diff --git a/.bazelrc b/.bazelrc
index 9abda3e670a..60455dd72c6 100644
--- a/.bazelrc
+++ b/.bazelrc
@@ -1,5 +1,4 @@
 common --enable_platform_specific_config
-common --enable_bzlmod
 # because we use --override_module with `%workspace%`, the lock file is not stable
 common --lockfile_mode=off
 
@@ -24,6 +23,5 @@ common --registry=file:///%workspace%/misc/bazel/registry
 common --registry=https://bcr.bazel.build
 
 common --@rules_dotnet//dotnet/settings:strict_deps=false
-common --experimental_isolated_extension_usages
 
 try-import %workspace%/local.bazelrc
diff --git a/.bazelrc.internal b/.bazelrc.internal
index dcc8dafa6c7..f7718959c9d 100644
--- a/.bazelrc.internal
+++ b/.bazelrc.internal
@@ -8,4 +8,3 @@ common --registry=https://bcr.bazel.build
 # its implementation packages without providing any code itself.
 # We either can depend on internal implementation details, or turn of strict deps.
 common --@rules_dotnet//dotnet/settings:strict_deps=false
-common --experimental_isolated_extension_usages
diff --git a/.bazelversion b/.bazelversion
index b9ad1fa3a7f..5ce91d4d61c 100644
--- a/.bazelversion
+++ b/.bazelversion
@@ -1 +1 @@
-5f5d70b6c4d2fb1a889479569107f1692239e8a7
+8.0.0rc1
diff --git a/.github/codeql/codeql-config.yml b/.github/codeql/codeql-config.yml
index cbd1f33a7f6..f1f5ba9b691 100644
--- a/.github/codeql/codeql-config.yml
+++ b/.github/codeql/codeql-config.yml
@@ -9,3 +9,5 @@ paths-ignore:
   - '/python/'
   - '/javascript/ql/test'
   - '/javascript/extractor/tests'
+  - '/rust/ql/test'
+  - '/rust/ql/integration-tests'
diff --git a/.github/labeler.yml b/.github/labeler.yml
index 0e43646c7ba..65f82079971 100644
--- a/.github/labeler.yml
+++ b/.github/labeler.yml
@@ -38,6 +38,10 @@ Swift:
   - swift/**/*
   - change-notes/**/*swift*
 
+Actions:
+  - actions/**/*
+  - change-notes/**/*actions*
+
 documentation:
   - "**/*.qhelp"
   - "**/*.md"
diff --git a/.github/workflows/build-ripunzip.yml b/.github/workflows/build-ripunzip.yml
index aed80bac669..e7218a40e66 100644
--- a/.github/workflows/build-ripunzip.yml
+++ b/.github/workflows/build-ripunzip.yml
@@ -17,7 +17,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-20.04, macos-12, windows-2019]
+        os: [ubuntu-20.04, macos-13, windows-2019]
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v4
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index fbe5338e4ca..d571d961e67 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -30,7 +30,7 @@ jobs:
     - name: Setup dotnet
       uses: actions/setup-dotnet@v4
       with:
-        dotnet-version: 8.0.101
+        dotnet-version: 9.0.100
 
     - name: Checkout repository
       uses: actions/checkout@v4
diff --git a/.github/workflows/cpp-swift-analysis.yml b/.github/workflows/cpp-swift-analysis.yml
index 4b923f1b39c..3af9c3c5e4e 100644
--- a/.github/workflows/cpp-swift-analysis.yml
+++ b/.github/workflows/cpp-swift-analysis.yml
@@ -48,7 +48,7 @@ jobs:
     - name: "Build Swift extractor using Bazel"
       run: |
         bazel clean --expunge
-        bazel run //swift:create-extractor-pack --nouse_action_cache --noremote_accept_cached --noremote_upload_local_results --spawn_strategy=local
+        bazel run //swift:install --nouse_action_cache --noremote_accept_cached --noremote_upload_local_results --spawn_strategy=local
         bazel shutdown
 
     - name: Perform CodeQL Analysis
diff --git a/.github/workflows/csharp-qltest.yml b/.github/workflows/csharp-qltest.yml
index 35bbcf0896a..cb301d65f9a 100644
--- a/.github/workflows/csharp-qltest.yml
+++ b/.github/workflows/csharp-qltest.yml
@@ -39,14 +39,14 @@ jobs:
       - name: Setup dotnet
         uses: actions/setup-dotnet@v4
         with:
-          dotnet-version: 8.0.101
+          dotnet-version: 9.0.100
       - name: Extractor unit tests
         run: |
           dotnet tool restore
-          dotnet test -p:RuntimeFrameworkVersion=8.0.1 extractor/Semmle.Util.Tests
-          dotnet test -p:RuntimeFrameworkVersion=8.0.1 extractor/Semmle.Extraction.Tests
-          dotnet test -p:RuntimeFrameworkVersion=8.0.1 autobuilder/Semmle.Autobuild.CSharp.Tests
-          dotnet test -p:RuntimeFrameworkVersion=8.0.1 autobuilder/Semmle.Autobuild.Cpp.Tests
+          dotnet test -p:RuntimeFrameworkVersion=9.0.0 extractor/Semmle.Util.Tests
+          dotnet test -p:RuntimeFrameworkVersion=9.0.0 extractor/Semmle.Extraction.Tests
+          dotnet test -p:RuntimeFrameworkVersion=9.0.0 autobuilder/Semmle.Autobuild.CSharp.Tests
+          dotnet test -p:RuntimeFrameworkVersion=9.0.0 autobuilder/Semmle.Autobuild.Cpp.Tests
         shell: bash
   stubgentest:
     runs-on: ubuntu-latest
diff --git a/.github/workflows/csv-coverage-metrics.yml b/.github/workflows/csv-coverage-metrics.yml
index 6f1170047bf..08f0e9883ef 100644
--- a/.github/workflows/csv-coverage-metrics.yml
+++ b/.github/workflows/csv-coverage-metrics.yml
@@ -37,7 +37,7 @@ jobs:
         run: |
           DATABASE="${{ runner.temp }}/java-database"
           codeql database analyze --format=sarif-latest --output=metrics-java.sarif -- "$DATABASE" ./java/ql/src/Metrics/Summaries/FrameworkCoverage.ql
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
           name: metrics-java.sarif
           path: metrics-java.sarif
@@ -64,7 +64,7 @@ jobs:
         run: |
           DATABASE="${{ runner.temp }}/csharp-database"
           codeql database analyze --format=sarif-latest --output=metrics-csharp.sarif -- "$DATABASE" ./csharp/ql/src/Metrics/Summaries/FrameworkCoverage.ql
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
           name: metrics-csharp.sarif
           path: metrics-csharp.sarif
diff --git a/.github/workflows/csv-coverage-pr-artifacts.yml b/.github/workflows/csv-coverage-pr-artifacts.yml
index b5baa70321d..cbd92dd47d7 100644
--- a/.github/workflows/csv-coverage-pr-artifacts.yml
+++ b/.github/workflows/csv-coverage-pr-artifacts.yml
@@ -71,21 +71,21 @@ jobs:
         run: |
           python base/misc/scripts/library-coverage/compare-folders.py out_base out_merge comparison.md
       - name: Upload CSV package list
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: csv-framework-coverage-merge
           path: |
             out_merge/framework-coverage-*.csv
             out_merge/framework-coverage-*.rst
       - name: Upload CSV package list
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: csv-framework-coverage-base
           path: |
             out_base/framework-coverage-*.csv
             out_base/framework-coverage-*.rst
       - name: Upload comparison results
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: comparison
           path: |
@@ -97,7 +97,7 @@ jobs:
         env:
           PR_NUMBER: ${{ github.event.pull_request.number }}
       - name: Upload PR number
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: pr
           path: pr/
@@ -117,7 +117,7 @@ jobs:
           GITHUB_TOKEN: ${{ github.token }}
           PR_NUMBER: ${{ github.event.pull_request.number }}
       - name: Upload comment ID (if it exists)
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: comment
           path: comment/
diff --git a/.github/workflows/csv-coverage-timeseries.yml b/.github/workflows/csv-coverage-timeseries.yml
index f2e1ed47a3d..13dc99b162c 100644
--- a/.github/workflows/csv-coverage-timeseries.yml
+++ b/.github/workflows/csv-coverage-timeseries.yml
@@ -30,7 +30,7 @@ jobs:
         run: |
           python script/misc/scripts/library-coverage/generate-timeseries.py codeqlModels
       - name: Upload timeseries CSV
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: framework-coverage-timeseries
           path: framework-coverage-timeseries-*.csv
diff --git a/.github/workflows/csv-coverage.yml b/.github/workflows/csv-coverage.yml
index 9461ba887f5..525f4bfb64c 100644
--- a/.github/workflows/csv-coverage.yml
+++ b/.github/workflows/csv-coverage.yml
@@ -34,12 +34,12 @@ jobs:
         run: |
           python script/misc/scripts/library-coverage/generate-report.py ci codeqlModels script
       - name: Upload CSV package list
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: framework-coverage-csv
           path: framework-coverage-*.csv
       - name: Upload RST package list
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: framework-coverage-rst
           path: framework-coverage-*.rst
diff --git a/.github/workflows/go-tests.yml b/.github/workflows/go-tests.yml
index f5e7d33fb1f..bf6cd209e15 100644
--- a/.github/workflows/go-tests.yml
+++ b/.github/workflows/go-tests.yml
@@ -3,6 +3,7 @@ on:
   push:
     paths:
       - "go/**"
+      - "shared/**"
       - .github/workflows/go-tests.yml
       - .github/actions/**
       - codeql-workspace.yml
@@ -12,6 +13,7 @@ on:
   pull_request:
     paths:
       - "go/**"
+      - "shared/**"
       - .github/workflows/go-tests.yml
       - .github/actions/**
       - codeql-workspace.yml
diff --git a/.github/workflows/mad_modelDiff.yml b/.github/workflows/mad_modelDiff.yml
index 62cb57fd935..3d98e74f0fb 100644
--- a/.github/workflows/mad_modelDiff.yml
+++ b/.github/workflows/mad_modelDiff.yml
@@ -38,14 +38,20 @@ jobs:
           path: codeql-main
           ref: main
       - uses: ./codeql-main/.github/actions/fetch-codeql
+      # compute the shortname of the project that does not contain any special (disk) characters
+      - run: |
+          echo "SHORTNAME=${SLUG//[^a-zA-Z0-9_]/}" >> $GITHUB_OUTPUT
+        env: 
+          SLUG: ${{ matrix.slug }}
+        id: shortname
       - name: Download database
         env:
           SLUG: ${{ matrix.slug }}
           GH_TOKEN: ${{ github.token }}
+          SHORTNAME: ${{ steps.shortname.outputs.SHORTNAME }}
         run: |
           set -x
           mkdir lib-dbs
-          SHORTNAME=${SLUG//[^a-zA-Z0-9_]/}
           gh api -H "Accept: application/zip" "/repos/${SLUG}/code-scanning/codeql/databases/java" > "$SHORTNAME.zip"
           unzip -q -d "${SHORTNAME}-db" "${SHORTNAME}.zip"
           mkdir "lib-dbs/$SHORTNAME/"
@@ -93,14 +99,14 @@ jobs:
             name="diff_${basename/.model.yml/""}"
             (diff -w -u $m $t | diff2html -i stdin -F $MODELS/$name.html) || true
           done
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
-          name: models
+          name: models-${{ steps.shortname.outputs.SHORTNAME }}
           path: tmp-models/**/**/*.model.yml
           retention-days: 20
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
-          name: diffs
+          name: diffs-${{ steps.shortname.outputs.SHORTNAME }}
           path: tmp-models/*.html
           # An html file is only produced if the generated models differ.
           if-no-files-found: ignore
diff --git a/.github/workflows/mad_regenerate-models.yml b/.github/workflows/mad_regenerate-models.yml
index 1c7d14238f3..61e4f986243 100644
--- a/.github/workflows/mad_regenerate-models.yml
+++ b/.github/workflows/mad_regenerate-models.yml
@@ -59,7 +59,7 @@ jobs:
           find java -name "*.model.yml" -print0 | xargs -0 git add
           git status
           git diff --cached > models.patch
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
           name: patch
           path: models.patch
diff --git a/.github/workflows/post-pr-comment.yml b/.github/workflows/post-pr-comment.yml
index 7a86909371f..1c6798bfe80 100644
--- a/.github/workflows/post-pr-comment.yml
+++ b/.github/workflows/post-pr-comment.yml
@@ -17,8 +17,11 @@ jobs:
   post_comment:
     runs-on: ubuntu-latest
     steps:
-      - name: Download artifact
-        run: gh run download "${WORKFLOW_RUN_ID}" --repo "${GITHUB_REPOSITORY}" --name "comment"
+      - name: Download artifacts
+        run: |
+          gh run download "${WORKFLOW_RUN_ID}" --repo "${GITHUB_REPOSITORY}" --name "comment-pr-number"
+          gh run download "${WORKFLOW_RUN_ID}" --repo "${GITHUB_REPOSITORY}" --name "comment-body"
+          gh run download "${WORKFLOW_RUN_ID}" --repo "${GITHUB_REPOSITORY}" --name "comment-id"
         env:
           GITHUB_TOKEN: ${{ github.token }}
           WORKFLOW_RUN_ID: ${{ github.event.workflow_run.id }}
diff --git a/.github/workflows/qhelp-pr-preview.yml b/.github/workflows/qhelp-pr-preview.yml
index db267175d4e..be5a42096bb 100644
--- a/.github/workflows/qhelp-pr-preview.yml
+++ b/.github/workflows/qhelp-pr-preview.yml
@@ -36,9 +36,9 @@ jobs:
       - run: echo "${PR_NUMBER}" > pr_number.txt
         env:
           PR_NUMBER: ${{ github.event.number }}
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
-          name: comment
+          name: comment-pr-number
           path: pr_number.txt
           if-no-files-found: error
           retention-days: 1
@@ -78,9 +78,9 @@ jobs:
           exit "${EXIT_CODE}"
 
       - if: ${{ !cancelled() }}
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
-          name: comment
+          name: comment-body
           path: comment_body.txt
           if-no-files-found: error
           retention-days: 1
@@ -94,9 +94,9 @@ jobs:
           GITHUB_TOKEN: ${{ github.token }}
           PR_NUMBER: ${{ github.event.number }}
 
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
-          name: comment
+          name: comment-id
           path: comment_id.txt
           if-no-files-found: error
           retention-days: 1
diff --git a/.github/workflows/ql-for-ql-build.yml b/.github/workflows/ql-for-ql-build.yml
index 2082629d9c8..73833da0549 100644
--- a/.github/workflows/ql-for-ql-build.yml
+++ b/.github/workflows/ql-for-ql-build.yml
@@ -75,7 +75,7 @@ jobs:
           sarif_file: ql-for-ql.sarif
           category: ql-for-ql
       - name: Sarif as artifact
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: ql-for-ql.sarif
           path: ql-for-ql.sarif
@@ -84,7 +84,7 @@ jobs:
           mkdir split-sarif
           node ./ql/scripts/split-sarif.js ql-for-ql.sarif split-sarif
       - name: Upload langs as artifacts
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: ql-for-ql-langs
           path: split-sarif
diff --git a/.github/workflows/ql-for-ql-dataset_measure.yml b/.github/workflows/ql-for-ql-dataset_measure.yml
index e53cce8ff8e..d133eb0ad35 100644
--- a/.github/workflows/ql-for-ql-dataset_measure.yml
+++ b/.github/workflows/ql-for-ql-dataset_measure.yml
@@ -65,7 +65,7 @@ jobs:
           "${CODEQL}" dataset measure --threads 4 --output "stats/${{ matrix.repo }}/stats.xml" "${{ runner.temp }}/database/db-ql"
         env:
           CODEQL: ${{ steps.find-codeql.outputs.codeql-path }}
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
           name: measurements
           path: stats
@@ -76,14 +76,14 @@ jobs:
     needs: measure
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/download-artifact@v3
+      - uses: actions/download-artifact@v4
         with:
           name: measurements
           path: stats
       - run: |
           python -m pip install --user lxml
           find stats -name 'stats.xml' -print0 | sort -z | xargs -0 python ruby/scripts/merge_stats.py --output ql/ql/src/ql.dbscheme.stats --normalise ql_tokeninfo
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
           name: ql.dbscheme.stats
           path: ql/ql/src/ql.dbscheme.stats
diff --git a/.github/workflows/query-list.yml b/.github/workflows/query-list.yml
index 233cc8120f5..a286b9b846b 100644
--- a/.github/workflows/query-list.yml
+++ b/.github/workflows/query-list.yml
@@ -37,7 +37,7 @@ jobs:
       run: |
         python codeql/misc/scripts/generate-code-scanning-query-list.py > code-scanning-query-list.csv
     - name: Upload code scanning query list
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: code-scanning-query-list
         path: code-scanning-query-list.csv
diff --git a/.github/workflows/ruby-build.yml b/.github/workflows/ruby-build.yml
index fcabff5d110..b1ae2e2b7db 100644
--- a/.github/workflows/ruby-build.yml
+++ b/.github/workflows/ruby-build.yml
@@ -92,17 +92,17 @@ jobs:
       - 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@v3
+      - uses: actions/upload-artifact@v4
         if: ${{ matrix.os == 'ubuntu-latest' }}
         with:
           name: ruby.dbscheme
           path: ruby/ql/lib/ruby.dbscheme
-      - uses: actions/upload-artifact@v3
+      - 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@v3
+      - uses: actions/upload-artifact@v4
         with:
           name: extractor-${{ matrix.os }}
           path: |
@@ -134,7 +134,7 @@ jobs:
           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@v3
+      - uses: actions/upload-artifact@v4
         with:
           name: codeql-ruby-queries
           path: |
@@ -147,19 +147,19 @@ jobs:
     needs: [build, compile-queries]
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/download-artifact@v3
+      - uses: actions/download-artifact@v4
         with:
           name: ruby.dbscheme
           path: ruby/ruby
-      - uses: actions/download-artifact@v3
+      - uses: actions/download-artifact@v4
         with:
           name: extractor-ubuntu-latest
           path: ruby/linux64
-      - uses: actions/download-artifact@v3
+      - uses: actions/download-artifact@v4
         with:
           name: extractor-windows-latest
           path: ruby/win64
-      - uses: actions/download-artifact@v3
+      - uses: actions/download-artifact@v4
         with:
           name: extractor-macos-latest
           path: ruby/osx64
@@ -172,13 +172,13 @@ jobs:
           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@v3
+      - 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@v3
+      - uses: actions/download-artifact@v4
         with:
           name: codeql-ruby-queries
           path: ruby/qlpacks
@@ -190,7 +190,7 @@ jobs:
             ]
           }' > .codeqlmanifest.json
           zip -rq codeql-ruby-bundle.zip .codeqlmanifest.json ruby qlpacks
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
           name: codeql-ruby-bundle
           path: ruby/codeql-ruby-bundle.zip
@@ -214,7 +214,7 @@ jobs:
         uses: ./.github/actions/fetch-codeql
 
       - name: Download Ruby bundle
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: codeql-ruby-bundle
           path: ${{ runner.temp }}
diff --git a/.github/workflows/ruby-dataset-measure.yml b/.github/workflows/ruby-dataset-measure.yml
index d6e3c9216fc..e3229b15806 100644
--- a/.github/workflows/ruby-dataset-measure.yml
+++ b/.github/workflows/ruby-dataset-measure.yml
@@ -52,9 +52,9 @@ jobs:
         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@v3
+      - uses: actions/upload-artifact@v4
         with:
-          name: measurements
+          name: measurements-${{ hashFiles('stats/**') }}
           path: stats
           retention-days: 1
 
@@ -63,14 +63,13 @@ jobs:
     needs: measure
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/download-artifact@v3
+      - uses: actions/download-artifact@v4
         with:
-          name: measurements
           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@v3
+      - uses: actions/upload-artifact@v4
         with:
           name: ruby.dbscheme.stats
           path: ruby/ql/lib/ruby.dbscheme.stats
diff --git a/.github/workflows/rust-analysis.yml b/.github/workflows/rust-analysis.yml
new file mode 100644
index 00000000000..04028ad594b
--- /dev/null
+++ b/.github/workflows/rust-analysis.yml
@@ -0,0 +1,64 @@
+name: "Code scanning - Rust"
+
+on:
+  push:
+    branches:
+      - main
+      - 'rc/*'
+  pull_request:
+    branches:
+      - main
+      - 'rc/*'
+    paths:
+      - '**/*.rs'
+      - '**/Cargo.toml'
+      - '.github/codeql/codeql-config.yml'
+      - '.github/workflows/rust-analysis.yml'
+  schedule:
+    - cron: '0 9 * * 1'
+
+env:
+  CODEQL_ENABLE_EXPERIMENTAL_FEATURES: "true"
+
+jobs:
+  analyze:
+    strategy:
+      matrix:
+        language: [ 'rust' ]
+
+    runs-on: ubuntu-latest
+
+    permissions:
+      contents: read
+      security-events: write
+      pull-requests: read
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v4
+
+    - name: Query latest nightly CodeQL bundle
+      shell: bash
+      id: codeql
+      env:
+        GITHUB_TOKEN: ${{ github.token }}
+      run: |
+        REPO=dsp-testing/codeql-cli-nightlies
+        TAG=$(
+          gh release list -R $REPO -L1 --exclude-drafts --json tagName -q ".[] | .tagName"
+        )
+        echo "nightly_bundle=https://github.com/$REPO/releases/download/$TAG/codeql-bundle-linux64.tar.zst" \
+          | tee -a "$GITHUB_OUTPUT"
+
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@main
+      with:
+        tools: ${{ steps.codeql.outputs.nightly_bundle }}
+        languages: ${{ matrix.language }}
+        config-file: ./.github/codeql/codeql-config.yml
+
+    - name: Autobuild
+      uses: github/codeql-action/autobuild@main
+
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@main
diff --git a/.github/workflows/swift.yml b/.github/workflows/swift.yml
index ad7e8f52aa3..265fbbe2717 100644
--- a/.github/workflows/swift.yml
+++ b/.github/workflows/swift.yml
@@ -44,7 +44,7 @@ jobs:
   # without waiting for the macOS build
   build-and-test-macos:
     if: github.repository_owner == 'github'
-    runs-on: macos-12-xl
+    runs-on: macos-13-xlarge
     steps:
       - uses: actions/checkout@v4
       - uses: ./swift/actions/build-and-test
@@ -64,7 +64,7 @@ jobs:
   qltests-macos:
     if: ${{ github.repository_owner == 'github' && github.event_name == 'pull_request' }}
     needs: build-and-test-macos
-    runs-on: macos-12-xl
+    runs-on: macos-13-xlarge
     steps:
       - uses: actions/checkout@v4
       - uses: ./swift/actions/run-ql-tests
@@ -98,7 +98,7 @@ jobs:
       - name: Generate C++ files
         run: |
           bazel run //swift/codegen:codegen -- --generate=trap,cpp --cpp-output=$PWD/generated-cpp-files
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
           name: swift-generated-cpp-files
           path: generated-cpp-files/**
diff --git a/.vscode/settings.json b/.vscode/settings.json
index 1050c79b825..7685e036f31 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -1,5 +1,6 @@
 {
   "omnisharp.autoStart": false,
   "cmake.sourceDirectory": "${workspaceFolder}/swift",
-  "cmake.buildDirectory": "${workspaceFolder}/bazel-cmake-build"
+  "cmake.buildDirectory": "${workspaceFolder}/bazel-cmake-build",
+  "editor.suggest.matchOnWordStartOnly": false
 }
diff --git a/BUILD.bazel b/BUILD.bazel
index 8ef196cd85a..b2e4ea80678 100644
--- a/BUILD.bazel
+++ b/BUILD.bazel
@@ -1 +1,5 @@
-exports_files(["LICENSE"])
+exports_files([
+    "LICENSE",
+    "Cargo.lock",
+    "Cargo.toml",
+])
diff --git a/CODEOWNERS b/CODEOWNERS
index 992acbda4ff..6e1c975ace7 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -23,7 +23,6 @@
 /ql/ @github/codeql-ql-for-ql-reviewers
 
 # Bazel (excluding BUILD.bazel files)
-WORKSPACE.bazel @github/codeql-ci-reviewers
 MODULE.bazel @github/codeql-ci-reviewers
 .bazelversion @github/codeql-ci-reviewers
 .bazelrc @github/codeql-ci-reviewers
diff --git a/Cargo.lock b/Cargo.lock
index d3b54343499..1d5b8824c84 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -43,9 +43,9 @@ dependencies = [
 
 [[package]]
 name = "anstream"
-version = "0.6.15"
+version = "0.6.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "64e15c1ab1f89faffbf04a634d5e1962e9074f2741eef6d97f3c4e322426d526"
+checksum = "8acc5369981196006228e28809f761875c0327210a891e941f4c683b3a99529b"
 dependencies = [
  "anstyle",
  "anstyle-parse",
@@ -58,43 +58,43 @@ dependencies = [
 
 [[package]]
 name = "anstyle"
-version = "1.0.8"
+version = "1.0.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1bec1de6f59aedf83baf9ff929c98f2ad654b97c9510f4e70cf6f661d49fd5b1"
+checksum = "55cc3b69f167a1ef2e161439aa98aed94e6028e5f9a59be9a6ffb47aef1651f9"
 
 [[package]]
 name = "anstyle-parse"
-version = "0.2.5"
+version = "0.2.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb47de1e80c2b463c735db5b217a0ddc39d612e7ac9e2e96a5aed1f57616c1cb"
+checksum = "3b2d16507662817a6a20a9ea92df6652ee4f94f914589377d69f3b21bc5798a9"
 dependencies = [
  "utf8parse",
 ]
 
 [[package]]
 name = "anstyle-query"
-version = "1.1.1"
+version = "1.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d36fc52c7f6c869915e99412912f22093507da8d9e942ceaf66fe4b7c14422a"
+checksum = "79947af37f4177cfead1110013d678905c37501914fba0efea834c3fe9a8d60c"
 dependencies = [
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
 name = "anstyle-wincon"
-version = "3.0.4"
+version = "3.0.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5bf74e1b6e971609db8ca7a9ce79fd5768ab6ae46441c572e46cf596f59e57f8"
+checksum = "2109dbce0e72be3ec00bed26e6a7479ca384ad226efdd66db8fa2e3a38c83125"
 dependencies = [
  "anstyle",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
 name = "anyhow"
-version = "1.0.87"
+version = "1.0.93"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "10f00e1f6e58a40e807377c75c6a7f97bf9044fab57816f2414e6f5f4499d7b8"
+checksum = "4c95c10ba0b00a02636238b814946408b1322d5ac4760326e6fb8ec956d85775"
 
 [[package]]
 name = "argfile"
@@ -112,6 +112,16 @@ version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50"
 
+[[package]]
+name = "ast-generator"
+version = "0.1.0"
+dependencies = [
+ "itertools 0.10.5",
+ "proc-macro2",
+ "quote",
+ "ungrammar",
+]
+
 [[package]]
 name = "atomic"
 version = "0.6.0"
@@ -123,9 +133,9 @@ dependencies = [
 
 [[package]]
 name = "autocfg"
-version = "1.3.0"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
+checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
 
 [[package]]
 name = "base64"
@@ -163,9 +173,9 @@ checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c"
 
 [[package]]
 name = "bytemuck"
-version = "1.18.0"
+version = "1.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "94bbb0ad554ad961ddc5da507a12a29b14e4ae5bda06b19f575a3e6079d2e2ae"
+checksum = "8334215b81e418a0a7bdb8ef0849474f40bb10c8b71f1c4ed315cff49f32494d"
 
 [[package]]
 name = "byteorder"
@@ -207,9 +217,9 @@ dependencies = [
 
 [[package]]
 name = "cc"
-version = "1.1.18"
+version = "1.1.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b62ac837cdb5cb22e10a256099b4fc502b1dfe560cb282963a974d7abd80e476"
+checksum = "40545c26d092346d8a8dab71ee48e7685a7a9cba76e634790c215b41a4a7b4cf"
 dependencies = [
  "shlex",
 ]
@@ -264,8 +274,8 @@ dependencies = [
  "chalk-derive",
  "chalk-ir",
  "ena",
- "indexmap 2.5.0",
- "itertools",
+ "indexmap 2.6.0",
+ "itertools 0.12.1",
  "petgraph",
  "rustc-hash",
  "tracing",
@@ -288,9 +298,9 @@ dependencies = [
 
 [[package]]
 name = "clap"
-version = "4.5.17"
+version = "4.5.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3e5a21b8495e732f1b3c364c9949b201ca7bae518c502c80256c96ad79eaf6ac"
+checksum = "b97f376d85a664d5837dbae44bf546e6477a679ff6610010f17276f686d867e8"
 dependencies = [
  "clap_builder",
  "clap_derive",
@@ -298,9 +308,9 @@ dependencies = [
 
 [[package]]
 name = "clap_builder"
-version = "4.5.17"
+version = "4.5.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8cf2dd12af7a047ad9d6da2b6b249759a22a7abc0f474c1dae1777afa4b21a73"
+checksum = "19bc80abd44e4bed93ca373a0704ccbd1b710dc5749406201bb018272808dc54"
 dependencies = [
  "anstream",
  "anstyle",
@@ -310,9 +320,9 @@ dependencies = [
 
 [[package]]
 name = "clap_derive"
-version = "4.5.13"
+version = "4.5.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "501d359d5f3dcaf6ecdeee48833ae73ec6e42723a1e52419c79abf9507eec0a0"
+checksum = "4ac6a0c7b1a9e9a5186361f67dfa1b88213572f427fb9ab038efb2bd8c582dab"
 dependencies = [
  "heck 0.5.0",
  "proc-macro2",
@@ -374,15 +384,22 @@ dependencies = [
  "clap",
  "codeql-extractor",
  "figment",
+ "glob",
+ "itertools 0.13.0",
  "log",
  "num-traits",
  "ra_ap_base_db",
+ "ra_ap_cfg",
  "ra_ap_hir",
  "ra_ap_hir_def",
+ "ra_ap_hir_expand",
  "ra_ap_ide_db",
+ "ra_ap_intern",
  "ra_ap_load-cargo",
+ "ra_ap_parser",
  "ra_ap_paths",
  "ra_ap_project_model",
+ "ra_ap_span",
  "ra_ap_syntax",
  "ra_ap_vfs",
  "rust-extractor-macros",
@@ -394,9 +411,9 @@ dependencies = [
 
 [[package]]
 name = "colorchoice"
-version = "1.0.2"
+version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d3fd119d74b830634cea2a0f58bbd0d54540518a14397557951e79340abc28c0"
+checksum = "5b63caa9aa9397e2d9480a9b13673856c78d8ac123288526c37d7839f2a86990"
 
 [[package]]
 name = "core-foundation-sys"
@@ -617,6 +634,7 @@ dependencies = [
  "atomic",
  "pear",
  "serde",
+ "serde_yaml",
  "uncased",
  "version_check",
 ]
@@ -641,9 +659,9 @@ checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80"
 
 [[package]]
 name = "flate2"
-version = "1.0.33"
+version = "1.0.34"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "324a1be68054ef05ad64b861cc9eaf1d623d2d8cb25b4bf2cb9cdd902b4bf253"
+checksum = "a1b589b4dc103969ad3cf85c950899926ec64300a1a46d76c03a6072957036f0"
 dependencies = [
  "crc32fast",
  "miniz_oxide",
@@ -690,6 +708,12 @@ dependencies = [
  "wasi",
 ]
 
+[[package]]
+name = "glob"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b"
+
 [[package]]
 name = "globset"
 version = "0.4.15"
@@ -699,8 +723,8 @@ dependencies = [
  "aho-corasick",
  "bstr",
  "log",
- "regex-automata 0.4.7",
- "regex-syntax 0.8.4",
+ "regex-automata 0.4.8",
+ "regex-syntax 0.8.5",
 ]
 
 [[package]]
@@ -715,6 +739,12 @@ version = "0.14.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1"
 
+[[package]]
+name = "hashbrown"
+version = "0.15.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3a9bfc1af68b1726ea47d3d5109de126281def866b33970e10fbab11b5dafab3"
+
 [[package]]
 name = "heck"
 version = "0.4.1"
@@ -756,9 +786,9 @@ dependencies = [
 
 [[package]]
 name = "iana-time-zone"
-version = "0.1.60"
+version = "0.1.61"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141"
+checksum = "235e081f3925a06703c2d0117ea8b91f042756fd6e7a6e5d901e8ca1a996b220"
 dependencies = [
  "android_system_properties",
  "core-foundation-sys",
@@ -796,12 +826,12 @@ dependencies = [
 
 [[package]]
 name = "indexmap"
-version = "2.5.0"
+version = "2.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68b900aa2f7301e21c36462b170ee99994de34dff39a4a6a528e80e7376d07e5"
+checksum = "707907fe3c25f5424cce2cb7e1cbcafee6bdbe735ca90ef77c29e84591e5b9da"
 dependencies = [
  "equivalent",
- "hashbrown 0.14.5",
+ "hashbrown 0.15.1",
  "serde",
 ]
 
@@ -848,6 +878,15 @@ version = "1.70.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf"
 
+[[package]]
+name = "itertools"
+version = "0.10.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473"
+dependencies = [
+ "either",
+]
+
 [[package]]
 name = "itertools"
 version = "0.12.1"
@@ -857,6 +896,15 @@ dependencies = [
  "either",
 ]
 
+[[package]]
+name = "itertools"
+version = "0.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186"
+dependencies = [
+ "either",
+]
+
 [[package]]
 name = "itoa"
 version = "1.0.11"
@@ -871,9 +919,9 @@ checksum = "8b23360e99b8717f20aaa4598f5a6541efbe30630039fbc7706cf954a87947ae"
 
 [[package]]
 name = "js-sys"
-version = "0.3.70"
+version = "0.3.72"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1868808506b929d7b0cfa8f75951347aa71bb21144b7791bae35d9bccfcfe37a"
+checksum = "6a88f1bda2bd75b0452a14784937d796722fdebfe50df998aeb3f0b7603019a9"
 dependencies = [
  "wasm-bindgen",
 ]
@@ -912,9 +960,9 @@ checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
 
 [[package]]
 name = "libc"
-version = "0.2.158"
+version = "0.2.162"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439"
+checksum = "18d287de67fe55fd7e1581fe933d965a5a9477b38e949cfa9f8574ef01506398"
 
 [[package]]
 name = "libredox"
@@ -929,9 +977,9 @@ dependencies = [
 
 [[package]]
 name = "line-index"
-version = "0.1.1"
+version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "67d61795376ae2683928c218fda7d7d7db136fd38c06b7552904667f0d55580a"
+checksum = "3e27e0ed5a392a7f5ba0b3808a2afccff16c64933312c84b57618b49d1209bd2"
 dependencies = [
  "nohash-hasher",
  "text-size",
@@ -1075,9 +1123,9 @@ dependencies = [
 
 [[package]]
 name = "once_cell"
-version = "1.19.0"
+version = "1.20.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
+checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775"
 
 [[package]]
 name = "oorandom"
@@ -1172,14 +1220,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b4c5cc86750666a3ed20bdaf5ca2a0344f9c67674cae0515bec2da16fbaa47db"
 dependencies = [
  "fixedbitset",
- "indexmap 2.5.0",
+ "indexmap 2.6.0",
 ]
 
 [[package]]
 name = "pin-project-lite"
-version = "0.2.14"
+version = "0.2.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02"
+checksum = "915a1e146535de9163f3987b8944ed8cf49a18bb0056bcebcdcece385cece4ff"
 
 [[package]]
 name = "powerfmt"
@@ -1198,9 +1246,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.86"
+version = "1.0.89"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
+checksum = "f139b0662de085916d1fb67d2b4169d1addddda1919e696f3252b740b629986e"
 dependencies = [
  "unicode-ident",
 ]
@@ -1333,7 +1381,7 @@ checksum = "c7c38520eb4770af561c34b908431f4e548c3282093cf3daf3c6e566d99a2937"
 dependencies = [
  "arrayvec",
  "either",
- "itertools",
+ "itertools 0.12.1",
  "ra_ap_base_db",
  "ra_ap_cfg",
  "ra_ap_hir_def",
@@ -1364,8 +1412,8 @@ dependencies = [
  "either",
  "fst",
  "hashbrown 0.14.5",
- "indexmap 2.5.0",
- "itertools",
+ "indexmap 2.6.0",
+ "itertools 0.12.1",
  "la-arena",
  "ra-ap-rustc_abi",
  "ra-ap-rustc_parse_format",
@@ -1395,7 +1443,7 @@ dependencies = [
  "cov-mark",
  "either",
  "hashbrown 0.14.5",
- "itertools",
+ "itertools 0.12.1",
  "la-arena",
  "ra_ap_base_db",
  "ra_ap_cfg",
@@ -1429,8 +1477,8 @@ dependencies = [
  "cov-mark",
  "either",
  "ena",
- "indexmap 2.5.0",
- "itertools",
+ "indexmap 2.6.0",
+ "itertools 0.12.1",
  "la-arena",
  "nohash-hasher",
  "oorandom",
@@ -1466,8 +1514,8 @@ dependencies = [
  "crossbeam-channel",
  "either",
  "fst",
- "indexmap 2.5.0",
- "itertools",
+ "indexmap 2.6.0",
+ "itertools 0.12.1",
  "line-index",
  "memchr",
  "nohash-hasher",
@@ -1513,7 +1561,7 @@ checksum = "82e6f24b61f1ef1f3a756493d1fb7e711b69b2e4d5f4746fcb959313dfd41471"
 dependencies = [
  "anyhow",
  "crossbeam-channel",
- "itertools",
+ "itertools 0.12.1",
  "ra_ap_hir_expand",
  "ra_ap_ide_db",
  "ra_ap_intern",
@@ -1575,7 +1623,7 @@ version = "0.0.232"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "809670622e93f105abc60ea0cb371cfaff990beae7ce534b127fb39b423b4b92"
 dependencies = [
- "indexmap 2.5.0",
+ "indexmap 2.6.0",
  "ra_ap_base_db",
  "ra_ap_intern",
  "ra_ap_paths",
@@ -1608,7 +1656,7 @@ checksum = "db83d1844c74b22c110c4b8e8f2519be2b1723964008527281a11c3398749756"
 dependencies = [
  "anyhow",
  "cargo_metadata",
- "itertools",
+ "itertools 0.12.1",
  "la-arena",
  "ra_ap_base_db",
  "ra_ap_cfg",
@@ -1631,8 +1679,8 @@ version = "0.0.232"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "370b302873eeafd07ccc6a714fc9395cae11e385955ccb78081093ee3b86f94e"
 dependencies = [
- "indexmap 2.5.0",
- "itertools",
+ "indexmap 2.6.0",
+ "itertools 0.12.1",
  "lock_api",
  "oorandom",
  "parking_lot",
@@ -1679,7 +1727,7 @@ checksum = "bb63ff9d6b11b4553fc0835f16705975258905e3b1230fcf1ddbf24c46aff69d"
 dependencies = [
  "always-assert",
  "crossbeam-channel",
- "itertools",
+ "itertools 0.12.1",
  "jod-thread",
  "libc",
  "miow",
@@ -1694,8 +1742,8 @@ checksum = "f1ac12decfd5cadd880177316fc16afc1f2c67f241f6290b51fd6f222e2bd4d5"
 dependencies = [
  "cov-mark",
  "either",
- "indexmap 2.5.0",
- "itertools",
+ "indexmap 2.6.0",
+ "itertools 0.12.1",
  "ra-ap-rustc_lexer",
  "ra_ap_parser",
  "ra_ap_stdx",
@@ -1729,7 +1777,7 @@ version = "0.0.232"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7cb72ee1901baec556f4f2ef77e287d749ac0e973f063990672d6207b076aeac"
 dependencies = [
- "itertools",
+ "itertools 0.12.1",
  "text-size",
 ]
 
@@ -1764,7 +1812,7 @@ checksum = "d833eaa5422de9bb51ab1841fe505ed00fb51e64cce397e21de6c324bbcbffa0"
 dependencies = [
  "crossbeam-channel",
  "fst",
- "indexmap 2.5.0",
+ "indexmap 2.6.0",
  "nohash-hasher",
  "ra_ap_paths",
  "ra_ap_stdx",
@@ -1841,23 +1889,23 @@ dependencies = [
 
 [[package]]
 name = "redox_syscall"
-version = "0.5.3"
+version = "0.5.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2a908a6e00f1fdd0dfd9c0eb08ce85126f6d8bbda50017e74bc4a4b7d4a926a4"
+checksum = "9b6dfecf2c74bce2466cabf93f6664d6998a69eb21e39f4207930065b27b771f"
 dependencies = [
  "bitflags 2.6.0",
 ]
 
 [[package]]
 name = "regex"
-version = "1.10.6"
+version = "1.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619"
+checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191"
 dependencies = [
  "aho-corasick",
  "memchr",
- "regex-automata 0.4.7",
- "regex-syntax 0.8.4",
+ "regex-automata 0.4.8",
+ "regex-syntax 0.8.5",
 ]
 
 [[package]]
@@ -1871,13 +1919,13 @@ dependencies = [
 
 [[package]]
 name = "regex-automata"
-version = "0.4.7"
+version = "0.4.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df"
+checksum = "368758f23274712b504848e9d5a6f010445cc8b87a7cdb4d7cbee666c1288da3"
 dependencies = [
  "aho-corasick",
  "memchr",
- "regex-syntax 0.8.4",
+ "regex-syntax 0.8.5",
 ]
 
 [[package]]
@@ -1888,9 +1936,9 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1"
 
 [[package]]
 name = "regex-syntax"
-version = "0.8.4"
+version = "0.8.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b"
+checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c"
 
 [[package]]
 name = "rowan"
@@ -1966,18 +2014,18 @@ dependencies = [
 
 [[package]]
 name = "serde"
-version = "1.0.210"
+version = "1.0.214"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a"
+checksum = "f55c3193aca71c12ad7890f1785d2b73e1b9f63a0bbc353c08ef26fe03fc56b5"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.210"
+version = "1.0.214"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f"
+checksum = "de523f781f095e28fa605cdce0f8307e451cc0fd14e2eb4cd2e98a355b147766"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1986,9 +2034,9 @@ dependencies = [
 
 [[package]]
 name = "serde_json"
-version = "1.0.128"
+version = "1.0.132"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ff5456707a1de34e7e37f2a6fd3d3f808c318259cbd01ab6377795054b483d8"
+checksum = "d726bfaff4b320266d395898905d0eba0345aae23b54aee3a737e260fd46db03"
 dependencies = [
  "itoa",
  "memchr",
@@ -1998,15 +2046,15 @@ dependencies = [
 
 [[package]]
 name = "serde_with"
-version = "3.9.0"
+version = "3.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "69cecfa94848272156ea67b2b1a53f20fc7bc638c4a46d2f8abde08f05f4b857"
+checksum = "8e28bdad6db2b8340e449f7108f020b3b092e8583a9e3fb82713e1d4e71fe817"
 dependencies = [
  "base64",
  "chrono",
  "hex",
  "indexmap 1.9.3",
- "indexmap 2.5.0",
+ "indexmap 2.6.0",
  "serde",
  "serde_derive",
  "serde_json",
@@ -2016,9 +2064,9 @@ dependencies = [
 
 [[package]]
 name = "serde_with_macros"
-version = "3.9.0"
+version = "3.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a8fee4991ef4f274617a51ad4af30519438dacb2f56ac773b08a1922ff743350"
+checksum = "9d846214a9854ef724f3da161b426242d8de7c1fc7de2f89bb1efcb154dca79d"
 dependencies = [
  "darling",
  "proc-macro2",
@@ -2026,6 +2074,19 @@ dependencies = [
  "syn",
 ]
 
+[[package]]
+name = "serde_yaml"
+version = "0.9.34+deprecated"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6a8b1a1a2ebf674015cc02edccce75287f1a0130d394307b36743c2f5d504b47"
+dependencies = [
+ "indexmap 2.6.0",
+ "itoa",
+ "ryu",
+ "serde",
+ "unsafe-libyaml",
+]
+
 [[package]]
 name = "sharded-slab"
 version = "0.1.7"
@@ -2081,6 +2142,12 @@ dependencies = [
  "thread_local",
 ]
 
+[[package]]
+name = "streaming-iterator"
+version = "0.1.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2b2231b7c3057d5e4ad0156fb3dc807d900806020c5ffa3ee6ff2c8c76fb8520"
+
 [[package]]
 name = "strsim"
 version = "0.11.1"
@@ -2089,9 +2156,9 @@ checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f"
 
 [[package]]
 name = "syn"
-version = "2.0.77"
+version = "2.0.87"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
+checksum = "25aa4ce346d03a6dcd68dd8b4010bcb74e54e62c90c573f394c46eae99aba32d"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2126,18 +2193,18 @@ checksum = "f18aa187839b2bdb1ad2fa35ead8c4c2976b64e4363c386d45ac0f7ee85c9233"
 
 [[package]]
 name = "thiserror"
-version = "1.0.63"
+version = "1.0.69"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724"
+checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52"
 dependencies = [
  "thiserror-impl",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.63"
+version = "1.0.69"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261"
+checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2248,20 +2315,22 @@ dependencies = [
 
 [[package]]
 name = "tree-sitter"
-version = "0.23.0"
+version = "0.24.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "20f4cd3642c47a85052a887d86704f4eac272969f61b686bdd3f772122aabaff"
+checksum = "b67baf55e7e1b6806063b1e51041069c90afff16afcbbccd278d899f9d84bca4"
 dependencies = [
  "cc",
  "regex",
- "regex-syntax 0.8.4",
+ "regex-syntax 0.8.5",
+ "streaming-iterator",
  "tree-sitter-language",
 ]
 
 [[package]]
 name = "tree-sitter-embedded-template"
-version = "0.23.0"
-source = "git+https://github.com/tree-sitter/tree-sitter-embedded-template.git?rev=62b0a6e45900a7dff7c37da95fec20a09968ba52#62b0a6e45900a7dff7c37da95fec20a09968ba52"
+version = "0.23.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "790063ef14e5b67556abc0b3be0ed863fb41d65ee791cf8c0b20eb42a1fa46af"
 dependencies = [
  "cc",
  "tree-sitter-language",
@@ -2269,8 +2338,9 @@ dependencies = [
 
 [[package]]
 name = "tree-sitter-json"
-version = "0.23.0"
-source = "git+https://github.com/tree-sitter/tree-sitter-json#8bfdb43f47ad805bb1ce093203cfcbaa8ed2c571"
+version = "0.24.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4d727acca406c0020cffc6cf35516764f36c8e3dc4408e5ebe2cb35a947ec471"
 dependencies = [
  "cc",
  "tree-sitter-language",
@@ -2278,14 +2348,15 @@ dependencies = [
 
 [[package]]
 name = "tree-sitter-language"
-version = "0.1.0"
+version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2545046bd1473dac6c626659cc2567c6c0ff302fc8b84a56c4243378276f7f57"
+checksum = "e8ddffe35a0e5eeeadf13ff7350af564c6e73993a24db62caee1822b185c2600"
 
 [[package]]
 name = "tree-sitter-ql"
-version = "0.23.0"
-source = "git+https://github.com/tree-sitter/tree-sitter-ql#c73c31c89cb0019ef56fe8bc1723e7c36e0be607"
+version = "0.23.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "80b7bcaf39acefbb199417a6ec2fd0c038083ba115da3e4f4426c820dc76d386"
 dependencies = [
  "cc",
  "tree-sitter-language",
@@ -2293,8 +2364,9 @@ dependencies = [
 
 [[package]]
 name = "tree-sitter-ruby"
-version = "0.23.0"
-source = "git+https://github.com/tree-sitter/tree-sitter-ruby.git?rev=a66579f70d6f50ffd81a16fc3d3358e2ac173c88#a66579f70d6f50ffd81a16fc3d3358e2ac173c88"
+version = "0.23.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "be0484ea4ef6bb9c575b4fdabde7e31340a8d2dbc7d52b321ac83da703249f95"
 dependencies = [
  "cc",
  "tree-sitter-language",
@@ -2302,9 +2374,9 @@ dependencies = [
 
 [[package]]
 name = "triomphe"
-version = "0.1.13"
+version = "0.1.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6631e42e10b40c0690bf92f404ebcfe6e1fdb480391d15f17cc8e96eeed5369"
+checksum = "ef8f7726da4807b58ea5c96fdc122f80702030edc33b35aff9190a51148ccc85"
 dependencies = [
  "serde",
  "stable_deref_trait",
@@ -2325,6 +2397,12 @@ dependencies = [
  "version_check",
 ]
 
+[[package]]
+name = "ungrammar"
+version = "1.16.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a3e5df347f0bf3ec1d670aad6ca5c6a1859cd9ea61d2113125794654ccced68f"
+
 [[package]]
 name = "unicode-ident"
 version = "1.0.13"
@@ -2333,15 +2411,21 @@ checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe"
 
 [[package]]
 name = "unicode-properties"
-version = "0.1.2"
+version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "52ea75f83c0137a9b98608359a5f1af8144876eb67bcb1ce837368e906a9f524"
+checksum = "e70f2a8b45122e719eb623c01822704c4e0907e7e426a05927e1a1cfff5b75d0"
 
 [[package]]
 name = "unicode-xid"
-version = "0.2.5"
+version = "0.2.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "229730647fbc343e3a80e463c1db7f78f3855d3f3739bee0dda773c9a037c90a"
+checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853"
+
+[[package]]
+name = "unsafe-libyaml"
+version = "0.2.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "673aac59facbab8a9007c7f6108d11f63b603f7cabff99fabf650fea5c32b861"
 
 [[package]]
 name = "utf8parse"
@@ -2379,9 +2463,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
 
 [[package]]
 name = "wasm-bindgen"
-version = "0.2.93"
+version = "0.2.95"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a82edfc16a6c469f5f44dc7b571814045d60404b55a0ee849f9bcfa2e63dd9b5"
+checksum = "128d1e363af62632b8eb57219c8fd7877144af57558fb2ef0368d0087bddeb2e"
 dependencies = [
  "cfg-if",
  "once_cell",
@@ -2390,9 +2474,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-backend"
-version = "0.2.93"
+version = "0.2.95"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9de396da306523044d3302746f1208fa71d7532227f15e347e2d93e4145dd77b"
+checksum = "cb6dd4d3ca0ddffd1dd1c9c04f94b868c37ff5fac97c30b97cff2d74fce3a358"
 dependencies = [
  "bumpalo",
  "log",
@@ -2405,9 +2489,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.93"
+version = "0.2.95"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "585c4c91a46b072c92e908d99cb1dcdf95c5218eeb6f3bf1efa991ee7a68cccf"
+checksum = "e79384be7f8f5a9dd5d7167216f022090cf1f9ec128e6e6a482a2cb5c5422c56"
 dependencies = [
  "quote",
  "wasm-bindgen-macro-support",
@@ -2415,9 +2499,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.93"
+version = "0.2.95"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836"
+checksum = "26c6ab57572f7a24a4985830b120de1594465e5d500f24afe89e16b4e833ef68"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2428,9 +2512,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.93"
+version = "0.2.95"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484"
+checksum = "65fc09f10666a9f147042251e0dda9c18f166ff7de300607007e96bdebc1068d"
 
 [[package]]
 name = "winapi"
diff --git a/Cargo.toml b/Cargo.toml
index 4aacef79adc..b63e3971ee5 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -7,6 +7,7 @@ members = [
     "ruby/extractor",
     "rust/extractor",
     "rust/extractor/macros",
+    "rust/ast-generator",
 ]
 
 [patch.crates-io]
diff --git a/MODULE.bazel b/MODULE.bazel
index b539dee7874..13c801520b0 100644
--- a/MODULE.bazel
+++ b/MODULE.bazel
@@ -18,56 +18,60 @@ bazel_dep(name = "platforms", version = "0.0.10")
 bazel_dep(name = "rules_go", version = "0.50.0")
 bazel_dep(name = "rules_pkg", version = "1.0.1")
 bazel_dep(name = "rules_nodejs", version = "6.2.0-codeql.1")
-bazel_dep(name = "rules_python", version = "0.35.0")
-bazel_dep(name = "bazel_skylib", version = "1.6.1")
+bazel_dep(name = "rules_python", version = "0.36.0")
+bazel_dep(name = "bazel_skylib", version = "1.7.1")
 bazel_dep(name = "abseil-cpp", version = "20240116.0", repo_name = "absl")
 bazel_dep(name = "nlohmann_json", version = "3.11.3", repo_name = "json")
 bazel_dep(name = "fmt", version = "10.0.0")
-bazel_dep(name = "rules_kotlin", version = "1.9.4-codeql.1")
+bazel_dep(name = "rules_kotlin", version = "2.0.0-codeql.1")
 bazel_dep(name = "gazelle", version = "0.38.0")
-bazel_dep(name = "rules_dotnet", version = "0.15.1")
+bazel_dep(name = "rules_dotnet", version = "0.17.4")
 bazel_dep(name = "googletest", version = "1.14.0.bcr.1")
-bazel_dep(name = "rules_rust", version = "0.50.0")
+bazel_dep(name = "rules_rust", version = "0.52.2")
 
 bazel_dep(name = "buildifier_prebuilt", version = "6.4.0", dev_dependency = True)
 
-# crate_py but shortened due to Windows file path considerations
-cp = use_extension(
-    "@rules_rust//crate_universe:extension.bzl",
-    "crate",
-    isolate = True,
-)
-cp.from_cargo(
-    name = "py_deps",
-    cargo_lockfile = "//python/extractor/tsg-python:Cargo.lock",
-    manifests = [
-        "//python/extractor/tsg-python:Cargo.toml",
-        "//python/extractor/tsg-python/tsp:Cargo.toml",
-    ],
-)
-use_repo(cp, "py_deps")
+# Keep edition and version approximately in sync with internal repo.
+# the versions there are canonical, the versions here are used for CI in github/codeql, as well as for the vendoring of dependencies.
+RUST_EDITION = "2021"
 
-# deps for ruby+rust, but shortened due to windows file paths
-r = use_extension(
-    "@rules_rust//crate_universe:extension.bzl",
-    "crate",
-    isolate = True,
-)
-r.from_cargo(
-    name = "r",
-    cargo_lockfile = "//:Cargo.lock",
-    manifests = [
-        "//:Cargo.toml",
-        "//ruby/extractor:Cargo.toml",
-        "//rust/extractor:Cargo.toml",
-        "//rust/extractor/macros:Cargo.toml",
-        "//shared/tree-sitter-extractor:Cargo.toml",
+RUST_VERSION = "1.81.0"
+
+rust = use_extension("@rules_rust//rust:extensions.bzl", "rust")
+rust.toolchain(
+    edition = RUST_EDITION,
+    # We need those extra target triples so that we can build universal binaries on macos
+    extra_target_triples = [
+        "x86_64-apple-darwin",
+        "aarch64-apple-darwin",
     ],
+    versions = [RUST_VERSION],
 )
-use_repo(r, tree_sitter_extractors_deps = "r")
+use_repo(rust, "rust_toolchains")
+
+register_toolchains("@rust_toolchains//:all")
+
+rust_host_tools = use_extension("@rules_rust//rust:extensions.bzl", "rust_host_tools")
+
+# Don't download a second toolchain as host toolchain, make sure this is the same version as above
+# The host toolchain is used for vendoring dependencies.
+rust_host_tools.host_tools(
+    edition = RUST_EDITION,
+    version = RUST_VERSION,
+)
+
+# deps for python extractor
+# keep in sync by running `misc/bazel/3rdparty/update_cargo_deps.sh`
+py_deps = use_extension("//misc/bazel/3rdparty:py_deps_extension.bzl", "p")
+use_repo(py_deps, "vendor__anyhow-1.0.44", "vendor__cc-1.0.70", "vendor__clap-2.33.3", "vendor__regex-1.5.5", "vendor__smallvec-1.6.1", "vendor__string-interner-0.12.2", "vendor__thiserror-1.0.29", "vendor__tree-sitter-0.20.4", "vendor__tree-sitter-graph-0.7.0")
+
+# deps for ruby+rust
+# keep in sync by running `misc/bazel/3rdparty/update_cargo_deps.sh`
+tree_sitter_extractors_deps = use_extension("//misc/bazel/3rdparty:tree_sitter_extractors_extension.bzl", "r")
+use_repo(tree_sitter_extractors_deps, "vendor__anyhow-1.0.93", "vendor__argfile-0.2.1", "vendor__chrono-0.4.38", "vendor__clap-4.5.20", "vendor__encoding-0.2.33", "vendor__figment-0.10.19", "vendor__flate2-1.0.34", "vendor__glob-0.3.1", "vendor__globset-0.4.15", "vendor__itertools-0.10.5", "vendor__itertools-0.13.0", "vendor__lazy_static-1.5.0", "vendor__log-0.4.22", "vendor__num-traits-0.2.19", "vendor__num_cpus-1.16.0", "vendor__proc-macro2-1.0.89", "vendor__quote-1.0.37", "vendor__ra_ap_base_db-0.0.232", "vendor__ra_ap_cfg-0.0.232", "vendor__ra_ap_hir-0.0.232", "vendor__ra_ap_hir_def-0.0.232", "vendor__ra_ap_hir_expand-0.0.232", "vendor__ra_ap_ide_db-0.0.232", "vendor__ra_ap_intern-0.0.232", "vendor__ra_ap_load-cargo-0.0.232", "vendor__ra_ap_parser-0.0.232", "vendor__ra_ap_paths-0.0.232", "vendor__ra_ap_project_model-0.0.232", "vendor__ra_ap_span-0.0.232", "vendor__ra_ap_syntax-0.0.232", "vendor__ra_ap_vfs-0.0.232", "vendor__rand-0.8.5", "vendor__rayon-1.10.0", "vendor__regex-1.11.1", "vendor__serde-1.0.214", "vendor__serde_json-1.0.132", "vendor__serde_with-3.11.0", "vendor__stderrlog-0.6.0", "vendor__syn-2.0.87", "vendor__tracing-0.1.40", "vendor__tracing-subscriber-0.3.18", "vendor__tree-sitter-0.24.4", "vendor__tree-sitter-embedded-template-0.23.2", "vendor__tree-sitter-json-0.24.8", "vendor__tree-sitter-ql-0.23.1", "vendor__tree-sitter-ruby-0.23.1", "vendor__triomphe-0.1.14", "vendor__ungrammar-1.16.1")
 
 dotnet = use_extension("@rules_dotnet//dotnet:extensions.bzl", "dotnet")
-dotnet.toolchain(dotnet_version = "8.0.101")
+dotnet.toolchain(dotnet_version = "9.0.100")
 use_repo(dotnet, "dotnet_toolchains")
 
 register_toolchains("@dotnet_toolchains//:all")
@@ -127,6 +131,7 @@ use_repo(
     "kotlin-compiler-1.9.20-Beta",
     "kotlin-compiler-2.0.0-RC1",
     "kotlin-compiler-2.0.20-Beta2",
+    "kotlin-compiler-2.1.0-Beta1",
     "kotlin-compiler-embeddable-1.5.0",
     "kotlin-compiler-embeddable-1.5.10",
     "kotlin-compiler-embeddable-1.5.20",
@@ -140,6 +145,7 @@ use_repo(
     "kotlin-compiler-embeddable-1.9.20-Beta",
     "kotlin-compiler-embeddable-2.0.0-RC1",
     "kotlin-compiler-embeddable-2.0.20-Beta2",
+    "kotlin-compiler-embeddable-2.1.0-Beta1",
     "kotlin-stdlib-1.5.0",
     "kotlin-stdlib-1.5.10",
     "kotlin-stdlib-1.5.20",
@@ -153,6 +159,7 @@ use_repo(
     "kotlin-stdlib-1.9.20-Beta",
     "kotlin-stdlib-2.0.0-RC1",
     "kotlin-stdlib-2.0.20-Beta2",
+    "kotlin-stdlib-2.1.0-Beta1",
 )
 
 go_sdk = use_extension("@rules_go//go:extensions.bzl", "go_sdk")
diff --git a/WORKSPACE.bazel b/WORKSPACE.bazel
deleted file mode 100644
index 3f7ecf16770..00000000000
--- a/WORKSPACE.bazel
+++ /dev/null
@@ -1,2 +0,0 @@
-# please use MODULE.bazel to add dependencies
-# this empty file is required by internal repositories, don't remove it
diff --git a/actions/BUILD.bazel b/actions/BUILD.bazel
new file mode 100644
index 00000000000..b1af486543c
--- /dev/null
+++ b/actions/BUILD.bazel
@@ -0,0 +1,9 @@
+load("//misc/bazel:pkg.bzl", "codeql_pack")
+
+package(default_visibility = ["//visibility:public"])
+
+codeql_pack(
+    name = "actions",
+    srcs = ["//actions/extractor"],
+    experimental = True,
+)
diff --git a/actions/extractor/BUILD.bazel b/actions/extractor/BUILD.bazel
new file mode 100644
index 00000000000..e6780e10db2
--- /dev/null
+++ b/actions/extractor/BUILD.bazel
@@ -0,0 +1,10 @@
+load("//misc/bazel:pkg.bzl", "codeql_pkg_files", "strip_prefix")
+
+codeql_pkg_files(
+    name = "extractor",
+    srcs = [
+        "codeql-extractor.yml",
+    ] + glob(["tools/**"]),
+    strip_prefix = strip_prefix.from_pkg(),
+    visibility = ["//actions:__pkg__"],
+)
diff --git a/actions/extractor/codeql-extractor.yml b/actions/extractor/codeql-extractor.yml
new file mode 100644
index 00000000000..ab737491005
--- /dev/null
+++ b/actions/extractor/codeql-extractor.yml
@@ -0,0 +1,44 @@
+name: "actions"
+aliases: []
+display_name: "GitHub Actions"
+version: 0.0.1
+column_kind: "utf16"
+unicode_newlines: true
+build_modes:
+  - none
+file_coverage_languages: []
+github_api_languages: []
+scc_languages: []
+file_types:
+  - name: workflow
+    display_name: GitHub Actions workflow files
+    extensions:
+      - .yml
+      - .yaml
+forwarded_extractor_name: javascript
+options:
+  trap:
+    title: TRAP options
+    description: Options about how the extractor handles TRAP files
+    type: object
+    visibility: 3
+    properties:
+      cache:
+        title: TRAP cache options
+        description: Options about how the extractor handles its TRAP cache
+        type: object
+        properties:
+          dir:
+            title: TRAP cache directory
+            description: The directory of the TRAP cache to use
+            type: string
+          bound:
+            title: TRAP cache bound
+            description: A soft limit (in MB) on the size of the TRAP cache
+            type: string
+            pattern: "[0-9]+"
+          write:
+            title: TRAP cache writeable
+            description: Whether to write to the TRAP cache as well as reading it
+            type: string
+            pattern: "(true|TRUE|false|FALSE)"
diff --git a/actions/extractor/tools/autobuild-impl.ps1 b/actions/extractor/tools/autobuild-impl.ps1
new file mode 100644
index 00000000000..6ae433f2599
--- /dev/null
+++ b/actions/extractor/tools/autobuild-impl.ps1
@@ -0,0 +1,40 @@
+if (($null -ne $env:LGTM_INDEX_INCLUDE) -or ($null -ne $env:LGTM_INDEX_EXCLUDE) -or ($null -ne $env:LGTM_INDEX_FILTERS)) {
+    Write-Output 'Path filters set. Passing them through to the JavaScript extractor.' 
+} else {
+    Write-Output 'No path filters set. Using the default filters.'
+    $DefaultPathFilters = @(
+        'exclude:**/*',
+        'include:.github/workflows/**/*.yml',
+        'include:.github/workflows/**/*.yaml',
+        'include:**/action.yml',
+        'include:**/action.yaml'
+    )
+
+    $env:LGTM_INDEX_FILTERS = $DefaultPathFilters -join "`n"
+}
+
+# Find the JavaScript extractor directory via `codeql resolve extractor`.
+$CodeQL = Join-Path $env:CODEQL_DIST 'codeql.exe'
+$env:CODEQL_EXTRACTOR_JAVASCRIPT_ROOT = &$CodeQL resolve extractor --language javascript
+if ($LASTEXITCODE -ne 0) {
+    throw 'Failed to resolve JavaScript extractor.'
+}
+
+Write-Output "Found JavaScript extractor at '${env:CODEQL_EXTRACTOR_JAVASCRIPT_ROOT}'."
+
+# Run the JavaScript autobuilder.
+$JavaScriptAutoBuild = Join-Path $env:CODEQL_EXTRACTOR_JAVASCRIPT_ROOT 'tools\autobuild.cmd'
+Write-Output "Running JavaScript autobuilder at '${JavaScriptAutoBuild}'."
+
+# Copy the values of the Actions extractor environment variables to the JavaScript extractor environment variables.
+$env:CODEQL_EXTRACTOR_JAVASCRIPT_DIAGNOSTIC_DIR = $env:CODEQL_EXTRACTOR_ACTIONS_DIAGNOSTIC_DIR
+$env:CODEQL_EXTRACTOR_JAVASCRIPT_LOG_DIR = $env:CODEQL_EXTRACTOR_ACTIONS_LOG_DIR
+$env:CODEQL_EXTRACTOR_JAVASCRIPT_SCRATCH_DIR = $env:CODEQL_EXTRACTOR_ACTIONS_SCRATCH_DIR
+$env:CODEQL_EXTRACTOR_JAVASCRIPT_SOURCE_ARCHIVE_DIR = $env:CODEQL_EXTRACTOR_ACTIONS_SOURCE_ARCHIVE_DIR
+$env:CODEQL_EXTRACTOR_JAVASCRIPT_TRAP_DIR = $env:CODEQL_EXTRACTOR_ACTIONS_TRAP_DIR
+$env:CODEQL_EXTRACTOR_JAVASCRIPT_WIP_DATABASE = $env:CODEQL_EXTRACTOR_ACTIONS_WIP_DATABASE
+
+&$JavaScriptAutoBuild
+if ($LASTEXITCODE -ne 0) {
+    throw "JavaScript autobuilder failed."
+}
diff --git a/actions/extractor/tools/autobuild.cmd b/actions/extractor/tools/autobuild.cmd
new file mode 100644
index 00000000000..ff5ca89d94a
--- /dev/null
+++ b/actions/extractor/tools/autobuild.cmd
@@ -0,0 +1,3 @@
+@echo off
+rem All of the work is done in the PowerShell script
+powershell.exe %~dp0autobuild-impl.ps1
diff --git a/actions/extractor/tools/autobuild.sh b/actions/extractor/tools/autobuild.sh
new file mode 100755
index 00000000000..57adbf96279
--- /dev/null
+++ b/actions/extractor/tools/autobuild.sh
@@ -0,0 +1,39 @@
+#!/bin/sh
+
+set -eu
+
+DEFAULT_PATH_FILTERS=$(cat << END
+exclude:**/*
+include:.github/workflows/**/*.yml
+include:.github/workflows/**/*.yaml
+include:**/action.yml
+include:**/action.yaml
+END
+)
+
+if [ -n "${LGTM_INDEX_INCLUDE:-}" ] || [ -n "${LGTM_INDEX_EXCLUDE:-}" ] || [ -n "${LGTM_INDEX_FILTERS:-}" ] ; then
+    echo "Path filters set. Passing them through to the JavaScript extractor."
+else
+    echo "No path filters set. Using the default filters."
+    LGTM_INDEX_FILTERS="${DEFAULT_PATH_FILTERS}"
+    export LGTM_INDEX_FILTERS
+fi
+
+# Find the JavaScript extractor directory via `codeql resolve extractor`.
+CODEQL_EXTRACTOR_JAVASCRIPT_ROOT="$($CODEQL_DIST/codeql resolve extractor --language javascript)"
+export CODEQL_EXTRACTOR_JAVASCRIPT_ROOT
+
+echo "Found JavaScript extractor at '${CODEQL_EXTRACTOR_JAVASCRIPT_ROOT}'."
+
+# Run the JavaScript autobuilder
+JAVASCRIPT_AUTO_BUILD="${CODEQL_EXTRACTOR_JAVASCRIPT_ROOT}/tools/autobuild.sh"
+echo "Running JavaScript autobuilder at '${JAVASCRIPT_AUTO_BUILD}'."
+
+# Copy the values of the Actions extractor environment variables to the JavaScript extractor environment variables.
+env CODEQL_EXTRACTOR_JAVASCRIPT_DIAGNOSTIC_DIR="${CODEQL_EXTRACTOR_ACTIONS_DIAGNOSTIC_DIR}" \
+    CODEQL_EXTRACTOR_JAVASCRIPT_LOG_DIR="${CODEQL_EXTRACTOR_ACTIONS_LOG_DIR}" \
+    CODEQL_EXTRACTOR_JAVASCRIPT_SCRATCH_DIR="${CODEQL_EXTRACTOR_ACTIONS_SCRATCH_DIR}" \
+    CODEQL_EXTRACTOR_JAVASCRIPT_SOURCE_ARCHIVE_DIR="${CODEQL_EXTRACTOR_ACTIONS_SOURCE_ARCHIVE_DIR}" \
+    CODEQL_EXTRACTOR_JAVASCRIPT_TRAP_DIR="${CODEQL_EXTRACTOR_ACTIONS_TRAP_DIR}" \
+    CODEQL_EXTRACTOR_JAVASCRIPT_WIP_DATABASE="${CODEQL_EXTRACTOR_ACTIONS_WIP_DATABASE}" \
+    ${JAVASCRIPT_AUTO_BUILD}
diff --git a/actions/ql/lib/actions.qll b/actions/ql/lib/actions.qll
new file mode 100644
index 00000000000..073277dcace
--- /dev/null
+++ b/actions/ql/lib/actions.qll
@@ -0,0 +1 @@
+predicate placeholder(int x) { x = 0 }
diff --git a/actions/ql/lib/qlpack.yml b/actions/ql/lib/qlpack.yml
new file mode 100644
index 00000000000..4f674220c88
--- /dev/null
+++ b/actions/ql/lib/qlpack.yml
@@ -0,0 +1,12 @@
+name: codeql/actions-all
+version: 0.0.1-dev
+library: true
+warnOnImplicitThis: true
+dependencies:
+  codeql/util: ${workspace}
+  codeql/yaml: ${workspace}
+  codeql/controlflow: ${workspace}
+  codeql/dataflow: ${workspace}
+  codeql/javascript-all: ${workspace}
+extractor: actions
+groups: actions
diff --git a/actions/ql/src/Placeholder.ql b/actions/ql/src/Placeholder.ql
new file mode 100644
index 00000000000..63e32f04dfb
--- /dev/null
+++ b/actions/ql/src/Placeholder.ql
@@ -0,0 +1,16 @@
+/**
+ * @name Placeholder Query
+ * @description Placeholder
+ * @kind problem
+ * @problem.severity warning
+ * @security-severity 9.3
+ * @precision high
+ * @id actions/placeholder
+ * @tags actions security
+ */
+
+import actions
+import javascript
+
+from File f
+select f, "Analyzed a file."
diff --git a/actions/ql/src/qlpack.yml b/actions/ql/src/qlpack.yml
new file mode 100644
index 00000000000..0cede827207
--- /dev/null
+++ b/actions/ql/src/qlpack.yml
@@ -0,0 +1,8 @@
+name: codeql/actions-queries
+version: 0.0.1-dev
+library: false
+groups: [actions, queries]
+extractor: actions
+dependencies:
+  codeql/actions-all: ${workspace}
+warnOnImplicitThis: true
diff --git a/actions/ql/test/library-tests/.github/workflows/shell.yml b/actions/ql/test/library-tests/.github/workflows/shell.yml
new file mode 100644
index 00000000000..9392b81c6ab
--- /dev/null
+++ b/actions/ql/test/library-tests/.github/workflows/shell.yml
@@ -0,0 +1,23 @@
+on: push
+
+jobs:
+  job1:
+    runs-on: ubuntu-latest
+    steps:
+      - shell: pwsh
+        run: Write-Output "foo"
+  job2:
+    runs-on: ubuntu-latest
+    steps:
+      - run: echo "foo"
+
+  job3:
+    runs-on: windows-latest
+    steps:
+      - shell: bash
+        run: echo "foo"
+  job4:
+    runs-on: windows-latest
+    steps:
+      - run: Write-Output "foo"
+
diff --git a/actions/ql/test/library-tests/Placeholder.expected b/actions/ql/test/library-tests/Placeholder.expected
new file mode 100644
index 00000000000..2a4f078a25f
--- /dev/null
+++ b/actions/ql/test/library-tests/Placeholder.expected
@@ -0,0 +1 @@
+| 1 |
diff --git a/actions/ql/test/library-tests/Placeholder.ql b/actions/ql/test/library-tests/Placeholder.ql
new file mode 100644
index 00000000000..82198eaf87b
--- /dev/null
+++ b/actions/ql/test/library-tests/Placeholder.ql
@@ -0,0 +1 @@
+select 1
diff --git a/actions/ql/test/qlpack.yml b/actions/ql/test/qlpack.yml
new file mode 100644
index 00000000000..12711bee904
--- /dev/null
+++ b/actions/ql/test/qlpack.yml
@@ -0,0 +1,8 @@
+name: codeql/actions-tests
+groups: [codeql, test]
+dependencies:
+  codeql/actions-all: ${workspace}
+  codeql/actions-queries: ${workspace}
+extractor: actions
+tests: .
+warnOnImplicitThis: true
diff --git a/actions/ql/test/query-tests/Placeholder/.github/workflows/shell.yml b/actions/ql/test/query-tests/Placeholder/.github/workflows/shell.yml
new file mode 100644
index 00000000000..9392b81c6ab
--- /dev/null
+++ b/actions/ql/test/query-tests/Placeholder/.github/workflows/shell.yml
@@ -0,0 +1,23 @@
+on: push
+
+jobs:
+  job1:
+    runs-on: ubuntu-latest
+    steps:
+      - shell: pwsh
+        run: Write-Output "foo"
+  job2:
+    runs-on: ubuntu-latest
+    steps:
+      - run: echo "foo"
+
+  job3:
+    runs-on: windows-latest
+    steps:
+      - shell: bash
+        run: echo "foo"
+  job4:
+    runs-on: windows-latest
+    steps:
+      - run: Write-Output "foo"
+
diff --git a/actions/ql/test/query-tests/Placeholder/Placeholder.expected b/actions/ql/test/query-tests/Placeholder/Placeholder.expected
new file mode 100644
index 00000000000..82fd180be66
--- /dev/null
+++ b/actions/ql/test/query-tests/Placeholder/Placeholder.expected
@@ -0,0 +1 @@
+| .github/workflows/shell.yml:0:0:0:0 | .github/workflows/shell.yml | Analyzed a file. |
diff --git a/actions/ql/test/query-tests/Placeholder/Placeholder.qlref b/actions/ql/test/query-tests/Placeholder/Placeholder.qlref
new file mode 100644
index 00000000000..2ad15e688e2
--- /dev/null
+++ b/actions/ql/test/query-tests/Placeholder/Placeholder.qlref
@@ -0,0 +1 @@
+Placeholder.ql
diff --git a/config/identical-files.json b/config/identical-files.json
index d14052c12d8..c4436872b9a 100644
--- a/config/identical-files.json
+++ b/config/identical-files.json
@@ -57,10 +57,6 @@
     "java/ql/lib/semmle/code/java/dataflow/internal/rangeanalysis/SsaReadPositionCommon.qll",
     "csharp/ql/lib/semmle/code/csharp/dataflow/internal/rangeanalysis/SsaReadPositionCommon.qll"
   ],
-  "Model as Data Generation Java/C# - CaptureModels": [
-    "java/ql/src/utils/modelgenerator/internal/CaptureModels.qll",
-    "csharp/ql/src/utils/modelgenerator/internal/CaptureModels.qll"
-  ],
   "Sign Java/C#": [
     "java/ql/lib/semmle/code/java/dataflow/internal/rangeanalysis/Sign.qll",
     "csharp/ql/lib/semmle/code/csharp/dataflow/internal/rangeanalysis/Sign.qll"
diff --git a/cpp/downgrades/6f5d51e89e762fe4609fd4ac8ee3afb04221e873/exprs.ql b/cpp/downgrades/6f5d51e89e762fe4609fd4ac8ee3afb04221e873/exprs.ql
new file mode 100644
index 00000000000..5c335c836fb
--- /dev/null
+++ b/cpp/downgrades/6f5d51e89e762fe4609fd4ac8ee3afb04221e873/exprs.ql
@@ -0,0 +1,15 @@
+class Expr extends @expr {
+  string toString() { none() }
+}
+
+class Location extends @location_expr {
+  string toString() { none() }
+}
+
+predicate isExprRequires(Expr expr) { exists(int kind | exprs(expr, kind, _) | kind = 390) }
+
+from Expr expr, int kind, int kind_new, Location location
+where
+  exprs(expr, kind, location) and
+  if isExprRequires(expr) then kind_new = 1 else kind_new = kind
+select expr, kind_new, location
diff --git a/cpp/downgrades/6f5d51e89e762fe4609fd4ac8ee3afb04221e873/old.dbscheme b/cpp/downgrades/6f5d51e89e762fe4609fd4ac8ee3afb04221e873/old.dbscheme
new file mode 100644
index 00000000000..6f5d51e89e7
--- /dev/null
+++ b/cpp/downgrades/6f5d51e89e762fe4609fd4ac8ee3afb04221e873/old.dbscheme
@@ -0,0 +1,2316 @@
+
+/**
+ * An invocation of the compiler. Note that more than one file may be
+ * compiled per invocation. For example, this command compiles three
+ * source files:
+ *
+ *   gcc -c f1.c f2.c f3.c
+ *
+ * The `id` simply identifies the invocation, while `cwd` is the working
+ * directory from which the compiler was invoked.
+ */
+compilations(
+    /**
+     * An invocation of the compiler. Note that more than one file may
+     * be compiled per invocation. For example, this command compiles
+     * three source files:
+     *
+     *   gcc -c f1.c f2.c f3.c
+     */
+    unique int id : @compilation,
+    string cwd : string ref
+);
+
+/**
+ * The arguments that were passed to the extractor for a compiler
+ * invocation. If `id` is for the compiler invocation
+ *
+ *   gcc -c f1.c f2.c f3.c
+ *
+ * then typically there will be rows for
+ *
+ * num | arg
+ * --- | ---
+ * 0   | *path to extractor*
+ * 1   | `--mimic`
+ * 2   | `/usr/bin/gcc`
+ * 3   | `-c`
+ * 4   | f1.c
+ * 5   | f2.c
+ * 6   | f3.c
+ */
+#keyset[id, num]
+compilation_args(
+    int id : @compilation ref,
+    int num : int ref,
+    string arg : string ref
+);
+
+/**
+ * The source files that are compiled by a compiler invocation.
+ * If `id` is for the compiler invocation
+ *
+ *   gcc -c f1.c f2.c f3.c
+ *
+ * then there will be rows for
+ *
+ * num | arg
+ * --- | ---
+ * 0   | f1.c
+ * 1   | f2.c
+ * 2   | f3.c
+ *
+ * Note that even if those files `#include` headers, those headers
+ * do not appear as rows.
+ */
+#keyset[id, num]
+compilation_compiling_files(
+    int id : @compilation ref,
+    int num : int ref,
+    int file : @file ref
+);
+
+/**
+ * The time taken by the extractor for a compiler invocation.
+ *
+ * For each file `num`, there will be rows for
+ *
+ * kind | seconds
+ * ---- | ---
+ * 1    | CPU seconds used by the extractor frontend
+ * 2    | Elapsed seconds during the extractor frontend
+ * 3    | CPU seconds used by the extractor backend
+ * 4    | Elapsed seconds during the extractor backend
+ */
+#keyset[id, num, kind]
+compilation_time(
+    int id : @compilation ref,
+    int num : int ref,
+    /* kind:
+       1 = frontend_cpu_seconds
+       2 = frontend_elapsed_seconds
+       3 = extractor_cpu_seconds
+       4 = extractor_elapsed_seconds
+    */
+    int kind : int ref,
+    float seconds : float ref
+);
+
+/**
+ * An error or warning generated by the extractor.
+ * The diagnostic message `diagnostic` was generated during compiler
+ * invocation `compilation`, and is the `file_number_diagnostic_number`th
+ * message generated while extracting the `file_number`th file of that
+ * invocation.
+ */
+#keyset[compilation, file_number, file_number_diagnostic_number]
+diagnostic_for(
+    int diagnostic : @diagnostic ref,
+    int compilation : @compilation ref,
+    int file_number : int ref,
+    int file_number_diagnostic_number : int ref
+);
+
+/**
+ * If extraction was successful, then `cpu_seconds` and
+ * `elapsed_seconds` are the CPU time and elapsed time (respectively)
+ * that extraction took for compiler invocation `id`.
+ */
+compilation_finished(
+    unique int id : @compilation ref,
+    float cpu_seconds : float ref,
+    float elapsed_seconds : float ref
+);
+
+
+/**
+ * External data, loaded from CSV files during snapshot creation. See
+ * [Tutorial: Incorporating external data](https://help.semmle.com/wiki/display/SD/Tutorial%3A+Incorporating+external+data)
+ * for more information.
+ */
+externalData(
+    int id : @externalDataElement,
+    string path : string ref,
+    int column: int ref,
+    string value : string ref
+);
+
+/**
+ * The source location of the snapshot.
+ */
+sourceLocationPrefix(string prefix : string ref);
+
+/**
+ * Information about packages that provide code used during compilation.
+ * The `id` is just a unique identifier.
+ * The `namespace` is typically the name of the package manager that
+ * provided the package (e.g. "dpkg" or "yum").
+ * The `package_name` is the name of the package, and `version` is its
+ * version (as a string).
+ */
+external_packages(
+    unique int id: @external_package,
+    string namespace : string ref,
+    string package_name : string ref,
+    string version : string ref
+);
+
+/**
+ * Holds if File `fileid` was provided by package `package`.
+ */
+header_to_external_package(
+    int fileid : @file ref,
+    int package : @external_package ref
+);
+
+/*
+ * Version history
+ */
+
+svnentries(
+    unique int id : @svnentry,
+    string revision : string ref,
+    string author : string ref,
+    date revisionDate : date ref,
+    int changeSize : int ref
+)
+
+svnaffectedfiles(
+    int id : @svnentry ref,
+    int file : @file ref,
+    string action : string ref
+)
+
+svnentrymsg(
+    unique int id : @svnentry ref,
+    string message : string ref
+)
+
+svnchurn(
+    int commit : @svnentry ref,
+    int file : @file ref,
+    int addedLines : int ref,
+    int deletedLines : int ref
+)
+
+/*
+ * C++ dbscheme
+ */
+
+extractor_version(
+    string codeql_version: string ref,
+    string frontend_version: string ref
+)
+
+@location = @location_stmt | @location_expr | @location_default ;
+
+/**
+ * The location of an element that is not an expression or a statement.
+ * The location spans column `startcolumn` of line `startline` to
+ * column `endcolumn` of line `endline` in file `file`.
+ * For more information, see
+ * [Locations](https://codeql.github.com/docs/writing-codeql-queries/providing-locations-in-codeql-queries/).
+ */
+locations_default(
+    /** The location of an element that is not an expression or a statement. */
+    unique int id: @location_default,
+    int container: @container ref,
+    int startLine: int ref,
+    int startColumn: int ref,
+    int endLine: int ref,
+    int endColumn: int ref
+);
+
+/**
+ * The location of a statement.
+ * The location spans column `startcolumn` of line `startline` to
+ * column `endcolumn` of line `endline` in file `file`.
+ * For more information, see
+ * [Locations](https://codeql.github.com/docs/writing-codeql-queries/providing-locations-in-codeql-queries/).
+ */
+locations_stmt(
+    /** The location of a statement. */
+    unique int id: @location_stmt,
+    int container: @container ref,
+    int startLine: int ref,
+    int startColumn: int ref,
+    int endLine: int ref,
+    int endColumn: int ref
+);
+
+/**
+ * The location of an expression.
+ * The location spans column `startcolumn` of line `startline` to
+ * column `endcolumn` of line `endline` in file `file`.
+ * For more information, see
+ * [Locations](https://codeql.github.com/docs/writing-codeql-queries/providing-locations-in-codeql-queries/).
+ */
+locations_expr(
+    /** The location of an expression. */
+    unique int id: @location_expr,
+    int container: @container ref,
+    int startLine: int ref,
+    int startColumn: int ref,
+    int endLine: int ref,
+    int endColumn: int ref
+);
+
+/** An element for which line-count information is available. */
+@sourceline = @file | @function | @variable | @enumconstant | @xmllocatable;
+
+numlines(
+    int element_id: @sourceline ref,
+    int num_lines: int ref,
+    int num_code: int ref,
+    int num_comment: int ref
+);
+
+diagnostics(
+    unique int id: @diagnostic,
+    int severity: int ref,
+    string error_tag: string ref,
+    string error_message: string ref,
+    string full_error_message: string ref,
+    int location: @location_default ref
+);
+
+files(
+    unique int id: @file,
+    string name: string ref
+);
+
+folders(
+    unique int id: @folder,
+    string name: string ref
+);
+
+@container = @folder | @file
+
+containerparent(
+    int parent: @container ref,
+    unique int child: @container ref
+);
+
+fileannotations(
+    int id: @file ref,
+    int kind: int ref,
+    string name: string ref,
+    string value: string ref
+);
+
+inmacroexpansion(
+    int id: @element ref,
+    int inv: @macroinvocation ref
+);
+
+affectedbymacroexpansion(
+    int id: @element ref,
+    int inv: @macroinvocation ref
+);
+
+case @macroinvocation.kind of
+  1 = @macro_expansion
+| 2 = @other_macro_reference
+;
+
+macroinvocations(
+    unique int id: @macroinvocation,
+    int macro_id: @ppd_define ref,
+    int location: @location_default ref,
+    int kind: int ref
+);
+
+macroparent(
+    unique int id: @macroinvocation ref,
+    int parent_id: @macroinvocation ref
+);
+
+// a macroinvocation may be part of another location
+// the way to find a constant expression that uses a macro
+// is thus to find a constant expression that has a location
+// to which a macro invocation is bound
+macrolocationbind(
+    int id: @macroinvocation ref,
+    int location: @location ref
+);
+
+#keyset[invocation, argument_index]
+macro_argument_unexpanded(
+    int invocation: @macroinvocation ref,
+    int argument_index: int ref,
+    string text: string ref
+);
+
+#keyset[invocation, argument_index]
+macro_argument_expanded(
+    int invocation: @macroinvocation ref,
+    int argument_index: int ref,
+    string text: string ref
+);
+
+/*
+case @function.kind of
+  1 = @normal_function
+| 2 = @constructor
+| 3 = @destructor
+| 4 = @conversion_function
+| 5 = @operator
+| 6 = @builtin_function     // GCC built-in functions, e.g. __builtin___memcpy_chk
+| 7 = @user_defined_literal
+| 8 = @deduction_guide
+;
+*/
+
+functions(
+    unique int id: @function,
+    string name: string ref,
+    int kind: int ref
+);
+
+function_entry_point(
+    int id: @function ref,
+    unique int entry_point: @stmt ref
+);
+
+function_return_type(
+    int id: @function ref,
+    int return_type: @type ref
+);
+
+/**
+ * If `function` is a coroutine, then this gives the `std::experimental::resumable_traits`
+ * instance associated with it, and the variables representing the `handle` and `promise`
+ * for it.
+ */
+coroutine(
+  unique int function: @function ref,
+  int traits: @type ref
+);
+
+/*
+case @coroutine_placeholder_variable.kind of
+  1 = @handle
+| 2 = @promise
+| 3 = @init_await_resume
+;
+*/
+
+coroutine_placeholder_variable(
+  unique int placeholder_variable: @variable ref,
+  int kind: int ref,
+  int function: @function ref
+)
+
+/** The `new` function used for allocating the coroutine state, if any. */
+coroutine_new(
+  unique int function: @function ref,
+  int new: @function ref
+);
+
+/** The `delete` function used for deallocating the coroutine state, if any. */
+coroutine_delete(
+  unique int function: @function ref,
+  int delete: @function ref
+);
+
+purefunctions(unique int id: @function ref);
+
+function_deleted(unique int id: @function ref);
+
+function_defaulted(unique int id: @function ref);
+
+function_prototyped(unique int id: @function ref)
+
+deduction_guide_for_class(
+    int id: @function ref,
+    int class_template: @usertype ref
+)
+
+member_function_this_type(
+    unique int id: @function ref,
+    int this_type: @type ref
+);
+
+#keyset[id, type_id]
+fun_decls(
+    int id: @fun_decl,
+    int function: @function ref,
+    int type_id: @type ref,
+    string name: string ref,
+    int location: @location_default ref
+);
+fun_def(unique int id: @fun_decl ref);
+fun_specialized(unique int id: @fun_decl ref);
+fun_implicit(unique int id: @fun_decl ref);
+fun_decl_specifiers(
+    int id: @fun_decl ref,
+    string name: string ref
+)
+#keyset[fun_decl, index]
+fun_decl_throws(
+    int fun_decl: @fun_decl ref,
+    int index: int ref,
+    int type_id: @type ref
+);
+/* an empty throw specification is different from none */
+fun_decl_empty_throws(unique int fun_decl: @fun_decl ref);
+fun_decl_noexcept(
+    int fun_decl: @fun_decl ref,
+    int constant: @expr ref
+);
+fun_decl_empty_noexcept(int fun_decl: @fun_decl ref);
+fun_decl_typedef_type(
+    unique int fun_decl: @fun_decl ref,
+    int typedeftype_id: @usertype ref
+);
+
+param_decl_bind(
+    unique int id: @var_decl ref,
+    int index: int ref,
+    int fun_decl: @fun_decl ref
+);
+
+#keyset[id, type_id]
+var_decls(
+    int id: @var_decl,
+    int variable: @variable ref,
+    int type_id: @type ref,
+    string name: string ref,
+    int location: @location_default ref
+);
+var_def(unique int id: @var_decl ref);
+var_decl_specifiers(
+    int id: @var_decl ref,
+    string name: string ref
+)
+is_structured_binding(unique int id: @variable ref);
+
+type_decls(
+    unique int id: @type_decl,
+    int type_id: @type ref,
+    int location: @location_default ref
+);
+type_def(unique int id: @type_decl ref);
+type_decl_top(
+    unique int type_decl: @type_decl ref
+);
+
+namespace_decls(
+    unique int id: @namespace_decl,
+    int namespace_id: @namespace ref,
+    int location: @location_default ref,
+    int bodylocation: @location_default ref
+);
+
+case @using.kind of
+  1 = @using_declaration
+| 2 = @using_directive
+| 3 = @using_enum_declaration
+;
+
+usings(
+    unique int id: @using,
+    int element_id: @element ref,
+    int location: @location_default ref,
+    int kind: int ref
+);
+
+/** The element which contains the `using` declaration. */
+using_container(
+    int parent: @element ref,
+    int child: @using ref
+);
+
+static_asserts(
+    unique int id: @static_assert,
+    int condition : @expr ref,
+    string message : string ref,
+    int location: @location_default ref,
+    int enclosing : @element ref
+);
+
+// each function has an ordered list of parameters
+#keyset[id, type_id]
+#keyset[function, index, type_id]
+params(
+    int id: @parameter,
+    int function: @functionorblock ref,
+    int index: int ref,
+    int type_id: @type ref
+);
+
+overrides(
+    int new: @function ref,
+    int old: @function ref
+);
+
+#keyset[id, type_id]
+membervariables(
+    int id: @membervariable,
+    int type_id: @type ref,
+    string name: string ref
+);
+
+#keyset[id, type_id]
+globalvariables(
+    int id: @globalvariable,
+    int type_id: @type ref,
+    string name: string ref
+);
+
+#keyset[id, type_id]
+localvariables(
+    int id: @localvariable,
+    int type_id: @type ref,
+    string name: string ref
+);
+
+autoderivation(
+    unique int var: @variable ref,
+    int derivation_type: @type ref
+);
+
+orphaned_variables(
+    int var: @localvariable ref,
+    int function: @function ref
+)
+
+enumconstants(
+    unique int id: @enumconstant,
+    int parent: @usertype ref,
+    int index: int ref,
+    int type_id: @type ref,
+    string name: string ref,
+    int location: @location_default ref
+);
+
+@variable = @localscopevariable | @globalvariable | @membervariable;
+
+@localscopevariable = @localvariable | @parameter;
+
+/**
+ * Built-in types are the fundamental types, e.g., integral, floating, and void.
+ */
+case @builtintype.kind of
+   1 = @errortype
+|  2 = @unknowntype
+|  3 = @void
+|  4 = @boolean
+|  5 = @char
+|  6 = @unsigned_char
+|  7 = @signed_char
+|  8 = @short
+|  9 = @unsigned_short
+| 10 = @signed_short
+| 11 = @int
+| 12 = @unsigned_int
+| 13 = @signed_int
+| 14 = @long
+| 15 = @unsigned_long
+| 16 = @signed_long
+| 17 = @long_long
+| 18 = @unsigned_long_long
+| 19 = @signed_long_long
+// ... 20 Microsoft-specific __int8
+// ... 21 Microsoft-specific __int16
+// ... 22 Microsoft-specific __int32
+// ... 23 Microsoft-specific __int64
+| 24 = @float
+| 25 = @double
+| 26 = @long_double
+| 27 = @complex_float         // C99-specific _Complex float
+| 28 = @complex_double        // C99-specific _Complex double
+| 29 = @complex_long_double   // C99-specific _Complex long double
+| 30 = @imaginary_float       // C99-specific _Imaginary float
+| 31 = @imaginary_double      // C99-specific _Imaginary double
+| 32 = @imaginary_long_double // C99-specific _Imaginary long double
+| 33 = @wchar_t               // Microsoft-specific
+| 34 = @decltype_nullptr      // C++11
+| 35 = @int128                // __int128
+| 36 = @unsigned_int128       // unsigned __int128
+| 37 = @signed_int128         // signed __int128
+| 38 = @float128              // __float128
+| 39 = @complex_float128      // _Complex __float128
+| 40 = @decimal32             // _Decimal32
+| 41 = @decimal64             // _Decimal64
+| 42 = @decimal128            // _Decimal128
+| 43 = @char16_t
+| 44 = @char32_t
+| 45 = @std_float32           // _Float32
+| 46 = @float32x              // _Float32x
+| 47 = @std_float64           // _Float64
+| 48 = @float64x              // _Float64x
+| 49 = @std_float128          // _Float128
+// ... 50 _Float128x
+| 51 = @char8_t
+| 52 = @float16               // _Float16
+| 53 = @complex_float16       // _Complex _Float16
+| 54 = @fp16                  // __fp16
+| 55 = @std_bfloat16          // __bf16
+| 56 = @std_float16           // std::float16_t
+| 57 = @complex_std_float32   // _Complex _Float32
+| 58 = @complex_float32x      // _Complex _Float32x
+| 59 = @complex_std_float64   // _Complex _Float64
+| 60 = @complex_float64x      // _Complex _Float64x
+| 61 = @complex_std_float128  // _Complex _Float128
+;
+
+builtintypes(
+    unique int id: @builtintype,
+    string name: string ref,
+    int kind: int ref,
+    int size: int ref,
+    int sign: int ref,
+    int alignment: int ref
+);
+
+/**
+ * Derived types are types that are directly derived from existing types and
+ * point to, refer to, transform type data to return a new type.
+ */
+case @derivedtype.kind of
+   1 = @pointer
+|  2 = @reference
+|  3 = @type_with_specifiers
+|  4 = @array
+|  5 = @gnu_vector
+|  6 = @routineptr
+|  7 = @routinereference
+|  8 = @rvalue_reference // C++11
+// ... 9 type_conforming_to_protocols deprecated
+| 10 = @block
+;
+
+derivedtypes(
+    unique int id: @derivedtype,
+    string name: string ref,
+    int kind: int ref,
+    int type_id: @type ref
+);
+
+pointerishsize(unique int id: @derivedtype ref,
+    int size: int ref,
+    int alignment: int ref);
+
+arraysizes(
+    unique int id: @derivedtype ref,
+    int num_elements: int ref,
+    int bytesize: int ref,
+    int alignment: int ref
+);
+
+typedefbase(
+    unique int id: @usertype ref,
+    int type_id: @type ref
+);
+
+/**
+ * An instance of the C++11 `decltype` operator.  For example:
+ * ```
+ * int a;
+ * decltype(1+a) b;
+ * ```
+ * Here `expr` is `1+a`.
+ *
+ * Sometimes an additional pair of parentheses around the expression
+ * would change the semantics of this decltype, e.g.
+ * ```
+ * struct A { double x; };
+ * const A* a = new A();
+ * decltype( a->x ); // type is double
+ * decltype((a->x)); // type is const double&
+ * ```
+ * (Please consult the C++11 standard for more details).
+ * `parentheses_would_change_meaning` is `true` iff that is the case.
+ */
+#keyset[id, expr]
+decltypes(
+    int id: @decltype,
+    int expr: @expr ref,
+    int base_type: @type ref,
+    boolean parentheses_would_change_meaning: boolean ref
+);
+
+/*
+case @usertype.kind of
+   1 = @struct
+|  2 = @class
+|  3 = @union
+|  4 = @enum
+|  5 = @typedef                       // classic C: typedef typedef type name
+|  6 = @template
+|  7 = @template_parameter
+|  8 = @template_template_parameter
+|  9 = @proxy_class                   // a proxy class associated with a template parameter
+// ... 10 objc_class deprecated
+// ... 11 objc_protocol deprecated
+// ... 12 objc_category deprecated
+| 13 = @scoped_enum
+| 14 = @using_alias                  // a using name = type style typedef
+;
+*/
+
+usertypes(
+    unique int id: @usertype,
+    string name: string ref,
+    int kind: int ref
+);
+
+usertypesize(
+    unique int id: @usertype ref,
+    int size: int ref,
+    int alignment: int ref
+);
+
+usertype_final(unique int id: @usertype ref);
+
+usertype_uuid(
+    unique int id: @usertype ref,
+    string uuid: string ref
+);
+
+mangled_name(
+    unique int id: @declaration ref,
+    int mangled_name : @mangledname,
+    boolean is_complete: boolean ref
+);
+
+is_pod_class(unique int id: @usertype ref);
+is_standard_layout_class(unique int id: @usertype ref);
+
+is_complete(unique int id: @usertype ref);
+
+is_class_template(unique int id: @usertype ref);
+class_instantiation(
+    int to: @usertype ref,
+    int from: @usertype ref
+);
+class_template_argument(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+class_template_argument_value(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+is_proxy_class_for(
+    unique int id: @usertype ref,
+    unique int templ_param_id: @usertype ref
+);
+
+type_mentions(
+    unique int id: @type_mention,
+    int type_id: @type ref,
+    int location: @location ref,
+    // a_symbol_reference_kind from the frontend.
+    int kind: int ref
+);
+
+is_function_template(unique int id: @function ref);
+function_instantiation(
+    unique int to: @function ref,
+    int from: @function ref
+);
+function_template_argument(
+    int function_id: @function ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+function_template_argument_value(
+    int function_id: @function ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+is_variable_template(unique int id: @variable ref);
+variable_instantiation(
+    unique int to: @variable ref,
+    int from: @variable ref
+);
+variable_template_argument(
+    int variable_id: @variable ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+variable_template_argument_value(
+    int variable_id: @variable ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+routinetypes(
+    unique int id: @routinetype,
+    int return_type: @type ref
+);
+
+routinetypeargs(
+    int routine: @routinetype ref,
+    int index: int ref,
+    int type_id: @type ref
+);
+
+ptrtomembers(
+    unique int id: @ptrtomember,
+    int type_id: @type ref,
+    int class_id: @type ref
+);
+
+/*
+ specifiers for types, functions, and variables
+
+    "public",
+    "protected",
+    "private",
+
+    "const",
+    "volatile",
+    "static",
+
+    "pure",
+    "virtual",
+    "sealed", // Microsoft
+    "__interface", // Microsoft
+    "inline",
+    "explicit",
+
+    "near", // near far extension
+    "far", // near far extension
+    "__ptr32", // Microsoft
+    "__ptr64", // Microsoft
+    "__sptr", // Microsoft
+    "__uptr", // Microsoft
+    "dllimport", // Microsoft
+    "dllexport", // Microsoft
+    "thread", // Microsoft
+    "naked", // Microsoft
+    "microsoft_inline", // Microsoft
+    "forceinline", // Microsoft
+    "selectany", // Microsoft
+    "nothrow", // Microsoft
+    "novtable", // Microsoft
+    "noreturn", // Microsoft
+    "noinline", // Microsoft
+    "noalias", // Microsoft
+    "restrict", // Microsoft
+*/
+
+specifiers(
+    unique int id: @specifier,
+    unique string str: string ref
+);
+
+typespecifiers(
+    int type_id: @type ref,
+    int spec_id: @specifier ref
+);
+
+funspecifiers(
+    int func_id: @function ref,
+    int spec_id: @specifier ref
+);
+
+varspecifiers(
+    int var_id: @accessible ref,
+    int spec_id: @specifier ref
+);
+
+explicit_specifier_exprs(
+    unique int func_id: @function ref,
+    int constant: @expr ref
+)
+
+attributes(
+    unique int id: @attribute,
+    int kind: int ref,
+    string name: string ref,
+    string name_space: string ref,
+    int location: @location_default ref
+);
+
+case @attribute.kind of
+  0 = @gnuattribute
+| 1 = @stdattribute
+| 2 = @declspec
+| 3 = @msattribute
+| 4 = @alignas
+// ... 5 @objc_propertyattribute deprecated
+;
+
+attribute_args(
+    unique int id: @attribute_arg,
+    int kind: int ref,
+    int attribute: @attribute ref,
+    int index: int ref,
+    int location: @location_default ref
+);
+
+case @attribute_arg.kind of
+  0 = @attribute_arg_empty
+| 1 = @attribute_arg_token
+| 2 = @attribute_arg_constant
+| 3 = @attribute_arg_type
+| 4 = @attribute_arg_constant_expr
+| 5 = @attribute_arg_expr
+;
+
+attribute_arg_value(
+    unique int arg: @attribute_arg ref,
+    string value: string ref
+);
+attribute_arg_type(
+    unique int arg: @attribute_arg ref,
+    int type_id: @type ref
+);
+attribute_arg_constant(
+    unique int arg: @attribute_arg ref,
+    int constant: @expr ref
+)
+attribute_arg_expr(
+    unique int arg: @attribute_arg ref,
+    int expr: @expr ref
+)
+attribute_arg_name(
+    unique int arg: @attribute_arg ref,
+    string name: string ref
+);
+
+typeattributes(
+    int type_id: @type ref,
+    int spec_id: @attribute ref
+);
+
+funcattributes(
+    int func_id: @function ref,
+    int spec_id: @attribute ref
+);
+
+varattributes(
+    int var_id: @accessible ref,
+    int spec_id: @attribute ref
+);
+
+stmtattributes(
+    int stmt_id: @stmt ref,
+    int spec_id: @attribute ref
+);
+
+@type = @builtintype
+      | @derivedtype
+      | @usertype
+      /* TODO | @fixedpointtype */
+      | @routinetype
+      | @ptrtomember
+      | @decltype;
+
+unspecifiedtype(
+    unique int type_id: @type ref,
+    int unspecified_type_id: @type ref
+);
+
+member(
+    int parent: @type ref,
+    int index: int ref,
+    int child: @member ref
+);
+
+@enclosingfunction_child = @usertype | @variable | @namespace
+
+enclosingfunction(
+    unique int child: @enclosingfunction_child ref,
+    int parent: @function ref
+);
+
+derivations(
+    unique int derivation: @derivation,
+    int sub: @type ref,
+    int index: int ref,
+    int super: @type ref,
+    int location: @location_default ref
+);
+
+derspecifiers(
+    int der_id: @derivation ref,
+    int spec_id: @specifier ref
+);
+
+/**
+ * Contains the byte offset of the base class subobject within the derived
+ * class. Only holds for non-virtual base classes, but see table
+ * `virtual_base_offsets` for offsets of virtual base class subobjects.
+ */
+direct_base_offsets(
+    unique int der_id: @derivation ref,
+    int offset: int ref
+);
+
+/**
+ * Contains the byte offset of the virtual base class subobject for class
+ * `super` within a most-derived object of class `sub`. `super` can be either a
+ * direct or indirect base class.
+ */
+#keyset[sub, super]
+virtual_base_offsets(
+    int sub: @usertype ref,
+    int super: @usertype ref,
+    int offset: int ref
+);
+
+frienddecls(
+    unique int id: @frienddecl,
+    int type_id: @type ref,
+    int decl_id: @declaration ref,
+    int location: @location_default ref
+);
+
+@declaredtype = @usertype ;
+
+@declaration = @function
+             | @declaredtype
+             | @variable
+             | @enumconstant
+             | @frienddecl;
+
+@member = @membervariable
+        | @function
+        | @declaredtype
+        | @enumconstant;
+
+@locatable = @diagnostic
+           | @declaration
+           | @ppd_include
+           | @ppd_define
+           | @macroinvocation
+           /*| @funcall*/
+           | @xmllocatable
+           | @attribute
+           | @attribute_arg;
+
+@namedscope = @namespace | @usertype;
+
+@element = @locatable
+         | @file
+         | @folder
+         | @specifier
+         | @type
+         | @expr
+         | @namespace
+         | @initialiser
+         | @stmt
+         | @derivation
+         | @comment
+         | @preprocdirect
+         | @fun_decl
+         | @var_decl
+         | @type_decl
+         | @namespace_decl
+         | @using
+         | @namequalifier
+         | @specialnamequalifyingelement
+         | @static_assert
+         | @type_mention
+         | @lambdacapture;
+
+@exprparent = @element;
+
+comments(
+    unique int id: @comment,
+    string contents: string ref,
+    int location: @location_default ref
+);
+
+commentbinding(
+    int id: @comment ref,
+    int element: @element ref
+);
+
+exprconv(
+    int converted: @expr ref,
+    unique int conversion: @expr ref
+);
+
+compgenerated(unique int id: @element ref);
+
+/**
+ * `destructor_call` destructs the `i`'th entity that should be
+ * destructed following `element`. Note that entities should be
+ * destructed in reverse construction order, so for a given `element`
+ * these should be called from highest to lowest `i`.
+ */
+#keyset[element, destructor_call]
+#keyset[element, i]
+synthetic_destructor_call(
+    int element: @element ref,
+    int i: int ref,
+    int destructor_call: @routineexpr ref
+);
+
+namespaces(
+    unique int id: @namespace,
+    string name: string ref
+);
+
+namespace_inline(
+    unique int id: @namespace ref
+);
+
+namespacembrs(
+    int parentid: @namespace ref,
+    unique int memberid: @namespacembr ref
+);
+
+@namespacembr = @declaration | @namespace;
+
+exprparents(
+    int expr_id: @expr ref,
+    int child_index: int ref,
+    int parent_id: @exprparent ref
+);
+
+expr_isload(unique int expr_id: @expr ref);
+
+@cast = @c_style_cast
+      | @const_cast
+      | @dynamic_cast
+      | @reinterpret_cast
+      | @static_cast
+      ;
+
+/*
+case @conversion.kind of
+  0 = @simple_conversion           // a numeric conversion, qualification conversion, or a reinterpret_cast
+| 1 = @bool_conversion             // conversion to 'bool'
+| 2 = @base_class_conversion       // a derived-to-base conversion
+| 3 = @derived_class_conversion    // a base-to-derived conversion
+| 4 = @pm_base_class_conversion    // a derived-to-base conversion of a pointer to member
+| 5 = @pm_derived_class_conversion // a base-to-derived conversion of a pointer to member
+| 6 = @glvalue_adjust              // an adjustment of the type of a glvalue
+| 7 = @prvalue_adjust              // an adjustment of the type of a prvalue
+;
+*/
+/**
+ * Describes the semantics represented by a cast expression. This is largely
+ * independent of the source syntax of the cast, so it is separate from the
+ * regular expression kind.
+ */
+conversionkinds(
+    unique int expr_id: @cast ref,
+    int kind: int ref
+);
+
+@conversion = @cast
+            | @array_to_pointer
+            | @parexpr
+            | @reference_to
+            | @ref_indirect
+            | @temp_init
+            | @c11_generic
+            ;
+
+/*
+case @funbindexpr.kind of
+  0 = @normal_call  // a normal call
+| 1 = @virtual_call // a virtual call
+| 2 = @adl_call     // a call whose target is only found by ADL
+;
+*/
+iscall(
+    unique int caller: @funbindexpr ref,
+    int kind: int ref
+);
+
+numtemplatearguments(
+    unique int expr_id: @expr ref,
+    int num: int ref
+);
+
+specialnamequalifyingelements(
+    unique int id: @specialnamequalifyingelement,
+    unique string name: string ref
+);
+
+@namequalifiableelement = @expr | @namequalifier;
+@namequalifyingelement = @namespace
+                       | @specialnamequalifyingelement
+                       | @usertype;
+
+namequalifiers(
+    unique int id: @namequalifier,
+    unique int qualifiableelement: @namequalifiableelement ref,
+    int qualifyingelement: @namequalifyingelement ref,
+    int location: @location_default ref
+);
+
+varbind(
+    int expr: @varbindexpr ref,
+    int var: @accessible ref
+);
+
+funbind(
+    int expr: @funbindexpr ref,
+    int fun: @function ref
+);
+
+@any_new_expr = @new_expr
+              | @new_array_expr;
+
+@new_or_delete_expr = @any_new_expr
+                    | @delete_expr
+                    | @delete_array_expr;
+
+@prefix_crement_expr = @preincrexpr | @predecrexpr;
+
+@postfix_crement_expr = @postincrexpr | @postdecrexpr;
+
+@increment_expr = @preincrexpr | @postincrexpr;
+
+@decrement_expr = @predecrexpr | @postdecrexpr;
+
+@crement_expr = @increment_expr | @decrement_expr;
+
+@un_arith_op_expr = @arithnegexpr
+                  | @unaryplusexpr
+                  | @conjugation
+                  | @realpartexpr
+                  | @imagpartexpr
+                  | @crement_expr
+                  ;
+
+@un_bitwise_op_expr = @complementexpr;
+
+@un_log_op_expr = @notexpr;
+
+@un_op_expr = @address_of
+            | @indirect
+            | @un_arith_op_expr
+            | @un_bitwise_op_expr
+            | @builtinaddressof
+            | @vec_fill
+            | @un_log_op_expr
+            | @co_await
+            | @co_yield
+            ;
+
+@bin_log_op_expr = @andlogicalexpr | @orlogicalexpr;
+
+@cmp_op_expr = @eq_op_expr | @rel_op_expr;
+
+@eq_op_expr = @eqexpr | @neexpr;
+
+@rel_op_expr = @gtexpr
+             | @ltexpr
+             | @geexpr
+             | @leexpr
+             | @spaceshipexpr
+             ;
+
+@bin_bitwise_op_expr = @lshiftexpr
+                     | @rshiftexpr
+                     | @andexpr
+                     | @orexpr
+                     | @xorexpr
+                     ;
+
+@p_arith_op_expr = @paddexpr
+                 | @psubexpr
+                 | @pdiffexpr
+                 ;
+
+@bin_arith_op_expr = @addexpr
+                   | @subexpr
+                   | @mulexpr
+                   | @divexpr
+                   | @remexpr
+                   | @jmulexpr
+                   | @jdivexpr
+                   | @fjaddexpr
+                   | @jfaddexpr
+                   | @fjsubexpr
+                   | @jfsubexpr
+                   | @minexpr
+                   | @maxexpr
+                   | @p_arith_op_expr
+                   ;
+
+@bin_op_expr = @bin_arith_op_expr
+             | @bin_bitwise_op_expr
+             | @cmp_op_expr
+             | @bin_log_op_expr
+             ;
+
+@op_expr = @un_op_expr
+         | @bin_op_expr
+         | @assign_expr
+         | @conditionalexpr
+         ;
+
+@assign_arith_expr = @assignaddexpr
+                   | @assignsubexpr
+                   | @assignmulexpr
+                   | @assigndivexpr
+                   | @assignremexpr
+                   ;
+
+@assign_bitwise_expr = @assignandexpr
+                     | @assignorexpr
+                     | @assignxorexpr
+                     | @assignlshiftexpr
+                     | @assignrshiftexpr
+                     ;
+
+@assign_pointer_expr = @assignpaddexpr
+                     | @assignpsubexpr
+                     ;
+
+@assign_op_expr = @assign_arith_expr
+                | @assign_bitwise_expr
+                | @assign_pointer_expr
+                ;
+
+@assign_expr = @assignexpr | @assign_op_expr | @blockassignexpr
+
+/*
+  Binary encoding of the allocator form.
+
+  case @allocator.form of
+    0 = plain
+  | 1 = alignment
+  ;
+*/
+
+/**
+ * The allocator function associated with a `new` or `new[]` expression.
+ * The `form` column specified whether the allocation call contains an alignment
+ * argument.
+ */
+expr_allocator(
+    unique int expr: @any_new_expr ref,
+    int func: @function ref,
+    int form: int ref
+);
+
+/*
+  Binary encoding of the deallocator form.
+
+  case @deallocator.form of
+    0 = plain
+  | 1 = size
+  | 2 = alignment
+  | 4 = destroying_delete
+  ;
+*/
+
+/**
+ * The deallocator function associated with a `delete`, `delete[]`, `new`, or
+ * `new[]` expression. For a `new` or `new[]` expression, the deallocator is the
+ * one used to free memory if the initialization throws an exception.
+ * The `form` column specifies whether the deallocation call contains a size
+ * argument, and alignment argument, or both.
+ */
+expr_deallocator(
+    unique int expr: @new_or_delete_expr ref,
+    int func: @function ref,
+    int form: int ref
+);
+
+/**
+ * Holds if the `@conditionalexpr` is of the two operand form
+ * `guard ? : false`.
+ */
+expr_cond_two_operand(
+    unique int cond: @conditionalexpr ref
+);
+
+/**
+ * The guard of `@conditionalexpr` `guard ? true : false`
+ */
+expr_cond_guard(
+    unique int cond: @conditionalexpr ref,
+    int guard: @expr ref
+);
+
+/**
+ * The expression used when the guard of `@conditionalexpr`
+ * `guard ? true : false` holds. For the two operand form
+ * `guard ?: false` consider using `expr_cond_guard` instead.
+ */
+expr_cond_true(
+    unique int cond: @conditionalexpr ref,
+    int true: @expr ref
+);
+
+/**
+ * The expression used when the guard of `@conditionalexpr`
+ * `guard ? true : false` does not hold.
+ */
+expr_cond_false(
+    unique int cond: @conditionalexpr ref,
+    int false: @expr ref
+);
+
+/** A string representation of the value. */
+values(
+    unique int id: @value,
+    string str: string ref
+);
+
+/** The actual text in the source code for the value, if any. */
+valuetext(
+    unique int id: @value ref,
+    string text: string ref
+);
+
+valuebind(
+    int val: @value ref,
+    unique int expr: @expr ref
+);
+
+fieldoffsets(
+    unique int id: @variable ref,
+    int byteoffset: int ref,
+    int bitoffset: int ref
+);
+
+bitfield(
+    unique int id: @variable ref,
+    int bits: int ref,
+    int declared_bits: int ref
+);
+
+/* TODO
+memberprefix(
+    int member: @expr ref,
+    int prefix: @expr ref
+);
+*/
+
+/*
+   kind(1) = mbrcallexpr
+   kind(2) = mbrptrcallexpr
+   kind(3) = mbrptrmbrcallexpr
+   kind(4) = ptrmbrptrmbrcallexpr
+   kind(5) = mbrreadexpr // x.y
+   kind(6) = mbrptrreadexpr // p->y
+   kind(7) = mbrptrmbrreadexpr // x.*pm
+   kind(8) = mbrptrmbrptrreadexpr // x->*pm
+   kind(9) = staticmbrreadexpr // static x.y
+   kind(10) = staticmbrptrreadexpr // static p->y
+*/
+/* TODO
+memberaccess(
+    int member: @expr ref,
+    int kind: int ref
+);
+*/
+
+initialisers(
+    unique int init: @initialiser,
+    int var: @accessible ref,
+    unique int expr: @expr ref,
+    int location: @location_expr ref
+);
+
+braced_initialisers(
+    int init: @initialiser ref
+);
+
+/**
+ * An ancestor for the expression, for cases in which we cannot
+ * otherwise find the expression's parent.
+ */
+expr_ancestor(
+    int exp: @expr ref,
+    int ancestor: @element ref
+);
+
+exprs(
+    unique int id: @expr,
+    int kind: int ref,
+    int location: @location_expr ref
+);
+
+expr_reuse(
+    int reuse: @expr ref,
+    int original: @expr ref,
+    int value_category: int ref
+)
+
+/*
+  case @value.category of
+    1 = prval
+  | 2 = xval
+  | 3 = lval
+  ;
+*/
+expr_types(
+    int id: @expr ref,
+    int typeid: @type ref,
+    int value_category: int ref
+);
+
+case @expr.kind of
+    1 = @errorexpr
+|   2 = @address_of // & AddressOfExpr
+|   3 = @reference_to // ReferenceToExpr (implicit?)
+|   4 = @indirect // * PointerDereferenceExpr
+|   5 = @ref_indirect // ReferenceDereferenceExpr (implicit?)
+// ...
+|   8 = @array_to_pointer // (???)
+|   9 = @vacuous_destructor_call // VacuousDestructorCall
+// ...
+|  11 = @assume // Microsoft
+|  12 = @parexpr
+|  13 = @arithnegexpr
+|  14 = @unaryplusexpr
+|  15 = @complementexpr
+|  16 = @notexpr
+|  17 = @conjugation // GNU ~ operator
+|  18 = @realpartexpr // GNU __real
+|  19 = @imagpartexpr // GNU __imag
+|  20 = @postincrexpr
+|  21 = @postdecrexpr
+|  22 = @preincrexpr
+|  23 = @predecrexpr
+|  24 = @conditionalexpr
+|  25 = @addexpr
+|  26 = @subexpr
+|  27 = @mulexpr
+|  28 = @divexpr
+|  29 = @remexpr
+|  30 = @jmulexpr // C99 mul imaginary
+|  31 = @jdivexpr // C99 div imaginary
+|  32 = @fjaddexpr // C99 add real + imaginary
+|  33 = @jfaddexpr // C99 add imaginary + real
+|  34 = @fjsubexpr // C99 sub real - imaginary
+|  35 = @jfsubexpr // C99 sub imaginary - real
+|  36 = @paddexpr // pointer add (pointer + int or int + pointer)
+|  37 = @psubexpr // pointer sub (pointer - integer)
+|  38 = @pdiffexpr // difference between two pointers
+|  39 = @lshiftexpr
+|  40 = @rshiftexpr
+|  41 = @andexpr
+|  42 = @orexpr
+|  43 = @xorexpr
+|  44 = @eqexpr
+|  45 = @neexpr
+|  46 = @gtexpr
+|  47 = @ltexpr
+|  48 = @geexpr
+|  49 = @leexpr
+|  50 = @minexpr // GNU minimum
+|  51 = @maxexpr // GNU maximum
+|  52 = @assignexpr
+|  53 = @assignaddexpr
+|  54 = @assignsubexpr
+|  55 = @assignmulexpr
+|  56 = @assigndivexpr
+|  57 = @assignremexpr
+|  58 = @assignlshiftexpr
+|  59 = @assignrshiftexpr
+|  60 = @assignandexpr
+|  61 = @assignorexpr
+|  62 = @assignxorexpr
+|  63 = @assignpaddexpr // assign pointer add
+|  64 = @assignpsubexpr // assign pointer sub
+|  65 = @andlogicalexpr
+|  66 = @orlogicalexpr
+|  67 = @commaexpr
+|  68 = @subscriptexpr // access to member of an array, e.g., a[5]
+// ...  69 @objc_subscriptexpr deprecated
+// ...  70 @cmdaccess deprecated
+// ...
+|  73 = @virtfunptrexpr
+|  74 = @callexpr
+// ...  75 @msgexpr_normal deprecated
+// ...  76 @msgexpr_super deprecated
+// ...  77 @atselectorexpr deprecated
+// ...  78 @atprotocolexpr deprecated
+|  79 = @vastartexpr
+|  80 = @vaargexpr
+|  81 = @vaendexpr
+|  82 = @vacopyexpr
+// ...  83 @atencodeexpr deprecated
+|  84 = @varaccess
+|  85 = @thisaccess
+// ...  86 @objc_box_expr deprecated
+|  87 = @new_expr
+|  88 = @delete_expr
+|  89 = @throw_expr
+|  90 = @condition_decl // a variable declared in a condition, e.g., if(int x = y > 2)
+|  91 = @braced_init_list
+|  92 = @type_id
+|  93 = @runtime_sizeof
+|  94 = @runtime_alignof
+|  95 = @sizeof_pack
+|  96 = @expr_stmt // GNU extension
+|  97 = @routineexpr
+|  98 = @type_operand // used to access a type in certain contexts (haven't found any examples yet....)
+|  99 = @offsetofexpr // offsetof ::= type and field
+| 100 = @hasassignexpr // __has_assign ::= type
+| 101 = @hascopyexpr // __has_copy ::= type
+| 102 = @hasnothrowassign // __has_nothrow_assign ::= type
+| 103 = @hasnothrowconstr // __has_nothrow_constructor ::= type
+| 104 = @hasnothrowcopy // __has_nothrow_copy ::= type
+| 105 = @hastrivialassign // __has_trivial_assign ::= type
+| 106 = @hastrivialconstr // __has_trivial_constructor ::= type
+| 107 = @hastrivialcopy // __has_trivial_copy ::= type
+| 108 = @hasuserdestr // __has_user_destructor ::= type
+| 109 = @hasvirtualdestr // __has_virtual_destructor ::= type
+| 110 = @isabstractexpr // __is_abstract ::= type
+| 111 = @isbaseofexpr // __is_base_of ::= type type
+| 112 = @isclassexpr // __is_class ::= type
+| 113 = @isconvtoexpr // __is_convertible_to ::= type type
+| 114 = @isemptyexpr // __is_empty ::= type
+| 115 = @isenumexpr // __is_enum ::= type
+| 116 = @ispodexpr // __is_pod ::= type
+| 117 = @ispolyexpr // __is_polymorphic ::= type
+| 118 = @isunionexpr // __is_union ::= type
+| 119 = @typescompexpr // GNU __builtin_types_compatible ::= type type
+| 120 = @intaddrexpr // frontend internal builtin, used to implement offsetof
+// ...
+| 122 = @hastrivialdestructor // __has_trivial_destructor ::= type
+| 123 = @literal
+| 124 = @uuidof
+| 127 = @aggregateliteral
+| 128 = @delete_array_expr
+| 129 = @new_array_expr
+// ... 130 @objc_array_literal deprecated
+// ... 131 @objc_dictionary_literal deprecated
+| 132 = @foldexpr
+// ...
+| 200 = @ctordirectinit
+| 201 = @ctorvirtualinit
+| 202 = @ctorfieldinit
+| 203 = @ctordelegatinginit
+| 204 = @dtordirectdestruct
+| 205 = @dtorvirtualdestruct
+| 206 = @dtorfielddestruct
+// ...
+| 210 = @static_cast
+| 211 = @reinterpret_cast
+| 212 = @const_cast
+| 213 = @dynamic_cast
+| 214 = @c_style_cast
+| 215 = @lambdaexpr
+| 216 = @param_ref
+| 217 = @noopexpr
+// ...
+| 294 = @istriviallyconstructibleexpr
+| 295 = @isdestructibleexpr
+| 296 = @isnothrowdestructibleexpr
+| 297 = @istriviallydestructibleexpr
+| 298 = @istriviallyassignableexpr
+| 299 = @isnothrowassignableexpr
+| 300 = @istrivialexpr
+| 301 = @isstandardlayoutexpr
+| 302 = @istriviallycopyableexpr
+| 303 = @isliteraltypeexpr
+| 304 = @hastrivialmoveconstructorexpr
+| 305 = @hastrivialmoveassignexpr
+| 306 = @hasnothrowmoveassignexpr
+| 307 = @isconstructibleexpr
+| 308 = @isnothrowconstructibleexpr
+| 309 = @hasfinalizerexpr
+| 310 = @isdelegateexpr
+| 311 = @isinterfaceclassexpr
+| 312 = @isrefarrayexpr
+| 313 = @isrefclassexpr
+| 314 = @issealedexpr
+| 315 = @issimplevalueclassexpr
+| 316 = @isvalueclassexpr
+| 317 = @isfinalexpr
+| 319 = @noexceptexpr
+| 320 = @builtinshufflevector
+| 321 = @builtinchooseexpr
+| 322 = @builtinaddressof
+| 323 = @vec_fill
+| 324 = @builtinconvertvector
+| 325 = @builtincomplex
+| 326 = @spaceshipexpr
+| 327 = @co_await
+| 328 = @co_yield
+| 329 = @temp_init
+| 330 = @isassignable
+| 331 = @isaggregate
+| 332 = @hasuniqueobjectrepresentations
+| 333 = @builtinbitcast
+| 334 = @builtinshuffle
+| 335 = @blockassignexpr
+| 336 = @issame
+| 337 = @isfunction
+| 338 = @islayoutcompatible
+| 339 = @ispointerinterconvertiblebaseof
+| 340 = @isarray
+| 341 = @arrayrank
+| 342 = @arrayextent
+| 343 = @isarithmetic
+| 344 = @iscompletetype
+| 345 = @iscompound
+| 346 = @isconst
+| 347 = @isfloatingpoint
+| 348 = @isfundamental
+| 349 = @isintegral
+| 350 = @islvaluereference
+| 351 = @ismemberfunctionpointer
+| 352 = @ismemberobjectpointer
+| 353 = @ismemberpointer
+| 354 = @isobject
+| 355 = @ispointer
+| 356 = @isreference
+| 357 = @isrvaluereference
+| 358 = @isscalar
+| 359 = @issigned
+| 360 = @isunsigned
+| 361 = @isvoid
+| 362 = @isvolatile
+| 363 = @reuseexpr
+| 364 = @istriviallycopyassignable
+| 365 = @isassignablenopreconditioncheck
+| 366 = @referencebindstotemporary
+| 367 = @issameas
+| 368 = @builtinhasattribute
+| 369 = @ispointerinterconvertiblewithclass
+| 370 = @builtinispointerinterconvertiblewithclass
+| 371 = @iscorrespondingmember
+| 372 = @builtiniscorrespondingmember
+| 373 = @isboundedarray
+| 374 = @isunboundedarray
+| 375 = @isreferenceable
+| 378 = @isnothrowconvertible
+| 379 = @referenceconstructsfromtemporary
+| 380 = @referenceconvertsfromtemporary
+| 381 = @isconvertible
+| 382 = @isvalidwinrttype
+| 383 = @iswinclass
+| 384 = @iswininterface
+| 385 = @istriviallyequalitycomparable
+| 386 = @isscopedenum
+| 387 = @istriviallyrelocatable
+| 388 = @datasizeof
+| 389 = @c11_generic
+| 390 = @requires_expr
+;
+
+@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
+            ;
+
+new_allocated_type(
+    unique int expr: @new_expr ref,
+    int type_id: @type ref
+);
+
+new_array_allocated_type(
+    unique int expr: @new_array_expr ref,
+    int type_id: @type ref
+);
+
+/**
+ * The field being initialized by an initializer expression within an aggregate
+ * initializer for a class/struct/union. Position is used to sort repeated initializers.
+ */
+#keyset[aggregate, position]
+aggregate_field_init(
+    int aggregate: @aggregateliteral ref,
+    int initializer: @expr ref,
+    int field: @membervariable ref,
+    int position: int ref
+);
+
+/**
+ * The index of the element being initialized by an initializer expression
+ * within an aggregate initializer for an array. Position is used to sort repeated initializers.
+ */
+#keyset[aggregate, position]
+aggregate_array_init(
+    int aggregate: @aggregateliteral ref,
+    int initializer: @expr ref,
+    int element_index: int ref,
+    int position: int ref
+);
+
+@ctorinit = @ctordirectinit
+          | @ctorvirtualinit
+          | @ctorfieldinit
+          | @ctordelegatinginit;
+@dtordestruct = @dtordirectdestruct
+              | @dtorvirtualdestruct
+              | @dtorfielddestruct;
+
+
+condition_decl_bind(
+    unique int expr: @condition_decl ref,
+    unique int decl: @declaration ref
+);
+
+typeid_bind(
+    unique int expr: @type_id ref,
+    int type_id: @type ref
+);
+
+uuidof_bind(
+    unique int expr: @uuidof ref,
+    int type_id: @type ref
+);
+
+@runtime_sizeof_or_alignof = @runtime_sizeof | @runtime_alignof | @datasizeof;
+
+sizeof_bind(
+    unique int expr: @runtime_sizeof_or_alignof ref,
+    int type_id: @type ref
+);
+
+code_block(
+    unique int block: @literal ref,
+    unique int routine: @function ref
+);
+
+lambdas(
+    unique int expr: @lambdaexpr ref,
+    string default_capture: string ref,
+    boolean has_explicit_return_type: boolean ref
+);
+
+lambda_capture(
+    unique int id: @lambdacapture,
+    int lambda: @lambdaexpr ref,
+    int index: int ref,
+    int field: @membervariable ref,
+    boolean captured_by_reference: boolean ref,
+    boolean is_implicit: boolean ref,
+    int location: @location_default ref
+);
+
+@funbindexpr = @routineexpr
+             | @new_expr
+             | @delete_expr
+             | @delete_array_expr
+             | @ctordirectinit
+             | @ctorvirtualinit
+             | @ctordelegatinginit
+             | @dtordirectdestruct
+             | @dtorvirtualdestruct;
+
+@varbindexpr = @varaccess | @ctorfieldinit | @dtorfielddestruct;
+@addressable = @function | @variable ;
+@accessible = @addressable | @enumconstant ;
+
+@access = @varaccess | @routineexpr ;
+
+fold(
+    int expr: @foldexpr ref,
+    string operator: string ref,
+    boolean is_left_fold: boolean ref
+);
+
+stmts(
+    unique int id: @stmt,
+    int kind: int ref,
+    int location: @location_stmt ref
+);
+
+case @stmt.kind of
+    1 = @stmt_expr
+|   2 = @stmt_if
+|   3 = @stmt_while
+|   4 = @stmt_goto
+|   5 = @stmt_label
+|   6 = @stmt_return
+|   7 = @stmt_block
+|   8 = @stmt_end_test_while // do { ... } while ( ... )
+|   9 = @stmt_for
+|  10 = @stmt_switch_case
+|  11 = @stmt_switch
+|  13 = @stmt_asm // "asm" statement or the body of an asm function
+|  15 = @stmt_try_block
+|  16 = @stmt_microsoft_try // Microsoft
+|  17 = @stmt_decl
+|  18 = @stmt_set_vla_size // C99
+|  19 = @stmt_vla_decl // C99
+|  25 = @stmt_assigned_goto // GNU
+|  26 = @stmt_empty
+|  27 = @stmt_continue
+|  28 = @stmt_break
+|  29 = @stmt_range_based_for // C++11
+// ...  30 @stmt_at_autoreleasepool_block deprecated
+// ...  31 @stmt_objc_for_in deprecated
+// ...  32 @stmt_at_synchronized deprecated
+|  33 = @stmt_handler
+// ...  34 @stmt_finally_end deprecated
+|  35 = @stmt_constexpr_if
+|  37 = @stmt_co_return
+;
+
+type_vla(
+    int type_id: @type ref,
+    int decl: @stmt_vla_decl ref
+);
+
+variable_vla(
+    int var: @variable ref,
+    int decl: @stmt_vla_decl ref
+);
+
+if_initialization(
+    unique int if_stmt: @stmt_if ref,
+    int init_id: @stmt ref
+);
+
+if_then(
+    unique int if_stmt: @stmt_if ref,
+    int then_id: @stmt ref
+);
+
+if_else(
+    unique int if_stmt: @stmt_if ref,
+    int else_id: @stmt ref
+);
+
+constexpr_if_initialization(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int init_id: @stmt ref
+);
+
+constexpr_if_then(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int then_id: @stmt ref
+);
+
+constexpr_if_else(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int else_id: @stmt ref
+);
+
+while_body(
+    unique int while_stmt: @stmt_while ref,
+    int body_id: @stmt ref
+);
+
+do_body(
+    unique int do_stmt: @stmt_end_test_while ref,
+    int body_id: @stmt ref
+);
+
+switch_initialization(
+    unique int switch_stmt: @stmt_switch ref,
+    int init_id: @stmt ref
+);
+
+#keyset[switch_stmt, index]
+switch_case(
+    int switch_stmt: @stmt_switch ref,
+    int index: int ref,
+    int case_id: @stmt_switch_case ref
+);
+
+switch_body(
+    unique int switch_stmt: @stmt_switch ref,
+    int body_id: @stmt ref
+);
+
+@stmt_for_or_range_based_for = @stmt_for
+                             | @stmt_range_based_for;
+
+for_initialization(
+    unique int for_stmt: @stmt_for_or_range_based_for ref,
+    int init_id: @stmt ref
+);
+
+for_condition(
+    unique int for_stmt: @stmt_for ref,
+    int condition_id: @expr ref
+);
+
+for_update(
+    unique int for_stmt: @stmt_for ref,
+    int update_id: @expr ref
+);
+
+for_body(
+    unique int for_stmt: @stmt_for ref,
+    int body_id: @stmt ref
+);
+
+@stmtparent = @stmt | @expr_stmt ;
+stmtparents(
+    unique int id: @stmt ref,
+    int index: int ref,
+    int parent: @stmtparent ref
+);
+
+ishandler(unique int block: @stmt_block ref);
+
+@cfgnode = @stmt | @expr | @function | @initialiser ;
+
+stmt_decl_bind(
+    int stmt: @stmt_decl ref,
+    int num: int ref,
+    int decl: @declaration ref
+);
+
+stmt_decl_entry_bind(
+    int stmt: @stmt_decl ref,
+    int num: int ref,
+    int decl_entry: @element ref
+);
+
+@functionorblock = @function | @stmt_block;
+
+blockscope(
+    unique int block: @stmt_block ref,
+    int enclosing: @functionorblock ref
+);
+
+@jump = @stmt_goto | @stmt_break | @stmt_continue;
+
+@jumporlabel = @jump | @stmt_label | @literal;
+
+jumpinfo(
+    unique int id: @jumporlabel ref,
+    string str: string ref,
+    int target: @stmt ref
+);
+
+preprocdirects(
+    unique int id: @preprocdirect,
+    int kind: int ref,
+    int location: @location_default ref
+);
+case @preprocdirect.kind of
+   0 = @ppd_if
+|  1 = @ppd_ifdef
+|  2 = @ppd_ifndef
+|  3 = @ppd_elif
+|  4 = @ppd_else
+|  5 = @ppd_endif
+|  6 = @ppd_plain_include
+|  7 = @ppd_define
+|  8 = @ppd_undef
+|  9 = @ppd_line
+| 10 = @ppd_error
+| 11 = @ppd_pragma
+| 12 = @ppd_objc_import
+| 13 = @ppd_include_next
+| 18 = @ppd_warning
+;
+
+@ppd_include = @ppd_plain_include | @ppd_objc_import | @ppd_include_next;
+
+@ppd_branch = @ppd_if | @ppd_ifdef | @ppd_ifndef | @ppd_elif;
+
+preprocpair(
+    int begin : @ppd_branch ref,
+    int elseelifend : @preprocdirect ref
+);
+
+preproctrue(int branch : @ppd_branch ref);
+preprocfalse(int branch : @ppd_branch ref);
+
+preproctext(
+    unique int id: @preprocdirect ref,
+    string head: string ref,
+    string body: string ref
+);
+
+includes(
+    unique int id: @ppd_include ref,
+    int included: @file ref
+);
+
+link_targets(
+    int id: @link_target,
+    int binary: @file ref
+);
+
+link_parent(
+    int element : @element ref,
+    int link_target : @link_target ref
+);
+
+/* XML Files */
+
+xmlEncoding(unique int id: @file ref, string encoding: string ref);
+
+xmlDTDs(
+    unique int id: @xmldtd,
+    string root: string ref,
+    string publicId: string ref,
+    string systemId: string ref,
+    int fileid: @file ref
+);
+
+xmlElements(
+    unique int id: @xmlelement,
+    string name: string ref,
+    int parentid: @xmlparent ref,
+    int idx: int ref,
+    int fileid: @file ref
+);
+
+xmlAttrs(
+    unique int id: @xmlattribute,
+    int elementid: @xmlelement ref,
+    string name: string ref,
+    string value: string ref,
+    int idx: int ref,
+    int fileid: @file ref
+);
+
+xmlNs(
+    int id: @xmlnamespace,
+    string prefixName: string ref,
+    string URI: string ref,
+    int fileid: @file ref
+);
+
+xmlHasNs(
+    int elementId: @xmlnamespaceable ref,
+    int nsId: @xmlnamespace ref,
+    int fileid: @file ref
+);
+
+xmlComments(
+    unique int id: @xmlcomment,
+    string text: string ref,
+    int parentid: @xmlparent ref,
+    int fileid: @file ref
+);
+
+xmlChars(
+    unique int id: @xmlcharacters,
+    string text: string ref,
+    int parentid: @xmlparent ref,
+    int idx: int ref,
+    int isCDATA: int ref,
+    int fileid: @file ref
+);
+
+@xmlparent = @file | @xmlelement;
+@xmlnamespaceable = @xmlelement | @xmlattribute;
+
+xmllocations(
+    int xmlElement: @xmllocatable ref,
+    int location: @location_default ref
+);
+
+@xmllocatable = @xmlcharacters
+              | @xmlelement
+              | @xmlcomment
+              | @xmlattribute
+              | @xmldtd
+              | @file
+              | @xmlnamespace;
diff --git a/cpp/downgrades/6f5d51e89e762fe4609fd4ac8ee3afb04221e873/semmlecode.cpp.dbscheme b/cpp/downgrades/6f5d51e89e762fe4609fd4ac8ee3afb04221e873/semmlecode.cpp.dbscheme
new file mode 100644
index 00000000000..7ff6a6e53db
--- /dev/null
+++ b/cpp/downgrades/6f5d51e89e762fe4609fd4ac8ee3afb04221e873/semmlecode.cpp.dbscheme
@@ -0,0 +1,2315 @@
+
+/**
+ * An invocation of the compiler. Note that more than one file may be
+ * compiled per invocation. For example, this command compiles three
+ * source files:
+ *
+ *   gcc -c f1.c f2.c f3.c
+ *
+ * The `id` simply identifies the invocation, while `cwd` is the working
+ * directory from which the compiler was invoked.
+ */
+compilations(
+    /**
+     * An invocation of the compiler. Note that more than one file may
+     * be compiled per invocation. For example, this command compiles
+     * three source files:
+     *
+     *   gcc -c f1.c f2.c f3.c
+     */
+    unique int id : @compilation,
+    string cwd : string ref
+);
+
+/**
+ * The arguments that were passed to the extractor for a compiler
+ * invocation. If `id` is for the compiler invocation
+ *
+ *   gcc -c f1.c f2.c f3.c
+ *
+ * then typically there will be rows for
+ *
+ * num | arg
+ * --- | ---
+ * 0   | *path to extractor*
+ * 1   | `--mimic`
+ * 2   | `/usr/bin/gcc`
+ * 3   | `-c`
+ * 4   | f1.c
+ * 5   | f2.c
+ * 6   | f3.c
+ */
+#keyset[id, num]
+compilation_args(
+    int id : @compilation ref,
+    int num : int ref,
+    string arg : string ref
+);
+
+/**
+ * The source files that are compiled by a compiler invocation.
+ * If `id` is for the compiler invocation
+ *
+ *   gcc -c f1.c f2.c f3.c
+ *
+ * then there will be rows for
+ *
+ * num | arg
+ * --- | ---
+ * 0   | f1.c
+ * 1   | f2.c
+ * 2   | f3.c
+ *
+ * Note that even if those files `#include` headers, those headers
+ * do not appear as rows.
+ */
+#keyset[id, num]
+compilation_compiling_files(
+    int id : @compilation ref,
+    int num : int ref,
+    int file : @file ref
+);
+
+/**
+ * The time taken by the extractor for a compiler invocation.
+ *
+ * For each file `num`, there will be rows for
+ *
+ * kind | seconds
+ * ---- | ---
+ * 1    | CPU seconds used by the extractor frontend
+ * 2    | Elapsed seconds during the extractor frontend
+ * 3    | CPU seconds used by the extractor backend
+ * 4    | Elapsed seconds during the extractor backend
+ */
+#keyset[id, num, kind]
+compilation_time(
+    int id : @compilation ref,
+    int num : int ref,
+    /* kind:
+       1 = frontend_cpu_seconds
+       2 = frontend_elapsed_seconds
+       3 = extractor_cpu_seconds
+       4 = extractor_elapsed_seconds
+    */
+    int kind : int ref,
+    float seconds : float ref
+);
+
+/**
+ * An error or warning generated by the extractor.
+ * The diagnostic message `diagnostic` was generated during compiler
+ * invocation `compilation`, and is the `file_number_diagnostic_number`th
+ * message generated while extracting the `file_number`th file of that
+ * invocation.
+ */
+#keyset[compilation, file_number, file_number_diagnostic_number]
+diagnostic_for(
+    int diagnostic : @diagnostic ref,
+    int compilation : @compilation ref,
+    int file_number : int ref,
+    int file_number_diagnostic_number : int ref
+);
+
+/**
+ * If extraction was successful, then `cpu_seconds` and
+ * `elapsed_seconds` are the CPU time and elapsed time (respectively)
+ * that extraction took for compiler invocation `id`.
+ */
+compilation_finished(
+    unique int id : @compilation ref,
+    float cpu_seconds : float ref,
+    float elapsed_seconds : float ref
+);
+
+
+/**
+ * External data, loaded from CSV files during snapshot creation. See
+ * [Tutorial: Incorporating external data](https://help.semmle.com/wiki/display/SD/Tutorial%3A+Incorporating+external+data)
+ * for more information.
+ */
+externalData(
+    int id : @externalDataElement,
+    string path : string ref,
+    int column: int ref,
+    string value : string ref
+);
+
+/**
+ * The source location of the snapshot.
+ */
+sourceLocationPrefix(string prefix : string ref);
+
+/**
+ * Information about packages that provide code used during compilation.
+ * The `id` is just a unique identifier.
+ * The `namespace` is typically the name of the package manager that
+ * provided the package (e.g. "dpkg" or "yum").
+ * The `package_name` is the name of the package, and `version` is its
+ * version (as a string).
+ */
+external_packages(
+    unique int id: @external_package,
+    string namespace : string ref,
+    string package_name : string ref,
+    string version : string ref
+);
+
+/**
+ * Holds if File `fileid` was provided by package `package`.
+ */
+header_to_external_package(
+    int fileid : @file ref,
+    int package : @external_package ref
+);
+
+/*
+ * Version history
+ */
+
+svnentries(
+    unique int id : @svnentry,
+    string revision : string ref,
+    string author : string ref,
+    date revisionDate : date ref,
+    int changeSize : int ref
+)
+
+svnaffectedfiles(
+    int id : @svnentry ref,
+    int file : @file ref,
+    string action : string ref
+)
+
+svnentrymsg(
+    unique int id : @svnentry ref,
+    string message : string ref
+)
+
+svnchurn(
+    int commit : @svnentry ref,
+    int file : @file ref,
+    int addedLines : int ref,
+    int deletedLines : int ref
+)
+
+/*
+ * C++ dbscheme
+ */
+
+extractor_version(
+    string codeql_version: string ref,
+    string frontend_version: string ref
+)
+
+@location = @location_stmt | @location_expr | @location_default ;
+
+/**
+ * The location of an element that is not an expression or a statement.
+ * The location spans column `startcolumn` of line `startline` to
+ * column `endcolumn` of line `endline` in file `file`.
+ * For more information, see
+ * [Locations](https://codeql.github.com/docs/writing-codeql-queries/providing-locations-in-codeql-queries/).
+ */
+locations_default(
+    /** The location of an element that is not an expression or a statement. */
+    unique int id: @location_default,
+    int container: @container ref,
+    int startLine: int ref,
+    int startColumn: int ref,
+    int endLine: int ref,
+    int endColumn: int ref
+);
+
+/**
+ * The location of a statement.
+ * The location spans column `startcolumn` of line `startline` to
+ * column `endcolumn` of line `endline` in file `file`.
+ * For more information, see
+ * [Locations](https://codeql.github.com/docs/writing-codeql-queries/providing-locations-in-codeql-queries/).
+ */
+locations_stmt(
+    /** The location of a statement. */
+    unique int id: @location_stmt,
+    int container: @container ref,
+    int startLine: int ref,
+    int startColumn: int ref,
+    int endLine: int ref,
+    int endColumn: int ref
+);
+
+/**
+ * The location of an expression.
+ * The location spans column `startcolumn` of line `startline` to
+ * column `endcolumn` of line `endline` in file `file`.
+ * For more information, see
+ * [Locations](https://codeql.github.com/docs/writing-codeql-queries/providing-locations-in-codeql-queries/).
+ */
+locations_expr(
+    /** The location of an expression. */
+    unique int id: @location_expr,
+    int container: @container ref,
+    int startLine: int ref,
+    int startColumn: int ref,
+    int endLine: int ref,
+    int endColumn: int ref
+);
+
+/** An element for which line-count information is available. */
+@sourceline = @file | @function | @variable | @enumconstant | @xmllocatable;
+
+numlines(
+    int element_id: @sourceline ref,
+    int num_lines: int ref,
+    int num_code: int ref,
+    int num_comment: int ref
+);
+
+diagnostics(
+    unique int id: @diagnostic,
+    int severity: int ref,
+    string error_tag: string ref,
+    string error_message: string ref,
+    string full_error_message: string ref,
+    int location: @location_default ref
+);
+
+files(
+    unique int id: @file,
+    string name: string ref
+);
+
+folders(
+    unique int id: @folder,
+    string name: string ref
+);
+
+@container = @folder | @file
+
+containerparent(
+    int parent: @container ref,
+    unique int child: @container ref
+);
+
+fileannotations(
+    int id: @file ref,
+    int kind: int ref,
+    string name: string ref,
+    string value: string ref
+);
+
+inmacroexpansion(
+    int id: @element ref,
+    int inv: @macroinvocation ref
+);
+
+affectedbymacroexpansion(
+    int id: @element ref,
+    int inv: @macroinvocation ref
+);
+
+case @macroinvocation.kind of
+  1 = @macro_expansion
+| 2 = @other_macro_reference
+;
+
+macroinvocations(
+    unique int id: @macroinvocation,
+    int macro_id: @ppd_define ref,
+    int location: @location_default ref,
+    int kind: int ref
+);
+
+macroparent(
+    unique int id: @macroinvocation ref,
+    int parent_id: @macroinvocation ref
+);
+
+// a macroinvocation may be part of another location
+// the way to find a constant expression that uses a macro
+// is thus to find a constant expression that has a location
+// to which a macro invocation is bound
+macrolocationbind(
+    int id: @macroinvocation ref,
+    int location: @location ref
+);
+
+#keyset[invocation, argument_index]
+macro_argument_unexpanded(
+    int invocation: @macroinvocation ref,
+    int argument_index: int ref,
+    string text: string ref
+);
+
+#keyset[invocation, argument_index]
+macro_argument_expanded(
+    int invocation: @macroinvocation ref,
+    int argument_index: int ref,
+    string text: string ref
+);
+
+/*
+case @function.kind of
+  1 = @normal_function
+| 2 = @constructor
+| 3 = @destructor
+| 4 = @conversion_function
+| 5 = @operator
+| 6 = @builtin_function     // GCC built-in functions, e.g. __builtin___memcpy_chk
+| 7 = @user_defined_literal
+| 8 = @deduction_guide
+;
+*/
+
+functions(
+    unique int id: @function,
+    string name: string ref,
+    int kind: int ref
+);
+
+function_entry_point(
+    int id: @function ref,
+    unique int entry_point: @stmt ref
+);
+
+function_return_type(
+    int id: @function ref,
+    int return_type: @type ref
+);
+
+/**
+ * If `function` is a coroutine, then this gives the `std::experimental::resumable_traits`
+ * instance associated with it, and the variables representing the `handle` and `promise`
+ * for it.
+ */
+coroutine(
+  unique int function: @function ref,
+  int traits: @type ref
+);
+
+/*
+case @coroutine_placeholder_variable.kind of
+  1 = @handle
+| 2 = @promise
+| 3 = @init_await_resume
+;
+*/
+
+coroutine_placeholder_variable(
+  unique int placeholder_variable: @variable ref,
+  int kind: int ref,
+  int function: @function ref
+)
+
+/** The `new` function used for allocating the coroutine state, if any. */
+coroutine_new(
+  unique int function: @function ref,
+  int new: @function ref
+);
+
+/** The `delete` function used for deallocating the coroutine state, if any. */
+coroutine_delete(
+  unique int function: @function ref,
+  int delete: @function ref
+);
+
+purefunctions(unique int id: @function ref);
+
+function_deleted(unique int id: @function ref);
+
+function_defaulted(unique int id: @function ref);
+
+function_prototyped(unique int id: @function ref)
+
+deduction_guide_for_class(
+    int id: @function ref,
+    int class_template: @usertype ref
+)
+
+member_function_this_type(
+    unique int id: @function ref,
+    int this_type: @type ref
+);
+
+#keyset[id, type_id]
+fun_decls(
+    int id: @fun_decl,
+    int function: @function ref,
+    int type_id: @type ref,
+    string name: string ref,
+    int location: @location_default ref
+);
+fun_def(unique int id: @fun_decl ref);
+fun_specialized(unique int id: @fun_decl ref);
+fun_implicit(unique int id: @fun_decl ref);
+fun_decl_specifiers(
+    int id: @fun_decl ref,
+    string name: string ref
+)
+#keyset[fun_decl, index]
+fun_decl_throws(
+    int fun_decl: @fun_decl ref,
+    int index: int ref,
+    int type_id: @type ref
+);
+/* an empty throw specification is different from none */
+fun_decl_empty_throws(unique int fun_decl: @fun_decl ref);
+fun_decl_noexcept(
+    int fun_decl: @fun_decl ref,
+    int constant: @expr ref
+);
+fun_decl_empty_noexcept(int fun_decl: @fun_decl ref);
+fun_decl_typedef_type(
+    unique int fun_decl: @fun_decl ref,
+    int typedeftype_id: @usertype ref
+);
+
+param_decl_bind(
+    unique int id: @var_decl ref,
+    int index: int ref,
+    int fun_decl: @fun_decl ref
+);
+
+#keyset[id, type_id]
+var_decls(
+    int id: @var_decl,
+    int variable: @variable ref,
+    int type_id: @type ref,
+    string name: string ref,
+    int location: @location_default ref
+);
+var_def(unique int id: @var_decl ref);
+var_decl_specifiers(
+    int id: @var_decl ref,
+    string name: string ref
+)
+is_structured_binding(unique int id: @variable ref);
+
+type_decls(
+    unique int id: @type_decl,
+    int type_id: @type ref,
+    int location: @location_default ref
+);
+type_def(unique int id: @type_decl ref);
+type_decl_top(
+    unique int type_decl: @type_decl ref
+);
+
+namespace_decls(
+    unique int id: @namespace_decl,
+    int namespace_id: @namespace ref,
+    int location: @location_default ref,
+    int bodylocation: @location_default ref
+);
+
+case @using.kind of
+  1 = @using_declaration
+| 2 = @using_directive
+| 3 = @using_enum_declaration
+;
+
+usings(
+    unique int id: @using,
+    int element_id: @element ref,
+    int location: @location_default ref,
+    int kind: int ref
+);
+
+/** The element which contains the `using` declaration. */
+using_container(
+    int parent: @element ref,
+    int child: @using ref
+);
+
+static_asserts(
+    unique int id: @static_assert,
+    int condition : @expr ref,
+    string message : string ref,
+    int location: @location_default ref,
+    int enclosing : @element ref
+);
+
+// each function has an ordered list of parameters
+#keyset[id, type_id]
+#keyset[function, index, type_id]
+params(
+    int id: @parameter,
+    int function: @functionorblock ref,
+    int index: int ref,
+    int type_id: @type ref
+);
+
+overrides(
+    int new: @function ref,
+    int old: @function ref
+);
+
+#keyset[id, type_id]
+membervariables(
+    int id: @membervariable,
+    int type_id: @type ref,
+    string name: string ref
+);
+
+#keyset[id, type_id]
+globalvariables(
+    int id: @globalvariable,
+    int type_id: @type ref,
+    string name: string ref
+);
+
+#keyset[id, type_id]
+localvariables(
+    int id: @localvariable,
+    int type_id: @type ref,
+    string name: string ref
+);
+
+autoderivation(
+    unique int var: @variable ref,
+    int derivation_type: @type ref
+);
+
+orphaned_variables(
+    int var: @localvariable ref,
+    int function: @function ref
+)
+
+enumconstants(
+    unique int id: @enumconstant,
+    int parent: @usertype ref,
+    int index: int ref,
+    int type_id: @type ref,
+    string name: string ref,
+    int location: @location_default ref
+);
+
+@variable = @localscopevariable | @globalvariable | @membervariable;
+
+@localscopevariable = @localvariable | @parameter;
+
+/**
+ * Built-in types are the fundamental types, e.g., integral, floating, and void.
+ */
+case @builtintype.kind of
+   1 = @errortype
+|  2 = @unknowntype
+|  3 = @void
+|  4 = @boolean
+|  5 = @char
+|  6 = @unsigned_char
+|  7 = @signed_char
+|  8 = @short
+|  9 = @unsigned_short
+| 10 = @signed_short
+| 11 = @int
+| 12 = @unsigned_int
+| 13 = @signed_int
+| 14 = @long
+| 15 = @unsigned_long
+| 16 = @signed_long
+| 17 = @long_long
+| 18 = @unsigned_long_long
+| 19 = @signed_long_long
+// ... 20 Microsoft-specific __int8
+// ... 21 Microsoft-specific __int16
+// ... 22 Microsoft-specific __int32
+// ... 23 Microsoft-specific __int64
+| 24 = @float
+| 25 = @double
+| 26 = @long_double
+| 27 = @complex_float         // C99-specific _Complex float
+| 28 = @complex_double        // C99-specific _Complex double
+| 29 = @complex_long_double   // C99-specific _Complex long double
+| 30 = @imaginary_float       // C99-specific _Imaginary float
+| 31 = @imaginary_double      // C99-specific _Imaginary double
+| 32 = @imaginary_long_double // C99-specific _Imaginary long double
+| 33 = @wchar_t               // Microsoft-specific
+| 34 = @decltype_nullptr      // C++11
+| 35 = @int128                // __int128
+| 36 = @unsigned_int128       // unsigned __int128
+| 37 = @signed_int128         // signed __int128
+| 38 = @float128              // __float128
+| 39 = @complex_float128      // _Complex __float128
+| 40 = @decimal32             // _Decimal32
+| 41 = @decimal64             // _Decimal64
+| 42 = @decimal128            // _Decimal128
+| 43 = @char16_t
+| 44 = @char32_t
+| 45 = @std_float32           // _Float32
+| 46 = @float32x              // _Float32x
+| 47 = @std_float64           // _Float64
+| 48 = @float64x              // _Float64x
+| 49 = @std_float128          // _Float128
+// ... 50 _Float128x
+| 51 = @char8_t
+| 52 = @float16               // _Float16
+| 53 = @complex_float16       // _Complex _Float16
+| 54 = @fp16                  // __fp16
+| 55 = @std_bfloat16          // __bf16
+| 56 = @std_float16           // std::float16_t
+| 57 = @complex_std_float32   // _Complex _Float32
+| 58 = @complex_float32x      // _Complex _Float32x
+| 59 = @complex_std_float64   // _Complex _Float64
+| 60 = @complex_float64x      // _Complex _Float64x
+| 61 = @complex_std_float128  // _Complex _Float128
+;
+
+builtintypes(
+    unique int id: @builtintype,
+    string name: string ref,
+    int kind: int ref,
+    int size: int ref,
+    int sign: int ref,
+    int alignment: int ref
+);
+
+/**
+ * Derived types are types that are directly derived from existing types and
+ * point to, refer to, transform type data to return a new type.
+ */
+case @derivedtype.kind of
+   1 = @pointer
+|  2 = @reference
+|  3 = @type_with_specifiers
+|  4 = @array
+|  5 = @gnu_vector
+|  6 = @routineptr
+|  7 = @routinereference
+|  8 = @rvalue_reference // C++11
+// ... 9 type_conforming_to_protocols deprecated
+| 10 = @block
+;
+
+derivedtypes(
+    unique int id: @derivedtype,
+    string name: string ref,
+    int kind: int ref,
+    int type_id: @type ref
+);
+
+pointerishsize(unique int id: @derivedtype ref,
+    int size: int ref,
+    int alignment: int ref);
+
+arraysizes(
+    unique int id: @derivedtype ref,
+    int num_elements: int ref,
+    int bytesize: int ref,
+    int alignment: int ref
+);
+
+typedefbase(
+    unique int id: @usertype ref,
+    int type_id: @type ref
+);
+
+/**
+ * An instance of the C++11 `decltype` operator.  For example:
+ * ```
+ * int a;
+ * decltype(1+a) b;
+ * ```
+ * Here `expr` is `1+a`.
+ *
+ * Sometimes an additional pair of parentheses around the expression
+ * would change the semantics of this decltype, e.g.
+ * ```
+ * struct A { double x; };
+ * const A* a = new A();
+ * decltype( a->x ); // type is double
+ * decltype((a->x)); // type is const double&
+ * ```
+ * (Please consult the C++11 standard for more details).
+ * `parentheses_would_change_meaning` is `true` iff that is the case.
+ */
+#keyset[id, expr]
+decltypes(
+    int id: @decltype,
+    int expr: @expr ref,
+    int base_type: @type ref,
+    boolean parentheses_would_change_meaning: boolean ref
+);
+
+/*
+case @usertype.kind of
+   1 = @struct
+|  2 = @class
+|  3 = @union
+|  4 = @enum
+|  5 = @typedef                       // classic C: typedef typedef type name
+|  6 = @template
+|  7 = @template_parameter
+|  8 = @template_template_parameter
+|  9 = @proxy_class                   // a proxy class associated with a template parameter
+// ... 10 objc_class deprecated
+// ... 11 objc_protocol deprecated
+// ... 12 objc_category deprecated
+| 13 = @scoped_enum
+| 14 = @using_alias                  // a using name = type style typedef
+;
+*/
+
+usertypes(
+    unique int id: @usertype,
+    string name: string ref,
+    int kind: int ref
+);
+
+usertypesize(
+    unique int id: @usertype ref,
+    int size: int ref,
+    int alignment: int ref
+);
+
+usertype_final(unique int id: @usertype ref);
+
+usertype_uuid(
+    unique int id: @usertype ref,
+    string uuid: string ref
+);
+
+mangled_name(
+    unique int id: @declaration ref,
+    int mangled_name : @mangledname,
+    boolean is_complete: boolean ref
+);
+
+is_pod_class(unique int id: @usertype ref);
+is_standard_layout_class(unique int id: @usertype ref);
+
+is_complete(unique int id: @usertype ref);
+
+is_class_template(unique int id: @usertype ref);
+class_instantiation(
+    int to: @usertype ref,
+    int from: @usertype ref
+);
+class_template_argument(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+class_template_argument_value(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+is_proxy_class_for(
+    unique int id: @usertype ref,
+    unique int templ_param_id: @usertype ref
+);
+
+type_mentions(
+    unique int id: @type_mention,
+    int type_id: @type ref,
+    int location: @location ref,
+    // a_symbol_reference_kind from the frontend.
+    int kind: int ref
+);
+
+is_function_template(unique int id: @function ref);
+function_instantiation(
+    unique int to: @function ref,
+    int from: @function ref
+);
+function_template_argument(
+    int function_id: @function ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+function_template_argument_value(
+    int function_id: @function ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+is_variable_template(unique int id: @variable ref);
+variable_instantiation(
+    unique int to: @variable ref,
+    int from: @variable ref
+);
+variable_template_argument(
+    int variable_id: @variable ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+variable_template_argument_value(
+    int variable_id: @variable ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+routinetypes(
+    unique int id: @routinetype,
+    int return_type: @type ref
+);
+
+routinetypeargs(
+    int routine: @routinetype ref,
+    int index: int ref,
+    int type_id: @type ref
+);
+
+ptrtomembers(
+    unique int id: @ptrtomember,
+    int type_id: @type ref,
+    int class_id: @type ref
+);
+
+/*
+ specifiers for types, functions, and variables
+
+    "public",
+    "protected",
+    "private",
+
+    "const",
+    "volatile",
+    "static",
+
+    "pure",
+    "virtual",
+    "sealed", // Microsoft
+    "__interface", // Microsoft
+    "inline",
+    "explicit",
+
+    "near", // near far extension
+    "far", // near far extension
+    "__ptr32", // Microsoft
+    "__ptr64", // Microsoft
+    "__sptr", // Microsoft
+    "__uptr", // Microsoft
+    "dllimport", // Microsoft
+    "dllexport", // Microsoft
+    "thread", // Microsoft
+    "naked", // Microsoft
+    "microsoft_inline", // Microsoft
+    "forceinline", // Microsoft
+    "selectany", // Microsoft
+    "nothrow", // Microsoft
+    "novtable", // Microsoft
+    "noreturn", // Microsoft
+    "noinline", // Microsoft
+    "noalias", // Microsoft
+    "restrict", // Microsoft
+*/
+
+specifiers(
+    unique int id: @specifier,
+    unique string str: string ref
+);
+
+typespecifiers(
+    int type_id: @type ref,
+    int spec_id: @specifier ref
+);
+
+funspecifiers(
+    int func_id: @function ref,
+    int spec_id: @specifier ref
+);
+
+varspecifiers(
+    int var_id: @accessible ref,
+    int spec_id: @specifier ref
+);
+
+explicit_specifier_exprs(
+    unique int func_id: @function ref,
+    int constant: @expr ref
+)
+
+attributes(
+    unique int id: @attribute,
+    int kind: int ref,
+    string name: string ref,
+    string name_space: string ref,
+    int location: @location_default ref
+);
+
+case @attribute.kind of
+  0 = @gnuattribute
+| 1 = @stdattribute
+| 2 = @declspec
+| 3 = @msattribute
+| 4 = @alignas
+// ... 5 @objc_propertyattribute deprecated
+;
+
+attribute_args(
+    unique int id: @attribute_arg,
+    int kind: int ref,
+    int attribute: @attribute ref,
+    int index: int ref,
+    int location: @location_default ref
+);
+
+case @attribute_arg.kind of
+  0 = @attribute_arg_empty
+| 1 = @attribute_arg_token
+| 2 = @attribute_arg_constant
+| 3 = @attribute_arg_type
+| 4 = @attribute_arg_constant_expr
+| 5 = @attribute_arg_expr
+;
+
+attribute_arg_value(
+    unique int arg: @attribute_arg ref,
+    string value: string ref
+);
+attribute_arg_type(
+    unique int arg: @attribute_arg ref,
+    int type_id: @type ref
+);
+attribute_arg_constant(
+    unique int arg: @attribute_arg ref,
+    int constant: @expr ref
+)
+attribute_arg_expr(
+    unique int arg: @attribute_arg ref,
+    int expr: @expr ref
+)
+attribute_arg_name(
+    unique int arg: @attribute_arg ref,
+    string name: string ref
+);
+
+typeattributes(
+    int type_id: @type ref,
+    int spec_id: @attribute ref
+);
+
+funcattributes(
+    int func_id: @function ref,
+    int spec_id: @attribute ref
+);
+
+varattributes(
+    int var_id: @accessible ref,
+    int spec_id: @attribute ref
+);
+
+stmtattributes(
+    int stmt_id: @stmt ref,
+    int spec_id: @attribute ref
+);
+
+@type = @builtintype
+      | @derivedtype
+      | @usertype
+      /* TODO | @fixedpointtype */
+      | @routinetype
+      | @ptrtomember
+      | @decltype;
+
+unspecifiedtype(
+    unique int type_id: @type ref,
+    int unspecified_type_id: @type ref
+);
+
+member(
+    int parent: @type ref,
+    int index: int ref,
+    int child: @member ref
+);
+
+@enclosingfunction_child = @usertype | @variable | @namespace
+
+enclosingfunction(
+    unique int child: @enclosingfunction_child ref,
+    int parent: @function ref
+);
+
+derivations(
+    unique int derivation: @derivation,
+    int sub: @type ref,
+    int index: int ref,
+    int super: @type ref,
+    int location: @location_default ref
+);
+
+derspecifiers(
+    int der_id: @derivation ref,
+    int spec_id: @specifier ref
+);
+
+/**
+ * Contains the byte offset of the base class subobject within the derived
+ * class. Only holds for non-virtual base classes, but see table
+ * `virtual_base_offsets` for offsets of virtual base class subobjects.
+ */
+direct_base_offsets(
+    unique int der_id: @derivation ref,
+    int offset: int ref
+);
+
+/**
+ * Contains the byte offset of the virtual base class subobject for class
+ * `super` within a most-derived object of class `sub`. `super` can be either a
+ * direct or indirect base class.
+ */
+#keyset[sub, super]
+virtual_base_offsets(
+    int sub: @usertype ref,
+    int super: @usertype ref,
+    int offset: int ref
+);
+
+frienddecls(
+    unique int id: @frienddecl,
+    int type_id: @type ref,
+    int decl_id: @declaration ref,
+    int location: @location_default ref
+);
+
+@declaredtype = @usertype ;
+
+@declaration = @function
+             | @declaredtype
+             | @variable
+             | @enumconstant
+             | @frienddecl;
+
+@member = @membervariable
+        | @function
+        | @declaredtype
+        | @enumconstant;
+
+@locatable = @diagnostic
+           | @declaration
+           | @ppd_include
+           | @ppd_define
+           | @macroinvocation
+           /*| @funcall*/
+           | @xmllocatable
+           | @attribute
+           | @attribute_arg;
+
+@namedscope = @namespace | @usertype;
+
+@element = @locatable
+         | @file
+         | @folder
+         | @specifier
+         | @type
+         | @expr
+         | @namespace
+         | @initialiser
+         | @stmt
+         | @derivation
+         | @comment
+         | @preprocdirect
+         | @fun_decl
+         | @var_decl
+         | @type_decl
+         | @namespace_decl
+         | @using
+         | @namequalifier
+         | @specialnamequalifyingelement
+         | @static_assert
+         | @type_mention
+         | @lambdacapture;
+
+@exprparent = @element;
+
+comments(
+    unique int id: @comment,
+    string contents: string ref,
+    int location: @location_default ref
+);
+
+commentbinding(
+    int id: @comment ref,
+    int element: @element ref
+);
+
+exprconv(
+    int converted: @expr ref,
+    unique int conversion: @expr ref
+);
+
+compgenerated(unique int id: @element ref);
+
+/**
+ * `destructor_call` destructs the `i`'th entity that should be
+ * destructed following `element`. Note that entities should be
+ * destructed in reverse construction order, so for a given `element`
+ * these should be called from highest to lowest `i`.
+ */
+#keyset[element, destructor_call]
+#keyset[element, i]
+synthetic_destructor_call(
+    int element: @element ref,
+    int i: int ref,
+    int destructor_call: @routineexpr ref
+);
+
+namespaces(
+    unique int id: @namespace,
+    string name: string ref
+);
+
+namespace_inline(
+    unique int id: @namespace ref
+);
+
+namespacembrs(
+    int parentid: @namespace ref,
+    unique int memberid: @namespacembr ref
+);
+
+@namespacembr = @declaration | @namespace;
+
+exprparents(
+    int expr_id: @expr ref,
+    int child_index: int ref,
+    int parent_id: @exprparent ref
+);
+
+expr_isload(unique int expr_id: @expr ref);
+
+@cast = @c_style_cast
+      | @const_cast
+      | @dynamic_cast
+      | @reinterpret_cast
+      | @static_cast
+      ;
+
+/*
+case @conversion.kind of
+  0 = @simple_conversion           // a numeric conversion, qualification conversion, or a reinterpret_cast
+| 1 = @bool_conversion             // conversion to 'bool'
+| 2 = @base_class_conversion       // a derived-to-base conversion
+| 3 = @derived_class_conversion    // a base-to-derived conversion
+| 4 = @pm_base_class_conversion    // a derived-to-base conversion of a pointer to member
+| 5 = @pm_derived_class_conversion // a base-to-derived conversion of a pointer to member
+| 6 = @glvalue_adjust              // an adjustment of the type of a glvalue
+| 7 = @prvalue_adjust              // an adjustment of the type of a prvalue
+;
+*/
+/**
+ * Describes the semantics represented by a cast expression. This is largely
+ * independent of the source syntax of the cast, so it is separate from the
+ * regular expression kind.
+ */
+conversionkinds(
+    unique int expr_id: @cast ref,
+    int kind: int ref
+);
+
+@conversion = @cast
+            | @array_to_pointer
+            | @parexpr
+            | @reference_to
+            | @ref_indirect
+            | @temp_init
+            | @c11_generic
+            ;
+
+/*
+case @funbindexpr.kind of
+  0 = @normal_call  // a normal call
+| 1 = @virtual_call // a virtual call
+| 2 = @adl_call     // a call whose target is only found by ADL
+;
+*/
+iscall(
+    unique int caller: @funbindexpr ref,
+    int kind: int ref
+);
+
+numtemplatearguments(
+    unique int expr_id: @expr ref,
+    int num: int ref
+);
+
+specialnamequalifyingelements(
+    unique int id: @specialnamequalifyingelement,
+    unique string name: string ref
+);
+
+@namequalifiableelement = @expr | @namequalifier;
+@namequalifyingelement = @namespace
+                       | @specialnamequalifyingelement
+                       | @usertype;
+
+namequalifiers(
+    unique int id: @namequalifier,
+    unique int qualifiableelement: @namequalifiableelement ref,
+    int qualifyingelement: @namequalifyingelement ref,
+    int location: @location_default ref
+);
+
+varbind(
+    int expr: @varbindexpr ref,
+    int var: @accessible ref
+);
+
+funbind(
+    int expr: @funbindexpr ref,
+    int fun: @function ref
+);
+
+@any_new_expr = @new_expr
+              | @new_array_expr;
+
+@new_or_delete_expr = @any_new_expr
+                    | @delete_expr
+                    | @delete_array_expr;
+
+@prefix_crement_expr = @preincrexpr | @predecrexpr;
+
+@postfix_crement_expr = @postincrexpr | @postdecrexpr;
+
+@increment_expr = @preincrexpr | @postincrexpr;
+
+@decrement_expr = @predecrexpr | @postdecrexpr;
+
+@crement_expr = @increment_expr | @decrement_expr;
+
+@un_arith_op_expr = @arithnegexpr
+                  | @unaryplusexpr
+                  | @conjugation
+                  | @realpartexpr
+                  | @imagpartexpr
+                  | @crement_expr
+                  ;
+
+@un_bitwise_op_expr = @complementexpr;
+
+@un_log_op_expr = @notexpr;
+
+@un_op_expr = @address_of
+            | @indirect
+            | @un_arith_op_expr
+            | @un_bitwise_op_expr
+            | @builtinaddressof
+            | @vec_fill
+            | @un_log_op_expr
+            | @co_await
+            | @co_yield
+            ;
+
+@bin_log_op_expr = @andlogicalexpr | @orlogicalexpr;
+
+@cmp_op_expr = @eq_op_expr | @rel_op_expr;
+
+@eq_op_expr = @eqexpr | @neexpr;
+
+@rel_op_expr = @gtexpr
+             | @ltexpr
+             | @geexpr
+             | @leexpr
+             | @spaceshipexpr
+             ;
+
+@bin_bitwise_op_expr = @lshiftexpr
+                     | @rshiftexpr
+                     | @andexpr
+                     | @orexpr
+                     | @xorexpr
+                     ;
+
+@p_arith_op_expr = @paddexpr
+                 | @psubexpr
+                 | @pdiffexpr
+                 ;
+
+@bin_arith_op_expr = @addexpr
+                   | @subexpr
+                   | @mulexpr
+                   | @divexpr
+                   | @remexpr
+                   | @jmulexpr
+                   | @jdivexpr
+                   | @fjaddexpr
+                   | @jfaddexpr
+                   | @fjsubexpr
+                   | @jfsubexpr
+                   | @minexpr
+                   | @maxexpr
+                   | @p_arith_op_expr
+                   ;
+
+@bin_op_expr = @bin_arith_op_expr
+             | @bin_bitwise_op_expr
+             | @cmp_op_expr
+             | @bin_log_op_expr
+             ;
+
+@op_expr = @un_op_expr
+         | @bin_op_expr
+         | @assign_expr
+         | @conditionalexpr
+         ;
+
+@assign_arith_expr = @assignaddexpr
+                   | @assignsubexpr
+                   | @assignmulexpr
+                   | @assigndivexpr
+                   | @assignremexpr
+                   ;
+
+@assign_bitwise_expr = @assignandexpr
+                     | @assignorexpr
+                     | @assignxorexpr
+                     | @assignlshiftexpr
+                     | @assignrshiftexpr
+                     ;
+
+@assign_pointer_expr = @assignpaddexpr
+                     | @assignpsubexpr
+                     ;
+
+@assign_op_expr = @assign_arith_expr
+                | @assign_bitwise_expr
+                | @assign_pointer_expr
+                ;
+
+@assign_expr = @assignexpr | @assign_op_expr | @blockassignexpr
+
+/*
+  Binary encoding of the allocator form.
+
+  case @allocator.form of
+    0 = plain
+  | 1 = alignment
+  ;
+*/
+
+/**
+ * The allocator function associated with a `new` or `new[]` expression.
+ * The `form` column specified whether the allocation call contains an alignment
+ * argument.
+ */
+expr_allocator(
+    unique int expr: @any_new_expr ref,
+    int func: @function ref,
+    int form: int ref
+);
+
+/*
+  Binary encoding of the deallocator form.
+
+  case @deallocator.form of
+    0 = plain
+  | 1 = size
+  | 2 = alignment
+  | 4 = destroying_delete
+  ;
+*/
+
+/**
+ * The deallocator function associated with a `delete`, `delete[]`, `new`, or
+ * `new[]` expression. For a `new` or `new[]` expression, the deallocator is the
+ * one used to free memory if the initialization throws an exception.
+ * The `form` column specifies whether the deallocation call contains a size
+ * argument, and alignment argument, or both.
+ */
+expr_deallocator(
+    unique int expr: @new_or_delete_expr ref,
+    int func: @function ref,
+    int form: int ref
+);
+
+/**
+ * Holds if the `@conditionalexpr` is of the two operand form
+ * `guard ? : false`.
+ */
+expr_cond_two_operand(
+    unique int cond: @conditionalexpr ref
+);
+
+/**
+ * The guard of `@conditionalexpr` `guard ? true : false`
+ */
+expr_cond_guard(
+    unique int cond: @conditionalexpr ref,
+    int guard: @expr ref
+);
+
+/**
+ * The expression used when the guard of `@conditionalexpr`
+ * `guard ? true : false` holds. For the two operand form
+ * `guard ?: false` consider using `expr_cond_guard` instead.
+ */
+expr_cond_true(
+    unique int cond: @conditionalexpr ref,
+    int true: @expr ref
+);
+
+/**
+ * The expression used when the guard of `@conditionalexpr`
+ * `guard ? true : false` does not hold.
+ */
+expr_cond_false(
+    unique int cond: @conditionalexpr ref,
+    int false: @expr ref
+);
+
+/** A string representation of the value. */
+values(
+    unique int id: @value,
+    string str: string ref
+);
+
+/** The actual text in the source code for the value, if any. */
+valuetext(
+    unique int id: @value ref,
+    string text: string ref
+);
+
+valuebind(
+    int val: @value ref,
+    unique int expr: @expr ref
+);
+
+fieldoffsets(
+    unique int id: @variable ref,
+    int byteoffset: int ref,
+    int bitoffset: int ref
+);
+
+bitfield(
+    unique int id: @variable ref,
+    int bits: int ref,
+    int declared_bits: int ref
+);
+
+/* TODO
+memberprefix(
+    int member: @expr ref,
+    int prefix: @expr ref
+);
+*/
+
+/*
+   kind(1) = mbrcallexpr
+   kind(2) = mbrptrcallexpr
+   kind(3) = mbrptrmbrcallexpr
+   kind(4) = ptrmbrptrmbrcallexpr
+   kind(5) = mbrreadexpr // x.y
+   kind(6) = mbrptrreadexpr // p->y
+   kind(7) = mbrptrmbrreadexpr // x.*pm
+   kind(8) = mbrptrmbrptrreadexpr // x->*pm
+   kind(9) = staticmbrreadexpr // static x.y
+   kind(10) = staticmbrptrreadexpr // static p->y
+*/
+/* TODO
+memberaccess(
+    int member: @expr ref,
+    int kind: int ref
+);
+*/
+
+initialisers(
+    unique int init: @initialiser,
+    int var: @accessible ref,
+    unique int expr: @expr ref,
+    int location: @location_expr ref
+);
+
+braced_initialisers(
+    int init: @initialiser ref
+);
+
+/**
+ * An ancestor for the expression, for cases in which we cannot
+ * otherwise find the expression's parent.
+ */
+expr_ancestor(
+    int exp: @expr ref,
+    int ancestor: @element ref
+);
+
+exprs(
+    unique int id: @expr,
+    int kind: int ref,
+    int location: @location_expr ref
+);
+
+expr_reuse(
+    int reuse: @expr ref,
+    int original: @expr ref,
+    int value_category: int ref
+)
+
+/*
+  case @value.category of
+    1 = prval
+  | 2 = xval
+  | 3 = lval
+  ;
+*/
+expr_types(
+    int id: @expr ref,
+    int typeid: @type ref,
+    int value_category: int ref
+);
+
+case @expr.kind of
+    1 = @errorexpr
+|   2 = @address_of // & AddressOfExpr
+|   3 = @reference_to // ReferenceToExpr (implicit?)
+|   4 = @indirect // * PointerDereferenceExpr
+|   5 = @ref_indirect // ReferenceDereferenceExpr (implicit?)
+// ...
+|   8 = @array_to_pointer // (???)
+|   9 = @vacuous_destructor_call // VacuousDestructorCall
+// ...
+|  11 = @assume // Microsoft
+|  12 = @parexpr
+|  13 = @arithnegexpr
+|  14 = @unaryplusexpr
+|  15 = @complementexpr
+|  16 = @notexpr
+|  17 = @conjugation // GNU ~ operator
+|  18 = @realpartexpr // GNU __real
+|  19 = @imagpartexpr // GNU __imag
+|  20 = @postincrexpr
+|  21 = @postdecrexpr
+|  22 = @preincrexpr
+|  23 = @predecrexpr
+|  24 = @conditionalexpr
+|  25 = @addexpr
+|  26 = @subexpr
+|  27 = @mulexpr
+|  28 = @divexpr
+|  29 = @remexpr
+|  30 = @jmulexpr // C99 mul imaginary
+|  31 = @jdivexpr // C99 div imaginary
+|  32 = @fjaddexpr // C99 add real + imaginary
+|  33 = @jfaddexpr // C99 add imaginary + real
+|  34 = @fjsubexpr // C99 sub real - imaginary
+|  35 = @jfsubexpr // C99 sub imaginary - real
+|  36 = @paddexpr // pointer add (pointer + int or int + pointer)
+|  37 = @psubexpr // pointer sub (pointer - integer)
+|  38 = @pdiffexpr // difference between two pointers
+|  39 = @lshiftexpr
+|  40 = @rshiftexpr
+|  41 = @andexpr
+|  42 = @orexpr
+|  43 = @xorexpr
+|  44 = @eqexpr
+|  45 = @neexpr
+|  46 = @gtexpr
+|  47 = @ltexpr
+|  48 = @geexpr
+|  49 = @leexpr
+|  50 = @minexpr // GNU minimum
+|  51 = @maxexpr // GNU maximum
+|  52 = @assignexpr
+|  53 = @assignaddexpr
+|  54 = @assignsubexpr
+|  55 = @assignmulexpr
+|  56 = @assigndivexpr
+|  57 = @assignremexpr
+|  58 = @assignlshiftexpr
+|  59 = @assignrshiftexpr
+|  60 = @assignandexpr
+|  61 = @assignorexpr
+|  62 = @assignxorexpr
+|  63 = @assignpaddexpr // assign pointer add
+|  64 = @assignpsubexpr // assign pointer sub
+|  65 = @andlogicalexpr
+|  66 = @orlogicalexpr
+|  67 = @commaexpr
+|  68 = @subscriptexpr // access to member of an array, e.g., a[5]
+// ...  69 @objc_subscriptexpr deprecated
+// ...  70 @cmdaccess deprecated
+// ...
+|  73 = @virtfunptrexpr
+|  74 = @callexpr
+// ...  75 @msgexpr_normal deprecated
+// ...  76 @msgexpr_super deprecated
+// ...  77 @atselectorexpr deprecated
+// ...  78 @atprotocolexpr deprecated
+|  79 = @vastartexpr
+|  80 = @vaargexpr
+|  81 = @vaendexpr
+|  82 = @vacopyexpr
+// ...  83 @atencodeexpr deprecated
+|  84 = @varaccess
+|  85 = @thisaccess
+// ...  86 @objc_box_expr deprecated
+|  87 = @new_expr
+|  88 = @delete_expr
+|  89 = @throw_expr
+|  90 = @condition_decl // a variable declared in a condition, e.g., if(int x = y > 2)
+|  91 = @braced_init_list
+|  92 = @type_id
+|  93 = @runtime_sizeof
+|  94 = @runtime_alignof
+|  95 = @sizeof_pack
+|  96 = @expr_stmt // GNU extension
+|  97 = @routineexpr
+|  98 = @type_operand // used to access a type in certain contexts (haven't found any examples yet....)
+|  99 = @offsetofexpr // offsetof ::= type and field
+| 100 = @hasassignexpr // __has_assign ::= type
+| 101 = @hascopyexpr // __has_copy ::= type
+| 102 = @hasnothrowassign // __has_nothrow_assign ::= type
+| 103 = @hasnothrowconstr // __has_nothrow_constructor ::= type
+| 104 = @hasnothrowcopy // __has_nothrow_copy ::= type
+| 105 = @hastrivialassign // __has_trivial_assign ::= type
+| 106 = @hastrivialconstr // __has_trivial_constructor ::= type
+| 107 = @hastrivialcopy // __has_trivial_copy ::= type
+| 108 = @hasuserdestr // __has_user_destructor ::= type
+| 109 = @hasvirtualdestr // __has_virtual_destructor ::= type
+| 110 = @isabstractexpr // __is_abstract ::= type
+| 111 = @isbaseofexpr // __is_base_of ::= type type
+| 112 = @isclassexpr // __is_class ::= type
+| 113 = @isconvtoexpr // __is_convertible_to ::= type type
+| 114 = @isemptyexpr // __is_empty ::= type
+| 115 = @isenumexpr // __is_enum ::= type
+| 116 = @ispodexpr // __is_pod ::= type
+| 117 = @ispolyexpr // __is_polymorphic ::= type
+| 118 = @isunionexpr // __is_union ::= type
+| 119 = @typescompexpr // GNU __builtin_types_compatible ::= type type
+| 120 = @intaddrexpr // frontend internal builtin, used to implement offsetof
+// ...
+| 122 = @hastrivialdestructor // __has_trivial_destructor ::= type
+| 123 = @literal
+| 124 = @uuidof
+| 127 = @aggregateliteral
+| 128 = @delete_array_expr
+| 129 = @new_array_expr
+// ... 130 @objc_array_literal deprecated
+// ... 131 @objc_dictionary_literal deprecated
+| 132 = @foldexpr
+// ...
+| 200 = @ctordirectinit
+| 201 = @ctorvirtualinit
+| 202 = @ctorfieldinit
+| 203 = @ctordelegatinginit
+| 204 = @dtordirectdestruct
+| 205 = @dtorvirtualdestruct
+| 206 = @dtorfielddestruct
+// ...
+| 210 = @static_cast
+| 211 = @reinterpret_cast
+| 212 = @const_cast
+| 213 = @dynamic_cast
+| 214 = @c_style_cast
+| 215 = @lambdaexpr
+| 216 = @param_ref
+| 217 = @noopexpr
+// ...
+| 294 = @istriviallyconstructibleexpr
+| 295 = @isdestructibleexpr
+| 296 = @isnothrowdestructibleexpr
+| 297 = @istriviallydestructibleexpr
+| 298 = @istriviallyassignableexpr
+| 299 = @isnothrowassignableexpr
+| 300 = @istrivialexpr
+| 301 = @isstandardlayoutexpr
+| 302 = @istriviallycopyableexpr
+| 303 = @isliteraltypeexpr
+| 304 = @hastrivialmoveconstructorexpr
+| 305 = @hastrivialmoveassignexpr
+| 306 = @hasnothrowmoveassignexpr
+| 307 = @isconstructibleexpr
+| 308 = @isnothrowconstructibleexpr
+| 309 = @hasfinalizerexpr
+| 310 = @isdelegateexpr
+| 311 = @isinterfaceclassexpr
+| 312 = @isrefarrayexpr
+| 313 = @isrefclassexpr
+| 314 = @issealedexpr
+| 315 = @issimplevalueclassexpr
+| 316 = @isvalueclassexpr
+| 317 = @isfinalexpr
+| 319 = @noexceptexpr
+| 320 = @builtinshufflevector
+| 321 = @builtinchooseexpr
+| 322 = @builtinaddressof
+| 323 = @vec_fill
+| 324 = @builtinconvertvector
+| 325 = @builtincomplex
+| 326 = @spaceshipexpr
+| 327 = @co_await
+| 328 = @co_yield
+| 329 = @temp_init
+| 330 = @isassignable
+| 331 = @isaggregate
+| 332 = @hasuniqueobjectrepresentations
+| 333 = @builtinbitcast
+| 334 = @builtinshuffle
+| 335 = @blockassignexpr
+| 336 = @issame
+| 337 = @isfunction
+| 338 = @islayoutcompatible
+| 339 = @ispointerinterconvertiblebaseof
+| 340 = @isarray
+| 341 = @arrayrank
+| 342 = @arrayextent
+| 343 = @isarithmetic
+| 344 = @iscompletetype
+| 345 = @iscompound
+| 346 = @isconst
+| 347 = @isfloatingpoint
+| 348 = @isfundamental
+| 349 = @isintegral
+| 350 = @islvaluereference
+| 351 = @ismemberfunctionpointer
+| 352 = @ismemberobjectpointer
+| 353 = @ismemberpointer
+| 354 = @isobject
+| 355 = @ispointer
+| 356 = @isreference
+| 357 = @isrvaluereference
+| 358 = @isscalar
+| 359 = @issigned
+| 360 = @isunsigned
+| 361 = @isvoid
+| 362 = @isvolatile
+| 363 = @reuseexpr
+| 364 = @istriviallycopyassignable
+| 365 = @isassignablenopreconditioncheck
+| 366 = @referencebindstotemporary
+| 367 = @issameas
+| 368 = @builtinhasattribute
+| 369 = @ispointerinterconvertiblewithclass
+| 370 = @builtinispointerinterconvertiblewithclass
+| 371 = @iscorrespondingmember
+| 372 = @builtiniscorrespondingmember
+| 373 = @isboundedarray
+| 374 = @isunboundedarray
+| 375 = @isreferenceable
+| 378 = @isnothrowconvertible
+| 379 = @referenceconstructsfromtemporary
+| 380 = @referenceconvertsfromtemporary
+| 381 = @isconvertible
+| 382 = @isvalidwinrttype
+| 383 = @iswinclass
+| 384 = @iswininterface
+| 385 = @istriviallyequalitycomparable
+| 386 = @isscopedenum
+| 387 = @istriviallyrelocatable
+| 388 = @datasizeof
+| 389 = @c11_generic
+;
+
+@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
+            ;
+
+new_allocated_type(
+    unique int expr: @new_expr ref,
+    int type_id: @type ref
+);
+
+new_array_allocated_type(
+    unique int expr: @new_array_expr ref,
+    int type_id: @type ref
+);
+
+/**
+ * The field being initialized by an initializer expression within an aggregate
+ * initializer for a class/struct/union. Position is used to sort repeated initializers.
+ */
+#keyset[aggregate, position]
+aggregate_field_init(
+    int aggregate: @aggregateliteral ref,
+    int initializer: @expr ref,
+    int field: @membervariable ref,
+    int position: int ref
+);
+
+/**
+ * The index of the element being initialized by an initializer expression
+ * within an aggregate initializer for an array. Position is used to sort repeated initializers.
+ */
+#keyset[aggregate, position]
+aggregate_array_init(
+    int aggregate: @aggregateliteral ref,
+    int initializer: @expr ref,
+    int element_index: int ref,
+    int position: int ref
+);
+
+@ctorinit = @ctordirectinit
+          | @ctorvirtualinit
+          | @ctorfieldinit
+          | @ctordelegatinginit;
+@dtordestruct = @dtordirectdestruct
+              | @dtorvirtualdestruct
+              | @dtorfielddestruct;
+
+
+condition_decl_bind(
+    unique int expr: @condition_decl ref,
+    unique int decl: @declaration ref
+);
+
+typeid_bind(
+    unique int expr: @type_id ref,
+    int type_id: @type ref
+);
+
+uuidof_bind(
+    unique int expr: @uuidof ref,
+    int type_id: @type ref
+);
+
+@runtime_sizeof_or_alignof = @runtime_sizeof | @runtime_alignof | @datasizeof;
+
+sizeof_bind(
+    unique int expr: @runtime_sizeof_or_alignof ref,
+    int type_id: @type ref
+);
+
+code_block(
+    unique int block: @literal ref,
+    unique int routine: @function ref
+);
+
+lambdas(
+    unique int expr: @lambdaexpr ref,
+    string default_capture: string ref,
+    boolean has_explicit_return_type: boolean ref
+);
+
+lambda_capture(
+    unique int id: @lambdacapture,
+    int lambda: @lambdaexpr ref,
+    int index: int ref,
+    int field: @membervariable ref,
+    boolean captured_by_reference: boolean ref,
+    boolean is_implicit: boolean ref,
+    int location: @location_default ref
+);
+
+@funbindexpr = @routineexpr
+             | @new_expr
+             | @delete_expr
+             | @delete_array_expr
+             | @ctordirectinit
+             | @ctorvirtualinit
+             | @ctordelegatinginit
+             | @dtordirectdestruct
+             | @dtorvirtualdestruct;
+
+@varbindexpr = @varaccess | @ctorfieldinit | @dtorfielddestruct;
+@addressable = @function | @variable ;
+@accessible = @addressable | @enumconstant ;
+
+@access = @varaccess | @routineexpr ;
+
+fold(
+    int expr: @foldexpr ref,
+    string operator: string ref,
+    boolean is_left_fold: boolean ref
+);
+
+stmts(
+    unique int id: @stmt,
+    int kind: int ref,
+    int location: @location_stmt ref
+);
+
+case @stmt.kind of
+    1 = @stmt_expr
+|   2 = @stmt_if
+|   3 = @stmt_while
+|   4 = @stmt_goto
+|   5 = @stmt_label
+|   6 = @stmt_return
+|   7 = @stmt_block
+|   8 = @stmt_end_test_while // do { ... } while ( ... )
+|   9 = @stmt_for
+|  10 = @stmt_switch_case
+|  11 = @stmt_switch
+|  13 = @stmt_asm // "asm" statement or the body of an asm function
+|  15 = @stmt_try_block
+|  16 = @stmt_microsoft_try // Microsoft
+|  17 = @stmt_decl
+|  18 = @stmt_set_vla_size // C99
+|  19 = @stmt_vla_decl // C99
+|  25 = @stmt_assigned_goto // GNU
+|  26 = @stmt_empty
+|  27 = @stmt_continue
+|  28 = @stmt_break
+|  29 = @stmt_range_based_for // C++11
+// ...  30 @stmt_at_autoreleasepool_block deprecated
+// ...  31 @stmt_objc_for_in deprecated
+// ...  32 @stmt_at_synchronized deprecated
+|  33 = @stmt_handler
+// ...  34 @stmt_finally_end deprecated
+|  35 = @stmt_constexpr_if
+|  37 = @stmt_co_return
+;
+
+type_vla(
+    int type_id: @type ref,
+    int decl: @stmt_vla_decl ref
+);
+
+variable_vla(
+    int var: @variable ref,
+    int decl: @stmt_vla_decl ref
+);
+
+if_initialization(
+    unique int if_stmt: @stmt_if ref,
+    int init_id: @stmt ref
+);
+
+if_then(
+    unique int if_stmt: @stmt_if ref,
+    int then_id: @stmt ref
+);
+
+if_else(
+    unique int if_stmt: @stmt_if ref,
+    int else_id: @stmt ref
+);
+
+constexpr_if_initialization(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int init_id: @stmt ref
+);
+
+constexpr_if_then(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int then_id: @stmt ref
+);
+
+constexpr_if_else(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int else_id: @stmt ref
+);
+
+while_body(
+    unique int while_stmt: @stmt_while ref,
+    int body_id: @stmt ref
+);
+
+do_body(
+    unique int do_stmt: @stmt_end_test_while ref,
+    int body_id: @stmt ref
+);
+
+switch_initialization(
+    unique int switch_stmt: @stmt_switch ref,
+    int init_id: @stmt ref
+);
+
+#keyset[switch_stmt, index]
+switch_case(
+    int switch_stmt: @stmt_switch ref,
+    int index: int ref,
+    int case_id: @stmt_switch_case ref
+);
+
+switch_body(
+    unique int switch_stmt: @stmt_switch ref,
+    int body_id: @stmt ref
+);
+
+@stmt_for_or_range_based_for = @stmt_for
+                             | @stmt_range_based_for;
+
+for_initialization(
+    unique int for_stmt: @stmt_for_or_range_based_for ref,
+    int init_id: @stmt ref
+);
+
+for_condition(
+    unique int for_stmt: @stmt_for ref,
+    int condition_id: @expr ref
+);
+
+for_update(
+    unique int for_stmt: @stmt_for ref,
+    int update_id: @expr ref
+);
+
+for_body(
+    unique int for_stmt: @stmt_for ref,
+    int body_id: @stmt ref
+);
+
+@stmtparent = @stmt | @expr_stmt ;
+stmtparents(
+    unique int id: @stmt ref,
+    int index: int ref,
+    int parent: @stmtparent ref
+);
+
+ishandler(unique int block: @stmt_block ref);
+
+@cfgnode = @stmt | @expr | @function | @initialiser ;
+
+stmt_decl_bind(
+    int stmt: @stmt_decl ref,
+    int num: int ref,
+    int decl: @declaration ref
+);
+
+stmt_decl_entry_bind(
+    int stmt: @stmt_decl ref,
+    int num: int ref,
+    int decl_entry: @element ref
+);
+
+@functionorblock = @function | @stmt_block;
+
+blockscope(
+    unique int block: @stmt_block ref,
+    int enclosing: @functionorblock ref
+);
+
+@jump = @stmt_goto | @stmt_break | @stmt_continue;
+
+@jumporlabel = @jump | @stmt_label | @literal;
+
+jumpinfo(
+    unique int id: @jumporlabel ref,
+    string str: string ref,
+    int target: @stmt ref
+);
+
+preprocdirects(
+    unique int id: @preprocdirect,
+    int kind: int ref,
+    int location: @location_default ref
+);
+case @preprocdirect.kind of
+   0 = @ppd_if
+|  1 = @ppd_ifdef
+|  2 = @ppd_ifndef
+|  3 = @ppd_elif
+|  4 = @ppd_else
+|  5 = @ppd_endif
+|  6 = @ppd_plain_include
+|  7 = @ppd_define
+|  8 = @ppd_undef
+|  9 = @ppd_line
+| 10 = @ppd_error
+| 11 = @ppd_pragma
+| 12 = @ppd_objc_import
+| 13 = @ppd_include_next
+| 18 = @ppd_warning
+;
+
+@ppd_include = @ppd_plain_include | @ppd_objc_import | @ppd_include_next;
+
+@ppd_branch = @ppd_if | @ppd_ifdef | @ppd_ifndef | @ppd_elif;
+
+preprocpair(
+    int begin : @ppd_branch ref,
+    int elseelifend : @preprocdirect ref
+);
+
+preproctrue(int branch : @ppd_branch ref);
+preprocfalse(int branch : @ppd_branch ref);
+
+preproctext(
+    unique int id: @preprocdirect ref,
+    string head: string ref,
+    string body: string ref
+);
+
+includes(
+    unique int id: @ppd_include ref,
+    int included: @file ref
+);
+
+link_targets(
+    int id: @link_target,
+    int binary: @file ref
+);
+
+link_parent(
+    int element : @element ref,
+    int link_target : @link_target ref
+);
+
+/* XML Files */
+
+xmlEncoding(unique int id: @file ref, string encoding: string ref);
+
+xmlDTDs(
+    unique int id: @xmldtd,
+    string root: string ref,
+    string publicId: string ref,
+    string systemId: string ref,
+    int fileid: @file ref
+);
+
+xmlElements(
+    unique int id: @xmlelement,
+    string name: string ref,
+    int parentid: @xmlparent ref,
+    int idx: int ref,
+    int fileid: @file ref
+);
+
+xmlAttrs(
+    unique int id: @xmlattribute,
+    int elementid: @xmlelement ref,
+    string name: string ref,
+    string value: string ref,
+    int idx: int ref,
+    int fileid: @file ref
+);
+
+xmlNs(
+    int id: @xmlnamespace,
+    string prefixName: string ref,
+    string URI: string ref,
+    int fileid: @file ref
+);
+
+xmlHasNs(
+    int elementId: @xmlnamespaceable ref,
+    int nsId: @xmlnamespace ref,
+    int fileid: @file ref
+);
+
+xmlComments(
+    unique int id: @xmlcomment,
+    string text: string ref,
+    int parentid: @xmlparent ref,
+    int fileid: @file ref
+);
+
+xmlChars(
+    unique int id: @xmlcharacters,
+    string text: string ref,
+    int parentid: @xmlparent ref,
+    int idx: int ref,
+    int isCDATA: int ref,
+    int fileid: @file ref
+);
+
+@xmlparent = @file | @xmlelement;
+@xmlnamespaceable = @xmlelement | @xmlattribute;
+
+xmllocations(
+    int xmlElement: @xmllocatable ref,
+    int location: @location_default ref
+);
+
+@xmllocatable = @xmlcharacters
+              | @xmlelement
+              | @xmlcomment
+              | @xmlattribute
+              | @xmldtd
+              | @file
+              | @xmlnamespace;
diff --git a/cpp/downgrades/6f5d51e89e762fe4609fd4ac8ee3afb04221e873/upgrade.properties b/cpp/downgrades/6f5d51e89e762fe4609fd4ac8ee3afb04221e873/upgrade.properties
new file mode 100644
index 00000000000..89fbcd9b239
--- /dev/null
+++ b/cpp/downgrades/6f5d51e89e762fe4609fd4ac8ee3afb04221e873/upgrade.properties
@@ -0,0 +1,3 @@
+description: Add requires expr
+compatibility: partial
+exprs.rel: run exprs.qlo
diff --git a/cpp/downgrades/e51fad7a2436caefab0c6bd52f05e28e7cce4d92/exprs.ql b/cpp/downgrades/e51fad7a2436caefab0c6bd52f05e28e7cce4d92/exprs.ql
new file mode 100644
index 00000000000..1a52d6d48f7
--- /dev/null
+++ b/cpp/downgrades/e51fad7a2436caefab0c6bd52f05e28e7cce4d92/exprs.ql
@@ -0,0 +1,17 @@
+class Expr extends @expr {
+  string toString() { none() }
+}
+
+class Location extends @location_expr {
+  string toString() { none() }
+}
+
+predicate isExprRequirement(Expr expr) {
+  exists(int kind | exprs(expr, kind, _) | kind = [391, 392, 393])
+}
+
+from Expr expr, int kind, int kind_new, Location location
+where
+  exprs(expr, kind, location) and
+  if isExprRequirement(expr) then kind_new = 1 else kind_new = kind
+select expr, kind_new, location
diff --git a/cpp/downgrades/e51fad7a2436caefab0c6bd52f05e28e7cce4d92/old.dbscheme b/cpp/downgrades/e51fad7a2436caefab0c6bd52f05e28e7cce4d92/old.dbscheme
new file mode 100644
index 00000000000..e51fad7a243
--- /dev/null
+++ b/cpp/downgrades/e51fad7a2436caefab0c6bd52f05e28e7cce4d92/old.dbscheme
@@ -0,0 +1,2323 @@
+
+/**
+ * An invocation of the compiler. Note that more than one file may be
+ * compiled per invocation. For example, this command compiles three
+ * source files:
+ *
+ *   gcc -c f1.c f2.c f3.c
+ *
+ * The `id` simply identifies the invocation, while `cwd` is the working
+ * directory from which the compiler was invoked.
+ */
+compilations(
+    /**
+     * An invocation of the compiler. Note that more than one file may
+     * be compiled per invocation. For example, this command compiles
+     * three source files:
+     *
+     *   gcc -c f1.c f2.c f3.c
+     */
+    unique int id : @compilation,
+    string cwd : string ref
+);
+
+/**
+ * The arguments that were passed to the extractor for a compiler
+ * invocation. If `id` is for the compiler invocation
+ *
+ *   gcc -c f1.c f2.c f3.c
+ *
+ * then typically there will be rows for
+ *
+ * num | arg
+ * --- | ---
+ * 0   | *path to extractor*
+ * 1   | `--mimic`
+ * 2   | `/usr/bin/gcc`
+ * 3   | `-c`
+ * 4   | f1.c
+ * 5   | f2.c
+ * 6   | f3.c
+ */
+#keyset[id, num]
+compilation_args(
+    int id : @compilation ref,
+    int num : int ref,
+    string arg : string ref
+);
+
+/**
+ * The source files that are compiled by a compiler invocation.
+ * If `id` is for the compiler invocation
+ *
+ *   gcc -c f1.c f2.c f3.c
+ *
+ * then there will be rows for
+ *
+ * num | arg
+ * --- | ---
+ * 0   | f1.c
+ * 1   | f2.c
+ * 2   | f3.c
+ *
+ * Note that even if those files `#include` headers, those headers
+ * do not appear as rows.
+ */
+#keyset[id, num]
+compilation_compiling_files(
+    int id : @compilation ref,
+    int num : int ref,
+    int file : @file ref
+);
+
+/**
+ * The time taken by the extractor for a compiler invocation.
+ *
+ * For each file `num`, there will be rows for
+ *
+ * kind | seconds
+ * ---- | ---
+ * 1    | CPU seconds used by the extractor frontend
+ * 2    | Elapsed seconds during the extractor frontend
+ * 3    | CPU seconds used by the extractor backend
+ * 4    | Elapsed seconds during the extractor backend
+ */
+#keyset[id, num, kind]
+compilation_time(
+    int id : @compilation ref,
+    int num : int ref,
+    /* kind:
+       1 = frontend_cpu_seconds
+       2 = frontend_elapsed_seconds
+       3 = extractor_cpu_seconds
+       4 = extractor_elapsed_seconds
+    */
+    int kind : int ref,
+    float seconds : float ref
+);
+
+/**
+ * An error or warning generated by the extractor.
+ * The diagnostic message `diagnostic` was generated during compiler
+ * invocation `compilation`, and is the `file_number_diagnostic_number`th
+ * message generated while extracting the `file_number`th file of that
+ * invocation.
+ */
+#keyset[compilation, file_number, file_number_diagnostic_number]
+diagnostic_for(
+    int diagnostic : @diagnostic ref,
+    int compilation : @compilation ref,
+    int file_number : int ref,
+    int file_number_diagnostic_number : int ref
+);
+
+/**
+ * If extraction was successful, then `cpu_seconds` and
+ * `elapsed_seconds` are the CPU time and elapsed time (respectively)
+ * that extraction took for compiler invocation `id`.
+ */
+compilation_finished(
+    unique int id : @compilation ref,
+    float cpu_seconds : float ref,
+    float elapsed_seconds : float ref
+);
+
+
+/**
+ * External data, loaded from CSV files during snapshot creation. See
+ * [Tutorial: Incorporating external data](https://help.semmle.com/wiki/display/SD/Tutorial%3A+Incorporating+external+data)
+ * for more information.
+ */
+externalData(
+    int id : @externalDataElement,
+    string path : string ref,
+    int column: int ref,
+    string value : string ref
+);
+
+/**
+ * The source location of the snapshot.
+ */
+sourceLocationPrefix(string prefix : string ref);
+
+/**
+ * Information about packages that provide code used during compilation.
+ * The `id` is just a unique identifier.
+ * The `namespace` is typically the name of the package manager that
+ * provided the package (e.g. "dpkg" or "yum").
+ * The `package_name` is the name of the package, and `version` is its
+ * version (as a string).
+ */
+external_packages(
+    unique int id: @external_package,
+    string namespace : string ref,
+    string package_name : string ref,
+    string version : string ref
+);
+
+/**
+ * Holds if File `fileid` was provided by package `package`.
+ */
+header_to_external_package(
+    int fileid : @file ref,
+    int package : @external_package ref
+);
+
+/*
+ * Version history
+ */
+
+svnentries(
+    unique int id : @svnentry,
+    string revision : string ref,
+    string author : string ref,
+    date revisionDate : date ref,
+    int changeSize : int ref
+)
+
+svnaffectedfiles(
+    int id : @svnentry ref,
+    int file : @file ref,
+    string action : string ref
+)
+
+svnentrymsg(
+    unique int id : @svnentry ref,
+    string message : string ref
+)
+
+svnchurn(
+    int commit : @svnentry ref,
+    int file : @file ref,
+    int addedLines : int ref,
+    int deletedLines : int ref
+)
+
+/*
+ * C++ dbscheme
+ */
+
+extractor_version(
+    string codeql_version: string ref,
+    string frontend_version: string ref
+)
+
+@location = @location_stmt | @location_expr | @location_default ;
+
+/**
+ * The location of an element that is not an expression or a statement.
+ * The location spans column `startcolumn` of line `startline` to
+ * column `endcolumn` of line `endline` in file `file`.
+ * For more information, see
+ * [Locations](https://codeql.github.com/docs/writing-codeql-queries/providing-locations-in-codeql-queries/).
+ */
+locations_default(
+    /** The location of an element that is not an expression or a statement. */
+    unique int id: @location_default,
+    int container: @container ref,
+    int startLine: int ref,
+    int startColumn: int ref,
+    int endLine: int ref,
+    int endColumn: int ref
+);
+
+/**
+ * The location of a statement.
+ * The location spans column `startcolumn` of line `startline` to
+ * column `endcolumn` of line `endline` in file `file`.
+ * For more information, see
+ * [Locations](https://codeql.github.com/docs/writing-codeql-queries/providing-locations-in-codeql-queries/).
+ */
+locations_stmt(
+    /** The location of a statement. */
+    unique int id: @location_stmt,
+    int container: @container ref,
+    int startLine: int ref,
+    int startColumn: int ref,
+    int endLine: int ref,
+    int endColumn: int ref
+);
+
+/**
+ * The location of an expression.
+ * The location spans column `startcolumn` of line `startline` to
+ * column `endcolumn` of line `endline` in file `file`.
+ * For more information, see
+ * [Locations](https://codeql.github.com/docs/writing-codeql-queries/providing-locations-in-codeql-queries/).
+ */
+locations_expr(
+    /** The location of an expression. */
+    unique int id: @location_expr,
+    int container: @container ref,
+    int startLine: int ref,
+    int startColumn: int ref,
+    int endLine: int ref,
+    int endColumn: int ref
+);
+
+/** An element for which line-count information is available. */
+@sourceline = @file | @function | @variable | @enumconstant | @xmllocatable;
+
+numlines(
+    int element_id: @sourceline ref,
+    int num_lines: int ref,
+    int num_code: int ref,
+    int num_comment: int ref
+);
+
+diagnostics(
+    unique int id: @diagnostic,
+    int severity: int ref,
+    string error_tag: string ref,
+    string error_message: string ref,
+    string full_error_message: string ref,
+    int location: @location_default ref
+);
+
+files(
+    unique int id: @file,
+    string name: string ref
+);
+
+folders(
+    unique int id: @folder,
+    string name: string ref
+);
+
+@container = @folder | @file
+
+containerparent(
+    int parent: @container ref,
+    unique int child: @container ref
+);
+
+fileannotations(
+    int id: @file ref,
+    int kind: int ref,
+    string name: string ref,
+    string value: string ref
+);
+
+inmacroexpansion(
+    int id: @element ref,
+    int inv: @macroinvocation ref
+);
+
+affectedbymacroexpansion(
+    int id: @element ref,
+    int inv: @macroinvocation ref
+);
+
+case @macroinvocation.kind of
+  1 = @macro_expansion
+| 2 = @other_macro_reference
+;
+
+macroinvocations(
+    unique int id: @macroinvocation,
+    int macro_id: @ppd_define ref,
+    int location: @location_default ref,
+    int kind: int ref
+);
+
+macroparent(
+    unique int id: @macroinvocation ref,
+    int parent_id: @macroinvocation ref
+);
+
+// a macroinvocation may be part of another location
+// the way to find a constant expression that uses a macro
+// is thus to find a constant expression that has a location
+// to which a macro invocation is bound
+macrolocationbind(
+    int id: @macroinvocation ref,
+    int location: @location ref
+);
+
+#keyset[invocation, argument_index]
+macro_argument_unexpanded(
+    int invocation: @macroinvocation ref,
+    int argument_index: int ref,
+    string text: string ref
+);
+
+#keyset[invocation, argument_index]
+macro_argument_expanded(
+    int invocation: @macroinvocation ref,
+    int argument_index: int ref,
+    string text: string ref
+);
+
+/*
+case @function.kind of
+  1 = @normal_function
+| 2 = @constructor
+| 3 = @destructor
+| 4 = @conversion_function
+| 5 = @operator
+| 6 = @builtin_function     // GCC built-in functions, e.g. __builtin___memcpy_chk
+| 7 = @user_defined_literal
+| 8 = @deduction_guide
+;
+*/
+
+functions(
+    unique int id: @function,
+    string name: string ref,
+    int kind: int ref
+);
+
+function_entry_point(
+    int id: @function ref,
+    unique int entry_point: @stmt ref
+);
+
+function_return_type(
+    int id: @function ref,
+    int return_type: @type ref
+);
+
+/**
+ * If `function` is a coroutine, then this gives the `std::experimental::resumable_traits`
+ * instance associated with it, and the variables representing the `handle` and `promise`
+ * for it.
+ */
+coroutine(
+  unique int function: @function ref,
+  int traits: @type ref
+);
+
+/*
+case @coroutine_placeholder_variable.kind of
+  1 = @handle
+| 2 = @promise
+| 3 = @init_await_resume
+;
+*/
+
+coroutine_placeholder_variable(
+  unique int placeholder_variable: @variable ref,
+  int kind: int ref,
+  int function: @function ref
+)
+
+/** The `new` function used for allocating the coroutine state, if any. */
+coroutine_new(
+  unique int function: @function ref,
+  int new: @function ref
+);
+
+/** The `delete` function used for deallocating the coroutine state, if any. */
+coroutine_delete(
+  unique int function: @function ref,
+  int delete: @function ref
+);
+
+purefunctions(unique int id: @function ref);
+
+function_deleted(unique int id: @function ref);
+
+function_defaulted(unique int id: @function ref);
+
+function_prototyped(unique int id: @function ref)
+
+deduction_guide_for_class(
+    int id: @function ref,
+    int class_template: @usertype ref
+)
+
+member_function_this_type(
+    unique int id: @function ref,
+    int this_type: @type ref
+);
+
+#keyset[id, type_id]
+fun_decls(
+    int id: @fun_decl,
+    int function: @function ref,
+    int type_id: @type ref,
+    string name: string ref,
+    int location: @location_default ref
+);
+fun_def(unique int id: @fun_decl ref);
+fun_specialized(unique int id: @fun_decl ref);
+fun_implicit(unique int id: @fun_decl ref);
+fun_decl_specifiers(
+    int id: @fun_decl ref,
+    string name: string ref
+)
+#keyset[fun_decl, index]
+fun_decl_throws(
+    int fun_decl: @fun_decl ref,
+    int index: int ref,
+    int type_id: @type ref
+);
+/* an empty throw specification is different from none */
+fun_decl_empty_throws(unique int fun_decl: @fun_decl ref);
+fun_decl_noexcept(
+    int fun_decl: @fun_decl ref,
+    int constant: @expr ref
+);
+fun_decl_empty_noexcept(int fun_decl: @fun_decl ref);
+fun_decl_typedef_type(
+    unique int fun_decl: @fun_decl ref,
+    int typedeftype_id: @usertype ref
+);
+
+param_decl_bind(
+    unique int id: @var_decl ref,
+    int index: int ref,
+    int fun_decl: @fun_decl ref
+);
+
+#keyset[id, type_id]
+var_decls(
+    int id: @var_decl,
+    int variable: @variable ref,
+    int type_id: @type ref,
+    string name: string ref,
+    int location: @location_default ref
+);
+var_def(unique int id: @var_decl ref);
+var_decl_specifiers(
+    int id: @var_decl ref,
+    string name: string ref
+)
+is_structured_binding(unique int id: @variable ref);
+
+type_decls(
+    unique int id: @type_decl,
+    int type_id: @type ref,
+    int location: @location_default ref
+);
+type_def(unique int id: @type_decl ref);
+type_decl_top(
+    unique int type_decl: @type_decl ref
+);
+
+namespace_decls(
+    unique int id: @namespace_decl,
+    int namespace_id: @namespace ref,
+    int location: @location_default ref,
+    int bodylocation: @location_default ref
+);
+
+case @using.kind of
+  1 = @using_declaration
+| 2 = @using_directive
+| 3 = @using_enum_declaration
+;
+
+usings(
+    unique int id: @using,
+    int element_id: @element ref,
+    int location: @location_default ref,
+    int kind: int ref
+);
+
+/** The element which contains the `using` declaration. */
+using_container(
+    int parent: @element ref,
+    int child: @using ref
+);
+
+static_asserts(
+    unique int id: @static_assert,
+    int condition : @expr ref,
+    string message : string ref,
+    int location: @location_default ref,
+    int enclosing : @element ref
+);
+
+// each function has an ordered list of parameters
+#keyset[id, type_id]
+#keyset[function, index, type_id]
+params(
+    int id: @parameter,
+    int function: @parameterized_element ref,
+    int index: int ref,
+    int type_id: @type ref
+);
+
+overrides(
+    int new: @function ref,
+    int old: @function ref
+);
+
+#keyset[id, type_id]
+membervariables(
+    int id: @membervariable,
+    int type_id: @type ref,
+    string name: string ref
+);
+
+#keyset[id, type_id]
+globalvariables(
+    int id: @globalvariable,
+    int type_id: @type ref,
+    string name: string ref
+);
+
+#keyset[id, type_id]
+localvariables(
+    int id: @localvariable,
+    int type_id: @type ref,
+    string name: string ref
+);
+
+autoderivation(
+    unique int var: @variable ref,
+    int derivation_type: @type ref
+);
+
+orphaned_variables(
+    int var: @localvariable ref,
+    int function: @function ref
+)
+
+enumconstants(
+    unique int id: @enumconstant,
+    int parent: @usertype ref,
+    int index: int ref,
+    int type_id: @type ref,
+    string name: string ref,
+    int location: @location_default ref
+);
+
+@variable = @localscopevariable | @globalvariable | @membervariable;
+
+@localscopevariable = @localvariable | @parameter;
+
+/**
+ * Built-in types are the fundamental types, e.g., integral, floating, and void.
+ */
+case @builtintype.kind of
+   1 = @errortype
+|  2 = @unknowntype
+|  3 = @void
+|  4 = @boolean
+|  5 = @char
+|  6 = @unsigned_char
+|  7 = @signed_char
+|  8 = @short
+|  9 = @unsigned_short
+| 10 = @signed_short
+| 11 = @int
+| 12 = @unsigned_int
+| 13 = @signed_int
+| 14 = @long
+| 15 = @unsigned_long
+| 16 = @signed_long
+| 17 = @long_long
+| 18 = @unsigned_long_long
+| 19 = @signed_long_long
+// ... 20 Microsoft-specific __int8
+// ... 21 Microsoft-specific __int16
+// ... 22 Microsoft-specific __int32
+// ... 23 Microsoft-specific __int64
+| 24 = @float
+| 25 = @double
+| 26 = @long_double
+| 27 = @complex_float         // C99-specific _Complex float
+| 28 = @complex_double        // C99-specific _Complex double
+| 29 = @complex_long_double   // C99-specific _Complex long double
+| 30 = @imaginary_float       // C99-specific _Imaginary float
+| 31 = @imaginary_double      // C99-specific _Imaginary double
+| 32 = @imaginary_long_double // C99-specific _Imaginary long double
+| 33 = @wchar_t               // Microsoft-specific
+| 34 = @decltype_nullptr      // C++11
+| 35 = @int128                // __int128
+| 36 = @unsigned_int128       // unsigned __int128
+| 37 = @signed_int128         // signed __int128
+| 38 = @float128              // __float128
+| 39 = @complex_float128      // _Complex __float128
+| 40 = @decimal32             // _Decimal32
+| 41 = @decimal64             // _Decimal64
+| 42 = @decimal128            // _Decimal128
+| 43 = @char16_t
+| 44 = @char32_t
+| 45 = @std_float32           // _Float32
+| 46 = @float32x              // _Float32x
+| 47 = @std_float64           // _Float64
+| 48 = @float64x              // _Float64x
+| 49 = @std_float128          // _Float128
+// ... 50 _Float128x
+| 51 = @char8_t
+| 52 = @float16               // _Float16
+| 53 = @complex_float16       // _Complex _Float16
+| 54 = @fp16                  // __fp16
+| 55 = @std_bfloat16          // __bf16
+| 56 = @std_float16           // std::float16_t
+| 57 = @complex_std_float32   // _Complex _Float32
+| 58 = @complex_float32x      // _Complex _Float32x
+| 59 = @complex_std_float64   // _Complex _Float64
+| 60 = @complex_float64x      // _Complex _Float64x
+| 61 = @complex_std_float128  // _Complex _Float128
+;
+
+builtintypes(
+    unique int id: @builtintype,
+    string name: string ref,
+    int kind: int ref,
+    int size: int ref,
+    int sign: int ref,
+    int alignment: int ref
+);
+
+/**
+ * Derived types are types that are directly derived from existing types and
+ * point to, refer to, transform type data to return a new type.
+ */
+case @derivedtype.kind of
+   1 = @pointer
+|  2 = @reference
+|  3 = @type_with_specifiers
+|  4 = @array
+|  5 = @gnu_vector
+|  6 = @routineptr
+|  7 = @routinereference
+|  8 = @rvalue_reference // C++11
+// ... 9 type_conforming_to_protocols deprecated
+| 10 = @block
+;
+
+derivedtypes(
+    unique int id: @derivedtype,
+    string name: string ref,
+    int kind: int ref,
+    int type_id: @type ref
+);
+
+pointerishsize(unique int id: @derivedtype ref,
+    int size: int ref,
+    int alignment: int ref);
+
+arraysizes(
+    unique int id: @derivedtype ref,
+    int num_elements: int ref,
+    int bytesize: int ref,
+    int alignment: int ref
+);
+
+typedefbase(
+    unique int id: @usertype ref,
+    int type_id: @type ref
+);
+
+/**
+ * An instance of the C++11 `decltype` operator.  For example:
+ * ```
+ * int a;
+ * decltype(1+a) b;
+ * ```
+ * Here `expr` is `1+a`.
+ *
+ * Sometimes an additional pair of parentheses around the expression
+ * would change the semantics of this decltype, e.g.
+ * ```
+ * struct A { double x; };
+ * const A* a = new A();
+ * decltype( a->x ); // type is double
+ * decltype((a->x)); // type is const double&
+ * ```
+ * (Please consult the C++11 standard for more details).
+ * `parentheses_would_change_meaning` is `true` iff that is the case.
+ */
+#keyset[id, expr]
+decltypes(
+    int id: @decltype,
+    int expr: @expr ref,
+    int base_type: @type ref,
+    boolean parentheses_would_change_meaning: boolean ref
+);
+
+/*
+case @usertype.kind of
+   1 = @struct
+|  2 = @class
+|  3 = @union
+|  4 = @enum
+|  5 = @typedef                       // classic C: typedef typedef type name
+|  6 = @template
+|  7 = @template_parameter
+|  8 = @template_template_parameter
+|  9 = @proxy_class                   // a proxy class associated with a template parameter
+// ... 10 objc_class deprecated
+// ... 11 objc_protocol deprecated
+// ... 12 objc_category deprecated
+| 13 = @scoped_enum
+| 14 = @using_alias                  // a using name = type style typedef
+;
+*/
+
+usertypes(
+    unique int id: @usertype,
+    string name: string ref,
+    int kind: int ref
+);
+
+usertypesize(
+    unique int id: @usertype ref,
+    int size: int ref,
+    int alignment: int ref
+);
+
+usertype_final(unique int id: @usertype ref);
+
+usertype_uuid(
+    unique int id: @usertype ref,
+    string uuid: string ref
+);
+
+mangled_name(
+    unique int id: @declaration ref,
+    int mangled_name : @mangledname,
+    boolean is_complete: boolean ref
+);
+
+is_pod_class(unique int id: @usertype ref);
+is_standard_layout_class(unique int id: @usertype ref);
+
+is_complete(unique int id: @usertype ref);
+
+is_class_template(unique int id: @usertype ref);
+class_instantiation(
+    int to: @usertype ref,
+    int from: @usertype ref
+);
+class_template_argument(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+class_template_argument_value(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+is_proxy_class_for(
+    unique int id: @usertype ref,
+    unique int templ_param_id: @usertype ref
+);
+
+type_mentions(
+    unique int id: @type_mention,
+    int type_id: @type ref,
+    int location: @location ref,
+    // a_symbol_reference_kind from the frontend.
+    int kind: int ref
+);
+
+is_function_template(unique int id: @function ref);
+function_instantiation(
+    unique int to: @function ref,
+    int from: @function ref
+);
+function_template_argument(
+    int function_id: @function ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+function_template_argument_value(
+    int function_id: @function ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+is_variable_template(unique int id: @variable ref);
+variable_instantiation(
+    unique int to: @variable ref,
+    int from: @variable ref
+);
+variable_template_argument(
+    int variable_id: @variable ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+variable_template_argument_value(
+    int variable_id: @variable ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+routinetypes(
+    unique int id: @routinetype,
+    int return_type: @type ref
+);
+
+routinetypeargs(
+    int routine: @routinetype ref,
+    int index: int ref,
+    int type_id: @type ref
+);
+
+ptrtomembers(
+    unique int id: @ptrtomember,
+    int type_id: @type ref,
+    int class_id: @type ref
+);
+
+/*
+ specifiers for types, functions, and variables
+
+    "public",
+    "protected",
+    "private",
+
+    "const",
+    "volatile",
+    "static",
+
+    "pure",
+    "virtual",
+    "sealed", // Microsoft
+    "__interface", // Microsoft
+    "inline",
+    "explicit",
+
+    "near", // near far extension
+    "far", // near far extension
+    "__ptr32", // Microsoft
+    "__ptr64", // Microsoft
+    "__sptr", // Microsoft
+    "__uptr", // Microsoft
+    "dllimport", // Microsoft
+    "dllexport", // Microsoft
+    "thread", // Microsoft
+    "naked", // Microsoft
+    "microsoft_inline", // Microsoft
+    "forceinline", // Microsoft
+    "selectany", // Microsoft
+    "nothrow", // Microsoft
+    "novtable", // Microsoft
+    "noreturn", // Microsoft
+    "noinline", // Microsoft
+    "noalias", // Microsoft
+    "restrict", // Microsoft
+*/
+
+specifiers(
+    unique int id: @specifier,
+    unique string str: string ref
+);
+
+typespecifiers(
+    int type_id: @type ref,
+    int spec_id: @specifier ref
+);
+
+funspecifiers(
+    int func_id: @function ref,
+    int spec_id: @specifier ref
+);
+
+varspecifiers(
+    int var_id: @accessible ref,
+    int spec_id: @specifier ref
+);
+
+explicit_specifier_exprs(
+    unique int func_id: @function ref,
+    int constant: @expr ref
+)
+
+attributes(
+    unique int id: @attribute,
+    int kind: int ref,
+    string name: string ref,
+    string name_space: string ref,
+    int location: @location_default ref
+);
+
+case @attribute.kind of
+  0 = @gnuattribute
+| 1 = @stdattribute
+| 2 = @declspec
+| 3 = @msattribute
+| 4 = @alignas
+// ... 5 @objc_propertyattribute deprecated
+;
+
+attribute_args(
+    unique int id: @attribute_arg,
+    int kind: int ref,
+    int attribute: @attribute ref,
+    int index: int ref,
+    int location: @location_default ref
+);
+
+case @attribute_arg.kind of
+  0 = @attribute_arg_empty
+| 1 = @attribute_arg_token
+| 2 = @attribute_arg_constant
+| 3 = @attribute_arg_type
+| 4 = @attribute_arg_constant_expr
+| 5 = @attribute_arg_expr
+;
+
+attribute_arg_value(
+    unique int arg: @attribute_arg ref,
+    string value: string ref
+);
+attribute_arg_type(
+    unique int arg: @attribute_arg ref,
+    int type_id: @type ref
+);
+attribute_arg_constant(
+    unique int arg: @attribute_arg ref,
+    int constant: @expr ref
+)
+attribute_arg_expr(
+    unique int arg: @attribute_arg ref,
+    int expr: @expr ref
+)
+attribute_arg_name(
+    unique int arg: @attribute_arg ref,
+    string name: string ref
+);
+
+typeattributes(
+    int type_id: @type ref,
+    int spec_id: @attribute ref
+);
+
+funcattributes(
+    int func_id: @function ref,
+    int spec_id: @attribute ref
+);
+
+varattributes(
+    int var_id: @accessible ref,
+    int spec_id: @attribute ref
+);
+
+stmtattributes(
+    int stmt_id: @stmt ref,
+    int spec_id: @attribute ref
+);
+
+@type = @builtintype
+      | @derivedtype
+      | @usertype
+      /* TODO | @fixedpointtype */
+      | @routinetype
+      | @ptrtomember
+      | @decltype;
+
+unspecifiedtype(
+    unique int type_id: @type ref,
+    int unspecified_type_id: @type ref
+);
+
+member(
+    int parent: @type ref,
+    int index: int ref,
+    int child: @member ref
+);
+
+@enclosingfunction_child = @usertype | @variable | @namespace
+
+enclosingfunction(
+    unique int child: @enclosingfunction_child ref,
+    int parent: @function ref
+);
+
+derivations(
+    unique int derivation: @derivation,
+    int sub: @type ref,
+    int index: int ref,
+    int super: @type ref,
+    int location: @location_default ref
+);
+
+derspecifiers(
+    int der_id: @derivation ref,
+    int spec_id: @specifier ref
+);
+
+/**
+ * Contains the byte offset of the base class subobject within the derived
+ * class. Only holds for non-virtual base classes, but see table
+ * `virtual_base_offsets` for offsets of virtual base class subobjects.
+ */
+direct_base_offsets(
+    unique int der_id: @derivation ref,
+    int offset: int ref
+);
+
+/**
+ * Contains the byte offset of the virtual base class subobject for class
+ * `super` within a most-derived object of class `sub`. `super` can be either a
+ * direct or indirect base class.
+ */
+#keyset[sub, super]
+virtual_base_offsets(
+    int sub: @usertype ref,
+    int super: @usertype ref,
+    int offset: int ref
+);
+
+frienddecls(
+    unique int id: @frienddecl,
+    int type_id: @type ref,
+    int decl_id: @declaration ref,
+    int location: @location_default ref
+);
+
+@declaredtype = @usertype ;
+
+@declaration = @function
+             | @declaredtype
+             | @variable
+             | @enumconstant
+             | @frienddecl;
+
+@member = @membervariable
+        | @function
+        | @declaredtype
+        | @enumconstant;
+
+@locatable = @diagnostic
+           | @declaration
+           | @ppd_include
+           | @ppd_define
+           | @macroinvocation
+           /*| @funcall*/
+           | @xmllocatable
+           | @attribute
+           | @attribute_arg;
+
+@namedscope = @namespace | @usertype;
+
+@element = @locatable
+         | @file
+         | @folder
+         | @specifier
+         | @type
+         | @expr
+         | @namespace
+         | @initialiser
+         | @stmt
+         | @derivation
+         | @comment
+         | @preprocdirect
+         | @fun_decl
+         | @var_decl
+         | @type_decl
+         | @namespace_decl
+         | @using
+         | @namequalifier
+         | @specialnamequalifyingelement
+         | @static_assert
+         | @type_mention
+         | @lambdacapture;
+
+@exprparent = @element;
+
+comments(
+    unique int id: @comment,
+    string contents: string ref,
+    int location: @location_default ref
+);
+
+commentbinding(
+    int id: @comment ref,
+    int element: @element ref
+);
+
+exprconv(
+    int converted: @expr ref,
+    unique int conversion: @expr ref
+);
+
+compgenerated(unique int id: @element ref);
+
+/**
+ * `destructor_call` destructs the `i`'th entity that should be
+ * destructed following `element`. Note that entities should be
+ * destructed in reverse construction order, so for a given `element`
+ * these should be called from highest to lowest `i`.
+ */
+#keyset[element, destructor_call]
+#keyset[element, i]
+synthetic_destructor_call(
+    int element: @element ref,
+    int i: int ref,
+    int destructor_call: @routineexpr ref
+);
+
+namespaces(
+    unique int id: @namespace,
+    string name: string ref
+);
+
+namespace_inline(
+    unique int id: @namespace ref
+);
+
+namespacembrs(
+    int parentid: @namespace ref,
+    unique int memberid: @namespacembr ref
+);
+
+@namespacembr = @declaration | @namespace;
+
+exprparents(
+    int expr_id: @expr ref,
+    int child_index: int ref,
+    int parent_id: @exprparent ref
+);
+
+expr_isload(unique int expr_id: @expr ref);
+
+@cast = @c_style_cast
+      | @const_cast
+      | @dynamic_cast
+      | @reinterpret_cast
+      | @static_cast
+      ;
+
+/*
+case @conversion.kind of
+  0 = @simple_conversion           // a numeric conversion, qualification conversion, or a reinterpret_cast
+| 1 = @bool_conversion             // conversion to 'bool'
+| 2 = @base_class_conversion       // a derived-to-base conversion
+| 3 = @derived_class_conversion    // a base-to-derived conversion
+| 4 = @pm_base_class_conversion    // a derived-to-base conversion of a pointer to member
+| 5 = @pm_derived_class_conversion // a base-to-derived conversion of a pointer to member
+| 6 = @glvalue_adjust              // an adjustment of the type of a glvalue
+| 7 = @prvalue_adjust              // an adjustment of the type of a prvalue
+;
+*/
+/**
+ * Describes the semantics represented by a cast expression. This is largely
+ * independent of the source syntax of the cast, so it is separate from the
+ * regular expression kind.
+ */
+conversionkinds(
+    unique int expr_id: @cast ref,
+    int kind: int ref
+);
+
+@conversion = @cast
+            | @array_to_pointer
+            | @parexpr
+            | @reference_to
+            | @ref_indirect
+            | @temp_init
+            | @c11_generic
+            ;
+
+/*
+case @funbindexpr.kind of
+  0 = @normal_call  // a normal call
+| 1 = @virtual_call // a virtual call
+| 2 = @adl_call     // a call whose target is only found by ADL
+;
+*/
+iscall(
+    unique int caller: @funbindexpr ref,
+    int kind: int ref
+);
+
+numtemplatearguments(
+    unique int expr_id: @expr ref,
+    int num: int ref
+);
+
+specialnamequalifyingelements(
+    unique int id: @specialnamequalifyingelement,
+    unique string name: string ref
+);
+
+@namequalifiableelement = @expr | @namequalifier;
+@namequalifyingelement = @namespace
+                       | @specialnamequalifyingelement
+                       | @usertype;
+
+namequalifiers(
+    unique int id: @namequalifier,
+    unique int qualifiableelement: @namequalifiableelement ref,
+    int qualifyingelement: @namequalifyingelement ref,
+    int location: @location_default ref
+);
+
+varbind(
+    int expr: @varbindexpr ref,
+    int var: @accessible ref
+);
+
+funbind(
+    int expr: @funbindexpr ref,
+    int fun: @function ref
+);
+
+@any_new_expr = @new_expr
+              | @new_array_expr;
+
+@new_or_delete_expr = @any_new_expr
+                    | @delete_expr
+                    | @delete_array_expr;
+
+@prefix_crement_expr = @preincrexpr | @predecrexpr;
+
+@postfix_crement_expr = @postincrexpr | @postdecrexpr;
+
+@increment_expr = @preincrexpr | @postincrexpr;
+
+@decrement_expr = @predecrexpr | @postdecrexpr;
+
+@crement_expr = @increment_expr | @decrement_expr;
+
+@un_arith_op_expr = @arithnegexpr
+                  | @unaryplusexpr
+                  | @conjugation
+                  | @realpartexpr
+                  | @imagpartexpr
+                  | @crement_expr
+                  ;
+
+@un_bitwise_op_expr = @complementexpr;
+
+@un_log_op_expr = @notexpr;
+
+@un_op_expr = @address_of
+            | @indirect
+            | @un_arith_op_expr
+            | @un_bitwise_op_expr
+            | @builtinaddressof
+            | @vec_fill
+            | @un_log_op_expr
+            | @co_await
+            | @co_yield
+            ;
+
+@bin_log_op_expr = @andlogicalexpr | @orlogicalexpr;
+
+@cmp_op_expr = @eq_op_expr | @rel_op_expr;
+
+@eq_op_expr = @eqexpr | @neexpr;
+
+@rel_op_expr = @gtexpr
+             | @ltexpr
+             | @geexpr
+             | @leexpr
+             | @spaceshipexpr
+             ;
+
+@bin_bitwise_op_expr = @lshiftexpr
+                     | @rshiftexpr
+                     | @andexpr
+                     | @orexpr
+                     | @xorexpr
+                     ;
+
+@p_arith_op_expr = @paddexpr
+                 | @psubexpr
+                 | @pdiffexpr
+                 ;
+
+@bin_arith_op_expr = @addexpr
+                   | @subexpr
+                   | @mulexpr
+                   | @divexpr
+                   | @remexpr
+                   | @jmulexpr
+                   | @jdivexpr
+                   | @fjaddexpr
+                   | @jfaddexpr
+                   | @fjsubexpr
+                   | @jfsubexpr
+                   | @minexpr
+                   | @maxexpr
+                   | @p_arith_op_expr
+                   ;
+
+@bin_op_expr = @bin_arith_op_expr
+             | @bin_bitwise_op_expr
+             | @cmp_op_expr
+             | @bin_log_op_expr
+             ;
+
+@op_expr = @un_op_expr
+         | @bin_op_expr
+         | @assign_expr
+         | @conditionalexpr
+         ;
+
+@assign_arith_expr = @assignaddexpr
+                   | @assignsubexpr
+                   | @assignmulexpr
+                   | @assigndivexpr
+                   | @assignremexpr
+                   ;
+
+@assign_bitwise_expr = @assignandexpr
+                     | @assignorexpr
+                     | @assignxorexpr
+                     | @assignlshiftexpr
+                     | @assignrshiftexpr
+                     ;
+
+@assign_pointer_expr = @assignpaddexpr
+                     | @assignpsubexpr
+                     ;
+
+@assign_op_expr = @assign_arith_expr
+                | @assign_bitwise_expr
+                | @assign_pointer_expr
+                ;
+
+@assign_expr = @assignexpr | @assign_op_expr | @blockassignexpr
+
+/*
+  Binary encoding of the allocator form.
+
+  case @allocator.form of
+    0 = plain
+  | 1 = alignment
+  ;
+*/
+
+/**
+ * The allocator function associated with a `new` or `new[]` expression.
+ * The `form` column specified whether the allocation call contains an alignment
+ * argument.
+ */
+expr_allocator(
+    unique int expr: @any_new_expr ref,
+    int func: @function ref,
+    int form: int ref
+);
+
+/*
+  Binary encoding of the deallocator form.
+
+  case @deallocator.form of
+    0 = plain
+  | 1 = size
+  | 2 = alignment
+  | 4 = destroying_delete
+  ;
+*/
+
+/**
+ * The deallocator function associated with a `delete`, `delete[]`, `new`, or
+ * `new[]` expression. For a `new` or `new[]` expression, the deallocator is the
+ * one used to free memory if the initialization throws an exception.
+ * The `form` column specifies whether the deallocation call contains a size
+ * argument, and alignment argument, or both.
+ */
+expr_deallocator(
+    unique int expr: @new_or_delete_expr ref,
+    int func: @function ref,
+    int form: int ref
+);
+
+/**
+ * Holds if the `@conditionalexpr` is of the two operand form
+ * `guard ? : false`.
+ */
+expr_cond_two_operand(
+    unique int cond: @conditionalexpr ref
+);
+
+/**
+ * The guard of `@conditionalexpr` `guard ? true : false`
+ */
+expr_cond_guard(
+    unique int cond: @conditionalexpr ref,
+    int guard: @expr ref
+);
+
+/**
+ * The expression used when the guard of `@conditionalexpr`
+ * `guard ? true : false` holds. For the two operand form
+ * `guard ?: false` consider using `expr_cond_guard` instead.
+ */
+expr_cond_true(
+    unique int cond: @conditionalexpr ref,
+    int true: @expr ref
+);
+
+/**
+ * The expression used when the guard of `@conditionalexpr`
+ * `guard ? true : false` does not hold.
+ */
+expr_cond_false(
+    unique int cond: @conditionalexpr ref,
+    int false: @expr ref
+);
+
+/** A string representation of the value. */
+values(
+    unique int id: @value,
+    string str: string ref
+);
+
+/** The actual text in the source code for the value, if any. */
+valuetext(
+    unique int id: @value ref,
+    string text: string ref
+);
+
+valuebind(
+    int val: @value ref,
+    unique int expr: @expr ref
+);
+
+fieldoffsets(
+    unique int id: @variable ref,
+    int byteoffset: int ref,
+    int bitoffset: int ref
+);
+
+bitfield(
+    unique int id: @variable ref,
+    int bits: int ref,
+    int declared_bits: int ref
+);
+
+/* TODO
+memberprefix(
+    int member: @expr ref,
+    int prefix: @expr ref
+);
+*/
+
+/*
+   kind(1) = mbrcallexpr
+   kind(2) = mbrptrcallexpr
+   kind(3) = mbrptrmbrcallexpr
+   kind(4) = ptrmbrptrmbrcallexpr
+   kind(5) = mbrreadexpr // x.y
+   kind(6) = mbrptrreadexpr // p->y
+   kind(7) = mbrptrmbrreadexpr // x.*pm
+   kind(8) = mbrptrmbrptrreadexpr // x->*pm
+   kind(9) = staticmbrreadexpr // static x.y
+   kind(10) = staticmbrptrreadexpr // static p->y
+*/
+/* TODO
+memberaccess(
+    int member: @expr ref,
+    int kind: int ref
+);
+*/
+
+initialisers(
+    unique int init: @initialiser,
+    int var: @accessible ref,
+    unique int expr: @expr ref,
+    int location: @location_expr ref
+);
+
+braced_initialisers(
+    int init: @initialiser ref
+);
+
+/**
+ * An ancestor for the expression, for cases in which we cannot
+ * otherwise find the expression's parent.
+ */
+expr_ancestor(
+    int exp: @expr ref,
+    int ancestor: @element ref
+);
+
+exprs(
+    unique int id: @expr,
+    int kind: int ref,
+    int location: @location_expr ref
+);
+
+expr_reuse(
+    int reuse: @expr ref,
+    int original: @expr ref,
+    int value_category: int ref
+)
+
+/*
+  case @value.category of
+    1 = prval
+  | 2 = xval
+  | 3 = lval
+  ;
+*/
+expr_types(
+    int id: @expr ref,
+    int typeid: @type ref,
+    int value_category: int ref
+);
+
+case @expr.kind of
+    1 = @errorexpr
+|   2 = @address_of // & AddressOfExpr
+|   3 = @reference_to // ReferenceToExpr (implicit?)
+|   4 = @indirect // * PointerDereferenceExpr
+|   5 = @ref_indirect // ReferenceDereferenceExpr (implicit?)
+// ...
+|   8 = @array_to_pointer // (???)
+|   9 = @vacuous_destructor_call // VacuousDestructorCall
+// ...
+|  11 = @assume // Microsoft
+|  12 = @parexpr
+|  13 = @arithnegexpr
+|  14 = @unaryplusexpr
+|  15 = @complementexpr
+|  16 = @notexpr
+|  17 = @conjugation // GNU ~ operator
+|  18 = @realpartexpr // GNU __real
+|  19 = @imagpartexpr // GNU __imag
+|  20 = @postincrexpr
+|  21 = @postdecrexpr
+|  22 = @preincrexpr
+|  23 = @predecrexpr
+|  24 = @conditionalexpr
+|  25 = @addexpr
+|  26 = @subexpr
+|  27 = @mulexpr
+|  28 = @divexpr
+|  29 = @remexpr
+|  30 = @jmulexpr // C99 mul imaginary
+|  31 = @jdivexpr // C99 div imaginary
+|  32 = @fjaddexpr // C99 add real + imaginary
+|  33 = @jfaddexpr // C99 add imaginary + real
+|  34 = @fjsubexpr // C99 sub real - imaginary
+|  35 = @jfsubexpr // C99 sub imaginary - real
+|  36 = @paddexpr // pointer add (pointer + int or int + pointer)
+|  37 = @psubexpr // pointer sub (pointer - integer)
+|  38 = @pdiffexpr // difference between two pointers
+|  39 = @lshiftexpr
+|  40 = @rshiftexpr
+|  41 = @andexpr
+|  42 = @orexpr
+|  43 = @xorexpr
+|  44 = @eqexpr
+|  45 = @neexpr
+|  46 = @gtexpr
+|  47 = @ltexpr
+|  48 = @geexpr
+|  49 = @leexpr
+|  50 = @minexpr // GNU minimum
+|  51 = @maxexpr // GNU maximum
+|  52 = @assignexpr
+|  53 = @assignaddexpr
+|  54 = @assignsubexpr
+|  55 = @assignmulexpr
+|  56 = @assigndivexpr
+|  57 = @assignremexpr
+|  58 = @assignlshiftexpr
+|  59 = @assignrshiftexpr
+|  60 = @assignandexpr
+|  61 = @assignorexpr
+|  62 = @assignxorexpr
+|  63 = @assignpaddexpr // assign pointer add
+|  64 = @assignpsubexpr // assign pointer sub
+|  65 = @andlogicalexpr
+|  66 = @orlogicalexpr
+|  67 = @commaexpr
+|  68 = @subscriptexpr // access to member of an array, e.g., a[5]
+// ...  69 @objc_subscriptexpr deprecated
+// ...  70 @cmdaccess deprecated
+// ...
+|  73 = @virtfunptrexpr
+|  74 = @callexpr
+// ...  75 @msgexpr_normal deprecated
+// ...  76 @msgexpr_super deprecated
+// ...  77 @atselectorexpr deprecated
+// ...  78 @atprotocolexpr deprecated
+|  79 = @vastartexpr
+|  80 = @vaargexpr
+|  81 = @vaendexpr
+|  82 = @vacopyexpr
+// ...  83 @atencodeexpr deprecated
+|  84 = @varaccess
+|  85 = @thisaccess
+// ...  86 @objc_box_expr deprecated
+|  87 = @new_expr
+|  88 = @delete_expr
+|  89 = @throw_expr
+|  90 = @condition_decl // a variable declared in a condition, e.g., if(int x = y > 2)
+|  91 = @braced_init_list
+|  92 = @type_id
+|  93 = @runtime_sizeof
+|  94 = @runtime_alignof
+|  95 = @sizeof_pack
+|  96 = @expr_stmt // GNU extension
+|  97 = @routineexpr
+|  98 = @type_operand // used to access a type in certain contexts (haven't found any examples yet....)
+|  99 = @offsetofexpr // offsetof ::= type and field
+| 100 = @hasassignexpr // __has_assign ::= type
+| 101 = @hascopyexpr // __has_copy ::= type
+| 102 = @hasnothrowassign // __has_nothrow_assign ::= type
+| 103 = @hasnothrowconstr // __has_nothrow_constructor ::= type
+| 104 = @hasnothrowcopy // __has_nothrow_copy ::= type
+| 105 = @hastrivialassign // __has_trivial_assign ::= type
+| 106 = @hastrivialconstr // __has_trivial_constructor ::= type
+| 107 = @hastrivialcopy // __has_trivial_copy ::= type
+| 108 = @hasuserdestr // __has_user_destructor ::= type
+| 109 = @hasvirtualdestr // __has_virtual_destructor ::= type
+| 110 = @isabstractexpr // __is_abstract ::= type
+| 111 = @isbaseofexpr // __is_base_of ::= type type
+| 112 = @isclassexpr // __is_class ::= type
+| 113 = @isconvtoexpr // __is_convertible_to ::= type type
+| 114 = @isemptyexpr // __is_empty ::= type
+| 115 = @isenumexpr // __is_enum ::= type
+| 116 = @ispodexpr // __is_pod ::= type
+| 117 = @ispolyexpr // __is_polymorphic ::= type
+| 118 = @isunionexpr // __is_union ::= type
+| 119 = @typescompexpr // GNU __builtin_types_compatible ::= type type
+| 120 = @intaddrexpr // frontend internal builtin, used to implement offsetof
+// ...
+| 122 = @hastrivialdestructor // __has_trivial_destructor ::= type
+| 123 = @literal
+| 124 = @uuidof
+| 127 = @aggregateliteral
+| 128 = @delete_array_expr
+| 129 = @new_array_expr
+// ... 130 @objc_array_literal deprecated
+// ... 131 @objc_dictionary_literal deprecated
+| 132 = @foldexpr
+// ...
+| 200 = @ctordirectinit
+| 201 = @ctorvirtualinit
+| 202 = @ctorfieldinit
+| 203 = @ctordelegatinginit
+| 204 = @dtordirectdestruct
+| 205 = @dtorvirtualdestruct
+| 206 = @dtorfielddestruct
+// ...
+| 210 = @static_cast
+| 211 = @reinterpret_cast
+| 212 = @const_cast
+| 213 = @dynamic_cast
+| 214 = @c_style_cast
+| 215 = @lambdaexpr
+| 216 = @param_ref
+| 217 = @noopexpr
+// ...
+| 294 = @istriviallyconstructibleexpr
+| 295 = @isdestructibleexpr
+| 296 = @isnothrowdestructibleexpr
+| 297 = @istriviallydestructibleexpr
+| 298 = @istriviallyassignableexpr
+| 299 = @isnothrowassignableexpr
+| 300 = @istrivialexpr
+| 301 = @isstandardlayoutexpr
+| 302 = @istriviallycopyableexpr
+| 303 = @isliteraltypeexpr
+| 304 = @hastrivialmoveconstructorexpr
+| 305 = @hastrivialmoveassignexpr
+| 306 = @hasnothrowmoveassignexpr
+| 307 = @isconstructibleexpr
+| 308 = @isnothrowconstructibleexpr
+| 309 = @hasfinalizerexpr
+| 310 = @isdelegateexpr
+| 311 = @isinterfaceclassexpr
+| 312 = @isrefarrayexpr
+| 313 = @isrefclassexpr
+| 314 = @issealedexpr
+| 315 = @issimplevalueclassexpr
+| 316 = @isvalueclassexpr
+| 317 = @isfinalexpr
+| 319 = @noexceptexpr
+| 320 = @builtinshufflevector
+| 321 = @builtinchooseexpr
+| 322 = @builtinaddressof
+| 323 = @vec_fill
+| 324 = @builtinconvertvector
+| 325 = @builtincomplex
+| 326 = @spaceshipexpr
+| 327 = @co_await
+| 328 = @co_yield
+| 329 = @temp_init
+| 330 = @isassignable
+| 331 = @isaggregate
+| 332 = @hasuniqueobjectrepresentations
+| 333 = @builtinbitcast
+| 334 = @builtinshuffle
+| 335 = @blockassignexpr
+| 336 = @issame
+| 337 = @isfunction
+| 338 = @islayoutcompatible
+| 339 = @ispointerinterconvertiblebaseof
+| 340 = @isarray
+| 341 = @arrayrank
+| 342 = @arrayextent
+| 343 = @isarithmetic
+| 344 = @iscompletetype
+| 345 = @iscompound
+| 346 = @isconst
+| 347 = @isfloatingpoint
+| 348 = @isfundamental
+| 349 = @isintegral
+| 350 = @islvaluereference
+| 351 = @ismemberfunctionpointer
+| 352 = @ismemberobjectpointer
+| 353 = @ismemberpointer
+| 354 = @isobject
+| 355 = @ispointer
+| 356 = @isreference
+| 357 = @isrvaluereference
+| 358 = @isscalar
+| 359 = @issigned
+| 360 = @isunsigned
+| 361 = @isvoid
+| 362 = @isvolatile
+| 363 = @reuseexpr
+| 364 = @istriviallycopyassignable
+| 365 = @isassignablenopreconditioncheck
+| 366 = @referencebindstotemporary
+| 367 = @issameas
+| 368 = @builtinhasattribute
+| 369 = @ispointerinterconvertiblewithclass
+| 370 = @builtinispointerinterconvertiblewithclass
+| 371 = @iscorrespondingmember
+| 372 = @builtiniscorrespondingmember
+| 373 = @isboundedarray
+| 374 = @isunboundedarray
+| 375 = @isreferenceable
+| 378 = @isnothrowconvertible
+| 379 = @referenceconstructsfromtemporary
+| 380 = @referenceconvertsfromtemporary
+| 381 = @isconvertible
+| 382 = @isvalidwinrttype
+| 383 = @iswinclass
+| 384 = @iswininterface
+| 385 = @istriviallyequalitycomparable
+| 386 = @isscopedenum
+| 387 = @istriviallyrelocatable
+| 388 = @datasizeof
+| 389 = @c11_generic
+| 390 = @requires_expr
+| 391 = @nested_requirement
+| 392 = @compound_requirement
+| 393 = @concept_id
+;
+
+@var_args_expr = @vastartexpr
+               | @vaendexpr
+               | @vaargexpr
+               | @vacopyexpr
+               ;
+
+@builtin_op = @var_args_expr
+            | @noopexpr
+            | @offsetofexpr
+            | @intaddrexpr
+            | @hasassignexpr
+            | @hascopyexpr
+            | @hasnothrowassign
+            | @hasnothrowconstr
+            | @hasnothrowcopy
+            | @hastrivialassign
+            | @hastrivialconstr
+            | @hastrivialcopy
+            | @hastrivialdestructor
+            | @hasuserdestr
+            | @hasvirtualdestr
+            | @isabstractexpr
+            | @isbaseofexpr
+            | @isclassexpr
+            | @isconvtoexpr
+            | @isemptyexpr
+            | @isenumexpr
+            | @ispodexpr
+            | @ispolyexpr
+            | @isunionexpr
+            | @typescompexpr
+            | @builtinshufflevector
+            | @builtinconvertvector
+            | @builtinaddressof
+            | @istriviallyconstructibleexpr
+            | @isdestructibleexpr
+            | @isnothrowdestructibleexpr
+            | @istriviallydestructibleexpr
+            | @istriviallyassignableexpr
+            | @isnothrowassignableexpr
+            | @istrivialexpr
+            | @isstandardlayoutexpr
+            | @istriviallycopyableexpr
+            | @isliteraltypeexpr
+            | @hastrivialmoveconstructorexpr
+            | @hastrivialmoveassignexpr
+            | @hasnothrowmoveassignexpr
+            | @isconstructibleexpr
+            | @isnothrowconstructibleexpr
+            | @hasfinalizerexpr
+            | @isdelegateexpr
+            | @isinterfaceclassexpr
+            | @isrefarrayexpr
+            | @isrefclassexpr
+            | @issealedexpr
+            | @issimplevalueclassexpr
+            | @isvalueclassexpr
+            | @isfinalexpr
+            | @builtinchooseexpr
+            | @builtincomplex
+            | @isassignable
+            | @isaggregate
+            | @hasuniqueobjectrepresentations
+            | @builtinbitcast
+            | @builtinshuffle
+            | @issame
+            | @isfunction
+            | @islayoutcompatible
+            | @ispointerinterconvertiblebaseof
+            | @isarray
+            | @arrayrank
+            | @arrayextent
+            | @isarithmetic
+            | @iscompletetype
+            | @iscompound
+            | @isconst
+            | @isfloatingpoint
+            | @isfundamental
+            | @isintegral
+            | @islvaluereference
+            | @ismemberfunctionpointer
+            | @ismemberobjectpointer
+            | @ismemberpointer
+            | @isobject
+            | @ispointer
+            | @isreference
+            | @isrvaluereference
+            | @isscalar
+            | @issigned
+            | @isunsigned
+            | @isvoid
+            | @isvolatile
+            | @istriviallycopyassignable
+            | @isassignablenopreconditioncheck
+            | @referencebindstotemporary
+            | @issameas
+            | @builtinhasattribute
+            | @ispointerinterconvertiblewithclass
+            | @builtinispointerinterconvertiblewithclass
+            | @iscorrespondingmember
+            | @builtiniscorrespondingmember
+            | @isboundedarray
+            | @isunboundedarray
+            | @isreferenceable
+            | @isnothrowconvertible
+            | @referenceconstructsfromtemporary
+            | @referenceconvertsfromtemporary
+            | @isconvertible
+            | @isvalidwinrttype
+            | @iswinclass
+            | @iswininterface
+            | @istriviallyequalitycomparable
+            | @isscopedenum
+            | @istriviallyrelocatable
+            ;
+
+compound_requirement_is_noexcept(
+    int expr: @compound_requirement ref
+);
+
+new_allocated_type(
+    unique int expr: @new_expr ref,
+    int type_id: @type ref
+);
+
+new_array_allocated_type(
+    unique int expr: @new_array_expr ref,
+    int type_id: @type ref
+);
+
+/**
+ * The field being initialized by an initializer expression within an aggregate
+ * initializer for a class/struct/union. Position is used to sort repeated initializers.
+ */
+#keyset[aggregate, position]
+aggregate_field_init(
+    int aggregate: @aggregateliteral ref,
+    int initializer: @expr ref,
+    int field: @membervariable ref,
+    int position: int ref
+);
+
+/**
+ * The index of the element being initialized by an initializer expression
+ * within an aggregate initializer for an array. Position is used to sort repeated initializers.
+ */
+#keyset[aggregate, position]
+aggregate_array_init(
+    int aggregate: @aggregateliteral ref,
+    int initializer: @expr ref,
+    int element_index: int ref,
+    int position: int ref
+);
+
+@ctorinit = @ctordirectinit
+          | @ctorvirtualinit
+          | @ctorfieldinit
+          | @ctordelegatinginit;
+@dtordestruct = @dtordirectdestruct
+              | @dtorvirtualdestruct
+              | @dtorfielddestruct;
+
+
+condition_decl_bind(
+    unique int expr: @condition_decl ref,
+    unique int decl: @declaration ref
+);
+
+typeid_bind(
+    unique int expr: @type_id ref,
+    int type_id: @type ref
+);
+
+uuidof_bind(
+    unique int expr: @uuidof ref,
+    int type_id: @type ref
+);
+
+@runtime_sizeof_or_alignof = @runtime_sizeof | @runtime_alignof | @datasizeof;
+
+sizeof_bind(
+    unique int expr: @runtime_sizeof_or_alignof ref,
+    int type_id: @type ref
+);
+
+code_block(
+    unique int block: @literal ref,
+    unique int routine: @function ref
+);
+
+lambdas(
+    unique int expr: @lambdaexpr ref,
+    string default_capture: string ref,
+    boolean has_explicit_return_type: boolean ref
+);
+
+lambda_capture(
+    unique int id: @lambdacapture,
+    int lambda: @lambdaexpr ref,
+    int index: int ref,
+    int field: @membervariable ref,
+    boolean captured_by_reference: boolean ref,
+    boolean is_implicit: boolean ref,
+    int location: @location_default ref
+);
+
+@funbindexpr = @routineexpr
+             | @new_expr
+             | @delete_expr
+             | @delete_array_expr
+             | @ctordirectinit
+             | @ctorvirtualinit
+             | @ctordelegatinginit
+             | @dtordirectdestruct
+             | @dtorvirtualdestruct;
+
+@varbindexpr = @varaccess | @ctorfieldinit | @dtorfielddestruct;
+@addressable = @function | @variable ;
+@accessible = @addressable | @enumconstant ;
+
+@access = @varaccess | @routineexpr ;
+
+fold(
+    int expr: @foldexpr ref,
+    string operator: string ref,
+    boolean is_left_fold: boolean ref
+);
+
+stmts(
+    unique int id: @stmt,
+    int kind: int ref,
+    int location: @location_stmt ref
+);
+
+case @stmt.kind of
+    1 = @stmt_expr
+|   2 = @stmt_if
+|   3 = @stmt_while
+|   4 = @stmt_goto
+|   5 = @stmt_label
+|   6 = @stmt_return
+|   7 = @stmt_block
+|   8 = @stmt_end_test_while // do { ... } while ( ... )
+|   9 = @stmt_for
+|  10 = @stmt_switch_case
+|  11 = @stmt_switch
+|  13 = @stmt_asm // "asm" statement or the body of an asm function
+|  15 = @stmt_try_block
+|  16 = @stmt_microsoft_try // Microsoft
+|  17 = @stmt_decl
+|  18 = @stmt_set_vla_size // C99
+|  19 = @stmt_vla_decl // C99
+|  25 = @stmt_assigned_goto // GNU
+|  26 = @stmt_empty
+|  27 = @stmt_continue
+|  28 = @stmt_break
+|  29 = @stmt_range_based_for // C++11
+// ...  30 @stmt_at_autoreleasepool_block deprecated
+// ...  31 @stmt_objc_for_in deprecated
+// ...  32 @stmt_at_synchronized deprecated
+|  33 = @stmt_handler
+// ...  34 @stmt_finally_end deprecated
+|  35 = @stmt_constexpr_if
+|  37 = @stmt_co_return
+;
+
+type_vla(
+    int type_id: @type ref,
+    int decl: @stmt_vla_decl ref
+);
+
+variable_vla(
+    int var: @variable ref,
+    int decl: @stmt_vla_decl ref
+);
+
+if_initialization(
+    unique int if_stmt: @stmt_if ref,
+    int init_id: @stmt ref
+);
+
+if_then(
+    unique int if_stmt: @stmt_if ref,
+    int then_id: @stmt ref
+);
+
+if_else(
+    unique int if_stmt: @stmt_if ref,
+    int else_id: @stmt ref
+);
+
+constexpr_if_initialization(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int init_id: @stmt ref
+);
+
+constexpr_if_then(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int then_id: @stmt ref
+);
+
+constexpr_if_else(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int else_id: @stmt ref
+);
+
+while_body(
+    unique int while_stmt: @stmt_while ref,
+    int body_id: @stmt ref
+);
+
+do_body(
+    unique int do_stmt: @stmt_end_test_while ref,
+    int body_id: @stmt ref
+);
+
+switch_initialization(
+    unique int switch_stmt: @stmt_switch ref,
+    int init_id: @stmt ref
+);
+
+#keyset[switch_stmt, index]
+switch_case(
+    int switch_stmt: @stmt_switch ref,
+    int index: int ref,
+    int case_id: @stmt_switch_case ref
+);
+
+switch_body(
+    unique int switch_stmt: @stmt_switch ref,
+    int body_id: @stmt ref
+);
+
+@stmt_for_or_range_based_for = @stmt_for
+                             | @stmt_range_based_for;
+
+for_initialization(
+    unique int for_stmt: @stmt_for_or_range_based_for ref,
+    int init_id: @stmt ref
+);
+
+for_condition(
+    unique int for_stmt: @stmt_for ref,
+    int condition_id: @expr ref
+);
+
+for_update(
+    unique int for_stmt: @stmt_for ref,
+    int update_id: @expr ref
+);
+
+for_body(
+    unique int for_stmt: @stmt_for ref,
+    int body_id: @stmt ref
+);
+
+@stmtparent = @stmt | @expr_stmt ;
+stmtparents(
+    unique int id: @stmt ref,
+    int index: int ref,
+    int parent: @stmtparent ref
+);
+
+ishandler(unique int block: @stmt_block ref);
+
+@cfgnode = @stmt | @expr | @function | @initialiser ;
+
+stmt_decl_bind(
+    int stmt: @stmt_decl ref,
+    int num: int ref,
+    int decl: @declaration ref
+);
+
+stmt_decl_entry_bind(
+    int stmt: @stmt_decl ref,
+    int num: int ref,
+    int decl_entry: @element ref
+);
+
+@parameterized_element = @function | @stmt_block | @requires_expr;
+
+blockscope(
+    unique int block: @stmt_block ref,
+    int enclosing: @parameterized_element ref
+);
+
+@jump = @stmt_goto | @stmt_break | @stmt_continue;
+
+@jumporlabel = @jump | @stmt_label | @literal;
+
+jumpinfo(
+    unique int id: @jumporlabel ref,
+    string str: string ref,
+    int target: @stmt ref
+);
+
+preprocdirects(
+    unique int id: @preprocdirect,
+    int kind: int ref,
+    int location: @location_default ref
+);
+case @preprocdirect.kind of
+   0 = @ppd_if
+|  1 = @ppd_ifdef
+|  2 = @ppd_ifndef
+|  3 = @ppd_elif
+|  4 = @ppd_else
+|  5 = @ppd_endif
+|  6 = @ppd_plain_include
+|  7 = @ppd_define
+|  8 = @ppd_undef
+|  9 = @ppd_line
+| 10 = @ppd_error
+| 11 = @ppd_pragma
+| 12 = @ppd_objc_import
+| 13 = @ppd_include_next
+| 18 = @ppd_warning
+;
+
+@ppd_include = @ppd_plain_include | @ppd_objc_import | @ppd_include_next;
+
+@ppd_branch = @ppd_if | @ppd_ifdef | @ppd_ifndef | @ppd_elif;
+
+preprocpair(
+    int begin : @ppd_branch ref,
+    int elseelifend : @preprocdirect ref
+);
+
+preproctrue(int branch : @ppd_branch ref);
+preprocfalse(int branch : @ppd_branch ref);
+
+preproctext(
+    unique int id: @preprocdirect ref,
+    string head: string ref,
+    string body: string ref
+);
+
+includes(
+    unique int id: @ppd_include ref,
+    int included: @file ref
+);
+
+link_targets(
+    int id: @link_target,
+    int binary: @file ref
+);
+
+link_parent(
+    int element : @element ref,
+    int link_target : @link_target ref
+);
+
+/* XML Files */
+
+xmlEncoding(unique int id: @file ref, string encoding: string ref);
+
+xmlDTDs(
+    unique int id: @xmldtd,
+    string root: string ref,
+    string publicId: string ref,
+    string systemId: string ref,
+    int fileid: @file ref
+);
+
+xmlElements(
+    unique int id: @xmlelement,
+    string name: string ref,
+    int parentid: @xmlparent ref,
+    int idx: int ref,
+    int fileid: @file ref
+);
+
+xmlAttrs(
+    unique int id: @xmlattribute,
+    int elementid: @xmlelement ref,
+    string name: string ref,
+    string value: string ref,
+    int idx: int ref,
+    int fileid: @file ref
+);
+
+xmlNs(
+    int id: @xmlnamespace,
+    string prefixName: string ref,
+    string URI: string ref,
+    int fileid: @file ref
+);
+
+xmlHasNs(
+    int elementId: @xmlnamespaceable ref,
+    int nsId: @xmlnamespace ref,
+    int fileid: @file ref
+);
+
+xmlComments(
+    unique int id: @xmlcomment,
+    string text: string ref,
+    int parentid: @xmlparent ref,
+    int fileid: @file ref
+);
+
+xmlChars(
+    unique int id: @xmlcharacters,
+    string text: string ref,
+    int parentid: @xmlparent ref,
+    int idx: int ref,
+    int isCDATA: int ref,
+    int fileid: @file ref
+);
+
+@xmlparent = @file | @xmlelement;
+@xmlnamespaceable = @xmlelement | @xmlattribute;
+
+xmllocations(
+    int xmlElement: @xmllocatable ref,
+    int location: @location_default ref
+);
+
+@xmllocatable = @xmlcharacters
+              | @xmlelement
+              | @xmlcomment
+              | @xmlattribute
+              | @xmldtd
+              | @file
+              | @xmlnamespace;
diff --git a/cpp/downgrades/e51fad7a2436caefab0c6bd52f05e28e7cce4d92/params.ql b/cpp/downgrades/e51fad7a2436caefab0c6bd52f05e28e7cce4d92/params.ql
new file mode 100644
index 00000000000..db4e11c75d5
--- /dev/null
+++ b/cpp/downgrades/e51fad7a2436caefab0c6bd52f05e28e7cce4d92/params.ql
@@ -0,0 +1,17 @@
+class Parameter extends @parameter {
+  string toString() { none() }
+}
+
+class ParameterizedElement extends @parameterized_element {
+  string toString() { none() }
+}
+
+class Type extends @type {
+  string toString() { none() }
+}
+
+from Parameter param, ParameterizedElement pe, int index, Type type
+where
+  params(param, pe, index, type) and
+  not pe instanceof @requires_expr
+select param, pe, index, type
diff --git a/cpp/downgrades/e51fad7a2436caefab0c6bd52f05e28e7cce4d92/semmlecode.cpp.dbscheme b/cpp/downgrades/e51fad7a2436caefab0c6bd52f05e28e7cce4d92/semmlecode.cpp.dbscheme
new file mode 100644
index 00000000000..6f5d51e89e7
--- /dev/null
+++ b/cpp/downgrades/e51fad7a2436caefab0c6bd52f05e28e7cce4d92/semmlecode.cpp.dbscheme
@@ -0,0 +1,2316 @@
+
+/**
+ * An invocation of the compiler. Note that more than one file may be
+ * compiled per invocation. For example, this command compiles three
+ * source files:
+ *
+ *   gcc -c f1.c f2.c f3.c
+ *
+ * The `id` simply identifies the invocation, while `cwd` is the working
+ * directory from which the compiler was invoked.
+ */
+compilations(
+    /**
+     * An invocation of the compiler. Note that more than one file may
+     * be compiled per invocation. For example, this command compiles
+     * three source files:
+     *
+     *   gcc -c f1.c f2.c f3.c
+     */
+    unique int id : @compilation,
+    string cwd : string ref
+);
+
+/**
+ * The arguments that were passed to the extractor for a compiler
+ * invocation. If `id` is for the compiler invocation
+ *
+ *   gcc -c f1.c f2.c f3.c
+ *
+ * then typically there will be rows for
+ *
+ * num | arg
+ * --- | ---
+ * 0   | *path to extractor*
+ * 1   | `--mimic`
+ * 2   | `/usr/bin/gcc`
+ * 3   | `-c`
+ * 4   | f1.c
+ * 5   | f2.c
+ * 6   | f3.c
+ */
+#keyset[id, num]
+compilation_args(
+    int id : @compilation ref,
+    int num : int ref,
+    string arg : string ref
+);
+
+/**
+ * The source files that are compiled by a compiler invocation.
+ * If `id` is for the compiler invocation
+ *
+ *   gcc -c f1.c f2.c f3.c
+ *
+ * then there will be rows for
+ *
+ * num | arg
+ * --- | ---
+ * 0   | f1.c
+ * 1   | f2.c
+ * 2   | f3.c
+ *
+ * Note that even if those files `#include` headers, those headers
+ * do not appear as rows.
+ */
+#keyset[id, num]
+compilation_compiling_files(
+    int id : @compilation ref,
+    int num : int ref,
+    int file : @file ref
+);
+
+/**
+ * The time taken by the extractor for a compiler invocation.
+ *
+ * For each file `num`, there will be rows for
+ *
+ * kind | seconds
+ * ---- | ---
+ * 1    | CPU seconds used by the extractor frontend
+ * 2    | Elapsed seconds during the extractor frontend
+ * 3    | CPU seconds used by the extractor backend
+ * 4    | Elapsed seconds during the extractor backend
+ */
+#keyset[id, num, kind]
+compilation_time(
+    int id : @compilation ref,
+    int num : int ref,
+    /* kind:
+       1 = frontend_cpu_seconds
+       2 = frontend_elapsed_seconds
+       3 = extractor_cpu_seconds
+       4 = extractor_elapsed_seconds
+    */
+    int kind : int ref,
+    float seconds : float ref
+);
+
+/**
+ * An error or warning generated by the extractor.
+ * The diagnostic message `diagnostic` was generated during compiler
+ * invocation `compilation`, and is the `file_number_diagnostic_number`th
+ * message generated while extracting the `file_number`th file of that
+ * invocation.
+ */
+#keyset[compilation, file_number, file_number_diagnostic_number]
+diagnostic_for(
+    int diagnostic : @diagnostic ref,
+    int compilation : @compilation ref,
+    int file_number : int ref,
+    int file_number_diagnostic_number : int ref
+);
+
+/**
+ * If extraction was successful, then `cpu_seconds` and
+ * `elapsed_seconds` are the CPU time and elapsed time (respectively)
+ * that extraction took for compiler invocation `id`.
+ */
+compilation_finished(
+    unique int id : @compilation ref,
+    float cpu_seconds : float ref,
+    float elapsed_seconds : float ref
+);
+
+
+/**
+ * External data, loaded from CSV files during snapshot creation. See
+ * [Tutorial: Incorporating external data](https://help.semmle.com/wiki/display/SD/Tutorial%3A+Incorporating+external+data)
+ * for more information.
+ */
+externalData(
+    int id : @externalDataElement,
+    string path : string ref,
+    int column: int ref,
+    string value : string ref
+);
+
+/**
+ * The source location of the snapshot.
+ */
+sourceLocationPrefix(string prefix : string ref);
+
+/**
+ * Information about packages that provide code used during compilation.
+ * The `id` is just a unique identifier.
+ * The `namespace` is typically the name of the package manager that
+ * provided the package (e.g. "dpkg" or "yum").
+ * The `package_name` is the name of the package, and `version` is its
+ * version (as a string).
+ */
+external_packages(
+    unique int id: @external_package,
+    string namespace : string ref,
+    string package_name : string ref,
+    string version : string ref
+);
+
+/**
+ * Holds if File `fileid` was provided by package `package`.
+ */
+header_to_external_package(
+    int fileid : @file ref,
+    int package : @external_package ref
+);
+
+/*
+ * Version history
+ */
+
+svnentries(
+    unique int id : @svnentry,
+    string revision : string ref,
+    string author : string ref,
+    date revisionDate : date ref,
+    int changeSize : int ref
+)
+
+svnaffectedfiles(
+    int id : @svnentry ref,
+    int file : @file ref,
+    string action : string ref
+)
+
+svnentrymsg(
+    unique int id : @svnentry ref,
+    string message : string ref
+)
+
+svnchurn(
+    int commit : @svnentry ref,
+    int file : @file ref,
+    int addedLines : int ref,
+    int deletedLines : int ref
+)
+
+/*
+ * C++ dbscheme
+ */
+
+extractor_version(
+    string codeql_version: string ref,
+    string frontend_version: string ref
+)
+
+@location = @location_stmt | @location_expr | @location_default ;
+
+/**
+ * The location of an element that is not an expression or a statement.
+ * The location spans column `startcolumn` of line `startline` to
+ * column `endcolumn` of line `endline` in file `file`.
+ * For more information, see
+ * [Locations](https://codeql.github.com/docs/writing-codeql-queries/providing-locations-in-codeql-queries/).
+ */
+locations_default(
+    /** The location of an element that is not an expression or a statement. */
+    unique int id: @location_default,
+    int container: @container ref,
+    int startLine: int ref,
+    int startColumn: int ref,
+    int endLine: int ref,
+    int endColumn: int ref
+);
+
+/**
+ * The location of a statement.
+ * The location spans column `startcolumn` of line `startline` to
+ * column `endcolumn` of line `endline` in file `file`.
+ * For more information, see
+ * [Locations](https://codeql.github.com/docs/writing-codeql-queries/providing-locations-in-codeql-queries/).
+ */
+locations_stmt(
+    /** The location of a statement. */
+    unique int id: @location_stmt,
+    int container: @container ref,
+    int startLine: int ref,
+    int startColumn: int ref,
+    int endLine: int ref,
+    int endColumn: int ref
+);
+
+/**
+ * The location of an expression.
+ * The location spans column `startcolumn` of line `startline` to
+ * column `endcolumn` of line `endline` in file `file`.
+ * For more information, see
+ * [Locations](https://codeql.github.com/docs/writing-codeql-queries/providing-locations-in-codeql-queries/).
+ */
+locations_expr(
+    /** The location of an expression. */
+    unique int id: @location_expr,
+    int container: @container ref,
+    int startLine: int ref,
+    int startColumn: int ref,
+    int endLine: int ref,
+    int endColumn: int ref
+);
+
+/** An element for which line-count information is available. */
+@sourceline = @file | @function | @variable | @enumconstant | @xmllocatable;
+
+numlines(
+    int element_id: @sourceline ref,
+    int num_lines: int ref,
+    int num_code: int ref,
+    int num_comment: int ref
+);
+
+diagnostics(
+    unique int id: @diagnostic,
+    int severity: int ref,
+    string error_tag: string ref,
+    string error_message: string ref,
+    string full_error_message: string ref,
+    int location: @location_default ref
+);
+
+files(
+    unique int id: @file,
+    string name: string ref
+);
+
+folders(
+    unique int id: @folder,
+    string name: string ref
+);
+
+@container = @folder | @file
+
+containerparent(
+    int parent: @container ref,
+    unique int child: @container ref
+);
+
+fileannotations(
+    int id: @file ref,
+    int kind: int ref,
+    string name: string ref,
+    string value: string ref
+);
+
+inmacroexpansion(
+    int id: @element ref,
+    int inv: @macroinvocation ref
+);
+
+affectedbymacroexpansion(
+    int id: @element ref,
+    int inv: @macroinvocation ref
+);
+
+case @macroinvocation.kind of
+  1 = @macro_expansion
+| 2 = @other_macro_reference
+;
+
+macroinvocations(
+    unique int id: @macroinvocation,
+    int macro_id: @ppd_define ref,
+    int location: @location_default ref,
+    int kind: int ref
+);
+
+macroparent(
+    unique int id: @macroinvocation ref,
+    int parent_id: @macroinvocation ref
+);
+
+// a macroinvocation may be part of another location
+// the way to find a constant expression that uses a macro
+// is thus to find a constant expression that has a location
+// to which a macro invocation is bound
+macrolocationbind(
+    int id: @macroinvocation ref,
+    int location: @location ref
+);
+
+#keyset[invocation, argument_index]
+macro_argument_unexpanded(
+    int invocation: @macroinvocation ref,
+    int argument_index: int ref,
+    string text: string ref
+);
+
+#keyset[invocation, argument_index]
+macro_argument_expanded(
+    int invocation: @macroinvocation ref,
+    int argument_index: int ref,
+    string text: string ref
+);
+
+/*
+case @function.kind of
+  1 = @normal_function
+| 2 = @constructor
+| 3 = @destructor
+| 4 = @conversion_function
+| 5 = @operator
+| 6 = @builtin_function     // GCC built-in functions, e.g. __builtin___memcpy_chk
+| 7 = @user_defined_literal
+| 8 = @deduction_guide
+;
+*/
+
+functions(
+    unique int id: @function,
+    string name: string ref,
+    int kind: int ref
+);
+
+function_entry_point(
+    int id: @function ref,
+    unique int entry_point: @stmt ref
+);
+
+function_return_type(
+    int id: @function ref,
+    int return_type: @type ref
+);
+
+/**
+ * If `function` is a coroutine, then this gives the `std::experimental::resumable_traits`
+ * instance associated with it, and the variables representing the `handle` and `promise`
+ * for it.
+ */
+coroutine(
+  unique int function: @function ref,
+  int traits: @type ref
+);
+
+/*
+case @coroutine_placeholder_variable.kind of
+  1 = @handle
+| 2 = @promise
+| 3 = @init_await_resume
+;
+*/
+
+coroutine_placeholder_variable(
+  unique int placeholder_variable: @variable ref,
+  int kind: int ref,
+  int function: @function ref
+)
+
+/** The `new` function used for allocating the coroutine state, if any. */
+coroutine_new(
+  unique int function: @function ref,
+  int new: @function ref
+);
+
+/** The `delete` function used for deallocating the coroutine state, if any. */
+coroutine_delete(
+  unique int function: @function ref,
+  int delete: @function ref
+);
+
+purefunctions(unique int id: @function ref);
+
+function_deleted(unique int id: @function ref);
+
+function_defaulted(unique int id: @function ref);
+
+function_prototyped(unique int id: @function ref)
+
+deduction_guide_for_class(
+    int id: @function ref,
+    int class_template: @usertype ref
+)
+
+member_function_this_type(
+    unique int id: @function ref,
+    int this_type: @type ref
+);
+
+#keyset[id, type_id]
+fun_decls(
+    int id: @fun_decl,
+    int function: @function ref,
+    int type_id: @type ref,
+    string name: string ref,
+    int location: @location_default ref
+);
+fun_def(unique int id: @fun_decl ref);
+fun_specialized(unique int id: @fun_decl ref);
+fun_implicit(unique int id: @fun_decl ref);
+fun_decl_specifiers(
+    int id: @fun_decl ref,
+    string name: string ref
+)
+#keyset[fun_decl, index]
+fun_decl_throws(
+    int fun_decl: @fun_decl ref,
+    int index: int ref,
+    int type_id: @type ref
+);
+/* an empty throw specification is different from none */
+fun_decl_empty_throws(unique int fun_decl: @fun_decl ref);
+fun_decl_noexcept(
+    int fun_decl: @fun_decl ref,
+    int constant: @expr ref
+);
+fun_decl_empty_noexcept(int fun_decl: @fun_decl ref);
+fun_decl_typedef_type(
+    unique int fun_decl: @fun_decl ref,
+    int typedeftype_id: @usertype ref
+);
+
+param_decl_bind(
+    unique int id: @var_decl ref,
+    int index: int ref,
+    int fun_decl: @fun_decl ref
+);
+
+#keyset[id, type_id]
+var_decls(
+    int id: @var_decl,
+    int variable: @variable ref,
+    int type_id: @type ref,
+    string name: string ref,
+    int location: @location_default ref
+);
+var_def(unique int id: @var_decl ref);
+var_decl_specifiers(
+    int id: @var_decl ref,
+    string name: string ref
+)
+is_structured_binding(unique int id: @variable ref);
+
+type_decls(
+    unique int id: @type_decl,
+    int type_id: @type ref,
+    int location: @location_default ref
+);
+type_def(unique int id: @type_decl ref);
+type_decl_top(
+    unique int type_decl: @type_decl ref
+);
+
+namespace_decls(
+    unique int id: @namespace_decl,
+    int namespace_id: @namespace ref,
+    int location: @location_default ref,
+    int bodylocation: @location_default ref
+);
+
+case @using.kind of
+  1 = @using_declaration
+| 2 = @using_directive
+| 3 = @using_enum_declaration
+;
+
+usings(
+    unique int id: @using,
+    int element_id: @element ref,
+    int location: @location_default ref,
+    int kind: int ref
+);
+
+/** The element which contains the `using` declaration. */
+using_container(
+    int parent: @element ref,
+    int child: @using ref
+);
+
+static_asserts(
+    unique int id: @static_assert,
+    int condition : @expr ref,
+    string message : string ref,
+    int location: @location_default ref,
+    int enclosing : @element ref
+);
+
+// each function has an ordered list of parameters
+#keyset[id, type_id]
+#keyset[function, index, type_id]
+params(
+    int id: @parameter,
+    int function: @functionorblock ref,
+    int index: int ref,
+    int type_id: @type ref
+);
+
+overrides(
+    int new: @function ref,
+    int old: @function ref
+);
+
+#keyset[id, type_id]
+membervariables(
+    int id: @membervariable,
+    int type_id: @type ref,
+    string name: string ref
+);
+
+#keyset[id, type_id]
+globalvariables(
+    int id: @globalvariable,
+    int type_id: @type ref,
+    string name: string ref
+);
+
+#keyset[id, type_id]
+localvariables(
+    int id: @localvariable,
+    int type_id: @type ref,
+    string name: string ref
+);
+
+autoderivation(
+    unique int var: @variable ref,
+    int derivation_type: @type ref
+);
+
+orphaned_variables(
+    int var: @localvariable ref,
+    int function: @function ref
+)
+
+enumconstants(
+    unique int id: @enumconstant,
+    int parent: @usertype ref,
+    int index: int ref,
+    int type_id: @type ref,
+    string name: string ref,
+    int location: @location_default ref
+);
+
+@variable = @localscopevariable | @globalvariable | @membervariable;
+
+@localscopevariable = @localvariable | @parameter;
+
+/**
+ * Built-in types are the fundamental types, e.g., integral, floating, and void.
+ */
+case @builtintype.kind of
+   1 = @errortype
+|  2 = @unknowntype
+|  3 = @void
+|  4 = @boolean
+|  5 = @char
+|  6 = @unsigned_char
+|  7 = @signed_char
+|  8 = @short
+|  9 = @unsigned_short
+| 10 = @signed_short
+| 11 = @int
+| 12 = @unsigned_int
+| 13 = @signed_int
+| 14 = @long
+| 15 = @unsigned_long
+| 16 = @signed_long
+| 17 = @long_long
+| 18 = @unsigned_long_long
+| 19 = @signed_long_long
+// ... 20 Microsoft-specific __int8
+// ... 21 Microsoft-specific __int16
+// ... 22 Microsoft-specific __int32
+// ... 23 Microsoft-specific __int64
+| 24 = @float
+| 25 = @double
+| 26 = @long_double
+| 27 = @complex_float         // C99-specific _Complex float
+| 28 = @complex_double        // C99-specific _Complex double
+| 29 = @complex_long_double   // C99-specific _Complex long double
+| 30 = @imaginary_float       // C99-specific _Imaginary float
+| 31 = @imaginary_double      // C99-specific _Imaginary double
+| 32 = @imaginary_long_double // C99-specific _Imaginary long double
+| 33 = @wchar_t               // Microsoft-specific
+| 34 = @decltype_nullptr      // C++11
+| 35 = @int128                // __int128
+| 36 = @unsigned_int128       // unsigned __int128
+| 37 = @signed_int128         // signed __int128
+| 38 = @float128              // __float128
+| 39 = @complex_float128      // _Complex __float128
+| 40 = @decimal32             // _Decimal32
+| 41 = @decimal64             // _Decimal64
+| 42 = @decimal128            // _Decimal128
+| 43 = @char16_t
+| 44 = @char32_t
+| 45 = @std_float32           // _Float32
+| 46 = @float32x              // _Float32x
+| 47 = @std_float64           // _Float64
+| 48 = @float64x              // _Float64x
+| 49 = @std_float128          // _Float128
+// ... 50 _Float128x
+| 51 = @char8_t
+| 52 = @float16               // _Float16
+| 53 = @complex_float16       // _Complex _Float16
+| 54 = @fp16                  // __fp16
+| 55 = @std_bfloat16          // __bf16
+| 56 = @std_float16           // std::float16_t
+| 57 = @complex_std_float32   // _Complex _Float32
+| 58 = @complex_float32x      // _Complex _Float32x
+| 59 = @complex_std_float64   // _Complex _Float64
+| 60 = @complex_float64x      // _Complex _Float64x
+| 61 = @complex_std_float128  // _Complex _Float128
+;
+
+builtintypes(
+    unique int id: @builtintype,
+    string name: string ref,
+    int kind: int ref,
+    int size: int ref,
+    int sign: int ref,
+    int alignment: int ref
+);
+
+/**
+ * Derived types are types that are directly derived from existing types and
+ * point to, refer to, transform type data to return a new type.
+ */
+case @derivedtype.kind of
+   1 = @pointer
+|  2 = @reference
+|  3 = @type_with_specifiers
+|  4 = @array
+|  5 = @gnu_vector
+|  6 = @routineptr
+|  7 = @routinereference
+|  8 = @rvalue_reference // C++11
+// ... 9 type_conforming_to_protocols deprecated
+| 10 = @block
+;
+
+derivedtypes(
+    unique int id: @derivedtype,
+    string name: string ref,
+    int kind: int ref,
+    int type_id: @type ref
+);
+
+pointerishsize(unique int id: @derivedtype ref,
+    int size: int ref,
+    int alignment: int ref);
+
+arraysizes(
+    unique int id: @derivedtype ref,
+    int num_elements: int ref,
+    int bytesize: int ref,
+    int alignment: int ref
+);
+
+typedefbase(
+    unique int id: @usertype ref,
+    int type_id: @type ref
+);
+
+/**
+ * An instance of the C++11 `decltype` operator.  For example:
+ * ```
+ * int a;
+ * decltype(1+a) b;
+ * ```
+ * Here `expr` is `1+a`.
+ *
+ * Sometimes an additional pair of parentheses around the expression
+ * would change the semantics of this decltype, e.g.
+ * ```
+ * struct A { double x; };
+ * const A* a = new A();
+ * decltype( a->x ); // type is double
+ * decltype((a->x)); // type is const double&
+ * ```
+ * (Please consult the C++11 standard for more details).
+ * `parentheses_would_change_meaning` is `true` iff that is the case.
+ */
+#keyset[id, expr]
+decltypes(
+    int id: @decltype,
+    int expr: @expr ref,
+    int base_type: @type ref,
+    boolean parentheses_would_change_meaning: boolean ref
+);
+
+/*
+case @usertype.kind of
+   1 = @struct
+|  2 = @class
+|  3 = @union
+|  4 = @enum
+|  5 = @typedef                       // classic C: typedef typedef type name
+|  6 = @template
+|  7 = @template_parameter
+|  8 = @template_template_parameter
+|  9 = @proxy_class                   // a proxy class associated with a template parameter
+// ... 10 objc_class deprecated
+// ... 11 objc_protocol deprecated
+// ... 12 objc_category deprecated
+| 13 = @scoped_enum
+| 14 = @using_alias                  // a using name = type style typedef
+;
+*/
+
+usertypes(
+    unique int id: @usertype,
+    string name: string ref,
+    int kind: int ref
+);
+
+usertypesize(
+    unique int id: @usertype ref,
+    int size: int ref,
+    int alignment: int ref
+);
+
+usertype_final(unique int id: @usertype ref);
+
+usertype_uuid(
+    unique int id: @usertype ref,
+    string uuid: string ref
+);
+
+mangled_name(
+    unique int id: @declaration ref,
+    int mangled_name : @mangledname,
+    boolean is_complete: boolean ref
+);
+
+is_pod_class(unique int id: @usertype ref);
+is_standard_layout_class(unique int id: @usertype ref);
+
+is_complete(unique int id: @usertype ref);
+
+is_class_template(unique int id: @usertype ref);
+class_instantiation(
+    int to: @usertype ref,
+    int from: @usertype ref
+);
+class_template_argument(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+class_template_argument_value(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+is_proxy_class_for(
+    unique int id: @usertype ref,
+    unique int templ_param_id: @usertype ref
+);
+
+type_mentions(
+    unique int id: @type_mention,
+    int type_id: @type ref,
+    int location: @location ref,
+    // a_symbol_reference_kind from the frontend.
+    int kind: int ref
+);
+
+is_function_template(unique int id: @function ref);
+function_instantiation(
+    unique int to: @function ref,
+    int from: @function ref
+);
+function_template_argument(
+    int function_id: @function ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+function_template_argument_value(
+    int function_id: @function ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+is_variable_template(unique int id: @variable ref);
+variable_instantiation(
+    unique int to: @variable ref,
+    int from: @variable ref
+);
+variable_template_argument(
+    int variable_id: @variable ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+variable_template_argument_value(
+    int variable_id: @variable ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+routinetypes(
+    unique int id: @routinetype,
+    int return_type: @type ref
+);
+
+routinetypeargs(
+    int routine: @routinetype ref,
+    int index: int ref,
+    int type_id: @type ref
+);
+
+ptrtomembers(
+    unique int id: @ptrtomember,
+    int type_id: @type ref,
+    int class_id: @type ref
+);
+
+/*
+ specifiers for types, functions, and variables
+
+    "public",
+    "protected",
+    "private",
+
+    "const",
+    "volatile",
+    "static",
+
+    "pure",
+    "virtual",
+    "sealed", // Microsoft
+    "__interface", // Microsoft
+    "inline",
+    "explicit",
+
+    "near", // near far extension
+    "far", // near far extension
+    "__ptr32", // Microsoft
+    "__ptr64", // Microsoft
+    "__sptr", // Microsoft
+    "__uptr", // Microsoft
+    "dllimport", // Microsoft
+    "dllexport", // Microsoft
+    "thread", // Microsoft
+    "naked", // Microsoft
+    "microsoft_inline", // Microsoft
+    "forceinline", // Microsoft
+    "selectany", // Microsoft
+    "nothrow", // Microsoft
+    "novtable", // Microsoft
+    "noreturn", // Microsoft
+    "noinline", // Microsoft
+    "noalias", // Microsoft
+    "restrict", // Microsoft
+*/
+
+specifiers(
+    unique int id: @specifier,
+    unique string str: string ref
+);
+
+typespecifiers(
+    int type_id: @type ref,
+    int spec_id: @specifier ref
+);
+
+funspecifiers(
+    int func_id: @function ref,
+    int spec_id: @specifier ref
+);
+
+varspecifiers(
+    int var_id: @accessible ref,
+    int spec_id: @specifier ref
+);
+
+explicit_specifier_exprs(
+    unique int func_id: @function ref,
+    int constant: @expr ref
+)
+
+attributes(
+    unique int id: @attribute,
+    int kind: int ref,
+    string name: string ref,
+    string name_space: string ref,
+    int location: @location_default ref
+);
+
+case @attribute.kind of
+  0 = @gnuattribute
+| 1 = @stdattribute
+| 2 = @declspec
+| 3 = @msattribute
+| 4 = @alignas
+// ... 5 @objc_propertyattribute deprecated
+;
+
+attribute_args(
+    unique int id: @attribute_arg,
+    int kind: int ref,
+    int attribute: @attribute ref,
+    int index: int ref,
+    int location: @location_default ref
+);
+
+case @attribute_arg.kind of
+  0 = @attribute_arg_empty
+| 1 = @attribute_arg_token
+| 2 = @attribute_arg_constant
+| 3 = @attribute_arg_type
+| 4 = @attribute_arg_constant_expr
+| 5 = @attribute_arg_expr
+;
+
+attribute_arg_value(
+    unique int arg: @attribute_arg ref,
+    string value: string ref
+);
+attribute_arg_type(
+    unique int arg: @attribute_arg ref,
+    int type_id: @type ref
+);
+attribute_arg_constant(
+    unique int arg: @attribute_arg ref,
+    int constant: @expr ref
+)
+attribute_arg_expr(
+    unique int arg: @attribute_arg ref,
+    int expr: @expr ref
+)
+attribute_arg_name(
+    unique int arg: @attribute_arg ref,
+    string name: string ref
+);
+
+typeattributes(
+    int type_id: @type ref,
+    int spec_id: @attribute ref
+);
+
+funcattributes(
+    int func_id: @function ref,
+    int spec_id: @attribute ref
+);
+
+varattributes(
+    int var_id: @accessible ref,
+    int spec_id: @attribute ref
+);
+
+stmtattributes(
+    int stmt_id: @stmt ref,
+    int spec_id: @attribute ref
+);
+
+@type = @builtintype
+      | @derivedtype
+      | @usertype
+      /* TODO | @fixedpointtype */
+      | @routinetype
+      | @ptrtomember
+      | @decltype;
+
+unspecifiedtype(
+    unique int type_id: @type ref,
+    int unspecified_type_id: @type ref
+);
+
+member(
+    int parent: @type ref,
+    int index: int ref,
+    int child: @member ref
+);
+
+@enclosingfunction_child = @usertype | @variable | @namespace
+
+enclosingfunction(
+    unique int child: @enclosingfunction_child ref,
+    int parent: @function ref
+);
+
+derivations(
+    unique int derivation: @derivation,
+    int sub: @type ref,
+    int index: int ref,
+    int super: @type ref,
+    int location: @location_default ref
+);
+
+derspecifiers(
+    int der_id: @derivation ref,
+    int spec_id: @specifier ref
+);
+
+/**
+ * Contains the byte offset of the base class subobject within the derived
+ * class. Only holds for non-virtual base classes, but see table
+ * `virtual_base_offsets` for offsets of virtual base class subobjects.
+ */
+direct_base_offsets(
+    unique int der_id: @derivation ref,
+    int offset: int ref
+);
+
+/**
+ * Contains the byte offset of the virtual base class subobject for class
+ * `super` within a most-derived object of class `sub`. `super` can be either a
+ * direct or indirect base class.
+ */
+#keyset[sub, super]
+virtual_base_offsets(
+    int sub: @usertype ref,
+    int super: @usertype ref,
+    int offset: int ref
+);
+
+frienddecls(
+    unique int id: @frienddecl,
+    int type_id: @type ref,
+    int decl_id: @declaration ref,
+    int location: @location_default ref
+);
+
+@declaredtype = @usertype ;
+
+@declaration = @function
+             | @declaredtype
+             | @variable
+             | @enumconstant
+             | @frienddecl;
+
+@member = @membervariable
+        | @function
+        | @declaredtype
+        | @enumconstant;
+
+@locatable = @diagnostic
+           | @declaration
+           | @ppd_include
+           | @ppd_define
+           | @macroinvocation
+           /*| @funcall*/
+           | @xmllocatable
+           | @attribute
+           | @attribute_arg;
+
+@namedscope = @namespace | @usertype;
+
+@element = @locatable
+         | @file
+         | @folder
+         | @specifier
+         | @type
+         | @expr
+         | @namespace
+         | @initialiser
+         | @stmt
+         | @derivation
+         | @comment
+         | @preprocdirect
+         | @fun_decl
+         | @var_decl
+         | @type_decl
+         | @namespace_decl
+         | @using
+         | @namequalifier
+         | @specialnamequalifyingelement
+         | @static_assert
+         | @type_mention
+         | @lambdacapture;
+
+@exprparent = @element;
+
+comments(
+    unique int id: @comment,
+    string contents: string ref,
+    int location: @location_default ref
+);
+
+commentbinding(
+    int id: @comment ref,
+    int element: @element ref
+);
+
+exprconv(
+    int converted: @expr ref,
+    unique int conversion: @expr ref
+);
+
+compgenerated(unique int id: @element ref);
+
+/**
+ * `destructor_call` destructs the `i`'th entity that should be
+ * destructed following `element`. Note that entities should be
+ * destructed in reverse construction order, so for a given `element`
+ * these should be called from highest to lowest `i`.
+ */
+#keyset[element, destructor_call]
+#keyset[element, i]
+synthetic_destructor_call(
+    int element: @element ref,
+    int i: int ref,
+    int destructor_call: @routineexpr ref
+);
+
+namespaces(
+    unique int id: @namespace,
+    string name: string ref
+);
+
+namespace_inline(
+    unique int id: @namespace ref
+);
+
+namespacembrs(
+    int parentid: @namespace ref,
+    unique int memberid: @namespacembr ref
+);
+
+@namespacembr = @declaration | @namespace;
+
+exprparents(
+    int expr_id: @expr ref,
+    int child_index: int ref,
+    int parent_id: @exprparent ref
+);
+
+expr_isload(unique int expr_id: @expr ref);
+
+@cast = @c_style_cast
+      | @const_cast
+      | @dynamic_cast
+      | @reinterpret_cast
+      | @static_cast
+      ;
+
+/*
+case @conversion.kind of
+  0 = @simple_conversion           // a numeric conversion, qualification conversion, or a reinterpret_cast
+| 1 = @bool_conversion             // conversion to 'bool'
+| 2 = @base_class_conversion       // a derived-to-base conversion
+| 3 = @derived_class_conversion    // a base-to-derived conversion
+| 4 = @pm_base_class_conversion    // a derived-to-base conversion of a pointer to member
+| 5 = @pm_derived_class_conversion // a base-to-derived conversion of a pointer to member
+| 6 = @glvalue_adjust              // an adjustment of the type of a glvalue
+| 7 = @prvalue_adjust              // an adjustment of the type of a prvalue
+;
+*/
+/**
+ * Describes the semantics represented by a cast expression. This is largely
+ * independent of the source syntax of the cast, so it is separate from the
+ * regular expression kind.
+ */
+conversionkinds(
+    unique int expr_id: @cast ref,
+    int kind: int ref
+);
+
+@conversion = @cast
+            | @array_to_pointer
+            | @parexpr
+            | @reference_to
+            | @ref_indirect
+            | @temp_init
+            | @c11_generic
+            ;
+
+/*
+case @funbindexpr.kind of
+  0 = @normal_call  // a normal call
+| 1 = @virtual_call // a virtual call
+| 2 = @adl_call     // a call whose target is only found by ADL
+;
+*/
+iscall(
+    unique int caller: @funbindexpr ref,
+    int kind: int ref
+);
+
+numtemplatearguments(
+    unique int expr_id: @expr ref,
+    int num: int ref
+);
+
+specialnamequalifyingelements(
+    unique int id: @specialnamequalifyingelement,
+    unique string name: string ref
+);
+
+@namequalifiableelement = @expr | @namequalifier;
+@namequalifyingelement = @namespace
+                       | @specialnamequalifyingelement
+                       | @usertype;
+
+namequalifiers(
+    unique int id: @namequalifier,
+    unique int qualifiableelement: @namequalifiableelement ref,
+    int qualifyingelement: @namequalifyingelement ref,
+    int location: @location_default ref
+);
+
+varbind(
+    int expr: @varbindexpr ref,
+    int var: @accessible ref
+);
+
+funbind(
+    int expr: @funbindexpr ref,
+    int fun: @function ref
+);
+
+@any_new_expr = @new_expr
+              | @new_array_expr;
+
+@new_or_delete_expr = @any_new_expr
+                    | @delete_expr
+                    | @delete_array_expr;
+
+@prefix_crement_expr = @preincrexpr | @predecrexpr;
+
+@postfix_crement_expr = @postincrexpr | @postdecrexpr;
+
+@increment_expr = @preincrexpr | @postincrexpr;
+
+@decrement_expr = @predecrexpr | @postdecrexpr;
+
+@crement_expr = @increment_expr | @decrement_expr;
+
+@un_arith_op_expr = @arithnegexpr
+                  | @unaryplusexpr
+                  | @conjugation
+                  | @realpartexpr
+                  | @imagpartexpr
+                  | @crement_expr
+                  ;
+
+@un_bitwise_op_expr = @complementexpr;
+
+@un_log_op_expr = @notexpr;
+
+@un_op_expr = @address_of
+            | @indirect
+            | @un_arith_op_expr
+            | @un_bitwise_op_expr
+            | @builtinaddressof
+            | @vec_fill
+            | @un_log_op_expr
+            | @co_await
+            | @co_yield
+            ;
+
+@bin_log_op_expr = @andlogicalexpr | @orlogicalexpr;
+
+@cmp_op_expr = @eq_op_expr | @rel_op_expr;
+
+@eq_op_expr = @eqexpr | @neexpr;
+
+@rel_op_expr = @gtexpr
+             | @ltexpr
+             | @geexpr
+             | @leexpr
+             | @spaceshipexpr
+             ;
+
+@bin_bitwise_op_expr = @lshiftexpr
+                     | @rshiftexpr
+                     | @andexpr
+                     | @orexpr
+                     | @xorexpr
+                     ;
+
+@p_arith_op_expr = @paddexpr
+                 | @psubexpr
+                 | @pdiffexpr
+                 ;
+
+@bin_arith_op_expr = @addexpr
+                   | @subexpr
+                   | @mulexpr
+                   | @divexpr
+                   | @remexpr
+                   | @jmulexpr
+                   | @jdivexpr
+                   | @fjaddexpr
+                   | @jfaddexpr
+                   | @fjsubexpr
+                   | @jfsubexpr
+                   | @minexpr
+                   | @maxexpr
+                   | @p_arith_op_expr
+                   ;
+
+@bin_op_expr = @bin_arith_op_expr
+             | @bin_bitwise_op_expr
+             | @cmp_op_expr
+             | @bin_log_op_expr
+             ;
+
+@op_expr = @un_op_expr
+         | @bin_op_expr
+         | @assign_expr
+         | @conditionalexpr
+         ;
+
+@assign_arith_expr = @assignaddexpr
+                   | @assignsubexpr
+                   | @assignmulexpr
+                   | @assigndivexpr
+                   | @assignremexpr
+                   ;
+
+@assign_bitwise_expr = @assignandexpr
+                     | @assignorexpr
+                     | @assignxorexpr
+                     | @assignlshiftexpr
+                     | @assignrshiftexpr
+                     ;
+
+@assign_pointer_expr = @assignpaddexpr
+                     | @assignpsubexpr
+                     ;
+
+@assign_op_expr = @assign_arith_expr
+                | @assign_bitwise_expr
+                | @assign_pointer_expr
+                ;
+
+@assign_expr = @assignexpr | @assign_op_expr | @blockassignexpr
+
+/*
+  Binary encoding of the allocator form.
+
+  case @allocator.form of
+    0 = plain
+  | 1 = alignment
+  ;
+*/
+
+/**
+ * The allocator function associated with a `new` or `new[]` expression.
+ * The `form` column specified whether the allocation call contains an alignment
+ * argument.
+ */
+expr_allocator(
+    unique int expr: @any_new_expr ref,
+    int func: @function ref,
+    int form: int ref
+);
+
+/*
+  Binary encoding of the deallocator form.
+
+  case @deallocator.form of
+    0 = plain
+  | 1 = size
+  | 2 = alignment
+  | 4 = destroying_delete
+  ;
+*/
+
+/**
+ * The deallocator function associated with a `delete`, `delete[]`, `new`, or
+ * `new[]` expression. For a `new` or `new[]` expression, the deallocator is the
+ * one used to free memory if the initialization throws an exception.
+ * The `form` column specifies whether the deallocation call contains a size
+ * argument, and alignment argument, or both.
+ */
+expr_deallocator(
+    unique int expr: @new_or_delete_expr ref,
+    int func: @function ref,
+    int form: int ref
+);
+
+/**
+ * Holds if the `@conditionalexpr` is of the two operand form
+ * `guard ? : false`.
+ */
+expr_cond_two_operand(
+    unique int cond: @conditionalexpr ref
+);
+
+/**
+ * The guard of `@conditionalexpr` `guard ? true : false`
+ */
+expr_cond_guard(
+    unique int cond: @conditionalexpr ref,
+    int guard: @expr ref
+);
+
+/**
+ * The expression used when the guard of `@conditionalexpr`
+ * `guard ? true : false` holds. For the two operand form
+ * `guard ?: false` consider using `expr_cond_guard` instead.
+ */
+expr_cond_true(
+    unique int cond: @conditionalexpr ref,
+    int true: @expr ref
+);
+
+/**
+ * The expression used when the guard of `@conditionalexpr`
+ * `guard ? true : false` does not hold.
+ */
+expr_cond_false(
+    unique int cond: @conditionalexpr ref,
+    int false: @expr ref
+);
+
+/** A string representation of the value. */
+values(
+    unique int id: @value,
+    string str: string ref
+);
+
+/** The actual text in the source code for the value, if any. */
+valuetext(
+    unique int id: @value ref,
+    string text: string ref
+);
+
+valuebind(
+    int val: @value ref,
+    unique int expr: @expr ref
+);
+
+fieldoffsets(
+    unique int id: @variable ref,
+    int byteoffset: int ref,
+    int bitoffset: int ref
+);
+
+bitfield(
+    unique int id: @variable ref,
+    int bits: int ref,
+    int declared_bits: int ref
+);
+
+/* TODO
+memberprefix(
+    int member: @expr ref,
+    int prefix: @expr ref
+);
+*/
+
+/*
+   kind(1) = mbrcallexpr
+   kind(2) = mbrptrcallexpr
+   kind(3) = mbrptrmbrcallexpr
+   kind(4) = ptrmbrptrmbrcallexpr
+   kind(5) = mbrreadexpr // x.y
+   kind(6) = mbrptrreadexpr // p->y
+   kind(7) = mbrptrmbrreadexpr // x.*pm
+   kind(8) = mbrptrmbrptrreadexpr // x->*pm
+   kind(9) = staticmbrreadexpr // static x.y
+   kind(10) = staticmbrptrreadexpr // static p->y
+*/
+/* TODO
+memberaccess(
+    int member: @expr ref,
+    int kind: int ref
+);
+*/
+
+initialisers(
+    unique int init: @initialiser,
+    int var: @accessible ref,
+    unique int expr: @expr ref,
+    int location: @location_expr ref
+);
+
+braced_initialisers(
+    int init: @initialiser ref
+);
+
+/**
+ * An ancestor for the expression, for cases in which we cannot
+ * otherwise find the expression's parent.
+ */
+expr_ancestor(
+    int exp: @expr ref,
+    int ancestor: @element ref
+);
+
+exprs(
+    unique int id: @expr,
+    int kind: int ref,
+    int location: @location_expr ref
+);
+
+expr_reuse(
+    int reuse: @expr ref,
+    int original: @expr ref,
+    int value_category: int ref
+)
+
+/*
+  case @value.category of
+    1 = prval
+  | 2 = xval
+  | 3 = lval
+  ;
+*/
+expr_types(
+    int id: @expr ref,
+    int typeid: @type ref,
+    int value_category: int ref
+);
+
+case @expr.kind of
+    1 = @errorexpr
+|   2 = @address_of // & AddressOfExpr
+|   3 = @reference_to // ReferenceToExpr (implicit?)
+|   4 = @indirect // * PointerDereferenceExpr
+|   5 = @ref_indirect // ReferenceDereferenceExpr (implicit?)
+// ...
+|   8 = @array_to_pointer // (???)
+|   9 = @vacuous_destructor_call // VacuousDestructorCall
+// ...
+|  11 = @assume // Microsoft
+|  12 = @parexpr
+|  13 = @arithnegexpr
+|  14 = @unaryplusexpr
+|  15 = @complementexpr
+|  16 = @notexpr
+|  17 = @conjugation // GNU ~ operator
+|  18 = @realpartexpr // GNU __real
+|  19 = @imagpartexpr // GNU __imag
+|  20 = @postincrexpr
+|  21 = @postdecrexpr
+|  22 = @preincrexpr
+|  23 = @predecrexpr
+|  24 = @conditionalexpr
+|  25 = @addexpr
+|  26 = @subexpr
+|  27 = @mulexpr
+|  28 = @divexpr
+|  29 = @remexpr
+|  30 = @jmulexpr // C99 mul imaginary
+|  31 = @jdivexpr // C99 div imaginary
+|  32 = @fjaddexpr // C99 add real + imaginary
+|  33 = @jfaddexpr // C99 add imaginary + real
+|  34 = @fjsubexpr // C99 sub real - imaginary
+|  35 = @jfsubexpr // C99 sub imaginary - real
+|  36 = @paddexpr // pointer add (pointer + int or int + pointer)
+|  37 = @psubexpr // pointer sub (pointer - integer)
+|  38 = @pdiffexpr // difference between two pointers
+|  39 = @lshiftexpr
+|  40 = @rshiftexpr
+|  41 = @andexpr
+|  42 = @orexpr
+|  43 = @xorexpr
+|  44 = @eqexpr
+|  45 = @neexpr
+|  46 = @gtexpr
+|  47 = @ltexpr
+|  48 = @geexpr
+|  49 = @leexpr
+|  50 = @minexpr // GNU minimum
+|  51 = @maxexpr // GNU maximum
+|  52 = @assignexpr
+|  53 = @assignaddexpr
+|  54 = @assignsubexpr
+|  55 = @assignmulexpr
+|  56 = @assigndivexpr
+|  57 = @assignremexpr
+|  58 = @assignlshiftexpr
+|  59 = @assignrshiftexpr
+|  60 = @assignandexpr
+|  61 = @assignorexpr
+|  62 = @assignxorexpr
+|  63 = @assignpaddexpr // assign pointer add
+|  64 = @assignpsubexpr // assign pointer sub
+|  65 = @andlogicalexpr
+|  66 = @orlogicalexpr
+|  67 = @commaexpr
+|  68 = @subscriptexpr // access to member of an array, e.g., a[5]
+// ...  69 @objc_subscriptexpr deprecated
+// ...  70 @cmdaccess deprecated
+// ...
+|  73 = @virtfunptrexpr
+|  74 = @callexpr
+// ...  75 @msgexpr_normal deprecated
+// ...  76 @msgexpr_super deprecated
+// ...  77 @atselectorexpr deprecated
+// ...  78 @atprotocolexpr deprecated
+|  79 = @vastartexpr
+|  80 = @vaargexpr
+|  81 = @vaendexpr
+|  82 = @vacopyexpr
+// ...  83 @atencodeexpr deprecated
+|  84 = @varaccess
+|  85 = @thisaccess
+// ...  86 @objc_box_expr deprecated
+|  87 = @new_expr
+|  88 = @delete_expr
+|  89 = @throw_expr
+|  90 = @condition_decl // a variable declared in a condition, e.g., if(int x = y > 2)
+|  91 = @braced_init_list
+|  92 = @type_id
+|  93 = @runtime_sizeof
+|  94 = @runtime_alignof
+|  95 = @sizeof_pack
+|  96 = @expr_stmt // GNU extension
+|  97 = @routineexpr
+|  98 = @type_operand // used to access a type in certain contexts (haven't found any examples yet....)
+|  99 = @offsetofexpr // offsetof ::= type and field
+| 100 = @hasassignexpr // __has_assign ::= type
+| 101 = @hascopyexpr // __has_copy ::= type
+| 102 = @hasnothrowassign // __has_nothrow_assign ::= type
+| 103 = @hasnothrowconstr // __has_nothrow_constructor ::= type
+| 104 = @hasnothrowcopy // __has_nothrow_copy ::= type
+| 105 = @hastrivialassign // __has_trivial_assign ::= type
+| 106 = @hastrivialconstr // __has_trivial_constructor ::= type
+| 107 = @hastrivialcopy // __has_trivial_copy ::= type
+| 108 = @hasuserdestr // __has_user_destructor ::= type
+| 109 = @hasvirtualdestr // __has_virtual_destructor ::= type
+| 110 = @isabstractexpr // __is_abstract ::= type
+| 111 = @isbaseofexpr // __is_base_of ::= type type
+| 112 = @isclassexpr // __is_class ::= type
+| 113 = @isconvtoexpr // __is_convertible_to ::= type type
+| 114 = @isemptyexpr // __is_empty ::= type
+| 115 = @isenumexpr // __is_enum ::= type
+| 116 = @ispodexpr // __is_pod ::= type
+| 117 = @ispolyexpr // __is_polymorphic ::= type
+| 118 = @isunionexpr // __is_union ::= type
+| 119 = @typescompexpr // GNU __builtin_types_compatible ::= type type
+| 120 = @intaddrexpr // frontend internal builtin, used to implement offsetof
+// ...
+| 122 = @hastrivialdestructor // __has_trivial_destructor ::= type
+| 123 = @literal
+| 124 = @uuidof
+| 127 = @aggregateliteral
+| 128 = @delete_array_expr
+| 129 = @new_array_expr
+// ... 130 @objc_array_literal deprecated
+// ... 131 @objc_dictionary_literal deprecated
+| 132 = @foldexpr
+// ...
+| 200 = @ctordirectinit
+| 201 = @ctorvirtualinit
+| 202 = @ctorfieldinit
+| 203 = @ctordelegatinginit
+| 204 = @dtordirectdestruct
+| 205 = @dtorvirtualdestruct
+| 206 = @dtorfielddestruct
+// ...
+| 210 = @static_cast
+| 211 = @reinterpret_cast
+| 212 = @const_cast
+| 213 = @dynamic_cast
+| 214 = @c_style_cast
+| 215 = @lambdaexpr
+| 216 = @param_ref
+| 217 = @noopexpr
+// ...
+| 294 = @istriviallyconstructibleexpr
+| 295 = @isdestructibleexpr
+| 296 = @isnothrowdestructibleexpr
+| 297 = @istriviallydestructibleexpr
+| 298 = @istriviallyassignableexpr
+| 299 = @isnothrowassignableexpr
+| 300 = @istrivialexpr
+| 301 = @isstandardlayoutexpr
+| 302 = @istriviallycopyableexpr
+| 303 = @isliteraltypeexpr
+| 304 = @hastrivialmoveconstructorexpr
+| 305 = @hastrivialmoveassignexpr
+| 306 = @hasnothrowmoveassignexpr
+| 307 = @isconstructibleexpr
+| 308 = @isnothrowconstructibleexpr
+| 309 = @hasfinalizerexpr
+| 310 = @isdelegateexpr
+| 311 = @isinterfaceclassexpr
+| 312 = @isrefarrayexpr
+| 313 = @isrefclassexpr
+| 314 = @issealedexpr
+| 315 = @issimplevalueclassexpr
+| 316 = @isvalueclassexpr
+| 317 = @isfinalexpr
+| 319 = @noexceptexpr
+| 320 = @builtinshufflevector
+| 321 = @builtinchooseexpr
+| 322 = @builtinaddressof
+| 323 = @vec_fill
+| 324 = @builtinconvertvector
+| 325 = @builtincomplex
+| 326 = @spaceshipexpr
+| 327 = @co_await
+| 328 = @co_yield
+| 329 = @temp_init
+| 330 = @isassignable
+| 331 = @isaggregate
+| 332 = @hasuniqueobjectrepresentations
+| 333 = @builtinbitcast
+| 334 = @builtinshuffle
+| 335 = @blockassignexpr
+| 336 = @issame
+| 337 = @isfunction
+| 338 = @islayoutcompatible
+| 339 = @ispointerinterconvertiblebaseof
+| 340 = @isarray
+| 341 = @arrayrank
+| 342 = @arrayextent
+| 343 = @isarithmetic
+| 344 = @iscompletetype
+| 345 = @iscompound
+| 346 = @isconst
+| 347 = @isfloatingpoint
+| 348 = @isfundamental
+| 349 = @isintegral
+| 350 = @islvaluereference
+| 351 = @ismemberfunctionpointer
+| 352 = @ismemberobjectpointer
+| 353 = @ismemberpointer
+| 354 = @isobject
+| 355 = @ispointer
+| 356 = @isreference
+| 357 = @isrvaluereference
+| 358 = @isscalar
+| 359 = @issigned
+| 360 = @isunsigned
+| 361 = @isvoid
+| 362 = @isvolatile
+| 363 = @reuseexpr
+| 364 = @istriviallycopyassignable
+| 365 = @isassignablenopreconditioncheck
+| 366 = @referencebindstotemporary
+| 367 = @issameas
+| 368 = @builtinhasattribute
+| 369 = @ispointerinterconvertiblewithclass
+| 370 = @builtinispointerinterconvertiblewithclass
+| 371 = @iscorrespondingmember
+| 372 = @builtiniscorrespondingmember
+| 373 = @isboundedarray
+| 374 = @isunboundedarray
+| 375 = @isreferenceable
+| 378 = @isnothrowconvertible
+| 379 = @referenceconstructsfromtemporary
+| 380 = @referenceconvertsfromtemporary
+| 381 = @isconvertible
+| 382 = @isvalidwinrttype
+| 383 = @iswinclass
+| 384 = @iswininterface
+| 385 = @istriviallyequalitycomparable
+| 386 = @isscopedenum
+| 387 = @istriviallyrelocatable
+| 388 = @datasizeof
+| 389 = @c11_generic
+| 390 = @requires_expr
+;
+
+@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
+            ;
+
+new_allocated_type(
+    unique int expr: @new_expr ref,
+    int type_id: @type ref
+);
+
+new_array_allocated_type(
+    unique int expr: @new_array_expr ref,
+    int type_id: @type ref
+);
+
+/**
+ * The field being initialized by an initializer expression within an aggregate
+ * initializer for a class/struct/union. Position is used to sort repeated initializers.
+ */
+#keyset[aggregate, position]
+aggregate_field_init(
+    int aggregate: @aggregateliteral ref,
+    int initializer: @expr ref,
+    int field: @membervariable ref,
+    int position: int ref
+);
+
+/**
+ * The index of the element being initialized by an initializer expression
+ * within an aggregate initializer for an array. Position is used to sort repeated initializers.
+ */
+#keyset[aggregate, position]
+aggregate_array_init(
+    int aggregate: @aggregateliteral ref,
+    int initializer: @expr ref,
+    int element_index: int ref,
+    int position: int ref
+);
+
+@ctorinit = @ctordirectinit
+          | @ctorvirtualinit
+          | @ctorfieldinit
+          | @ctordelegatinginit;
+@dtordestruct = @dtordirectdestruct
+              | @dtorvirtualdestruct
+              | @dtorfielddestruct;
+
+
+condition_decl_bind(
+    unique int expr: @condition_decl ref,
+    unique int decl: @declaration ref
+);
+
+typeid_bind(
+    unique int expr: @type_id ref,
+    int type_id: @type ref
+);
+
+uuidof_bind(
+    unique int expr: @uuidof ref,
+    int type_id: @type ref
+);
+
+@runtime_sizeof_or_alignof = @runtime_sizeof | @runtime_alignof | @datasizeof;
+
+sizeof_bind(
+    unique int expr: @runtime_sizeof_or_alignof ref,
+    int type_id: @type ref
+);
+
+code_block(
+    unique int block: @literal ref,
+    unique int routine: @function ref
+);
+
+lambdas(
+    unique int expr: @lambdaexpr ref,
+    string default_capture: string ref,
+    boolean has_explicit_return_type: boolean ref
+);
+
+lambda_capture(
+    unique int id: @lambdacapture,
+    int lambda: @lambdaexpr ref,
+    int index: int ref,
+    int field: @membervariable ref,
+    boolean captured_by_reference: boolean ref,
+    boolean is_implicit: boolean ref,
+    int location: @location_default ref
+);
+
+@funbindexpr = @routineexpr
+             | @new_expr
+             | @delete_expr
+             | @delete_array_expr
+             | @ctordirectinit
+             | @ctorvirtualinit
+             | @ctordelegatinginit
+             | @dtordirectdestruct
+             | @dtorvirtualdestruct;
+
+@varbindexpr = @varaccess | @ctorfieldinit | @dtorfielddestruct;
+@addressable = @function | @variable ;
+@accessible = @addressable | @enumconstant ;
+
+@access = @varaccess | @routineexpr ;
+
+fold(
+    int expr: @foldexpr ref,
+    string operator: string ref,
+    boolean is_left_fold: boolean ref
+);
+
+stmts(
+    unique int id: @stmt,
+    int kind: int ref,
+    int location: @location_stmt ref
+);
+
+case @stmt.kind of
+    1 = @stmt_expr
+|   2 = @stmt_if
+|   3 = @stmt_while
+|   4 = @stmt_goto
+|   5 = @stmt_label
+|   6 = @stmt_return
+|   7 = @stmt_block
+|   8 = @stmt_end_test_while // do { ... } while ( ... )
+|   9 = @stmt_for
+|  10 = @stmt_switch_case
+|  11 = @stmt_switch
+|  13 = @stmt_asm // "asm" statement or the body of an asm function
+|  15 = @stmt_try_block
+|  16 = @stmt_microsoft_try // Microsoft
+|  17 = @stmt_decl
+|  18 = @stmt_set_vla_size // C99
+|  19 = @stmt_vla_decl // C99
+|  25 = @stmt_assigned_goto // GNU
+|  26 = @stmt_empty
+|  27 = @stmt_continue
+|  28 = @stmt_break
+|  29 = @stmt_range_based_for // C++11
+// ...  30 @stmt_at_autoreleasepool_block deprecated
+// ...  31 @stmt_objc_for_in deprecated
+// ...  32 @stmt_at_synchronized deprecated
+|  33 = @stmt_handler
+// ...  34 @stmt_finally_end deprecated
+|  35 = @stmt_constexpr_if
+|  37 = @stmt_co_return
+;
+
+type_vla(
+    int type_id: @type ref,
+    int decl: @stmt_vla_decl ref
+);
+
+variable_vla(
+    int var: @variable ref,
+    int decl: @stmt_vla_decl ref
+);
+
+if_initialization(
+    unique int if_stmt: @stmt_if ref,
+    int init_id: @stmt ref
+);
+
+if_then(
+    unique int if_stmt: @stmt_if ref,
+    int then_id: @stmt ref
+);
+
+if_else(
+    unique int if_stmt: @stmt_if ref,
+    int else_id: @stmt ref
+);
+
+constexpr_if_initialization(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int init_id: @stmt ref
+);
+
+constexpr_if_then(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int then_id: @stmt ref
+);
+
+constexpr_if_else(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int else_id: @stmt ref
+);
+
+while_body(
+    unique int while_stmt: @stmt_while ref,
+    int body_id: @stmt ref
+);
+
+do_body(
+    unique int do_stmt: @stmt_end_test_while ref,
+    int body_id: @stmt ref
+);
+
+switch_initialization(
+    unique int switch_stmt: @stmt_switch ref,
+    int init_id: @stmt ref
+);
+
+#keyset[switch_stmt, index]
+switch_case(
+    int switch_stmt: @stmt_switch ref,
+    int index: int ref,
+    int case_id: @stmt_switch_case ref
+);
+
+switch_body(
+    unique int switch_stmt: @stmt_switch ref,
+    int body_id: @stmt ref
+);
+
+@stmt_for_or_range_based_for = @stmt_for
+                             | @stmt_range_based_for;
+
+for_initialization(
+    unique int for_stmt: @stmt_for_or_range_based_for ref,
+    int init_id: @stmt ref
+);
+
+for_condition(
+    unique int for_stmt: @stmt_for ref,
+    int condition_id: @expr ref
+);
+
+for_update(
+    unique int for_stmt: @stmt_for ref,
+    int update_id: @expr ref
+);
+
+for_body(
+    unique int for_stmt: @stmt_for ref,
+    int body_id: @stmt ref
+);
+
+@stmtparent = @stmt | @expr_stmt ;
+stmtparents(
+    unique int id: @stmt ref,
+    int index: int ref,
+    int parent: @stmtparent ref
+);
+
+ishandler(unique int block: @stmt_block ref);
+
+@cfgnode = @stmt | @expr | @function | @initialiser ;
+
+stmt_decl_bind(
+    int stmt: @stmt_decl ref,
+    int num: int ref,
+    int decl: @declaration ref
+);
+
+stmt_decl_entry_bind(
+    int stmt: @stmt_decl ref,
+    int num: int ref,
+    int decl_entry: @element ref
+);
+
+@functionorblock = @function | @stmt_block;
+
+blockscope(
+    unique int block: @stmt_block ref,
+    int enclosing: @functionorblock ref
+);
+
+@jump = @stmt_goto | @stmt_break | @stmt_continue;
+
+@jumporlabel = @jump | @stmt_label | @literal;
+
+jumpinfo(
+    unique int id: @jumporlabel ref,
+    string str: string ref,
+    int target: @stmt ref
+);
+
+preprocdirects(
+    unique int id: @preprocdirect,
+    int kind: int ref,
+    int location: @location_default ref
+);
+case @preprocdirect.kind of
+   0 = @ppd_if
+|  1 = @ppd_ifdef
+|  2 = @ppd_ifndef
+|  3 = @ppd_elif
+|  4 = @ppd_else
+|  5 = @ppd_endif
+|  6 = @ppd_plain_include
+|  7 = @ppd_define
+|  8 = @ppd_undef
+|  9 = @ppd_line
+| 10 = @ppd_error
+| 11 = @ppd_pragma
+| 12 = @ppd_objc_import
+| 13 = @ppd_include_next
+| 18 = @ppd_warning
+;
+
+@ppd_include = @ppd_plain_include | @ppd_objc_import | @ppd_include_next;
+
+@ppd_branch = @ppd_if | @ppd_ifdef | @ppd_ifndef | @ppd_elif;
+
+preprocpair(
+    int begin : @ppd_branch ref,
+    int elseelifend : @preprocdirect ref
+);
+
+preproctrue(int branch : @ppd_branch ref);
+preprocfalse(int branch : @ppd_branch ref);
+
+preproctext(
+    unique int id: @preprocdirect ref,
+    string head: string ref,
+    string body: string ref
+);
+
+includes(
+    unique int id: @ppd_include ref,
+    int included: @file ref
+);
+
+link_targets(
+    int id: @link_target,
+    int binary: @file ref
+);
+
+link_parent(
+    int element : @element ref,
+    int link_target : @link_target ref
+);
+
+/* XML Files */
+
+xmlEncoding(unique int id: @file ref, string encoding: string ref);
+
+xmlDTDs(
+    unique int id: @xmldtd,
+    string root: string ref,
+    string publicId: string ref,
+    string systemId: string ref,
+    int fileid: @file ref
+);
+
+xmlElements(
+    unique int id: @xmlelement,
+    string name: string ref,
+    int parentid: @xmlparent ref,
+    int idx: int ref,
+    int fileid: @file ref
+);
+
+xmlAttrs(
+    unique int id: @xmlattribute,
+    int elementid: @xmlelement ref,
+    string name: string ref,
+    string value: string ref,
+    int idx: int ref,
+    int fileid: @file ref
+);
+
+xmlNs(
+    int id: @xmlnamespace,
+    string prefixName: string ref,
+    string URI: string ref,
+    int fileid: @file ref
+);
+
+xmlHasNs(
+    int elementId: @xmlnamespaceable ref,
+    int nsId: @xmlnamespace ref,
+    int fileid: @file ref
+);
+
+xmlComments(
+    unique int id: @xmlcomment,
+    string text: string ref,
+    int parentid: @xmlparent ref,
+    int fileid: @file ref
+);
+
+xmlChars(
+    unique int id: @xmlcharacters,
+    string text: string ref,
+    int parentid: @xmlparent ref,
+    int idx: int ref,
+    int isCDATA: int ref,
+    int fileid: @file ref
+);
+
+@xmlparent = @file | @xmlelement;
+@xmlnamespaceable = @xmlelement | @xmlattribute;
+
+xmllocations(
+    int xmlElement: @xmllocatable ref,
+    int location: @location_default ref
+);
+
+@xmllocatable = @xmlcharacters
+              | @xmlelement
+              | @xmlcomment
+              | @xmlattribute
+              | @xmldtd
+              | @file
+              | @xmlnamespace;
diff --git a/cpp/downgrades/e51fad7a2436caefab0c6bd52f05e28e7cce4d92/upgrade.properties b/cpp/downgrades/e51fad7a2436caefab0c6bd52f05e28e7cce4d92/upgrade.properties
new file mode 100644
index 00000000000..68c8b688e5b
--- /dev/null
+++ b/cpp/downgrades/e51fad7a2436caefab0c6bd52f05e28e7cce4d92/upgrade.properties
@@ -0,0 +1,5 @@
+description: Support C++20 requires expressions
+compatibility: partial
+compound_requirement_is_noexcept.rel: delete
+exprs.rel: run exprs.qlo
+params.rel: run params.qlo
diff --git a/cpp/ql/lib/CHANGELOG.md b/cpp/ql/lib/CHANGELOG.md
index 9723b57f127..0536c1c361b 100644
--- a/cpp/ql/lib/CHANGELOG.md
+++ b/cpp/ql/lib/CHANGELOG.md
@@ -1,3 +1,27 @@
+## 2.1.0
+
+### New Features
+
+* Added a new predicate `DataFlow::getARuntimeTarget` for getting a function that may be invoked by a `Call` expression. Unlike `Call.getTarget` this new predicate may also resolve function pointers.
+* Added the predicate `mayBeFromImplicitlyDeclaredFunction()` to the `Call` class to represent calls that may be the return value of an implicitly declared C function.
+* Added the predicate `getAnExplicitDeclarationEntry()` to the `Function` class to get a `FunctionDeclarationEntry` that is not implicit.
+* Added classes `RequiresExpr`, `SimpleRequirementExpr`, `TypeRequirementExpr`, `CompoundRequirementExpr`, and `NestedRequirementExpr` to represent C++20 requires expressions and the simple, type, compound, and nested requirements that can occur in `requires` expressions.
+
+### Minor Analysis Improvements
+
+* The function call target resolution algorithm has been improved to resolve more calls through function pointers. As a result, dataflow queries may have more results.
+
+## 2.0.2
+
+### Minor Analysis Improvements
+
+* Added taint flow model for `fopen` and related functions.
+* The `SimpleRangeAnalysis` library (`semmle.code.cpp.rangeanalysis.SimpleRangeAnalysis`) now generates more precise ranges for calls to `fgetc` and `getc`.
+
+## 2.0.1
+
+No user-facing changes.
+
 ## 2.0.0
 
 ### Breaking Changes
diff --git a/cpp/ql/lib/change-notes/2024-11-18-guard-conditions.md b/cpp/ql/lib/change-notes/2024-11-18-guard-conditions.md
new file mode 100644
index 00000000000..8fb914bf51b
--- /dev/null
+++ b/cpp/ql/lib/change-notes/2024-11-18-guard-conditions.md
@@ -0,0 +1,4 @@
+---
+category: minorAnalysis
+---
+* The `Guards` library (`semmle.code.cpp.controlflow.Guards`) has been improved to recognize more guard conditions. Additionally, the guards library no longer considers guards in static local initializers or global initializers as `GuardCondition`s.
\ No newline at end of file
diff --git a/cpp/ql/lib/change-notes/released/2.0.1.md b/cpp/ql/lib/change-notes/released/2.0.1.md
new file mode 100644
index 00000000000..b5b6d0dee91
--- /dev/null
+++ b/cpp/ql/lib/change-notes/released/2.0.1.md
@@ -0,0 +1,3 @@
+## 2.0.1
+
+No user-facing changes.
diff --git a/cpp/ql/lib/change-notes/released/2.0.2.md b/cpp/ql/lib/change-notes/released/2.0.2.md
new file mode 100644
index 00000000000..db3a11e55a8
--- /dev/null
+++ b/cpp/ql/lib/change-notes/released/2.0.2.md
@@ -0,0 +1,6 @@
+## 2.0.2
+
+### Minor Analysis Improvements
+
+* Added taint flow model for `fopen` and related functions.
+* The `SimpleRangeAnalysis` library (`semmle.code.cpp.rangeanalysis.SimpleRangeAnalysis`) now generates more precise ranges for calls to `fgetc` and `getc`.
diff --git a/cpp/ql/lib/change-notes/released/2.1.0.md b/cpp/ql/lib/change-notes/released/2.1.0.md
new file mode 100644
index 00000000000..e6f0dff2a71
--- /dev/null
+++ b/cpp/ql/lib/change-notes/released/2.1.0.md
@@ -0,0 +1,12 @@
+## 2.1.0
+
+### New Features
+
+* Added a new predicate `DataFlow::getARuntimeTarget` for getting a function that may be invoked by a `Call` expression. Unlike `Call.getTarget` this new predicate may also resolve function pointers.
+* Added the predicate `mayBeFromImplicitlyDeclaredFunction()` to the `Call` class to represent calls that may be the return value of an implicitly declared C function.
+* Added the predicate `getAnExplicitDeclarationEntry()` to the `Function` class to get a `FunctionDeclarationEntry` that is not implicit.
+* Added classes `RequiresExpr`, `SimpleRequirementExpr`, `TypeRequirementExpr`, `CompoundRequirementExpr`, and `NestedRequirementExpr` to represent C++20 requires expressions and the simple, type, compound, and nested requirements that can occur in `requires` expressions.
+
+### Minor Analysis Improvements
+
+* The function call target resolution algorithm has been improved to resolve more calls through function pointers. As a result, dataflow queries may have more results.
diff --git a/cpp/ql/lib/codeql-pack.release.yml b/cpp/ql/lib/codeql-pack.release.yml
index 0abe6ccede0..487a1a58b2b 100644
--- a/cpp/ql/lib/codeql-pack.release.yml
+++ b/cpp/ql/lib/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 2.0.0
+lastReleaseVersion: 2.1.0
diff --git a/cpp/ql/lib/cpp.qll b/cpp/ql/lib/cpp.qll
index 0a29f7b86ba..5162248c4b8 100644
--- a/cpp/ql/lib/cpp.qll
+++ b/cpp/ql/lib/cpp.qll
@@ -17,6 +17,7 @@ import semmle.code.cpp.File
 import semmle.code.cpp.Linkage
 import semmle.code.cpp.Location
 import semmle.code.cpp.Compilation
+import semmle.code.cpp.Concept
 import semmle.code.cpp.Element
 import semmle.code.cpp.Namespace
 import semmle.code.cpp.Specifier
diff --git a/cpp/ql/lib/qlpack.yml b/cpp/ql/lib/qlpack.yml
index ed813841129..397a56ac535 100644
--- a/cpp/ql/lib/qlpack.yml
+++ b/cpp/ql/lib/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/cpp-all
-version: 2.0.1-dev
+version: 2.1.1-dev
 groups: cpp
 dbscheme: semmlecode.cpp.dbscheme
 extractor: cpp
diff --git a/cpp/ql/lib/semmle/code/cpp/Concept.qll b/cpp/ql/lib/semmle/code/cpp/Concept.qll
new file mode 100644
index 00000000000..d9b00e59fd5
--- /dev/null
+++ b/cpp/ql/lib/semmle/code/cpp/Concept.qll
@@ -0,0 +1,161 @@
+/**
+ * Provides classes for working with C++ concepts.
+ */
+
+import semmle.code.cpp.exprs.Expr
+
+/**
+ * A C++ requires expression.
+ *
+ * For example, with `T` and `U` template parameters:
+ * ```cpp
+ * requires (T x, U y) { x + y; };
+ * ```
+ */
+class RequiresExpr extends Expr, @requires_expr {
+  override string toString() {
+    if exists(this.getAParameter())
+    then result = "requires(...) { ... }"
+    else result = "requires { ... }"
+  }
+
+  override string getAPrimaryQlClass() { result = "RequiresExpr" }
+
+  /**
+   * Gets a requirement in this requires expression.
+   */
+  RequirementExpr getARequirement() { result = this.getAChild() }
+
+  /**
+   * Gets the nth requirement in this requires expression.
+   */
+  RequirementExpr getRequirement(int n) { result = this.getChild(n) }
+
+  /**
+   * Gets the number of requirements in this requires expression.
+   */
+  int getNumberOfRequirements() { result = count(this.getARequirement()) }
+
+  /**
+   * Gets a parameter of this requires expression, if any.
+   */
+  Parameter getAParameter() { result.getRequiresExpr() = underlyingElement(this) }
+
+  /**
+   * Gets the the nth parameter of this requires expression.
+   */
+  Parameter getParameter(int n) {
+    result.getRequiresExpr() = underlyingElement(this) and result.getIndex() = n
+  }
+
+  /**
+   * Gets the number of parameters of this requires expression.
+   */
+  int getNumberOfParameters() { result = count(this.getAParameter()) }
+}
+
+/**
+ * A C++ requirement in a requires expression.
+ */
+class RequirementExpr extends Expr { }
+
+/**
+ * A C++ simple requirement in a requires expression.
+ *
+ * For example, if:
+ * ```cpp
+ * requires(T x, U y) { x + y; };
+ * ```
+ * with `T` and `U` template parameters, then `x + y;` is a simple requirement.
+ */
+class SimpleRequirementExpr extends RequirementExpr {
+  SimpleRequirementExpr() {
+    this.getParent() instanceof RequiresExpr and
+    not this instanceof TypeRequirementExpr and
+    not this instanceof CompoundRequirementExpr and
+    not this instanceof NestedRequirementExpr
+  }
+
+  override string getAPrimaryQlClass() { result = "SimpleRequirementExpr" }
+}
+
+/**
+ * A C++ type requirement in a requires expression.
+ *
+ * For example, if:
+ * ```cpp
+ * requires { typename T::a_field; };
+ * ```
+ * with `T` a template parameter, then `typename T::a_field;` is a type requirement.
+ */
+class TypeRequirementExpr extends RequirementExpr, TypeName {
+  TypeRequirementExpr() { this.getParent() instanceof RequiresExpr }
+
+  override string getAPrimaryQlClass() { result = "TypeRequirementExpr" }
+}
+
+/**
+ * A C++ compound requirement in a requires expression.
+ *
+ * For example, if:
+ * ```cpp
+ * requires(T x) { { x } noexcept -> std::same_as<int>; };
+ * ```
+ * with `T` a template parameter, then `{ x } noexcept -> std::same_as<int>;` is
+ * a compound requirement.
+ */
+class CompoundRequirementExpr extends RequirementExpr, @compound_requirement {
+  override string toString() {
+    if exists(this.getReturnTypeRequirement())
+    then result = "{ ... } -> ..."
+    else result = "{ ... }"
+  }
+
+  override string getAPrimaryQlClass() { result = "CompoundRequirementExpr" }
+
+  /**
+   * Gets the expression from the compound requirement.
+   */
+  Expr getExpr() { result = this.getChild(0) }
+
+  /**
+   * Gets the return type requirement from the compound requirement, if any.
+   */
+  Expr getReturnTypeRequirement() { result = this.getChild(1) }
+
+  /**
+   * Holds if the expression from the compound requirement must not be
+   * potentially throwing.
+   */
+  predicate isNoExcept() { compound_requirement_is_noexcept(underlyingElement(this)) }
+}
+
+/**
+ * A C++ nested requirement in a requires expression.
+ *
+ * For example, if:
+ * ```cpp
+ * requires { requires std::is_same<T, int>::value; };
+ * ```
+ * with `T` a template parameter, then `requires std::is_same<T, int>::value;` is
+ * a nested requirement.
+ */
+class NestedRequirementExpr extends Expr, @nested_requirement {
+  override string toString() { result = "requires ..." }
+
+  override string getAPrimaryQlClass() { result = "NestedRequirementExpr" }
+
+  /**
+   * Gets the constraint from the nested requirement.
+   */
+  Expr getConstraint() { result = this.getChild(0) }
+}
+
+/**
+ * A C++ concept id expression.
+ */
+class ConceptIdExpr extends RequirementExpr, @concept_id {
+  override string toString() { result = "concept<...>" }
+
+  override string getAPrimaryQlClass() { result = "ConceptIdExpr" }
+}
diff --git a/cpp/ql/lib/semmle/code/cpp/Element.qll b/cpp/ql/lib/semmle/code/cpp/Element.qll
index 98b5da60c1c..1cf75aa8a84 100644
--- a/cpp/ql/lib/semmle/code/cpp/Element.qll
+++ b/cpp/ql/lib/semmle/code/cpp/Element.qll
@@ -129,7 +129,7 @@ class Element extends ElementBase {
    * or certain kinds of `Statement`.
    */
   Element getParentScope() {
-    // result instanceof class
+    // result instanceof Class
     exists(Declaration m |
       m = this and
       result = m.getDeclaringType() and
@@ -138,31 +138,40 @@ class Element extends ElementBase {
     or
     exists(TemplateClass tc | this = tc.getATemplateArgument() and result = tc)
     or
-    // result instanceof namespace
+    // result instanceof Namespace
     exists(Namespace n | result = n and n.getADeclaration() = this)
     or
     exists(FriendDecl d, Namespace n | this = d and n.getADeclaration() = d and result = n)
     or
     exists(Namespace n | this = n and result = n.getParentNamespace())
     or
-    // result instanceof stmt
+    // result instanceof Stmt
     exists(LocalVariable v |
       this = v and
       exists(DeclStmt ds | ds.getADeclaration() = v and result = ds.getParent())
     )
     or
-    exists(Parameter p | this = p and result = p.getFunction())
+    exists(Parameter p |
+      this = p and
+      (
+        result = p.getFunction() or
+        result = p.getCatchBlock().getParent().(Handler).getParent().(TryStmt).getParent() or
+        result = p.getRequiresExpr().getEnclosingStmt().getParent()
+      )
+    )
     or
     exists(GlobalVariable g, Namespace n | this = g and n.getADeclaration() = g and result = n)
     or
+    exists(TemplateVariable tv | this = tv.getATemplateArgument() and result = tv)
+    or
     exists(EnumConstant e | this = e and result = e.getDeclaringEnum())
     or
-    // result instanceof block|function
+    // result instanceof Block|Function
     exists(BlockStmt b | this = b and blockscope(unresolveElement(b), unresolveElement(result)))
     or
     exists(TemplateFunction tf | this = tf.getATemplateArgument() and result = tf)
     or
-    // result instanceof stmt
+    // result instanceof Stmt
     exists(ControlStructure s | this = s and result = s.getParent())
     or
     using_container(unresolveElement(result), underlyingElement(this))
diff --git a/cpp/ql/lib/semmle/code/cpp/Function.qll b/cpp/ql/lib/semmle/code/cpp/Function.qll
index f23b04e19d6..18b7c21dbe2 100644
--- a/cpp/ql/lib/semmle/code/cpp/Function.qll
+++ b/cpp/ql/lib/semmle/code/cpp/Function.qll
@@ -230,6 +230,14 @@ class Function extends Declaration, ControlFlowNode, AccessHolder, @function {
       )
   }
 
+  /**
+   * Gets a non-implicit function declaration entry.
+   */
+  FunctionDeclarationEntry getAnExplicitDeclarationEntry() {
+    result = this.getADeclarationEntry() and
+    not result.isImplicit()
+  }
+
   private predicate declEntry(FunctionDeclarationEntry fde) {
     fun_decls(unresolveElement(fde), underlyingElement(this), _, _, _) and
     // If one .cpp file specializes a function, and another calls the
@@ -500,6 +508,17 @@ class Function extends Declaration, ControlFlowNode, AccessHolder, @function {
    * Gets the nearest enclosing AccessHolder.
    */
   override AccessHolder getEnclosingAccessHolder() { result = this.getDeclaringType() }
+
+  /**
+   * Holds if this function has extraction errors that create an `ErrorExpr`.
+   */
+  predicate hasErrors() {
+    exists(ErrorExpr e |
+      e.getEnclosingFunction() = this and
+      // Exclude the first allocator call argument because it is always extracted as `ErrorExpr`.
+      not exists(NewOrNewArrayExpr new | e = new.getAllocatorCall().getArgument(0))
+    )
+  }
 }
 
 pragma[noinline]
@@ -651,7 +670,8 @@ class FunctionDeclarationEntry extends DeclarationEntry, @fun_decl {
 
   /**
    * Holds if this declaration is an implicit function declaration, that is,
-   * where a function is used before it is declared (under older C standards).
+   * where a function is used before it is declared (under older C standards,
+   * or when there were parse errors).
    */
   predicate isImplicit() { fun_implicit(underlyingElement(this)) }
 
diff --git a/cpp/ql/lib/semmle/code/cpp/Parameter.qll b/cpp/ql/lib/semmle/code/cpp/Parameter.qll
index 814fa734408..e45dd56e720 100644
--- a/cpp/ql/lib/semmle/code/cpp/Parameter.qll
+++ b/cpp/ql/lib/semmle/code/cpp/Parameter.qll
@@ -7,8 +7,8 @@ import semmle.code.cpp.Declaration
 private import semmle.code.cpp.internal.ResolveClass
 
 /**
- * A C/C++ function parameter or catch block parameter. For example the
- * function parameter `p` and the catch block parameter `e` in the following
+ * A C/C++ function parameter, catch block parameter, or requires expression parameter.
+ * For example the function parameter `p` and the catch block parameter `e` in the following
  * code:
  * ```
  * void myFunction(int p) {
@@ -20,8 +20,8 @@ private import semmle.code.cpp.internal.ResolveClass
  * }
  * ```
  *
- * For catch block parameters, there is a one-to-one correspondence between
- * the `Parameter` and its `ParameterDeclarationEntry`.
+ * For catch block parameters and expression , there is a one-to-one
+ * correspondence between the `Parameter` and its `VariableDeclarationEntry`.
  *
  * For function parameters, there is a one-to-many relationship between
  * `Parameter` and `ParameterDeclarationEntry`, because one function can
@@ -73,7 +73,8 @@ class Parameter extends LocalScopeVariable, @parameter {
   }
 
   private VariableDeclarationEntry getANamedDeclarationEntry() {
-    result = this.getAnEffectiveDeclarationEntry() and result.getName() != ""
+    result = this.getAnEffectiveDeclarationEntry() and
+    exists(string name | var_decls(unresolveElement(result), _, _, name, _) | name != "")
   }
 
   /**
@@ -118,6 +119,12 @@ class Parameter extends LocalScopeVariable, @parameter {
    */
   BlockStmt getCatchBlock() { params(underlyingElement(this), unresolveElement(result), _, _) }
 
+  /**
+   * Gets the requires expression to which the parameter belongs, if it is a
+   * requires expression parameter.
+   */
+  RequiresExpr getRequiresExpr() { params(underlyingElement(this), unresolveElement(result), _, _) }
+
   /**
    * Gets the zero-based index of this parameter.
    *
diff --git a/cpp/ql/lib/semmle/code/cpp/PrintAST.qll b/cpp/ql/lib/semmle/code/cpp/PrintAST.qll
index 6194710f0c5..cc5a8d6c335 100644
--- a/cpp/ql/lib/semmle/code/cpp/PrintAST.qll
+++ b/cpp/ql/lib/semmle/code/cpp/PrintAST.qll
@@ -80,6 +80,10 @@ private Declaration getAnEnclosingDeclaration(Locatable ast) {
   or
   result = ast.(Parameter).getFunction()
   or
+  result = ast.(Parameter).getCatchBlock().getEnclosingFunction()
+  or
+  result = ast.(Parameter).getRequiresExpr().getEnclosingFunction()
+  or
   result = ast.(Expr).getEnclosingDeclaration()
   or
   result = ast.(Initializer).getDeclaration()
@@ -99,7 +103,10 @@ private newtype TPrintAstNode =
     stmt.getADeclarationEntry() = entry and
     shouldPrintDeclaration(stmt.getEnclosingFunction())
   } or
-  TParametersNode(Function func) { shouldPrintDeclaration(func) } or
+  TFunctionParametersNode(Function func) { shouldPrintDeclaration(func) } or
+  TRequiresExprParametersNode(RequiresExpr req) {
+    shouldPrintDeclaration(getAnEnclosingDeclaration(req))
+  } or
   TConstructorInitializersNode(Constructor ctor) {
     ctor.hasEntryPoint() and
     shouldPrintDeclaration(ctor)
@@ -303,14 +310,14 @@ class ExprNode extends AstNode {
 
   ExprNode() { expr = ast }
 
-  override AstNode getChildInternal(int childIndex) {
-    result.getAst() = expr.getChild(childIndex)
+  override PrintAstNode getChildInternal(int childIndex) {
+    result.(AstNode).getAst() = expr.getChild(childIndex)
     or
     childIndex = max(int index | exists(expr.getChild(index)) or index = 0) + 1 and
-    result.getAst() = expr.(ConditionDeclExpr).getInitializingExpr()
+    result.(AstNode).getAst() = expr.(ConditionDeclExpr).getInitializingExpr()
     or
     exists(int destructorIndex |
-      result.getAst() = expr.getImplicitDestructorCall(destructorIndex) and
+      result.(AstNode).getAst() = expr.getImplicitDestructorCall(destructorIndex) and
       childIndex = destructorIndex + max(int index | exists(expr.getChild(index)) or index = 0) + 2
     )
   }
@@ -329,7 +336,8 @@ class ExprNode extends AstNode {
   }
 
   override string getChildAccessorPredicateInternal(int childIndex) {
-    result = getChildAccessorWithoutConversions(ast, this.getChildInternal(childIndex).getAst())
+    result =
+      getChildAccessorWithoutConversions(ast, this.getChildInternal(childIndex).(AstNode).getAst())
   }
 
   /**
@@ -409,6 +417,26 @@ class StmtExprNode extends ExprNode {
   }
 }
 
+/**
+ * A node representing a `RequiresExpr`
+ */
+class RequiresExprNode extends ExprNode {
+  override RequiresExpr expr;
+
+  override PrintAstNode getChildInternal(int childIndex) {
+    result = super.getChildInternal(childIndex)
+    or
+    childIndex = -1 and
+    result.(RequiresExprParametersNode).getRequiresExpr() = expr
+  }
+
+  override string getChildAccessorPredicateInternal(int childIndex) {
+    result = super.getChildAccessorPredicateInternal(childIndex)
+    or
+    childIndex = -1 and result = "<params>"
+  }
+}
+
 /**
  * A node representing a `DeclarationEntry`.
  */
@@ -510,6 +538,22 @@ class DeclStmtNode extends StmtNode {
   }
 }
 
+/**
+ * A node representing a `Handler`.
+ */
+class HandlerNode extends ChildStmtNode {
+  Handler handler;
+
+  HandlerNode() { handler = stmt }
+
+  override BaseAstNode getChildInternal(int childIndex) {
+    result = super.getChildInternal(childIndex)
+    or
+    childIndex = -1 and
+    result.getAst() = handler.getParameter()
+  }
+}
+
 /**
  * A node representing a `Parameter`.
  */
@@ -552,10 +596,10 @@ class InitializerNode extends AstNode {
 /**
  * A node representing the parameters of a `Function`.
  */
-class ParametersNode extends PrintAstNode, TParametersNode {
+class FunctionParametersNode extends PrintAstNode, TFunctionParametersNode {
   Function func;
 
-  ParametersNode() { this = TParametersNode(func) }
+  FunctionParametersNode() { this = TFunctionParametersNode(func) }
 
   final override string toString() { result = "" }
 
@@ -576,6 +620,33 @@ class ParametersNode extends PrintAstNode, TParametersNode {
   final Function getFunction() { result = func }
 }
 
+/**
+ * A node representing the parameters of a `RequiresExpr`.
+ */
+class RequiresExprParametersNode extends PrintAstNode, TRequiresExprParametersNode {
+  RequiresExpr req;
+
+  RequiresExprParametersNode() { this = TRequiresExprParametersNode(req) }
+
+  final override string toString() { result = "" }
+
+  final override Location getLocation() { result = getRepresentativeLocation(req) }
+
+  override AstNode getChildInternal(int childIndex) {
+    result.getAst() = req.getParameter(childIndex)
+  }
+
+  override string getChildAccessorPredicateInternal(int childIndex) {
+    exists(this.getChildInternal(childIndex)) and
+    result = "getParameter(" + childIndex.toString() + ")"
+  }
+
+  /**
+   * Gets the `RequiresExpr` for which this node represents the parameters.
+   */
+  final RequiresExpr getRequiresExpr() { result = req }
+}
+
 /**
  * A node representing the initializer list of a `Constructor`.
  */
@@ -679,7 +750,7 @@ class FunctionNode extends FunctionOrGlobalOrNamespaceVariableNode {
 
   override PrintAstNode getChildInternal(int childIndex) {
     childIndex = 0 and
-    result.(ParametersNode).getFunction() = func
+    result.(FunctionParametersNode).getFunction() = func
     or
     childIndex = 1 and
     result.(ConstructorInitializersNode).getConstructor() = func
@@ -754,6 +825,8 @@ private predicate namedStmtChildPredicates(Locatable s, Element e, string pred)
     or
     s.(ConstexprIfStmt).getElse() = e and pred = "getElse()"
     or
+    s.(Handler).getParameter() = e and pred = "getParameter()"
+    or
     s.(IfStmt).getInitialization() = e and pred = "getInitialization()"
     or
     s.(IfStmt).getCondition() = e and pred = "getCondition()"
@@ -901,6 +974,11 @@ private predicate namedExprChildPredicates(Expr expr, Element ele, string pred)
     or
     expr.(CommaExpr).getRightOperand() = ele and pred = "getRightOperand()"
     or
+    expr.(CompoundRequirementExpr).getExpr() = ele and pred = "getExpr()"
+    or
+    expr.(CompoundRequirementExpr).getReturnTypeRequirement() = ele and
+    pred = "getReturnTypeRequirement()"
+    or
     expr.(ConditionDeclExpr).getVariableAccess() = ele and pred = "getVariableAccess()"
     or
     expr.(ConstructorFieldInit).getExpr() = ele and pred = "getExpr()"
@@ -921,6 +999,8 @@ private predicate namedExprChildPredicates(Expr expr, Element ele, string pred)
     or
     expr.(LambdaExpression).getInitializer() = ele and pred = "getInitializer()"
     or
+    expr.(NestedRequirementExpr).getConstraint() = ele and pred = "getConstraint()"
+    or
     expr.(NewOrNewArrayExpr).getAllocatorCall() = ele and pred = "getAllocatorCall()"
     or
     expr.(NewOrNewArrayExpr).getAlignmentArgument() = ele and pred = "getAlignmentArgument()"
@@ -960,6 +1040,11 @@ private predicate namedExprChildPredicates(Expr expr, Element ele, string pred)
     or
     expr.(UnaryOperation).getOperand() = ele and pred = "getOperand()"
     or
+    exists(int n |
+      expr.(RequiresExpr).getRequirement(n) = ele and
+      pred = "getRequirement(" + n + ")"
+    )
+    or
     expr.(SizeofExprOperator).getExprOperand() = ele and pred = "getExprOperand()"
     or
     expr.(StmtExpr).getStmt() = ele and pred = "getStmt()"
diff --git a/cpp/ql/lib/semmle/code/cpp/Type.qll b/cpp/ql/lib/semmle/code/cpp/Type.qll
index 16d589e9995..b67b6502afe 100644
--- a/cpp/ql/lib/semmle/code/cpp/Type.qll
+++ b/cpp/ql/lib/semmle/code/cpp/Type.qll
@@ -39,8 +39,8 @@ class Type extends Locatable, @type {
 
   /**
    * Gets a specifier of this type, recursively looking through `typedef` and
-   * `decltype`. For example, in the context of `typedef const int *restrict
-   * t`, the type `volatile t` has specifiers `volatile` and `restrict` but not
+   * `decltype`. For example, in the context of `typedef const int *restrict t`,
+   * the type `volatile t` has specifiers `volatile` and `restrict` but not
    * `const` since the `const` is attached to the type being pointed to rather
    * than the pointer itself.
    */
diff --git a/cpp/ql/lib/semmle/code/cpp/Variable.qll b/cpp/ql/lib/semmle/code/cpp/Variable.qll
index 96bfabb4de0..b3b619c4ccc 100644
--- a/cpp/ql/lib/semmle/code/cpp/Variable.qll
+++ b/cpp/ql/lib/semmle/code/cpp/Variable.qll
@@ -241,6 +241,10 @@ class VariableDeclarationEntry extends DeclarationEntry, @var_decl {
         name != "" and result = name
         or
         name = "" and result = this.getVariable().(LocalVariable).getName()
+        or
+        name = "" and
+        not this instanceof ParameterDeclarationEntry and
+        result = this.getVariable().(Parameter).getName()
       )
     )
   }
@@ -295,19 +299,11 @@ class ParameterDeclarationEntry extends VariableDeclarationEntry {
 
   private string getAnonymousParameterDescription() {
     not exists(this.getName()) and
-    exists(string idx |
-      idx =
-        ((this.getIndex() + 1).toString() + "th")
-            .replaceAll("1th", "1st")
-            .replaceAll("2th", "2nd")
-            .replaceAll("3th", "3rd")
-            .replaceAll("11st", "11th")
-            .replaceAll("12nd", "12th")
-            .replaceAll("13rd", "13th") and
+    exists(string anon |
+      anon = "(unnamed parameter " + this.getIndex().toString() + ")" and
       if exists(this.getCanonicalName())
-      then
-        result = "declaration of " + this.getCanonicalName() + " as anonymous " + idx + " parameter"
-      else result = "declaration of " + idx + " parameter"
+      then result = "declaration of " + this.getCanonicalName() + " as " + anon
+      else result = "declaration of " + anon
     )
   }
 
diff --git a/cpp/ql/lib/semmle/code/cpp/controlflow/IRGuards.qll b/cpp/ql/lib/semmle/code/cpp/controlflow/IRGuards.qll
index 9b4d28430ff..f16dbd3d49d 100644
--- a/cpp/ql/lib/semmle/code/cpp/controlflow/IRGuards.qll
+++ b/cpp/ql/lib/semmle/code/cpp/controlflow/IRGuards.qll
@@ -5,6 +5,7 @@
 
 import cpp
 import semmle.code.cpp.ir.IR
+private import semmle.code.cpp.ir.ValueNumbering
 private import semmle.code.cpp.ir.implementation.raw.internal.TranslatedExpr
 private import semmle.code.cpp.ir.implementation.raw.internal.InstructionTag
 
@@ -59,7 +60,91 @@ class MatchValue extends AbstractValue, TMatchValue {
 }
 
 /**
- * A Boolean condition in the AST that guards one or more basic blocks.
+ * A value number such that at least one of the instructions is
+ * a `CompareInstruction`.
+ */
+private class CompareValueNumber extends ValueNumber {
+  CompareInstruction cmp;
+
+  CompareValueNumber() { cmp = this.getAnInstruction() }
+
+  /** Gets a `CompareInstruction` belonging to this value number. */
+  CompareInstruction getCompareInstruction() { result = cmp }
+
+  /**
+   * Gets the left and right operands of a `CompareInstruction` that
+   * belong to this value number.
+   */
+  predicate hasOperands(Operand left, Operand right) {
+    left = cmp.getLeftOperand() and
+    right = cmp.getRightOperand()
+  }
+}
+
+private class CompareEQValueNumber extends CompareValueNumber {
+  override CompareEQInstruction cmp;
+}
+
+private class CompareNEValueNumber extends CompareValueNumber {
+  override CompareNEInstruction cmp;
+}
+
+private class CompareLTValueNumber extends CompareValueNumber {
+  override CompareLTInstruction cmp;
+}
+
+private class CompareGTValueNumber extends CompareValueNumber {
+  override CompareGTInstruction cmp;
+}
+
+private class CompareLEValueNumber extends CompareValueNumber {
+  override CompareLEInstruction cmp;
+}
+
+private class CompareGEValueNumber extends CompareValueNumber {
+  override CompareGEInstruction cmp;
+}
+
+/**
+ * A value number such that at least one of the instructions provides
+ * the integer value controlling a  `SwitchInstruction`.
+ */
+private class SwitchConditionValueNumber extends ValueNumber {
+  SwitchInstruction switch;
+
+  pragma[nomagic]
+  SwitchConditionValueNumber() { this.getAnInstruction() = switch.getExpression() }
+
+  /** Gets an expression that belongs to this value number. */
+  Operand getExpressionOperand() { result = switch.getExpressionOperand() }
+
+  Instruction getSuccessor(CaseEdge kind) { result = switch.getSuccessor(kind) }
+}
+
+private class BuiltinExpectCallValueNumber extends ValueNumber {
+  BuiltinExpectCallInstruction instr;
+
+  BuiltinExpectCallValueNumber() { this.getAnInstruction() = instr }
+
+  ValueNumber getCondition() { result.getAnInstruction() = instr.getCondition() }
+
+  Operand getAUse() { result = instr.getAUse() }
+}
+
+private class LogicalNotValueNumber extends ValueNumber {
+  LogicalNotInstruction instr;
+
+  LogicalNotValueNumber() { this.getAnInstruction() = instr }
+
+  ValueNumber getUnary() { result.getAnInstruction() = instr.getUnary() }
+}
+
+/**
+ * A Boolean condition in the AST that guards one or more basic blocks. This includes
+ * operands of logical operators but not switch statements.
+ *
+ * For performance reasons conditions inside static local initializers or
+ * global initializers are not considered `GuardCondition`s.
  */
 cached
 class GuardCondition extends Expr {
@@ -369,6 +454,9 @@ private predicate nonExcludedIRAndBasicBlock(IRBlock irb, BasicBlock controlled)
  *
  * Note that `&&` and `||` don't have an explicit representation in the IR,
  * and therefore will not appear as IRGuardConditions.
+ *
+ * For performance reasons conditions inside static local initializers or
+ * global initializers are not considered `IRGuardCondition`s.
  */
 cached
 class IRGuardCondition extends Instruction {
@@ -517,7 +605,7 @@ class IRGuardCondition extends Instruction {
   cached
   predicate comparesLt(Operand left, Operand right, int k, boolean isLessThan, boolean testIsTrue) {
     exists(BooleanValue value |
-      compares_lt(this, left, right, k, isLessThan, value) and
+      compares_lt(valueNumber(this), left, right, k, isLessThan, value) and
       value.getValue() = testIsTrue
     )
   }
@@ -528,7 +616,7 @@ class IRGuardCondition extends Instruction {
    */
   cached
   predicate comparesLt(Operand op, int k, boolean isLessThan, AbstractValue value) {
-    compares_lt(this, op, k, isLessThan, value)
+    compares_lt(valueNumber(this), op, k, isLessThan, value)
   }
 
   /**
@@ -538,7 +626,8 @@ class IRGuardCondition extends Instruction {
   cached
   predicate ensuresLt(Operand left, Operand right, int k, IRBlock block, boolean isLessThan) {
     exists(AbstractValue value |
-      compares_lt(this, left, right, k, isLessThan, value) and this.valueControls(block, value)
+      compares_lt(valueNumber(this), left, right, k, isLessThan, value) and
+      this.valueControls(block, value)
     )
   }
 
@@ -549,7 +638,8 @@ class IRGuardCondition extends Instruction {
   cached
   predicate ensuresLt(Operand op, int k, IRBlock block, boolean isLessThan) {
     exists(AbstractValue value |
-      compares_lt(this, op, k, isLessThan, value) and this.valueControls(block, value)
+      compares_lt(valueNumber(this), op, k, isLessThan, value) and
+      this.valueControls(block, value)
     )
   }
 
@@ -562,7 +652,7 @@ class IRGuardCondition extends Instruction {
     Operand left, Operand right, int k, IRBlock pred, IRBlock succ, boolean isLessThan
   ) {
     exists(AbstractValue value |
-      compares_lt(this, left, right, k, isLessThan, value) and
+      compares_lt(valueNumber(this), left, right, k, isLessThan, value) and
       this.valueControlsEdge(pred, succ, value)
     )
   }
@@ -574,7 +664,7 @@ class IRGuardCondition extends Instruction {
   cached
   predicate ensuresLtEdge(Operand left, int k, IRBlock pred, IRBlock succ, boolean isLessThan) {
     exists(AbstractValue value |
-      compares_lt(this, left, k, isLessThan, value) and
+      compares_lt(valueNumber(this), left, k, isLessThan, value) and
       this.valueControlsEdge(pred, succ, value)
     )
   }
@@ -583,7 +673,7 @@ class IRGuardCondition extends Instruction {
   cached
   predicate comparesEq(Operand left, Operand right, int k, boolean areEqual, boolean testIsTrue) {
     exists(BooleanValue value |
-      compares_eq(this, left, right, k, areEqual, value) and
+      compares_eq(valueNumber(this), left, right, k, areEqual, value) and
       value.getValue() = testIsTrue
     )
   }
@@ -591,7 +681,7 @@ class IRGuardCondition extends Instruction {
   /** Holds if (determined by this guard) `op == k` evaluates to `areEqual` if this expression evaluates to `value`. */
   cached
   predicate comparesEq(Operand op, int k, boolean areEqual, AbstractValue value) {
-    unary_compares_eq(this, op, k, areEqual, false, value)
+    unary_compares_eq(valueNumber(this), op, k, areEqual, false, value)
   }
 
   /**
@@ -601,7 +691,8 @@ class IRGuardCondition extends Instruction {
   cached
   predicate ensuresEq(Operand left, Operand right, int k, IRBlock block, boolean areEqual) {
     exists(AbstractValue value |
-      compares_eq(this, left, right, k, areEqual, value) and this.valueControls(block, value)
+      compares_eq(valueNumber(this), left, right, k, areEqual, value) and
+      this.valueControls(block, value)
     )
   }
 
@@ -612,7 +703,8 @@ class IRGuardCondition extends Instruction {
   cached
   predicate ensuresEq(Operand op, int k, IRBlock block, boolean areEqual) {
     exists(AbstractValue value |
-      unary_compares_eq(this, op, k, areEqual, false, value) and this.valueControls(block, value)
+      unary_compares_eq(valueNumber(this), op, k, areEqual, false, value) and
+      this.valueControls(block, value)
     )
   }
 
@@ -625,7 +717,7 @@ class IRGuardCondition extends Instruction {
     Operand left, Operand right, int k, IRBlock pred, IRBlock succ, boolean areEqual
   ) {
     exists(AbstractValue value |
-      compares_eq(this, left, right, k, areEqual, value) and
+      compares_eq(valueNumber(this), left, right, k, areEqual, value) and
       this.valueControlsEdge(pred, succ, value)
     )
   }
@@ -637,7 +729,7 @@ class IRGuardCondition extends Instruction {
   cached
   predicate ensuresEqEdge(Operand op, int k, IRBlock pred, IRBlock succ, boolean areEqual) {
     exists(AbstractValue value |
-      unary_compares_eq(this, op, k, areEqual, false, value) and
+      unary_compares_eq(valueNumber(this), op, k, areEqual, false, value) and
       this.valueControlsEdge(pred, succ, value)
     )
   }
@@ -725,13 +817,20 @@ class IRGuardCondition extends Instruction {
 }
 
 private Instruction getBranchForCondition(Instruction guard) {
-  result.(ConditionalBranchInstruction).getCondition() = guard
+  // There are a lot of guards inside global or static local initializers,
+  // and on certain databases this can make the `ensures*` predicates
+  // blow up.
+  // These guards are likely not super important anyway.
+  guard.getEnclosingFunction() instanceof Function and
+  (
+    result.(ConditionalBranchInstruction).getCondition() = guard
+    or
+    result.(SwitchInstruction).getExpression() = guard
+  )
   or
   exists(LogicalNotInstruction cond |
     result = getBranchForCondition(cond) and cond.getUnary() = guard
   )
-  or
-  result.(SwitchInstruction).getExpression() = guard
 }
 
 /**
@@ -740,7 +839,7 @@ private Instruction getBranchForCondition(Instruction guard) {
  * Beware making mistaken logical implications here relating `areEqual` and `testIsTrue`.
  */
 private predicate compares_eq(
-  Instruction test, Operand left, Operand right, int k, boolean areEqual, AbstractValue value
+  ValueNumber test, Operand left, Operand right, int k, boolean areEqual, AbstractValue value
 ) {
   /* The simple case where the test *is* the comparison so areEqual = testIsTrue xor eq. */
   exists(AbstractValue v | simple_comparison_eq(test, left, right, k, v) |
@@ -759,10 +858,10 @@ private predicate compares_eq(
   or
   /* (x is true => (left == right + k)) => (!x is false => (left == right + k)) */
   exists(AbstractValue dual | value = dual.getDualValue() |
-    compares_eq(test.(LogicalNotInstruction).getUnary(), left, right, k, areEqual, dual)
+    compares_eq(test.(LogicalNotValueNumber).getUnary(), left, right, k, areEqual, dual)
   )
   or
-  compares_eq(test.(BuiltinExpectCallInstruction).getCondition(), left, right, k, areEqual, value)
+  compares_eq(test.(BuiltinExpectCallValueNumber).getCondition(), left, right, k, areEqual, value)
 }
 
 /**
@@ -801,12 +900,10 @@ private predicate compares_eq(
  * latter.
  */
 private predicate unary_compares_eq(
-  Instruction test, Operand op, int k, boolean areEqual, boolean inNonZeroCase, AbstractValue value
+  ValueNumber test, Operand op, int k, boolean areEqual, boolean inNonZeroCase, AbstractValue value
 ) {
   /* The simple case where the test *is* the comparison so areEqual = testIsTrue xor eq. */
-  exists(AbstractValue v |
-    unary_simple_comparison_eq(test, k, inNonZeroCase, v) and op.getDef() = test
-  |
+  exists(AbstractValue v | unary_simple_comparison_eq(test, op, k, inNonZeroCase, v) |
     areEqual = true and value = v
     or
     areEqual = false and value = v.getDualValue()
@@ -817,7 +914,7 @@ private predicate unary_compares_eq(
   /* (x is true => (op == k)) => (!x is false => (op == k)) */
   exists(AbstractValue dual, boolean inNonZeroCase0 |
     value = dual.getDualValue() and
-    unary_compares_eq(test.(LogicalNotInstruction).getUnary(), op, k, inNonZeroCase0, areEqual, dual)
+    unary_compares_eq(test.(LogicalNotValueNumber).getUnary(), op, k, inNonZeroCase0, areEqual, dual)
   |
     k = 0 and inNonZeroCase = inNonZeroCase0
     or
@@ -827,82 +924,95 @@ private predicate unary_compares_eq(
   // ((test is `areEqual` => op == const + k2) and const == `k1`) =>
   // test is `areEqual` => op == k1 + k2
   inNonZeroCase = false and
-  exists(int k1, int k2, ConstantInstruction const |
+  exists(int k1, int k2, Instruction const |
     compares_eq(test, op, const.getAUse(), k2, areEqual, value) and
     int_value(const) = k1 and
     k = k1 + k2
   )
   or
-  unary_compares_eq(test.(BuiltinExpectCallInstruction).getCondition(), op, k, areEqual,
+  unary_compares_eq(test.(BuiltinExpectCallValueNumber).getCondition(), op, k, areEqual,
     inNonZeroCase, value)
 }
 
 /** Rearrange various simple comparisons into `left == right + k` form. */
 private predicate simple_comparison_eq(
-  CompareInstruction cmp, Operand left, Operand right, int k, AbstractValue value
+  CompareValueNumber cmp, Operand left, Operand right, int k, AbstractValue value
 ) {
-  left = cmp.getLeftOperand() and
-  cmp instanceof CompareEQInstruction and
-  right = cmp.getRightOperand() and
+  cmp instanceof CompareEQValueNumber and
+  cmp.hasOperands(left, right) and
   k = 0 and
   value.(BooleanValue).getValue() = true
   or
-  left = cmp.getLeftOperand() and
-  cmp instanceof CompareNEInstruction and
-  right = cmp.getRightOperand() and
+  cmp instanceof CompareNEValueNumber and
+  cmp.hasOperands(left, right) and
   k = 0 and
   value.(BooleanValue).getValue() = false
 }
 
 /**
- * Rearrange various simple comparisons into `op == k` form.
+ * Holds if `op` is an operand that is eventually used in a unary comparison
+ * with a constant.
  */
+private predicate isRelevantUnaryComparisonOperand(Operand op) {
+  // Base case: `op` is an operand of a `CompareEQInstruction` or `CompareNEInstruction`,
+  // and the other operand is a constant.
+  exists(CompareInstruction eq, Instruction instr |
+    eq.hasOperands(op, instr.getAUse()) and
+    exists(int_value(instr))
+  |
+    eq instanceof CompareEQInstruction
+    or
+    eq instanceof CompareNEInstruction
+  )
+  or
+  // C doesn't have int-to-bool conversions, so `if(x)` will just generate:
+  // r2_1(glval<int>) = VariableAddress[x]
+  // r2_2(int)        = Load[x]                : &:r2_1, m1_6
+  // v2_3(void)       = ConditionalBranch      : r2_2
+  exists(ConditionalBranchInstruction branch | branch.getConditionOperand() = op)
+  or
+  // If `!x` is a relevant unary comparison then so is `x`.
+  exists(LogicalNotInstruction logicalNot |
+    isRelevantUnaryComparisonOperand(unique( | | logicalNot.getAUse())) and
+    logicalNot.getUnaryOperand() = op
+  )
+  or
+  // If `y` is a relevant unary comparison and `y = x` then so is `x`.
+  not op.isDefinitionInexact() and
+  exists(CopyInstruction copy |
+    isRelevantUnaryComparisonOperand(unique( | | copy.getAUse())) and
+    op = copy.getSourceValueOperand()
+  )
+  or
+  // If phi(x1, x2) is a relevant unary comparison then so are `x1` and `x2`.
+  not op.isDefinitionInexact() and
+  exists(PhiInstruction phi |
+    isRelevantUnaryComparisonOperand(unique( | | phi.getAUse())) and
+    op = phi.getAnInputOperand()
+  )
+  or
+  // If `__builtin_expect(x)` is a relevant unary comparison then so is `x`.
+  exists(BuiltinExpectCallInstruction call |
+    isRelevantUnaryComparisonOperand(unique( | | call.getAUse())) and
+    op = call.getConditionOperand()
+  )
+}
+
+/** Rearrange various simple comparisons into `op == k` form. */
 private predicate unary_simple_comparison_eq(
-  Instruction test, int k, boolean inNonZeroCase, AbstractValue value
+  ValueNumber test, Operand op, int k, boolean inNonZeroCase, AbstractValue value
 ) {
-  exists(SwitchInstruction switch, CaseEdge case |
-    test = switch.getExpression() and
+  exists(CaseEdge case, SwitchConditionValueNumber condition |
+    condition = test and
+    op = condition.getExpressionOperand() and
     case = value.(MatchValue).getCase() and
-    exists(switch.getSuccessor(case)) and
+    exists(condition.getSuccessor(case)) and
     case.getValue().toInt() = k and
     inNonZeroCase = false
   )
   or
-  // Any instruction with an integral type could potentially be part of a
-  // check for nullness when used in a guard. So we include all integral
-  // typed instructions here. However, since some of these instructions are
-  // already included as guards in other cases, we exclude those here.
-  // These are instructions that compute a binary equality or inequality
-  // relation. For example, the following:
-  // ```cpp
-  // if(a == b + 42) { ... }
-  // ```
-  // generates the following IR:
-  // ```
-  // r1(glval<int>) = VariableAddress[a]     :
-  // r2(int)        = Load[a]                : &:r1, m1
-  // r3(glval<int>) = VariableAddress[b]     :
-  // r4(int)        = Load[b]                : &:r3, m2
-  // r5(int)        = Constant[42]           :
-  // r6(int)        = Add                    : r4, r5
-  // r7(bool)       = CompareEQ              : r2, r6
-  // v1(void)       = ConditionalBranch      : r7
-  // ```
-  // and since `r7` is an integral typed instruction this predicate could
-  // include a case for when `r7` evaluates to true (in which case we would
-  // infer that `r6` was non-zero, and a case for when `r7` evaluates to false
-  // (in which case we would infer that `r6` was zero).
-  // However, since `a == b + 42` is already supported when reasoning about
-  // binary equalities we exclude those cases here.
-  not test.isGLValue() and
-  not simple_comparison_eq(test, _, _, _, _) and
-  not simple_comparison_lt(test, _, _, _) and
-  not test = any(SwitchInstruction switch).getExpression() and
-  (
-    test.getResultIRType() instanceof IRAddressType or
-    test.getResultIRType() instanceof IRIntegerType or
-    test.getResultIRType() instanceof IRBooleanType
-  ) and
+  isRelevantUnaryComparisonOperand(op) and
+  op.getDef() = test.getAnInstruction() and
   (
     k = 1 and
     value.(BooleanValue).getValue() = true and
@@ -919,10 +1029,12 @@ private class BuiltinExpectCallInstruction extends CallInstruction {
   BuiltinExpectCallInstruction() { this.getStaticCallTarget().hasName("__builtin_expect") }
 
   /** Gets the condition of this call. */
-  Instruction getCondition() {
+  Instruction getCondition() { result = this.getConditionOperand().getDef() }
+
+  Operand getConditionOperand() {
     // The first parameter of `__builtin_expect` has type `long`. So we skip
     // the conversion when inferring guards.
-    result = this.getArgument(0).(ConvertInstruction).getUnary()
+    result = this.getArgument(0).(ConvertInstruction).getUnaryOperand()
   }
 }
 
@@ -932,23 +1044,23 @@ private class BuiltinExpectCallInstruction extends CallInstruction {
  * `__builtin_expect(left == right + k, _)` to `0`.
  */
 private predicate builtin_expect_eq(
-  CompareInstruction cmp, Operand left, Operand right, int k, boolean areEqual, AbstractValue value
+  CompareValueNumber cmp, Operand left, Operand right, int k, boolean areEqual, AbstractValue value
 ) {
-  exists(BuiltinExpectCallInstruction call, Instruction const, AbstractValue innerValue |
+  exists(BuiltinExpectCallValueNumber call, Instruction const, AbstractValue innerValue |
     int_value(const) = 0 and
     cmp.hasOperands(call.getAUse(), const.getAUse()) and
     compares_eq(call.getCondition(), left, right, k, areEqual, innerValue)
   |
-    cmp instanceof CompareNEInstruction and
+    cmp instanceof CompareNEValueNumber and
     value = innerValue
     or
-    cmp instanceof CompareEQInstruction and
+    cmp instanceof CompareEQValueNumber and
     value.getDualValue() = innerValue
   )
 }
 
 private predicate complex_eq(
-  CompareInstruction cmp, Operand left, Operand right, int k, boolean areEqual, AbstractValue value
+  ValueNumber cmp, Operand left, Operand right, int k, boolean areEqual, AbstractValue value
 ) {
   sub_eq(cmp, left, right, k, areEqual, value)
   or
@@ -962,24 +1074,24 @@ private predicate complex_eq(
  * an instruction that compares the value of `__builtin_expect(op == k, _)` to `0`.
  */
 private predicate unary_builtin_expect_eq(
-  CompareInstruction cmp, Operand op, int k, boolean areEqual, boolean inNonZeroCase,
+  CompareValueNumber cmp, Operand op, int k, boolean areEqual, boolean inNonZeroCase,
   AbstractValue value
 ) {
-  exists(BuiltinExpectCallInstruction call, Instruction const, AbstractValue innerValue |
+  exists(BuiltinExpectCallValueNumber call, Instruction const, AbstractValue innerValue |
     int_value(const) = 0 and
     cmp.hasOperands(call.getAUse(), const.getAUse()) and
     unary_compares_eq(call.getCondition(), op, k, areEqual, inNonZeroCase, innerValue)
   |
-    cmp instanceof CompareNEInstruction and
+    cmp instanceof CompareNEValueNumber and
     value = innerValue
     or
-    cmp instanceof CompareEQInstruction and
+    cmp instanceof CompareEQValueNumber and
     value.getDualValue() = innerValue
   )
 }
 
 private predicate unary_complex_eq(
-  Instruction test, Operand op, int k, boolean areEqual, boolean inNonZeroCase, AbstractValue value
+  ValueNumber test, Operand op, int k, boolean areEqual, boolean inNonZeroCase, AbstractValue value
 ) {
   unary_sub_eq(test, op, k, areEqual, inNonZeroCase, value)
   or
@@ -995,7 +1107,7 @@ private predicate unary_complex_eq(
 
 /** Holds if `left < right + k` evaluates to `isLt` given that test is `testIsTrue`. */
 private predicate compares_lt(
-  Instruction test, Operand left, Operand right, int k, boolean isLt, AbstractValue value
+  ValueNumber test, Operand left, Operand right, int k, boolean isLt, AbstractValue value
 ) {
   /* In the simple case, the test is the comparison, so isLt = testIsTrue */
   simple_comparison_lt(test, left, right, k) and
@@ -1008,23 +1120,22 @@ private predicate compares_lt(
   or
   /* (x is true => (left < right + k)) => (!x is false => (left < right + k)) */
   exists(AbstractValue dual | value = dual.getDualValue() |
-    compares_lt(test.(LogicalNotInstruction).getUnary(), left, right, k, isLt, dual)
+    compares_lt(test.(LogicalNotValueNumber).getUnary(), left, right, k, isLt, dual)
   )
 }
 
 /** Holds if `op < k` evaluates to `isLt` given that `test` evaluates to `value`. */
-private predicate compares_lt(Instruction test, Operand op, int k, boolean isLt, AbstractValue value) {
-  unary_simple_comparison_lt(test, k, isLt, value) and
-  op.getDef() = test
+private predicate compares_lt(ValueNumber test, Operand op, int k, boolean isLt, AbstractValue value) {
+  unary_simple_comparison_lt(test, op, k, isLt, value)
   or
   complex_lt(test, op, k, isLt, value)
   or
   /* (x is true => (op < k)) => (!x is false => (op < k)) */
   exists(AbstractValue dual | value = dual.getDualValue() |
-    compares_lt(test.(LogicalNotInstruction).getUnary(), op, k, isLt, dual)
+    compares_lt(test.(LogicalNotValueNumber).getUnary(), op, k, isLt, dual)
   )
   or
-  exists(int k1, int k2, ConstantInstruction const |
+  exists(int k1, int k2, Instruction const |
     compares_lt(test, op, const.getAUse(), k2, isLt, value) and
     int_value(const) = k1 and
     k = k1 + k2
@@ -1033,42 +1144,38 @@ private predicate compares_lt(Instruction test, Operand op, int k, boolean isLt,
 
 /** `(a < b + k) => (b > a - k) => (b >= a + (1-k))` */
 private predicate compares_ge(
-  Instruction test, Operand left, Operand right, int k, boolean isGe, AbstractValue value
+  ValueNumber test, Operand left, Operand right, int k, boolean isGe, AbstractValue value
 ) {
   exists(int onemk | k = 1 - onemk | compares_lt(test, right, left, onemk, isGe, value))
 }
 
 /** Rearrange various simple comparisons into `left < right + k` form. */
-private predicate simple_comparison_lt(CompareInstruction cmp, Operand left, Operand right, int k) {
-  left = cmp.getLeftOperand() and
-  cmp instanceof CompareLTInstruction and
-  right = cmp.getRightOperand() and
+private predicate simple_comparison_lt(CompareValueNumber cmp, Operand left, Operand right, int k) {
+  cmp.hasOperands(left, right) and
+  cmp instanceof CompareLTValueNumber and
   k = 0
   or
-  left = cmp.getLeftOperand() and
-  cmp instanceof CompareLEInstruction and
-  right = cmp.getRightOperand() and
+  cmp.hasOperands(left, right) and
+  cmp instanceof CompareLEValueNumber and
   k = 1
   or
-  right = cmp.getLeftOperand() and
-  cmp instanceof CompareGTInstruction and
-  left = cmp.getRightOperand() and
+  cmp.hasOperands(right, left) and
+  cmp instanceof CompareGTValueNumber and
   k = 0
   or
-  right = cmp.getLeftOperand() and
-  cmp instanceof CompareGEInstruction and
-  left = cmp.getRightOperand() and
+  cmp.hasOperands(right, left) and
+  cmp instanceof CompareGEValueNumber and
   k = 1
 }
 
 /** Rearrange various simple comparisons into `op < k` form. */
 private predicate unary_simple_comparison_lt(
-  Instruction test, int k, boolean isLt, AbstractValue value
+  SwitchConditionValueNumber test, Operand op, int k, boolean isLt, AbstractValue value
 ) {
-  exists(SwitchInstruction switch, CaseEdge case |
-    test = switch.getExpression() and
+  exists(CaseEdge case |
+    test.getExpressionOperand() = op and
     case = value.(MatchValue).getCase() and
-    exists(switch.getSuccessor(case)) and
+    exists(test.getSuccessor(case)) and
     case.getMaxValue() > case.getMinValue()
   |
     // op <= k => op < k - 1
@@ -1081,7 +1188,7 @@ private predicate unary_simple_comparison_lt(
 }
 
 private predicate complex_lt(
-  CompareInstruction cmp, Operand left, Operand right, int k, boolean isLt, AbstractValue value
+  ValueNumber cmp, Operand left, Operand right, int k, boolean isLt, AbstractValue value
 ) {
   sub_lt(cmp, left, right, k, isLt, value)
   or
@@ -1089,7 +1196,7 @@ private predicate complex_lt(
 }
 
 private predicate complex_lt(
-  Instruction test, Operand left, int k, boolean isLt, AbstractValue value
+  ValueNumber test, Operand left, int k, boolean isLt, AbstractValue value
 ) {
   sub_lt(test, left, k, isLt, value)
   or
@@ -1099,7 +1206,7 @@ private predicate complex_lt(
 // left - x < right + c => left < right + (c+x)
 // left < (right - x) + c => left < right + (c-x)
 private predicate sub_lt(
-  CompareInstruction cmp, Operand left, Operand right, int k, boolean isLt, AbstractValue value
+  ValueNumber cmp, Operand left, Operand right, int k, boolean isLt, AbstractValue value
 ) {
   exists(SubInstruction lhs, int c, int x |
     compares_lt(cmp, lhs.getAUse(), right, c, isLt, value) and
@@ -1130,7 +1237,7 @@ private predicate sub_lt(
   )
 }
 
-private predicate sub_lt(Instruction test, Operand left, int k, boolean isLt, AbstractValue value) {
+private predicate sub_lt(ValueNumber test, Operand left, int k, boolean isLt, AbstractValue value) {
   exists(SubInstruction lhs, int c, int x |
     compares_lt(test, lhs.getAUse(), c, isLt, value) and
     left = lhs.getLeftOperand() and
@@ -1149,7 +1256,7 @@ private predicate sub_lt(Instruction test, Operand left, int k, boolean isLt, Ab
 // left + x < right + c => left < right + (c-x)
 // left < (right + x) + c => left < right + (c+x)
 private predicate add_lt(
-  CompareInstruction cmp, Operand left, Operand right, int k, boolean isLt, AbstractValue value
+  ValueNumber cmp, Operand left, Operand right, int k, boolean isLt, AbstractValue value
 ) {
   exists(AddInstruction lhs, int c, int x |
     compares_lt(cmp, lhs.getAUse(), right, c, isLt, value) and
@@ -1192,7 +1299,7 @@ private predicate add_lt(
   )
 }
 
-private predicate add_lt(Instruction test, Operand left, int k, boolean isLt, AbstractValue value) {
+private predicate add_lt(ValueNumber test, Operand left, int k, boolean isLt, AbstractValue value) {
   exists(AddInstruction lhs, int c, int x |
     compares_lt(test, lhs.getAUse(), c, isLt, value) and
     (
@@ -1217,7 +1324,7 @@ private predicate add_lt(Instruction test, Operand left, int k, boolean isLt, Ab
 // left - x == right + c => left == right + (c+x)
 // left == (right - x) + c => left == right + (c-x)
 private predicate sub_eq(
-  CompareInstruction cmp, Operand left, Operand right, int k, boolean areEqual, AbstractValue value
+  ValueNumber cmp, Operand left, Operand right, int k, boolean areEqual, AbstractValue value
 ) {
   exists(SubInstruction lhs, int c, int x |
     compares_eq(cmp, lhs.getAUse(), right, c, areEqual, value) and
@@ -1250,7 +1357,7 @@ private predicate sub_eq(
 
 // op - x == c => op == (c+x)
 private predicate unary_sub_eq(
-  Instruction test, Operand op, int k, boolean areEqual, boolean inNonZeroCase, AbstractValue value
+  ValueNumber test, Operand op, int k, boolean areEqual, boolean inNonZeroCase, AbstractValue value
 ) {
   inNonZeroCase = false and
   exists(SubInstruction sub, int c, int x |
@@ -1272,7 +1379,7 @@ private predicate unary_sub_eq(
 // left + x == right + c => left == right + (c-x)
 // left == (right + x) + c => left == right + (c+x)
 private predicate add_eq(
-  CompareInstruction cmp, Operand left, Operand right, int k, boolean areEqual, AbstractValue value
+  ValueNumber cmp, Operand left, Operand right, int k, boolean areEqual, AbstractValue value
 ) {
   exists(AddInstruction lhs, int c, int x |
     compares_eq(cmp, lhs.getAUse(), right, c, areEqual, value) and
@@ -1317,7 +1424,7 @@ private predicate add_eq(
 
 // left + x == right + c => left == right + (c-x)
 private predicate unary_add_eq(
-  Instruction test, Operand left, int k, boolean areEqual, boolean inNonZeroCase,
+  ValueNumber test, Operand left, int k, boolean areEqual, boolean inNonZeroCase,
   AbstractValue value
 ) {
   inNonZeroCase = false and
@@ -1351,6 +1458,4 @@ private class IntegerOrPointerConstantInstruction extends ConstantInstruction {
 }
 
 /** The int value of integer constant expression. */
-private int int_value(Instruction i) {
-  result = i.(IntegerOrPointerConstantInstruction).getValue().toInt()
-}
+private int int_value(IntegerOrPointerConstantInstruction i) { result = i.getValue().toInt() }
diff --git a/cpp/ql/lib/semmle/code/cpp/dataflow/internal/DataFlowImpl1.qll b/cpp/ql/lib/semmle/code/cpp/dataflow/internal/DataFlowImpl1.qll
index 359fa71744b..17def0c431d 100644
--- a/cpp/ql/lib/semmle/code/cpp/dataflow/internal/DataFlowImpl1.qll
+++ b/cpp/ql/lib/semmle/code/cpp/dataflow/internal/DataFlowImpl1.qll
@@ -261,13 +261,17 @@ deprecated private module Config implements FullStateConfigSig {
     model = ""
   }
 
-  predicate isAdditionalFlowStep(Node node1, FlowState state1, Node node2, FlowState state2) {
+  predicate isAdditionalFlowStep(
+    Node node1, FlowState state1, Node node2, FlowState state2, string model
+  ) {
     getConfig(state1).isAdditionalFlowStep(node1, getState(state1), node2, getState(state2)) and
-    getConfig(state2) = getConfig(state1)
+    getConfig(state2) = getConfig(state1) and
+    model = ""
     or
     not singleConfiguration() and
     getConfig(state1).isAdditionalFlowStep(node1, node2) and
-    state2 = state1
+    state2 = state1 and
+    model = ""
   }
 
   predicate allowImplicitRead(Node node, ContentSet c) {
@@ -283,6 +287,8 @@ deprecated private module Config implements FullStateConfigSig {
   FlowFeature getAFeature() { result = any(Configuration config).getAFeature() }
 
   predicate includeHiddenNodes() { any(Configuration config).includeHiddenNodes() }
+
+  predicate observeDiffInformedIncrementalMode() { none() }
 }
 
 deprecated private import Impl<Config> as I
diff --git a/cpp/ql/lib/semmle/code/cpp/dataflow/internal/DataFlowImpl2.qll b/cpp/ql/lib/semmle/code/cpp/dataflow/internal/DataFlowImpl2.qll
index 359fa71744b..17def0c431d 100644
--- a/cpp/ql/lib/semmle/code/cpp/dataflow/internal/DataFlowImpl2.qll
+++ b/cpp/ql/lib/semmle/code/cpp/dataflow/internal/DataFlowImpl2.qll
@@ -261,13 +261,17 @@ deprecated private module Config implements FullStateConfigSig {
     model = ""
   }
 
-  predicate isAdditionalFlowStep(Node node1, FlowState state1, Node node2, FlowState state2) {
+  predicate isAdditionalFlowStep(
+    Node node1, FlowState state1, Node node2, FlowState state2, string model
+  ) {
     getConfig(state1).isAdditionalFlowStep(node1, getState(state1), node2, getState(state2)) and
-    getConfig(state2) = getConfig(state1)
+    getConfig(state2) = getConfig(state1) and
+    model = ""
     or
     not singleConfiguration() and
     getConfig(state1).isAdditionalFlowStep(node1, node2) and
-    state2 = state1
+    state2 = state1 and
+    model = ""
   }
 
   predicate allowImplicitRead(Node node, ContentSet c) {
@@ -283,6 +287,8 @@ deprecated private module Config implements FullStateConfigSig {
   FlowFeature getAFeature() { result = any(Configuration config).getAFeature() }
 
   predicate includeHiddenNodes() { any(Configuration config).includeHiddenNodes() }
+
+  predicate observeDiffInformedIncrementalMode() { none() }
 }
 
 deprecated private import Impl<Config> as I
diff --git a/cpp/ql/lib/semmle/code/cpp/dataflow/internal/DataFlowImpl3.qll b/cpp/ql/lib/semmle/code/cpp/dataflow/internal/DataFlowImpl3.qll
index 359fa71744b..17def0c431d 100644
--- a/cpp/ql/lib/semmle/code/cpp/dataflow/internal/DataFlowImpl3.qll
+++ b/cpp/ql/lib/semmle/code/cpp/dataflow/internal/DataFlowImpl3.qll
@@ -261,13 +261,17 @@ deprecated private module Config implements FullStateConfigSig {
     model = ""
   }
 
-  predicate isAdditionalFlowStep(Node node1, FlowState state1, Node node2, FlowState state2) {
+  predicate isAdditionalFlowStep(
+    Node node1, FlowState state1, Node node2, FlowState state2, string model
+  ) {
     getConfig(state1).isAdditionalFlowStep(node1, getState(state1), node2, getState(state2)) and
-    getConfig(state2) = getConfig(state1)
+    getConfig(state2) = getConfig(state1) and
+    model = ""
     or
     not singleConfiguration() and
     getConfig(state1).isAdditionalFlowStep(node1, node2) and
-    state2 = state1
+    state2 = state1 and
+    model = ""
   }
 
   predicate allowImplicitRead(Node node, ContentSet c) {
@@ -283,6 +287,8 @@ deprecated private module Config implements FullStateConfigSig {
   FlowFeature getAFeature() { result = any(Configuration config).getAFeature() }
 
   predicate includeHiddenNodes() { any(Configuration config).includeHiddenNodes() }
+
+  predicate observeDiffInformedIncrementalMode() { none() }
 }
 
 deprecated private import Impl<Config> as I
diff --git a/cpp/ql/lib/semmle/code/cpp/dataflow/internal/DataFlowImpl4.qll b/cpp/ql/lib/semmle/code/cpp/dataflow/internal/DataFlowImpl4.qll
index 359fa71744b..17def0c431d 100644
--- a/cpp/ql/lib/semmle/code/cpp/dataflow/internal/DataFlowImpl4.qll
+++ b/cpp/ql/lib/semmle/code/cpp/dataflow/internal/DataFlowImpl4.qll
@@ -261,13 +261,17 @@ deprecated private module Config implements FullStateConfigSig {
     model = ""
   }
 
-  predicate isAdditionalFlowStep(Node node1, FlowState state1, Node node2, FlowState state2) {
+  predicate isAdditionalFlowStep(
+    Node node1, FlowState state1, Node node2, FlowState state2, string model
+  ) {
     getConfig(state1).isAdditionalFlowStep(node1, getState(state1), node2, getState(state2)) and
-    getConfig(state2) = getConfig(state1)
+    getConfig(state2) = getConfig(state1) and
+    model = ""
     or
     not singleConfiguration() and
     getConfig(state1).isAdditionalFlowStep(node1, node2) and
-    state2 = state1
+    state2 = state1 and
+    model = ""
   }
 
   predicate allowImplicitRead(Node node, ContentSet c) {
@@ -283,6 +287,8 @@ deprecated private module Config implements FullStateConfigSig {
   FlowFeature getAFeature() { result = any(Configuration config).getAFeature() }
 
   predicate includeHiddenNodes() { any(Configuration config).includeHiddenNodes() }
+
+  predicate observeDiffInformedIncrementalMode() { none() }
 }
 
 deprecated private import Impl<Config> as I
diff --git a/cpp/ql/lib/semmle/code/cpp/dataflow/internal/DataFlowImplLocal.qll b/cpp/ql/lib/semmle/code/cpp/dataflow/internal/DataFlowImplLocal.qll
index 359fa71744b..17def0c431d 100644
--- a/cpp/ql/lib/semmle/code/cpp/dataflow/internal/DataFlowImplLocal.qll
+++ b/cpp/ql/lib/semmle/code/cpp/dataflow/internal/DataFlowImplLocal.qll
@@ -261,13 +261,17 @@ deprecated private module Config implements FullStateConfigSig {
     model = ""
   }
 
-  predicate isAdditionalFlowStep(Node node1, FlowState state1, Node node2, FlowState state2) {
+  predicate isAdditionalFlowStep(
+    Node node1, FlowState state1, Node node2, FlowState state2, string model
+  ) {
     getConfig(state1).isAdditionalFlowStep(node1, getState(state1), node2, getState(state2)) and
-    getConfig(state2) = getConfig(state1)
+    getConfig(state2) = getConfig(state1) and
+    model = ""
     or
     not singleConfiguration() and
     getConfig(state1).isAdditionalFlowStep(node1, node2) and
-    state2 = state1
+    state2 = state1 and
+    model = ""
   }
 
   predicate allowImplicitRead(Node node, ContentSet c) {
@@ -283,6 +287,8 @@ deprecated private module Config implements FullStateConfigSig {
   FlowFeature getAFeature() { result = any(Configuration config).getAFeature() }
 
   predicate includeHiddenNodes() { any(Configuration config).includeHiddenNodes() }
+
+  predicate observeDiffInformedIncrementalMode() { none() }
 }
 
 deprecated private import Impl<Config> as I
diff --git a/cpp/ql/lib/semmle/code/cpp/dataflow/internal/TaintTrackingUtil.qll b/cpp/ql/lib/semmle/code/cpp/dataflow/internal/TaintTrackingUtil.qll
index 3075d397457..493b531a49a 100644
--- a/cpp/ql/lib/semmle/code/cpp/dataflow/internal/TaintTrackingUtil.qll
+++ b/cpp/ql/lib/semmle/code/cpp/dataflow/internal/TaintTrackingUtil.qll
@@ -281,3 +281,9 @@ private predicate exprToPartialDefinitionStep(Expr exprIn, Expr exprOut) {
 }
 
 private predicate iteratorDereference(Call c) { c.getTarget() instanceof IteratorReferenceFunction }
+
+/**
+ * Holds if the additional step from `src` to `sink` should be considered in
+ * speculative taint flow exploration.
+ */
+predicate speculativeTaintStep(DataFlow::Node src, DataFlow::Node sink) { none() }
diff --git a/cpp/ql/lib/semmle/code/cpp/exprs/Call.qll b/cpp/ql/lib/semmle/code/cpp/exprs/Call.qll
index 332cda770bb..03c3e8a3371 100644
--- a/cpp/ql/lib/semmle/code/cpp/exprs/Call.qll
+++ b/cpp/ql/lib/semmle/code/cpp/exprs/Call.qll
@@ -149,6 +149,11 @@ class Call extends Expr, NameQualifiableElement, TCall {
     variableAddressEscapesTreeNonConst(va, this.getQualifier().getFullyConverted()) and
     i = -1
   }
+
+  /** Holds if this expression could be the return value of an implicitly declared function. */
+  predicate mayBeFromImplicitlyDeclaredFunction() {
+    this.getTarget().getADeclarationEntry().isImplicit()
+  }
 }
 
 /**
diff --git a/cpp/ql/lib/semmle/code/cpp/internal/QualifiedName.qll b/cpp/ql/lib/semmle/code/cpp/internal/QualifiedName.qll
index 6d795048734..54de2c95363 100644
--- a/cpp/ql/lib/semmle/code/cpp/internal/QualifiedName.qll
+++ b/cpp/ql/lib/semmle/code/cpp/internal/QualifiedName.qll
@@ -181,12 +181,7 @@ class VariableDeclarationEntry extends @var_decl {
   string getName() { var_decls(this, _, _, result, _) and result != "" }
 }
 
-class Parameter extends LocalScopeVariable, @parameter {
-  @functionorblock function;
-  int index;
-
-  Parameter() { params(this, function, index, _) }
-}
+class Parameter extends LocalScopeVariable, @parameter { }
 
 class GlobalOrNamespaceVariable extends Variable, @globalvariable { }
 
diff --git a/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/DataFlowImpl1.qll b/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/DataFlowImpl1.qll
index 359fa71744b..17def0c431d 100644
--- a/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/DataFlowImpl1.qll
+++ b/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/DataFlowImpl1.qll
@@ -261,13 +261,17 @@ deprecated private module Config implements FullStateConfigSig {
     model = ""
   }
 
-  predicate isAdditionalFlowStep(Node node1, FlowState state1, Node node2, FlowState state2) {
+  predicate isAdditionalFlowStep(
+    Node node1, FlowState state1, Node node2, FlowState state2, string model
+  ) {
     getConfig(state1).isAdditionalFlowStep(node1, getState(state1), node2, getState(state2)) and
-    getConfig(state2) = getConfig(state1)
+    getConfig(state2) = getConfig(state1) and
+    model = ""
     or
     not singleConfiguration() and
     getConfig(state1).isAdditionalFlowStep(node1, node2) and
-    state2 = state1
+    state2 = state1 and
+    model = ""
   }
 
   predicate allowImplicitRead(Node node, ContentSet c) {
@@ -283,6 +287,8 @@ deprecated private module Config implements FullStateConfigSig {
   FlowFeature getAFeature() { result = any(Configuration config).getAFeature() }
 
   predicate includeHiddenNodes() { any(Configuration config).includeHiddenNodes() }
+
+  predicate observeDiffInformedIncrementalMode() { none() }
 }
 
 deprecated private import Impl<Config> as I
diff --git a/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/DataFlowImpl2.qll b/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/DataFlowImpl2.qll
index 359fa71744b..17def0c431d 100644
--- a/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/DataFlowImpl2.qll
+++ b/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/DataFlowImpl2.qll
@@ -261,13 +261,17 @@ deprecated private module Config implements FullStateConfigSig {
     model = ""
   }
 
-  predicate isAdditionalFlowStep(Node node1, FlowState state1, Node node2, FlowState state2) {
+  predicate isAdditionalFlowStep(
+    Node node1, FlowState state1, Node node2, FlowState state2, string model
+  ) {
     getConfig(state1).isAdditionalFlowStep(node1, getState(state1), node2, getState(state2)) and
-    getConfig(state2) = getConfig(state1)
+    getConfig(state2) = getConfig(state1) and
+    model = ""
     or
     not singleConfiguration() and
     getConfig(state1).isAdditionalFlowStep(node1, node2) and
-    state2 = state1
+    state2 = state1 and
+    model = ""
   }
 
   predicate allowImplicitRead(Node node, ContentSet c) {
@@ -283,6 +287,8 @@ deprecated private module Config implements FullStateConfigSig {
   FlowFeature getAFeature() { result = any(Configuration config).getAFeature() }
 
   predicate includeHiddenNodes() { any(Configuration config).includeHiddenNodes() }
+
+  predicate observeDiffInformedIncrementalMode() { none() }
 }
 
 deprecated private import Impl<Config> as I
diff --git a/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/DataFlowImpl3.qll b/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/DataFlowImpl3.qll
index 359fa71744b..17def0c431d 100644
--- a/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/DataFlowImpl3.qll
+++ b/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/DataFlowImpl3.qll
@@ -261,13 +261,17 @@ deprecated private module Config implements FullStateConfigSig {
     model = ""
   }
 
-  predicate isAdditionalFlowStep(Node node1, FlowState state1, Node node2, FlowState state2) {
+  predicate isAdditionalFlowStep(
+    Node node1, FlowState state1, Node node2, FlowState state2, string model
+  ) {
     getConfig(state1).isAdditionalFlowStep(node1, getState(state1), node2, getState(state2)) and
-    getConfig(state2) = getConfig(state1)
+    getConfig(state2) = getConfig(state1) and
+    model = ""
     or
     not singleConfiguration() and
     getConfig(state1).isAdditionalFlowStep(node1, node2) and
-    state2 = state1
+    state2 = state1 and
+    model = ""
   }
 
   predicate allowImplicitRead(Node node, ContentSet c) {
@@ -283,6 +287,8 @@ deprecated private module Config implements FullStateConfigSig {
   FlowFeature getAFeature() { result = any(Configuration config).getAFeature() }
 
   predicate includeHiddenNodes() { any(Configuration config).includeHiddenNodes() }
+
+  predicate observeDiffInformedIncrementalMode() { none() }
 }
 
 deprecated private import Impl<Config> as I
diff --git a/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/DataFlowImpl4.qll b/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/DataFlowImpl4.qll
index 359fa71744b..17def0c431d 100644
--- a/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/DataFlowImpl4.qll
+++ b/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/DataFlowImpl4.qll
@@ -261,13 +261,17 @@ deprecated private module Config implements FullStateConfigSig {
     model = ""
   }
 
-  predicate isAdditionalFlowStep(Node node1, FlowState state1, Node node2, FlowState state2) {
+  predicate isAdditionalFlowStep(
+    Node node1, FlowState state1, Node node2, FlowState state2, string model
+  ) {
     getConfig(state1).isAdditionalFlowStep(node1, getState(state1), node2, getState(state2)) and
-    getConfig(state2) = getConfig(state1)
+    getConfig(state2) = getConfig(state1) and
+    model = ""
     or
     not singleConfiguration() and
     getConfig(state1).isAdditionalFlowStep(node1, node2) and
-    state2 = state1
+    state2 = state1 and
+    model = ""
   }
 
   predicate allowImplicitRead(Node node, ContentSet c) {
@@ -283,6 +287,8 @@ deprecated private module Config implements FullStateConfigSig {
   FlowFeature getAFeature() { result = any(Configuration config).getAFeature() }
 
   predicate includeHiddenNodes() { any(Configuration config).includeHiddenNodes() }
+
+  predicate observeDiffInformedIncrementalMode() { none() }
 }
 
 deprecated private import Impl<Config> as I
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 ac6e898748a..8f0ae53171e 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
@@ -1328,7 +1328,10 @@ predicate lambdaCreation(Node creation, LambdaCallKind kind, DataFlowCallable c)
 
 /** Holds if `call` is a lambda call of kind `kind` where `receiver` is the lambda expression. */
 predicate lambdaCall(DataFlowCall call, LambdaCallKind kind, Node receiver) {
-  call.(SummaryCall).getReceiver() = receiver.(FlowSummaryNode).getSummaryNode() and
+  (
+    call.(SummaryCall).getReceiver() = receiver.(FlowSummaryNode).getSummaryNode() or
+    call.asCallInstruction().getCallTargetOperand() = receiver.asOperand()
+  ) and
   exists(kind)
 }
 
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 f2263abf7f5..d0935bb76d2 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
@@ -17,6 +17,7 @@ private import SsaInternals as Ssa
 private import DataFlowImplCommon as DataFlowImplCommon
 private import codeql.util.Unit
 private import Node0ToString
+private import DataFlowDispatch as DataFlowDispatch
 import ExprNodes
 
 /**
@@ -2497,3 +2498,16 @@ class AdditionalCallTarget extends Unit {
    */
   abstract Declaration viableTarget(Call call);
 }
+
+/**
+ * Gets a function that may be called by `call`.
+ *
+ * Note that `call` may be a call to a function pointer expression.
+ */
+Function getARuntimeTarget(Call call) {
+  exists(DataFlowCall dfCall | dfCall.asCallInstruction().getUnconvertedResultExpression() = call |
+    result = DataFlowDispatch::viableCallable(dfCall).asSourceCallable()
+    or
+    result = DataFlowImplCommon::viableCallableLambda(dfCall, _).asSourceCallable()
+  )
+}
diff --git a/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/ProductFlow.qll b/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/ProductFlow.qll
index c2325593df2..0c474b0e75d 100644
--- a/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/ProductFlow.qll
+++ b/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/ProductFlow.qll
@@ -546,7 +546,7 @@ module ProductFlow {
       Flow1::PathGraph::edges(pred1, succ1, _, _) and
       exists(ReturnKindExt returnKind |
         succ1.getNode() = returnKind.getAnOutNode(call) and
-        paramReturnNode(_, pred1.asParameterReturnNode(), _, returnKind)
+        returnKind = getParamReturnPosition(_, pred1.asParameterReturnNode()).getKind()
       )
     }
 
@@ -574,7 +574,7 @@ module ProductFlow {
       Flow2::PathGraph::edges(pred2, succ2, _, _) and
       exists(ReturnKindExt returnKind |
         succ2.getNode() = returnKind.getAnOutNode(call) and
-        paramReturnNode(_, pred2.asParameterReturnNode(), _, returnKind)
+        returnKind = getParamReturnPosition(_, pred2.asParameterReturnNode()).getKind()
       )
     }
 
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 e570ecb0542..b6d332e3d4c 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
@@ -212,3 +212,30 @@ predicate modeledTaintStep(DataFlow::Node nodeIn, DataFlow::Node nodeOut, string
     nodeOut = callOutput(call, modelOut)
   )
 }
+
+import SpeculativeTaintFlow
+
+private module SpeculativeTaintFlow {
+  private import semmle.code.cpp.ir.dataflow.internal.DataFlowDispatch as DataFlowDispatch
+  private import semmle.code.cpp.ir.dataflow.internal.DataFlowPrivate as DataFlowPrivate
+
+  /**
+   * Holds if the additional step from `src` to `sink` should be considered in
+   * speculative taint flow exploration.
+   */
+  predicate speculativeTaintStep(DataFlow::Node src, DataFlow::Node sink) {
+    exists(DataFlowCall call, ArgumentPosition argpos |
+      // TODO: exclude neutrals and anything that has QL modeling.
+      not exists(DataFlowDispatch::viableCallable(call)) and
+      src.(DataFlowPrivate::ArgumentNode).argumentOf(call, argpos)
+    |
+      not argpos.(DirectPosition).getIndex() = -1 and
+      sink.(PostUpdateNode)
+          .getPreUpdateNode()
+          .(DataFlowPrivate::ArgumentNode)
+          .argumentOf(call, any(DirectPosition qualpos | qualpos.getIndex() = -1))
+      or
+      sink.(DataFlowPrivate::OutNode).getCall() = call
+    )
+  }
+}
diff --git a/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/TypeFlow.qll b/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/TypeFlow.qll
index 69f94dad91b..41e30e2902b 100644
--- a/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/TypeFlow.qll
+++ b/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/TypeFlow.qll
@@ -159,7 +159,7 @@ private module Input implements TypeFlowInput<Location> {
     )
   }
 
-  predicate joinStep(TypeFlowNode n1, TypeFlowNode n2) {
+  predicate step(TypeFlowNode n1, TypeFlowNode n2) {
     // instruction -> phi
     getAnUltimateLocalDefinition(n2.asInstruction()) = n1.asInstruction()
     or
@@ -179,6 +179,8 @@ private module Input implements TypeFlowInput<Location> {
       n1.asInstruction() = arg and
       n2.asInstruction() = p
     )
+    or
+    instructionStep(n1.asInstruction(), n2.asInstruction())
   }
 
   /**
@@ -199,10 +201,6 @@ private module Input implements TypeFlowInput<Location> {
     i2.(PointerArithmeticInstruction).getLeft() = i1
   }
 
-  predicate step(TypeFlowNode n1, TypeFlowNode n2) {
-    instructionStep(n1.asInstruction(), n2.asInstruction())
-  }
-
   predicate isNullValue(TypeFlowNode n) { n.isNullValue() }
 
   private newtype TType =
@@ -245,11 +243,7 @@ private module Input implements TypeFlowInput<Location> {
 
   pragma[nomagic]
   private predicate upcastCand(TypeFlowNode n, Type t1, Type t2) {
-    exists(TypeFlowNode next |
-      step(n, next)
-      or
-      joinStep(n, next)
-    |
+    exists(TypeFlowNode next | step(n, next) |
       n.getType() = t1 and
       next.getType() = t2 and
       t1 != t2
diff --git a/cpp/ql/lib/semmle/code/cpp/ir/implementation/aliased_ssa/IRConsistency.qll b/cpp/ql/lib/semmle/code/cpp/ir/implementation/aliased_ssa/IRConsistency.qll
index edc785dfabe..67a6965ae9b 100644
--- a/cpp/ql/lib/semmle/code/cpp/ir/implementation/aliased_ssa/IRConsistency.qll
+++ b/cpp/ql/lib/semmle/code/cpp/ir/implementation/aliased_ssa/IRConsistency.qll
@@ -546,4 +546,26 @@ module InstructionConsistency {
         "' has no associated variable, in function '$@'." and
     irFunc = getInstructionIRFunction(instr, irFuncText)
   }
+
+  query predicate nonBooleanOperand(
+    Instruction instr, string message, OptionalIRFunction irFunc, string irFuncText
+  ) {
+    exists(Instruction unary |
+      unary = instr.(LogicalNotInstruction).getUnary() and
+      not unary.getResultIRType() instanceof IRBooleanType and
+      irFunc = getInstructionIRFunction(instr, irFuncText) and
+      message =
+        "Logical Not instruction " + instr.toString() +
+          " with non-Boolean operand, in function '$@'."
+    )
+    or
+    exists(Instruction cond |
+      cond = instr.(ConditionalBranchInstruction).getCondition() and
+      not cond.getResultIRType() instanceof IRBooleanType and
+      irFunc = getInstructionIRFunction(instr, irFuncText) and
+      message =
+        "Conditional branch instruction " + instr.toString() +
+          " with non-Boolean condition, in function '$@'."
+    )
+  }
 }
diff --git a/cpp/ql/lib/semmle/code/cpp/ir/implementation/aliased_ssa/PrintIR.qll b/cpp/ql/lib/semmle/code/cpp/ir/implementation/aliased_ssa/PrintIR.qll
index c4b18d9cb61..7fd66ba8441 100644
--- a/cpp/ql/lib/semmle/code/cpp/ir/implementation/aliased_ssa/PrintIR.qll
+++ b/cpp/ql/lib/semmle/code/cpp/ir/implementation/aliased_ssa/PrintIR.qll
@@ -6,6 +6,112 @@
  * uses, however, it is better to write a query that imports `PrintIR.qll`, extends
  * `PrintIRConfiguration`, and overrides `shouldPrintDeclaration()` to select a subset of declarations
  * to dump.
+ *
+ * Anatomy of a printed IR instruction
+ *
+ * An instruction:
+ *
+ * ```
+ * # 2281|     v2281_19(void) = Call[~String]     : func:r2281_18, this:r2281_17
+ * ```
+ *
+ * The prefix `# 2281|` specifies that this instruction was generated by the C++ source code on line 2281.
+ * Scrolling up in the printed output, one will eventually find the name of the file to which the line
+ * belongs.
+ *
+ * `v2281_19(void)` is the result of the instruction. Here, `v` means this is a void result or operand (so
+ * there should be no later uses of the result; see below for other possible values). The `2281_19` is a
+ * unique ID for the result. This is usually just the line number plus a small integer suffix to make it
+ * unique within the function. The type of the result is `void`. In this case, it is `void`, because
+ * `~String` returns `void`. The type of the result is usually just the name of the appropriate C++ type,
+ * but it will sometimes be a type like `glval<int>`, which means result holds a glvalue, which at the
+ * IR level works like a pointer. In other words, in the source code the type was `int`, but it is really
+ * more like an `int*`. We see this, for example, in `x = y;`, where `x` is a glvalue.
+ *
+ * `Call` is the opcode of the instruction. Common opcodes include:
+ *
+ * * Arithmetic operations: `Add`, `Sub`, `Mul`, etc.
+ * * Memory access operations: `Load`, `Store`.
+ * * Function calls: `Call`.
+ * * Literals: `Constant`.
+ * * Variable addresses: `VariableAddress`.
+ * * Function entry points: `EnterFunction`.
+ * * Return from a function: `Return`, `ReturnVoid`. Note that the value being returned is set separately by a
+ *   `Store` to a special `#return` variable.
+ * * Stack unwinding for C++ function that throw and where the exception escapes the function: `Unwind`.
+ * * Common exit point for `Unwind` and `Return`: `ExitFunction`.
+ * * SSA-related opcodes: `Phi`, `Chi`.
+ *
+ * `[~String]` denotes additional information. The information might be present earlier in the IR, as is the case
+ * for `Call`, where it is the name of the called function. This is also the case for `Load` and `Store`, where it
+ * is the name of the variable that loaded or stored (if known). In the case of `Constant`, `FieldAddress`, and
+ * `VariableAddress`, the information between brackets does not occur earlier.
+ *
+ * `func:r2281_18` and `this:r28281_17` are the operands of the instruction. The `func:` prefix denotes the operand
+ * that holds the address of the called function. The `this:` prefix denotes the argument to the special `this`
+ * parameter of an instance member function. `r2281_18`, `r2281_17` are the unique IDs of the operands. Each of these
+ * matches the ID of a previously seen result, showing where that value came from. The `r` means that these are
+ * "register" operands (see below).
+ *
+ * Result and operand kinds:
+ *
+ * Every result and operand is one of these three kinds:
+ *
+ * * `r` "register". These operands are not stored in any particular memory location. We can think of them as
+ *   temporary values created during the evaluation of an expression. A register operand almost always has one
+ *   use, often in the same block as its definition.
+ * *  `m` "memory". These operands represents accesses to a specific memory location. The location could be a
+ *    local variable, a global variable, a field of an object, an element of an array, or any memory that we happen
+ *    to have a pointer to. These only occur as the result of a `Store`, the source operand of a `Load` or on the
+ *    SSA instructions (`Phi`, `Chi`).
+ * * `v` "void". Really just a register operand, but we mark register operands of type void with this special prefix
+ *   so we know that there is no actual value there.
+ *
+ * Branches in the IR:
+ *
+ * The IR is divided into basic blocks. At the end of each block, there are one or more edges showing the possible
+ * control flow successors of the block.
+ *
+ * ```
+ * #   44|     v44_3(void)    = ConditionalBranch : r44_2
+ * #-----|   False -> Block 4
+ * #-----|   True -> Block 3
+ * ```
+ * Here we have a block that ends with a conditional branch. The two edges show where the control flows to depending
+ * on whether the condition is true or false.
+ *
+ * SSA instructions:
+ *
+ * We use `Phi` instructions in SSA to create a single definition for a variable that might be assigned on multiple
+ * control flow paths. The `Phi` instruction merges the potential values of that variable from each predecessor edge,
+ * and the resulting definition is then used wherever that variable is accessed later on.
+ *
+ * When dealing with aliased memory, we use the `Chi` instruction to create a single definition for memory that might
+ * or might not have been updated by a store, depending on the actual address that was written to. For example, take:
+ *
+ * ```cpp
+ * int x = 5;
+ * int y = 7;
+ * int* p = condition ? &x : &y;
+ * *p = 6;
+ * return x;
+ * ```
+ *
+ * At the point where we store to `*p`, we do not know whether `p` points to `x` or `y`. Thus, we do not know whether
+ * `return x;` is going to return the value that `x` was originally initialized to (5), or whether it will return 6,
+ *  because it was overwritten by `*p = 6;`. We insert a `Chi` instruction immediately after the store to `*p`:
+ *
+ * ```
+ * r2(int)     = Constant[6]
+ * r3(int*)    = <<value of p>>
+ * m4(int)     = Store           : &r3, r2  // Stores the constant 6 to *p
+ * m5(unknown) = Chi             : total:m1, partial:m4
+ * ```
+ * The `partial:` operand represents the memory that was just stored. The `total:` operand represents the previous
+ * contents of all of the memory that `p` might have pointed to (in this case, both `x` and `y`). The result of the
+ * `Chi` represents the new contents of whatever memory the `total:` operand referred to. We usually do not know exactly
+ * which parts of that memory were overwritten, but it does model that any of that memory could have been modified, so
+ * that later instructions do not assume that the memory was unchanged.
  */
 
 private import internal.IRInternal
diff --git a/cpp/ql/lib/semmle/code/cpp/ir/implementation/aliased_ssa/internal/AliasedSSA.qll b/cpp/ql/lib/semmle/code/cpp/ir/implementation/aliased_ssa/internal/AliasedSSA.qll
index b63a543d9ae..314bc0bc81b 100644
--- a/cpp/ql/lib/semmle/code/cpp/ir/implementation/aliased_ssa/internal/AliasedSSA.qll
+++ b/cpp/ql/lib/semmle/code/cpp/ir/implementation/aliased_ssa/internal/AliasedSSA.qll
@@ -683,8 +683,13 @@ private Overlap getExtentOverlap(MemoryLocation0 def, MemoryLocation0 use) {
     def.getVirtualVariable() = use.getVirtualVariable() and
     def instanceof EntireAllocationMemoryLocation and
     (
-      // EntireAllocationMemoryLocation exactly overlaps itself.
-      use instanceof EntireAllocationMemoryLocation and
+      // EntireAllocationMemoryLocation exactly overlaps any EntireAllocationMemoryLocation for the
+      // same allocation. Checking the allocation, rather than the memory location itself, ensures
+      // that we get the right relationship between the "must" and "may" memory locations for that
+      // allocation.
+      // Note that if one of the locations is a "may" access, the overlap will be downgraded to
+      // `MustTotallyOverlap` or `MayPartialOverlap` in `getOverlap()`.
+      use.(EntireAllocationMemoryLocation).getAnAllocation() = def.getAnAllocation() and
       result instanceof MustExactlyOverlap
       or
       not use instanceof EntireAllocationMemoryLocation and
diff --git a/cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/IRConsistency.qll b/cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/IRConsistency.qll
index edc785dfabe..67a6965ae9b 100644
--- a/cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/IRConsistency.qll
+++ b/cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/IRConsistency.qll
@@ -546,4 +546,26 @@ module InstructionConsistency {
         "' has no associated variable, in function '$@'." and
     irFunc = getInstructionIRFunction(instr, irFuncText)
   }
+
+  query predicate nonBooleanOperand(
+    Instruction instr, string message, OptionalIRFunction irFunc, string irFuncText
+  ) {
+    exists(Instruction unary |
+      unary = instr.(LogicalNotInstruction).getUnary() and
+      not unary.getResultIRType() instanceof IRBooleanType and
+      irFunc = getInstructionIRFunction(instr, irFuncText) and
+      message =
+        "Logical Not instruction " + instr.toString() +
+          " with non-Boolean operand, in function '$@'."
+    )
+    or
+    exists(Instruction cond |
+      cond = instr.(ConditionalBranchInstruction).getCondition() and
+      not cond.getResultIRType() instanceof IRBooleanType and
+      irFunc = getInstructionIRFunction(instr, irFuncText) and
+      message =
+        "Conditional branch instruction " + instr.toString() +
+          " with non-Boolean condition, in function '$@'."
+    )
+  }
 }
diff --git a/cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/PrintIR.qll b/cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/PrintIR.qll
index c4b18d9cb61..7fd66ba8441 100644
--- a/cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/PrintIR.qll
+++ b/cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/PrintIR.qll
@@ -6,6 +6,112 @@
  * uses, however, it is better to write a query that imports `PrintIR.qll`, extends
  * `PrintIRConfiguration`, and overrides `shouldPrintDeclaration()` to select a subset of declarations
  * to dump.
+ *
+ * Anatomy of a printed IR instruction
+ *
+ * An instruction:
+ *
+ * ```
+ * # 2281|     v2281_19(void) = Call[~String]     : func:r2281_18, this:r2281_17
+ * ```
+ *
+ * The prefix `# 2281|` specifies that this instruction was generated by the C++ source code on line 2281.
+ * Scrolling up in the printed output, one will eventually find the name of the file to which the line
+ * belongs.
+ *
+ * `v2281_19(void)` is the result of the instruction. Here, `v` means this is a void result or operand (so
+ * there should be no later uses of the result; see below for other possible values). The `2281_19` is a
+ * unique ID for the result. This is usually just the line number plus a small integer suffix to make it
+ * unique within the function. The type of the result is `void`. In this case, it is `void`, because
+ * `~String` returns `void`. The type of the result is usually just the name of the appropriate C++ type,
+ * but it will sometimes be a type like `glval<int>`, which means result holds a glvalue, which at the
+ * IR level works like a pointer. In other words, in the source code the type was `int`, but it is really
+ * more like an `int*`. We see this, for example, in `x = y;`, where `x` is a glvalue.
+ *
+ * `Call` is the opcode of the instruction. Common opcodes include:
+ *
+ * * Arithmetic operations: `Add`, `Sub`, `Mul`, etc.
+ * * Memory access operations: `Load`, `Store`.
+ * * Function calls: `Call`.
+ * * Literals: `Constant`.
+ * * Variable addresses: `VariableAddress`.
+ * * Function entry points: `EnterFunction`.
+ * * Return from a function: `Return`, `ReturnVoid`. Note that the value being returned is set separately by a
+ *   `Store` to a special `#return` variable.
+ * * Stack unwinding for C++ function that throw and where the exception escapes the function: `Unwind`.
+ * * Common exit point for `Unwind` and `Return`: `ExitFunction`.
+ * * SSA-related opcodes: `Phi`, `Chi`.
+ *
+ * `[~String]` denotes additional information. The information might be present earlier in the IR, as is the case
+ * for `Call`, where it is the name of the called function. This is also the case for `Load` and `Store`, where it
+ * is the name of the variable that loaded or stored (if known). In the case of `Constant`, `FieldAddress`, and
+ * `VariableAddress`, the information between brackets does not occur earlier.
+ *
+ * `func:r2281_18` and `this:r28281_17` are the operands of the instruction. The `func:` prefix denotes the operand
+ * that holds the address of the called function. The `this:` prefix denotes the argument to the special `this`
+ * parameter of an instance member function. `r2281_18`, `r2281_17` are the unique IDs of the operands. Each of these
+ * matches the ID of a previously seen result, showing where that value came from. The `r` means that these are
+ * "register" operands (see below).
+ *
+ * Result and operand kinds:
+ *
+ * Every result and operand is one of these three kinds:
+ *
+ * * `r` "register". These operands are not stored in any particular memory location. We can think of them as
+ *   temporary values created during the evaluation of an expression. A register operand almost always has one
+ *   use, often in the same block as its definition.
+ * *  `m` "memory". These operands represents accesses to a specific memory location. The location could be a
+ *    local variable, a global variable, a field of an object, an element of an array, or any memory that we happen
+ *    to have a pointer to. These only occur as the result of a `Store`, the source operand of a `Load` or on the
+ *    SSA instructions (`Phi`, `Chi`).
+ * * `v` "void". Really just a register operand, but we mark register operands of type void with this special prefix
+ *   so we know that there is no actual value there.
+ *
+ * Branches in the IR:
+ *
+ * The IR is divided into basic blocks. At the end of each block, there are one or more edges showing the possible
+ * control flow successors of the block.
+ *
+ * ```
+ * #   44|     v44_3(void)    = ConditionalBranch : r44_2
+ * #-----|   False -> Block 4
+ * #-----|   True -> Block 3
+ * ```
+ * Here we have a block that ends with a conditional branch. The two edges show where the control flows to depending
+ * on whether the condition is true or false.
+ *
+ * SSA instructions:
+ *
+ * We use `Phi` instructions in SSA to create a single definition for a variable that might be assigned on multiple
+ * control flow paths. The `Phi` instruction merges the potential values of that variable from each predecessor edge,
+ * and the resulting definition is then used wherever that variable is accessed later on.
+ *
+ * When dealing with aliased memory, we use the `Chi` instruction to create a single definition for memory that might
+ * or might not have been updated by a store, depending on the actual address that was written to. For example, take:
+ *
+ * ```cpp
+ * int x = 5;
+ * int y = 7;
+ * int* p = condition ? &x : &y;
+ * *p = 6;
+ * return x;
+ * ```
+ *
+ * At the point where we store to `*p`, we do not know whether `p` points to `x` or `y`. Thus, we do not know whether
+ * `return x;` is going to return the value that `x` was originally initialized to (5), or whether it will return 6,
+ *  because it was overwritten by `*p = 6;`. We insert a `Chi` instruction immediately after the store to `*p`:
+ *
+ * ```
+ * r2(int)     = Constant[6]
+ * r3(int*)    = <<value of p>>
+ * m4(int)     = Store           : &r3, r2  // Stores the constant 6 to *p
+ * m5(unknown) = Chi             : total:m1, partial:m4
+ * ```
+ * The `partial:` operand represents the memory that was just stored. The `total:` operand represents the previous
+ * contents of all of the memory that `p` might have pointed to (in this case, both `x` and `y`). The result of the
+ * `Chi` represents the new contents of whatever memory the `total:` operand referred to. We usually do not know exactly
+ * which parts of that memory were overwritten, but it does model that any of that memory could have been modified, so
+ * that later instructions do not assume that the memory was unchanged.
  */
 
 private import internal.IRInternal
diff --git a/cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/internal/TranslatedElement.qll b/cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/internal/TranslatedElement.qll
index 0f9bc370f7a..8e7e46c94c6 100644
--- a/cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/internal/TranslatedElement.qll
+++ b/cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/internal/TranslatedElement.qll
@@ -196,6 +196,8 @@ private predicate isInvalidFunction(Function func) {
     expr.getEnclosingFunction() = func and
     not exists(expr.getType())
   )
+  or
+  count(func.getEntryPoint().getLocation()) > 1
 }
 
 /**
diff --git a/cpp/ql/lib/semmle/code/cpp/ir/implementation/unaliased_ssa/IRConsistency.qll b/cpp/ql/lib/semmle/code/cpp/ir/implementation/unaliased_ssa/IRConsistency.qll
index edc785dfabe..67a6965ae9b 100644
--- a/cpp/ql/lib/semmle/code/cpp/ir/implementation/unaliased_ssa/IRConsistency.qll
+++ b/cpp/ql/lib/semmle/code/cpp/ir/implementation/unaliased_ssa/IRConsistency.qll
@@ -546,4 +546,26 @@ module InstructionConsistency {
         "' has no associated variable, in function '$@'." and
     irFunc = getInstructionIRFunction(instr, irFuncText)
   }
+
+  query predicate nonBooleanOperand(
+    Instruction instr, string message, OptionalIRFunction irFunc, string irFuncText
+  ) {
+    exists(Instruction unary |
+      unary = instr.(LogicalNotInstruction).getUnary() and
+      not unary.getResultIRType() instanceof IRBooleanType and
+      irFunc = getInstructionIRFunction(instr, irFuncText) and
+      message =
+        "Logical Not instruction " + instr.toString() +
+          " with non-Boolean operand, in function '$@'."
+    )
+    or
+    exists(Instruction cond |
+      cond = instr.(ConditionalBranchInstruction).getCondition() and
+      not cond.getResultIRType() instanceof IRBooleanType and
+      irFunc = getInstructionIRFunction(instr, irFuncText) and
+      message =
+        "Conditional branch instruction " + instr.toString() +
+          " with non-Boolean condition, in function '$@'."
+    )
+  }
 }
diff --git a/cpp/ql/lib/semmle/code/cpp/ir/implementation/unaliased_ssa/PrintIR.qll b/cpp/ql/lib/semmle/code/cpp/ir/implementation/unaliased_ssa/PrintIR.qll
index c4b18d9cb61..7fd66ba8441 100644
--- a/cpp/ql/lib/semmle/code/cpp/ir/implementation/unaliased_ssa/PrintIR.qll
+++ b/cpp/ql/lib/semmle/code/cpp/ir/implementation/unaliased_ssa/PrintIR.qll
@@ -6,6 +6,112 @@
  * uses, however, it is better to write a query that imports `PrintIR.qll`, extends
  * `PrintIRConfiguration`, and overrides `shouldPrintDeclaration()` to select a subset of declarations
  * to dump.
+ *
+ * Anatomy of a printed IR instruction
+ *
+ * An instruction:
+ *
+ * ```
+ * # 2281|     v2281_19(void) = Call[~String]     : func:r2281_18, this:r2281_17
+ * ```
+ *
+ * The prefix `# 2281|` specifies that this instruction was generated by the C++ source code on line 2281.
+ * Scrolling up in the printed output, one will eventually find the name of the file to which the line
+ * belongs.
+ *
+ * `v2281_19(void)` is the result of the instruction. Here, `v` means this is a void result or operand (so
+ * there should be no later uses of the result; see below for other possible values). The `2281_19` is a
+ * unique ID for the result. This is usually just the line number plus a small integer suffix to make it
+ * unique within the function. The type of the result is `void`. In this case, it is `void`, because
+ * `~String` returns `void`. The type of the result is usually just the name of the appropriate C++ type,
+ * but it will sometimes be a type like `glval<int>`, which means result holds a glvalue, which at the
+ * IR level works like a pointer. In other words, in the source code the type was `int`, but it is really
+ * more like an `int*`. We see this, for example, in `x = y;`, where `x` is a glvalue.
+ *
+ * `Call` is the opcode of the instruction. Common opcodes include:
+ *
+ * * Arithmetic operations: `Add`, `Sub`, `Mul`, etc.
+ * * Memory access operations: `Load`, `Store`.
+ * * Function calls: `Call`.
+ * * Literals: `Constant`.
+ * * Variable addresses: `VariableAddress`.
+ * * Function entry points: `EnterFunction`.
+ * * Return from a function: `Return`, `ReturnVoid`. Note that the value being returned is set separately by a
+ *   `Store` to a special `#return` variable.
+ * * Stack unwinding for C++ function that throw and where the exception escapes the function: `Unwind`.
+ * * Common exit point for `Unwind` and `Return`: `ExitFunction`.
+ * * SSA-related opcodes: `Phi`, `Chi`.
+ *
+ * `[~String]` denotes additional information. The information might be present earlier in the IR, as is the case
+ * for `Call`, where it is the name of the called function. This is also the case for `Load` and `Store`, where it
+ * is the name of the variable that loaded or stored (if known). In the case of `Constant`, `FieldAddress`, and
+ * `VariableAddress`, the information between brackets does not occur earlier.
+ *
+ * `func:r2281_18` and `this:r28281_17` are the operands of the instruction. The `func:` prefix denotes the operand
+ * that holds the address of the called function. The `this:` prefix denotes the argument to the special `this`
+ * parameter of an instance member function. `r2281_18`, `r2281_17` are the unique IDs of the operands. Each of these
+ * matches the ID of a previously seen result, showing where that value came from. The `r` means that these are
+ * "register" operands (see below).
+ *
+ * Result and operand kinds:
+ *
+ * Every result and operand is one of these three kinds:
+ *
+ * * `r` "register". These operands are not stored in any particular memory location. We can think of them as
+ *   temporary values created during the evaluation of an expression. A register operand almost always has one
+ *   use, often in the same block as its definition.
+ * *  `m` "memory". These operands represents accesses to a specific memory location. The location could be a
+ *    local variable, a global variable, a field of an object, an element of an array, or any memory that we happen
+ *    to have a pointer to. These only occur as the result of a `Store`, the source operand of a `Load` or on the
+ *    SSA instructions (`Phi`, `Chi`).
+ * * `v` "void". Really just a register operand, but we mark register operands of type void with this special prefix
+ *   so we know that there is no actual value there.
+ *
+ * Branches in the IR:
+ *
+ * The IR is divided into basic blocks. At the end of each block, there are one or more edges showing the possible
+ * control flow successors of the block.
+ *
+ * ```
+ * #   44|     v44_3(void)    = ConditionalBranch : r44_2
+ * #-----|   False -> Block 4
+ * #-----|   True -> Block 3
+ * ```
+ * Here we have a block that ends with a conditional branch. The two edges show where the control flows to depending
+ * on whether the condition is true or false.
+ *
+ * SSA instructions:
+ *
+ * We use `Phi` instructions in SSA to create a single definition for a variable that might be assigned on multiple
+ * control flow paths. The `Phi` instruction merges the potential values of that variable from each predecessor edge,
+ * and the resulting definition is then used wherever that variable is accessed later on.
+ *
+ * When dealing with aliased memory, we use the `Chi` instruction to create a single definition for memory that might
+ * or might not have been updated by a store, depending on the actual address that was written to. For example, take:
+ *
+ * ```cpp
+ * int x = 5;
+ * int y = 7;
+ * int* p = condition ? &x : &y;
+ * *p = 6;
+ * return x;
+ * ```
+ *
+ * At the point where we store to `*p`, we do not know whether `p` points to `x` or `y`. Thus, we do not know whether
+ * `return x;` is going to return the value that `x` was originally initialized to (5), or whether it will return 6,
+ *  because it was overwritten by `*p = 6;`. We insert a `Chi` instruction immediately after the store to `*p`:
+ *
+ * ```
+ * r2(int)     = Constant[6]
+ * r3(int*)    = <<value of p>>
+ * m4(int)     = Store           : &r3, r2  // Stores the constant 6 to *p
+ * m5(unknown) = Chi             : total:m1, partial:m4
+ * ```
+ * The `partial:` operand represents the memory that was just stored. The `total:` operand represents the previous
+ * contents of all of the memory that `p` might have pointed to (in this case, both `x` and `y`). The result of the
+ * `Chi` represents the new contents of whatever memory the `total:` operand referred to. We usually do not know exactly
+ * which parts of that memory were overwritten, but it does model that any of that memory could have been modified, so
+ * that later instructions do not assume that the memory was unchanged.
  */
 
 private import internal.IRInternal
diff --git a/cpp/ql/lib/semmle/code/cpp/models/implementations/Fopen.qll b/cpp/ql/lib/semmle/code/cpp/models/implementations/Fopen.qll
index 6bc700becf1..fc6ceb321c1 100644
--- a/cpp/ql/lib/semmle/code/cpp/models/implementations/Fopen.qll
+++ b/cpp/ql/lib/semmle/code/cpp/models/implementations/Fopen.qll
@@ -7,7 +7,7 @@ import semmle.code.cpp.models.interfaces.Alias
 import semmle.code.cpp.models.interfaces.SideEffect
 
 /** The function `fopen` and friends. */
-private class Fopen extends Function, AliasFunction, SideEffectFunction {
+private class Fopen extends Function, AliasFunction, SideEffectFunction, TaintFunction {
   Fopen() {
     this.hasGlobalOrStdName(["fopen", "fopen_s", "freopen"])
     or
@@ -47,4 +47,22 @@ private class Fopen extends Function, AliasFunction, SideEffectFunction {
     i = 0 and
     buffer = true
   }
+
+  override predicate hasTaintFlow(FunctionInput input, FunctionOutput output) {
+    (
+      this.hasGlobalOrStdName(["fopen", "freopen"]) or
+      this.hasGlobalName(["_wfopen", "_fsopen", "_wfsopen"])
+    ) and
+    input.isParameterDeref(0) and
+    output.isReturnValueDeref()
+    or
+    // The out parameter is a pointer to a `FILE*`.
+    this.hasGlobalOrStdName("fopen_s") and
+    input.isParameterDeref(1) and
+    output.isParameterDeref(0, 2)
+    or
+    this.hasGlobalName(["_open", "_wopen"]) and
+    input.isParameterDeref(0) and
+    output.isReturnValue()
+  }
 }
diff --git a/cpp/ql/lib/semmle/code/cpp/models/implementations/Printf.qll b/cpp/ql/lib/semmle/code/cpp/models/implementations/Printf.qll
index 7286552e3ee..9c3bfb4f35e 100644
--- a/cpp/ql/lib/semmle/code/cpp/models/implementations/Printf.qll
+++ b/cpp/ql/lib/semmle/code/cpp/models/implementations/Printf.qll
@@ -91,7 +91,7 @@ private class Sprintf extends FormattingFunction, NonThrowingFunction {
   override int getFirstFormatArgumentIndex() {
     if this.hasName("__builtin___sprintf_chk")
     then result = 4
-    else result = this.getNumberOfParameters()
+    else result = super.getFirstFormatArgumentIndex()
   }
 }
 
diff --git a/cpp/ql/lib/semmle/code/cpp/models/interfaces/FormattingFunction.qll b/cpp/ql/lib/semmle/code/cpp/models/interfaces/FormattingFunction.qll
index 7c1ea723193..ce65a65319a 100644
--- a/cpp/ql/lib/semmle/code/cpp/models/interfaces/FormattingFunction.qll
+++ b/cpp/ql/lib/semmle/code/cpp/models/interfaces/FormattingFunction.qll
@@ -42,6 +42,21 @@ private Type getAFormatterWideTypeOrDefault() {
  * A standard library function that uses a `printf`-like formatting string.
  */
 abstract class FormattingFunction extends ArrayFunction, TaintFunction {
+  int firstFormatArgumentIndex;
+
+  FormattingFunction() {
+    firstFormatArgumentIndex > 0 and
+    if this.hasDefinition()
+    then firstFormatArgumentIndex = this.getDefinition().getNumberOfParameters()
+    else
+      if this instanceof BuiltInFunction
+      then firstFormatArgumentIndex = this.getNumberOfParameters()
+      else
+        forex(FunctionDeclarationEntry fde | fde = this.getAnExplicitDeclarationEntry() |
+          firstFormatArgumentIndex = fde.getNumberOfParameters()
+        )
+  }
+
   /** Gets the position at which the format parameter occurs. */
   abstract int getFormatParameterIndex();
 
@@ -118,21 +133,10 @@ abstract class FormattingFunction extends ArrayFunction, TaintFunction {
 
   /**
    * Gets the position of the first format argument, corresponding with
-   * the first format specifier in the format string.
+   * the first format specifier in the format string. We ignore all
+   * implicit function definitions.
    */
-  int getFirstFormatArgumentIndex() {
-    result = this.getNumberOfParameters() and
-    // the formatting function either has a definition in the snapshot, or all
-    // `DeclarationEntry`s agree on the number of parameters (otherwise we don't
-    // really know the correct number)
-    (
-      this.hasDefinition()
-      or
-      forall(FunctionDeclarationEntry fde | fde = this.getADeclarationEntry() |
-        result = fde.getNumberOfParameters()
-      )
-    )
-  }
+  int getFirstFormatArgumentIndex() { result = firstFormatArgumentIndex }
 
   /**
    * Gets the position of the buffer size argument, if any.
diff --git a/cpp/ql/lib/semmle/code/cpp/rangeanalysis/SimpleRangeAnalysis.qll b/cpp/ql/lib/semmle/code/cpp/rangeanalysis/SimpleRangeAnalysis.qll
index 1ce7a6a4f5a..990def8b2f1 100644
--- a/cpp/ql/lib/semmle/code/cpp/rangeanalysis/SimpleRangeAnalysis.qll
+++ b/cpp/ql/lib/semmle/code/cpp/rangeanalysis/SimpleRangeAnalysis.qll
@@ -192,6 +192,37 @@ private class UnsignedMulExpr extends MulExpr {
   }
 }
 
+/**
+ * Gets the value of the `EOF` macro.
+ *
+ * This is typically `"-1"`, but this is not guaranteed to be the case on all
+ * systems.
+ */
+private int getEofValue() {
+  exists(MacroInvocation mi |
+    mi.getMacroName() = "EOF" and
+    result = unique( | | mi.getExpr().getValue().toInt())
+  )
+}
+
+/** Get standard `getc` function or related variants. */
+private class Getc extends Function {
+  Getc() { this.hasGlobalOrStdOrBslName(["fgetc", "getc"]) }
+}
+
+/** A call to `getc` */
+private class CallToGetc extends FunctionCall {
+  CallToGetc() { this.getTarget() instanceof Getc }
+}
+
+/**
+ * A call to `getc` that we can analyze because we know
+ * the value of the `EOF` macro.
+ */
+private class AnalyzableCallToGetc extends CallToGetc {
+  AnalyzableCallToGetc() { exists(getEofValue()) }
+}
+
 /**
  * Holds if `expr` is effectively a multiplication of `operand` with the
  * positive constant `positive`.
@@ -287,6 +318,8 @@ private predicate analyzableExpr(Expr e) {
     or
     e instanceof RemExpr
     or
+    e instanceof AnalyzableCallToGetc
+    or
     // A conversion is analyzable, provided that its child has an arithmetic
     // type. (Sometimes the child is a reference type, and so does not get
     // any bounds.) Rather than checking whether the type of the child is
@@ -861,6 +894,14 @@ private float getLowerBoundsImpl(Expr expr) {
       )
     )
     or
+    exists(AnalyzableCallToGetc getc |
+      expr = getc and
+      // from https://en.cppreference.com/w/c/io/fgetc:
+      // On success, returns the obtained character as an unsigned char
+      // converted to an int. On failure, returns EOF.
+      result = min([typeLowerBound(any(UnsignedCharType pct)), getEofValue()])
+    )
+    or
     // If the conversion is to an arithmetic type then we just return the
     // lower bound of the child. We do not need to handle truncation and
     // overflow here, because that is done in `getTruncatedLowerBounds`.
@@ -1055,6 +1096,14 @@ private float getUpperBoundsImpl(Expr expr) {
       )
     )
     or
+    exists(AnalyzableCallToGetc getc |
+      expr = getc and
+      // from https://en.cppreference.com/w/c/io/fgetc:
+      // On success, returns the obtained character as an unsigned char
+      // converted to an int. On failure, returns EOF.
+      result = max([typeUpperBound(any(UnsignedCharType pct)), getEofValue()])
+    )
+    or
     // If the conversion is to an arithmetic type then we just return the
     // upper bound of the child. We do not need to handle truncation and
     // overflow here, because that is done in `getTruncatedUpperBounds`.
diff --git a/cpp/ql/lib/semmle/code/cpp/security/InvalidPointerDereference/InvalidPointerToDereference.qll b/cpp/ql/lib/semmle/code/cpp/security/InvalidPointerDereference/InvalidPointerToDereference.qll
index 90d7f04f7ca..03369aacade 100644
--- a/cpp/ql/lib/semmle/code/cpp/security/InvalidPointerDereference/InvalidPointerToDereference.qll
+++ b/cpp/ql/lib/semmle/code/cpp/security/InvalidPointerDereference/InvalidPointerToDereference.qll
@@ -160,6 +160,26 @@ private module InvalidPointerToDerefBarrier {
   }
 }
 
+/**
+ * BEWARE: This configuration uses an unrestricted sink, so accessing its full
+ * flow computation or any stages beyond the first 2 will likely diverge.
+ * Stage 1 will still be fast and we use it to restrict the subsequent sink
+ * computation.
+ */
+private module InvalidPointerReachesConfig implements DataFlow::ConfigSig {
+  predicate isSource(DataFlow::Node source) { invalidPointerToDerefSource(_, _, source) }
+
+  predicate isSink(DataFlow::Node sink) { any() }
+
+  predicate isBarrier(DataFlow::Node node) { InvalidPointerToDerefConfig::isBarrier(node) }
+
+  int fieldFlowBranchLimit() { result = invalidPointerToDereferenceFieldFlowBranchLimit() }
+}
+
+private module InvalidPointerReachesFlow = DataFlow::Global<InvalidPointerReachesConfig>;
+
+private import semmle.code.cpp.ir.dataflow.internal.DataFlowImplCommon as DataFlowImplCommon
+
 /**
  * A configuration to track flow from a pointer-arithmetic operation found
  * by `AllocToInvalidPointerConfig` to a dereference of the pointer.
@@ -173,8 +193,13 @@ private module InvalidPointerToDerefConfig implements DataFlow::StateConfigSig {
     invalidPointerToDerefSource(_, pai, source)
   }
 
-  pragma[inline]
-  predicate isSink(DataFlow::Node sink) { isInvalidPointerDerefSink(sink, _, _, _, _) }
+  predicate isSink(DataFlow::Node sink) {
+    exists(DataFlowImplCommon::NodeEx n |
+      InvalidPointerReachesFlow::Stages::Stage1::sinkNode(n, _) and
+      n.asNode() = sink and
+      isInvalidPointerDerefSink(sink, _, _, _, _)
+    )
+  }
 
   predicate isSink(DataFlow::Node sink, FlowState pai) { none() }
 
diff --git a/cpp/ql/lib/semmle/code/cpp/security/flowafterfree/FlowAfterFree.qll b/cpp/ql/lib/semmle/code/cpp/security/flowafterfree/FlowAfterFree.qll
index 1103ff93a1c..e6a037a9431 100644
--- a/cpp/ql/lib/semmle/code/cpp/security/flowafterfree/FlowAfterFree.qll
+++ b/cpp/ql/lib/semmle/code/cpp/security/flowafterfree/FlowAfterFree.qll
@@ -72,7 +72,6 @@ module FlowFromFree<FlowFromFreeParamSig P> {
 
     predicate isSource(DataFlow::Node node, FlowState state) { isFree(node, _, state, _) }
 
-    pragma[inline]
     predicate isSink(DataFlow::Node sink, FlowState state) {
       exists(Expr e, DataFlow::Node source, DeallocationExpr dealloc |
         P::isSink(sink, e) and
diff --git a/cpp/ql/lib/semmlecode.cpp.dbscheme b/cpp/ql/lib/semmlecode.cpp.dbscheme
index 7ff6a6e53db..e51fad7a243 100644
--- a/cpp/ql/lib/semmlecode.cpp.dbscheme
+++ b/cpp/ql/lib/semmlecode.cpp.dbscheme
@@ -534,7 +534,7 @@ static_asserts(
 #keyset[function, index, type_id]
 params(
     int id: @parameter,
-    int function: @functionorblock ref,
+    int function: @parameterized_element ref,
     int index: int ref,
     int type_id: @type ref
 );
@@ -1790,6 +1790,10 @@ case @expr.kind of
 | 387 = @istriviallyrelocatable
 | 388 = @datasizeof
 | 389 = @c11_generic
+| 390 = @requires_expr
+| 391 = @nested_requirement
+| 392 = @compound_requirement
+| 393 = @concept_id
 ;
 
 @var_args_expr = @vastartexpr
@@ -1908,6 +1912,10 @@ case @expr.kind of
             | @istriviallyrelocatable
             ;
 
+compound_requirement_is_noexcept(
+    int expr: @compound_requirement ref
+);
+
 new_allocated_type(
     unique int expr: @new_expr ref,
     int type_id: @type ref
@@ -2167,11 +2175,11 @@ stmt_decl_entry_bind(
     int decl_entry: @element ref
 );
 
-@functionorblock = @function | @stmt_block;
+@parameterized_element = @function | @stmt_block | @requires_expr;
 
 blockscope(
     unique int block: @stmt_block ref,
-    int enclosing: @functionorblock ref
+    int enclosing: @parameterized_element ref
 );
 
 @jump = @stmt_goto | @stmt_break | @stmt_continue;
diff --git a/cpp/ql/lib/semmlecode.cpp.dbscheme.stats b/cpp/ql/lib/semmlecode.cpp.dbscheme.stats
index 07045b0bd67..7f0d99272e7 100644
--- a/cpp/ql/lib/semmlecode.cpp.dbscheme.stats
+++ b/cpp/ql/lib/semmlecode.cpp.dbscheme.stats
@@ -18,15 +18,15 @@
         </e>
         <e>
             <k>@location_default</k>
-            <v>29765023</v>
+            <v>29764890</v>
         </e>
         <e>
             <k>@location_stmt</k>
-            <v>3819884</v>
+            <v>3819867</v>
         </e>
         <e>
             <k>@location_expr</k>
-            <v>13187951</v>
+            <v>13187892</v>
         </e>
         <e>
             <k>@diagnostic</k>
@@ -34,7 +34,7 @@
         </e>
         <e>
             <k>@file</k>
-            <v>123252</v>
+            <v>123251</v>
         </e>
         <e>
             <k>@folder</k>
@@ -42,35 +42,35 @@
         </e>
         <e>
             <k>@macro_expansion</k>
-            <v>33257908</v>
+            <v>33257760</v>
         </e>
         <e>
             <k>@other_macro_reference</k>
-            <v>859032</v>
+            <v>859029</v>
         </e>
         <e>
             <k>@function</k>
-            <v>4179381</v>
+            <v>4179363</v>
         </e>
         <e>
             <k>@fun_decl</k>
-            <v>4543537</v>
+            <v>4543516</v>
         </e>
         <e>
             <k>@var_decl</k>
-            <v>8039427</v>
+            <v>8039391</v>
         </e>
         <e>
             <k>@type_decl</k>
-            <v>3283466</v>
+            <v>3283451</v>
         </e>
         <e>
             <k>@namespace_decl</k>
-            <v>311638</v>
+            <v>311636</v>
         </e>
         <e>
             <k>@using_declaration</k>
-            <v>363221</v>
+            <v>363219</v>
         </e>
         <e>
             <k>@using_directive</k>
@@ -82,15 +82,15 @@
         </e>
         <e>
             <k>@static_assert</k>
-            <v>134702</v>
+            <v>134701</v>
         </e>
         <e>
             <k>@parameter</k>
-            <v>6190639</v>
+            <v>6190611</v>
         </e>
         <e>
             <k>@membervariable</k>
-            <v>1054697</v>
+            <v>1054692</v>
         </e>
         <e>
             <k>@globalvariable</k>
@@ -98,11 +98,11 @@
         </e>
         <e>
             <k>@localvariable</k>
-            <v>576946</v>
+            <v>576945</v>
         </e>
         <e>
             <k>@enumconstant</k>
-            <v>241670</v>
+            <v>241669</v>
         </e>
         <e>
             <k>@errortype</k>
@@ -330,23 +330,23 @@
         </e>
         <e>
             <k>@pointer</k>
-            <v>568175</v>
+            <v>568173</v>
         </e>
         <e>
             <k>@type_with_specifiers</k>
-            <v>852029</v>
+            <v>852026</v>
         </e>
         <e>
             <k>@array</k>
-            <v>110180</v>
+            <v>110179</v>
         </e>
         <e>
             <k>@routineptr</k>
-            <v>625429</v>
+            <v>625424</v>
         </e>
         <e>
             <k>@reference</k>
-            <v>1276410</v>
+            <v>1276405</v>
         </e>
         <e>
             <k>@gnu_vector</k>
@@ -358,7 +358,7 @@
         </e>
         <e>
             <k>@rvalue_reference</k>
-            <v>333342</v>
+            <v>333340</v>
         </e>
         <e>
             <k>@block</k>
@@ -370,23 +370,23 @@
         </e>
         <e>
             <k>@usertype</k>
-            <v>5234965</v>
+            <v>5234008</v>
         </e>
         <e>
             <k>@mangledname</k>
-            <v>6061784</v>
+            <v>6061757</v>
         </e>
         <e>
             <k>@type_mention</k>
-            <v>4029136</v>
+            <v>4029118</v>
         </e>
         <e>
             <k>@routinetype</k>
-            <v>538824</v>
+            <v>538889</v>
         </e>
         <e>
             <k>@ptrtomember</k>
-            <v>37816</v>
+            <v>37815</v>
         </e>
         <e>
             <k>@specifier</k>
@@ -394,15 +394,15 @@
         </e>
         <e>
             <k>@gnuattribute</k>
-            <v>553702</v>
+            <v>553700</v>
         </e>
         <e>
             <k>@stdattribute</k>
-            <v>253563</v>
+            <v>253562</v>
         </e>
         <e>
             <k>@declspec</k>
-            <v>239153</v>
+            <v>239152</v>
         </e>
         <e>
             <k>@msattribute</k>
@@ -418,7 +418,7 @@
         </e>
         <e>
             <k>@attribute_arg_constant_expr</k>
-            <v>318402</v>
+            <v>318400</v>
         </e>
         <e>
             <k>@attribute_arg_empty</k>
@@ -438,15 +438,15 @@
         </e>
         <e>
             <k>@derivation</k>
-            <v>391568</v>
+            <v>391564</v>
         </e>
         <e>
             <k>@frienddecl</k>
-            <v>707052</v>
+            <v>707046</v>
         </e>
         <e>
             <k>@comment</k>
-            <v>8266137</v>
+            <v>8266100</v>
         </e>
         <e>
             <k>@namespace</k>
@@ -458,15 +458,15 @@
         </e>
         <e>
             <k>@namequalifier</k>
-            <v>1513800</v>
+            <v>1513793</v>
         </e>
         <e>
             <k>@value</k>
-            <v>10776699</v>
+            <v>10776651</v>
         </e>
         <e>
             <k>@initialiser</k>
-            <v>1710781</v>
+            <v>1710773</v>
         </e>
         <e>
             <k>@address_of</k>
@@ -474,15 +474,15 @@
         </e>
         <e>
             <k>@indirect</k>
-            <v>292646</v>
+            <v>292644</v>
         </e>
         <e>
             <k>@array_to_pointer</k>
-            <v>1430838</v>
+            <v>1430832</v>
         </e>
         <e>
             <k>@parexpr</k>
-            <v>3587479</v>
+            <v>3587463</v>
         </e>
         <e>
             <k>@arithnegexpr</k>
@@ -498,7 +498,7 @@
         </e>
         <e>
             <k>@notexpr</k>
-            <v>276425</v>
+            <v>276424</v>
         </e>
         <e>
             <k>@postincrexpr</k>
@@ -518,19 +518,19 @@
         </e>
         <e>
             <k>@conditionalexpr</k>
-            <v>657237</v>
+            <v>657235</v>
         </e>
         <e>
             <k>@addexpr</k>
-            <v>398394</v>
+            <v>398392</v>
         </e>
         <e>
             <k>@subexpr</k>
-            <v>340758</v>
+            <v>340757</v>
         </e>
         <e>
             <k>@mulexpr</k>
-            <v>306356</v>
+            <v>306355</v>
         </e>
         <e>
             <k>@divexpr</k>
@@ -542,7 +542,7 @@
         </e>
         <e>
             <k>@paddexpr</k>
-            <v>86662</v>
+            <v>86661</v>
         </e>
         <e>
             <k>@psubexpr</k>
@@ -554,35 +554,35 @@
         </e>
         <e>
             <k>@lshiftexpr</k>
-            <v>566303</v>
+            <v>566300</v>
         </e>
         <e>
             <k>@rshiftexpr</k>
-            <v>140840</v>
+            <v>140839</v>
         </e>
         <e>
             <k>@andexpr</k>
-            <v>489056</v>
+            <v>489054</v>
         </e>
         <e>
             <k>@orexpr</k>
-            <v>145465</v>
+            <v>145464</v>
         </e>
         <e>
             <k>@xorexpr</k>
-            <v>54175</v>
+            <v>54174</v>
         </e>
         <e>
             <k>@eqexpr</k>
-            <v>470650</v>
+            <v>470648</v>
         </e>
         <e>
             <k>@neexpr</k>
-            <v>301667</v>
+            <v>301666</v>
         </e>
         <e>
             <k>@gtexpr</k>
-            <v>104111</v>
+            <v>104110</v>
         </e>
         <e>
             <k>@ltexpr</k>
@@ -590,15 +590,15 @@
         </e>
         <e>
             <k>@geexpr</k>
-            <v>59249</v>
+            <v>59248</v>
         </e>
         <e>
             <k>@leexpr</k>
-            <v>212526</v>
+            <v>212525</v>
         </e>
         <e>
             <k>@assignexpr</k>
-            <v>936957</v>
+            <v>936952</v>
         </e>
         <e>
             <k>@assignaddexpr</k>
@@ -614,7 +614,7 @@
         </e>
         <e>
             <k>@assigndivexpr</k>
-            <v>4994</v>
+            <v>4993</v>
         </e>
         <e>
             <k>@assignremexpr</k>
@@ -638,7 +638,7 @@
         </e>
         <e>
             <k>@assignxorexpr</k>
-            <v>21844</v>
+            <v>21843</v>
         </e>
         <e>
             <k>@assignpaddexpr</k>
@@ -650,23 +650,23 @@
         </e>
         <e>
             <k>@andlogicalexpr</k>
-            <v>249952</v>
+            <v>249951</v>
         </e>
         <e>
             <k>@orlogicalexpr</k>
-            <v>866110</v>
+            <v>866116</v>
         </e>
         <e>
             <k>@commaexpr</k>
-            <v>122841</v>
+            <v>122840</v>
         </e>
         <e>
             <k>@subscriptexpr</k>
-            <v>364478</v>
+            <v>364477</v>
         </e>
         <e>
             <k>@callexpr</k>
-            <v>316534</v>
+            <v>316533</v>
         </e>
         <e>
             <k>@vastartexpr</k>
@@ -686,11 +686,11 @@
         </e>
         <e>
             <k>@varaccess</k>
-            <v>6029127</v>
+            <v>6029100</v>
         </e>
         <e>
             <k>@runtime_sizeof</k>
-            <v>295836</v>
+            <v>295835</v>
         </e>
         <e>
             <k>@runtime_alignof</k>
@@ -698,27 +698,27 @@
         </e>
         <e>
             <k>@expr_stmt</k>
-            <v>94387</v>
+            <v>94386</v>
         </e>
         <e>
             <k>@routineexpr</k>
-            <v>3186314</v>
+            <v>3186299</v>
         </e>
         <e>
             <k>@type_operand</k>
-            <v>1128756</v>
+            <v>1128764</v>
         </e>
         <e>
             <k>@offsetofexpr</k>
-            <v>19993</v>
+            <v>19992</v>
         </e>
         <e>
             <k>@typescompexpr</k>
-            <v>563777</v>
+            <v>563781</v>
         </e>
         <e>
             <k>@literal</k>
-            <v>4406923</v>
+            <v>4406841</v>
         </e>
         <e>
             <k>@aggregateliteral</k>
@@ -730,7 +730,7 @@
         </e>
         <e>
             <k>@temp_init</k>
-            <v>794460</v>
+            <v>794456</v>
         </e>
         <e>
             <k>@errorexpr</k>
@@ -738,11 +738,11 @@
         </e>
         <e>
             <k>@reference_to</k>
-            <v>1572195</v>
+            <v>1572182</v>
         </e>
         <e>
             <k>@ref_indirect</k>
-            <v>1901648</v>
+            <v>1901633</v>
         </e>
         <e>
             <k>@vacuous_destructor_call</k>
@@ -802,7 +802,7 @@
         </e>
         <e>
             <k>@thisaccess</k>
-            <v>1116784</v>
+            <v>1116779</v>
         </e>
         <e>
             <k>@new_expr</k>
@@ -934,7 +934,7 @@
         </e>
         <e>
             <k>@ctordirectinit</k>
-            <v>110607</v>
+            <v>110606</v>
         </e>
         <e>
             <k>@ctorvirtualinit</k>
@@ -942,7 +942,7 @@
         </e>
         <e>
             <k>@ctorfieldinit</k>
-            <v>190976</v>
+            <v>190975</v>
         </e>
         <e>
             <k>@ctordelegatinginit</k>
@@ -962,7 +962,7 @@
         </e>
         <e>
             <k>@static_cast</k>
-            <v>215649</v>
+            <v>215648</v>
         </e>
         <e>
             <k>@reinterpret_cast</k>
@@ -982,7 +982,7 @@
         </e>
         <e>
             <k>@param_ref</k>
-            <v>235619</v>
+            <v>235618</v>
         </e>
         <e>
             <k>@noopexpr</k>
@@ -1086,7 +1086,7 @@
         </e>
         <e>
             <k>@noexceptexpr</k>
-            <v>24641</v>
+            <v>24640</v>
         </e>
         <e>
             <k>@builtinshufflevector</k>
@@ -1258,7 +1258,7 @@
         </e>
         <e>
             <k>@reuseexpr</k>
-            <v>373719</v>
+            <v>373717</v>
         </e>
         <e>
             <k>@istriviallycopyassignable</k>
@@ -1356,25 +1356,41 @@
             <k>@c11_generic</k>
             <v>8</v>
         </e>
+        <e>
+            <k>@requires_expr</k>
+            <v>8</v>
+        </e>
+        <e>
+            <k>@nested_requirement</k>
+            <v>1</v>
+        </e>
+        <e>
+            <k>@compound_requirement</k>
+            <v>2</v>
+        </e>
+        <e>
+            <k>@concept_id</k>
+            <v>2</v>
+        </e>
         <e>
             <k>@lambdacapture</k>
             <v>28011</v>
         </e>
         <e>
             <k>@stmt_expr</k>
-            <v>1486025</v>
+            <v>1486018</v>
         </e>
         <e>
             <k>@stmt_if</k>
-            <v>725914</v>
+            <v>725911</v>
         </e>
         <e>
             <k>@stmt_while</k>
-            <v>29317</v>
+            <v>29316</v>
         </e>
         <e>
             <k>@stmt_goto</k>
-            <v>110691</v>
+            <v>110690</v>
         </e>
         <e>
             <k>@stmt_label</k>
@@ -1382,15 +1398,15 @@
         </e>
         <e>
             <k>@stmt_return</k>
-            <v>1280145</v>
+            <v>1280140</v>
         </e>
         <e>
             <k>@stmt_block</k>
-            <v>1419271</v>
+            <v>1419265</v>
         </e>
         <e>
             <k>@stmt_end_test_while</k>
-            <v>148874</v>
+            <v>148873</v>
         </e>
         <e>
             <k>@stmt_for</k>
@@ -1398,7 +1414,7 @@
         </e>
         <e>
             <k>@stmt_switch_case</k>
-            <v>207501</v>
+            <v>207500</v>
         </e>
         <e>
             <k>@stmt_switch</k>
@@ -1410,11 +1426,11 @@
         </e>
         <e>
             <k>@stmt_decl</k>
-            <v>593124</v>
+            <v>593121</v>
         </e>
         <e>
             <k>@stmt_empty</k>
-            <v>192683</v>
+            <v>192682</v>
         </e>
         <e>
             <k>@stmt_continue</k>
@@ -1450,11 +1466,11 @@
         </e>
         <e>
             <k>@stmt_handler</k>
-            <v>62676</v>
+            <v>62675</v>
         </e>
         <e>
             <k>@stmt_constexpr_if</k>
-            <v>52998</v>
+            <v>52997</v>
         </e>
         <e>
             <k>@stmt_co_return</k>
@@ -1462,15 +1478,15 @@
         </e>
         <e>
             <k>@ppd_if</k>
-            <v>667151</v>
+            <v>667148</v>
         </e>
         <e>
             <k>@ppd_ifdef</k>
-            <v>263312</v>
+            <v>263311</v>
         </e>
         <e>
             <k>@ppd_ifndef</k>
-            <v>266580</v>
+            <v>266579</v>
         </e>
         <e>
             <k>@ppd_elif</k>
@@ -1478,23 +1494,23 @@
         </e>
         <e>
             <k>@ppd_else</k>
-            <v>209155</v>
+            <v>209154</v>
         </e>
         <e>
             <k>@ppd_endif</k>
-            <v>1197043</v>
+            <v>1197038</v>
         </e>
         <e>
             <k>@ppd_plain_include</k>
-            <v>311399</v>
+            <v>311398</v>
         </e>
         <e>
             <k>@ppd_define</k>
-            <v>2291924</v>
+            <v>2291914</v>
         </e>
         <e>
             <k>@ppd_undef</k>
-            <v>258643</v>
+            <v>258642</v>
         </e>
         <e>
             <k>@ppd_include_next</k>
@@ -1510,7 +1526,7 @@
         </e>
         <e>
             <k>@ppd_pragma</k>
-            <v>296710</v>
+            <v>296709</v>
         </e>
         <e>
             <k>@ppd_objc_import</k>
@@ -1600,7 +1616,7 @@
         </relation>
         <relation>
             <name>compilation_args</name>
-            <cardinality>652551</cardinality>
+            <cardinality>652548</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
@@ -2148,7 +2164,7 @@
                 </e>
                 <e>
                     <k>seconds</k>
-                    <v>9149</v>
+                    <v>8429</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -2229,27 +2245,27 @@
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>759</v>
+                                    <v>639</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>239</v>
+                                    <v>359</v>
                                 </b>
                                 <b>
-                                    <a>5</a>
-                                    <b>8</b>
-                                    <v>159</v>
+                                    <a>6</a>
+                                    <b>7</b>
+                                    <v>119</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>10</b>
-                                    <v>119</v>
+                                    <v>159</v>
                                 </b>
                                 <b>
                                     <a>10</a>
                                     <b>11</b>
-                                    <v>159</v>
+                                    <v>119</v>
                                 </b>
                                 <b>
                                     <a>11</a>
@@ -2257,19 +2273,19 @@
                                     <v>159</v>
                                 </b>
                                 <b>
-                                    <a>17</a>
+                                    <a>16</a>
                                     <b>19</b>
                                     <v>159</v>
                                 </b>
                                 <b>
-                                    <a>20</a>
-                                    <b>44</b>
+                                    <a>19</a>
+                                    <b>24</b>
                                     <v>159</v>
                                 </b>
                                 <b>
-                                    <a>50</a>
-                                    <b>92</b>
-                                    <v>79</v>
+                                    <a>40</a>
+                                    <b>89</b>
+                                    <v>119</v>
                                 </b>
                             </bs>
                         </hist>
@@ -2337,42 +2353,42 @@
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>1478</v>
+                                    <v>1438</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>279</v>
+                                    <v>319</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>239</v>
+                                    <v>199</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>7</b>
-                                    <v>479</v>
+                                    <v>439</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>8</b>
-                                    <v>39</v>
+                                    <v>159</v>
                                 </b>
                                 <b>
                                     <a>8</a>
-                                    <b>9</b>
+                                    <b>10</b>
                                     <v>279</v>
                                 </b>
                                 <b>
-                                    <a>9</a>
-                                    <b>24</b>
-                                    <v>239</v>
+                                    <a>10</a>
+                                    <b>26</b>
+                                    <v>279</v>
                                 </b>
                                 <b>
-                                    <a>25</a>
-                                    <b>88</b>
-                                    <v>279</v>
+                                    <a>28</a>
+                                    <b>81</b>
+                                    <v>199</v>
                                 </b>
                             </bs>
                         </hist>
@@ -2420,21 +2436,16 @@
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
+                                    <v>79</v>
+                                </b>
+                                <b>
+                                    <a>125</a>
+                                    <b>126</b>
                                     <v>39</v>
                                 </b>
                                 <b>
-                                    <a>4</a>
-                                    <b>5</b>
-                                    <v>39</v>
-                                </b>
-                                <b>
-                                    <a>124</a>
-                                    <b>125</b>
-                                    <v>39</v>
-                                </b>
-                                <b>
-                                    <a>129</a>
-                                    <b>130</b>
+                                    <a>128</a>
+                                    <b>129</b>
                                     <v>39</v>
                                 </b>
                             </bs>
@@ -2451,27 +2462,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4394</v>
+                                    <v>3635</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>1757</v>
+                                    <v>1917</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>1518</v>
+                                    <v>1558</v>
                                 </b>
                                 <b>
                                     <a>4</a>
-                                    <b>5</b>
-                                    <v>998</v>
+                                    <b>6</b>
+                                    <v>719</v>
                                 </b>
                                 <b>
-                                    <a>5</a>
-                                    <b>46</b>
-                                    <v>479</v>
+                                    <a>6</a>
+                                    <b>48</b>
+                                    <v>599</v>
                                 </b>
                             </bs>
                         </hist>
@@ -2487,32 +2498,37 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4115</v>
+                                    <v>3595</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>1478</v>
+                                    <v>1438</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>1478</v>
+                                    <v>1358</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>799</v>
+                                    <v>639</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>559</v>
+                                    <v>479</v>
                                 </b>
                                 <b>
                                     <a>6</a>
-                                    <b>75</b>
-                                    <v>719</v>
+                                    <b>8</b>
+                                    <v>679</v>
+                                </b>
+                                <b>
+                                    <a>8</a>
+                                    <b>73</b>
+                                    <v>239</v>
                                 </b>
                             </bs>
                         </hist>
@@ -2528,12 +2544,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7910</v>
+                                    <v>6512</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>1238</v>
+                                    <v>1917</v>
                                 </b>
                             </bs>
                         </hist>
@@ -2877,7 +2893,7 @@
                 </e>
                 <e>
                     <k>cpu_seconds</k>
-                    <v>7100</v>
+                    <v>7507</v>
                 </e>
                 <e>
                     <k>elapsed_seconds</k>
@@ -2927,22 +2943,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5655</v>
+                                    <v>6242</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>857</v>
+                                    <v>835</v>
                                 </b>
                                 <b>
                                     <a>3</a>
-                                    <b>7</b>
-                                    <v>553</v>
-                                </b>
-                                <b>
-                                    <a>11</a>
-                                    <b>13</b>
-                                    <v>33</v>
+                                    <b>15</b>
+                                    <v>428</v>
                                 </b>
                             </bs>
                         </hist>
@@ -2958,12 +2969,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6400</v>
+                                    <v>6976</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>699</v>
+                                    <v>530</v>
                                 </b>
                             </bs>
                         </hist>
@@ -2976,49 +2987,64 @@
                         <hist>
                             <budget>12</budget>
                             <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>11</v>
+                                </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>33</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>5</b>
                                     <v>11</v>
                                 </b>
                                 <b>
-                                    <a>8</a>
-                                    <b>9</b>
+                                    <a>3</a>
+                                    <b>4</b>
                                     <v>11</v>
                                 </b>
                                 <b>
-                                    <a>13</a>
-                                    <b>14</b>
-                                    <v>22</v>
-                                </b>
-                                <b>
-                                    <a>51</a>
-                                    <b>52</b>
+                                    <a>6</a>
+                                    <b>7</b>
                                     <v>11</v>
                                 </b>
                                 <b>
-                                    <a>159</a>
-                                    <b>160</b>
+                                    <a>9</a>
+                                    <b>10</b>
                                     <v>11</v>
                                 </b>
                                 <b>
-                                    <a>177</a>
-                                    <b>178</b>
+                                    <a>11</a>
+                                    <b>12</b>
                                     <v>11</v>
                                 </b>
                                 <b>
-                                    <a>185</a>
-                                    <b>186</b>
+                                    <a>16</a>
+                                    <b>17</b>
                                     <v>11</v>
                                 </b>
                                 <b>
-                                    <a>247</a>
-                                    <b>248</b>
+                                    <a>49</a>
+                                    <b>50</b>
+                                    <v>11</v>
+                                </b>
+                                <b>
+                                    <a>154</a>
+                                    <b>155</b>
+                                    <v>11</v>
+                                </b>
+                                <b>
+                                    <a>160</a>
+                                    <b>161</b>
+                                    <v>11</v>
+                                </b>
+                                <b>
+                                    <a>204</a>
+                                    <b>205</b>
+                                    <v>11</v>
+                                </b>
+                                <b>
+                                    <a>248</a>
+                                    <b>249</b>
                                     <v>11</v>
                                 </b>
                             </bs>
@@ -3032,54 +3058,64 @@
                         <hist>
                             <budget>12</budget>
                             <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>11</v>
+                                </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>33</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>5</b>
                                     <v>11</v>
                                 </b>
                                 <b>
-                                    <a>8</a>
-                                    <b>9</b>
+                                    <a>3</a>
+                                    <b>4</b>
                                     <v>11</v>
                                 </b>
                                 <b>
-                                    <a>12</a>
-                                    <b>13</b>
+                                    <a>6</a>
+                                    <b>7</b>
                                     <v>11</v>
                                 </b>
                                 <b>
-                                    <a>13</a>
-                                    <b>14</b>
+                                    <a>9</a>
+                                    <b>10</b>
                                     <v>11</v>
                                 </b>
                                 <b>
-                                    <a>49</a>
-                                    <b>50</b>
+                                    <a>11</a>
+                                    <b>12</b>
                                     <v>11</v>
                                 </b>
                                 <b>
-                                    <a>112</a>
-                                    <b>113</b>
+                                    <a>16</a>
+                                    <b>17</b>
                                     <v>11</v>
                                 </b>
                                 <b>
-                                    <a>124</a>
-                                    <b>125</b>
+                                    <a>47</a>
+                                    <b>48</b>
                                     <v>11</v>
                                 </b>
                                 <b>
-                                    <a>145</a>
-                                    <b>146</b>
+                                    <a>118</a>
+                                    <b>119</b>
                                     <v>11</v>
                                 </b>
                                 <b>
-                                    <a>218</a>
-                                    <b>219</b>
+                                    <a>128</a>
+                                    <b>129</b>
+                                    <v>11</v>
+                                </b>
+                                <b>
+                                    <a>149</a>
+                                    <b>150</b>
+                                    <v>11</v>
+                                </b>
+                                <b>
+                                    <a>222</a>
+                                    <b>223</b>
                                     <v>11</v>
                                 </b>
                             </bs>
@@ -4852,19 +4888,19 @@
         </relation>
         <relation>
             <name>locations_default</name>
-            <cardinality>29765023</cardinality>
+            <cardinality>29764890</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>29765023</v>
+                    <v>29764890</v>
                 </e>
                 <e>
                     <k>container</k>
-                    <v>123252</v>
+                    <v>123251</v>
                 </e>
                 <e>
                     <k>startLine</k>
-                    <v>2095293</v>
+                    <v>2095283</v>
                 </e>
                 <e>
                     <k>startColumn</k>
@@ -4872,11 +4908,11 @@
                 </e>
                 <e>
                     <k>endLine</k>
-                    <v>2099495</v>
+                    <v>2099485</v>
                 </e>
                 <e>
                     <k>endColumn</k>
-                    <v>48087</v>
+                    <v>48086</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -4890,7 +4926,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>29765023</v>
+                                    <v>29764890</v>
                                 </b>
                             </bs>
                         </hist>
@@ -4906,7 +4942,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>29765023</v>
+                                    <v>29764890</v>
                                 </b>
                             </bs>
                         </hist>
@@ -4922,7 +4958,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>29765023</v>
+                                    <v>29764890</v>
                                 </b>
                             </bs>
                         </hist>
@@ -4938,7 +4974,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>29765023</v>
+                                    <v>29764890</v>
                                 </b>
                             </bs>
                         </hist>
@@ -4954,7 +4990,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>29765023</v>
+                                    <v>29764890</v>
                                 </b>
                             </bs>
                         </hist>
@@ -4975,7 +5011,7 @@
                                 <b>
                                     <a>11</a>
                                     <b>18</b>
-                                    <v>10271</v>
+                                    <v>10270</v>
                                 </b>
                                 <b>
                                     <a>18</a>
@@ -5299,7 +5335,7 @@
                                 <b>
                                     <a>18</a>
                                     <b>26</b>
-                                    <v>10271</v>
+                                    <v>10270</v>
                                 </b>
                                 <b>
                                     <a>27</a>
@@ -5314,7 +5350,7 @@
                                 <b>
                                     <a>39</a>
                                     <b>47</b>
-                                    <v>10271</v>
+                                    <v>10270</v>
                                 </b>
                                 <b>
                                     <a>47</a>
@@ -5324,7 +5360,7 @@
                                 <b>
                                     <a>53</a>
                                     <b>60</b>
-                                    <v>10271</v>
+                                    <v>10270</v>
                                 </b>
                                 <b>
                                     <a>60</a>
@@ -5360,42 +5396,42 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>583115</v>
+                                    <v>583112</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>314200</v>
+                                    <v>314199</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>195616</v>
+                                    <v>195615</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>162002</v>
+                                    <v>162001</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>10</b>
-                                    <v>183011</v>
+                                    <v>183010</v>
                                 </b>
                                 <b>
                                     <a>10</a>
                                     <b>16</b>
-                                    <v>162936</v>
+                                    <v>162935</v>
                                 </b>
                                 <b>
                                     <a>16</a>
                                     <b>25</b>
-                                    <v>169005</v>
+                                    <v>169004</v>
                                 </b>
                                 <b>
                                     <a>25</a>
                                     <b>46</b>
-                                    <v>161068</v>
+                                    <v>161067</v>
                                 </b>
                                 <b>
                                     <a>46</a>
@@ -5421,22 +5457,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>871171</v>
+                                    <v>871167</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>273583</v>
+                                    <v>273582</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>193749</v>
+                                    <v>193748</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>8</b>
-                                    <v>173674</v>
+                                    <v>173673</v>
                                 </b>
                                 <b>
                                     <a>8</a>
@@ -5446,12 +5482,12 @@
                                 <b>
                                     <a>13</a>
                                     <b>20</b>
-                                    <v>161068</v>
+                                    <v>161067</v>
                                 </b>
                                 <b>
                                     <a>20</a>
                                     <b>51</b>
-                                    <v>159668</v>
+                                    <v>159667</v>
                                 </b>
                                 <b>
                                     <a>51</a>
@@ -5472,12 +5508,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>612060</v>
+                                    <v>612058</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>313266</v>
+                                    <v>313265</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -5487,12 +5523,12 @@
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>183011</v>
+                                    <v>183010</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>9</b>
-                                    <v>173207</v>
+                                    <v>173206</v>
                                 </b>
                                 <b>
                                     <a>9</a>
@@ -5502,12 +5538,12 @@
                                 <b>
                                     <a>13</a>
                                     <b>19</b>
-                                    <v>174607</v>
+                                    <v>174606</v>
                                 </b>
                                 <b>
                                     <a>19</a>
                                     <b>29</b>
-                                    <v>164803</v>
+                                    <v>164802</v>
                                 </b>
                                 <b>
                                     <a>29</a>
@@ -5528,17 +5564,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1531786</v>
+                                    <v>1531779</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>348748</v>
+                                    <v>348747</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>162002</v>
+                                    <v>162001</v>
                                 </b>
                                 <b>
                                     <a>5</a>
@@ -5559,27 +5595,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>587783</v>
+                                    <v>587781</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>316068</v>
+                                    <v>316066</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>197484</v>
+                                    <v>197483</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>168538</v>
+                                    <v>168537</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>9</b>
-                                    <v>158267</v>
+                                    <v>158266</v>
                                 </b>
                                 <b>
                                     <a>9</a>
@@ -5589,17 +5625,17 @@
                                 <b>
                                     <a>14</a>
                                     <b>21</b>
-                                    <v>175074</v>
+                                    <v>175073</v>
                                 </b>
                                 <b>
                                     <a>21</a>
                                     <b>32</b>
-                                    <v>162469</v>
+                                    <v>162468</v>
                                 </b>
                                 <b>
                                     <a>32</a>
                                     <b>63</b>
-                                    <v>157800</v>
+                                    <v>157799</v>
                                 </b>
                                 <b>
                                     <a>64</a>
@@ -6015,12 +6051,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>593386</v>
+                                    <v>593383</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>306263</v>
+                                    <v>306262</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -6030,32 +6066,32 @@
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>159668</v>
+                                    <v>159667</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>10</b>
-                                    <v>182544</v>
+                                    <v>182543</v>
                                 </b>
                                 <b>
                                     <a>10</a>
                                     <b>16</b>
-                                    <v>162002</v>
+                                    <v>162001</v>
                                 </b>
                                 <b>
                                     <a>16</a>
                                     <b>25</b>
-                                    <v>171339</v>
+                                    <v>171338</v>
                                 </b>
                                 <b>
                                     <a>25</a>
                                     <b>46</b>
-                                    <v>158734</v>
+                                    <v>158733</v>
                                 </b>
                                 <b>
                                     <a>46</a>
                                     <b>161</b>
-                                    <v>158267</v>
+                                    <v>158266</v>
                                 </b>
                                 <b>
                                     <a>162</a>
@@ -6076,32 +6112,32 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>886577</v>
+                                    <v>886574</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>260044</v>
+                                    <v>260043</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>125120</v>
+                                    <v>125119</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>140993</v>
+                                    <v>140992</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>10</b>
-                                    <v>184878</v>
+                                    <v>184877</v>
                                 </b>
                                 <b>
                                     <a>10</a>
                                     <b>15</b>
-                                    <v>168538</v>
+                                    <v>168537</v>
                                 </b>
                                 <b>
                                     <a>15</a>
@@ -6111,7 +6147,7 @@
                                 <b>
                                     <a>26</a>
                                     <b>120</b>
-                                    <v>158267</v>
+                                    <v>158266</v>
                                 </b>
                                 <b>
                                     <a>121</a>
@@ -6132,12 +6168,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1529452</v>
+                                    <v>1529445</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>341745</v>
+                                    <v>341744</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -6163,12 +6199,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>623265</v>
+                                    <v>623262</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>303462</v>
+                                    <v>303461</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -6178,32 +6214,32 @@
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>183945</v>
+                                    <v>183944</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>9</b>
-                                    <v>169939</v>
+                                    <v>169938</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>13</b>
-                                    <v>166671</v>
+                                    <v>166670</v>
                                 </b>
                                 <b>
                                     <a>13</a>
                                     <b>19</b>
-                                    <v>175074</v>
+                                    <v>175073</v>
                                 </b>
                                 <b>
                                     <a>19</a>
                                     <b>29</b>
-                                    <v>161068</v>
+                                    <v>161067</v>
                                 </b>
                                 <b>
                                     <a>29</a>
                                     <b>52</b>
-                                    <v>114382</v>
+                                    <v>114381</v>
                                 </b>
                             </bs>
                         </hist>
@@ -6219,32 +6255,32 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>599922</v>
+                                    <v>599919</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>306263</v>
+                                    <v>306262</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>197017</v>
+                                    <v>197016</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>169005</v>
+                                    <v>169004</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>9</b>
-                                    <v>156400</v>
+                                    <v>156399</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>14</b>
-                                    <v>169005</v>
+                                    <v>169004</v>
                                 </b>
                                 <b>
                                     <a>14</a>
@@ -6254,12 +6290,12 @@
                                 <b>
                                     <a>21</a>
                                     <b>32</b>
-                                    <v>162002</v>
+                                    <v>162001</v>
                                 </b>
                                 <b>
                                     <a>32</a>
                                     <b>60</b>
-                                    <v>158267</v>
+                                    <v>158266</v>
                                 </b>
                                 <b>
                                     <a>60</a>
@@ -6649,11 +6685,11 @@
         </relation>
         <relation>
             <name>locations_stmt</name>
-            <cardinality>3819884</cardinality>
+            <cardinality>3819867</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>3819884</v>
+                    <v>3819867</v>
                 </e>
                 <e>
                     <k>container</k>
@@ -6661,7 +6697,7 @@
                 </e>
                 <e>
                     <k>startLine</k>
-                    <v>200172</v>
+                    <v>200171</v>
                 </e>
                 <e>
                     <k>startColumn</k>
@@ -6669,7 +6705,7 @@
                 </e>
                 <e>
                     <k>endLine</k>
-                    <v>194428</v>
+                    <v>194427</v>
                 </e>
                 <e>
                     <k>endColumn</k>
@@ -6687,7 +6723,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3819884</v>
+                                    <v>3819867</v>
                                 </b>
                             </bs>
                         </hist>
@@ -6703,7 +6739,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3819884</v>
+                                    <v>3819867</v>
                                 </b>
                             </bs>
                         </hist>
@@ -6719,7 +6755,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3819884</v>
+                                    <v>3819867</v>
                                 </b>
                             </bs>
                         </hist>
@@ -6735,7 +6771,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3819884</v>
+                                    <v>3819867</v>
                                 </b>
                             </bs>
                         </hist>
@@ -6751,7 +6787,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3819884</v>
+                                    <v>3819867</v>
                                 </b>
                             </bs>
                         </hist>
@@ -7167,7 +7203,7 @@
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>14473</v>
+                                    <v>14472</v>
                                 </b>
                                 <b>
                                     <a>6</a>
@@ -7273,7 +7309,7 @@
                                 <b>
                                     <a>29</a>
                                     <b>36</b>
-                                    <v>16017</v>
+                                    <v>16016</v>
                                 </b>
                                 <b>
                                     <a>36</a>
@@ -7466,7 +7502,7 @@
                                 <b>
                                     <a>6</a>
                                     <b>8</b>
-                                    <v>14720</v>
+                                    <v>14719</v>
                                 </b>
                                 <b>
                                     <a>8</a>
@@ -7927,7 +7963,7 @@
                                 <b>
                                     <a>15</a>
                                     <b>21</b>
-                                    <v>16120</v>
+                                    <v>16119</v>
                                 </b>
                                 <b>
                                     <a>21</a>
@@ -7942,7 +7978,7 @@
                                 <b>
                                     <a>34</a>
                                     <b>42</b>
-                                    <v>15770</v>
+                                    <v>15769</v>
                                 </b>
                                 <b>
                                     <a>42</a>
@@ -8631,11 +8667,11 @@
         </relation>
         <relation>
             <name>locations_expr</name>
-            <cardinality>13187951</cardinality>
+            <cardinality>13187892</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>13187951</v>
+                    <v>13187892</v>
                 </e>
                 <e>
                     <k>container</k>
@@ -8643,7 +8679,7 @@
                 </e>
                 <e>
                     <k>startLine</k>
-                    <v>192225</v>
+                    <v>192224</v>
                 </e>
                 <e>
                     <k>startColumn</k>
@@ -8651,7 +8687,7 @@
                 </e>
                 <e>
                     <k>endLine</k>
-                    <v>192204</v>
+                    <v>192203</v>
                 </e>
                 <e>
                     <k>endColumn</k>
@@ -8669,7 +8705,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>13187951</v>
+                                    <v>13187892</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8685,7 +8721,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>13187951</v>
+                                    <v>13187892</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8701,7 +8737,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>13187951</v>
+                                    <v>13187892</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8717,7 +8753,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>13187951</v>
+                                    <v>13187892</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8733,7 +8769,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>13187951</v>
+                                    <v>13187892</v>
                                 </b>
                             </bs>
                         </hist>
@@ -9225,7 +9261,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>23552</v>
+                                    <v>23551</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -9306,7 +9342,7 @@
                                 <b>
                                     <a>7</a>
                                     <b>11</b>
-                                    <v>16717</v>
+                                    <v>16716</v>
                                 </b>
                                 <b>
                                     <a>11</a>
@@ -9448,7 +9484,7 @@
                                 <b>
                                     <a>43</a>
                                     <b>47</b>
-                                    <v>14720</v>
+                                    <v>14719</v>
                                 </b>
                                 <b>
                                     <a>47</a>
@@ -9458,7 +9494,7 @@
                                 <b>
                                     <a>52</a>
                                     <b>65</b>
-                                    <v>14473</v>
+                                    <v>14472</v>
                                 </b>
                                 <b>
                                     <a>65</a>
@@ -9940,7 +9976,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>23552</v>
+                                    <v>23551</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -10563,11 +10599,11 @@
         </relation>
         <relation>
             <name>numlines</name>
-            <cardinality>1383789</cardinality>
+            <cardinality>1383783</cardinality>
             <columnsizes>
                 <e>
                     <k>element_id</k>
-                    <v>1376786</v>
+                    <v>1376780</v>
                 </e>
                 <e>
                     <k>num_lines</k>
@@ -10593,7 +10629,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1369783</v>
+                                    <v>1369777</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -10614,7 +10650,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1370717</v>
+                                    <v>1370711</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -10635,7 +10671,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1376786</v>
+                                    <v>1376780</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10862,7 +10898,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>34548</v>
+                                    <v>34547</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -10903,7 +10939,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>34548</v>
+                                    <v>34547</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -10944,7 +10980,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>34548</v>
+                                    <v>34547</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -11611,15 +11647,15 @@
         </relation>
         <relation>
             <name>files</name>
-            <cardinality>123252</cardinality>
+            <cardinality>123251</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>123252</v>
+                    <v>123251</v>
                 </e>
                 <e>
                     <k>name</k>
-                    <v>123252</v>
+                    <v>123251</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -11633,7 +11669,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>123252</v>
+                                    <v>123251</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11649,7 +11685,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>123252</v>
+                                    <v>123251</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11707,7 +11743,7 @@
         </relation>
         <relation>
             <name>containerparent</name>
-            <cardinality>138659</cardinality>
+            <cardinality>138658</cardinality>
             <columnsizes>
                 <e>
                     <k>parent</k>
@@ -11715,7 +11751,7 @@
                 </e>
                 <e>
                     <k>child</k>
-                    <v>138659</v>
+                    <v>138658</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -11770,7 +11806,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>138659</v>
+                                    <v>138658</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11780,7 +11816,7 @@
         </relation>
         <relation>
             <name>fileannotations</name>
-            <cardinality>5129447</cardinality>
+            <cardinality>5129436</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
@@ -11792,7 +11828,7 @@
                 </e>
                 <e>
                     <k>name</k>
-                    <v>54773</v>
+                    <v>54772</v>
                 </e>
                 <e>
                     <k>value</k>
@@ -11815,7 +11851,7 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>4730</v>
+                                    <v>4729</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12066,7 +12102,7 @@
                                 <b>
                                     <a>20</a>
                                     <b>34</b>
-                                    <v>4222</v>
+                                    <v>4221</v>
                                 </b>
                                 <b>
                                     <a>34</a>
@@ -12102,7 +12138,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>54773</v>
+                                    <v>54772</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12326,12 +12362,12 @@
                                 <b>
                                     <a>39</a>
                                     <b>48</b>
-                                    <v>3612</v>
+                                    <v>3646</v>
                                 </b>
                                 <b>
                                     <a>48</a>
                                     <b>74</b>
-                                    <v>3567</v>
+                                    <v>3533</v>
                                 </b>
                                 <b>
                                     <a>74</a>
@@ -12356,15 +12392,15 @@
         </relation>
         <relation>
             <name>inmacroexpansion</name>
-            <cardinality>109779137</cardinality>
+            <cardinality>109779080</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>18027366</v>
+                    <v>18027694</v>
                 </e>
                 <e>
                     <k>inv</k>
-                    <v>2700175</v>
+                    <v>2700160</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -12378,37 +12414,37 @@
                                 <b>
                                     <a>1</a>
                                     <b>3</b>
-                                    <v>1581965</v>
+                                    <v>1582361</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>1077798</v>
+                                    <v>1077793</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>1184883</v>
+                                    <v>1184878</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>7</b>
-                                    <v>4819923</v>
+                                    <v>4819903</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>8</b>
-                                    <v>6385959</v>
+                                    <v>6385932</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>9</b>
-                                    <v>2605253</v>
+                                    <v>2605242</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>21</b>
-                                    <v>371583</v>
+                                    <v>371581</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12424,32 +12460,32 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>378428</v>
+                                    <v>378424</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>544105</v>
+                                    <v>544104</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>351515</v>
+                                    <v>351513</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>7</b>
-                                    <v>200660</v>
+                                    <v>200658</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>8</b>
-                                    <v>207152</v>
+                                    <v>207151</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>9</b>
-                                    <v>241888</v>
+                                    <v>241887</v>
                                 </b>
                                 <b>
                                     <a>9</a>
@@ -12459,17 +12495,17 @@
                                 <b>
                                     <a>10</a>
                                     <b>11</b>
-                                    <v>325486</v>
+                                    <v>325485</v>
                                 </b>
                                 <b>
                                     <a>11</a>
                                     <b>337</b>
-                                    <v>224849</v>
+                                    <v>224847</v>
                                 </b>
                                 <b>
                                     <a>339</a>
                                     <b>423</b>
-                                    <v>206353</v>
+                                    <v>206352</v>
                                 </b>
                                 <b>
                                     <a>423</a>
@@ -12484,15 +12520,15 @@
         </relation>
         <relation>
             <name>affectedbymacroexpansion</name>
-            <cardinality>35689082</cardinality>
+            <cardinality>35689251</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>5156745</v>
+                    <v>5156949</v>
                 </e>
                 <e>
                     <k>inv</k>
-                    <v>2784776</v>
+                    <v>2784762</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -12506,32 +12542,32 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2815933</v>
+                                    <v>2816079</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>560132</v>
+                                    <v>560184</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>264906</v>
+                                    <v>264908</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>565794</v>
+                                    <v>565803</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>12</b>
-                                    <v>391903</v>
+                                    <v>391901</v>
                                 </b>
                                 <b>
                                     <a>12</a>
                                     <b>50</b>
-                                    <v>407401</v>
+                                    <v>407399</v>
                                 </b>
                                 <b>
                                     <a>50</a>
@@ -12552,32 +12588,32 @@
                                 <b>
                                     <a>1</a>
                                     <b>4</b>
-                                    <v>229120</v>
+                                    <v>229116</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>7</b>
-                                    <v>231788</v>
+                                    <v>231720</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>9</b>
-                                    <v>220478</v>
+                                    <v>220491</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>12</b>
-                                    <v>251087</v>
+                                    <v>251119</v>
                                 </b>
                                 <b>
                                     <a>12</a>
                                     <b>13</b>
-                                    <v>333978</v>
+                                    <v>333984</v>
                                 </b>
                                 <b>
                                     <a>13</a>
                                     <b>14</b>
-                                    <v>165588</v>
+                                    <v>165593</v>
                                 </b>
                                 <b>
                                     <a>14</a>
@@ -12587,7 +12623,7 @@
                                 <b>
                                     <a>15</a>
                                     <b>16</b>
-                                    <v>121843</v>
+                                    <v>121842</v>
                                 </b>
                                 <b>
                                     <a>16</a>
@@ -12597,7 +12633,7 @@
                                 <b>
                                     <a>17</a>
                                     <b>18</b>
-                                    <v>146940</v>
+                                    <v>146942</v>
                                 </b>
                                 <b>
                                     <a>18</a>
@@ -12607,7 +12643,7 @@
                                 <b>
                                     <a>20</a>
                                     <b>25</b>
-                                    <v>208979</v>
+                                    <v>208978</v>
                                 </b>
                                 <b>
                                     <a>25</a>
@@ -12622,11 +12658,11 @@
         </relation>
         <relation>
             <name>macroinvocations</name>
-            <cardinality>33491157</cardinality>
+            <cardinality>33491008</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>33491157</v>
+                    <v>33491008</v>
                 </e>
                 <e>
                     <k>macro_id</k>
@@ -12634,7 +12670,7 @@
                 </e>
                 <e>
                     <k>location</k>
-                    <v>760390</v>
+                    <v>760387</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -12652,7 +12688,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>33491157</v>
+                                    <v>33491008</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12668,7 +12704,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>33491157</v>
+                                    <v>33491008</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12684,7 +12720,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>33491157</v>
+                                    <v>33491008</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12781,7 +12817,7 @@
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>6841</v>
+                                    <v>6840</v>
                                 </b>
                                 <b>
                                     <a>6</a>
@@ -12833,12 +12869,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>281226</v>
+                                    <v>281225</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>169659</v>
+                                    <v>169658</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -12884,12 +12920,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>714219</v>
+                                    <v>714216</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>350</b>
-                                    <v>46171</v>
+                                    <v>46170</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12905,7 +12941,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>760390</v>
+                                    <v>760387</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12978,15 +13014,15 @@
         </relation>
         <relation>
             <name>macroparent</name>
-            <cardinality>29950856</cardinality>
+            <cardinality>29950722</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>29950856</v>
+                    <v>29950722</v>
                 </e>
                 <e>
                     <k>parent_id</k>
-                    <v>23287102</v>
+                    <v>23286998</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -13000,7 +13036,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>29950856</v>
+                                    <v>29950722</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13016,17 +13052,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>17992872</v>
+                                    <v>17992792</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>4459570</v>
+                                    <v>4459550</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>88</b>
-                                    <v>834659</v>
+                                    <v>834655</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13036,15 +13072,15 @@
         </relation>
         <relation>
             <name>macrolocationbind</name>
-            <cardinality>4043799</cardinality>
+            <cardinality>4043781</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>2831150</v>
+                    <v>2831137</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>2021069</v>
+                    <v>2021060</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -13058,22 +13094,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2229922</v>
+                                    <v>2229912</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>341125</v>
+                                    <v>341123</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>7</b>
-                                    <v>230525</v>
+                                    <v>230524</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>57</b>
-                                    <v>29577</v>
+                                    <v>29576</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13089,12 +13125,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1611024</v>
+                                    <v>1611017</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>177682</v>
+                                    <v>177681</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -13104,7 +13140,7 @@
                                 <b>
                                     <a>8</a>
                                     <b>723</b>
-                                    <v>75493</v>
+                                    <v>75492</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13114,11 +13150,11 @@
         </relation>
         <relation>
             <name>macro_argument_unexpanded</name>
-            <cardinality>84549814</cardinality>
+            <cardinality>84549437</cardinality>
             <columnsizes>
                 <e>
                     <k>invocation</k>
-                    <v>26214874</v>
+                    <v>26214757</v>
                 </e>
                 <e>
                     <k>argument_index</k>
@@ -13126,7 +13162,7 @@
                 </e>
                 <e>
                     <k>text</k>
-                    <v>318310</v>
+                    <v>318308</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -13140,22 +13176,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7432497</v>
+                                    <v>7432464</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>10674075</v>
+                                    <v>10674027</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>6139354</v>
+                                    <v>6139327</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>67</b>
-                                    <v>1968946</v>
+                                    <v>1968937</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13171,22 +13207,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7502657</v>
+                                    <v>7502624</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>10820626</v>
+                                    <v>10820578</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>5973025</v>
+                                    <v>5972999</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>67</b>
-                                    <v>1918564</v>
+                                    <v>1918556</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13289,7 +13325,7 @@
                                 <b>
                                     <a>16</a>
                                     <b>23</b>
-                                    <v>24982</v>
+                                    <v>24981</v>
                                 </b>
                                 <b>
                                     <a>23</a>
@@ -13320,7 +13356,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>230201</v>
+                                    <v>230200</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -13340,11 +13376,11 @@
         </relation>
         <relation>
             <name>macro_argument_expanded</name>
-            <cardinality>84549814</cardinality>
+            <cardinality>84549437</cardinality>
             <columnsizes>
                 <e>
                     <k>invocation</k>
-                    <v>26214874</v>
+                    <v>26214757</v>
                 </e>
                 <e>
                     <k>argument_index</k>
@@ -13366,22 +13402,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7432497</v>
+                                    <v>7432464</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>10674075</v>
+                                    <v>10674027</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>6139354</v>
+                                    <v>6139327</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>67</b>
-                                    <v>1968946</v>
+                                    <v>1968937</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13397,22 +13433,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>10688841</v>
+                                    <v>10688793</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>9201903</v>
+                                    <v>9201862</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>5208300</v>
+                                    <v>5208277</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>9</b>
-                                    <v>1115829</v>
+                                    <v>1115824</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13571,15 +13607,15 @@
         </relation>
         <relation>
             <name>functions</name>
-            <cardinality>4179381</cardinality>
+            <cardinality>4179363</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>4179381</v>
+                    <v>4179363</v>
                 </e>
                 <e>
                     <k>name</k>
-                    <v>1895474</v>
+                    <v>1895466</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -13597,7 +13633,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4179381</v>
+                                    <v>4179363</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13613,7 +13649,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4179381</v>
+                                    <v>4179363</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13629,7 +13665,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1498172</v>
+                                    <v>1498165</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -13660,7 +13696,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1895007</v>
+                                    <v>1894999</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -13762,15 +13798,15 @@
         </relation>
         <relation>
             <name>function_entry_point</name>
-            <cardinality>1151757</cardinality>
+            <cardinality>1151752</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1141953</v>
+                    <v>1141948</v>
                 </e>
                 <e>
                     <k>entry_point</k>
-                    <v>1151757</v>
+                    <v>1151752</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -13784,7 +13820,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1132149</v>
+                                    <v>1132144</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -13805,7 +13841,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1151757</v>
+                                    <v>1151752</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13815,15 +13851,15 @@
         </relation>
         <relation>
             <name>function_return_type</name>
-            <cardinality>4184517</cardinality>
+            <cardinality>4184498</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>4179381</v>
+                    <v>4179363</v>
                 </e>
                 <e>
                     <k>return_type</k>
-                    <v>817948</v>
+                    <v>817945</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -13837,7 +13873,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4174246</v>
+                                    <v>4174227</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -13858,12 +13894,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>506082</v>
+                                    <v>506080</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>211490</v>
+                                    <v>211489</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -14153,22 +14189,22 @@
         </relation>
         <relation>
             <name>purefunctions</name>
-            <cardinality>100952</cardinality>
+            <cardinality>100951</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>100952</v>
+                    <v>100951</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>function_deleted</name>
-            <cardinality>96174</cardinality>
+            <cardinality>96173</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>96174</v>
+                    <v>96173</v>
                 </e>
             </columnsizes>
             <dependencies/>
@@ -14186,11 +14222,11 @@
         </relation>
         <relation>
             <name>function_prototyped</name>
-            <cardinality>4087409</cardinality>
+            <cardinality>4087391</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>4087409</v>
+                    <v>4087391</v>
                 </e>
             </columnsizes>
             <dependencies/>
@@ -14270,15 +14306,15 @@
         </relation>
         <relation>
             <name>member_function_this_type</name>
-            <cardinality>536525</cardinality>
+            <cardinality>536520</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>536525</v>
+                    <v>536520</v>
                 </e>
                 <e>
                     <k>this_type</k>
-                    <v>185332</v>
+                    <v>185331</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -14292,7 +14328,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>536525</v>
+                                    <v>536520</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14308,7 +14344,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>67897</v>
+                                    <v>67896</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -14343,27 +14379,27 @@
         </relation>
         <relation>
             <name>fun_decls</name>
-            <cardinality>4548672</cardinality>
+            <cardinality>4548652</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>4543537</v>
+                    <v>4543516</v>
                 </e>
                 <e>
                     <k>function</k>
-                    <v>4035587</v>
+                    <v>4035569</v>
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>816548</v>
+                    <v>816544</v>
                 </e>
                 <e>
                     <k>name</k>
-                    <v>1797899</v>
+                    <v>1797891</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>3370770</v>
+                    <v>3370755</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -14377,7 +14413,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4543537</v>
+                                    <v>4543516</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14393,7 +14429,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4538401</v>
+                                    <v>4538381</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -14414,7 +14450,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4543537</v>
+                                    <v>4543516</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14430,7 +14466,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4543537</v>
+                                    <v>4543516</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14446,17 +14482,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3606537</v>
+                                    <v>3606521</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>356218</v>
+                                    <v>356216</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>7</b>
-                                    <v>72831</v>
+                                    <v>72830</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14472,7 +14508,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3995903</v>
+                                    <v>3995885</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -14493,7 +14529,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4035587</v>
+                                    <v>4035569</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14509,12 +14545,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3663028</v>
+                                    <v>3663012</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>311866</v>
+                                    <v>311864</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -14535,12 +14571,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>431383</v>
+                                    <v>431381</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>274050</v>
+                                    <v>274048</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -14566,12 +14602,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>515419</v>
+                                    <v>515417</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>203086</v>
+                                    <v>203085</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -14597,7 +14633,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>690027</v>
+                                    <v>690024</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -14623,12 +14659,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>595253</v>
+                                    <v>595251</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>121385</v>
+                                    <v>121384</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -14654,12 +14690,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1228323</v>
+                                    <v>1228318</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>267047</v>
+                                    <v>267045</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -14690,12 +14726,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1407600</v>
+                                    <v>1407593</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>152198</v>
+                                    <v>152197</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -14721,12 +14757,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1579406</v>
+                                    <v>1579399</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>134924</v>
+                                    <v>134923</v>
                                 </b>
                                 <b>
                                     <a>4</a>
@@ -14747,22 +14783,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1236260</v>
+                                    <v>1236254</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>293191</v>
+                                    <v>293190</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>78900</v>
+                                    <v>78899</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>8</b>
-                                    <v>137258</v>
+                                    <v>137257</v>
                                 </b>
                                 <b>
                                     <a>8</a>
@@ -14783,12 +14819,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2966464</v>
+                                    <v>2966451</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>277785</v>
+                                    <v>277783</v>
                                 </b>
                                 <b>
                                     <a>4</a>
@@ -14809,17 +14845,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3033693</v>
+                                    <v>3033679</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>7</b>
-                                    <v>244170</v>
+                                    <v>244169</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>55</b>
-                                    <v>92906</v>
+                                    <v>92905</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14835,7 +14871,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3207367</v>
+                                    <v>3207353</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -14856,12 +14892,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3232578</v>
+                                    <v>3232563</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>13</b>
-                                    <v>138192</v>
+                                    <v>138191</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14871,11 +14907,11 @@
         </relation>
         <relation>
             <name>fun_def</name>
-            <cardinality>1888938</cardinality>
+            <cardinality>1888930</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1888938</v>
+                    <v>1888930</v>
                 </e>
             </columnsizes>
             <dependencies/>
@@ -14904,11 +14940,11 @@
         </relation>
         <relation>
             <name>fun_decl_specifiers</name>
-            <cardinality>2906705</cardinality>
+            <cardinality>2906692</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1689587</v>
+                    <v>1689579</v>
                 </e>
                 <e>
                     <k>name</k>
@@ -14926,12 +14962,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>491142</v>
+                                    <v>491140</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>1179769</v>
+                                    <v>1179764</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -15108,22 +15144,22 @@
         </relation>
         <relation>
             <name>fun_decl_empty_throws</name>
-            <cardinality>1472027</cardinality>
+            <cardinality>1472021</cardinality>
             <columnsizes>
                 <e>
                     <k>fun_decl</k>
-                    <v>1472027</v>
+                    <v>1472021</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>fun_decl_noexcept</name>
-            <cardinality>61667</cardinality>
+            <cardinality>61666</cardinality>
             <columnsizes>
                 <e>
                     <k>fun_decl</k>
-                    <v>61667</v>
+                    <v>61666</v>
                 </e>
                 <e>
                     <k>constant</k>
@@ -15141,7 +15177,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>61667</v>
+                                    <v>61666</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15172,11 +15208,11 @@
         </relation>
         <relation>
             <name>fun_decl_empty_noexcept</name>
-            <cardinality>863234</cardinality>
+            <cardinality>863230</cardinality>
             <columnsizes>
                 <e>
                     <k>fun_decl</k>
-                    <v>863234</v>
+                    <v>863230</v>
                 </e>
             </columnsizes>
             <dependencies/>
@@ -15281,11 +15317,11 @@
         </relation>
         <relation>
             <name>param_decl_bind</name>
-            <cardinality>6995048</cardinality>
+            <cardinality>6995017</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>6995048</v>
+                    <v>6995017</v>
                 </e>
                 <e>
                     <k>index</k>
@@ -15293,7 +15329,7 @@
                 </e>
                 <e>
                     <k>fun_decl</k>
-                    <v>3835301</v>
+                    <v>3835284</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -15307,7 +15343,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6995048</v>
+                                    <v>6995017</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15323,7 +15359,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6995048</v>
+                                    <v>6995017</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15501,22 +15537,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1973908</v>
+                                    <v>1973899</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>1061652</v>
+                                    <v>1061647</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>502814</v>
+                                    <v>502812</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>8</b>
-                                    <v>290857</v>
+                                    <v>290856</v>
                                 </b>
                                 <b>
                                     <a>8</a>
@@ -15537,22 +15573,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1973908</v>
+                                    <v>1973899</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>1061652</v>
+                                    <v>1061647</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>502814</v>
+                                    <v>502812</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>8</b>
-                                    <v>290857</v>
+                                    <v>290856</v>
                                 </b>
                                 <b>
                                     <a>8</a>
@@ -15567,27 +15603,27 @@
         </relation>
         <relation>
             <name>var_decls</name>
-            <cardinality>8110391</cardinality>
+            <cardinality>8110354</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>8039427</v>
+                    <v>8039391</v>
                 </e>
                 <e>
                     <k>variable</k>
-                    <v>7027262</v>
+                    <v>7027231</v>
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>2043471</v>
+                    <v>2043462</v>
                 </e>
                 <e>
                     <k>name</k>
-                    <v>667617</v>
+                    <v>667614</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>5311998</v>
+                    <v>5311974</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -15601,7 +15637,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>8039427</v>
+                                    <v>8039391</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15617,7 +15653,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7971265</v>
+                                    <v>7971229</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -15638,7 +15674,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>8039427</v>
+                                    <v>8039391</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15654,7 +15690,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>8036626</v>
+                                    <v>8036590</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -15675,12 +15711,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6175232</v>
+                                    <v>6175205</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>698431</v>
+                                    <v>698427</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -15701,12 +15737,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6855922</v>
+                                    <v>6855892</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>171339</v>
+                                    <v>171338</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15722,7 +15758,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6911946</v>
+                                    <v>6911916</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -15743,12 +15779,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6481963</v>
+                                    <v>6481934</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>542964</v>
+                                    <v>542962</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -15769,12 +15805,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1165763</v>
+                                    <v>1165758</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>477136</v>
+                                    <v>477134</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -15784,12 +15820,12 @@
                                 <b>
                                     <a>4</a>
                                     <b>7</b>
-                                    <v>184878</v>
+                                    <v>184877</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>762</b>
-                                    <v>120918</v>
+                                    <v>120917</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15805,17 +15841,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1299287</v>
+                                    <v>1299281</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>452392</v>
+                                    <v>452390</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>6</b>
-                                    <v>155933</v>
+                                    <v>155932</v>
                                 </b>
                                 <b>
                                     <a>6</a>
@@ -15836,17 +15872,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1539256</v>
+                                    <v>1539249</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>383296</v>
+                                    <v>383295</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>128</b>
-                                    <v>120918</v>
+                                    <v>120917</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15862,22 +15898,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1365582</v>
+                                    <v>1365576</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>404305</v>
+                                    <v>404303</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>7</b>
-                                    <v>173207</v>
+                                    <v>173206</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>592</b>
-                                    <v>100376</v>
+                                    <v>100375</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15893,22 +15929,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>341278</v>
+                                    <v>341277</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>86837</v>
+                                    <v>86836</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>48554</v>
+                                    <v>48553</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>51822</v>
+                                    <v>51821</v>
                                 </b>
                                 <b>
                                     <a>6</a>
@@ -15939,7 +15975,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>368823</v>
+                                    <v>368822</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -15985,12 +16021,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>457061</v>
+                                    <v>457059</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>93840</v>
+                                    <v>93839</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -16021,7 +16057,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>379094</v>
+                                    <v>379093</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -16036,7 +16072,7 @@
                                 <b>
                                     <a>5</a>
                                     <b>9</b>
-                                    <v>51355</v>
+                                    <v>51354</v>
                                 </b>
                                 <b>
                                     <a>9</a>
@@ -16062,17 +16098,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4496383</v>
+                                    <v>4496363</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>531760</v>
+                                    <v>531757</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>896</b>
-                                    <v>283854</v>
+                                    <v>283853</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16088,12 +16124,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4885749</v>
+                                    <v>4885727</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>17</b>
-                                    <v>415510</v>
+                                    <v>415508</v>
                                 </b>
                                 <b>
                                     <a>17</a>
@@ -16114,12 +16150,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4961848</v>
+                                    <v>4961826</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>759</b>
-                                    <v>350149</v>
+                                    <v>350147</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16135,7 +16171,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5302660</v>
+                                    <v>5302637</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -16150,22 +16186,22 @@
         </relation>
         <relation>
             <name>var_def</name>
-            <cardinality>3994969</cardinality>
+            <cardinality>3994952</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>3994969</v>
+                    <v>3994952</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>var_decl_specifiers</name>
-            <cardinality>378628</cardinality>
+            <cardinality>378626</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>378628</v>
+                    <v>378626</v>
                 </e>
                 <e>
                     <k>name</k>
@@ -16183,7 +16219,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>378628</v>
+                                    <v>378626</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16235,19 +16271,19 @@
         </relation>
         <relation>
             <name>type_decls</name>
-            <cardinality>3283466</cardinality>
+            <cardinality>3283451</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>3283466</v>
+                    <v>3283451</v>
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>3233045</v>
+                    <v>3233030</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>3166283</v>
+                    <v>3166269</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -16261,7 +16297,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3283466</v>
+                                    <v>3283451</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16277,7 +16313,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3283466</v>
+                                    <v>3283451</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16293,12 +16329,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3191493</v>
+                                    <v>3191479</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>5</b>
-                                    <v>41551</v>
+                                    <v>41550</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16314,12 +16350,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3191493</v>
+                                    <v>3191479</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>5</b>
-                                    <v>41551</v>
+                                    <v>41550</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16335,7 +16371,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3113994</v>
+                                    <v>3113980</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -16356,7 +16392,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3113994</v>
+                                    <v>3113980</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -16371,33 +16407,33 @@
         </relation>
         <relation>
             <name>type_def</name>
-            <cardinality>2641993</cardinality>
+            <cardinality>2641981</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>2641993</v>
+                    <v>2641981</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>type_decl_top</name>
-            <cardinality>743717</cardinality>
+            <cardinality>743713</cardinality>
             <columnsizes>
                 <e>
                     <k>type_decl</k>
-                    <v>743717</v>
+                    <v>743713</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>namespace_decls</name>
-            <cardinality>311638</cardinality>
+            <cardinality>311636</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>311638</v>
+                    <v>311636</v>
                 </e>
                 <e>
                     <k>namespace_id</k>
@@ -16405,11 +16441,11 @@
                 </e>
                 <e>
                     <k>location</k>
-                    <v>311638</v>
+                    <v>311636</v>
                 </e>
                 <e>
                     <k>bodylocation</k>
-                    <v>311638</v>
+                    <v>311636</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -16423,7 +16459,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>311638</v>
+                                    <v>311636</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16439,7 +16475,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>311638</v>
+                                    <v>311636</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16455,7 +16491,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>311638</v>
+                                    <v>311636</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16669,7 +16705,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>311638</v>
+                                    <v>311636</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16685,7 +16721,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>311638</v>
+                                    <v>311636</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16701,7 +16737,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>311638</v>
+                                    <v>311636</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16717,7 +16753,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>311638</v>
+                                    <v>311636</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16733,7 +16769,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>311638</v>
+                                    <v>311636</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16749,7 +16785,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>311638</v>
+                                    <v>311636</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16759,19 +16795,19 @@
         </relation>
         <relation>
             <name>usings</name>
-            <cardinality>369757</cardinality>
+            <cardinality>369755</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>369757</v>
+                    <v>369755</v>
                 </e>
                 <e>
                     <k>element_id</k>
-                    <v>315601</v>
+                    <v>315599</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>247905</v>
+                    <v>247904</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -16789,7 +16825,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>369757</v>
+                                    <v>369755</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16805,7 +16841,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>369757</v>
+                                    <v>369755</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16821,7 +16857,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>369757</v>
+                                    <v>369755</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16837,7 +16873,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>263312</v>
+                                    <v>263311</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -16863,7 +16899,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>263312</v>
+                                    <v>263311</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -16889,7 +16925,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>315601</v>
+                                    <v>315599</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16905,7 +16941,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>202619</v>
+                                    <v>202618</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -16915,7 +16951,7 @@
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>31280</v>
+                                    <v>31279</v>
                                 </b>
                                 <b>
                                     <a>5</a>
@@ -16936,7 +16972,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>202619</v>
+                                    <v>202618</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -16946,7 +16982,7 @@
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>31280</v>
+                                    <v>31279</v>
                                 </b>
                                 <b>
                                     <a>5</a>
@@ -16967,7 +17003,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>247905</v>
+                                    <v>247904</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17040,7 +17076,7 @@
         </relation>
         <relation>
             <name>using_container</name>
-            <cardinality>466802</cardinality>
+            <cardinality>466800</cardinality>
             <columnsizes>
                 <e>
                     <k>parent</k>
@@ -17048,7 +17084,7 @@
                 </e>
                 <e>
                     <k>child</k>
-                    <v>295992</v>
+                    <v>295990</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -17118,7 +17154,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>218314</v>
+                                    <v>218313</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -17143,15 +17179,15 @@
         </relation>
         <relation>
             <name>static_asserts</name>
-            <cardinality>134702</cardinality>
+            <cardinality>134701</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>134702</v>
+                    <v>134701</v>
                 </e>
                 <e>
                     <k>condition</k>
-                    <v>134702</v>
+                    <v>134701</v>
                 </e>
                 <e>
                     <k>message</k>
@@ -17177,7 +17213,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>134702</v>
+                                    <v>134701</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17193,7 +17229,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>134702</v>
+                                    <v>134701</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17209,7 +17245,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>134702</v>
+                                    <v>134701</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17225,7 +17261,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>134702</v>
+                                    <v>134701</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17241,7 +17277,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>134702</v>
+                                    <v>134701</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17257,7 +17293,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>134702</v>
+                                    <v>134701</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17273,7 +17309,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>134702</v>
+                                    <v>134701</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17289,7 +17325,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>134702</v>
+                                    <v>134701</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17751,15 +17787,15 @@
         </relation>
         <relation>
             <name>params</name>
-            <cardinality>6354509</cardinality>
+            <cardinality>6354480</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>6190639</v>
+                    <v>6190611</v>
                 </e>
                 <e>
                     <k>function</k>
-                    <v>3491688</v>
+                    <v>3491673</v>
                 </e>
                 <e>
                     <k>index</k>
@@ -17767,7 +17803,7 @@
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>1846453</v>
+                    <v>1846445</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -17781,7 +17817,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6190639</v>
+                                    <v>6190611</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17797,7 +17833,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6190639</v>
+                                    <v>6190611</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17813,12 +17849,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6066919</v>
+                                    <v>6066892</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>123719</v>
+                                    <v>123718</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17834,22 +17870,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1867462</v>
+                                    <v>1867454</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>952872</v>
+                                    <v>952868</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>429983</v>
+                                    <v>429981</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>18</b>
-                                    <v>241369</v>
+                                    <v>241368</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17865,22 +17901,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1867462</v>
+                                    <v>1867454</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>952872</v>
+                                    <v>952868</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>429983</v>
+                                    <v>429981</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>18</b>
-                                    <v>241369</v>
+                                    <v>241368</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17896,22 +17932,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2165790</v>
+                                    <v>2165780</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>826819</v>
+                                    <v>826815</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>346414</v>
+                                    <v>346412</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>12</b>
-                                    <v>152665</v>
+                                    <v>152664</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18165,17 +18201,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1183971</v>
+                                    <v>1183966</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>406173</v>
+                                    <v>406171</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>7</b>
-                                    <v>154065</v>
+                                    <v>154064</v>
                                 </b>
                                 <b>
                                     <a>7</a>
@@ -18196,17 +18232,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1404798</v>
+                                    <v>1404792</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>212423</v>
+                                    <v>212422</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>7</b>
-                                    <v>147529</v>
+                                    <v>147528</v>
                                 </b>
                                 <b>
                                     <a>7</a>
@@ -18227,17 +18263,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1420205</v>
+                                    <v>1420199</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>347348</v>
+                                    <v>347346</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>13</b>
-                                    <v>78900</v>
+                                    <v>78899</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18330,19 +18366,19 @@
         </relation>
         <relation>
             <name>membervariables</name>
-            <cardinality>1056495</cardinality>
+            <cardinality>1056490</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1054697</v>
+                    <v>1054692</v>
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>327727</v>
+                    <v>327726</v>
                 </e>
                 <e>
                     <k>name</k>
-                    <v>451619</v>
+                    <v>451617</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -18356,7 +18392,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1052979</v>
+                                    <v>1052974</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -18377,7 +18413,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1054697</v>
+                                    <v>1054692</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18393,7 +18429,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>243029</v>
+                                    <v>243027</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -18424,7 +18460,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>255254</v>
+                                    <v>255253</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -18455,7 +18491,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>295326</v>
+                                    <v>295325</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -18486,12 +18522,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>367839</v>
+                                    <v>367837</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>51738</v>
+                                    <v>51737</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -18506,7 +18542,7 @@
         </relation>
         <relation>
             <name>globalvariables</name>
-            <cardinality>301284</cardinality>
+            <cardinality>301286</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
@@ -18532,12 +18568,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>301268</v>
+                                    <v>301266</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>8</v>
+                                    <v>10</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18574,12 +18610,12 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>160</v>
+                                    <v>159</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>7</b>
-                                    <v>116</v>
+                                    <v>117</v>
                                 </b>
                                 <b>
                                     <a>7</a>
@@ -18677,11 +18713,11 @@
         </relation>
         <relation>
             <name>localvariables</name>
-            <cardinality>576946</cardinality>
+            <cardinality>576945</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>576946</v>
+                    <v>576945</v>
                 </e>
                 <e>
                     <k>type_id</k>
@@ -18689,7 +18725,7 @@
                 </e>
                 <e>
                     <k>name</k>
-                    <v>90548</v>
+                    <v>90547</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -18703,7 +18739,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>576946</v>
+                                    <v>576945</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18719,7 +18755,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>576946</v>
+                                    <v>576945</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18740,7 +18776,7 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>5362</v>
+                                    <v>5366</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -18750,7 +18786,7 @@
                                 <b>
                                     <a>4</a>
                                     <b>7</b>
-                                    <v>3380</v>
+                                    <v>3376</v>
                                 </b>
                                 <b>
                                     <a>7</a>
@@ -18776,7 +18812,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>26908</v>
+                                    <v>26912</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -18786,7 +18822,7 @@
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>2918</v>
+                                    <v>2914</v>
                                 </b>
                                 <b>
                                     <a>5</a>
@@ -18817,7 +18853,7 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>14285</v>
+                                    <v>14284</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -18848,7 +18884,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>76492</v>
+                                    <v>76491</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -18868,11 +18904,11 @@
         </relation>
         <relation>
             <name>autoderivation</name>
-            <cardinality>147961</cardinality>
+            <cardinality>147960</cardinality>
             <columnsizes>
                 <e>
                     <k>var</k>
-                    <v>147961</v>
+                    <v>147960</v>
                 </e>
                 <e>
                     <k>derivation_type</k>
@@ -18890,7 +18926,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>147961</v>
+                                    <v>147960</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18944,7 +18980,7 @@
                 </e>
                 <e>
                     <k>function</k>
-                    <v>32886</v>
+                    <v>32885</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -18989,11 +19025,11 @@
         </relation>
         <relation>
             <name>enumconstants</name>
-            <cardinality>241670</cardinality>
+            <cardinality>241669</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>241670</v>
+                    <v>241669</v>
                 </e>
                 <e>
                     <k>parent</k>
@@ -19009,11 +19045,11 @@
                 </e>
                 <e>
                     <k>name</k>
-                    <v>241391</v>
+                    <v>241389</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>221574</v>
+                    <v>221573</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -19027,7 +19063,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>241670</v>
+                                    <v>241669</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19043,7 +19079,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>241670</v>
+                                    <v>241669</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19059,7 +19095,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>241670</v>
+                                    <v>241669</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19075,7 +19111,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>241670</v>
+                                    <v>241669</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19091,7 +19127,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>241670</v>
+                                    <v>241669</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19331,7 +19367,7 @@
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>5833</v>
+                                    <v>5832</v>
                                 </b>
                                 <b>
                                     <a>4</a>
@@ -19702,7 +19738,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>241111</v>
+                                    <v>241110</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -19723,7 +19759,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>241111</v>
+                                    <v>241110</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -19744,7 +19780,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>241391</v>
+                                    <v>241389</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19760,7 +19796,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>241391</v>
+                                    <v>241389</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19776,7 +19812,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>241111</v>
+                                    <v>241110</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -19797,7 +19833,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>220815</v>
+                                    <v>220814</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -19818,7 +19854,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>221574</v>
+                                    <v>221573</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19834,7 +19870,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>220815</v>
+                                    <v>220814</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -19855,7 +19891,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>221574</v>
+                                    <v>221573</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19871,7 +19907,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>220815</v>
+                                    <v>220814</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -20593,15 +20629,15 @@
         </relation>
         <relation>
             <name>derivedtypes</name>
-            <cardinality>3669564</cardinality>
+            <cardinality>3669548</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>3669564</v>
+                    <v>3669548</v>
                 </e>
                 <e>
                     <k>name</k>
-                    <v>1552795</v>
+                    <v>1552788</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -20609,7 +20645,7 @@
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>2362807</v>
+                    <v>2362796</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -20623,7 +20659,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3669564</v>
+                                    <v>3669548</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20639,7 +20675,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3669564</v>
+                                    <v>3669548</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20655,7 +20691,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3669564</v>
+                                    <v>3669548</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20671,12 +20707,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1324031</v>
+                                    <v>1324025</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>120451</v>
+                                    <v>120450</v>
                                 </b>
                                 <b>
                                     <a>4</a>
@@ -20697,7 +20733,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1551861</v>
+                                    <v>1551854</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -20718,12 +20754,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1324031</v>
+                                    <v>1324025</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>120451</v>
+                                    <v>120450</v>
                                 </b>
                                 <b>
                                     <a>4</a>
@@ -20867,22 +20903,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1515446</v>
+                                    <v>1515439</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>546232</v>
+                                    <v>546230</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>218493</v>
+                                    <v>218492</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>72</b>
-                                    <v>82635</v>
+                                    <v>82634</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20898,17 +20934,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1526650</v>
+                                    <v>1526644</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>538763</v>
+                                    <v>538760</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>215691</v>
+                                    <v>215690</v>
                                 </b>
                                 <b>
                                     <a>4</a>
@@ -20929,22 +20965,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1519647</v>
+                                    <v>1519641</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>549967</v>
+                                    <v>549965</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>217559</v>
+                                    <v>217558</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>75632</v>
+                                    <v>75631</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20954,11 +20990,11 @@
         </relation>
         <relation>
             <name>pointerishsize</name>
-            <cardinality>2707354</cardinality>
+            <cardinality>2707342</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>2707354</v>
+                    <v>2707342</v>
                 </e>
                 <e>
                     <k>size</k>
@@ -20980,7 +21016,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2707354</v>
+                                    <v>2707342</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20996,7 +21032,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2707354</v>
+                                    <v>2707342</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21272,7 +21308,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>27545</v>
+                                    <v>27544</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -21298,7 +21334,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>27545</v>
+                                    <v>27544</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -21406,15 +21442,15 @@
         </relation>
         <relation>
             <name>typedefbase</name>
-            <cardinality>1686117</cardinality>
+            <cardinality>1686109</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1686117</v>
+                    <v>1686109</v>
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>793489</v>
+                    <v>793485</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -21428,7 +21464,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1686117</v>
+                                    <v>1686109</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21444,7 +21480,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>617406</v>
+                                    <v>617404</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -21755,15 +21791,15 @@
         </relation>
         <relation>
             <name>usertypes</name>
-            <cardinality>5234965</cardinality>
+            <cardinality>5234008</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>5234965</v>
+                    <v>5234008</v>
                 </e>
                 <e>
                     <k>name</k>
-                    <v>1352509</v>
+                    <v>1352503</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -21781,7 +21817,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5234965</v>
+                                    <v>5234008</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21797,7 +21833,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5234965</v>
+                                    <v>5234008</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21813,7 +21849,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>983686</v>
+                                    <v>983681</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -21849,17 +21885,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1211983</v>
+                                    <v>1211977</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>125120</v>
+                                    <v>125586</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>7</b>
-                                    <v>15406</v>
+                                    <v>14939</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21893,8 +21929,8 @@
                                     <v>466</v>
                                 </b>
                                 <b>
-                                    <a>135</a>
-                                    <b>136</b>
+                                    <a>133</a>
+                                    <b>134</b>
                                     <v>466</v>
                                 </b>
                                 <b>
@@ -21959,8 +21995,8 @@
                                     <v>466</v>
                                 </b>
                                 <b>
-                                    <a>43</a>
-                                    <b>44</b>
+                                    <a>41</a>
+                                    <b>42</b>
                                     <v>466</v>
                                 </b>
                                 <b>
@@ -22001,11 +22037,11 @@
         </relation>
         <relation>
             <name>usertypesize</name>
-            <cardinality>1707327</cardinality>
+            <cardinality>1706386</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1707327</v>
+                    <v>1706386</v>
                 </e>
                 <e>
                     <k>size</k>
@@ -22027,7 +22063,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1707327</v>
+                                    <v>1706386</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22043,7 +22079,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1707327</v>
+                                    <v>1706386</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22098,7 +22134,7 @@
                                 </b>
                                 <b>
                                     <a>740</a>
-                                    <b>2472</b>
+                                    <b>2470</b>
                                     <v>933</v>
                                 </b>
                             </bs>
@@ -22115,7 +22151,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>10271</v>
+                                    <v>10270</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -22159,8 +22195,8 @@
                                     <v>466</v>
                                 </b>
                                 <b>
-                                    <a>3211</a>
-                                    <b>3212</b>
+                                    <a>3209</a>
+                                    <b>3210</b>
                                     <v>466</v>
                                 </b>
                             </bs>
@@ -22218,11 +22254,11 @@
         </relation>
         <relation>
             <name>usertype_uuid</name>
-            <cardinality>36652</cardinality>
+            <cardinality>36651</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>36652</v>
+                    <v>36651</v>
                 </e>
                 <e>
                     <k>uuid</k>
@@ -22240,7 +22276,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>36652</v>
+                                    <v>36651</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22271,15 +22307,15 @@
         </relation>
         <relation>
             <name>mangled_name</name>
-            <cardinality>9020312</cardinality>
+            <cardinality>9019338</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>9020312</v>
+                    <v>9019338</v>
                 </e>
                 <e>
                     <k>mangled_name</k>
-                    <v>6061784</v>
+                    <v>6061757</v>
                 </e>
                 <e>
                     <k>is_complete</k>
@@ -22297,7 +22333,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9020312</v>
+                                    <v>9019338</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22313,7 +22349,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9020312</v>
+                                    <v>9019338</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22329,12 +22365,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5789134</v>
+                                    <v>5789108</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>874</b>
-                                    <v>272649</v>
+                                    <v>272648</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22350,7 +22386,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6061784</v>
+                                    <v>6061757</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22364,8 +22400,8 @@
                             <budget>12</budget>
                             <bs>
                                 <b>
-                                    <a>19321</a>
-                                    <b>19322</b>
+                                    <a>19319</a>
+                                    <b>19320</b>
                                     <v>466</v>
                                 </b>
                             </bs>
@@ -22392,59 +22428,59 @@
         </relation>
         <relation>
             <name>is_pod_class</name>
-            <cardinality>534705</cardinality>
+            <cardinality>534713</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>534705</v>
+                    <v>534713</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>is_standard_layout_class</name>
-            <cardinality>1254935</cardinality>
+            <cardinality>1253995</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1254935</v>
+                    <v>1253995</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>is_complete</name>
-            <cardinality>1646635</cardinality>
+            <cardinality>1645694</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1646635</v>
+                    <v>1645694</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>is_class_template</name>
-            <cardinality>398236</cardinality>
+            <cardinality>398234</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>398236</v>
+                    <v>398234</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>class_instantiation</name>
-            <cardinality>1089664</cardinality>
+            <cardinality>1089659</cardinality>
             <columnsizes>
                 <e>
                     <k>to</k>
-                    <v>1089664</v>
+                    <v>1089659</v>
                 </e>
                 <e>
                     <k>from</k>
-                    <v>168538</v>
+                    <v>168537</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -22458,7 +22494,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1089664</v>
+                                    <v>1089659</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22524,11 +22560,11 @@
         </relation>
         <relation>
             <name>class_template_argument</name>
-            <cardinality>2882763</cardinality>
+            <cardinality>2882750</cardinality>
             <columnsizes>
                 <e>
                     <k>type_id</k>
-                    <v>1315517</v>
+                    <v>1315511</v>
                 </e>
                 <e>
                     <k>index</k>
@@ -22536,7 +22572,7 @@
                 </e>
                 <e>
                     <k>arg_type</k>
-                    <v>840394</v>
+                    <v>840390</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -22550,17 +22586,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>540959</v>
+                                    <v>540956</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>399239</v>
+                                    <v>399237</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>231397</v>
+                                    <v>231396</v>
                                 </b>
                                 <b>
                                     <a>4</a>
@@ -22586,22 +22622,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>567611</v>
+                                    <v>567609</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>410483</v>
+                                    <v>410481</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>244842</v>
+                                    <v>244841</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>113</b>
-                                    <v>92579</v>
+                                    <v>92578</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22709,12 +22745,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>523348</v>
+                                    <v>523346</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>174344</v>
+                                    <v>174343</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -22745,12 +22781,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>746494</v>
+                                    <v>746490</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>77836</v>
+                                    <v>77835</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -22765,11 +22801,11 @@
         </relation>
         <relation>
             <name>class_template_argument_value</name>
-            <cardinality>495344</cardinality>
+            <cardinality>495342</cardinality>
             <columnsizes>
                 <e>
                     <k>type_id</k>
-                    <v>304863</v>
+                    <v>304861</v>
                 </e>
                 <e>
                     <k>index</k>
@@ -22777,7 +22813,7 @@
                 </e>
                 <e>
                     <k>arg_value</k>
-                    <v>495344</v>
+                    <v>495342</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -22791,7 +22827,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>249773</v>
+                                    <v>249772</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -22817,7 +22853,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>189547</v>
+                                    <v>189546</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -22910,7 +22946,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>495344</v>
+                                    <v>495342</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22926,7 +22962,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>495344</v>
+                                    <v>495342</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22936,15 +22972,15 @@
         </relation>
         <relation>
             <name>is_proxy_class_for</name>
-            <cardinality>63026</cardinality>
+            <cardinality>62092</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>63026</v>
+                    <v>62092</v>
                 </e>
                 <e>
                     <k>templ_param_id</k>
-                    <v>63026</v>
+                    <v>62092</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -22958,7 +22994,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>63026</v>
+                                    <v>62092</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22974,7 +23010,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>63026</v>
+                                    <v>62092</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22984,19 +23020,19 @@
         </relation>
         <relation>
             <name>type_mentions</name>
-            <cardinality>4029136</cardinality>
+            <cardinality>4029118</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>4029136</v>
+                    <v>4029118</v>
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>198202</v>
+                    <v>198201</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>3995616</v>
+                    <v>3995598</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -23014,7 +23050,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4029136</v>
+                                    <v>4029118</v>
                                 </b>
                             </bs>
                         </hist>
@@ -23030,7 +23066,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4029136</v>
+                                    <v>4029118</v>
                                 </b>
                             </bs>
                         </hist>
@@ -23046,7 +23082,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4029136</v>
+                                    <v>4029118</v>
                                 </b>
                             </bs>
                         </hist>
@@ -23062,7 +23098,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>97603</v>
+                                    <v>97602</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -23087,7 +23123,7 @@
                                 <b>
                                     <a>7</a>
                                     <b>12</b>
-                                    <v>15861</v>
+                                    <v>15860</v>
                                 </b>
                                 <b>
                                     <a>12</a>
@@ -23113,7 +23149,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>97603</v>
+                                    <v>97602</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -23138,7 +23174,7 @@
                                 <b>
                                     <a>7</a>
                                     <b>12</b>
-                                    <v>15861</v>
+                                    <v>15860</v>
                                 </b>
                                 <b>
                                     <a>12</a>
@@ -23164,7 +23200,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>198202</v>
+                                    <v>198201</v>
                                 </b>
                             </bs>
                         </hist>
@@ -23180,7 +23216,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3962096</v>
+                                    <v>3962078</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -23201,7 +23237,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3962096</v>
+                                    <v>3962078</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -23222,7 +23258,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3995616</v>
+                                    <v>3995598</v>
                                 </b>
                             </bs>
                         </hist>
@@ -23280,26 +23316,26 @@
         </relation>
         <relation>
             <name>is_function_template</name>
-            <cardinality>1402931</cardinality>
+            <cardinality>1402925</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1402931</v>
+                    <v>1402925</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>function_instantiation</name>
-            <cardinality>894823</cardinality>
+            <cardinality>894816</cardinality>
             <columnsizes>
                 <e>
                     <k>to</k>
-                    <v>894823</v>
+                    <v>894816</v>
                 </e>
                 <e>
                     <k>from</k>
-                    <v>144434</v>
+                    <v>144433</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -23313,7 +23349,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>894823</v>
+                                    <v>894816</v>
                                 </b>
                             </bs>
                         </hist>
@@ -23329,7 +23365,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>100156</v>
+                                    <v>100155</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -23359,11 +23395,11 @@
         </relation>
         <relation>
             <name>function_template_argument</name>
-            <cardinality>2313492</cardinality>
+            <cardinality>2313473</cardinality>
             <columnsizes>
                 <e>
                     <k>function_id</k>
-                    <v>1321577</v>
+                    <v>1321566</v>
                 </e>
                 <e>
                     <k>index</k>
@@ -23371,7 +23407,7 @@
                 </e>
                 <e>
                     <k>arg_type</k>
-                    <v>301235</v>
+                    <v>301233</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -23385,22 +23421,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>674410</v>
+                                    <v>674404</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>390488</v>
+                                    <v>390485</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>186796</v>
+                                    <v>186794</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>15</b>
-                                    <v>69883</v>
+                                    <v>69882</v>
                                 </b>
                             </bs>
                         </hist>
@@ -23416,22 +23452,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>691828</v>
+                                    <v>691822</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>400277</v>
+                                    <v>400274</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>166869</v>
+                                    <v>166867</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>9</b>
-                                    <v>62602</v>
+                                    <v>62601</v>
                                 </b>
                             </bs>
                         </hist>
@@ -23569,7 +23605,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>184531</v>
+                                    <v>184530</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -23610,7 +23646,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>271728</v>
+                                    <v>271726</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -23630,11 +23666,11 @@
         </relation>
         <relation>
             <name>function_template_argument_value</name>
-            <cardinality>358995</cardinality>
+            <cardinality>358992</cardinality>
             <columnsizes>
                 <e>
                     <k>function_id</k>
-                    <v>192753</v>
+                    <v>192751</v>
                 </e>
                 <e>
                     <k>index</k>
@@ -23642,7 +23678,7 @@
                 </e>
                 <e>
                     <k>arg_value</k>
-                    <v>356382</v>
+                    <v>356379</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -23656,7 +23692,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>183486</v>
+                                    <v>183485</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -23677,7 +23713,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>176136</v>
+                                    <v>176134</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -23815,7 +23851,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>353770</v>
+                                    <v>353767</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -23836,7 +23872,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>356382</v>
+                                    <v>356379</v>
                                 </b>
                             </bs>
                         </hist>
@@ -23857,11 +23893,11 @@
         </relation>
         <relation>
             <name>variable_instantiation</name>
-            <cardinality>204308</cardinality>
+            <cardinality>204307</cardinality>
             <columnsizes>
                 <e>
                     <k>to</k>
-                    <v>204308</v>
+                    <v>204307</v>
                 </e>
                 <e>
                     <k>from</k>
@@ -23879,7 +23915,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>204308</v>
+                                    <v>204307</v>
                                 </b>
                             </bs>
                         </hist>
@@ -23940,11 +23976,11 @@
         </relation>
         <relation>
             <name>variable_template_argument</name>
-            <cardinality>383990</cardinality>
+            <cardinality>383988</cardinality>
             <columnsizes>
                 <e>
                     <k>variable_id</k>
-                    <v>195640</v>
+                    <v>195639</v>
                 </e>
                 <e>
                     <k>index</k>
@@ -23952,7 +23988,7 @@
                 </e>
                 <e>
                     <k>arg_type</k>
-                    <v>187562</v>
+                    <v>187561</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -23981,7 +24017,7 @@
                                 <b>
                                     <a>4</a>
                                     <b>17</b>
-                                    <v>10442</v>
+                                    <v>10441</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24145,7 +24181,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>145597</v>
+                                    <v>145596</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -24176,7 +24212,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>170224</v>
+                                    <v>170223</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -24357,15 +24393,15 @@
         </relation>
         <relation>
             <name>routinetypes</name>
-            <cardinality>538824</cardinality>
+            <cardinality>538889</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>538824</v>
+                    <v>538889</v>
                 </e>
                 <e>
                     <k>return_type</k>
-                    <v>280751</v>
+                    <v>280749</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -24379,7 +24415,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>538824</v>
+                                    <v>538889</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24395,12 +24431,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>244521</v>
+                                    <v>244449</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>20971</v>
+                                    <v>21041</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -24415,11 +24451,11 @@
         </relation>
         <relation>
             <name>routinetypeargs</name>
-            <cardinality>983219</cardinality>
+            <cardinality>983214</cardinality>
             <columnsizes>
                 <e>
                     <k>routine</k>
-                    <v>423447</v>
+                    <v>423445</v>
                 </e>
                 <e>
                     <k>index</k>
@@ -24427,7 +24463,7 @@
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>226896</v>
+                    <v>226895</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -24441,12 +24477,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>152665</v>
+                                    <v>152664</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>133990</v>
+                                    <v>133989</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -24461,7 +24497,7 @@
                                 <b>
                                     <a>5</a>
                                     <b>18</b>
-                                    <v>27545</v>
+                                    <v>27544</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24477,17 +24513,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>182544</v>
+                                    <v>182543</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>133523</v>
+                                    <v>133522</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>58825</v>
+                                    <v>58824</v>
                                 </b>
                                 <b>
                                     <a>4</a>
@@ -24660,7 +24696,7 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>30813</v>
+                                    <v>30812</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -24691,12 +24727,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>172740</v>
+                                    <v>172739</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>30813</v>
+                                    <v>30812</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -24716,15 +24752,15 @@
         </relation>
         <relation>
             <name>ptrtomembers</name>
-            <cardinality>37816</cardinality>
+            <cardinality>37815</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>37816</v>
+                    <v>37815</v>
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>37816</v>
+                    <v>37815</v>
                 </e>
                 <e>
                     <k>class_id</k>
@@ -24742,7 +24778,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>37816</v>
+                                    <v>37815</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24758,7 +24794,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>37816</v>
+                                    <v>37815</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24774,7 +24810,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>37816</v>
+                                    <v>37815</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24790,7 +24826,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>37816</v>
+                                    <v>37815</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24900,11 +24936,11 @@
         </relation>
         <relation>
             <name>typespecifiers</name>
-            <cardinality>1133083</cardinality>
+            <cardinality>1132144</cardinality>
             <columnsizes>
                 <e>
                     <k>type_id</k>
-                    <v>1114875</v>
+                    <v>1113936</v>
                 </e>
                 <e>
                     <k>spec_id</k>
@@ -24922,7 +24958,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1096667</v>
+                                    <v>1095728</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -24968,12 +25004,7 @@
                                 <b>
                                     <a>219</a>
                                     <b>220</b>
-                                    <v>466</v>
-                                </b>
-                                <b>
-                                    <a>221</a>
-                                    <b>222</b>
-                                    <v>466</v>
+                                    <v>933</v>
                                 </b>
                                 <b>
                                     <a>1701</a>
@@ -24988,11 +25019,11 @@
         </relation>
         <relation>
             <name>funspecifiers</name>
-            <cardinality>10304659</cardinality>
+            <cardinality>10305080</cardinality>
             <columnsizes>
                 <e>
                     <k>func_id</k>
-                    <v>4068267</v>
+                    <v>4068249</v>
                 </e>
                 <e>
                     <k>spec_id</k>
@@ -25010,27 +25041,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1357645</v>
+                                    <v>1357639</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>641006</v>
+                                    <v>640536</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>985086</v>
+                                    <v>985549</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>780132</v>
+                                    <v>780129</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>8</b>
-                                    <v>304396</v>
+                                    <v>304395</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25129,8 +25160,8 @@
                                     <v>466</v>
                                 </b>
                                 <b>
-                                    <a>6434</a>
-                                    <b>6435</b>
+                                    <a>6435</a>
+                                    <b>6436</b>
                                     <v>466</v>
                                 </b>
                             </bs>
@@ -25141,11 +25172,11 @@
         </relation>
         <relation>
             <name>varspecifiers</name>
-            <cardinality>2246090</cardinality>
+            <cardinality>2246080</cardinality>
             <columnsizes>
                 <e>
                     <k>var_id</k>
-                    <v>1225055</v>
+                    <v>1225050</v>
                 </e>
                 <e>
                     <k>spec_id</k>
@@ -25163,22 +25194,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>730177</v>
+                                    <v>730174</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>202619</v>
+                                    <v>202618</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>58358</v>
+                                    <v>58357</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>233899</v>
+                                    <v>233898</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25287,11 +25318,11 @@
         </relation>
         <relation>
             <name>attributes</name>
-            <cardinality>561639</cardinality>
+            <cardinality>561636</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>561639</v>
+                    <v>561636</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -25307,7 +25338,7 @@
                 </e>
                 <e>
                     <k>location</k>
-                    <v>481338</v>
+                    <v>481336</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -25321,7 +25352,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>561639</v>
+                                    <v>561636</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25337,7 +25368,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>561639</v>
+                                    <v>561636</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25353,7 +25384,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>561639</v>
+                                    <v>561636</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25369,7 +25400,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>561639</v>
+                                    <v>561636</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25560,7 +25591,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>10271</v>
+                                    <v>10270</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -25752,7 +25783,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>431850</v>
+                                    <v>431848</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -25778,7 +25809,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>481338</v>
+                                    <v>481336</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25794,7 +25825,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>433251</v>
+                                    <v>433249</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -25820,7 +25851,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>481338</v>
+                                    <v>481336</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25830,11 +25861,11 @@
         </relation>
         <relation>
             <name>attribute_args</name>
-            <cardinality>344080</cardinality>
+            <cardinality>344078</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>344080</v>
+                    <v>344078</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -25842,7 +25873,7 @@
                 </e>
                 <e>
                     <k>attribute</k>
-                    <v>262845</v>
+                    <v>262844</v>
                 </e>
                 <e>
                     <k>index</k>
@@ -25850,7 +25881,7 @@
                 </e>
                 <e>
                     <k>location</k>
-                    <v>327739</v>
+                    <v>327738</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -25864,7 +25895,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>344080</v>
+                                    <v>344078</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25880,7 +25911,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>344080</v>
+                                    <v>344078</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25896,7 +25927,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>344080</v>
+                                    <v>344078</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25912,7 +25943,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>344080</v>
+                                    <v>344078</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26027,7 +26058,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>197484</v>
+                                    <v>197483</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -26053,12 +26084,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>252574</v>
+                                    <v>252573</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>10271</v>
+                                    <v>10270</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26074,7 +26105,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>197484</v>
+                                    <v>197483</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -26100,7 +26131,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>197484</v>
+                                    <v>197483</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -26225,7 +26256,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>313733</v>
+                                    <v>313732</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -26246,7 +26277,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>315134</v>
+                                    <v>315132</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -26267,7 +26298,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>313733</v>
+                                    <v>313732</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -26288,7 +26319,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>327739</v>
+                                    <v>327738</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26399,15 +26430,15 @@
         </relation>
         <relation>
             <name>attribute_arg_constant</name>
-            <cardinality>318402</cardinality>
+            <cardinality>318400</cardinality>
             <columnsizes>
                 <e>
                     <k>arg</k>
-                    <v>318402</v>
+                    <v>318400</v>
                 </e>
                 <e>
                     <k>constant</k>
-                    <v>318402</v>
+                    <v>318400</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -26421,7 +26452,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>318402</v>
+                                    <v>318400</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26437,7 +26468,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>318402</v>
+                                    <v>318400</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26548,15 +26579,15 @@
         </relation>
         <relation>
             <name>typeattributes</name>
-            <cardinality>60997</cardinality>
+            <cardinality>61863</cardinality>
             <columnsizes>
                 <e>
                     <k>type_id</k>
-                    <v>37617</v>
+                    <v>61469</v>
                 </e>
                 <e>
                     <k>spec_id</k>
-                    <v>60572</v>
+                    <v>19701</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -26570,17 +26601,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>14636</v>
+                                    <v>61075</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>22580</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>400</v>
+                                    <v>394</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26596,12 +26622,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>60477</v>
+                                    <v>16254</v>
                                 </b>
                                 <b>
                                     <a>2</a>
-                                    <b>26</b>
-                                    <v>95</v>
+                                    <b>5</b>
+                                    <v>1576</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
+                                    <b>23</b>
+                                    <v>1379</v>
+                                </b>
+                                <b>
+                                    <a>57</a>
+                                    <b>58</b>
+                                    <v>492</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26611,15 +26647,15 @@
         </relation>
         <relation>
             <name>funcattributes</name>
-            <cardinality>630268</cardinality>
+            <cardinality>630265</cardinality>
             <columnsizes>
                 <e>
                     <k>func_id</k>
-                    <v>443522</v>
+                    <v>443520</v>
                 </e>
                 <e>
                     <k>spec_id</k>
-                    <v>524757</v>
+                    <v>524754</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -26633,7 +26669,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>338477</v>
+                                    <v>338476</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -26664,7 +26700,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>506082</v>
+                                    <v>506080</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -26805,15 +26841,15 @@
         </relation>
         <relation>
             <name>unspecifiedtype</name>
-            <cardinality>9489045</cardinality>
+            <cardinality>9488069</cardinality>
             <columnsizes>
                 <e>
                     <k>type_id</k>
-                    <v>9489045</v>
+                    <v>9488069</v>
                 </e>
                 <e>
                     <k>unspecified_type_id</k>
-                    <v>6491300</v>
+                    <v>6490338</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -26827,7 +26863,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9489045</v>
+                                    <v>9488069</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26843,17 +26879,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4559877</v>
+                                    <v>4558923</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>1715731</v>
+                                    <v>1715723</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>145</b>
-                                    <v>215691</v>
+                                    <v>215690</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26863,19 +26899,19 @@
         </relation>
         <relation>
             <name>member</name>
-            <cardinality>3881054</cardinality>
+            <cardinality>3881037</cardinality>
             <columnsizes>
                 <e>
                     <k>parent</k>
-                    <v>545766</v>
+                    <v>545763</v>
                 </e>
                 <e>
                     <k>index</k>
-                    <v>92906</v>
+                    <v>92905</v>
                 </e>
                 <e>
                     <k>child</k>
-                    <v>3809624</v>
+                    <v>3809607</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -26924,7 +26960,7 @@
                                 <b>
                                     <a>14</a>
                                     <b>30</b>
-                                    <v>41551</v>
+                                    <v>41550</v>
                                 </b>
                                 <b>
                                     <a>30</a>
@@ -26960,7 +26996,7 @@
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>76099</v>
+                                    <v>76098</v>
                                 </b>
                                 <b>
                                     <a>5</a>
@@ -26970,7 +27006,7 @@
                                 <b>
                                     <a>6</a>
                                     <b>7</b>
-                                    <v>24277</v>
+                                    <v>24276</v>
                                 </b>
                                 <b>
                                     <a>7</a>
@@ -26985,12 +27021,12 @@
                                 <b>
                                     <a>17</a>
                                     <b>41</b>
-                                    <v>41551</v>
+                                    <v>41550</v>
                                 </b>
                                 <b>
                                     <a>41</a>
                                     <b>200</b>
-                                    <v>10271</v>
+                                    <v>10270</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27148,7 +27184,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3809624</v>
+                                    <v>3809607</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27164,7 +27200,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3738193</v>
+                                    <v>3738177</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -27179,15 +27215,15 @@
         </relation>
         <relation>
             <name>enclosingfunction</name>
-            <cardinality>118329</cardinality>
+            <cardinality>118328</cardinality>
             <columnsizes>
                 <e>
                     <k>child</k>
-                    <v>118329</v>
+                    <v>118328</v>
                 </e>
                 <e>
                     <k>parent</k>
-                    <v>67665</v>
+                    <v>67664</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -27201,7 +27237,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>118329</v>
+                                    <v>118328</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27242,15 +27278,15 @@
         </relation>
         <relation>
             <name>derivations</name>
-            <cardinality>391568</cardinality>
+            <cardinality>391564</cardinality>
             <columnsizes>
                 <e>
                     <k>derivation</k>
-                    <v>391568</v>
+                    <v>391564</v>
                 </e>
                 <e>
                     <k>sub</k>
-                    <v>371293</v>
+                    <v>371289</v>
                 </e>
                 <e>
                     <k>index</k>
@@ -27258,7 +27294,7 @@
                 </e>
                 <e>
                     <k>super</k>
-                    <v>202751</v>
+                    <v>202749</v>
                 </e>
                 <e>
                     <k>location</k>
@@ -27276,7 +27312,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>391568</v>
+                                    <v>391564</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27292,7 +27328,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>391568</v>
+                                    <v>391564</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27308,7 +27344,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>391568</v>
+                                    <v>391564</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27324,7 +27360,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>391568</v>
+                                    <v>391564</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27340,7 +27376,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>356313</v>
+                                    <v>356310</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -27361,7 +27397,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>356313</v>
+                                    <v>356310</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -27382,7 +27418,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>356313</v>
+                                    <v>356310</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -27403,7 +27439,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>356313</v>
+                                    <v>356310</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -27553,7 +27589,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>195366</v>
+                                    <v>195364</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -27574,7 +27610,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>195366</v>
+                                    <v>195364</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -27595,7 +27631,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>202298</v>
+                                    <v>202296</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -27616,7 +27652,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>199093</v>
+                                    <v>199091</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -27642,7 +27678,7 @@
                                 <b>
                                     <a>2</a>
                                     <b>5</b>
-                                    <v>3205</v>
+                                    <v>3204</v>
                                 </b>
                                 <b>
                                     <a>5</a>
@@ -27678,7 +27714,7 @@
                                 <b>
                                     <a>2</a>
                                     <b>5</b>
-                                    <v>3205</v>
+                                    <v>3204</v>
                                 </b>
                                 <b>
                                     <a>5</a>
@@ -27750,11 +27786,11 @@
         </relation>
         <relation>
             <name>derspecifiers</name>
-            <cardinality>393449</cardinality>
+            <cardinality>393446</cardinality>
             <columnsizes>
                 <e>
                     <k>der_id</k>
-                    <v>391184</v>
+                    <v>391181</v>
                 </e>
                 <e>
                     <k>spec_id</k>
@@ -27772,7 +27808,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>388920</v>
+                                    <v>388917</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -27818,11 +27854,11 @@
         </relation>
         <relation>
             <name>direct_base_offsets</name>
-            <cardinality>362618</cardinality>
+            <cardinality>362615</cardinality>
             <columnsizes>
                 <e>
                     <k>der_id</k>
-                    <v>362618</v>
+                    <v>362615</v>
                 </e>
                 <e>
                     <k>offset</k>
@@ -27840,7 +27876,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>362618</v>
+                                    <v>362615</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28182,11 +28218,11 @@
         </relation>
         <relation>
             <name>frienddecls</name>
-            <cardinality>707052</cardinality>
+            <cardinality>707046</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>707052</v>
+                    <v>707046</v>
                 </e>
                 <e>
                     <k>type_id</k>
@@ -28194,7 +28230,7 @@
                 </e>
                 <e>
                     <k>decl_id</k>
-                    <v>69395</v>
+                    <v>69394</v>
                 </e>
                 <e>
                     <k>location</k>
@@ -28212,7 +28248,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>707052</v>
+                                    <v>707046</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28228,7 +28264,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>707052</v>
+                                    <v>707046</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28244,7 +28280,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>707052</v>
+                                    <v>707046</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28295,7 +28331,7 @@
                                 <b>
                                     <a>37</a>
                                     <b>55</b>
-                                    <v>3205</v>
+                                    <v>3204</v>
                                 </b>
                                 <b>
                                     <a>55</a>
@@ -28351,7 +28387,7 @@
                                 <b>
                                     <a>37</a>
                                     <b>55</b>
-                                    <v>3205</v>
+                                    <v>3204</v>
                                 </b>
                                 <b>
                                     <a>55</a>
@@ -28485,7 +28521,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>68733</v>
+                                    <v>68732</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -28563,19 +28599,19 @@
         </relation>
         <relation>
             <name>comments</name>
-            <cardinality>8266137</cardinality>
+            <cardinality>8266100</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>8266137</v>
+                    <v>8266100</v>
                 </e>
                 <e>
                     <k>contents</k>
-                    <v>3147578</v>
+                    <v>3147564</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>8266137</v>
+                    <v>8266100</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -28589,7 +28625,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>8266137</v>
+                                    <v>8266100</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28605,7 +28641,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>8266137</v>
+                                    <v>8266100</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28621,12 +28657,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2879337</v>
+                                    <v>2879324</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>7</b>
-                                    <v>236620</v>
+                                    <v>236618</v>
                                 </b>
                                 <b>
                                     <a>7</a>
@@ -28647,12 +28683,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2879337</v>
+                                    <v>2879324</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>7</b>
-                                    <v>236620</v>
+                                    <v>236618</v>
                                 </b>
                                 <b>
                                     <a>7</a>
@@ -28673,7 +28709,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>8266137</v>
+                                    <v>8266100</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28689,7 +28725,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>8266137</v>
+                                    <v>8266100</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28699,15 +28735,15 @@
         </relation>
         <relation>
             <name>commentbinding</name>
-            <cardinality>3091117</cardinality>
+            <cardinality>3091104</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>2445442</v>
+                    <v>2445431</v>
                 </e>
                 <e>
                     <k>element</k>
-                    <v>3014551</v>
+                    <v>3014538</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -28721,7 +28757,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2368409</v>
+                                    <v>2368399</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -28742,7 +28778,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2937985</v>
+                                    <v>2937972</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -28757,15 +28793,15 @@
         </relation>
         <relation>
             <name>exprconv</name>
-            <cardinality>7033022</cardinality>
+            <cardinality>7032991</cardinality>
             <columnsizes>
                 <e>
                     <k>converted</k>
-                    <v>7033022</v>
+                    <v>7032991</v>
                 </e>
                 <e>
                     <k>conversion</k>
-                    <v>7033022</v>
+                    <v>7032991</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -28779,7 +28815,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7033022</v>
+                                    <v>7032991</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28795,7 +28831,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7033022</v>
+                                    <v>7032991</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28805,22 +28841,22 @@
         </relation>
         <relation>
             <name>compgenerated</name>
-            <cardinality>7908075</cardinality>
+            <cardinality>7908009</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>7908075</v>
+                    <v>7908009</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>synthetic_destructor_call</name>
-            <cardinality>512503</cardinality>
+            <cardinality>512501</cardinality>
             <columnsizes>
                 <e>
                     <k>element</k>
-                    <v>325805</v>
+                    <v>325803</v>
                 </e>
                 <e>
                     <k>i</k>
@@ -28828,7 +28864,7 @@
                 </e>
                 <e>
                     <k>destructor_call</k>
-                    <v>512503</v>
+                    <v>512501</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -28842,7 +28878,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>227848</v>
+                                    <v>227847</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -28857,7 +28893,7 @@
                                 <b>
                                     <a>4</a>
                                     <b>8</b>
-                                    <v>24622</v>
+                                    <v>24621</v>
                                 </b>
                                 <b>
                                     <a>8</a>
@@ -28878,7 +28914,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>227848</v>
+                                    <v>227847</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -28893,7 +28929,7 @@
                                 <b>
                                     <a>4</a>
                                     <b>8</b>
-                                    <v>24622</v>
+                                    <v>24621</v>
                                 </b>
                                 <b>
                                     <a>8</a>
@@ -29126,7 +29162,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>512503</v>
+                                    <v>512501</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29142,7 +29178,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>512503</v>
+                                    <v>512501</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29221,15 +29257,15 @@
         </relation>
         <relation>
             <name>namespacembrs</name>
-            <cardinality>2388018</cardinality>
+            <cardinality>2388007</cardinality>
             <columnsizes>
                 <e>
                     <k>parentid</k>
-                    <v>10271</v>
+                    <v>10270</v>
                 </e>
                 <e>
                     <k>memberid</k>
-                    <v>2388018</v>
+                    <v>2388007</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -29304,7 +29340,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2388018</v>
+                                    <v>2388007</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29314,11 +29350,11 @@
         </relation>
         <relation>
             <name>exprparents</name>
-            <cardinality>14206517</cardinality>
+            <cardinality>14206453</cardinality>
             <columnsizes>
                 <e>
                     <k>expr_id</k>
-                    <v>14206517</v>
+                    <v>14206453</v>
                 </e>
                 <e>
                     <k>child_index</k>
@@ -29326,7 +29362,7 @@
                 </e>
                 <e>
                     <k>parent_id</k>
-                    <v>9453690</v>
+                    <v>9453648</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -29340,7 +29376,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>14206517</v>
+                                    <v>14206453</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29356,7 +29392,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>14206517</v>
+                                    <v>14206453</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29474,17 +29510,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5409361</v>
+                                    <v>5409337</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>3706591</v>
+                                    <v>3706574</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>712</b>
-                                    <v>337737</v>
+                                    <v>337736</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29500,17 +29536,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5409361</v>
+                                    <v>5409337</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>3706591</v>
+                                    <v>3706574</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>712</b>
-                                    <v>337737</v>
+                                    <v>337736</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29520,11 +29556,11 @@
         </relation>
         <relation>
             <name>expr_isload</name>
-            <cardinality>5096886</cardinality>
+            <cardinality>5096863</cardinality>
             <columnsizes>
                 <e>
                     <k>expr_id</k>
-                    <v>5096886</v>
+                    <v>5096863</v>
                 </e>
             </columnsizes>
             <dependencies/>
@@ -29604,11 +29640,11 @@
         </relation>
         <relation>
             <name>iscall</name>
-            <cardinality>3218003</cardinality>
+            <cardinality>3217989</cardinality>
             <columnsizes>
                 <e>
                     <k>caller</k>
-                    <v>3218003</v>
+                    <v>3217989</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -29626,7 +29662,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3218003</v>
+                                    <v>3217989</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29662,11 +29698,11 @@
         </relation>
         <relation>
             <name>numtemplatearguments</name>
-            <cardinality>393832</cardinality>
+            <cardinality>393829</cardinality>
             <columnsizes>
                 <e>
                     <k>expr_id</k>
-                    <v>393832</v>
+                    <v>393829</v>
                 </e>
                 <e>
                     <k>num</k>
@@ -29684,7 +29720,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>393832</v>
+                                    <v>393829</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29788,23 +29824,23 @@
         </relation>
         <relation>
             <name>namequalifiers</name>
-            <cardinality>1513800</cardinality>
+            <cardinality>1513793</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1513800</v>
+                    <v>1513793</v>
                 </e>
                 <e>
                     <k>qualifiableelement</k>
-                    <v>1513800</v>
+                    <v>1513793</v>
                 </e>
                 <e>
                     <k>qualifyingelement</k>
-                    <v>97519</v>
+                    <v>97518</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>304298</v>
+                    <v>304297</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -29818,7 +29854,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1513800</v>
+                                    <v>1513793</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29834,7 +29870,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1513800</v>
+                                    <v>1513793</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29850,7 +29886,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1513800</v>
+                                    <v>1513793</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29866,7 +29902,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1513800</v>
+                                    <v>1513793</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29882,7 +29918,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1513800</v>
+                                    <v>1513793</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29898,7 +29934,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1513800</v>
+                                    <v>1513793</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30017,7 +30053,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>100559</v>
+                                    <v>100558</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -30058,7 +30094,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>100559</v>
+                                    <v>100558</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -30099,7 +30135,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>137074</v>
+                                    <v>137073</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -30124,15 +30160,15 @@
         </relation>
         <relation>
             <name>varbind</name>
-            <cardinality>6029127</cardinality>
+            <cardinality>6029100</cardinality>
             <columnsizes>
                 <e>
                     <k>expr</k>
-                    <v>6029127</v>
+                    <v>6029100</v>
                 </e>
                 <e>
                     <k>var</k>
-                    <v>768530</v>
+                    <v>768527</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -30146,7 +30182,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6029127</v>
+                                    <v>6029100</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30167,12 +30203,12 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>137874</v>
+                                    <v>137873</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>106293</v>
+                                    <v>106292</v>
                                 </b>
                                 <b>
                                     <a>4</a>
@@ -30202,7 +30238,7 @@
                                 <b>
                                     <a>13</a>
                                     <b>28</b>
-                                    <v>58880</v>
+                                    <v>58879</v>
                                 </b>
                                 <b>
                                     <a>28</a>
@@ -30217,15 +30253,15 @@
         </relation>
         <relation>
             <name>funbind</name>
-            <cardinality>3224501</cardinality>
+            <cardinality>3224486</cardinality>
             <columnsizes>
                 <e>
                     <k>expr</k>
-                    <v>3218288</v>
+                    <v>3218274</v>
                 </e>
                 <e>
                     <k>fun</k>
-                    <v>511344</v>
+                    <v>511342</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -30239,7 +30275,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3212076</v>
+                                    <v>3212061</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -30260,7 +30296,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>315090</v>
+                                    <v>315088</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -30421,11 +30457,11 @@
         </relation>
         <relation>
             <name>expr_deallocator</name>
-            <cardinality>54694</cardinality>
+            <cardinality>54693</cardinality>
             <columnsizes>
                 <e>
                     <k>expr</k>
-                    <v>54694</v>
+                    <v>54693</v>
                 </e>
                 <e>
                     <k>func</k>
@@ -30447,7 +30483,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>54694</v>
+                                    <v>54693</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30463,7 +30499,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>54694</v>
+                                    <v>54693</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30568,15 +30604,15 @@
         </relation>
         <relation>
             <name>expr_cond_guard</name>
-            <cardinality>657237</cardinality>
+            <cardinality>657235</cardinality>
             <columnsizes>
                 <e>
                     <k>cond</k>
-                    <v>657237</v>
+                    <v>657235</v>
                 </e>
                 <e>
                     <k>guard</k>
-                    <v>657237</v>
+                    <v>657235</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -30590,7 +30626,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>657237</v>
+                                    <v>657235</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30606,7 +30642,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>657237</v>
+                                    <v>657235</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30616,15 +30652,15 @@
         </relation>
         <relation>
             <name>expr_cond_true</name>
-            <cardinality>657235</cardinality>
+            <cardinality>657232</cardinality>
             <columnsizes>
                 <e>
                     <k>cond</k>
-                    <v>657235</v>
+                    <v>657232</v>
                 </e>
                 <e>
                     <k>true</k>
-                    <v>657235</v>
+                    <v>657232</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -30638,7 +30674,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>657235</v>
+                                    <v>657232</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30654,7 +30690,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>657235</v>
+                                    <v>657232</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30664,15 +30700,15 @@
         </relation>
         <relation>
             <name>expr_cond_false</name>
-            <cardinality>657237</cardinality>
+            <cardinality>657235</cardinality>
             <columnsizes>
                 <e>
                     <k>cond</k>
-                    <v>657237</v>
+                    <v>657235</v>
                 </e>
                 <e>
                     <k>false</k>
-                    <v>657237</v>
+                    <v>657235</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -30686,7 +30722,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>657237</v>
+                                    <v>657235</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30702,7 +30738,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>657237</v>
+                                    <v>657235</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30712,11 +30748,11 @@
         </relation>
         <relation>
             <name>values</name>
-            <cardinality>10776699</cardinality>
+            <cardinality>10776651</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>10776699</v>
+                    <v>10776651</v>
                 </e>
                 <e>
                     <k>str</k>
@@ -30734,7 +30770,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>10776699</v>
+                                    <v>10776651</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30750,7 +30786,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>59545</v>
+                                    <v>59544</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -30780,11 +30816,11 @@
         </relation>
         <relation>
             <name>valuetext</name>
-            <cardinality>4757348</cardinality>
+            <cardinality>4757344</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>4757348</v>
+                    <v>4757344</v>
                 </e>
                 <e>
                     <k>text</k>
@@ -30802,7 +30838,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4757348</v>
+                                    <v>4757344</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30843,15 +30879,15 @@
         </relation>
         <relation>
             <name>valuebind</name>
-            <cardinality>11210920</cardinality>
+            <cardinality>11210870</cardinality>
             <columnsizes>
                 <e>
                     <k>val</k>
-                    <v>10776699</v>
+                    <v>10776651</v>
                 </e>
                 <e>
                     <k>expr</k>
-                    <v>11210920</v>
+                    <v>11210870</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -30865,12 +30901,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>10365022</v>
+                                    <v>10364976</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>7</b>
-                                    <v>411677</v>
+                                    <v>411675</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30886,7 +30922,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>11210920</v>
+                                    <v>11210870</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30896,11 +30932,11 @@
         </relation>
         <relation>
             <name>fieldoffsets</name>
-            <cardinality>1054697</cardinality>
+            <cardinality>1054692</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1054697</v>
+                    <v>1054692</v>
                 </e>
                 <e>
                     <k>byteoffset</k>
@@ -30922,7 +30958,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1054697</v>
+                                    <v>1054692</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30938,7 +30974,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1054697</v>
+                                    <v>1054692</v>
                                 </b>
                             </bs>
                         </hist>
@@ -31283,23 +31319,23 @@
         </relation>
         <relation>
             <name>initialisers</name>
-            <cardinality>1710781</cardinality>
+            <cardinality>1710773</cardinality>
             <columnsizes>
                 <e>
                     <k>init</k>
-                    <v>1710781</v>
+                    <v>1710773</v>
                 </e>
                 <e>
                     <k>var</k>
-                    <v>719764</v>
+                    <v>719761</v>
                 </e>
                 <e>
                     <k>expr</k>
-                    <v>1710781</v>
+                    <v>1710773</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>394651</v>
+                    <v>394649</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -31313,7 +31349,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1710781</v>
+                                    <v>1710773</v>
                                 </b>
                             </bs>
                         </hist>
@@ -31329,7 +31365,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1710781</v>
+                                    <v>1710773</v>
                                 </b>
                             </bs>
                         </hist>
@@ -31345,7 +31381,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1710781</v>
+                                    <v>1710773</v>
                                 </b>
                             </bs>
                         </hist>
@@ -31361,7 +31397,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>633988</v>
+                                    <v>633986</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -31387,7 +31423,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>633988</v>
+                                    <v>633986</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -31413,7 +31449,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>719758</v>
+                                    <v>719754</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -31434,7 +31470,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1710781</v>
+                                    <v>1710773</v>
                                 </b>
                             </bs>
                         </hist>
@@ -31450,7 +31486,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1710781</v>
+                                    <v>1710773</v>
                                 </b>
                             </bs>
                         </hist>
@@ -31466,7 +31502,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1710781</v>
+                                    <v>1710773</v>
                                 </b>
                             </bs>
                         </hist>
@@ -31482,7 +31518,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>321715</v>
+                                    <v>321714</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -31513,7 +31549,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>344607</v>
+                                    <v>344605</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -31539,7 +31575,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>321715</v>
+                                    <v>321714</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -31575,15 +31611,15 @@
         </relation>
         <relation>
             <name>expr_ancestor</name>
-            <cardinality>516626</cardinality>
+            <cardinality>516623</cardinality>
             <columnsizes>
                 <e>
                     <k>exp</k>
-                    <v>516626</v>
+                    <v>516623</v>
                 </e>
                 <e>
                     <k>ancestor</k>
-                    <v>308516</v>
+                    <v>308515</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -31597,7 +31633,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>516626</v>
+                                    <v>516623</v>
                                 </b>
                             </bs>
                         </hist>
@@ -31613,7 +31649,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>203568</v>
+                                    <v>203567</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -31628,7 +31664,7 @@
                                 <b>
                                     <a>4</a>
                                     <b>7</b>
-                                    <v>25154</v>
+                                    <v>25153</v>
                                 </b>
                                 <b>
                                     <a>7</a>
@@ -31643,11 +31679,11 @@
         </relation>
         <relation>
             <name>exprs</name>
-            <cardinality>18387506</cardinality>
+            <cardinality>18387424</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>18387506</v>
+                    <v>18387424</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -31655,7 +31691,7 @@
                 </e>
                 <e>
                     <k>location</k>
-                    <v>8488094</v>
+                    <v>8488154</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -31669,7 +31705,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>18387506</v>
+                                    <v>18387424</v>
                                 </b>
                             </bs>
                         </hist>
@@ -31685,7 +31721,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>18387506</v>
+                                    <v>18387424</v>
                                 </b>
                             </bs>
                         </hist>
@@ -31863,22 +31899,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7145154</v>
+                                    <v>7145204</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>663031</v>
+                                    <v>663036</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>18</b>
-                                    <v>638103</v>
+                                    <v>638107</v>
                                 </b>
                                 <b>
                                     <a>18</a>
                                     <b>71656</b>
-                                    <v>41805</v>
+                                    <v>41806</v>
                                 </b>
                             </bs>
                         </hist>
@@ -31894,17 +31930,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7251222</v>
+                                    <v>7251273</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>618242</v>
+                                    <v>618246</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>32</b>
-                                    <v>618630</v>
+                                    <v>618634</v>
                                 </b>
                             </bs>
                         </hist>
@@ -31914,15 +31950,15 @@
         </relation>
         <relation>
             <name>expr_reuse</name>
-            <cardinality>373719</cardinality>
+            <cardinality>373717</cardinality>
             <columnsizes>
                 <e>
                     <k>reuse</k>
-                    <v>373719</v>
+                    <v>373717</v>
                 </e>
                 <e>
                     <k>original</k>
-                    <v>373700</v>
+                    <v>373698</v>
                 </e>
                 <e>
                     <k>value_category</k>
@@ -31940,7 +31976,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>373719</v>
+                                    <v>373717</v>
                                 </b>
                             </bs>
                         </hist>
@@ -31956,7 +31992,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>373719</v>
+                                    <v>373717</v>
                                 </b>
                             </bs>
                         </hist>
@@ -31972,7 +32008,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>373681</v>
+                                    <v>373679</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -31993,7 +32029,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>373700</v>
+                                    <v>373698</v>
                                 </b>
                             </bs>
                         </hist>
@@ -32045,15 +32081,15 @@
         </relation>
         <relation>
             <name>expr_types</name>
-            <cardinality>18451524</cardinality>
+            <cardinality>18451442</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>18319863</v>
+                    <v>18319781</v>
                 </e>
                 <e>
                     <k>typeid</k>
-                    <v>1214606</v>
+                    <v>1214623</v>
                 </e>
                 <e>
                     <k>value_category</k>
@@ -32071,12 +32107,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>18188202</v>
+                                    <v>18188121</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>131661</v>
+                                    <v>131660</v>
                                 </b>
                             </bs>
                         </hist>
@@ -32092,7 +32128,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>18319863</v>
+                                    <v>18319781</v>
                                 </b>
                             </bs>
                         </hist>
@@ -32108,22 +32144,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>438558</v>
+                                    <v>438567</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>249335</v>
+                                    <v>249334</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>102807</v>
+                                    <v>102840</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>81888</v>
+                                    <v>81865</v>
                                 </b>
                                 <b>
                                     <a>5</a>
@@ -32133,17 +32169,17 @@
                                 <b>
                                     <a>8</a>
                                     <b>14</b>
-                                    <v>96485</v>
+                                    <v>96496</v>
                                 </b>
                                 <b>
                                     <a>14</a>
                                     <b>41</b>
-                                    <v>91665</v>
+                                    <v>91664</v>
                                 </b>
                                 <b>
                                     <a>41</a>
                                     <b>125325</b>
-                                    <v>44590</v>
+                                    <v>44579</v>
                                 </b>
                             </bs>
                         </hist>
@@ -32159,12 +32195,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1050219</v>
+                                    <v>1050237</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>154193</v>
+                                    <v>154192</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -32219,8 +32255,8 @@
                                     <v>11</v>
                                 </b>
                                 <b>
-                                    <a>90427</a>
-                                    <b>90428</b>
+                                    <a>90429</a>
+                                    <b>90430</b>
                                     <v>11</v>
                                 </b>
                             </bs>
@@ -32229,6 +32265,17 @@
                 </dep>
             </dependencies>
         </relation>
+        <relation>
+            <name>compound_requirement_is_noexcept</name>
+            <cardinality>1</cardinality>
+            <columnsizes>
+                <e>
+                    <k>expr</k>
+                    <v>1</v>
+                </e>
+            </columnsizes>
+            <dependencies/>
+        </relation>
         <relation>
             <name>new_allocated_type</name>
             <cardinality>47064</cardinality>
@@ -32274,7 +32321,7 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>14736</v>
+                                    <v>14735</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -33483,7 +33530,7 @@
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>20104</v>
+                    <v>20103</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -33528,11 +33575,11 @@
         </relation>
         <relation>
             <name>sizeof_bind</name>
-            <cardinality>199184</cardinality>
+            <cardinality>199183</cardinality>
             <columnsizes>
                 <e>
                     <k>expr</k>
-                    <v>199184</v>
+                    <v>199183</v>
                 </e>
                 <e>
                     <k>type_id</k>
@@ -33550,7 +33597,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>199184</v>
+                                    <v>199183</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33783,7 +33830,7 @@
                 </e>
                 <e>
                     <k>lambda</k>
-                    <v>20542</v>
+                    <v>20541</v>
                 </e>
                 <e>
                     <k>index</k>
@@ -33976,7 +34023,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>20542</v>
+                                    <v>20541</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33992,7 +34039,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>20542</v>
+                                    <v>20541</v>
                                 </b>
                             </bs>
                         </hist>
@@ -34654,11 +34701,11 @@
         </relation>
         <relation>
             <name>stmts</name>
-            <cardinality>4630345</cardinality>
+            <cardinality>4630324</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>4630345</v>
+                    <v>4630324</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -34666,7 +34713,7 @@
                 </e>
                 <e>
                     <k>location</k>
-                    <v>2171742</v>
+                    <v>2171732</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -34680,7 +34727,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4630345</v>
+                                    <v>4630324</v>
                                 </b>
                             </bs>
                         </hist>
@@ -34696,7 +34743,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4630345</v>
+                                    <v>4630324</v>
                                 </b>
                             </bs>
                         </hist>
@@ -34924,12 +34971,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1725789</v>
+                                    <v>1725781</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>178302</v>
+                                    <v>178301</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -34955,7 +35002,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2117857</v>
+                                    <v>2117848</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -35114,15 +35161,15 @@
         </relation>
         <relation>
             <name>if_then</name>
-            <cardinality>725914</cardinality>
+            <cardinality>725911</cardinality>
             <columnsizes>
                 <e>
                     <k>if_stmt</k>
-                    <v>725914</v>
+                    <v>725911</v>
                 </e>
                 <e>
                     <k>then_id</k>
-                    <v>725914</v>
+                    <v>725911</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -35136,7 +35183,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>725914</v>
+                                    <v>725911</v>
                                 </b>
                             </bs>
                         </hist>
@@ -35152,7 +35199,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>725914</v>
+                                    <v>725911</v>
                                 </b>
                             </bs>
                         </hist>
@@ -35162,15 +35209,15 @@
         </relation>
         <relation>
             <name>if_else</name>
-            <cardinality>184669</cardinality>
+            <cardinality>184668</cardinality>
             <columnsizes>
                 <e>
                     <k>if_stmt</k>
-                    <v>184669</v>
+                    <v>184668</v>
                 </e>
                 <e>
                     <k>else_id</k>
-                    <v>184669</v>
+                    <v>184668</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -35184,7 +35231,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>184669</v>
+                                    <v>184668</v>
                                 </b>
                             </bs>
                         </hist>
@@ -35200,7 +35247,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>184669</v>
+                                    <v>184668</v>
                                 </b>
                             </bs>
                         </hist>
@@ -35258,15 +35305,15 @@
         </relation>
         <relation>
             <name>constexpr_if_then</name>
-            <cardinality>52998</cardinality>
+            <cardinality>52997</cardinality>
             <columnsizes>
                 <e>
                     <k>constexpr_if_stmt</k>
-                    <v>52998</v>
+                    <v>52997</v>
                 </e>
                 <e>
                     <k>then_id</k>
-                    <v>52998</v>
+                    <v>52997</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -35280,7 +35327,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>52998</v>
+                                    <v>52997</v>
                                 </b>
                             </bs>
                         </hist>
@@ -35296,7 +35343,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>52998</v>
+                                    <v>52997</v>
                                 </b>
                             </bs>
                         </hist>
@@ -35354,15 +35401,15 @@
         </relation>
         <relation>
             <name>while_body</name>
-            <cardinality>29317</cardinality>
+            <cardinality>29316</cardinality>
             <columnsizes>
                 <e>
                     <k>while_stmt</k>
-                    <v>29317</v>
+                    <v>29316</v>
                 </e>
                 <e>
                     <k>body_id</k>
-                    <v>29317</v>
+                    <v>29316</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -35376,7 +35423,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>29317</v>
+                                    <v>29316</v>
                                 </b>
                             </bs>
                         </hist>
@@ -35392,7 +35439,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>29317</v>
+                                    <v>29316</v>
                                 </b>
                             </bs>
                         </hist>
@@ -35402,15 +35449,15 @@
         </relation>
         <relation>
             <name>do_body</name>
-            <cardinality>148874</cardinality>
+            <cardinality>148873</cardinality>
             <columnsizes>
                 <e>
                     <k>do_stmt</k>
-                    <v>148874</v>
+                    <v>148873</v>
                 </e>
                 <e>
                     <k>body_id</k>
-                    <v>148874</v>
+                    <v>148873</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -35424,7 +35471,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>148874</v>
+                                    <v>148873</v>
                                 </b>
                             </bs>
                         </hist>
@@ -35440,7 +35487,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>148874</v>
+                                    <v>148873</v>
                                 </b>
                             </bs>
                         </hist>
@@ -35498,7 +35545,7 @@
         </relation>
         <relation>
             <name>switch_case</name>
-            <cardinality>207501</cardinality>
+            <cardinality>207500</cardinality>
             <columnsizes>
                 <e>
                     <k>switch_stmt</k>
@@ -35510,7 +35557,7 @@
                 </e>
                 <e>
                     <k>case_id</k>
-                    <v>207501</v>
+                    <v>207500</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -35738,7 +35785,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>207501</v>
+                                    <v>207500</v>
                                 </b>
                             </bs>
                         </hist>
@@ -35754,7 +35801,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>207501</v>
+                                    <v>207500</v>
                                 </b>
                             </bs>
                         </hist>
@@ -36004,11 +36051,11 @@
         </relation>
         <relation>
             <name>stmtparents</name>
-            <cardinality>4053474</cardinality>
+            <cardinality>4053456</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>4053474</v>
+                    <v>4053456</v>
                 </e>
                 <e>
                     <k>index</k>
@@ -36016,7 +36063,7 @@
                 </e>
                 <e>
                     <k>parent</k>
-                    <v>1719861</v>
+                    <v>1719854</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -36030,7 +36077,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4053474</v>
+                                    <v>4053456</v>
                                 </b>
                             </bs>
                         </hist>
@@ -36046,7 +36093,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4053474</v>
+                                    <v>4053456</v>
                                 </b>
                             </bs>
                         </hist>
@@ -36184,17 +36231,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>987702</v>
+                                    <v>987697</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>372623</v>
+                                    <v>372621</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>105638</v>
+                                    <v>105637</v>
                                 </b>
                                 <b>
                                     <a>4</a>
@@ -36225,17 +36272,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>987702</v>
+                                    <v>987697</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>372623</v>
+                                    <v>372621</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>105638</v>
+                                    <v>105637</v>
                                 </b>
                                 <b>
                                     <a>4</a>
@@ -36260,22 +36307,22 @@
         </relation>
         <relation>
             <name>ishandler</name>
-            <cardinality>62676</cardinality>
+            <cardinality>62675</cardinality>
             <columnsizes>
                 <e>
                     <k>block</k>
-                    <v>62676</v>
+                    <v>62675</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>stmt_decl_bind</name>
-            <cardinality>580843</cardinality>
+            <cardinality>580842</cardinality>
             <columnsizes>
                 <e>
                     <k>stmt</k>
-                    <v>541061</v>
+                    <v>541060</v>
                 </e>
                 <e>
                     <k>num</k>
@@ -36283,7 +36330,7 @@
                 </e>
                 <e>
                     <k>decl</k>
-                    <v>580739</v>
+                    <v>580738</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -36297,7 +36344,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>520372</v>
+                                    <v>520371</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -36318,7 +36365,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>520372</v>
+                                    <v>520371</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -36521,7 +36568,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>580702</v>
+                                    <v>580700</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -36542,7 +36589,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>580739</v>
+                                    <v>580738</v>
                                 </b>
                             </bs>
                         </hist>
@@ -36552,11 +36599,11 @@
         </relation>
         <relation>
             <name>stmt_decl_entry_bind</name>
-            <cardinality>580843</cardinality>
+            <cardinality>580842</cardinality>
             <columnsizes>
                 <e>
                     <k>stmt</k>
-                    <v>541061</v>
+                    <v>541060</v>
                 </e>
                 <e>
                     <k>num</k>
@@ -36564,7 +36611,7 @@
                 </e>
                 <e>
                     <k>decl_entry</k>
-                    <v>580785</v>
+                    <v>580784</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -36578,7 +36625,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>520372</v>
+                                    <v>520371</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -36599,7 +36646,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>520372</v>
+                                    <v>520371</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -36802,7 +36849,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>580764</v>
+                                    <v>580763</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -36823,7 +36870,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>580785</v>
+                                    <v>580784</v>
                                 </b>
                             </bs>
                         </hist>
@@ -36833,15 +36880,15 @@
         </relation>
         <relation>
             <name>blockscope</name>
-            <cardinality>1410868</cardinality>
+            <cardinality>1410861</cardinality>
             <columnsizes>
                 <e>
                     <k>block</k>
-                    <v>1410868</v>
+                    <v>1410861</v>
                 </e>
                 <e>
                     <k>enclosing</k>
-                    <v>1295552</v>
+                    <v>1295546</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -36855,7 +36902,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1410868</v>
+                                    <v>1410861</v>
                                 </b>
                             </bs>
                         </hist>
@@ -36871,12 +36918,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1230191</v>
+                                    <v>1230185</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>13</b>
-                                    <v>65361</v>
+                                    <v>65360</v>
                                 </b>
                             </bs>
                         </hist>
@@ -36886,15 +36933,15 @@
         </relation>
         <relation>
             <name>jumpinfo</name>
-            <cardinality>254457</cardinality>
+            <cardinality>254455</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>254457</v>
+                    <v>254455</v>
                 </e>
                 <e>
                     <k>str</k>
-                    <v>21191</v>
+                    <v>21190</v>
                 </e>
                 <e>
                     <k>target</k>
@@ -36912,7 +36959,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>254457</v>
+                                    <v>254455</v>
                                 </b>
                             </bs>
                         </hist>
@@ -36928,7 +36975,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>254457</v>
+                                    <v>254455</v>
                                 </b>
                             </bs>
                         </hist>
@@ -37072,11 +37119,11 @@
         </relation>
         <relation>
             <name>preprocdirects</name>
-            <cardinality>4190586</cardinality>
+            <cardinality>4190567</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>4190586</v>
+                    <v>4190567</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -37084,7 +37131,7 @@
                 </e>
                 <e>
                     <k>location</k>
-                    <v>4149969</v>
+                    <v>4149950</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -37098,7 +37145,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4190586</v>
+                                    <v>4190567</v>
                                 </b>
                             </bs>
                         </hist>
@@ -37114,7 +37161,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4190586</v>
+                                    <v>4190567</v>
                                 </b>
                             </bs>
                         </hist>
@@ -37262,7 +37309,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4149502</v>
+                                    <v>4149483</v>
                                 </b>
                                 <b>
                                     <a>88</a>
@@ -37283,7 +37330,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4149969</v>
+                                    <v>4149950</v>
                                 </b>
                             </bs>
                         </hist>
@@ -37293,15 +37340,15 @@
         </relation>
         <relation>
             <name>preprocpair</name>
-            <cardinality>1431410</cardinality>
+            <cardinality>1431403</cardinality>
             <columnsizes>
                 <e>
                     <k>begin</k>
-                    <v>1197043</v>
+                    <v>1197038</v>
                 </e>
                 <e>
                     <k>elseelifend</k>
-                    <v>1431410</v>
+                    <v>1431403</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -37315,17 +37362,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>978550</v>
+                                    <v>978546</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>208222</v>
+                                    <v>208221</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>11</b>
-                                    <v>10271</v>
+                                    <v>10270</v>
                                 </b>
                             </bs>
                         </hist>
@@ -37341,7 +37388,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1431410</v>
+                                    <v>1431403</v>
                                 </b>
                             </bs>
                         </hist>
@@ -37351,41 +37398,41 @@
         </relation>
         <relation>
             <name>preproctrue</name>
-            <cardinality>767060</cardinality>
+            <cardinality>767056</cardinality>
             <columnsizes>
                 <e>
                     <k>branch</k>
-                    <v>767060</v>
+                    <v>767056</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>preprocfalse</name>
-            <cardinality>331474</cardinality>
+            <cardinality>331473</cardinality>
             <columnsizes>
                 <e>
                     <k>branch</k>
-                    <v>331474</v>
+                    <v>331473</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>preproctext</name>
-            <cardinality>3367747</cardinality>
+            <cardinality>3367732</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>3367747</v>
+                    <v>3367732</v>
                 </e>
                 <e>
                     <k>head</k>
-                    <v>2440673</v>
+                    <v>2440662</v>
                 </e>
                 <e>
                     <k>body</k>
-                    <v>1426418</v>
+                    <v>1426412</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -37399,7 +37446,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3367747</v>
+                                    <v>3367732</v>
                                 </b>
                             </bs>
                         </hist>
@@ -37415,7 +37462,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3367747</v>
+                                    <v>3367732</v>
                                 </b>
                             </bs>
                         </hist>
@@ -37431,12 +37478,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2301873</v>
+                                    <v>2301863</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>740</b>
-                                    <v>138800</v>
+                                    <v>138799</v>
                                 </b>
                             </bs>
                         </hist>
@@ -37452,7 +37499,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2381962</v>
+                                    <v>2381951</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -37473,12 +37520,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1291263</v>
+                                    <v>1291258</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>6</b>
-                                    <v>106981</v>
+                                    <v>106980</v>
                                 </b>
                                 <b>
                                     <a>6</a>
@@ -37499,7 +37546,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1294120</v>
+                                    <v>1294114</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -37519,15 +37566,15 @@
         </relation>
         <relation>
             <name>includes</name>
-            <cardinality>313266</cardinality>
+            <cardinality>313265</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>313266</v>
+                    <v>313265</v>
                 </e>
                 <e>
                     <k>included</k>
-                    <v>117183</v>
+                    <v>117182</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -37541,7 +37588,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>313266</v>
+                                    <v>313265</v>
                                 </b>
                             </bs>
                         </hist>
@@ -37572,7 +37619,7 @@
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>10271</v>
+                                    <v>10270</v>
                                 </b>
                                 <b>
                                     <a>6</a>
@@ -37640,11 +37687,11 @@
         </relation>
         <relation>
             <name>link_parent</name>
-            <cardinality>28676866</cardinality>
+            <cardinality>28682586</cardinality>
             <columnsizes>
                 <e>
                     <k>element</k>
-                    <v>3584451</v>
+                    <v>3585083</v>
                 </e>
                 <e>
                     <k>link_target</k>
@@ -37662,7 +37709,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>432954</v>
+                                    <v>432951</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -37672,7 +37719,7 @@
                                 <b>
                                     <a>9</a>
                                     <b>10</b>
-                                    <v>3131152</v>
+                                    <v>3131788</v>
                                 </b>
                             </bs>
                         </hist>
@@ -37691,48 +37738,48 @@
                                     <v>34</v>
                                 </b>
                                 <b>
-                                    <a>90034</a>
-                                    <b>90035</b>
+                                    <a>90053</a>
+                                    <b>90054</b>
                                     <v>34</v>
                                 </b>
                                 <b>
-                                    <a>90100</a>
-                                    <b>90101</b>
+                                    <a>90119</a>
+                                    <b>90120</b>
                                     <v>34</v>
                                 </b>
                                 <b>
-                                    <a>90152</a>
-                                    <b>90153</b>
+                                    <a>90171</a>
+                                    <b>90172</b>
                                     <v>34</v>
                                 </b>
                                 <b>
-                                    <a>90159</a>
-                                    <b>90160</b>
+                                    <a>90178</a>
+                                    <b>90179</b>
                                     <v>34</v>
                                 </b>
                                 <b>
-                                    <a>90195</a>
-                                    <b>90196</b>
+                                    <a>90214</a>
+                                    <b>90215</b>
                                     <v>34</v>
                                 </b>
                                 <b>
-                                    <a>90252</a>
-                                    <b>90253</b>
+                                    <a>90271</a>
+                                    <b>90272</b>
                                     <v>34</v>
                                 </b>
                                 <b>
-                                    <a>91339</a>
-                                    <b>91340</b>
+                                    <a>91358</a>
+                                    <b>91359</b>
                                     <v>34</v>
                                 </b>
                                 <b>
-                                    <a>94665</a>
-                                    <b>94666</b>
+                                    <a>94684</a>
+                                    <b>94685</b>
                                     <v>34</v>
                                 </b>
                                 <b>
-                                    <a>96273</a>
-                                    <b>96274</b>
+                                    <a>96292</a>
+                                    <b>96293</b>
                                     <v>34</v>
                                 </b>
                             </bs>
diff --git a/cpp/ql/lib/upgrades/6f5d51e89e762fe4609fd4ac8ee3afb04221e873/old.dbscheme b/cpp/ql/lib/upgrades/6f5d51e89e762fe4609fd4ac8ee3afb04221e873/old.dbscheme
new file mode 100644
index 00000000000..6f5d51e89e7
--- /dev/null
+++ b/cpp/ql/lib/upgrades/6f5d51e89e762fe4609fd4ac8ee3afb04221e873/old.dbscheme
@@ -0,0 +1,2316 @@
+
+/**
+ * An invocation of the compiler. Note that more than one file may be
+ * compiled per invocation. For example, this command compiles three
+ * source files:
+ *
+ *   gcc -c f1.c f2.c f3.c
+ *
+ * The `id` simply identifies the invocation, while `cwd` is the working
+ * directory from which the compiler was invoked.
+ */
+compilations(
+    /**
+     * An invocation of the compiler. Note that more than one file may
+     * be compiled per invocation. For example, this command compiles
+     * three source files:
+     *
+     *   gcc -c f1.c f2.c f3.c
+     */
+    unique int id : @compilation,
+    string cwd : string ref
+);
+
+/**
+ * The arguments that were passed to the extractor for a compiler
+ * invocation. If `id` is for the compiler invocation
+ *
+ *   gcc -c f1.c f2.c f3.c
+ *
+ * then typically there will be rows for
+ *
+ * num | arg
+ * --- | ---
+ * 0   | *path to extractor*
+ * 1   | `--mimic`
+ * 2   | `/usr/bin/gcc`
+ * 3   | `-c`
+ * 4   | f1.c
+ * 5   | f2.c
+ * 6   | f3.c
+ */
+#keyset[id, num]
+compilation_args(
+    int id : @compilation ref,
+    int num : int ref,
+    string arg : string ref
+);
+
+/**
+ * The source files that are compiled by a compiler invocation.
+ * If `id` is for the compiler invocation
+ *
+ *   gcc -c f1.c f2.c f3.c
+ *
+ * then there will be rows for
+ *
+ * num | arg
+ * --- | ---
+ * 0   | f1.c
+ * 1   | f2.c
+ * 2   | f3.c
+ *
+ * Note that even if those files `#include` headers, those headers
+ * do not appear as rows.
+ */
+#keyset[id, num]
+compilation_compiling_files(
+    int id : @compilation ref,
+    int num : int ref,
+    int file : @file ref
+);
+
+/**
+ * The time taken by the extractor for a compiler invocation.
+ *
+ * For each file `num`, there will be rows for
+ *
+ * kind | seconds
+ * ---- | ---
+ * 1    | CPU seconds used by the extractor frontend
+ * 2    | Elapsed seconds during the extractor frontend
+ * 3    | CPU seconds used by the extractor backend
+ * 4    | Elapsed seconds during the extractor backend
+ */
+#keyset[id, num, kind]
+compilation_time(
+    int id : @compilation ref,
+    int num : int ref,
+    /* kind:
+       1 = frontend_cpu_seconds
+       2 = frontend_elapsed_seconds
+       3 = extractor_cpu_seconds
+       4 = extractor_elapsed_seconds
+    */
+    int kind : int ref,
+    float seconds : float ref
+);
+
+/**
+ * An error or warning generated by the extractor.
+ * The diagnostic message `diagnostic` was generated during compiler
+ * invocation `compilation`, and is the `file_number_diagnostic_number`th
+ * message generated while extracting the `file_number`th file of that
+ * invocation.
+ */
+#keyset[compilation, file_number, file_number_diagnostic_number]
+diagnostic_for(
+    int diagnostic : @diagnostic ref,
+    int compilation : @compilation ref,
+    int file_number : int ref,
+    int file_number_diagnostic_number : int ref
+);
+
+/**
+ * If extraction was successful, then `cpu_seconds` and
+ * `elapsed_seconds` are the CPU time and elapsed time (respectively)
+ * that extraction took for compiler invocation `id`.
+ */
+compilation_finished(
+    unique int id : @compilation ref,
+    float cpu_seconds : float ref,
+    float elapsed_seconds : float ref
+);
+
+
+/**
+ * External data, loaded from CSV files during snapshot creation. See
+ * [Tutorial: Incorporating external data](https://help.semmle.com/wiki/display/SD/Tutorial%3A+Incorporating+external+data)
+ * for more information.
+ */
+externalData(
+    int id : @externalDataElement,
+    string path : string ref,
+    int column: int ref,
+    string value : string ref
+);
+
+/**
+ * The source location of the snapshot.
+ */
+sourceLocationPrefix(string prefix : string ref);
+
+/**
+ * Information about packages that provide code used during compilation.
+ * The `id` is just a unique identifier.
+ * The `namespace` is typically the name of the package manager that
+ * provided the package (e.g. "dpkg" or "yum").
+ * The `package_name` is the name of the package, and `version` is its
+ * version (as a string).
+ */
+external_packages(
+    unique int id: @external_package,
+    string namespace : string ref,
+    string package_name : string ref,
+    string version : string ref
+);
+
+/**
+ * Holds if File `fileid` was provided by package `package`.
+ */
+header_to_external_package(
+    int fileid : @file ref,
+    int package : @external_package ref
+);
+
+/*
+ * Version history
+ */
+
+svnentries(
+    unique int id : @svnentry,
+    string revision : string ref,
+    string author : string ref,
+    date revisionDate : date ref,
+    int changeSize : int ref
+)
+
+svnaffectedfiles(
+    int id : @svnentry ref,
+    int file : @file ref,
+    string action : string ref
+)
+
+svnentrymsg(
+    unique int id : @svnentry ref,
+    string message : string ref
+)
+
+svnchurn(
+    int commit : @svnentry ref,
+    int file : @file ref,
+    int addedLines : int ref,
+    int deletedLines : int ref
+)
+
+/*
+ * C++ dbscheme
+ */
+
+extractor_version(
+    string codeql_version: string ref,
+    string frontend_version: string ref
+)
+
+@location = @location_stmt | @location_expr | @location_default ;
+
+/**
+ * The location of an element that is not an expression or a statement.
+ * The location spans column `startcolumn` of line `startline` to
+ * column `endcolumn` of line `endline` in file `file`.
+ * For more information, see
+ * [Locations](https://codeql.github.com/docs/writing-codeql-queries/providing-locations-in-codeql-queries/).
+ */
+locations_default(
+    /** The location of an element that is not an expression or a statement. */
+    unique int id: @location_default,
+    int container: @container ref,
+    int startLine: int ref,
+    int startColumn: int ref,
+    int endLine: int ref,
+    int endColumn: int ref
+);
+
+/**
+ * The location of a statement.
+ * The location spans column `startcolumn` of line `startline` to
+ * column `endcolumn` of line `endline` in file `file`.
+ * For more information, see
+ * [Locations](https://codeql.github.com/docs/writing-codeql-queries/providing-locations-in-codeql-queries/).
+ */
+locations_stmt(
+    /** The location of a statement. */
+    unique int id: @location_stmt,
+    int container: @container ref,
+    int startLine: int ref,
+    int startColumn: int ref,
+    int endLine: int ref,
+    int endColumn: int ref
+);
+
+/**
+ * The location of an expression.
+ * The location spans column `startcolumn` of line `startline` to
+ * column `endcolumn` of line `endline` in file `file`.
+ * For more information, see
+ * [Locations](https://codeql.github.com/docs/writing-codeql-queries/providing-locations-in-codeql-queries/).
+ */
+locations_expr(
+    /** The location of an expression. */
+    unique int id: @location_expr,
+    int container: @container ref,
+    int startLine: int ref,
+    int startColumn: int ref,
+    int endLine: int ref,
+    int endColumn: int ref
+);
+
+/** An element for which line-count information is available. */
+@sourceline = @file | @function | @variable | @enumconstant | @xmllocatable;
+
+numlines(
+    int element_id: @sourceline ref,
+    int num_lines: int ref,
+    int num_code: int ref,
+    int num_comment: int ref
+);
+
+diagnostics(
+    unique int id: @diagnostic,
+    int severity: int ref,
+    string error_tag: string ref,
+    string error_message: string ref,
+    string full_error_message: string ref,
+    int location: @location_default ref
+);
+
+files(
+    unique int id: @file,
+    string name: string ref
+);
+
+folders(
+    unique int id: @folder,
+    string name: string ref
+);
+
+@container = @folder | @file
+
+containerparent(
+    int parent: @container ref,
+    unique int child: @container ref
+);
+
+fileannotations(
+    int id: @file ref,
+    int kind: int ref,
+    string name: string ref,
+    string value: string ref
+);
+
+inmacroexpansion(
+    int id: @element ref,
+    int inv: @macroinvocation ref
+);
+
+affectedbymacroexpansion(
+    int id: @element ref,
+    int inv: @macroinvocation ref
+);
+
+case @macroinvocation.kind of
+  1 = @macro_expansion
+| 2 = @other_macro_reference
+;
+
+macroinvocations(
+    unique int id: @macroinvocation,
+    int macro_id: @ppd_define ref,
+    int location: @location_default ref,
+    int kind: int ref
+);
+
+macroparent(
+    unique int id: @macroinvocation ref,
+    int parent_id: @macroinvocation ref
+);
+
+// a macroinvocation may be part of another location
+// the way to find a constant expression that uses a macro
+// is thus to find a constant expression that has a location
+// to which a macro invocation is bound
+macrolocationbind(
+    int id: @macroinvocation ref,
+    int location: @location ref
+);
+
+#keyset[invocation, argument_index]
+macro_argument_unexpanded(
+    int invocation: @macroinvocation ref,
+    int argument_index: int ref,
+    string text: string ref
+);
+
+#keyset[invocation, argument_index]
+macro_argument_expanded(
+    int invocation: @macroinvocation ref,
+    int argument_index: int ref,
+    string text: string ref
+);
+
+/*
+case @function.kind of
+  1 = @normal_function
+| 2 = @constructor
+| 3 = @destructor
+| 4 = @conversion_function
+| 5 = @operator
+| 6 = @builtin_function     // GCC built-in functions, e.g. __builtin___memcpy_chk
+| 7 = @user_defined_literal
+| 8 = @deduction_guide
+;
+*/
+
+functions(
+    unique int id: @function,
+    string name: string ref,
+    int kind: int ref
+);
+
+function_entry_point(
+    int id: @function ref,
+    unique int entry_point: @stmt ref
+);
+
+function_return_type(
+    int id: @function ref,
+    int return_type: @type ref
+);
+
+/**
+ * If `function` is a coroutine, then this gives the `std::experimental::resumable_traits`
+ * instance associated with it, and the variables representing the `handle` and `promise`
+ * for it.
+ */
+coroutine(
+  unique int function: @function ref,
+  int traits: @type ref
+);
+
+/*
+case @coroutine_placeholder_variable.kind of
+  1 = @handle
+| 2 = @promise
+| 3 = @init_await_resume
+;
+*/
+
+coroutine_placeholder_variable(
+  unique int placeholder_variable: @variable ref,
+  int kind: int ref,
+  int function: @function ref
+)
+
+/** The `new` function used for allocating the coroutine state, if any. */
+coroutine_new(
+  unique int function: @function ref,
+  int new: @function ref
+);
+
+/** The `delete` function used for deallocating the coroutine state, if any. */
+coroutine_delete(
+  unique int function: @function ref,
+  int delete: @function ref
+);
+
+purefunctions(unique int id: @function ref);
+
+function_deleted(unique int id: @function ref);
+
+function_defaulted(unique int id: @function ref);
+
+function_prototyped(unique int id: @function ref)
+
+deduction_guide_for_class(
+    int id: @function ref,
+    int class_template: @usertype ref
+)
+
+member_function_this_type(
+    unique int id: @function ref,
+    int this_type: @type ref
+);
+
+#keyset[id, type_id]
+fun_decls(
+    int id: @fun_decl,
+    int function: @function ref,
+    int type_id: @type ref,
+    string name: string ref,
+    int location: @location_default ref
+);
+fun_def(unique int id: @fun_decl ref);
+fun_specialized(unique int id: @fun_decl ref);
+fun_implicit(unique int id: @fun_decl ref);
+fun_decl_specifiers(
+    int id: @fun_decl ref,
+    string name: string ref
+)
+#keyset[fun_decl, index]
+fun_decl_throws(
+    int fun_decl: @fun_decl ref,
+    int index: int ref,
+    int type_id: @type ref
+);
+/* an empty throw specification is different from none */
+fun_decl_empty_throws(unique int fun_decl: @fun_decl ref);
+fun_decl_noexcept(
+    int fun_decl: @fun_decl ref,
+    int constant: @expr ref
+);
+fun_decl_empty_noexcept(int fun_decl: @fun_decl ref);
+fun_decl_typedef_type(
+    unique int fun_decl: @fun_decl ref,
+    int typedeftype_id: @usertype ref
+);
+
+param_decl_bind(
+    unique int id: @var_decl ref,
+    int index: int ref,
+    int fun_decl: @fun_decl ref
+);
+
+#keyset[id, type_id]
+var_decls(
+    int id: @var_decl,
+    int variable: @variable ref,
+    int type_id: @type ref,
+    string name: string ref,
+    int location: @location_default ref
+);
+var_def(unique int id: @var_decl ref);
+var_decl_specifiers(
+    int id: @var_decl ref,
+    string name: string ref
+)
+is_structured_binding(unique int id: @variable ref);
+
+type_decls(
+    unique int id: @type_decl,
+    int type_id: @type ref,
+    int location: @location_default ref
+);
+type_def(unique int id: @type_decl ref);
+type_decl_top(
+    unique int type_decl: @type_decl ref
+);
+
+namespace_decls(
+    unique int id: @namespace_decl,
+    int namespace_id: @namespace ref,
+    int location: @location_default ref,
+    int bodylocation: @location_default ref
+);
+
+case @using.kind of
+  1 = @using_declaration
+| 2 = @using_directive
+| 3 = @using_enum_declaration
+;
+
+usings(
+    unique int id: @using,
+    int element_id: @element ref,
+    int location: @location_default ref,
+    int kind: int ref
+);
+
+/** The element which contains the `using` declaration. */
+using_container(
+    int parent: @element ref,
+    int child: @using ref
+);
+
+static_asserts(
+    unique int id: @static_assert,
+    int condition : @expr ref,
+    string message : string ref,
+    int location: @location_default ref,
+    int enclosing : @element ref
+);
+
+// each function has an ordered list of parameters
+#keyset[id, type_id]
+#keyset[function, index, type_id]
+params(
+    int id: @parameter,
+    int function: @functionorblock ref,
+    int index: int ref,
+    int type_id: @type ref
+);
+
+overrides(
+    int new: @function ref,
+    int old: @function ref
+);
+
+#keyset[id, type_id]
+membervariables(
+    int id: @membervariable,
+    int type_id: @type ref,
+    string name: string ref
+);
+
+#keyset[id, type_id]
+globalvariables(
+    int id: @globalvariable,
+    int type_id: @type ref,
+    string name: string ref
+);
+
+#keyset[id, type_id]
+localvariables(
+    int id: @localvariable,
+    int type_id: @type ref,
+    string name: string ref
+);
+
+autoderivation(
+    unique int var: @variable ref,
+    int derivation_type: @type ref
+);
+
+orphaned_variables(
+    int var: @localvariable ref,
+    int function: @function ref
+)
+
+enumconstants(
+    unique int id: @enumconstant,
+    int parent: @usertype ref,
+    int index: int ref,
+    int type_id: @type ref,
+    string name: string ref,
+    int location: @location_default ref
+);
+
+@variable = @localscopevariable | @globalvariable | @membervariable;
+
+@localscopevariable = @localvariable | @parameter;
+
+/**
+ * Built-in types are the fundamental types, e.g., integral, floating, and void.
+ */
+case @builtintype.kind of
+   1 = @errortype
+|  2 = @unknowntype
+|  3 = @void
+|  4 = @boolean
+|  5 = @char
+|  6 = @unsigned_char
+|  7 = @signed_char
+|  8 = @short
+|  9 = @unsigned_short
+| 10 = @signed_short
+| 11 = @int
+| 12 = @unsigned_int
+| 13 = @signed_int
+| 14 = @long
+| 15 = @unsigned_long
+| 16 = @signed_long
+| 17 = @long_long
+| 18 = @unsigned_long_long
+| 19 = @signed_long_long
+// ... 20 Microsoft-specific __int8
+// ... 21 Microsoft-specific __int16
+// ... 22 Microsoft-specific __int32
+// ... 23 Microsoft-specific __int64
+| 24 = @float
+| 25 = @double
+| 26 = @long_double
+| 27 = @complex_float         // C99-specific _Complex float
+| 28 = @complex_double        // C99-specific _Complex double
+| 29 = @complex_long_double   // C99-specific _Complex long double
+| 30 = @imaginary_float       // C99-specific _Imaginary float
+| 31 = @imaginary_double      // C99-specific _Imaginary double
+| 32 = @imaginary_long_double // C99-specific _Imaginary long double
+| 33 = @wchar_t               // Microsoft-specific
+| 34 = @decltype_nullptr      // C++11
+| 35 = @int128                // __int128
+| 36 = @unsigned_int128       // unsigned __int128
+| 37 = @signed_int128         // signed __int128
+| 38 = @float128              // __float128
+| 39 = @complex_float128      // _Complex __float128
+| 40 = @decimal32             // _Decimal32
+| 41 = @decimal64             // _Decimal64
+| 42 = @decimal128            // _Decimal128
+| 43 = @char16_t
+| 44 = @char32_t
+| 45 = @std_float32           // _Float32
+| 46 = @float32x              // _Float32x
+| 47 = @std_float64           // _Float64
+| 48 = @float64x              // _Float64x
+| 49 = @std_float128          // _Float128
+// ... 50 _Float128x
+| 51 = @char8_t
+| 52 = @float16               // _Float16
+| 53 = @complex_float16       // _Complex _Float16
+| 54 = @fp16                  // __fp16
+| 55 = @std_bfloat16          // __bf16
+| 56 = @std_float16           // std::float16_t
+| 57 = @complex_std_float32   // _Complex _Float32
+| 58 = @complex_float32x      // _Complex _Float32x
+| 59 = @complex_std_float64   // _Complex _Float64
+| 60 = @complex_float64x      // _Complex _Float64x
+| 61 = @complex_std_float128  // _Complex _Float128
+;
+
+builtintypes(
+    unique int id: @builtintype,
+    string name: string ref,
+    int kind: int ref,
+    int size: int ref,
+    int sign: int ref,
+    int alignment: int ref
+);
+
+/**
+ * Derived types are types that are directly derived from existing types and
+ * point to, refer to, transform type data to return a new type.
+ */
+case @derivedtype.kind of
+   1 = @pointer
+|  2 = @reference
+|  3 = @type_with_specifiers
+|  4 = @array
+|  5 = @gnu_vector
+|  6 = @routineptr
+|  7 = @routinereference
+|  8 = @rvalue_reference // C++11
+// ... 9 type_conforming_to_protocols deprecated
+| 10 = @block
+;
+
+derivedtypes(
+    unique int id: @derivedtype,
+    string name: string ref,
+    int kind: int ref,
+    int type_id: @type ref
+);
+
+pointerishsize(unique int id: @derivedtype ref,
+    int size: int ref,
+    int alignment: int ref);
+
+arraysizes(
+    unique int id: @derivedtype ref,
+    int num_elements: int ref,
+    int bytesize: int ref,
+    int alignment: int ref
+);
+
+typedefbase(
+    unique int id: @usertype ref,
+    int type_id: @type ref
+);
+
+/**
+ * An instance of the C++11 `decltype` operator.  For example:
+ * ```
+ * int a;
+ * decltype(1+a) b;
+ * ```
+ * Here `expr` is `1+a`.
+ *
+ * Sometimes an additional pair of parentheses around the expression
+ * would change the semantics of this decltype, e.g.
+ * ```
+ * struct A { double x; };
+ * const A* a = new A();
+ * decltype( a->x ); // type is double
+ * decltype((a->x)); // type is const double&
+ * ```
+ * (Please consult the C++11 standard for more details).
+ * `parentheses_would_change_meaning` is `true` iff that is the case.
+ */
+#keyset[id, expr]
+decltypes(
+    int id: @decltype,
+    int expr: @expr ref,
+    int base_type: @type ref,
+    boolean parentheses_would_change_meaning: boolean ref
+);
+
+/*
+case @usertype.kind of
+   1 = @struct
+|  2 = @class
+|  3 = @union
+|  4 = @enum
+|  5 = @typedef                       // classic C: typedef typedef type name
+|  6 = @template
+|  7 = @template_parameter
+|  8 = @template_template_parameter
+|  9 = @proxy_class                   // a proxy class associated with a template parameter
+// ... 10 objc_class deprecated
+// ... 11 objc_protocol deprecated
+// ... 12 objc_category deprecated
+| 13 = @scoped_enum
+| 14 = @using_alias                  // a using name = type style typedef
+;
+*/
+
+usertypes(
+    unique int id: @usertype,
+    string name: string ref,
+    int kind: int ref
+);
+
+usertypesize(
+    unique int id: @usertype ref,
+    int size: int ref,
+    int alignment: int ref
+);
+
+usertype_final(unique int id: @usertype ref);
+
+usertype_uuid(
+    unique int id: @usertype ref,
+    string uuid: string ref
+);
+
+mangled_name(
+    unique int id: @declaration ref,
+    int mangled_name : @mangledname,
+    boolean is_complete: boolean ref
+);
+
+is_pod_class(unique int id: @usertype ref);
+is_standard_layout_class(unique int id: @usertype ref);
+
+is_complete(unique int id: @usertype ref);
+
+is_class_template(unique int id: @usertype ref);
+class_instantiation(
+    int to: @usertype ref,
+    int from: @usertype ref
+);
+class_template_argument(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+class_template_argument_value(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+is_proxy_class_for(
+    unique int id: @usertype ref,
+    unique int templ_param_id: @usertype ref
+);
+
+type_mentions(
+    unique int id: @type_mention,
+    int type_id: @type ref,
+    int location: @location ref,
+    // a_symbol_reference_kind from the frontend.
+    int kind: int ref
+);
+
+is_function_template(unique int id: @function ref);
+function_instantiation(
+    unique int to: @function ref,
+    int from: @function ref
+);
+function_template_argument(
+    int function_id: @function ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+function_template_argument_value(
+    int function_id: @function ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+is_variable_template(unique int id: @variable ref);
+variable_instantiation(
+    unique int to: @variable ref,
+    int from: @variable ref
+);
+variable_template_argument(
+    int variable_id: @variable ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+variable_template_argument_value(
+    int variable_id: @variable ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+routinetypes(
+    unique int id: @routinetype,
+    int return_type: @type ref
+);
+
+routinetypeargs(
+    int routine: @routinetype ref,
+    int index: int ref,
+    int type_id: @type ref
+);
+
+ptrtomembers(
+    unique int id: @ptrtomember,
+    int type_id: @type ref,
+    int class_id: @type ref
+);
+
+/*
+ specifiers for types, functions, and variables
+
+    "public",
+    "protected",
+    "private",
+
+    "const",
+    "volatile",
+    "static",
+
+    "pure",
+    "virtual",
+    "sealed", // Microsoft
+    "__interface", // Microsoft
+    "inline",
+    "explicit",
+
+    "near", // near far extension
+    "far", // near far extension
+    "__ptr32", // Microsoft
+    "__ptr64", // Microsoft
+    "__sptr", // Microsoft
+    "__uptr", // Microsoft
+    "dllimport", // Microsoft
+    "dllexport", // Microsoft
+    "thread", // Microsoft
+    "naked", // Microsoft
+    "microsoft_inline", // Microsoft
+    "forceinline", // Microsoft
+    "selectany", // Microsoft
+    "nothrow", // Microsoft
+    "novtable", // Microsoft
+    "noreturn", // Microsoft
+    "noinline", // Microsoft
+    "noalias", // Microsoft
+    "restrict", // Microsoft
+*/
+
+specifiers(
+    unique int id: @specifier,
+    unique string str: string ref
+);
+
+typespecifiers(
+    int type_id: @type ref,
+    int spec_id: @specifier ref
+);
+
+funspecifiers(
+    int func_id: @function ref,
+    int spec_id: @specifier ref
+);
+
+varspecifiers(
+    int var_id: @accessible ref,
+    int spec_id: @specifier ref
+);
+
+explicit_specifier_exprs(
+    unique int func_id: @function ref,
+    int constant: @expr ref
+)
+
+attributes(
+    unique int id: @attribute,
+    int kind: int ref,
+    string name: string ref,
+    string name_space: string ref,
+    int location: @location_default ref
+);
+
+case @attribute.kind of
+  0 = @gnuattribute
+| 1 = @stdattribute
+| 2 = @declspec
+| 3 = @msattribute
+| 4 = @alignas
+// ... 5 @objc_propertyattribute deprecated
+;
+
+attribute_args(
+    unique int id: @attribute_arg,
+    int kind: int ref,
+    int attribute: @attribute ref,
+    int index: int ref,
+    int location: @location_default ref
+);
+
+case @attribute_arg.kind of
+  0 = @attribute_arg_empty
+| 1 = @attribute_arg_token
+| 2 = @attribute_arg_constant
+| 3 = @attribute_arg_type
+| 4 = @attribute_arg_constant_expr
+| 5 = @attribute_arg_expr
+;
+
+attribute_arg_value(
+    unique int arg: @attribute_arg ref,
+    string value: string ref
+);
+attribute_arg_type(
+    unique int arg: @attribute_arg ref,
+    int type_id: @type ref
+);
+attribute_arg_constant(
+    unique int arg: @attribute_arg ref,
+    int constant: @expr ref
+)
+attribute_arg_expr(
+    unique int arg: @attribute_arg ref,
+    int expr: @expr ref
+)
+attribute_arg_name(
+    unique int arg: @attribute_arg ref,
+    string name: string ref
+);
+
+typeattributes(
+    int type_id: @type ref,
+    int spec_id: @attribute ref
+);
+
+funcattributes(
+    int func_id: @function ref,
+    int spec_id: @attribute ref
+);
+
+varattributes(
+    int var_id: @accessible ref,
+    int spec_id: @attribute ref
+);
+
+stmtattributes(
+    int stmt_id: @stmt ref,
+    int spec_id: @attribute ref
+);
+
+@type = @builtintype
+      | @derivedtype
+      | @usertype
+      /* TODO | @fixedpointtype */
+      | @routinetype
+      | @ptrtomember
+      | @decltype;
+
+unspecifiedtype(
+    unique int type_id: @type ref,
+    int unspecified_type_id: @type ref
+);
+
+member(
+    int parent: @type ref,
+    int index: int ref,
+    int child: @member ref
+);
+
+@enclosingfunction_child = @usertype | @variable | @namespace
+
+enclosingfunction(
+    unique int child: @enclosingfunction_child ref,
+    int parent: @function ref
+);
+
+derivations(
+    unique int derivation: @derivation,
+    int sub: @type ref,
+    int index: int ref,
+    int super: @type ref,
+    int location: @location_default ref
+);
+
+derspecifiers(
+    int der_id: @derivation ref,
+    int spec_id: @specifier ref
+);
+
+/**
+ * Contains the byte offset of the base class subobject within the derived
+ * class. Only holds for non-virtual base classes, but see table
+ * `virtual_base_offsets` for offsets of virtual base class subobjects.
+ */
+direct_base_offsets(
+    unique int der_id: @derivation ref,
+    int offset: int ref
+);
+
+/**
+ * Contains the byte offset of the virtual base class subobject for class
+ * `super` within a most-derived object of class `sub`. `super` can be either a
+ * direct or indirect base class.
+ */
+#keyset[sub, super]
+virtual_base_offsets(
+    int sub: @usertype ref,
+    int super: @usertype ref,
+    int offset: int ref
+);
+
+frienddecls(
+    unique int id: @frienddecl,
+    int type_id: @type ref,
+    int decl_id: @declaration ref,
+    int location: @location_default ref
+);
+
+@declaredtype = @usertype ;
+
+@declaration = @function
+             | @declaredtype
+             | @variable
+             | @enumconstant
+             | @frienddecl;
+
+@member = @membervariable
+        | @function
+        | @declaredtype
+        | @enumconstant;
+
+@locatable = @diagnostic
+           | @declaration
+           | @ppd_include
+           | @ppd_define
+           | @macroinvocation
+           /*| @funcall*/
+           | @xmllocatable
+           | @attribute
+           | @attribute_arg;
+
+@namedscope = @namespace | @usertype;
+
+@element = @locatable
+         | @file
+         | @folder
+         | @specifier
+         | @type
+         | @expr
+         | @namespace
+         | @initialiser
+         | @stmt
+         | @derivation
+         | @comment
+         | @preprocdirect
+         | @fun_decl
+         | @var_decl
+         | @type_decl
+         | @namespace_decl
+         | @using
+         | @namequalifier
+         | @specialnamequalifyingelement
+         | @static_assert
+         | @type_mention
+         | @lambdacapture;
+
+@exprparent = @element;
+
+comments(
+    unique int id: @comment,
+    string contents: string ref,
+    int location: @location_default ref
+);
+
+commentbinding(
+    int id: @comment ref,
+    int element: @element ref
+);
+
+exprconv(
+    int converted: @expr ref,
+    unique int conversion: @expr ref
+);
+
+compgenerated(unique int id: @element ref);
+
+/**
+ * `destructor_call` destructs the `i`'th entity that should be
+ * destructed following `element`. Note that entities should be
+ * destructed in reverse construction order, so for a given `element`
+ * these should be called from highest to lowest `i`.
+ */
+#keyset[element, destructor_call]
+#keyset[element, i]
+synthetic_destructor_call(
+    int element: @element ref,
+    int i: int ref,
+    int destructor_call: @routineexpr ref
+);
+
+namespaces(
+    unique int id: @namespace,
+    string name: string ref
+);
+
+namespace_inline(
+    unique int id: @namespace ref
+);
+
+namespacembrs(
+    int parentid: @namespace ref,
+    unique int memberid: @namespacembr ref
+);
+
+@namespacembr = @declaration | @namespace;
+
+exprparents(
+    int expr_id: @expr ref,
+    int child_index: int ref,
+    int parent_id: @exprparent ref
+);
+
+expr_isload(unique int expr_id: @expr ref);
+
+@cast = @c_style_cast
+      | @const_cast
+      | @dynamic_cast
+      | @reinterpret_cast
+      | @static_cast
+      ;
+
+/*
+case @conversion.kind of
+  0 = @simple_conversion           // a numeric conversion, qualification conversion, or a reinterpret_cast
+| 1 = @bool_conversion             // conversion to 'bool'
+| 2 = @base_class_conversion       // a derived-to-base conversion
+| 3 = @derived_class_conversion    // a base-to-derived conversion
+| 4 = @pm_base_class_conversion    // a derived-to-base conversion of a pointer to member
+| 5 = @pm_derived_class_conversion // a base-to-derived conversion of a pointer to member
+| 6 = @glvalue_adjust              // an adjustment of the type of a glvalue
+| 7 = @prvalue_adjust              // an adjustment of the type of a prvalue
+;
+*/
+/**
+ * Describes the semantics represented by a cast expression. This is largely
+ * independent of the source syntax of the cast, so it is separate from the
+ * regular expression kind.
+ */
+conversionkinds(
+    unique int expr_id: @cast ref,
+    int kind: int ref
+);
+
+@conversion = @cast
+            | @array_to_pointer
+            | @parexpr
+            | @reference_to
+            | @ref_indirect
+            | @temp_init
+            | @c11_generic
+            ;
+
+/*
+case @funbindexpr.kind of
+  0 = @normal_call  // a normal call
+| 1 = @virtual_call // a virtual call
+| 2 = @adl_call     // a call whose target is only found by ADL
+;
+*/
+iscall(
+    unique int caller: @funbindexpr ref,
+    int kind: int ref
+);
+
+numtemplatearguments(
+    unique int expr_id: @expr ref,
+    int num: int ref
+);
+
+specialnamequalifyingelements(
+    unique int id: @specialnamequalifyingelement,
+    unique string name: string ref
+);
+
+@namequalifiableelement = @expr | @namequalifier;
+@namequalifyingelement = @namespace
+                       | @specialnamequalifyingelement
+                       | @usertype;
+
+namequalifiers(
+    unique int id: @namequalifier,
+    unique int qualifiableelement: @namequalifiableelement ref,
+    int qualifyingelement: @namequalifyingelement ref,
+    int location: @location_default ref
+);
+
+varbind(
+    int expr: @varbindexpr ref,
+    int var: @accessible ref
+);
+
+funbind(
+    int expr: @funbindexpr ref,
+    int fun: @function ref
+);
+
+@any_new_expr = @new_expr
+              | @new_array_expr;
+
+@new_or_delete_expr = @any_new_expr
+                    | @delete_expr
+                    | @delete_array_expr;
+
+@prefix_crement_expr = @preincrexpr | @predecrexpr;
+
+@postfix_crement_expr = @postincrexpr | @postdecrexpr;
+
+@increment_expr = @preincrexpr | @postincrexpr;
+
+@decrement_expr = @predecrexpr | @postdecrexpr;
+
+@crement_expr = @increment_expr | @decrement_expr;
+
+@un_arith_op_expr = @arithnegexpr
+                  | @unaryplusexpr
+                  | @conjugation
+                  | @realpartexpr
+                  | @imagpartexpr
+                  | @crement_expr
+                  ;
+
+@un_bitwise_op_expr = @complementexpr;
+
+@un_log_op_expr = @notexpr;
+
+@un_op_expr = @address_of
+            | @indirect
+            | @un_arith_op_expr
+            | @un_bitwise_op_expr
+            | @builtinaddressof
+            | @vec_fill
+            | @un_log_op_expr
+            | @co_await
+            | @co_yield
+            ;
+
+@bin_log_op_expr = @andlogicalexpr | @orlogicalexpr;
+
+@cmp_op_expr = @eq_op_expr | @rel_op_expr;
+
+@eq_op_expr = @eqexpr | @neexpr;
+
+@rel_op_expr = @gtexpr
+             | @ltexpr
+             | @geexpr
+             | @leexpr
+             | @spaceshipexpr
+             ;
+
+@bin_bitwise_op_expr = @lshiftexpr
+                     | @rshiftexpr
+                     | @andexpr
+                     | @orexpr
+                     | @xorexpr
+                     ;
+
+@p_arith_op_expr = @paddexpr
+                 | @psubexpr
+                 | @pdiffexpr
+                 ;
+
+@bin_arith_op_expr = @addexpr
+                   | @subexpr
+                   | @mulexpr
+                   | @divexpr
+                   | @remexpr
+                   | @jmulexpr
+                   | @jdivexpr
+                   | @fjaddexpr
+                   | @jfaddexpr
+                   | @fjsubexpr
+                   | @jfsubexpr
+                   | @minexpr
+                   | @maxexpr
+                   | @p_arith_op_expr
+                   ;
+
+@bin_op_expr = @bin_arith_op_expr
+             | @bin_bitwise_op_expr
+             | @cmp_op_expr
+             | @bin_log_op_expr
+             ;
+
+@op_expr = @un_op_expr
+         | @bin_op_expr
+         | @assign_expr
+         | @conditionalexpr
+         ;
+
+@assign_arith_expr = @assignaddexpr
+                   | @assignsubexpr
+                   | @assignmulexpr
+                   | @assigndivexpr
+                   | @assignremexpr
+                   ;
+
+@assign_bitwise_expr = @assignandexpr
+                     | @assignorexpr
+                     | @assignxorexpr
+                     | @assignlshiftexpr
+                     | @assignrshiftexpr
+                     ;
+
+@assign_pointer_expr = @assignpaddexpr
+                     | @assignpsubexpr
+                     ;
+
+@assign_op_expr = @assign_arith_expr
+                | @assign_bitwise_expr
+                | @assign_pointer_expr
+                ;
+
+@assign_expr = @assignexpr | @assign_op_expr | @blockassignexpr
+
+/*
+  Binary encoding of the allocator form.
+
+  case @allocator.form of
+    0 = plain
+  | 1 = alignment
+  ;
+*/
+
+/**
+ * The allocator function associated with a `new` or `new[]` expression.
+ * The `form` column specified whether the allocation call contains an alignment
+ * argument.
+ */
+expr_allocator(
+    unique int expr: @any_new_expr ref,
+    int func: @function ref,
+    int form: int ref
+);
+
+/*
+  Binary encoding of the deallocator form.
+
+  case @deallocator.form of
+    0 = plain
+  | 1 = size
+  | 2 = alignment
+  | 4 = destroying_delete
+  ;
+*/
+
+/**
+ * The deallocator function associated with a `delete`, `delete[]`, `new`, or
+ * `new[]` expression. For a `new` or `new[]` expression, the deallocator is the
+ * one used to free memory if the initialization throws an exception.
+ * The `form` column specifies whether the deallocation call contains a size
+ * argument, and alignment argument, or both.
+ */
+expr_deallocator(
+    unique int expr: @new_or_delete_expr ref,
+    int func: @function ref,
+    int form: int ref
+);
+
+/**
+ * Holds if the `@conditionalexpr` is of the two operand form
+ * `guard ? : false`.
+ */
+expr_cond_two_operand(
+    unique int cond: @conditionalexpr ref
+);
+
+/**
+ * The guard of `@conditionalexpr` `guard ? true : false`
+ */
+expr_cond_guard(
+    unique int cond: @conditionalexpr ref,
+    int guard: @expr ref
+);
+
+/**
+ * The expression used when the guard of `@conditionalexpr`
+ * `guard ? true : false` holds. For the two operand form
+ * `guard ?: false` consider using `expr_cond_guard` instead.
+ */
+expr_cond_true(
+    unique int cond: @conditionalexpr ref,
+    int true: @expr ref
+);
+
+/**
+ * The expression used when the guard of `@conditionalexpr`
+ * `guard ? true : false` does not hold.
+ */
+expr_cond_false(
+    unique int cond: @conditionalexpr ref,
+    int false: @expr ref
+);
+
+/** A string representation of the value. */
+values(
+    unique int id: @value,
+    string str: string ref
+);
+
+/** The actual text in the source code for the value, if any. */
+valuetext(
+    unique int id: @value ref,
+    string text: string ref
+);
+
+valuebind(
+    int val: @value ref,
+    unique int expr: @expr ref
+);
+
+fieldoffsets(
+    unique int id: @variable ref,
+    int byteoffset: int ref,
+    int bitoffset: int ref
+);
+
+bitfield(
+    unique int id: @variable ref,
+    int bits: int ref,
+    int declared_bits: int ref
+);
+
+/* TODO
+memberprefix(
+    int member: @expr ref,
+    int prefix: @expr ref
+);
+*/
+
+/*
+   kind(1) = mbrcallexpr
+   kind(2) = mbrptrcallexpr
+   kind(3) = mbrptrmbrcallexpr
+   kind(4) = ptrmbrptrmbrcallexpr
+   kind(5) = mbrreadexpr // x.y
+   kind(6) = mbrptrreadexpr // p->y
+   kind(7) = mbrptrmbrreadexpr // x.*pm
+   kind(8) = mbrptrmbrptrreadexpr // x->*pm
+   kind(9) = staticmbrreadexpr // static x.y
+   kind(10) = staticmbrptrreadexpr // static p->y
+*/
+/* TODO
+memberaccess(
+    int member: @expr ref,
+    int kind: int ref
+);
+*/
+
+initialisers(
+    unique int init: @initialiser,
+    int var: @accessible ref,
+    unique int expr: @expr ref,
+    int location: @location_expr ref
+);
+
+braced_initialisers(
+    int init: @initialiser ref
+);
+
+/**
+ * An ancestor for the expression, for cases in which we cannot
+ * otherwise find the expression's parent.
+ */
+expr_ancestor(
+    int exp: @expr ref,
+    int ancestor: @element ref
+);
+
+exprs(
+    unique int id: @expr,
+    int kind: int ref,
+    int location: @location_expr ref
+);
+
+expr_reuse(
+    int reuse: @expr ref,
+    int original: @expr ref,
+    int value_category: int ref
+)
+
+/*
+  case @value.category of
+    1 = prval
+  | 2 = xval
+  | 3 = lval
+  ;
+*/
+expr_types(
+    int id: @expr ref,
+    int typeid: @type ref,
+    int value_category: int ref
+);
+
+case @expr.kind of
+    1 = @errorexpr
+|   2 = @address_of // & AddressOfExpr
+|   3 = @reference_to // ReferenceToExpr (implicit?)
+|   4 = @indirect // * PointerDereferenceExpr
+|   5 = @ref_indirect // ReferenceDereferenceExpr (implicit?)
+// ...
+|   8 = @array_to_pointer // (???)
+|   9 = @vacuous_destructor_call // VacuousDestructorCall
+// ...
+|  11 = @assume // Microsoft
+|  12 = @parexpr
+|  13 = @arithnegexpr
+|  14 = @unaryplusexpr
+|  15 = @complementexpr
+|  16 = @notexpr
+|  17 = @conjugation // GNU ~ operator
+|  18 = @realpartexpr // GNU __real
+|  19 = @imagpartexpr // GNU __imag
+|  20 = @postincrexpr
+|  21 = @postdecrexpr
+|  22 = @preincrexpr
+|  23 = @predecrexpr
+|  24 = @conditionalexpr
+|  25 = @addexpr
+|  26 = @subexpr
+|  27 = @mulexpr
+|  28 = @divexpr
+|  29 = @remexpr
+|  30 = @jmulexpr // C99 mul imaginary
+|  31 = @jdivexpr // C99 div imaginary
+|  32 = @fjaddexpr // C99 add real + imaginary
+|  33 = @jfaddexpr // C99 add imaginary + real
+|  34 = @fjsubexpr // C99 sub real - imaginary
+|  35 = @jfsubexpr // C99 sub imaginary - real
+|  36 = @paddexpr // pointer add (pointer + int or int + pointer)
+|  37 = @psubexpr // pointer sub (pointer - integer)
+|  38 = @pdiffexpr // difference between two pointers
+|  39 = @lshiftexpr
+|  40 = @rshiftexpr
+|  41 = @andexpr
+|  42 = @orexpr
+|  43 = @xorexpr
+|  44 = @eqexpr
+|  45 = @neexpr
+|  46 = @gtexpr
+|  47 = @ltexpr
+|  48 = @geexpr
+|  49 = @leexpr
+|  50 = @minexpr // GNU minimum
+|  51 = @maxexpr // GNU maximum
+|  52 = @assignexpr
+|  53 = @assignaddexpr
+|  54 = @assignsubexpr
+|  55 = @assignmulexpr
+|  56 = @assigndivexpr
+|  57 = @assignremexpr
+|  58 = @assignlshiftexpr
+|  59 = @assignrshiftexpr
+|  60 = @assignandexpr
+|  61 = @assignorexpr
+|  62 = @assignxorexpr
+|  63 = @assignpaddexpr // assign pointer add
+|  64 = @assignpsubexpr // assign pointer sub
+|  65 = @andlogicalexpr
+|  66 = @orlogicalexpr
+|  67 = @commaexpr
+|  68 = @subscriptexpr // access to member of an array, e.g., a[5]
+// ...  69 @objc_subscriptexpr deprecated
+// ...  70 @cmdaccess deprecated
+// ...
+|  73 = @virtfunptrexpr
+|  74 = @callexpr
+// ...  75 @msgexpr_normal deprecated
+// ...  76 @msgexpr_super deprecated
+// ...  77 @atselectorexpr deprecated
+// ...  78 @atprotocolexpr deprecated
+|  79 = @vastartexpr
+|  80 = @vaargexpr
+|  81 = @vaendexpr
+|  82 = @vacopyexpr
+// ...  83 @atencodeexpr deprecated
+|  84 = @varaccess
+|  85 = @thisaccess
+// ...  86 @objc_box_expr deprecated
+|  87 = @new_expr
+|  88 = @delete_expr
+|  89 = @throw_expr
+|  90 = @condition_decl // a variable declared in a condition, e.g., if(int x = y > 2)
+|  91 = @braced_init_list
+|  92 = @type_id
+|  93 = @runtime_sizeof
+|  94 = @runtime_alignof
+|  95 = @sizeof_pack
+|  96 = @expr_stmt // GNU extension
+|  97 = @routineexpr
+|  98 = @type_operand // used to access a type in certain contexts (haven't found any examples yet....)
+|  99 = @offsetofexpr // offsetof ::= type and field
+| 100 = @hasassignexpr // __has_assign ::= type
+| 101 = @hascopyexpr // __has_copy ::= type
+| 102 = @hasnothrowassign // __has_nothrow_assign ::= type
+| 103 = @hasnothrowconstr // __has_nothrow_constructor ::= type
+| 104 = @hasnothrowcopy // __has_nothrow_copy ::= type
+| 105 = @hastrivialassign // __has_trivial_assign ::= type
+| 106 = @hastrivialconstr // __has_trivial_constructor ::= type
+| 107 = @hastrivialcopy // __has_trivial_copy ::= type
+| 108 = @hasuserdestr // __has_user_destructor ::= type
+| 109 = @hasvirtualdestr // __has_virtual_destructor ::= type
+| 110 = @isabstractexpr // __is_abstract ::= type
+| 111 = @isbaseofexpr // __is_base_of ::= type type
+| 112 = @isclassexpr // __is_class ::= type
+| 113 = @isconvtoexpr // __is_convertible_to ::= type type
+| 114 = @isemptyexpr // __is_empty ::= type
+| 115 = @isenumexpr // __is_enum ::= type
+| 116 = @ispodexpr // __is_pod ::= type
+| 117 = @ispolyexpr // __is_polymorphic ::= type
+| 118 = @isunionexpr // __is_union ::= type
+| 119 = @typescompexpr // GNU __builtin_types_compatible ::= type type
+| 120 = @intaddrexpr // frontend internal builtin, used to implement offsetof
+// ...
+| 122 = @hastrivialdestructor // __has_trivial_destructor ::= type
+| 123 = @literal
+| 124 = @uuidof
+| 127 = @aggregateliteral
+| 128 = @delete_array_expr
+| 129 = @new_array_expr
+// ... 130 @objc_array_literal deprecated
+// ... 131 @objc_dictionary_literal deprecated
+| 132 = @foldexpr
+// ...
+| 200 = @ctordirectinit
+| 201 = @ctorvirtualinit
+| 202 = @ctorfieldinit
+| 203 = @ctordelegatinginit
+| 204 = @dtordirectdestruct
+| 205 = @dtorvirtualdestruct
+| 206 = @dtorfielddestruct
+// ...
+| 210 = @static_cast
+| 211 = @reinterpret_cast
+| 212 = @const_cast
+| 213 = @dynamic_cast
+| 214 = @c_style_cast
+| 215 = @lambdaexpr
+| 216 = @param_ref
+| 217 = @noopexpr
+// ...
+| 294 = @istriviallyconstructibleexpr
+| 295 = @isdestructibleexpr
+| 296 = @isnothrowdestructibleexpr
+| 297 = @istriviallydestructibleexpr
+| 298 = @istriviallyassignableexpr
+| 299 = @isnothrowassignableexpr
+| 300 = @istrivialexpr
+| 301 = @isstandardlayoutexpr
+| 302 = @istriviallycopyableexpr
+| 303 = @isliteraltypeexpr
+| 304 = @hastrivialmoveconstructorexpr
+| 305 = @hastrivialmoveassignexpr
+| 306 = @hasnothrowmoveassignexpr
+| 307 = @isconstructibleexpr
+| 308 = @isnothrowconstructibleexpr
+| 309 = @hasfinalizerexpr
+| 310 = @isdelegateexpr
+| 311 = @isinterfaceclassexpr
+| 312 = @isrefarrayexpr
+| 313 = @isrefclassexpr
+| 314 = @issealedexpr
+| 315 = @issimplevalueclassexpr
+| 316 = @isvalueclassexpr
+| 317 = @isfinalexpr
+| 319 = @noexceptexpr
+| 320 = @builtinshufflevector
+| 321 = @builtinchooseexpr
+| 322 = @builtinaddressof
+| 323 = @vec_fill
+| 324 = @builtinconvertvector
+| 325 = @builtincomplex
+| 326 = @spaceshipexpr
+| 327 = @co_await
+| 328 = @co_yield
+| 329 = @temp_init
+| 330 = @isassignable
+| 331 = @isaggregate
+| 332 = @hasuniqueobjectrepresentations
+| 333 = @builtinbitcast
+| 334 = @builtinshuffle
+| 335 = @blockassignexpr
+| 336 = @issame
+| 337 = @isfunction
+| 338 = @islayoutcompatible
+| 339 = @ispointerinterconvertiblebaseof
+| 340 = @isarray
+| 341 = @arrayrank
+| 342 = @arrayextent
+| 343 = @isarithmetic
+| 344 = @iscompletetype
+| 345 = @iscompound
+| 346 = @isconst
+| 347 = @isfloatingpoint
+| 348 = @isfundamental
+| 349 = @isintegral
+| 350 = @islvaluereference
+| 351 = @ismemberfunctionpointer
+| 352 = @ismemberobjectpointer
+| 353 = @ismemberpointer
+| 354 = @isobject
+| 355 = @ispointer
+| 356 = @isreference
+| 357 = @isrvaluereference
+| 358 = @isscalar
+| 359 = @issigned
+| 360 = @isunsigned
+| 361 = @isvoid
+| 362 = @isvolatile
+| 363 = @reuseexpr
+| 364 = @istriviallycopyassignable
+| 365 = @isassignablenopreconditioncheck
+| 366 = @referencebindstotemporary
+| 367 = @issameas
+| 368 = @builtinhasattribute
+| 369 = @ispointerinterconvertiblewithclass
+| 370 = @builtinispointerinterconvertiblewithclass
+| 371 = @iscorrespondingmember
+| 372 = @builtiniscorrespondingmember
+| 373 = @isboundedarray
+| 374 = @isunboundedarray
+| 375 = @isreferenceable
+| 378 = @isnothrowconvertible
+| 379 = @referenceconstructsfromtemporary
+| 380 = @referenceconvertsfromtemporary
+| 381 = @isconvertible
+| 382 = @isvalidwinrttype
+| 383 = @iswinclass
+| 384 = @iswininterface
+| 385 = @istriviallyequalitycomparable
+| 386 = @isscopedenum
+| 387 = @istriviallyrelocatable
+| 388 = @datasizeof
+| 389 = @c11_generic
+| 390 = @requires_expr
+;
+
+@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
+            ;
+
+new_allocated_type(
+    unique int expr: @new_expr ref,
+    int type_id: @type ref
+);
+
+new_array_allocated_type(
+    unique int expr: @new_array_expr ref,
+    int type_id: @type ref
+);
+
+/**
+ * The field being initialized by an initializer expression within an aggregate
+ * initializer for a class/struct/union. Position is used to sort repeated initializers.
+ */
+#keyset[aggregate, position]
+aggregate_field_init(
+    int aggregate: @aggregateliteral ref,
+    int initializer: @expr ref,
+    int field: @membervariable ref,
+    int position: int ref
+);
+
+/**
+ * The index of the element being initialized by an initializer expression
+ * within an aggregate initializer for an array. Position is used to sort repeated initializers.
+ */
+#keyset[aggregate, position]
+aggregate_array_init(
+    int aggregate: @aggregateliteral ref,
+    int initializer: @expr ref,
+    int element_index: int ref,
+    int position: int ref
+);
+
+@ctorinit = @ctordirectinit
+          | @ctorvirtualinit
+          | @ctorfieldinit
+          | @ctordelegatinginit;
+@dtordestruct = @dtordirectdestruct
+              | @dtorvirtualdestruct
+              | @dtorfielddestruct;
+
+
+condition_decl_bind(
+    unique int expr: @condition_decl ref,
+    unique int decl: @declaration ref
+);
+
+typeid_bind(
+    unique int expr: @type_id ref,
+    int type_id: @type ref
+);
+
+uuidof_bind(
+    unique int expr: @uuidof ref,
+    int type_id: @type ref
+);
+
+@runtime_sizeof_or_alignof = @runtime_sizeof | @runtime_alignof | @datasizeof;
+
+sizeof_bind(
+    unique int expr: @runtime_sizeof_or_alignof ref,
+    int type_id: @type ref
+);
+
+code_block(
+    unique int block: @literal ref,
+    unique int routine: @function ref
+);
+
+lambdas(
+    unique int expr: @lambdaexpr ref,
+    string default_capture: string ref,
+    boolean has_explicit_return_type: boolean ref
+);
+
+lambda_capture(
+    unique int id: @lambdacapture,
+    int lambda: @lambdaexpr ref,
+    int index: int ref,
+    int field: @membervariable ref,
+    boolean captured_by_reference: boolean ref,
+    boolean is_implicit: boolean ref,
+    int location: @location_default ref
+);
+
+@funbindexpr = @routineexpr
+             | @new_expr
+             | @delete_expr
+             | @delete_array_expr
+             | @ctordirectinit
+             | @ctorvirtualinit
+             | @ctordelegatinginit
+             | @dtordirectdestruct
+             | @dtorvirtualdestruct;
+
+@varbindexpr = @varaccess | @ctorfieldinit | @dtorfielddestruct;
+@addressable = @function | @variable ;
+@accessible = @addressable | @enumconstant ;
+
+@access = @varaccess | @routineexpr ;
+
+fold(
+    int expr: @foldexpr ref,
+    string operator: string ref,
+    boolean is_left_fold: boolean ref
+);
+
+stmts(
+    unique int id: @stmt,
+    int kind: int ref,
+    int location: @location_stmt ref
+);
+
+case @stmt.kind of
+    1 = @stmt_expr
+|   2 = @stmt_if
+|   3 = @stmt_while
+|   4 = @stmt_goto
+|   5 = @stmt_label
+|   6 = @stmt_return
+|   7 = @stmt_block
+|   8 = @stmt_end_test_while // do { ... } while ( ... )
+|   9 = @stmt_for
+|  10 = @stmt_switch_case
+|  11 = @stmt_switch
+|  13 = @stmt_asm // "asm" statement or the body of an asm function
+|  15 = @stmt_try_block
+|  16 = @stmt_microsoft_try // Microsoft
+|  17 = @stmt_decl
+|  18 = @stmt_set_vla_size // C99
+|  19 = @stmt_vla_decl // C99
+|  25 = @stmt_assigned_goto // GNU
+|  26 = @stmt_empty
+|  27 = @stmt_continue
+|  28 = @stmt_break
+|  29 = @stmt_range_based_for // C++11
+// ...  30 @stmt_at_autoreleasepool_block deprecated
+// ...  31 @stmt_objc_for_in deprecated
+// ...  32 @stmt_at_synchronized deprecated
+|  33 = @stmt_handler
+// ...  34 @stmt_finally_end deprecated
+|  35 = @stmt_constexpr_if
+|  37 = @stmt_co_return
+;
+
+type_vla(
+    int type_id: @type ref,
+    int decl: @stmt_vla_decl ref
+);
+
+variable_vla(
+    int var: @variable ref,
+    int decl: @stmt_vla_decl ref
+);
+
+if_initialization(
+    unique int if_stmt: @stmt_if ref,
+    int init_id: @stmt ref
+);
+
+if_then(
+    unique int if_stmt: @stmt_if ref,
+    int then_id: @stmt ref
+);
+
+if_else(
+    unique int if_stmt: @stmt_if ref,
+    int else_id: @stmt ref
+);
+
+constexpr_if_initialization(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int init_id: @stmt ref
+);
+
+constexpr_if_then(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int then_id: @stmt ref
+);
+
+constexpr_if_else(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int else_id: @stmt ref
+);
+
+while_body(
+    unique int while_stmt: @stmt_while ref,
+    int body_id: @stmt ref
+);
+
+do_body(
+    unique int do_stmt: @stmt_end_test_while ref,
+    int body_id: @stmt ref
+);
+
+switch_initialization(
+    unique int switch_stmt: @stmt_switch ref,
+    int init_id: @stmt ref
+);
+
+#keyset[switch_stmt, index]
+switch_case(
+    int switch_stmt: @stmt_switch ref,
+    int index: int ref,
+    int case_id: @stmt_switch_case ref
+);
+
+switch_body(
+    unique int switch_stmt: @stmt_switch ref,
+    int body_id: @stmt ref
+);
+
+@stmt_for_or_range_based_for = @stmt_for
+                             | @stmt_range_based_for;
+
+for_initialization(
+    unique int for_stmt: @stmt_for_or_range_based_for ref,
+    int init_id: @stmt ref
+);
+
+for_condition(
+    unique int for_stmt: @stmt_for ref,
+    int condition_id: @expr ref
+);
+
+for_update(
+    unique int for_stmt: @stmt_for ref,
+    int update_id: @expr ref
+);
+
+for_body(
+    unique int for_stmt: @stmt_for ref,
+    int body_id: @stmt ref
+);
+
+@stmtparent = @stmt | @expr_stmt ;
+stmtparents(
+    unique int id: @stmt ref,
+    int index: int ref,
+    int parent: @stmtparent ref
+);
+
+ishandler(unique int block: @stmt_block ref);
+
+@cfgnode = @stmt | @expr | @function | @initialiser ;
+
+stmt_decl_bind(
+    int stmt: @stmt_decl ref,
+    int num: int ref,
+    int decl: @declaration ref
+);
+
+stmt_decl_entry_bind(
+    int stmt: @stmt_decl ref,
+    int num: int ref,
+    int decl_entry: @element ref
+);
+
+@functionorblock = @function | @stmt_block;
+
+blockscope(
+    unique int block: @stmt_block ref,
+    int enclosing: @functionorblock ref
+);
+
+@jump = @stmt_goto | @stmt_break | @stmt_continue;
+
+@jumporlabel = @jump | @stmt_label | @literal;
+
+jumpinfo(
+    unique int id: @jumporlabel ref,
+    string str: string ref,
+    int target: @stmt ref
+);
+
+preprocdirects(
+    unique int id: @preprocdirect,
+    int kind: int ref,
+    int location: @location_default ref
+);
+case @preprocdirect.kind of
+   0 = @ppd_if
+|  1 = @ppd_ifdef
+|  2 = @ppd_ifndef
+|  3 = @ppd_elif
+|  4 = @ppd_else
+|  5 = @ppd_endif
+|  6 = @ppd_plain_include
+|  7 = @ppd_define
+|  8 = @ppd_undef
+|  9 = @ppd_line
+| 10 = @ppd_error
+| 11 = @ppd_pragma
+| 12 = @ppd_objc_import
+| 13 = @ppd_include_next
+| 18 = @ppd_warning
+;
+
+@ppd_include = @ppd_plain_include | @ppd_objc_import | @ppd_include_next;
+
+@ppd_branch = @ppd_if | @ppd_ifdef | @ppd_ifndef | @ppd_elif;
+
+preprocpair(
+    int begin : @ppd_branch ref,
+    int elseelifend : @preprocdirect ref
+);
+
+preproctrue(int branch : @ppd_branch ref);
+preprocfalse(int branch : @ppd_branch ref);
+
+preproctext(
+    unique int id: @preprocdirect ref,
+    string head: string ref,
+    string body: string ref
+);
+
+includes(
+    unique int id: @ppd_include ref,
+    int included: @file ref
+);
+
+link_targets(
+    int id: @link_target,
+    int binary: @file ref
+);
+
+link_parent(
+    int element : @element ref,
+    int link_target : @link_target ref
+);
+
+/* XML Files */
+
+xmlEncoding(unique int id: @file ref, string encoding: string ref);
+
+xmlDTDs(
+    unique int id: @xmldtd,
+    string root: string ref,
+    string publicId: string ref,
+    string systemId: string ref,
+    int fileid: @file ref
+);
+
+xmlElements(
+    unique int id: @xmlelement,
+    string name: string ref,
+    int parentid: @xmlparent ref,
+    int idx: int ref,
+    int fileid: @file ref
+);
+
+xmlAttrs(
+    unique int id: @xmlattribute,
+    int elementid: @xmlelement ref,
+    string name: string ref,
+    string value: string ref,
+    int idx: int ref,
+    int fileid: @file ref
+);
+
+xmlNs(
+    int id: @xmlnamespace,
+    string prefixName: string ref,
+    string URI: string ref,
+    int fileid: @file ref
+);
+
+xmlHasNs(
+    int elementId: @xmlnamespaceable ref,
+    int nsId: @xmlnamespace ref,
+    int fileid: @file ref
+);
+
+xmlComments(
+    unique int id: @xmlcomment,
+    string text: string ref,
+    int parentid: @xmlparent ref,
+    int fileid: @file ref
+);
+
+xmlChars(
+    unique int id: @xmlcharacters,
+    string text: string ref,
+    int parentid: @xmlparent ref,
+    int idx: int ref,
+    int isCDATA: int ref,
+    int fileid: @file ref
+);
+
+@xmlparent = @file | @xmlelement;
+@xmlnamespaceable = @xmlelement | @xmlattribute;
+
+xmllocations(
+    int xmlElement: @xmllocatable ref,
+    int location: @location_default ref
+);
+
+@xmllocatable = @xmlcharacters
+              | @xmlelement
+              | @xmlcomment
+              | @xmlattribute
+              | @xmldtd
+              | @file
+              | @xmlnamespace;
diff --git a/cpp/ql/lib/upgrades/6f5d51e89e762fe4609fd4ac8ee3afb04221e873/semmlecode.cpp.dbscheme b/cpp/ql/lib/upgrades/6f5d51e89e762fe4609fd4ac8ee3afb04221e873/semmlecode.cpp.dbscheme
new file mode 100644
index 00000000000..e51fad7a243
--- /dev/null
+++ b/cpp/ql/lib/upgrades/6f5d51e89e762fe4609fd4ac8ee3afb04221e873/semmlecode.cpp.dbscheme
@@ -0,0 +1,2323 @@
+
+/**
+ * An invocation of the compiler. Note that more than one file may be
+ * compiled per invocation. For example, this command compiles three
+ * source files:
+ *
+ *   gcc -c f1.c f2.c f3.c
+ *
+ * The `id` simply identifies the invocation, while `cwd` is the working
+ * directory from which the compiler was invoked.
+ */
+compilations(
+    /**
+     * An invocation of the compiler. Note that more than one file may
+     * be compiled per invocation. For example, this command compiles
+     * three source files:
+     *
+     *   gcc -c f1.c f2.c f3.c
+     */
+    unique int id : @compilation,
+    string cwd : string ref
+);
+
+/**
+ * The arguments that were passed to the extractor for a compiler
+ * invocation. If `id` is for the compiler invocation
+ *
+ *   gcc -c f1.c f2.c f3.c
+ *
+ * then typically there will be rows for
+ *
+ * num | arg
+ * --- | ---
+ * 0   | *path to extractor*
+ * 1   | `--mimic`
+ * 2   | `/usr/bin/gcc`
+ * 3   | `-c`
+ * 4   | f1.c
+ * 5   | f2.c
+ * 6   | f3.c
+ */
+#keyset[id, num]
+compilation_args(
+    int id : @compilation ref,
+    int num : int ref,
+    string arg : string ref
+);
+
+/**
+ * The source files that are compiled by a compiler invocation.
+ * If `id` is for the compiler invocation
+ *
+ *   gcc -c f1.c f2.c f3.c
+ *
+ * then there will be rows for
+ *
+ * num | arg
+ * --- | ---
+ * 0   | f1.c
+ * 1   | f2.c
+ * 2   | f3.c
+ *
+ * Note that even if those files `#include` headers, those headers
+ * do not appear as rows.
+ */
+#keyset[id, num]
+compilation_compiling_files(
+    int id : @compilation ref,
+    int num : int ref,
+    int file : @file ref
+);
+
+/**
+ * The time taken by the extractor for a compiler invocation.
+ *
+ * For each file `num`, there will be rows for
+ *
+ * kind | seconds
+ * ---- | ---
+ * 1    | CPU seconds used by the extractor frontend
+ * 2    | Elapsed seconds during the extractor frontend
+ * 3    | CPU seconds used by the extractor backend
+ * 4    | Elapsed seconds during the extractor backend
+ */
+#keyset[id, num, kind]
+compilation_time(
+    int id : @compilation ref,
+    int num : int ref,
+    /* kind:
+       1 = frontend_cpu_seconds
+       2 = frontend_elapsed_seconds
+       3 = extractor_cpu_seconds
+       4 = extractor_elapsed_seconds
+    */
+    int kind : int ref,
+    float seconds : float ref
+);
+
+/**
+ * An error or warning generated by the extractor.
+ * The diagnostic message `diagnostic` was generated during compiler
+ * invocation `compilation`, and is the `file_number_diagnostic_number`th
+ * message generated while extracting the `file_number`th file of that
+ * invocation.
+ */
+#keyset[compilation, file_number, file_number_diagnostic_number]
+diagnostic_for(
+    int diagnostic : @diagnostic ref,
+    int compilation : @compilation ref,
+    int file_number : int ref,
+    int file_number_diagnostic_number : int ref
+);
+
+/**
+ * If extraction was successful, then `cpu_seconds` and
+ * `elapsed_seconds` are the CPU time and elapsed time (respectively)
+ * that extraction took for compiler invocation `id`.
+ */
+compilation_finished(
+    unique int id : @compilation ref,
+    float cpu_seconds : float ref,
+    float elapsed_seconds : float ref
+);
+
+
+/**
+ * External data, loaded from CSV files during snapshot creation. See
+ * [Tutorial: Incorporating external data](https://help.semmle.com/wiki/display/SD/Tutorial%3A+Incorporating+external+data)
+ * for more information.
+ */
+externalData(
+    int id : @externalDataElement,
+    string path : string ref,
+    int column: int ref,
+    string value : string ref
+);
+
+/**
+ * The source location of the snapshot.
+ */
+sourceLocationPrefix(string prefix : string ref);
+
+/**
+ * Information about packages that provide code used during compilation.
+ * The `id` is just a unique identifier.
+ * The `namespace` is typically the name of the package manager that
+ * provided the package (e.g. "dpkg" or "yum").
+ * The `package_name` is the name of the package, and `version` is its
+ * version (as a string).
+ */
+external_packages(
+    unique int id: @external_package,
+    string namespace : string ref,
+    string package_name : string ref,
+    string version : string ref
+);
+
+/**
+ * Holds if File `fileid` was provided by package `package`.
+ */
+header_to_external_package(
+    int fileid : @file ref,
+    int package : @external_package ref
+);
+
+/*
+ * Version history
+ */
+
+svnentries(
+    unique int id : @svnentry,
+    string revision : string ref,
+    string author : string ref,
+    date revisionDate : date ref,
+    int changeSize : int ref
+)
+
+svnaffectedfiles(
+    int id : @svnentry ref,
+    int file : @file ref,
+    string action : string ref
+)
+
+svnentrymsg(
+    unique int id : @svnentry ref,
+    string message : string ref
+)
+
+svnchurn(
+    int commit : @svnentry ref,
+    int file : @file ref,
+    int addedLines : int ref,
+    int deletedLines : int ref
+)
+
+/*
+ * C++ dbscheme
+ */
+
+extractor_version(
+    string codeql_version: string ref,
+    string frontend_version: string ref
+)
+
+@location = @location_stmt | @location_expr | @location_default ;
+
+/**
+ * The location of an element that is not an expression or a statement.
+ * The location spans column `startcolumn` of line `startline` to
+ * column `endcolumn` of line `endline` in file `file`.
+ * For more information, see
+ * [Locations](https://codeql.github.com/docs/writing-codeql-queries/providing-locations-in-codeql-queries/).
+ */
+locations_default(
+    /** The location of an element that is not an expression or a statement. */
+    unique int id: @location_default,
+    int container: @container ref,
+    int startLine: int ref,
+    int startColumn: int ref,
+    int endLine: int ref,
+    int endColumn: int ref
+);
+
+/**
+ * The location of a statement.
+ * The location spans column `startcolumn` of line `startline` to
+ * column `endcolumn` of line `endline` in file `file`.
+ * For more information, see
+ * [Locations](https://codeql.github.com/docs/writing-codeql-queries/providing-locations-in-codeql-queries/).
+ */
+locations_stmt(
+    /** The location of a statement. */
+    unique int id: @location_stmt,
+    int container: @container ref,
+    int startLine: int ref,
+    int startColumn: int ref,
+    int endLine: int ref,
+    int endColumn: int ref
+);
+
+/**
+ * The location of an expression.
+ * The location spans column `startcolumn` of line `startline` to
+ * column `endcolumn` of line `endline` in file `file`.
+ * For more information, see
+ * [Locations](https://codeql.github.com/docs/writing-codeql-queries/providing-locations-in-codeql-queries/).
+ */
+locations_expr(
+    /** The location of an expression. */
+    unique int id: @location_expr,
+    int container: @container ref,
+    int startLine: int ref,
+    int startColumn: int ref,
+    int endLine: int ref,
+    int endColumn: int ref
+);
+
+/** An element for which line-count information is available. */
+@sourceline = @file | @function | @variable | @enumconstant | @xmllocatable;
+
+numlines(
+    int element_id: @sourceline ref,
+    int num_lines: int ref,
+    int num_code: int ref,
+    int num_comment: int ref
+);
+
+diagnostics(
+    unique int id: @diagnostic,
+    int severity: int ref,
+    string error_tag: string ref,
+    string error_message: string ref,
+    string full_error_message: string ref,
+    int location: @location_default ref
+);
+
+files(
+    unique int id: @file,
+    string name: string ref
+);
+
+folders(
+    unique int id: @folder,
+    string name: string ref
+);
+
+@container = @folder | @file
+
+containerparent(
+    int parent: @container ref,
+    unique int child: @container ref
+);
+
+fileannotations(
+    int id: @file ref,
+    int kind: int ref,
+    string name: string ref,
+    string value: string ref
+);
+
+inmacroexpansion(
+    int id: @element ref,
+    int inv: @macroinvocation ref
+);
+
+affectedbymacroexpansion(
+    int id: @element ref,
+    int inv: @macroinvocation ref
+);
+
+case @macroinvocation.kind of
+  1 = @macro_expansion
+| 2 = @other_macro_reference
+;
+
+macroinvocations(
+    unique int id: @macroinvocation,
+    int macro_id: @ppd_define ref,
+    int location: @location_default ref,
+    int kind: int ref
+);
+
+macroparent(
+    unique int id: @macroinvocation ref,
+    int parent_id: @macroinvocation ref
+);
+
+// a macroinvocation may be part of another location
+// the way to find a constant expression that uses a macro
+// is thus to find a constant expression that has a location
+// to which a macro invocation is bound
+macrolocationbind(
+    int id: @macroinvocation ref,
+    int location: @location ref
+);
+
+#keyset[invocation, argument_index]
+macro_argument_unexpanded(
+    int invocation: @macroinvocation ref,
+    int argument_index: int ref,
+    string text: string ref
+);
+
+#keyset[invocation, argument_index]
+macro_argument_expanded(
+    int invocation: @macroinvocation ref,
+    int argument_index: int ref,
+    string text: string ref
+);
+
+/*
+case @function.kind of
+  1 = @normal_function
+| 2 = @constructor
+| 3 = @destructor
+| 4 = @conversion_function
+| 5 = @operator
+| 6 = @builtin_function     // GCC built-in functions, e.g. __builtin___memcpy_chk
+| 7 = @user_defined_literal
+| 8 = @deduction_guide
+;
+*/
+
+functions(
+    unique int id: @function,
+    string name: string ref,
+    int kind: int ref
+);
+
+function_entry_point(
+    int id: @function ref,
+    unique int entry_point: @stmt ref
+);
+
+function_return_type(
+    int id: @function ref,
+    int return_type: @type ref
+);
+
+/**
+ * If `function` is a coroutine, then this gives the `std::experimental::resumable_traits`
+ * instance associated with it, and the variables representing the `handle` and `promise`
+ * for it.
+ */
+coroutine(
+  unique int function: @function ref,
+  int traits: @type ref
+);
+
+/*
+case @coroutine_placeholder_variable.kind of
+  1 = @handle
+| 2 = @promise
+| 3 = @init_await_resume
+;
+*/
+
+coroutine_placeholder_variable(
+  unique int placeholder_variable: @variable ref,
+  int kind: int ref,
+  int function: @function ref
+)
+
+/** The `new` function used for allocating the coroutine state, if any. */
+coroutine_new(
+  unique int function: @function ref,
+  int new: @function ref
+);
+
+/** The `delete` function used for deallocating the coroutine state, if any. */
+coroutine_delete(
+  unique int function: @function ref,
+  int delete: @function ref
+);
+
+purefunctions(unique int id: @function ref);
+
+function_deleted(unique int id: @function ref);
+
+function_defaulted(unique int id: @function ref);
+
+function_prototyped(unique int id: @function ref)
+
+deduction_guide_for_class(
+    int id: @function ref,
+    int class_template: @usertype ref
+)
+
+member_function_this_type(
+    unique int id: @function ref,
+    int this_type: @type ref
+);
+
+#keyset[id, type_id]
+fun_decls(
+    int id: @fun_decl,
+    int function: @function ref,
+    int type_id: @type ref,
+    string name: string ref,
+    int location: @location_default ref
+);
+fun_def(unique int id: @fun_decl ref);
+fun_specialized(unique int id: @fun_decl ref);
+fun_implicit(unique int id: @fun_decl ref);
+fun_decl_specifiers(
+    int id: @fun_decl ref,
+    string name: string ref
+)
+#keyset[fun_decl, index]
+fun_decl_throws(
+    int fun_decl: @fun_decl ref,
+    int index: int ref,
+    int type_id: @type ref
+);
+/* an empty throw specification is different from none */
+fun_decl_empty_throws(unique int fun_decl: @fun_decl ref);
+fun_decl_noexcept(
+    int fun_decl: @fun_decl ref,
+    int constant: @expr ref
+);
+fun_decl_empty_noexcept(int fun_decl: @fun_decl ref);
+fun_decl_typedef_type(
+    unique int fun_decl: @fun_decl ref,
+    int typedeftype_id: @usertype ref
+);
+
+param_decl_bind(
+    unique int id: @var_decl ref,
+    int index: int ref,
+    int fun_decl: @fun_decl ref
+);
+
+#keyset[id, type_id]
+var_decls(
+    int id: @var_decl,
+    int variable: @variable ref,
+    int type_id: @type ref,
+    string name: string ref,
+    int location: @location_default ref
+);
+var_def(unique int id: @var_decl ref);
+var_decl_specifiers(
+    int id: @var_decl ref,
+    string name: string ref
+)
+is_structured_binding(unique int id: @variable ref);
+
+type_decls(
+    unique int id: @type_decl,
+    int type_id: @type ref,
+    int location: @location_default ref
+);
+type_def(unique int id: @type_decl ref);
+type_decl_top(
+    unique int type_decl: @type_decl ref
+);
+
+namespace_decls(
+    unique int id: @namespace_decl,
+    int namespace_id: @namespace ref,
+    int location: @location_default ref,
+    int bodylocation: @location_default ref
+);
+
+case @using.kind of
+  1 = @using_declaration
+| 2 = @using_directive
+| 3 = @using_enum_declaration
+;
+
+usings(
+    unique int id: @using,
+    int element_id: @element ref,
+    int location: @location_default ref,
+    int kind: int ref
+);
+
+/** The element which contains the `using` declaration. */
+using_container(
+    int parent: @element ref,
+    int child: @using ref
+);
+
+static_asserts(
+    unique int id: @static_assert,
+    int condition : @expr ref,
+    string message : string ref,
+    int location: @location_default ref,
+    int enclosing : @element ref
+);
+
+// each function has an ordered list of parameters
+#keyset[id, type_id]
+#keyset[function, index, type_id]
+params(
+    int id: @parameter,
+    int function: @parameterized_element ref,
+    int index: int ref,
+    int type_id: @type ref
+);
+
+overrides(
+    int new: @function ref,
+    int old: @function ref
+);
+
+#keyset[id, type_id]
+membervariables(
+    int id: @membervariable,
+    int type_id: @type ref,
+    string name: string ref
+);
+
+#keyset[id, type_id]
+globalvariables(
+    int id: @globalvariable,
+    int type_id: @type ref,
+    string name: string ref
+);
+
+#keyset[id, type_id]
+localvariables(
+    int id: @localvariable,
+    int type_id: @type ref,
+    string name: string ref
+);
+
+autoderivation(
+    unique int var: @variable ref,
+    int derivation_type: @type ref
+);
+
+orphaned_variables(
+    int var: @localvariable ref,
+    int function: @function ref
+)
+
+enumconstants(
+    unique int id: @enumconstant,
+    int parent: @usertype ref,
+    int index: int ref,
+    int type_id: @type ref,
+    string name: string ref,
+    int location: @location_default ref
+);
+
+@variable = @localscopevariable | @globalvariable | @membervariable;
+
+@localscopevariable = @localvariable | @parameter;
+
+/**
+ * Built-in types are the fundamental types, e.g., integral, floating, and void.
+ */
+case @builtintype.kind of
+   1 = @errortype
+|  2 = @unknowntype
+|  3 = @void
+|  4 = @boolean
+|  5 = @char
+|  6 = @unsigned_char
+|  7 = @signed_char
+|  8 = @short
+|  9 = @unsigned_short
+| 10 = @signed_short
+| 11 = @int
+| 12 = @unsigned_int
+| 13 = @signed_int
+| 14 = @long
+| 15 = @unsigned_long
+| 16 = @signed_long
+| 17 = @long_long
+| 18 = @unsigned_long_long
+| 19 = @signed_long_long
+// ... 20 Microsoft-specific __int8
+// ... 21 Microsoft-specific __int16
+// ... 22 Microsoft-specific __int32
+// ... 23 Microsoft-specific __int64
+| 24 = @float
+| 25 = @double
+| 26 = @long_double
+| 27 = @complex_float         // C99-specific _Complex float
+| 28 = @complex_double        // C99-specific _Complex double
+| 29 = @complex_long_double   // C99-specific _Complex long double
+| 30 = @imaginary_float       // C99-specific _Imaginary float
+| 31 = @imaginary_double      // C99-specific _Imaginary double
+| 32 = @imaginary_long_double // C99-specific _Imaginary long double
+| 33 = @wchar_t               // Microsoft-specific
+| 34 = @decltype_nullptr      // C++11
+| 35 = @int128                // __int128
+| 36 = @unsigned_int128       // unsigned __int128
+| 37 = @signed_int128         // signed __int128
+| 38 = @float128              // __float128
+| 39 = @complex_float128      // _Complex __float128
+| 40 = @decimal32             // _Decimal32
+| 41 = @decimal64             // _Decimal64
+| 42 = @decimal128            // _Decimal128
+| 43 = @char16_t
+| 44 = @char32_t
+| 45 = @std_float32           // _Float32
+| 46 = @float32x              // _Float32x
+| 47 = @std_float64           // _Float64
+| 48 = @float64x              // _Float64x
+| 49 = @std_float128          // _Float128
+// ... 50 _Float128x
+| 51 = @char8_t
+| 52 = @float16               // _Float16
+| 53 = @complex_float16       // _Complex _Float16
+| 54 = @fp16                  // __fp16
+| 55 = @std_bfloat16          // __bf16
+| 56 = @std_float16           // std::float16_t
+| 57 = @complex_std_float32   // _Complex _Float32
+| 58 = @complex_float32x      // _Complex _Float32x
+| 59 = @complex_std_float64   // _Complex _Float64
+| 60 = @complex_float64x      // _Complex _Float64x
+| 61 = @complex_std_float128  // _Complex _Float128
+;
+
+builtintypes(
+    unique int id: @builtintype,
+    string name: string ref,
+    int kind: int ref,
+    int size: int ref,
+    int sign: int ref,
+    int alignment: int ref
+);
+
+/**
+ * Derived types are types that are directly derived from existing types and
+ * point to, refer to, transform type data to return a new type.
+ */
+case @derivedtype.kind of
+   1 = @pointer
+|  2 = @reference
+|  3 = @type_with_specifiers
+|  4 = @array
+|  5 = @gnu_vector
+|  6 = @routineptr
+|  7 = @routinereference
+|  8 = @rvalue_reference // C++11
+// ... 9 type_conforming_to_protocols deprecated
+| 10 = @block
+;
+
+derivedtypes(
+    unique int id: @derivedtype,
+    string name: string ref,
+    int kind: int ref,
+    int type_id: @type ref
+);
+
+pointerishsize(unique int id: @derivedtype ref,
+    int size: int ref,
+    int alignment: int ref);
+
+arraysizes(
+    unique int id: @derivedtype ref,
+    int num_elements: int ref,
+    int bytesize: int ref,
+    int alignment: int ref
+);
+
+typedefbase(
+    unique int id: @usertype ref,
+    int type_id: @type ref
+);
+
+/**
+ * An instance of the C++11 `decltype` operator.  For example:
+ * ```
+ * int a;
+ * decltype(1+a) b;
+ * ```
+ * Here `expr` is `1+a`.
+ *
+ * Sometimes an additional pair of parentheses around the expression
+ * would change the semantics of this decltype, e.g.
+ * ```
+ * struct A { double x; };
+ * const A* a = new A();
+ * decltype( a->x ); // type is double
+ * decltype((a->x)); // type is const double&
+ * ```
+ * (Please consult the C++11 standard for more details).
+ * `parentheses_would_change_meaning` is `true` iff that is the case.
+ */
+#keyset[id, expr]
+decltypes(
+    int id: @decltype,
+    int expr: @expr ref,
+    int base_type: @type ref,
+    boolean parentheses_would_change_meaning: boolean ref
+);
+
+/*
+case @usertype.kind of
+   1 = @struct
+|  2 = @class
+|  3 = @union
+|  4 = @enum
+|  5 = @typedef                       // classic C: typedef typedef type name
+|  6 = @template
+|  7 = @template_parameter
+|  8 = @template_template_parameter
+|  9 = @proxy_class                   // a proxy class associated with a template parameter
+// ... 10 objc_class deprecated
+// ... 11 objc_protocol deprecated
+// ... 12 objc_category deprecated
+| 13 = @scoped_enum
+| 14 = @using_alias                  // a using name = type style typedef
+;
+*/
+
+usertypes(
+    unique int id: @usertype,
+    string name: string ref,
+    int kind: int ref
+);
+
+usertypesize(
+    unique int id: @usertype ref,
+    int size: int ref,
+    int alignment: int ref
+);
+
+usertype_final(unique int id: @usertype ref);
+
+usertype_uuid(
+    unique int id: @usertype ref,
+    string uuid: string ref
+);
+
+mangled_name(
+    unique int id: @declaration ref,
+    int mangled_name : @mangledname,
+    boolean is_complete: boolean ref
+);
+
+is_pod_class(unique int id: @usertype ref);
+is_standard_layout_class(unique int id: @usertype ref);
+
+is_complete(unique int id: @usertype ref);
+
+is_class_template(unique int id: @usertype ref);
+class_instantiation(
+    int to: @usertype ref,
+    int from: @usertype ref
+);
+class_template_argument(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+class_template_argument_value(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+is_proxy_class_for(
+    unique int id: @usertype ref,
+    unique int templ_param_id: @usertype ref
+);
+
+type_mentions(
+    unique int id: @type_mention,
+    int type_id: @type ref,
+    int location: @location ref,
+    // a_symbol_reference_kind from the frontend.
+    int kind: int ref
+);
+
+is_function_template(unique int id: @function ref);
+function_instantiation(
+    unique int to: @function ref,
+    int from: @function ref
+);
+function_template_argument(
+    int function_id: @function ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+function_template_argument_value(
+    int function_id: @function ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+is_variable_template(unique int id: @variable ref);
+variable_instantiation(
+    unique int to: @variable ref,
+    int from: @variable ref
+);
+variable_template_argument(
+    int variable_id: @variable ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+variable_template_argument_value(
+    int variable_id: @variable ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+routinetypes(
+    unique int id: @routinetype,
+    int return_type: @type ref
+);
+
+routinetypeargs(
+    int routine: @routinetype ref,
+    int index: int ref,
+    int type_id: @type ref
+);
+
+ptrtomembers(
+    unique int id: @ptrtomember,
+    int type_id: @type ref,
+    int class_id: @type ref
+);
+
+/*
+ specifiers for types, functions, and variables
+
+    "public",
+    "protected",
+    "private",
+
+    "const",
+    "volatile",
+    "static",
+
+    "pure",
+    "virtual",
+    "sealed", // Microsoft
+    "__interface", // Microsoft
+    "inline",
+    "explicit",
+
+    "near", // near far extension
+    "far", // near far extension
+    "__ptr32", // Microsoft
+    "__ptr64", // Microsoft
+    "__sptr", // Microsoft
+    "__uptr", // Microsoft
+    "dllimport", // Microsoft
+    "dllexport", // Microsoft
+    "thread", // Microsoft
+    "naked", // Microsoft
+    "microsoft_inline", // Microsoft
+    "forceinline", // Microsoft
+    "selectany", // Microsoft
+    "nothrow", // Microsoft
+    "novtable", // Microsoft
+    "noreturn", // Microsoft
+    "noinline", // Microsoft
+    "noalias", // Microsoft
+    "restrict", // Microsoft
+*/
+
+specifiers(
+    unique int id: @specifier,
+    unique string str: string ref
+);
+
+typespecifiers(
+    int type_id: @type ref,
+    int spec_id: @specifier ref
+);
+
+funspecifiers(
+    int func_id: @function ref,
+    int spec_id: @specifier ref
+);
+
+varspecifiers(
+    int var_id: @accessible ref,
+    int spec_id: @specifier ref
+);
+
+explicit_specifier_exprs(
+    unique int func_id: @function ref,
+    int constant: @expr ref
+)
+
+attributes(
+    unique int id: @attribute,
+    int kind: int ref,
+    string name: string ref,
+    string name_space: string ref,
+    int location: @location_default ref
+);
+
+case @attribute.kind of
+  0 = @gnuattribute
+| 1 = @stdattribute
+| 2 = @declspec
+| 3 = @msattribute
+| 4 = @alignas
+// ... 5 @objc_propertyattribute deprecated
+;
+
+attribute_args(
+    unique int id: @attribute_arg,
+    int kind: int ref,
+    int attribute: @attribute ref,
+    int index: int ref,
+    int location: @location_default ref
+);
+
+case @attribute_arg.kind of
+  0 = @attribute_arg_empty
+| 1 = @attribute_arg_token
+| 2 = @attribute_arg_constant
+| 3 = @attribute_arg_type
+| 4 = @attribute_arg_constant_expr
+| 5 = @attribute_arg_expr
+;
+
+attribute_arg_value(
+    unique int arg: @attribute_arg ref,
+    string value: string ref
+);
+attribute_arg_type(
+    unique int arg: @attribute_arg ref,
+    int type_id: @type ref
+);
+attribute_arg_constant(
+    unique int arg: @attribute_arg ref,
+    int constant: @expr ref
+)
+attribute_arg_expr(
+    unique int arg: @attribute_arg ref,
+    int expr: @expr ref
+)
+attribute_arg_name(
+    unique int arg: @attribute_arg ref,
+    string name: string ref
+);
+
+typeattributes(
+    int type_id: @type ref,
+    int spec_id: @attribute ref
+);
+
+funcattributes(
+    int func_id: @function ref,
+    int spec_id: @attribute ref
+);
+
+varattributes(
+    int var_id: @accessible ref,
+    int spec_id: @attribute ref
+);
+
+stmtattributes(
+    int stmt_id: @stmt ref,
+    int spec_id: @attribute ref
+);
+
+@type = @builtintype
+      | @derivedtype
+      | @usertype
+      /* TODO | @fixedpointtype */
+      | @routinetype
+      | @ptrtomember
+      | @decltype;
+
+unspecifiedtype(
+    unique int type_id: @type ref,
+    int unspecified_type_id: @type ref
+);
+
+member(
+    int parent: @type ref,
+    int index: int ref,
+    int child: @member ref
+);
+
+@enclosingfunction_child = @usertype | @variable | @namespace
+
+enclosingfunction(
+    unique int child: @enclosingfunction_child ref,
+    int parent: @function ref
+);
+
+derivations(
+    unique int derivation: @derivation,
+    int sub: @type ref,
+    int index: int ref,
+    int super: @type ref,
+    int location: @location_default ref
+);
+
+derspecifiers(
+    int der_id: @derivation ref,
+    int spec_id: @specifier ref
+);
+
+/**
+ * Contains the byte offset of the base class subobject within the derived
+ * class. Only holds for non-virtual base classes, but see table
+ * `virtual_base_offsets` for offsets of virtual base class subobjects.
+ */
+direct_base_offsets(
+    unique int der_id: @derivation ref,
+    int offset: int ref
+);
+
+/**
+ * Contains the byte offset of the virtual base class subobject for class
+ * `super` within a most-derived object of class `sub`. `super` can be either a
+ * direct or indirect base class.
+ */
+#keyset[sub, super]
+virtual_base_offsets(
+    int sub: @usertype ref,
+    int super: @usertype ref,
+    int offset: int ref
+);
+
+frienddecls(
+    unique int id: @frienddecl,
+    int type_id: @type ref,
+    int decl_id: @declaration ref,
+    int location: @location_default ref
+);
+
+@declaredtype = @usertype ;
+
+@declaration = @function
+             | @declaredtype
+             | @variable
+             | @enumconstant
+             | @frienddecl;
+
+@member = @membervariable
+        | @function
+        | @declaredtype
+        | @enumconstant;
+
+@locatable = @diagnostic
+           | @declaration
+           | @ppd_include
+           | @ppd_define
+           | @macroinvocation
+           /*| @funcall*/
+           | @xmllocatable
+           | @attribute
+           | @attribute_arg;
+
+@namedscope = @namespace | @usertype;
+
+@element = @locatable
+         | @file
+         | @folder
+         | @specifier
+         | @type
+         | @expr
+         | @namespace
+         | @initialiser
+         | @stmt
+         | @derivation
+         | @comment
+         | @preprocdirect
+         | @fun_decl
+         | @var_decl
+         | @type_decl
+         | @namespace_decl
+         | @using
+         | @namequalifier
+         | @specialnamequalifyingelement
+         | @static_assert
+         | @type_mention
+         | @lambdacapture;
+
+@exprparent = @element;
+
+comments(
+    unique int id: @comment,
+    string contents: string ref,
+    int location: @location_default ref
+);
+
+commentbinding(
+    int id: @comment ref,
+    int element: @element ref
+);
+
+exprconv(
+    int converted: @expr ref,
+    unique int conversion: @expr ref
+);
+
+compgenerated(unique int id: @element ref);
+
+/**
+ * `destructor_call` destructs the `i`'th entity that should be
+ * destructed following `element`. Note that entities should be
+ * destructed in reverse construction order, so for a given `element`
+ * these should be called from highest to lowest `i`.
+ */
+#keyset[element, destructor_call]
+#keyset[element, i]
+synthetic_destructor_call(
+    int element: @element ref,
+    int i: int ref,
+    int destructor_call: @routineexpr ref
+);
+
+namespaces(
+    unique int id: @namespace,
+    string name: string ref
+);
+
+namespace_inline(
+    unique int id: @namespace ref
+);
+
+namespacembrs(
+    int parentid: @namespace ref,
+    unique int memberid: @namespacembr ref
+);
+
+@namespacembr = @declaration | @namespace;
+
+exprparents(
+    int expr_id: @expr ref,
+    int child_index: int ref,
+    int parent_id: @exprparent ref
+);
+
+expr_isload(unique int expr_id: @expr ref);
+
+@cast = @c_style_cast
+      | @const_cast
+      | @dynamic_cast
+      | @reinterpret_cast
+      | @static_cast
+      ;
+
+/*
+case @conversion.kind of
+  0 = @simple_conversion           // a numeric conversion, qualification conversion, or a reinterpret_cast
+| 1 = @bool_conversion             // conversion to 'bool'
+| 2 = @base_class_conversion       // a derived-to-base conversion
+| 3 = @derived_class_conversion    // a base-to-derived conversion
+| 4 = @pm_base_class_conversion    // a derived-to-base conversion of a pointer to member
+| 5 = @pm_derived_class_conversion // a base-to-derived conversion of a pointer to member
+| 6 = @glvalue_adjust              // an adjustment of the type of a glvalue
+| 7 = @prvalue_adjust              // an adjustment of the type of a prvalue
+;
+*/
+/**
+ * Describes the semantics represented by a cast expression. This is largely
+ * independent of the source syntax of the cast, so it is separate from the
+ * regular expression kind.
+ */
+conversionkinds(
+    unique int expr_id: @cast ref,
+    int kind: int ref
+);
+
+@conversion = @cast
+            | @array_to_pointer
+            | @parexpr
+            | @reference_to
+            | @ref_indirect
+            | @temp_init
+            | @c11_generic
+            ;
+
+/*
+case @funbindexpr.kind of
+  0 = @normal_call  // a normal call
+| 1 = @virtual_call // a virtual call
+| 2 = @adl_call     // a call whose target is only found by ADL
+;
+*/
+iscall(
+    unique int caller: @funbindexpr ref,
+    int kind: int ref
+);
+
+numtemplatearguments(
+    unique int expr_id: @expr ref,
+    int num: int ref
+);
+
+specialnamequalifyingelements(
+    unique int id: @specialnamequalifyingelement,
+    unique string name: string ref
+);
+
+@namequalifiableelement = @expr | @namequalifier;
+@namequalifyingelement = @namespace
+                       | @specialnamequalifyingelement
+                       | @usertype;
+
+namequalifiers(
+    unique int id: @namequalifier,
+    unique int qualifiableelement: @namequalifiableelement ref,
+    int qualifyingelement: @namequalifyingelement ref,
+    int location: @location_default ref
+);
+
+varbind(
+    int expr: @varbindexpr ref,
+    int var: @accessible ref
+);
+
+funbind(
+    int expr: @funbindexpr ref,
+    int fun: @function ref
+);
+
+@any_new_expr = @new_expr
+              | @new_array_expr;
+
+@new_or_delete_expr = @any_new_expr
+                    | @delete_expr
+                    | @delete_array_expr;
+
+@prefix_crement_expr = @preincrexpr | @predecrexpr;
+
+@postfix_crement_expr = @postincrexpr | @postdecrexpr;
+
+@increment_expr = @preincrexpr | @postincrexpr;
+
+@decrement_expr = @predecrexpr | @postdecrexpr;
+
+@crement_expr = @increment_expr | @decrement_expr;
+
+@un_arith_op_expr = @arithnegexpr
+                  | @unaryplusexpr
+                  | @conjugation
+                  | @realpartexpr
+                  | @imagpartexpr
+                  | @crement_expr
+                  ;
+
+@un_bitwise_op_expr = @complementexpr;
+
+@un_log_op_expr = @notexpr;
+
+@un_op_expr = @address_of
+            | @indirect
+            | @un_arith_op_expr
+            | @un_bitwise_op_expr
+            | @builtinaddressof
+            | @vec_fill
+            | @un_log_op_expr
+            | @co_await
+            | @co_yield
+            ;
+
+@bin_log_op_expr = @andlogicalexpr | @orlogicalexpr;
+
+@cmp_op_expr = @eq_op_expr | @rel_op_expr;
+
+@eq_op_expr = @eqexpr | @neexpr;
+
+@rel_op_expr = @gtexpr
+             | @ltexpr
+             | @geexpr
+             | @leexpr
+             | @spaceshipexpr
+             ;
+
+@bin_bitwise_op_expr = @lshiftexpr
+                     | @rshiftexpr
+                     | @andexpr
+                     | @orexpr
+                     | @xorexpr
+                     ;
+
+@p_arith_op_expr = @paddexpr
+                 | @psubexpr
+                 | @pdiffexpr
+                 ;
+
+@bin_arith_op_expr = @addexpr
+                   | @subexpr
+                   | @mulexpr
+                   | @divexpr
+                   | @remexpr
+                   | @jmulexpr
+                   | @jdivexpr
+                   | @fjaddexpr
+                   | @jfaddexpr
+                   | @fjsubexpr
+                   | @jfsubexpr
+                   | @minexpr
+                   | @maxexpr
+                   | @p_arith_op_expr
+                   ;
+
+@bin_op_expr = @bin_arith_op_expr
+             | @bin_bitwise_op_expr
+             | @cmp_op_expr
+             | @bin_log_op_expr
+             ;
+
+@op_expr = @un_op_expr
+         | @bin_op_expr
+         | @assign_expr
+         | @conditionalexpr
+         ;
+
+@assign_arith_expr = @assignaddexpr
+                   | @assignsubexpr
+                   | @assignmulexpr
+                   | @assigndivexpr
+                   | @assignremexpr
+                   ;
+
+@assign_bitwise_expr = @assignandexpr
+                     | @assignorexpr
+                     | @assignxorexpr
+                     | @assignlshiftexpr
+                     | @assignrshiftexpr
+                     ;
+
+@assign_pointer_expr = @assignpaddexpr
+                     | @assignpsubexpr
+                     ;
+
+@assign_op_expr = @assign_arith_expr
+                | @assign_bitwise_expr
+                | @assign_pointer_expr
+                ;
+
+@assign_expr = @assignexpr | @assign_op_expr | @blockassignexpr
+
+/*
+  Binary encoding of the allocator form.
+
+  case @allocator.form of
+    0 = plain
+  | 1 = alignment
+  ;
+*/
+
+/**
+ * The allocator function associated with a `new` or `new[]` expression.
+ * The `form` column specified whether the allocation call contains an alignment
+ * argument.
+ */
+expr_allocator(
+    unique int expr: @any_new_expr ref,
+    int func: @function ref,
+    int form: int ref
+);
+
+/*
+  Binary encoding of the deallocator form.
+
+  case @deallocator.form of
+    0 = plain
+  | 1 = size
+  | 2 = alignment
+  | 4 = destroying_delete
+  ;
+*/
+
+/**
+ * The deallocator function associated with a `delete`, `delete[]`, `new`, or
+ * `new[]` expression. For a `new` or `new[]` expression, the deallocator is the
+ * one used to free memory if the initialization throws an exception.
+ * The `form` column specifies whether the deallocation call contains a size
+ * argument, and alignment argument, or both.
+ */
+expr_deallocator(
+    unique int expr: @new_or_delete_expr ref,
+    int func: @function ref,
+    int form: int ref
+);
+
+/**
+ * Holds if the `@conditionalexpr` is of the two operand form
+ * `guard ? : false`.
+ */
+expr_cond_two_operand(
+    unique int cond: @conditionalexpr ref
+);
+
+/**
+ * The guard of `@conditionalexpr` `guard ? true : false`
+ */
+expr_cond_guard(
+    unique int cond: @conditionalexpr ref,
+    int guard: @expr ref
+);
+
+/**
+ * The expression used when the guard of `@conditionalexpr`
+ * `guard ? true : false` holds. For the two operand form
+ * `guard ?: false` consider using `expr_cond_guard` instead.
+ */
+expr_cond_true(
+    unique int cond: @conditionalexpr ref,
+    int true: @expr ref
+);
+
+/**
+ * The expression used when the guard of `@conditionalexpr`
+ * `guard ? true : false` does not hold.
+ */
+expr_cond_false(
+    unique int cond: @conditionalexpr ref,
+    int false: @expr ref
+);
+
+/** A string representation of the value. */
+values(
+    unique int id: @value,
+    string str: string ref
+);
+
+/** The actual text in the source code for the value, if any. */
+valuetext(
+    unique int id: @value ref,
+    string text: string ref
+);
+
+valuebind(
+    int val: @value ref,
+    unique int expr: @expr ref
+);
+
+fieldoffsets(
+    unique int id: @variable ref,
+    int byteoffset: int ref,
+    int bitoffset: int ref
+);
+
+bitfield(
+    unique int id: @variable ref,
+    int bits: int ref,
+    int declared_bits: int ref
+);
+
+/* TODO
+memberprefix(
+    int member: @expr ref,
+    int prefix: @expr ref
+);
+*/
+
+/*
+   kind(1) = mbrcallexpr
+   kind(2) = mbrptrcallexpr
+   kind(3) = mbrptrmbrcallexpr
+   kind(4) = ptrmbrptrmbrcallexpr
+   kind(5) = mbrreadexpr // x.y
+   kind(6) = mbrptrreadexpr // p->y
+   kind(7) = mbrptrmbrreadexpr // x.*pm
+   kind(8) = mbrptrmbrptrreadexpr // x->*pm
+   kind(9) = staticmbrreadexpr // static x.y
+   kind(10) = staticmbrptrreadexpr // static p->y
+*/
+/* TODO
+memberaccess(
+    int member: @expr ref,
+    int kind: int ref
+);
+*/
+
+initialisers(
+    unique int init: @initialiser,
+    int var: @accessible ref,
+    unique int expr: @expr ref,
+    int location: @location_expr ref
+);
+
+braced_initialisers(
+    int init: @initialiser ref
+);
+
+/**
+ * An ancestor for the expression, for cases in which we cannot
+ * otherwise find the expression's parent.
+ */
+expr_ancestor(
+    int exp: @expr ref,
+    int ancestor: @element ref
+);
+
+exprs(
+    unique int id: @expr,
+    int kind: int ref,
+    int location: @location_expr ref
+);
+
+expr_reuse(
+    int reuse: @expr ref,
+    int original: @expr ref,
+    int value_category: int ref
+)
+
+/*
+  case @value.category of
+    1 = prval
+  | 2 = xval
+  | 3 = lval
+  ;
+*/
+expr_types(
+    int id: @expr ref,
+    int typeid: @type ref,
+    int value_category: int ref
+);
+
+case @expr.kind of
+    1 = @errorexpr
+|   2 = @address_of // & AddressOfExpr
+|   3 = @reference_to // ReferenceToExpr (implicit?)
+|   4 = @indirect // * PointerDereferenceExpr
+|   5 = @ref_indirect // ReferenceDereferenceExpr (implicit?)
+// ...
+|   8 = @array_to_pointer // (???)
+|   9 = @vacuous_destructor_call // VacuousDestructorCall
+// ...
+|  11 = @assume // Microsoft
+|  12 = @parexpr
+|  13 = @arithnegexpr
+|  14 = @unaryplusexpr
+|  15 = @complementexpr
+|  16 = @notexpr
+|  17 = @conjugation // GNU ~ operator
+|  18 = @realpartexpr // GNU __real
+|  19 = @imagpartexpr // GNU __imag
+|  20 = @postincrexpr
+|  21 = @postdecrexpr
+|  22 = @preincrexpr
+|  23 = @predecrexpr
+|  24 = @conditionalexpr
+|  25 = @addexpr
+|  26 = @subexpr
+|  27 = @mulexpr
+|  28 = @divexpr
+|  29 = @remexpr
+|  30 = @jmulexpr // C99 mul imaginary
+|  31 = @jdivexpr // C99 div imaginary
+|  32 = @fjaddexpr // C99 add real + imaginary
+|  33 = @jfaddexpr // C99 add imaginary + real
+|  34 = @fjsubexpr // C99 sub real - imaginary
+|  35 = @jfsubexpr // C99 sub imaginary - real
+|  36 = @paddexpr // pointer add (pointer + int or int + pointer)
+|  37 = @psubexpr // pointer sub (pointer - integer)
+|  38 = @pdiffexpr // difference between two pointers
+|  39 = @lshiftexpr
+|  40 = @rshiftexpr
+|  41 = @andexpr
+|  42 = @orexpr
+|  43 = @xorexpr
+|  44 = @eqexpr
+|  45 = @neexpr
+|  46 = @gtexpr
+|  47 = @ltexpr
+|  48 = @geexpr
+|  49 = @leexpr
+|  50 = @minexpr // GNU minimum
+|  51 = @maxexpr // GNU maximum
+|  52 = @assignexpr
+|  53 = @assignaddexpr
+|  54 = @assignsubexpr
+|  55 = @assignmulexpr
+|  56 = @assigndivexpr
+|  57 = @assignremexpr
+|  58 = @assignlshiftexpr
+|  59 = @assignrshiftexpr
+|  60 = @assignandexpr
+|  61 = @assignorexpr
+|  62 = @assignxorexpr
+|  63 = @assignpaddexpr // assign pointer add
+|  64 = @assignpsubexpr // assign pointer sub
+|  65 = @andlogicalexpr
+|  66 = @orlogicalexpr
+|  67 = @commaexpr
+|  68 = @subscriptexpr // access to member of an array, e.g., a[5]
+// ...  69 @objc_subscriptexpr deprecated
+// ...  70 @cmdaccess deprecated
+// ...
+|  73 = @virtfunptrexpr
+|  74 = @callexpr
+// ...  75 @msgexpr_normal deprecated
+// ...  76 @msgexpr_super deprecated
+// ...  77 @atselectorexpr deprecated
+// ...  78 @atprotocolexpr deprecated
+|  79 = @vastartexpr
+|  80 = @vaargexpr
+|  81 = @vaendexpr
+|  82 = @vacopyexpr
+// ...  83 @atencodeexpr deprecated
+|  84 = @varaccess
+|  85 = @thisaccess
+// ...  86 @objc_box_expr deprecated
+|  87 = @new_expr
+|  88 = @delete_expr
+|  89 = @throw_expr
+|  90 = @condition_decl // a variable declared in a condition, e.g., if(int x = y > 2)
+|  91 = @braced_init_list
+|  92 = @type_id
+|  93 = @runtime_sizeof
+|  94 = @runtime_alignof
+|  95 = @sizeof_pack
+|  96 = @expr_stmt // GNU extension
+|  97 = @routineexpr
+|  98 = @type_operand // used to access a type in certain contexts (haven't found any examples yet....)
+|  99 = @offsetofexpr // offsetof ::= type and field
+| 100 = @hasassignexpr // __has_assign ::= type
+| 101 = @hascopyexpr // __has_copy ::= type
+| 102 = @hasnothrowassign // __has_nothrow_assign ::= type
+| 103 = @hasnothrowconstr // __has_nothrow_constructor ::= type
+| 104 = @hasnothrowcopy // __has_nothrow_copy ::= type
+| 105 = @hastrivialassign // __has_trivial_assign ::= type
+| 106 = @hastrivialconstr // __has_trivial_constructor ::= type
+| 107 = @hastrivialcopy // __has_trivial_copy ::= type
+| 108 = @hasuserdestr // __has_user_destructor ::= type
+| 109 = @hasvirtualdestr // __has_virtual_destructor ::= type
+| 110 = @isabstractexpr // __is_abstract ::= type
+| 111 = @isbaseofexpr // __is_base_of ::= type type
+| 112 = @isclassexpr // __is_class ::= type
+| 113 = @isconvtoexpr // __is_convertible_to ::= type type
+| 114 = @isemptyexpr // __is_empty ::= type
+| 115 = @isenumexpr // __is_enum ::= type
+| 116 = @ispodexpr // __is_pod ::= type
+| 117 = @ispolyexpr // __is_polymorphic ::= type
+| 118 = @isunionexpr // __is_union ::= type
+| 119 = @typescompexpr // GNU __builtin_types_compatible ::= type type
+| 120 = @intaddrexpr // frontend internal builtin, used to implement offsetof
+// ...
+| 122 = @hastrivialdestructor // __has_trivial_destructor ::= type
+| 123 = @literal
+| 124 = @uuidof
+| 127 = @aggregateliteral
+| 128 = @delete_array_expr
+| 129 = @new_array_expr
+// ... 130 @objc_array_literal deprecated
+// ... 131 @objc_dictionary_literal deprecated
+| 132 = @foldexpr
+// ...
+| 200 = @ctordirectinit
+| 201 = @ctorvirtualinit
+| 202 = @ctorfieldinit
+| 203 = @ctordelegatinginit
+| 204 = @dtordirectdestruct
+| 205 = @dtorvirtualdestruct
+| 206 = @dtorfielddestruct
+// ...
+| 210 = @static_cast
+| 211 = @reinterpret_cast
+| 212 = @const_cast
+| 213 = @dynamic_cast
+| 214 = @c_style_cast
+| 215 = @lambdaexpr
+| 216 = @param_ref
+| 217 = @noopexpr
+// ...
+| 294 = @istriviallyconstructibleexpr
+| 295 = @isdestructibleexpr
+| 296 = @isnothrowdestructibleexpr
+| 297 = @istriviallydestructibleexpr
+| 298 = @istriviallyassignableexpr
+| 299 = @isnothrowassignableexpr
+| 300 = @istrivialexpr
+| 301 = @isstandardlayoutexpr
+| 302 = @istriviallycopyableexpr
+| 303 = @isliteraltypeexpr
+| 304 = @hastrivialmoveconstructorexpr
+| 305 = @hastrivialmoveassignexpr
+| 306 = @hasnothrowmoveassignexpr
+| 307 = @isconstructibleexpr
+| 308 = @isnothrowconstructibleexpr
+| 309 = @hasfinalizerexpr
+| 310 = @isdelegateexpr
+| 311 = @isinterfaceclassexpr
+| 312 = @isrefarrayexpr
+| 313 = @isrefclassexpr
+| 314 = @issealedexpr
+| 315 = @issimplevalueclassexpr
+| 316 = @isvalueclassexpr
+| 317 = @isfinalexpr
+| 319 = @noexceptexpr
+| 320 = @builtinshufflevector
+| 321 = @builtinchooseexpr
+| 322 = @builtinaddressof
+| 323 = @vec_fill
+| 324 = @builtinconvertvector
+| 325 = @builtincomplex
+| 326 = @spaceshipexpr
+| 327 = @co_await
+| 328 = @co_yield
+| 329 = @temp_init
+| 330 = @isassignable
+| 331 = @isaggregate
+| 332 = @hasuniqueobjectrepresentations
+| 333 = @builtinbitcast
+| 334 = @builtinshuffle
+| 335 = @blockassignexpr
+| 336 = @issame
+| 337 = @isfunction
+| 338 = @islayoutcompatible
+| 339 = @ispointerinterconvertiblebaseof
+| 340 = @isarray
+| 341 = @arrayrank
+| 342 = @arrayextent
+| 343 = @isarithmetic
+| 344 = @iscompletetype
+| 345 = @iscompound
+| 346 = @isconst
+| 347 = @isfloatingpoint
+| 348 = @isfundamental
+| 349 = @isintegral
+| 350 = @islvaluereference
+| 351 = @ismemberfunctionpointer
+| 352 = @ismemberobjectpointer
+| 353 = @ismemberpointer
+| 354 = @isobject
+| 355 = @ispointer
+| 356 = @isreference
+| 357 = @isrvaluereference
+| 358 = @isscalar
+| 359 = @issigned
+| 360 = @isunsigned
+| 361 = @isvoid
+| 362 = @isvolatile
+| 363 = @reuseexpr
+| 364 = @istriviallycopyassignable
+| 365 = @isassignablenopreconditioncheck
+| 366 = @referencebindstotemporary
+| 367 = @issameas
+| 368 = @builtinhasattribute
+| 369 = @ispointerinterconvertiblewithclass
+| 370 = @builtinispointerinterconvertiblewithclass
+| 371 = @iscorrespondingmember
+| 372 = @builtiniscorrespondingmember
+| 373 = @isboundedarray
+| 374 = @isunboundedarray
+| 375 = @isreferenceable
+| 378 = @isnothrowconvertible
+| 379 = @referenceconstructsfromtemporary
+| 380 = @referenceconvertsfromtemporary
+| 381 = @isconvertible
+| 382 = @isvalidwinrttype
+| 383 = @iswinclass
+| 384 = @iswininterface
+| 385 = @istriviallyequalitycomparable
+| 386 = @isscopedenum
+| 387 = @istriviallyrelocatable
+| 388 = @datasizeof
+| 389 = @c11_generic
+| 390 = @requires_expr
+| 391 = @nested_requirement
+| 392 = @compound_requirement
+| 393 = @concept_id
+;
+
+@var_args_expr = @vastartexpr
+               | @vaendexpr
+               | @vaargexpr
+               | @vacopyexpr
+               ;
+
+@builtin_op = @var_args_expr
+            | @noopexpr
+            | @offsetofexpr
+            | @intaddrexpr
+            | @hasassignexpr
+            | @hascopyexpr
+            | @hasnothrowassign
+            | @hasnothrowconstr
+            | @hasnothrowcopy
+            | @hastrivialassign
+            | @hastrivialconstr
+            | @hastrivialcopy
+            | @hastrivialdestructor
+            | @hasuserdestr
+            | @hasvirtualdestr
+            | @isabstractexpr
+            | @isbaseofexpr
+            | @isclassexpr
+            | @isconvtoexpr
+            | @isemptyexpr
+            | @isenumexpr
+            | @ispodexpr
+            | @ispolyexpr
+            | @isunionexpr
+            | @typescompexpr
+            | @builtinshufflevector
+            | @builtinconvertvector
+            | @builtinaddressof
+            | @istriviallyconstructibleexpr
+            | @isdestructibleexpr
+            | @isnothrowdestructibleexpr
+            | @istriviallydestructibleexpr
+            | @istriviallyassignableexpr
+            | @isnothrowassignableexpr
+            | @istrivialexpr
+            | @isstandardlayoutexpr
+            | @istriviallycopyableexpr
+            | @isliteraltypeexpr
+            | @hastrivialmoveconstructorexpr
+            | @hastrivialmoveassignexpr
+            | @hasnothrowmoveassignexpr
+            | @isconstructibleexpr
+            | @isnothrowconstructibleexpr
+            | @hasfinalizerexpr
+            | @isdelegateexpr
+            | @isinterfaceclassexpr
+            | @isrefarrayexpr
+            | @isrefclassexpr
+            | @issealedexpr
+            | @issimplevalueclassexpr
+            | @isvalueclassexpr
+            | @isfinalexpr
+            | @builtinchooseexpr
+            | @builtincomplex
+            | @isassignable
+            | @isaggregate
+            | @hasuniqueobjectrepresentations
+            | @builtinbitcast
+            | @builtinshuffle
+            | @issame
+            | @isfunction
+            | @islayoutcompatible
+            | @ispointerinterconvertiblebaseof
+            | @isarray
+            | @arrayrank
+            | @arrayextent
+            | @isarithmetic
+            | @iscompletetype
+            | @iscompound
+            | @isconst
+            | @isfloatingpoint
+            | @isfundamental
+            | @isintegral
+            | @islvaluereference
+            | @ismemberfunctionpointer
+            | @ismemberobjectpointer
+            | @ismemberpointer
+            | @isobject
+            | @ispointer
+            | @isreference
+            | @isrvaluereference
+            | @isscalar
+            | @issigned
+            | @isunsigned
+            | @isvoid
+            | @isvolatile
+            | @istriviallycopyassignable
+            | @isassignablenopreconditioncheck
+            | @referencebindstotemporary
+            | @issameas
+            | @builtinhasattribute
+            | @ispointerinterconvertiblewithclass
+            | @builtinispointerinterconvertiblewithclass
+            | @iscorrespondingmember
+            | @builtiniscorrespondingmember
+            | @isboundedarray
+            | @isunboundedarray
+            | @isreferenceable
+            | @isnothrowconvertible
+            | @referenceconstructsfromtemporary
+            | @referenceconvertsfromtemporary
+            | @isconvertible
+            | @isvalidwinrttype
+            | @iswinclass
+            | @iswininterface
+            | @istriviallyequalitycomparable
+            | @isscopedenum
+            | @istriviallyrelocatable
+            ;
+
+compound_requirement_is_noexcept(
+    int expr: @compound_requirement ref
+);
+
+new_allocated_type(
+    unique int expr: @new_expr ref,
+    int type_id: @type ref
+);
+
+new_array_allocated_type(
+    unique int expr: @new_array_expr ref,
+    int type_id: @type ref
+);
+
+/**
+ * The field being initialized by an initializer expression within an aggregate
+ * initializer for a class/struct/union. Position is used to sort repeated initializers.
+ */
+#keyset[aggregate, position]
+aggregate_field_init(
+    int aggregate: @aggregateliteral ref,
+    int initializer: @expr ref,
+    int field: @membervariable ref,
+    int position: int ref
+);
+
+/**
+ * The index of the element being initialized by an initializer expression
+ * within an aggregate initializer for an array. Position is used to sort repeated initializers.
+ */
+#keyset[aggregate, position]
+aggregate_array_init(
+    int aggregate: @aggregateliteral ref,
+    int initializer: @expr ref,
+    int element_index: int ref,
+    int position: int ref
+);
+
+@ctorinit = @ctordirectinit
+          | @ctorvirtualinit
+          | @ctorfieldinit
+          | @ctordelegatinginit;
+@dtordestruct = @dtordirectdestruct
+              | @dtorvirtualdestruct
+              | @dtorfielddestruct;
+
+
+condition_decl_bind(
+    unique int expr: @condition_decl ref,
+    unique int decl: @declaration ref
+);
+
+typeid_bind(
+    unique int expr: @type_id ref,
+    int type_id: @type ref
+);
+
+uuidof_bind(
+    unique int expr: @uuidof ref,
+    int type_id: @type ref
+);
+
+@runtime_sizeof_or_alignof = @runtime_sizeof | @runtime_alignof | @datasizeof;
+
+sizeof_bind(
+    unique int expr: @runtime_sizeof_or_alignof ref,
+    int type_id: @type ref
+);
+
+code_block(
+    unique int block: @literal ref,
+    unique int routine: @function ref
+);
+
+lambdas(
+    unique int expr: @lambdaexpr ref,
+    string default_capture: string ref,
+    boolean has_explicit_return_type: boolean ref
+);
+
+lambda_capture(
+    unique int id: @lambdacapture,
+    int lambda: @lambdaexpr ref,
+    int index: int ref,
+    int field: @membervariable ref,
+    boolean captured_by_reference: boolean ref,
+    boolean is_implicit: boolean ref,
+    int location: @location_default ref
+);
+
+@funbindexpr = @routineexpr
+             | @new_expr
+             | @delete_expr
+             | @delete_array_expr
+             | @ctordirectinit
+             | @ctorvirtualinit
+             | @ctordelegatinginit
+             | @dtordirectdestruct
+             | @dtorvirtualdestruct;
+
+@varbindexpr = @varaccess | @ctorfieldinit | @dtorfielddestruct;
+@addressable = @function | @variable ;
+@accessible = @addressable | @enumconstant ;
+
+@access = @varaccess | @routineexpr ;
+
+fold(
+    int expr: @foldexpr ref,
+    string operator: string ref,
+    boolean is_left_fold: boolean ref
+);
+
+stmts(
+    unique int id: @stmt,
+    int kind: int ref,
+    int location: @location_stmt ref
+);
+
+case @stmt.kind of
+    1 = @stmt_expr
+|   2 = @stmt_if
+|   3 = @stmt_while
+|   4 = @stmt_goto
+|   5 = @stmt_label
+|   6 = @stmt_return
+|   7 = @stmt_block
+|   8 = @stmt_end_test_while // do { ... } while ( ... )
+|   9 = @stmt_for
+|  10 = @stmt_switch_case
+|  11 = @stmt_switch
+|  13 = @stmt_asm // "asm" statement or the body of an asm function
+|  15 = @stmt_try_block
+|  16 = @stmt_microsoft_try // Microsoft
+|  17 = @stmt_decl
+|  18 = @stmt_set_vla_size // C99
+|  19 = @stmt_vla_decl // C99
+|  25 = @stmt_assigned_goto // GNU
+|  26 = @stmt_empty
+|  27 = @stmt_continue
+|  28 = @stmt_break
+|  29 = @stmt_range_based_for // C++11
+// ...  30 @stmt_at_autoreleasepool_block deprecated
+// ...  31 @stmt_objc_for_in deprecated
+// ...  32 @stmt_at_synchronized deprecated
+|  33 = @stmt_handler
+// ...  34 @stmt_finally_end deprecated
+|  35 = @stmt_constexpr_if
+|  37 = @stmt_co_return
+;
+
+type_vla(
+    int type_id: @type ref,
+    int decl: @stmt_vla_decl ref
+);
+
+variable_vla(
+    int var: @variable ref,
+    int decl: @stmt_vla_decl ref
+);
+
+if_initialization(
+    unique int if_stmt: @stmt_if ref,
+    int init_id: @stmt ref
+);
+
+if_then(
+    unique int if_stmt: @stmt_if ref,
+    int then_id: @stmt ref
+);
+
+if_else(
+    unique int if_stmt: @stmt_if ref,
+    int else_id: @stmt ref
+);
+
+constexpr_if_initialization(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int init_id: @stmt ref
+);
+
+constexpr_if_then(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int then_id: @stmt ref
+);
+
+constexpr_if_else(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int else_id: @stmt ref
+);
+
+while_body(
+    unique int while_stmt: @stmt_while ref,
+    int body_id: @stmt ref
+);
+
+do_body(
+    unique int do_stmt: @stmt_end_test_while ref,
+    int body_id: @stmt ref
+);
+
+switch_initialization(
+    unique int switch_stmt: @stmt_switch ref,
+    int init_id: @stmt ref
+);
+
+#keyset[switch_stmt, index]
+switch_case(
+    int switch_stmt: @stmt_switch ref,
+    int index: int ref,
+    int case_id: @stmt_switch_case ref
+);
+
+switch_body(
+    unique int switch_stmt: @stmt_switch ref,
+    int body_id: @stmt ref
+);
+
+@stmt_for_or_range_based_for = @stmt_for
+                             | @stmt_range_based_for;
+
+for_initialization(
+    unique int for_stmt: @stmt_for_or_range_based_for ref,
+    int init_id: @stmt ref
+);
+
+for_condition(
+    unique int for_stmt: @stmt_for ref,
+    int condition_id: @expr ref
+);
+
+for_update(
+    unique int for_stmt: @stmt_for ref,
+    int update_id: @expr ref
+);
+
+for_body(
+    unique int for_stmt: @stmt_for ref,
+    int body_id: @stmt ref
+);
+
+@stmtparent = @stmt | @expr_stmt ;
+stmtparents(
+    unique int id: @stmt ref,
+    int index: int ref,
+    int parent: @stmtparent ref
+);
+
+ishandler(unique int block: @stmt_block ref);
+
+@cfgnode = @stmt | @expr | @function | @initialiser ;
+
+stmt_decl_bind(
+    int stmt: @stmt_decl ref,
+    int num: int ref,
+    int decl: @declaration ref
+);
+
+stmt_decl_entry_bind(
+    int stmt: @stmt_decl ref,
+    int num: int ref,
+    int decl_entry: @element ref
+);
+
+@parameterized_element = @function | @stmt_block | @requires_expr;
+
+blockscope(
+    unique int block: @stmt_block ref,
+    int enclosing: @parameterized_element ref
+);
+
+@jump = @stmt_goto | @stmt_break | @stmt_continue;
+
+@jumporlabel = @jump | @stmt_label | @literal;
+
+jumpinfo(
+    unique int id: @jumporlabel ref,
+    string str: string ref,
+    int target: @stmt ref
+);
+
+preprocdirects(
+    unique int id: @preprocdirect,
+    int kind: int ref,
+    int location: @location_default ref
+);
+case @preprocdirect.kind of
+   0 = @ppd_if
+|  1 = @ppd_ifdef
+|  2 = @ppd_ifndef
+|  3 = @ppd_elif
+|  4 = @ppd_else
+|  5 = @ppd_endif
+|  6 = @ppd_plain_include
+|  7 = @ppd_define
+|  8 = @ppd_undef
+|  9 = @ppd_line
+| 10 = @ppd_error
+| 11 = @ppd_pragma
+| 12 = @ppd_objc_import
+| 13 = @ppd_include_next
+| 18 = @ppd_warning
+;
+
+@ppd_include = @ppd_plain_include | @ppd_objc_import | @ppd_include_next;
+
+@ppd_branch = @ppd_if | @ppd_ifdef | @ppd_ifndef | @ppd_elif;
+
+preprocpair(
+    int begin : @ppd_branch ref,
+    int elseelifend : @preprocdirect ref
+);
+
+preproctrue(int branch : @ppd_branch ref);
+preprocfalse(int branch : @ppd_branch ref);
+
+preproctext(
+    unique int id: @preprocdirect ref,
+    string head: string ref,
+    string body: string ref
+);
+
+includes(
+    unique int id: @ppd_include ref,
+    int included: @file ref
+);
+
+link_targets(
+    int id: @link_target,
+    int binary: @file ref
+);
+
+link_parent(
+    int element : @element ref,
+    int link_target : @link_target ref
+);
+
+/* XML Files */
+
+xmlEncoding(unique int id: @file ref, string encoding: string ref);
+
+xmlDTDs(
+    unique int id: @xmldtd,
+    string root: string ref,
+    string publicId: string ref,
+    string systemId: string ref,
+    int fileid: @file ref
+);
+
+xmlElements(
+    unique int id: @xmlelement,
+    string name: string ref,
+    int parentid: @xmlparent ref,
+    int idx: int ref,
+    int fileid: @file ref
+);
+
+xmlAttrs(
+    unique int id: @xmlattribute,
+    int elementid: @xmlelement ref,
+    string name: string ref,
+    string value: string ref,
+    int idx: int ref,
+    int fileid: @file ref
+);
+
+xmlNs(
+    int id: @xmlnamespace,
+    string prefixName: string ref,
+    string URI: string ref,
+    int fileid: @file ref
+);
+
+xmlHasNs(
+    int elementId: @xmlnamespaceable ref,
+    int nsId: @xmlnamespace ref,
+    int fileid: @file ref
+);
+
+xmlComments(
+    unique int id: @xmlcomment,
+    string text: string ref,
+    int parentid: @xmlparent ref,
+    int fileid: @file ref
+);
+
+xmlChars(
+    unique int id: @xmlcharacters,
+    string text: string ref,
+    int parentid: @xmlparent ref,
+    int idx: int ref,
+    int isCDATA: int ref,
+    int fileid: @file ref
+);
+
+@xmlparent = @file | @xmlelement;
+@xmlnamespaceable = @xmlelement | @xmlattribute;
+
+xmllocations(
+    int xmlElement: @xmllocatable ref,
+    int location: @location_default ref
+);
+
+@xmllocatable = @xmlcharacters
+              | @xmlelement
+              | @xmlcomment
+              | @xmlattribute
+              | @xmldtd
+              | @file
+              | @xmlnamespace;
diff --git a/cpp/ql/lib/upgrades/6f5d51e89e762fe4609fd4ac8ee3afb04221e873/upgrade.properties b/cpp/ql/lib/upgrades/6f5d51e89e762fe4609fd4ac8ee3afb04221e873/upgrade.properties
new file mode 100644
index 00000000000..5807e06e14c
--- /dev/null
+++ b/cpp/ql/lib/upgrades/6f5d51e89e762fe4609fd4ac8ee3afb04221e873/upgrade.properties
@@ -0,0 +1,2 @@
+description: Support C++20 requires expressions
+compatibility: backwards
diff --git a/cpp/ql/lib/upgrades/7ff6a6e53dbcff09d1b9b758b594bc6d17366863/old.dbscheme b/cpp/ql/lib/upgrades/7ff6a6e53dbcff09d1b9b758b594bc6d17366863/old.dbscheme
new file mode 100644
index 00000000000..7ff6a6e53db
--- /dev/null
+++ b/cpp/ql/lib/upgrades/7ff6a6e53dbcff09d1b9b758b594bc6d17366863/old.dbscheme
@@ -0,0 +1,2315 @@
+
+/**
+ * An invocation of the compiler. Note that more than one file may be
+ * compiled per invocation. For example, this command compiles three
+ * source files:
+ *
+ *   gcc -c f1.c f2.c f3.c
+ *
+ * The `id` simply identifies the invocation, while `cwd` is the working
+ * directory from which the compiler was invoked.
+ */
+compilations(
+    /**
+     * An invocation of the compiler. Note that more than one file may
+     * be compiled per invocation. For example, this command compiles
+     * three source files:
+     *
+     *   gcc -c f1.c f2.c f3.c
+     */
+    unique int id : @compilation,
+    string cwd : string ref
+);
+
+/**
+ * The arguments that were passed to the extractor for a compiler
+ * invocation. If `id` is for the compiler invocation
+ *
+ *   gcc -c f1.c f2.c f3.c
+ *
+ * then typically there will be rows for
+ *
+ * num | arg
+ * --- | ---
+ * 0   | *path to extractor*
+ * 1   | `--mimic`
+ * 2   | `/usr/bin/gcc`
+ * 3   | `-c`
+ * 4   | f1.c
+ * 5   | f2.c
+ * 6   | f3.c
+ */
+#keyset[id, num]
+compilation_args(
+    int id : @compilation ref,
+    int num : int ref,
+    string arg : string ref
+);
+
+/**
+ * The source files that are compiled by a compiler invocation.
+ * If `id` is for the compiler invocation
+ *
+ *   gcc -c f1.c f2.c f3.c
+ *
+ * then there will be rows for
+ *
+ * num | arg
+ * --- | ---
+ * 0   | f1.c
+ * 1   | f2.c
+ * 2   | f3.c
+ *
+ * Note that even if those files `#include` headers, those headers
+ * do not appear as rows.
+ */
+#keyset[id, num]
+compilation_compiling_files(
+    int id : @compilation ref,
+    int num : int ref,
+    int file : @file ref
+);
+
+/**
+ * The time taken by the extractor for a compiler invocation.
+ *
+ * For each file `num`, there will be rows for
+ *
+ * kind | seconds
+ * ---- | ---
+ * 1    | CPU seconds used by the extractor frontend
+ * 2    | Elapsed seconds during the extractor frontend
+ * 3    | CPU seconds used by the extractor backend
+ * 4    | Elapsed seconds during the extractor backend
+ */
+#keyset[id, num, kind]
+compilation_time(
+    int id : @compilation ref,
+    int num : int ref,
+    /* kind:
+       1 = frontend_cpu_seconds
+       2 = frontend_elapsed_seconds
+       3 = extractor_cpu_seconds
+       4 = extractor_elapsed_seconds
+    */
+    int kind : int ref,
+    float seconds : float ref
+);
+
+/**
+ * An error or warning generated by the extractor.
+ * The diagnostic message `diagnostic` was generated during compiler
+ * invocation `compilation`, and is the `file_number_diagnostic_number`th
+ * message generated while extracting the `file_number`th file of that
+ * invocation.
+ */
+#keyset[compilation, file_number, file_number_diagnostic_number]
+diagnostic_for(
+    int diagnostic : @diagnostic ref,
+    int compilation : @compilation ref,
+    int file_number : int ref,
+    int file_number_diagnostic_number : int ref
+);
+
+/**
+ * If extraction was successful, then `cpu_seconds` and
+ * `elapsed_seconds` are the CPU time and elapsed time (respectively)
+ * that extraction took for compiler invocation `id`.
+ */
+compilation_finished(
+    unique int id : @compilation ref,
+    float cpu_seconds : float ref,
+    float elapsed_seconds : float ref
+);
+
+
+/**
+ * External data, loaded from CSV files during snapshot creation. See
+ * [Tutorial: Incorporating external data](https://help.semmle.com/wiki/display/SD/Tutorial%3A+Incorporating+external+data)
+ * for more information.
+ */
+externalData(
+    int id : @externalDataElement,
+    string path : string ref,
+    int column: int ref,
+    string value : string ref
+);
+
+/**
+ * The source location of the snapshot.
+ */
+sourceLocationPrefix(string prefix : string ref);
+
+/**
+ * Information about packages that provide code used during compilation.
+ * The `id` is just a unique identifier.
+ * The `namespace` is typically the name of the package manager that
+ * provided the package (e.g. "dpkg" or "yum").
+ * The `package_name` is the name of the package, and `version` is its
+ * version (as a string).
+ */
+external_packages(
+    unique int id: @external_package,
+    string namespace : string ref,
+    string package_name : string ref,
+    string version : string ref
+);
+
+/**
+ * Holds if File `fileid` was provided by package `package`.
+ */
+header_to_external_package(
+    int fileid : @file ref,
+    int package : @external_package ref
+);
+
+/*
+ * Version history
+ */
+
+svnentries(
+    unique int id : @svnentry,
+    string revision : string ref,
+    string author : string ref,
+    date revisionDate : date ref,
+    int changeSize : int ref
+)
+
+svnaffectedfiles(
+    int id : @svnentry ref,
+    int file : @file ref,
+    string action : string ref
+)
+
+svnentrymsg(
+    unique int id : @svnentry ref,
+    string message : string ref
+)
+
+svnchurn(
+    int commit : @svnentry ref,
+    int file : @file ref,
+    int addedLines : int ref,
+    int deletedLines : int ref
+)
+
+/*
+ * C++ dbscheme
+ */
+
+extractor_version(
+    string codeql_version: string ref,
+    string frontend_version: string ref
+)
+
+@location = @location_stmt | @location_expr | @location_default ;
+
+/**
+ * The location of an element that is not an expression or a statement.
+ * The location spans column `startcolumn` of line `startline` to
+ * column `endcolumn` of line `endline` in file `file`.
+ * For more information, see
+ * [Locations](https://codeql.github.com/docs/writing-codeql-queries/providing-locations-in-codeql-queries/).
+ */
+locations_default(
+    /** The location of an element that is not an expression or a statement. */
+    unique int id: @location_default,
+    int container: @container ref,
+    int startLine: int ref,
+    int startColumn: int ref,
+    int endLine: int ref,
+    int endColumn: int ref
+);
+
+/**
+ * The location of a statement.
+ * The location spans column `startcolumn` of line `startline` to
+ * column `endcolumn` of line `endline` in file `file`.
+ * For more information, see
+ * [Locations](https://codeql.github.com/docs/writing-codeql-queries/providing-locations-in-codeql-queries/).
+ */
+locations_stmt(
+    /** The location of a statement. */
+    unique int id: @location_stmt,
+    int container: @container ref,
+    int startLine: int ref,
+    int startColumn: int ref,
+    int endLine: int ref,
+    int endColumn: int ref
+);
+
+/**
+ * The location of an expression.
+ * The location spans column `startcolumn` of line `startline` to
+ * column `endcolumn` of line `endline` in file `file`.
+ * For more information, see
+ * [Locations](https://codeql.github.com/docs/writing-codeql-queries/providing-locations-in-codeql-queries/).
+ */
+locations_expr(
+    /** The location of an expression. */
+    unique int id: @location_expr,
+    int container: @container ref,
+    int startLine: int ref,
+    int startColumn: int ref,
+    int endLine: int ref,
+    int endColumn: int ref
+);
+
+/** An element for which line-count information is available. */
+@sourceline = @file | @function | @variable | @enumconstant | @xmllocatable;
+
+numlines(
+    int element_id: @sourceline ref,
+    int num_lines: int ref,
+    int num_code: int ref,
+    int num_comment: int ref
+);
+
+diagnostics(
+    unique int id: @diagnostic,
+    int severity: int ref,
+    string error_tag: string ref,
+    string error_message: string ref,
+    string full_error_message: string ref,
+    int location: @location_default ref
+);
+
+files(
+    unique int id: @file,
+    string name: string ref
+);
+
+folders(
+    unique int id: @folder,
+    string name: string ref
+);
+
+@container = @folder | @file
+
+containerparent(
+    int parent: @container ref,
+    unique int child: @container ref
+);
+
+fileannotations(
+    int id: @file ref,
+    int kind: int ref,
+    string name: string ref,
+    string value: string ref
+);
+
+inmacroexpansion(
+    int id: @element ref,
+    int inv: @macroinvocation ref
+);
+
+affectedbymacroexpansion(
+    int id: @element ref,
+    int inv: @macroinvocation ref
+);
+
+case @macroinvocation.kind of
+  1 = @macro_expansion
+| 2 = @other_macro_reference
+;
+
+macroinvocations(
+    unique int id: @macroinvocation,
+    int macro_id: @ppd_define ref,
+    int location: @location_default ref,
+    int kind: int ref
+);
+
+macroparent(
+    unique int id: @macroinvocation ref,
+    int parent_id: @macroinvocation ref
+);
+
+// a macroinvocation may be part of another location
+// the way to find a constant expression that uses a macro
+// is thus to find a constant expression that has a location
+// to which a macro invocation is bound
+macrolocationbind(
+    int id: @macroinvocation ref,
+    int location: @location ref
+);
+
+#keyset[invocation, argument_index]
+macro_argument_unexpanded(
+    int invocation: @macroinvocation ref,
+    int argument_index: int ref,
+    string text: string ref
+);
+
+#keyset[invocation, argument_index]
+macro_argument_expanded(
+    int invocation: @macroinvocation ref,
+    int argument_index: int ref,
+    string text: string ref
+);
+
+/*
+case @function.kind of
+  1 = @normal_function
+| 2 = @constructor
+| 3 = @destructor
+| 4 = @conversion_function
+| 5 = @operator
+| 6 = @builtin_function     // GCC built-in functions, e.g. __builtin___memcpy_chk
+| 7 = @user_defined_literal
+| 8 = @deduction_guide
+;
+*/
+
+functions(
+    unique int id: @function,
+    string name: string ref,
+    int kind: int ref
+);
+
+function_entry_point(
+    int id: @function ref,
+    unique int entry_point: @stmt ref
+);
+
+function_return_type(
+    int id: @function ref,
+    int return_type: @type ref
+);
+
+/**
+ * If `function` is a coroutine, then this gives the `std::experimental::resumable_traits`
+ * instance associated with it, and the variables representing the `handle` and `promise`
+ * for it.
+ */
+coroutine(
+  unique int function: @function ref,
+  int traits: @type ref
+);
+
+/*
+case @coroutine_placeholder_variable.kind of
+  1 = @handle
+| 2 = @promise
+| 3 = @init_await_resume
+;
+*/
+
+coroutine_placeholder_variable(
+  unique int placeholder_variable: @variable ref,
+  int kind: int ref,
+  int function: @function ref
+)
+
+/** The `new` function used for allocating the coroutine state, if any. */
+coroutine_new(
+  unique int function: @function ref,
+  int new: @function ref
+);
+
+/** The `delete` function used for deallocating the coroutine state, if any. */
+coroutine_delete(
+  unique int function: @function ref,
+  int delete: @function ref
+);
+
+purefunctions(unique int id: @function ref);
+
+function_deleted(unique int id: @function ref);
+
+function_defaulted(unique int id: @function ref);
+
+function_prototyped(unique int id: @function ref)
+
+deduction_guide_for_class(
+    int id: @function ref,
+    int class_template: @usertype ref
+)
+
+member_function_this_type(
+    unique int id: @function ref,
+    int this_type: @type ref
+);
+
+#keyset[id, type_id]
+fun_decls(
+    int id: @fun_decl,
+    int function: @function ref,
+    int type_id: @type ref,
+    string name: string ref,
+    int location: @location_default ref
+);
+fun_def(unique int id: @fun_decl ref);
+fun_specialized(unique int id: @fun_decl ref);
+fun_implicit(unique int id: @fun_decl ref);
+fun_decl_specifiers(
+    int id: @fun_decl ref,
+    string name: string ref
+)
+#keyset[fun_decl, index]
+fun_decl_throws(
+    int fun_decl: @fun_decl ref,
+    int index: int ref,
+    int type_id: @type ref
+);
+/* an empty throw specification is different from none */
+fun_decl_empty_throws(unique int fun_decl: @fun_decl ref);
+fun_decl_noexcept(
+    int fun_decl: @fun_decl ref,
+    int constant: @expr ref
+);
+fun_decl_empty_noexcept(int fun_decl: @fun_decl ref);
+fun_decl_typedef_type(
+    unique int fun_decl: @fun_decl ref,
+    int typedeftype_id: @usertype ref
+);
+
+param_decl_bind(
+    unique int id: @var_decl ref,
+    int index: int ref,
+    int fun_decl: @fun_decl ref
+);
+
+#keyset[id, type_id]
+var_decls(
+    int id: @var_decl,
+    int variable: @variable ref,
+    int type_id: @type ref,
+    string name: string ref,
+    int location: @location_default ref
+);
+var_def(unique int id: @var_decl ref);
+var_decl_specifiers(
+    int id: @var_decl ref,
+    string name: string ref
+)
+is_structured_binding(unique int id: @variable ref);
+
+type_decls(
+    unique int id: @type_decl,
+    int type_id: @type ref,
+    int location: @location_default ref
+);
+type_def(unique int id: @type_decl ref);
+type_decl_top(
+    unique int type_decl: @type_decl ref
+);
+
+namespace_decls(
+    unique int id: @namespace_decl,
+    int namespace_id: @namespace ref,
+    int location: @location_default ref,
+    int bodylocation: @location_default ref
+);
+
+case @using.kind of
+  1 = @using_declaration
+| 2 = @using_directive
+| 3 = @using_enum_declaration
+;
+
+usings(
+    unique int id: @using,
+    int element_id: @element ref,
+    int location: @location_default ref,
+    int kind: int ref
+);
+
+/** The element which contains the `using` declaration. */
+using_container(
+    int parent: @element ref,
+    int child: @using ref
+);
+
+static_asserts(
+    unique int id: @static_assert,
+    int condition : @expr ref,
+    string message : string ref,
+    int location: @location_default ref,
+    int enclosing : @element ref
+);
+
+// each function has an ordered list of parameters
+#keyset[id, type_id]
+#keyset[function, index, type_id]
+params(
+    int id: @parameter,
+    int function: @functionorblock ref,
+    int index: int ref,
+    int type_id: @type ref
+);
+
+overrides(
+    int new: @function ref,
+    int old: @function ref
+);
+
+#keyset[id, type_id]
+membervariables(
+    int id: @membervariable,
+    int type_id: @type ref,
+    string name: string ref
+);
+
+#keyset[id, type_id]
+globalvariables(
+    int id: @globalvariable,
+    int type_id: @type ref,
+    string name: string ref
+);
+
+#keyset[id, type_id]
+localvariables(
+    int id: @localvariable,
+    int type_id: @type ref,
+    string name: string ref
+);
+
+autoderivation(
+    unique int var: @variable ref,
+    int derivation_type: @type ref
+);
+
+orphaned_variables(
+    int var: @localvariable ref,
+    int function: @function ref
+)
+
+enumconstants(
+    unique int id: @enumconstant,
+    int parent: @usertype ref,
+    int index: int ref,
+    int type_id: @type ref,
+    string name: string ref,
+    int location: @location_default ref
+);
+
+@variable = @localscopevariable | @globalvariable | @membervariable;
+
+@localscopevariable = @localvariable | @parameter;
+
+/**
+ * Built-in types are the fundamental types, e.g., integral, floating, and void.
+ */
+case @builtintype.kind of
+   1 = @errortype
+|  2 = @unknowntype
+|  3 = @void
+|  4 = @boolean
+|  5 = @char
+|  6 = @unsigned_char
+|  7 = @signed_char
+|  8 = @short
+|  9 = @unsigned_short
+| 10 = @signed_short
+| 11 = @int
+| 12 = @unsigned_int
+| 13 = @signed_int
+| 14 = @long
+| 15 = @unsigned_long
+| 16 = @signed_long
+| 17 = @long_long
+| 18 = @unsigned_long_long
+| 19 = @signed_long_long
+// ... 20 Microsoft-specific __int8
+// ... 21 Microsoft-specific __int16
+// ... 22 Microsoft-specific __int32
+// ... 23 Microsoft-specific __int64
+| 24 = @float
+| 25 = @double
+| 26 = @long_double
+| 27 = @complex_float         // C99-specific _Complex float
+| 28 = @complex_double        // C99-specific _Complex double
+| 29 = @complex_long_double   // C99-specific _Complex long double
+| 30 = @imaginary_float       // C99-specific _Imaginary float
+| 31 = @imaginary_double      // C99-specific _Imaginary double
+| 32 = @imaginary_long_double // C99-specific _Imaginary long double
+| 33 = @wchar_t               // Microsoft-specific
+| 34 = @decltype_nullptr      // C++11
+| 35 = @int128                // __int128
+| 36 = @unsigned_int128       // unsigned __int128
+| 37 = @signed_int128         // signed __int128
+| 38 = @float128              // __float128
+| 39 = @complex_float128      // _Complex __float128
+| 40 = @decimal32             // _Decimal32
+| 41 = @decimal64             // _Decimal64
+| 42 = @decimal128            // _Decimal128
+| 43 = @char16_t
+| 44 = @char32_t
+| 45 = @std_float32           // _Float32
+| 46 = @float32x              // _Float32x
+| 47 = @std_float64           // _Float64
+| 48 = @float64x              // _Float64x
+| 49 = @std_float128          // _Float128
+// ... 50 _Float128x
+| 51 = @char8_t
+| 52 = @float16               // _Float16
+| 53 = @complex_float16       // _Complex _Float16
+| 54 = @fp16                  // __fp16
+| 55 = @std_bfloat16          // __bf16
+| 56 = @std_float16           // std::float16_t
+| 57 = @complex_std_float32   // _Complex _Float32
+| 58 = @complex_float32x      // _Complex _Float32x
+| 59 = @complex_std_float64   // _Complex _Float64
+| 60 = @complex_float64x      // _Complex _Float64x
+| 61 = @complex_std_float128  // _Complex _Float128
+;
+
+builtintypes(
+    unique int id: @builtintype,
+    string name: string ref,
+    int kind: int ref,
+    int size: int ref,
+    int sign: int ref,
+    int alignment: int ref
+);
+
+/**
+ * Derived types are types that are directly derived from existing types and
+ * point to, refer to, transform type data to return a new type.
+ */
+case @derivedtype.kind of
+   1 = @pointer
+|  2 = @reference
+|  3 = @type_with_specifiers
+|  4 = @array
+|  5 = @gnu_vector
+|  6 = @routineptr
+|  7 = @routinereference
+|  8 = @rvalue_reference // C++11
+// ... 9 type_conforming_to_protocols deprecated
+| 10 = @block
+;
+
+derivedtypes(
+    unique int id: @derivedtype,
+    string name: string ref,
+    int kind: int ref,
+    int type_id: @type ref
+);
+
+pointerishsize(unique int id: @derivedtype ref,
+    int size: int ref,
+    int alignment: int ref);
+
+arraysizes(
+    unique int id: @derivedtype ref,
+    int num_elements: int ref,
+    int bytesize: int ref,
+    int alignment: int ref
+);
+
+typedefbase(
+    unique int id: @usertype ref,
+    int type_id: @type ref
+);
+
+/**
+ * An instance of the C++11 `decltype` operator.  For example:
+ * ```
+ * int a;
+ * decltype(1+a) b;
+ * ```
+ * Here `expr` is `1+a`.
+ *
+ * Sometimes an additional pair of parentheses around the expression
+ * would change the semantics of this decltype, e.g.
+ * ```
+ * struct A { double x; };
+ * const A* a = new A();
+ * decltype( a->x ); // type is double
+ * decltype((a->x)); // type is const double&
+ * ```
+ * (Please consult the C++11 standard for more details).
+ * `parentheses_would_change_meaning` is `true` iff that is the case.
+ */
+#keyset[id, expr]
+decltypes(
+    int id: @decltype,
+    int expr: @expr ref,
+    int base_type: @type ref,
+    boolean parentheses_would_change_meaning: boolean ref
+);
+
+/*
+case @usertype.kind of
+   1 = @struct
+|  2 = @class
+|  3 = @union
+|  4 = @enum
+|  5 = @typedef                       // classic C: typedef typedef type name
+|  6 = @template
+|  7 = @template_parameter
+|  8 = @template_template_parameter
+|  9 = @proxy_class                   // a proxy class associated with a template parameter
+// ... 10 objc_class deprecated
+// ... 11 objc_protocol deprecated
+// ... 12 objc_category deprecated
+| 13 = @scoped_enum
+| 14 = @using_alias                  // a using name = type style typedef
+;
+*/
+
+usertypes(
+    unique int id: @usertype,
+    string name: string ref,
+    int kind: int ref
+);
+
+usertypesize(
+    unique int id: @usertype ref,
+    int size: int ref,
+    int alignment: int ref
+);
+
+usertype_final(unique int id: @usertype ref);
+
+usertype_uuid(
+    unique int id: @usertype ref,
+    string uuid: string ref
+);
+
+mangled_name(
+    unique int id: @declaration ref,
+    int mangled_name : @mangledname,
+    boolean is_complete: boolean ref
+);
+
+is_pod_class(unique int id: @usertype ref);
+is_standard_layout_class(unique int id: @usertype ref);
+
+is_complete(unique int id: @usertype ref);
+
+is_class_template(unique int id: @usertype ref);
+class_instantiation(
+    int to: @usertype ref,
+    int from: @usertype ref
+);
+class_template_argument(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+class_template_argument_value(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+is_proxy_class_for(
+    unique int id: @usertype ref,
+    unique int templ_param_id: @usertype ref
+);
+
+type_mentions(
+    unique int id: @type_mention,
+    int type_id: @type ref,
+    int location: @location ref,
+    // a_symbol_reference_kind from the frontend.
+    int kind: int ref
+);
+
+is_function_template(unique int id: @function ref);
+function_instantiation(
+    unique int to: @function ref,
+    int from: @function ref
+);
+function_template_argument(
+    int function_id: @function ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+function_template_argument_value(
+    int function_id: @function ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+is_variable_template(unique int id: @variable ref);
+variable_instantiation(
+    unique int to: @variable ref,
+    int from: @variable ref
+);
+variable_template_argument(
+    int variable_id: @variable ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+variable_template_argument_value(
+    int variable_id: @variable ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+routinetypes(
+    unique int id: @routinetype,
+    int return_type: @type ref
+);
+
+routinetypeargs(
+    int routine: @routinetype ref,
+    int index: int ref,
+    int type_id: @type ref
+);
+
+ptrtomembers(
+    unique int id: @ptrtomember,
+    int type_id: @type ref,
+    int class_id: @type ref
+);
+
+/*
+ specifiers for types, functions, and variables
+
+    "public",
+    "protected",
+    "private",
+
+    "const",
+    "volatile",
+    "static",
+
+    "pure",
+    "virtual",
+    "sealed", // Microsoft
+    "__interface", // Microsoft
+    "inline",
+    "explicit",
+
+    "near", // near far extension
+    "far", // near far extension
+    "__ptr32", // Microsoft
+    "__ptr64", // Microsoft
+    "__sptr", // Microsoft
+    "__uptr", // Microsoft
+    "dllimport", // Microsoft
+    "dllexport", // Microsoft
+    "thread", // Microsoft
+    "naked", // Microsoft
+    "microsoft_inline", // Microsoft
+    "forceinline", // Microsoft
+    "selectany", // Microsoft
+    "nothrow", // Microsoft
+    "novtable", // Microsoft
+    "noreturn", // Microsoft
+    "noinline", // Microsoft
+    "noalias", // Microsoft
+    "restrict", // Microsoft
+*/
+
+specifiers(
+    unique int id: @specifier,
+    unique string str: string ref
+);
+
+typespecifiers(
+    int type_id: @type ref,
+    int spec_id: @specifier ref
+);
+
+funspecifiers(
+    int func_id: @function ref,
+    int spec_id: @specifier ref
+);
+
+varspecifiers(
+    int var_id: @accessible ref,
+    int spec_id: @specifier ref
+);
+
+explicit_specifier_exprs(
+    unique int func_id: @function ref,
+    int constant: @expr ref
+)
+
+attributes(
+    unique int id: @attribute,
+    int kind: int ref,
+    string name: string ref,
+    string name_space: string ref,
+    int location: @location_default ref
+);
+
+case @attribute.kind of
+  0 = @gnuattribute
+| 1 = @stdattribute
+| 2 = @declspec
+| 3 = @msattribute
+| 4 = @alignas
+// ... 5 @objc_propertyattribute deprecated
+;
+
+attribute_args(
+    unique int id: @attribute_arg,
+    int kind: int ref,
+    int attribute: @attribute ref,
+    int index: int ref,
+    int location: @location_default ref
+);
+
+case @attribute_arg.kind of
+  0 = @attribute_arg_empty
+| 1 = @attribute_arg_token
+| 2 = @attribute_arg_constant
+| 3 = @attribute_arg_type
+| 4 = @attribute_arg_constant_expr
+| 5 = @attribute_arg_expr
+;
+
+attribute_arg_value(
+    unique int arg: @attribute_arg ref,
+    string value: string ref
+);
+attribute_arg_type(
+    unique int arg: @attribute_arg ref,
+    int type_id: @type ref
+);
+attribute_arg_constant(
+    unique int arg: @attribute_arg ref,
+    int constant: @expr ref
+)
+attribute_arg_expr(
+    unique int arg: @attribute_arg ref,
+    int expr: @expr ref
+)
+attribute_arg_name(
+    unique int arg: @attribute_arg ref,
+    string name: string ref
+);
+
+typeattributes(
+    int type_id: @type ref,
+    int spec_id: @attribute ref
+);
+
+funcattributes(
+    int func_id: @function ref,
+    int spec_id: @attribute ref
+);
+
+varattributes(
+    int var_id: @accessible ref,
+    int spec_id: @attribute ref
+);
+
+stmtattributes(
+    int stmt_id: @stmt ref,
+    int spec_id: @attribute ref
+);
+
+@type = @builtintype
+      | @derivedtype
+      | @usertype
+      /* TODO | @fixedpointtype */
+      | @routinetype
+      | @ptrtomember
+      | @decltype;
+
+unspecifiedtype(
+    unique int type_id: @type ref,
+    int unspecified_type_id: @type ref
+);
+
+member(
+    int parent: @type ref,
+    int index: int ref,
+    int child: @member ref
+);
+
+@enclosingfunction_child = @usertype | @variable | @namespace
+
+enclosingfunction(
+    unique int child: @enclosingfunction_child ref,
+    int parent: @function ref
+);
+
+derivations(
+    unique int derivation: @derivation,
+    int sub: @type ref,
+    int index: int ref,
+    int super: @type ref,
+    int location: @location_default ref
+);
+
+derspecifiers(
+    int der_id: @derivation ref,
+    int spec_id: @specifier ref
+);
+
+/**
+ * Contains the byte offset of the base class subobject within the derived
+ * class. Only holds for non-virtual base classes, but see table
+ * `virtual_base_offsets` for offsets of virtual base class subobjects.
+ */
+direct_base_offsets(
+    unique int der_id: @derivation ref,
+    int offset: int ref
+);
+
+/**
+ * Contains the byte offset of the virtual base class subobject for class
+ * `super` within a most-derived object of class `sub`. `super` can be either a
+ * direct or indirect base class.
+ */
+#keyset[sub, super]
+virtual_base_offsets(
+    int sub: @usertype ref,
+    int super: @usertype ref,
+    int offset: int ref
+);
+
+frienddecls(
+    unique int id: @frienddecl,
+    int type_id: @type ref,
+    int decl_id: @declaration ref,
+    int location: @location_default ref
+);
+
+@declaredtype = @usertype ;
+
+@declaration = @function
+             | @declaredtype
+             | @variable
+             | @enumconstant
+             | @frienddecl;
+
+@member = @membervariable
+        | @function
+        | @declaredtype
+        | @enumconstant;
+
+@locatable = @diagnostic
+           | @declaration
+           | @ppd_include
+           | @ppd_define
+           | @macroinvocation
+           /*| @funcall*/
+           | @xmllocatable
+           | @attribute
+           | @attribute_arg;
+
+@namedscope = @namespace | @usertype;
+
+@element = @locatable
+         | @file
+         | @folder
+         | @specifier
+         | @type
+         | @expr
+         | @namespace
+         | @initialiser
+         | @stmt
+         | @derivation
+         | @comment
+         | @preprocdirect
+         | @fun_decl
+         | @var_decl
+         | @type_decl
+         | @namespace_decl
+         | @using
+         | @namequalifier
+         | @specialnamequalifyingelement
+         | @static_assert
+         | @type_mention
+         | @lambdacapture;
+
+@exprparent = @element;
+
+comments(
+    unique int id: @comment,
+    string contents: string ref,
+    int location: @location_default ref
+);
+
+commentbinding(
+    int id: @comment ref,
+    int element: @element ref
+);
+
+exprconv(
+    int converted: @expr ref,
+    unique int conversion: @expr ref
+);
+
+compgenerated(unique int id: @element ref);
+
+/**
+ * `destructor_call` destructs the `i`'th entity that should be
+ * destructed following `element`. Note that entities should be
+ * destructed in reverse construction order, so for a given `element`
+ * these should be called from highest to lowest `i`.
+ */
+#keyset[element, destructor_call]
+#keyset[element, i]
+synthetic_destructor_call(
+    int element: @element ref,
+    int i: int ref,
+    int destructor_call: @routineexpr ref
+);
+
+namespaces(
+    unique int id: @namespace,
+    string name: string ref
+);
+
+namespace_inline(
+    unique int id: @namespace ref
+);
+
+namespacembrs(
+    int parentid: @namespace ref,
+    unique int memberid: @namespacembr ref
+);
+
+@namespacembr = @declaration | @namespace;
+
+exprparents(
+    int expr_id: @expr ref,
+    int child_index: int ref,
+    int parent_id: @exprparent ref
+);
+
+expr_isload(unique int expr_id: @expr ref);
+
+@cast = @c_style_cast
+      | @const_cast
+      | @dynamic_cast
+      | @reinterpret_cast
+      | @static_cast
+      ;
+
+/*
+case @conversion.kind of
+  0 = @simple_conversion           // a numeric conversion, qualification conversion, or a reinterpret_cast
+| 1 = @bool_conversion             // conversion to 'bool'
+| 2 = @base_class_conversion       // a derived-to-base conversion
+| 3 = @derived_class_conversion    // a base-to-derived conversion
+| 4 = @pm_base_class_conversion    // a derived-to-base conversion of a pointer to member
+| 5 = @pm_derived_class_conversion // a base-to-derived conversion of a pointer to member
+| 6 = @glvalue_adjust              // an adjustment of the type of a glvalue
+| 7 = @prvalue_adjust              // an adjustment of the type of a prvalue
+;
+*/
+/**
+ * Describes the semantics represented by a cast expression. This is largely
+ * independent of the source syntax of the cast, so it is separate from the
+ * regular expression kind.
+ */
+conversionkinds(
+    unique int expr_id: @cast ref,
+    int kind: int ref
+);
+
+@conversion = @cast
+            | @array_to_pointer
+            | @parexpr
+            | @reference_to
+            | @ref_indirect
+            | @temp_init
+            | @c11_generic
+            ;
+
+/*
+case @funbindexpr.kind of
+  0 = @normal_call  // a normal call
+| 1 = @virtual_call // a virtual call
+| 2 = @adl_call     // a call whose target is only found by ADL
+;
+*/
+iscall(
+    unique int caller: @funbindexpr ref,
+    int kind: int ref
+);
+
+numtemplatearguments(
+    unique int expr_id: @expr ref,
+    int num: int ref
+);
+
+specialnamequalifyingelements(
+    unique int id: @specialnamequalifyingelement,
+    unique string name: string ref
+);
+
+@namequalifiableelement = @expr | @namequalifier;
+@namequalifyingelement = @namespace
+                       | @specialnamequalifyingelement
+                       | @usertype;
+
+namequalifiers(
+    unique int id: @namequalifier,
+    unique int qualifiableelement: @namequalifiableelement ref,
+    int qualifyingelement: @namequalifyingelement ref,
+    int location: @location_default ref
+);
+
+varbind(
+    int expr: @varbindexpr ref,
+    int var: @accessible ref
+);
+
+funbind(
+    int expr: @funbindexpr ref,
+    int fun: @function ref
+);
+
+@any_new_expr = @new_expr
+              | @new_array_expr;
+
+@new_or_delete_expr = @any_new_expr
+                    | @delete_expr
+                    | @delete_array_expr;
+
+@prefix_crement_expr = @preincrexpr | @predecrexpr;
+
+@postfix_crement_expr = @postincrexpr | @postdecrexpr;
+
+@increment_expr = @preincrexpr | @postincrexpr;
+
+@decrement_expr = @predecrexpr | @postdecrexpr;
+
+@crement_expr = @increment_expr | @decrement_expr;
+
+@un_arith_op_expr = @arithnegexpr
+                  | @unaryplusexpr
+                  | @conjugation
+                  | @realpartexpr
+                  | @imagpartexpr
+                  | @crement_expr
+                  ;
+
+@un_bitwise_op_expr = @complementexpr;
+
+@un_log_op_expr = @notexpr;
+
+@un_op_expr = @address_of
+            | @indirect
+            | @un_arith_op_expr
+            | @un_bitwise_op_expr
+            | @builtinaddressof
+            | @vec_fill
+            | @un_log_op_expr
+            | @co_await
+            | @co_yield
+            ;
+
+@bin_log_op_expr = @andlogicalexpr | @orlogicalexpr;
+
+@cmp_op_expr = @eq_op_expr | @rel_op_expr;
+
+@eq_op_expr = @eqexpr | @neexpr;
+
+@rel_op_expr = @gtexpr
+             | @ltexpr
+             | @geexpr
+             | @leexpr
+             | @spaceshipexpr
+             ;
+
+@bin_bitwise_op_expr = @lshiftexpr
+                     | @rshiftexpr
+                     | @andexpr
+                     | @orexpr
+                     | @xorexpr
+                     ;
+
+@p_arith_op_expr = @paddexpr
+                 | @psubexpr
+                 | @pdiffexpr
+                 ;
+
+@bin_arith_op_expr = @addexpr
+                   | @subexpr
+                   | @mulexpr
+                   | @divexpr
+                   | @remexpr
+                   | @jmulexpr
+                   | @jdivexpr
+                   | @fjaddexpr
+                   | @jfaddexpr
+                   | @fjsubexpr
+                   | @jfsubexpr
+                   | @minexpr
+                   | @maxexpr
+                   | @p_arith_op_expr
+                   ;
+
+@bin_op_expr = @bin_arith_op_expr
+             | @bin_bitwise_op_expr
+             | @cmp_op_expr
+             | @bin_log_op_expr
+             ;
+
+@op_expr = @un_op_expr
+         | @bin_op_expr
+         | @assign_expr
+         | @conditionalexpr
+         ;
+
+@assign_arith_expr = @assignaddexpr
+                   | @assignsubexpr
+                   | @assignmulexpr
+                   | @assigndivexpr
+                   | @assignremexpr
+                   ;
+
+@assign_bitwise_expr = @assignandexpr
+                     | @assignorexpr
+                     | @assignxorexpr
+                     | @assignlshiftexpr
+                     | @assignrshiftexpr
+                     ;
+
+@assign_pointer_expr = @assignpaddexpr
+                     | @assignpsubexpr
+                     ;
+
+@assign_op_expr = @assign_arith_expr
+                | @assign_bitwise_expr
+                | @assign_pointer_expr
+                ;
+
+@assign_expr = @assignexpr | @assign_op_expr | @blockassignexpr
+
+/*
+  Binary encoding of the allocator form.
+
+  case @allocator.form of
+    0 = plain
+  | 1 = alignment
+  ;
+*/
+
+/**
+ * The allocator function associated with a `new` or `new[]` expression.
+ * The `form` column specified whether the allocation call contains an alignment
+ * argument.
+ */
+expr_allocator(
+    unique int expr: @any_new_expr ref,
+    int func: @function ref,
+    int form: int ref
+);
+
+/*
+  Binary encoding of the deallocator form.
+
+  case @deallocator.form of
+    0 = plain
+  | 1 = size
+  | 2 = alignment
+  | 4 = destroying_delete
+  ;
+*/
+
+/**
+ * The deallocator function associated with a `delete`, `delete[]`, `new`, or
+ * `new[]` expression. For a `new` or `new[]` expression, the deallocator is the
+ * one used to free memory if the initialization throws an exception.
+ * The `form` column specifies whether the deallocation call contains a size
+ * argument, and alignment argument, or both.
+ */
+expr_deallocator(
+    unique int expr: @new_or_delete_expr ref,
+    int func: @function ref,
+    int form: int ref
+);
+
+/**
+ * Holds if the `@conditionalexpr` is of the two operand form
+ * `guard ? : false`.
+ */
+expr_cond_two_operand(
+    unique int cond: @conditionalexpr ref
+);
+
+/**
+ * The guard of `@conditionalexpr` `guard ? true : false`
+ */
+expr_cond_guard(
+    unique int cond: @conditionalexpr ref,
+    int guard: @expr ref
+);
+
+/**
+ * The expression used when the guard of `@conditionalexpr`
+ * `guard ? true : false` holds. For the two operand form
+ * `guard ?: false` consider using `expr_cond_guard` instead.
+ */
+expr_cond_true(
+    unique int cond: @conditionalexpr ref,
+    int true: @expr ref
+);
+
+/**
+ * The expression used when the guard of `@conditionalexpr`
+ * `guard ? true : false` does not hold.
+ */
+expr_cond_false(
+    unique int cond: @conditionalexpr ref,
+    int false: @expr ref
+);
+
+/** A string representation of the value. */
+values(
+    unique int id: @value,
+    string str: string ref
+);
+
+/** The actual text in the source code for the value, if any. */
+valuetext(
+    unique int id: @value ref,
+    string text: string ref
+);
+
+valuebind(
+    int val: @value ref,
+    unique int expr: @expr ref
+);
+
+fieldoffsets(
+    unique int id: @variable ref,
+    int byteoffset: int ref,
+    int bitoffset: int ref
+);
+
+bitfield(
+    unique int id: @variable ref,
+    int bits: int ref,
+    int declared_bits: int ref
+);
+
+/* TODO
+memberprefix(
+    int member: @expr ref,
+    int prefix: @expr ref
+);
+*/
+
+/*
+   kind(1) = mbrcallexpr
+   kind(2) = mbrptrcallexpr
+   kind(3) = mbrptrmbrcallexpr
+   kind(4) = ptrmbrptrmbrcallexpr
+   kind(5) = mbrreadexpr // x.y
+   kind(6) = mbrptrreadexpr // p->y
+   kind(7) = mbrptrmbrreadexpr // x.*pm
+   kind(8) = mbrptrmbrptrreadexpr // x->*pm
+   kind(9) = staticmbrreadexpr // static x.y
+   kind(10) = staticmbrptrreadexpr // static p->y
+*/
+/* TODO
+memberaccess(
+    int member: @expr ref,
+    int kind: int ref
+);
+*/
+
+initialisers(
+    unique int init: @initialiser,
+    int var: @accessible ref,
+    unique int expr: @expr ref,
+    int location: @location_expr ref
+);
+
+braced_initialisers(
+    int init: @initialiser ref
+);
+
+/**
+ * An ancestor for the expression, for cases in which we cannot
+ * otherwise find the expression's parent.
+ */
+expr_ancestor(
+    int exp: @expr ref,
+    int ancestor: @element ref
+);
+
+exprs(
+    unique int id: @expr,
+    int kind: int ref,
+    int location: @location_expr ref
+);
+
+expr_reuse(
+    int reuse: @expr ref,
+    int original: @expr ref,
+    int value_category: int ref
+)
+
+/*
+  case @value.category of
+    1 = prval
+  | 2 = xval
+  | 3 = lval
+  ;
+*/
+expr_types(
+    int id: @expr ref,
+    int typeid: @type ref,
+    int value_category: int ref
+);
+
+case @expr.kind of
+    1 = @errorexpr
+|   2 = @address_of // & AddressOfExpr
+|   3 = @reference_to // ReferenceToExpr (implicit?)
+|   4 = @indirect // * PointerDereferenceExpr
+|   5 = @ref_indirect // ReferenceDereferenceExpr (implicit?)
+// ...
+|   8 = @array_to_pointer // (???)
+|   9 = @vacuous_destructor_call // VacuousDestructorCall
+// ...
+|  11 = @assume // Microsoft
+|  12 = @parexpr
+|  13 = @arithnegexpr
+|  14 = @unaryplusexpr
+|  15 = @complementexpr
+|  16 = @notexpr
+|  17 = @conjugation // GNU ~ operator
+|  18 = @realpartexpr // GNU __real
+|  19 = @imagpartexpr // GNU __imag
+|  20 = @postincrexpr
+|  21 = @postdecrexpr
+|  22 = @preincrexpr
+|  23 = @predecrexpr
+|  24 = @conditionalexpr
+|  25 = @addexpr
+|  26 = @subexpr
+|  27 = @mulexpr
+|  28 = @divexpr
+|  29 = @remexpr
+|  30 = @jmulexpr // C99 mul imaginary
+|  31 = @jdivexpr // C99 div imaginary
+|  32 = @fjaddexpr // C99 add real + imaginary
+|  33 = @jfaddexpr // C99 add imaginary + real
+|  34 = @fjsubexpr // C99 sub real - imaginary
+|  35 = @jfsubexpr // C99 sub imaginary - real
+|  36 = @paddexpr // pointer add (pointer + int or int + pointer)
+|  37 = @psubexpr // pointer sub (pointer - integer)
+|  38 = @pdiffexpr // difference between two pointers
+|  39 = @lshiftexpr
+|  40 = @rshiftexpr
+|  41 = @andexpr
+|  42 = @orexpr
+|  43 = @xorexpr
+|  44 = @eqexpr
+|  45 = @neexpr
+|  46 = @gtexpr
+|  47 = @ltexpr
+|  48 = @geexpr
+|  49 = @leexpr
+|  50 = @minexpr // GNU minimum
+|  51 = @maxexpr // GNU maximum
+|  52 = @assignexpr
+|  53 = @assignaddexpr
+|  54 = @assignsubexpr
+|  55 = @assignmulexpr
+|  56 = @assigndivexpr
+|  57 = @assignremexpr
+|  58 = @assignlshiftexpr
+|  59 = @assignrshiftexpr
+|  60 = @assignandexpr
+|  61 = @assignorexpr
+|  62 = @assignxorexpr
+|  63 = @assignpaddexpr // assign pointer add
+|  64 = @assignpsubexpr // assign pointer sub
+|  65 = @andlogicalexpr
+|  66 = @orlogicalexpr
+|  67 = @commaexpr
+|  68 = @subscriptexpr // access to member of an array, e.g., a[5]
+// ...  69 @objc_subscriptexpr deprecated
+// ...  70 @cmdaccess deprecated
+// ...
+|  73 = @virtfunptrexpr
+|  74 = @callexpr
+// ...  75 @msgexpr_normal deprecated
+// ...  76 @msgexpr_super deprecated
+// ...  77 @atselectorexpr deprecated
+// ...  78 @atprotocolexpr deprecated
+|  79 = @vastartexpr
+|  80 = @vaargexpr
+|  81 = @vaendexpr
+|  82 = @vacopyexpr
+// ...  83 @atencodeexpr deprecated
+|  84 = @varaccess
+|  85 = @thisaccess
+// ...  86 @objc_box_expr deprecated
+|  87 = @new_expr
+|  88 = @delete_expr
+|  89 = @throw_expr
+|  90 = @condition_decl // a variable declared in a condition, e.g., if(int x = y > 2)
+|  91 = @braced_init_list
+|  92 = @type_id
+|  93 = @runtime_sizeof
+|  94 = @runtime_alignof
+|  95 = @sizeof_pack
+|  96 = @expr_stmt // GNU extension
+|  97 = @routineexpr
+|  98 = @type_operand // used to access a type in certain contexts (haven't found any examples yet....)
+|  99 = @offsetofexpr // offsetof ::= type and field
+| 100 = @hasassignexpr // __has_assign ::= type
+| 101 = @hascopyexpr // __has_copy ::= type
+| 102 = @hasnothrowassign // __has_nothrow_assign ::= type
+| 103 = @hasnothrowconstr // __has_nothrow_constructor ::= type
+| 104 = @hasnothrowcopy // __has_nothrow_copy ::= type
+| 105 = @hastrivialassign // __has_trivial_assign ::= type
+| 106 = @hastrivialconstr // __has_trivial_constructor ::= type
+| 107 = @hastrivialcopy // __has_trivial_copy ::= type
+| 108 = @hasuserdestr // __has_user_destructor ::= type
+| 109 = @hasvirtualdestr // __has_virtual_destructor ::= type
+| 110 = @isabstractexpr // __is_abstract ::= type
+| 111 = @isbaseofexpr // __is_base_of ::= type type
+| 112 = @isclassexpr // __is_class ::= type
+| 113 = @isconvtoexpr // __is_convertible_to ::= type type
+| 114 = @isemptyexpr // __is_empty ::= type
+| 115 = @isenumexpr // __is_enum ::= type
+| 116 = @ispodexpr // __is_pod ::= type
+| 117 = @ispolyexpr // __is_polymorphic ::= type
+| 118 = @isunionexpr // __is_union ::= type
+| 119 = @typescompexpr // GNU __builtin_types_compatible ::= type type
+| 120 = @intaddrexpr // frontend internal builtin, used to implement offsetof
+// ...
+| 122 = @hastrivialdestructor // __has_trivial_destructor ::= type
+| 123 = @literal
+| 124 = @uuidof
+| 127 = @aggregateliteral
+| 128 = @delete_array_expr
+| 129 = @new_array_expr
+// ... 130 @objc_array_literal deprecated
+// ... 131 @objc_dictionary_literal deprecated
+| 132 = @foldexpr
+// ...
+| 200 = @ctordirectinit
+| 201 = @ctorvirtualinit
+| 202 = @ctorfieldinit
+| 203 = @ctordelegatinginit
+| 204 = @dtordirectdestruct
+| 205 = @dtorvirtualdestruct
+| 206 = @dtorfielddestruct
+// ...
+| 210 = @static_cast
+| 211 = @reinterpret_cast
+| 212 = @const_cast
+| 213 = @dynamic_cast
+| 214 = @c_style_cast
+| 215 = @lambdaexpr
+| 216 = @param_ref
+| 217 = @noopexpr
+// ...
+| 294 = @istriviallyconstructibleexpr
+| 295 = @isdestructibleexpr
+| 296 = @isnothrowdestructibleexpr
+| 297 = @istriviallydestructibleexpr
+| 298 = @istriviallyassignableexpr
+| 299 = @isnothrowassignableexpr
+| 300 = @istrivialexpr
+| 301 = @isstandardlayoutexpr
+| 302 = @istriviallycopyableexpr
+| 303 = @isliteraltypeexpr
+| 304 = @hastrivialmoveconstructorexpr
+| 305 = @hastrivialmoveassignexpr
+| 306 = @hasnothrowmoveassignexpr
+| 307 = @isconstructibleexpr
+| 308 = @isnothrowconstructibleexpr
+| 309 = @hasfinalizerexpr
+| 310 = @isdelegateexpr
+| 311 = @isinterfaceclassexpr
+| 312 = @isrefarrayexpr
+| 313 = @isrefclassexpr
+| 314 = @issealedexpr
+| 315 = @issimplevalueclassexpr
+| 316 = @isvalueclassexpr
+| 317 = @isfinalexpr
+| 319 = @noexceptexpr
+| 320 = @builtinshufflevector
+| 321 = @builtinchooseexpr
+| 322 = @builtinaddressof
+| 323 = @vec_fill
+| 324 = @builtinconvertvector
+| 325 = @builtincomplex
+| 326 = @spaceshipexpr
+| 327 = @co_await
+| 328 = @co_yield
+| 329 = @temp_init
+| 330 = @isassignable
+| 331 = @isaggregate
+| 332 = @hasuniqueobjectrepresentations
+| 333 = @builtinbitcast
+| 334 = @builtinshuffle
+| 335 = @blockassignexpr
+| 336 = @issame
+| 337 = @isfunction
+| 338 = @islayoutcompatible
+| 339 = @ispointerinterconvertiblebaseof
+| 340 = @isarray
+| 341 = @arrayrank
+| 342 = @arrayextent
+| 343 = @isarithmetic
+| 344 = @iscompletetype
+| 345 = @iscompound
+| 346 = @isconst
+| 347 = @isfloatingpoint
+| 348 = @isfundamental
+| 349 = @isintegral
+| 350 = @islvaluereference
+| 351 = @ismemberfunctionpointer
+| 352 = @ismemberobjectpointer
+| 353 = @ismemberpointer
+| 354 = @isobject
+| 355 = @ispointer
+| 356 = @isreference
+| 357 = @isrvaluereference
+| 358 = @isscalar
+| 359 = @issigned
+| 360 = @isunsigned
+| 361 = @isvoid
+| 362 = @isvolatile
+| 363 = @reuseexpr
+| 364 = @istriviallycopyassignable
+| 365 = @isassignablenopreconditioncheck
+| 366 = @referencebindstotemporary
+| 367 = @issameas
+| 368 = @builtinhasattribute
+| 369 = @ispointerinterconvertiblewithclass
+| 370 = @builtinispointerinterconvertiblewithclass
+| 371 = @iscorrespondingmember
+| 372 = @builtiniscorrespondingmember
+| 373 = @isboundedarray
+| 374 = @isunboundedarray
+| 375 = @isreferenceable
+| 378 = @isnothrowconvertible
+| 379 = @referenceconstructsfromtemporary
+| 380 = @referenceconvertsfromtemporary
+| 381 = @isconvertible
+| 382 = @isvalidwinrttype
+| 383 = @iswinclass
+| 384 = @iswininterface
+| 385 = @istriviallyequalitycomparable
+| 386 = @isscopedenum
+| 387 = @istriviallyrelocatable
+| 388 = @datasizeof
+| 389 = @c11_generic
+;
+
+@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
+            ;
+
+new_allocated_type(
+    unique int expr: @new_expr ref,
+    int type_id: @type ref
+);
+
+new_array_allocated_type(
+    unique int expr: @new_array_expr ref,
+    int type_id: @type ref
+);
+
+/**
+ * The field being initialized by an initializer expression within an aggregate
+ * initializer for a class/struct/union. Position is used to sort repeated initializers.
+ */
+#keyset[aggregate, position]
+aggregate_field_init(
+    int aggregate: @aggregateliteral ref,
+    int initializer: @expr ref,
+    int field: @membervariable ref,
+    int position: int ref
+);
+
+/**
+ * The index of the element being initialized by an initializer expression
+ * within an aggregate initializer for an array. Position is used to sort repeated initializers.
+ */
+#keyset[aggregate, position]
+aggregate_array_init(
+    int aggregate: @aggregateliteral ref,
+    int initializer: @expr ref,
+    int element_index: int ref,
+    int position: int ref
+);
+
+@ctorinit = @ctordirectinit
+          | @ctorvirtualinit
+          | @ctorfieldinit
+          | @ctordelegatinginit;
+@dtordestruct = @dtordirectdestruct
+              | @dtorvirtualdestruct
+              | @dtorfielddestruct;
+
+
+condition_decl_bind(
+    unique int expr: @condition_decl ref,
+    unique int decl: @declaration ref
+);
+
+typeid_bind(
+    unique int expr: @type_id ref,
+    int type_id: @type ref
+);
+
+uuidof_bind(
+    unique int expr: @uuidof ref,
+    int type_id: @type ref
+);
+
+@runtime_sizeof_or_alignof = @runtime_sizeof | @runtime_alignof | @datasizeof;
+
+sizeof_bind(
+    unique int expr: @runtime_sizeof_or_alignof ref,
+    int type_id: @type ref
+);
+
+code_block(
+    unique int block: @literal ref,
+    unique int routine: @function ref
+);
+
+lambdas(
+    unique int expr: @lambdaexpr ref,
+    string default_capture: string ref,
+    boolean has_explicit_return_type: boolean ref
+);
+
+lambda_capture(
+    unique int id: @lambdacapture,
+    int lambda: @lambdaexpr ref,
+    int index: int ref,
+    int field: @membervariable ref,
+    boolean captured_by_reference: boolean ref,
+    boolean is_implicit: boolean ref,
+    int location: @location_default ref
+);
+
+@funbindexpr = @routineexpr
+             | @new_expr
+             | @delete_expr
+             | @delete_array_expr
+             | @ctordirectinit
+             | @ctorvirtualinit
+             | @ctordelegatinginit
+             | @dtordirectdestruct
+             | @dtorvirtualdestruct;
+
+@varbindexpr = @varaccess | @ctorfieldinit | @dtorfielddestruct;
+@addressable = @function | @variable ;
+@accessible = @addressable | @enumconstant ;
+
+@access = @varaccess | @routineexpr ;
+
+fold(
+    int expr: @foldexpr ref,
+    string operator: string ref,
+    boolean is_left_fold: boolean ref
+);
+
+stmts(
+    unique int id: @stmt,
+    int kind: int ref,
+    int location: @location_stmt ref
+);
+
+case @stmt.kind of
+    1 = @stmt_expr
+|   2 = @stmt_if
+|   3 = @stmt_while
+|   4 = @stmt_goto
+|   5 = @stmt_label
+|   6 = @stmt_return
+|   7 = @stmt_block
+|   8 = @stmt_end_test_while // do { ... } while ( ... )
+|   9 = @stmt_for
+|  10 = @stmt_switch_case
+|  11 = @stmt_switch
+|  13 = @stmt_asm // "asm" statement or the body of an asm function
+|  15 = @stmt_try_block
+|  16 = @stmt_microsoft_try // Microsoft
+|  17 = @stmt_decl
+|  18 = @stmt_set_vla_size // C99
+|  19 = @stmt_vla_decl // C99
+|  25 = @stmt_assigned_goto // GNU
+|  26 = @stmt_empty
+|  27 = @stmt_continue
+|  28 = @stmt_break
+|  29 = @stmt_range_based_for // C++11
+// ...  30 @stmt_at_autoreleasepool_block deprecated
+// ...  31 @stmt_objc_for_in deprecated
+// ...  32 @stmt_at_synchronized deprecated
+|  33 = @stmt_handler
+// ...  34 @stmt_finally_end deprecated
+|  35 = @stmt_constexpr_if
+|  37 = @stmt_co_return
+;
+
+type_vla(
+    int type_id: @type ref,
+    int decl: @stmt_vla_decl ref
+);
+
+variable_vla(
+    int var: @variable ref,
+    int decl: @stmt_vla_decl ref
+);
+
+if_initialization(
+    unique int if_stmt: @stmt_if ref,
+    int init_id: @stmt ref
+);
+
+if_then(
+    unique int if_stmt: @stmt_if ref,
+    int then_id: @stmt ref
+);
+
+if_else(
+    unique int if_stmt: @stmt_if ref,
+    int else_id: @stmt ref
+);
+
+constexpr_if_initialization(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int init_id: @stmt ref
+);
+
+constexpr_if_then(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int then_id: @stmt ref
+);
+
+constexpr_if_else(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int else_id: @stmt ref
+);
+
+while_body(
+    unique int while_stmt: @stmt_while ref,
+    int body_id: @stmt ref
+);
+
+do_body(
+    unique int do_stmt: @stmt_end_test_while ref,
+    int body_id: @stmt ref
+);
+
+switch_initialization(
+    unique int switch_stmt: @stmt_switch ref,
+    int init_id: @stmt ref
+);
+
+#keyset[switch_stmt, index]
+switch_case(
+    int switch_stmt: @stmt_switch ref,
+    int index: int ref,
+    int case_id: @stmt_switch_case ref
+);
+
+switch_body(
+    unique int switch_stmt: @stmt_switch ref,
+    int body_id: @stmt ref
+);
+
+@stmt_for_or_range_based_for = @stmt_for
+                             | @stmt_range_based_for;
+
+for_initialization(
+    unique int for_stmt: @stmt_for_or_range_based_for ref,
+    int init_id: @stmt ref
+);
+
+for_condition(
+    unique int for_stmt: @stmt_for ref,
+    int condition_id: @expr ref
+);
+
+for_update(
+    unique int for_stmt: @stmt_for ref,
+    int update_id: @expr ref
+);
+
+for_body(
+    unique int for_stmt: @stmt_for ref,
+    int body_id: @stmt ref
+);
+
+@stmtparent = @stmt | @expr_stmt ;
+stmtparents(
+    unique int id: @stmt ref,
+    int index: int ref,
+    int parent: @stmtparent ref
+);
+
+ishandler(unique int block: @stmt_block ref);
+
+@cfgnode = @stmt | @expr | @function | @initialiser ;
+
+stmt_decl_bind(
+    int stmt: @stmt_decl ref,
+    int num: int ref,
+    int decl: @declaration ref
+);
+
+stmt_decl_entry_bind(
+    int stmt: @stmt_decl ref,
+    int num: int ref,
+    int decl_entry: @element ref
+);
+
+@functionorblock = @function | @stmt_block;
+
+blockscope(
+    unique int block: @stmt_block ref,
+    int enclosing: @functionorblock ref
+);
+
+@jump = @stmt_goto | @stmt_break | @stmt_continue;
+
+@jumporlabel = @jump | @stmt_label | @literal;
+
+jumpinfo(
+    unique int id: @jumporlabel ref,
+    string str: string ref,
+    int target: @stmt ref
+);
+
+preprocdirects(
+    unique int id: @preprocdirect,
+    int kind: int ref,
+    int location: @location_default ref
+);
+case @preprocdirect.kind of
+   0 = @ppd_if
+|  1 = @ppd_ifdef
+|  2 = @ppd_ifndef
+|  3 = @ppd_elif
+|  4 = @ppd_else
+|  5 = @ppd_endif
+|  6 = @ppd_plain_include
+|  7 = @ppd_define
+|  8 = @ppd_undef
+|  9 = @ppd_line
+| 10 = @ppd_error
+| 11 = @ppd_pragma
+| 12 = @ppd_objc_import
+| 13 = @ppd_include_next
+| 18 = @ppd_warning
+;
+
+@ppd_include = @ppd_plain_include | @ppd_objc_import | @ppd_include_next;
+
+@ppd_branch = @ppd_if | @ppd_ifdef | @ppd_ifndef | @ppd_elif;
+
+preprocpair(
+    int begin : @ppd_branch ref,
+    int elseelifend : @preprocdirect ref
+);
+
+preproctrue(int branch : @ppd_branch ref);
+preprocfalse(int branch : @ppd_branch ref);
+
+preproctext(
+    unique int id: @preprocdirect ref,
+    string head: string ref,
+    string body: string ref
+);
+
+includes(
+    unique int id: @ppd_include ref,
+    int included: @file ref
+);
+
+link_targets(
+    int id: @link_target,
+    int binary: @file ref
+);
+
+link_parent(
+    int element : @element ref,
+    int link_target : @link_target ref
+);
+
+/* XML Files */
+
+xmlEncoding(unique int id: @file ref, string encoding: string ref);
+
+xmlDTDs(
+    unique int id: @xmldtd,
+    string root: string ref,
+    string publicId: string ref,
+    string systemId: string ref,
+    int fileid: @file ref
+);
+
+xmlElements(
+    unique int id: @xmlelement,
+    string name: string ref,
+    int parentid: @xmlparent ref,
+    int idx: int ref,
+    int fileid: @file ref
+);
+
+xmlAttrs(
+    unique int id: @xmlattribute,
+    int elementid: @xmlelement ref,
+    string name: string ref,
+    string value: string ref,
+    int idx: int ref,
+    int fileid: @file ref
+);
+
+xmlNs(
+    int id: @xmlnamespace,
+    string prefixName: string ref,
+    string URI: string ref,
+    int fileid: @file ref
+);
+
+xmlHasNs(
+    int elementId: @xmlnamespaceable ref,
+    int nsId: @xmlnamespace ref,
+    int fileid: @file ref
+);
+
+xmlComments(
+    unique int id: @xmlcomment,
+    string text: string ref,
+    int parentid: @xmlparent ref,
+    int fileid: @file ref
+);
+
+xmlChars(
+    unique int id: @xmlcharacters,
+    string text: string ref,
+    int parentid: @xmlparent ref,
+    int idx: int ref,
+    int isCDATA: int ref,
+    int fileid: @file ref
+);
+
+@xmlparent = @file | @xmlelement;
+@xmlnamespaceable = @xmlelement | @xmlattribute;
+
+xmllocations(
+    int xmlElement: @xmllocatable ref,
+    int location: @location_default ref
+);
+
+@xmllocatable = @xmlcharacters
+              | @xmlelement
+              | @xmlcomment
+              | @xmlattribute
+              | @xmldtd
+              | @file
+              | @xmlnamespace;
diff --git a/cpp/ql/lib/upgrades/7ff6a6e53dbcff09d1b9b758b594bc6d17366863/semmlecode.cpp.dbscheme b/cpp/ql/lib/upgrades/7ff6a6e53dbcff09d1b9b758b594bc6d17366863/semmlecode.cpp.dbscheme
new file mode 100644
index 00000000000..6f5d51e89e7
--- /dev/null
+++ b/cpp/ql/lib/upgrades/7ff6a6e53dbcff09d1b9b758b594bc6d17366863/semmlecode.cpp.dbscheme
@@ -0,0 +1,2316 @@
+
+/**
+ * An invocation of the compiler. Note that more than one file may be
+ * compiled per invocation. For example, this command compiles three
+ * source files:
+ *
+ *   gcc -c f1.c f2.c f3.c
+ *
+ * The `id` simply identifies the invocation, while `cwd` is the working
+ * directory from which the compiler was invoked.
+ */
+compilations(
+    /**
+     * An invocation of the compiler. Note that more than one file may
+     * be compiled per invocation. For example, this command compiles
+     * three source files:
+     *
+     *   gcc -c f1.c f2.c f3.c
+     */
+    unique int id : @compilation,
+    string cwd : string ref
+);
+
+/**
+ * The arguments that were passed to the extractor for a compiler
+ * invocation. If `id` is for the compiler invocation
+ *
+ *   gcc -c f1.c f2.c f3.c
+ *
+ * then typically there will be rows for
+ *
+ * num | arg
+ * --- | ---
+ * 0   | *path to extractor*
+ * 1   | `--mimic`
+ * 2   | `/usr/bin/gcc`
+ * 3   | `-c`
+ * 4   | f1.c
+ * 5   | f2.c
+ * 6   | f3.c
+ */
+#keyset[id, num]
+compilation_args(
+    int id : @compilation ref,
+    int num : int ref,
+    string arg : string ref
+);
+
+/**
+ * The source files that are compiled by a compiler invocation.
+ * If `id` is for the compiler invocation
+ *
+ *   gcc -c f1.c f2.c f3.c
+ *
+ * then there will be rows for
+ *
+ * num | arg
+ * --- | ---
+ * 0   | f1.c
+ * 1   | f2.c
+ * 2   | f3.c
+ *
+ * Note that even if those files `#include` headers, those headers
+ * do not appear as rows.
+ */
+#keyset[id, num]
+compilation_compiling_files(
+    int id : @compilation ref,
+    int num : int ref,
+    int file : @file ref
+);
+
+/**
+ * The time taken by the extractor for a compiler invocation.
+ *
+ * For each file `num`, there will be rows for
+ *
+ * kind | seconds
+ * ---- | ---
+ * 1    | CPU seconds used by the extractor frontend
+ * 2    | Elapsed seconds during the extractor frontend
+ * 3    | CPU seconds used by the extractor backend
+ * 4    | Elapsed seconds during the extractor backend
+ */
+#keyset[id, num, kind]
+compilation_time(
+    int id : @compilation ref,
+    int num : int ref,
+    /* kind:
+       1 = frontend_cpu_seconds
+       2 = frontend_elapsed_seconds
+       3 = extractor_cpu_seconds
+       4 = extractor_elapsed_seconds
+    */
+    int kind : int ref,
+    float seconds : float ref
+);
+
+/**
+ * An error or warning generated by the extractor.
+ * The diagnostic message `diagnostic` was generated during compiler
+ * invocation `compilation`, and is the `file_number_diagnostic_number`th
+ * message generated while extracting the `file_number`th file of that
+ * invocation.
+ */
+#keyset[compilation, file_number, file_number_diagnostic_number]
+diagnostic_for(
+    int diagnostic : @diagnostic ref,
+    int compilation : @compilation ref,
+    int file_number : int ref,
+    int file_number_diagnostic_number : int ref
+);
+
+/**
+ * If extraction was successful, then `cpu_seconds` and
+ * `elapsed_seconds` are the CPU time and elapsed time (respectively)
+ * that extraction took for compiler invocation `id`.
+ */
+compilation_finished(
+    unique int id : @compilation ref,
+    float cpu_seconds : float ref,
+    float elapsed_seconds : float ref
+);
+
+
+/**
+ * External data, loaded from CSV files during snapshot creation. See
+ * [Tutorial: Incorporating external data](https://help.semmle.com/wiki/display/SD/Tutorial%3A+Incorporating+external+data)
+ * for more information.
+ */
+externalData(
+    int id : @externalDataElement,
+    string path : string ref,
+    int column: int ref,
+    string value : string ref
+);
+
+/**
+ * The source location of the snapshot.
+ */
+sourceLocationPrefix(string prefix : string ref);
+
+/**
+ * Information about packages that provide code used during compilation.
+ * The `id` is just a unique identifier.
+ * The `namespace` is typically the name of the package manager that
+ * provided the package (e.g. "dpkg" or "yum").
+ * The `package_name` is the name of the package, and `version` is its
+ * version (as a string).
+ */
+external_packages(
+    unique int id: @external_package,
+    string namespace : string ref,
+    string package_name : string ref,
+    string version : string ref
+);
+
+/**
+ * Holds if File `fileid` was provided by package `package`.
+ */
+header_to_external_package(
+    int fileid : @file ref,
+    int package : @external_package ref
+);
+
+/*
+ * Version history
+ */
+
+svnentries(
+    unique int id : @svnentry,
+    string revision : string ref,
+    string author : string ref,
+    date revisionDate : date ref,
+    int changeSize : int ref
+)
+
+svnaffectedfiles(
+    int id : @svnentry ref,
+    int file : @file ref,
+    string action : string ref
+)
+
+svnentrymsg(
+    unique int id : @svnentry ref,
+    string message : string ref
+)
+
+svnchurn(
+    int commit : @svnentry ref,
+    int file : @file ref,
+    int addedLines : int ref,
+    int deletedLines : int ref
+)
+
+/*
+ * C++ dbscheme
+ */
+
+extractor_version(
+    string codeql_version: string ref,
+    string frontend_version: string ref
+)
+
+@location = @location_stmt | @location_expr | @location_default ;
+
+/**
+ * The location of an element that is not an expression or a statement.
+ * The location spans column `startcolumn` of line `startline` to
+ * column `endcolumn` of line `endline` in file `file`.
+ * For more information, see
+ * [Locations](https://codeql.github.com/docs/writing-codeql-queries/providing-locations-in-codeql-queries/).
+ */
+locations_default(
+    /** The location of an element that is not an expression or a statement. */
+    unique int id: @location_default,
+    int container: @container ref,
+    int startLine: int ref,
+    int startColumn: int ref,
+    int endLine: int ref,
+    int endColumn: int ref
+);
+
+/**
+ * The location of a statement.
+ * The location spans column `startcolumn` of line `startline` to
+ * column `endcolumn` of line `endline` in file `file`.
+ * For more information, see
+ * [Locations](https://codeql.github.com/docs/writing-codeql-queries/providing-locations-in-codeql-queries/).
+ */
+locations_stmt(
+    /** The location of a statement. */
+    unique int id: @location_stmt,
+    int container: @container ref,
+    int startLine: int ref,
+    int startColumn: int ref,
+    int endLine: int ref,
+    int endColumn: int ref
+);
+
+/**
+ * The location of an expression.
+ * The location spans column `startcolumn` of line `startline` to
+ * column `endcolumn` of line `endline` in file `file`.
+ * For more information, see
+ * [Locations](https://codeql.github.com/docs/writing-codeql-queries/providing-locations-in-codeql-queries/).
+ */
+locations_expr(
+    /** The location of an expression. */
+    unique int id: @location_expr,
+    int container: @container ref,
+    int startLine: int ref,
+    int startColumn: int ref,
+    int endLine: int ref,
+    int endColumn: int ref
+);
+
+/** An element for which line-count information is available. */
+@sourceline = @file | @function | @variable | @enumconstant | @xmllocatable;
+
+numlines(
+    int element_id: @sourceline ref,
+    int num_lines: int ref,
+    int num_code: int ref,
+    int num_comment: int ref
+);
+
+diagnostics(
+    unique int id: @diagnostic,
+    int severity: int ref,
+    string error_tag: string ref,
+    string error_message: string ref,
+    string full_error_message: string ref,
+    int location: @location_default ref
+);
+
+files(
+    unique int id: @file,
+    string name: string ref
+);
+
+folders(
+    unique int id: @folder,
+    string name: string ref
+);
+
+@container = @folder | @file
+
+containerparent(
+    int parent: @container ref,
+    unique int child: @container ref
+);
+
+fileannotations(
+    int id: @file ref,
+    int kind: int ref,
+    string name: string ref,
+    string value: string ref
+);
+
+inmacroexpansion(
+    int id: @element ref,
+    int inv: @macroinvocation ref
+);
+
+affectedbymacroexpansion(
+    int id: @element ref,
+    int inv: @macroinvocation ref
+);
+
+case @macroinvocation.kind of
+  1 = @macro_expansion
+| 2 = @other_macro_reference
+;
+
+macroinvocations(
+    unique int id: @macroinvocation,
+    int macro_id: @ppd_define ref,
+    int location: @location_default ref,
+    int kind: int ref
+);
+
+macroparent(
+    unique int id: @macroinvocation ref,
+    int parent_id: @macroinvocation ref
+);
+
+// a macroinvocation may be part of another location
+// the way to find a constant expression that uses a macro
+// is thus to find a constant expression that has a location
+// to which a macro invocation is bound
+macrolocationbind(
+    int id: @macroinvocation ref,
+    int location: @location ref
+);
+
+#keyset[invocation, argument_index]
+macro_argument_unexpanded(
+    int invocation: @macroinvocation ref,
+    int argument_index: int ref,
+    string text: string ref
+);
+
+#keyset[invocation, argument_index]
+macro_argument_expanded(
+    int invocation: @macroinvocation ref,
+    int argument_index: int ref,
+    string text: string ref
+);
+
+/*
+case @function.kind of
+  1 = @normal_function
+| 2 = @constructor
+| 3 = @destructor
+| 4 = @conversion_function
+| 5 = @operator
+| 6 = @builtin_function     // GCC built-in functions, e.g. __builtin___memcpy_chk
+| 7 = @user_defined_literal
+| 8 = @deduction_guide
+;
+*/
+
+functions(
+    unique int id: @function,
+    string name: string ref,
+    int kind: int ref
+);
+
+function_entry_point(
+    int id: @function ref,
+    unique int entry_point: @stmt ref
+);
+
+function_return_type(
+    int id: @function ref,
+    int return_type: @type ref
+);
+
+/**
+ * If `function` is a coroutine, then this gives the `std::experimental::resumable_traits`
+ * instance associated with it, and the variables representing the `handle` and `promise`
+ * for it.
+ */
+coroutine(
+  unique int function: @function ref,
+  int traits: @type ref
+);
+
+/*
+case @coroutine_placeholder_variable.kind of
+  1 = @handle
+| 2 = @promise
+| 3 = @init_await_resume
+;
+*/
+
+coroutine_placeholder_variable(
+  unique int placeholder_variable: @variable ref,
+  int kind: int ref,
+  int function: @function ref
+)
+
+/** The `new` function used for allocating the coroutine state, if any. */
+coroutine_new(
+  unique int function: @function ref,
+  int new: @function ref
+);
+
+/** The `delete` function used for deallocating the coroutine state, if any. */
+coroutine_delete(
+  unique int function: @function ref,
+  int delete: @function ref
+);
+
+purefunctions(unique int id: @function ref);
+
+function_deleted(unique int id: @function ref);
+
+function_defaulted(unique int id: @function ref);
+
+function_prototyped(unique int id: @function ref)
+
+deduction_guide_for_class(
+    int id: @function ref,
+    int class_template: @usertype ref
+)
+
+member_function_this_type(
+    unique int id: @function ref,
+    int this_type: @type ref
+);
+
+#keyset[id, type_id]
+fun_decls(
+    int id: @fun_decl,
+    int function: @function ref,
+    int type_id: @type ref,
+    string name: string ref,
+    int location: @location_default ref
+);
+fun_def(unique int id: @fun_decl ref);
+fun_specialized(unique int id: @fun_decl ref);
+fun_implicit(unique int id: @fun_decl ref);
+fun_decl_specifiers(
+    int id: @fun_decl ref,
+    string name: string ref
+)
+#keyset[fun_decl, index]
+fun_decl_throws(
+    int fun_decl: @fun_decl ref,
+    int index: int ref,
+    int type_id: @type ref
+);
+/* an empty throw specification is different from none */
+fun_decl_empty_throws(unique int fun_decl: @fun_decl ref);
+fun_decl_noexcept(
+    int fun_decl: @fun_decl ref,
+    int constant: @expr ref
+);
+fun_decl_empty_noexcept(int fun_decl: @fun_decl ref);
+fun_decl_typedef_type(
+    unique int fun_decl: @fun_decl ref,
+    int typedeftype_id: @usertype ref
+);
+
+param_decl_bind(
+    unique int id: @var_decl ref,
+    int index: int ref,
+    int fun_decl: @fun_decl ref
+);
+
+#keyset[id, type_id]
+var_decls(
+    int id: @var_decl,
+    int variable: @variable ref,
+    int type_id: @type ref,
+    string name: string ref,
+    int location: @location_default ref
+);
+var_def(unique int id: @var_decl ref);
+var_decl_specifiers(
+    int id: @var_decl ref,
+    string name: string ref
+)
+is_structured_binding(unique int id: @variable ref);
+
+type_decls(
+    unique int id: @type_decl,
+    int type_id: @type ref,
+    int location: @location_default ref
+);
+type_def(unique int id: @type_decl ref);
+type_decl_top(
+    unique int type_decl: @type_decl ref
+);
+
+namespace_decls(
+    unique int id: @namespace_decl,
+    int namespace_id: @namespace ref,
+    int location: @location_default ref,
+    int bodylocation: @location_default ref
+);
+
+case @using.kind of
+  1 = @using_declaration
+| 2 = @using_directive
+| 3 = @using_enum_declaration
+;
+
+usings(
+    unique int id: @using,
+    int element_id: @element ref,
+    int location: @location_default ref,
+    int kind: int ref
+);
+
+/** The element which contains the `using` declaration. */
+using_container(
+    int parent: @element ref,
+    int child: @using ref
+);
+
+static_asserts(
+    unique int id: @static_assert,
+    int condition : @expr ref,
+    string message : string ref,
+    int location: @location_default ref,
+    int enclosing : @element ref
+);
+
+// each function has an ordered list of parameters
+#keyset[id, type_id]
+#keyset[function, index, type_id]
+params(
+    int id: @parameter,
+    int function: @functionorblock ref,
+    int index: int ref,
+    int type_id: @type ref
+);
+
+overrides(
+    int new: @function ref,
+    int old: @function ref
+);
+
+#keyset[id, type_id]
+membervariables(
+    int id: @membervariable,
+    int type_id: @type ref,
+    string name: string ref
+);
+
+#keyset[id, type_id]
+globalvariables(
+    int id: @globalvariable,
+    int type_id: @type ref,
+    string name: string ref
+);
+
+#keyset[id, type_id]
+localvariables(
+    int id: @localvariable,
+    int type_id: @type ref,
+    string name: string ref
+);
+
+autoderivation(
+    unique int var: @variable ref,
+    int derivation_type: @type ref
+);
+
+orphaned_variables(
+    int var: @localvariable ref,
+    int function: @function ref
+)
+
+enumconstants(
+    unique int id: @enumconstant,
+    int parent: @usertype ref,
+    int index: int ref,
+    int type_id: @type ref,
+    string name: string ref,
+    int location: @location_default ref
+);
+
+@variable = @localscopevariable | @globalvariable | @membervariable;
+
+@localscopevariable = @localvariable | @parameter;
+
+/**
+ * Built-in types are the fundamental types, e.g., integral, floating, and void.
+ */
+case @builtintype.kind of
+   1 = @errortype
+|  2 = @unknowntype
+|  3 = @void
+|  4 = @boolean
+|  5 = @char
+|  6 = @unsigned_char
+|  7 = @signed_char
+|  8 = @short
+|  9 = @unsigned_short
+| 10 = @signed_short
+| 11 = @int
+| 12 = @unsigned_int
+| 13 = @signed_int
+| 14 = @long
+| 15 = @unsigned_long
+| 16 = @signed_long
+| 17 = @long_long
+| 18 = @unsigned_long_long
+| 19 = @signed_long_long
+// ... 20 Microsoft-specific __int8
+// ... 21 Microsoft-specific __int16
+// ... 22 Microsoft-specific __int32
+// ... 23 Microsoft-specific __int64
+| 24 = @float
+| 25 = @double
+| 26 = @long_double
+| 27 = @complex_float         // C99-specific _Complex float
+| 28 = @complex_double        // C99-specific _Complex double
+| 29 = @complex_long_double   // C99-specific _Complex long double
+| 30 = @imaginary_float       // C99-specific _Imaginary float
+| 31 = @imaginary_double      // C99-specific _Imaginary double
+| 32 = @imaginary_long_double // C99-specific _Imaginary long double
+| 33 = @wchar_t               // Microsoft-specific
+| 34 = @decltype_nullptr      // C++11
+| 35 = @int128                // __int128
+| 36 = @unsigned_int128       // unsigned __int128
+| 37 = @signed_int128         // signed __int128
+| 38 = @float128              // __float128
+| 39 = @complex_float128      // _Complex __float128
+| 40 = @decimal32             // _Decimal32
+| 41 = @decimal64             // _Decimal64
+| 42 = @decimal128            // _Decimal128
+| 43 = @char16_t
+| 44 = @char32_t
+| 45 = @std_float32           // _Float32
+| 46 = @float32x              // _Float32x
+| 47 = @std_float64           // _Float64
+| 48 = @float64x              // _Float64x
+| 49 = @std_float128          // _Float128
+// ... 50 _Float128x
+| 51 = @char8_t
+| 52 = @float16               // _Float16
+| 53 = @complex_float16       // _Complex _Float16
+| 54 = @fp16                  // __fp16
+| 55 = @std_bfloat16          // __bf16
+| 56 = @std_float16           // std::float16_t
+| 57 = @complex_std_float32   // _Complex _Float32
+| 58 = @complex_float32x      // _Complex _Float32x
+| 59 = @complex_std_float64   // _Complex _Float64
+| 60 = @complex_float64x      // _Complex _Float64x
+| 61 = @complex_std_float128  // _Complex _Float128
+;
+
+builtintypes(
+    unique int id: @builtintype,
+    string name: string ref,
+    int kind: int ref,
+    int size: int ref,
+    int sign: int ref,
+    int alignment: int ref
+);
+
+/**
+ * Derived types are types that are directly derived from existing types and
+ * point to, refer to, transform type data to return a new type.
+ */
+case @derivedtype.kind of
+   1 = @pointer
+|  2 = @reference
+|  3 = @type_with_specifiers
+|  4 = @array
+|  5 = @gnu_vector
+|  6 = @routineptr
+|  7 = @routinereference
+|  8 = @rvalue_reference // C++11
+// ... 9 type_conforming_to_protocols deprecated
+| 10 = @block
+;
+
+derivedtypes(
+    unique int id: @derivedtype,
+    string name: string ref,
+    int kind: int ref,
+    int type_id: @type ref
+);
+
+pointerishsize(unique int id: @derivedtype ref,
+    int size: int ref,
+    int alignment: int ref);
+
+arraysizes(
+    unique int id: @derivedtype ref,
+    int num_elements: int ref,
+    int bytesize: int ref,
+    int alignment: int ref
+);
+
+typedefbase(
+    unique int id: @usertype ref,
+    int type_id: @type ref
+);
+
+/**
+ * An instance of the C++11 `decltype` operator.  For example:
+ * ```
+ * int a;
+ * decltype(1+a) b;
+ * ```
+ * Here `expr` is `1+a`.
+ *
+ * Sometimes an additional pair of parentheses around the expression
+ * would change the semantics of this decltype, e.g.
+ * ```
+ * struct A { double x; };
+ * const A* a = new A();
+ * decltype( a->x ); // type is double
+ * decltype((a->x)); // type is const double&
+ * ```
+ * (Please consult the C++11 standard for more details).
+ * `parentheses_would_change_meaning` is `true` iff that is the case.
+ */
+#keyset[id, expr]
+decltypes(
+    int id: @decltype,
+    int expr: @expr ref,
+    int base_type: @type ref,
+    boolean parentheses_would_change_meaning: boolean ref
+);
+
+/*
+case @usertype.kind of
+   1 = @struct
+|  2 = @class
+|  3 = @union
+|  4 = @enum
+|  5 = @typedef                       // classic C: typedef typedef type name
+|  6 = @template
+|  7 = @template_parameter
+|  8 = @template_template_parameter
+|  9 = @proxy_class                   // a proxy class associated with a template parameter
+// ... 10 objc_class deprecated
+// ... 11 objc_protocol deprecated
+// ... 12 objc_category deprecated
+| 13 = @scoped_enum
+| 14 = @using_alias                  // a using name = type style typedef
+;
+*/
+
+usertypes(
+    unique int id: @usertype,
+    string name: string ref,
+    int kind: int ref
+);
+
+usertypesize(
+    unique int id: @usertype ref,
+    int size: int ref,
+    int alignment: int ref
+);
+
+usertype_final(unique int id: @usertype ref);
+
+usertype_uuid(
+    unique int id: @usertype ref,
+    string uuid: string ref
+);
+
+mangled_name(
+    unique int id: @declaration ref,
+    int mangled_name : @mangledname,
+    boolean is_complete: boolean ref
+);
+
+is_pod_class(unique int id: @usertype ref);
+is_standard_layout_class(unique int id: @usertype ref);
+
+is_complete(unique int id: @usertype ref);
+
+is_class_template(unique int id: @usertype ref);
+class_instantiation(
+    int to: @usertype ref,
+    int from: @usertype ref
+);
+class_template_argument(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+class_template_argument_value(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+is_proxy_class_for(
+    unique int id: @usertype ref,
+    unique int templ_param_id: @usertype ref
+);
+
+type_mentions(
+    unique int id: @type_mention,
+    int type_id: @type ref,
+    int location: @location ref,
+    // a_symbol_reference_kind from the frontend.
+    int kind: int ref
+);
+
+is_function_template(unique int id: @function ref);
+function_instantiation(
+    unique int to: @function ref,
+    int from: @function ref
+);
+function_template_argument(
+    int function_id: @function ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+function_template_argument_value(
+    int function_id: @function ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+is_variable_template(unique int id: @variable ref);
+variable_instantiation(
+    unique int to: @variable ref,
+    int from: @variable ref
+);
+variable_template_argument(
+    int variable_id: @variable ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+variable_template_argument_value(
+    int variable_id: @variable ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+routinetypes(
+    unique int id: @routinetype,
+    int return_type: @type ref
+);
+
+routinetypeargs(
+    int routine: @routinetype ref,
+    int index: int ref,
+    int type_id: @type ref
+);
+
+ptrtomembers(
+    unique int id: @ptrtomember,
+    int type_id: @type ref,
+    int class_id: @type ref
+);
+
+/*
+ specifiers for types, functions, and variables
+
+    "public",
+    "protected",
+    "private",
+
+    "const",
+    "volatile",
+    "static",
+
+    "pure",
+    "virtual",
+    "sealed", // Microsoft
+    "__interface", // Microsoft
+    "inline",
+    "explicit",
+
+    "near", // near far extension
+    "far", // near far extension
+    "__ptr32", // Microsoft
+    "__ptr64", // Microsoft
+    "__sptr", // Microsoft
+    "__uptr", // Microsoft
+    "dllimport", // Microsoft
+    "dllexport", // Microsoft
+    "thread", // Microsoft
+    "naked", // Microsoft
+    "microsoft_inline", // Microsoft
+    "forceinline", // Microsoft
+    "selectany", // Microsoft
+    "nothrow", // Microsoft
+    "novtable", // Microsoft
+    "noreturn", // Microsoft
+    "noinline", // Microsoft
+    "noalias", // Microsoft
+    "restrict", // Microsoft
+*/
+
+specifiers(
+    unique int id: @specifier,
+    unique string str: string ref
+);
+
+typespecifiers(
+    int type_id: @type ref,
+    int spec_id: @specifier ref
+);
+
+funspecifiers(
+    int func_id: @function ref,
+    int spec_id: @specifier ref
+);
+
+varspecifiers(
+    int var_id: @accessible ref,
+    int spec_id: @specifier ref
+);
+
+explicit_specifier_exprs(
+    unique int func_id: @function ref,
+    int constant: @expr ref
+)
+
+attributes(
+    unique int id: @attribute,
+    int kind: int ref,
+    string name: string ref,
+    string name_space: string ref,
+    int location: @location_default ref
+);
+
+case @attribute.kind of
+  0 = @gnuattribute
+| 1 = @stdattribute
+| 2 = @declspec
+| 3 = @msattribute
+| 4 = @alignas
+// ... 5 @objc_propertyattribute deprecated
+;
+
+attribute_args(
+    unique int id: @attribute_arg,
+    int kind: int ref,
+    int attribute: @attribute ref,
+    int index: int ref,
+    int location: @location_default ref
+);
+
+case @attribute_arg.kind of
+  0 = @attribute_arg_empty
+| 1 = @attribute_arg_token
+| 2 = @attribute_arg_constant
+| 3 = @attribute_arg_type
+| 4 = @attribute_arg_constant_expr
+| 5 = @attribute_arg_expr
+;
+
+attribute_arg_value(
+    unique int arg: @attribute_arg ref,
+    string value: string ref
+);
+attribute_arg_type(
+    unique int arg: @attribute_arg ref,
+    int type_id: @type ref
+);
+attribute_arg_constant(
+    unique int arg: @attribute_arg ref,
+    int constant: @expr ref
+)
+attribute_arg_expr(
+    unique int arg: @attribute_arg ref,
+    int expr: @expr ref
+)
+attribute_arg_name(
+    unique int arg: @attribute_arg ref,
+    string name: string ref
+);
+
+typeattributes(
+    int type_id: @type ref,
+    int spec_id: @attribute ref
+);
+
+funcattributes(
+    int func_id: @function ref,
+    int spec_id: @attribute ref
+);
+
+varattributes(
+    int var_id: @accessible ref,
+    int spec_id: @attribute ref
+);
+
+stmtattributes(
+    int stmt_id: @stmt ref,
+    int spec_id: @attribute ref
+);
+
+@type = @builtintype
+      | @derivedtype
+      | @usertype
+      /* TODO | @fixedpointtype */
+      | @routinetype
+      | @ptrtomember
+      | @decltype;
+
+unspecifiedtype(
+    unique int type_id: @type ref,
+    int unspecified_type_id: @type ref
+);
+
+member(
+    int parent: @type ref,
+    int index: int ref,
+    int child: @member ref
+);
+
+@enclosingfunction_child = @usertype | @variable | @namespace
+
+enclosingfunction(
+    unique int child: @enclosingfunction_child ref,
+    int parent: @function ref
+);
+
+derivations(
+    unique int derivation: @derivation,
+    int sub: @type ref,
+    int index: int ref,
+    int super: @type ref,
+    int location: @location_default ref
+);
+
+derspecifiers(
+    int der_id: @derivation ref,
+    int spec_id: @specifier ref
+);
+
+/**
+ * Contains the byte offset of the base class subobject within the derived
+ * class. Only holds for non-virtual base classes, but see table
+ * `virtual_base_offsets` for offsets of virtual base class subobjects.
+ */
+direct_base_offsets(
+    unique int der_id: @derivation ref,
+    int offset: int ref
+);
+
+/**
+ * Contains the byte offset of the virtual base class subobject for class
+ * `super` within a most-derived object of class `sub`. `super` can be either a
+ * direct or indirect base class.
+ */
+#keyset[sub, super]
+virtual_base_offsets(
+    int sub: @usertype ref,
+    int super: @usertype ref,
+    int offset: int ref
+);
+
+frienddecls(
+    unique int id: @frienddecl,
+    int type_id: @type ref,
+    int decl_id: @declaration ref,
+    int location: @location_default ref
+);
+
+@declaredtype = @usertype ;
+
+@declaration = @function
+             | @declaredtype
+             | @variable
+             | @enumconstant
+             | @frienddecl;
+
+@member = @membervariable
+        | @function
+        | @declaredtype
+        | @enumconstant;
+
+@locatable = @diagnostic
+           | @declaration
+           | @ppd_include
+           | @ppd_define
+           | @macroinvocation
+           /*| @funcall*/
+           | @xmllocatable
+           | @attribute
+           | @attribute_arg;
+
+@namedscope = @namespace | @usertype;
+
+@element = @locatable
+         | @file
+         | @folder
+         | @specifier
+         | @type
+         | @expr
+         | @namespace
+         | @initialiser
+         | @stmt
+         | @derivation
+         | @comment
+         | @preprocdirect
+         | @fun_decl
+         | @var_decl
+         | @type_decl
+         | @namespace_decl
+         | @using
+         | @namequalifier
+         | @specialnamequalifyingelement
+         | @static_assert
+         | @type_mention
+         | @lambdacapture;
+
+@exprparent = @element;
+
+comments(
+    unique int id: @comment,
+    string contents: string ref,
+    int location: @location_default ref
+);
+
+commentbinding(
+    int id: @comment ref,
+    int element: @element ref
+);
+
+exprconv(
+    int converted: @expr ref,
+    unique int conversion: @expr ref
+);
+
+compgenerated(unique int id: @element ref);
+
+/**
+ * `destructor_call` destructs the `i`'th entity that should be
+ * destructed following `element`. Note that entities should be
+ * destructed in reverse construction order, so for a given `element`
+ * these should be called from highest to lowest `i`.
+ */
+#keyset[element, destructor_call]
+#keyset[element, i]
+synthetic_destructor_call(
+    int element: @element ref,
+    int i: int ref,
+    int destructor_call: @routineexpr ref
+);
+
+namespaces(
+    unique int id: @namespace,
+    string name: string ref
+);
+
+namespace_inline(
+    unique int id: @namespace ref
+);
+
+namespacembrs(
+    int parentid: @namespace ref,
+    unique int memberid: @namespacembr ref
+);
+
+@namespacembr = @declaration | @namespace;
+
+exprparents(
+    int expr_id: @expr ref,
+    int child_index: int ref,
+    int parent_id: @exprparent ref
+);
+
+expr_isload(unique int expr_id: @expr ref);
+
+@cast = @c_style_cast
+      | @const_cast
+      | @dynamic_cast
+      | @reinterpret_cast
+      | @static_cast
+      ;
+
+/*
+case @conversion.kind of
+  0 = @simple_conversion           // a numeric conversion, qualification conversion, or a reinterpret_cast
+| 1 = @bool_conversion             // conversion to 'bool'
+| 2 = @base_class_conversion       // a derived-to-base conversion
+| 3 = @derived_class_conversion    // a base-to-derived conversion
+| 4 = @pm_base_class_conversion    // a derived-to-base conversion of a pointer to member
+| 5 = @pm_derived_class_conversion // a base-to-derived conversion of a pointer to member
+| 6 = @glvalue_adjust              // an adjustment of the type of a glvalue
+| 7 = @prvalue_adjust              // an adjustment of the type of a prvalue
+;
+*/
+/**
+ * Describes the semantics represented by a cast expression. This is largely
+ * independent of the source syntax of the cast, so it is separate from the
+ * regular expression kind.
+ */
+conversionkinds(
+    unique int expr_id: @cast ref,
+    int kind: int ref
+);
+
+@conversion = @cast
+            | @array_to_pointer
+            | @parexpr
+            | @reference_to
+            | @ref_indirect
+            | @temp_init
+            | @c11_generic
+            ;
+
+/*
+case @funbindexpr.kind of
+  0 = @normal_call  // a normal call
+| 1 = @virtual_call // a virtual call
+| 2 = @adl_call     // a call whose target is only found by ADL
+;
+*/
+iscall(
+    unique int caller: @funbindexpr ref,
+    int kind: int ref
+);
+
+numtemplatearguments(
+    unique int expr_id: @expr ref,
+    int num: int ref
+);
+
+specialnamequalifyingelements(
+    unique int id: @specialnamequalifyingelement,
+    unique string name: string ref
+);
+
+@namequalifiableelement = @expr | @namequalifier;
+@namequalifyingelement = @namespace
+                       | @specialnamequalifyingelement
+                       | @usertype;
+
+namequalifiers(
+    unique int id: @namequalifier,
+    unique int qualifiableelement: @namequalifiableelement ref,
+    int qualifyingelement: @namequalifyingelement ref,
+    int location: @location_default ref
+);
+
+varbind(
+    int expr: @varbindexpr ref,
+    int var: @accessible ref
+);
+
+funbind(
+    int expr: @funbindexpr ref,
+    int fun: @function ref
+);
+
+@any_new_expr = @new_expr
+              | @new_array_expr;
+
+@new_or_delete_expr = @any_new_expr
+                    | @delete_expr
+                    | @delete_array_expr;
+
+@prefix_crement_expr = @preincrexpr | @predecrexpr;
+
+@postfix_crement_expr = @postincrexpr | @postdecrexpr;
+
+@increment_expr = @preincrexpr | @postincrexpr;
+
+@decrement_expr = @predecrexpr | @postdecrexpr;
+
+@crement_expr = @increment_expr | @decrement_expr;
+
+@un_arith_op_expr = @arithnegexpr
+                  | @unaryplusexpr
+                  | @conjugation
+                  | @realpartexpr
+                  | @imagpartexpr
+                  | @crement_expr
+                  ;
+
+@un_bitwise_op_expr = @complementexpr;
+
+@un_log_op_expr = @notexpr;
+
+@un_op_expr = @address_of
+            | @indirect
+            | @un_arith_op_expr
+            | @un_bitwise_op_expr
+            | @builtinaddressof
+            | @vec_fill
+            | @un_log_op_expr
+            | @co_await
+            | @co_yield
+            ;
+
+@bin_log_op_expr = @andlogicalexpr | @orlogicalexpr;
+
+@cmp_op_expr = @eq_op_expr | @rel_op_expr;
+
+@eq_op_expr = @eqexpr | @neexpr;
+
+@rel_op_expr = @gtexpr
+             | @ltexpr
+             | @geexpr
+             | @leexpr
+             | @spaceshipexpr
+             ;
+
+@bin_bitwise_op_expr = @lshiftexpr
+                     | @rshiftexpr
+                     | @andexpr
+                     | @orexpr
+                     | @xorexpr
+                     ;
+
+@p_arith_op_expr = @paddexpr
+                 | @psubexpr
+                 | @pdiffexpr
+                 ;
+
+@bin_arith_op_expr = @addexpr
+                   | @subexpr
+                   | @mulexpr
+                   | @divexpr
+                   | @remexpr
+                   | @jmulexpr
+                   | @jdivexpr
+                   | @fjaddexpr
+                   | @jfaddexpr
+                   | @fjsubexpr
+                   | @jfsubexpr
+                   | @minexpr
+                   | @maxexpr
+                   | @p_arith_op_expr
+                   ;
+
+@bin_op_expr = @bin_arith_op_expr
+             | @bin_bitwise_op_expr
+             | @cmp_op_expr
+             | @bin_log_op_expr
+             ;
+
+@op_expr = @un_op_expr
+         | @bin_op_expr
+         | @assign_expr
+         | @conditionalexpr
+         ;
+
+@assign_arith_expr = @assignaddexpr
+                   | @assignsubexpr
+                   | @assignmulexpr
+                   | @assigndivexpr
+                   | @assignremexpr
+                   ;
+
+@assign_bitwise_expr = @assignandexpr
+                     | @assignorexpr
+                     | @assignxorexpr
+                     | @assignlshiftexpr
+                     | @assignrshiftexpr
+                     ;
+
+@assign_pointer_expr = @assignpaddexpr
+                     | @assignpsubexpr
+                     ;
+
+@assign_op_expr = @assign_arith_expr
+                | @assign_bitwise_expr
+                | @assign_pointer_expr
+                ;
+
+@assign_expr = @assignexpr | @assign_op_expr | @blockassignexpr
+
+/*
+  Binary encoding of the allocator form.
+
+  case @allocator.form of
+    0 = plain
+  | 1 = alignment
+  ;
+*/
+
+/**
+ * The allocator function associated with a `new` or `new[]` expression.
+ * The `form` column specified whether the allocation call contains an alignment
+ * argument.
+ */
+expr_allocator(
+    unique int expr: @any_new_expr ref,
+    int func: @function ref,
+    int form: int ref
+);
+
+/*
+  Binary encoding of the deallocator form.
+
+  case @deallocator.form of
+    0 = plain
+  | 1 = size
+  | 2 = alignment
+  | 4 = destroying_delete
+  ;
+*/
+
+/**
+ * The deallocator function associated with a `delete`, `delete[]`, `new`, or
+ * `new[]` expression. For a `new` or `new[]` expression, the deallocator is the
+ * one used to free memory if the initialization throws an exception.
+ * The `form` column specifies whether the deallocation call contains a size
+ * argument, and alignment argument, or both.
+ */
+expr_deallocator(
+    unique int expr: @new_or_delete_expr ref,
+    int func: @function ref,
+    int form: int ref
+);
+
+/**
+ * Holds if the `@conditionalexpr` is of the two operand form
+ * `guard ? : false`.
+ */
+expr_cond_two_operand(
+    unique int cond: @conditionalexpr ref
+);
+
+/**
+ * The guard of `@conditionalexpr` `guard ? true : false`
+ */
+expr_cond_guard(
+    unique int cond: @conditionalexpr ref,
+    int guard: @expr ref
+);
+
+/**
+ * The expression used when the guard of `@conditionalexpr`
+ * `guard ? true : false` holds. For the two operand form
+ * `guard ?: false` consider using `expr_cond_guard` instead.
+ */
+expr_cond_true(
+    unique int cond: @conditionalexpr ref,
+    int true: @expr ref
+);
+
+/**
+ * The expression used when the guard of `@conditionalexpr`
+ * `guard ? true : false` does not hold.
+ */
+expr_cond_false(
+    unique int cond: @conditionalexpr ref,
+    int false: @expr ref
+);
+
+/** A string representation of the value. */
+values(
+    unique int id: @value,
+    string str: string ref
+);
+
+/** The actual text in the source code for the value, if any. */
+valuetext(
+    unique int id: @value ref,
+    string text: string ref
+);
+
+valuebind(
+    int val: @value ref,
+    unique int expr: @expr ref
+);
+
+fieldoffsets(
+    unique int id: @variable ref,
+    int byteoffset: int ref,
+    int bitoffset: int ref
+);
+
+bitfield(
+    unique int id: @variable ref,
+    int bits: int ref,
+    int declared_bits: int ref
+);
+
+/* TODO
+memberprefix(
+    int member: @expr ref,
+    int prefix: @expr ref
+);
+*/
+
+/*
+   kind(1) = mbrcallexpr
+   kind(2) = mbrptrcallexpr
+   kind(3) = mbrptrmbrcallexpr
+   kind(4) = ptrmbrptrmbrcallexpr
+   kind(5) = mbrreadexpr // x.y
+   kind(6) = mbrptrreadexpr // p->y
+   kind(7) = mbrptrmbrreadexpr // x.*pm
+   kind(8) = mbrptrmbrptrreadexpr // x->*pm
+   kind(9) = staticmbrreadexpr // static x.y
+   kind(10) = staticmbrptrreadexpr // static p->y
+*/
+/* TODO
+memberaccess(
+    int member: @expr ref,
+    int kind: int ref
+);
+*/
+
+initialisers(
+    unique int init: @initialiser,
+    int var: @accessible ref,
+    unique int expr: @expr ref,
+    int location: @location_expr ref
+);
+
+braced_initialisers(
+    int init: @initialiser ref
+);
+
+/**
+ * An ancestor for the expression, for cases in which we cannot
+ * otherwise find the expression's parent.
+ */
+expr_ancestor(
+    int exp: @expr ref,
+    int ancestor: @element ref
+);
+
+exprs(
+    unique int id: @expr,
+    int kind: int ref,
+    int location: @location_expr ref
+);
+
+expr_reuse(
+    int reuse: @expr ref,
+    int original: @expr ref,
+    int value_category: int ref
+)
+
+/*
+  case @value.category of
+    1 = prval
+  | 2 = xval
+  | 3 = lval
+  ;
+*/
+expr_types(
+    int id: @expr ref,
+    int typeid: @type ref,
+    int value_category: int ref
+);
+
+case @expr.kind of
+    1 = @errorexpr
+|   2 = @address_of // & AddressOfExpr
+|   3 = @reference_to // ReferenceToExpr (implicit?)
+|   4 = @indirect // * PointerDereferenceExpr
+|   5 = @ref_indirect // ReferenceDereferenceExpr (implicit?)
+// ...
+|   8 = @array_to_pointer // (???)
+|   9 = @vacuous_destructor_call // VacuousDestructorCall
+// ...
+|  11 = @assume // Microsoft
+|  12 = @parexpr
+|  13 = @arithnegexpr
+|  14 = @unaryplusexpr
+|  15 = @complementexpr
+|  16 = @notexpr
+|  17 = @conjugation // GNU ~ operator
+|  18 = @realpartexpr // GNU __real
+|  19 = @imagpartexpr // GNU __imag
+|  20 = @postincrexpr
+|  21 = @postdecrexpr
+|  22 = @preincrexpr
+|  23 = @predecrexpr
+|  24 = @conditionalexpr
+|  25 = @addexpr
+|  26 = @subexpr
+|  27 = @mulexpr
+|  28 = @divexpr
+|  29 = @remexpr
+|  30 = @jmulexpr // C99 mul imaginary
+|  31 = @jdivexpr // C99 div imaginary
+|  32 = @fjaddexpr // C99 add real + imaginary
+|  33 = @jfaddexpr // C99 add imaginary + real
+|  34 = @fjsubexpr // C99 sub real - imaginary
+|  35 = @jfsubexpr // C99 sub imaginary - real
+|  36 = @paddexpr // pointer add (pointer + int or int + pointer)
+|  37 = @psubexpr // pointer sub (pointer - integer)
+|  38 = @pdiffexpr // difference between two pointers
+|  39 = @lshiftexpr
+|  40 = @rshiftexpr
+|  41 = @andexpr
+|  42 = @orexpr
+|  43 = @xorexpr
+|  44 = @eqexpr
+|  45 = @neexpr
+|  46 = @gtexpr
+|  47 = @ltexpr
+|  48 = @geexpr
+|  49 = @leexpr
+|  50 = @minexpr // GNU minimum
+|  51 = @maxexpr // GNU maximum
+|  52 = @assignexpr
+|  53 = @assignaddexpr
+|  54 = @assignsubexpr
+|  55 = @assignmulexpr
+|  56 = @assigndivexpr
+|  57 = @assignremexpr
+|  58 = @assignlshiftexpr
+|  59 = @assignrshiftexpr
+|  60 = @assignandexpr
+|  61 = @assignorexpr
+|  62 = @assignxorexpr
+|  63 = @assignpaddexpr // assign pointer add
+|  64 = @assignpsubexpr // assign pointer sub
+|  65 = @andlogicalexpr
+|  66 = @orlogicalexpr
+|  67 = @commaexpr
+|  68 = @subscriptexpr // access to member of an array, e.g., a[5]
+// ...  69 @objc_subscriptexpr deprecated
+// ...  70 @cmdaccess deprecated
+// ...
+|  73 = @virtfunptrexpr
+|  74 = @callexpr
+// ...  75 @msgexpr_normal deprecated
+// ...  76 @msgexpr_super deprecated
+// ...  77 @atselectorexpr deprecated
+// ...  78 @atprotocolexpr deprecated
+|  79 = @vastartexpr
+|  80 = @vaargexpr
+|  81 = @vaendexpr
+|  82 = @vacopyexpr
+// ...  83 @atencodeexpr deprecated
+|  84 = @varaccess
+|  85 = @thisaccess
+// ...  86 @objc_box_expr deprecated
+|  87 = @new_expr
+|  88 = @delete_expr
+|  89 = @throw_expr
+|  90 = @condition_decl // a variable declared in a condition, e.g., if(int x = y > 2)
+|  91 = @braced_init_list
+|  92 = @type_id
+|  93 = @runtime_sizeof
+|  94 = @runtime_alignof
+|  95 = @sizeof_pack
+|  96 = @expr_stmt // GNU extension
+|  97 = @routineexpr
+|  98 = @type_operand // used to access a type in certain contexts (haven't found any examples yet....)
+|  99 = @offsetofexpr // offsetof ::= type and field
+| 100 = @hasassignexpr // __has_assign ::= type
+| 101 = @hascopyexpr // __has_copy ::= type
+| 102 = @hasnothrowassign // __has_nothrow_assign ::= type
+| 103 = @hasnothrowconstr // __has_nothrow_constructor ::= type
+| 104 = @hasnothrowcopy // __has_nothrow_copy ::= type
+| 105 = @hastrivialassign // __has_trivial_assign ::= type
+| 106 = @hastrivialconstr // __has_trivial_constructor ::= type
+| 107 = @hastrivialcopy // __has_trivial_copy ::= type
+| 108 = @hasuserdestr // __has_user_destructor ::= type
+| 109 = @hasvirtualdestr // __has_virtual_destructor ::= type
+| 110 = @isabstractexpr // __is_abstract ::= type
+| 111 = @isbaseofexpr // __is_base_of ::= type type
+| 112 = @isclassexpr // __is_class ::= type
+| 113 = @isconvtoexpr // __is_convertible_to ::= type type
+| 114 = @isemptyexpr // __is_empty ::= type
+| 115 = @isenumexpr // __is_enum ::= type
+| 116 = @ispodexpr // __is_pod ::= type
+| 117 = @ispolyexpr // __is_polymorphic ::= type
+| 118 = @isunionexpr // __is_union ::= type
+| 119 = @typescompexpr // GNU __builtin_types_compatible ::= type type
+| 120 = @intaddrexpr // frontend internal builtin, used to implement offsetof
+// ...
+| 122 = @hastrivialdestructor // __has_trivial_destructor ::= type
+| 123 = @literal
+| 124 = @uuidof
+| 127 = @aggregateliteral
+| 128 = @delete_array_expr
+| 129 = @new_array_expr
+// ... 130 @objc_array_literal deprecated
+// ... 131 @objc_dictionary_literal deprecated
+| 132 = @foldexpr
+// ...
+| 200 = @ctordirectinit
+| 201 = @ctorvirtualinit
+| 202 = @ctorfieldinit
+| 203 = @ctordelegatinginit
+| 204 = @dtordirectdestruct
+| 205 = @dtorvirtualdestruct
+| 206 = @dtorfielddestruct
+// ...
+| 210 = @static_cast
+| 211 = @reinterpret_cast
+| 212 = @const_cast
+| 213 = @dynamic_cast
+| 214 = @c_style_cast
+| 215 = @lambdaexpr
+| 216 = @param_ref
+| 217 = @noopexpr
+// ...
+| 294 = @istriviallyconstructibleexpr
+| 295 = @isdestructibleexpr
+| 296 = @isnothrowdestructibleexpr
+| 297 = @istriviallydestructibleexpr
+| 298 = @istriviallyassignableexpr
+| 299 = @isnothrowassignableexpr
+| 300 = @istrivialexpr
+| 301 = @isstandardlayoutexpr
+| 302 = @istriviallycopyableexpr
+| 303 = @isliteraltypeexpr
+| 304 = @hastrivialmoveconstructorexpr
+| 305 = @hastrivialmoveassignexpr
+| 306 = @hasnothrowmoveassignexpr
+| 307 = @isconstructibleexpr
+| 308 = @isnothrowconstructibleexpr
+| 309 = @hasfinalizerexpr
+| 310 = @isdelegateexpr
+| 311 = @isinterfaceclassexpr
+| 312 = @isrefarrayexpr
+| 313 = @isrefclassexpr
+| 314 = @issealedexpr
+| 315 = @issimplevalueclassexpr
+| 316 = @isvalueclassexpr
+| 317 = @isfinalexpr
+| 319 = @noexceptexpr
+| 320 = @builtinshufflevector
+| 321 = @builtinchooseexpr
+| 322 = @builtinaddressof
+| 323 = @vec_fill
+| 324 = @builtinconvertvector
+| 325 = @builtincomplex
+| 326 = @spaceshipexpr
+| 327 = @co_await
+| 328 = @co_yield
+| 329 = @temp_init
+| 330 = @isassignable
+| 331 = @isaggregate
+| 332 = @hasuniqueobjectrepresentations
+| 333 = @builtinbitcast
+| 334 = @builtinshuffle
+| 335 = @blockassignexpr
+| 336 = @issame
+| 337 = @isfunction
+| 338 = @islayoutcompatible
+| 339 = @ispointerinterconvertiblebaseof
+| 340 = @isarray
+| 341 = @arrayrank
+| 342 = @arrayextent
+| 343 = @isarithmetic
+| 344 = @iscompletetype
+| 345 = @iscompound
+| 346 = @isconst
+| 347 = @isfloatingpoint
+| 348 = @isfundamental
+| 349 = @isintegral
+| 350 = @islvaluereference
+| 351 = @ismemberfunctionpointer
+| 352 = @ismemberobjectpointer
+| 353 = @ismemberpointer
+| 354 = @isobject
+| 355 = @ispointer
+| 356 = @isreference
+| 357 = @isrvaluereference
+| 358 = @isscalar
+| 359 = @issigned
+| 360 = @isunsigned
+| 361 = @isvoid
+| 362 = @isvolatile
+| 363 = @reuseexpr
+| 364 = @istriviallycopyassignable
+| 365 = @isassignablenopreconditioncheck
+| 366 = @referencebindstotemporary
+| 367 = @issameas
+| 368 = @builtinhasattribute
+| 369 = @ispointerinterconvertiblewithclass
+| 370 = @builtinispointerinterconvertiblewithclass
+| 371 = @iscorrespondingmember
+| 372 = @builtiniscorrespondingmember
+| 373 = @isboundedarray
+| 374 = @isunboundedarray
+| 375 = @isreferenceable
+| 378 = @isnothrowconvertible
+| 379 = @referenceconstructsfromtemporary
+| 380 = @referenceconvertsfromtemporary
+| 381 = @isconvertible
+| 382 = @isvalidwinrttype
+| 383 = @iswinclass
+| 384 = @iswininterface
+| 385 = @istriviallyequalitycomparable
+| 386 = @isscopedenum
+| 387 = @istriviallyrelocatable
+| 388 = @datasizeof
+| 389 = @c11_generic
+| 390 = @requires_expr
+;
+
+@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
+            ;
+
+new_allocated_type(
+    unique int expr: @new_expr ref,
+    int type_id: @type ref
+);
+
+new_array_allocated_type(
+    unique int expr: @new_array_expr ref,
+    int type_id: @type ref
+);
+
+/**
+ * The field being initialized by an initializer expression within an aggregate
+ * initializer for a class/struct/union. Position is used to sort repeated initializers.
+ */
+#keyset[aggregate, position]
+aggregate_field_init(
+    int aggregate: @aggregateliteral ref,
+    int initializer: @expr ref,
+    int field: @membervariable ref,
+    int position: int ref
+);
+
+/**
+ * The index of the element being initialized by an initializer expression
+ * within an aggregate initializer for an array. Position is used to sort repeated initializers.
+ */
+#keyset[aggregate, position]
+aggregate_array_init(
+    int aggregate: @aggregateliteral ref,
+    int initializer: @expr ref,
+    int element_index: int ref,
+    int position: int ref
+);
+
+@ctorinit = @ctordirectinit
+          | @ctorvirtualinit
+          | @ctorfieldinit
+          | @ctordelegatinginit;
+@dtordestruct = @dtordirectdestruct
+              | @dtorvirtualdestruct
+              | @dtorfielddestruct;
+
+
+condition_decl_bind(
+    unique int expr: @condition_decl ref,
+    unique int decl: @declaration ref
+);
+
+typeid_bind(
+    unique int expr: @type_id ref,
+    int type_id: @type ref
+);
+
+uuidof_bind(
+    unique int expr: @uuidof ref,
+    int type_id: @type ref
+);
+
+@runtime_sizeof_or_alignof = @runtime_sizeof | @runtime_alignof | @datasizeof;
+
+sizeof_bind(
+    unique int expr: @runtime_sizeof_or_alignof ref,
+    int type_id: @type ref
+);
+
+code_block(
+    unique int block: @literal ref,
+    unique int routine: @function ref
+);
+
+lambdas(
+    unique int expr: @lambdaexpr ref,
+    string default_capture: string ref,
+    boolean has_explicit_return_type: boolean ref
+);
+
+lambda_capture(
+    unique int id: @lambdacapture,
+    int lambda: @lambdaexpr ref,
+    int index: int ref,
+    int field: @membervariable ref,
+    boolean captured_by_reference: boolean ref,
+    boolean is_implicit: boolean ref,
+    int location: @location_default ref
+);
+
+@funbindexpr = @routineexpr
+             | @new_expr
+             | @delete_expr
+             | @delete_array_expr
+             | @ctordirectinit
+             | @ctorvirtualinit
+             | @ctordelegatinginit
+             | @dtordirectdestruct
+             | @dtorvirtualdestruct;
+
+@varbindexpr = @varaccess | @ctorfieldinit | @dtorfielddestruct;
+@addressable = @function | @variable ;
+@accessible = @addressable | @enumconstant ;
+
+@access = @varaccess | @routineexpr ;
+
+fold(
+    int expr: @foldexpr ref,
+    string operator: string ref,
+    boolean is_left_fold: boolean ref
+);
+
+stmts(
+    unique int id: @stmt,
+    int kind: int ref,
+    int location: @location_stmt ref
+);
+
+case @stmt.kind of
+    1 = @stmt_expr
+|   2 = @stmt_if
+|   3 = @stmt_while
+|   4 = @stmt_goto
+|   5 = @stmt_label
+|   6 = @stmt_return
+|   7 = @stmt_block
+|   8 = @stmt_end_test_while // do { ... } while ( ... )
+|   9 = @stmt_for
+|  10 = @stmt_switch_case
+|  11 = @stmt_switch
+|  13 = @stmt_asm // "asm" statement or the body of an asm function
+|  15 = @stmt_try_block
+|  16 = @stmt_microsoft_try // Microsoft
+|  17 = @stmt_decl
+|  18 = @stmt_set_vla_size // C99
+|  19 = @stmt_vla_decl // C99
+|  25 = @stmt_assigned_goto // GNU
+|  26 = @stmt_empty
+|  27 = @stmt_continue
+|  28 = @stmt_break
+|  29 = @stmt_range_based_for // C++11
+// ...  30 @stmt_at_autoreleasepool_block deprecated
+// ...  31 @stmt_objc_for_in deprecated
+// ...  32 @stmt_at_synchronized deprecated
+|  33 = @stmt_handler
+// ...  34 @stmt_finally_end deprecated
+|  35 = @stmt_constexpr_if
+|  37 = @stmt_co_return
+;
+
+type_vla(
+    int type_id: @type ref,
+    int decl: @stmt_vla_decl ref
+);
+
+variable_vla(
+    int var: @variable ref,
+    int decl: @stmt_vla_decl ref
+);
+
+if_initialization(
+    unique int if_stmt: @stmt_if ref,
+    int init_id: @stmt ref
+);
+
+if_then(
+    unique int if_stmt: @stmt_if ref,
+    int then_id: @stmt ref
+);
+
+if_else(
+    unique int if_stmt: @stmt_if ref,
+    int else_id: @stmt ref
+);
+
+constexpr_if_initialization(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int init_id: @stmt ref
+);
+
+constexpr_if_then(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int then_id: @stmt ref
+);
+
+constexpr_if_else(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int else_id: @stmt ref
+);
+
+while_body(
+    unique int while_stmt: @stmt_while ref,
+    int body_id: @stmt ref
+);
+
+do_body(
+    unique int do_stmt: @stmt_end_test_while ref,
+    int body_id: @stmt ref
+);
+
+switch_initialization(
+    unique int switch_stmt: @stmt_switch ref,
+    int init_id: @stmt ref
+);
+
+#keyset[switch_stmt, index]
+switch_case(
+    int switch_stmt: @stmt_switch ref,
+    int index: int ref,
+    int case_id: @stmt_switch_case ref
+);
+
+switch_body(
+    unique int switch_stmt: @stmt_switch ref,
+    int body_id: @stmt ref
+);
+
+@stmt_for_or_range_based_for = @stmt_for
+                             | @stmt_range_based_for;
+
+for_initialization(
+    unique int for_stmt: @stmt_for_or_range_based_for ref,
+    int init_id: @stmt ref
+);
+
+for_condition(
+    unique int for_stmt: @stmt_for ref,
+    int condition_id: @expr ref
+);
+
+for_update(
+    unique int for_stmt: @stmt_for ref,
+    int update_id: @expr ref
+);
+
+for_body(
+    unique int for_stmt: @stmt_for ref,
+    int body_id: @stmt ref
+);
+
+@stmtparent = @stmt | @expr_stmt ;
+stmtparents(
+    unique int id: @stmt ref,
+    int index: int ref,
+    int parent: @stmtparent ref
+);
+
+ishandler(unique int block: @stmt_block ref);
+
+@cfgnode = @stmt | @expr | @function | @initialiser ;
+
+stmt_decl_bind(
+    int stmt: @stmt_decl ref,
+    int num: int ref,
+    int decl: @declaration ref
+);
+
+stmt_decl_entry_bind(
+    int stmt: @stmt_decl ref,
+    int num: int ref,
+    int decl_entry: @element ref
+);
+
+@functionorblock = @function | @stmt_block;
+
+blockscope(
+    unique int block: @stmt_block ref,
+    int enclosing: @functionorblock ref
+);
+
+@jump = @stmt_goto | @stmt_break | @stmt_continue;
+
+@jumporlabel = @jump | @stmt_label | @literal;
+
+jumpinfo(
+    unique int id: @jumporlabel ref,
+    string str: string ref,
+    int target: @stmt ref
+);
+
+preprocdirects(
+    unique int id: @preprocdirect,
+    int kind: int ref,
+    int location: @location_default ref
+);
+case @preprocdirect.kind of
+   0 = @ppd_if
+|  1 = @ppd_ifdef
+|  2 = @ppd_ifndef
+|  3 = @ppd_elif
+|  4 = @ppd_else
+|  5 = @ppd_endif
+|  6 = @ppd_plain_include
+|  7 = @ppd_define
+|  8 = @ppd_undef
+|  9 = @ppd_line
+| 10 = @ppd_error
+| 11 = @ppd_pragma
+| 12 = @ppd_objc_import
+| 13 = @ppd_include_next
+| 18 = @ppd_warning
+;
+
+@ppd_include = @ppd_plain_include | @ppd_objc_import | @ppd_include_next;
+
+@ppd_branch = @ppd_if | @ppd_ifdef | @ppd_ifndef | @ppd_elif;
+
+preprocpair(
+    int begin : @ppd_branch ref,
+    int elseelifend : @preprocdirect ref
+);
+
+preproctrue(int branch : @ppd_branch ref);
+preprocfalse(int branch : @ppd_branch ref);
+
+preproctext(
+    unique int id: @preprocdirect ref,
+    string head: string ref,
+    string body: string ref
+);
+
+includes(
+    unique int id: @ppd_include ref,
+    int included: @file ref
+);
+
+link_targets(
+    int id: @link_target,
+    int binary: @file ref
+);
+
+link_parent(
+    int element : @element ref,
+    int link_target : @link_target ref
+);
+
+/* XML Files */
+
+xmlEncoding(unique int id: @file ref, string encoding: string ref);
+
+xmlDTDs(
+    unique int id: @xmldtd,
+    string root: string ref,
+    string publicId: string ref,
+    string systemId: string ref,
+    int fileid: @file ref
+);
+
+xmlElements(
+    unique int id: @xmlelement,
+    string name: string ref,
+    int parentid: @xmlparent ref,
+    int idx: int ref,
+    int fileid: @file ref
+);
+
+xmlAttrs(
+    unique int id: @xmlattribute,
+    int elementid: @xmlelement ref,
+    string name: string ref,
+    string value: string ref,
+    int idx: int ref,
+    int fileid: @file ref
+);
+
+xmlNs(
+    int id: @xmlnamespace,
+    string prefixName: string ref,
+    string URI: string ref,
+    int fileid: @file ref
+);
+
+xmlHasNs(
+    int elementId: @xmlnamespaceable ref,
+    int nsId: @xmlnamespace ref,
+    int fileid: @file ref
+);
+
+xmlComments(
+    unique int id: @xmlcomment,
+    string text: string ref,
+    int parentid: @xmlparent ref,
+    int fileid: @file ref
+);
+
+xmlChars(
+    unique int id: @xmlcharacters,
+    string text: string ref,
+    int parentid: @xmlparent ref,
+    int idx: int ref,
+    int isCDATA: int ref,
+    int fileid: @file ref
+);
+
+@xmlparent = @file | @xmlelement;
+@xmlnamespaceable = @xmlelement | @xmlattribute;
+
+xmllocations(
+    int xmlElement: @xmllocatable ref,
+    int location: @location_default ref
+);
+
+@xmllocatable = @xmlcharacters
+              | @xmlelement
+              | @xmlcomment
+              | @xmlattribute
+              | @xmldtd
+              | @file
+              | @xmlnamespace;
diff --git a/cpp/ql/lib/upgrades/7ff6a6e53dbcff09d1b9b758b594bc6d17366863/upgrade.properties b/cpp/ql/lib/upgrades/7ff6a6e53dbcff09d1b9b758b594bc6d17366863/upgrade.properties
new file mode 100644
index 00000000000..dddc448b8e1
--- /dev/null
+++ b/cpp/ql/lib/upgrades/7ff6a6e53dbcff09d1b9b758b594bc6d17366863/upgrade.properties
@@ -0,0 +1,2 @@
+description: Add requires expressions
+compatibility: full
diff --git a/cpp/ql/src/Best Practices/Unused Entities/UnusedLocals.ql b/cpp/ql/src/Best Practices/Unused Entities/UnusedLocals.ql
index 1d02474bfbb..5ae8468d0fc 100644
--- a/cpp/ql/src/Best Practices/Unused Entities/UnusedLocals.ql	
+++ b/cpp/ql/src/Best Practices/Unused Entities/UnusedLocals.ql	
@@ -57,5 +57,5 @@ where
   not declarationHasSideEffects(v) and
   not exists(AsmStmt s | f = s.getEnclosingFunction()) and
   not v.getAnAttribute().getName() = "unused" and
-  not any(ErrorExpr e).getEnclosingFunction() = f // unextracted expr may use `v`
+  not f.hasErrors() // Unextracted expressions may use `v`
 select v, "Variable " + v.getName() + " is not used."
diff --git a/cpp/ql/src/CHANGELOG.md b/cpp/ql/src/CHANGELOG.md
index 05f179aa844..4098bcf4d20 100644
--- a/cpp/ql/src/CHANGELOG.md
+++ b/cpp/ql/src/CHANGELOG.md
@@ -1,9 +1,30 @@
+## 1.2.6
+
+### Minor Analysis Improvements
+
+* Remove results from the `cpp/wrong-type-format-argument` ("Wrong type of arguments to formatting function") query if the argument is the return value of an implicitly declared function.
+
+## 1.2.5
+
+### Minor Analysis Improvements
+
+* The `cpp/unclear-array-index-validation` ("Unclear validation of array index") query has been improved to reduce false positives and increase true positives.
+* Fixed false positives in the `cpp/uninitialized-local` ("Potentially uninitialized local variable") query if there are extraction errors in the function.
+* The `cpp/incorrect-string-type-conversion` query now produces fewer false positives caused by failure to detect byte arrays.
+* The `cpp/incorrect-string-type-conversion` query now produces fewer false positives caused by failure to recognize dynamic checks prior to possible dangerous widening.
+
+## 1.2.4
+
+### Minor Analysis Improvements
+
+* Fixed false positives in the `cpp/wrong-number-format-arguments` ("Too few arguments to formatting function") query when the formatting function has been declared implicitly.
+
 ## 1.2.3
 
 ### Minor Analysis Improvements
 
-* Removed false positives caused by buffer accesses in unreachable code.
-* Removed false positives caused by inconsistent type checking.
+* Removed false positives caused by buffer accesses in unreachable code
+* Removed false positives caused by inconsistent type checking
 * Add modeling of C functions that don't throw, thereby increasing the precision of the `cpp/incorrect-allocation-error-handling` ("Incorrect allocation-error handling") query. The query now produces additional true positives.
 
 ## 1.2.2
diff --git a/cpp/ql/src/Critical/UseAfterFree.qhelp b/cpp/ql/src/Critical/UseAfterFree.qhelp
index 6a532ed4d35..60dd1a6690e 100644
--- a/cpp/ql/src/Critical/UseAfterFree.qhelp
+++ b/cpp/ql/src/Critical/UseAfterFree.qhelp
@@ -8,7 +8,7 @@
 <p>
 This rule finds accesses through a pointer of a memory location that has already been freed (i.e. through a dangling pointer). 
 Such memory blocks have already been released to the dynamic memory manager, and modifying them can lead to anything 
-from a segfault to memory corruption that would cause subsequent calls to the dynamic memory manger to behave 
+from a segfault to memory corruption that would cause subsequent calls to the dynamic memory manager to behave 
 erratically, to a possible security vulnerability.
 </p>
 
diff --git a/cpp/ql/src/Likely Bugs/Format/WrongNumberOfFormatArguments.ql b/cpp/ql/src/Likely Bugs/Format/WrongNumberOfFormatArguments.ql
index 1deb9493ca3..1dd1668a880 100644
--- a/cpp/ql/src/Likely Bugs/Format/WrongNumberOfFormatArguments.ql	
+++ b/cpp/ql/src/Likely Bugs/Format/WrongNumberOfFormatArguments.ql	
@@ -16,6 +16,20 @@
 
 import cpp
 
+class SyntaxError extends CompilerError {
+  SyntaxError() { this.getTag().matches("exp_%") }
+
+  predicate affects(Element e) {
+    exists(Location l1, Location l2 |
+      l1 = this.getLocation() and
+      l2 = e.getLocation()
+    |
+      l1.getFile() = l2.getFile() and
+      l1.getStartLine() = l2.getStartLine()
+    )
+  }
+}
+
 from FormatLiteral fl, FormattingFunctionCall ffc, int expected, int given, string ffcName
 where
   ffc = fl.getUse() and
@@ -27,7 +41,10 @@ where
     if ffc.isInMacroExpansion()
     then ffcName = ffc.getTarget().getName() + " (in a macro expansion)"
     else ffcName = ffc.getTarget().getName()
-  )
+  ) and
+  // A typical problem is that string literals are concatenated, but if one of the string
+  // literals is an undefined macro, then this just leads to a syntax error.
+  not exists(SyntaxError e | e.affects(fl))
 select ffc,
   "Format for " + ffcName + " expects " + expected.toString() + " arguments but given " +
     given.toString()
diff --git a/cpp/ql/src/Likely Bugs/Format/WrongTypeFormatArguments.ql b/cpp/ql/src/Likely Bugs/Format/WrongTypeFormatArguments.ql
index e38bfbf562b..027f4caa8ae 100644
--- a/cpp/ql/src/Likely Bugs/Format/WrongTypeFormatArguments.ql	
+++ b/cpp/ql/src/Likely Bugs/Format/WrongTypeFormatArguments.ql	
@@ -170,7 +170,8 @@ where
   ) and
   not arg.isAffectedByMacro() and
   not arg.isFromUninstantiatedTemplate(_) and
-  not actual.getUnspecifiedType() instanceof ErroneousType
+  not actual.getUnspecifiedType() instanceof ErroneousType and
+  not arg.(Call).mayBeFromImplicitlyDeclaredFunction()
 select arg,
   "This format specifier for type '" + expected.getName() + "' does not match the argument type '" +
     actual.getUnspecifiedType().getName() + "'."
diff --git a/cpp/ql/src/Likely Bugs/Memory Management/ReturnStackAllocatedMemory.ql b/cpp/ql/src/Likely Bugs/Memory Management/ReturnStackAllocatedMemory.ql
index 16679d67fd2..02678beaf12 100644
--- a/cpp/ql/src/Likely Bugs/Memory Management/ReturnStackAllocatedMemory.ql	
+++ b/cpp/ql/src/Likely Bugs/Memory Management/ReturnStackAllocatedMemory.ql	
@@ -29,7 +29,7 @@ class ReturnStackAllocatedMemoryConfig extends MustFlowConfiguration {
   override predicate isSource(Instruction source) {
     exists(Function func |
       // Rule out FPs caused by extraction errors.
-      not any(ErrorExpr e).getEnclosingFunction() = func and
+      not func.hasErrors() and
       not intentionallyReturnsStackPointer(func) and
       func = source.getEnclosingFunction()
     |
diff --git a/cpp/ql/src/Likely Bugs/Memory Management/UninitializedLocal.ql b/cpp/ql/src/Likely Bugs/Memory Management/UninitializedLocal.ql
index 35bee25c9f5..763a142f1b9 100644
--- a/cpp/ql/src/Likely Bugs/Memory Management/UninitializedLocal.ql	
+++ b/cpp/ql/src/Likely Bugs/Memory Management/UninitializedLocal.ql	
@@ -65,6 +65,7 @@ predicate isSinkImpl(Instruction sink, VariableAccess va) {
   exists(LoadInstruction load |
     va = load.getUnconvertedResultExpression() and
     not va = commonException() and
+    not va.getTarget().(LocalVariable).getFunction().hasErrors() and
     sink = load.getSourceValue()
   )
 }
diff --git a/cpp/ql/src/Likely Bugs/Memory Management/UsingExpiredStackAddress.ql b/cpp/ql/src/Likely Bugs/Memory Management/UsingExpiredStackAddress.ql
index 678cb95a721..0df59b5f01d 100644
--- a/cpp/ql/src/Likely Bugs/Memory Management/UsingExpiredStackAddress.ql	
+++ b/cpp/ql/src/Likely Bugs/Memory Management/UsingExpiredStackAddress.ql	
@@ -24,7 +24,7 @@ predicate instructionHasVariable(VariableAddressInstruction vai, StackVariable v
   // Pointer-to-member types aren't properly handled in the dbscheme.
   not vai.getResultType() instanceof PointerToMemberType and
   // Rule out FPs caused by extraction errors.
-  not any(ErrorExpr e).getEnclosingFunction() = f
+  not f.hasErrors()
 }
 
 /**
diff --git a/cpp/ql/src/Metrics/Internal/IRConsistency.ql b/cpp/ql/src/Metrics/Internal/IRConsistency.ql
index e90c158fe94..b4b5b32f7ad 100644
--- a/cpp/ql/src/Metrics/Internal/IRConsistency.ql
+++ b/cpp/ql/src/Metrics/Internal/IRConsistency.ql
@@ -40,4 +40,5 @@ select count(Instruction i | IRConsistency::missingOperand(i, _, _, _) | i) as m
   count(Instruction i | IRConsistency::nonUniqueEnclosingIRFunction(i, _, _, _) | i) as nonUniqueEnclosingIRFunction,
   count(FieldAddressInstruction i | IRConsistency::fieldAddressOnNonPointer(i, _, _, _) | i) as fieldAddressOnNonPointer,
   count(Instruction i | IRConsistency::thisArgumentIsNonPointer(i, _, _, _) | i) as thisArgumentIsNonPointer,
-  count(Instruction i | IRConsistency::nonUniqueIRVariable(i, _, _, _) | i) as nonUniqueIRVariable
+  count(Instruction i | IRConsistency::nonUniqueIRVariable(i, _, _, _) | i) as nonUniqueIRVariable,
+  count(Instruction i | IRConsistency::nonBooleanOperand(i, _, _, _) | i) as nonBooleanOperand
diff --git a/cpp/ql/src/Security/CWE/CWE-129/ImproperArrayIndexValidation.ql b/cpp/ql/src/Security/CWE/CWE-129/ImproperArrayIndexValidation.ql
index 107be7bddfd..b5dc4d893b2 100644
--- a/cpp/ql/src/Security/CWE/CWE-129/ImproperArrayIndexValidation.ql
+++ b/cpp/ql/src/Security/CWE/CWE-129/ImproperArrayIndexValidation.ql
@@ -14,102 +14,56 @@
 
 import cpp
 import semmle.code.cpp.controlflow.IRGuards
-import semmle.code.cpp.security.FlowSources
-import semmle.code.cpp.ir.dataflow.TaintTracking
-import semmle.code.cpp.rangeanalysis.RangeAnalysisUtils
+import semmle.code.cpp.security.FlowSources as FS
+import semmle.code.cpp.dataflow.new.TaintTracking
+import semmle.code.cpp.rangeanalysis.SimpleRangeAnalysis
 import ImproperArrayIndexValidation::PathGraph
-import semmle.code.cpp.security.Security
 
-predicate hasUpperBound(VariableAccess offsetExpr) {
-  exists(BasicBlock controlled, StackVariable offsetVar, SsaDefinition def |
-    controlled.contains(offsetExpr) and
-    linearBoundControls(controlled, def, offsetVar) and
-    offsetExpr = def.getAUse(offsetVar)
+predicate isFlowSource(FS::FlowSource source, string sourceType) {
+  sourceType = source.getSourceType()
+}
+
+predicate guardChecks(IRGuardCondition g, Expr e, boolean branch) {
+  exists(Operand op | op.getDef().getConvertedResultExpression() = e |
+    // `op < k` is true and `k > 0`
+    g.comparesLt(op, any(int k | k > 0), true, any(BooleanValue bv | bv.getValue() = branch))
+    or
+    // `op < _ + k` is true and `k > 0`.
+    g.comparesLt(op, _, any(int k | k > 0), true, branch)
+    or
+    // op == k
+    g.comparesEq(op, _, true, any(BooleanValue bv | bv.getValue() = branch))
+    or
+    // op == _ + k
+    g.comparesEq(op, _, _, true, branch)
   )
 }
 
-pragma[noinline]
-predicate linearBoundControls(BasicBlock controlled, SsaDefinition def, StackVariable offsetVar) {
-  exists(GuardCondition guard, boolean branch |
-    guard.controls(controlled, branch) and
-    cmpWithLinearBound(guard, def.getAUse(offsetVar), Lesser(), branch)
+/**
+ * Holds if `arrayExpr` accesses an `ArrayType` with a constant size `N`, and
+ * the value of `offsetExpr` is known to be smaller than `N`.
+ */
+predicate offsetIsAlwaysInBounds(ArrayExpr arrayExpr, VariableAccess offsetExpr) {
+  exists(ArrayType arrayType |
+    arrayType = arrayExpr.getArrayBase().getUnspecifiedType() and
+    arrayType.getArraySize() > upperBound(offsetExpr.getFullyConverted())
   )
 }
 
-predicate readsVariable(LoadInstruction load, Variable var) {
-  load.getSourceAddress().(VariableAddressInstruction).getAstVariable() = var
-}
-
-predicate hasUpperBoundsCheck(Variable var) {
-  exists(RelationalOperation oper, VariableAccess access |
-    oper.getAnOperand() = access and
-    access.getTarget() = var and
-    // Comparing to 0 is not an upper bound check
-    not oper.getAnOperand().getValue() = "0"
-  )
-}
-
-predicate nodeIsBarrierEqualityCandidate(DataFlow::Node node, Operand access, Variable checkedVar) {
-  readsVariable(node.asInstruction(), checkedVar) and
-  any(IRGuardCondition guard).ensuresEq(access, _, _, node.asInstruction().getBlock(), true)
-}
-
-predicate isFlowSource(FlowSource source, string sourceType) { sourceType = source.getSourceType() }
-
-predicate predictableInstruction(Instruction instr) {
-  instr instanceof ConstantInstruction
-  or
-  instr instanceof StringConstantInstruction
-  or
-  // This could be a conversion on a string literal
-  predictableInstruction(instr.(UnaryInstruction).getUnary())
-}
-
 module ImproperArrayIndexValidationConfig implements DataFlow::ConfigSig {
   predicate isSource(DataFlow::Node source) { isFlowSource(source, _) }
 
   predicate isBarrier(DataFlow::Node node) {
-    hasUpperBound(node.asExpr())
-    or
-    // These barriers are ported from `DefaultTaintTracking` because this query is quite noisy
-    // otherwise.
-    exists(Variable checkedVar |
-      readsVariable(node.asInstruction(), checkedVar) and
-      hasUpperBoundsCheck(checkedVar)
-    )
-    or
-    exists(Variable checkedVar, Operand access |
-      readsVariable(access.getDef(), checkedVar) and
-      nodeIsBarrierEqualityCandidate(node, access, checkedVar)
-    )
-    or
-    // Don't use dataflow into binary instructions if both operands are unpredictable
-    exists(BinaryInstruction iTo |
-      iTo = node.asInstruction() and
-      not predictableInstruction(iTo.getLeft()) and
-      not predictableInstruction(iTo.getRight()) and
-      // propagate taint from either the pointer or the offset, regardless of predictability
-      not iTo instanceof PointerArithmeticInstruction
-    )
-    or
-    // don't use dataflow through calls to pure functions if two or more operands
-    // are unpredictable
-    exists(Instruction iFrom1, Instruction iFrom2, CallInstruction iTo |
-      iTo = node.asInstruction() and
-      isPureFunction(iTo.getStaticCallTarget().getName()) and
-      iFrom1 = iTo.getAnArgument() and
-      iFrom2 = iTo.getAnArgument() and
-      not predictableInstruction(iFrom1) and
-      not predictableInstruction(iFrom2) and
-      iFrom1 != iFrom2
-    )
+    node = DataFlow::BarrierGuard<guardChecks/3>::getABarrierNode()
   }
 
+  predicate isBarrierOut(DataFlow::Node node) { isSink(node) }
+
   predicate isSink(DataFlow::Node sink) {
     exists(ArrayExpr arrayExpr, VariableAccess offsetExpr |
       offsetExpr = arrayExpr.getArrayOffset() and
       sink.asExpr() = offsetExpr and
-      not hasUpperBound(offsetExpr)
+      not offsetIsAlwaysInBounds(arrayExpr, offsetExpr)
     )
   }
 }
diff --git a/cpp/ql/src/Security/CWE/CWE-704/WcharCharConversion.ql b/cpp/ql/src/Security/CWE/CWE-704/WcharCharConversion.ql
index bfd3324f2a9..e3f15bd12b5 100644
--- a/cpp/ql/src/Security/CWE/CWE-704/WcharCharConversion.ql
+++ b/cpp/ql/src/Security/CWE/CWE-704/WcharCharConversion.ql
@@ -13,23 +13,85 @@
  */
 
 import cpp
+import semmle.code.cpp.controlflow.Guards
 
 class WideCharPointerType extends PointerType {
   WideCharPointerType() { this.getBaseType() instanceof WideCharType }
 }
 
+/**
+ * Given type `t`, recurses through and returns all
+ * intermediate base types, including `t`.
+ */
+Type getABaseType(Type t) {
+  result = t
+  or
+  result = getABaseType(t.(DerivedType).getBaseType())
+  or
+  result = getABaseType(t.(TypedefType).getBaseType())
+}
+
 /**
  * A type that may also be `CharPointerType`, but that are likely used as arbitrary buffers.
  */
 class UnlikelyToBeAStringType extends Type {
   UnlikelyToBeAStringType() {
-    this.(PointerType).getBaseType().(CharType).isUnsigned() or
-    this.(PointerType).getBaseType().getName().toLowerCase().matches("%byte") or
-    this.getName().toLowerCase().matches("%byte") or
-    this.(PointerType).getBaseType().hasName("uint8_t")
+    exists(Type targ | getABaseType(this) = targ |
+      // NOTE: not using CharType isUnsigned, but rather look for any explicitly declared unsigned
+      // char types. Assuming these are used for buffers, not strings.
+      targ.(CharType).getName().toLowerCase().matches("unsigned%") or
+      targ.getName().toLowerCase().matches(["uint8_t", "%byte%"])
+    )
   }
 }
 
+// Types that can be wide depending on the UNICODE macro
+// see https://learn.microsoft.com/en-us/windows/win32/winprog/windows-data-types
+class UnicodeMacroDependentWidthType extends Type {
+  UnicodeMacroDependentWidthType() {
+    exists(Type targ | getABaseType(this) = targ |
+      targ.getName() in [
+          "LPCTSTR",
+          "LPTSTR",
+          "PCTSTR",
+          "PTSTR",
+          "TBYTE",
+          "TCHAR"
+        ]
+    )
+  }
+}
+
+class UnicodeMacro extends Macro {
+  UnicodeMacro() { this.getName().toLowerCase().matches("%unicode%") }
+}
+
+class UnicodeMacroInvocation extends MacroInvocation {
+  UnicodeMacroInvocation() { this.getMacro() instanceof UnicodeMacro }
+}
+
+/**
+ * Holds when a expression whose type is UnicodeMacroDependentWidthType and
+ * is observed to be guarded by a check involving a bitwise-and operation
+ * with a UnicodeMacroInvocation.
+ * Such expressions are assumed to be checked dynamically, i.e.,
+ * the flag would indicate if UNICODE typing is set correctly to allow
+ * or disallow a widening cast.
+ */
+predicate isLikelyDynamicallyChecked(Expr e) {
+  e.getType() instanceof UnicodeMacroDependentWidthType and
+  exists(GuardCondition gc, BitwiseAndExpr bai, UnicodeMacroInvocation umi |
+    bai.getAnOperand() = umi.getExpr()
+  |
+    // bai == 0 is false when reaching `e.getBasicBlock()`.
+    // That is, bai != 0 when reaching `e.getBasicBlock()`.
+    gc.ensuresEq(bai, 0, e.getBasicBlock(), false)
+    or
+    // bai == k and k != 0 is true when reaching `e.getBasicBlock()`.
+    gc.ensuresEq(bai, any(int k | k != 0), e.getBasicBlock(), true)
+  )
+}
+
 from Expr e1, Cast e2
 where
   e2 = e1.getConversion() and
@@ -42,7 +104,11 @@ where
   not e1.getType() instanceof UnlikelyToBeAStringType and
   // Avoid castings from 'new' expressions as typically these will be safe
   // Example: `__Type* ret = reinterpret_cast<__Type*>(New(m_pmo) char[num * sizeof(__Type)]);`
-  not exists(NewOrNewArrayExpr newExpr | newExpr.getAChild*() = e1)
+  not exists(NewOrNewArrayExpr newExpr | newExpr.getAChild*() = e1) and
+  // Avoid cases where the cast is guarded by a check to determine if
+  // unicode encoding is enabled in such a way to disallow the dangerous cast
+  // at runtime.
+  not isLikelyDynamicallyChecked(e1)
 select e1,
   "Conversion from " + e1.getType().toString() + " to " + e2.getType().toString() +
     ". Use of invalid string can lead to undefined behavior."
diff --git a/cpp/ql/src/Telemetry/CompilerErrors.ql b/cpp/ql/src/Telemetry/CompilerErrors.ql
new file mode 100644
index 00000000000..0f5166f9e9f
--- /dev/null
+++ b/cpp/ql/src/Telemetry/CompilerErrors.ql
@@ -0,0 +1,13 @@
+/**
+ * @name Compiler errors
+ * @description A count of all compiler errors, grouped by error text.
+ * @kind metric
+ * @tags summary telemetry
+ * @id cpp/telemetry/compiler-errors
+ */
+
+import Metrics
+
+from CppMetrics::ErrorCount m
+where RankMetric<CppMetrics::ErrorCount>::getRank(m) <= 50
+select m.toString(), m.getValue()
diff --git a/cpp/ql/src/Telemetry/DatabaseQuality.ql b/cpp/ql/src/Telemetry/DatabaseQuality.ql
new file mode 100644
index 00000000000..af8e340507b
--- /dev/null
+++ b/cpp/ql/src/Telemetry/DatabaseQuality.ql
@@ -0,0 +1,12 @@
+/**
+ * @name Database quality
+ * @description Metrics that indicate the quality of the database.
+ * @kind metric
+ * @tags summary telemetry
+ * @id cpp/telemetry/database-quality
+ */
+
+import Metrics
+
+from QualityMetric m
+select m.toString(), m.getValue()
diff --git a/cpp/ql/src/Telemetry/Diagnostics.qll b/cpp/ql/src/Telemetry/Diagnostics.qll
new file mode 100644
index 00000000000..cc7dcb3a36d
--- /dev/null
+++ b/cpp/ql/src/Telemetry/Diagnostics.qll
@@ -0,0 +1,29 @@
+import cpp
+
+/**
+ * A syntax error.
+ */
+class SyntaxError extends CompilerError {
+  SyntaxError() {
+    this.getTag().matches("exp_%") or
+    this.getTag() =
+      [
+        "bad_data_member_initialization", "bad_pure_specifier", "bad_return", "bad_uuid_string",
+        "literal_without_initializer", "missing_class_definition", "missing_exception_declaration",
+        "nonstd_const_member_decl_not_allowed", "operator_name_not_allowed",
+        "wide_string_invalid_in_asm"
+      ]
+  }
+}
+
+/**
+ * A cannot open file error.
+ * Typically this is due to a missing include.
+ */
+class CannotOpenFileError extends CompilerError {
+  CannotOpenFileError() { this.hasTag(["cannot_open_file", "cannot_open_file_reason"]) }
+
+  string getIncludedFile() {
+    result = this.getMessage().regexpCapture("cannot open source file '([^']+)'", 1)
+  }
+}
diff --git a/cpp/ql/src/Telemetry/ExtractionMetrics.ql b/cpp/ql/src/Telemetry/ExtractionMetrics.ql
new file mode 100644
index 00000000000..968bf456ecb
--- /dev/null
+++ b/cpp/ql/src/Telemetry/ExtractionMetrics.ql
@@ -0,0 +1,12 @@
+/**
+ * @name Extraction metrics
+ * @description Raw metrics relating to extraction.
+ * @kind metric
+ * @tags summary telemetry
+ * @id cpp/telemetry/extraction-metrics
+ */
+
+import Metrics
+
+from ExtractionMetric m
+select m.toString(), m.getValue()
diff --git a/cpp/ql/src/Telemetry/Metrics.qll b/cpp/ql/src/Telemetry/Metrics.qll
new file mode 100644
index 00000000000..b3c90af8450
--- /dev/null
+++ b/cpp/ql/src/Telemetry/Metrics.qll
@@ -0,0 +1,269 @@
+import cpp
+import Diagnostics
+
+/**
+ * A metric is a string with a value.
+ */
+abstract class Metric extends string {
+  bindingset[this]
+  Metric() { any() }
+}
+
+/**
+ * A metric that we want to report in cpp/telemetry/extraction-metrics
+ */
+abstract class ExtractionMetric extends Metric {
+  bindingset[this]
+  ExtractionMetric() { any() }
+
+  /** Gets the value of this metric. */
+  abstract int getValue();
+}
+
+/**
+ * A metric that provides a baseline for a SuccessMetric.
+ */
+abstract class BaseMetric extends ExtractionMetric {
+  bindingset[this]
+  BaseMetric() { any() }
+}
+
+/**
+ * A metric that is relative to another metric,
+ * so can be used to calculate percentages.
+ *
+ * For clarity, metrics should express success,
+ * so higher values means better.
+ */
+abstract class SuccessMetric extends ExtractionMetric {
+  bindingset[this]
+  SuccessMetric() { any() }
+
+  /** Gets the metric this is relative to. */
+  abstract BaseMetric getBaseline();
+}
+
+/**
+ * A metric used to report database quality.
+ */
+class QualityMetric extends Metric {
+  BaseMetric baseMetric;
+  SuccessMetric relativeMetric;
+
+  QualityMetric() {
+    baseMetric = relativeMetric.getBaseline() and this = "Percentage of " + relativeMetric
+  }
+
+  float getValue() {
+    baseMetric.getValue() > 0 and
+    result = 100.0 * relativeMetric.getValue() / baseMetric.getValue()
+  }
+}
+
+signature class RankedMetric extends Metric {
+  int getValue();
+}
+
+module RankMetric<RankedMetric M> {
+  int getRank(M s) { s = rank[result](M m | | m order by m.getValue() desc) }
+}
+
+/** Various metrics we want to report. */
+module CppMetrics {
+  class Compilations extends BaseMetric {
+    Compilations() { this = "compilations" }
+
+    override int getValue() { result = count(Compilation c) }
+  }
+
+  class SourceAndHeaderFiles extends BaseMetric {
+    SourceAndHeaderFiles() { this = "source/header files" }
+
+    override int getValue() { result = count(File f | f.fromSource()) }
+  }
+
+  class SourceAndHeaderFilesWithoutErrors extends SuccessMetric {
+    SourceAndHeaderFilesWithoutErrors() { this = "source/header files without errors" }
+
+    override int getValue() {
+      result = count(File f | f.fromSource() and not exists(CompilerError e | f = e.getFile()))
+    }
+
+    override SourceAndHeaderFiles getBaseline() { any() }
+  }
+
+  class CompilationsWithoutErrors extends SuccessMetric {
+    CompilationsWithoutErrors() { this = "compilations without errors" }
+
+    override int getValue() {
+      result = count(Compilation c | not exists(Diagnostic d | d.getFile() = c.getAFileCompiled()))
+    }
+
+    override Compilations getBaseline() { any() }
+  }
+
+  class Expressions extends BaseMetric {
+    Expressions() { this = "expressions" }
+
+    override int getValue() { result = count(Expr e) }
+  }
+
+  class SucceededExpressions extends SuccessMetric {
+    SucceededExpressions() { this = "non-error expressions" }
+
+    override int getValue() { result = count(Expr e) - count(ErrorExpr e) }
+
+    override Expressions getBaseline() { any() }
+  }
+
+  class TypedExpressions extends SuccessMetric {
+    TypedExpressions() { this = "expressions with a known type" }
+
+    override int getValue() { result = count(Expr e | not e.getType() instanceof ErroneousType) }
+
+    override Expressions getBaseline() { any() }
+  }
+
+  class Calls extends BaseMetric {
+    Calls() { this = "calls" }
+
+    override int getValue() { result = count(Call c) }
+  }
+
+  class CallsWithExplicitTarget extends SuccessMetric {
+    CallsWithExplicitTarget() { this = "calls with an explicit target" }
+
+    override int getValue() {
+      result = count(Call c | not c.getTarget().getADeclarationEntry().isImplicit())
+    }
+
+    override Calls getBaseline() { any() }
+  }
+
+  class Variables extends BaseMetric {
+    Variables() { this = "variables" }
+
+    override int getValue() { result = count(Variable v) }
+  }
+
+  class VariablesKnownType extends SuccessMetric {
+    VariablesKnownType() { this = "variables with a known type" }
+
+    override int getValue() {
+      result = count(Variable v | not v.getType() instanceof ErroneousType)
+    }
+
+    override Variables getBaseline() { any() }
+  }
+
+  class LinesOfText extends BaseMetric {
+    LinesOfText() { this = "lines of text" }
+
+    override int getValue() { result = sum(File f | | f.getMetrics().getNumberOfLines()) }
+  }
+
+  class LinesOfCode extends BaseMetric {
+    LinesOfCode() { this = "lines of code" }
+
+    override int getValue() { result = sum(File f | | f.getMetrics().getNumberOfLinesOfCode()) }
+  }
+
+  private predicate errorLine(File file, int line) {
+    exists(Locatable l, Location loc |
+      loc = l.getLocation() and
+      loc.getFile() = file and
+      line in [loc.getStartLine() .. loc.getEndLine()]
+    |
+      l instanceof Diagnostic
+      or
+      l instanceof ErrorExpr
+    )
+  }
+
+  class SucceededLines extends SuccessMetric {
+    SucceededLines() { this = "lines of code without errors" }
+
+    override int getValue() {
+      result =
+        sum(File f | | f.getMetrics().getNumberOfLinesOfCode()) -
+          count(File f, int line | errorLine(f, line))
+    }
+
+    override LinesOfCode getBaseline() { any() }
+  }
+
+  class Functions extends BaseMetric {
+    Functions() { this = "functions" }
+
+    override int getValue() { result = count(Function f) }
+  }
+
+  class SucceededFunctions extends SuccessMetric {
+    SucceededFunctions() { this = "functions without errors" }
+
+    override int getValue() { result = count(Function f | not f.hasErrors()) }
+
+    override Functions getBaseline() { any() }
+  }
+
+  class Includes extends BaseMetric {
+    Includes() { this = "#include directives" }
+
+    override int getValue() { result = count(Include i) + count(CannotOpenFileError e) }
+  }
+
+  class SucceededIncludes extends SuccessMetric {
+    SucceededIncludes() { this = "successfully resolved #include directives" }
+
+    override int getValue() { result = count(Include i) }
+
+    override Includes getBaseline() { any() }
+  }
+
+  class SucceededIncludeCount extends Metric {
+    string includeText;
+
+    SucceededIncludeCount() {
+      exists(Include i |
+        i.getIncludeText() = includeText and
+        exists(i.getFile().getRelativePath()) // Only report includes from the repo
+      ) and
+      this = "Successfully included " + includeText
+    }
+
+    int getValue() { result = count(Include i | i.getIncludeText() = includeText) }
+
+    string getIncludeText() { result = includeText }
+  }
+
+  class MissingIncludeCount extends Metric {
+    string includeText;
+
+    MissingIncludeCount() {
+      exists(CannotOpenFileError e | e.getIncludedFile() = includeText) and
+      this = "Failed to include '" + includeText + "'"
+    }
+
+    int getValue() { result = count(CannotOpenFileError e | e.getIncludedFile() = includeText) }
+
+    string getIncludeText() { result = includeText }
+  }
+
+  class CompilerErrors extends ExtractionMetric {
+    CompilerErrors() { this = "compiler errors" }
+
+    override int getValue() { result = count(CompilerError e) }
+  }
+
+  class ErrorCount extends Metric {
+    ErrorCount() { exists(CompilerError e | e.getMessage() = this) }
+
+    int getValue() { result = count(CompilerError e | e.getMessage() = this) }
+  }
+
+  class SyntaxErrorCount extends ExtractionMetric {
+    SyntaxErrorCount() { this = "syntax errors" }
+
+    override int getValue() { result = count(SyntaxError e) }
+  }
+}
diff --git a/cpp/ql/src/Telemetry/MissingIncludes.ql b/cpp/ql/src/Telemetry/MissingIncludes.ql
new file mode 100644
index 00000000000..6ff58729dd2
--- /dev/null
+++ b/cpp/ql/src/Telemetry/MissingIncludes.ql
@@ -0,0 +1,13 @@
+/**
+ * @name Failed to include header file
+ * @description A count of all failed includes, grouped by filename.
+ * @kind metric
+ * @tags summary telemetry
+ * @id cpp/telemetry/failed-includes
+ */
+
+import Metrics
+
+from CppMetrics::MissingIncludeCount e
+where RankMetric<CppMetrics::MissingIncludeCount>::getRank(e) <= 50
+select e.getIncludeText(), e.getValue()
diff --git a/cpp/ql/src/Telemetry/SucceededIncludes.ql b/cpp/ql/src/Telemetry/SucceededIncludes.ql
new file mode 100644
index 00000000000..aa08acd9fdb
--- /dev/null
+++ b/cpp/ql/src/Telemetry/SucceededIncludes.ql
@@ -0,0 +1,13 @@
+/**
+ * @name Successfully included header files
+ * @description A count of all succeeded includes, grouped by filename.
+ * @kind metric
+ * @tags summary telemetry
+ * @id cpp/telemetry/succeeded-includes
+ */
+
+import Metrics
+
+from CppMetrics::SucceededIncludeCount m
+where RankMetric<CppMetrics::SucceededIncludeCount>::getRank(m) <= 50
+select m.getIncludeText(), m.getValue()
diff --git a/cpp/ql/src/change-notes/released/1.2.4.md b/cpp/ql/src/change-notes/released/1.2.4.md
new file mode 100644
index 00000000000..a603dc14047
--- /dev/null
+++ b/cpp/ql/src/change-notes/released/1.2.4.md
@@ -0,0 +1,5 @@
+## 1.2.4
+
+### Minor Analysis Improvements
+
+* Fixed false positives in the `cpp/wrong-number-format-arguments` ("Too few arguments to formatting function") query when the formatting function has been declared implicitly.
diff --git a/cpp/ql/src/change-notes/released/1.2.5.md b/cpp/ql/src/change-notes/released/1.2.5.md
new file mode 100644
index 00000000000..04aead25cb9
--- /dev/null
+++ b/cpp/ql/src/change-notes/released/1.2.5.md
@@ -0,0 +1,8 @@
+## 1.2.5
+
+### Minor Analysis Improvements
+
+* The `cpp/unclear-array-index-validation` ("Unclear validation of array index") query has been improved to reduce false positives and increase true positives.
+* Fixed false positives in the `cpp/uninitialized-local` ("Potentially uninitialized local variable") query if there are extraction errors in the function.
+* The `cpp/incorrect-string-type-conversion` query now produces fewer false positives caused by failure to detect byte arrays.
+* The `cpp/incorrect-string-type-conversion` query now produces fewer false positives caused by failure to recognize dynamic checks prior to possible dangerous widening.
diff --git a/cpp/ql/src/change-notes/released/1.2.6.md b/cpp/ql/src/change-notes/released/1.2.6.md
new file mode 100644
index 00000000000..0ef6528188a
--- /dev/null
+++ b/cpp/ql/src/change-notes/released/1.2.6.md
@@ -0,0 +1,5 @@
+## 1.2.6
+
+### Minor Analysis Improvements
+
+* Remove results from the `cpp/wrong-type-format-argument` ("Wrong type of arguments to formatting function") query if the argument is the return value of an implicitly declared function.
diff --git a/cpp/ql/src/codeql-pack.release.yml b/cpp/ql/src/codeql-pack.release.yml
index 09a7400b594..24962f7ba24 100644
--- a/cpp/ql/src/codeql-pack.release.yml
+++ b/cpp/ql/src/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.2.3
+lastReleaseVersion: 1.2.6
diff --git a/cpp/ql/src/experimental/Security/CWE/CWE-295/CurlSSL.qhelp b/cpp/ql/src/experimental/Security/CWE/CWE-295/CurlSSL.qhelp
new file mode 100644
index 00000000000..2e17f99f45d
--- /dev/null
+++ b/cpp/ql/src/experimental/Security/CWE/CWE-295/CurlSSL.qhelp
@@ -0,0 +1,34 @@
+<!DOCTYPE qhelp PUBLIC "-//Semmle//qhelp//EN" "qhelp.dtd">
+<qhelp>
+  <overview>
+    <p>
+      Disabling verification of the SSL certificate allows man-in-the-middle attacks. A SSL
+      connection is vulnerable to man-in-the-middle attacks if the certification is not checked
+      properly. If the peer or the host's certificate verification is not verified, the underlying
+      SSL communication is insecure.</p>
+  </overview>
+  <recommendation>
+    <p>It is recommended that all communications be done post verification of the host as well as
+      the
+      peer.</p>
+  </recommendation>
+  <example>
+    <p>The following snippet disables certification verification by setting the value of <code>
+      CURLOPT_SSL_VERIFYHOST</code> and <code>CURLOPT_SSL_VERIFYHOST</code> to <code>0</code>:</p>
+    <sample src="CurlSSLBad.cpp" />
+    <p>This is bad as the certificates are not verified any more. This can be easily fixed by
+      setting the values of the options to <code>2</code>. </p>
+    <sample src="CurlSSLGood.cpp" />
+  </example>
+  <references>
+    <li> Curl Documentation:<a href="https://curl.se/libcurl/c/CURLOPT_SSL_VERIFYHOST.html">
+      CURLOPT_SSL_VERIFYHOST</a></li>
+    <li> Curl Documentation:<a href="https://curl.se/libcurl/c/CURLOPT_SSL_VERIFYPEER.html">
+      CURLOPT_SSL_VERIFYPEER</a></li>
+    <li> Related CVE: <a href="https://github.com/advisories/GHSA-5r3h-c3r7-9w4h"> CVE-2022-33684</a></li>
+    <li> Related security advisory: <a
+        href="https://huntr.com/bounties/42325662-6329-4e04-875a-49e2f5d69f78">
+      openframeworks/openframeworks
+      </a></li>
+  </references>
+</qhelp>
\ No newline at end of file
diff --git a/cpp/ql/src/experimental/Security/CWE/CWE-295/CurlSSL.ql b/cpp/ql/src/experimental/Security/CWE/CWE-295/CurlSSL.ql
new file mode 100644
index 00000000000..f6cdaf3e9fc
--- /dev/null
+++ b/cpp/ql/src/experimental/Security/CWE/CWE-295/CurlSSL.ql
@@ -0,0 +1,39 @@
+/**
+ * @name Disabled certifcate verification
+ * @description Disabling SSL certificate verification of host or peer could expose the communication to man-in-the-middle(MITM) attacks.
+ * @kind problem
+ * @problem.severity warning
+ * @id cpp/curl-disabled-ssl
+ * @tags security
+ *       external/cwe/cwe-295
+ */
+
+import cpp
+import semmle.code.cpp.dataflow.new.TaintTracking
+
+/** Models the `curl_easy_setopt` function call */
+private class CurlSetOptCall extends FunctionCall {
+  CurlSetOptCall() {
+    exists(FunctionCall fc, Function f |
+      f.hasGlobalOrStdName("curl_easy_setopt") and
+      fc.getTarget() = f
+    |
+      this = fc
+    )
+  }
+}
+
+/** Models an access to any enum constant which could affect SSL verification */
+private class CurlVerificationConstant extends EnumConstantAccess {
+  CurlVerificationConstant() {
+    exists(EnumConstant e | e.getName() = ["CURLOPT_SSL_VERIFYHOST", "CURLOPT_SSL_VERIFYPEER"] |
+      e.getAnAccess() = this
+    )
+  }
+}
+
+from CurlSetOptCall c
+where
+  c.getArgument(1) = any(CurlVerificationConstant v) and
+  c.getArgument(2).getValue() = "0"
+select c, "This call disables Secure Socket Layer and could potentially lead to MITM attacks"
diff --git a/cpp/ql/src/experimental/Security/CWE/CWE-295/CurlSSLBad.cpp b/cpp/ql/src/experimental/Security/CWE/CWE-295/CurlSSLBad.cpp
new file mode 100644
index 00000000000..a09e490d73b
--- /dev/null
+++ b/cpp/ql/src/experimental/Security/CWE/CWE-295/CurlSSLBad.cpp
@@ -0,0 +1,9 @@
+string host = "codeql.com"
+void bad(void) {
+	std::unique_ptr<CURL, void(*)(CURL*)> curl =
+		std::unique_ptr<CURL, void(*)(CURL*)>(curl_easy_init(), curl_easy_cleanup);
+	curl_easy_setopt(curl.get(), CURLOPT_SSL_VERIFYPEER, 0);
+	curl_easy_setopt(curl.get(), CURLOPT_SSL_VERIFYHOST, 0); 
+  	curl_easy_setopt(curl.get(), CURLOPT_URL, host.c_str());
+  	curl_easy_perform(curl.get());
+}
\ No newline at end of file
diff --git a/cpp/ql/src/experimental/Security/CWE/CWE-295/CurlSSLGood.cpp b/cpp/ql/src/experimental/Security/CWE/CWE-295/CurlSSLGood.cpp
new file mode 100644
index 00000000000..bafead50d5e
--- /dev/null
+++ b/cpp/ql/src/experimental/Security/CWE/CWE-295/CurlSSLGood.cpp
@@ -0,0 +1,9 @@
+string host = "codeql.com"
+void good(void) {
+	std::unique_ptr<CURL, void(*)(CURL*)> curl =
+		std::unique_ptr<CURL, void(*)(CURL*)>(curl_easy_init(), curl_easy_cleanup);
+	curl_easy_setopt(curl.get(), CURLOPT_SSL_VERIFYPEER, 2);
+	curl_easy_setopt(curl.get(), CURLOPT_SSL_VERIFYHOST, 2); 
+  	curl_easy_setopt(curl.get(), CURLOPT_URL, host.c_str());
+  	curl_easy_perform(curl.get());
+}
\ No newline at end of file
diff --git a/cpp/ql/src/jsf/4.13 Functions/AV Rule 114.ql b/cpp/ql/src/jsf/4.13 Functions/AV Rule 114.ql
index ac5db25ea6b..9027c064ac6 100644
--- a/cpp/ql/src/jsf/4.13 Functions/AV Rule 114.ql	
+++ b/cpp/ql/src/jsf/4.13 Functions/AV Rule 114.ql	
@@ -49,7 +49,7 @@ predicate functionsMissingReturnStmt(Function f, ControlFlowNode blame) {
 predicate functionImperfectlyExtracted(Function f) {
   exists(CompilerError e | f.getBlock().getLocation().subsumes(e.getLocation()))
   or
-  exists(ErrorExpr ee | ee.getEnclosingFunction() = f)
+  f.hasErrors()
   or
   count(f.getType()) > 1
   or
diff --git a/cpp/ql/src/qlpack.yml b/cpp/ql/src/qlpack.yml
index 0715feb8e01..7059965615a 100644
--- a/cpp/ql/src/qlpack.yml
+++ b/cpp/ql/src/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/cpp-queries
-version: 1.2.4-dev
+version: 1.2.7-dev
 groups:
   - cpp
   - queries
diff --git a/cpp/ql/test/TestUtilities/InlineExpectationsTest.qll b/cpp/ql/test/TestUtilities/InlineExpectationsTest.qll
index 9f839de821b..5d74a9da2c2 100644
--- a/cpp/ql/test/TestUtilities/InlineExpectationsTest.qll
+++ b/cpp/ql/test/TestUtilities/InlineExpectationsTest.qll
@@ -5,31 +5,5 @@
 
 import cpp as C
 private import codeql.util.test.InlineExpectationsTest
-
-private module Impl implements InlineExpectationsTestSig {
-  private newtype TExpectationComment = MkExpectationComment(C::CppStyleComment c)
-
-  /**
-   * A class representing a line comment in the CPP style.
-   * Unlike the `CppStyleComment` class, however, the string returned by `getContents` does _not_
-   * include the preceding comment marker (`//`).
-   */
-  class ExpectationComment extends TExpectationComment {
-    C::CppStyleComment comment;
-
-    ExpectationComment() { this = MkExpectationComment(comment) }
-
-    /** Returns the contents of the given comment, _without_ the preceding comment marker (`//`). */
-    string getContents() { result = comment.getContents().suffix(2) }
-
-    /** Gets a textual representation of this element. */
-    string toString() { result = comment.toString() }
-
-    /** Gets the location of this comment. */
-    Location getLocation() { result = comment.getLocation() }
-  }
-
-  class Location = C::Location;
-}
-
+private import internal.InlineExpectationsTestImpl
 import Make<Impl>
diff --git a/cpp/ql/test/TestUtilities/InlineExpectationsTestQuery.ql b/cpp/ql/test/TestUtilities/InlineExpectationsTestQuery.ql
new file mode 100644
index 00000000000..8e6977ba532
--- /dev/null
+++ b/cpp/ql/test/TestUtilities/InlineExpectationsTestQuery.ql
@@ -0,0 +1,21 @@
+/**
+ * @kind test-postprocess
+ */
+
+private import cpp
+private import codeql.util.test.InlineExpectationsTest as T
+private import internal.InlineExpectationsTestImpl
+import T::TestPostProcessing
+import T::TestPostProcessing::Make<Impl, Input>
+
+private module Input implements T::TestPostProcessing::InputSig<Impl> {
+  string getRelativeUrl(Location location) {
+    exists(File f, int startline, int startcolumn, int endline, int endcolumn |
+      location.hasLocationInfo(_, startline, startcolumn, endline, endcolumn) and
+      f = location.getFile()
+    |
+      result =
+        f.getRelativePath() + ":" + startline + ":" + startcolumn + ":" + endline + ":" + endcolumn
+    )
+  }
+}
diff --git a/cpp/ql/test/TestUtilities/internal/InlineExpectationsTestImpl.qll b/cpp/ql/test/TestUtilities/internal/InlineExpectationsTestImpl.qll
new file mode 100644
index 00000000000..d2c8efbf316
--- /dev/null
+++ b/cpp/ql/test/TestUtilities/internal/InlineExpectationsTestImpl.qll
@@ -0,0 +1,28 @@
+import cpp as C
+private import codeql.util.test.InlineExpectationsTest
+
+module Impl implements InlineExpectationsTestSig {
+  private newtype TExpectationComment = MkExpectationComment(C::CppStyleComment c)
+
+  /**
+   * A class representing a line comment in the CPP style.
+   * Unlike the `CppStyleComment` class, however, the string returned by `getContents` does _not_
+   * include the preceding comment marker (`//`).
+   */
+  class ExpectationComment extends TExpectationComment {
+    C::CppStyleComment comment;
+
+    ExpectationComment() { this = MkExpectationComment(comment) }
+
+    /** Returns the contents of the given comment, _without_ the preceding comment marker (`//`). */
+    string getContents() { result = comment.getContents().suffix(2) }
+
+    /** Gets a textual representation of this element. */
+    string toString() { result = comment.toString() }
+
+    /** Gets the location of this comment. */
+    Location getLocation() { result = comment.getLocation() }
+  }
+
+  class Location = C::Location;
+}
diff --git a/cpp/ql/test/examples/expressions/PrintAST.expected b/cpp/ql/test/examples/expressions/PrintAST.expected
index 7de95cb8b4a..e8e753becb5 100644
--- a/cpp/ql/test/examples/expressions/PrintAST.expected
+++ b/cpp/ql/test/examples/expressions/PrintAST.expected
@@ -870,6 +870,8 @@ Throw.cpp:
 #    8|               Type = [BoolType] bool
 #    8|               ValueCategory = prvalue
 #   12|       getChild(1): [Handler] <handler>
+#   12|         getParameter(): [Parameter] e
+#   12|             Type = [PointerType] E *
 #   12|         getBlock(): [CatchBlock] { ... }
 #   13|           getStmt(0): [ExprStmt] ExprStmt
 #   13|             getExpr(): [ReThrowExpr] re-throw exception 
diff --git a/cpp/ql/test/experimental/library-tests/rangeanalysis/rangeanalysis/RangeAnalysis.expected b/cpp/ql/test/experimental/library-tests/rangeanalysis/rangeanalysis/RangeAnalysis.expected
index 106313c8707..15125038d19 100644
--- a/cpp/ql/test/experimental/library-tests/rangeanalysis/rangeanalysis/RangeAnalysis.expected
+++ b/cpp/ql/test/experimental/library-tests/rangeanalysis/rangeanalysis/RangeAnalysis.expected
@@ -17,6 +17,7 @@
 | test.cpp:49:12:49:12 | Load: x | test.cpp:46:22:46:22 | ValueNumberBound | -1 | true | CompareLT: ... < ... | test.cpp:48:9:48:13 | test.cpp:48:9:48:13 |
 | test.cpp:49:12:49:12 | Load: x | test.cpp:46:29:46:29 | ValueNumberBound | -2 | true | CompareLT: ... < ... | test.cpp:48:9:48:13 | test.cpp:48:9:48:13 |
 | test.cpp:54:12:54:12 | Load: x | test.cpp:46:22:46:22 | ValueNumberBound | -1 | true | CompareLT: ... < ... | test.cpp:52:7:52:11 | test.cpp:52:7:52:11 |
+| test.cpp:54:12:54:12 | Load: x | test.cpp:46:29:46:29 | ValueNumberBound | -2 | true | CompareLT: ... < ... | test.cpp:52:7:52:11 | test.cpp:52:7:52:11 |
 | test.cpp:62:10:62:13 | Load: iter | test.cpp:60:17:60:17 | ValueNumberBound | 0 | false | NoReason | file://:0:0:0:0 | file://:0:0:0:0 |
 | test.cpp:62:10:62:13 | Load: iter | test.cpp:60:17:60:17 | ValueNumberBound | 3 | true | CompareLT: ... < ... | test.cpp:61:32:61:51 | test.cpp:61:32:61:51 |
 | test.cpp:62:10:62:13 | Load: iter | test.cpp:61:39:61:51 | ValueNumberBound | -1 | true | CompareLT: ... < ... | test.cpp:61:32:61:51 | test.cpp:61:32:61:51 |
diff --git a/cpp/ql/test/experimental/library-tests/rangeanalysis/rangeanalysis/test.cpp b/cpp/ql/test/experimental/library-tests/rangeanalysis/rangeanalysis/test.cpp
index 87653c2fa43..6b241fc42f7 100644
--- a/cpp/ql/test/experimental/library-tests/rangeanalysis/rangeanalysis/test.cpp
+++ b/cpp/ql/test/experimental/library-tests/rangeanalysis/rangeanalysis/test.cpp
@@ -51,7 +51,7 @@ int test5(int x, int y, int z) {
   }
   if (x < y) {
     if (y < z) {
-      sink(x); // x < z is not inferred here
+      sink(x); // x < z is inferred here
     }
   }
 }
diff --git a/cpp/ql/test/experimental/query-tests/Best Practices/GuardedFree/GuardedFree.expected b/cpp/ql/test/experimental/query-tests/Best Practices/GuardedFree/GuardedFree.expected
new file mode 100644
index 00000000000..209bae407b8
--- /dev/null
+++ b/cpp/ql/test/experimental/query-tests/Best Practices/GuardedFree/GuardedFree.expected	
@@ -0,0 +1,10 @@
+| test.cpp:5:7:5:7 | x | unnecessary NULL check before call to $@ | test.cpp:6:5:6:8 | call to free | free |
+| test.cpp:23:7:23:7 | x | unnecessary NULL check before call to $@ | test.cpp:26:5:26:8 | call to free | free |
+| test.cpp:31:7:31:8 | ! ... | unnecessary NULL check before call to $@ | test.cpp:35:3:35:6 | call to free | free |
+| test.cpp:31:7:31:24 | ... \|\| ... | unnecessary NULL check before call to $@ | test.cpp:35:3:35:6 | call to free | free |
+| test.cpp:31:8:31:8 | x | unnecessary NULL check before call to $@ | test.cpp:35:3:35:6 | call to free | free |
+| test.cpp:94:12:94:12 | x | unnecessary NULL check before call to $@ | test.cpp:94:3:94:13 | call to free | free |
+| test.cpp:98:7:98:8 | ! ... | unnecessary NULL check before call to $@ | test.cpp:101:3:101:6 | call to free | free |
+| test.cpp:98:8:98:8 | x | unnecessary NULL check before call to $@ | test.cpp:101:3:101:6 | call to free | free |
+| test.cpp:106:7:106:18 | ... != ... | unnecessary NULL check before call to $@ | test.cpp:107:5:107:8 | call to free | free |
+| test.cpp:113:7:113:18 | ... != ... | unnecessary NULL check before call to $@ | test.cpp:114:17:114:20 | call to free | free |
diff --git a/cpp/ql/test/experimental/query-tests/Best Practices/GuardedFree/GuardedFree.qlref b/cpp/ql/test/experimental/query-tests/Best Practices/GuardedFree/GuardedFree.qlref
new file mode 100644
index 00000000000..e28bdae3991
--- /dev/null
+++ b/cpp/ql/test/experimental/query-tests/Best Practices/GuardedFree/GuardedFree.qlref	
@@ -0,0 +1 @@
+experimental/Best Practices/GuardedFree.ql
diff --git a/cpp/ql/test/experimental/query-tests/Best Practices/GuardedFree/test.cpp b/cpp/ql/test/experimental/query-tests/Best Practices/GuardedFree/test.cpp
new file mode 100644
index 00000000000..12b1fb2364e
--- /dev/null
+++ b/cpp/ql/test/experimental/query-tests/Best Practices/GuardedFree/test.cpp	
@@ -0,0 +1,115 @@
+extern "C" void free(void *ptr);
+extern "C" int strcmp(const char *s1, const char *s2);
+
+void test0(int *x) {
+  if (x) // BAD
+    free(x);
+}
+
+void test1(int *x) {
+  if (x) { // BAD
+    free(x);
+  }
+}
+
+void test2(int *x) {
+  if (x) { // GOOD: x is being accessed in the body of the if
+    *x = 42;
+    free(x);
+  }
+}
+
+void test3(int *x, bool b) {
+  if (x) { // GOOD [FALSE POSITIVE]: x is being accessed in the body of the if
+    if (b)
+      *x = 42;
+    free(x);
+  }
+}
+
+bool test4(char *x, char *y) {
+  if (!x || strcmp(x, y)) { // GOOD [FALSE POSITIVE]: x is being accessed in the guard and return value depends on x
+    free(x);
+    return true;
+  }
+  free(x);
+  return false;
+}
+
+void test5(char *x) {
+  if (x)
+    *x = 42;
+  if (x) { // BAD
+    free(x);
+  }
+}
+
+void test6(char *x) {
+  *x = 42;
+  if (x) { // BAD
+    free(x);
+  }
+}
+
+void test7(char *x) {
+  if (x || x) { // BAD [NOT DETECTED]
+    free(x);
+  }
+}
+
+bool test8(char *x) {
+  if (x) { // GOOD: return value depends on x
+    free(x);
+    return true;
+  }
+  return false;
+}
+
+#ifdef FOO
+#define my_free(x) free(x - 1)
+#else
+#define my_free(x) free(x)
+#endif
+
+void test9(char *x) {
+  if (x) { // GOOD: macro may make free behave unexpectedly when compiled differently
+    my_free(x);
+  }
+}
+
+void test10(char *x) {
+  if (x) { // GOOD: #ifdef may make free behave unexpectedly when compiled differently
+#ifdef FOO
+    free(x - 1);
+#else
+    free(x);
+#endif
+  }
+}
+
+#define TRY_FREE(x) \
+  if (x) free(x);
+
+void test11(char *x) {
+  TRY_FREE(x) // BAD
+}
+
+bool test12(char *x) {
+  if (!x) // GOOD [FALSE POSITIVE]: return value depends on x
+    return false;
+
+  free(x);
+  return true;
+}
+
+void test13(char *x) {
+  if (x != nullptr) // BAD
+    free(x);
+}
+
+void inspect(char *x);
+
+void test14(char *x) {
+  if (x != nullptr) // GOOD [FALSE POSITIVE]: x might be accessed in the first operand of the comma operator
+    inspect(x), free(x);
+}
diff --git a/cpp/ql/test/experimental/query-tests/Security/CWE/CWE-125/semmle/tests/test.cpp b/cpp/ql/test/experimental/query-tests/Security/CWE/CWE-125/semmle/tests/test.cpp
index b5e8096af2a..b4f0830039d 100644
--- a/cpp/ql/test/experimental/query-tests/Security/CWE/CWE-125/semmle/tests/test.cpp
+++ b/cpp/ql/test/experimental/query-tests/Security/CWE/CWE-125/semmle/tests/test.cpp
@@ -6,7 +6,7 @@ int wprintf (const wchar_t* format, ...);
 int strlen( const char * string );
 int checkErrors();
 
-void goodTest0()
+static void goodTest0()
 {
   char * ptr = "123456789";
   int ret;
@@ -17,7 +17,7 @@ void goodTest0()
     ptr += ret;
   }
 }
-void goodTest1(const char* ptr)
+static void goodTest1(const char* ptr)
 {
   int ret;
   int len;
@@ -27,7 +27,7 @@ void goodTest1(const char* ptr)
     ptr += ret;
   }
 }
-void goodTest2(char* ptr)
+static void goodTest2(char* ptr)
 {
   int ret;
   ptr[10]=0;
@@ -38,7 +38,7 @@ void goodTest2(char* ptr)
   }
 }
 
-void goodTest3(const char* ptr)
+static void goodTest3(const char* ptr)
 {
   int ret;
   int len;
@@ -48,7 +48,7 @@ void goodTest3(const char* ptr)
     ptr += ret;
   }
 }
-void goodTest4(const char* ptr)
+static void goodTest4(const char* ptr)
 {
   int ret;
   int len;
@@ -58,7 +58,7 @@ void goodTest4(const char* ptr)
     ptr += ret;
   }
 }
-void badTest1(const char* ptr)
+static void badTest1(const char* ptr)
 {
   int ret;
   int len;
@@ -68,7 +68,7 @@ void badTest1(const char* ptr)
     ptr += ret;
   }
 }
-void badTest2(const char* ptr)
+static void badTest2(const char* ptr)
 {
   int ret;
   int len;
@@ -79,7 +79,7 @@ void badTest2(const char* ptr)
   }
 }
 
-void goodTest5(const char* ptr,wchar_t *wc,int wc_len)
+static void goodTest5(const char* ptr,wchar_t *wc,int wc_len)
 {
   int ret;
   int len;
@@ -96,7 +96,7 @@ void goodTest5(const char* ptr,wchar_t *wc,int wc_len)
   }
 }
 
-void badTest3(const char* ptr,int wc_len)
+static void badTest3(const char* ptr,int wc_len)
 {
   int ret;
   int len;
@@ -113,7 +113,7 @@ void badTest3(const char* ptr,int wc_len)
     wc++;
   }
 }
-void badTest4(const char* ptr,int wc_len)
+static void badTest4(const char* ptr,int wc_len)
 {
   int ret;
   int len;
@@ -130,7 +130,7 @@ void badTest4(const char* ptr,int wc_len)
     wc++;
   }
 }
-void badTest5(const char* ptr,int wc_len)
+static void badTest5(const char* ptr,int wc_len)
 {
   int ret;
   int len;
@@ -148,7 +148,7 @@ void badTest5(const char* ptr,int wc_len)
   }
 }
 
-void badTest6(const char* ptr,int wc_len)
+static void badTest6(const char* ptr,int wc_len)
 {
   int ret;
   int len;
@@ -171,7 +171,7 @@ void badTest6(const char* ptr,int wc_len)
     ptr+=ret;
   }
 }
-void badTest7(const char* ptr,int wc_len)
+static void badTest7(const char* ptr,int wc_len)
 {
   int ret;
   int len;
@@ -188,7 +188,7 @@ void badTest7(const char* ptr,int wc_len)
     ptr+=ret;
   }
 }
-void badTest8(const char* ptr,wchar_t *wc)
+static void badTest8(const char* ptr,wchar_t *wc)
 {
   int ret;
   int len;
diff --git a/cpp/ql/test/experimental/query-tests/Security/CWE/CWE-125/semmle/tests/test1.cpp b/cpp/ql/test/experimental/query-tests/Security/CWE/CWE-125/semmle/tests/test1.cpp
index 828b91a44f1..d66f36d38b9 100644
--- a/cpp/ql/test/experimental/query-tests/Security/CWE/CWE-125/semmle/tests/test1.cpp
+++ b/cpp/ql/test/experimental/query-tests/Security/CWE/CWE-125/semmle/tests/test1.cpp
@@ -24,7 +24,7 @@ typedef unsigned int size_t;
 void* calloc (size_t num, size_t size);
 void* malloc (size_t size);
 
-void badTest1(void *src,  int size) {
+static void badTest1(void *src,  int size) {
     WideCharToMultiByte(CP_ACP, 0, (LPCWSTR)src, -1, (LPSTR)src, size, 0, 0); // BAD
     MultiByteToWideChar(CP_ACP, 0, (LPCSTR)src, -1, (LPCWSTR)src, 30); // BAD
 }
@@ -39,43 +39,43 @@ void goodTest2(){
   }
   printf("%s\n", dst);
 }
-void badTest2(){
+static void badTest2(){
   wchar_t src[] = L"0123456789ABCDEF";
   char dst[16];
   WideCharToMultiByte(CP_UTF8, 0, src, -1, dst, 16, NULL, NULL); // BAD
   printf("%s\n", dst);
 }
-void goodTest3(){
+static void goodTest3(){
   char src[] = "0123456789ABCDEF";
   int size = MultiByteToWideChar(CP_UTF8, 0, src,sizeof(src),NULL,0);
   wchar_t * dst = (wchar_t*)calloc(size + 1, sizeof(wchar_t));
   MultiByteToWideChar(CP_UTF8, 0, src, -1, dst, size+1); // GOOD
 }
-void badTest3(){
+static void badTest3(){
   char src[] = "0123456789ABCDEF";
   int size = MultiByteToWideChar(CP_UTF8, 0, src,sizeof(src),NULL,0);
   wchar_t * dst = (wchar_t*)calloc(size + 1, 1);
   MultiByteToWideChar(CP_UTF8, 0, src, -1, dst, size+1); // BAD
 }
-void goodTest4(){
+static void goodTest4(){
   char src[] = "0123456789ABCDEF";
   int size = MultiByteToWideChar(CP_UTF8, 0, src,sizeof(src),NULL,0);
   wchar_t * dst = (wchar_t*)malloc((size + 1)*sizeof(wchar_t));
   MultiByteToWideChar(CP_UTF8, 0, src, -1, dst, size+1); // GOOD
 }
-void badTest4(){
+static void badTest4(){
   char src[] = "0123456789ABCDEF";
   int size = MultiByteToWideChar(CP_UTF8, 0, src,sizeof(src),NULL,0);
   wchar_t * dst = (wchar_t*)malloc(size + 1);
   MultiByteToWideChar(CP_UTF8, 0, src, -1, dst, size+1); // BAD
 }
-int goodTest5(void *src){
+static int goodTest5(void *src){
   return WideCharToMultiByte(CP_ACP, 0, (LPCWSTR)src, -1, 0, 0, 0, 0); // GOOD
 }
-int badTest5 (void *src) {
+static int badTest5 (void *src) {
   return WideCharToMultiByte(CP_ACP, 0, (LPCWSTR)src, -1, 0, 3, 0, 0);  // BAD
 }
-void goodTest6(WCHAR *src)
+static void goodTest6(WCHAR *src)
 {
   int size;
   char dst[5] ="";
@@ -87,7 +87,7 @@ void goodTest6(WCHAR *src)
   WideCharToMultiByte(CP_ACP, 0, src, -1, dst, sizeof(dst), 0, 0); // GOOD
   printf("%s\n", dst);
 }
-void badTest6(WCHAR *src)
+static void badTest6(WCHAR *src)
 {
     char dst[5] ="";
     WideCharToMultiByte(CP_ACP, 0, src, -1, dst, 260, 0, 0); // BAD
diff --git a/cpp/ql/test/experimental/query-tests/Security/CWE/CWE-125/semmle/tests/test2.cpp b/cpp/ql/test/experimental/query-tests/Security/CWE/CWE-125/semmle/tests/test2.cpp
index 99dc3e47e5b..65e5a9ee275 100644
--- a/cpp/ql/test/experimental/query-tests/Security/CWE/CWE-125/semmle/tests/test2.cpp
+++ b/cpp/ql/test/experimental/query-tests/Security/CWE/CWE-125/semmle/tests/test2.cpp
@@ -11,14 +11,14 @@ size_t _mbstowcs_l(wchar_t *wcstr,const char *mbstr,size_t count, _locale_t loca
 size_t mbsrtowcs(wchar_t *wcstr,const char *mbstr,size_t count, mbstate_t *mbstate);
 
 
-void badTest1(void *src,  int size) {
+static void badTest1(void *src,  int size) {
     mbstowcs((wchar_t*)src,(char*)src,size); // BAD
     _locale_t locale;
     _mbstowcs_l((wchar_t*)src,(char*)src,size,locale); // BAD
     mbstate_t *mbstate;
     mbsrtowcs((wchar_t*)src,(char*)src,size,mbstate); // BAD
 }
-void goodTest2(){
+static void goodTest2(){
   char src[] = "0123456789ABCDEF";
   wchar_t dst[16];
   int res = mbstowcs(dst, src,16); // GOOD
@@ -29,43 +29,43 @@ void goodTest2(){
   }
   printf("%s\n", dst);
 }
-void badTest2(){
+static void badTest2(){
   char src[] = "0123456789ABCDEF";
   wchar_t dst[16];
   mbstowcs(dst, src,16); // BAD
   printf("%s\n", dst);
 }
-void goodTest3(){
+static void goodTest3(){
   char src[] = "0123456789ABCDEF";
   int size = mbstowcs(NULL, src,NULL);
   wchar_t * dst = (wchar_t*)calloc(size + 1, sizeof(wchar_t));
   mbstowcs(dst, src,size+1); // GOOD
 }
-void badTest3(){
+static void badTest3(){
   char src[] = "0123456789ABCDEF";
   int size = mbstowcs(NULL, src,NULL);
   wchar_t * dst = (wchar_t*)calloc(size + 1, 1);
   mbstowcs(dst, src,size+1); // BAD
 }
-void goodTest4(){
+static void goodTest4(){
   char src[] = "0123456789ABCDEF";
   int size = mbstowcs(NULL, src,NULL);
   wchar_t * dst = (wchar_t*)malloc((size + 1)*sizeof(wchar_t));
   mbstowcs(dst, src,size+1); // GOOD
 }
-void badTest4(){
+static void badTest4(){
   char src[] = "0123456789ABCDEF";
   int size = mbstowcs(NULL, src,NULL);
   wchar_t * dst = (wchar_t*)malloc(size + 1);
   mbstowcs(dst, src,size+1); // BAD
 }
-int goodTest5(void *src){
+static int goodTest5(void *src){
   return mbstowcs(NULL, (char*)src,NULL); // GOOD
 }
-int badTest5 (void *src) {
+static int badTest5 (void *src) {
   return mbstowcs(NULL, (char*)src,3); // BAD
 }
-void goodTest6(void *src){
+static void goodTest6(void *src){
   wchar_t dst[5];
   int size = mbstowcs(NULL, (char*)src,NULL);
   if(size>=sizeof(dst)){
@@ -75,7 +75,7 @@ void goodTest6(void *src){
   mbstowcs(dst, (char*)src,sizeof(dst)); // GOOD
   printf("%s\n", dst);
 }
-void badTest6(void *src){
+static void badTest6(void *src){
   wchar_t dst[5];
   mbstowcs(dst, (char*)src,260); // BAD
   printf("%s\n", dst);
diff --git a/cpp/ql/test/experimental/query-tests/Security/CWE/CWE-125/semmle/tests/test3.cpp b/cpp/ql/test/experimental/query-tests/Security/CWE/CWE-125/semmle/tests/test3.cpp
index e37052e839b..662cdfc7be8 100644
--- a/cpp/ql/test/experimental/query-tests/Security/CWE/CWE-125/semmle/tests/test3.cpp
+++ b/cpp/ql/test/experimental/query-tests/Security/CWE/CWE-125/semmle/tests/test3.cpp
@@ -9,14 +9,14 @@ void goodTest1(unsigned char *src){
   unsigned char dst[50];
   _mbsnbcpy(dst,src,sizeof(dst)); // GOOD
 }
-size_t badTest1(unsigned char *src){
+static size_t badTest1(unsigned char *src){
   int cb = 0;
   unsigned char dst[50];
   while( cb < sizeof(dst) )
     dst[cb++]=*src++; // BAD
   return _mbclen(dst);
 }
-void goodTest2(unsigned char *src){
+static void goodTest2(unsigned char *src){
 
   int cb = 0;
   unsigned char dst[50];
@@ -27,7 +27,7 @@ void goodTest2(unsigned char *src){
     src=_mbsinc(src);
   }
 }
-void badTest2(unsigned char *src){
+static void badTest2(unsigned char *src){
 
   int cb = 0;
   unsigned char dst[50];
@@ -38,11 +38,11 @@ void badTest2(unsigned char *src){
     src=_mbsinc(src);
   }
 }
-void goodTest3(){
+static void goodTest3(){
   wchar_t name[50];
   name[sizeof(name) / sizeof(*name) - 1] = L'\0'; // GOOD
 }
-void badTest3(){
+static void badTest3(){
   wchar_t name[50];
   name[sizeof(name) - 1] = L'\0'; // BAD
 }
diff --git a/cpp/ql/test/experimental/query-tests/Security/CWE/CWE-295/CurlSSL.cpp b/cpp/ql/test/experimental/query-tests/Security/CWE/CWE-295/CurlSSL.cpp
new file mode 100644
index 00000000000..60a34889e05
--- /dev/null
+++ b/cpp/ql/test/experimental/query-tests/Security/CWE/CWE-295/CurlSSL.cpp
@@ -0,0 +1,43 @@
+#include "../../../../../library-tests/string_concat/stl.h"
+
+namespace std{
+	struct CURL {};
+	typedef CURL curl;
+	enum curl_constant{
+		CURLOPT_URL,
+		CURLOPT_SSL_VERIFYHOST,
+		CURLOPT_SSL_VERIFYPEER
+	}; 
+
+	CURL *curl_easy_init();
+	void curl_easy_cleanup(CURL *handle);
+	void curl_easy_perform(CURL *handle);
+	void curl_easy_setopt(CURL *handle, curl_constant param, int p);
+	void curl_easy_setopt(CURL *handle, curl_constant param, char* p);
+}
+
+
+using namespace std;
+char host[] = "codeql.com";
+
+void bad(void) {
+	std::unique_ptr<CURL> curl = std::unique_ptr<CURL>(curl_easy_init());
+	curl_easy_setopt(curl.get(), CURLOPT_SSL_VERIFYPEER, 0);
+	curl_easy_setopt(curl.get(), CURLOPT_SSL_VERIFYHOST, 0); 
+  	curl_easy_setopt(curl.get(), CURLOPT_URL, host);
+  	curl_easy_perform(curl.get());
+}
+
+void good(void) {
+	std::unique_ptr<CURL> curl = std::unique_ptr<CURL>(curl_easy_init());
+	curl_easy_setopt(curl.get(), CURLOPT_SSL_VERIFYPEER, 2);
+	curl_easy_setopt(curl.get(), CURLOPT_SSL_VERIFYHOST, 2); 
+  	curl_easy_setopt(curl.get(), CURLOPT_URL, host);
+  	curl_easy_perform(curl.get());
+}
+
+int main(int c, char** argv){
+	bad();
+  	good();
+}
+
diff --git a/cpp/ql/test/experimental/query-tests/Security/CWE/CWE-295/CurlSSL.expected b/cpp/ql/test/experimental/query-tests/Security/CWE/CWE-295/CurlSSL.expected
new file mode 100644
index 00000000000..343da6da607
--- /dev/null
+++ b/cpp/ql/test/experimental/query-tests/Security/CWE/CWE-295/CurlSSL.expected
@@ -0,0 +1,2 @@
+| CurlSSL.cpp:25:2:25:17 | call to curl_easy_setopt | This call disables Secure Socket Layer and could potentially lead to MITM attacks |
+| CurlSSL.cpp:26:2:26:17 | call to curl_easy_setopt | This call disables Secure Socket Layer and could potentially lead to MITM attacks |
diff --git a/cpp/ql/test/experimental/query-tests/Security/CWE/CWE-295/CurlSSL.qlref b/cpp/ql/test/experimental/query-tests/Security/CWE/CWE-295/CurlSSL.qlref
new file mode 100644
index 00000000000..6b09ac53c9b
--- /dev/null
+++ b/cpp/ql/test/experimental/query-tests/Security/CWE/CWE-295/CurlSSL.qlref
@@ -0,0 +1 @@
+experimental/Security/CWE/CWE-295/CurlSSL.ql
diff --git a/cpp/ql/test/library-tests/basic_blocks/bb_cfg.ql b/cpp/ql/test/library-tests/basic_blocks/bb_cfg.ql
index 5371e2a3901..f078a70a66d 100644
--- a/cpp/ql/test/library-tests/basic_blocks/bb_cfg.ql
+++ b/cpp/ql/test/library-tests/basic_blocks/bb_cfg.ql
@@ -1,4 +1,9 @@
-// query-type: graph
+/**
+ * query-type: graph
+ *
+ * @kind graph-equivalence-test
+ */
+
 import cpp
 
 class DestructorCallEnhanced extends DestructorCall {
diff --git a/cpp/ql/test/library-tests/basic_blocks/cfg.ql b/cpp/ql/test/library-tests/basic_blocks/cfg.ql
index 19a82ba0de0..0e1f45caf19 100644
--- a/cpp/ql/test/library-tests/basic_blocks/cfg.ql
+++ b/cpp/ql/test/library-tests/basic_blocks/cfg.ql
@@ -1,4 +1,9 @@
-// query-type: graph
+/**
+ * query-type: graph
+ *
+ * @kind graph-equivalence-test
+ */
+
 import cpp
 
 class DestructorCallEnhanced extends DestructorCall {
diff --git a/cpp/ql/test/library-tests/c++_exceptions/graphable.ql b/cpp/ql/test/library-tests/c++_exceptions/graphable.ql
index 19a82ba0de0..0e1f45caf19 100644
--- a/cpp/ql/test/library-tests/c++_exceptions/graphable.ql
+++ b/cpp/ql/test/library-tests/c++_exceptions/graphable.ql
@@ -1,4 +1,9 @@
-// query-type: graph
+/**
+ * query-type: graph
+ *
+ * @kind graph-equivalence-test
+ */
+
 import cpp
 
 class DestructorCallEnhanced extends DestructorCall {
diff --git a/cpp/ql/test/library-tests/constexpr_if/cfg.ql b/cpp/ql/test/library-tests/constexpr_if/cfg.ql
index 19a82ba0de0..0e1f45caf19 100644
--- a/cpp/ql/test/library-tests/constexpr_if/cfg.ql
+++ b/cpp/ql/test/library-tests/constexpr_if/cfg.ql
@@ -1,4 +1,9 @@
-// query-type: graph
+/**
+ * query-type: graph
+ *
+ * @kind graph-equivalence-test
+ */
+
 import cpp
 
 class DestructorCallEnhanced extends DestructorCall {
diff --git a/cpp/ql/test/library-tests/controlflow/guards-ir/tests.expected b/cpp/ql/test/library-tests/controlflow/guards-ir/tests.expected
index d097fa7dfa6..24ce995f813 100644
--- a/cpp/ql/test/library-tests/controlflow/guards-ir/tests.expected
+++ b/cpp/ql/test/library-tests/controlflow/guards-ir/tests.expected
@@ -42,6 +42,8 @@ astGuards
 astGuardsCompare
 | 7 | 0 < x+0 when ... > ... is true |
 | 7 | 0 >= x+0 when ... > ... is false |
+| 7 | ... > ... != 0 when ... > ... is true |
+| 7 | ... > ... == 0 when ... > ... is false |
 | 7 | x < 0+1 when ... > ... is false |
 | 7 | x >= 0+1 when ... > ... is true |
 | 17 | 0 < x+1 when ... < ... is false |
@@ -50,6 +52,12 @@ astGuardsCompare
 | 17 | 1 < y+0 when ... && ... is true |
 | 17 | 1 < y+0 when ... > ... is true |
 | 17 | 1 >= y+0 when ... > ... is false |
+| 17 | ... < ... != 0 when ... && ... is true |
+| 17 | ... < ... != 0 when ... < ... is true |
+| 17 | ... < ... == 0 when ... < ... is false |
+| 17 | ... > ... != 0 when ... && ... is true |
+| 17 | ... > ... != 0 when ... > ... is true |
+| 17 | ... > ... == 0 when ... > ... is false |
 | 17 | x < 0+0 when ... && ... is true |
 | 17 | x < 0+0 when ... < ... is true |
 | 17 | x >= 0+0 when ... < ... is false |
@@ -60,30 +68,42 @@ astGuardsCompare
 | 18 | call to get == 0 when call to get is false |
 | 26 | 0 < x+0 when ... > ... is true |
 | 26 | 0 >= x+0 when ... > ... is false |
+| 26 | ... > ... != 0 when ... > ... is true |
+| 26 | ... > ... == 0 when ... > ... is false |
 | 26 | x < 0+1 when ... > ... is false |
 | 26 | x >= 0+1 when ... > ... is true |
 | 31 | - ... != x+0 when ... == ... is false |
 | 31 | - ... == x+0 when ... == ... is true |
+| 31 | ... == ... != 0 when ... == ... is true |
+| 31 | ... == ... == 0 when ... == ... is false |
 | 31 | x != -1 when ... == ... is false |
 | 31 | x != - ...+0 when ... == ... is false |
 | 31 | x == -1 when ... == ... is true |
 | 31 | x == - ...+0 when ... == ... is true |
 | 34 | 10 < j+1 when ... < ... is false |
 | 34 | 10 >= j+1 when ... < ... is true |
+| 34 | ... < ... != 0 when ... < ... is true |
+| 34 | ... < ... == 0 when ... < ... is false |
 | 34 | j < 10+0 when ... < ... is true |
 | 34 | j >= 10+0 when ... < ... is false |
 | 42 | 10 < j+1 when ... < ... is false |
 | 42 | 10 >= j+1 when ... < ... is true |
+| 42 | ... < ... != 0 when ... < ... is true |
+| 42 | ... < ... == 0 when ... < ... is false |
 | 42 | call to getABool != 0 when call to getABool is true |
 | 42 | call to getABool == 0 when call to getABool is false |
 | 42 | j < 10+0 when ... < ... is true |
 | 42 | j >= 10+0 when ... < ... is false |
 | 44 | 0 < z+0 when ... > ... is true |
 | 44 | 0 >= z+0 when ... > ... is false |
+| 44 | ... > ... != 0 when ... > ... is true |
+| 44 | ... > ... == 0 when ... > ... is false |
 | 44 | z < 0+1 when ... > ... is false |
 | 44 | z >= 0+1 when ... > ... is true |
 | 45 | 0 < y+0 when ... > ... is true |
 | 45 | 0 >= y+0 when ... > ... is false |
+| 45 | ... > ... != 0 when ... > ... is true |
+| 45 | ... > ... == 0 when ... > ... is false |
 | 45 | y < 0+1 when ... > ... is false |
 | 45 | y >= 0+1 when ... > ... is true |
 | 58 | 0 != x+0 when ... == ... is false |
@@ -92,6 +112,12 @@ astGuardsCompare
 | 58 | 0 < y+1 when ... \|\| ... is false |
 | 58 | 0 == x+0 when ... == ... is true |
 | 58 | 0 >= y+1 when ... < ... is true |
+| 58 | ... < ... != 0 when ... < ... is true |
+| 58 | ... < ... == 0 when ... < ... is false |
+| 58 | ... < ... == 0 when ... \|\| ... is false |
+| 58 | ... == ... != 0 when ... == ... is true |
+| 58 | ... == ... == 0 when ... == ... is false |
+| 58 | ... == ... == 0 when ... \|\| ... is false |
 | 58 | x != 0 when ... == ... is false |
 | 58 | x != 0 when ... \|\| ... is false |
 | 58 | x != 0+0 when ... == ... is false |
@@ -103,6 +129,8 @@ astGuardsCompare
 | 58 | y >= 0+0 when ... \|\| ... is false |
 | 75 | 0 != x+0 when ... == ... is false |
 | 75 | 0 == x+0 when ... == ... is true |
+| 75 | ... == ... != 0 when ... == ... is true |
+| 75 | ... == ... == 0 when ... == ... is false |
 | 75 | x != 0 when ... == ... is false |
 | 75 | x != 0+0 when ... == ... is false |
 | 75 | x == 0 when ... == ... is true |
@@ -113,6 +141,12 @@ astGuardsCompare
 | 85 | 0 == x+0 when ... && ... is true |
 | 85 | 0 == x+0 when ... == ... is true |
 | 85 | 0 == y+0 when ... != ... is false |
+| 85 | ... != ... != 0 when ... != ... is true |
+| 85 | ... != ... != 0 when ... && ... is true |
+| 85 | ... != ... == 0 when ... != ... is false |
+| 85 | ... == ... != 0 when ... && ... is true |
+| 85 | ... == ... != 0 when ... == ... is true |
+| 85 | ... == ... == 0 when ... == ... is false |
 | 85 | x != 0 when ... == ... is false |
 | 85 | x != 0+0 when ... == ... is false |
 | 85 | x == 0 when ... && ... is true |
@@ -127,12 +161,16 @@ astGuardsCompare
 | 85 | y == 0+0 when ... != ... is false |
 | 94 | 0 != x+0 when ... != ... is true |
 | 94 | 0 == x+0 when ... != ... is false |
+| 94 | ... != ... != 0 when ... != ... is true |
+| 94 | ... != ... == 0 when ... != ... is false |
 | 94 | x != 0 when ... != ... is true |
 | 94 | x != 0+0 when ... != ... is true |
 | 94 | x == 0 when ... != ... is false |
 | 94 | x == 0+0 when ... != ... is false |
 | 102 | 10 < j+1 when ... < ... is false |
 | 102 | 10 >= j+1 when ... < ... is true |
+| 102 | ... < ... != 0 when ... < ... is true |
+| 102 | ... < ... == 0 when ... < ... is false |
 | 102 | j < 10+0 when ... < ... is true |
 | 102 | j >= 10+0 when ... < ... is false |
 | 109 | 0 != x+0 when ... == ... is false |
@@ -141,6 +179,12 @@ astGuardsCompare
 | 109 | 0 < y+1 when ... \|\| ... is false |
 | 109 | 0 == x+0 when ... == ... is true |
 | 109 | 0 >= y+1 when ... < ... is true |
+| 109 | ... < ... != 0 when ... < ... is true |
+| 109 | ... < ... == 0 when ... < ... is false |
+| 109 | ... < ... == 0 when ... \|\| ... is false |
+| 109 | ... == ... != 0 when ... == ... is true |
+| 109 | ... == ... == 0 when ... == ... is false |
+| 109 | ... == ... == 0 when ... \|\| ... is false |
 | 109 | x != 0 when ... == ... is false |
 | 109 | x != 0 when ... \|\| ... is false |
 | 109 | x != 0+0 when ... == ... is false |
@@ -173,6 +217,8 @@ astGuardsCompare
 | 152 | y == 0 when y is false |
 | 156 | ... + ... != x+0 when ... == ... is false |
 | 156 | ... + ... == x+0 when ... == ... is true |
+| 156 | ... == ... != 0 when ... == ... is true |
+| 156 | ... == ... == 0 when ... == ... is false |
 | 156 | x != ... + ...+0 when ... == ... is false |
 | 156 | x != y+42 when ... == ... is false |
 | 156 | x == ... + ...+0 when ... == ... is true |
@@ -181,6 +227,8 @@ astGuardsCompare
 | 156 | y == x+-42 when ... == ... is true |
 | 159 | ... - ... != x+0 when ... == ... is false |
 | 159 | ... - ... == x+0 when ... == ... is true |
+| 159 | ... == ... != 0 when ... == ... is true |
+| 159 | ... == ... == 0 when ... == ... is false |
 | 159 | x != ... - ...+0 when ... == ... is false |
 | 159 | x != y+-42 when ... == ... is false |
 | 159 | x == ... - ...+0 when ... == ... is true |
@@ -189,6 +237,8 @@ astGuardsCompare
 | 159 | y == x+42 when ... == ... is true |
 | 162 | ... + ... < x+1 when ... < ... is false |
 | 162 | ... + ... >= x+1 when ... < ... is true |
+| 162 | ... < ... != 0 when ... < ... is true |
+| 162 | ... < ... == 0 when ... < ... is false |
 | 162 | x < ... + ...+0 when ... < ... is true |
 | 162 | x < y+42 when ... < ... is true |
 | 162 | x >= ... + ...+0 when ... < ... is false |
@@ -197,6 +247,8 @@ astGuardsCompare
 | 162 | y >= x+-41 when ... < ... is true |
 | 165 | ... - ... < x+1 when ... < ... is false |
 | 165 | ... - ... >= x+1 when ... < ... is true |
+| 165 | ... < ... != 0 when ... < ... is true |
+| 165 | ... < ... == 0 when ... < ... is false |
 | 165 | x < ... - ...+0 when ... < ... is true |
 | 165 | x < y+-42 when ... < ... is true |
 | 165 | x >= ... - ...+0 when ... < ... is false |
@@ -205,6 +257,8 @@ astGuardsCompare
 | 165 | y >= x+43 when ... < ... is true |
 | 175 | 0 != call to foo+0 when ... == ... is false |
 | 175 | 0 == call to foo+0 when ... == ... is true |
+| 175 | ... == ... != 0 when ... == ... is true |
+| 175 | ... == ... == 0 when ... == ... is false |
 | 175 | call to foo != 0 when ... == ... is false |
 | 175 | call to foo != 0+0 when ... == ... is false |
 | 175 | call to foo == 0 when ... == ... is true |
@@ -414,10 +468,20 @@ astGuardsEnsure
 | test.c:75:9:75:14 | ... == ... | test.c:75:9:75:9 | x | == | test.c:75:14:75:14 | 0 | 0 | 75 | 77 |
 | test.c:75:9:75:14 | ... == ... | test.c:75:14:75:14 | 0 | != | test.c:75:9:75:9 | x | 0 | 78 | 79 |
 | test.c:75:9:75:14 | ... == ... | test.c:75:14:75:14 | 0 | == | test.c:75:9:75:9 | x | 0 | 75 | 77 |
+| test.c:75:9:75:14 | ... == ... | test.c:85:8:85:8 | x | != | test.c:85:13:85:13 | 0 | 0 | 78 | 79 |
+| test.c:75:9:75:14 | ... == ... | test.c:85:8:85:8 | x | == | test.c:85:13:85:13 | 0 | 0 | 75 | 77 |
+| test.c:75:9:75:14 | ... == ... | test.c:85:13:85:13 | 0 | != | test.c:85:8:85:8 | x | 0 | 78 | 79 |
+| test.c:75:9:75:14 | ... == ... | test.c:85:13:85:13 | 0 | == | test.c:85:8:85:8 | x | 0 | 75 | 77 |
+| test.c:85:8:85:13 | ... == ... | test.c:75:9:75:9 | x | == | test.c:75:14:75:14 | 0 | 0 | 85 | 85 |
+| test.c:85:8:85:13 | ... == ... | test.c:75:9:75:9 | x | == | test.c:75:14:75:14 | 0 | 0 | 86 | 86 |
+| test.c:85:8:85:13 | ... == ... | test.c:75:14:75:14 | 0 | == | test.c:75:9:75:9 | x | 0 | 85 | 85 |
+| test.c:85:8:85:13 | ... == ... | test.c:75:14:75:14 | 0 | == | test.c:75:9:75:9 | x | 0 | 86 | 86 |
 | test.c:85:8:85:13 | ... == ... | test.c:85:8:85:8 | x | == | test.c:85:13:85:13 | 0 | 0 | 85 | 85 |
 | test.c:85:8:85:13 | ... == ... | test.c:85:8:85:8 | x | == | test.c:85:13:85:13 | 0 | 0 | 86 | 86 |
 | test.c:85:8:85:13 | ... == ... | test.c:85:13:85:13 | 0 | == | test.c:85:8:85:8 | x | 0 | 85 | 85 |
 | test.c:85:8:85:13 | ... == ... | test.c:85:13:85:13 | 0 | == | test.c:85:8:85:8 | x | 0 | 86 | 86 |
+| test.c:85:8:85:23 | ... && ... | test.c:75:9:75:9 | x | == | test.c:75:14:75:14 | 0 | 0 | 86 | 86 |
+| test.c:85:8:85:23 | ... && ... | test.c:75:14:75:14 | 0 | == | test.c:75:9:75:9 | x | 0 | 86 | 86 |
 | test.c:85:8:85:23 | ... && ... | test.c:85:8:85:8 | x | == | test.c:85:13:85:13 | 0 | 0 | 86 | 86 |
 | test.c:85:8:85:23 | ... && ... | test.c:85:13:85:13 | 0 | == | test.c:85:8:85:8 | x | 0 | 86 | 86 |
 | test.c:85:8:85:23 | ... && ... | test.c:85:18:85:18 | y | != | test.c:85:23:85:23 | 0 | 0 | 86 | 86 |
@@ -491,16 +555,81 @@ astGuardsEnsure
 | test.cpp:31:7:31:13 | ... == ... | test.cpp:31:12:31:13 | - ... | == | test.cpp:31:7:31:7 | x | 0 | 30 | 30 |
 | test.cpp:31:7:31:13 | ... == ... | test.cpp:31:12:31:13 | - ... | == | test.cpp:31:7:31:7 | x | 0 | 31 | 32 |
 astGuardsEnsure_const
+| test.c:7:9:7:13 | ... > ... | test.c:7:9:7:13 | ... > ... | != | 0 | 7 | 9 |
+| test.c:7:9:7:13 | ... > ... | test.c:7:9:7:13 | ... > ... | == | 0 | 10 | 11 |
+| test.c:17:8:17:12 | ... < ... | test.c:17:8:17:12 | ... < ... | != | 0 | 17 | 17 |
+| test.c:17:8:17:12 | ... < ... | test.c:17:8:17:12 | ... < ... | != | 0 | 18 | 18 |
+| test.c:17:8:17:21 | ... && ... | test.c:17:8:17:12 | ... < ... | != | 0 | 18 | 18 |
+| test.c:17:8:17:21 | ... && ... | test.c:17:17:17:21 | ... > ... | != | 0 | 18 | 18 |
+| test.c:17:17:17:21 | ... > ... | test.c:17:17:17:21 | ... > ... | != | 0 | 18 | 18 |
+| test.c:26:11:26:15 | ... > ... | test.c:26:11:26:15 | ... > ... | != | 0 | 26 | 28 |
+| test.c:26:11:26:15 | ... > ... | test.c:26:11:26:15 | ... > ... | == | 0 | 2 | 2 |
+| test.c:26:11:26:15 | ... > ... | test.c:26:11:26:15 | ... > ... | == | 0 | 31 | 34 |
+| test.c:26:11:26:15 | ... > ... | test.c:26:11:26:15 | ... > ... | == | 0 | 34 | 34 |
+| test.c:26:11:26:15 | ... > ... | test.c:26:11:26:15 | ... > ... | == | 0 | 39 | 42 |
+| test.c:26:11:26:15 | ... > ... | test.c:26:11:26:15 | ... > ... | == | 0 | 42 | 42 |
+| test.c:26:11:26:15 | ... > ... | test.c:26:11:26:15 | ... > ... | == | 0 | 42 | 44 |
+| test.c:26:11:26:15 | ... > ... | test.c:26:11:26:15 | ... > ... | == | 0 | 45 | 45 |
+| test.c:26:11:26:15 | ... > ... | test.c:26:11:26:15 | ... > ... | == | 0 | 45 | 47 |
+| test.c:26:11:26:15 | ... > ... | test.c:26:11:26:15 | ... > ... | == | 0 | 51 | 53 |
+| test.c:26:11:26:15 | ... > ... | test.c:26:11:26:15 | ... > ... | == | 0 | 56 | 58 |
+| test.c:26:11:26:15 | ... > ... | test.c:26:11:26:15 | ... > ... | == | 0 | 58 | 58 |
+| test.c:26:11:26:15 | ... > ... | test.c:26:11:26:15 | ... > ... | == | 0 | 58 | 66 |
+| test.c:26:11:26:15 | ... > ... | test.c:26:11:26:15 | ... > ... | == | 0 | 62 | 62 |
+| test.c:34:16:34:21 | ... < ... | test.c:34:16:34:21 | ... < ... | != | 0 | 34 | 34 |
+| test.c:34:16:34:21 | ... < ... | test.c:34:16:34:21 | ... < ... | == | 0 | 2 | 2 |
+| test.c:34:16:34:21 | ... < ... | test.c:34:16:34:21 | ... < ... | == | 0 | 39 | 42 |
+| test.c:34:16:34:21 | ... < ... | test.c:34:16:34:21 | ... < ... | == | 0 | 42 | 42 |
+| test.c:34:16:34:21 | ... < ... | test.c:34:16:34:21 | ... < ... | == | 0 | 42 | 44 |
+| test.c:34:16:34:21 | ... < ... | test.c:34:16:34:21 | ... < ... | == | 0 | 45 | 45 |
+| test.c:34:16:34:21 | ... < ... | test.c:34:16:34:21 | ... < ... | == | 0 | 45 | 47 |
+| test.c:34:16:34:21 | ... < ... | test.c:34:16:34:21 | ... < ... | == | 0 | 51 | 53 |
+| test.c:34:16:34:21 | ... < ... | test.c:34:16:34:21 | ... < ... | == | 0 | 56 | 58 |
+| test.c:34:16:34:21 | ... < ... | test.c:34:16:34:21 | ... < ... | == | 0 | 58 | 58 |
+| test.c:34:16:34:21 | ... < ... | test.c:34:16:34:21 | ... < ... | == | 0 | 58 | 66 |
+| test.c:34:16:34:21 | ... < ... | test.c:34:16:34:21 | ... < ... | == | 0 | 62 | 62 |
+| test.c:42:16:42:21 | ... < ... | test.c:42:16:42:21 | ... < ... | != | 0 | 42 | 42 |
+| test.c:42:16:42:21 | ... < ... | test.c:42:16:42:21 | ... < ... | != | 0 | 42 | 44 |
+| test.c:42:16:42:21 | ... < ... | test.c:42:16:42:21 | ... < ... | != | 0 | 45 | 45 |
+| test.c:42:16:42:21 | ... < ... | test.c:42:16:42:21 | ... < ... | != | 0 | 45 | 47 |
+| test.c:42:16:42:21 | ... < ... | test.c:42:16:42:21 | ... < ... | != | 0 | 51 | 53 |
+| test.c:44:12:44:16 | ... > ... | test.c:44:12:44:16 | ... > ... | != | 0 | 45 | 45 |
+| test.c:44:12:44:16 | ... > ... | test.c:44:12:44:16 | ... > ... | != | 0 | 45 | 47 |
+| test.c:44:12:44:16 | ... > ... | test.c:44:12:44:16 | ... > ... | == | 0 | 42 | 42 |
+| test.c:44:12:44:16 | ... > ... | test.c:44:12:44:16 | ... > ... | == | 0 | 51 | 53 |
+| test.c:45:16:45:20 | ... > ... | test.c:45:16:45:20 | ... > ... | != | 0 | 45 | 47 |
 | test.c:58:9:58:14 | ... == ... | test.c:58:9:58:9 | x | != | 0 | 58 | 58 |
 | test.c:58:9:58:14 | ... == ... | test.c:58:9:58:9 | x | != | 0 | 62 | 62 |
+| test.c:58:9:58:14 | ... == ... | test.c:58:9:58:14 | ... == ... | == | 0 | 58 | 58 |
+| test.c:58:9:58:14 | ... == ... | test.c:58:9:58:14 | ... == ... | == | 0 | 62 | 62 |
 | test.c:58:9:58:23 | ... \|\| ... | test.c:58:9:58:9 | x | != | 0 | 62 | 62 |
+| test.c:58:9:58:23 | ... \|\| ... | test.c:58:9:58:14 | ... == ... | == | 0 | 62 | 62 |
+| test.c:58:9:58:23 | ... \|\| ... | test.c:58:19:58:23 | ... < ... | == | 0 | 62 | 62 |
+| test.c:58:19:58:23 | ... < ... | test.c:58:19:58:23 | ... < ... | == | 0 | 62 | 62 |
 | test.c:75:9:75:14 | ... == ... | test.c:75:9:75:9 | x | != | 0 | 78 | 79 |
 | test.c:75:9:75:14 | ... == ... | test.c:75:9:75:9 | x | == | 0 | 75 | 77 |
+| test.c:75:9:75:14 | ... == ... | test.c:75:9:75:14 | ... == ... | != | 0 | 75 | 77 |
+| test.c:75:9:75:14 | ... == ... | test.c:75:9:75:14 | ... == ... | == | 0 | 78 | 79 |
+| test.c:75:9:75:14 | ... == ... | test.c:85:8:85:8 | x | != | 0 | 78 | 79 |
+| test.c:75:9:75:14 | ... == ... | test.c:85:8:85:8 | x | == | 0 | 75 | 77 |
+| test.c:75:9:75:14 | ... == ... | test.c:85:8:85:13 | ... == ... | != | 0 | 75 | 77 |
+| test.c:75:9:75:14 | ... == ... | test.c:85:8:85:13 | ... == ... | == | 0 | 78 | 79 |
+| test.c:85:8:85:13 | ... == ... | test.c:75:9:75:9 | x | == | 0 | 85 | 85 |
+| test.c:85:8:85:13 | ... == ... | test.c:75:9:75:9 | x | == | 0 | 86 | 86 |
+| test.c:85:8:85:13 | ... == ... | test.c:75:9:75:14 | ... == ... | != | 0 | 85 | 85 |
+| test.c:85:8:85:13 | ... == ... | test.c:75:9:75:14 | ... == ... | != | 0 | 86 | 86 |
 | test.c:85:8:85:13 | ... == ... | test.c:85:8:85:8 | x | == | 0 | 85 | 85 |
 | test.c:85:8:85:13 | ... == ... | test.c:85:8:85:8 | x | == | 0 | 86 | 86 |
+| test.c:85:8:85:13 | ... == ... | test.c:85:8:85:13 | ... == ... | != | 0 | 85 | 85 |
+| test.c:85:8:85:13 | ... == ... | test.c:85:8:85:13 | ... == ... | != | 0 | 86 | 86 |
+| test.c:85:8:85:23 | ... && ... | test.c:75:9:75:9 | x | == | 0 | 86 | 86 |
+| test.c:85:8:85:23 | ... && ... | test.c:75:9:75:14 | ... == ... | != | 0 | 86 | 86 |
 | test.c:85:8:85:23 | ... && ... | test.c:85:8:85:8 | x | == | 0 | 86 | 86 |
+| test.c:85:8:85:23 | ... && ... | test.c:85:8:85:13 | ... == ... | != | 0 | 86 | 86 |
 | test.c:85:8:85:23 | ... && ... | test.c:85:18:85:18 | y | != | 0 | 86 | 86 |
+| test.c:85:8:85:23 | ... && ... | test.c:85:18:85:23 | ... != ... | != | 0 | 86 | 86 |
 | test.c:85:18:85:23 | ... != ... | test.c:85:18:85:18 | y | != | 0 | 86 | 86 |
+| test.c:85:18:85:23 | ... != ... | test.c:85:18:85:23 | ... != ... | != | 0 | 86 | 86 |
 | test.c:94:11:94:16 | ... != ... | test.c:94:11:94:11 | x | != | 0 | 94 | 96 |
 | test.c:94:11:94:16 | ... != ... | test.c:94:11:94:11 | x | == | 0 | 70 | 70 |
 | test.c:94:11:94:16 | ... != ... | test.c:94:11:94:11 | x | == | 0 | 99 | 102 |
@@ -509,16 +638,41 @@ astGuardsEnsure_const
 | test.c:94:11:94:16 | ... != ... | test.c:94:11:94:11 | x | == | 0 | 109 | 109 |
 | test.c:94:11:94:16 | ... != ... | test.c:94:11:94:11 | x | == | 0 | 109 | 117 |
 | test.c:94:11:94:16 | ... != ... | test.c:94:11:94:11 | x | == | 0 | 113 | 113 |
+| test.c:94:11:94:16 | ... != ... | test.c:94:11:94:16 | ... != ... | != | 0 | 94 | 96 |
+| test.c:94:11:94:16 | ... != ... | test.c:94:11:94:16 | ... != ... | == | 0 | 70 | 70 |
+| test.c:94:11:94:16 | ... != ... | test.c:94:11:94:16 | ... != ... | == | 0 | 99 | 102 |
+| test.c:94:11:94:16 | ... != ... | test.c:94:11:94:16 | ... != ... | == | 0 | 102 | 102 |
+| test.c:94:11:94:16 | ... != ... | test.c:94:11:94:16 | ... != ... | == | 0 | 107 | 109 |
+| test.c:94:11:94:16 | ... != ... | test.c:94:11:94:16 | ... != ... | == | 0 | 109 | 109 |
+| test.c:94:11:94:16 | ... != ... | test.c:94:11:94:16 | ... != ... | == | 0 | 109 | 117 |
+| test.c:94:11:94:16 | ... != ... | test.c:94:11:94:16 | ... != ... | == | 0 | 113 | 113 |
+| test.c:102:16:102:21 | ... < ... | test.c:102:16:102:21 | ... < ... | != | 0 | 102 | 102 |
+| test.c:102:16:102:21 | ... < ... | test.c:102:16:102:21 | ... < ... | == | 0 | 70 | 70 |
+| test.c:102:16:102:21 | ... < ... | test.c:102:16:102:21 | ... < ... | == | 0 | 107 | 109 |
+| test.c:102:16:102:21 | ... < ... | test.c:102:16:102:21 | ... < ... | == | 0 | 109 | 109 |
+| test.c:102:16:102:21 | ... < ... | test.c:102:16:102:21 | ... < ... | == | 0 | 109 | 117 |
+| test.c:102:16:102:21 | ... < ... | test.c:102:16:102:21 | ... < ... | == | 0 | 113 | 113 |
 | test.c:109:9:109:14 | ... == ... | test.c:109:9:109:9 | x | != | 0 | 109 | 109 |
 | test.c:109:9:109:14 | ... == ... | test.c:109:9:109:9 | x | != | 0 | 113 | 113 |
+| test.c:109:9:109:14 | ... == ... | test.c:109:9:109:14 | ... == ... | == | 0 | 109 | 109 |
+| test.c:109:9:109:14 | ... == ... | test.c:109:9:109:14 | ... == ... | == | 0 | 113 | 113 |
 | test.c:109:9:109:23 | ... \|\| ... | test.c:109:9:109:9 | x | != | 0 | 113 | 113 |
+| test.c:109:9:109:23 | ... \|\| ... | test.c:109:9:109:14 | ... == ... | == | 0 | 113 | 113 |
+| test.c:109:9:109:23 | ... \|\| ... | test.c:109:19:109:23 | ... < ... | == | 0 | 113 | 113 |
+| test.c:109:19:109:23 | ... < ... | test.c:109:19:109:23 | ... < ... | == | 0 | 113 | 113 |
 | test.c:126:7:126:7 | 1 | test.c:126:7:126:7 | 1 | != | 0 | 126 | 126 |
 | test.c:126:7:126:7 | 1 | test.c:126:7:126:7 | 1 | != | 0 | 126 | 128 |
 | test.c:126:7:126:7 | 1 | test.c:126:7:126:7 | 1 | != | 0 | 131 | 131 |
 | test.c:126:7:126:7 | 1 | test.c:126:7:126:7 | 1 | != | 0 | 131 | 132 |
 | test.c:126:7:126:7 | 1 | test.c:126:7:126:7 | 1 | != | 0 | 134 | 123 |
+| test.c:126:7:126:7 | 1 | test.c:127:9:127:9 | 1 | != | 0 | 126 | 126 |
+| test.c:126:7:126:7 | 1 | test.c:127:9:127:9 | 1 | != | 0 | 126 | 128 |
+| test.c:126:7:126:7 | 1 | test.c:127:9:127:9 | 1 | != | 0 | 131 | 131 |
+| test.c:126:7:126:7 | 1 | test.c:127:9:127:9 | 1 | != | 0 | 131 | 132 |
+| test.c:126:7:126:7 | 1 | test.c:127:9:127:9 | 1 | != | 0 | 134 | 123 |
 | test.c:126:7:126:28 | ... && ... | test.c:126:7:126:7 | 1 | != | 0 | 126 | 128 |
 | test.c:126:7:126:28 | ... && ... | test.c:126:12:126:26 | call to test3_condition | != | 0 | 126 | 128 |
+| test.c:126:7:126:28 | ... && ... | test.c:127:9:127:9 | 1 | != | 0 | 126 | 128 |
 | test.c:126:12:126:26 | call to test3_condition | test.c:126:12:126:26 | call to test3_condition | != | 0 | 126 | 128 |
 | test.c:131:7:131:7 | b | test.c:131:7:131:7 | b | != | 0 | 131 | 132 |
 | test.c:137:7:137:7 | 0 | test.c:137:7:137:7 | 0 | == | 0 | 142 | 136 |
@@ -529,8 +683,14 @@ astGuardsEnsure_const
 | test.c:152:10:152:15 | ... && ... | test.c:152:10:152:10 | x | != | 0 | 151 | 152 |
 | test.c:152:10:152:15 | ... && ... | test.c:152:15:152:15 | y | != | 0 | 151 | 152 |
 | test.c:152:15:152:15 | y | test.c:152:15:152:15 | y | != | 0 | 151 | 152 |
+| test.c:156:9:156:19 | ... == ... | test.c:156:9:156:19 | ... == ... | != | 0 | 156 | 157 |
+| test.c:159:9:159:19 | ... == ... | test.c:159:9:159:19 | ... == ... | != | 0 | 159 | 160 |
+| test.c:162:9:162:18 | ... < ... | test.c:162:9:162:18 | ... < ... | != | 0 | 162 | 163 |
+| test.c:165:9:165:18 | ... < ... | test.c:165:9:165:18 | ... < ... | != | 0 | 165 | 166 |
 | test.c:175:13:175:32 | ... == ... | test.c:175:13:175:15 | call to foo | != | 0 | 175 | 175 |
 | test.c:175:13:175:32 | ... == ... | test.c:175:13:175:15 | call to foo | == | 0 | 175 | 175 |
+| test.c:175:13:175:32 | ... == ... | test.c:175:13:175:32 | ... == ... | != | 0 | 175 | 175 |
+| test.c:175:13:175:32 | ... == ... | test.c:175:13:175:32 | ... == ... | == | 0 | 175 | 175 |
 | test.c:181:9:181:9 | x | test.c:181:9:181:9 | x | != | 0 | 181 | 182 |
 | test.c:181:9:181:9 | x | test.c:181:9:181:9 | x | != | 0 | 186 | 180 |
 | test.c:181:9:181:9 | x | test.c:181:9:181:9 | x | == | 0 | 183 | 184 |
@@ -539,6 +699,10 @@ astGuardsEnsure_const
 | test.cpp:31:7:31:13 | ... == ... | test.cpp:31:7:31:7 | x | != | -1 | 34 | 34 |
 | test.cpp:31:7:31:13 | ... == ... | test.cpp:31:7:31:7 | x | == | -1 | 30 | 30 |
 | test.cpp:31:7:31:13 | ... == ... | test.cpp:31:7:31:7 | x | == | -1 | 31 | 32 |
+| test.cpp:31:7:31:13 | ... == ... | test.cpp:31:7:31:13 | ... == ... | != | 0 | 30 | 30 |
+| test.cpp:31:7:31:13 | ... == ... | test.cpp:31:7:31:13 | ... == ... | != | 0 | 31 | 32 |
+| test.cpp:31:7:31:13 | ... == ... | test.cpp:31:7:31:13 | ... == ... | == | 0 | 30 | 30 |
+| test.cpp:31:7:31:13 | ... == ... | test.cpp:31:7:31:13 | ... == ... | == | 0 | 34 | 34 |
 | test.cpp:42:13:42:20 | call to getABool | test.cpp:42:13:42:20 | call to getABool | != | 0 | 43 | 45 |
 | test.cpp:42:13:42:20 | call to getABool | test.cpp:42:13:42:20 | call to getABool | == | 0 | 53 | 53 |
 irGuards
@@ -579,6 +743,8 @@ irGuards
 irGuardsCompare
 | 7 | 0 < x+0 when CompareGT: ... > ... is true |
 | 7 | 0 >= x+0 when CompareGT: ... > ... is false |
+| 7 | ... > ... != 0 when CompareGT: ... > ... is true |
+| 7 | ... > ... == 0 when CompareGT: ... > ... is false |
 | 7 | x < 0+1 when CompareGT: ... > ... is false |
 | 7 | x < 1 when CompareGT: ... > ... is false |
 | 7 | x >= 0+1 when CompareGT: ... > ... is true |
@@ -587,6 +753,10 @@ irGuardsCompare
 | 17 | 0 >= x+1 when CompareLT: ... < ... is true |
 | 17 | 1 < y+0 when CompareGT: ... > ... is true |
 | 17 | 1 >= y+0 when CompareGT: ... > ... is false |
+| 17 | ... < ... != 0 when CompareLT: ... < ... is true |
+| 17 | ... < ... == 0 when CompareLT: ... < ... is false |
+| 17 | ... > ... != 0 when CompareGT: ... > ... is true |
+| 17 | ... > ... == 0 when CompareGT: ... > ... is false |
 | 17 | x < 0 when CompareLT: ... < ... is true |
 | 17 | x < 0+0 when CompareLT: ... < ... is true |
 | 17 | x >= 0 when CompareLT: ... < ... is false |
@@ -599,24 +769,32 @@ irGuardsCompare
 | 18 | call to get == 0 when CompareNE: (bool)... is false |
 | 26 | 0 < x+0 when CompareGT: ... > ... is true |
 | 26 | 0 >= x+0 when CompareGT: ... > ... is false |
+| 26 | ... > ... != 0 when CompareGT: ... > ... is true |
+| 26 | ... > ... == 0 when CompareGT: ... > ... is false |
 | 26 | x < 0+1 when CompareGT: ... > ... is false |
 | 26 | x < 1 when CompareGT: ... > ... is false |
 | 26 | x >= 0+1 when CompareGT: ... > ... is true |
 | 26 | x >= 1 when CompareGT: ... > ... is true |
 | 31 | - ... != x+0 when CompareEQ: ... == ... is false |
 | 31 | - ... == x+0 when CompareEQ: ... == ... is true |
+| 31 | ... == ... != 0 when CompareEQ: ... == ... is true |
+| 31 | ... == ... == 0 when CompareEQ: ... == ... is false |
 | 31 | x != -1 when CompareEQ: ... == ... is false |
 | 31 | x != - ...+0 when CompareEQ: ... == ... is false |
 | 31 | x == -1 when CompareEQ: ... == ... is true |
 | 31 | x == - ...+0 when CompareEQ: ... == ... is true |
 | 34 | 10 < j+1 when CompareLT: ... < ... is false |
 | 34 | 10 >= j+1 when CompareLT: ... < ... is true |
+| 34 | ... < ... != 0 when CompareLT: ... < ... is true |
+| 34 | ... < ... == 0 when CompareLT: ... < ... is false |
 | 34 | j < 10 when CompareLT: ... < ... is true |
 | 34 | j < 10+0 when CompareLT: ... < ... is true |
 | 34 | j >= 10 when CompareLT: ... < ... is false |
 | 34 | j >= 10+0 when CompareLT: ... < ... is false |
 | 42 | 10 < j+1 when CompareLT: ... < ... is false |
 | 42 | 10 >= j+1 when CompareLT: ... < ... is true |
+| 42 | ... < ... != 0 when CompareLT: ... < ... is true |
+| 42 | ... < ... == 0 when CompareLT: ... < ... is false |
 | 42 | call to getABool != 0 when Call: call to getABool is true |
 | 42 | call to getABool == 0 when Call: call to getABool is false |
 | 42 | j < 10 when CompareLT: ... < ... is true |
@@ -625,12 +803,16 @@ irGuardsCompare
 | 42 | j >= 10+0 when CompareLT: ... < ... is false |
 | 44 | 0 < z+0 when CompareGT: ... > ... is true |
 | 44 | 0 >= z+0 when CompareGT: ... > ... is false |
+| 44 | ... > ... != 0 when CompareGT: ... > ... is true |
+| 44 | ... > ... == 0 when CompareGT: ... > ... is false |
 | 44 | z < 0+1 when CompareGT: ... > ... is false |
 | 44 | z < 1 when CompareGT: ... > ... is false |
 | 44 | z >= 0+1 when CompareGT: ... > ... is true |
 | 44 | z >= 1 when CompareGT: ... > ... is true |
 | 45 | 0 < y+0 when CompareGT: ... > ... is true |
 | 45 | 0 >= y+0 when CompareGT: ... > ... is false |
+| 45 | ... > ... != 0 when CompareGT: ... > ... is true |
+| 45 | ... > ... == 0 when CompareGT: ... > ... is false |
 | 45 | y < 0+1 when CompareGT: ... > ... is false |
 | 45 | y < 1 when CompareGT: ... > ... is false |
 | 45 | y >= 0+1 when CompareGT: ... > ... is true |
@@ -639,6 +821,10 @@ irGuardsCompare
 | 58 | 0 < y+1 when CompareLT: ... < ... is false |
 | 58 | 0 == x+0 when CompareEQ: ... == ... is true |
 | 58 | 0 >= y+1 when CompareLT: ... < ... is true |
+| 58 | ... < ... != 0 when CompareLT: ... < ... is true |
+| 58 | ... < ... == 0 when CompareLT: ... < ... is false |
+| 58 | ... == ... != 0 when CompareEQ: ... == ... is true |
+| 58 | ... == ... == 0 when CompareEQ: ... == ... is false |
 | 58 | x != 0 when CompareEQ: ... == ... is false |
 | 58 | x != 0+0 when CompareEQ: ... == ... is false |
 | 58 | x == 0 when CompareEQ: ... == ... is true |
@@ -649,6 +835,8 @@ irGuardsCompare
 | 58 | y >= 0+0 when CompareLT: ... < ... is false |
 | 75 | 0 != x+0 when CompareEQ: ... == ... is false |
 | 75 | 0 == x+0 when CompareEQ: ... == ... is true |
+| 75 | ... == ... != 0 when CompareEQ: ... == ... is true |
+| 75 | ... == ... == 0 when CompareEQ: ... == ... is false |
 | 75 | x != 0 when CompareEQ: ... == ... is false |
 | 75 | x != 0+0 when CompareEQ: ... == ... is false |
 | 75 | x == 0 when CompareEQ: ... == ... is true |
@@ -657,6 +845,10 @@ irGuardsCompare
 | 85 | 0 != y+0 when CompareNE: ... != ... is true |
 | 85 | 0 == x+0 when CompareEQ: ... == ... is true |
 | 85 | 0 == y+0 when CompareNE: ... != ... is false |
+| 85 | ... != ... != 0 when CompareNE: ... != ... is true |
+| 85 | ... != ... == 0 when CompareNE: ... != ... is false |
+| 85 | ... == ... != 0 when CompareEQ: ... == ... is true |
+| 85 | ... == ... == 0 when CompareEQ: ... == ... is false |
 | 85 | x != 0 when CompareEQ: ... == ... is false |
 | 85 | x != 0+0 when CompareEQ: ... == ... is false |
 | 85 | x == 0 when CompareEQ: ... == ... is true |
@@ -667,12 +859,16 @@ irGuardsCompare
 | 85 | y == 0+0 when CompareNE: ... != ... is false |
 | 94 | 0 != x+0 when CompareNE: ... != ... is true |
 | 94 | 0 == x+0 when CompareNE: ... != ... is false |
+| 94 | ... != ... != 0 when CompareNE: ... != ... is true |
+| 94 | ... != ... == 0 when CompareNE: ... != ... is false |
 | 94 | x != 0 when CompareNE: ... != ... is true |
 | 94 | x != 0+0 when CompareNE: ... != ... is true |
 | 94 | x == 0 when CompareNE: ... != ... is false |
 | 94 | x == 0+0 when CompareNE: ... != ... is false |
 | 102 | 10 < j+1 when CompareLT: ... < ... is false |
 | 102 | 10 >= j+1 when CompareLT: ... < ... is true |
+| 102 | ... < ... != 0 when CompareLT: ... < ... is true |
+| 102 | ... < ... == 0 when CompareLT: ... < ... is false |
 | 102 | j < 10 when CompareLT: ... < ... is true |
 | 102 | j < 10+0 when CompareLT: ... < ... is true |
 | 102 | j >= 10 when CompareLT: ... < ... is false |
@@ -681,6 +877,10 @@ irGuardsCompare
 | 109 | 0 < y+1 when CompareLT: ... < ... is false |
 | 109 | 0 == x+0 when CompareEQ: ... == ... is true |
 | 109 | 0 >= y+1 when CompareLT: ... < ... is true |
+| 109 | ... < ... != 0 when CompareLT: ... < ... is true |
+| 109 | ... < ... == 0 when CompareLT: ... < ... is false |
+| 109 | ... == ... != 0 when CompareEQ: ... == ... is true |
+| 109 | ... == ... == 0 when CompareEQ: ... == ... is false |
 | 109 | x != 0 when CompareEQ: ... == ... is false |
 | 109 | x != 0+0 when CompareEQ: ... == ... is false |
 | 109 | x == 0 when CompareEQ: ... == ... is true |
@@ -708,6 +908,8 @@ irGuardsCompare
 | 152 | y == 0 when Load: y is false |
 | 156 | ... + ... != x+0 when CompareEQ: ... == ... is false |
 | 156 | ... + ... == x+0 when CompareEQ: ... == ... is true |
+| 156 | ... == ... != 0 when CompareEQ: ... == ... is true |
+| 156 | ... == ... == 0 when CompareEQ: ... == ... is false |
 | 156 | x != ... + ...+0 when CompareEQ: ... == ... is false |
 | 156 | x != y+42 when CompareEQ: ... == ... is false |
 | 156 | x == ... + ...+0 when CompareEQ: ... == ... is true |
@@ -716,6 +918,8 @@ irGuardsCompare
 | 156 | y == x+-42 when CompareEQ: ... == ... is true |
 | 159 | ... - ... != x+0 when CompareEQ: ... == ... is false |
 | 159 | ... - ... == x+0 when CompareEQ: ... == ... is true |
+| 159 | ... == ... != 0 when CompareEQ: ... == ... is true |
+| 159 | ... == ... == 0 when CompareEQ: ... == ... is false |
 | 159 | x != ... - ...+0 when CompareEQ: ... == ... is false |
 | 159 | x != y+-42 when CompareEQ: ... == ... is false |
 | 159 | x == ... - ...+0 when CompareEQ: ... == ... is true |
@@ -724,6 +928,8 @@ irGuardsCompare
 | 159 | y == x+42 when CompareEQ: ... == ... is true |
 | 162 | ... + ... < x+1 when CompareLT: ... < ... is false |
 | 162 | ... + ... >= x+1 when CompareLT: ... < ... is true |
+| 162 | ... < ... != 0 when CompareLT: ... < ... is true |
+| 162 | ... < ... == 0 when CompareLT: ... < ... is false |
 | 162 | x < ... + ...+0 when CompareLT: ... < ... is true |
 | 162 | x < y+42 when CompareLT: ... < ... is true |
 | 162 | x >= ... + ...+0 when CompareLT: ... < ... is false |
@@ -732,6 +938,8 @@ irGuardsCompare
 | 162 | y >= x+-41 when CompareLT: ... < ... is true |
 | 165 | ... - ... < x+1 when CompareLT: ... < ... is false |
 | 165 | ... - ... >= x+1 when CompareLT: ... < ... is true |
+| 165 | ... < ... != 0 when CompareLT: ... < ... is true |
+| 165 | ... < ... == 0 when CompareLT: ... < ... is false |
 | 165 | x < ... - ...+0 when CompareLT: ... < ... is true |
 | 165 | x < y+-42 when CompareLT: ... < ... is true |
 | 165 | x >= ... - ...+0 when CompareLT: ... < ... is false |
@@ -740,6 +948,8 @@ irGuardsCompare
 | 165 | y >= x+43 when CompareLT: ... < ... is true |
 | 175 | 0 != call to foo+0 when CompareEQ: ... == ... is false |
 | 175 | 0 == call to foo+0 when CompareEQ: ... == ... is true |
+| 175 | ... == ... != 0 when CompareEQ: ... == ... is true |
+| 175 | ... == ... == 0 when CompareEQ: ... == ... is false |
 | 175 | call to foo != 0 when CompareEQ: ... == ... is false |
 | 175 | call to foo != 0+0 when CompareEQ: ... == ... is false |
 | 175 | call to foo == 0 when CompareEQ: ... == ... is true |
@@ -930,6 +1140,14 @@ irGuardsEnsure
 | test.c:75:9:75:14 | CompareEQ: ... == ... | test.c:75:9:75:9 | Load: x | == | test.c:75:14:75:14 | Constant: 0 | 0 | 76 | 76 |
 | test.c:75:9:75:14 | CompareEQ: ... == ... | test.c:75:14:75:14 | Constant: 0 | != | test.c:75:9:75:9 | Load: x | 0 | 79 | 79 |
 | test.c:75:9:75:14 | CompareEQ: ... == ... | test.c:75:14:75:14 | Constant: 0 | == | test.c:75:9:75:9 | Load: x | 0 | 76 | 76 |
+| test.c:75:9:75:14 | CompareEQ: ... == ... | test.c:85:8:85:8 | Load: x | != | test.c:85:13:85:13 | Constant: 0 | 0 | 79 | 79 |
+| test.c:75:9:75:14 | CompareEQ: ... == ... | test.c:85:8:85:8 | Load: x | == | test.c:85:13:85:13 | Constant: 0 | 0 | 76 | 76 |
+| test.c:75:9:75:14 | CompareEQ: ... == ... | test.c:85:13:85:13 | Constant: 0 | != | test.c:85:8:85:8 | Load: x | 0 | 79 | 79 |
+| test.c:75:9:75:14 | CompareEQ: ... == ... | test.c:85:13:85:13 | Constant: 0 | == | test.c:85:8:85:8 | Load: x | 0 | 76 | 76 |
+| test.c:85:8:85:13 | CompareEQ: ... == ... | test.c:75:9:75:9 | Load: x | == | test.c:75:14:75:14 | Constant: 0 | 0 | 85 | 85 |
+| test.c:85:8:85:13 | CompareEQ: ... == ... | test.c:75:9:75:9 | Load: x | == | test.c:75:14:75:14 | Constant: 0 | 0 | 86 | 86 |
+| test.c:85:8:85:13 | CompareEQ: ... == ... | test.c:75:14:75:14 | Constant: 0 | == | test.c:75:9:75:9 | Load: x | 0 | 85 | 85 |
+| test.c:85:8:85:13 | CompareEQ: ... == ... | test.c:75:14:75:14 | Constant: 0 | == | test.c:75:9:75:9 | Load: x | 0 | 86 | 86 |
 | test.c:85:8:85:13 | CompareEQ: ... == ... | test.c:85:8:85:8 | Load: x | == | test.c:85:13:85:13 | Constant: 0 | 0 | 85 | 85 |
 | test.c:85:8:85:13 | CompareEQ: ... == ... | test.c:85:8:85:8 | Load: x | == | test.c:85:13:85:13 | Constant: 0 | 0 | 86 | 86 |
 | test.c:85:8:85:13 | CompareEQ: ... == ... | test.c:85:13:85:13 | Constant: 0 | == | test.c:85:8:85:8 | Load: x | 0 | 85 | 85 |
@@ -1003,9 +1221,14 @@ irGuardsEnsure
 irGuardsEnsure_const
 | test.c:7:9:7:13 | CompareGT: ... > ... | test.c:7:9:7:9 | Load: x | < | 1 | 11 | 11 |
 | test.c:7:9:7:13 | CompareGT: ... > ... | test.c:7:9:7:9 | Load: x | >= | 1 | 8 | 8 |
+| test.c:7:9:7:13 | CompareGT: ... > ... | test.c:7:9:7:13 | CompareGT: ... > ... | != | 0 | 8 | 8 |
+| test.c:7:9:7:13 | CompareGT: ... > ... | test.c:7:9:7:13 | CompareGT: ... > ... | == | 0 | 11 | 11 |
 | test.c:17:8:17:12 | CompareLT: ... < ... | test.c:17:8:17:8 | Load: x | < | 0 | 17 | 17 |
 | test.c:17:8:17:12 | CompareLT: ... < ... | test.c:17:8:17:8 | Load: x | < | 0 | 18 | 18 |
+| test.c:17:8:17:12 | CompareLT: ... < ... | test.c:17:8:17:12 | CompareLT: ... < ... | != | 0 | 17 | 17 |
+| test.c:17:8:17:12 | CompareLT: ... < ... | test.c:17:8:17:12 | CompareLT: ... < ... | != | 0 | 18 | 18 |
 | test.c:17:17:17:21 | CompareGT: ... > ... | test.c:17:17:17:17 | Load: y | >= | 2 | 18 | 18 |
+| test.c:17:17:17:21 | CompareGT: ... > ... | test.c:17:17:17:21 | CompareGT: ... > ... | != | 0 | 18 | 18 |
 | test.c:26:11:26:15 | CompareGT: ... > ... | test.c:26:11:26:11 | Load: x | < | 1 | 2 | 2 |
 | test.c:26:11:26:15 | CompareGT: ... > ... | test.c:26:11:26:11 | Load: x | < | 1 | 31 | 31 |
 | test.c:26:11:26:15 | CompareGT: ... > ... | test.c:26:11:26:11 | Load: x | < | 1 | 34 | 34 |
@@ -1021,6 +1244,21 @@ irGuardsEnsure_const
 | test.c:26:11:26:15 | CompareGT: ... > ... | test.c:26:11:26:11 | Load: x | < | 1 | 59 | 59 |
 | test.c:26:11:26:15 | CompareGT: ... > ... | test.c:26:11:26:11 | Load: x | < | 1 | 62 | 62 |
 | test.c:26:11:26:15 | CompareGT: ... > ... | test.c:26:11:26:11 | Load: x | >= | 1 | 27 | 27 |
+| test.c:26:11:26:15 | CompareGT: ... > ... | test.c:26:11:26:15 | CompareGT: ... > ... | != | 0 | 27 | 27 |
+| test.c:26:11:26:15 | CompareGT: ... > ... | test.c:26:11:26:15 | CompareGT: ... > ... | == | 0 | 2 | 2 |
+| test.c:26:11:26:15 | CompareGT: ... > ... | test.c:26:11:26:15 | CompareGT: ... > ... | == | 0 | 31 | 31 |
+| test.c:26:11:26:15 | CompareGT: ... > ... | test.c:26:11:26:15 | CompareGT: ... > ... | == | 0 | 34 | 34 |
+| test.c:26:11:26:15 | CompareGT: ... > ... | test.c:26:11:26:15 | CompareGT: ... > ... | == | 0 | 35 | 35 |
+| test.c:26:11:26:15 | CompareGT: ... > ... | test.c:26:11:26:15 | CompareGT: ... > ... | == | 0 | 39 | 39 |
+| test.c:26:11:26:15 | CompareGT: ... > ... | test.c:26:11:26:15 | CompareGT: ... > ... | == | 0 | 42 | 42 |
+| test.c:26:11:26:15 | CompareGT: ... > ... | test.c:26:11:26:15 | CompareGT: ... > ... | == | 0 | 43 | 43 |
+| test.c:26:11:26:15 | CompareGT: ... > ... | test.c:26:11:26:15 | CompareGT: ... > ... | == | 0 | 45 | 45 |
+| test.c:26:11:26:15 | CompareGT: ... > ... | test.c:26:11:26:15 | CompareGT: ... > ... | == | 0 | 46 | 46 |
+| test.c:26:11:26:15 | CompareGT: ... > ... | test.c:26:11:26:15 | CompareGT: ... > ... | == | 0 | 52 | 52 |
+| test.c:26:11:26:15 | CompareGT: ... > ... | test.c:26:11:26:15 | CompareGT: ... > ... | == | 0 | 56 | 56 |
+| test.c:26:11:26:15 | CompareGT: ... > ... | test.c:26:11:26:15 | CompareGT: ... > ... | == | 0 | 58 | 58 |
+| test.c:26:11:26:15 | CompareGT: ... > ... | test.c:26:11:26:15 | CompareGT: ... > ... | == | 0 | 59 | 59 |
+| test.c:26:11:26:15 | CompareGT: ... > ... | test.c:26:11:26:15 | CompareGT: ... > ... | == | 0 | 62 | 62 |
 | test.c:34:16:34:21 | CompareLT: ... < ... | test.c:34:16:34:16 | Load: j | < | 10 | 35 | 35 |
 | test.c:34:16:34:21 | CompareLT: ... < ... | test.c:34:16:34:16 | Load: j | >= | 10 | 2 | 2 |
 | test.c:34:16:34:21 | CompareLT: ... < ... | test.c:34:16:34:16 | Load: j | >= | 10 | 39 | 39 |
@@ -1033,22 +1271,58 @@ irGuardsEnsure_const
 | test.c:34:16:34:21 | CompareLT: ... < ... | test.c:34:16:34:16 | Load: j | >= | 10 | 58 | 58 |
 | test.c:34:16:34:21 | CompareLT: ... < ... | test.c:34:16:34:16 | Load: j | >= | 10 | 59 | 59 |
 | test.c:34:16:34:21 | CompareLT: ... < ... | test.c:34:16:34:16 | Load: j | >= | 10 | 62 | 62 |
+| test.c:34:16:34:21 | CompareLT: ... < ... | test.c:34:16:34:21 | CompareLT: ... < ... | != | 0 | 35 | 35 |
+| test.c:34:16:34:21 | CompareLT: ... < ... | test.c:34:16:34:21 | CompareLT: ... < ... | == | 0 | 2 | 2 |
+| test.c:34:16:34:21 | CompareLT: ... < ... | test.c:34:16:34:21 | CompareLT: ... < ... | == | 0 | 39 | 39 |
+| test.c:34:16:34:21 | CompareLT: ... < ... | test.c:34:16:34:21 | CompareLT: ... < ... | == | 0 | 42 | 42 |
+| test.c:34:16:34:21 | CompareLT: ... < ... | test.c:34:16:34:21 | CompareLT: ... < ... | == | 0 | 43 | 43 |
+| test.c:34:16:34:21 | CompareLT: ... < ... | test.c:34:16:34:21 | CompareLT: ... < ... | == | 0 | 45 | 45 |
+| test.c:34:16:34:21 | CompareLT: ... < ... | test.c:34:16:34:21 | CompareLT: ... < ... | == | 0 | 46 | 46 |
+| test.c:34:16:34:21 | CompareLT: ... < ... | test.c:34:16:34:21 | CompareLT: ... < ... | == | 0 | 52 | 52 |
+| test.c:34:16:34:21 | CompareLT: ... < ... | test.c:34:16:34:21 | CompareLT: ... < ... | == | 0 | 56 | 56 |
+| test.c:34:16:34:21 | CompareLT: ... < ... | test.c:34:16:34:21 | CompareLT: ... < ... | == | 0 | 58 | 58 |
+| test.c:34:16:34:21 | CompareLT: ... < ... | test.c:34:16:34:21 | CompareLT: ... < ... | == | 0 | 59 | 59 |
+| test.c:34:16:34:21 | CompareLT: ... < ... | test.c:34:16:34:21 | CompareLT: ... < ... | == | 0 | 62 | 62 |
 | test.c:42:16:42:21 | CompareLT: ... < ... | test.c:42:16:42:16 | Load: j | < | 10 | 43 | 43 |
 | test.c:42:16:42:21 | CompareLT: ... < ... | test.c:42:16:42:16 | Load: j | < | 10 | 45 | 45 |
 | test.c:42:16:42:21 | CompareLT: ... < ... | test.c:42:16:42:16 | Load: j | < | 10 | 46 | 46 |
 | test.c:42:16:42:21 | CompareLT: ... < ... | test.c:42:16:42:16 | Load: j | < | 10 | 52 | 52 |
+| test.c:42:16:42:21 | CompareLT: ... < ... | test.c:42:16:42:21 | CompareLT: ... < ... | != | 0 | 43 | 43 |
+| test.c:42:16:42:21 | CompareLT: ... < ... | test.c:42:16:42:21 | CompareLT: ... < ... | != | 0 | 45 | 45 |
+| test.c:42:16:42:21 | CompareLT: ... < ... | test.c:42:16:42:21 | CompareLT: ... < ... | != | 0 | 46 | 46 |
+| test.c:42:16:42:21 | CompareLT: ... < ... | test.c:42:16:42:21 | CompareLT: ... < ... | != | 0 | 52 | 52 |
 | test.c:44:12:44:16 | CompareGT: ... > ... | test.c:44:12:44:12 | Load: z | < | 1 | 52 | 52 |
 | test.c:44:12:44:16 | CompareGT: ... > ... | test.c:44:12:44:12 | Load: z | >= | 1 | 45 | 45 |
 | test.c:44:12:44:16 | CompareGT: ... > ... | test.c:44:12:44:12 | Load: z | >= | 1 | 46 | 46 |
+| test.c:44:12:44:16 | CompareGT: ... > ... | test.c:44:12:44:16 | CompareGT: ... > ... | != | 0 | 45 | 45 |
+| test.c:44:12:44:16 | CompareGT: ... > ... | test.c:44:12:44:16 | CompareGT: ... > ... | != | 0 | 46 | 46 |
+| test.c:44:12:44:16 | CompareGT: ... > ... | test.c:44:12:44:16 | CompareGT: ... > ... | == | 0 | 52 | 52 |
 | test.c:45:16:45:20 | CompareGT: ... > ... | test.c:45:16:45:16 | Load: y | >= | 1 | 46 | 46 |
+| test.c:45:16:45:20 | CompareGT: ... > ... | test.c:45:16:45:20 | CompareGT: ... > ... | != | 0 | 46 | 46 |
 | test.c:58:9:58:14 | CompareEQ: ... == ... | test.c:58:9:58:9 | Load: x | != | 0 | 58 | 58 |
 | test.c:58:9:58:14 | CompareEQ: ... == ... | test.c:58:9:58:9 | Load: x | != | 0 | 62 | 62 |
+| test.c:58:9:58:14 | CompareEQ: ... == ... | test.c:58:9:58:14 | CompareEQ: ... == ... | == | 0 | 58 | 58 |
+| test.c:58:9:58:14 | CompareEQ: ... == ... | test.c:58:9:58:14 | CompareEQ: ... == ... | == | 0 | 62 | 62 |
 | test.c:58:19:58:23 | CompareLT: ... < ... | test.c:58:19:58:19 | Load: y | >= | 0 | 62 | 62 |
+| test.c:58:19:58:23 | CompareLT: ... < ... | test.c:58:19:58:23 | CompareLT: ... < ... | == | 0 | 62 | 62 |
 | test.c:75:9:75:14 | CompareEQ: ... == ... | test.c:75:9:75:9 | Load: x | != | 0 | 79 | 79 |
 | test.c:75:9:75:14 | CompareEQ: ... == ... | test.c:75:9:75:9 | Load: x | == | 0 | 76 | 76 |
+| test.c:75:9:75:14 | CompareEQ: ... == ... | test.c:75:9:75:14 | CompareEQ: ... == ... | != | 0 | 76 | 76 |
+| test.c:75:9:75:14 | CompareEQ: ... == ... | test.c:75:9:75:14 | CompareEQ: ... == ... | == | 0 | 79 | 79 |
+| test.c:75:9:75:14 | CompareEQ: ... == ... | test.c:85:8:85:8 | Load: x | != | 0 | 79 | 79 |
+| test.c:75:9:75:14 | CompareEQ: ... == ... | test.c:85:8:85:8 | Load: x | == | 0 | 76 | 76 |
+| test.c:75:9:75:14 | CompareEQ: ... == ... | test.c:85:8:85:13 | CompareEQ: ... == ... | != | 0 | 76 | 76 |
+| test.c:75:9:75:14 | CompareEQ: ... == ... | test.c:85:8:85:13 | CompareEQ: ... == ... | == | 0 | 79 | 79 |
+| test.c:85:8:85:13 | CompareEQ: ... == ... | test.c:75:9:75:9 | Load: x | == | 0 | 85 | 85 |
+| test.c:85:8:85:13 | CompareEQ: ... == ... | test.c:75:9:75:9 | Load: x | == | 0 | 86 | 86 |
+| test.c:85:8:85:13 | CompareEQ: ... == ... | test.c:75:9:75:14 | CompareEQ: ... == ... | != | 0 | 85 | 85 |
+| test.c:85:8:85:13 | CompareEQ: ... == ... | test.c:75:9:75:14 | CompareEQ: ... == ... | != | 0 | 86 | 86 |
 | test.c:85:8:85:13 | CompareEQ: ... == ... | test.c:85:8:85:8 | Load: x | == | 0 | 85 | 85 |
 | test.c:85:8:85:13 | CompareEQ: ... == ... | test.c:85:8:85:8 | Load: x | == | 0 | 86 | 86 |
+| test.c:85:8:85:13 | CompareEQ: ... == ... | test.c:85:8:85:13 | CompareEQ: ... == ... | != | 0 | 85 | 85 |
+| test.c:85:8:85:13 | CompareEQ: ... == ... | test.c:85:8:85:13 | CompareEQ: ... == ... | != | 0 | 86 | 86 |
 | test.c:85:18:85:23 | CompareNE: ... != ... | test.c:85:18:85:18 | Load: y | != | 0 | 86 | 86 |
+| test.c:85:18:85:23 | CompareNE: ... != ... | test.c:85:18:85:23 | CompareNE: ... != ... | != | 0 | 86 | 86 |
 | test.c:94:11:94:16 | CompareNE: ... != ... | test.c:94:11:94:11 | Load: x | != | 0 | 95 | 95 |
 | test.c:94:11:94:16 | CompareNE: ... != ... | test.c:94:11:94:11 | Load: x | == | 0 | 70 | 70 |
 | test.c:94:11:94:16 | CompareNE: ... != ... | test.c:94:11:94:11 | Load: x | == | 0 | 99 | 99 |
@@ -1058,34 +1332,78 @@ irGuardsEnsure_const
 | test.c:94:11:94:16 | CompareNE: ... != ... | test.c:94:11:94:11 | Load: x | == | 0 | 109 | 109 |
 | test.c:94:11:94:16 | CompareNE: ... != ... | test.c:94:11:94:11 | Load: x | == | 0 | 110 | 110 |
 | test.c:94:11:94:16 | CompareNE: ... != ... | test.c:94:11:94:11 | Load: x | == | 0 | 113 | 113 |
+| test.c:94:11:94:16 | CompareNE: ... != ... | test.c:94:11:94:16 | CompareNE: ... != ... | != | 0 | 95 | 95 |
+| test.c:94:11:94:16 | CompareNE: ... != ... | test.c:94:11:94:16 | CompareNE: ... != ... | == | 0 | 70 | 70 |
+| test.c:94:11:94:16 | CompareNE: ... != ... | test.c:94:11:94:16 | CompareNE: ... != ... | == | 0 | 99 | 99 |
+| test.c:94:11:94:16 | CompareNE: ... != ... | test.c:94:11:94:16 | CompareNE: ... != ... | == | 0 | 102 | 102 |
+| test.c:94:11:94:16 | CompareNE: ... != ... | test.c:94:11:94:16 | CompareNE: ... != ... | == | 0 | 103 | 103 |
+| test.c:94:11:94:16 | CompareNE: ... != ... | test.c:94:11:94:16 | CompareNE: ... != ... | == | 0 | 107 | 107 |
+| test.c:94:11:94:16 | CompareNE: ... != ... | test.c:94:11:94:16 | CompareNE: ... != ... | == | 0 | 109 | 109 |
+| test.c:94:11:94:16 | CompareNE: ... != ... | test.c:94:11:94:16 | CompareNE: ... != ... | == | 0 | 110 | 110 |
+| test.c:94:11:94:16 | CompareNE: ... != ... | test.c:94:11:94:16 | CompareNE: ... != ... | == | 0 | 113 | 113 |
 | test.c:102:16:102:21 | CompareLT: ... < ... | test.c:102:16:102:16 | Load: j | < | 10 | 103 | 103 |
 | test.c:102:16:102:21 | CompareLT: ... < ... | test.c:102:16:102:16 | Load: j | >= | 10 | 70 | 70 |
 | test.c:102:16:102:21 | CompareLT: ... < ... | test.c:102:16:102:16 | Load: j | >= | 10 | 107 | 107 |
 | test.c:102:16:102:21 | CompareLT: ... < ... | test.c:102:16:102:16 | Load: j | >= | 10 | 109 | 109 |
 | test.c:102:16:102:21 | CompareLT: ... < ... | test.c:102:16:102:16 | Load: j | >= | 10 | 110 | 110 |
 | test.c:102:16:102:21 | CompareLT: ... < ... | test.c:102:16:102:16 | Load: j | >= | 10 | 113 | 113 |
+| test.c:102:16:102:21 | CompareLT: ... < ... | test.c:102:16:102:21 | CompareLT: ... < ... | != | 0 | 103 | 103 |
+| test.c:102:16:102:21 | CompareLT: ... < ... | test.c:102:16:102:21 | CompareLT: ... < ... | == | 0 | 70 | 70 |
+| test.c:102:16:102:21 | CompareLT: ... < ... | test.c:102:16:102:21 | CompareLT: ... < ... | == | 0 | 107 | 107 |
+| test.c:102:16:102:21 | CompareLT: ... < ... | test.c:102:16:102:21 | CompareLT: ... < ... | == | 0 | 109 | 109 |
+| test.c:102:16:102:21 | CompareLT: ... < ... | test.c:102:16:102:21 | CompareLT: ... < ... | == | 0 | 110 | 110 |
+| test.c:102:16:102:21 | CompareLT: ... < ... | test.c:102:16:102:21 | CompareLT: ... < ... | == | 0 | 113 | 113 |
 | test.c:109:9:109:14 | CompareEQ: ... == ... | test.c:109:9:109:9 | Load: x | != | 0 | 109 | 109 |
 | test.c:109:9:109:14 | CompareEQ: ... == ... | test.c:109:9:109:9 | Load: x | != | 0 | 113 | 113 |
+| test.c:109:9:109:14 | CompareEQ: ... == ... | test.c:109:9:109:14 | CompareEQ: ... == ... | == | 0 | 109 | 109 |
+| test.c:109:9:109:14 | CompareEQ: ... == ... | test.c:109:9:109:14 | CompareEQ: ... == ... | == | 0 | 113 | 113 |
 | test.c:109:19:109:23 | CompareLT: ... < ... | test.c:109:19:109:19 | Load: y | >= | 0 | 113 | 113 |
+| test.c:109:19:109:23 | CompareLT: ... < ... | test.c:109:19:109:23 | CompareLT: ... < ... | == | 0 | 113 | 113 |
 | test.c:126:7:126:7 | Constant: 1 | test.c:126:7:126:7 | Constant: 1 | != | 0 | 126 | 126 |
 | test.c:126:7:126:7 | Constant: 1 | test.c:126:7:126:7 | Constant: 1 | != | 0 | 127 | 127 |
 | test.c:126:7:126:7 | Constant: 1 | test.c:126:7:126:7 | Constant: 1 | != | 0 | 131 | 131 |
 | test.c:126:7:126:7 | Constant: 1 | test.c:126:7:126:7 | Constant: 1 | != | 0 | 132 | 132 |
 | test.c:126:7:126:7 | Constant: 1 | test.c:126:7:126:7 | Constant: 1 | != | 0 | 134 | 134 |
+| test.c:126:7:126:7 | Constant: 1 | test.c:127:5:127:9 | Store: ... = ... | != | 0 | 126 | 126 |
+| test.c:126:7:126:7 | Constant: 1 | test.c:127:5:127:9 | Store: ... = ... | != | 0 | 127 | 127 |
+| test.c:126:7:126:7 | Constant: 1 | test.c:127:5:127:9 | Store: ... = ... | != | 0 | 131 | 131 |
+| test.c:126:7:126:7 | Constant: 1 | test.c:127:5:127:9 | Store: ... = ... | != | 0 | 132 | 132 |
+| test.c:126:7:126:7 | Constant: 1 | test.c:127:5:127:9 | Store: ... = ... | != | 0 | 134 | 134 |
+| test.c:126:7:126:7 | Constant: 1 | test.c:127:9:127:9 | Constant: 1 | != | 0 | 126 | 126 |
+| test.c:126:7:126:7 | Constant: 1 | test.c:127:9:127:9 | Constant: 1 | != | 0 | 127 | 127 |
+| test.c:126:7:126:7 | Constant: 1 | test.c:127:9:127:9 | Constant: 1 | != | 0 | 131 | 131 |
+| test.c:126:7:126:7 | Constant: 1 | test.c:127:9:127:9 | Constant: 1 | != | 0 | 132 | 132 |
+| test.c:126:7:126:7 | Constant: 1 | test.c:127:9:127:9 | Constant: 1 | != | 0 | 134 | 134 |
 | test.c:126:12:126:26 | Call: call to test3_condition | test.c:126:12:126:26 | Call: call to test3_condition | != | 0 | 127 | 127 |
 | test.c:131:7:131:7 | Load: b | test.c:131:7:131:7 | Load: b | != | 0 | 132 | 132 |
+| test.c:131:7:131:7 | Load: b | test.c:131:7:131:7 | Phi: b | != | 0 | 132 | 132 |
 | test.c:137:7:137:7 | Constant: 0 | test.c:137:7:137:7 | Constant: 0 | == | 0 | 142 | 142 |
 | test.c:146:7:146:8 | LogicalNot: ! ... | test.c:146:7:146:8 | LogicalNot: ! ... | != | 0 | 147 | 147 |
+| test.c:146:8:146:8 | Load: x | test.c:145:16:145:16 | InitializeParameter: x | == | 0 | 147 | 147 |
 | test.c:146:8:146:8 | Load: x | test.c:146:8:146:8 | Load: x | == | 0 | 147 | 147 |
+| test.c:152:10:152:10 | Load: x | test.c:151:16:151:16 | InitializeParameter: x | != | 0 | 152 | 152 |
 | test.c:152:10:152:10 | Load: x | test.c:152:10:152:10 | Load: x | != | 0 | 152 | 152 |
+| test.c:152:15:152:15 | Load: y | test.c:151:23:151:23 | InitializeParameter: y | != | 0 | 152 | 152 |
 | test.c:152:15:152:15 | Load: y | test.c:152:15:152:15 | Load: y | != | 0 | 152 | 152 |
+| test.c:156:9:156:19 | CompareEQ: ... == ... | test.c:156:9:156:19 | CompareEQ: ... == ... | != | 0 | 156 | 157 |
+| test.c:159:9:159:19 | CompareEQ: ... == ... | test.c:159:9:159:19 | CompareEQ: ... == ... | != | 0 | 159 | 160 |
+| test.c:162:9:162:18 | CompareLT: ... < ... | test.c:162:9:162:18 | CompareLT: ... < ... | != | 0 | 162 | 163 |
+| test.c:165:9:165:18 | CompareLT: ... < ... | test.c:165:9:165:18 | CompareLT: ... < ... | != | 0 | 165 | 166 |
 | test.c:175:13:175:32 | CompareEQ: ... == ... | test.c:175:13:175:15 | Call: call to foo | != | 0 | 175 | 175 |
 | test.c:175:13:175:32 | CompareEQ: ... == ... | test.c:175:13:175:15 | Call: call to foo | == | 0 | 175 | 175 |
+| test.c:175:13:175:32 | CompareEQ: ... == ... | test.c:175:13:175:32 | CompareEQ: ... == ... | != | 0 | 175 | 175 |
+| test.c:175:13:175:32 | CompareEQ: ... == ... | test.c:175:13:175:32 | CompareEQ: ... == ... | == | 0 | 175 | 175 |
+| test.c:181:9:181:9 | Load: x | test.c:180:20:180:20 | InitializeParameter: x | != | 0 | 182 | 182 |
+| test.c:181:9:181:9 | Load: x | test.c:180:20:180:20 | InitializeParameter: x | == | 0 | 184 | 184 |
 | test.c:181:9:181:9 | Load: x | test.c:181:9:181:9 | Load: x | != | 0 | 182 | 182 |
 | test.c:181:9:181:9 | Load: x | test.c:181:9:181:9 | Load: x | == | 0 | 184 | 184 |
 | test.cpp:18:8:18:12 | CompareNE: (bool)... | test.cpp:18:8:18:10 | Call: call to get | != | 0 | 19 | 19 |
+| test.cpp:18:8:18:12 | CompareNE: (bool)... | test.cpp:18:8:18:12 | CompareNE: (bool)... | != | 0 | 19 | 19 |
 | test.cpp:31:7:31:13 | CompareEQ: ... == ... | test.cpp:31:7:31:7 | Load: x | != | -1 | 34 | 34 |
 | test.cpp:31:7:31:13 | CompareEQ: ... == ... | test.cpp:31:7:31:7 | Load: x | == | -1 | 30 | 30 |
 | test.cpp:31:7:31:13 | CompareEQ: ... == ... | test.cpp:31:7:31:7 | Load: x | == | -1 | 32 | 32 |
+| test.cpp:31:7:31:13 | CompareEQ: ... == ... | test.cpp:31:7:31:13 | CompareEQ: ... == ... | != | 0 | 30 | 30 |
+| test.cpp:31:7:31:13 | CompareEQ: ... == ... | test.cpp:31:7:31:13 | CompareEQ: ... == ... | != | 0 | 32 | 32 |
+| test.cpp:31:7:31:13 | CompareEQ: ... == ... | test.cpp:31:7:31:13 | CompareEQ: ... == ... | == | 0 | 34 | 34 |
 | test.cpp:42:13:42:20 | Call: call to getABool | test.cpp:42:13:42:20 | Call: call to getABool | != | 0 | 44 | 44 |
 | test.cpp:42:13:42:20 | Call: call to getABool | test.cpp:42:13:42:20 | Call: call to getABool | == | 0 | 53 | 53 |
diff --git a/cpp/ql/test/library-tests/controlflow/guards/GuardsCompare.expected b/cpp/ql/test/library-tests/controlflow/guards/GuardsCompare.expected
index 8480a1f8613..4f44591e0b8 100644
--- a/cpp/ql/test/library-tests/controlflow/guards/GuardsCompare.expected
+++ b/cpp/ql/test/library-tests/controlflow/guards/GuardsCompare.expected
@@ -1,5 +1,7 @@
 | 7 | 0 < x+0 when ... > ... is true |
 | 7 | 0 >= x+0 when ... > ... is false |
+| 7 | ... > ... != 0 when ... > ... is true |
+| 7 | ... > ... == 0 when ... > ... is false |
 | 7 | x < 0+1 when ... > ... is false |
 | 7 | x < 1 when ... > ... is false |
 | 7 | x >= 0+1 when ... > ... is true |
@@ -10,6 +12,12 @@
 | 17 | 1 < y+0 when ... && ... is true |
 | 17 | 1 < y+0 when ... > ... is true |
 | 17 | 1 >= y+0 when ... > ... is false |
+| 17 | ... < ... != 0 when ... && ... is true |
+| 17 | ... < ... != 0 when ... < ... is true |
+| 17 | ... < ... == 0 when ... < ... is false |
+| 17 | ... > ... != 0 when ... && ... is true |
+| 17 | ... > ... != 0 when ... > ... is true |
+| 17 | ... > ... == 0 when ... > ... is false |
 | 17 | x < 0 when ... && ... is true |
 | 17 | x < 0 when ... < ... is true |
 | 17 | x < 0+0 when ... && ... is true |
@@ -26,24 +34,32 @@
 | 18 | call to get == 0 when call to get is false |
 | 26 | 0 < x+0 when ... > ... is true |
 | 26 | 0 >= x+0 when ... > ... is false |
+| 26 | ... > ... != 0 when ... > ... is true |
+| 26 | ... > ... == 0 when ... > ... is false |
 | 26 | x < 0+1 when ... > ... is false |
 | 26 | x < 1 when ... > ... is false |
 | 26 | x >= 0+1 when ... > ... is true |
 | 26 | x >= 1 when ... > ... is true |
 | 31 | - ... != x+0 when ... == ... is false |
 | 31 | - ... == x+0 when ... == ... is true |
+| 31 | ... == ... != 0 when ... == ... is true |
+| 31 | ... == ... == 0 when ... == ... is false |
 | 31 | x != -1 when ... == ... is false |
 | 31 | x != - ...+0 when ... == ... is false |
 | 31 | x == -1 when ... == ... is true |
 | 31 | x == - ...+0 when ... == ... is true |
 | 34 | 10 < j+1 when ... < ... is false |
 | 34 | 10 >= j+1 when ... < ... is true |
+| 34 | ... < ... != 0 when ... < ... is true |
+| 34 | ... < ... == 0 when ... < ... is false |
 | 34 | j < 10 when ... < ... is true |
 | 34 | j < 10+0 when ... < ... is true |
 | 34 | j >= 10 when ... < ... is false |
 | 34 | j >= 10+0 when ... < ... is false |
 | 42 | 10 < j+1 when ... < ... is false |
 | 42 | 10 >= j+1 when ... < ... is true |
+| 42 | ... < ... != 0 when ... < ... is true |
+| 42 | ... < ... == 0 when ... < ... is false |
 | 42 | call to getABool != 0 when call to getABool is true |
 | 42 | call to getABool == 0 when call to getABool is false |
 | 42 | j < 10 when ... < ... is true |
@@ -52,12 +68,16 @@
 | 42 | j >= 10+0 when ... < ... is false |
 | 44 | 0 < z+0 when ... > ... is true |
 | 44 | 0 >= z+0 when ... > ... is false |
+| 44 | ... > ... != 0 when ... > ... is true |
+| 44 | ... > ... == 0 when ... > ... is false |
 | 44 | z < 0+1 when ... > ... is false |
 | 44 | z < 1 when ... > ... is false |
 | 44 | z >= 0+1 when ... > ... is true |
 | 44 | z >= 1 when ... > ... is true |
 | 45 | 0 < y+0 when ... > ... is true |
 | 45 | 0 >= y+0 when ... > ... is false |
+| 45 | ... > ... != 0 when ... > ... is true |
+| 45 | ... > ... == 0 when ... > ... is false |
 | 45 | y < 0+1 when ... > ... is false |
 | 45 | y < 1 when ... > ... is false |
 | 45 | y >= 0+1 when ... > ... is true |
@@ -68,6 +88,12 @@
 | 58 | 0 < y+1 when ... \|\| ... is false |
 | 58 | 0 == x+0 when ... == ... is true |
 | 58 | 0 >= y+1 when ... < ... is true |
+| 58 | ... < ... != 0 when ... < ... is true |
+| 58 | ... < ... == 0 when ... < ... is false |
+| 58 | ... < ... == 0 when ... \|\| ... is false |
+| 58 | ... == ... != 0 when ... == ... is true |
+| 58 | ... == ... == 0 when ... == ... is false |
+| 58 | ... == ... == 0 when ... \|\| ... is false |
 | 58 | x != 0 when ... == ... is false |
 | 58 | x != 0 when ... \|\| ... is false |
 | 58 | x != 0+0 when ... == ... is false |
@@ -89,6 +115,8 @@
 | 74 | i >= 11 when i is Case[11..20] |
 | 75 | 0 != x+0 when ... == ... is false |
 | 75 | 0 == x+0 when ... == ... is true |
+| 75 | ... == ... != 0 when ... == ... is true |
+| 75 | ... == ... == 0 when ... == ... is false |
 | 75 | x != 0 when ... == ... is false |
 | 75 | x != 0+0 when ... == ... is false |
 | 75 | x == 0 when ... == ... is true |
@@ -99,6 +127,12 @@
 | 85 | 0 == x+0 when ... && ... is true |
 | 85 | 0 == x+0 when ... == ... is true |
 | 85 | 0 == y+0 when ... != ... is false |
+| 85 | ... != ... != 0 when ... != ... is true |
+| 85 | ... != ... != 0 when ... && ... is true |
+| 85 | ... != ... == 0 when ... != ... is false |
+| 85 | ... == ... != 0 when ... && ... is true |
+| 85 | ... == ... != 0 when ... == ... is true |
+| 85 | ... == ... == 0 when ... == ... is false |
 | 85 | x != 0 when ... == ... is false |
 | 85 | x != 0+0 when ... == ... is false |
 | 85 | x == 0 when ... && ... is true |
@@ -115,18 +149,26 @@
 | 93 | c == 0 when c is false |
 | 94 | 0 != x+0 when ... != ... is true |
 | 94 | 0 == x+0 when ... != ... is false |
+| 94 | ... != ... != 0 when ... != ... is true |
+| 94 | ... != ... == 0 when ... != ... is false |
 | 94 | x != 0 when ... != ... is true |
 | 94 | x != 0+0 when ... != ... is true |
 | 94 | x == 0 when ... != ... is false |
 | 94 | x == 0+0 when ... != ... is false |
+| 99 | f != 0 when f is true |
+| 99 | f == 0 when f is false |
 | 102 | 10 < j+1 when ... < ... is false |
 | 102 | 10 >= j+1 when ... < ... is true |
+| 102 | ... < ... != 0 when ... < ... is true |
+| 102 | ... < ... == 0 when ... < ... is false |
 | 102 | j < 10 when ... < ... is true |
 | 102 | j < 10+0 when ... < ... is true |
 | 102 | j >= 10 when ... < ... is false |
 | 102 | j >= 10+0 when ... < ... is false |
 | 105 | 0.0 != f+0 when ... != ... is true |
 | 105 | 0.0 == f+0 when ... != ... is false |
+| 105 | ... != ... != 0 when ... != ... is true |
+| 105 | ... != ... == 0 when ... != ... is false |
 | 105 | f != 0.0+0 when ... != ... is true |
 | 105 | f == 0.0+0 when ... != ... is false |
 | 109 | 0 != x+0 when ... == ... is false |
@@ -135,6 +177,12 @@
 | 109 | 0 < y+1 when ... \|\| ... is false |
 | 109 | 0 == x+0 when ... == ... is true |
 | 109 | 0 >= y+1 when ... < ... is true |
+| 109 | ... < ... != 0 when ... < ... is true |
+| 109 | ... < ... == 0 when ... < ... is false |
+| 109 | ... < ... == 0 when ... \|\| ... is false |
+| 109 | ... == ... != 0 when ... == ... is true |
+| 109 | ... == ... == 0 when ... == ... is false |
+| 109 | ... == ... == 0 when ... \|\| ... is false |
 | 109 | x != 0 when ... == ... is false |
 | 109 | x != 0 when ... \|\| ... is false |
 | 109 | x != 0+0 when ... == ... is false |
@@ -149,6 +197,8 @@
 | 109 | y >= 0+0 when ... \|\| ... is false |
 | 111 | 0.0 != i+0 when ... != ... is true |
 | 111 | 0.0 == i+0 when ... != ... is false |
+| 111 | ... != ... != 0 when ... != ... is true |
+| 111 | ... != ... == 0 when ... != ... is false |
 | 111 | i != 0.0+0 when ... != ... is true |
 | 111 | i == 0.0+0 when ... != ... is false |
 | 122 | b != 0 when b is true |
@@ -166,6 +216,8 @@
 | 126 | call to test3_condition == 0 when call to test3_condition is false |
 | 131 | ... + ... != a+0 when call to __builtin_expect is false |
 | 131 | ... + ... == a+0 when call to __builtin_expect is true |
+| 131 | ... == ... != 0 when call to __builtin_expect is true |
+| 131 | ... == ... == 0 when call to __builtin_expect is false |
 | 131 | a != ... + ...+0 when call to __builtin_expect is false |
 | 131 | a != b+42 when call to __builtin_expect is false |
 | 131 | a == ... + ...+0 when call to __builtin_expect is true |
@@ -176,6 +228,8 @@
 | 131 | b == a+-42 when call to __builtin_expect is true |
 | 131 | call to __builtin_expect != 0 when call to __builtin_expect is true |
 | 131 | call to __builtin_expect == 0 when call to __builtin_expect is false |
+| 135 | ... != ... != 0 when call to __builtin_expect is true |
+| 135 | ... != ... == 0 when call to __builtin_expect is false |
 | 135 | ... + ... != a+0 when call to __builtin_expect is true |
 | 135 | ... + ... == a+0 when call to __builtin_expect is false |
 | 135 | a != ... + ...+0 when call to __builtin_expect is true |
@@ -190,6 +244,8 @@
 | 137 | 0 == 0 when 0 is false |
 | 141 | 42 != a+0 when call to __builtin_expect is false |
 | 141 | 42 == a+0 when call to __builtin_expect is true |
+| 141 | ... == ... != 0 when call to __builtin_expect is true |
+| 141 | ... == ... == 0 when call to __builtin_expect is false |
 | 141 | a != 42 when call to __builtin_expect is false |
 | 141 | a != 42+0 when call to __builtin_expect is false |
 | 141 | a == 42 when call to __builtin_expect is true |
@@ -198,6 +254,8 @@
 | 141 | call to __builtin_expect == 0 when call to __builtin_expect is false |
 | 145 | 42 != a+0 when call to __builtin_expect is true |
 | 145 | 42 == a+0 when call to __builtin_expect is false |
+| 145 | ... != ... != 0 when call to __builtin_expect is true |
+| 145 | ... != ... == 0 when call to __builtin_expect is false |
 | 145 | a != 42 when call to __builtin_expect is true |
 | 145 | a != 42+0 when call to __builtin_expect is true |
 | 145 | a == 42 when call to __builtin_expect is false |
diff --git a/cpp/ql/test/library-tests/controlflow/guards/GuardsEnsure.expected b/cpp/ql/test/library-tests/controlflow/guards/GuardsEnsure.expected
index c520b48f94e..c41cdfd6063 100644
--- a/cpp/ql/test/library-tests/controlflow/guards/GuardsEnsure.expected
+++ b/cpp/ql/test/library-tests/controlflow/guards/GuardsEnsure.expected
@@ -99,10 +99,20 @@ binary
 | test.c:75:9:75:14 | ... == ... | test.c:75:9:75:9 | x | == | test.c:75:14:75:14 | 0 | 0 | 75 | 77 |
 | test.c:75:9:75:14 | ... == ... | test.c:75:14:75:14 | 0 | != | test.c:75:9:75:9 | x | 0 | 78 | 79 |
 | test.c:75:9:75:14 | ... == ... | test.c:75:14:75:14 | 0 | == | test.c:75:9:75:9 | x | 0 | 75 | 77 |
+| test.c:75:9:75:14 | ... == ... | test.c:85:8:85:8 | x | != | test.c:85:13:85:13 | 0 | 0 | 78 | 79 |
+| test.c:75:9:75:14 | ... == ... | test.c:85:8:85:8 | x | == | test.c:85:13:85:13 | 0 | 0 | 75 | 77 |
+| test.c:75:9:75:14 | ... == ... | test.c:85:13:85:13 | 0 | != | test.c:85:8:85:8 | x | 0 | 78 | 79 |
+| test.c:75:9:75:14 | ... == ... | test.c:85:13:85:13 | 0 | == | test.c:85:8:85:8 | x | 0 | 75 | 77 |
+| test.c:85:8:85:13 | ... == ... | test.c:75:9:75:9 | x | == | test.c:75:14:75:14 | 0 | 0 | 85 | 85 |
+| test.c:85:8:85:13 | ... == ... | test.c:75:9:75:9 | x | == | test.c:75:14:75:14 | 0 | 0 | 86 | 86 |
+| test.c:85:8:85:13 | ... == ... | test.c:75:14:75:14 | 0 | == | test.c:75:9:75:9 | x | 0 | 85 | 85 |
+| test.c:85:8:85:13 | ... == ... | test.c:75:14:75:14 | 0 | == | test.c:75:9:75:9 | x | 0 | 86 | 86 |
 | test.c:85:8:85:13 | ... == ... | test.c:85:8:85:8 | x | == | test.c:85:13:85:13 | 0 | 0 | 85 | 85 |
 | test.c:85:8:85:13 | ... == ... | test.c:85:8:85:8 | x | == | test.c:85:13:85:13 | 0 | 0 | 86 | 86 |
 | test.c:85:8:85:13 | ... == ... | test.c:85:13:85:13 | 0 | == | test.c:85:8:85:8 | x | 0 | 85 | 85 |
 | test.c:85:8:85:13 | ... == ... | test.c:85:13:85:13 | 0 | == | test.c:85:8:85:8 | x | 0 | 86 | 86 |
+| test.c:85:8:85:23 | ... && ... | test.c:75:9:75:9 | x | == | test.c:75:14:75:14 | 0 | 0 | 86 | 86 |
+| test.c:85:8:85:23 | ... && ... | test.c:75:14:75:14 | 0 | == | test.c:75:9:75:9 | x | 0 | 86 | 86 |
 | test.c:85:8:85:23 | ... && ... | test.c:85:8:85:8 | x | == | test.c:85:13:85:13 | 0 | 0 | 86 | 86 |
 | test.c:85:8:85:23 | ... && ... | test.c:85:13:85:13 | 0 | == | test.c:85:8:85:8 | x | 0 | 86 | 86 |
 | test.c:85:8:85:23 | ... && ... | test.c:85:18:85:18 | y | != | test.c:85:23:85:23 | 0 | 0 | 86 | 86 |
@@ -174,11 +184,18 @@ binary
 unary
 | test.c:7:9:7:13 | ... > ... | test.c:7:9:7:9 | x | < | 1 | 10 | 11 |
 | test.c:7:9:7:13 | ... > ... | test.c:7:9:7:9 | x | >= | 1 | 7 | 9 |
+| test.c:7:9:7:13 | ... > ... | test.c:7:9:7:13 | ... > ... | != | 0 | 7 | 9 |
+| test.c:7:9:7:13 | ... > ... | test.c:7:9:7:13 | ... > ... | == | 0 | 10 | 11 |
 | test.c:17:8:17:12 | ... < ... | test.c:17:8:17:8 | x | < | 0 | 17 | 17 |
 | test.c:17:8:17:12 | ... < ... | test.c:17:8:17:8 | x | < | 0 | 18 | 18 |
+| test.c:17:8:17:12 | ... < ... | test.c:17:8:17:12 | ... < ... | != | 0 | 17 | 17 |
+| test.c:17:8:17:12 | ... < ... | test.c:17:8:17:12 | ... < ... | != | 0 | 18 | 18 |
 | test.c:17:8:17:21 | ... && ... | test.c:17:8:17:8 | x | < | 0 | 18 | 18 |
+| test.c:17:8:17:21 | ... && ... | test.c:17:8:17:12 | ... < ... | != | 0 | 18 | 18 |
 | test.c:17:8:17:21 | ... && ... | test.c:17:17:17:17 | y | >= | 2 | 18 | 18 |
+| test.c:17:8:17:21 | ... && ... | test.c:17:17:17:21 | ... > ... | != | 0 | 18 | 18 |
 | test.c:17:17:17:21 | ... > ... | test.c:17:17:17:17 | y | >= | 2 | 18 | 18 |
+| test.c:17:17:17:21 | ... > ... | test.c:17:17:17:21 | ... > ... | != | 0 | 18 | 18 |
 | test.c:26:11:26:15 | ... > ... | test.c:26:11:26:11 | x | < | 1 | 2 | 2 |
 | test.c:26:11:26:15 | ... > ... | test.c:26:11:26:11 | x | < | 1 | 31 | 34 |
 | test.c:26:11:26:15 | ... > ... | test.c:26:11:26:11 | x | < | 1 | 34 | 34 |
@@ -193,6 +210,20 @@ unary
 | test.c:26:11:26:15 | ... > ... | test.c:26:11:26:11 | x | < | 1 | 58 | 66 |
 | test.c:26:11:26:15 | ... > ... | test.c:26:11:26:11 | x | < | 1 | 62 | 62 |
 | test.c:26:11:26:15 | ... > ... | test.c:26:11:26:11 | x | >= | 1 | 26 | 28 |
+| test.c:26:11:26:15 | ... > ... | test.c:26:11:26:15 | ... > ... | != | 0 | 26 | 28 |
+| test.c:26:11:26:15 | ... > ... | test.c:26:11:26:15 | ... > ... | == | 0 | 2 | 2 |
+| test.c:26:11:26:15 | ... > ... | test.c:26:11:26:15 | ... > ... | == | 0 | 31 | 34 |
+| test.c:26:11:26:15 | ... > ... | test.c:26:11:26:15 | ... > ... | == | 0 | 34 | 34 |
+| test.c:26:11:26:15 | ... > ... | test.c:26:11:26:15 | ... > ... | == | 0 | 39 | 42 |
+| test.c:26:11:26:15 | ... > ... | test.c:26:11:26:15 | ... > ... | == | 0 | 42 | 42 |
+| test.c:26:11:26:15 | ... > ... | test.c:26:11:26:15 | ... > ... | == | 0 | 42 | 44 |
+| test.c:26:11:26:15 | ... > ... | test.c:26:11:26:15 | ... > ... | == | 0 | 45 | 45 |
+| test.c:26:11:26:15 | ... > ... | test.c:26:11:26:15 | ... > ... | == | 0 | 45 | 47 |
+| test.c:26:11:26:15 | ... > ... | test.c:26:11:26:15 | ... > ... | == | 0 | 51 | 53 |
+| test.c:26:11:26:15 | ... > ... | test.c:26:11:26:15 | ... > ... | == | 0 | 56 | 58 |
+| test.c:26:11:26:15 | ... > ... | test.c:26:11:26:15 | ... > ... | == | 0 | 58 | 58 |
+| test.c:26:11:26:15 | ... > ... | test.c:26:11:26:15 | ... > ... | == | 0 | 58 | 66 |
+| test.c:26:11:26:15 | ... > ... | test.c:26:11:26:15 | ... > ... | == | 0 | 62 | 62 |
 | test.c:34:16:34:21 | ... < ... | test.c:34:16:34:16 | j | < | 10 | 34 | 34 |
 | test.c:34:16:34:21 | ... < ... | test.c:34:16:34:16 | j | >= | 10 | 2 | 2 |
 | test.c:34:16:34:21 | ... < ... | test.c:34:16:34:16 | j | >= | 10 | 39 | 42 |
@@ -205,28 +236,72 @@ unary
 | test.c:34:16:34:21 | ... < ... | test.c:34:16:34:16 | j | >= | 10 | 58 | 58 |
 | test.c:34:16:34:21 | ... < ... | test.c:34:16:34:16 | j | >= | 10 | 58 | 66 |
 | test.c:34:16:34:21 | ... < ... | test.c:34:16:34:16 | j | >= | 10 | 62 | 62 |
+| test.c:34:16:34:21 | ... < ... | test.c:34:16:34:21 | ... < ... | != | 0 | 34 | 34 |
+| test.c:34:16:34:21 | ... < ... | test.c:34:16:34:21 | ... < ... | == | 0 | 2 | 2 |
+| test.c:34:16:34:21 | ... < ... | test.c:34:16:34:21 | ... < ... | == | 0 | 39 | 42 |
+| test.c:34:16:34:21 | ... < ... | test.c:34:16:34:21 | ... < ... | == | 0 | 42 | 42 |
+| test.c:34:16:34:21 | ... < ... | test.c:34:16:34:21 | ... < ... | == | 0 | 42 | 44 |
+| test.c:34:16:34:21 | ... < ... | test.c:34:16:34:21 | ... < ... | == | 0 | 45 | 45 |
+| test.c:34:16:34:21 | ... < ... | test.c:34:16:34:21 | ... < ... | == | 0 | 45 | 47 |
+| test.c:34:16:34:21 | ... < ... | test.c:34:16:34:21 | ... < ... | == | 0 | 51 | 53 |
+| test.c:34:16:34:21 | ... < ... | test.c:34:16:34:21 | ... < ... | == | 0 | 56 | 58 |
+| test.c:34:16:34:21 | ... < ... | test.c:34:16:34:21 | ... < ... | == | 0 | 58 | 58 |
+| test.c:34:16:34:21 | ... < ... | test.c:34:16:34:21 | ... < ... | == | 0 | 58 | 66 |
+| test.c:34:16:34:21 | ... < ... | test.c:34:16:34:21 | ... < ... | == | 0 | 62 | 62 |
 | test.c:42:16:42:21 | ... < ... | test.c:42:16:42:16 | j | < | 10 | 42 | 42 |
 | test.c:42:16:42:21 | ... < ... | test.c:42:16:42:16 | j | < | 10 | 42 | 44 |
 | test.c:42:16:42:21 | ... < ... | test.c:42:16:42:16 | j | < | 10 | 45 | 45 |
 | test.c:42:16:42:21 | ... < ... | test.c:42:16:42:16 | j | < | 10 | 45 | 47 |
 | test.c:42:16:42:21 | ... < ... | test.c:42:16:42:16 | j | < | 10 | 51 | 53 |
+| test.c:42:16:42:21 | ... < ... | test.c:42:16:42:21 | ... < ... | != | 0 | 42 | 42 |
+| test.c:42:16:42:21 | ... < ... | test.c:42:16:42:21 | ... < ... | != | 0 | 42 | 44 |
+| test.c:42:16:42:21 | ... < ... | test.c:42:16:42:21 | ... < ... | != | 0 | 45 | 45 |
+| test.c:42:16:42:21 | ... < ... | test.c:42:16:42:21 | ... < ... | != | 0 | 45 | 47 |
+| test.c:42:16:42:21 | ... < ... | test.c:42:16:42:21 | ... < ... | != | 0 | 51 | 53 |
 | test.c:44:12:44:16 | ... > ... | test.c:44:12:44:12 | z | < | 1 | 42 | 42 |
 | test.c:44:12:44:16 | ... > ... | test.c:44:12:44:12 | z | < | 1 | 51 | 53 |
 | test.c:44:12:44:16 | ... > ... | test.c:44:12:44:12 | z | >= | 1 | 45 | 45 |
 | test.c:44:12:44:16 | ... > ... | test.c:44:12:44:12 | z | >= | 1 | 45 | 47 |
+| test.c:44:12:44:16 | ... > ... | test.c:44:12:44:16 | ... > ... | != | 0 | 45 | 45 |
+| test.c:44:12:44:16 | ... > ... | test.c:44:12:44:16 | ... > ... | != | 0 | 45 | 47 |
+| test.c:44:12:44:16 | ... > ... | test.c:44:12:44:16 | ... > ... | == | 0 | 42 | 42 |
+| test.c:44:12:44:16 | ... > ... | test.c:44:12:44:16 | ... > ... | == | 0 | 51 | 53 |
 | test.c:45:16:45:20 | ... > ... | test.c:45:16:45:16 | y | >= | 1 | 45 | 47 |
+| test.c:45:16:45:20 | ... > ... | test.c:45:16:45:20 | ... > ... | != | 0 | 45 | 47 |
 | test.c:58:9:58:14 | ... == ... | test.c:58:9:58:9 | x | != | 0 | 58 | 58 |
 | test.c:58:9:58:14 | ... == ... | test.c:58:9:58:9 | x | != | 0 | 62 | 62 |
+| test.c:58:9:58:14 | ... == ... | test.c:58:9:58:14 | ... == ... | == | 0 | 58 | 58 |
+| test.c:58:9:58:14 | ... == ... | test.c:58:9:58:14 | ... == ... | == | 0 | 62 | 62 |
 | test.c:58:9:58:23 | ... \|\| ... | test.c:58:9:58:9 | x | != | 0 | 62 | 62 |
+| test.c:58:9:58:23 | ... \|\| ... | test.c:58:9:58:14 | ... == ... | == | 0 | 62 | 62 |
 | test.c:58:9:58:23 | ... \|\| ... | test.c:58:19:58:19 | y | >= | 0 | 62 | 62 |
+| test.c:58:9:58:23 | ... \|\| ... | test.c:58:19:58:23 | ... < ... | == | 0 | 62 | 62 |
 | test.c:58:19:58:23 | ... < ... | test.c:58:19:58:19 | y | >= | 0 | 62 | 62 |
+| test.c:58:19:58:23 | ... < ... | test.c:58:19:58:23 | ... < ... | == | 0 | 62 | 62 |
 | test.c:75:9:75:14 | ... == ... | test.c:75:9:75:9 | x | != | 0 | 78 | 79 |
 | test.c:75:9:75:14 | ... == ... | test.c:75:9:75:9 | x | == | 0 | 75 | 77 |
+| test.c:75:9:75:14 | ... == ... | test.c:75:9:75:14 | ... == ... | != | 0 | 75 | 77 |
+| test.c:75:9:75:14 | ... == ... | test.c:75:9:75:14 | ... == ... | == | 0 | 78 | 79 |
+| test.c:75:9:75:14 | ... == ... | test.c:85:8:85:8 | x | != | 0 | 78 | 79 |
+| test.c:75:9:75:14 | ... == ... | test.c:85:8:85:8 | x | == | 0 | 75 | 77 |
+| test.c:75:9:75:14 | ... == ... | test.c:85:8:85:13 | ... == ... | != | 0 | 75 | 77 |
+| test.c:75:9:75:14 | ... == ... | test.c:85:8:85:13 | ... == ... | == | 0 | 78 | 79 |
+| test.c:85:8:85:13 | ... == ... | test.c:75:9:75:9 | x | == | 0 | 85 | 85 |
+| test.c:85:8:85:13 | ... == ... | test.c:75:9:75:9 | x | == | 0 | 86 | 86 |
+| test.c:85:8:85:13 | ... == ... | test.c:75:9:75:14 | ... == ... | != | 0 | 85 | 85 |
+| test.c:85:8:85:13 | ... == ... | test.c:75:9:75:14 | ... == ... | != | 0 | 86 | 86 |
 | test.c:85:8:85:13 | ... == ... | test.c:85:8:85:8 | x | == | 0 | 85 | 85 |
 | test.c:85:8:85:13 | ... == ... | test.c:85:8:85:8 | x | == | 0 | 86 | 86 |
+| test.c:85:8:85:13 | ... == ... | test.c:85:8:85:13 | ... == ... | != | 0 | 85 | 85 |
+| test.c:85:8:85:13 | ... == ... | test.c:85:8:85:13 | ... == ... | != | 0 | 86 | 86 |
+| test.c:85:8:85:23 | ... && ... | test.c:75:9:75:9 | x | == | 0 | 86 | 86 |
+| test.c:85:8:85:23 | ... && ... | test.c:75:9:75:14 | ... == ... | != | 0 | 86 | 86 |
 | test.c:85:8:85:23 | ... && ... | test.c:85:8:85:8 | x | == | 0 | 86 | 86 |
+| test.c:85:8:85:23 | ... && ... | test.c:85:8:85:13 | ... == ... | != | 0 | 86 | 86 |
 | test.c:85:8:85:23 | ... && ... | test.c:85:18:85:18 | y | != | 0 | 86 | 86 |
+| test.c:85:8:85:23 | ... && ... | test.c:85:18:85:23 | ... != ... | != | 0 | 86 | 86 |
 | test.c:85:18:85:23 | ... != ... | test.c:85:18:85:18 | y | != | 0 | 86 | 86 |
+| test.c:85:18:85:23 | ... != ... | test.c:85:18:85:23 | ... != ... | != | 0 | 86 | 86 |
 | test.c:94:11:94:16 | ... != ... | test.c:94:11:94:11 | x | != | 0 | 94 | 96 |
 | test.c:94:11:94:16 | ... != ... | test.c:94:11:94:11 | x | == | 0 | 70 | 70 |
 | test.c:94:11:94:16 | ... != ... | test.c:94:11:94:11 | x | == | 0 | 99 | 102 |
@@ -235,24 +310,49 @@ unary
 | test.c:94:11:94:16 | ... != ... | test.c:94:11:94:11 | x | == | 0 | 109 | 109 |
 | test.c:94:11:94:16 | ... != ... | test.c:94:11:94:11 | x | == | 0 | 109 | 117 |
 | test.c:94:11:94:16 | ... != ... | test.c:94:11:94:11 | x | == | 0 | 113 | 113 |
+| test.c:94:11:94:16 | ... != ... | test.c:94:11:94:16 | ... != ... | != | 0 | 94 | 96 |
+| test.c:94:11:94:16 | ... != ... | test.c:94:11:94:16 | ... != ... | == | 0 | 70 | 70 |
+| test.c:94:11:94:16 | ... != ... | test.c:94:11:94:16 | ... != ... | == | 0 | 99 | 102 |
+| test.c:94:11:94:16 | ... != ... | test.c:94:11:94:16 | ... != ... | == | 0 | 102 | 102 |
+| test.c:94:11:94:16 | ... != ... | test.c:94:11:94:16 | ... != ... | == | 0 | 107 | 109 |
+| test.c:94:11:94:16 | ... != ... | test.c:94:11:94:16 | ... != ... | == | 0 | 109 | 109 |
+| test.c:94:11:94:16 | ... != ... | test.c:94:11:94:16 | ... != ... | == | 0 | 109 | 117 |
+| test.c:94:11:94:16 | ... != ... | test.c:94:11:94:16 | ... != ... | == | 0 | 113 | 113 |
 | test.c:102:16:102:21 | ... < ... | test.c:102:16:102:16 | j | < | 10 | 102 | 102 |
 | test.c:102:16:102:21 | ... < ... | test.c:102:16:102:16 | j | >= | 10 | 70 | 70 |
 | test.c:102:16:102:21 | ... < ... | test.c:102:16:102:16 | j | >= | 10 | 107 | 109 |
 | test.c:102:16:102:21 | ... < ... | test.c:102:16:102:16 | j | >= | 10 | 109 | 109 |
 | test.c:102:16:102:21 | ... < ... | test.c:102:16:102:16 | j | >= | 10 | 109 | 117 |
 | test.c:102:16:102:21 | ... < ... | test.c:102:16:102:16 | j | >= | 10 | 113 | 113 |
+| test.c:102:16:102:21 | ... < ... | test.c:102:16:102:21 | ... < ... | != | 0 | 102 | 102 |
+| test.c:102:16:102:21 | ... < ... | test.c:102:16:102:21 | ... < ... | == | 0 | 70 | 70 |
+| test.c:102:16:102:21 | ... < ... | test.c:102:16:102:21 | ... < ... | == | 0 | 107 | 109 |
+| test.c:102:16:102:21 | ... < ... | test.c:102:16:102:21 | ... < ... | == | 0 | 109 | 109 |
+| test.c:102:16:102:21 | ... < ... | test.c:102:16:102:21 | ... < ... | == | 0 | 109 | 117 |
+| test.c:102:16:102:21 | ... < ... | test.c:102:16:102:21 | ... < ... | == | 0 | 113 | 113 |
 | test.c:109:9:109:14 | ... == ... | test.c:109:9:109:9 | x | != | 0 | 109 | 109 |
 | test.c:109:9:109:14 | ... == ... | test.c:109:9:109:9 | x | != | 0 | 113 | 113 |
+| test.c:109:9:109:14 | ... == ... | test.c:109:9:109:14 | ... == ... | == | 0 | 109 | 109 |
+| test.c:109:9:109:14 | ... == ... | test.c:109:9:109:14 | ... == ... | == | 0 | 113 | 113 |
 | test.c:109:9:109:23 | ... \|\| ... | test.c:109:9:109:9 | x | != | 0 | 113 | 113 |
+| test.c:109:9:109:23 | ... \|\| ... | test.c:109:9:109:14 | ... == ... | == | 0 | 113 | 113 |
 | test.c:109:9:109:23 | ... \|\| ... | test.c:109:19:109:19 | y | >= | 0 | 113 | 113 |
+| test.c:109:9:109:23 | ... \|\| ... | test.c:109:19:109:23 | ... < ... | == | 0 | 113 | 113 |
 | test.c:109:19:109:23 | ... < ... | test.c:109:19:109:19 | y | >= | 0 | 113 | 113 |
+| test.c:109:19:109:23 | ... < ... | test.c:109:19:109:23 | ... < ... | == | 0 | 113 | 113 |
 | test.c:126:7:126:7 | 1 | test.c:126:7:126:7 | 1 | != | 0 | 126 | 126 |
 | test.c:126:7:126:7 | 1 | test.c:126:7:126:7 | 1 | != | 0 | 126 | 128 |
 | test.c:126:7:126:7 | 1 | test.c:126:7:126:7 | 1 | != | 0 | 131 | 131 |
 | test.c:126:7:126:7 | 1 | test.c:126:7:126:7 | 1 | != | 0 | 131 | 132 |
 | test.c:126:7:126:7 | 1 | test.c:126:7:126:7 | 1 | != | 0 | 134 | 123 |
+| test.c:126:7:126:7 | 1 | test.c:127:9:127:9 | 1 | != | 0 | 126 | 126 |
+| test.c:126:7:126:7 | 1 | test.c:127:9:127:9 | 1 | != | 0 | 126 | 128 |
+| test.c:126:7:126:7 | 1 | test.c:127:9:127:9 | 1 | != | 0 | 131 | 131 |
+| test.c:126:7:126:7 | 1 | test.c:127:9:127:9 | 1 | != | 0 | 131 | 132 |
+| test.c:126:7:126:7 | 1 | test.c:127:9:127:9 | 1 | != | 0 | 134 | 123 |
 | test.c:126:7:126:28 | ... && ... | test.c:126:7:126:7 | 1 | != | 0 | 126 | 128 |
 | test.c:126:7:126:28 | ... && ... | test.c:126:12:126:26 | call to test3_condition | != | 0 | 126 | 128 |
+| test.c:126:7:126:28 | ... && ... | test.c:127:9:127:9 | 1 | != | 0 | 126 | 128 |
 | test.c:126:12:126:26 | call to test3_condition | test.c:126:12:126:26 | call to test3_condition | != | 0 | 126 | 128 |
 | test.c:131:7:131:7 | b | test.c:131:7:131:7 | b | != | 0 | 131 | 132 |
 | test.c:137:7:137:7 | 0 | test.c:137:7:137:7 | 0 | == | 0 | 142 | 136 |
@@ -269,6 +369,10 @@ unary
 | test.cpp:31:7:31:13 | ... == ... | test.cpp:31:7:31:7 | x | != | -1 | 34 | 34 |
 | test.cpp:31:7:31:13 | ... == ... | test.cpp:31:7:31:7 | x | == | -1 | 30 | 30 |
 | test.cpp:31:7:31:13 | ... == ... | test.cpp:31:7:31:7 | x | == | -1 | 31 | 32 |
+| test.cpp:31:7:31:13 | ... == ... | test.cpp:31:7:31:13 | ... == ... | != | 0 | 30 | 30 |
+| test.cpp:31:7:31:13 | ... == ... | test.cpp:31:7:31:13 | ... == ... | != | 0 | 31 | 32 |
+| test.cpp:31:7:31:13 | ... == ... | test.cpp:31:7:31:13 | ... == ... | == | 0 | 30 | 30 |
+| test.cpp:31:7:31:13 | ... == ... | test.cpp:31:7:31:13 | ... == ... | == | 0 | 34 | 34 |
 | test.cpp:42:13:42:20 | call to getABool | test.cpp:42:13:42:20 | call to getABool | != | 0 | 43 | 45 |
 | test.cpp:42:13:42:20 | call to getABool | test.cpp:42:13:42:20 | call to getABool | == | 0 | 53 | 53 |
 | test.cpp:61:10:61:10 | i | test.cpp:61:10:61:10 | i | == | 0 | 62 | 64 |
@@ -278,13 +382,20 @@ unary
 | test.cpp:74:10:74:10 | i | test.cpp:74:10:74:10 | i | >= | 0 | 75 | 77 |
 | test.cpp:74:10:74:10 | i | test.cpp:74:10:74:10 | i | >= | 11 | 78 | 79 |
 | test.cpp:93:6:93:6 | c | test.cpp:93:6:93:6 | c | != | 0 | 93 | 94 |
+| test.cpp:99:6:99:6 | f | test.cpp:99:6:99:6 | f | != | 0 | 99 | 100 |
+| test.cpp:105:6:105:14 | ... != ... | test.cpp:105:6:105:14 | ... != ... | != | 0 | 105 | 106 |
+| test.cpp:111:6:111:14 | ... != ... | test.cpp:111:6:111:14 | ... != ... | != | 0 | 111 | 112 |
 | test.cpp:122:9:122:9 | b | test.cpp:122:9:122:9 | b | != | 0 | 123 | 125 |
 | test.cpp:122:9:122:9 | b | test.cpp:122:9:122:9 | b | != | 0 | 125 | 125 |
 | test.cpp:125:13:125:20 | ! ... | test.cpp:125:13:125:20 | ! ... | != | 0 | 125 | 125 |
 | test.cpp:125:14:125:17 | call to safe | test.cpp:125:14:125:17 | call to safe | == | 0 | 125 | 125 |
 | test.cpp:131:6:131:21 | call to __builtin_expect | test.cpp:131:6:131:21 | call to __builtin_expect | != | 0 | 131 | 132 |
+| test.cpp:131:6:131:21 | call to __builtin_expect | test.cpp:131:23:131:33 | ... == ... | != | 0 | 131 | 132 |
 | test.cpp:135:6:135:21 | call to __builtin_expect | test.cpp:135:6:135:21 | call to __builtin_expect | != | 0 | 135 | 136 |
+| test.cpp:135:6:135:21 | call to __builtin_expect | test.cpp:135:23:135:33 | ... != ... | != | 0 | 135 | 136 |
 | test.cpp:141:6:141:21 | call to __builtin_expect | test.cpp:141:6:141:21 | call to __builtin_expect | != | 0 | 141 | 142 |
 | test.cpp:141:6:141:21 | call to __builtin_expect | test.cpp:141:23:141:23 | a | == | 42 | 141 | 142 |
+| test.cpp:141:6:141:21 | call to __builtin_expect | test.cpp:141:23:141:29 | ... == ... | != | 0 | 141 | 142 |
 | test.cpp:145:6:145:21 | call to __builtin_expect | test.cpp:145:6:145:21 | call to __builtin_expect | != | 0 | 145 | 146 |
 | test.cpp:145:6:145:21 | call to __builtin_expect | test.cpp:145:23:145:23 | a | != | 42 | 145 | 146 |
+| test.cpp:145:6:145:21 | call to __builtin_expect | test.cpp:145:23:145:29 | ... != ... | != | 0 | 145 | 146 |
diff --git a/cpp/ql/test/library-tests/dataflow/dataflow-tests/dataflow-consistency.expected b/cpp/ql/test/library-tests/dataflow/dataflow-tests/dataflow-consistency.expected
index d97abde482e..68dad62a95f 100644
--- a/cpp/ql/test/library-tests/dataflow/dataflow-tests/dataflow-consistency.expected
+++ b/cpp/ql/test/library-tests/dataflow/dataflow-tests/dataflow-consistency.expected
@@ -3,6 +3,9 @@ uniqueEnclosingCallable
 | test.cpp:864:47:864:54 | call to source | Node should have one enclosing callable but has 0. |
 | test.cpp:872:46:872:51 | call to source | Node should have one enclosing callable but has 0. |
 | test.cpp:872:53:872:56 | 1 | Node should have one enclosing callable but has 0. |
+| test.cpp:1126:33:1129:1 | {...} | Node should have one enclosing callable but has 0. |
+| test.cpp:1127:3:1127:13 | reads_input | Node should have one enclosing callable but has 0. |
+| test.cpp:1128:3:1128:21 | not_does_read_input | Node should have one enclosing callable but has 0. |
 uniqueCallEnclosingCallable
 | test.cpp:864:47:864:54 | call to source | Call should have one enclosing callable but has 0. |
 | test.cpp:872:46:872:51 | call to source | Call should have one enclosing callable but has 0. |
@@ -186,3 +189,4 @@ identityLocalStep
 missingArgumentCall
 multipleArgumentCall
 lambdaCallEnclosingCallableMismatch
+speculativeStepAlreadyHasModel
diff --git a/cpp/ql/test/library-tests/dataflow/dataflow-tests/dataflow-ir-consistency.expected b/cpp/ql/test/library-tests/dataflow/dataflow-tests/dataflow-ir-consistency.expected
index 064a53e8d12..d0d49db4a21 100644
--- a/cpp/ql/test/library-tests/dataflow/dataflow-tests/dataflow-ir-consistency.expected
+++ b/cpp/ql/test/library-tests/dataflow/dataflow-tests/dataflow-ir-consistency.expected
@@ -38,3 +38,4 @@ identityLocalStep
 missingArgumentCall
 multipleArgumentCall
 lambdaCallEnclosingCallableMismatch
+speculativeStepAlreadyHasModel
diff --git a/cpp/ql/test/library-tests/dataflow/dataflow-tests/flowOut.cpp b/cpp/ql/test/library-tests/dataflow/dataflow-tests/flowOut.cpp
index d6a06361524..a60a20f12e3 100644
--- a/cpp/ql/test/library-tests/dataflow/dataflow-tests/flowOut.cpp
+++ b/cpp/ql/test/library-tests/dataflow/dataflow-tests/flowOut.cpp
@@ -78,7 +78,7 @@ int* deref(int** p) { // $ ast-def=p ir-def=*p ir-def=**p
   return q;
 }
 
-void test1() {
+void flowout_test1() {
   int x = 0;
   int* p = &x;
   deref(&p)[0] = source();
@@ -95,7 +95,7 @@ void addtaint2(int** p) { // $ ast-def=p ir-def=*p ir-def=**p
   addtaint1(q);
 }
 
-void test2() {
+void flowout_test2() {
   int x = 0;
   int* p = &x;
   addtaint2(&p);
diff --git a/cpp/ql/test/library-tests/dataflow/dataflow-tests/self-Iterator.cpp b/cpp/ql/test/library-tests/dataflow/dataflow-tests/self-Iterator.cpp
index cac7f222c30..3303a250ccc 100644
--- a/cpp/ql/test/library-tests/dataflow/dataflow-tests/self-Iterator.cpp
+++ b/cpp/ql/test/library-tests/dataflow/dataflow-tests/self-Iterator.cpp
@@ -15,7 +15,7 @@ template<> struct std::iterator_traits<unsigned long>
 };
 
 
-int test() {
+int iterator_test() {
     unsigned long x = source();
     sink(x); // $ ast ir
 }
\ No newline at end of file
diff --git a/cpp/ql/test/library-tests/dataflow/dataflow-tests/test-source-sink.expected b/cpp/ql/test/library-tests/dataflow/dataflow-tests/test-source-sink.expected
index 90f797429c9..10a8bef9a33 100644
--- a/cpp/ql/test/library-tests/dataflow/dataflow-tests/test-source-sink.expected
+++ b/cpp/ql/test/library-tests/dataflow/dataflow-tests/test-source-sink.expected
@@ -323,6 +323,7 @@ irFlow
 | test.cpp:1069:9:1069:14 | call to source | test.cpp:1074:10:1074:10 | i |
 | test.cpp:1069:9:1069:14 | call to source | test.cpp:1081:10:1081:10 | i |
 | test.cpp:1117:27:1117:34 | call to source | test.cpp:1117:27:1117:34 | call to source |
+| test.cpp:1132:11:1132:16 | call to source | test.cpp:1121:8:1121:8 | x |
 | true_upon_entry.cpp:9:11:9:16 | call to source | true_upon_entry.cpp:13:8:13:8 | x |
 | true_upon_entry.cpp:17:11:17:16 | call to source | true_upon_entry.cpp:21:8:21:8 | x |
 | true_upon_entry.cpp:27:9:27:14 | call to source | true_upon_entry.cpp:29:8:29:8 | x |
diff --git a/cpp/ql/test/library-tests/dataflow/dataflow-tests/test.cpp b/cpp/ql/test/library-tests/dataflow/dataflow-tests/test.cpp
index 3a6ffe9b716..60baa08bb8d 100644
--- a/cpp/ql/test/library-tests/dataflow/dataflow-tests/test.cpp
+++ b/cpp/ql/test/library-tests/dataflow/dataflow-tests/test.cpp
@@ -1115,4 +1115,20 @@ void indirect_sink_const_ref(const T&);
 
 void test_temp_with_conversion_from_materialization() {
   indirect_sink_const_ref(source()); // $ ir MISSING: ast
+}
+
+void reads_input(int x) {
+  sink(x); // $ ir MISSING: ast
+}
+
+void not_does_read_input(int x);
+
+void (*dispatch_table[])(int) = {
+  reads_input,
+  not_does_read_input
+};
+
+void test_dispatch_table(int i) {
+  int x = source();
+  dispatch_table[i](x);
 }
\ No newline at end of file
diff --git a/cpp/ql/test/library-tests/dataflow/dataflow-tests/true_upon_entry.cpp b/cpp/ql/test/library-tests/dataflow/dataflow-tests/true_upon_entry.cpp
index 923a7c0513d..cb97ce325d2 100644
--- a/cpp/ql/test/library-tests/dataflow/dataflow-tests/true_upon_entry.cpp
+++ b/cpp/ql/test/library-tests/dataflow/dataflow-tests/true_upon_entry.cpp
@@ -5,7 +5,7 @@ int source();
 void sink(...);
 bool random();
 
-void test1() {
+void on_entry_test1() {
   int x = source();
   for (int i = 0; i < 10; i++) {
     x = 0;
@@ -13,7 +13,7 @@ void test1() {
   sink(x); // $ SPURIOUS: ir
 }
 
-void test2(int iterations) {
+void on_entry_test2(int iterations) {
   int x = source();
   for (int i = 0; i < iterations; i++) {
     x = 0;
@@ -21,7 +21,7 @@ void test2(int iterations) {
   sink(x); // $ ast,ir
 }
 
-void test3() {
+void on_entry_test3() {
   int x = 0;
   for (int i = 0; i < 10; i++) {
     x = source();
@@ -29,7 +29,7 @@ void test3() {
   sink(x); // $ ast,ir
 }
 
-void test4() {
+void on_entry_test4() {
   int x = source();
   for (int i = 0; i < 10; i++) {
     if (random())
@@ -39,7 +39,7 @@ void test4() {
   sink(x); // $ ast,ir
 }
 
-void test5() {
+void on_entry_test5() {
   int x = source();
   for (int i = 0; i < 10; i++) {
     if (random())
@@ -49,7 +49,7 @@ void test5() {
   sink(x); // $ ast,ir
 }
 
-void test6() {
+void on_entry_test6() {
   int y;
   int x = source();
   for (int i = 0; i < 10 && (y = 1); i++) {
@@ -57,7 +57,7 @@ void test6() {
   sink(x); // $ ast,ir
 }
 
-void test7() {
+void on_entry_test7() {
   int y;
   int x = source();
   for (int i = 0; i < 10 && (y = 1); i++) {
@@ -66,7 +66,7 @@ void test7() {
   sink(x); // $ SPURIOUS: ir
 }
 
-void test8() {
+void on_entry_test8() {
   int x = source();
   // It appears to the analysis that the condition can exit after `i < 10`
   // without having assigned to `x`. That is an effect of how the
@@ -78,7 +78,7 @@ void test8() {
   sink(x); // $ SPURIOUS: ast,ir
 }
 
-void test9() {
+void on_entry_test9() {
   int y;
   int x = source();
   for (int i = 0; (y = 1) && i < 10; i++) {
@@ -86,14 +86,14 @@ void test9() {
   sink(x); // $ ast,ir
 }
 
-void test10() {
+void on_entry_test10() {
   int x = source();
   for (int i = 0; (x = 1) && i < 10; i++) {
   }
   sink(x); // no flow
 }
 
-void test10(int b, int d) {
+void on_entry_test10(int b, int d) {
   int i = 0;
   int x = source();
   if (b)
diff --git a/cpp/ql/test/library-tests/dataflow/external-models/flow.expected b/cpp/ql/test/library-tests/dataflow/external-models/flow.expected
index cbeabc52c5d..a3d09178f2c 100644
--- a/cpp/ql/test/library-tests/dataflow/external-models/flow.expected
+++ b/cpp/ql/test/library-tests/dataflow/external-models/flow.expected
@@ -3,20 +3,20 @@ failures
 edges
 | asio_streams.cpp:56:18:56:23 | [summary param] *0 in buffer | asio_streams.cpp:56:18:56:23 | [summary] to write: ReturnValue in buffer | provenance | MaD:10 |
 | asio_streams.cpp:87:34:87:44 | read_until output argument | asio_streams.cpp:91:7:91:17 | recv_buffer | provenance | Src:MaD:2  |
-| asio_streams.cpp:87:34:87:44 | read_until output argument | asio_streams.cpp:93:29:93:39 | *recv_buffer | provenance | Src:MaD:2  Sink:MaD:6 |
+| asio_streams.cpp:87:34:87:44 | read_until output argument | asio_streams.cpp:93:29:93:39 | *recv_buffer | provenance | Src:MaD:2 Sink:MaD:6 |
 | asio_streams.cpp:97:37:97:44 | call to source | asio_streams.cpp:98:7:98:14 | send_str | provenance | TaintFunction |
 | asio_streams.cpp:97:37:97:44 | call to source | asio_streams.cpp:100:64:100:71 | *send_str | provenance | TaintFunction |
 | asio_streams.cpp:100:44:100:62 | call to buffer | asio_streams.cpp:100:44:100:62 | call to buffer | provenance |  |
 | asio_streams.cpp:100:44:100:62 | call to buffer | asio_streams.cpp:101:7:101:17 | send_buffer | provenance |  |
-| asio_streams.cpp:100:44:100:62 | call to buffer | asio_streams.cpp:103:29:103:39 | *send_buffer | provenance |  Sink:MaD:6 |
+| asio_streams.cpp:100:44:100:62 | call to buffer | asio_streams.cpp:103:29:103:39 | *send_buffer | provenance | Sink:MaD:6 |
 | asio_streams.cpp:100:64:100:71 | *send_str | asio_streams.cpp:56:18:56:23 | [summary param] *0 in buffer | provenance |  |
 | asio_streams.cpp:100:64:100:71 | *send_str | asio_streams.cpp:100:44:100:62 | call to buffer | provenance | MaD:10 |
 | test.cpp:4:5:4:11 | [summary param] 0 in ymlStep | test.cpp:4:5:4:11 | [summary] to write: ReturnValue in ymlStep | provenance | MaD:644 |
 | test.cpp:7:10:7:18 | call to ymlSource | test.cpp:7:10:7:18 | call to ymlSource | provenance | Src:MaD:642  |
-| test.cpp:7:10:7:18 | call to ymlSource | test.cpp:11:10:11:10 | x | provenance |  Sink:MaD:643 |
+| test.cpp:7:10:7:18 | call to ymlSource | test.cpp:11:10:11:10 | x | provenance | Sink:MaD:643 |
 | test.cpp:7:10:7:18 | call to ymlSource | test.cpp:13:18:13:18 | x | provenance |  |
 | test.cpp:13:10:13:16 | call to ymlStep | test.cpp:13:10:13:16 | call to ymlStep | provenance |  |
-| test.cpp:13:10:13:16 | call to ymlStep | test.cpp:15:10:15:10 | y | provenance |  Sink:MaD:643 |
+| test.cpp:13:10:13:16 | call to ymlStep | test.cpp:15:10:15:10 | y | provenance | Sink:MaD:643 |
 | test.cpp:13:18:13:18 | x | test.cpp:4:5:4:11 | [summary param] 0 in ymlStep | provenance |  |
 | test.cpp:13:18:13:18 | x | test.cpp:13:10:13:16 | call to ymlStep | provenance | MaD:644 |
 nodes
diff --git a/cpp/ql/test/library-tests/dataflow/fields/dataflow-consistency.expected b/cpp/ql/test/library-tests/dataflow/fields/dataflow-consistency.expected
index 0af54dc8570..29daff36303 100644
--- a/cpp/ql/test/library-tests/dataflow/fields/dataflow-consistency.expected
+++ b/cpp/ql/test/library-tests/dataflow/fields/dataflow-consistency.expected
@@ -185,6 +185,8 @@ postWithInFlow
 | simple.cpp:83:12:83:13 | f1 [post update] | PostUpdateNode should not be the target of local flow. |
 | simple.cpp:92:7:92:7 | i [post update] | PostUpdateNode should not be the target of local flow. |
 | simple.cpp:118:7:118:7 | i [post update] | PostUpdateNode should not be the target of local flow. |
+| simple.cpp:124:5:124:6 | * ... [post update] | PostUpdateNode should not be the target of local flow. |
+| simple.cpp:124:6:124:6 | p [inner post update] | PostUpdateNode should not be the target of local flow. |
 | struct_init.c:24:11:24:12 | ab [inner post update] | PostUpdateNode should not be the target of local flow. |
 | struct_init.c:36:17:36:24 | nestedAB [inner post update] | PostUpdateNode should not be the target of local flow. |
 viableImplInCallContextTooLarge
@@ -195,3 +197,4 @@ identityLocalStep
 missingArgumentCall
 multipleArgumentCall
 lambdaCallEnclosingCallableMismatch
+speculativeStepAlreadyHasModel
diff --git a/cpp/ql/test/library-tests/dataflow/fields/dataflow-ir-consistency.expected b/cpp/ql/test/library-tests/dataflow/fields/dataflow-ir-consistency.expected
index e6de5b4991e..364c6549fe5 100644
--- a/cpp/ql/test/library-tests/dataflow/fields/dataflow-ir-consistency.expected
+++ b/cpp/ql/test/library-tests/dataflow/fields/dataflow-ir-consistency.expected
@@ -28,3 +28,4 @@ identityLocalStep
 missingArgumentCall
 multipleArgumentCall
 lambdaCallEnclosingCallableMismatch
+speculativeStepAlreadyHasModel
diff --git a/cpp/ql/test/library-tests/dataflow/fields/partial-definition-diff.expected b/cpp/ql/test/library-tests/dataflow/fields/partial-definition-diff.expected
index e00e05e8dc8..91b22f8d13a 100644
--- a/cpp/ql/test/library-tests/dataflow/fields/partial-definition-diff.expected
+++ b/cpp/ql/test/library-tests/dataflow/fields/partial-definition-diff.expected
@@ -291,3 +291,6 @@ WARNING: module 'DataFlow' has been deprecated and may be removed in future (par
 | simple.cpp:94:10:94:11 | a2 | IR only |
 | simple.cpp:118:7:118:7 | i | AST only |
 | simple.cpp:120:8:120:8 | a | IR only |
+| simple.cpp:124:5:124:6 | * ... | AST only |
+| simple.cpp:131:14:131:14 | a | IR only |
+| simple.cpp:136:10:136:10 | a | IR only |
diff --git a/cpp/ql/test/library-tests/dataflow/fields/partial-definition-ir.expected b/cpp/ql/test/library-tests/dataflow/fields/partial-definition-ir.expected
index fcb70d77d5b..c12cc3c3c0f 100644
--- a/cpp/ql/test/library-tests/dataflow/fields/partial-definition-ir.expected
+++ b/cpp/ql/test/library-tests/dataflow/fields/partial-definition-ir.expected
@@ -651,6 +651,9 @@
 | simple.cpp:94:10:94:11 | a2 |
 | simple.cpp:118:5:118:5 | a |
 | simple.cpp:120:8:120:8 | a |
+| simple.cpp:131:14:131:14 | a |
+| simple.cpp:135:20:135:20 | q |
+| simple.cpp:136:10:136:10 | a |
 | struct_init.c:15:8:15:9 | ab |
 | struct_init.c:15:12:15:12 | a |
 | struct_init.c:16:8:16:9 | ab |
diff --git a/cpp/ql/test/library-tests/dataflow/fields/partial-definition.expected b/cpp/ql/test/library-tests/dataflow/fields/partial-definition.expected
index af303d6ba76..00e84906b6c 100644
--- a/cpp/ql/test/library-tests/dataflow/fields/partial-definition.expected
+++ b/cpp/ql/test/library-tests/dataflow/fields/partial-definition.expected
@@ -581,6 +581,8 @@ WARNING: module 'DataFlow' has been deprecated and may be removed in future (par
 | simple.cpp:92:7:92:7 | i |
 | simple.cpp:118:5:118:5 | a |
 | simple.cpp:118:7:118:7 | i |
+| simple.cpp:124:5:124:6 | * ... |
+| simple.cpp:135:20:135:20 | q |
 | struct_init.c:15:8:15:9 | ab |
 | struct_init.c:15:12:15:12 | a |
 | struct_init.c:16:8:16:9 | ab |
diff --git a/cpp/ql/test/library-tests/dataflow/fields/simple.cpp b/cpp/ql/test/library-tests/dataflow/fields/simple.cpp
index 9501bdaf63b..3b8d882bc2b 100644
--- a/cpp/ql/test/library-tests/dataflow/fields/simple.cpp
+++ b/cpp/ql/test/library-tests/dataflow/fields/simple.cpp
@@ -120,4 +120,20 @@ void post_update_to_phi_input(bool b)
   sink(a.i); // $ ast,ir
 }
 
-} // namespace Simple
+void write_to_param(int* p) {
+    *p = user_input();
+}
+
+void alias_with_fields(bool b) {
+    A a;
+    int* q;
+    if(b) {
+        q = &a.i;
+    } else {
+        q = nullptr;
+    }
+    write_to_param(q);
+    sink(a.i); // $ MISSING: ast,ir
+}
+
+} // namespace Simple
\ No newline at end of file
diff --git a/cpp/ql/test/library-tests/dataflow/taint-tests/localTaint.expected b/cpp/ql/test/library-tests/dataflow/taint-tests/localTaint.expected
index 80541c16115..7de6914e8aa 100644
--- a/cpp/ql/test/library-tests/dataflow/taint-tests/localTaint.expected
+++ b/cpp/ql/test/library-tests/dataflow/taint-tests/localTaint.expected
@@ -6584,6 +6584,16 @@ WARNING: module 'TaintTracking' has been deprecated and may be removed in future
 | taint.cpp:767:21:767:24 | ref arg path | taint.cpp:768:8:768:11 | path |  |
 | taint.cpp:768:8:768:11 | path | taint.cpp:768:7:768:11 | * ... |  |
 | taint.cpp:778:37:778:42 | call to source | taint.cpp:779:7:779:9 | obj |  |
+| taint.cpp:785:23:785:28 | source | taint.cpp:785:23:785:28 | source |  |
+| taint.cpp:785:23:785:28 | source | taint.cpp:786:18:786:23 | source |  |
+| taint.cpp:785:23:785:28 | source | taint.cpp:790:15:790:20 | source |  |
+| taint.cpp:786:12:786:16 | call to fopen | taint.cpp:787:7:787:7 | f |  |
+| taint.cpp:786:18:786:23 | source | taint.cpp:786:12:786:16 | call to fopen | TAINT |
+| taint.cpp:789:8:789:9 | f2 | taint.cpp:790:11:790:12 | f2 |  |
+| taint.cpp:789:8:789:9 | f2 | taint.cpp:791:7:791:8 | f2 |  |
+| taint.cpp:790:10:790:12 | ref arg & ... | taint.cpp:790:11:790:12 | f2 [inner post update] |  |
+| taint.cpp:790:10:790:12 | ref arg & ... | taint.cpp:791:7:791:8 | f2 |  |
+| taint.cpp:790:11:790:12 | f2 | taint.cpp:790:10:790:12 | & ... |  |
 | vector.cpp:16:43:16:49 | source1 | vector.cpp:17:26:17:32 | source1 |  |
 | vector.cpp:16:43:16:49 | source1 | vector.cpp:31:38:31:44 | source1 |  |
 | vector.cpp:17:21:17:33 | call to vector | vector.cpp:19:14:19:14 | v |  |
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 220265a3bb1..a5f63b3d2e6 100644
--- a/cpp/ql/test/library-tests/dataflow/taint-tests/taint.cpp
+++ b/cpp/ql/test/library-tests/dataflow/taint-tests/taint.cpp
@@ -777,4 +777,16 @@ TaintInheritingContentObject source(bool);
 void test_TaintInheritingContent() {
 	TaintInheritingContentObject obj = source(true);
 	sink(obj.flowFromObject); // $ ir MISSING: ast
+}
+
+FILE* fopen(const char*, const char*);
+int fopen_s(FILE** pFile, const char *filename, const char *mode);
+
+void fopen_test(char* source) {
+	FILE* f = fopen(source, "r");
+	sink(f); // $ ast,ir
+
+	FILE* f2;
+	fopen_s(&f2, source, "r");
+	sink(f2); // $ ast,ir
 }
\ No newline at end of file
diff --git a/cpp/ql/test/library-tests/declarationEntry/declarationEntry/roundTrip.expected b/cpp/ql/test/library-tests/declarationEntry/declarationEntry/roundTrip.expected
index 2f9ea170973..29366af6993 100644
--- a/cpp/ql/test/library-tests/declarationEntry/declarationEntry/roundTrip.expected
+++ b/cpp/ql/test/library-tests/declarationEntry/declarationEntry/roundTrip.expected
@@ -25,8 +25,8 @@
 | declarationEntry.cpp:39:7:39:7 | declaration of operator= | declarationEntry.cpp:39:7:39:7 | operator= | yes |
 | declarationEntry.cpp:39:7:39:13 | definition of myClass | declarationEntry.cpp:39:7:39:13 | myClass | yes |
 | declarationEntry.cpp:42:6:42:21 | definition of myMemberVariable | declarationEntry.cpp:42:6:42:21 | myMemberVariable | yes |
-| file://:0:0:0:0 | declaration of 1st parameter | file://:0:0:0:0 | (unnamed parameter 0) | yes |
-| file://:0:0:0:0 | declaration of 1st parameter | file://:0:0:0:0 | (unnamed parameter 0) | yes |
+| file://:0:0:0:0 | declaration of (unnamed parameter 0) | file://:0:0:0:0 | (unnamed parameter 0) | yes |
+| file://:0:0:0:0 | declaration of (unnamed parameter 0) | file://:0:0:0:0 | (unnamed parameter 0) | yes |
 | file://:0:0:0:0 | definition of fp_offset | file://:0:0:0:0 | fp_offset | yes |
 | file://:0:0:0:0 | definition of gp_offset | file://:0:0:0:0 | gp_offset | yes |
 | file://:0:0:0:0 | definition of overflow_arg_area | file://:0:0:0:0 | overflow_arg_area | yes |
diff --git a/cpp/ql/test/library-tests/declarationEntry/more/declarationEntry.expected b/cpp/ql/test/library-tests/declarationEntry/more/declarationEntry.expected
index b4817f60ad1..767da646f5e 100644
--- a/cpp/ql/test/library-tests/declarationEntry/more/declarationEntry.expected
+++ b/cpp/ql/test/library-tests/declarationEntry/more/declarationEntry.expected
@@ -1,7 +1,7 @@
-| file://:0:0:0:0 | declaration of 1st parameter |
-| file://:0:0:0:0 | declaration of 1st parameter |
-| file://:0:0:0:0 | declaration of 1st parameter |
-| file://:0:0:0:0 | declaration of 1st parameter |
+| file://:0:0:0:0 | declaration of (unnamed parameter 0) |
+| file://:0:0:0:0 | declaration of (unnamed parameter 0) |
+| file://:0:0:0:0 | declaration of (unnamed parameter 0) |
+| file://:0:0:0:0 | declaration of (unnamed parameter 0) |
 | file://:0:0:0:0 | definition of fp_offset |
 | file://:0:0:0:0 | definition of gp_offset |
 | file://:0:0:0:0 | definition of overflow_arg_area |
diff --git a/cpp/ql/test/library-tests/destructors/cfg.ql b/cpp/ql/test/library-tests/destructors/cfg.ql
index 19a82ba0de0..0e1f45caf19 100644
--- a/cpp/ql/test/library-tests/destructors/cfg.ql
+++ b/cpp/ql/test/library-tests/destructors/cfg.ql
@@ -1,4 +1,9 @@
-// query-type: graph
+/**
+ * query-type: graph
+ *
+ * @kind graph-equivalence-test
+ */
+
 import cpp
 
 class DestructorCallEnhanced extends DestructorCall {
diff --git a/cpp/ql/test/library-tests/exprs/implicitly_declared/error_type.expected b/cpp/ql/test/library-tests/exprs/implicitly_declared/error_type.expected
new file mode 100644
index 00000000000..b7974b1b262
--- /dev/null
+++ b/cpp/ql/test/library-tests/exprs/implicitly_declared/error_type.expected
@@ -0,0 +1 @@
+| file://:0:0:0:0 | <error expr> |
diff --git a/cpp/ql/test/library-tests/exprs/implicitly_declared/error_type.ql b/cpp/ql/test/library-tests/exprs/implicitly_declared/error_type.ql
new file mode 100644
index 00000000000..81e1f1fefa7
--- /dev/null
+++ b/cpp/ql/test/library-tests/exprs/implicitly_declared/error_type.ql
@@ -0,0 +1,5 @@
+import cpp
+
+from Expr e
+where e.getType() instanceof ErroneousType
+select e
diff --git a/cpp/ql/test/library-tests/exprs/implicitly_declared/errors.expected b/cpp/ql/test/library-tests/exprs/implicitly_declared/errors.expected
new file mode 100644
index 00000000000..84a1b0c7df2
--- /dev/null
+++ b/cpp/ql/test/library-tests/exprs/implicitly_declared/errors.expected
@@ -0,0 +1,2 @@
+| file://:0:0:0:0 | There was an error during this compilation |
+| implicit.cpp:5:5:5:5 | identifier 'g' is undefined |
diff --git a/cpp/ql/test/library-tests/exprs/implicitly_declared/errors.ql b/cpp/ql/test/library-tests/exprs/implicitly_declared/errors.ql
new file mode 100644
index 00000000000..3fa864748e1
--- /dev/null
+++ b/cpp/ql/test/library-tests/exprs/implicitly_declared/errors.ql
@@ -0,0 +1,4 @@
+import cpp
+
+from Diagnostic d
+select d
diff --git a/cpp/ql/test/library-tests/exprs/implicitly_declared/functions.expected b/cpp/ql/test/library-tests/exprs/implicitly_declared/functions.expected
new file mode 100644
index 00000000000..e7142fb7df2
--- /dev/null
+++ b/cpp/ql/test/library-tests/exprs/implicitly_declared/functions.expected
@@ -0,0 +1,6 @@
+| implicit2.c:1:7:1:7 | g | file://:0:0:0:0 | float |
+| implicit2.c:1:7:1:7 | g | file://:0:0:0:0 | int |
+| implicit.c:1:6:1:6 | f | file://:0:0:0:0 | void |
+| implicit.c:3:5:3:5 | g | file://:0:0:0:0 | float |
+| implicit.c:3:5:3:5 | g | file://:0:0:0:0 | int |
+| implicit.cpp:3:6:3:6 | f | file://:0:0:0:0 | void |
diff --git a/cpp/ql/test/library-tests/exprs/implicitly_declared/functions.ql b/cpp/ql/test/library-tests/exprs/implicitly_declared/functions.ql
new file mode 100644
index 00000000000..71d120935a5
--- /dev/null
+++ b/cpp/ql/test/library-tests/exprs/implicitly_declared/functions.ql
@@ -0,0 +1,5 @@
+import cpp
+
+from Function fn
+where fn.fromSource()
+select fn, fn.getType()
diff --git a/cpp/ql/test/library-tests/exprs/implicitly_declared/implicit.c b/cpp/ql/test/library-tests/exprs/implicitly_declared/implicit.c
new file mode 100644
index 00000000000..5cfb42c79ba
--- /dev/null
+++ b/cpp/ql/test/library-tests/exprs/implicitly_declared/implicit.c
@@ -0,0 +1,4 @@
+void f() {
+    f();
+    g();
+}
diff --git a/cpp/ql/test/library-tests/exprs/implicitly_declared/implicit.cpp b/cpp/ql/test/library-tests/exprs/implicitly_declared/implicit.cpp
new file mode 100644
index 00000000000..f64bf61753f
--- /dev/null
+++ b/cpp/ql/test/library-tests/exprs/implicitly_declared/implicit.cpp
@@ -0,0 +1,6 @@
+// semmle-extractor-options: --expect_errors
+
+void f() {
+    f();
+    g();
+}
diff --git a/cpp/ql/test/library-tests/exprs/implicitly_declared/implicit.expected b/cpp/ql/test/library-tests/exprs/implicitly_declared/implicit.expected
new file mode 100644
index 00000000000..8f626de5e7c
--- /dev/null
+++ b/cpp/ql/test/library-tests/exprs/implicitly_declared/implicit.expected
@@ -0,0 +1 @@
+| implicit.c:3:5:3:5 | call to g |
diff --git a/cpp/ql/test/library-tests/exprs/implicitly_declared/implicit.ql b/cpp/ql/test/library-tests/exprs/implicitly_declared/implicit.ql
new file mode 100644
index 00000000000..fe640c83de9
--- /dev/null
+++ b/cpp/ql/test/library-tests/exprs/implicitly_declared/implicit.ql
@@ -0,0 +1,5 @@
+import cpp
+
+from Call c
+where c.mayBeFromImplicitlyDeclaredFunction()
+select c
diff --git a/cpp/ql/test/library-tests/exprs/implicitly_declared/implicit2.c b/cpp/ql/test/library-tests/exprs/implicitly_declared/implicit2.c
new file mode 100644
index 00000000000..0f4c2a489e3
--- /dev/null
+++ b/cpp/ql/test/library-tests/exprs/implicitly_declared/implicit2.c
@@ -0,0 +1 @@
+float g();
diff --git a/cpp/ql/test/library-tests/extraction_errors/CompilerErrors.expected b/cpp/ql/test/library-tests/extraction_errors/CompilerErrors.expected
new file mode 100644
index 00000000000..1e4e4c8e3c6
--- /dev/null
+++ b/cpp/ql/test/library-tests/extraction_errors/CompilerErrors.expected
@@ -0,0 +1,10 @@
+| 'this' may only be used inside a nonstatic member function | 1 |
+| There was an error during this compilation | 1 |
+| expected a ')' | 1 |
+| expected a ';' | 1 |
+| expected an expression | 1 |
+| identifier 'no_such_function' is undefined | 1 |
+| identifier 'nsf2' is undefined | 1 |
+| identifier 'so_is_this' is undefined | 1 |
+| identifier 'uint32_t' is undefined | 1 |
+| too few arguments in function call | 1 |
diff --git a/cpp/ql/test/library-tests/extraction_errors/CompilerErrors.qlref b/cpp/ql/test/library-tests/extraction_errors/CompilerErrors.qlref
new file mode 100644
index 00000000000..fd0c287c00d
--- /dev/null
+++ b/cpp/ql/test/library-tests/extraction_errors/CompilerErrors.qlref
@@ -0,0 +1 @@
+Telemetry/CompilerErrors.ql
diff --git a/cpp/ql/test/library-tests/extraction_errors/DatabaseQuality.expected b/cpp/ql/test/library-tests/extraction_errors/DatabaseQuality.expected
new file mode 100644
index 00000000000..6d9cea2d734
--- /dev/null
+++ b/cpp/ql/test/library-tests/extraction_errors/DatabaseQuality.expected
@@ -0,0 +1,9 @@
+| Percentage of calls with an explicit target | 50.0 |
+| Percentage of compilations without errors | 50.0 |
+| Percentage of expressions with a known type | 30.0 |
+| Percentage of functions without errors | 75.0 |
+| Percentage of lines of code without errors | 63.1578947368421 |
+| Percentage of non-error expressions | 30.0 |
+| Percentage of source/header files without errors | 66.66666666666667 |
+| Percentage of successfully resolved #include directives | 100.0 |
+| Percentage of variables with a known type | 90.0 |
diff --git a/cpp/ql/test/library-tests/extraction_errors/DatabaseQuality.qlref b/cpp/ql/test/library-tests/extraction_errors/DatabaseQuality.qlref
new file mode 100644
index 00000000000..b2c536f00d7
--- /dev/null
+++ b/cpp/ql/test/library-tests/extraction_errors/DatabaseQuality.qlref
@@ -0,0 +1 @@
+Telemetry/DatabaseQuality.ql
diff --git a/cpp/ql/test/library-tests/extraction_errors/ErrorExprs.expected b/cpp/ql/test/library-tests/extraction_errors/ErrorExprs.expected
new file mode 100644
index 00000000000..3f437a7fd26
--- /dev/null
+++ b/cpp/ql/test/library-tests/extraction_errors/ErrorExprs.expected
@@ -0,0 +1,7 @@
+| test.cpp:6:13:6:31 | initializer for x | test.cpp:6:13:6:31 | <error expr> |
+| test.cpp:7:5:7:8 | ExprStmt | file://:0:0:0:0 | <error expr> |
+| test.cpp:8:5:8:23 | ExprStmt | file://:0:0:0:0 | <error expr> |
+| test.cpp:9:5:9:21 | ExprStmt | file://:0:0:0:0 | <error expr> |
+| test.cpp:11:5:11:8 | ExprStmt | file://:0:0:0:0 | <error expr> |
+| test.cpp:15:5:15:8 | ExprStmt | file://:0:0:0:0 | <error expr> |
+| test.cpp:16:5:16:16 | ExprStmt | file://:0:0:0:0 | <error expr> |
diff --git a/cpp/ql/test/library-tests/extraction_errors/ErrorExprs.ql b/cpp/ql/test/library-tests/extraction_errors/ErrorExprs.ql
new file mode 100644
index 00000000000..25c2118e010
--- /dev/null
+++ b/cpp/ql/test/library-tests/extraction_errors/ErrorExprs.ql
@@ -0,0 +1,4 @@
+import cpp
+
+from ErrorExpr e
+select e.getParent(), e
diff --git a/cpp/ql/test/library-tests/extraction_errors/ExtractionMetrics.expected b/cpp/ql/test/library-tests/extraction_errors/ExtractionMetrics.expected
new file mode 100644
index 00000000000..ee2cc0f9963
--- /dev/null
+++ b/cpp/ql/test/library-tests/extraction_errors/ExtractionMetrics.expected
@@ -0,0 +1,20 @@
+| #include directives | 2 |
+| calls | 2 |
+| calls with an explicit target | 1 |
+| compilations | 2 |
+| compilations without errors | 1 |
+| compiler errors | 10 |
+| expressions | 10 |
+| expressions with a known type | 3 |
+| functions | 8 |
+| functions without errors | 6 |
+| lines of code | 19 |
+| lines of code without errors | 12 |
+| lines of text | 24 |
+| non-error expressions | 3 |
+| source/header files | 3 |
+| source/header files without errors | 2 |
+| successfully resolved #include directives | 2 |
+| syntax errors | 3 |
+| variables | 10 |
+| variables with a known type | 9 |
diff --git a/cpp/ql/test/library-tests/extraction_errors/ExtractionMetrics.qlref b/cpp/ql/test/library-tests/extraction_errors/ExtractionMetrics.qlref
new file mode 100644
index 00000000000..80547fdfd98
--- /dev/null
+++ b/cpp/ql/test/library-tests/extraction_errors/ExtractionMetrics.qlref
@@ -0,0 +1 @@
+Telemetry/ExtractionMetrics.ql
\ No newline at end of file
diff --git a/cpp/ql/test/library-tests/extraction_errors/SucceededIncludes.expected b/cpp/ql/test/library-tests/extraction_errors/SucceededIncludes.expected
new file mode 100644
index 00000000000..13536ce172c
--- /dev/null
+++ b/cpp/ql/test/library-tests/extraction_errors/SucceededIncludes.expected
@@ -0,0 +1 @@
+| "test.h" | 2 |
diff --git a/cpp/ql/test/library-tests/extraction_errors/SucceededIncludes.qlref b/cpp/ql/test/library-tests/extraction_errors/SucceededIncludes.qlref
new file mode 100644
index 00000000000..055b6af49a7
--- /dev/null
+++ b/cpp/ql/test/library-tests/extraction_errors/SucceededIncludes.qlref
@@ -0,0 +1 @@
+Telemetry/SucceededIncludes.ql
diff --git a/cpp/ql/test/library-tests/extraction_errors/diags.expected b/cpp/ql/test/library-tests/extraction_errors/diags.expected
new file mode 100644
index 00000000000..68e5c9c154c
--- /dev/null
+++ b/cpp/ql/test/library-tests/extraction_errors/diags.expected
@@ -0,0 +1,10 @@
+| file://:0:0:0:0 | There was an error during this compilation |
+| test.cpp:6:14:6:14 | identifier 'no_such_function' is undefined |
+| test.cpp:9:14:9:14 | identifier 'nsf2' is undefined |
+| test.cpp:11:7:11:7 | too few arguments in function call |
+| test.cpp:14:1:14:1 | identifier 'uint32_t' is undefined |
+| test.cpp:15:5:15:5 | 'this' may only be used inside a nonstatic member function |
+| test.cpp:15:10:15:10 | expected a ';' |
+| test.cpp:16:5:16:5 | identifier 'so_is_this' is undefined |
+| test.cpp:16:16:16:16 | expected a ')' |
+| test.cpp:16:16:16:16 | expected an expression |
diff --git a/cpp/ql/test/library-tests/extraction_errors/diags.ql b/cpp/ql/test/library-tests/extraction_errors/diags.ql
new file mode 100644
index 00000000000..3fa864748e1
--- /dev/null
+++ b/cpp/ql/test/library-tests/extraction_errors/diags.ql
@@ -0,0 +1,4 @@
+import cpp
+
+from Diagnostic d
+select d
diff --git a/cpp/ql/test/library-tests/extraction_errors/error_variables.expected b/cpp/ql/test/library-tests/extraction_errors/error_variables.expected
new file mode 100644
index 00000000000..d5b216dba71
--- /dev/null
+++ b/cpp/ql/test/library-tests/extraction_errors/error_variables.expected
@@ -0,0 +1 @@
+| test.cpp:6:10:6:10 | x | This variable does not have a type. |
diff --git a/cpp/ql/test/library-tests/extraction_errors/error_variables.ql b/cpp/ql/test/library-tests/extraction_errors/error_variables.ql
new file mode 100644
index 00000000000..e3867462b56
--- /dev/null
+++ b/cpp/ql/test/library-tests/extraction_errors/error_variables.ql
@@ -0,0 +1,5 @@
+import cpp
+
+from Variable v
+where v.getType() instanceof ErroneousType or not exists(v.getType())
+select v, "This variable does not have a type."
diff --git a/cpp/ql/test/library-tests/extraction_errors/functions.expected b/cpp/ql/test/library-tests/extraction_errors/functions.expected
new file mode 100644
index 00000000000..db80ede0655
--- /dev/null
+++ b/cpp/ql/test/library-tests/extraction_errors/functions.expected
@@ -0,0 +1,6 @@
+| test.c:3:6:3:6 | g |
+| test.c:4:13:4:13 | no_such_function |
+| test.cpp:5:6:5:25 | function_with_errors |
+| test.cpp:14:10:14:12 | fn2 |
+| test.h:2:5:2:5 | f |
+| test.h:2:5:2:5 | f |
diff --git a/cpp/ql/test/library-tests/extraction_errors/functions.ql b/cpp/ql/test/library-tests/extraction_errors/functions.ql
new file mode 100644
index 00000000000..ac52eec7309
--- /dev/null
+++ b/cpp/ql/test/library-tests/extraction_errors/functions.ql
@@ -0,0 +1,5 @@
+import cpp
+
+from Function fn
+where fn.fromSource()
+select fn
diff --git a/cpp/ql/test/library-tests/extraction_errors/test.c b/cpp/ql/test/library-tests/extraction_errors/test.c
new file mode 100644
index 00000000000..e247964f71c
--- /dev/null
+++ b/cpp/ql/test/library-tests/extraction_errors/test.c
@@ -0,0 +1,5 @@
+#include "test.h"
+
+void g() {
+    int x = no_such_function();
+}
diff --git a/cpp/ql/test/library-tests/extraction_errors/test.cpp b/cpp/ql/test/library-tests/extraction_errors/test.cpp
new file mode 100644
index 00000000000..b2ca86bcbaa
--- /dev/null
+++ b/cpp/ql/test/library-tests/extraction_errors/test.cpp
@@ -0,0 +1,17 @@
+// semmle-extractor-options: --expect_errors
+
+#include "test.h"
+
+void function_with_errors() {
+    auto x = no_such_function();
+    x+2;
+    no_such_function();
+    ADD(x+1, nsf2());
+    f(1);
+    f();
+}
+
+uint32_t fn2() {
+    this is a syntax error;
+    so_is_this(;
+}
diff --git a/cpp/ql/test/library-tests/extraction_errors/test.h b/cpp/ql/test/library-tests/extraction_errors/test.h
new file mode 100644
index 00000000000..a3941657c0e
--- /dev/null
+++ b/cpp/ql/test/library-tests/extraction_errors/test.h
@@ -0,0 +1,2 @@
+#define ADD(A,B) ((A)+(B))
+int f(int);
diff --git a/cpp/ql/test/library-tests/files/Files.expected b/cpp/ql/test/library-tests/files/Files.expected
index 68187793433..13f3a6b2da1 100644
--- a/cpp/ql/test/library-tests/files/Files.expected
+++ b/cpp/ql/test/library-tests/files/Files.expected
@@ -1,4 +1,4 @@
-| c.c | library-tests/files/c.c | CFile, MetricFile | C |  |  |
-| files1.cpp | library-tests/files/files1.cpp | CppFile, MetricFile | C++ | swap | t |
-| files1.h | library-tests/files/files1.h | HeaderFile, MetricFile |  | swap |  |
-| files2.cpp | library-tests/files/files2.cpp | CppFile, MetricFile | C++ | g | x, y |
+| c.c | c.c | CFile, MetricFile | C |  |  |
+| files1.cpp | files1.cpp | CppFile, MetricFile | C++ | swap | t |
+| files1.h | files1.h | HeaderFile, MetricFile |  | swap |  |
+| files2.cpp | files2.cpp | CppFile, MetricFile | C++ | g | x, y |
diff --git a/cpp/ql/test/library-tests/ir/ir/PrintAST.expected b/cpp/ql/test/library-tests/ir/ir/PrintAST.expected
index 986ce6dd158..d4f9c4f96c6 100644
--- a/cpp/ql/test/library-tests/ir/ir/PrintAST.expected
+++ b/cpp/ql/test/library-tests/ir/ir/PrintAST.expected
@@ -4607,6 +4607,188 @@ ir.c:
 #   81|             Value = [Literal] 1
 #   81|             ValueCategory = prvalue
 #   82|     getStmt(1): [ReturnStmt] return ...
+#   84| [TopLevelFunction] void branch_on_integral_in_c(int, int)
+#   84|   <params>: 
+#   84|     getParameter(0): [Parameter] x1
+#   84|         Type = [IntType] int
+#   84|     getParameter(1): [Parameter] x2
+#   84|         Type = [IntType] int
+#   84|   getEntryPoint(): [BlockStmt] { ... }
+#   85|     getStmt(0): [IfStmt] if (...) ... 
+#   85|       getCondition(): [VariableAccess] x1
+#   85|           Type = [IntType] int
+#   85|           ValueCategory = prvalue(load)
+#   85|       getThen(): [BlockStmt] { ... }
+#   86|     getStmt(1): [IfStmt] if (...) ... 
+#   86|       getCondition(): [NotExpr] ! ...
+#   86|           Type = [IntType] int
+#   86|           ValueCategory = prvalue
+#   86|         getOperand(): [VariableAccess] x1
+#   86|             Type = [IntType] int
+#   86|             ValueCategory = prvalue(load)
+#   86|       getThen(): [BlockStmt] { ... }
+#   88|     getStmt(2): [DeclStmt] declaration
+#   88|       getDeclarationEntry(0): [VariableDeclarationEntry] definition of y
+#   88|           Type = [IntType] int
+#   88|         getVariable().getInitializer(): [Initializer] initializer for y
+#   88|           getExpr(): [NotExpr] ! ...
+#   88|               Type = [IntType] int
+#   88|               ValueCategory = prvalue
+#   88|             getOperand(): [VariableAccess] x1
+#   88|                 Type = [IntType] int
+#   88|                 ValueCategory = prvalue(load)
+#   89|     getStmt(3): [IfStmt] if (...) ... 
+#   89|       getCondition(): [VariableAccess] y
+#   89|           Type = [IntType] int
+#   89|           ValueCategory = prvalue(load)
+#   89|       getThen(): [BlockStmt] { ... }
+#   90|     getStmt(4): [IfStmt] if (...) ... 
+#   90|       getCondition(): [NotExpr] ! ...
+#   90|           Type = [IntType] int
+#   90|           ValueCategory = prvalue
+#   90|         getOperand(): [VariableAccess] y
+#   90|             Type = [IntType] int
+#   90|             ValueCategory = prvalue(load)
+#   90|       getThen(): [BlockStmt] { ... }
+#   92|     getStmt(5): [IfStmt] if (...) ... 
+#   92|       getCondition(): [LogicalAndExpr] ... && ...
+#   92|           Type = [IntType] int
+#   92|           ValueCategory = prvalue
+#   92|         getLeftOperand(): [VariableAccess] x1
+#   92|             Type = [IntType] int
+#   92|             ValueCategory = prvalue(load)
+#   92|         getRightOperand(): [VariableAccess] x2
+#   92|             Type = [IntType] int
+#   92|             ValueCategory = prvalue(load)
+#   92|       getThen(): [BlockStmt] { ... }
+#   93|     getStmt(6): [IfStmt] if (...) ... 
+#   93|       getCondition(): [LogicalAndExpr] ... && ...
+#   93|           Type = [IntType] int
+#   93|           ValueCategory = prvalue
+#   93|         getLeftOperand(): [NotExpr] ! ...
+#   93|             Type = [IntType] int
+#   93|             ValueCategory = prvalue
+#   93|           getOperand(): [VariableAccess] x1
+#   93|               Type = [IntType] int
+#   93|               ValueCategory = prvalue(load)
+#   93|         getRightOperand(): [VariableAccess] x2
+#   93|             Type = [IntType] int
+#   93|             ValueCategory = prvalue(load)
+#   93|       getThen(): [BlockStmt] { ... }
+#   94|     getStmt(7): [IfStmt] if (...) ... 
+#   94|       getCondition(): [LogicalAndExpr] ... && ...
+#   94|           Type = [IntType] int
+#   94|           ValueCategory = prvalue
+#   94|         getLeftOperand(): [VariableAccess] x1
+#   94|             Type = [IntType] int
+#   94|             ValueCategory = prvalue(load)
+#   94|         getRightOperand(): [NotExpr] ! ...
+#   94|             Type = [IntType] int
+#   94|             ValueCategory = prvalue
+#   94|           getOperand(): [VariableAccess] x2
+#   94|               Type = [IntType] int
+#   94|               ValueCategory = prvalue(load)
+#   94|       getThen(): [BlockStmt] { ... }
+#   95|     getStmt(8): [IfStmt] if (...) ... 
+#   95|       getCondition(): [LogicalAndExpr] ... && ...
+#   95|           Type = [IntType] int
+#   95|           ValueCategory = prvalue
+#   95|         getLeftOperand(): [NotExpr] ! ...
+#   95|             Type = [IntType] int
+#   95|             ValueCategory = prvalue
+#   95|           getOperand(): [VariableAccess] x1
+#   95|               Type = [IntType] int
+#   95|               ValueCategory = prvalue(load)
+#   95|         getRightOperand(): [NotExpr] ! ...
+#   95|             Type = [IntType] int
+#   95|             ValueCategory = prvalue
+#   95|           getOperand(): [VariableAccess] x2
+#   95|               Type = [IntType] int
+#   95|               ValueCategory = prvalue(load)
+#   95|       getThen(): [BlockStmt] { ... }
+#   96|     getStmt(9): [IfStmt] if (...) ... 
+#   96|       getCondition(): [LogicalOrExpr] ... || ...
+#   96|           Type = [IntType] int
+#   96|           ValueCategory = prvalue
+#   96|         getLeftOperand(): [VariableAccess] x1
+#   96|             Type = [IntType] int
+#   96|             ValueCategory = prvalue(load)
+#   96|         getRightOperand(): [VariableAccess] x2
+#   96|             Type = [IntType] int
+#   96|             ValueCategory = prvalue(load)
+#   96|       getThen(): [BlockStmt] { ... }
+#   97|     getStmt(10): [IfStmt] if (...) ... 
+#   97|       getCondition(): [LogicalOrExpr] ... || ...
+#   97|           Type = [IntType] int
+#   97|           ValueCategory = prvalue
+#   97|         getLeftOperand(): [NotExpr] ! ...
+#   97|             Type = [IntType] int
+#   97|             ValueCategory = prvalue
+#   97|           getOperand(): [VariableAccess] x1
+#   97|               Type = [IntType] int
+#   97|               ValueCategory = prvalue(load)
+#   97|         getRightOperand(): [VariableAccess] x2
+#   97|             Type = [IntType] int
+#   97|             ValueCategory = prvalue(load)
+#   97|       getThen(): [BlockStmt] { ... }
+#   98|     getStmt(11): [IfStmt] if (...) ... 
+#   98|       getCondition(): [LogicalOrExpr] ... || ...
+#   98|           Type = [IntType] int
+#   98|           ValueCategory = prvalue
+#   98|         getLeftOperand(): [VariableAccess] x1
+#   98|             Type = [IntType] int
+#   98|             ValueCategory = prvalue(load)
+#   98|         getRightOperand(): [NotExpr] ! ...
+#   98|             Type = [IntType] int
+#   98|             ValueCategory = prvalue
+#   98|           getOperand(): [VariableAccess] x2
+#   98|               Type = [IntType] int
+#   98|               ValueCategory = prvalue(load)
+#   98|       getThen(): [BlockStmt] { ... }
+#   99|     getStmt(12): [IfStmt] if (...) ... 
+#   99|       getCondition(): [LogicalOrExpr] ... || ...
+#   99|           Type = [IntType] int
+#   99|           ValueCategory = prvalue
+#   99|         getLeftOperand(): [NotExpr] ! ...
+#   99|             Type = [IntType] int
+#   99|             ValueCategory = prvalue
+#   99|           getOperand(): [VariableAccess] x1
+#   99|               Type = [IntType] int
+#   99|               ValueCategory = prvalue(load)
+#   99|         getRightOperand(): [NotExpr] ! ...
+#   99|             Type = [IntType] int
+#   99|             ValueCategory = prvalue
+#   99|           getOperand(): [VariableAccess] x2
+#   99|               Type = [IntType] int
+#   99|               ValueCategory = prvalue(load)
+#   99|       getThen(): [BlockStmt] { ... }
+#  101|     getStmt(13): [DeclStmt] declaration
+#  101|       getDeclarationEntry(0): [VariableDeclarationEntry] definition of x_1_and_2
+#  101|           Type = [IntType] int
+#  101|         getVariable().getInitializer(): [Initializer] initializer for x_1_and_2
+#  101|           getExpr(): [LogicalAndExpr] ... && ...
+#  101|               Type = [IntType] int
+#  101|               ValueCategory = prvalue
+#  101|             getLeftOperand(): [VariableAccess] x1
+#  101|                 Type = [IntType] int
+#  101|                 ValueCategory = prvalue(load)
+#  101|             getRightOperand(): [VariableAccess] x2
+#  101|                 Type = [IntType] int
+#  101|                 ValueCategory = prvalue(load)
+#  102|     getStmt(14): [IfStmt] if (...) ... 
+#  102|       getCondition(): [VariableAccess] x_1_and_2
+#  102|           Type = [IntType] int
+#  102|           ValueCategory = prvalue(load)
+#  102|       getThen(): [BlockStmt] { ... }
+#  103|     getStmt(15): [IfStmt] if (...) ... 
+#  103|       getCondition(): [NotExpr] ! ...
+#  103|           Type = [IntType] int
+#  103|           ValueCategory = prvalue
+#  103|         getOperand(): [VariableAccess] x_1_and_2
+#  103|             Type = [IntType] int
+#  103|             ValueCategory = prvalue(load)
+#  103|       getThen(): [BlockStmt] { ... }
+#  104|     getStmt(16): [ReturnStmt] return ...
 ir.cpp:
 #    1| [TopLevelFunction] void Constants()
 #    1|   <params>: 
@@ -9055,6 +9237,8 @@ ir.cpp:
 #  733|                 Value = [Literal] 7
 #  733|                 ValueCategory = prvalue
 #  735|       getChild(1): [Handler] <handler>
+#  735|         getParameter(): [Parameter] s
+#  735|             Type = [PointerType] const char *
 #  735|         getBlock(): [CatchBlock] { ... }
 #  736|           getStmt(0): [ExprStmt] ExprStmt
 #  736|             getExpr(): [ThrowExpr] throw ...
@@ -9067,6 +9251,8 @@ ir.cpp:
 #  736|                     Type = [PointerType] const char *
 #  736|                     ValueCategory = prvalue(load)
 #  738|       getChild(2): [Handler] <handler>
+#  738|         getParameter(): [Parameter] e
+#  738|             Type = [LValueReferenceType] const String &
 #  738|         getBlock(): [CatchBlock] { ... }
 #  740|       getChild(3): [Handler] <handler>
 #  740|         getBlock(): [CatchAnyBlock] { ... }
@@ -12852,6 +13038,8 @@ ir.cpp:
 # 1200|                 Value = [Literal] 7
 # 1200|                 ValueCategory = prvalue
 # 1202|       getChild(1): [Handler] <handler>
+# 1202|         getParameter(): [Parameter] s
+# 1202|             Type = [PointerType] const char *
 # 1202|         getBlock(): [CatchBlock] { ... }
 # 1203|           getStmt(0): [ExprStmt] ExprStmt
 # 1203|             getExpr(): [ThrowExpr] throw ...
@@ -12864,6 +13052,8 @@ ir.cpp:
 # 1203|                     Type = [PointerType] const char *
 # 1203|                     ValueCategory = prvalue(load)
 # 1205|       getChild(2): [Handler] <handler>
+# 1205|         getParameter(): [Parameter] e
+# 1205|             Type = [LValueReferenceType] const String &
 # 1205|         getBlock(): [CatchBlock] { ... }
 # 1207|     getStmt(1): [ReturnStmt] return ...
 # 1211| [TopLevelFunction] void VectorTypes(int)
@@ -20586,6 +20776,8 @@ ir.cpp:
 # 2281|               Type = [Struct] String
 # 2281|               ValueCategory = lvalue
 # 2282|       getChild(1): [Handler] <handler>
+# 2282|         getParameter(): [Parameter] s
+# 2282|             Type = [PointerType] const char *
 # 2282|         getBlock(): [CatchBlock] { ... }
 # 2283|           getStmt(0): [ExprStmt] ExprStmt
 # 2283|             getExpr(): [ThrowExpr] throw ...
@@ -20598,6 +20790,8 @@ ir.cpp:
 # 2283|                     Type = [PointerType] const char *
 # 2283|                     ValueCategory = prvalue(load)
 # 2285|       getChild(2): [Handler] <handler>
+# 2285|         getParameter(): [Parameter] e
+# 2285|             Type = [LValueReferenceType] const String &
 # 2285|         getBlock(): [CatchBlock] { ... }
 # 2287|       getChild(3): [Handler] <handler>
 # 2287|         getBlock(): [CatchAnyBlock] { ... }
@@ -22845,6 +23039,8 @@ ir.cpp:
 # 2537|                 Value = [Literal] 42
 # 2537|                 ValueCategory = prvalue
 # 2539|       getChild(1): [Handler] <handler>
+# 2539|         getParameter(): [Parameter] (unnamed parameter 0)
+# 2539|             Type = [PlainCharType] char
 # 2539|         getBlock(): [CatchBlock] { ... }
 # 2541|         getImplicitDestructorCall(0): [DestructorCall] call to ~ClassWithDestructor
 # 2541|             Type = [VoidType] void
@@ -23564,6 +23760,332 @@ ir.cpp:
 # 2686|           Value = [CStyleCast] 0
 # 2686|           ValueCategory = prvalue
 # 2687|     getStmt(1): [ReturnStmt] return ...
+# 2691| [TopLevelFunction] int concepts::requires_use()
+# 2691|   <params>: 
+# 2691|   getEntryPoint(): [BlockStmt] { ... }
+# 2692|     getStmt(0): [DeclStmt] declaration
+# 2692|       getDeclarationEntry(0): [VariableDeclarationEntry] definition of y
+# 2692|           Type = [IntType] int
+# 2692|         getVariable().getInitializer(): [Initializer] initializer for y
+#-----|           getExpr(): [RequiresExpr] requires { ... }
+#-----|               Type = [BoolType] bool
+#-----|               Value = [RequiresExpr] 1
+#-----|               ValueCategory = prvalue
+#-----|             <params>: 
+# 2692|             getRequirement(0): [GTExpr,SimpleRequirementExpr] ... > ...
+# 2692|                 Type = [BoolType] bool
+# 2692|                 ValueCategory = prvalue
+# 2692|               getGreaterOperand(): [SizeofTypeOperator] sizeof(int)
+# 2692|                   Type = [LongType] unsigned long
+# 2692|                   Value = [SizeofTypeOperator] 4
+# 2692|                   ValueCategory = prvalue
+# 2692|               getLesserOperand(): [Literal] 0
+# 2692|                   Type = [IntType] int
+# 2692|                   Value = [Literal] 0
+# 2692|                   ValueCategory = prvalue
+# 2692|               getLesserOperand().getFullyConverted(): [CStyleCast] (unsigned long)...
+# 2692|                   Conversion = [IntegralConversion] integral conversion
+# 2692|                   Type = [LongType] unsigned long
+# 2692|                   ValueCategory = prvalue
+#-----|           getExpr().getFullyConverted(): [CStyleCast] (int)...
+#-----|               Conversion = [IntegralConversion] integral conversion
+#-----|               Type = [IntType] int
+#-----|               Value = [CStyleCast] 1
+#-----|               ValueCategory = prvalue
+# 2693|     getStmt(1): [ReturnStmt] return ...
+# 2693|       getExpr(): [VariableAccess] y
+# 2693|           Type = [IntType] int
+# 2693|           ValueCategory = prvalue(load)
+# 2698| [TopLevelFunction] void branch_on_integral_in_cpp(int, int)
+# 2698|   <params>: 
+# 2698|     getParameter(0): [Parameter] x1
+# 2698|         Type = [IntType] int
+# 2698|     getParameter(1): [Parameter] x2
+# 2698|         Type = [IntType] int
+# 2698|   getEntryPoint(): [BlockStmt] { ... }
+# 2699|     getStmt(0): [IfStmt] if (...) ... 
+# 2699|       getCondition(): [VariableAccess] x1
+# 2699|           Type = [IntType] int
+# 2699|           ValueCategory = prvalue(load)
+# 2699|       getThen(): [BlockStmt] { ... }
+# 2699|       getCondition().getFullyConverted(): [CStyleCast] (bool)...
+# 2699|           Conversion = [BoolConversion] conversion to bool
+# 2699|           Type = [BoolType] bool
+# 2699|           ValueCategory = prvalue
+# 2700|     getStmt(1): [IfStmt] if (...) ... 
+# 2700|       getCondition(): [NotExpr] ! ...
+# 2700|           Type = [BoolType] bool
+# 2700|           ValueCategory = prvalue
+# 2700|         getOperand(): [VariableAccess] x1
+# 2700|             Type = [IntType] int
+# 2700|             ValueCategory = prvalue(load)
+# 2700|         getOperand().getFullyConverted(): [CStyleCast] (bool)...
+# 2700|             Conversion = [BoolConversion] conversion to bool
+# 2700|             Type = [BoolType] bool
+# 2700|             ValueCategory = prvalue
+# 2700|       getThen(): [BlockStmt] { ... }
+# 2702|     getStmt(2): [DeclStmt] declaration
+# 2702|       getDeclarationEntry(0): [VariableDeclarationEntry] definition of y
+# 2702|           Type = [IntType] int
+# 2702|         getVariable().getInitializer(): [Initializer] initializer for y
+# 2702|           getExpr(): [NotExpr] ! ...
+# 2702|               Type = [BoolType] bool
+# 2702|               ValueCategory = prvalue
+# 2702|             getOperand(): [VariableAccess] x1
+# 2702|                 Type = [IntType] int
+# 2702|                 ValueCategory = prvalue(load)
+# 2702|             getOperand().getFullyConverted(): [CStyleCast] (bool)...
+# 2702|                 Conversion = [BoolConversion] conversion to bool
+# 2702|                 Type = [BoolType] bool
+# 2702|                 ValueCategory = prvalue
+# 2702|           getExpr().getFullyConverted(): [CStyleCast] (int)...
+# 2702|               Conversion = [IntegralConversion] integral conversion
+# 2702|               Type = [IntType] int
+# 2702|               ValueCategory = prvalue
+# 2703|     getStmt(3): [IfStmt] if (...) ... 
+# 2703|       getCondition(): [VariableAccess] y
+# 2703|           Type = [IntType] int
+# 2703|           ValueCategory = prvalue(load)
+# 2703|       getThen(): [BlockStmt] { ... }
+# 2703|       getCondition().getFullyConverted(): [CStyleCast] (bool)...
+# 2703|           Conversion = [BoolConversion] conversion to bool
+# 2703|           Type = [BoolType] bool
+# 2703|           ValueCategory = prvalue
+# 2704|     getStmt(4): [IfStmt] if (...) ... 
+# 2704|       getCondition(): [NotExpr] ! ...
+# 2704|           Type = [BoolType] bool
+# 2704|           ValueCategory = prvalue
+# 2704|         getOperand(): [VariableAccess] y
+# 2704|             Type = [IntType] int
+# 2704|             ValueCategory = prvalue(load)
+# 2704|         getOperand().getFullyConverted(): [CStyleCast] (bool)...
+# 2704|             Conversion = [BoolConversion] conversion to bool
+# 2704|             Type = [BoolType] bool
+# 2704|             ValueCategory = prvalue
+# 2704|       getThen(): [BlockStmt] { ... }
+# 2706|     getStmt(5): [IfStmt] if (...) ... 
+# 2706|       getCondition(): [LogicalAndExpr] ... && ...
+# 2706|           Type = [BoolType] bool
+# 2706|           ValueCategory = prvalue
+# 2706|         getLeftOperand(): [VariableAccess] x1
+# 2706|             Type = [IntType] int
+# 2706|             ValueCategory = prvalue(load)
+# 2706|         getRightOperand(): [VariableAccess] x2
+# 2706|             Type = [IntType] int
+# 2706|             ValueCategory = prvalue(load)
+# 2706|         getLeftOperand().getFullyConverted(): [CStyleCast] (bool)...
+# 2706|             Conversion = [BoolConversion] conversion to bool
+# 2706|             Type = [BoolType] bool
+# 2706|             ValueCategory = prvalue
+# 2706|         getRightOperand().getFullyConverted(): [CStyleCast] (bool)...
+# 2706|             Conversion = [BoolConversion] conversion to bool
+# 2706|             Type = [BoolType] bool
+# 2706|             ValueCategory = prvalue
+# 2706|       getThen(): [BlockStmt] { ... }
+# 2707|     getStmt(6): [IfStmt] if (...) ... 
+# 2707|       getCondition(): [LogicalAndExpr] ... && ...
+# 2707|           Type = [BoolType] bool
+# 2707|           ValueCategory = prvalue
+# 2707|         getLeftOperand(): [NotExpr] ! ...
+# 2707|             Type = [BoolType] bool
+# 2707|             ValueCategory = prvalue
+# 2707|           getOperand(): [VariableAccess] x1
+# 2707|               Type = [IntType] int
+# 2707|               ValueCategory = prvalue(load)
+# 2707|           getOperand().getFullyConverted(): [CStyleCast] (bool)...
+# 2707|               Conversion = [BoolConversion] conversion to bool
+# 2707|               Type = [BoolType] bool
+# 2707|               ValueCategory = prvalue
+# 2707|         getRightOperand(): [VariableAccess] x2
+# 2707|             Type = [IntType] int
+# 2707|             ValueCategory = prvalue(load)
+# 2707|         getRightOperand().getFullyConverted(): [CStyleCast] (bool)...
+# 2707|             Conversion = [BoolConversion] conversion to bool
+# 2707|             Type = [BoolType] bool
+# 2707|             ValueCategory = prvalue
+# 2707|       getThen(): [BlockStmt] { ... }
+# 2708|     getStmt(7): [IfStmt] if (...) ... 
+# 2708|       getCondition(): [LogicalAndExpr] ... && ...
+# 2708|           Type = [BoolType] bool
+# 2708|           ValueCategory = prvalue
+# 2708|         getLeftOperand(): [VariableAccess] x1
+# 2708|             Type = [IntType] int
+# 2708|             ValueCategory = prvalue(load)
+# 2708|         getRightOperand(): [NotExpr] ! ...
+# 2708|             Type = [BoolType] bool
+# 2708|             ValueCategory = prvalue
+# 2708|           getOperand(): [VariableAccess] x2
+# 2708|               Type = [IntType] int
+# 2708|               ValueCategory = prvalue(load)
+# 2708|           getOperand().getFullyConverted(): [CStyleCast] (bool)...
+# 2708|               Conversion = [BoolConversion] conversion to bool
+# 2708|               Type = [BoolType] bool
+# 2708|               ValueCategory = prvalue
+# 2708|         getLeftOperand().getFullyConverted(): [CStyleCast] (bool)...
+# 2708|             Conversion = [BoolConversion] conversion to bool
+# 2708|             Type = [BoolType] bool
+# 2708|             ValueCategory = prvalue
+# 2708|       getThen(): [BlockStmt] { ... }
+# 2709|     getStmt(8): [IfStmt] if (...) ... 
+# 2709|       getCondition(): [LogicalAndExpr] ... && ...
+# 2709|           Type = [BoolType] bool
+# 2709|           ValueCategory = prvalue
+# 2709|         getLeftOperand(): [NotExpr] ! ...
+# 2709|             Type = [BoolType] bool
+# 2709|             ValueCategory = prvalue
+# 2709|           getOperand(): [VariableAccess] x1
+# 2709|               Type = [IntType] int
+# 2709|               ValueCategory = prvalue(load)
+# 2709|           getOperand().getFullyConverted(): [CStyleCast] (bool)...
+# 2709|               Conversion = [BoolConversion] conversion to bool
+# 2709|               Type = [BoolType] bool
+# 2709|               ValueCategory = prvalue
+# 2709|         getRightOperand(): [NotExpr] ! ...
+# 2709|             Type = [BoolType] bool
+# 2709|             ValueCategory = prvalue
+# 2709|           getOperand(): [VariableAccess] x2
+# 2709|               Type = [IntType] int
+# 2709|               ValueCategory = prvalue(load)
+# 2709|           getOperand().getFullyConverted(): [CStyleCast] (bool)...
+# 2709|               Conversion = [BoolConversion] conversion to bool
+# 2709|               Type = [BoolType] bool
+# 2709|               ValueCategory = prvalue
+# 2709|       getThen(): [BlockStmt] { ... }
+# 2710|     getStmt(9): [IfStmt] if (...) ... 
+# 2710|       getCondition(): [LogicalOrExpr] ... || ...
+# 2710|           Type = [BoolType] bool
+# 2710|           ValueCategory = prvalue
+# 2710|         getLeftOperand(): [VariableAccess] x1
+# 2710|             Type = [IntType] int
+# 2710|             ValueCategory = prvalue(load)
+# 2710|         getRightOperand(): [VariableAccess] x2
+# 2710|             Type = [IntType] int
+# 2710|             ValueCategory = prvalue(load)
+# 2710|         getLeftOperand().getFullyConverted(): [CStyleCast] (bool)...
+# 2710|             Conversion = [BoolConversion] conversion to bool
+# 2710|             Type = [BoolType] bool
+# 2710|             ValueCategory = prvalue
+# 2710|         getRightOperand().getFullyConverted(): [CStyleCast] (bool)...
+# 2710|             Conversion = [BoolConversion] conversion to bool
+# 2710|             Type = [BoolType] bool
+# 2710|             ValueCategory = prvalue
+# 2710|       getThen(): [BlockStmt] { ... }
+# 2711|     getStmt(10): [IfStmt] if (...) ... 
+# 2711|       getCondition(): [LogicalOrExpr] ... || ...
+# 2711|           Type = [BoolType] bool
+# 2711|           ValueCategory = prvalue
+# 2711|         getLeftOperand(): [NotExpr] ! ...
+# 2711|             Type = [BoolType] bool
+# 2711|             ValueCategory = prvalue
+# 2711|           getOperand(): [VariableAccess] x1
+# 2711|               Type = [IntType] int
+# 2711|               ValueCategory = prvalue(load)
+# 2711|           getOperand().getFullyConverted(): [CStyleCast] (bool)...
+# 2711|               Conversion = [BoolConversion] conversion to bool
+# 2711|               Type = [BoolType] bool
+# 2711|               ValueCategory = prvalue
+# 2711|         getRightOperand(): [VariableAccess] x2
+# 2711|             Type = [IntType] int
+# 2711|             ValueCategory = prvalue(load)
+# 2711|         getRightOperand().getFullyConverted(): [CStyleCast] (bool)...
+# 2711|             Conversion = [BoolConversion] conversion to bool
+# 2711|             Type = [BoolType] bool
+# 2711|             ValueCategory = prvalue
+# 2711|       getThen(): [BlockStmt] { ... }
+# 2712|     getStmt(11): [IfStmt] if (...) ... 
+# 2712|       getCondition(): [LogicalOrExpr] ... || ...
+# 2712|           Type = [BoolType] bool
+# 2712|           ValueCategory = prvalue
+# 2712|         getLeftOperand(): [VariableAccess] x1
+# 2712|             Type = [IntType] int
+# 2712|             ValueCategory = prvalue(load)
+# 2712|         getRightOperand(): [NotExpr] ! ...
+# 2712|             Type = [BoolType] bool
+# 2712|             ValueCategory = prvalue
+# 2712|           getOperand(): [VariableAccess] x2
+# 2712|               Type = [IntType] int
+# 2712|               ValueCategory = prvalue(load)
+# 2712|           getOperand().getFullyConverted(): [CStyleCast] (bool)...
+# 2712|               Conversion = [BoolConversion] conversion to bool
+# 2712|               Type = [BoolType] bool
+# 2712|               ValueCategory = prvalue
+# 2712|         getLeftOperand().getFullyConverted(): [CStyleCast] (bool)...
+# 2712|             Conversion = [BoolConversion] conversion to bool
+# 2712|             Type = [BoolType] bool
+# 2712|             ValueCategory = prvalue
+# 2712|       getThen(): [BlockStmt] { ... }
+# 2713|     getStmt(12): [IfStmt] if (...) ... 
+# 2713|       getCondition(): [LogicalOrExpr] ... || ...
+# 2713|           Type = [BoolType] bool
+# 2713|           ValueCategory = prvalue
+# 2713|         getLeftOperand(): [NotExpr] ! ...
+# 2713|             Type = [BoolType] bool
+# 2713|             ValueCategory = prvalue
+# 2713|           getOperand(): [VariableAccess] x1
+# 2713|               Type = [IntType] int
+# 2713|               ValueCategory = prvalue(load)
+# 2713|           getOperand().getFullyConverted(): [CStyleCast] (bool)...
+# 2713|               Conversion = [BoolConversion] conversion to bool
+# 2713|               Type = [BoolType] bool
+# 2713|               ValueCategory = prvalue
+# 2713|         getRightOperand(): [NotExpr] ! ...
+# 2713|             Type = [BoolType] bool
+# 2713|             ValueCategory = prvalue
+# 2713|           getOperand(): [VariableAccess] x2
+# 2713|               Type = [IntType] int
+# 2713|               ValueCategory = prvalue(load)
+# 2713|           getOperand().getFullyConverted(): [CStyleCast] (bool)...
+# 2713|               Conversion = [BoolConversion] conversion to bool
+# 2713|               Type = [BoolType] bool
+# 2713|               ValueCategory = prvalue
+# 2713|       getThen(): [BlockStmt] { ... }
+# 2715|     getStmt(13): [DeclStmt] declaration
+# 2715|       getDeclarationEntry(0): [VariableDeclarationEntry] definition of x_1_and_2
+# 2715|           Type = [IntType] int
+# 2715|         getVariable().getInitializer(): [Initializer] initializer for x_1_and_2
+# 2715|           getExpr(): [LogicalAndExpr] ... && ...
+# 2715|               Type = [BoolType] bool
+# 2715|               ValueCategory = prvalue
+# 2715|             getLeftOperand(): [VariableAccess] x1
+# 2715|                 Type = [IntType] int
+# 2715|                 ValueCategory = prvalue(load)
+# 2715|             getRightOperand(): [VariableAccess] x2
+# 2715|                 Type = [IntType] int
+# 2715|                 ValueCategory = prvalue(load)
+# 2715|             getLeftOperand().getFullyConverted(): [CStyleCast] (bool)...
+# 2715|                 Conversion = [BoolConversion] conversion to bool
+# 2715|                 Type = [BoolType] bool
+# 2715|                 ValueCategory = prvalue
+# 2715|             getRightOperand().getFullyConverted(): [CStyleCast] (bool)...
+# 2715|                 Conversion = [BoolConversion] conversion to bool
+# 2715|                 Type = [BoolType] bool
+# 2715|                 ValueCategory = prvalue
+# 2715|           getExpr().getFullyConverted(): [CStyleCast] (int)...
+# 2715|               Conversion = [IntegralConversion] integral conversion
+# 2715|               Type = [IntType] int
+# 2715|               ValueCategory = prvalue
+# 2716|     getStmt(14): [IfStmt] if (...) ... 
+# 2716|       getCondition(): [VariableAccess] x_1_and_2
+# 2716|           Type = [IntType] int
+# 2716|           ValueCategory = prvalue(load)
+# 2716|       getThen(): [BlockStmt] { ... }
+# 2716|       getCondition().getFullyConverted(): [CStyleCast] (bool)...
+# 2716|           Conversion = [BoolConversion] conversion to bool
+# 2716|           Type = [BoolType] bool
+# 2716|           ValueCategory = prvalue
+# 2717|     getStmt(15): [IfStmt] if (...) ... 
+# 2717|       getCondition(): [NotExpr] ! ...
+# 2717|           Type = [BoolType] bool
+# 2717|           ValueCategory = prvalue
+# 2717|         getOperand(): [VariableAccess] x_1_and_2
+# 2717|             Type = [IntType] int
+# 2717|             ValueCategory = prvalue(load)
+# 2717|         getOperand().getFullyConverted(): [CStyleCast] (bool)...
+# 2717|             Conversion = [BoolConversion] conversion to bool
+# 2717|             Type = [BoolType] bool
+# 2717|             ValueCategory = prvalue
+# 2717|       getThen(): [BlockStmt] { ... }
+# 2718|     getStmt(16): [ReturnStmt] return ...
 many-defs-per-use.cpp:
 #   34| [TopLevelFunction] void many_defs_per_use()
 #   34|   <params>: 
diff --git a/cpp/ql/test/library-tests/ir/ir/aliased_ir.expected b/cpp/ql/test/library-tests/ir/ir/aliased_ir.expected
index 57c80627867..28fde3672d9 100644
--- a/cpp/ql/test/library-tests/ir/ir/aliased_ir.expected
+++ b/cpp/ql/test/library-tests/ir/ir/aliased_ir.expected
@@ -3296,6 +3296,278 @@ ir.c:
 #   80|     v80_6(void) = AliasedUse   : ~m81_5
 #   80|     v80_7(void) = ExitFunction : 
 
+#   84| void branch_on_integral_in_c(int, int)
+#   84|   Block 0
+#   84|     v84_1(void)       = EnterFunction           : 
+#   84|     m84_2(unknown)    = AliasedDefinition       : 
+#   84|     m84_3(unknown)    = InitializeNonLocal      : 
+#   84|     m84_4(unknown)    = Chi                     : total:m84_2, partial:m84_3
+#   84|     r84_5(glval<int>) = VariableAddress[x1]     : 
+#   84|     m84_6(int)        = InitializeParameter[x1] : &:r84_5
+#   84|     r84_7(glval<int>) = VariableAddress[x2]     : 
+#   84|     m84_8(int)        = InitializeParameter[x2] : &:r84_7
+#   85|     r85_1(glval<int>) = VariableAddress[x1]     : 
+#   85|     r85_2(int)        = Load[x1]                : &:r85_1, m84_6
+#   85|     v85_3(void)       = ConditionalBranch       : r85_2
+#-----|   False -> Block 2
+#-----|   True -> Block 1
+
+#   85|   Block 1
+#   85|     v85_4(void) = NoOp : 
+#-----|   Goto -> Block 2
+
+#   86|   Block 2
+#   86|     r86_1(glval<int>) = VariableAddress[x1] : 
+#   86|     r86_2(int)        = Load[x1]            : &:r86_1, m84_6
+#   86|     r86_3(int)        = LogicalNot          : r86_2
+#   86|     v86_4(void)       = ConditionalBranch   : r86_3
+#-----|   False -> Block 4
+#-----|   True -> Block 3
+
+#   86|   Block 3
+#   86|     v86_5(void) = NoOp : 
+#-----|   Goto -> Block 4
+
+#   88|   Block 4
+#   88|     r88_1(glval<int>) = VariableAddress[y]  : 
+#   88|     r88_2(glval<int>) = VariableAddress[x1] : 
+#   88|     r88_3(int)        = Load[x1]            : &:r88_2, m84_6
+#   88|     r88_4(int)        = LogicalNot          : r88_3
+#   88|     m88_5(int)        = Store[y]            : &:r88_1, r88_4
+#   89|     r89_1(glval<int>) = VariableAddress[y]  : 
+#   89|     r89_2(int)        = Load[y]             : &:r89_1, m88_5
+#   89|     v89_3(void)       = ConditionalBranch   : r89_2
+#-----|   False -> Block 6
+#-----|   True -> Block 5
+
+#   89|   Block 5
+#   89|     v89_4(void) = NoOp : 
+#-----|   Goto -> Block 6
+
+#   90|   Block 6
+#   90|     r90_1(glval<int>) = VariableAddress[y] : 
+#   90|     r90_2(int)        = Load[y]            : &:r90_1, m88_5
+#   90|     r90_3(int)        = LogicalNot         : r90_2
+#   90|     v90_4(void)       = ConditionalBranch  : r90_3
+#-----|   False -> Block 8
+#-----|   True -> Block 7
+
+#   90|   Block 7
+#   90|     v90_5(void) = NoOp : 
+#-----|   Goto -> Block 8
+
+#   92|   Block 8
+#   92|     r92_1(glval<int>) = VariableAddress[x1] : 
+#   92|     r92_2(int)        = Load[x1]            : &:r92_1, m84_6
+#   92|     v92_3(void)       = ConditionalBranch   : r92_2
+#-----|   False -> Block 11
+#-----|   True -> Block 9
+
+#   92|   Block 9
+#   92|     r92_4(glval<int>) = VariableAddress[x2] : 
+#   92|     r92_5(int)        = Load[x2]            : &:r92_4, m84_8
+#   92|     v92_6(void)       = ConditionalBranch   : r92_5
+#-----|   False -> Block 11
+#-----|   True -> Block 10
+
+#   92|   Block 10
+#   92|     v92_7(void) = NoOp : 
+#-----|   Goto -> Block 11
+
+#   93|   Block 11
+#   93|     r93_1(glval<int>) = VariableAddress[x1] : 
+#   93|     r93_2(int)        = Load[x1]            : &:r93_1, m84_6
+#   93|     r93_3(int)        = LogicalNot          : r93_2
+#   93|     v93_4(void)       = ConditionalBranch   : r93_3
+#-----|   False -> Block 14
+#-----|   True -> Block 12
+
+#   93|   Block 12
+#   93|     r93_5(glval<int>) = VariableAddress[x2] : 
+#   93|     r93_6(int)        = Load[x2]            : &:r93_5, m84_8
+#   93|     v93_7(void)       = ConditionalBranch   : r93_6
+#-----|   False -> Block 14
+#-----|   True -> Block 13
+
+#   93|   Block 13
+#   93|     v93_8(void) = NoOp : 
+#-----|   Goto -> Block 14
+
+#   94|   Block 14
+#   94|     r94_1(glval<int>) = VariableAddress[x1] : 
+#   94|     r94_2(int)        = Load[x1]            : &:r94_1, m84_6
+#   94|     v94_3(void)       = ConditionalBranch   : r94_2
+#-----|   False -> Block 17
+#-----|   True -> Block 15
+
+#   94|   Block 15
+#   94|     r94_4(glval<int>) = VariableAddress[x2] : 
+#   94|     r94_5(int)        = Load[x2]            : &:r94_4, m84_8
+#   94|     r94_6(int)        = LogicalNot          : r94_5
+#   94|     v94_7(void)       = ConditionalBranch   : r94_6
+#-----|   False -> Block 17
+#-----|   True -> Block 16
+
+#   94|   Block 16
+#   94|     v94_8(void) = NoOp : 
+#-----|   Goto -> Block 17
+
+#   95|   Block 17
+#   95|     r95_1(glval<int>) = VariableAddress[x1] : 
+#   95|     r95_2(int)        = Load[x1]            : &:r95_1, m84_6
+#   95|     r95_3(int)        = LogicalNot          : r95_2
+#   95|     v95_4(void)       = ConditionalBranch   : r95_3
+#-----|   False -> Block 20
+#-----|   True -> Block 18
+
+#   95|   Block 18
+#   95|     r95_5(glval<int>) = VariableAddress[x2] : 
+#   95|     r95_6(int)        = Load[x2]            : &:r95_5, m84_8
+#   95|     r95_7(int)        = LogicalNot          : r95_6
+#   95|     v95_8(void)       = ConditionalBranch   : r95_7
+#-----|   False -> Block 20
+#-----|   True -> Block 19
+
+#   95|   Block 19
+#   95|     v95_9(void) = NoOp : 
+#-----|   Goto -> Block 20
+
+#   96|   Block 20
+#   96|     r96_1(glval<int>) = VariableAddress[x1] : 
+#   96|     r96_2(int)        = Load[x1]            : &:r96_1, m84_6
+#   96|     v96_3(void)       = ConditionalBranch   : r96_2
+#-----|   False -> Block 21
+#-----|   True -> Block 22
+
+#   96|   Block 21
+#   96|     r96_4(glval<int>) = VariableAddress[x2] : 
+#   96|     r96_5(int)        = Load[x2]            : &:r96_4, m84_8
+#   96|     v96_6(void)       = ConditionalBranch   : r96_5
+#-----|   False -> Block 23
+#-----|   True -> Block 22
+
+#   96|   Block 22
+#   96|     v96_7(void) = NoOp : 
+#-----|   Goto -> Block 23
+
+#   97|   Block 23
+#   97|     r97_1(glval<int>) = VariableAddress[x1] : 
+#   97|     r97_2(int)        = Load[x1]            : &:r97_1, m84_6
+#   97|     r97_3(int)        = LogicalNot          : r97_2
+#   97|     v97_4(void)       = ConditionalBranch   : r97_3
+#-----|   False -> Block 24
+#-----|   True -> Block 25
+
+#   97|   Block 24
+#   97|     r97_5(glval<int>) = VariableAddress[x2] : 
+#   97|     r97_6(int)        = Load[x2]            : &:r97_5, m84_8
+#   97|     v97_7(void)       = ConditionalBranch   : r97_6
+#-----|   False -> Block 26
+#-----|   True -> Block 25
+
+#   97|   Block 25
+#   97|     v97_8(void) = NoOp : 
+#-----|   Goto -> Block 26
+
+#   98|   Block 26
+#   98|     r98_1(glval<int>) = VariableAddress[x1] : 
+#   98|     r98_2(int)        = Load[x1]            : &:r98_1, m84_6
+#   98|     v98_3(void)       = ConditionalBranch   : r98_2
+#-----|   False -> Block 27
+#-----|   True -> Block 28
+
+#   98|   Block 27
+#   98|     r98_4(glval<int>) = VariableAddress[x2] : 
+#   98|     r98_5(int)        = Load[x2]            : &:r98_4, m84_8
+#   98|     r98_6(int)        = LogicalNot          : r98_5
+#   98|     v98_7(void)       = ConditionalBranch   : r98_6
+#-----|   False -> Block 29
+#-----|   True -> Block 28
+
+#   98|   Block 28
+#   98|     v98_8(void) = NoOp : 
+#-----|   Goto -> Block 29
+
+#   99|   Block 29
+#   99|     r99_1(glval<int>) = VariableAddress[x1] : 
+#   99|     r99_2(int)        = Load[x1]            : &:r99_1, m84_6
+#   99|     r99_3(int)        = LogicalNot          : r99_2
+#   99|     v99_4(void)       = ConditionalBranch   : r99_3
+#-----|   False -> Block 30
+#-----|   True -> Block 31
+
+#   99|   Block 30
+#   99|     r99_5(glval<int>) = VariableAddress[x2] : 
+#   99|     r99_6(int)        = Load[x2]            : &:r99_5, m84_8
+#   99|     r99_7(int)        = LogicalNot          : r99_6
+#   99|     v99_8(void)       = ConditionalBranch   : r99_7
+#-----|   False -> Block 32
+#-----|   True -> Block 31
+
+#   99|   Block 31
+#   99|     v99_9(void) = NoOp : 
+#-----|   Goto -> Block 32
+
+#  101|   Block 32
+#  101|     r101_1(glval<int>) = VariableAddress[x_1_and_2] : 
+#  101|     r101_2(glval<int>) = VariableAddress[x1]        : 
+#  101|     r101_3(int)        = Load[x1]                   : &:r101_2, m84_6
+#  101|     v101_4(void)       = ConditionalBranch          : r101_3
+#-----|   False -> Block 33
+#-----|   True -> Block 36
+
+#  101|   Block 33
+#  101|     r101_5(glval<int>) = VariableAddress[#temp101:19] : 
+#  101|     r101_6(int)        = Constant[0]                  : 
+#  101|     m101_7(int)        = Store[#temp101:19]           : &:r101_5, r101_6
+#-----|   Goto -> Block 34
+
+#  101|   Block 34
+#  101|     m101_8(int)        = Phi                          : from 33:m101_7, from 35:m101_14
+#  101|     r101_9(glval<int>) = VariableAddress[#temp101:19] : 
+#  101|     r101_10(int)       = Load[#temp101:19]            : &:r101_9, m101_8
+#  101|     m101_11(int)       = Store[x_1_and_2]             : &:r101_1, r101_10
+#  102|     r102_1(glval<int>) = VariableAddress[x_1_and_2]   : 
+#  102|     r102_2(int)        = Load[x_1_and_2]              : &:r102_1, m101_11
+#  102|     v102_3(void)       = ConditionalBranch            : r102_2
+#-----|   False -> Block 38
+#-----|   True -> Block 37
+
+#  101|   Block 35
+#  101|     r101_12(glval<int>) = VariableAddress[#temp101:19] : 
+#  101|     r101_13(int)        = Constant[1]                  : 
+#  101|     m101_14(int)        = Store[#temp101:19]           : &:r101_12, r101_13
+#-----|   Goto -> Block 34
+
+#  101|   Block 36
+#  101|     r101_15(glval<int>) = VariableAddress[x2] : 
+#  101|     r101_16(int)        = Load[x2]            : &:r101_15, m84_8
+#  101|     v101_17(void)       = ConditionalBranch   : r101_16
+#-----|   False -> Block 33
+#-----|   True -> Block 35
+
+#  102|   Block 37
+#  102|     v102_4(void) = NoOp : 
+#-----|   Goto -> Block 38
+
+#  103|   Block 38
+#  103|     r103_1(glval<int>) = VariableAddress[x_1_and_2] : 
+#  103|     r103_2(int)        = Load[x_1_and_2]            : &:r103_1, m101_11
+#  103|     r103_3(int)        = LogicalNot                 : r103_2
+#  103|     v103_4(void)       = ConditionalBranch          : r103_3
+#-----|   False -> Block 40
+#-----|   True -> Block 39
+
+#  103|   Block 39
+#  103|     v103_5(void) = NoOp : 
+#-----|   Goto -> Block 40
+
+#  104|   Block 40
+#  104|     v104_1(void) = NoOp         : 
+#   84|     v84_9(void)  = ReturnVoid   : 
+#   84|     v84_10(void) = AliasedUse   : m84_3
+#   84|     v84_11(void) = ExitFunction : 
+
 ir.cpp:
 #    1| void Constants()
 #    1|   Block 0
@@ -19099,6 +19371,348 @@ ir.cpp:
 # 2684|   Block 8
 # 2684|     v2684_14(void) = Unreached : 
 
+# 2691| int concepts::requires_use()
+# 2691|   Block 0
+# 2691|     v2691_1(void)       = EnterFunction            : 
+# 2691|     m2691_2(unknown)    = AliasedDefinition        : 
+# 2691|     m2691_3(unknown)    = InitializeNonLocal       : 
+# 2691|     m2691_4(unknown)    = Chi                      : total:m2691_2, partial:m2691_3
+# 2692|     r2692_1(glval<int>) = VariableAddress[y]       : 
+#-----|     r0_1(int)           = Constant[1]              : 
+#-----|     m0_2(int)           = Store[y]                 : &:r2692_1, r0_1
+# 2693|     r2693_1(glval<int>) = VariableAddress[#return] : 
+# 2693|     r2693_2(glval<int>) = VariableAddress[y]       : 
+# 2693|     r2693_3(int)        = Load[y]                  : &:r2693_2, m0_2
+# 2693|     m2693_4(int)        = Store[#return]           : &:r2693_1, r2693_3
+# 2691|     r2691_5(glval<int>) = VariableAddress[#return] : 
+# 2691|     v2691_6(void)       = ReturnValue              : &:r2691_5, m2693_4
+# 2691|     v2691_7(void)       = AliasedUse               : m2691_3
+# 2691|     v2691_8(void)       = ExitFunction             : 
+
+# 2698| void branch_on_integral_in_cpp(int, int)
+# 2698|   Block 0
+# 2698|     v2698_1(void)       = EnterFunction           : 
+# 2698|     m2698_2(unknown)    = AliasedDefinition       : 
+# 2698|     m2698_3(unknown)    = InitializeNonLocal      : 
+# 2698|     m2698_4(unknown)    = Chi                     : total:m2698_2, partial:m2698_3
+# 2698|     r2698_5(glval<int>) = VariableAddress[x1]     : 
+# 2698|     m2698_6(int)        = InitializeParameter[x1] : &:r2698_5
+# 2698|     r2698_7(glval<int>) = VariableAddress[x2]     : 
+# 2698|     m2698_8(int)        = InitializeParameter[x2] : &:r2698_7
+# 2699|     r2699_1(glval<int>) = VariableAddress[x1]     : 
+# 2699|     r2699_2(int)        = Load[x1]                : &:r2699_1, m2698_6
+# 2699|     r2699_3(int)        = Constant[0]             : 
+# 2699|     r2699_4(bool)       = CompareNE               : r2699_2, r2699_3
+# 2699|     v2699_5(void)       = ConditionalBranch       : r2699_4
+#-----|   False -> Block 2
+#-----|   True -> Block 1
+
+# 2699|   Block 1
+# 2699|     v2699_6(void) = NoOp : 
+#-----|   Goto -> Block 2
+
+# 2700|   Block 2
+# 2700|     r2700_1(glval<int>) = VariableAddress[x1] : 
+# 2700|     r2700_2(int)        = Load[x1]            : &:r2700_1, m2698_6
+# 2700|     r2700_3(int)        = Constant[0]         : 
+# 2700|     r2700_4(bool)       = CompareNE           : r2700_2, r2700_3
+# 2700|     r2700_5(bool)       = LogicalNot          : r2700_4
+# 2700|     v2700_6(void)       = ConditionalBranch   : r2700_5
+#-----|   False -> Block 4
+#-----|   True -> Block 3
+
+# 2700|   Block 3
+# 2700|     v2700_7(void) = NoOp : 
+#-----|   Goto -> Block 4
+
+# 2702|   Block 4
+# 2702|     r2702_1(glval<int>) = VariableAddress[y]  : 
+# 2702|     r2702_2(glval<int>) = VariableAddress[x1] : 
+# 2702|     r2702_3(int)        = Load[x1]            : &:r2702_2, m2698_6
+# 2702|     r2702_4(int)        = Constant[0]         : 
+# 2702|     r2702_5(bool)       = CompareNE           : r2702_3, r2702_4
+# 2702|     r2702_6(bool)       = LogicalNot          : r2702_5
+# 2702|     r2702_7(int)        = Convert             : r2702_6
+# 2702|     m2702_8(int)        = Store[y]            : &:r2702_1, r2702_7
+# 2703|     r2703_1(glval<int>) = VariableAddress[y]  : 
+# 2703|     r2703_2(int)        = Load[y]             : &:r2703_1, m2702_8
+# 2703|     r2703_3(int)        = Constant[0]         : 
+# 2703|     r2703_4(bool)       = CompareNE           : r2703_2, r2703_3
+# 2703|     v2703_5(void)       = ConditionalBranch   : r2703_4
+#-----|   False -> Block 6
+#-----|   True -> Block 5
+
+# 2703|   Block 5
+# 2703|     v2703_6(void) = NoOp : 
+#-----|   Goto -> Block 6
+
+# 2704|   Block 6
+# 2704|     r2704_1(glval<int>) = VariableAddress[y] : 
+# 2704|     r2704_2(int)        = Load[y]            : &:r2704_1, m2702_8
+# 2704|     r2704_3(int)        = Constant[0]        : 
+# 2704|     r2704_4(bool)       = CompareNE          : r2704_2, r2704_3
+# 2704|     r2704_5(bool)       = LogicalNot         : r2704_4
+# 2704|     v2704_6(void)       = ConditionalBranch  : r2704_5
+#-----|   False -> Block 8
+#-----|   True -> Block 7
+
+# 2704|   Block 7
+# 2704|     v2704_7(void) = NoOp : 
+#-----|   Goto -> Block 8
+
+# 2706|   Block 8
+# 2706|     r2706_1(glval<int>) = VariableAddress[x1] : 
+# 2706|     r2706_2(int)        = Load[x1]            : &:r2706_1, m2698_6
+# 2706|     r2706_3(int)        = Constant[0]         : 
+# 2706|     r2706_4(bool)       = CompareNE           : r2706_2, r2706_3
+# 2706|     v2706_5(void)       = ConditionalBranch   : r2706_4
+#-----|   False -> Block 11
+#-----|   True -> Block 9
+
+# 2706|   Block 9
+# 2706|     r2706_6(glval<int>) = VariableAddress[x2] : 
+# 2706|     r2706_7(int)        = Load[x2]            : &:r2706_6, m2698_8
+# 2706|     r2706_8(int)        = Constant[0]         : 
+# 2706|     r2706_9(bool)       = CompareNE           : r2706_7, r2706_8
+# 2706|     v2706_10(void)      = ConditionalBranch   : r2706_9
+#-----|   False -> Block 11
+#-----|   True -> Block 10
+
+# 2706|   Block 10
+# 2706|     v2706_11(void) = NoOp : 
+#-----|   Goto -> Block 11
+
+# 2707|   Block 11
+# 2707|     r2707_1(glval<int>) = VariableAddress[x1] : 
+# 2707|     r2707_2(int)        = Load[x1]            : &:r2707_1, m2698_6
+# 2707|     r2707_3(int)        = Constant[0]         : 
+# 2707|     r2707_4(bool)       = CompareNE           : r2707_2, r2707_3
+# 2707|     r2707_5(bool)       = LogicalNot          : r2707_4
+# 2707|     v2707_6(void)       = ConditionalBranch   : r2707_5
+#-----|   False -> Block 14
+#-----|   True -> Block 12
+
+# 2707|   Block 12
+# 2707|     r2707_7(glval<int>) = VariableAddress[x2] : 
+# 2707|     r2707_8(int)        = Load[x2]            : &:r2707_7, m2698_8
+# 2707|     r2707_9(int)        = Constant[0]         : 
+# 2707|     r2707_10(bool)      = CompareNE           : r2707_8, r2707_9
+# 2707|     v2707_11(void)      = ConditionalBranch   : r2707_10
+#-----|   False -> Block 14
+#-----|   True -> Block 13
+
+# 2707|   Block 13
+# 2707|     v2707_12(void) = NoOp : 
+#-----|   Goto -> Block 14
+
+# 2708|   Block 14
+# 2708|     r2708_1(glval<int>) = VariableAddress[x1] : 
+# 2708|     r2708_2(int)        = Load[x1]            : &:r2708_1, m2698_6
+# 2708|     r2708_3(int)        = Constant[0]         : 
+# 2708|     r2708_4(bool)       = CompareNE           : r2708_2, r2708_3
+# 2708|     v2708_5(void)       = ConditionalBranch   : r2708_4
+#-----|   False -> Block 17
+#-----|   True -> Block 15
+
+# 2708|   Block 15
+# 2708|     r2708_6(glval<int>) = VariableAddress[x2] : 
+# 2708|     r2708_7(int)        = Load[x2]            : &:r2708_6, m2698_8
+# 2708|     r2708_8(int)        = Constant[0]         : 
+# 2708|     r2708_9(bool)       = CompareNE           : r2708_7, r2708_8
+# 2708|     r2708_10(bool)      = LogicalNot          : r2708_9
+# 2708|     v2708_11(void)      = ConditionalBranch   : r2708_10
+#-----|   False -> Block 17
+#-----|   True -> Block 16
+
+# 2708|   Block 16
+# 2708|     v2708_12(void) = NoOp : 
+#-----|   Goto -> Block 17
+
+# 2709|   Block 17
+# 2709|     r2709_1(glval<int>) = VariableAddress[x1] : 
+# 2709|     r2709_2(int)        = Load[x1]            : &:r2709_1, m2698_6
+# 2709|     r2709_3(int)        = Constant[0]         : 
+# 2709|     r2709_4(bool)       = CompareNE           : r2709_2, r2709_3
+# 2709|     r2709_5(bool)       = LogicalNot          : r2709_4
+# 2709|     v2709_6(void)       = ConditionalBranch   : r2709_5
+#-----|   False -> Block 20
+#-----|   True -> Block 18
+
+# 2709|   Block 18
+# 2709|     r2709_7(glval<int>) = VariableAddress[x2] : 
+# 2709|     r2709_8(int)        = Load[x2]            : &:r2709_7, m2698_8
+# 2709|     r2709_9(int)        = Constant[0]         : 
+# 2709|     r2709_10(bool)      = CompareNE           : r2709_8, r2709_9
+# 2709|     r2709_11(bool)      = LogicalNot          : r2709_10
+# 2709|     v2709_12(void)      = ConditionalBranch   : r2709_11
+#-----|   False -> Block 20
+#-----|   True -> Block 19
+
+# 2709|   Block 19
+# 2709|     v2709_13(void) = NoOp : 
+#-----|   Goto -> Block 20
+
+# 2710|   Block 20
+# 2710|     r2710_1(glval<int>) = VariableAddress[x1] : 
+# 2710|     r2710_2(int)        = Load[x1]            : &:r2710_1, m2698_6
+# 2710|     r2710_3(int)        = Constant[0]         : 
+# 2710|     r2710_4(bool)       = CompareNE           : r2710_2, r2710_3
+# 2710|     v2710_5(void)       = ConditionalBranch   : r2710_4
+#-----|   False -> Block 21
+#-----|   True -> Block 22
+
+# 2710|   Block 21
+# 2710|     r2710_6(glval<int>) = VariableAddress[x2] : 
+# 2710|     r2710_7(int)        = Load[x2]            : &:r2710_6, m2698_8
+# 2710|     r2710_8(int)        = Constant[0]         : 
+# 2710|     r2710_9(bool)       = CompareNE           : r2710_7, r2710_8
+# 2710|     v2710_10(void)      = ConditionalBranch   : r2710_9
+#-----|   False -> Block 23
+#-----|   True -> Block 22
+
+# 2710|   Block 22
+# 2710|     v2710_11(void) = NoOp : 
+#-----|   Goto -> Block 23
+
+# 2711|   Block 23
+# 2711|     r2711_1(glval<int>) = VariableAddress[x1] : 
+# 2711|     r2711_2(int)        = Load[x1]            : &:r2711_1, m2698_6
+# 2711|     r2711_3(int)        = Constant[0]         : 
+# 2711|     r2711_4(bool)       = CompareNE           : r2711_2, r2711_3
+# 2711|     r2711_5(bool)       = LogicalNot          : r2711_4
+# 2711|     v2711_6(void)       = ConditionalBranch   : r2711_5
+#-----|   False -> Block 24
+#-----|   True -> Block 25
+
+# 2711|   Block 24
+# 2711|     r2711_7(glval<int>) = VariableAddress[x2] : 
+# 2711|     r2711_8(int)        = Load[x2]            : &:r2711_7, m2698_8
+# 2711|     r2711_9(int)        = Constant[0]         : 
+# 2711|     r2711_10(bool)      = CompareNE           : r2711_8, r2711_9
+# 2711|     v2711_11(void)      = ConditionalBranch   : r2711_10
+#-----|   False -> Block 26
+#-----|   True -> Block 25
+
+# 2711|   Block 25
+# 2711|     v2711_12(void) = NoOp : 
+#-----|   Goto -> Block 26
+
+# 2712|   Block 26
+# 2712|     r2712_1(glval<int>) = VariableAddress[x1] : 
+# 2712|     r2712_2(int)        = Load[x1]            : &:r2712_1, m2698_6
+# 2712|     r2712_3(int)        = Constant[0]         : 
+# 2712|     r2712_4(bool)       = CompareNE           : r2712_2, r2712_3
+# 2712|     v2712_5(void)       = ConditionalBranch   : r2712_4
+#-----|   False -> Block 27
+#-----|   True -> Block 28
+
+# 2712|   Block 27
+# 2712|     r2712_6(glval<int>) = VariableAddress[x2] : 
+# 2712|     r2712_7(int)        = Load[x2]            : &:r2712_6, m2698_8
+# 2712|     r2712_8(int)        = Constant[0]         : 
+# 2712|     r2712_9(bool)       = CompareNE           : r2712_7, r2712_8
+# 2712|     r2712_10(bool)      = LogicalNot          : r2712_9
+# 2712|     v2712_11(void)      = ConditionalBranch   : r2712_10
+#-----|   False -> Block 29
+#-----|   True -> Block 28
+
+# 2712|   Block 28
+# 2712|     v2712_12(void) = NoOp : 
+#-----|   Goto -> Block 29
+
+# 2713|   Block 29
+# 2713|     r2713_1(glval<int>) = VariableAddress[x1] : 
+# 2713|     r2713_2(int)        = Load[x1]            : &:r2713_1, m2698_6
+# 2713|     r2713_3(int)        = Constant[0]         : 
+# 2713|     r2713_4(bool)       = CompareNE           : r2713_2, r2713_3
+# 2713|     r2713_5(bool)       = LogicalNot          : r2713_4
+# 2713|     v2713_6(void)       = ConditionalBranch   : r2713_5
+#-----|   False -> Block 30
+#-----|   True -> Block 31
+
+# 2713|   Block 30
+# 2713|     r2713_7(glval<int>) = VariableAddress[x2] : 
+# 2713|     r2713_8(int)        = Load[x2]            : &:r2713_7, m2698_8
+# 2713|     r2713_9(int)        = Constant[0]         : 
+# 2713|     r2713_10(bool)      = CompareNE           : r2713_8, r2713_9
+# 2713|     r2713_11(bool)      = LogicalNot          : r2713_10
+# 2713|     v2713_12(void)      = ConditionalBranch   : r2713_11
+#-----|   False -> Block 32
+#-----|   True -> Block 31
+
+# 2713|   Block 31
+# 2713|     v2713_13(void) = NoOp : 
+#-----|   Goto -> Block 32
+
+# 2715|   Block 32
+# 2715|     r2715_1(glval<int>) = VariableAddress[x_1_and_2] : 
+# 2715|     r2715_2(glval<int>) = VariableAddress[x1]        : 
+# 2715|     r2715_3(int)        = Load[x1]                   : &:r2715_2, m2698_6
+# 2715|     r2715_4(int)        = Constant[0]                : 
+# 2715|     r2715_5(bool)       = CompareNE                  : r2715_3, r2715_4
+# 2715|     v2715_6(void)       = ConditionalBranch          : r2715_5
+#-----|   False -> Block 33
+#-----|   True -> Block 36
+
+# 2715|   Block 33
+# 2715|     r2715_7(glval<bool>) = VariableAddress[#temp2715:19] : 
+# 2715|     r2715_8(bool)        = Constant[0]                   : 
+# 2715|     m2715_9(bool)        = Store[#temp2715:19]           : &:r2715_7, r2715_8
+#-----|   Goto -> Block 34
+
+# 2715|   Block 34
+# 2715|     m2715_10(bool)        = Phi                           : from 33:m2715_9, from 35:m2715_17
+# 2715|     r2715_11(glval<bool>) = VariableAddress[#temp2715:19] : 
+# 2715|     r2715_12(bool)        = Load[#temp2715:19]            : &:r2715_11, m2715_10
+# 2715|     r2715_13(int)         = Convert                       : r2715_12
+# 2715|     m2715_14(int)         = Store[x_1_and_2]              : &:r2715_1, r2715_13
+# 2716|     r2716_1(glval<int>)   = VariableAddress[x_1_and_2]    : 
+# 2716|     r2716_2(int)          = Load[x_1_and_2]               : &:r2716_1, m2715_14
+# 2716|     r2716_3(int)          = Constant[0]                   : 
+# 2716|     r2716_4(bool)         = CompareNE                     : r2716_2, r2716_3
+# 2716|     v2716_5(void)         = ConditionalBranch             : r2716_4
+#-----|   False -> Block 38
+#-----|   True -> Block 37
+
+# 2715|   Block 35
+# 2715|     r2715_15(glval<bool>) = VariableAddress[#temp2715:19] : 
+# 2715|     r2715_16(bool)        = Constant[1]                   : 
+# 2715|     m2715_17(bool)        = Store[#temp2715:19]           : &:r2715_15, r2715_16
+#-----|   Goto -> Block 34
+
+# 2715|   Block 36
+# 2715|     r2715_18(glval<int>) = VariableAddress[x2] : 
+# 2715|     r2715_19(int)        = Load[x2]            : &:r2715_18, m2698_8
+# 2715|     r2715_20(int)        = Constant[0]         : 
+# 2715|     r2715_21(bool)       = CompareNE           : r2715_19, r2715_20
+# 2715|     v2715_22(void)       = ConditionalBranch   : r2715_21
+#-----|   False -> Block 33
+#-----|   True -> Block 35
+
+# 2716|   Block 37
+# 2716|     v2716_6(void) = NoOp : 
+#-----|   Goto -> Block 38
+
+# 2717|   Block 38
+# 2717|     r2717_1(glval<int>) = VariableAddress[x_1_and_2] : 
+# 2717|     r2717_2(int)        = Load[x_1_and_2]            : &:r2717_1, m2715_14
+# 2717|     r2717_3(int)        = Constant[0]                : 
+# 2717|     r2717_4(bool)       = CompareNE                  : r2717_2, r2717_3
+# 2717|     r2717_5(bool)       = LogicalNot                 : r2717_4
+# 2717|     v2717_6(void)       = ConditionalBranch          : r2717_5
+#-----|   False -> Block 40
+#-----|   True -> Block 39
+
+# 2717|   Block 39
+# 2717|     v2717_7(void) = NoOp : 
+#-----|   Goto -> Block 40
+
+# 2718|   Block 40
+# 2718|     v2718_1(void)  = NoOp         : 
+# 2698|     v2698_9(void)  = ReturnVoid   : 
+# 2698|     v2698_10(void) = AliasedUse   : m2698_3
+# 2698|     v2698_11(void) = ExitFunction : 
+
 many-defs-per-use.cpp:
 #   34| void many_defs_per_use()
 #   34|   Block 0
diff --git a/cpp/ql/test/library-tests/ir/ir/aliased_ssa_consistency.expected b/cpp/ql/test/library-tests/ir/ir/aliased_ssa_consistency.expected
index 199d61f015d..7f10f2f9d7c 100644
--- a/cpp/ql/test/library-tests/ir/ir/aliased_ssa_consistency.expected
+++ b/cpp/ql/test/library-tests/ir/ir/aliased_ssa_consistency.expected
@@ -29,4 +29,42 @@ fieldAddressOnNonPointer
 thisArgumentIsNonPointer
 | ir.cpp:2546:34:2546:34 | Call: call to operator bool | Call instruction 'Call: call to operator bool' has a `this` argument operand that is not an address, in function '$@'. | ir.cpp:2545:6:2545:23 | void this_inconsistency(bool) | void this_inconsistency(bool) |
 nonUniqueIRVariable
+nonBooleanOperand
+| ir.c:85:7:85:8 | ConditionalBranch: x1 | Conditional branch instruction ConditionalBranch: x1 with non-Boolean condition, in function '$@'. | ir.c:84:6:84:28 | void branch_on_integral_in_c(int, int) | void branch_on_integral_in_c(int, int) |
+| ir.c:86:6:86:8 | ConditionalBranch: ! ... | Conditional branch instruction ConditionalBranch: ! ... with non-Boolean condition, in function '$@'. | ir.c:84:6:84:28 | void branch_on_integral_in_c(int, int) | void branch_on_integral_in_c(int, int) |
+| ir.c:86:6:86:8 | LogicalNot: ! ... | Logical Not instruction LogicalNot: ! ... with non-Boolean operand, in function '$@'. | ir.c:84:6:84:28 | void branch_on_integral_in_c(int, int) | void branch_on_integral_in_c(int, int) |
+| ir.c:88:11:88:13 | LogicalNot: ! ... | Logical Not instruction LogicalNot: ! ... with non-Boolean operand, in function '$@'. | ir.c:84:6:84:28 | void branch_on_integral_in_c(int, int) | void branch_on_integral_in_c(int, int) |
+| ir.c:89:6:89:6 | ConditionalBranch: y | Conditional branch instruction ConditionalBranch: y with non-Boolean condition, in function '$@'. | ir.c:84:6:84:28 | void branch_on_integral_in_c(int, int) | void branch_on_integral_in_c(int, int) |
+| ir.c:90:6:90:7 | ConditionalBranch: ! ... | Conditional branch instruction ConditionalBranch: ! ... with non-Boolean condition, in function '$@'. | ir.c:84:6:84:28 | void branch_on_integral_in_c(int, int) | void branch_on_integral_in_c(int, int) |
+| ir.c:90:6:90:7 | LogicalNot: ! ... | Logical Not instruction LogicalNot: ! ... with non-Boolean operand, in function '$@'. | ir.c:84:6:84:28 | void branch_on_integral_in_c(int, int) | void branch_on_integral_in_c(int, int) |
+| ir.c:92:6:92:7 | ConditionalBranch: x1 | Conditional branch instruction ConditionalBranch: x1 with non-Boolean condition, in function '$@'. | ir.c:84:6:84:28 | void branch_on_integral_in_c(int, int) | void branch_on_integral_in_c(int, int) |
+| ir.c:92:12:92:13 | ConditionalBranch: x2 | Conditional branch instruction ConditionalBranch: x2 with non-Boolean condition, in function '$@'. | ir.c:84:6:84:28 | void branch_on_integral_in_c(int, int) | void branch_on_integral_in_c(int, int) |
+| ir.c:93:6:93:8 | ConditionalBranch: ! ... | Conditional branch instruction ConditionalBranch: ! ... with non-Boolean condition, in function '$@'. | ir.c:84:6:84:28 | void branch_on_integral_in_c(int, int) | void branch_on_integral_in_c(int, int) |
+| ir.c:93:6:93:8 | LogicalNot: ! ... | Logical Not instruction LogicalNot: ! ... with non-Boolean operand, in function '$@'. | ir.c:84:6:84:28 | void branch_on_integral_in_c(int, int) | void branch_on_integral_in_c(int, int) |
+| ir.c:93:13:93:14 | ConditionalBranch: x2 | Conditional branch instruction ConditionalBranch: x2 with non-Boolean condition, in function '$@'. | ir.c:84:6:84:28 | void branch_on_integral_in_c(int, int) | void branch_on_integral_in_c(int, int) |
+| ir.c:94:6:94:7 | ConditionalBranch: x1 | Conditional branch instruction ConditionalBranch: x1 with non-Boolean condition, in function '$@'. | ir.c:84:6:84:28 | void branch_on_integral_in_c(int, int) | void branch_on_integral_in_c(int, int) |
+| ir.c:94:12:94:14 | ConditionalBranch: ! ... | Conditional branch instruction ConditionalBranch: ! ... with non-Boolean condition, in function '$@'. | ir.c:84:6:84:28 | void branch_on_integral_in_c(int, int) | void branch_on_integral_in_c(int, int) |
+| ir.c:94:12:94:14 | LogicalNot: ! ... | Logical Not instruction LogicalNot: ! ... with non-Boolean operand, in function '$@'. | ir.c:84:6:84:28 | void branch_on_integral_in_c(int, int) | void branch_on_integral_in_c(int, int) |
+| ir.c:95:6:95:8 | ConditionalBranch: ! ... | Conditional branch instruction ConditionalBranch: ! ... with non-Boolean condition, in function '$@'. | ir.c:84:6:84:28 | void branch_on_integral_in_c(int, int) | void branch_on_integral_in_c(int, int) |
+| ir.c:95:6:95:8 | LogicalNot: ! ... | Logical Not instruction LogicalNot: ! ... with non-Boolean operand, in function '$@'. | ir.c:84:6:84:28 | void branch_on_integral_in_c(int, int) | void branch_on_integral_in_c(int, int) |
+| ir.c:95:13:95:15 | ConditionalBranch: ! ... | Conditional branch instruction ConditionalBranch: ! ... with non-Boolean condition, in function '$@'. | ir.c:84:6:84:28 | void branch_on_integral_in_c(int, int) | void branch_on_integral_in_c(int, int) |
+| ir.c:95:13:95:15 | LogicalNot: ! ... | Logical Not instruction LogicalNot: ! ... with non-Boolean operand, in function '$@'. | ir.c:84:6:84:28 | void branch_on_integral_in_c(int, int) | void branch_on_integral_in_c(int, int) |
+| ir.c:96:6:96:7 | ConditionalBranch: x1 | Conditional branch instruction ConditionalBranch: x1 with non-Boolean condition, in function '$@'. | ir.c:84:6:84:28 | void branch_on_integral_in_c(int, int) | void branch_on_integral_in_c(int, int) |
+| ir.c:96:12:96:13 | ConditionalBranch: x2 | Conditional branch instruction ConditionalBranch: x2 with non-Boolean condition, in function '$@'. | ir.c:84:6:84:28 | void branch_on_integral_in_c(int, int) | void branch_on_integral_in_c(int, int) |
+| ir.c:97:6:97:8 | ConditionalBranch: ! ... | Conditional branch instruction ConditionalBranch: ! ... with non-Boolean condition, in function '$@'. | ir.c:84:6:84:28 | void branch_on_integral_in_c(int, int) | void branch_on_integral_in_c(int, int) |
+| ir.c:97:6:97:8 | LogicalNot: ! ... | Logical Not instruction LogicalNot: ! ... with non-Boolean operand, in function '$@'. | ir.c:84:6:84:28 | void branch_on_integral_in_c(int, int) | void branch_on_integral_in_c(int, int) |
+| ir.c:97:13:97:14 | ConditionalBranch: x2 | Conditional branch instruction ConditionalBranch: x2 with non-Boolean condition, in function '$@'. | ir.c:84:6:84:28 | void branch_on_integral_in_c(int, int) | void branch_on_integral_in_c(int, int) |
+| ir.c:98:6:98:7 | ConditionalBranch: x1 | Conditional branch instruction ConditionalBranch: x1 with non-Boolean condition, in function '$@'. | ir.c:84:6:84:28 | void branch_on_integral_in_c(int, int) | void branch_on_integral_in_c(int, int) |
+| ir.c:98:12:98:14 | ConditionalBranch: ! ... | Conditional branch instruction ConditionalBranch: ! ... with non-Boolean condition, in function '$@'. | ir.c:84:6:84:28 | void branch_on_integral_in_c(int, int) | void branch_on_integral_in_c(int, int) |
+| ir.c:98:12:98:14 | LogicalNot: ! ... | Logical Not instruction LogicalNot: ! ... with non-Boolean operand, in function '$@'. | ir.c:84:6:84:28 | void branch_on_integral_in_c(int, int) | void branch_on_integral_in_c(int, int) |
+| ir.c:99:6:99:8 | ConditionalBranch: ! ... | Conditional branch instruction ConditionalBranch: ! ... with non-Boolean condition, in function '$@'. | ir.c:84:6:84:28 | void branch_on_integral_in_c(int, int) | void branch_on_integral_in_c(int, int) |
+| ir.c:99:6:99:8 | LogicalNot: ! ... | Logical Not instruction LogicalNot: ! ... with non-Boolean operand, in function '$@'. | ir.c:84:6:84:28 | void branch_on_integral_in_c(int, int) | void branch_on_integral_in_c(int, int) |
+| ir.c:99:13:99:15 | ConditionalBranch: ! ... | Conditional branch instruction ConditionalBranch: ! ... with non-Boolean condition, in function '$@'. | ir.c:84:6:84:28 | void branch_on_integral_in_c(int, int) | void branch_on_integral_in_c(int, int) |
+| ir.c:99:13:99:15 | LogicalNot: ! ... | Logical Not instruction LogicalNot: ! ... with non-Boolean operand, in function '$@'. | ir.c:84:6:84:28 | void branch_on_integral_in_c(int, int) | void branch_on_integral_in_c(int, int) |
+| ir.c:101:19:101:20 | ConditionalBranch: x1 | Conditional branch instruction ConditionalBranch: x1 with non-Boolean condition, in function '$@'. | ir.c:84:6:84:28 | void branch_on_integral_in_c(int, int) | void branch_on_integral_in_c(int, int) |
+| ir.c:101:25:101:26 | ConditionalBranch: x2 | Conditional branch instruction ConditionalBranch: x2 with non-Boolean condition, in function '$@'. | ir.c:84:6:84:28 | void branch_on_integral_in_c(int, int) | void branch_on_integral_in_c(int, int) |
+| ir.c:102:6:102:14 | ConditionalBranch: x_1_and_2 | Conditional branch instruction ConditionalBranch: x_1_and_2 with non-Boolean condition, in function '$@'. | ir.c:84:6:84:28 | void branch_on_integral_in_c(int, int) | void branch_on_integral_in_c(int, int) |
+| ir.c:103:6:103:15 | ConditionalBranch: ! ... | Conditional branch instruction ConditionalBranch: ! ... with non-Boolean condition, in function '$@'. | ir.c:84:6:84:28 | void branch_on_integral_in_c(int, int) | void branch_on_integral_in_c(int, int) |
+| ir.c:103:6:103:15 | LogicalNot: ! ... | Logical Not instruction LogicalNot: ! ... with non-Boolean operand, in function '$@'. | ir.c:84:6:84:28 | void branch_on_integral_in_c(int, int) | void branch_on_integral_in_c(int, int) |
+| try_except.c:35:13:35:13 | ConditionalBranch: b | Conditional branch instruction ConditionalBranch: b with non-Boolean condition, in function '$@'. | try_except.c:32:6:32:6 | void h(int) | void h(int) |
 missingCppType
diff --git a/cpp/ql/test/library-tests/ir/ir/aliased_ssa_consistency_unsound.expected b/cpp/ql/test/library-tests/ir/ir/aliased_ssa_consistency_unsound.expected
index 199d61f015d..7f10f2f9d7c 100644
--- a/cpp/ql/test/library-tests/ir/ir/aliased_ssa_consistency_unsound.expected
+++ b/cpp/ql/test/library-tests/ir/ir/aliased_ssa_consistency_unsound.expected
@@ -29,4 +29,42 @@ fieldAddressOnNonPointer
 thisArgumentIsNonPointer
 | ir.cpp:2546:34:2546:34 | Call: call to operator bool | Call instruction 'Call: call to operator bool' has a `this` argument operand that is not an address, in function '$@'. | ir.cpp:2545:6:2545:23 | void this_inconsistency(bool) | void this_inconsistency(bool) |
 nonUniqueIRVariable
+nonBooleanOperand
+| ir.c:85:7:85:8 | ConditionalBranch: x1 | Conditional branch instruction ConditionalBranch: x1 with non-Boolean condition, in function '$@'. | ir.c:84:6:84:28 | void branch_on_integral_in_c(int, int) | void branch_on_integral_in_c(int, int) |
+| ir.c:86:6:86:8 | ConditionalBranch: ! ... | Conditional branch instruction ConditionalBranch: ! ... with non-Boolean condition, in function '$@'. | ir.c:84:6:84:28 | void branch_on_integral_in_c(int, int) | void branch_on_integral_in_c(int, int) |
+| ir.c:86:6:86:8 | LogicalNot: ! ... | Logical Not instruction LogicalNot: ! ... with non-Boolean operand, in function '$@'. | ir.c:84:6:84:28 | void branch_on_integral_in_c(int, int) | void branch_on_integral_in_c(int, int) |
+| ir.c:88:11:88:13 | LogicalNot: ! ... | Logical Not instruction LogicalNot: ! ... with non-Boolean operand, in function '$@'. | ir.c:84:6:84:28 | void branch_on_integral_in_c(int, int) | void branch_on_integral_in_c(int, int) |
+| ir.c:89:6:89:6 | ConditionalBranch: y | Conditional branch instruction ConditionalBranch: y with non-Boolean condition, in function '$@'. | ir.c:84:6:84:28 | void branch_on_integral_in_c(int, int) | void branch_on_integral_in_c(int, int) |
+| ir.c:90:6:90:7 | ConditionalBranch: ! ... | Conditional branch instruction ConditionalBranch: ! ... with non-Boolean condition, in function '$@'. | ir.c:84:6:84:28 | void branch_on_integral_in_c(int, int) | void branch_on_integral_in_c(int, int) |
+| ir.c:90:6:90:7 | LogicalNot: ! ... | Logical Not instruction LogicalNot: ! ... with non-Boolean operand, in function '$@'. | ir.c:84:6:84:28 | void branch_on_integral_in_c(int, int) | void branch_on_integral_in_c(int, int) |
+| ir.c:92:6:92:7 | ConditionalBranch: x1 | Conditional branch instruction ConditionalBranch: x1 with non-Boolean condition, in function '$@'. | ir.c:84:6:84:28 | void branch_on_integral_in_c(int, int) | void branch_on_integral_in_c(int, int) |
+| ir.c:92:12:92:13 | ConditionalBranch: x2 | Conditional branch instruction ConditionalBranch: x2 with non-Boolean condition, in function '$@'. | ir.c:84:6:84:28 | void branch_on_integral_in_c(int, int) | void branch_on_integral_in_c(int, int) |
+| ir.c:93:6:93:8 | ConditionalBranch: ! ... | Conditional branch instruction ConditionalBranch: ! ... with non-Boolean condition, in function '$@'. | ir.c:84:6:84:28 | void branch_on_integral_in_c(int, int) | void branch_on_integral_in_c(int, int) |
+| ir.c:93:6:93:8 | LogicalNot: ! ... | Logical Not instruction LogicalNot: ! ... with non-Boolean operand, in function '$@'. | ir.c:84:6:84:28 | void branch_on_integral_in_c(int, int) | void branch_on_integral_in_c(int, int) |
+| ir.c:93:13:93:14 | ConditionalBranch: x2 | Conditional branch instruction ConditionalBranch: x2 with non-Boolean condition, in function '$@'. | ir.c:84:6:84:28 | void branch_on_integral_in_c(int, int) | void branch_on_integral_in_c(int, int) |
+| ir.c:94:6:94:7 | ConditionalBranch: x1 | Conditional branch instruction ConditionalBranch: x1 with non-Boolean condition, in function '$@'. | ir.c:84:6:84:28 | void branch_on_integral_in_c(int, int) | void branch_on_integral_in_c(int, int) |
+| ir.c:94:12:94:14 | ConditionalBranch: ! ... | Conditional branch instruction ConditionalBranch: ! ... with non-Boolean condition, in function '$@'. | ir.c:84:6:84:28 | void branch_on_integral_in_c(int, int) | void branch_on_integral_in_c(int, int) |
+| ir.c:94:12:94:14 | LogicalNot: ! ... | Logical Not instruction LogicalNot: ! ... with non-Boolean operand, in function '$@'. | ir.c:84:6:84:28 | void branch_on_integral_in_c(int, int) | void branch_on_integral_in_c(int, int) |
+| ir.c:95:6:95:8 | ConditionalBranch: ! ... | Conditional branch instruction ConditionalBranch: ! ... with non-Boolean condition, in function '$@'. | ir.c:84:6:84:28 | void branch_on_integral_in_c(int, int) | void branch_on_integral_in_c(int, int) |
+| ir.c:95:6:95:8 | LogicalNot: ! ... | Logical Not instruction LogicalNot: ! ... with non-Boolean operand, in function '$@'. | ir.c:84:6:84:28 | void branch_on_integral_in_c(int, int) | void branch_on_integral_in_c(int, int) |
+| ir.c:95:13:95:15 | ConditionalBranch: ! ... | Conditional branch instruction ConditionalBranch: ! ... with non-Boolean condition, in function '$@'. | ir.c:84:6:84:28 | void branch_on_integral_in_c(int, int) | void branch_on_integral_in_c(int, int) |
+| ir.c:95:13:95:15 | LogicalNot: ! ... | Logical Not instruction LogicalNot: ! ... with non-Boolean operand, in function '$@'. | ir.c:84:6:84:28 | void branch_on_integral_in_c(int, int) | void branch_on_integral_in_c(int, int) |
+| ir.c:96:6:96:7 | ConditionalBranch: x1 | Conditional branch instruction ConditionalBranch: x1 with non-Boolean condition, in function '$@'. | ir.c:84:6:84:28 | void branch_on_integral_in_c(int, int) | void branch_on_integral_in_c(int, int) |
+| ir.c:96:12:96:13 | ConditionalBranch: x2 | Conditional branch instruction ConditionalBranch: x2 with non-Boolean condition, in function '$@'. | ir.c:84:6:84:28 | void branch_on_integral_in_c(int, int) | void branch_on_integral_in_c(int, int) |
+| ir.c:97:6:97:8 | ConditionalBranch: ! ... | Conditional branch instruction ConditionalBranch: ! ... with non-Boolean condition, in function '$@'. | ir.c:84:6:84:28 | void branch_on_integral_in_c(int, int) | void branch_on_integral_in_c(int, int) |
+| ir.c:97:6:97:8 | LogicalNot: ! ... | Logical Not instruction LogicalNot: ! ... with non-Boolean operand, in function '$@'. | ir.c:84:6:84:28 | void branch_on_integral_in_c(int, int) | void branch_on_integral_in_c(int, int) |
+| ir.c:97:13:97:14 | ConditionalBranch: x2 | Conditional branch instruction ConditionalBranch: x2 with non-Boolean condition, in function '$@'. | ir.c:84:6:84:28 | void branch_on_integral_in_c(int, int) | void branch_on_integral_in_c(int, int) |
+| ir.c:98:6:98:7 | ConditionalBranch: x1 | Conditional branch instruction ConditionalBranch: x1 with non-Boolean condition, in function '$@'. | ir.c:84:6:84:28 | void branch_on_integral_in_c(int, int) | void branch_on_integral_in_c(int, int) |
+| ir.c:98:12:98:14 | ConditionalBranch: ! ... | Conditional branch instruction ConditionalBranch: ! ... with non-Boolean condition, in function '$@'. | ir.c:84:6:84:28 | void branch_on_integral_in_c(int, int) | void branch_on_integral_in_c(int, int) |
+| ir.c:98:12:98:14 | LogicalNot: ! ... | Logical Not instruction LogicalNot: ! ... with non-Boolean operand, in function '$@'. | ir.c:84:6:84:28 | void branch_on_integral_in_c(int, int) | void branch_on_integral_in_c(int, int) |
+| ir.c:99:6:99:8 | ConditionalBranch: ! ... | Conditional branch instruction ConditionalBranch: ! ... with non-Boolean condition, in function '$@'. | ir.c:84:6:84:28 | void branch_on_integral_in_c(int, int) | void branch_on_integral_in_c(int, int) |
+| ir.c:99:6:99:8 | LogicalNot: ! ... | Logical Not instruction LogicalNot: ! ... with non-Boolean operand, in function '$@'. | ir.c:84:6:84:28 | void branch_on_integral_in_c(int, int) | void branch_on_integral_in_c(int, int) |
+| ir.c:99:13:99:15 | ConditionalBranch: ! ... | Conditional branch instruction ConditionalBranch: ! ... with non-Boolean condition, in function '$@'. | ir.c:84:6:84:28 | void branch_on_integral_in_c(int, int) | void branch_on_integral_in_c(int, int) |
+| ir.c:99:13:99:15 | LogicalNot: ! ... | Logical Not instruction LogicalNot: ! ... with non-Boolean operand, in function '$@'. | ir.c:84:6:84:28 | void branch_on_integral_in_c(int, int) | void branch_on_integral_in_c(int, int) |
+| ir.c:101:19:101:20 | ConditionalBranch: x1 | Conditional branch instruction ConditionalBranch: x1 with non-Boolean condition, in function '$@'. | ir.c:84:6:84:28 | void branch_on_integral_in_c(int, int) | void branch_on_integral_in_c(int, int) |
+| ir.c:101:25:101:26 | ConditionalBranch: x2 | Conditional branch instruction ConditionalBranch: x2 with non-Boolean condition, in function '$@'. | ir.c:84:6:84:28 | void branch_on_integral_in_c(int, int) | void branch_on_integral_in_c(int, int) |
+| ir.c:102:6:102:14 | ConditionalBranch: x_1_and_2 | Conditional branch instruction ConditionalBranch: x_1_and_2 with non-Boolean condition, in function '$@'. | ir.c:84:6:84:28 | void branch_on_integral_in_c(int, int) | void branch_on_integral_in_c(int, int) |
+| ir.c:103:6:103:15 | ConditionalBranch: ! ... | Conditional branch instruction ConditionalBranch: ! ... with non-Boolean condition, in function '$@'. | ir.c:84:6:84:28 | void branch_on_integral_in_c(int, int) | void branch_on_integral_in_c(int, int) |
+| ir.c:103:6:103:15 | LogicalNot: ! ... | Logical Not instruction LogicalNot: ! ... with non-Boolean operand, in function '$@'. | ir.c:84:6:84:28 | void branch_on_integral_in_c(int, int) | void branch_on_integral_in_c(int, int) |
+| try_except.c:35:13:35:13 | ConditionalBranch: b | Conditional branch instruction ConditionalBranch: b with non-Boolean condition, in function '$@'. | try_except.c:32:6:32:6 | void h(int) | void h(int) |
 missingCppType
diff --git a/cpp/ql/test/library-tests/ir/ir/ir.c b/cpp/ql/test/library-tests/ir/ir/ir.c
index e658b4d754e..6e5b3774304 100644
--- a/cpp/ql/test/library-tests/ir/ir/ir.c
+++ b/cpp/ql/test/library-tests/ir/ir/ir.c
@@ -81,4 +81,26 @@ void raise_access_violation() {
   ExRaiseAccessViolation(1);
 }
 
+void branch_on_integral_in_c(int x1, int x2) {
+  if (x1) {}
+  if(!x1) {}
+
+  int y = !x1;
+  if(y) {}
+  if(!y) {}
+
+  if(x1 && x2) {}
+  if(!x1 && x2) {}
+  if(x1 && !x2) {}
+  if(!x1 && !x2) {}
+  if(x1 || x2) {}
+  if(!x1 || x2) {}
+  if(x1 || !x2) {}
+  if(!x1 || !x2) {}
+
+  int x_1_and_2 = x1 && x2;
+  if(x_1_and_2) {}
+  if(!x_1_and_2) {}
+}
+
 // semmle-extractor-options: --microsoft
diff --git a/cpp/ql/test/library-tests/ir/ir/ir.cpp b/cpp/ql/test/library-tests/ir/ir/ir.cpp
index f8e16368537..bb4698ea7e2 100644
--- a/cpp/ql/test/library-tests/ir/ir/ir.cpp
+++ b/cpp/ql/test/library-tests/ir/ir/ir.cpp
@@ -2686,4 +2686,35 @@ void test(bool b)
   twice_call_use(b ? "" : "");
 }
 
+namespace concepts {
+
+int requires_use() {
+  int y = requires { sizeof(int) > 0; };
+  return y;
+}
+
+}
+
+void branch_on_integral_in_cpp(int x1, int x2) {
+  if (x1) {}
+  if(!x1) {}
+
+  int y = !x1;
+  if(y) {}
+  if(!y) {}
+
+  if(x1 && x2) {}
+  if(!x1 && x2) {}
+  if(x1 && !x2) {}
+  if(!x1 && !x2) {}
+  if(x1 || x2) {}
+  if(!x1 || x2) {}
+  if(x1 || !x2) {}
+  if(!x1 || !x2) {}
+
+  int x_1_and_2 = x1 && x2;
+  if(x_1_and_2) {}
+  if(!x_1_and_2) {}
+}
+
 // semmle-extractor-options: -std=c++20 --clang
diff --git a/cpp/ql/test/library-tests/ir/ir/raw_consistency.expected b/cpp/ql/test/library-tests/ir/ir/raw_consistency.expected
index 26760a15730..7b5d32c6543 100644
--- a/cpp/ql/test/library-tests/ir/ir/raw_consistency.expected
+++ b/cpp/ql/test/library-tests/ir/ir/raw_consistency.expected
@@ -38,4 +38,42 @@ fieldAddressOnNonPointer
 thisArgumentIsNonPointer
 | ir.cpp:2546:34:2546:34 | Call: call to operator bool | Call instruction 'Call: call to operator bool' has a `this` argument operand that is not an address, in function '$@'. | ir.cpp:2545:6:2545:23 | void this_inconsistency(bool) | void this_inconsistency(bool) |
 nonUniqueIRVariable
+nonBooleanOperand
+| ir.c:85:7:85:8 | ConditionalBranch: x1 | Conditional branch instruction ConditionalBranch: x1 with non-Boolean condition, in function '$@'. | ir.c:84:6:84:28 | void branch_on_integral_in_c(int, int) | void branch_on_integral_in_c(int, int) |
+| ir.c:86:6:86:8 | ConditionalBranch: ! ... | Conditional branch instruction ConditionalBranch: ! ... with non-Boolean condition, in function '$@'. | ir.c:84:6:84:28 | void branch_on_integral_in_c(int, int) | void branch_on_integral_in_c(int, int) |
+| ir.c:86:6:86:8 | LogicalNot: ! ... | Logical Not instruction LogicalNot: ! ... with non-Boolean operand, in function '$@'. | ir.c:84:6:84:28 | void branch_on_integral_in_c(int, int) | void branch_on_integral_in_c(int, int) |
+| ir.c:88:11:88:13 | LogicalNot: ! ... | Logical Not instruction LogicalNot: ! ... with non-Boolean operand, in function '$@'. | ir.c:84:6:84:28 | void branch_on_integral_in_c(int, int) | void branch_on_integral_in_c(int, int) |
+| ir.c:89:6:89:6 | ConditionalBranch: y | Conditional branch instruction ConditionalBranch: y with non-Boolean condition, in function '$@'. | ir.c:84:6:84:28 | void branch_on_integral_in_c(int, int) | void branch_on_integral_in_c(int, int) |
+| ir.c:90:6:90:7 | ConditionalBranch: ! ... | Conditional branch instruction ConditionalBranch: ! ... with non-Boolean condition, in function '$@'. | ir.c:84:6:84:28 | void branch_on_integral_in_c(int, int) | void branch_on_integral_in_c(int, int) |
+| ir.c:90:6:90:7 | LogicalNot: ! ... | Logical Not instruction LogicalNot: ! ... with non-Boolean operand, in function '$@'. | ir.c:84:6:84:28 | void branch_on_integral_in_c(int, int) | void branch_on_integral_in_c(int, int) |
+| ir.c:92:6:92:7 | ConditionalBranch: x1 | Conditional branch instruction ConditionalBranch: x1 with non-Boolean condition, in function '$@'. | ir.c:84:6:84:28 | void branch_on_integral_in_c(int, int) | void branch_on_integral_in_c(int, int) |
+| ir.c:92:12:92:13 | ConditionalBranch: x2 | Conditional branch instruction ConditionalBranch: x2 with non-Boolean condition, in function '$@'. | ir.c:84:6:84:28 | void branch_on_integral_in_c(int, int) | void branch_on_integral_in_c(int, int) |
+| ir.c:93:6:93:8 | ConditionalBranch: ! ... | Conditional branch instruction ConditionalBranch: ! ... with non-Boolean condition, in function '$@'. | ir.c:84:6:84:28 | void branch_on_integral_in_c(int, int) | void branch_on_integral_in_c(int, int) |
+| ir.c:93:6:93:8 | LogicalNot: ! ... | Logical Not instruction LogicalNot: ! ... with non-Boolean operand, in function '$@'. | ir.c:84:6:84:28 | void branch_on_integral_in_c(int, int) | void branch_on_integral_in_c(int, int) |
+| ir.c:93:13:93:14 | ConditionalBranch: x2 | Conditional branch instruction ConditionalBranch: x2 with non-Boolean condition, in function '$@'. | ir.c:84:6:84:28 | void branch_on_integral_in_c(int, int) | void branch_on_integral_in_c(int, int) |
+| ir.c:94:6:94:7 | ConditionalBranch: x1 | Conditional branch instruction ConditionalBranch: x1 with non-Boolean condition, in function '$@'. | ir.c:84:6:84:28 | void branch_on_integral_in_c(int, int) | void branch_on_integral_in_c(int, int) |
+| ir.c:94:12:94:14 | ConditionalBranch: ! ... | Conditional branch instruction ConditionalBranch: ! ... with non-Boolean condition, in function '$@'. | ir.c:84:6:84:28 | void branch_on_integral_in_c(int, int) | void branch_on_integral_in_c(int, int) |
+| ir.c:94:12:94:14 | LogicalNot: ! ... | Logical Not instruction LogicalNot: ! ... with non-Boolean operand, in function '$@'. | ir.c:84:6:84:28 | void branch_on_integral_in_c(int, int) | void branch_on_integral_in_c(int, int) |
+| ir.c:95:6:95:8 | ConditionalBranch: ! ... | Conditional branch instruction ConditionalBranch: ! ... with non-Boolean condition, in function '$@'. | ir.c:84:6:84:28 | void branch_on_integral_in_c(int, int) | void branch_on_integral_in_c(int, int) |
+| ir.c:95:6:95:8 | LogicalNot: ! ... | Logical Not instruction LogicalNot: ! ... with non-Boolean operand, in function '$@'. | ir.c:84:6:84:28 | void branch_on_integral_in_c(int, int) | void branch_on_integral_in_c(int, int) |
+| ir.c:95:13:95:15 | ConditionalBranch: ! ... | Conditional branch instruction ConditionalBranch: ! ... with non-Boolean condition, in function '$@'. | ir.c:84:6:84:28 | void branch_on_integral_in_c(int, int) | void branch_on_integral_in_c(int, int) |
+| ir.c:95:13:95:15 | LogicalNot: ! ... | Logical Not instruction LogicalNot: ! ... with non-Boolean operand, in function '$@'. | ir.c:84:6:84:28 | void branch_on_integral_in_c(int, int) | void branch_on_integral_in_c(int, int) |
+| ir.c:96:6:96:7 | ConditionalBranch: x1 | Conditional branch instruction ConditionalBranch: x1 with non-Boolean condition, in function '$@'. | ir.c:84:6:84:28 | void branch_on_integral_in_c(int, int) | void branch_on_integral_in_c(int, int) |
+| ir.c:96:12:96:13 | ConditionalBranch: x2 | Conditional branch instruction ConditionalBranch: x2 with non-Boolean condition, in function '$@'. | ir.c:84:6:84:28 | void branch_on_integral_in_c(int, int) | void branch_on_integral_in_c(int, int) |
+| ir.c:97:6:97:8 | ConditionalBranch: ! ... | Conditional branch instruction ConditionalBranch: ! ... with non-Boolean condition, in function '$@'. | ir.c:84:6:84:28 | void branch_on_integral_in_c(int, int) | void branch_on_integral_in_c(int, int) |
+| ir.c:97:6:97:8 | LogicalNot: ! ... | Logical Not instruction LogicalNot: ! ... with non-Boolean operand, in function '$@'. | ir.c:84:6:84:28 | void branch_on_integral_in_c(int, int) | void branch_on_integral_in_c(int, int) |
+| ir.c:97:13:97:14 | ConditionalBranch: x2 | Conditional branch instruction ConditionalBranch: x2 with non-Boolean condition, in function '$@'. | ir.c:84:6:84:28 | void branch_on_integral_in_c(int, int) | void branch_on_integral_in_c(int, int) |
+| ir.c:98:6:98:7 | ConditionalBranch: x1 | Conditional branch instruction ConditionalBranch: x1 with non-Boolean condition, in function '$@'. | ir.c:84:6:84:28 | void branch_on_integral_in_c(int, int) | void branch_on_integral_in_c(int, int) |
+| ir.c:98:12:98:14 | ConditionalBranch: ! ... | Conditional branch instruction ConditionalBranch: ! ... with non-Boolean condition, in function '$@'. | ir.c:84:6:84:28 | void branch_on_integral_in_c(int, int) | void branch_on_integral_in_c(int, int) |
+| ir.c:98:12:98:14 | LogicalNot: ! ... | Logical Not instruction LogicalNot: ! ... with non-Boolean operand, in function '$@'. | ir.c:84:6:84:28 | void branch_on_integral_in_c(int, int) | void branch_on_integral_in_c(int, int) |
+| ir.c:99:6:99:8 | ConditionalBranch: ! ... | Conditional branch instruction ConditionalBranch: ! ... with non-Boolean condition, in function '$@'. | ir.c:84:6:84:28 | void branch_on_integral_in_c(int, int) | void branch_on_integral_in_c(int, int) |
+| ir.c:99:6:99:8 | LogicalNot: ! ... | Logical Not instruction LogicalNot: ! ... with non-Boolean operand, in function '$@'. | ir.c:84:6:84:28 | void branch_on_integral_in_c(int, int) | void branch_on_integral_in_c(int, int) |
+| ir.c:99:13:99:15 | ConditionalBranch: ! ... | Conditional branch instruction ConditionalBranch: ! ... with non-Boolean condition, in function '$@'. | ir.c:84:6:84:28 | void branch_on_integral_in_c(int, int) | void branch_on_integral_in_c(int, int) |
+| ir.c:99:13:99:15 | LogicalNot: ! ... | Logical Not instruction LogicalNot: ! ... with non-Boolean operand, in function '$@'. | ir.c:84:6:84:28 | void branch_on_integral_in_c(int, int) | void branch_on_integral_in_c(int, int) |
+| ir.c:101:19:101:20 | ConditionalBranch: x1 | Conditional branch instruction ConditionalBranch: x1 with non-Boolean condition, in function '$@'. | ir.c:84:6:84:28 | void branch_on_integral_in_c(int, int) | void branch_on_integral_in_c(int, int) |
+| ir.c:101:25:101:26 | ConditionalBranch: x2 | Conditional branch instruction ConditionalBranch: x2 with non-Boolean condition, in function '$@'. | ir.c:84:6:84:28 | void branch_on_integral_in_c(int, int) | void branch_on_integral_in_c(int, int) |
+| ir.c:102:6:102:14 | ConditionalBranch: x_1_and_2 | Conditional branch instruction ConditionalBranch: x_1_and_2 with non-Boolean condition, in function '$@'. | ir.c:84:6:84:28 | void branch_on_integral_in_c(int, int) | void branch_on_integral_in_c(int, int) |
+| ir.c:103:6:103:15 | ConditionalBranch: ! ... | Conditional branch instruction ConditionalBranch: ! ... with non-Boolean condition, in function '$@'. | ir.c:84:6:84:28 | void branch_on_integral_in_c(int, int) | void branch_on_integral_in_c(int, int) |
+| ir.c:103:6:103:15 | LogicalNot: ! ... | Logical Not instruction LogicalNot: ! ... with non-Boolean operand, in function '$@'. | ir.c:84:6:84:28 | void branch_on_integral_in_c(int, int) | void branch_on_integral_in_c(int, int) |
+| try_except.c:35:13:35:13 | ConditionalBranch: b | Conditional branch instruction ConditionalBranch: b with non-Boolean condition, in function '$@'. | try_except.c:32:6:32:6 | void h(int) | void h(int) |
 missingCppType
diff --git a/cpp/ql/test/library-tests/ir/ir/raw_ir.expected b/cpp/ql/test/library-tests/ir/ir/raw_ir.expected
index a2d605daef1..0093a108577 100644
--- a/cpp/ql/test/library-tests/ir/ir/raw_ir.expected
+++ b/cpp/ql/test/library-tests/ir/ir/raw_ir.expected
@@ -3095,6 +3095,276 @@ ir.c:
 #   80|     v80_7(void) = ReturnVoid : 
 #-----|   Goto -> Block 1
 
+#   84| void branch_on_integral_in_c(int, int)
+#   84|   Block 0
+#   84|     v84_1(void)       = EnterFunction           : 
+#   84|     mu84_2(unknown)   = AliasedDefinition       : 
+#   84|     mu84_3(unknown)   = InitializeNonLocal      : 
+#   84|     r84_4(glval<int>) = VariableAddress[x1]     : 
+#   84|     mu84_5(int)       = InitializeParameter[x1] : &:r84_4
+#   84|     r84_6(glval<int>) = VariableAddress[x2]     : 
+#   84|     mu84_7(int)       = InitializeParameter[x2] : &:r84_6
+#   85|     r85_1(glval<int>) = VariableAddress[x1]     : 
+#   85|     r85_2(int)        = Load[x1]                : &:r85_1, ~m?
+#   85|     v85_3(void)       = ConditionalBranch       : r85_2
+#-----|   False -> Block 2
+#-----|   True -> Block 1
+
+#   85|   Block 1
+#   85|     v85_4(void) = NoOp : 
+#-----|   Goto -> Block 2
+
+#   86|   Block 2
+#   86|     r86_1(glval<int>) = VariableAddress[x1] : 
+#   86|     r86_2(int)        = Load[x1]            : &:r86_1, ~m?
+#   86|     r86_3(int)        = LogicalNot          : r86_2
+#   86|     v86_4(void)       = ConditionalBranch   : r86_3
+#-----|   False -> Block 4
+#-----|   True -> Block 3
+
+#   86|   Block 3
+#   86|     v86_5(void) = NoOp : 
+#-----|   Goto -> Block 4
+
+#   88|   Block 4
+#   88|     r88_1(glval<int>) = VariableAddress[y]  : 
+#   88|     r88_2(glval<int>) = VariableAddress[x1] : 
+#   88|     r88_3(int)        = Load[x1]            : &:r88_2, ~m?
+#   88|     r88_4(int)        = LogicalNot          : r88_3
+#   88|     mu88_5(int)       = Store[y]            : &:r88_1, r88_4
+#   89|     r89_1(glval<int>) = VariableAddress[y]  : 
+#   89|     r89_2(int)        = Load[y]             : &:r89_1, ~m?
+#   89|     v89_3(void)       = ConditionalBranch   : r89_2
+#-----|   False -> Block 6
+#-----|   True -> Block 5
+
+#   89|   Block 5
+#   89|     v89_4(void) = NoOp : 
+#-----|   Goto -> Block 6
+
+#   90|   Block 6
+#   90|     r90_1(glval<int>) = VariableAddress[y] : 
+#   90|     r90_2(int)        = Load[y]            : &:r90_1, ~m?
+#   90|     r90_3(int)        = LogicalNot         : r90_2
+#   90|     v90_4(void)       = ConditionalBranch  : r90_3
+#-----|   False -> Block 8
+#-----|   True -> Block 7
+
+#   90|   Block 7
+#   90|     v90_5(void) = NoOp : 
+#-----|   Goto -> Block 8
+
+#   92|   Block 8
+#   92|     r92_1(glval<int>) = VariableAddress[x1] : 
+#   92|     r92_2(int)        = Load[x1]            : &:r92_1, ~m?
+#   92|     v92_3(void)       = ConditionalBranch   : r92_2
+#-----|   False -> Block 11
+#-----|   True -> Block 9
+
+#   92|   Block 9
+#   92|     r92_4(glval<int>) = VariableAddress[x2] : 
+#   92|     r92_5(int)        = Load[x2]            : &:r92_4, ~m?
+#   92|     v92_6(void)       = ConditionalBranch   : r92_5
+#-----|   False -> Block 11
+#-----|   True -> Block 10
+
+#   92|   Block 10
+#   92|     v92_7(void) = NoOp : 
+#-----|   Goto -> Block 11
+
+#   93|   Block 11
+#   93|     r93_1(glval<int>) = VariableAddress[x1] : 
+#   93|     r93_2(int)        = Load[x1]            : &:r93_1, ~m?
+#   93|     r93_3(int)        = LogicalNot          : r93_2
+#   93|     v93_4(void)       = ConditionalBranch   : r93_3
+#-----|   False -> Block 14
+#-----|   True -> Block 12
+
+#   93|   Block 12
+#   93|     r93_5(glval<int>) = VariableAddress[x2] : 
+#   93|     r93_6(int)        = Load[x2]            : &:r93_5, ~m?
+#   93|     v93_7(void)       = ConditionalBranch   : r93_6
+#-----|   False -> Block 14
+#-----|   True -> Block 13
+
+#   93|   Block 13
+#   93|     v93_8(void) = NoOp : 
+#-----|   Goto -> Block 14
+
+#   94|   Block 14
+#   94|     r94_1(glval<int>) = VariableAddress[x1] : 
+#   94|     r94_2(int)        = Load[x1]            : &:r94_1, ~m?
+#   94|     v94_3(void)       = ConditionalBranch   : r94_2
+#-----|   False -> Block 17
+#-----|   True -> Block 15
+
+#   94|   Block 15
+#   94|     r94_4(glval<int>) = VariableAddress[x2] : 
+#   94|     r94_5(int)        = Load[x2]            : &:r94_4, ~m?
+#   94|     r94_6(int)        = LogicalNot          : r94_5
+#   94|     v94_7(void)       = ConditionalBranch   : r94_6
+#-----|   False -> Block 17
+#-----|   True -> Block 16
+
+#   94|   Block 16
+#   94|     v94_8(void) = NoOp : 
+#-----|   Goto -> Block 17
+
+#   95|   Block 17
+#   95|     r95_1(glval<int>) = VariableAddress[x1] : 
+#   95|     r95_2(int)        = Load[x1]            : &:r95_1, ~m?
+#   95|     r95_3(int)        = LogicalNot          : r95_2
+#   95|     v95_4(void)       = ConditionalBranch   : r95_3
+#-----|   False -> Block 20
+#-----|   True -> Block 18
+
+#   95|   Block 18
+#   95|     r95_5(glval<int>) = VariableAddress[x2] : 
+#   95|     r95_6(int)        = Load[x2]            : &:r95_5, ~m?
+#   95|     r95_7(int)        = LogicalNot          : r95_6
+#   95|     v95_8(void)       = ConditionalBranch   : r95_7
+#-----|   False -> Block 20
+#-----|   True -> Block 19
+
+#   95|   Block 19
+#   95|     v95_9(void) = NoOp : 
+#-----|   Goto -> Block 20
+
+#   96|   Block 20
+#   96|     r96_1(glval<int>) = VariableAddress[x1] : 
+#   96|     r96_2(int)        = Load[x1]            : &:r96_1, ~m?
+#   96|     v96_3(void)       = ConditionalBranch   : r96_2
+#-----|   False -> Block 21
+#-----|   True -> Block 22
+
+#   96|   Block 21
+#   96|     r96_4(glval<int>) = VariableAddress[x2] : 
+#   96|     r96_5(int)        = Load[x2]            : &:r96_4, ~m?
+#   96|     v96_6(void)       = ConditionalBranch   : r96_5
+#-----|   False -> Block 23
+#-----|   True -> Block 22
+
+#   96|   Block 22
+#   96|     v96_7(void) = NoOp : 
+#-----|   Goto -> Block 23
+
+#   97|   Block 23
+#   97|     r97_1(glval<int>) = VariableAddress[x1] : 
+#   97|     r97_2(int)        = Load[x1]            : &:r97_1, ~m?
+#   97|     r97_3(int)        = LogicalNot          : r97_2
+#   97|     v97_4(void)       = ConditionalBranch   : r97_3
+#-----|   False -> Block 24
+#-----|   True -> Block 25
+
+#   97|   Block 24
+#   97|     r97_5(glval<int>) = VariableAddress[x2] : 
+#   97|     r97_6(int)        = Load[x2]            : &:r97_5, ~m?
+#   97|     v97_7(void)       = ConditionalBranch   : r97_6
+#-----|   False -> Block 26
+#-----|   True -> Block 25
+
+#   97|   Block 25
+#   97|     v97_8(void) = NoOp : 
+#-----|   Goto -> Block 26
+
+#   98|   Block 26
+#   98|     r98_1(glval<int>) = VariableAddress[x1] : 
+#   98|     r98_2(int)        = Load[x1]            : &:r98_1, ~m?
+#   98|     v98_3(void)       = ConditionalBranch   : r98_2
+#-----|   False -> Block 27
+#-----|   True -> Block 28
+
+#   98|   Block 27
+#   98|     r98_4(glval<int>) = VariableAddress[x2] : 
+#   98|     r98_5(int)        = Load[x2]            : &:r98_4, ~m?
+#   98|     r98_6(int)        = LogicalNot          : r98_5
+#   98|     v98_7(void)       = ConditionalBranch   : r98_6
+#-----|   False -> Block 29
+#-----|   True -> Block 28
+
+#   98|   Block 28
+#   98|     v98_8(void) = NoOp : 
+#-----|   Goto -> Block 29
+
+#   99|   Block 29
+#   99|     r99_1(glval<int>) = VariableAddress[x1] : 
+#   99|     r99_2(int)        = Load[x1]            : &:r99_1, ~m?
+#   99|     r99_3(int)        = LogicalNot          : r99_2
+#   99|     v99_4(void)       = ConditionalBranch   : r99_3
+#-----|   False -> Block 30
+#-----|   True -> Block 31
+
+#   99|   Block 30
+#   99|     r99_5(glval<int>) = VariableAddress[x2] : 
+#   99|     r99_6(int)        = Load[x2]            : &:r99_5, ~m?
+#   99|     r99_7(int)        = LogicalNot          : r99_6
+#   99|     v99_8(void)       = ConditionalBranch   : r99_7
+#-----|   False -> Block 32
+#-----|   True -> Block 31
+
+#   99|   Block 31
+#   99|     v99_9(void) = NoOp : 
+#-----|   Goto -> Block 32
+
+#  101|   Block 32
+#  101|     r101_1(glval<int>) = VariableAddress[x_1_and_2] : 
+#  101|     r101_2(glval<int>) = VariableAddress[x1]        : 
+#  101|     r101_3(int)        = Load[x1]                   : &:r101_2, ~m?
+#  101|     v101_4(void)       = ConditionalBranch          : r101_3
+#-----|   False -> Block 33
+#-----|   True -> Block 36
+
+#  101|   Block 33
+#  101|     r101_5(glval<int>) = VariableAddress[#temp101:19] : 
+#  101|     r101_6(int)        = Constant[0]                  : 
+#  101|     mu101_7(int)       = Store[#temp101:19]           : &:r101_5, r101_6
+#-----|   Goto -> Block 34
+
+#  101|   Block 34
+#  101|     r101_8(glval<int>) = VariableAddress[#temp101:19] : 
+#  101|     r101_9(int)        = Load[#temp101:19]            : &:r101_8, ~m?
+#  101|     mu101_10(int)      = Store[x_1_and_2]             : &:r101_1, r101_9
+#  102|     r102_1(glval<int>) = VariableAddress[x_1_and_2]   : 
+#  102|     r102_2(int)        = Load[x_1_and_2]              : &:r102_1, ~m?
+#  102|     v102_3(void)       = ConditionalBranch            : r102_2
+#-----|   False -> Block 38
+#-----|   True -> Block 37
+
+#  101|   Block 35
+#  101|     r101_11(glval<int>) = VariableAddress[#temp101:19] : 
+#  101|     r101_12(int)        = Constant[1]                  : 
+#  101|     mu101_13(int)       = Store[#temp101:19]           : &:r101_11, r101_12
+#-----|   Goto -> Block 34
+
+#  101|   Block 36
+#  101|     r101_14(glval<int>) = VariableAddress[x2] : 
+#  101|     r101_15(int)        = Load[x2]            : &:r101_14, ~m?
+#  101|     v101_16(void)       = ConditionalBranch   : r101_15
+#-----|   False -> Block 33
+#-----|   True -> Block 35
+
+#  102|   Block 37
+#  102|     v102_4(void) = NoOp : 
+#-----|   Goto -> Block 38
+
+#  103|   Block 38
+#  103|     r103_1(glval<int>) = VariableAddress[x_1_and_2] : 
+#  103|     r103_2(int)        = Load[x_1_and_2]            : &:r103_1, ~m?
+#  103|     r103_3(int)        = LogicalNot                 : r103_2
+#  103|     v103_4(void)       = ConditionalBranch          : r103_3
+#-----|   False -> Block 40
+#-----|   True -> Block 39
+
+#  103|   Block 39
+#  103|     v103_5(void) = NoOp : 
+#-----|   Goto -> Block 40
+
+#  104|   Block 40
+#  104|     v104_1(void) = NoOp         : 
+#   84|     v84_8(void)  = ReturnVoid   : 
+#   84|     v84_9(void)  = AliasedUse   : ~m?
+#   84|     v84_10(void) = ExitFunction : 
+
 ir.cpp:
 #    1| void Constants()
 #    1|   Block 0
@@ -17422,6 +17692,345 @@ ir.cpp:
 # 2684|     v2684_7(void) = AliasedUse   : ~m?
 # 2684|     v2684_8(void) = ExitFunction : 
 
+# 2691| int concepts::requires_use()
+# 2691|   Block 0
+# 2691|     v2691_1(void)       = EnterFunction            : 
+# 2691|     mu2691_2(unknown)   = AliasedDefinition        : 
+# 2691|     mu2691_3(unknown)   = InitializeNonLocal       : 
+# 2692|     r2692_1(glval<int>) = VariableAddress[y]       : 
+#-----|     r0_1(int)           = Constant[1]              : 
+#-----|     mu0_2(int)          = Store[y]                 : &:r2692_1, r0_1
+# 2693|     r2693_1(glval<int>) = VariableAddress[#return] : 
+# 2693|     r2693_2(glval<int>) = VariableAddress[y]       : 
+# 2693|     r2693_3(int)        = Load[y]                  : &:r2693_2, ~m?
+# 2693|     mu2693_4(int)       = Store[#return]           : &:r2693_1, r2693_3
+# 2691|     r2691_4(glval<int>) = VariableAddress[#return] : 
+# 2691|     v2691_5(void)       = ReturnValue              : &:r2691_4, ~m?
+# 2691|     v2691_6(void)       = AliasedUse               : ~m?
+# 2691|     v2691_7(void)       = ExitFunction             : 
+
+# 2698| void branch_on_integral_in_cpp(int, int)
+# 2698|   Block 0
+# 2698|     v2698_1(void)       = EnterFunction           : 
+# 2698|     mu2698_2(unknown)   = AliasedDefinition       : 
+# 2698|     mu2698_3(unknown)   = InitializeNonLocal      : 
+# 2698|     r2698_4(glval<int>) = VariableAddress[x1]     : 
+# 2698|     mu2698_5(int)       = InitializeParameter[x1] : &:r2698_4
+# 2698|     r2698_6(glval<int>) = VariableAddress[x2]     : 
+# 2698|     mu2698_7(int)       = InitializeParameter[x2] : &:r2698_6
+# 2699|     r2699_1(glval<int>) = VariableAddress[x1]     : 
+# 2699|     r2699_2(int)        = Load[x1]                : &:r2699_1, ~m?
+# 2699|     r2699_3(int)        = Constant[0]             : 
+# 2699|     r2699_4(bool)       = CompareNE               : r2699_2, r2699_3
+# 2699|     v2699_5(void)       = ConditionalBranch       : r2699_4
+#-----|   False -> Block 2
+#-----|   True -> Block 1
+
+# 2699|   Block 1
+# 2699|     v2699_6(void) = NoOp : 
+#-----|   Goto -> Block 2
+
+# 2700|   Block 2
+# 2700|     r2700_1(glval<int>) = VariableAddress[x1] : 
+# 2700|     r2700_2(int)        = Load[x1]            : &:r2700_1, ~m?
+# 2700|     r2700_3(int)        = Constant[0]         : 
+# 2700|     r2700_4(bool)       = CompareNE           : r2700_2, r2700_3
+# 2700|     r2700_5(bool)       = LogicalNot          : r2700_4
+# 2700|     v2700_6(void)       = ConditionalBranch   : r2700_5
+#-----|   False -> Block 4
+#-----|   True -> Block 3
+
+# 2700|   Block 3
+# 2700|     v2700_7(void) = NoOp : 
+#-----|   Goto -> Block 4
+
+# 2702|   Block 4
+# 2702|     r2702_1(glval<int>) = VariableAddress[y]  : 
+# 2702|     r2702_2(glval<int>) = VariableAddress[x1] : 
+# 2702|     r2702_3(int)        = Load[x1]            : &:r2702_2, ~m?
+# 2702|     r2702_4(int)        = Constant[0]         : 
+# 2702|     r2702_5(bool)       = CompareNE           : r2702_3, r2702_4
+# 2702|     r2702_6(bool)       = LogicalNot          : r2702_5
+# 2702|     r2702_7(int)        = Convert             : r2702_6
+# 2702|     mu2702_8(int)       = Store[y]            : &:r2702_1, r2702_7
+# 2703|     r2703_1(glval<int>) = VariableAddress[y]  : 
+# 2703|     r2703_2(int)        = Load[y]             : &:r2703_1, ~m?
+# 2703|     r2703_3(int)        = Constant[0]         : 
+# 2703|     r2703_4(bool)       = CompareNE           : r2703_2, r2703_3
+# 2703|     v2703_5(void)       = ConditionalBranch   : r2703_4
+#-----|   False -> Block 6
+#-----|   True -> Block 5
+
+# 2703|   Block 5
+# 2703|     v2703_6(void) = NoOp : 
+#-----|   Goto -> Block 6
+
+# 2704|   Block 6
+# 2704|     r2704_1(glval<int>) = VariableAddress[y] : 
+# 2704|     r2704_2(int)        = Load[y]            : &:r2704_1, ~m?
+# 2704|     r2704_3(int)        = Constant[0]        : 
+# 2704|     r2704_4(bool)       = CompareNE          : r2704_2, r2704_3
+# 2704|     r2704_5(bool)       = LogicalNot         : r2704_4
+# 2704|     v2704_6(void)       = ConditionalBranch  : r2704_5
+#-----|   False -> Block 8
+#-----|   True -> Block 7
+
+# 2704|   Block 7
+# 2704|     v2704_7(void) = NoOp : 
+#-----|   Goto -> Block 8
+
+# 2706|   Block 8
+# 2706|     r2706_1(glval<int>) = VariableAddress[x1] : 
+# 2706|     r2706_2(int)        = Load[x1]            : &:r2706_1, ~m?
+# 2706|     r2706_3(int)        = Constant[0]         : 
+# 2706|     r2706_4(bool)       = CompareNE           : r2706_2, r2706_3
+# 2706|     v2706_5(void)       = ConditionalBranch   : r2706_4
+#-----|   False -> Block 11
+#-----|   True -> Block 9
+
+# 2706|   Block 9
+# 2706|     r2706_6(glval<int>) = VariableAddress[x2] : 
+# 2706|     r2706_7(int)        = Load[x2]            : &:r2706_6, ~m?
+# 2706|     r2706_8(int)        = Constant[0]         : 
+# 2706|     r2706_9(bool)       = CompareNE           : r2706_7, r2706_8
+# 2706|     v2706_10(void)      = ConditionalBranch   : r2706_9
+#-----|   False -> Block 11
+#-----|   True -> Block 10
+
+# 2706|   Block 10
+# 2706|     v2706_11(void) = NoOp : 
+#-----|   Goto -> Block 11
+
+# 2707|   Block 11
+# 2707|     r2707_1(glval<int>) = VariableAddress[x1] : 
+# 2707|     r2707_2(int)        = Load[x1]            : &:r2707_1, ~m?
+# 2707|     r2707_3(int)        = Constant[0]         : 
+# 2707|     r2707_4(bool)       = CompareNE           : r2707_2, r2707_3
+# 2707|     r2707_5(bool)       = LogicalNot          : r2707_4
+# 2707|     v2707_6(void)       = ConditionalBranch   : r2707_5
+#-----|   False -> Block 14
+#-----|   True -> Block 12
+
+# 2707|   Block 12
+# 2707|     r2707_7(glval<int>) = VariableAddress[x2] : 
+# 2707|     r2707_8(int)        = Load[x2]            : &:r2707_7, ~m?
+# 2707|     r2707_9(int)        = Constant[0]         : 
+# 2707|     r2707_10(bool)      = CompareNE           : r2707_8, r2707_9
+# 2707|     v2707_11(void)      = ConditionalBranch   : r2707_10
+#-----|   False -> Block 14
+#-----|   True -> Block 13
+
+# 2707|   Block 13
+# 2707|     v2707_12(void) = NoOp : 
+#-----|   Goto -> Block 14
+
+# 2708|   Block 14
+# 2708|     r2708_1(glval<int>) = VariableAddress[x1] : 
+# 2708|     r2708_2(int)        = Load[x1]            : &:r2708_1, ~m?
+# 2708|     r2708_3(int)        = Constant[0]         : 
+# 2708|     r2708_4(bool)       = CompareNE           : r2708_2, r2708_3
+# 2708|     v2708_5(void)       = ConditionalBranch   : r2708_4
+#-----|   False -> Block 17
+#-----|   True -> Block 15
+
+# 2708|   Block 15
+# 2708|     r2708_6(glval<int>) = VariableAddress[x2] : 
+# 2708|     r2708_7(int)        = Load[x2]            : &:r2708_6, ~m?
+# 2708|     r2708_8(int)        = Constant[0]         : 
+# 2708|     r2708_9(bool)       = CompareNE           : r2708_7, r2708_8
+# 2708|     r2708_10(bool)      = LogicalNot          : r2708_9
+# 2708|     v2708_11(void)      = ConditionalBranch   : r2708_10
+#-----|   False -> Block 17
+#-----|   True -> Block 16
+
+# 2708|   Block 16
+# 2708|     v2708_12(void) = NoOp : 
+#-----|   Goto -> Block 17
+
+# 2709|   Block 17
+# 2709|     r2709_1(glval<int>) = VariableAddress[x1] : 
+# 2709|     r2709_2(int)        = Load[x1]            : &:r2709_1, ~m?
+# 2709|     r2709_3(int)        = Constant[0]         : 
+# 2709|     r2709_4(bool)       = CompareNE           : r2709_2, r2709_3
+# 2709|     r2709_5(bool)       = LogicalNot          : r2709_4
+# 2709|     v2709_6(void)       = ConditionalBranch   : r2709_5
+#-----|   False -> Block 20
+#-----|   True -> Block 18
+
+# 2709|   Block 18
+# 2709|     r2709_7(glval<int>) = VariableAddress[x2] : 
+# 2709|     r2709_8(int)        = Load[x2]            : &:r2709_7, ~m?
+# 2709|     r2709_9(int)        = Constant[0]         : 
+# 2709|     r2709_10(bool)      = CompareNE           : r2709_8, r2709_9
+# 2709|     r2709_11(bool)      = LogicalNot          : r2709_10
+# 2709|     v2709_12(void)      = ConditionalBranch   : r2709_11
+#-----|   False -> Block 20
+#-----|   True -> Block 19
+
+# 2709|   Block 19
+# 2709|     v2709_13(void) = NoOp : 
+#-----|   Goto -> Block 20
+
+# 2710|   Block 20
+# 2710|     r2710_1(glval<int>) = VariableAddress[x1] : 
+# 2710|     r2710_2(int)        = Load[x1]            : &:r2710_1, ~m?
+# 2710|     r2710_3(int)        = Constant[0]         : 
+# 2710|     r2710_4(bool)       = CompareNE           : r2710_2, r2710_3
+# 2710|     v2710_5(void)       = ConditionalBranch   : r2710_4
+#-----|   False -> Block 21
+#-----|   True -> Block 22
+
+# 2710|   Block 21
+# 2710|     r2710_6(glval<int>) = VariableAddress[x2] : 
+# 2710|     r2710_7(int)        = Load[x2]            : &:r2710_6, ~m?
+# 2710|     r2710_8(int)        = Constant[0]         : 
+# 2710|     r2710_9(bool)       = CompareNE           : r2710_7, r2710_8
+# 2710|     v2710_10(void)      = ConditionalBranch   : r2710_9
+#-----|   False -> Block 23
+#-----|   True -> Block 22
+
+# 2710|   Block 22
+# 2710|     v2710_11(void) = NoOp : 
+#-----|   Goto -> Block 23
+
+# 2711|   Block 23
+# 2711|     r2711_1(glval<int>) = VariableAddress[x1] : 
+# 2711|     r2711_2(int)        = Load[x1]            : &:r2711_1, ~m?
+# 2711|     r2711_3(int)        = Constant[0]         : 
+# 2711|     r2711_4(bool)       = CompareNE           : r2711_2, r2711_3
+# 2711|     r2711_5(bool)       = LogicalNot          : r2711_4
+# 2711|     v2711_6(void)       = ConditionalBranch   : r2711_5
+#-----|   False -> Block 24
+#-----|   True -> Block 25
+
+# 2711|   Block 24
+# 2711|     r2711_7(glval<int>) = VariableAddress[x2] : 
+# 2711|     r2711_8(int)        = Load[x2]            : &:r2711_7, ~m?
+# 2711|     r2711_9(int)        = Constant[0]         : 
+# 2711|     r2711_10(bool)      = CompareNE           : r2711_8, r2711_9
+# 2711|     v2711_11(void)      = ConditionalBranch   : r2711_10
+#-----|   False -> Block 26
+#-----|   True -> Block 25
+
+# 2711|   Block 25
+# 2711|     v2711_12(void) = NoOp : 
+#-----|   Goto -> Block 26
+
+# 2712|   Block 26
+# 2712|     r2712_1(glval<int>) = VariableAddress[x1] : 
+# 2712|     r2712_2(int)        = Load[x1]            : &:r2712_1, ~m?
+# 2712|     r2712_3(int)        = Constant[0]         : 
+# 2712|     r2712_4(bool)       = CompareNE           : r2712_2, r2712_3
+# 2712|     v2712_5(void)       = ConditionalBranch   : r2712_4
+#-----|   False -> Block 27
+#-----|   True -> Block 28
+
+# 2712|   Block 27
+# 2712|     r2712_6(glval<int>) = VariableAddress[x2] : 
+# 2712|     r2712_7(int)        = Load[x2]            : &:r2712_6, ~m?
+# 2712|     r2712_8(int)        = Constant[0]         : 
+# 2712|     r2712_9(bool)       = CompareNE           : r2712_7, r2712_8
+# 2712|     r2712_10(bool)      = LogicalNot          : r2712_9
+# 2712|     v2712_11(void)      = ConditionalBranch   : r2712_10
+#-----|   False -> Block 29
+#-----|   True -> Block 28
+
+# 2712|   Block 28
+# 2712|     v2712_12(void) = NoOp : 
+#-----|   Goto -> Block 29
+
+# 2713|   Block 29
+# 2713|     r2713_1(glval<int>) = VariableAddress[x1] : 
+# 2713|     r2713_2(int)        = Load[x1]            : &:r2713_1, ~m?
+# 2713|     r2713_3(int)        = Constant[0]         : 
+# 2713|     r2713_4(bool)       = CompareNE           : r2713_2, r2713_3
+# 2713|     r2713_5(bool)       = LogicalNot          : r2713_4
+# 2713|     v2713_6(void)       = ConditionalBranch   : r2713_5
+#-----|   False -> Block 30
+#-----|   True -> Block 31
+
+# 2713|   Block 30
+# 2713|     r2713_7(glval<int>) = VariableAddress[x2] : 
+# 2713|     r2713_8(int)        = Load[x2]            : &:r2713_7, ~m?
+# 2713|     r2713_9(int)        = Constant[0]         : 
+# 2713|     r2713_10(bool)      = CompareNE           : r2713_8, r2713_9
+# 2713|     r2713_11(bool)      = LogicalNot          : r2713_10
+# 2713|     v2713_12(void)      = ConditionalBranch   : r2713_11
+#-----|   False -> Block 32
+#-----|   True -> Block 31
+
+# 2713|   Block 31
+# 2713|     v2713_13(void) = NoOp : 
+#-----|   Goto -> Block 32
+
+# 2715|   Block 32
+# 2715|     r2715_1(glval<int>) = VariableAddress[x_1_and_2] : 
+# 2715|     r2715_2(glval<int>) = VariableAddress[x1]        : 
+# 2715|     r2715_3(int)        = Load[x1]                   : &:r2715_2, ~m?
+# 2715|     r2715_4(int)        = Constant[0]                : 
+# 2715|     r2715_5(bool)       = CompareNE                  : r2715_3, r2715_4
+# 2715|     v2715_6(void)       = ConditionalBranch          : r2715_5
+#-----|   False -> Block 33
+#-----|   True -> Block 36
+
+# 2715|   Block 33
+# 2715|     r2715_7(glval<bool>) = VariableAddress[#temp2715:19] : 
+# 2715|     r2715_8(bool)        = Constant[0]                   : 
+# 2715|     mu2715_9(bool)       = Store[#temp2715:19]           : &:r2715_7, r2715_8
+#-----|   Goto -> Block 34
+
+# 2715|   Block 34
+# 2715|     r2715_10(glval<bool>) = VariableAddress[#temp2715:19] : 
+# 2715|     r2715_11(bool)        = Load[#temp2715:19]            : &:r2715_10, ~m?
+# 2715|     r2715_12(int)         = Convert                       : r2715_11
+# 2715|     mu2715_13(int)        = Store[x_1_and_2]              : &:r2715_1, r2715_12
+# 2716|     r2716_1(glval<int>)   = VariableAddress[x_1_and_2]    : 
+# 2716|     r2716_2(int)          = Load[x_1_and_2]               : &:r2716_1, ~m?
+# 2716|     r2716_3(int)          = Constant[0]                   : 
+# 2716|     r2716_4(bool)         = CompareNE                     : r2716_2, r2716_3
+# 2716|     v2716_5(void)         = ConditionalBranch             : r2716_4
+#-----|   False -> Block 38
+#-----|   True -> Block 37
+
+# 2715|   Block 35
+# 2715|     r2715_14(glval<bool>) = VariableAddress[#temp2715:19] : 
+# 2715|     r2715_15(bool)        = Constant[1]                   : 
+# 2715|     mu2715_16(bool)       = Store[#temp2715:19]           : &:r2715_14, r2715_15
+#-----|   Goto -> Block 34
+
+# 2715|   Block 36
+# 2715|     r2715_17(glval<int>) = VariableAddress[x2] : 
+# 2715|     r2715_18(int)        = Load[x2]            : &:r2715_17, ~m?
+# 2715|     r2715_19(int)        = Constant[0]         : 
+# 2715|     r2715_20(bool)       = CompareNE           : r2715_18, r2715_19
+# 2715|     v2715_21(void)       = ConditionalBranch   : r2715_20
+#-----|   False -> Block 33
+#-----|   True -> Block 35
+
+# 2716|   Block 37
+# 2716|     v2716_6(void) = NoOp : 
+#-----|   Goto -> Block 38
+
+# 2717|   Block 38
+# 2717|     r2717_1(glval<int>) = VariableAddress[x_1_and_2] : 
+# 2717|     r2717_2(int)        = Load[x_1_and_2]            : &:r2717_1, ~m?
+# 2717|     r2717_3(int)        = Constant[0]                : 
+# 2717|     r2717_4(bool)       = CompareNE                  : r2717_2, r2717_3
+# 2717|     r2717_5(bool)       = LogicalNot                 : r2717_4
+# 2717|     v2717_6(void)       = ConditionalBranch          : r2717_5
+#-----|   False -> Block 40
+#-----|   True -> Block 39
+
+# 2717|   Block 39
+# 2717|     v2717_7(void) = NoOp : 
+#-----|   Goto -> Block 40
+
+# 2718|   Block 40
+# 2718|     v2718_1(void)  = NoOp         : 
+# 2698|     v2698_8(void)  = ReturnVoid   : 
+# 2698|     v2698_9(void)  = AliasedUse   : ~m?
+# 2698|     v2698_10(void) = ExitFunction : 
+
 many-defs-per-use.cpp:
 #   34| void many_defs_per_use()
 #   34|   Block 0
diff --git a/cpp/ql/test/library-tests/ir/ir/unaliased_ssa_consistency.expected b/cpp/ql/test/library-tests/ir/ir/unaliased_ssa_consistency.expected
index 199d61f015d..7f10f2f9d7c 100644
--- a/cpp/ql/test/library-tests/ir/ir/unaliased_ssa_consistency.expected
+++ b/cpp/ql/test/library-tests/ir/ir/unaliased_ssa_consistency.expected
@@ -29,4 +29,42 @@ fieldAddressOnNonPointer
 thisArgumentIsNonPointer
 | ir.cpp:2546:34:2546:34 | Call: call to operator bool | Call instruction 'Call: call to operator bool' has a `this` argument operand that is not an address, in function '$@'. | ir.cpp:2545:6:2545:23 | void this_inconsistency(bool) | void this_inconsistency(bool) |
 nonUniqueIRVariable
+nonBooleanOperand
+| ir.c:85:7:85:8 | ConditionalBranch: x1 | Conditional branch instruction ConditionalBranch: x1 with non-Boolean condition, in function '$@'. | ir.c:84:6:84:28 | void branch_on_integral_in_c(int, int) | void branch_on_integral_in_c(int, int) |
+| ir.c:86:6:86:8 | ConditionalBranch: ! ... | Conditional branch instruction ConditionalBranch: ! ... with non-Boolean condition, in function '$@'. | ir.c:84:6:84:28 | void branch_on_integral_in_c(int, int) | void branch_on_integral_in_c(int, int) |
+| ir.c:86:6:86:8 | LogicalNot: ! ... | Logical Not instruction LogicalNot: ! ... with non-Boolean operand, in function '$@'. | ir.c:84:6:84:28 | void branch_on_integral_in_c(int, int) | void branch_on_integral_in_c(int, int) |
+| ir.c:88:11:88:13 | LogicalNot: ! ... | Logical Not instruction LogicalNot: ! ... with non-Boolean operand, in function '$@'. | ir.c:84:6:84:28 | void branch_on_integral_in_c(int, int) | void branch_on_integral_in_c(int, int) |
+| ir.c:89:6:89:6 | ConditionalBranch: y | Conditional branch instruction ConditionalBranch: y with non-Boolean condition, in function '$@'. | ir.c:84:6:84:28 | void branch_on_integral_in_c(int, int) | void branch_on_integral_in_c(int, int) |
+| ir.c:90:6:90:7 | ConditionalBranch: ! ... | Conditional branch instruction ConditionalBranch: ! ... with non-Boolean condition, in function '$@'. | ir.c:84:6:84:28 | void branch_on_integral_in_c(int, int) | void branch_on_integral_in_c(int, int) |
+| ir.c:90:6:90:7 | LogicalNot: ! ... | Logical Not instruction LogicalNot: ! ... with non-Boolean operand, in function '$@'. | ir.c:84:6:84:28 | void branch_on_integral_in_c(int, int) | void branch_on_integral_in_c(int, int) |
+| ir.c:92:6:92:7 | ConditionalBranch: x1 | Conditional branch instruction ConditionalBranch: x1 with non-Boolean condition, in function '$@'. | ir.c:84:6:84:28 | void branch_on_integral_in_c(int, int) | void branch_on_integral_in_c(int, int) |
+| ir.c:92:12:92:13 | ConditionalBranch: x2 | Conditional branch instruction ConditionalBranch: x2 with non-Boolean condition, in function '$@'. | ir.c:84:6:84:28 | void branch_on_integral_in_c(int, int) | void branch_on_integral_in_c(int, int) |
+| ir.c:93:6:93:8 | ConditionalBranch: ! ... | Conditional branch instruction ConditionalBranch: ! ... with non-Boolean condition, in function '$@'. | ir.c:84:6:84:28 | void branch_on_integral_in_c(int, int) | void branch_on_integral_in_c(int, int) |
+| ir.c:93:6:93:8 | LogicalNot: ! ... | Logical Not instruction LogicalNot: ! ... with non-Boolean operand, in function '$@'. | ir.c:84:6:84:28 | void branch_on_integral_in_c(int, int) | void branch_on_integral_in_c(int, int) |
+| ir.c:93:13:93:14 | ConditionalBranch: x2 | Conditional branch instruction ConditionalBranch: x2 with non-Boolean condition, in function '$@'. | ir.c:84:6:84:28 | void branch_on_integral_in_c(int, int) | void branch_on_integral_in_c(int, int) |
+| ir.c:94:6:94:7 | ConditionalBranch: x1 | Conditional branch instruction ConditionalBranch: x1 with non-Boolean condition, in function '$@'. | ir.c:84:6:84:28 | void branch_on_integral_in_c(int, int) | void branch_on_integral_in_c(int, int) |
+| ir.c:94:12:94:14 | ConditionalBranch: ! ... | Conditional branch instruction ConditionalBranch: ! ... with non-Boolean condition, in function '$@'. | ir.c:84:6:84:28 | void branch_on_integral_in_c(int, int) | void branch_on_integral_in_c(int, int) |
+| ir.c:94:12:94:14 | LogicalNot: ! ... | Logical Not instruction LogicalNot: ! ... with non-Boolean operand, in function '$@'. | ir.c:84:6:84:28 | void branch_on_integral_in_c(int, int) | void branch_on_integral_in_c(int, int) |
+| ir.c:95:6:95:8 | ConditionalBranch: ! ... | Conditional branch instruction ConditionalBranch: ! ... with non-Boolean condition, in function '$@'. | ir.c:84:6:84:28 | void branch_on_integral_in_c(int, int) | void branch_on_integral_in_c(int, int) |
+| ir.c:95:6:95:8 | LogicalNot: ! ... | Logical Not instruction LogicalNot: ! ... with non-Boolean operand, in function '$@'. | ir.c:84:6:84:28 | void branch_on_integral_in_c(int, int) | void branch_on_integral_in_c(int, int) |
+| ir.c:95:13:95:15 | ConditionalBranch: ! ... | Conditional branch instruction ConditionalBranch: ! ... with non-Boolean condition, in function '$@'. | ir.c:84:6:84:28 | void branch_on_integral_in_c(int, int) | void branch_on_integral_in_c(int, int) |
+| ir.c:95:13:95:15 | LogicalNot: ! ... | Logical Not instruction LogicalNot: ! ... with non-Boolean operand, in function '$@'. | ir.c:84:6:84:28 | void branch_on_integral_in_c(int, int) | void branch_on_integral_in_c(int, int) |
+| ir.c:96:6:96:7 | ConditionalBranch: x1 | Conditional branch instruction ConditionalBranch: x1 with non-Boolean condition, in function '$@'. | ir.c:84:6:84:28 | void branch_on_integral_in_c(int, int) | void branch_on_integral_in_c(int, int) |
+| ir.c:96:12:96:13 | ConditionalBranch: x2 | Conditional branch instruction ConditionalBranch: x2 with non-Boolean condition, in function '$@'. | ir.c:84:6:84:28 | void branch_on_integral_in_c(int, int) | void branch_on_integral_in_c(int, int) |
+| ir.c:97:6:97:8 | ConditionalBranch: ! ... | Conditional branch instruction ConditionalBranch: ! ... with non-Boolean condition, in function '$@'. | ir.c:84:6:84:28 | void branch_on_integral_in_c(int, int) | void branch_on_integral_in_c(int, int) |
+| ir.c:97:6:97:8 | LogicalNot: ! ... | Logical Not instruction LogicalNot: ! ... with non-Boolean operand, in function '$@'. | ir.c:84:6:84:28 | void branch_on_integral_in_c(int, int) | void branch_on_integral_in_c(int, int) |
+| ir.c:97:13:97:14 | ConditionalBranch: x2 | Conditional branch instruction ConditionalBranch: x2 with non-Boolean condition, in function '$@'. | ir.c:84:6:84:28 | void branch_on_integral_in_c(int, int) | void branch_on_integral_in_c(int, int) |
+| ir.c:98:6:98:7 | ConditionalBranch: x1 | Conditional branch instruction ConditionalBranch: x1 with non-Boolean condition, in function '$@'. | ir.c:84:6:84:28 | void branch_on_integral_in_c(int, int) | void branch_on_integral_in_c(int, int) |
+| ir.c:98:12:98:14 | ConditionalBranch: ! ... | Conditional branch instruction ConditionalBranch: ! ... with non-Boolean condition, in function '$@'. | ir.c:84:6:84:28 | void branch_on_integral_in_c(int, int) | void branch_on_integral_in_c(int, int) |
+| ir.c:98:12:98:14 | LogicalNot: ! ... | Logical Not instruction LogicalNot: ! ... with non-Boolean operand, in function '$@'. | ir.c:84:6:84:28 | void branch_on_integral_in_c(int, int) | void branch_on_integral_in_c(int, int) |
+| ir.c:99:6:99:8 | ConditionalBranch: ! ... | Conditional branch instruction ConditionalBranch: ! ... with non-Boolean condition, in function '$@'. | ir.c:84:6:84:28 | void branch_on_integral_in_c(int, int) | void branch_on_integral_in_c(int, int) |
+| ir.c:99:6:99:8 | LogicalNot: ! ... | Logical Not instruction LogicalNot: ! ... with non-Boolean operand, in function '$@'. | ir.c:84:6:84:28 | void branch_on_integral_in_c(int, int) | void branch_on_integral_in_c(int, int) |
+| ir.c:99:13:99:15 | ConditionalBranch: ! ... | Conditional branch instruction ConditionalBranch: ! ... with non-Boolean condition, in function '$@'. | ir.c:84:6:84:28 | void branch_on_integral_in_c(int, int) | void branch_on_integral_in_c(int, int) |
+| ir.c:99:13:99:15 | LogicalNot: ! ... | Logical Not instruction LogicalNot: ! ... with non-Boolean operand, in function '$@'. | ir.c:84:6:84:28 | void branch_on_integral_in_c(int, int) | void branch_on_integral_in_c(int, int) |
+| ir.c:101:19:101:20 | ConditionalBranch: x1 | Conditional branch instruction ConditionalBranch: x1 with non-Boolean condition, in function '$@'. | ir.c:84:6:84:28 | void branch_on_integral_in_c(int, int) | void branch_on_integral_in_c(int, int) |
+| ir.c:101:25:101:26 | ConditionalBranch: x2 | Conditional branch instruction ConditionalBranch: x2 with non-Boolean condition, in function '$@'. | ir.c:84:6:84:28 | void branch_on_integral_in_c(int, int) | void branch_on_integral_in_c(int, int) |
+| ir.c:102:6:102:14 | ConditionalBranch: x_1_and_2 | Conditional branch instruction ConditionalBranch: x_1_and_2 with non-Boolean condition, in function '$@'. | ir.c:84:6:84:28 | void branch_on_integral_in_c(int, int) | void branch_on_integral_in_c(int, int) |
+| ir.c:103:6:103:15 | ConditionalBranch: ! ... | Conditional branch instruction ConditionalBranch: ! ... with non-Boolean condition, in function '$@'. | ir.c:84:6:84:28 | void branch_on_integral_in_c(int, int) | void branch_on_integral_in_c(int, int) |
+| ir.c:103:6:103:15 | LogicalNot: ! ... | Logical Not instruction LogicalNot: ! ... with non-Boolean operand, in function '$@'. | ir.c:84:6:84:28 | void branch_on_integral_in_c(int, int) | void branch_on_integral_in_c(int, int) |
+| try_except.c:35:13:35:13 | ConditionalBranch: b | Conditional branch instruction ConditionalBranch: b with non-Boolean condition, in function '$@'. | try_except.c:32:6:32:6 | void h(int) | void h(int) |
 missingCppType
diff --git a/cpp/ql/test/library-tests/ir/ir/unaliased_ssa_consistency_unsound.expected b/cpp/ql/test/library-tests/ir/ir/unaliased_ssa_consistency_unsound.expected
index 199d61f015d..7f10f2f9d7c 100644
--- a/cpp/ql/test/library-tests/ir/ir/unaliased_ssa_consistency_unsound.expected
+++ b/cpp/ql/test/library-tests/ir/ir/unaliased_ssa_consistency_unsound.expected
@@ -29,4 +29,42 @@ fieldAddressOnNonPointer
 thisArgumentIsNonPointer
 | ir.cpp:2546:34:2546:34 | Call: call to operator bool | Call instruction 'Call: call to operator bool' has a `this` argument operand that is not an address, in function '$@'. | ir.cpp:2545:6:2545:23 | void this_inconsistency(bool) | void this_inconsistency(bool) |
 nonUniqueIRVariable
+nonBooleanOperand
+| ir.c:85:7:85:8 | ConditionalBranch: x1 | Conditional branch instruction ConditionalBranch: x1 with non-Boolean condition, in function '$@'. | ir.c:84:6:84:28 | void branch_on_integral_in_c(int, int) | void branch_on_integral_in_c(int, int) |
+| ir.c:86:6:86:8 | ConditionalBranch: ! ... | Conditional branch instruction ConditionalBranch: ! ... with non-Boolean condition, in function '$@'. | ir.c:84:6:84:28 | void branch_on_integral_in_c(int, int) | void branch_on_integral_in_c(int, int) |
+| ir.c:86:6:86:8 | LogicalNot: ! ... | Logical Not instruction LogicalNot: ! ... with non-Boolean operand, in function '$@'. | ir.c:84:6:84:28 | void branch_on_integral_in_c(int, int) | void branch_on_integral_in_c(int, int) |
+| ir.c:88:11:88:13 | LogicalNot: ! ... | Logical Not instruction LogicalNot: ! ... with non-Boolean operand, in function '$@'. | ir.c:84:6:84:28 | void branch_on_integral_in_c(int, int) | void branch_on_integral_in_c(int, int) |
+| ir.c:89:6:89:6 | ConditionalBranch: y | Conditional branch instruction ConditionalBranch: y with non-Boolean condition, in function '$@'. | ir.c:84:6:84:28 | void branch_on_integral_in_c(int, int) | void branch_on_integral_in_c(int, int) |
+| ir.c:90:6:90:7 | ConditionalBranch: ! ... | Conditional branch instruction ConditionalBranch: ! ... with non-Boolean condition, in function '$@'. | ir.c:84:6:84:28 | void branch_on_integral_in_c(int, int) | void branch_on_integral_in_c(int, int) |
+| ir.c:90:6:90:7 | LogicalNot: ! ... | Logical Not instruction LogicalNot: ! ... with non-Boolean operand, in function '$@'. | ir.c:84:6:84:28 | void branch_on_integral_in_c(int, int) | void branch_on_integral_in_c(int, int) |
+| ir.c:92:6:92:7 | ConditionalBranch: x1 | Conditional branch instruction ConditionalBranch: x1 with non-Boolean condition, in function '$@'. | ir.c:84:6:84:28 | void branch_on_integral_in_c(int, int) | void branch_on_integral_in_c(int, int) |
+| ir.c:92:12:92:13 | ConditionalBranch: x2 | Conditional branch instruction ConditionalBranch: x2 with non-Boolean condition, in function '$@'. | ir.c:84:6:84:28 | void branch_on_integral_in_c(int, int) | void branch_on_integral_in_c(int, int) |
+| ir.c:93:6:93:8 | ConditionalBranch: ! ... | Conditional branch instruction ConditionalBranch: ! ... with non-Boolean condition, in function '$@'. | ir.c:84:6:84:28 | void branch_on_integral_in_c(int, int) | void branch_on_integral_in_c(int, int) |
+| ir.c:93:6:93:8 | LogicalNot: ! ... | Logical Not instruction LogicalNot: ! ... with non-Boolean operand, in function '$@'. | ir.c:84:6:84:28 | void branch_on_integral_in_c(int, int) | void branch_on_integral_in_c(int, int) |
+| ir.c:93:13:93:14 | ConditionalBranch: x2 | Conditional branch instruction ConditionalBranch: x2 with non-Boolean condition, in function '$@'. | ir.c:84:6:84:28 | void branch_on_integral_in_c(int, int) | void branch_on_integral_in_c(int, int) |
+| ir.c:94:6:94:7 | ConditionalBranch: x1 | Conditional branch instruction ConditionalBranch: x1 with non-Boolean condition, in function '$@'. | ir.c:84:6:84:28 | void branch_on_integral_in_c(int, int) | void branch_on_integral_in_c(int, int) |
+| ir.c:94:12:94:14 | ConditionalBranch: ! ... | Conditional branch instruction ConditionalBranch: ! ... with non-Boolean condition, in function '$@'. | ir.c:84:6:84:28 | void branch_on_integral_in_c(int, int) | void branch_on_integral_in_c(int, int) |
+| ir.c:94:12:94:14 | LogicalNot: ! ... | Logical Not instruction LogicalNot: ! ... with non-Boolean operand, in function '$@'. | ir.c:84:6:84:28 | void branch_on_integral_in_c(int, int) | void branch_on_integral_in_c(int, int) |
+| ir.c:95:6:95:8 | ConditionalBranch: ! ... | Conditional branch instruction ConditionalBranch: ! ... with non-Boolean condition, in function '$@'. | ir.c:84:6:84:28 | void branch_on_integral_in_c(int, int) | void branch_on_integral_in_c(int, int) |
+| ir.c:95:6:95:8 | LogicalNot: ! ... | Logical Not instruction LogicalNot: ! ... with non-Boolean operand, in function '$@'. | ir.c:84:6:84:28 | void branch_on_integral_in_c(int, int) | void branch_on_integral_in_c(int, int) |
+| ir.c:95:13:95:15 | ConditionalBranch: ! ... | Conditional branch instruction ConditionalBranch: ! ... with non-Boolean condition, in function '$@'. | ir.c:84:6:84:28 | void branch_on_integral_in_c(int, int) | void branch_on_integral_in_c(int, int) |
+| ir.c:95:13:95:15 | LogicalNot: ! ... | Logical Not instruction LogicalNot: ! ... with non-Boolean operand, in function '$@'. | ir.c:84:6:84:28 | void branch_on_integral_in_c(int, int) | void branch_on_integral_in_c(int, int) |
+| ir.c:96:6:96:7 | ConditionalBranch: x1 | Conditional branch instruction ConditionalBranch: x1 with non-Boolean condition, in function '$@'. | ir.c:84:6:84:28 | void branch_on_integral_in_c(int, int) | void branch_on_integral_in_c(int, int) |
+| ir.c:96:12:96:13 | ConditionalBranch: x2 | Conditional branch instruction ConditionalBranch: x2 with non-Boolean condition, in function '$@'. | ir.c:84:6:84:28 | void branch_on_integral_in_c(int, int) | void branch_on_integral_in_c(int, int) |
+| ir.c:97:6:97:8 | ConditionalBranch: ! ... | Conditional branch instruction ConditionalBranch: ! ... with non-Boolean condition, in function '$@'. | ir.c:84:6:84:28 | void branch_on_integral_in_c(int, int) | void branch_on_integral_in_c(int, int) |
+| ir.c:97:6:97:8 | LogicalNot: ! ... | Logical Not instruction LogicalNot: ! ... with non-Boolean operand, in function '$@'. | ir.c:84:6:84:28 | void branch_on_integral_in_c(int, int) | void branch_on_integral_in_c(int, int) |
+| ir.c:97:13:97:14 | ConditionalBranch: x2 | Conditional branch instruction ConditionalBranch: x2 with non-Boolean condition, in function '$@'. | ir.c:84:6:84:28 | void branch_on_integral_in_c(int, int) | void branch_on_integral_in_c(int, int) |
+| ir.c:98:6:98:7 | ConditionalBranch: x1 | Conditional branch instruction ConditionalBranch: x1 with non-Boolean condition, in function '$@'. | ir.c:84:6:84:28 | void branch_on_integral_in_c(int, int) | void branch_on_integral_in_c(int, int) |
+| ir.c:98:12:98:14 | ConditionalBranch: ! ... | Conditional branch instruction ConditionalBranch: ! ... with non-Boolean condition, in function '$@'. | ir.c:84:6:84:28 | void branch_on_integral_in_c(int, int) | void branch_on_integral_in_c(int, int) |
+| ir.c:98:12:98:14 | LogicalNot: ! ... | Logical Not instruction LogicalNot: ! ... with non-Boolean operand, in function '$@'. | ir.c:84:6:84:28 | void branch_on_integral_in_c(int, int) | void branch_on_integral_in_c(int, int) |
+| ir.c:99:6:99:8 | ConditionalBranch: ! ... | Conditional branch instruction ConditionalBranch: ! ... with non-Boolean condition, in function '$@'. | ir.c:84:6:84:28 | void branch_on_integral_in_c(int, int) | void branch_on_integral_in_c(int, int) |
+| ir.c:99:6:99:8 | LogicalNot: ! ... | Logical Not instruction LogicalNot: ! ... with non-Boolean operand, in function '$@'. | ir.c:84:6:84:28 | void branch_on_integral_in_c(int, int) | void branch_on_integral_in_c(int, int) |
+| ir.c:99:13:99:15 | ConditionalBranch: ! ... | Conditional branch instruction ConditionalBranch: ! ... with non-Boolean condition, in function '$@'. | ir.c:84:6:84:28 | void branch_on_integral_in_c(int, int) | void branch_on_integral_in_c(int, int) |
+| ir.c:99:13:99:15 | LogicalNot: ! ... | Logical Not instruction LogicalNot: ! ... with non-Boolean operand, in function '$@'. | ir.c:84:6:84:28 | void branch_on_integral_in_c(int, int) | void branch_on_integral_in_c(int, int) |
+| ir.c:101:19:101:20 | ConditionalBranch: x1 | Conditional branch instruction ConditionalBranch: x1 with non-Boolean condition, in function '$@'. | ir.c:84:6:84:28 | void branch_on_integral_in_c(int, int) | void branch_on_integral_in_c(int, int) |
+| ir.c:101:25:101:26 | ConditionalBranch: x2 | Conditional branch instruction ConditionalBranch: x2 with non-Boolean condition, in function '$@'. | ir.c:84:6:84:28 | void branch_on_integral_in_c(int, int) | void branch_on_integral_in_c(int, int) |
+| ir.c:102:6:102:14 | ConditionalBranch: x_1_and_2 | Conditional branch instruction ConditionalBranch: x_1_and_2 with non-Boolean condition, in function '$@'. | ir.c:84:6:84:28 | void branch_on_integral_in_c(int, int) | void branch_on_integral_in_c(int, int) |
+| ir.c:103:6:103:15 | ConditionalBranch: ! ... | Conditional branch instruction ConditionalBranch: ! ... with non-Boolean condition, in function '$@'. | ir.c:84:6:84:28 | void branch_on_integral_in_c(int, int) | void branch_on_integral_in_c(int, int) |
+| ir.c:103:6:103:15 | LogicalNot: ! ... | Logical Not instruction LogicalNot: ! ... with non-Boolean operand, in function '$@'. | ir.c:84:6:84:28 | void branch_on_integral_in_c(int, int) | void branch_on_integral_in_c(int, int) |
+| try_except.c:35:13:35:13 | ConditionalBranch: b | Conditional branch instruction ConditionalBranch: b with non-Boolean condition, in function '$@'. | try_except.c:32:6:32:6 | void h(int) | void h(int) |
 missingCppType
diff --git a/misc/bazel/semmle_code_stub/WORKSPACE.bazel b/cpp/ql/test/library-tests/ir/multiple-entry-points/raw_ir.expected
similarity index 100%
rename from misc/bazel/semmle_code_stub/WORKSPACE.bazel
rename to cpp/ql/test/library-tests/ir/multiple-entry-points/raw_ir.expected
diff --git a/cpp/ql/test/library-tests/ir/multiple-entry-points/raw_ir.ql b/cpp/ql/test/library-tests/ir/multiple-entry-points/raw_ir.ql
new file mode 100644
index 00000000000..cfc9da598a1
--- /dev/null
+++ b/cpp/ql/test/library-tests/ir/multiple-entry-points/raw_ir.ql
@@ -0,0 +1,6 @@
+/**
+ * @kind graph
+ */
+
+private import cpp
+private import semmle.code.cpp.ir.implementation.raw.PrintIR
diff --git a/cpp/ql/test/library-tests/ir/multiple-entry-points/test1.cpp b/cpp/ql/test/library-tests/ir/multiple-entry-points/test1.cpp
new file mode 100644
index 00000000000..463e9d34a86
--- /dev/null
+++ b/cpp/ql/test/library-tests/ir/multiple-entry-points/test1.cpp
@@ -0,0 +1,7 @@
+int foo(int i);
+
+int foo(int i) {
+  return 42;
+}
+
+int bar();
diff --git a/cpp/ql/test/library-tests/ir/multiple-entry-points/test2.cpp b/cpp/ql/test/library-tests/ir/multiple-entry-points/test2.cpp
new file mode 100644
index 00000000000..b61562ce2c3
--- /dev/null
+++ b/cpp/ql/test/library-tests/ir/multiple-entry-points/test2.cpp
@@ -0,0 +1,3 @@
+int foo(int i) {
+  return i;
+}
diff --git a/cpp/ql/test/library-tests/ir/ssa/aliased_ssa_consistency.expected b/cpp/ql/test/library-tests/ir/ssa/aliased_ssa_consistency.expected
index b93c7d2649f..91def5d3871 100644
--- a/cpp/ql/test/library-tests/ir/ssa/aliased_ssa_consistency.expected
+++ b/cpp/ql/test/library-tests/ir/ssa/aliased_ssa_consistency.expected
@@ -28,4 +28,5 @@ nonUniqueEnclosingIRFunction
 fieldAddressOnNonPointer
 thisArgumentIsNonPointer
 nonUniqueIRVariable
+nonBooleanOperand
 missingCppType
diff --git a/cpp/ql/test/library-tests/ir/ssa/aliased_ssa_consistency_unsound.expected b/cpp/ql/test/library-tests/ir/ssa/aliased_ssa_consistency_unsound.expected
index b93c7d2649f..91def5d3871 100644
--- a/cpp/ql/test/library-tests/ir/ssa/aliased_ssa_consistency_unsound.expected
+++ b/cpp/ql/test/library-tests/ir/ssa/aliased_ssa_consistency_unsound.expected
@@ -28,4 +28,5 @@ nonUniqueEnclosingIRFunction
 fieldAddressOnNonPointer
 thisArgumentIsNonPointer
 nonUniqueIRVariable
+nonBooleanOperand
 missingCppType
diff --git a/cpp/ql/test/library-tests/ir/ssa/aliased_ssa_ir.expected b/cpp/ql/test/library-tests/ir/ssa/aliased_ssa_ir.expected
index aad6b670188..4a7e70ae106 100644
--- a/cpp/ql/test/library-tests/ir/ssa/aliased_ssa_ir.expected
+++ b/cpp/ql/test/library-tests/ir/ssa/aliased_ssa_ir.expected
@@ -2200,3 +2200,65 @@ ssa.cpp:
 #  439|     r439_15(glval<int>) = VariableAddress[#temp439:13] : 
 #  439|     m439_16(int)        = Store[#temp439:13]           : &:r439_15, r439_14
 #-----|   Goto -> Block 1
+
+#  442| void NonEscapingParams(void*, void*)
+#  442|   Block 0
+#  442|     v442_1(void)          = EnterFunction            : 
+#  442|     m442_2(unknown)       = AliasedDefinition        : 
+#  442|     m442_3(unknown)       = InitializeNonLocal       : 
+#  442|     m442_4(unknown)       = Chi                      : total:m442_2, partial:m442_3
+#  442|     r442_5(glval<void *>) = VariableAddress[a]       : 
+#  442|     m442_6(void *)        = InitializeParameter[a]   : &:r442_5
+#  442|     r442_7(void *)        = Load[a]                  : &:r442_5, m442_6
+#  442|     m442_8(unknown)       = InitializeIndirection[a] : &:r442_7
+#  442|     r442_9(glval<void *>) = VariableAddress[b]       : 
+#  442|     m442_10(void *)       = InitializeParameter[b]   : &:r442_9
+#  442|     r442_11(void *)       = Load[b]                  : &:r442_9, m442_10
+#  442|     m442_12(unknown)      = InitializeIndirection[b] : &:r442_11
+#  444|     v444_1(void)          = NoOp                     : 
+#  442|     v442_13(void)         = ReturnIndirection[a]     : &:r442_7, m442_8
+#  442|     v442_14(void)         = ReturnIndirection[b]     : &:r442_11, m442_12
+#  442|     v442_15(void)         = ReturnVoid               : 
+#  442|     v442_16(void)         = AliasedUse               : m442_3
+#  442|     v442_17(void)         = ExitFunction             : 
+
+#  446| void EscapingParams(void*, void*)
+#  446|   Block 0
+#  446|     v446_1(void)           = EnterFunction                : 
+#  446|     m446_2(unknown)        = AliasedDefinition            : 
+#  446|     m446_3(unknown)        = InitializeNonLocal           : 
+#  446|     m446_4(unknown)        = Chi                          : total:m446_2, partial:m446_3
+#  446|     r446_5(glval<void *>)  = VariableAddress[a]           : 
+#  446|     m446_6(void *)         = InitializeParameter[a]       : &:r446_5
+#  446|     r446_7(void *)         = Load[a]                      : &:r446_5, m446_6
+#  446|     m446_8(unknown)        = InitializeIndirection[a]     : &:r446_7
+#  446|     m446_9(unknown)        = Chi                          : total:m446_4, partial:m446_8
+#  446|     r446_10(glval<void *>) = VariableAddress[b]           : 
+#  446|     m446_11(void *)        = InitializeParameter[b]       : &:r446_10
+#  446|     r446_12(void *)        = Load[b]                      : &:r446_10, m446_11
+#  446|     m446_13(unknown)       = InitializeIndirection[b]     : &:r446_12
+#  446|     m446_14(unknown)       = Chi                          : total:m446_9, partial:m446_13
+#  448|     r448_1(glval<unknown>) = FunctionAddress[Escape]      : 
+#  448|     r448_2(glval<void *>)  = VariableAddress[a]           : 
+#  448|     r448_3(void *)         = Load[a]                      : &:r448_2, m446_6
+#  448|     v448_4(void)           = Call[Escape]                 : func:r448_1, 0:r448_3
+#  448|     m448_5(unknown)        = ^CallSideEffect              : ~m446_14
+#  448|     m448_6(unknown)        = Chi                          : total:m446_14, partial:m448_5
+#  448|     v448_7(void)           = ^BufferReadSideEffect[0]     : &:r448_3, ~m448_6
+#  448|     m448_8(unknown)        = ^BufferMayWriteSideEffect[0] : &:r448_3
+#  448|     m448_9(unknown)        = Chi                          : total:m448_6, partial:m448_8
+#  449|     r449_1(glval<unknown>) = FunctionAddress[Escape]      : 
+#  449|     r449_2(glval<void *>)  = VariableAddress[b]           : 
+#  449|     r449_3(void *)         = Load[b]                      : &:r449_2, m446_11
+#  449|     v449_4(void)           = Call[Escape]                 : func:r449_1, 0:r449_3
+#  449|     m449_5(unknown)        = ^CallSideEffect              : ~m448_9
+#  449|     m449_6(unknown)        = Chi                          : total:m448_9, partial:m449_5
+#  449|     v449_7(void)           = ^BufferReadSideEffect[0]     : &:r449_3, ~m449_6
+#  449|     m449_8(unknown)        = ^BufferMayWriteSideEffect[0] : &:r449_3
+#  449|     m449_9(unknown)        = Chi                          : total:m449_6, partial:m449_8
+#  450|     v450_1(void)           = NoOp                         : 
+#  446|     v446_15(void)          = ReturnIndirection[a]         : &:r446_7, ~m449_9
+#  446|     v446_16(void)          = ReturnIndirection[b]         : &:r446_12, ~m449_9
+#  446|     v446_17(void)          = ReturnVoid                   : 
+#  446|     v446_18(void)          = AliasedUse                   : ~m449_9
+#  446|     v446_19(void)          = ExitFunction                 : 
diff --git a/cpp/ql/test/library-tests/ir/ssa/aliased_ssa_ir_unsound.expected b/cpp/ql/test/library-tests/ir/ssa/aliased_ssa_ir_unsound.expected
index aad6b670188..4a7e70ae106 100644
--- a/cpp/ql/test/library-tests/ir/ssa/aliased_ssa_ir_unsound.expected
+++ b/cpp/ql/test/library-tests/ir/ssa/aliased_ssa_ir_unsound.expected
@@ -2200,3 +2200,65 @@ ssa.cpp:
 #  439|     r439_15(glval<int>) = VariableAddress[#temp439:13] : 
 #  439|     m439_16(int)        = Store[#temp439:13]           : &:r439_15, r439_14
 #-----|   Goto -> Block 1
+
+#  442| void NonEscapingParams(void*, void*)
+#  442|   Block 0
+#  442|     v442_1(void)          = EnterFunction            : 
+#  442|     m442_2(unknown)       = AliasedDefinition        : 
+#  442|     m442_3(unknown)       = InitializeNonLocal       : 
+#  442|     m442_4(unknown)       = Chi                      : total:m442_2, partial:m442_3
+#  442|     r442_5(glval<void *>) = VariableAddress[a]       : 
+#  442|     m442_6(void *)        = InitializeParameter[a]   : &:r442_5
+#  442|     r442_7(void *)        = Load[a]                  : &:r442_5, m442_6
+#  442|     m442_8(unknown)       = InitializeIndirection[a] : &:r442_7
+#  442|     r442_9(glval<void *>) = VariableAddress[b]       : 
+#  442|     m442_10(void *)       = InitializeParameter[b]   : &:r442_9
+#  442|     r442_11(void *)       = Load[b]                  : &:r442_9, m442_10
+#  442|     m442_12(unknown)      = InitializeIndirection[b] : &:r442_11
+#  444|     v444_1(void)          = NoOp                     : 
+#  442|     v442_13(void)         = ReturnIndirection[a]     : &:r442_7, m442_8
+#  442|     v442_14(void)         = ReturnIndirection[b]     : &:r442_11, m442_12
+#  442|     v442_15(void)         = ReturnVoid               : 
+#  442|     v442_16(void)         = AliasedUse               : m442_3
+#  442|     v442_17(void)         = ExitFunction             : 
+
+#  446| void EscapingParams(void*, void*)
+#  446|   Block 0
+#  446|     v446_1(void)           = EnterFunction                : 
+#  446|     m446_2(unknown)        = AliasedDefinition            : 
+#  446|     m446_3(unknown)        = InitializeNonLocal           : 
+#  446|     m446_4(unknown)        = Chi                          : total:m446_2, partial:m446_3
+#  446|     r446_5(glval<void *>)  = VariableAddress[a]           : 
+#  446|     m446_6(void *)         = InitializeParameter[a]       : &:r446_5
+#  446|     r446_7(void *)         = Load[a]                      : &:r446_5, m446_6
+#  446|     m446_8(unknown)        = InitializeIndirection[a]     : &:r446_7
+#  446|     m446_9(unknown)        = Chi                          : total:m446_4, partial:m446_8
+#  446|     r446_10(glval<void *>) = VariableAddress[b]           : 
+#  446|     m446_11(void *)        = InitializeParameter[b]       : &:r446_10
+#  446|     r446_12(void *)        = Load[b]                      : &:r446_10, m446_11
+#  446|     m446_13(unknown)       = InitializeIndirection[b]     : &:r446_12
+#  446|     m446_14(unknown)       = Chi                          : total:m446_9, partial:m446_13
+#  448|     r448_1(glval<unknown>) = FunctionAddress[Escape]      : 
+#  448|     r448_2(glval<void *>)  = VariableAddress[a]           : 
+#  448|     r448_3(void *)         = Load[a]                      : &:r448_2, m446_6
+#  448|     v448_4(void)           = Call[Escape]                 : func:r448_1, 0:r448_3
+#  448|     m448_5(unknown)        = ^CallSideEffect              : ~m446_14
+#  448|     m448_6(unknown)        = Chi                          : total:m446_14, partial:m448_5
+#  448|     v448_7(void)           = ^BufferReadSideEffect[0]     : &:r448_3, ~m448_6
+#  448|     m448_8(unknown)        = ^BufferMayWriteSideEffect[0] : &:r448_3
+#  448|     m448_9(unknown)        = Chi                          : total:m448_6, partial:m448_8
+#  449|     r449_1(glval<unknown>) = FunctionAddress[Escape]      : 
+#  449|     r449_2(glval<void *>)  = VariableAddress[b]           : 
+#  449|     r449_3(void *)         = Load[b]                      : &:r449_2, m446_11
+#  449|     v449_4(void)           = Call[Escape]                 : func:r449_1, 0:r449_3
+#  449|     m449_5(unknown)        = ^CallSideEffect              : ~m448_9
+#  449|     m449_6(unknown)        = Chi                          : total:m448_9, partial:m449_5
+#  449|     v449_7(void)           = ^BufferReadSideEffect[0]     : &:r449_3, ~m449_6
+#  449|     m449_8(unknown)        = ^BufferMayWriteSideEffect[0] : &:r449_3
+#  449|     m449_9(unknown)        = Chi                          : total:m449_6, partial:m449_8
+#  450|     v450_1(void)           = NoOp                         : 
+#  446|     v446_15(void)          = ReturnIndirection[a]         : &:r446_7, ~m449_9
+#  446|     v446_16(void)          = ReturnIndirection[b]         : &:r446_12, ~m449_9
+#  446|     v446_17(void)          = ReturnVoid                   : 
+#  446|     v446_18(void)          = AliasedUse                   : ~m449_9
+#  446|     v446_19(void)          = ExitFunction                 : 
diff --git a/cpp/ql/test/library-tests/ir/ssa/aliased_ssa_overlap.expected b/cpp/ql/test/library-tests/ir/ssa/aliased_ssa_overlap.expected
new file mode 100644
index 00000000000..3a9abfc7f78
--- /dev/null
+++ b/cpp/ql/test/library-tests/ir/ssa/aliased_ssa_overlap.expected
@@ -0,0 +1,526 @@
+| ssa.c:3:14:3:16 | foo | ssa.c:3:14:3:16 | foo | MustExactlyOverlap |
+| ssa.c:3:14:3:16 | foo | ssa.c:3:14:3:16 | foo[0..4)<int> | MustTotallyOverlap |
+| ssa.c:3:14:3:16 | foo | ssa.c:3:14:3:16 | foo[4..8)<int> | MustTotallyOverlap |
+| ssa.c:3:14:3:16 | foo[0..4)<int> | ssa.c:3:14:3:16 | foo | MayPartiallyOverlap |
+| ssa.c:3:14:3:16 | foo[0..4)<int> | ssa.c:3:14:3:16 | foo[0..4)<int> | MustExactlyOverlap |
+| ssa.c:3:14:3:16 | foo[4..8)<int> | ssa.c:3:14:3:16 | foo | MayPartiallyOverlap |
+| ssa.c:3:14:3:16 | foo[4..8)<int> | ssa.c:3:14:3:16 | foo[4..8)<int> | MustExactlyOverlap |
+| ssa.c:7:7:7:7 | x | ssa.c:7:7:7:7 | x | MustExactlyOverlap |
+| ssa.c:7:7:7:7 | x | ssa.c:7:7:7:7 | x<int> | MustTotallyOverlap |
+| ssa.c:7:7:7:7 | x<int> | ssa.c:7:7:7:7 | x | MustTotallyOverlap |
+| ssa.c:7:7:7:7 | x<int> | ssa.c:7:7:7:7 | x<int> | MustExactlyOverlap |
+| ssa.c:12:15:12:17 | foo | ssa.c:12:15:12:17 | foo | MustExactlyOverlap |
+| ssa.c:12:15:12:17 | foo | ssa.c:12:15:12:17 | foo[0..4)<int> | MustTotallyOverlap |
+| ssa.c:12:15:12:17 | foo | ssa.c:12:15:12:17 | foo[4..8)<int> | MustTotallyOverlap |
+| ssa.c:12:15:12:17 | foo[0..4)<int> | ssa.c:12:15:12:17 | foo | MayPartiallyOverlap |
+| ssa.c:12:15:12:17 | foo[0..4)<int> | ssa.c:12:15:12:17 | foo[0..4)<int> | MustExactlyOverlap |
+| ssa.c:12:15:12:17 | foo[4..8)<int> | ssa.c:12:15:12:17 | foo | MayPartiallyOverlap |
+| ssa.c:12:15:12:17 | foo[4..8)<int> | ssa.c:12:15:12:17 | foo[4..8)<int> | MustExactlyOverlap |
+| ssa.c:14:15:14:25 | foo_swapped | ssa.c:14:15:14:25 | foo_swapped | MustExactlyOverlap |
+| ssa.c:14:15:14:25 | foo_swapped | ssa.c:14:15:14:25 | foo_swapped[0..4)<int> | MustTotallyOverlap |
+| ssa.c:14:15:14:25 | foo_swapped | ssa.c:14:15:14:25 | foo_swapped[4..8)<int> | MustTotallyOverlap |
+| ssa.c:14:15:14:25 | foo_swapped[0..4)<int> | ssa.c:14:15:14:25 | foo_swapped | MayPartiallyOverlap |
+| ssa.c:14:15:14:25 | foo_swapped[0..4)<int> | ssa.c:14:15:14:25 | foo_swapped[0..4)<int> | MustExactlyOverlap |
+| ssa.c:14:15:14:25 | foo_swapped[4..8)<int> | ssa.c:14:15:14:25 | foo_swapped | MayPartiallyOverlap |
+| ssa.c:14:15:14:25 | foo_swapped[4..8)<int> | ssa.c:14:15:14:25 | foo_swapped[4..8)<int> | MustExactlyOverlap |
+| ssa.c:18:7:18:7 | x | ssa.c:18:7:18:7 | x | MustExactlyOverlap |
+| ssa.c:18:7:18:7 | x | ssa.c:18:7:18:7 | x[0..4)<int> | MustTotallyOverlap |
+| ssa.c:18:7:18:7 | x | ssa.c:18:7:18:7 | x[4..8)<int> | MustTotallyOverlap |
+| ssa.c:18:7:18:7 | x[0..4)<int> | ssa.c:18:7:18:7 | x | MayPartiallyOverlap |
+| ssa.c:18:7:18:7 | x[0..4)<int> | ssa.c:18:7:18:7 | x[0..4)<int> | MustExactlyOverlap |
+| ssa.c:18:7:18:7 | x[4..8)<int> | ssa.c:18:7:18:7 | x | MayPartiallyOverlap |
+| ssa.c:18:7:18:7 | x[4..8)<int> | ssa.c:18:7:18:7 | x[4..8)<int> | MustExactlyOverlap |
+| ssa.c:20:7:20:7 | y | ssa.c:20:7:20:7 | y | MustExactlyOverlap |
+| ssa.c:20:7:20:7 | y | ssa.c:20:7:20:7 | y[0..4)<int> | MustTotallyOverlap |
+| ssa.c:20:7:20:7 | y | ssa.c:20:7:20:7 | y[4..8)<int> | MustTotallyOverlap |
+| ssa.c:20:7:20:7 | y[0..4)<int> | ssa.c:20:7:20:7 | y | MayPartiallyOverlap |
+| ssa.c:20:7:20:7 | y[0..4)<int> | ssa.c:20:7:20:7 | y[0..4)<int> | MustExactlyOverlap |
+| ssa.c:20:7:20:7 | y[4..8)<int> | ssa.c:20:7:20:7 | y | MayPartiallyOverlap |
+| ssa.c:20:7:20:7 | y[4..8)<int> | ssa.c:20:7:20:7 | y[4..8)<int> | MustExactlyOverlap |
+| ssa.c:29:28:29:28 | f | ssa.c:29:28:29:28 | f | MustExactlyOverlap |
+| ssa.c:29:28:29:28 | f | ssa.c:29:28:29:28 | f[0..4)<int> | MustTotallyOverlap |
+| ssa.c:29:28:29:28 | f | ssa.c:29:28:29:28 | f[4..8)<int> | MustTotallyOverlap |
+| ssa.c:29:28:29:28 | f | ssa.c:29:28:29:28 | f[8..12)<int> | MustTotallyOverlap |
+| ssa.c:29:28:29:28 | f[0..4)<int> | ssa.c:29:28:29:28 | f | MayPartiallyOverlap |
+| ssa.c:29:28:29:28 | f[0..4)<int> | ssa.c:29:28:29:28 | f[0..4)<int> | MustExactlyOverlap |
+| ssa.c:29:28:29:28 | f[4..8)<int> | ssa.c:29:28:29:28 | f | MayPartiallyOverlap |
+| ssa.c:29:28:29:28 | f[4..8)<int> | ssa.c:29:28:29:28 | f[4..8)<int> | MustExactlyOverlap |
+| ssa.c:29:28:29:28 | f[8..12)<int> | ssa.c:29:28:29:28 | f | MayPartiallyOverlap |
+| ssa.c:29:28:29:28 | f[8..12)<int> | ssa.c:29:28:29:28 | f[8..12)<int> | MustExactlyOverlap |
+| ssa.cpp:13:23:13:23 | *p | ssa.cpp:13:23:13:23 | *p | MustExactlyOverlap |
+| ssa.cpp:13:23:13:23 | *p | ssa.cpp:13:23:13:23 | *p[0..4)<int> | MustTotallyOverlap |
+| ssa.cpp:13:23:13:23 | *p | ssa.cpp:13:23:13:23 | *p[4..8)<int> | MustTotallyOverlap |
+| ssa.cpp:13:23:13:23 | *p | ssa.cpp:13:23:13:23 | ?*p | MustTotallyOverlap |
+| ssa.cpp:13:23:13:23 | *p[0..4)<int> | ssa.cpp:13:23:13:23 | *p | MayPartiallyOverlap |
+| ssa.cpp:13:23:13:23 | *p[0..4)<int> | ssa.cpp:13:23:13:23 | *p[0..4)<int> | MustExactlyOverlap |
+| ssa.cpp:13:23:13:23 | *p[0..4)<int> | ssa.cpp:13:23:13:23 | ?*p | MayPartiallyOverlap |
+| ssa.cpp:13:23:13:23 | *p[4..8)<int> | ssa.cpp:13:23:13:23 | *p | MayPartiallyOverlap |
+| ssa.cpp:13:23:13:23 | *p[4..8)<int> | ssa.cpp:13:23:13:23 | *p[4..8)<int> | MustExactlyOverlap |
+| ssa.cpp:13:23:13:23 | *p[4..8)<int> | ssa.cpp:13:23:13:23 | ?*p | MayPartiallyOverlap |
+| ssa.cpp:13:23:13:23 | ?*p | ssa.cpp:13:23:13:23 | *p | MayPartiallyOverlap |
+| ssa.cpp:13:23:13:23 | ?*p | ssa.cpp:13:23:13:23 | *p[0..4)<int> | MayPartiallyOverlap |
+| ssa.cpp:13:23:13:23 | ?*p | ssa.cpp:13:23:13:23 | *p[4..8)<int> | MayPartiallyOverlap |
+| ssa.cpp:13:23:13:23 | ?*p | ssa.cpp:13:23:13:23 | ?*p | MayPartiallyOverlap |
+| ssa.cpp:68:38:68:38 | *p | ssa.cpp:68:38:68:38 | *p | MustExactlyOverlap |
+| ssa.cpp:68:38:68:38 | *p | ssa.cpp:68:38:68:38 | *p[?..?)<char> | MustTotallyOverlap |
+| ssa.cpp:68:38:68:38 | *p | ssa.cpp:68:38:68:38 | ?*p | MustTotallyOverlap |
+| ssa.cpp:68:38:68:38 | *p[?..?)<char> | ssa.cpp:68:38:68:38 | *p | MayPartiallyOverlap |
+| ssa.cpp:68:38:68:38 | *p[?..?)<char> | ssa.cpp:68:38:68:38 | *p[?..?)<char> | MayPartiallyOverlap |
+| ssa.cpp:68:38:68:38 | *p[?..?)<char> | ssa.cpp:68:38:68:38 | ?*p | MayPartiallyOverlap |
+| ssa.cpp:68:38:68:38 | ?*p | ssa.cpp:68:38:68:38 | *p | MayPartiallyOverlap |
+| ssa.cpp:68:38:68:38 | ?*p | ssa.cpp:68:38:68:38 | *p[?..?)<char> | MayPartiallyOverlap |
+| ssa.cpp:68:38:68:38 | ?*p | ssa.cpp:68:38:68:38 | ?*p | MayPartiallyOverlap |
+| ssa.cpp:95:38:95:38 | ?a[0..?)<unknown> | ssa.cpp:95:38:95:38 | ?a[0..?)<unknown> | MayPartiallyOverlap |
+| ssa.cpp:95:38:95:38 | ?a[0..?)<unknown> | ssa.cpp:95:38:95:38 | a | MayPartiallyOverlap |
+| ssa.cpp:95:38:95:38 | ?a[0..?)<unknown> | ssa.cpp:95:38:95:38 | a[0..?)<unknown> | MayPartiallyOverlap |
+| ssa.cpp:95:38:95:38 | a | ssa.cpp:95:38:95:38 | ?a[0..?)<unknown> | MustTotallyOverlap |
+| ssa.cpp:95:38:95:38 | a | ssa.cpp:95:38:95:38 | a | MustExactlyOverlap |
+| ssa.cpp:95:38:95:38 | a | ssa.cpp:95:38:95:38 | a[0..?)<unknown> | MustTotallyOverlap |
+| ssa.cpp:95:38:95:38 | a[0..?)<unknown> | ssa.cpp:95:38:95:38 | ?a[0..?)<unknown> | MayPartiallyOverlap |
+| ssa.cpp:95:38:95:38 | a[0..?)<unknown> | ssa.cpp:95:38:95:38 | a | MayPartiallyOverlap |
+| ssa.cpp:95:38:95:38 | a[0..?)<unknown> | ssa.cpp:95:38:95:38 | a[0..?)<unknown> | MayPartiallyOverlap |
+| ssa.cpp:100:31:100:31 | a | ssa.cpp:100:31:100:31 | a | MustExactlyOverlap |
+| ssa.cpp:100:31:100:31 | a | ssa.cpp:100:31:100:31 | a[0..4)<int> | MustTotallyOverlap |
+| ssa.cpp:100:31:100:31 | a | ssa.cpp:100:31:100:31 | a[4..8)<int> | MustTotallyOverlap |
+| ssa.cpp:100:31:100:31 | a[0..4)<int> | ssa.cpp:100:31:100:31 | a | MayPartiallyOverlap |
+| ssa.cpp:100:31:100:31 | a[0..4)<int> | ssa.cpp:100:31:100:31 | a[0..4)<int> | MustExactlyOverlap |
+| ssa.cpp:100:31:100:31 | a[4..8)<int> | ssa.cpp:100:31:100:31 | a | MayPartiallyOverlap |
+| ssa.cpp:100:31:100:31 | a[4..8)<int> | ssa.cpp:100:31:100:31 | a[4..8)<int> | MustExactlyOverlap |
+| ssa.cpp:105:38:105:38 | ?a[0..?)<unknown> | ssa.cpp:105:38:105:38 | ?a[0..?)<unknown> | MayPartiallyOverlap |
+| ssa.cpp:105:38:105:38 | ?a[0..?)<unknown> | ssa.cpp:105:38:105:38 | a | MayPartiallyOverlap |
+| ssa.cpp:105:38:105:38 | ?a[0..?)<unknown> | ssa.cpp:105:38:105:38 | a[0..4)<int> | MayPartiallyOverlap |
+| ssa.cpp:105:38:105:38 | ?a[0..?)<unknown> | ssa.cpp:105:38:105:38 | a[0..?)<unknown> | MayPartiallyOverlap |
+| ssa.cpp:105:38:105:38 | ?a[0..?)<unknown> | ssa.cpp:105:38:105:38 | a[4..8)<int> | MayPartiallyOverlap |
+| ssa.cpp:105:38:105:38 | a | ssa.cpp:105:38:105:38 | ?a[0..?)<unknown> | MustTotallyOverlap |
+| ssa.cpp:105:38:105:38 | a | ssa.cpp:105:38:105:38 | a | MustExactlyOverlap |
+| ssa.cpp:105:38:105:38 | a | ssa.cpp:105:38:105:38 | a[0..4)<int> | MustTotallyOverlap |
+| ssa.cpp:105:38:105:38 | a | ssa.cpp:105:38:105:38 | a[0..?)<unknown> | MustTotallyOverlap |
+| ssa.cpp:105:38:105:38 | a | ssa.cpp:105:38:105:38 | a[4..8)<int> | MustTotallyOverlap |
+| ssa.cpp:105:38:105:38 | a[0..4)<int> | ssa.cpp:105:38:105:38 | ?a[0..?)<unknown> | MayPartiallyOverlap |
+| ssa.cpp:105:38:105:38 | a[0..4)<int> | ssa.cpp:105:38:105:38 | a | MayPartiallyOverlap |
+| ssa.cpp:105:38:105:38 | a[0..4)<int> | ssa.cpp:105:38:105:38 | a[0..4)<int> | MustExactlyOverlap |
+| ssa.cpp:105:38:105:38 | a[0..4)<int> | ssa.cpp:105:38:105:38 | a[0..?)<unknown> | MayPartiallyOverlap |
+| ssa.cpp:105:38:105:38 | a[0..?)<unknown> | ssa.cpp:105:38:105:38 | ?a[0..?)<unknown> | MayPartiallyOverlap |
+| ssa.cpp:105:38:105:38 | a[0..?)<unknown> | ssa.cpp:105:38:105:38 | a | MayPartiallyOverlap |
+| ssa.cpp:105:38:105:38 | a[0..?)<unknown> | ssa.cpp:105:38:105:38 | a[0..4)<int> | MayPartiallyOverlap |
+| ssa.cpp:105:38:105:38 | a[0..?)<unknown> | ssa.cpp:105:38:105:38 | a[0..?)<unknown> | MayPartiallyOverlap |
+| ssa.cpp:105:38:105:38 | a[0..?)<unknown> | ssa.cpp:105:38:105:38 | a[4..8)<int> | MayPartiallyOverlap |
+| ssa.cpp:105:38:105:38 | a[4..8)<int> | ssa.cpp:105:38:105:38 | ?a[0..?)<unknown> | MayPartiallyOverlap |
+| ssa.cpp:105:38:105:38 | a[4..8)<int> | ssa.cpp:105:38:105:38 | a | MayPartiallyOverlap |
+| ssa.cpp:105:38:105:38 | a[4..8)<int> | ssa.cpp:105:38:105:38 | a[0..?)<unknown> | MayPartiallyOverlap |
+| ssa.cpp:105:38:105:38 | a[4..8)<int> | ssa.cpp:105:38:105:38 | a[4..8)<int> | MustExactlyOverlap |
+| ssa.cpp:112:9:112:9 | a | ssa.cpp:112:9:112:9 | a | MustExactlyOverlap |
+| ssa.cpp:112:9:112:9 | a | ssa.cpp:112:9:112:9 | a[0..4)<int> | MustTotallyOverlap |
+| ssa.cpp:112:9:112:9 | a | ssa.cpp:112:9:112:9 | a[4..8)<int> | MustTotallyOverlap |
+| ssa.cpp:112:9:112:9 | a[0..4)<int> | ssa.cpp:112:9:112:9 | a | MayPartiallyOverlap |
+| ssa.cpp:112:9:112:9 | a[0..4)<int> | ssa.cpp:112:9:112:9 | a[0..4)<int> | MustExactlyOverlap |
+| ssa.cpp:112:9:112:9 | a[4..8)<int> | ssa.cpp:112:9:112:9 | a | MayPartiallyOverlap |
+| ssa.cpp:112:9:112:9 | a[4..8)<int> | ssa.cpp:112:9:112:9 | a[4..8)<int> | MustExactlyOverlap |
+| ssa.cpp:117:9:117:9 | ?a[0..?)<unknown> | ssa.cpp:117:9:117:9 | ?a[0..?)<unknown> | MayPartiallyOverlap |
+| ssa.cpp:117:9:117:9 | ?a[0..?)<unknown> | ssa.cpp:117:9:117:9 | a | MayPartiallyOverlap |
+| ssa.cpp:117:9:117:9 | ?a[0..?)<unknown> | ssa.cpp:117:9:117:9 | a[0..4)<int> | MayPartiallyOverlap |
+| ssa.cpp:117:9:117:9 | ?a[0..?)<unknown> | ssa.cpp:117:9:117:9 | a[0..?)<unknown> | MayPartiallyOverlap |
+| ssa.cpp:117:9:117:9 | ?a[0..?)<unknown> | ssa.cpp:117:9:117:9 | a[4..8)<int> | MayPartiallyOverlap |
+| ssa.cpp:117:9:117:9 | a | ssa.cpp:117:9:117:9 | ?a[0..?)<unknown> | MustTotallyOverlap |
+| ssa.cpp:117:9:117:9 | a | ssa.cpp:117:9:117:9 | a | MustExactlyOverlap |
+| ssa.cpp:117:9:117:9 | a | ssa.cpp:117:9:117:9 | a[0..4)<int> | MustTotallyOverlap |
+| ssa.cpp:117:9:117:9 | a | ssa.cpp:117:9:117:9 | a[0..?)<unknown> | MustTotallyOverlap |
+| ssa.cpp:117:9:117:9 | a | ssa.cpp:117:9:117:9 | a[4..8)<int> | MustTotallyOverlap |
+| ssa.cpp:117:9:117:9 | a[0..4)<int> | ssa.cpp:117:9:117:9 | ?a[0..?)<unknown> | MayPartiallyOverlap |
+| ssa.cpp:117:9:117:9 | a[0..4)<int> | ssa.cpp:117:9:117:9 | a | MayPartiallyOverlap |
+| ssa.cpp:117:9:117:9 | a[0..4)<int> | ssa.cpp:117:9:117:9 | a[0..4)<int> | MustExactlyOverlap |
+| ssa.cpp:117:9:117:9 | a[0..4)<int> | ssa.cpp:117:9:117:9 | a[0..?)<unknown> | MayPartiallyOverlap |
+| ssa.cpp:117:9:117:9 | a[0..?)<unknown> | ssa.cpp:117:9:117:9 | ?a[0..?)<unknown> | MayPartiallyOverlap |
+| ssa.cpp:117:9:117:9 | a[0..?)<unknown> | ssa.cpp:117:9:117:9 | a | MayPartiallyOverlap |
+| ssa.cpp:117:9:117:9 | a[0..?)<unknown> | ssa.cpp:117:9:117:9 | a[0..4)<int> | MayPartiallyOverlap |
+| ssa.cpp:117:9:117:9 | a[0..?)<unknown> | ssa.cpp:117:9:117:9 | a[0..?)<unknown> | MayPartiallyOverlap |
+| ssa.cpp:117:9:117:9 | a[0..?)<unknown> | ssa.cpp:117:9:117:9 | a[4..8)<int> | MayPartiallyOverlap |
+| ssa.cpp:117:9:117:9 | a[4..8)<int> | ssa.cpp:117:9:117:9 | ?a[0..?)<unknown> | MayPartiallyOverlap |
+| ssa.cpp:117:9:117:9 | a[4..8)<int> | ssa.cpp:117:9:117:9 | a | MayPartiallyOverlap |
+| ssa.cpp:117:9:117:9 | a[4..8)<int> | ssa.cpp:117:9:117:9 | a[0..?)<unknown> | MayPartiallyOverlap |
+| ssa.cpp:117:9:117:9 | a[4..8)<int> | ssa.cpp:117:9:117:9 | a[4..8)<int> | MustExactlyOverlap |
+| ssa.cpp:123:9:123:9 | a | ssa.cpp:123:9:123:9 | a | MustExactlyOverlap |
+| ssa.cpp:123:9:123:9 | a | ssa.cpp:123:9:123:9 | a[0..4)<int> | MustTotallyOverlap |
+| ssa.cpp:123:9:123:9 | a | ssa.cpp:123:9:123:9 | a[4..8)<int> | MustTotallyOverlap |
+| ssa.cpp:123:9:123:9 | a[0..4)<int> | ssa.cpp:123:9:123:9 | a | MayPartiallyOverlap |
+| ssa.cpp:123:9:123:9 | a[0..4)<int> | ssa.cpp:123:9:123:9 | a[0..4)<int> | MustExactlyOverlap |
+| ssa.cpp:123:9:123:9 | a[4..8)<int> | ssa.cpp:123:9:123:9 | a | MayPartiallyOverlap |
+| ssa.cpp:123:9:123:9 | a[4..8)<int> | ssa.cpp:123:9:123:9 | a[4..8)<int> | MustExactlyOverlap |
+| ssa.cpp:135:9:135:9 | a | ssa.cpp:135:9:135:9 | a | MustExactlyOverlap |
+| ssa.cpp:135:9:135:9 | a | ssa.cpp:135:9:135:9 | a[0..4)<int> | MustTotallyOverlap |
+| ssa.cpp:135:9:135:9 | a | ssa.cpp:135:9:135:9 | a[4..8)<int> | MustTotallyOverlap |
+| ssa.cpp:135:9:135:9 | a[0..4)<int> | ssa.cpp:135:9:135:9 | a | MayPartiallyOverlap |
+| ssa.cpp:135:9:135:9 | a[0..4)<int> | ssa.cpp:135:9:135:9 | a[0..4)<int> | MustExactlyOverlap |
+| ssa.cpp:135:9:135:9 | a[4..8)<int> | ssa.cpp:135:9:135:9 | a | MayPartiallyOverlap |
+| ssa.cpp:135:9:135:9 | a[4..8)<int> | ssa.cpp:135:9:135:9 | a[4..8)<int> | MustExactlyOverlap |
+| ssa.cpp:146:9:146:9 | a | ssa.cpp:146:9:146:9 | a | MustExactlyOverlap |
+| ssa.cpp:146:9:146:9 | a | ssa.cpp:146:9:146:9 | a[0..4)<int> | MustTotallyOverlap |
+| ssa.cpp:146:9:146:9 | a | ssa.cpp:146:9:146:9 | a[4..8)<int> | MustTotallyOverlap |
+| ssa.cpp:146:9:146:9 | a[0..4)<int> | ssa.cpp:146:9:146:9 | a | MayPartiallyOverlap |
+| ssa.cpp:146:9:146:9 | a[0..4)<int> | ssa.cpp:146:9:146:9 | a[0..4)<int> | MustExactlyOverlap |
+| ssa.cpp:146:9:146:9 | a[4..8)<int> | ssa.cpp:146:9:146:9 | a | MayPartiallyOverlap |
+| ssa.cpp:146:9:146:9 | a[4..8)<int> | ssa.cpp:146:9:146:9 | a[4..8)<int> | MustExactlyOverlap |
+| ssa.cpp:157:8:157:8 | a | ssa.cpp:157:8:157:8 | a | MustExactlyOverlap |
+| ssa.cpp:157:8:157:8 | a | ssa.cpp:157:8:157:8 | a[0..4)<int> | MustTotallyOverlap |
+| ssa.cpp:157:8:157:8 | a | ssa.cpp:157:8:157:8 | a[0..8)<Point> | MustTotallyOverlap |
+| ssa.cpp:157:8:157:8 | a | ssa.cpp:157:8:157:8 | a[8..16)<Point> | MustTotallyOverlap |
+| ssa.cpp:157:8:157:8 | a[0..4)<int> | ssa.cpp:157:8:157:8 | a | MayPartiallyOverlap |
+| ssa.cpp:157:8:157:8 | a[0..4)<int> | ssa.cpp:157:8:157:8 | a[0..4)<int> | MustExactlyOverlap |
+| ssa.cpp:157:8:157:8 | a[0..4)<int> | ssa.cpp:157:8:157:8 | a[0..8)<Point> | MayPartiallyOverlap |
+| ssa.cpp:157:8:157:8 | a[0..8)<Point> | ssa.cpp:157:8:157:8 | a | MayPartiallyOverlap |
+| ssa.cpp:157:8:157:8 | a[0..8)<Point> | ssa.cpp:157:8:157:8 | a[0..4)<int> | MustTotallyOverlap |
+| ssa.cpp:157:8:157:8 | a[0..8)<Point> | ssa.cpp:157:8:157:8 | a[0..8)<Point> | MustExactlyOverlap |
+| ssa.cpp:157:8:157:8 | a[8..16)<Point> | ssa.cpp:157:8:157:8 | a | MayPartiallyOverlap |
+| ssa.cpp:157:8:157:8 | a[8..16)<Point> | ssa.cpp:157:8:157:8 | a[8..16)<Point> | MustExactlyOverlap |
+| ssa.cpp:171:28:171:28 | w | ssa.cpp:171:28:171:28 | w | MustExactlyOverlap |
+| ssa.cpp:171:28:171:28 | w | ssa.cpp:171:28:171:28 | w<int> | MustTotallyOverlap |
+| ssa.cpp:171:28:171:28 | w<int> | ssa.cpp:171:28:171:28 | w | MustTotallyOverlap |
+| ssa.cpp:171:28:171:28 | w<int> | ssa.cpp:171:28:171:28 | w<int> | MustExactlyOverlap |
+| ssa.cpp:179:18:179:18 | *p | ssa.cpp:179:18:179:18 | *p | MustExactlyOverlap |
+| ssa.cpp:179:18:179:18 | *p | ssa.cpp:179:18:179:18 | *p[0..4)<int> | MustTotallyOverlap |
+| ssa.cpp:179:18:179:18 | *p | ssa.cpp:179:18:179:18 | ?*p | MustTotallyOverlap |
+| ssa.cpp:179:18:179:18 | *p[0..4)<int> | ssa.cpp:179:18:179:18 | *p | MayPartiallyOverlap |
+| ssa.cpp:179:18:179:18 | *p[0..4)<int> | ssa.cpp:179:18:179:18 | *p[0..4)<int> | MustExactlyOverlap |
+| ssa.cpp:179:18:179:18 | *p[0..4)<int> | ssa.cpp:179:18:179:18 | ?*p | MayPartiallyOverlap |
+| ssa.cpp:179:18:179:18 | ?*p | ssa.cpp:179:18:179:18 | *p | MayPartiallyOverlap |
+| ssa.cpp:179:18:179:18 | ?*p | ssa.cpp:179:18:179:18 | *p[0..4)<int> | MayPartiallyOverlap |
+| ssa.cpp:179:18:179:18 | ?*p | ssa.cpp:179:18:179:18 | ?*p | MayPartiallyOverlap |
+| ssa.cpp:184:46:184:46 | *a | ssa.cpp:184:46:184:46 | *a | MustExactlyOverlap |
+| ssa.cpp:184:46:184:46 | *a | ssa.cpp:184:46:184:46 | ?*a | MustTotallyOverlap |
+| ssa.cpp:184:46:184:46 | ?*a | ssa.cpp:184:46:184:46 | *a | MayPartiallyOverlap |
+| ssa.cpp:184:46:184:46 | ?*a | ssa.cpp:184:46:184:46 | ?*a | MayPartiallyOverlap |
+| ssa.cpp:184:63:184:63 | *b | ssa.cpp:184:63:184:63 | *b | MustExactlyOverlap |
+| ssa.cpp:184:63:184:63 | *b | ssa.cpp:184:63:184:63 | ?*b | MustTotallyOverlap |
+| ssa.cpp:184:63:184:63 | ?*b | ssa.cpp:184:63:184:63 | *b | MayPartiallyOverlap |
+| ssa.cpp:184:63:184:63 | ?*b | ssa.cpp:184:63:184:63 | ?*b | MayPartiallyOverlap |
+| ssa.cpp:184:80:184:80 | *c | ssa.cpp:184:80:184:80 | *c | MustExactlyOverlap |
+| ssa.cpp:184:80:184:80 | *c | ssa.cpp:184:80:184:80 | *c[0..4)<unsigned int> | MustTotallyOverlap |
+| ssa.cpp:184:80:184:80 | *c | ssa.cpp:184:80:184:80 | ?*c | MustTotallyOverlap |
+| ssa.cpp:184:80:184:80 | *c[0..4)<unsigned int> | ssa.cpp:184:80:184:80 | *c | MayPartiallyOverlap |
+| ssa.cpp:184:80:184:80 | *c[0..4)<unsigned int> | ssa.cpp:184:80:184:80 | *c[0..4)<unsigned int> | MustExactlyOverlap |
+| ssa.cpp:184:80:184:80 | *c[0..4)<unsigned int> | ssa.cpp:184:80:184:80 | ?*c | MayPartiallyOverlap |
+| ssa.cpp:184:80:184:80 | ?*c | ssa.cpp:184:80:184:80 | *c | MayPartiallyOverlap |
+| ssa.cpp:184:80:184:80 | ?*c | ssa.cpp:184:80:184:80 | *c[0..4)<unsigned int> | MayPartiallyOverlap |
+| ssa.cpp:184:80:184:80 | ?*c | ssa.cpp:184:80:184:80 | ?*c | MayPartiallyOverlap |
+| ssa.cpp:184:97:184:97 | *d | ssa.cpp:184:97:184:97 | *d | MustExactlyOverlap |
+| ssa.cpp:184:97:184:97 | *d | ssa.cpp:184:97:184:97 | *d[0..4)<unsigned int> | MustTotallyOverlap |
+| ssa.cpp:184:97:184:97 | *d | ssa.cpp:184:97:184:97 | ?*d | MustTotallyOverlap |
+| ssa.cpp:184:97:184:97 | *d[0..4)<unsigned int> | ssa.cpp:184:97:184:97 | *d | MayPartiallyOverlap |
+| ssa.cpp:184:97:184:97 | *d[0..4)<unsigned int> | ssa.cpp:184:97:184:97 | *d[0..4)<unsigned int> | MustExactlyOverlap |
+| ssa.cpp:184:97:184:97 | *d[0..4)<unsigned int> | ssa.cpp:184:97:184:97 | ?*d | MayPartiallyOverlap |
+| ssa.cpp:184:97:184:97 | ?*d | ssa.cpp:184:97:184:97 | *d | MayPartiallyOverlap |
+| ssa.cpp:184:97:184:97 | ?*d | ssa.cpp:184:97:184:97 | *d[0..4)<unsigned int> | MayPartiallyOverlap |
+| ssa.cpp:184:97:184:97 | ?*d | ssa.cpp:184:97:184:97 | ?*d | MayPartiallyOverlap |
+| ssa.cpp:198:25:198:28 | *str1 | ssa.cpp:198:25:198:28 | *str1 | MustExactlyOverlap |
+| ssa.cpp:198:25:198:28 | *str1 | ssa.cpp:198:25:198:28 | *str1[0..?)<unknown> | MustTotallyOverlap |
+| ssa.cpp:198:25:198:28 | *str1 | ssa.cpp:198:25:198:28 | ?*str1 | MustTotallyOverlap |
+| ssa.cpp:198:25:198:28 | *str1[0..?)<unknown> | ssa.cpp:198:25:198:28 | *str1 | MayPartiallyOverlap |
+| ssa.cpp:198:25:198:28 | *str1[0..?)<unknown> | ssa.cpp:198:25:198:28 | *str1[0..?)<unknown> | MayPartiallyOverlap |
+| ssa.cpp:198:25:198:28 | *str1[0..?)<unknown> | ssa.cpp:198:25:198:28 | ?*str1 | MayPartiallyOverlap |
+| ssa.cpp:198:25:198:28 | ?*str1 | ssa.cpp:198:25:198:28 | *str1 | MayPartiallyOverlap |
+| ssa.cpp:198:25:198:28 | ?*str1 | ssa.cpp:198:25:198:28 | *str1[0..?)<unknown> | MayPartiallyOverlap |
+| ssa.cpp:198:25:198:28 | ?*str1 | ssa.cpp:198:25:198:28 | ?*str1 | MayPartiallyOverlap |
+| ssa.cpp:198:37:198:40 | *str2 | ssa.cpp:198:37:198:40 | *str2 | MustExactlyOverlap |
+| ssa.cpp:198:37:198:40 | *str2 | ssa.cpp:198:37:198:40 | *str2[0..?)<unknown> | MustTotallyOverlap |
+| ssa.cpp:198:37:198:40 | *str2 | ssa.cpp:198:37:198:40 | ?*str2 | MustTotallyOverlap |
+| ssa.cpp:198:37:198:40 | *str2[0..?)<unknown> | ssa.cpp:198:37:198:40 | *str2 | MayPartiallyOverlap |
+| ssa.cpp:198:37:198:40 | *str2[0..?)<unknown> | ssa.cpp:198:37:198:40 | *str2[0..?)<unknown> | MayPartiallyOverlap |
+| ssa.cpp:198:37:198:40 | *str2[0..?)<unknown> | ssa.cpp:198:37:198:40 | ?*str2 | MayPartiallyOverlap |
+| ssa.cpp:198:37:198:40 | ?*str2 | ssa.cpp:198:37:198:40 | *str2 | MayPartiallyOverlap |
+| ssa.cpp:198:37:198:40 | ?*str2 | ssa.cpp:198:37:198:40 | *str2[0..?)<unknown> | MayPartiallyOverlap |
+| ssa.cpp:198:37:198:40 | ?*str2 | ssa.cpp:198:37:198:40 | ?*str2 | MayPartiallyOverlap |
+| ssa.cpp:207:27:207:27 | x | ssa.cpp:207:27:207:27 | x | MustExactlyOverlap |
+| ssa.cpp:207:27:207:27 | x | ssa.cpp:207:27:207:27 | x[0..?)<unknown> | MustTotallyOverlap |
+| ssa.cpp:207:27:207:27 | x[0..?)<unknown> | ssa.cpp:207:27:207:27 | x | MayPartiallyOverlap |
+| ssa.cpp:207:27:207:27 | x[0..?)<unknown> | ssa.cpp:207:27:207:27 | x[0..?)<unknown> | MayPartiallyOverlap |
+| ssa.cpp:208:7:208:7 | y | ssa.cpp:208:7:208:7 | y | MustExactlyOverlap |
+| ssa.cpp:208:7:208:7 | y | ssa.cpp:208:7:208:7 | y[0..?)<unknown> | MustTotallyOverlap |
+| ssa.cpp:208:7:208:7 | y[0..?)<unknown> | ssa.cpp:208:7:208:7 | y | MayPartiallyOverlap |
+| ssa.cpp:208:7:208:7 | y[0..?)<unknown> | ssa.cpp:208:7:208:7 | y[0..?)<unknown> | MayPartiallyOverlap |
+| ssa.cpp:218:10:218:10 | c | ssa.cpp:218:10:218:10 | c | MustExactlyOverlap |
+| ssa.cpp:218:10:218:10 | c | ssa.cpp:218:10:218:10 | c<unknown[2]> | MustTotallyOverlap |
+| ssa.cpp:218:10:218:10 | c<unknown[2]> | ssa.cpp:218:10:218:10 | c | MustTotallyOverlap |
+| ssa.cpp:218:10:218:10 | c<unknown[2]> | ssa.cpp:218:10:218:10 | c<unknown[2]> | MustExactlyOverlap |
+| ssa.cpp:219:10:219:10 | d | ssa.cpp:219:10:219:10 | d | MustExactlyOverlap |
+| ssa.cpp:219:10:219:10 | d | ssa.cpp:219:10:219:10 | d[0..1)<char> | MustTotallyOverlap |
+| ssa.cpp:219:10:219:10 | d | ssa.cpp:219:10:219:10 | d[1..2)<char> | MustTotallyOverlap |
+| ssa.cpp:219:10:219:10 | d[0..1)<char> | ssa.cpp:219:10:219:10 | d | MayPartiallyOverlap |
+| ssa.cpp:219:10:219:10 | d[0..1)<char> | ssa.cpp:219:10:219:10 | d[0..1)<char> | MustExactlyOverlap |
+| ssa.cpp:219:10:219:10 | d[1..2)<char> | ssa.cpp:219:10:219:10 | d | MayPartiallyOverlap |
+| ssa.cpp:219:10:219:10 | d[1..2)<char> | ssa.cpp:219:10:219:10 | d[1..2)<char> | MustExactlyOverlap |
+| ssa.cpp:220:10:220:10 | e | ssa.cpp:220:10:220:10 | e | MustExactlyOverlap |
+| ssa.cpp:220:10:220:10 | e | ssa.cpp:220:10:220:10 | e[0..1)<char> | MustTotallyOverlap |
+| ssa.cpp:220:10:220:10 | e | ssa.cpp:220:10:220:10 | e[1..2)<char> | MustTotallyOverlap |
+| ssa.cpp:220:10:220:10 | e[0..1)<char> | ssa.cpp:220:10:220:10 | e | MayPartiallyOverlap |
+| ssa.cpp:220:10:220:10 | e[0..1)<char> | ssa.cpp:220:10:220:10 | e[0..1)<char> | MustExactlyOverlap |
+| ssa.cpp:220:10:220:10 | e[1..2)<char> | ssa.cpp:220:10:220:10 | e | MayPartiallyOverlap |
+| ssa.cpp:220:10:220:10 | e[1..2)<char> | ssa.cpp:220:10:220:10 | e[1..2)<char> | MustExactlyOverlap |
+| ssa.cpp:221:10:221:10 | f | ssa.cpp:221:10:221:10 | f | MustExactlyOverlap |
+| ssa.cpp:221:10:221:10 | f | ssa.cpp:221:10:221:10 | f[0..1)<char> | MustTotallyOverlap |
+| ssa.cpp:221:10:221:10 | f | ssa.cpp:221:10:221:10 | f[1..3)<unknown[2]> | MustTotallyOverlap |
+| ssa.cpp:221:10:221:10 | f[0..1)<char> | ssa.cpp:221:10:221:10 | f | MayPartiallyOverlap |
+| ssa.cpp:221:10:221:10 | f[0..1)<char> | ssa.cpp:221:10:221:10 | f[0..1)<char> | MustExactlyOverlap |
+| ssa.cpp:221:10:221:10 | f[1..3)<unknown[2]> | ssa.cpp:221:10:221:10 | f | MayPartiallyOverlap |
+| ssa.cpp:221:10:221:10 | f[1..3)<unknown[2]> | ssa.cpp:221:10:221:10 | f[1..3)<unknown[2]> | MustExactlyOverlap |
+| ssa.cpp:235:5:235:17 | *#this | ssa.cpp:235:5:235:17 | *#this | MustExactlyOverlap |
+| ssa.cpp:235:5:235:17 | *#this | ssa.cpp:235:5:235:17 | ?*#this | MustTotallyOverlap |
+| ssa.cpp:235:5:235:17 | ?*#this | ssa.cpp:235:5:235:17 | *#this | MayPartiallyOverlap |
+| ssa.cpp:235:5:235:17 | ?*#this | ssa.cpp:235:5:235:17 | ?*#this | MayPartiallyOverlap |
+| ssa.cpp:236:10:236:10 | *#this | ssa.cpp:236:10:236:10 | *#this | MustExactlyOverlap |
+| ssa.cpp:236:10:236:10 | *#this | ssa.cpp:236:10:236:10 | ?*#this | MustTotallyOverlap |
+| ssa.cpp:236:10:236:10 | ?*#this | ssa.cpp:236:10:236:10 | *#this | MayPartiallyOverlap |
+| ssa.cpp:236:10:236:10 | ?*#this | ssa.cpp:236:10:236:10 | ?*#this | MayPartiallyOverlap |
+| ssa.cpp:240:17:240:17 | ?c | ssa.cpp:240:17:240:17 | ?c | MayPartiallyOverlap |
+| ssa.cpp:240:17:240:17 | ?c | ssa.cpp:240:17:240:17 | c | MayPartiallyOverlap |
+| ssa.cpp:240:17:240:17 | c | ssa.cpp:240:17:240:17 | ?c | MustTotallyOverlap |
+| ssa.cpp:240:17:240:17 | c | ssa.cpp:240:17:240:17 | c | MustExactlyOverlap |
+| ssa.cpp:243:17:243:18 | ?c2 | ssa.cpp:243:17:243:18 | ?c2 | MayPartiallyOverlap |
+| ssa.cpp:243:17:243:18 | ?c2 | ssa.cpp:243:17:243:18 | c2 | MayPartiallyOverlap |
+| ssa.cpp:243:17:243:18 | c2 | ssa.cpp:243:17:243:18 | ?c2 | MustTotallyOverlap |
+| ssa.cpp:243:17:243:18 | c2 | ssa.cpp:243:17:243:18 | c2 | MustExactlyOverlap |
+| ssa.cpp:247:40:247:42 | *src | ssa.cpp:247:40:247:42 | *src | MustExactlyOverlap |
+| ssa.cpp:247:40:247:42 | *src | ssa.cpp:247:40:247:42 | *src[0..1)<char> | MustTotallyOverlap |
+| ssa.cpp:247:40:247:42 | *src | ssa.cpp:247:40:247:42 | *src[0..?)<unknown> | MustTotallyOverlap |
+| ssa.cpp:247:40:247:42 | *src | ssa.cpp:247:40:247:42 | ?*src | MustTotallyOverlap |
+| ssa.cpp:247:40:247:42 | *src[0..1)<char> | ssa.cpp:247:40:247:42 | *src | MayPartiallyOverlap |
+| ssa.cpp:247:40:247:42 | *src[0..1)<char> | ssa.cpp:247:40:247:42 | *src[0..1)<char> | MustExactlyOverlap |
+| ssa.cpp:247:40:247:42 | *src[0..1)<char> | ssa.cpp:247:40:247:42 | *src[0..?)<unknown> | MayPartiallyOverlap |
+| ssa.cpp:247:40:247:42 | *src[0..1)<char> | ssa.cpp:247:40:247:42 | ?*src | MayPartiallyOverlap |
+| ssa.cpp:247:40:247:42 | *src[0..?)<unknown> | ssa.cpp:247:40:247:42 | *src | MayPartiallyOverlap |
+| ssa.cpp:247:40:247:42 | *src[0..?)<unknown> | ssa.cpp:247:40:247:42 | *src[0..1)<char> | MayPartiallyOverlap |
+| ssa.cpp:247:40:247:42 | *src[0..?)<unknown> | ssa.cpp:247:40:247:42 | *src[0..?)<unknown> | MayPartiallyOverlap |
+| ssa.cpp:247:40:247:42 | *src[0..?)<unknown> | ssa.cpp:247:40:247:42 | ?*src | MayPartiallyOverlap |
+| ssa.cpp:247:40:247:42 | ?*src | ssa.cpp:247:40:247:42 | *src | MayPartiallyOverlap |
+| ssa.cpp:247:40:247:42 | ?*src | ssa.cpp:247:40:247:42 | *src[0..1)<char> | MayPartiallyOverlap |
+| ssa.cpp:247:40:247:42 | ?*src | ssa.cpp:247:40:247:42 | *src[0..?)<unknown> | MayPartiallyOverlap |
+| ssa.cpp:247:40:247:42 | ?*src | ssa.cpp:247:40:247:42 | ?*src | MayPartiallyOverlap |
+| ssa.cpp:248:15:248:28 | ?dynamic{1} | ssa.cpp:248:15:248:28 | ?dynamic{1} | MayPartiallyOverlap |
+| ssa.cpp:248:15:248:28 | ?dynamic{1} | ssa.cpp:248:15:248:28 | dynamic{1} | MayPartiallyOverlap |
+| ssa.cpp:248:15:248:28 | ?dynamic{1} | ssa.cpp:248:15:248:28 | dynamic{1}[0..?)<unknown> | MayPartiallyOverlap |
+| ssa.cpp:248:15:248:28 | dynamic{1} | ssa.cpp:248:15:248:28 | ?dynamic{1} | MustTotallyOverlap |
+| ssa.cpp:248:15:248:28 | dynamic{1} | ssa.cpp:248:15:248:28 | dynamic{1} | MustExactlyOverlap |
+| ssa.cpp:248:15:248:28 | dynamic{1} | ssa.cpp:248:15:248:28 | dynamic{1}[0..?)<unknown> | MustTotallyOverlap |
+| ssa.cpp:248:15:248:28 | dynamic{1}[0..?)<unknown> | ssa.cpp:248:15:248:28 | ?dynamic{1} | MayPartiallyOverlap |
+| ssa.cpp:248:15:248:28 | dynamic{1}[0..?)<unknown> | ssa.cpp:248:15:248:28 | dynamic{1} | MayPartiallyOverlap |
+| ssa.cpp:248:15:248:28 | dynamic{1}[0..?)<unknown> | ssa.cpp:248:15:248:28 | dynamic{1}[0..?)<unknown> | MayPartiallyOverlap |
+| ssa.cpp:268:28:268:28 | *s | ssa.cpp:268:28:268:28 | *s | MustExactlyOverlap |
+| ssa.cpp:268:28:268:28 | *s | ssa.cpp:268:28:268:28 | *s[0..?)<unknown> | MustTotallyOverlap |
+| ssa.cpp:268:28:268:28 | *s | ssa.cpp:268:28:268:28 | ?*s | MustTotallyOverlap |
+| ssa.cpp:268:28:268:28 | *s[0..?)<unknown> | ssa.cpp:268:28:268:28 | *s | MayPartiallyOverlap |
+| ssa.cpp:268:28:268:28 | *s[0..?)<unknown> | ssa.cpp:268:28:268:28 | *s[0..?)<unknown> | MayPartiallyOverlap |
+| ssa.cpp:268:28:268:28 | *s[0..?)<unknown> | ssa.cpp:268:28:268:28 | ?*s | MayPartiallyOverlap |
+| ssa.cpp:268:28:268:28 | ?*s | ssa.cpp:268:28:268:28 | *s | MayPartiallyOverlap |
+| ssa.cpp:268:28:268:28 | ?*s | ssa.cpp:268:28:268:28 | *s[0..?)<unknown> | MayPartiallyOverlap |
+| ssa.cpp:268:28:268:28 | ?*s | ssa.cpp:268:28:268:28 | ?*s | MayPartiallyOverlap |
+| ssa.cpp:269:15:269:20 | ?dynamic{1} | ssa.cpp:269:15:269:20 | ?dynamic{1} | MayPartiallyOverlap |
+| ssa.cpp:269:15:269:20 | ?dynamic{1} | ssa.cpp:269:15:269:20 | dynamic{1} | MayPartiallyOverlap |
+| ssa.cpp:269:15:269:20 | ?dynamic{1} | ssa.cpp:269:15:269:20 | dynamic{1}[0..?)<unknown> | MayPartiallyOverlap |
+| ssa.cpp:269:15:269:20 | dynamic{1} | ssa.cpp:269:15:269:20 | ?dynamic{1} | MustTotallyOverlap |
+| ssa.cpp:269:15:269:20 | dynamic{1} | ssa.cpp:269:15:269:20 | dynamic{1} | MustExactlyOverlap |
+| ssa.cpp:269:15:269:20 | dynamic{1} | ssa.cpp:269:15:269:20 | dynamic{1}[0..?)<unknown> | MustTotallyOverlap |
+| ssa.cpp:269:15:269:20 | dynamic{1}[0..?)<unknown> | ssa.cpp:269:15:269:20 | ?dynamic{1} | MayPartiallyOverlap |
+| ssa.cpp:269:15:269:20 | dynamic{1}[0..?)<unknown> | ssa.cpp:269:15:269:20 | dynamic{1} | MayPartiallyOverlap |
+| ssa.cpp:269:15:269:20 | dynamic{1}[0..?)<unknown> | ssa.cpp:269:15:269:20 | dynamic{1}[0..?)<unknown> | MayPartiallyOverlap |
+| ssa.cpp:274:8:274:9 | pp | ssa.cpp:274:8:274:9 | pp | MustExactlyOverlap |
+| ssa.cpp:276:9:276:9 | a | ssa.cpp:276:9:276:9 | a | MustExactlyOverlap |
+| ssa.cpp:276:9:276:9 | a | ssa.cpp:276:9:276:9 | a[0..4)<int> | MustTotallyOverlap |
+| ssa.cpp:276:9:276:9 | a | ssa.cpp:276:9:276:9 | a[4..8)<int> | MustTotallyOverlap |
+| ssa.cpp:276:9:276:9 | a[0..4)<int> | ssa.cpp:276:9:276:9 | a | MayPartiallyOverlap |
+| ssa.cpp:276:9:276:9 | a[0..4)<int> | ssa.cpp:276:9:276:9 | a[0..4)<int> | MustExactlyOverlap |
+| ssa.cpp:276:9:276:9 | a[4..8)<int> | ssa.cpp:276:9:276:9 | a | MayPartiallyOverlap |
+| ssa.cpp:276:9:276:9 | a[4..8)<int> | ssa.cpp:276:9:276:9 | a[4..8)<int> | MustExactlyOverlap |
+| ssa.cpp:286:3:286:3 | *#this | ssa.cpp:286:3:286:3 | *#this | MustExactlyOverlap |
+| ssa.cpp:286:3:286:3 | *#this | ssa.cpp:286:3:286:3 | ?*#this | MustTotallyOverlap |
+| ssa.cpp:286:3:286:3 | ?*#this | ssa.cpp:286:3:286:3 | *#this | MayPartiallyOverlap |
+| ssa.cpp:286:3:286:3 | ?*#this | ssa.cpp:286:3:286:3 | ?*#this | MayPartiallyOverlap |
+| ssa.cpp:287:3:287:3 | *#this | ssa.cpp:287:3:287:3 | *#this | MustExactlyOverlap |
+| ssa.cpp:287:3:287:3 | *#this | ssa.cpp:287:3:287:3 | ?*#this | MustTotallyOverlap |
+| ssa.cpp:287:3:287:3 | ?*#this | ssa.cpp:287:3:287:3 | *#this | MayPartiallyOverlap |
+| ssa.cpp:287:3:287:3 | ?*#this | ssa.cpp:287:3:287:3 | ?*#this | MayPartiallyOverlap |
+| ssa.cpp:287:5:287:5 | *(unnamed parameter 0) | ssa.cpp:287:5:287:5 | *(unnamed parameter 0) | MustExactlyOverlap |
+| ssa.cpp:287:5:287:5 | *(unnamed parameter 0) | ssa.cpp:287:5:287:5 | ?*(unnamed parameter 0) | MustTotallyOverlap |
+| ssa.cpp:287:5:287:5 | ?*(unnamed parameter 0) | ssa.cpp:287:5:287:5 | *(unnamed parameter 0) | MayPartiallyOverlap |
+| ssa.cpp:287:5:287:5 | ?*(unnamed parameter 0) | ssa.cpp:287:5:287:5 | ?*(unnamed parameter 0) | MayPartiallyOverlap |
+| ssa.cpp:288:3:288:3 | *#this | ssa.cpp:288:3:288:3 | *#this | MustExactlyOverlap |
+| ssa.cpp:288:3:288:3 | *#this | ssa.cpp:288:3:288:3 | ?*#this | MustTotallyOverlap |
+| ssa.cpp:288:3:288:3 | ?*#this | ssa.cpp:288:3:288:3 | *#this | MayPartiallyOverlap |
+| ssa.cpp:288:3:288:3 | ?*#this | ssa.cpp:288:3:288:3 | ?*#this | MayPartiallyOverlap |
+| ssa.cpp:292:14:292:22 | ?dynamic{1} | ssa.cpp:292:14:292:22 | ?dynamic{1} | MayPartiallyOverlap |
+| ssa.cpp:292:14:292:22 | ?dynamic{1} | ssa.cpp:292:14:292:22 | dynamic{1} | MayPartiallyOverlap |
+| ssa.cpp:292:14:292:22 | dynamic{1} | ssa.cpp:292:14:292:22 | ?dynamic{1} | MustTotallyOverlap |
+| ssa.cpp:292:14:292:22 | dynamic{1} | ssa.cpp:292:14:292:22 | dynamic{1} | MustExactlyOverlap |
+| ssa.cpp:293:14:293:22 | ?dynamic{2} | ssa.cpp:293:14:293:22 | ?dynamic{2} | MayPartiallyOverlap |
+| ssa.cpp:293:14:293:22 | ?dynamic{2} | ssa.cpp:293:14:293:22 | dynamic{2} | MayPartiallyOverlap |
+| ssa.cpp:293:14:293:22 | dynamic{2} | ssa.cpp:293:14:293:22 | ?dynamic{2} | MustTotallyOverlap |
+| ssa.cpp:293:14:293:22 | dynamic{2} | ssa.cpp:293:14:293:22 | dynamic{2} | MustExactlyOverlap |
+| ssa.cpp:294:12:294:26 | ?dynamic{3} | ssa.cpp:294:12:294:26 | ?dynamic{3} | MayPartiallyOverlap |
+| ssa.cpp:294:12:294:26 | ?dynamic{3} | ssa.cpp:294:12:294:26 | ?dynamic{3}[0..4)<A> | MayPartiallyOverlap |
+| ssa.cpp:294:12:294:26 | ?dynamic{3} | ssa.cpp:294:12:294:26 | dynamic{3} | MayPartiallyOverlap |
+| ssa.cpp:294:12:294:26 | ?dynamic{3} | ssa.cpp:294:12:294:26 | dynamic{3}[0..4)<int> | MayPartiallyOverlap |
+| ssa.cpp:294:12:294:26 | ?dynamic{3}[0..4)<A> | ssa.cpp:294:12:294:26 | ?dynamic{3} | MayPartiallyOverlap |
+| ssa.cpp:294:12:294:26 | ?dynamic{3}[0..4)<A> | ssa.cpp:294:12:294:26 | ?dynamic{3}[0..4)<A> | MayPartiallyOverlap |
+| ssa.cpp:294:12:294:26 | ?dynamic{3}[0..4)<A> | ssa.cpp:294:12:294:26 | dynamic{3} | MayPartiallyOverlap |
+| ssa.cpp:294:12:294:26 | ?dynamic{3}[0..4)<A> | ssa.cpp:294:12:294:26 | dynamic{3}[0..4)<int> | MayPartiallyOverlap |
+| ssa.cpp:294:12:294:26 | dynamic{3} | ssa.cpp:294:12:294:26 | ?dynamic{3} | MustTotallyOverlap |
+| ssa.cpp:294:12:294:26 | dynamic{3} | ssa.cpp:294:12:294:26 | ?dynamic{3}[0..4)<A> | MustTotallyOverlap |
+| ssa.cpp:294:12:294:26 | dynamic{3} | ssa.cpp:294:12:294:26 | dynamic{3} | MustExactlyOverlap |
+| ssa.cpp:294:12:294:26 | dynamic{3} | ssa.cpp:294:12:294:26 | dynamic{3}[0..4)<int> | MustTotallyOverlap |
+| ssa.cpp:294:12:294:26 | dynamic{3}[0..4)<int> | ssa.cpp:294:12:294:26 | ?dynamic{3} | MayPartiallyOverlap |
+| ssa.cpp:294:12:294:26 | dynamic{3}[0..4)<int> | ssa.cpp:294:12:294:26 | ?dynamic{3}[0..4)<A> | MustTotallyOverlap |
+| ssa.cpp:294:12:294:26 | dynamic{3}[0..4)<int> | ssa.cpp:294:12:294:26 | dynamic{3} | MayPartiallyOverlap |
+| ssa.cpp:294:12:294:26 | dynamic{3}[0..4)<int> | ssa.cpp:294:12:294:26 | dynamic{3}[0..4)<int> | MustExactlyOverlap |
+| ssa.cpp:294:18:294:25 | ?dynamic{3} | ssa.cpp:294:18:294:25 | ?dynamic{3} | MayPartiallyOverlap |
+| ssa.cpp:294:18:294:25 | ?dynamic{3} | ssa.cpp:294:18:294:25 | ?dynamic{3}[0..4)<A> | MayPartiallyOverlap |
+| ssa.cpp:294:18:294:25 | ?dynamic{3} | ssa.cpp:294:18:294:25 | ?dynamic{3}[0..?)<unknown> | MayPartiallyOverlap |
+| ssa.cpp:294:18:294:25 | ?dynamic{3} | ssa.cpp:294:18:294:25 | dynamic{3} | MayPartiallyOverlap |
+| ssa.cpp:294:18:294:25 | ?dynamic{3} | ssa.cpp:294:18:294:25 | dynamic{3}[0..?)<unknown> | MayPartiallyOverlap |
+| ssa.cpp:294:18:294:25 | ?dynamic{3}[0..4)<A> | ssa.cpp:294:18:294:25 | ?dynamic{3} | MayPartiallyOverlap |
+| ssa.cpp:294:18:294:25 | ?dynamic{3}[0..4)<A> | ssa.cpp:294:18:294:25 | ?dynamic{3}[0..4)<A> | MayPartiallyOverlap |
+| ssa.cpp:294:18:294:25 | ?dynamic{3}[0..4)<A> | ssa.cpp:294:18:294:25 | ?dynamic{3}[0..?)<unknown> | MayPartiallyOverlap |
+| ssa.cpp:294:18:294:25 | ?dynamic{3}[0..4)<A> | ssa.cpp:294:18:294:25 | dynamic{3} | MayPartiallyOverlap |
+| ssa.cpp:294:18:294:25 | ?dynamic{3}[0..4)<A> | ssa.cpp:294:18:294:25 | dynamic{3}[0..?)<unknown> | MayPartiallyOverlap |
+| ssa.cpp:294:18:294:25 | ?dynamic{3}[0..?)<unknown> | ssa.cpp:294:18:294:25 | ?dynamic{3} | MayPartiallyOverlap |
+| ssa.cpp:294:18:294:25 | ?dynamic{3}[0..?)<unknown> | ssa.cpp:294:18:294:25 | ?dynamic{3}[0..4)<A> | MayPartiallyOverlap |
+| ssa.cpp:294:18:294:25 | ?dynamic{3}[0..?)<unknown> | ssa.cpp:294:18:294:25 | ?dynamic{3}[0..?)<unknown> | MayPartiallyOverlap |
+| ssa.cpp:294:18:294:25 | ?dynamic{3}[0..?)<unknown> | ssa.cpp:294:18:294:25 | dynamic{3} | MayPartiallyOverlap |
+| ssa.cpp:294:18:294:25 | ?dynamic{3}[0..?)<unknown> | ssa.cpp:294:18:294:25 | dynamic{3}[0..?)<unknown> | MayPartiallyOverlap |
+| ssa.cpp:294:18:294:25 | dynamic{3} | ssa.cpp:294:18:294:25 | ?dynamic{3} | MustTotallyOverlap |
+| ssa.cpp:294:18:294:25 | dynamic{3} | ssa.cpp:294:18:294:25 | ?dynamic{3}[0..4)<A> | MustTotallyOverlap |
+| ssa.cpp:294:18:294:25 | dynamic{3} | ssa.cpp:294:18:294:25 | ?dynamic{3}[0..?)<unknown> | MustTotallyOverlap |
+| ssa.cpp:294:18:294:25 | dynamic{3} | ssa.cpp:294:18:294:25 | dynamic{3} | MustExactlyOverlap |
+| ssa.cpp:294:18:294:25 | dynamic{3} | ssa.cpp:294:18:294:25 | dynamic{3}[0..?)<unknown> | MustTotallyOverlap |
+| ssa.cpp:294:18:294:25 | dynamic{3}[0..?)<unknown> | ssa.cpp:294:18:294:25 | ?dynamic{3} | MayPartiallyOverlap |
+| ssa.cpp:294:18:294:25 | dynamic{3}[0..?)<unknown> | ssa.cpp:294:18:294:25 | ?dynamic{3}[0..4)<A> | MayPartiallyOverlap |
+| ssa.cpp:294:18:294:25 | dynamic{3}[0..?)<unknown> | ssa.cpp:294:18:294:25 | ?dynamic{3}[0..?)<unknown> | MayPartiallyOverlap |
+| ssa.cpp:294:18:294:25 | dynamic{3}[0..?)<unknown> | ssa.cpp:294:18:294:25 | dynamic{3} | MayPartiallyOverlap |
+| ssa.cpp:294:18:294:25 | dynamic{3}[0..?)<unknown> | ssa.cpp:294:18:294:25 | dynamic{3}[0..?)<unknown> | MayPartiallyOverlap |
+| ssa.cpp:295:10:295:14 | ?dynamic{5} | ssa.cpp:295:10:295:14 | ?dynamic{5} | MayPartiallyOverlap |
+| ssa.cpp:295:10:295:14 | ?dynamic{5} | ssa.cpp:295:10:295:14 | ?dynamic{5}[0..4)<A> | MayPartiallyOverlap |
+| ssa.cpp:295:10:295:14 | ?dynamic{5} | ssa.cpp:295:10:295:14 | dynamic{5} | MayPartiallyOverlap |
+| ssa.cpp:295:10:295:14 | ?dynamic{5}[0..4)<A> | ssa.cpp:295:10:295:14 | ?dynamic{5} | MayPartiallyOverlap |
+| ssa.cpp:295:10:295:14 | ?dynamic{5}[0..4)<A> | ssa.cpp:295:10:295:14 | ?dynamic{5}[0..4)<A> | MayPartiallyOverlap |
+| ssa.cpp:295:10:295:14 | ?dynamic{5}[0..4)<A> | ssa.cpp:295:10:295:14 | dynamic{5} | MayPartiallyOverlap |
+| ssa.cpp:295:10:295:14 | dynamic{5} | ssa.cpp:295:10:295:14 | ?dynamic{5} | MustTotallyOverlap |
+| ssa.cpp:295:10:295:14 | dynamic{5} | ssa.cpp:295:10:295:14 | ?dynamic{5}[0..4)<A> | MustTotallyOverlap |
+| ssa.cpp:295:10:295:14 | dynamic{5} | ssa.cpp:295:10:295:14 | dynamic{5} | MustExactlyOverlap |
+| ssa.cpp:301:27:301:30 | *argv | ssa.cpp:301:27:301:30 | *argv | MustExactlyOverlap |
+| ssa.cpp:301:27:301:30 | *argv | ssa.cpp:301:27:301:30 | *argv[0..8)<decltype(nullptr)> | MustTotallyOverlap |
+| ssa.cpp:301:27:301:30 | *argv | ssa.cpp:301:27:301:30 | *argv[0..?)<unknown> | MustTotallyOverlap |
+| ssa.cpp:301:27:301:30 | *argv | ssa.cpp:301:27:301:30 | ?*argv | MustTotallyOverlap |
+| ssa.cpp:301:27:301:30 | *argv | ssa.cpp:301:27:301:30 | ?*argv[0..?)<unknown> | MustTotallyOverlap |
+| ssa.cpp:301:27:301:30 | *argv[0..8)<decltype(nullptr)> | ssa.cpp:301:27:301:30 | *argv | MayPartiallyOverlap |
+| ssa.cpp:301:27:301:30 | *argv[0..8)<decltype(nullptr)> | ssa.cpp:301:27:301:30 | *argv[0..8)<decltype(nullptr)> | MustExactlyOverlap |
+| ssa.cpp:301:27:301:30 | *argv[0..8)<decltype(nullptr)> | ssa.cpp:301:27:301:30 | *argv[0..?)<unknown> | MayPartiallyOverlap |
+| ssa.cpp:301:27:301:30 | *argv[0..8)<decltype(nullptr)> | ssa.cpp:301:27:301:30 | ?*argv | MayPartiallyOverlap |
+| ssa.cpp:301:27:301:30 | *argv[0..8)<decltype(nullptr)> | ssa.cpp:301:27:301:30 | ?*argv[0..?)<unknown> | MayPartiallyOverlap |
+| ssa.cpp:301:27:301:30 | *argv[0..?)<unknown> | ssa.cpp:301:27:301:30 | *argv | MayPartiallyOverlap |
+| ssa.cpp:301:27:301:30 | *argv[0..?)<unknown> | ssa.cpp:301:27:301:30 | *argv[0..8)<decltype(nullptr)> | MayPartiallyOverlap |
+| ssa.cpp:301:27:301:30 | *argv[0..?)<unknown> | ssa.cpp:301:27:301:30 | *argv[0..?)<unknown> | MayPartiallyOverlap |
+| ssa.cpp:301:27:301:30 | *argv[0..?)<unknown> | ssa.cpp:301:27:301:30 | ?*argv | MayPartiallyOverlap |
+| ssa.cpp:301:27:301:30 | *argv[0..?)<unknown> | ssa.cpp:301:27:301:30 | ?*argv[0..?)<unknown> | MayPartiallyOverlap |
+| ssa.cpp:301:27:301:30 | ?*argv | ssa.cpp:301:27:301:30 | *argv | MayPartiallyOverlap |
+| ssa.cpp:301:27:301:30 | ?*argv | ssa.cpp:301:27:301:30 | *argv[0..8)<decltype(nullptr)> | MayPartiallyOverlap |
+| ssa.cpp:301:27:301:30 | ?*argv | ssa.cpp:301:27:301:30 | *argv[0..?)<unknown> | MayPartiallyOverlap |
+| ssa.cpp:301:27:301:30 | ?*argv | ssa.cpp:301:27:301:30 | ?*argv | MayPartiallyOverlap |
+| ssa.cpp:301:27:301:30 | ?*argv | ssa.cpp:301:27:301:30 | ?*argv[0..?)<unknown> | MayPartiallyOverlap |
+| ssa.cpp:301:27:301:30 | ?*argv[0..?)<unknown> | ssa.cpp:301:27:301:30 | *argv | MayPartiallyOverlap |
+| ssa.cpp:301:27:301:30 | ?*argv[0..?)<unknown> | ssa.cpp:301:27:301:30 | *argv[0..8)<decltype(nullptr)> | MayPartiallyOverlap |
+| ssa.cpp:301:27:301:30 | ?*argv[0..?)<unknown> | ssa.cpp:301:27:301:30 | *argv[0..?)<unknown> | MayPartiallyOverlap |
+| ssa.cpp:301:27:301:30 | ?*argv[0..?)<unknown> | ssa.cpp:301:27:301:30 | ?*argv | MayPartiallyOverlap |
+| ssa.cpp:301:27:301:30 | ?*argv[0..?)<unknown> | ssa.cpp:301:27:301:30 | ?*argv[0..?)<unknown> | MayPartiallyOverlap |
+| ssa.cpp:310:8:310:11 | *#this | ssa.cpp:310:8:310:11 | *#this | MustExactlyOverlap |
+| ssa.cpp:310:8:310:11 | *#this | ssa.cpp:310:8:310:11 | *#this[0..4)<int> | MustTotallyOverlap |
+| ssa.cpp:310:8:310:11 | *#this | ssa.cpp:310:8:310:11 | ?*#this | MustTotallyOverlap |
+| ssa.cpp:310:8:310:11 | *#this[0..4)<int> | ssa.cpp:310:8:310:11 | *#this | MayPartiallyOverlap |
+| ssa.cpp:310:8:310:11 | *#this[0..4)<int> | ssa.cpp:310:8:310:11 | *#this[0..4)<int> | MustExactlyOverlap |
+| ssa.cpp:310:8:310:11 | *#this[0..4)<int> | ssa.cpp:310:8:310:11 | ?*#this | MayPartiallyOverlap |
+| ssa.cpp:310:8:310:11 | ?*#this | ssa.cpp:310:8:310:11 | *#this | MayPartiallyOverlap |
+| ssa.cpp:310:8:310:11 | ?*#this | ssa.cpp:310:8:310:11 | *#this[0..4)<int> | MayPartiallyOverlap |
+| ssa.cpp:310:8:310:11 | ?*#this | ssa.cpp:310:8:310:11 | ?*#this | MayPartiallyOverlap |
+| ssa.cpp:319:37:319:37 | *s | ssa.cpp:319:37:319:37 | *s | MustExactlyOverlap |
+| ssa.cpp:319:37:319:37 | *s | ssa.cpp:319:37:319:37 | *s[0..?)<unknown> | MustTotallyOverlap |
+| ssa.cpp:319:37:319:37 | *s | ssa.cpp:319:37:319:37 | ?*s | MustTotallyOverlap |
+| ssa.cpp:319:37:319:37 | *s[0..?)<unknown> | ssa.cpp:319:37:319:37 | *s | MayPartiallyOverlap |
+| ssa.cpp:319:37:319:37 | *s[0..?)<unknown> | ssa.cpp:319:37:319:37 | *s[0..?)<unknown> | MayPartiallyOverlap |
+| ssa.cpp:319:37:319:37 | *s[0..?)<unknown> | ssa.cpp:319:37:319:37 | ?*s | MayPartiallyOverlap |
+| ssa.cpp:319:37:319:37 | ?*s | ssa.cpp:319:37:319:37 | *s | MayPartiallyOverlap |
+| ssa.cpp:319:37:319:37 | ?*s | ssa.cpp:319:37:319:37 | *s[0..?)<unknown> | MayPartiallyOverlap |
+| ssa.cpp:319:37:319:37 | ?*s | ssa.cpp:319:37:319:37 | ?*s | MayPartiallyOverlap |
+| ssa.cpp:321:7:321:12 | ?buffer[0..?)<unknown> | ssa.cpp:321:7:321:12 | ?buffer[0..?)<unknown> | MayPartiallyOverlap |
+| ssa.cpp:321:7:321:12 | ?buffer[0..?)<unknown> | ssa.cpp:321:7:321:12 | buffer | MayPartiallyOverlap |
+| ssa.cpp:321:7:321:12 | ?buffer[0..?)<unknown> | ssa.cpp:321:7:321:12 | buffer[0..?)<unknown> | MayPartiallyOverlap |
+| ssa.cpp:321:7:321:12 | buffer | ssa.cpp:321:7:321:12 | ?buffer[0..?)<unknown> | MustTotallyOverlap |
+| ssa.cpp:321:7:321:12 | buffer | ssa.cpp:321:7:321:12 | buffer | MustExactlyOverlap |
+| ssa.cpp:321:7:321:12 | buffer | ssa.cpp:321:7:321:12 | buffer[0..?)<unknown> | MustTotallyOverlap |
+| ssa.cpp:321:7:321:12 | buffer[0..?)<unknown> | ssa.cpp:321:7:321:12 | ?buffer[0..?)<unknown> | MayPartiallyOverlap |
+| ssa.cpp:321:7:321:12 | buffer[0..?)<unknown> | ssa.cpp:321:7:321:12 | buffer | MayPartiallyOverlap |
+| ssa.cpp:321:7:321:12 | buffer[0..?)<unknown> | ssa.cpp:321:7:321:12 | buffer[0..?)<unknown> | MayPartiallyOverlap |
+| ssa.cpp:322:8:322:11 | ?ptr1[0..?)<unknown> | ssa.cpp:322:8:322:11 | ?ptr1[0..?)<unknown> | MayPartiallyOverlap |
+| ssa.cpp:322:8:322:11 | ?ptr1[0..?)<unknown> | ssa.cpp:322:8:322:11 | ptr1 | MayPartiallyOverlap |
+| ssa.cpp:322:8:322:11 | ?ptr1[0..?)<unknown> | ssa.cpp:322:8:322:11 | ptr1[0..?)<unknown> | MayPartiallyOverlap |
+| ssa.cpp:322:8:322:11 | ptr1 | ssa.cpp:322:8:322:11 | ?ptr1[0..?)<unknown> | MustTotallyOverlap |
+| ssa.cpp:322:8:322:11 | ptr1 | ssa.cpp:322:8:322:11 | ptr1 | MustExactlyOverlap |
+| ssa.cpp:322:8:322:11 | ptr1 | ssa.cpp:322:8:322:11 | ptr1[0..?)<unknown> | MustTotallyOverlap |
+| ssa.cpp:322:8:322:11 | ptr1[0..?)<unknown> | ssa.cpp:322:8:322:11 | ?ptr1[0..?)<unknown> | MayPartiallyOverlap |
+| ssa.cpp:322:8:322:11 | ptr1[0..?)<unknown> | ssa.cpp:322:8:322:11 | ptr1 | MayPartiallyOverlap |
+| ssa.cpp:322:8:322:11 | ptr1[0..?)<unknown> | ssa.cpp:322:8:322:11 | ptr1[0..?)<unknown> | MayPartiallyOverlap |
+| ssa.cpp:402:7:402:7 | b | ssa.cpp:402:7:402:7 | b | MustExactlyOverlap |
+| ssa.cpp:402:7:402:7 | b | ssa.cpp:402:7:402:7 | b[0..4)<int> | MustTotallyOverlap |
+| ssa.cpp:402:7:402:7 | b[0..4)<int> | ssa.cpp:402:7:402:7 | b | MayPartiallyOverlap |
+| ssa.cpp:402:7:402:7 | b[0..4)<int> | ssa.cpp:402:7:402:7 | b[0..4)<int> | MustExactlyOverlap |
+| ssa.cpp:403:7:403:7 | c | ssa.cpp:403:7:403:7 | c | MustExactlyOverlap |
+| ssa.cpp:418:7:418:7 | x | ssa.cpp:418:7:418:7 | x | MustExactlyOverlap |
+| ssa.cpp:418:7:418:7 | x | ssa.cpp:418:7:418:7 | x[0..4)<int> | MustTotallyOverlap |
+| ssa.cpp:418:7:418:7 | x | ssa.cpp:418:7:418:7 | x[4..8)<int> | MustTotallyOverlap |
+| ssa.cpp:418:7:418:7 | x[0..4)<int> | ssa.cpp:418:7:418:7 | x | MayPartiallyOverlap |
+| ssa.cpp:418:7:418:7 | x[0..4)<int> | ssa.cpp:418:7:418:7 | x[0..4)<int> | MustExactlyOverlap |
+| ssa.cpp:418:7:418:7 | x[4..8)<int> | ssa.cpp:418:7:418:7 | x | MayPartiallyOverlap |
+| ssa.cpp:418:7:418:7 | x[4..8)<int> | ssa.cpp:418:7:418:7 | x[4..8)<int> | MustExactlyOverlap |
+| ssa.cpp:442:37:442:37 | *a | ssa.cpp:442:37:442:37 | *a | MustExactlyOverlap |
+| ssa.cpp:442:37:442:37 | *a | ssa.cpp:442:37:442:37 | ?*a | MustTotallyOverlap |
+| ssa.cpp:442:37:442:37 | ?*a | ssa.cpp:442:37:442:37 | *a | MayPartiallyOverlap |
+| ssa.cpp:442:37:442:37 | ?*a | ssa.cpp:442:37:442:37 | ?*a | MayPartiallyOverlap |
+| ssa.cpp:442:46:442:46 | *b | ssa.cpp:442:46:442:46 | *b | MustExactlyOverlap |
+| ssa.cpp:442:46:442:46 | *b | ssa.cpp:442:46:442:46 | ?*b | MustTotallyOverlap |
+| ssa.cpp:442:46:442:46 | ?*b | ssa.cpp:442:46:442:46 | *b | MayPartiallyOverlap |
+| ssa.cpp:442:46:442:46 | ?*b | ssa.cpp:442:46:442:46 | ?*b | MayPartiallyOverlap |
+| ssa.cpp:446:34:446:34 | *a | ssa.cpp:446:34:446:34 | *a | MustExactlyOverlap |
+| ssa.cpp:446:34:446:34 | *a | ssa.cpp:446:34:446:34 | *a[0..?)<unknown> | MustTotallyOverlap |
+| ssa.cpp:446:34:446:34 | *a | ssa.cpp:446:34:446:34 | ?*a | MustTotallyOverlap |
+| ssa.cpp:446:34:446:34 | *a | ssa.cpp:446:34:446:34 | ?*a[0..?)<unknown> | MustTotallyOverlap |
+| ssa.cpp:446:34:446:34 | *a[0..?)<unknown> | ssa.cpp:446:34:446:34 | *a | MayPartiallyOverlap |
+| ssa.cpp:446:34:446:34 | *a[0..?)<unknown> | ssa.cpp:446:34:446:34 | *a[0..?)<unknown> | MayPartiallyOverlap |
+| ssa.cpp:446:34:446:34 | *a[0..?)<unknown> | ssa.cpp:446:34:446:34 | ?*a | MayPartiallyOverlap |
+| ssa.cpp:446:34:446:34 | *a[0..?)<unknown> | ssa.cpp:446:34:446:34 | ?*a[0..?)<unknown> | MayPartiallyOverlap |
+| ssa.cpp:446:34:446:34 | *a[0..?)<unknown> | ssa.cpp:446:43:446:43 | *b | MayPartiallyOverlap |
+| ssa.cpp:446:34:446:34 | *a[0..?)<unknown> | ssa.cpp:446:43:446:43 | ?*b | MayPartiallyOverlap |
+| ssa.cpp:446:34:446:34 | ?*a | ssa.cpp:446:34:446:34 | *a | MayPartiallyOverlap |
+| ssa.cpp:446:34:446:34 | ?*a | ssa.cpp:446:34:446:34 | *a[0..?)<unknown> | MayPartiallyOverlap |
+| ssa.cpp:446:34:446:34 | ?*a | ssa.cpp:446:34:446:34 | ?*a | MayPartiallyOverlap |
+| ssa.cpp:446:34:446:34 | ?*a | ssa.cpp:446:34:446:34 | ?*a[0..?)<unknown> | MayPartiallyOverlap |
+| ssa.cpp:446:34:446:34 | ?*a[0..?)<unknown> | ssa.cpp:446:34:446:34 | *a | MayPartiallyOverlap |
+| ssa.cpp:446:34:446:34 | ?*a[0..?)<unknown> | ssa.cpp:446:34:446:34 | *a[0..?)<unknown> | MayPartiallyOverlap |
+| ssa.cpp:446:34:446:34 | ?*a[0..?)<unknown> | ssa.cpp:446:34:446:34 | ?*a | MayPartiallyOverlap |
+| ssa.cpp:446:34:446:34 | ?*a[0..?)<unknown> | ssa.cpp:446:34:446:34 | ?*a[0..?)<unknown> | MayPartiallyOverlap |
+| ssa.cpp:446:34:446:34 | ?*a[0..?)<unknown> | ssa.cpp:446:43:446:43 | *b | MayPartiallyOverlap |
+| ssa.cpp:446:34:446:34 | ?*a[0..?)<unknown> | ssa.cpp:446:43:446:43 | ?*b | MayPartiallyOverlap |
+| ssa.cpp:446:43:446:43 | *b | ssa.cpp:446:43:446:43 | *b | MustExactlyOverlap |
+| ssa.cpp:446:43:446:43 | *b | ssa.cpp:446:43:446:43 | *b[0..?)<unknown> | MustTotallyOverlap |
+| ssa.cpp:446:43:446:43 | *b | ssa.cpp:446:43:446:43 | ?*b | MustTotallyOverlap |
+| ssa.cpp:446:43:446:43 | *b | ssa.cpp:446:43:446:43 | ?*b[0..?)<unknown> | MustTotallyOverlap |
+| ssa.cpp:446:43:446:43 | *b[0..?)<unknown> | ssa.cpp:446:34:446:34 | *a | MayPartiallyOverlap |
+| ssa.cpp:446:43:446:43 | *b[0..?)<unknown> | ssa.cpp:446:34:446:34 | ?*a | MayPartiallyOverlap |
+| ssa.cpp:446:43:446:43 | *b[0..?)<unknown> | ssa.cpp:446:43:446:43 | *b | MayPartiallyOverlap |
+| ssa.cpp:446:43:446:43 | *b[0..?)<unknown> | ssa.cpp:446:43:446:43 | *b[0..?)<unknown> | MayPartiallyOverlap |
+| ssa.cpp:446:43:446:43 | *b[0..?)<unknown> | ssa.cpp:446:43:446:43 | ?*b | MayPartiallyOverlap |
+| ssa.cpp:446:43:446:43 | *b[0..?)<unknown> | ssa.cpp:446:43:446:43 | ?*b[0..?)<unknown> | MayPartiallyOverlap |
+| ssa.cpp:446:43:446:43 | ?*b | ssa.cpp:446:43:446:43 | *b | MayPartiallyOverlap |
+| ssa.cpp:446:43:446:43 | ?*b | ssa.cpp:446:43:446:43 | *b[0..?)<unknown> | MayPartiallyOverlap |
+| ssa.cpp:446:43:446:43 | ?*b | ssa.cpp:446:43:446:43 | ?*b | MayPartiallyOverlap |
+| ssa.cpp:446:43:446:43 | ?*b | ssa.cpp:446:43:446:43 | ?*b[0..?)<unknown> | MayPartiallyOverlap |
+| ssa.cpp:446:43:446:43 | ?*b[0..?)<unknown> | ssa.cpp:446:34:446:34 | *a | MayPartiallyOverlap |
+| ssa.cpp:446:43:446:43 | ?*b[0..?)<unknown> | ssa.cpp:446:34:446:34 | ?*a | MayPartiallyOverlap |
+| ssa.cpp:446:43:446:43 | ?*b[0..?)<unknown> | ssa.cpp:446:43:446:43 | *b | MayPartiallyOverlap |
+| ssa.cpp:446:43:446:43 | ?*b[0..?)<unknown> | ssa.cpp:446:43:446:43 | *b[0..?)<unknown> | MayPartiallyOverlap |
+| ssa.cpp:446:43:446:43 | ?*b[0..?)<unknown> | ssa.cpp:446:43:446:43 | ?*b | MayPartiallyOverlap |
+| ssa.cpp:446:43:446:43 | ?*b[0..?)<unknown> | ssa.cpp:446:43:446:43 | ?*b[0..?)<unknown> | MayPartiallyOverlap |
diff --git a/cpp/ql/test/library-tests/ir/ssa/aliased_ssa_overlap.ql b/cpp/ql/test/library-tests/ir/ssa/aliased_ssa_overlap.ql
new file mode 100644
index 00000000000..2616b21f320
--- /dev/null
+++ b/cpp/ql/test/library-tests/ir/ssa/aliased_ssa_overlap.ql
@@ -0,0 +1,5 @@
+import semmle.code.cpp.ir.implementation.aliased_ssa.internal.AliasedSSA
+
+from AllocationMemoryLocation def, AllocationMemoryLocation use, Overlap ovr
+where ovr = getOverlap(def, use)
+select def, use, ovr
diff --git a/cpp/ql/test/library-tests/ir/ssa/ssa.cpp b/cpp/ql/test/library-tests/ir/ssa/ssa.cpp
index 56caf9de3b6..c5fedcab716 100644
--- a/cpp/ql/test/library-tests/ir/ssa/ssa.cpp
+++ b/cpp/ql/test/library-tests/ir/ssa/ssa.cpp
@@ -211,7 +211,7 @@ int ModeledCallTarget(int x) {
 }
 
 void InitArray() {
-    char a_pad[32] = ""; 
+    char a_pad[32] = "";
     char a_nopad[4] = "foo";
     char a_infer[] = "blah";
     char b[2];
@@ -306,7 +306,7 @@ int main(int argc, char **argv) {
 
 class ThisAliasTest {
   int x, y;
-  
+
   void setX(int arg) {
     this->x = arg;
   }
@@ -438,3 +438,13 @@ int noreturnTest2(int x) {
 void Conditional(bool a, int x, int y) {
     int z = a ? x : y;
 }
+
+static void NonEscapingParams(void *a, void *b)
+{
+}
+
+static void EscapingParams(void *a, void *b)
+{
+  Escape(a);
+  Escape(b);
+}
diff --git a/cpp/ql/test/library-tests/ir/ssa/unaliased_ssa_consistency.expected b/cpp/ql/test/library-tests/ir/ssa/unaliased_ssa_consistency.expected
index b93c7d2649f..91def5d3871 100644
--- a/cpp/ql/test/library-tests/ir/ssa/unaliased_ssa_consistency.expected
+++ b/cpp/ql/test/library-tests/ir/ssa/unaliased_ssa_consistency.expected
@@ -28,4 +28,5 @@ nonUniqueEnclosingIRFunction
 fieldAddressOnNonPointer
 thisArgumentIsNonPointer
 nonUniqueIRVariable
+nonBooleanOperand
 missingCppType
diff --git a/cpp/ql/test/library-tests/ir/ssa/unaliased_ssa_consistency_unsound.expected b/cpp/ql/test/library-tests/ir/ssa/unaliased_ssa_consistency_unsound.expected
index b93c7d2649f..91def5d3871 100644
--- a/cpp/ql/test/library-tests/ir/ssa/unaliased_ssa_consistency_unsound.expected
+++ b/cpp/ql/test/library-tests/ir/ssa/unaliased_ssa_consistency_unsound.expected
@@ -28,4 +28,5 @@ nonUniqueEnclosingIRFunction
 fieldAddressOnNonPointer
 thisArgumentIsNonPointer
 nonUniqueIRVariable
+nonBooleanOperand
 missingCppType
diff --git a/cpp/ql/test/library-tests/ir/ssa/unaliased_ssa_ir.expected b/cpp/ql/test/library-tests/ir/ssa/unaliased_ssa_ir.expected
index 96b35a76c3b..dc3129df784 100644
--- a/cpp/ql/test/library-tests/ir/ssa/unaliased_ssa_ir.expected
+++ b/cpp/ql/test/library-tests/ir/ssa/unaliased_ssa_ir.expected
@@ -2044,3 +2044,57 @@ ssa.cpp:
 #  439|     r439_15(glval<int>) = VariableAddress[#temp439:13] : 
 #  439|     m439_16(int)        = Store[#temp439:13]           : &:r439_15, r439_14
 #-----|   Goto -> Block 1
+
+#  442| void NonEscapingParams(void*, void*)
+#  442|   Block 0
+#  442|     v442_1(void)          = EnterFunction            : 
+#  442|     mu442_2(unknown)      = AliasedDefinition        : 
+#  442|     mu442_3(unknown)      = InitializeNonLocal       : 
+#  442|     r442_4(glval<void *>) = VariableAddress[a]       : 
+#  442|     m442_5(void *)        = InitializeParameter[a]   : &:r442_4
+#  442|     r442_6(void *)        = Load[a]                  : &:r442_4, m442_5
+#  442|     mu442_7(unknown)      = InitializeIndirection[a] : &:r442_6
+#  442|     r442_8(glval<void *>) = VariableAddress[b]       : 
+#  442|     m442_9(void *)        = InitializeParameter[b]   : &:r442_8
+#  442|     r442_10(void *)       = Load[b]                  : &:r442_8, m442_9
+#  442|     mu442_11(unknown)     = InitializeIndirection[b] : &:r442_10
+#  444|     v444_1(void)          = NoOp                     : 
+#  442|     v442_12(void)         = ReturnIndirection[a]     : &:r442_6, ~m?
+#  442|     v442_13(void)         = ReturnIndirection[b]     : &:r442_10, ~m?
+#  442|     v442_14(void)         = ReturnVoid               : 
+#  442|     v442_15(void)         = AliasedUse               : ~m?
+#  442|     v442_16(void)         = ExitFunction             : 
+
+#  446| void EscapingParams(void*, void*)
+#  446|   Block 0
+#  446|     v446_1(void)           = EnterFunction                : 
+#  446|     mu446_2(unknown)       = AliasedDefinition            : 
+#  446|     mu446_3(unknown)       = InitializeNonLocal           : 
+#  446|     r446_4(glval<void *>)  = VariableAddress[a]           : 
+#  446|     m446_5(void *)         = InitializeParameter[a]       : &:r446_4
+#  446|     r446_6(void *)         = Load[a]                      : &:r446_4, m446_5
+#  446|     mu446_7(unknown)       = InitializeIndirection[a]     : &:r446_6
+#  446|     r446_8(glval<void *>)  = VariableAddress[b]           : 
+#  446|     m446_9(void *)         = InitializeParameter[b]       : &:r446_8
+#  446|     r446_10(void *)        = Load[b]                      : &:r446_8, m446_9
+#  446|     mu446_11(unknown)      = InitializeIndirection[b]     : &:r446_10
+#  448|     r448_1(glval<unknown>) = FunctionAddress[Escape]      : 
+#  448|     r448_2(glval<void *>)  = VariableAddress[a]           : 
+#  448|     r448_3(void *)         = Load[a]                      : &:r448_2, m446_5
+#  448|     v448_4(void)           = Call[Escape]                 : func:r448_1, 0:r448_3
+#  448|     mu448_5(unknown)       = ^CallSideEffect              : ~m?
+#  448|     v448_6(void)           = ^BufferReadSideEffect[0]     : &:r448_3, ~m?
+#  448|     mu448_7(unknown)       = ^BufferMayWriteSideEffect[0] : &:r448_3
+#  449|     r449_1(glval<unknown>) = FunctionAddress[Escape]      : 
+#  449|     r449_2(glval<void *>)  = VariableAddress[b]           : 
+#  449|     r449_3(void *)         = Load[b]                      : &:r449_2, m446_9
+#  449|     v449_4(void)           = Call[Escape]                 : func:r449_1, 0:r449_3
+#  449|     mu449_5(unknown)       = ^CallSideEffect              : ~m?
+#  449|     v449_6(void)           = ^BufferReadSideEffect[0]     : &:r449_3, ~m?
+#  449|     mu449_7(unknown)       = ^BufferMayWriteSideEffect[0] : &:r449_3
+#  450|     v450_1(void)           = NoOp                         : 
+#  446|     v446_12(void)          = ReturnIndirection[a]         : &:r446_6, ~m?
+#  446|     v446_13(void)          = ReturnIndirection[b]         : &:r446_10, ~m?
+#  446|     v446_14(void)          = ReturnVoid                   : 
+#  446|     v446_15(void)          = AliasedUse                   : ~m?
+#  446|     v446_16(void)          = ExitFunction                 : 
diff --git a/cpp/ql/test/library-tests/ir/ssa/unaliased_ssa_ir_unsound.expected b/cpp/ql/test/library-tests/ir/ssa/unaliased_ssa_ir_unsound.expected
index 96b35a76c3b..dc3129df784 100644
--- a/cpp/ql/test/library-tests/ir/ssa/unaliased_ssa_ir_unsound.expected
+++ b/cpp/ql/test/library-tests/ir/ssa/unaliased_ssa_ir_unsound.expected
@@ -2044,3 +2044,57 @@ ssa.cpp:
 #  439|     r439_15(glval<int>) = VariableAddress[#temp439:13] : 
 #  439|     m439_16(int)        = Store[#temp439:13]           : &:r439_15, r439_14
 #-----|   Goto -> Block 1
+
+#  442| void NonEscapingParams(void*, void*)
+#  442|   Block 0
+#  442|     v442_1(void)          = EnterFunction            : 
+#  442|     mu442_2(unknown)      = AliasedDefinition        : 
+#  442|     mu442_3(unknown)      = InitializeNonLocal       : 
+#  442|     r442_4(glval<void *>) = VariableAddress[a]       : 
+#  442|     m442_5(void *)        = InitializeParameter[a]   : &:r442_4
+#  442|     r442_6(void *)        = Load[a]                  : &:r442_4, m442_5
+#  442|     mu442_7(unknown)      = InitializeIndirection[a] : &:r442_6
+#  442|     r442_8(glval<void *>) = VariableAddress[b]       : 
+#  442|     m442_9(void *)        = InitializeParameter[b]   : &:r442_8
+#  442|     r442_10(void *)       = Load[b]                  : &:r442_8, m442_9
+#  442|     mu442_11(unknown)     = InitializeIndirection[b] : &:r442_10
+#  444|     v444_1(void)          = NoOp                     : 
+#  442|     v442_12(void)         = ReturnIndirection[a]     : &:r442_6, ~m?
+#  442|     v442_13(void)         = ReturnIndirection[b]     : &:r442_10, ~m?
+#  442|     v442_14(void)         = ReturnVoid               : 
+#  442|     v442_15(void)         = AliasedUse               : ~m?
+#  442|     v442_16(void)         = ExitFunction             : 
+
+#  446| void EscapingParams(void*, void*)
+#  446|   Block 0
+#  446|     v446_1(void)           = EnterFunction                : 
+#  446|     mu446_2(unknown)       = AliasedDefinition            : 
+#  446|     mu446_3(unknown)       = InitializeNonLocal           : 
+#  446|     r446_4(glval<void *>)  = VariableAddress[a]           : 
+#  446|     m446_5(void *)         = InitializeParameter[a]       : &:r446_4
+#  446|     r446_6(void *)         = Load[a]                      : &:r446_4, m446_5
+#  446|     mu446_7(unknown)       = InitializeIndirection[a]     : &:r446_6
+#  446|     r446_8(glval<void *>)  = VariableAddress[b]           : 
+#  446|     m446_9(void *)         = InitializeParameter[b]       : &:r446_8
+#  446|     r446_10(void *)        = Load[b]                      : &:r446_8, m446_9
+#  446|     mu446_11(unknown)      = InitializeIndirection[b]     : &:r446_10
+#  448|     r448_1(glval<unknown>) = FunctionAddress[Escape]      : 
+#  448|     r448_2(glval<void *>)  = VariableAddress[a]           : 
+#  448|     r448_3(void *)         = Load[a]                      : &:r448_2, m446_5
+#  448|     v448_4(void)           = Call[Escape]                 : func:r448_1, 0:r448_3
+#  448|     mu448_5(unknown)       = ^CallSideEffect              : ~m?
+#  448|     v448_6(void)           = ^BufferReadSideEffect[0]     : &:r448_3, ~m?
+#  448|     mu448_7(unknown)       = ^BufferMayWriteSideEffect[0] : &:r448_3
+#  449|     r449_1(glval<unknown>) = FunctionAddress[Escape]      : 
+#  449|     r449_2(glval<void *>)  = VariableAddress[b]           : 
+#  449|     r449_3(void *)         = Load[b]                      : &:r449_2, m446_9
+#  449|     v449_4(void)           = Call[Escape]                 : func:r449_1, 0:r449_3
+#  449|     mu449_5(unknown)       = ^CallSideEffect              : ~m?
+#  449|     v449_6(void)           = ^BufferReadSideEffect[0]     : &:r449_3, ~m?
+#  449|     mu449_7(unknown)       = ^BufferMayWriteSideEffect[0] : &:r449_3
+#  450|     v450_1(void)           = NoOp                         : 
+#  446|     v446_12(void)          = ReturnIndirection[a]         : &:r446_6, ~m?
+#  446|     v446_13(void)          = ReturnIndirection[b]         : &:r446_10, ~m?
+#  446|     v446_14(void)          = ReturnVoid                   : 
+#  446|     v446_15(void)          = AliasedUse                   : ~m?
+#  446|     v446_16(void)          = ExitFunction                 : 
diff --git a/cpp/ql/test/library-tests/lambdas/cfg/cfg.ql b/cpp/ql/test/library-tests/lambdas/cfg/cfg.ql
index 19a82ba0de0..0e1f45caf19 100644
--- a/cpp/ql/test/library-tests/lambdas/cfg/cfg.ql
+++ b/cpp/ql/test/library-tests/lambdas/cfg/cfg.ql
@@ -1,4 +1,9 @@
-// query-type: graph
+/**
+ * query-type: graph
+ *
+ * @kind graph-equivalence-test
+ */
+
 import cpp
 
 class DestructorCallEnhanced extends DestructorCall {
diff --git a/cpp/ql/test/library-tests/macros/inmacroexpansion/inmacroexpansion.expected b/cpp/ql/test/library-tests/macros/inmacroexpansion/inmacroexpansion.expected
index 7ffe4cb03e9..f8eff955d47 100644
--- a/cpp/ql/test/library-tests/macros/inmacroexpansion/inmacroexpansion.expected
+++ b/cpp/ql/test/library-tests/macros/inmacroexpansion/inmacroexpansion.expected
@@ -2,25 +2,168 @@
 | file://:0:0:0:0 | (unnamed parameter 0) | false |
 | file://:0:0:0:0 | __super | false |
 | file://:0:0:0:0 | __va_list_tag | false |
+| file://:0:0:0:0 | decltype([...](...){...}) | false |
 | file://:0:0:0:0 | operator= | false |
 | file://:0:0:0:0 | operator= | false |
 | test.cpp:0:0:0:0 | test.cpp | false |
-| test.cpp:2:1:2:61 | #define FOO class S{int i; void f(void) { int j; return; } }; | false |
+| test.cpp:2:1:2:68 | #define CLASS_DECL class S{int i; void f(void) { int j; return; } }; | false |
 | test.cpp:4:1:4:1 | S | false |
 | test.cpp:4:1:4:1 | declaration of S | false |
 | test.cpp:4:1:4:1 | declaration of operator= | false |
 | test.cpp:4:1:4:1 | declaration of operator= | false |
 | test.cpp:4:1:4:1 | operator= | false |
 | test.cpp:4:1:4:1 | operator= | false |
-| test.cpp:4:1:4:3 | FOO | false |
-| test.cpp:4:1:4:3 | S | false |
-| test.cpp:4:1:4:3 | declaration | true |
-| test.cpp:4:1:4:3 | definition of S | true |
-| test.cpp:4:1:4:3 | definition of f | true |
-| test.cpp:4:1:4:3 | definition of i | true |
-| test.cpp:4:1:4:3 | definition of j | true |
-| test.cpp:4:1:4:3 | f | false |
-| test.cpp:4:1:4:3 | i | false |
-| test.cpp:4:1:4:3 | j | true |
-| test.cpp:4:1:4:3 | return ... | true |
-| test.cpp:4:1:4:3 | { ... } | true |
+| test.cpp:4:1:4:10 | CLASS_DECL | false |
+| test.cpp:4:1:4:10 | S | false |
+| test.cpp:4:1:4:10 | declaration | true |
+| test.cpp:4:1:4:10 | definition of S | true |
+| test.cpp:4:1:4:10 | definition of f | true |
+| test.cpp:4:1:4:10 | definition of i | true |
+| test.cpp:4:1:4:10 | definition of j | true |
+| test.cpp:4:1:4:10 | f | false |
+| test.cpp:4:1:4:10 | i | false |
+| test.cpp:4:1:4:10 | j | true |
+| test.cpp:4:1:4:10 | return ... | true |
+| test.cpp:4:1:4:10 | { ... } | true |
+| test.cpp:6:1:6:42 | #define FUNCTION_DECL void f1() { int k; } | false |
+| test.cpp:8:1:8:13 | FUNCTION_DECL | false |
+| test.cpp:8:1:8:13 | declaration | true |
+| test.cpp:8:1:8:13 | definition of f1 | true |
+| test.cpp:8:1:8:13 | definition of k | true |
+| test.cpp:8:1:8:13 | f1 | false |
+| test.cpp:8:1:8:13 | k | true |
+| test.cpp:8:1:8:13 | return ... | true |
+| test.cpp:8:1:8:13 | { ... } | true |
+| test.cpp:10:1:10:33 | #define VARIABLE_DECL int v1 = 1; | false |
+| test.cpp:12:1:12:13 | 1 | true |
+| test.cpp:12:1:12:13 | VARIABLE_DECL | false |
+| test.cpp:12:1:12:13 | definition of v1 | true |
+| test.cpp:12:1:12:13 | initializer for v1 | true |
+| test.cpp:12:1:12:13 | v1 | true |
+| test.cpp:14:1:14:35 | #define TYPE_DECL_1 typedef int t1; | false |
+| test.cpp:16:1:16:11 | TYPE_DECL_1 | false |
+| test.cpp:16:1:16:11 | declaration of t1 | true |
+| test.cpp:16:1:16:11 | t1 | false |
+| test.cpp:18:1:18:35 | #define TYPE_DECL_2 using t2 = int; | false |
+| test.cpp:20:1:20:11 | TYPE_DECL_2 | false |
+| test.cpp:20:1:20:11 | declaration of t2 | true |
+| test.cpp:20:1:20:11 | t2 | false |
+| test.cpp:22:1:22:47 | #define NAMESPACE_DECL namespace ns { int v2; } | false |
+| test.cpp:24:1:24:14 | NAMESPACE_DECL | false |
+| test.cpp:24:1:24:14 | definition of v2 | true |
+| test.cpp:24:1:24:14 | ns | false |
+| test.cpp:24:1:24:14 | ns | false |
+| test.cpp:24:1:24:14 | v2 | true |
+| test.cpp:26:1:26:43 | #define USING_NAMESPACE using namespace ns; | false |
+| test.cpp:28:1:28:34 | #define ENUM_CONSTANT enum_element | false |
+| test.cpp:30:12:30:21 | definition of enum_class | false |
+| test.cpp:30:12:30:21 | enum_class | false |
+| test.cpp:30:25:30:37 | ENUM_CONSTANT | false |
+| test.cpp:30:25:30:37 | enum_element | false |
+| test.cpp:32:1:32:41 | #define USING_ENUM using enum enum_class; | false |
+| test.cpp:34:1:34:10 | USING_ENUM | false |
+| test.cpp:34:1:34:10 | using enum enum_class | false |
+| test.cpp:36:1:36:48 | #define STATIC_ASSERT static_assert(1 == 1, ""); | false |
+| test.cpp:38:1:38:13 | 1 | true |
+| test.cpp:38:1:38:13 | 1 | true |
+| test.cpp:38:1:38:13 | ... == ... | true |
+| test.cpp:38:1:38:13 | STATIC_ASSERT | false |
+| test.cpp:38:1:38:13 | static_assert(..., "") | false |
+| test.cpp:40:1:40:42 | #define ATTRIBUTE [[nodiscard("reason1")]] | false |
+| test.cpp:42:1:42:9 | ATTRIBUTE | false |
+| test.cpp:42:1:42:9 | nodiscard | false |
+| test.cpp:42:1:42:9 | reason1 | false |
+| test.cpp:42:1:42:9 | reason1 | true |
+| test.cpp:43:5:43:6 | declaration of f2 | false |
+| test.cpp:43:5:43:6 | f2 | false |
+| test.cpp:45:1:45:31 | #define ATTRIBUTE_ARG "reason2" | false |
+| test.cpp:47:3:47:11 | nodiscard | false |
+| test.cpp:47:13:47:25 | ATTRIBUTE_ARG | false |
+| test.cpp:47:13:47:25 | reason2 | false |
+| test.cpp:47:13:47:25 | reason2 | true |
+| test.cpp:48:5:48:6 | declaration of f3 | false |
+| test.cpp:48:5:48:6 | f3 | false |
+| test.cpp:50:1:50:16 | #define TYPE int | false |
+| test.cpp:52:1:52:4 | TYPE | false |
+| test.cpp:52:6:52:7 | definition of v3 | true |
+| test.cpp:52:6:52:7 | v3 | true |
+| test.cpp:52:11:52:11 | 1 | false |
+| test.cpp:52:11:52:11 | initializer for v3 | false |
+| test.cpp:54:1:54:29 | #define DERIVATION : public S | false |
+| test.cpp:56:7:56:7 | T | false |
+| test.cpp:56:7:56:7 | T | false |
+| test.cpp:56:7:56:7 | declaration of T | false |
+| test.cpp:56:7:56:7 | declaration of operator= | false |
+| test.cpp:56:7:56:7 | declaration of operator= | false |
+| test.cpp:56:7:56:7 | definition of T | false |
+| test.cpp:56:7:56:7 | operator= | false |
+| test.cpp:56:7:56:7 | operator= | false |
+| test.cpp:56:9:56:18 | DERIVATION | false |
+| test.cpp:56:9:56:18 | derivation | false |
+| test.cpp:58:1:58:31 | #define FRIEND friend int f3(); | false |
+| test.cpp:60:7:60:7 | U | false |
+| test.cpp:60:7:60:7 | declaration of operator= | false |
+| test.cpp:60:7:60:7 | declaration of operator= | false |
+| test.cpp:60:7:60:7 | definition of U | false |
+| test.cpp:60:7:60:7 | operator= | false |
+| test.cpp:60:7:60:7 | operator= | false |
+| test.cpp:61:3:61:8 | FRIEND | false |
+| test.cpp:61:3:61:8 | U's friend | false |
+| test.cpp:64:1:64:24 | #define NAME_QUAL_1 ns:: | false |
+| test.cpp:66:1:66:22 | #define NAME_QUAL_2 ns | false |
+| test.cpp:68:1:68:19 | #define LOCAL_VAR m | false |
+| test.cpp:70:6:70:7 | definition of f4 | false |
+| test.cpp:70:6:70:7 | f4 | false |
+| test.cpp:70:11:76:1 | { ... } | false |
+| test.cpp:71:5:71:8 | ns:: | false |
+| test.cpp:71:5:71:15 | NAME_QUAL_1 | false |
+| test.cpp:71:5:71:18 | v2 | false |
+| test.cpp:71:5:71:19 | ExprStmt | false |
+| test.cpp:72:5:72:8 | ns:: | false |
+| test.cpp:72:5:72:15 | NAME_QUAL_2 | false |
+| test.cpp:72:5:72:21 | v2 | false |
+| test.cpp:72:5:72:22 | ExprStmt | false |
+| test.cpp:73:5:73:23 | declaration | false |
+| test.cpp:73:9:73:17 | LOCAL_VAR | false |
+| test.cpp:73:9:73:17 | definition of m | true |
+| test.cpp:73:9:73:17 | m | true |
+| test.cpp:73:20:73:22 | 42 | false |
+| test.cpp:73:20:73:22 | initializer for m | false |
+| test.cpp:74:5:74:41 | declaration | false |
+| test.cpp:74:10:74:10 | definition of l | false |
+| test.cpp:74:10:74:10 | l | false |
+| test.cpp:74:13:74:40 | [...](...){...} | false |
+| test.cpp:74:13:74:40 | initializer for l | false |
+| test.cpp:74:13:74:40 | {...} | false |
+| test.cpp:74:14:74:14 | (unnamed constructor) | false |
+| test.cpp:74:14:74:14 | (unnamed constructor) | false |
+| test.cpp:74:14:74:14 | (unnamed constructor) | false |
+| test.cpp:74:14:74:14 | declaration of (unnamed constructor) | false |
+| test.cpp:74:14:74:14 | declaration of (unnamed constructor) | false |
+| test.cpp:74:14:74:14 | definition of (unnamed constructor) | false |
+| test.cpp:74:14:74:14 | definition of operator= | false |
+| test.cpp:74:14:74:14 | operator= | false |
+| test.cpp:74:15:74:15 | definition of m | false |
+| test.cpp:74:15:74:15 | m | false |
+| test.cpp:74:15:74:15 | m | false |
+| test.cpp:74:15:74:23 | LOCAL_VAR | false |
+| test.cpp:74:15:74:23 | m | true |
+| test.cpp:74:25:74:25 | definition of operator() | false |
+| test.cpp:74:25:74:25 | operator() | false |
+| test.cpp:74:28:74:40 | { ... } | false |
+| test.cpp:74:30:74:38 | return ... | false |
+| test.cpp:74:37:74:37 | (int)... | false |
+| test.cpp:75:5:75:5 | (const lambda [] type at line 74, col. 14)... | false |
+| test.cpp:75:5:75:5 | l | false |
+| test.cpp:75:5:75:8 | ExprStmt | false |
+| test.cpp:75:6:75:6 | call to operator() | false |
+| test.cpp:76:1:76:1 | return ... | false |
+| test.cpp:78:1:78:15 | #define ID(x) x | false |
+| test.cpp:79:1:79:23 | #define NESTED(x) ID(x) | false |
+| test.cpp:80:5:80:6 | definition of v4 | false |
+| test.cpp:80:5:80:6 | v4 | false |
+| test.cpp:80:10:80:18 | ID(x) | false |
+| test.cpp:80:10:80:18 | NESTED(x) | false |
+| test.cpp:80:17:80:17 | 1 | true |
+| test.cpp:80:17:80:17 | initializer for v4 | true |
+| test.cpp:82:1:82:39 | // semmle-extractor-options: -std=c++20 | false |
diff --git a/cpp/ql/test/library-tests/macros/inmacroexpansion/test.cpp b/cpp/ql/test/library-tests/macros/inmacroexpansion/test.cpp
index 7cc1d581a0a..22e55b17f5a 100644
--- a/cpp/ql/test/library-tests/macros/inmacroexpansion/test.cpp
+++ b/cpp/ql/test/library-tests/macros/inmacroexpansion/test.cpp
@@ -1,5 +1,82 @@
 
-#define FOO class S{int i; void f(void) { int j; return; } };
+#define CLASS_DECL class S{int i; void f(void) { int j; return; } };
 
-FOO
+CLASS_DECL
 
+#define FUNCTION_DECL void f1() { int k; }
+
+FUNCTION_DECL
+
+#define VARIABLE_DECL int v1 = 1;
+
+VARIABLE_DECL
+
+#define TYPE_DECL_1 typedef int t1;
+
+TYPE_DECL_1
+
+#define TYPE_DECL_2 using t2 = int;
+
+TYPE_DECL_2
+
+#define NAMESPACE_DECL namespace ns { int v2; }
+
+NAMESPACE_DECL
+
+#define USING_NAMESPACE using namespace ns;
+
+#define ENUM_CONSTANT enum_element
+
+enum class enum_class { ENUM_CONSTANT };
+
+#define USING_ENUM using enum enum_class;
+
+USING_ENUM
+
+#define STATIC_ASSERT static_assert(1 == 1, "");
+
+STATIC_ASSERT
+
+#define ATTRIBUTE [[nodiscard("reason1")]]
+
+ATTRIBUTE
+int f2();
+
+#define ATTRIBUTE_ARG "reason2"
+
+[[nodiscard(ATTRIBUTE_ARG)]]
+int f3();
+
+#define TYPE int
+
+TYPE v3 = 1;
+
+#define DERIVATION : public S
+
+class T DERIVATION {};
+
+#define FRIEND friend int f3();
+
+class U {
+  FRIEND
+};
+
+#define NAME_QUAL_1 ns::
+
+#define NAME_QUAL_2 ns
+
+#define LOCAL_VAR m
+
+void f4() {
+    NAME_QUAL_1 v2;
+    NAME_QUAL_2 :: v2;
+    int LOCAL_VAR = 42;
+    auto l = [LOCAL_VAR]() { return m; };
+    l();
+}
+
+#define ID(x) x
+#define NESTED(x) ID(x)
+int v4 = NESTED(1);
+
+// semmle-extractor-options: -std=c++20
diff --git a/cpp/ql/test/library-tests/parameters/toStrings/params.expected b/cpp/ql/test/library-tests/parameters/toStrings/params.expected
index 908089b31e6..f5687137e87 100644
--- a/cpp/ql/test/library-tests/parameters/toStrings/params.expected
+++ b/cpp/ql/test/library-tests/parameters/toStrings/params.expected
@@ -1,11 +1,11 @@
-| test.c:2:8:2:10 | declaration of 1st parameter |
-| test.c:2:13:2:15 | declaration of 2nd parameter |
-| test.c:2:18:2:20 | declaration of 3rd parameter |
-| test.c:2:23:2:25 | declaration of 4th parameter |
-| test.c:3:8:3:10 | declaration of y1 as anonymous 1st parameter |
-| test.c:3:13:3:15 | declaration of y2 as anonymous 2nd parameter |
-| test.c:3:18:3:20 | declaration of y3 as anonymous 3rd parameter |
-| test.c:3:23:3:25 | declaration of y4 as anonymous 4th parameter |
+| test.c:2:8:2:10 | declaration of (unnamed parameter 0) |
+| test.c:2:13:2:15 | declaration of (unnamed parameter 1) |
+| test.c:2:18:2:20 | declaration of (unnamed parameter 2) |
+| test.c:2:23:2:25 | declaration of (unnamed parameter 3) |
+| test.c:3:8:3:10 | declaration of y1 as (unnamed parameter 0) |
+| test.c:3:13:3:15 | declaration of y2 as (unnamed parameter 1) |
+| test.c:3:18:3:20 | declaration of y3 as (unnamed parameter 2) |
+| test.c:3:23:3:25 | declaration of y4 as (unnamed parameter 3) |
 | test.c:4:12:4:13 | declaration of x1 |
 | test.c:4:20:4:21 | declaration of x2 |
 | test.c:4:28:4:29 | declaration of x3 |
diff --git a/cpp/ql/test/library-tests/pointsto/basic/sets.ql b/cpp/ql/test/library-tests/pointsto/basic/sets.ql
index ebb1cb9134e..98b952f3dfe 100644
--- a/cpp/ql/test/library-tests/pointsto/basic/sets.ql
+++ b/cpp/ql/test/library-tests/pointsto/basic/sets.ql
@@ -1,4 +1,9 @@
-// query-type: graph
+/**
+ * query-type: graph
+ *
+ * @kind graph-equivalence-test
+ */
+
 import cpp
 import semmle.code.cpp.pointsto.PointsTo
 
diff --git a/cpp/ql/test/library-tests/scopes/parents/parents.cpp b/cpp/ql/test/library-tests/scopes/parents/parents.cpp
index 3e0f66aa52c..cdf42821701 100644
--- a/cpp/ql/test/library-tests/scopes/parents/parents.cpp
+++ b/cpp/ql/test/library-tests/scopes/parents/parents.cpp
@@ -14,6 +14,13 @@ namespace foo {
   }
 }
 
+template<typename T>
+T var = 42;
 
-                        
+int g() {
+  requires(int l) { l; };
 
+  return var<int>;
+}
+
+// semmle-extractor-options: -std=c++20
diff --git a/cpp/ql/test/library-tests/scopes/parents/parents.expected b/cpp/ql/test/library-tests/scopes/parents/parents.expected
index 1d9e352ab9d..6d6e9fc2780 100644
--- a/cpp/ql/test/library-tests/scopes/parents/parents.expected
+++ b/cpp/ql/test/library-tests/scopes/parents/parents.expected
@@ -1,5 +1,8 @@
 | 0 | file://:0:0:0:0 | (global namespace) | file://:0:0:0:0 | __va_list_tag |
 | 0 | file://:0:0:0:0 | (global namespace) | parents.cpp:2:11:2:13 | foo |
+| 0 | file://:0:0:0:0 | (global namespace) | parents.cpp:18:3:18:3 | var |
+| 0 | file://:0:0:0:0 | (global namespace) | parents.cpp:18:7:18:7 | var |
+| 0 | file://:0:0:0:0 | (global namespace) | parents.cpp:20:5:20:5 | g |
 | 1 | file://:0:0:0:0 | __va_list_tag | file://:0:0:0:0 | fp_offset |
 | 1 | file://:0:0:0:0 | __va_list_tag | file://:0:0:0:0 | gp_offset |
 | 1 | file://:0:0:0:0 | __va_list_tag | file://:0:0:0:0 | operator= |
@@ -14,7 +17,11 @@
 | 1 | parents.cpp:4:10:4:10 | f | parents.cpp:4:19:13:5 | { ... } |
 | 1 | parents.cpp:4:19:13:5 | { ... } | parents.cpp:5:11:5:11 | j |
 | 1 | parents.cpp:4:19:13:5 | { ... } | parents.cpp:6:11:10:7 | { ... } |
+| 1 | parents.cpp:4:19:13:5 | { ... } | parents.cpp:11:18:11:18 | e |
 | 1 | parents.cpp:4:19:13:5 | { ... } | parents.cpp:11:21:12:7 | { ... } |
 | 1 | parents.cpp:6:11:10:7 | { ... } | parents.cpp:7:9:9:9 | for(...;...;...) ... |
 | 1 | parents.cpp:6:11:10:7 | { ... } | parents.cpp:7:33:9:9 | { ... } |
 | 1 | parents.cpp:7:33:9:9 | { ... } | parents.cpp:8:15:8:15 | k |
+| 1 | parents.cpp:18:7:18:7 | var | parents.cpp:17:19:17:19 | T |
+| 1 | parents.cpp:20:5:20:5 | g | parents.cpp:20:9:24:1 | { ... } |
+| 1 | parents.cpp:20:9:24:1 | { ... } | parents.cpp:21:16:21:16 | l |
diff --git a/cpp/ql/test/library-tests/sub_basic_blocks/cut.ql b/cpp/ql/test/library-tests/sub_basic_blocks/cut.ql
index 2d89bd3cf95..3f081a90488 100644
--- a/cpp/ql/test/library-tests/sub_basic_blocks/cut.ql
+++ b/cpp/ql/test/library-tests/sub_basic_blocks/cut.ql
@@ -1,4 +1,9 @@
-// query-type: graph
+/**
+ * query-type: graph
+ *
+ * @kind graph-equivalence-test
+ */
+
 import sbb_test
 
 class CutCall extends SubBasicBlockCutNode {
diff --git a/cpp/ql/test/library-tests/sub_basic_blocks/no_cut.ql b/cpp/ql/test/library-tests/sub_basic_blocks/no_cut.ql
index 1f1a6b3eb77..84f74a26b92 100644
--- a/cpp/ql/test/library-tests/sub_basic_blocks/no_cut.ql
+++ b/cpp/ql/test/library-tests/sub_basic_blocks/no_cut.ql
@@ -1,4 +1,9 @@
-// query-type: graph
+/**
+ * query-type: graph
+ *
+ * @kind graph-equivalence-test
+ */
+
 import sbb_test
 
 // Note: no instance of `SubBasicBlockCutNode`
diff --git a/cpp/ql/test/library-tests/syntax-zoo/aliased_ssa_consistency.expected b/cpp/ql/test/library-tests/syntax-zoo/aliased_ssa_consistency.expected
index 3e1b675f84e..66f9c9c375f 100644
--- a/cpp/ql/test/library-tests/syntax-zoo/aliased_ssa_consistency.expected
+++ b/cpp/ql/test/library-tests/syntax-zoo/aliased_ssa_consistency.expected
@@ -33,4 +33,271 @@ thisArgumentIsNonPointer
 | pointer_to_member.cpp:23:5:23:54 | Call: call to expression | Call instruction 'Call: call to expression' has a `this` argument operand that is not an address, in function '$@'. | pointer_to_member.cpp:14:5:14:9 | int usePM(int PM::*) | int usePM(int PM::*) |
 | pointer_to_member.cpp:24:5:24:49 | Call: call to expression | Call instruction 'Call: call to expression' has a `this` argument operand that is not an address, in function '$@'. | pointer_to_member.cpp:14:5:14:9 | int usePM(int PM::*) | int usePM(int PM::*) |
 nonUniqueIRVariable
+nonBooleanOperand
+| break_labels.c:4:9:4:14 | ConditionalBranch: ... != ... | Conditional branch instruction ConditionalBranch: ... != ... with non-Boolean condition, in function '$@'. | break_labels.c:2:12:2:12 | int f(int) | int f(int) |
+| break_labels.c:6:16:6:21 | ConditionalBranch: ... < ... | Conditional branch instruction ConditionalBranch: ... < ... with non-Boolean condition, in function '$@'. | break_labels.c:2:12:2:12 | int f(int) | int f(int) |
+| break_labels.c:7:17:7:24 | ConditionalBranch: ... == ... | Conditional branch instruction ConditionalBranch: ... == ... with non-Boolean condition, in function '$@'. | break_labels.c:2:12:2:12 | int f(int) | int f(int) |
+| break_labels.c:20:16:20:21 | ConditionalBranch: ... < ... | Conditional branch instruction ConditionalBranch: ... < ... with non-Boolean condition, in function '$@'. | break_labels.c:16:6:16:10 | void f_for() | void f_for() |
+| break_labels.c:21:13:21:18 | ConditionalBranch: ... == ... | Conditional branch instruction ConditionalBranch: ... == ... with non-Boolean condition, in function '$@'. | break_labels.c:16:6:16:10 | void f_for() | void f_for() |
+| break_labels.c:24:13:24:18 | ConditionalBranch: ... == ... | Conditional branch instruction ConditionalBranch: ... == ... with non-Boolean condition, in function '$@'. | break_labels.c:16:6:16:10 | void f_for() | void f_for() |
+| builtin.c:24:7:24:13 | ConditionalBranch: ... == ... | Conditional branch instruction ConditionalBranch: ... == ... with non-Boolean condition, in function '$@'. | builtin.c:5:5:5:11 | int builtin(int, int) | int builtin(int, int) |
+| builtin.c:28:7:28:29 | ConditionalBranch: call to __builtin_unpredictable | Conditional branch instruction ConditionalBranch: call to __builtin_unpredictable with non-Boolean condition, in function '$@'. | builtin.c:5:5:5:11 | int builtin(int, int) | int builtin(int, int) |
+| builtin.c:47:7:47:22 | ConditionalBranch: call to __builtin_memchr | Conditional branch instruction ConditionalBranch: call to __builtin_memchr with non-Boolean condition, in function '$@'. | builtin.c:5:5:5:11 | int builtin(int, int) | int builtin(int, int) |
+| dostmt.c:4:11:4:11 | ConditionalBranch: 0 | Conditional branch instruction ConditionalBranch: 0 with non-Boolean condition, in function '$@'. | dostmt.c:1:6:1:17 | void always_false() | void always_false() |
+| dostmt.c:28:11:28:11 | ConditionalBranch: 1 | Conditional branch instruction ConditionalBranch: 1 with non-Boolean condition, in function '$@'. | dostmt.c:25:13:25:25 | void always_true_3() | void always_true_3() |
+| dostmt.c:36:11:36:16 | ConditionalBranch: ... < ... | Conditional branch instruction ConditionalBranch: ... < ... with non-Boolean condition, in function '$@'. | dostmt.c:32:13:32:18 | void normal() | void normal() |
+| duff2.c:13:14:13:20 | ConditionalBranch: ... > ... | Conditional branch instruction ConditionalBranch: ... > ... with non-Boolean condition, in function '$@'. | duff2.c:2:6:2:12 | void duff2_8(int) | void duff2_8(int) |
+| duff2.c:21:14:21:20 | ConditionalBranch: ... > ... | Conditional branch instruction ConditionalBranch: ... > ... with non-Boolean condition, in function '$@'. | duff2.c:16:6:16:12 | void duff2_2(int) | void duff2_2(int) |
+| duff.c:13:22:13:28 | ConditionalBranch: ... > ... | Conditional branch instruction ConditionalBranch: ... > ... with non-Boolean condition, in function '$@'. | duff.c:2:13:2:13 | void f(int) | void f(int) |
+| dummyblock.c:2:9:2:9 | ConditionalBranch: 1 | Conditional branch instruction ConditionalBranch: 1 with non-Boolean condition, in function '$@'. | dummyblock.c:1:13:1:13 | void f() | void f() |
+| ifelsestmt.c:2:6:2:6 | ConditionalBranch: 0 | Conditional branch instruction ConditionalBranch: 0 with non-Boolean condition, in function '$@'. | ifelsestmt.c:1:13:1:26 | void always_false_1() | void always_false_1() |
+| ifelsestmt.c:12:6:12:6 | ConditionalBranch: 0 | Conditional branch instruction ConditionalBranch: 0 with non-Boolean condition, in function '$@'. | ifelsestmt.c:11:13:11:26 | void always_false_2() | void always_false_2() |
+| ifelsestmt.c:20:6:20:6 | ConditionalBranch: 1 | Conditional branch instruction ConditionalBranch: 1 with non-Boolean condition, in function '$@'. | ifelsestmt.c:19:13:19:25 | void always_true_1() | void always_true_1() |
+| ifelsestmt.c:30:6:30:6 | ConditionalBranch: 1 | Conditional branch instruction ConditionalBranch: 1 with non-Boolean condition, in function '$@'. | ifelsestmt.c:29:13:29:25 | void always_true_2() | void always_true_2() |
+| ifelsestmt.c:38:6:38:11 | ConditionalBranch: ... == ... | Conditional branch instruction ConditionalBranch: ... == ... with non-Boolean condition, in function '$@'. | ifelsestmt.c:37:13:37:18 | void normal(int, int) | void normal(int, int) |
+| ifstmt.c:2:6:2:6 | ConditionalBranch: 0 | Conditional branch instruction ConditionalBranch: 0 with non-Boolean condition, in function '$@'. | ifstmt.c:1:13:1:26 | void always_false_1() | void always_false_1() |
+| ifstmt.c:9:6:9:6 | ConditionalBranch: 0 | Conditional branch instruction ConditionalBranch: 0 with non-Boolean condition, in function '$@'. | ifstmt.c:8:13:8:26 | void always_false_2() | void always_false_2() |
+| ifstmt.c:15:6:15:6 | ConditionalBranch: 1 | Conditional branch instruction ConditionalBranch: 1 with non-Boolean condition, in function '$@'. | ifstmt.c:14:13:14:25 | void always_true_1() | void always_true_1() |
+| ifstmt.c:22:6:22:6 | ConditionalBranch: 1 | Conditional branch instruction ConditionalBranch: 1 with non-Boolean condition, in function '$@'. | ifstmt.c:21:13:21:25 | void always_true_2() | void always_true_2() |
+| ifstmt.c:28:6:28:11 | ConditionalBranch: ... == ... | Conditional branch instruction ConditionalBranch: ... == ... with non-Boolean condition, in function '$@'. | ifstmt.c:27:13:27:18 | void normal(int, int) | void normal(int, int) |
+| landexpr.c:3:6:3:6 | ConditionalBranch: a | Conditional branch instruction ConditionalBranch: a with non-Boolean condition, in function '$@'. | landexpr.c:1:13:1:13 | void f() | void f() |
+| landexpr.c:3:11:3:11 | ConditionalBranch: b | Conditional branch instruction ConditionalBranch: b with non-Boolean condition, in function '$@'. | landexpr.c:1:13:1:13 | void f() | void f() |
+| lorexpr.c:3:6:3:6 | ConditionalBranch: a | Conditional branch instruction ConditionalBranch: a with non-Boolean condition, in function '$@'. | lorexpr.c:1:13:1:13 | void f() | void f() |
+| lorexpr.c:3:11:3:11 | ConditionalBranch: b | Conditional branch instruction ConditionalBranch: b with non-Boolean condition, in function '$@'. | lorexpr.c:1:13:1:13 | void f() | void f() |
+| misc.c:22:9:22:12 | ConditionalBranch: argi | Conditional branch instruction ConditionalBranch: argi with non-Boolean condition, in function '$@'. | misc.c:16:6:16:10 | void misc1(int, int) | void misc1(int, int) |
+| misc.c:22:17:22:20 | ConditionalBranch: argj | Conditional branch instruction ConditionalBranch: argj with non-Boolean condition, in function '$@'. | misc.c:16:6:16:10 | void misc1(int, int) | void misc1(int, int) |
+| misc.c:27:9:27:12 | ConditionalBranch: argi | Conditional branch instruction ConditionalBranch: argi with non-Boolean condition, in function '$@'. | misc.c:16:6:16:10 | void misc1(int, int) | void misc1(int, int) |
+| misc.c:27:17:27:20 | ConditionalBranch: argj | Conditional branch instruction ConditionalBranch: argj with non-Boolean condition, in function '$@'. | misc.c:16:6:16:10 | void misc1(int, int) | void misc1(int, int) |
+| misc.c:32:9:32:9 | ConditionalBranch: i | Conditional branch instruction ConditionalBranch: i with non-Boolean condition, in function '$@'. | misc.c:16:6:16:10 | void misc1(int, int) | void misc1(int, int) |
+| misc.c:32:14:32:14 | ConditionalBranch: j | Conditional branch instruction ConditionalBranch: j with non-Boolean condition, in function '$@'. | misc.c:16:6:16:10 | void misc1(int, int) | void misc1(int, int) |
+| misc.c:37:9:37:9 | ConditionalBranch: i | Conditional branch instruction ConditionalBranch: i with non-Boolean condition, in function '$@'. | misc.c:16:6:16:10 | void misc1(int, int) | void misc1(int, int) |
+| misc.c:37:14:37:14 | ConditionalBranch: j | Conditional branch instruction ConditionalBranch: j with non-Boolean condition, in function '$@'. | misc.c:16:6:16:10 | void misc1(int, int) | void misc1(int, int) |
+| misc.c:44:11:44:11 | ConditionalBranch: i | Conditional branch instruction ConditionalBranch: i with non-Boolean condition, in function '$@'. | misc.c:16:6:16:10 | void misc1(int, int) | void misc1(int, int) |
+| misc.c:47:11:47:11 | ConditionalBranch: i | Conditional branch instruction ConditionalBranch: i with non-Boolean condition, in function '$@'. | misc.c:16:6:16:10 | void misc1(int, int) | void misc1(int, int) |
+| misc.c:47:16:47:16 | ConditionalBranch: j | Conditional branch instruction ConditionalBranch: j with non-Boolean condition, in function '$@'. | misc.c:16:6:16:10 | void misc1(int, int) | void misc1(int, int) |
+| misc.c:50:11:50:11 | ConditionalBranch: i | Conditional branch instruction ConditionalBranch: i with non-Boolean condition, in function '$@'. | misc.c:16:6:16:10 | void misc1(int, int) | void misc1(int, int) |
+| misc.c:50:16:50:16 | ConditionalBranch: j | Conditional branch instruction ConditionalBranch: j with non-Boolean condition, in function '$@'. | misc.c:16:6:16:10 | void misc1(int, int) | void misc1(int, int) |
+| misc.c:53:11:53:14 | ConditionalBranch: argi | Conditional branch instruction ConditionalBranch: argi with non-Boolean condition, in function '$@'. | misc.c:16:6:16:10 | void misc1(int, int) | void misc1(int, int) |
+| misc.c:58:13:58:13 | ConditionalBranch: i | Conditional branch instruction ConditionalBranch: i with non-Boolean condition, in function '$@'. | misc.c:16:6:16:10 | void misc1(int, int) | void misc1(int, int) |
+| misc.c:61:13:61:16 | ConditionalBranch: argi | Conditional branch instruction ConditionalBranch: argi with non-Boolean condition, in function '$@'. | misc.c:16:6:16:10 | void misc1(int, int) | void misc1(int, int) |
+| misc.c:62:16:62:21 | ConditionalBranch: ... < ... | Conditional branch instruction ConditionalBranch: ... < ... with non-Boolean condition, in function '$@'. | misc.c:16:6:16:10 | void misc1(int, int) | void misc1(int, int) |
+| misc.c:64:11:64:16 | ConditionalBranch: ... < ... | Conditional branch instruction ConditionalBranch: ... < ... with non-Boolean condition, in function '$@'. | misc.c:16:6:16:10 | void misc1(int, int) | void misc1(int, int) |
+| misc.c:93:9:93:15 | ConditionalBranch: ... ? ... : ... | Conditional branch instruction ConditionalBranch: ... ? ... : ... with non-Boolean condition, in function '$@'. | misc.c:91:6:91:33 | void gnuConditionalOmittedOperand(someStruct*) | void gnuConditionalOmittedOperand(someStruct*) |
+| misc.c:94:9:94:19 | ConditionalBranch: ... ? ... : ... | Conditional branch instruction ConditionalBranch: ... ? ... : ... with non-Boolean condition, in function '$@'. | misc.c:91:6:91:33 | void gnuConditionalOmittedOperand(someStruct*) | void gnuConditionalOmittedOperand(someStruct*) |
+| misc.c:139:10:139:18 | ConditionalBranch: ... & ... | Conditional branch instruction ConditionalBranch: ... & ... with non-Boolean condition, in function '$@'. | misc.c:97:6:97:10 | void misc3() | void misc3() |
+| misc.c:139:25:139:33 | ConditionalBranch: ... & ... | Conditional branch instruction ConditionalBranch: ... & ... with non-Boolean condition, in function '$@'. | misc.c:97:6:97:10 | void misc3() | void misc3() |
+| misc.c:140:9:140:9 | ConditionalBranch: i | Conditional branch instruction ConditionalBranch: i with non-Boolean condition, in function '$@'. | misc.c:97:6:97:10 | void misc3() | void misc3() |
+| misc.c:140:14:140:14 | ConditionalBranch: i | Conditional branch instruction ConditionalBranch: i with non-Boolean condition, in function '$@'. | misc.c:97:6:97:10 | void misc3() | void misc3() |
+| misc.c:140:19:140:19 | ConditionalBranch: i | Conditional branch instruction ConditionalBranch: i with non-Boolean condition, in function '$@'. | misc.c:97:6:97:10 | void misc3() | void misc3() |
+| misc.c:141:9:141:9 | ConditionalBranch: i | Conditional branch instruction ConditionalBranch: i with non-Boolean condition, in function '$@'. | misc.c:97:6:97:10 | void misc3() | void misc3() |
+| misc.c:141:14:141:14 | ConditionalBranch: i | Conditional branch instruction ConditionalBranch: i with non-Boolean condition, in function '$@'. | misc.c:97:6:97:10 | void misc3() | void misc3() |
+| misc.c:141:19:141:19 | ConditionalBranch: i | Conditional branch instruction ConditionalBranch: i with non-Boolean condition, in function '$@'. | misc.c:97:6:97:10 | void misc3() | void misc3() |
+| misc.c:192:11:192:11 | ConditionalBranch: 1 | Conditional branch instruction ConditionalBranch: 1 with non-Boolean condition, in function '$@'. | misc.c:191:6:191:20 | void unreachable_end() | void unreachable_end() |
+| pruning.c:5:9:5:9 | ConditionalBranch: 0 | Conditional branch instruction ConditionalBranch: 0 with non-Boolean condition, in function '$@'. | pruning.c:4:6:4:8 | void f_0() | void f_0() |
+| pruning.c:13:9:13:9 | ConditionalBranch: 1 | Conditional branch instruction ConditionalBranch: 1 with non-Boolean condition, in function '$@'. | pruning.c:12:6:12:8 | void f_1() | void f_1() |
+| pruning.c:21:9:21:11 | ConditionalBranch: 256 | Conditional branch instruction ConditionalBranch: 256 with non-Boolean condition, in function '$@'. | pruning.c:20:6:20:10 | void f_256() | void f_256() |
+| pruning.c:29:9:29:18 | ConditionalBranch: (uint8_t)... | Conditional branch instruction ConditionalBranch: (uint8_t)... with non-Boolean condition, in function '$@'. | pruning.c:28:6:28:16 | void f_uint8_t_0() | void f_uint8_t_0() |
+| pruning.c:37:9:37:18 | ConditionalBranch: (uint8_t)... | Conditional branch instruction ConditionalBranch: (uint8_t)... with non-Boolean condition, in function '$@'. | pruning.c:36:6:36:16 | void f_uint8_t_1() | void f_uint8_t_1() |
+| pruning.c:45:9:45:20 | ConditionalBranch: (uint8_t)... | Conditional branch instruction ConditionalBranch: (uint8_t)... with non-Boolean condition, in function '$@'. | pruning.c:44:6:44:18 | void f_uint8_t_256() | void f_uint8_t_256() |
+| pruning.c:53:9:53:20 | ConditionalBranch: (uint8_t)... | Conditional branch instruction ConditionalBranch: (uint8_t)... with non-Boolean condition, in function '$@'. | pruning.c:52:6:52:18 | void f_uint8_t_257() | void f_uint8_t_257() |
+| pruning.c:61:9:61:26 | ConditionalBranch: ... == ... | Conditional branch instruction ConditionalBranch: ... == ... with non-Boolean condition, in function '$@'. | pruning.c:60:6:60:21 | void f_uint8_t_minus1() | void f_uint8_t_minus1() |
+| pruning.c:70:9:70:9 | ConditionalBranch: i | Conditional branch instruction ConditionalBranch: i with non-Boolean condition, in function '$@'. | pruning.c:68:6:68:14 | void f_v_int_0() | void f_v_int_0() |
+| pruning.c:79:9:79:9 | ConditionalBranch: i | Conditional branch instruction ConditionalBranch: i with non-Boolean condition, in function '$@'. | pruning.c:77:6:77:14 | void f_v_int_1() | void f_v_int_1() |
+| pruning.c:88:9:88:9 | ConditionalBranch: i | Conditional branch instruction ConditionalBranch: i with non-Boolean condition, in function '$@'. | pruning.c:86:6:86:16 | void f_v_int_256() | void f_v_int_256() |
+| pruning.c:97:9:97:9 | ConditionalBranch: i | Conditional branch instruction ConditionalBranch: i with non-Boolean condition, in function '$@'. | pruning.c:95:6:95:18 | void f_v_uint8_t_0() | void f_v_uint8_t_0() |
+| pruning.c:106:9:106:9 | ConditionalBranch: i | Conditional branch instruction ConditionalBranch: i with non-Boolean condition, in function '$@'. | pruning.c:104:6:104:18 | void f_v_uint8_t_1() | void f_v_uint8_t_1() |
+| pruning.c:115:9:115:9 | ConditionalBranch: i | Conditional branch instruction ConditionalBranch: i with non-Boolean condition, in function '$@'. | pruning.c:113:6:113:20 | void f_v_uint8_t_256() | void f_v_uint8_t_256() |
+| pruning.c:124:9:124:9 | ConditionalBranch: i | Conditional branch instruction ConditionalBranch: i with non-Boolean condition, in function '$@'. | pruning.c:122:6:122:20 | void f_v_uint8_t_257() | void f_v_uint8_t_257() |
+| pruning.c:133:9:133:16 | ConditionalBranch: ... == ... | Conditional branch instruction ConditionalBranch: ... == ... with non-Boolean condition, in function '$@'. | pruning.c:131:6:131:23 | void f_v_uint8_t_minus1() | void f_v_uint8_t_minus1() |
+| questionexpr.c:3:6:3:11 | ConditionalBranch: ... == ... | Conditional branch instruction ConditionalBranch: ... == ... with non-Boolean condition, in function '$@'. | questionexpr.c:1:13:1:13 | void f() | void f() |
+| range_analysis.c:7:10:7:10 | ConditionalBranch: p | Conditional branch instruction ConditionalBranch: p with non-Boolean condition, in function '$@'. | range_analysis.c:5:5:5:9 | int test1(List*) | int test1(List*) |
+| range_analysis.c:15:10:15:10 | ConditionalBranch: p | Conditional branch instruction ConditionalBranch: p with non-Boolean condition, in function '$@'. | range_analysis.c:13:5:13:9 | int test2(List*) | int test2(List*) |
+| range_analysis.c:23:10:23:10 | ConditionalBranch: p | Conditional branch instruction ConditionalBranch: p with non-Boolean condition, in function '$@'. | range_analysis.c:21:5:21:9 | int test3(List*) | int test3(List*) |
+| range_analysis.c:33:15:33:19 | ConditionalBranch: ... < ... | Conditional branch instruction ConditionalBranch: ... < ... with non-Boolean condition, in function '$@'. | range_analysis.c:30:5:30:9 | int test4() | int test4() |
+| range_analysis.c:42:15:42:19 | ConditionalBranch: ... < ... | Conditional branch instruction ConditionalBranch: ... < ... with non-Boolean condition, in function '$@'. | range_analysis.c:39:5:39:9 | int test5() | int test5() |
+| range_analysis.c:51:15:51:21 | ConditionalBranch: ... < ... | Conditional branch instruction ConditionalBranch: ... < ... with non-Boolean condition, in function '$@'. | range_analysis.c:48:5:48:9 | int test6() | int test6() |
+| range_analysis.c:58:7:58:11 | ConditionalBranch: ... < ... | Conditional branch instruction ConditionalBranch: ... < ... with non-Boolean condition, in function '$@'. | range_analysis.c:57:5:57:9 | int test7(int) | int test7(int) |
+| range_analysis.c:59:9:59:13 | ConditionalBranch: ... < ... | Conditional branch instruction ConditionalBranch: ... < ... with non-Boolean condition, in function '$@'. | range_analysis.c:57:5:57:9 | int test7(int) | int test7(int) |
+| range_analysis.c:67:7:67:15 | ConditionalBranch: ... < ... | Conditional branch instruction ConditionalBranch: ... < ... with non-Boolean condition, in function '$@'. | range_analysis.c:66:5:66:9 | int test8(int, int) | int test8(int, int) |
+| range_analysis.c:67:20:67:25 | ConditionalBranch: ... < ... | Conditional branch instruction ConditionalBranch: ... < ... with non-Boolean condition, in function '$@'. | range_analysis.c:66:5:66:9 | int test8(int, int) | int test8(int, int) |
+| range_analysis.c:68:9:68:15 | ConditionalBranch: ... < ... | Conditional branch instruction ConditionalBranch: ... < ... with non-Boolean condition, in function '$@'. | range_analysis.c:66:5:66:9 | int test8(int, int) | int test8(int, int) |
+| range_analysis.c:76:7:76:12 | ConditionalBranch: ... == ... | Conditional branch instruction ConditionalBranch: ... == ... with non-Boolean condition, in function '$@'. | range_analysis.c:75:5:75:9 | int test9(int, int) | int test9(int, int) |
+| range_analysis.c:77:9:77:13 | ConditionalBranch: ... < ... | Conditional branch instruction ConditionalBranch: ... < ... with non-Boolean condition, in function '$@'. | range_analysis.c:75:5:75:9 | int test9(int, int) | int test9(int, int) |
+| range_analysis.c:81:9:81:13 | ConditionalBranch: ... < ... | Conditional branch instruction ConditionalBranch: ... < ... with non-Boolean condition, in function '$@'. | range_analysis.c:75:5:75:9 | int test9(int, int) | int test9(int, int) |
+| range_analysis.c:89:7:89:11 | ConditionalBranch: ... > ... | Conditional branch instruction ConditionalBranch: ... > ... with non-Boolean condition, in function '$@'. | range_analysis.c:88:5:88:10 | int test10(int, int) | int test10(int, int) |
+| range_analysis.c:90:9:90:13 | ConditionalBranch: ... < ... | Conditional branch instruction ConditionalBranch: ... < ... with non-Boolean condition, in function '$@'. | range_analysis.c:88:5:88:10 | int test10(int, int) | int test10(int, int) |
+| range_analysis.c:101:7:101:15 | ConditionalBranch: ... != ... | Conditional branch instruction ConditionalBranch: ... != ... with non-Boolean condition, in function '$@'. | range_analysis.c:98:5:98:10 | int test11(char*) | int test11(char*) |
+| range_analysis.c:104:7:104:14 | ConditionalBranch: ... == ... | Conditional branch instruction ConditionalBranch: ... == ... with non-Boolean condition, in function '$@'. | range_analysis.c:98:5:98:10 | int test11(char*) | int test11(char*) |
+| range_analysis.c:106:9:106:17 | ConditionalBranch: ... != ... | Conditional branch instruction ConditionalBranch: ... != ... with non-Boolean condition, in function '$@'. | range_analysis.c:98:5:98:10 | int test11(char*) | int test11(char*) |
+| range_analysis.c:109:9:109:16 | ConditionalBranch: ... != ... | Conditional branch instruction ConditionalBranch: ... != ... with non-Boolean condition, in function '$@'. | range_analysis.c:98:5:98:10 | int test11(char*) | int test11(char*) |
+| range_analysis.c:124:11:124:36 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:122:5:122:10 | int test12() | int test12() |
+| range_analysis.c:154:11:154:15 | ConditionalBranch: ... > ... | Conditional branch instruction ConditionalBranch: ... > ... with non-Boolean condition, in function '$@'. | range_analysis.c:153:11:153:16 | long long test15(long long) | long long test15(long long) |
+| range_analysis.c:154:20:154:30 | ConditionalBranch: ... == ... | Conditional branch instruction ConditionalBranch: ... == ... with non-Boolean condition, in function '$@'. | range_analysis.c:153:11:153:16 | long long test15(long long) | long long test15(long long) |
+| range_analysis.c:161:7:161:12 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:158:5:158:14 | int test_unary(int) | int test_unary(int) |
+| range_analysis.c:161:17:161:23 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:158:5:158:14 | int test_unary(int) | int test_unary(int) |
+| range_analysis.c:166:7:166:12 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:158:5:158:14 | int test_unary(int) | int test_unary(int) |
+| range_analysis.c:166:17:166:23 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:158:5:158:14 | int test_unary(int) | int test_unary(int) |
+| range_analysis.c:171:7:171:13 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:158:5:158:14 | int test_unary(int) | int test_unary(int) |
+| range_analysis.c:171:18:171:24 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:158:5:158:14 | int test_unary(int) | int test_unary(int) |
+| range_analysis.c:176:7:176:13 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:158:5:158:14 | int test_unary(int) | int test_unary(int) |
+| range_analysis.c:176:18:176:23 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:158:5:158:14 | int test_unary(int) | int test_unary(int) |
+| range_analysis.c:181:7:181:13 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:158:5:158:14 | int test_unary(int) | int test_unary(int) |
+| range_analysis.c:181:18:181:23 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:158:5:158:14 | int test_unary(int) | int test_unary(int) |
+| range_analysis.c:186:7:186:13 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:158:5:158:14 | int test_unary(int) | int test_unary(int) |
+| range_analysis.c:186:18:186:24 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:158:5:158:14 | int test_unary(int) | int test_unary(int) |
+| range_analysis.c:200:7:200:12 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:197:5:197:15 | int test_mult01(int, int) | int test_mult01(int, int) |
+| range_analysis.c:200:17:200:23 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:197:5:197:15 | int test_mult01(int, int) | int test_mult01(int, int) |
+| range_analysis.c:200:28:200:33 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:197:5:197:15 | int test_mult01(int, int) | int test_mult01(int, int) |
+| range_analysis.c:200:38:200:44 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:197:5:197:15 | int test_mult01(int, int) | int test_mult01(int, int) |
+| range_analysis.c:204:7:204:12 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:197:5:197:15 | int test_mult01(int, int) | int test_mult01(int, int) |
+| range_analysis.c:204:17:204:23 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:197:5:197:15 | int test_mult01(int, int) | int test_mult01(int, int) |
+| range_analysis.c:204:28:204:33 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:197:5:197:15 | int test_mult01(int, int) | int test_mult01(int, int) |
+| range_analysis.c:204:38:204:44 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:197:5:197:15 | int test_mult01(int, int) | int test_mult01(int, int) |
+| range_analysis.c:208:7:208:12 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:197:5:197:15 | int test_mult01(int, int) | int test_mult01(int, int) |
+| range_analysis.c:208:17:208:23 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:197:5:197:15 | int test_mult01(int, int) | int test_mult01(int, int) |
+| range_analysis.c:208:28:208:35 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:197:5:197:15 | int test_mult01(int, int) | int test_mult01(int, int) |
+| range_analysis.c:208:40:208:46 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:197:5:197:15 | int test_mult01(int, int) | int test_mult01(int, int) |
+| range_analysis.c:212:7:212:12 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:197:5:197:15 | int test_mult01(int, int) | int test_mult01(int, int) |
+| range_analysis.c:212:17:212:23 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:197:5:197:15 | int test_mult01(int, int) | int test_mult01(int, int) |
+| range_analysis.c:212:28:212:35 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:197:5:197:15 | int test_mult01(int, int) | int test_mult01(int, int) |
+| range_analysis.c:212:40:212:45 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:197:5:197:15 | int test_mult01(int, int) | int test_mult01(int, int) |
+| range_analysis.c:216:7:216:12 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:197:5:197:15 | int test_mult01(int, int) | int test_mult01(int, int) |
+| range_analysis.c:216:17:216:23 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:197:5:197:15 | int test_mult01(int, int) | int test_mult01(int, int) |
+| range_analysis.c:216:28:216:35 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:197:5:197:15 | int test_mult01(int, int) | int test_mult01(int, int) |
+| range_analysis.c:216:40:216:46 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:197:5:197:15 | int test_mult01(int, int) | int test_mult01(int, int) |
+| range_analysis.c:228:7:228:12 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:225:5:225:15 | int test_mult02(int, int) | int test_mult02(int, int) |
+| range_analysis.c:228:17:228:23 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:225:5:225:15 | int test_mult02(int, int) | int test_mult02(int, int) |
+| range_analysis.c:228:28:228:33 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:225:5:225:15 | int test_mult02(int, int) | int test_mult02(int, int) |
+| range_analysis.c:228:38:228:44 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:225:5:225:15 | int test_mult02(int, int) | int test_mult02(int, int) |
+| range_analysis.c:232:7:232:12 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:225:5:225:15 | int test_mult02(int, int) | int test_mult02(int, int) |
+| range_analysis.c:232:17:232:23 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:225:5:225:15 | int test_mult02(int, int) | int test_mult02(int, int) |
+| range_analysis.c:232:28:232:33 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:225:5:225:15 | int test_mult02(int, int) | int test_mult02(int, int) |
+| range_analysis.c:232:38:232:44 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:225:5:225:15 | int test_mult02(int, int) | int test_mult02(int, int) |
+| range_analysis.c:236:7:236:12 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:225:5:225:15 | int test_mult02(int, int) | int test_mult02(int, int) |
+| range_analysis.c:236:17:236:23 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:225:5:225:15 | int test_mult02(int, int) | int test_mult02(int, int) |
+| range_analysis.c:236:28:236:35 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:225:5:225:15 | int test_mult02(int, int) | int test_mult02(int, int) |
+| range_analysis.c:236:40:236:46 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:225:5:225:15 | int test_mult02(int, int) | int test_mult02(int, int) |
+| range_analysis.c:240:7:240:12 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:225:5:225:15 | int test_mult02(int, int) | int test_mult02(int, int) |
+| range_analysis.c:240:17:240:23 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:225:5:225:15 | int test_mult02(int, int) | int test_mult02(int, int) |
+| range_analysis.c:240:28:240:35 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:225:5:225:15 | int test_mult02(int, int) | int test_mult02(int, int) |
+| range_analysis.c:240:40:240:45 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:225:5:225:15 | int test_mult02(int, int) | int test_mult02(int, int) |
+| range_analysis.c:244:7:244:12 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:225:5:225:15 | int test_mult02(int, int) | int test_mult02(int, int) |
+| range_analysis.c:244:17:244:23 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:225:5:225:15 | int test_mult02(int, int) | int test_mult02(int, int) |
+| range_analysis.c:244:28:244:35 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:225:5:225:15 | int test_mult02(int, int) | int test_mult02(int, int) |
+| range_analysis.c:244:40:244:46 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:225:5:225:15 | int test_mult02(int, int) | int test_mult02(int, int) |
+| range_analysis.c:256:7:256:14 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:253:5:253:15 | int test_mult03(int, int) | int test_mult03(int, int) |
+| range_analysis.c:256:19:256:25 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:253:5:253:15 | int test_mult03(int, int) | int test_mult03(int, int) |
+| range_analysis.c:256:30:256:35 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:253:5:253:15 | int test_mult03(int, int) | int test_mult03(int, int) |
+| range_analysis.c:256:40:256:46 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:253:5:253:15 | int test_mult03(int, int) | int test_mult03(int, int) |
+| range_analysis.c:260:7:260:14 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:253:5:253:15 | int test_mult03(int, int) | int test_mult03(int, int) |
+| range_analysis.c:260:19:260:25 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:253:5:253:15 | int test_mult03(int, int) | int test_mult03(int, int) |
+| range_analysis.c:260:30:260:35 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:253:5:253:15 | int test_mult03(int, int) | int test_mult03(int, int) |
+| range_analysis.c:260:40:260:46 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:253:5:253:15 | int test_mult03(int, int) | int test_mult03(int, int) |
+| range_analysis.c:264:7:264:14 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:253:5:253:15 | int test_mult03(int, int) | int test_mult03(int, int) |
+| range_analysis.c:264:19:264:25 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:253:5:253:15 | int test_mult03(int, int) | int test_mult03(int, int) |
+| range_analysis.c:264:30:264:37 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:253:5:253:15 | int test_mult03(int, int) | int test_mult03(int, int) |
+| range_analysis.c:264:42:264:48 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:253:5:253:15 | int test_mult03(int, int) | int test_mult03(int, int) |
+| range_analysis.c:268:7:268:14 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:253:5:253:15 | int test_mult03(int, int) | int test_mult03(int, int) |
+| range_analysis.c:268:19:268:25 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:253:5:253:15 | int test_mult03(int, int) | int test_mult03(int, int) |
+| range_analysis.c:268:30:268:37 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:253:5:253:15 | int test_mult03(int, int) | int test_mult03(int, int) |
+| range_analysis.c:268:42:268:47 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:253:5:253:15 | int test_mult03(int, int) | int test_mult03(int, int) |
+| range_analysis.c:272:7:272:14 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:253:5:253:15 | int test_mult03(int, int) | int test_mult03(int, int) |
+| range_analysis.c:272:19:272:25 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:253:5:253:15 | int test_mult03(int, int) | int test_mult03(int, int) |
+| range_analysis.c:272:30:272:37 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:253:5:253:15 | int test_mult03(int, int) | int test_mult03(int, int) |
+| range_analysis.c:272:42:272:48 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:253:5:253:15 | int test_mult03(int, int) | int test_mult03(int, int) |
+| range_analysis.c:284:7:284:14 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:281:5:281:15 | int test_mult04(int, int) | int test_mult04(int, int) |
+| range_analysis.c:284:19:284:24 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:281:5:281:15 | int test_mult04(int, int) | int test_mult04(int, int) |
+| range_analysis.c:284:29:284:34 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:281:5:281:15 | int test_mult04(int, int) | int test_mult04(int, int) |
+| range_analysis.c:284:39:284:45 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:281:5:281:15 | int test_mult04(int, int) | int test_mult04(int, int) |
+| range_analysis.c:288:7:288:14 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:281:5:281:15 | int test_mult04(int, int) | int test_mult04(int, int) |
+| range_analysis.c:288:19:288:24 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:281:5:281:15 | int test_mult04(int, int) | int test_mult04(int, int) |
+| range_analysis.c:288:29:288:34 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:281:5:281:15 | int test_mult04(int, int) | int test_mult04(int, int) |
+| range_analysis.c:288:39:288:45 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:281:5:281:15 | int test_mult04(int, int) | int test_mult04(int, int) |
+| range_analysis.c:292:7:292:14 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:281:5:281:15 | int test_mult04(int, int) | int test_mult04(int, int) |
+| range_analysis.c:292:19:292:24 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:281:5:281:15 | int test_mult04(int, int) | int test_mult04(int, int) |
+| range_analysis.c:292:29:292:36 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:281:5:281:15 | int test_mult04(int, int) | int test_mult04(int, int) |
+| range_analysis.c:292:41:292:47 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:281:5:281:15 | int test_mult04(int, int) | int test_mult04(int, int) |
+| range_analysis.c:296:7:296:14 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:281:5:281:15 | int test_mult04(int, int) | int test_mult04(int, int) |
+| range_analysis.c:296:19:296:24 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:281:5:281:15 | int test_mult04(int, int) | int test_mult04(int, int) |
+| range_analysis.c:296:29:296:36 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:281:5:281:15 | int test_mult04(int, int) | int test_mult04(int, int) |
+| range_analysis.c:296:41:296:46 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:281:5:281:15 | int test_mult04(int, int) | int test_mult04(int, int) |
+| range_analysis.c:300:7:300:14 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:281:5:281:15 | int test_mult04(int, int) | int test_mult04(int, int) |
+| range_analysis.c:300:19:300:24 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:281:5:281:15 | int test_mult04(int, int) | int test_mult04(int, int) |
+| range_analysis.c:300:29:300:36 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:281:5:281:15 | int test_mult04(int, int) | int test_mult04(int, int) |
+| range_analysis.c:300:41:300:47 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:281:5:281:15 | int test_mult04(int, int) | int test_mult04(int, int) |
+| range_analysis.c:312:7:312:14 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:309:5:309:15 | int test_mult05(int, int) | int test_mult05(int, int) |
+| range_analysis.c:312:19:312:25 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:309:5:309:15 | int test_mult05(int, int) | int test_mult05(int, int) |
+| range_analysis.c:312:30:312:35 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:309:5:309:15 | int test_mult05(int, int) | int test_mult05(int, int) |
+| range_analysis.c:312:40:312:46 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:309:5:309:15 | int test_mult05(int, int) | int test_mult05(int, int) |
+| range_analysis.c:316:7:316:14 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:309:5:309:15 | int test_mult05(int, int) | int test_mult05(int, int) |
+| range_analysis.c:316:19:316:25 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:309:5:309:15 | int test_mult05(int, int) | int test_mult05(int, int) |
+| range_analysis.c:316:30:316:35 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:309:5:309:15 | int test_mult05(int, int) | int test_mult05(int, int) |
+| range_analysis.c:316:40:316:46 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:309:5:309:15 | int test_mult05(int, int) | int test_mult05(int, int) |
+| range_analysis.c:320:7:320:14 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:309:5:309:15 | int test_mult05(int, int) | int test_mult05(int, int) |
+| range_analysis.c:320:19:320:25 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:309:5:309:15 | int test_mult05(int, int) | int test_mult05(int, int) |
+| range_analysis.c:320:30:320:37 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:309:5:309:15 | int test_mult05(int, int) | int test_mult05(int, int) |
+| range_analysis.c:320:42:320:48 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:309:5:309:15 | int test_mult05(int, int) | int test_mult05(int, int) |
+| range_analysis.c:324:7:324:14 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:309:5:309:15 | int test_mult05(int, int) | int test_mult05(int, int) |
+| range_analysis.c:324:19:324:25 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:309:5:309:15 | int test_mult05(int, int) | int test_mult05(int, int) |
+| range_analysis.c:324:30:324:37 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:309:5:309:15 | int test_mult05(int, int) | int test_mult05(int, int) |
+| range_analysis.c:324:42:324:47 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:309:5:309:15 | int test_mult05(int, int) | int test_mult05(int, int) |
+| range_analysis.c:328:7:328:14 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:309:5:309:15 | int test_mult05(int, int) | int test_mult05(int, int) |
+| range_analysis.c:328:19:328:25 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:309:5:309:15 | int test_mult05(int, int) | int test_mult05(int, int) |
+| range_analysis.c:328:30:328:37 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:309:5:309:15 | int test_mult05(int, int) | int test_mult05(int, int) |
+| range_analysis.c:328:42:328:48 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:309:5:309:15 | int test_mult05(int, int) | int test_mult05(int, int) |
+| range_analysis.c:338:7:338:11 | ConditionalBranch: ... < ... | Conditional branch instruction ConditionalBranch: ... < ... with non-Boolean condition, in function '$@'. | range_analysis.c:336:5:336:10 | int test16(int) | int test16(int) |
+| range_analysis.c:342:10:342:14 | ConditionalBranch: ... < ... | Conditional branch instruction ConditionalBranch: ... < ... with non-Boolean condition, in function '$@'. | range_analysis.c:336:5:336:10 | int test16(int) | int test16(int) |
+| range_analysis.c:346:7:346:11 | ConditionalBranch: ... < ... | Conditional branch instruction ConditionalBranch: ... < ... with non-Boolean condition, in function '$@'. | range_analysis.c:336:5:336:10 | int test16(int) | int test16(int) |
+| range_analysis.c:347:9:347:14 | ConditionalBranch: ... > ... | Conditional branch instruction ConditionalBranch: ... > ... with non-Boolean condition, in function '$@'. | range_analysis.c:336:5:336:10 | int test16(int) | int test16(int) |
+| range_analysis.c:357:8:357:14 | ConditionalBranch: ... < ... | Conditional branch instruction ConditionalBranch: ... < ... with non-Boolean condition, in function '$@'. | range_analysis.c:355:14:355:27 | unsigned int test_ternary01(unsigned int) | unsigned int test_ternary01(unsigned int) |
+| range_analysis.c:358:8:358:15 | ConditionalBranch: ... >= ... | Conditional branch instruction ConditionalBranch: ... >= ... with non-Boolean condition, in function '$@'. | range_analysis.c:355:14:355:27 | unsigned int test_ternary01(unsigned int) | unsigned int test_ternary01(unsigned int) |
+| range_analysis.c:365:7:365:13 | ConditionalBranch: ... < ... | Conditional branch instruction ConditionalBranch: ... < ... with non-Boolean condition, in function '$@'. | range_analysis.c:355:14:355:27 | unsigned int test_ternary01(unsigned int) | unsigned int test_ternary01(unsigned int) |
+| range_analysis.c:366:10:366:15 | ConditionalBranch: ... ? ... : ... | Conditional branch instruction ConditionalBranch: ... ? ... : ... with non-Boolean condition, in function '$@'. | range_analysis.c:355:14:355:27 | unsigned int test_ternary01(unsigned int) | unsigned int test_ternary01(unsigned int) |
+| range_analysis.c:367:10:367:17 | ConditionalBranch: ... ? ... : ... | Conditional branch instruction ConditionalBranch: ... ? ... : ... with non-Boolean condition, in function '$@'. | range_analysis.c:355:14:355:27 | unsigned int test_ternary01(unsigned int) | unsigned int test_ternary01(unsigned int) |
+| range_analysis.c:368:10:368:21 | ConditionalBranch: ... ? ... : ... | Conditional branch instruction ConditionalBranch: ... ? ... : ... with non-Boolean condition, in function '$@'. | range_analysis.c:355:14:355:27 | unsigned int test_ternary01(unsigned int) | unsigned int test_ternary01(unsigned int) |
+| range_analysis.c:369:10:369:36 | ConditionalBranch: ... ? ... : ... | Conditional branch instruction ConditionalBranch: ... ? ... : ... with non-Boolean condition, in function '$@'. | range_analysis.c:355:14:355:27 | unsigned int test_ternary01(unsigned int) | unsigned int test_ternary01(unsigned int) |
+| range_analysis.c:370:10:370:38 | ConditionalBranch: ... ? ... : ... | Conditional branch instruction ConditionalBranch: ... ? ... : ... with non-Boolean condition, in function '$@'. | range_analysis.c:355:14:355:27 | unsigned int test_ternary01(unsigned int) | unsigned int test_ternary01(unsigned int) |
+| range_analysis.c:371:10:371:39 | ConditionalBranch: ... ? ... : ... | Conditional branch instruction ConditionalBranch: ... ? ... : ... with non-Boolean condition, in function '$@'. | range_analysis.c:355:14:355:27 | unsigned int test_ternary01(unsigned int) | unsigned int test_ternary01(unsigned int) |
+| range_analysis.c:379:8:379:14 | ConditionalBranch: ... > ... | Conditional branch instruction ConditionalBranch: ... > ... with non-Boolean condition, in function '$@'. | range_analysis.c:377:14:377:27 | unsigned int test_ternary02(unsigned int) | unsigned int test_ternary02(unsigned int) |
+| range_analysis.c:380:8:380:15 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:377:14:377:27 | unsigned int test_ternary02(unsigned int) | unsigned int test_ternary02(unsigned int) |
+| range_analysis.c:384:7:384:14 | ConditionalBranch: ... >= ... | Conditional branch instruction ConditionalBranch: ... >= ... with non-Boolean condition, in function '$@'. | range_analysis.c:377:14:377:27 | unsigned int test_ternary02(unsigned int) | unsigned int test_ternary02(unsigned int) |
+| range_analysis.c:385:10:385:21 | ConditionalBranch: ... ? ... : ... | Conditional branch instruction ConditionalBranch: ... ? ... : ... with non-Boolean condition, in function '$@'. | range_analysis.c:377:14:377:27 | unsigned int test_ternary02(unsigned int) | unsigned int test_ternary02(unsigned int) |
+| range_analysis.c:386:10:386:21 | ConditionalBranch: ... ? ... : ... | Conditional branch instruction ConditionalBranch: ... ? ... : ... with non-Boolean condition, in function '$@'. | range_analysis.c:377:14:377:27 | unsigned int test_ternary02(unsigned int) | unsigned int test_ternary02(unsigned int) |
+| range_analysis.c:387:10:387:38 | ConditionalBranch: ... ? ... : ... | Conditional branch instruction ConditionalBranch: ... ? ... : ... with non-Boolean condition, in function '$@'. | range_analysis.c:377:14:377:27 | unsigned int test_ternary02(unsigned int) | unsigned int test_ternary02(unsigned int) |
+| range_analysis.c:394:20:394:26 | ConditionalBranch: ... < ... | Conditional branch instruction ConditionalBranch: ... < ... with non-Boolean condition, in function '$@'. | range_analysis.c:393:14:393:25 | unsigned int test_comma01(unsigned int) | unsigned int test_comma01(unsigned int) |
+| switchbody.c:5:11:5:15 | ConditionalBranch: ... < ... | Conditional branch instruction ConditionalBranch: ... < ... with non-Boolean condition, in function '$@'. | switchbody.c:4:5:4:16 | int switch_block(int) | int switch_block(int) |
+| switchbody.c:16:11:16:15 | ConditionalBranch: ... < ... | Conditional branch instruction ConditionalBranch: ... < ... with non-Boolean condition, in function '$@'. | switchbody.c:15:5:15:17 | int switch_single(int) | int switch_single(int) |
+| switchbody.c:28:11:28:15 | ConditionalBranch: ... < ... | Conditional branch instruction ConditionalBranch: ... < ... with non-Boolean condition, in function '$@'. | switchbody.c:27:5:27:19 | int switch_notblock(int) | int switch_notblock(int) |
+| test.c:3:9:3:9 | ConditionalBranch: i | Conditional branch instruction ConditionalBranch: i with non-Boolean condition, in function '$@'. | test.c:2:6:2:11 | void f_if_1(int) | void f_if_1(int) |
+| test.c:11:9:11:9 | ConditionalBranch: 1 | Conditional branch instruction ConditionalBranch: 1 with non-Boolean condition, in function '$@'. | test.c:10:6:10:11 | void f_if_2() | void f_if_2() |
+| test.c:19:9:19:9 | ConditionalBranch: 0 | Conditional branch instruction ConditionalBranch: 0 with non-Boolean condition, in function '$@'. | test.c:18:6:18:11 | void f_if_3() | void f_if_3() |
+| test.c:28:16:28:21 | ConditionalBranch: ... < ... | Conditional branch instruction ConditionalBranch: ... < ... with non-Boolean condition, in function '$@'. | test.c:26:6:26:12 | void f_for_1() | void f_for_1() |
+| test.c:36:16:36:16 | ConditionalBranch: 1 | Conditional branch instruction ConditionalBranch: 1 with non-Boolean condition, in function '$@'. | test.c:34:6:34:12 | void f_for_2() | void f_for_2() |
+| test.c:44:16:44:16 | ConditionalBranch: 0 | Conditional branch instruction ConditionalBranch: 0 with non-Boolean condition, in function '$@'. | test.c:42:6:42:12 | void f_for_3() | void f_for_3() |
+| test.c:51:11:51:11 | ConditionalBranch: i | Conditional branch instruction ConditionalBranch: i with non-Boolean condition, in function '$@'. | test.c:50:6:50:14 | void f_while_1(int) | void f_while_1(int) |
+| test.c:58:11:58:11 | ConditionalBranch: 1 | Conditional branch instruction ConditionalBranch: 1 with non-Boolean condition, in function '$@'. | test.c:57:6:57:14 | void f_while_2() | void f_while_2() |
+| test.c:65:11:65:11 | ConditionalBranch: 0 | Conditional branch instruction ConditionalBranch: 0 with non-Boolean condition, in function '$@'. | test.c:64:6:64:14 | void f_while_3() | void f_while_3() |
+| test.c:74:14:74:14 | ConditionalBranch: i | Conditional branch instruction ConditionalBranch: i with non-Boolean condition, in function '$@'. | test.c:71:6:71:11 | void f_do_1(int) | void f_do_1(int) |
+| test.c:81:14:81:14 | ConditionalBranch: 1 | Conditional branch instruction ConditionalBranch: 1 with non-Boolean condition, in function '$@'. | test.c:78:6:78:11 | void f_do_2() | void f_do_2() |
+| test.c:88:14:88:14 | ConditionalBranch: 0 | Conditional branch instruction ConditionalBranch: 0 with non-Boolean condition, in function '$@'. | test.c:85:6:85:11 | void f_do_3() | void f_do_3() |
+| test.c:93:13:93:13 | ConditionalBranch: i | Conditional branch instruction ConditionalBranch: i with non-Boolean condition, in function '$@'. | test.c:92:6:92:13 | void f_cond_1(int) | void f_cond_1(int) |
+| test.c:204:12:204:12 | ConditionalBranch: i | Conditional branch instruction ConditionalBranch: i with non-Boolean condition, in function '$@'. | test.c:203:6:203:15 | void f_switch_7(int) | void f_switch_7(int) |
+| test.c:219:7:219:7 | ConditionalBranch: x | Conditional branch instruction ConditionalBranch: x with non-Boolean condition, in function '$@'. | test.c:218:5:218:11 | int f_and_1(int, int) | int f_and_1(int, int) |
+| test.c:219:12:219:13 | ConditionalBranch: ! ... | Conditional branch instruction ConditionalBranch: ! ... with non-Boolean condition, in function '$@'. | test.c:218:5:218:11 | int f_and_1(int, int) | int f_and_1(int, int) |
+| test.c:219:12:219:13 | LogicalNot: ! ... | Logical Not instruction LogicalNot: ! ... with non-Boolean operand, in function '$@'. | test.c:218:5:218:11 | int f_and_1(int, int) | int f_and_1(int, int) |
+| test.c:226:7:226:15 | ConditionalBranch: ! ... | Conditional branch instruction ConditionalBranch: ! ... with non-Boolean condition, in function '$@'. | test.c:225:5:225:11 | int f_and_2(int, int) | int f_and_2(int, int) |
+| test.c:226:7:226:15 | LogicalNot: ! ... | Logical Not instruction LogicalNot: ! ... with non-Boolean operand, in function '$@'. | test.c:225:5:225:11 | int f_and_2(int, int) | int f_and_2(int, int) |
+| test.c:226:9:226:9 | ConditionalBranch: x | Conditional branch instruction ConditionalBranch: x with non-Boolean condition, in function '$@'. | test.c:225:5:225:11 | int f_and_2(int, int) | int f_and_2(int, int) |
+| test.c:226:14:226:14 | ConditionalBranch: y | Conditional branch instruction ConditionalBranch: y with non-Boolean condition, in function '$@'. | test.c:225:5:225:11 | int f_and_2(int, int) | int f_and_2(int, int) |
+| test.c:233:7:233:7 | ConditionalBranch: b | Conditional branch instruction ConditionalBranch: b with non-Boolean condition, in function '$@'. | test.c:232:6:232:19 | void f_if_ternary_1(int, int, int) | void f_if_ternary_1(int, int, int) |
+| test.c:233:7:233:15 | ConditionalBranch: ... ? ... : ... | Conditional branch instruction ConditionalBranch: ... ? ... : ... with non-Boolean condition, in function '$@'. | test.c:232:6:232:19 | void f_if_ternary_1(int, int, int) | void f_if_ternary_1(int, int, int) |
+| test.c:245:31:245:31 | ConditionalBranch: 0 | Conditional branch instruction ConditionalBranch: 0 with non-Boolean condition, in function '$@'. | test.c:245:24:245:24 | const void *[] a | const void *[] a |
+| unaryopexpr.c:8:5:8:6 | LogicalNot: ! ... | Logical Not instruction LogicalNot: ! ... with non-Boolean operand, in function '$@'. | unaryopexpr.c:1:13:1:13 | void f() | void f() |
+| whilestmt.c:2:9:2:9 | ConditionalBranch: 0 | Conditional branch instruction ConditionalBranch: 0 with non-Boolean condition, in function '$@'. | whilestmt.c:1:13:1:26 | void always_false_1() | void always_false_1() |
+| whilestmt.c:10:9:10:13 | ConditionalBranch: ! ... | Conditional branch instruction ConditionalBranch: ! ... with non-Boolean condition, in function '$@'. | whilestmt.c:8:13:8:26 | void always_false_2() | void always_false_2() |
+| whilestmt.c:10:9:10:13 | LogicalNot: ! ... | Logical Not instruction LogicalNot: ! ... with non-Boolean operand, in function '$@'. | whilestmt.c:8:13:8:26 | void always_false_2() | void always_false_2() |
+| whilestmt.c:16:9:16:9 | ConditionalBranch: 1 | Conditional branch instruction ConditionalBranch: 1 with non-Boolean condition, in function '$@'. | whilestmt.c:15:13:15:25 | void always_true_1() | void always_true_1() |
+| whilestmt.c:24:9:24:9 | ConditionalBranch: 1 | Conditional branch instruction ConditionalBranch: 1 with non-Boolean condition, in function '$@'. | whilestmt.c:23:13:23:25 | void always_true_2() | void always_true_2() |
+| whilestmt.c:33:9:33:9 | ConditionalBranch: 1 | Conditional branch instruction ConditionalBranch: 1 with non-Boolean condition, in function '$@'. | whilestmt.c:32:13:32:25 | void always_true_3() | void always_true_3() |
+| whilestmt.c:41:9:41:14 | ConditionalBranch: ... < ... | Conditional branch instruction ConditionalBranch: ... < ... with non-Boolean condition, in function '$@'. | whilestmt.c:39:13:39:18 | void normal() | void normal() |
 missingCppType
diff --git a/cpp/ql/test/library-tests/syntax-zoo/dataflow-consistency.expected b/cpp/ql/test/library-tests/syntax-zoo/dataflow-consistency.expected
index 597d096e769..9fbef1167a4 100644
--- a/cpp/ql/test/library-tests/syntax-zoo/dataflow-consistency.expected
+++ b/cpp/ql/test/library-tests/syntax-zoo/dataflow-consistency.expected
@@ -100,3 +100,4 @@ identityLocalStep
 missingArgumentCall
 multipleArgumentCall
 lambdaCallEnclosingCallableMismatch
+speculativeStepAlreadyHasModel
diff --git a/cpp/ql/test/library-tests/syntax-zoo/dataflow-ir-consistency.expected b/cpp/ql/test/library-tests/syntax-zoo/dataflow-ir-consistency.expected
index e154e42247b..984335d1251 100644
--- a/cpp/ql/test/library-tests/syntax-zoo/dataflow-ir-consistency.expected
+++ b/cpp/ql/test/library-tests/syntax-zoo/dataflow-ir-consistency.expected
@@ -37,3 +37,4 @@ identityLocalStep
 missingArgumentCall
 multipleArgumentCall
 lambdaCallEnclosingCallableMismatch
+speculativeStepAlreadyHasModel
diff --git a/cpp/ql/test/library-tests/syntax-zoo/raw_consistency.expected b/cpp/ql/test/library-tests/syntax-zoo/raw_consistency.expected
index 9e3d40c99c5..dc6671af8a4 100644
--- a/cpp/ql/test/library-tests/syntax-zoo/raw_consistency.expected
+++ b/cpp/ql/test/library-tests/syntax-zoo/raw_consistency.expected
@@ -42,4 +42,280 @@ thisArgumentIsNonPointer
 | pointer_to_member.cpp:23:5:23:54 | Call: call to expression | Call instruction 'Call: call to expression' has a `this` argument operand that is not an address, in function '$@'. | pointer_to_member.cpp:14:5:14:9 | int usePM(int PM::*) | int usePM(int PM::*) |
 | pointer_to_member.cpp:24:5:24:49 | Call: call to expression | Call instruction 'Call: call to expression' has a `this` argument operand that is not an address, in function '$@'. | pointer_to_member.cpp:14:5:14:9 | int usePM(int PM::*) | int usePM(int PM::*) |
 nonUniqueIRVariable
+nonBooleanOperand
+| break_labels.c:4:9:4:14 | ConditionalBranch: ... != ... | Conditional branch instruction ConditionalBranch: ... != ... with non-Boolean condition, in function '$@'. | break_labels.c:2:12:2:12 | int f(int) | int f(int) |
+| break_labels.c:6:16:6:21 | ConditionalBranch: ... < ... | Conditional branch instruction ConditionalBranch: ... < ... with non-Boolean condition, in function '$@'. | break_labels.c:2:12:2:12 | int f(int) | int f(int) |
+| break_labels.c:7:17:7:24 | ConditionalBranch: ... == ... | Conditional branch instruction ConditionalBranch: ... == ... with non-Boolean condition, in function '$@'. | break_labels.c:2:12:2:12 | int f(int) | int f(int) |
+| break_labels.c:20:16:20:21 | ConditionalBranch: ... < ... | Conditional branch instruction ConditionalBranch: ... < ... with non-Boolean condition, in function '$@'. | break_labels.c:16:6:16:10 | void f_for() | void f_for() |
+| break_labels.c:21:13:21:18 | ConditionalBranch: ... == ... | Conditional branch instruction ConditionalBranch: ... == ... with non-Boolean condition, in function '$@'. | break_labels.c:16:6:16:10 | void f_for() | void f_for() |
+| break_labels.c:24:13:24:18 | ConditionalBranch: ... == ... | Conditional branch instruction ConditionalBranch: ... == ... with non-Boolean condition, in function '$@'. | break_labels.c:16:6:16:10 | void f_for() | void f_for() |
+| builtin.c:24:7:24:13 | ConditionalBranch: ... == ... | Conditional branch instruction ConditionalBranch: ... == ... with non-Boolean condition, in function '$@'. | builtin.c:5:5:5:11 | int builtin(int, int) | int builtin(int, int) |
+| builtin.c:28:7:28:29 | ConditionalBranch: call to __builtin_unpredictable | Conditional branch instruction ConditionalBranch: call to __builtin_unpredictable with non-Boolean condition, in function '$@'. | builtin.c:5:5:5:11 | int builtin(int, int) | int builtin(int, int) |
+| builtin.c:47:7:47:22 | ConditionalBranch: call to __builtin_memchr | Conditional branch instruction ConditionalBranch: call to __builtin_memchr with non-Boolean condition, in function '$@'. | builtin.c:5:5:5:11 | int builtin(int, int) | int builtin(int, int) |
+| dostmt.c:4:11:4:11 | ConditionalBranch: 0 | Conditional branch instruction ConditionalBranch: 0 with non-Boolean condition, in function '$@'. | dostmt.c:1:6:1:17 | void always_false() | void always_false() |
+| dostmt.c:12:11:12:11 | ConditionalBranch: 1 | Conditional branch instruction ConditionalBranch: 1 with non-Boolean condition, in function '$@'. | dostmt.c:8:13:8:25 | void always_true_1() | void always_true_1() |
+| dostmt.c:21:11:21:11 | ConditionalBranch: 1 | Conditional branch instruction ConditionalBranch: 1 with non-Boolean condition, in function '$@'. | dostmt.c:16:13:16:25 | void always_true_2() | void always_true_2() |
+| dostmt.c:28:11:28:11 | ConditionalBranch: 1 | Conditional branch instruction ConditionalBranch: 1 with non-Boolean condition, in function '$@'. | dostmt.c:25:13:25:25 | void always_true_3() | void always_true_3() |
+| dostmt.c:36:11:36:16 | ConditionalBranch: ... < ... | Conditional branch instruction ConditionalBranch: ... < ... with non-Boolean condition, in function '$@'. | dostmt.c:32:13:32:18 | void normal() | void normal() |
+| duff2.c:13:14:13:20 | ConditionalBranch: ... > ... | Conditional branch instruction ConditionalBranch: ... > ... with non-Boolean condition, in function '$@'. | duff2.c:2:6:2:12 | void duff2_8(int) | void duff2_8(int) |
+| duff2.c:21:14:21:20 | ConditionalBranch: ... > ... | Conditional branch instruction ConditionalBranch: ... > ... with non-Boolean condition, in function '$@'. | duff2.c:16:6:16:12 | void duff2_2(int) | void duff2_2(int) |
+| duff.c:13:22:13:28 | ConditionalBranch: ... > ... | Conditional branch instruction ConditionalBranch: ... > ... with non-Boolean condition, in function '$@'. | duff.c:2:13:2:13 | void f(int) | void f(int) |
+| dummyblock.c:2:9:2:9 | ConditionalBranch: 1 | Conditional branch instruction ConditionalBranch: 1 with non-Boolean condition, in function '$@'. | dummyblock.c:1:13:1:13 | void f() | void f() |
+| ifelsestmt.c:2:6:2:6 | ConditionalBranch: 0 | Conditional branch instruction ConditionalBranch: 0 with non-Boolean condition, in function '$@'. | ifelsestmt.c:1:13:1:26 | void always_false_1() | void always_false_1() |
+| ifelsestmt.c:12:6:12:6 | ConditionalBranch: 0 | Conditional branch instruction ConditionalBranch: 0 with non-Boolean condition, in function '$@'. | ifelsestmt.c:11:13:11:26 | void always_false_2() | void always_false_2() |
+| ifelsestmt.c:20:6:20:6 | ConditionalBranch: 1 | Conditional branch instruction ConditionalBranch: 1 with non-Boolean condition, in function '$@'. | ifelsestmt.c:19:13:19:25 | void always_true_1() | void always_true_1() |
+| ifelsestmt.c:30:6:30:6 | ConditionalBranch: 1 | Conditional branch instruction ConditionalBranch: 1 with non-Boolean condition, in function '$@'. | ifelsestmt.c:29:13:29:25 | void always_true_2() | void always_true_2() |
+| ifelsestmt.c:38:6:38:11 | ConditionalBranch: ... == ... | Conditional branch instruction ConditionalBranch: ... == ... with non-Boolean condition, in function '$@'. | ifelsestmt.c:37:13:37:18 | void normal(int, int) | void normal(int, int) |
+| ifstmt.c:2:6:2:6 | ConditionalBranch: 0 | Conditional branch instruction ConditionalBranch: 0 with non-Boolean condition, in function '$@'. | ifstmt.c:1:13:1:26 | void always_false_1() | void always_false_1() |
+| ifstmt.c:9:6:9:6 | ConditionalBranch: 0 | Conditional branch instruction ConditionalBranch: 0 with non-Boolean condition, in function '$@'. | ifstmt.c:8:13:8:26 | void always_false_2() | void always_false_2() |
+| ifstmt.c:15:6:15:6 | ConditionalBranch: 1 | Conditional branch instruction ConditionalBranch: 1 with non-Boolean condition, in function '$@'. | ifstmt.c:14:13:14:25 | void always_true_1() | void always_true_1() |
+| ifstmt.c:22:6:22:6 | ConditionalBranch: 1 | Conditional branch instruction ConditionalBranch: 1 with non-Boolean condition, in function '$@'. | ifstmt.c:21:13:21:25 | void always_true_2() | void always_true_2() |
+| ifstmt.c:28:6:28:11 | ConditionalBranch: ... == ... | Conditional branch instruction ConditionalBranch: ... == ... with non-Boolean condition, in function '$@'. | ifstmt.c:27:13:27:18 | void normal(int, int) | void normal(int, int) |
+| landexpr.c:3:6:3:6 | ConditionalBranch: a | Conditional branch instruction ConditionalBranch: a with non-Boolean condition, in function '$@'. | landexpr.c:1:13:1:13 | void f() | void f() |
+| landexpr.c:3:11:3:11 | ConditionalBranch: b | Conditional branch instruction ConditionalBranch: b with non-Boolean condition, in function '$@'. | landexpr.c:1:13:1:13 | void f() | void f() |
+| lorexpr.c:3:6:3:6 | ConditionalBranch: a | Conditional branch instruction ConditionalBranch: a with non-Boolean condition, in function '$@'. | lorexpr.c:1:13:1:13 | void f() | void f() |
+| lorexpr.c:3:11:3:11 | ConditionalBranch: b | Conditional branch instruction ConditionalBranch: b with non-Boolean condition, in function '$@'. | lorexpr.c:1:13:1:13 | void f() | void f() |
+| misc.c:22:9:22:12 | ConditionalBranch: argi | Conditional branch instruction ConditionalBranch: argi with non-Boolean condition, in function '$@'. | misc.c:16:6:16:10 | void misc1(int, int) | void misc1(int, int) |
+| misc.c:22:17:22:20 | ConditionalBranch: argj | Conditional branch instruction ConditionalBranch: argj with non-Boolean condition, in function '$@'. | misc.c:16:6:16:10 | void misc1(int, int) | void misc1(int, int) |
+| misc.c:27:9:27:12 | ConditionalBranch: argi | Conditional branch instruction ConditionalBranch: argi with non-Boolean condition, in function '$@'. | misc.c:16:6:16:10 | void misc1(int, int) | void misc1(int, int) |
+| misc.c:27:17:27:20 | ConditionalBranch: argj | Conditional branch instruction ConditionalBranch: argj with non-Boolean condition, in function '$@'. | misc.c:16:6:16:10 | void misc1(int, int) | void misc1(int, int) |
+| misc.c:32:9:32:9 | ConditionalBranch: i | Conditional branch instruction ConditionalBranch: i with non-Boolean condition, in function '$@'. | misc.c:16:6:16:10 | void misc1(int, int) | void misc1(int, int) |
+| misc.c:32:14:32:14 | ConditionalBranch: j | Conditional branch instruction ConditionalBranch: j with non-Boolean condition, in function '$@'. | misc.c:16:6:16:10 | void misc1(int, int) | void misc1(int, int) |
+| misc.c:37:9:37:9 | ConditionalBranch: i | Conditional branch instruction ConditionalBranch: i with non-Boolean condition, in function '$@'. | misc.c:16:6:16:10 | void misc1(int, int) | void misc1(int, int) |
+| misc.c:37:14:37:14 | ConditionalBranch: j | Conditional branch instruction ConditionalBranch: j with non-Boolean condition, in function '$@'. | misc.c:16:6:16:10 | void misc1(int, int) | void misc1(int, int) |
+| misc.c:44:11:44:11 | ConditionalBranch: i | Conditional branch instruction ConditionalBranch: i with non-Boolean condition, in function '$@'. | misc.c:16:6:16:10 | void misc1(int, int) | void misc1(int, int) |
+| misc.c:47:11:47:11 | ConditionalBranch: i | Conditional branch instruction ConditionalBranch: i with non-Boolean condition, in function '$@'. | misc.c:16:6:16:10 | void misc1(int, int) | void misc1(int, int) |
+| misc.c:47:16:47:16 | ConditionalBranch: j | Conditional branch instruction ConditionalBranch: j with non-Boolean condition, in function '$@'. | misc.c:16:6:16:10 | void misc1(int, int) | void misc1(int, int) |
+| misc.c:50:11:50:11 | ConditionalBranch: i | Conditional branch instruction ConditionalBranch: i with non-Boolean condition, in function '$@'. | misc.c:16:6:16:10 | void misc1(int, int) | void misc1(int, int) |
+| misc.c:50:16:50:16 | ConditionalBranch: j | Conditional branch instruction ConditionalBranch: j with non-Boolean condition, in function '$@'. | misc.c:16:6:16:10 | void misc1(int, int) | void misc1(int, int) |
+| misc.c:53:11:53:14 | ConditionalBranch: argi | Conditional branch instruction ConditionalBranch: argi with non-Boolean condition, in function '$@'. | misc.c:16:6:16:10 | void misc1(int, int) | void misc1(int, int) |
+| misc.c:58:13:58:13 | ConditionalBranch: i | Conditional branch instruction ConditionalBranch: i with non-Boolean condition, in function '$@'. | misc.c:16:6:16:10 | void misc1(int, int) | void misc1(int, int) |
+| misc.c:61:13:61:16 | ConditionalBranch: argi | Conditional branch instruction ConditionalBranch: argi with non-Boolean condition, in function '$@'. | misc.c:16:6:16:10 | void misc1(int, int) | void misc1(int, int) |
+| misc.c:62:16:62:21 | ConditionalBranch: ... < ... | Conditional branch instruction ConditionalBranch: ... < ... with non-Boolean condition, in function '$@'. | misc.c:16:6:16:10 | void misc1(int, int) | void misc1(int, int) |
+| misc.c:64:11:64:16 | ConditionalBranch: ... < ... | Conditional branch instruction ConditionalBranch: ... < ... with non-Boolean condition, in function '$@'. | misc.c:16:6:16:10 | void misc1(int, int) | void misc1(int, int) |
+| misc.c:68:16:68:21 | ConditionalBranch: ... < ... | Conditional branch instruction ConditionalBranch: ... < ... with non-Boolean condition, in function '$@'. | misc.c:16:6:16:10 | void misc1(int, int) | void misc1(int, int) |
+| misc.c:72:11:72:16 | ConditionalBranch: ... < ... | Conditional branch instruction ConditionalBranch: ... < ... with non-Boolean condition, in function '$@'. | misc.c:16:6:16:10 | void misc1(int, int) | void misc1(int, int) |
+| misc.c:86:9:86:13 | ConditionalBranch: ... > ... | Conditional branch instruction ConditionalBranch: ... > ... with non-Boolean condition, in function '$@'. | misc.c:16:6:16:10 | void misc1(int, int) | void misc1(int, int) |
+| misc.c:87:9:87:10 | ConditionalBranch: ! ... | Conditional branch instruction ConditionalBranch: ! ... with non-Boolean condition, in function '$@'. | misc.c:16:6:16:10 | void misc1(int, int) | void misc1(int, int) |
+| misc.c:87:9:87:10 | LogicalNot: ! ... | Logical Not instruction LogicalNot: ! ... with non-Boolean operand, in function '$@'. | misc.c:16:6:16:10 | void misc1(int, int) | void misc1(int, int) |
+| misc.c:88:9:88:9 | ConditionalBranch: j | Conditional branch instruction ConditionalBranch: j with non-Boolean condition, in function '$@'. | misc.c:16:6:16:10 | void misc1(int, int) | void misc1(int, int) |
+| misc.c:93:9:93:15 | ConditionalBranch: ... ? ... : ... | Conditional branch instruction ConditionalBranch: ... ? ... : ... with non-Boolean condition, in function '$@'. | misc.c:91:6:91:33 | void gnuConditionalOmittedOperand(someStruct*) | void gnuConditionalOmittedOperand(someStruct*) |
+| misc.c:94:9:94:19 | ConditionalBranch: ... ? ... : ... | Conditional branch instruction ConditionalBranch: ... ? ... : ... with non-Boolean condition, in function '$@'. | misc.c:91:6:91:33 | void gnuConditionalOmittedOperand(someStruct*) | void gnuConditionalOmittedOperand(someStruct*) |
+| misc.c:139:10:139:18 | ConditionalBranch: ... & ... | Conditional branch instruction ConditionalBranch: ... & ... with non-Boolean condition, in function '$@'. | misc.c:97:6:97:10 | void misc3() | void misc3() |
+| misc.c:139:25:139:33 | ConditionalBranch: ... & ... | Conditional branch instruction ConditionalBranch: ... & ... with non-Boolean condition, in function '$@'. | misc.c:97:6:97:10 | void misc3() | void misc3() |
+| misc.c:140:9:140:9 | ConditionalBranch: i | Conditional branch instruction ConditionalBranch: i with non-Boolean condition, in function '$@'. | misc.c:97:6:97:10 | void misc3() | void misc3() |
+| misc.c:140:14:140:14 | ConditionalBranch: i | Conditional branch instruction ConditionalBranch: i with non-Boolean condition, in function '$@'. | misc.c:97:6:97:10 | void misc3() | void misc3() |
+| misc.c:140:19:140:19 | ConditionalBranch: i | Conditional branch instruction ConditionalBranch: i with non-Boolean condition, in function '$@'. | misc.c:97:6:97:10 | void misc3() | void misc3() |
+| misc.c:141:9:141:9 | ConditionalBranch: i | Conditional branch instruction ConditionalBranch: i with non-Boolean condition, in function '$@'. | misc.c:97:6:97:10 | void misc3() | void misc3() |
+| misc.c:141:14:141:14 | ConditionalBranch: i | Conditional branch instruction ConditionalBranch: i with non-Boolean condition, in function '$@'. | misc.c:97:6:97:10 | void misc3() | void misc3() |
+| misc.c:141:19:141:19 | ConditionalBranch: i | Conditional branch instruction ConditionalBranch: i with non-Boolean condition, in function '$@'. | misc.c:97:6:97:10 | void misc3() | void misc3() |
+| misc.c:192:11:192:11 | ConditionalBranch: 1 | Conditional branch instruction ConditionalBranch: 1 with non-Boolean condition, in function '$@'. | misc.c:191:6:191:20 | void unreachable_end() | void unreachable_end() |
+| pruning.c:5:9:5:9 | ConditionalBranch: 0 | Conditional branch instruction ConditionalBranch: 0 with non-Boolean condition, in function '$@'. | pruning.c:4:6:4:8 | void f_0() | void f_0() |
+| pruning.c:13:9:13:9 | ConditionalBranch: 1 | Conditional branch instruction ConditionalBranch: 1 with non-Boolean condition, in function '$@'. | pruning.c:12:6:12:8 | void f_1() | void f_1() |
+| pruning.c:21:9:21:11 | ConditionalBranch: 256 | Conditional branch instruction ConditionalBranch: 256 with non-Boolean condition, in function '$@'. | pruning.c:20:6:20:10 | void f_256() | void f_256() |
+| pruning.c:29:9:29:18 | ConditionalBranch: (uint8_t)... | Conditional branch instruction ConditionalBranch: (uint8_t)... with non-Boolean condition, in function '$@'. | pruning.c:28:6:28:16 | void f_uint8_t_0() | void f_uint8_t_0() |
+| pruning.c:37:9:37:18 | ConditionalBranch: (uint8_t)... | Conditional branch instruction ConditionalBranch: (uint8_t)... with non-Boolean condition, in function '$@'. | pruning.c:36:6:36:16 | void f_uint8_t_1() | void f_uint8_t_1() |
+| pruning.c:45:9:45:20 | ConditionalBranch: (uint8_t)... | Conditional branch instruction ConditionalBranch: (uint8_t)... with non-Boolean condition, in function '$@'. | pruning.c:44:6:44:18 | void f_uint8_t_256() | void f_uint8_t_256() |
+| pruning.c:53:9:53:20 | ConditionalBranch: (uint8_t)... | Conditional branch instruction ConditionalBranch: (uint8_t)... with non-Boolean condition, in function '$@'. | pruning.c:52:6:52:18 | void f_uint8_t_257() | void f_uint8_t_257() |
+| pruning.c:61:9:61:26 | ConditionalBranch: ... == ... | Conditional branch instruction ConditionalBranch: ... == ... with non-Boolean condition, in function '$@'. | pruning.c:60:6:60:21 | void f_uint8_t_minus1() | void f_uint8_t_minus1() |
+| pruning.c:70:9:70:9 | ConditionalBranch: i | Conditional branch instruction ConditionalBranch: i with non-Boolean condition, in function '$@'. | pruning.c:68:6:68:14 | void f_v_int_0() | void f_v_int_0() |
+| pruning.c:79:9:79:9 | ConditionalBranch: i | Conditional branch instruction ConditionalBranch: i with non-Boolean condition, in function '$@'. | pruning.c:77:6:77:14 | void f_v_int_1() | void f_v_int_1() |
+| pruning.c:88:9:88:9 | ConditionalBranch: i | Conditional branch instruction ConditionalBranch: i with non-Boolean condition, in function '$@'. | pruning.c:86:6:86:16 | void f_v_int_256() | void f_v_int_256() |
+| pruning.c:97:9:97:9 | ConditionalBranch: i | Conditional branch instruction ConditionalBranch: i with non-Boolean condition, in function '$@'. | pruning.c:95:6:95:18 | void f_v_uint8_t_0() | void f_v_uint8_t_0() |
+| pruning.c:106:9:106:9 | ConditionalBranch: i | Conditional branch instruction ConditionalBranch: i with non-Boolean condition, in function '$@'. | pruning.c:104:6:104:18 | void f_v_uint8_t_1() | void f_v_uint8_t_1() |
+| pruning.c:115:9:115:9 | ConditionalBranch: i | Conditional branch instruction ConditionalBranch: i with non-Boolean condition, in function '$@'. | pruning.c:113:6:113:20 | void f_v_uint8_t_256() | void f_v_uint8_t_256() |
+| pruning.c:124:9:124:9 | ConditionalBranch: i | Conditional branch instruction ConditionalBranch: i with non-Boolean condition, in function '$@'. | pruning.c:122:6:122:20 | void f_v_uint8_t_257() | void f_v_uint8_t_257() |
+| pruning.c:133:9:133:16 | ConditionalBranch: ... == ... | Conditional branch instruction ConditionalBranch: ... == ... with non-Boolean condition, in function '$@'. | pruning.c:131:6:131:23 | void f_v_uint8_t_minus1() | void f_v_uint8_t_minus1() |
+| questionexpr.c:3:6:3:11 | ConditionalBranch: ... == ... | Conditional branch instruction ConditionalBranch: ... == ... with non-Boolean condition, in function '$@'. | questionexpr.c:1:13:1:13 | void f() | void f() |
+| range_analysis.c:7:10:7:10 | ConditionalBranch: p | Conditional branch instruction ConditionalBranch: p with non-Boolean condition, in function '$@'. | range_analysis.c:5:5:5:9 | int test1(List*) | int test1(List*) |
+| range_analysis.c:15:10:15:10 | ConditionalBranch: p | Conditional branch instruction ConditionalBranch: p with non-Boolean condition, in function '$@'. | range_analysis.c:13:5:13:9 | int test2(List*) | int test2(List*) |
+| range_analysis.c:23:10:23:10 | ConditionalBranch: p | Conditional branch instruction ConditionalBranch: p with non-Boolean condition, in function '$@'. | range_analysis.c:21:5:21:9 | int test3(List*) | int test3(List*) |
+| range_analysis.c:33:15:33:19 | ConditionalBranch: ... < ... | Conditional branch instruction ConditionalBranch: ... < ... with non-Boolean condition, in function '$@'. | range_analysis.c:30:5:30:9 | int test4() | int test4() |
+| range_analysis.c:42:15:42:19 | ConditionalBranch: ... < ... | Conditional branch instruction ConditionalBranch: ... < ... with non-Boolean condition, in function '$@'. | range_analysis.c:39:5:39:9 | int test5() | int test5() |
+| range_analysis.c:51:15:51:21 | ConditionalBranch: ... < ... | Conditional branch instruction ConditionalBranch: ... < ... with non-Boolean condition, in function '$@'. | range_analysis.c:48:5:48:9 | int test6() | int test6() |
+| range_analysis.c:58:7:58:11 | ConditionalBranch: ... < ... | Conditional branch instruction ConditionalBranch: ... < ... with non-Boolean condition, in function '$@'. | range_analysis.c:57:5:57:9 | int test7(int) | int test7(int) |
+| range_analysis.c:59:9:59:13 | ConditionalBranch: ... < ... | Conditional branch instruction ConditionalBranch: ... < ... with non-Boolean condition, in function '$@'. | range_analysis.c:57:5:57:9 | int test7(int) | int test7(int) |
+| range_analysis.c:67:7:67:15 | ConditionalBranch: ... < ... | Conditional branch instruction ConditionalBranch: ... < ... with non-Boolean condition, in function '$@'. | range_analysis.c:66:5:66:9 | int test8(int, int) | int test8(int, int) |
+| range_analysis.c:67:20:67:25 | ConditionalBranch: ... < ... | Conditional branch instruction ConditionalBranch: ... < ... with non-Boolean condition, in function '$@'. | range_analysis.c:66:5:66:9 | int test8(int, int) | int test8(int, int) |
+| range_analysis.c:68:9:68:15 | ConditionalBranch: ... < ... | Conditional branch instruction ConditionalBranch: ... < ... with non-Boolean condition, in function '$@'. | range_analysis.c:66:5:66:9 | int test8(int, int) | int test8(int, int) |
+| range_analysis.c:76:7:76:12 | ConditionalBranch: ... == ... | Conditional branch instruction ConditionalBranch: ... == ... with non-Boolean condition, in function '$@'. | range_analysis.c:75:5:75:9 | int test9(int, int) | int test9(int, int) |
+| range_analysis.c:77:9:77:13 | ConditionalBranch: ... < ... | Conditional branch instruction ConditionalBranch: ... < ... with non-Boolean condition, in function '$@'. | range_analysis.c:75:5:75:9 | int test9(int, int) | int test9(int, int) |
+| range_analysis.c:81:9:81:13 | ConditionalBranch: ... < ... | Conditional branch instruction ConditionalBranch: ... < ... with non-Boolean condition, in function '$@'. | range_analysis.c:75:5:75:9 | int test9(int, int) | int test9(int, int) |
+| range_analysis.c:89:7:89:11 | ConditionalBranch: ... > ... | Conditional branch instruction ConditionalBranch: ... > ... with non-Boolean condition, in function '$@'. | range_analysis.c:88:5:88:10 | int test10(int, int) | int test10(int, int) |
+| range_analysis.c:90:9:90:13 | ConditionalBranch: ... < ... | Conditional branch instruction ConditionalBranch: ... < ... with non-Boolean condition, in function '$@'. | range_analysis.c:88:5:88:10 | int test10(int, int) | int test10(int, int) |
+| range_analysis.c:101:7:101:15 | ConditionalBranch: ... != ... | Conditional branch instruction ConditionalBranch: ... != ... with non-Boolean condition, in function '$@'. | range_analysis.c:98:5:98:10 | int test11(char*) | int test11(char*) |
+| range_analysis.c:104:7:104:14 | ConditionalBranch: ... == ... | Conditional branch instruction ConditionalBranch: ... == ... with non-Boolean condition, in function '$@'. | range_analysis.c:98:5:98:10 | int test11(char*) | int test11(char*) |
+| range_analysis.c:106:9:106:17 | ConditionalBranch: ... != ... | Conditional branch instruction ConditionalBranch: ... != ... with non-Boolean condition, in function '$@'. | range_analysis.c:98:5:98:10 | int test11(char*) | int test11(char*) |
+| range_analysis.c:109:9:109:16 | ConditionalBranch: ... != ... | Conditional branch instruction ConditionalBranch: ... != ... with non-Boolean condition, in function '$@'. | range_analysis.c:98:5:98:10 | int test11(char*) | int test11(char*) |
+| range_analysis.c:124:11:124:36 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:122:5:122:10 | int test12() | int test12() |
+| range_analysis.c:154:11:154:15 | ConditionalBranch: ... > ... | Conditional branch instruction ConditionalBranch: ... > ... with non-Boolean condition, in function '$@'. | range_analysis.c:153:11:153:16 | long long test15(long long) | long long test15(long long) |
+| range_analysis.c:154:20:154:30 | ConditionalBranch: ... == ... | Conditional branch instruction ConditionalBranch: ... == ... with non-Boolean condition, in function '$@'. | range_analysis.c:153:11:153:16 | long long test15(long long) | long long test15(long long) |
+| range_analysis.c:161:7:161:12 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:158:5:158:14 | int test_unary(int) | int test_unary(int) |
+| range_analysis.c:161:17:161:23 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:158:5:158:14 | int test_unary(int) | int test_unary(int) |
+| range_analysis.c:166:7:166:12 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:158:5:158:14 | int test_unary(int) | int test_unary(int) |
+| range_analysis.c:166:17:166:23 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:158:5:158:14 | int test_unary(int) | int test_unary(int) |
+| range_analysis.c:171:7:171:13 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:158:5:158:14 | int test_unary(int) | int test_unary(int) |
+| range_analysis.c:171:18:171:24 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:158:5:158:14 | int test_unary(int) | int test_unary(int) |
+| range_analysis.c:176:7:176:13 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:158:5:158:14 | int test_unary(int) | int test_unary(int) |
+| range_analysis.c:176:18:176:23 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:158:5:158:14 | int test_unary(int) | int test_unary(int) |
+| range_analysis.c:181:7:181:13 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:158:5:158:14 | int test_unary(int) | int test_unary(int) |
+| range_analysis.c:181:18:181:23 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:158:5:158:14 | int test_unary(int) | int test_unary(int) |
+| range_analysis.c:186:7:186:13 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:158:5:158:14 | int test_unary(int) | int test_unary(int) |
+| range_analysis.c:186:18:186:24 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:158:5:158:14 | int test_unary(int) | int test_unary(int) |
+| range_analysis.c:200:7:200:12 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:197:5:197:15 | int test_mult01(int, int) | int test_mult01(int, int) |
+| range_analysis.c:200:17:200:23 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:197:5:197:15 | int test_mult01(int, int) | int test_mult01(int, int) |
+| range_analysis.c:200:28:200:33 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:197:5:197:15 | int test_mult01(int, int) | int test_mult01(int, int) |
+| range_analysis.c:200:38:200:44 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:197:5:197:15 | int test_mult01(int, int) | int test_mult01(int, int) |
+| range_analysis.c:204:7:204:12 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:197:5:197:15 | int test_mult01(int, int) | int test_mult01(int, int) |
+| range_analysis.c:204:17:204:23 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:197:5:197:15 | int test_mult01(int, int) | int test_mult01(int, int) |
+| range_analysis.c:204:28:204:33 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:197:5:197:15 | int test_mult01(int, int) | int test_mult01(int, int) |
+| range_analysis.c:204:38:204:44 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:197:5:197:15 | int test_mult01(int, int) | int test_mult01(int, int) |
+| range_analysis.c:208:7:208:12 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:197:5:197:15 | int test_mult01(int, int) | int test_mult01(int, int) |
+| range_analysis.c:208:17:208:23 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:197:5:197:15 | int test_mult01(int, int) | int test_mult01(int, int) |
+| range_analysis.c:208:28:208:35 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:197:5:197:15 | int test_mult01(int, int) | int test_mult01(int, int) |
+| range_analysis.c:208:40:208:46 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:197:5:197:15 | int test_mult01(int, int) | int test_mult01(int, int) |
+| range_analysis.c:212:7:212:12 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:197:5:197:15 | int test_mult01(int, int) | int test_mult01(int, int) |
+| range_analysis.c:212:17:212:23 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:197:5:197:15 | int test_mult01(int, int) | int test_mult01(int, int) |
+| range_analysis.c:212:28:212:35 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:197:5:197:15 | int test_mult01(int, int) | int test_mult01(int, int) |
+| range_analysis.c:212:40:212:45 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:197:5:197:15 | int test_mult01(int, int) | int test_mult01(int, int) |
+| range_analysis.c:216:7:216:12 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:197:5:197:15 | int test_mult01(int, int) | int test_mult01(int, int) |
+| range_analysis.c:216:17:216:23 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:197:5:197:15 | int test_mult01(int, int) | int test_mult01(int, int) |
+| range_analysis.c:216:28:216:35 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:197:5:197:15 | int test_mult01(int, int) | int test_mult01(int, int) |
+| range_analysis.c:216:40:216:46 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:197:5:197:15 | int test_mult01(int, int) | int test_mult01(int, int) |
+| range_analysis.c:228:7:228:12 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:225:5:225:15 | int test_mult02(int, int) | int test_mult02(int, int) |
+| range_analysis.c:228:17:228:23 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:225:5:225:15 | int test_mult02(int, int) | int test_mult02(int, int) |
+| range_analysis.c:228:28:228:33 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:225:5:225:15 | int test_mult02(int, int) | int test_mult02(int, int) |
+| range_analysis.c:228:38:228:44 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:225:5:225:15 | int test_mult02(int, int) | int test_mult02(int, int) |
+| range_analysis.c:232:7:232:12 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:225:5:225:15 | int test_mult02(int, int) | int test_mult02(int, int) |
+| range_analysis.c:232:17:232:23 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:225:5:225:15 | int test_mult02(int, int) | int test_mult02(int, int) |
+| range_analysis.c:232:28:232:33 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:225:5:225:15 | int test_mult02(int, int) | int test_mult02(int, int) |
+| range_analysis.c:232:38:232:44 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:225:5:225:15 | int test_mult02(int, int) | int test_mult02(int, int) |
+| range_analysis.c:236:7:236:12 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:225:5:225:15 | int test_mult02(int, int) | int test_mult02(int, int) |
+| range_analysis.c:236:17:236:23 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:225:5:225:15 | int test_mult02(int, int) | int test_mult02(int, int) |
+| range_analysis.c:236:28:236:35 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:225:5:225:15 | int test_mult02(int, int) | int test_mult02(int, int) |
+| range_analysis.c:236:40:236:46 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:225:5:225:15 | int test_mult02(int, int) | int test_mult02(int, int) |
+| range_analysis.c:240:7:240:12 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:225:5:225:15 | int test_mult02(int, int) | int test_mult02(int, int) |
+| range_analysis.c:240:17:240:23 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:225:5:225:15 | int test_mult02(int, int) | int test_mult02(int, int) |
+| range_analysis.c:240:28:240:35 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:225:5:225:15 | int test_mult02(int, int) | int test_mult02(int, int) |
+| range_analysis.c:240:40:240:45 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:225:5:225:15 | int test_mult02(int, int) | int test_mult02(int, int) |
+| range_analysis.c:244:7:244:12 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:225:5:225:15 | int test_mult02(int, int) | int test_mult02(int, int) |
+| range_analysis.c:244:17:244:23 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:225:5:225:15 | int test_mult02(int, int) | int test_mult02(int, int) |
+| range_analysis.c:244:28:244:35 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:225:5:225:15 | int test_mult02(int, int) | int test_mult02(int, int) |
+| range_analysis.c:244:40:244:46 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:225:5:225:15 | int test_mult02(int, int) | int test_mult02(int, int) |
+| range_analysis.c:256:7:256:14 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:253:5:253:15 | int test_mult03(int, int) | int test_mult03(int, int) |
+| range_analysis.c:256:19:256:25 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:253:5:253:15 | int test_mult03(int, int) | int test_mult03(int, int) |
+| range_analysis.c:256:30:256:35 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:253:5:253:15 | int test_mult03(int, int) | int test_mult03(int, int) |
+| range_analysis.c:256:40:256:46 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:253:5:253:15 | int test_mult03(int, int) | int test_mult03(int, int) |
+| range_analysis.c:260:7:260:14 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:253:5:253:15 | int test_mult03(int, int) | int test_mult03(int, int) |
+| range_analysis.c:260:19:260:25 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:253:5:253:15 | int test_mult03(int, int) | int test_mult03(int, int) |
+| range_analysis.c:260:30:260:35 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:253:5:253:15 | int test_mult03(int, int) | int test_mult03(int, int) |
+| range_analysis.c:260:40:260:46 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:253:5:253:15 | int test_mult03(int, int) | int test_mult03(int, int) |
+| range_analysis.c:264:7:264:14 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:253:5:253:15 | int test_mult03(int, int) | int test_mult03(int, int) |
+| range_analysis.c:264:19:264:25 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:253:5:253:15 | int test_mult03(int, int) | int test_mult03(int, int) |
+| range_analysis.c:264:30:264:37 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:253:5:253:15 | int test_mult03(int, int) | int test_mult03(int, int) |
+| range_analysis.c:264:42:264:48 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:253:5:253:15 | int test_mult03(int, int) | int test_mult03(int, int) |
+| range_analysis.c:268:7:268:14 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:253:5:253:15 | int test_mult03(int, int) | int test_mult03(int, int) |
+| range_analysis.c:268:19:268:25 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:253:5:253:15 | int test_mult03(int, int) | int test_mult03(int, int) |
+| range_analysis.c:268:30:268:37 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:253:5:253:15 | int test_mult03(int, int) | int test_mult03(int, int) |
+| range_analysis.c:268:42:268:47 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:253:5:253:15 | int test_mult03(int, int) | int test_mult03(int, int) |
+| range_analysis.c:272:7:272:14 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:253:5:253:15 | int test_mult03(int, int) | int test_mult03(int, int) |
+| range_analysis.c:272:19:272:25 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:253:5:253:15 | int test_mult03(int, int) | int test_mult03(int, int) |
+| range_analysis.c:272:30:272:37 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:253:5:253:15 | int test_mult03(int, int) | int test_mult03(int, int) |
+| range_analysis.c:272:42:272:48 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:253:5:253:15 | int test_mult03(int, int) | int test_mult03(int, int) |
+| range_analysis.c:284:7:284:14 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:281:5:281:15 | int test_mult04(int, int) | int test_mult04(int, int) |
+| range_analysis.c:284:19:284:24 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:281:5:281:15 | int test_mult04(int, int) | int test_mult04(int, int) |
+| range_analysis.c:284:29:284:34 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:281:5:281:15 | int test_mult04(int, int) | int test_mult04(int, int) |
+| range_analysis.c:284:39:284:45 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:281:5:281:15 | int test_mult04(int, int) | int test_mult04(int, int) |
+| range_analysis.c:288:7:288:14 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:281:5:281:15 | int test_mult04(int, int) | int test_mult04(int, int) |
+| range_analysis.c:288:19:288:24 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:281:5:281:15 | int test_mult04(int, int) | int test_mult04(int, int) |
+| range_analysis.c:288:29:288:34 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:281:5:281:15 | int test_mult04(int, int) | int test_mult04(int, int) |
+| range_analysis.c:288:39:288:45 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:281:5:281:15 | int test_mult04(int, int) | int test_mult04(int, int) |
+| range_analysis.c:292:7:292:14 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:281:5:281:15 | int test_mult04(int, int) | int test_mult04(int, int) |
+| range_analysis.c:292:19:292:24 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:281:5:281:15 | int test_mult04(int, int) | int test_mult04(int, int) |
+| range_analysis.c:292:29:292:36 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:281:5:281:15 | int test_mult04(int, int) | int test_mult04(int, int) |
+| range_analysis.c:292:41:292:47 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:281:5:281:15 | int test_mult04(int, int) | int test_mult04(int, int) |
+| range_analysis.c:296:7:296:14 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:281:5:281:15 | int test_mult04(int, int) | int test_mult04(int, int) |
+| range_analysis.c:296:19:296:24 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:281:5:281:15 | int test_mult04(int, int) | int test_mult04(int, int) |
+| range_analysis.c:296:29:296:36 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:281:5:281:15 | int test_mult04(int, int) | int test_mult04(int, int) |
+| range_analysis.c:296:41:296:46 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:281:5:281:15 | int test_mult04(int, int) | int test_mult04(int, int) |
+| range_analysis.c:300:7:300:14 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:281:5:281:15 | int test_mult04(int, int) | int test_mult04(int, int) |
+| range_analysis.c:300:19:300:24 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:281:5:281:15 | int test_mult04(int, int) | int test_mult04(int, int) |
+| range_analysis.c:300:29:300:36 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:281:5:281:15 | int test_mult04(int, int) | int test_mult04(int, int) |
+| range_analysis.c:300:41:300:47 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:281:5:281:15 | int test_mult04(int, int) | int test_mult04(int, int) |
+| range_analysis.c:312:7:312:14 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:309:5:309:15 | int test_mult05(int, int) | int test_mult05(int, int) |
+| range_analysis.c:312:19:312:25 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:309:5:309:15 | int test_mult05(int, int) | int test_mult05(int, int) |
+| range_analysis.c:312:30:312:35 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:309:5:309:15 | int test_mult05(int, int) | int test_mult05(int, int) |
+| range_analysis.c:312:40:312:46 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:309:5:309:15 | int test_mult05(int, int) | int test_mult05(int, int) |
+| range_analysis.c:316:7:316:14 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:309:5:309:15 | int test_mult05(int, int) | int test_mult05(int, int) |
+| range_analysis.c:316:19:316:25 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:309:5:309:15 | int test_mult05(int, int) | int test_mult05(int, int) |
+| range_analysis.c:316:30:316:35 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:309:5:309:15 | int test_mult05(int, int) | int test_mult05(int, int) |
+| range_analysis.c:316:40:316:46 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:309:5:309:15 | int test_mult05(int, int) | int test_mult05(int, int) |
+| range_analysis.c:320:7:320:14 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:309:5:309:15 | int test_mult05(int, int) | int test_mult05(int, int) |
+| range_analysis.c:320:19:320:25 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:309:5:309:15 | int test_mult05(int, int) | int test_mult05(int, int) |
+| range_analysis.c:320:30:320:37 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:309:5:309:15 | int test_mult05(int, int) | int test_mult05(int, int) |
+| range_analysis.c:320:42:320:48 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:309:5:309:15 | int test_mult05(int, int) | int test_mult05(int, int) |
+| range_analysis.c:324:7:324:14 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:309:5:309:15 | int test_mult05(int, int) | int test_mult05(int, int) |
+| range_analysis.c:324:19:324:25 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:309:5:309:15 | int test_mult05(int, int) | int test_mult05(int, int) |
+| range_analysis.c:324:30:324:37 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:309:5:309:15 | int test_mult05(int, int) | int test_mult05(int, int) |
+| range_analysis.c:324:42:324:47 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:309:5:309:15 | int test_mult05(int, int) | int test_mult05(int, int) |
+| range_analysis.c:328:7:328:14 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:309:5:309:15 | int test_mult05(int, int) | int test_mult05(int, int) |
+| range_analysis.c:328:19:328:25 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:309:5:309:15 | int test_mult05(int, int) | int test_mult05(int, int) |
+| range_analysis.c:328:30:328:37 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:309:5:309:15 | int test_mult05(int, int) | int test_mult05(int, int) |
+| range_analysis.c:328:42:328:48 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:309:5:309:15 | int test_mult05(int, int) | int test_mult05(int, int) |
+| range_analysis.c:338:7:338:11 | ConditionalBranch: ... < ... | Conditional branch instruction ConditionalBranch: ... < ... with non-Boolean condition, in function '$@'. | range_analysis.c:336:5:336:10 | int test16(int) | int test16(int) |
+| range_analysis.c:342:10:342:14 | ConditionalBranch: ... < ... | Conditional branch instruction ConditionalBranch: ... < ... with non-Boolean condition, in function '$@'. | range_analysis.c:336:5:336:10 | int test16(int) | int test16(int) |
+| range_analysis.c:346:7:346:11 | ConditionalBranch: ... < ... | Conditional branch instruction ConditionalBranch: ... < ... with non-Boolean condition, in function '$@'. | range_analysis.c:336:5:336:10 | int test16(int) | int test16(int) |
+| range_analysis.c:347:9:347:14 | ConditionalBranch: ... > ... | Conditional branch instruction ConditionalBranch: ... > ... with non-Boolean condition, in function '$@'. | range_analysis.c:336:5:336:10 | int test16(int) | int test16(int) |
+| range_analysis.c:357:8:357:14 | ConditionalBranch: ... < ... | Conditional branch instruction ConditionalBranch: ... < ... with non-Boolean condition, in function '$@'. | range_analysis.c:355:14:355:27 | unsigned int test_ternary01(unsigned int) | unsigned int test_ternary01(unsigned int) |
+| range_analysis.c:358:8:358:15 | ConditionalBranch: ... >= ... | Conditional branch instruction ConditionalBranch: ... >= ... with non-Boolean condition, in function '$@'. | range_analysis.c:355:14:355:27 | unsigned int test_ternary01(unsigned int) | unsigned int test_ternary01(unsigned int) |
+| range_analysis.c:365:7:365:13 | ConditionalBranch: ... < ... | Conditional branch instruction ConditionalBranch: ... < ... with non-Boolean condition, in function '$@'. | range_analysis.c:355:14:355:27 | unsigned int test_ternary01(unsigned int) | unsigned int test_ternary01(unsigned int) |
+| range_analysis.c:366:10:366:15 | ConditionalBranch: ... ? ... : ... | Conditional branch instruction ConditionalBranch: ... ? ... : ... with non-Boolean condition, in function '$@'. | range_analysis.c:355:14:355:27 | unsigned int test_ternary01(unsigned int) | unsigned int test_ternary01(unsigned int) |
+| range_analysis.c:367:10:367:17 | ConditionalBranch: ... ? ... : ... | Conditional branch instruction ConditionalBranch: ... ? ... : ... with non-Boolean condition, in function '$@'. | range_analysis.c:355:14:355:27 | unsigned int test_ternary01(unsigned int) | unsigned int test_ternary01(unsigned int) |
+| range_analysis.c:368:10:368:21 | ConditionalBranch: ... ? ... : ... | Conditional branch instruction ConditionalBranch: ... ? ... : ... with non-Boolean condition, in function '$@'. | range_analysis.c:355:14:355:27 | unsigned int test_ternary01(unsigned int) | unsigned int test_ternary01(unsigned int) |
+| range_analysis.c:369:10:369:36 | ConditionalBranch: ... ? ... : ... | Conditional branch instruction ConditionalBranch: ... ? ... : ... with non-Boolean condition, in function '$@'. | range_analysis.c:355:14:355:27 | unsigned int test_ternary01(unsigned int) | unsigned int test_ternary01(unsigned int) |
+| range_analysis.c:370:10:370:38 | ConditionalBranch: ... ? ... : ... | Conditional branch instruction ConditionalBranch: ... ? ... : ... with non-Boolean condition, in function '$@'. | range_analysis.c:355:14:355:27 | unsigned int test_ternary01(unsigned int) | unsigned int test_ternary01(unsigned int) |
+| range_analysis.c:371:10:371:39 | ConditionalBranch: ... ? ... : ... | Conditional branch instruction ConditionalBranch: ... ? ... : ... with non-Boolean condition, in function '$@'. | range_analysis.c:355:14:355:27 | unsigned int test_ternary01(unsigned int) | unsigned int test_ternary01(unsigned int) |
+| range_analysis.c:379:8:379:14 | ConditionalBranch: ... > ... | Conditional branch instruction ConditionalBranch: ... > ... with non-Boolean condition, in function '$@'. | range_analysis.c:377:14:377:27 | unsigned int test_ternary02(unsigned int) | unsigned int test_ternary02(unsigned int) |
+| range_analysis.c:380:8:380:15 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:377:14:377:27 | unsigned int test_ternary02(unsigned int) | unsigned int test_ternary02(unsigned int) |
+| range_analysis.c:384:7:384:14 | ConditionalBranch: ... >= ... | Conditional branch instruction ConditionalBranch: ... >= ... with non-Boolean condition, in function '$@'. | range_analysis.c:377:14:377:27 | unsigned int test_ternary02(unsigned int) | unsigned int test_ternary02(unsigned int) |
+| range_analysis.c:385:10:385:21 | ConditionalBranch: ... ? ... : ... | Conditional branch instruction ConditionalBranch: ... ? ... : ... with non-Boolean condition, in function '$@'. | range_analysis.c:377:14:377:27 | unsigned int test_ternary02(unsigned int) | unsigned int test_ternary02(unsigned int) |
+| range_analysis.c:386:10:386:21 | ConditionalBranch: ... ? ... : ... | Conditional branch instruction ConditionalBranch: ... ? ... : ... with non-Boolean condition, in function '$@'. | range_analysis.c:377:14:377:27 | unsigned int test_ternary02(unsigned int) | unsigned int test_ternary02(unsigned int) |
+| range_analysis.c:387:10:387:38 | ConditionalBranch: ... ? ... : ... | Conditional branch instruction ConditionalBranch: ... ? ... : ... with non-Boolean condition, in function '$@'. | range_analysis.c:377:14:377:27 | unsigned int test_ternary02(unsigned int) | unsigned int test_ternary02(unsigned int) |
+| range_analysis.c:394:20:394:26 | ConditionalBranch: ... < ... | Conditional branch instruction ConditionalBranch: ... < ... with non-Boolean condition, in function '$@'. | range_analysis.c:393:14:393:25 | unsigned int test_comma01(unsigned int) | unsigned int test_comma01(unsigned int) |
+| switchbody.c:5:11:5:15 | ConditionalBranch: ... < ... | Conditional branch instruction ConditionalBranch: ... < ... with non-Boolean condition, in function '$@'. | switchbody.c:4:5:4:16 | int switch_block(int) | int switch_block(int) |
+| switchbody.c:16:11:16:15 | ConditionalBranch: ... < ... | Conditional branch instruction ConditionalBranch: ... < ... with non-Boolean condition, in function '$@'. | switchbody.c:15:5:15:17 | int switch_single(int) | int switch_single(int) |
+| switchbody.c:28:11:28:15 | ConditionalBranch: ... < ... | Conditional branch instruction ConditionalBranch: ... < ... with non-Boolean condition, in function '$@'. | switchbody.c:27:5:27:19 | int switch_notblock(int) | int switch_notblock(int) |
+| switchbody.c:29:9:29:9 | ConditionalBranch: 1 | Conditional branch instruction ConditionalBranch: 1 with non-Boolean condition, in function '$@'. | switchbody.c:27:5:27:19 | int switch_notblock(int) | int switch_notblock(int) |
+| test.c:3:9:3:9 | ConditionalBranch: i | Conditional branch instruction ConditionalBranch: i with non-Boolean condition, in function '$@'. | test.c:2:6:2:11 | void f_if_1(int) | void f_if_1(int) |
+| test.c:11:9:11:9 | ConditionalBranch: 1 | Conditional branch instruction ConditionalBranch: 1 with non-Boolean condition, in function '$@'. | test.c:10:6:10:11 | void f_if_2() | void f_if_2() |
+| test.c:19:9:19:9 | ConditionalBranch: 0 | Conditional branch instruction ConditionalBranch: 0 with non-Boolean condition, in function '$@'. | test.c:18:6:18:11 | void f_if_3() | void f_if_3() |
+| test.c:28:16:28:21 | ConditionalBranch: ... < ... | Conditional branch instruction ConditionalBranch: ... < ... with non-Boolean condition, in function '$@'. | test.c:26:6:26:12 | void f_for_1() | void f_for_1() |
+| test.c:36:16:36:16 | ConditionalBranch: 1 | Conditional branch instruction ConditionalBranch: 1 with non-Boolean condition, in function '$@'. | test.c:34:6:34:12 | void f_for_2() | void f_for_2() |
+| test.c:44:16:44:16 | ConditionalBranch: 0 | Conditional branch instruction ConditionalBranch: 0 with non-Boolean condition, in function '$@'. | test.c:42:6:42:12 | void f_for_3() | void f_for_3() |
+| test.c:51:11:51:11 | ConditionalBranch: i | Conditional branch instruction ConditionalBranch: i with non-Boolean condition, in function '$@'. | test.c:50:6:50:14 | void f_while_1(int) | void f_while_1(int) |
+| test.c:58:11:58:11 | ConditionalBranch: 1 | Conditional branch instruction ConditionalBranch: 1 with non-Boolean condition, in function '$@'. | test.c:57:6:57:14 | void f_while_2() | void f_while_2() |
+| test.c:65:11:65:11 | ConditionalBranch: 0 | Conditional branch instruction ConditionalBranch: 0 with non-Boolean condition, in function '$@'. | test.c:64:6:64:14 | void f_while_3() | void f_while_3() |
+| test.c:74:14:74:14 | ConditionalBranch: i | Conditional branch instruction ConditionalBranch: i with non-Boolean condition, in function '$@'. | test.c:71:6:71:11 | void f_do_1(int) | void f_do_1(int) |
+| test.c:81:14:81:14 | ConditionalBranch: 1 | Conditional branch instruction ConditionalBranch: 1 with non-Boolean condition, in function '$@'. | test.c:78:6:78:11 | void f_do_2() | void f_do_2() |
+| test.c:88:14:88:14 | ConditionalBranch: 0 | Conditional branch instruction ConditionalBranch: 0 with non-Boolean condition, in function '$@'. | test.c:85:6:85:11 | void f_do_3() | void f_do_3() |
+| test.c:93:13:93:13 | ConditionalBranch: i | Conditional branch instruction ConditionalBranch: i with non-Boolean condition, in function '$@'. | test.c:92:6:92:13 | void f_cond_1(int) | void f_cond_1(int) |
+| test.c:204:12:204:12 | ConditionalBranch: i | Conditional branch instruction ConditionalBranch: i with non-Boolean condition, in function '$@'. | test.c:203:6:203:15 | void f_switch_7(int) | void f_switch_7(int) |
+| test.c:219:7:219:7 | ConditionalBranch: x | Conditional branch instruction ConditionalBranch: x with non-Boolean condition, in function '$@'. | test.c:218:5:218:11 | int f_and_1(int, int) | int f_and_1(int, int) |
+| test.c:219:12:219:13 | ConditionalBranch: ! ... | Conditional branch instruction ConditionalBranch: ! ... with non-Boolean condition, in function '$@'. | test.c:218:5:218:11 | int f_and_1(int, int) | int f_and_1(int, int) |
+| test.c:219:12:219:13 | LogicalNot: ! ... | Logical Not instruction LogicalNot: ! ... with non-Boolean operand, in function '$@'. | test.c:218:5:218:11 | int f_and_1(int, int) | int f_and_1(int, int) |
+| test.c:226:7:226:15 | ConditionalBranch: ! ... | Conditional branch instruction ConditionalBranch: ! ... with non-Boolean condition, in function '$@'. | test.c:225:5:225:11 | int f_and_2(int, int) | int f_and_2(int, int) |
+| test.c:226:7:226:15 | LogicalNot: ! ... | Logical Not instruction LogicalNot: ! ... with non-Boolean operand, in function '$@'. | test.c:225:5:225:11 | int f_and_2(int, int) | int f_and_2(int, int) |
+| test.c:226:9:226:9 | ConditionalBranch: x | Conditional branch instruction ConditionalBranch: x with non-Boolean condition, in function '$@'. | test.c:225:5:225:11 | int f_and_2(int, int) | int f_and_2(int, int) |
+| test.c:226:14:226:14 | ConditionalBranch: y | Conditional branch instruction ConditionalBranch: y with non-Boolean condition, in function '$@'. | test.c:225:5:225:11 | int f_and_2(int, int) | int f_and_2(int, int) |
+| test.c:233:7:233:7 | ConditionalBranch: b | Conditional branch instruction ConditionalBranch: b with non-Boolean condition, in function '$@'. | test.c:232:6:232:19 | void f_if_ternary_1(int, int, int) | void f_if_ternary_1(int, int, int) |
+| test.c:233:7:233:15 | ConditionalBranch: ... ? ... : ... | Conditional branch instruction ConditionalBranch: ... ? ... : ... with non-Boolean condition, in function '$@'. | test.c:232:6:232:19 | void f_if_ternary_1(int, int, int) | void f_if_ternary_1(int, int, int) |
+| test.c:245:31:245:31 | ConditionalBranch: 0 | Conditional branch instruction ConditionalBranch: 0 with non-Boolean condition, in function '$@'. | test.c:245:24:245:24 | const void *[] a | const void *[] a |
+| unaryopexpr.c:8:5:8:6 | LogicalNot: ! ... | Logical Not instruction LogicalNot: ! ... with non-Boolean operand, in function '$@'. | unaryopexpr.c:1:13:1:13 | void f() | void f() |
+| whilestmt.c:2:9:2:9 | ConditionalBranch: 0 | Conditional branch instruction ConditionalBranch: 0 with non-Boolean condition, in function '$@'. | whilestmt.c:1:13:1:26 | void always_false_1() | void always_false_1() |
+| whilestmt.c:10:9:10:13 | ConditionalBranch: ! ... | Conditional branch instruction ConditionalBranch: ! ... with non-Boolean condition, in function '$@'. | whilestmt.c:8:13:8:26 | void always_false_2() | void always_false_2() |
+| whilestmt.c:10:9:10:13 | LogicalNot: ! ... | Logical Not instruction LogicalNot: ! ... with non-Boolean operand, in function '$@'. | whilestmt.c:8:13:8:26 | void always_false_2() | void always_false_2() |
+| whilestmt.c:16:9:16:9 | ConditionalBranch: 1 | Conditional branch instruction ConditionalBranch: 1 with non-Boolean condition, in function '$@'. | whilestmt.c:15:13:15:25 | void always_true_1() | void always_true_1() |
+| whilestmt.c:24:9:24:9 | ConditionalBranch: 1 | Conditional branch instruction ConditionalBranch: 1 with non-Boolean condition, in function '$@'. | whilestmt.c:23:13:23:25 | void always_true_2() | void always_true_2() |
+| whilestmt.c:33:9:33:9 | ConditionalBranch: 1 | Conditional branch instruction ConditionalBranch: 1 with non-Boolean condition, in function '$@'. | whilestmt.c:32:13:32:25 | void always_true_3() | void always_true_3() |
+| whilestmt.c:41:9:41:14 | ConditionalBranch: ... < ... | Conditional branch instruction ConditionalBranch: ... < ... with non-Boolean condition, in function '$@'. | whilestmt.c:39:13:39:18 | void normal() | void normal() |
 missingCppType
diff --git a/cpp/ql/test/library-tests/syntax-zoo/unaliased_ssa_consistency.expected b/cpp/ql/test/library-tests/syntax-zoo/unaliased_ssa_consistency.expected
index 3e1b675f84e..66f9c9c375f 100644
--- a/cpp/ql/test/library-tests/syntax-zoo/unaliased_ssa_consistency.expected
+++ b/cpp/ql/test/library-tests/syntax-zoo/unaliased_ssa_consistency.expected
@@ -33,4 +33,271 @@ thisArgumentIsNonPointer
 | pointer_to_member.cpp:23:5:23:54 | Call: call to expression | Call instruction 'Call: call to expression' has a `this` argument operand that is not an address, in function '$@'. | pointer_to_member.cpp:14:5:14:9 | int usePM(int PM::*) | int usePM(int PM::*) |
 | pointer_to_member.cpp:24:5:24:49 | Call: call to expression | Call instruction 'Call: call to expression' has a `this` argument operand that is not an address, in function '$@'. | pointer_to_member.cpp:14:5:14:9 | int usePM(int PM::*) | int usePM(int PM::*) |
 nonUniqueIRVariable
+nonBooleanOperand
+| break_labels.c:4:9:4:14 | ConditionalBranch: ... != ... | Conditional branch instruction ConditionalBranch: ... != ... with non-Boolean condition, in function '$@'. | break_labels.c:2:12:2:12 | int f(int) | int f(int) |
+| break_labels.c:6:16:6:21 | ConditionalBranch: ... < ... | Conditional branch instruction ConditionalBranch: ... < ... with non-Boolean condition, in function '$@'. | break_labels.c:2:12:2:12 | int f(int) | int f(int) |
+| break_labels.c:7:17:7:24 | ConditionalBranch: ... == ... | Conditional branch instruction ConditionalBranch: ... == ... with non-Boolean condition, in function '$@'. | break_labels.c:2:12:2:12 | int f(int) | int f(int) |
+| break_labels.c:20:16:20:21 | ConditionalBranch: ... < ... | Conditional branch instruction ConditionalBranch: ... < ... with non-Boolean condition, in function '$@'. | break_labels.c:16:6:16:10 | void f_for() | void f_for() |
+| break_labels.c:21:13:21:18 | ConditionalBranch: ... == ... | Conditional branch instruction ConditionalBranch: ... == ... with non-Boolean condition, in function '$@'. | break_labels.c:16:6:16:10 | void f_for() | void f_for() |
+| break_labels.c:24:13:24:18 | ConditionalBranch: ... == ... | Conditional branch instruction ConditionalBranch: ... == ... with non-Boolean condition, in function '$@'. | break_labels.c:16:6:16:10 | void f_for() | void f_for() |
+| builtin.c:24:7:24:13 | ConditionalBranch: ... == ... | Conditional branch instruction ConditionalBranch: ... == ... with non-Boolean condition, in function '$@'. | builtin.c:5:5:5:11 | int builtin(int, int) | int builtin(int, int) |
+| builtin.c:28:7:28:29 | ConditionalBranch: call to __builtin_unpredictable | Conditional branch instruction ConditionalBranch: call to __builtin_unpredictable with non-Boolean condition, in function '$@'. | builtin.c:5:5:5:11 | int builtin(int, int) | int builtin(int, int) |
+| builtin.c:47:7:47:22 | ConditionalBranch: call to __builtin_memchr | Conditional branch instruction ConditionalBranch: call to __builtin_memchr with non-Boolean condition, in function '$@'. | builtin.c:5:5:5:11 | int builtin(int, int) | int builtin(int, int) |
+| dostmt.c:4:11:4:11 | ConditionalBranch: 0 | Conditional branch instruction ConditionalBranch: 0 with non-Boolean condition, in function '$@'. | dostmt.c:1:6:1:17 | void always_false() | void always_false() |
+| dostmt.c:28:11:28:11 | ConditionalBranch: 1 | Conditional branch instruction ConditionalBranch: 1 with non-Boolean condition, in function '$@'. | dostmt.c:25:13:25:25 | void always_true_3() | void always_true_3() |
+| dostmt.c:36:11:36:16 | ConditionalBranch: ... < ... | Conditional branch instruction ConditionalBranch: ... < ... with non-Boolean condition, in function '$@'. | dostmt.c:32:13:32:18 | void normal() | void normal() |
+| duff2.c:13:14:13:20 | ConditionalBranch: ... > ... | Conditional branch instruction ConditionalBranch: ... > ... with non-Boolean condition, in function '$@'. | duff2.c:2:6:2:12 | void duff2_8(int) | void duff2_8(int) |
+| duff2.c:21:14:21:20 | ConditionalBranch: ... > ... | Conditional branch instruction ConditionalBranch: ... > ... with non-Boolean condition, in function '$@'. | duff2.c:16:6:16:12 | void duff2_2(int) | void duff2_2(int) |
+| duff.c:13:22:13:28 | ConditionalBranch: ... > ... | Conditional branch instruction ConditionalBranch: ... > ... with non-Boolean condition, in function '$@'. | duff.c:2:13:2:13 | void f(int) | void f(int) |
+| dummyblock.c:2:9:2:9 | ConditionalBranch: 1 | Conditional branch instruction ConditionalBranch: 1 with non-Boolean condition, in function '$@'. | dummyblock.c:1:13:1:13 | void f() | void f() |
+| ifelsestmt.c:2:6:2:6 | ConditionalBranch: 0 | Conditional branch instruction ConditionalBranch: 0 with non-Boolean condition, in function '$@'. | ifelsestmt.c:1:13:1:26 | void always_false_1() | void always_false_1() |
+| ifelsestmt.c:12:6:12:6 | ConditionalBranch: 0 | Conditional branch instruction ConditionalBranch: 0 with non-Boolean condition, in function '$@'. | ifelsestmt.c:11:13:11:26 | void always_false_2() | void always_false_2() |
+| ifelsestmt.c:20:6:20:6 | ConditionalBranch: 1 | Conditional branch instruction ConditionalBranch: 1 with non-Boolean condition, in function '$@'. | ifelsestmt.c:19:13:19:25 | void always_true_1() | void always_true_1() |
+| ifelsestmt.c:30:6:30:6 | ConditionalBranch: 1 | Conditional branch instruction ConditionalBranch: 1 with non-Boolean condition, in function '$@'. | ifelsestmt.c:29:13:29:25 | void always_true_2() | void always_true_2() |
+| ifelsestmt.c:38:6:38:11 | ConditionalBranch: ... == ... | Conditional branch instruction ConditionalBranch: ... == ... with non-Boolean condition, in function '$@'. | ifelsestmt.c:37:13:37:18 | void normal(int, int) | void normal(int, int) |
+| ifstmt.c:2:6:2:6 | ConditionalBranch: 0 | Conditional branch instruction ConditionalBranch: 0 with non-Boolean condition, in function '$@'. | ifstmt.c:1:13:1:26 | void always_false_1() | void always_false_1() |
+| ifstmt.c:9:6:9:6 | ConditionalBranch: 0 | Conditional branch instruction ConditionalBranch: 0 with non-Boolean condition, in function '$@'. | ifstmt.c:8:13:8:26 | void always_false_2() | void always_false_2() |
+| ifstmt.c:15:6:15:6 | ConditionalBranch: 1 | Conditional branch instruction ConditionalBranch: 1 with non-Boolean condition, in function '$@'. | ifstmt.c:14:13:14:25 | void always_true_1() | void always_true_1() |
+| ifstmt.c:22:6:22:6 | ConditionalBranch: 1 | Conditional branch instruction ConditionalBranch: 1 with non-Boolean condition, in function '$@'. | ifstmt.c:21:13:21:25 | void always_true_2() | void always_true_2() |
+| ifstmt.c:28:6:28:11 | ConditionalBranch: ... == ... | Conditional branch instruction ConditionalBranch: ... == ... with non-Boolean condition, in function '$@'. | ifstmt.c:27:13:27:18 | void normal(int, int) | void normal(int, int) |
+| landexpr.c:3:6:3:6 | ConditionalBranch: a | Conditional branch instruction ConditionalBranch: a with non-Boolean condition, in function '$@'. | landexpr.c:1:13:1:13 | void f() | void f() |
+| landexpr.c:3:11:3:11 | ConditionalBranch: b | Conditional branch instruction ConditionalBranch: b with non-Boolean condition, in function '$@'. | landexpr.c:1:13:1:13 | void f() | void f() |
+| lorexpr.c:3:6:3:6 | ConditionalBranch: a | Conditional branch instruction ConditionalBranch: a with non-Boolean condition, in function '$@'. | lorexpr.c:1:13:1:13 | void f() | void f() |
+| lorexpr.c:3:11:3:11 | ConditionalBranch: b | Conditional branch instruction ConditionalBranch: b with non-Boolean condition, in function '$@'. | lorexpr.c:1:13:1:13 | void f() | void f() |
+| misc.c:22:9:22:12 | ConditionalBranch: argi | Conditional branch instruction ConditionalBranch: argi with non-Boolean condition, in function '$@'. | misc.c:16:6:16:10 | void misc1(int, int) | void misc1(int, int) |
+| misc.c:22:17:22:20 | ConditionalBranch: argj | Conditional branch instruction ConditionalBranch: argj with non-Boolean condition, in function '$@'. | misc.c:16:6:16:10 | void misc1(int, int) | void misc1(int, int) |
+| misc.c:27:9:27:12 | ConditionalBranch: argi | Conditional branch instruction ConditionalBranch: argi with non-Boolean condition, in function '$@'. | misc.c:16:6:16:10 | void misc1(int, int) | void misc1(int, int) |
+| misc.c:27:17:27:20 | ConditionalBranch: argj | Conditional branch instruction ConditionalBranch: argj with non-Boolean condition, in function '$@'. | misc.c:16:6:16:10 | void misc1(int, int) | void misc1(int, int) |
+| misc.c:32:9:32:9 | ConditionalBranch: i | Conditional branch instruction ConditionalBranch: i with non-Boolean condition, in function '$@'. | misc.c:16:6:16:10 | void misc1(int, int) | void misc1(int, int) |
+| misc.c:32:14:32:14 | ConditionalBranch: j | Conditional branch instruction ConditionalBranch: j with non-Boolean condition, in function '$@'. | misc.c:16:6:16:10 | void misc1(int, int) | void misc1(int, int) |
+| misc.c:37:9:37:9 | ConditionalBranch: i | Conditional branch instruction ConditionalBranch: i with non-Boolean condition, in function '$@'. | misc.c:16:6:16:10 | void misc1(int, int) | void misc1(int, int) |
+| misc.c:37:14:37:14 | ConditionalBranch: j | Conditional branch instruction ConditionalBranch: j with non-Boolean condition, in function '$@'. | misc.c:16:6:16:10 | void misc1(int, int) | void misc1(int, int) |
+| misc.c:44:11:44:11 | ConditionalBranch: i | Conditional branch instruction ConditionalBranch: i with non-Boolean condition, in function '$@'. | misc.c:16:6:16:10 | void misc1(int, int) | void misc1(int, int) |
+| misc.c:47:11:47:11 | ConditionalBranch: i | Conditional branch instruction ConditionalBranch: i with non-Boolean condition, in function '$@'. | misc.c:16:6:16:10 | void misc1(int, int) | void misc1(int, int) |
+| misc.c:47:16:47:16 | ConditionalBranch: j | Conditional branch instruction ConditionalBranch: j with non-Boolean condition, in function '$@'. | misc.c:16:6:16:10 | void misc1(int, int) | void misc1(int, int) |
+| misc.c:50:11:50:11 | ConditionalBranch: i | Conditional branch instruction ConditionalBranch: i with non-Boolean condition, in function '$@'. | misc.c:16:6:16:10 | void misc1(int, int) | void misc1(int, int) |
+| misc.c:50:16:50:16 | ConditionalBranch: j | Conditional branch instruction ConditionalBranch: j with non-Boolean condition, in function '$@'. | misc.c:16:6:16:10 | void misc1(int, int) | void misc1(int, int) |
+| misc.c:53:11:53:14 | ConditionalBranch: argi | Conditional branch instruction ConditionalBranch: argi with non-Boolean condition, in function '$@'. | misc.c:16:6:16:10 | void misc1(int, int) | void misc1(int, int) |
+| misc.c:58:13:58:13 | ConditionalBranch: i | Conditional branch instruction ConditionalBranch: i with non-Boolean condition, in function '$@'. | misc.c:16:6:16:10 | void misc1(int, int) | void misc1(int, int) |
+| misc.c:61:13:61:16 | ConditionalBranch: argi | Conditional branch instruction ConditionalBranch: argi with non-Boolean condition, in function '$@'. | misc.c:16:6:16:10 | void misc1(int, int) | void misc1(int, int) |
+| misc.c:62:16:62:21 | ConditionalBranch: ... < ... | Conditional branch instruction ConditionalBranch: ... < ... with non-Boolean condition, in function '$@'. | misc.c:16:6:16:10 | void misc1(int, int) | void misc1(int, int) |
+| misc.c:64:11:64:16 | ConditionalBranch: ... < ... | Conditional branch instruction ConditionalBranch: ... < ... with non-Boolean condition, in function '$@'. | misc.c:16:6:16:10 | void misc1(int, int) | void misc1(int, int) |
+| misc.c:93:9:93:15 | ConditionalBranch: ... ? ... : ... | Conditional branch instruction ConditionalBranch: ... ? ... : ... with non-Boolean condition, in function '$@'. | misc.c:91:6:91:33 | void gnuConditionalOmittedOperand(someStruct*) | void gnuConditionalOmittedOperand(someStruct*) |
+| misc.c:94:9:94:19 | ConditionalBranch: ... ? ... : ... | Conditional branch instruction ConditionalBranch: ... ? ... : ... with non-Boolean condition, in function '$@'. | misc.c:91:6:91:33 | void gnuConditionalOmittedOperand(someStruct*) | void gnuConditionalOmittedOperand(someStruct*) |
+| misc.c:139:10:139:18 | ConditionalBranch: ... & ... | Conditional branch instruction ConditionalBranch: ... & ... with non-Boolean condition, in function '$@'. | misc.c:97:6:97:10 | void misc3() | void misc3() |
+| misc.c:139:25:139:33 | ConditionalBranch: ... & ... | Conditional branch instruction ConditionalBranch: ... & ... with non-Boolean condition, in function '$@'. | misc.c:97:6:97:10 | void misc3() | void misc3() |
+| misc.c:140:9:140:9 | ConditionalBranch: i | Conditional branch instruction ConditionalBranch: i with non-Boolean condition, in function '$@'. | misc.c:97:6:97:10 | void misc3() | void misc3() |
+| misc.c:140:14:140:14 | ConditionalBranch: i | Conditional branch instruction ConditionalBranch: i with non-Boolean condition, in function '$@'. | misc.c:97:6:97:10 | void misc3() | void misc3() |
+| misc.c:140:19:140:19 | ConditionalBranch: i | Conditional branch instruction ConditionalBranch: i with non-Boolean condition, in function '$@'. | misc.c:97:6:97:10 | void misc3() | void misc3() |
+| misc.c:141:9:141:9 | ConditionalBranch: i | Conditional branch instruction ConditionalBranch: i with non-Boolean condition, in function '$@'. | misc.c:97:6:97:10 | void misc3() | void misc3() |
+| misc.c:141:14:141:14 | ConditionalBranch: i | Conditional branch instruction ConditionalBranch: i with non-Boolean condition, in function '$@'. | misc.c:97:6:97:10 | void misc3() | void misc3() |
+| misc.c:141:19:141:19 | ConditionalBranch: i | Conditional branch instruction ConditionalBranch: i with non-Boolean condition, in function '$@'. | misc.c:97:6:97:10 | void misc3() | void misc3() |
+| misc.c:192:11:192:11 | ConditionalBranch: 1 | Conditional branch instruction ConditionalBranch: 1 with non-Boolean condition, in function '$@'. | misc.c:191:6:191:20 | void unreachable_end() | void unreachable_end() |
+| pruning.c:5:9:5:9 | ConditionalBranch: 0 | Conditional branch instruction ConditionalBranch: 0 with non-Boolean condition, in function '$@'. | pruning.c:4:6:4:8 | void f_0() | void f_0() |
+| pruning.c:13:9:13:9 | ConditionalBranch: 1 | Conditional branch instruction ConditionalBranch: 1 with non-Boolean condition, in function '$@'. | pruning.c:12:6:12:8 | void f_1() | void f_1() |
+| pruning.c:21:9:21:11 | ConditionalBranch: 256 | Conditional branch instruction ConditionalBranch: 256 with non-Boolean condition, in function '$@'. | pruning.c:20:6:20:10 | void f_256() | void f_256() |
+| pruning.c:29:9:29:18 | ConditionalBranch: (uint8_t)... | Conditional branch instruction ConditionalBranch: (uint8_t)... with non-Boolean condition, in function '$@'. | pruning.c:28:6:28:16 | void f_uint8_t_0() | void f_uint8_t_0() |
+| pruning.c:37:9:37:18 | ConditionalBranch: (uint8_t)... | Conditional branch instruction ConditionalBranch: (uint8_t)... with non-Boolean condition, in function '$@'. | pruning.c:36:6:36:16 | void f_uint8_t_1() | void f_uint8_t_1() |
+| pruning.c:45:9:45:20 | ConditionalBranch: (uint8_t)... | Conditional branch instruction ConditionalBranch: (uint8_t)... with non-Boolean condition, in function '$@'. | pruning.c:44:6:44:18 | void f_uint8_t_256() | void f_uint8_t_256() |
+| pruning.c:53:9:53:20 | ConditionalBranch: (uint8_t)... | Conditional branch instruction ConditionalBranch: (uint8_t)... with non-Boolean condition, in function '$@'. | pruning.c:52:6:52:18 | void f_uint8_t_257() | void f_uint8_t_257() |
+| pruning.c:61:9:61:26 | ConditionalBranch: ... == ... | Conditional branch instruction ConditionalBranch: ... == ... with non-Boolean condition, in function '$@'. | pruning.c:60:6:60:21 | void f_uint8_t_minus1() | void f_uint8_t_minus1() |
+| pruning.c:70:9:70:9 | ConditionalBranch: i | Conditional branch instruction ConditionalBranch: i with non-Boolean condition, in function '$@'. | pruning.c:68:6:68:14 | void f_v_int_0() | void f_v_int_0() |
+| pruning.c:79:9:79:9 | ConditionalBranch: i | Conditional branch instruction ConditionalBranch: i with non-Boolean condition, in function '$@'. | pruning.c:77:6:77:14 | void f_v_int_1() | void f_v_int_1() |
+| pruning.c:88:9:88:9 | ConditionalBranch: i | Conditional branch instruction ConditionalBranch: i with non-Boolean condition, in function '$@'. | pruning.c:86:6:86:16 | void f_v_int_256() | void f_v_int_256() |
+| pruning.c:97:9:97:9 | ConditionalBranch: i | Conditional branch instruction ConditionalBranch: i with non-Boolean condition, in function '$@'. | pruning.c:95:6:95:18 | void f_v_uint8_t_0() | void f_v_uint8_t_0() |
+| pruning.c:106:9:106:9 | ConditionalBranch: i | Conditional branch instruction ConditionalBranch: i with non-Boolean condition, in function '$@'. | pruning.c:104:6:104:18 | void f_v_uint8_t_1() | void f_v_uint8_t_1() |
+| pruning.c:115:9:115:9 | ConditionalBranch: i | Conditional branch instruction ConditionalBranch: i with non-Boolean condition, in function '$@'. | pruning.c:113:6:113:20 | void f_v_uint8_t_256() | void f_v_uint8_t_256() |
+| pruning.c:124:9:124:9 | ConditionalBranch: i | Conditional branch instruction ConditionalBranch: i with non-Boolean condition, in function '$@'. | pruning.c:122:6:122:20 | void f_v_uint8_t_257() | void f_v_uint8_t_257() |
+| pruning.c:133:9:133:16 | ConditionalBranch: ... == ... | Conditional branch instruction ConditionalBranch: ... == ... with non-Boolean condition, in function '$@'. | pruning.c:131:6:131:23 | void f_v_uint8_t_minus1() | void f_v_uint8_t_minus1() |
+| questionexpr.c:3:6:3:11 | ConditionalBranch: ... == ... | Conditional branch instruction ConditionalBranch: ... == ... with non-Boolean condition, in function '$@'. | questionexpr.c:1:13:1:13 | void f() | void f() |
+| range_analysis.c:7:10:7:10 | ConditionalBranch: p | Conditional branch instruction ConditionalBranch: p with non-Boolean condition, in function '$@'. | range_analysis.c:5:5:5:9 | int test1(List*) | int test1(List*) |
+| range_analysis.c:15:10:15:10 | ConditionalBranch: p | Conditional branch instruction ConditionalBranch: p with non-Boolean condition, in function '$@'. | range_analysis.c:13:5:13:9 | int test2(List*) | int test2(List*) |
+| range_analysis.c:23:10:23:10 | ConditionalBranch: p | Conditional branch instruction ConditionalBranch: p with non-Boolean condition, in function '$@'. | range_analysis.c:21:5:21:9 | int test3(List*) | int test3(List*) |
+| range_analysis.c:33:15:33:19 | ConditionalBranch: ... < ... | Conditional branch instruction ConditionalBranch: ... < ... with non-Boolean condition, in function '$@'. | range_analysis.c:30:5:30:9 | int test4() | int test4() |
+| range_analysis.c:42:15:42:19 | ConditionalBranch: ... < ... | Conditional branch instruction ConditionalBranch: ... < ... with non-Boolean condition, in function '$@'. | range_analysis.c:39:5:39:9 | int test5() | int test5() |
+| range_analysis.c:51:15:51:21 | ConditionalBranch: ... < ... | Conditional branch instruction ConditionalBranch: ... < ... with non-Boolean condition, in function '$@'. | range_analysis.c:48:5:48:9 | int test6() | int test6() |
+| range_analysis.c:58:7:58:11 | ConditionalBranch: ... < ... | Conditional branch instruction ConditionalBranch: ... < ... with non-Boolean condition, in function '$@'. | range_analysis.c:57:5:57:9 | int test7(int) | int test7(int) |
+| range_analysis.c:59:9:59:13 | ConditionalBranch: ... < ... | Conditional branch instruction ConditionalBranch: ... < ... with non-Boolean condition, in function '$@'. | range_analysis.c:57:5:57:9 | int test7(int) | int test7(int) |
+| range_analysis.c:67:7:67:15 | ConditionalBranch: ... < ... | Conditional branch instruction ConditionalBranch: ... < ... with non-Boolean condition, in function '$@'. | range_analysis.c:66:5:66:9 | int test8(int, int) | int test8(int, int) |
+| range_analysis.c:67:20:67:25 | ConditionalBranch: ... < ... | Conditional branch instruction ConditionalBranch: ... < ... with non-Boolean condition, in function '$@'. | range_analysis.c:66:5:66:9 | int test8(int, int) | int test8(int, int) |
+| range_analysis.c:68:9:68:15 | ConditionalBranch: ... < ... | Conditional branch instruction ConditionalBranch: ... < ... with non-Boolean condition, in function '$@'. | range_analysis.c:66:5:66:9 | int test8(int, int) | int test8(int, int) |
+| range_analysis.c:76:7:76:12 | ConditionalBranch: ... == ... | Conditional branch instruction ConditionalBranch: ... == ... with non-Boolean condition, in function '$@'. | range_analysis.c:75:5:75:9 | int test9(int, int) | int test9(int, int) |
+| range_analysis.c:77:9:77:13 | ConditionalBranch: ... < ... | Conditional branch instruction ConditionalBranch: ... < ... with non-Boolean condition, in function '$@'. | range_analysis.c:75:5:75:9 | int test9(int, int) | int test9(int, int) |
+| range_analysis.c:81:9:81:13 | ConditionalBranch: ... < ... | Conditional branch instruction ConditionalBranch: ... < ... with non-Boolean condition, in function '$@'. | range_analysis.c:75:5:75:9 | int test9(int, int) | int test9(int, int) |
+| range_analysis.c:89:7:89:11 | ConditionalBranch: ... > ... | Conditional branch instruction ConditionalBranch: ... > ... with non-Boolean condition, in function '$@'. | range_analysis.c:88:5:88:10 | int test10(int, int) | int test10(int, int) |
+| range_analysis.c:90:9:90:13 | ConditionalBranch: ... < ... | Conditional branch instruction ConditionalBranch: ... < ... with non-Boolean condition, in function '$@'. | range_analysis.c:88:5:88:10 | int test10(int, int) | int test10(int, int) |
+| range_analysis.c:101:7:101:15 | ConditionalBranch: ... != ... | Conditional branch instruction ConditionalBranch: ... != ... with non-Boolean condition, in function '$@'. | range_analysis.c:98:5:98:10 | int test11(char*) | int test11(char*) |
+| range_analysis.c:104:7:104:14 | ConditionalBranch: ... == ... | Conditional branch instruction ConditionalBranch: ... == ... with non-Boolean condition, in function '$@'. | range_analysis.c:98:5:98:10 | int test11(char*) | int test11(char*) |
+| range_analysis.c:106:9:106:17 | ConditionalBranch: ... != ... | Conditional branch instruction ConditionalBranch: ... != ... with non-Boolean condition, in function '$@'. | range_analysis.c:98:5:98:10 | int test11(char*) | int test11(char*) |
+| range_analysis.c:109:9:109:16 | ConditionalBranch: ... != ... | Conditional branch instruction ConditionalBranch: ... != ... with non-Boolean condition, in function '$@'. | range_analysis.c:98:5:98:10 | int test11(char*) | int test11(char*) |
+| range_analysis.c:124:11:124:36 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:122:5:122:10 | int test12() | int test12() |
+| range_analysis.c:154:11:154:15 | ConditionalBranch: ... > ... | Conditional branch instruction ConditionalBranch: ... > ... with non-Boolean condition, in function '$@'. | range_analysis.c:153:11:153:16 | long long test15(long long) | long long test15(long long) |
+| range_analysis.c:154:20:154:30 | ConditionalBranch: ... == ... | Conditional branch instruction ConditionalBranch: ... == ... with non-Boolean condition, in function '$@'. | range_analysis.c:153:11:153:16 | long long test15(long long) | long long test15(long long) |
+| range_analysis.c:161:7:161:12 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:158:5:158:14 | int test_unary(int) | int test_unary(int) |
+| range_analysis.c:161:17:161:23 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:158:5:158:14 | int test_unary(int) | int test_unary(int) |
+| range_analysis.c:166:7:166:12 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:158:5:158:14 | int test_unary(int) | int test_unary(int) |
+| range_analysis.c:166:17:166:23 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:158:5:158:14 | int test_unary(int) | int test_unary(int) |
+| range_analysis.c:171:7:171:13 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:158:5:158:14 | int test_unary(int) | int test_unary(int) |
+| range_analysis.c:171:18:171:24 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:158:5:158:14 | int test_unary(int) | int test_unary(int) |
+| range_analysis.c:176:7:176:13 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:158:5:158:14 | int test_unary(int) | int test_unary(int) |
+| range_analysis.c:176:18:176:23 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:158:5:158:14 | int test_unary(int) | int test_unary(int) |
+| range_analysis.c:181:7:181:13 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:158:5:158:14 | int test_unary(int) | int test_unary(int) |
+| range_analysis.c:181:18:181:23 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:158:5:158:14 | int test_unary(int) | int test_unary(int) |
+| range_analysis.c:186:7:186:13 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:158:5:158:14 | int test_unary(int) | int test_unary(int) |
+| range_analysis.c:186:18:186:24 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:158:5:158:14 | int test_unary(int) | int test_unary(int) |
+| range_analysis.c:200:7:200:12 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:197:5:197:15 | int test_mult01(int, int) | int test_mult01(int, int) |
+| range_analysis.c:200:17:200:23 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:197:5:197:15 | int test_mult01(int, int) | int test_mult01(int, int) |
+| range_analysis.c:200:28:200:33 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:197:5:197:15 | int test_mult01(int, int) | int test_mult01(int, int) |
+| range_analysis.c:200:38:200:44 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:197:5:197:15 | int test_mult01(int, int) | int test_mult01(int, int) |
+| range_analysis.c:204:7:204:12 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:197:5:197:15 | int test_mult01(int, int) | int test_mult01(int, int) |
+| range_analysis.c:204:17:204:23 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:197:5:197:15 | int test_mult01(int, int) | int test_mult01(int, int) |
+| range_analysis.c:204:28:204:33 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:197:5:197:15 | int test_mult01(int, int) | int test_mult01(int, int) |
+| range_analysis.c:204:38:204:44 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:197:5:197:15 | int test_mult01(int, int) | int test_mult01(int, int) |
+| range_analysis.c:208:7:208:12 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:197:5:197:15 | int test_mult01(int, int) | int test_mult01(int, int) |
+| range_analysis.c:208:17:208:23 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:197:5:197:15 | int test_mult01(int, int) | int test_mult01(int, int) |
+| range_analysis.c:208:28:208:35 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:197:5:197:15 | int test_mult01(int, int) | int test_mult01(int, int) |
+| range_analysis.c:208:40:208:46 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:197:5:197:15 | int test_mult01(int, int) | int test_mult01(int, int) |
+| range_analysis.c:212:7:212:12 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:197:5:197:15 | int test_mult01(int, int) | int test_mult01(int, int) |
+| range_analysis.c:212:17:212:23 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:197:5:197:15 | int test_mult01(int, int) | int test_mult01(int, int) |
+| range_analysis.c:212:28:212:35 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:197:5:197:15 | int test_mult01(int, int) | int test_mult01(int, int) |
+| range_analysis.c:212:40:212:45 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:197:5:197:15 | int test_mult01(int, int) | int test_mult01(int, int) |
+| range_analysis.c:216:7:216:12 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:197:5:197:15 | int test_mult01(int, int) | int test_mult01(int, int) |
+| range_analysis.c:216:17:216:23 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:197:5:197:15 | int test_mult01(int, int) | int test_mult01(int, int) |
+| range_analysis.c:216:28:216:35 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:197:5:197:15 | int test_mult01(int, int) | int test_mult01(int, int) |
+| range_analysis.c:216:40:216:46 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:197:5:197:15 | int test_mult01(int, int) | int test_mult01(int, int) |
+| range_analysis.c:228:7:228:12 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:225:5:225:15 | int test_mult02(int, int) | int test_mult02(int, int) |
+| range_analysis.c:228:17:228:23 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:225:5:225:15 | int test_mult02(int, int) | int test_mult02(int, int) |
+| range_analysis.c:228:28:228:33 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:225:5:225:15 | int test_mult02(int, int) | int test_mult02(int, int) |
+| range_analysis.c:228:38:228:44 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:225:5:225:15 | int test_mult02(int, int) | int test_mult02(int, int) |
+| range_analysis.c:232:7:232:12 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:225:5:225:15 | int test_mult02(int, int) | int test_mult02(int, int) |
+| range_analysis.c:232:17:232:23 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:225:5:225:15 | int test_mult02(int, int) | int test_mult02(int, int) |
+| range_analysis.c:232:28:232:33 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:225:5:225:15 | int test_mult02(int, int) | int test_mult02(int, int) |
+| range_analysis.c:232:38:232:44 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:225:5:225:15 | int test_mult02(int, int) | int test_mult02(int, int) |
+| range_analysis.c:236:7:236:12 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:225:5:225:15 | int test_mult02(int, int) | int test_mult02(int, int) |
+| range_analysis.c:236:17:236:23 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:225:5:225:15 | int test_mult02(int, int) | int test_mult02(int, int) |
+| range_analysis.c:236:28:236:35 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:225:5:225:15 | int test_mult02(int, int) | int test_mult02(int, int) |
+| range_analysis.c:236:40:236:46 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:225:5:225:15 | int test_mult02(int, int) | int test_mult02(int, int) |
+| range_analysis.c:240:7:240:12 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:225:5:225:15 | int test_mult02(int, int) | int test_mult02(int, int) |
+| range_analysis.c:240:17:240:23 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:225:5:225:15 | int test_mult02(int, int) | int test_mult02(int, int) |
+| range_analysis.c:240:28:240:35 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:225:5:225:15 | int test_mult02(int, int) | int test_mult02(int, int) |
+| range_analysis.c:240:40:240:45 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:225:5:225:15 | int test_mult02(int, int) | int test_mult02(int, int) |
+| range_analysis.c:244:7:244:12 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:225:5:225:15 | int test_mult02(int, int) | int test_mult02(int, int) |
+| range_analysis.c:244:17:244:23 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:225:5:225:15 | int test_mult02(int, int) | int test_mult02(int, int) |
+| range_analysis.c:244:28:244:35 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:225:5:225:15 | int test_mult02(int, int) | int test_mult02(int, int) |
+| range_analysis.c:244:40:244:46 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:225:5:225:15 | int test_mult02(int, int) | int test_mult02(int, int) |
+| range_analysis.c:256:7:256:14 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:253:5:253:15 | int test_mult03(int, int) | int test_mult03(int, int) |
+| range_analysis.c:256:19:256:25 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:253:5:253:15 | int test_mult03(int, int) | int test_mult03(int, int) |
+| range_analysis.c:256:30:256:35 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:253:5:253:15 | int test_mult03(int, int) | int test_mult03(int, int) |
+| range_analysis.c:256:40:256:46 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:253:5:253:15 | int test_mult03(int, int) | int test_mult03(int, int) |
+| range_analysis.c:260:7:260:14 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:253:5:253:15 | int test_mult03(int, int) | int test_mult03(int, int) |
+| range_analysis.c:260:19:260:25 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:253:5:253:15 | int test_mult03(int, int) | int test_mult03(int, int) |
+| range_analysis.c:260:30:260:35 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:253:5:253:15 | int test_mult03(int, int) | int test_mult03(int, int) |
+| range_analysis.c:260:40:260:46 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:253:5:253:15 | int test_mult03(int, int) | int test_mult03(int, int) |
+| range_analysis.c:264:7:264:14 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:253:5:253:15 | int test_mult03(int, int) | int test_mult03(int, int) |
+| range_analysis.c:264:19:264:25 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:253:5:253:15 | int test_mult03(int, int) | int test_mult03(int, int) |
+| range_analysis.c:264:30:264:37 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:253:5:253:15 | int test_mult03(int, int) | int test_mult03(int, int) |
+| range_analysis.c:264:42:264:48 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:253:5:253:15 | int test_mult03(int, int) | int test_mult03(int, int) |
+| range_analysis.c:268:7:268:14 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:253:5:253:15 | int test_mult03(int, int) | int test_mult03(int, int) |
+| range_analysis.c:268:19:268:25 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:253:5:253:15 | int test_mult03(int, int) | int test_mult03(int, int) |
+| range_analysis.c:268:30:268:37 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:253:5:253:15 | int test_mult03(int, int) | int test_mult03(int, int) |
+| range_analysis.c:268:42:268:47 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:253:5:253:15 | int test_mult03(int, int) | int test_mult03(int, int) |
+| range_analysis.c:272:7:272:14 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:253:5:253:15 | int test_mult03(int, int) | int test_mult03(int, int) |
+| range_analysis.c:272:19:272:25 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:253:5:253:15 | int test_mult03(int, int) | int test_mult03(int, int) |
+| range_analysis.c:272:30:272:37 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:253:5:253:15 | int test_mult03(int, int) | int test_mult03(int, int) |
+| range_analysis.c:272:42:272:48 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:253:5:253:15 | int test_mult03(int, int) | int test_mult03(int, int) |
+| range_analysis.c:284:7:284:14 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:281:5:281:15 | int test_mult04(int, int) | int test_mult04(int, int) |
+| range_analysis.c:284:19:284:24 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:281:5:281:15 | int test_mult04(int, int) | int test_mult04(int, int) |
+| range_analysis.c:284:29:284:34 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:281:5:281:15 | int test_mult04(int, int) | int test_mult04(int, int) |
+| range_analysis.c:284:39:284:45 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:281:5:281:15 | int test_mult04(int, int) | int test_mult04(int, int) |
+| range_analysis.c:288:7:288:14 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:281:5:281:15 | int test_mult04(int, int) | int test_mult04(int, int) |
+| range_analysis.c:288:19:288:24 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:281:5:281:15 | int test_mult04(int, int) | int test_mult04(int, int) |
+| range_analysis.c:288:29:288:34 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:281:5:281:15 | int test_mult04(int, int) | int test_mult04(int, int) |
+| range_analysis.c:288:39:288:45 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:281:5:281:15 | int test_mult04(int, int) | int test_mult04(int, int) |
+| range_analysis.c:292:7:292:14 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:281:5:281:15 | int test_mult04(int, int) | int test_mult04(int, int) |
+| range_analysis.c:292:19:292:24 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:281:5:281:15 | int test_mult04(int, int) | int test_mult04(int, int) |
+| range_analysis.c:292:29:292:36 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:281:5:281:15 | int test_mult04(int, int) | int test_mult04(int, int) |
+| range_analysis.c:292:41:292:47 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:281:5:281:15 | int test_mult04(int, int) | int test_mult04(int, int) |
+| range_analysis.c:296:7:296:14 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:281:5:281:15 | int test_mult04(int, int) | int test_mult04(int, int) |
+| range_analysis.c:296:19:296:24 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:281:5:281:15 | int test_mult04(int, int) | int test_mult04(int, int) |
+| range_analysis.c:296:29:296:36 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:281:5:281:15 | int test_mult04(int, int) | int test_mult04(int, int) |
+| range_analysis.c:296:41:296:46 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:281:5:281:15 | int test_mult04(int, int) | int test_mult04(int, int) |
+| range_analysis.c:300:7:300:14 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:281:5:281:15 | int test_mult04(int, int) | int test_mult04(int, int) |
+| range_analysis.c:300:19:300:24 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:281:5:281:15 | int test_mult04(int, int) | int test_mult04(int, int) |
+| range_analysis.c:300:29:300:36 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:281:5:281:15 | int test_mult04(int, int) | int test_mult04(int, int) |
+| range_analysis.c:300:41:300:47 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:281:5:281:15 | int test_mult04(int, int) | int test_mult04(int, int) |
+| range_analysis.c:312:7:312:14 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:309:5:309:15 | int test_mult05(int, int) | int test_mult05(int, int) |
+| range_analysis.c:312:19:312:25 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:309:5:309:15 | int test_mult05(int, int) | int test_mult05(int, int) |
+| range_analysis.c:312:30:312:35 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:309:5:309:15 | int test_mult05(int, int) | int test_mult05(int, int) |
+| range_analysis.c:312:40:312:46 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:309:5:309:15 | int test_mult05(int, int) | int test_mult05(int, int) |
+| range_analysis.c:316:7:316:14 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:309:5:309:15 | int test_mult05(int, int) | int test_mult05(int, int) |
+| range_analysis.c:316:19:316:25 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:309:5:309:15 | int test_mult05(int, int) | int test_mult05(int, int) |
+| range_analysis.c:316:30:316:35 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:309:5:309:15 | int test_mult05(int, int) | int test_mult05(int, int) |
+| range_analysis.c:316:40:316:46 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:309:5:309:15 | int test_mult05(int, int) | int test_mult05(int, int) |
+| range_analysis.c:320:7:320:14 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:309:5:309:15 | int test_mult05(int, int) | int test_mult05(int, int) |
+| range_analysis.c:320:19:320:25 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:309:5:309:15 | int test_mult05(int, int) | int test_mult05(int, int) |
+| range_analysis.c:320:30:320:37 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:309:5:309:15 | int test_mult05(int, int) | int test_mult05(int, int) |
+| range_analysis.c:320:42:320:48 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:309:5:309:15 | int test_mult05(int, int) | int test_mult05(int, int) |
+| range_analysis.c:324:7:324:14 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:309:5:309:15 | int test_mult05(int, int) | int test_mult05(int, int) |
+| range_analysis.c:324:19:324:25 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:309:5:309:15 | int test_mult05(int, int) | int test_mult05(int, int) |
+| range_analysis.c:324:30:324:37 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:309:5:309:15 | int test_mult05(int, int) | int test_mult05(int, int) |
+| range_analysis.c:324:42:324:47 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:309:5:309:15 | int test_mult05(int, int) | int test_mult05(int, int) |
+| range_analysis.c:328:7:328:14 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:309:5:309:15 | int test_mult05(int, int) | int test_mult05(int, int) |
+| range_analysis.c:328:19:328:25 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:309:5:309:15 | int test_mult05(int, int) | int test_mult05(int, int) |
+| range_analysis.c:328:30:328:37 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:309:5:309:15 | int test_mult05(int, int) | int test_mult05(int, int) |
+| range_analysis.c:328:42:328:48 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:309:5:309:15 | int test_mult05(int, int) | int test_mult05(int, int) |
+| range_analysis.c:338:7:338:11 | ConditionalBranch: ... < ... | Conditional branch instruction ConditionalBranch: ... < ... with non-Boolean condition, in function '$@'. | range_analysis.c:336:5:336:10 | int test16(int) | int test16(int) |
+| range_analysis.c:342:10:342:14 | ConditionalBranch: ... < ... | Conditional branch instruction ConditionalBranch: ... < ... with non-Boolean condition, in function '$@'. | range_analysis.c:336:5:336:10 | int test16(int) | int test16(int) |
+| range_analysis.c:346:7:346:11 | ConditionalBranch: ... < ... | Conditional branch instruction ConditionalBranch: ... < ... with non-Boolean condition, in function '$@'. | range_analysis.c:336:5:336:10 | int test16(int) | int test16(int) |
+| range_analysis.c:347:9:347:14 | ConditionalBranch: ... > ... | Conditional branch instruction ConditionalBranch: ... > ... with non-Boolean condition, in function '$@'. | range_analysis.c:336:5:336:10 | int test16(int) | int test16(int) |
+| range_analysis.c:357:8:357:14 | ConditionalBranch: ... < ... | Conditional branch instruction ConditionalBranch: ... < ... with non-Boolean condition, in function '$@'. | range_analysis.c:355:14:355:27 | unsigned int test_ternary01(unsigned int) | unsigned int test_ternary01(unsigned int) |
+| range_analysis.c:358:8:358:15 | ConditionalBranch: ... >= ... | Conditional branch instruction ConditionalBranch: ... >= ... with non-Boolean condition, in function '$@'. | range_analysis.c:355:14:355:27 | unsigned int test_ternary01(unsigned int) | unsigned int test_ternary01(unsigned int) |
+| range_analysis.c:365:7:365:13 | ConditionalBranch: ... < ... | Conditional branch instruction ConditionalBranch: ... < ... with non-Boolean condition, in function '$@'. | range_analysis.c:355:14:355:27 | unsigned int test_ternary01(unsigned int) | unsigned int test_ternary01(unsigned int) |
+| range_analysis.c:366:10:366:15 | ConditionalBranch: ... ? ... : ... | Conditional branch instruction ConditionalBranch: ... ? ... : ... with non-Boolean condition, in function '$@'. | range_analysis.c:355:14:355:27 | unsigned int test_ternary01(unsigned int) | unsigned int test_ternary01(unsigned int) |
+| range_analysis.c:367:10:367:17 | ConditionalBranch: ... ? ... : ... | Conditional branch instruction ConditionalBranch: ... ? ... : ... with non-Boolean condition, in function '$@'. | range_analysis.c:355:14:355:27 | unsigned int test_ternary01(unsigned int) | unsigned int test_ternary01(unsigned int) |
+| range_analysis.c:368:10:368:21 | ConditionalBranch: ... ? ... : ... | Conditional branch instruction ConditionalBranch: ... ? ... : ... with non-Boolean condition, in function '$@'. | range_analysis.c:355:14:355:27 | unsigned int test_ternary01(unsigned int) | unsigned int test_ternary01(unsigned int) |
+| range_analysis.c:369:10:369:36 | ConditionalBranch: ... ? ... : ... | Conditional branch instruction ConditionalBranch: ... ? ... : ... with non-Boolean condition, in function '$@'. | range_analysis.c:355:14:355:27 | unsigned int test_ternary01(unsigned int) | unsigned int test_ternary01(unsigned int) |
+| range_analysis.c:370:10:370:38 | ConditionalBranch: ... ? ... : ... | Conditional branch instruction ConditionalBranch: ... ? ... : ... with non-Boolean condition, in function '$@'. | range_analysis.c:355:14:355:27 | unsigned int test_ternary01(unsigned int) | unsigned int test_ternary01(unsigned int) |
+| range_analysis.c:371:10:371:39 | ConditionalBranch: ... ? ... : ... | Conditional branch instruction ConditionalBranch: ... ? ... : ... with non-Boolean condition, in function '$@'. | range_analysis.c:355:14:355:27 | unsigned int test_ternary01(unsigned int) | unsigned int test_ternary01(unsigned int) |
+| range_analysis.c:379:8:379:14 | ConditionalBranch: ... > ... | Conditional branch instruction ConditionalBranch: ... > ... with non-Boolean condition, in function '$@'. | range_analysis.c:377:14:377:27 | unsigned int test_ternary02(unsigned int) | unsigned int test_ternary02(unsigned int) |
+| range_analysis.c:380:8:380:15 | ConditionalBranch: ... <= ... | Conditional branch instruction ConditionalBranch: ... <= ... with non-Boolean condition, in function '$@'. | range_analysis.c:377:14:377:27 | unsigned int test_ternary02(unsigned int) | unsigned int test_ternary02(unsigned int) |
+| range_analysis.c:384:7:384:14 | ConditionalBranch: ... >= ... | Conditional branch instruction ConditionalBranch: ... >= ... with non-Boolean condition, in function '$@'. | range_analysis.c:377:14:377:27 | unsigned int test_ternary02(unsigned int) | unsigned int test_ternary02(unsigned int) |
+| range_analysis.c:385:10:385:21 | ConditionalBranch: ... ? ... : ... | Conditional branch instruction ConditionalBranch: ... ? ... : ... with non-Boolean condition, in function '$@'. | range_analysis.c:377:14:377:27 | unsigned int test_ternary02(unsigned int) | unsigned int test_ternary02(unsigned int) |
+| range_analysis.c:386:10:386:21 | ConditionalBranch: ... ? ... : ... | Conditional branch instruction ConditionalBranch: ... ? ... : ... with non-Boolean condition, in function '$@'. | range_analysis.c:377:14:377:27 | unsigned int test_ternary02(unsigned int) | unsigned int test_ternary02(unsigned int) |
+| range_analysis.c:387:10:387:38 | ConditionalBranch: ... ? ... : ... | Conditional branch instruction ConditionalBranch: ... ? ... : ... with non-Boolean condition, in function '$@'. | range_analysis.c:377:14:377:27 | unsigned int test_ternary02(unsigned int) | unsigned int test_ternary02(unsigned int) |
+| range_analysis.c:394:20:394:26 | ConditionalBranch: ... < ... | Conditional branch instruction ConditionalBranch: ... < ... with non-Boolean condition, in function '$@'. | range_analysis.c:393:14:393:25 | unsigned int test_comma01(unsigned int) | unsigned int test_comma01(unsigned int) |
+| switchbody.c:5:11:5:15 | ConditionalBranch: ... < ... | Conditional branch instruction ConditionalBranch: ... < ... with non-Boolean condition, in function '$@'. | switchbody.c:4:5:4:16 | int switch_block(int) | int switch_block(int) |
+| switchbody.c:16:11:16:15 | ConditionalBranch: ... < ... | Conditional branch instruction ConditionalBranch: ... < ... with non-Boolean condition, in function '$@'. | switchbody.c:15:5:15:17 | int switch_single(int) | int switch_single(int) |
+| switchbody.c:28:11:28:15 | ConditionalBranch: ... < ... | Conditional branch instruction ConditionalBranch: ... < ... with non-Boolean condition, in function '$@'. | switchbody.c:27:5:27:19 | int switch_notblock(int) | int switch_notblock(int) |
+| test.c:3:9:3:9 | ConditionalBranch: i | Conditional branch instruction ConditionalBranch: i with non-Boolean condition, in function '$@'. | test.c:2:6:2:11 | void f_if_1(int) | void f_if_1(int) |
+| test.c:11:9:11:9 | ConditionalBranch: 1 | Conditional branch instruction ConditionalBranch: 1 with non-Boolean condition, in function '$@'. | test.c:10:6:10:11 | void f_if_2() | void f_if_2() |
+| test.c:19:9:19:9 | ConditionalBranch: 0 | Conditional branch instruction ConditionalBranch: 0 with non-Boolean condition, in function '$@'. | test.c:18:6:18:11 | void f_if_3() | void f_if_3() |
+| test.c:28:16:28:21 | ConditionalBranch: ... < ... | Conditional branch instruction ConditionalBranch: ... < ... with non-Boolean condition, in function '$@'. | test.c:26:6:26:12 | void f_for_1() | void f_for_1() |
+| test.c:36:16:36:16 | ConditionalBranch: 1 | Conditional branch instruction ConditionalBranch: 1 with non-Boolean condition, in function '$@'. | test.c:34:6:34:12 | void f_for_2() | void f_for_2() |
+| test.c:44:16:44:16 | ConditionalBranch: 0 | Conditional branch instruction ConditionalBranch: 0 with non-Boolean condition, in function '$@'. | test.c:42:6:42:12 | void f_for_3() | void f_for_3() |
+| test.c:51:11:51:11 | ConditionalBranch: i | Conditional branch instruction ConditionalBranch: i with non-Boolean condition, in function '$@'. | test.c:50:6:50:14 | void f_while_1(int) | void f_while_1(int) |
+| test.c:58:11:58:11 | ConditionalBranch: 1 | Conditional branch instruction ConditionalBranch: 1 with non-Boolean condition, in function '$@'. | test.c:57:6:57:14 | void f_while_2() | void f_while_2() |
+| test.c:65:11:65:11 | ConditionalBranch: 0 | Conditional branch instruction ConditionalBranch: 0 with non-Boolean condition, in function '$@'. | test.c:64:6:64:14 | void f_while_3() | void f_while_3() |
+| test.c:74:14:74:14 | ConditionalBranch: i | Conditional branch instruction ConditionalBranch: i with non-Boolean condition, in function '$@'. | test.c:71:6:71:11 | void f_do_1(int) | void f_do_1(int) |
+| test.c:81:14:81:14 | ConditionalBranch: 1 | Conditional branch instruction ConditionalBranch: 1 with non-Boolean condition, in function '$@'. | test.c:78:6:78:11 | void f_do_2() | void f_do_2() |
+| test.c:88:14:88:14 | ConditionalBranch: 0 | Conditional branch instruction ConditionalBranch: 0 with non-Boolean condition, in function '$@'. | test.c:85:6:85:11 | void f_do_3() | void f_do_3() |
+| test.c:93:13:93:13 | ConditionalBranch: i | Conditional branch instruction ConditionalBranch: i with non-Boolean condition, in function '$@'. | test.c:92:6:92:13 | void f_cond_1(int) | void f_cond_1(int) |
+| test.c:204:12:204:12 | ConditionalBranch: i | Conditional branch instruction ConditionalBranch: i with non-Boolean condition, in function '$@'. | test.c:203:6:203:15 | void f_switch_7(int) | void f_switch_7(int) |
+| test.c:219:7:219:7 | ConditionalBranch: x | Conditional branch instruction ConditionalBranch: x with non-Boolean condition, in function '$@'. | test.c:218:5:218:11 | int f_and_1(int, int) | int f_and_1(int, int) |
+| test.c:219:12:219:13 | ConditionalBranch: ! ... | Conditional branch instruction ConditionalBranch: ! ... with non-Boolean condition, in function '$@'. | test.c:218:5:218:11 | int f_and_1(int, int) | int f_and_1(int, int) |
+| test.c:219:12:219:13 | LogicalNot: ! ... | Logical Not instruction LogicalNot: ! ... with non-Boolean operand, in function '$@'. | test.c:218:5:218:11 | int f_and_1(int, int) | int f_and_1(int, int) |
+| test.c:226:7:226:15 | ConditionalBranch: ! ... | Conditional branch instruction ConditionalBranch: ! ... with non-Boolean condition, in function '$@'. | test.c:225:5:225:11 | int f_and_2(int, int) | int f_and_2(int, int) |
+| test.c:226:7:226:15 | LogicalNot: ! ... | Logical Not instruction LogicalNot: ! ... with non-Boolean operand, in function '$@'. | test.c:225:5:225:11 | int f_and_2(int, int) | int f_and_2(int, int) |
+| test.c:226:9:226:9 | ConditionalBranch: x | Conditional branch instruction ConditionalBranch: x with non-Boolean condition, in function '$@'. | test.c:225:5:225:11 | int f_and_2(int, int) | int f_and_2(int, int) |
+| test.c:226:14:226:14 | ConditionalBranch: y | Conditional branch instruction ConditionalBranch: y with non-Boolean condition, in function '$@'. | test.c:225:5:225:11 | int f_and_2(int, int) | int f_and_2(int, int) |
+| test.c:233:7:233:7 | ConditionalBranch: b | Conditional branch instruction ConditionalBranch: b with non-Boolean condition, in function '$@'. | test.c:232:6:232:19 | void f_if_ternary_1(int, int, int) | void f_if_ternary_1(int, int, int) |
+| test.c:233:7:233:15 | ConditionalBranch: ... ? ... : ... | Conditional branch instruction ConditionalBranch: ... ? ... : ... with non-Boolean condition, in function '$@'. | test.c:232:6:232:19 | void f_if_ternary_1(int, int, int) | void f_if_ternary_1(int, int, int) |
+| test.c:245:31:245:31 | ConditionalBranch: 0 | Conditional branch instruction ConditionalBranch: 0 with non-Boolean condition, in function '$@'. | test.c:245:24:245:24 | const void *[] a | const void *[] a |
+| unaryopexpr.c:8:5:8:6 | LogicalNot: ! ... | Logical Not instruction LogicalNot: ! ... with non-Boolean operand, in function '$@'. | unaryopexpr.c:1:13:1:13 | void f() | void f() |
+| whilestmt.c:2:9:2:9 | ConditionalBranch: 0 | Conditional branch instruction ConditionalBranch: 0 with non-Boolean condition, in function '$@'. | whilestmt.c:1:13:1:26 | void always_false_1() | void always_false_1() |
+| whilestmt.c:10:9:10:13 | ConditionalBranch: ! ... | Conditional branch instruction ConditionalBranch: ! ... with non-Boolean condition, in function '$@'. | whilestmt.c:8:13:8:26 | void always_false_2() | void always_false_2() |
+| whilestmt.c:10:9:10:13 | LogicalNot: ! ... | Logical Not instruction LogicalNot: ! ... with non-Boolean operand, in function '$@'. | whilestmt.c:8:13:8:26 | void always_false_2() | void always_false_2() |
+| whilestmt.c:16:9:16:9 | ConditionalBranch: 1 | Conditional branch instruction ConditionalBranch: 1 with non-Boolean condition, in function '$@'. | whilestmt.c:15:13:15:25 | void always_true_1() | void always_true_1() |
+| whilestmt.c:24:9:24:9 | ConditionalBranch: 1 | Conditional branch instruction ConditionalBranch: 1 with non-Boolean condition, in function '$@'. | whilestmt.c:23:13:23:25 | void always_true_2() | void always_true_2() |
+| whilestmt.c:33:9:33:9 | ConditionalBranch: 1 | Conditional branch instruction ConditionalBranch: 1 with non-Boolean condition, in function '$@'. | whilestmt.c:32:13:32:25 | void always_true_3() | void always_true_3() |
+| whilestmt.c:41:9:41:14 | ConditionalBranch: ... < ... | Conditional branch instruction ConditionalBranch: ... < ... with non-Boolean condition, in function '$@'. | whilestmt.c:39:13:39:18 | void normal() | void normal() |
 missingCppType
diff --git a/cpp/ql/test/library-tests/virtual_functions/cfg/cfg.ql b/cpp/ql/test/library-tests/virtual_functions/cfg/cfg.ql
index 19a82ba0de0..0e1f45caf19 100644
--- a/cpp/ql/test/library-tests/virtual_functions/cfg/cfg.ql
+++ b/cpp/ql/test/library-tests/virtual_functions/cfg/cfg.ql
@@ -1,4 +1,9 @@
-// query-type: graph
+/**
+ * query-type: graph
+ *
+ * @kind graph-equivalence-test
+ */
+
 import cpp
 
 class DestructorCallEnhanced extends DestructorCall {
diff --git a/cpp/ql/test/library-tests/vla/cfg.ql b/cpp/ql/test/library-tests/vla/cfg.ql
index 19a82ba0de0..0e1f45caf19 100644
--- a/cpp/ql/test/library-tests/vla/cfg.ql
+++ b/cpp/ql/test/library-tests/vla/cfg.ql
@@ -1,4 +1,9 @@
-// query-type: graph
+/**
+ * query-type: graph
+ *
+ * @kind graph-equivalence-test
+ */
+
 import cpp
 
 class DestructorCallEnhanced extends DestructorCall {
diff --git a/cpp/ql/test/query-tests/Critical/MissingCheckScanf/MissingCheckScanf.expected b/cpp/ql/test/query-tests/Critical/MissingCheckScanf/MissingCheckScanf.expected
index dac8afd3fd3..1edf3b1ae99 100644
--- a/cpp/ql/test/query-tests/Critical/MissingCheckScanf/MissingCheckScanf.expected
+++ b/cpp/ql/test/query-tests/Critical/MissingCheckScanf/MissingCheckScanf.expected
@@ -52,6 +52,9 @@ edges
 | test.cpp:541:39:541:40 | sscanf output argument | test.cpp:549:8:549:8 | e | provenance |  |
 | test.cpp:541:43:541:44 | sscanf output argument | test.cpp:545:8:545:8 | f | provenance |  |
 | test.cpp:541:43:541:44 | sscanf output argument | test.cpp:550:8:550:8 | f | provenance |  |
+| test.cpp:559:30:559:31 | scanf output argument | test.cpp:561:9:561:9 | i | provenance |  |
+| test.cpp:567:35:567:36 | scanf output argument | test.cpp:569:9:569:9 | i | provenance |  |
+| test.cpp:575:30:575:31 | scanf output argument | test.cpp:577:9:577:9 | i | provenance |  |
 nodes
 | test.cpp:34:15:34:16 | scanf output argument | semmle.label | scanf output argument |
 | test.cpp:35:7:35:7 | i | semmle.label | i |
@@ -154,6 +157,12 @@ nodes
 | test.cpp:548:8:548:8 | d | semmle.label | d |
 | test.cpp:549:8:549:8 | e | semmle.label | e |
 | test.cpp:550:8:550:8 | f | semmle.label | f |
+| test.cpp:559:30:559:31 | scanf output argument | semmle.label | scanf output argument |
+| test.cpp:561:9:561:9 | i | semmle.label | i |
+| test.cpp:567:35:567:36 | scanf output argument | semmle.label | scanf output argument |
+| test.cpp:569:9:569:9 | i | semmle.label | i |
+| test.cpp:575:30:575:31 | scanf output argument | semmle.label | scanf output argument |
+| test.cpp:577:9:577:9 | i | semmle.label | i |
 subpaths
 #select
 | test.cpp:35:7:35:7 | i | test.cpp:34:15:34:16 | scanf output argument | test.cpp:35:7:35:7 | i | This variable is read, but may not have been written. It should be guarded by a check that the $@ returns at least 1. | test.cpp:34:3:34:7 | call to scanf | call to scanf |
@@ -177,3 +186,5 @@ subpaths
 | test.cpp:484:9:484:9 | i | test.cpp:480:25:480:26 | scanf output argument | test.cpp:484:9:484:9 | i | This variable is read, but may not have been written. It should be guarded by a check that the $@ returns at least 1. | test.cpp:480:13:480:17 | call to scanf | call to scanf |
 | test.cpp:495:8:495:8 | i | test.cpp:491:25:491:26 | scanf output argument | test.cpp:495:8:495:8 | i | This variable is read, but may not have been written. It should be guarded by a check that the $@ returns at least 1. | test.cpp:491:13:491:17 | call to scanf | call to scanf |
 | test.cpp:545:8:545:8 | f | test.cpp:541:43:541:44 | sscanf output argument | test.cpp:545:8:545:8 | f | This variable is read, but may not have been written. It should be guarded by a check that the $@ returns at least 3. | test.cpp:541:10:541:15 | call to sscanf | call to sscanf |
+| test.cpp:569:9:569:9 | i | test.cpp:567:35:567:36 | scanf output argument | test.cpp:569:9:569:9 | i | This variable is read, but may not have been written. It should be guarded by a check that the $@ returns at least 1. | test.cpp:567:23:567:27 | call to scanf | call to scanf |
+| test.cpp:577:9:577:9 | i | test.cpp:575:30:575:31 | scanf output argument | test.cpp:577:9:577:9 | i | This variable is read, but may not have been written. It should be guarded by a check that the $@ returns at least 1. | test.cpp:575:18:575:22 | call to scanf | call to scanf |
diff --git a/cpp/ql/test/query-tests/Critical/MissingCheckScanf/test.cpp b/cpp/ql/test/query-tests/Critical/MissingCheckScanf/test.cpp
index efc37060a55..9cfad40a148 100644
--- a/cpp/ql/test/query-tests/Critical/MissingCheckScanf/test.cpp
+++ b/cpp/ql/test/query-tests/Critical/MissingCheckScanf/test.cpp
@@ -553,3 +553,27 @@ void switch_cases(const char *data) {
 			break;
 	}
 }
+
+void test_scanf_compared_right_away() {
+  int i;
+  bool success = scanf("%d", &i) == 1;
+  if(success) {
+    use(i); // GOOD
+  }
+}
+
+void test_scanf_compared_in_conjunct_right(bool b) {
+  int i;
+  bool success = b && scanf("%d", &i) == 1;
+  if(success) {
+    use(i); // GOOD [FALSE POSITIVE]
+  }
+}
+
+void test_scanf_compared_in_conjunct_left(bool b) {
+  int i;
+  bool success = scanf("%d", &i) == 1 && b;
+  if(success) {
+    use(i); // GOOD [FALSE POSITIVE]
+  }
+}
diff --git a/cpp/ql/test/query-tests/Critical/SizeCheck/SizeCheck.qlref b/cpp/ql/test/query-tests/Critical/SizeCheck/SizeCheck.qlref
index 772c4cee2f9..a1ab57f2b75 100644
--- a/cpp/ql/test/query-tests/Critical/SizeCheck/SizeCheck.qlref
+++ b/cpp/ql/test/query-tests/Critical/SizeCheck/SizeCheck.qlref
@@ -1 +1,2 @@
-Critical/SizeCheck.ql
+query: Critical/SizeCheck.ql
+postprocess: TestUtilities/InlineExpectationsTestQuery.ql
\ No newline at end of file
diff --git a/cpp/ql/test/query-tests/Critical/SizeCheck/test.c b/cpp/ql/test/query-tests/Critical/SizeCheck/test.c
index 0015a2514c0..b4ea2dc3f98 100644
--- a/cpp/ql/test/query-tests/Critical/SizeCheck/test.c
+++ b/cpp/ql/test/query-tests/Critical/SizeCheck/test.c
@@ -13,8 +13,8 @@ void free(void *ptr);
 
 void bad0(void) {
 
-    float *fptr = malloc(3); // BAD -- Too small
-    double *dptr = malloc(5); // BAD -- Too small
+    float *fptr = malloc(3); // $ Alert -- Too small
+    double *dptr = malloc(5); // $ Alert -- Too small
     free(fptr);
     free(dptr);
 }
@@ -29,8 +29,8 @@ void good0(void) {
 
 void bad1(void) {
 
-    float *fptr = malloc(sizeof(short)); // BAD -- Too small
-    double *dptr = malloc(sizeof(float)); // BAD -- Too small
+    float *fptr = malloc(sizeof(short)); // $ Alert -- Too small
+    double *dptr = malloc(sizeof(float)); // $ Alert -- Too small
     free(fptr);
     free(dptr);
 }
@@ -56,7 +56,7 @@ typedef union _myUnion
 
 void test_union() {
 	MyUnion *a = malloc(sizeof(MyUnion)); // GOOD
-	MyUnion *b = malloc(sizeof(MyStruct)); // BAD (too small)
+	MyUnion *b = malloc(sizeof(MyStruct)); // $ Alert (too small)
 }
 
 // --- custom allocators ---
@@ -66,6 +66,6 @@ void *MyMalloc2(size_t size);
 
 void customAllocatorTests()
 {
-    float *fptr1 = MyMalloc1(3); // BAD (too small) [NOT DETECTED]
-    float *fptr2 = MyMalloc2(3); // BAD (too small) [NOT DETECTED]
+    float *fptr1 = MyMalloc1(3); // $ MISSING: BAD (too small)
+    float *fptr2 = MyMalloc2(3); // $ MISSING: BAD (too small)
 }
diff --git a/cpp/ql/test/query-tests/Diagnostics/Info.expected b/cpp/ql/test/query-tests/Diagnostics/Info.expected
index 55e3310fd19..a3254130360 100644
--- a/cpp/ql/test/query-tests/Diagnostics/Info.expected
+++ b/cpp/ql/test/query-tests/Diagnostics/Info.expected
@@ -1,6 +1,6 @@
-| containserror.cpp:0:0:0:0 | containserror.cpp | query-tests/Diagnostics/containserror.cpp | fromSource, normalTermination |
-| containswarning.cpp:0:0:0:0 | containswarning.cpp | query-tests/Diagnostics/containswarning.cpp | fromSource, normalTermination |
-| doesnotcompile.cpp:0:0:0:0 | doesnotcompile.cpp | query-tests/Diagnostics/doesnotcompile.cpp | ExtractionProblem (severity 1), fromSource, normalTermination |
+| containserror.cpp:0:0:0:0 | containserror.cpp | containserror.cpp | fromSource, normalTermination |
+| containswarning.cpp:0:0:0:0 | containswarning.cpp | containswarning.cpp | fromSource, normalTermination |
+| doesnotcompile.cpp:0:0:0:0 | doesnotcompile.cpp | doesnotcompile.cpp | ExtractionProblem (severity 1), fromSource, normalTermination |
 | file://:0:0:0:0 |  |  |  |
-| header.h:0:0:0:0 | header.h | query-tests/Diagnostics/header.h | fromSource |
-| successful.cpp:0:0:0:0 | successful.cpp | query-tests/Diagnostics/successful.cpp | fromSource, normalTermination |
+| header.h:0:0:0:0 | header.h | header.h | fromSource |
+| successful.cpp:0:0:0:0 | successful.cpp | successful.cpp | fromSource, normalTermination |
diff --git a/cpp/ql/test/query-tests/Documentation/DocumentApi/DocumentApi.expected b/cpp/ql/test/query-tests/Documentation/DocumentApi/DocumentApi.expected
index b19d88acdc2..62d47bc8db0 100644
--- a/cpp/ql/test/query-tests/Documentation/DocumentApi/DocumentApi.expected
+++ b/cpp/ql/test/query-tests/Documentation/DocumentApi/DocumentApi.expected
@@ -1,16 +1,16 @@
-| comment_prototypes.c:29:6:29:11 | proto6 | Functions called from other files should be documented (called from $@). | comment_prototypes_caller1.c:9:5:9:10 | call to proto6 | query-tests/Documentation/DocumentApi/comment_prototypes_caller1.c |
-| comment_prototypes.c:29:6:29:11 | proto6 | Functions called from other files should be documented (called from $@). | comment_prototypes_caller2.c:9:5:9:10 | call to proto6 | query-tests/Documentation/DocumentApi/comment_prototypes_caller2.c |
-| comment_prototypes.c:34:6:34:11 | proto7 | Functions called from other files should be documented (called from $@). | comment_prototypes_caller1.c:10:5:10:10 | call to proto7 | query-tests/Documentation/DocumentApi/comment_prototypes_caller1.c |
-| comment_prototypes.c:34:6:34:11 | proto7 | Functions called from other files should be documented (called from $@). | comment_prototypes_caller2.c:10:5:10:10 | call to proto7 | query-tests/Documentation/DocumentApi/comment_prototypes_caller2.c |
-| comment_prototypes.c:45:6:45:11 | proto9 | Functions called from other files should be documented (called from $@). | comment_prototypes_caller1.c:12:5:12:10 | call to proto9 | query-tests/Documentation/DocumentApi/comment_prototypes_caller1.c |
-| comment_prototypes.c:45:6:45:11 | proto9 | Functions called from other files should be documented (called from $@). | comment_prototypes_caller2.c:12:5:12:10 | call to proto9 | query-tests/Documentation/DocumentApi/comment_prototypes_caller2.c |
-| comment_prototypes.c:50:6:50:12 | proto10 | Functions called from other files should be documented (called from $@). | comment_prototypes_caller1.c:13:5:13:11 | call to proto10 | query-tests/Documentation/DocumentApi/comment_prototypes_caller1.c |
-| comment_prototypes.c:50:6:50:12 | proto10 | Functions called from other files should be documented (called from $@). | comment_prototypes_caller2.c:13:5:13:11 | call to proto10 | query-tests/Documentation/DocumentApi/comment_prototypes_caller2.c |
-| comment_prototypes.c:55:6:55:12 | proto11 | Functions called from other files should be documented (called from $@). | comment_prototypes_caller1.c:14:5:14:11 | call to proto11 | query-tests/Documentation/DocumentApi/comment_prototypes_caller1.c |
-| comment_prototypes.c:55:6:55:12 | proto11 | Functions called from other files should be documented (called from $@). | comment_prototypes_caller2.c:14:5:14:11 | call to proto11 | query-tests/Documentation/DocumentApi/comment_prototypes_caller2.c |
-| comment_prototypes.c:66:6:66:12 | proto13 | Functions called from other files should be documented (called from $@). | comment_prototypes_caller1.c:16:5:16:11 | call to proto13 | query-tests/Documentation/DocumentApi/comment_prototypes_caller1.c |
-| comment_prototypes.c:66:6:66:12 | proto13 | Functions called from other files should be documented (called from $@). | comment_prototypes_caller2.c:16:5:16:11 | call to proto13 | query-tests/Documentation/DocumentApi/comment_prototypes_caller2.c |
-| definition.c:2:6:2:7 | f1 | Functions called from other files should be documented (called from $@). | user1.c:9:5:9:6 | call to f1 | query-tests/Documentation/DocumentApi/user1.c |
-| definition.c:2:6:2:7 | f1 | Functions called from other files should be documented (called from $@). | user2.c:7:5:7:6 | call to f1 | query-tests/Documentation/DocumentApi/user2.c |
-| definition.c:32:6:32:7 | f6 | Functions called from other files should be documented (called from $@). | user1.c:14:5:14:6 | call to f6 | query-tests/Documentation/DocumentApi/user1.c |
-| definition.c:32:6:32:7 | f6 | Functions called from other files should be documented (called from $@). | user2.c:10:5:10:6 | call to f6 | query-tests/Documentation/DocumentApi/user2.c |
+| comment_prototypes.c:29:6:29:11 | proto6 | Functions called from other files should be documented (called from $@). | comment_prototypes_caller1.c:9:5:9:10 | call to proto6 | comment_prototypes_caller1.c |
+| comment_prototypes.c:29:6:29:11 | proto6 | Functions called from other files should be documented (called from $@). | comment_prototypes_caller2.c:9:5:9:10 | call to proto6 | comment_prototypes_caller2.c |
+| comment_prototypes.c:34:6:34:11 | proto7 | Functions called from other files should be documented (called from $@). | comment_prototypes_caller1.c:10:5:10:10 | call to proto7 | comment_prototypes_caller1.c |
+| comment_prototypes.c:34:6:34:11 | proto7 | Functions called from other files should be documented (called from $@). | comment_prototypes_caller2.c:10:5:10:10 | call to proto7 | comment_prototypes_caller2.c |
+| comment_prototypes.c:45:6:45:11 | proto9 | Functions called from other files should be documented (called from $@). | comment_prototypes_caller1.c:12:5:12:10 | call to proto9 | comment_prototypes_caller1.c |
+| comment_prototypes.c:45:6:45:11 | proto9 | Functions called from other files should be documented (called from $@). | comment_prototypes_caller2.c:12:5:12:10 | call to proto9 | comment_prototypes_caller2.c |
+| comment_prototypes.c:50:6:50:12 | proto10 | Functions called from other files should be documented (called from $@). | comment_prototypes_caller1.c:13:5:13:11 | call to proto10 | comment_prototypes_caller1.c |
+| comment_prototypes.c:50:6:50:12 | proto10 | Functions called from other files should be documented (called from $@). | comment_prototypes_caller2.c:13:5:13:11 | call to proto10 | comment_prototypes_caller2.c |
+| comment_prototypes.c:55:6:55:12 | proto11 | Functions called from other files should be documented (called from $@). | comment_prototypes_caller1.c:14:5:14:11 | call to proto11 | comment_prototypes_caller1.c |
+| comment_prototypes.c:55:6:55:12 | proto11 | Functions called from other files should be documented (called from $@). | comment_prototypes_caller2.c:14:5:14:11 | call to proto11 | comment_prototypes_caller2.c |
+| comment_prototypes.c:66:6:66:12 | proto13 | Functions called from other files should be documented (called from $@). | comment_prototypes_caller1.c:16:5:16:11 | call to proto13 | comment_prototypes_caller1.c |
+| comment_prototypes.c:66:6:66:12 | proto13 | Functions called from other files should be documented (called from $@). | comment_prototypes_caller2.c:16:5:16:11 | call to proto13 | comment_prototypes_caller2.c |
+| definition.c:2:6:2:7 | f1 | Functions called from other files should be documented (called from $@). | user1.c:9:5:9:6 | call to f1 | user1.c |
+| definition.c:2:6:2:7 | f1 | Functions called from other files should be documented (called from $@). | user2.c:7:5:7:6 | call to f1 | user2.c |
+| definition.c:32:6:32:7 | f6 | Functions called from other files should be documented (called from $@). | user1.c:14:5:14:6 | call to f6 | user1.c |
+| definition.c:32:6:32:7 | f6 | Functions called from other files should be documented (called from $@). | user2.c:10:5:10:6 | call to f6 | user2.c |
diff --git a/cpp/ql/test/query-tests/Likely Bugs/Format/WrongNumberOfFormatArguments/WrongNumberOfFormatArguments.expected b/cpp/ql/test/query-tests/Likely Bugs/Format/WrongNumberOfFormatArguments/WrongNumberOfFormatArguments.expected
index d6897f1bddd..d99190ef1eb 100644
--- a/cpp/ql/test/query-tests/Likely Bugs/Format/WrongNumberOfFormatArguments/WrongNumberOfFormatArguments.expected	
+++ b/cpp/ql/test/query-tests/Likely Bugs/Format/WrongNumberOfFormatArguments/WrongNumberOfFormatArguments.expected	
@@ -10,3 +10,4 @@
 | test.c:15:2:15:7 | call to printf | Format for printf expects 3 arguments but given 2 |
 | test.c:19:2:19:7 | call to printf | Format for printf expects 2 arguments but given 1 |
 | test.c:29:3:29:8 | call to printf | Format for printf expects 2 arguments but given 1 |
+| test.c:53:2:53:10 | call to my_logger | Format for my_logger expects 3 arguments but given 2 |
diff --git a/cpp/ql/test/query-tests/Likely Bugs/Format/WrongNumberOfFormatArguments/custom_printf.cpp b/cpp/ql/test/query-tests/Likely Bugs/Format/WrongNumberOfFormatArguments/custom_printf.cpp
index b80e14e7410..9c04f7a0049 100644
--- a/cpp/ql/test/query-tests/Likely Bugs/Format/WrongNumberOfFormatArguments/custom_printf.cpp	
+++ b/cpp/ql/test/query-tests/Likely Bugs/Format/WrongNumberOfFormatArguments/custom_printf.cpp	
@@ -44,3 +44,6 @@ void test_custom_printf2()
 	printf("",           "%i %i",  100, 200); // GOOD
 	printf("%i %i",      ""        );         // GOOD
 }
+
+extern "C" void my_logger(int param, char *fmt, ...) __attribute__((format(printf, 2, 3))) {}
+
diff --git a/cpp/ql/test/query-tests/Likely Bugs/Format/WrongNumberOfFormatArguments/syntax_errors.c b/cpp/ql/test/query-tests/Likely Bugs/Format/WrongNumberOfFormatArguments/syntax_errors.c
new file mode 100644
index 00000000000..8dfa8b9418c
--- /dev/null
+++ b/cpp/ql/test/query-tests/Likely Bugs/Format/WrongNumberOfFormatArguments/syntax_errors.c	
@@ -0,0 +1,7 @@
+// semmle-extractor-options: --expect_errors
+
+extern int printf(const char *fmt, ...);
+
+void test_syntax_error() {
+    printf("Error code %d: " FMT_MSG, 0, "");
+}
diff --git a/cpp/ql/test/query-tests/Likely Bugs/Format/WrongNumberOfFormatArguments/test.c b/cpp/ql/test/query-tests/Likely Bugs/Format/WrongNumberOfFormatArguments/test.c
index 2feb8db9a5a..0079d0f0d21 100644
--- a/cpp/ql/test/query-tests/Likely Bugs/Format/WrongNumberOfFormatArguments/test.c	
+++ b/cpp/ql/test/query-tests/Likely Bugs/Format/WrongNumberOfFormatArguments/test.c	
@@ -46,4 +46,12 @@ void test(int i, const char *str)
 	printf("%Y", 1, 2); // GOOD (unknown format character, this might be correct)
 	printf("%1.1Y", 1, 2); // GOOD (unknown format character, this might be correct)
 	printf("%*.*Y", 1, 2); // GOOD (unknown format character, this might be correct)
+
+	// Implicit logger function declaration
+	my_logger(0, "%i %i %i %i %i %i\n", 1, 2, 3, 4, 5, 6); // GOOD
+	my_logger(0, "%i %i %i\n", 1, 2, 3); // GOOD
+	my_logger(0, "%i %i %i\n", 1, 2); // BAD (too few format arguments)
 }
+
+// A spurious definition of my_logger
+extern void my_logger(int param, char *fmt, int, int, int, int, int);
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
new file mode 100644
index 00000000000..745f2f790f7
--- /dev/null
+++ b/cpp/ql/test/query-tests/Likely Bugs/Format/WrongTypeFormatArguments/Buildless/WrongTypeFormatArguments.expected	
@@ -0,0 +1 @@
+| 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/WrongTypeFormatArguments.qlref b/cpp/ql/test/query-tests/Likely Bugs/Format/WrongTypeFormatArguments/Buildless/WrongTypeFormatArguments.qlref
new file mode 100644
index 00000000000..6f557ace55a
--- /dev/null
+++ b/cpp/ql/test/query-tests/Likely Bugs/Format/WrongTypeFormatArguments/Buildless/WrongTypeFormatArguments.qlref	
@@ -0,0 +1 @@
+Likely Bugs/Format/WrongTypeFormatArguments.ql
diff --git a/cpp/ql/test/query-tests/Likely Bugs/Format/WrongTypeFormatArguments/Buildless/tests.c b/cpp/ql/test/query-tests/Likely Bugs/Format/WrongTypeFormatArguments/Buildless/tests.c
new file mode 100644
index 00000000000..81698c497c5
--- /dev/null
+++ b/cpp/ql/test/query-tests/Likely Bugs/Format/WrongTypeFormatArguments/Buildless/tests.c	
@@ -0,0 +1,11 @@
+// semmle-extractor-options: --expect_errors
+
+int printf(const char * format, ...);
+int fprintf();
+
+void f() {
+    printf("%s", 1); // BAD
+    printf("%s", implicit_function()); // GOOD - we should ignore the type
+    sprintf(0, "%s", ""); // GOOD
+    fprintf(0, "%s", ""); // GOOD
+}
diff --git a/cpp/ql/test/query-tests/Likely Bugs/Format/WrongTypeFormatArguments/Builtin/WrongTypeFormatArguments.expected b/cpp/ql/test/query-tests/Likely Bugs/Format/WrongTypeFormatArguments/Builtin/WrongTypeFormatArguments.expected
new file mode 100644
index 00000000000..8f32f611ec1
--- /dev/null
+++ b/cpp/ql/test/query-tests/Likely Bugs/Format/WrongTypeFormatArguments/Builtin/WrongTypeFormatArguments.expected	
@@ -0,0 +1 @@
+| tests.c:3:74:3:74 | 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/Builtin/WrongTypeFormatArguments.qlref b/cpp/ql/test/query-tests/Likely Bugs/Format/WrongTypeFormatArguments/Builtin/WrongTypeFormatArguments.qlref
new file mode 100644
index 00000000000..6f557ace55a
--- /dev/null
+++ b/cpp/ql/test/query-tests/Likely Bugs/Format/WrongTypeFormatArguments/Builtin/WrongTypeFormatArguments.qlref	
@@ -0,0 +1 @@
+Likely Bugs/Format/WrongTypeFormatArguments.ql
diff --git a/cpp/ql/test/query-tests/Likely Bugs/Format/WrongTypeFormatArguments/Builtin/tests.c b/cpp/ql/test/query-tests/Likely Bugs/Format/WrongTypeFormatArguments/Builtin/tests.c
new file mode 100644
index 00000000000..f94e01251ee
--- /dev/null
+++ b/cpp/ql/test/query-tests/Likely Bugs/Format/WrongTypeFormatArguments/Builtin/tests.c	
@@ -0,0 +1,5 @@
+void f() {
+    char buf[35];
+    __builtin___sprintf_chk(buf, 0, __builtin_object_size(buf, 1), "%s", 1);
+    __builtin___sprintf_chk(buf, 0, __builtin_object_size(buf, 1), "%d", 1);
+}
diff --git a/cpp/ql/test/query-tests/Metrics/Dependencies/ExternalDependencies.expected b/cpp/ql/test/query-tests/Metrics/Dependencies/ExternalDependencies.expected
index a42506f8be1..795f6dba431 100644
--- a/cpp/ql/test/query-tests/Metrics/Dependencies/ExternalDependencies.expected
+++ b/cpp/ql/test/query-tests/Metrics/Dependencies/ExternalDependencies.expected
@@ -1,4 +1,4 @@
-| /query-tests/Metrics/Dependencies/main.cpp<\|>LibC<\|>unknown | 5 |
-| /query-tests/Metrics/Dependencies/include.h<\|>LibD<\|>unknown | 1 |
-| /query-tests/Metrics/Dependencies/main.cpp<\|>LibA<\|>unknown | 1 |
-| /query-tests/Metrics/Dependencies/main.cpp<\|>LibB<\|>unknown | 1 |
+| /main.cpp<\|>LibC<\|>unknown | 5 |
+| /include.h<\|>LibD<\|>unknown | 1 |
+| /main.cpp<\|>LibA<\|>unknown | 1 |
+| /main.cpp<\|>LibB<\|>unknown | 1 |
diff --git a/cpp/ql/test/query-tests/Metrics/Dependencies/ExternalDependenciesSourceLinks.expected b/cpp/ql/test/query-tests/Metrics/Dependencies/ExternalDependenciesSourceLinks.expected
index f5399bf6ac3..b00deb76d7d 100644
--- a/cpp/ql/test/query-tests/Metrics/Dependencies/ExternalDependenciesSourceLinks.expected
+++ b/cpp/ql/test/query-tests/Metrics/Dependencies/ExternalDependenciesSourceLinks.expected
@@ -1,4 +1,4 @@
-| /query-tests/Metrics/Dependencies/include.h<\|>LibD<\|>unknown | include.h:0:0:0:0 | include.h |
-| /query-tests/Metrics/Dependencies/main.cpp<\|>LibA<\|>unknown | main.cpp:0:0:0:0 | main.cpp |
-| /query-tests/Metrics/Dependencies/main.cpp<\|>LibB<\|>unknown | main.cpp:0:0:0:0 | main.cpp |
-| /query-tests/Metrics/Dependencies/main.cpp<\|>LibC<\|>unknown | main.cpp:0:0:0:0 | main.cpp |
+| /include.h<\|>LibD<\|>unknown | include.h:0:0:0:0 | include.h |
+| /main.cpp<\|>LibA<\|>unknown | main.cpp:0:0:0:0 | main.cpp |
+| /main.cpp<\|>LibB<\|>unknown | main.cpp:0:0:0:0 | main.cpp |
+| /main.cpp<\|>LibC<\|>unknown | main.cpp:0:0:0:0 | main.cpp |
diff --git a/cpp/ql/test/query-tests/Metrics/Dependencies/dependencies.expected b/cpp/ql/test/query-tests/Metrics/Dependencies/dependencies.expected
index 6c93362a096..9e7f88376f8 100644
--- a/cpp/ql/test/query-tests/Metrics/Dependencies/dependencies.expected
+++ b/cpp/ql/test/query-tests/Metrics/Dependencies/dependencies.expected
@@ -1,5 +1,5 @@
-| file://:0:0:0:0 | declaration of 1st parameter | LibB/libb_internal.h:5:8:5:12 | thing |
-| file://:0:0:0:0 | declaration of 1st parameter | LibB/libb_internal.h:5:8:5:12 | thing |
+| file://:0:0:0:0 | declaration of (unnamed parameter 0) | LibB/libb_internal.h:5:8:5:12 | thing |
+| file://:0:0:0:0 | declaration of (unnamed parameter 0) | LibB/libb_internal.h:5:8:5:12 | thing |
 | include.h:3:25:3:33 | num | LibD/libd.h:5:12:5:14 | num |
 | main.cpp:8:31:8:31 | call to container | LibC/libc.h:9:3:9:3 | container |
 | main.cpp:8:31:8:31 | definition of x | LibB/libb_internal.h:5:8:5:12 | thing |
diff --git a/cpp/ql/test/query-tests/Security/CWE/CWE-022/semmle/tests/TaintedPath.qlref b/cpp/ql/test/query-tests/Security/CWE/CWE-022/semmle/tests/TaintedPath.qlref
index 1677939387d..db270a97f3e 100644
--- a/cpp/ql/test/query-tests/Security/CWE/CWE-022/semmle/tests/TaintedPath.qlref
+++ b/cpp/ql/test/query-tests/Security/CWE/CWE-022/semmle/tests/TaintedPath.qlref
@@ -1 +1,2 @@
-Security/CWE/CWE-022/TaintedPath.ql
\ No newline at end of file
+query: Security/CWE/CWE-022/TaintedPath.ql
+postprocess: TestUtilities/InlineExpectationsTestQuery.ql
\ No newline at end of file
diff --git a/cpp/ql/test/query-tests/Security/CWE/CWE-022/semmle/tests/stdlib.h b/cpp/ql/test/query-tests/Security/CWE/CWE-022/semmle/tests/stdlib.h
index 53344da57d6..8c0cb21482b 100644
--- a/cpp/ql/test/query-tests/Security/CWE/CWE-022/semmle/tests/stdlib.h
+++ b/cpp/ql/test/query-tests/Security/CWE/CWE-022/semmle/tests/stdlib.h
@@ -17,3 +17,4 @@ void *malloc(size_t size);
 double strtod(const char *ptr, char **endptr);
 char *getenv(const char *name);
 ssize_t read(int fd, void *buffer, size_t count);
+int snprintf(char *s, size_t n, const char *format, ...);
diff --git a/cpp/ql/test/query-tests/Security/CWE/CWE-022/semmle/tests/test.c b/cpp/ql/test/query-tests/Security/CWE/CWE-022/semmle/tests/test.c
index 4324f269df6..e27bfc85b8d 100644
--- a/cpp/ql/test/query-tests/Security/CWE/CWE-022/semmle/tests/test.c
+++ b/cpp/ql/test/query-tests/Security/CWE/CWE-022/semmle/tests/test.c
@@ -5,7 +5,7 @@
 #define PATH_MAX 4096
 ///// Test code /////
 
-int main(int argc, char** argv) {
+int main(int argc, char** argv) { // $ Source=argv
   char *userAndFile = argv[2];
 
   {
@@ -14,7 +14,7 @@ int main(int argc, char** argv) {
     size_t len = strlen(fileName);
     strncat(fileName+len, userAndFile, FILENAME_MAX-len-1);
     // BAD: a string from the user is used in a filename
-    fopen(fileName, "wb+");
+    fopen(fileName, "wb+"); // $ Alert=argv
   }
 
   {
@@ -29,30 +29,30 @@ int main(int argc, char** argv) {
 
   {
     char *fileName = argv[1];
-    fopen(fileName, "wb+"); // BAD
+    fopen(fileName, "wb+"); // $ Alert=argv
   }
 
   {
     char fileName[20];
-    scanf("%s", fileName);
-    fopen(fileName, "wb+"); // BAD
+    scanf("%s", fileName); // $ Source=scanf_output1
+    fopen(fileName, "wb+"); // $ Alert=scanf_output1
   }
 
   {
     char *fileName = (char*)malloc(20 * sizeof(char));
-    scanf("%s", fileName);
-    fopen(fileName, "wb+"); // BAD
+    scanf("%s", fileName); // $ Source=scanf_output2
+    fopen(fileName, "wb+"); // $ Alert=scanf_output2
   }
 
   {
-    char *tainted = getenv("A_STRING");
-    fopen(tainted, "wb+"); // BAD
+    char *tainted = getenv("A_STRING"); // $ Source=getenv1
+    fopen(tainted, "wb+"); // $ Alert=getenv1
   }
 
   {
     char buffer[1024];
-    strncpy(buffer, getenv("A_STRING"), 1024);
-    fopen(buffer, "wb+"); // BAD
+    strncpy(buffer, getenv("A_STRING"), 1024); // $ Source=getenv2
+    fopen(buffer, "wb+"); // $ Alert=getenv2
     fopen(buffer, "wb+"); // (we don't want a duplicate result here)
   }
 
@@ -66,14 +66,14 @@ int main(int argc, char** argv) {
 
   {
     void readFile(const char *fileName);
-    readFile(argv[1]); // BAD
+    readFile(argv[1]); // $ Alert=argv
   }
 
   {
     char buffer[1024];
-    read(0, buffer, 1024);
-    read(0, buffer, 1024);
-    fopen(buffer, "wb+"); // BAD [duplicated with both sources]
+    read(0, buffer, 1024); // $ Source=read_output1
+    read(0, buffer, 1024); // $ Source=read_output2
+    fopen(buffer, "wb+"); // $ SPURIOUS: Alert=read_output1 $ Alert=read_output2 [duplicated with both sources]
   }
 
   {
@@ -81,7 +81,7 @@ int main(int argc, char** argv) {
     char fileBuffer[PATH_MAX];
     snprintf(fileBuffer, sizeof(fileBuffer), "/home/%s", userAndFile);
     // BAD: a string from the user is used in a filename
-    fopen(fileBuffer, "wb+");
+    fopen(fileBuffer, "wb+"); // $ Alert=argv
   }
 
   {
@@ -95,7 +95,7 @@ int main(int argc, char** argv) {
     char fileBuffer[PATH_MAX];
     snprintf(fileBuffer, sizeof(fileBuffer), "/home/user/files/%s", fileName);
     // GOOD: We know that the filename is safe and stays within the public folder. But we currently get an FP here.
-    FILE *file = fopen(fileBuffer, "wb+");
+    FILE *file = fopen(fileBuffer, "wb+"); // $ SPURIOUS: Alert=argv
   }
 
   {
diff --git a/cpp/ql/test/query-tests/Security/CWE/CWE-129/semmle/ImproperArrayIndexValidation/ImproperArrayIndexValidation.expected b/cpp/ql/test/query-tests/Security/CWE/CWE-129/semmle/ImproperArrayIndexValidation/ImproperArrayIndexValidation.expected
index d6ffc7aed57..184af69e72c 100644
--- a/cpp/ql/test/query-tests/Security/CWE/CWE-129/semmle/ImproperArrayIndexValidation/ImproperArrayIndexValidation.expected
+++ b/cpp/ql/test/query-tests/Security/CWE/CWE-129/semmle/ImproperArrayIndexValidation/ImproperArrayIndexValidation.expected
@@ -2,29 +2,36 @@ edges
 | test1.c:7:26:7:29 | **argv | test1.c:8:11:8:14 | call to atoi | provenance | TaintFunction |
 | test1.c:8:11:8:14 | call to atoi | test1.c:9:9:9:9 | i | provenance |  |
 | test1.c:8:11:8:14 | call to atoi | test1.c:11:9:11:9 | i | provenance |  |
+| test1.c:8:11:8:14 | call to atoi | test1.c:12:9:12:9 | i | provenance |  |
 | test1.c:8:11:8:14 | call to atoi | test1.c:13:9:13:9 | i | provenance |  |
-| test1.c:9:9:9:9 | i | test1.c:16:16:16:16 | i | provenance |  |
-| test1.c:11:9:11:9 | i | test1.c:32:16:32:16 | i | provenance |  |
-| test1.c:13:9:13:9 | i | test1.c:48:16:48:16 | i | provenance |  |
-| test1.c:16:16:16:16 | i | test1.c:18:16:18:16 | i | provenance |  |
-| test1.c:32:16:32:16 | i | test1.c:33:11:33:11 | i | provenance |  |
-| test1.c:48:16:48:16 | i | test1.c:51:3:51:7 | ... = ... | provenance |  |
-| test1.c:51:3:51:7 | ... = ... | test1.c:53:15:53:15 | j | provenance |  |
+| test1.c:9:9:9:9 | i | test1.c:18:16:18:16 | i | provenance |  |
+| test1.c:11:9:11:9 | i | test1.c:34:16:34:16 | i | provenance |  |
+| test1.c:12:9:12:9 | i | test1.c:42:16:42:16 | i | provenance |  |
+| test1.c:13:9:13:9 | i | test1.c:50:16:50:16 | i | provenance |  |
+| test1.c:18:16:18:16 | i | test1.c:20:16:20:16 | i | provenance |  |
+| test1.c:34:16:34:16 | i | test1.c:35:11:35:11 | i | provenance |  |
+| test1.c:42:16:42:16 | i | test1.c:43:11:43:11 | i | provenance |  |
+| test1.c:50:16:50:16 | i | test1.c:53:3:53:7 | ... = ... | provenance |  |
+| test1.c:53:3:53:7 | ... = ... | test1.c:55:15:55:15 | j | provenance |  |
 nodes
 | test1.c:7:26:7:29 | **argv | semmle.label | **argv |
 | test1.c:8:11:8:14 | call to atoi | semmle.label | call to atoi |
 | test1.c:9:9:9:9 | i | semmle.label | i |
 | test1.c:11:9:11:9 | i | semmle.label | i |
+| test1.c:12:9:12:9 | i | semmle.label | i |
 | test1.c:13:9:13:9 | i | semmle.label | i |
-| test1.c:16:16:16:16 | i | semmle.label | i |
 | test1.c:18:16:18:16 | i | semmle.label | i |
-| test1.c:32:16:32:16 | i | semmle.label | i |
-| test1.c:33:11:33:11 | i | semmle.label | i |
-| test1.c:48:16:48:16 | i | semmle.label | i |
-| test1.c:51:3:51:7 | ... = ... | semmle.label | ... = ... |
-| test1.c:53:15:53:15 | j | semmle.label | j |
+| test1.c:20:16:20:16 | i | semmle.label | i |
+| test1.c:34:16:34:16 | i | semmle.label | i |
+| test1.c:35:11:35:11 | i | semmle.label | i |
+| test1.c:42:16:42:16 | i | semmle.label | i |
+| test1.c:43:11:43:11 | i | semmle.label | i |
+| test1.c:50:16:50:16 | i | semmle.label | i |
+| test1.c:53:3:53:7 | ... = ... | semmle.label | ... = ... |
+| test1.c:55:15:55:15 | j | semmle.label | j |
 subpaths
 #select
-| test1.c:18:16:18:16 | i | test1.c:7:26:7:29 | **argv | test1.c:18:16:18:16 | i | An array indexing expression depends on $@ that might be outside the bounds of the array. | test1.c:7:26:7:29 | **argv | a command-line argument |
-| test1.c:33:11:33:11 | i | test1.c:7:26:7:29 | **argv | test1.c:33:11:33:11 | i | An array indexing expression depends on $@ that might be outside the bounds of the array. | test1.c:7:26:7:29 | **argv | a command-line argument |
-| test1.c:53:15:53:15 | j | test1.c:7:26:7:29 | **argv | test1.c:53:15:53:15 | j | An array indexing expression depends on $@ that might be outside the bounds of the array. | test1.c:7:26:7:29 | **argv | a command-line argument |
+| test1.c:20:16:20:16 | i | test1.c:7:26:7:29 | **argv | test1.c:20:16:20:16 | i | An array indexing expression depends on $@ that might be outside the bounds of the array. | test1.c:7:26:7:29 | **argv | a command-line argument |
+| test1.c:35:11:35:11 | i | test1.c:7:26:7:29 | **argv | test1.c:35:11:35:11 | i | An array indexing expression depends on $@ that might be outside the bounds of the array. | test1.c:7:26:7:29 | **argv | a command-line argument |
+| test1.c:43:11:43:11 | i | test1.c:7:26:7:29 | **argv | test1.c:43:11:43:11 | i | An array indexing expression depends on $@ that might be outside the bounds of the array. | test1.c:7:26:7:29 | **argv | a command-line argument |
+| test1.c:55:15:55:15 | j | test1.c:7:26:7:29 | **argv | test1.c:55:15:55:15 | j | An array indexing expression depends on $@ that might be outside the bounds of the array. | test1.c:7:26:7:29 | **argv | a command-line argument |
diff --git a/cpp/ql/test/query-tests/Security/CWE/CWE-129/semmle/ImproperArrayIndexValidation/test1.c b/cpp/ql/test/query-tests/Security/CWE/CWE-129/semmle/ImproperArrayIndexValidation/test1.c
index 08484aef51f..89619626de9 100644
--- a/cpp/ql/test/query-tests/Security/CWE/CWE-129/semmle/ImproperArrayIndexValidation/test1.c
+++ b/cpp/ql/test/query-tests/Security/CWE/CWE-129/semmle/ImproperArrayIndexValidation/test1.c
@@ -11,6 +11,8 @@ int main(int argc, char *argv[]) {
   test3(i);
   test4(i);
   test5(i);
+  test6(i);
+  test7(argv[1]);
 }
 
 void test1(int i) {
@@ -38,7 +40,7 @@ void test3(int i) {
 }
 
 void test4(int i) {
-  myArray[i] = 0; // BAD: i has not been validated [NOT REPORTED]
+  myArray[i] = 0; // BAD: i has not been validated
 
   if ((i < 0) || (i >= 10)) return;
 
@@ -52,3 +54,26 @@ void test5(int i) {
 
   j = myArray[j]; // BAD: j has not been validated
 }
+
+extern int myTable[256];
+
+void test6(int i) {
+  unsigned char s = i;
+
+  myTable[s] = 0; // GOOD: Input is small [FALSE POSITIVE]
+}
+
+typedef void FILE;
+#define EOF (-1)
+
+int getc(FILE*);
+
+extern int myMaxCharTable[256];
+
+void test7(FILE* fp) {
+  int ch;
+  while ((ch = getc(fp)) != EOF) {
+    myMaxCharTable[ch] = 0; // GOOD
+  }
+}
+
diff --git a/cpp/ql/test/query-tests/Security/CWE/CWE-131/NoSpaceForZeroTerminator/test.c b/cpp/ql/test/query-tests/Security/CWE/CWE-131/NoSpaceForZeroTerminator/test.c
index 21dcad6f2fd..551b2441a41 100644
--- a/cpp/ql/test/query-tests/Security/CWE/CWE-131/NoSpaceForZeroTerminator/test.c
+++ b/cpp/ql/test/query-tests/Security/CWE/CWE-131/NoSpaceForZeroTerminator/test.c
@@ -11,14 +11,14 @@ char *strcpy(char *s1, const char *s2);
 
 //// Test code /////
 
-void bad0(char *str) {
+static void bad0(char *str) {
     // BAD -- Not allocating space for '\0' terminator
     char *buffer = malloc(strlen(str));
     strcpy(buffer, str);
     free(buffer);
 }
 
-void good0(char *str) {
+static void good0(char *str) {
     // GOOD -- Allocating extra byte for terminator
     char *buffer = malloc(strlen(str)+1);
     strcpy(buffer, str);
@@ -26,7 +26,7 @@ void good0(char *str) {
 }
 
 
-void bad1(char *str) {
+static void bad1(char *str) {
     int len = strlen(str);
     // BAD -- Not allocating space for '\0' terminator
     char *buffer = malloc(len);
@@ -34,7 +34,7 @@ void bad1(char *str) {
     free(buffer);
 }
 
-void good1(char *str) {
+static void good1(char *str) {
     int len = strlen(str);
     // GOOD -- Allocating extra byte for terminator
     char *buffer = malloc(len+1);
@@ -43,7 +43,7 @@ void good1(char *str) {
 }
 
 
-void bad2(char *str) {
+static void bad2(char *str) {
     int len = strlen(str);
     // BAD -- Not allocating space for '\0' terminator
     char *buffer = malloc(len);
@@ -51,7 +51,7 @@ void bad2(char *str) {
     free(buffer);
 }
 
-void good2(char *str) {
+static void good2(char *str) {
     int len = strlen(str)+1;
     // GOOD -- Allocating extra byte for terminator
     char *buffer = malloc(len);
@@ -59,14 +59,14 @@ void good2(char *str) {
     free(buffer);
 }
 
-void bad3(char *str) {
+static void bad3(char *str) {
     // BAD -- Not allocating space for '\0' terminator
     char *buffer = malloc(strlen(str) * sizeof(char));
     strcpy(buffer, str);
     free(buffer);
 }
 
-void good3(char *str) {
+static void good3(char *str) {
     // GOOD -- Allocating extra byte for terminator
     char *buffer = malloc((strlen(str) + 1) * sizeof(char));
     strcpy(buffer, str);
@@ -75,7 +75,7 @@ void good3(char *str) {
 
 void *memcpy(void *s1, const void *s2, size_t n);
 
-void good4(char *str) {
+static void good4(char *str) {
 	// GOOD -- allocating a non zero-terminated string
 	int len = strlen(str);
 	char *buffer = malloc(len);
diff --git a/cpp/ql/test/query-tests/Security/CWE/CWE-131/NoSpaceForZeroTerminator/test.cpp b/cpp/ql/test/query-tests/Security/CWE/CWE-131/NoSpaceForZeroTerminator/test.cpp
index 63b2b4e760a..24032a91ef1 100644
--- a/cpp/ql/test/query-tests/Security/CWE/CWE-131/NoSpaceForZeroTerminator/test.cpp
+++ b/cpp/ql/test/query-tests/Security/CWE/CWE-131/NoSpaceForZeroTerminator/test.cpp
@@ -19,28 +19,28 @@ int strcmp(const char *s1, const char *s2);
 
 //// Test code /////
 
-void bad1(wchar_t *wstr) {
+static void bad1(wchar_t *wstr) {
     // BAD -- Not allocating space for '\0' terminator
     wchar_t *wbuffer = (wchar_t *)malloc(wcslen(wstr));
     wcscpy(wbuffer, wstr);
     free(wbuffer);
 }
 
-void bad2(wchar_t *wstr) {
+static void bad2(wchar_t *wstr) {
     // BAD -- Not allocating space for '\0' terminator
     wchar_t *wbuffer = (wchar_t *)malloc(wcslen(wstr) * sizeof(wchar_t));
     wcscpy(wbuffer, wstr);
     free(wbuffer);
 }
 
-void good1(wchar_t *wstr) {
+static void good1(wchar_t *wstr) {
     // GOOD -- Allocating extra character for terminator
     wchar_t *wbuffer = (wchar_t *)malloc((wcslen(wstr) + 1) * sizeof(wchar_t));
     wcscpy(wbuffer, wstr);
     free(wbuffer);
 }
 
-void bad3(char *str) {
+static void bad3(char *str) {
     // BAD -- zero-termination proved by sprintf (as destination)
     char *buffer = (char *)malloc(strlen(str));
     sprintf(buffer, "%s", str);
@@ -50,7 +50,7 @@ void bad3(char *str) {
 void decode(char *dest, char *src);
 void wdecode(wchar_t *dest, wchar_t *src);
 
-void bad4(char *str) {
+static void bad4(char *str) {
     // BAD -- zero-termination proved by wprintf (as parameter)
     char *buffer = (char *)malloc(strlen(str));
     decode(buffer, str);
@@ -58,7 +58,7 @@ void bad4(char *str) {
     free(buffer);
 }
 
-void bad5(char *str) {
+static void bad5(char *str) {
     // BAD -- zero-termination proved by strcat (as destination)
     char *buffer = (char *)malloc(strlen(str));
     buffer[0] = 0;
@@ -66,7 +66,7 @@ void bad5(char *str) {
     free(buffer);
 }
 
-void bad6(char *str, char *dest) {
+static void bad6(char *str, char *dest) {
     // BAD -- zero-termination proved by strcat (as source)
     char *buffer = (char *)malloc(strlen(str));
     decode(buffer, str);
@@ -74,7 +74,7 @@ void bad6(char *str, char *dest) {
     free(buffer);
 }
 
-void bad7(char *str, char *str2) {
+static void bad7(char *str, char *str2) {
     // BAD -- zero-termination proved by strcmp
     char *buffer = (char *)malloc(strlen(str));
     decode(buffer, str);
@@ -84,7 +84,7 @@ void bad7(char *str, char *str2) {
     free(buffer);
 }
 
-void bad8(wchar_t *str) {
+static void bad8(wchar_t *str) {
     // BAD -- zero-termination proved by wcslen
     wchar_t *wbuffer = (wchar_t *)malloc(wcslen(str));
     wdecode(wbuffer, str);
@@ -94,21 +94,21 @@ void bad8(wchar_t *str) {
     free(wbuffer);
 }
 
-void good2(char *str, char *dest) {
+static void good2(char *str, char *dest) {
     // GOOD -- zero-termination not proven
     char *buffer = (char *)malloc(strlen(str));
     decode(buffer, str);
     free(buffer);
 }
 
-void bad9(wchar_t *wstr) {
+static void bad9(wchar_t *wstr) {
     // BAD -- using new
     wchar_t *wbuffer = new wchar_t[wcslen(wstr)];
     wcscpy(wbuffer, wstr);
     delete wbuffer;
 }
 
-void good3(char *str) {
+static void good3(char *str) {
     // GOOD -- zero-termination not required for this printf
     char *buffer = (char *)malloc(strlen(str));
     decode(buffer, str);
@@ -116,7 +116,7 @@ void good3(char *str) {
     free(buffer);
 }
 
-void good4(char *str) {
+static void good4(char *str) {
     // GOOD -- zero-termination not required for this printf
     char *buffer = (char *)malloc(strlen(str));
     decode(buffer, str);
diff --git a/cpp/ql/test/query-tests/Security/CWE/CWE-131/NoSpaceForZeroTerminator/test2.cpp b/cpp/ql/test/query-tests/Security/CWE/CWE-131/NoSpaceForZeroTerminator/test2.cpp
index 3b02e89b852..7c7f7406697 100644
--- a/cpp/ql/test/query-tests/Security/CWE/CWE-131/NoSpaceForZeroTerminator/test2.cpp
+++ b/cpp/ql/test/query-tests/Security/CWE/CWE-131/NoSpaceForZeroTerminator/test2.cpp
@@ -38,35 +38,35 @@ namespace std
 
 //// Test code /////
 
-void bad1(char *str) {
+static void bad1(char *str) {
     // BAD -- Not allocating space for '\0' terminator [NOT DETECTED]
     char *buffer = (char *)malloc(strlen(str));
     std::string str2(buffer);
     free(buffer);
 }
 
-void good1(char *str) {
+static void good1(char *str) {
     // GOOD --- copy does not overrun due to size limit
     char *buffer = (char *)malloc(strlen(str));
     std::string str2(buffer, strlen(str));
     free(buffer);
 }
 
-void bad2(wchar_t *str) {
+static void bad2(wchar_t *str) {
     // BAD -- Not allocating space for '\0' terminator [NOT DETECTED]
     wchar_t *buffer = (wchar_t *)calloc(wcslen(str), sizeof(wchar_t));
     wcscpy(buffer, str);
     free(buffer);
 }
 
-void bad3(wchar_t *str) {
+static void bad3(wchar_t *str) {
     // BAD -- Not allocating space for '\0' terminator
     wchar_t *buffer = (wchar_t *)calloc(sizeof(wchar_t), wcslen(str));
     wcscpy(buffer, str);
     free(buffer);
 }
 
-void bad4(char *str) {
+static void bad4(char *str) {
     // BAD -- Not allocating space for '\0' terminator
     char *buffer = (char *)realloc(0, strlen(str));
     strcpy(buffer, str);
diff --git a/cpp/ql/test/query-tests/Security/CWE/CWE-190/semmle/tainted/ArithmeticTainted.expected b/cpp/ql/test/query-tests/Security/CWE/CWE-190/semmle/tainted/ArithmeticTainted.expected
index c60b26aae40..34aa8a7a7e4 100644
--- a/cpp/ql/test/query-tests/Security/CWE/CWE-190/semmle/tainted/ArithmeticTainted.expected
+++ b/cpp/ql/test/query-tests/Security/CWE/CWE-190/semmle/tainted/ArithmeticTainted.expected
@@ -1,4 +1,6 @@
 edges
+| main.cpp:7:27:7:30 | **argv | main.cpp:8:17:8:20 | **argv | provenance |  |
+| main.cpp:8:17:8:20 | **argv | test.c:10:28:10:31 | **argv | provenance |  |
 | test2.cpp:12:21:12:21 | v | test2.cpp:14:11:14:11 | v | provenance |  |
 | test2.cpp:25:22:25:23 | fscanf output argument | test2.cpp:27:13:27:13 | v | provenance |  |
 | test2.cpp:27:13:27:13 | v | test2.cpp:12:21:12:21 | v | provenance |  |
@@ -6,18 +8,15 @@ edges
 | test2.cpp:38:13:38:16 | call to atoi | test2.cpp:39:3:39:18 | ... = ... | provenance |  |
 | test2.cpp:38:13:38:16 | call to atoi | test2.cpp:39:9:39:11 | num | provenance |  |
 | test2.cpp:39:3:39:18 | ... = ... | test2.cpp:40:3:40:5 | num | provenance |  |
-| test3.c:10:27:10:30 | **argv | test.c:11:24:11:27 | call to atoi | provenance | TaintFunction |
-| test3.c:10:27:10:30 | **argv | test.c:41:5:41:24 | ... = ... | provenance | TaintFunction |
-| test3.c:10:27:10:30 | **argv | test.c:51:5:51:24 | ... = ... | provenance | TaintFunction |
 | test5.cpp:5:5:5:17 | *getTaintedInt | test5.cpp:17:6:17:18 | call to getTaintedInt | provenance |  |
 | test5.cpp:5:5:5:17 | *getTaintedInt | test5.cpp:18:6:18:18 | call to getTaintedInt | provenance |  |
 | test5.cpp:9:7:9:9 | gets output argument | test5.cpp:10:9:10:27 | call to strtoul | provenance | TaintFunction |
 | test5.cpp:10:9:10:27 | call to strtoul | test5.cpp:5:5:5:17 | *getTaintedInt | provenance |  |
 | test5.cpp:18:2:18:20 | ... = ... | test5.cpp:19:6:19:6 | y | provenance |  |
 | test5.cpp:18:6:18:18 | call to getTaintedInt | test5.cpp:18:2:18:20 | ... = ... | provenance |  |
-| test.c:10:27:10:30 | **argv | test.c:11:24:11:27 | call to atoi | provenance | TaintFunction |
-| test.c:10:27:10:30 | **argv | test.c:41:5:41:24 | ... = ... | provenance | TaintFunction |
-| test.c:10:27:10:30 | **argv | test.c:51:5:51:24 | ... = ... | provenance | TaintFunction |
+| test.c:10:28:10:31 | **argv | test.c:11:24:11:27 | call to atoi | provenance | TaintFunction |
+| test.c:10:28:10:31 | **argv | test.c:41:5:41:24 | ... = ... | provenance | TaintFunction |
+| test.c:10:28:10:31 | **argv | test.c:51:5:51:24 | ... = ... | provenance | TaintFunction |
 | test.c:11:24:11:27 | call to atoi | test.c:14:15:14:28 | maxConnections | provenance |  |
 | test.c:41:5:41:24 | ... = ... | test.c:44:7:44:10 | len2 | provenance |  |
 | test.c:41:5:41:24 | ... = ... | test.c:44:7:44:12 | ... -- | provenance |  |
@@ -26,6 +25,8 @@ edges
 | test.c:51:5:51:24 | ... = ... | test.c:54:7:54:12 | ... -- | provenance |  |
 | test.c:54:7:54:12 | ... -- | test.c:54:7:54:10 | len3 | provenance |  |
 nodes
+| main.cpp:7:27:7:30 | **argv | semmle.label | **argv |
+| main.cpp:8:17:8:20 | **argv | semmle.label | **argv |
 | test2.cpp:12:21:12:21 | v | semmle.label | v |
 | test2.cpp:14:11:14:11 | v | semmle.label | v |
 | test2.cpp:25:22:25:23 | fscanf output argument | semmle.label | fscanf output argument |
@@ -35,7 +36,6 @@ nodes
 | test2.cpp:39:3:39:18 | ... = ... | semmle.label | ... = ... |
 | test2.cpp:39:9:39:11 | num | semmle.label | num |
 | test2.cpp:40:3:40:5 | num | semmle.label | num |
-| test3.c:10:27:10:30 | **argv | semmle.label | **argv |
 | test5.cpp:5:5:5:17 | *getTaintedInt | semmle.label | *getTaintedInt |
 | test5.cpp:9:7:9:9 | gets output argument | semmle.label | gets output argument |
 | test5.cpp:10:9:10:27 | call to strtoul | semmle.label | call to strtoul |
@@ -43,7 +43,7 @@ nodes
 | test5.cpp:18:2:18:20 | ... = ... | semmle.label | ... = ... |
 | test5.cpp:18:6:18:18 | call to getTaintedInt | semmle.label | call to getTaintedInt |
 | test5.cpp:19:6:19:6 | y | semmle.label | y |
-| test.c:10:27:10:30 | **argv | semmle.label | **argv |
+| test.c:10:28:10:31 | **argv | semmle.label | **argv |
 | test.c:11:24:11:27 | call to atoi | semmle.label | call to atoi |
 | test.c:14:15:14:28 | maxConnections | semmle.label | maxConnections |
 | test.c:41:5:41:24 | ... = ... | semmle.label | ... = ... |
@@ -61,19 +61,7 @@ subpaths
 | test5.cpp:17:6:17:18 | call to getTaintedInt | test5.cpp:9:7:9:9 | gets output argument | test5.cpp:17:6:17:18 | call to getTaintedInt | $@ flows to an operand of an arithmetic expression, potentially causing an overflow. | test5.cpp:9:7:9:9 | gets output argument | string read by gets |
 | test5.cpp:19:6:19:6 | y | test5.cpp:9:7:9:9 | gets output argument | test5.cpp:19:6:19:6 | y | $@ flows to an operand of an arithmetic expression, potentially causing an overflow. | test5.cpp:9:7:9:9 | gets output argument | string read by gets |
 | test5.cpp:19:6:19:6 | y | test5.cpp:9:7:9:9 | gets output argument | test5.cpp:19:6:19:6 | y | $@ flows to an operand of an arithmetic expression, potentially causing an underflow. | test5.cpp:9:7:9:9 | gets output argument | string read by gets |
-| test.c:14:15:14:28 | maxConnections | test3.c:10:27:10:30 | **argv | test.c:14:15:14:28 | maxConnections | $@ flows to an operand of an arithmetic expression, potentially causing an overflow. | test3.c:10:27:10:30 | **argv | a command-line argument |
-| test.c:14:15:14:28 | maxConnections | test3.c:10:27:10:30 | **argv | test.c:14:15:14:28 | maxConnections | $@ flows to an operand of an arithmetic expression, potentially causing an overflow. | test.c:10:27:10:30 | **argv | a command-line argument |
-| test.c:14:15:14:28 | maxConnections | test3.c:10:27:10:30 | **argv | test.c:14:15:14:28 | maxConnections | $@ flows to an operand of an arithmetic expression, potentially causing an underflow. | test3.c:10:27:10:30 | **argv | a command-line argument |
-| test.c:14:15:14:28 | maxConnections | test3.c:10:27:10:30 | **argv | test.c:14:15:14:28 | maxConnections | $@ flows to an operand of an arithmetic expression, potentially causing an underflow. | test.c:10:27:10:30 | **argv | a command-line argument |
-| test.c:14:15:14:28 | maxConnections | test.c:10:27:10:30 | **argv | test.c:14:15:14:28 | maxConnections | $@ flows to an operand of an arithmetic expression, potentially causing an overflow. | test3.c:10:27:10:30 | **argv | a command-line argument |
-| test.c:14:15:14:28 | maxConnections | test.c:10:27:10:30 | **argv | test.c:14:15:14:28 | maxConnections | $@ flows to an operand of an arithmetic expression, potentially causing an overflow. | test.c:10:27:10:30 | **argv | a command-line argument |
-| test.c:14:15:14:28 | maxConnections | test.c:10:27:10:30 | **argv | test.c:14:15:14:28 | maxConnections | $@ flows to an operand of an arithmetic expression, potentially causing an underflow. | test3.c:10:27:10:30 | **argv | a command-line argument |
-| test.c:14:15:14:28 | maxConnections | test.c:10:27:10:30 | **argv | test.c:14:15:14:28 | maxConnections | $@ flows to an operand of an arithmetic expression, potentially causing an underflow. | test.c:10:27:10:30 | **argv | a command-line argument |
-| test.c:44:7:44:10 | len2 | test3.c:10:27:10:30 | **argv | test.c:44:7:44:10 | len2 | $@ flows to an operand of an arithmetic expression, potentially causing an underflow. | test3.c:10:27:10:30 | **argv | a command-line argument |
-| test.c:44:7:44:10 | len2 | test3.c:10:27:10:30 | **argv | test.c:44:7:44:10 | len2 | $@ flows to an operand of an arithmetic expression, potentially causing an underflow. | test.c:10:27:10:30 | **argv | a command-line argument |
-| test.c:44:7:44:10 | len2 | test.c:10:27:10:30 | **argv | test.c:44:7:44:10 | len2 | $@ flows to an operand of an arithmetic expression, potentially causing an underflow. | test3.c:10:27:10:30 | **argv | a command-line argument |
-| test.c:44:7:44:10 | len2 | test.c:10:27:10:30 | **argv | test.c:44:7:44:10 | len2 | $@ flows to an operand of an arithmetic expression, potentially causing an underflow. | test.c:10:27:10:30 | **argv | a command-line argument |
-| test.c:54:7:54:10 | len3 | test3.c:10:27:10:30 | **argv | test.c:54:7:54:10 | len3 | $@ flows to an operand of an arithmetic expression, potentially causing an underflow. | test3.c:10:27:10:30 | **argv | a command-line argument |
-| test.c:54:7:54:10 | len3 | test3.c:10:27:10:30 | **argv | test.c:54:7:54:10 | len3 | $@ flows to an operand of an arithmetic expression, potentially causing an underflow. | test.c:10:27:10:30 | **argv | a command-line argument |
-| test.c:54:7:54:10 | len3 | test.c:10:27:10:30 | **argv | test.c:54:7:54:10 | len3 | $@ flows to an operand of an arithmetic expression, potentially causing an underflow. | test3.c:10:27:10:30 | **argv | a command-line argument |
-| test.c:54:7:54:10 | len3 | test.c:10:27:10:30 | **argv | test.c:54:7:54:10 | len3 | $@ flows to an operand of an arithmetic expression, potentially causing an underflow. | test.c:10:27:10:30 | **argv | a command-line argument |
+| test.c:14:15:14:28 | maxConnections | main.cpp:7:27:7:30 | **argv | test.c:14:15:14:28 | maxConnections | $@ flows to an operand of an arithmetic expression, potentially causing an overflow. | main.cpp:7:27:7:30 | **argv | a command-line argument |
+| test.c:14:15:14:28 | maxConnections | main.cpp:7:27:7:30 | **argv | test.c:14:15:14:28 | maxConnections | $@ flows to an operand of an arithmetic expression, potentially causing an underflow. | main.cpp:7:27:7:30 | **argv | a command-line argument |
+| test.c:44:7:44:10 | len2 | main.cpp:7:27:7:30 | **argv | test.c:44:7:44:10 | len2 | $@ flows to an operand of an arithmetic expression, potentially causing an underflow. | main.cpp:7:27:7:30 | **argv | a command-line argument |
+| test.c:54:7:54:10 | len3 | main.cpp:7:27:7:30 | **argv | test.c:54:7:54:10 | len3 | $@ flows to an operand of an arithmetic expression, potentially causing an underflow. | main.cpp:7:27:7:30 | **argv | a command-line argument |
diff --git a/cpp/ql/test/query-tests/Security/CWE/CWE-190/semmle/tainted/IntegerOverflowTainted.expected b/cpp/ql/test/query-tests/Security/CWE/CWE-190/semmle/tainted/IntegerOverflowTainted.expected
index a79144feaca..ae20929d7b8 100644
--- a/cpp/ql/test/query-tests/Security/CWE/CWE-190/semmle/tainted/IntegerOverflowTainted.expected
+++ b/cpp/ql/test/query-tests/Security/CWE/CWE-190/semmle/tainted/IntegerOverflowTainted.expected
@@ -4,20 +4,15 @@
 | test2.cpp:17:11:17:22 | ... * ... | $@ flows an expression which might overflow. | test2.cpp:25:22:25:23 | fscanf output argument | value read by fscanf |
 | test2.cpp:39:9:39:18 | ... + ... | $@ flows an expression which might overflow. | test2.cpp:36:9:36:14 | fgets output argument | string read by fgets |
 | test2.cpp:40:3:40:13 | ... += ... | $@ flows an expression which might overflow. | test2.cpp:36:9:36:14 | fgets output argument | string read by fgets |
-| test3.c:12:11:12:34 | * ... | $@ flows an expression which might overflow negatively. | test3.c:10:27:10:30 | **argv | a command-line argument |
-| test3.c:12:11:12:34 | * ... | $@ flows an expression which might overflow negatively. | test.c:10:27:10:30 | **argv | a command-line argument |
-| test3.c:13:11:13:20 | * ... | $@ flows an expression which might overflow negatively. | test3.c:10:27:10:30 | **argv | a command-line argument |
-| test3.c:13:11:13:20 | * ... | $@ flows an expression which might overflow negatively. | test.c:10:27:10:30 | **argv | a command-line argument |
-| test4.cpp:13:7:13:20 | access to array | $@ flows an expression which might overflow negatively. | test4.cpp:8:27:8:30 | **argv | a command-line argument |
+| test3.c:12:11:12:34 | * ... | $@ flows an expression which might overflow negatively. | main.cpp:7:27:7:30 | **argv | a command-line argument |
+| test3.c:13:11:13:20 | * ... | $@ flows an expression which might overflow negatively. | main.cpp:7:27:7:30 | **argv | a command-line argument |
+| test4.cpp:13:7:13:20 | access to array | $@ flows an expression which might overflow negatively. | main.cpp:7:27:7:30 | **argv | a command-line argument |
 | test5.cpp:10:9:10:27 | call to strtoul | $@ flows an expression which might overflow. | test5.cpp:9:7:9:9 | gets output argument | string read by gets |
 | test5.cpp:17:6:17:27 | ... * ... | $@ flows an expression which might overflow. | test5.cpp:9:7:9:9 | gets output argument | string read by gets |
 | test5.cpp:19:6:19:13 | ... * ... | $@ flows an expression which might overflow. | test5.cpp:9:7:9:9 | gets output argument | string read by gets |
 | test6.cpp:11:10:11:15 | s | $@ flows an expression which might overflow. | test6.cpp:39:23:39:24 | fscanf output argument | value read by fscanf |
 | test6.cpp:16:10:16:15 | s | $@ flows an expression which might overflow. | test6.cpp:39:23:39:24 | fscanf output argument | value read by fscanf |
 | test6.cpp:30:11:30:16 | s | $@ flows an expression which might overflow. | test6.cpp:39:23:39:24 | fscanf output argument | value read by fscanf |
-| test.c:14:15:14:35 | ... * ... | $@ flows an expression which might overflow. | test3.c:10:27:10:30 | **argv | a command-line argument |
-| test.c:14:15:14:35 | ... * ... | $@ flows an expression which might overflow. | test.c:10:27:10:30 | **argv | a command-line argument |
-| test.c:44:7:44:12 | ... -- | $@ flows an expression which might overflow negatively. | test3.c:10:27:10:30 | **argv | a command-line argument |
-| test.c:44:7:44:12 | ... -- | $@ flows an expression which might overflow negatively. | test.c:10:27:10:30 | **argv | a command-line argument |
-| test.c:54:7:54:12 | ... -- | $@ flows an expression which might overflow negatively. | test3.c:10:27:10:30 | **argv | a command-line argument |
-| test.c:54:7:54:12 | ... -- | $@ flows an expression which might overflow negatively. | test.c:10:27:10:30 | **argv | a command-line argument |
+| test.c:14:15:14:35 | ... * ... | $@ flows an expression which might overflow. | main.cpp:7:27:7:30 | **argv | a command-line argument |
+| test.c:44:7:44:12 | ... -- | $@ flows an expression which might overflow negatively. | main.cpp:7:27:7:30 | **argv | a command-line argument |
+| test.c:54:7:54:12 | ... -- | $@ flows an expression which might overflow negatively. | main.cpp:7:27:7:30 | **argv | a command-line argument |
diff --git a/cpp/ql/test/query-tests/Security/CWE/CWE-190/semmle/tainted/main.cpp b/cpp/ql/test/query-tests/Security/CWE/CWE-190/semmle/tainted/main.cpp
new file mode 100644
index 00000000000..645b5893dea
--- /dev/null
+++ b/cpp/ql/test/query-tests/Security/CWE/CWE-190/semmle/tainted/main.cpp
@@ -0,0 +1,12 @@
+extern "C" {
+int main1(int argc, char** argv);
+int main3(int argc, char** argv);
+}
+int main4(int argc, char** argv);
+
+int main(int argc, char** argv) {
+    main1(argc, argv);
+    main3(argc, argv);
+    main4(argc, argv);
+    return 0;
+}
diff --git a/cpp/ql/test/query-tests/Security/CWE/CWE-190/semmle/tainted/test.c b/cpp/ql/test/query-tests/Security/CWE/CWE-190/semmle/tainted/test.c
index 29ab7cc8f25..b39e54084ac 100644
--- a/cpp/ql/test/query-tests/Security/CWE/CWE-190/semmle/tainted/test.c
+++ b/cpp/ql/test/query-tests/Security/CWE/CWE-190/semmle/tainted/test.c
@@ -7,7 +7,7 @@ void startServer(int heapSize);
 typedef unsigned long size_t;
 size_t strlen(const char *s);
 
-int main(int argc, char** argv) {
+int main1(int argc, char** argv) {
   int maxConnections = atoi(argv[1]);
 
   // BAD: arithmetic on a user input without any validation
diff --git a/cpp/ql/test/query-tests/Security/CWE/CWE-190/semmle/tainted/test3.c b/cpp/ql/test/query-tests/Security/CWE/CWE-190/semmle/tainted/test3.c
index 57c3b529f58..a8116e05853 100644
--- a/cpp/ql/test/query-tests/Security/CWE/CWE-190/semmle/tainted/test3.c
+++ b/cpp/ql/test/query-tests/Security/CWE/CWE-190/semmle/tainted/test3.c
@@ -7,7 +7,7 @@
 // Regression test for ODASA-6054: IntegerOverflowTainted should
 // not report a result if the overflow happens in a macro expansion
 // from a macro that is defined in a system header.
-int main(int argc, char **argv) {
+int main3(int argc, char **argv) {
   char *cmd = argv[0];
   int x = (int)(unsigned char)*cmd;  // BAD: overflow
   int y = CAST(*cmd);  // BAD: overflow in macro expansion (macro is not from a system header)
diff --git a/cpp/ql/test/query-tests/Security/CWE/CWE-190/semmle/tainted/test4.cpp b/cpp/ql/test/query-tests/Security/CWE/CWE-190/semmle/tainted/test4.cpp
index 054aea93fba..ad4cc80d30a 100644
--- a/cpp/ql/test/query-tests/Security/CWE/CWE-190/semmle/tainted/test4.cpp
+++ b/cpp/ql/test/query-tests/Security/CWE/CWE-190/semmle/tainted/test4.cpp
@@ -5,7 +5,7 @@
 // by comparing the value to 0. This means that the cast cannot overflow,
 // regardless of what the input type is.
 
-int main(int argc, char **argv) {
+int main4(int argc, char **argv) {
   char *p = argv[0];
   if (!p[0]) {  // GOOD: cast to bool.
     return 1;
diff --git a/cpp/ql/test/query-tests/Security/CWE/CWE-457/semmle/tests/UninitializedLocal.expected b/cpp/ql/test/query-tests/Security/CWE/CWE-457/semmle/tests/UninitializedLocal.expected
index a8b3c7782e7..6773f5aef94 100644
--- a/cpp/ql/test/query-tests/Security/CWE/CWE-457/semmle/tests/UninitializedLocal.expected
+++ b/cpp/ql/test/query-tests/Security/CWE/CWE-457/semmle/tests/UninitializedLocal.expected
@@ -1,5 +1,6 @@
 edges
 nodes
+| errors.cpp:13:7:13:7 | definition of x | semmle.label | definition of x |
 | test.cpp:11:6:11:8 | definition of foo | semmle.label | definition of foo |
 | test.cpp:111:6:111:8 | definition of foo | semmle.label | definition of foo |
 | test.cpp:226:7:226:7 | definition of x | semmle.label | definition of x |
@@ -14,6 +15,7 @@ nodes
 | test.cpp:472:6:472:6 | definition of x | semmle.label | definition of x |
 | test.cpp:479:6:479:6 | definition of x | semmle.label | definition of x |
 #select
+| errors.cpp:14:18:14:18 | x | errors.cpp:13:7:13:7 | definition of x | errors.cpp:13:7:13:7 | definition of x | The variable $@ may not be initialized at this access. | errors.cpp:13:7:13:7 | x | x |
 | test.cpp:12:6:12:8 | foo | test.cpp:11:6:11:8 | definition of foo | test.cpp:11:6:11:8 | definition of foo | The variable $@ may not be initialized at this access. | test.cpp:11:6:11:8 | foo | foo |
 | test.cpp:113:6:113:8 | foo | test.cpp:111:6:111:8 | definition of foo | test.cpp:111:6:111:8 | definition of foo | The variable $@ may not be initialized at this access. | test.cpp:111:6:111:8 | foo | foo |
 | test.cpp:227:3:227:3 | x | test.cpp:226:7:226:7 | definition of x | test.cpp:226:7:226:7 | definition of x | The variable $@ may not be initialized at this access. | test.cpp:226:7:226:7 | x | x |
diff --git a/cpp/ql/test/query-tests/Security/CWE/CWE-457/semmle/tests/errors.cpp b/cpp/ql/test/query-tests/Security/CWE/CWE-457/semmle/tests/errors.cpp
new file mode 100644
index 00000000000..07bb61f943e
--- /dev/null
+++ b/cpp/ql/test/query-tests/Security/CWE/CWE-457/semmle/tests/errors.cpp
@@ -0,0 +1,15 @@
+// semmle-extractor-options: --expect_errors
+
+int f1() {
+  int x;
+  initialize(&x); // error expression - initialize() is not defined
+  return x;       // GOOD - assume x is initialized
+}
+
+void * operator new(unsigned long, bool);
+void operator delete(void*, bool);
+
+int f2() {
+  int x;
+  new(true) int (x);  // BAD, ignore implicit error expression
+}
diff --git a/cpp/ql/test/query-tests/Security/CWE/CWE-497/semmle/tests/tests2.cpp b/cpp/ql/test/query-tests/Security/CWE/CWE-497/semmle/tests/tests2.cpp
index 4c72bc61f31..c22d74b7a75 100644
--- a/cpp/ql/test/query-tests/Security/CWE/CWE-497/semmle/tests/tests2.cpp
+++ b/cpp/ql/test/query-tests/Security/CWE/CWE-497/semmle/tests/tests2.cpp
@@ -50,7 +50,7 @@ int val();
 const char *global1 = mysql_get_client_info();
 const char *global2 = "abc";
 
-void test1()
+void test7()
 {
 	int sock = socket(val(), val(), val());
 
diff --git a/cpp/ql/test/query-tests/Security/CWE/CWE-704/WcharCharConversion.cpp b/cpp/ql/test/query-tests/Security/CWE/CWE-704/WcharCharConversion.cpp
index 909927c6549..dc2b9f4a9c1 100644
--- a/cpp/ql/test/query-tests/Security/CWE/CWE-704/WcharCharConversion.cpp
+++ b/cpp/ql/test/query-tests/Security/CWE/CWE-704/WcharCharConversion.cpp
@@ -53,4 +53,59 @@ void NonStringFalsePositiveTest2(unsigned char* buffer)
 {
 	wchar_t *lpWchar = NULL;
 	lpWchar = (LPWSTR)buffer; // Possible False Positive
-}
\ No newline at end of file
+}
+
+typedef unsigned char BYTE;
+using FOO = BYTE*;
+
+void NonStringFalsePositiveTest3(FOO buffer)
+{
+	wchar_t *lpWchar = NULL;
+	lpWchar = (LPWSTR)buffer; // GOOD
+}
+
+#define UNICODE 0x8
+
+// assume EMPTY_MACRO is tied to if UNICODE is enabled
+#ifdef EMPTY_MACRO
+typedef WCHAR* LPTSTR;
+#else
+typedef char* LPTSTR;
+#endif
+
+void CheckedConversionFalsePositiveTest3(unsigned short flags, LPTSTR buffer)
+{
+	wchar_t *lpWchar = NULL;
+	if(flags & UNICODE)
+		lpWchar = (LPWSTR)buffer; // GOOD
+	else
+		lpWchar = (LPWSTR)buffer; // BUG
+
+	if((flags & UNICODE) == 0x8)
+		lpWchar = (LPWSTR)buffer; // GOOD
+	else
+		lpWchar = (LPWSTR)buffer; // BUG
+
+	if((flags & UNICODE) != 0x8)
+		lpWchar = (LPWSTR)buffer; // BUG
+	else
+		lpWchar = (LPWSTR)buffer; // GOOD
+
+	// Bad operator precedence
+	if(flags & UNICODE == 0x8)
+		lpWchar = (LPWSTR)buffer; // BUG
+	else
+		lpWchar = (LPWSTR)buffer; // BUG
+
+	if((flags & UNICODE) != 0)
+		lpWchar = (LPWSTR)buffer; // GOOD
+	else
+		lpWchar = (LPWSTR)buffer; // BUG
+
+	if((flags & UNICODE) == 0)
+		lpWchar = (LPWSTR)buffer; // BUG
+	else
+		lpWchar = (LPWSTR)buffer; // GOOD
+
+	lpWchar = (LPWSTR)buffer; // BUG
+}
diff --git a/cpp/ql/test/query-tests/Security/CWE/CWE-704/WcharCharConversion.expected b/cpp/ql/test/query-tests/Security/CWE/CWE-704/WcharCharConversion.expected
index 73787d4f6eb..9b34966aa87 100644
--- a/cpp/ql/test/query-tests/Security/CWE/CWE-704/WcharCharConversion.expected
+++ b/cpp/ql/test/query-tests/Security/CWE/CWE-704/WcharCharConversion.expected
@@ -3,3 +3,11 @@
 | WcharCharConversion.cpp:24:22:24:27 | lpChar | Conversion from char * to wchar_t *. Use of invalid string can lead to undefined behavior. |
 | WcharCharConversion.cpp:26:23:26:28 | lpChar | Conversion from char * to LPCWSTR. Use of invalid string can lead to undefined behavior. |
 | WcharCharConversion.cpp:27:17:27:22 | lpChar | Conversion from char * to LPWSTR. Use of invalid string can lead to undefined behavior. |
+| WcharCharConversion.cpp:82:21:82:26 | buffer | Conversion from LPTSTR to LPWSTR. Use of invalid string can lead to undefined behavior. |
+| WcharCharConversion.cpp:87:21:87:26 | buffer | Conversion from LPTSTR to LPWSTR. Use of invalid string can lead to undefined behavior. |
+| WcharCharConversion.cpp:90:21:90:26 | buffer | Conversion from LPTSTR to LPWSTR. Use of invalid string can lead to undefined behavior. |
+| WcharCharConversion.cpp:96:21:96:26 | buffer | Conversion from LPTSTR to LPWSTR. Use of invalid string can lead to undefined behavior. |
+| WcharCharConversion.cpp:98:21:98:26 | buffer | Conversion from LPTSTR to LPWSTR. Use of invalid string can lead to undefined behavior. |
+| WcharCharConversion.cpp:103:21:103:26 | buffer | Conversion from LPTSTR to LPWSTR. Use of invalid string can lead to undefined behavior. |
+| WcharCharConversion.cpp:106:21:106:26 | buffer | Conversion from LPTSTR to LPWSTR. Use of invalid string can lead to undefined behavior. |
+| WcharCharConversion.cpp:110:20:110:25 | buffer | Conversion from LPTSTR to LPWSTR. Use of invalid string can lead to undefined behavior. |
diff --git a/cpp/ql/test/successor-tests/break_labels/cfg.ql b/cpp/ql/test/successor-tests/break_labels/cfg.ql
index 4698a25e809..e9cbb93d005 100644
--- a/cpp/ql/test/successor-tests/break_labels/cfg.ql
+++ b/cpp/ql/test/successor-tests/break_labels/cfg.ql
@@ -1,4 +1,9 @@
-// query-type: graph
+/**
+ * query-type: graph
+ *
+ * @kind graph-equivalence-test
+ */
+
 import cpp
 
 class DestructorCallEnhanced extends DestructorCall {
diff --git a/cpp/ql/test/successor-tests/conditional_destructors/cfg.ql b/cpp/ql/test/successor-tests/conditional_destructors/cfg.ql
index 19a82ba0de0..0e1f45caf19 100644
--- a/cpp/ql/test/successor-tests/conditional_destructors/cfg.ql
+++ b/cpp/ql/test/successor-tests/conditional_destructors/cfg.ql
@@ -1,4 +1,9 @@
-// query-type: graph
+/**
+ * query-type: graph
+ *
+ * @kind graph-equivalence-test
+ */
+
 import cpp
 
 class DestructorCallEnhanced extends DestructorCall {
diff --git a/cpp/ql/test/successor-tests/exceptionhandler/ellipsisexceptionhandler/graphable.ql b/cpp/ql/test/successor-tests/exceptionhandler/ellipsisexceptionhandler/graphable.ql
index 19a82ba0de0..0e1f45caf19 100644
--- a/cpp/ql/test/successor-tests/exceptionhandler/ellipsisexceptionhandler/graphable.ql
+++ b/cpp/ql/test/successor-tests/exceptionhandler/ellipsisexceptionhandler/graphable.ql
@@ -1,4 +1,9 @@
-// query-type: graph
+/**
+ * query-type: graph
+ *
+ * @kind graph-equivalence-test
+ */
+
 import cpp
 
 class DestructorCallEnhanced extends DestructorCall {
diff --git a/cpp/ql/test/successor-tests/exceptionhandler/exceptionhandler/graphable.ql b/cpp/ql/test/successor-tests/exceptionhandler/exceptionhandler/graphable.ql
index 19a82ba0de0..0e1f45caf19 100644
--- a/cpp/ql/test/successor-tests/exceptionhandler/exceptionhandler/graphable.ql
+++ b/cpp/ql/test/successor-tests/exceptionhandler/exceptionhandler/graphable.ql
@@ -1,4 +1,9 @@
-// query-type: graph
+/**
+ * query-type: graph
+ *
+ * @kind graph-equivalence-test
+ */
+
 import cpp
 
 class DestructorCallEnhanced extends DestructorCall {
diff --git a/cpp/ql/test/successor-tests/pruning/graphable.ql b/cpp/ql/test/successor-tests/pruning/graphable.ql
index 19a82ba0de0..0e1f45caf19 100644
--- a/cpp/ql/test/successor-tests/pruning/graphable.ql
+++ b/cpp/ql/test/successor-tests/pruning/graphable.ql
@@ -1,4 +1,9 @@
-// query-type: graph
+/**
+ * query-type: graph
+ *
+ * @kind graph-equivalence-test
+ */
+
 import cpp
 
 class DestructorCallEnhanced extends DestructorCall {
diff --git a/cpp/ql/test/successor-tests/returnstmt/graphable.ql b/cpp/ql/test/successor-tests/returnstmt/graphable.ql
index 19a82ba0de0..0e1f45caf19 100644
--- a/cpp/ql/test/successor-tests/returnstmt/graphable.ql
+++ b/cpp/ql/test/successor-tests/returnstmt/graphable.ql
@@ -1,4 +1,9 @@
-// query-type: graph
+/**
+ * query-type: graph
+ *
+ * @kind graph-equivalence-test
+ */
+
 import cpp
 
 class DestructorCallEnhanced extends DestructorCall {
diff --git a/cpp/ql/test/successor-tests/stackvariables/stackvariables/graphable.ql b/cpp/ql/test/successor-tests/stackvariables/stackvariables/graphable.ql
index 19a82ba0de0..0e1f45caf19 100644
--- a/cpp/ql/test/successor-tests/stackvariables/stackvariables/graphable.ql
+++ b/cpp/ql/test/successor-tests/stackvariables/stackvariables/graphable.ql
@@ -1,4 +1,9 @@
-// query-type: graph
+/**
+ * query-type: graph
+ *
+ * @kind graph-equivalence-test
+ */
+
 import cpp
 
 class DestructorCallEnhanced extends DestructorCall {
diff --git a/cpp/ql/test/successor-tests/switchstmt/switchbody/graphable.ql b/cpp/ql/test/successor-tests/switchstmt/switchbody/graphable.ql
index 19a82ba0de0..0e1f45caf19 100644
--- a/cpp/ql/test/successor-tests/switchstmt/switchbody/graphable.ql
+++ b/cpp/ql/test/successor-tests/switchstmt/switchbody/graphable.ql
@@ -1,4 +1,9 @@
-// query-type: graph
+/**
+ * query-type: graph
+ *
+ * @kind graph-equivalence-test
+ */
+
 import cpp
 
 class DestructorCallEnhanced extends DestructorCall {
diff --git a/csharp/.config/dotnet-tools.json b/csharp/.config/dotnet-tools.json
index b9052bc027d..16d0d2fef4f 100644
--- a/csharp/.config/dotnet-tools.json
+++ b/csharp/.config/dotnet-tools.json
@@ -3,7 +3,7 @@
   "isRoot": true,
   "tools": {
     "paket": {
-      "version": "8.0.3",
+      "version": "9.0.1",
       "commands": [
         "paket"
       ]
diff --git a/csharp/.paket/Paket.Restore.targets b/csharp/.paket/Paket.Restore.targets
index bbeec153f50..17aeb63502d 100644
--- a/csharp/.paket/Paket.Restore.targets
+++ b/csharp/.paket/Paket.Restore.targets
@@ -235,14 +235,15 @@
 				<Splits>$([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',').Length)</Splits>
 				<PackageName>$([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[0])</PackageName>
 				<PackageVersion>$([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[1])</PackageVersion>
+				<Reference>$([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[2])</Reference>
 				<AllPrivateAssets>$([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[4])</AllPrivateAssets>
 				<CopyLocal Condition="%(PaketReferencesFileLinesInfo.Splits) &gt;= 6">$([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[5])</CopyLocal>
 				<OmitContent Condition="%(PaketReferencesFileLinesInfo.Splits) &gt;= 7">$([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[6])</OmitContent>
 				<ImportTargets Condition="%(PaketReferencesFileLinesInfo.Splits) &gt;= 8">$([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[7])</ImportTargets>
 				<Aliases Condition="%(PaketReferencesFileLinesInfo.Splits) &gt;= 9">$([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[8])</Aliases>
 			</PaketReferencesFileLinesInfo>
-			<PackageReference Include="%(PaketReferencesFileLinesInfo.PackageName)">
-				<Version>%(PaketReferencesFileLinesInfo.PackageVersion)</Version>
+			<PackageReference Condition=" '$(ManagePackageVersionsCentrally)' != 'true' Or '%(PaketReferencesFileLinesInfo.Reference)' == 'Direct' " Include="%(PaketReferencesFileLinesInfo.PackageName)">
+				<Version Condition=" '$(ManagePackageVersionsCentrally)' != 'true' ">%(PaketReferencesFileLinesInfo.PackageVersion)</Version>
 				<PrivateAssets Condition=" ('%(PaketReferencesFileLinesInfo.AllPrivateAssets)' == 'true') Or ('$(PackAsTool)' == 'true') ">All</PrivateAssets>
 				<ExcludeAssets Condition=" %(PaketReferencesFileLinesInfo.CopyLocal) == 'false' or %(PaketReferencesFileLinesInfo.AllPrivateAssets) == 'exclude'">runtime</ExcludeAssets>
 				<ExcludeAssets Condition=" %(PaketReferencesFileLinesInfo.OmitContent) == 'true'">$(ExcludeAssets);contentFiles</ExcludeAssets>
@@ -252,6 +253,10 @@
 				<AllowExplicitVersion>true</AllowExplicitVersion>
 
 			</PackageReference>
+
+			<PackageVersion Include="%(PaketReferencesFileLinesInfo.PackageName)">
+				<Version>%(PaketReferencesFileLinesInfo.PackageVersion)</Version>
+			</PackageVersion>
 		</ItemGroup>
 
 		<PropertyGroup>
diff --git a/csharp/CSharp.sln b/csharp/CSharp.sln
index dddba01c6ed..f4cde4624d4 100644
--- a/csharp/CSharp.sln
+++ b/csharp/CSharp.sln
@@ -4,8 +4,6 @@ VisualStudioVersion = 15.0.27130.2036
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Semmle.Util", "extractor\Semmle.Util\Semmle.Util.csproj", "{CDD7AD69-0FD8-40F0-A9DA-F1077A2A85D6}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Semmle.Extraction", "extractor\Semmle.Extraction\Semmle.Extraction.csproj", "{81EAAD75-4BE1-44E4-91DF-20778216DB64}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Semmle.Extraction.CSharp", "extractor\Semmle.Extraction.CSharp\Semmle.Extraction.CSharp.csproj", "{C4D62DA0-B64B-440B-86DC-AB52318CB8BF}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Semmle.Extraction.CSharp.DependencyFetching", "extractor\Semmle.Extraction.CSharp.DependencyFetching\Semmle.Extraction.CSharp.DependencyFetching.csproj", "{541D1AC5-E42C-4AB2-A1A4-C2355CE2A2EF}"
diff --git a/csharp/Directory.Build.props b/csharp/Directory.Build.props
index 08e24aa8dc9..0c8a2bc1526 100644
--- a/csharp/Directory.Build.props
+++ b/csharp/Directory.Build.props
@@ -1,7 +1,7 @@
 <Project>
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <RuntimeIdentifiers>win-x64;linux-x64;osx-x64</RuntimeIdentifiers>
     <Nullable>enable</Nullable>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
diff --git a/csharp/actions/create-extractor-pack/action.yml b/csharp/actions/create-extractor-pack/action.yml
index 3f8150c0459..2386fe15101 100644
--- a/csharp/actions/create-extractor-pack/action.yml
+++ b/csharp/actions/create-extractor-pack/action.yml
@@ -5,9 +5,9 @@ runs:
   steps:
     - uses: ./.github/actions/fetch-codeql
     - name: Setup dotnet
-      uses: actions/setup-dotnet@v3
+      uses: actions/setup-dotnet@v4
       with:
-        dotnet-version: 8.0.101
+        dotnet-version: 9.0.100
     - name: Build Extractor
       shell: bash
       run: scripts/create-extractor-pack.sh
diff --git a/csharp/codeql-extractor.yml b/csharp/codeql-extractor.yml
index 43c4adaafbf..c4d7352cc43 100644
--- a/csharp/codeql-extractor.yml
+++ b/csharp/codeql-extractor.yml
@@ -70,4 +70,4 @@ options:
     description: >
       [EXPERIMENTAL] The value is a path to the MsBuild binary log file that should be extracted.
       This option only works when `--build-mode none` is also specified.
-    type: string
+    type: array
diff --git a/csharp/documentation/library-coverage/coverage.csv b/csharp/documentation/library-coverage/coverage.csv
index 27324759b2a..10b1c58ef31 100644
--- a/csharp/documentation/library-coverage/coverage.csv
+++ b/csharp/documentation/library-coverage/coverage.csv
@@ -2,44 +2,45 @@ package,sink,source,summary,sink:code-injection,sink:encryption-decryptor,sink:e
 Amazon.Lambda.APIGatewayEvents,,6,,,,,,,,,,,,,,,,,6,,,,
 Amazon.Lambda.Core,10,,,,,,,,,,,10,,,,,,,,,,,
 Dapper,55,42,1,,,,,,,,,,55,,42,,,,,,,,1
-ILCompiler,,,123,,,,,,,,,,,,,,,,,,,123,
-ILLink.RoslynAnalyzer,,,145,,,,,,,,,,,,,,,,,,,145,
-ILLink.Shared,,,34,,,,,,,,,,,,,,,,,,,32,2
-ILLink.Tasks,,,4,,,,,,,,,,,,,,,,,,,4,
-Internal.IL,,,46,,,,,,,,,,,,,,,,,,,44,2
-Internal.Pgo,,,9,,,,,,,,,,,,,,,,,,,8,1
-Internal.TypeSystem,,,315,,,,,,,,,,,,,,,,,,,299,16
-JsonToItemsTaskFactory,,,10,,,,,,,,,,,,,,,,,,,10,
-Microsoft.Android.Build,,1,16,,,,,,,,,,,,,1,,,,,,16,
-Microsoft.Apple.Build,,,8,,,,,,,,,,,,,,,,,,,8,
+ILCompiler,,,123,,,,,,,,,,,,,,,,,,,79,44
+ILLink.RoslynAnalyzer,,,139,,,,,,,,,,,,,,,,,,,50,89
+ILLink.Shared,,,31,,,,,,,,,,,,,,,,,,,11,20
+ILLink.Tasks,,,5,,,,,,,,,,,,,,,,,,,4,1
+Internal.IL,,,54,,,,,,,,,,,,,,,,,,,28,26
+Internal.Pgo,,,9,,,,,,,,,,,,,,,,,,,2,7
+Internal.TypeSystem,,,328,,,,,,,,,,,,,,,,,,,201,127
+JsonToItemsTaskFactory,,,11,,,,,,,,,,,,,,,,,,,1,10
+Microsoft.Android.Build,,1,14,,,,,,,,,,,,,1,,,,,,12,2
+Microsoft.Apple.Build,,,7,,,,,,,,,,,,,,,,,,,7,
 Microsoft.ApplicationBlocks.Data,28,,,,,,,,,,,,28,,,,,,,,,,
-Microsoft.CSharp,,,13,,,,,,,,,,,,,,,,,,,13,
-Microsoft.Diagnostics.Tools.Pgo,,,12,,,,,,,,,,,,,,,,,,,12,
-Microsoft.DotNet.Build.Tasks,,,6,,,,,,,,,,,,,,,,,,,6,
+Microsoft.CSharp,,,2,,,,,,,,,,,,,,,,,,,2,
+Microsoft.Diagnostics.Tools.Pgo,,,23,,,,,,,,,,,,,,,,,,,2,21
+Microsoft.DotNet.Build.Tasks,,,10,,,,,,,,,,,,,,,,,,,8,2
 Microsoft.EntityFrameworkCore,6,,12,,,,,,,,,,6,,,,,,,,,,12
-Microsoft.Extensions.Caching.Distributed,,,10,,,,,,,,,,,,,,,,,,,10,
-Microsoft.Extensions.Caching.Memory,,,39,,,,,,,,,,,,,,,,,,,38,1
-Microsoft.Extensions.Configuration,,3,90,,,,,,,,,,,,,3,,,,,,89,1
-Microsoft.Extensions.DependencyInjection,,,134,,,,,,,,,,,,,,,,,,,133,1
-Microsoft.Extensions.DependencyModel,,1,18,,,,,,,,,,,,,1,,,,,,18,
-Microsoft.Extensions.Diagnostics.Metrics,,,15,,,,,,,,,,,,,,,,,,,15,
-Microsoft.Extensions.FileProviders,,,15,,,,,,,,,,,,,,,,,,,15,
-Microsoft.Extensions.FileSystemGlobbing,,,18,,,,,,,,,,,,,,,,,,,16,2
-Microsoft.Extensions.Hosting,,,41,,,,,,,,,,,,,,,,,,,40,1
-Microsoft.Extensions.Http,,,9,,,,,,,,,,,,,,,,,,,9,
-Microsoft.Extensions.Logging,,,65,,,,,,,,,,,,,,,,,,,64,1
-Microsoft.Extensions.Options,,,13,,,,,,,,,,,,,,,,,,,13,
-Microsoft.Extensions.Primitives,,,72,,,,,,,,,,,,,,,,,,,72,
-Microsoft.Interop,,,121,,,,,,,,,,,,,,,,,,,121,
-Microsoft.NET.Build.Tasks,,,4,,,,,,,,,,,,,,,,,,,4,
-Microsoft.NET.WebAssembly.Webcil,,,8,,,,,,,,,,,,,,,,,,,8,
-Microsoft.VisualBasic,,,6,,,,,,,,,,,,,,,,,,,1,5
-Microsoft.WebAssembly.Build.Tasks,,,4,,,,,,,,,,,,,,,,,,,4,
-Microsoft.Win32,,4,4,,,,,,,,,,,,,,,,,,4,4,
-Mono.Linker,,,285,,,,,,,,,,,,,,,,,,,285,
+Microsoft.Extensions.Caching.Distributed,,,3,,,,,,,,,,,,,,,,,,,,3
+Microsoft.Extensions.Caching.Memory,,,31,,,,,,,,,,,,,,,,,,,5,26
+Microsoft.Extensions.Configuration,,3,91,,,,,,,,,,,,,3,,,,,,25,66
+Microsoft.Extensions.DependencyInjection,,,130,,,,,,,,,,,,,,,,,,,17,113
+Microsoft.Extensions.DependencyModel,,1,16,,,,,,,,,,,,,1,,,,,,14,2
+Microsoft.Extensions.Diagnostics.Metrics,,,14,,,,,,,,,,,,,,,,,,,1,13
+Microsoft.Extensions.FileProviders,,,17,,,,,,,,,,,,,,,,,,,7,10
+Microsoft.Extensions.FileSystemGlobbing,,,22,,,,,,,,,,,,,,,,,,,11,11
+Microsoft.Extensions.Hosting,,,39,,,,,,,,,,,,,,,,,,,29,10
+Microsoft.Extensions.Http,,,9,,,,,,,,,,,,,,,,,,,7,2
+Microsoft.Extensions.Logging,,,64,,,,,,,,,,,,,,,,,,,25,39
+Microsoft.Extensions.Options,,,14,,,,,,,,,,,,,,,,,,,14,
+Microsoft.Extensions.Primitives,,,72,,,,,,,,,,,,,,,,,,,67,5
+Microsoft.Interop,,,137,,,,,,,,,,,,,,,,,,,70,67
+Microsoft.NET.Build.Tasks,,,5,,,,,,,,,,,,,,,,,,,3,2
+Microsoft.NET.Sdk.WebAssembly,,,2,,,,,,,,,,,,,,,,,,,1,1
+Microsoft.NET.WebAssembly.Webcil,,,6,,,,,,,,,,,,,,,,,,,6,
+Microsoft.VisualBasic,,,13,,,,,,,,,,,,,,,,,,,1,12
+Microsoft.WebAssembly.Build.Tasks,,,9,,,,,,,,,,,,,,,,,,,8,1
+Microsoft.Win32,,4,2,,,,,,,,,,,,,,,,,,4,,2
+Mono.Linker,,,287,,,,,,,,,,,,,,,,,,,145,142
 MySql.Data.MySqlClient,48,,,,,,,,,,,,48,,,,,,,,,,
 Newtonsoft.Json,,,91,,,,,,,,,,,,,,,,,,,73,18
 ServiceStack,194,,7,27,,,,,75,,,,92,,,,,,,,,7,
-SourceGenerators,,,5,,,,,,,,,,,,,,,,,,,5,
-System,54,47,10626,,6,5,5,,,4,1,,33,2,,6,15,17,4,3,,8721,1905
+SourceGenerators,,,5,,,,,,,,,,,,,,,,,,,,5
+System,54,47,10313,,6,5,5,,,4,1,,33,2,,6,15,17,4,3,,5351,4962
 Windows.Security.Cryptography.Core,1,,,,,,,1,,,,,,,,,,,,,,,
diff --git a/csharp/documentation/library-coverage/coverage.rst b/csharp/documentation/library-coverage/coverage.rst
index 25ca061666b..5eaaad17457 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,10626,54,5
-   Others,"``Amazon.Lambda.APIGatewayEvents``, ``Amazon.Lambda.Core``, ``Dapper``, ``ILCompiler``, ``ILLink.RoslynAnalyzer``, ``ILLink.Shared``, ``ILLink.Tasks``, ``Internal.IL``, ``Internal.Pgo``, ``Internal.TypeSystem``, ``JsonToItemsTaskFactory``, ``Microsoft.Android.Build``, ``Microsoft.Apple.Build``, ``Microsoft.ApplicationBlocks.Data``, ``Microsoft.CSharp``, ``Microsoft.Diagnostics.Tools.Pgo``, ``Microsoft.DotNet.Build.Tasks``, ``Microsoft.EntityFrameworkCore``, ``Microsoft.Extensions.Caching.Distributed``, ``Microsoft.Extensions.Caching.Memory``, ``Microsoft.Extensions.Configuration``, ``Microsoft.Extensions.DependencyInjection``, ``Microsoft.Extensions.DependencyModel``, ``Microsoft.Extensions.Diagnostics.Metrics``, ``Microsoft.Extensions.FileProviders``, ``Microsoft.Extensions.FileSystemGlobbing``, ``Microsoft.Extensions.Hosting``, ``Microsoft.Extensions.Http``, ``Microsoft.Extensions.Logging``, ``Microsoft.Extensions.Options``, ``Microsoft.Extensions.Primitives``, ``Microsoft.Interop``, ``Microsoft.NET.Build.Tasks``, ``Microsoft.NET.WebAssembly.Webcil``, ``Microsoft.VisualBasic``, ``Microsoft.WebAssembly.Build.Tasks``, ``Microsoft.Win32``, ``Mono.Linker``, ``MySql.Data.MySqlClient``, ``Newtonsoft.Json``, ``SourceGenerators``, ``Windows.Security.Cryptography.Core``",57,1821,148,
-   Totals,,104,12454,396,5
+   System,"``System.*``, ``System``",47,10313,54,5
+   Others,"``Amazon.Lambda.APIGatewayEvents``, ``Amazon.Lambda.Core``, ``Dapper``, ``ILCompiler``, ``ILLink.RoslynAnalyzer``, ``ILLink.Shared``, ``ILLink.Tasks``, ``Internal.IL``, ``Internal.Pgo``, ``Internal.TypeSystem``, ``JsonToItemsTaskFactory``, ``Microsoft.Android.Build``, ``Microsoft.Apple.Build``, ``Microsoft.ApplicationBlocks.Data``, ``Microsoft.CSharp``, ``Microsoft.Diagnostics.Tools.Pgo``, ``Microsoft.DotNet.Build.Tasks``, ``Microsoft.EntityFrameworkCore``, ``Microsoft.Extensions.Caching.Distributed``, ``Microsoft.Extensions.Caching.Memory``, ``Microsoft.Extensions.Configuration``, ``Microsoft.Extensions.DependencyInjection``, ``Microsoft.Extensions.DependencyModel``, ``Microsoft.Extensions.Diagnostics.Metrics``, ``Microsoft.Extensions.FileProviders``, ``Microsoft.Extensions.FileSystemGlobbing``, ``Microsoft.Extensions.Hosting``, ``Microsoft.Extensions.Http``, ``Microsoft.Extensions.Logging``, ``Microsoft.Extensions.Options``, ``Microsoft.Extensions.Primitives``, ``Microsoft.Interop``, ``Microsoft.NET.Build.Tasks``, ``Microsoft.NET.Sdk.WebAssembly``, ``Microsoft.NET.WebAssembly.Webcil``, ``Microsoft.VisualBasic``, ``Microsoft.WebAssembly.Build.Tasks``, ``Microsoft.Win32``, ``Mono.Linker``, ``MySql.Data.MySqlClient``, ``Newtonsoft.Json``, ``SourceGenerators``, ``Windows.Security.Cryptography.Core``",57,1848,148,
+   Totals,,104,12168,396,5
 
diff --git a/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/BUILD.bazel b/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/BUILD.bazel
index 71f54154077..4be9954a274 100644
--- a/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/BUILD.bazel
+++ b/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/BUILD.bazel
@@ -14,7 +14,7 @@ codeql_csharp_library(
     nowarn = ["CA1822"],
     visibility = ["//csharp:__subpackages__"],
     deps = [
-        "//csharp/extractor/Semmle.Extraction",
+        "//csharp/extractor/Semmle.Extraction.CSharp",
         "//csharp/extractor/Semmle.Util",
     ],
 )
diff --git a/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/DotNet.cs b/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/DotNet.cs
index d0646ea921c..edfea049a81 100644
--- a/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/DotNet.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/DotNet.cs
@@ -131,7 +131,7 @@ namespace Semmle.Extraction.CSharp.DependencyFetching
         }
 
         // The version number should be kept in sync with the version .NET version used for building the application.
-        public const string LatestDotNetSdkVersion = "8.0.101";
+        public const string LatestDotNetSdkVersion = "9.0.100";
 
         /// <summary>
         /// Returns a script for downloading relevant versions of the
diff --git a/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/NugetExeWrapper.cs b/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/NugetExeWrapper.cs
index 0676042eb42..c77daa8899c 100644
--- a/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/NugetExeWrapper.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/NugetExeWrapper.cs
@@ -15,7 +15,7 @@ namespace Semmle.Extraction.CSharp.DependencyFetching
     internal class NugetExeWrapper : IDisposable
     {
         private readonly string? nugetExe;
-        private readonly Util.Logging.ILogger logger;
+        private readonly Semmle.Util.Logging.ILogger logger;
 
         public int PackageCount => fileProvider.PackagesConfigs.Count;
 
@@ -33,7 +33,7 @@ namespace Semmle.Extraction.CSharp.DependencyFetching
         /// <summary>
         /// Create the package manager for a specified source tree.
         /// </summary>
-        public NugetExeWrapper(FileProvider fileProvider, TemporaryDirectory packageDirectory, Util.Logging.ILogger logger)
+        public NugetExeWrapper(FileProvider fileProvider, TemporaryDirectory packageDirectory, Semmle.Util.Logging.ILogger logger)
         {
             this.fileProvider = fileProvider;
             this.packageDirectory = packageDirectory;
diff --git a/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/Semmle.Extraction.CSharp.DependencyFetching.csproj b/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/Semmle.Extraction.CSharp.DependencyFetching.csproj
index 82003c4dd14..424094c1ed6 100644
--- a/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/Semmle.Extraction.CSharp.DependencyFetching.csproj
+++ b/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/Semmle.Extraction.CSharp.DependencyFetching.csproj
@@ -5,7 +5,7 @@
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\Semmle.Util\Semmle.Util.csproj" />
-    <ProjectReference Include="..\Semmle.Extraction\Semmle.Extraction.csproj" />
+    <ProjectReference Include="..\Semmle.Extraction.CSharp\Semmle.Extraction.CSharp.csproj" />
 
     <InternalsVisibleTo Include="Semmle.Extraction.Tests" />
   </ItemGroup>
diff --git a/csharp/extractor/Semmle.Extraction.CSharp.DependencyStubGenerator/Semmle.Extraction.CSharp.DependencyStubGenerator.csproj b/csharp/extractor/Semmle.Extraction.CSharp.DependencyStubGenerator/Semmle.Extraction.CSharp.DependencyStubGenerator.csproj
index a2925dc32af..9ec28298950 100644
--- a/csharp/extractor/Semmle.Extraction.CSharp.DependencyStubGenerator/Semmle.Extraction.CSharp.DependencyStubGenerator.csproj
+++ b/csharp/extractor/Semmle.Extraction.CSharp.DependencyStubGenerator/Semmle.Extraction.CSharp.DependencyStubGenerator.csproj
@@ -2,7 +2,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <AssemblyName>Semmle.Extraction.CSharp.DependencyStubGenerator</AssemblyName>
     <RootNamespace>Semmle.Extraction.CSharp.DependencyStubGenerator</RootNamespace>
     <ImplicitUsings>enable</ImplicitUsings>
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/BUILD.bazel b/csharp/extractor/Semmle.Extraction.CSharp/BUILD.bazel
index f5d36340bd6..42495f63ed4 100644
--- a/csharp/extractor/Semmle.Extraction.CSharp/BUILD.bazel
+++ b/csharp/extractor/Semmle.Extraction.CSharp/BUILD.bazel
@@ -6,17 +6,18 @@ load(
 codeql_csharp_library(
     name = "Semmle.Extraction.CSharp",
     srcs = glob([
+        "CodeAnalysisExtensions/**/*.cs",
         "Comments/**/*.cs",
         "Entities/**/*.cs",
         "Extractor/**/*.cs",
         "Kinds/**/*.cs",
         "Populators/**/*.cs",
+        "Trap/**/*.cs",
         "*.cs",
     ]),
     allow_unsafe_blocks = True,
     visibility = ["//csharp:__subpackages__"],
     deps = [
-        "//csharp/extractor/Semmle.Extraction",
         "//csharp/extractor/Semmle.Extraction.CSharp.Util",
         "//csharp/extractor/Semmle.Util",
         "@paket.main//basic.compilerlog.util",
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/CachedEntityFactory.cs b/csharp/extractor/Semmle.Extraction.CSharp/CachedEntityFactory.cs
deleted file mode 100644
index 2673ed0d7ef..00000000000
--- a/csharp/extractor/Semmle.Extraction.CSharp/CachedEntityFactory.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-namespace Semmle.Extraction.CSharp
-{
-    /// <summary>
-    /// A factory for creating cached entities.
-    /// </summary>
-    internal abstract class CachedEntityFactory<TInit, TEntity>
-        : Extraction.CachedEntityFactory<TInit, TEntity> where TEntity : CachedEntity
-    {
-        /// <summary>
-        /// Initializes the entity, but does not generate any trap code.
-        /// </summary>
-        public sealed override TEntity Create(Extraction.Context cx, TInit init)
-        {
-            return Create((Context)cx, init);
-        }
-
-        public abstract TEntity Create(Context cx, TInit init);
-    }
-}
diff --git a/csharp/extractor/Semmle.Extraction/LocationExtensions.cs b/csharp/extractor/Semmle.Extraction.CSharp/CodeAnalysisExtensions/LocationExtensions.cs
similarity index 98%
rename from csharp/extractor/Semmle.Extraction/LocationExtensions.cs
rename to csharp/extractor/Semmle.Extraction.CSharp/CodeAnalysisExtensions/LocationExtensions.cs
index f615fe65963..6d1d644e82c 100644
--- a/csharp/extractor/Semmle.Extraction/LocationExtensions.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp/CodeAnalysisExtensions/LocationExtensions.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using Microsoft.CodeAnalysis;
 
-namespace Semmle.Extraction
+namespace Semmle.Extraction.CSharp
 {
     public static class LocationExtensions
     {
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/SymbolExtensions.cs b/csharp/extractor/Semmle.Extraction.CSharp/CodeAnalysisExtensions/SymbolExtensions.cs
similarity index 100%
rename from csharp/extractor/Semmle.Extraction.CSharp/SymbolExtensions.cs
rename to csharp/extractor/Semmle.Extraction.CSharp/CodeAnalysisExtensions/SymbolExtensions.cs
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Comments/CommentBlock.cs b/csharp/extractor/Semmle.Extraction.CSharp/Comments/CommentBlock.cs
index 48dcd9f85a1..08db5bba013 100644
--- a/csharp/extractor/Semmle.Extraction.CSharp/Comments/CommentBlock.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp/Comments/CommentBlock.cs
@@ -12,7 +12,7 @@ namespace Semmle.Extraction.CSharp.Comments
 
         public IEnumerable<CommentLine> CommentLines => lines;
 
-        public Location Location { get; private set; }
+        public Microsoft.CodeAnalysis.Location Location { get; private set; }
 
         public CommentBlock(CommentLine firstLine)
         {
@@ -49,7 +49,7 @@ namespace Semmle.Extraction.CSharp.Comments
         {
             Location = !lines.Any()
                 ? line.Location
-                : Location.Create(
+                : Microsoft.CodeAnalysis.Location.Create(
                     line.Location.SourceTree!,
                     new TextSpan(Location.SourceSpan.Start, line.Location.SourceSpan.End - Location.SourceSpan.Start));
 
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Comments/CommentProcessor.cs b/csharp/extractor/Semmle.Extraction.CSharp/Comments/CommentProcessor.cs
index d8c9152bec1..6b6e363ba5f 100644
--- a/csharp/extractor/Semmle.Extraction.CSharp/Comments/CommentProcessor.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp/Comments/CommentProcessor.cs
@@ -19,10 +19,10 @@ namespace Semmle.Extraction.CSharp
         }
 
         // Comments sorted by location.
-        private readonly SortedDictionary<Location, CommentLine> comments = new SortedDictionary<Location, CommentLine>(new LocationComparer());
+        private readonly SortedDictionary<Microsoft.CodeAnalysis.Location, CommentLine> comments = new SortedDictionary<Microsoft.CodeAnalysis.Location, CommentLine>(new LocationComparer());
 
         // Program elements sorted by location.
-        private readonly SortedDictionary<Location, Label> elements = new SortedDictionary<Location, Label>(new LocationComparer());
+        private readonly SortedDictionary<Microsoft.CodeAnalysis.Location, Label> elements = new SortedDictionary<Microsoft.CodeAnalysis.Location, Label>(new LocationComparer());
 
         private readonly Dictionary<Label, Key> duplicationGuardKeys = new Dictionary<Label, Key>();
 
@@ -33,9 +33,9 @@ namespace Semmle.Extraction.CSharp
             return null;
         }
 
-        private class LocationComparer : IComparer<Location>
+        private class LocationComparer : IComparer<Microsoft.CodeAnalysis.Location>
         {
-            public int Compare(Location? l1, Location? l2) => CommentProcessor.Compare(l1, l2);
+            public int Compare(Microsoft.CodeAnalysis.Location? l1, Microsoft.CodeAnalysis.Location? l2) => CommentProcessor.Compare(l1, l2);
         }
 
         /// <summary>
@@ -44,7 +44,7 @@ namespace Semmle.Extraction.CSharp
         /// <param name="l1">First location</param>
         /// <param name="l2">Second location</param>
         /// <returns>&lt;0 if l1 before l2, &gt;0 if l1 after l2, else 0.</returns>
-        private static int Compare(Location? l1, Location? l2)
+        private static int Compare(Microsoft.CodeAnalysis.Location? l1, Microsoft.CodeAnalysis.Location? l2)
         {
             if (object.ReferenceEquals(l1, l2))
                 return 0;
@@ -68,7 +68,7 @@ namespace Semmle.Extraction.CSharp
         /// <param name="elementLabel">The label of the element in the trap file.</param>
         /// <param name="duplicationGuardKey">The duplication guard key of the element, if any.</param>
         /// <param name="loc">The location of the element.</param>
-        public void AddElement(Label elementLabel, Key? duplicationGuardKey, Location? loc)
+        public void AddElement(Label elementLabel, Key? duplicationGuardKey, Microsoft.CodeAnalysis.Location? loc)
         {
             if (loc is not null && loc.IsInSource)
                 elements[loc] = elementLabel;
@@ -78,7 +78,7 @@ namespace Semmle.Extraction.CSharp
 
         // Ensure that commentBlock and element refer to the same file
         // which can happen when processing multiple files.
-        private static void EnsureSameFile(Comments.CommentBlock commentBlock, ref KeyValuePair<Location, Label>? element)
+        private static void EnsureSameFile(Comments.CommentBlock commentBlock, ref KeyValuePair<Microsoft.CodeAnalysis.Location, Label>? element)
         {
             if (element is not null && element.Value.Key.SourceTree != commentBlock.Location.SourceTree)
                 element = null;
@@ -96,9 +96,9 @@ namespace Semmle.Extraction.CSharp
         /// <param name="callback">Output binding information.</param>
         private void GenerateBindings(
             Comments.CommentBlock commentBlock,
-            KeyValuePair<Location, Label>? previousElement,
-            KeyValuePair<Location, Label>? nextElement,
-            KeyValuePair<Location, Label>? parentElement,
+            KeyValuePair<Microsoft.CodeAnalysis.Location, Label>? previousElement,
+            KeyValuePair<Microsoft.CodeAnalysis.Location, Label>? nextElement,
+            KeyValuePair<Microsoft.CodeAnalysis.Location, Label>? parentElement,
             CommentBindingCallback callback
             )
         {
@@ -125,7 +125,7 @@ namespace Semmle.Extraction.CSharp
             }
 
             // Heuristic to decide which is the "best" element associated with the comment.
-            KeyValuePair<Location, Label>? bestElement;
+            KeyValuePair<Microsoft.CodeAnalysis.Location, Label>? bestElement;
 
             if (previousElement is not null && previousElement.Value.Key.EndLine() == commentBlock.Location.StartLine())
             {
@@ -180,14 +180,14 @@ namespace Semmle.Extraction.CSharp
         private class ElementStack
         {
             // Invariant: the top of the stack must be contained by items below it.
-            private readonly Stack<KeyValuePair<Location, Label>> elementStack = new Stack<KeyValuePair<Location, Label>>();
+            private readonly Stack<KeyValuePair<Microsoft.CodeAnalysis.Location, Label>> elementStack = new();
 
             /// <summary>
             /// Add a new element to the stack.
             /// </summary>
             /// The stack is maintained.
             /// <param name="value">The new element to push.</param>
-            public void Push(KeyValuePair<Location, Label> value)
+            public void Push(KeyValuePair<Microsoft.CodeAnalysis.Location, Label> value)
             {
                 // Maintain the invariant by popping existing elements
                 while (elementStack.Count > 0 && !elementStack.Peek().Key.Contains(value.Key))
@@ -201,7 +201,7 @@ namespace Semmle.Extraction.CSharp
             /// </summary>
             /// <param name="l">The location of the comment.</param>
             /// <returns>An element completely containing l, or null if none found.</returns>
-            public KeyValuePair<Location, Label>? FindParent(Location l) =>
+            public KeyValuePair<Microsoft.CodeAnalysis.Location, Label>? FindParent(Microsoft.CodeAnalysis.Location l) =>
                 elementStack.Where(v => v.Key.Contains(l)).FirstOrNull();
 
             /// <summary>
@@ -209,7 +209,7 @@ namespace Semmle.Extraction.CSharp
             /// </summary>
             /// <param name="l">The location of the comment.</param>
             /// <returns>The element before l, or null.</returns>
-            public KeyValuePair<Location, Label>? FindBefore(Location l)
+            public KeyValuePair<Microsoft.CodeAnalysis.Location, Label>? FindBefore(Microsoft.CodeAnalysis.Location l)
             {
                 return elementStack
                     .Where(v => v.Key.SourceSpan.End < l.SourceSpan.Start)
@@ -222,7 +222,7 @@ namespace Semmle.Extraction.CSharp
             /// <param name="comment">The location of the comment.</param>
             /// <param name="next">The next element.</param>
             /// <returns>The next element.</returns>
-            public KeyValuePair<Location, Label>? FindAfter(Location comment, KeyValuePair<Location, Label>? next)
+            public KeyValuePair<Microsoft.CodeAnalysis.Location, Label>? FindAfter(Microsoft.CodeAnalysis.Location comment, KeyValuePair<Microsoft.CodeAnalysis.Location, Label>? next)
             {
                 var p = FindParent(comment);
                 return next.HasValue && p.HasValue && p.Value.Key.Before(next.Value.Key) ? null : next;
@@ -233,7 +233,7 @@ namespace Semmle.Extraction.CSharp
         private void GenerateBindings(
             Comments.CommentBlock block,
             ElementStack elementStack,
-            KeyValuePair<Location, Label>? nextElement,
+            KeyValuePair<Microsoft.CodeAnalysis.Location, Label>? nextElement,
             CommentBindingCallback cb
             )
         {
@@ -259,8 +259,8 @@ namespace Semmle.Extraction.CSharp
         /// <param name="cb">Where to send the results.</param>
         /// <returns>true if there are more comments to process, false otherwise.</returns>
         private bool GenerateBindings(
-            IEnumerator<KeyValuePair<Location, CommentLine>> commentEnumerator,
-            KeyValuePair<Location, Label>? nextElement,
+            IEnumerator<KeyValuePair<Microsoft.CodeAnalysis.Location, CommentLine>> commentEnumerator,
+            KeyValuePair<Microsoft.CodeAnalysis.Location, Label>? nextElement,
             ElementStack elementStack,
             CommentBindingCallback cb
             )
@@ -319,8 +319,8 @@ namespace Semmle.Extraction.CSharp
 
             var elementStack = new ElementStack();
 
-            using IEnumerator<KeyValuePair<Location, Label>> elementEnumerator = elements.GetEnumerator();
-            using IEnumerator<KeyValuePair<Location, CommentLine>> commentEnumerator = comments.GetEnumerator();
+            using IEnumerator<KeyValuePair<Microsoft.CodeAnalysis.Location, Label>> elementEnumerator = elements.GetEnumerator();
+            using IEnumerator<KeyValuePair<Microsoft.CodeAnalysis.Location, CommentLine>> commentEnumerator = comments.GetEnumerator();
             if (!commentEnumerator.MoveNext())
             {
                 // There are no comments to process.
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Assembly.cs b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Assembly.cs
index 0fa9422e08c..cc36e41ff58 100644
--- a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Assembly.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Assembly.cs
@@ -3,10 +3,8 @@ using Microsoft.CodeAnalysis;
 
 namespace Semmle.Extraction.CSharp.Entities
 {
-    internal class Assembly : Extraction.Entities.Location
+    internal class Assembly : Location
     {
-        public override Context Context => (Context)base.Context;
-
         private readonly string assemblyPath;
         private readonly IAssemblySymbol assembly;
         private readonly bool isOutputAssembly;
@@ -56,7 +54,7 @@ namespace Semmle.Extraction.CSharp.Entities
             return false;
         }
 
-        public static Extraction.Entities.Location Create(Context cx, Microsoft.CodeAnalysis.Location loc) => AssemblyConstructorFactory.Instance.CreateEntity(cx, loc, loc);
+        public static Location Create(Context cx, Microsoft.CodeAnalysis.Location loc) => AssemblyConstructorFactory.Instance.CreateEntity(cx, loc, loc);
 
         private class AssemblyConstructorFactory : CachedEntityFactory<Microsoft.CodeAnalysis.Location?, Assembly>
         {
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Attribute.cs b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Attribute.cs
index a70b84dde1d..e4799c05507 100644
--- a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Attribute.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Attribute.cs
@@ -151,9 +151,9 @@ namespace Semmle.Extraction.CSharp.Entities
 
         public override Microsoft.CodeAnalysis.Location? ReportingLocation => attributeSyntax?.Name.GetLocation();
 
-        private Semmle.Extraction.Entities.Location? location;
+        private Location? location;
 
-        private Semmle.Extraction.Entities.Location Location =>
+        private Location Location =>
             location ??= Context.CreateLocation(attributeSyntax is null
                 ? entity.ReportingLocation
                 : attributeSyntax.Name.GetLocation());
diff --git a/csharp/extractor/Semmle.Extraction/Entities/Base/CachedEntity`1.cs b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Base/CachedEntity.cs
similarity index 98%
rename from csharp/extractor/Semmle.Extraction/Entities/Base/CachedEntity`1.cs
rename to csharp/extractor/Semmle.Extraction.CSharp/Entities/Base/CachedEntity.cs
index 82ded71a9cd..ed0a21bc083 100644
--- a/csharp/extractor/Semmle.Extraction/Entities/Base/CachedEntity`1.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Base/CachedEntity.cs
@@ -2,7 +2,7 @@ using System.Diagnostics.CodeAnalysis;
 using System.IO;
 using Microsoft.CodeAnalysis;
 
-namespace Semmle.Extraction
+namespace Semmle.Extraction.CSharp.Entities
 {
     /// <summary>
     /// A cached entity.
diff --git a/csharp/extractor/Semmle.Extraction/Entities/Base/CachedEntityFactory.cs b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Base/CachedEntityFactory.cs
similarity index 83%
rename from csharp/extractor/Semmle.Extraction/Entities/Base/CachedEntityFactory.cs
rename to csharp/extractor/Semmle.Extraction.CSharp/Entities/Base/CachedEntityFactory.cs
index 60c6a7cade1..fb8ce9cb7cf 100644
--- a/csharp/extractor/Semmle.Extraction/Entities/Base/CachedEntityFactory.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Base/CachedEntityFactory.cs
@@ -1,9 +1,9 @@
-namespace Semmle.Extraction
+namespace Semmle.Extraction.CSharp
 {
     /// <summary>
     /// A factory for creating cached entities.
     /// </summary>
-    public abstract class CachedEntityFactory<TInit, TEntity> where TEntity : CachedEntity
+    public abstract class CachedEntityFactory<TInit, TEntity> where TEntity : Entities.CachedEntity
     {
         /// <summary>
         /// Initializes the entity, but does not generate any trap code.
diff --git a/csharp/extractor/Semmle.Extraction/Entities/Base/CachedEntityFactoryExtensions.cs b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Base/CachedEntityFactoryExtensions.cs
similarity index 88%
rename from csharp/extractor/Semmle.Extraction/Entities/Base/CachedEntityFactoryExtensions.cs
rename to csharp/extractor/Semmle.Extraction.CSharp/Entities/Base/CachedEntityFactoryExtensions.cs
index f8a08298cca..d7ca1293e33 100644
--- a/csharp/extractor/Semmle.Extraction/Entities/Base/CachedEntityFactoryExtensions.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Base/CachedEntityFactoryExtensions.cs
@@ -1,6 +1,6 @@
 using Microsoft.CodeAnalysis;
 
-namespace Semmle.Extraction
+namespace Semmle.Extraction.CSharp
 {
     public static class CachedEntityFactoryExtensions
     {
@@ -16,7 +16,7 @@ namespace Semmle.Extraction
         /// <param name="init">The initializer for the entity.</param>
         /// <returns>The entity.</returns>
         public static TEntity CreateEntity<TInit, TEntity>(this CachedEntityFactory<TInit, TEntity> factory, Context cx, object cacheKey, TInit init)
-            where TEntity : CachedEntity => cx.CreateEntity(factory, cacheKey, init);
+            where TEntity : Entities.CachedEntity => cx.CreateEntity(factory, cacheKey, init);
 
         /// <summary>
         /// Creates and populates a new entity from an `ISymbol`, or returns the existing one
@@ -30,6 +30,6 @@ namespace Semmle.Extraction
         /// <returns>The entity.</returns>
         public static TEntity CreateEntityFromSymbol<TSymbol, TEntity>(this CachedEntityFactory<TSymbol, TEntity> factory, Context cx, TSymbol init)
             where TSymbol : ISymbol
-            where TEntity : CachedEntity => cx.CreateEntityFromSymbol(factory, init);
+            where TEntity : Entities.CachedEntity => cx.CreateEntityFromSymbol(factory, init);
     }
 }
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Entities/CachedSymbol.cs b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Base/CachedSymbol.cs
similarity index 95%
rename from csharp/extractor/Semmle.Extraction.CSharp/Entities/CachedSymbol.cs
rename to csharp/extractor/Semmle.Extraction.CSharp/Entities/Base/CachedSymbol.cs
index 4a4d483ea37..c39eb6076b5 100644
--- a/csharp/extractor/Semmle.Extraction.CSharp/Entities/CachedSymbol.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Base/CachedSymbol.cs
@@ -1,8 +1,6 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using System.Reflection.Metadata;
-using System.Reflection.Metadata.Ecma335;
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.CSharp.Syntax;
 
@@ -89,7 +87,7 @@ namespace Semmle.Extraction.CSharp.Entities
         /// </summary>
         public virtual Microsoft.CodeAnalysis.Location? FullLocation => Symbol.Locations.BestOrDefault();
 
-        public virtual IEnumerable<Extraction.Entities.Location> Locations
+        public virtual IEnumerable<Location> Locations
         {
             get
             {
@@ -143,6 +141,6 @@ namespace Semmle.Extraction.CSharp.Entities
 
         public override bool NeedsPopulation => Context.Defines(Symbol);
 
-        public Extraction.Entities.Location Location => Context.CreateLocation(ReportingLocation);
+        public Location Location => Context.CreateLocation(ReportingLocation);
     }
 }
diff --git a/csharp/extractor/Semmle.Extraction/Entities/Base/Entity.cs b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Base/Entity.cs
similarity index 96%
rename from csharp/extractor/Semmle.Extraction/Entities/Base/Entity.cs
rename to csharp/extractor/Semmle.Extraction.CSharp/Entities/Base/Entity.cs
index 9cd645ae1d4..ca1887b3be9 100644
--- a/csharp/extractor/Semmle.Extraction/Entities/Base/Entity.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Base/Entity.cs
@@ -2,11 +2,11 @@ using System;
 using System.IO;
 using Microsoft.CodeAnalysis;
 
-namespace Semmle.Extraction
+namespace Semmle.Extraction.CSharp
 {
     public abstract class Entity : IEntity
     {
-        public virtual Context Context { get; }
+        public Context Context { get; }
 
         protected Entity(Context context)
         {
diff --git a/csharp/extractor/Semmle.Extraction/Entities/Base/FreshEntity.cs b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Base/FreshEntity.cs
similarity index 95%
rename from csharp/extractor/Semmle.Extraction/Entities/Base/FreshEntity.cs
rename to csharp/extractor/Semmle.Extraction.CSharp/Entities/Base/FreshEntity.cs
index 7ecdab8086e..87776fa8c6b 100644
--- a/csharp/extractor/Semmle.Extraction/Entities/Base/FreshEntity.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Base/FreshEntity.cs
@@ -1,6 +1,6 @@
 using System.IO;
 
-namespace Semmle.Extraction
+namespace Semmle.Extraction.CSharp.Entities
 {
     /// <summary>
     /// An entity which has a default "*" ID assigned to it.
diff --git a/csharp/extractor/Semmle.Extraction/Entities/Base/IEntity.cs b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Base/IEntity.cs
similarity index 98%
rename from csharp/extractor/Semmle.Extraction/Entities/Base/IEntity.cs
rename to csharp/extractor/Semmle.Extraction.CSharp/Entities/Base/IEntity.cs
index 3700e61b22e..d8d3c538e42 100644
--- a/csharp/extractor/Semmle.Extraction/Entities/Base/IEntity.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Base/IEntity.cs
@@ -1,7 +1,7 @@
 using System.IO;
 using Microsoft.CodeAnalysis;
 
-namespace Semmle.Extraction
+namespace Semmle.Extraction.CSharp
 {
     /// <summary>
     /// Any program entity which has a corresponding label in the trap file.
diff --git a/csharp/extractor/Semmle.Extraction/Entities/Base/LabelledEntity.cs b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Base/LabelledEntity.cs
similarity index 80%
rename from csharp/extractor/Semmle.Extraction/Entities/Base/LabelledEntity.cs
rename to csharp/extractor/Semmle.Extraction.CSharp/Entities/Base/LabelledEntity.cs
index 4694332fd52..e458c935b0e 100644
--- a/csharp/extractor/Semmle.Extraction/Entities/Base/LabelledEntity.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Base/LabelledEntity.cs
@@ -1,4 +1,4 @@
-namespace Semmle.Extraction
+namespace Semmle.Extraction.CSharp
 {
     public abstract class LabelledEntity : Entity
     {
diff --git a/csharp/extractor/Semmle.Extraction/Entities/Base/UnlabelledEntity.cs b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Base/UnlabelledEntity.cs
similarity index 92%
rename from csharp/extractor/Semmle.Extraction/Entities/Base/UnlabelledEntity.cs
rename to csharp/extractor/Semmle.Extraction.CSharp/Entities/Base/UnlabelledEntity.cs
index 2faf15689ed..2bfcc35b274 100644
--- a/csharp/extractor/Semmle.Extraction/Entities/Base/UnlabelledEntity.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Base/UnlabelledEntity.cs
@@ -1,4 +1,4 @@
-namespace Semmle.Extraction
+namespace Semmle.Extraction.CSharp
 {
     public abstract class UnlabelledEntity : Entity
     {
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Entities/CachedEntity.cs b/csharp/extractor/Semmle.Extraction.CSharp/Entities/CachedEntity.cs
deleted file mode 100644
index 603a1d822b1..00000000000
--- a/csharp/extractor/Semmle.Extraction.CSharp/Entities/CachedEntity.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-namespace Semmle.Extraction.CSharp.Entities
-{
-    internal abstract class CachedEntity<T> : Extraction.CachedEntity<T> where T : notnull
-    {
-        public override Context Context => (Context)base.Context;
-
-        protected CachedEntity(Context context, T symbol)
-            : base(context, symbol)
-        {
-        }
-    }
-}
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Entities/CommentLine.cs b/csharp/extractor/Semmle.Extraction.CSharp/Entities/CommentLine.cs
index 9029eb071d4..7638eefce12 100644
--- a/csharp/extractor/Semmle.Extraction.CSharp/Entities/CommentLine.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp/Entities/CommentLine.cs
@@ -1,5 +1,4 @@
 using System.IO;
-using Semmle.Extraction.Entities;
 
 namespace Semmle.Extraction.CSharp.Entities
 {
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Compilations/Compilation.cs b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Compilations/Compilation.cs
index ecb5d51d44d..2c74775460d 100644
--- a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Compilations/Compilation.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Compilations/Compilation.cs
@@ -3,7 +3,6 @@ using System.Collections.Concurrent;
 using System.IO;
 using System.Linq;
 using Microsoft.CodeAnalysis;
-using Semmle.Extraction.Entities;
 using Semmle.Util;
 
 namespace Semmle.Extraction.CSharp.Entities
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Constructor.cs b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Constructor.cs
index 047a7b68ae6..c3ce2bb6d29 100644
--- a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Constructor.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Constructor.cs
@@ -116,7 +116,7 @@ namespace Semmle.Extraction.CSharp.Entities
             }
         }
 
-        private void ExtractSourceInitializer(TextWriter trapFile, ITypeSymbol? type, IMethodSymbol? symbol, ArgumentListSyntax arguments, Location location)
+        private void ExtractSourceInitializer(TextWriter trapFile, ITypeSymbol? type, IMethodSymbol? symbol, ArgumentListSyntax arguments, Microsoft.CodeAnalysis.Location location)
         {
             var initInfo = new ExpressionInfo(Context,
                 AnnotatedTypeSymbol.CreateNotAnnotated(type),
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Expression.cs b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Expression.cs
index cdd2964ff21..f5021d38eeb 100644
--- a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Expression.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Expression.cs
@@ -15,7 +15,7 @@ namespace Semmle.Extraction.CSharp.Entities
     {
         private readonly IExpressionInfo info;
         public AnnotatedTypeSymbol? Type { get; private set; }
-        public Extraction.Entities.Location Location { get; }
+        public Location Location { get; }
         public ExprKind Kind { get; }
 
         internal Expression(IExpressionInfo info, bool shouldPopulate = true)
@@ -62,7 +62,7 @@ namespace Semmle.Extraction.CSharp.Entities
             type.PopulateGenerics();
         }
 
-        public override Location? ReportingLocation => Location.Symbol;
+        public override Microsoft.CodeAnalysis.Location? ReportingLocation => Location.Symbol;
 
         internal void SetType(ITypeSymbol? type)
         {
@@ -138,7 +138,7 @@ namespace Semmle.Extraction.CSharp.Entities
         /// Creates a generated expression from a typed constant.
         /// </summary>
         public static Expression? CreateGenerated(Context cx, TypedConstant constant, IExpressionParentEntity parent,
-            int childIndex, Extraction.Entities.Location location)
+            int childIndex, Location location)
         {
             if (constant.IsNull ||
                 constant.Type is null)
@@ -176,7 +176,7 @@ namespace Semmle.Extraction.CSharp.Entities
         /// Creates a generated expression for a default argument value.
         /// </summary>
         public static Expression? CreateGenerated(Context cx, IParameterSymbol parameter, IExpressionParentEntity parent,
-            int childIndex, Extraction.Entities.Location location)
+            int childIndex, Location location)
         {
             if (!parameter.HasExplicitDefaultValue ||
                 parameter.Type is IErrorTypeSymbol)
@@ -315,7 +315,7 @@ namespace Semmle.Extraction.CSharp.Entities
 
         /// <summary>
         /// Given `b` in `a?.b.c`, return `(a?.b, a?.b)`.
-        /// 
+        ///
         /// Given `c` in `a?.b?.c.d`, return `(b?.c, a?.b?.c)`.
         /// </summary>
         /// <param name="node">A MemberBindingExpression.</param>
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Entities/ExpressionInfo.cs b/csharp/extractor/Semmle.Extraction.CSharp/Entities/ExpressionInfo.cs
index 3474ad4a818..8ebc0e2a0ef 100644
--- a/csharp/extractor/Semmle.Extraction.CSharp/Entities/ExpressionInfo.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp/Entities/ExpressionInfo.cs
@@ -10,14 +10,14 @@ namespace Semmle.Extraction.CSharp.Entities
     {
         public Context Context { get; }
         public AnnotatedTypeSymbol? Type { get; }
-        public Extraction.Entities.Location Location { get; }
+        public Location Location { get; }
         public ExprKind Kind { get; }
         public IExpressionParentEntity Parent { get; }
         public int Child { get; }
         public bool IsCompilerGenerated { get; }
         public string? ExprValue { get; }
 
-        public ExpressionInfo(Context cx, AnnotatedTypeSymbol? type, Extraction.Entities.Location location, ExprKind kind,
+        public ExpressionInfo(Context cx, AnnotatedTypeSymbol? type, Location location, ExprKind kind,
             IExpressionParentEntity parent, int child, bool isCompilerGenerated, string? value)
         {
             Context = cx;
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Entities/ExpressionNodeInfo.cs b/csharp/extractor/Semmle.Extraction.CSharp/Entities/ExpressionNodeInfo.cs
index a78f7e8c80b..924382a5550 100644
--- a/csharp/extractor/Semmle.Extraction.CSharp/Entities/ExpressionNodeInfo.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp/Entities/ExpressionNodeInfo.cs
@@ -115,9 +115,9 @@ namespace Semmle.Extraction.CSharp.Entities
             }
         }
 
-        private Extraction.Entities.Location? cachedLocation;
+        private Location? cachedLocation;
 
-        public Extraction.Entities.Location Location
+        public Location Location
         {
             get
             {
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Expressions/ArrayCreation.cs b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Expressions/ArrayCreation.cs
index 302bcaded39..72993e2db01 100644
--- a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Expressions/ArrayCreation.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Expressions/ArrayCreation.cs
@@ -88,7 +88,7 @@ namespace Semmle.Extraction.CSharp.Entities.Expressions
 
         public static Expression Create(ExpressionNodeInfo info) => new NormalArrayCreation(info).TryPopulate();
 
-        public static Expression CreateGenerated(Context cx, IExpressionParentEntity parent, int childIndex, ITypeSymbol type, IEnumerable<TypedConstant> items, Semmle.Extraction.Entities.Location location)
+        public static Expression CreateGenerated(Context cx, IExpressionParentEntity parent, int childIndex, ITypeSymbol type, IEnumerable<TypedConstant> items, Location location)
         {
             var info = new ExpressionInfo(
                 cx,
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Expressions/Cast.cs b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Expressions/Cast.cs
index 62e23e3b66d..20a5dc611a3 100644
--- a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Expressions/Cast.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Expressions/Cast.cs
@@ -32,7 +32,7 @@ namespace Semmle.Extraction.CSharp.Entities.Expressions
 
         public override Microsoft.CodeAnalysis.Location ReportingLocation => Syntax.GetLocation();
 
-        public static Expression CreateGenerated(Context cx, IExpressionParentEntity parent, int childIndex, Microsoft.CodeAnalysis.ITypeSymbol type, object? value, Action<Expression, int> createChild, Extraction.Entities.Location location)
+        public static Expression CreateGenerated(Context cx, IExpressionParentEntity parent, int childIndex, Microsoft.CodeAnalysis.ITypeSymbol type, object? value, Action<Expression, int> createChild, Location location)
         {
             var info = new ExpressionInfo(
                 cx,
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Expressions/Default.cs b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Expressions/Default.cs
index 968f2e8f43b..a7758e4243f 100644
--- a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Expressions/Default.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Expressions/Default.cs
@@ -15,7 +15,7 @@ namespace Semmle.Extraction.CSharp.Entities.Expressions
             TypeAccess.Create(Context, Syntax.Type, this, 0);
         }
 
-        public static Expression CreateGenerated(Context cx, IExpressionParentEntity parent, int childIndex, Extraction.Entities.Location location, string? value)
+        public static Expression CreateGenerated(Context cx, IExpressionParentEntity parent, int childIndex, Location location, string? value)
         {
             var info = new ExpressionInfo(
                 cx,
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Expressions/ImplicitCast.cs b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Expressions/ImplicitCast.cs
index 3e886a9c3ac..b0508bf83b7 100644
--- a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Expressions/ImplicitCast.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Expressions/ImplicitCast.cs
@@ -55,7 +55,7 @@ namespace Semmle.Extraction.CSharp.Entities.Expressions
         /// Creates a new generated expression with an implicit conversion added.
         /// </summary>
         public static Expression CreateGeneratedConversion(Context cx, IExpressionParentEntity parent, int childIndex, ITypeSymbol type, object value,
-            Extraction.Entities.Location location)
+            Location location)
         {
             ExpressionInfo create(ExprKind kind, string? v) =>
                 new ExpressionInfo(
@@ -85,7 +85,7 @@ namespace Semmle.Extraction.CSharp.Entities.Expressions
         /// Creates a new generated cast expression.
         /// </summary>
         public static Expression CreateGenerated(Context cx, IExpressionParentEntity parent, int childIndex, ITypeSymbol type, object value,
-                    Extraction.Entities.Location location)
+                    Location location)
         {
             var info = new ExpressionInfo(cx,
                     AnnotatedTypeSymbol.CreateNotAnnotated(type),
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Expressions/Initializer.cs b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Expressions/Initializer.cs
index cdc2e87798e..92e2b910f99 100644
--- a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Expressions/Initializer.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Expressions/Initializer.cs
@@ -36,7 +36,7 @@ namespace Semmle.Extraction.CSharp.Entities.Expressions
             }
         }
 
-        public static Expression CreateGenerated(Context cx, IExpressionParentEntity parent, int index, Extraction.Entities.Location location)
+        public static Expression CreateGenerated(Context cx, IExpressionParentEntity parent, int index, Location location)
         {
             var info = new ExpressionInfo(
                 cx,
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Expressions/Literal.cs b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Expressions/Literal.cs
index 72d54abf6c1..d471839f97a 100644
--- a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Expressions/Literal.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Expressions/Literal.cs
@@ -37,7 +37,7 @@ namespace Semmle.Extraction.CSharp.Entities.Expressions
             return GetExprKind(type, info.Node, info.Location, info.Context);
         }
 
-        private static ExprKind GetExprKind(ITypeSymbol? type, ExpressionSyntax? expr, Extraction.Entities.Location loc, Context context)
+        private static ExprKind GetExprKind(ITypeSymbol? type, ExpressionSyntax? expr, Location loc, Context context)
         {
             switch (type?.SpecialType)
             {
@@ -87,7 +87,7 @@ namespace Semmle.Extraction.CSharp.Entities.Expressions
         }
 
         public static Expression CreateGenerated(Context cx, IExpressionParentEntity parent, int childIndex, ITypeSymbol type, object? value,
-            Extraction.Entities.Location location)
+            Location location)
         {
             var kind = value is null ? ExprKind.NULL_LITERAL : GetExprKind(type, null, location, cx);
             var info = new ExpressionInfo(
@@ -103,7 +103,7 @@ namespace Semmle.Extraction.CSharp.Entities.Expressions
             return new Expression(info);
         }
 
-        public static Expression CreateGeneratedNullLiteral(Context cx, IExpressionParentEntity parent, int childIndex, Extraction.Entities.Location location)
+        public static Expression CreateGeneratedNullLiteral(Context cx, IExpressionParentEntity parent, int childIndex, Location location)
         {
             var info = new ExpressionInfo(
                 cx,
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Expressions/ObjectCreation/DateTimeObjectCreation.cs b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Expressions/ObjectCreation/DateTimeObjectCreation.cs
index 012a30d81cc..98f7a8bce92 100644
--- a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Expressions/ObjectCreation/DateTimeObjectCreation.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Expressions/ObjectCreation/DateTimeObjectCreation.cs
@@ -49,7 +49,7 @@ namespace Semmle.Extraction.CSharp.Entities.Expressions
         // The `type` symbol must be a System.DateTime type and the value must be a System.DateTime object.
         // The expression that is being created is a call to the System.DateTime(long) constructor, where
         // the number of ticks from the `value` object is used as the argument to the constructor call.
-        public static Expression CreateGenerated(Context cx, IExpressionParentEntity parent, int childIndex, ITypeSymbol type, object? value, Extraction.Entities.Location location)
+        public static Expression CreateGenerated(Context cx, IExpressionParentEntity parent, int childIndex, ITypeSymbol type, object? value, Location location)
         {
             var constructorSymbol = GetDateTimeConstructor(type) ?? throw new InternalError("Could not find symbol for System.DateTime(long)");
             var expr = new DateTimeObjectCreation(constructorSymbol, new ExpressionInfo(
@@ -68,4 +68,4 @@ namespace Semmle.Extraction.CSharp.Entities.Expressions
             return expr.TryPopulate();
         }
     }
-}
\ No newline at end of file
+}
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Expressions/This.cs b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Expressions/This.cs
index 33f2ad9fbc7..53dfc84de09 100644
--- a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Expressions/This.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Expressions/This.cs
@@ -7,7 +7,7 @@ namespace Semmle.Extraction.CSharp.Entities.Expressions
     {
         private This(IExpressionInfo info) : base(info) { }
 
-        public static This CreateImplicit(Context cx, ITypeSymbol @class, Extraction.Entities.Location loc, IExpressionParentEntity parent, int child) =>
+        public static This CreateImplicit(Context cx, ITypeSymbol @class, Location loc, IExpressionParentEntity parent, int child) =>
             new This(new ExpressionInfo(cx, AnnotatedTypeSymbol.CreateNotAnnotated(@class), loc, Kinds.ExprKind.THIS_ACCESS, parent, child, isCompilerGenerated: true, null));
 
         public static This CreateExplicit(ExpressionNodeInfo info) => new This(info.SetKind(ExprKind.THIS_ACCESS));
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Expressions/TypeAccess.cs b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Expressions/TypeAccess.cs
index b4e678d8ab6..55afd83318e 100644
--- a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Expressions/TypeAccess.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Expressions/TypeAccess.cs
@@ -35,7 +35,7 @@ namespace Semmle.Extraction.CSharp.Entities.Expressions
 
         public static Expression Create(ExpressionNodeInfo info) => new TypeAccess(info).TryPopulate();
 
-        public static Expression CreateGenerated(Context cx, IExpressionParentEntity parent, int childIndex, Microsoft.CodeAnalysis.ITypeSymbol type, Extraction.Entities.Location location)
+        public static Expression CreateGenerated(Context cx, IExpressionParentEntity parent, int childIndex, Microsoft.CodeAnalysis.ITypeSymbol type, Location location)
         {
             var typeAccessInfo = new ExpressionInfo(
                 cx,
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Expressions/TypeOf.cs b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Expressions/TypeOf.cs
index b36c1e425a0..cb205d383ac 100644
--- a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Expressions/TypeOf.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Expressions/TypeOf.cs
@@ -17,7 +17,7 @@ namespace Semmle.Extraction.CSharp.Entities.Expressions
             TypeAccess.Create(Context, Syntax.Type, this, TypeAccessIndex);
         }
 
-        public static Expression CreateGenerated(Context cx, IExpressionParentEntity parent, int childIndex, Microsoft.CodeAnalysis.ITypeSymbol type, Extraction.Entities.Location location)
+        public static Expression CreateGenerated(Context cx, IExpressionParentEntity parent, int childIndex, Microsoft.CodeAnalysis.ITypeSymbol type, Location location)
         {
             var info = new ExpressionInfo(
                 cx,
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Expressions/VariableDeclaration.cs b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Expressions/VariableDeclaration.cs
index 5931feb070c..c44f9e2b946 100644
--- a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Expressions/VariableDeclaration.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Expressions/VariableDeclaration.cs
@@ -13,7 +13,7 @@ namespace Semmle.Extraction.CSharp.Entities.Expressions
     {
         private VariableDeclaration(IExpressionInfo info) : base(info) { }
 
-        public static VariableDeclaration Create(Context cx, ISymbol symbol, AnnotatedTypeSymbol? type, TypeSyntax? optionalSyntax, Extraction.Entities.Location exprLocation, bool isVar, IExpressionParentEntity parent, int child)
+        public static VariableDeclaration Create(Context cx, ISymbol symbol, AnnotatedTypeSymbol? type, TypeSyntax? optionalSyntax, Location exprLocation, bool isVar, IExpressionParentEntity parent, int child)
         {
             var ret = new VariableDeclaration(new ExpressionInfo(cx, type, exprLocation, ExprKind.LOCAL_VAR_DECL, parent, child, isCompilerGenerated: false, null));
             cx.Try(null, null, () =>
diff --git a/csharp/extractor/Semmle.Extraction/Entities/ExtractionMessage.cs b/csharp/extractor/Semmle.Extraction.CSharp/Entities/ExtractionMessage.cs
similarity index 93%
rename from csharp/extractor/Semmle.Extraction/Entities/ExtractionMessage.cs
rename to csharp/extractor/Semmle.Extraction.CSharp/Entities/ExtractionMessage.cs
index 514ce433c0a..f8a771ae6d0 100644
--- a/csharp/extractor/Semmle.Extraction/Entities/ExtractionMessage.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp/Entities/ExtractionMessage.cs
@@ -3,7 +3,7 @@ using System.IO;
 using System.Threading;
 using Semmle.Util;
 
-namespace Semmle.Extraction.Entities
+namespace Semmle.Extraction.CSharp.Entities
 {
     internal class ExtractionMessage : FreshEntity
     {
@@ -40,7 +40,7 @@ namespace Semmle.Extraction.Entities
                     if (val == limit + 1)
                     {
                         Context.ExtractionContext.Logger.LogWarning($"Stopped logging extractor messages after reaching {limit}");
-                        _ = new ExtractionMessage(Context, new Message($"Stopped logging extractor messages after reaching {limit}", null, null, null, Util.Logging.Severity.Warning), bypassLimit: true);
+                        _ = new ExtractionMessage(Context, new Message($"Stopped logging extractor messages after reaching {limit}", null, null, null, Semmle.Util.Logging.Severity.Warning), bypassLimit: true);
                     }
                     return;
                 }
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Field.cs b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Field.cs
index 4894da062e3..0a91eb57ecd 100644
--- a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Field.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Field.cs
@@ -4,7 +4,6 @@ using System.Linq;
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.CSharp.Syntax;
 using Semmle.Extraction.CSharp.Entities.Expressions;
-using Semmle.Extraction.Entities;
 using Semmle.Extraction.Kinds;
 
 namespace Semmle.Extraction.CSharp.Entities
@@ -105,7 +104,7 @@ namespace Semmle.Extraction.CSharp.Entities
             }
         }
 
-        private Expression AddInitializerAssignment(TextWriter trapFile, ExpressionSyntax initializer, Extraction.Entities.Location loc,
+        private Expression AddInitializerAssignment(TextWriter trapFile, ExpressionSyntax initializer, Location loc,
             string? constValue, ref int child)
         {
             var type = Symbol.GetAnnotatedType();
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Entities/FreshEntity.cs b/csharp/extractor/Semmle.Extraction.CSharp/Entities/FreshEntity.cs
deleted file mode 100644
index 79144e109d4..00000000000
--- a/csharp/extractor/Semmle.Extraction.CSharp/Entities/FreshEntity.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-namespace Semmle.Extraction.CSharp.Entities
-{
-    internal abstract class FreshEntity : Extraction.FreshEntity
-    {
-        public override Context Context => (Context)base.Context;
-
-        protected FreshEntity(Context cx)
-            : base(cx)
-        {
-        }
-    }
-}
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Entities/IExpressionInfo.cs b/csharp/extractor/Semmle.Extraction.CSharp/Entities/IExpressionInfo.cs
index ea43b19456c..167ad806671 100644
--- a/csharp/extractor/Semmle.Extraction.CSharp/Entities/IExpressionInfo.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp/Entities/IExpressionInfo.cs
@@ -18,7 +18,7 @@ namespace Semmle.Extraction.CSharp.Entities
         /// <summary>
         /// The location of the expression.
         /// </summary>
-        Extraction.Entities.Location Location { get; }
+        Location Location { get; }
 
         /// <summary>
         /// The kind of the expression.
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Entities/File.cs b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Locations/File.cs
similarity index 74%
rename from csharp/extractor/Semmle.Extraction.CSharp/Entities/File.cs
rename to csharp/extractor/Semmle.Extraction.CSharp/Entities/Locations/File.cs
index 9a2d0475c58..61c4bb3e7cc 100644
--- a/csharp/extractor/Semmle.Extraction.CSharp/Entities/File.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Locations/File.cs
@@ -6,21 +6,36 @@ using Semmle.Util;
 
 namespace Semmle.Extraction.CSharp.Entities
 {
-    internal class File : Extraction.Entities.File
+    public class File : CachedEntity<string>
     {
-        public override Context Context => (Context)base.Context;
+        protected readonly string originalPath;
+        private readonly Lazy<PathTransformer.ITransformedPath> transformedPathLazy;
+        protected PathTransformer.ITransformedPath TransformedPath => transformedPathLazy.Value;
+        public override Microsoft.CodeAnalysis.Location? ReportingLocation => null;
+
+        public override bool NeedsPopulation => true;
 
         protected File(Context cx, string path)
             : base(cx, path)
         {
+            originalPath = path;
+            var adjustedPath = BinaryLogExtractionContext.GetAdjustedPath(Context.ExtractionContext, originalPath) ?? path;
+            transformedPathLazy = new Lazy<PathTransformer.ITransformedPath>(() => Context.ExtractionContext.PathTransformer.Transform(adjustedPath));
         }
 
+        public override void WriteId(EscapingTextWriter trapFile)
+        {
+            trapFile.Write(TransformedPath.DatabaseId);
+            trapFile.Write(";sourcefile");
+        }
+
+
         public override void Populate(TextWriter trapFile)
         {
             trapFile.files(this, TransformedPath.Value);
 
             if (TransformedPath.ParentDirectory is PathTransformer.ITransformedPath dir)
-                trapFile.containerparent(Extraction.Entities.Folder.Create(Context, dir), this);
+                trapFile.containerparent(Folder.Create(Context, dir), this);
 
             var trees = Context.Compilation.SyntaxTrees.Where(t => t.FilePath == originalPath);
 
@@ -64,7 +79,7 @@ namespace Semmle.Extraction.CSharp.Entities
                 }
                 catch (Exception exc)
                 {
-                    Context.ExtractionError($"Couldn't read file: {originalPath}. {exc.Message}", null, null, exc.StackTrace);
+                    Context.ExtractionError($"Couldn't read file: {originalPath}. {exc.Message}", null, null, exc.StackTrace, Semmle.Util.Logging.Severity.Warning);
                 }
             }
 
diff --git a/csharp/extractor/Semmle.Extraction/Entities/Folder.cs b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Locations/Folder.cs
similarity index 97%
rename from csharp/extractor/Semmle.Extraction/Entities/Folder.cs
rename to csharp/extractor/Semmle.Extraction.CSharp/Entities/Locations/Folder.cs
index 465d545d983..bef3e23ee2b 100644
--- a/csharp/extractor/Semmle.Extraction/Entities/Folder.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Locations/Folder.cs
@@ -1,6 +1,6 @@
 using System.IO;
 
-namespace Semmle.Extraction.Entities
+namespace Semmle.Extraction.CSharp.Entities
 {
     public sealed class Folder : CachedEntity<PathTransformer.ITransformedPath>
     {
diff --git a/csharp/extractor/Semmle.Extraction/Entities/GeneratedFile.cs b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Locations/GeneratedFile.cs
similarity index 95%
rename from csharp/extractor/Semmle.Extraction/Entities/GeneratedFile.cs
rename to csharp/extractor/Semmle.Extraction.CSharp/Entities/Locations/GeneratedFile.cs
index b4a771f53db..5a62619fd06 100644
--- a/csharp/extractor/Semmle.Extraction/Entities/GeneratedFile.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Locations/GeneratedFile.cs
@@ -1,6 +1,6 @@
 using System.IO;
 
-namespace Semmle.Extraction.Entities
+namespace Semmle.Extraction.CSharp.Entities
 {
     internal class GeneratedFile : File
     {
diff --git a/csharp/extractor/Semmle.Extraction/Entities/GeneratedLocation.cs b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Locations/GeneratedLocation.cs
similarity index 96%
rename from csharp/extractor/Semmle.Extraction/Entities/GeneratedLocation.cs
rename to csharp/extractor/Semmle.Extraction.CSharp/Entities/Locations/GeneratedLocation.cs
index db552f7e452..d12f1ca51e0 100644
--- a/csharp/extractor/Semmle.Extraction/Entities/GeneratedLocation.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Locations/GeneratedLocation.cs
@@ -1,6 +1,6 @@
 using System.IO;
 
-namespace Semmle.Extraction.Entities
+namespace Semmle.Extraction.CSharp.Entities
 {
     public class GeneratedLocation : SourceLocation
     {
diff --git a/csharp/extractor/Semmle.Extraction/Entities/Location.cs b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Locations/Location.cs
similarity index 91%
rename from csharp/extractor/Semmle.Extraction/Entities/Location.cs
rename to csharp/extractor/Semmle.Extraction.CSharp/Entities/Locations/Location.cs
index d77fb46544d..9f9e15e33f3 100644
--- a/csharp/extractor/Semmle.Extraction/Entities/Location.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Locations/Location.cs
@@ -1,4 +1,4 @@
-namespace Semmle.Extraction.Entities
+namespace Semmle.Extraction.CSharp.Entities
 {
 #nullable disable warnings
     public abstract class Location : CachedEntity<Microsoft.CodeAnalysis.Location?>
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Entities/NonGeneratedSourceLocation.cs b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Locations/NonGeneratedSourceLocation.cs
similarity index 77%
rename from csharp/extractor/Semmle.Extraction.CSharp/Entities/NonGeneratedSourceLocation.cs
rename to csharp/extractor/Semmle.Extraction.CSharp/Entities/Locations/NonGeneratedSourceLocation.cs
index df41abd524d..69e9ea4e9dc 100644
--- a/csharp/extractor/Semmle.Extraction.CSharp/Entities/NonGeneratedSourceLocation.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Locations/NonGeneratedSourceLocation.cs
@@ -1,22 +1,18 @@
-using System;
 using System.IO;
 using Microsoft.CodeAnalysis;
-using Semmle.Util.Logging;
 
 namespace Semmle.Extraction.CSharp.Entities
 {
-    internal class NonGeneratedSourceLocation : Extraction.Entities.SourceLocation
+    internal class NonGeneratedSourceLocation : SourceLocation
     {
-        public override Context Context => (Context)base.Context;
-
-        protected NonGeneratedSourceLocation(Context cx, Location init)
+        protected NonGeneratedSourceLocation(Context cx, Microsoft.CodeAnalysis.Location init)
             : base(cx, init)
         {
             Position = init.GetLineSpan();
             FileEntity = File.Create(Context, Position.Path);
         }
 
-        public static NonGeneratedSourceLocation Create(Context cx, Location loc) => SourceLocationFactory.Instance.CreateEntity(cx, loc, loc);
+        public static NonGeneratedSourceLocation Create(Context cx, Microsoft.CodeAnalysis.Location loc) => SourceLocationFactory.Instance.CreateEntity(cx, loc, loc);
 
         public override void Populate(TextWriter trapFile)
         {
@@ -28,7 +24,7 @@ namespace Semmle.Extraction.CSharp.Entities
             if (mapped.HasMappedPath && mapped.IsValid)
             {
                 var path = Context.TryAdjustRelativeMappedFilePath(mapped.Path, Position.Path);
-                var mappedLoc = Create(Context, Location.Create(path, default, mapped.Span));
+                var mappedLoc = Create(Context, Microsoft.CodeAnalysis.Location.Create(path, default, mapped.Span));
 
                 trapFile.locations_mapped(this, mappedLoc);
             }
@@ -58,11 +54,11 @@ namespace Semmle.Extraction.CSharp.Entities
             trapFile.Write(Position.Span.End.Character);
         }
 
-        private class SourceLocationFactory : CachedEntityFactory<Location, NonGeneratedSourceLocation>
+        private class SourceLocationFactory : CachedEntityFactory<Microsoft.CodeAnalysis.Location, NonGeneratedSourceLocation>
         {
             public static SourceLocationFactory Instance { get; } = new SourceLocationFactory();
 
-            public override NonGeneratedSourceLocation Create(Context cx, Location init) => new NonGeneratedSourceLocation(cx, init);
+            public override NonGeneratedSourceLocation Create(Context cx, Microsoft.CodeAnalysis.Location init) => new NonGeneratedSourceLocation(cx, init);
         }
     }
 }
diff --git a/csharp/extractor/Semmle.Extraction/Entities/SourceLocation.cs b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Locations/SourceLocation.cs
similarity index 84%
rename from csharp/extractor/Semmle.Extraction/Entities/SourceLocation.cs
rename to csharp/extractor/Semmle.Extraction.CSharp/Entities/Locations/SourceLocation.cs
index d126f552165..382a4899a83 100644
--- a/csharp/extractor/Semmle.Extraction/Entities/SourceLocation.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Locations/SourceLocation.cs
@@ -1,4 +1,4 @@
-namespace Semmle.Extraction.Entities
+namespace Semmle.Extraction.CSharp.Entities
 {
     public abstract class SourceLocation : Location
     {
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Method.cs b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Method.cs
index c1a2082a3ba..6890ca49084 100644
--- a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Method.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Method.cs
@@ -290,7 +290,7 @@ namespace Semmle.Extraction.CSharp.Entities
 
         public Method OriginalDefinition => Create(Context, Symbol.OriginalDefinition);
 
-        public override Location? FullLocation => ReportingLocation;
+        public override Microsoft.CodeAnalysis.Location? FullLocation => ReportingLocation;
 
         public override bool IsSourceDeclaration => Symbol.IsSourceDeclaration();
 
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Modifier.cs b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Modifier.cs
index 390311ca94b..cb1bb6e930d 100644
--- a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Modifier.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Modifier.cs
@@ -3,12 +3,12 @@ using Microsoft.CodeAnalysis;
 
 namespace Semmle.Extraction.CSharp.Entities
 {
-    internal class Modifier : Extraction.CachedEntity<string>
+    internal class Modifier : CachedEntity<string>
     {
         private Modifier(Context cx, string init)
             : base(cx, init) { }
 
-        public override Location? ReportingLocation => null;
+        public override Microsoft.CodeAnalysis.Location? ReportingLocation => null;
 
         public override void WriteId(EscapingTextWriter trapFile)
         {
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Namespace.cs b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Namespace.cs
index 874d8e1b69f..e431ff0a720 100644
--- a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Namespace.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Namespace.cs
@@ -8,7 +8,7 @@ namespace Semmle.Extraction.CSharp.Entities
         private Namespace(Context cx, INamespaceSymbol init)
             : base(cx, init) { }
 
-        public override Location? ReportingLocation => null;
+        public override Microsoft.CodeAnalysis.Location? ReportingLocation => null;
 
         public override void Populate(TextWriter trapFile)
         {
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Parameter.cs b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Parameter.cs
index 8c6a65ad553..76d518776ca 100644
--- a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Parameter.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Parameter.cs
@@ -4,7 +4,6 @@ using System.Linq;
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.CSharp.Syntax;
 using Semmle.Extraction.CSharp.Populators;
-using Semmle.Extraction.Entities;
 
 namespace Semmle.Extraction.CSharp.Entities
 {
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Statement`1.cs b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Statement`1.cs
index 0d7bdd31354..3b16cfc31f0 100644
--- a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Statement`1.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Statement`1.cs
@@ -1,7 +1,6 @@
 using System.IO;
 using Microsoft.CodeAnalysis.CSharp;
 using Semmle.Extraction.CSharp.Populators;
-using Semmle.Extraction.Entities;
 
 namespace Semmle.Extraction.CSharp.Entities
 {
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Statements/SyntheticEmptyBlock.cs b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Statements/SyntheticEmptyBlock.cs
index 670d338d2b3..6d6ebba24fb 100644
--- a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Statements/SyntheticEmptyBlock.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Statements/SyntheticEmptyBlock.cs
@@ -1,7 +1,6 @@
 using System.IO;
 using Microsoft.CodeAnalysis.CSharp;
 using Microsoft.CodeAnalysis.CSharp.Syntax;
-using Semmle.Extraction.Entities;
 using Semmle.Extraction.Kinds;
 
 namespace Semmle.Extraction.CSharp.Entities.Statements
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Types/NamedType.cs b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Types/NamedType.cs
index 75a931e2266..189a07f6f47 100644
--- a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Types/NamedType.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Types/NamedType.cs
@@ -101,7 +101,7 @@ namespace Semmle.Extraction.CSharp.Entities
 
         public override IEnumerable<Type> TypeMentions => TypeArguments;
 
-        public override IEnumerable<Extraction.Entities.Location> Locations
+        public override IEnumerable<Location> Locations
         {
             get
             {
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Types/Nullability.cs b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Types/Nullability.cs
index 67a68958a0f..9791f386a19 100644
--- a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Types/Nullability.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Types/Nullability.cs
@@ -102,7 +102,7 @@ namespace Semmle.Extraction.CSharp.Entities
         {
         }
 
-        public override Location ReportingLocation => throw new System.NotImplementedException();
+        public override Microsoft.CodeAnalysis.Location ReportingLocation => throw new System.NotImplementedException();
 
         public override bool NeedsPopulation => true;
 
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Types/TypeParameterConstraints.cs b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Types/TypeParameterConstraints.cs
index 8684c0b820d..6f85759dee0 100644
--- a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Types/TypeParameterConstraints.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Types/TypeParameterConstraints.cs
@@ -49,7 +49,7 @@ namespace Semmle.Extraction.CSharp.Entities
             }
         }
 
-        public override Location? ReportingLocation => null;
+        public override Microsoft.CodeAnalysis.Location? ReportingLocation => null;
 
         public static TypeParameterConstraints Create(Context cx, TypeParameter p) =>
             TypeParameterConstraintsFactory.Instance.CreateEntity(cx, (typeof(TypeParameterConstraints), p), p);
@@ -62,4 +62,3 @@ namespace Semmle.Extraction.CSharp.Entities
         }
     }
 }
-
diff --git a/csharp/extractor/Semmle.Extraction/AssemblyScope.cs b/csharp/extractor/Semmle.Extraction.CSharp/Extractor/AssemblyScope.cs
similarity index 95%
rename from csharp/extractor/Semmle.Extraction/AssemblyScope.cs
rename to csharp/extractor/Semmle.Extraction.CSharp/Extractor/AssemblyScope.cs
index 27c9377bb30..a09eba671c7 100644
--- a/csharp/extractor/Semmle.Extraction/AssemblyScope.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp/Extractor/AssemblyScope.cs
@@ -1,6 +1,6 @@
 using Microsoft.CodeAnalysis;
 
-namespace Semmle.Extraction
+namespace Semmle.Extraction.CSharp
 {
     /// <summary>
     /// The scope of symbols in an assembly.
diff --git a/csharp/extractor/Semmle.Extraction/Extractor/BinaryLogExtractionContext.cs b/csharp/extractor/Semmle.Extraction.CSharp/Extractor/BinaryLogExtractionContext.cs
similarity index 98%
rename from csharp/extractor/Semmle.Extraction/Extractor/BinaryLogExtractionContext.cs
rename to csharp/extractor/Semmle.Extraction.CSharp/Extractor/BinaryLogExtractionContext.cs
index 5e3ac901bb0..e4ad5f83e2a 100644
--- a/csharp/extractor/Semmle.Extraction/Extractor/BinaryLogExtractionContext.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp/Extractor/BinaryLogExtractionContext.cs
@@ -4,7 +4,7 @@ using System.Linq;
 using Microsoft.CodeAnalysis;
 using Semmle.Util.Logging;
 
-namespace Semmle.Extraction
+namespace Semmle.Extraction.CSharp
 {
     public class BinaryLogExtractionContext : ExtractionContext
     {
diff --git a/csharp/extractor/Semmle.Extraction/Options.cs b/csharp/extractor/Semmle.Extraction.CSharp/Extractor/CommonOptions.cs
similarity index 99%
rename from csharp/extractor/Semmle.Extraction/Options.cs
rename to csharp/extractor/Semmle.Extraction.CSharp/Extractor/CommonOptions.cs
index ba809e7cfcb..3595096c186 100644
--- a/csharp/extractor/Semmle.Extraction/Options.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp/Extractor/CommonOptions.cs
@@ -2,7 +2,7 @@ using System;
 using Semmle.Util;
 using Semmle.Util.Logging;
 
-namespace Semmle.Extraction
+namespace Semmle.Extraction.CSharp
 {
     /// <summary>
     /// Represents the parsed state of the command line arguments.
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Extractor/Context.cs b/csharp/extractor/Semmle.Extraction.CSharp/Extractor/Context.cs
index 654ce0cc0f5..8d819d715f9 100644
--- a/csharp/extractor/Semmle.Extraction.CSharp/Extractor/Context.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp/Extractor/Context.cs
@@ -2,8 +2,9 @@ using System;
 using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
 using System.IO;
+using System.Linq;
 using Microsoft.CodeAnalysis;
-using Semmle.Extraction.Entities;
+using Semmle.Util.Logging;
 
 namespace Semmle.Extraction.CSharp
 {
@@ -11,8 +12,453 @@ namespace Semmle.Extraction.CSharp
     /// State that needs to be available throughout the extraction process.
     /// There is one Context object per trap output file.
     /// </summary>
-    internal class Context : Extraction.Context
+    public class Context
     {
+        /// <summary>
+        /// Access various extraction functions, e.g. logger, trap writer.
+        /// </summary>
+        public ExtractionContext ExtractionContext { get; }
+
+        /// <summary>
+        /// Access to the trap file.
+        /// </summary>
+        public TrapWriter TrapWriter { get; }
+
+        /// <summary>
+        /// Holds if assembly information should be prefixed to TRAP labels.
+        /// </summary>
+        public bool ShouldAddAssemblyTrapPrefix { get; }
+
+        public IList<object> TrapStackSuffix { get; } = new List<object>();
+
+        private int GetNewId() => TrapWriter.IdCounter++;
+
+        // A recursion guard against writing to the trap file whilst writing an id to the trap file.
+        private bool writingLabel = false;
+
+        private readonly Queue<IEntity> labelQueue = [];
+
+        protected void DefineLabel(IEntity entity)
+        {
+            if (writingLabel)
+            {
+                // Don't define a label whilst writing a label.
+                labelQueue.Enqueue(entity);
+            }
+            else
+            {
+                try
+                {
+                    writingLabel = true;
+                    entity.DefineLabel(TrapWriter.Writer);
+                }
+                finally
+                {
+                    writingLabel = false;
+                    if (labelQueue.Any())
+                    {
+                        DefineLabel(labelQueue.Dequeue());
+                    }
+                }
+            }
+        }
+
+#if DEBUG_LABELS
+        private void CheckEntityHasUniqueLabel(string id, CachedEntity entity)
+        {
+            if (idLabelCache.ContainsKey(id))
+            {
+                this.Extractor.Message(new Message("Label collision for " + id, entity.Label.ToString(), CreateLocation(entity.ReportingLocation), "", Severity.Warning));
+            }
+            else
+            {
+                idLabelCache[id] = entity;
+            }
+        }
+#endif
+
+        protected Label GetNewLabel() => new Label(GetNewId());
+
+        internal TEntity CreateEntity<TInit, TEntity>(CachedEntityFactory<TInit, TEntity> factory, object cacheKey, TInit init)
+            where TEntity : Entities.CachedEntity =>
+                cacheKey is ISymbol s ? CreateEntity(factory, s, init, symbolEntityCache) : CreateEntity(factory, cacheKey, init, objectEntityCache);
+
+        internal TEntity CreateEntityFromSymbol<TSymbol, TEntity>(CachedEntityFactory<TSymbol, TEntity> factory, TSymbol init)
+            where TSymbol : ISymbol
+            where TEntity : Entities.CachedEntity => CreateEntity(factory, init, init, symbolEntityCache);
+
+
+        /// <summary>
+        /// Creates and populates a new entity, or returns the existing one from the cache.
+        /// </summary>
+        /// <param name="factory">The entity factory.</param>
+        /// <param name="cacheKey">The key used for caching.</param>
+        /// <param name="init">The initializer for the entity.</param>
+        /// <param name="dictionary">The dictionary to use for caching.</param>
+        /// <returns>The new/existing entity.</returns>
+        private TEntity CreateEntity<TInit, TCacheKey, TEntity>(CachedEntityFactory<TInit, TEntity> factory, TCacheKey cacheKey, TInit init, IDictionary<TCacheKey, Entities.CachedEntity> dictionary)
+            where TCacheKey : notnull
+            where TEntity : Entities.CachedEntity
+        {
+            if (dictionary.TryGetValue(cacheKey, out var cached))
+                return (TEntity)cached;
+
+            using (StackGuard)
+            {
+                var label = GetNewLabel();
+                var entity = factory.Create(this, init);
+                entity.Label = label;
+
+                dictionary[cacheKey] = entity;
+
+                DefineLabel(entity);
+                if (entity.NeedsPopulation)
+                    Populate(init as ISymbol, entity);
+
+#if DEBUG_LABELS
+                using var id = new EscapingTextWriter();
+                entity.WriteQuotedId(id);
+                CheckEntityHasUniqueLabel(id.ToString(), entity);
+#endif
+
+                return entity;
+            }
+        }
+
+        /// <summary>
+        /// Creates a fresh label with ID "*", and set it on the
+        /// supplied <paramref name="entity"/> object.
+        /// </summary>
+        internal void AddFreshLabel(Entity entity)
+        {
+            entity.Label = GetNewLabel();
+            entity.DefineFreshLabel(TrapWriter.Writer);
+        }
+
+#if DEBUG_LABELS
+        private readonly Dictionary<string, CachedEntity> idLabelCache = new Dictionary<string, CachedEntity>();
+#endif
+
+        private readonly IDictionary<object, Entities.CachedEntity> objectEntityCache = new Dictionary<object, Entities.CachedEntity>();
+        private readonly IDictionary<ISymbol, Entities.CachedEntity> symbolEntityCache = new Dictionary<ISymbol, Entities.CachedEntity>(10000, SymbolEqualityComparer.Default);
+
+        /// <summary>
+        /// Queue of items to populate later.
+        /// The only reason for this is so that the call stack does not
+        /// grow indefinitely, causing a potential stack overflow.
+        /// </summary>
+        private readonly Queue<Action> populateQueue = new Queue<Action>();
+
+        /// <summary>
+        /// Enqueue the given action to be performed later.
+        /// </summary>
+        /// <param name="toRun">The action to run.</param>
+        public void PopulateLater(Action a, bool preserveDuplicationKey = true)
+        {
+            var key = preserveDuplicationKey ? GetCurrentTagStackKey() : null;
+            if (key is not null)
+            {
+                // If we are currently executing with a duplication guard, then the same
+                // guard must be used for the deferred action
+                populateQueue.Enqueue(() => WithDuplicationGuard(key, a));
+            }
+            else
+            {
+                populateQueue.Enqueue(a);
+            }
+        }
+
+        /// <summary>
+        /// Runs the main populate loop until there's nothing left to populate.
+        /// </summary>
+        public void PopulateAll()
+        {
+            while (populateQueue.Any())
+            {
+                try
+                {
+                    populateQueue.Dequeue()();
+                }
+                catch (InternalError ex)
+                {
+                    ExtractionError(new Message(ex.Text, ex.EntityText, CreateLocation(ex.Location), ex.StackTrace));
+                }
+                catch (Exception ex)  // lgtm[cs/catch-of-all-exceptions]
+                {
+                    ExtractionError($"Uncaught exception. {ex.Message}", null, CreateLocation(), ex.StackTrace);
+                }
+            }
+        }
+
+        private int currentRecursiveDepth = 0;
+        private const int maxRecursiveDepth = 150;
+
+        private void EnterScope()
+        {
+            if (currentRecursiveDepth >= maxRecursiveDepth)
+                throw new StackOverflowException($"Maximum nesting depth of {maxRecursiveDepth} exceeded");
+            ++currentRecursiveDepth;
+        }
+
+        private void ExitScope()
+        {
+            --currentRecursiveDepth;
+        }
+
+        public IDisposable StackGuard => new ScopeGuard(this);
+
+        private sealed class ScopeGuard : IDisposable
+        {
+            private readonly Context cx;
+
+            public ScopeGuard(Context c)
+            {
+                cx = c;
+                cx.EnterScope();
+            }
+
+            public void Dispose()
+            {
+                cx.ExitScope();
+            }
+        }
+
+        private class PushEmitter : ITrapEmitter
+        {
+            private readonly Key key;
+
+            public PushEmitter(Key key)
+            {
+                this.key = key;
+            }
+
+            public void EmitTrap(TextWriter trapFile)
+            {
+                trapFile.Write(".push ");
+                key.AppendTo(trapFile);
+                trapFile.WriteLine();
+            }
+        }
+
+        private class PopEmitter : ITrapEmitter
+        {
+            public void EmitTrap(TextWriter trapFile)
+            {
+                trapFile.WriteLine(".pop");
+            }
+        }
+
+        private readonly Stack<Key> tagStack = new Stack<Key>();
+
+        /// <summary>
+        /// Populates an entity, handling the tag stack appropriately
+        /// </summary>
+        /// <param name="optionalSymbol">Symbol for reporting errors.</param>
+        /// <param name="entity">The entity to populate.</param>
+        /// <exception cref="InternalError">Thrown on invalid trap stack behaviour.</exception>
+        private void Populate(ISymbol? optionalSymbol, Entities.CachedEntity entity)
+        {
+            if (writingLabel)
+            {
+                // Don't write tuples etc if we're currently defining a label
+                PopulateLater(() => Populate(optionalSymbol, entity));
+                return;
+            }
+
+            bool duplicationGuard, deferred;
+
+            if (ExtractionContext.Mode is ExtractorMode.Standalone)
+            {
+                duplicationGuard = false;
+                deferred = false;
+            }
+            else
+            {
+                switch (entity.TrapStackBehaviour)
+                {
+                    case TrapStackBehaviour.NeedsLabel:
+                        if (!tagStack.Any())
+                            ExtractionError("TagStack unexpectedly empty", optionalSymbol, entity);
+                        duplicationGuard = false;
+                        deferred = false;
+                        break;
+                    case TrapStackBehaviour.NoLabel:
+                        duplicationGuard = false;
+                        deferred = tagStack.Any();
+                        break;
+                    case TrapStackBehaviour.OptionalLabel:
+                        duplicationGuard = false;
+                        deferred = false;
+                        break;
+                    case TrapStackBehaviour.PushesLabel:
+                        duplicationGuard = true;
+                        deferred = tagStack.Any();
+                        break;
+                    default:
+                        throw new InternalError("Unexpected TrapStackBehaviour");
+                }
+            }
+
+            var a = duplicationGuard && IsEntityDuplicationGuarded(entity, out var loc)
+                ? (() =>
+                {
+                    var args = new object[TrapStackSuffix.Count + 2];
+                    args[0] = entity;
+                    args[1] = loc;
+                    for (var i = 0; i < TrapStackSuffix.Count; i++)
+                    {
+                        args[i + 2] = TrapStackSuffix[i];
+                    }
+                    WithDuplicationGuard(new Key(args), () => entity.Populate(TrapWriter.Writer));
+                })
+                : (Action)(() => this.Try(null, optionalSymbol, () => entity.Populate(TrapWriter.Writer)));
+
+            if (deferred)
+                populateQueue.Enqueue(a);
+            else
+                a();
+        }
+
+        protected Key? GetCurrentTagStackKey() => tagStack.Count > 0
+            ? tagStack.Peek()
+            : null;
+
+        /// <summary>
+        /// Log an extraction error.
+        /// </summary>
+        /// <param name="message">The error message.</param>
+        /// <param name="entityText">A textual representation of the failed entity.</param>
+        /// <param name="location">The location of the error.</param>
+        /// <param name="stackTrace">An optional stack trace of the error, or null.</param>
+        /// <param name="severity">The severity of the error.</param>
+        public void ExtractionError(string message, string? entityText, Entities.Location? location, string? stackTrace = null, Severity severity = Severity.Error)
+        {
+            var msg = new Message(message, entityText, location, stackTrace, severity);
+            ExtractionError(msg);
+        }
+
+        /// <summary>
+        /// Log an extraction error.
+        /// </summary>
+        /// <param name="message">The text of the message.</param>
+        /// <param name="optionalSymbol">The symbol of the error, or null.</param>
+        /// <param name="optionalEntity">The entity of the error, or null.</param>
+        private void ExtractionError(string message, ISymbol? optionalSymbol, Entity optionalEntity)
+        {
+            if (!(optionalSymbol is null))
+            {
+                ExtractionError(message, optionalSymbol.ToDisplayString(), CreateLocation(optionalSymbol.Locations.BestOrDefault()));
+            }
+            else if (!(optionalEntity is null))
+            {
+                ExtractionError(message, optionalEntity.Label.ToString(), CreateLocation(optionalEntity.ReportingLocation));
+            }
+            else
+            {
+                ExtractionError(message, null, CreateLocation());
+            }
+        }
+
+        /// <summary>
+        /// Log an extraction message.
+        /// </summary>
+        /// <param name="msg">The message to log.</param>
+        private void ExtractionError(Message msg)
+        {
+            _ = new Entities.ExtractionMessage(this, msg);
+            ExtractionContext.Message(msg);
+        }
+
+        private void ExtractionError(InternalError error)
+        {
+            ExtractionError(new Message(error.Message, error.EntityText, CreateLocation(error.Location), error.StackTrace, Severity.Error));
+        }
+
+        private void ReportError(InternalError error)
+        {
+            if (!ExtractionContext.Mode.HasFlag(ExtractorMode.Standalone))
+                throw error;
+
+            ExtractionError(error);
+        }
+
+        /// <summary>
+        /// Signal an error in the program model.
+        /// </summary>
+        /// <param name="node">The syntax node causing the failure.</param>
+        /// <param name="msg">The error message.</param>
+        public void ModelError(SyntaxNode node, string msg)
+        {
+            ReportError(new InternalError(node, msg));
+        }
+
+        /// <summary>
+        /// Signal an error in the program model.
+        /// </summary>
+        /// <param name="symbol">Symbol causing the error.</param>
+        /// <param name="msg">The error message.</param>
+        public void ModelError(ISymbol symbol, string msg)
+        {
+            ReportError(new InternalError(symbol, msg));
+        }
+
+        /// <summary>
+        /// Signal an error in the program model.
+        /// </summary>
+        /// <param name="loc">The location of the error.</param>
+        /// <param name="msg">The error message.</param>
+        public void ModelError(CSharp.Entities.Location loc, string msg)
+        {
+            ReportError(new InternalError(loc.ReportingLocation, msg));
+        }
+
+        /// <summary>
+        /// Signal an error in the program model.
+        /// </summary>
+        /// <param name="msg">The error message.</param>
+        public void ModelError(string msg)
+        {
+            ReportError(new InternalError(msg));
+        }
+
+        /// <summary>
+        /// Tries the supplied action <paramref name="a"/>, and logs an uncaught
+        /// exception error if the action fails.
+        /// </summary>
+        /// <param name="node">Optional syntax node for error reporting.</param>
+        /// <param name="symbol">Optional symbol for error reporting.</param>
+        /// <param name="a">The action to perform.</param>
+        public void Try(SyntaxNode? node, ISymbol? symbol, Action a)
+        {
+            try
+            {
+                a();
+            }
+            catch (Exception ex)  // lgtm[cs/catch-of-all-exceptions]
+            {
+                Message message;
+
+                if (node is not null)
+                {
+                    message = Message.Create(this, ex.Message, node, ex.StackTrace);
+                }
+                else if (symbol is not null)
+                {
+                    message = Message.Create(this, ex.Message, symbol, ex.StackTrace);
+                }
+                else if (ex is InternalError ie)
+                {
+                    message = new Message(ie.Text, ie.EntityText, CreateLocation(ie.Location), ex.StackTrace);
+                }
+                else
+                {
+                    message = new Message($"Uncaught exception. {ex.Message}", null, CreateLocation(), ex.StackTrace);
+                }
+
+                ExtractionError(message);
+            }
+        }
+
         /// <summary>
         /// The program database provided by Roslyn.
         /// There's one per syntax tree, which makes things awkward.
@@ -77,9 +523,11 @@ namespace Semmle.Extraction.CSharp
 
         internal CommentProcessor CommentGenerator { get; } = new CommentProcessor();
 
-        public Context(ExtractionContext extractionContext, Compilation c, TrapWriter trapWriter, IExtractionScope scope, bool addAssemblyTrapPrefix)
-            : base(extractionContext, trapWriter, addAssemblyTrapPrefix)
+        public Context(ExtractionContext extractionContext, Compilation c, TrapWriter trapWriter, IExtractionScope scope, bool shouldAddAssemblyTrapPrefix = false)
         {
+            ExtractionContext = extractionContext;
+            TrapWriter = trapWriter;
+            ShouldAddAssemblyTrapPrefix = shouldAddAssemblyTrapPrefix;
             Compilation = c;
             this.scope = scope;
         }
@@ -102,7 +550,11 @@ namespace Semmle.Extraction.CSharp
             !SymbolEqualityComparer.Default.Equals(symbol, symbol.OriginalDefinition) ||
             scope.InScope(symbol);
 
-        public override void WithDuplicationGuard(Key key, Action a)
+        /// <summary>
+        /// Runs the given action <paramref name="a"/>, guarding for trap duplication
+        /// based on key <paramref name="key"/>.
+        /// </summary>
+        public void WithDuplicationGuard(Key key, Action a)
         {
             if (IsAssemblyScope)
             {
@@ -113,21 +565,31 @@ namespace Semmle.Extraction.CSharp
             }
             else
             {
-                base.WithDuplicationGuard(key, a);
+                tagStack.Push(key);
+                TrapWriter.Emit(new PushEmitter(key));
+                try
+                {
+                    a();
+                }
+                finally
+                {
+                    TrapWriter.Emit(new PopEmitter());
+                    tagStack.Pop();
+                }
             }
         }
 
-        public override Extraction.Entities.Location CreateLocation()
+        public Entities.Location CreateLocation()
         {
             return SourceTree is null
-                ? GeneratedLocation.Create(this)
+                ? Entities.GeneratedLocation.Create(this)
                 : CreateLocation(Microsoft.CodeAnalysis.Location.Create(SourceTree, Microsoft.CodeAnalysis.Text.TextSpan.FromBounds(0, 0)));
         }
 
-        public override Extraction.Entities.Location CreateLocation(Microsoft.CodeAnalysis.Location? location)
+        public Entities.Location CreateLocation(Microsoft.CodeAnalysis.Location? location)
         {
             return (location is null || location.Kind == LocationKind.None)
-                ? GeneratedLocation.Create(this)
+                ? Entities.GeneratedLocation.Create(this)
                 : location.IsInSource
                     ? Entities.NonGeneratedSourceLocation.Create(this, location)
                     : Entities.Assembly.Create(this, location);
@@ -145,7 +607,7 @@ namespace Semmle.Extraction.CSharp
             CommentGenerator.AddElement(entity.Label, duplicationGuardKey, l);
         }
 
-        protected override bool IsEntityDuplicationGuarded(IEntity entity, [NotNullWhen(true)] out Extraction.Entities.Location? loc)
+        private bool IsEntityDuplicationGuarded(IEntity entity, [NotNullWhen(true)] out Entities.Location? loc)
         {
             if (CreateLocation(entity.ReportingLocation) is Entities.NonGeneratedSourceLocation l)
             {
@@ -169,7 +631,7 @@ namespace Semmle.Extraction.CSharp
         /// </summary>
         /// <param name="entity">The entity to extract.</param>
         /// <returns>True only on the first call for a particular entity.</returns>
-        internal bool ExtractGenerics(CachedEntity entity)
+        internal bool ExtractGenerics(CSharp.Entities.CachedEntity entity)
         {
             if (extractedGenerics.Contains(entity.Label))
             {
diff --git a/csharp/extractor/Semmle.Extraction/CsProjFile.cs b/csharp/extractor/Semmle.Extraction.CSharp/Extractor/CsProjFile.cs
similarity index 99%
rename from csharp/extractor/Semmle.Extraction/CsProjFile.cs
rename to csharp/extractor/Semmle.Extraction.CSharp/Extractor/CsProjFile.cs
index bed9d746996..665eb0bf346 100644
--- a/csharp/extractor/Semmle.Extraction/CsProjFile.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp/Extractor/CsProjFile.cs
@@ -4,7 +4,7 @@ using System.IO;
 using System.Linq;
 using System.Xml;
 
-namespace Semmle.Extraction
+namespace Semmle.Extraction.CSharp
 {
     /// <summary>
     /// Represents a .csproj file and reads information from it.
diff --git a/csharp/extractor/Semmle.Extraction/Extractor/ExtractionContext.cs b/csharp/extractor/Semmle.Extraction.CSharp/Extractor/ExtractionContext.cs
similarity index 98%
rename from csharp/extractor/Semmle.Extraction/Extractor/ExtractionContext.cs
rename to csharp/extractor/Semmle.Extraction.CSharp/Extractor/ExtractionContext.cs
index 26b30ad004b..619eb995347 100644
--- a/csharp/extractor/Semmle.Extraction/Extractor/ExtractionContext.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp/Extractor/ExtractionContext.cs
@@ -2,7 +2,7 @@ using System.Collections.Generic;
 using Semmle.Util.Logging;
 using CompilationInfo = (string key, string value);
 
-namespace Semmle.Extraction
+namespace Semmle.Extraction.CSharp
 {
     /// <summary>
     /// Implementation of the main extractor state.
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Extractor/Extractor.cs b/csharp/extractor/Semmle.Extraction.CSharp/Extractor/Extractor.cs
index d87f6fd24c0..50f673a7158 100644
--- a/csharp/extractor/Semmle.Extraction.CSharp/Extractor/Extractor.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp/Extractor/Extractor.cs
@@ -106,10 +106,10 @@ namespace Semmle.Extraction.CSharp
                 var canonicalPathCache = CanonicalPathCache.Create(logger, 1000);
                 var pathTransformer = new PathTransformer(canonicalPathCache);
 
-                if (options.BinaryLogPath is string binlogPath)
+                if (options.BinaryLogPaths is string[] binlogPaths)
                 {
                     logger.LogInfo(" Running binary log analysis.");
-                    return RunBinaryLogAnalysis(analyzerStopwatch, options, binlogPath, logger, canonicalPathCache, pathTransformer);
+                    return RunBinaryLogAnalysis(analyzerStopwatch, options, binlogPaths, logger, canonicalPathCache, pathTransformer);
                 }
                 else
                 {
@@ -124,6 +124,25 @@ namespace Semmle.Extraction.CSharp
             }
         }
 
+        private static ExitCode RunBinaryLogAnalysis(Stopwatch stopwatch, Options options, string[] binlogPaths, ILogger logger, CanonicalPathCache canonicalPathCache, PathTransformer pathTransformer)
+        {
+            var allFailed = true;
+            foreach (var binlogPath in binlogPaths)
+            {
+                var exit = RunBinaryLogAnalysis(stopwatch, options, binlogPath, logger, canonicalPathCache, pathTransformer);
+                switch (exit)
+                {
+                    case ExitCode.Ok:
+                    case ExitCode.Errors:
+                        allFailed = false;
+                        break;
+                    case ExitCode.Failed:
+                        break;
+                }
+            }
+            return allFailed ? ExitCode.Failed : ExitCode.Ok;
+        }
+
         private static ExitCode RunBinaryLogAnalysis(Stopwatch stopwatch, Options options, string binlogPath, ILogger logger, CanonicalPathCache canonicalPathCache, PathTransformer pathTransformer)
         {
             logger.LogInfo($"Reading compiler calls from binary log {binlogPath}");
@@ -142,7 +161,15 @@ namespace Semmle.Extraction.CSharp
                 var allCompilationData = reader.ReadAllCompilationData(filter);
                 var allFailed = true;
 
-                logger.LogInfo($"  Found {allCompilationData.Count} compilations in binary log");
+                if (allCompilationData.Count == 0)
+                {
+                    logger.LogWarning("  No compilations found in binary log.");
+                    return ExitCode.Ok;
+                }
+                else
+                {
+                    logger.LogInfo($"  Found {allCompilationData.Count} compilations in binary log");
+                }
 
                 foreach (var compilationData in allCompilationData)
                 {
@@ -190,11 +217,11 @@ namespace Semmle.Extraction.CSharp
                     switch (exit)
                     {
                         case ExitCode.Ok:
-                            allFailed &= false;
+                            allFailed = false;
                             logger.LogInfo($"  Compilation {diagnosticName} succeeded");
                             break;
                         case ExitCode.Errors:
-                            allFailed &= false;
+                            allFailed = false;
                             logger.LogWarning($"  Compilation {diagnosticName} had errors");
                             break;
                         case ExitCode.Failed:
diff --git a/csharp/extractor/Semmle.Extraction/Extractor/ExtractorMode.cs b/csharp/extractor/Semmle.Extraction.CSharp/Extractor/ExtractorMode.cs
similarity index 88%
rename from csharp/extractor/Semmle.Extraction/Extractor/ExtractorMode.cs
rename to csharp/extractor/Semmle.Extraction.CSharp/Extractor/ExtractorMode.cs
index cc1f5cc0413..6729878e563 100644
--- a/csharp/extractor/Semmle.Extraction/Extractor/ExtractorMode.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp/Extractor/ExtractorMode.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace Semmle.Extraction
+namespace Semmle.Extraction.CSharp
 {
     /// <summary>
     /// The mode in which a file is extracted.
diff --git a/csharp/extractor/Semmle.Extraction/FilePattern.cs b/csharp/extractor/Semmle.Extraction.CSharp/Extractor/FilePattern.cs
similarity index 99%
rename from csharp/extractor/Semmle.Extraction/FilePattern.cs
rename to csharp/extractor/Semmle.Extraction.CSharp/Extractor/FilePattern.cs
index 8c8e190a3ce..8220260369d 100644
--- a/csharp/extractor/Semmle.Extraction/FilePattern.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp/Extractor/FilePattern.cs
@@ -6,7 +6,7 @@ using System.Text;
 using System.Text.RegularExpressions;
 using Semmle.Util;
 
-namespace Semmle.Extraction
+namespace Semmle.Extraction.CSharp
 {
     public sealed class InvalidFilePatternException : Exception
     {
diff --git a/csharp/extractor/Semmle.Extraction/IExtractionScope.cs b/csharp/extractor/Semmle.Extraction.CSharp/Extractor/IExtractionScope.cs
similarity index 96%
rename from csharp/extractor/Semmle.Extraction/IExtractionScope.cs
rename to csharp/extractor/Semmle.Extraction.CSharp/Extractor/IExtractionScope.cs
index f12823b3f96..4a3ffe852e2 100644
--- a/csharp/extractor/Semmle.Extraction/IExtractionScope.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp/Extractor/IExtractionScope.cs
@@ -1,6 +1,6 @@
 using Microsoft.CodeAnalysis;
 
-namespace Semmle.Extraction
+namespace Semmle.Extraction.CSharp
 {
     /// <summary>
     /// Defines which entities belong in the trap file
diff --git a/csharp/extractor/Semmle.Extraction/Message.cs b/csharp/extractor/Semmle.Extraction.CSharp/Extractor/Message.cs
similarity index 96%
rename from csharp/extractor/Semmle.Extraction/Message.cs
rename to csharp/extractor/Semmle.Extraction.CSharp/Extractor/Message.cs
index 7239c5880cb..4825c6c3fe1 100644
--- a/csharp/extractor/Semmle.Extraction/Message.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp/Extractor/Message.cs
@@ -1,9 +1,8 @@
-using System.Linq;
-using System.Text;
+using System.Text;
 using Microsoft.CodeAnalysis;
 using Semmle.Util.Logging;
 
-namespace Semmle.Extraction
+namespace Semmle.Extraction.CSharp
 {
     /// <summary>
     /// Encapsulates information for a log message.
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Extractor/Options.cs b/csharp/extractor/Semmle.Extraction.CSharp/Extractor/Options.cs
index 7f3815520d6..3ff881d0a85 100644
--- a/csharp/extractor/Semmle.Extraction.CSharp/Extractor/Options.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp/Extractor/Options.cs
@@ -33,9 +33,9 @@ namespace Semmle.Extraction.CSharp
         public bool AssemblySensitiveTrap { get; private set; } = false;
 
         /// <summary>
-        /// The path to the binary log file, or null if unspecified.
+        /// The paths to the binary log files, or null if unspecified.
         /// </summary>
-        public string? BinaryLogPath { get; set; }
+        public string[]? BinaryLogPaths { get; set; }
 
         public static Options CreateWithEnvironment(string[] arguments)
         {
@@ -71,7 +71,7 @@ namespace Semmle.Extraction.CSharp
                     ProjectsToLoad.Add(value);
                     return true;
                 case "binlog":
-                    BinaryLogPath = value;
+                    BinaryLogPaths = value.Split(FileUtils.NewLineCharacters, StringSplitOptions.RemoveEmptyEntries);
                     return true;
                 default:
                     return base.HandleOption(key, value);
diff --git a/csharp/extractor/Semmle.Extraction/PathTransformer.cs b/csharp/extractor/Semmle.Extraction.CSharp/Extractor/PathTransformer.cs
similarity index 99%
rename from csharp/extractor/Semmle.Extraction/PathTransformer.cs
rename to csharp/extractor/Semmle.Extraction.CSharp/Extractor/PathTransformer.cs
index e67d60b11df..79108d10d52 100644
--- a/csharp/extractor/Semmle.Extraction/PathTransformer.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp/Extractor/PathTransformer.cs
@@ -5,7 +5,7 @@ using System.IO;
 using Semmle.Util;
 using Semmle.Util.Logging;
 
-namespace Semmle.Extraction
+namespace Semmle.Extraction.CSharp
 {
     /// <summary>
     /// A class for interpreting path transformers specified using the environment
diff --git a/csharp/extractor/Semmle.Extraction/SourceScope.cs b/csharp/extractor/Semmle.Extraction.CSharp/Extractor/SourceScope.cs
similarity index 93%
rename from csharp/extractor/Semmle.Extraction/SourceScope.cs
rename to csharp/extractor/Semmle.Extraction.CSharp/Extractor/SourceScope.cs
index 784dc8fdc93..6eff9c713cc 100644
--- a/csharp/extractor/Semmle.Extraction/SourceScope.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp/Extractor/SourceScope.cs
@@ -2,7 +2,7 @@
 using Microsoft.CodeAnalysis;
 
 
-namespace Semmle.Extraction
+namespace Semmle.Extraction.CSharp
 {
 
     /// <summary>
diff --git a/csharp/extractor/Semmle.Extraction/TrapWriter.cs b/csharp/extractor/Semmle.Extraction.CSharp/Extractor/TrapWriter.cs
similarity index 99%
rename from csharp/extractor/Semmle.Extraction/TrapWriter.cs
rename to csharp/extractor/Semmle.Extraction.CSharp/Extractor/TrapWriter.cs
index f773207e654..4830c3209c2 100644
--- a/csharp/extractor/Semmle.Extraction/TrapWriter.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp/Extractor/TrapWriter.cs
@@ -5,7 +5,7 @@ using System.Text;
 using Semmle.Util;
 using Semmle.Util.Logging;
 
-namespace Semmle.Extraction
+namespace Semmle.Extraction.CSharp
 {
     public interface ITrapEmitter
     {
diff --git a/csharp/extractor/Semmle.Extraction/InternalError.cs b/csharp/extractor/Semmle.Extraction.CSharp/InternalError.cs
similarity index 95%
rename from csharp/extractor/Semmle.Extraction/InternalError.cs
rename to csharp/extractor/Semmle.Extraction.CSharp/InternalError.cs
index f162316618e..7b42432be25 100644
--- a/csharp/extractor/Semmle.Extraction/InternalError.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp/InternalError.cs
@@ -1,8 +1,7 @@
 using System;
-using System.Linq;
 using Microsoft.CodeAnalysis;
 
-namespace Semmle.Extraction
+namespace Semmle.Extraction.CSharp
 {
     /// <summary>
     /// Exception thrown whenever extraction encounters something unexpected.
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Semmle.Extraction.CSharp.csproj b/csharp/extractor/Semmle.Extraction.CSharp/Semmle.Extraction.CSharp.csproj
index 00a84ec3627..3794d25df50 100644
--- a/csharp/extractor/Semmle.Extraction.CSharp/Semmle.Extraction.CSharp.csproj
+++ b/csharp/extractor/Semmle.Extraction.CSharp/Semmle.Extraction.CSharp.csproj
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
 	<ItemGroup>
-		<ProjectReference Include="..\Semmle.Extraction\Semmle.Extraction.csproj" />
 		<ProjectReference Include="..\Semmle.Extraction.CSharp.Util\Semmle.Extraction.CSharp.Util.csproj" />
 		<ProjectReference Include="..\Semmle.Util\Semmle.Util.csproj" />
 	</ItemGroup>
diff --git a/csharp/extractor/Semmle.Extraction/EscapingTextWriter.cs b/csharp/extractor/Semmle.Extraction.CSharp/Trap/EscapingTextWriter.cs
similarity index 99%
rename from csharp/extractor/Semmle.Extraction/EscapingTextWriter.cs
rename to csharp/extractor/Semmle.Extraction.CSharp/Trap/EscapingTextWriter.cs
index 2374b398843..63f5e81c358 100644
--- a/csharp/extractor/Semmle.Extraction/EscapingTextWriter.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp/Trap/EscapingTextWriter.cs
@@ -4,7 +4,7 @@ using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace Semmle.Extraction
+namespace Semmle.Extraction.CSharp
 {
     /// <summary>
     /// A `TextWriter` object that wraps another `TextWriter` object, and which
diff --git a/csharp/extractor/Semmle.Extraction/Id.cs b/csharp/extractor/Semmle.Extraction.CSharp/Trap/Key.cs
similarity index 76%
rename from csharp/extractor/Semmle.Extraction/Id.cs
rename to csharp/extractor/Semmle.Extraction.CSharp/Trap/Key.cs
index c66688f0760..273da621dce 100644
--- a/csharp/extractor/Semmle.Extraction/Id.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp/Trap/Key.cs
@@ -1,52 +1,13 @@
 using System;
 using System.IO;
 
-namespace Semmle.Extraction
+namespace Semmle.Extraction.CSharp
 {
-    /// <summary>
-    /// An ID. Either a fresh ID (`*`), a key, or a label (https://semmle.com/wiki/display/IN/TRAP+Files):
-    ///
-    /// ```
-    /// id ::= '*' | key | label
-    /// ```
-    /// </summary>
-    public interface IId
-    {
-        /// <summary>
-        /// Appends this ID to the supplied trap builder.
-        /// </summary>
-        void AppendTo(TextWriter trapFile);
-    }
-
-    /// <summary>
-    /// A fresh ID (`*`).
-    /// </summary>
-    public class FreshId : IId
-    {
-        private FreshId() { }
-
-        /// <summary>
-        /// Gets the singleton <see cref="FreshId"/> instance.
-        /// </summary>
-        public static IId Instance { get; } = new FreshId();
-
-        public override string ToString() => "*";
-
-        public override bool Equals(object? obj) => obj?.GetType() == GetType();
-
-        public override int GetHashCode() => 0;
-
-        public void AppendTo(TextWriter trapFile)
-        {
-            trapFile.Write('*');
-        }
-    }
-
     /// <summary>
     /// A key. Either a simple key, e.g. `@"bool A.M();method"`, or a compound key, e.g.
     /// `@"{0} {1}.M();method"` where `0` and `1` are both labels.
     /// </summary>
-    public class Key : IId
+    public class Key
     {
         private readonly StringWriter trapBuilder = new StringWriter();
 
diff --git a/csharp/extractor/Semmle.Extraction/TrapExtensions.cs b/csharp/extractor/Semmle.Extraction.CSharp/Trap/TrapExtensions.cs
similarity index 99%
rename from csharp/extractor/Semmle.Extraction/TrapExtensions.cs
rename to csharp/extractor/Semmle.Extraction.CSharp/Trap/TrapExtensions.cs
index 5c65e41f0ab..787ba62e3e8 100644
--- a/csharp/extractor/Semmle.Extraction/TrapExtensions.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp/Trap/TrapExtensions.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.IO;
 
-namespace Semmle.Extraction
+namespace Semmle.Extraction.CSharp
 {
     public static class TrapExtensions
     {
diff --git a/csharp/extractor/Semmle.Extraction/TrapStackBehaviour.cs b/csharp/extractor/Semmle.Extraction.CSharp/Trap/TrapStackBehaviour.cs
similarity index 95%
rename from csharp/extractor/Semmle.Extraction/TrapStackBehaviour.cs
rename to csharp/extractor/Semmle.Extraction.CSharp/Trap/TrapStackBehaviour.cs
index 0966a4816af..023170d1887 100644
--- a/csharp/extractor/Semmle.Extraction/TrapStackBehaviour.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp/Trap/TrapStackBehaviour.cs
@@ -1,4 +1,4 @@
-namespace Semmle.Extraction
+namespace Semmle.Extraction.CSharp
 {
     /// <summary>
     /// How an entity behaves with respect to .push and .pop
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Tuples.cs b/csharp/extractor/Semmle.Extraction.CSharp/Trap/Tuples.cs
similarity index 94%
rename from csharp/extractor/Semmle.Extraction.CSharp/Tuples.cs
rename to csharp/extractor/Semmle.Extraction.CSharp/Trap/Tuples.cs
index 49d08fc80ef..8960b6adb67 100644
--- a/csharp/extractor/Semmle.Extraction.CSharp/Tuples.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp/Trap/Tuples.cs
@@ -3,7 +3,6 @@ using Microsoft.CodeAnalysis.CSharp.Syntax;
 using Semmle.Util;
 using Semmle.Extraction.CSharp.Entities;
 using Semmle.Extraction.CSharp.Entities.Expressions;
-using Semmle.Extraction.Entities;
 using Semmle.Extraction.Kinds;
 
 namespace Semmle.Extraction.CSharp
@@ -17,7 +16,22 @@ namespace Semmle.Extraction.CSharp
     /// </remarks>
     internal static class Tuples
     {
-        internal static void assemblies(this System.IO.TextWriter trapFile, Assembly assembly, Extraction.Entities.File file, string identifier, string name, string version) =>
+        public static void containerparent(this TextWriter trapFile, Folder parent, IEntity child) =>
+            trapFile.WriteTuple("containerparent", parent, child);
+
+        internal static void extractor_messages(this TextWriter trapFile, ExtractionMessage error, Semmle.Util.Logging.Severity severity, string errorMessage, string entityText, Location location, string stackTrace) =>
+            trapFile.WriteTuple("extractor_messages", error, (int)severity, "C# extractor", errorMessage, entityText, location, stackTrace);
+
+        public static void files(this TextWriter trapFile, Entities.File file, string fullName) =>
+            trapFile.WriteTuple("files", file, fullName);
+
+        internal static void folders(this TextWriter trapFile, Folder folder, string path) =>
+            trapFile.WriteTuple("folders", folder, path);
+
+        public static void locations_default(this TextWriter trapFile, SourceLocation label, Entities.File file, int startLine, int startCol, int endLine, int endCol) =>
+            trapFile.WriteTuple("locations_default", label, file, startLine, startCol, endLine, endCol);
+
+        internal static void assemblies(this TextWriter trapFile, Assembly assembly, Entities.File file, string identifier, string name, string version) =>
             trapFile.WriteTuple("assemblies", assembly, file, identifier, name, version);
 
         internal static void accessor_location(this TextWriter trapFile, Accessor accessorKey, Location location) =>
@@ -74,10 +88,10 @@ namespace Semmle.Extraction.CSharp
         internal static void compilation_info(this TextWriter trapFile, Compilation compilation, string infoKey, string infoValue) =>
             trapFile.WriteTuple("compilation_info", compilation, infoKey, infoValue);
 
-        internal static void compilation_compiling_files(this TextWriter trapFile, Compilation compilation, int index, Extraction.Entities.File file) =>
+        internal static void compilation_compiling_files(this TextWriter trapFile, Compilation compilation, int index, Entities.File file) =>
             trapFile.WriteTuple("compilation_compiling_files", compilation, index, file);
 
-        internal static void compilation_referencing_files(this TextWriter trapFile, Compilation compilation, int index, Extraction.Entities.File file) =>
+        internal static void compilation_referencing_files(this TextWriter trapFile, Compilation compilation, int index, Entities.File file) =>
             trapFile.WriteTuple("compilation_referencing_files", compilation, index, file);
 
         internal static void compilation_finished(this TextWriter trapFile, Compilation compilation, float cpuSeconds, float elapsedSeconds) =>
@@ -398,7 +412,7 @@ namespace Semmle.Extraction.CSharp
         internal static void pragma_warning_error_codes(this TextWriter trapFile, PragmaWarningDirective pragma, string errorCode, int child) =>
             trapFile.WriteTuple("pragma_warning_error_codes", pragma, errorCode, child);
 
-        internal static void pragma_checksums(this TextWriter trapFile, PragmaChecksumDirective pragma, Extraction.Entities.File file, string guid, string bytes) =>
+        internal static void pragma_checksums(this TextWriter trapFile, PragmaChecksumDirective pragma, Entities.File file, string guid, string bytes) =>
             trapFile.WriteTuple("pragma_checksums", pragma, file, guid, bytes);
 
         internal static void directive_defines(this TextWriter trapFile, DefineDirective directive, string name) =>
@@ -422,7 +436,7 @@ namespace Semmle.Extraction.CSharp
         internal static void directive_line_value(this TextWriter trapFile, LineDirective directive, int line) =>
             trapFile.WriteTuple("directive_line_value", directive, line);
 
-        internal static void directive_line_file<T>(this TextWriter trapFile, LineOrSpanDirective<T> directive, Extraction.Entities.File file) where T : LineOrSpanDirectiveTriviaSyntax =>
+        internal static void directive_line_file<T>(this TextWriter trapFile, LineOrSpanDirective<T> directive, Entities.File file) where T : LineOrSpanDirectiveTriviaSyntax =>
             trapFile.WriteTuple("directive_line_file", directive, file);
 
         internal static void directive_line_offset(this TextWriter trapFile, LineSpanDirective directive, int offset) =>
diff --git a/csharp/extractor/Semmle.Extraction.Tests/BUILD.bazel b/csharp/extractor/Semmle.Extraction.Tests/BUILD.bazel
index dfdf41150ea..df9799d3f95 100644
--- a/csharp/extractor/Semmle.Extraction.Tests/BUILD.bazel
+++ b/csharp/extractor/Semmle.Extraction.Tests/BUILD.bazel
@@ -9,7 +9,6 @@ codeql_xunit_test(
         "*.cs",
     ]),
     deps = [
-        "//csharp/extractor/Semmle.Extraction",
         "//csharp/extractor/Semmle.Extraction.CSharp",
         "//csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching",
         "//csharp/extractor/Semmle.Extraction.CSharp.Standalone:bin/Semmle.Extraction.CSharp.Standalone",
diff --git a/csharp/extractor/Semmle.Extraction.Tests/FilePattern.cs b/csharp/extractor/Semmle.Extraction.Tests/FilePattern.cs
index 9985a6f06c6..e4ed2721bf9 100644
--- a/csharp/extractor/Semmle.Extraction.Tests/FilePattern.cs
+++ b/csharp/extractor/Semmle.Extraction.Tests/FilePattern.cs
@@ -1,4 +1,5 @@
 using Xunit;
+using Semmle.Extraction.CSharp;
 
 namespace Semmle.Extraction.Tests
 {
diff --git a/csharp/extractor/Semmle.Extraction.Tests/Options.cs b/csharp/extractor/Semmle.Extraction.Tests/Options.cs
index 1978732ee07..76a03996df0 100644
--- a/csharp/extractor/Semmle.Extraction.Tests/Options.cs
+++ b/csharp/extractor/Semmle.Extraction.Tests/Options.cs
@@ -4,6 +4,7 @@ using System.IO;
 using System.Text.RegularExpressions;
 using Semmle.Util;
 using Semmle.Util.Logging;
+using Semmle.Extraction.CSharp;
 
 namespace Semmle.Extraction.Tests
 {
diff --git a/csharp/extractor/Semmle.Extraction.Tests/PathTransformer.cs b/csharp/extractor/Semmle.Extraction.Tests/PathTransformer.cs
index e629c406457..be73becd25d 100644
--- a/csharp/extractor/Semmle.Extraction.Tests/PathTransformer.cs
+++ b/csharp/extractor/Semmle.Extraction.Tests/PathTransformer.cs
@@ -1,5 +1,6 @@
 using Xunit;
 using Semmle.Util;
+using Semmle.Extraction.CSharp;
 
 namespace Semmle.Extraction.Tests
 {
diff --git a/csharp/extractor/Semmle.Extraction.Tests/Semmle.Extraction.Tests.csproj b/csharp/extractor/Semmle.Extraction.Tests/Semmle.Extraction.Tests.csproj
index 60994237e15..d3940eb3df9 100644
--- a/csharp/extractor/Semmle.Extraction.Tests/Semmle.Extraction.Tests.csproj
+++ b/csharp/extractor/Semmle.Extraction.Tests/Semmle.Extraction.Tests.csproj
@@ -4,7 +4,6 @@
     <ProjectReference Include="..\Semmle.Extraction.CSharp.StubGenerator\Semmle.Extraction.CSharp.StubGenerator.csproj" />
     <ProjectReference Include="..\Semmle.Extraction.CSharp.Standalone\Semmle.Extraction.CSharp.Standalone.csproj" />
     <ProjectReference Include="..\Semmle.Extraction.CSharp\Semmle.Extraction.CSharp.csproj" />
-    <ProjectReference Include="..\Semmle.Extraction\Semmle.Extraction.csproj" />
     <ProjectReference Include="..\Semmle.Util\Semmle.Util.csproj" />
   </ItemGroup>
   <Import Project="..\..\.paket\Paket.Restore.targets" />
diff --git a/csharp/extractor/Semmle.Extraction/BUILD.bazel b/csharp/extractor/Semmle.Extraction/BUILD.bazel
deleted file mode 100644
index 83dfb8235e8..00000000000
--- a/csharp/extractor/Semmle.Extraction/BUILD.bazel
+++ /dev/null
@@ -1,36 +0,0 @@
-load(
-    "//misc/bazel:csharp.bzl",
-    "codeql_csharp_library",
-)
-
-config_setting(
-    name = "debug_build",
-    values = {
-        "compilation_mode": "dbg",
-    },
-)
-
-codeql_csharp_library(
-    name = "Semmle.Extraction",
-    srcs = glob([
-        "Entities/**/*.cs",
-        "Extractor/**/*.cs",
-        "*.cs",
-    ]),
-    # enable via -c dbg on the bazel command line/in .bazelrc.local
-    defines = select({
-        ":debug_build": [
-            "TRACE",
-            "DEBUG",
-            "DEBUG_LABELS",
-        ],
-        "//conditions:default": [],
-    }),
-    internals_visible_to = ["Semmle.Extraction.CSharp"],
-    visibility = ["//csharp:__subpackages__"],
-    deps = [
-        "//csharp/extractor/Semmle.Util",
-        "@paket.main//microsoft.build",
-        "@paket.main//microsoft.codeanalysis",
-    ],
-)
diff --git a/csharp/extractor/Semmle.Extraction/Context.cs b/csharp/extractor/Semmle.Extraction/Context.cs
deleted file mode 100644
index 8b7b750768c..00000000000
--- a/csharp/extractor/Semmle.Extraction/Context.cs
+++ /dev/null
@@ -1,500 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
-using System.IO;
-using System.Linq;
-using Microsoft.CodeAnalysis;
-using Semmle.Util.Logging;
-using Semmle.Extraction.Entities;
-
-namespace Semmle.Extraction
-{
-    /// <summary>
-    /// State that needs to be available throughout the extraction process.
-    /// There is one Context object per trap output file.
-    /// </summary>
-    public class Context
-    {
-        /// <summary>
-        /// Access various extraction functions, e.g. logger, trap writer.
-        /// </summary>
-        public ExtractionContext ExtractionContext { get; }
-
-        /// <summary>
-        /// Access to the trap file.
-        /// </summary>
-        public TrapWriter TrapWriter { get; }
-
-        /// <summary>
-        /// Holds if assembly information should be prefixed to TRAP labels.
-        /// </summary>
-        public bool ShouldAddAssemblyTrapPrefix { get; }
-
-        public IList<object> TrapStackSuffix { get; } = new List<object>();
-
-        private int GetNewId() => TrapWriter.IdCounter++;
-
-        // A recursion guard against writing to the trap file whilst writing an id to the trap file.
-        private bool writingLabel = false;
-
-        private readonly Queue<IEntity> labelQueue = [];
-
-        protected void DefineLabel(IEntity entity)
-        {
-            if (writingLabel)
-            {
-                // Don't define a label whilst writing a label.
-                labelQueue.Enqueue(entity);
-            }
-            else
-            {
-                try
-                {
-                    writingLabel = true;
-                    entity.DefineLabel(TrapWriter.Writer);
-                }
-                finally
-                {
-                    writingLabel = false;
-                    if (labelQueue.Any())
-                    {
-                        DefineLabel(labelQueue.Dequeue());
-                    }
-                }
-            }
-        }
-
-#if DEBUG_LABELS
-        private void CheckEntityHasUniqueLabel(string id, CachedEntity entity)
-        {
-            if (idLabelCache.ContainsKey(id))
-            {
-                this.Extractor.Message(new Message("Label collision for " + id, entity.Label.ToString(), CreateLocation(entity.ReportingLocation), "", Severity.Warning));
-            }
-            else
-            {
-                idLabelCache[id] = entity;
-            }
-        }
-#endif
-
-        protected Label GetNewLabel() => new Label(GetNewId());
-
-        internal TEntity CreateEntity<TInit, TEntity>(CachedEntityFactory<TInit, TEntity> factory, object cacheKey, TInit init)
-            where TEntity : CachedEntity =>
-                cacheKey is ISymbol s ? CreateEntity(factory, s, init, symbolEntityCache) : CreateEntity(factory, cacheKey, init, objectEntityCache);
-
-        internal TEntity CreateEntityFromSymbol<TSymbol, TEntity>(CachedEntityFactory<TSymbol, TEntity> factory, TSymbol init)
-            where TSymbol : ISymbol
-            where TEntity : CachedEntity => CreateEntity(factory, init, init, symbolEntityCache);
-
-        /// <summary>
-        /// Creates and populates a new entity, or returns the existing one from the cache.
-        /// </summary>
-        /// <param name="factory">The entity factory.</param>
-        /// <param name="cacheKey">The key used for caching.</param>
-        /// <param name="init">The initializer for the entity.</param>
-        /// <param name="dictionary">The dictionary to use for caching.</param>
-        /// <returns>The new/existing entity.</returns>
-        private TEntity CreateEntity<TInit, TCacheKey, TEntity>(CachedEntityFactory<TInit, TEntity> factory, TCacheKey cacheKey, TInit init, IDictionary<TCacheKey, CachedEntity> dictionary)
-            where TCacheKey : notnull
-            where TEntity : CachedEntity
-        {
-            if (dictionary.TryGetValue(cacheKey, out var cached))
-                return (TEntity)cached;
-
-            using (StackGuard)
-            {
-                var label = GetNewLabel();
-                var entity = factory.Create(this, init);
-                entity.Label = label;
-
-                dictionary[cacheKey] = entity;
-
-                DefineLabel(entity);
-                if (entity.NeedsPopulation)
-                    Populate(init as ISymbol, entity);
-
-#if DEBUG_LABELS
-                using var id = new EscapingTextWriter();
-                entity.WriteQuotedId(id);
-                CheckEntityHasUniqueLabel(id.ToString(), entity);
-#endif
-
-                return entity;
-            }
-        }
-
-        /// <summary>
-        /// Creates a fresh label with ID "*", and set it on the
-        /// supplied <paramref name="entity"/> object.
-        /// </summary>
-        internal void AddFreshLabel(Entity entity)
-        {
-            entity.Label = GetNewLabel();
-            entity.DefineFreshLabel(TrapWriter.Writer);
-        }
-
-#if DEBUG_LABELS
-        private readonly Dictionary<string, CachedEntity> idLabelCache = new Dictionary<string, CachedEntity>();
-#endif
-
-        private readonly IDictionary<object, CachedEntity> objectEntityCache = new Dictionary<object, CachedEntity>();
-        private readonly IDictionary<ISymbol, CachedEntity> symbolEntityCache = new Dictionary<ISymbol, CachedEntity>(10000, SymbolEqualityComparer.Default);
-
-        /// <summary>
-        /// Queue of items to populate later.
-        /// The only reason for this is so that the call stack does not
-        /// grow indefinitely, causing a potential stack overflow.
-        /// </summary>
-        private readonly Queue<Action> populateQueue = new Queue<Action>();
-
-        /// <summary>
-        /// Enqueue the given action to be performed later.
-        /// </summary>
-        /// <param name="toRun">The action to run.</param>
-        public void PopulateLater(Action a, bool preserveDuplicationKey = true)
-        {
-            var key = preserveDuplicationKey ? GetCurrentTagStackKey() : null;
-            if (key is not null)
-            {
-                // If we are currently executing with a duplication guard, then the same
-                // guard must be used for the deferred action
-                populateQueue.Enqueue(() => WithDuplicationGuard(key, a));
-            }
-            else
-            {
-                populateQueue.Enqueue(a);
-            }
-        }
-
-        /// <summary>
-        /// Runs the main populate loop until there's nothing left to populate.
-        /// </summary>
-        public void PopulateAll()
-        {
-            while (populateQueue.Any())
-            {
-                try
-                {
-                    populateQueue.Dequeue()();
-                }
-                catch (InternalError ex)
-                {
-                    ExtractionError(new Message(ex.Text, ex.EntityText, CreateLocation(ex.Location), ex.StackTrace));
-                }
-                catch (Exception ex)  // lgtm[cs/catch-of-all-exceptions]
-                {
-                    ExtractionError($"Uncaught exception. {ex.Message}", null, CreateLocation(), ex.StackTrace);
-                }
-            }
-        }
-
-        protected Context(ExtractionContext extractionContext, TrapWriter trapWriter, bool shouldAddAssemblyTrapPrefix = false)
-        {
-            ExtractionContext = extractionContext;
-            TrapWriter = trapWriter;
-            ShouldAddAssemblyTrapPrefix = shouldAddAssemblyTrapPrefix;
-        }
-
-        private int currentRecursiveDepth = 0;
-        private const int maxRecursiveDepth = 150;
-
-        private void EnterScope()
-        {
-            if (currentRecursiveDepth >= maxRecursiveDepth)
-                throw new StackOverflowException($"Maximum nesting depth of {maxRecursiveDepth} exceeded");
-            ++currentRecursiveDepth;
-        }
-
-        private void ExitScope()
-        {
-            --currentRecursiveDepth;
-        }
-
-        public IDisposable StackGuard => new ScopeGuard(this);
-
-        private sealed class ScopeGuard : IDisposable
-        {
-            private readonly Context cx;
-
-            public ScopeGuard(Context c)
-            {
-                cx = c;
-                cx.EnterScope();
-            }
-
-            public void Dispose()
-            {
-                cx.ExitScope();
-            }
-        }
-
-        private class PushEmitter : ITrapEmitter
-        {
-            private readonly Key key;
-
-            public PushEmitter(Key key)
-            {
-                this.key = key;
-            }
-
-            public void EmitTrap(TextWriter trapFile)
-            {
-                trapFile.Write(".push ");
-                key.AppendTo(trapFile);
-                trapFile.WriteLine();
-            }
-        }
-
-        private class PopEmitter : ITrapEmitter
-        {
-            public void EmitTrap(TextWriter trapFile)
-            {
-                trapFile.WriteLine(".pop");
-            }
-        }
-
-        private readonly Stack<Key> tagStack = new Stack<Key>();
-
-        /// <summary>
-        /// Populates an entity, handling the tag stack appropriately
-        /// </summary>
-        /// <param name="optionalSymbol">Symbol for reporting errors.</param>
-        /// <param name="entity">The entity to populate.</param>
-        /// <exception cref="InternalError">Thrown on invalid trap stack behaviour.</exception>
-        private void Populate(ISymbol? optionalSymbol, CachedEntity entity)
-        {
-            if (writingLabel)
-            {
-                // Don't write tuples etc if we're currently defining a label
-                PopulateLater(() => Populate(optionalSymbol, entity));
-                return;
-            }
-
-            bool duplicationGuard, deferred;
-
-            if (ExtractionContext.Mode is ExtractorMode.Standalone)
-            {
-                duplicationGuard = false;
-                deferred = false;
-            }
-            else
-            {
-                switch (entity.TrapStackBehaviour)
-                {
-                    case TrapStackBehaviour.NeedsLabel:
-                        if (!tagStack.Any())
-                            ExtractionError("TagStack unexpectedly empty", optionalSymbol, entity);
-                        duplicationGuard = false;
-                        deferred = false;
-                        break;
-                    case TrapStackBehaviour.NoLabel:
-                        duplicationGuard = false;
-                        deferred = tagStack.Any();
-                        break;
-                    case TrapStackBehaviour.OptionalLabel:
-                        duplicationGuard = false;
-                        deferred = false;
-                        break;
-                    case TrapStackBehaviour.PushesLabel:
-                        duplicationGuard = true;
-                        deferred = duplicationGuard && tagStack.Any();
-                        break;
-                    default:
-                        throw new InternalError("Unexpected TrapStackBehaviour");
-                }
-            }
-
-            var a = duplicationGuard && IsEntityDuplicationGuarded(entity, out var loc)
-                ? (() =>
-                {
-                    var args = new object[TrapStackSuffix.Count + 2];
-                    args[0] = entity;
-                    args[1] = loc;
-                    for (var i = 0; i < TrapStackSuffix.Count; i++)
-                    {
-                        args[i + 2] = TrapStackSuffix[i];
-                    }
-                    WithDuplicationGuard(new Key(args), () => entity.Populate(TrapWriter.Writer));
-                })
-                : (Action)(() => this.Try(null, optionalSymbol, () => entity.Populate(TrapWriter.Writer)));
-
-            if (deferred)
-                populateQueue.Enqueue(a);
-            else
-                a();
-        }
-
-        protected virtual bool IsEntityDuplicationGuarded(IEntity entity, [NotNullWhen(returnValue: true)] out Entities.Location? loc)
-        {
-            loc = null;
-            return false;
-        }
-
-        /// <summary>
-        /// Runs the given action <paramref name="a"/>, guarding for trap duplication
-        /// based on key <paramref name="key"/>.
-        /// </summary>
-        public virtual void WithDuplicationGuard(Key key, Action a)
-        {
-            tagStack.Push(key);
-            TrapWriter.Emit(new PushEmitter(key));
-            try
-            {
-                a();
-            }
-            finally
-            {
-                TrapWriter.Emit(new PopEmitter());
-                tagStack.Pop();
-            }
-        }
-
-        protected Key? GetCurrentTagStackKey() => tagStack.Count > 0
-            ? tagStack.Peek()
-            : null;
-
-        /// <summary>
-        /// Log an extraction error.
-        /// </summary>
-        /// <param name="message">The error message.</param>
-        /// <param name="entityText">A textual representation of the failed entity.</param>
-        /// <param name="location">The location of the error.</param>
-        /// <param name="stackTrace">An optional stack trace of the error, or null.</param>
-        /// <param name="severity">The severity of the error.</param>
-        public void ExtractionError(string message, string? entityText, Entities.Location? location, string? stackTrace = null, Severity severity = Severity.Error)
-        {
-            var msg = new Message(message, entityText, location, stackTrace, severity);
-            ExtractionError(msg);
-        }
-
-        /// <summary>
-        /// Log an extraction error.
-        /// </summary>
-        /// <param name="message">The text of the message.</param>
-        /// <param name="optionalSymbol">The symbol of the error, or null.</param>
-        /// <param name="optionalEntity">The entity of the error, or null.</param>
-        private void ExtractionError(string message, ISymbol? optionalSymbol, Entity optionalEntity)
-        {
-            if (!(optionalSymbol is null))
-            {
-                ExtractionError(message, optionalSymbol.ToDisplayString(), CreateLocation(optionalSymbol.Locations.BestOrDefault()));
-            }
-            else if (!(optionalEntity is null))
-            {
-                ExtractionError(message, optionalEntity.Label.ToString(), CreateLocation(optionalEntity.ReportingLocation));
-            }
-            else
-            {
-                ExtractionError(message, null, CreateLocation());
-            }
-        }
-
-        /// <summary>
-        /// Log an extraction message.
-        /// </summary>
-        /// <param name="msg">The message to log.</param>
-        private void ExtractionError(Message msg)
-        {
-            new ExtractionMessage(this, msg);
-            ExtractionContext.Message(msg);
-        }
-
-        private void ExtractionError(InternalError error)
-        {
-            ExtractionError(new Message(error.Message, error.EntityText, CreateLocation(error.Location), error.StackTrace, Severity.Error));
-        }
-
-        private void ReportError(InternalError error)
-        {
-            if (!ExtractionContext.Mode.HasFlag(ExtractorMode.Standalone))
-                throw error;
-
-            ExtractionError(error);
-        }
-
-        /// <summary>
-        /// Signal an error in the program model.
-        /// </summary>
-        /// <param name="node">The syntax node causing the failure.</param>
-        /// <param name="msg">The error message.</param>
-        public void ModelError(SyntaxNode node, string msg)
-        {
-            ReportError(new InternalError(node, msg));
-        }
-
-        /// <summary>
-        /// Signal an error in the program model.
-        /// </summary>
-        /// <param name="symbol">Symbol causing the error.</param>
-        /// <param name="msg">The error message.</param>
-        public void ModelError(ISymbol symbol, string msg)
-        {
-            ReportError(new InternalError(symbol, msg));
-        }
-
-        /// <summary>
-        /// Signal an error in the program model.
-        /// </summary>
-        /// <param name="loc">The location of the error.</param>
-        /// <param name="msg">The error message.</param>
-        public void ModelError(Entities.Location loc, string msg)
-        {
-            ReportError(new InternalError(loc.ReportingLocation, msg));
-        }
-
-        /// <summary>
-        /// Signal an error in the program model.
-        /// </summary>
-        /// <param name="msg">The error message.</param>
-        public void ModelError(string msg)
-        {
-            ReportError(new InternalError(msg));
-        }
-
-        /// <summary>
-        /// Tries the supplied action <paramref name="a"/>, and logs an uncaught
-        /// exception error if the action fails.
-        /// </summary>
-        /// <param name="node">Optional syntax node for error reporting.</param>
-        /// <param name="symbol">Optional symbol for error reporting.</param>
-        /// <param name="a">The action to perform.</param>
-        public void Try(SyntaxNode? node, ISymbol? symbol, Action a)
-        {
-            try
-            {
-                a();
-            }
-            catch (Exception ex)  // lgtm[cs/catch-of-all-exceptions]
-            {
-                Message message;
-
-                if (node is not null)
-                {
-                    message = Message.Create(this, ex.Message, node, ex.StackTrace);
-                }
-                else if (symbol is not null)
-                {
-                    message = Message.Create(this, ex.Message, symbol, ex.StackTrace);
-                }
-                else if (ex is InternalError ie)
-                {
-                    message = new Message(ie.Text, ie.EntityText, CreateLocation(ie.Location), ex.StackTrace);
-                }
-                else
-                {
-                    message = new Message($"Uncaught exception. {ex.Message}", null, CreateLocation(), ex.StackTrace);
-                }
-
-                ExtractionError(message);
-            }
-        }
-
-        public virtual Entities.Location CreateLocation() =>
-            GeneratedLocation.Create(this);
-
-        public virtual Entities.Location CreateLocation(Microsoft.CodeAnalysis.Location? location) =>
-            CreateLocation();
-    }
-}
diff --git a/csharp/extractor/Semmle.Extraction/Entities/File.cs b/csharp/extractor/Semmle.Extraction/Entities/File.cs
deleted file mode 100644
index dda965920ae..00000000000
--- a/csharp/extractor/Semmle.Extraction/Entities/File.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-using System;
-
-namespace Semmle.Extraction.Entities
-{
-    public abstract class File : CachedEntity<string>
-    {
-        protected File(Context cx, string path)
-            : base(cx, path)
-        {
-            originalPath = path;
-            var adjustedPath = BinaryLogExtractionContext.GetAdjustedPath(Context.ExtractionContext, originalPath) ?? path;
-            transformedPathLazy = new Lazy<PathTransformer.ITransformedPath>(() => Context.ExtractionContext.PathTransformer.Transform(adjustedPath));
-        }
-
-        protected readonly string originalPath;
-        private readonly Lazy<PathTransformer.ITransformedPath> transformedPathLazy;
-        protected PathTransformer.ITransformedPath TransformedPath => transformedPathLazy.Value;
-
-        public override bool NeedsPopulation => true;
-
-        public override void WriteId(EscapingTextWriter trapFile)
-        {
-            trapFile.Write(TransformedPath.DatabaseId);
-            trapFile.Write(";sourcefile");
-        }
-
-        public override Microsoft.CodeAnalysis.Location? ReportingLocation => null;
-    }
-}
diff --git a/csharp/extractor/Semmle.Extraction/Semmle.Extraction.csproj b/csharp/extractor/Semmle.Extraction/Semmle.Extraction.csproj
deleted file mode 100644
index 2173a50f2ad..00000000000
--- a/csharp/extractor/Semmle.Extraction/Semmle.Extraction.csproj
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project Sdk="Microsoft.NET.Sdk">
-	<PropertyGroup>
-    	<CodeAnalysisRuleSet>Semmle.Extraction.ruleset</CodeAnalysisRuleSet>
-	</PropertyGroup>
-	<ItemGroup>
-		<ProjectReference Include="..\Semmle.Util\Semmle.Util.csproj" />
-
-		<InternalsVisibleTo Include="Semmle.Extraction.CSharp" />
-	</ItemGroup>
-  <Import Project="..\..\.paket\Paket.Restore.targets" />
-</Project>
diff --git a/csharp/extractor/Semmle.Extraction/Semmle.Extraction.ruleset b/csharp/extractor/Semmle.Extraction/Semmle.Extraction.ruleset
deleted file mode 100644
index 14df29e3653..00000000000
--- a/csharp/extractor/Semmle.Extraction/Semmle.Extraction.ruleset
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RuleSet Name="Microsoft Managed Recommended Rules" Description="These rules focus on the most critical problems in your code, including potential security holes, application crashes, and other important logic and design errors. It is recommended to include this rule set in any custom rule set you create for your projects." ToolsVersion="10.0">
-  <Localization ResourceAssembly="Microsoft.VisualStudio.CodeAnalysis.RuleSets.Strings.dll" ResourceBaseName="Microsoft.VisualStudio.CodeAnalysis.RuleSets.Strings.Localized">
-    <Name Resource="MinimumRecommendedRules_Name" />
-    <Description Resource="MinimumRecommendedRules_Description" />
-  </Localization>
-
-  <Rules AnalyzerId="Microsoft.CodeAnalysis.CSharp.Analyzers" RuleNamespace="Microsoft.CodeAnalysis.CSharp.Analyzers">
-    <Rule Id="RS1022" Action="None" />
-  </Rules>
-  <Rules AnalyzerId="Microsoft.CodeAnalysis.Analyzers" RuleNamespace="Microsoft.CodeAnalysis.Analyzers" />
-</RuleSet>
\ No newline at end of file
diff --git a/csharp/extractor/Semmle.Extraction/Tuple.cs b/csharp/extractor/Semmle.Extraction/Tuple.cs
deleted file mode 100644
index bfe660926d6..00000000000
--- a/csharp/extractor/Semmle.Extraction/Tuple.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-using System.IO;
-
-namespace Semmle.Extraction
-{
-    /// <summary>
-    /// A tuple represents a string of the form "a(b,c,d)".
-    /// </summary>
-    public struct Tuple : ITrapEmitter
-    {
-        private readonly string name;
-        private readonly object[] args;
-
-        public Tuple(string name, params object[] args)
-        {
-            this.name = name;
-            this.args = args;
-        }
-
-        /// <summary>
-        /// Constructs a unique string for this tuple.
-        /// </summary>
-        /// <param name="trapFile">The trap file to write to.</param>
-        public void EmitTrap(TextWriter trapFile)
-        {
-            trapFile.WriteTuple(name, args);
-        }
-
-        public override string ToString()
-        {
-            // Only implemented for debugging purposes
-            using var writer = new StringWriter();
-            EmitTrap(writer);
-            return writer.ToString();
-        }
-    }
-}
diff --git a/csharp/extractor/Semmle.Extraction/Tuples.cs b/csharp/extractor/Semmle.Extraction/Tuples.cs
deleted file mode 100644
index cddec932286..00000000000
--- a/csharp/extractor/Semmle.Extraction/Tuples.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-using Semmle.Extraction.Entities;
-
-namespace Semmle.Extraction
-{
-    /// <summary>
-    /// Methods for creating DB tuples.
-    /// </summary>
-    public static class Tuples
-    {
-        public static void containerparent(this System.IO.TextWriter trapFile, Folder parent, IEntity child)
-        {
-            trapFile.WriteTuple("containerparent", parent, child);
-        }
-
-        internal static void extractor_messages(this System.IO.TextWriter trapFile, ExtractionMessage error, Semmle.Util.Logging.Severity severity, string errorMessage, string entityText, Location location, string stackTrace)
-        {
-            trapFile.WriteTuple("extractor_messages", error, (int)severity, "C# extractor", errorMessage, entityText, location, stackTrace);
-        }
-
-        public static void files(this System.IO.TextWriter trapFile, File file, string fullName)
-        {
-            trapFile.WriteTuple("files", file, fullName);
-        }
-
-        internal static void folders(this System.IO.TextWriter trapFile, Folder folder, string path)
-        {
-            trapFile.WriteTuple("folders", folder, path);
-        }
-
-        public static void locations_default(this System.IO.TextWriter trapFile, SourceLocation label, Entities.File file, int startLine, int startCol, int endLine, int endCol)
-        {
-            trapFile.WriteTuple("locations_default", label, file, startLine, startCol, endLine, endCol);
-        }
-    }
-}
diff --git a/csharp/extractor/Semmle.Extraction/paket.references b/csharp/extractor/Semmle.Extraction/paket.references
deleted file mode 100644
index 310fffb853f..00000000000
--- a/csharp/extractor/Semmle.Extraction/paket.references
+++ /dev/null
@@ -1,2 +0,0 @@
-Microsoft.Build
-Microsoft.CodeAnalysis
diff --git a/csharp/extractor/Testrunner/Testrunner.cs b/csharp/extractor/Testrunner/Testrunner.cs
index 55fec21da43..6280a8c1be2 100644
--- a/csharp/extractor/Testrunner/Testrunner.cs
+++ b/csharp/extractor/Testrunner/Testrunner.cs
@@ -71,7 +71,7 @@ public class Testrunner
             testrunner.OnTestSkipped = OnTestSkipped;
 
             Console.WriteLine("Discovering tests...");
-            testrunner.Start(parallelAlgorithm: null);
+            testrunner.Start();
 
             Finished.WaitOne();
             Finished.Dispose();
diff --git a/csharp/paket.dependencies b/csharp/paket.dependencies
index dab8c5a2a09..f07d495f7db 100644
--- a/csharp/paket.dependencies
+++ b/csharp/paket.dependencies
@@ -1,4 +1,4 @@
-framework: net8.0
+framework: net9.0
 storage: none
 source https://api.nuget.org/v3/index.json
 # behave like nuget in choosing transitive dependency versions
diff --git a/csharp/paket.lock b/csharp/paket.lock
index dd01f431483..d0cd1517b41 100644
--- a/csharp/paket.lock
+++ b/csharp/paket.lock
@@ -1,9 +1,9 @@
 STORAGE: NONE
 STRATEGY: MIN
-RESTRICTION: == net8.0
+RESTRICTION: == net9.0
 NUGET
   remote: https://api.nuget.org/v3/index.json
-    Basic.CompilerLog.Util (0.7.8)
+    Basic.CompilerLog.Util (0.7.9)
       MessagePack (>= 2.5.129)
       Microsoft.CodeAnalysis (>= 4.9.2)
       Microsoft.CodeAnalysis.CSharp (>= 4.9.2)
@@ -59,18 +59,18 @@ NUGET
       System.Composition (>= 8.0)
       System.IO.Pipelines (>= 8.0)
       System.Threading.Channels (>= 8.0)
-    Microsoft.CodeCoverage (17.9)
+    Microsoft.CodeCoverage (17.11.1)
     Microsoft.Extensions.ObjectPool (7.0.13)
     Microsoft.NET.StringTools (17.8.3)
-    Microsoft.NET.Test.Sdk (17.9)
-      Microsoft.CodeCoverage (>= 17.9)
-      Microsoft.TestPlatform.TestHost (>= 17.9)
+    Microsoft.NET.Test.Sdk (17.11.1)
+      Microsoft.CodeCoverage (>= 17.11.1)
+      Microsoft.TestPlatform.TestHost (>= 17.11.1)
     Microsoft.NETCore.Platforms (1.1.1)
     Microsoft.NETCore.Targets (1.1.3)
-    Microsoft.TestPlatform.ObjectModel (17.9)
+    Microsoft.TestPlatform.ObjectModel (17.11.1)
       System.Reflection.Metadata (>= 1.6)
-    Microsoft.TestPlatform.TestHost (17.9)
-      Microsoft.TestPlatform.ObjectModel (>= 17.9)
+    Microsoft.TestPlatform.TestHost (17.11.1)
+      Microsoft.TestPlatform.ObjectModel (>= 17.11.1)
       Newtonsoft.Json (>= 13.0.1)
     Microsoft.Win32.Primitives (4.3)
       Microsoft.NETCore.Platforms (>= 1.1)
@@ -163,20 +163,20 @@ NUGET
       System.Runtime.Handles (>= 4.3)
     System.Windows.Extensions (7.0)
       System.Drawing.Common (>= 7.0)
-    xunit (2.8)
-      xunit.analyzers (>= 1.13)
-      xunit.assert (>= 2.8)
-      xunit.core (2.8)
+    xunit (2.9.2)
+      xunit.analyzers (>= 1.16)
+      xunit.assert (>= 2.9.2)
+      xunit.core (2.9.2)
     xunit.abstractions (2.0.3)
-    xunit.analyzers (1.13)
-    xunit.assert (2.8)
-    xunit.core (2.8)
-      xunit.extensibility.core (2.8)
-      xunit.extensibility.execution (2.8)
-    xunit.extensibility.core (2.8)
+    xunit.analyzers (1.16)
+    xunit.assert (2.9.2)
+    xunit.core (2.9.2)
+      xunit.extensibility.core (2.9.2)
+      xunit.extensibility.execution (2.9.2)
+    xunit.extensibility.core (2.9.2)
       xunit.abstractions (>= 2.0.3)
-    xunit.extensibility.execution (2.8)
-      xunit.extensibility.core (2.8)
-    xunit.runner.utility (2.8)
+    xunit.extensibility.execution (2.9.2)
+      xunit.extensibility.core (2.9.2)
+    xunit.runner.utility (2.9.2)
       xunit.abstractions (>= 2.0.3)
-    xunit.runner.visualstudio (2.8)
+    xunit.runner.visualstudio (2.8.2)
diff --git a/csharp/paket.main.bzl b/csharp/paket.main.bzl
index a3e778088cd..c8e6dbf2c8d 100644
--- a/csharp/paket.main.bzl
+++ b/csharp/paket.main.bzl
@@ -7,72 +7,72 @@ def main():
     nuget_repo(
         name = "paket.main",
         packages = [
-            {"name": "Basic.CompilerLog.Util", "id": "Basic.CompilerLog.Util", "version": "0.7.8", "sha512": "sha512-l4HWgecvjVCLOYNbdo7NiW+icYbOmPolc6xYacawIb8OKGBdncAR4gECP9NzRcOqKqe+Y6bp/zym1MyWMtUmbQ==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": ["MSBuild.StructuredLogger", "MessagePack", "Microsoft.CodeAnalysis", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.Extensions.ObjectPool"], "net462": ["MSBuild.StructuredLogger", "MessagePack", "Microsoft.CodeAnalysis", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.Extensions.ObjectPool"], "net47": ["MSBuild.StructuredLogger", "MessagePack", "Microsoft.CodeAnalysis", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.Extensions.ObjectPool"], "net471": ["MSBuild.StructuredLogger", "MessagePack", "Microsoft.CodeAnalysis", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.Extensions.ObjectPool"], "net472": ["MSBuild.StructuredLogger", "MessagePack", "Microsoft.CodeAnalysis", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.Extensions.ObjectPool"], "net48": ["MSBuild.StructuredLogger", "MessagePack", "Microsoft.CodeAnalysis", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.Extensions.ObjectPool"], "net5.0": ["MSBuild.StructuredLogger", "MessagePack", "Microsoft.CodeAnalysis", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.Extensions.ObjectPool"], "net6.0": ["MSBuild.StructuredLogger", "MessagePack", "Microsoft.CodeAnalysis", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.Extensions.ObjectPool"], "net7.0": ["MSBuild.StructuredLogger", "MessagePack", "Microsoft.CodeAnalysis", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.Extensions.ObjectPool"], "net8.0": ["MSBuild.StructuredLogger", "MessagePack", "Microsoft.CodeAnalysis", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.Extensions.ObjectPool"], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": ["MSBuild.StructuredLogger", "MessagePack", "Microsoft.CodeAnalysis", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.Extensions.ObjectPool"], "netcoreapp2.1": ["MSBuild.StructuredLogger", "MessagePack", "Microsoft.CodeAnalysis", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.Extensions.ObjectPool"], "netcoreapp2.2": ["MSBuild.StructuredLogger", "MessagePack", "Microsoft.CodeAnalysis", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.Extensions.ObjectPool"], "netcoreapp3.0": ["MSBuild.StructuredLogger", "MessagePack", "Microsoft.CodeAnalysis", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.Extensions.ObjectPool"], "netcoreapp3.1": ["MSBuild.StructuredLogger", "MessagePack", "Microsoft.CodeAnalysis", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.Extensions.ObjectPool"], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": ["MSBuild.StructuredLogger", "MessagePack", "Microsoft.CodeAnalysis", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.Extensions.ObjectPool"], "netstandard2.1": ["MSBuild.StructuredLogger", "MessagePack", "Microsoft.CodeAnalysis", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.Extensions.ObjectPool"]}, "targeting_pack_overrides": [], "framework_list": []},
-            {"name": "Humanizer.Core", "id": "Humanizer.Core", "version": "2.14.1", "sha512": "sha512-yzqGU/HKNLZ9Uvr6kvSc3wYV/S5O/IvklIUW5WF7MuivGLY8wS5IZnLPkt7D1KW8Et2Enl0I3Lzg2vGWM24Xsw==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": [], "net462": [], "net47": [], "net471": [], "net472": [], "net48": [], "net5.0": [], "net6.0": [], "net7.0": [], "net8.0": [], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": [], "netcoreapp2.1": [], "netcoreapp2.2": [], "netcoreapp3.0": [], "netcoreapp3.1": [], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": [], "netstandard2.1": []}, "targeting_pack_overrides": [], "framework_list": []},
-            {"name": "MessagePack", "id": "MessagePack", "version": "2.5.129", "sha512": "sha512-wpw2dHkE5AcvMYKE4MrWuoeZ2jeaneDlqAgplxm6yKqPXeUVI2h5DPrKjsljnJSNRZOm3tunasw18Q9xj/3UoA==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": ["MessagePack.Annotations", "Microsoft.NET.StringTools", "System.Collections.Immutable", "System.Runtime.CompilerServices.Unsafe"], "net462": ["MessagePack.Annotations", "Microsoft.NET.StringTools", "System.Collections.Immutable", "System.Runtime.CompilerServices.Unsafe"], "net47": ["MessagePack.Annotations", "Microsoft.NET.StringTools", "System.Collections.Immutable", "System.Runtime.CompilerServices.Unsafe"], "net471": ["MessagePack.Annotations", "Microsoft.NET.StringTools", "System.Collections.Immutable", "System.Runtime.CompilerServices.Unsafe"], "net472": ["MessagePack.Annotations", "Microsoft.NET.StringTools", "System.Collections.Immutable", "System.Runtime.CompilerServices.Unsafe"], "net48": ["MessagePack.Annotations", "Microsoft.NET.StringTools", "System.Collections.Immutable", "System.Runtime.CompilerServices.Unsafe"], "net5.0": ["MessagePack.Annotations", "Microsoft.NET.StringTools", "System.Collections.Immutable", "System.Runtime.CompilerServices.Unsafe"], "net6.0": ["MessagePack.Annotations", "Microsoft.NET.StringTools", "System.Runtime.CompilerServices.Unsafe"], "net7.0": ["MessagePack.Annotations", "Microsoft.NET.StringTools", "System.Runtime.CompilerServices.Unsafe"], "net8.0": ["MessagePack.Annotations", "Microsoft.NET.StringTools", "System.Runtime.CompilerServices.Unsafe"], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": ["MessagePack.Annotations", "Microsoft.NET.StringTools", "System.Collections.Immutable", "System.Runtime.CompilerServices.Unsafe"], "netcoreapp2.1": ["MessagePack.Annotations", "Microsoft.NET.StringTools", "System.Collections.Immutable", "System.Runtime.CompilerServices.Unsafe"], "netcoreapp2.2": ["MessagePack.Annotations", "Microsoft.NET.StringTools", "System.Collections.Immutable", "System.Runtime.CompilerServices.Unsafe"], "netcoreapp3.0": ["MessagePack.Annotations", "Microsoft.NET.StringTools", "System.Collections.Immutable", "System.Runtime.CompilerServices.Unsafe"], "netcoreapp3.1": ["MessagePack.Annotations", "Microsoft.NET.StringTools", "System.Collections.Immutable", "System.Runtime.CompilerServices.Unsafe"], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": ["MessagePack.Annotations", "Microsoft.NET.StringTools", "System.Collections.Immutable", "System.Runtime.CompilerServices.Unsafe"], "netstandard2.1": ["MessagePack.Annotations", "Microsoft.NET.StringTools", "System.Collections.Immutable", "System.Runtime.CompilerServices.Unsafe"]}, "targeting_pack_overrides": [], "framework_list": []},
-            {"name": "MessagePack.Annotations", "id": "MessagePack.Annotations", "version": "2.5.129", "sha512": "sha512-mr12dLr06Kp7Ra7+GUXHbuxt/gbi6RPGPw1mpSvZsubs7hJxzHDtYTb5KKuseu5cpzOUDfsGcaW+Bo0+lqCFAA==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": [], "net462": [], "net47": [], "net471": [], "net472": [], "net48": [], "net5.0": [], "net6.0": [], "net7.0": [], "net8.0": [], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": [], "netcoreapp2.1": [], "netcoreapp2.2": [], "netcoreapp3.0": [], "netcoreapp3.1": [], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": [], "netstandard2.1": []}, "targeting_pack_overrides": [], "framework_list": []},
-            {"name": "Microsoft.Build", "id": "Microsoft.Build", "version": "17.8.3", "sha512": "sha512-jRz++ltVTU9xGAYSnI7fGwLIsg/AwINaxlXaJrcMszO+fyh1xJ8gKZkDz10foT/5y26jZC6G93wyp85NVHc+lA==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": [], "net462": [], "net47": [], "net471": [], "net472": ["Microsoft.Build.Framework", "Microsoft.NET.StringTools", "System.Collections.Immutable", "System.Configuration.ConfigurationManager", "System.Reflection.MetadataLoadContext", "System.Security.Principal.Windows", "System.Threading.Tasks.Dataflow", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe"], "net48": ["Microsoft.Build.Framework", "Microsoft.NET.StringTools", "System.Collections.Immutable", "System.Configuration.ConfigurationManager", "System.Reflection.MetadataLoadContext", "System.Security.Principal.Windows", "System.Threading.Tasks.Dataflow", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe"], "net5.0": [], "net6.0": [], "net7.0": [], "net8.0": ["Microsoft.Build.Framework", "Microsoft.NET.StringTools", "System.Collections.Immutable", "System.Configuration.ConfigurationManager", "System.Reflection.MetadataLoadContext", "System.Security.Principal.Windows", "System.Threading.Tasks.Dataflow", "System.Reflection.Metadata"], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": [], "netcoreapp2.1": [], "netcoreapp2.2": [], "netcoreapp3.0": [], "netcoreapp3.1": [], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": [], "netstandard2.1": []}, "targeting_pack_overrides": [], "framework_list": []},
-            {"name": "Microsoft.Build.Framework", "id": "Microsoft.Build.Framework", "version": "17.8.3", "sha512": "sha512-xDOoj8lpNohM0Sieo4sJ47m/3SAquclF8wFZeAYYuDRHc8hII4XWPhSafFmw5A4TMGOyV08Z1TrrqES9HxMB3Q==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": ["System.Runtime.CompilerServices.Unsafe", "System.Security.Principal.Windows"], "net462": ["System.Runtime.CompilerServices.Unsafe", "System.Security.Principal.Windows"], "net47": ["System.Runtime.CompilerServices.Unsafe", "System.Security.Principal.Windows"], "net471": ["System.Runtime.CompilerServices.Unsafe", "System.Security.Principal.Windows"], "net472": ["System.Runtime.CompilerServices.Unsafe"], "net48": ["System.Runtime.CompilerServices.Unsafe"], "net5.0": ["System.Runtime.CompilerServices.Unsafe", "System.Security.Principal.Windows"], "net6.0": ["System.Runtime.CompilerServices.Unsafe", "System.Security.Principal.Windows"], "net7.0": ["System.Runtime.CompilerServices.Unsafe", "System.Security.Principal.Windows"], "net8.0": [], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": ["System.Runtime.CompilerServices.Unsafe", "System.Security.Principal.Windows"], "netcoreapp2.1": ["System.Runtime.CompilerServices.Unsafe", "System.Security.Principal.Windows"], "netcoreapp2.2": ["System.Runtime.CompilerServices.Unsafe", "System.Security.Principal.Windows"], "netcoreapp3.0": ["System.Runtime.CompilerServices.Unsafe", "System.Security.Principal.Windows"], "netcoreapp3.1": ["System.Runtime.CompilerServices.Unsafe", "System.Security.Principal.Windows"], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": ["System.Runtime.CompilerServices.Unsafe", "System.Security.Principal.Windows"], "netstandard2.1": ["System.Runtime.CompilerServices.Unsafe", "System.Security.Principal.Windows"]}, "targeting_pack_overrides": [], "framework_list": []},
-            {"name": "Microsoft.Build.Utilities.Core", "id": "Microsoft.Build.Utilities.Core", "version": "17.5.0", "sha512": "sha512-La1NFQ7SVz1pVGEUnG15BQG26jJkRMCiitySBXLhuTYf9IG6eZ5j5UFjnM4EFKSVKbictRv+D/F0dQtsCiK9ag==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": ["Microsoft.Build.Framework", "Microsoft.NET.StringTools", "System.Collections.Immutable", "System.Configuration.ConfigurationManager", "System.Security.Permissions"], "net462": ["Microsoft.Build.Framework", "Microsoft.NET.StringTools", "System.Collections.Immutable", "System.Configuration.ConfigurationManager", "System.Security.Permissions"], "net47": ["Microsoft.Build.Framework", "Microsoft.NET.StringTools", "System.Collections.Immutable", "System.Configuration.ConfigurationManager", "System.Security.Permissions"], "net471": ["Microsoft.Build.Framework", "Microsoft.NET.StringTools", "System.Collections.Immutable", "System.Configuration.ConfigurationManager", "System.Security.Permissions"], "net472": ["Microsoft.Build.Framework", "Microsoft.NET.StringTools", "System.Collections.Immutable", "System.Configuration.ConfigurationManager"], "net48": ["Microsoft.Build.Framework", "Microsoft.NET.StringTools", "System.Collections.Immutable", "System.Configuration.ConfigurationManager"], "net5.0": ["Microsoft.Build.Framework", "Microsoft.NET.StringTools", "System.Collections.Immutable", "System.Configuration.ConfigurationManager", "System.Security.Permissions"], "net6.0": ["Microsoft.Build.Framework", "Microsoft.NET.StringTools", "System.Collections.Immutable", "System.Configuration.ConfigurationManager", "System.Security.Permissions"], "net7.0": ["Microsoft.Build.Framework", "Microsoft.NET.StringTools", "System.Collections.Immutable", "System.Configuration.ConfigurationManager"], "net8.0": ["Microsoft.Build.Framework", "Microsoft.NET.StringTools", "System.Collections.Immutable", "System.Configuration.ConfigurationManager"], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": ["Microsoft.Build.Framework", "Microsoft.NET.StringTools", "System.Collections.Immutable", "System.Configuration.ConfigurationManager", "System.Security.Permissions"], "netcoreapp2.1": ["Microsoft.Build.Framework", "Microsoft.NET.StringTools", "System.Collections.Immutable", "System.Configuration.ConfigurationManager", "System.Security.Permissions"], "netcoreapp2.2": ["Microsoft.Build.Framework", "Microsoft.NET.StringTools", "System.Collections.Immutable", "System.Configuration.ConfigurationManager", "System.Security.Permissions"], "netcoreapp3.0": ["Microsoft.Build.Framework", "Microsoft.NET.StringTools", "System.Collections.Immutable", "System.Configuration.ConfigurationManager", "System.Security.Permissions"], "netcoreapp3.1": ["Microsoft.Build.Framework", "Microsoft.NET.StringTools", "System.Collections.Immutable", "System.Configuration.ConfigurationManager", "System.Security.Permissions"], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": ["Microsoft.Build.Framework", "Microsoft.NET.StringTools", "System.Collections.Immutable", "System.Configuration.ConfigurationManager", "System.Security.Permissions"], "netstandard2.1": ["Microsoft.Build.Framework", "Microsoft.NET.StringTools", "System.Collections.Immutable", "System.Configuration.ConfigurationManager", "System.Security.Permissions"]}, "targeting_pack_overrides": [], "framework_list": []},
-            {"name": "Microsoft.CodeAnalysis", "id": "Microsoft.CodeAnalysis", "version": "4.9.2", "sha512": "sha512-CJh/yj/ZWnDn0qRDovqeb7qhXl4MDFR5CELAQ2B5K9dcEC6JPg7Fkm2ADRiBM4UF7ub+n6fkiE5+/+GPD5WbFg==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": ["Microsoft.CodeAnalysis.CSharp.Workspaces", "Microsoft.CodeAnalysis.VisualBasic.Workspaces"], "net462": ["Microsoft.CodeAnalysis.CSharp.Workspaces", "Microsoft.CodeAnalysis.VisualBasic.Workspaces"], "net47": ["Microsoft.CodeAnalysis.CSharp.Workspaces", "Microsoft.CodeAnalysis.VisualBasic.Workspaces"], "net471": ["Microsoft.CodeAnalysis.CSharp.Workspaces", "Microsoft.CodeAnalysis.VisualBasic.Workspaces"], "net472": ["Microsoft.CodeAnalysis.CSharp.Workspaces", "Microsoft.CodeAnalysis.VisualBasic.Workspaces"], "net48": ["Microsoft.CodeAnalysis.CSharp.Workspaces", "Microsoft.CodeAnalysis.VisualBasic.Workspaces"], "net5.0": ["Microsoft.CodeAnalysis.CSharp.Workspaces", "Microsoft.CodeAnalysis.VisualBasic.Workspaces"], "net6.0": ["Microsoft.CodeAnalysis.CSharp.Workspaces", "Microsoft.CodeAnalysis.VisualBasic.Workspaces"], "net7.0": ["Microsoft.CodeAnalysis.CSharp.Workspaces", "Microsoft.CodeAnalysis.VisualBasic.Workspaces"], "net8.0": ["Microsoft.CodeAnalysis.CSharp.Workspaces", "Microsoft.CodeAnalysis.VisualBasic.Workspaces"], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": ["Microsoft.CodeAnalysis.CSharp.Workspaces", "Microsoft.CodeAnalysis.VisualBasic.Workspaces"], "netcoreapp2.1": ["Microsoft.CodeAnalysis.CSharp.Workspaces", "Microsoft.CodeAnalysis.VisualBasic.Workspaces"], "netcoreapp2.2": ["Microsoft.CodeAnalysis.CSharp.Workspaces", "Microsoft.CodeAnalysis.VisualBasic.Workspaces"], "netcoreapp3.0": ["Microsoft.CodeAnalysis.CSharp.Workspaces", "Microsoft.CodeAnalysis.VisualBasic.Workspaces"], "netcoreapp3.1": ["Microsoft.CodeAnalysis.CSharp.Workspaces", "Microsoft.CodeAnalysis.VisualBasic.Workspaces"], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": ["Microsoft.CodeAnalysis.CSharp.Workspaces", "Microsoft.CodeAnalysis.VisualBasic.Workspaces"], "netstandard2.1": ["Microsoft.CodeAnalysis.CSharp.Workspaces", "Microsoft.CodeAnalysis.VisualBasic.Workspaces"]}, "targeting_pack_overrides": [], "framework_list": []},
-            {"name": "Microsoft.CodeAnalysis.Analyzers", "id": "Microsoft.CodeAnalysis.Analyzers", "version": "3.3.4", "sha512": "sha512-I+Riw6/6WjNICydoiNpDjN/GGP7u4XsL6VsI9lG/OjFufH3flvSEy/fxNhGDVGwZWwq/5BlnqX+LH2dmheaPfg==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": [], "net462": [], "net47": [], "net471": [], "net472": [], "net48": [], "net5.0": [], "net6.0": [], "net7.0": [], "net8.0": [], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": [], "netcoreapp2.1": [], "netcoreapp2.2": [], "netcoreapp3.0": [], "netcoreapp3.1": [], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": [], "netstandard2.1": []}, "targeting_pack_overrides": [], "framework_list": []},
-            {"name": "Microsoft.CodeAnalysis.Common", "id": "Microsoft.CodeAnalysis.Common", "version": "4.9.2", "sha512": "sha512-XCtqPQdnoqfrBSidFWIESm8exXVHF4yPY94e84St2PVZPc2bGeQNXdFNwadu1Bd2sr/bAgM5B0UHbCqBz+/SeQ==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": ["Microsoft.CodeAnalysis.Analyzers", "System.Collections.Immutable", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe"], "net462": ["Microsoft.CodeAnalysis.Analyzers", "System.Collections.Immutable", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe"], "net47": ["Microsoft.CodeAnalysis.Analyzers", "System.Collections.Immutable", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe"], "net471": ["Microsoft.CodeAnalysis.Analyzers", "System.Collections.Immutable", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe"], "net472": ["Microsoft.CodeAnalysis.Analyzers", "System.Collections.Immutable", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe"], "net48": ["Microsoft.CodeAnalysis.Analyzers", "System.Collections.Immutable", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe"], "net5.0": ["Microsoft.CodeAnalysis.Analyzers", "System.Collections.Immutable", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe"], "net6.0": ["Microsoft.CodeAnalysis.Analyzers", "System.Collections.Immutable", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe"], "net7.0": ["Microsoft.CodeAnalysis.Analyzers", "System.Collections.Immutable", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe"], "net8.0": ["Microsoft.CodeAnalysis.Analyzers", "System.Collections.Immutable", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe"], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": ["Microsoft.CodeAnalysis.Analyzers", "System.Collections.Immutable", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe"], "netcoreapp2.1": ["Microsoft.CodeAnalysis.Analyzers", "System.Collections.Immutable", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe"], "netcoreapp2.2": ["Microsoft.CodeAnalysis.Analyzers", "System.Collections.Immutable", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe"], "netcoreapp3.0": ["Microsoft.CodeAnalysis.Analyzers", "System.Collections.Immutable", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe"], "netcoreapp3.1": ["Microsoft.CodeAnalysis.Analyzers", "System.Collections.Immutable", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe"], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": ["Microsoft.CodeAnalysis.Analyzers", "System.Collections.Immutable", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe"], "netstandard2.1": ["Microsoft.CodeAnalysis.Analyzers", "System.Collections.Immutable", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe"]}, "targeting_pack_overrides": [], "framework_list": []},
-            {"name": "Microsoft.CodeAnalysis.CSharp", "id": "Microsoft.CodeAnalysis.CSharp", "version": "4.9.2", "sha512": "sha512-oy5nUdJOaOQEjUZimhYH4xU6nVxt8ctkdP7HT2fc32ecvH50QeIwJXgjNt7MGUyhJO+Wd3SipQWQ5QyDw7VuLg==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": ["Microsoft.CodeAnalysis.Common"], "net462": ["Microsoft.CodeAnalysis.Common"], "net47": ["Microsoft.CodeAnalysis.Common"], "net471": ["Microsoft.CodeAnalysis.Common"], "net472": ["Microsoft.CodeAnalysis.Common"], "net48": ["Microsoft.CodeAnalysis.Common"], "net5.0": ["Microsoft.CodeAnalysis.Common"], "net6.0": ["Microsoft.CodeAnalysis.Common"], "net7.0": ["Microsoft.CodeAnalysis.Common"], "net8.0": ["Microsoft.CodeAnalysis.Common"], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": ["Microsoft.CodeAnalysis.Common"], "netcoreapp2.1": ["Microsoft.CodeAnalysis.Common"], "netcoreapp2.2": ["Microsoft.CodeAnalysis.Common"], "netcoreapp3.0": ["Microsoft.CodeAnalysis.Common"], "netcoreapp3.1": ["Microsoft.CodeAnalysis.Common"], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": ["Microsoft.CodeAnalysis.Common"], "netstandard2.1": ["Microsoft.CodeAnalysis.Common"]}, "targeting_pack_overrides": [], "framework_list": []},
-            {"name": "Microsoft.CodeAnalysis.CSharp.Workspaces", "id": "Microsoft.CodeAnalysis.CSharp.Workspaces", "version": "4.9.2", "sha512": "sha512-NfP1c+OjN0KbFxhSN2DXilIjZzH6p/DzkF+yemB0v/7nhQkvRq7cDle6TpWgpw12JKOSa6lSirfECbRSyLFGhA==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.Workspaces.Common", "Humanizer.Core"], "net462": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.Workspaces.Common", "Humanizer.Core"], "net47": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.Workspaces.Common", "Humanizer.Core"], "net471": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.Workspaces.Common", "Humanizer.Core"], "net472": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.Workspaces.Common", "Humanizer.Core"], "net48": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.Workspaces.Common", "Humanizer.Core"], "net5.0": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.Workspaces.Common", "Humanizer.Core"], "net6.0": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.Workspaces.Common", "Humanizer.Core"], "net7.0": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.Workspaces.Common", "Humanizer.Core"], "net8.0": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.Workspaces.Common", "Humanizer.Core"], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.Workspaces.Common", "Humanizer.Core"], "netcoreapp2.1": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.Workspaces.Common", "Humanizer.Core"], "netcoreapp2.2": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.Workspaces.Common", "Humanizer.Core"], "netcoreapp3.0": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.Workspaces.Common", "Humanizer.Core"], "netcoreapp3.1": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.Workspaces.Common", "Humanizer.Core"], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.Workspaces.Common", "Humanizer.Core"], "netstandard2.1": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.Workspaces.Common", "Humanizer.Core"]}, "targeting_pack_overrides": [], "framework_list": []},
-            {"name": "Microsoft.CodeAnalysis.VisualBasic", "id": "Microsoft.CodeAnalysis.VisualBasic", "version": "4.9.2", "sha512": "sha512-Jx3d7jpZ2bdCb/FzVBPD2a4P8jFDhdoEugGoxLxVKtBDzHA5+RdQL0BWvzwrP1Tdw3YPshrUelNlZXmcNXqZyA==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": ["Microsoft.CodeAnalysis.Common"], "net462": ["Microsoft.CodeAnalysis.Common"], "net47": ["Microsoft.CodeAnalysis.Common"], "net471": ["Microsoft.CodeAnalysis.Common"], "net472": ["Microsoft.CodeAnalysis.Common"], "net48": ["Microsoft.CodeAnalysis.Common"], "net5.0": ["Microsoft.CodeAnalysis.Common"], "net6.0": ["Microsoft.CodeAnalysis.Common"], "net7.0": ["Microsoft.CodeAnalysis.Common"], "net8.0": ["Microsoft.CodeAnalysis.Common"], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": ["Microsoft.CodeAnalysis.Common"], "netcoreapp2.1": ["Microsoft.CodeAnalysis.Common"], "netcoreapp2.2": ["Microsoft.CodeAnalysis.Common"], "netcoreapp3.0": ["Microsoft.CodeAnalysis.Common"], "netcoreapp3.1": ["Microsoft.CodeAnalysis.Common"], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": ["Microsoft.CodeAnalysis.Common"], "netstandard2.1": ["Microsoft.CodeAnalysis.Common"]}, "targeting_pack_overrides": [], "framework_list": []},
-            {"name": "Microsoft.CodeAnalysis.VisualBasic.Workspaces", "id": "Microsoft.CodeAnalysis.VisualBasic.Workspaces", "version": "4.9.2", "sha512": "sha512-v07rvZvckHiPLDzKXFs9AXfEGsDeTvR+N9YHO9wQqboXgms4HCv0fTrZOOgqM/aVS7racJKRo1tf62UfjqMeEw==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.CodeAnalysis.Workspaces.Common"], "net462": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.CodeAnalysis.Workspaces.Common"], "net47": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.CodeAnalysis.Workspaces.Common"], "net471": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.CodeAnalysis.Workspaces.Common"], "net472": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.CodeAnalysis.Workspaces.Common"], "net48": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.CodeAnalysis.Workspaces.Common"], "net5.0": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.CodeAnalysis.Workspaces.Common"], "net6.0": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.CodeAnalysis.Workspaces.Common"], "net7.0": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.CodeAnalysis.Workspaces.Common"], "net8.0": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.CodeAnalysis.Workspaces.Common"], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.CodeAnalysis.Workspaces.Common"], "netcoreapp2.1": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.CodeAnalysis.Workspaces.Common"], "netcoreapp2.2": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.CodeAnalysis.Workspaces.Common"], "netcoreapp3.0": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.CodeAnalysis.Workspaces.Common"], "netcoreapp3.1": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.CodeAnalysis.Workspaces.Common"], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.CodeAnalysis.Workspaces.Common"], "netstandard2.1": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.CodeAnalysis.Workspaces.Common"]}, "targeting_pack_overrides": [], "framework_list": []},
-            {"name": "Microsoft.CodeAnalysis.Workspaces.Common", "id": "Microsoft.CodeAnalysis.Workspaces.Common", "version": "4.9.2", "sha512": "sha512-DieswZYcYVGDPeT6m7M4i+0aKkjSgyjmI9z9HJEDSRZdvXfKYLEKwmlFGUTyzFS4brnyMCwLSiw2KWVAydpzVA==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": ["Microsoft.CodeAnalysis.Common", "Humanizer.Core", "System.Composition", "System.IO.Pipelines", "System.Threading.Channels"], "net462": ["Microsoft.CodeAnalysis.Common", "Humanizer.Core", "System.Composition", "System.IO.Pipelines", "System.Threading.Channels"], "net47": ["Microsoft.CodeAnalysis.Common", "Humanizer.Core", "System.Composition", "System.IO.Pipelines", "System.Threading.Channels"], "net471": ["Microsoft.CodeAnalysis.Common", "Humanizer.Core", "System.Composition", "System.IO.Pipelines", "System.Threading.Channels"], "net472": ["Microsoft.CodeAnalysis.Common", "Humanizer.Core", "System.Composition", "System.IO.Pipelines", "System.Threading.Channels"], "net48": ["Microsoft.CodeAnalysis.Common", "Humanizer.Core", "System.Composition", "System.IO.Pipelines", "System.Threading.Channels"], "net5.0": ["Microsoft.CodeAnalysis.Common", "Humanizer.Core", "System.Composition", "System.IO.Pipelines", "System.Threading.Channels"], "net6.0": ["Microsoft.CodeAnalysis.Common", "Humanizer.Core", "System.Composition", "System.IO.Pipelines", "System.Threading.Channels"], "net7.0": ["Microsoft.CodeAnalysis.Common", "Humanizer.Core", "System.Composition", "System.IO.Pipelines", "System.Threading.Channels"], "net8.0": ["Microsoft.CodeAnalysis.Common", "Humanizer.Core", "System.Composition", "System.IO.Pipelines", "System.Threading.Channels"], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": ["Microsoft.CodeAnalysis.Common", "Humanizer.Core", "System.Composition", "System.IO.Pipelines", "System.Threading.Channels"], "netcoreapp2.1": ["Microsoft.CodeAnalysis.Common", "Humanizer.Core", "System.Composition", "System.IO.Pipelines", "System.Threading.Channels"], "netcoreapp2.2": ["Microsoft.CodeAnalysis.Common", "Humanizer.Core", "System.Composition", "System.IO.Pipelines", "System.Threading.Channels"], "netcoreapp3.0": ["Microsoft.CodeAnalysis.Common", "Humanizer.Core", "System.Composition", "System.IO.Pipelines", "System.Threading.Channels"], "netcoreapp3.1": ["Microsoft.CodeAnalysis.Common", "Humanizer.Core", "System.Composition", "System.IO.Pipelines", "System.Threading.Channels"], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": ["Microsoft.CodeAnalysis.Common", "Humanizer.Core", "System.Composition", "System.IO.Pipelines", "System.Threading.Channels"], "netstandard2.1": ["Microsoft.CodeAnalysis.Common", "Humanizer.Core", "System.Composition", "System.IO.Pipelines", "System.Threading.Channels"]}, "targeting_pack_overrides": [], "framework_list": []},
-            {"name": "Microsoft.CodeCoverage", "id": "Microsoft.CodeCoverage", "version": "17.9.0", "sha512": "sha512-QEb48Z408yBfe/f156te98pfHwjvLOKl+UC1Pzg7KH1PDXXgk8KN8ZOEdYGrAiG43pC99Oo39bCb2R5WE+e5VA==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": [], "net462": [], "net47": [], "net471": [], "net472": [], "net48": [], "net5.0": [], "net6.0": [], "net7.0": [], "net8.0": [], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": [], "netcoreapp2.1": [], "netcoreapp2.2": [], "netcoreapp3.0": [], "netcoreapp3.1": [], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": [], "netstandard2.1": []}, "targeting_pack_overrides": [], "framework_list": []},
-            {"name": "Microsoft.Extensions.ObjectPool", "id": "Microsoft.Extensions.ObjectPool", "version": "7.0.13", "sha512": "sha512-N66kAzKBfcs4zIX/iVMUOhfn8Xv3Ye1QpLGS8IUSpCHa+Vxh2ZsdDiqd0Y2m7ryPU6FU2LOTnZ+0ymmm83vC6w==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": [], "net462": [], "net47": [], "net471": [], "net472": [], "net48": [], "net5.0": [], "net6.0": [], "net7.0": [], "net8.0": [], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": [], "netcoreapp2.1": [], "netcoreapp2.2": [], "netcoreapp3.0": [], "netcoreapp3.1": [], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": [], "netstandard2.1": []}, "targeting_pack_overrides": [], "framework_list": []},
-            {"name": "Microsoft.NET.StringTools", "id": "Microsoft.NET.StringTools", "version": "17.8.3", "sha512": "sha512-3N/Ika66JZeORrIZ68fap6M0LSQ9+SQz277NxjA/dxETnR3dZwJXj67jAAc4FkijG6w//QzrC5NEregtIVjz1w==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": [], "net462": [], "net47": [], "net471": [], "net472": ["System.Runtime.CompilerServices.Unsafe"], "net48": ["System.Runtime.CompilerServices.Unsafe"], "net5.0": ["System.Runtime.CompilerServices.Unsafe"], "net6.0": ["System.Runtime.CompilerServices.Unsafe"], "net7.0": ["System.Runtime.CompilerServices.Unsafe"], "net8.0": [], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": ["System.Runtime.CompilerServices.Unsafe"], "netcoreapp2.1": ["System.Runtime.CompilerServices.Unsafe"], "netcoreapp2.2": ["System.Runtime.CompilerServices.Unsafe"], "netcoreapp3.0": ["System.Runtime.CompilerServices.Unsafe"], "netcoreapp3.1": ["System.Runtime.CompilerServices.Unsafe"], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": ["System.Runtime.CompilerServices.Unsafe"], "netstandard2.1": ["System.Runtime.CompilerServices.Unsafe"]}, "targeting_pack_overrides": [], "framework_list": []},
-            {"name": "Microsoft.NET.Test.Sdk", "id": "Microsoft.NET.Test.Sdk", "version": "17.9.0", "sha512": "sha512-1WsHeRGhVUDonn7uT+vAGkYmJF57QTR+0PDpoIvDPq+vJtaNzrUHJbPFrU3aV+y68D+0wlj4QRop5fzvxFBJkA==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": [], "net462": ["Microsoft.CodeCoverage"], "net47": ["Microsoft.CodeCoverage"], "net471": ["Microsoft.CodeCoverage"], "net472": ["Microsoft.CodeCoverage"], "net48": ["Microsoft.CodeCoverage"], "net5.0": ["Microsoft.TestPlatform.TestHost", "Microsoft.CodeCoverage"], "net6.0": ["Microsoft.TestPlatform.TestHost", "Microsoft.CodeCoverage"], "net7.0": ["Microsoft.TestPlatform.TestHost", "Microsoft.CodeCoverage"], "net8.0": ["Microsoft.TestPlatform.TestHost", "Microsoft.CodeCoverage"], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": [], "netcoreapp2.1": [], "netcoreapp2.2": [], "netcoreapp3.0": [], "netcoreapp3.1": ["Microsoft.TestPlatform.TestHost", "Microsoft.CodeCoverage"], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": [], "netstandard2.1": []}, "targeting_pack_overrides": [], "framework_list": []},
-            {"name": "Microsoft.NETCore.Platforms", "id": "Microsoft.NETCore.Platforms", "version": "1.1.1", "sha512": "sha512-mDUJD1eLXIzmUnWCzWlmNQZGDp/cVGT8KyhzMcJNk2nlfdFUOoZai9idT8/FacJr8Nv8zhAmdf39FHm5qWUoGQ==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": [], "net462": [], "net47": [], "net471": [], "net472": [], "net48": [], "net5.0": [], "net6.0": [], "net7.0": [], "net8.0": [], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": [], "netcoreapp2.1": [], "netcoreapp2.2": [], "netcoreapp3.0": [], "netcoreapp3.1": [], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": [], "netstandard2.1": []}, "targeting_pack_overrides": [], "framework_list": []},
-            {"name": "Microsoft.NETCore.Targets", "id": "Microsoft.NETCore.Targets", "version": "1.1.3", "sha512": "sha512-pxwq8g2PYRiEF5KXVjmZFMNTqsg2Gr1puv/pR1sqAduAKHAGbaCuJ6+yc3pAJseClQUD29S2Ubrm7n/ZD78dUg==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": [], "net462": [], "net47": [], "net471": [], "net472": [], "net48": [], "net5.0": [], "net6.0": [], "net7.0": [], "net8.0": [], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": [], "netcoreapp2.1": [], "netcoreapp2.2": [], "netcoreapp3.0": [], "netcoreapp3.1": [], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": [], "netstandard2.1": []}, "targeting_pack_overrides": [], "framework_list": []},
-            {"name": "Microsoft.TestPlatform.ObjectModel", "id": "Microsoft.TestPlatform.ObjectModel", "version": "17.9.0", "sha512": "sha512-Y3BIxwsZCgJp1+B2HXy+x9qNMG9XcEgMuRKGwGBH1/TxZmVW38RJTsCQ2wEbA/tzbKAzE0ebVmAZpaVFZ+BfNw==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": ["System.Reflection.Metadata"], "net462": ["System.Reflection.Metadata"], "net47": ["System.Reflection.Metadata"], "net471": ["System.Reflection.Metadata"], "net472": ["System.Reflection.Metadata"], "net48": ["System.Reflection.Metadata"], "net5.0": ["System.Reflection.Metadata"], "net6.0": ["System.Reflection.Metadata"], "net7.0": ["System.Reflection.Metadata"], "net8.0": ["System.Reflection.Metadata"], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": ["System.Reflection.Metadata"], "netcoreapp2.1": ["System.Reflection.Metadata"], "netcoreapp2.2": ["System.Reflection.Metadata"], "netcoreapp3.0": ["System.Reflection.Metadata"], "netcoreapp3.1": ["System.Reflection.Metadata"], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": ["System.Reflection.Metadata"], "netstandard2.1": ["System.Reflection.Metadata"]}, "targeting_pack_overrides": [], "framework_list": []},
-            {"name": "Microsoft.TestPlatform.TestHost", "id": "Microsoft.TestPlatform.TestHost", "version": "17.9.0", "sha512": "sha512-yCRsmzZaiv6/NTFzVxJVY4GaPqaLGi7E2VzUSDjvsvEhvlcQJQpozrBsegUmBr/xwgKpUE7i0gz2X2ZGO0PTGg==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": [], "net462": [], "net47": [], "net471": [], "net472": [], "net48": [], "net5.0": ["Microsoft.TestPlatform.ObjectModel", "Newtonsoft.Json"], "net6.0": ["Microsoft.TestPlatform.ObjectModel", "Newtonsoft.Json"], "net7.0": ["Microsoft.TestPlatform.ObjectModel", "Newtonsoft.Json"], "net8.0": ["Microsoft.TestPlatform.ObjectModel", "Newtonsoft.Json"], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": [], "netcoreapp2.1": [], "netcoreapp2.2": [], "netcoreapp3.0": [], "netcoreapp3.1": ["Microsoft.TestPlatform.ObjectModel", "Newtonsoft.Json"], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": [], "netstandard2.1": []}, "targeting_pack_overrides": [], "framework_list": []},
-            {"name": "Microsoft.Win32.Primitives", "id": "Microsoft.Win32.Primitives", "version": "4.3.0", "sha512": "sha512-Nm8Hp51y9tYcK3xD6qk43Wjftrg1mdH24CCJsTb6gr7HS21U1uA+CKPGEtUcVZbjU1y8Kynzm5eoJ7Pnx5gm8A==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": [], "net462": [], "net47": [], "net471": [], "net472": [], "net48": [], "net5.0": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime"], "net6.0": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime"], "net7.0": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime"], "net8.0": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime"], "netcoreapp1.0": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime"], "netcoreapp1.1": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime"], "netcoreapp2.0": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime"], "netcoreapp2.1": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime"], "netcoreapp2.2": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime"], "netcoreapp3.0": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime"], "netcoreapp3.1": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime"], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime"], "netstandard1.4": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime"], "netstandard1.5": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime"], "netstandard1.6": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime"], "netstandard2.0": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime"], "netstandard2.1": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime"]}, "targeting_pack_overrides": [], "framework_list": []},
-            {"name": "Microsoft.Win32.SystemEvents", "id": "Microsoft.Win32.SystemEvents", "version": "7.0.0", "sha512": "sha512-GO6SWx/wSZIFvxOn67Y6OiIGdz9JGCg5CRDDbSAAvBDQeZFbybu9sEOUb9w/vUlQv+A2XakTFZg9Ug1w+tgbWQ==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": [], "net462": [], "net47": [], "net471": [], "net472": [], "net48": [], "net5.0": [], "net6.0": [], "net7.0": [], "net8.0": [], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": [], "netcoreapp2.1": [], "netcoreapp2.2": [], "netcoreapp3.0": [], "netcoreapp3.1": [], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": [], "netstandard2.1": []}, "targeting_pack_overrides": [], "framework_list": []},
-            {"name": "Mono.Posix.NETStandard", "id": "Mono.Posix.NETStandard", "version": "1.0.0", "sha512": "sha512-RtGiutQZJAmajvQ0QvBvh73VJye85iW9f9tjZlzF88idLxNMo4lAktP/4Y9ilCpais0LDO0tpoICt9Hdv6wooA==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": [], "net462": [], "net47": [], "net471": [], "net472": [], "net48": [], "net5.0": [], "net6.0": [], "net7.0": [], "net8.0": [], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": [], "netcoreapp2.1": [], "netcoreapp2.2": [], "netcoreapp3.0": [], "netcoreapp3.1": [], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": [], "netstandard2.1": []}, "targeting_pack_overrides": [], "framework_list": []},
-            {"name": "MSBuild.StructuredLogger", "id": "MSBuild.StructuredLogger", "version": "2.2.235", "sha512": "sha512-9ige0SOByBirmeIYZ3fwlwbnXrYZA2trdZV7Mad8z7FiuGbVNOVkGYrzln/+G1eIvmRh9J0pt6xBLwqIYaMxyQ==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": ["Microsoft.Build.Framework", "Microsoft.Build.Utilities.Core"], "net462": ["Microsoft.Build.Framework", "Microsoft.Build.Utilities.Core"], "net47": ["Microsoft.Build.Framework", "Microsoft.Build.Utilities.Core"], "net471": ["Microsoft.Build.Framework", "Microsoft.Build.Utilities.Core"], "net472": ["Microsoft.Build.Framework", "Microsoft.Build.Utilities.Core"], "net48": ["Microsoft.Build.Framework", "Microsoft.Build.Utilities.Core"], "net5.0": ["Microsoft.Build.Framework", "Microsoft.Build.Utilities.Core"], "net6.0": ["Microsoft.Build.Framework", "Microsoft.Build.Utilities.Core"], "net7.0": ["Microsoft.Build.Framework", "Microsoft.Build.Utilities.Core"], "net8.0": ["Microsoft.Build.Framework", "Microsoft.Build.Utilities.Core"], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": ["Microsoft.Build.Framework", "Microsoft.Build.Utilities.Core"], "netcoreapp2.1": ["Microsoft.Build.Framework", "Microsoft.Build.Utilities.Core"], "netcoreapp2.2": ["Microsoft.Build.Framework", "Microsoft.Build.Utilities.Core"], "netcoreapp3.0": ["Microsoft.Build.Framework", "Microsoft.Build.Utilities.Core"], "netcoreapp3.1": ["Microsoft.Build.Framework", "Microsoft.Build.Utilities.Core"], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": ["Microsoft.Build.Framework", "Microsoft.Build.Utilities.Core"], "netstandard2.1": ["Microsoft.Build.Framework", "Microsoft.Build.Utilities.Core"]}, "targeting_pack_overrides": [], "framework_list": []},
-            {"name": "Newtonsoft.Json", "id": "Newtonsoft.Json", "version": "13.0.3", "sha512": "sha512-mbJSvHfRxfX3tR/U6n1WU+mWHXswYc+SB/hkOpx8yZZe68hNZGfymJu0cjsaJEkVzCMqePiU6LdIyogqfIn7kg==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": [], "net462": [], "net47": [], "net471": [], "net472": [], "net48": [], "net5.0": [], "net6.0": [], "net7.0": [], "net8.0": [], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": [], "netcoreapp2.1": [], "netcoreapp2.2": [], "netcoreapp3.0": [], "netcoreapp3.1": [], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": [], "netstandard2.1": []}, "targeting_pack_overrides": [], "framework_list": []},
-            {"name": "System.Collections.Immutable", "id": "System.Collections.Immutable", "version": "8.0.0", "sha512": "sha512-BXqVkcIrhimvvem6q2ChWkuW6XYYirvb6FlhvuwaMoBqBdpcr4nehJBKP65Tw40UqcUM6oDoODsecM0yjZ6AUw==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": ["System.Runtime.CompilerServices.Unsafe"], "net462": ["System.Runtime.CompilerServices.Unsafe"], "net47": ["System.Runtime.CompilerServices.Unsafe"], "net471": ["System.Runtime.CompilerServices.Unsafe"], "net472": ["System.Runtime.CompilerServices.Unsafe"], "net48": ["System.Runtime.CompilerServices.Unsafe"], "net5.0": ["System.Runtime.CompilerServices.Unsafe"], "net6.0": ["System.Runtime.CompilerServices.Unsafe"], "net7.0": [], "net8.0": [], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": ["System.Runtime.CompilerServices.Unsafe"], "netcoreapp2.1": ["System.Runtime.CompilerServices.Unsafe"], "netcoreapp2.2": ["System.Runtime.CompilerServices.Unsafe"], "netcoreapp3.0": ["System.Runtime.CompilerServices.Unsafe"], "netcoreapp3.1": ["System.Runtime.CompilerServices.Unsafe"], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": ["System.Runtime.CompilerServices.Unsafe"], "netstandard2.1": ["System.Runtime.CompilerServices.Unsafe"]}, "targeting_pack_overrides": [], "framework_list": []},
-            {"name": "System.Composition", "id": "System.Composition", "version": "8.0.0", "sha512": "sha512-/AZ/S+sX6awiSeSvOv7997aiwbU6HCcOBJDLecdYQJjDo+4nYCrWwWKQQIZ38VZ6BLh1pDmcYFPZockIuoRIYw==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": ["System.Composition.AttributedModel", "System.Composition.Convention", "System.Composition.Hosting", "System.Composition.Runtime", "System.Composition.TypedParts"], "net462": ["System.Composition.AttributedModel", "System.Composition.Convention", "System.Composition.Hosting", "System.Composition.Runtime", "System.Composition.TypedParts"], "net47": ["System.Composition.AttributedModel", "System.Composition.Convention", "System.Composition.Hosting", "System.Composition.Runtime", "System.Composition.TypedParts"], "net471": ["System.Composition.AttributedModel", "System.Composition.Convention", "System.Composition.Hosting", "System.Composition.Runtime", "System.Composition.TypedParts"], "net472": ["System.Composition.AttributedModel", "System.Composition.Convention", "System.Composition.Hosting", "System.Composition.Runtime", "System.Composition.TypedParts"], "net48": ["System.Composition.AttributedModel", "System.Composition.Convention", "System.Composition.Hosting", "System.Composition.Runtime", "System.Composition.TypedParts"], "net5.0": ["System.Composition.AttributedModel", "System.Composition.Convention", "System.Composition.Hosting", "System.Composition.Runtime", "System.Composition.TypedParts"], "net6.0": ["System.Composition.AttributedModel", "System.Composition.Convention", "System.Composition.Hosting", "System.Composition.Runtime", "System.Composition.TypedParts"], "net7.0": ["System.Composition.AttributedModel", "System.Composition.Convention", "System.Composition.Hosting", "System.Composition.Runtime", "System.Composition.TypedParts"], "net8.0": ["System.Composition.AttributedModel", "System.Composition.Convention", "System.Composition.Hosting", "System.Composition.Runtime", "System.Composition.TypedParts"], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": ["System.Composition.AttributedModel", "System.Composition.Convention", "System.Composition.Hosting", "System.Composition.Runtime", "System.Composition.TypedParts"], "netcoreapp2.1": ["System.Composition.AttributedModel", "System.Composition.Convention", "System.Composition.Hosting", "System.Composition.Runtime", "System.Composition.TypedParts"], "netcoreapp2.2": ["System.Composition.AttributedModel", "System.Composition.Convention", "System.Composition.Hosting", "System.Composition.Runtime", "System.Composition.TypedParts"], "netcoreapp3.0": ["System.Composition.AttributedModel", "System.Composition.Convention", "System.Composition.Hosting", "System.Composition.Runtime", "System.Composition.TypedParts"], "netcoreapp3.1": ["System.Composition.AttributedModel", "System.Composition.Convention", "System.Composition.Hosting", "System.Composition.Runtime", "System.Composition.TypedParts"], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": ["System.Composition.AttributedModel", "System.Composition.Convention", "System.Composition.Hosting", "System.Composition.Runtime", "System.Composition.TypedParts"], "netstandard2.1": ["System.Composition.AttributedModel", "System.Composition.Convention", "System.Composition.Hosting", "System.Composition.Runtime", "System.Composition.TypedParts"]}, "targeting_pack_overrides": [], "framework_list": []},
-            {"name": "System.Composition.AttributedModel", "id": "System.Composition.AttributedModel", "version": "8.0.0", "sha512": "sha512-gmEwpwXz+COPtuAASK+ichAg8+0oQAaPOV59g6fDdnt1KWbrymdixAn06bNbkdCUGcBXb8RX5k79cqg0Hqlv1g==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": [], "net462": [], "net47": [], "net471": [], "net472": [], "net48": [], "net5.0": [], "net6.0": [], "net7.0": [], "net8.0": [], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": [], "netcoreapp2.1": [], "netcoreapp2.2": [], "netcoreapp3.0": [], "netcoreapp3.1": [], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": [], "netstandard2.1": []}, "targeting_pack_overrides": [], "framework_list": []},
-            {"name": "System.Composition.Convention", "id": "System.Composition.Convention", "version": "8.0.0", "sha512": "sha512-MP7qMadQGUcMOEyGON5dmy9T+OXubvIx04kFHvTVPfZ/9+ns8dqmFToxoF7IDzJVSWmtOQHDUP2fL1x8F6slTA==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": ["System.Composition.AttributedModel"], "net462": ["System.Composition.AttributedModel"], "net47": ["System.Composition.AttributedModel"], "net471": ["System.Composition.AttributedModel"], "net472": ["System.Composition.AttributedModel"], "net48": ["System.Composition.AttributedModel"], "net5.0": ["System.Composition.AttributedModel"], "net6.0": ["System.Composition.AttributedModel"], "net7.0": ["System.Composition.AttributedModel"], "net8.0": ["System.Composition.AttributedModel"], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": ["System.Composition.AttributedModel"], "netcoreapp2.1": ["System.Composition.AttributedModel"], "netcoreapp2.2": ["System.Composition.AttributedModel"], "netcoreapp3.0": ["System.Composition.AttributedModel"], "netcoreapp3.1": ["System.Composition.AttributedModel"], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": ["System.Composition.AttributedModel"], "netstandard2.1": ["System.Composition.AttributedModel"]}, "targeting_pack_overrides": [], "framework_list": []},
-            {"name": "System.Composition.Hosting", "id": "System.Composition.Hosting", "version": "8.0.0", "sha512": "sha512-HK6mWN38TLXo0jQOzR6so8cH1J8/6MzCfSsQS15bWbFEYKeonKRAZKyTC2E92o+wB1KCkocNpOy01ix61JnWjQ==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": ["System.Composition.Runtime"], "net462": ["System.Composition.Runtime"], "net47": ["System.Composition.Runtime"], "net471": ["System.Composition.Runtime"], "net472": ["System.Composition.Runtime"], "net48": ["System.Composition.Runtime"], "net5.0": ["System.Composition.Runtime"], "net6.0": ["System.Composition.Runtime"], "net7.0": ["System.Composition.Runtime"], "net8.0": ["System.Composition.Runtime"], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": ["System.Composition.Runtime"], "netcoreapp2.1": ["System.Composition.Runtime"], "netcoreapp2.2": ["System.Composition.Runtime"], "netcoreapp3.0": ["System.Composition.Runtime"], "netcoreapp3.1": ["System.Composition.Runtime"], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": ["System.Composition.Runtime"], "netstandard2.1": ["System.Composition.Runtime"]}, "targeting_pack_overrides": [], "framework_list": []},
-            {"name": "System.Composition.Runtime", "id": "System.Composition.Runtime", "version": "8.0.0", "sha512": "sha512-hgGA3KDIx9FN3WYkpMvy0pUqWAul9BTehmqq49dqPxu5E+MbUKqgksU5XRP8M9LoBPZFa8FqBbKeFgCZ3rja2w==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": [], "net462": [], "net47": [], "net471": [], "net472": [], "net48": [], "net5.0": [], "net6.0": [], "net7.0": [], "net8.0": [], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": [], "netcoreapp2.1": [], "netcoreapp2.2": [], "netcoreapp3.0": [], "netcoreapp3.1": [], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": [], "netstandard2.1": []}, "targeting_pack_overrides": [], "framework_list": []},
-            {"name": "System.Composition.TypedParts", "id": "System.Composition.TypedParts", "version": "8.0.0", "sha512": "sha512-rKu0GdZ4JYOWUF7br1W7UQFI/UgzWTU03CHY6tnTLZXCMth6YSADGJRRQYrLzpwh2+NuNcBIuv7a7x8J1xsfdw==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": ["System.Composition.AttributedModel", "System.Composition.Hosting", "System.Composition.Runtime"], "net462": ["System.Composition.AttributedModel", "System.Composition.Hosting", "System.Composition.Runtime"], "net47": ["System.Composition.AttributedModel", "System.Composition.Hosting", "System.Composition.Runtime"], "net471": ["System.Composition.AttributedModel", "System.Composition.Hosting", "System.Composition.Runtime"], "net472": ["System.Composition.AttributedModel", "System.Composition.Hosting", "System.Composition.Runtime"], "net48": ["System.Composition.AttributedModel", "System.Composition.Hosting", "System.Composition.Runtime"], "net5.0": ["System.Composition.AttributedModel", "System.Composition.Hosting", "System.Composition.Runtime"], "net6.0": ["System.Composition.AttributedModel", "System.Composition.Hosting", "System.Composition.Runtime"], "net7.0": ["System.Composition.AttributedModel", "System.Composition.Hosting", "System.Composition.Runtime"], "net8.0": ["System.Composition.AttributedModel", "System.Composition.Hosting", "System.Composition.Runtime"], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": ["System.Composition.AttributedModel", "System.Composition.Hosting", "System.Composition.Runtime"], "netcoreapp2.1": ["System.Composition.AttributedModel", "System.Composition.Hosting", "System.Composition.Runtime"], "netcoreapp2.2": ["System.Composition.AttributedModel", "System.Composition.Hosting", "System.Composition.Runtime"], "netcoreapp3.0": ["System.Composition.AttributedModel", "System.Composition.Hosting", "System.Composition.Runtime"], "netcoreapp3.1": ["System.Composition.AttributedModel", "System.Composition.Hosting", "System.Composition.Runtime"], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": ["System.Composition.AttributedModel", "System.Composition.Hosting", "System.Composition.Runtime"], "netstandard2.1": ["System.Composition.AttributedModel", "System.Composition.Hosting", "System.Composition.Runtime"]}, "targeting_pack_overrides": [], "framework_list": []},
-            {"name": "System.Configuration.ConfigurationManager", "id": "System.Configuration.ConfigurationManager", "version": "7.0.0", "sha512": "sha512-g3iVgTpIcjMYpH+sMq5VKjytevOJv+ABsYLKOLj0UZrXp3diFFdnPPqL+orxMD5ktyaTagg2S7ONJInu8itIaQ==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": ["System.Security.Cryptography.ProtectedData", "System.Security.Permissions"], "net462": ["System.Security.Permissions"], "net47": ["System.Security.Permissions"], "net471": ["System.Security.Permissions"], "net472": ["System.Security.Permissions"], "net48": ["System.Security.Permissions"], "net5.0": ["System.Security.Cryptography.ProtectedData", "System.Security.Permissions"], "net6.0": ["System.Security.Cryptography.ProtectedData", "System.Security.Permissions"], "net7.0": ["System.Diagnostics.EventLog", "System.Security.Cryptography.ProtectedData", "System.Security.Permissions"], "net8.0": ["System.Diagnostics.EventLog", "System.Security.Cryptography.ProtectedData", "System.Security.Permissions"], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": ["System.Security.Cryptography.ProtectedData", "System.Security.Permissions"], "netcoreapp2.1": ["System.Security.Cryptography.ProtectedData", "System.Security.Permissions"], "netcoreapp2.2": ["System.Security.Cryptography.ProtectedData", "System.Security.Permissions"], "netcoreapp3.0": ["System.Security.Cryptography.ProtectedData", "System.Security.Permissions"], "netcoreapp3.1": ["System.Security.Cryptography.ProtectedData", "System.Security.Permissions"], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": ["System.Security.Cryptography.ProtectedData", "System.Security.Permissions"], "netstandard2.1": ["System.Security.Cryptography.ProtectedData", "System.Security.Permissions"]}, "targeting_pack_overrides": [], "framework_list": []},
-            {"name": "System.Diagnostics.EventLog", "id": "System.Diagnostics.EventLog", "version": "7.0.0", "sha512": "sha512-m/H4Rg7KukGEmfRpl+rXU1UbMN3GYbv42cbMHRgMwHIiUL3svKoFFR76Fk/mHN5TgrwGx64fS0Fp+p3qICKg/Q==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": ["System.Security.Principal.Windows"], "net462": ["System.Security.Principal.Windows"], "net47": ["System.Security.Principal.Windows"], "net471": ["System.Security.Principal.Windows"], "net472": ["System.Security.Principal.Windows"], "net48": ["System.Security.Principal.Windows"], "net5.0": ["System.Security.Principal.Windows"], "net6.0": [], "net7.0": [], "net8.0": [], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": ["System.Security.Principal.Windows"], "netcoreapp2.1": ["System.Security.Principal.Windows"], "netcoreapp2.2": ["System.Security.Principal.Windows"], "netcoreapp3.0": ["System.Security.Principal.Windows"], "netcoreapp3.1": ["System.Security.Principal.Windows"], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": ["System.Security.Principal.Windows"], "netstandard2.1": ["System.Security.Principal.Windows"]}, "targeting_pack_overrides": [], "framework_list": []},
-            {"name": "System.Drawing.Common", "id": "System.Drawing.Common", "version": "7.0.0", "sha512": "sha512-0TJd5U26gRDgGa/rqABgHC5OBAiyl7Mm3pIzPgKfpmPXFQ8CFVWyGi+4mkEaCK715ViOBDkU2pC2nAiPunLw7Q==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": [], "net462": [], "net47": [], "net471": [], "net472": [], "net48": [], "net5.0": [], "net6.0": ["Microsoft.Win32.SystemEvents"], "net7.0": ["Microsoft.Win32.SystemEvents"], "net8.0": ["Microsoft.Win32.SystemEvents"], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": [], "netcoreapp2.1": [], "netcoreapp2.2": [], "netcoreapp3.0": [], "netcoreapp3.1": [], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": [], "netstandard2.1": []}, "targeting_pack_overrides": [], "framework_list": []},
-            {"name": "System.IO", "id": "System.IO", "version": "4.3.0", "sha512": "sha512-v8paIePhmGuXZbE9xvvNb4uJ5ME4OFXR1+8la/G/L1GIl2nbU2WFnddgb79kVK3U2us7q1aZT/uY/R0D/ovB5g==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": [], "net462": [], "net47": [], "net471": [], "net472": [], "net48": [], "net5.0": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime", "System.Text.Encoding", "System.Threading.Tasks"], "net6.0": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime", "System.Text.Encoding", "System.Threading.Tasks"], "net7.0": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime", "System.Text.Encoding", "System.Threading.Tasks"], "net8.0": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime", "System.Text.Encoding", "System.Threading.Tasks"], "netcoreapp1.0": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime", "System.Text.Encoding", "System.Threading.Tasks"], "netcoreapp1.1": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime", "System.Text.Encoding", "System.Threading.Tasks"], "netcoreapp2.0": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime", "System.Text.Encoding", "System.Threading.Tasks"], "netcoreapp2.1": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime", "System.Text.Encoding", "System.Threading.Tasks"], "netcoreapp2.2": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime", "System.Text.Encoding", "System.Threading.Tasks"], "netcoreapp3.0": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime", "System.Text.Encoding", "System.Threading.Tasks"], "netcoreapp3.1": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime", "System.Text.Encoding", "System.Threading.Tasks"], "netstandard": [], "netstandard1.0": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime", "System.Text.Encoding", "System.Threading.Tasks"], "netstandard1.1": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime", "System.Text.Encoding", "System.Threading.Tasks"], "netstandard1.2": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime", "System.Text.Encoding", "System.Threading.Tasks"], "netstandard1.3": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime", "System.Text.Encoding", "System.Threading.Tasks"], "netstandard1.4": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime", "System.Text.Encoding", "System.Threading.Tasks"], "netstandard1.5": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime", "System.Text.Encoding", "System.Threading.Tasks"], "netstandard1.6": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime", "System.Text.Encoding", "System.Threading.Tasks"], "netstandard2.0": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime", "System.Text.Encoding", "System.Threading.Tasks"], "netstandard2.1": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime", "System.Text.Encoding", "System.Threading.Tasks"]}, "targeting_pack_overrides": [], "framework_list": []},
-            {"name": "System.IO.FileSystem", "id": "System.IO.FileSystem", "version": "4.3.0", "sha512": "sha512-T7WB1vhblSmgkaDpdGM3Uqo55Qsr5sip5eyowrwiXOoHBkzOx3ePd9+Zh97r9NzOwFCxqX7awO6RBxQuao7n7g==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": ["System.IO.FileSystem.Primitives"], "net461": ["System.IO.FileSystem.Primitives"], "net462": ["System.IO.FileSystem.Primitives"], "net47": ["System.IO.FileSystem.Primitives"], "net471": ["System.IO.FileSystem.Primitives"], "net472": ["System.IO.FileSystem.Primitives"], "net48": ["System.IO.FileSystem.Primitives"], "net5.0": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.IO", "System.IO.FileSystem.Primitives", "System.Runtime", "System.Runtime.Handles", "System.Text.Encoding", "System.Threading.Tasks"], "net6.0": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.IO", "System.IO.FileSystem.Primitives", "System.Runtime", "System.Runtime.Handles", "System.Text.Encoding", "System.Threading.Tasks"], "net7.0": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.IO", "System.IO.FileSystem.Primitives", "System.Runtime", "System.Runtime.Handles", "System.Text.Encoding", "System.Threading.Tasks"], "net8.0": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.IO", "System.IO.FileSystem.Primitives", "System.Runtime", "System.Runtime.Handles", "System.Text.Encoding", "System.Threading.Tasks"], "netcoreapp1.0": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.IO", "System.IO.FileSystem.Primitives", "System.Runtime", "System.Runtime.Handles", "System.Text.Encoding", "System.Threading.Tasks"], "netcoreapp1.1": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.IO", "System.IO.FileSystem.Primitives", "System.Runtime", "System.Runtime.Handles", "System.Text.Encoding", "System.Threading.Tasks"], "netcoreapp2.0": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.IO", "System.IO.FileSystem.Primitives", "System.Runtime", "System.Runtime.Handles", "System.Text.Encoding", "System.Threading.Tasks"], "netcoreapp2.1": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.IO", "System.IO.FileSystem.Primitives", "System.Runtime", "System.Runtime.Handles", "System.Text.Encoding", "System.Threading.Tasks"], "netcoreapp2.2": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.IO", "System.IO.FileSystem.Primitives", "System.Runtime", "System.Runtime.Handles", "System.Text.Encoding", "System.Threading.Tasks"], "netcoreapp3.0": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.IO", "System.IO.FileSystem.Primitives", "System.Runtime", "System.Runtime.Handles", "System.Text.Encoding", "System.Threading.Tasks"], "netcoreapp3.1": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.IO", "System.IO.FileSystem.Primitives", "System.Runtime", "System.Runtime.Handles", "System.Text.Encoding", "System.Threading.Tasks"], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.IO", "System.IO.FileSystem.Primitives", "System.Runtime", "System.Runtime.Handles", "System.Text.Encoding", "System.Threading.Tasks"], "netstandard1.4": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.IO", "System.IO.FileSystem.Primitives", "System.Runtime", "System.Runtime.Handles", "System.Text.Encoding", "System.Threading.Tasks"], "netstandard1.5": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.IO", "System.IO.FileSystem.Primitives", "System.Runtime", "System.Runtime.Handles", "System.Text.Encoding", "System.Threading.Tasks"], "netstandard1.6": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.IO", "System.IO.FileSystem.Primitives", "System.Runtime", "System.Runtime.Handles", "System.Text.Encoding", "System.Threading.Tasks"], "netstandard2.0": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.IO", "System.IO.FileSystem.Primitives", "System.Runtime", "System.Runtime.Handles", "System.Text.Encoding", "System.Threading.Tasks"], "netstandard2.1": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.IO", "System.IO.FileSystem.Primitives", "System.Runtime", "System.Runtime.Handles", "System.Text.Encoding", "System.Threading.Tasks"]}, "targeting_pack_overrides": [], "framework_list": []},
-            {"name": "System.IO.FileSystem.Primitives", "id": "System.IO.FileSystem.Primitives", "version": "4.3.0", "sha512": "sha512-WIWVPQlYLP/Zc9I6IakpBk1y8ryVGK83MtZx//zGKKi2hvHQWKAB7moRQCOz5Is/wNDksiYpocf3FeA3le6e5Q==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": [], "net462": [], "net47": [], "net471": [], "net472": [], "net48": [], "net5.0": ["System.Runtime"], "net6.0": ["System.Runtime"], "net7.0": ["System.Runtime"], "net8.0": ["System.Runtime"], "netcoreapp1.0": ["System.Runtime"], "netcoreapp1.1": ["System.Runtime"], "netcoreapp2.0": ["System.Runtime"], "netcoreapp2.1": ["System.Runtime"], "netcoreapp2.2": ["System.Runtime"], "netcoreapp3.0": ["System.Runtime"], "netcoreapp3.1": ["System.Runtime"], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": ["System.Runtime"], "netstandard1.4": ["System.Runtime"], "netstandard1.5": ["System.Runtime"], "netstandard1.6": ["System.Runtime"], "netstandard2.0": ["System.Runtime"], "netstandard2.1": ["System.Runtime"]}, "targeting_pack_overrides": [], "framework_list": []},
-            {"name": "System.IO.Pipelines", "id": "System.IO.Pipelines", "version": "8.0.0", "sha512": "sha512-V+tqEehPQKSLV7HcV4agGqmFISK30VNjSQ2KEsmkWL+ZqN30wMAke+mFWcK0LnaaEL2ixamBdzVITZYNxlLrEg==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": [], "net462": [], "net47": [], "net471": [], "net472": [], "net48": [], "net5.0": [], "net6.0": [], "net7.0": [], "net8.0": [], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": [], "netcoreapp2.1": [], "netcoreapp2.2": [], "netcoreapp3.0": [], "netcoreapp3.1": [], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": [], "netstandard2.1": []}, "targeting_pack_overrides": [], "framework_list": []},
-            {"name": "System.Net.Primitives", "id": "System.Net.Primitives", "version": "4.3.1", "sha512": "sha512-BgdlyYCI7rrdh36p3lMTqbkvaafPETpB1bk9iQlFdQxYE692kiXvmseXs8ghL+gEgQF2xgDc8GH4QLkSgUUs+Q==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": [], "net462": [], "net47": [], "net471": [], "net472": [], "net48": [], "net5.0": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime", "System.Runtime.Handles"], "net6.0": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime", "System.Runtime.Handles"], "net7.0": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime", "System.Runtime.Handles"], "net8.0": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime", "System.Runtime.Handles"], "netcoreapp1.0": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime", "System.Runtime.Handles"], "netcoreapp1.1": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime", "System.Runtime.Handles"], "netcoreapp2.0": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime", "System.Runtime.Handles"], "netcoreapp2.1": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime", "System.Runtime.Handles"], "netcoreapp2.2": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime", "System.Runtime.Handles"], "netcoreapp3.0": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime", "System.Runtime.Handles"], "netcoreapp3.1": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime", "System.Runtime.Handles"], "netstandard": [], "netstandard1.0": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime"], "netstandard1.1": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime"], "netstandard1.2": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime"], "netstandard1.3": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime", "System.Runtime.Handles"], "netstandard1.4": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime", "System.Runtime.Handles"], "netstandard1.5": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime", "System.Runtime.Handles"], "netstandard1.6": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime", "System.Runtime.Handles"], "netstandard2.0": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime", "System.Runtime.Handles"], "netstandard2.1": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime", "System.Runtime.Handles"]}, "targeting_pack_overrides": [], "framework_list": []},
-            {"name": "System.Reflection.Metadata", "id": "System.Reflection.Metadata", "version": "8.0.0", "sha512": "sha512-+6sMdkJjee0B6nm3AlBBl7cQaI0oPniLvvkrkFhmEN3fo/hGONaFdwpAaO+GRTlbZe4kRZzFwU7kSXQW0RyJxg==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": ["System.Collections.Immutable"], "net462": ["System.Collections.Immutable"], "net47": ["System.Collections.Immutable"], "net471": ["System.Collections.Immutable"], "net472": ["System.Collections.Immutable"], "net48": ["System.Collections.Immutable"], "net5.0": ["System.Collections.Immutable"], "net6.0": ["System.Collections.Immutable"], "net7.0": ["System.Collections.Immutable"], "net8.0": ["System.Collections.Immutable"], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": ["System.Collections.Immutable"], "netcoreapp2.1": ["System.Collections.Immutable"], "netcoreapp2.2": ["System.Collections.Immutable"], "netcoreapp3.0": ["System.Collections.Immutable"], "netcoreapp3.1": ["System.Collections.Immutable"], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": ["System.Collections.Immutable"], "netstandard2.1": ["System.Collections.Immutable"]}, "targeting_pack_overrides": [], "framework_list": []},
-            {"name": "System.Reflection.MetadataLoadContext", "id": "System.Reflection.MetadataLoadContext", "version": "7.0.0", "sha512": "sha512-dqk0PmO2SGulqNpuJlALPc/5vqFVZc6As4ToHeZvd+6B/DomA1/JM1nAOpSU2hkBVytU0GlwsBr4YfKSnGSchg==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": ["System.Collections.Immutable", "System.Reflection.Metadata"], "net462": ["System.Collections.Immutable", "System.Reflection.Metadata"], "net47": ["System.Collections.Immutable", "System.Reflection.Metadata"], "net471": ["System.Collections.Immutable", "System.Reflection.Metadata"], "net472": ["System.Collections.Immutable", "System.Reflection.Metadata"], "net48": ["System.Collections.Immutable", "System.Reflection.Metadata"], "net5.0": ["System.Collections.Immutable", "System.Reflection.Metadata"], "net6.0": ["System.Collections.Immutable", "System.Reflection.Metadata"], "net7.0": ["System.Collections.Immutable", "System.Reflection.Metadata"], "net8.0": ["System.Collections.Immutable", "System.Reflection.Metadata"], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": ["System.Collections.Immutable", "System.Reflection.Metadata"], "netcoreapp2.1": ["System.Collections.Immutable", "System.Reflection.Metadata"], "netcoreapp2.2": ["System.Collections.Immutable", "System.Reflection.Metadata"], "netcoreapp3.0": ["System.Collections.Immutable", "System.Reflection.Metadata"], "netcoreapp3.1": ["System.Collections.Immutable", "System.Reflection.Metadata"], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": ["System.Collections.Immutable", "System.Reflection.Metadata"], "netstandard2.1": ["System.Collections.Immutable", "System.Reflection.Metadata"]}, "targeting_pack_overrides": [], "framework_list": []},
-            {"name": "System.Runtime", "id": "System.Runtime", "version": "4.3.1", "sha512": "sha512-Al69mPDfzdD+bKGK2HAfB+lNFOHFqnkqzNnUJmmvUe1/qEPK9M7EiTT4zuycKDPy7ev11xz8XVgJWKP0hm7NIA==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": [], "net462": [], "net47": [], "net471": [], "net472": [], "net48": [], "net5.0": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets"], "net6.0": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets"], "net7.0": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets"], "net8.0": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets"], "netcoreapp1.0": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets"], "netcoreapp1.1": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets"], "netcoreapp2.0": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets"], "netcoreapp2.1": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets"], "netcoreapp2.2": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets"], "netcoreapp3.0": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets"], "netcoreapp3.1": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets"], "netstandard": [], "netstandard1.0": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets"], "netstandard1.1": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets"], "netstandard1.2": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets"], "netstandard1.3": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets"], "netstandard1.4": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets"], "netstandard1.5": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets"], "netstandard1.6": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets"], "netstandard2.0": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets"], "netstandard2.1": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets"]}, "targeting_pack_overrides": [], "framework_list": []},
-            {"name": "System.Runtime.CompilerServices.Unsafe", "id": "System.Runtime.CompilerServices.Unsafe", "version": "6.0.0", "sha512": "sha512-1AVzAb5OxJNvJLnOADtexNmWgattm2XVOT3TjQTN7Dd4SqoSwai1CsN2fth42uQldJSQdz/sAec0+TzxBFgisw==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": [], "net462": [], "net47": [], "net471": [], "net472": [], "net48": [], "net5.0": [], "net6.0": [], "net7.0": [], "net8.0": [], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": [], "netcoreapp2.1": [], "netcoreapp2.2": [], "netcoreapp3.0": [], "netcoreapp3.1": [], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": [], "netstandard2.1": []}, "targeting_pack_overrides": [], "framework_list": []},
-            {"name": "System.Runtime.Handles", "id": "System.Runtime.Handles", "version": "4.3.0", "sha512": "sha512-CluvHdVUv54BvLTOCCyybugreDNk/rR8unMPruzXDtxSjvrQOU3M4R831/lQf4YI8VYp668FGQa/01E+Rq8PEQ==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": [], "net462": [], "net47": [], "net471": [], "net472": [], "net48": [], "net5.0": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime"], "net6.0": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime"], "net7.0": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime"], "net8.0": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime"], "netcoreapp1.0": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime"], "netcoreapp1.1": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime"], "netcoreapp2.0": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime"], "netcoreapp2.1": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime"], "netcoreapp2.2": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime"], "netcoreapp3.0": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime"], "netcoreapp3.1": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime"], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime"], "netstandard1.4": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime"], "netstandard1.5": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime"], "netstandard1.6": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime"], "netstandard2.0": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime"], "netstandard2.1": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime"]}, "targeting_pack_overrides": [], "framework_list": []},
-            {"name": "System.Security.Cryptography.ProtectedData", "id": "System.Security.Cryptography.ProtectedData", "version": "7.0.0", "sha512": "sha512-a34SHiyaMcLRjw/1IGXokS2cH9j8XoOhs1jUYq3m+kQcnPp6fhmeuqe5U947WqojDsVMhWAsCE6rIg8grBv9BA==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": [], "net462": [], "net47": [], "net471": [], "net472": [], "net48": [], "net5.0": [], "net6.0": [], "net7.0": [], "net8.0": [], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": [], "netcoreapp2.1": [], "netcoreapp2.2": [], "netcoreapp3.0": [], "netcoreapp3.1": [], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": [], "netstandard2.1": []}, "targeting_pack_overrides": [], "framework_list": []},
-            {"name": "System.Security.Permissions", "id": "System.Security.Permissions", "version": "7.0.0", "sha512": "sha512-XNVTmQ9JuCRwRXRTDoOHEzEt0wmQeRudH9lThP0l3OBja4P3jmRHq/0H0N9Ns1OD6gNmKpjLdOeHCQEXv4iVrA==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": [], "net462": [], "net47": [], "net471": [], "net472": [], "net48": [], "net5.0": [], "net6.0": ["System.Windows.Extensions"], "net7.0": ["System.Windows.Extensions"], "net8.0": ["System.Windows.Extensions"], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": [], "netcoreapp2.1": [], "netcoreapp2.2": [], "netcoreapp3.0": [], "netcoreapp3.1": [], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": [], "netstandard2.1": []}, "targeting_pack_overrides": [], "framework_list": []},
-            {"name": "System.Security.Principal", "id": "System.Security.Principal", "version": "4.3.0", "sha512": "sha512-24oe0NGJY32e+DFHVQzl2okM9uwYmn0Aa6nehqtVZ55/Al4Yva7S3BN934Kn5qATH7TVTUJkgxhisdfF7mKDfg==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": [], "net462": [], "net47": [], "net471": [], "net472": [], "net48": [], "net5.0": ["System.Runtime"], "net6.0": ["System.Runtime"], "net7.0": ["System.Runtime"], "net8.0": ["System.Runtime"], "netcoreapp1.0": ["System.Runtime"], "netcoreapp1.1": ["System.Runtime"], "netcoreapp2.0": ["System.Runtime"], "netcoreapp2.1": ["System.Runtime"], "netcoreapp2.2": ["System.Runtime"], "netcoreapp3.0": ["System.Runtime"], "netcoreapp3.1": ["System.Runtime"], "netstandard": [], "netstandard1.0": ["System.Runtime"], "netstandard1.1": ["System.Runtime"], "netstandard1.2": ["System.Runtime"], "netstandard1.3": ["System.Runtime"], "netstandard1.4": ["System.Runtime"], "netstandard1.5": ["System.Runtime"], "netstandard1.6": ["System.Runtime"], "netstandard2.0": ["System.Runtime"], "netstandard2.1": ["System.Runtime"]}, "targeting_pack_overrides": [], "framework_list": []},
-            {"name": "System.Security.Principal.Windows", "id": "System.Security.Principal.Windows", "version": "5.0.0", "sha512": "sha512-RKkgqq8ishctQTGbtXqyuOGkUx1fAhkqb1OoHYdRJRlbYLoLWkSkWYHRN/17DzplsSlZtf2Xr8BXjNhO8nRnzQ==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": [], "net462": [], "net47": [], "net471": [], "net472": [], "net48": [], "net5.0": [], "net6.0": [], "net7.0": [], "net8.0": [], "netcoreapp1.0": ["Microsoft.Win32.Primitives", "System.Runtime", "System.Runtime.Handles", "System.Security.Principal", "System.Text.Encoding"], "netcoreapp1.1": ["Microsoft.Win32.Primitives", "System.Runtime", "System.Runtime.Handles", "System.Security.Principal", "System.Text.Encoding"], "netcoreapp2.0": ["Microsoft.NETCore.Platforms"], "netcoreapp2.1": ["Microsoft.NETCore.Platforms"], "netcoreapp2.2": ["Microsoft.NETCore.Platforms"], "netcoreapp3.0": [], "netcoreapp3.1": [], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": ["Microsoft.Win32.Primitives", "System.Runtime", "System.Runtime.Handles", "System.Security.Principal", "System.Text.Encoding"], "netstandard1.4": ["Microsoft.Win32.Primitives", "System.Runtime", "System.Runtime.Handles", "System.Security.Principal", "System.Text.Encoding"], "netstandard1.5": ["Microsoft.Win32.Primitives", "System.Runtime", "System.Runtime.Handles", "System.Security.Principal", "System.Text.Encoding"], "netstandard1.6": ["Microsoft.Win32.Primitives", "System.Runtime", "System.Runtime.Handles", "System.Security.Principal", "System.Text.Encoding"], "netstandard2.0": [], "netstandard2.1": []}, "targeting_pack_overrides": [], "framework_list": []},
-            {"name": "System.Text.Encoding", "id": "System.Text.Encoding", "version": "4.3.0", "sha512": "sha512-b/f+7HMTpxIfeV7H03bkuHKMFylCGfr9/U6gePnfFFW0aF8LOWLDgQCY6V1oWUqDksC3mdNuyChM1vy9TP4sZw==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": [], "net462": [], "net47": [], "net471": [], "net472": [], "net48": [], "net5.0": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime"], "net6.0": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime"], "net7.0": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime"], "net8.0": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime"], "netcoreapp1.0": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime"], "netcoreapp1.1": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime"], "netcoreapp2.0": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime"], "netcoreapp2.1": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime"], "netcoreapp2.2": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime"], "netcoreapp3.0": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime"], "netcoreapp3.1": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime"], "netstandard": [], "netstandard1.0": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime"], "netstandard1.1": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime"], "netstandard1.2": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime"], "netstandard1.3": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime"], "netstandard1.4": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime"], "netstandard1.5": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime"], "netstandard1.6": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime"], "netstandard2.0": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime"], "netstandard2.1": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime"]}, "targeting_pack_overrides": [], "framework_list": []},
-            {"name": "System.Threading.Channels", "id": "System.Threading.Channels", "version": "8.0.0", "sha512": "sha512-M1s365f1lOc6s2585/ATW+KRRFFnaI6JvSSdE14n9ZKgvWnZHoJGoccqV41XvtRDrHMCMRNlwWFgt9yXTu3xQQ==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": [], "net462": [], "net47": [], "net471": [], "net472": [], "net48": [], "net5.0": [], "net6.0": [], "net7.0": [], "net8.0": [], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": [], "netcoreapp2.1": [], "netcoreapp2.2": [], "netcoreapp3.0": [], "netcoreapp3.1": [], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": [], "netstandard2.1": []}, "targeting_pack_overrides": [], "framework_list": []},
-            {"name": "System.Threading.Tasks", "id": "System.Threading.Tasks", "version": "4.3.0", "sha512": "sha512-fUiP+CyyCjs872OA8trl6p97qma/da1xGq3h4zAbJZk8zyaU4zyEfqW5vbkP80xG/Nimun1vlWBboMEk7XxdEw==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": [], "net462": [], "net47": [], "net471": [], "net472": [], "net48": [], "net5.0": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime"], "net6.0": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime"], "net7.0": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime"], "net8.0": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime"], "netcoreapp1.0": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime"], "netcoreapp1.1": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime"], "netcoreapp2.0": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime"], "netcoreapp2.1": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime"], "netcoreapp2.2": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime"], "netcoreapp3.0": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime"], "netcoreapp3.1": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime"], "netstandard": [], "netstandard1.0": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime"], "netstandard1.1": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime"], "netstandard1.2": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime"], "netstandard1.3": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime"], "netstandard1.4": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime"], "netstandard1.5": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime"], "netstandard1.6": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime"], "netstandard2.0": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime"], "netstandard2.1": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime"]}, "targeting_pack_overrides": [], "framework_list": []},
-            {"name": "System.Threading.Tasks.Dataflow", "id": "System.Threading.Tasks.Dataflow", "version": "7.0.0", "sha512": "sha512-nB6cUBEEimO35tPK+KmhUF8jxxisO1E+8KU3eDIA9/o156qulMs8YeozOTcVRYHZWvgn1YCDI/ZR2ga9ErXIfg==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": [], "net462": [], "net47": [], "net471": [], "net472": [], "net48": [], "net5.0": [], "net6.0": [], "net7.0": [], "net8.0": [], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": [], "netcoreapp2.1": [], "netcoreapp2.2": [], "netcoreapp3.0": [], "netcoreapp3.1": [], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": [], "netstandard2.1": []}, "targeting_pack_overrides": [], "framework_list": []},
-            {"name": "System.Threading.ThreadPool", "id": "System.Threading.ThreadPool", "version": "4.3.0", "sha512": "sha512-RQpA+UpI6Tlpeedk5JStYk2DM/M3i5HqabI/yDbfj1xDu9bIz9kdoquVpHbh/wQjOJaOCbcgRH8iQcAUv8dRWQ==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": [], "net462": [], "net47": [], "net471": [], "net472": [], "net48": [], "net5.0": ["System.Runtime", "System.Runtime.Handles"], "net6.0": ["System.Runtime", "System.Runtime.Handles"], "net7.0": ["System.Runtime", "System.Runtime.Handles"], "net8.0": ["System.Runtime", "System.Runtime.Handles"], "netcoreapp1.0": ["System.Runtime", "System.Runtime.Handles"], "netcoreapp1.1": ["System.Runtime", "System.Runtime.Handles"], "netcoreapp2.0": ["System.Runtime", "System.Runtime.Handles"], "netcoreapp2.1": ["System.Runtime", "System.Runtime.Handles"], "netcoreapp2.2": ["System.Runtime", "System.Runtime.Handles"], "netcoreapp3.0": ["System.Runtime", "System.Runtime.Handles"], "netcoreapp3.1": ["System.Runtime", "System.Runtime.Handles"], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": ["System.Runtime", "System.Runtime.Handles"], "netstandard1.4": ["System.Runtime", "System.Runtime.Handles"], "netstandard1.5": ["System.Runtime", "System.Runtime.Handles"], "netstandard1.6": ["System.Runtime", "System.Runtime.Handles"], "netstandard2.0": ["System.Runtime", "System.Runtime.Handles"], "netstandard2.1": ["System.Runtime", "System.Runtime.Handles"]}, "targeting_pack_overrides": [], "framework_list": []},
-            {"name": "System.Windows.Extensions", "id": "System.Windows.Extensions", "version": "7.0.0", "sha512": "sha512-KNnH0GX7T/oRAzOtJjefboYngi+d/bNGd63j+ZIFFTIR8RM0dwptuImNXiKqvD78kzcWAf3kd3yjcih+UTYkbw==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": [], "net462": [], "net47": [], "net471": [], "net472": [], "net48": [], "net5.0": [], "net6.0": ["System.Drawing.Common"], "net7.0": ["System.Drawing.Common"], "net8.0": ["System.Drawing.Common"], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": [], "netcoreapp2.1": [], "netcoreapp2.2": [], "netcoreapp3.0": [], "netcoreapp3.1": [], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": [], "netstandard2.1": []}, "targeting_pack_overrides": [], "framework_list": []},
-            {"name": "xunit", "id": "xunit", "version": "2.8.0", "sha512": "sha512-pY+3288LqTgGilRPOuWdTdTAQ3URBTqlo4WJp1FwM10/x7GriewCV/wxL7NrTH4DRUVjoKY6HdcpFSdtQmirLQ==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": ["xunit.core", "xunit.assert", "xunit.analyzers"], "net20": ["xunit.core", "xunit.assert", "xunit.analyzers"], "net30": ["xunit.core", "xunit.assert", "xunit.analyzers"], "net35": ["xunit.core", "xunit.assert", "xunit.analyzers"], "net40": ["xunit.core", "xunit.assert", "xunit.analyzers"], "net403": ["xunit.core", "xunit.assert", "xunit.analyzers"], "net45": ["xunit.core", "xunit.assert", "xunit.analyzers"], "net451": ["xunit.core", "xunit.assert", "xunit.analyzers"], "net452": ["xunit.core", "xunit.assert", "xunit.analyzers"], "net46": ["xunit.core", "xunit.assert", "xunit.analyzers"], "net461": ["xunit.core", "xunit.assert", "xunit.analyzers"], "net462": ["xunit.core", "xunit.assert", "xunit.analyzers"], "net47": ["xunit.core", "xunit.assert", "xunit.analyzers"], "net471": ["xunit.core", "xunit.assert", "xunit.analyzers"], "net472": ["xunit.core", "xunit.assert", "xunit.analyzers"], "net48": ["xunit.core", "xunit.assert", "xunit.analyzers"], "net5.0": ["xunit.core", "xunit.assert", "xunit.analyzers"], "net6.0": ["xunit.core", "xunit.assert", "xunit.analyzers"], "net7.0": ["xunit.core", "xunit.assert", "xunit.analyzers"], "net8.0": ["xunit.core", "xunit.assert", "xunit.analyzers"], "netcoreapp1.0": ["xunit.core", "xunit.assert", "xunit.analyzers"], "netcoreapp1.1": ["xunit.core", "xunit.assert", "xunit.analyzers"], "netcoreapp2.0": ["xunit.core", "xunit.assert", "xunit.analyzers"], "netcoreapp2.1": ["xunit.core", "xunit.assert", "xunit.analyzers"], "netcoreapp2.2": ["xunit.core", "xunit.assert", "xunit.analyzers"], "netcoreapp3.0": ["xunit.core", "xunit.assert", "xunit.analyzers"], "netcoreapp3.1": ["xunit.core", "xunit.assert", "xunit.analyzers"], "netstandard": ["xunit.core", "xunit.assert", "xunit.analyzers"], "netstandard1.0": ["xunit.core", "xunit.assert", "xunit.analyzers"], "netstandard1.1": ["xunit.core", "xunit.assert", "xunit.analyzers"], "netstandard1.2": ["xunit.core", "xunit.assert", "xunit.analyzers"], "netstandard1.3": ["xunit.core", "xunit.assert", "xunit.analyzers"], "netstandard1.4": ["xunit.core", "xunit.assert", "xunit.analyzers"], "netstandard1.5": ["xunit.core", "xunit.assert", "xunit.analyzers"], "netstandard1.6": ["xunit.core", "xunit.assert", "xunit.analyzers"], "netstandard2.0": ["xunit.core", "xunit.assert", "xunit.analyzers"], "netstandard2.1": ["xunit.core", "xunit.assert", "xunit.analyzers"]}, "targeting_pack_overrides": [], "framework_list": []},
-            {"name": "xunit.abstractions", "id": "xunit.abstractions", "version": "2.0.3", "sha512": "sha512-PKJri5f0qEQPFvgY6CZR9XG8JROlWSdC/ZYLkkDQuID++Egn+yWjB+Yf57AZ8U6GRlP7z33uDQ4/r5BZPer2JA==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": [], "net462": [], "net47": [], "net471": [], "net472": [], "net48": [], "net5.0": [], "net6.0": [], "net7.0": [], "net8.0": [], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": [], "netcoreapp2.1": [], "netcoreapp2.2": [], "netcoreapp3.0": [], "netcoreapp3.1": [], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": [], "netstandard2.1": []}, "targeting_pack_overrides": [], "framework_list": []},
-            {"name": "xunit.analyzers", "id": "xunit.analyzers", "version": "1.13.0", "sha512": "sha512-GJ4gtp1hp3hpIWrK+PJ0AOG9t2WW7K2l1hlvklevMTAeZ9tKqzUGwaixZ6G/HLHWAcZo7Wy1r45Fu0v9Dwd4tA==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": [], "net462": [], "net47": [], "net471": [], "net472": [], "net48": [], "net5.0": [], "net6.0": [], "net7.0": [], "net8.0": [], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": [], "netcoreapp2.1": [], "netcoreapp2.2": [], "netcoreapp3.0": [], "netcoreapp3.1": [], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": [], "netstandard2.1": []}, "targeting_pack_overrides": [], "framework_list": []},
-            {"name": "xunit.assert", "id": "xunit.assert", "version": "2.8.0", "sha512": "sha512-S5571ILGuO1wZAraKjnkXyWacxwJr+9NftDNopugypT2r3UhJJVz/10WD7Xx+dDsvRS3ucd1VMI92cBIfSRjjg==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": [], "net462": [], "net47": [], "net471": [], "net472": [], "net48": [], "net5.0": [], "net6.0": [], "net7.0": [], "net8.0": [], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": [], "netcoreapp2.1": [], "netcoreapp2.2": [], "netcoreapp3.0": [], "netcoreapp3.1": [], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": [], "netstandard2.1": []}, "targeting_pack_overrides": [], "framework_list": []},
-            {"name": "xunit.core", "id": "xunit.core", "version": "2.8.0", "sha512": "sha512-/Ns+N8X8pffZm91IJhB1MbzStjLo8+aKnu3kzF+IlOHq850+MYG+NI23XEV4AH5Cc3pqHD4tp7wbB/s4bY7PGg==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": ["xunit.extensibility.core", "xunit.extensibility.execution"], "net20": ["xunit.extensibility.core", "xunit.extensibility.execution"], "net30": ["xunit.extensibility.core", "xunit.extensibility.execution"], "net35": ["xunit.extensibility.core", "xunit.extensibility.execution"], "net40": ["xunit.extensibility.core", "xunit.extensibility.execution"], "net403": ["xunit.extensibility.core", "xunit.extensibility.execution"], "net45": ["xunit.extensibility.core", "xunit.extensibility.execution"], "net451": ["xunit.extensibility.core", "xunit.extensibility.execution"], "net452": ["xunit.extensibility.core", "xunit.extensibility.execution"], "net46": ["xunit.extensibility.core", "xunit.extensibility.execution"], "net461": ["xunit.extensibility.core", "xunit.extensibility.execution"], "net462": ["xunit.extensibility.core", "xunit.extensibility.execution"], "net47": ["xunit.extensibility.core", "xunit.extensibility.execution"], "net471": ["xunit.extensibility.core", "xunit.extensibility.execution"], "net472": ["xunit.extensibility.core", "xunit.extensibility.execution"], "net48": ["xunit.extensibility.core", "xunit.extensibility.execution"], "net5.0": ["xunit.extensibility.core", "xunit.extensibility.execution"], "net6.0": ["xunit.extensibility.core", "xunit.extensibility.execution"], "net7.0": ["xunit.extensibility.core", "xunit.extensibility.execution"], "net8.0": ["xunit.extensibility.core", "xunit.extensibility.execution"], "netcoreapp1.0": ["xunit.extensibility.core", "xunit.extensibility.execution"], "netcoreapp1.1": ["xunit.extensibility.core", "xunit.extensibility.execution"], "netcoreapp2.0": ["xunit.extensibility.core", "xunit.extensibility.execution"], "netcoreapp2.1": ["xunit.extensibility.core", "xunit.extensibility.execution"], "netcoreapp2.2": ["xunit.extensibility.core", "xunit.extensibility.execution"], "netcoreapp3.0": ["xunit.extensibility.core", "xunit.extensibility.execution"], "netcoreapp3.1": ["xunit.extensibility.core", "xunit.extensibility.execution"], "netstandard": ["xunit.extensibility.core", "xunit.extensibility.execution"], "netstandard1.0": ["xunit.extensibility.core", "xunit.extensibility.execution"], "netstandard1.1": ["xunit.extensibility.core", "xunit.extensibility.execution"], "netstandard1.2": ["xunit.extensibility.core", "xunit.extensibility.execution"], "netstandard1.3": ["xunit.extensibility.core", "xunit.extensibility.execution"], "netstandard1.4": ["xunit.extensibility.core", "xunit.extensibility.execution"], "netstandard1.5": ["xunit.extensibility.core", "xunit.extensibility.execution"], "netstandard1.6": ["xunit.extensibility.core", "xunit.extensibility.execution"], "netstandard2.0": ["xunit.extensibility.core", "xunit.extensibility.execution"], "netstandard2.1": ["xunit.extensibility.core", "xunit.extensibility.execution"]}, "targeting_pack_overrides": [], "framework_list": []},
-            {"name": "xunit.extensibility.core", "id": "xunit.extensibility.core", "version": "2.8.0", "sha512": "sha512-Otlt6joZ9a7QpiAB5SNRb0sd0DMndpH6ktuAVj65hz80xjoQdhdMNO51qWIdk98Ri+fiUS3EBmuSzbv0Dkws5w==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": ["xunit.abstractions"], "net451": ["xunit.abstractions"], "net452": ["xunit.abstractions"], "net46": ["xunit.abstractions"], "net461": ["xunit.abstractions"], "net462": ["xunit.abstractions"], "net47": ["xunit.abstractions"], "net471": ["xunit.abstractions"], "net472": ["xunit.abstractions"], "net48": ["xunit.abstractions"], "net5.0": ["xunit.abstractions"], "net6.0": ["xunit.abstractions"], "net7.0": ["xunit.abstractions"], "net8.0": ["xunit.abstractions"], "netcoreapp1.0": ["xunit.abstractions"], "netcoreapp1.1": ["xunit.abstractions"], "netcoreapp2.0": ["xunit.abstractions"], "netcoreapp2.1": ["xunit.abstractions"], "netcoreapp2.2": ["xunit.abstractions"], "netcoreapp3.0": ["xunit.abstractions"], "netcoreapp3.1": ["xunit.abstractions"], "netstandard": [], "netstandard1.0": [], "netstandard1.1": ["xunit.abstractions"], "netstandard1.2": ["xunit.abstractions"], "netstandard1.3": ["xunit.abstractions"], "netstandard1.4": ["xunit.abstractions"], "netstandard1.5": ["xunit.abstractions"], "netstandard1.6": ["xunit.abstractions"], "netstandard2.0": ["xunit.abstractions"], "netstandard2.1": ["xunit.abstractions"]}, "targeting_pack_overrides": [], "framework_list": []},
-            {"name": "xunit.extensibility.execution", "id": "xunit.extensibility.execution", "version": "2.8.0", "sha512": "sha512-YZn5YCt3ohLPpsz/eoG92pSmt01RJpVD509eRwtt2Bz9iYvgTNIqxu2WJUKhBiMGTZ2nU+IFl6WQG2OiJ639gA==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": ["xunit.extensibility.core"], "net451": ["xunit.extensibility.core"], "net452": ["xunit.extensibility.core"], "net46": ["xunit.extensibility.core"], "net461": ["xunit.extensibility.core"], "net462": ["xunit.extensibility.core"], "net47": ["xunit.extensibility.core"], "net471": ["xunit.extensibility.core"], "net472": ["xunit.extensibility.core"], "net48": ["xunit.extensibility.core"], "net5.0": ["xunit.extensibility.core"], "net6.0": ["xunit.extensibility.core"], "net7.0": ["xunit.extensibility.core"], "net8.0": ["xunit.extensibility.core"], "netcoreapp1.0": ["xunit.extensibility.core"], "netcoreapp1.1": ["xunit.extensibility.core"], "netcoreapp2.0": ["xunit.extensibility.core"], "netcoreapp2.1": ["xunit.extensibility.core"], "netcoreapp2.2": ["xunit.extensibility.core"], "netcoreapp3.0": ["xunit.extensibility.core"], "netcoreapp3.1": ["xunit.extensibility.core"], "netstandard": [], "netstandard1.0": [], "netstandard1.1": ["xunit.extensibility.core"], "netstandard1.2": ["xunit.extensibility.core"], "netstandard1.3": ["xunit.extensibility.core"], "netstandard1.4": ["xunit.extensibility.core"], "netstandard1.5": ["xunit.extensibility.core"], "netstandard1.6": ["xunit.extensibility.core"], "netstandard2.0": ["xunit.extensibility.core"], "netstandard2.1": ["xunit.extensibility.core"]}, "targeting_pack_overrides": [], "framework_list": []},
-            {"name": "xunit.runner.utility", "id": "xunit.runner.utility", "version": "2.8.0", "sha512": "sha512-YJ9UEsY0NUxeYfB01AO4uJgSSelInfROv4oAsTn7z0GD6kly3HzPQC+B/JDbWUVCRJ1xIRoaYPisMvVYQBIyxA==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": ["xunit.abstractions"], "net40": ["xunit.abstractions"], "net403": ["xunit.abstractions"], "net45": ["xunit.abstractions"], "net451": ["xunit.abstractions"], "net452": ["xunit.abstractions"], "net46": ["xunit.abstractions"], "net461": ["xunit.abstractions"], "net462": ["xunit.abstractions"], "net47": ["xunit.abstractions"], "net471": ["xunit.abstractions"], "net472": ["xunit.abstractions"], "net48": ["xunit.abstractions"], "net5.0": ["xunit.abstractions"], "net6.0": ["xunit.abstractions"], "net7.0": ["xunit.abstractions"], "net8.0": ["xunit.abstractions"], "netcoreapp1.0": ["xunit.abstractions"], "netcoreapp1.1": ["xunit.abstractions"], "netcoreapp2.0": ["xunit.abstractions"], "netcoreapp2.1": ["xunit.abstractions"], "netcoreapp2.2": ["xunit.abstractions"], "netcoreapp3.0": ["xunit.abstractions"], "netcoreapp3.1": ["xunit.abstractions"], "netstandard": [], "netstandard1.0": [], "netstandard1.1": ["xunit.abstractions"], "netstandard1.2": ["xunit.abstractions"], "netstandard1.3": ["xunit.abstractions"], "netstandard1.4": ["xunit.abstractions"], "netstandard1.5": ["xunit.abstractions"], "netstandard1.6": ["xunit.abstractions"], "netstandard2.0": ["xunit.abstractions"], "netstandard2.1": ["xunit.abstractions"]}, "targeting_pack_overrides": [], "framework_list": []},
-            {"name": "xunit.runner.visualstudio", "id": "xunit.runner.visualstudio", "version": "2.8.0", "sha512": "sha512-hEFlhPQ0BVrJkWHtGpKOqtqAvTk1FCPAIS5Z0zs+CMjNAgugpBuuddEa5gB4CzRDjGzms2UjvgzkgbnQXozFpw==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": [], "net462": ["Microsoft.TestPlatform.ObjectModel"], "net47": ["Microsoft.TestPlatform.ObjectModel"], "net471": ["Microsoft.TestPlatform.ObjectModel"], "net472": ["Microsoft.TestPlatform.ObjectModel"], "net48": ["Microsoft.TestPlatform.ObjectModel"], "net5.0": [], "net6.0": [], "net7.0": [], "net8.0": [], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": [], "netcoreapp2.1": [], "netcoreapp2.2": [], "netcoreapp3.0": [], "netcoreapp3.1": [], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": [], "netstandard2.1": []}, "targeting_pack_overrides": [], "framework_list": []},
+            {"name": "Basic.CompilerLog.Util", "id": "Basic.CompilerLog.Util", "version": "0.7.9", "sha512": "sha512-Z50VRWQIXO0E8GM3ZFdL+Mq+YdmPh+OEJ7bDXPIsp1TQJB07i09WdlEb4MucSz9wG4exeLC3HGt23O3NOFL30g==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": ["MSBuild.StructuredLogger", "MessagePack", "Microsoft.CodeAnalysis", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.Extensions.ObjectPool"], "net462": ["MSBuild.StructuredLogger", "MessagePack", "Microsoft.CodeAnalysis", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.Extensions.ObjectPool"], "net47": ["MSBuild.StructuredLogger", "MessagePack", "Microsoft.CodeAnalysis", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.Extensions.ObjectPool"], "net471": ["MSBuild.StructuredLogger", "MessagePack", "Microsoft.CodeAnalysis", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.Extensions.ObjectPool"], "net472": ["MSBuild.StructuredLogger", "MessagePack", "Microsoft.CodeAnalysis", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.Extensions.ObjectPool"], "net48": ["MSBuild.StructuredLogger", "MessagePack", "Microsoft.CodeAnalysis", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.Extensions.ObjectPool"], "net5.0": ["MSBuild.StructuredLogger", "MessagePack", "Microsoft.CodeAnalysis", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.Extensions.ObjectPool"], "net6.0": ["MSBuild.StructuredLogger", "MessagePack", "Microsoft.CodeAnalysis", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.Extensions.ObjectPool"], "net7.0": ["MSBuild.StructuredLogger", "MessagePack", "Microsoft.CodeAnalysis", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.Extensions.ObjectPool"], "net8.0": ["MSBuild.StructuredLogger", "MessagePack", "Microsoft.CodeAnalysis", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.Extensions.ObjectPool"], "net9.0": ["MSBuild.StructuredLogger", "MessagePack", "Microsoft.CodeAnalysis", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.Extensions.ObjectPool"], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": ["MSBuild.StructuredLogger", "MessagePack", "Microsoft.CodeAnalysis", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.Extensions.ObjectPool"], "netcoreapp2.1": ["MSBuild.StructuredLogger", "MessagePack", "Microsoft.CodeAnalysis", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.Extensions.ObjectPool"], "netcoreapp2.2": ["MSBuild.StructuredLogger", "MessagePack", "Microsoft.CodeAnalysis", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.Extensions.ObjectPool"], "netcoreapp3.0": ["MSBuild.StructuredLogger", "MessagePack", "Microsoft.CodeAnalysis", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.Extensions.ObjectPool"], "netcoreapp3.1": ["MSBuild.StructuredLogger", "MessagePack", "Microsoft.CodeAnalysis", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.Extensions.ObjectPool"], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": ["MSBuild.StructuredLogger", "MessagePack", "Microsoft.CodeAnalysis", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.Extensions.ObjectPool"], "netstandard2.1": ["MSBuild.StructuredLogger", "MessagePack", "Microsoft.CodeAnalysis", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.Extensions.ObjectPool"]}, "targeting_pack_overrides": [], "framework_list": []},
+            {"name": "Humanizer.Core", "id": "Humanizer.Core", "version": "2.14.1", "sha512": "sha512-yzqGU/HKNLZ9Uvr6kvSc3wYV/S5O/IvklIUW5WF7MuivGLY8wS5IZnLPkt7D1KW8Et2Enl0I3Lzg2vGWM24Xsw==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": [], "net462": [], "net47": [], "net471": [], "net472": [], "net48": [], "net5.0": [], "net6.0": [], "net7.0": [], "net8.0": [], "net9.0": [], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": [], "netcoreapp2.1": [], "netcoreapp2.2": [], "netcoreapp3.0": [], "netcoreapp3.1": [], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": [], "netstandard2.1": []}, "targeting_pack_overrides": [], "framework_list": []},
+            {"name": "MessagePack", "id": "MessagePack", "version": "2.5.129", "sha512": "sha512-wpw2dHkE5AcvMYKE4MrWuoeZ2jeaneDlqAgplxm6yKqPXeUVI2h5DPrKjsljnJSNRZOm3tunasw18Q9xj/3UoA==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": ["MessagePack.Annotations", "Microsoft.NET.StringTools", "System.Collections.Immutable", "System.Runtime.CompilerServices.Unsafe"], "net462": ["MessagePack.Annotations", "Microsoft.NET.StringTools", "System.Collections.Immutable", "System.Runtime.CompilerServices.Unsafe"], "net47": ["MessagePack.Annotations", "Microsoft.NET.StringTools", "System.Collections.Immutable", "System.Runtime.CompilerServices.Unsafe"], "net471": ["MessagePack.Annotations", "Microsoft.NET.StringTools", "System.Collections.Immutable", "System.Runtime.CompilerServices.Unsafe"], "net472": ["MessagePack.Annotations", "Microsoft.NET.StringTools", "System.Collections.Immutable", "System.Runtime.CompilerServices.Unsafe"], "net48": ["MessagePack.Annotations", "Microsoft.NET.StringTools", "System.Collections.Immutable", "System.Runtime.CompilerServices.Unsafe"], "net5.0": ["MessagePack.Annotations", "Microsoft.NET.StringTools", "System.Collections.Immutable", "System.Runtime.CompilerServices.Unsafe"], "net6.0": ["MessagePack.Annotations", "Microsoft.NET.StringTools", "System.Runtime.CompilerServices.Unsafe"], "net7.0": ["MessagePack.Annotations", "Microsoft.NET.StringTools", "System.Runtime.CompilerServices.Unsafe"], "net8.0": ["MessagePack.Annotations", "Microsoft.NET.StringTools", "System.Runtime.CompilerServices.Unsafe"], "net9.0": ["MessagePack.Annotations", "Microsoft.NET.StringTools", "System.Runtime.CompilerServices.Unsafe"], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": ["MessagePack.Annotations", "Microsoft.NET.StringTools", "System.Collections.Immutable", "System.Runtime.CompilerServices.Unsafe"], "netcoreapp2.1": ["MessagePack.Annotations", "Microsoft.NET.StringTools", "System.Collections.Immutable", "System.Runtime.CompilerServices.Unsafe"], "netcoreapp2.2": ["MessagePack.Annotations", "Microsoft.NET.StringTools", "System.Collections.Immutable", "System.Runtime.CompilerServices.Unsafe"], "netcoreapp3.0": ["MessagePack.Annotations", "Microsoft.NET.StringTools", "System.Collections.Immutable", "System.Runtime.CompilerServices.Unsafe"], "netcoreapp3.1": ["MessagePack.Annotations", "Microsoft.NET.StringTools", "System.Collections.Immutable", "System.Runtime.CompilerServices.Unsafe"], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": ["MessagePack.Annotations", "Microsoft.NET.StringTools", "System.Collections.Immutable", "System.Runtime.CompilerServices.Unsafe"], "netstandard2.1": ["MessagePack.Annotations", "Microsoft.NET.StringTools", "System.Collections.Immutable", "System.Runtime.CompilerServices.Unsafe"]}, "targeting_pack_overrides": [], "framework_list": []},
+            {"name": "MessagePack.Annotations", "id": "MessagePack.Annotations", "version": "2.5.129", "sha512": "sha512-mr12dLr06Kp7Ra7+GUXHbuxt/gbi6RPGPw1mpSvZsubs7hJxzHDtYTb5KKuseu5cpzOUDfsGcaW+Bo0+lqCFAA==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": [], "net462": [], "net47": [], "net471": [], "net472": [], "net48": [], "net5.0": [], "net6.0": [], "net7.0": [], "net8.0": [], "net9.0": [], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": [], "netcoreapp2.1": [], "netcoreapp2.2": [], "netcoreapp3.0": [], "netcoreapp3.1": [], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": [], "netstandard2.1": []}, "targeting_pack_overrides": [], "framework_list": []},
+            {"name": "Microsoft.Build", "id": "Microsoft.Build", "version": "17.8.3", "sha512": "sha512-jRz++ltVTU9xGAYSnI7fGwLIsg/AwINaxlXaJrcMszO+fyh1xJ8gKZkDz10foT/5y26jZC6G93wyp85NVHc+lA==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": [], "net462": [], "net47": [], "net471": [], "net472": ["Microsoft.Build.Framework", "Microsoft.NET.StringTools", "System.Collections.Immutable", "System.Configuration.ConfigurationManager", "System.Reflection.MetadataLoadContext", "System.Security.Principal.Windows", "System.Threading.Tasks.Dataflow", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe"], "net48": ["Microsoft.Build.Framework", "Microsoft.NET.StringTools", "System.Collections.Immutable", "System.Configuration.ConfigurationManager", "System.Reflection.MetadataLoadContext", "System.Security.Principal.Windows", "System.Threading.Tasks.Dataflow", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe"], "net5.0": [], "net6.0": [], "net7.0": [], "net8.0": ["Microsoft.Build.Framework", "Microsoft.NET.StringTools", "System.Collections.Immutable", "System.Configuration.ConfigurationManager", "System.Reflection.MetadataLoadContext", "System.Security.Principal.Windows", "System.Threading.Tasks.Dataflow", "System.Reflection.Metadata"], "net9.0": ["Microsoft.Build.Framework", "Microsoft.NET.StringTools", "System.Collections.Immutable", "System.Configuration.ConfigurationManager", "System.Reflection.MetadataLoadContext", "System.Security.Principal.Windows", "System.Threading.Tasks.Dataflow", "System.Reflection.Metadata"], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": [], "netcoreapp2.1": [], "netcoreapp2.2": [], "netcoreapp3.0": [], "netcoreapp3.1": [], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": [], "netstandard2.1": []}, "targeting_pack_overrides": [], "framework_list": []},
+            {"name": "Microsoft.Build.Framework", "id": "Microsoft.Build.Framework", "version": "17.8.3", "sha512": "sha512-xDOoj8lpNohM0Sieo4sJ47m/3SAquclF8wFZeAYYuDRHc8hII4XWPhSafFmw5A4TMGOyV08Z1TrrqES9HxMB3Q==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": ["System.Runtime.CompilerServices.Unsafe", "System.Security.Principal.Windows"], "net462": ["System.Runtime.CompilerServices.Unsafe", "System.Security.Principal.Windows"], "net47": ["System.Runtime.CompilerServices.Unsafe", "System.Security.Principal.Windows"], "net471": ["System.Runtime.CompilerServices.Unsafe", "System.Security.Principal.Windows"], "net472": ["System.Runtime.CompilerServices.Unsafe"], "net48": ["System.Runtime.CompilerServices.Unsafe"], "net5.0": ["System.Runtime.CompilerServices.Unsafe", "System.Security.Principal.Windows"], "net6.0": ["System.Runtime.CompilerServices.Unsafe", "System.Security.Principal.Windows"], "net7.0": ["System.Runtime.CompilerServices.Unsafe", "System.Security.Principal.Windows"], "net8.0": [], "net9.0": [], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": ["System.Runtime.CompilerServices.Unsafe", "System.Security.Principal.Windows"], "netcoreapp2.1": ["System.Runtime.CompilerServices.Unsafe", "System.Security.Principal.Windows"], "netcoreapp2.2": ["System.Runtime.CompilerServices.Unsafe", "System.Security.Principal.Windows"], "netcoreapp3.0": ["System.Runtime.CompilerServices.Unsafe", "System.Security.Principal.Windows"], "netcoreapp3.1": ["System.Runtime.CompilerServices.Unsafe", "System.Security.Principal.Windows"], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": ["System.Runtime.CompilerServices.Unsafe", "System.Security.Principal.Windows"], "netstandard2.1": ["System.Runtime.CompilerServices.Unsafe", "System.Security.Principal.Windows"]}, "targeting_pack_overrides": [], "framework_list": []},
+            {"name": "Microsoft.Build.Utilities.Core", "id": "Microsoft.Build.Utilities.Core", "version": "17.5.0", "sha512": "sha512-La1NFQ7SVz1pVGEUnG15BQG26jJkRMCiitySBXLhuTYf9IG6eZ5j5UFjnM4EFKSVKbictRv+D/F0dQtsCiK9ag==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": ["Microsoft.Build.Framework", "Microsoft.NET.StringTools", "System.Collections.Immutable", "System.Configuration.ConfigurationManager", "System.Security.Permissions"], "net462": ["Microsoft.Build.Framework", "Microsoft.NET.StringTools", "System.Collections.Immutable", "System.Configuration.ConfigurationManager", "System.Security.Permissions"], "net47": ["Microsoft.Build.Framework", "Microsoft.NET.StringTools", "System.Collections.Immutable", "System.Configuration.ConfigurationManager", "System.Security.Permissions"], "net471": ["Microsoft.Build.Framework", "Microsoft.NET.StringTools", "System.Collections.Immutable", "System.Configuration.ConfigurationManager", "System.Security.Permissions"], "net472": ["Microsoft.Build.Framework", "Microsoft.NET.StringTools", "System.Collections.Immutable", "System.Configuration.ConfigurationManager"], "net48": ["Microsoft.Build.Framework", "Microsoft.NET.StringTools", "System.Collections.Immutable", "System.Configuration.ConfigurationManager"], "net5.0": ["Microsoft.Build.Framework", "Microsoft.NET.StringTools", "System.Collections.Immutable", "System.Configuration.ConfigurationManager", "System.Security.Permissions"], "net6.0": ["Microsoft.Build.Framework", "Microsoft.NET.StringTools", "System.Collections.Immutable", "System.Configuration.ConfigurationManager", "System.Security.Permissions"], "net7.0": ["Microsoft.Build.Framework", "Microsoft.NET.StringTools", "System.Collections.Immutable", "System.Configuration.ConfigurationManager"], "net8.0": ["Microsoft.Build.Framework", "Microsoft.NET.StringTools", "System.Collections.Immutable", "System.Configuration.ConfigurationManager"], "net9.0": ["Microsoft.Build.Framework", "Microsoft.NET.StringTools", "System.Collections.Immutable", "System.Configuration.ConfigurationManager"], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": ["Microsoft.Build.Framework", "Microsoft.NET.StringTools", "System.Collections.Immutable", "System.Configuration.ConfigurationManager", "System.Security.Permissions"], "netcoreapp2.1": ["Microsoft.Build.Framework", "Microsoft.NET.StringTools", "System.Collections.Immutable", "System.Configuration.ConfigurationManager", "System.Security.Permissions"], "netcoreapp2.2": ["Microsoft.Build.Framework", "Microsoft.NET.StringTools", "System.Collections.Immutable", "System.Configuration.ConfigurationManager", "System.Security.Permissions"], "netcoreapp3.0": ["Microsoft.Build.Framework", "Microsoft.NET.StringTools", "System.Collections.Immutable", "System.Configuration.ConfigurationManager", "System.Security.Permissions"], "netcoreapp3.1": ["Microsoft.Build.Framework", "Microsoft.NET.StringTools", "System.Collections.Immutable", "System.Configuration.ConfigurationManager", "System.Security.Permissions"], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": ["Microsoft.Build.Framework", "Microsoft.NET.StringTools", "System.Collections.Immutable", "System.Configuration.ConfigurationManager", "System.Security.Permissions"], "netstandard2.1": ["Microsoft.Build.Framework", "Microsoft.NET.StringTools", "System.Collections.Immutable", "System.Configuration.ConfigurationManager", "System.Security.Permissions"]}, "targeting_pack_overrides": [], "framework_list": []},
+            {"name": "Microsoft.CodeAnalysis", "id": "Microsoft.CodeAnalysis", "version": "4.9.2", "sha512": "sha512-CJh/yj/ZWnDn0qRDovqeb7qhXl4MDFR5CELAQ2B5K9dcEC6JPg7Fkm2ADRiBM4UF7ub+n6fkiE5+/+GPD5WbFg==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": ["Microsoft.CodeAnalysis.CSharp.Workspaces", "Microsoft.CodeAnalysis.VisualBasic.Workspaces"], "net462": ["Microsoft.CodeAnalysis.CSharp.Workspaces", "Microsoft.CodeAnalysis.VisualBasic.Workspaces"], "net47": ["Microsoft.CodeAnalysis.CSharp.Workspaces", "Microsoft.CodeAnalysis.VisualBasic.Workspaces"], "net471": ["Microsoft.CodeAnalysis.CSharp.Workspaces", "Microsoft.CodeAnalysis.VisualBasic.Workspaces"], "net472": ["Microsoft.CodeAnalysis.CSharp.Workspaces", "Microsoft.CodeAnalysis.VisualBasic.Workspaces"], "net48": ["Microsoft.CodeAnalysis.CSharp.Workspaces", "Microsoft.CodeAnalysis.VisualBasic.Workspaces"], "net5.0": ["Microsoft.CodeAnalysis.CSharp.Workspaces", "Microsoft.CodeAnalysis.VisualBasic.Workspaces"], "net6.0": ["Microsoft.CodeAnalysis.CSharp.Workspaces", "Microsoft.CodeAnalysis.VisualBasic.Workspaces"], "net7.0": ["Microsoft.CodeAnalysis.CSharp.Workspaces", "Microsoft.CodeAnalysis.VisualBasic.Workspaces"], "net8.0": ["Microsoft.CodeAnalysis.CSharp.Workspaces", "Microsoft.CodeAnalysis.VisualBasic.Workspaces"], "net9.0": ["Microsoft.CodeAnalysis.CSharp.Workspaces", "Microsoft.CodeAnalysis.VisualBasic.Workspaces"], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": ["Microsoft.CodeAnalysis.CSharp.Workspaces", "Microsoft.CodeAnalysis.VisualBasic.Workspaces"], "netcoreapp2.1": ["Microsoft.CodeAnalysis.CSharp.Workspaces", "Microsoft.CodeAnalysis.VisualBasic.Workspaces"], "netcoreapp2.2": ["Microsoft.CodeAnalysis.CSharp.Workspaces", "Microsoft.CodeAnalysis.VisualBasic.Workspaces"], "netcoreapp3.0": ["Microsoft.CodeAnalysis.CSharp.Workspaces", "Microsoft.CodeAnalysis.VisualBasic.Workspaces"], "netcoreapp3.1": ["Microsoft.CodeAnalysis.CSharp.Workspaces", "Microsoft.CodeAnalysis.VisualBasic.Workspaces"], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": ["Microsoft.CodeAnalysis.CSharp.Workspaces", "Microsoft.CodeAnalysis.VisualBasic.Workspaces"], "netstandard2.1": ["Microsoft.CodeAnalysis.CSharp.Workspaces", "Microsoft.CodeAnalysis.VisualBasic.Workspaces"]}, "targeting_pack_overrides": [], "framework_list": []},
+            {"name": "Microsoft.CodeAnalysis.Analyzers", "id": "Microsoft.CodeAnalysis.Analyzers", "version": "3.3.4", "sha512": "sha512-I+Riw6/6WjNICydoiNpDjN/GGP7u4XsL6VsI9lG/OjFufH3flvSEy/fxNhGDVGwZWwq/5BlnqX+LH2dmheaPfg==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": [], "net462": [], "net47": [], "net471": [], "net472": [], "net48": [], "net5.0": [], "net6.0": [], "net7.0": [], "net8.0": [], "net9.0": [], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": [], "netcoreapp2.1": [], "netcoreapp2.2": [], "netcoreapp3.0": [], "netcoreapp3.1": [], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": [], "netstandard2.1": []}, "targeting_pack_overrides": [], "framework_list": []},
+            {"name": "Microsoft.CodeAnalysis.Common", "id": "Microsoft.CodeAnalysis.Common", "version": "4.9.2", "sha512": "sha512-XCtqPQdnoqfrBSidFWIESm8exXVHF4yPY94e84St2PVZPc2bGeQNXdFNwadu1Bd2sr/bAgM5B0UHbCqBz+/SeQ==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": ["Microsoft.CodeAnalysis.Analyzers", "System.Collections.Immutable", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe"], "net462": ["Microsoft.CodeAnalysis.Analyzers", "System.Collections.Immutable", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe"], "net47": ["Microsoft.CodeAnalysis.Analyzers", "System.Collections.Immutable", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe"], "net471": ["Microsoft.CodeAnalysis.Analyzers", "System.Collections.Immutable", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe"], "net472": ["Microsoft.CodeAnalysis.Analyzers", "System.Collections.Immutable", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe"], "net48": ["Microsoft.CodeAnalysis.Analyzers", "System.Collections.Immutable", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe"], "net5.0": ["Microsoft.CodeAnalysis.Analyzers", "System.Collections.Immutable", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe"], "net6.0": ["Microsoft.CodeAnalysis.Analyzers", "System.Collections.Immutable", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe"], "net7.0": ["Microsoft.CodeAnalysis.Analyzers", "System.Collections.Immutable", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe"], "net8.0": ["Microsoft.CodeAnalysis.Analyzers", "System.Collections.Immutable", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe"], "net9.0": ["Microsoft.CodeAnalysis.Analyzers", "System.Collections.Immutable", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe"], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": ["Microsoft.CodeAnalysis.Analyzers", "System.Collections.Immutable", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe"], "netcoreapp2.1": ["Microsoft.CodeAnalysis.Analyzers", "System.Collections.Immutable", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe"], "netcoreapp2.2": ["Microsoft.CodeAnalysis.Analyzers", "System.Collections.Immutable", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe"], "netcoreapp3.0": ["Microsoft.CodeAnalysis.Analyzers", "System.Collections.Immutable", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe"], "netcoreapp3.1": ["Microsoft.CodeAnalysis.Analyzers", "System.Collections.Immutable", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe"], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": ["Microsoft.CodeAnalysis.Analyzers", "System.Collections.Immutable", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe"], "netstandard2.1": ["Microsoft.CodeAnalysis.Analyzers", "System.Collections.Immutable", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe"]}, "targeting_pack_overrides": [], "framework_list": []},
+            {"name": "Microsoft.CodeAnalysis.CSharp", "id": "Microsoft.CodeAnalysis.CSharp", "version": "4.9.2", "sha512": "sha512-oy5nUdJOaOQEjUZimhYH4xU6nVxt8ctkdP7HT2fc32ecvH50QeIwJXgjNt7MGUyhJO+Wd3SipQWQ5QyDw7VuLg==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": ["Microsoft.CodeAnalysis.Common"], "net462": ["Microsoft.CodeAnalysis.Common"], "net47": ["Microsoft.CodeAnalysis.Common"], "net471": ["Microsoft.CodeAnalysis.Common"], "net472": ["Microsoft.CodeAnalysis.Common"], "net48": ["Microsoft.CodeAnalysis.Common"], "net5.0": ["Microsoft.CodeAnalysis.Common"], "net6.0": ["Microsoft.CodeAnalysis.Common"], "net7.0": ["Microsoft.CodeAnalysis.Common"], "net8.0": ["Microsoft.CodeAnalysis.Common"], "net9.0": ["Microsoft.CodeAnalysis.Common"], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": ["Microsoft.CodeAnalysis.Common"], "netcoreapp2.1": ["Microsoft.CodeAnalysis.Common"], "netcoreapp2.2": ["Microsoft.CodeAnalysis.Common"], "netcoreapp3.0": ["Microsoft.CodeAnalysis.Common"], "netcoreapp3.1": ["Microsoft.CodeAnalysis.Common"], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": ["Microsoft.CodeAnalysis.Common"], "netstandard2.1": ["Microsoft.CodeAnalysis.Common"]}, "targeting_pack_overrides": [], "framework_list": []},
+            {"name": "Microsoft.CodeAnalysis.CSharp.Workspaces", "id": "Microsoft.CodeAnalysis.CSharp.Workspaces", "version": "4.9.2", "sha512": "sha512-NfP1c+OjN0KbFxhSN2DXilIjZzH6p/DzkF+yemB0v/7nhQkvRq7cDle6TpWgpw12JKOSa6lSirfECbRSyLFGhA==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.Workspaces.Common", "Humanizer.Core"], "net462": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.Workspaces.Common", "Humanizer.Core"], "net47": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.Workspaces.Common", "Humanizer.Core"], "net471": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.Workspaces.Common", "Humanizer.Core"], "net472": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.Workspaces.Common", "Humanizer.Core"], "net48": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.Workspaces.Common", "Humanizer.Core"], "net5.0": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.Workspaces.Common", "Humanizer.Core"], "net6.0": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.Workspaces.Common", "Humanizer.Core"], "net7.0": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.Workspaces.Common", "Humanizer.Core"], "net8.0": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.Workspaces.Common", "Humanizer.Core"], "net9.0": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.Workspaces.Common", "Humanizer.Core"], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.Workspaces.Common", "Humanizer.Core"], "netcoreapp2.1": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.Workspaces.Common", "Humanizer.Core"], "netcoreapp2.2": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.Workspaces.Common", "Humanizer.Core"], "netcoreapp3.0": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.Workspaces.Common", "Humanizer.Core"], "netcoreapp3.1": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.Workspaces.Common", "Humanizer.Core"], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.Workspaces.Common", "Humanizer.Core"], "netstandard2.1": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.Workspaces.Common", "Humanizer.Core"]}, "targeting_pack_overrides": [], "framework_list": []},
+            {"name": "Microsoft.CodeAnalysis.VisualBasic", "id": "Microsoft.CodeAnalysis.VisualBasic", "version": "4.9.2", "sha512": "sha512-Jx3d7jpZ2bdCb/FzVBPD2a4P8jFDhdoEugGoxLxVKtBDzHA5+RdQL0BWvzwrP1Tdw3YPshrUelNlZXmcNXqZyA==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": ["Microsoft.CodeAnalysis.Common"], "net462": ["Microsoft.CodeAnalysis.Common"], "net47": ["Microsoft.CodeAnalysis.Common"], "net471": ["Microsoft.CodeAnalysis.Common"], "net472": ["Microsoft.CodeAnalysis.Common"], "net48": ["Microsoft.CodeAnalysis.Common"], "net5.0": ["Microsoft.CodeAnalysis.Common"], "net6.0": ["Microsoft.CodeAnalysis.Common"], "net7.0": ["Microsoft.CodeAnalysis.Common"], "net8.0": ["Microsoft.CodeAnalysis.Common"], "net9.0": ["Microsoft.CodeAnalysis.Common"], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": ["Microsoft.CodeAnalysis.Common"], "netcoreapp2.1": ["Microsoft.CodeAnalysis.Common"], "netcoreapp2.2": ["Microsoft.CodeAnalysis.Common"], "netcoreapp3.0": ["Microsoft.CodeAnalysis.Common"], "netcoreapp3.1": ["Microsoft.CodeAnalysis.Common"], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": ["Microsoft.CodeAnalysis.Common"], "netstandard2.1": ["Microsoft.CodeAnalysis.Common"]}, "targeting_pack_overrides": [], "framework_list": []},
+            {"name": "Microsoft.CodeAnalysis.VisualBasic.Workspaces", "id": "Microsoft.CodeAnalysis.VisualBasic.Workspaces", "version": "4.9.2", "sha512": "sha512-v07rvZvckHiPLDzKXFs9AXfEGsDeTvR+N9YHO9wQqboXgms4HCv0fTrZOOgqM/aVS7racJKRo1tf62UfjqMeEw==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.CodeAnalysis.Workspaces.Common"], "net462": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.CodeAnalysis.Workspaces.Common"], "net47": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.CodeAnalysis.Workspaces.Common"], "net471": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.CodeAnalysis.Workspaces.Common"], "net472": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.CodeAnalysis.Workspaces.Common"], "net48": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.CodeAnalysis.Workspaces.Common"], "net5.0": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.CodeAnalysis.Workspaces.Common"], "net6.0": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.CodeAnalysis.Workspaces.Common"], "net7.0": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.CodeAnalysis.Workspaces.Common"], "net8.0": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.CodeAnalysis.Workspaces.Common"], "net9.0": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.CodeAnalysis.Workspaces.Common"], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.CodeAnalysis.Workspaces.Common"], "netcoreapp2.1": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.CodeAnalysis.Workspaces.Common"], "netcoreapp2.2": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.CodeAnalysis.Workspaces.Common"], "netcoreapp3.0": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.CodeAnalysis.Workspaces.Common"], "netcoreapp3.1": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.CodeAnalysis.Workspaces.Common"], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.CodeAnalysis.Workspaces.Common"], "netstandard2.1": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.CodeAnalysis.Workspaces.Common"]}, "targeting_pack_overrides": [], "framework_list": []},
+            {"name": "Microsoft.CodeAnalysis.Workspaces.Common", "id": "Microsoft.CodeAnalysis.Workspaces.Common", "version": "4.9.2", "sha512": "sha512-DieswZYcYVGDPeT6m7M4i+0aKkjSgyjmI9z9HJEDSRZdvXfKYLEKwmlFGUTyzFS4brnyMCwLSiw2KWVAydpzVA==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": ["Microsoft.CodeAnalysis.Common", "Humanizer.Core", "System.Composition", "System.IO.Pipelines", "System.Threading.Channels"], "net462": ["Microsoft.CodeAnalysis.Common", "Humanizer.Core", "System.Composition", "System.IO.Pipelines", "System.Threading.Channels"], "net47": ["Microsoft.CodeAnalysis.Common", "Humanizer.Core", "System.Composition", "System.IO.Pipelines", "System.Threading.Channels"], "net471": ["Microsoft.CodeAnalysis.Common", "Humanizer.Core", "System.Composition", "System.IO.Pipelines", "System.Threading.Channels"], "net472": ["Microsoft.CodeAnalysis.Common", "Humanizer.Core", "System.Composition", "System.IO.Pipelines", "System.Threading.Channels"], "net48": ["Microsoft.CodeAnalysis.Common", "Humanizer.Core", "System.Composition", "System.IO.Pipelines", "System.Threading.Channels"], "net5.0": ["Microsoft.CodeAnalysis.Common", "Humanizer.Core", "System.Composition", "System.IO.Pipelines", "System.Threading.Channels"], "net6.0": ["Microsoft.CodeAnalysis.Common", "Humanizer.Core", "System.Composition", "System.IO.Pipelines", "System.Threading.Channels"], "net7.0": ["Microsoft.CodeAnalysis.Common", "Humanizer.Core", "System.Composition", "System.IO.Pipelines", "System.Threading.Channels"], "net8.0": ["Microsoft.CodeAnalysis.Common", "Humanizer.Core", "System.Composition", "System.IO.Pipelines", "System.Threading.Channels"], "net9.0": ["Microsoft.CodeAnalysis.Common", "Humanizer.Core", "System.Composition", "System.IO.Pipelines", "System.Threading.Channels"], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": ["Microsoft.CodeAnalysis.Common", "Humanizer.Core", "System.Composition", "System.IO.Pipelines", "System.Threading.Channels"], "netcoreapp2.1": ["Microsoft.CodeAnalysis.Common", "Humanizer.Core", "System.Composition", "System.IO.Pipelines", "System.Threading.Channels"], "netcoreapp2.2": ["Microsoft.CodeAnalysis.Common", "Humanizer.Core", "System.Composition", "System.IO.Pipelines", "System.Threading.Channels"], "netcoreapp3.0": ["Microsoft.CodeAnalysis.Common", "Humanizer.Core", "System.Composition", "System.IO.Pipelines", "System.Threading.Channels"], "netcoreapp3.1": ["Microsoft.CodeAnalysis.Common", "Humanizer.Core", "System.Composition", "System.IO.Pipelines", "System.Threading.Channels"], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": ["Microsoft.CodeAnalysis.Common", "Humanizer.Core", "System.Composition", "System.IO.Pipelines", "System.Threading.Channels"], "netstandard2.1": ["Microsoft.CodeAnalysis.Common", "Humanizer.Core", "System.Composition", "System.IO.Pipelines", "System.Threading.Channels"]}, "targeting_pack_overrides": [], "framework_list": []},
+            {"name": "Microsoft.CodeCoverage", "id": "Microsoft.CodeCoverage", "version": "17.11.1", "sha512": "sha512-ZJ4Ch1u7AemIzNpc0BbLoysJ0dJildIvAybL2vBUfbqho86N2VqzX9PGNc9a9pemZ//1Y6AOJ7SJxi/pCvLhHA==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": [], "net462": [], "net47": [], "net471": [], "net472": [], "net48": [], "net5.0": [], "net6.0": [], "net7.0": [], "net8.0": [], "net9.0": [], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": [], "netcoreapp2.1": [], "netcoreapp2.2": [], "netcoreapp3.0": [], "netcoreapp3.1": [], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": [], "netstandard2.1": []}, "targeting_pack_overrides": [], "framework_list": []},
+            {"name": "Microsoft.Extensions.ObjectPool", "id": "Microsoft.Extensions.ObjectPool", "version": "7.0.13", "sha512": "sha512-N66kAzKBfcs4zIX/iVMUOhfn8Xv3Ye1QpLGS8IUSpCHa+Vxh2ZsdDiqd0Y2m7ryPU6FU2LOTnZ+0ymmm83vC6w==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": [], "net462": [], "net47": [], "net471": [], "net472": [], "net48": [], "net5.0": [], "net6.0": [], "net7.0": [], "net8.0": [], "net9.0": [], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": [], "netcoreapp2.1": [], "netcoreapp2.2": [], "netcoreapp3.0": [], "netcoreapp3.1": [], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": [], "netstandard2.1": []}, "targeting_pack_overrides": [], "framework_list": []},
+            {"name": "Microsoft.NET.StringTools", "id": "Microsoft.NET.StringTools", "version": "17.8.3", "sha512": "sha512-3N/Ika66JZeORrIZ68fap6M0LSQ9+SQz277NxjA/dxETnR3dZwJXj67jAAc4FkijG6w//QzrC5NEregtIVjz1w==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": [], "net462": [], "net47": [], "net471": [], "net472": ["System.Runtime.CompilerServices.Unsafe"], "net48": ["System.Runtime.CompilerServices.Unsafe"], "net5.0": ["System.Runtime.CompilerServices.Unsafe"], "net6.0": ["System.Runtime.CompilerServices.Unsafe"], "net7.0": ["System.Runtime.CompilerServices.Unsafe"], "net8.0": [], "net9.0": [], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": ["System.Runtime.CompilerServices.Unsafe"], "netcoreapp2.1": ["System.Runtime.CompilerServices.Unsafe"], "netcoreapp2.2": ["System.Runtime.CompilerServices.Unsafe"], "netcoreapp3.0": ["System.Runtime.CompilerServices.Unsafe"], "netcoreapp3.1": ["System.Runtime.CompilerServices.Unsafe"], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": ["System.Runtime.CompilerServices.Unsafe"], "netstandard2.1": ["System.Runtime.CompilerServices.Unsafe"]}, "targeting_pack_overrides": [], "framework_list": []},
+            {"name": "Microsoft.NET.Test.Sdk", "id": "Microsoft.NET.Test.Sdk", "version": "17.11.1", "sha512": "sha512-k3ULrpyrTHKhVeKqdFwiUDOwqKVRtVTcyjmfKqKw/NrIHJ54mkTaGlU5ARUakDC894X1wTyXtdmzzaDZqelliA==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": [], "net462": ["Microsoft.CodeCoverage"], "net47": ["Microsoft.CodeCoverage"], "net471": ["Microsoft.CodeCoverage"], "net472": ["Microsoft.CodeCoverage"], "net48": ["Microsoft.CodeCoverage"], "net5.0": ["Microsoft.TestPlatform.TestHost", "Microsoft.CodeCoverage"], "net6.0": ["Microsoft.TestPlatform.TestHost", "Microsoft.CodeCoverage"], "net7.0": ["Microsoft.TestPlatform.TestHost", "Microsoft.CodeCoverage"], "net8.0": ["Microsoft.TestPlatform.TestHost", "Microsoft.CodeCoverage"], "net9.0": ["Microsoft.TestPlatform.TestHost", "Microsoft.CodeCoverage"], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": [], "netcoreapp2.1": [], "netcoreapp2.2": [], "netcoreapp3.0": [], "netcoreapp3.1": ["Microsoft.TestPlatform.TestHost", "Microsoft.CodeCoverage"], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": [], "netstandard2.1": []}, "targeting_pack_overrides": [], "framework_list": []},
+            {"name": "Microsoft.NETCore.Platforms", "id": "Microsoft.NETCore.Platforms", "version": "1.1.1", "sha512": "sha512-mDUJD1eLXIzmUnWCzWlmNQZGDp/cVGT8KyhzMcJNk2nlfdFUOoZai9idT8/FacJr8Nv8zhAmdf39FHm5qWUoGQ==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": [], "net462": [], "net47": [], "net471": [], "net472": [], "net48": [], "net5.0": [], "net6.0": [], "net7.0": [], "net8.0": [], "net9.0": [], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": [], "netcoreapp2.1": [], "netcoreapp2.2": [], "netcoreapp3.0": [], "netcoreapp3.1": [], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": [], "netstandard2.1": []}, "targeting_pack_overrides": [], "framework_list": []},
+            {"name": "Microsoft.NETCore.Targets", "id": "Microsoft.NETCore.Targets", "version": "1.1.3", "sha512": "sha512-pxwq8g2PYRiEF5KXVjmZFMNTqsg2Gr1puv/pR1sqAduAKHAGbaCuJ6+yc3pAJseClQUD29S2Ubrm7n/ZD78dUg==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": [], "net462": [], "net47": [], "net471": [], "net472": [], "net48": [], "net5.0": [], "net6.0": [], "net7.0": [], "net8.0": [], "net9.0": [], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": [], "netcoreapp2.1": [], "netcoreapp2.2": [], "netcoreapp3.0": [], "netcoreapp3.1": [], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": [], "netstandard2.1": []}, "targeting_pack_overrides": [], "framework_list": []},
+            {"name": "Microsoft.TestPlatform.ObjectModel", "id": "Microsoft.TestPlatform.ObjectModel", "version": "17.11.1", "sha512": "sha512-9hJ6Gbf3IaPwOP2qgdADYLEk9NXtAsp5y3szBogAe0lj7zaBWU0n8GiCVxpJL8RaoPee46qlJBfZcu1z9DQgAA==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": ["System.Reflection.Metadata"], "net462": ["System.Reflection.Metadata"], "net47": ["System.Reflection.Metadata"], "net471": ["System.Reflection.Metadata"], "net472": ["System.Reflection.Metadata"], "net48": ["System.Reflection.Metadata"], "net5.0": ["System.Reflection.Metadata"], "net6.0": ["System.Reflection.Metadata"], "net7.0": ["System.Reflection.Metadata"], "net8.0": ["System.Reflection.Metadata"], "net9.0": ["System.Reflection.Metadata"], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": ["System.Reflection.Metadata"], "netcoreapp2.1": ["System.Reflection.Metadata"], "netcoreapp2.2": ["System.Reflection.Metadata"], "netcoreapp3.0": ["System.Reflection.Metadata"], "netcoreapp3.1": ["System.Reflection.Metadata"], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": ["System.Reflection.Metadata"], "netstandard2.1": ["System.Reflection.Metadata"]}, "targeting_pack_overrides": [], "framework_list": []},
+            {"name": "Microsoft.TestPlatform.TestHost", "id": "Microsoft.TestPlatform.TestHost", "version": "17.11.1", "sha512": "sha512-deRHZRRzHUWbCu31aoFmFt9qelMkDmuBsgJ3jgqQt8KEIj2Tx0R1Qe7nDRZ3YUF84YGICMXMBd+BABtWRw3Wxg==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": [], "net462": [], "net47": [], "net471": [], "net472": [], "net48": [], "net5.0": ["Microsoft.TestPlatform.ObjectModel", "Newtonsoft.Json"], "net6.0": ["Microsoft.TestPlatform.ObjectModel", "Newtonsoft.Json"], "net7.0": ["Microsoft.TestPlatform.ObjectModel", "Newtonsoft.Json"], "net8.0": ["Microsoft.TestPlatform.ObjectModel", "Newtonsoft.Json"], "net9.0": ["Microsoft.TestPlatform.ObjectModel", "Newtonsoft.Json"], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": [], "netcoreapp2.1": [], "netcoreapp2.2": [], "netcoreapp3.0": [], "netcoreapp3.1": ["Microsoft.TestPlatform.ObjectModel", "Newtonsoft.Json"], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": [], "netstandard2.1": []}, "targeting_pack_overrides": [], "framework_list": []},
+            {"name": "Microsoft.Win32.Primitives", "id": "Microsoft.Win32.Primitives", "version": "4.3.0", "sha512": "sha512-Nm8Hp51y9tYcK3xD6qk43Wjftrg1mdH24CCJsTb6gr7HS21U1uA+CKPGEtUcVZbjU1y8Kynzm5eoJ7Pnx5gm8A==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": [], "net462": [], "net47": [], "net471": [], "net472": [], "net48": [], "net5.0": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime"], "net6.0": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime"], "net7.0": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime"], "net8.0": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime"], "net9.0": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime"], "netcoreapp1.0": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime"], "netcoreapp1.1": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime"], "netcoreapp2.0": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime"], "netcoreapp2.1": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime"], "netcoreapp2.2": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime"], "netcoreapp3.0": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime"], "netcoreapp3.1": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime"], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime"], "netstandard1.4": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime"], "netstandard1.5": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime"], "netstandard1.6": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime"], "netstandard2.0": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime"], "netstandard2.1": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime"]}, "targeting_pack_overrides": [], "framework_list": []},
+            {"name": "Microsoft.Win32.SystemEvents", "id": "Microsoft.Win32.SystemEvents", "version": "7.0.0", "sha512": "sha512-GO6SWx/wSZIFvxOn67Y6OiIGdz9JGCg5CRDDbSAAvBDQeZFbybu9sEOUb9w/vUlQv+A2XakTFZg9Ug1w+tgbWQ==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": [], "net462": [], "net47": [], "net471": [], "net472": [], "net48": [], "net5.0": [], "net6.0": [], "net7.0": [], "net8.0": [], "net9.0": [], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": [], "netcoreapp2.1": [], "netcoreapp2.2": [], "netcoreapp3.0": [], "netcoreapp3.1": [], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": [], "netstandard2.1": []}, "targeting_pack_overrides": [], "framework_list": []},
+            {"name": "Mono.Posix.NETStandard", "id": "Mono.Posix.NETStandard", "version": "1.0.0", "sha512": "sha512-RtGiutQZJAmajvQ0QvBvh73VJye85iW9f9tjZlzF88idLxNMo4lAktP/4Y9ilCpais0LDO0tpoICt9Hdv6wooA==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": [], "net462": [], "net47": [], "net471": [], "net472": [], "net48": [], "net5.0": [], "net6.0": [], "net7.0": [], "net8.0": [], "net9.0": [], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": [], "netcoreapp2.1": [], "netcoreapp2.2": [], "netcoreapp3.0": [], "netcoreapp3.1": [], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": [], "netstandard2.1": []}, "targeting_pack_overrides": [], "framework_list": []},
+            {"name": "MSBuild.StructuredLogger", "id": "MSBuild.StructuredLogger", "version": "2.2.235", "sha512": "sha512-9ige0SOByBirmeIYZ3fwlwbnXrYZA2trdZV7Mad8z7FiuGbVNOVkGYrzln/+G1eIvmRh9J0pt6xBLwqIYaMxyQ==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": ["Microsoft.Build.Framework", "Microsoft.Build.Utilities.Core"], "net462": ["Microsoft.Build.Framework", "Microsoft.Build.Utilities.Core"], "net47": ["Microsoft.Build.Framework", "Microsoft.Build.Utilities.Core"], "net471": ["Microsoft.Build.Framework", "Microsoft.Build.Utilities.Core"], "net472": ["Microsoft.Build.Framework", "Microsoft.Build.Utilities.Core"], "net48": ["Microsoft.Build.Framework", "Microsoft.Build.Utilities.Core"], "net5.0": ["Microsoft.Build.Framework", "Microsoft.Build.Utilities.Core"], "net6.0": ["Microsoft.Build.Framework", "Microsoft.Build.Utilities.Core"], "net7.0": ["Microsoft.Build.Framework", "Microsoft.Build.Utilities.Core"], "net8.0": ["Microsoft.Build.Framework", "Microsoft.Build.Utilities.Core"], "net9.0": ["Microsoft.Build.Framework", "Microsoft.Build.Utilities.Core"], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": ["Microsoft.Build.Framework", "Microsoft.Build.Utilities.Core"], "netcoreapp2.1": ["Microsoft.Build.Framework", "Microsoft.Build.Utilities.Core"], "netcoreapp2.2": ["Microsoft.Build.Framework", "Microsoft.Build.Utilities.Core"], "netcoreapp3.0": ["Microsoft.Build.Framework", "Microsoft.Build.Utilities.Core"], "netcoreapp3.1": ["Microsoft.Build.Framework", "Microsoft.Build.Utilities.Core"], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": ["Microsoft.Build.Framework", "Microsoft.Build.Utilities.Core"], "netstandard2.1": ["Microsoft.Build.Framework", "Microsoft.Build.Utilities.Core"]}, "targeting_pack_overrides": [], "framework_list": []},
+            {"name": "Newtonsoft.Json", "id": "Newtonsoft.Json", "version": "13.0.3", "sha512": "sha512-mbJSvHfRxfX3tR/U6n1WU+mWHXswYc+SB/hkOpx8yZZe68hNZGfymJu0cjsaJEkVzCMqePiU6LdIyogqfIn7kg==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": [], "net462": [], "net47": [], "net471": [], "net472": [], "net48": [], "net5.0": [], "net6.0": [], "net7.0": [], "net8.0": [], "net9.0": [], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": [], "netcoreapp2.1": [], "netcoreapp2.2": [], "netcoreapp3.0": [], "netcoreapp3.1": [], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": [], "netstandard2.1": []}, "targeting_pack_overrides": [], "framework_list": []},
+            {"name": "System.Collections.Immutable", "id": "System.Collections.Immutable", "version": "8.0.0", "sha512": "sha512-BXqVkcIrhimvvem6q2ChWkuW6XYYirvb6FlhvuwaMoBqBdpcr4nehJBKP65Tw40UqcUM6oDoODsecM0yjZ6AUw==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": ["System.Runtime.CompilerServices.Unsafe"], "net462": ["System.Runtime.CompilerServices.Unsafe"], "net47": ["System.Runtime.CompilerServices.Unsafe"], "net471": ["System.Runtime.CompilerServices.Unsafe"], "net472": ["System.Runtime.CompilerServices.Unsafe"], "net48": ["System.Runtime.CompilerServices.Unsafe"], "net5.0": ["System.Runtime.CompilerServices.Unsafe"], "net6.0": ["System.Runtime.CompilerServices.Unsafe"], "net7.0": [], "net8.0": [], "net9.0": [], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": ["System.Runtime.CompilerServices.Unsafe"], "netcoreapp2.1": ["System.Runtime.CompilerServices.Unsafe"], "netcoreapp2.2": ["System.Runtime.CompilerServices.Unsafe"], "netcoreapp3.0": ["System.Runtime.CompilerServices.Unsafe"], "netcoreapp3.1": ["System.Runtime.CompilerServices.Unsafe"], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": ["System.Runtime.CompilerServices.Unsafe"], "netstandard2.1": ["System.Runtime.CompilerServices.Unsafe"]}, "targeting_pack_overrides": [], "framework_list": []},
+            {"name": "System.Composition", "id": "System.Composition", "version": "8.0.0", "sha512": "sha512-/AZ/S+sX6awiSeSvOv7997aiwbU6HCcOBJDLecdYQJjDo+4nYCrWwWKQQIZ38VZ6BLh1pDmcYFPZockIuoRIYw==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": ["System.Composition.AttributedModel", "System.Composition.Convention", "System.Composition.Hosting", "System.Composition.Runtime", "System.Composition.TypedParts"], "net462": ["System.Composition.AttributedModel", "System.Composition.Convention", "System.Composition.Hosting", "System.Composition.Runtime", "System.Composition.TypedParts"], "net47": ["System.Composition.AttributedModel", "System.Composition.Convention", "System.Composition.Hosting", "System.Composition.Runtime", "System.Composition.TypedParts"], "net471": ["System.Composition.AttributedModel", "System.Composition.Convention", "System.Composition.Hosting", "System.Composition.Runtime", "System.Composition.TypedParts"], "net472": ["System.Composition.AttributedModel", "System.Composition.Convention", "System.Composition.Hosting", "System.Composition.Runtime", "System.Composition.TypedParts"], "net48": ["System.Composition.AttributedModel", "System.Composition.Convention", "System.Composition.Hosting", "System.Composition.Runtime", "System.Composition.TypedParts"], "net5.0": ["System.Composition.AttributedModel", "System.Composition.Convention", "System.Composition.Hosting", "System.Composition.Runtime", "System.Composition.TypedParts"], "net6.0": ["System.Composition.AttributedModel", "System.Composition.Convention", "System.Composition.Hosting", "System.Composition.Runtime", "System.Composition.TypedParts"], "net7.0": ["System.Composition.AttributedModel", "System.Composition.Convention", "System.Composition.Hosting", "System.Composition.Runtime", "System.Composition.TypedParts"], "net8.0": ["System.Composition.AttributedModel", "System.Composition.Convention", "System.Composition.Hosting", "System.Composition.Runtime", "System.Composition.TypedParts"], "net9.0": ["System.Composition.AttributedModel", "System.Composition.Convention", "System.Composition.Hosting", "System.Composition.Runtime", "System.Composition.TypedParts"], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": ["System.Composition.AttributedModel", "System.Composition.Convention", "System.Composition.Hosting", "System.Composition.Runtime", "System.Composition.TypedParts"], "netcoreapp2.1": ["System.Composition.AttributedModel", "System.Composition.Convention", "System.Composition.Hosting", "System.Composition.Runtime", "System.Composition.TypedParts"], "netcoreapp2.2": ["System.Composition.AttributedModel", "System.Composition.Convention", "System.Composition.Hosting", "System.Composition.Runtime", "System.Composition.TypedParts"], "netcoreapp3.0": ["System.Composition.AttributedModel", "System.Composition.Convention", "System.Composition.Hosting", "System.Composition.Runtime", "System.Composition.TypedParts"], "netcoreapp3.1": ["System.Composition.AttributedModel", "System.Composition.Convention", "System.Composition.Hosting", "System.Composition.Runtime", "System.Composition.TypedParts"], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": ["System.Composition.AttributedModel", "System.Composition.Convention", "System.Composition.Hosting", "System.Composition.Runtime", "System.Composition.TypedParts"], "netstandard2.1": ["System.Composition.AttributedModel", "System.Composition.Convention", "System.Composition.Hosting", "System.Composition.Runtime", "System.Composition.TypedParts"]}, "targeting_pack_overrides": [], "framework_list": []},
+            {"name": "System.Composition.AttributedModel", "id": "System.Composition.AttributedModel", "version": "8.0.0", "sha512": "sha512-gmEwpwXz+COPtuAASK+ichAg8+0oQAaPOV59g6fDdnt1KWbrymdixAn06bNbkdCUGcBXb8RX5k79cqg0Hqlv1g==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": [], "net462": [], "net47": [], "net471": [], "net472": [], "net48": [], "net5.0": [], "net6.0": [], "net7.0": [], "net8.0": [], "net9.0": [], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": [], "netcoreapp2.1": [], "netcoreapp2.2": [], "netcoreapp3.0": [], "netcoreapp3.1": [], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": [], "netstandard2.1": []}, "targeting_pack_overrides": [], "framework_list": []},
+            {"name": "System.Composition.Convention", "id": "System.Composition.Convention", "version": "8.0.0", "sha512": "sha512-MP7qMadQGUcMOEyGON5dmy9T+OXubvIx04kFHvTVPfZ/9+ns8dqmFToxoF7IDzJVSWmtOQHDUP2fL1x8F6slTA==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": ["System.Composition.AttributedModel"], "net462": ["System.Composition.AttributedModel"], "net47": ["System.Composition.AttributedModel"], "net471": ["System.Composition.AttributedModel"], "net472": ["System.Composition.AttributedModel"], "net48": ["System.Composition.AttributedModel"], "net5.0": ["System.Composition.AttributedModel"], "net6.0": ["System.Composition.AttributedModel"], "net7.0": ["System.Composition.AttributedModel"], "net8.0": ["System.Composition.AttributedModel"], "net9.0": ["System.Composition.AttributedModel"], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": ["System.Composition.AttributedModel"], "netcoreapp2.1": ["System.Composition.AttributedModel"], "netcoreapp2.2": ["System.Composition.AttributedModel"], "netcoreapp3.0": ["System.Composition.AttributedModel"], "netcoreapp3.1": ["System.Composition.AttributedModel"], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": ["System.Composition.AttributedModel"], "netstandard2.1": ["System.Composition.AttributedModel"]}, "targeting_pack_overrides": [], "framework_list": []},
+            {"name": "System.Composition.Hosting", "id": "System.Composition.Hosting", "version": "8.0.0", "sha512": "sha512-HK6mWN38TLXo0jQOzR6so8cH1J8/6MzCfSsQS15bWbFEYKeonKRAZKyTC2E92o+wB1KCkocNpOy01ix61JnWjQ==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": ["System.Composition.Runtime"], "net462": ["System.Composition.Runtime"], "net47": ["System.Composition.Runtime"], "net471": ["System.Composition.Runtime"], "net472": ["System.Composition.Runtime"], "net48": ["System.Composition.Runtime"], "net5.0": ["System.Composition.Runtime"], "net6.0": ["System.Composition.Runtime"], "net7.0": ["System.Composition.Runtime"], "net8.0": ["System.Composition.Runtime"], "net9.0": ["System.Composition.Runtime"], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": ["System.Composition.Runtime"], "netcoreapp2.1": ["System.Composition.Runtime"], "netcoreapp2.2": ["System.Composition.Runtime"], "netcoreapp3.0": ["System.Composition.Runtime"], "netcoreapp3.1": ["System.Composition.Runtime"], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": ["System.Composition.Runtime"], "netstandard2.1": ["System.Composition.Runtime"]}, "targeting_pack_overrides": [], "framework_list": []},
+            {"name": "System.Composition.Runtime", "id": "System.Composition.Runtime", "version": "8.0.0", "sha512": "sha512-hgGA3KDIx9FN3WYkpMvy0pUqWAul9BTehmqq49dqPxu5E+MbUKqgksU5XRP8M9LoBPZFa8FqBbKeFgCZ3rja2w==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": [], "net462": [], "net47": [], "net471": [], "net472": [], "net48": [], "net5.0": [], "net6.0": [], "net7.0": [], "net8.0": [], "net9.0": [], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": [], "netcoreapp2.1": [], "netcoreapp2.2": [], "netcoreapp3.0": [], "netcoreapp3.1": [], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": [], "netstandard2.1": []}, "targeting_pack_overrides": [], "framework_list": []},
+            {"name": "System.Composition.TypedParts", "id": "System.Composition.TypedParts", "version": "8.0.0", "sha512": "sha512-rKu0GdZ4JYOWUF7br1W7UQFI/UgzWTU03CHY6tnTLZXCMth6YSADGJRRQYrLzpwh2+NuNcBIuv7a7x8J1xsfdw==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": ["System.Composition.AttributedModel", "System.Composition.Hosting", "System.Composition.Runtime"], "net462": ["System.Composition.AttributedModel", "System.Composition.Hosting", "System.Composition.Runtime"], "net47": ["System.Composition.AttributedModel", "System.Composition.Hosting", "System.Composition.Runtime"], "net471": ["System.Composition.AttributedModel", "System.Composition.Hosting", "System.Composition.Runtime"], "net472": ["System.Composition.AttributedModel", "System.Composition.Hosting", "System.Composition.Runtime"], "net48": ["System.Composition.AttributedModel", "System.Composition.Hosting", "System.Composition.Runtime"], "net5.0": ["System.Composition.AttributedModel", "System.Composition.Hosting", "System.Composition.Runtime"], "net6.0": ["System.Composition.AttributedModel", "System.Composition.Hosting", "System.Composition.Runtime"], "net7.0": ["System.Composition.AttributedModel", "System.Composition.Hosting", "System.Composition.Runtime"], "net8.0": ["System.Composition.AttributedModel", "System.Composition.Hosting", "System.Composition.Runtime"], "net9.0": ["System.Composition.AttributedModel", "System.Composition.Hosting", "System.Composition.Runtime"], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": ["System.Composition.AttributedModel", "System.Composition.Hosting", "System.Composition.Runtime"], "netcoreapp2.1": ["System.Composition.AttributedModel", "System.Composition.Hosting", "System.Composition.Runtime"], "netcoreapp2.2": ["System.Composition.AttributedModel", "System.Composition.Hosting", "System.Composition.Runtime"], "netcoreapp3.0": ["System.Composition.AttributedModel", "System.Composition.Hosting", "System.Composition.Runtime"], "netcoreapp3.1": ["System.Composition.AttributedModel", "System.Composition.Hosting", "System.Composition.Runtime"], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": ["System.Composition.AttributedModel", "System.Composition.Hosting", "System.Composition.Runtime"], "netstandard2.1": ["System.Composition.AttributedModel", "System.Composition.Hosting", "System.Composition.Runtime"]}, "targeting_pack_overrides": [], "framework_list": []},
+            {"name": "System.Configuration.ConfigurationManager", "id": "System.Configuration.ConfigurationManager", "version": "7.0.0", "sha512": "sha512-g3iVgTpIcjMYpH+sMq5VKjytevOJv+ABsYLKOLj0UZrXp3diFFdnPPqL+orxMD5ktyaTagg2S7ONJInu8itIaQ==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": ["System.Security.Cryptography.ProtectedData", "System.Security.Permissions"], "net462": ["System.Security.Permissions"], "net47": ["System.Security.Permissions"], "net471": ["System.Security.Permissions"], "net472": ["System.Security.Permissions"], "net48": ["System.Security.Permissions"], "net5.0": ["System.Security.Cryptography.ProtectedData", "System.Security.Permissions"], "net6.0": ["System.Security.Cryptography.ProtectedData", "System.Security.Permissions"], "net7.0": ["System.Diagnostics.EventLog", "System.Security.Cryptography.ProtectedData", "System.Security.Permissions"], "net8.0": ["System.Diagnostics.EventLog", "System.Security.Cryptography.ProtectedData", "System.Security.Permissions"], "net9.0": ["System.Diagnostics.EventLog", "System.Security.Cryptography.ProtectedData", "System.Security.Permissions"], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": ["System.Security.Cryptography.ProtectedData", "System.Security.Permissions"], "netcoreapp2.1": ["System.Security.Cryptography.ProtectedData", "System.Security.Permissions"], "netcoreapp2.2": ["System.Security.Cryptography.ProtectedData", "System.Security.Permissions"], "netcoreapp3.0": ["System.Security.Cryptography.ProtectedData", "System.Security.Permissions"], "netcoreapp3.1": ["System.Security.Cryptography.ProtectedData", "System.Security.Permissions"], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": ["System.Security.Cryptography.ProtectedData", "System.Security.Permissions"], "netstandard2.1": ["System.Security.Cryptography.ProtectedData", "System.Security.Permissions"]}, "targeting_pack_overrides": [], "framework_list": []},
+            {"name": "System.Diagnostics.EventLog", "id": "System.Diagnostics.EventLog", "version": "7.0.0", "sha512": "sha512-m/H4Rg7KukGEmfRpl+rXU1UbMN3GYbv42cbMHRgMwHIiUL3svKoFFR76Fk/mHN5TgrwGx64fS0Fp+p3qICKg/Q==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": ["System.Security.Principal.Windows"], "net462": ["System.Security.Principal.Windows"], "net47": ["System.Security.Principal.Windows"], "net471": ["System.Security.Principal.Windows"], "net472": ["System.Security.Principal.Windows"], "net48": ["System.Security.Principal.Windows"], "net5.0": ["System.Security.Principal.Windows"], "net6.0": [], "net7.0": [], "net8.0": [], "net9.0": [], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": ["System.Security.Principal.Windows"], "netcoreapp2.1": ["System.Security.Principal.Windows"], "netcoreapp2.2": ["System.Security.Principal.Windows"], "netcoreapp3.0": ["System.Security.Principal.Windows"], "netcoreapp3.1": ["System.Security.Principal.Windows"], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": ["System.Security.Principal.Windows"], "netstandard2.1": ["System.Security.Principal.Windows"]}, "targeting_pack_overrides": [], "framework_list": []},
+            {"name": "System.Drawing.Common", "id": "System.Drawing.Common", "version": "7.0.0", "sha512": "sha512-0TJd5U26gRDgGa/rqABgHC5OBAiyl7Mm3pIzPgKfpmPXFQ8CFVWyGi+4mkEaCK715ViOBDkU2pC2nAiPunLw7Q==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": [], "net462": [], "net47": [], "net471": [], "net472": [], "net48": [], "net5.0": [], "net6.0": ["Microsoft.Win32.SystemEvents"], "net7.0": ["Microsoft.Win32.SystemEvents"], "net8.0": ["Microsoft.Win32.SystemEvents"], "net9.0": ["Microsoft.Win32.SystemEvents"], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": [], "netcoreapp2.1": [], "netcoreapp2.2": [], "netcoreapp3.0": [], "netcoreapp3.1": [], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": [], "netstandard2.1": []}, "targeting_pack_overrides": [], "framework_list": []},
+            {"name": "System.IO", "id": "System.IO", "version": "4.3.0", "sha512": "sha512-v8paIePhmGuXZbE9xvvNb4uJ5ME4OFXR1+8la/G/L1GIl2nbU2WFnddgb79kVK3U2us7q1aZT/uY/R0D/ovB5g==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": [], "net462": [], "net47": [], "net471": [], "net472": [], "net48": [], "net5.0": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime", "System.Text.Encoding", "System.Threading.Tasks"], "net6.0": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime", "System.Text.Encoding", "System.Threading.Tasks"], "net7.0": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime", "System.Text.Encoding", "System.Threading.Tasks"], "net8.0": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime", "System.Text.Encoding", "System.Threading.Tasks"], "net9.0": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime", "System.Text.Encoding", "System.Threading.Tasks"], "netcoreapp1.0": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime", "System.Text.Encoding", "System.Threading.Tasks"], "netcoreapp1.1": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime", "System.Text.Encoding", "System.Threading.Tasks"], "netcoreapp2.0": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime", "System.Text.Encoding", "System.Threading.Tasks"], "netcoreapp2.1": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime", "System.Text.Encoding", "System.Threading.Tasks"], "netcoreapp2.2": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime", "System.Text.Encoding", "System.Threading.Tasks"], "netcoreapp3.0": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime", "System.Text.Encoding", "System.Threading.Tasks"], "netcoreapp3.1": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime", "System.Text.Encoding", "System.Threading.Tasks"], "netstandard": [], "netstandard1.0": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime", "System.Text.Encoding", "System.Threading.Tasks"], "netstandard1.1": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime", "System.Text.Encoding", "System.Threading.Tasks"], "netstandard1.2": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime", "System.Text.Encoding", "System.Threading.Tasks"], "netstandard1.3": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime", "System.Text.Encoding", "System.Threading.Tasks"], "netstandard1.4": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime", "System.Text.Encoding", "System.Threading.Tasks"], "netstandard1.5": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime", "System.Text.Encoding", "System.Threading.Tasks"], "netstandard1.6": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime", "System.Text.Encoding", "System.Threading.Tasks"], "netstandard2.0": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime", "System.Text.Encoding", "System.Threading.Tasks"], "netstandard2.1": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime", "System.Text.Encoding", "System.Threading.Tasks"]}, "targeting_pack_overrides": [], "framework_list": []},
+            {"name": "System.IO.FileSystem", "id": "System.IO.FileSystem", "version": "4.3.0", "sha512": "sha512-T7WB1vhblSmgkaDpdGM3Uqo55Qsr5sip5eyowrwiXOoHBkzOx3ePd9+Zh97r9NzOwFCxqX7awO6RBxQuao7n7g==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": ["System.IO.FileSystem.Primitives"], "net461": ["System.IO.FileSystem.Primitives"], "net462": ["System.IO.FileSystem.Primitives"], "net47": ["System.IO.FileSystem.Primitives"], "net471": ["System.IO.FileSystem.Primitives"], "net472": ["System.IO.FileSystem.Primitives"], "net48": ["System.IO.FileSystem.Primitives"], "net5.0": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.IO", "System.IO.FileSystem.Primitives", "System.Runtime", "System.Runtime.Handles", "System.Text.Encoding", "System.Threading.Tasks"], "net6.0": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.IO", "System.IO.FileSystem.Primitives", "System.Runtime", "System.Runtime.Handles", "System.Text.Encoding", "System.Threading.Tasks"], "net7.0": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.IO", "System.IO.FileSystem.Primitives", "System.Runtime", "System.Runtime.Handles", "System.Text.Encoding", "System.Threading.Tasks"], "net8.0": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.IO", "System.IO.FileSystem.Primitives", "System.Runtime", "System.Runtime.Handles", "System.Text.Encoding", "System.Threading.Tasks"], "net9.0": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.IO", "System.IO.FileSystem.Primitives", "System.Runtime", "System.Runtime.Handles", "System.Text.Encoding", "System.Threading.Tasks"], "netcoreapp1.0": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.IO", "System.IO.FileSystem.Primitives", "System.Runtime", "System.Runtime.Handles", "System.Text.Encoding", "System.Threading.Tasks"], "netcoreapp1.1": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.IO", "System.IO.FileSystem.Primitives", "System.Runtime", "System.Runtime.Handles", "System.Text.Encoding", "System.Threading.Tasks"], "netcoreapp2.0": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.IO", "System.IO.FileSystem.Primitives", "System.Runtime", "System.Runtime.Handles", "System.Text.Encoding", "System.Threading.Tasks"], "netcoreapp2.1": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.IO", "System.IO.FileSystem.Primitives", "System.Runtime", "System.Runtime.Handles", "System.Text.Encoding", "System.Threading.Tasks"], "netcoreapp2.2": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.IO", "System.IO.FileSystem.Primitives", "System.Runtime", "System.Runtime.Handles", "System.Text.Encoding", "System.Threading.Tasks"], "netcoreapp3.0": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.IO", "System.IO.FileSystem.Primitives", "System.Runtime", "System.Runtime.Handles", "System.Text.Encoding", "System.Threading.Tasks"], "netcoreapp3.1": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.IO", "System.IO.FileSystem.Primitives", "System.Runtime", "System.Runtime.Handles", "System.Text.Encoding", "System.Threading.Tasks"], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.IO", "System.IO.FileSystem.Primitives", "System.Runtime", "System.Runtime.Handles", "System.Text.Encoding", "System.Threading.Tasks"], "netstandard1.4": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.IO", "System.IO.FileSystem.Primitives", "System.Runtime", "System.Runtime.Handles", "System.Text.Encoding", "System.Threading.Tasks"], "netstandard1.5": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.IO", "System.IO.FileSystem.Primitives", "System.Runtime", "System.Runtime.Handles", "System.Text.Encoding", "System.Threading.Tasks"], "netstandard1.6": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.IO", "System.IO.FileSystem.Primitives", "System.Runtime", "System.Runtime.Handles", "System.Text.Encoding", "System.Threading.Tasks"], "netstandard2.0": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.IO", "System.IO.FileSystem.Primitives", "System.Runtime", "System.Runtime.Handles", "System.Text.Encoding", "System.Threading.Tasks"], "netstandard2.1": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.IO", "System.IO.FileSystem.Primitives", "System.Runtime", "System.Runtime.Handles", "System.Text.Encoding", "System.Threading.Tasks"]}, "targeting_pack_overrides": [], "framework_list": []},
+            {"name": "System.IO.FileSystem.Primitives", "id": "System.IO.FileSystem.Primitives", "version": "4.3.0", "sha512": "sha512-WIWVPQlYLP/Zc9I6IakpBk1y8ryVGK83MtZx//zGKKi2hvHQWKAB7moRQCOz5Is/wNDksiYpocf3FeA3le6e5Q==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": [], "net462": [], "net47": [], "net471": [], "net472": [], "net48": [], "net5.0": ["System.Runtime"], "net6.0": ["System.Runtime"], "net7.0": ["System.Runtime"], "net8.0": ["System.Runtime"], "net9.0": ["System.Runtime"], "netcoreapp1.0": ["System.Runtime"], "netcoreapp1.1": ["System.Runtime"], "netcoreapp2.0": ["System.Runtime"], "netcoreapp2.1": ["System.Runtime"], "netcoreapp2.2": ["System.Runtime"], "netcoreapp3.0": ["System.Runtime"], "netcoreapp3.1": ["System.Runtime"], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": ["System.Runtime"], "netstandard1.4": ["System.Runtime"], "netstandard1.5": ["System.Runtime"], "netstandard1.6": ["System.Runtime"], "netstandard2.0": ["System.Runtime"], "netstandard2.1": ["System.Runtime"]}, "targeting_pack_overrides": [], "framework_list": []},
+            {"name": "System.IO.Pipelines", "id": "System.IO.Pipelines", "version": "8.0.0", "sha512": "sha512-V+tqEehPQKSLV7HcV4agGqmFISK30VNjSQ2KEsmkWL+ZqN30wMAke+mFWcK0LnaaEL2ixamBdzVITZYNxlLrEg==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": [], "net462": [], "net47": [], "net471": [], "net472": [], "net48": [], "net5.0": [], "net6.0": [], "net7.0": [], "net8.0": [], "net9.0": [], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": [], "netcoreapp2.1": [], "netcoreapp2.2": [], "netcoreapp3.0": [], "netcoreapp3.1": [], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": [], "netstandard2.1": []}, "targeting_pack_overrides": [], "framework_list": []},
+            {"name": "System.Net.Primitives", "id": "System.Net.Primitives", "version": "4.3.1", "sha512": "sha512-BgdlyYCI7rrdh36p3lMTqbkvaafPETpB1bk9iQlFdQxYE692kiXvmseXs8ghL+gEgQF2xgDc8GH4QLkSgUUs+Q==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": [], "net462": [], "net47": [], "net471": [], "net472": [], "net48": [], "net5.0": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime", "System.Runtime.Handles"], "net6.0": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime", "System.Runtime.Handles"], "net7.0": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime", "System.Runtime.Handles"], "net8.0": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime", "System.Runtime.Handles"], "net9.0": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime", "System.Runtime.Handles"], "netcoreapp1.0": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime", "System.Runtime.Handles"], "netcoreapp1.1": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime", "System.Runtime.Handles"], "netcoreapp2.0": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime", "System.Runtime.Handles"], "netcoreapp2.1": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime", "System.Runtime.Handles"], "netcoreapp2.2": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime", "System.Runtime.Handles"], "netcoreapp3.0": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime", "System.Runtime.Handles"], "netcoreapp3.1": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime", "System.Runtime.Handles"], "netstandard": [], "netstandard1.0": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime"], "netstandard1.1": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime"], "netstandard1.2": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime"], "netstandard1.3": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime", "System.Runtime.Handles"], "netstandard1.4": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime", "System.Runtime.Handles"], "netstandard1.5": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime", "System.Runtime.Handles"], "netstandard1.6": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime", "System.Runtime.Handles"], "netstandard2.0": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime", "System.Runtime.Handles"], "netstandard2.1": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime", "System.Runtime.Handles"]}, "targeting_pack_overrides": [], "framework_list": []},
+            {"name": "System.Reflection.Metadata", "id": "System.Reflection.Metadata", "version": "8.0.0", "sha512": "sha512-+6sMdkJjee0B6nm3AlBBl7cQaI0oPniLvvkrkFhmEN3fo/hGONaFdwpAaO+GRTlbZe4kRZzFwU7kSXQW0RyJxg==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": ["System.Collections.Immutable"], "net462": ["System.Collections.Immutable"], "net47": ["System.Collections.Immutable"], "net471": ["System.Collections.Immutable"], "net472": ["System.Collections.Immutable"], "net48": ["System.Collections.Immutable"], "net5.0": ["System.Collections.Immutable"], "net6.0": ["System.Collections.Immutable"], "net7.0": ["System.Collections.Immutable"], "net8.0": ["System.Collections.Immutable"], "net9.0": ["System.Collections.Immutable"], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": ["System.Collections.Immutable"], "netcoreapp2.1": ["System.Collections.Immutable"], "netcoreapp2.2": ["System.Collections.Immutable"], "netcoreapp3.0": ["System.Collections.Immutable"], "netcoreapp3.1": ["System.Collections.Immutable"], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": ["System.Collections.Immutable"], "netstandard2.1": ["System.Collections.Immutable"]}, "targeting_pack_overrides": [], "framework_list": []},
+            {"name": "System.Reflection.MetadataLoadContext", "id": "System.Reflection.MetadataLoadContext", "version": "7.0.0", "sha512": "sha512-dqk0PmO2SGulqNpuJlALPc/5vqFVZc6As4ToHeZvd+6B/DomA1/JM1nAOpSU2hkBVytU0GlwsBr4YfKSnGSchg==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": ["System.Collections.Immutable", "System.Reflection.Metadata"], "net462": ["System.Collections.Immutable", "System.Reflection.Metadata"], "net47": ["System.Collections.Immutable", "System.Reflection.Metadata"], "net471": ["System.Collections.Immutable", "System.Reflection.Metadata"], "net472": ["System.Collections.Immutable", "System.Reflection.Metadata"], "net48": ["System.Collections.Immutable", "System.Reflection.Metadata"], "net5.0": ["System.Collections.Immutable", "System.Reflection.Metadata"], "net6.0": ["System.Collections.Immutable", "System.Reflection.Metadata"], "net7.0": ["System.Collections.Immutable", "System.Reflection.Metadata"], "net8.0": ["System.Collections.Immutable", "System.Reflection.Metadata"], "net9.0": ["System.Collections.Immutable", "System.Reflection.Metadata"], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": ["System.Collections.Immutable", "System.Reflection.Metadata"], "netcoreapp2.1": ["System.Collections.Immutable", "System.Reflection.Metadata"], "netcoreapp2.2": ["System.Collections.Immutable", "System.Reflection.Metadata"], "netcoreapp3.0": ["System.Collections.Immutable", "System.Reflection.Metadata"], "netcoreapp3.1": ["System.Collections.Immutable", "System.Reflection.Metadata"], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": ["System.Collections.Immutable", "System.Reflection.Metadata"], "netstandard2.1": ["System.Collections.Immutable", "System.Reflection.Metadata"]}, "targeting_pack_overrides": [], "framework_list": []},
+            {"name": "System.Runtime", "id": "System.Runtime", "version": "4.3.1", "sha512": "sha512-Al69mPDfzdD+bKGK2HAfB+lNFOHFqnkqzNnUJmmvUe1/qEPK9M7EiTT4zuycKDPy7ev11xz8XVgJWKP0hm7NIA==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": [], "net462": [], "net47": [], "net471": [], "net472": [], "net48": [], "net5.0": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets"], "net6.0": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets"], "net7.0": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets"], "net8.0": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets"], "net9.0": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets"], "netcoreapp1.0": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets"], "netcoreapp1.1": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets"], "netcoreapp2.0": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets"], "netcoreapp2.1": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets"], "netcoreapp2.2": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets"], "netcoreapp3.0": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets"], "netcoreapp3.1": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets"], "netstandard": [], "netstandard1.0": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets"], "netstandard1.1": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets"], "netstandard1.2": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets"], "netstandard1.3": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets"], "netstandard1.4": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets"], "netstandard1.5": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets"], "netstandard1.6": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets"], "netstandard2.0": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets"], "netstandard2.1": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets"]}, "targeting_pack_overrides": [], "framework_list": []},
+            {"name": "System.Runtime.CompilerServices.Unsafe", "id": "System.Runtime.CompilerServices.Unsafe", "version": "6.0.0", "sha512": "sha512-1AVzAb5OxJNvJLnOADtexNmWgattm2XVOT3TjQTN7Dd4SqoSwai1CsN2fth42uQldJSQdz/sAec0+TzxBFgisw==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": [], "net462": [], "net47": [], "net471": [], "net472": [], "net48": [], "net5.0": [], "net6.0": [], "net7.0": [], "net8.0": [], "net9.0": [], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": [], "netcoreapp2.1": [], "netcoreapp2.2": [], "netcoreapp3.0": [], "netcoreapp3.1": [], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": [], "netstandard2.1": []}, "targeting_pack_overrides": [], "framework_list": []},
+            {"name": "System.Runtime.Handles", "id": "System.Runtime.Handles", "version": "4.3.0", "sha512": "sha512-CluvHdVUv54BvLTOCCyybugreDNk/rR8unMPruzXDtxSjvrQOU3M4R831/lQf4YI8VYp668FGQa/01E+Rq8PEQ==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": [], "net462": [], "net47": [], "net471": [], "net472": [], "net48": [], "net5.0": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime"], "net6.0": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime"], "net7.0": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime"], "net8.0": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime"], "net9.0": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime"], "netcoreapp1.0": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime"], "netcoreapp1.1": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime"], "netcoreapp2.0": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime"], "netcoreapp2.1": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime"], "netcoreapp2.2": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime"], "netcoreapp3.0": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime"], "netcoreapp3.1": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime"], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime"], "netstandard1.4": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime"], "netstandard1.5": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime"], "netstandard1.6": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime"], "netstandard2.0": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime"], "netstandard2.1": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime"]}, "targeting_pack_overrides": [], "framework_list": []},
+            {"name": "System.Security.Cryptography.ProtectedData", "id": "System.Security.Cryptography.ProtectedData", "version": "7.0.0", "sha512": "sha512-a34SHiyaMcLRjw/1IGXokS2cH9j8XoOhs1jUYq3m+kQcnPp6fhmeuqe5U947WqojDsVMhWAsCE6rIg8grBv9BA==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": [], "net462": [], "net47": [], "net471": [], "net472": [], "net48": [], "net5.0": [], "net6.0": [], "net7.0": [], "net8.0": [], "net9.0": [], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": [], "netcoreapp2.1": [], "netcoreapp2.2": [], "netcoreapp3.0": [], "netcoreapp3.1": [], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": [], "netstandard2.1": []}, "targeting_pack_overrides": [], "framework_list": []},
+            {"name": "System.Security.Permissions", "id": "System.Security.Permissions", "version": "7.0.0", "sha512": "sha512-XNVTmQ9JuCRwRXRTDoOHEzEt0wmQeRudH9lThP0l3OBja4P3jmRHq/0H0N9Ns1OD6gNmKpjLdOeHCQEXv4iVrA==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": [], "net462": [], "net47": [], "net471": [], "net472": [], "net48": [], "net5.0": [], "net6.0": ["System.Windows.Extensions"], "net7.0": ["System.Windows.Extensions"], "net8.0": ["System.Windows.Extensions"], "net9.0": ["System.Windows.Extensions"], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": [], "netcoreapp2.1": [], "netcoreapp2.2": [], "netcoreapp3.0": [], "netcoreapp3.1": [], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": [], "netstandard2.1": []}, "targeting_pack_overrides": [], "framework_list": []},
+            {"name": "System.Security.Principal", "id": "System.Security.Principal", "version": "4.3.0", "sha512": "sha512-24oe0NGJY32e+DFHVQzl2okM9uwYmn0Aa6nehqtVZ55/Al4Yva7S3BN934Kn5qATH7TVTUJkgxhisdfF7mKDfg==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": [], "net462": [], "net47": [], "net471": [], "net472": [], "net48": [], "net5.0": ["System.Runtime"], "net6.0": ["System.Runtime"], "net7.0": ["System.Runtime"], "net8.0": ["System.Runtime"], "net9.0": ["System.Runtime"], "netcoreapp1.0": ["System.Runtime"], "netcoreapp1.1": ["System.Runtime"], "netcoreapp2.0": ["System.Runtime"], "netcoreapp2.1": ["System.Runtime"], "netcoreapp2.2": ["System.Runtime"], "netcoreapp3.0": ["System.Runtime"], "netcoreapp3.1": ["System.Runtime"], "netstandard": [], "netstandard1.0": ["System.Runtime"], "netstandard1.1": ["System.Runtime"], "netstandard1.2": ["System.Runtime"], "netstandard1.3": ["System.Runtime"], "netstandard1.4": ["System.Runtime"], "netstandard1.5": ["System.Runtime"], "netstandard1.6": ["System.Runtime"], "netstandard2.0": ["System.Runtime"], "netstandard2.1": ["System.Runtime"]}, "targeting_pack_overrides": [], "framework_list": []},
+            {"name": "System.Security.Principal.Windows", "id": "System.Security.Principal.Windows", "version": "5.0.0", "sha512": "sha512-RKkgqq8ishctQTGbtXqyuOGkUx1fAhkqb1OoHYdRJRlbYLoLWkSkWYHRN/17DzplsSlZtf2Xr8BXjNhO8nRnzQ==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": [], "net462": [], "net47": [], "net471": [], "net472": [], "net48": [], "net5.0": [], "net6.0": [], "net7.0": [], "net8.0": [], "net9.0": [], "netcoreapp1.0": ["Microsoft.Win32.Primitives", "System.Runtime", "System.Runtime.Handles", "System.Security.Principal", "System.Text.Encoding"], "netcoreapp1.1": ["Microsoft.Win32.Primitives", "System.Runtime", "System.Runtime.Handles", "System.Security.Principal", "System.Text.Encoding"], "netcoreapp2.0": ["Microsoft.NETCore.Platforms"], "netcoreapp2.1": ["Microsoft.NETCore.Platforms"], "netcoreapp2.2": ["Microsoft.NETCore.Platforms"], "netcoreapp3.0": [], "netcoreapp3.1": [], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": ["Microsoft.Win32.Primitives", "System.Runtime", "System.Runtime.Handles", "System.Security.Principal", "System.Text.Encoding"], "netstandard1.4": ["Microsoft.Win32.Primitives", "System.Runtime", "System.Runtime.Handles", "System.Security.Principal", "System.Text.Encoding"], "netstandard1.5": ["Microsoft.Win32.Primitives", "System.Runtime", "System.Runtime.Handles", "System.Security.Principal", "System.Text.Encoding"], "netstandard1.6": ["Microsoft.Win32.Primitives", "System.Runtime", "System.Runtime.Handles", "System.Security.Principal", "System.Text.Encoding"], "netstandard2.0": [], "netstandard2.1": []}, "targeting_pack_overrides": [], "framework_list": []},
+            {"name": "System.Text.Encoding", "id": "System.Text.Encoding", "version": "4.3.0", "sha512": "sha512-b/f+7HMTpxIfeV7H03bkuHKMFylCGfr9/U6gePnfFFW0aF8LOWLDgQCY6V1oWUqDksC3mdNuyChM1vy9TP4sZw==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": [], "net462": [], "net47": [], "net471": [], "net472": [], "net48": [], "net5.0": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime"], "net6.0": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime"], "net7.0": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime"], "net8.0": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime"], "net9.0": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime"], "netcoreapp1.0": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime"], "netcoreapp1.1": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime"], "netcoreapp2.0": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime"], "netcoreapp2.1": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime"], "netcoreapp2.2": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime"], "netcoreapp3.0": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime"], "netcoreapp3.1": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime"], "netstandard": [], "netstandard1.0": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime"], "netstandard1.1": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime"], "netstandard1.2": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime"], "netstandard1.3": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime"], "netstandard1.4": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime"], "netstandard1.5": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime"], "netstandard1.6": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime"], "netstandard2.0": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime"], "netstandard2.1": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime"]}, "targeting_pack_overrides": [], "framework_list": []},
+            {"name": "System.Threading.Channels", "id": "System.Threading.Channels", "version": "8.0.0", "sha512": "sha512-M1s365f1lOc6s2585/ATW+KRRFFnaI6JvSSdE14n9ZKgvWnZHoJGoccqV41XvtRDrHMCMRNlwWFgt9yXTu3xQQ==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": [], "net462": [], "net47": [], "net471": [], "net472": [], "net48": [], "net5.0": [], "net6.0": [], "net7.0": [], "net8.0": [], "net9.0": [], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": [], "netcoreapp2.1": [], "netcoreapp2.2": [], "netcoreapp3.0": [], "netcoreapp3.1": [], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": [], "netstandard2.1": []}, "targeting_pack_overrides": [], "framework_list": []},
+            {"name": "System.Threading.Tasks", "id": "System.Threading.Tasks", "version": "4.3.0", "sha512": "sha512-fUiP+CyyCjs872OA8trl6p97qma/da1xGq3h4zAbJZk8zyaU4zyEfqW5vbkP80xG/Nimun1vlWBboMEk7XxdEw==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": [], "net462": [], "net47": [], "net471": [], "net472": [], "net48": [], "net5.0": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime"], "net6.0": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime"], "net7.0": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime"], "net8.0": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime"], "net9.0": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime"], "netcoreapp1.0": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime"], "netcoreapp1.1": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime"], "netcoreapp2.0": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime"], "netcoreapp2.1": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime"], "netcoreapp2.2": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime"], "netcoreapp3.0": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime"], "netcoreapp3.1": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime"], "netstandard": [], "netstandard1.0": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime"], "netstandard1.1": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime"], "netstandard1.2": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime"], "netstandard1.3": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime"], "netstandard1.4": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime"], "netstandard1.5": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime"], "netstandard1.6": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime"], "netstandard2.0": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime"], "netstandard2.1": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime"]}, "targeting_pack_overrides": [], "framework_list": []},
+            {"name": "System.Threading.Tasks.Dataflow", "id": "System.Threading.Tasks.Dataflow", "version": "7.0.0", "sha512": "sha512-nB6cUBEEimO35tPK+KmhUF8jxxisO1E+8KU3eDIA9/o156qulMs8YeozOTcVRYHZWvgn1YCDI/ZR2ga9ErXIfg==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": [], "net462": [], "net47": [], "net471": [], "net472": [], "net48": [], "net5.0": [], "net6.0": [], "net7.0": [], "net8.0": [], "net9.0": [], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": [], "netcoreapp2.1": [], "netcoreapp2.2": [], "netcoreapp3.0": [], "netcoreapp3.1": [], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": [], "netstandard2.1": []}, "targeting_pack_overrides": [], "framework_list": []},
+            {"name": "System.Threading.ThreadPool", "id": "System.Threading.ThreadPool", "version": "4.3.0", "sha512": "sha512-RQpA+UpI6Tlpeedk5JStYk2DM/M3i5HqabI/yDbfj1xDu9bIz9kdoquVpHbh/wQjOJaOCbcgRH8iQcAUv8dRWQ==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": [], "net462": [], "net47": [], "net471": [], "net472": [], "net48": [], "net5.0": ["System.Runtime", "System.Runtime.Handles"], "net6.0": ["System.Runtime", "System.Runtime.Handles"], "net7.0": ["System.Runtime", "System.Runtime.Handles"], "net8.0": ["System.Runtime", "System.Runtime.Handles"], "net9.0": ["System.Runtime", "System.Runtime.Handles"], "netcoreapp1.0": ["System.Runtime", "System.Runtime.Handles"], "netcoreapp1.1": ["System.Runtime", "System.Runtime.Handles"], "netcoreapp2.0": ["System.Runtime", "System.Runtime.Handles"], "netcoreapp2.1": ["System.Runtime", "System.Runtime.Handles"], "netcoreapp2.2": ["System.Runtime", "System.Runtime.Handles"], "netcoreapp3.0": ["System.Runtime", "System.Runtime.Handles"], "netcoreapp3.1": ["System.Runtime", "System.Runtime.Handles"], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": ["System.Runtime", "System.Runtime.Handles"], "netstandard1.4": ["System.Runtime", "System.Runtime.Handles"], "netstandard1.5": ["System.Runtime", "System.Runtime.Handles"], "netstandard1.6": ["System.Runtime", "System.Runtime.Handles"], "netstandard2.0": ["System.Runtime", "System.Runtime.Handles"], "netstandard2.1": ["System.Runtime", "System.Runtime.Handles"]}, "targeting_pack_overrides": [], "framework_list": []},
+            {"name": "System.Windows.Extensions", "id": "System.Windows.Extensions", "version": "7.0.0", "sha512": "sha512-KNnH0GX7T/oRAzOtJjefboYngi+d/bNGd63j+ZIFFTIR8RM0dwptuImNXiKqvD78kzcWAf3kd3yjcih+UTYkbw==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": [], "net462": [], "net47": [], "net471": [], "net472": [], "net48": [], "net5.0": [], "net6.0": ["System.Drawing.Common"], "net7.0": ["System.Drawing.Common"], "net8.0": ["System.Drawing.Common"], "net9.0": ["System.Drawing.Common"], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": [], "netcoreapp2.1": [], "netcoreapp2.2": [], "netcoreapp3.0": [], "netcoreapp3.1": [], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": [], "netstandard2.1": []}, "targeting_pack_overrides": [], "framework_list": []},
+            {"name": "xunit", "id": "xunit", "version": "2.9.2", "sha512": "sha512-bs4ccplaqCT7+jdAJhtt75uKq9qA3Jeld1ugiOgGEGSnzq8gkoa0VUqNEKkMPkBwV5COlAllNJGtGBfgxoZDrA==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": ["xunit.core", "xunit.assert", "xunit.analyzers"], "net20": ["xunit.core", "xunit.assert", "xunit.analyzers"], "net30": ["xunit.core", "xunit.assert", "xunit.analyzers"], "net35": ["xunit.core", "xunit.assert", "xunit.analyzers"], "net40": ["xunit.core", "xunit.assert", "xunit.analyzers"], "net403": ["xunit.core", "xunit.assert", "xunit.analyzers"], "net45": ["xunit.core", "xunit.assert", "xunit.analyzers"], "net451": ["xunit.core", "xunit.assert", "xunit.analyzers"], "net452": ["xunit.core", "xunit.assert", "xunit.analyzers"], "net46": ["xunit.core", "xunit.assert", "xunit.analyzers"], "net461": ["xunit.core", "xunit.assert", "xunit.analyzers"], "net462": ["xunit.core", "xunit.assert", "xunit.analyzers"], "net47": ["xunit.core", "xunit.assert", "xunit.analyzers"], "net471": ["xunit.core", "xunit.assert", "xunit.analyzers"], "net472": ["xunit.core", "xunit.assert", "xunit.analyzers"], "net48": ["xunit.core", "xunit.assert", "xunit.analyzers"], "net5.0": ["xunit.core", "xunit.assert", "xunit.analyzers"], "net6.0": ["xunit.core", "xunit.assert", "xunit.analyzers"], "net7.0": ["xunit.core", "xunit.assert", "xunit.analyzers"], "net8.0": ["xunit.core", "xunit.assert", "xunit.analyzers"], "net9.0": ["xunit.core", "xunit.assert", "xunit.analyzers"], "netcoreapp1.0": ["xunit.core", "xunit.assert", "xunit.analyzers"], "netcoreapp1.1": ["xunit.core", "xunit.assert", "xunit.analyzers"], "netcoreapp2.0": ["xunit.core", "xunit.assert", "xunit.analyzers"], "netcoreapp2.1": ["xunit.core", "xunit.assert", "xunit.analyzers"], "netcoreapp2.2": ["xunit.core", "xunit.assert", "xunit.analyzers"], "netcoreapp3.0": ["xunit.core", "xunit.assert", "xunit.analyzers"], "netcoreapp3.1": ["xunit.core", "xunit.assert", "xunit.analyzers"], "netstandard": ["xunit.core", "xunit.assert", "xunit.analyzers"], "netstandard1.0": ["xunit.core", "xunit.assert", "xunit.analyzers"], "netstandard1.1": ["xunit.core", "xunit.assert", "xunit.analyzers"], "netstandard1.2": ["xunit.core", "xunit.assert", "xunit.analyzers"], "netstandard1.3": ["xunit.core", "xunit.assert", "xunit.analyzers"], "netstandard1.4": ["xunit.core", "xunit.assert", "xunit.analyzers"], "netstandard1.5": ["xunit.core", "xunit.assert", "xunit.analyzers"], "netstandard1.6": ["xunit.core", "xunit.assert", "xunit.analyzers"], "netstandard2.0": ["xunit.core", "xunit.assert", "xunit.analyzers"], "netstandard2.1": ["xunit.core", "xunit.assert", "xunit.analyzers"]}, "targeting_pack_overrides": [], "framework_list": []},
+            {"name": "xunit.abstractions", "id": "xunit.abstractions", "version": "2.0.3", "sha512": "sha512-PKJri5f0qEQPFvgY6CZR9XG8JROlWSdC/ZYLkkDQuID++Egn+yWjB+Yf57AZ8U6GRlP7z33uDQ4/r5BZPer2JA==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": [], "net462": [], "net47": [], "net471": [], "net472": [], "net48": [], "net5.0": [], "net6.0": [], "net7.0": [], "net8.0": [], "net9.0": [], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": [], "netcoreapp2.1": [], "netcoreapp2.2": [], "netcoreapp3.0": [], "netcoreapp3.1": [], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": [], "netstandard2.1": []}, "targeting_pack_overrides": [], "framework_list": []},
+            {"name": "xunit.analyzers", "id": "xunit.analyzers", "version": "1.16.0", "sha512": "sha512-65QLxnRoOqpAn2hMnjI1FLmQEjzUye2h4MwRVe1k151K+UFG1Ehr/s/MLwNJ6pCNoyoJjOoNuF7OGW4mH2bdaQ==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": [], "net462": [], "net47": [], "net471": [], "net472": [], "net48": [], "net5.0": [], "net6.0": [], "net7.0": [], "net8.0": [], "net9.0": [], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": [], "netcoreapp2.1": [], "netcoreapp2.2": [], "netcoreapp3.0": [], "netcoreapp3.1": [], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": [], "netstandard2.1": []}, "targeting_pack_overrides": [], "framework_list": []},
+            {"name": "xunit.assert", "id": "xunit.assert", "version": "2.9.2", "sha512": "sha512-huNfINLH5HnyiPImimKv7liIJJ2MgRdJYT7ky3464zR62SH7o9JjsgMiSZRXha46kgTCNjKSNN1VvctC+USp7w==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": [], "net462": [], "net47": [], "net471": [], "net472": [], "net48": [], "net5.0": [], "net6.0": [], "net7.0": [], "net8.0": [], "net9.0": [], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": [], "netcoreapp2.1": [], "netcoreapp2.2": [], "netcoreapp3.0": [], "netcoreapp3.1": [], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": [], "netstandard2.1": []}, "targeting_pack_overrides": [], "framework_list": []},
+            {"name": "xunit.core", "id": "xunit.core", "version": "2.9.2", "sha512": "sha512-kW48d7YL7ryT4zuWTjJN491cJwY8aYiIAxDaXJRebgMIw40PmlREiiaIz33QUFmglcfLlaoRyZcI4sl70kARiw==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": ["xunit.extensibility.core", "xunit.extensibility.execution"], "net20": ["xunit.extensibility.core", "xunit.extensibility.execution"], "net30": ["xunit.extensibility.core", "xunit.extensibility.execution"], "net35": ["xunit.extensibility.core", "xunit.extensibility.execution"], "net40": ["xunit.extensibility.core", "xunit.extensibility.execution"], "net403": ["xunit.extensibility.core", "xunit.extensibility.execution"], "net45": ["xunit.extensibility.core", "xunit.extensibility.execution"], "net451": ["xunit.extensibility.core", "xunit.extensibility.execution"], "net452": ["xunit.extensibility.core", "xunit.extensibility.execution"], "net46": ["xunit.extensibility.core", "xunit.extensibility.execution"], "net461": ["xunit.extensibility.core", "xunit.extensibility.execution"], "net462": ["xunit.extensibility.core", "xunit.extensibility.execution"], "net47": ["xunit.extensibility.core", "xunit.extensibility.execution"], "net471": ["xunit.extensibility.core", "xunit.extensibility.execution"], "net472": ["xunit.extensibility.core", "xunit.extensibility.execution"], "net48": ["xunit.extensibility.core", "xunit.extensibility.execution"], "net5.0": ["xunit.extensibility.core", "xunit.extensibility.execution"], "net6.0": ["xunit.extensibility.core", "xunit.extensibility.execution"], "net7.0": ["xunit.extensibility.core", "xunit.extensibility.execution"], "net8.0": ["xunit.extensibility.core", "xunit.extensibility.execution"], "net9.0": ["xunit.extensibility.core", "xunit.extensibility.execution"], "netcoreapp1.0": ["xunit.extensibility.core", "xunit.extensibility.execution"], "netcoreapp1.1": ["xunit.extensibility.core", "xunit.extensibility.execution"], "netcoreapp2.0": ["xunit.extensibility.core", "xunit.extensibility.execution"], "netcoreapp2.1": ["xunit.extensibility.core", "xunit.extensibility.execution"], "netcoreapp2.2": ["xunit.extensibility.core", "xunit.extensibility.execution"], "netcoreapp3.0": ["xunit.extensibility.core", "xunit.extensibility.execution"], "netcoreapp3.1": ["xunit.extensibility.core", "xunit.extensibility.execution"], "netstandard": ["xunit.extensibility.core", "xunit.extensibility.execution"], "netstandard1.0": ["xunit.extensibility.core", "xunit.extensibility.execution"], "netstandard1.1": ["xunit.extensibility.core", "xunit.extensibility.execution"], "netstandard1.2": ["xunit.extensibility.core", "xunit.extensibility.execution"], "netstandard1.3": ["xunit.extensibility.core", "xunit.extensibility.execution"], "netstandard1.4": ["xunit.extensibility.core", "xunit.extensibility.execution"], "netstandard1.5": ["xunit.extensibility.core", "xunit.extensibility.execution"], "netstandard1.6": ["xunit.extensibility.core", "xunit.extensibility.execution"], "netstandard2.0": ["xunit.extensibility.core", "xunit.extensibility.execution"], "netstandard2.1": ["xunit.extensibility.core", "xunit.extensibility.execution"]}, "targeting_pack_overrides": [], "framework_list": []},
+            {"name": "xunit.extensibility.core", "id": "xunit.extensibility.core", "version": "2.9.2", "sha512": "sha512-sosk+dg5Cn4N9MKOjQ1wFTvfgduqiX1DLRZHEYXIaLOuTJbCJeXfn7XhAVDGY+zeB8aX3jCKL8BcDp4EJCdZXw==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": ["xunit.abstractions"], "net451": ["xunit.abstractions"], "net452": ["xunit.abstractions"], "net46": ["xunit.abstractions"], "net461": ["xunit.abstractions"], "net462": ["xunit.abstractions"], "net47": ["xunit.abstractions"], "net471": ["xunit.abstractions"], "net472": ["xunit.abstractions"], "net48": ["xunit.abstractions"], "net5.0": ["xunit.abstractions"], "net6.0": ["xunit.abstractions"], "net7.0": ["xunit.abstractions"], "net8.0": ["xunit.abstractions"], "net9.0": ["xunit.abstractions"], "netcoreapp1.0": ["xunit.abstractions"], "netcoreapp1.1": ["xunit.abstractions"], "netcoreapp2.0": ["xunit.abstractions"], "netcoreapp2.1": ["xunit.abstractions"], "netcoreapp2.2": ["xunit.abstractions"], "netcoreapp3.0": ["xunit.abstractions"], "netcoreapp3.1": ["xunit.abstractions"], "netstandard": [], "netstandard1.0": [], "netstandard1.1": ["xunit.abstractions"], "netstandard1.2": ["xunit.abstractions"], "netstandard1.3": ["xunit.abstractions"], "netstandard1.4": ["xunit.abstractions"], "netstandard1.5": ["xunit.abstractions"], "netstandard1.6": ["xunit.abstractions"], "netstandard2.0": ["xunit.abstractions"], "netstandard2.1": ["xunit.abstractions"]}, "targeting_pack_overrides": [], "framework_list": []},
+            {"name": "xunit.extensibility.execution", "id": "xunit.extensibility.execution", "version": "2.9.2", "sha512": "sha512-oOnG3GsmntYZqZleKMHFlAxxCxn+ZQrcY7GEKDFP0Zpjx/sTE61cEblJk4Dkl4He0t02DN4gmJ4hsQDoLTdo7g==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": ["xunit.extensibility.core"], "net451": ["xunit.extensibility.core"], "net452": ["xunit.extensibility.core"], "net46": ["xunit.extensibility.core"], "net461": ["xunit.extensibility.core"], "net462": ["xunit.extensibility.core"], "net47": ["xunit.extensibility.core"], "net471": ["xunit.extensibility.core"], "net472": ["xunit.extensibility.core"], "net48": ["xunit.extensibility.core"], "net5.0": ["xunit.extensibility.core"], "net6.0": ["xunit.extensibility.core"], "net7.0": ["xunit.extensibility.core"], "net8.0": ["xunit.extensibility.core"], "net9.0": ["xunit.extensibility.core"], "netcoreapp1.0": ["xunit.extensibility.core"], "netcoreapp1.1": ["xunit.extensibility.core"], "netcoreapp2.0": ["xunit.extensibility.core"], "netcoreapp2.1": ["xunit.extensibility.core"], "netcoreapp2.2": ["xunit.extensibility.core"], "netcoreapp3.0": ["xunit.extensibility.core"], "netcoreapp3.1": ["xunit.extensibility.core"], "netstandard": [], "netstandard1.0": [], "netstandard1.1": ["xunit.extensibility.core"], "netstandard1.2": ["xunit.extensibility.core"], "netstandard1.3": ["xunit.extensibility.core"], "netstandard1.4": ["xunit.extensibility.core"], "netstandard1.5": ["xunit.extensibility.core"], "netstandard1.6": ["xunit.extensibility.core"], "netstandard2.0": ["xunit.extensibility.core"], "netstandard2.1": ["xunit.extensibility.core"]}, "targeting_pack_overrides": [], "framework_list": []},
+            {"name": "xunit.runner.utility", "id": "xunit.runner.utility", "version": "2.9.2", "sha512": "sha512-uXH4JqD2cHxrS6L/NXbaKPa+i0/RarJp68Fu+9NMVKJuDjVXDQFtnzgaP9gB+77GbjsJ14SWdJEDkh+D+UX7jw==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": ["xunit.abstractions"], "net40": ["xunit.abstractions"], "net403": ["xunit.abstractions"], "net45": ["xunit.abstractions"], "net451": ["xunit.abstractions"], "net452": ["xunit.abstractions"], "net46": ["xunit.abstractions"], "net461": ["xunit.abstractions"], "net462": ["xunit.abstractions"], "net47": ["xunit.abstractions"], "net471": ["xunit.abstractions"], "net472": ["xunit.abstractions"], "net48": ["xunit.abstractions"], "net5.0": ["xunit.abstractions"], "net6.0": ["xunit.abstractions"], "net7.0": ["xunit.abstractions"], "net8.0": ["xunit.abstractions"], "net9.0": ["xunit.abstractions"], "netcoreapp1.0": ["xunit.abstractions"], "netcoreapp1.1": ["xunit.abstractions"], "netcoreapp2.0": ["xunit.abstractions"], "netcoreapp2.1": ["xunit.abstractions"], "netcoreapp2.2": ["xunit.abstractions"], "netcoreapp3.0": ["xunit.abstractions"], "netcoreapp3.1": ["xunit.abstractions"], "netstandard": [], "netstandard1.0": [], "netstandard1.1": ["xunit.abstractions"], "netstandard1.2": ["xunit.abstractions"], "netstandard1.3": ["xunit.abstractions"], "netstandard1.4": ["xunit.abstractions"], "netstandard1.5": ["xunit.abstractions"], "netstandard1.6": ["xunit.abstractions"], "netstandard2.0": ["xunit.abstractions"], "netstandard2.1": ["xunit.abstractions"]}, "targeting_pack_overrides": [], "framework_list": []},
+            {"name": "xunit.runner.visualstudio", "id": "xunit.runner.visualstudio", "version": "2.8.2", "sha512": "sha512-z+EzhXxLlgn/n7FQ5J0DJxbGns/1vx1kPJh4Uq+OPChRpdSy3x/MCqQ/jtkboc7BRMthz14k7pL0D3iq/e4d0A==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": [], "net462": ["Microsoft.TestPlatform.ObjectModel"], "net47": ["Microsoft.TestPlatform.ObjectModel"], "net471": ["Microsoft.TestPlatform.ObjectModel"], "net472": ["Microsoft.TestPlatform.ObjectModel"], "net48": ["Microsoft.TestPlatform.ObjectModel"], "net5.0": [], "net6.0": [], "net7.0": [], "net8.0": [], "net9.0": [], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": [], "netcoreapp2.1": [], "netcoreapp2.2": [], "netcoreapp3.0": [], "netcoreapp3.1": [], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": [], "netstandard2.1": []}, "targeting_pack_overrides": [], "framework_list": []},
         ],
     )
diff --git a/csharp/ql/campaigns/Solorigate/lib/CHANGELOG.md b/csharp/ql/campaigns/Solorigate/lib/CHANGELOG.md
index c469ca5f4ff..7b5cb257096 100644
--- a/csharp/ql/campaigns/Solorigate/lib/CHANGELOG.md
+++ b/csharp/ql/campaigns/Solorigate/lib/CHANGELOG.md
@@ -1,3 +1,15 @@
+## 1.7.28
+
+No user-facing changes.
+
+## 1.7.27
+
+No user-facing changes.
+
+## 1.7.26
+
+No user-facing changes.
+
 ## 1.7.25
 
 No user-facing changes.
diff --git a/csharp/ql/campaigns/Solorigate/lib/change-notes/released/1.7.26.md b/csharp/ql/campaigns/Solorigate/lib/change-notes/released/1.7.26.md
new file mode 100644
index 00000000000..468fc7681df
--- /dev/null
+++ b/csharp/ql/campaigns/Solorigate/lib/change-notes/released/1.7.26.md
@@ -0,0 +1,3 @@
+## 1.7.26
+
+No user-facing changes.
diff --git a/csharp/ql/campaigns/Solorigate/lib/change-notes/released/1.7.27.md b/csharp/ql/campaigns/Solorigate/lib/change-notes/released/1.7.27.md
new file mode 100644
index 00000000000..7d323c89100
--- /dev/null
+++ b/csharp/ql/campaigns/Solorigate/lib/change-notes/released/1.7.27.md
@@ -0,0 +1,3 @@
+## 1.7.27
+
+No user-facing changes.
diff --git a/csharp/ql/campaigns/Solorigate/lib/change-notes/released/1.7.28.md b/csharp/ql/campaigns/Solorigate/lib/change-notes/released/1.7.28.md
new file mode 100644
index 00000000000..7e60c6708b6
--- /dev/null
+++ b/csharp/ql/campaigns/Solorigate/lib/change-notes/released/1.7.28.md
@@ -0,0 +1,3 @@
+## 1.7.28
+
+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 317528bce5f..ff17fbaf982 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.25
+lastReleaseVersion: 1.7.28
diff --git a/csharp/ql/campaigns/Solorigate/lib/qlpack.yml b/csharp/ql/campaigns/Solorigate/lib/qlpack.yml
index ca0697ac40b..cccebfc4f3f 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.26-dev
+version: 1.7.29-dev
 groups:
   - csharp
   - solorigate
diff --git a/csharp/ql/campaigns/Solorigate/src/CHANGELOG.md b/csharp/ql/campaigns/Solorigate/src/CHANGELOG.md
index c469ca5f4ff..7b5cb257096 100644
--- a/csharp/ql/campaigns/Solorigate/src/CHANGELOG.md
+++ b/csharp/ql/campaigns/Solorigate/src/CHANGELOG.md
@@ -1,3 +1,15 @@
+## 1.7.28
+
+No user-facing changes.
+
+## 1.7.27
+
+No user-facing changes.
+
+## 1.7.26
+
+No user-facing changes.
+
 ## 1.7.25
 
 No user-facing changes.
diff --git a/csharp/ql/campaigns/Solorigate/src/change-notes/released/1.7.26.md b/csharp/ql/campaigns/Solorigate/src/change-notes/released/1.7.26.md
new file mode 100644
index 00000000000..468fc7681df
--- /dev/null
+++ b/csharp/ql/campaigns/Solorigate/src/change-notes/released/1.7.26.md
@@ -0,0 +1,3 @@
+## 1.7.26
+
+No user-facing changes.
diff --git a/csharp/ql/campaigns/Solorigate/src/change-notes/released/1.7.27.md b/csharp/ql/campaigns/Solorigate/src/change-notes/released/1.7.27.md
new file mode 100644
index 00000000000..7d323c89100
--- /dev/null
+++ b/csharp/ql/campaigns/Solorigate/src/change-notes/released/1.7.27.md
@@ -0,0 +1,3 @@
+## 1.7.27
+
+No user-facing changes.
diff --git a/csharp/ql/campaigns/Solorigate/src/change-notes/released/1.7.28.md b/csharp/ql/campaigns/Solorigate/src/change-notes/released/1.7.28.md
new file mode 100644
index 00000000000..7e60c6708b6
--- /dev/null
+++ b/csharp/ql/campaigns/Solorigate/src/change-notes/released/1.7.28.md
@@ -0,0 +1,3 @@
+## 1.7.28
+
+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 317528bce5f..ff17fbaf982 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.25
+lastReleaseVersion: 1.7.28
diff --git a/csharp/ql/campaigns/Solorigate/src/qlpack.yml b/csharp/ql/campaigns/Solorigate/src/qlpack.yml
index 221eca049fe..4e5b51ed11a 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.26-dev
+version: 1.7.29-dev
 groups:
   - csharp
   - solorigate
diff --git a/csharp/ql/consistency-queries/CfgConsistency.ql b/csharp/ql/consistency-queries/CfgConsistency.ql
index 9802ddff264..3caf64f9aec 100644
--- a/csharp/ql/consistency-queries/CfgConsistency.ql
+++ b/csharp/ql/consistency-queries/CfgConsistency.ql
@@ -61,8 +61,3 @@ query predicate preBasicBlockConsistency(ControlFlowElement cfe1, ControlFlowEle
   bbIntraSuccInconsistency(cfe1, cfe2) and
   s = "intra succ inconsistency"
 }
-
-query predicate multipleToString(Node n, string s) {
-  s = strictconcat(n.toString(), ",") and
-  strictcount(n.toString()) > 1
-}
diff --git a/csharp/ql/integration-tests/all-platforms/binlog/Files.expected b/csharp/ql/integration-tests/all-platforms/binlog/Files.expected
index bf3694ff9ca..1b566ea2fd2 100644
--- a/csharp/ql/integration-tests/all-platforms/binlog/Files.expected
+++ b/csharp/ql/integration-tests/all-platforms/binlog/Files.expected
@@ -1,10 +1,10 @@
 | a/A.cs:0:0:0:0 | a/A.cs |
-| a/obj/Debug/net8.0/.NETCoreApp,Version=v8.0.AssemblyAttributes.cs:0:0:0:0 | a/obj/Debug/net8.0/.NETCoreApp,Version=v8.0.AssemblyAttributes.cs |
-| a/obj/Debug/net8.0/test.AssemblyInfo.cs:0:0:0:0 | a/obj/Debug/net8.0/test.AssemblyInfo.cs |
-| a/obj/Debug/net8.0/test.GlobalUsings.g.cs:0:0:0:0 | a/obj/Debug/net8.0/test.GlobalUsings.g.cs |
+| a/obj/Debug/net9.0/.NETCoreApp,Version=v9.0.AssemblyAttributes.cs:0:0:0:0 | a/obj/Debug/net9.0/.NETCoreApp,Version=v9.0.AssemblyAttributes.cs |
+| a/obj/Debug/net9.0/test.AssemblyInfo.cs:0:0:0:0 | a/obj/Debug/net9.0/test.AssemblyInfo.cs |
+| a/obj/Debug/net9.0/test.GlobalUsings.g.cs:0:0:0:0 | a/obj/Debug/net9.0/test.GlobalUsings.g.cs |
 | b/B.cs:0:0:0:0 | b/B.cs |
-| b/obj/Debug/net8.0/.NETCoreApp,Version=v8.0.AssemblyAttributes.cs:0:0:0:0 | b/obj/Debug/net8.0/.NETCoreApp,Version=v8.0.AssemblyAttributes.cs |
-| b/obj/Debug/net8.0/test.AssemblyInfo.cs:0:0:0:0 | b/obj/Debug/net8.0/test.AssemblyInfo.cs |
-| b/obj/Debug/net8.0/test.GlobalUsings.g.cs:0:0:0:0 | b/obj/Debug/net8.0/test.GlobalUsings.g.cs |
-| generated/a/test.csproj (net8.0)/System.Text.RegularExpressions.Generator/System.Text.RegularExpressions.Generator.RegexGenerator/RegexGenerator.g.cs:0:0:0:0 | generated/a/test.csproj (net8.0)/System.Text.RegularExpressions.Generator/System.Text.RegularExpressions.Generator.RegexGenerator/RegexGenerator.g.cs |
-| generated/b/test.csproj (net8.0)/System.Text.RegularExpressions.Generator/System.Text.RegularExpressions.Generator.RegexGenerator/RegexGenerator.g.cs:0:0:0:0 | generated/b/test.csproj (net8.0)/System.Text.RegularExpressions.Generator/System.Text.RegularExpressions.Generator.RegexGenerator/RegexGenerator.g.cs |
+| b/obj/Debug/net9.0/.NETCoreApp,Version=v9.0.AssemblyAttributes.cs:0:0:0:0 | b/obj/Debug/net9.0/.NETCoreApp,Version=v9.0.AssemblyAttributes.cs |
+| b/obj/Debug/net9.0/test.AssemblyInfo.cs:0:0:0:0 | b/obj/Debug/net9.0/test.AssemblyInfo.cs |
+| b/obj/Debug/net9.0/test.GlobalUsings.g.cs:0:0:0:0 | b/obj/Debug/net9.0/test.GlobalUsings.g.cs |
+| generated/a/test.csproj (net9.0)/System.Text.RegularExpressions.Generator/System.Text.RegularExpressions.Generator.RegexGenerator/RegexGenerator.g.cs:0:0:0:0 | generated/a/test.csproj (net9.0)/System.Text.RegularExpressions.Generator/System.Text.RegularExpressions.Generator.RegexGenerator/RegexGenerator.g.cs |
+| generated/b/test.csproj (net9.0)/System.Text.RegularExpressions.Generator/System.Text.RegularExpressions.Generator.RegexGenerator/RegexGenerator.g.cs:0:0:0:0 | generated/b/test.csproj (net9.0)/System.Text.RegularExpressions.Generator/System.Text.RegularExpressions.Generator.RegexGenerator/RegexGenerator.g.cs |
diff --git a/csharp/ql/integration-tests/all-platforms/binlog/a/test.csproj b/csharp/ql/integration-tests/all-platforms/binlog/a/test.csproj
index 91b464afeac..694035b3acd 100644
--- a/csharp/ql/integration-tests/all-platforms/binlog/a/test.csproj
+++ b/csharp/ql/integration-tests/all-platforms/binlog/a/test.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>
diff --git a/csharp/ql/integration-tests/all-platforms/binlog/b/test.csproj b/csharp/ql/integration-tests/all-platforms/binlog/b/test.csproj
index 91b464afeac..694035b3acd 100644
--- a/csharp/ql/integration-tests/all-platforms/binlog/b/test.csproj
+++ b/csharp/ql/integration-tests/all-platforms/binlog/b/test.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>
diff --git a/csharp/ql/integration-tests/all-platforms/binlog/global.json b/csharp/ql/integration-tests/all-platforms/binlog/global.json
index 5c3fd64fbd1..76474f06d04 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": "8.0.101"
+        "version": "9.0.100"
     }
 }
diff --git a/csharp/ql/integration-tests/all-platforms/binlog_multiple/Files.expected b/csharp/ql/integration-tests/all-platforms/binlog_multiple/Files.expected
new file mode 100644
index 00000000000..1b566ea2fd2
--- /dev/null
+++ b/csharp/ql/integration-tests/all-platforms/binlog_multiple/Files.expected
@@ -0,0 +1,10 @@
+| a/A.cs:0:0:0:0 | a/A.cs |
+| a/obj/Debug/net9.0/.NETCoreApp,Version=v9.0.AssemblyAttributes.cs:0:0:0:0 | a/obj/Debug/net9.0/.NETCoreApp,Version=v9.0.AssemblyAttributes.cs |
+| a/obj/Debug/net9.0/test.AssemblyInfo.cs:0:0:0:0 | a/obj/Debug/net9.0/test.AssemblyInfo.cs |
+| a/obj/Debug/net9.0/test.GlobalUsings.g.cs:0:0:0:0 | a/obj/Debug/net9.0/test.GlobalUsings.g.cs |
+| b/B.cs:0:0:0:0 | b/B.cs |
+| b/obj/Debug/net9.0/.NETCoreApp,Version=v9.0.AssemblyAttributes.cs:0:0:0:0 | b/obj/Debug/net9.0/.NETCoreApp,Version=v9.0.AssemblyAttributes.cs |
+| b/obj/Debug/net9.0/test.AssemblyInfo.cs:0:0:0:0 | b/obj/Debug/net9.0/test.AssemblyInfo.cs |
+| b/obj/Debug/net9.0/test.GlobalUsings.g.cs:0:0:0:0 | b/obj/Debug/net9.0/test.GlobalUsings.g.cs |
+| generated/a/test.csproj (net9.0)/System.Text.RegularExpressions.Generator/System.Text.RegularExpressions.Generator.RegexGenerator/RegexGenerator.g.cs:0:0:0:0 | generated/a/test.csproj (net9.0)/System.Text.RegularExpressions.Generator/System.Text.RegularExpressions.Generator.RegexGenerator/RegexGenerator.g.cs |
+| generated/b/test.csproj (net9.0)/System.Text.RegularExpressions.Generator/System.Text.RegularExpressions.Generator.RegexGenerator/RegexGenerator.g.cs:0:0:0:0 | generated/b/test.csproj (net9.0)/System.Text.RegularExpressions.Generator/System.Text.RegularExpressions.Generator.RegexGenerator/RegexGenerator.g.cs |
diff --git a/csharp/ql/integration-tests/all-platforms/binlog_multiple/Files.ql b/csharp/ql/integration-tests/all-platforms/binlog_multiple/Files.ql
new file mode 100644
index 00000000000..bea5557a25f
--- /dev/null
+++ b/csharp/ql/integration-tests/all-platforms/binlog_multiple/Files.ql
@@ -0,0 +1,5 @@
+import csharp
+
+from File f
+where f.fromSource()
+select f
diff --git a/csharp/ql/integration-tests/all-platforms/binlog_multiple/a/A.cs b/csharp/ql/integration-tests/all-platforms/binlog_multiple/a/A.cs
new file mode 100644
index 00000000000..2c75e62d019
--- /dev/null
+++ b/csharp/ql/integration-tests/all-platforms/binlog_multiple/a/A.cs
@@ -0,0 +1,9 @@
+using System.Text.RegularExpressions;
+
+var dummy = "dummy";
+
+partial class Test
+{
+    [GeneratedRegex("abc|def", RegexOptions.IgnoreCase, "en-US")]
+    private static partial Regex AbcOrDefGeneratedRegex();
+}
diff --git a/csharp/ql/integration-tests/all-platforms/binlog_multiple/a/test.csproj b/csharp/ql/integration-tests/all-platforms/binlog_multiple/a/test.csproj
new file mode 100644
index 00000000000..694035b3acd
--- /dev/null
+++ b/csharp/ql/integration-tests/all-platforms/binlog_multiple/a/test.csproj
@@ -0,0 +1,10 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>net9.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+  </PropertyGroup>
+
+</Project>
diff --git a/csharp/ql/integration-tests/all-platforms/binlog_multiple/b/B.cs b/csharp/ql/integration-tests/all-platforms/binlog_multiple/b/B.cs
new file mode 100644
index 00000000000..2c75e62d019
--- /dev/null
+++ b/csharp/ql/integration-tests/all-platforms/binlog_multiple/b/B.cs
@@ -0,0 +1,9 @@
+using System.Text.RegularExpressions;
+
+var dummy = "dummy";
+
+partial class Test
+{
+    [GeneratedRegex("abc|def", RegexOptions.IgnoreCase, "en-US")]
+    private static partial Regex AbcOrDefGeneratedRegex();
+}
diff --git a/csharp/ql/integration-tests/all-platforms/binlog_multiple/b/test.csproj b/csharp/ql/integration-tests/all-platforms/binlog_multiple/b/test.csproj
new file mode 100644
index 00000000000..694035b3acd
--- /dev/null
+++ b/csharp/ql/integration-tests/all-platforms/binlog_multiple/b/test.csproj
@@ -0,0 +1,10 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>net9.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+  </PropertyGroup>
+
+</Project>
diff --git a/csharp/ql/integration-tests/all-platforms/binlog_multiple/diagnostics.expected b/csharp/ql/integration-tests/all-platforms/binlog_multiple/diagnostics.expected
new file mode 100644
index 00000000000..1a10ae9ded5
--- /dev/null
+++ b/csharp/ql/integration-tests/all-platforms/binlog_multiple/diagnostics.expected
@@ -0,0 +1,42 @@
+{
+  "markdownMessage": "C# analysis with build-mode 'none' completed.",
+  "severity": "unknown",
+  "source": {
+    "extractorName": "csharp",
+    "id": "csharp/autobuilder/buildless/complete",
+    "name": "C# analysis with build-mode 'none' completed"
+  },
+  "visibility": {
+    "cliSummaryTable": true,
+    "statusPage": false,
+    "telemetry": true
+  }
+}
+{
+  "markdownMessage": "C# was extracted with build-mode set to 'none'. This means that all C# source in the working directory will be scanned, with build tools, such as Nuget and Dotnet CLIs, only contributing information about external dependencies.",
+  "severity": "note",
+  "source": {
+    "extractorName": "csharp",
+    "id": "csharp/autobuilder/buildless/mode-active",
+    "name": "C# was extracted with build-mode set to 'none'"
+  },
+  "visibility": {
+    "cliSummaryTable": true,
+    "statusPage": true,
+    "telemetry": true
+  }
+}
+{
+  "markdownMessage": "C# was extracted with the experimental 'binlog' option.",
+  "severity": "note",
+  "source": {
+    "extractorName": "csharp",
+    "id": "csharp/autobuilder/buildless/binlog",
+    "name": "C# was extracted with the experimental 'binlog' option"
+  },
+  "visibility": {
+    "cliSummaryTable": true,
+    "statusPage": true,
+    "telemetry": true
+  }
+}
diff --git a/csharp/ql/integration-tests/all-platforms/binlog_multiple/global.json b/csharp/ql/integration-tests/all-platforms/binlog_multiple/global.json
new file mode 100644
index 00000000000..76474f06d04
--- /dev/null
+++ b/csharp/ql/integration-tests/all-platforms/binlog_multiple/global.json
@@ -0,0 +1,5 @@
+{
+    "sdk": {
+        "version": "9.0.100"
+    }
+}
diff --git a/csharp/ql/integration-tests/all-platforms/binlog_multiple/test.py b/csharp/ql/integration-tests/all-platforms/binlog_multiple/test.py
new file mode 100644
index 00000000000..585d86ef57b
--- /dev/null
+++ b/csharp/ql/integration-tests/all-platforms/binlog_multiple/test.py
@@ -0,0 +1,7 @@
+import commands
+
+
+def test(codeql, csharp):
+    commands.run(["dotnet", "build", "a/test.csproj", "/bl:a.binlog"])
+    commands.run(["dotnet", "build", "b/test.csproj", "/bl:b.binlog"])
+    codeql.database.create(build_mode="none", extractor_option=["binlog=a.binlog", "binlog=b.binlog"])
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 5c3fd64fbd1..76474f06d04 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": "8.0.101"
+        "version": "9.0.100"
     }
 }
diff --git a/csharp/ql/integration-tests/all-platforms/conditional_compilation/test.csproj b/csharp/ql/integration-tests/all-platforms/conditional_compilation/test.csproj
index e7ed4bf0173..d457711bd99 100644
--- a/csharp/ql/integration-tests/all-platforms/conditional_compilation/test.csproj
+++ b/csharp/ql/integration-tests/all-platforms/conditional_compilation/test.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>
diff --git a/csharp/ql/integration-tests/all-platforms/cshtml/Files.expected b/csharp/ql/integration-tests/all-platforms/cshtml/Files.expected
index debab01086f..946bef62462 100644
--- a/csharp/ql/integration-tests/all-platforms/cshtml/Files.expected
+++ b/csharp/ql/integration-tests/all-platforms/cshtml/Files.expected
@@ -1,7 +1,7 @@
 | Program.cs:0:0:0:0 | Program.cs |
 | Views/Home/Index.cshtml:0:0:0:0 | Views/Home/Index.cshtml |
-| obj/Debug/net8.0/.NETCoreApp,Version=v8.0.AssemblyAttributes.cs:0:0:0:0 | obj/Debug/net8.0/.NETCoreApp,Version=v8.0.AssemblyAttributes.cs |
-| obj/Debug/net8.0/cshtml.AssemblyInfo.cs:0:0:0:0 | obj/Debug/net8.0/cshtml.AssemblyInfo.cs |
-| obj/Debug/net8.0/cshtml.GlobalUsings.g.cs:0:0:0:0 | obj/Debug/net8.0/cshtml.GlobalUsings.g.cs |
-| obj/Debug/net8.0/cshtml.RazorAssemblyInfo.cs:0:0:0:0 | obj/Debug/net8.0/cshtml.RazorAssemblyInfo.cs |
-| obj/Debug/net8.0/generated/Microsoft.NET.Sdk.Razor.SourceGenerators/Microsoft.NET.Sdk.Razor.SourceGenerators.RazorSourceGenerator/Views_Home_Index_cshtml.g.cs:0:0:0:0 | obj/Debug/net8.0/generated/Microsoft.NET.Sdk.Razor.SourceGenerators/Microsoft.NET.Sdk.Razor.SourceGenerators.RazorSourceGenerator/Views_Home_Index_cshtml.g.cs |
+| obj/Debug/net9.0/.NETCoreApp,Version=v9.0.AssemblyAttributes.cs:0:0:0:0 | obj/Debug/net9.0/.NETCoreApp,Version=v9.0.AssemblyAttributes.cs |
+| obj/Debug/net9.0/cshtml.AssemblyInfo.cs:0:0:0:0 | obj/Debug/net9.0/cshtml.AssemblyInfo.cs |
+| obj/Debug/net9.0/cshtml.GlobalUsings.g.cs:0:0:0:0 | obj/Debug/net9.0/cshtml.GlobalUsings.g.cs |
+| obj/Debug/net9.0/cshtml.RazorAssemblyInfo.cs:0:0:0:0 | obj/Debug/net9.0/cshtml.RazorAssemblyInfo.cs |
+| obj/Debug/net9.0/generated/Microsoft.CodeAnalysis.Razor.Compiler/Microsoft.NET.Sdk.Razor.SourceGenerators.RazorSourceGenerator/Views_Home_Index_cshtml.g.cs:0:0:0:0 | obj/Debug/net9.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/cshtml.csproj b/csharp/ql/integration-tests/all-platforms/cshtml/cshtml.csproj
index 8a366ff09d4..bdb0e0d0c31 100644
--- a/csharp/ql/integration-tests/all-platforms/cshtml/cshtml.csproj
+++ b/csharp/ql/integration-tests/all-platforms/cshtml/cshtml.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>
diff --git a/csharp/ql/integration-tests/all-platforms/cshtml/global.json b/csharp/ql/integration-tests/all-platforms/cshtml/global.json
index 5c3fd64fbd1..76474f06d04 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": "8.0.101"
+        "version": "9.0.100"
     }
 }
diff --git a/csharp/ql/integration-tests/all-platforms/cshtml_standalone/cshtml.csproj b/csharp/ql/integration-tests/all-platforms/cshtml_standalone/cshtml.csproj
index 8a366ff09d4..bdb0e0d0c31 100644
--- a/csharp/ql/integration-tests/all-platforms/cshtml_standalone/cshtml.csproj
+++ b/csharp/ql/integration-tests/all-platforms/cshtml_standalone/cshtml.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>
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 5c3fd64fbd1..76474f06d04 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": "8.0.101"
+        "version": "9.0.100"
     }
 }
diff --git a/csharp/ql/integration-tests/all-platforms/cshtml_standalone_disabled/cshtml.csproj b/csharp/ql/integration-tests/all-platforms/cshtml_standalone_disabled/cshtml.csproj
index 8a366ff09d4..bdb0e0d0c31 100644
--- a/csharp/ql/integration-tests/all-platforms/cshtml_standalone_disabled/cshtml.csproj
+++ b/csharp/ql/integration-tests/all-platforms/cshtml_standalone_disabled/cshtml.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>
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 5c3fd64fbd1..76474f06d04 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": "8.0.101"
+        "version": "9.0.100"
     }
 }
diff --git a/csharp/ql/integration-tests/all-platforms/cshtml_standalone_flowsteps/cshtml.csproj b/csharp/ql/integration-tests/all-platforms/cshtml_standalone_flowsteps/cshtml.csproj
index 1b28a01c81c..6568b3dcfb4 100644
--- a/csharp/ql/integration-tests/all-platforms/cshtml_standalone_flowsteps/cshtml.csproj
+++ b/csharp/ql/integration-tests/all-platforms/cshtml_standalone_flowsteps/cshtml.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
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 b11f794bfce..d68ee8382ed 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
@@ -2,4 +2,4 @@
     "sdk": {
         "version": "8.0.300"
     }
-}
\ 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 5c3fd64fbd1..76474f06d04 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": "8.0.101"
+        "version": "9.0.100"
     }
 }
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 5c3fd64fbd1..76474f06d04 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": "8.0.101"
+        "version": "9.0.100"
     }
 }
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 5c3fd64fbd1..76474f06d04 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": "8.0.101"
+        "version": "9.0.100"
     }
 }
diff --git a/csharp/ql/integration-tests/all-platforms/diag_missing_xamarin_sdk/test.csproj b/csharp/ql/integration-tests/all-platforms/diag_missing_xamarin_sdk/test.csproj
index d0ac3e77f7a..6bb5914483b 100644
--- a/csharp/ql/integration-tests/all-platforms/diag_missing_xamarin_sdk/test.csproj
+++ b/csharp/ql/integration-tests/all-platforms/diag_missing_xamarin_sdk/test.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <LanguageTargets>$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets</LanguageTargets>
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 5c3fd64fbd1..76474f06d04 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": "8.0.101"
+        "version": "9.0.100"
     }
 }
diff --git a/csharp/ql/integration-tests/all-platforms/diag_recursive_generics/test.csproj b/csharp/ql/integration-tests/all-platforms/diag_recursive_generics/test.csproj
index ec516c57e78..546e25e0172 100644
--- a/csharp/ql/integration-tests/all-platforms/diag_recursive_generics/test.csproj
+++ b/csharp/ql/integration-tests/all-platforms/diag_recursive_generics/test.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
   </PropertyGroup>
 
  <Target Name="DeleteBinObjFolders" BeforeTargets="Clean">
diff --git a/csharp/ql/integration-tests/all-platforms/dotnet_build/dotnet_build.csproj b/csharp/ql/integration-tests/all-platforms/dotnet_build/dotnet_build.csproj
index 91b464afeac..694035b3acd 100644
--- a/csharp/ql/integration-tests/all-platforms/dotnet_build/dotnet_build.csproj
+++ b/csharp/ql/integration-tests/all-platforms/dotnet_build/dotnet_build.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>
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 5c3fd64fbd1..76474f06d04 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": "8.0.101"
+        "version": "9.0.100"
     }
 }
diff --git a/csharp/ql/integration-tests/all-platforms/dotnet_build/test.py b/csharp/ql/integration-tests/all-platforms/dotnet_build/test.py
index 2b0869a6823..c32d966acb4 100644
--- a/csharp/ql/integration-tests/all-platforms/dotnet_build/test.py
+++ b/csharp/ql/integration-tests/all-platforms/dotnet_build/test.py
@@ -1,8 +1,11 @@
-def check_build_out(msg, s):
-    assert (
-        "[build-stdout] " + msg in s
-    ), f"The C# tracer did not interpret the dotnet path-to-application command correctly."
+import os
 
+def check_build_out(msg, s):
+    lines = s.splitlines()
+    lines = s.splitlines()
+    assert (
+        any (("[build-stdout]" in line) and (msg in line) for line in lines)
+    ), f"The C# tracer did not interpret the dotnet path-to-application command correctly."
 
 def test1(codeql, csharp):
     codeql.database.create(command="dotnet build")
diff --git a/csharp/ql/integration-tests/all-platforms/dotnet_no_args_inject/dotnet_build.csproj b/csharp/ql/integration-tests/all-platforms/dotnet_no_args_inject/dotnet_build.csproj
index 91b464afeac..694035b3acd 100644
--- a/csharp/ql/integration-tests/all-platforms/dotnet_no_args_inject/dotnet_build.csproj
+++ b/csharp/ql/integration-tests/all-platforms/dotnet_no_args_inject/dotnet_build.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>
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 5c3fd64fbd1..76474f06d04 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": "8.0.101"
+        "version": "9.0.100"
     }
 }
diff --git a/csharp/ql/integration-tests/all-platforms/dotnet_pack/dotnet_pack.csproj b/csharp/ql/integration-tests/all-platforms/dotnet_pack/dotnet_pack.csproj
index 91b464afeac..694035b3acd 100644
--- a/csharp/ql/integration-tests/all-platforms/dotnet_pack/dotnet_pack.csproj
+++ b/csharp/ql/integration-tests/all-platforms/dotnet_pack/dotnet_pack.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>
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 5c3fd64fbd1..76474f06d04 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": "8.0.101"
+        "version": "9.0.100"
     }
 }
diff --git a/csharp/ql/integration-tests/all-platforms/dotnet_publish/dotnet_publish.csproj b/csharp/ql/integration-tests/all-platforms/dotnet_publish/dotnet_publish.csproj
index 91b464afeac..694035b3acd 100644
--- a/csharp/ql/integration-tests/all-platforms/dotnet_publish/dotnet_publish.csproj
+++ b/csharp/ql/integration-tests/all-platforms/dotnet_publish/dotnet_publish.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>
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 5c3fd64fbd1..76474f06d04 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": "8.0.101"
+        "version": "9.0.100"
     }
 }
diff --git a/csharp/ql/integration-tests/all-platforms/dotnet_run/dotnet_run.csproj b/csharp/ql/integration-tests/all-platforms/dotnet_run/dotnet_run.csproj
index 324eba5d4ef..8bb8e6387f9 100644
--- a/csharp/ql/integration-tests/all-platforms/dotnet_run/dotnet_run.csproj
+++ b/csharp/ql/integration-tests/all-platforms/dotnet_run/dotnet_run.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>
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 5c3fd64fbd1..76474f06d04 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": "8.0.101"
+        "version": "9.0.100"
     }
 }
diff --git a/csharp/ql/integration-tests/all-platforms/dotnet_run/test.py b/csharp/ql/integration-tests/all-platforms/dotnet_run/test.py
index ad71240ff9b..8740bad71a8 100644
--- a/csharp/ql/integration-tests/all-platforms/dotnet_run/test.py
+++ b/csharp/ql/integration-tests/all-platforms/dotnet_run/test.py
@@ -1,9 +1,9 @@
 def check_build_out(msg, s):
+    lines = s.splitlines()
     assert (
-        "[build-stdout] " + msg in s
+        any (("[build-stdout]" in line) and (msg in line) for line in lines)
     ), "The C# tracer did not interpret the 'dotnet run' command correctly"
 
-
 # no arguments
 def test_no_args(codeql, csharp):
     s = codeql.database.create(command="dotnet run", _capture="stdout")
diff --git a/csharp/ql/integration-tests/all-platforms/source_generator/Files.expected b/csharp/ql/integration-tests/all-platforms/source_generator/Files.expected
index 25cb51a5bdb..48151f8387f 100644
--- a/csharp/ql/integration-tests/all-platforms/source_generator/Files.expected
+++ b/csharp/ql/integration-tests/all-platforms/source_generator/Files.expected
@@ -1,6 +1,6 @@
 | Generated/System.Text.RegularExpressions.Generator/System.Text.RegularExpressions.Generator.RegexGenerator/RegexGenerator.g.cs:0:0:0:0 | Generated/System.Text.RegularExpressions.Generator/System.Text.RegularExpressions.Generator.RegexGenerator/RegexGenerator.g.cs |
 | Generated/x.cs:0:0:0:0 | Generated/x.cs |
 | Program.cs:0:0:0:0 | Program.cs |
-| obj/Debug/net8.0/.NETCoreApp,Version=v8.0.AssemblyAttributes.cs:0:0:0:0 | obj/Debug/net8.0/.NETCoreApp,Version=v8.0.AssemblyAttributes.cs |
-| obj/Debug/net8.0/test.AssemblyInfo.cs:0:0:0:0 | obj/Debug/net8.0/test.AssemblyInfo.cs |
-| obj/Debug/net8.0/test.GlobalUsings.g.cs:0:0:0:0 | obj/Debug/net8.0/test.GlobalUsings.g.cs |
+| obj/Debug/net9.0/.NETCoreApp,Version=v9.0.AssemblyAttributes.cs:0:0:0:0 | obj/Debug/net9.0/.NETCoreApp,Version=v9.0.AssemblyAttributes.cs |
+| obj/Debug/net9.0/test.AssemblyInfo.cs:0:0:0:0 | obj/Debug/net9.0/test.AssemblyInfo.cs |
+| obj/Debug/net9.0/test.GlobalUsings.g.cs:0:0:0:0 | obj/Debug/net9.0/test.GlobalUsings.g.cs |
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 5c3fd64fbd1..76474f06d04 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": "8.0.101"
+        "version": "9.0.100"
     }
 }
diff --git a/csharp/ql/integration-tests/all-platforms/source_generator/test.csproj b/csharp/ql/integration-tests/all-platforms/source_generator/test.csproj
index 4c275900f09..966a7fdb5c5 100644
--- a/csharp/ql/integration-tests/all-platforms/source_generator/test.csproj
+++ b/csharp/ql/integration-tests/all-platforms/source_generator/test.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
 
diff --git a/csharp/ql/integration-tests/all-platforms/standalone/global.json b/csharp/ql/integration-tests/all-platforms/standalone/global.json
index 5c3fd64fbd1..76474f06d04 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": "8.0.101"
+        "version": "9.0.100"
     }
 }
diff --git a/csharp/ql/integration-tests/all-platforms/standalone/standalone.csproj b/csharp/ql/integration-tests/all-platforms/standalone/standalone.csproj
index 324eba5d4ef..8bb8e6387f9 100644
--- a/csharp/ql/integration-tests/all-platforms/standalone/standalone.csproj
+++ b/csharp/ql/integration-tests/all-platforms/standalone/standalone.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>
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 5c3fd64fbd1..76474f06d04 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": "8.0.101"
+        "version": "9.0.100"
     }
 }
diff --git a/csharp/ql/integration-tests/all-platforms/standalone_buildless_option/standalone.csproj b/csharp/ql/integration-tests/all-platforms/standalone_buildless_option/standalone.csproj
index a269962b552..92e46ddaccf 100644
--- a/csharp/ql/integration-tests/all-platforms/standalone_buildless_option/standalone.csproj
+++ b/csharp/ql/integration-tests/all-platforms/standalone_buildless_option/standalone.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
   </PropertyGroup>
 
 </Project>
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 d54915e8d4d..65324522984 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": "8.0.101"
+    "version": "9.0.100"
   }
 }
diff --git a/csharp/ql/integration-tests/all-platforms/standalone_failed/standalone.csproj b/csharp/ql/integration-tests/all-platforms/standalone_failed/standalone.csproj
index 324eba5d4ef..8bb8e6387f9 100644
--- a/csharp/ql/integration-tests/all-platforms/standalone_failed/standalone.csproj
+++ b/csharp/ql/integration-tests/all-platforms/standalone_failed/standalone.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>
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 5c3fd64fbd1..76474f06d04 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": "8.0.101"
+        "version": "9.0.100"
     }
 }
diff --git a/csharp/ql/integration-tests/all-platforms/standalone_resx/resx.csproj b/csharp/ql/integration-tests/all-platforms/standalone_resx/resx.csproj
index cda97396b08..951f79551f2 100644
--- a/csharp/ql/integration-tests/all-platforms/standalone_resx/resx.csproj
+++ b/csharp/ql/integration-tests/all-platforms/standalone_resx/resx.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <RootNamespace>Resx.Test1.Test2</RootNamespace>
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 8b1e8810a07..cee8db1f756 100644
--- a/csharp/ql/integration-tests/all-platforms/standalone_winforms/Assemblies.expected
+++ b/csharp/ql/integration-tests/all-platforms/standalone_winforms/Assemblies.expected
@@ -1,47 +1,49 @@
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/8.0.1/ref/net8.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/8.0.1/ref/net8.0/Microsoft.VisualBasic.Forms.dll:0:0:0:0 | Microsoft.VisualBasic.Forms, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/8.0.1/ref/net8.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/8.0.1/ref/net8.0/Microsoft.Win32.Registry.AccessControl.dll:0:0:0:0 | Microsoft.Win32.Registry.AccessControl, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/8.0.1/ref/net8.0/Microsoft.Win32.SystemEvents.dll:0:0:0:0 | Microsoft.Win32.SystemEvents, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/8.0.1/ref/net8.0/PresentationCore.dll:0:0:0:0 | PresentationCore, Version=8.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35 |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/8.0.1/ref/net8.0/PresentationFramework.Aero2.dll:0:0:0:0 | PresentationFramework.Aero2, Version=8.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35 |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/8.0.1/ref/net8.0/PresentationFramework.Aero.dll:0:0:0:0 | PresentationFramework.Aero, Version=8.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35 |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/8.0.1/ref/net8.0/PresentationFramework.AeroLite.dll:0:0:0:0 | PresentationFramework.AeroLite, Version=8.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35 |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/8.0.1/ref/net8.0/PresentationFramework.Classic.dll:0:0:0:0 | PresentationFramework.Classic, Version=8.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35 |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/8.0.1/ref/net8.0/PresentationFramework.Luna.dll:0:0:0:0 | PresentationFramework.Luna, Version=8.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35 |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/8.0.1/ref/net8.0/PresentationFramework.Royale.dll:0:0:0:0 | PresentationFramework.Royale, Version=8.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35 |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/8.0.1/ref/net8.0/PresentationFramework.dll:0:0:0:0 | PresentationFramework, Version=8.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35 |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/8.0.1/ref/net8.0/PresentationUI.dll:0:0:0:0 | PresentationUI, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/8.0.1/ref/net8.0/ReachFramework.dll:0:0:0:0 | ReachFramework, Version=8.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35 |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/8.0.1/ref/net8.0/System.CodeDom.dll:0:0:0:0 | System.CodeDom, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/8.0.1/ref/net8.0/System.Configuration.ConfigurationManager.dll:0:0:0:0 | System.Configuration.ConfigurationManager, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/8.0.1/ref/net8.0/System.Design.dll:0:0:0:0 | System.Design, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/8.0.1/ref/net8.0/System.Diagnostics.EventLog.dll:0:0:0:0 | System.Diagnostics.EventLog, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/8.0.1/ref/net8.0/System.Diagnostics.PerformanceCounter.dll:0:0:0:0 | System.Diagnostics.PerformanceCounter, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/8.0.1/ref/net8.0/System.DirectoryServices.dll:0:0:0:0 | System.DirectoryServices, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/8.0.1/ref/net8.0/System.Drawing.Common.dll:0:0:0:0 | System.Drawing.Common, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/8.0.1/ref/net8.0/System.Drawing.Design.dll:0:0:0:0 | System.Drawing.Design, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/8.0.1/ref/net8.0/System.Drawing.dll:0:0:0:0 | System.Drawing, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/8.0.1/ref/net8.0/System.IO.Packaging.dll:0:0:0:0 | System.IO.Packaging, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/8.0.1/ref/net8.0/System.Printing.dll:0:0:0:0 | System.Printing, Version=8.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35 |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/8.0.1/ref/net8.0/System.Resources.Extensions.dll:0:0:0:0 | System.Resources.Extensions, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/8.0.1/ref/net8.0/System.Security.Cryptography.Pkcs.dll:0:0:0:0 | System.Security.Cryptography.Pkcs, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/8.0.1/ref/net8.0/System.Security.Cryptography.ProtectedData.dll:0:0:0:0 | System.Security.Cryptography.ProtectedData, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/8.0.1/ref/net8.0/System.Security.Cryptography.Xml.dll:0:0:0:0 | System.Security.Cryptography.Xml, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/8.0.1/ref/net8.0/System.Security.Permissions.dll:0:0:0:0 | System.Security.Permissions, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/8.0.1/ref/net8.0/System.Threading.AccessControl.dll:0:0:0:0 | System.Threading.AccessControl, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/8.0.1/ref/net8.0/System.Windows.Controls.Ribbon.dll:0:0:0:0 | System.Windows.Controls.Ribbon, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/8.0.1/ref/net8.0/System.Windows.Extensions.dll:0:0:0:0 | System.Windows.Extensions, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/8.0.1/ref/net8.0/System.Windows.Forms.Design.Editors.dll:0:0:0:0 | System.Windows.Forms.Design.Editors, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/8.0.1/ref/net8.0/System.Windows.Forms.Design.dll:0:0:0:0 | System.Windows.Forms.Design, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/8.0.1/ref/net8.0/System.Windows.Forms.Primitives.dll:0:0:0:0 | System.Windows.Forms.Primitives, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/8.0.1/ref/net8.0/System.Windows.Forms.dll:0:0:0:0 | System.Windows.Forms, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/8.0.1/ref/net8.0/System.Windows.Input.Manipulations.dll:0:0:0:0 | System.Windows.Input.Manipulations, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/8.0.1/ref/net8.0/System.Windows.Presentation.dll:0:0:0:0 | System.Windows.Presentation, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/8.0.1/ref/net8.0/System.Xaml.dll:0:0:0:0 | System.Xaml, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/8.0.1/ref/net8.0/UIAutomationClient.dll:0:0:0:0 | UIAutomationClient, Version=8.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35 |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/8.0.1/ref/net8.0/UIAutomationClientSideProviders.dll:0:0:0:0 | UIAutomationClientSideProviders, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/8.0.1/ref/net8.0/UIAutomationProvider.dll:0:0:0:0 | UIAutomationProvider, Version=8.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35 |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/8.0.1/ref/net8.0/UIAutomationTypes.dll:0:0:0:0 | UIAutomationTypes, Version=8.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35 |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/8.0.1/ref/net8.0/WindowsBase.dll:0:0:0:0 | WindowsBase, Version=8.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35 |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/8.0.1/ref/net8.0/WindowsFormsIntegration.dll:0:0:0:0 | WindowsFormsIntegration, Version=8.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35 |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.0/ref/net9.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/9.0.0/ref/net9.0/Microsoft.VisualBasic.Forms.dll:0:0:0:0 | Microsoft.VisualBasic.Forms, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.0/ref/net9.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/9.0.0/ref/net9.0/Microsoft.Win32.Registry.AccessControl.dll:0:0:0:0 | Microsoft.Win32.Registry.AccessControl, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.0/ref/net9.0/Microsoft.Win32.SystemEvents.dll:0:0:0:0 | Microsoft.Win32.SystemEvents, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.0/ref/net9.0/PresentationCore.dll:0:0:0:0 | PresentationCore, Version=9.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35 |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.0/ref/net9.0/PresentationFramework.Aero2.dll:0:0:0:0 | PresentationFramework.Aero2, Version=9.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35 |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.0/ref/net9.0/PresentationFramework.Aero.dll:0:0:0:0 | PresentationFramework.Aero, Version=9.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35 |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.0/ref/net9.0/PresentationFramework.AeroLite.dll:0:0:0:0 | PresentationFramework.AeroLite, Version=9.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35 |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.0/ref/net9.0/PresentationFramework.Classic.dll:0:0:0:0 | PresentationFramework.Classic, Version=9.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35 |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.0/ref/net9.0/PresentationFramework.Luna.dll:0:0:0:0 | PresentationFramework.Luna, Version=9.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35 |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.0/ref/net9.0/PresentationFramework.Royale.dll:0:0:0:0 | PresentationFramework.Royale, Version=9.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35 |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.0/ref/net9.0/PresentationFramework.dll:0:0:0:0 | PresentationFramework, Version=9.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35 |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.0/ref/net9.0/PresentationUI.dll:0:0:0:0 | PresentationUI, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.0/ref/net9.0/ReachFramework.dll:0:0:0:0 | ReachFramework, Version=9.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35 |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.0/ref/net9.0/System.CodeDom.dll:0:0:0:0 | System.CodeDom, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.0/ref/net9.0/System.Configuration.ConfigurationManager.dll:0:0:0:0 | System.Configuration.ConfigurationManager, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.0/ref/net9.0/System.Design.dll:0:0:0:0 | System.Design, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.0/ref/net9.0/System.Diagnostics.EventLog.dll:0:0:0:0 | System.Diagnostics.EventLog, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.0/ref/net9.0/System.Diagnostics.PerformanceCounter.dll:0:0:0:0 | System.Diagnostics.PerformanceCounter, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.0/ref/net9.0/System.DirectoryServices.dll:0:0:0:0 | System.DirectoryServices, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.0/ref/net9.0/System.Drawing.Common.dll:0:0:0:0 | System.Drawing.Common, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.0/ref/net9.0/System.Drawing.Design.dll:0:0:0:0 | System.Drawing.Design, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.0/ref/net9.0/System.Drawing.dll:0:0:0:0 | System.Drawing, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.0/ref/net9.0/System.Formats.Nrbf.dll:0:0:0:0 | System.Formats.Nrbf, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.0/ref/net9.0/System.IO.Packaging.dll:0:0:0:0 | System.IO.Packaging, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.0/ref/net9.0/System.Printing.dll:0:0:0:0 | System.Printing, Version=9.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35 |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.0/ref/net9.0/System.Private.Windows.Core.dll:0:0:0:0 | System.Private.Windows.Core, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.0/ref/net9.0/System.Resources.Extensions.dll:0:0:0:0 | System.Resources.Extensions, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.0/ref/net9.0/System.Security.Cryptography.Pkcs.dll:0:0:0:0 | System.Security.Cryptography.Pkcs, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.0/ref/net9.0/System.Security.Cryptography.ProtectedData.dll:0:0:0:0 | System.Security.Cryptography.ProtectedData, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.0/ref/net9.0/System.Security.Cryptography.Xml.dll:0:0:0:0 | System.Security.Cryptography.Xml, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.0/ref/net9.0/System.Security.Permissions.dll:0:0:0:0 | System.Security.Permissions, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.0/ref/net9.0/System.Threading.AccessControl.dll:0:0:0:0 | System.Threading.AccessControl, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.0/ref/net9.0/System.Windows.Controls.Ribbon.dll:0:0:0:0 | System.Windows.Controls.Ribbon, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.0/ref/net9.0/System.Windows.Extensions.dll:0:0:0:0 | System.Windows.Extensions, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.0/ref/net9.0/System.Windows.Forms.Design.Editors.dll:0:0:0:0 | System.Windows.Forms.Design.Editors, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.0/ref/net9.0/System.Windows.Forms.Design.dll:0:0:0:0 | System.Windows.Forms.Design, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.0/ref/net9.0/System.Windows.Forms.Primitives.dll:0:0:0:0 | System.Windows.Forms.Primitives, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.0/ref/net9.0/System.Windows.Forms.dll:0:0:0:0 | System.Windows.Forms, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.0/ref/net9.0/System.Windows.Input.Manipulations.dll:0:0:0:0 | System.Windows.Input.Manipulations, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.0/ref/net9.0/System.Windows.Presentation.dll:0:0:0:0 | System.Windows.Presentation, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.0/ref/net9.0/System.Xaml.dll:0:0:0:0 | System.Xaml, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.0/ref/net9.0/UIAutomationClient.dll:0:0:0:0 | UIAutomationClient, Version=9.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35 |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.0/ref/net9.0/UIAutomationClientSideProviders.dll:0:0:0:0 | UIAutomationClientSideProviders, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.0/ref/net9.0/UIAutomationProvider.dll:0:0:0:0 | UIAutomationProvider, Version=9.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35 |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.0/ref/net9.0/UIAutomationTypes.dll:0:0:0:0 | UIAutomationTypes, Version=9.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35 |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.0/ref/net9.0/WindowsBase.dll:0:0:0:0 | WindowsBase, Version=9.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35 |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.0/ref/net9.0/WindowsFormsIntegration.dll:0:0:0:0 | WindowsFormsIntegration, Version=9.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 5c3fd64fbd1..76474f06d04 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": "8.0.101"
+        "version": "9.0.100"
     }
 }
diff --git a/csharp/ql/integration-tests/all-platforms/standalone_winforms/winforms.csproj b/csharp/ql/integration-tests/all-platforms/standalone_winforms/winforms.csproj
index bcc83124518..355e815cdee 100644
--- a/csharp/ql/integration-tests/all-platforms/standalone_winforms/winforms.csproj
+++ b/csharp/ql/integration-tests/all-platforms/standalone_winforms/winforms.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFramework>net8.0-windows</TargetFramework>
+    <TargetFramework>net9.0-windows</TargetFramework>
     <Nullable>enable</Nullable>
     <UseWindowsForms>true</UseWindowsForms>
     <ImplicitUsings>enable</ImplicitUsings>
diff --git a/csharp/ql/integration-tests/linux/compiler_args/CompilerArgs.expected b/csharp/ql/integration-tests/linux/compiler_args/CompilerArgs.expected
index a2f04cfb759..17e51d0b76f 100644
--- a/csharp/ql/integration-tests/linux/compiler_args/CompilerArgs.expected
+++ b/csharp/ql/integration-tests/linux/compiler_args/CompilerArgs.expected
@@ -5,197 +5,199 @@
 | 4 | /fullpaths |
 | 5 | /nostdlib+ |
 | 6 | /errorreport:prompt |
-| 7 | /warn:8 |
-| 8 | /define:TRACE;DEBUG;NET;NET8_0;NETCOREAPP;NET5_0_OR_GREATER;NET6_0_OR_GREATER;NET7_0_OR_GREATER;NET8_0_OR_GREATER;NETCOREAPP1_0_OR_GREATER;NETCOREAPP1_1_OR_GREATER;NETCOREAPP2_0_OR_GREATER;NETCOREAPP2_1_OR_GREATER;NETCOREAPP2_2_OR_GREATER;NETCOREAPP3_0_OR_GREATER;NETCOREAPP3_1_OR_GREATER |
+| 7 | /warn:9 |
+| 8 | /define:TRACE;DEBUG;NET;NET9_0;NETCOREAPP;NET5_0_OR_GREATER;NET6_0_OR_GREATER;NET7_0_OR_GREATER;NET8_0_OR_GREATER;NET9_0_OR_GREATER;NETCOREAPP1_0_OR_GREATER;NETCOREAPP1_1_OR_GREATER;NETCOREAPP2_0_OR_GREATER;NETCOREAPP2_1_OR_GREATER;NETCOREAPP2_2_OR_GREATER;NETCOREAPP3_0_OR_GREATER;NETCOREAPP3_1_OR_GREATER |
 | 9 | /highentropyva+ |
 | 10 | /nullable:enable |
-| 11 | /reference:[...]/8.0.1/ref/net8.0/Microsoft.CSharp.dll |
-| 12 | /reference:[...]/8.0.1/ref/net8.0/Microsoft.VisualBasic.Core.dll |
-| 13 | /reference:[...]/8.0.1/ref/net8.0/Microsoft.VisualBasic.dll |
-| 14 | /reference:[...]/8.0.1/ref/net8.0/Microsoft.Win32.Primitives.dll |
-| 15 | /reference:[...]/8.0.1/ref/net8.0/Microsoft.Win32.Registry.dll |
-| 16 | /reference:[...]/8.0.1/ref/net8.0/mscorlib.dll |
-| 17 | /reference:[...]/8.0.1/ref/net8.0/netstandard.dll |
-| 18 | /reference:[...]/8.0.1/ref/net8.0/System.AppContext.dll |
-| 19 | /reference:[...]/8.0.1/ref/net8.0/System.Buffers.dll |
-| 20 | /reference:[...]/8.0.1/ref/net8.0/System.Collections.Concurrent.dll |
-| 21 | /reference:[...]/8.0.1/ref/net8.0/System.Collections.dll |
-| 22 | /reference:[...]/8.0.1/ref/net8.0/System.Collections.Immutable.dll |
-| 23 | /reference:[...]/8.0.1/ref/net8.0/System.Collections.NonGeneric.dll |
-| 24 | /reference:[...]/8.0.1/ref/net8.0/System.Collections.Specialized.dll |
-| 25 | /reference:[...]/8.0.1/ref/net8.0/System.ComponentModel.Annotations.dll |
-| 26 | /reference:[...]/8.0.1/ref/net8.0/System.ComponentModel.DataAnnotations.dll |
-| 27 | /reference:[...]/8.0.1/ref/net8.0/System.ComponentModel.dll |
-| 28 | /reference:[...]/8.0.1/ref/net8.0/System.ComponentModel.EventBasedAsync.dll |
-| 29 | /reference:[...]/8.0.1/ref/net8.0/System.ComponentModel.Primitives.dll |
-| 30 | /reference:[...]/8.0.1/ref/net8.0/System.ComponentModel.TypeConverter.dll |
-| 31 | /reference:[...]/8.0.1/ref/net8.0/System.Configuration.dll |
-| 32 | /reference:[...]/8.0.1/ref/net8.0/System.Console.dll |
-| 33 | /reference:[...]/8.0.1/ref/net8.0/System.Core.dll |
-| 34 | /reference:[...]/8.0.1/ref/net8.0/System.Data.Common.dll |
-| 35 | /reference:[...]/8.0.1/ref/net8.0/System.Data.DataSetExtensions.dll |
-| 36 | /reference:[...]/8.0.1/ref/net8.0/System.Data.dll |
-| 37 | /reference:[...]/8.0.1/ref/net8.0/System.Diagnostics.Contracts.dll |
-| 38 | /reference:[...]/8.0.1/ref/net8.0/System.Diagnostics.Debug.dll |
-| 39 | /reference:[...]/8.0.1/ref/net8.0/System.Diagnostics.DiagnosticSource.dll |
-| 40 | /reference:[...]/8.0.1/ref/net8.0/System.Diagnostics.FileVersionInfo.dll |
-| 41 | /reference:[...]/8.0.1/ref/net8.0/System.Diagnostics.Process.dll |
-| 42 | /reference:[...]/8.0.1/ref/net8.0/System.Diagnostics.StackTrace.dll |
-| 43 | /reference:[...]/8.0.1/ref/net8.0/System.Diagnostics.TextWriterTraceListener.dll |
-| 44 | /reference:[...]/8.0.1/ref/net8.0/System.Diagnostics.Tools.dll |
-| 45 | /reference:[...]/8.0.1/ref/net8.0/System.Diagnostics.TraceSource.dll |
-| 46 | /reference:[...]/8.0.1/ref/net8.0/System.Diagnostics.Tracing.dll |
-| 47 | /reference:[...]/8.0.1/ref/net8.0/System.dll |
-| 48 | /reference:[...]/8.0.1/ref/net8.0/System.Drawing.dll |
-| 49 | /reference:[...]/8.0.1/ref/net8.0/System.Drawing.Primitives.dll |
-| 50 | /reference:[...]/8.0.1/ref/net8.0/System.Dynamic.Runtime.dll |
-| 51 | /reference:[...]/8.0.1/ref/net8.0/System.Formats.Asn1.dll |
-| 52 | /reference:[...]/8.0.1/ref/net8.0/System.Formats.Tar.dll |
-| 53 | /reference:[...]/8.0.1/ref/net8.0/System.Globalization.Calendars.dll |
-| 54 | /reference:[...]/8.0.1/ref/net8.0/System.Globalization.dll |
-| 55 | /reference:[...]/8.0.1/ref/net8.0/System.Globalization.Extensions.dll |
-| 56 | /reference:[...]/8.0.1/ref/net8.0/System.IO.Compression.Brotli.dll |
-| 57 | /reference:[...]/8.0.1/ref/net8.0/System.IO.Compression.dll |
-| 58 | /reference:[...]/8.0.1/ref/net8.0/System.IO.Compression.FileSystem.dll |
-| 59 | /reference:[...]/8.0.1/ref/net8.0/System.IO.Compression.ZipFile.dll |
-| 60 | /reference:[...]/8.0.1/ref/net8.0/System.IO.dll |
-| 61 | /reference:[...]/8.0.1/ref/net8.0/System.IO.FileSystem.AccessControl.dll |
-| 62 | /reference:[...]/8.0.1/ref/net8.0/System.IO.FileSystem.dll |
-| 63 | /reference:[...]/8.0.1/ref/net8.0/System.IO.FileSystem.DriveInfo.dll |
-| 64 | /reference:[...]/8.0.1/ref/net8.0/System.IO.FileSystem.Primitives.dll |
-| 65 | /reference:[...]/8.0.1/ref/net8.0/System.IO.FileSystem.Watcher.dll |
-| 66 | /reference:[...]/8.0.1/ref/net8.0/System.IO.IsolatedStorage.dll |
-| 67 | /reference:[...]/8.0.1/ref/net8.0/System.IO.MemoryMappedFiles.dll |
-| 68 | /reference:[...]/8.0.1/ref/net8.0/System.IO.Pipes.AccessControl.dll |
-| 69 | /reference:[...]/8.0.1/ref/net8.0/System.IO.Pipes.dll |
-| 70 | /reference:[...]/8.0.1/ref/net8.0/System.IO.UnmanagedMemoryStream.dll |
-| 71 | /reference:[...]/8.0.1/ref/net8.0/System.Linq.dll |
-| 72 | /reference:[...]/8.0.1/ref/net8.0/System.Linq.Expressions.dll |
-| 73 | /reference:[...]/8.0.1/ref/net8.0/System.Linq.Parallel.dll |
-| 74 | /reference:[...]/8.0.1/ref/net8.0/System.Linq.Queryable.dll |
-| 75 | /reference:[...]/8.0.1/ref/net8.0/System.Memory.dll |
-| 76 | /reference:[...]/8.0.1/ref/net8.0/System.Net.dll |
-| 77 | /reference:[...]/8.0.1/ref/net8.0/System.Net.Http.dll |
-| 78 | /reference:[...]/8.0.1/ref/net8.0/System.Net.Http.Json.dll |
-| 79 | /reference:[...]/8.0.1/ref/net8.0/System.Net.HttpListener.dll |
-| 80 | /reference:[...]/8.0.1/ref/net8.0/System.Net.Mail.dll |
-| 81 | /reference:[...]/8.0.1/ref/net8.0/System.Net.NameResolution.dll |
-| 82 | /reference:[...]/8.0.1/ref/net8.0/System.Net.NetworkInformation.dll |
-| 83 | /reference:[...]/8.0.1/ref/net8.0/System.Net.Ping.dll |
-| 84 | /reference:[...]/8.0.1/ref/net8.0/System.Net.Primitives.dll |
-| 85 | /reference:[...]/8.0.1/ref/net8.0/System.Net.Quic.dll |
-| 86 | /reference:[...]/8.0.1/ref/net8.0/System.Net.Requests.dll |
-| 87 | /reference:[...]/8.0.1/ref/net8.0/System.Net.Security.dll |
-| 88 | /reference:[...]/8.0.1/ref/net8.0/System.Net.ServicePoint.dll |
-| 89 | /reference:[...]/8.0.1/ref/net8.0/System.Net.Sockets.dll |
-| 90 | /reference:[...]/8.0.1/ref/net8.0/System.Net.WebClient.dll |
-| 91 | /reference:[...]/8.0.1/ref/net8.0/System.Net.WebHeaderCollection.dll |
-| 92 | /reference:[...]/8.0.1/ref/net8.0/System.Net.WebProxy.dll |
-| 93 | /reference:[...]/8.0.1/ref/net8.0/System.Net.WebSockets.Client.dll |
-| 94 | /reference:[...]/8.0.1/ref/net8.0/System.Net.WebSockets.dll |
-| 95 | /reference:[...]/8.0.1/ref/net8.0/System.Numerics.dll |
-| 96 | /reference:[...]/8.0.1/ref/net8.0/System.Numerics.Vectors.dll |
-| 97 | /reference:[...]/8.0.1/ref/net8.0/System.ObjectModel.dll |
-| 98 | /reference:[...]/8.0.1/ref/net8.0/System.Reflection.DispatchProxy.dll |
-| 99 | /reference:[...]/8.0.1/ref/net8.0/System.Reflection.dll |
-| 100 | /reference:[...]/8.0.1/ref/net8.0/System.Reflection.Emit.dll |
-| 101 | /reference:[...]/8.0.1/ref/net8.0/System.Reflection.Emit.ILGeneration.dll |
-| 102 | /reference:[...]/8.0.1/ref/net8.0/System.Reflection.Emit.Lightweight.dll |
-| 103 | /reference:[...]/8.0.1/ref/net8.0/System.Reflection.Extensions.dll |
-| 104 | /reference:[...]/8.0.1/ref/net8.0/System.Reflection.Metadata.dll |
-| 105 | /reference:[...]/8.0.1/ref/net8.0/System.Reflection.Primitives.dll |
-| 106 | /reference:[...]/8.0.1/ref/net8.0/System.Reflection.TypeExtensions.dll |
-| 107 | /reference:[...]/8.0.1/ref/net8.0/System.Resources.Reader.dll |
-| 108 | /reference:[...]/8.0.1/ref/net8.0/System.Resources.ResourceManager.dll |
-| 109 | /reference:[...]/8.0.1/ref/net8.0/System.Resources.Writer.dll |
-| 110 | /reference:[...]/8.0.1/ref/net8.0/System.Runtime.CompilerServices.Unsafe.dll |
-| 111 | /reference:[...]/8.0.1/ref/net8.0/System.Runtime.CompilerServices.VisualC.dll |
-| 112 | /reference:[...]/8.0.1/ref/net8.0/System.Runtime.dll |
-| 113 | /reference:[...]/8.0.1/ref/net8.0/System.Runtime.Extensions.dll |
-| 114 | /reference:[...]/8.0.1/ref/net8.0/System.Runtime.Handles.dll |
-| 115 | /reference:[...]/8.0.1/ref/net8.0/System.Runtime.InteropServices.dll |
-| 116 | /reference:[...]/8.0.1/ref/net8.0/System.Runtime.InteropServices.JavaScript.dll |
-| 117 | /reference:[...]/8.0.1/ref/net8.0/System.Runtime.InteropServices.RuntimeInformation.dll |
-| 118 | /reference:[...]/8.0.1/ref/net8.0/System.Runtime.Intrinsics.dll |
-| 119 | /reference:[...]/8.0.1/ref/net8.0/System.Runtime.Loader.dll |
-| 120 | /reference:[...]/8.0.1/ref/net8.0/System.Runtime.Numerics.dll |
-| 121 | /reference:[...]/8.0.1/ref/net8.0/System.Runtime.Serialization.dll |
-| 122 | /reference:[...]/8.0.1/ref/net8.0/System.Runtime.Serialization.Formatters.dll |
-| 123 | /reference:[...]/8.0.1/ref/net8.0/System.Runtime.Serialization.Json.dll |
-| 124 | /reference:[...]/8.0.1/ref/net8.0/System.Runtime.Serialization.Primitives.dll |
-| 125 | /reference:[...]/8.0.1/ref/net8.0/System.Runtime.Serialization.Xml.dll |
-| 126 | /reference:[...]/8.0.1/ref/net8.0/System.Security.AccessControl.dll |
-| 127 | /reference:[...]/8.0.1/ref/net8.0/System.Security.Claims.dll |
-| 128 | /reference:[...]/8.0.1/ref/net8.0/System.Security.Cryptography.Algorithms.dll |
-| 129 | /reference:[...]/8.0.1/ref/net8.0/System.Security.Cryptography.Cng.dll |
-| 130 | /reference:[...]/8.0.1/ref/net8.0/System.Security.Cryptography.Csp.dll |
-| 131 | /reference:[...]/8.0.1/ref/net8.0/System.Security.Cryptography.dll |
-| 132 | /reference:[...]/8.0.1/ref/net8.0/System.Security.Cryptography.Encoding.dll |
-| 133 | /reference:[...]/8.0.1/ref/net8.0/System.Security.Cryptography.OpenSsl.dll |
-| 134 | /reference:[...]/8.0.1/ref/net8.0/System.Security.Cryptography.Primitives.dll |
-| 135 | /reference:[...]/8.0.1/ref/net8.0/System.Security.Cryptography.X509Certificates.dll |
-| 136 | /reference:[...]/8.0.1/ref/net8.0/System.Security.dll |
-| 137 | /reference:[...]/8.0.1/ref/net8.0/System.Security.Principal.dll |
-| 138 | /reference:[...]/8.0.1/ref/net8.0/System.Security.Principal.Windows.dll |
-| 139 | /reference:[...]/8.0.1/ref/net8.0/System.Security.SecureString.dll |
-| 140 | /reference:[...]/8.0.1/ref/net8.0/System.ServiceModel.Web.dll |
-| 141 | /reference:[...]/8.0.1/ref/net8.0/System.ServiceProcess.dll |
-| 142 | /reference:[...]/8.0.1/ref/net8.0/System.Text.Encoding.CodePages.dll |
-| 143 | /reference:[...]/8.0.1/ref/net8.0/System.Text.Encoding.dll |
-| 144 | /reference:[...]/8.0.1/ref/net8.0/System.Text.Encoding.Extensions.dll |
-| 145 | /reference:[...]/8.0.1/ref/net8.0/System.Text.Encodings.Web.dll |
-| 146 | /reference:[...]/8.0.1/ref/net8.0/System.Text.Json.dll |
-| 147 | /reference:[...]/8.0.1/ref/net8.0/System.Text.RegularExpressions.dll |
-| 148 | /reference:[...]/8.0.1/ref/net8.0/System.Threading.Channels.dll |
-| 149 | /reference:[...]/8.0.1/ref/net8.0/System.Threading.dll |
-| 150 | /reference:[...]/8.0.1/ref/net8.0/System.Threading.Overlapped.dll |
-| 151 | /reference:[...]/8.0.1/ref/net8.0/System.Threading.Tasks.Dataflow.dll |
-| 152 | /reference:[...]/8.0.1/ref/net8.0/System.Threading.Tasks.dll |
-| 153 | /reference:[...]/8.0.1/ref/net8.0/System.Threading.Tasks.Extensions.dll |
-| 154 | /reference:[...]/8.0.1/ref/net8.0/System.Threading.Tasks.Parallel.dll |
-| 155 | /reference:[...]/8.0.1/ref/net8.0/System.Threading.Thread.dll |
-| 156 | /reference:[...]/8.0.1/ref/net8.0/System.Threading.ThreadPool.dll |
-| 157 | /reference:[...]/8.0.1/ref/net8.0/System.Threading.Timer.dll |
-| 158 | /reference:[...]/8.0.1/ref/net8.0/System.Transactions.dll |
-| 159 | /reference:[...]/8.0.1/ref/net8.0/System.Transactions.Local.dll |
-| 160 | /reference:[...]/8.0.1/ref/net8.0/System.ValueTuple.dll |
-| 161 | /reference:[...]/8.0.1/ref/net8.0/System.Web.dll |
-| 162 | /reference:[...]/8.0.1/ref/net8.0/System.Web.HttpUtility.dll |
-| 163 | /reference:[...]/8.0.1/ref/net8.0/System.Windows.dll |
-| 164 | /reference:[...]/8.0.1/ref/net8.0/System.Xml.dll |
-| 165 | /reference:[...]/8.0.1/ref/net8.0/System.Xml.Linq.dll |
-| 166 | /reference:[...]/8.0.1/ref/net8.0/System.Xml.ReaderWriter.dll |
-| 167 | /reference:[...]/8.0.1/ref/net8.0/System.Xml.Serialization.dll |
-| 168 | /reference:[...]/8.0.1/ref/net8.0/System.Xml.XDocument.dll |
-| 169 | /reference:[...]/8.0.1/ref/net8.0/System.Xml.XmlDocument.dll |
-| 170 | /reference:[...]/8.0.1/ref/net8.0/System.Xml.XmlSerializer.dll |
-| 171 | /reference:[...]/8.0.1/ref/net8.0/System.Xml.XPath.dll |
-| 172 | /reference:[...]/8.0.1/ref/net8.0/System.Xml.XPath.XDocument.dll |
-| 173 | /reference:[...]/8.0.1/ref/net8.0/WindowsBase.dll |
-| 174 | /debug+ |
-| 175 | /debug:portable |
-| 176 | /filealign:512 |
-| 177 | /generatedfilesout:obj/Debug/net8.0//generated |
-| 178 | /optimize- |
-| 179 | /out:obj/Debug/net8.0/test.dll |
-| 180 | /refout:obj/Debug/net8.0/refint/test.dll |
-| 181 | /target:exe |
-| 182 | /warnaserror- |
-| 183 | /utf8output |
-| 184 | /deterministic+ |
-| 185 | /langversion:12.0 |
-| 186 | /analyzerconfig:obj/Debug/net8.0/test.GeneratedMSBuildEditorConfig.editorconfig |
-| 187 | /analyzerconfig:[...]/8.0.101/Sdks/Microsoft.NET.Sdk/analyzers/build/config/analysislevel_8_default.globalconfig |
-| 188 | /analyzer:[...]/8.0.101/Sdks/Microsoft.NET.Sdk/targets/../analyzers/Microsoft.CodeAnalysis.CSharp.NetAnalyzers.dll |
-| 189 | /analyzer:[...]/8.0.101/Sdks/Microsoft.NET.Sdk/targets/../analyzers/Microsoft.CodeAnalysis.NetAnalyzers.dll |
-| 190 | /analyzer:[...]/8.0.1/analyzers/dotnet/cs/Microsoft.Interop.ComInterfaceGenerator.dll |
-| 191 | /analyzer:[...]/8.0.1/analyzers/dotnet/cs/Microsoft.Interop.JavaScript.JSImportGenerator.dll |
-| 192 | /analyzer:[...]/8.0.1/analyzers/dotnet/cs/Microsoft.Interop.LibraryImportGenerator.dll |
-| 193 | /analyzer:[...]/8.0.1/analyzers/dotnet/cs/Microsoft.Interop.SourceGeneration.dll |
-| 194 | /analyzer:[...]/8.0.1/analyzers/dotnet/cs/System.Text.Json.SourceGeneration.dll |
-| 195 | /analyzer:[...]/8.0.1/analyzers/dotnet/cs/System.Text.RegularExpressions.Generator.dll |
-| 196 | Program.cs |
-| 197 | obj/Debug/net8.0/test.GlobalUsings.g.cs |
-| 198 | obj/Debug/net8.0/.NETCoreApp,Version=v8.0.AssemblyAttributes.cs |
-| 199 | obj/Debug/net8.0/test.AssemblyInfo.cs |
-| 200 | /warnaserror+:NU1605,SYSLIB0011 |
+| 11 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/Microsoft.CSharp.dll |
+| 12 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/Microsoft.VisualBasic.Core.dll |
+| 13 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/Microsoft.VisualBasic.dll |
+| 14 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/Microsoft.Win32.Primitives.dll |
+| 15 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/Microsoft.Win32.Registry.dll |
+| 16 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/mscorlib.dll |
+| 17 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/netstandard.dll |
+| 18 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.AppContext.dll |
+| 19 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.Buffers.dll |
+| 20 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.Collections.Concurrent.dll |
+| 21 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.Collections.dll |
+| 22 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.Collections.Immutable.dll |
+| 23 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.Collections.NonGeneric.dll |
+| 24 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.Collections.Specialized.dll |
+| 25 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.ComponentModel.Annotations.dll |
+| 26 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.ComponentModel.DataAnnotations.dll |
+| 27 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.ComponentModel.dll |
+| 28 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.ComponentModel.EventBasedAsync.dll |
+| 29 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.ComponentModel.Primitives.dll |
+| 30 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.ComponentModel.TypeConverter.dll |
+| 31 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.Configuration.dll |
+| 32 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.Console.dll |
+| 33 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.Core.dll |
+| 34 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.Data.Common.dll |
+| 35 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.Data.DataSetExtensions.dll |
+| 36 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.Data.dll |
+| 37 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.Diagnostics.Contracts.dll |
+| 38 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.Diagnostics.Debug.dll |
+| 39 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.Diagnostics.DiagnosticSource.dll |
+| 40 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.Diagnostics.FileVersionInfo.dll |
+| 41 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.Diagnostics.Process.dll |
+| 42 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.Diagnostics.StackTrace.dll |
+| 43 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.Diagnostics.TextWriterTraceListener.dll |
+| 44 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.Diagnostics.Tools.dll |
+| 45 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.Diagnostics.TraceSource.dll |
+| 46 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.Diagnostics.Tracing.dll |
+| 47 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.dll |
+| 48 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.Drawing.dll |
+| 49 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.Drawing.Primitives.dll |
+| 50 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.Dynamic.Runtime.dll |
+| 51 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.Formats.Asn1.dll |
+| 52 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.Formats.Tar.dll |
+| 53 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.Globalization.Calendars.dll |
+| 54 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.Globalization.dll |
+| 55 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.Globalization.Extensions.dll |
+| 56 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.IO.Compression.Brotli.dll |
+| 57 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.IO.Compression.dll |
+| 58 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.IO.Compression.FileSystem.dll |
+| 59 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.IO.Compression.ZipFile.dll |
+| 60 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.IO.dll |
+| 61 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.IO.FileSystem.AccessControl.dll |
+| 62 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.IO.FileSystem.dll |
+| 63 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.IO.FileSystem.DriveInfo.dll |
+| 64 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.IO.FileSystem.Primitives.dll |
+| 65 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.IO.FileSystem.Watcher.dll |
+| 66 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.IO.IsolatedStorage.dll |
+| 67 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.IO.MemoryMappedFiles.dll |
+| 68 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.IO.Pipelines.dll |
+| 69 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.IO.Pipes.AccessControl.dll |
+| 70 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.IO.Pipes.dll |
+| 71 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.IO.UnmanagedMemoryStream.dll |
+| 72 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.Linq.dll |
+| 73 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.Linq.Expressions.dll |
+| 74 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.Linq.Parallel.dll |
+| 75 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.Linq.Queryable.dll |
+| 76 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.Memory.dll |
+| 77 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.Net.dll |
+| 78 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.Net.Http.dll |
+| 79 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.Net.Http.Json.dll |
+| 80 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.Net.HttpListener.dll |
+| 81 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.Net.Mail.dll |
+| 82 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.Net.NameResolution.dll |
+| 83 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.Net.NetworkInformation.dll |
+| 84 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.Net.Ping.dll |
+| 85 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.Net.Primitives.dll |
+| 86 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.Net.Quic.dll |
+| 87 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.Net.Requests.dll |
+| 88 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.Net.Security.dll |
+| 89 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.Net.ServicePoint.dll |
+| 90 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.Net.Sockets.dll |
+| 91 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.Net.WebClient.dll |
+| 92 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.Net.WebHeaderCollection.dll |
+| 93 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.Net.WebProxy.dll |
+| 94 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.Net.WebSockets.Client.dll |
+| 95 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.Net.WebSockets.dll |
+| 96 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.Numerics.dll |
+| 97 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.Numerics.Vectors.dll |
+| 98 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.ObjectModel.dll |
+| 99 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.Reflection.DispatchProxy.dll |
+| 100 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.Reflection.dll |
+| 101 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.Reflection.Emit.dll |
+| 102 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.Reflection.Emit.ILGeneration.dll |
+| 103 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.Reflection.Emit.Lightweight.dll |
+| 104 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.Reflection.Extensions.dll |
+| 105 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.Reflection.Metadata.dll |
+| 106 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.Reflection.Primitives.dll |
+| 107 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.Reflection.TypeExtensions.dll |
+| 108 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.Resources.Reader.dll |
+| 109 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.Resources.ResourceManager.dll |
+| 110 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.Resources.Writer.dll |
+| 111 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.Runtime.CompilerServices.Unsafe.dll |
+| 112 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.Runtime.CompilerServices.VisualC.dll |
+| 113 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.Runtime.dll |
+| 114 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.Runtime.Extensions.dll |
+| 115 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.Runtime.Handles.dll |
+| 116 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.Runtime.InteropServices.dll |
+| 117 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.Runtime.InteropServices.JavaScript.dll |
+| 118 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.Runtime.InteropServices.RuntimeInformation.dll |
+| 119 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.Runtime.Intrinsics.dll |
+| 120 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.Runtime.Loader.dll |
+| 121 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.Runtime.Numerics.dll |
+| 122 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.Runtime.Serialization.dll |
+| 123 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.Runtime.Serialization.Formatters.dll |
+| 124 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.Runtime.Serialization.Json.dll |
+| 125 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.Runtime.Serialization.Primitives.dll |
+| 126 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.Runtime.Serialization.Xml.dll |
+| 127 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.Security.AccessControl.dll |
+| 128 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.Security.Claims.dll |
+| 129 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.Security.Cryptography.Algorithms.dll |
+| 130 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.Security.Cryptography.Cng.dll |
+| 131 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.Security.Cryptography.Csp.dll |
+| 132 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.Security.Cryptography.dll |
+| 133 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.Security.Cryptography.Encoding.dll |
+| 134 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.Security.Cryptography.OpenSsl.dll |
+| 135 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.Security.Cryptography.Primitives.dll |
+| 136 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.Security.Cryptography.X509Certificates.dll |
+| 137 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.Security.dll |
+| 138 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.Security.Principal.dll |
+| 139 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.Security.Principal.Windows.dll |
+| 140 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.Security.SecureString.dll |
+| 141 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.ServiceModel.Web.dll |
+| 142 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.ServiceProcess.dll |
+| 143 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.Text.Encoding.CodePages.dll |
+| 144 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.Text.Encoding.dll |
+| 145 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.Text.Encoding.Extensions.dll |
+| 146 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.Text.Encodings.Web.dll |
+| 147 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.Text.Json.dll |
+| 148 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.Text.RegularExpressions.dll |
+| 149 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.Threading.Channels.dll |
+| 150 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.Threading.dll |
+| 151 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.Threading.Overlapped.dll |
+| 152 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.Threading.Tasks.Dataflow.dll |
+| 153 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.Threading.Tasks.dll |
+| 154 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.Threading.Tasks.Extensions.dll |
+| 155 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.Threading.Tasks.Parallel.dll |
+| 156 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.Threading.Thread.dll |
+| 157 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.Threading.ThreadPool.dll |
+| 158 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.Threading.Timer.dll |
+| 159 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.Transactions.dll |
+| 160 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.Transactions.Local.dll |
+| 161 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.ValueTuple.dll |
+| 162 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.Web.dll |
+| 163 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.Web.HttpUtility.dll |
+| 164 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.Windows.dll |
+| 165 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.Xml.dll |
+| 166 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.Xml.Linq.dll |
+| 167 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.Xml.ReaderWriter.dll |
+| 168 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.Xml.Serialization.dll |
+| 169 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.Xml.XDocument.dll |
+| 170 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.Xml.XmlDocument.dll |
+| 171 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.Xml.XmlSerializer.dll |
+| 172 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.Xml.XPath.dll |
+| 173 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.Xml.XPath.XDocument.dll |
+| 174 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/WindowsBase.dll |
+| 175 | /debug+ |
+| 176 | /debug:portable |
+| 177 | /filealign:512 |
+| 178 | /generatedfilesout:obj/Debug/net9.0//generated |
+| 179 | /optimize- |
+| 180 | /out:obj/Debug/net9.0/test.dll |
+| 181 | /refout:obj/Debug/net9.0/refint/test.dll |
+| 182 | /target:exe |
+| 183 | /warnaserror- |
+| 184 | /utf8output |
+| 185 | /deterministic+ |
+| 186 | /langversion:13.0 |
+| 187 | /analyzerconfig:/usr/share/dotnet/sdk/9.0.100/Sdks/Microsoft.NET.Sdk/codestyle/cs/build/config/analysislevelstyle_default.globalconfig |
+| 188 | /analyzerconfig:obj/Debug/net9.0/test.GeneratedMSBuildEditorConfig.editorconfig |
+| 189 | /analyzerconfig:/usr/share/dotnet/sdk/9.0.100/Sdks/Microsoft.NET.Sdk/analyzers/build/config/analysislevel_9_default.globalconfig |
+| 190 | /analyzer:/usr/share/dotnet/sdk/9.0.100/Sdks/Microsoft.NET.Sdk/targets/../analyzers/Microsoft.CodeAnalysis.CSharp.NetAnalyzers.dll |
+| 191 | /analyzer:/usr/share/dotnet/sdk/9.0.100/Sdks/Microsoft.NET.Sdk/targets/../analyzers/Microsoft.CodeAnalysis.NetAnalyzers.dll |
+| 192 | /analyzer:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/analyzers/dotnet/cs/Microsoft.Interop.ComInterfaceGenerator.dll |
+| 193 | /analyzer:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/analyzers/dotnet/cs/Microsoft.Interop.JavaScript.JSImportGenerator.dll |
+| 194 | /analyzer:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/analyzers/dotnet/cs/Microsoft.Interop.LibraryImportGenerator.dll |
+| 195 | /analyzer:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/analyzers/dotnet/cs/Microsoft.Interop.SourceGeneration.dll |
+| 196 | /analyzer:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/analyzers/dotnet/cs/System.Text.Json.SourceGeneration.dll |
+| 197 | /analyzer:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/analyzers/dotnet/cs/System.Text.RegularExpressions.Generator.dll |
+| 198 | Program.cs |
+| 199 | obj/Debug/net9.0/test.GlobalUsings.g.cs |
+| 200 | obj/Debug/net9.0/.NETCoreApp,Version=v9.0.AssemblyAttributes.cs |
+| 201 | obj/Debug/net9.0/test.AssemblyInfo.cs |
+| 202 | /warnaserror+:NU1605,SYSLIB0011 |
\ No newline at end of file
diff --git a/csharp/ql/integration-tests/linux/compiler_args/global.json b/csharp/ql/integration-tests/linux/compiler_args/global.json
index 5c3fd64fbd1..76474f06d04 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": "8.0.101"
+        "version": "9.0.100"
     }
 }
diff --git a/csharp/ql/integration-tests/linux/compiler_args/test.csproj b/csharp/ql/integration-tests/linux/compiler_args/test.csproj
index 324eba5d4ef..8bb8e6387f9 100644
--- a/csharp/ql/integration-tests/linux/compiler_args/test.csproj
+++ b/csharp/ql/integration-tests/linux/compiler_args/test.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>
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 5c3fd64fbd1..76474f06d04 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": "8.0.101"
+        "version": "9.0.100"
     }
 }
diff --git a/csharp/ql/integration-tests/linux/standalone_dependencies_non_utf8_filename/test.csproj b/csharp/ql/integration-tests/linux/standalone_dependencies_non_utf8_filename/test.csproj
index a269962b552..92e46ddaccf 100644
--- a/csharp/ql/integration-tests/linux/standalone_dependencies_non_utf8_filename/test.csproj
+++ b/csharp/ql/integration-tests/linux/standalone_dependencies_non_utf8_filename/test.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
   </PropertyGroup>
 
 </Project>
diff --git a/csharp/ql/integration-tests/posix/dotnet_test/dotnet_test.csproj b/csharp/ql/integration-tests/posix/dotnet_test/dotnet_test.csproj
index 385a784dce0..ae797904315 100644
--- a/csharp/ql/integration-tests/posix/dotnet_test/dotnet_test.csproj
+++ b/csharp/ql/integration-tests/posix/dotnet_test/dotnet_test.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <Nullable>enable</Nullable>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
diff --git a/csharp/ql/integration-tests/posix/dotnet_test/global.json b/csharp/ql/integration-tests/posix/dotnet_test/global.json
index 5c3fd64fbd1..76474f06d04 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": "8.0.101"
+        "version": "9.0.100"
     }
 }
diff --git a/csharp/ql/integration-tests/posix/dotnet_test_mstest/dotnet_test_mstest.csproj b/csharp/ql/integration-tests/posix/dotnet_test_mstest/dotnet_test_mstest.csproj
index acbb9e7fe2b..45ccf93ee74 100644
--- a/csharp/ql/integration-tests/posix/dotnet_test_mstest/dotnet_test_mstest.csproj
+++ b/csharp/ql/integration-tests/posix/dotnet_test_mstest/dotnet_test_mstest.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
 
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 5c3fd64fbd1..76474f06d04 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": "8.0.101"
+        "version": "9.0.100"
     }
 }
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 5c3fd64fbd1..76474f06d04 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": "8.0.101"
+        "version": "9.0.100"
     }
 }
diff --git a/csharp/ql/integration-tests/posix/inherit-env-vars/proj.csproj.no_auto b/csharp/ql/integration-tests/posix/inherit-env-vars/proj.csproj.no_auto
index 91b464afeac..694035b3acd 100644
--- a/csharp/ql/integration-tests/posix/inherit-env-vars/proj.csproj.no_auto
+++ b/csharp/ql/integration-tests/posix/inherit-env-vars/proj.csproj.no_auto
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>
diff --git a/csharp/ql/integration-tests/posix/standalone_dependencies/Assemblies.expected b/csharp/ql/integration-tests/posix/standalone_dependencies/Assemblies.expected
index d1602665e16..3e9c8fa753b 100644
--- a/csharp/ql/integration-tests/posix/standalone_dependencies/Assemblies.expected
+++ b/csharp/ql/integration-tests/posix/standalone_dependencies/Assemblies.expected
@@ -1,166 +1,167 @@
 | 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/8.0.1/ref/net8.0/Microsoft.CSharp.dll:0:0:0:0 | Microsoft.CSharp, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/Microsoft.VisualBasic.Core.dll:0:0:0:0 | Microsoft.VisualBasic.Core, Version=13.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.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/8.0.1/ref/net8.0/Microsoft.Win32.Primitives.dll:0:0:0:0 | Microsoft.Win32.Primitives, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/Microsoft.Win32.Registry.dll:0:0:0:0 | Microsoft.Win32.Registry, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.AppContext.dll:0:0:0:0 | System.AppContext, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Buffers.dll:0:0:0:0 | System.Buffers, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Collections.Concurrent.dll:0:0:0:0 | System.Collections.Concurrent, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Collections.Immutable.dll:0:0:0:0 | System.Collections.Immutable, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Collections.NonGeneric.dll:0:0:0:0 | System.Collections.NonGeneric, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Collections.Specialized.dll:0:0:0:0 | System.Collections.Specialized, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Collections.dll:0:0:0:0 | System.Collections, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.ComponentModel.Annotations.dll:0:0:0:0 | System.ComponentModel.Annotations, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.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/8.0.1/ref/net8.0/System.ComponentModel.EventBasedAsync.dll:0:0:0:0 | System.ComponentModel.EventBasedAsync, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.ComponentModel.Primitives.dll:0:0:0:0 | System.ComponentModel.Primitives, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.ComponentModel.TypeConverter.dll:0:0:0:0 | System.ComponentModel.TypeConverter, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.ComponentModel.dll:0:0:0:0 | System.ComponentModel, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.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/8.0.1/ref/net8.0/System.Console.dll:0:0:0:0 | System.Console, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.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/8.0.1/ref/net8.0/System.Data.Common.dll:0:0:0:0 | System.Data.Common, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Data.DataSetExtensions.dll:0:0:0:0 | System.Data.DataSetExtensions, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.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/8.0.1/ref/net8.0/System.Diagnostics.Contracts.dll:0:0:0:0 | System.Diagnostics.Contracts, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Diagnostics.Debug.dll:0:0:0:0 | System.Diagnostics.Debug, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Diagnostics.DiagnosticSource.dll:0:0:0:0 | System.Diagnostics.DiagnosticSource, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Diagnostics.FileVersionInfo.dll:0:0:0:0 | System.Diagnostics.FileVersionInfo, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Diagnostics.Process.dll:0:0:0:0 | System.Diagnostics.Process, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Diagnostics.StackTrace.dll:0:0:0:0 | System.Diagnostics.StackTrace, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Diagnostics.TextWriterTraceListener.dll:0:0:0:0 | System.Diagnostics.TextWriterTraceListener, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Diagnostics.Tools.dll:0:0:0:0 | System.Diagnostics.Tools, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Diagnostics.TraceSource.dll:0:0:0:0 | System.Diagnostics.TraceSource, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Diagnostics.Tracing.dll:0:0:0:0 | System.Diagnostics.Tracing, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Drawing.Primitives.dll:0:0:0:0 | System.Drawing.Primitives, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.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/8.0.1/ref/net8.0/System.Dynamic.Runtime.dll:0:0:0:0 | System.Dynamic.Runtime, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Formats.Asn1.dll:0:0:0:0 | System.Formats.Asn1, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Formats.Tar.dll:0:0:0:0 | System.Formats.Tar, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Globalization.Calendars.dll:0:0:0:0 | System.Globalization.Calendars, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Globalization.Extensions.dll:0:0:0:0 | System.Globalization.Extensions, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Globalization.dll:0:0:0:0 | System.Globalization, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.IO.Compression.Brotli.dll:0:0:0:0 | System.IO.Compression.Brotli, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.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/8.0.1/ref/net8.0/System.IO.Compression.ZipFile.dll:0:0:0:0 | System.IO.Compression.ZipFile, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.IO.Compression.dll:0:0:0:0 | System.IO.Compression, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.IO.FileSystem.AccessControl.dll:0:0:0:0 | System.IO.FileSystem.AccessControl, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.IO.FileSystem.DriveInfo.dll:0:0:0:0 | System.IO.FileSystem.DriveInfo, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.IO.FileSystem.Primitives.dll:0:0:0:0 | System.IO.FileSystem.Primitives, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.IO.FileSystem.Watcher.dll:0:0:0:0 | System.IO.FileSystem.Watcher, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.IO.FileSystem.dll:0:0:0:0 | System.IO.FileSystem, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.IO.IsolatedStorage.dll:0:0:0:0 | System.IO.IsolatedStorage, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.IO.MemoryMappedFiles.dll:0:0:0:0 | System.IO.MemoryMappedFiles, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.IO.Pipes.AccessControl.dll:0:0:0:0 | System.IO.Pipes.AccessControl, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.IO.Pipes.dll:0:0:0:0 | System.IO.Pipes, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.IO.UnmanagedMemoryStream.dll:0:0:0:0 | System.IO.UnmanagedMemoryStream, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.IO.dll:0:0:0:0 | System.IO, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Linq.Expressions.dll:0:0:0:0 | System.Linq.Expressions, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Linq.Parallel.dll:0:0:0:0 | System.Linq.Parallel, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Linq.Queryable.dll:0:0:0:0 | System.Linq.Queryable, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Linq.dll:0:0:0:0 | System.Linq, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Memory.dll:0:0:0:0 | System.Memory, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Net.Http.Json.dll:0:0:0:0 | System.Net.Http.Json, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Net.Http.dll:0:0:0:0 | System.Net.Http, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Net.HttpListener.dll:0:0:0:0 | System.Net.HttpListener, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Net.Mail.dll:0:0:0:0 | System.Net.Mail, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Net.NameResolution.dll:0:0:0:0 | System.Net.NameResolution, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Net.NetworkInformation.dll:0:0:0:0 | System.Net.NetworkInformation, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Net.Ping.dll:0:0:0:0 | System.Net.Ping, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Net.Primitives.dll:0:0:0:0 | System.Net.Primitives, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Net.Quic.dll:0:0:0:0 | System.Net.Quic, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Net.Requests.dll:0:0:0:0 | System.Net.Requests, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Net.Security.dll:0:0:0:0 | System.Net.Security, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Net.ServicePoint.dll:0:0:0:0 | System.Net.ServicePoint, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Net.Sockets.dll:0:0:0:0 | System.Net.Sockets, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Net.WebClient.dll:0:0:0:0 | System.Net.WebClient, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Net.WebHeaderCollection.dll:0:0:0:0 | System.Net.WebHeaderCollection, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Net.WebProxy.dll:0:0:0:0 | System.Net.WebProxy, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Net.WebSockets.Client.dll:0:0:0:0 | System.Net.WebSockets.Client, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Net.WebSockets.dll:0:0:0:0 | System.Net.WebSockets, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.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/8.0.1/ref/net8.0/System.Numerics.Vectors.dll:0:0:0:0 | System.Numerics.Vectors, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.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/8.0.1/ref/net8.0/System.ObjectModel.dll:0:0:0:0 | System.ObjectModel, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Reflection.DispatchProxy.dll:0:0:0:0 | System.Reflection.DispatchProxy, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Reflection.Emit.ILGeneration.dll:0:0:0:0 | System.Reflection.Emit.ILGeneration, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Reflection.Emit.Lightweight.dll:0:0:0:0 | System.Reflection.Emit.Lightweight, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Reflection.Emit.dll:0:0:0:0 | System.Reflection.Emit, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Reflection.Extensions.dll:0:0:0:0 | System.Reflection.Extensions, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Reflection.Metadata.dll:0:0:0:0 | System.Reflection.Metadata, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Reflection.Primitives.dll:0:0:0:0 | System.Reflection.Primitives, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Reflection.TypeExtensions.dll:0:0:0:0 | System.Reflection.TypeExtensions, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Reflection.dll:0:0:0:0 | System.Reflection, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Resources.Reader.dll:0:0:0:0 | System.Resources.Reader, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Resources.ResourceManager.dll:0:0:0:0 | System.Resources.ResourceManager, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Resources.Writer.dll:0:0:0:0 | System.Resources.Writer, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Runtime.CompilerServices.Unsafe.dll:0:0:0:0 | System.Runtime.CompilerServices.Unsafe, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Runtime.CompilerServices.VisualC.dll:0:0:0:0 | System.Runtime.CompilerServices.VisualC, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Runtime.Extensions.dll:0:0:0:0 | System.Runtime.Extensions, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Runtime.Handles.dll:0:0:0:0 | System.Runtime.Handles, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Runtime.InteropServices.JavaScript.dll:0:0:0:0 | System.Runtime.InteropServices.JavaScript, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Runtime.InteropServices.RuntimeInformation.dll:0:0:0:0 | System.Runtime.InteropServices.RuntimeInformation, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Runtime.InteropServices.dll:0:0:0:0 | System.Runtime.InteropServices, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Runtime.Intrinsics.dll:0:0:0:0 | System.Runtime.Intrinsics, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Runtime.Loader.dll:0:0:0:0 | System.Runtime.Loader, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Runtime.Numerics.dll:0:0:0:0 | System.Runtime.Numerics, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Runtime.Serialization.Formatters.dll:0:0:0:0 | System.Runtime.Serialization.Formatters, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Runtime.Serialization.Json.dll:0:0:0:0 | System.Runtime.Serialization.Json, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Runtime.Serialization.Primitives.dll:0:0:0:0 | System.Runtime.Serialization.Primitives, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Runtime.Serialization.Xml.dll:0:0:0:0 | System.Runtime.Serialization.Xml, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.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/8.0.1/ref/net8.0/System.Runtime.dll:0:0:0:0 | System.Runtime, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Security.AccessControl.dll:0:0:0:0 | System.Security.AccessControl, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Security.Claims.dll:0:0:0:0 | System.Security.Claims, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Security.Cryptography.Algorithms.dll:0:0:0:0 | System.Security.Cryptography.Algorithms, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Security.Cryptography.Cng.dll:0:0:0:0 | System.Security.Cryptography.Cng, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Security.Cryptography.Csp.dll:0:0:0:0 | System.Security.Cryptography.Csp, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Security.Cryptography.Encoding.dll:0:0:0:0 | System.Security.Cryptography.Encoding, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Security.Cryptography.OpenSsl.dll:0:0:0:0 | System.Security.Cryptography.OpenSsl, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Security.Cryptography.Primitives.dll:0:0:0:0 | System.Security.Cryptography.Primitives, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Security.Cryptography.X509Certificates.dll:0:0:0:0 | System.Security.Cryptography.X509Certificates, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Security.Cryptography.dll:0:0:0:0 | System.Security.Cryptography, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Security.Principal.Windows.dll:0:0:0:0 | System.Security.Principal.Windows, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Security.Principal.dll:0:0:0:0 | System.Security.Principal, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Security.SecureString.dll:0:0:0:0 | System.Security.SecureString, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.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/8.0.1/ref/net8.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/8.0.1/ref/net8.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/8.0.1/ref/net8.0/System.Text.Encoding.CodePages.dll:0:0:0:0 | System.Text.Encoding.CodePages, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Text.Encoding.Extensions.dll:0:0:0:0 | System.Text.Encoding.Extensions, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Text.Encoding.dll:0:0:0:0 | System.Text.Encoding, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Text.Encodings.Web.dll:0:0:0:0 | System.Text.Encodings.Web, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Text.Json.dll:0:0:0:0 | System.Text.Json, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Text.RegularExpressions.dll:0:0:0:0 | System.Text.RegularExpressions, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Threading.Channels.dll:0:0:0:0 | System.Threading.Channels, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Threading.Overlapped.dll:0:0:0:0 | System.Threading.Overlapped, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Threading.Tasks.Dataflow.dll:0:0:0:0 | System.Threading.Tasks.Dataflow, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Threading.Tasks.Extensions.dll:0:0:0:0 | System.Threading.Tasks.Extensions, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Threading.Tasks.Parallel.dll:0:0:0:0 | System.Threading.Tasks.Parallel, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Threading.Tasks.dll:0:0:0:0 | System.Threading.Tasks, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Threading.Thread.dll:0:0:0:0 | System.Threading.Thread, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Threading.ThreadPool.dll:0:0:0:0 | System.Threading.ThreadPool, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Threading.Timer.dll:0:0:0:0 | System.Threading.Timer, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Threading.dll:0:0:0:0 | System.Threading, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Transactions.Local.dll:0:0:0:0 | System.Transactions.Local, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.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/8.0.1/ref/net8.0/System.ValueTuple.dll:0:0:0:0 | System.ValueTuple, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Web.HttpUtility.dll:0:0:0:0 | System.Web.HttpUtility, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.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/8.0.1/ref/net8.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/8.0.1/ref/net8.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/8.0.1/ref/net8.0/System.Xml.ReaderWriter.dll:0:0:0:0 | System.Xml.ReaderWriter, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.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/8.0.1/ref/net8.0/System.Xml.XDocument.dll:0:0:0:0 | System.Xml.XDocument, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Xml.XPath.XDocument.dll:0:0:0:0 | System.Xml.XPath.XDocument, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Xml.XPath.dll:0:0:0:0 | System.Xml.XPath, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Xml.XmlDocument.dll:0:0:0:0 | System.Xml.XmlDocument, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Xml.XmlSerializer.dll:0:0:0:0 | System.Xml.XmlSerializer, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.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/8.0.1/ref/net8.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/8.0.1/ref/net8.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/8.0.1/ref/net8.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/8.0.1/ref/net8.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/9.0.0/ref/net9.0/Microsoft.CSharp.dll:0:0:0:0 | Microsoft.CSharp, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/Microsoft.VisualBasic.Core.dll:0:0:0:0 | Microsoft.VisualBasic.Core, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.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/9.0.0/ref/net9.0/Microsoft.Win32.Primitives.dll:0:0:0:0 | Microsoft.Win32.Primitives, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/Microsoft.Win32.Registry.dll:0:0:0:0 | Microsoft.Win32.Registry, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.AppContext.dll:0:0:0:0 | System.AppContext, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Buffers.dll:0:0:0:0 | System.Buffers, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Collections.Concurrent.dll:0:0:0:0 | System.Collections.Concurrent, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Collections.Immutable.dll:0:0:0:0 | System.Collections.Immutable, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Collections.NonGeneric.dll:0:0:0:0 | System.Collections.NonGeneric, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Collections.Specialized.dll:0:0:0:0 | System.Collections.Specialized, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Collections.dll:0:0:0:0 | System.Collections, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.ComponentModel.Annotations.dll:0:0:0:0 | System.ComponentModel.Annotations, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.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/9.0.0/ref/net9.0/System.ComponentModel.EventBasedAsync.dll:0:0:0:0 | System.ComponentModel.EventBasedAsync, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.ComponentModel.Primitives.dll:0:0:0:0 | System.ComponentModel.Primitives, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.ComponentModel.TypeConverter.dll:0:0:0:0 | System.ComponentModel.TypeConverter, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.ComponentModel.dll:0:0:0:0 | System.ComponentModel, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.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/9.0.0/ref/net9.0/System.Console.dll:0:0:0:0 | System.Console, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.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/9.0.0/ref/net9.0/System.Data.Common.dll:0:0:0:0 | System.Data.Common, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Data.DataSetExtensions.dll:0:0:0:0 | System.Data.DataSetExtensions, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.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/9.0.0/ref/net9.0/System.Diagnostics.Contracts.dll:0:0:0:0 | System.Diagnostics.Contracts, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Diagnostics.Debug.dll:0:0:0:0 | System.Diagnostics.Debug, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Diagnostics.DiagnosticSource.dll:0:0:0:0 | System.Diagnostics.DiagnosticSource, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Diagnostics.FileVersionInfo.dll:0:0:0:0 | System.Diagnostics.FileVersionInfo, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Diagnostics.Process.dll:0:0:0:0 | System.Diagnostics.Process, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Diagnostics.StackTrace.dll:0:0:0:0 | System.Diagnostics.StackTrace, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Diagnostics.TextWriterTraceListener.dll:0:0:0:0 | System.Diagnostics.TextWriterTraceListener, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Diagnostics.Tools.dll:0:0:0:0 | System.Diagnostics.Tools, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Diagnostics.TraceSource.dll:0:0:0:0 | System.Diagnostics.TraceSource, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Diagnostics.Tracing.dll:0:0:0:0 | System.Diagnostics.Tracing, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Drawing.Primitives.dll:0:0:0:0 | System.Drawing.Primitives, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.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/9.0.0/ref/net9.0/System.Dynamic.Runtime.dll:0:0:0:0 | System.Dynamic.Runtime, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Formats.Asn1.dll:0:0:0:0 | System.Formats.Asn1, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Formats.Tar.dll:0:0:0:0 | System.Formats.Tar, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Globalization.Calendars.dll:0:0:0:0 | System.Globalization.Calendars, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Globalization.Extensions.dll:0:0:0:0 | System.Globalization.Extensions, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Globalization.dll:0:0:0:0 | System.Globalization, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.IO.Compression.Brotli.dll:0:0:0:0 | System.IO.Compression.Brotli, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.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/9.0.0/ref/net9.0/System.IO.Compression.ZipFile.dll:0:0:0:0 | System.IO.Compression.ZipFile, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.IO.Compression.dll:0:0:0:0 | System.IO.Compression, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.IO.FileSystem.AccessControl.dll:0:0:0:0 | System.IO.FileSystem.AccessControl, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.IO.FileSystem.DriveInfo.dll:0:0:0:0 | System.IO.FileSystem.DriveInfo, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.IO.FileSystem.Primitives.dll:0:0:0:0 | System.IO.FileSystem.Primitives, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.IO.FileSystem.Watcher.dll:0:0:0:0 | System.IO.FileSystem.Watcher, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.IO.FileSystem.dll:0:0:0:0 | System.IO.FileSystem, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.IO.IsolatedStorage.dll:0:0:0:0 | System.IO.IsolatedStorage, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.IO.MemoryMappedFiles.dll:0:0:0:0 | System.IO.MemoryMappedFiles, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.IO.Pipelines.dll:0:0:0:0 | System.IO.Pipelines, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.IO.Pipes.AccessControl.dll:0:0:0:0 | System.IO.Pipes.AccessControl, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.IO.Pipes.dll:0:0:0:0 | System.IO.Pipes, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.IO.UnmanagedMemoryStream.dll:0:0:0:0 | System.IO.UnmanagedMemoryStream, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.IO.dll:0:0:0:0 | System.IO, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Linq.Expressions.dll:0:0:0:0 | System.Linq.Expressions, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Linq.Parallel.dll:0:0:0:0 | System.Linq.Parallel, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Linq.Queryable.dll:0:0:0:0 | System.Linq.Queryable, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Linq.dll:0:0:0:0 | System.Linq, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Memory.dll:0:0:0:0 | System.Memory, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Net.Http.Json.dll:0:0:0:0 | System.Net.Http.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Net.Http.dll:0:0:0:0 | System.Net.Http, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Net.HttpListener.dll:0:0:0:0 | System.Net.HttpListener, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Net.Mail.dll:0:0:0:0 | System.Net.Mail, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Net.NameResolution.dll:0:0:0:0 | System.Net.NameResolution, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Net.NetworkInformation.dll:0:0:0:0 | System.Net.NetworkInformation, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Net.Ping.dll:0:0:0:0 | System.Net.Ping, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Net.Primitives.dll:0:0:0:0 | System.Net.Primitives, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Net.Quic.dll:0:0:0:0 | System.Net.Quic, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Net.Requests.dll:0:0:0:0 | System.Net.Requests, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Net.Security.dll:0:0:0:0 | System.Net.Security, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Net.ServicePoint.dll:0:0:0:0 | System.Net.ServicePoint, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Net.Sockets.dll:0:0:0:0 | System.Net.Sockets, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Net.WebClient.dll:0:0:0:0 | System.Net.WebClient, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Net.WebHeaderCollection.dll:0:0:0:0 | System.Net.WebHeaderCollection, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Net.WebProxy.dll:0:0:0:0 | System.Net.WebProxy, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Net.WebSockets.Client.dll:0:0:0:0 | System.Net.WebSockets.Client, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Net.WebSockets.dll:0:0:0:0 | System.Net.WebSockets, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.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/9.0.0/ref/net9.0/System.Numerics.Vectors.dll:0:0:0:0 | System.Numerics.Vectors, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.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/9.0.0/ref/net9.0/System.ObjectModel.dll:0:0:0:0 | System.ObjectModel, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Reflection.DispatchProxy.dll:0:0:0:0 | System.Reflection.DispatchProxy, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Reflection.Emit.ILGeneration.dll:0:0:0:0 | System.Reflection.Emit.ILGeneration, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Reflection.Emit.Lightweight.dll:0:0:0:0 | System.Reflection.Emit.Lightweight, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Reflection.Emit.dll:0:0:0:0 | System.Reflection.Emit, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Reflection.Extensions.dll:0:0:0:0 | System.Reflection.Extensions, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Reflection.Metadata.dll:0:0:0:0 | System.Reflection.Metadata, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Reflection.Primitives.dll:0:0:0:0 | System.Reflection.Primitives, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Reflection.TypeExtensions.dll:0:0:0:0 | System.Reflection.TypeExtensions, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Reflection.dll:0:0:0:0 | System.Reflection, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Resources.Reader.dll:0:0:0:0 | System.Resources.Reader, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Resources.ResourceManager.dll:0:0:0:0 | System.Resources.ResourceManager, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Resources.Writer.dll:0:0:0:0 | System.Resources.Writer, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Runtime.CompilerServices.Unsafe.dll:0:0:0:0 | System.Runtime.CompilerServices.Unsafe, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Runtime.CompilerServices.VisualC.dll:0:0:0:0 | System.Runtime.CompilerServices.VisualC, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Runtime.Extensions.dll:0:0:0:0 | System.Runtime.Extensions, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Runtime.Handles.dll:0:0:0:0 | System.Runtime.Handles, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Runtime.InteropServices.JavaScript.dll:0:0:0:0 | System.Runtime.InteropServices.JavaScript, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Runtime.InteropServices.RuntimeInformation.dll:0:0:0:0 | System.Runtime.InteropServices.RuntimeInformation, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Runtime.InteropServices.dll:0:0:0:0 | System.Runtime.InteropServices, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Runtime.Intrinsics.dll:0:0:0:0 | System.Runtime.Intrinsics, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Runtime.Loader.dll:0:0:0:0 | System.Runtime.Loader, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Runtime.Numerics.dll:0:0:0:0 | System.Runtime.Numerics, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.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/9.0.0/ref/net9.0/System.Runtime.Serialization.Json.dll:0:0:0:0 | System.Runtime.Serialization.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Runtime.Serialization.Primitives.dll:0:0:0:0 | System.Runtime.Serialization.Primitives, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Runtime.Serialization.Xml.dll:0:0:0:0 | System.Runtime.Serialization.Xml, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.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/9.0.0/ref/net9.0/System.Runtime.dll:0:0:0:0 | System.Runtime, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Security.AccessControl.dll:0:0:0:0 | System.Security.AccessControl, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Security.Claims.dll:0:0:0:0 | System.Security.Claims, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Security.Cryptography.Algorithms.dll:0:0:0:0 | System.Security.Cryptography.Algorithms, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Security.Cryptography.Cng.dll:0:0:0:0 | System.Security.Cryptography.Cng, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Security.Cryptography.Csp.dll:0:0:0:0 | System.Security.Cryptography.Csp, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Security.Cryptography.Encoding.dll:0:0:0:0 | System.Security.Cryptography.Encoding, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Security.Cryptography.OpenSsl.dll:0:0:0:0 | System.Security.Cryptography.OpenSsl, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Security.Cryptography.Primitives.dll:0:0:0:0 | System.Security.Cryptography.Primitives, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Security.Cryptography.X509Certificates.dll:0:0:0:0 | System.Security.Cryptography.X509Certificates, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Security.Cryptography.dll:0:0:0:0 | System.Security.Cryptography, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Security.Principal.Windows.dll:0:0:0:0 | System.Security.Principal.Windows, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Security.Principal.dll:0:0:0:0 | System.Security.Principal, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Security.SecureString.dll:0:0:0:0 | System.Security.SecureString, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.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/9.0.0/ref/net9.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/9.0.0/ref/net9.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/9.0.0/ref/net9.0/System.Text.Encoding.CodePages.dll:0:0:0:0 | System.Text.Encoding.CodePages, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Text.Encoding.Extensions.dll:0:0:0:0 | System.Text.Encoding.Extensions, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Text.Encoding.dll:0:0:0:0 | System.Text.Encoding, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Text.Encodings.Web.dll:0:0:0:0 | System.Text.Encodings.Web, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Text.Json.dll:0:0:0:0 | System.Text.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Text.RegularExpressions.dll:0:0:0:0 | System.Text.RegularExpressions, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Threading.Channels.dll:0:0:0:0 | System.Threading.Channels, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Threading.Overlapped.dll:0:0:0:0 | System.Threading.Overlapped, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Threading.Tasks.Dataflow.dll:0:0:0:0 | System.Threading.Tasks.Dataflow, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Threading.Tasks.Extensions.dll:0:0:0:0 | System.Threading.Tasks.Extensions, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Threading.Tasks.Parallel.dll:0:0:0:0 | System.Threading.Tasks.Parallel, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Threading.Tasks.dll:0:0:0:0 | System.Threading.Tasks, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Threading.Thread.dll:0:0:0:0 | System.Threading.Thread, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Threading.ThreadPool.dll:0:0:0:0 | System.Threading.ThreadPool, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Threading.Timer.dll:0:0:0:0 | System.Threading.Timer, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Threading.dll:0:0:0:0 | System.Threading, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Transactions.Local.dll:0:0:0:0 | System.Transactions.Local, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.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/9.0.0/ref/net9.0/System.ValueTuple.dll:0:0:0:0 | System.ValueTuple, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Web.HttpUtility.dll:0:0:0:0 | System.Web.HttpUtility, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.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/9.0.0/ref/net9.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/9.0.0/ref/net9.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/9.0.0/ref/net9.0/System.Xml.ReaderWriter.dll:0:0:0:0 | System.Xml.ReaderWriter, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.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/9.0.0/ref/net9.0/System.Xml.XDocument.dll:0:0:0:0 | System.Xml.XDocument, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Xml.XPath.XDocument.dll:0:0:0:0 | System.Xml.XPath.XDocument, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Xml.XPath.dll:0:0:0:0 | System.Xml.XPath, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Xml.XmlDocument.dll:0:0:0:0 | System.Xml.XmlDocument, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Xml.XmlSerializer.dll:0:0:0:0 | System.Xml.XmlSerializer, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.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/9.0.0/ref/net9.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/9.0.0/ref/net9.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/9.0.0/ref/net9.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/9.0.0/ref/net9.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 d54915e8d4d..65324522984 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": "8.0.101"
+    "version": "9.0.100"
   }
 }
diff --git a/csharp/ql/integration-tests/posix/standalone_dependencies/standalone.csproj b/csharp/ql/integration-tests/posix/standalone_dependencies/standalone.csproj
index a8f3cc44512..58df1d80a86 100644
--- a/csharp/ql/integration-tests/posix/standalone_dependencies/standalone.csproj
+++ b/csharp/ql/integration-tests/posix/standalone_dependencies/standalone.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFrameworks>net8.0;net6.0;netcoreapp3.1;netstandard2.0;net48</TargetFrameworks>
+    <TargetFrameworks>net9.0;net6.0;netcoreapp3.1;netstandard2.0;net48</TargetFrameworks>
   </PropertyGroup>
 
   <Target Name="DeleteBinObjFolders" BeforeTargets="Clean">
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 d1602665e16..3e9c8fa753b 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,166 +1,167 @@
 | 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/8.0.1/ref/net8.0/Microsoft.CSharp.dll:0:0:0:0 | Microsoft.CSharp, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/Microsoft.VisualBasic.Core.dll:0:0:0:0 | Microsoft.VisualBasic.Core, Version=13.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.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/8.0.1/ref/net8.0/Microsoft.Win32.Primitives.dll:0:0:0:0 | Microsoft.Win32.Primitives, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/Microsoft.Win32.Registry.dll:0:0:0:0 | Microsoft.Win32.Registry, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.AppContext.dll:0:0:0:0 | System.AppContext, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Buffers.dll:0:0:0:0 | System.Buffers, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Collections.Concurrent.dll:0:0:0:0 | System.Collections.Concurrent, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Collections.Immutable.dll:0:0:0:0 | System.Collections.Immutable, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Collections.NonGeneric.dll:0:0:0:0 | System.Collections.NonGeneric, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Collections.Specialized.dll:0:0:0:0 | System.Collections.Specialized, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Collections.dll:0:0:0:0 | System.Collections, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.ComponentModel.Annotations.dll:0:0:0:0 | System.ComponentModel.Annotations, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.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/8.0.1/ref/net8.0/System.ComponentModel.EventBasedAsync.dll:0:0:0:0 | System.ComponentModel.EventBasedAsync, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.ComponentModel.Primitives.dll:0:0:0:0 | System.ComponentModel.Primitives, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.ComponentModel.TypeConverter.dll:0:0:0:0 | System.ComponentModel.TypeConverter, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.ComponentModel.dll:0:0:0:0 | System.ComponentModel, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.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/8.0.1/ref/net8.0/System.Console.dll:0:0:0:0 | System.Console, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.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/8.0.1/ref/net8.0/System.Data.Common.dll:0:0:0:0 | System.Data.Common, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Data.DataSetExtensions.dll:0:0:0:0 | System.Data.DataSetExtensions, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.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/8.0.1/ref/net8.0/System.Diagnostics.Contracts.dll:0:0:0:0 | System.Diagnostics.Contracts, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Diagnostics.Debug.dll:0:0:0:0 | System.Diagnostics.Debug, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Diagnostics.DiagnosticSource.dll:0:0:0:0 | System.Diagnostics.DiagnosticSource, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Diagnostics.FileVersionInfo.dll:0:0:0:0 | System.Diagnostics.FileVersionInfo, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Diagnostics.Process.dll:0:0:0:0 | System.Diagnostics.Process, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Diagnostics.StackTrace.dll:0:0:0:0 | System.Diagnostics.StackTrace, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Diagnostics.TextWriterTraceListener.dll:0:0:0:0 | System.Diagnostics.TextWriterTraceListener, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Diagnostics.Tools.dll:0:0:0:0 | System.Diagnostics.Tools, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Diagnostics.TraceSource.dll:0:0:0:0 | System.Diagnostics.TraceSource, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Diagnostics.Tracing.dll:0:0:0:0 | System.Diagnostics.Tracing, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Drawing.Primitives.dll:0:0:0:0 | System.Drawing.Primitives, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.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/8.0.1/ref/net8.0/System.Dynamic.Runtime.dll:0:0:0:0 | System.Dynamic.Runtime, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Formats.Asn1.dll:0:0:0:0 | System.Formats.Asn1, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Formats.Tar.dll:0:0:0:0 | System.Formats.Tar, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Globalization.Calendars.dll:0:0:0:0 | System.Globalization.Calendars, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Globalization.Extensions.dll:0:0:0:0 | System.Globalization.Extensions, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Globalization.dll:0:0:0:0 | System.Globalization, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.IO.Compression.Brotli.dll:0:0:0:0 | System.IO.Compression.Brotli, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.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/8.0.1/ref/net8.0/System.IO.Compression.ZipFile.dll:0:0:0:0 | System.IO.Compression.ZipFile, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.IO.Compression.dll:0:0:0:0 | System.IO.Compression, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.IO.FileSystem.AccessControl.dll:0:0:0:0 | System.IO.FileSystem.AccessControl, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.IO.FileSystem.DriveInfo.dll:0:0:0:0 | System.IO.FileSystem.DriveInfo, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.IO.FileSystem.Primitives.dll:0:0:0:0 | System.IO.FileSystem.Primitives, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.IO.FileSystem.Watcher.dll:0:0:0:0 | System.IO.FileSystem.Watcher, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.IO.FileSystem.dll:0:0:0:0 | System.IO.FileSystem, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.IO.IsolatedStorage.dll:0:0:0:0 | System.IO.IsolatedStorage, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.IO.MemoryMappedFiles.dll:0:0:0:0 | System.IO.MemoryMappedFiles, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.IO.Pipes.AccessControl.dll:0:0:0:0 | System.IO.Pipes.AccessControl, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.IO.Pipes.dll:0:0:0:0 | System.IO.Pipes, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.IO.UnmanagedMemoryStream.dll:0:0:0:0 | System.IO.UnmanagedMemoryStream, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.IO.dll:0:0:0:0 | System.IO, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Linq.Expressions.dll:0:0:0:0 | System.Linq.Expressions, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Linq.Parallel.dll:0:0:0:0 | System.Linq.Parallel, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Linq.Queryable.dll:0:0:0:0 | System.Linq.Queryable, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Linq.dll:0:0:0:0 | System.Linq, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Memory.dll:0:0:0:0 | System.Memory, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Net.Http.Json.dll:0:0:0:0 | System.Net.Http.Json, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Net.Http.dll:0:0:0:0 | System.Net.Http, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Net.HttpListener.dll:0:0:0:0 | System.Net.HttpListener, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Net.Mail.dll:0:0:0:0 | System.Net.Mail, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Net.NameResolution.dll:0:0:0:0 | System.Net.NameResolution, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Net.NetworkInformation.dll:0:0:0:0 | System.Net.NetworkInformation, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Net.Ping.dll:0:0:0:0 | System.Net.Ping, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Net.Primitives.dll:0:0:0:0 | System.Net.Primitives, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Net.Quic.dll:0:0:0:0 | System.Net.Quic, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Net.Requests.dll:0:0:0:0 | System.Net.Requests, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Net.Security.dll:0:0:0:0 | System.Net.Security, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Net.ServicePoint.dll:0:0:0:0 | System.Net.ServicePoint, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Net.Sockets.dll:0:0:0:0 | System.Net.Sockets, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Net.WebClient.dll:0:0:0:0 | System.Net.WebClient, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Net.WebHeaderCollection.dll:0:0:0:0 | System.Net.WebHeaderCollection, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Net.WebProxy.dll:0:0:0:0 | System.Net.WebProxy, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Net.WebSockets.Client.dll:0:0:0:0 | System.Net.WebSockets.Client, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Net.WebSockets.dll:0:0:0:0 | System.Net.WebSockets, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.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/8.0.1/ref/net8.0/System.Numerics.Vectors.dll:0:0:0:0 | System.Numerics.Vectors, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.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/8.0.1/ref/net8.0/System.ObjectModel.dll:0:0:0:0 | System.ObjectModel, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Reflection.DispatchProxy.dll:0:0:0:0 | System.Reflection.DispatchProxy, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Reflection.Emit.ILGeneration.dll:0:0:0:0 | System.Reflection.Emit.ILGeneration, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Reflection.Emit.Lightweight.dll:0:0:0:0 | System.Reflection.Emit.Lightweight, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Reflection.Emit.dll:0:0:0:0 | System.Reflection.Emit, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Reflection.Extensions.dll:0:0:0:0 | System.Reflection.Extensions, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Reflection.Metadata.dll:0:0:0:0 | System.Reflection.Metadata, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Reflection.Primitives.dll:0:0:0:0 | System.Reflection.Primitives, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Reflection.TypeExtensions.dll:0:0:0:0 | System.Reflection.TypeExtensions, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Reflection.dll:0:0:0:0 | System.Reflection, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Resources.Reader.dll:0:0:0:0 | System.Resources.Reader, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Resources.ResourceManager.dll:0:0:0:0 | System.Resources.ResourceManager, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Resources.Writer.dll:0:0:0:0 | System.Resources.Writer, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Runtime.CompilerServices.Unsafe.dll:0:0:0:0 | System.Runtime.CompilerServices.Unsafe, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Runtime.CompilerServices.VisualC.dll:0:0:0:0 | System.Runtime.CompilerServices.VisualC, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Runtime.Extensions.dll:0:0:0:0 | System.Runtime.Extensions, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Runtime.Handles.dll:0:0:0:0 | System.Runtime.Handles, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Runtime.InteropServices.JavaScript.dll:0:0:0:0 | System.Runtime.InteropServices.JavaScript, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Runtime.InteropServices.RuntimeInformation.dll:0:0:0:0 | System.Runtime.InteropServices.RuntimeInformation, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Runtime.InteropServices.dll:0:0:0:0 | System.Runtime.InteropServices, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Runtime.Intrinsics.dll:0:0:0:0 | System.Runtime.Intrinsics, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Runtime.Loader.dll:0:0:0:0 | System.Runtime.Loader, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Runtime.Numerics.dll:0:0:0:0 | System.Runtime.Numerics, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Runtime.Serialization.Formatters.dll:0:0:0:0 | System.Runtime.Serialization.Formatters, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Runtime.Serialization.Json.dll:0:0:0:0 | System.Runtime.Serialization.Json, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Runtime.Serialization.Primitives.dll:0:0:0:0 | System.Runtime.Serialization.Primitives, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Runtime.Serialization.Xml.dll:0:0:0:0 | System.Runtime.Serialization.Xml, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.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/8.0.1/ref/net8.0/System.Runtime.dll:0:0:0:0 | System.Runtime, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Security.AccessControl.dll:0:0:0:0 | System.Security.AccessControl, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Security.Claims.dll:0:0:0:0 | System.Security.Claims, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Security.Cryptography.Algorithms.dll:0:0:0:0 | System.Security.Cryptography.Algorithms, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Security.Cryptography.Cng.dll:0:0:0:0 | System.Security.Cryptography.Cng, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Security.Cryptography.Csp.dll:0:0:0:0 | System.Security.Cryptography.Csp, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Security.Cryptography.Encoding.dll:0:0:0:0 | System.Security.Cryptography.Encoding, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Security.Cryptography.OpenSsl.dll:0:0:0:0 | System.Security.Cryptography.OpenSsl, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Security.Cryptography.Primitives.dll:0:0:0:0 | System.Security.Cryptography.Primitives, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Security.Cryptography.X509Certificates.dll:0:0:0:0 | System.Security.Cryptography.X509Certificates, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Security.Cryptography.dll:0:0:0:0 | System.Security.Cryptography, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Security.Principal.Windows.dll:0:0:0:0 | System.Security.Principal.Windows, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Security.Principal.dll:0:0:0:0 | System.Security.Principal, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Security.SecureString.dll:0:0:0:0 | System.Security.SecureString, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.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/8.0.1/ref/net8.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/8.0.1/ref/net8.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/8.0.1/ref/net8.0/System.Text.Encoding.CodePages.dll:0:0:0:0 | System.Text.Encoding.CodePages, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Text.Encoding.Extensions.dll:0:0:0:0 | System.Text.Encoding.Extensions, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Text.Encoding.dll:0:0:0:0 | System.Text.Encoding, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Text.Encodings.Web.dll:0:0:0:0 | System.Text.Encodings.Web, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Text.Json.dll:0:0:0:0 | System.Text.Json, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Text.RegularExpressions.dll:0:0:0:0 | System.Text.RegularExpressions, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Threading.Channels.dll:0:0:0:0 | System.Threading.Channels, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Threading.Overlapped.dll:0:0:0:0 | System.Threading.Overlapped, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Threading.Tasks.Dataflow.dll:0:0:0:0 | System.Threading.Tasks.Dataflow, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Threading.Tasks.Extensions.dll:0:0:0:0 | System.Threading.Tasks.Extensions, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Threading.Tasks.Parallel.dll:0:0:0:0 | System.Threading.Tasks.Parallel, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Threading.Tasks.dll:0:0:0:0 | System.Threading.Tasks, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Threading.Thread.dll:0:0:0:0 | System.Threading.Thread, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Threading.ThreadPool.dll:0:0:0:0 | System.Threading.ThreadPool, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Threading.Timer.dll:0:0:0:0 | System.Threading.Timer, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Threading.dll:0:0:0:0 | System.Threading, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Transactions.Local.dll:0:0:0:0 | System.Transactions.Local, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.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/8.0.1/ref/net8.0/System.ValueTuple.dll:0:0:0:0 | System.ValueTuple, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Web.HttpUtility.dll:0:0:0:0 | System.Web.HttpUtility, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.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/8.0.1/ref/net8.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/8.0.1/ref/net8.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/8.0.1/ref/net8.0/System.Xml.ReaderWriter.dll:0:0:0:0 | System.Xml.ReaderWriter, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.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/8.0.1/ref/net8.0/System.Xml.XDocument.dll:0:0:0:0 | System.Xml.XDocument, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Xml.XPath.XDocument.dll:0:0:0:0 | System.Xml.XPath.XDocument, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Xml.XPath.dll:0:0:0:0 | System.Xml.XPath, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Xml.XmlDocument.dll:0:0:0:0 | System.Xml.XmlDocument, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Xml.XmlSerializer.dll:0:0:0:0 | System.Xml.XmlSerializer, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.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/8.0.1/ref/net8.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/8.0.1/ref/net8.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/8.0.1/ref/net8.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/8.0.1/ref/net8.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/9.0.0/ref/net9.0/Microsoft.CSharp.dll:0:0:0:0 | Microsoft.CSharp, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/Microsoft.VisualBasic.Core.dll:0:0:0:0 | Microsoft.VisualBasic.Core, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.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/9.0.0/ref/net9.0/Microsoft.Win32.Primitives.dll:0:0:0:0 | Microsoft.Win32.Primitives, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/Microsoft.Win32.Registry.dll:0:0:0:0 | Microsoft.Win32.Registry, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.AppContext.dll:0:0:0:0 | System.AppContext, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Buffers.dll:0:0:0:0 | System.Buffers, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Collections.Concurrent.dll:0:0:0:0 | System.Collections.Concurrent, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Collections.Immutable.dll:0:0:0:0 | System.Collections.Immutable, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Collections.NonGeneric.dll:0:0:0:0 | System.Collections.NonGeneric, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Collections.Specialized.dll:0:0:0:0 | System.Collections.Specialized, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Collections.dll:0:0:0:0 | System.Collections, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.ComponentModel.Annotations.dll:0:0:0:0 | System.ComponentModel.Annotations, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.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/9.0.0/ref/net9.0/System.ComponentModel.EventBasedAsync.dll:0:0:0:0 | System.ComponentModel.EventBasedAsync, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.ComponentModel.Primitives.dll:0:0:0:0 | System.ComponentModel.Primitives, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.ComponentModel.TypeConverter.dll:0:0:0:0 | System.ComponentModel.TypeConverter, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.ComponentModel.dll:0:0:0:0 | System.ComponentModel, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.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/9.0.0/ref/net9.0/System.Console.dll:0:0:0:0 | System.Console, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.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/9.0.0/ref/net9.0/System.Data.Common.dll:0:0:0:0 | System.Data.Common, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Data.DataSetExtensions.dll:0:0:0:0 | System.Data.DataSetExtensions, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.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/9.0.0/ref/net9.0/System.Diagnostics.Contracts.dll:0:0:0:0 | System.Diagnostics.Contracts, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Diagnostics.Debug.dll:0:0:0:0 | System.Diagnostics.Debug, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Diagnostics.DiagnosticSource.dll:0:0:0:0 | System.Diagnostics.DiagnosticSource, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Diagnostics.FileVersionInfo.dll:0:0:0:0 | System.Diagnostics.FileVersionInfo, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Diagnostics.Process.dll:0:0:0:0 | System.Diagnostics.Process, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Diagnostics.StackTrace.dll:0:0:0:0 | System.Diagnostics.StackTrace, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Diagnostics.TextWriterTraceListener.dll:0:0:0:0 | System.Diagnostics.TextWriterTraceListener, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Diagnostics.Tools.dll:0:0:0:0 | System.Diagnostics.Tools, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Diagnostics.TraceSource.dll:0:0:0:0 | System.Diagnostics.TraceSource, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Diagnostics.Tracing.dll:0:0:0:0 | System.Diagnostics.Tracing, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Drawing.Primitives.dll:0:0:0:0 | System.Drawing.Primitives, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.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/9.0.0/ref/net9.0/System.Dynamic.Runtime.dll:0:0:0:0 | System.Dynamic.Runtime, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Formats.Asn1.dll:0:0:0:0 | System.Formats.Asn1, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Formats.Tar.dll:0:0:0:0 | System.Formats.Tar, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Globalization.Calendars.dll:0:0:0:0 | System.Globalization.Calendars, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Globalization.Extensions.dll:0:0:0:0 | System.Globalization.Extensions, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Globalization.dll:0:0:0:0 | System.Globalization, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.IO.Compression.Brotli.dll:0:0:0:0 | System.IO.Compression.Brotli, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.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/9.0.0/ref/net9.0/System.IO.Compression.ZipFile.dll:0:0:0:0 | System.IO.Compression.ZipFile, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.IO.Compression.dll:0:0:0:0 | System.IO.Compression, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.IO.FileSystem.AccessControl.dll:0:0:0:0 | System.IO.FileSystem.AccessControl, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.IO.FileSystem.DriveInfo.dll:0:0:0:0 | System.IO.FileSystem.DriveInfo, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.IO.FileSystem.Primitives.dll:0:0:0:0 | System.IO.FileSystem.Primitives, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.IO.FileSystem.Watcher.dll:0:0:0:0 | System.IO.FileSystem.Watcher, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.IO.FileSystem.dll:0:0:0:0 | System.IO.FileSystem, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.IO.IsolatedStorage.dll:0:0:0:0 | System.IO.IsolatedStorage, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.IO.MemoryMappedFiles.dll:0:0:0:0 | System.IO.MemoryMappedFiles, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.IO.Pipelines.dll:0:0:0:0 | System.IO.Pipelines, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.IO.Pipes.AccessControl.dll:0:0:0:0 | System.IO.Pipes.AccessControl, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.IO.Pipes.dll:0:0:0:0 | System.IO.Pipes, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.IO.UnmanagedMemoryStream.dll:0:0:0:0 | System.IO.UnmanagedMemoryStream, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.IO.dll:0:0:0:0 | System.IO, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Linq.Expressions.dll:0:0:0:0 | System.Linq.Expressions, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Linq.Parallel.dll:0:0:0:0 | System.Linq.Parallel, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Linq.Queryable.dll:0:0:0:0 | System.Linq.Queryable, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Linq.dll:0:0:0:0 | System.Linq, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Memory.dll:0:0:0:0 | System.Memory, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Net.Http.Json.dll:0:0:0:0 | System.Net.Http.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Net.Http.dll:0:0:0:0 | System.Net.Http, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Net.HttpListener.dll:0:0:0:0 | System.Net.HttpListener, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Net.Mail.dll:0:0:0:0 | System.Net.Mail, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Net.NameResolution.dll:0:0:0:0 | System.Net.NameResolution, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Net.NetworkInformation.dll:0:0:0:0 | System.Net.NetworkInformation, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Net.Ping.dll:0:0:0:0 | System.Net.Ping, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Net.Primitives.dll:0:0:0:0 | System.Net.Primitives, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Net.Quic.dll:0:0:0:0 | System.Net.Quic, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Net.Requests.dll:0:0:0:0 | System.Net.Requests, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Net.Security.dll:0:0:0:0 | System.Net.Security, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Net.ServicePoint.dll:0:0:0:0 | System.Net.ServicePoint, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Net.Sockets.dll:0:0:0:0 | System.Net.Sockets, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Net.WebClient.dll:0:0:0:0 | System.Net.WebClient, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Net.WebHeaderCollection.dll:0:0:0:0 | System.Net.WebHeaderCollection, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Net.WebProxy.dll:0:0:0:0 | System.Net.WebProxy, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Net.WebSockets.Client.dll:0:0:0:0 | System.Net.WebSockets.Client, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Net.WebSockets.dll:0:0:0:0 | System.Net.WebSockets, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.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/9.0.0/ref/net9.0/System.Numerics.Vectors.dll:0:0:0:0 | System.Numerics.Vectors, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.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/9.0.0/ref/net9.0/System.ObjectModel.dll:0:0:0:0 | System.ObjectModel, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Reflection.DispatchProxy.dll:0:0:0:0 | System.Reflection.DispatchProxy, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Reflection.Emit.ILGeneration.dll:0:0:0:0 | System.Reflection.Emit.ILGeneration, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Reflection.Emit.Lightweight.dll:0:0:0:0 | System.Reflection.Emit.Lightweight, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Reflection.Emit.dll:0:0:0:0 | System.Reflection.Emit, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Reflection.Extensions.dll:0:0:0:0 | System.Reflection.Extensions, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Reflection.Metadata.dll:0:0:0:0 | System.Reflection.Metadata, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Reflection.Primitives.dll:0:0:0:0 | System.Reflection.Primitives, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Reflection.TypeExtensions.dll:0:0:0:0 | System.Reflection.TypeExtensions, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Reflection.dll:0:0:0:0 | System.Reflection, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Resources.Reader.dll:0:0:0:0 | System.Resources.Reader, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Resources.ResourceManager.dll:0:0:0:0 | System.Resources.ResourceManager, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Resources.Writer.dll:0:0:0:0 | System.Resources.Writer, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Runtime.CompilerServices.Unsafe.dll:0:0:0:0 | System.Runtime.CompilerServices.Unsafe, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Runtime.CompilerServices.VisualC.dll:0:0:0:0 | System.Runtime.CompilerServices.VisualC, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Runtime.Extensions.dll:0:0:0:0 | System.Runtime.Extensions, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Runtime.Handles.dll:0:0:0:0 | System.Runtime.Handles, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Runtime.InteropServices.JavaScript.dll:0:0:0:0 | System.Runtime.InteropServices.JavaScript, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Runtime.InteropServices.RuntimeInformation.dll:0:0:0:0 | System.Runtime.InteropServices.RuntimeInformation, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Runtime.InteropServices.dll:0:0:0:0 | System.Runtime.InteropServices, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Runtime.Intrinsics.dll:0:0:0:0 | System.Runtime.Intrinsics, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Runtime.Loader.dll:0:0:0:0 | System.Runtime.Loader, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Runtime.Numerics.dll:0:0:0:0 | System.Runtime.Numerics, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.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/9.0.0/ref/net9.0/System.Runtime.Serialization.Json.dll:0:0:0:0 | System.Runtime.Serialization.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Runtime.Serialization.Primitives.dll:0:0:0:0 | System.Runtime.Serialization.Primitives, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Runtime.Serialization.Xml.dll:0:0:0:0 | System.Runtime.Serialization.Xml, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.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/9.0.0/ref/net9.0/System.Runtime.dll:0:0:0:0 | System.Runtime, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Security.AccessControl.dll:0:0:0:0 | System.Security.AccessControl, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Security.Claims.dll:0:0:0:0 | System.Security.Claims, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Security.Cryptography.Algorithms.dll:0:0:0:0 | System.Security.Cryptography.Algorithms, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Security.Cryptography.Cng.dll:0:0:0:0 | System.Security.Cryptography.Cng, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Security.Cryptography.Csp.dll:0:0:0:0 | System.Security.Cryptography.Csp, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Security.Cryptography.Encoding.dll:0:0:0:0 | System.Security.Cryptography.Encoding, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Security.Cryptography.OpenSsl.dll:0:0:0:0 | System.Security.Cryptography.OpenSsl, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Security.Cryptography.Primitives.dll:0:0:0:0 | System.Security.Cryptography.Primitives, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Security.Cryptography.X509Certificates.dll:0:0:0:0 | System.Security.Cryptography.X509Certificates, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Security.Cryptography.dll:0:0:0:0 | System.Security.Cryptography, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Security.Principal.Windows.dll:0:0:0:0 | System.Security.Principal.Windows, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Security.Principal.dll:0:0:0:0 | System.Security.Principal, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Security.SecureString.dll:0:0:0:0 | System.Security.SecureString, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.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/9.0.0/ref/net9.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/9.0.0/ref/net9.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/9.0.0/ref/net9.0/System.Text.Encoding.CodePages.dll:0:0:0:0 | System.Text.Encoding.CodePages, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Text.Encoding.Extensions.dll:0:0:0:0 | System.Text.Encoding.Extensions, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Text.Encoding.dll:0:0:0:0 | System.Text.Encoding, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Text.Encodings.Web.dll:0:0:0:0 | System.Text.Encodings.Web, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Text.Json.dll:0:0:0:0 | System.Text.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Text.RegularExpressions.dll:0:0:0:0 | System.Text.RegularExpressions, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Threading.Channels.dll:0:0:0:0 | System.Threading.Channels, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Threading.Overlapped.dll:0:0:0:0 | System.Threading.Overlapped, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Threading.Tasks.Dataflow.dll:0:0:0:0 | System.Threading.Tasks.Dataflow, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Threading.Tasks.Extensions.dll:0:0:0:0 | System.Threading.Tasks.Extensions, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Threading.Tasks.Parallel.dll:0:0:0:0 | System.Threading.Tasks.Parallel, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Threading.Tasks.dll:0:0:0:0 | System.Threading.Tasks, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Threading.Thread.dll:0:0:0:0 | System.Threading.Thread, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Threading.ThreadPool.dll:0:0:0:0 | System.Threading.ThreadPool, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Threading.Timer.dll:0:0:0:0 | System.Threading.Timer, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Threading.dll:0:0:0:0 | System.Threading, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Transactions.Local.dll:0:0:0:0 | System.Transactions.Local, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.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/9.0.0/ref/net9.0/System.ValueTuple.dll:0:0:0:0 | System.ValueTuple, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Web.HttpUtility.dll:0:0:0:0 | System.Web.HttpUtility, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.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/9.0.0/ref/net9.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/9.0.0/ref/net9.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/9.0.0/ref/net9.0/System.Xml.ReaderWriter.dll:0:0:0:0 | System.Xml.ReaderWriter, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.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/9.0.0/ref/net9.0/System.Xml.XDocument.dll:0:0:0:0 | System.Xml.XDocument, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Xml.XPath.XDocument.dll:0:0:0:0 | System.Xml.XPath.XDocument, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Xml.XPath.dll:0:0:0:0 | System.Xml.XPath, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Xml.XmlDocument.dll:0:0:0:0 | System.Xml.XmlDocument, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Xml.XmlSerializer.dll:0:0:0:0 | System.Xml.XmlSerializer, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.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/9.0.0/ref/net9.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/9.0.0/ref/net9.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/9.0.0/ref/net9.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/9.0.0/ref/net9.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 d54915e8d4d..65324522984 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": "8.0.101"
+    "version": "9.0.100"
   }
 }
diff --git a/csharp/ql/integration-tests/posix/standalone_dependencies_multi_project/standalone1.csproj b/csharp/ql/integration-tests/posix/standalone_dependencies_multi_project/standalone1.csproj
index 67d37d1a760..45639c4ecd2 100644
--- a/csharp/ql/integration-tests/posix/standalone_dependencies_multi_project/standalone1.csproj
+++ b/csharp/ql/integration-tests/posix/standalone_dependencies_multi_project/standalone1.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFrameworks>net8.0</TargetFrameworks>
+    <TargetFrameworks>net9.0</TargetFrameworks>
   </PropertyGroup>
 
   <Target Name="DeleteBinObjFolders" BeforeTargets="Clean">
diff --git a/csharp/ql/integration-tests/posix/standalone_dependencies_multi_project/standalone2.csproj b/csharp/ql/integration-tests/posix/standalone_dependencies_multi_project/standalone2.csproj
index 05fb5c1aa48..40d116df47f 100644
--- a/csharp/ql/integration-tests/posix/standalone_dependencies_multi_project/standalone2.csproj
+++ b/csharp/ql/integration-tests/posix/standalone_dependencies_multi_project/standalone2.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFrameworks>net8.0</TargetFrameworks>
+    <TargetFrameworks>net9.0</TargetFrameworks>
   </PropertyGroup>
 
   <Target Name="DeleteBinObjFolders" BeforeTargets="Clean">
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 74544f88e71..eb5ca93485b 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,163 +1,164 @@
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/Microsoft.CSharp.dll:0:0:0:0 | Microsoft.CSharp, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/Microsoft.VisualBasic.Core.dll:0:0:0:0 | Microsoft.VisualBasic.Core, Version=13.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.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/8.0.1/ref/net8.0/Microsoft.Win32.Primitives.dll:0:0:0:0 | Microsoft.Win32.Primitives, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/Microsoft.Win32.Registry.dll:0:0:0:0 | Microsoft.Win32.Registry, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.AppContext.dll:0:0:0:0 | System.AppContext, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Buffers.dll:0:0:0:0 | System.Buffers, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Collections.Concurrent.dll:0:0:0:0 | System.Collections.Concurrent, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Collections.Immutable.dll:0:0:0:0 | System.Collections.Immutable, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Collections.NonGeneric.dll:0:0:0:0 | System.Collections.NonGeneric, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Collections.Specialized.dll:0:0:0:0 | System.Collections.Specialized, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Collections.dll:0:0:0:0 | System.Collections, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.ComponentModel.Annotations.dll:0:0:0:0 | System.ComponentModel.Annotations, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.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/8.0.1/ref/net8.0/System.ComponentModel.EventBasedAsync.dll:0:0:0:0 | System.ComponentModel.EventBasedAsync, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.ComponentModel.Primitives.dll:0:0:0:0 | System.ComponentModel.Primitives, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.ComponentModel.TypeConverter.dll:0:0:0:0 | System.ComponentModel.TypeConverter, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.ComponentModel.dll:0:0:0:0 | System.ComponentModel, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.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/8.0.1/ref/net8.0/System.Console.dll:0:0:0:0 | System.Console, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.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/8.0.1/ref/net8.0/System.Data.Common.dll:0:0:0:0 | System.Data.Common, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Data.DataSetExtensions.dll:0:0:0:0 | System.Data.DataSetExtensions, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.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/8.0.1/ref/net8.0/System.Diagnostics.Contracts.dll:0:0:0:0 | System.Diagnostics.Contracts, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Diagnostics.Debug.dll:0:0:0:0 | System.Diagnostics.Debug, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Diagnostics.DiagnosticSource.dll:0:0:0:0 | System.Diagnostics.DiagnosticSource, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Diagnostics.FileVersionInfo.dll:0:0:0:0 | System.Diagnostics.FileVersionInfo, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Diagnostics.Process.dll:0:0:0:0 | System.Diagnostics.Process, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Diagnostics.StackTrace.dll:0:0:0:0 | System.Diagnostics.StackTrace, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Diagnostics.TextWriterTraceListener.dll:0:0:0:0 | System.Diagnostics.TextWriterTraceListener, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Diagnostics.Tools.dll:0:0:0:0 | System.Diagnostics.Tools, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Diagnostics.TraceSource.dll:0:0:0:0 | System.Diagnostics.TraceSource, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Diagnostics.Tracing.dll:0:0:0:0 | System.Diagnostics.Tracing, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Drawing.Primitives.dll:0:0:0:0 | System.Drawing.Primitives, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.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/8.0.1/ref/net8.0/System.Dynamic.Runtime.dll:0:0:0:0 | System.Dynamic.Runtime, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Formats.Asn1.dll:0:0:0:0 | System.Formats.Asn1, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Formats.Tar.dll:0:0:0:0 | System.Formats.Tar, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Globalization.Calendars.dll:0:0:0:0 | System.Globalization.Calendars, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Globalization.Extensions.dll:0:0:0:0 | System.Globalization.Extensions, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Globalization.dll:0:0:0:0 | System.Globalization, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.IO.Compression.Brotli.dll:0:0:0:0 | System.IO.Compression.Brotli, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.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/8.0.1/ref/net8.0/System.IO.Compression.ZipFile.dll:0:0:0:0 | System.IO.Compression.ZipFile, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.IO.Compression.dll:0:0:0:0 | System.IO.Compression, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.IO.FileSystem.AccessControl.dll:0:0:0:0 | System.IO.FileSystem.AccessControl, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.IO.FileSystem.DriveInfo.dll:0:0:0:0 | System.IO.FileSystem.DriveInfo, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.IO.FileSystem.Primitives.dll:0:0:0:0 | System.IO.FileSystem.Primitives, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.IO.FileSystem.Watcher.dll:0:0:0:0 | System.IO.FileSystem.Watcher, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.IO.FileSystem.dll:0:0:0:0 | System.IO.FileSystem, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.IO.IsolatedStorage.dll:0:0:0:0 | System.IO.IsolatedStorage, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.IO.MemoryMappedFiles.dll:0:0:0:0 | System.IO.MemoryMappedFiles, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.IO.Pipes.AccessControl.dll:0:0:0:0 | System.IO.Pipes.AccessControl, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.IO.Pipes.dll:0:0:0:0 | System.IO.Pipes, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.IO.UnmanagedMemoryStream.dll:0:0:0:0 | System.IO.UnmanagedMemoryStream, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.IO.dll:0:0:0:0 | System.IO, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Linq.Expressions.dll:0:0:0:0 | System.Linq.Expressions, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Linq.Parallel.dll:0:0:0:0 | System.Linq.Parallel, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Linq.Queryable.dll:0:0:0:0 | System.Linq.Queryable, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Linq.dll:0:0:0:0 | System.Linq, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Memory.dll:0:0:0:0 | System.Memory, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Net.Http.Json.dll:0:0:0:0 | System.Net.Http.Json, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Net.Http.dll:0:0:0:0 | System.Net.Http, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Net.HttpListener.dll:0:0:0:0 | System.Net.HttpListener, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Net.Mail.dll:0:0:0:0 | System.Net.Mail, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Net.NameResolution.dll:0:0:0:0 | System.Net.NameResolution, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Net.NetworkInformation.dll:0:0:0:0 | System.Net.NetworkInformation, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Net.Ping.dll:0:0:0:0 | System.Net.Ping, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Net.Primitives.dll:0:0:0:0 | System.Net.Primitives, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Net.Quic.dll:0:0:0:0 | System.Net.Quic, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Net.Requests.dll:0:0:0:0 | System.Net.Requests, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Net.Security.dll:0:0:0:0 | System.Net.Security, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Net.ServicePoint.dll:0:0:0:0 | System.Net.ServicePoint, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Net.Sockets.dll:0:0:0:0 | System.Net.Sockets, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Net.WebClient.dll:0:0:0:0 | System.Net.WebClient, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Net.WebHeaderCollection.dll:0:0:0:0 | System.Net.WebHeaderCollection, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Net.WebProxy.dll:0:0:0:0 | System.Net.WebProxy, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Net.WebSockets.Client.dll:0:0:0:0 | System.Net.WebSockets.Client, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Net.WebSockets.dll:0:0:0:0 | System.Net.WebSockets, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.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/8.0.1/ref/net8.0/System.Numerics.Vectors.dll:0:0:0:0 | System.Numerics.Vectors, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.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/8.0.1/ref/net8.0/System.ObjectModel.dll:0:0:0:0 | System.ObjectModel, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Reflection.DispatchProxy.dll:0:0:0:0 | System.Reflection.DispatchProxy, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Reflection.Emit.ILGeneration.dll:0:0:0:0 | System.Reflection.Emit.ILGeneration, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Reflection.Emit.Lightweight.dll:0:0:0:0 | System.Reflection.Emit.Lightweight, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Reflection.Emit.dll:0:0:0:0 | System.Reflection.Emit, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Reflection.Extensions.dll:0:0:0:0 | System.Reflection.Extensions, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Reflection.Metadata.dll:0:0:0:0 | System.Reflection.Metadata, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Reflection.Primitives.dll:0:0:0:0 | System.Reflection.Primitives, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Reflection.TypeExtensions.dll:0:0:0:0 | System.Reflection.TypeExtensions, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Reflection.dll:0:0:0:0 | System.Reflection, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Resources.Reader.dll:0:0:0:0 | System.Resources.Reader, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Resources.ResourceManager.dll:0:0:0:0 | System.Resources.ResourceManager, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Resources.Writer.dll:0:0:0:0 | System.Resources.Writer, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Runtime.CompilerServices.Unsafe.dll:0:0:0:0 | System.Runtime.CompilerServices.Unsafe, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Runtime.CompilerServices.VisualC.dll:0:0:0:0 | System.Runtime.CompilerServices.VisualC, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Runtime.Extensions.dll:0:0:0:0 | System.Runtime.Extensions, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Runtime.Handles.dll:0:0:0:0 | System.Runtime.Handles, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Runtime.InteropServices.JavaScript.dll:0:0:0:0 | System.Runtime.InteropServices.JavaScript, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Runtime.InteropServices.RuntimeInformation.dll:0:0:0:0 | System.Runtime.InteropServices.RuntimeInformation, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Runtime.InteropServices.dll:0:0:0:0 | System.Runtime.InteropServices, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Runtime.Intrinsics.dll:0:0:0:0 | System.Runtime.Intrinsics, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Runtime.Loader.dll:0:0:0:0 | System.Runtime.Loader, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Runtime.Numerics.dll:0:0:0:0 | System.Runtime.Numerics, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Runtime.Serialization.Formatters.dll:0:0:0:0 | System.Runtime.Serialization.Formatters, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Runtime.Serialization.Json.dll:0:0:0:0 | System.Runtime.Serialization.Json, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Runtime.Serialization.Primitives.dll:0:0:0:0 | System.Runtime.Serialization.Primitives, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Runtime.Serialization.Xml.dll:0:0:0:0 | System.Runtime.Serialization.Xml, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.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/8.0.1/ref/net8.0/System.Runtime.dll:0:0:0:0 | System.Runtime, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Security.AccessControl.dll:0:0:0:0 | System.Security.AccessControl, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Security.Claims.dll:0:0:0:0 | System.Security.Claims, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Security.Cryptography.Algorithms.dll:0:0:0:0 | System.Security.Cryptography.Algorithms, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Security.Cryptography.Cng.dll:0:0:0:0 | System.Security.Cryptography.Cng, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Security.Cryptography.Csp.dll:0:0:0:0 | System.Security.Cryptography.Csp, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Security.Cryptography.Encoding.dll:0:0:0:0 | System.Security.Cryptography.Encoding, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Security.Cryptography.OpenSsl.dll:0:0:0:0 | System.Security.Cryptography.OpenSsl, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Security.Cryptography.Primitives.dll:0:0:0:0 | System.Security.Cryptography.Primitives, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Security.Cryptography.X509Certificates.dll:0:0:0:0 | System.Security.Cryptography.X509Certificates, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Security.Cryptography.dll:0:0:0:0 | System.Security.Cryptography, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Security.Principal.Windows.dll:0:0:0:0 | System.Security.Principal.Windows, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Security.Principal.dll:0:0:0:0 | System.Security.Principal, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Security.SecureString.dll:0:0:0:0 | System.Security.SecureString, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.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/8.0.1/ref/net8.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/8.0.1/ref/net8.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/8.0.1/ref/net8.0/System.Text.Encoding.CodePages.dll:0:0:0:0 | System.Text.Encoding.CodePages, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Text.Encoding.Extensions.dll:0:0:0:0 | System.Text.Encoding.Extensions, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Text.Encoding.dll:0:0:0:0 | System.Text.Encoding, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Text.Encodings.Web.dll:0:0:0:0 | System.Text.Encodings.Web, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Text.Json.dll:0:0:0:0 | System.Text.Json, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Text.RegularExpressions.dll:0:0:0:0 | System.Text.RegularExpressions, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Threading.Channels.dll:0:0:0:0 | System.Threading.Channels, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Threading.Overlapped.dll:0:0:0:0 | System.Threading.Overlapped, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Threading.Tasks.Dataflow.dll:0:0:0:0 | System.Threading.Tasks.Dataflow, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Threading.Tasks.Extensions.dll:0:0:0:0 | System.Threading.Tasks.Extensions, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Threading.Tasks.Parallel.dll:0:0:0:0 | System.Threading.Tasks.Parallel, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Threading.Tasks.dll:0:0:0:0 | System.Threading.Tasks, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Threading.Thread.dll:0:0:0:0 | System.Threading.Thread, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Threading.ThreadPool.dll:0:0:0:0 | System.Threading.ThreadPool, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Threading.Timer.dll:0:0:0:0 | System.Threading.Timer, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Threading.dll:0:0:0:0 | System.Threading, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Transactions.Local.dll:0:0:0:0 | System.Transactions.Local, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.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/8.0.1/ref/net8.0/System.ValueTuple.dll:0:0:0:0 | System.ValueTuple, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Web.HttpUtility.dll:0:0:0:0 | System.Web.HttpUtility, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.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/8.0.1/ref/net8.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/8.0.1/ref/net8.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/8.0.1/ref/net8.0/System.Xml.ReaderWriter.dll:0:0:0:0 | System.Xml.ReaderWriter, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.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/8.0.1/ref/net8.0/System.Xml.XDocument.dll:0:0:0:0 | System.Xml.XDocument, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Xml.XPath.XDocument.dll:0:0:0:0 | System.Xml.XPath.XDocument, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Xml.XPath.dll:0:0:0:0 | System.Xml.XPath, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Xml.XmlDocument.dll:0:0:0:0 | System.Xml.XmlDocument, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Xml.XmlSerializer.dll:0:0:0:0 | System.Xml.XmlSerializer, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.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/8.0.1/ref/net8.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/8.0.1/ref/net8.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/8.0.1/ref/net8.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/8.0.1/ref/net8.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/9.0.0/ref/net9.0/Microsoft.CSharp.dll:0:0:0:0 | Microsoft.CSharp, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/Microsoft.VisualBasic.Core.dll:0:0:0:0 | Microsoft.VisualBasic.Core, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.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/9.0.0/ref/net9.0/Microsoft.Win32.Primitives.dll:0:0:0:0 | Microsoft.Win32.Primitives, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/Microsoft.Win32.Registry.dll:0:0:0:0 | Microsoft.Win32.Registry, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.AppContext.dll:0:0:0:0 | System.AppContext, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Buffers.dll:0:0:0:0 | System.Buffers, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Collections.Concurrent.dll:0:0:0:0 | System.Collections.Concurrent, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Collections.Immutable.dll:0:0:0:0 | System.Collections.Immutable, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Collections.NonGeneric.dll:0:0:0:0 | System.Collections.NonGeneric, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Collections.Specialized.dll:0:0:0:0 | System.Collections.Specialized, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Collections.dll:0:0:0:0 | System.Collections, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.ComponentModel.Annotations.dll:0:0:0:0 | System.ComponentModel.Annotations, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.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/9.0.0/ref/net9.0/System.ComponentModel.EventBasedAsync.dll:0:0:0:0 | System.ComponentModel.EventBasedAsync, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.ComponentModel.Primitives.dll:0:0:0:0 | System.ComponentModel.Primitives, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.ComponentModel.TypeConverter.dll:0:0:0:0 | System.ComponentModel.TypeConverter, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.ComponentModel.dll:0:0:0:0 | System.ComponentModel, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.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/9.0.0/ref/net9.0/System.Console.dll:0:0:0:0 | System.Console, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.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/9.0.0/ref/net9.0/System.Data.Common.dll:0:0:0:0 | System.Data.Common, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Data.DataSetExtensions.dll:0:0:0:0 | System.Data.DataSetExtensions, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.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/9.0.0/ref/net9.0/System.Diagnostics.Contracts.dll:0:0:0:0 | System.Diagnostics.Contracts, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Diagnostics.Debug.dll:0:0:0:0 | System.Diagnostics.Debug, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Diagnostics.DiagnosticSource.dll:0:0:0:0 | System.Diagnostics.DiagnosticSource, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Diagnostics.FileVersionInfo.dll:0:0:0:0 | System.Diagnostics.FileVersionInfo, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Diagnostics.Process.dll:0:0:0:0 | System.Diagnostics.Process, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Diagnostics.StackTrace.dll:0:0:0:0 | System.Diagnostics.StackTrace, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Diagnostics.TextWriterTraceListener.dll:0:0:0:0 | System.Diagnostics.TextWriterTraceListener, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Diagnostics.Tools.dll:0:0:0:0 | System.Diagnostics.Tools, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Diagnostics.TraceSource.dll:0:0:0:0 | System.Diagnostics.TraceSource, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Diagnostics.Tracing.dll:0:0:0:0 | System.Diagnostics.Tracing, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Drawing.Primitives.dll:0:0:0:0 | System.Drawing.Primitives, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.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/9.0.0/ref/net9.0/System.Dynamic.Runtime.dll:0:0:0:0 | System.Dynamic.Runtime, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Formats.Asn1.dll:0:0:0:0 | System.Formats.Asn1, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Formats.Tar.dll:0:0:0:0 | System.Formats.Tar, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Globalization.Calendars.dll:0:0:0:0 | System.Globalization.Calendars, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Globalization.Extensions.dll:0:0:0:0 | System.Globalization.Extensions, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Globalization.dll:0:0:0:0 | System.Globalization, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.IO.Compression.Brotli.dll:0:0:0:0 | System.IO.Compression.Brotli, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.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/9.0.0/ref/net9.0/System.IO.Compression.ZipFile.dll:0:0:0:0 | System.IO.Compression.ZipFile, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.IO.Compression.dll:0:0:0:0 | System.IO.Compression, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.IO.FileSystem.AccessControl.dll:0:0:0:0 | System.IO.FileSystem.AccessControl, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.IO.FileSystem.DriveInfo.dll:0:0:0:0 | System.IO.FileSystem.DriveInfo, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.IO.FileSystem.Primitives.dll:0:0:0:0 | System.IO.FileSystem.Primitives, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.IO.FileSystem.Watcher.dll:0:0:0:0 | System.IO.FileSystem.Watcher, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.IO.FileSystem.dll:0:0:0:0 | System.IO.FileSystem, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.IO.IsolatedStorage.dll:0:0:0:0 | System.IO.IsolatedStorage, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.IO.MemoryMappedFiles.dll:0:0:0:0 | System.IO.MemoryMappedFiles, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.IO.Pipelines.dll:0:0:0:0 | System.IO.Pipelines, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.IO.Pipes.AccessControl.dll:0:0:0:0 | System.IO.Pipes.AccessControl, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.IO.Pipes.dll:0:0:0:0 | System.IO.Pipes, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.IO.UnmanagedMemoryStream.dll:0:0:0:0 | System.IO.UnmanagedMemoryStream, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.IO.dll:0:0:0:0 | System.IO, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Linq.Expressions.dll:0:0:0:0 | System.Linq.Expressions, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Linq.Parallel.dll:0:0:0:0 | System.Linq.Parallel, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Linq.Queryable.dll:0:0:0:0 | System.Linq.Queryable, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Linq.dll:0:0:0:0 | System.Linq, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Memory.dll:0:0:0:0 | System.Memory, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Net.Http.Json.dll:0:0:0:0 | System.Net.Http.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Net.Http.dll:0:0:0:0 | System.Net.Http, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Net.HttpListener.dll:0:0:0:0 | System.Net.HttpListener, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Net.Mail.dll:0:0:0:0 | System.Net.Mail, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Net.NameResolution.dll:0:0:0:0 | System.Net.NameResolution, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Net.NetworkInformation.dll:0:0:0:0 | System.Net.NetworkInformation, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Net.Ping.dll:0:0:0:0 | System.Net.Ping, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Net.Primitives.dll:0:0:0:0 | System.Net.Primitives, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Net.Quic.dll:0:0:0:0 | System.Net.Quic, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Net.Requests.dll:0:0:0:0 | System.Net.Requests, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Net.Security.dll:0:0:0:0 | System.Net.Security, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Net.ServicePoint.dll:0:0:0:0 | System.Net.ServicePoint, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Net.Sockets.dll:0:0:0:0 | System.Net.Sockets, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Net.WebClient.dll:0:0:0:0 | System.Net.WebClient, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Net.WebHeaderCollection.dll:0:0:0:0 | System.Net.WebHeaderCollection, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Net.WebProxy.dll:0:0:0:0 | System.Net.WebProxy, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Net.WebSockets.Client.dll:0:0:0:0 | System.Net.WebSockets.Client, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Net.WebSockets.dll:0:0:0:0 | System.Net.WebSockets, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.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/9.0.0/ref/net9.0/System.Numerics.Vectors.dll:0:0:0:0 | System.Numerics.Vectors, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.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/9.0.0/ref/net9.0/System.ObjectModel.dll:0:0:0:0 | System.ObjectModel, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Reflection.DispatchProxy.dll:0:0:0:0 | System.Reflection.DispatchProxy, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Reflection.Emit.ILGeneration.dll:0:0:0:0 | System.Reflection.Emit.ILGeneration, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Reflection.Emit.Lightweight.dll:0:0:0:0 | System.Reflection.Emit.Lightweight, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Reflection.Emit.dll:0:0:0:0 | System.Reflection.Emit, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Reflection.Extensions.dll:0:0:0:0 | System.Reflection.Extensions, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Reflection.Metadata.dll:0:0:0:0 | System.Reflection.Metadata, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Reflection.Primitives.dll:0:0:0:0 | System.Reflection.Primitives, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Reflection.TypeExtensions.dll:0:0:0:0 | System.Reflection.TypeExtensions, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Reflection.dll:0:0:0:0 | System.Reflection, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Resources.Reader.dll:0:0:0:0 | System.Resources.Reader, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Resources.ResourceManager.dll:0:0:0:0 | System.Resources.ResourceManager, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Resources.Writer.dll:0:0:0:0 | System.Resources.Writer, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Runtime.CompilerServices.Unsafe.dll:0:0:0:0 | System.Runtime.CompilerServices.Unsafe, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Runtime.CompilerServices.VisualC.dll:0:0:0:0 | System.Runtime.CompilerServices.VisualC, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Runtime.Extensions.dll:0:0:0:0 | System.Runtime.Extensions, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Runtime.Handles.dll:0:0:0:0 | System.Runtime.Handles, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Runtime.InteropServices.JavaScript.dll:0:0:0:0 | System.Runtime.InteropServices.JavaScript, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Runtime.InteropServices.RuntimeInformation.dll:0:0:0:0 | System.Runtime.InteropServices.RuntimeInformation, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Runtime.InteropServices.dll:0:0:0:0 | System.Runtime.InteropServices, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Runtime.Intrinsics.dll:0:0:0:0 | System.Runtime.Intrinsics, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Runtime.Loader.dll:0:0:0:0 | System.Runtime.Loader, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Runtime.Numerics.dll:0:0:0:0 | System.Runtime.Numerics, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.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/9.0.0/ref/net9.0/System.Runtime.Serialization.Json.dll:0:0:0:0 | System.Runtime.Serialization.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Runtime.Serialization.Primitives.dll:0:0:0:0 | System.Runtime.Serialization.Primitives, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Runtime.Serialization.Xml.dll:0:0:0:0 | System.Runtime.Serialization.Xml, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.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/9.0.0/ref/net9.0/System.Runtime.dll:0:0:0:0 | System.Runtime, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Security.AccessControl.dll:0:0:0:0 | System.Security.AccessControl, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Security.Claims.dll:0:0:0:0 | System.Security.Claims, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Security.Cryptography.Algorithms.dll:0:0:0:0 | System.Security.Cryptography.Algorithms, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Security.Cryptography.Cng.dll:0:0:0:0 | System.Security.Cryptography.Cng, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Security.Cryptography.Csp.dll:0:0:0:0 | System.Security.Cryptography.Csp, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Security.Cryptography.Encoding.dll:0:0:0:0 | System.Security.Cryptography.Encoding, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Security.Cryptography.OpenSsl.dll:0:0:0:0 | System.Security.Cryptography.OpenSsl, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Security.Cryptography.Primitives.dll:0:0:0:0 | System.Security.Cryptography.Primitives, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Security.Cryptography.X509Certificates.dll:0:0:0:0 | System.Security.Cryptography.X509Certificates, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Security.Cryptography.dll:0:0:0:0 | System.Security.Cryptography, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Security.Principal.Windows.dll:0:0:0:0 | System.Security.Principal.Windows, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Security.Principal.dll:0:0:0:0 | System.Security.Principal, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Security.SecureString.dll:0:0:0:0 | System.Security.SecureString, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.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/9.0.0/ref/net9.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/9.0.0/ref/net9.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/9.0.0/ref/net9.0/System.Text.Encoding.CodePages.dll:0:0:0:0 | System.Text.Encoding.CodePages, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Text.Encoding.Extensions.dll:0:0:0:0 | System.Text.Encoding.Extensions, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Text.Encoding.dll:0:0:0:0 | System.Text.Encoding, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Text.Encodings.Web.dll:0:0:0:0 | System.Text.Encodings.Web, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Text.Json.dll:0:0:0:0 | System.Text.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Text.RegularExpressions.dll:0:0:0:0 | System.Text.RegularExpressions, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Threading.Channels.dll:0:0:0:0 | System.Threading.Channels, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Threading.Overlapped.dll:0:0:0:0 | System.Threading.Overlapped, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Threading.Tasks.Dataflow.dll:0:0:0:0 | System.Threading.Tasks.Dataflow, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Threading.Tasks.Extensions.dll:0:0:0:0 | System.Threading.Tasks.Extensions, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Threading.Tasks.Parallel.dll:0:0:0:0 | System.Threading.Tasks.Parallel, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Threading.Tasks.dll:0:0:0:0 | System.Threading.Tasks, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Threading.Thread.dll:0:0:0:0 | System.Threading.Thread, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Threading.ThreadPool.dll:0:0:0:0 | System.Threading.ThreadPool, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Threading.Timer.dll:0:0:0:0 | System.Threading.Timer, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Threading.dll:0:0:0:0 | System.Threading, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Transactions.Local.dll:0:0:0:0 | System.Transactions.Local, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.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/9.0.0/ref/net9.0/System.ValueTuple.dll:0:0:0:0 | System.ValueTuple, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Web.HttpUtility.dll:0:0:0:0 | System.Web.HttpUtility, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.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/9.0.0/ref/net9.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/9.0.0/ref/net9.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/9.0.0/ref/net9.0/System.Xml.ReaderWriter.dll:0:0:0:0 | System.Xml.ReaderWriter, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.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/9.0.0/ref/net9.0/System.Xml.XDocument.dll:0:0:0:0 | System.Xml.XDocument, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Xml.XPath.XDocument.dll:0:0:0:0 | System.Xml.XPath.XDocument, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Xml.XPath.dll:0:0:0:0 | System.Xml.XPath, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Xml.XmlDocument.dll:0:0:0:0 | System.Xml.XmlDocument, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Xml.XmlSerializer.dll:0:0:0:0 | System.Xml.XmlSerializer, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.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/9.0.0/ref/net9.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/9.0.0/ref/net9.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/9.0.0/ref/net9.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/9.0.0/ref/net9.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 d54915e8d4d..65324522984 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": "8.0.101"
+    "version": "9.0.100"
   }
 }
diff --git a/csharp/ql/integration-tests/posix/standalone_dependencies_multi_target/net70.csproj b/csharp/ql/integration-tests/posix/standalone_dependencies_multi_target/net70.csproj
index 91b464afeac..694035b3acd 100644
--- a/csharp/ql/integration-tests/posix/standalone_dependencies_multi_target/net70.csproj
+++ b/csharp/ql/integration-tests/posix/standalone_dependencies_multi_target/net70.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>
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 5c3fd64fbd1..76474f06d04 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": "8.0.101"
+        "version": "9.0.100"
     }
 }
diff --git a/csharp/ql/integration-tests/posix/standalone_dependencies_no_framework/test_sdk.csproj b/csharp/ql/integration-tests/posix/standalone_dependencies_no_framework/test_sdk.csproj
index 4425f1c1431..3beee773f83 100644
--- a/csharp/ql/integration-tests/posix/standalone_dependencies_no_framework/test_sdk.csproj
+++ b/csharp/ql/integration-tests/posix/standalone_dependencies_no_framework/test_sdk.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
   </PropertyGroup>
 
   <Target Name="DeleteBinObjFolders" BeforeTargets="Clean">
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 5c3fd64fbd1..76474f06d04 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": "8.0.101"
+        "version": "9.0.100"
     }
 }
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 5c3fd64fbd1..76474f06d04 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": "8.0.101"
+        "version": "9.0.100"
     }
 }
diff --git a/csharp/ql/integration-tests/posix/standalone_dependencies_nuget_config_error/proj/proj.csproj b/csharp/ql/integration-tests/posix/standalone_dependencies_nuget_config_error/proj/proj.csproj
index cef71796352..b73f743f95c 100644
--- a/csharp/ql/integration-tests/posix/standalone_dependencies_nuget_config_error/proj/proj.csproj
+++ b/csharp/ql/integration-tests/posix/standalone_dependencies_nuget_config_error/proj/proj.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFrameworks>net8.0</TargetFrameworks>
+    <TargetFrameworks>net9.0</TargetFrameworks>
   </PropertyGroup>
 
   <Target Name="DeleteBinObjFolders" BeforeTargets="Clean">
diff --git a/csharp/ql/integration-tests/posix/standalone_dependencies_nuget_config_error_timeout/proj/proj.csproj b/csharp/ql/integration-tests/posix/standalone_dependencies_nuget_config_error_timeout/proj/proj.csproj
index cef71796352..b73f743f95c 100644
--- a/csharp/ql/integration-tests/posix/standalone_dependencies_nuget_config_error_timeout/proj/proj.csproj
+++ b/csharp/ql/integration-tests/posix/standalone_dependencies_nuget_config_error_timeout/proj/proj.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFrameworks>net8.0</TargetFrameworks>
+    <TargetFrameworks>net9.0</TargetFrameworks>
   </PropertyGroup>
 
   <Target Name="DeleteBinObjFolders" BeforeTargets="Clean">
diff --git a/csharp/ql/integration-tests/posix/standalone_dependencies_nuget_config_fallback/proj/proj.csproj b/csharp/ql/integration-tests/posix/standalone_dependencies_nuget_config_fallback/proj/proj.csproj
index cef71796352..b73f743f95c 100644
--- a/csharp/ql/integration-tests/posix/standalone_dependencies_nuget_config_fallback/proj/proj.csproj
+++ b/csharp/ql/integration-tests/posix/standalone_dependencies_nuget_config_fallback/proj/proj.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFrameworks>net8.0</TargetFrameworks>
+    <TargetFrameworks>net9.0</TargetFrameworks>
   </PropertyGroup>
 
   <Target Name="DeleteBinObjFolders" BeforeTargets="Clean">
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 5c3fd64fbd1..76474f06d04 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": "8.0.101"
+        "version": "9.0.100"
     }
 }
diff --git a/csharp/ql/integration-tests/posix/standalone_dependencies_nuget_versions/d1/test1.csproj b/csharp/ql/integration-tests/posix/standalone_dependencies_nuget_versions/d1/test1.csproj
index 1cce9e65b06..47798ff95a4 100644
--- a/csharp/ql/integration-tests/posix/standalone_dependencies_nuget_versions/d1/test1.csproj
+++ b/csharp/ql/integration-tests/posix/standalone_dependencies_nuget_versions/d1/test1.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFrameworks>net8.0</TargetFrameworks>
+    <TargetFrameworks>net9.0</TargetFrameworks>
   </PropertyGroup>
 
   <Target Name="DeleteBinObjFolders" BeforeTargets="Clean">
diff --git a/csharp/ql/integration-tests/posix/standalone_dependencies_nuget_versions/d2/test2.csproj b/csharp/ql/integration-tests/posix/standalone_dependencies_nuget_versions/d2/test2.csproj
index 94772f7cc04..29604e2cbd8 100644
--- a/csharp/ql/integration-tests/posix/standalone_dependencies_nuget_versions/d2/test2.csproj
+++ b/csharp/ql/integration-tests/posix/standalone_dependencies_nuget_versions/d2/test2.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFrameworks>net8.0</TargetFrameworks>
+    <TargetFrameworks>net9.0</TargetFrameworks>
   </PropertyGroup>
 
   <Target Name="DeleteBinObjFolders" BeforeTargets="Clean">
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 5c3fd64fbd1..76474f06d04 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": "8.0.101"
+        "version": "9.0.100"
     }
 }
diff --git a/csharp/ql/integration-tests/posix/warn_as_error/WarnAsError.csproj b/csharp/ql/integration-tests/posix/warn_as_error/WarnAsError.csproj
index eb001ff56e7..3c234e42302 100644
--- a/csharp/ql/integration-tests/posix/warn_as_error/WarnAsError.csproj
+++ b/csharp/ql/integration-tests/posix/warn_as_error/WarnAsError.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
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 5c3fd64fbd1..76474f06d04 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": "8.0.101"
+        "version": "9.0.100"
     }
 }
diff --git a/csharp/ql/integration-tests/windows/standalone_dependencies/Assemblies.expected b/csharp/ql/integration-tests/windows/standalone_dependencies/Assemblies.expected
index d4d36b1d0e6..a001f7f23d7 100644
--- a/csharp/ql/integration-tests/windows/standalone_dependencies/Assemblies.expected
+++ b/csharp/ql/integration-tests/windows/standalone_dependencies/Assemblies.expected
@@ -1,210 +1,213 @@
 | 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/8.0.1/ref/net8.0/Microsoft.CSharp.dll:0:0:0:0 | Microsoft.CSharp, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/Microsoft.VisualBasic.Core.dll:0:0:0:0 | Microsoft.VisualBasic.Core, Version=13.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/Microsoft.Win32.Primitives.dll:0:0:0:0 | Microsoft.Win32.Primitives, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/Microsoft.Win32.Registry.dll:0:0:0:0 | Microsoft.Win32.Registry, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.AppContext.dll:0:0:0:0 | System.AppContext, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Buffers.dll:0:0:0:0 | System.Buffers, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Collections.Concurrent.dll:0:0:0:0 | System.Collections.Concurrent, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Collections.Immutable.dll:0:0:0:0 | System.Collections.Immutable, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Collections.NonGeneric.dll:0:0:0:0 | System.Collections.NonGeneric, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Collections.Specialized.dll:0:0:0:0 | System.Collections.Specialized, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Collections.dll:0:0:0:0 | System.Collections, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.ComponentModel.Annotations.dll:0:0:0:0 | System.ComponentModel.Annotations, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.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/8.0.1/ref/net8.0/System.ComponentModel.EventBasedAsync.dll:0:0:0:0 | System.ComponentModel.EventBasedAsync, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.ComponentModel.Primitives.dll:0:0:0:0 | System.ComponentModel.Primitives, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.ComponentModel.TypeConverter.dll:0:0:0:0 | System.ComponentModel.TypeConverter, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.ComponentModel.dll:0:0:0:0 | System.ComponentModel, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.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/8.0.1/ref/net8.0/System.Console.dll:0:0:0:0 | System.Console, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.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/8.0.1/ref/net8.0/System.Data.Common.dll:0:0:0:0 | System.Data.Common, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Data.DataSetExtensions.dll:0:0:0:0 | System.Data.DataSetExtensions, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.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/8.0.1/ref/net8.0/System.Diagnostics.Contracts.dll:0:0:0:0 | System.Diagnostics.Contracts, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Diagnostics.Debug.dll:0:0:0:0 | System.Diagnostics.Debug, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Diagnostics.DiagnosticSource.dll:0:0:0:0 | System.Diagnostics.DiagnosticSource, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Diagnostics.FileVersionInfo.dll:0:0:0:0 | System.Diagnostics.FileVersionInfo, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Diagnostics.Process.dll:0:0:0:0 | System.Diagnostics.Process, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Diagnostics.StackTrace.dll:0:0:0:0 | System.Diagnostics.StackTrace, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Diagnostics.TextWriterTraceListener.dll:0:0:0:0 | System.Diagnostics.TextWriterTraceListener, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Diagnostics.Tools.dll:0:0:0:0 | System.Diagnostics.Tools, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Diagnostics.TraceSource.dll:0:0:0:0 | System.Diagnostics.TraceSource, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Diagnostics.Tracing.dll:0:0:0:0 | System.Diagnostics.Tracing, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Drawing.Primitives.dll:0:0:0:0 | System.Drawing.Primitives, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Dynamic.Runtime.dll:0:0:0:0 | System.Dynamic.Runtime, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Formats.Asn1.dll:0:0:0:0 | System.Formats.Asn1, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Formats.Tar.dll:0:0:0:0 | System.Formats.Tar, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Globalization.Calendars.dll:0:0:0:0 | System.Globalization.Calendars, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Globalization.Extensions.dll:0:0:0:0 | System.Globalization.Extensions, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Globalization.dll:0:0:0:0 | System.Globalization, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.IO.Compression.Brotli.dll:0:0:0:0 | System.IO.Compression.Brotli, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.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/8.0.1/ref/net8.0/System.IO.Compression.ZipFile.dll:0:0:0:0 | System.IO.Compression.ZipFile, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.IO.Compression.dll:0:0:0:0 | System.IO.Compression, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.IO.FileSystem.AccessControl.dll:0:0:0:0 | System.IO.FileSystem.AccessControl, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.IO.FileSystem.DriveInfo.dll:0:0:0:0 | System.IO.FileSystem.DriveInfo, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.IO.FileSystem.Primitives.dll:0:0:0:0 | System.IO.FileSystem.Primitives, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.IO.FileSystem.Watcher.dll:0:0:0:0 | System.IO.FileSystem.Watcher, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.IO.FileSystem.dll:0:0:0:0 | System.IO.FileSystem, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.IO.IsolatedStorage.dll:0:0:0:0 | System.IO.IsolatedStorage, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.IO.MemoryMappedFiles.dll:0:0:0:0 | System.IO.MemoryMappedFiles, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.IO.Pipes.AccessControl.dll:0:0:0:0 | System.IO.Pipes.AccessControl, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.IO.Pipes.dll:0:0:0:0 | System.IO.Pipes, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.IO.UnmanagedMemoryStream.dll:0:0:0:0 | System.IO.UnmanagedMemoryStream, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.IO.dll:0:0:0:0 | System.IO, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Linq.Expressions.dll:0:0:0:0 | System.Linq.Expressions, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Linq.Parallel.dll:0:0:0:0 | System.Linq.Parallel, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Linq.Queryable.dll:0:0:0:0 | System.Linq.Queryable, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Linq.dll:0:0:0:0 | System.Linq, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Memory.dll:0:0:0:0 | System.Memory, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Net.Http.Json.dll:0:0:0:0 | System.Net.Http.Json, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Net.Http.dll:0:0:0:0 | System.Net.Http, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Net.HttpListener.dll:0:0:0:0 | System.Net.HttpListener, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Net.Mail.dll:0:0:0:0 | System.Net.Mail, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Net.NameResolution.dll:0:0:0:0 | System.Net.NameResolution, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Net.NetworkInformation.dll:0:0:0:0 | System.Net.NetworkInformation, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Net.Ping.dll:0:0:0:0 | System.Net.Ping, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Net.Primitives.dll:0:0:0:0 | System.Net.Primitives, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Net.Quic.dll:0:0:0:0 | System.Net.Quic, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Net.Requests.dll:0:0:0:0 | System.Net.Requests, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Net.Security.dll:0:0:0:0 | System.Net.Security, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Net.ServicePoint.dll:0:0:0:0 | System.Net.ServicePoint, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Net.Sockets.dll:0:0:0:0 | System.Net.Sockets, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Net.WebClient.dll:0:0:0:0 | System.Net.WebClient, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Net.WebHeaderCollection.dll:0:0:0:0 | System.Net.WebHeaderCollection, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Net.WebProxy.dll:0:0:0:0 | System.Net.WebProxy, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Net.WebSockets.Client.dll:0:0:0:0 | System.Net.WebSockets.Client, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Net.WebSockets.dll:0:0:0:0 | System.Net.WebSockets, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.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/8.0.1/ref/net8.0/System.Numerics.Vectors.dll:0:0:0:0 | System.Numerics.Vectors, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.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/8.0.1/ref/net8.0/System.ObjectModel.dll:0:0:0:0 | System.ObjectModel, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Reflection.DispatchProxy.dll:0:0:0:0 | System.Reflection.DispatchProxy, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Reflection.Emit.ILGeneration.dll:0:0:0:0 | System.Reflection.Emit.ILGeneration, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Reflection.Emit.Lightweight.dll:0:0:0:0 | System.Reflection.Emit.Lightweight, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Reflection.Emit.dll:0:0:0:0 | System.Reflection.Emit, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Reflection.Extensions.dll:0:0:0:0 | System.Reflection.Extensions, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Reflection.Metadata.dll:0:0:0:0 | System.Reflection.Metadata, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Reflection.Primitives.dll:0:0:0:0 | System.Reflection.Primitives, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Reflection.TypeExtensions.dll:0:0:0:0 | System.Reflection.TypeExtensions, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Reflection.dll:0:0:0:0 | System.Reflection, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Resources.Reader.dll:0:0:0:0 | System.Resources.Reader, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Resources.ResourceManager.dll:0:0:0:0 | System.Resources.ResourceManager, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Resources.Writer.dll:0:0:0:0 | System.Resources.Writer, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Runtime.CompilerServices.Unsafe.dll:0:0:0:0 | System.Runtime.CompilerServices.Unsafe, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Runtime.CompilerServices.VisualC.dll:0:0:0:0 | System.Runtime.CompilerServices.VisualC, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Runtime.Extensions.dll:0:0:0:0 | System.Runtime.Extensions, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Runtime.Handles.dll:0:0:0:0 | System.Runtime.Handles, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Runtime.InteropServices.JavaScript.dll:0:0:0:0 | System.Runtime.InteropServices.JavaScript, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Runtime.InteropServices.RuntimeInformation.dll:0:0:0:0 | System.Runtime.InteropServices.RuntimeInformation, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Runtime.InteropServices.dll:0:0:0:0 | System.Runtime.InteropServices, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Runtime.Intrinsics.dll:0:0:0:0 | System.Runtime.Intrinsics, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Runtime.Loader.dll:0:0:0:0 | System.Runtime.Loader, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Runtime.Numerics.dll:0:0:0:0 | System.Runtime.Numerics, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Runtime.Serialization.Formatters.dll:0:0:0:0 | System.Runtime.Serialization.Formatters, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Runtime.Serialization.Json.dll:0:0:0:0 | System.Runtime.Serialization.Json, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Runtime.Serialization.Primitives.dll:0:0:0:0 | System.Runtime.Serialization.Primitives, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Runtime.Serialization.Xml.dll:0:0:0:0 | System.Runtime.Serialization.Xml, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.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/8.0.1/ref/net8.0/System.Runtime.dll:0:0:0:0 | System.Runtime, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Security.AccessControl.dll:0:0:0:0 | System.Security.AccessControl, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Security.Claims.dll:0:0:0:0 | System.Security.Claims, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Security.Cryptography.Algorithms.dll:0:0:0:0 | System.Security.Cryptography.Algorithms, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Security.Cryptography.Cng.dll:0:0:0:0 | System.Security.Cryptography.Cng, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Security.Cryptography.Csp.dll:0:0:0:0 | System.Security.Cryptography.Csp, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Security.Cryptography.Encoding.dll:0:0:0:0 | System.Security.Cryptography.Encoding, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Security.Cryptography.OpenSsl.dll:0:0:0:0 | System.Security.Cryptography.OpenSsl, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Security.Cryptography.Primitives.dll:0:0:0:0 | System.Security.Cryptography.Primitives, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Security.Cryptography.X509Certificates.dll:0:0:0:0 | System.Security.Cryptography.X509Certificates, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Security.Cryptography.dll:0:0:0:0 | System.Security.Cryptography, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Security.Principal.Windows.dll:0:0:0:0 | System.Security.Principal.Windows, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Security.Principal.dll:0:0:0:0 | System.Security.Principal, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Security.SecureString.dll:0:0:0:0 | System.Security.SecureString, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.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/8.0.1/ref/net8.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/8.0.1/ref/net8.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/8.0.1/ref/net8.0/System.Text.Encoding.CodePages.dll:0:0:0:0 | System.Text.Encoding.CodePages, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Text.Encoding.Extensions.dll:0:0:0:0 | System.Text.Encoding.Extensions, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Text.Encoding.dll:0:0:0:0 | System.Text.Encoding, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Text.Encodings.Web.dll:0:0:0:0 | System.Text.Encodings.Web, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Text.Json.dll:0:0:0:0 | System.Text.Json, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Text.RegularExpressions.dll:0:0:0:0 | System.Text.RegularExpressions, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Threading.Channels.dll:0:0:0:0 | System.Threading.Channels, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Threading.Overlapped.dll:0:0:0:0 | System.Threading.Overlapped, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Threading.Tasks.Dataflow.dll:0:0:0:0 | System.Threading.Tasks.Dataflow, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Threading.Tasks.Extensions.dll:0:0:0:0 | System.Threading.Tasks.Extensions, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Threading.Tasks.Parallel.dll:0:0:0:0 | System.Threading.Tasks.Parallel, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Threading.Tasks.dll:0:0:0:0 | System.Threading.Tasks, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Threading.Thread.dll:0:0:0:0 | System.Threading.Thread, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Threading.ThreadPool.dll:0:0:0:0 | System.Threading.ThreadPool, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Threading.Timer.dll:0:0:0:0 | System.Threading.Timer, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Threading.dll:0:0:0:0 | System.Threading, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Transactions.Local.dll:0:0:0:0 | System.Transactions.Local, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.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/8.0.1/ref/net8.0/System.ValueTuple.dll:0:0:0:0 | System.ValueTuple, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Web.HttpUtility.dll:0:0:0:0 | System.Web.HttpUtility, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.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/8.0.1/ref/net8.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/8.0.1/ref/net8.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/8.0.1/ref/net8.0/System.Xml.ReaderWriter.dll:0:0:0:0 | System.Xml.ReaderWriter, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.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/8.0.1/ref/net8.0/System.Xml.XDocument.dll:0:0:0:0 | System.Xml.XDocument, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Xml.XPath.XDocument.dll:0:0:0:0 | System.Xml.XPath.XDocument, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Xml.XPath.dll:0:0:0:0 | System.Xml.XPath, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Xml.XmlDocument.dll:0:0:0:0 | System.Xml.XmlDocument, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.0/System.Xml.XmlSerializer.dll:0:0:0:0 | System.Xml.XmlSerializer, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/8.0.1/ref/net8.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/8.0.1/ref/net8.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/8.0.1/ref/net8.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/8.0.1/ref/net8.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/8.0.1/ref/net8.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/8.0.1/ref/net8.0/Microsoft.VisualBasic.Forms.dll:0:0:0:0 | Microsoft.VisualBasic.Forms, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/8.0.1/ref/net8.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/8.0.1/ref/net8.0/Microsoft.Win32.Registry.AccessControl.dll:0:0:0:0 | Microsoft.Win32.Registry.AccessControl, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/8.0.1/ref/net8.0/Microsoft.Win32.SystemEvents.dll:0:0:0:0 | Microsoft.Win32.SystemEvents, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/8.0.1/ref/net8.0/PresentationCore.dll:0:0:0:0 | PresentationCore, Version=8.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35 |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/8.0.1/ref/net8.0/PresentationFramework.Aero2.dll:0:0:0:0 | PresentationFramework.Aero2, Version=8.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35 |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/8.0.1/ref/net8.0/PresentationFramework.Aero.dll:0:0:0:0 | PresentationFramework.Aero, Version=8.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35 |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/8.0.1/ref/net8.0/PresentationFramework.AeroLite.dll:0:0:0:0 | PresentationFramework.AeroLite, Version=8.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35 |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/8.0.1/ref/net8.0/PresentationFramework.Classic.dll:0:0:0:0 | PresentationFramework.Classic, Version=8.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35 |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/8.0.1/ref/net8.0/PresentationFramework.Luna.dll:0:0:0:0 | PresentationFramework.Luna, Version=8.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35 |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/8.0.1/ref/net8.0/PresentationFramework.Royale.dll:0:0:0:0 | PresentationFramework.Royale, Version=8.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35 |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/8.0.1/ref/net8.0/PresentationFramework.dll:0:0:0:0 | PresentationFramework, Version=8.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35 |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/8.0.1/ref/net8.0/PresentationUI.dll:0:0:0:0 | PresentationUI, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/8.0.1/ref/net8.0/ReachFramework.dll:0:0:0:0 | ReachFramework, Version=8.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35 |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/8.0.1/ref/net8.0/System.CodeDom.dll:0:0:0:0 | System.CodeDom, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/8.0.1/ref/net8.0/System.Configuration.ConfigurationManager.dll:0:0:0:0 | System.Configuration.ConfigurationManager, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/8.0.1/ref/net8.0/System.Design.dll:0:0:0:0 | System.Design, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/8.0.1/ref/net8.0/System.Diagnostics.EventLog.dll:0:0:0:0 | System.Diagnostics.EventLog, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/8.0.1/ref/net8.0/System.Diagnostics.PerformanceCounter.dll:0:0:0:0 | System.Diagnostics.PerformanceCounter, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/8.0.1/ref/net8.0/System.DirectoryServices.dll:0:0:0:0 | System.DirectoryServices, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/8.0.1/ref/net8.0/System.Drawing.Common.dll:0:0:0:0 | System.Drawing.Common, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/8.0.1/ref/net8.0/System.Drawing.Design.dll:0:0:0:0 | System.Drawing.Design, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/8.0.1/ref/net8.0/System.Drawing.dll:0:0:0:0 | System.Drawing, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/8.0.1/ref/net8.0/System.IO.Packaging.dll:0:0:0:0 | System.IO.Packaging, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/8.0.1/ref/net8.0/System.Printing.dll:0:0:0:0 | System.Printing, Version=8.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35 |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/8.0.1/ref/net8.0/System.Resources.Extensions.dll:0:0:0:0 | System.Resources.Extensions, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/8.0.1/ref/net8.0/System.Security.Cryptography.Pkcs.dll:0:0:0:0 | System.Security.Cryptography.Pkcs, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/8.0.1/ref/net8.0/System.Security.Cryptography.ProtectedData.dll:0:0:0:0 | System.Security.Cryptography.ProtectedData, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/8.0.1/ref/net8.0/System.Security.Cryptography.Xml.dll:0:0:0:0 | System.Security.Cryptography.Xml, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/8.0.1/ref/net8.0/System.Security.Permissions.dll:0:0:0:0 | System.Security.Permissions, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/8.0.1/ref/net8.0/System.Threading.AccessControl.dll:0:0:0:0 | System.Threading.AccessControl, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/8.0.1/ref/net8.0/System.Windows.Controls.Ribbon.dll:0:0:0:0 | System.Windows.Controls.Ribbon, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/8.0.1/ref/net8.0/System.Windows.Extensions.dll:0:0:0:0 | System.Windows.Extensions, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/8.0.1/ref/net8.0/System.Windows.Forms.Design.Editors.dll:0:0:0:0 | System.Windows.Forms.Design.Editors, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/8.0.1/ref/net8.0/System.Windows.Forms.Design.dll:0:0:0:0 | System.Windows.Forms.Design, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/8.0.1/ref/net8.0/System.Windows.Forms.Primitives.dll:0:0:0:0 | System.Windows.Forms.Primitives, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/8.0.1/ref/net8.0/System.Windows.Forms.dll:0:0:0:0 | System.Windows.Forms, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/8.0.1/ref/net8.0/System.Windows.Input.Manipulations.dll:0:0:0:0 | System.Windows.Input.Manipulations, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/8.0.1/ref/net8.0/System.Windows.Presentation.dll:0:0:0:0 | System.Windows.Presentation, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/8.0.1/ref/net8.0/System.Xaml.dll:0:0:0:0 | System.Xaml, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/8.0.1/ref/net8.0/UIAutomationClient.dll:0:0:0:0 | UIAutomationClient, Version=8.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35 |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/8.0.1/ref/net8.0/UIAutomationClientSideProviders.dll:0:0:0:0 | UIAutomationClientSideProviders, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/8.0.1/ref/net8.0/UIAutomationProvider.dll:0:0:0:0 | UIAutomationProvider, Version=8.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35 |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/8.0.1/ref/net8.0/UIAutomationTypes.dll:0:0:0:0 | UIAutomationTypes, Version=8.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35 |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/8.0.1/ref/net8.0/WindowsBase.dll:0:0:0:0 | WindowsBase, Version=8.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35 |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/8.0.1/ref/net8.0/WindowsFormsIntegration.dll:0:0:0:0 | WindowsFormsIntegration, Version=8.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35 |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/Microsoft.CSharp.dll:0:0:0:0 | Microsoft.CSharp, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/Microsoft.VisualBasic.Core.dll:0:0:0:0 | Microsoft.VisualBasic.Core, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/Microsoft.Win32.Primitives.dll:0:0:0:0 | Microsoft.Win32.Primitives, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/Microsoft.Win32.Registry.dll:0:0:0:0 | Microsoft.Win32.Registry, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.AppContext.dll:0:0:0:0 | System.AppContext, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Buffers.dll:0:0:0:0 | System.Buffers, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Collections.Concurrent.dll:0:0:0:0 | System.Collections.Concurrent, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Collections.Immutable.dll:0:0:0:0 | System.Collections.Immutable, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Collections.NonGeneric.dll:0:0:0:0 | System.Collections.NonGeneric, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Collections.Specialized.dll:0:0:0:0 | System.Collections.Specialized, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Collections.dll:0:0:0:0 | System.Collections, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.ComponentModel.Annotations.dll:0:0:0:0 | System.ComponentModel.Annotations, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.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/9.0.0/ref/net9.0/System.ComponentModel.EventBasedAsync.dll:0:0:0:0 | System.ComponentModel.EventBasedAsync, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.ComponentModel.Primitives.dll:0:0:0:0 | System.ComponentModel.Primitives, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.ComponentModel.TypeConverter.dll:0:0:0:0 | System.ComponentModel.TypeConverter, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.ComponentModel.dll:0:0:0:0 | System.ComponentModel, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.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/9.0.0/ref/net9.0/System.Console.dll:0:0:0:0 | System.Console, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.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/9.0.0/ref/net9.0/System.Data.Common.dll:0:0:0:0 | System.Data.Common, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Data.DataSetExtensions.dll:0:0:0:0 | System.Data.DataSetExtensions, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.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/9.0.0/ref/net9.0/System.Diagnostics.Contracts.dll:0:0:0:0 | System.Diagnostics.Contracts, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Diagnostics.Debug.dll:0:0:0:0 | System.Diagnostics.Debug, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Diagnostics.DiagnosticSource.dll:0:0:0:0 | System.Diagnostics.DiagnosticSource, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Diagnostics.FileVersionInfo.dll:0:0:0:0 | System.Diagnostics.FileVersionInfo, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Diagnostics.Process.dll:0:0:0:0 | System.Diagnostics.Process, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Diagnostics.StackTrace.dll:0:0:0:0 | System.Diagnostics.StackTrace, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Diagnostics.TextWriterTraceListener.dll:0:0:0:0 | System.Diagnostics.TextWriterTraceListener, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Diagnostics.Tools.dll:0:0:0:0 | System.Diagnostics.Tools, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Diagnostics.TraceSource.dll:0:0:0:0 | System.Diagnostics.TraceSource, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Diagnostics.Tracing.dll:0:0:0:0 | System.Diagnostics.Tracing, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Drawing.Primitives.dll:0:0:0:0 | System.Drawing.Primitives, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Dynamic.Runtime.dll:0:0:0:0 | System.Dynamic.Runtime, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Formats.Asn1.dll:0:0:0:0 | System.Formats.Asn1, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Formats.Tar.dll:0:0:0:0 | System.Formats.Tar, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Globalization.Calendars.dll:0:0:0:0 | System.Globalization.Calendars, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Globalization.Extensions.dll:0:0:0:0 | System.Globalization.Extensions, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Globalization.dll:0:0:0:0 | System.Globalization, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.IO.Compression.Brotli.dll:0:0:0:0 | System.IO.Compression.Brotli, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.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/9.0.0/ref/net9.0/System.IO.Compression.ZipFile.dll:0:0:0:0 | System.IO.Compression.ZipFile, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.IO.Compression.dll:0:0:0:0 | System.IO.Compression, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.IO.FileSystem.AccessControl.dll:0:0:0:0 | System.IO.FileSystem.AccessControl, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.IO.FileSystem.DriveInfo.dll:0:0:0:0 | System.IO.FileSystem.DriveInfo, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.IO.FileSystem.Primitives.dll:0:0:0:0 | System.IO.FileSystem.Primitives, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.IO.FileSystem.Watcher.dll:0:0:0:0 | System.IO.FileSystem.Watcher, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.IO.FileSystem.dll:0:0:0:0 | System.IO.FileSystem, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.IO.IsolatedStorage.dll:0:0:0:0 | System.IO.IsolatedStorage, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.IO.MemoryMappedFiles.dll:0:0:0:0 | System.IO.MemoryMappedFiles, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.IO.Pipelines.dll:0:0:0:0 | System.IO.Pipelines, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.IO.Pipes.AccessControl.dll:0:0:0:0 | System.IO.Pipes.AccessControl, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.IO.Pipes.dll:0:0:0:0 | System.IO.Pipes, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.IO.UnmanagedMemoryStream.dll:0:0:0:0 | System.IO.UnmanagedMemoryStream, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.IO.dll:0:0:0:0 | System.IO, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Linq.Expressions.dll:0:0:0:0 | System.Linq.Expressions, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Linq.Parallel.dll:0:0:0:0 | System.Linq.Parallel, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Linq.Queryable.dll:0:0:0:0 | System.Linq.Queryable, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Linq.dll:0:0:0:0 | System.Linq, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Memory.dll:0:0:0:0 | System.Memory, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Net.Http.Json.dll:0:0:0:0 | System.Net.Http.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Net.Http.dll:0:0:0:0 | System.Net.Http, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Net.HttpListener.dll:0:0:0:0 | System.Net.HttpListener, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Net.Mail.dll:0:0:0:0 | System.Net.Mail, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Net.NameResolution.dll:0:0:0:0 | System.Net.NameResolution, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Net.NetworkInformation.dll:0:0:0:0 | System.Net.NetworkInformation, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Net.Ping.dll:0:0:0:0 | System.Net.Ping, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Net.Primitives.dll:0:0:0:0 | System.Net.Primitives, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Net.Quic.dll:0:0:0:0 | System.Net.Quic, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Net.Requests.dll:0:0:0:0 | System.Net.Requests, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Net.Security.dll:0:0:0:0 | System.Net.Security, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Net.ServicePoint.dll:0:0:0:0 | System.Net.ServicePoint, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Net.Sockets.dll:0:0:0:0 | System.Net.Sockets, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Net.WebClient.dll:0:0:0:0 | System.Net.WebClient, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Net.WebHeaderCollection.dll:0:0:0:0 | System.Net.WebHeaderCollection, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Net.WebProxy.dll:0:0:0:0 | System.Net.WebProxy, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Net.WebSockets.Client.dll:0:0:0:0 | System.Net.WebSockets.Client, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Net.WebSockets.dll:0:0:0:0 | System.Net.WebSockets, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.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/9.0.0/ref/net9.0/System.Numerics.Vectors.dll:0:0:0:0 | System.Numerics.Vectors, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.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/9.0.0/ref/net9.0/System.ObjectModel.dll:0:0:0:0 | System.ObjectModel, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Reflection.DispatchProxy.dll:0:0:0:0 | System.Reflection.DispatchProxy, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Reflection.Emit.ILGeneration.dll:0:0:0:0 | System.Reflection.Emit.ILGeneration, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Reflection.Emit.Lightweight.dll:0:0:0:0 | System.Reflection.Emit.Lightweight, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Reflection.Emit.dll:0:0:0:0 | System.Reflection.Emit, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Reflection.Extensions.dll:0:0:0:0 | System.Reflection.Extensions, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Reflection.Metadata.dll:0:0:0:0 | System.Reflection.Metadata, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Reflection.Primitives.dll:0:0:0:0 | System.Reflection.Primitives, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Reflection.TypeExtensions.dll:0:0:0:0 | System.Reflection.TypeExtensions, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Reflection.dll:0:0:0:0 | System.Reflection, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Resources.Reader.dll:0:0:0:0 | System.Resources.Reader, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Resources.ResourceManager.dll:0:0:0:0 | System.Resources.ResourceManager, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Resources.Writer.dll:0:0:0:0 | System.Resources.Writer, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Runtime.CompilerServices.Unsafe.dll:0:0:0:0 | System.Runtime.CompilerServices.Unsafe, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Runtime.CompilerServices.VisualC.dll:0:0:0:0 | System.Runtime.CompilerServices.VisualC, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Runtime.Extensions.dll:0:0:0:0 | System.Runtime.Extensions, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Runtime.Handles.dll:0:0:0:0 | System.Runtime.Handles, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Runtime.InteropServices.JavaScript.dll:0:0:0:0 | System.Runtime.InteropServices.JavaScript, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Runtime.InteropServices.RuntimeInformation.dll:0:0:0:0 | System.Runtime.InteropServices.RuntimeInformation, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Runtime.InteropServices.dll:0:0:0:0 | System.Runtime.InteropServices, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Runtime.Intrinsics.dll:0:0:0:0 | System.Runtime.Intrinsics, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Runtime.Loader.dll:0:0:0:0 | System.Runtime.Loader, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Runtime.Numerics.dll:0:0:0:0 | System.Runtime.Numerics, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.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/9.0.0/ref/net9.0/System.Runtime.Serialization.Json.dll:0:0:0:0 | System.Runtime.Serialization.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Runtime.Serialization.Primitives.dll:0:0:0:0 | System.Runtime.Serialization.Primitives, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Runtime.Serialization.Xml.dll:0:0:0:0 | System.Runtime.Serialization.Xml, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.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/9.0.0/ref/net9.0/System.Runtime.dll:0:0:0:0 | System.Runtime, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Security.AccessControl.dll:0:0:0:0 | System.Security.AccessControl, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Security.Claims.dll:0:0:0:0 | System.Security.Claims, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Security.Cryptography.Algorithms.dll:0:0:0:0 | System.Security.Cryptography.Algorithms, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Security.Cryptography.Cng.dll:0:0:0:0 | System.Security.Cryptography.Cng, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Security.Cryptography.Csp.dll:0:0:0:0 | System.Security.Cryptography.Csp, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Security.Cryptography.Encoding.dll:0:0:0:0 | System.Security.Cryptography.Encoding, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Security.Cryptography.OpenSsl.dll:0:0:0:0 | System.Security.Cryptography.OpenSsl, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Security.Cryptography.Primitives.dll:0:0:0:0 | System.Security.Cryptography.Primitives, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Security.Cryptography.X509Certificates.dll:0:0:0:0 | System.Security.Cryptography.X509Certificates, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Security.Cryptography.dll:0:0:0:0 | System.Security.Cryptography, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Security.Principal.Windows.dll:0:0:0:0 | System.Security.Principal.Windows, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Security.Principal.dll:0:0:0:0 | System.Security.Principal, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Security.SecureString.dll:0:0:0:0 | System.Security.SecureString, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.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/9.0.0/ref/net9.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/9.0.0/ref/net9.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/9.0.0/ref/net9.0/System.Text.Encoding.CodePages.dll:0:0:0:0 | System.Text.Encoding.CodePages, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Text.Encoding.Extensions.dll:0:0:0:0 | System.Text.Encoding.Extensions, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Text.Encoding.dll:0:0:0:0 | System.Text.Encoding, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Text.Encodings.Web.dll:0:0:0:0 | System.Text.Encodings.Web, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Text.Json.dll:0:0:0:0 | System.Text.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Text.RegularExpressions.dll:0:0:0:0 | System.Text.RegularExpressions, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Threading.Channels.dll:0:0:0:0 | System.Threading.Channels, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Threading.Overlapped.dll:0:0:0:0 | System.Threading.Overlapped, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Threading.Tasks.Dataflow.dll:0:0:0:0 | System.Threading.Tasks.Dataflow, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Threading.Tasks.Extensions.dll:0:0:0:0 | System.Threading.Tasks.Extensions, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Threading.Tasks.Parallel.dll:0:0:0:0 | System.Threading.Tasks.Parallel, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Threading.Tasks.dll:0:0:0:0 | System.Threading.Tasks, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Threading.Thread.dll:0:0:0:0 | System.Threading.Thread, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Threading.ThreadPool.dll:0:0:0:0 | System.Threading.ThreadPool, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Threading.Timer.dll:0:0:0:0 | System.Threading.Timer, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Threading.dll:0:0:0:0 | System.Threading, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Transactions.Local.dll:0:0:0:0 | System.Transactions.Local, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.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/9.0.0/ref/net9.0/System.ValueTuple.dll:0:0:0:0 | System.ValueTuple, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Web.HttpUtility.dll:0:0:0:0 | System.Web.HttpUtility, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.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/9.0.0/ref/net9.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/9.0.0/ref/net9.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/9.0.0/ref/net9.0/System.Xml.ReaderWriter.dll:0:0:0:0 | System.Xml.ReaderWriter, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.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/9.0.0/ref/net9.0/System.Xml.XDocument.dll:0:0:0:0 | System.Xml.XDocument, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Xml.XPath.XDocument.dll:0:0:0:0 | System.Xml.XPath.XDocument, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Xml.XPath.dll:0:0:0:0 | System.Xml.XPath, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Xml.XmlDocument.dll:0:0:0:0 | System.Xml.XmlDocument, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Xml.XmlSerializer.dll:0:0:0:0 | System.Xml.XmlSerializer, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.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/9.0.0/ref/net9.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/9.0.0/ref/net9.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/9.0.0/ref/net9.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/9.0.0/ref/net9.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/9.0.0/ref/net9.0/Microsoft.VisualBasic.Forms.dll:0:0:0:0 | Microsoft.VisualBasic.Forms, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.0/ref/net9.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/9.0.0/ref/net9.0/Microsoft.Win32.Registry.AccessControl.dll:0:0:0:0 | Microsoft.Win32.Registry.AccessControl, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.0/ref/net9.0/Microsoft.Win32.SystemEvents.dll:0:0:0:0 | Microsoft.Win32.SystemEvents, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.0/ref/net9.0/PresentationCore.dll:0:0:0:0 | PresentationCore, Version=9.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35 |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.0/ref/net9.0/PresentationFramework.Aero2.dll:0:0:0:0 | PresentationFramework.Aero2, Version=9.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35 |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.0/ref/net9.0/PresentationFramework.Aero.dll:0:0:0:0 | PresentationFramework.Aero, Version=9.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35 |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.0/ref/net9.0/PresentationFramework.AeroLite.dll:0:0:0:0 | PresentationFramework.AeroLite, Version=9.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35 |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.0/ref/net9.0/PresentationFramework.Classic.dll:0:0:0:0 | PresentationFramework.Classic, Version=9.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35 |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.0/ref/net9.0/PresentationFramework.Luna.dll:0:0:0:0 | PresentationFramework.Luna, Version=9.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35 |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.0/ref/net9.0/PresentationFramework.Royale.dll:0:0:0:0 | PresentationFramework.Royale, Version=9.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35 |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.0/ref/net9.0/PresentationFramework.dll:0:0:0:0 | PresentationFramework, Version=9.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35 |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.0/ref/net9.0/PresentationUI.dll:0:0:0:0 | PresentationUI, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.0/ref/net9.0/ReachFramework.dll:0:0:0:0 | ReachFramework, Version=9.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35 |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.0/ref/net9.0/System.CodeDom.dll:0:0:0:0 | System.CodeDom, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.0/ref/net9.0/System.Configuration.ConfigurationManager.dll:0:0:0:0 | System.Configuration.ConfigurationManager, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.0/ref/net9.0/System.Design.dll:0:0:0:0 | System.Design, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.0/ref/net9.0/System.Diagnostics.EventLog.dll:0:0:0:0 | System.Diagnostics.EventLog, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.0/ref/net9.0/System.Diagnostics.PerformanceCounter.dll:0:0:0:0 | System.Diagnostics.PerformanceCounter, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.0/ref/net9.0/System.DirectoryServices.dll:0:0:0:0 | System.DirectoryServices, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.0/ref/net9.0/System.Drawing.Common.dll:0:0:0:0 | System.Drawing.Common, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.0/ref/net9.0/System.Drawing.Design.dll:0:0:0:0 | System.Drawing.Design, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.0/ref/net9.0/System.Drawing.dll:0:0:0:0 | System.Drawing, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.0/ref/net9.0/System.Formats.Nrbf.dll:0:0:0:0 | System.Formats.Nrbf, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.0/ref/net9.0/System.IO.Packaging.dll:0:0:0:0 | System.IO.Packaging, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.0/ref/net9.0/System.Printing.dll:0:0:0:0 | System.Printing, Version=9.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35 |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.0/ref/net9.0/System.Private.Windows.Core.dll:0:0:0:0 | System.Private.Windows.Core, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.0/ref/net9.0/System.Resources.Extensions.dll:0:0:0:0 | System.Resources.Extensions, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.0/ref/net9.0/System.Security.Cryptography.Pkcs.dll:0:0:0:0 | System.Security.Cryptography.Pkcs, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.0/ref/net9.0/System.Security.Cryptography.ProtectedData.dll:0:0:0:0 | System.Security.Cryptography.ProtectedData, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.0/ref/net9.0/System.Security.Cryptography.Xml.dll:0:0:0:0 | System.Security.Cryptography.Xml, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.0/ref/net9.0/System.Security.Permissions.dll:0:0:0:0 | System.Security.Permissions, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.0/ref/net9.0/System.Threading.AccessControl.dll:0:0:0:0 | System.Threading.AccessControl, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.0/ref/net9.0/System.Windows.Controls.Ribbon.dll:0:0:0:0 | System.Windows.Controls.Ribbon, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.0/ref/net9.0/System.Windows.Extensions.dll:0:0:0:0 | System.Windows.Extensions, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.0/ref/net9.0/System.Windows.Forms.Design.Editors.dll:0:0:0:0 | System.Windows.Forms.Design.Editors, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.0/ref/net9.0/System.Windows.Forms.Design.dll:0:0:0:0 | System.Windows.Forms.Design, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.0/ref/net9.0/System.Windows.Forms.Primitives.dll:0:0:0:0 | System.Windows.Forms.Primitives, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.0/ref/net9.0/System.Windows.Forms.dll:0:0:0:0 | System.Windows.Forms, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.0/ref/net9.0/System.Windows.Input.Manipulations.dll:0:0:0:0 | System.Windows.Input.Manipulations, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.0/ref/net9.0/System.Windows.Presentation.dll:0:0:0:0 | System.Windows.Presentation, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.0/ref/net9.0/System.Xaml.dll:0:0:0:0 | System.Xaml, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.0/ref/net9.0/UIAutomationClient.dll:0:0:0:0 | UIAutomationClient, Version=9.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35 |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.0/ref/net9.0/UIAutomationClientSideProviders.dll:0:0:0:0 | UIAutomationClientSideProviders, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.0/ref/net9.0/UIAutomationProvider.dll:0:0:0:0 | UIAutomationProvider, Version=9.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35 |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.0/ref/net9.0/UIAutomationTypes.dll:0:0:0:0 | UIAutomationTypes, Version=9.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35 |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.0/ref/net9.0/WindowsBase.dll:0:0:0:0 | WindowsBase, Version=9.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35 |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.0/ref/net9.0/WindowsFormsIntegration.dll:0:0:0:0 | WindowsFormsIntegration, Version=9.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 d54915e8d4d..65324522984 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": "8.0.101"
+    "version": "9.0.100"
   }
 }
diff --git a/csharp/ql/integration-tests/windows/standalone_dependencies/standalone.csproj b/csharp/ql/integration-tests/windows/standalone_dependencies/standalone.csproj
index a8f3cc44512..58df1d80a86 100644
--- a/csharp/ql/integration-tests/windows/standalone_dependencies/standalone.csproj
+++ b/csharp/ql/integration-tests/windows/standalone_dependencies/standalone.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFrameworks>net8.0;net6.0;netcoreapp3.1;netstandard2.0;net48</TargetFrameworks>
+    <TargetFrameworks>net9.0;net6.0;netcoreapp3.1;netstandard2.0;net48</TargetFrameworks>
   </PropertyGroup>
 
   <Target Name="DeleteBinObjFolders" BeforeTargets="Clean">
diff --git a/csharp/ql/lib/CHANGELOG.md b/csharp/ql/lib/CHANGELOG.md
index f27c109e269..39a75db1b5f 100644
--- a/csharp/ql/lib/CHANGELOG.md
+++ b/csharp/ql/lib/CHANGELOG.md
@@ -1,3 +1,29 @@
+## 3.1.0
+
+### Major Analysis Improvements
+
+* The generated .NET 8 runtime models have been updated.
+
+## 3.0.1
+
+No user-facing changes.
+
+## 3.0.0
+
+### Breaking Changes
+
+* C#: Add support for MaD directly on properties and indexers using *attributes*. Using `Attribute.Getter` or `Attribute.Setter` in the model `ext` field applies the model to the getter or setter for properties and indexers. Prior to this change `Attribute` models unintentionally worked for property setters (if the property is decorated with the matching attribute). That is, a model that uses the `Attribute` feature directly on a property for a property setter needs to be changed to `Attribute.Setter`.
+* C#: Remove all CIL tables and related QL library functionality.
+
+### Deprecated APIs
+
+* The class `ThreatModelFlowSource` has been renamed to `ActiveThreatModelSource` to more clearly reflect it only contains the currently active threat model sources. `ThreatModelFlowSource` has been marked as deprecated.
+
+### Minor Analysis Improvements
+
+* `DataFlow::Node` instances are no longer created for library methods and fields that are not callable (either statically or dynamically) or otherwise referred to from source code. This may affect third-party queries that use these nodes to identify library methods or fields that are present in DLL files where those methods or fields are unreferenced. If this presents a problem, consider using `Callable` and other non-dataflow classes to identify such library entities.
+* C#: Add extractor support for attributes on indexers.
+
 ## 2.0.0
 
 ### Breaking Changes
diff --git a/csharp/ql/lib/change-notes/2024-09-16-accessor-mad.md b/csharp/ql/lib/change-notes/2024-09-16-accessor-mad.md
deleted file mode 100644
index 3ccdcffef24..00000000000
--- a/csharp/ql/lib/change-notes/2024-09-16-accessor-mad.md
+++ /dev/null
@@ -1,4 +0,0 @@
----
-category: breaking
----
-* C#: Add support for MaD directly on properties and indexers using *attributes*. Using `Attribute.Getter` or `Attribute.Setter` in the model `ext` field applies the model to the getter or setter for properties and indexers. Prior to this change `Attribute` models unintentionally worked for property setters (if the property is decorated with the matching attribute). That is, a model that uses the `Attribute` feature directly on a property for a property setter needs to be changed to `Attribute.Setter`.
diff --git a/csharp/ql/lib/change-notes/2024-09-16-delete-cil.md b/csharp/ql/lib/change-notes/2024-09-16-delete-cil.md
deleted file mode 100644
index 288fc29e5cb..00000000000
--- a/csharp/ql/lib/change-notes/2024-09-16-delete-cil.md
+++ /dev/null
@@ -1,4 +0,0 @@
----
-category: breaking
----
-* C#: Remove all CIL tables and related QL library functionality.
diff --git a/csharp/ql/lib/change-notes/2024-09-16-indexer-attributes.md b/csharp/ql/lib/change-notes/2024-09-16-indexer-attributes.md
deleted file mode 100644
index 4d1fbee6d4c..00000000000
--- a/csharp/ql/lib/change-notes/2024-09-16-indexer-attributes.md
+++ /dev/null
@@ -1,4 +0,0 @@
----
-category: minorAnalysis
----
-* C#: Add extractor support for attributes on indexers.
diff --git a/csharp/ql/lib/change-notes/2024-11-07-net8-runtime-models.md b/csharp/ql/lib/change-notes/2024-11-07-net8-runtime-models.md
new file mode 100644
index 00000000000..89574208e40
--- /dev/null
+++ b/csharp/ql/lib/change-notes/2024-11-07-net8-runtime-models.md
@@ -0,0 +1,4 @@
+---
+category: minorAnalysis
+---
+* The Models as Data models for .NET 8 Runtime now include generated models for higher order methods.
diff --git a/csharp/ql/lib/change-notes/2024-11-19-extractor-dotnet.md b/csharp/ql/lib/change-notes/2024-11-19-extractor-dotnet.md
new file mode 100644
index 00000000000..58185aa0b0e
--- /dev/null
+++ b/csharp/ql/lib/change-notes/2024-11-19-extractor-dotnet.md
@@ -0,0 +1,4 @@
+---
+category: minorAnalysis
+---
+* .NET 9 is now required to build the C# extractor.
diff --git a/csharp/ql/lib/change-notes/released/3.0.0.md b/csharp/ql/lib/change-notes/released/3.0.0.md
new file mode 100644
index 00000000000..1042cc6d724
--- /dev/null
+++ b/csharp/ql/lib/change-notes/released/3.0.0.md
@@ -0,0 +1,15 @@
+## 3.0.0
+
+### Breaking Changes
+
+* C#: Add support for MaD directly on properties and indexers using *attributes*. Using `Attribute.Getter` or `Attribute.Setter` in the model `ext` field applies the model to the getter or setter for properties and indexers. Prior to this change `Attribute` models unintentionally worked for property setters (if the property is decorated with the matching attribute). That is, a model that uses the `Attribute` feature directly on a property for a property setter needs to be changed to `Attribute.Setter`.
+* C#: Remove all CIL tables and related QL library functionality.
+
+### Deprecated APIs
+
+* The class `ThreatModelFlowSource` has been renamed to `ActiveThreatModelSource` to more clearly reflect it only contains the currently active threat model sources. `ThreatModelFlowSource` has been marked as deprecated.
+
+### Minor Analysis Improvements
+
+* `DataFlow::Node` instances are no longer created for library methods and fields that are not callable (either statically or dynamically) or otherwise referred to from source code. This may affect third-party queries that use these nodes to identify library methods or fields that are present in DLL files where those methods or fields are unreferenced. If this presents a problem, consider using `Callable` and other non-dataflow classes to identify such library entities.
+* C#: Add extractor support for attributes on indexers.
diff --git a/csharp/ql/lib/change-notes/released/3.0.1.md b/csharp/ql/lib/change-notes/released/3.0.1.md
new file mode 100644
index 00000000000..ac5998ace61
--- /dev/null
+++ b/csharp/ql/lib/change-notes/released/3.0.1.md
@@ -0,0 +1,3 @@
+## 3.0.1
+
+No user-facing changes.
diff --git a/csharp/ql/lib/change-notes/released/3.1.0.md b/csharp/ql/lib/change-notes/released/3.1.0.md
new file mode 100644
index 00000000000..cc7397093a5
--- /dev/null
+++ b/csharp/ql/lib/change-notes/released/3.1.0.md
@@ -0,0 +1,5 @@
+## 3.1.0
+
+### Major Analysis Improvements
+
+* The generated .NET 8 runtime models have been updated.
diff --git a/csharp/ql/lib/codeql-pack.release.yml b/csharp/ql/lib/codeql-pack.release.yml
index 0abe6ccede0..82f62960aa3 100644
--- a/csharp/ql/lib/codeql-pack.release.yml
+++ b/csharp/ql/lib/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 2.0.0
+lastReleaseVersion: 3.1.0
diff --git a/csharp/ql/lib/ext/System.IO.model.yml b/csharp/ql/lib/ext/System.IO.model.yml
index d78fb8e1e2d..8439b7d686c 100644
--- a/csharp/ql/lib/ext/System.IO.model.yml
+++ b/csharp/ql/lib/ext/System.IO.model.yml
@@ -112,6 +112,19 @@ extensions:
       - ["System.IO", "StreamReader", False, "StreamReader", "(System.String,System.Text.Encoding,System.Boolean,System.IO.FileStreamOptions)", "", "Argument[0]", "Argument[this]", "taint", "manual"]
       - ["System.IO", "StreamReader", False, "StreamReader", "(System.String,System.Text.Encoding,System.Boolean,System.Int32)", "", "Argument[0]", "Argument[this]", "taint", "manual"]
       - ["System.IO", "StringReader", False, "StringReader", "(System.String)", "", "Argument[0]", "Argument[this]", "taint", "manual"]
+      - ["System.IO", "StringWriter", True, "GetStringBuilder", "()", "", "Argument[this]", "ReturnValue", "taint", "manual"]
+      - ["System.IO", "StringWriter", False, "StringWriter", "(System.Text.StringBuilder,System.IFormatProvider)", "", "Argument[0]", "Argument[this]", "taint", "manual"]
+      - ["System.IO", "StringWriter", False, "ToString", "()", "", "Argument[this]", "ReturnValue", "taint", "manual"]
+      - ["System.IO", "StringWriter", True, "Write", "(System.Char[],System.Int32,System.Int32)", "", "Argument[0].Element", "Argument[this]", "taint", "manual"]
+      - ["System.IO", "StringWriter", True, "Write", "(System.String)", "", "Argument[0]", "Argument[this]", "taint", "manual"]
+      - ["System.IO", "StringWriter", True, "Write", "(System.Text.StringBuilder)", "", "Argument[0]", "Argument[this]", "taint", "manual"]
+      - ["System.IO", "StringWriter", True, "WriteAsync", "(System.Char[],System.Int32,System.Int32)", "", "Argument[0].Element", "Argument[this]", "taint", "manual"]
+      - ["System.IO", "StringWriter", True, "WriteAsync", "(System.String)", "", "Argument[0]", "Argument[this]", "taint", "manual"]
+      - ["System.IO", "StringWriter", True, "WriteAsync", "(System.Text.StringBuilder,System.Threading.CancellationToken)", "", "Argument[0]", "Argument[this]", "taint", "manual"]
+      - ["System.IO", "StringWriter", True, "WriteLine", "(System.Text.StringBuilder)", "", "Argument[0]", "Argument[this]", "taint", "manual"]
+      - ["System.IO", "StringWriter", True, "WriteLineAsync", "(System.Char[],System.Int32,System.Int32)", "", "Argument[0].Element", "Argument[this]", "taint", "manual"]
+      - ["System.IO", "StringWriter", True, "WriteLineAsync", "(System.String)", "", "Argument[0]", "Argument[this]", "taint", "manual"]
+      - ["System.IO", "StringWriter", True, "WriteLineAsync", "(System.Text.StringBuilder,System.Threading.CancellationToken)", "", "Argument[0]", "Argument[this]", "taint", "manual"]
       - ["System.IO", "TextReader", True, "Read", "()", "", "Argument[this]", "ReturnValue", "taint", "manual"]
       - ["System.IO", "TextReader", True, "Read", "(System.Char[],System.Int32,System.Int32)", "", "Argument[this]", "Argument[0].Element", "taint", "manual"]
       - ["System.IO", "TextReader", True, "Read", "(System.Span<System.Char>)", "", "Argument[this]", "Argument[0].Element", "taint", "manual"]
diff --git a/csharp/ql/lib/ext/generated/ILCompiler.IBC.model.yml b/csharp/ql/lib/ext/generated/ILCompiler.IBC.model.yml
index caf44ab1ac2..f3b7d0b137e 100644
--- a/csharp/ql/lib/ext/generated/ILCompiler.IBC.model.yml
+++ b/csharp/ql/lib/ext/generated/ILCompiler.IBC.model.yml
@@ -4,7 +4,8 @@ extensions:
       pack: codeql/csharp-all
       extensible: summaryModel
     data:
-      - ["ILCompiler.IBC", "IBCProfileData", False, "IBCProfileData", "(ILCompiler.IBC.MibcConfig,System.Boolean,System.Collections.Generic.IEnumerable<ILCompiler.MethodProfileData>)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["ILCompiler.IBC", "IBCProfileData", False, "IBCProfileData", "(ILCompiler.IBC.MibcConfig,System.Boolean,System.Collections.Generic.IEnumerable<ILCompiler.MethodProfileData>)", "", "Argument[0]", "Argument[this].SyntheticField[ILCompiler.IBC.IBCProfileData._config]", "value", "dfc-generated"]
+      - ["ILCompiler.IBC", "IBCProfileData", True, "get_Config", "()", "", "Argument[this].SyntheticField[ILCompiler.IBC.IBCProfileData._config]", "ReturnValue", "value", "dfc-generated"]
       - ["ILCompiler.IBC", "MibcConfig", False, "FromKeyValueMap", "(System.Collections.Generic.Dictionary<System.String,System.String>)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
       - ["ILCompiler.IBC", "MibcConfig", False, "ToString", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
   - addsTo:
diff --git a/csharp/ql/lib/ext/generated/ILCompiler.Reflection.ReadyToRun.Amd64.model.yml b/csharp/ql/lib/ext/generated/ILCompiler.Reflection.ReadyToRun.Amd64.model.yml
index 181043122f4..ce26bec046a 100644
--- a/csharp/ql/lib/ext/generated/ILCompiler.Reflection.ReadyToRun.Amd64.model.yml
+++ b/csharp/ql/lib/ext/generated/ILCompiler.Reflection.ReadyToRun.Amd64.model.yml
@@ -4,8 +4,8 @@ extensions:
       pack: codeql/csharp-all
       extensible: summaryModel
     data:
-      - ["ILCompiler.Reflection.ReadyToRun.Amd64", "GcSlotTable+GcSlot", False, "GcSlot", "(System.Int32,System.Int32,ILCompiler.Reflection.ReadyToRun.GcStackSlot,ILCompiler.Reflection.ReadyToRun.GcSlotFlags,System.Boolean)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
-      - ["ILCompiler.Reflection.ReadyToRun.Amd64", "GcTransition", False, "ToString", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["ILCompiler.Reflection.ReadyToRun.Amd64", "GcSlotTable+GcSlot", False, "GcSlot", "(System.Int32,System.Int32,ILCompiler.Reflection.ReadyToRun.GcStackSlot,ILCompiler.Reflection.ReadyToRun.GcSlotFlags,System.Boolean)", "", "Argument[2]", "Argument[this].Property[ILCompiler.Reflection.ReadyToRun.Amd64.GcSlotTable+GcSlot.StackSlot]", "value", "dfc-generated"]
+      - ["ILCompiler.Reflection.ReadyToRun.Amd64", "GcTransition", False, "ToString", "()", "", "Argument[this].Property[ILCompiler.Reflection.ReadyToRun.Amd64.GcTransition.SlotState]", "ReturnValue", "value", "dfc-generated"]
       - ["ILCompiler.Reflection.ReadyToRun.Amd64", "UnwindInfo", False, "ToString", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
   - addsTo:
       pack: codeql/csharp-all
diff --git a/csharp/ql/lib/ext/generated/ILCompiler.Reflection.ReadyToRun.model.yml b/csharp/ql/lib/ext/generated/ILCompiler.Reflection.ReadyToRun.model.yml
index dc531fc2fa0..c00a55214f2 100644
--- a/csharp/ql/lib/ext/generated/ILCompiler.Reflection.ReadyToRun.model.yml
+++ b/csharp/ql/lib/ext/generated/ILCompiler.Reflection.ReadyToRun.model.yml
@@ -7,24 +7,24 @@ extensions:
       - ["ILCompiler.Reflection.ReadyToRun", "DebugInfo", False, "DebugInfo", "(ILCompiler.Reflection.ReadyToRun.RuntimeFunction,System.Int32)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["ILCompiler.Reflection.ReadyToRun", "DebugInfo", False, "get_BoundsList", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["ILCompiler.Reflection.ReadyToRun", "DebugInfo", False, "get_VariablesList", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["ILCompiler.Reflection.ReadyToRun", "DisassemblingGenericContext", False, "DisassemblingGenericContext", "(System.String[],System.String[])", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["ILCompiler.Reflection.ReadyToRun", "DisassemblingGenericContext", False, "DisassemblingGenericContext", "(System.String[],System.String[])", "", "Argument[1].Element", "Argument[this]", "taint", "df-generated"]
-      - ["ILCompiler.Reflection.ReadyToRun", "DisassemblingTypeProvider", True, "GetGenericMethodParameter", "(ILCompiler.Reflection.ReadyToRun.DisassemblingGenericContext,System.Int32)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["ILCompiler.Reflection.ReadyToRun", "DisassemblingTypeProvider", True, "GetGenericTypeParameter", "(ILCompiler.Reflection.ReadyToRun.DisassemblingGenericContext,System.Int32)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["ILCompiler.Reflection.ReadyToRun", "DisassemblingGenericContext", False, "DisassemblingGenericContext", "(System.String[],System.String[])", "", "Argument[0]", "Argument[this].Property[ILCompiler.Reflection.ReadyToRun.DisassemblingGenericContext.TypeParameters]", "value", "dfc-generated"]
+      - ["ILCompiler.Reflection.ReadyToRun", "DisassemblingGenericContext", False, "DisassemblingGenericContext", "(System.String[],System.String[])", "", "Argument[1]", "Argument[this].Property[ILCompiler.Reflection.ReadyToRun.DisassemblingGenericContext.MethodParameters]", "value", "dfc-generated"]
+      - ["ILCompiler.Reflection.ReadyToRun", "DisassemblingTypeProvider", True, "GetGenericMethodParameter", "(ILCompiler.Reflection.ReadyToRun.DisassemblingGenericContext,System.Int32)", "", "Argument[0].Property[ILCompiler.Reflection.ReadyToRun.DisassemblingGenericContext.MethodParameters].Element", "ReturnValue", "value", "dfc-generated"]
+      - ["ILCompiler.Reflection.ReadyToRun", "DisassemblingTypeProvider", True, "GetGenericTypeParameter", "(ILCompiler.Reflection.ReadyToRun.DisassemblingGenericContext,System.Int32)", "", "Argument[0].Property[ILCompiler.Reflection.ReadyToRun.DisassemblingGenericContext.TypeParameters].Element", "ReturnValue", "value", "dfc-generated"]
       - ["ILCompiler.Reflection.ReadyToRun", "EHClause", False, "WriteTo", "(System.IO.TextWriter,System.Int32,System.Boolean)", "", "Argument[this]", "Argument[0]", "taint", "df-generated"]
       - ["ILCompiler.Reflection.ReadyToRun", "EHInfo", False, "EHInfo", "(ILCompiler.Reflection.ReadyToRun.ReadyToRunReader,System.Int32,System.Int32,System.Int32,System.Int32)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["ILCompiler.Reflection.ReadyToRun", "EHInfo", False, "WriteTo", "(System.IO.TextWriter,System.Boolean)", "", "Argument[this]", "Argument[0]", "taint", "df-generated"]
       - ["ILCompiler.Reflection.ReadyToRun", "EHInfo", False, "get_EHClauses", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["ILCompiler.Reflection.ReadyToRun", "FixupCell", False, "FixupCell", "(System.Int32,System.UInt32,System.UInt32,ILCompiler.Reflection.ReadyToRun.ReadyToRunSignature)", "", "Argument[3]", "Argument[this]", "taint", "df-generated"]
-      - ["ILCompiler.Reflection.ReadyToRun", "GCRefMap", False, "GCRefMap", "(System.UInt32,ILCompiler.Reflection.ReadyToRun.GCRefMapEntry[])", "", "Argument[1].Element", "Argument[this]", "taint", "df-generated"]
+      - ["ILCompiler.Reflection.ReadyToRun", "FixupCell", False, "FixupCell", "(System.Int32,System.UInt32,System.UInt32,ILCompiler.Reflection.ReadyToRun.ReadyToRunSignature)", "", "Argument[3]", "Argument[this].Property[ILCompiler.Reflection.ReadyToRun.FixupCell.Signature]", "value", "dfc-generated"]
+      - ["ILCompiler.Reflection.ReadyToRun", "GCRefMap", False, "GCRefMap", "(System.UInt32,ILCompiler.Reflection.ReadyToRun.GCRefMapEntry[])", "", "Argument[1]", "Argument[this].Field[ILCompiler.Reflection.ReadyToRun.GCRefMap.Entries]", "value", "dfc-generated"]
       - ["ILCompiler.Reflection.ReadyToRun", "GCRefMapDecoder", False, "GCRefMapDecoder", "(ILCompiler.Reflection.ReadyToRun.ReadyToRunReader,System.Int32)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["ILCompiler.Reflection.ReadyToRun", "IAssemblyMetadata", True, "get_ImageReader", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["ILCompiler.Reflection.ReadyToRun", "IAssemblyMetadata", True, "get_MetadataReader", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["ILCompiler.Reflection.ReadyToRun", "InliningInfoSection2", False, "InliningInfoSection2", "(ILCompiler.Reflection.ReadyToRun.ReadyToRunReader,System.Int32,System.Int32)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["ILCompiler.Reflection.ReadyToRun", "InliningInfoSection", False, "InliningInfoSection", "(ILCompiler.Reflection.ReadyToRun.ReadyToRunReader,System.Int32,System.Int32)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["ILCompiler.Reflection.ReadyToRun", "InstanceMethod", False, "InstanceMethod", "(System.Byte,ILCompiler.Reflection.ReadyToRun.ReadyToRunMethod)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["ILCompiler.Reflection.ReadyToRun", "MetadataNameFormatter", False, "FormatHandle", "(System.Reflection.Metadata.MetadataReader,System.Reflection.Metadata.Handle,System.Boolean,System.String,System.String)", "", "Argument[3]", "ReturnValue", "taint", "df-generated"]
-      - ["ILCompiler.Reflection.ReadyToRun", "MetadataNameFormatter", False, "FormatHandle", "(System.Reflection.Metadata.MetadataReader,System.Reflection.Metadata.Handle,System.Boolean,System.String,System.String)", "", "Argument[4]", "ReturnValue", "taint", "df-generated"]
+      - ["ILCompiler.Reflection.ReadyToRun", "InstanceMethod", False, "InstanceMethod", "(System.Byte,ILCompiler.Reflection.ReadyToRun.ReadyToRunMethod)", "", "Argument[1]", "Argument[this].Field[ILCompiler.Reflection.ReadyToRun.InstanceMethod.Method]", "value", "dfc-generated"]
+      - ["ILCompiler.Reflection.ReadyToRun", "MetadataNameFormatter", False, "FormatHandle", "(System.Reflection.Metadata.MetadataReader,System.Reflection.Metadata.Handle,System.Boolean,System.String,System.String)", "", "Argument[3]", "ReturnValue", "taint", "dfc-generated"]
+      - ["ILCompiler.Reflection.ReadyToRun", "MetadataNameFormatter", False, "FormatHandle", "(System.Reflection.Metadata.MetadataReader,System.Reflection.Metadata.Handle,System.Boolean,System.String,System.String)", "", "Argument[4]", "ReturnValue", "taint", "dfc-generated"]
       - ["ILCompiler.Reflection.ReadyToRun", "MetadataNameFormatter", False, "MetadataNameFormatter", "(System.Reflection.Metadata.MetadataReader)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["ILCompiler.Reflection.ReadyToRun", "NativeArray", False, "NativeArray", "(System.Byte[],System.UInt32)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
       - ["ILCompiler.Reflection.ReadyToRun", "NativeCuckooFilter", False, "NativeCuckooFilter", "(System.Byte[],System.Int32,System.Int32)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
@@ -34,50 +34,49 @@ extensions:
       - ["ILCompiler.Reflection.ReadyToRun", "NativeHashtable", False, "NativeHashtable", "(System.Byte[],ILCompiler.Reflection.ReadyToRun.NativeParser,System.UInt32)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
       - ["ILCompiler.Reflection.ReadyToRun", "NativeParser", False, "GetParserFromRelativeOffset", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["ILCompiler.Reflection.ReadyToRun", "NativeParser", False, "NativeParser", "(System.Byte[],System.UInt32,System.Byte)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["ILCompiler.Reflection.ReadyToRun", "PgoInfo", False, "PgoInfo", "(ILCompiler.Reflection.ReadyToRun.PgoInfoKey,ILCompiler.Reflection.ReadyToRun.ReadyToRunReader,System.Int32,System.Byte[],System.Int32)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["ILCompiler.Reflection.ReadyToRun", "PgoInfo", False, "PgoInfo", "(ILCompiler.Reflection.ReadyToRun.PgoInfoKey,ILCompiler.Reflection.ReadyToRun.ReadyToRunReader,System.Int32,System.Byte[],System.Int32)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["ILCompiler.Reflection.ReadyToRun", "PgoInfo", False, "PgoInfo", "(ILCompiler.Reflection.ReadyToRun.PgoInfoKey,ILCompiler.Reflection.ReadyToRun.ReadyToRunReader,System.Int32,System.Byte[],System.Int32)", "", "Argument[3].Element", "Argument[this]", "taint", "df-generated"]
+      - ["ILCompiler.Reflection.ReadyToRun", "PgoInfo", False, "PgoInfo", "(ILCompiler.Reflection.ReadyToRun.PgoInfoKey,ILCompiler.Reflection.ReadyToRun.ReadyToRunReader,System.Int32,System.Byte[],System.Int32)", "", "Argument[0]", "Argument[this].Property[ILCompiler.Reflection.ReadyToRun.PgoInfo.Key]", "value", "dfc-generated"]
+      - ["ILCompiler.Reflection.ReadyToRun", "PgoInfo", False, "PgoInfo", "(ILCompiler.Reflection.ReadyToRun.PgoInfoKey,ILCompiler.Reflection.ReadyToRun.ReadyToRunReader,System.Int32,System.Byte[],System.Int32)", "", "Argument[3]", "Argument[this].Property[ILCompiler.Reflection.ReadyToRun.PgoInfo.Image]", "value", "dfc-generated"]
       - ["ILCompiler.Reflection.ReadyToRun", "PgoInfo", False, "ToString", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["ILCompiler.Reflection.ReadyToRun", "PgoInfo", False, "get_PgoData", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["ILCompiler.Reflection.ReadyToRun", "PgoInfoKey", False, "FromReadyToRunMethod", "(ILCompiler.Reflection.ReadyToRun.ReadyToRunMethod)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["ILCompiler.Reflection.ReadyToRun", "PgoInfoKey", False, "PgoInfoKey", "(ILCompiler.Reflection.ReadyToRun.IAssemblyMetadata,System.String,System.Reflection.Metadata.EntityHandle,System.String[])", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["ILCompiler.Reflection.ReadyToRun", "PgoInfoKey", False, "PgoInfoKey", "(ILCompiler.Reflection.ReadyToRun.IAssemblyMetadata,System.String,System.Reflection.Metadata.EntityHandle,System.String[])", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["ILCompiler.Reflection.ReadyToRun", "PgoInfoKey", False, "PgoInfoKey", "(ILCompiler.Reflection.ReadyToRun.IAssemblyMetadata,System.String,System.Reflection.Metadata.EntityHandle,System.String[])", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
-      - ["ILCompiler.Reflection.ReadyToRun", "PgoInfoKey", False, "PgoInfoKey", "(ILCompiler.Reflection.ReadyToRun.IAssemblyMetadata,System.String,System.Reflection.Metadata.EntityHandle,System.String[])", "", "Argument[3].Element", "Argument[this]", "taint", "df-generated"]
-      - ["ILCompiler.Reflection.ReadyToRun", "PgoInfoKey", False, "ToString", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["ILCompiler.Reflection.ReadyToRun", "R2RSignatureDecoder<TType,TMethod,TGenericContext>", False, "R2RSignatureDecoder", "(ILCompiler.Reflection.ReadyToRun.IR2RSignatureTypeProvider<TType,TMethod,TGenericContext>,TGenericContext,System.Reflection.Metadata.MetadataReader,ILCompiler.Reflection.ReadyToRun.ReadyToRunReader,System.Int32,System.Boolean)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["ILCompiler.Reflection.ReadyToRun", "R2RSignatureDecoder<TType,TMethod,TGenericContext>", False, "R2RSignatureDecoder", "(ILCompiler.Reflection.ReadyToRun.IR2RSignatureTypeProvider<TType,TMethod,TGenericContext>,TGenericContext,System.Reflection.Metadata.MetadataReader,ILCompiler.Reflection.ReadyToRun.ReadyToRunReader,System.Int32,System.Boolean)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["ILCompiler.Reflection.ReadyToRun", "R2RSignatureDecoder<TType,TMethod,TGenericContext>", False, "R2RSignatureDecoder", "(ILCompiler.Reflection.ReadyToRun.IR2RSignatureTypeProvider<TType,TMethod,TGenericContext>,TGenericContext,System.Reflection.Metadata.MetadataReader,ILCompiler.Reflection.ReadyToRun.ReadyToRunReader,System.Int32,System.Boolean)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
-      - ["ILCompiler.Reflection.ReadyToRun", "R2RSignatureDecoder<TType,TMethod,TGenericContext>", False, "R2RSignatureDecoder", "(ILCompiler.Reflection.ReadyToRun.IR2RSignatureTypeProvider<TType,TMethod,TGenericContext>,TGenericContext,System.Reflection.Metadata.MetadataReader,ILCompiler.Reflection.ReadyToRun.ReadyToRunReader,System.Int32,System.Boolean)", "", "Argument[3]", "Argument[this]", "taint", "df-generated"]
-      - ["ILCompiler.Reflection.ReadyToRun", "R2RSignatureDecoder<TType,TMethod,TGenericContext>", False, "R2RSignatureDecoder", "(ILCompiler.Reflection.ReadyToRun.IR2RSignatureTypeProvider<TType,TMethod,TGenericContext>,TGenericContext,System.Reflection.Metadata.MetadataReader,System.Byte[],System.Int32,System.Reflection.Metadata.MetadataReader,ILCompiler.Reflection.ReadyToRun.ReadyToRunReader,System.Boolean)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["ILCompiler.Reflection.ReadyToRun", "R2RSignatureDecoder<TType,TMethod,TGenericContext>", False, "R2RSignatureDecoder", "(ILCompiler.Reflection.ReadyToRun.IR2RSignatureTypeProvider<TType,TMethod,TGenericContext>,TGenericContext,System.Reflection.Metadata.MetadataReader,System.Byte[],System.Int32,System.Reflection.Metadata.MetadataReader,ILCompiler.Reflection.ReadyToRun.ReadyToRunReader,System.Boolean)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["ILCompiler.Reflection.ReadyToRun", "R2RSignatureDecoder<TType,TMethod,TGenericContext>", False, "R2RSignatureDecoder", "(ILCompiler.Reflection.ReadyToRun.IR2RSignatureTypeProvider<TType,TMethod,TGenericContext>,TGenericContext,System.Reflection.Metadata.MetadataReader,System.Byte[],System.Int32,System.Reflection.Metadata.MetadataReader,ILCompiler.Reflection.ReadyToRun.ReadyToRunReader,System.Boolean)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
-      - ["ILCompiler.Reflection.ReadyToRun", "R2RSignatureDecoder<TType,TMethod,TGenericContext>", False, "R2RSignatureDecoder", "(ILCompiler.Reflection.ReadyToRun.IR2RSignatureTypeProvider<TType,TMethod,TGenericContext>,TGenericContext,System.Reflection.Metadata.MetadataReader,System.Byte[],System.Int32,System.Reflection.Metadata.MetadataReader,ILCompiler.Reflection.ReadyToRun.ReadyToRunReader,System.Boolean)", "", "Argument[3].Element", "Argument[this]", "taint", "df-generated"]
-      - ["ILCompiler.Reflection.ReadyToRun", "R2RSignatureDecoder<TType,TMethod,TGenericContext>", False, "R2RSignatureDecoder", "(ILCompiler.Reflection.ReadyToRun.IR2RSignatureTypeProvider<TType,TMethod,TGenericContext>,TGenericContext,System.Reflection.Metadata.MetadataReader,System.Byte[],System.Int32,System.Reflection.Metadata.MetadataReader,ILCompiler.Reflection.ReadyToRun.ReadyToRunReader,System.Boolean)", "", "Argument[5]", "Argument[this]", "taint", "df-generated"]
-      - ["ILCompiler.Reflection.ReadyToRun", "R2RSignatureDecoder<TType,TMethod,TGenericContext>", False, "R2RSignatureDecoder", "(ILCompiler.Reflection.ReadyToRun.IR2RSignatureTypeProvider<TType,TMethod,TGenericContext>,TGenericContext,System.Reflection.Metadata.MetadataReader,System.Byte[],System.Int32,System.Reflection.Metadata.MetadataReader,ILCompiler.Reflection.ReadyToRun.ReadyToRunReader,System.Boolean)", "", "Argument[6]", "Argument[this]", "taint", "df-generated"]
+      - ["ILCompiler.Reflection.ReadyToRun", "PgoInfoKey", False, "PgoInfoKey", "(ILCompiler.Reflection.ReadyToRun.IAssemblyMetadata,System.String,System.Reflection.Metadata.EntityHandle,System.String[])", "", "Argument[0]", "Argument[this].Property[ILCompiler.Reflection.ReadyToRun.PgoInfoKey.ComponentReader]", "value", "dfc-generated"]
+      - ["ILCompiler.Reflection.ReadyToRun", "PgoInfoKey", False, "PgoInfoKey", "(ILCompiler.Reflection.ReadyToRun.IAssemblyMetadata,System.String,System.Reflection.Metadata.EntityHandle,System.String[])", "", "Argument[1]", "Argument[this].Property[ILCompiler.Reflection.ReadyToRun.PgoInfoKey.DeclaringType]", "value", "dfc-generated"]
+      - ["ILCompiler.Reflection.ReadyToRun", "PgoInfoKey", False, "PgoInfoKey", "(ILCompiler.Reflection.ReadyToRun.IAssemblyMetadata,System.String,System.Reflection.Metadata.EntityHandle,System.String[])", "", "Argument[1]", "Argument[this].Property[ILCompiler.Reflection.ReadyToRun.PgoInfoKey.SignatureString]", "taint", "dfc-generated"]
+      - ["ILCompiler.Reflection.ReadyToRun", "PgoInfoKey", False, "PgoInfoKey", "(ILCompiler.Reflection.ReadyToRun.IAssemblyMetadata,System.String,System.Reflection.Metadata.EntityHandle,System.String[])", "", "Argument[2]", "Argument[this].Property[ILCompiler.Reflection.ReadyToRun.PgoInfoKey.MethodHandle]", "value", "dfc-generated"]
+      - ["ILCompiler.Reflection.ReadyToRun", "PgoInfoKey", False, "PgoInfoKey", "(ILCompiler.Reflection.ReadyToRun.IAssemblyMetadata,System.String,System.Reflection.Metadata.EntityHandle,System.String[])", "", "Argument[3].Element", "Argument[this].Property[ILCompiler.Reflection.ReadyToRun.PgoInfoKey.SignatureString]", "taint", "dfc-generated"]
+      - ["ILCompiler.Reflection.ReadyToRun", "PgoInfoKey", False, "PgoInfoKey", "(ILCompiler.Reflection.ReadyToRun.IAssemblyMetadata,System.String,System.Reflection.Metadata.EntityHandle,System.String[])", "", "Argument[this].Property[ILCompiler.Reflection.ReadyToRun.PgoInfoKey.DeclaringType]", "Argument[this].Property[ILCompiler.Reflection.ReadyToRun.PgoInfoKey.SignatureString]", "taint", "dfc-generated"]
+      - ["ILCompiler.Reflection.ReadyToRun", "PgoInfoKey", False, "PgoInfoKey", "(ILCompiler.Reflection.ReadyToRun.IAssemblyMetadata,System.String,System.Reflection.Metadata.EntityHandle,System.String[])", "", "Argument[this].Property[ILCompiler.Reflection.ReadyToRun.PgoInfoKey.Name]", "Argument[this].Property[ILCompiler.Reflection.ReadyToRun.PgoInfoKey.SignatureString]", "taint", "dfc-generated"]
+      - ["ILCompiler.Reflection.ReadyToRun", "PgoInfoKey", False, "PgoInfoKey", "(ILCompiler.Reflection.ReadyToRun.IAssemblyMetadata,System.String,System.Reflection.Metadata.EntityHandle,System.String[])", "", "Argument[this].Property[ILCompiler.Reflection.ReadyToRun.PgoInfoKey.Signature].Property[System.Reflection.Metadata.MethodSignature`1.ReturnType]", "Argument[this].Property[ILCompiler.Reflection.ReadyToRun.PgoInfoKey.SignatureString]", "taint", "dfc-generated"]
+      - ["ILCompiler.Reflection.ReadyToRun", "PgoInfoKey", False, "ToString", "()", "", "Argument[this].Property[ILCompiler.Reflection.ReadyToRun.PgoInfoKey.SignatureString]", "ReturnValue", "value", "dfc-generated"]
+      - ["ILCompiler.Reflection.ReadyToRun", "R2RSignatureDecoder<TType,TMethod,TGenericContext>", False, "R2RSignatureDecoder", "(ILCompiler.Reflection.ReadyToRun.IR2RSignatureTypeProvider<TType,TMethod,TGenericContext>,TGenericContext,System.Reflection.Metadata.MetadataReader,ILCompiler.Reflection.ReadyToRun.ReadyToRunReader,System.Int32,System.Boolean)", "", "Argument[1]", "Argument[this].Property[ILCompiler.Reflection.ReadyToRun.R2RSignatureDecoder`3.Context]", "value", "dfc-generated"]
+      - ["ILCompiler.Reflection.ReadyToRun", "R2RSignatureDecoder<TType,TMethod,TGenericContext>", False, "R2RSignatureDecoder", "(ILCompiler.Reflection.ReadyToRun.IR2RSignatureTypeProvider<TType,TMethod,TGenericContext>,TGenericContext,System.Reflection.Metadata.MetadataReader,ILCompiler.Reflection.ReadyToRun.ReadyToRunReader,System.Int32,System.Boolean)", "", "Argument[2]", "Argument[this].Field[ILCompiler.Reflection.ReadyToRun.R2RSignatureDecoder`3._metadataReader]", "value", "dfc-generated"]
+      - ["ILCompiler.Reflection.ReadyToRun", "R2RSignatureDecoder<TType,TMethod,TGenericContext>", False, "R2RSignatureDecoder", "(ILCompiler.Reflection.ReadyToRun.IR2RSignatureTypeProvider<TType,TMethod,TGenericContext>,TGenericContext,System.Reflection.Metadata.MetadataReader,System.Byte[],System.Int32,System.Reflection.Metadata.MetadataReader,ILCompiler.Reflection.ReadyToRun.ReadyToRunReader,System.Boolean)", "", "Argument[1]", "Argument[this].Property[ILCompiler.Reflection.ReadyToRun.R2RSignatureDecoder`3.Context]", "value", "dfc-generated"]
+      - ["ILCompiler.Reflection.ReadyToRun", "R2RSignatureDecoder<TType,TMethod,TGenericContext>", False, "R2RSignatureDecoder", "(ILCompiler.Reflection.ReadyToRun.IR2RSignatureTypeProvider<TType,TMethod,TGenericContext>,TGenericContext,System.Reflection.Metadata.MetadataReader,System.Byte[],System.Int32,System.Reflection.Metadata.MetadataReader,ILCompiler.Reflection.ReadyToRun.ReadyToRunReader,System.Boolean)", "", "Argument[2]", "Argument[this].Field[ILCompiler.Reflection.ReadyToRun.R2RSignatureDecoder`3._metadataReader]", "value", "dfc-generated"]
+      - ["ILCompiler.Reflection.ReadyToRun", "R2RSignatureDecoder<TType,TMethod,TGenericContext>", False, "R2RSignatureDecoder", "(ILCompiler.Reflection.ReadyToRun.IR2RSignatureTypeProvider<TType,TMethod,TGenericContext>,TGenericContext,System.Reflection.Metadata.MetadataReader,System.Byte[],System.Int32,System.Reflection.Metadata.MetadataReader,ILCompiler.Reflection.ReadyToRun.ReadyToRunReader,System.Boolean)", "", "Argument[3]", "Argument[this].Field[ILCompiler.Reflection.ReadyToRun.R2RSignatureDecoder`3._image]", "value", "dfc-generated"]
       - ["ILCompiler.Reflection.ReadyToRun", "ReadyToRunAssembly", False, "get_AvailableTypes", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["ILCompiler.Reflection.ReadyToRun", "ReadyToRunAssembly", False, "get_Methods", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["ILCompiler.Reflection.ReadyToRun", "ReadyToRunHeader", False, "ToString", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["ILCompiler.Reflection.ReadyToRun", "ReadyToRunImportSection+ImportSectionEntry", False, "ImportSectionEntry", "(System.Int32,System.Int32,System.Int32,System.Int64,System.UInt32,ILCompiler.Reflection.ReadyToRun.ReadyToRunSignature)", "", "Argument[5]", "Argument[this]", "taint", "df-generated"]
-      - ["ILCompiler.Reflection.ReadyToRun", "ReadyToRunImportSection", False, "ReadyToRunImportSection", "(System.Int32,ILCompiler.Reflection.ReadyToRun.ReadyToRunReader,System.Int32,System.Int32,Internal.ReadyToRunConstants.ReadyToRunImportSectionFlags,Internal.ReadyToRunConstants.ReadyToRunImportSectionType,System.Byte,System.Int32,System.Collections.Generic.List<ILCompiler.Reflection.ReadyToRun.ReadyToRunImportSection+ImportSectionEntry>,System.Int32,System.Int32,System.Reflection.PortableExecutable.Machine,System.UInt16)", "", "Argument[8].Element", "Argument[this]", "taint", "df-generated"]
-      - ["ILCompiler.Reflection.ReadyToRun", "ReadyToRunMethod", False, "ReadyToRunMethod", "(ILCompiler.Reflection.ReadyToRun.ReadyToRunReader,ILCompiler.Reflection.ReadyToRun.IAssemblyMetadata,System.Reflection.Metadata.EntityHandle,System.Int32,System.String,System.String,System.String[],System.Nullable<System.Int32>)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["ILCompiler.Reflection.ReadyToRun", "ReadyToRunMethod", False, "ReadyToRunMethod", "(ILCompiler.Reflection.ReadyToRun.ReadyToRunReader,ILCompiler.Reflection.ReadyToRun.IAssemblyMetadata,System.Reflection.Metadata.EntityHandle,System.Int32,System.String,System.String,System.String[],System.Nullable<System.Int32>)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["ILCompiler.Reflection.ReadyToRun", "ReadyToRunMethod", False, "ReadyToRunMethod", "(ILCompiler.Reflection.ReadyToRun.ReadyToRunReader,ILCompiler.Reflection.ReadyToRun.IAssemblyMetadata,System.Reflection.Metadata.EntityHandle,System.Int32,System.String,System.String,System.String[],System.Nullable<System.Int32>)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
-      - ["ILCompiler.Reflection.ReadyToRun", "ReadyToRunMethod", False, "ReadyToRunMethod", "(ILCompiler.Reflection.ReadyToRun.ReadyToRunReader,ILCompiler.Reflection.ReadyToRun.IAssemblyMetadata,System.Reflection.Metadata.EntityHandle,System.Int32,System.String,System.String,System.String[],System.Nullable<System.Int32>)", "", "Argument[4]", "Argument[this]", "taint", "df-generated"]
-      - ["ILCompiler.Reflection.ReadyToRun", "ReadyToRunMethod", False, "ReadyToRunMethod", "(ILCompiler.Reflection.ReadyToRun.ReadyToRunReader,ILCompiler.Reflection.ReadyToRun.IAssemblyMetadata,System.Reflection.Metadata.EntityHandle,System.Int32,System.String,System.String,System.String[],System.Nullable<System.Int32>)", "", "Argument[6].Element", "Argument[this]", "taint", "df-generated"]
-      - ["ILCompiler.Reflection.ReadyToRun", "ReadyToRunMethod", False, "ReadyToRunMethod", "(ILCompiler.Reflection.ReadyToRun.ReadyToRunReader,ILCompiler.Reflection.ReadyToRun.IAssemblyMetadata,System.Reflection.Metadata.EntityHandle,System.Int32,System.String,System.String,System.String[],System.Nullable<System.Int32>)", "", "Argument[7]", "Argument[this]", "taint", "df-generated"]
+      - ["ILCompiler.Reflection.ReadyToRun", "ReadyToRunHeader", False, "ToString", "()", "", "Argument[this].Property[ILCompiler.Reflection.ReadyToRun.ReadyToRunHeader.SignatureString]", "ReturnValue", "taint", "dfc-generated"]
+      - ["ILCompiler.Reflection.ReadyToRun", "ReadyToRunImportSection+ImportSectionEntry", False, "ImportSectionEntry", "(System.Int32,System.Int32,System.Int32,System.Int64,System.UInt32,ILCompiler.Reflection.ReadyToRun.ReadyToRunSignature)", "", "Argument[5]", "Argument[this].Property[ILCompiler.Reflection.ReadyToRun.ReadyToRunImportSection+ImportSectionEntry.Signature]", "value", "dfc-generated"]
+      - ["ILCompiler.Reflection.ReadyToRun", "ReadyToRunImportSection", False, "ReadyToRunImportSection", "(System.Int32,ILCompiler.Reflection.ReadyToRun.ReadyToRunReader,System.Int32,System.Int32,Internal.ReadyToRunConstants.ReadyToRunImportSectionFlags,Internal.ReadyToRunConstants.ReadyToRunImportSectionType,System.Byte,System.Int32,System.Collections.Generic.List<ILCompiler.Reflection.ReadyToRun.ReadyToRunImportSection+ImportSectionEntry>,System.Int32,System.Int32,System.Reflection.PortableExecutable.Machine,System.UInt16)", "", "Argument[8]", "Argument[this].Property[ILCompiler.Reflection.ReadyToRun.ReadyToRunImportSection.Entries]", "value", "dfc-generated"]
+      - ["ILCompiler.Reflection.ReadyToRun", "ReadyToRunMethod", False, "ReadyToRunMethod", "(ILCompiler.Reflection.ReadyToRun.ReadyToRunReader,ILCompiler.Reflection.ReadyToRun.IAssemblyMetadata,System.Reflection.Metadata.EntityHandle,System.Int32,System.String,System.String,System.String[],System.Nullable<System.Int32>)", "", "Argument[1]", "Argument[this].Property[ILCompiler.Reflection.ReadyToRun.ReadyToRunMethod.ComponentReader]", "value", "dfc-generated"]
+      - ["ILCompiler.Reflection.ReadyToRun", "ReadyToRunMethod", False, "ReadyToRunMethod", "(ILCompiler.Reflection.ReadyToRun.ReadyToRunReader,ILCompiler.Reflection.ReadyToRun.IAssemblyMetadata,System.Reflection.Metadata.EntityHandle,System.Int32,System.String,System.String,System.String[],System.Nullable<System.Int32>)", "", "Argument[2]", "Argument[this].Property[ILCompiler.Reflection.ReadyToRun.ReadyToRunMethod.MethodHandle]", "value", "dfc-generated"]
+      - ["ILCompiler.Reflection.ReadyToRun", "ReadyToRunMethod", False, "ReadyToRunMethod", "(ILCompiler.Reflection.ReadyToRun.ReadyToRunReader,ILCompiler.Reflection.ReadyToRun.IAssemblyMetadata,System.Reflection.Metadata.EntityHandle,System.Int32,System.String,System.String,System.String[],System.Nullable<System.Int32>)", "", "Argument[4]", "Argument[this].Property[ILCompiler.Reflection.ReadyToRun.ReadyToRunMethod.DeclaringType]", "value", "dfc-generated"]
+      - ["ILCompiler.Reflection.ReadyToRun", "ReadyToRunMethod", False, "ReadyToRunMethod", "(ILCompiler.Reflection.ReadyToRun.ReadyToRunReader,ILCompiler.Reflection.ReadyToRun.IAssemblyMetadata,System.Reflection.Metadata.EntityHandle,System.Int32,System.String,System.String,System.String[],System.Nullable<System.Int32>)", "", "Argument[4]", "Argument[this].Property[ILCompiler.Reflection.ReadyToRun.ReadyToRunMethod.SignatureString]", "taint", "dfc-generated"]
+      - ["ILCompiler.Reflection.ReadyToRun", "ReadyToRunMethod", False, "ReadyToRunMethod", "(ILCompiler.Reflection.ReadyToRun.ReadyToRunReader,ILCompiler.Reflection.ReadyToRun.IAssemblyMetadata,System.Reflection.Metadata.EntityHandle,System.Int32,System.String,System.String,System.String[],System.Nullable<System.Int32>)", "", "Argument[6].Element", "Argument[this].Property[ILCompiler.Reflection.ReadyToRun.ReadyToRunMethod.InstanceArgs].Element", "value", "dfc-generated"]
+      - ["ILCompiler.Reflection.ReadyToRun", "ReadyToRunMethod", False, "ReadyToRunMethod", "(ILCompiler.Reflection.ReadyToRun.ReadyToRunReader,ILCompiler.Reflection.ReadyToRun.IAssemblyMetadata,System.Reflection.Metadata.EntityHandle,System.Int32,System.String,System.String,System.String[],System.Nullable<System.Int32>)", "", "Argument[6].Element", "Argument[this].Property[ILCompiler.Reflection.ReadyToRun.ReadyToRunMethod.SignatureString]", "taint", "dfc-generated"]
+      - ["ILCompiler.Reflection.ReadyToRun", "ReadyToRunMethod", False, "ReadyToRunMethod", "(ILCompiler.Reflection.ReadyToRun.ReadyToRunReader,ILCompiler.Reflection.ReadyToRun.IAssemblyMetadata,System.Reflection.Metadata.EntityHandle,System.Int32,System.String,System.String,System.String[],System.Nullable<System.Int32>)", "", "Argument[this].Property[ILCompiler.Reflection.ReadyToRun.ReadyToRunMethod.DeclaringType]", "Argument[this].Property[ILCompiler.Reflection.ReadyToRun.ReadyToRunMethod.SignatureString]", "taint", "dfc-generated"]
+      - ["ILCompiler.Reflection.ReadyToRun", "ReadyToRunMethod", False, "ReadyToRunMethod", "(ILCompiler.Reflection.ReadyToRun.ReadyToRunReader,ILCompiler.Reflection.ReadyToRun.IAssemblyMetadata,System.Reflection.Metadata.EntityHandle,System.Int32,System.String,System.String,System.String[],System.Nullable<System.Int32>)", "", "Argument[this].Property[ILCompiler.Reflection.ReadyToRun.ReadyToRunMethod.Name]", "Argument[this].Property[ILCompiler.Reflection.ReadyToRun.ReadyToRunMethod.SignatureString]", "taint", "dfc-generated"]
+      - ["ILCompiler.Reflection.ReadyToRun", "ReadyToRunMethod", False, "ReadyToRunMethod", "(ILCompiler.Reflection.ReadyToRun.ReadyToRunReader,ILCompiler.Reflection.ReadyToRun.IAssemblyMetadata,System.Reflection.Metadata.EntityHandle,System.Int32,System.String,System.String,System.String[],System.Nullable<System.Int32>)", "", "Argument[this].Property[ILCompiler.Reflection.ReadyToRun.ReadyToRunMethod.Signature].Property[System.Reflection.Metadata.MethodSignature`1.ReturnType]", "Argument[this].Property[ILCompiler.Reflection.ReadyToRun.ReadyToRunMethod.SignatureString]", "taint", "dfc-generated"]
       - ["ILCompiler.Reflection.ReadyToRun", "ReadyToRunMethod", False, "get_Fixups", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["ILCompiler.Reflection.ReadyToRun", "ReadyToRunMethod", False, "get_GcInfo", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["ILCompiler.Reflection.ReadyToRun", "ReadyToRunMethod", False, "get_PgoInfo", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["ILCompiler.Reflection.ReadyToRun", "ReadyToRunMethod", False, "get_RuntimeFunctions", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["ILCompiler.Reflection.ReadyToRun", "ReadyToRunReader", False, "GetCustomMethodToRuntimeFunctionMapping<TType,TMethod,TGenericContext>", "(ILCompiler.Reflection.ReadyToRun.IR2RSignatureTypeProvider<TType,TMethod,TGenericContext>)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["ILCompiler.Reflection.ReadyToRun", "ReadyToRunReader", False, "GetGlobalMetadata", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["ILCompiler.Reflection.ReadyToRun", "ReadyToRunReader", False, "ReadyToRunReader", "(ILCompiler.Reflection.ReadyToRun.IAssemblyResolver,ILCompiler.Reflection.ReadyToRun.IAssemblyMetadata,System.Reflection.PortableExecutable.PEReader,System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["ILCompiler.Reflection.ReadyToRun", "ReadyToRunReader", False, "ReadyToRunReader", "(ILCompiler.Reflection.ReadyToRun.IAssemblyResolver,ILCompiler.Reflection.ReadyToRun.IAssemblyMetadata,System.Reflection.PortableExecutable.PEReader,System.String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["ILCompiler.Reflection.ReadyToRun", "ReadyToRunReader", False, "ReadyToRunReader", "(ILCompiler.Reflection.ReadyToRun.IAssemblyResolver,ILCompiler.Reflection.ReadyToRun.IAssemblyMetadata,System.Reflection.PortableExecutable.PEReader,System.String)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
-      - ["ILCompiler.Reflection.ReadyToRun", "ReadyToRunReader", False, "ReadyToRunReader", "(ILCompiler.Reflection.ReadyToRun.IAssemblyResolver,ILCompiler.Reflection.ReadyToRun.IAssemblyMetadata,System.Reflection.PortableExecutable.PEReader,System.String)", "", "Argument[3]", "Argument[this]", "taint", "df-generated"]
-      - ["ILCompiler.Reflection.ReadyToRun", "ReadyToRunReader", False, "ReadyToRunReader", "(ILCompiler.Reflection.ReadyToRun.IAssemblyResolver,System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["ILCompiler.Reflection.ReadyToRun", "ReadyToRunReader", False, "ReadyToRunReader", "(ILCompiler.Reflection.ReadyToRun.IAssemblyResolver,System.String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["ILCompiler.Reflection.ReadyToRun", "ReadyToRunReader", False, "GetGlobalMetadata", "()", "", "Argument[this].SyntheticField[ILCompiler.Reflection.ReadyToRun.ReadyToRunReader._assemblyCache].Element", "ReturnValue", "value", "dfc-generated"]
+      - ["ILCompiler.Reflection.ReadyToRun", "ReadyToRunReader", False, "ReadyToRunReader", "(ILCompiler.Reflection.ReadyToRun.IAssemblyResolver,ILCompiler.Reflection.ReadyToRun.IAssemblyMetadata,System.Reflection.PortableExecutable.PEReader,System.String)", "", "Argument[1]", "Argument[this].SyntheticField[ILCompiler.Reflection.ReadyToRun.ReadyToRunReader._assemblyCache].Element", "value", "dfc-generated"]
+      - ["ILCompiler.Reflection.ReadyToRun", "ReadyToRunReader", False, "ReadyToRunReader", "(ILCompiler.Reflection.ReadyToRun.IAssemblyResolver,ILCompiler.Reflection.ReadyToRun.IAssemblyMetadata,System.Reflection.PortableExecutable.PEReader,System.String)", "", "Argument[2]", "Argument[this].Property[ILCompiler.Reflection.ReadyToRun.ReadyToRunReader.CompositeReader]", "value", "dfc-generated"]
+      - ["ILCompiler.Reflection.ReadyToRun", "ReadyToRunReader", False, "ReadyToRunReader", "(ILCompiler.Reflection.ReadyToRun.IAssemblyResolver,ILCompiler.Reflection.ReadyToRun.IAssemblyMetadata,System.Reflection.PortableExecutable.PEReader,System.String)", "", "Argument[3]", "Argument[this].Property[ILCompiler.Reflection.ReadyToRun.ReadyToRunReader.Filename]", "value", "dfc-generated"]
+      - ["ILCompiler.Reflection.ReadyToRun", "ReadyToRunReader", False, "ReadyToRunReader", "(ILCompiler.Reflection.ReadyToRun.IAssemblyResolver,System.String)", "", "Argument[1]", "Argument[this].Property[ILCompiler.Reflection.ReadyToRun.ReadyToRunReader.Filename]", "value", "dfc-generated"]
       - ["ILCompiler.Reflection.ReadyToRun", "ReadyToRunReader", False, "get_AllPgoInfos", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["ILCompiler.Reflection.ReadyToRun", "ReadyToRunReader", False, "get_CompilerIdentifier", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["ILCompiler.Reflection.ReadyToRun", "ReadyToRunReader", False, "get_ImportSections", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
@@ -90,26 +89,26 @@ extensions:
       - ["ILCompiler.Reflection.ReadyToRun", "ReadyToRunReader", False, "get_ReadyToRunAssemblyHeaders", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["ILCompiler.Reflection.ReadyToRun", "ReadyToRunReader", False, "get_ReadyToRunHeader", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["ILCompiler.Reflection.ReadyToRun", "ReadyToRunSignature", False, "ReadyToRunSignature", "(ILCompiler.Reflection.ReadyToRun.SignatureDecoder,Internal.ReadyToRunConstants.ReadyToRunFixupKind)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["ILCompiler.Reflection.ReadyToRun", "RuntimeFunction", False, "RuntimeFunction", "(ILCompiler.Reflection.ReadyToRun.ReadyToRunReader,System.Int32,System.Int32,System.Int32,System.Int32,System.Int32,ILCompiler.Reflection.ReadyToRun.ReadyToRunMethod,ILCompiler.Reflection.ReadyToRun.BaseUnwindInfo)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["ILCompiler.Reflection.ReadyToRun", "RuntimeFunction", False, "RuntimeFunction", "(ILCompiler.Reflection.ReadyToRun.ReadyToRunReader,System.Int32,System.Int32,System.Int32,System.Int32,System.Int32,ILCompiler.Reflection.ReadyToRun.ReadyToRunMethod,ILCompiler.Reflection.ReadyToRun.BaseUnwindInfo)", "", "Argument[6]", "Argument[this]", "taint", "df-generated"]
-      - ["ILCompiler.Reflection.ReadyToRun", "RuntimeFunction", False, "RuntimeFunction", "(ILCompiler.Reflection.ReadyToRun.ReadyToRunReader,System.Int32,System.Int32,System.Int32,System.Int32,System.Int32,ILCompiler.Reflection.ReadyToRun.ReadyToRunMethod,ILCompiler.Reflection.ReadyToRun.BaseUnwindInfo)", "", "Argument[7]", "Argument[this]", "taint", "df-generated"]
+      - ["ILCompiler.Reflection.ReadyToRun", "RuntimeFunction", False, "RuntimeFunction", "(ILCompiler.Reflection.ReadyToRun.ReadyToRunReader,System.Int32,System.Int32,System.Int32,System.Int32,System.Int32,ILCompiler.Reflection.ReadyToRun.ReadyToRunMethod,ILCompiler.Reflection.ReadyToRun.BaseUnwindInfo)", "", "Argument[6]", "Argument[this].Property[ILCompiler.Reflection.ReadyToRun.RuntimeFunction.Method]", "value", "dfc-generated"]
+      - ["ILCompiler.Reflection.ReadyToRun", "RuntimeFunction", False, "RuntimeFunction", "(ILCompiler.Reflection.ReadyToRun.ReadyToRunReader,System.Int32,System.Int32,System.Int32,System.Int32,System.Int32,ILCompiler.Reflection.ReadyToRun.ReadyToRunMethod,ILCompiler.Reflection.ReadyToRun.BaseUnwindInfo)", "", "Argument[7]", "Argument[this].Property[ILCompiler.Reflection.ReadyToRun.RuntimeFunction.UnwindInfo]", "value", "dfc-generated"]
       - ["ILCompiler.Reflection.ReadyToRun", "RuntimeFunction", False, "get_DebugInfo", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["ILCompiler.Reflection.ReadyToRun", "RuntimeFunction", False, "get_EHInfo", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["ILCompiler.Reflection.ReadyToRun", "SignatureDecoder", False, "GetMetadataReaderFromModuleOverride", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["ILCompiler.Reflection.ReadyToRun", "StandaloneAssemblyMetadata", False, "StandaloneAssemblyMetadata", "(System.Reflection.PortableExecutable.PEReader)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["ILCompiler.Reflection.ReadyToRun", "StringBuilderExtensions", False, "AppendEscapedString", "(System.Text.StringBuilder,System.String,System.Boolean)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["ILCompiler.Reflection.ReadyToRun", "StringTypeProviderBase<TGenericContext>", True, "GetArrayType", "(System.String,System.Reflection.Metadata.ArrayShape)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["ILCompiler.Reflection.ReadyToRun", "StringTypeProviderBase<TGenericContext>", True, "GetByReferenceType", "(System.String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["ILCompiler.Reflection.ReadyToRun", "StringTypeProviderBase<TGenericContext>", True, "GetFunctionPointerType", "(System.Reflection.Metadata.MethodSignature<System.String>)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["ILCompiler.Reflection.ReadyToRun", "StringTypeProviderBase<TGenericContext>", True, "GetGenericInstantiation", "(System.String,System.Collections.Immutable.ImmutableArray<System.String>)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["ILCompiler.Reflection.ReadyToRun", "StringTypeProviderBase<TGenericContext>", True, "GetGenericInstantiation", "(System.String,System.Collections.Immutable.ImmutableArray<System.String>)", "", "Argument[1].Element", "ReturnValue", "taint", "df-generated"]
-      - ["ILCompiler.Reflection.ReadyToRun", "StringTypeProviderBase<TGenericContext>", True, "GetModifiedType", "(System.String,System.String,System.Boolean)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["ILCompiler.Reflection.ReadyToRun", "StringTypeProviderBase<TGenericContext>", True, "GetModifiedType", "(System.String,System.String,System.Boolean)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["ILCompiler.Reflection.ReadyToRun", "StringTypeProviderBase<TGenericContext>", True, "GetPinnedType", "(System.String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["ILCompiler.Reflection.ReadyToRun", "StringTypeProviderBase<TGenericContext>", True, "GetPointerType", "(System.String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["ILCompiler.Reflection.ReadyToRun", "StringTypeProviderBase<TGenericContext>", True, "GetSZArrayType", "(System.String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["ILCompiler.Reflection.ReadyToRun", "TextSignatureDecoderContext", False, "TextSignatureDecoderContext", "(ILCompiler.Reflection.ReadyToRun.IAssemblyResolver,ILCompiler.Reflection.ReadyToRun.SignatureFormattingOptions)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["ILCompiler.Reflection.ReadyToRun", "TextSignatureDecoderContext", False, "TextSignatureDecoderContext", "(ILCompiler.Reflection.ReadyToRun.IAssemblyResolver,ILCompiler.Reflection.ReadyToRun.SignatureFormattingOptions)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["ILCompiler.Reflection.ReadyToRun", "StandaloneAssemblyMetadata", False, "StandaloneAssemblyMetadata", "(System.Reflection.PortableExecutable.PEReader)", "", "Argument[0]", "Argument[this].SyntheticField[ILCompiler.Reflection.ReadyToRun.StandaloneAssemblyMetadata._peReader]", "value", "dfc-generated"]
+      - ["ILCompiler.Reflection.ReadyToRun", "StandaloneAssemblyMetadata", False, "get_ImageReader", "()", "", "Argument[this].SyntheticField[ILCompiler.Reflection.ReadyToRun.StandaloneAssemblyMetadata._peReader]", "ReturnValue", "value", "dfc-generated"]
+      - ["ILCompiler.Reflection.ReadyToRun", "StringBuilderExtensions", False, "AppendEscapedString", "(System.Text.StringBuilder,System.String,System.Boolean)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["ILCompiler.Reflection.ReadyToRun", "StringTypeProviderBase<TGenericContext>", True, "GetArrayType", "(System.String,System.Reflection.Metadata.ArrayShape)", "", "Argument[0]", "ReturnValue", "taint", "dfc-generated"]
+      - ["ILCompiler.Reflection.ReadyToRun", "StringTypeProviderBase<TGenericContext>", True, "GetByReferenceType", "(System.String)", "", "Argument[0]", "ReturnValue", "taint", "dfc-generated"]
+      - ["ILCompiler.Reflection.ReadyToRun", "StringTypeProviderBase<TGenericContext>", True, "GetFunctionPointerType", "(System.Reflection.Metadata.MethodSignature<System.String>)", "", "Argument[0].Property[System.Reflection.Metadata.MethodSignature`1.ReturnType]", "ReturnValue", "taint", "dfc-generated"]
+      - ["ILCompiler.Reflection.ReadyToRun", "StringTypeProviderBase<TGenericContext>", True, "GetGenericInstantiation", "(System.String,System.Collections.Immutable.ImmutableArray<System.String>)", "", "Argument[0]", "ReturnValue", "taint", "dfc-generated"]
+      - ["ILCompiler.Reflection.ReadyToRun", "StringTypeProviderBase<TGenericContext>", True, "GetGenericInstantiation", "(System.String,System.Collections.Immutable.ImmutableArray<System.String>)", "", "Argument[1].Element", "ReturnValue", "taint", "dfc-generated"]
+      - ["ILCompiler.Reflection.ReadyToRun", "StringTypeProviderBase<TGenericContext>", True, "GetModifiedType", "(System.String,System.String,System.Boolean)", "", "Argument[0]", "ReturnValue", "taint", "dfc-generated"]
+      - ["ILCompiler.Reflection.ReadyToRun", "StringTypeProviderBase<TGenericContext>", True, "GetModifiedType", "(System.String,System.String,System.Boolean)", "", "Argument[1]", "ReturnValue", "taint", "dfc-generated"]
+      - ["ILCompiler.Reflection.ReadyToRun", "StringTypeProviderBase<TGenericContext>", True, "GetPinnedType", "(System.String)", "", "Argument[0]", "ReturnValue", "taint", "dfc-generated"]
+      - ["ILCompiler.Reflection.ReadyToRun", "StringTypeProviderBase<TGenericContext>", True, "GetPointerType", "(System.String)", "", "Argument[0]", "ReturnValue", "taint", "dfc-generated"]
+      - ["ILCompiler.Reflection.ReadyToRun", "StringTypeProviderBase<TGenericContext>", True, "GetSZArrayType", "(System.String)", "", "Argument[0]", "ReturnValue", "taint", "dfc-generated"]
+      - ["ILCompiler.Reflection.ReadyToRun", "TextSignatureDecoderContext", False, "TextSignatureDecoderContext", "(ILCompiler.Reflection.ReadyToRun.IAssemblyResolver,ILCompiler.Reflection.ReadyToRun.SignatureFormattingOptions)", "", "Argument[0]", "Argument[this].Property[ILCompiler.Reflection.ReadyToRun.TextSignatureDecoderContext.AssemblyResolver]", "value", "dfc-generated"]
+      - ["ILCompiler.Reflection.ReadyToRun", "TextSignatureDecoderContext", False, "TextSignatureDecoderContext", "(ILCompiler.Reflection.ReadyToRun.IAssemblyResolver,ILCompiler.Reflection.ReadyToRun.SignatureFormattingOptions)", "", "Argument[1]", "Argument[this].Property[ILCompiler.Reflection.ReadyToRun.TextSignatureDecoderContext.Options]", "value", "dfc-generated"]
   - addsTo:
       pack: codeql/csharp-all
       extensible: neutralModel
diff --git a/csharp/ql/lib/ext/generated/ILCompiler.Reflection.ReadyToRun.x86.model.yml b/csharp/ql/lib/ext/generated/ILCompiler.Reflection.ReadyToRun.x86.model.yml
index c1bd08f9841..51134c57b04 100644
--- a/csharp/ql/lib/ext/generated/ILCompiler.Reflection.ReadyToRun.x86.model.yml
+++ b/csharp/ql/lib/ext/generated/ILCompiler.Reflection.ReadyToRun.x86.model.yml
@@ -4,10 +4,11 @@ extensions:
       pack: codeql/csharp-all
       extensible: summaryModel
     data:
-      - ["ILCompiler.Reflection.ReadyToRun.x86", "GcInfo", False, "ToString", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["ILCompiler.Reflection.ReadyToRun.x86", "GcSlotTable+GcSlot", False, "GcSlot", "(System.Int32,System.String,System.Int32,System.Int32,ILCompiler.Reflection.ReadyToRun.GcSlotFlags)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["ILCompiler.Reflection.ReadyToRun.x86", "GcSlotTable+GcSlot", False, "GcSlot", "(System.Int32,System.String,System.Int32,System.Int32,System.Int32,System.Int32,ILCompiler.Reflection.ReadyToRun.GcSlotFlags)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["ILCompiler.Reflection.ReadyToRun.x86", "GcSlotTable+GcSlot", False, "ToString", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["ILCompiler.Reflection.ReadyToRun.x86", "GcInfo", False, "ToString", "()", "", "Argument[this].Property[ILCompiler.Reflection.ReadyToRun.x86.GcInfo.Header]", "ReturnValue", "taint", "dfc-generated"]
+      - ["ILCompiler.Reflection.ReadyToRun.x86", "GcInfo", False, "ToString", "()", "", "Argument[this].Property[ILCompiler.Reflection.ReadyToRun.x86.GcInfo.SlotTable]", "ReturnValue", "taint", "dfc-generated"]
+      - ["ILCompiler.Reflection.ReadyToRun.x86", "GcSlotTable+GcSlot", False, "GcSlot", "(System.Int32,System.String,System.Int32,System.Int32,ILCompiler.Reflection.ReadyToRun.GcSlotFlags)", "", "Argument[1]", "Argument[this].Property[ILCompiler.Reflection.ReadyToRun.x86.GcSlotTable+GcSlot.Register]", "value", "dfc-generated"]
+      - ["ILCompiler.Reflection.ReadyToRun.x86", "GcSlotTable+GcSlot", False, "GcSlot", "(System.Int32,System.String,System.Int32,System.Int32,System.Int32,System.Int32,ILCompiler.Reflection.ReadyToRun.GcSlotFlags)", "", "Argument[1]", "Argument[this].Property[ILCompiler.Reflection.ReadyToRun.x86.GcSlotTable+GcSlot.Register]", "taint", "dfc-generated"]
+      - ["ILCompiler.Reflection.ReadyToRun.x86", "GcSlotTable+GcSlot", False, "ToString", "()", "", "Argument[this].Property[ILCompiler.Reflection.ReadyToRun.x86.GcSlotTable+GcSlot.Register]", "ReturnValue", "taint", "dfc-generated"]
       - ["ILCompiler.Reflection.ReadyToRun.x86", "GcSlotTable", False, "ToString", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
   - addsTo:
       pack: codeql/csharp-all
diff --git a/csharp/ql/lib/ext/generated/ILCompiler.model.yml b/csharp/ql/lib/ext/generated/ILCompiler.model.yml
index 2fac421a499..ae4c00e5b18 100644
--- a/csharp/ql/lib/ext/generated/ILCompiler.model.yml
+++ b/csharp/ql/lib/ext/generated/ILCompiler.model.yml
@@ -4,20 +4,21 @@ extensions:
       pack: codeql/csharp-all
       extensible: summaryModel
     data:
-      - ["ILCompiler", "MethodProfileData", False, "MethodProfileData", "(Internal.TypeSystem.MethodDesc,ILCompiler.MethodProfilingDataFlags,System.Double,System.Collections.Generic.Dictionary<Internal.TypeSystem.MethodDesc,System.Int32>,System.UInt32,Internal.Pgo.PgoSchemaElem[])", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["ILCompiler", "MethodProfileData", False, "MethodProfileData", "(Internal.TypeSystem.MethodDesc,ILCompiler.MethodProfilingDataFlags,System.Double,System.Collections.Generic.Dictionary<Internal.TypeSystem.MethodDesc,System.Int32>,System.UInt32,Internal.Pgo.PgoSchemaElem[])", "", "Argument[3].Element", "Argument[this]", "taint", "df-generated"]
-      - ["ILCompiler", "MethodProfileData", False, "MethodProfileData", "(Internal.TypeSystem.MethodDesc,ILCompiler.MethodProfilingDataFlags,System.Double,System.Collections.Generic.Dictionary<Internal.TypeSystem.MethodDesc,System.Int32>,System.UInt32,Internal.Pgo.PgoSchemaElem[])", "", "Argument[5].Element", "Argument[this]", "taint", "df-generated"]
+      - ["ILCompiler", "MethodProfileData", False, "MethodProfileData", "(Internal.TypeSystem.MethodDesc,ILCompiler.MethodProfilingDataFlags,System.Double,System.Collections.Generic.Dictionary<Internal.TypeSystem.MethodDesc,System.Int32>,System.UInt32,Internal.Pgo.PgoSchemaElem[])", "", "Argument[0]", "Argument[this].Field[ILCompiler.MethodProfileData.Method]", "value", "dfc-generated"]
+      - ["ILCompiler", "MethodProfileData", False, "MethodProfileData", "(Internal.TypeSystem.MethodDesc,ILCompiler.MethodProfilingDataFlags,System.Double,System.Collections.Generic.Dictionary<Internal.TypeSystem.MethodDesc,System.Int32>,System.UInt32,Internal.Pgo.PgoSchemaElem[])", "", "Argument[3]", "Argument[this].Field[ILCompiler.MethodProfileData.CallWeights]", "value", "dfc-generated"]
+      - ["ILCompiler", "MethodProfileData", False, "MethodProfileData", "(Internal.TypeSystem.MethodDesc,ILCompiler.MethodProfilingDataFlags,System.Double,System.Collections.Generic.Dictionary<Internal.TypeSystem.MethodDesc,System.Int32>,System.UInt32,Internal.Pgo.PgoSchemaElem[])", "", "Argument[5]", "Argument[this].Field[ILCompiler.MethodProfileData.SchemaData]", "value", "dfc-generated"]
       - ["ILCompiler", "ProfileData", False, "MergeProfileData", "(System.Collections.Generic.Dictionary<Internal.TypeSystem.MethodDesc,ILCompiler.MethodProfileData>,ILCompiler.ProfileData)", "", "Argument[1]", "Argument[0].Element", "taint", "df-generated"]
       - ["ILCompiler", "ProfileData", True, "GetAllMethodProfileData", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["ILCompiler", "ProfileData", True, "get_Config", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
   - addsTo:
       pack: codeql/csharp-all
       extensible: neutralModel
     data:
       - ["ILCompiler", "EmptyProfileData", "GetMethodBlockCount", "(Internal.TypeSystem.MethodDesc)", "summary", "df-generated"]
       - ["ILCompiler", "EmptyProfileData", "GetMethodProfileData", "(Internal.TypeSystem.MethodDesc)", "summary", "df-generated"]
+      - ["ILCompiler", "EmptyProfileData", "get_Config", "()", "summary", "df-generated"]
       - ["ILCompiler", "EmptyProfileData", "get_PartialNGen", "()", "summary", "df-generated"]
       - ["ILCompiler", "EmptyProfileData", "get_Singleton", "()", "summary", "df-generated"]
       - ["ILCompiler", "ProfileData", "GetMethodBlockCount", "(Internal.TypeSystem.MethodDesc)", "summary", "df-generated"]
       - ["ILCompiler", "ProfileData", "GetMethodProfileData", "(Internal.TypeSystem.MethodDesc)", "summary", "df-generated"]
+      - ["ILCompiler", "ProfileData", "get_Config", "()", "summary", "df-generated"]
       - ["ILCompiler", "ProfileData", "get_PartialNGen", "()", "summary", "df-generated"]
diff --git a/csharp/ql/lib/ext/generated/ILLink.RoslynAnalyzer.DataFlow.model.yml b/csharp/ql/lib/ext/generated/ILLink.RoslynAnalyzer.DataFlow.model.yml
index 8aed78bb3d0..6e944d379af 100644
--- a/csharp/ql/lib/ext/generated/ILLink.RoslynAnalyzer.DataFlow.model.yml
+++ b/csharp/ql/lib/ext/generated/ILLink.RoslynAnalyzer.DataFlow.model.yml
@@ -4,7 +4,7 @@ extensions:
       pack: codeql/csharp-all
       extensible: summaryModel
     data:
-      - ["ILLink.RoslynAnalyzer.DataFlow", "CapturedReferenceValue", False, "CapturedReferenceValue", "(Microsoft.CodeAnalysis.IOperation)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["ILLink.RoslynAnalyzer.DataFlow", "CapturedReferenceValue", False, "CapturedReferenceValue", "(Microsoft.CodeAnalysis.IOperation)", "", "Argument[0]", "Argument[this].Field[ILLink.RoslynAnalyzer.DataFlow.CapturedReferenceValue.Reference]", "value", "dfc-generated"]
       - ["ILLink.RoslynAnalyzer.DataFlow", "FeatureChecksValue", False, "And", "(ILLink.RoslynAnalyzer.DataFlow.FeatureChecksValue)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["ILLink.RoslynAnalyzer.DataFlow", "FeatureChecksValue", False, "And", "(ILLink.RoslynAnalyzer.DataFlow.FeatureChecksValue)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["ILLink.RoslynAnalyzer.DataFlow", "FeatureChecksValue", False, "FeatureChecksValue", "(System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
@@ -12,37 +12,33 @@ extensions:
       - ["ILLink.RoslynAnalyzer.DataFlow", "FeatureChecksValue", False, "Or", "(ILLink.RoslynAnalyzer.DataFlow.FeatureChecksValue)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["ILLink.RoslynAnalyzer.DataFlow", "FeatureChecksValue", False, "Or", "(ILLink.RoslynAnalyzer.DataFlow.FeatureChecksValue)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["ILLink.RoslynAnalyzer.DataFlow", "FeatureChecksVisitor", False, "FeatureChecksVisitor", "(ILLink.RoslynAnalyzer.DataFlowAnalyzerContext)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["ILLink.RoslynAnalyzer.DataFlow", "FeatureContext", False, "DeepCopy", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["ILLink.RoslynAnalyzer.DataFlow", "FeatureContext", False, "FeatureContext", "(ILLink.Shared.DataFlow.ValueSet<System.String>)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["ILLink.RoslynAnalyzer.DataFlow", "FeatureContext", False, "Intersection", "(ILLink.RoslynAnalyzer.DataFlow.FeatureContext)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["ILLink.RoslynAnalyzer.DataFlow", "FeatureContext", False, "Intersection", "(ILLink.RoslynAnalyzer.DataFlow.FeatureContext)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["ILLink.RoslynAnalyzer.DataFlow", "FeatureContext", False, "Union", "(ILLink.RoslynAnalyzer.DataFlow.FeatureContext)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["ILLink.RoslynAnalyzer.DataFlow", "FeatureContext", False, "Union", "(ILLink.RoslynAnalyzer.DataFlow.FeatureContext)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["ILLink.RoslynAnalyzer.DataFlow", "FeatureContextLattice", False, "Meet", "(ILLink.RoslynAnalyzer.DataFlow.FeatureContext,ILLink.RoslynAnalyzer.DataFlow.FeatureContext)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["ILLink.RoslynAnalyzer.DataFlow", "FeatureContextLattice", False, "Meet", "(ILLink.RoslynAnalyzer.DataFlow.FeatureContext,ILLink.RoslynAnalyzer.DataFlow.FeatureContext)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["ILLink.RoslynAnalyzer.DataFlow", "FeatureContext", False, "DeepCopy", "()", "", "Argument[this].Field[ILLink.RoslynAnalyzer.DataFlow.FeatureContext.EnabledFeatures]", "ReturnValue.Field[ILLink.RoslynAnalyzer.DataFlow.FeatureContext.EnabledFeatures]", "value", "dfc-generated"]
+      - ["ILLink.RoslynAnalyzer.DataFlow", "FeatureContext", False, "FeatureContext", "(ILLink.Shared.DataFlow.ValueSet<System.String>)", "", "Argument[0]", "Argument[this].Field[ILLink.RoslynAnalyzer.DataFlow.FeatureContext.EnabledFeatures]", "value", "dfc-generated"]
+      - ["ILLink.RoslynAnalyzer.DataFlow", "FeatureContext", False, "Intersection", "(ILLink.RoslynAnalyzer.DataFlow.FeatureContext)", "", "Argument[0].Field[ILLink.RoslynAnalyzer.DataFlow.FeatureContext.EnabledFeatures]", "ReturnValue.Field[ILLink.RoslynAnalyzer.DataFlow.FeatureContext.EnabledFeatures]", "value", "dfc-generated"]
+      - ["ILLink.RoslynAnalyzer.DataFlow", "FeatureContext", False, "Intersection", "(ILLink.RoslynAnalyzer.DataFlow.FeatureContext)", "", "Argument[this].Field[ILLink.RoslynAnalyzer.DataFlow.FeatureContext.EnabledFeatures]", "ReturnValue.Field[ILLink.RoslynAnalyzer.DataFlow.FeatureContext.EnabledFeatures]", "value", "dfc-generated"]
+      - ["ILLink.RoslynAnalyzer.DataFlow", "FeatureContext", False, "Union", "(ILLink.RoslynAnalyzer.DataFlow.FeatureContext)", "", "Argument[0].Field[ILLink.RoslynAnalyzer.DataFlow.FeatureContext.EnabledFeatures]", "ReturnValue.Field[ILLink.RoslynAnalyzer.DataFlow.FeatureContext.EnabledFeatures]", "value", "dfc-generated"]
+      - ["ILLink.RoslynAnalyzer.DataFlow", "FeatureContext", False, "Union", "(ILLink.RoslynAnalyzer.DataFlow.FeatureContext)", "", "Argument[this].Field[ILLink.RoslynAnalyzer.DataFlow.FeatureContext.EnabledFeatures]", "ReturnValue.Field[ILLink.RoslynAnalyzer.DataFlow.FeatureContext.EnabledFeatures]", "value", "dfc-generated"]
+      - ["ILLink.RoslynAnalyzer.DataFlow", "FeatureContextLattice", False, "Meet", "(ILLink.RoslynAnalyzer.DataFlow.FeatureContext,ILLink.RoslynAnalyzer.DataFlow.FeatureContext)", "", "Argument[0].Field[ILLink.RoslynAnalyzer.DataFlow.FeatureContext.EnabledFeatures]", "ReturnValue.Field[ILLink.RoslynAnalyzer.DataFlow.FeatureContext.EnabledFeatures]", "value", "dfc-generated"]
+      - ["ILLink.RoslynAnalyzer.DataFlow", "FeatureContextLattice", False, "Meet", "(ILLink.RoslynAnalyzer.DataFlow.FeatureContext,ILLink.RoslynAnalyzer.DataFlow.FeatureContext)", "", "Argument[1].Field[ILLink.RoslynAnalyzer.DataFlow.FeatureContext.EnabledFeatures]", "ReturnValue.Field[ILLink.RoslynAnalyzer.DataFlow.FeatureContext.EnabledFeatures]", "value", "dfc-generated"]
       - ["ILLink.RoslynAnalyzer.DataFlow", "InterproceduralState<TValue,TValueLattice>", False, "Clone", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["ILLink.RoslynAnalyzer.DataFlow", "InterproceduralState<TValue,TValueLattice>", False, "InterproceduralState", "(ILLink.Shared.DataFlow.ValueSet<ILLink.RoslynAnalyzer.DataFlow.MethodBodyValue>,ILLink.Shared.DataFlow.DefaultValueDictionary<ILLink.RoslynAnalyzer.DataFlow.LocalKey,ILLink.Shared.DataFlow.Maybe<TValue>>,ILLink.RoslynAnalyzer.DataFlow.InterproceduralStateLattice<TValue,TValueLattice>)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["ILLink.RoslynAnalyzer.DataFlow", "InterproceduralState<TValue,TValueLattice>", False, "InterproceduralState", "(ILLink.Shared.DataFlow.ValueSet<ILLink.RoslynAnalyzer.DataFlow.MethodBodyValue>,ILLink.Shared.DataFlow.DefaultValueDictionary<ILLink.RoslynAnalyzer.DataFlow.LocalKey,ILLink.Shared.DataFlow.Maybe<TValue>>,ILLink.RoslynAnalyzer.DataFlow.InterproceduralStateLattice<TValue,TValueLattice>)", "", "Argument[1].Element", "Argument[this]", "taint", "df-generated"]
-      - ["ILLink.RoslynAnalyzer.DataFlow", "InterproceduralState<TValue,TValueLattice>", False, "InterproceduralState", "(ILLink.Shared.DataFlow.ValueSet<ILLink.RoslynAnalyzer.DataFlow.MethodBodyValue>,ILLink.Shared.DataFlow.DefaultValueDictionary<ILLink.RoslynAnalyzer.DataFlow.LocalKey,ILLink.Shared.DataFlow.Maybe<TValue>>,ILLink.RoslynAnalyzer.DataFlow.InterproceduralStateLattice<TValue,TValueLattice>)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
-      - ["ILLink.RoslynAnalyzer.DataFlow", "InterproceduralStateLattice<TValue,TValueLattice>", False, "InterproceduralStateLattice", "(ILLink.Shared.DataFlow.ValueSetLattice<ILLink.RoslynAnalyzer.DataFlow.MethodBodyValue>,ILLink.Shared.DataFlow.DictionaryLattice<ILLink.RoslynAnalyzer.DataFlow.LocalKey,ILLink.Shared.DataFlow.Maybe<TValue>,ILLink.Shared.DataFlow.MaybeLattice<TValue,TValueLattice>>)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["ILLink.RoslynAnalyzer.DataFlow", "InterproceduralStateLattice<TValue,TValueLattice>", False, "InterproceduralStateLattice", "(ILLink.Shared.DataFlow.ValueSetLattice<ILLink.RoslynAnalyzer.DataFlow.MethodBodyValue>,ILLink.Shared.DataFlow.DictionaryLattice<ILLink.RoslynAnalyzer.DataFlow.LocalKey,ILLink.Shared.DataFlow.Maybe<TValue>,ILLink.Shared.DataFlow.MaybeLattice<TValue,TValueLattice>>)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["ILLink.RoslynAnalyzer.DataFlow", "InterproceduralStateLattice<TValue,TValueLattice>", False, "Meet", "(ILLink.RoslynAnalyzer.DataFlow.InterproceduralState<TValue,TValueLattice>,ILLink.RoslynAnalyzer.DataFlow.InterproceduralState<TValue,TValueLattice>)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["ILLink.RoslynAnalyzer.DataFlow", "InterproceduralStateLattice<TValue,TValueLattice>", False, "Meet", "(ILLink.RoslynAnalyzer.DataFlow.InterproceduralState<TValue,TValueLattice>,ILLink.RoslynAnalyzer.DataFlow.InterproceduralState<TValue,TValueLattice>)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["ILLink.RoslynAnalyzer.DataFlow", "InterproceduralStateLattice<TValue,TValueLattice>", False, "Meet", "(ILLink.RoslynAnalyzer.DataFlow.InterproceduralState<TValue,TValueLattice>,ILLink.RoslynAnalyzer.DataFlow.InterproceduralState<TValue,TValueLattice>)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["ILLink.RoslynAnalyzer.DataFlow", "InterproceduralStateLattice<TValue,TValueLattice>", False, "get_Top", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["ILLink.RoslynAnalyzer.DataFlow", "LocalDataFlowAnalysis<TValue,TContext,TLattice,TContextLattice,TTransfer,TConditionValue>", False, "LocalDataFlowAnalysis", "(Microsoft.CodeAnalysis.Diagnostics.OperationBlockAnalysisContext,Microsoft.CodeAnalysis.IOperation,TContext)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["ILLink.RoslynAnalyzer.DataFlow", "LocalDataFlowAnalysis<TValue,TContext,TLattice,TContextLattice,TTransfer,TConditionValue>", False, "LocalDataFlowAnalysis", "(Microsoft.CodeAnalysis.Diagnostics.OperationBlockAnalysisContext,Microsoft.CodeAnalysis.IOperation,TContext)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["ILLink.RoslynAnalyzer.DataFlow", "LocalDataFlowVisitor<TValue,TContext,TValueLattice,TContextLattice,TConditionValue>", False, "LocalDataFlowVisitor", "(Microsoft.CodeAnalysis.Compilation,ILLink.RoslynAnalyzer.DataFlow.LocalStateAndContextLattice<TValue,TContext,TValueLattice,TContextLattice>,Microsoft.CodeAnalysis.ISymbol,Microsoft.CodeAnalysis.FlowAnalysis.ControlFlowGraph,System.Collections.Immutable.ImmutableDictionary<Microsoft.CodeAnalysis.FlowAnalysis.CaptureId,ILLink.RoslynAnalyzer.DataFlow.FlowCaptureKind>,ILLink.RoslynAnalyzer.DataFlow.InterproceduralState<TValue,TValueLattice>)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["ILLink.RoslynAnalyzer.DataFlow", "LocalDataFlowVisitor<TValue,TContext,TValueLattice,TContextLattice,TConditionValue>", False, "LocalDataFlowVisitor", "(Microsoft.CodeAnalysis.Compilation,ILLink.RoslynAnalyzer.DataFlow.LocalStateAndContextLattice<TValue,TContext,TValueLattice,TContextLattice>,Microsoft.CodeAnalysis.ISymbol,Microsoft.CodeAnalysis.FlowAnalysis.ControlFlowGraph,System.Collections.Immutable.ImmutableDictionary<Microsoft.CodeAnalysis.FlowAnalysis.CaptureId,ILLink.RoslynAnalyzer.DataFlow.FlowCaptureKind>,ILLink.RoslynAnalyzer.DataFlow.InterproceduralState<TValue,TValueLattice>)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["ILLink.RoslynAnalyzer.DataFlow", "LocalDataFlowVisitor<TValue,TContext,TValueLattice,TContextLattice,TConditionValue>", False, "LocalDataFlowVisitor", "(Microsoft.CodeAnalysis.Compilation,ILLink.RoslynAnalyzer.DataFlow.LocalStateAndContextLattice<TValue,TContext,TValueLattice,TContextLattice>,Microsoft.CodeAnalysis.ISymbol,Microsoft.CodeAnalysis.FlowAnalysis.ControlFlowGraph,System.Collections.Immutable.ImmutableDictionary<Microsoft.CodeAnalysis.FlowAnalysis.CaptureId,ILLink.RoslynAnalyzer.DataFlow.FlowCaptureKind>,ILLink.RoslynAnalyzer.DataFlow.InterproceduralState<TValue,TValueLattice>)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
-      - ["ILLink.RoslynAnalyzer.DataFlow", "LocalDataFlowVisitor<TValue,TContext,TValueLattice,TContextLattice,TConditionValue>", False, "LocalDataFlowVisitor", "(Microsoft.CodeAnalysis.Compilation,ILLink.RoslynAnalyzer.DataFlow.LocalStateAndContextLattice<TValue,TContext,TValueLattice,TContextLattice>,Microsoft.CodeAnalysis.ISymbol,Microsoft.CodeAnalysis.FlowAnalysis.ControlFlowGraph,System.Collections.Immutable.ImmutableDictionary<Microsoft.CodeAnalysis.FlowAnalysis.CaptureId,ILLink.RoslynAnalyzer.DataFlow.FlowCaptureKind>,ILLink.RoslynAnalyzer.DataFlow.InterproceduralState<TValue,TValueLattice>)", "", "Argument[3]", "Argument[this]", "taint", "df-generated"]
-      - ["ILLink.RoslynAnalyzer.DataFlow", "LocalDataFlowVisitor<TValue,TContext,TValueLattice,TContextLattice,TConditionValue>", False, "LocalDataFlowVisitor", "(Microsoft.CodeAnalysis.Compilation,ILLink.RoslynAnalyzer.DataFlow.LocalStateAndContextLattice<TValue,TContext,TValueLattice,TContextLattice>,Microsoft.CodeAnalysis.ISymbol,Microsoft.CodeAnalysis.FlowAnalysis.ControlFlowGraph,System.Collections.Immutable.ImmutableDictionary<Microsoft.CodeAnalysis.FlowAnalysis.CaptureId,ILLink.RoslynAnalyzer.DataFlow.FlowCaptureKind>,ILLink.RoslynAnalyzer.DataFlow.InterproceduralState<TValue,TValueLattice>)", "", "Argument[4].Element", "Argument[this]", "taint", "df-generated"]
-      - ["ILLink.RoslynAnalyzer.DataFlow", "LocalDataFlowVisitor<TValue,TContext,TValueLattice,TContextLattice,TConditionValue>", False, "LocalDataFlowVisitor", "(Microsoft.CodeAnalysis.Compilation,ILLink.RoslynAnalyzer.DataFlow.LocalStateAndContextLattice<TValue,TContext,TValueLattice,TContextLattice>,Microsoft.CodeAnalysis.ISymbol,Microsoft.CodeAnalysis.FlowAnalysis.ControlFlowGraph,System.Collections.Immutable.ImmutableDictionary<Microsoft.CodeAnalysis.FlowAnalysis.CaptureId,ILLink.RoslynAnalyzer.DataFlow.FlowCaptureKind>,ILLink.RoslynAnalyzer.DataFlow.InterproceduralState<TValue,TValueLattice>)", "", "Argument[5]", "Argument[this]", "taint", "df-generated"]
-      - ["ILLink.RoslynAnalyzer.DataFlow", "LocalDataFlowVisitor<TValue,TContext,TValueLattice,TContextLattice,TConditionValue>", True, "VisitArrayElementReference", "(Microsoft.CodeAnalysis.Operations.IArrayElementReferenceOperation,ILLink.RoslynAnalyzer.DataFlow.LocalDataFlowState<TValue,TContext,TValueLattice,TContextLattice>)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["ILLink.RoslynAnalyzer.DataFlow", "InterproceduralState<TValue,TValueLattice>", False, "InterproceduralState", "(ILLink.Shared.DataFlow.ValueSet<ILLink.RoslynAnalyzer.DataFlow.MethodBodyValue>,ILLink.Shared.DataFlow.DefaultValueDictionary<ILLink.RoslynAnalyzer.DataFlow.LocalKey,ILLink.Shared.DataFlow.Maybe<TValue>>,ILLink.RoslynAnalyzer.DataFlow.InterproceduralStateLattice<TValue,TValueLattice>)", "", "Argument[0]", "Argument[this].Field[ILLink.RoslynAnalyzer.DataFlow.InterproceduralState`2.Methods]", "value", "dfc-generated"]
+      - ["ILLink.RoslynAnalyzer.DataFlow", "InterproceduralState<TValue,TValueLattice>", False, "InterproceduralState", "(ILLink.Shared.DataFlow.ValueSet<ILLink.RoslynAnalyzer.DataFlow.MethodBodyValue>,ILLink.Shared.DataFlow.DefaultValueDictionary<ILLink.RoslynAnalyzer.DataFlow.LocalKey,ILLink.Shared.DataFlow.Maybe<TValue>>,ILLink.RoslynAnalyzer.DataFlow.InterproceduralStateLattice<TValue,TValueLattice>)", "", "Argument[1]", "Argument[this].Field[ILLink.RoslynAnalyzer.DataFlow.InterproceduralState`2.HoistedLocals]", "value", "dfc-generated"]
+      - ["ILLink.RoslynAnalyzer.DataFlow", "InterproceduralStateLattice<TValue,TValueLattice>", False, "InterproceduralStateLattice", "(ILLink.Shared.DataFlow.ValueSetLattice<ILLink.RoslynAnalyzer.DataFlow.MethodBodyValue>,ILLink.Shared.DataFlow.DictionaryLattice<ILLink.RoslynAnalyzer.DataFlow.LocalKey,ILLink.Shared.DataFlow.Maybe<TValue>,ILLink.Shared.DataFlow.MaybeLattice<TValue,TValueLattice>>)", "", "Argument[0]", "Argument[this].Field[ILLink.RoslynAnalyzer.DataFlow.InterproceduralStateLattice`2.MethodLattice]", "value", "dfc-generated"]
+      - ["ILLink.RoslynAnalyzer.DataFlow", "InterproceduralStateLattice<TValue,TValueLattice>", False, "InterproceduralStateLattice", "(ILLink.Shared.DataFlow.ValueSetLattice<ILLink.RoslynAnalyzer.DataFlow.MethodBodyValue>,ILLink.Shared.DataFlow.DictionaryLattice<ILLink.RoslynAnalyzer.DataFlow.LocalKey,ILLink.Shared.DataFlow.Maybe<TValue>,ILLink.Shared.DataFlow.MaybeLattice<TValue,TValueLattice>>)", "", "Argument[1]", "Argument[this].Field[ILLink.RoslynAnalyzer.DataFlow.InterproceduralStateLattice`2.HoistedLocalLattice]", "value", "dfc-generated"]
+      - ["ILLink.RoslynAnalyzer.DataFlow", "InterproceduralStateLattice<TValue,TValueLattice>", False, "Meet", "(ILLink.RoslynAnalyzer.DataFlow.InterproceduralState<TValue,TValueLattice>,ILLink.RoslynAnalyzer.DataFlow.InterproceduralState<TValue,TValueLattice>)", "", "Argument[0].Field[ILLink.RoslynAnalyzer.DataFlow.InterproceduralState`2.Methods]", "ReturnValue.Field[ILLink.RoslynAnalyzer.DataFlow.InterproceduralState`2.Methods]", "value", "dfc-generated"]
+      - ["ILLink.RoslynAnalyzer.DataFlow", "InterproceduralStateLattice<TValue,TValueLattice>", False, "Meet", "(ILLink.RoslynAnalyzer.DataFlow.InterproceduralState<TValue,TValueLattice>,ILLink.RoslynAnalyzer.DataFlow.InterproceduralState<TValue,TValueLattice>)", "", "Argument[1].Field[ILLink.RoslynAnalyzer.DataFlow.InterproceduralState`2.Methods]", "ReturnValue.Field[ILLink.RoslynAnalyzer.DataFlow.InterproceduralState`2.Methods]", "value", "dfc-generated"]
+      - ["ILLink.RoslynAnalyzer.DataFlow", "InterproceduralStateLattice<TValue,TValueLattice>", False, "get_Top", "()", "", "Argument[this].Field[ILLink.RoslynAnalyzer.DataFlow.InterproceduralStateLattice`2.HoistedLocalLattice].Property[ILLink.Shared.DataFlow.DictionaryLattice`3.Top]", "ReturnValue.Field[ILLink.RoslynAnalyzer.DataFlow.InterproceduralState`2.HoistedLocals]", "value", "dfc-generated"]
+      - ["ILLink.RoslynAnalyzer.DataFlow", "InterproceduralStateLattice<TValue,TValueLattice>", False, "get_Top", "()", "", "Argument[this].Field[ILLink.RoslynAnalyzer.DataFlow.InterproceduralStateLattice`2.MethodLattice].Property[ILLink.Shared.DataFlow.ValueSetLattice`1.Top]", "ReturnValue.Field[ILLink.RoslynAnalyzer.DataFlow.InterproceduralState`2.Methods]", "value", "dfc-generated"]
+      - ["ILLink.RoslynAnalyzer.DataFlow", "LocalDataFlowAnalysis<TValue,TContext,TLattice,TContextLattice,TTransfer,TConditionValue>", False, "LocalDataFlowAnalysis", "(Microsoft.CodeAnalysis.Diagnostics.OperationBlockAnalysisContext,Microsoft.CodeAnalysis.IOperation,TContext)", "", "Argument[0]", "Argument[this].Field[ILLink.RoslynAnalyzer.DataFlow.LocalDataFlowAnalysis`6.Context]", "value", "dfc-generated"]
+      - ["ILLink.RoslynAnalyzer.DataFlow", "LocalDataFlowVisitor<TValue,TContext,TValueLattice,TContextLattice,TConditionValue>", False, "LocalDataFlowVisitor", "(Microsoft.CodeAnalysis.Compilation,ILLink.RoslynAnalyzer.DataFlow.LocalStateAndContextLattice<TValue,TContext,TValueLattice,TContextLattice>,Microsoft.CodeAnalysis.ISymbol,Microsoft.CodeAnalysis.FlowAnalysis.ControlFlowGraph,System.Collections.Immutable.ImmutableDictionary<Microsoft.CodeAnalysis.FlowAnalysis.CaptureId,ILLink.RoslynAnalyzer.DataFlow.FlowCaptureKind>,ILLink.RoslynAnalyzer.DataFlow.InterproceduralState<TValue,TValueLattice>)", "", "Argument[0]", "Argument[this].Field[ILLink.RoslynAnalyzer.DataFlow.LocalDataFlowVisitor`5.Compilation]", "value", "dfc-generated"]
+      - ["ILLink.RoslynAnalyzer.DataFlow", "LocalDataFlowVisitor<TValue,TContext,TValueLattice,TContextLattice,TConditionValue>", False, "LocalDataFlowVisitor", "(Microsoft.CodeAnalysis.Compilation,ILLink.RoslynAnalyzer.DataFlow.LocalStateAndContextLattice<TValue,TContext,TValueLattice,TContextLattice>,Microsoft.CodeAnalysis.ISymbol,Microsoft.CodeAnalysis.FlowAnalysis.ControlFlowGraph,System.Collections.Immutable.ImmutableDictionary<Microsoft.CodeAnalysis.FlowAnalysis.CaptureId,ILLink.RoslynAnalyzer.DataFlow.FlowCaptureKind>,ILLink.RoslynAnalyzer.DataFlow.InterproceduralState<TValue,TValueLattice>)", "", "Argument[1]", "Argument[this].Field[ILLink.RoslynAnalyzer.DataFlow.LocalDataFlowVisitor`5.LocalStateAndContextLattice]", "value", "dfc-generated"]
+      - ["ILLink.RoslynAnalyzer.DataFlow", "LocalDataFlowVisitor<TValue,TContext,TValueLattice,TContextLattice,TConditionValue>", False, "LocalDataFlowVisitor", "(Microsoft.CodeAnalysis.Compilation,ILLink.RoslynAnalyzer.DataFlow.LocalStateAndContextLattice<TValue,TContext,TValueLattice,TContextLattice>,Microsoft.CodeAnalysis.ISymbol,Microsoft.CodeAnalysis.FlowAnalysis.ControlFlowGraph,System.Collections.Immutable.ImmutableDictionary<Microsoft.CodeAnalysis.FlowAnalysis.CaptureId,ILLink.RoslynAnalyzer.DataFlow.FlowCaptureKind>,ILLink.RoslynAnalyzer.DataFlow.InterproceduralState<TValue,TValueLattice>)", "", "Argument[2]", "Argument[this].Field[ILLink.RoslynAnalyzer.DataFlow.LocalDataFlowVisitor`5.OwningSymbol]", "value", "dfc-generated"]
+      - ["ILLink.RoslynAnalyzer.DataFlow", "LocalDataFlowVisitor<TValue,TContext,TValueLattice,TContextLattice,TConditionValue>", False, "LocalDataFlowVisitor", "(Microsoft.CodeAnalysis.Compilation,ILLink.RoslynAnalyzer.DataFlow.LocalStateAndContextLattice<TValue,TContext,TValueLattice,TContextLattice>,Microsoft.CodeAnalysis.ISymbol,Microsoft.CodeAnalysis.FlowAnalysis.ControlFlowGraph,System.Collections.Immutable.ImmutableDictionary<Microsoft.CodeAnalysis.FlowAnalysis.CaptureId,ILLink.RoslynAnalyzer.DataFlow.FlowCaptureKind>,ILLink.RoslynAnalyzer.DataFlow.InterproceduralState<TValue,TValueLattice>)", "", "Argument[5]", "Argument[this].Field[ILLink.RoslynAnalyzer.DataFlow.LocalDataFlowVisitor`5.InterproceduralState]", "value", "dfc-generated"]
+      - ["ILLink.RoslynAnalyzer.DataFlow", "LocalDataFlowVisitor<TValue,TContext,TValueLattice,TContextLattice,TConditionValue>", True, "VisitArrayElementReference", "(Microsoft.CodeAnalysis.Operations.IArrayElementReferenceOperation,ILLink.RoslynAnalyzer.DataFlow.LocalDataFlowState<TValue,TContext,TValueLattice,TContextLattice>)", "", "Argument[this].Property[ILLink.RoslynAnalyzer.DataFlow.LocalDataFlowVisitor`5.TopValue]", "ReturnValue", "value", "dfc-generated"]
       - ["ILLink.RoslynAnalyzer.DataFlow", "LocalDataFlowVisitor<TValue,TContext,TValueLattice,TContextLattice,TConditionValue>", True, "VisitCompoundAssignment", "(Microsoft.CodeAnalysis.Operations.ICompoundAssignmentOperation,ILLink.RoslynAnalyzer.DataFlow.LocalDataFlowState<TValue,TContext,TValueLattice,TContextLattice>)", "", "Argument[this]", "Argument[1]", "taint", "df-generated"]
       - ["ILLink.RoslynAnalyzer.DataFlow", "LocalDataFlowVisitor<TValue,TContext,TValueLattice,TContextLattice,TConditionValue>", True, "VisitCompoundAssignment", "(Microsoft.CodeAnalysis.Operations.ICompoundAssignmentOperation,ILLink.RoslynAnalyzer.DataFlow.LocalDataFlowState<TValue,TContext,TValueLattice,TContextLattice>)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["ILLink.RoslynAnalyzer.DataFlow", "LocalDataFlowVisitor<TValue,TContext,TValueLattice,TContextLattice,TConditionValue>", True, "VisitConversion", "(Microsoft.CodeAnalysis.Operations.IConversionOperation,ILLink.RoslynAnalyzer.DataFlow.LocalDataFlowState<TValue,TContext,TValueLattice,TContextLattice>)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["ILLink.RoslynAnalyzer.DataFlow", "LocalDataFlowVisitor<TValue,TContext,TValueLattice,TContextLattice,TConditionValue>", True, "VisitDelegateCreation", "(Microsoft.CodeAnalysis.Operations.IDelegateCreationOperation,ILLink.RoslynAnalyzer.DataFlow.LocalDataFlowState<TValue,TContext,TValueLattice,TContextLattice>)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["ILLink.RoslynAnalyzer.DataFlow", "LocalDataFlowVisitor<TValue,TContext,TValueLattice,TContextLattice,TConditionValue>", True, "VisitConversion", "(Microsoft.CodeAnalysis.Operations.IConversionOperation,ILLink.RoslynAnalyzer.DataFlow.LocalDataFlowState<TValue,TContext,TValueLattice,TContextLattice>)", "", "Argument[this].Property[ILLink.RoslynAnalyzer.DataFlow.LocalDataFlowVisitor`5.TopValue]", "ReturnValue", "value", "dfc-generated"]
+      - ["ILLink.RoslynAnalyzer.DataFlow", "LocalDataFlowVisitor<TValue,TContext,TValueLattice,TContextLattice,TConditionValue>", True, "VisitDelegateCreation", "(Microsoft.CodeAnalysis.Operations.IDelegateCreationOperation,ILLink.RoslynAnalyzer.DataFlow.LocalDataFlowState<TValue,TContext,TValueLattice,TContextLattice>)", "", "Argument[this].Property[ILLink.RoslynAnalyzer.DataFlow.LocalDataFlowVisitor`5.TopValue]", "ReturnValue", "value", "dfc-generated"]
       - ["ILLink.RoslynAnalyzer.DataFlow", "LocalDataFlowVisitor<TValue,TContext,TValueLattice,TContextLattice,TConditionValue>", True, "VisitDynamicIndexerAccess", "(Microsoft.CodeAnalysis.Operations.IDynamicIndexerAccessOperation,ILLink.RoslynAnalyzer.DataFlow.LocalDataFlowState<TValue,TContext,TValueLattice,TContextLattice>)", "", "Argument[this]", "Argument[1]", "taint", "df-generated"]
       - ["ILLink.RoslynAnalyzer.DataFlow", "LocalDataFlowVisitor<TValue,TContext,TValueLattice,TContextLattice,TConditionValue>", True, "VisitDynamicIndexerAccess", "(Microsoft.CodeAnalysis.Operations.IDynamicIndexerAccessOperation,ILLink.RoslynAnalyzer.DataFlow.LocalDataFlowState<TValue,TContext,TValueLattice,TContextLattice>)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["ILLink.RoslynAnalyzer.DataFlow", "LocalDataFlowVisitor<TValue,TContext,TValueLattice,TContextLattice,TConditionValue>", True, "VisitDynamicInvocation", "(Microsoft.CodeAnalysis.Operations.IDynamicInvocationOperation,ILLink.RoslynAnalyzer.DataFlow.LocalDataFlowState<TValue,TContext,TValueLattice,TContextLattice>)", "", "Argument[this]", "Argument[1]", "taint", "df-generated"]
@@ -51,44 +47,44 @@ extensions:
       - ["ILLink.RoslynAnalyzer.DataFlow", "LocalDataFlowVisitor<TValue,TContext,TValueLattice,TContextLattice,TConditionValue>", True, "VisitDynamicMemberReference", "(Microsoft.CodeAnalysis.Operations.IDynamicMemberReferenceOperation,ILLink.RoslynAnalyzer.DataFlow.LocalDataFlowState<TValue,TContext,TValueLattice,TContextLattice>)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["ILLink.RoslynAnalyzer.DataFlow", "LocalDataFlowVisitor<TValue,TContext,TValueLattice,TContextLattice,TConditionValue>", True, "VisitDynamicObjectCreation", "(Microsoft.CodeAnalysis.Operations.IDynamicObjectCreationOperation,ILLink.RoslynAnalyzer.DataFlow.LocalDataFlowState<TValue,TContext,TValueLattice,TContextLattice>)", "", "Argument[this]", "Argument[1]", "taint", "df-generated"]
       - ["ILLink.RoslynAnalyzer.DataFlow", "LocalDataFlowVisitor<TValue,TContext,TValueLattice,TContextLattice,TConditionValue>", True, "VisitDynamicObjectCreation", "(Microsoft.CodeAnalysis.Operations.IDynamicObjectCreationOperation,ILLink.RoslynAnalyzer.DataFlow.LocalDataFlowState<TValue,TContext,TValueLattice,TContextLattice>)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["ILLink.RoslynAnalyzer.DataFlow", "LocalDataFlowVisitor<TValue,TContext,TValueLattice,TContextLattice,TConditionValue>", True, "VisitEventAssignment", "(Microsoft.CodeAnalysis.Operations.IEventAssignmentOperation,ILLink.RoslynAnalyzer.DataFlow.LocalDataFlowState<TValue,TContext,TValueLattice,TContextLattice>)", "", "Argument[this]", "Argument[1]", "taint", "df-generated"]
-      - ["ILLink.RoslynAnalyzer.DataFlow", "LocalDataFlowVisitor<TValue,TContext,TValueLattice,TContextLattice,TConditionValue>", True, "VisitEventReference", "(Microsoft.CodeAnalysis.Operations.IEventReferenceOperation,ILLink.RoslynAnalyzer.DataFlow.LocalDataFlowState<TValue,TContext,TValueLattice,TContextLattice>)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["ILLink.RoslynAnalyzer.DataFlow", "LocalDataFlowVisitor<TValue,TContext,TValueLattice,TContextLattice,TConditionValue>", True, "VisitExpressionStatement", "(Microsoft.CodeAnalysis.Operations.IExpressionStatementOperation,ILLink.RoslynAnalyzer.DataFlow.LocalDataFlowState<TValue,TContext,TValueLattice,TContextLattice>)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["ILLink.RoslynAnalyzer.DataFlow", "LocalDataFlowVisitor<TValue,TContext,TValueLattice,TContextLattice,TConditionValue>", True, "VisitFlowAnonymousFunction", "(Microsoft.CodeAnalysis.FlowAnalysis.IFlowAnonymousFunctionOperation,ILLink.RoslynAnalyzer.DataFlow.LocalDataFlowState<TValue,TContext,TValueLattice,TContextLattice>)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["ILLink.RoslynAnalyzer.DataFlow", "LocalDataFlowVisitor<TValue,TContext,TValueLattice,TContextLattice,TConditionValue>", True, "VisitEventAssignment", "(Microsoft.CodeAnalysis.Operations.IEventAssignmentOperation,ILLink.RoslynAnalyzer.DataFlow.LocalDataFlowState<TValue,TContext,TValueLattice,TContextLattice>)", "", "Argument[this].Field[ILLink.RoslynAnalyzer.DataFlow.LocalDataFlowVisitor`5.LocalStateAndContextLattice].Property[ILLink.RoslynAnalyzer.DataFlow.LocalStateAndContextLattice`4.Top]", "Argument[1].Property[ILLink.RoslynAnalyzer.DataFlow.LocalDataFlowState`4.Current]", "value", "dfc-generated"]
+      - ["ILLink.RoslynAnalyzer.DataFlow", "LocalDataFlowVisitor<TValue,TContext,TValueLattice,TContextLattice,TConditionValue>", True, "VisitEventReference", "(Microsoft.CodeAnalysis.Operations.IEventReferenceOperation,ILLink.RoslynAnalyzer.DataFlow.LocalDataFlowState<TValue,TContext,TValueLattice,TContextLattice>)", "", "Argument[this].Property[ILLink.RoslynAnalyzer.DataFlow.LocalDataFlowVisitor`5.TopValue]", "ReturnValue", "value", "dfc-generated"]
+      - ["ILLink.RoslynAnalyzer.DataFlow", "LocalDataFlowVisitor<TValue,TContext,TValueLattice,TContextLattice,TConditionValue>", True, "VisitExpressionStatement", "(Microsoft.CodeAnalysis.Operations.IExpressionStatementOperation,ILLink.RoslynAnalyzer.DataFlow.LocalDataFlowState<TValue,TContext,TValueLattice,TContextLattice>)", "", "Argument[this].Property[ILLink.RoslynAnalyzer.DataFlow.LocalDataFlowVisitor`5.TopValue]", "ReturnValue", "value", "dfc-generated"]
+      - ["ILLink.RoslynAnalyzer.DataFlow", "LocalDataFlowVisitor<TValue,TContext,TValueLattice,TContextLattice,TConditionValue>", True, "VisitFlowAnonymousFunction", "(Microsoft.CodeAnalysis.FlowAnalysis.IFlowAnonymousFunctionOperation,ILLink.RoslynAnalyzer.DataFlow.LocalDataFlowState<TValue,TContext,TValueLattice,TContextLattice>)", "", "Argument[this].Property[ILLink.RoslynAnalyzer.DataFlow.LocalDataFlowVisitor`5.TopValue]", "ReturnValue", "value", "dfc-generated"]
       - ["ILLink.RoslynAnalyzer.DataFlow", "LocalDataFlowVisitor<TValue,TContext,TValueLattice,TContextLattice,TConditionValue>", True, "VisitFlowCapture", "(Microsoft.CodeAnalysis.FlowAnalysis.IFlowCaptureOperation,ILLink.RoslynAnalyzer.DataFlow.LocalDataFlowState<TValue,TContext,TValueLattice,TContextLattice>)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["ILLink.RoslynAnalyzer.DataFlow", "LocalDataFlowVisitor<TValue,TContext,TValueLattice,TContextLattice,TConditionValue>", True, "VisitFlowCaptureReference", "(Microsoft.CodeAnalysis.FlowAnalysis.IFlowCaptureReferenceOperation,ILLink.RoslynAnalyzer.DataFlow.LocalDataFlowState<TValue,TContext,TValueLattice,TContextLattice>)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["ILLink.RoslynAnalyzer.DataFlow", "LocalDataFlowVisitor<TValue,TContext,TValueLattice,TContextLattice,TConditionValue>", True, "VisitFlowCaptureReference", "(Microsoft.CodeAnalysis.FlowAnalysis.IFlowCaptureReferenceOperation,ILLink.RoslynAnalyzer.DataFlow.LocalDataFlowState<TValue,TContext,TValueLattice,TContextLattice>)", "", "Argument[this].Property[ILLink.RoslynAnalyzer.DataFlow.LocalDataFlowVisitor`5.TopValue]", "ReturnValue", "value", "dfc-generated"]
       - ["ILLink.RoslynAnalyzer.DataFlow", "LocalDataFlowVisitor<TValue,TContext,TValueLattice,TContextLattice,TConditionValue>", True, "VisitImplicitIndexerReference", "(Microsoft.CodeAnalysis.Operations.IImplicitIndexerReferenceOperation,ILLink.RoslynAnalyzer.DataFlow.LocalDataFlowState<TValue,TContext,TValueLattice,TContextLattice>)", "", "Argument[this]", "Argument[1]", "taint", "df-generated"]
       - ["ILLink.RoslynAnalyzer.DataFlow", "LocalDataFlowVisitor<TValue,TContext,TValueLattice,TContextLattice,TConditionValue>", True, "VisitImplicitIndexerReference", "(Microsoft.CodeAnalysis.Operations.IImplicitIndexerReferenceOperation,ILLink.RoslynAnalyzer.DataFlow.LocalDataFlowState<TValue,TContext,TValueLattice,TContextLattice>)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["ILLink.RoslynAnalyzer.DataFlow", "LocalDataFlowVisitor<TValue,TContext,TValueLattice,TContextLattice,TConditionValue>", True, "VisitInlineArrayAccess", "(Microsoft.CodeAnalysis.Operations.IInlineArrayAccessOperation,ILLink.RoslynAnalyzer.DataFlow.LocalDataFlowState<TValue,TContext,TValueLattice,TContextLattice>)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["ILLink.RoslynAnalyzer.DataFlow", "LocalDataFlowVisitor<TValue,TContext,TValueLattice,TContextLattice,TConditionValue>", True, "VisitInvocation", "(Microsoft.CodeAnalysis.Operations.IInvocationOperation,ILLink.RoslynAnalyzer.DataFlow.LocalDataFlowState<TValue,TContext,TValueLattice,TContextLattice>)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["ILLink.RoslynAnalyzer.DataFlow", "LocalDataFlowVisitor<TValue,TContext,TValueLattice,TContextLattice,TConditionValue>", True, "VisitInvocation", "(Microsoft.CodeAnalysis.Operations.IInvocationOperation,ILLink.RoslynAnalyzer.DataFlow.LocalDataFlowState<TValue,TContext,TValueLattice,TContextLattice>)", "", "Argument[this]", "Argument[1]", "taint", "df-generated"]
-      - ["ILLink.RoslynAnalyzer.DataFlow", "LocalDataFlowVisitor<TValue,TContext,TValueLattice,TContextLattice,TConditionValue>", True, "VisitInvocation", "(Microsoft.CodeAnalysis.Operations.IInvocationOperation,ILLink.RoslynAnalyzer.DataFlow.LocalDataFlowState<TValue,TContext,TValueLattice,TContextLattice>)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["ILLink.RoslynAnalyzer.DataFlow", "LocalDataFlowVisitor<TValue,TContext,TValueLattice,TContextLattice,TConditionValue>", True, "VisitObjectCreation", "(Microsoft.CodeAnalysis.Operations.IObjectCreationOperation,ILLink.RoslynAnalyzer.DataFlow.LocalDataFlowState<TValue,TContext,TValueLattice,TContextLattice>)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["ILLink.RoslynAnalyzer.DataFlow", "LocalDataFlowVisitor<TValue,TContext,TValueLattice,TContextLattice,TConditionValue>", True, "VisitInlineArrayAccess", "(Microsoft.CodeAnalysis.Operations.IInlineArrayAccessOperation,ILLink.RoslynAnalyzer.DataFlow.LocalDataFlowState<TValue,TContext,TValueLattice,TContextLattice>)", "", "Argument[this].Property[ILLink.RoslynAnalyzer.DataFlow.LocalDataFlowVisitor`5.TopValue]", "ReturnValue", "value", "dfc-generated"]
+      - ["ILLink.RoslynAnalyzer.DataFlow", "LocalDataFlowVisitor<TValue,TContext,TValueLattice,TContextLattice,TConditionValue>", True, "VisitInvocation", "(Microsoft.CodeAnalysis.Operations.IInvocationOperation,ILLink.RoslynAnalyzer.DataFlow.LocalDataFlowState<TValue,TContext,TValueLattice,TContextLattice>)", "", "Argument[this].Field[ILLink.RoslynAnalyzer.DataFlow.LocalDataFlowVisitor`5.LocalStateAndContextLattice].Property[ILLink.RoslynAnalyzer.DataFlow.LocalStateAndContextLattice`4.Top]", "Argument[1].Property[ILLink.RoslynAnalyzer.DataFlow.LocalDataFlowState`4.Current]", "value", "dfc-generated"]
       - ["ILLink.RoslynAnalyzer.DataFlow", "LocalDataFlowVisitor<TValue,TContext,TValueLattice,TContextLattice,TConditionValue>", True, "VisitObjectCreation", "(Microsoft.CodeAnalysis.Operations.IObjectCreationOperation,ILLink.RoslynAnalyzer.DataFlow.LocalDataFlowState<TValue,TContext,TValueLattice,TContextLattice>)", "", "Argument[this]", "Argument[1]", "taint", "df-generated"]
       - ["ILLink.RoslynAnalyzer.DataFlow", "LocalDataFlowVisitor<TValue,TContext,TValueLattice,TContextLattice,TConditionValue>", True, "VisitObjectCreation", "(Microsoft.CodeAnalysis.Operations.IObjectCreationOperation,ILLink.RoslynAnalyzer.DataFlow.LocalDataFlowState<TValue,TContext,TValueLattice,TContextLattice>)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["ILLink.RoslynAnalyzer.DataFlow", "LocalDataFlowVisitor<TValue,TContext,TValueLattice,TContextLattice,TConditionValue>", True, "VisitPropertyReference", "(Microsoft.CodeAnalysis.Operations.IPropertyReferenceOperation,ILLink.RoslynAnalyzer.DataFlow.LocalDataFlowState<TValue,TContext,TValueLattice,TContextLattice>)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["ILLink.RoslynAnalyzer.DataFlow", "LocalDataFlowVisitor<TValue,TContext,TValueLattice,TContextLattice,TConditionValue>", True, "VisitPropertyReference", "(Microsoft.CodeAnalysis.Operations.IPropertyReferenceOperation,ILLink.RoslynAnalyzer.DataFlow.LocalDataFlowState<TValue,TContext,TValueLattice,TContextLattice>)", "", "Argument[this]", "Argument[1]", "taint", "df-generated"]
       - ["ILLink.RoslynAnalyzer.DataFlow", "LocalDataFlowVisitor<TValue,TContext,TValueLattice,TContextLattice,TConditionValue>", True, "VisitPropertyReference", "(Microsoft.CodeAnalysis.Operations.IPropertyReferenceOperation,ILLink.RoslynAnalyzer.DataFlow.LocalDataFlowState<TValue,TContext,TValueLattice,TContextLattice>)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["ILLink.RoslynAnalyzer.DataFlow", "LocalDataFlowVisitor<TValue,TContext,TValueLattice,TContextLattice,TConditionValue>", True, "VisitReturn", "(Microsoft.CodeAnalysis.Operations.IReturnOperation,ILLink.RoslynAnalyzer.DataFlow.LocalDataFlowState<TValue,TContext,TValueLattice,TContextLattice>)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["ILLink.RoslynAnalyzer.DataFlow", "LocalDataFlowVisitor<TValue,TContext,TValueLattice,TContextLattice,TConditionValue>", True, "VisitReturn", "(Microsoft.CodeAnalysis.Operations.IReturnOperation,ILLink.RoslynAnalyzer.DataFlow.LocalDataFlowState<TValue,TContext,TValueLattice,TContextLattice>)", "", "Argument[this].Property[ILLink.RoslynAnalyzer.DataFlow.LocalDataFlowVisitor`5.TopValue]", "ReturnValue", "value", "dfc-generated"]
       - ["ILLink.RoslynAnalyzer.DataFlow", "LocalDataFlowVisitor<TValue,TContext,TValueLattice,TContextLattice,TConditionValue>", True, "VisitSimpleAssignment", "(Microsoft.CodeAnalysis.Operations.ISimpleAssignmentOperation,ILLink.RoslynAnalyzer.DataFlow.LocalDataFlowState<TValue,TContext,TValueLattice,TContextLattice>)", "", "Argument[this]", "Argument[1]", "taint", "df-generated"]
       - ["ILLink.RoslynAnalyzer.DataFlow", "LocalDataFlowVisitor<TValue,TContext,TValueLattice,TContextLattice,TConditionValue>", True, "VisitSimpleAssignment", "(Microsoft.CodeAnalysis.Operations.ISimpleAssignmentOperation,ILLink.RoslynAnalyzer.DataFlow.LocalDataFlowState<TValue,TContext,TValueLattice,TContextLattice>)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["ILLink.RoslynAnalyzer.DataFlow", "LocalKey", False, "LocalKey", "(Microsoft.CodeAnalysis.FlowAnalysis.CaptureId)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["ILLink.RoslynAnalyzer.DataFlow", "LocalKey", False, "LocalKey", "(Microsoft.CodeAnalysis.ILocalSymbol)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["ILLink.RoslynAnalyzer.DataFlow", "LocalState<TValue>", False, "Get", "(ILLink.RoslynAnalyzer.DataFlow.LocalKey)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["ILLink.RoslynAnalyzer.DataFlow", "LocalState<TValue>", False, "LocalState", "(ILLink.Shared.DataFlow.DefaultValueDictionary<ILLink.RoslynAnalyzer.DataFlow.LocalKey,TValue>,ILLink.Shared.DataFlow.DefaultValueDictionary<Microsoft.CodeAnalysis.FlowAnalysis.CaptureId,ILLink.Shared.DataFlow.ValueSet<ILLink.RoslynAnalyzer.DataFlow.CapturedReferenceValue>>)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["ILLink.RoslynAnalyzer.DataFlow", "LocalState<TValue>", False, "LocalState", "(ILLink.Shared.DataFlow.DefaultValueDictionary<ILLink.RoslynAnalyzer.DataFlow.LocalKey,TValue>,ILLink.Shared.DataFlow.DefaultValueDictionary<Microsoft.CodeAnalysis.FlowAnalysis.CaptureId,ILLink.Shared.DataFlow.ValueSet<ILLink.RoslynAnalyzer.DataFlow.CapturedReferenceValue>>)", "", "Argument[1].Element", "Argument[this]", "taint", "df-generated"]
+      - ["ILLink.RoslynAnalyzer.DataFlow", "LocalState<TValue>", False, "LocalState", "(ILLink.Shared.DataFlow.DefaultValueDictionary<ILLink.RoslynAnalyzer.DataFlow.LocalKey,TValue>,ILLink.Shared.DataFlow.DefaultValueDictionary<Microsoft.CodeAnalysis.FlowAnalysis.CaptureId,ILLink.Shared.DataFlow.ValueSet<ILLink.RoslynAnalyzer.DataFlow.CapturedReferenceValue>>)", "", "Argument[0]", "Argument[this].Field[ILLink.RoslynAnalyzer.DataFlow.LocalState`1.Dictionary]", "value", "dfc-generated"]
+      - ["ILLink.RoslynAnalyzer.DataFlow", "LocalState<TValue>", False, "LocalState", "(ILLink.Shared.DataFlow.DefaultValueDictionary<ILLink.RoslynAnalyzer.DataFlow.LocalKey,TValue>,ILLink.Shared.DataFlow.DefaultValueDictionary<Microsoft.CodeAnalysis.FlowAnalysis.CaptureId,ILLink.Shared.DataFlow.ValueSet<ILLink.RoslynAnalyzer.DataFlow.CapturedReferenceValue>>)", "", "Argument[1]", "Argument[this].Field[ILLink.RoslynAnalyzer.DataFlow.LocalState`1.CapturedReferences]", "value", "dfc-generated"]
       - ["ILLink.RoslynAnalyzer.DataFlow", "LocalState<TValue>", False, "ToString", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["ILLink.RoslynAnalyzer.DataFlow", "LocalStateAndContext<TValue,TContext>", False, "LocalStateAndContext", "(ILLink.RoslynAnalyzer.DataFlow.LocalState<TValue>,TContext)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["ILLink.RoslynAnalyzer.DataFlow", "LocalStateAndContext<TValue,TContext>", False, "LocalStateAndContext", "(ILLink.RoslynAnalyzer.DataFlow.LocalState<TValue>,TContext)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["ILLink.RoslynAnalyzer.DataFlow", "LocalStateAndContextLattice<TValue,TContext,TValueLattice,TContextLattice>", False, "LocalStateAndContextLattice", "(ILLink.RoslynAnalyzer.DataFlow.LocalStateLattice<TValue,TValueLattice>,TContextLattice)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["ILLink.RoslynAnalyzer.DataFlow", "LocalStateAndContextLattice<TValue,TContext,TValueLattice,TContextLattice>", False, "LocalStateAndContextLattice", "(ILLink.RoslynAnalyzer.DataFlow.LocalStateLattice<TValue,TValueLattice>,TContextLattice)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["ILLink.RoslynAnalyzer.DataFlow", "LocalStateAndContext<TValue,TContext>", False, "LocalStateAndContext", "(ILLink.RoslynAnalyzer.DataFlow.LocalState<TValue>,TContext)", "", "Argument[0]", "Argument[this].Field[ILLink.RoslynAnalyzer.DataFlow.LocalStateAndContext`2.LocalState]", "value", "dfc-generated"]
+      - ["ILLink.RoslynAnalyzer.DataFlow", "LocalStateAndContext<TValue,TContext>", False, "LocalStateAndContext", "(ILLink.RoslynAnalyzer.DataFlow.LocalState<TValue>,TContext)", "", "Argument[1]", "Argument[this].Field[ILLink.RoslynAnalyzer.DataFlow.LocalStateAndContext`2.Context]", "value", "dfc-generated"]
+      - ["ILLink.RoslynAnalyzer.DataFlow", "LocalStateAndContextLattice<TValue,TContext,TValueLattice,TContextLattice>", False, "LocalStateAndContextLattice", "(ILLink.RoslynAnalyzer.DataFlow.LocalStateLattice<TValue,TValueLattice>,TContextLattice)", "", "Argument[0].Property[ILLink.RoslynAnalyzer.DataFlow.LocalStateLattice`2.Top]", "Argument[this].Property[ILLink.RoslynAnalyzer.DataFlow.LocalStateAndContextLattice`4.Top].Field[ILLink.RoslynAnalyzer.DataFlow.LocalStateAndContext`2.LocalState]", "value", "dfc-generated"]
+      - ["ILLink.RoslynAnalyzer.DataFlow", "LocalStateAndContextLattice<TValue,TContext,TValueLattice,TContextLattice>", False, "LocalStateAndContextLattice", "(ILLink.RoslynAnalyzer.DataFlow.LocalStateLattice<TValue,TValueLattice>,TContextLattice)", "", "Argument[0]", "Argument[this].Field[ILLink.RoslynAnalyzer.DataFlow.LocalStateAndContextLattice`4.LocalStateLattice]", "value", "dfc-generated"]
+      - ["ILLink.RoslynAnalyzer.DataFlow", "LocalStateAndContextLattice<TValue,TContext,TValueLattice,TContextLattice>", False, "LocalStateAndContextLattice", "(ILLink.RoslynAnalyzer.DataFlow.LocalStateLattice<TValue,TValueLattice>,TContextLattice)", "", "Argument[1].Property[ILLink.Shared.DataFlow.ILattice`1.Top]", "Argument[this].Property[ILLink.RoslynAnalyzer.DataFlow.LocalStateAndContextLattice`4.Top].Field[ILLink.RoslynAnalyzer.DataFlow.LocalStateAndContext`2.Context]", "value", "dfc-generated"]
+      - ["ILLink.RoslynAnalyzer.DataFlow", "LocalStateAndContextLattice<TValue,TContext,TValueLattice,TContextLattice>", False, "LocalStateAndContextLattice", "(ILLink.RoslynAnalyzer.DataFlow.LocalStateLattice<TValue,TValueLattice>,TContextLattice)", "", "Argument[1]", "Argument[this].Field[ILLink.RoslynAnalyzer.DataFlow.LocalStateAndContextLattice`4.ContextLattice]", "value", "dfc-generated"]
+      - ["ILLink.RoslynAnalyzer.DataFlow", "LocalStateAndContextLattice<TValue,TContext,TValueLattice,TContextLattice>", False, "LocalStateAndContextLattice", "(ILLink.RoslynAnalyzer.DataFlow.LocalStateLattice<TValue,TValueLattice>,TContextLattice)", "", "Argument[this].Field[ILLink.RoslynAnalyzer.DataFlow.LocalStateAndContextLattice`4.ContextLattice].Property[ILLink.Shared.DataFlow.ILattice`1.Top]", "Argument[this].Property[ILLink.RoslynAnalyzer.DataFlow.LocalStateAndContextLattice`4.Top].Field[ILLink.RoslynAnalyzer.DataFlow.LocalStateAndContext`2.Context]", "value", "dfc-generated"]
+      - ["ILLink.RoslynAnalyzer.DataFlow", "LocalStateAndContextLattice<TValue,TContext,TValueLattice,TContextLattice>", False, "LocalStateAndContextLattice", "(ILLink.RoslynAnalyzer.DataFlow.LocalStateLattice<TValue,TValueLattice>,TContextLattice)", "", "Argument[this].Field[ILLink.RoslynAnalyzer.DataFlow.LocalStateAndContextLattice`4.LocalStateLattice].Property[ILLink.RoslynAnalyzer.DataFlow.LocalStateLattice`2.Top]", "Argument[this].Property[ILLink.RoslynAnalyzer.DataFlow.LocalStateAndContextLattice`4.Top].Field[ILLink.RoslynAnalyzer.DataFlow.LocalStateAndContext`2.LocalState]", "value", "dfc-generated"]
       - ["ILLink.RoslynAnalyzer.DataFlow", "LocalStateAndContextLattice<TValue,TContext,TValueLattice,TContextLattice>", False, "Meet", "(ILLink.RoslynAnalyzer.DataFlow.LocalStateAndContext<TValue,TContext>,ILLink.RoslynAnalyzer.DataFlow.LocalStateAndContext<TValue,TContext>)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["ILLink.RoslynAnalyzer.DataFlow", "LocalStateAndContextLattice<TValue,TContext,TValueLattice,TContextLattice>", False, "Meet", "(ILLink.RoslynAnalyzer.DataFlow.LocalStateAndContext<TValue,TContext>,ILLink.RoslynAnalyzer.DataFlow.LocalStateAndContext<TValue,TContext>)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
       - ["ILLink.RoslynAnalyzer.DataFlow", "LocalStateAndContextLattice<TValue,TContext,TValueLattice,TContextLattice>", False, "Meet", "(ILLink.RoslynAnalyzer.DataFlow.LocalStateAndContext<TValue,TContext>,ILLink.RoslynAnalyzer.DataFlow.LocalStateAndContext<TValue,TContext>)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["ILLink.RoslynAnalyzer.DataFlow", "LocalStateLattice<TValue,TValueLattice>", False, "LocalStateLattice", "(TValueLattice)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["ILLink.RoslynAnalyzer.DataFlow", "LocalStateLattice<TValue,TValueLattice>", False, "LocalStateLattice", "(TValueLattice)", "", "Argument[0]", "Argument[this].Field[ILLink.RoslynAnalyzer.DataFlow.LocalStateLattice`2.Lattice].Field[ILLink.Shared.DataFlow.DictionaryLattice`3.ValueLattice]", "value", "dfc-generated"]
       - ["ILLink.RoslynAnalyzer.DataFlow", "LocalStateLattice<TValue,TValueLattice>", False, "Meet", "(ILLink.RoslynAnalyzer.DataFlow.LocalState<TValue>,ILLink.RoslynAnalyzer.DataFlow.LocalState<TValue>)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["ILLink.RoslynAnalyzer.DataFlow", "MethodBodyValue", False, "MethodBodyValue", "(Microsoft.CodeAnalysis.ISymbol,Microsoft.CodeAnalysis.FlowAnalysis.ControlFlowGraph)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["ILLink.RoslynAnalyzer.DataFlow", "MethodBodyValue", False, "MethodBodyValue", "(Microsoft.CodeAnalysis.ISymbol,Microsoft.CodeAnalysis.FlowAnalysis.ControlFlowGraph)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["ILLink.RoslynAnalyzer.DataFlow", "MethodBodyValue", False, "MethodBodyValue", "(Microsoft.CodeAnalysis.ISymbol,Microsoft.CodeAnalysis.FlowAnalysis.ControlFlowGraph)", "", "Argument[0]", "Argument[this].Property[ILLink.RoslynAnalyzer.DataFlow.MethodBodyValue.OwningSymbol]", "value", "dfc-generated"]
+      - ["ILLink.RoslynAnalyzer.DataFlow", "MethodBodyValue", False, "MethodBodyValue", "(Microsoft.CodeAnalysis.ISymbol,Microsoft.CodeAnalysis.FlowAnalysis.ControlFlowGraph)", "", "Argument[1]", "Argument[this].Property[ILLink.RoslynAnalyzer.DataFlow.MethodBodyValue.ControlFlowGraph]", "value", "dfc-generated"]
   - addsTo:
       pack: codeql/csharp-all
       extensible: neutralModel
diff --git a/csharp/ql/lib/ext/generated/ILLink.RoslynAnalyzer.TrimAnalysis.model.yml b/csharp/ql/lib/ext/generated/ILLink.RoslynAnalyzer.TrimAnalysis.model.yml
index 59211fef774..528a4086cbe 100644
--- a/csharp/ql/lib/ext/generated/ILLink.RoslynAnalyzer.TrimAnalysis.model.yml
+++ b/csharp/ql/lib/ext/generated/ILLink.RoslynAnalyzer.TrimAnalysis.model.yml
@@ -7,52 +7,46 @@ extensions:
       - ["ILLink.RoslynAnalyzer.TrimAnalysis", "SingleValueExtensions", False, "FromTypeSymbol", "(Microsoft.CodeAnalysis.ITypeSymbol)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["ILLink.RoslynAnalyzer.TrimAnalysis", "TrimAnalysisAssignmentPattern", False, "Merge", "(ILLink.Shared.DataFlow.ValueSetLattice<ILLink.Shared.DataFlow.SingleValue>,ILLink.RoslynAnalyzer.DataFlow.FeatureContextLattice,ILLink.RoslynAnalyzer.TrimAnalysis.TrimAnalysisAssignmentPattern)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
       - ["ILLink.RoslynAnalyzer.TrimAnalysis", "TrimAnalysisAssignmentPattern", False, "Merge", "(ILLink.Shared.DataFlow.ValueSetLattice<ILLink.Shared.DataFlow.SingleValue>,ILLink.RoslynAnalyzer.DataFlow.FeatureContextLattice,ILLink.RoslynAnalyzer.TrimAnalysis.TrimAnalysisAssignmentPattern)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["ILLink.RoslynAnalyzer.TrimAnalysis", "TrimAnalysisAssignmentPattern", False, "TrimAnalysisAssignmentPattern", "(ILLink.Shared.DataFlow.ValueSet<ILLink.Shared.DataFlow.SingleValue>,ILLink.Shared.DataFlow.ValueSet<ILLink.Shared.DataFlow.SingleValue>,Microsoft.CodeAnalysis.IOperation,Microsoft.CodeAnalysis.ISymbol,ILLink.RoslynAnalyzer.DataFlow.FeatureContext)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["ILLink.RoslynAnalyzer.TrimAnalysis", "TrimAnalysisAssignmentPattern", False, "TrimAnalysisAssignmentPattern", "(ILLink.Shared.DataFlow.ValueSet<ILLink.Shared.DataFlow.SingleValue>,ILLink.Shared.DataFlow.ValueSet<ILLink.Shared.DataFlow.SingleValue>,Microsoft.CodeAnalysis.IOperation,Microsoft.CodeAnalysis.ISymbol,ILLink.RoslynAnalyzer.DataFlow.FeatureContext)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["ILLink.RoslynAnalyzer.TrimAnalysis", "TrimAnalysisAssignmentPattern", False, "TrimAnalysisAssignmentPattern", "(ILLink.Shared.DataFlow.ValueSet<ILLink.Shared.DataFlow.SingleValue>,ILLink.Shared.DataFlow.ValueSet<ILLink.Shared.DataFlow.SingleValue>,Microsoft.CodeAnalysis.IOperation,Microsoft.CodeAnalysis.ISymbol,ILLink.RoslynAnalyzer.DataFlow.FeatureContext)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
-      - ["ILLink.RoslynAnalyzer.TrimAnalysis", "TrimAnalysisAssignmentPattern", False, "TrimAnalysisAssignmentPattern", "(ILLink.Shared.DataFlow.ValueSet<ILLink.Shared.DataFlow.SingleValue>,ILLink.Shared.DataFlow.ValueSet<ILLink.Shared.DataFlow.SingleValue>,Microsoft.CodeAnalysis.IOperation,Microsoft.CodeAnalysis.ISymbol,ILLink.RoslynAnalyzer.DataFlow.FeatureContext)", "", "Argument[3]", "Argument[this]", "taint", "df-generated"]
-      - ["ILLink.RoslynAnalyzer.TrimAnalysis", "TrimAnalysisAssignmentPattern", False, "TrimAnalysisAssignmentPattern", "(ILLink.Shared.DataFlow.ValueSet<ILLink.Shared.DataFlow.SingleValue>,ILLink.Shared.DataFlow.ValueSet<ILLink.Shared.DataFlow.SingleValue>,Microsoft.CodeAnalysis.IOperation,Microsoft.CodeAnalysis.ISymbol,ILLink.RoslynAnalyzer.DataFlow.FeatureContext)", "", "Argument[4]", "Argument[this]", "taint", "df-generated"]
-      - ["ILLink.RoslynAnalyzer.TrimAnalysis", "TrimAnalysisFieldAccessPattern", False, "Merge", "(ILLink.Shared.DataFlow.ValueSetLattice<ILLink.Shared.DataFlow.SingleValue>,ILLink.RoslynAnalyzer.DataFlow.FeatureContextLattice,ILLink.RoslynAnalyzer.TrimAnalysis.TrimAnalysisFieldAccessPattern)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
-      - ["ILLink.RoslynAnalyzer.TrimAnalysis", "TrimAnalysisFieldAccessPattern", False, "Merge", "(ILLink.Shared.DataFlow.ValueSetLattice<ILLink.Shared.DataFlow.SingleValue>,ILLink.RoslynAnalyzer.DataFlow.FeatureContextLattice,ILLink.RoslynAnalyzer.TrimAnalysis.TrimAnalysisFieldAccessPattern)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["ILLink.RoslynAnalyzer.TrimAnalysis", "TrimAnalysisFieldAccessPattern", False, "TrimAnalysisFieldAccessPattern", "(Microsoft.CodeAnalysis.IFieldSymbol,Microsoft.CodeAnalysis.Operations.IFieldReferenceOperation,Microsoft.CodeAnalysis.ISymbol,ILLink.RoslynAnalyzer.DataFlow.FeatureContext)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["ILLink.RoslynAnalyzer.TrimAnalysis", "TrimAnalysisFieldAccessPattern", False, "TrimAnalysisFieldAccessPattern", "(Microsoft.CodeAnalysis.IFieldSymbol,Microsoft.CodeAnalysis.Operations.IFieldReferenceOperation,Microsoft.CodeAnalysis.ISymbol,ILLink.RoslynAnalyzer.DataFlow.FeatureContext)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["ILLink.RoslynAnalyzer.TrimAnalysis", "TrimAnalysisFieldAccessPattern", False, "TrimAnalysisFieldAccessPattern", "(Microsoft.CodeAnalysis.IFieldSymbol,Microsoft.CodeAnalysis.Operations.IFieldReferenceOperation,Microsoft.CodeAnalysis.ISymbol,ILLink.RoslynAnalyzer.DataFlow.FeatureContext)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
-      - ["ILLink.RoslynAnalyzer.TrimAnalysis", "TrimAnalysisFieldAccessPattern", False, "TrimAnalysisFieldAccessPattern", "(Microsoft.CodeAnalysis.IFieldSymbol,Microsoft.CodeAnalysis.Operations.IFieldReferenceOperation,Microsoft.CodeAnalysis.ISymbol,ILLink.RoslynAnalyzer.DataFlow.FeatureContext)", "", "Argument[3]", "Argument[this]", "taint", "df-generated"]
-      - ["ILLink.RoslynAnalyzer.TrimAnalysis", "TrimAnalysisMethodCallPattern", False, "Merge", "(ILLink.Shared.DataFlow.ValueSetLattice<ILLink.Shared.DataFlow.SingleValue>,ILLink.RoslynAnalyzer.DataFlow.FeatureContextLattice,ILLink.RoslynAnalyzer.TrimAnalysis.TrimAnalysisMethodCallPattern)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
-      - ["ILLink.RoslynAnalyzer.TrimAnalysis", "TrimAnalysisMethodCallPattern", False, "Merge", "(ILLink.Shared.DataFlow.ValueSetLattice<ILLink.Shared.DataFlow.SingleValue>,ILLink.RoslynAnalyzer.DataFlow.FeatureContextLattice,ILLink.RoslynAnalyzer.TrimAnalysis.TrimAnalysisMethodCallPattern)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["ILLink.RoslynAnalyzer.TrimAnalysis", "TrimAnalysisMethodCallPattern", False, "TrimAnalysisMethodCallPattern", "(Microsoft.CodeAnalysis.IMethodSymbol,ILLink.Shared.DataFlow.ValueSet<ILLink.Shared.DataFlow.SingleValue>,System.Collections.Immutable.ImmutableArray<ILLink.Shared.DataFlow.ValueSet<ILLink.Shared.DataFlow.SingleValue>>,Microsoft.CodeAnalysis.IOperation,Microsoft.CodeAnalysis.ISymbol,ILLink.RoslynAnalyzer.DataFlow.FeatureContext)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["ILLink.RoslynAnalyzer.TrimAnalysis", "TrimAnalysisMethodCallPattern", False, "TrimAnalysisMethodCallPattern", "(Microsoft.CodeAnalysis.IMethodSymbol,ILLink.Shared.DataFlow.ValueSet<ILLink.Shared.DataFlow.SingleValue>,System.Collections.Immutable.ImmutableArray<ILLink.Shared.DataFlow.ValueSet<ILLink.Shared.DataFlow.SingleValue>>,Microsoft.CodeAnalysis.IOperation,Microsoft.CodeAnalysis.ISymbol,ILLink.RoslynAnalyzer.DataFlow.FeatureContext)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["ILLink.RoslynAnalyzer.TrimAnalysis", "TrimAnalysisMethodCallPattern", False, "TrimAnalysisMethodCallPattern", "(Microsoft.CodeAnalysis.IMethodSymbol,ILLink.Shared.DataFlow.ValueSet<ILLink.Shared.DataFlow.SingleValue>,System.Collections.Immutable.ImmutableArray<ILLink.Shared.DataFlow.ValueSet<ILLink.Shared.DataFlow.SingleValue>>,Microsoft.CodeAnalysis.IOperation,Microsoft.CodeAnalysis.ISymbol,ILLink.RoslynAnalyzer.DataFlow.FeatureContext)", "", "Argument[3]", "Argument[this]", "taint", "df-generated"]
-      - ["ILLink.RoslynAnalyzer.TrimAnalysis", "TrimAnalysisMethodCallPattern", False, "TrimAnalysisMethodCallPattern", "(Microsoft.CodeAnalysis.IMethodSymbol,ILLink.Shared.DataFlow.ValueSet<ILLink.Shared.DataFlow.SingleValue>,System.Collections.Immutable.ImmutableArray<ILLink.Shared.DataFlow.ValueSet<ILLink.Shared.DataFlow.SingleValue>>,Microsoft.CodeAnalysis.IOperation,Microsoft.CodeAnalysis.ISymbol,ILLink.RoslynAnalyzer.DataFlow.FeatureContext)", "", "Argument[4]", "Argument[this]", "taint", "df-generated"]
-      - ["ILLink.RoslynAnalyzer.TrimAnalysis", "TrimAnalysisMethodCallPattern", False, "TrimAnalysisMethodCallPattern", "(Microsoft.CodeAnalysis.IMethodSymbol,ILLink.Shared.DataFlow.ValueSet<ILLink.Shared.DataFlow.SingleValue>,System.Collections.Immutable.ImmutableArray<ILLink.Shared.DataFlow.ValueSet<ILLink.Shared.DataFlow.SingleValue>>,Microsoft.CodeAnalysis.IOperation,Microsoft.CodeAnalysis.ISymbol,ILLink.RoslynAnalyzer.DataFlow.FeatureContext)", "", "Argument[5]", "Argument[this]", "taint", "df-generated"]
+      - ["ILLink.RoslynAnalyzer.TrimAnalysis", "TrimAnalysisAssignmentPattern", False, "TrimAnalysisAssignmentPattern", "(ILLink.Shared.DataFlow.ValueSet<ILLink.Shared.DataFlow.SingleValue>,ILLink.Shared.DataFlow.ValueSet<ILLink.Shared.DataFlow.SingleValue>,Microsoft.CodeAnalysis.IOperation,Microsoft.CodeAnalysis.ISymbol,ILLink.RoslynAnalyzer.DataFlow.FeatureContext)", "", "Argument[0]", "Argument[this].Property[ILLink.RoslynAnalyzer.TrimAnalysis.TrimAnalysisAssignmentPattern.Source]", "value", "dfc-generated"]
+      - ["ILLink.RoslynAnalyzer.TrimAnalysis", "TrimAnalysisAssignmentPattern", False, "TrimAnalysisAssignmentPattern", "(ILLink.Shared.DataFlow.ValueSet<ILLink.Shared.DataFlow.SingleValue>,ILLink.Shared.DataFlow.ValueSet<ILLink.Shared.DataFlow.SingleValue>,Microsoft.CodeAnalysis.IOperation,Microsoft.CodeAnalysis.ISymbol,ILLink.RoslynAnalyzer.DataFlow.FeatureContext)", "", "Argument[1]", "Argument[this].Property[ILLink.RoslynAnalyzer.TrimAnalysis.TrimAnalysisAssignmentPattern.Target]", "value", "dfc-generated"]
+      - ["ILLink.RoslynAnalyzer.TrimAnalysis", "TrimAnalysisAssignmentPattern", False, "TrimAnalysisAssignmentPattern", "(ILLink.Shared.DataFlow.ValueSet<ILLink.Shared.DataFlow.SingleValue>,ILLink.Shared.DataFlow.ValueSet<ILLink.Shared.DataFlow.SingleValue>,Microsoft.CodeAnalysis.IOperation,Microsoft.CodeAnalysis.ISymbol,ILLink.RoslynAnalyzer.DataFlow.FeatureContext)", "", "Argument[2]", "Argument[this].Property[ILLink.RoslynAnalyzer.TrimAnalysis.TrimAnalysisAssignmentPattern.Operation]", "value", "dfc-generated"]
+      - ["ILLink.RoslynAnalyzer.TrimAnalysis", "TrimAnalysisAssignmentPattern", False, "TrimAnalysisAssignmentPattern", "(ILLink.Shared.DataFlow.ValueSet<ILLink.Shared.DataFlow.SingleValue>,ILLink.Shared.DataFlow.ValueSet<ILLink.Shared.DataFlow.SingleValue>,Microsoft.CodeAnalysis.IOperation,Microsoft.CodeAnalysis.ISymbol,ILLink.RoslynAnalyzer.DataFlow.FeatureContext)", "", "Argument[3]", "Argument[this].Property[ILLink.RoslynAnalyzer.TrimAnalysis.TrimAnalysisAssignmentPattern.OwningSymbol]", "value", "dfc-generated"]
+      - ["ILLink.RoslynAnalyzer.TrimAnalysis", "TrimAnalysisAssignmentPattern", False, "TrimAnalysisAssignmentPattern", "(ILLink.Shared.DataFlow.ValueSet<ILLink.Shared.DataFlow.SingleValue>,ILLink.Shared.DataFlow.ValueSet<ILLink.Shared.DataFlow.SingleValue>,Microsoft.CodeAnalysis.IOperation,Microsoft.CodeAnalysis.ISymbol,ILLink.RoslynAnalyzer.DataFlow.FeatureContext)", "", "Argument[4]", "Argument[this].Property[ILLink.RoslynAnalyzer.TrimAnalysis.TrimAnalysisAssignmentPattern.FeatureContext]", "value", "dfc-generated"]
+      - ["ILLink.RoslynAnalyzer.TrimAnalysis", "TrimAnalysisFieldAccessPattern", False, "Merge", "(ILLink.Shared.DataFlow.ValueSetLattice<ILLink.Shared.DataFlow.SingleValue>,ILLink.RoslynAnalyzer.DataFlow.FeatureContextLattice,ILLink.RoslynAnalyzer.TrimAnalysis.TrimAnalysisFieldAccessPattern)", "", "Argument[2].Property[ILLink.RoslynAnalyzer.TrimAnalysis.TrimAnalysisFieldAccessPattern.FeatureContext].Field[ILLink.RoslynAnalyzer.DataFlow.FeatureContext.EnabledFeatures]", "ReturnValue.Property[ILLink.RoslynAnalyzer.TrimAnalysis.TrimAnalysisFieldAccessPattern.FeatureContext].Field[ILLink.RoslynAnalyzer.DataFlow.FeatureContext.EnabledFeatures]", "value", "dfc-generated"]
+      - ["ILLink.RoslynAnalyzer.TrimAnalysis", "TrimAnalysisFieldAccessPattern", False, "TrimAnalysisFieldAccessPattern", "(Microsoft.CodeAnalysis.IFieldSymbol,Microsoft.CodeAnalysis.Operations.IFieldReferenceOperation,Microsoft.CodeAnalysis.ISymbol,ILLink.RoslynAnalyzer.DataFlow.FeatureContext)", "", "Argument[0]", "Argument[this].Property[ILLink.RoslynAnalyzer.TrimAnalysis.TrimAnalysisFieldAccessPattern.Field]", "value", "dfc-generated"]
+      - ["ILLink.RoslynAnalyzer.TrimAnalysis", "TrimAnalysisFieldAccessPattern", False, "TrimAnalysisFieldAccessPattern", "(Microsoft.CodeAnalysis.IFieldSymbol,Microsoft.CodeAnalysis.Operations.IFieldReferenceOperation,Microsoft.CodeAnalysis.ISymbol,ILLink.RoslynAnalyzer.DataFlow.FeatureContext)", "", "Argument[1]", "Argument[this].Property[ILLink.RoslynAnalyzer.TrimAnalysis.TrimAnalysisFieldAccessPattern.Operation]", "value", "dfc-generated"]
+      - ["ILLink.RoslynAnalyzer.TrimAnalysis", "TrimAnalysisFieldAccessPattern", False, "TrimAnalysisFieldAccessPattern", "(Microsoft.CodeAnalysis.IFieldSymbol,Microsoft.CodeAnalysis.Operations.IFieldReferenceOperation,Microsoft.CodeAnalysis.ISymbol,ILLink.RoslynAnalyzer.DataFlow.FeatureContext)", "", "Argument[2]", "Argument[this].Property[ILLink.RoslynAnalyzer.TrimAnalysis.TrimAnalysisFieldAccessPattern.OwningSymbol]", "value", "dfc-generated"]
+      - ["ILLink.RoslynAnalyzer.TrimAnalysis", "TrimAnalysisFieldAccessPattern", False, "TrimAnalysisFieldAccessPattern", "(Microsoft.CodeAnalysis.IFieldSymbol,Microsoft.CodeAnalysis.Operations.IFieldReferenceOperation,Microsoft.CodeAnalysis.ISymbol,ILLink.RoslynAnalyzer.DataFlow.FeatureContext)", "", "Argument[3]", "Argument[this].Property[ILLink.RoslynAnalyzer.TrimAnalysis.TrimAnalysisFieldAccessPattern.FeatureContext]", "value", "dfc-generated"]
+      - ["ILLink.RoslynAnalyzer.TrimAnalysis", "TrimAnalysisMethodCallPattern", False, "Merge", "(ILLink.Shared.DataFlow.ValueSetLattice<ILLink.Shared.DataFlow.SingleValue>,ILLink.RoslynAnalyzer.DataFlow.FeatureContextLattice,ILLink.RoslynAnalyzer.TrimAnalysis.TrimAnalysisMethodCallPattern)", "", "Argument[2].Property[ILLink.RoslynAnalyzer.TrimAnalysis.TrimAnalysisMethodCallPattern.FeatureContext].Field[ILLink.RoslynAnalyzer.DataFlow.FeatureContext.EnabledFeatures]", "ReturnValue.Property[ILLink.RoslynAnalyzer.TrimAnalysis.TrimAnalysisMethodCallPattern.FeatureContext].Field[ILLink.RoslynAnalyzer.DataFlow.FeatureContext.EnabledFeatures]", "value", "dfc-generated"]
+      - ["ILLink.RoslynAnalyzer.TrimAnalysis", "TrimAnalysisMethodCallPattern", False, "Merge", "(ILLink.Shared.DataFlow.ValueSetLattice<ILLink.Shared.DataFlow.SingleValue>,ILLink.RoslynAnalyzer.DataFlow.FeatureContextLattice,ILLink.RoslynAnalyzer.TrimAnalysis.TrimAnalysisMethodCallPattern)", "", "Argument[2].Property[ILLink.RoslynAnalyzer.TrimAnalysis.TrimAnalysisMethodCallPattern.Instance]", "ReturnValue.Property[ILLink.RoslynAnalyzer.TrimAnalysis.TrimAnalysisMethodCallPattern.Instance]", "value", "dfc-generated"]
+      - ["ILLink.RoslynAnalyzer.TrimAnalysis", "TrimAnalysisMethodCallPattern", False, "TrimAnalysisMethodCallPattern", "(Microsoft.CodeAnalysis.IMethodSymbol,ILLink.Shared.DataFlow.ValueSet<ILLink.Shared.DataFlow.SingleValue>,System.Collections.Immutable.ImmutableArray<ILLink.Shared.DataFlow.ValueSet<ILLink.Shared.DataFlow.SingleValue>>,Microsoft.CodeAnalysis.IOperation,Microsoft.CodeAnalysis.ISymbol,ILLink.RoslynAnalyzer.DataFlow.FeatureContext)", "", "Argument[0]", "Argument[this].Property[ILLink.RoslynAnalyzer.TrimAnalysis.TrimAnalysisMethodCallPattern.CalledMethod]", "value", "dfc-generated"]
+      - ["ILLink.RoslynAnalyzer.TrimAnalysis", "TrimAnalysisMethodCallPattern", False, "TrimAnalysisMethodCallPattern", "(Microsoft.CodeAnalysis.IMethodSymbol,ILLink.Shared.DataFlow.ValueSet<ILLink.Shared.DataFlow.SingleValue>,System.Collections.Immutable.ImmutableArray<ILLink.Shared.DataFlow.ValueSet<ILLink.Shared.DataFlow.SingleValue>>,Microsoft.CodeAnalysis.IOperation,Microsoft.CodeAnalysis.ISymbol,ILLink.RoslynAnalyzer.DataFlow.FeatureContext)", "", "Argument[1]", "Argument[this].Property[ILLink.RoslynAnalyzer.TrimAnalysis.TrimAnalysisMethodCallPattern.Instance]", "value", "dfc-generated"]
+      - ["ILLink.RoslynAnalyzer.TrimAnalysis", "TrimAnalysisMethodCallPattern", False, "TrimAnalysisMethodCallPattern", "(Microsoft.CodeAnalysis.IMethodSymbol,ILLink.Shared.DataFlow.ValueSet<ILLink.Shared.DataFlow.SingleValue>,System.Collections.Immutable.ImmutableArray<ILLink.Shared.DataFlow.ValueSet<ILLink.Shared.DataFlow.SingleValue>>,Microsoft.CodeAnalysis.IOperation,Microsoft.CodeAnalysis.ISymbol,ILLink.RoslynAnalyzer.DataFlow.FeatureContext)", "", "Argument[3]", "Argument[this].Property[ILLink.RoslynAnalyzer.TrimAnalysis.TrimAnalysisMethodCallPattern.Operation]", "value", "dfc-generated"]
+      - ["ILLink.RoslynAnalyzer.TrimAnalysis", "TrimAnalysisMethodCallPattern", False, "TrimAnalysisMethodCallPattern", "(Microsoft.CodeAnalysis.IMethodSymbol,ILLink.Shared.DataFlow.ValueSet<ILLink.Shared.DataFlow.SingleValue>,System.Collections.Immutable.ImmutableArray<ILLink.Shared.DataFlow.ValueSet<ILLink.Shared.DataFlow.SingleValue>>,Microsoft.CodeAnalysis.IOperation,Microsoft.CodeAnalysis.ISymbol,ILLink.RoslynAnalyzer.DataFlow.FeatureContext)", "", "Argument[4]", "Argument[this].Property[ILLink.RoslynAnalyzer.TrimAnalysis.TrimAnalysisMethodCallPattern.OwningSymbol]", "value", "dfc-generated"]
+      - ["ILLink.RoslynAnalyzer.TrimAnalysis", "TrimAnalysisMethodCallPattern", False, "TrimAnalysisMethodCallPattern", "(Microsoft.CodeAnalysis.IMethodSymbol,ILLink.Shared.DataFlow.ValueSet<ILLink.Shared.DataFlow.SingleValue>,System.Collections.Immutable.ImmutableArray<ILLink.Shared.DataFlow.ValueSet<ILLink.Shared.DataFlow.SingleValue>>,Microsoft.CodeAnalysis.IOperation,Microsoft.CodeAnalysis.ISymbol,ILLink.RoslynAnalyzer.DataFlow.FeatureContext)", "", "Argument[5].Field[ILLink.RoslynAnalyzer.DataFlow.FeatureContext.EnabledFeatures]", "Argument[this].Property[ILLink.RoslynAnalyzer.TrimAnalysis.TrimAnalysisMethodCallPattern.FeatureContext].Field[ILLink.RoslynAnalyzer.DataFlow.FeatureContext.EnabledFeatures]", "value", "dfc-generated"]
       - ["ILLink.RoslynAnalyzer.TrimAnalysis", "TrimAnalysisPatternStore", False, "TrimAnalysisPatternStore", "(ILLink.Shared.DataFlow.ValueSetLattice<ILLink.Shared.DataFlow.SingleValue>,ILLink.RoslynAnalyzer.DataFlow.FeatureContextLattice)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["ILLink.RoslynAnalyzer.TrimAnalysis", "TrimAnalysisPatternStore", False, "TrimAnalysisPatternStore", "(ILLink.Shared.DataFlow.ValueSetLattice<ILLink.Shared.DataFlow.SingleValue>,ILLink.RoslynAnalyzer.DataFlow.FeatureContextLattice)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["ILLink.RoslynAnalyzer.TrimAnalysis", "TrimAnalysisReflectionAccessPattern", False, "Merge", "(ILLink.Shared.DataFlow.ValueSetLattice<ILLink.Shared.DataFlow.SingleValue>,ILLink.RoslynAnalyzer.DataFlow.FeatureContextLattice,ILLink.RoslynAnalyzer.TrimAnalysis.TrimAnalysisReflectionAccessPattern)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
-      - ["ILLink.RoslynAnalyzer.TrimAnalysis", "TrimAnalysisReflectionAccessPattern", False, "Merge", "(ILLink.Shared.DataFlow.ValueSetLattice<ILLink.Shared.DataFlow.SingleValue>,ILLink.RoslynAnalyzer.DataFlow.FeatureContextLattice,ILLink.RoslynAnalyzer.TrimAnalysis.TrimAnalysisReflectionAccessPattern)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["ILLink.RoslynAnalyzer.TrimAnalysis", "TrimAnalysisReflectionAccessPattern", False, "TrimAnalysisReflectionAccessPattern", "(Microsoft.CodeAnalysis.IMethodSymbol,Microsoft.CodeAnalysis.IOperation,Microsoft.CodeAnalysis.ISymbol,ILLink.RoslynAnalyzer.DataFlow.FeatureContext)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["ILLink.RoslynAnalyzer.TrimAnalysis", "TrimAnalysisReflectionAccessPattern", False, "TrimAnalysisReflectionAccessPattern", "(Microsoft.CodeAnalysis.IMethodSymbol,Microsoft.CodeAnalysis.IOperation,Microsoft.CodeAnalysis.ISymbol,ILLink.RoslynAnalyzer.DataFlow.FeatureContext)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["ILLink.RoslynAnalyzer.TrimAnalysis", "TrimAnalysisReflectionAccessPattern", False, "TrimAnalysisReflectionAccessPattern", "(Microsoft.CodeAnalysis.IMethodSymbol,Microsoft.CodeAnalysis.IOperation,Microsoft.CodeAnalysis.ISymbol,ILLink.RoslynAnalyzer.DataFlow.FeatureContext)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
-      - ["ILLink.RoslynAnalyzer.TrimAnalysis", "TrimAnalysisReflectionAccessPattern", False, "TrimAnalysisReflectionAccessPattern", "(Microsoft.CodeAnalysis.IMethodSymbol,Microsoft.CodeAnalysis.IOperation,Microsoft.CodeAnalysis.ISymbol,ILLink.RoslynAnalyzer.DataFlow.FeatureContext)", "", "Argument[3]", "Argument[this]", "taint", "df-generated"]
-      - ["ILLink.RoslynAnalyzer.TrimAnalysis", "TrimAnalysisVisitor", False, "TrimAnalysisVisitor", "(Microsoft.CodeAnalysis.Compilation,ILLink.RoslynAnalyzer.DataFlow.LocalStateAndContextLattice<ILLink.Shared.DataFlow.ValueSet<ILLink.Shared.DataFlow.SingleValue>,ILLink.RoslynAnalyzer.DataFlow.FeatureContext,ILLink.Shared.DataFlow.ValueSetLattice<ILLink.Shared.DataFlow.SingleValue>,ILLink.RoslynAnalyzer.DataFlow.FeatureContextLattice>,Microsoft.CodeAnalysis.ISymbol,Microsoft.CodeAnalysis.FlowAnalysis.ControlFlowGraph,System.Collections.Immutable.ImmutableDictionary<Microsoft.CodeAnalysis.FlowAnalysis.CaptureId,ILLink.RoslynAnalyzer.DataFlow.FlowCaptureKind>,ILLink.RoslynAnalyzer.TrimAnalysis.TrimAnalysisPatternStore,ILLink.RoslynAnalyzer.DataFlow.InterproceduralState<ILLink.Shared.DataFlow.ValueSet<ILLink.Shared.DataFlow.SingleValue>,ILLink.Shared.DataFlow.ValueSetLattice<ILLink.Shared.DataFlow.SingleValue>>,ILLink.RoslynAnalyzer.DataFlowAnalyzerContext)", "", "Argument[5]", "Argument[this]", "taint", "df-generated"]
-      - ["ILLink.RoslynAnalyzer.TrimAnalysis", "TrimAnalysisVisitor", False, "TrimAnalysisVisitor", "(Microsoft.CodeAnalysis.Compilation,ILLink.RoslynAnalyzer.DataFlow.LocalStateAndContextLattice<ILLink.Shared.DataFlow.ValueSet<ILLink.Shared.DataFlow.SingleValue>,ILLink.RoslynAnalyzer.DataFlow.FeatureContext,ILLink.Shared.DataFlow.ValueSetLattice<ILLink.Shared.DataFlow.SingleValue>,ILLink.RoslynAnalyzer.DataFlow.FeatureContextLattice>,Microsoft.CodeAnalysis.ISymbol,Microsoft.CodeAnalysis.FlowAnalysis.ControlFlowGraph,System.Collections.Immutable.ImmutableDictionary<Microsoft.CodeAnalysis.FlowAnalysis.CaptureId,ILLink.RoslynAnalyzer.DataFlow.FlowCaptureKind>,ILLink.RoslynAnalyzer.TrimAnalysis.TrimAnalysisPatternStore,ILLink.RoslynAnalyzer.DataFlow.InterproceduralState<ILLink.Shared.DataFlow.ValueSet<ILLink.Shared.DataFlow.SingleValue>,ILLink.Shared.DataFlow.ValueSetLattice<ILLink.Shared.DataFlow.SingleValue>>,ILLink.RoslynAnalyzer.DataFlowAnalyzerContext)", "", "Argument[7]", "Argument[this]", "taint", "df-generated"]
-      - ["ILLink.RoslynAnalyzer.TrimAnalysis", "TrimAnalysisVisitor", True, "ApplyCondition", "(ILLink.RoslynAnalyzer.DataFlow.FeatureChecksValue,ILLink.RoslynAnalyzer.DataFlow.LocalStateAndContext<ILLink.Shared.DataFlow.ValueSet<ILLink.Shared.DataFlow.SingleValue>,ILLink.RoslynAnalyzer.DataFlow.FeatureContext>)", "", "Argument[0]", "Argument[1]", "taint", "df-generated"]
+      - ["ILLink.RoslynAnalyzer.TrimAnalysis", "TrimAnalysisReflectionAccessPattern", False, "Merge", "(ILLink.Shared.DataFlow.ValueSetLattice<ILLink.Shared.DataFlow.SingleValue>,ILLink.RoslynAnalyzer.DataFlow.FeatureContextLattice,ILLink.RoslynAnalyzer.TrimAnalysis.TrimAnalysisReflectionAccessPattern)", "", "Argument[2].Property[ILLink.RoslynAnalyzer.TrimAnalysis.TrimAnalysisReflectionAccessPattern.FeatureContext].Field[ILLink.RoslynAnalyzer.DataFlow.FeatureContext.EnabledFeatures]", "ReturnValue.Property[ILLink.RoslynAnalyzer.TrimAnalysis.TrimAnalysisReflectionAccessPattern.FeatureContext].Field[ILLink.RoslynAnalyzer.DataFlow.FeatureContext.EnabledFeatures]", "value", "dfc-generated"]
+      - ["ILLink.RoslynAnalyzer.TrimAnalysis", "TrimAnalysisReflectionAccessPattern", False, "TrimAnalysisReflectionAccessPattern", "(Microsoft.CodeAnalysis.IMethodSymbol,Microsoft.CodeAnalysis.IOperation,Microsoft.CodeAnalysis.ISymbol,ILLink.RoslynAnalyzer.DataFlow.FeatureContext)", "", "Argument[0]", "Argument[this].Property[ILLink.RoslynAnalyzer.TrimAnalysis.TrimAnalysisReflectionAccessPattern.ReferencedMethod]", "value", "dfc-generated"]
+      - ["ILLink.RoslynAnalyzer.TrimAnalysis", "TrimAnalysisReflectionAccessPattern", False, "TrimAnalysisReflectionAccessPattern", "(Microsoft.CodeAnalysis.IMethodSymbol,Microsoft.CodeAnalysis.IOperation,Microsoft.CodeAnalysis.ISymbol,ILLink.RoslynAnalyzer.DataFlow.FeatureContext)", "", "Argument[1]", "Argument[this].Property[ILLink.RoslynAnalyzer.TrimAnalysis.TrimAnalysisReflectionAccessPattern.Operation]", "value", "dfc-generated"]
+      - ["ILLink.RoslynAnalyzer.TrimAnalysis", "TrimAnalysisReflectionAccessPattern", False, "TrimAnalysisReflectionAccessPattern", "(Microsoft.CodeAnalysis.IMethodSymbol,Microsoft.CodeAnalysis.IOperation,Microsoft.CodeAnalysis.ISymbol,ILLink.RoslynAnalyzer.DataFlow.FeatureContext)", "", "Argument[2]", "Argument[this].Property[ILLink.RoslynAnalyzer.TrimAnalysis.TrimAnalysisReflectionAccessPattern.OwningSymbol]", "value", "dfc-generated"]
+      - ["ILLink.RoslynAnalyzer.TrimAnalysis", "TrimAnalysisReflectionAccessPattern", False, "TrimAnalysisReflectionAccessPattern", "(Microsoft.CodeAnalysis.IMethodSymbol,Microsoft.CodeAnalysis.IOperation,Microsoft.CodeAnalysis.ISymbol,ILLink.RoslynAnalyzer.DataFlow.FeatureContext)", "", "Argument[3].Field[ILLink.RoslynAnalyzer.DataFlow.FeatureContext.EnabledFeatures]", "Argument[this].Property[ILLink.RoslynAnalyzer.TrimAnalysis.TrimAnalysisReflectionAccessPattern.FeatureContext].Field[ILLink.RoslynAnalyzer.DataFlow.FeatureContext.EnabledFeatures]", "value", "dfc-generated"]
+      - ["ILLink.RoslynAnalyzer.TrimAnalysis", "TrimAnalysisVisitor", False, "TrimAnalysisVisitor", "(Microsoft.CodeAnalysis.Compilation,ILLink.RoslynAnalyzer.DataFlow.LocalStateAndContextLattice<ILLink.Shared.DataFlow.ValueSet<ILLink.Shared.DataFlow.SingleValue>,ILLink.RoslynAnalyzer.DataFlow.FeatureContext,ILLink.Shared.DataFlow.ValueSetLattice<ILLink.Shared.DataFlow.SingleValue>,ILLink.RoslynAnalyzer.DataFlow.FeatureContextLattice>,Microsoft.CodeAnalysis.ISymbol,Microsoft.CodeAnalysis.FlowAnalysis.ControlFlowGraph,System.Collections.Immutable.ImmutableDictionary<Microsoft.CodeAnalysis.FlowAnalysis.CaptureId,ILLink.RoslynAnalyzer.DataFlow.FlowCaptureKind>,ILLink.RoslynAnalyzer.TrimAnalysis.TrimAnalysisPatternStore,ILLink.RoslynAnalyzer.DataFlow.InterproceduralState<ILLink.Shared.DataFlow.ValueSet<ILLink.Shared.DataFlow.SingleValue>,ILLink.Shared.DataFlow.ValueSetLattice<ILLink.Shared.DataFlow.SingleValue>>,ILLink.RoslynAnalyzer.DataFlowAnalyzerContext)", "", "Argument[5]", "Argument[this].Field[ILLink.RoslynAnalyzer.TrimAnalysis.TrimAnalysisVisitor.TrimAnalysisPatterns]", "value", "dfc-generated"]
+      - ["ILLink.RoslynAnalyzer.TrimAnalysis", "TrimAnalysisVisitor", True, "ApplyCondition", "(ILLink.RoslynAnalyzer.DataFlow.FeatureChecksValue,ILLink.RoslynAnalyzer.DataFlow.LocalStateAndContext<ILLink.Shared.DataFlow.ValueSet<ILLink.Shared.DataFlow.SingleValue>,ILLink.RoslynAnalyzer.DataFlow.FeatureContext>)", "", "Argument[0].Field[ILLink.RoslynAnalyzer.DataFlow.FeatureChecksValue.EnabledFeatures]", "Argument[1].Field[ILLink.RoslynAnalyzer.DataFlow.LocalStateAndContext`2.Context].Field[ILLink.RoslynAnalyzer.DataFlow.FeatureContext.EnabledFeatures]", "value", "dfc-generated"]
+      - ["ILLink.RoslynAnalyzer.TrimAnalysis", "TrimAnalysisVisitor", True, "ApplyCondition", "(ILLink.RoslynAnalyzer.DataFlow.FeatureChecksValue,ILLink.RoslynAnalyzer.DataFlow.LocalStateAndContext<ILLink.Shared.DataFlow.ValueSet<ILLink.Shared.DataFlow.SingleValue>,ILLink.RoslynAnalyzer.DataFlow.FeatureContext>)", "", "Argument[1]", "ReturnValue", "value", "dfc-generated"]
       - ["ILLink.RoslynAnalyzer.TrimAnalysis", "TrimAnalysisVisitor", True, "GetFieldTargetValue", "(Microsoft.CodeAnalysis.IFieldSymbol,Microsoft.CodeAnalysis.Operations.IFieldReferenceOperation,ILLink.RoslynAnalyzer.DataFlow.FeatureContext)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["ILLink.RoslynAnalyzer.TrimAnalysis", "TrimAnalysisVisitor", True, "HandleArrayElementRead", "(ILLink.Shared.DataFlow.ValueSet<ILLink.Shared.DataFlow.SingleValue>,ILLink.Shared.DataFlow.ValueSet<ILLink.Shared.DataFlow.SingleValue>,Microsoft.CodeAnalysis.IOperation)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["ILLink.RoslynAnalyzer.TrimAnalysis", "TrimAnalysisVisitor", True, "HandleDelegateCreation", "(Microsoft.CodeAnalysis.IMethodSymbol,Microsoft.CodeAnalysis.IOperation,ILLink.RoslynAnalyzer.DataFlow.FeatureContext)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["ILLink.RoslynAnalyzer.TrimAnalysis", "TrimAnalysisVisitor", True, "HandleMethodCall", "(Microsoft.CodeAnalysis.IMethodSymbol,ILLink.Shared.DataFlow.ValueSet<ILLink.Shared.DataFlow.SingleValue>,System.Collections.Immutable.ImmutableArray<ILLink.Shared.DataFlow.ValueSet<ILLink.Shared.DataFlow.SingleValue>>,Microsoft.CodeAnalysis.IOperation,ILLink.RoslynAnalyzer.DataFlow.FeatureContext)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["ILLink.RoslynAnalyzer.TrimAnalysis", "TrimAnalysisVisitor", True, "HandleMethodCall", "(Microsoft.CodeAnalysis.IMethodSymbol,ILLink.Shared.DataFlow.ValueSet<ILLink.Shared.DataFlow.SingleValue>,System.Collections.Immutable.ImmutableArray<ILLink.Shared.DataFlow.ValueSet<ILLink.Shared.DataFlow.SingleValue>>,Microsoft.CodeAnalysis.IOperation,ILLink.RoslynAnalyzer.DataFlow.FeatureContext)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["ILLink.RoslynAnalyzer.TrimAnalysis", "TrimAnalysisVisitor", True, "HandleMethodCall", "(Microsoft.CodeAnalysis.IMethodSymbol,ILLink.Shared.DataFlow.ValueSet<ILLink.Shared.DataFlow.SingleValue>,System.Collections.Immutable.ImmutableArray<ILLink.Shared.DataFlow.ValueSet<ILLink.Shared.DataFlow.SingleValue>>,Microsoft.CodeAnalysis.IOperation,ILLink.RoslynAnalyzer.DataFlow.FeatureContext)", "", "Argument[2].Element", "ReturnValue", "taint", "df-generated"]
-      - ["ILLink.RoslynAnalyzer.TrimAnalysis", "TrimAnalysisVisitor", True, "HandleMethodCall", "(Microsoft.CodeAnalysis.IMethodSymbol,ILLink.Shared.DataFlow.ValueSet<ILLink.Shared.DataFlow.SingleValue>,System.Collections.Immutable.ImmutableArray<ILLink.Shared.DataFlow.ValueSet<ILLink.Shared.DataFlow.SingleValue>>,Microsoft.CodeAnalysis.IOperation,ILLink.RoslynAnalyzer.DataFlow.FeatureContext)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["ILLink.RoslynAnalyzer.TrimAnalysis", "TrimAnalysisVisitor", True, "HandleArrayElementRead", "(ILLink.Shared.DataFlow.ValueSet<ILLink.Shared.DataFlow.SingleValue>,ILLink.Shared.DataFlow.ValueSet<ILLink.Shared.DataFlow.SingleValue>,Microsoft.CodeAnalysis.IOperation)", "", "Argument[this].Property[ILLink.RoslynAnalyzer.DataFlow.LocalDataFlowVisitor`5.TopValue]", "ReturnValue", "value", "dfc-generated"]
+      - ["ILLink.RoslynAnalyzer.TrimAnalysis", "TrimAnalysisVisitor", True, "HandleDelegateCreation", "(Microsoft.CodeAnalysis.IMethodSymbol,Microsoft.CodeAnalysis.IOperation,ILLink.RoslynAnalyzer.DataFlow.FeatureContext)", "", "Argument[this].Property[ILLink.RoslynAnalyzer.DataFlow.LocalDataFlowVisitor`5.TopValue]", "ReturnValue", "value", "dfc-generated"]
+      - ["ILLink.RoslynAnalyzer.TrimAnalysis", "TrimAnalysisVisitor", True, "HandleMethodCall", "(Microsoft.CodeAnalysis.IMethodSymbol,ILLink.Shared.DataFlow.ValueSet<ILLink.Shared.DataFlow.SingleValue>,System.Collections.Immutable.ImmutableArray<ILLink.Shared.DataFlow.ValueSet<ILLink.Shared.DataFlow.SingleValue>>,Microsoft.CodeAnalysis.IOperation,ILLink.RoslynAnalyzer.DataFlow.FeatureContext)", "", "Argument[1].Property[System.Nullable`1.Value]", "ReturnValue", "value", "dfc-generated"]
       - ["ILLink.RoslynAnalyzer.TrimAnalysis", "TrimAnalysisVisitor", True, "Visit", "(Microsoft.CodeAnalysis.IOperation,ILLink.RoslynAnalyzer.DataFlow.LocalDataFlowState<ILLink.Shared.DataFlow.ValueSet<ILLink.Shared.DataFlow.SingleValue>,ILLink.RoslynAnalyzer.DataFlow.FeatureContext,ILLink.Shared.DataFlow.ValueSetLattice<ILLink.Shared.DataFlow.SingleValue>,ILLink.RoslynAnalyzer.DataFlow.FeatureContextLattice>)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["ILLink.RoslynAnalyzer.TrimAnalysis", "TrimAnalysisVisitor", True, "VisitArrayCreation", "(Microsoft.CodeAnalysis.Operations.IArrayCreationOperation,ILLink.RoslynAnalyzer.DataFlow.LocalDataFlowState<ILLink.Shared.DataFlow.ValueSet<ILLink.Shared.DataFlow.SingleValue>,ILLink.RoslynAnalyzer.DataFlow.FeatureContext,ILLink.Shared.DataFlow.ValueSetLattice<ILLink.Shared.DataFlow.SingleValue>,ILLink.RoslynAnalyzer.DataFlow.FeatureContextLattice>)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["ILLink.RoslynAnalyzer.TrimAnalysis", "TrimAnalysisVisitor", True, "VisitBinaryOperator", "(Microsoft.CodeAnalysis.Operations.IBinaryOperation,ILLink.RoslynAnalyzer.DataFlow.LocalDataFlowState<ILLink.Shared.DataFlow.ValueSet<ILLink.Shared.DataFlow.SingleValue>,ILLink.RoslynAnalyzer.DataFlow.FeatureContext,ILLink.Shared.DataFlow.ValueSetLattice<ILLink.Shared.DataFlow.SingleValue>,ILLink.RoslynAnalyzer.DataFlow.FeatureContextLattice>)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["ILLink.RoslynAnalyzer.TrimAnalysis", "TrimAnalysisVisitor", True, "VisitConversion", "(Microsoft.CodeAnalysis.Operations.IConversionOperation,ILLink.RoslynAnalyzer.DataFlow.LocalDataFlowState<ILLink.Shared.DataFlow.ValueSet<ILLink.Shared.DataFlow.SingleValue>,ILLink.RoslynAnalyzer.DataFlow.FeatureContext,ILLink.Shared.DataFlow.ValueSetLattice<ILLink.Shared.DataFlow.SingleValue>,ILLink.RoslynAnalyzer.DataFlow.FeatureContextLattice>)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["ILLink.RoslynAnalyzer.TrimAnalysis", "TrimAnalysisVisitor", True, "VisitArrayCreation", "(Microsoft.CodeAnalysis.Operations.IArrayCreationOperation,ILLink.RoslynAnalyzer.DataFlow.LocalDataFlowState<ILLink.Shared.DataFlow.ValueSet<ILLink.Shared.DataFlow.SingleValue>,ILLink.RoslynAnalyzer.DataFlow.FeatureContext,ILLink.Shared.DataFlow.ValueSetLattice<ILLink.Shared.DataFlow.SingleValue>,ILLink.RoslynAnalyzer.DataFlow.FeatureContextLattice>)", "", "Argument[this].Property[ILLink.RoslynAnalyzer.DataFlow.LocalDataFlowVisitor`5.TopValue]", "ReturnValue", "value", "dfc-generated"]
+      - ["ILLink.RoslynAnalyzer.TrimAnalysis", "TrimAnalysisVisitor", True, "VisitBinaryOperator", "(Microsoft.CodeAnalysis.Operations.IBinaryOperation,ILLink.RoslynAnalyzer.DataFlow.LocalDataFlowState<ILLink.Shared.DataFlow.ValueSet<ILLink.Shared.DataFlow.SingleValue>,ILLink.RoslynAnalyzer.DataFlow.FeatureContext,ILLink.Shared.DataFlow.ValueSetLattice<ILLink.Shared.DataFlow.SingleValue>,ILLink.RoslynAnalyzer.DataFlow.FeatureContextLattice>)", "", "Argument[this].Property[ILLink.RoslynAnalyzer.DataFlow.LocalDataFlowVisitor`5.TopValue]", "ReturnValue", "value", "dfc-generated"]
+      - ["ILLink.RoslynAnalyzer.TrimAnalysis", "TrimAnalysisVisitor", True, "VisitConversion", "(Microsoft.CodeAnalysis.Operations.IConversionOperation,ILLink.RoslynAnalyzer.DataFlow.LocalDataFlowState<ILLink.Shared.DataFlow.ValueSet<ILLink.Shared.DataFlow.SingleValue>,ILLink.RoslynAnalyzer.DataFlow.FeatureContext,ILLink.Shared.DataFlow.ValueSetLattice<ILLink.Shared.DataFlow.SingleValue>,ILLink.RoslynAnalyzer.DataFlow.FeatureContextLattice>)", "", "Argument[this].Property[ILLink.RoslynAnalyzer.DataFlow.LocalDataFlowVisitor`5.TopValue]", "ReturnValue", "value", "dfc-generated"]
       - ["ILLink.RoslynAnalyzer.TrimAnalysis", "TrimAnalysisVisitor", True, "VisitFieldReference", "(Microsoft.CodeAnalysis.Operations.IFieldReferenceOperation,ILLink.RoslynAnalyzer.DataFlow.LocalDataFlowState<ILLink.Shared.DataFlow.ValueSet<ILLink.Shared.DataFlow.SingleValue>,ILLink.RoslynAnalyzer.DataFlow.FeatureContext,ILLink.Shared.DataFlow.ValueSetLattice<ILLink.Shared.DataFlow.SingleValue>,ILLink.RoslynAnalyzer.DataFlow.FeatureContextLattice>)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["ILLink.RoslynAnalyzer.TrimAnalysis", "TrimAnalysisVisitor", True, "VisitInstanceReference", "(Microsoft.CodeAnalysis.Operations.IInstanceReferenceOperation,ILLink.RoslynAnalyzer.DataFlow.LocalDataFlowState<ILLink.Shared.DataFlow.ValueSet<ILLink.Shared.DataFlow.SingleValue>,ILLink.RoslynAnalyzer.DataFlow.FeatureContext,ILLink.Shared.DataFlow.ValueSetLattice<ILLink.Shared.DataFlow.SingleValue>,ILLink.RoslynAnalyzer.DataFlow.FeatureContextLattice>)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["ILLink.RoslynAnalyzer.TrimAnalysis", "TrimAnalysisVisitor", True, "VisitTypeOf", "(Microsoft.CodeAnalysis.Operations.ITypeOfOperation,ILLink.RoslynAnalyzer.DataFlow.LocalDataFlowState<ILLink.Shared.DataFlow.ValueSet<ILLink.Shared.DataFlow.SingleValue>,ILLink.RoslynAnalyzer.DataFlow.FeatureContext,ILLink.Shared.DataFlow.ValueSetLattice<ILLink.Shared.DataFlow.SingleValue>,ILLink.RoslynAnalyzer.DataFlow.FeatureContextLattice>)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["ILLink.RoslynAnalyzer.TrimAnalysis", "TrimAnalysisVisitor", True, "VisitTypeOf", "(Microsoft.CodeAnalysis.Operations.ITypeOfOperation,ILLink.RoslynAnalyzer.DataFlow.LocalDataFlowState<ILLink.Shared.DataFlow.ValueSet<ILLink.Shared.DataFlow.SingleValue>,ILLink.RoslynAnalyzer.DataFlow.FeatureContext,ILLink.Shared.DataFlow.ValueSetLattice<ILLink.Shared.DataFlow.SingleValue>,ILLink.RoslynAnalyzer.DataFlow.FeatureContextLattice>)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["ILLink.RoslynAnalyzer.TrimAnalysis", "TrimAnalysisVisitor", True, "VisitInstanceReference", "(Microsoft.CodeAnalysis.Operations.IInstanceReferenceOperation,ILLink.RoslynAnalyzer.DataFlow.LocalDataFlowState<ILLink.Shared.DataFlow.ValueSet<ILLink.Shared.DataFlow.SingleValue>,ILLink.RoslynAnalyzer.DataFlow.FeatureContext,ILLink.Shared.DataFlow.ValueSetLattice<ILLink.Shared.DataFlow.SingleValue>,ILLink.RoslynAnalyzer.DataFlow.FeatureContextLattice>)", "", "Argument[this].Property[ILLink.RoslynAnalyzer.DataFlow.LocalDataFlowVisitor`5.TopValue]", "ReturnValue", "value", "dfc-generated"]
+      - ["ILLink.RoslynAnalyzer.TrimAnalysis", "TrimAnalysisVisitor", True, "VisitTypeOf", "(Microsoft.CodeAnalysis.Operations.ITypeOfOperation,ILLink.RoslynAnalyzer.DataFlow.LocalDataFlowState<ILLink.Shared.DataFlow.ValueSet<ILLink.Shared.DataFlow.SingleValue>,ILLink.RoslynAnalyzer.DataFlow.FeatureContext,ILLink.Shared.DataFlow.ValueSetLattice<ILLink.Shared.DataFlow.SingleValue>,ILLink.RoslynAnalyzer.DataFlow.FeatureContextLattice>)", "", "Argument[this].Property[ILLink.RoslynAnalyzer.DataFlow.LocalDataFlowVisitor`5.TopValue]", "ReturnValue", "value", "dfc-generated"]
       - ["ILLink.RoslynAnalyzer.TrimAnalysis", "TrimDataFlowAnalysis", False, "TrimDataFlowAnalysis", "(Microsoft.CodeAnalysis.Diagnostics.OperationBlockAnalysisContext,ILLink.RoslynAnalyzer.DataFlowAnalyzerContext,Microsoft.CodeAnalysis.IOperation)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["ILLink.RoslynAnalyzer.TrimAnalysis", "TrimDataFlowAnalysis", True, "GetVisitor", "(Microsoft.CodeAnalysis.ISymbol,Microsoft.CodeAnalysis.FlowAnalysis.ControlFlowGraph,System.Collections.Immutable.ImmutableDictionary<Microsoft.CodeAnalysis.FlowAnalysis.CaptureId,ILLink.RoslynAnalyzer.DataFlow.FlowCaptureKind>,ILLink.RoslynAnalyzer.DataFlow.InterproceduralState<ILLink.Shared.DataFlow.ValueSet<ILLink.Shared.DataFlow.SingleValue>,ILLink.Shared.DataFlow.ValueSetLattice<ILLink.Shared.DataFlow.SingleValue>>)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["ILLink.RoslynAnalyzer.TrimAnalysis", "TrimDataFlowAnalysis", True, "GetVisitor", "(Microsoft.CodeAnalysis.ISymbol,Microsoft.CodeAnalysis.FlowAnalysis.ControlFlowGraph,System.Collections.Immutable.ImmutableDictionary<Microsoft.CodeAnalysis.FlowAnalysis.CaptureId,ILLink.RoslynAnalyzer.DataFlow.FlowCaptureKind>,ILLink.RoslynAnalyzer.DataFlow.InterproceduralState<ILLink.Shared.DataFlow.ValueSet<ILLink.Shared.DataFlow.SingleValue>,ILLink.Shared.DataFlow.ValueSetLattice<ILLink.Shared.DataFlow.SingleValue>>)", "", "Argument[this].Property[ILLink.RoslynAnalyzer.TrimAnalysis.TrimDataFlowAnalysis.TrimAnalysisPatterns]", "ReturnValue.Field[ILLink.RoslynAnalyzer.TrimAnalysis.TrimAnalysisVisitor.TrimAnalysisPatterns]", "value", "dfc-generated"]
       - ["ILLink.RoslynAnalyzer.TrimAnalysis", "TrimDataFlowAnalysis", True, "TraceStart", "(ILLink.RoslynAnalyzer.DataFlow.ControlFlowGraphProxy)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
   - addsTo:
       pack: codeql/csharp-all
diff --git a/csharp/ql/lib/ext/generated/ILLink.RoslynAnalyzer.model.yml b/csharp/ql/lib/ext/generated/ILLink.RoslynAnalyzer.model.yml
index bf190b87661..98e034e8058 100644
--- a/csharp/ql/lib/ext/generated/ILLink.RoslynAnalyzer.model.yml
+++ b/csharp/ql/lib/ext/generated/ILLink.RoslynAnalyzer.model.yml
@@ -4,14 +4,18 @@ extensions:
       pack: codeql/csharp-all
       extensible: summaryModel
     data:
-      - ["ILLink.RoslynAnalyzer", "CompilationExtensions", False, "GetUnqualifiedName", "(Microsoft.CodeAnalysis.CSharp.Syntax.NameSyntax)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["ILLink.RoslynAnalyzer", "CompilationExtensions", False, "ToImmutableArray<T>", "(System.ReadOnlySpan<T>)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["ILLink.RoslynAnalyzer", "DataFlowAnalyzerContext", False, "Create", "(Microsoft.CodeAnalysis.Diagnostics.AnalyzerOptions,Microsoft.CodeAnalysis.Compilation,System.Collections.Immutable.ImmutableArray<ILLink.RoslynAnalyzer.RequiresAnalyzerBase>)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["ILLink.RoslynAnalyzer", "CompilationExtensions", False, "GetUnqualifiedName", "(Microsoft.CodeAnalysis.CSharp.Syntax.NameSyntax)", "", "Argument[0].Property[Microsoft.CodeAnalysis.CSharp.Syntax.AliasQualifiedNameSyntax.Name]", "ReturnValue", "value", "dfc-generated"]
+      - ["ILLink.RoslynAnalyzer", "CompilationExtensions", False, "GetUnqualifiedName", "(Microsoft.CodeAnalysis.CSharp.Syntax.NameSyntax)", "", "Argument[0].Property[Microsoft.CodeAnalysis.CSharp.Syntax.QualifiedNameSyntax.Right]", "ReturnValue", "value", "dfc-generated"]
+      - ["ILLink.RoslynAnalyzer", "CompilationExtensions", False, "GetUnqualifiedName", "(Microsoft.CodeAnalysis.CSharp.Syntax.NameSyntax)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["ILLink.RoslynAnalyzer", "DataFlowAnalyzerContext", False, "Create", "(Microsoft.CodeAnalysis.Diagnostics.AnalyzerOptions,Microsoft.CodeAnalysis.Compilation,System.Collections.Immutable.ImmutableArray<ILLink.RoslynAnalyzer.RequiresAnalyzerBase>)", "", "Argument[1]", "ReturnValue.Property[ILLink.RoslynAnalyzer.DataFlowAnalyzerContext.Compilation]", "value", "dfc-generated"]
       - ["ILLink.RoslynAnalyzer", "DataFlowAnalyzerContext", False, "get_EnabledRequiresAnalyzers", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["ILLink.RoslynAnalyzer", "IPropertySymbolExtensions", False, "GetGetMethod", "(Microsoft.CodeAnalysis.IPropertySymbol)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["ILLink.RoslynAnalyzer", "IPropertySymbolExtensions", False, "GetSetMethod", "(Microsoft.CodeAnalysis.IPropertySymbol)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["ILLink.RoslynAnalyzer", "ISymbolExtensions", False, "GetDisplayName", "(Microsoft.CodeAnalysis.ISymbol)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["ILLink.RoslynAnalyzer", "RequiresAnalyzerBase", False, "FindContainingSymbol", "(Microsoft.CodeAnalysis.Diagnostics.OperationAnalysisContext,ILLink.RoslynAnalyzer.RequiresAnalyzerBase+DiagnosticTargets)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["ILLink.RoslynAnalyzer", "IPropertySymbolExtensions", False, "GetGetMethod", "(Microsoft.CodeAnalysis.IPropertySymbol)", "", "Argument[0].Property[Microsoft.CodeAnalysis.IPropertySymbol.GetMethod]", "ReturnValue", "value", "dfc-generated"]
+      - ["ILLink.RoslynAnalyzer", "IPropertySymbolExtensions", False, "GetGetMethod", "(Microsoft.CodeAnalysis.IPropertySymbol)", "", "Argument[0].Property[Microsoft.CodeAnalysis.IPropertySymbol.OverriddenProperty].Property[Microsoft.CodeAnalysis.IPropertySymbol.GetMethod]", "ReturnValue", "value", "dfc-generated"]
+      - ["ILLink.RoslynAnalyzer", "IPropertySymbolExtensions", False, "GetSetMethod", "(Microsoft.CodeAnalysis.IPropertySymbol)", "", "Argument[0].Property[Microsoft.CodeAnalysis.IPropertySymbol.OverriddenProperty].Property[Microsoft.CodeAnalysis.IPropertySymbol.SetMethod]", "ReturnValue", "value", "dfc-generated"]
+      - ["ILLink.RoslynAnalyzer", "IPropertySymbolExtensions", False, "GetSetMethod", "(Microsoft.CodeAnalysis.IPropertySymbol)", "", "Argument[0].Property[Microsoft.CodeAnalysis.IPropertySymbol.SetMethod]", "ReturnValue", "value", "dfc-generated"]
+      - ["ILLink.RoslynAnalyzer", "ISymbolExtensions", False, "GetDisplayName", "(Microsoft.CodeAnalysis.ISymbol)", "", "Argument[0].Property[Microsoft.CodeAnalysis.ISymbol.MetadataName]", "ReturnValue", "taint", "dfc-generated"]
+      - ["ILLink.RoslynAnalyzer", "ISymbolExtensions", False, "GetDisplayName", "(Microsoft.CodeAnalysis.ISymbol)", "", "Argument[0].Property[Microsoft.CodeAnalysis.ISymbol.Name]", "ReturnValue", "taint", "dfc-generated"]
+      - ["ILLink.RoslynAnalyzer", "RequiresAnalyzerBase", False, "FindContainingSymbol", "(Microsoft.CodeAnalysis.Diagnostics.OperationAnalysisContext,ILLink.RoslynAnalyzer.RequiresAnalyzerBase+DiagnosticTargets)", "", "Argument[0].Property[Microsoft.CodeAnalysis.Diagnostics.OperationAnalysisContext.ContainingSymbol]", "ReturnValue", "value", "dfc-generated"]
       - ["ILLink.RoslynAnalyzer", "RequiresAnalyzerBase", True, "GetMessageFromAttribute", "(Microsoft.CodeAnalysis.AttributeData)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["ILLink.RoslynAnalyzer", "RequiresUnreferencedCodeUtils", False, "GetMessageFromAttribute", "(Microsoft.CodeAnalysis.AttributeData)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
   - addsTo:
@@ -21,6 +25,7 @@ extensions:
       - ["ILLink.RoslynAnalyzer", "COMAnalyzer", "Initialize", "(Microsoft.CodeAnalysis.Diagnostics.AnalysisContext)", "summary", "df-generated"]
       - ["ILLink.RoslynAnalyzer", "COMAnalyzer", "get_SupportedDiagnostics", "()", "summary", "df-generated"]
       - ["ILLink.RoslynAnalyzer", "CompilationExtensions", "GetBestTypeByMetadataName", "(Microsoft.CodeAnalysis.Compilation,System.String)", "summary", "df-generated"]
+      - ["ILLink.RoslynAnalyzer", "CompilationExtensions", "ToImmutableArray<T>", "(System.ReadOnlySpan<T>)", "summary", "df-generated"]
       - ["ILLink.RoslynAnalyzer", "DataFlowAnalyzerContext", "GetSpecialIncompatibleMembers", "(ILLink.RoslynAnalyzer.RequiresAnalyzerBase)", "summary", "df-generated"]
       - ["ILLink.RoslynAnalyzer", "DataFlowAnalyzerContext", "get_AnyAnalyzersEnabled", "()", "summary", "df-generated"]
       - ["ILLink.RoslynAnalyzer", "DataFlowAnalyzerContext", "get_Compilation", "()", "summary", "df-generated"]
diff --git a/csharp/ql/lib/ext/generated/ILLink.Shared.DataFlow.model.yml b/csharp/ql/lib/ext/generated/ILLink.Shared.DataFlow.model.yml
index 449c378ce87..5f1feaaad72 100644
--- a/csharp/ql/lib/ext/generated/ILLink.Shared.DataFlow.model.yml
+++ b/csharp/ql/lib/ext/generated/ILLink.Shared.DataFlow.model.yml
@@ -4,30 +4,29 @@ extensions:
       pack: codeql/csharp-all
       extensible: summaryModel
     data:
-      - ["ILLink.Shared.DataFlow", "Box<T>", False, "Box", "(T)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["ILLink.Shared.DataFlow", "Box<T>", False, "Box", "(T)", "", "Argument[0]", "Argument[this].Property[ILLink.Shared.DataFlow.Box`1.Value]", "value", "dfc-generated"]
       - ["ILLink.Shared.DataFlow", "DefaultValueDictionary<TKey,TValue>", False, "Clone", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["ILLink.Shared.DataFlow", "DefaultValueDictionary<TKey,TValue>", False, "DefaultValueDictionary", "(ILLink.Shared.DataFlow.DefaultValueDictionary<TKey,TValue>)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["ILLink.Shared.DataFlow", "DefaultValueDictionary<TKey,TValue>", False, "DefaultValueDictionary", "(TValue)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["ILLink.Shared.DataFlow", "DefaultValueDictionary<TKey,TValue>", False, "Get", "(TKey)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["ILLink.Shared.DataFlow", "DefaultValueDictionary<TKey,TValue>", False, "DefaultValueDictionary", "(ILLink.Shared.DataFlow.DefaultValueDictionary<TKey,TValue>)", "", "Argument[0].SyntheticField[ILLink.Shared.DataFlow.DefaultValueDictionary`2.DefaultValue]", "Argument[this].SyntheticField[ILLink.Shared.DataFlow.DefaultValueDictionary`2.DefaultValue]", "value", "dfc-generated"]
+      - ["ILLink.Shared.DataFlow", "DefaultValueDictionary<TKey,TValue>", False, "DefaultValueDictionary", "(TValue)", "", "Argument[0]", "Argument[this].SyntheticField[ILLink.Shared.DataFlow.DefaultValueDictionary`2.DefaultValue]", "value", "dfc-generated"]
+      - ["ILLink.Shared.DataFlow", "DefaultValueDictionary<TKey,TValue>", False, "Get", "(TKey)", "", "Argument[this].SyntheticField[ILLink.Shared.DataFlow.DefaultValueDictionary`2.DefaultValue]", "ReturnValue", "value", "dfc-generated"]
       - ["ILLink.Shared.DataFlow", "DefaultValueDictionary<TKey,TValue>", False, "ToString", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["ILLink.Shared.DataFlow", "DictionaryLattice<TKey,TValue,TValueLattice>", False, "DictionaryLattice", "(TValueLattice)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["ILLink.Shared.DataFlow", "DictionaryLattice<TKey,TValue,TValueLattice>", False, "DictionaryLattice", "(TValueLattice)", "", "Argument[0]", "Argument[this].Field[ILLink.Shared.DataFlow.DictionaryLattice`3.ValueLattice]", "value", "dfc-generated"]
       - ["ILLink.Shared.DataFlow", "DictionaryLattice<TKey,TValue,TValueLattice>", False, "Meet", "(ILLink.Shared.DataFlow.DefaultValueDictionary<TKey,TValue>,ILLink.Shared.DataFlow.DefaultValueDictionary<TKey,TValue>)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["ILLink.Shared.DataFlow", "ForwardDataFlowAnalysis<TValue,TState,TLattice,TBlock,TRegion,TControlFlowGraph,TTransfer,TConditionValue>", False, "ForwardDataFlowAnalysis", "(TLattice,TValue)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["ILLink.Shared.DataFlow", "ForwardDataFlowAnalysis<TValue,TState,TLattice,TBlock,TRegion,TControlFlowGraph,TTransfer,TConditionValue>", False, "ForwardDataFlowAnalysis", "(TLattice,TValue)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["ILLink.Shared.DataFlow", "IControlFlowGraph<TBlock,TRegion>+ControlFlowBranch", False, "ControlFlowBranch", "(TBlock,System.Nullable<TBlock>,System.Collections.Immutable.ImmutableArray<TRegion>,System.Boolean)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["ILLink.Shared.DataFlow", "IControlFlowGraph<TBlock,TRegion>+ControlFlowBranch", False, "ControlFlowBranch", "(TBlock,System.Nullable<TBlock>,System.Collections.Immutable.ImmutableArray<TRegion>,System.Boolean)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["ILLink.Shared.DataFlow", "IControlFlowGraph<TBlock,TRegion>+ControlFlowBranch", False, "ControlFlowBranch", "(TBlock,System.Nullable<TBlock>,System.Collections.Immutable.ImmutableArray<TRegion>,System.Boolean)", "", "Argument[2].Element", "Argument[this]", "taint", "df-generated"]
-      - ["ILLink.Shared.DataFlow", "Maybe<T>", False, "Maybe", "(T)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["ILLink.Shared.DataFlow", "MaybeLattice<T,TValueLattice>", False, "MaybeLattice", "(TValueLattice)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["ILLink.Shared.DataFlow", "SingleValue", True, "DeepCopy", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["ILLink.Shared.DataFlow", "SingleValue", True, "DeepCopy", "()", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["ILLink.Shared.DataFlow", "ValueSet<TValue>+Enumerable", False, "Enumerable", "(System.Object)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["ILLink.Shared.DataFlow", "ValueSet<TValue>+Enumerable", False, "GetEnumerator", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["ILLink.Shared.DataFlow", "ValueSet<TValue>+Enumerator", False, "get_Current", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["ILLink.Shared.DataFlow", "ForwardDataFlowAnalysis<TValue,TState,TLattice,TBlock,TRegion,TControlFlowGraph,TTransfer,TConditionValue>", False, "ForwardDataFlowAnalysis", "(TLattice,TValue)", "", "Argument[0]", "Argument[this].Field[ILLink.Shared.DataFlow.ForwardDataFlowAnalysis`8.lattice]", "value", "dfc-generated"]
+      - ["ILLink.Shared.DataFlow", "IControlFlowGraph<TBlock,TRegion>+ControlFlowBranch", False, "ControlFlowBranch", "(TBlock,System.Nullable<TBlock>,System.Collections.Immutable.ImmutableArray<TRegion>,System.Boolean)", "", "Argument[0]", "Argument[this].Field[ILLink.Shared.DataFlow.IControlFlowGraph`2+ControlFlowBranch.Source]", "value", "dfc-generated"]
+      - ["ILLink.Shared.DataFlow", "IControlFlowGraph<TBlock,TRegion>+ControlFlowBranch", False, "ControlFlowBranch", "(TBlock,System.Nullable<TBlock>,System.Collections.Immutable.ImmutableArray<TRegion>,System.Boolean)", "", "Argument[2]", "Argument[this].Field[ILLink.Shared.DataFlow.IControlFlowGraph`2+ControlFlowBranch.FinallyRegions]", "value", "dfc-generated"]
+      - ["ILLink.Shared.DataFlow", "Maybe<T>", False, "Maybe", "(T)", "", "Argument[0]", "Argument[this].Field[ILLink.Shared.DataFlow.Maybe`1.MaybeValue]", "value", "dfc-generated"]
+      - ["ILLink.Shared.DataFlow", "MaybeLattice<T,TValueLattice>", False, "MaybeLattice", "(TValueLattice)", "", "Argument[0]", "Argument[this].Field[ILLink.Shared.DataFlow.MaybeLattice`2.ValueLattice]", "value", "dfc-generated"]
+      - ["ILLink.Shared.DataFlow", "SingleValue", True, "DeepCopy", "()", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["ILLink.Shared.DataFlow", "ValueSet<TValue>+Enumerable", False, "Enumerable", "(System.Object)", "", "Argument[0]", "Argument[this].SyntheticField[ILLink.Shared.DataFlow.ValueSet`1+Enumerable._values]", "value", "dfc-generated"]
+      - ["ILLink.Shared.DataFlow", "ValueSet<TValue>+Enumerable", False, "GetEnumerator", "()", "", "Argument[this].SyntheticField[ILLink.Shared.DataFlow.ValueSet`1+Enumerable._values].Element", "ReturnValue.SyntheticField[ILLink.Shared.DataFlow.ValueSet`1+Enumerator._enumerator].Property[System.Collections.Generic.HashSet`1+Enumerator.Current]", "value", "dfc-generated"]
+      - ["ILLink.Shared.DataFlow", "ValueSet<TValue>+Enumerable", False, "GetEnumerator", "()", "", "Argument[this].SyntheticField[ILLink.Shared.DataFlow.ValueSet`1+Enumerable._values]", "ReturnValue.SyntheticField[ILLink.Shared.DataFlow.ValueSet`1+Enumerator._value]", "value", "dfc-generated"]
+      - ["ILLink.Shared.DataFlow", "ValueSet<TValue>+Enumerator", False, "get_Current", "()", "", "Argument[this].Property[ILLink.Shared.DataFlow.ValueSet`1+Enumerator.Current]", "ReturnValue", "value", "dfc-generated"]
+      - ["ILLink.Shared.DataFlow", "ValueSet<TValue>+Enumerator", False, "get_Current", "()", "", "Argument[this].SyntheticField[ILLink.Shared.DataFlow.ValueSet`1+Enumerator._enumerator].Property[System.Collections.Generic.IEnumerator`1.Current]", "ReturnValue", "value", "dfc-generated"]
+      - ["ILLink.Shared.DataFlow", "ValueSet<TValue>+Enumerator", False, "get_Current", "()", "", "Argument[this].SyntheticField[ILLink.Shared.DataFlow.ValueSet`1+Enumerator._value]", "ReturnValue", "value", "dfc-generated"]
       - ["ILLink.Shared.DataFlow", "ValueSet<TValue>", False, "DeepCopy", "()", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["ILLink.Shared.DataFlow", "ValueSet<TValue>", False, "GetKnownValues", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["ILLink.Shared.DataFlow", "ValueSet<TValue>", False, "ToString", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["ILLink.Shared.DataFlow", "ValueSet<TValue>", False, "ValueSet", "(TValue)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["ILLink.Shared.DataFlow", "ValueSet<TValue>", False, "GetKnownValues", "()", "", "Argument[this].SyntheticField[ILLink.Shared.DataFlow.ValueSet`1._values]", "ReturnValue.SyntheticField[ILLink.Shared.DataFlow.ValueSet`1+Enumerable._values]", "value", "dfc-generated"]
+      - ["ILLink.Shared.DataFlow", "ValueSet<TValue>", False, "ValueSet", "(TValue)", "", "Argument[0]", "Argument[this].SyntheticField[ILLink.Shared.DataFlow.ValueSet`1._values]", "value", "dfc-generated"]
       - ["ILLink.Shared.DataFlow", "ValueSetLattice<TValue>", False, "Meet", "(ILLink.Shared.DataFlow.ValueSet<TValue>,ILLink.Shared.DataFlow.ValueSet<TValue>)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["ILLink.Shared.DataFlow", "ValueSetLattice<TValue>", False, "Meet", "(ILLink.Shared.DataFlow.ValueSet<TValue>,ILLink.Shared.DataFlow.ValueSet<TValue>)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
   - addsTo:
@@ -91,6 +90,7 @@ extensions:
       - ["ILLink.Shared.DataFlow", "ValueSet<TValue>", "GetHashCode", "()", "summary", "df-generated"]
       - ["ILLink.Shared.DataFlow", "ValueSet<TValue>", "IsEmpty", "()", "summary", "df-generated"]
       - ["ILLink.Shared.DataFlow", "ValueSet<TValue>", "IsUnknown", "()", "summary", "df-generated"]
+      - ["ILLink.Shared.DataFlow", "ValueSet<TValue>", "ToString", "()", "summary", "df-generated"]
       - ["ILLink.Shared.DataFlow", "ValueSet<TValue>", "ValueSet", "(System.Collections.Generic.IEnumerable<TValue>)", "summary", "df-generated"]
       - ["ILLink.Shared.DataFlow", "ValueSet<TValue>", "get_HasMultipleValues", "()", "summary", "df-generated"]
       - ["ILLink.Shared.DataFlow", "ValueSet<TValue>", "op_Equality", "(ILLink.Shared.DataFlow.ValueSet<TValue>,ILLink.Shared.DataFlow.ValueSet<TValue>)", "summary", "df-generated"]
diff --git a/csharp/ql/lib/ext/generated/ILLink.Shared.model.yml b/csharp/ql/lib/ext/generated/ILLink.Shared.model.yml
index eaf4652ef2b..1f62c1f05c2 100644
--- a/csharp/ql/lib/ext/generated/ILLink.Shared.model.yml
+++ b/csharp/ql/lib/ext/generated/ILLink.Shared.model.yml
@@ -4,11 +4,9 @@ extensions:
       pack: codeql/csharp-all
       extensible: summaryModel
     data:
-      - ["ILLink.Shared", "DiagnosticString", False, "GetMessage", "(System.String[])", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["ILLink.Shared", "DiagnosticString", False, "GetMessage", "(System.String[])", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["ILLink.Shared", "DiagnosticString", False, "GetMessage", "(System.String[])", "", "Argument[0].Element", "ReturnValue", "taint", "dfc-generated"]
       - ["ILLink.Shared", "DiagnosticString", False, "GetMessageFormat", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["ILLink.Shared", "DiagnosticString", False, "GetTitle", "(System.String[])", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["ILLink.Shared", "DiagnosticString", False, "GetTitle", "(System.String[])", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["ILLink.Shared", "DiagnosticString", False, "GetTitle", "(System.String[])", "", "Argument[0].Element", "ReturnValue", "taint", "dfc-generated"]
       - ["ILLink.Shared", "DiagnosticString", False, "GetTitleFormat", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
   - addsTo:
       pack: codeql/csharp-all
diff --git a/csharp/ql/lib/ext/generated/ILLink.Tasks.model.yml b/csharp/ql/lib/ext/generated/ILLink.Tasks.model.yml
index de5b330dd4f..8fa3aee05cb 100644
--- a/csharp/ql/lib/ext/generated/ILLink.Tasks.model.yml
+++ b/csharp/ql/lib/ext/generated/ILLink.Tasks.model.yml
@@ -4,7 +4,8 @@ extensions:
       pack: codeql/csharp-all
       extensible: summaryModel
     data:
-      - ["ILLink.Tasks", "ILLink", True, "GenerateCommandLineCommands", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["ILLink.Tasks", "ComputeManagedAssemblies", True, "Execute", "()", "", "Argument[this].Property[ILLink.Tasks.ComputeManagedAssemblies.Assemblies].Element", "Argument[this].Property[ILLink.Tasks.ComputeManagedAssemblies.ManagedAssemblies].Element", "value", "dfc-generated"]
+      - ["ILLink.Tasks", "ILLink", True, "GenerateCommandLineCommands", "()", "", "Argument[this].Property[ILLink.Tasks.ILLink.ILLinkPath]", "ReturnValue", "taint", "dfc-generated"]
       - ["ILLink.Tasks", "ILLink", True, "GenerateFullPathToTool", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["ILLink.Tasks", "ILLink", True, "GenerateResponseFileCommands", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["ILLink.Tasks", "ILLink", True, "get_ToolName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
@@ -13,7 +14,6 @@ extensions:
       extensible: neutralModel
     data:
       - ["ILLink.Tasks", "CombineLinkerXmlFiles", "Execute", "()", "summary", "df-generated"]
-      - ["ILLink.Tasks", "ComputeManagedAssemblies", "Execute", "()", "summary", "df-generated"]
       - ["ILLink.Tasks", "CreateRuntimeRootILLinkDescriptorFile", "Execute", "()", "summary", "df-generated"]
       - ["ILLink.Tasks", "CreateRuntimeRootILLinkDescriptorFile", "ProcessCoreTypes", "(System.String)", "summary", "df-generated"]
       - ["ILLink.Tasks", "CreateRuntimeRootILLinkDescriptorFile", "ProcessExceptionTypes", "(System.String)", "summary", "df-generated"]
diff --git a/csharp/ql/lib/ext/generated/Internal.IL.Stubs.model.yml b/csharp/ql/lib/ext/generated/Internal.IL.Stubs.model.yml
index 5c24c3116e3..86808a1d73a 100644
--- a/csharp/ql/lib/ext/generated/Internal.IL.Stubs.model.yml
+++ b/csharp/ql/lib/ext/generated/Internal.IL.Stubs.model.yml
@@ -9,19 +9,28 @@ extensions:
       - ["Internal.IL.Stubs", "ILCodeStream", False, "EmitLabel", "(Internal.IL.Stubs.ILCodeLabel)", "", "Argument[this]", "Argument[0]", "taint", "df-generated"]
       - ["Internal.IL.Stubs", "ILCodeStream", False, "EndHandler", "(Internal.IL.Stubs.ILExceptionRegionBuilder)", "", "Argument[this]", "Argument[0]", "taint", "df-generated"]
       - ["Internal.IL.Stubs", "ILCodeStream", False, "EndTry", "(Internal.IL.Stubs.ILExceptionRegionBuilder)", "", "Argument[this]", "Argument[0]", "taint", "df-generated"]
-      - ["Internal.IL.Stubs", "ILEmitter", False, "Link", "(Internal.TypeSystem.MethodDesc)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["Internal.IL.Stubs", "ILEmitter", False, "Link", "(Internal.TypeSystem.MethodDesc)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["Internal.IL.Stubs", "ILEmitter", False, "Link", "(Internal.TypeSystem.MethodDesc)", "", "Argument[0]", "ReturnValue.SyntheticField[Internal.IL.Stubs.ILStubMethodIL._method]", "value", "dfc-generated"]
       - ["Internal.IL.Stubs", "ILEmitter", False, "NewCodeStream", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["Internal.IL.Stubs", "ILStubMethodIL", False, "ILStubMethodIL", "(Internal.IL.Stubs.ILStubMethodIL)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["Internal.IL.Stubs", "ILStubMethodIL", False, "ILStubMethodIL", "(Internal.TypeSystem.MethodDesc,System.Byte[],Internal.TypeSystem.LocalVariableDefinition[],System.Object[],Internal.IL.ILExceptionRegion[],Internal.IL.MethodDebugInformation)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["Internal.IL.Stubs", "ILStubMethodIL", False, "ILStubMethodIL", "(Internal.TypeSystem.MethodDesc,System.Byte[],Internal.TypeSystem.LocalVariableDefinition[],System.Object[],Internal.IL.ILExceptionRegion[],Internal.IL.MethodDebugInformation)", "", "Argument[1].Element", "Argument[this]", "taint", "df-generated"]
-      - ["Internal.IL.Stubs", "ILStubMethodIL", False, "ILStubMethodIL", "(Internal.TypeSystem.MethodDesc,System.Byte[],Internal.TypeSystem.LocalVariableDefinition[],System.Object[],Internal.IL.ILExceptionRegion[],Internal.IL.MethodDebugInformation)", "", "Argument[2].Element", "Argument[this]", "taint", "df-generated"]
-      - ["Internal.IL.Stubs", "ILStubMethodIL", False, "ILStubMethodIL", "(Internal.TypeSystem.MethodDesc,System.Byte[],Internal.TypeSystem.LocalVariableDefinition[],System.Object[],Internal.IL.ILExceptionRegion[],Internal.IL.MethodDebugInformation)", "", "Argument[3].Element", "Argument[this]", "taint", "df-generated"]
-      - ["Internal.IL.Stubs", "ILStubMethodIL", False, "ILStubMethodIL", "(Internal.TypeSystem.MethodDesc,System.Byte[],Internal.TypeSystem.LocalVariableDefinition[],System.Object[],Internal.IL.ILExceptionRegion[],Internal.IL.MethodDebugInformation)", "", "Argument[4].Element", "Argument[this]", "taint", "df-generated"]
-      - ["Internal.IL.Stubs", "ILStubMethodIL", False, "ILStubMethodIL", "(Internal.TypeSystem.MethodDesc,System.Byte[],Internal.TypeSystem.LocalVariableDefinition[],System.Object[],Internal.IL.ILExceptionRegion[],Internal.IL.MethodDebugInformation)", "", "Argument[5]", "Argument[this]", "taint", "df-generated"]
-      - ["Internal.IL.Stubs", "PInvokeTargetNativeMethod", False, "PInvokeTargetNativeMethod", "(Internal.TypeSystem.MethodDesc,Internal.TypeSystem.MethodSignature)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["Internal.IL.Stubs", "PInvokeTargetNativeMethod", False, "PInvokeTargetNativeMethod", "(Internal.TypeSystem.MethodDesc,Internal.TypeSystem.MethodSignature)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["Internal.IL.Stubs", "PInvokeTargetNativeMethod", False, "get_Target", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["Internal.IL.Stubs", "ILStubMethodIL", False, "ILStubMethodIL", "(Internal.TypeSystem.MethodDesc,System.Byte[],Internal.TypeSystem.LocalVariableDefinition[],System.Object[],Internal.IL.ILExceptionRegion[],Internal.IL.MethodDebugInformation)", "", "Argument[0]", "Argument[this].SyntheticField[Internal.IL.Stubs.ILStubMethodIL._method]", "value", "dfc-generated"]
+      - ["Internal.IL.Stubs", "ILStubMethodIL", False, "ILStubMethodIL", "(Internal.TypeSystem.MethodDesc,System.Byte[],Internal.TypeSystem.LocalVariableDefinition[],System.Object[],Internal.IL.ILExceptionRegion[],Internal.IL.MethodDebugInformation)", "", "Argument[1]", "Argument[this].SyntheticField[Internal.IL.Stubs.ILStubMethodIL._ilBytes]", "value", "dfc-generated"]
+      - ["Internal.IL.Stubs", "ILStubMethodIL", False, "ILStubMethodIL", "(Internal.TypeSystem.MethodDesc,System.Byte[],Internal.TypeSystem.LocalVariableDefinition[],System.Object[],Internal.IL.ILExceptionRegion[],Internal.IL.MethodDebugInformation)", "", "Argument[2]", "Argument[this].SyntheticField[Internal.IL.Stubs.ILStubMethodIL._locals]", "value", "dfc-generated"]
+      - ["Internal.IL.Stubs", "ILStubMethodIL", False, "ILStubMethodIL", "(Internal.TypeSystem.MethodDesc,System.Byte[],Internal.TypeSystem.LocalVariableDefinition[],System.Object[],Internal.IL.ILExceptionRegion[],Internal.IL.MethodDebugInformation)", "", "Argument[3]", "Argument[this].SyntheticField[Internal.IL.Stubs.ILStubMethodIL._tokens]", "value", "dfc-generated"]
+      - ["Internal.IL.Stubs", "ILStubMethodIL", False, "ILStubMethodIL", "(Internal.TypeSystem.MethodDesc,System.Byte[],Internal.TypeSystem.LocalVariableDefinition[],System.Object[],Internal.IL.ILExceptionRegion[],Internal.IL.MethodDebugInformation)", "", "Argument[4]", "Argument[this].SyntheticField[Internal.IL.Stubs.ILStubMethodIL._exceptionRegions]", "value", "dfc-generated"]
+      - ["Internal.IL.Stubs", "ILStubMethodIL", False, "ILStubMethodIL", "(Internal.TypeSystem.MethodDesc,System.Byte[],Internal.TypeSystem.LocalVariableDefinition[],System.Object[],Internal.IL.ILExceptionRegion[],Internal.IL.MethodDebugInformation)", "", "Argument[5]", "Argument[this].SyntheticField[Internal.IL.Stubs.ILStubMethodIL._debugInformation]", "value", "dfc-generated"]
+      - ["Internal.IL.Stubs", "ILStubMethodIL", True, "GetDebugInfo", "()", "", "Argument[this].SyntheticField[Internal.IL.Stubs.ILStubMethodIL._debugInformation]", "ReturnValue", "value", "dfc-generated"]
+      - ["Internal.IL.Stubs", "ILStubMethodIL", True, "GetExceptionRegions", "()", "", "Argument[this].SyntheticField[Internal.IL.Stubs.ILStubMethodIL._exceptionRegions]", "ReturnValue", "value", "dfc-generated"]
+      - ["Internal.IL.Stubs", "ILStubMethodIL", True, "GetILBytes", "()", "", "Argument[this].SyntheticField[Internal.IL.Stubs.ILStubMethodIL._ilBytes]", "ReturnValue", "value", "dfc-generated"]
+      - ["Internal.IL.Stubs", "ILStubMethodIL", True, "GetLocals", "()", "", "Argument[this].SyntheticField[Internal.IL.Stubs.ILStubMethodIL._locals]", "ReturnValue", "value", "dfc-generated"]
+      - ["Internal.IL.Stubs", "ILStubMethodIL", True, "GetObject", "(System.Int32,Internal.TypeSystem.NotFoundBehavior)", "", "Argument[this].SyntheticField[Internal.IL.Stubs.ILStubMethodIL._tokens].Element", "ReturnValue", "value", "dfc-generated"]
+      - ["Internal.IL.Stubs", "ILStubMethodIL", True, "get_OwningMethod", "()", "", "Argument[this].SyntheticField[Internal.IL.Stubs.ILStubMethodIL._method]", "ReturnValue", "value", "dfc-generated"]
+      - ["Internal.IL.Stubs", "PInvokeTargetNativeMethod", False, "PInvokeTargetNativeMethod", "(Internal.TypeSystem.MethodDesc,Internal.TypeSystem.MethodSignature)", "", "Argument[0]", "Argument[this].SyntheticField[Internal.IL.Stubs.PInvokeTargetNativeMethod._declMethod]", "value", "dfc-generated"]
+      - ["Internal.IL.Stubs", "PInvokeTargetNativeMethod", False, "PInvokeTargetNativeMethod", "(Internal.TypeSystem.MethodDesc,Internal.TypeSystem.MethodSignature)", "", "Argument[1]", "Argument[this].SyntheticField[Internal.IL.Stubs.PInvokeTargetNativeMethod._signature]", "value", "dfc-generated"]
+      - ["Internal.IL.Stubs", "PInvokeTargetNativeMethod", False, "get_BaseMethod", "()", "", "Argument[this].SyntheticField[Internal.IL.Stubs.PInvokeTargetNativeMethod._declMethod]", "ReturnValue", "value", "dfc-generated"]
+      - ["Internal.IL.Stubs", "PInvokeTargetNativeMethod", False, "get_Context", "()", "", "Argument[this].SyntheticField[Internal.IL.Stubs.PInvokeTargetNativeMethod._declMethod].Property[Internal.TypeSystem.TypeSystemEntity.Context]", "ReturnValue", "value", "dfc-generated"]
+      - ["Internal.IL.Stubs", "PInvokeTargetNativeMethod", False, "get_Name", "()", "", "Argument[this].SyntheticField[Internal.IL.Stubs.PInvokeTargetNativeMethod._declMethod].Property[Internal.TypeSystem.MethodDesc.Name]", "ReturnValue", "value", "dfc-generated"]
+      - ["Internal.IL.Stubs", "PInvokeTargetNativeMethod", False, "get_Signature", "()", "", "Argument[this].SyntheticField[Internal.IL.Stubs.PInvokeTargetNativeMethod._signature]", "ReturnValue", "value", "dfc-generated"]
+      - ["Internal.IL.Stubs", "PInvokeTargetNativeMethod", False, "get_Target", "()", "", "Argument[this].SyntheticField[Internal.IL.Stubs.PInvokeTargetNativeMethod._declMethod]", "ReturnValue", "value", "dfc-generated"]
   - addsTo:
       pack: codeql/csharp-all
       extensible: neutralModel
diff --git a/csharp/ql/lib/ext/generated/Internal.IL.model.yml b/csharp/ql/lib/ext/generated/Internal.IL.model.yml
index a51303477d6..13536b1cd1b 100644
--- a/csharp/ql/lib/ext/generated/Internal.IL.model.yml
+++ b/csharp/ql/lib/ext/generated/Internal.IL.model.yml
@@ -13,22 +13,21 @@ extensions:
       - ["Internal.IL", "ILDisassembler+ILTypeNameFormatter", False, "AppendNameForNamespaceTypeWithoutAliases", "(System.Text.StringBuilder,Internal.TypeSystem.DefType)", "", "Argument[1]", "Argument[0]", "taint", "df-generated"]
       - ["Internal.IL", "ILDisassembler+ILTypeNameFormatter", False, "AppendNameWithValueClassPrefix", "(System.Text.StringBuilder,Internal.TypeSystem.TypeDesc)", "", "Argument[1]", "Argument[0]", "taint", "df-generated"]
       - ["Internal.IL", "ILDisassembler+ILTypeNameFormatter", False, "ILTypeNameFormatter", "(Internal.TypeSystem.ModuleDesc)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["Internal.IL", "ILDisassembler+ILTypeNameFormatter", True, "AppendName", "(System.Text.StringBuilder,Internal.TypeSystem.GenericParameterDesc)", "", "Argument[1].Property[Internal.TypeSystem.GenericParameterDesc.Name]", "Argument[0]", "taint", "dfc-generated"]
       - ["Internal.IL", "ILDisassembler", False, "AppendType", "(System.Text.StringBuilder,Internal.TypeSystem.TypeDesc,System.Boolean)", "", "Argument[1]", "Argument[0]", "taint", "df-generated"]
       - ["Internal.IL", "ILDisassembler", False, "ILDisassembler", "(Internal.IL.MethodIL)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["Internal.IL", "ILLocalVariable", False, "ILLocalVariable", "(System.Int32,System.String,System.Boolean)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["Internal.IL", "ILSequencePoint", False, "ILSequencePoint", "(System.Int32,System.String,System.Int32)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["Internal.IL", "InstantiatedMethodIL", False, "InstantiatedMethodIL", "(Internal.TypeSystem.MethodDesc,Internal.IL.MethodIL)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["Internal.IL", "InstantiatedMethodIL", False, "InstantiatedMethodIL", "(Internal.TypeSystem.MethodDesc,Internal.IL.MethodIL)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["Internal.IL", "ILLocalVariable", False, "ILLocalVariable", "(System.Int32,System.String,System.Boolean)", "", "Argument[1]", "Argument[this].Field[Internal.IL.ILLocalVariable.Name]", "value", "dfc-generated"]
+      - ["Internal.IL", "ILSequencePoint", False, "ILSequencePoint", "(System.Int32,System.String,System.Int32)", "", "Argument[1]", "Argument[this].Field[Internal.IL.ILSequencePoint.Document]", "value", "dfc-generated"]
+      - ["Internal.IL", "InstantiatedMethodIL", False, "GetMethodILDefinition", "()", "", "Argument[this].SyntheticField[Internal.IL.InstantiatedMethodIL._methodIL]", "ReturnValue", "value", "dfc-generated"]
+      - ["Internal.IL", "InstantiatedMethodIL", False, "InstantiatedMethodIL", "(Internal.TypeSystem.MethodDesc,Internal.IL.MethodIL)", "", "Argument[1]", "Argument[this].SyntheticField[Internal.IL.InstantiatedMethodIL._methodIL]", "value", "dfc-generated"]
       - ["Internal.IL", "MethodDebugInformation", True, "GetSequencePoints", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["Internal.IL", "MethodIL", True, "GetDebugInfo", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["Internal.IL", "MethodIL", True, "GetExceptionRegions", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["Internal.IL", "MethodIL", True, "GetILBytes", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["Internal.IL", "MethodIL", True, "GetLocals", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["Internal.IL", "MethodIL", True, "GetMethodILDefinition", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["Internal.IL", "MethodIL", True, "GetMethodILDefinition", "()", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["Internal.IL", "MethodIL", True, "GetMethodILDefinition", "()", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
       - ["Internal.IL", "MethodILScope", False, "ToString", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["Internal.IL", "MethodILScope", True, "GetMethodILScopeDefinition", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["Internal.IL", "MethodILScope", True, "GetMethodILScopeDefinition", "()", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["Internal.IL", "MethodILScope", True, "GetMethodILScopeDefinition", "()", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
       - ["Internal.IL", "MethodILScope", True, "GetObject", "(System.Int32,Internal.TypeSystem.NotFoundBehavior)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["Internal.IL", "MethodILScope", True, "get_OwningMethod", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["Internal.IL", "UnsafeAccessors", False, "TryGetIL", "(Internal.TypeSystem.Ecma.EcmaMethod)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
@@ -55,6 +54,7 @@ extensions:
       - ["Internal.IL", "ILOpcodeHelper", "IsValid", "(Internal.IL.ILOpcode)", "summary", "df-generated"]
       - ["Internal.IL", "ILStackHelper", "CheckStackBalance", "(Internal.IL.MethodIL)", "summary", "df-generated"]
       - ["Internal.IL", "ILStackHelper", "ComputeMaxStack", "(Internal.IL.MethodIL)", "summary", "df-generated"]
+      - ["Internal.IL", "ILTokenReplacer", "Replace", "(System.Byte[],System.Func<System.Int32,System.Int32>)", "summary", "df-generated"]
       - ["Internal.IL", "InstantiatedMethodIL", "get_IsInitLocals", "()", "summary", "df-generated"]
       - ["Internal.IL", "InstantiatedMethodIL", "get_MaxStack", "()", "summary", "df-generated"]
       - ["Internal.IL", "MethodDebugInformation", "GetLocalVariables", "()", "summary", "df-generated"]
diff --git a/csharp/ql/lib/ext/generated/Internal.Pgo.model.yml b/csharp/ql/lib/ext/generated/Internal.Pgo.model.yml
index bf7d8e16fec..f80bf2ee9b4 100644
--- a/csharp/ql/lib/ext/generated/Internal.Pgo.model.yml
+++ b/csharp/ql/lib/ext/generated/Internal.Pgo.model.yml
@@ -4,15 +4,15 @@ extensions:
       pack: codeql/csharp-all
       extensible: summaryModel
     data:
-      - ["Internal.Pgo", "PgoProcessor+PgoEncodedCompressedIntParser", False, "GetEnumerator", "()", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["Internal.Pgo", "PgoProcessor+PgoEncodedCompressedIntParser", False, "GetEnumerator", "()", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
       - ["Internal.Pgo", "PgoProcessor+PgoEncodedCompressedIntParser", False, "PgoEncodedCompressedIntParser", "(System.Byte[],System.Int32)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["Internal.Pgo", "PgoProcessor", False, "Merge<TType,TMethod>", "(System.ReadOnlySpan<Internal.Pgo.PgoSchemaElem[]>)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["Internal.Pgo", "PgoProcessor", False, "Merge<TType,TMethod>", "(System.ReadOnlySpan<Internal.Pgo.PgoSchemaElem[]>)", "", "Argument[0].Element.Element", "ReturnValue.Element", "value", "dfc-generated"]
       - ["Internal.Pgo", "TypeSystemEntityOrUnknown", False, "ToString", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["Internal.Pgo", "TypeSystemEntityOrUnknown", False, "TypeSystemEntityOrUnknown", "(Internal.TypeSystem.MethodDesc)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["Internal.Pgo", "TypeSystemEntityOrUnknown", False, "TypeSystemEntityOrUnknown", "(Internal.TypeSystem.TypeDesc)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["Internal.Pgo", "TypeSystemEntityOrUnknown", False, "get_AsField", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["Internal.Pgo", "TypeSystemEntityOrUnknown", False, "get_AsMethod", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["Internal.Pgo", "TypeSystemEntityOrUnknown", False, "get_AsType", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["Internal.Pgo", "TypeSystemEntityOrUnknown", False, "TypeSystemEntityOrUnknown", "(Internal.TypeSystem.MethodDesc)", "", "Argument[0]", "Argument[this].SyntheticField[Internal.Pgo.TypeSystemEntityOrUnknown._data]", "value", "dfc-generated"]
+      - ["Internal.Pgo", "TypeSystemEntityOrUnknown", False, "TypeSystemEntityOrUnknown", "(Internal.TypeSystem.TypeDesc)", "", "Argument[0]", "Argument[this].SyntheticField[Internal.Pgo.TypeSystemEntityOrUnknown._data]", "value", "dfc-generated"]
+      - ["Internal.Pgo", "TypeSystemEntityOrUnknown", False, "get_AsField", "()", "", "Argument[this].SyntheticField[Internal.Pgo.TypeSystemEntityOrUnknown._data]", "ReturnValue", "value", "dfc-generated"]
+      - ["Internal.Pgo", "TypeSystemEntityOrUnknown", False, "get_AsMethod", "()", "", "Argument[this].SyntheticField[Internal.Pgo.TypeSystemEntityOrUnknown._data]", "ReturnValue", "value", "dfc-generated"]
+      - ["Internal.Pgo", "TypeSystemEntityOrUnknown", False, "get_AsType", "()", "", "Argument[this].SyntheticField[Internal.Pgo.TypeSystemEntityOrUnknown._data]", "ReturnValue", "value", "dfc-generated"]
   - addsTo:
       pack: codeql/csharp-all
       extensible: neutralModel
diff --git a/csharp/ql/lib/ext/generated/Internal.TypeSystem.Ecma.model.yml b/csharp/ql/lib/ext/generated/Internal.TypeSystem.Ecma.model.yml
index 189682c4090..9273ce408ea 100644
--- a/csharp/ql/lib/ext/generated/Internal.TypeSystem.Ecma.model.yml
+++ b/csharp/ql/lib/ext/generated/Internal.TypeSystem.Ecma.model.yml
@@ -4,32 +4,34 @@ extensions:
       pack: codeql/csharp-all
       extensible: summaryModel
     data:
-      - ["Internal.TypeSystem.Ecma", "CachingMetadataStringDecoder", False, "Lookup", "(System.String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["Internal.TypeSystem.Ecma", "CachingMetadataStringDecoder", False, "Lookup", "(System.String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["Internal.TypeSystem.Ecma", "CachingMetadataStringDecoder", False, "Lookup", "(System.String)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
       - ["Internal.TypeSystem.Ecma", "CustomAttributeTypeProvider", False, "CustomAttributeTypeProvider", "(Internal.TypeSystem.Ecma.EcmaModule)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["Internal.TypeSystem.Ecma", "EcmaAssembly", False, "EcmaAssembly", "(Internal.TypeSystem.TypeSystemContext,System.Reflection.PortableExecutable.PEReader,System.Reflection.Metadata.MetadataReader,Internal.TypeSystem.IModuleResolver)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
       - ["Internal.TypeSystem.Ecma", "EcmaAssembly", False, "get_AssemblyDefinition", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["Internal.TypeSystem.Ecma", "EcmaField", False, "get_Handle", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["Internal.TypeSystem.Ecma", "EcmaField", False, "get_MetadataReader", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["Internal.TypeSystem.Ecma", "EcmaField", False, "get_Module", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["Internal.TypeSystem.Ecma", "EcmaField", False, "get_MetadataReader", "()", "", "Argument[this].SyntheticField[Internal.TypeSystem.Ecma.EcmaField._type].Property[Internal.TypeSystem.Ecma.EcmaType.MetadataReader]", "ReturnValue", "value", "dfc-generated"]
+      - ["Internal.TypeSystem.Ecma", "EcmaField", False, "get_Module", "()", "", "Argument[this].SyntheticField[Internal.TypeSystem.Ecma.EcmaField._type].Property[Internal.TypeSystem.Ecma.EcmaType.EcmaModule]", "ReturnValue", "value", "dfc-generated"]
+      - ["Internal.TypeSystem.Ecma", "EcmaField", False, "get_OwningType", "()", "", "Argument[this].SyntheticField[Internal.TypeSystem.Ecma.EcmaField._type]", "ReturnValue", "value", "dfc-generated"]
+      - ["Internal.TypeSystem.Ecma", "EcmaGenericParameter", False, "get_DiagnosticName", "()", "", "Argument[this].Property[Internal.TypeSystem.Ecma.EcmaGenericParameter.Name]", "ReturnValue", "value", "dfc-generated"]
       - ["Internal.TypeSystem.Ecma", "EcmaGenericParameter", False, "get_Handle", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["Internal.TypeSystem.Ecma", "EcmaGenericParameter", False, "get_MetadataReader", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["Internal.TypeSystem.Ecma", "EcmaGenericParameter", False, "get_Module", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["Internal.TypeSystem.Ecma", "EcmaMethod", False, "get_DiagnosticName", "()", "", "Argument[this].Property[Internal.TypeSystem.Ecma.EcmaMethod.Name]", "ReturnValue", "value", "dfc-generated"]
       - ["Internal.TypeSystem.Ecma", "EcmaMethod", False, "get_Handle", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["Internal.TypeSystem.Ecma", "EcmaMethod", False, "get_MetadataReader", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["Internal.TypeSystem.Ecma", "EcmaMethod", False, "get_Module", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["Internal.TypeSystem.Ecma", "EcmaModule", False, "Create", "(Internal.TypeSystem.TypeSystemContext,System.Reflection.PortableExecutable.PEReader,Internal.TypeSystem.IAssemblyDesc,Internal.TypeSystem.Ecma.PdbSymbolReader,Internal.TypeSystem.IModuleResolver)", "", "Argument[3]", "ReturnValue", "taint", "df-generated"]
-      - ["Internal.TypeSystem.Ecma", "EcmaModule", False, "Create", "(Internal.TypeSystem.TypeSystemContext,System.Reflection.PortableExecutable.PEReader,Internal.TypeSystem.IAssemblyDesc,Internal.TypeSystem.IModuleResolver)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["Internal.TypeSystem.Ecma", "EcmaModule", False, "Create", "(Internal.TypeSystem.TypeSystemContext,System.Reflection.PortableExecutable.PEReader,Internal.TypeSystem.IAssemblyDesc,Internal.TypeSystem.IModuleResolver)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["Internal.TypeSystem.Ecma", "EcmaModule", False, "Create", "(Internal.TypeSystem.TypeSystemContext,System.Reflection.PortableExecutable.PEReader,Internal.TypeSystem.IAssemblyDesc,Internal.TypeSystem.IModuleResolver)", "", "Argument[3]", "ReturnValue", "taint", "df-generated"]
+      - ["Internal.TypeSystem.Ecma", "EcmaMethod", False, "get_MetadataReader", "()", "", "Argument[this].SyntheticField[Internal.TypeSystem.Ecma.EcmaMethod._type].Property[Internal.TypeSystem.Ecma.EcmaType.MetadataReader]", "ReturnValue", "value", "dfc-generated"]
+      - ["Internal.TypeSystem.Ecma", "EcmaMethod", False, "get_Module", "()", "", "Argument[this].SyntheticField[Internal.TypeSystem.Ecma.EcmaMethod._type].Property[Internal.TypeSystem.Ecma.EcmaType.EcmaModule]", "ReturnValue", "value", "dfc-generated"]
+      - ["Internal.TypeSystem.Ecma", "EcmaMethod", False, "get_OwningType", "()", "", "Argument[this].SyntheticField[Internal.TypeSystem.Ecma.EcmaMethod._type]", "ReturnValue", "value", "dfc-generated"]
+      - ["Internal.TypeSystem.Ecma", "EcmaModule", False, "Create", "(Internal.TypeSystem.TypeSystemContext,System.Reflection.PortableExecutable.PEReader,Internal.TypeSystem.IAssemblyDesc,Internal.TypeSystem.Ecma.PdbSymbolReader,Internal.TypeSystem.IModuleResolver)", "", "Argument[3]", "ReturnValue.Property[Internal.TypeSystem.Ecma.EcmaModule.PdbReader]", "value", "dfc-generated"]
+      - ["Internal.TypeSystem.Ecma", "EcmaModule", False, "Create", "(Internal.TypeSystem.TypeSystemContext,System.Reflection.PortableExecutable.PEReader,Internal.TypeSystem.IAssemblyDesc,Internal.TypeSystem.IModuleResolver)", "", "Argument[1]", "ReturnValue.SyntheticField[Internal.TypeSystem.Ecma.EcmaModule._peReader]", "value", "dfc-generated"]
       - ["Internal.TypeSystem.Ecma", "EcmaModule", False, "GetField", "(System.Reflection.Metadata.EntityHandle)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["Internal.TypeSystem.Ecma", "EcmaModule", False, "GetMethod", "(System.Reflection.Metadata.EntityHandle)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["Internal.TypeSystem.Ecma", "EcmaModule", False, "ToString", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["Internal.TypeSystem.Ecma", "EcmaModule", False, "get_EntryPoint", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["Internal.TypeSystem.Ecma", "EcmaModule", False, "get_PEReader", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["Internal.TypeSystem.Ecma", "EcmaModule", False, "get_MetadataReader", "()", "", "Argument[this].Field[Internal.TypeSystem.Ecma.EcmaModule._metadataReader]", "ReturnValue", "value", "dfc-generated"]
+      - ["Internal.TypeSystem.Ecma", "EcmaModule", False, "get_PEReader", "()", "", "Argument[this].SyntheticField[Internal.TypeSystem.Ecma.EcmaModule._peReader]", "ReturnValue", "value", "dfc-generated"]
       - ["Internal.TypeSystem.Ecma", "EcmaSignatureEncoder<TEntityHandleProvider>", False, "EcmaSignatureEncoder", "(TEntityHandleProvider)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["Internal.TypeSystem.Ecma", "EcmaSignatureParser", False, "EcmaSignatureParser", "(Internal.TypeSystem.Ecma.EcmaModule,System.Reflection.Metadata.BlobReader,Internal.TypeSystem.NotFoundBehavior)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["Internal.TypeSystem.Ecma", "EcmaSignatureParser", False, "EcmaSignatureParser", "(Internal.TypeSystem.Ecma.EcmaModule,System.Reflection.Metadata.BlobReader,Internal.TypeSystem.NotFoundBehavior)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["Internal.TypeSystem.Ecma", "EcmaSignatureParser", False, "EcmaSignatureParser", "(Internal.TypeSystem.TypeSystemContext,System.Func<System.Reflection.Metadata.EntityHandle,Internal.TypeSystem.NotFoundBehavior,Internal.TypeSystem.TypeDesc>,System.Reflection.Metadata.BlobReader,Internal.TypeSystem.NotFoundBehavior)", "", "Argument[1]", "Argument[this].SyntheticField[Internal.TypeSystem.Ecma.EcmaSignatureParser._typeResolver]", "value", "dfc-generated"]
       - ["Internal.TypeSystem.Ecma", "EcmaSignatureParser", False, "ParseFieldSignature", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["Internal.TypeSystem.Ecma", "EcmaSignatureParser", False, "ParseFieldSignature", "(Internal.TypeSystem.EmbeddedSignatureData[])", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["Internal.TypeSystem.Ecma", "EcmaSignatureParser", False, "ParseLocalsSignature", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
@@ -38,15 +40,23 @@ extensions:
       - ["Internal.TypeSystem.Ecma", "EcmaSignatureParser", False, "ParsePropertySignature", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["Internal.TypeSystem.Ecma", "EcmaSignatureParser", False, "ParseType", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["Internal.TypeSystem.Ecma", "EcmaSignatureParser", False, "get_ResolutionFailure", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["Internal.TypeSystem.Ecma", "EcmaType", False, "GetDefaultConstructor", "()", "", "Argument[this]", "ReturnValue.SyntheticField[Internal.TypeSystem.Ecma.EcmaMethod._type]", "value", "dfc-generated"]
+      - ["Internal.TypeSystem.Ecma", "EcmaType", False, "GetField", "(System.String)", "", "Argument[this]", "ReturnValue.SyntheticField[Internal.TypeSystem.Ecma.EcmaField._type]", "value", "dfc-generated"]
+      - ["Internal.TypeSystem.Ecma", "EcmaType", False, "GetMethod", "(System.String,Internal.TypeSystem.MethodSignature,Internal.TypeSystem.Instantiation)", "", "Argument[this]", "ReturnValue.SyntheticField[Internal.TypeSystem.Ecma.EcmaMethod._type]", "value", "dfc-generated"]
+      - ["Internal.TypeSystem.Ecma", "EcmaType", False, "GetMethodWithEquivalentSignature", "(System.String,Internal.TypeSystem.MethodSignature,Internal.TypeSystem.Instantiation)", "", "Argument[this]", "ReturnValue.SyntheticField[Internal.TypeSystem.Ecma.EcmaMethod._type]", "value", "dfc-generated"]
+      - ["Internal.TypeSystem.Ecma", "EcmaType", False, "GetStaticConstructor", "()", "", "Argument[this]", "ReturnValue.SyntheticField[Internal.TypeSystem.Ecma.EcmaMethod._type]", "value", "dfc-generated"]
+      - ["Internal.TypeSystem.Ecma", "EcmaType", False, "get_DiagnosticName", "()", "", "Argument[this].Property[Internal.TypeSystem.Ecma.EcmaType.Name]", "ReturnValue", "value", "dfc-generated"]
+      - ["Internal.TypeSystem.Ecma", "EcmaType", False, "get_DiagnosticNamespace", "()", "", "Argument[this].Property[Internal.TypeSystem.Ecma.EcmaType.Namespace]", "ReturnValue", "value", "dfc-generated"]
       - ["Internal.TypeSystem.Ecma", "EcmaType", False, "get_EcmaModule", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["Internal.TypeSystem.Ecma", "EcmaType", False, "get_Handle", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["Internal.TypeSystem.Ecma", "EcmaType", False, "get_MetadataReader", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["Internal.TypeSystem.Ecma", "EcmaType", False, "get_TypeIdentifierData", "()", "", "Argument[this].Property[Internal.TypeSystem.Ecma.EcmaType.TypeIdentifierData]", "ReturnValue", "value", "dfc-generated"]
+      - ["Internal.TypeSystem.Ecma", "EcmaType", False, "get_UnderlyingType", "()", "", "Argument[this].Property[Internal.TypeSystem.TypeDesc.UnderlyingType]", "ReturnValue", "value", "dfc-generated"]
       - ["Internal.TypeSystem.Ecma", "IEcmaModule", True, "GetObject", "(System.Reflection.Metadata.EntityHandle,Internal.TypeSystem.NotFoundBehavior)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["Internal.TypeSystem.Ecma", "IEcmaModule", True, "GetType", "(System.Reflection.Metadata.EntityHandle)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["Internal.TypeSystem.Ecma", "IEcmaModule", True, "get_Assembly", "()", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["Internal.TypeSystem.Ecma", "IEcmaModule", True, "get_MetadataReader", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["Internal.TypeSystem.Ecma", "IEcmaModule", True, "get_Assembly", "()", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
       - ["Internal.TypeSystem.Ecma", "IMetadataStringDecoderProvider", True, "GetMetadataStringDecoder", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["Internal.TypeSystem.Ecma", "MetadataExtensions", False, "GetCustomAttributeHandle", "(System.Reflection.Metadata.MetadataReader,System.Reflection.Metadata.CustomAttributeHandleCollection,System.String,System.String)", "", "Argument[1].Element", "ReturnValue", "taint", "df-generated"]
+      - ["Internal.TypeSystem.Ecma", "MetadataExtensions", False, "GetCustomAttributeHandle", "(System.Reflection.Metadata.MetadataReader,System.Reflection.Metadata.CustomAttributeHandleCollection,System.String,System.String)", "", "Argument[1].Element", "ReturnValue", "value", "dfc-generated"]
       - ["Internal.TypeSystem.Ecma", "PrimitiveTypeProvider", False, "GetPrimitiveType", "(Internal.TypeSystem.TypeSystemContext,System.Reflection.Metadata.PrimitiveTypeCode)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
   - addsTo:
       pack: codeql/csharp-all
@@ -62,6 +72,7 @@ extensions:
       - ["Internal.TypeSystem.Ecma", "CustomAttributeTypeProvider", "GetTypeFromSpecification", "(System.Reflection.Metadata.MetadataReader,System.Reflection.Metadata.TypeSpecificationHandle,System.Byte)", "summary", "df-generated"]
       - ["Internal.TypeSystem.Ecma", "CustomAttributeTypeProvider", "GetUnderlyingEnumType", "(Internal.TypeSystem.TypeDesc)", "summary", "df-generated"]
       - ["Internal.TypeSystem.Ecma", "CustomAttributeTypeProvider", "IsSystemType", "(Internal.TypeSystem.TypeDesc)", "summary", "df-generated"]
+      - ["Internal.TypeSystem.Ecma", "EcmaAssembly", "EcmaAssembly", "(Internal.TypeSystem.TypeSystemContext,System.Reflection.PortableExecutable.PEReader,System.Reflection.Metadata.MetadataReader,Internal.TypeSystem.IModuleResolver)", "summary", "df-generated"]
       - ["Internal.TypeSystem.Ecma", "EcmaAssembly", "HasAssemblyCustomAttribute", "(System.String,System.String)", "summary", "df-generated"]
       - ["Internal.TypeSystem.Ecma", "EcmaField", "CompareToImpl", "(Internal.TypeSystem.FieldDesc,Internal.TypeSystem.TypeSystemComparer)", "summary", "df-generated"]
       - ["Internal.TypeSystem.Ecma", "EcmaField", "GetMarshalAsDescriptor", "()", "summary", "df-generated"]
@@ -122,6 +133,7 @@ extensions:
       - ["Internal.TypeSystem.Ecma", "EcmaSignatureEncoder<TEntityHandleProvider>", "EncodeTypeSignature", "(System.Reflection.Metadata.Ecma335.SignatureTypeEncoder,Internal.TypeSystem.TypeDesc)", "summary", "df-generated"]
       - ["Internal.TypeSystem.Ecma", "EcmaSignatureParser", "ParseMarshalAsDescriptor", "()", "summary", "df-generated"]
       - ["Internal.TypeSystem.Ecma", "EcmaSignatureParser", "get_IsFieldSignature", "()", "summary", "df-generated"]
+      - ["Internal.TypeSystem.Ecma", "EcmaSignatureTranslator", "EcmaSignatureTranslator", "(System.Reflection.Metadata.BlobReader,System.Reflection.Metadata.BlobBuilder,System.Func<System.Int32,System.Int32>)", "summary", "df-generated"]
       - ["Internal.TypeSystem.Ecma", "EcmaSignatureTranslator", "ParseFieldSignature", "()", "summary", "df-generated"]
       - ["Internal.TypeSystem.Ecma", "EcmaSignatureTranslator", "ParseLocalsSignature", "()", "summary", "df-generated"]
       - ["Internal.TypeSystem.Ecma", "EcmaSignatureTranslator", "ParseMemberRefSignature", "()", "summary", "df-generated"]
@@ -149,6 +161,7 @@ extensions:
       - ["Internal.TypeSystem.Ecma", "EcmaType", "get_IsWindowsRuntime", "()", "summary", "df-generated"]
       - ["Internal.TypeSystem.Ecma", "EcmaType", "get_PInvokeStringFormat", "()", "summary", "df-generated"]
       - ["Internal.TypeSystem.Ecma", "IEcmaModule", "CompareTo", "(Internal.TypeSystem.Ecma.IEcmaModule)", "summary", "df-generated"]
+      - ["Internal.TypeSystem.Ecma", "IEcmaModule", "get_MetadataReader", "()", "summary", "df-generated"]
       - ["Internal.TypeSystem.Ecma", "IEcmaModule", "get_ModuleTypeSort", "()", "summary", "df-generated"]
       - ["Internal.TypeSystem.Ecma", "IEntityHandleProvider", "GetTypeDefOrRefHandleForTypeDesc", "(Internal.TypeSystem.TypeDesc)", "summary", "df-generated"]
       - ["Internal.TypeSystem.Ecma", "MetadataExtensions", "GetAttributeNamespaceAndName", "(System.Reflection.Metadata.MetadataReader,System.Reflection.Metadata.CustomAttributeHandle,System.Reflection.Metadata.StringHandle,System.Reflection.Metadata.StringHandle)", "summary", "df-generated"]
diff --git a/csharp/ql/lib/ext/generated/Internal.TypeSystem.model.yml b/csharp/ql/lib/ext/generated/Internal.TypeSystem.model.yml
index 910a98ae0ae..d418b5c7381 100644
--- a/csharp/ql/lib/ext/generated/Internal.TypeSystem.model.yml
+++ b/csharp/ql/lib/ext/generated/Internal.TypeSystem.model.yml
@@ -4,34 +4,39 @@ extensions:
       pack: codeql/csharp-all
       extensible: summaryModel
     data:
+      - ["Internal.TypeSystem", "ArrayMethod", False, "get_DiagnosticName", "()", "", "Argument[this].Property[Internal.TypeSystem.ArrayMethod.Name]", "ReturnValue", "value", "dfc-generated"]
       - ["Internal.TypeSystem", "ArrayMethod", False, "get_OwningArray", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["Internal.TypeSystem", "ArrayOfTRuntimeInterfacesAlgorithm", False, "ArrayOfTRuntimeInterfacesAlgorithm", "(Internal.TypeSystem.MetadataType)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["Internal.TypeSystem", "ArrayType", False, "GetArrayMethod", "(Internal.TypeSystem.ArrayMethodKind)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["Internal.TypeSystem", "ArrayType", False, "get_ElementType", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["Internal.TypeSystem", "CanonBaseType", False, "CanonBaseType", "(Internal.TypeSystem.TypeSystemContext)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["Internal.TypeSystem", "ArrayType", False, "get_ElementType", "()", "", "Argument[this].Property[Internal.TypeSystem.ParameterizedType.ParameterType]", "ReturnValue", "value", "dfc-generated"]
+      - ["Internal.TypeSystem", "CanonBaseType", False, "CanonBaseType", "(Internal.TypeSystem.TypeSystemContext)", "", "Argument[0]", "Argument[this].SyntheticField[Internal.TypeSystem.CanonBaseType._context]", "value", "dfc-generated"]
+      - ["Internal.TypeSystem", "CanonBaseType", False, "get_Context", "()", "", "Argument[this].SyntheticField[Internal.TypeSystem.CanonBaseType._context]", "ReturnValue", "value", "dfc-generated"]
+      - ["Internal.TypeSystem", "CanonBaseType", True, "get_MetadataBaseType", "()", "", "Argument[this].Property[Internal.TypeSystem.MetadataType.BaseType]", "ReturnValue", "value", "dfc-generated"]
+      - ["Internal.TypeSystem", "CanonBaseType", True, "get_Module", "()", "", "Argument[this].SyntheticField[Internal.TypeSystem.CanonBaseType._context].Property[Internal.TypeSystem.TypeSystemContext.SystemModule]", "ReturnValue", "value", "dfc-generated"]
       - ["Internal.TypeSystem", "ConstructedTypeRewritingHelpers", False, "ReplaceTypesInConstructionOfMethod", "(Internal.TypeSystem.MethodDesc,Internal.TypeSystem.TypeDesc[],Internal.TypeSystem.TypeDesc[])", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["Internal.TypeSystem", "ConstructedTypeRewritingHelpers", False, "ReplaceTypesInConstructionOfMethod", "(Internal.TypeSystem.MethodDesc,Internal.TypeSystem.TypeDesc[],Internal.TypeSystem.TypeDesc[])", "", "Argument[2].Element", "ReturnValue", "taint", "df-generated"]
-      - ["Internal.TypeSystem", "ConstructedTypeRewritingHelpers", False, "ReplaceTypesInConstructionOfType", "(Internal.TypeSystem.TypeDesc,Internal.TypeSystem.TypeDesc[],Internal.TypeSystem.TypeDesc[])", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["Internal.TypeSystem", "ConstructedTypeRewritingHelpers", False, "ReplaceTypesInConstructionOfType", "(Internal.TypeSystem.TypeDesc,Internal.TypeSystem.TypeDesc[],Internal.TypeSystem.TypeDesc[])", "", "Argument[2].Element", "ReturnValue", "taint", "df-generated"]
+      - ["Internal.TypeSystem", "ConstructedTypeRewritingHelpers", False, "ReplaceTypesInConstructionOfType", "(Internal.TypeSystem.TypeDesc,Internal.TypeSystem.TypeDesc[],Internal.TypeSystem.TypeDesc[])", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Internal.TypeSystem", "ConstructedTypeRewritingHelpers", False, "ReplaceTypesInConstructionOfType", "(Internal.TypeSystem.TypeDesc,Internal.TypeSystem.TypeDesc[],Internal.TypeSystem.TypeDesc[])", "", "Argument[2].Element", "ReturnValue", "value", "dfc-generated"]
       - ["Internal.TypeSystem", "CustomAttributeTypeNameFormatter", False, "AppendNameForNamespaceType", "(System.Text.StringBuilder,Internal.TypeSystem.DefType,System.Boolean)", "", "Argument[1]", "Argument[0]", "taint", "df-generated"]
       - ["Internal.TypeSystem", "CustomAttributeTypeNameFormatter", False, "AppendNameForNamespaceType", "(System.Text.StringBuilder,Internal.TypeSystem.DefType,System.Boolean)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
       - ["Internal.TypeSystem", "CustomAttributeTypeNameFormatter", False, "AppendNameForNestedType", "(System.Text.StringBuilder,Internal.TypeSystem.DefType,Internal.TypeSystem.DefType,System.Boolean)", "", "Argument[1]", "Argument[0]", "taint", "df-generated"]
       - ["Internal.TypeSystem", "CustomAttributeTypeNameFormatter", False, "AppendNameForNestedType", "(System.Text.StringBuilder,Internal.TypeSystem.DefType,Internal.TypeSystem.DefType,System.Boolean)", "", "Argument[2]", "Argument[0]", "taint", "df-generated"]
       - ["Internal.TypeSystem", "CustomAttributeTypeNameFormatter", False, "AppendNameForNestedType", "(System.Text.StringBuilder,Internal.TypeSystem.DefType,Internal.TypeSystem.DefType,System.Boolean)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
       - ["Internal.TypeSystem", "CustomAttributeTypeNameFormatter", False, "CustomAttributeTypeNameFormatter", "(Internal.TypeSystem.IAssemblyDesc)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["Internal.TypeSystem", "DebugNameFormatter", True, "AppendName", "(System.Text.StringBuilder,Internal.TypeSystem.ArrayType,Internal.TypeSystem.DebugNameFormatter+FormatOptions)", "", "Argument[1]", "Argument[0]", "taint", "df-generated"]
-      - ["Internal.TypeSystem", "DebugNameFormatter", True, "AppendName", "(System.Text.StringBuilder,Internal.TypeSystem.ByRefType,Internal.TypeSystem.DebugNameFormatter+FormatOptions)", "", "Argument[1]", "Argument[0]", "taint", "df-generated"]
+      - ["Internal.TypeSystem", "DebugNameFormatter", True, "AppendName", "(System.Text.StringBuilder,Internal.TypeSystem.ArrayType,Internal.TypeSystem.DebugNameFormatter+FormatOptions)", "", "Argument[1].Property[Internal.TypeSystem.ArrayType.ElementType].Property[Internal.TypeSystem.GenericParameterDesc.DiagnosticName]", "Argument[0]", "taint", "dfc-generated"]
+      - ["Internal.TypeSystem", "DebugNameFormatter", True, "AppendName", "(System.Text.StringBuilder,Internal.TypeSystem.ArrayType,Internal.TypeSystem.DebugNameFormatter+FormatOptions)", "", "Argument[1].Property[Internal.TypeSystem.ParameterizedType.ParameterType].Property[Internal.TypeSystem.GenericParameterDesc.DiagnosticName]", "Argument[0]", "taint", "dfc-generated"]
+      - ["Internal.TypeSystem", "DebugNameFormatter", True, "AppendName", "(System.Text.StringBuilder,Internal.TypeSystem.ByRefType,Internal.TypeSystem.DebugNameFormatter+FormatOptions)", "", "Argument[1].Property[Internal.TypeSystem.ParameterizedType.ParameterType].Property[Internal.TypeSystem.GenericParameterDesc.DiagnosticName]", "Argument[0]", "taint", "dfc-generated"]
       - ["Internal.TypeSystem", "DebugNameFormatter", True, "AppendName", "(System.Text.StringBuilder,Internal.TypeSystem.FunctionPointerType,Internal.TypeSystem.DebugNameFormatter+FormatOptions)", "", "Argument[1]", "Argument[0]", "taint", "df-generated"]
-      - ["Internal.TypeSystem", "DebugNameFormatter", True, "AppendName", "(System.Text.StringBuilder,Internal.TypeSystem.GenericParameterDesc,Internal.TypeSystem.DebugNameFormatter+FormatOptions)", "", "Argument[1]", "Argument[0]", "taint", "df-generated"]
-      - ["Internal.TypeSystem", "DebugNameFormatter", True, "AppendName", "(System.Text.StringBuilder,Internal.TypeSystem.PointerType,Internal.TypeSystem.DebugNameFormatter+FormatOptions)", "", "Argument[1]", "Argument[0]", "taint", "df-generated"]
+      - ["Internal.TypeSystem", "DebugNameFormatter", True, "AppendName", "(System.Text.StringBuilder,Internal.TypeSystem.GenericParameterDesc,Internal.TypeSystem.DebugNameFormatter+FormatOptions)", "", "Argument[1].Property[Internal.TypeSystem.GenericParameterDesc.DiagnosticName]", "Argument[0]", "taint", "dfc-generated"]
+      - ["Internal.TypeSystem", "DebugNameFormatter", True, "AppendName", "(System.Text.StringBuilder,Internal.TypeSystem.PointerType,Internal.TypeSystem.DebugNameFormatter+FormatOptions)", "", "Argument[1].Property[Internal.TypeSystem.ParameterizedType.ParameterType].Property[Internal.TypeSystem.GenericParameterDesc.DiagnosticName]", "Argument[0]", "taint", "dfc-generated"]
       - ["Internal.TypeSystem", "DebugNameFormatter", True, "AppendNameForInstantiatedType", "(System.Text.StringBuilder,Internal.TypeSystem.DefType,Internal.TypeSystem.DebugNameFormatter+FormatOptions)", "", "Argument[1]", "Argument[0]", "taint", "df-generated"]
       - ["Internal.TypeSystem", "DebugNameFormatter", True, "AppendNameForNamespaceType", "(System.Text.StringBuilder,Internal.TypeSystem.DefType,Internal.TypeSystem.DebugNameFormatter+FormatOptions)", "", "Argument[1]", "Argument[0]", "taint", "df-generated"]
       - ["Internal.TypeSystem", "DebugNameFormatter", True, "AppendNameForNestedType", "(System.Text.StringBuilder,Internal.TypeSystem.DefType,Internal.TypeSystem.DefType,Internal.TypeSystem.DebugNameFormatter+FormatOptions)", "", "Argument[1]", "Argument[0]", "taint", "df-generated"]
       - ["Internal.TypeSystem", "DebugNameFormatter", True, "AppendNameForNestedType", "(System.Text.StringBuilder,Internal.TypeSystem.DefType,Internal.TypeSystem.DefType,Internal.TypeSystem.DebugNameFormatter+FormatOptions)", "", "Argument[2]", "Argument[0]", "taint", "df-generated"]
       - ["Internal.TypeSystem", "DebugNameFormatter", True, "GetContainingType", "(Internal.TypeSystem.DefType,Internal.TypeSystem.DebugNameFormatter+FormatOptions)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["Internal.TypeSystem", "DefType", False, "ConvertToSharedRuntimeDeterminedForm", "()", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["Internal.TypeSystem", "DefType", False, "ConvertToSharedRuntimeDeterminedForm", "()", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
       - ["Internal.TypeSystem", "DefType", False, "get_InstanceByteAlignment", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["Internal.TypeSystem", "DefType", False, "get_InstanceByteCount", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["Internal.TypeSystem", "DefType", False, "get_InstanceByteCount", "()", "", "Argument[this].Property[Internal.TypeSystem.DefType.InstanceByteCountUnaligned]", "ReturnValue", "value", "dfc-generated"]
       - ["Internal.TypeSystem", "DefType", False, "get_InstanceByteCountUnaligned", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["Internal.TypeSystem", "DefType", False, "get_InstanceFieldAlignment", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["Internal.TypeSystem", "DefType", False, "get_InstanceFieldSize", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
@@ -40,53 +45,54 @@ extensions:
       - ["Internal.TypeSystem", "DefType", True, "get_DiagnosticNamespace", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["Internal.TypeSystem", "DefType", True, "get_Name", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["Internal.TypeSystem", "DefType", True, "get_Namespace", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["Internal.TypeSystem", "FieldAndOffset", False, "FieldAndOffset", "(Internal.TypeSystem.FieldDesc,Internal.TypeSystem.LayoutInt)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["Internal.TypeSystem", "FieldAndOffset", False, "FieldAndOffset", "(Internal.TypeSystem.FieldDesc,Internal.TypeSystem.LayoutInt)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["Internal.TypeSystem", "FieldDesc", False, "GetNonRuntimeDeterminedFieldFromRuntimeDeterminedFieldViaSubstitution", "(Internal.TypeSystem.Instantiation,Internal.TypeSystem.Instantiation)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["Internal.TypeSystem", "ExceptionTypeNameFormatter", True, "AppendName", "(System.Text.StringBuilder,Internal.TypeSystem.GenericParameterDesc)", "", "Argument[1].Property[Internal.TypeSystem.GenericParameterDesc.Name]", "Argument[0]", "taint", "dfc-generated"]
+      - ["Internal.TypeSystem", "FieldAndOffset", False, "FieldAndOffset", "(Internal.TypeSystem.FieldDesc,Internal.TypeSystem.LayoutInt)", "", "Argument[0]", "Argument[this].Field[Internal.TypeSystem.FieldAndOffset.Field]", "value", "dfc-generated"]
+      - ["Internal.TypeSystem", "FieldAndOffset", False, "FieldAndOffset", "(Internal.TypeSystem.FieldDesc,Internal.TypeSystem.LayoutInt)", "", "Argument[1]", "Argument[this].Field[Internal.TypeSystem.FieldAndOffset.Offset]", "value", "dfc-generated"]
+      - ["Internal.TypeSystem", "FieldDesc", False, "GetNonRuntimeDeterminedFieldFromRuntimeDeterminedFieldViaSubstitution", "(Internal.TypeSystem.Instantiation,Internal.TypeSystem.Instantiation)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
       - ["Internal.TypeSystem", "FieldDesc", False, "ToString", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["Internal.TypeSystem", "FieldDesc", False, "get_Offset", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["Internal.TypeSystem", "FieldDesc", True, "GetEmbeddedSignatureData", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["Internal.TypeSystem", "FieldDesc", True, "GetTypicalFieldDefinition", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["Internal.TypeSystem", "FieldDesc", True, "GetTypicalFieldDefinition", "()", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["Internal.TypeSystem", "FieldDesc", True, "InstantiateSignature", "(Internal.TypeSystem.Instantiation,Internal.TypeSystem.Instantiation)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["Internal.TypeSystem", "FieldDesc", True, "GetTypicalFieldDefinition", "()", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["Internal.TypeSystem", "FieldDesc", True, "InstantiateSignature", "(Internal.TypeSystem.Instantiation,Internal.TypeSystem.Instantiation)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
       - ["Internal.TypeSystem", "FieldDesc", True, "get_FieldType", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["Internal.TypeSystem", "FieldDesc", True, "get_Name", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["Internal.TypeSystem", "FieldDesc", True, "get_OwningType", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["Internal.TypeSystem", "FieldLayoutAlgorithm", True, "ComputeInstanceLayout", "(Internal.TypeSystem.DefType,Internal.TypeSystem.InstanceLayoutKind)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["Internal.TypeSystem", "FunctionPointerType", False, "get_Signature", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["Internal.TypeSystem", "FunctionPointerType", False, "get_Signature", "()", "", "Argument[this].SyntheticField[Internal.TypeSystem.FunctionPointerType._signature]", "ReturnValue", "value", "dfc-generated"]
       - ["Internal.TypeSystem", "GenericParameterDesc", True, "get_AssociatedTypeOrMethod", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["Internal.TypeSystem", "GenericParameterDesc", True, "get_DiagnosticName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["Internal.TypeSystem", "IAssemblyDesc", True, "GetName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["Internal.TypeSystem", "IModuleResolver", True, "ResolveAssembly", "(System.Reflection.AssemblyName,System.Boolean)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["Internal.TypeSystem", "IPrefixMangledMethod", True, "get_BaseMethod", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["Internal.TypeSystem", "InstantiatedType", False, "InstantiateTypeArray<T>", "(T[],Internal.TypeSystem.Instantiation,Internal.TypeSystem.Instantiation)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["Internal.TypeSystem", "InstantiatedType", False, "InstantiateTypeArray<T>", "(T[],Internal.TypeSystem.Instantiation,Internal.TypeSystem.Instantiation)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["Internal.TypeSystem", "InstantiatedType", False, "InstantiateTypeArray<T>", "(T[],Internal.TypeSystem.Instantiation,Internal.TypeSystem.Instantiation)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
-      - ["Internal.TypeSystem", "Instantiation+Enumerator", False, "Enumerator", "(Internal.TypeSystem.TypeDesc[])", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["Internal.TypeSystem", "Instantiation+Enumerator", False, "get_Current", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["Internal.TypeSystem", "Instantiation", False, "GetEnumerator", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["Internal.TypeSystem", "Instantiation", False, "Instantiation", "(Internal.TypeSystem.TypeDesc[])", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["Internal.TypeSystem", "Instantiation", False, "ToString", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["Internal.TypeSystem", "Instantiation", False, "get_GenericParameters", "(System.Int32)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["Internal.TypeSystem", "InstantiationContext", False, "InstantiationContext", "(Internal.TypeSystem.Instantiation,Internal.TypeSystem.Instantiation)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["Internal.TypeSystem", "InstantiationContext", False, "InstantiationContext", "(Internal.TypeSystem.Instantiation,Internal.TypeSystem.Instantiation)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["Internal.TypeSystem", "LayoutInt", False, "AlignUp", "(Internal.TypeSystem.LayoutInt,Internal.TypeSystem.LayoutInt,Internal.TypeSystem.TargetDetails)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["Internal.TypeSystem", "LocalVariableDefinition", False, "LocalVariableDefinition", "(Internal.TypeSystem.TypeDesc,System.Boolean)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["Internal.TypeSystem", "InstantiatedType", False, "InstantiateTypeArray<T>", "(T[],Internal.TypeSystem.Instantiation,Internal.TypeSystem.Instantiation)", "", "Argument[0].Element", "ReturnValue.Element", "value", "dfc-generated"]
+      - ["Internal.TypeSystem", "InstantiatedType", False, "InstantiateTypeArray<T>", "(T[],Internal.TypeSystem.Instantiation,Internal.TypeSystem.Instantiation)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Internal.TypeSystem", "InstantiatedType", False, "InstantiateTypeArray<T>", "(T[],Internal.TypeSystem.Instantiation,Internal.TypeSystem.Instantiation)", "", "Argument[1].SyntheticField[Internal.TypeSystem.Instantiation._genericParameters].Element", "ReturnValue.Element", "value", "dfc-generated"]
+      - ["Internal.TypeSystem", "InstantiatedType", False, "InstantiateTypeArray<T>", "(T[],Internal.TypeSystem.Instantiation,Internal.TypeSystem.Instantiation)", "", "Argument[2].SyntheticField[Internal.TypeSystem.Instantiation._genericParameters].Element", "ReturnValue.Element", "value", "dfc-generated"]
+      - ["Internal.TypeSystem", "Instantiation+Enumerator", False, "Enumerator", "(Internal.TypeSystem.TypeDesc[])", "", "Argument[0]", "Argument[this].SyntheticField[Internal.TypeSystem.Instantiation+Enumerator._collection]", "value", "dfc-generated"]
+      - ["Internal.TypeSystem", "Instantiation+Enumerator", False, "get_Current", "()", "", "Argument[this].SyntheticField[Internal.TypeSystem.Instantiation+Enumerator._collection].Element", "ReturnValue", "value", "dfc-generated"]
+      - ["Internal.TypeSystem", "Instantiation", False, "GetEnumerator", "()", "", "Argument[this].SyntheticField[Internal.TypeSystem.Instantiation._genericParameters]", "ReturnValue.SyntheticField[Internal.TypeSystem.Instantiation+Enumerator._collection]", "value", "dfc-generated"]
+      - ["Internal.TypeSystem", "Instantiation", False, "Instantiation", "(Internal.TypeSystem.TypeDesc[])", "", "Argument[0]", "Argument[this].SyntheticField[Internal.TypeSystem.Instantiation._genericParameters]", "value", "dfc-generated"]
+      - ["Internal.TypeSystem", "Instantiation", False, "ToString", "()", "", "Argument[this].SyntheticField[Internal.TypeSystem.Instantiation._genericParameters].Element", "ReturnValue", "taint", "dfc-generated"]
+      - ["Internal.TypeSystem", "Instantiation", False, "get_GenericParameters", "(System.Int32)", "", "Argument[this].SyntheticField[Internal.TypeSystem.Instantiation._genericParameters].Element", "ReturnValue", "value", "dfc-generated"]
+      - ["Internal.TypeSystem", "InstantiationContext", False, "InstantiationContext", "(Internal.TypeSystem.Instantiation,Internal.TypeSystem.Instantiation)", "", "Argument[0]", "Argument[this].Field[Internal.TypeSystem.InstantiationContext.TypeInstantiation]", "value", "dfc-generated"]
+      - ["Internal.TypeSystem", "InstantiationContext", False, "InstantiationContext", "(Internal.TypeSystem.Instantiation,Internal.TypeSystem.Instantiation)", "", "Argument[1]", "Argument[this].Field[Internal.TypeSystem.InstantiationContext.MethodInstantiation]", "value", "dfc-generated"]
+      - ["Internal.TypeSystem", "LayoutInt", False, "AlignUp", "(Internal.TypeSystem.LayoutInt,Internal.TypeSystem.LayoutInt,Internal.TypeSystem.TargetDetails)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Internal.TypeSystem", "LocalVariableDefinition", False, "LocalVariableDefinition", "(Internal.TypeSystem.TypeDesc,System.Boolean)", "", "Argument[0]", "Argument[this].Field[Internal.TypeSystem.LocalVariableDefinition.Type]", "value", "dfc-generated"]
       - ["Internal.TypeSystem", "LockFreeReaderHashtable<TKey,TValue>+Enumerator", False, "Get", "(Internal.TypeSystem.LockFreeReaderHashtable<TKey,TValue>)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["Internal.TypeSystem", "LockFreeReaderHashtable<TKey,TValue>+Enumerator", False, "GetEnumerator", "()", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["Internal.TypeSystem", "LockFreeReaderHashtable<TKey,TValue>+Enumerator", False, "GetEnumerator", "()", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
       - ["Internal.TypeSystem", "LockFreeReaderHashtable<TKey,TValue>+Enumerator", False, "get_Current", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["Internal.TypeSystem", "LockFreeReaderHashtable<TKey,TValue>", False, "AddOrGetExisting", "(TValue)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["Internal.TypeSystem", "LockFreeReaderHashtable<TKey,TValue>", False, "AddOrGetExisting", "(TValue)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["Internal.TypeSystem", "LockFreeReaderHashtable<TKey,TValue>", False, "AddOrGetExisting", "(TValue)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
       - ["Internal.TypeSystem", "LockFreeReaderHashtable<TKey,TValue>", False, "GetOrCreateValue", "(TKey)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["Internal.TypeSystem", "LockFreeReaderHashtable<TKey,TValue>", False, "GetValueIfExists", "(TValue)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["Internal.TypeSystem", "LockFreeReaderHashtable<TKey,TValue>", False, "TryGetValue", "(TKey,TValue)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["Internal.TypeSystem", "MarshalAsDescriptor", False, "MarshalAsDescriptor", "(Internal.TypeSystem.NativeTypeKind,Internal.TypeSystem.NativeTypeKind,System.Nullable<System.UInt32>,System.Nullable<System.UInt32>,Internal.TypeSystem.TypeDesc,System.String)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
-      - ["Internal.TypeSystem", "MarshalAsDescriptor", False, "MarshalAsDescriptor", "(Internal.TypeSystem.NativeTypeKind,Internal.TypeSystem.NativeTypeKind,System.Nullable<System.UInt32>,System.Nullable<System.UInt32>,Internal.TypeSystem.TypeDesc,System.String)", "", "Argument[3]", "Argument[this]", "taint", "df-generated"]
-      - ["Internal.TypeSystem", "MarshalAsDescriptor", False, "MarshalAsDescriptor", "(Internal.TypeSystem.NativeTypeKind,Internal.TypeSystem.NativeTypeKind,System.Nullable<System.UInt32>,System.Nullable<System.UInt32>,Internal.TypeSystem.TypeDesc,System.String)", "", "Argument[4]", "Argument[this]", "taint", "df-generated"]
-      - ["Internal.TypeSystem", "MarshalAsDescriptor", False, "MarshalAsDescriptor", "(Internal.TypeSystem.NativeTypeKind,Internal.TypeSystem.NativeTypeKind,System.Nullable<System.UInt32>,System.Nullable<System.UInt32>,Internal.TypeSystem.TypeDesc,System.String)", "", "Argument[5]", "Argument[this]", "taint", "df-generated"]
-      - ["Internal.TypeSystem", "MarshalAsDescriptor", False, "get_Cookie", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["Internal.TypeSystem", "MarshalAsDescriptor", False, "get_MarshallerType", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["Internal.TypeSystem", "MarshalAsDescriptor", False, "MarshalAsDescriptor", "(Internal.TypeSystem.NativeTypeKind,Internal.TypeSystem.NativeTypeKind,System.Nullable<System.UInt32>,System.Nullable<System.UInt32>,Internal.TypeSystem.TypeDesc,System.String)", "", "Argument[2]", "Argument[this].Property[Internal.TypeSystem.MarshalAsDescriptor.SizeParamIndex]", "value", "dfc-generated"]
+      - ["Internal.TypeSystem", "MarshalAsDescriptor", False, "MarshalAsDescriptor", "(Internal.TypeSystem.NativeTypeKind,Internal.TypeSystem.NativeTypeKind,System.Nullable<System.UInt32>,System.Nullable<System.UInt32>,Internal.TypeSystem.TypeDesc,System.String)", "", "Argument[3]", "Argument[this].Property[Internal.TypeSystem.MarshalAsDescriptor.SizeConst]", "value", "dfc-generated"]
+      - ["Internal.TypeSystem", "MarshalAsDescriptor", False, "MarshalAsDescriptor", "(Internal.TypeSystem.NativeTypeKind,Internal.TypeSystem.NativeTypeKind,System.Nullable<System.UInt32>,System.Nullable<System.UInt32>,Internal.TypeSystem.TypeDesc,System.String)", "", "Argument[4]", "Argument[this].SyntheticField[Internal.TypeSystem.MarshalAsDescriptor._marshallerType]", "value", "dfc-generated"]
+      - ["Internal.TypeSystem", "MarshalAsDescriptor", False, "MarshalAsDescriptor", "(Internal.TypeSystem.NativeTypeKind,Internal.TypeSystem.NativeTypeKind,System.Nullable<System.UInt32>,System.Nullable<System.UInt32>,Internal.TypeSystem.TypeDesc,System.String)", "", "Argument[5]", "Argument[this].SyntheticField[Internal.TypeSystem.MarshalAsDescriptor._cookie]", "value", "dfc-generated"]
+      - ["Internal.TypeSystem", "MarshalAsDescriptor", False, "get_Cookie", "()", "", "Argument[this].SyntheticField[Internal.TypeSystem.MarshalAsDescriptor._cookie]", "ReturnValue", "value", "dfc-generated"]
+      - ["Internal.TypeSystem", "MarshalAsDescriptor", False, "get_MarshallerType", "()", "", "Argument[this].SyntheticField[Internal.TypeSystem.MarshalAsDescriptor._marshallerType]", "ReturnValue", "value", "dfc-generated"]
       - ["Internal.TypeSystem", "MetadataFieldLayoutAlgorithm", False, "CalculateFieldBaseOffset", "(Internal.TypeSystem.MetadataType,System.Boolean,System.Boolean)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["Internal.TypeSystem", "MetadataFieldLayoutAlgorithm", True, "AlignBaseOffsetIfNecessary", "(Internal.TypeSystem.MetadataType,Internal.TypeSystem.LayoutInt,System.Boolean,System.Boolean)", "", "Argument[1]", "ReturnValue", "value", "dfc-generated"]
+      - ["Internal.TypeSystem", "MetadataFieldLayoutAlgorithm", True, "FinalizeRuntimeSpecificStaticFieldLayout", "(Internal.TypeSystem.TypeSystemContext,Internal.TypeSystem.ComputedStaticFieldLayout)", "", "Argument[1]", "ReturnValue", "value", "dfc-generated"]
+      - ["Internal.TypeSystem", "MetadataFieldLayoutAlgorithm", True, "PrepareRuntimeSpecificStaticFieldLayout", "(Internal.TypeSystem.TypeSystemContext,Internal.TypeSystem.ComputedStaticFieldLayout)", "", "Argument[1]", "ReturnValue", "value", "dfc-generated"]
       - ["Internal.TypeSystem", "MetadataType", False, "get_VirtualMethodImplsForType", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["Internal.TypeSystem", "MetadataType", True, "ComputeVirtualMethodImplsForType", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["Internal.TypeSystem", "MetadataType", True, "GetNestedTypes", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
@@ -95,44 +101,45 @@ extensions:
       - ["Internal.TypeSystem", "MetadataType", True, "get_Module", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["Internal.TypeSystem", "MetadataTypeSystemContext", True, "SetSystemModule", "(Internal.TypeSystem.ModuleDesc)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["Internal.TypeSystem", "MetadataVirtualMethodAlgorithm", False, "EnumAllVirtualSlots", "(Internal.TypeSystem.MetadataType)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["Internal.TypeSystem", "MetadataVirtualMethodAlgorithm", False, "FindSlotDefiningMethodForVirtualMethod", "(Internal.TypeSystem.MethodDesc)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["Internal.TypeSystem", "MetadataVirtualMethodAlgorithm", False, "FindSlotDefiningMethodForVirtualMethod", "(Internal.TypeSystem.MethodDesc)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
       - ["Internal.TypeSystem", "MetadataVirtualMethodAlgorithm", False, "ResolveVariantInterfaceMethodToDefaultImplementationOnType", "(Internal.TypeSystem.MethodDesc,Internal.TypeSystem.MetadataType,Internal.TypeSystem.MethodDesc)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["Internal.TypeSystem", "MetadataVirtualMethodAlgorithm", False, "ResolveVariantInterfaceMethodToDefaultImplementationOnType", "(Internal.TypeSystem.MethodDesc,Internal.TypeSystem.MetadataType,Internal.TypeSystem.MethodDesc)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
       - ["Internal.TypeSystem", "MetadataVirtualMethodAlgorithm", False, "ResolveVariantInterfaceMethodToVirtualMethodOnType", "(Internal.TypeSystem.MethodDesc,Internal.TypeSystem.MetadataType)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["Internal.TypeSystem", "MethodDelegator", False, "MethodDelegator", "(Internal.TypeSystem.MethodDesc)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["Internal.TypeSystem", "MethodDesc", False, "GetSharedRuntimeFormMethodTarget", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["Internal.TypeSystem", "MethodDelegator", False, "MethodDelegator", "(Internal.TypeSystem.MethodDesc)", "", "Argument[0]", "Argument[this].Field[Internal.TypeSystem.MethodDelegator._wrappedMethod]", "value", "dfc-generated"]
+      - ["Internal.TypeSystem", "MethodDelegator", True, "get_Context", "()", "", "Argument[this].Field[Internal.TypeSystem.MethodDelegator._wrappedMethod].Property[Internal.TypeSystem.TypeSystemEntity.Context]", "ReturnValue", "value", "dfc-generated"]
+      - ["Internal.TypeSystem", "MethodDelegator", True, "get_Name", "()", "", "Argument[this].Field[Internal.TypeSystem.MethodDelegator._wrappedMethod].Property[Internal.TypeSystem.MethodDesc.Name]", "ReturnValue", "value", "dfc-generated"]
+      - ["Internal.TypeSystem", "MethodDesc", False, "GetSharedRuntimeFormMethodTarget", "()", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
       - ["Internal.TypeSystem", "MethodDesc", False, "ToString", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["Internal.TypeSystem", "MethodDesc", False, "get_ImplementationType", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["Internal.TypeSystem", "MethodDesc", True, "GetCanonMethodTarget", "(Internal.TypeSystem.CanonicalFormKind)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["Internal.TypeSystem", "MethodDesc", True, "GetCanonMethodTarget", "(Internal.TypeSystem.CanonicalFormKind)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["Internal.TypeSystem", "MethodDesc", True, "GetMethodDefinition", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["Internal.TypeSystem", "MethodDesc", True, "GetMethodDefinition", "()", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["Internal.TypeSystem", "MethodDesc", True, "GetNonRuntimeDeterminedMethodFromRuntimeDeterminedMethodViaSubstitution", "(Internal.TypeSystem.Instantiation,Internal.TypeSystem.Instantiation)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["Internal.TypeSystem", "MethodDesc", True, "GetNonRuntimeDeterminedMethodFromRuntimeDeterminedMethodViaSubstitution", "(Internal.TypeSystem.Instantiation,Internal.TypeSystem.Instantiation)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["Internal.TypeSystem", "MethodDesc", True, "GetTypicalMethodDefinition", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["Internal.TypeSystem", "MethodDesc", True, "GetTypicalMethodDefinition", "()", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["Internal.TypeSystem", "MethodDesc", True, "InstantiateSignature", "(Internal.TypeSystem.Instantiation,Internal.TypeSystem.Instantiation)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["Internal.TypeSystem", "MethodDesc", True, "InstantiateSignature", "(Internal.TypeSystem.Instantiation,Internal.TypeSystem.Instantiation)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["Internal.TypeSystem", "MethodDesc", True, "GetCanonMethodTarget", "(Internal.TypeSystem.CanonicalFormKind)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["Internal.TypeSystem", "MethodDesc", True, "GetMethodDefinition", "()", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["Internal.TypeSystem", "MethodDesc", True, "GetNonRuntimeDeterminedMethodFromRuntimeDeterminedMethodViaSubstitution", "(Internal.TypeSystem.Instantiation,Internal.TypeSystem.Instantiation)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["Internal.TypeSystem", "MethodDesc", True, "GetTypicalMethodDefinition", "()", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["Internal.TypeSystem", "MethodDesc", True, "InstantiateSignature", "(Internal.TypeSystem.Instantiation,Internal.TypeSystem.Instantiation)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
       - ["Internal.TypeSystem", "MethodDesc", True, "get_DiagnosticName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["Internal.TypeSystem", "MethodDesc", True, "get_Instantiation", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["Internal.TypeSystem", "MethodDesc", True, "get_Name", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["Internal.TypeSystem", "MethodDesc", True, "get_OwningType", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["Internal.TypeSystem", "MethodDesc", True, "get_Signature", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["Internal.TypeSystem", "MethodImplRecord", False, "MethodImplRecord", "(Internal.TypeSystem.MethodDesc,Internal.TypeSystem.MethodDesc)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["Internal.TypeSystem", "MethodImplRecord", False, "MethodImplRecord", "(Internal.TypeSystem.MethodDesc,Internal.TypeSystem.MethodDesc)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["Internal.TypeSystem", "MethodImplRecord", False, "MethodImplRecord", "(Internal.TypeSystem.MethodDesc,Internal.TypeSystem.MethodDesc)", "", "Argument[0]", "Argument[this].Field[Internal.TypeSystem.MethodImplRecord.Decl]", "value", "dfc-generated"]
+      - ["Internal.TypeSystem", "MethodImplRecord", False, "MethodImplRecord", "(Internal.TypeSystem.MethodDesc,Internal.TypeSystem.MethodDesc)", "", "Argument[1]", "Argument[this].Field[Internal.TypeSystem.MethodImplRecord.Body]", "value", "dfc-generated"]
       - ["Internal.TypeSystem", "MethodSignature+SignatureEnumerator", False, "SignatureEnumerator", "(Internal.TypeSystem.MethodSignature)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["Internal.TypeSystem", "MethodSignature+SignatureEnumerator", False, "get_Current", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["Internal.TypeSystem", "MethodSignature", False, "ApplySubstitution", "(Internal.TypeSystem.Instantiation)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["Internal.TypeSystem", "MethodSignature", False, "GetEmbeddedSignatureData", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["Internal.TypeSystem", "MethodSignature", False, "GetEmbeddedSignatureData", "(System.ReadOnlySpan<Internal.TypeSystem.EmbeddedSignatureDataKind>)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["Internal.TypeSystem", "MethodSignature", False, "ApplySubstitution", "(Internal.TypeSystem.Instantiation)", "", "Argument[0].SyntheticField[Internal.TypeSystem.Instantiation._genericParameters].Element", "ReturnValue.SyntheticField[Internal.TypeSystem.MethodSignature._parameters].Element", "value", "dfc-generated"]
+      - ["Internal.TypeSystem", "MethodSignature", False, "ApplySubstitution", "(Internal.TypeSystem.Instantiation)", "", "Argument[0].SyntheticField[Internal.TypeSystem.Instantiation._genericParameters].Element", "ReturnValue.SyntheticField[Internal.TypeSystem.MethodSignature._returnType]", "value", "dfc-generated"]
+      - ["Internal.TypeSystem", "MethodSignature", False, "GetEmbeddedSignatureData", "()", "", "Argument[this].SyntheticField[Internal.TypeSystem.MethodSignature._embeddedSignatureData].Element", "ReturnValue.Element", "value", "dfc-generated"]
+      - ["Internal.TypeSystem", "MethodSignature", False, "GetEmbeddedSignatureData", "(System.ReadOnlySpan<Internal.TypeSystem.EmbeddedSignatureDataKind>)", "", "Argument[this].SyntheticField[Internal.TypeSystem.MethodSignature._embeddedSignatureData].Element", "ReturnValue.Element", "value", "dfc-generated"]
       - ["Internal.TypeSystem", "MethodSignature", False, "GetEnumerator", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["Internal.TypeSystem", "MethodSignature", False, "MethodSignature", "(Internal.TypeSystem.MethodSignatureFlags,System.Int32,Internal.TypeSystem.TypeDesc,Internal.TypeSystem.TypeDesc[],Internal.TypeSystem.EmbeddedSignatureData[])", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
-      - ["Internal.TypeSystem", "MethodSignature", False, "MethodSignature", "(Internal.TypeSystem.MethodSignatureFlags,System.Int32,Internal.TypeSystem.TypeDesc,Internal.TypeSystem.TypeDesc[],Internal.TypeSystem.EmbeddedSignatureData[])", "", "Argument[3].Element", "Argument[this]", "taint", "df-generated"]
-      - ["Internal.TypeSystem", "MethodSignature", False, "MethodSignature", "(Internal.TypeSystem.MethodSignatureFlags,System.Int32,Internal.TypeSystem.TypeDesc,Internal.TypeSystem.TypeDesc[],Internal.TypeSystem.EmbeddedSignatureData[])", "", "Argument[4].Element", "Argument[this]", "taint", "df-generated"]
-      - ["Internal.TypeSystem", "MethodSignature", False, "ToString", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["Internal.TypeSystem", "MethodSignature", False, "ToString", "(System.Boolean)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["Internal.TypeSystem", "MethodSignature", False, "get_Parameter", "(System.Int32)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["Internal.TypeSystem", "MethodSignature", False, "get_ReturnType", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["Internal.TypeSystem", "MethodSignature", False, "MethodSignature", "(Internal.TypeSystem.MethodSignatureFlags,System.Int32,Internal.TypeSystem.TypeDesc,Internal.TypeSystem.TypeDesc[],Internal.TypeSystem.EmbeddedSignatureData[])", "", "Argument[2]", "Argument[this].SyntheticField[Internal.TypeSystem.MethodSignature._returnType]", "value", "dfc-generated"]
+      - ["Internal.TypeSystem", "MethodSignature", False, "MethodSignature", "(Internal.TypeSystem.MethodSignatureFlags,System.Int32,Internal.TypeSystem.TypeDesc,Internal.TypeSystem.TypeDesc[],Internal.TypeSystem.EmbeddedSignatureData[])", "", "Argument[3]", "Argument[this].SyntheticField[Internal.TypeSystem.MethodSignature._parameters]", "value", "dfc-generated"]
+      - ["Internal.TypeSystem", "MethodSignature", False, "MethodSignature", "(Internal.TypeSystem.MethodSignatureFlags,System.Int32,Internal.TypeSystem.TypeDesc,Internal.TypeSystem.TypeDesc[],Internal.TypeSystem.EmbeddedSignatureData[])", "", "Argument[4]", "Argument[this].SyntheticField[Internal.TypeSystem.MethodSignature._embeddedSignatureData]", "value", "dfc-generated"]
+      - ["Internal.TypeSystem", "MethodSignature", False, "ToString", "()", "", "Argument[this].Property[Internal.TypeSystem.MethodSignature.ReturnType].Property[Internal.TypeSystem.GenericParameterDesc.DiagnosticName]", "ReturnValue", "taint", "dfc-generated"]
+      - ["Internal.TypeSystem", "MethodSignature", False, "ToString", "()", "", "Argument[this].SyntheticField[Internal.TypeSystem.MethodSignature._returnType].Property[Internal.TypeSystem.GenericParameterDesc.DiagnosticName]", "ReturnValue", "taint", "dfc-generated"]
+      - ["Internal.TypeSystem", "MethodSignature", False, "ToString", "(System.Boolean)", "", "Argument[this].Property[Internal.TypeSystem.MethodSignature.ReturnType].Property[Internal.TypeSystem.GenericParameterDesc.DiagnosticName]", "ReturnValue", "taint", "dfc-generated"]
+      - ["Internal.TypeSystem", "MethodSignature", False, "ToString", "(System.Boolean)", "", "Argument[this].SyntheticField[Internal.TypeSystem.MethodSignature._returnType].Property[Internal.TypeSystem.GenericParameterDesc.DiagnosticName]", "ReturnValue", "taint", "dfc-generated"]
+      - ["Internal.TypeSystem", "MethodSignature", False, "get_Context", "()", "", "Argument[this].SyntheticField[Internal.TypeSystem.MethodSignature._returnType].Property[Internal.TypeSystem.TypeSystemEntity.Context]", "ReturnValue", "value", "dfc-generated"]
+      - ["Internal.TypeSystem", "MethodSignature", False, "get_Parameter", "(System.Int32)", "", "Argument[this].SyntheticField[Internal.TypeSystem.MethodSignature._parameters].Element", "ReturnValue", "value", "dfc-generated"]
+      - ["Internal.TypeSystem", "MethodSignature", False, "get_ReturnType", "()", "", "Argument[this].SyntheticField[Internal.TypeSystem.MethodSignature._returnType]", "ReturnValue", "value", "dfc-generated"]
       - ["Internal.TypeSystem", "MethodSignatureBuilder", False, "MethodSignatureBuilder", "(Internal.TypeSystem.MethodSignature)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["Internal.TypeSystem", "MethodSignatureBuilder", False, "SetEmbeddedSignatureData", "(Internal.TypeSystem.EmbeddedSignatureData[])", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
       - ["Internal.TypeSystem", "MethodSignatureBuilder", False, "ToSignature", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
@@ -144,17 +151,16 @@ extensions:
       - ["Internal.TypeSystem", "ModuleDesc", True, "GetType", "(System.String,System.String,Internal.TypeSystem.NotFoundBehavior)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["Internal.TypeSystem", "ModuleDesc", True, "GetType", "(System.String,System.String,Internal.TypeSystem.NotFoundBehavior)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
       - ["Internal.TypeSystem", "ModuleDesc", True, "GetType", "(System.String,System.String,Internal.TypeSystem.NotFoundBehavior)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["Internal.TypeSystem", "PInvokeMetadata", False, "PInvokeMetadata", "(System.String,System.String,Internal.TypeSystem.PInvokeAttributes)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["Internal.TypeSystem", "PInvokeMetadata", False, "PInvokeMetadata", "(System.String,System.String,Internal.TypeSystem.PInvokeAttributes)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["Internal.TypeSystem", "PInvokeMetadata", False, "PInvokeMetadata", "(System.String,System.String,Internal.TypeSystem.PInvokeFlags)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["Internal.TypeSystem", "PInvokeMetadata", False, "PInvokeMetadata", "(System.String,System.String,Internal.TypeSystem.PInvokeFlags)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["Internal.TypeSystem", "PInvokeMetadata", False, "PInvokeMetadata", "(System.String,System.String,Internal.TypeSystem.PInvokeFlags)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
-      - ["Internal.TypeSystem", "ParameterMetadata", False, "ParameterMetadata", "(System.Int32,Internal.TypeSystem.ParameterMetadataAttributes,Internal.TypeSystem.MarshalAsDescriptor)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
+      - ["Internal.TypeSystem", "PInvokeMetadata", False, "PInvokeMetadata", "(System.String,System.String,Internal.TypeSystem.PInvokeAttributes)", "", "Argument[0]", "Argument[this].Field[Internal.TypeSystem.PInvokeMetadata.Module]", "value", "dfc-generated"]
+      - ["Internal.TypeSystem", "PInvokeMetadata", False, "PInvokeMetadata", "(System.String,System.String,Internal.TypeSystem.PInvokeAttributes)", "", "Argument[1]", "Argument[this].Field[Internal.TypeSystem.PInvokeMetadata.Name]", "value", "dfc-generated"]
+      - ["Internal.TypeSystem", "PInvokeMetadata", False, "PInvokeMetadata", "(System.String,System.String,Internal.TypeSystem.PInvokeFlags)", "", "Argument[0]", "Argument[this].Field[Internal.TypeSystem.PInvokeMetadata.Module]", "value", "dfc-generated"]
+      - ["Internal.TypeSystem", "PInvokeMetadata", False, "PInvokeMetadata", "(System.String,System.String,Internal.TypeSystem.PInvokeFlags)", "", "Argument[1]", "Argument[this].Field[Internal.TypeSystem.PInvokeMetadata.Name]", "value", "dfc-generated"]
+      - ["Internal.TypeSystem", "PInvokeMetadata", False, "PInvokeMetadata", "(System.String,System.String,Internal.TypeSystem.PInvokeFlags)", "", "Argument[2]", "Argument[this].Field[Internal.TypeSystem.PInvokeMetadata.Flags]", "value", "dfc-generated"]
+      - ["Internal.TypeSystem", "ParameterMetadata", False, "ParameterMetadata", "(System.Int32,Internal.TypeSystem.ParameterMetadataAttributes,Internal.TypeSystem.MarshalAsDescriptor)", "", "Argument[2]", "Argument[this].Field[Internal.TypeSystem.ParameterMetadata.MarshalAsDescriptor]", "value", "dfc-generated"]
       - ["Internal.TypeSystem", "ParameterizedType", False, "get_ParameterType", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["Internal.TypeSystem", "PropertySignature", False, "PropertySignature", "(System.Boolean,Internal.TypeSystem.TypeDesc[],Internal.TypeSystem.TypeDesc,Internal.TypeSystem.EmbeddedSignatureData[])", "", "Argument[1].Element", "Argument[this]", "taint", "df-generated"]
-      - ["Internal.TypeSystem", "PropertySignature", False, "PropertySignature", "(System.Boolean,Internal.TypeSystem.TypeDesc[],Internal.TypeSystem.TypeDesc,Internal.TypeSystem.EmbeddedSignatureData[])", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
-      - ["Internal.TypeSystem", "PropertySignature", False, "PropertySignature", "(System.Boolean,Internal.TypeSystem.TypeDesc[],Internal.TypeSystem.TypeDesc,Internal.TypeSystem.EmbeddedSignatureData[])", "", "Argument[3].Element", "Argument[this]", "taint", "df-generated"]
-      - ["Internal.TypeSystem", "PropertySignature", False, "get_Parameter", "(System.Int32)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["Internal.TypeSystem", "PropertySignature", False, "PropertySignature", "(System.Boolean,Internal.TypeSystem.TypeDesc[],Internal.TypeSystem.TypeDesc,Internal.TypeSystem.EmbeddedSignatureData[])", "", "Argument[1]", "Argument[this].SyntheticField[Internal.TypeSystem.PropertySignature._parameters]", "value", "dfc-generated"]
+      - ["Internal.TypeSystem", "PropertySignature", False, "PropertySignature", "(System.Boolean,Internal.TypeSystem.TypeDesc[],Internal.TypeSystem.TypeDesc,Internal.TypeSystem.EmbeddedSignatureData[])", "", "Argument[2]", "Argument[this].Field[Internal.TypeSystem.PropertySignature.ReturnType]", "value", "dfc-generated"]
+      - ["Internal.TypeSystem", "PropertySignature", False, "get_Parameter", "(System.Int32)", "", "Argument[this].SyntheticField[Internal.TypeSystem.PropertySignature._parameters].Element", "ReturnValue", "value", "dfc-generated"]
       - ["Internal.TypeSystem", "ResolutionFailure", False, "GetAssemblyResolutionFailure", "(System.String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["Internal.TypeSystem", "ResolutionFailure", False, "GetMissingFieldFailure", "(Internal.TypeSystem.TypeDesc,System.String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["Internal.TypeSystem", "ResolutionFailure", False, "GetMissingFieldFailure", "(Internal.TypeSystem.TypeDesc,System.String)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
@@ -169,53 +175,51 @@ extensions:
       - ["Internal.TypeSystem", "ResolutionFailure", False, "GetTypeLoadResolutionFailure", "(System.String,System.String,System.String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["Internal.TypeSystem", "ResolutionFailure", False, "GetTypeLoadResolutionFailure", "(System.String,System.String,System.String)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
       - ["Internal.TypeSystem", "ResolutionFailure", False, "GetTypeLoadResolutionFailure", "(System.String,System.String,System.String)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
-      - ["Internal.TypeSystem", "RuntimeDeterminedCanonicalizationAlgorithm", False, "ConvertInstantiationToCanonForm", "(Internal.TypeSystem.Instantiation,Internal.TypeSystem.CanonicalFormKind,System.Boolean)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["Internal.TypeSystem", "RuntimeDeterminedCanonicalizationAlgorithm", False, "ConvertInstantiationToCanonForm", "(Internal.TypeSystem.Instantiation,Internal.TypeSystem.CanonicalFormKind,System.Boolean)", "", "Argument[0].SyntheticField[Internal.TypeSystem.Instantiation._genericParameters].Element", "ReturnValue.SyntheticField[Internal.TypeSystem.Instantiation._genericParameters].Element", "value", "dfc-generated"]
+      - ["Internal.TypeSystem", "RuntimeDeterminedCanonicalizationAlgorithm", False, "ConvertInstantiationToCanonForm", "(Internal.TypeSystem.Instantiation,Internal.TypeSystem.CanonicalFormKind,System.Boolean)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
       - ["Internal.TypeSystem", "RuntimeDeterminedCanonicalizationAlgorithm", False, "ConvertToCanon", "(Internal.TypeSystem.TypeDesc,Internal.TypeSystem.CanonicalFormKind)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["Internal.TypeSystem", "RuntimeDeterminedType", False, "RuntimeDeterminedType", "(Internal.TypeSystem.DefType,Internal.TypeSystem.GenericParameterDesc)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["Internal.TypeSystem", "RuntimeDeterminedType", False, "RuntimeDeterminedType", "(Internal.TypeSystem.DefType,Internal.TypeSystem.GenericParameterDesc)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["Internal.TypeSystem", "RuntimeDeterminedType", False, "get_CanonicalType", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["Internal.TypeSystem", "RuntimeDeterminedType", False, "get_RuntimeDeterminedDetailsType", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["Internal.TypeSystem", "RuntimeDeterminedType", False, "GetNonRuntimeDeterminedTypeFromRuntimeDeterminedSubtypeViaSubstitution", "(Internal.TypeSystem.Instantiation,Internal.TypeSystem.Instantiation)", "", "Argument[0].SyntheticField[Internal.TypeSystem.Instantiation._genericParameters].Element", "ReturnValue", "value", "dfc-generated"]
+      - ["Internal.TypeSystem", "RuntimeDeterminedType", False, "GetNonRuntimeDeterminedTypeFromRuntimeDeterminedSubtypeViaSubstitution", "(Internal.TypeSystem.Instantiation,Internal.TypeSystem.Instantiation)", "", "Argument[1].SyntheticField[Internal.TypeSystem.Instantiation._genericParameters].Element", "ReturnValue", "value", "dfc-generated"]
+      - ["Internal.TypeSystem", "RuntimeDeterminedType", False, "RuntimeDeterminedType", "(Internal.TypeSystem.DefType,Internal.TypeSystem.GenericParameterDesc)", "", "Argument[0]", "Argument[this].SyntheticField[Internal.TypeSystem.RuntimeDeterminedType._rawCanonType]", "value", "dfc-generated"]
+      - ["Internal.TypeSystem", "RuntimeDeterminedType", False, "RuntimeDeterminedType", "(Internal.TypeSystem.DefType,Internal.TypeSystem.GenericParameterDesc)", "", "Argument[1]", "Argument[this].SyntheticField[Internal.TypeSystem.RuntimeDeterminedType._runtimeDeterminedDetailsType]", "value", "dfc-generated"]
+      - ["Internal.TypeSystem", "RuntimeDeterminedType", False, "get_CanonicalType", "()", "", "Argument[this].SyntheticField[Internal.TypeSystem.RuntimeDeterminedType._rawCanonType]", "ReturnValue", "value", "dfc-generated"]
+      - ["Internal.TypeSystem", "RuntimeDeterminedType", False, "get_Context", "()", "", "Argument[this].SyntheticField[Internal.TypeSystem.RuntimeDeterminedType._rawCanonType].Property[Internal.TypeSystem.TypeSystemEntity.Context]", "ReturnValue", "value", "dfc-generated"]
+      - ["Internal.TypeSystem", "RuntimeDeterminedType", False, "get_Instantiation", "()", "", "Argument[this].SyntheticField[Internal.TypeSystem.RuntimeDeterminedType._rawCanonType].Property[Internal.TypeSystem.TypeDesc.Instantiation]", "ReturnValue", "value", "dfc-generated"]
+      - ["Internal.TypeSystem", "RuntimeDeterminedType", False, "get_Name", "()", "", "Argument[this].SyntheticField[Internal.TypeSystem.RuntimeDeterminedType._rawCanonType].Property[Internal.TypeSystem.DefType.Name]", "ReturnValue", "value", "dfc-generated"]
+      - ["Internal.TypeSystem", "RuntimeDeterminedType", False, "get_RuntimeDeterminedDetailsType", "()", "", "Argument[this].SyntheticField[Internal.TypeSystem.RuntimeDeterminedType._runtimeDeterminedDetailsType]", "ReturnValue", "value", "dfc-generated"]
       - ["Internal.TypeSystem", "RuntimeInterfacesAlgorithm", True, "ComputeRuntimeInterfaces", "(Internal.TypeSystem.TypeDesc)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["Internal.TypeSystem", "SignatureMethodVariable", False, "InstantiateSignature", "(Internal.TypeSystem.Instantiation,Internal.TypeSystem.Instantiation)", "", "Argument[1].SyntheticField[Internal.TypeSystem.Instantiation._genericParameters].Element", "ReturnValue", "value", "dfc-generated"]
+      - ["Internal.TypeSystem", "SignatureTypeVariable", False, "InstantiateSignature", "(Internal.TypeSystem.Instantiation,Internal.TypeSystem.Instantiation)", "", "Argument[0].SyntheticField[Internal.TypeSystem.Instantiation._genericParameters].Element", "ReturnValue", "value", "dfc-generated"]
       - ["Internal.TypeSystem", "SimpleArrayOfTRuntimeInterfacesAlgorithm", False, "SimpleArrayOfTRuntimeInterfacesAlgorithm", "(Internal.TypeSystem.ModuleDesc)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["Internal.TypeSystem", "StandardCanonicalizationAlgorithm", False, "ConvertInstantiationToCanonForm", "(Internal.TypeSystem.Instantiation,Internal.TypeSystem.CanonicalFormKind,System.Boolean)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["Internal.TypeSystem", "StandardCanonicalizationAlgorithm", False, "ConvertInstantiationToCanonForm", "(Internal.TypeSystem.Instantiation,Internal.TypeSystem.CanonicalFormKind,System.Boolean)", "", "Argument[0].SyntheticField[Internal.TypeSystem.Instantiation._genericParameters].Element", "ReturnValue.SyntheticField[Internal.TypeSystem.Instantiation._genericParameters].Element", "value", "dfc-generated"]
+      - ["Internal.TypeSystem", "StandardCanonicalizationAlgorithm", False, "ConvertInstantiationToCanonForm", "(Internal.TypeSystem.Instantiation,Internal.TypeSystem.CanonicalFormKind,System.Boolean)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
       - ["Internal.TypeSystem", "StandardCanonicalizationAlgorithm", False, "ConvertToCanon", "(Internal.TypeSystem.TypeDesc,Internal.TypeSystem.CanonicalFormKind)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["Internal.TypeSystem", "TypeDesc", False, "ConvertToCanonForm", "(Internal.TypeSystem.CanonicalFormKind)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["Internal.TypeSystem", "TypeDesc", False, "GetMethod", "(System.String,Internal.TypeSystem.MethodSignature)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["Internal.TypeSystem", "TypeDesc", False, "get_RuntimeInterfaces", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["Internal.TypeSystem", "TypeDesc", True, "ConvertToCanonFormImpl", "(Internal.TypeSystem.CanonicalFormKind)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["Internal.TypeSystem", "TypeDesc", True, "ConvertToCanonFormImpl", "(Internal.TypeSystem.CanonicalFormKind)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["Internal.TypeSystem", "TypeDesc", True, "GetDefaultConstructor", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["Internal.TypeSystem", "TypeDesc", True, "ConvertToCanonFormImpl", "(Internal.TypeSystem.CanonicalFormKind)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
       - ["Internal.TypeSystem", "TypeDesc", True, "GetField", "(System.String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["Internal.TypeSystem", "TypeDesc", True, "GetFields", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["Internal.TypeSystem", "TypeDesc", True, "GetFinalizer", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["Internal.TypeSystem", "TypeDesc", True, "GetMethod", "(System.String,Internal.TypeSystem.MethodSignature,Internal.TypeSystem.Instantiation)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["Internal.TypeSystem", "TypeDesc", True, "GetMethodWithEquivalentSignature", "(System.String,Internal.TypeSystem.MethodSignature,Internal.TypeSystem.Instantiation)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["Internal.TypeSystem", "TypeDesc", True, "GetMethods", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["Internal.TypeSystem", "TypeDesc", True, "GetNonRuntimeDeterminedTypeFromRuntimeDeterminedSubtypeViaSubstitution", "(Internal.TypeSystem.Instantiation,Internal.TypeSystem.Instantiation)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["Internal.TypeSystem", "TypeDesc", True, "GetNonRuntimeDeterminedTypeFromRuntimeDeterminedSubtypeViaSubstitution", "(Internal.TypeSystem.Instantiation,Internal.TypeSystem.Instantiation)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["Internal.TypeSystem", "TypeDesc", True, "GetNonRuntimeDeterminedTypeFromRuntimeDeterminedSubtypeViaSubstitution", "(Internal.TypeSystem.Instantiation,Internal.TypeSystem.Instantiation)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["Internal.TypeSystem", "TypeDesc", True, "GetNonRuntimeDeterminedTypeFromRuntimeDeterminedSubtypeViaSubstitution", "(Internal.TypeSystem.Instantiation,Internal.TypeSystem.Instantiation)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["Internal.TypeSystem", "TypeDesc", True, "GetStaticConstructor", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["Internal.TypeSystem", "TypeDesc", True, "GetTypeDefinition", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["Internal.TypeSystem", "TypeDesc", True, "GetTypeDefinition", "()", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["Internal.TypeSystem", "TypeDesc", True, "GetNonRuntimeDeterminedTypeFromRuntimeDeterminedSubtypeViaSubstitution", "(Internal.TypeSystem.Instantiation,Internal.TypeSystem.Instantiation)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["Internal.TypeSystem", "TypeDesc", True, "GetTypeDefinition", "()", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
       - ["Internal.TypeSystem", "TypeDesc", True, "GetVirtualMethods", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["Internal.TypeSystem", "TypeDesc", True, "InstantiateSignature", "(Internal.TypeSystem.Instantiation,Internal.TypeSystem.Instantiation)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["Internal.TypeSystem", "TypeDesc", True, "InstantiateSignature", "(Internal.TypeSystem.Instantiation,Internal.TypeSystem.Instantiation)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["Internal.TypeSystem", "TypeDesc", True, "InstantiateSignature", "(Internal.TypeSystem.Instantiation,Internal.TypeSystem.Instantiation)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["Internal.TypeSystem", "TypeDesc", True, "InstantiateSignature", "(Internal.TypeSystem.Instantiation,Internal.TypeSystem.Instantiation)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["Internal.TypeSystem", "TypeDesc", True, "InstantiateSignature", "(Internal.TypeSystem.Instantiation,Internal.TypeSystem.Instantiation)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
       - ["Internal.TypeSystem", "TypeDesc", True, "get_BaseType", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["Internal.TypeSystem", "TypeDesc", True, "get_Instantiation", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["Internal.TypeSystem", "TypeDesc", True, "get_TypeIdentifierData", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["Internal.TypeSystem", "TypeDesc", True, "get_UnderlyingType", "()", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["Internal.TypeSystem", "TypeIdentifierData", False, "TypeIdentifierData", "(System.String,System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["Internal.TypeSystem", "TypeIdentifierData", False, "TypeIdentifierData", "(System.String,System.String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["Internal.TypeSystem", "TypeDesc", True, "get_UnderlyingType", "()", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["Internal.TypeSystem", "TypeIdentifierData", False, "TypeIdentifierData", "(System.String,System.String)", "", "Argument[0]", "Argument[this].Property[Internal.TypeSystem.TypeIdentifierData.Scope]", "value", "dfc-generated"]
+      - ["Internal.TypeSystem", "TypeIdentifierData", False, "TypeIdentifierData", "(System.String,System.String)", "", "Argument[1]", "Argument[this].Property[Internal.TypeSystem.TypeIdentifierData.Name]", "value", "dfc-generated"]
       - ["Internal.TypeSystem", "TypeNameFormatter", False, "AppendName", "(System.Text.StringBuilder,Internal.TypeSystem.DefType)", "", "Argument[1]", "Argument[0]", "taint", "df-generated"]
       - ["Internal.TypeSystem", "TypeNameFormatter", False, "AppendName", "(System.Text.StringBuilder,Internal.TypeSystem.TypeDesc)", "", "Argument[1]", "Argument[0]", "taint", "df-generated"]
       - ["Internal.TypeSystem", "TypeNameFormatter", False, "FormatName", "(Internal.TypeSystem.TypeDesc)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["Internal.TypeSystem", "TypeNameFormatter", True, "AppendName", "(System.Text.StringBuilder,Internal.TypeSystem.ArrayType)", "", "Argument[1]", "Argument[0]", "taint", "df-generated"]
       - ["Internal.TypeSystem", "TypeNameFormatter", True, "AppendName", "(System.Text.StringBuilder,Internal.TypeSystem.ByRefType)", "", "Argument[1]", "Argument[0]", "taint", "df-generated"]
       - ["Internal.TypeSystem", "TypeNameFormatter", True, "AppendName", "(System.Text.StringBuilder,Internal.TypeSystem.FunctionPointerType)", "", "Argument[1]", "Argument[0]", "taint", "df-generated"]
-      - ["Internal.TypeSystem", "TypeNameFormatter", True, "AppendName", "(System.Text.StringBuilder,Internal.TypeSystem.GenericParameterDesc)", "", "Argument[1]", "Argument[0]", "taint", "df-generated"]
       - ["Internal.TypeSystem", "TypeNameFormatter", True, "AppendName", "(System.Text.StringBuilder,Internal.TypeSystem.PointerType)", "", "Argument[1]", "Argument[0]", "taint", "df-generated"]
       - ["Internal.TypeSystem", "TypeNameFormatter", True, "AppendNameForInstantiatedType", "(System.Text.StringBuilder,Internal.TypeSystem.DefType)", "", "Argument[1]", "Argument[0]", "taint", "df-generated"]
       - ["Internal.TypeSystem", "TypeNameFormatter", True, "AppendNameForNamespaceType", "(System.Text.StringBuilder,Internal.TypeSystem.DefType)", "", "Argument[1]", "Argument[0]", "taint", "df-generated"]
@@ -225,7 +229,7 @@ extensions:
       - ["Internal.TypeSystem", "TypeNameFormatter<TState,TOptions>", False, "AppendName", "(System.Text.StringBuilder,Internal.TypeSystem.DefType,TOptions)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
       - ["Internal.TypeSystem", "TypeNameFormatter<TState,TOptions>", False, "AppendName", "(System.Text.StringBuilder,Internal.TypeSystem.TypeDesc,TOptions)", "", "Argument[1]", "Argument[0]", "taint", "df-generated"]
       - ["Internal.TypeSystem", "TypeNameFormatter<TState,TOptions>", True, "GetContainingType", "(Internal.TypeSystem.DefType,TOptions)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["Internal.TypeSystem", "TypeSystemContext+FunctionPointerHashtable", True, "CreateValueFromKey", "(Internal.TypeSystem.MethodSignature)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["Internal.TypeSystem", "TypeSystemContext+FunctionPointerHashtable", True, "CreateValueFromKey", "(Internal.TypeSystem.MethodSignature)", "", "Argument[0]", "ReturnValue.SyntheticField[Internal.TypeSystem.FunctionPointerType._signature]", "value", "dfc-generated"]
       - ["Internal.TypeSystem", "TypeSystemContext", False, "GetArrayType", "(Internal.TypeSystem.TypeDesc)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["Internal.TypeSystem", "TypeSystemContext", False, "GetArrayType", "(Internal.TypeSystem.TypeDesc,System.Int32)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["Internal.TypeSystem", "TypeSystemContext", False, "GetByRefType", "(Internal.TypeSystem.TypeDesc)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
@@ -239,8 +243,8 @@ extensions:
       - ["Internal.TypeSystem", "TypeSystemContext", False, "GetPointerType", "(Internal.TypeSystem.TypeDesc)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["Internal.TypeSystem", "TypeSystemContext", False, "GetRuntimeDeterminedType", "(Internal.TypeSystem.DefType,Internal.TypeSystem.GenericParameterDesc)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["Internal.TypeSystem", "TypeSystemContext", False, "GetSignatureVariable", "(System.Int32,System.Boolean)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["Internal.TypeSystem", "TypeSystemContext", False, "InitializeSystemModule", "(Internal.TypeSystem.ModuleDesc)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["Internal.TypeSystem", "TypeSystemContext", False, "TypeSystemContext", "(Internal.TypeSystem.TargetDetails)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["Internal.TypeSystem", "TypeSystemContext", False, "InitializeSystemModule", "(Internal.TypeSystem.ModuleDesc)", "", "Argument[0]", "Argument[this].Property[Internal.TypeSystem.TypeSystemContext.SystemModule]", "value", "dfc-generated"]
+      - ["Internal.TypeSystem", "TypeSystemContext", False, "TypeSystemContext", "(Internal.TypeSystem.TargetDetails)", "", "Argument[0]", "Argument[this].Property[Internal.TypeSystem.TypeSystemContext.Target]", "value", "dfc-generated"]
       - ["Internal.TypeSystem", "TypeSystemContext", False, "get_CanonType", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["Internal.TypeSystem", "TypeSystemContext", False, "get_UniversalCanonType", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["Internal.TypeSystem", "TypeSystemContext", True, "GetAllMethods", "(Internal.TypeSystem.TypeDesc)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
@@ -254,23 +258,23 @@ extensions:
       - ["Internal.TypeSystem", "TypeSystemHelpers", False, "FindVirtualFunctionTargetMethodOnObjectType", "(Internal.TypeSystem.TypeDesc,Internal.TypeSystem.MethodDesc)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["Internal.TypeSystem", "TypeSystemHelpers", False, "GetAllMethods", "(Internal.TypeSystem.TypeDesc)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["Internal.TypeSystem", "TypeSystemHelpers", False, "GetAllVirtualMethods", "(Internal.TypeSystem.TypeDesc)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["Internal.TypeSystem", "TypeSystemHelpers", False, "GetElementSize", "(Internal.TypeSystem.TypeDesc)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["Internal.TypeSystem", "TypeSystemHelpers", False, "GetElementSize", "(Internal.TypeSystem.TypeDesc)", "", "Argument[0].Property[Internal.TypeSystem.DefType.InstanceFieldSize]", "ReturnValue", "value", "dfc-generated"]
       - ["Internal.TypeSystem", "TypeSystemHelpers", False, "GetFullName", "(Internal.TypeSystem.DefType)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["Internal.TypeSystem", "TypeSystemHelpers", False, "GetParameterType", "(Internal.TypeSystem.TypeDesc)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["Internal.TypeSystem", "TypeSystemHelpers", False, "GetParameterType", "(Internal.TypeSystem.TypeDesc)", "", "Argument[0].Property[Internal.TypeSystem.ParameterizedType.ParameterType]", "ReturnValue", "value", "dfc-generated"]
       - ["Internal.TypeSystem", "TypeSystemHelpers", False, "GetParameterlessConstructor", "(Internal.TypeSystem.TypeDesc)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["Internal.TypeSystem", "TypeSystemHelpers", False, "InstantiateAsOpen", "(Internal.TypeSystem.FieldDesc)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["Internal.TypeSystem", "TypeSystemHelpers", False, "InstantiateAsOpen", "(Internal.TypeSystem.MethodDesc)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["Internal.TypeSystem", "TypeSystemHelpers", False, "InstantiateAsOpen", "(Internal.TypeSystem.TypeDesc)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["Internal.TypeSystem", "TypeSystemHelpers", False, "InstantiateAsOpen", "(Internal.TypeSystem.FieldDesc)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Internal.TypeSystem", "TypeSystemHelpers", False, "InstantiateAsOpen", "(Internal.TypeSystem.MethodDesc)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Internal.TypeSystem", "TypeSystemHelpers", False, "InstantiateAsOpen", "(Internal.TypeSystem.TypeDesc)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
       - ["Internal.TypeSystem", "TypeSystemHelpers", False, "ResolveInterfaceMethodTarget", "(Internal.TypeSystem.TypeDesc,Internal.TypeSystem.MethodDesc)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["Internal.TypeSystem", "TypeSystemHelpers", False, "ResolveInterfaceMethodTargetWithVariance", "(Internal.TypeSystem.TypeDesc,Internal.TypeSystem.MethodDesc)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["Internal.TypeSystem", "TypeSystemHelpers", False, "ResolveInterfaceMethodToDefaultImplementationOnType", "(Internal.TypeSystem.TypeDesc,Internal.TypeSystem.MethodDesc,Internal.TypeSystem.MethodDesc)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["Internal.TypeSystem", "TypeSystemHelpers", False, "ResolveInterfaceMethodToDefaultImplementationOnType", "(Internal.TypeSystem.TypeDesc,Internal.TypeSystem.MethodDesc,Internal.TypeSystem.MethodDesc)", "", "Argument[1]", "ReturnValue", "value", "dfc-generated"]
       - ["Internal.TypeSystem", "TypeSystemHelpers", False, "ResolveInterfaceMethodToVirtualMethodOnType", "(Internal.TypeSystem.TypeDesc,Internal.TypeSystem.MethodDesc)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["Internal.TypeSystem", "TypeSystemHelpers", False, "ResolveVariantInterfaceMethodToDefaultImplementationOnType", "(Internal.TypeSystem.TypeDesc,Internal.TypeSystem.MethodDesc,Internal.TypeSystem.MethodDesc)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["Internal.TypeSystem", "TypeSystemHelpers", False, "ResolveVariantInterfaceMethodToDefaultImplementationOnType", "(Internal.TypeSystem.TypeDesc,Internal.TypeSystem.MethodDesc,Internal.TypeSystem.MethodDesc)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
       - ["Internal.TypeSystem", "TypeSystemHelpers", False, "ResolveVariantInterfaceMethodToVirtualMethodOnType", "(Internal.TypeSystem.TypeDesc,Internal.TypeSystem.MethodDesc)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["Internal.TypeSystem", "VirtualMethodAlgorithm", True, "ComputeAllVirtualSlots", "(Internal.TypeSystem.TypeDesc)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["Internal.TypeSystem", "VirtualMethodAlgorithm", True, "FindVirtualFunctionTargetMethodOnObjectType", "(Internal.TypeSystem.MethodDesc,Internal.TypeSystem.TypeDesc)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["Internal.TypeSystem", "VirtualMethodAlgorithm", True, "ResolveInterfaceMethodToDefaultImplementationOnType", "(Internal.TypeSystem.MethodDesc,Internal.TypeSystem.TypeDesc,Internal.TypeSystem.MethodDesc)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["Internal.TypeSystem", "VirtualMethodAlgorithm", True, "ResolveInterfaceMethodToDefaultImplementationOnType", "(Internal.TypeSystem.MethodDesc,Internal.TypeSystem.TypeDesc,Internal.TypeSystem.MethodDesc)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
       - ["Internal.TypeSystem", "VirtualMethodAlgorithm", True, "ResolveInterfaceMethodToVirtualMethodOnType", "(Internal.TypeSystem.MethodDesc,Internal.TypeSystem.TypeDesc)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
       - ["Internal.TypeSystem", "VirtualMethodAlgorithm", True, "ResolveVariantInterfaceMethodToDefaultImplementationOnType", "(Internal.TypeSystem.MethodDesc,Internal.TypeSystem.TypeDesc,Internal.TypeSystem.MethodDesc)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["Internal.TypeSystem", "VirtualMethodAlgorithm", True, "ResolveVariantInterfaceMethodToDefaultImplementationOnType", "(Internal.TypeSystem.MethodDesc,Internal.TypeSystem.TypeDesc,Internal.TypeSystem.MethodDesc)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
@@ -328,6 +332,7 @@ extensions:
       - ["Internal.TypeSystem", "CustomAttributeTypeNameFormatter", "AppendName", "(System.Text.StringBuilder,Internal.TypeSystem.SignatureMethodVariable,System.Boolean)", "summary", "df-generated"]
       - ["Internal.TypeSystem", "CustomAttributeTypeNameFormatter", "AppendName", "(System.Text.StringBuilder,Internal.TypeSystem.SignatureTypeVariable,System.Boolean)", "summary", "df-generated"]
       - ["Internal.TypeSystem", "CustomAttributeTypeNameFormatter", "AppendNameForInstantiatedType", "(System.Text.StringBuilder,Internal.TypeSystem.DefType,System.Boolean)", "summary", "df-generated"]
+      - ["Internal.TypeSystem", "CustomAttributeTypeNameParser", "GetTypeByCustomAttributeTypeName", "(Internal.TypeSystem.ModuleDesc,System.String,System.Boolean,System.Func<Internal.TypeSystem.ModuleDesc,System.String,Internal.TypeSystem.MetadataType>)", "summary", "df-generated"]
       - ["Internal.TypeSystem", "DebugNameFormatter+Void", "get_Value", "()", "summary", "df-generated"]
       - ["Internal.TypeSystem", "DebugNameFormatter", "AppendName", "(System.Text.StringBuilder,Internal.TypeSystem.SignatureMethodVariable,Internal.TypeSystem.DebugNameFormatter+FormatOptions)", "summary", "df-generated"]
       - ["Internal.TypeSystem", "DebugNameFormatter", "AppendName", "(System.Text.StringBuilder,Internal.TypeSystem.SignatureTypeVariable,Internal.TypeSystem.DebugNameFormatter+FormatOptions)", "summary", "df-generated"]
@@ -427,6 +432,7 @@ extensions:
       - ["Internal.TypeSystem", "GenericParameterDesc", "GetHashCode", "()", "summary", "df-generated"]
       - ["Internal.TypeSystem", "GenericParameterDesc", "IsCanonicalSubtype", "(Internal.TypeSystem.CanonicalFormKind)", "summary", "df-generated"]
       - ["Internal.TypeSystem", "GenericParameterDesc", "get_Constraints", "()", "summary", "df-generated"]
+      - ["Internal.TypeSystem", "GenericParameterDesc", "get_DiagnosticName", "()", "summary", "df-generated"]
       - ["Internal.TypeSystem", "GenericParameterDesc", "get_HasAcceptByRefLikeConstraint", "()", "summary", "df-generated"]
       - ["Internal.TypeSystem", "GenericParameterDesc", "get_HasDefaultConstructorConstraint", "()", "summary", "df-generated"]
       - ["Internal.TypeSystem", "GenericParameterDesc", "get_HasNotNullableValueTypeConstraint", "()", "summary", "df-generated"]
@@ -440,6 +446,7 @@ extensions:
       - ["Internal.TypeSystem", "GenericParameterDesc", "get_TypeConstraints", "()", "summary", "df-generated"]
       - ["Internal.TypeSystem", "GenericParameterDesc", "get_Variance", "()", "summary", "df-generated"]
       - ["Internal.TypeSystem", "IModuleResolver", "ResolveModule", "(Internal.TypeSystem.IAssemblyDesc,System.String,System.Boolean)", "summary", "df-generated"]
+      - ["Internal.TypeSystem", "IPrefixMangledMethod", "get_BaseMethod", "()", "summary", "df-generated"]
       - ["Internal.TypeSystem", "IPrefixMangledMethod", "get_Prefix", "()", "summary", "df-generated"]
       - ["Internal.TypeSystem", "IPrefixMangledSignature", "get_BaseSignature", "()", "summary", "df-generated"]
       - ["Internal.TypeSystem", "IPrefixMangledSignature", "get_Prefix", "()", "summary", "df-generated"]
@@ -473,9 +480,11 @@ extensions:
       - ["Internal.TypeSystem", "InstantiatedType", "ComputeTypeFlags", "(Internal.TypeSystem.TypeFlags)", "summary", "df-generated"]
       - ["Internal.TypeSystem", "InstantiatedType", "FindMethodsImplWithMatchingDeclName", "(System.String)", "summary", "df-generated"]
       - ["Internal.TypeSystem", "InstantiatedType", "GetClassLayout", "()", "summary", "df-generated"]
+      - ["Internal.TypeSystem", "InstantiatedType", "GetDefaultConstructor", "()", "summary", "df-generated"]
       - ["Internal.TypeSystem", "InstantiatedType", "GetHashCode", "()", "summary", "df-generated"]
       - ["Internal.TypeSystem", "InstantiatedType", "GetInlineArrayLength", "()", "summary", "df-generated"]
       - ["Internal.TypeSystem", "InstantiatedType", "GetNestedType", "(System.String)", "summary", "df-generated"]
+      - ["Internal.TypeSystem", "InstantiatedType", "GetStaticConstructor", "()", "summary", "df-generated"]
       - ["Internal.TypeSystem", "InstantiatedType", "HasCustomAttribute", "(System.String,System.String)", "summary", "df-generated"]
       - ["Internal.TypeSystem", "InstantiatedType", "IsCanonicalSubtype", "(Internal.TypeSystem.CanonicalFormKind)", "summary", "df-generated"]
       - ["Internal.TypeSystem", "InstantiatedType", "get_ClassCode", "()", "summary", "df-generated"]
@@ -528,7 +537,6 @@ extensions:
       - ["Internal.TypeSystem", "MarshalAsDescriptor", "get_SizeConst", "()", "summary", "df-generated"]
       - ["Internal.TypeSystem", "MarshalAsDescriptor", "get_SizeParamIndex", "()", "summary", "df-generated"]
       - ["Internal.TypeSystem", "MarshalAsDescriptor", "get_Type", "()", "summary", "df-generated"]
-      - ["Internal.TypeSystem", "MetadataFieldLayoutAlgorithm", "AlignBaseOffsetIfNecessary", "(Internal.TypeSystem.MetadataType,Internal.TypeSystem.LayoutInt,System.Boolean,System.Boolean)", "summary", "df-generated"]
       - ["Internal.TypeSystem", "MetadataFieldLayoutAlgorithm", "ComputeAutoFieldLayout", "(Internal.TypeSystem.MetadataType,System.Int32)", "summary", "df-generated"]
       - ["Internal.TypeSystem", "MetadataFieldLayoutAlgorithm", "ComputeContainsGCPointers", "(Internal.TypeSystem.DefType)", "summary", "df-generated"]
       - ["Internal.TypeSystem", "MetadataFieldLayoutAlgorithm", "ComputeExplicitFieldLayout", "(Internal.TypeSystem.MetadataType,System.Int32)", "summary", "df-generated"]
@@ -537,8 +545,6 @@ extensions:
       - ["Internal.TypeSystem", "MetadataFieldLayoutAlgorithm", "ComputeSequentialFieldLayout", "(Internal.TypeSystem.MetadataType,System.Int32)", "summary", "df-generated"]
       - ["Internal.TypeSystem", "MetadataFieldLayoutAlgorithm", "ComputeStaticFieldLayout", "(Internal.TypeSystem.DefType,Internal.TypeSystem.StaticLayoutKind)", "summary", "df-generated"]
       - ["Internal.TypeSystem", "MetadataFieldLayoutAlgorithm", "ComputeValueTypeShapeCharacteristics", "(Internal.TypeSystem.DefType)", "summary", "df-generated"]
-      - ["Internal.TypeSystem", "MetadataFieldLayoutAlgorithm", "FinalizeRuntimeSpecificStaticFieldLayout", "(Internal.TypeSystem.TypeSystemContext,Internal.TypeSystem.ComputedStaticFieldLayout)", "summary", "df-generated"]
-      - ["Internal.TypeSystem", "MetadataFieldLayoutAlgorithm", "PrepareRuntimeSpecificStaticFieldLayout", "(Internal.TypeSystem.TypeSystemContext,Internal.TypeSystem.ComputedStaticFieldLayout)", "summary", "df-generated"]
       - ["Internal.TypeSystem", "MetadataType", "FindMethodsImplWithMatchingDeclName", "(System.String)", "summary", "df-generated"]
       - ["Internal.TypeSystem", "MetadataType", "GetClassLayout", "()", "summary", "df-generated"]
       - ["Internal.TypeSystem", "MetadataType", "GetInlineArrayLength", "()", "summary", "df-generated"]
@@ -760,7 +766,9 @@ extensions:
       - ["Internal.TypeSystem", "TypeDesc", "CompareToImpl", "(Internal.TypeSystem.TypeDesc,Internal.TypeSystem.TypeSystemComparer)", "summary", "df-generated"]
       - ["Internal.TypeSystem", "TypeDesc", "ComputeTypeFlags", "(Internal.TypeSystem.TypeFlags)", "summary", "df-generated"]
       - ["Internal.TypeSystem", "TypeDesc", "Equals", "(System.Object)", "summary", "df-generated"]
+      - ["Internal.TypeSystem", "TypeDesc", "GetDefaultConstructor", "()", "summary", "df-generated"]
       - ["Internal.TypeSystem", "TypeDesc", "GetHashCode", "()", "summary", "df-generated"]
+      - ["Internal.TypeSystem", "TypeDesc", "GetStaticConstructor", "()", "summary", "df-generated"]
       - ["Internal.TypeSystem", "TypeDesc", "GetTypeFlags", "(Internal.TypeSystem.TypeFlags)", "summary", "df-generated"]
       - ["Internal.TypeSystem", "TypeDesc", "HasSameTypeDefinition", "(Internal.TypeSystem.TypeDesc)", "summary", "df-generated"]
       - ["Internal.TypeSystem", "TypeDesc", "IsCanonicalSubtype", "(Internal.TypeSystem.CanonicalFormKind)", "summary", "df-generated"]
@@ -815,6 +823,7 @@ extensions:
       - ["Internal.TypeSystem", "TypeIdentifierData", "GetHashCode", "()", "summary", "df-generated"]
       - ["Internal.TypeSystem", "TypeIdentifierData", "get_Name", "()", "summary", "df-generated"]
       - ["Internal.TypeSystem", "TypeIdentifierData", "get_Scope", "()", "summary", "df-generated"]
+      - ["Internal.TypeSystem", "TypeNameFormatter", "AppendName", "(System.Text.StringBuilder,Internal.TypeSystem.GenericParameterDesc)", "summary", "df-generated"]
       - ["Internal.TypeSystem", "TypeNameFormatter", "AppendName", "(System.Text.StringBuilder,Internal.TypeSystem.SignatureMethodVariable)", "summary", "df-generated"]
       - ["Internal.TypeSystem", "TypeNameFormatter", "AppendName", "(System.Text.StringBuilder,Internal.TypeSystem.SignatureTypeVariable)", "summary", "df-generated"]
       - ["Internal.TypeSystem", "TypeNameFormatter<TState,TOptions>", "AppendName", "(System.Text.StringBuilder,Internal.TypeSystem.ArrayType,TOptions)", "summary", "df-generated"]
diff --git a/csharp/ql/lib/ext/generated/JsonToItemsTaskFactory.model.yml b/csharp/ql/lib/ext/generated/JsonToItemsTaskFactory.model.yml
index 34465ac1eeb..7934a2d2264 100644
--- a/csharp/ql/lib/ext/generated/JsonToItemsTaskFactory.model.yml
+++ b/csharp/ql/lib/ext/generated/JsonToItemsTaskFactory.model.yml
@@ -4,16 +4,17 @@ extensions:
       pack: codeql/csharp-all
       extensible: summaryModel
     data:
-      - ["JsonToItemsTaskFactory", "JsonToItemsTaskFactory+CaseInsensitiveDictionaryConverter", True, "Read", "(System.Text.Json.Utf8JsonReader,System.Type,System.Text.Json.JsonSerializerOptions)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["JsonToItemsTaskFactory", "JsonToItemsTaskFactory+JsonModelItem", False, "JsonModelItem", "(System.String,System.Collections.Generic.Dictionary<System.String,System.String>)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["JsonToItemsTaskFactory", "JsonToItemsTaskFactory+JsonModelItem", False, "JsonModelItem", "(System.String,System.Collections.Generic.Dictionary<System.String,System.String>)", "", "Argument[1].Element", "Argument[this]", "taint", "df-generated"]
-      - ["JsonToItemsTaskFactory", "JsonToItemsTaskFactory+JsonModelItemConverter", True, "Read", "(System.Text.Json.Utf8JsonReader,System.Type,System.Text.Json.JsonSerializerOptions)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["JsonToItemsTaskFactory", "JsonToItemsTaskFactory+JsonToItemsTask", False, "JsonToItemsTask", "(System.String,System.Boolean)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["JsonToItemsTaskFactory", "JsonToItemsTaskFactory+CaseInsensitiveDictionaryConverter", True, "Read", "(System.Text.Json.Utf8JsonReader,System.Type,System.Text.Json.JsonSerializerOptions)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["JsonToItemsTaskFactory", "JsonToItemsTaskFactory+JsonModelItem", False, "JsonModelItem", "(System.String,System.Collections.Generic.Dictionary<System.String,System.String>)", "", "Argument[0]", "Argument[this].Property[JsonToItemsTaskFactory.JsonToItemsTaskFactory+JsonModelItem.Identity]", "value", "dfc-generated"]
+      - ["JsonToItemsTaskFactory", "JsonToItemsTaskFactory+JsonModelItem", False, "JsonModelItem", "(System.String,System.Collections.Generic.Dictionary<System.String,System.String>)", "", "Argument[1]", "Argument[this].Property[JsonToItemsTaskFactory.JsonToItemsTaskFactory+JsonModelItem.Metadata]", "value", "dfc-generated"]
+      - ["JsonToItemsTaskFactory", "JsonToItemsTaskFactory+JsonModelItemConverter", True, "Read", "(System.Text.Json.Utf8JsonReader,System.Type,System.Text.Json.JsonSerializerOptions)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["JsonToItemsTaskFactory", "JsonToItemsTaskFactory+JsonToItemsTask", False, "JsonToItemsTask", "(System.String,System.Boolean)", "", "Argument[0]", "Argument[this].Property[JsonToItemsTaskFactory.JsonToItemsTaskFactory+JsonToItemsTask.TaskName]", "value", "dfc-generated"]
       - ["JsonToItemsTaskFactory", "JsonToItemsTaskFactory+JsonToItemsTask", False, "SetPropertyValue", "(Microsoft.Build.Framework.TaskPropertyInfo,System.Object)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["JsonToItemsTaskFactory", "JsonToItemsTaskFactory", False, "CreateTask", "(Microsoft.Build.Framework.IBuildEngine)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["JsonToItemsTaskFactory", "JsonToItemsTaskFactory", False, "GetTaskParameters", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["JsonToItemsTaskFactory", "JsonToItemsTaskFactory", False, "Initialize", "(System.String,System.Collections.Generic.IDictionary<System.String,Microsoft.Build.Framework.TaskPropertyInfo>,System.String,Microsoft.Build.Framework.IBuildEngine)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["JsonToItemsTaskFactory", "JsonToItemsTaskFactory", False, "Initialize", "(System.String,System.Collections.Generic.IDictionary<System.String,Microsoft.Build.Framework.TaskPropertyInfo>,System.String,Microsoft.Build.Framework.IBuildEngine)", "", "Argument[1].Element", "Argument[this]", "taint", "df-generated"]
+      - ["JsonToItemsTaskFactory", "JsonToItemsTaskFactory", False, "CreateTask", "(Microsoft.Build.Framework.IBuildEngine)", "", "Argument[this].SyntheticField[JsonToItemsTaskFactory.JsonToItemsTaskFactory._taskName]", "ReturnValue.Property[JsonToItemsTaskFactory.JsonToItemsTaskFactory+JsonToItemsTask.TaskName]", "value", "dfc-generated"]
+      - ["JsonToItemsTaskFactory", "JsonToItemsTaskFactory", False, "GetTaskParameters", "()", "", "Argument[this].SyntheticField[JsonToItemsTaskFactory.JsonToItemsTaskFactory._taskProperties]", "ReturnValue", "value", "dfc-generated"]
+      - ["JsonToItemsTaskFactory", "JsonToItemsTaskFactory", False, "Initialize", "(System.String,System.Collections.Generic.IDictionary<System.String,Microsoft.Build.Framework.TaskPropertyInfo>,System.String,Microsoft.Build.Framework.IBuildEngine)", "", "Argument[0]", "Argument[this].SyntheticField[JsonToItemsTaskFactory.JsonToItemsTaskFactory._taskName]", "value", "dfc-generated"]
+      - ["JsonToItemsTaskFactory", "JsonToItemsTaskFactory", False, "Initialize", "(System.String,System.Collections.Generic.IDictionary<System.String,Microsoft.Build.Framework.TaskPropertyInfo>,System.String,Microsoft.Build.Framework.IBuildEngine)", "", "Argument[1].Element.Property[System.Collections.Generic.KeyValuePair`2.Value]", "Argument[this].SyntheticField[JsonToItemsTaskFactory.JsonToItemsTaskFactory._taskProperties].Element", "value", "dfc-generated"]
+      - ["JsonToItemsTaskFactory", "JsonToItemsTaskFactory", False, "Initialize", "(System.String,System.Collections.Generic.IDictionary<System.String,Microsoft.Build.Framework.TaskPropertyInfo>,System.String,Microsoft.Build.Framework.IBuildEngine)", "", "Argument[1].Property[System.Collections.Generic.IDictionary`2.Values].Element", "Argument[this].SyntheticField[JsonToItemsTaskFactory.JsonToItemsTaskFactory._taskProperties].Element", "value", "dfc-generated"]
   - addsTo:
       pack: codeql/csharp-all
       extensible: neutralModel
diff --git a/csharp/ql/lib/ext/generated/Microsoft.Android.Build.Ndk.model.yml b/csharp/ql/lib/ext/generated/Microsoft.Android.Build.Ndk.model.yml
index d5ea2c5d4b2..5eb848cffa0 100644
--- a/csharp/ql/lib/ext/generated/Microsoft.Android.Build.Ndk.model.yml
+++ b/csharp/ql/lib/ext/generated/Microsoft.Android.Build.Ndk.model.yml
@@ -4,15 +4,15 @@ extensions:
       pack: codeql/csharp-all
       extensible: summaryModel
     data:
-      - ["Microsoft.Android.Build.Ndk", "NdkTools", False, "NdkTools", "(System.String,System.String,System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["Microsoft.Android.Build.Ndk", "NdkTools", False, "NdkTools", "(System.String,System.String,System.String)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
+      - ["Microsoft.Android.Build.Ndk", "NdkTools", False, "NdkTools", "(System.String,System.String,System.String)", "", "Argument[2]", "Argument[this].SyntheticField[Microsoft.Android.Build.Ndk.NdkTools.clangPath]", "taint", "dfc-generated"]
       - ["Microsoft.Android.Build.Ndk", "NdkTools", False, "get_AsPrefixPath", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Android.Build.Ndk", "NdkTools", False, "get_ClangPath", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["Microsoft.Android.Build.Ndk", "NdkTools", False, "get_ClangPath", "()", "", "Argument[this].SyntheticField[Microsoft.Android.Build.Ndk.NdkTools.clangPath]", "ReturnValue", "value", "dfc-generated"]
       - ["Microsoft.Android.Build.Ndk", "NdkTools", False, "get_LdName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["Microsoft.Android.Build.Ndk", "NdkTools", False, "get_LdPath", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["Microsoft.Android.Build.Ndk", "NdkTools", False, "get_ToolPrefixPath", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Android.Build.Ndk", "NdkVersion", False, "NdkVersion", "(System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["Microsoft.Android.Build.Ndk", "NdkVersion", False, "ToString", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["Microsoft.Android.Build.Ndk", "NdkVersion", False, "NdkVersion", "(System.String)", "", "Argument[0]", "Argument[this].Property[Microsoft.Android.Build.Ndk.NdkVersion.Tag]", "taint", "dfc-generated"]
+      - ["Microsoft.Android.Build.Ndk", "NdkVersion", False, "ToString", "()", "", "Argument[this].Property[Microsoft.Android.Build.Ndk.NdkVersion.Main]", "ReturnValue", "taint", "dfc-generated"]
+      - ["Microsoft.Android.Build.Ndk", "NdkVersion", False, "ToString", "()", "", "Argument[this].Property[Microsoft.Android.Build.Ndk.NdkVersion.Tag]", "ReturnValue", "taint", "dfc-generated"]
   - addsTo:
       pack: codeql/csharp-all
       extensible: sourceModel
diff --git a/csharp/ql/lib/ext/generated/Microsoft.Android.Build.Tasks.model.yml b/csharp/ql/lib/ext/generated/Microsoft.Android.Build.Tasks.model.yml
index d83d43852e8..2cfc8a20064 100644
--- a/csharp/ql/lib/ext/generated/Microsoft.Android.Build.Tasks.model.yml
+++ b/csharp/ql/lib/ext/generated/Microsoft.Android.Build.Tasks.model.yml
@@ -2,6 +2,6 @@
 extensions:
   - addsTo:
       pack: codeql/csharp-all
-      extensible: neutralModel
+      extensible: summaryModel
     data:
-      - ["Microsoft.Android.Build.Tasks", "NdkToolFinderTask", "Execute", "()", "summary", "df-generated"]
+      - ["Microsoft.Android.Build.Tasks", "NdkToolFinderTask", True, "Execute", "()", "", "Argument[this].Property[Microsoft.Android.Build.Tasks.NdkToolFinderTask.MinApiLevel]", "Argument[this].Property[Microsoft.Android.Build.Tasks.NdkToolFinderTask.ClangPath]", "taint", "dfc-generated"]
diff --git a/csharp/ql/lib/ext/generated/Microsoft.Android.Build.model.yml b/csharp/ql/lib/ext/generated/Microsoft.Android.Build.model.yml
index 381def0f9ce..9c2af68af6d 100644
--- a/csharp/ql/lib/ext/generated/Microsoft.Android.Build.model.yml
+++ b/csharp/ql/lib/ext/generated/Microsoft.Android.Build.model.yml
@@ -4,12 +4,9 @@ extensions:
       pack: codeql/csharp-all
       extensible: summaryModel
     data:
-      - ["Microsoft.Android.Build", "AndroidProject", False, "AndroidProject", "(System.String,System.String,System.String,Microsoft.Build.Utilities.TaskLoggingHelper)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["Microsoft.Android.Build", "AndroidProject", False, "AndroidProject", "(System.String,System.String,System.String,Microsoft.Build.Utilities.TaskLoggingHelper)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["Microsoft.Android.Build", "AndroidProject", False, "AndroidProject", "(System.String,System.String,System.String,Microsoft.Build.Utilities.TaskLoggingHelper)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
-      - ["Microsoft.Android.Build", "AndroidProject", False, "AndroidProject", "(System.String,System.String,System.String,Microsoft.Build.Utilities.TaskLoggingHelper)", "", "Argument[3]", "Argument[this]", "taint", "df-generated"]
-      - ["Microsoft.Android.Build", "AndroidProject", False, "BuildCMake", "(System.String,System.Boolean)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Android.Build", "AndroidProject", False, "BuildCMake", "(System.String,System.Boolean)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["Microsoft.Android.Build", "AndroidProject", False, "AndroidProject", "(System.String,System.String,System.String,Microsoft.Build.Utilities.TaskLoggingHelper)", "", "Argument[0]", "Argument[this].SyntheticField[Microsoft.Android.Build.AndroidProject.projectName]", "value", "dfc-generated"]
+      - ["Microsoft.Android.Build", "AndroidProject", False, "BuildCMake", "(System.String,System.Boolean)", "", "Argument[0]", "ReturnValue", "taint", "dfc-generated"]
+      - ["Microsoft.Android.Build", "AndroidProject", False, "BuildCMake", "(System.String,System.Boolean)", "", "Argument[this].SyntheticField[Microsoft.Android.Build.AndroidProject.projectName]", "ReturnValue", "taint", "dfc-generated"]
       - ["Microsoft.Android.Build", "AndroidProject", False, "get_Abi", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
   - addsTo:
       pack: codeql/csharp-all
diff --git a/csharp/ql/lib/ext/generated/Microsoft.Apple.Build.model.yml b/csharp/ql/lib/ext/generated/Microsoft.Apple.Build.model.yml
index 5e70ba55a53..926814d55d1 100644
--- a/csharp/ql/lib/ext/generated/Microsoft.Apple.Build.model.yml
+++ b/csharp/ql/lib/ext/generated/Microsoft.Apple.Build.model.yml
@@ -7,8 +7,7 @@ extensions:
       - ["Microsoft.Apple.Build", "AppleProject", False, "AppleProject", "(System.String,System.String,Microsoft.Build.Utilities.TaskLoggingHelper)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["Microsoft.Apple.Build", "AppleProject", False, "AppleProject", "(System.String,System.String,Microsoft.Build.Utilities.TaskLoggingHelper)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
       - ["Microsoft.Apple.Build", "AppleProject", False, "Build", "(System.String,Microsoft.Mobile.Build.Clang.ClangBuildOptions,System.Boolean)", "", "Argument[this]", "Argument[1]", "taint", "df-generated"]
-      - ["Microsoft.Apple.Build", "AppleProject", False, "Build", "(System.String,Microsoft.Mobile.Build.Clang.ClangBuildOptions,System.String,System.Boolean)", "", "Argument[2]", "Argument[1]", "taint", "df-generated"]
-      - ["Microsoft.Apple.Build", "AppleProject", False, "Build", "(System.String,Microsoft.Mobile.Build.Clang.ClangBuildOptions,System.String,System.Boolean)", "", "Argument[this]", "Argument[1]", "taint", "df-generated"]
+      - ["Microsoft.Apple.Build", "AppleProject", False, "Build", "(System.String,Microsoft.Mobile.Build.Clang.ClangBuildOptions,System.String,System.Boolean)", "", "Argument[2]", "Argument[1].Property[Microsoft.Mobile.Build.Clang.ClangBuildOptions.CompilerArguments].Element", "taint", "dfc-generated"]
       - ["Microsoft.Apple.Build", "AppleSdk", False, "AppleSdk", "(System.String,Microsoft.Build.Utilities.TaskLoggingHelper)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
       - ["Microsoft.Apple.Build", "AppleSdk", False, "get_DeveloperRoot", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["Microsoft.Apple.Build", "AppleSdk", False, "get_SdkRoot", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
diff --git a/csharp/ql/lib/ext/generated/Microsoft.CSharp.RuntimeBinder.model.yml b/csharp/ql/lib/ext/generated/Microsoft.CSharp.RuntimeBinder.model.yml
index 83bbd240810..219f18bd87b 100644
--- a/csharp/ql/lib/ext/generated/Microsoft.CSharp.RuntimeBinder.model.yml
+++ b/csharp/ql/lib/ext/generated/Microsoft.CSharp.RuntimeBinder.model.yml
@@ -4,23 +4,22 @@ extensions:
       pack: codeql/csharp-all
       extensible: summaryModel
     data:
-      - ["Microsoft.CSharp.RuntimeBinder", "Binder", False, "BinaryOperation", "(Microsoft.CSharp.RuntimeBinder.CSharpBinderFlags,System.Linq.Expressions.ExpressionType,System.Type,System.Collections.Generic.IEnumerable<Microsoft.CSharp.RuntimeBinder.CSharpArgumentInfo>)", "", "Argument[3].Element", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.CSharp.RuntimeBinder", "Binder", False, "GetIndex", "(Microsoft.CSharp.RuntimeBinder.CSharpBinderFlags,System.Type,System.Collections.Generic.IEnumerable<Microsoft.CSharp.RuntimeBinder.CSharpArgumentInfo>)", "", "Argument[2].Element", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.CSharp.RuntimeBinder", "Binder", False, "GetMember", "(Microsoft.CSharp.RuntimeBinder.CSharpBinderFlags,System.String,System.Type,System.Collections.Generic.IEnumerable<Microsoft.CSharp.RuntimeBinder.CSharpArgumentInfo>)", "", "Argument[3].Element", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.CSharp.RuntimeBinder", "Binder", False, "Invoke", "(Microsoft.CSharp.RuntimeBinder.CSharpBinderFlags,System.Type,System.Collections.Generic.IEnumerable<Microsoft.CSharp.RuntimeBinder.CSharpArgumentInfo>)", "", "Argument[2].Element", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.CSharp.RuntimeBinder", "Binder", False, "InvokeConstructor", "(Microsoft.CSharp.RuntimeBinder.CSharpBinderFlags,System.Type,System.Collections.Generic.IEnumerable<Microsoft.CSharp.RuntimeBinder.CSharpArgumentInfo>)", "", "Argument[2].Element", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.CSharp.RuntimeBinder", "Binder", False, "InvokeMember", "(Microsoft.CSharp.RuntimeBinder.CSharpBinderFlags,System.String,System.Collections.Generic.IEnumerable<System.Type>,System.Type,System.Collections.Generic.IEnumerable<Microsoft.CSharp.RuntimeBinder.CSharpArgumentInfo>)", "", "Argument[2].Element", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.CSharp.RuntimeBinder", "Binder", False, "InvokeMember", "(Microsoft.CSharp.RuntimeBinder.CSharpBinderFlags,System.String,System.Collections.Generic.IEnumerable<System.Type>,System.Type,System.Collections.Generic.IEnumerable<Microsoft.CSharp.RuntimeBinder.CSharpArgumentInfo>)", "", "Argument[4].Element", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.CSharp.RuntimeBinder", "Binder", False, "IsEvent", "(Microsoft.CSharp.RuntimeBinder.CSharpBinderFlags,System.String,System.Type)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.CSharp.RuntimeBinder", "Binder", False, "SetIndex", "(Microsoft.CSharp.RuntimeBinder.CSharpBinderFlags,System.Type,System.Collections.Generic.IEnumerable<Microsoft.CSharp.RuntimeBinder.CSharpArgumentInfo>)", "", "Argument[2].Element", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.CSharp.RuntimeBinder", "Binder", False, "SetMember", "(Microsoft.CSharp.RuntimeBinder.CSharpBinderFlags,System.String,System.Type,System.Collections.Generic.IEnumerable<Microsoft.CSharp.RuntimeBinder.CSharpArgumentInfo>)", "", "Argument[3].Element", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.CSharp.RuntimeBinder", "Binder", False, "UnaryOperation", "(Microsoft.CSharp.RuntimeBinder.CSharpBinderFlags,System.Linq.Expressions.ExpressionType,System.Type,System.Collections.Generic.IEnumerable<Microsoft.CSharp.RuntimeBinder.CSharpArgumentInfo>)", "", "Argument[3].Element", "ReturnValue", "taint", "df-generated"]
       - ["Microsoft.CSharp.RuntimeBinder", "CSharpArgumentInfo", False, "Create", "(Microsoft.CSharp.RuntimeBinder.CSharpArgumentInfoFlags,System.String)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
   - addsTo:
       pack: codeql/csharp-all
       extensible: neutralModel
     data:
+      - ["Microsoft.CSharp.RuntimeBinder", "Binder", "BinaryOperation", "(Microsoft.CSharp.RuntimeBinder.CSharpBinderFlags,System.Linq.Expressions.ExpressionType,System.Type,System.Collections.Generic.IEnumerable<Microsoft.CSharp.RuntimeBinder.CSharpArgumentInfo>)", "summary", "df-generated"]
       - ["Microsoft.CSharp.RuntimeBinder", "Binder", "Convert", "(Microsoft.CSharp.RuntimeBinder.CSharpBinderFlags,System.Type,System.Type)", "summary", "df-generated"]
+      - ["Microsoft.CSharp.RuntimeBinder", "Binder", "GetIndex", "(Microsoft.CSharp.RuntimeBinder.CSharpBinderFlags,System.Type,System.Collections.Generic.IEnumerable<Microsoft.CSharp.RuntimeBinder.CSharpArgumentInfo>)", "summary", "df-generated"]
+      - ["Microsoft.CSharp.RuntimeBinder", "Binder", "GetMember", "(Microsoft.CSharp.RuntimeBinder.CSharpBinderFlags,System.String,System.Type,System.Collections.Generic.IEnumerable<Microsoft.CSharp.RuntimeBinder.CSharpArgumentInfo>)", "summary", "df-generated"]
+      - ["Microsoft.CSharp.RuntimeBinder", "Binder", "Invoke", "(Microsoft.CSharp.RuntimeBinder.CSharpBinderFlags,System.Type,System.Collections.Generic.IEnumerable<Microsoft.CSharp.RuntimeBinder.CSharpArgumentInfo>)", "summary", "df-generated"]
+      - ["Microsoft.CSharp.RuntimeBinder", "Binder", "InvokeConstructor", "(Microsoft.CSharp.RuntimeBinder.CSharpBinderFlags,System.Type,System.Collections.Generic.IEnumerable<Microsoft.CSharp.RuntimeBinder.CSharpArgumentInfo>)", "summary", "df-generated"]
+      - ["Microsoft.CSharp.RuntimeBinder", "Binder", "InvokeMember", "(Microsoft.CSharp.RuntimeBinder.CSharpBinderFlags,System.String,System.Collections.Generic.IEnumerable<System.Type>,System.Type,System.Collections.Generic.IEnumerable<Microsoft.CSharp.RuntimeBinder.CSharpArgumentInfo>)", "summary", "df-generated"]
+      - ["Microsoft.CSharp.RuntimeBinder", "Binder", "IsEvent", "(Microsoft.CSharp.RuntimeBinder.CSharpBinderFlags,System.String,System.Type)", "summary", "df-generated"]
+      - ["Microsoft.CSharp.RuntimeBinder", "Binder", "SetIndex", "(Microsoft.CSharp.RuntimeBinder.CSharpBinderFlags,System.Type,System.Collections.Generic.IEnumerable<Microsoft.CSharp.RuntimeBinder.CSharpArgumentInfo>)", "summary", "df-generated"]
+      - ["Microsoft.CSharp.RuntimeBinder", "Binder", "SetMember", "(Microsoft.CSharp.RuntimeBinder.CSharpBinderFlags,System.String,System.Type,System.Collections.Generic.IEnumerable<Microsoft.CSharp.RuntimeBinder.CSharpArgumentInfo>)", "summary", "df-generated"]
+      - ["Microsoft.CSharp.RuntimeBinder", "Binder", "UnaryOperation", "(Microsoft.CSharp.RuntimeBinder.CSharpBinderFlags,System.Linq.Expressions.ExpressionType,System.Type,System.Collections.Generic.IEnumerable<Microsoft.CSharp.RuntimeBinder.CSharpArgumentInfo>)", "summary", "df-generated"]
       - ["Microsoft.CSharp.RuntimeBinder", "RuntimeBinderException", "RuntimeBinderException", "(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)", "summary", "df-generated"]
       - ["Microsoft.CSharp.RuntimeBinder", "RuntimeBinderException", "RuntimeBinderException", "(System.String)", "summary", "df-generated"]
       - ["Microsoft.CSharp.RuntimeBinder", "RuntimeBinderException", "RuntimeBinderException", "(System.String,System.Exception)", "summary", "df-generated"]
diff --git a/csharp/ql/lib/ext/generated/Microsoft.Diagnostics.JitTrace.model.yml b/csharp/ql/lib/ext/generated/Microsoft.Diagnostics.JitTrace.model.yml
index 3924e5e8ad4..cf78859040f 100644
--- a/csharp/ql/lib/ext/generated/Microsoft.Diagnostics.JitTrace.model.yml
+++ b/csharp/ql/lib/ext/generated/Microsoft.Diagnostics.JitTrace.model.yml
@@ -7,3 +7,5 @@ extensions:
       - ["Microsoft.Diagnostics.JitTrace", "JitTraceRuntime", "Prepare", "(System.IO.FileInfo,System.Int32,System.Int32)", "summary", "df-generated"]
       - ["Microsoft.Diagnostics.JitTrace", "JitTraceRuntime", "Prepare", "(System.IO.StreamReader,System.Int32,System.Int32)", "summary", "df-generated"]
       - ["Microsoft.Diagnostics.JitTrace", "JitTraceRuntime", "Prepare", "(System.String,System.Int32,System.Int32)", "summary", "df-generated"]
+      - ["Microsoft.Diagnostics.JitTrace", "JitTraceRuntime", "add_LogFailure", "(System.Action<System.String>)", "summary", "df-generated"]
+      - ["Microsoft.Diagnostics.JitTrace", "JitTraceRuntime", "remove_LogFailure", "(System.Action<System.String>)", "summary", "df-generated"]
diff --git a/csharp/ql/lib/ext/generated/Microsoft.Diagnostics.Tools.Pgo.TypeRefTypeSystem.model.yml b/csharp/ql/lib/ext/generated/Microsoft.Diagnostics.Tools.Pgo.TypeRefTypeSystem.model.yml
index 636a7a2fb2d..873e8b2b2b9 100644
--- a/csharp/ql/lib/ext/generated/Microsoft.Diagnostics.Tools.Pgo.TypeRefTypeSystem.model.yml
+++ b/csharp/ql/lib/ext/generated/Microsoft.Diagnostics.Tools.Pgo.TypeRefTypeSystem.model.yml
@@ -1,5 +1,10 @@
 # THIS FILE IS AN AUTO-GENERATED MODELS AS DATA FILE. DO NOT EDIT.
 extensions:
+  - addsTo:
+      pack: codeql/csharp-all
+      extensible: summaryModel
+    data:
+      - ["Microsoft.Diagnostics.Tools.Pgo.TypeRefTypeSystem", "TypeRefTypeSystemGenericParameter", False, "get_DiagnosticName", "()", "", "Argument[this].Property[Microsoft.Diagnostics.Tools.Pgo.TypeRefTypeSystem.TypeRefTypeSystemGenericParameter.Name]", "ReturnValue", "value", "dfc-generated"]
   - addsTo:
       pack: codeql/csharp-all
       extensible: neutralModel
diff --git a/csharp/ql/lib/ext/generated/Microsoft.Diagnostics.Tools.Pgo.model.yml b/csharp/ql/lib/ext/generated/Microsoft.Diagnostics.Tools.Pgo.model.yml
index d29e80a9db5..38fcba62dc4 100644
--- a/csharp/ql/lib/ext/generated/Microsoft.Diagnostics.Tools.Pgo.model.yml
+++ b/csharp/ql/lib/ext/generated/Microsoft.Diagnostics.Tools.Pgo.model.yml
@@ -4,18 +4,30 @@ extensions:
       pack: codeql/csharp-all
       extensible: summaryModel
     data:
-      - ["Microsoft.Diagnostics.Tools.Pgo", "CirculationGraph", False, "AddNode", "(Microsoft.Diagnostics.Tools.Pgo.Node)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["Microsoft.Diagnostics.Tools.Pgo", "Edge", False, "Edge", "(Microsoft.Diagnostics.Tools.Pgo.Edge)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["Microsoft.Diagnostics.Tools.Pgo", "Edge", False, "Edge", "(Microsoft.Diagnostics.Tools.Pgo.Node,Microsoft.Diagnostics.Tools.Pgo.Node,System.Int64,System.Int64,System.Int64)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["Microsoft.Diagnostics.Tools.Pgo", "Edge", False, "Edge", "(Microsoft.Diagnostics.Tools.Pgo.Node,Microsoft.Diagnostics.Tools.Pgo.Node,System.Int64,System.Int64,System.Int64)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["Microsoft.Diagnostics.Tools.Pgo", "Edge", False, "ToString", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Diagnostics.Tools.Pgo", "KeyValueMap<TKey,TValue>", False, "KeyValueMap", "(TKey[],TValue[])", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["Microsoft.Diagnostics.Tools.Pgo", "KeyValueMap<TKey,TValue>", False, "KeyValueMap", "(TKey[],TValue[])", "", "Argument[1].Element", "Argument[this]", "taint", "df-generated"]
-      - ["Microsoft.Diagnostics.Tools.Pgo", "KeyValueMap<TKey,TValue>", False, "LookupRange", "(TKey,TKey)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Diagnostics.Tools.Pgo", "KeyValueMap<TKey,TValue>", False, "TryLookup", "(TKey,TValue)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Diagnostics.Tools.Pgo", "MinimumCostCirculation", False, "FindBellmanFordCycle", "(Microsoft.Diagnostics.Tools.Pgo.Node)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Diagnostics.Tools.Pgo", "Node", False, "AddInEdge", "(Microsoft.Diagnostics.Tools.Pgo.Edge)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["Microsoft.Diagnostics.Tools.Pgo", "Node", False, "AddOutEdge", "(Microsoft.Diagnostics.Tools.Pgo.Edge)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["Microsoft.Diagnostics.Tools.Pgo", "CirculationGraph", False, "AddNode", "(Microsoft.Diagnostics.Tools.Pgo.Node)", "", "Argument[0].Field[Microsoft.Diagnostics.Tools.Pgo.Node.OutEdgeList].Element", "Argument[this].Field[Microsoft.Diagnostics.Tools.Pgo.CirculationGraph.Edges].Element", "value", "dfc-generated"]
+      - ["Microsoft.Diagnostics.Tools.Pgo", "CirculationGraph", False, "AddNode", "(Microsoft.Diagnostics.Tools.Pgo.Node)", "", "Argument[0]", "Argument[this].Field[Microsoft.Diagnostics.Tools.Pgo.CirculationGraph.Nodes].Element", "value", "dfc-generated"]
+      - ["Microsoft.Diagnostics.Tools.Pgo", "Edge", False, "Edge", "(Microsoft.Diagnostics.Tools.Pgo.Edge)", "", "Argument[0].Field[Microsoft.Diagnostics.Tools.Pgo.Edge.Source]", "Argument[this].Field[Microsoft.Diagnostics.Tools.Pgo.Edge.Target]", "value", "dfc-generated"]
+      - ["Microsoft.Diagnostics.Tools.Pgo", "Edge", False, "Edge", "(Microsoft.Diagnostics.Tools.Pgo.Edge)", "", "Argument[0].Field[Microsoft.Diagnostics.Tools.Pgo.Edge.Target]", "Argument[this].Field[Microsoft.Diagnostics.Tools.Pgo.Edge.Source]", "value", "dfc-generated"]
+      - ["Microsoft.Diagnostics.Tools.Pgo", "Edge", False, "Edge", "(Microsoft.Diagnostics.Tools.Pgo.Edge)", "", "Argument[0]", "Argument[this].Field[Microsoft.Diagnostics.Tools.Pgo.Edge.BackEdge]", "value", "dfc-generated"]
+      - ["Microsoft.Diagnostics.Tools.Pgo", "Edge", False, "Edge", "(Microsoft.Diagnostics.Tools.Pgo.Node,Microsoft.Diagnostics.Tools.Pgo.Node,System.Int64,System.Int64,System.Int64)", "", "Argument[0]", "Argument[this].Field[Microsoft.Diagnostics.Tools.Pgo.Edge.BackEdge].Field[Microsoft.Diagnostics.Tools.Pgo.Edge.Target]", "value", "dfc-generated"]
+      - ["Microsoft.Diagnostics.Tools.Pgo", "Edge", False, "Edge", "(Microsoft.Diagnostics.Tools.Pgo.Node,Microsoft.Diagnostics.Tools.Pgo.Node,System.Int64,System.Int64,System.Int64)", "", "Argument[0]", "Argument[this].Field[Microsoft.Diagnostics.Tools.Pgo.Edge.Source]", "value", "dfc-generated"]
+      - ["Microsoft.Diagnostics.Tools.Pgo", "Edge", False, "Edge", "(Microsoft.Diagnostics.Tools.Pgo.Node,Microsoft.Diagnostics.Tools.Pgo.Node,System.Int64,System.Int64,System.Int64)", "", "Argument[1]", "Argument[this].Field[Microsoft.Diagnostics.Tools.Pgo.Edge.BackEdge].Field[Microsoft.Diagnostics.Tools.Pgo.Edge.Source]", "value", "dfc-generated"]
+      - ["Microsoft.Diagnostics.Tools.Pgo", "Edge", False, "Edge", "(Microsoft.Diagnostics.Tools.Pgo.Node,Microsoft.Diagnostics.Tools.Pgo.Node,System.Int64,System.Int64,System.Int64)", "", "Argument[1]", "Argument[this].Field[Microsoft.Diagnostics.Tools.Pgo.Edge.Target]", "value", "dfc-generated"]
+      - ["Microsoft.Diagnostics.Tools.Pgo", "Edge", False, "Edge", "(Microsoft.Diagnostics.Tools.Pgo.Node,Microsoft.Diagnostics.Tools.Pgo.Node,System.Int64,System.Int64,System.Int64)", "", "Argument[this].Field[Microsoft.Diagnostics.Tools.Pgo.Edge.Source]", "Argument[this].Field[Microsoft.Diagnostics.Tools.Pgo.Edge.BackEdge].Field[Microsoft.Diagnostics.Tools.Pgo.Edge.Target]", "value", "dfc-generated"]
+      - ["Microsoft.Diagnostics.Tools.Pgo", "Edge", False, "Edge", "(Microsoft.Diagnostics.Tools.Pgo.Node,Microsoft.Diagnostics.Tools.Pgo.Node,System.Int64,System.Int64,System.Int64)", "", "Argument[this].Field[Microsoft.Diagnostics.Tools.Pgo.Edge.Target]", "Argument[this].Field[Microsoft.Diagnostics.Tools.Pgo.Edge.BackEdge].Field[Microsoft.Diagnostics.Tools.Pgo.Edge.Source]", "value", "dfc-generated"]
+      - ["Microsoft.Diagnostics.Tools.Pgo", "Edge", False, "Edge", "(Microsoft.Diagnostics.Tools.Pgo.Node,Microsoft.Diagnostics.Tools.Pgo.Node,System.Int64,System.Int64,System.Int64)", "", "Argument[this]", "Argument[this].Field[Microsoft.Diagnostics.Tools.Pgo.Edge.BackEdge].Field[Microsoft.Diagnostics.Tools.Pgo.Edge.BackEdge]", "value", "dfc-generated"]
+      - ["Microsoft.Diagnostics.Tools.Pgo", "Edge", False, "ToString", "()", "", "Argument[this].Field[Microsoft.Diagnostics.Tools.Pgo.Edge.Source]", "ReturnValue", "taint", "dfc-generated"]
+      - ["Microsoft.Diagnostics.Tools.Pgo", "Edge", False, "ToString", "()", "", "Argument[this].Field[Microsoft.Diagnostics.Tools.Pgo.Edge.Target]", "ReturnValue", "taint", "dfc-generated"]
+      - ["Microsoft.Diagnostics.Tools.Pgo", "FlowSmoothing<T>", False, "MapEdges<S>", "(System.Func<System.ValueTuple<T,T>,System.Int64,S>)", "", "Argument[0].ReturnValue", "ReturnValue.Element.Property[System.Collections.Generic.KeyValuePair`2.Value]", "value", "dfc-generated"]
+      - ["Microsoft.Diagnostics.Tools.Pgo", "FlowSmoothing<T>", False, "MapNodes<S>", "(System.Func<T,System.Int64,S>)", "", "Argument[0].ReturnValue", "ReturnValue.Element.Property[System.Collections.Generic.KeyValuePair`2.Value]", "value", "dfc-generated"]
+      - ["Microsoft.Diagnostics.Tools.Pgo", "KeyValueMap<TKey,TValue>", False, "KeyValueMap", "(TKey[],TValue[])", "", "Argument[1]", "Argument[this].SyntheticField[Microsoft.Diagnostics.Tools.Pgo.KeyValueMap`2._values]", "value", "dfc-generated"]
+      - ["Microsoft.Diagnostics.Tools.Pgo", "KeyValueMap<TKey,TValue>", False, "LookupRange", "(TKey,TKey)", "", "Argument[this].SyntheticField[Microsoft.Diagnostics.Tools.Pgo.KeyValueMap`2._values].Element", "ReturnValue.Element", "value", "dfc-generated"]
+      - ["Microsoft.Diagnostics.Tools.Pgo", "KeyValueMap<TKey,TValue>", False, "TryLookup", "(TKey,TValue)", "", "Argument[this].SyntheticField[Microsoft.Diagnostics.Tools.Pgo.KeyValueMap`2._values].Element", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Diagnostics.Tools.Pgo", "LbrTraceEventData32", False, "Entries", "(Microsoft.Diagnostics.Tools.Pgo.LbrTraceEventData32,System.Int32)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Diagnostics.Tools.Pgo", "LbrTraceEventData64", False, "Entries", "(Microsoft.Diagnostics.Tools.Pgo.LbrTraceEventData64,System.Int32)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Diagnostics.Tools.Pgo", "MinimumCostCirculation", False, "FindBellmanFordCycle", "(Microsoft.Diagnostics.Tools.Pgo.Node)", "", "Argument[0].Field[Microsoft.Diagnostics.Tools.Pgo.Node.MetaData].Field[Microsoft.Diagnostics.Tools.Pgo.NodeMetaData.PredEdge]", "ReturnValue.Property[System.Tuple`2.Item1].Element", "value", "dfc-generated"]
+      - ["Microsoft.Diagnostics.Tools.Pgo", "Node", False, "AddInEdge", "(Microsoft.Diagnostics.Tools.Pgo.Edge)", "", "Argument[0]", "Argument[this].Field[Microsoft.Diagnostics.Tools.Pgo.Node.InEdgeList].Element", "value", "dfc-generated"]
+      - ["Microsoft.Diagnostics.Tools.Pgo", "Node", False, "AddOutEdge", "(Microsoft.Diagnostics.Tools.Pgo.Edge)", "", "Argument[0]", "Argument[this].Field[Microsoft.Diagnostics.Tools.Pgo.Node.OutEdgeList].Element", "value", "dfc-generated"]
   - addsTo:
       pack: codeql/csharp-all
       extensible: neutralModel
@@ -25,12 +37,11 @@ extensions:
       - ["Microsoft.Diagnostics.Tools.Pgo", "Edge", "AddFlow", "(System.Int64)", "summary", "df-generated"]
       - ["Microsoft.Diagnostics.Tools.Pgo", "Edge", "CheckEdgeConsistency", "()", "summary", "df-generated"]
       - ["Microsoft.Diagnostics.Tools.Pgo", "FlowSmoothing<T>", "CheckGraphConsistency", "()", "summary", "df-generated"]
+      - ["Microsoft.Diagnostics.Tools.Pgo", "FlowSmoothing<T>", "FlowSmoothing", "(System.Collections.Generic.Dictionary<T,System.Int64>,T,System.Func<T,System.Collections.Generic.HashSet<T>>,System.Func<T,System.Boolean,System.Int64>)", "summary", "df-generated"]
       - ["Microsoft.Diagnostics.Tools.Pgo", "FlowSmoothing<T>", "MakeGraphFeasible", "()", "summary", "df-generated"]
       - ["Microsoft.Diagnostics.Tools.Pgo", "FlowSmoothing<T>", "Perform", "(System.Int32)", "summary", "df-generated"]
       - ["Microsoft.Diagnostics.Tools.Pgo", "LbrEntry32", "ToString", "()", "summary", "df-generated"]
       - ["Microsoft.Diagnostics.Tools.Pgo", "LbrEntry64", "ToString", "()", "summary", "df-generated"]
-      - ["Microsoft.Diagnostics.Tools.Pgo", "LbrTraceEventData32", "Entries", "(Microsoft.Diagnostics.Tools.Pgo.LbrTraceEventData32,System.Int32)", "summary", "df-generated"]
-      - ["Microsoft.Diagnostics.Tools.Pgo", "LbrTraceEventData64", "Entries", "(Microsoft.Diagnostics.Tools.Pgo.LbrTraceEventData64,System.Int32)", "summary", "df-generated"]
       - ["Microsoft.Diagnostics.Tools.Pgo", "MinimumCostCirculation", "FindMinCostCirculation", "(Microsoft.Diagnostics.Tools.Pgo.CirculationGraph,System.Int32)", "summary", "df-generated"]
       - ["Microsoft.Diagnostics.Tools.Pgo", "MinimumCostCirculation", "FindNegativeCycle", "(Microsoft.Diagnostics.Tools.Pgo.CirculationGraph)", "summary", "df-generated"]
       - ["Microsoft.Diagnostics.Tools.Pgo", "Node", "NetInFlow", "()", "summary", "df-generated"]
diff --git a/csharp/ql/lib/ext/generated/Microsoft.DotNet.Build.Tasks.model.yml b/csharp/ql/lib/ext/generated/Microsoft.DotNet.Build.Tasks.model.yml
index 8ef410bf468..ba7b07afb60 100644
--- a/csharp/ql/lib/ext/generated/Microsoft.DotNet.Build.Tasks.model.yml
+++ b/csharp/ql/lib/ext/generated/Microsoft.DotNet.Build.Tasks.model.yml
@@ -4,12 +4,16 @@ extensions:
       pack: codeql/csharp-all
       extensible: summaryModel
     data:
-      - ["Microsoft.DotNet.Build.Tasks", "TpnDocument", False, "Parse", "(System.String[])", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.DotNet.Build.Tasks", "TpnDocument", False, "ToString", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.DotNet.Build.Tasks", "TpnSection", False, "ToString", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.DotNet.Build.Tasks", "TpnSectionHeader", False, "ParseAll", "(System.String[])", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.DotNet.Build.Tasks", "TpnSectionHeader", False, "ToString", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.DotNet.Build.Tasks", "TpnSectionHeader", False, "get_SingleLineName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["Microsoft.DotNet.Build.Tasks", "TpnDocument", False, "Parse", "(System.String[])", "", "Argument[0].Element", "ReturnValue.Property[Microsoft.DotNet.Build.Tasks.TpnDocument.Preamble]", "taint", "dfc-generated"]
+      - ["Microsoft.DotNet.Build.Tasks", "TpnDocument", False, "ToString", "()", "", "Argument[this].Property[Microsoft.DotNet.Build.Tasks.TpnDocument.Preamble]", "ReturnValue", "taint", "dfc-generated"]
+      - ["Microsoft.DotNet.Build.Tasks", "TpnDocument", False, "ToString", "()", "", "Argument[this].Property[Microsoft.DotNet.Build.Tasks.TpnDocument.Sections].Element", "ReturnValue", "taint", "dfc-generated"]
+      - ["Microsoft.DotNet.Build.Tasks", "TpnSection", False, "ToString", "()", "", "Argument[this].Property[Microsoft.DotNet.Build.Tasks.TpnSection.Content]", "ReturnValue", "taint", "dfc-generated"]
+      - ["Microsoft.DotNet.Build.Tasks", "TpnSection", False, "ToString", "()", "", "Argument[this].Property[Microsoft.DotNet.Build.Tasks.TpnSection.Header]", "ReturnValue", "taint", "dfc-generated"]
+      - ["Microsoft.DotNet.Build.Tasks", "TpnSectionHeader", False, "ParseAll", "(System.String[])", "", "Argument[0].Element", "ReturnValue.Element.Property[Microsoft.DotNet.Build.Tasks.TpnSectionHeader.Name]", "taint", "dfc-generated"]
+      - ["Microsoft.DotNet.Build.Tasks", "TpnSectionHeader", False, "ParseAll", "(System.String[])", "", "Argument[0].Element", "ReturnValue.Element.Property[Microsoft.DotNet.Build.Tasks.TpnSectionHeader.SeparatorLine]", "value", "dfc-generated"]
+      - ["Microsoft.DotNet.Build.Tasks", "TpnSectionHeader", False, "ToString", "()", "", "Argument[this].Property[Microsoft.DotNet.Build.Tasks.TpnSectionHeader.Name]", "ReturnValue", "taint", "dfc-generated"]
+      - ["Microsoft.DotNet.Build.Tasks", "TpnSectionHeader", False, "ToString", "()", "", "Argument[this].Property[Microsoft.DotNet.Build.Tasks.TpnSectionHeader.SeparatorLine]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.DotNet.Build.Tasks", "TpnSectionHeader", False, "get_SingleLineName", "()", "", "Argument[this].Property[Microsoft.DotNet.Build.Tasks.TpnSectionHeader.Name]", "ReturnValue", "taint", "dfc-generated"]
   - addsTo:
       pack: codeql/csharp-all
       extensible: neutralModel
diff --git a/csharp/ql/lib/ext/generated/Microsoft.DotNet.PlatformAbstractions.model.yml b/csharp/ql/lib/ext/generated/Microsoft.DotNet.PlatformAbstractions.model.yml
index a8e40981c95..dbf2d2c00d7 100644
--- a/csharp/ql/lib/ext/generated/Microsoft.DotNet.PlatformAbstractions.model.yml
+++ b/csharp/ql/lib/ext/generated/Microsoft.DotNet.PlatformAbstractions.model.yml
@@ -1,5 +1,10 @@
 # THIS FILE IS AN AUTO-GENERATED MODELS AS DATA FILE. DO NOT EDIT.
 extensions:
+  - addsTo:
+      pack: codeql/csharp-all
+      extensible: summaryModel
+    data:
+      - ["Microsoft.DotNet.PlatformAbstractions", "HashCodeCombiner", False, "Add<TValue>", "(TValue,System.Collections.Generic.IEqualityComparer<TValue>)", "", "Argument[0]", "Argument[1]", "taint", "df-generated"]
   - addsTo:
       pack: codeql/csharp-all
       extensible: neutralModel
@@ -7,6 +12,5 @@ extensions:
       - ["Microsoft.DotNet.PlatformAbstractions", "HashCodeCombiner", "Add", "(System.Int32)", "summary", "df-generated"]
       - ["Microsoft.DotNet.PlatformAbstractions", "HashCodeCombiner", "Add", "(System.Object)", "summary", "df-generated"]
       - ["Microsoft.DotNet.PlatformAbstractions", "HashCodeCombiner", "Add", "(System.String)", "summary", "df-generated"]
-      - ["Microsoft.DotNet.PlatformAbstractions", "HashCodeCombiner", "Add<TValue>", "(TValue,System.Collections.Generic.IEqualityComparer<TValue>)", "summary", "df-generated"]
       - ["Microsoft.DotNet.PlatformAbstractions", "HashCodeCombiner", "Start", "()", "summary", "df-generated"]
       - ["Microsoft.DotNet.PlatformAbstractions", "HashCodeCombiner", "get_CombinedHash", "()", "summary", "df-generated"]
diff --git a/csharp/ql/lib/ext/generated/Microsoft.Extensions.Caching.Distributed.model.yml b/csharp/ql/lib/ext/generated/Microsoft.Extensions.Caching.Distributed.model.yml
index 7b7f289f928..58f2a9347c4 100644
--- a/csharp/ql/lib/ext/generated/Microsoft.Extensions.Caching.Distributed.model.yml
+++ b/csharp/ql/lib/ext/generated/Microsoft.Extensions.Caching.Distributed.model.yml
@@ -4,16 +4,9 @@ extensions:
       pack: codeql/csharp-all
       extensible: summaryModel
     data:
-      - ["Microsoft.Extensions.Caching.Distributed", "DistributedCacheEntryExtensions", False, "SetAbsoluteExpiration", "(Microsoft.Extensions.Caching.Distributed.DistributedCacheEntryOptions,System.DateTimeOffset)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Extensions.Caching.Distributed", "DistributedCacheEntryExtensions", False, "SetAbsoluteExpiration", "(Microsoft.Extensions.Caching.Distributed.DistributedCacheEntryOptions,System.DateTimeOffset)", "", "Argument[1]", "Argument[0]", "taint", "df-generated"]
-      - ["Microsoft.Extensions.Caching.Distributed", "DistributedCacheEntryExtensions", False, "SetAbsoluteExpiration", "(Microsoft.Extensions.Caching.Distributed.DistributedCacheEntryOptions,System.DateTimeOffset)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Extensions.Caching.Distributed", "DistributedCacheEntryExtensions", False, "SetAbsoluteExpiration", "(Microsoft.Extensions.Caching.Distributed.DistributedCacheEntryOptions,System.TimeSpan)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Extensions.Caching.Distributed", "DistributedCacheEntryExtensions", False, "SetAbsoluteExpiration", "(Microsoft.Extensions.Caching.Distributed.DistributedCacheEntryOptions,System.TimeSpan)", "", "Argument[1]", "Argument[0]", "taint", "df-generated"]
-      - ["Microsoft.Extensions.Caching.Distributed", "DistributedCacheEntryExtensions", False, "SetAbsoluteExpiration", "(Microsoft.Extensions.Caching.Distributed.DistributedCacheEntryOptions,System.TimeSpan)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Extensions.Caching.Distributed", "DistributedCacheEntryExtensions", False, "SetSlidingExpiration", "(Microsoft.Extensions.Caching.Distributed.DistributedCacheEntryOptions,System.TimeSpan)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Extensions.Caching.Distributed", "DistributedCacheEntryExtensions", False, "SetSlidingExpiration", "(Microsoft.Extensions.Caching.Distributed.DistributedCacheEntryOptions,System.TimeSpan)", "", "Argument[1]", "Argument[0]", "taint", "df-generated"]
-      - ["Microsoft.Extensions.Caching.Distributed", "DistributedCacheEntryExtensions", False, "SetSlidingExpiration", "(Microsoft.Extensions.Caching.Distributed.DistributedCacheEntryOptions,System.TimeSpan)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Extensions.Caching.Distributed", "MemoryDistributedCache", False, "MemoryDistributedCache", "(Microsoft.Extensions.Options.IOptions<Microsoft.Extensions.Caching.Memory.MemoryDistributedCacheOptions>,Microsoft.Extensions.Logging.ILoggerFactory)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["Microsoft.Extensions.Caching.Distributed", "DistributedCacheEntryExtensions", False, "SetAbsoluteExpiration", "(Microsoft.Extensions.Caching.Distributed.DistributedCacheEntryOptions,System.DateTimeOffset)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.Caching.Distributed", "DistributedCacheEntryExtensions", False, "SetAbsoluteExpiration", "(Microsoft.Extensions.Caching.Distributed.DistributedCacheEntryOptions,System.TimeSpan)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.Caching.Distributed", "DistributedCacheEntryExtensions", False, "SetSlidingExpiration", "(Microsoft.Extensions.Caching.Distributed.DistributedCacheEntryOptions,System.TimeSpan)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
   - addsTo:
       pack: codeql/csharp-all
       extensible: neutralModel
@@ -37,6 +30,7 @@ extensions:
       - ["Microsoft.Extensions.Caching.Distributed", "MemoryDistributedCache", "Get", "(System.String)", "summary", "df-generated"]
       - ["Microsoft.Extensions.Caching.Distributed", "MemoryDistributedCache", "GetAsync", "(System.String,System.Threading.CancellationToken)", "summary", "df-generated"]
       - ["Microsoft.Extensions.Caching.Distributed", "MemoryDistributedCache", "MemoryDistributedCache", "(Microsoft.Extensions.Options.IOptions<Microsoft.Extensions.Caching.Memory.MemoryDistributedCacheOptions>)", "summary", "df-generated"]
+      - ["Microsoft.Extensions.Caching.Distributed", "MemoryDistributedCache", "MemoryDistributedCache", "(Microsoft.Extensions.Options.IOptions<Microsoft.Extensions.Caching.Memory.MemoryDistributedCacheOptions>,Microsoft.Extensions.Logging.ILoggerFactory)", "summary", "df-generated"]
       - ["Microsoft.Extensions.Caching.Distributed", "MemoryDistributedCache", "Refresh", "(System.String)", "summary", "df-generated"]
       - ["Microsoft.Extensions.Caching.Distributed", "MemoryDistributedCache", "RefreshAsync", "(System.String,System.Threading.CancellationToken)", "summary", "df-generated"]
       - ["Microsoft.Extensions.Caching.Distributed", "MemoryDistributedCache", "Remove", "(System.String)", "summary", "df-generated"]
diff --git a/csharp/ql/lib/ext/generated/Microsoft.Extensions.Caching.Memory.model.yml b/csharp/ql/lib/ext/generated/Microsoft.Extensions.Caching.Memory.model.yml
index fa600c6a788..b8a437e7063 100644
--- a/csharp/ql/lib/ext/generated/Microsoft.Extensions.Caching.Memory.model.yml
+++ b/csharp/ql/lib/ext/generated/Microsoft.Extensions.Caching.Memory.model.yml
@@ -4,51 +4,51 @@ extensions:
       pack: codeql/csharp-all
       extensible: summaryModel
     data:
-      - ["Microsoft.Extensions.Caching.Memory", "CacheEntryExtensions", False, "AddExpirationToken", "(Microsoft.Extensions.Caching.Memory.ICacheEntry,Microsoft.Extensions.Primitives.IChangeToken)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Extensions.Caching.Memory", "CacheEntryExtensions", False, "AddExpirationToken", "(Microsoft.Extensions.Caching.Memory.ICacheEntry,Microsoft.Extensions.Primitives.IChangeToken)", "", "Argument[1]", "Argument[0]", "taint", "df-generated"]
-      - ["Microsoft.Extensions.Caching.Memory", "CacheEntryExtensions", False, "AddExpirationToken", "(Microsoft.Extensions.Caching.Memory.ICacheEntry,Microsoft.Extensions.Primitives.IChangeToken)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Extensions.Caching.Memory", "CacheEntryExtensions", False, "SetAbsoluteExpiration", "(Microsoft.Extensions.Caching.Memory.ICacheEntry,System.DateTimeOffset)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Extensions.Caching.Memory", "CacheEntryExtensions", False, "SetAbsoluteExpiration", "(Microsoft.Extensions.Caching.Memory.ICacheEntry,System.TimeSpan)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Extensions.Caching.Memory", "CacheEntryExtensions", False, "SetOptions", "(Microsoft.Extensions.Caching.Memory.ICacheEntry,Microsoft.Extensions.Caching.Memory.MemoryCacheEntryOptions)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Extensions.Caching.Memory", "CacheEntryExtensions", False, "SetOptions", "(Microsoft.Extensions.Caching.Memory.ICacheEntry,Microsoft.Extensions.Caching.Memory.MemoryCacheEntryOptions)", "", "Argument[1]", "Argument[0]", "taint", "df-generated"]
-      - ["Microsoft.Extensions.Caching.Memory", "CacheEntryExtensions", False, "SetOptions", "(Microsoft.Extensions.Caching.Memory.ICacheEntry,Microsoft.Extensions.Caching.Memory.MemoryCacheEntryOptions)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Extensions.Caching.Memory", "CacheEntryExtensions", False, "SetPriority", "(Microsoft.Extensions.Caching.Memory.ICacheEntry,Microsoft.Extensions.Caching.Memory.CacheItemPriority)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Extensions.Caching.Memory", "CacheEntryExtensions", False, "SetSize", "(Microsoft.Extensions.Caching.Memory.ICacheEntry,System.Int64)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Extensions.Caching.Memory", "CacheEntryExtensions", False, "SetSlidingExpiration", "(Microsoft.Extensions.Caching.Memory.ICacheEntry,System.TimeSpan)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Extensions.Caching.Memory", "CacheEntryExtensions", False, "SetValue", "(Microsoft.Extensions.Caching.Memory.ICacheEntry,System.Object)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Extensions.Caching.Memory", "CacheEntryExtensions", False, "SetValue", "(Microsoft.Extensions.Caching.Memory.ICacheEntry,System.Object)", "", "Argument[1]", "Argument[0]", "taint", "df-generated"]
-      - ["Microsoft.Extensions.Caching.Memory", "CacheEntryExtensions", False, "SetValue", "(Microsoft.Extensions.Caching.Memory.ICacheEntry,System.Object)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Extensions.Caching.Memory", "CacheExtensions", False, "Set<TItem>", "(Microsoft.Extensions.Caching.Memory.IMemoryCache,System.Object,TItem)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Extensions.Caching.Memory", "CacheExtensions", False, "Set<TItem>", "(Microsoft.Extensions.Caching.Memory.IMemoryCache,System.Object,TItem,Microsoft.Extensions.Caching.Memory.MemoryCacheEntryOptions)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Extensions.Caching.Memory", "CacheExtensions", False, "Set<TItem>", "(Microsoft.Extensions.Caching.Memory.IMemoryCache,System.Object,TItem,Microsoft.Extensions.Primitives.IChangeToken)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Extensions.Caching.Memory", "CacheExtensions", False, "Set<TItem>", "(Microsoft.Extensions.Caching.Memory.IMemoryCache,System.Object,TItem,System.DateTimeOffset)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Extensions.Caching.Memory", "CacheExtensions", False, "Set<TItem>", "(Microsoft.Extensions.Caching.Memory.IMemoryCache,System.Object,TItem,System.TimeSpan)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
+      - ["Microsoft.Extensions.Caching.Memory", "CacheEntryExtensions", False, "AddExpirationToken", "(Microsoft.Extensions.Caching.Memory.ICacheEntry,Microsoft.Extensions.Primitives.IChangeToken)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.Caching.Memory", "CacheEntryExtensions", False, "AddExpirationToken", "(Microsoft.Extensions.Caching.Memory.ICacheEntry,Microsoft.Extensions.Primitives.IChangeToken)", "", "Argument[1]", "Argument[0].Property[Microsoft.Extensions.Caching.Memory.ICacheEntry.ExpirationTokens].Element", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.Caching.Memory", "CacheEntryExtensions", False, "AddExpirationToken", "(Microsoft.Extensions.Caching.Memory.ICacheEntry,Microsoft.Extensions.Primitives.IChangeToken)", "", "Argument[1]", "ReturnValue.Property[Microsoft.Extensions.Caching.Memory.ICacheEntry.ExpirationTokens].Element", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.Caching.Memory", "CacheEntryExtensions", False, "RegisterPostEvictionCallback", "(Microsoft.Extensions.Caching.Memory.ICacheEntry,Microsoft.Extensions.Caching.Memory.PostEvictionDelegate)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.Caching.Memory", "CacheEntryExtensions", False, "RegisterPostEvictionCallback", "(Microsoft.Extensions.Caching.Memory.ICacheEntry,Microsoft.Extensions.Caching.Memory.PostEvictionDelegate,System.Object)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.Caching.Memory", "CacheEntryExtensions", False, "SetAbsoluteExpiration", "(Microsoft.Extensions.Caching.Memory.ICacheEntry,System.DateTimeOffset)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.Caching.Memory", "CacheEntryExtensions", False, "SetAbsoluteExpiration", "(Microsoft.Extensions.Caching.Memory.ICacheEntry,System.TimeSpan)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.Caching.Memory", "CacheEntryExtensions", False, "SetOptions", "(Microsoft.Extensions.Caching.Memory.ICacheEntry,Microsoft.Extensions.Caching.Memory.MemoryCacheEntryOptions)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.Caching.Memory", "CacheEntryExtensions", False, "SetOptions", "(Microsoft.Extensions.Caching.Memory.ICacheEntry,Microsoft.Extensions.Caching.Memory.MemoryCacheEntryOptions)", "", "Argument[1].Property[Microsoft.Extensions.Caching.Memory.MemoryCacheEntryOptions.ExpirationTokens].Element", "Argument[0].Property[Microsoft.Extensions.Caching.Memory.ICacheEntry.ExpirationTokens].Element", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.Caching.Memory", "CacheEntryExtensions", False, "SetOptions", "(Microsoft.Extensions.Caching.Memory.ICacheEntry,Microsoft.Extensions.Caching.Memory.MemoryCacheEntryOptions)", "", "Argument[1].Property[Microsoft.Extensions.Caching.Memory.MemoryCacheEntryOptions.ExpirationTokens].Element", "ReturnValue.Property[Microsoft.Extensions.Caching.Memory.ICacheEntry.ExpirationTokens].Element", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.Caching.Memory", "CacheEntryExtensions", False, "SetPriority", "(Microsoft.Extensions.Caching.Memory.ICacheEntry,Microsoft.Extensions.Caching.Memory.CacheItemPriority)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.Caching.Memory", "CacheEntryExtensions", False, "SetSize", "(Microsoft.Extensions.Caching.Memory.ICacheEntry,System.Int64)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.Caching.Memory", "CacheEntryExtensions", False, "SetSlidingExpiration", "(Microsoft.Extensions.Caching.Memory.ICacheEntry,System.TimeSpan)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.Caching.Memory", "CacheEntryExtensions", False, "SetValue", "(Microsoft.Extensions.Caching.Memory.ICacheEntry,System.Object)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.Caching.Memory", "CacheExtensions", False, "GetOrCreate<TItem>", "(Microsoft.Extensions.Caching.Memory.IMemoryCache,System.Object,System.Func<Microsoft.Extensions.Caching.Memory.ICacheEntry,TItem>)", "", "Argument[2].ReturnValue", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.Caching.Memory", "CacheExtensions", False, "GetOrCreate<TItem>", "(Microsoft.Extensions.Caching.Memory.IMemoryCache,System.Object,System.Func<Microsoft.Extensions.Caching.Memory.ICacheEntry,TItem>,Microsoft.Extensions.Caching.Memory.MemoryCacheEntryOptions)", "", "Argument[2].ReturnValue", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.Caching.Memory", "CacheExtensions", False, "Set<TItem>", "(Microsoft.Extensions.Caching.Memory.IMemoryCache,System.Object,TItem)", "", "Argument[2]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.Caching.Memory", "CacheExtensions", False, "Set<TItem>", "(Microsoft.Extensions.Caching.Memory.IMemoryCache,System.Object,TItem,Microsoft.Extensions.Caching.Memory.MemoryCacheEntryOptions)", "", "Argument[2]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.Caching.Memory", "CacheExtensions", False, "Set<TItem>", "(Microsoft.Extensions.Caching.Memory.IMemoryCache,System.Object,TItem,Microsoft.Extensions.Primitives.IChangeToken)", "", "Argument[2]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.Caching.Memory", "CacheExtensions", False, "Set<TItem>", "(Microsoft.Extensions.Caching.Memory.IMemoryCache,System.Object,TItem,System.DateTimeOffset)", "", "Argument[2]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.Caching.Memory", "CacheExtensions", False, "Set<TItem>", "(Microsoft.Extensions.Caching.Memory.IMemoryCache,System.Object,TItem,System.TimeSpan)", "", "Argument[2]", "ReturnValue", "value", "dfc-generated"]
       - ["Microsoft.Extensions.Caching.Memory", "ICacheEntry", True, "get_ExpirationTokens", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["Microsoft.Extensions.Caching.Memory", "ICacheEntry", True, "get_PostEvictionCallbacks", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["Microsoft.Extensions.Caching.Memory", "IMemoryCache", True, "CreateEntry", "(System.Object)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["Microsoft.Extensions.Caching.Memory", "IMemoryCache", True, "CreateEntry", "(System.Object)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["Microsoft.Extensions.Caching.Memory", "MemoryCache", False, "MemoryCache", "(Microsoft.Extensions.Options.IOptions<Microsoft.Extensions.Caching.Memory.MemoryCacheOptions>,Microsoft.Extensions.Logging.ILoggerFactory)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["Microsoft.Extensions.Caching.Memory", "MemoryCacheEntryExtensions", False, "AddExpirationToken", "(Microsoft.Extensions.Caching.Memory.MemoryCacheEntryOptions,Microsoft.Extensions.Primitives.IChangeToken)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Extensions.Caching.Memory", "MemoryCacheEntryExtensions", False, "AddExpirationToken", "(Microsoft.Extensions.Caching.Memory.MemoryCacheEntryOptions,Microsoft.Extensions.Primitives.IChangeToken)", "", "Argument[1]", "Argument[0]", "taint", "df-generated"]
-      - ["Microsoft.Extensions.Caching.Memory", "MemoryCacheEntryExtensions", False, "AddExpirationToken", "(Microsoft.Extensions.Caching.Memory.MemoryCacheEntryOptions,Microsoft.Extensions.Primitives.IChangeToken)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Extensions.Caching.Memory", "MemoryCacheEntryExtensions", False, "SetAbsoluteExpiration", "(Microsoft.Extensions.Caching.Memory.MemoryCacheEntryOptions,System.DateTimeOffset)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Extensions.Caching.Memory", "MemoryCacheEntryExtensions", False, "SetAbsoluteExpiration", "(Microsoft.Extensions.Caching.Memory.MemoryCacheEntryOptions,System.DateTimeOffset)", "", "Argument[1]", "Argument[0]", "taint", "df-generated"]
-      - ["Microsoft.Extensions.Caching.Memory", "MemoryCacheEntryExtensions", False, "SetAbsoluteExpiration", "(Microsoft.Extensions.Caching.Memory.MemoryCacheEntryOptions,System.DateTimeOffset)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Extensions.Caching.Memory", "MemoryCacheEntryExtensions", False, "SetAbsoluteExpiration", "(Microsoft.Extensions.Caching.Memory.MemoryCacheEntryOptions,System.TimeSpan)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Extensions.Caching.Memory", "MemoryCacheEntryExtensions", False, "SetAbsoluteExpiration", "(Microsoft.Extensions.Caching.Memory.MemoryCacheEntryOptions,System.TimeSpan)", "", "Argument[1]", "Argument[0]", "taint", "df-generated"]
-      - ["Microsoft.Extensions.Caching.Memory", "MemoryCacheEntryExtensions", False, "SetAbsoluteExpiration", "(Microsoft.Extensions.Caching.Memory.MemoryCacheEntryOptions,System.TimeSpan)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Extensions.Caching.Memory", "MemoryCacheEntryExtensions", False, "SetPriority", "(Microsoft.Extensions.Caching.Memory.MemoryCacheEntryOptions,Microsoft.Extensions.Caching.Memory.CacheItemPriority)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Extensions.Caching.Memory", "MemoryCacheEntryExtensions", False, "SetSize", "(Microsoft.Extensions.Caching.Memory.MemoryCacheEntryOptions,System.Int64)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Extensions.Caching.Memory", "MemoryCacheEntryExtensions", False, "SetSlidingExpiration", "(Microsoft.Extensions.Caching.Memory.MemoryCacheEntryOptions,System.TimeSpan)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Extensions.Caching.Memory", "MemoryCacheEntryExtensions", False, "SetSlidingExpiration", "(Microsoft.Extensions.Caching.Memory.MemoryCacheEntryOptions,System.TimeSpan)", "", "Argument[1]", "Argument[0]", "taint", "df-generated"]
-      - ["Microsoft.Extensions.Caching.Memory", "MemoryCacheEntryExtensions", False, "SetSlidingExpiration", "(Microsoft.Extensions.Caching.Memory.MemoryCacheEntryOptions,System.TimeSpan)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Extensions.Caching.Memory", "MemoryCacheOptions", False, "get_Value", "()", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["Microsoft.Extensions.Caching.Memory", "MemoryCacheEntryExtensions", False, "AddExpirationToken", "(Microsoft.Extensions.Caching.Memory.MemoryCacheEntryOptions,Microsoft.Extensions.Primitives.IChangeToken)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.Caching.Memory", "MemoryCacheEntryExtensions", False, "AddExpirationToken", "(Microsoft.Extensions.Caching.Memory.MemoryCacheEntryOptions,Microsoft.Extensions.Primitives.IChangeToken)", "", "Argument[1]", "Argument[0].Property[Microsoft.Extensions.Caching.Memory.MemoryCacheEntryOptions.ExpirationTokens].Element", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.Caching.Memory", "MemoryCacheEntryExtensions", False, "AddExpirationToken", "(Microsoft.Extensions.Caching.Memory.MemoryCacheEntryOptions,Microsoft.Extensions.Primitives.IChangeToken)", "", "Argument[1]", "ReturnValue.Property[Microsoft.Extensions.Caching.Memory.MemoryCacheEntryOptions.ExpirationTokens].Element", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.Caching.Memory", "MemoryCacheEntryExtensions", False, "RegisterPostEvictionCallback", "(Microsoft.Extensions.Caching.Memory.MemoryCacheEntryOptions,Microsoft.Extensions.Caching.Memory.PostEvictionDelegate)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.Caching.Memory", "MemoryCacheEntryExtensions", False, "RegisterPostEvictionCallback", "(Microsoft.Extensions.Caching.Memory.MemoryCacheEntryOptions,Microsoft.Extensions.Caching.Memory.PostEvictionDelegate,System.Object)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.Caching.Memory", "MemoryCacheEntryExtensions", False, "SetAbsoluteExpiration", "(Microsoft.Extensions.Caching.Memory.MemoryCacheEntryOptions,System.DateTimeOffset)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.Caching.Memory", "MemoryCacheEntryExtensions", False, "SetAbsoluteExpiration", "(Microsoft.Extensions.Caching.Memory.MemoryCacheEntryOptions,System.TimeSpan)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.Caching.Memory", "MemoryCacheEntryExtensions", False, "SetPriority", "(Microsoft.Extensions.Caching.Memory.MemoryCacheEntryOptions,Microsoft.Extensions.Caching.Memory.CacheItemPriority)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.Caching.Memory", "MemoryCacheEntryExtensions", False, "SetSize", "(Microsoft.Extensions.Caching.Memory.MemoryCacheEntryOptions,System.Int64)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.Caching.Memory", "MemoryCacheEntryExtensions", False, "SetSlidingExpiration", "(Microsoft.Extensions.Caching.Memory.MemoryCacheEntryOptions,System.TimeSpan)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.Caching.Memory", "MemoryCacheOptions", False, "get_Value", "()", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
   - addsTo:
       pack: codeql/csharp-all
       extensible: neutralModel
     data:
       - ["Microsoft.Extensions.Caching.Memory", "CacheExtensions", "Get", "(Microsoft.Extensions.Caching.Memory.IMemoryCache,System.Object)", "summary", "df-generated"]
       - ["Microsoft.Extensions.Caching.Memory", "CacheExtensions", "Get<TItem>", "(Microsoft.Extensions.Caching.Memory.IMemoryCache,System.Object)", "summary", "df-generated"]
+      - ["Microsoft.Extensions.Caching.Memory", "CacheExtensions", "GetOrCreateAsync<TItem>", "(Microsoft.Extensions.Caching.Memory.IMemoryCache,System.Object,System.Func<Microsoft.Extensions.Caching.Memory.ICacheEntry,System.Threading.Tasks.Task<TItem>>)", "summary", "df-generated"]
+      - ["Microsoft.Extensions.Caching.Memory", "CacheExtensions", "GetOrCreateAsync<TItem>", "(Microsoft.Extensions.Caching.Memory.IMemoryCache,System.Object,System.Func<Microsoft.Extensions.Caching.Memory.ICacheEntry,System.Threading.Tasks.Task<TItem>>,Microsoft.Extensions.Caching.Memory.MemoryCacheEntryOptions)", "summary", "df-generated"]
       - ["Microsoft.Extensions.Caching.Memory", "CacheExtensions", "TryGetValue<TItem>", "(Microsoft.Extensions.Caching.Memory.IMemoryCache,System.Object,TItem)", "summary", "df-generated"]
       - ["Microsoft.Extensions.Caching.Memory", "ICacheEntry", "get_Key", "()", "summary", "df-generated"]
       - ["Microsoft.Extensions.Caching.Memory", "IMemoryCache", "GetCurrentStatistics", "()", "summary", "df-generated"]
diff --git a/csharp/ql/lib/ext/generated/Microsoft.Extensions.Configuration.Binder.SourceGeneration.model.yml b/csharp/ql/lib/ext/generated/Microsoft.Extensions.Configuration.Binder.SourceGeneration.model.yml
index b9ec52a5ca1..5493c5823a0 100644
--- a/csharp/ql/lib/ext/generated/Microsoft.Extensions.Configuration.Binder.SourceGeneration.model.yml
+++ b/csharp/ql/lib/ext/generated/Microsoft.Extensions.Configuration.Binder.SourceGeneration.model.yml
@@ -4,30 +4,36 @@ extensions:
       pack: codeql/csharp-all
       extensible: summaryModel
     data:
-      - ["Microsoft.Extensions.Configuration.Binder.SourceGeneration", "BindingExtensions", False, "AsConfigWithChildren", "(Microsoft.Extensions.Configuration.IConfiguration)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Extensions.Configuration.Binder.SourceGeneration", "BindingExtensions", False, "GetValue<T>", "(Microsoft.Extensions.Configuration.IConfiguration,System.String,T)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Extensions.Configuration.Binder.SourceGeneration", "InterceptorInfo", False, "GetInfo", "(Microsoft.Extensions.Configuration.Binder.SourceGeneration.MethodsToGen)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Extensions.Configuration.Binder.SourceGeneration", "MemberSpec", False, "MemberSpec", "(Microsoft.CodeAnalysis.ISymbol,SourceGenerators.TypeRef)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["Microsoft.Extensions.Configuration.Binder.SourceGeneration", "MemberSpec", False, "MemberSpec", "(Microsoft.CodeAnalysis.ISymbol,SourceGenerators.TypeRef)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["Microsoft.Extensions.Configuration.Binder.SourceGeneration", "ObjectSpec", False, "ObjectSpec", "(Microsoft.CodeAnalysis.INamedTypeSymbol,Microsoft.Extensions.Configuration.Binder.SourceGeneration.ObjectInstantiationStrategy,SourceGenerators.ImmutableEquatableArray<Microsoft.Extensions.Configuration.Binder.SourceGeneration.PropertySpec>,SourceGenerators.ImmutableEquatableArray<Microsoft.Extensions.Configuration.Binder.SourceGeneration.ParameterSpec>,System.String)", "", "Argument[2].Element", "Argument[this]", "taint", "df-generated"]
-      - ["Microsoft.Extensions.Configuration.Binder.SourceGeneration", "ObjectSpec", False, "ObjectSpec", "(Microsoft.CodeAnalysis.INamedTypeSymbol,Microsoft.Extensions.Configuration.Binder.SourceGeneration.ObjectInstantiationStrategy,SourceGenerators.ImmutableEquatableArray<Microsoft.Extensions.Configuration.Binder.SourceGeneration.PropertySpec>,SourceGenerators.ImmutableEquatableArray<Microsoft.Extensions.Configuration.Binder.SourceGeneration.ParameterSpec>,System.String)", "", "Argument[3].Element", "Argument[this]", "taint", "df-generated"]
-      - ["Microsoft.Extensions.Configuration.Binder.SourceGeneration", "ObjectSpec", False, "ObjectSpec", "(Microsoft.CodeAnalysis.INamedTypeSymbol,Microsoft.Extensions.Configuration.Binder.SourceGeneration.ObjectInstantiationStrategy,SourceGenerators.ImmutableEquatableArray<Microsoft.Extensions.Configuration.Binder.SourceGeneration.PropertySpec>,SourceGenerators.ImmutableEquatableArray<Microsoft.Extensions.Configuration.Binder.SourceGeneration.ParameterSpec>,System.String)", "", "Argument[4]", "Argument[this]", "taint", "df-generated"]
-      - ["Microsoft.Extensions.Configuration.Binder.SourceGeneration", "TypeSpec", False, "TypeSpec", "(Microsoft.CodeAnalysis.ITypeSymbol)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["Microsoft.Extensions.Configuration.Binder.SourceGeneration", "BindingExtensions", False, "AsConfigWithChildren", "(Microsoft.Extensions.Configuration.IConfiguration)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.Configuration.Binder.SourceGeneration", "BindingExtensions", False, "BindCore", "(Microsoft.Extensions.Configuration.IConfiguration,Microsoft.Extensions.Logging.Console.ConsoleFormatterOptions,System.Boolean,Microsoft.Extensions.Configuration.BinderOptions)", "", "Argument[1]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.Configuration.Binder.SourceGeneration", "BindingExtensions", False, "BindCore", "(Microsoft.Extensions.Configuration.IConfiguration,Microsoft.Extensions.Logging.Console.ConsoleLoggerOptions,System.Boolean,Microsoft.Extensions.Configuration.BinderOptions)", "", "Argument[1]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.Configuration.Binder.SourceGeneration", "BindingExtensions", False, "BindCore", "(Microsoft.Extensions.Configuration.IConfiguration,Microsoft.Extensions.Logging.Console.JsonConsoleFormatterOptions,System.Boolean,Microsoft.Extensions.Configuration.BinderOptions)", "", "Argument[1]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.Configuration.Binder.SourceGeneration", "BindingExtensions", False, "BindCore", "(Microsoft.Extensions.Configuration.IConfiguration,Microsoft.Extensions.Logging.Console.SimpleConsoleFormatterOptions,System.Boolean,Microsoft.Extensions.Configuration.BinderOptions)", "", "Argument[1]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.Configuration.Binder.SourceGeneration", "BindingExtensions", False, "BindCore", "(Microsoft.Extensions.Configuration.IConfiguration,System.Text.Encodings.Web.JavaScriptEncoder,System.Boolean,Microsoft.Extensions.Configuration.BinderOptions)", "", "Argument[1]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.Configuration.Binder.SourceGeneration", "BindingExtensions", False, "BindCore", "(Microsoft.Extensions.Configuration.IConfiguration,System.Text.Json.JsonWriterOptions,System.Boolean,Microsoft.Extensions.Configuration.BinderOptions)", "", "Argument[1]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.Configuration.Binder.SourceGeneration", "BindingExtensions", False, "GetValue<T>", "(Microsoft.Extensions.Configuration.IConfiguration,System.String,T)", "", "Argument[2]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.Configuration.Binder.SourceGeneration", "InterceptorInfo", False, "GetInfo", "(Microsoft.Extensions.Configuration.Binder.SourceGeneration.MethodsToGen)", "", "Argument[this].Property[Microsoft.Extensions.Configuration.Binder.SourceGeneration.InterceptorInfo.ConfigBinder].Element", "ReturnValue.Element", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.Configuration.Binder.SourceGeneration", "InterceptorInfo", False, "GetInfo", "(Microsoft.Extensions.Configuration.Binder.SourceGeneration.MethodsToGen)", "", "Argument[this].Property[Microsoft.Extensions.Configuration.Binder.SourceGeneration.InterceptorInfo.OptionsBuilderExt].Element", "ReturnValue.Element", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.Configuration.Binder.SourceGeneration", "InterceptorInfo", False, "GetInfo", "(Microsoft.Extensions.Configuration.Binder.SourceGeneration.MethodsToGen)", "", "Argument[this].Property[Microsoft.Extensions.Configuration.Binder.SourceGeneration.InterceptorInfo.ServiceCollectionExt].Element", "ReturnValue.Element", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.Configuration.Binder.SourceGeneration", "MemberSpec", False, "MemberSpec", "(Microsoft.CodeAnalysis.ISymbol,SourceGenerators.TypeRef)", "", "Argument[0].Property[Microsoft.CodeAnalysis.ISymbol.Name]", "Argument[this].Property[Microsoft.Extensions.Configuration.Binder.SourceGeneration.MemberSpec.Name]", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.Configuration.Binder.SourceGeneration", "MemberSpec", False, "MemberSpec", "(Microsoft.CodeAnalysis.ISymbol,SourceGenerators.TypeRef)", "", "Argument[1]", "Argument[this].Property[Microsoft.Extensions.Configuration.Binder.SourceGeneration.MemberSpec.TypeRef]", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.Configuration.Binder.SourceGeneration", "ObjectSpec", False, "ObjectSpec", "(Microsoft.CodeAnalysis.INamedTypeSymbol,Microsoft.Extensions.Configuration.Binder.SourceGeneration.ObjectInstantiationStrategy,SourceGenerators.ImmutableEquatableArray<Microsoft.Extensions.Configuration.Binder.SourceGeneration.PropertySpec>,SourceGenerators.ImmutableEquatableArray<Microsoft.Extensions.Configuration.Binder.SourceGeneration.ParameterSpec>,System.String)", "", "Argument[2]", "Argument[this].Property[Microsoft.Extensions.Configuration.Binder.SourceGeneration.ObjectSpec.Properties]", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.Configuration.Binder.SourceGeneration", "ObjectSpec", False, "ObjectSpec", "(Microsoft.CodeAnalysis.INamedTypeSymbol,Microsoft.Extensions.Configuration.Binder.SourceGeneration.ObjectInstantiationStrategy,SourceGenerators.ImmutableEquatableArray<Microsoft.Extensions.Configuration.Binder.SourceGeneration.PropertySpec>,SourceGenerators.ImmutableEquatableArray<Microsoft.Extensions.Configuration.Binder.SourceGeneration.ParameterSpec>,System.String)", "", "Argument[3]", "Argument[this].Property[Microsoft.Extensions.Configuration.Binder.SourceGeneration.ObjectSpec.ConstructorParameters]", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.Configuration.Binder.SourceGeneration", "ObjectSpec", False, "ObjectSpec", "(Microsoft.CodeAnalysis.INamedTypeSymbol,Microsoft.Extensions.Configuration.Binder.SourceGeneration.ObjectInstantiationStrategy,SourceGenerators.ImmutableEquatableArray<Microsoft.Extensions.Configuration.Binder.SourceGeneration.PropertySpec>,SourceGenerators.ImmutableEquatableArray<Microsoft.Extensions.Configuration.Binder.SourceGeneration.ParameterSpec>,System.String)", "", "Argument[4]", "Argument[this].Property[Microsoft.Extensions.Configuration.Binder.SourceGeneration.ObjectSpec.InitExceptionMessage]", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.Configuration.Binder.SourceGeneration", "ParameterSpec", False, "ParameterSpec", "(Microsoft.CodeAnalysis.IParameterSymbol,SourceGenerators.TypeRef)", "", "Argument[this].Property[Microsoft.Extensions.Configuration.Binder.SourceGeneration.MemberSpec.TypeRef].Property[SourceGenerators.TypeRef.FullyQualifiedName]", "Argument[this].Property[Microsoft.Extensions.Configuration.Binder.SourceGeneration.MemberSpec.DefaultValueExpr]", "taint", "dfc-generated"]
+      - ["Microsoft.Extensions.Configuration.Binder.SourceGeneration", "TypeSpec", False, "TypeSpec", "(Microsoft.CodeAnalysis.ITypeSymbol)", "", "Argument[this].Property[Microsoft.Extensions.Configuration.Binder.SourceGeneration.TypeSpec.TypeRef]", "Argument[this].Property[Microsoft.Extensions.Configuration.Binder.SourceGeneration.TypeSpec.EffectiveTypeRef]", "value", "dfc-generated"]
   - addsTo:
       pack: codeql/csharp-all
       extensible: neutralModel
     data:
-      - ["Microsoft.Extensions.Configuration.Binder.SourceGeneration", "BindingExtensions", "BindCore", "(Microsoft.Extensions.Configuration.IConfiguration,Microsoft.Extensions.Logging.Console.ConsoleFormatterOptions,System.Boolean,Microsoft.Extensions.Configuration.BinderOptions)", "summary", "df-generated"]
-      - ["Microsoft.Extensions.Configuration.Binder.SourceGeneration", "BindingExtensions", "BindCore", "(Microsoft.Extensions.Configuration.IConfiguration,Microsoft.Extensions.Logging.Console.ConsoleLoggerOptions,System.Boolean,Microsoft.Extensions.Configuration.BinderOptions)", "summary", "df-generated"]
-      - ["Microsoft.Extensions.Configuration.Binder.SourceGeneration", "BindingExtensions", "BindCore", "(Microsoft.Extensions.Configuration.IConfiguration,Microsoft.Extensions.Logging.Console.JsonConsoleFormatterOptions,System.Boolean,Microsoft.Extensions.Configuration.BinderOptions)", "summary", "df-generated"]
-      - ["Microsoft.Extensions.Configuration.Binder.SourceGeneration", "BindingExtensions", "BindCore", "(Microsoft.Extensions.Configuration.IConfiguration,Microsoft.Extensions.Logging.Console.SimpleConsoleFormatterOptions,System.Boolean,Microsoft.Extensions.Configuration.BinderOptions)", "summary", "df-generated"]
-      - ["Microsoft.Extensions.Configuration.Binder.SourceGeneration", "BindingExtensions", "BindCore", "(Microsoft.Extensions.Configuration.IConfiguration,System.Text.Encodings.Web.JavaScriptEncoder,System.Boolean,Microsoft.Extensions.Configuration.BinderOptions)", "summary", "df-generated"]
-      - ["Microsoft.Extensions.Configuration.Binder.SourceGeneration", "BindingExtensions", "BindCore", "(Microsoft.Extensions.Configuration.IConfiguration,System.Text.Json.JsonWriterOptions,System.Boolean,Microsoft.Extensions.Configuration.BinderOptions)", "summary", "df-generated"]
       - ["Microsoft.Extensions.Configuration.Binder.SourceGeneration", "BindingExtensions", "Bind_ConsoleFormatterOptions", "(Microsoft.Extensions.Configuration.IConfiguration,System.Object)", "summary", "df-generated"]
       - ["Microsoft.Extensions.Configuration.Binder.SourceGeneration", "BindingExtensions", "Bind_ConsoleLoggerOptions", "(Microsoft.Extensions.Configuration.IConfiguration,System.Object)", "summary", "df-generated"]
       - ["Microsoft.Extensions.Configuration.Binder.SourceGeneration", "BindingExtensions", "Bind_JsonConsoleFormatterOptions", "(Microsoft.Extensions.Configuration.IConfiguration,System.Object)", "summary", "df-generated"]
       - ["Microsoft.Extensions.Configuration.Binder.SourceGeneration", "BindingExtensions", "Bind_SimpleConsoleFormatterOptions", "(Microsoft.Extensions.Configuration.IConfiguration,System.Object)", "summary", "df-generated"]
       - ["Microsoft.Extensions.Configuration.Binder.SourceGeneration", "BindingExtensions", "GetValueCore", "(Microsoft.Extensions.Configuration.IConfiguration,System.Type,System.String)", "summary", "df-generated"]
+      - ["Microsoft.Extensions.Configuration.Binder.SourceGeneration", "BindingExtensions", "ParseBool", "(System.String,System.Func<System.String>)", "summary", "df-generated"]
+      - ["Microsoft.Extensions.Configuration.Binder.SourceGeneration", "BindingExtensions", "ParseEnum<T>", "(System.String,System.Func<System.String>)", "summary", "df-generated"]
+      - ["Microsoft.Extensions.Configuration.Binder.SourceGeneration", "BindingExtensions", "ParseInt", "(System.String,System.Func<System.String>)", "summary", "df-generated"]
       - ["Microsoft.Extensions.Configuration.Binder.SourceGeneration", "BindingExtensions", "ValidateConfigurationKeys", "(System.Type,System.Lazy<System.Collections.Generic.HashSet<System.String>>,Microsoft.Extensions.Configuration.IConfiguration,Microsoft.Extensions.Configuration.BinderOptions)", "summary", "df-generated"]
       - ["Microsoft.Extensions.Configuration.Binder.SourceGeneration", "BindingHelperInfo", "op_Equality", "(Microsoft.Extensions.Configuration.Binder.SourceGeneration.BindingHelperInfo,Microsoft.Extensions.Configuration.Binder.SourceGeneration.BindingHelperInfo)", "summary", "df-generated"]
       - ["Microsoft.Extensions.Configuration.Binder.SourceGeneration", "BindingHelperInfo", "op_Inequality", "(Microsoft.Extensions.Configuration.Binder.SourceGeneration.BindingHelperInfo,Microsoft.Extensions.Configuration.Binder.SourceGeneration.BindingHelperInfo)", "summary", "df-generated"]
@@ -61,7 +67,6 @@ extensions:
       - ["Microsoft.Extensions.Configuration.Binder.SourceGeneration", "ObjectSpec", "get_Properties", "()", "summary", "df-generated"]
       - ["Microsoft.Extensions.Configuration.Binder.SourceGeneration", "ObjectSpec", "op_Equality", "(Microsoft.Extensions.Configuration.Binder.SourceGeneration.ObjectSpec,Microsoft.Extensions.Configuration.Binder.SourceGeneration.ObjectSpec)", "summary", "df-generated"]
       - ["Microsoft.Extensions.Configuration.Binder.SourceGeneration", "ObjectSpec", "op_Inequality", "(Microsoft.Extensions.Configuration.Binder.SourceGeneration.ObjectSpec,Microsoft.Extensions.Configuration.Binder.SourceGeneration.ObjectSpec)", "summary", "df-generated"]
-      - ["Microsoft.Extensions.Configuration.Binder.SourceGeneration", "ParameterSpec", "ParameterSpec", "(Microsoft.CodeAnalysis.IParameterSymbol,SourceGenerators.TypeRef)", "summary", "df-generated"]
       - ["Microsoft.Extensions.Configuration.Binder.SourceGeneration", "ParameterSpec", "get_CanGet", "()", "summary", "df-generated"]
       - ["Microsoft.Extensions.Configuration.Binder.SourceGeneration", "ParameterSpec", "get_CanSet", "()", "summary", "df-generated"]
       - ["Microsoft.Extensions.Configuration.Binder.SourceGeneration", "ParameterSpec", "get_EqualityContract", "()", "summary", "df-generated"]
diff --git a/csharp/ql/lib/ext/generated/Microsoft.Extensions.Configuration.CommandLine.model.yml b/csharp/ql/lib/ext/generated/Microsoft.Extensions.Configuration.CommandLine.model.yml
index be719f1bf1b..d6887bfa0a4 100644
--- a/csharp/ql/lib/ext/generated/Microsoft.Extensions.Configuration.CommandLine.model.yml
+++ b/csharp/ql/lib/ext/generated/Microsoft.Extensions.Configuration.CommandLine.model.yml
@@ -6,3 +6,4 @@ extensions:
     data:
       - ["Microsoft.Extensions.Configuration.CommandLine", "CommandLineConfigurationProvider", "CommandLineConfigurationProvider", "(System.Collections.Generic.IEnumerable<System.String>,System.Collections.Generic.IDictionary<System.String,System.String>)", "summary", "df-generated"]
       - ["Microsoft.Extensions.Configuration.CommandLine", "CommandLineConfigurationProvider", "Load", "()", "summary", "df-generated"]
+      - ["Microsoft.Extensions.Configuration.CommandLine", "CommandLineConfigurationSource", "Build", "(Microsoft.Extensions.Configuration.IConfigurationBuilder)", "summary", "df-generated"]
diff --git a/csharp/ql/lib/ext/generated/Microsoft.Extensions.Configuration.EnvironmentVariables.model.yml b/csharp/ql/lib/ext/generated/Microsoft.Extensions.Configuration.EnvironmentVariables.model.yml
index 0453e0da72f..9391d7ae32f 100644
--- a/csharp/ql/lib/ext/generated/Microsoft.Extensions.Configuration.EnvironmentVariables.model.yml
+++ b/csharp/ql/lib/ext/generated/Microsoft.Extensions.Configuration.EnvironmentVariables.model.yml
@@ -4,9 +4,11 @@ extensions:
       pack: codeql/csharp-all
       extensible: summaryModel
     data:
-      - ["Microsoft.Extensions.Configuration.EnvironmentVariables", "EnvironmentVariablesConfigurationProvider", False, "EnvironmentVariablesConfigurationProvider", "(System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["Microsoft.Extensions.Configuration.EnvironmentVariables", "EnvironmentVariablesConfigurationProvider", False, "EnvironmentVariablesConfigurationProvider", "(System.String)", "", "Argument[0]", "Argument[this].SyntheticField[Microsoft.Extensions.Configuration.EnvironmentVariables.EnvironmentVariablesConfigurationProvider._prefix]", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.Configuration.EnvironmentVariables", "EnvironmentVariablesConfigurationProvider", False, "ToString", "()", "", "Argument[this].SyntheticField[Microsoft.Extensions.Configuration.EnvironmentVariables.EnvironmentVariablesConfigurationProvider._prefix]", "ReturnValue", "taint", "dfc-generated"]
   - addsTo:
       pack: codeql/csharp-all
       extensible: neutralModel
     data:
       - ["Microsoft.Extensions.Configuration.EnvironmentVariables", "EnvironmentVariablesConfigurationProvider", "Load", "()", "summary", "df-generated"]
+      - ["Microsoft.Extensions.Configuration.EnvironmentVariables", "EnvironmentVariablesConfigurationSource", "Build", "(Microsoft.Extensions.Configuration.IConfigurationBuilder)", "summary", "df-generated"]
diff --git a/csharp/ql/lib/ext/generated/Microsoft.Extensions.Configuration.Ini.model.yml b/csharp/ql/lib/ext/generated/Microsoft.Extensions.Configuration.Ini.model.yml
index 5e9b283811a..23d983d193c 100644
--- a/csharp/ql/lib/ext/generated/Microsoft.Extensions.Configuration.Ini.model.yml
+++ b/csharp/ql/lib/ext/generated/Microsoft.Extensions.Configuration.Ini.model.yml
@@ -6,6 +6,8 @@ extensions:
     data:
       - ["Microsoft.Extensions.Configuration.Ini", "IniConfigurationProvider", "IniConfigurationProvider", "(Microsoft.Extensions.Configuration.Ini.IniConfigurationSource)", "summary", "df-generated"]
       - ["Microsoft.Extensions.Configuration.Ini", "IniConfigurationProvider", "Load", "(System.IO.Stream)", "summary", "df-generated"]
+      - ["Microsoft.Extensions.Configuration.Ini", "IniConfigurationSource", "Build", "(Microsoft.Extensions.Configuration.IConfigurationBuilder)", "summary", "df-generated"]
       - ["Microsoft.Extensions.Configuration.Ini", "IniStreamConfigurationProvider", "IniStreamConfigurationProvider", "(Microsoft.Extensions.Configuration.Ini.IniStreamConfigurationSource)", "summary", "df-generated"]
       - ["Microsoft.Extensions.Configuration.Ini", "IniStreamConfigurationProvider", "Load", "(System.IO.Stream)", "summary", "df-generated"]
       - ["Microsoft.Extensions.Configuration.Ini", "IniStreamConfigurationProvider", "Read", "(System.IO.Stream)", "summary", "df-generated"]
+      - ["Microsoft.Extensions.Configuration.Ini", "IniStreamConfigurationSource", "Build", "(Microsoft.Extensions.Configuration.IConfigurationBuilder)", "summary", "df-generated"]
diff --git a/csharp/ql/lib/ext/generated/Microsoft.Extensions.Configuration.Json.model.yml b/csharp/ql/lib/ext/generated/Microsoft.Extensions.Configuration.Json.model.yml
index 788cc726480..4aa51d6d325 100644
--- a/csharp/ql/lib/ext/generated/Microsoft.Extensions.Configuration.Json.model.yml
+++ b/csharp/ql/lib/ext/generated/Microsoft.Extensions.Configuration.Json.model.yml
@@ -6,5 +6,7 @@ extensions:
     data:
       - ["Microsoft.Extensions.Configuration.Json", "JsonConfigurationProvider", "JsonConfigurationProvider", "(Microsoft.Extensions.Configuration.Json.JsonConfigurationSource)", "summary", "df-generated"]
       - ["Microsoft.Extensions.Configuration.Json", "JsonConfigurationProvider", "Load", "(System.IO.Stream)", "summary", "df-generated"]
+      - ["Microsoft.Extensions.Configuration.Json", "JsonConfigurationSource", "Build", "(Microsoft.Extensions.Configuration.IConfigurationBuilder)", "summary", "df-generated"]
       - ["Microsoft.Extensions.Configuration.Json", "JsonStreamConfigurationProvider", "JsonStreamConfigurationProvider", "(Microsoft.Extensions.Configuration.Json.JsonStreamConfigurationSource)", "summary", "df-generated"]
       - ["Microsoft.Extensions.Configuration.Json", "JsonStreamConfigurationProvider", "Load", "(System.IO.Stream)", "summary", "df-generated"]
+      - ["Microsoft.Extensions.Configuration.Json", "JsonStreamConfigurationSource", "Build", "(Microsoft.Extensions.Configuration.IConfigurationBuilder)", "summary", "df-generated"]
diff --git a/csharp/ql/lib/ext/generated/Microsoft.Extensions.Configuration.Memory.model.yml b/csharp/ql/lib/ext/generated/Microsoft.Extensions.Configuration.Memory.model.yml
index 3c062d97c7c..5befa2883de 100644
--- a/csharp/ql/lib/ext/generated/Microsoft.Extensions.Configuration.Memory.model.yml
+++ b/csharp/ql/lib/ext/generated/Microsoft.Extensions.Configuration.Memory.model.yml
@@ -10,3 +10,4 @@ extensions:
       extensible: neutralModel
     data:
       - ["Microsoft.Extensions.Configuration.Memory", "MemoryConfigurationProvider", "Add", "(System.String,System.String)", "summary", "df-generated"]
+      - ["Microsoft.Extensions.Configuration.Memory", "MemoryConfigurationSource", "Build", "(Microsoft.Extensions.Configuration.IConfigurationBuilder)", "summary", "df-generated"]
diff --git a/csharp/ql/lib/ext/generated/Microsoft.Extensions.Configuration.UserSecrets.model.yml b/csharp/ql/lib/ext/generated/Microsoft.Extensions.Configuration.UserSecrets.model.yml
index 9394ce3e180..dd396ea022e 100644
--- a/csharp/ql/lib/ext/generated/Microsoft.Extensions.Configuration.UserSecrets.model.yml
+++ b/csharp/ql/lib/ext/generated/Microsoft.Extensions.Configuration.UserSecrets.model.yml
@@ -4,7 +4,7 @@ extensions:
       pack: codeql/csharp-all
       extensible: summaryModel
     data:
-      - ["Microsoft.Extensions.Configuration.UserSecrets", "PathHelper", False, "GetSecretsPathFromSecretsId", "(System.String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["Microsoft.Extensions.Configuration.UserSecrets", "PathHelper", False, "GetSecretsPathFromSecretsId", "(System.String)", "", "Argument[0]", "ReturnValue", "taint", "dfc-generated"]
   - addsTo:
       pack: codeql/csharp-all
       extensible: sourceModel
diff --git a/csharp/ql/lib/ext/generated/Microsoft.Extensions.Configuration.Xml.model.yml b/csharp/ql/lib/ext/generated/Microsoft.Extensions.Configuration.Xml.model.yml
index c46bcd4e712..f3896c5a971 100644
--- a/csharp/ql/lib/ext/generated/Microsoft.Extensions.Configuration.Xml.model.yml
+++ b/csharp/ql/lib/ext/generated/Microsoft.Extensions.Configuration.Xml.model.yml
@@ -4,14 +4,16 @@ extensions:
       pack: codeql/csharp-all
       extensible: summaryModel
     data:
-      - ["Microsoft.Extensions.Configuration.Xml", "XmlDocumentDecryptor", False, "CreateDecryptingXmlReader", "(System.IO.Stream,System.Xml.XmlReaderSettings)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["Microsoft.Extensions.Configuration.Xml", "XmlDocumentDecryptor", False, "CreateDecryptingXmlReader", "(System.IO.Stream,System.Xml.XmlReaderSettings)", "", "Argument[0]", "ReturnValue", "taint", "dfc-generated"]
+      - ["Microsoft.Extensions.Configuration.Xml", "XmlDocumentDecryptor", True, "DecryptDocumentAndCreateXmlReader", "(System.Xml.XmlDocument)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
+      - ["Microsoft.Extensions.Configuration.Xml", "XmlStreamConfigurationProvider", False, "Read", "(System.IO.Stream,Microsoft.Extensions.Configuration.Xml.XmlDocumentDecryptor)", "", "Argument[0]", "Argument[1]", "taint", "df-generated"]
   - addsTo:
       pack: codeql/csharp-all
       extensible: neutralModel
     data:
       - ["Microsoft.Extensions.Configuration.Xml", "XmlConfigurationProvider", "Load", "(System.IO.Stream)", "summary", "df-generated"]
       - ["Microsoft.Extensions.Configuration.Xml", "XmlConfigurationProvider", "XmlConfigurationProvider", "(Microsoft.Extensions.Configuration.Xml.XmlConfigurationSource)", "summary", "df-generated"]
-      - ["Microsoft.Extensions.Configuration.Xml", "XmlDocumentDecryptor", "DecryptDocumentAndCreateXmlReader", "(System.Xml.XmlDocument)", "summary", "df-generated"]
+      - ["Microsoft.Extensions.Configuration.Xml", "XmlConfigurationSource", "Build", "(Microsoft.Extensions.Configuration.IConfigurationBuilder)", "summary", "df-generated"]
       - ["Microsoft.Extensions.Configuration.Xml", "XmlStreamConfigurationProvider", "Load", "(System.IO.Stream)", "summary", "df-generated"]
-      - ["Microsoft.Extensions.Configuration.Xml", "XmlStreamConfigurationProvider", "Read", "(System.IO.Stream,Microsoft.Extensions.Configuration.Xml.XmlDocumentDecryptor)", "summary", "df-generated"]
       - ["Microsoft.Extensions.Configuration.Xml", "XmlStreamConfigurationProvider", "XmlStreamConfigurationProvider", "(Microsoft.Extensions.Configuration.Xml.XmlStreamConfigurationSource)", "summary", "df-generated"]
+      - ["Microsoft.Extensions.Configuration.Xml", "XmlStreamConfigurationSource", "Build", "(Microsoft.Extensions.Configuration.IConfigurationBuilder)", "summary", "df-generated"]
diff --git a/csharp/ql/lib/ext/generated/Microsoft.Extensions.Configuration.model.yml b/csharp/ql/lib/ext/generated/Microsoft.Extensions.Configuration.model.yml
index e34cd992a27..95b0eb690a7 100644
--- a/csharp/ql/lib/ext/generated/Microsoft.Extensions.Configuration.model.yml
+++ b/csharp/ql/lib/ext/generated/Microsoft.Extensions.Configuration.model.yml
@@ -4,77 +4,76 @@ extensions:
       pack: codeql/csharp-all
       extensible: summaryModel
     data:
-      - ["Microsoft.Extensions.Configuration", "ChainedBuilderExtensions", False, "AddConfiguration", "(Microsoft.Extensions.Configuration.IConfigurationBuilder,Microsoft.Extensions.Configuration.IConfiguration)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Extensions.Configuration", "ChainedBuilderExtensions", False, "AddConfiguration", "(Microsoft.Extensions.Configuration.IConfigurationBuilder,Microsoft.Extensions.Configuration.IConfiguration,System.Boolean)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Extensions.Configuration", "ChainedConfigurationProvider", False, "ChainedConfigurationProvider", "(Microsoft.Extensions.Configuration.ChainedConfigurationSource)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["Microsoft.Extensions.Configuration", "ChainedConfigurationProvider", False, "get_Configuration", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["Microsoft.Extensions.Configuration", "ChainedBuilderExtensions", False, "AddConfiguration", "(Microsoft.Extensions.Configuration.IConfigurationBuilder,Microsoft.Extensions.Configuration.IConfiguration)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.Configuration", "ChainedBuilderExtensions", False, "AddConfiguration", "(Microsoft.Extensions.Configuration.IConfigurationBuilder,Microsoft.Extensions.Configuration.IConfiguration,System.Boolean)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.Configuration", "ChainedConfigurationProvider", False, "ChainedConfigurationProvider", "(Microsoft.Extensions.Configuration.ChainedConfigurationSource)", "", "Argument[0].Property[Microsoft.Extensions.Configuration.ChainedConfigurationSource.Configuration]", "Argument[this].SyntheticField[Microsoft.Extensions.Configuration.ChainedConfigurationProvider._config]", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.Configuration", "ChainedConfigurationProvider", False, "TryGet", "(System.String,System.String)", "", "Argument[this].SyntheticField[Microsoft.Extensions.Configuration.ChainedConfigurationProvider._config]", "ReturnValue", "taint", "dfc-generated"]
+      - ["Microsoft.Extensions.Configuration", "ChainedConfigurationProvider", False, "get_Configuration", "()", "", "Argument[this].SyntheticField[Microsoft.Extensions.Configuration.ChainedConfigurationProvider._config]", "ReturnValue", "value", "dfc-generated"]
       - ["Microsoft.Extensions.Configuration", "ConfigurationBinder", False, "Get", "(Microsoft.Extensions.Configuration.IConfiguration,System.Type)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["Microsoft.Extensions.Configuration", "ConfigurationBinder", False, "Get<T>", "(Microsoft.Extensions.Configuration.IConfiguration)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Extensions.Configuration", "ConfigurationBinder", False, "GetValue", "(Microsoft.Extensions.Configuration.IConfiguration,System.Type,System.String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Extensions.Configuration", "ConfigurationBinder", False, "GetValue", "(Microsoft.Extensions.Configuration.IConfiguration,System.Type,System.String,System.Object)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Extensions.Configuration", "ConfigurationBinder", False, "GetValue", "(Microsoft.Extensions.Configuration.IConfiguration,System.Type,System.String,System.Object)", "", "Argument[3]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Extensions.Configuration", "ConfigurationBinder", False, "GetValue<T>", "(Microsoft.Extensions.Configuration.IConfiguration,System.String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Extensions.Configuration", "ConfigurationBinder", False, "GetValue<T>", "(Microsoft.Extensions.Configuration.IConfiguration,System.String,T)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Extensions.Configuration", "ConfigurationBinder", False, "GetValue<T>", "(Microsoft.Extensions.Configuration.IConfiguration,System.String,T)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Extensions.Configuration", "ConfigurationExtensions", False, "AsEnumerable", "(Microsoft.Extensions.Configuration.IConfiguration)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Extensions.Configuration", "ConfigurationExtensions", False, "AsEnumerable", "(Microsoft.Extensions.Configuration.IConfiguration,System.Boolean)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Extensions.Configuration", "ConfigurationExtensions", False, "GetConnectionString", "(Microsoft.Extensions.Configuration.IConfiguration,System.String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Extensions.Configuration", "ConfigurationExtensions", False, "GetRequiredSection", "(Microsoft.Extensions.Configuration.IConfiguration,System.String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Extensions.Configuration", "ConfigurationExtensions", False, "GetRequiredSection", "(Microsoft.Extensions.Configuration.IConfiguration,System.String)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Extensions.Configuration", "ConfigurationPath", False, "Combine", "(System.Collections.Generic.IEnumerable<System.String>)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Extensions.Configuration", "ConfigurationPath", False, "Combine", "(System.String[])", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Extensions.Configuration", "ConfigurationPath", False, "GetParentPath", "(System.String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Extensions.Configuration", "ConfigurationPath", False, "GetSectionKey", "(System.String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Extensions.Configuration", "ConfigurationProvider", False, "ToString", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Extensions.Configuration", "ConfigurationRoot", False, "ConfigurationRoot", "(System.Collections.Generic.IList<Microsoft.Extensions.Configuration.IConfigurationProvider>)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["Microsoft.Extensions.Configuration", "ConfigurationRootExtensions", False, "GetDebugView", "(Microsoft.Extensions.Configuration.IConfigurationRoot)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Extensions.Configuration", "ConfigurationSection", False, "ConfigurationSection", "(Microsoft.Extensions.Configuration.IConfigurationRoot,System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["Microsoft.Extensions.Configuration", "ConfigurationSection", False, "ConfigurationSection", "(Microsoft.Extensions.Configuration.IConfigurationRoot,System.String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["Microsoft.Extensions.Configuration", "EnvironmentVariablesExtensions", False, "AddEnvironmentVariables", "(Microsoft.Extensions.Configuration.IConfigurationBuilder)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Extensions.Configuration", "EnvironmentVariablesExtensions", False, "AddEnvironmentVariables", "(Microsoft.Extensions.Configuration.IConfigurationBuilder,System.String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["Microsoft.Extensions.Configuration", "ConfigurationBinder", False, "GetValue", "(Microsoft.Extensions.Configuration.IConfiguration,System.Type,System.String,System.Object)", "", "Argument[3]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.Configuration", "ConfigurationBinder", False, "GetValue<T>", "(Microsoft.Extensions.Configuration.IConfiguration,System.String,T)", "", "Argument[2]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.Configuration", "ConfigurationBuilder", False, "Add", "(Microsoft.Extensions.Configuration.IConfigurationSource)", "", "Argument[0]", "Argument[this].SyntheticField[Microsoft.Extensions.Configuration.ConfigurationBuilder._sources].Element", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.Configuration", "ConfigurationBuilder", False, "Add", "(Microsoft.Extensions.Configuration.IConfigurationSource)", "", "Argument[0]", "ReturnValue.SyntheticField[Microsoft.Extensions.Configuration.ConfigurationBuilder._sources].Element", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.Configuration", "ConfigurationBuilder", False, "get_Sources", "()", "", "Argument[this].SyntheticField[Microsoft.Extensions.Configuration.ConfigurationBuilder._sources]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.Configuration", "ConfigurationExtensions", False, "Add<TSource>", "(Microsoft.Extensions.Configuration.IConfigurationBuilder,System.Action<TSource>)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.Configuration", "ConfigurationManager", False, "Add", "(Microsoft.Extensions.Configuration.IConfigurationSource)", "", "Argument[0]", "Argument[this].SyntheticField[Microsoft.Extensions.Configuration.ConfigurationManager._sources].Element", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.Configuration", "ConfigurationManager", False, "Add", "(Microsoft.Extensions.Configuration.IConfigurationSource)", "", "Argument[0]", "ReturnValue.SyntheticField[Microsoft.Extensions.Configuration.ConfigurationManager._sources].Element", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.Configuration", "ConfigurationManager", False, "get_Sources", "()", "", "Argument[this].SyntheticField[Microsoft.Extensions.Configuration.ConfigurationManager._sources]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.Configuration", "ConfigurationPath", False, "Combine", "(System.Collections.Generic.IEnumerable<System.String>)", "", "Argument[0].Element", "ReturnValue", "taint", "dfc-generated"]
+      - ["Microsoft.Extensions.Configuration", "ConfigurationPath", False, "Combine", "(System.String[])", "", "Argument[0].Element", "ReturnValue", "taint", "dfc-generated"]
+      - ["Microsoft.Extensions.Configuration", "ConfigurationPath", False, "GetParentPath", "(System.String)", "", "Argument[0]", "ReturnValue", "taint", "dfc-generated"]
+      - ["Microsoft.Extensions.Configuration", "ConfigurationPath", False, "GetSectionKey", "(System.String)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.Configuration", "ConfigurationRoot", False, "ConfigurationRoot", "(System.Collections.Generic.IList<Microsoft.Extensions.Configuration.IConfigurationProvider>)", "", "Argument[0]", "Argument[this].SyntheticField[Microsoft.Extensions.Configuration.ConfigurationRoot._providers]", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.Configuration", "ConfigurationRoot", False, "get_Providers", "()", "", "Argument[this].SyntheticField[Microsoft.Extensions.Configuration.ConfigurationRoot._providers]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.Configuration", "ConfigurationRootExtensions", False, "GetDebugView", "(Microsoft.Extensions.Configuration.IConfigurationRoot)", "", "Argument[0].Property[Microsoft.Extensions.Configuration.IConfigurationRoot.Providers].Element", "ReturnValue", "taint", "dfc-generated"]
+      - ["Microsoft.Extensions.Configuration", "ConfigurationRootExtensions", False, "GetDebugView", "(Microsoft.Extensions.Configuration.IConfigurationRoot,System.Func<Microsoft.Extensions.Configuration.ConfigurationDebugViewContext,System.String>)", "", "Argument[0].Property[Microsoft.Extensions.Configuration.IConfigurationRoot.Providers].Element", "ReturnValue", "taint", "dfc-generated"]
+      - ["Microsoft.Extensions.Configuration", "ConfigurationRootExtensions", False, "GetDebugView", "(Microsoft.Extensions.Configuration.IConfigurationRoot,System.Func<Microsoft.Extensions.Configuration.ConfigurationDebugViewContext,System.String>)", "", "Argument[1].ReturnValue", "ReturnValue", "taint", "dfc-generated"]
+      - ["Microsoft.Extensions.Configuration", "ConfigurationSection", False, "ConfigurationSection", "(Microsoft.Extensions.Configuration.IConfigurationRoot,System.String)", "", "Argument[1]", "Argument[this].SyntheticField[Microsoft.Extensions.Configuration.ConfigurationSection._path]", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.Configuration", "ConfigurationSection", False, "get_Path", "()", "", "Argument[this].SyntheticField[Microsoft.Extensions.Configuration.ConfigurationSection._path]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.Configuration", "EnvironmentVariablesExtensions", False, "AddEnvironmentVariables", "(Microsoft.Extensions.Configuration.IConfigurationBuilder)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.Configuration", "EnvironmentVariablesExtensions", False, "AddEnvironmentVariables", "(Microsoft.Extensions.Configuration.IConfigurationBuilder,System.Action<Microsoft.Extensions.Configuration.EnvironmentVariables.EnvironmentVariablesConfigurationSource>)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.Configuration", "EnvironmentVariablesExtensions", False, "AddEnvironmentVariables", "(Microsoft.Extensions.Configuration.IConfigurationBuilder,System.String)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
       - ["Microsoft.Extensions.Configuration", "FileConfigurationExtensions", False, "GetFileLoadExceptionHandler", "(Microsoft.Extensions.Configuration.IConfigurationBuilder)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["Microsoft.Extensions.Configuration", "FileConfigurationExtensions", False, "GetFileProvider", "(Microsoft.Extensions.Configuration.IConfigurationBuilder)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Extensions.Configuration", "FileConfigurationExtensions", False, "SetBasePath", "(Microsoft.Extensions.Configuration.IConfigurationBuilder,System.String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Extensions.Configuration", "FileConfigurationExtensions", False, "SetFileProvider", "(Microsoft.Extensions.Configuration.IConfigurationBuilder,Microsoft.Extensions.FileProviders.IFileProvider)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["Microsoft.Extensions.Configuration", "FileConfigurationExtensions", False, "SetBasePath", "(Microsoft.Extensions.Configuration.IConfigurationBuilder,System.String)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.Configuration", "FileConfigurationExtensions", False, "SetFileLoadExceptionHandler", "(Microsoft.Extensions.Configuration.IConfigurationBuilder,System.Action<Microsoft.Extensions.Configuration.FileLoadExceptionContext>)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.Configuration", "FileConfigurationExtensions", False, "SetFileProvider", "(Microsoft.Extensions.Configuration.IConfigurationBuilder,Microsoft.Extensions.FileProviders.IFileProvider)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.Configuration", "FileConfigurationProvider", False, "ToString", "()", "", "Argument[this].Property[Microsoft.Extensions.Configuration.FileConfigurationProvider.Source].Property[Microsoft.Extensions.Configuration.FileConfigurationSource.Path]", "ReturnValue", "taint", "dfc-generated"]
       - ["Microsoft.Extensions.Configuration", "IConfiguration", True, "GetReloadToken", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Extensions.Configuration", "IConfiguration", True, "GetSection", "(System.String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Extensions.Configuration", "IConfiguration", True, "GetSection", "(System.String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Extensions.Configuration", "IConfigurationBuilder", True, "Add", "(Microsoft.Extensions.Configuration.IConfigurationSource)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["Microsoft.Extensions.Configuration", "IConfigurationBuilder", True, "Add", "(Microsoft.Extensions.Configuration.IConfigurationSource)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["Microsoft.Extensions.Configuration", "IConfigurationBuilder", True, "Add", "(Microsoft.Extensions.Configuration.IConfigurationSource)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
       - ["Microsoft.Extensions.Configuration", "IConfigurationBuilder", True, "get_Properties", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Extensions.Configuration", "IConfigurationBuilder", True, "get_Sources", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Extensions.Configuration", "IConfigurationProvider", True, "GetChildKeys", "(System.Collections.Generic.IEnumerable<System.String>,System.String)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Extensions.Configuration", "IConfigurationProvider", True, "GetChildKeys", "(System.Collections.Generic.IEnumerable<System.String>,System.String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["Microsoft.Extensions.Configuration", "IConfigurationProvider", True, "GetChildKeys", "(System.Collections.Generic.IEnumerable<System.String>,System.String)", "", "Argument[0].Element", "ReturnValue.Element", "value", "dfc-generated"]
       - ["Microsoft.Extensions.Configuration", "IConfigurationProvider", True, "GetReloadToken", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Extensions.Configuration", "IConfigurationProvider", True, "TryGet", "(System.String,System.String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["Microsoft.Extensions.Configuration", "IConfigurationRoot", True, "get_Providers", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Extensions.Configuration", "IConfigurationSection", True, "get_Path", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Extensions.Configuration", "IConfigurationSource", True, "Build", "(Microsoft.Extensions.Configuration.IConfigurationBuilder)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Extensions.Configuration", "IniConfigurationExtensions", False, "AddIniFile", "(Microsoft.Extensions.Configuration.IConfigurationBuilder,Microsoft.Extensions.FileProviders.IFileProvider,System.String,System.Boolean,System.Boolean)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Extensions.Configuration", "IniConfigurationExtensions", False, "AddIniFile", "(Microsoft.Extensions.Configuration.IConfigurationBuilder,System.String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Extensions.Configuration", "IniConfigurationExtensions", False, "AddIniFile", "(Microsoft.Extensions.Configuration.IConfigurationBuilder,System.String,System.Boolean)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Extensions.Configuration", "IniConfigurationExtensions", False, "AddIniFile", "(Microsoft.Extensions.Configuration.IConfigurationBuilder,System.String,System.Boolean,System.Boolean)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Extensions.Configuration", "IniConfigurationExtensions", False, "AddIniStream", "(Microsoft.Extensions.Configuration.IConfigurationBuilder,System.IO.Stream)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Extensions.Configuration", "JsonConfigurationExtensions", False, "AddJsonFile", "(Microsoft.Extensions.Configuration.IConfigurationBuilder,Microsoft.Extensions.FileProviders.IFileProvider,System.String,System.Boolean,System.Boolean)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Extensions.Configuration", "JsonConfigurationExtensions", False, "AddJsonFile", "(Microsoft.Extensions.Configuration.IConfigurationBuilder,System.String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Extensions.Configuration", "JsonConfigurationExtensions", False, "AddJsonFile", "(Microsoft.Extensions.Configuration.IConfigurationBuilder,System.String,System.Boolean)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Extensions.Configuration", "JsonConfigurationExtensions", False, "AddJsonFile", "(Microsoft.Extensions.Configuration.IConfigurationBuilder,System.String,System.Boolean,System.Boolean)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Extensions.Configuration", "JsonConfigurationExtensions", False, "AddJsonStream", "(Microsoft.Extensions.Configuration.IConfigurationBuilder,System.IO.Stream)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Extensions.Configuration", "MemoryConfigurationBuilderExtensions", False, "AddInMemoryCollection", "(Microsoft.Extensions.Configuration.IConfigurationBuilder)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Extensions.Configuration", "MemoryConfigurationBuilderExtensions", False, "AddInMemoryCollection", "(Microsoft.Extensions.Configuration.IConfigurationBuilder,System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<System.String,System.String>>)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Extensions.Configuration", "UserSecretsConfigurationExtensions", False, "AddUserSecrets", "(Microsoft.Extensions.Configuration.IConfigurationBuilder,System.Reflection.Assembly)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Extensions.Configuration", "UserSecretsConfigurationExtensions", False, "AddUserSecrets", "(Microsoft.Extensions.Configuration.IConfigurationBuilder,System.Reflection.Assembly,System.Boolean)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Extensions.Configuration", "UserSecretsConfigurationExtensions", False, "AddUserSecrets", "(Microsoft.Extensions.Configuration.IConfigurationBuilder,System.Reflection.Assembly,System.Boolean,System.Boolean)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Extensions.Configuration", "UserSecretsConfigurationExtensions", False, "AddUserSecrets", "(Microsoft.Extensions.Configuration.IConfigurationBuilder,System.String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Extensions.Configuration", "UserSecretsConfigurationExtensions", False, "AddUserSecrets", "(Microsoft.Extensions.Configuration.IConfigurationBuilder,System.String,System.Boolean)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Extensions.Configuration", "UserSecretsConfigurationExtensions", False, "AddUserSecrets<T>", "(Microsoft.Extensions.Configuration.IConfigurationBuilder)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Extensions.Configuration", "UserSecretsConfigurationExtensions", False, "AddUserSecrets<T>", "(Microsoft.Extensions.Configuration.IConfigurationBuilder,System.Boolean)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Extensions.Configuration", "UserSecretsConfigurationExtensions", False, "AddUserSecrets<T>", "(Microsoft.Extensions.Configuration.IConfigurationBuilder,System.Boolean,System.Boolean)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Extensions.Configuration", "XmlConfigurationExtensions", False, "AddXmlFile", "(Microsoft.Extensions.Configuration.IConfigurationBuilder,Microsoft.Extensions.FileProviders.IFileProvider,System.String,System.Boolean,System.Boolean)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Extensions.Configuration", "XmlConfigurationExtensions", False, "AddXmlFile", "(Microsoft.Extensions.Configuration.IConfigurationBuilder,System.String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Extensions.Configuration", "XmlConfigurationExtensions", False, "AddXmlFile", "(Microsoft.Extensions.Configuration.IConfigurationBuilder,System.String,System.Boolean)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Extensions.Configuration", "XmlConfigurationExtensions", False, "AddXmlFile", "(Microsoft.Extensions.Configuration.IConfigurationBuilder,System.String,System.Boolean,System.Boolean)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Extensions.Configuration", "XmlConfigurationExtensions", False, "AddXmlStream", "(Microsoft.Extensions.Configuration.IConfigurationBuilder,System.IO.Stream)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["Microsoft.Extensions.Configuration", "IniConfigurationExtensions", False, "AddIniFile", "(Microsoft.Extensions.Configuration.IConfigurationBuilder,Microsoft.Extensions.FileProviders.IFileProvider,System.String,System.Boolean,System.Boolean)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.Configuration", "IniConfigurationExtensions", False, "AddIniFile", "(Microsoft.Extensions.Configuration.IConfigurationBuilder,System.Action<Microsoft.Extensions.Configuration.Ini.IniConfigurationSource>)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.Configuration", "IniConfigurationExtensions", False, "AddIniFile", "(Microsoft.Extensions.Configuration.IConfigurationBuilder,System.String)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.Configuration", "IniConfigurationExtensions", False, "AddIniFile", "(Microsoft.Extensions.Configuration.IConfigurationBuilder,System.String,System.Boolean)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.Configuration", "IniConfigurationExtensions", False, "AddIniFile", "(Microsoft.Extensions.Configuration.IConfigurationBuilder,System.String,System.Boolean,System.Boolean)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.Configuration", "IniConfigurationExtensions", False, "AddIniStream", "(Microsoft.Extensions.Configuration.IConfigurationBuilder,System.IO.Stream)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.Configuration", "JsonConfigurationExtensions", False, "AddJsonFile", "(Microsoft.Extensions.Configuration.IConfigurationBuilder,Microsoft.Extensions.FileProviders.IFileProvider,System.String,System.Boolean,System.Boolean)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.Configuration", "JsonConfigurationExtensions", False, "AddJsonFile", "(Microsoft.Extensions.Configuration.IConfigurationBuilder,System.Action<Microsoft.Extensions.Configuration.Json.JsonConfigurationSource>)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.Configuration", "JsonConfigurationExtensions", False, "AddJsonFile", "(Microsoft.Extensions.Configuration.IConfigurationBuilder,System.String)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.Configuration", "JsonConfigurationExtensions", False, "AddJsonFile", "(Microsoft.Extensions.Configuration.IConfigurationBuilder,System.String,System.Boolean)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.Configuration", "JsonConfigurationExtensions", False, "AddJsonFile", "(Microsoft.Extensions.Configuration.IConfigurationBuilder,System.String,System.Boolean,System.Boolean)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.Configuration", "JsonConfigurationExtensions", False, "AddJsonStream", "(Microsoft.Extensions.Configuration.IConfigurationBuilder,System.IO.Stream)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.Configuration", "MemoryConfigurationBuilderExtensions", False, "AddInMemoryCollection", "(Microsoft.Extensions.Configuration.IConfigurationBuilder)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.Configuration", "MemoryConfigurationBuilderExtensions", False, "AddInMemoryCollection", "(Microsoft.Extensions.Configuration.IConfigurationBuilder,System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<System.String,System.String>>)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.Configuration", "UserSecretsConfigurationExtensions", False, "AddUserSecrets", "(Microsoft.Extensions.Configuration.IConfigurationBuilder,System.Reflection.Assembly)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.Configuration", "UserSecretsConfigurationExtensions", False, "AddUserSecrets", "(Microsoft.Extensions.Configuration.IConfigurationBuilder,System.Reflection.Assembly,System.Boolean)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.Configuration", "UserSecretsConfigurationExtensions", False, "AddUserSecrets", "(Microsoft.Extensions.Configuration.IConfigurationBuilder,System.Reflection.Assembly,System.Boolean,System.Boolean)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.Configuration", "UserSecretsConfigurationExtensions", False, "AddUserSecrets", "(Microsoft.Extensions.Configuration.IConfigurationBuilder,System.String)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.Configuration", "UserSecretsConfigurationExtensions", False, "AddUserSecrets", "(Microsoft.Extensions.Configuration.IConfigurationBuilder,System.String,System.Boolean)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.Configuration", "UserSecretsConfigurationExtensions", False, "AddUserSecrets<T>", "(Microsoft.Extensions.Configuration.IConfigurationBuilder)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.Configuration", "UserSecretsConfigurationExtensions", False, "AddUserSecrets<T>", "(Microsoft.Extensions.Configuration.IConfigurationBuilder,System.Boolean)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.Configuration", "UserSecretsConfigurationExtensions", False, "AddUserSecrets<T>", "(Microsoft.Extensions.Configuration.IConfigurationBuilder,System.Boolean,System.Boolean)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.Configuration", "XmlConfigurationExtensions", False, "AddXmlFile", "(Microsoft.Extensions.Configuration.IConfigurationBuilder,Microsoft.Extensions.FileProviders.IFileProvider,System.String,System.Boolean,System.Boolean)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.Configuration", "XmlConfigurationExtensions", False, "AddXmlFile", "(Microsoft.Extensions.Configuration.IConfigurationBuilder,System.Action<Microsoft.Extensions.Configuration.Xml.XmlConfigurationSource>)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.Configuration", "XmlConfigurationExtensions", False, "AddXmlFile", "(Microsoft.Extensions.Configuration.IConfigurationBuilder,System.String)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.Configuration", "XmlConfigurationExtensions", False, "AddXmlFile", "(Microsoft.Extensions.Configuration.IConfigurationBuilder,System.String,System.Boolean)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.Configuration", "XmlConfigurationExtensions", False, "AddXmlFile", "(Microsoft.Extensions.Configuration.IConfigurationBuilder,System.String,System.Boolean,System.Boolean)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.Configuration", "XmlConfigurationExtensions", False, "AddXmlStream", "(Microsoft.Extensions.Configuration.IConfigurationBuilder,System.IO.Stream)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
   - addsTo:
       pack: codeql/csharp-all
       extensible: neutralModel
@@ -82,32 +81,47 @@ extensions:
       - ["Microsoft.Extensions.Configuration", "ChainedConfigurationProvider", "Dispose", "()", "summary", "df-generated"]
       - ["Microsoft.Extensions.Configuration", "ChainedConfigurationProvider", "Load", "()", "summary", "df-generated"]
       - ["Microsoft.Extensions.Configuration", "ChainedConfigurationProvider", "Set", "(System.String,System.String)", "summary", "df-generated"]
+      - ["Microsoft.Extensions.Configuration", "ChainedConfigurationSource", "Build", "(Microsoft.Extensions.Configuration.IConfigurationBuilder)", "summary", "df-generated"]
       - ["Microsoft.Extensions.Configuration", "ConfigurationBinder", "Bind", "(Microsoft.Extensions.Configuration.IConfiguration,System.Object)", "summary", "df-generated"]
+      - ["Microsoft.Extensions.Configuration", "ConfigurationBinder", "Bind", "(Microsoft.Extensions.Configuration.IConfiguration,System.Object,System.Action<Microsoft.Extensions.Configuration.BinderOptions>)", "summary", "df-generated"]
       - ["Microsoft.Extensions.Configuration", "ConfigurationBinder", "Bind", "(Microsoft.Extensions.Configuration.IConfiguration,System.String,System.Object)", "summary", "df-generated"]
+      - ["Microsoft.Extensions.Configuration", "ConfigurationBinder", "Get", "(Microsoft.Extensions.Configuration.IConfiguration,System.Type,System.Action<Microsoft.Extensions.Configuration.BinderOptions>)", "summary", "df-generated"]
+      - ["Microsoft.Extensions.Configuration", "ConfigurationBinder", "Get<T>", "(Microsoft.Extensions.Configuration.IConfiguration,System.Action<Microsoft.Extensions.Configuration.BinderOptions>)", "summary", "df-generated"]
+      - ["Microsoft.Extensions.Configuration", "ConfigurationBinder", "GetValue", "(Microsoft.Extensions.Configuration.IConfiguration,System.Type,System.String)", "summary", "df-generated"]
+      - ["Microsoft.Extensions.Configuration", "ConfigurationBinder", "GetValue<T>", "(Microsoft.Extensions.Configuration.IConfiguration,System.String)", "summary", "df-generated"]
       - ["Microsoft.Extensions.Configuration", "ConfigurationDebugViewContext", "ConfigurationDebugViewContext", "(System.String,System.String,System.String,Microsoft.Extensions.Configuration.IConfigurationProvider)", "summary", "df-generated"]
       - ["Microsoft.Extensions.Configuration", "ConfigurationDebugViewContext", "get_ConfigurationProvider", "()", "summary", "df-generated"]
       - ["Microsoft.Extensions.Configuration", "ConfigurationDebugViewContext", "get_Key", "()", "summary", "df-generated"]
       - ["Microsoft.Extensions.Configuration", "ConfigurationDebugViewContext", "get_Path", "()", "summary", "df-generated"]
       - ["Microsoft.Extensions.Configuration", "ConfigurationDebugViewContext", "get_Value", "()", "summary", "df-generated"]
+      - ["Microsoft.Extensions.Configuration", "ConfigurationExtensions", "AsEnumerable", "(Microsoft.Extensions.Configuration.IConfiguration)", "summary", "df-generated"]
+      - ["Microsoft.Extensions.Configuration", "ConfigurationExtensions", "AsEnumerable", "(Microsoft.Extensions.Configuration.IConfiguration,System.Boolean)", "summary", "df-generated"]
       - ["Microsoft.Extensions.Configuration", "ConfigurationExtensions", "Exists", "(Microsoft.Extensions.Configuration.IConfigurationSection)", "summary", "df-generated"]
+      - ["Microsoft.Extensions.Configuration", "ConfigurationExtensions", "GetConnectionString", "(Microsoft.Extensions.Configuration.IConfiguration,System.String)", "summary", "df-generated"]
+      - ["Microsoft.Extensions.Configuration", "ConfigurationExtensions", "GetRequiredSection", "(Microsoft.Extensions.Configuration.IConfiguration,System.String)", "summary", "df-generated"]
       - ["Microsoft.Extensions.Configuration", "ConfigurationKeyComparer", "Compare", "(System.String,System.String)", "summary", "df-generated"]
       - ["Microsoft.Extensions.Configuration", "ConfigurationKeyComparer", "get_Instance", "()", "summary", "df-generated"]
       - ["Microsoft.Extensions.Configuration", "ConfigurationKeyNameAttribute", "ConfigurationKeyNameAttribute", "(System.String)", "summary", "df-generated"]
       - ["Microsoft.Extensions.Configuration", "ConfigurationKeyNameAttribute", "get_Name", "()", "summary", "df-generated"]
       - ["Microsoft.Extensions.Configuration", "ConfigurationManager", "Dispose", "()", "summary", "df-generated"]
       - ["Microsoft.Extensions.Configuration", "ConfigurationManager", "GetChildren", "()", "summary", "df-generated"]
+      - ["Microsoft.Extensions.Configuration", "ConfigurationManager", "GetSection", "(System.String)", "summary", "df-generated"]
       - ["Microsoft.Extensions.Configuration", "ConfigurationManager", "Reload", "()", "summary", "df-generated"]
       - ["Microsoft.Extensions.Configuration", "ConfigurationManager", "set_Item", "(System.String,System.String)", "summary", "df-generated"]
       - ["Microsoft.Extensions.Configuration", "ConfigurationProvider", "Load", "()", "summary", "df-generated"]
       - ["Microsoft.Extensions.Configuration", "ConfigurationProvider", "OnReload", "()", "summary", "df-generated"]
       - ["Microsoft.Extensions.Configuration", "ConfigurationProvider", "Set", "(System.String,System.String)", "summary", "df-generated"]
+      - ["Microsoft.Extensions.Configuration", "ConfigurationProvider", "ToString", "()", "summary", "df-generated"]
+      - ["Microsoft.Extensions.Configuration", "ConfigurationProvider", "TryGet", "(System.String,System.String)", "summary", "df-generated"]
       - ["Microsoft.Extensions.Configuration", "ConfigurationReloadToken", "OnReload", "()", "summary", "df-generated"]
       - ["Microsoft.Extensions.Configuration", "ConfigurationReloadToken", "get_HasChanged", "()", "summary", "df-generated"]
       - ["Microsoft.Extensions.Configuration", "ConfigurationRoot", "Dispose", "()", "summary", "df-generated"]
       - ["Microsoft.Extensions.Configuration", "ConfigurationRoot", "GetChildren", "()", "summary", "df-generated"]
+      - ["Microsoft.Extensions.Configuration", "ConfigurationRoot", "GetSection", "(System.String)", "summary", "df-generated"]
       - ["Microsoft.Extensions.Configuration", "ConfigurationRoot", "Reload", "()", "summary", "df-generated"]
       - ["Microsoft.Extensions.Configuration", "ConfigurationRoot", "set_Item", "(System.String,System.String)", "summary", "df-generated"]
       - ["Microsoft.Extensions.Configuration", "ConfigurationSection", "GetChildren", "()", "summary", "df-generated"]
+      - ["Microsoft.Extensions.Configuration", "ConfigurationSection", "GetSection", "(System.String)", "summary", "df-generated"]
       - ["Microsoft.Extensions.Configuration", "ConfigurationSection", "get_Key", "()", "summary", "df-generated"]
       - ["Microsoft.Extensions.Configuration", "ConfigurationSection", "set_Item", "(System.String,System.String)", "summary", "df-generated"]
       - ["Microsoft.Extensions.Configuration", "FileConfigurationProvider", "Dispose", "()", "summary", "df-generated"]
@@ -116,15 +130,22 @@ extensions:
       - ["Microsoft.Extensions.Configuration", "FileConfigurationProvider", "Load", "()", "summary", "df-generated"]
       - ["Microsoft.Extensions.Configuration", "FileConfigurationProvider", "Load", "(System.IO.Stream)", "summary", "df-generated"]
       - ["Microsoft.Extensions.Configuration", "FileConfigurationProvider", "get_Source", "()", "summary", "df-generated"]
+      - ["Microsoft.Extensions.Configuration", "FileConfigurationSource", "Build", "(Microsoft.Extensions.Configuration.IConfigurationBuilder)", "summary", "df-generated"]
       - ["Microsoft.Extensions.Configuration", "FileConfigurationSource", "EnsureDefaults", "(Microsoft.Extensions.Configuration.IConfigurationBuilder)", "summary", "df-generated"]
       - ["Microsoft.Extensions.Configuration", "FileConfigurationSource", "ResolveFileProvider", "()", "summary", "df-generated"]
       - ["Microsoft.Extensions.Configuration", "IConfiguration", "GetChildren", "()", "summary", "df-generated"]
+      - ["Microsoft.Extensions.Configuration", "IConfiguration", "GetSection", "(System.String)", "summary", "df-generated"]
       - ["Microsoft.Extensions.Configuration", "IConfiguration", "set_Item", "(System.String,System.String)", "summary", "df-generated"]
+      - ["Microsoft.Extensions.Configuration", "IConfigurationBuilder", "get_Sources", "()", "summary", "df-generated"]
       - ["Microsoft.Extensions.Configuration", "IConfigurationProvider", "Load", "()", "summary", "df-generated"]
       - ["Microsoft.Extensions.Configuration", "IConfigurationProvider", "Set", "(System.String,System.String)", "summary", "df-generated"]
+      - ["Microsoft.Extensions.Configuration", "IConfigurationProvider", "TryGet", "(System.String,System.String)", "summary", "df-generated"]
       - ["Microsoft.Extensions.Configuration", "IConfigurationRoot", "Reload", "()", "summary", "df-generated"]
       - ["Microsoft.Extensions.Configuration", "IConfigurationSection", "get_Key", "()", "summary", "df-generated"]
+      - ["Microsoft.Extensions.Configuration", "IConfigurationSection", "get_Path", "()", "summary", "df-generated"]
+      - ["Microsoft.Extensions.Configuration", "IConfigurationSource", "Build", "(Microsoft.Extensions.Configuration.IConfigurationBuilder)", "summary", "df-generated"]
       - ["Microsoft.Extensions.Configuration", "StreamConfigurationProvider", "Load", "()", "summary", "df-generated"]
       - ["Microsoft.Extensions.Configuration", "StreamConfigurationProvider", "Load", "(System.IO.Stream)", "summary", "df-generated"]
       - ["Microsoft.Extensions.Configuration", "StreamConfigurationProvider", "StreamConfigurationProvider", "(Microsoft.Extensions.Configuration.StreamConfigurationSource)", "summary", "df-generated"]
       - ["Microsoft.Extensions.Configuration", "StreamConfigurationProvider", "get_Source", "()", "summary", "df-generated"]
+      - ["Microsoft.Extensions.Configuration", "StreamConfigurationSource", "Build", "(Microsoft.Extensions.Configuration.IConfigurationBuilder)", "summary", "df-generated"]
diff --git a/csharp/ql/lib/ext/generated/Microsoft.Extensions.DependencyInjection.Extensions.model.yml b/csharp/ql/lib/ext/generated/Microsoft.Extensions.DependencyInjection.Extensions.model.yml
index 395ecf701e8..f86f9258adf 100644
--- a/csharp/ql/lib/ext/generated/Microsoft.Extensions.DependencyInjection.Extensions.model.yml
+++ b/csharp/ql/lib/ext/generated/Microsoft.Extensions.DependencyInjection.Extensions.model.yml
@@ -4,50 +4,62 @@ extensions:
       pack: codeql/csharp-all
       extensible: summaryModel
     data:
-      - ["Microsoft.Extensions.DependencyInjection.Extensions", "ServiceCollectionDescriptorExtensions", False, "Add", "(Microsoft.Extensions.DependencyInjection.IServiceCollection,Microsoft.Extensions.DependencyInjection.ServiceDescriptor)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Extensions.DependencyInjection.Extensions", "ServiceCollectionDescriptorExtensions", False, "Add", "(Microsoft.Extensions.DependencyInjection.IServiceCollection,Microsoft.Extensions.DependencyInjection.ServiceDescriptor)", "", "Argument[1]", "Argument[0].Element", "taint", "df-generated"]
-      - ["Microsoft.Extensions.DependencyInjection.Extensions", "ServiceCollectionDescriptorExtensions", False, "Add", "(Microsoft.Extensions.DependencyInjection.IServiceCollection,Microsoft.Extensions.DependencyInjection.ServiceDescriptor)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Extensions.DependencyInjection.Extensions", "ServiceCollectionDescriptorExtensions", False, "Add", "(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Collections.Generic.IEnumerable<Microsoft.Extensions.DependencyInjection.ServiceDescriptor>)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Extensions.DependencyInjection.Extensions", "ServiceCollectionDescriptorExtensions", False, "Add", "(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Collections.Generic.IEnumerable<Microsoft.Extensions.DependencyInjection.ServiceDescriptor>)", "", "Argument[1].Element", "Argument[0].Element", "taint", "df-generated"]
-      - ["Microsoft.Extensions.DependencyInjection.Extensions", "ServiceCollectionDescriptorExtensions", False, "Add", "(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Collections.Generic.IEnumerable<Microsoft.Extensions.DependencyInjection.ServiceDescriptor>)", "", "Argument[1].Element", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Extensions.DependencyInjection.Extensions", "ServiceCollectionDescriptorExtensions", False, "RemoveAll", "(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Type)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Extensions.DependencyInjection.Extensions", "ServiceCollectionDescriptorExtensions", False, "RemoveAll<T>", "(Microsoft.Extensions.DependencyInjection.IServiceCollection)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Extensions.DependencyInjection.Extensions", "ServiceCollectionDescriptorExtensions", False, "RemoveAllKeyed", "(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Type,System.Object)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Extensions.DependencyInjection.Extensions", "ServiceCollectionDescriptorExtensions", False, "RemoveAllKeyed<T>", "(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Object)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Extensions.DependencyInjection.Extensions", "ServiceCollectionDescriptorExtensions", False, "Replace", "(Microsoft.Extensions.DependencyInjection.IServiceCollection,Microsoft.Extensions.DependencyInjection.ServiceDescriptor)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Extensions.DependencyInjection.Extensions", "ServiceCollectionDescriptorExtensions", False, "Replace", "(Microsoft.Extensions.DependencyInjection.IServiceCollection,Microsoft.Extensions.DependencyInjection.ServiceDescriptor)", "", "Argument[1]", "Argument[0].Element", "taint", "df-generated"]
-      - ["Microsoft.Extensions.DependencyInjection.Extensions", "ServiceCollectionDescriptorExtensions", False, "Replace", "(Microsoft.Extensions.DependencyInjection.IServiceCollection,Microsoft.Extensions.DependencyInjection.ServiceDescriptor)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Extensions.DependencyInjection.Extensions", "ServiceCollectionDescriptorExtensions", False, "TryAdd", "(Microsoft.Extensions.DependencyInjection.IServiceCollection,Microsoft.Extensions.DependencyInjection.ServiceDescriptor)", "", "Argument[1]", "Argument[0].Element", "taint", "df-generated"]
-      - ["Microsoft.Extensions.DependencyInjection.Extensions", "ServiceCollectionDescriptorExtensions", False, "TryAdd", "(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Collections.Generic.IEnumerable<Microsoft.Extensions.DependencyInjection.ServiceDescriptor>)", "", "Argument[1].Element", "Argument[0].Element", "taint", "df-generated"]
-      - ["Microsoft.Extensions.DependencyInjection.Extensions", "ServiceCollectionDescriptorExtensions", False, "TryAddEnumerable", "(Microsoft.Extensions.DependencyInjection.IServiceCollection,Microsoft.Extensions.DependencyInjection.ServiceDescriptor)", "", "Argument[1]", "Argument[0].Element", "taint", "df-generated"]
-      - ["Microsoft.Extensions.DependencyInjection.Extensions", "ServiceCollectionDescriptorExtensions", False, "TryAddEnumerable", "(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Collections.Generic.IEnumerable<Microsoft.Extensions.DependencyInjection.ServiceDescriptor>)", "", "Argument[1].Element", "Argument[0].Element", "taint", "df-generated"]
+      - ["Microsoft.Extensions.DependencyInjection.Extensions", "ServiceCollectionDescriptorExtensions", False, "Add", "(Microsoft.Extensions.DependencyInjection.IServiceCollection,Microsoft.Extensions.DependencyInjection.ServiceDescriptor)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.DependencyInjection.Extensions", "ServiceCollectionDescriptorExtensions", False, "Add", "(Microsoft.Extensions.DependencyInjection.IServiceCollection,Microsoft.Extensions.DependencyInjection.ServiceDescriptor)", "", "Argument[1]", "Argument[0].Element", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.DependencyInjection.Extensions", "ServiceCollectionDescriptorExtensions", False, "Add", "(Microsoft.Extensions.DependencyInjection.IServiceCollection,Microsoft.Extensions.DependencyInjection.ServiceDescriptor)", "", "Argument[1]", "ReturnValue.Element", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.DependencyInjection.Extensions", "ServiceCollectionDescriptorExtensions", False, "Add", "(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Collections.Generic.IEnumerable<Microsoft.Extensions.DependencyInjection.ServiceDescriptor>)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.DependencyInjection.Extensions", "ServiceCollectionDescriptorExtensions", False, "Add", "(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Collections.Generic.IEnumerable<Microsoft.Extensions.DependencyInjection.ServiceDescriptor>)", "", "Argument[1].Element", "Argument[0].Element", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.DependencyInjection.Extensions", "ServiceCollectionDescriptorExtensions", False, "Add", "(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Collections.Generic.IEnumerable<Microsoft.Extensions.DependencyInjection.ServiceDescriptor>)", "", "Argument[1].Element", "ReturnValue.Element", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.DependencyInjection.Extensions", "ServiceCollectionDescriptorExtensions", False, "RemoveAll", "(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Type)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.DependencyInjection.Extensions", "ServiceCollectionDescriptorExtensions", False, "RemoveAll<T>", "(Microsoft.Extensions.DependencyInjection.IServiceCollection)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.DependencyInjection.Extensions", "ServiceCollectionDescriptorExtensions", False, "RemoveAllKeyed", "(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Type,System.Object)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.DependencyInjection.Extensions", "ServiceCollectionDescriptorExtensions", False, "RemoveAllKeyed<T>", "(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Object)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.DependencyInjection.Extensions", "ServiceCollectionDescriptorExtensions", False, "Replace", "(Microsoft.Extensions.DependencyInjection.IServiceCollection,Microsoft.Extensions.DependencyInjection.ServiceDescriptor)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.DependencyInjection.Extensions", "ServiceCollectionDescriptorExtensions", False, "Replace", "(Microsoft.Extensions.DependencyInjection.IServiceCollection,Microsoft.Extensions.DependencyInjection.ServiceDescriptor)", "", "Argument[1]", "Argument[0].Element", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.DependencyInjection.Extensions", "ServiceCollectionDescriptorExtensions", False, "Replace", "(Microsoft.Extensions.DependencyInjection.IServiceCollection,Microsoft.Extensions.DependencyInjection.ServiceDescriptor)", "", "Argument[1]", "ReturnValue.Element", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.DependencyInjection.Extensions", "ServiceCollectionDescriptorExtensions", False, "TryAdd", "(Microsoft.Extensions.DependencyInjection.IServiceCollection,Microsoft.Extensions.DependencyInjection.ServiceDescriptor)", "", "Argument[1]", "Argument[0].Element", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.DependencyInjection.Extensions", "ServiceCollectionDescriptorExtensions", False, "TryAdd", "(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Collections.Generic.IEnumerable<Microsoft.Extensions.DependencyInjection.ServiceDescriptor>)", "", "Argument[1].Element", "Argument[0].Element", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.DependencyInjection.Extensions", "ServiceCollectionDescriptorExtensions", False, "TryAddEnumerable", "(Microsoft.Extensions.DependencyInjection.IServiceCollection,Microsoft.Extensions.DependencyInjection.ServiceDescriptor)", "", "Argument[1]", "Argument[0].Element", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.DependencyInjection.Extensions", "ServiceCollectionDescriptorExtensions", False, "TryAddEnumerable", "(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Collections.Generic.IEnumerable<Microsoft.Extensions.DependencyInjection.ServiceDescriptor>)", "", "Argument[1].Element", "Argument[0].Element", "value", "dfc-generated"]
       - ["Microsoft.Extensions.DependencyInjection.Extensions", "ServiceCollectionDescriptorExtensions", False, "TryAddKeyedSingleton<TService>", "(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Object,TService)", "", "Argument[2]", "Argument[0].Element", "taint", "df-generated"]
   - addsTo:
       pack: codeql/csharp-all
       extensible: neutralModel
     data:
       - ["Microsoft.Extensions.DependencyInjection.Extensions", "ServiceCollectionDescriptorExtensions", "TryAddKeyedScoped", "(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Type,System.Object)", "summary", "df-generated"]
+      - ["Microsoft.Extensions.DependencyInjection.Extensions", "ServiceCollectionDescriptorExtensions", "TryAddKeyedScoped", "(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Type,System.Object,System.Func<System.IServiceProvider,System.Object,System.Object>)", "summary", "df-generated"]
       - ["Microsoft.Extensions.DependencyInjection.Extensions", "ServiceCollectionDescriptorExtensions", "TryAddKeyedScoped", "(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Type,System.Object,System.Type)", "summary", "df-generated"]
       - ["Microsoft.Extensions.DependencyInjection.Extensions", "ServiceCollectionDescriptorExtensions", "TryAddKeyedScoped<TService,TImplementation>", "(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Object)", "summary", "df-generated"]
       - ["Microsoft.Extensions.DependencyInjection.Extensions", "ServiceCollectionDescriptorExtensions", "TryAddKeyedScoped<TService>", "(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Object)", "summary", "df-generated"]
+      - ["Microsoft.Extensions.DependencyInjection.Extensions", "ServiceCollectionDescriptorExtensions", "TryAddKeyedScoped<TService>", "(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Object,System.Func<System.IServiceProvider,System.Object,TService>)", "summary", "df-generated"]
       - ["Microsoft.Extensions.DependencyInjection.Extensions", "ServiceCollectionDescriptorExtensions", "TryAddKeyedSingleton", "(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Type,System.Object)", "summary", "df-generated"]
+      - ["Microsoft.Extensions.DependencyInjection.Extensions", "ServiceCollectionDescriptorExtensions", "TryAddKeyedSingleton", "(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Type,System.Object,System.Func<System.IServiceProvider,System.Object,System.Object>)", "summary", "df-generated"]
       - ["Microsoft.Extensions.DependencyInjection.Extensions", "ServiceCollectionDescriptorExtensions", "TryAddKeyedSingleton", "(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Type,System.Object,System.Type)", "summary", "df-generated"]
       - ["Microsoft.Extensions.DependencyInjection.Extensions", "ServiceCollectionDescriptorExtensions", "TryAddKeyedSingleton<TService,TImplementation>", "(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Object)", "summary", "df-generated"]
       - ["Microsoft.Extensions.DependencyInjection.Extensions", "ServiceCollectionDescriptorExtensions", "TryAddKeyedSingleton<TService>", "(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Object)", "summary", "df-generated"]
+      - ["Microsoft.Extensions.DependencyInjection.Extensions", "ServiceCollectionDescriptorExtensions", "TryAddKeyedSingleton<TService>", "(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Object,System.Func<System.IServiceProvider,System.Object,TService>)", "summary", "df-generated"]
       - ["Microsoft.Extensions.DependencyInjection.Extensions", "ServiceCollectionDescriptorExtensions", "TryAddKeyedTransient", "(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Type,System.Object)", "summary", "df-generated"]
+      - ["Microsoft.Extensions.DependencyInjection.Extensions", "ServiceCollectionDescriptorExtensions", "TryAddKeyedTransient", "(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Type,System.Object,System.Func<System.IServiceProvider,System.Object,System.Object>)", "summary", "df-generated"]
       - ["Microsoft.Extensions.DependencyInjection.Extensions", "ServiceCollectionDescriptorExtensions", "TryAddKeyedTransient", "(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Type,System.Object,System.Type)", "summary", "df-generated"]
       - ["Microsoft.Extensions.DependencyInjection.Extensions", "ServiceCollectionDescriptorExtensions", "TryAddKeyedTransient<TService,TImplementation>", "(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Object)", "summary", "df-generated"]
       - ["Microsoft.Extensions.DependencyInjection.Extensions", "ServiceCollectionDescriptorExtensions", "TryAddKeyedTransient<TService>", "(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Object)", "summary", "df-generated"]
+      - ["Microsoft.Extensions.DependencyInjection.Extensions", "ServiceCollectionDescriptorExtensions", "TryAddKeyedTransient<TService>", "(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Object,System.Func<System.IServiceProvider,System.Object,TService>)", "summary", "df-generated"]
       - ["Microsoft.Extensions.DependencyInjection.Extensions", "ServiceCollectionDescriptorExtensions", "TryAddScoped", "(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Type)", "summary", "df-generated"]
+      - ["Microsoft.Extensions.DependencyInjection.Extensions", "ServiceCollectionDescriptorExtensions", "TryAddScoped", "(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Type,System.Func<System.IServiceProvider,System.Object>)", "summary", "df-generated"]
       - ["Microsoft.Extensions.DependencyInjection.Extensions", "ServiceCollectionDescriptorExtensions", "TryAddScoped", "(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Type,System.Type)", "summary", "df-generated"]
       - ["Microsoft.Extensions.DependencyInjection.Extensions", "ServiceCollectionDescriptorExtensions", "TryAddScoped<TService,TImplementation>", "(Microsoft.Extensions.DependencyInjection.IServiceCollection)", "summary", "df-generated"]
       - ["Microsoft.Extensions.DependencyInjection.Extensions", "ServiceCollectionDescriptorExtensions", "TryAddScoped<TService>", "(Microsoft.Extensions.DependencyInjection.IServiceCollection)", "summary", "df-generated"]
+      - ["Microsoft.Extensions.DependencyInjection.Extensions", "ServiceCollectionDescriptorExtensions", "TryAddScoped<TService>", "(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Func<System.IServiceProvider,TService>)", "summary", "df-generated"]
       - ["Microsoft.Extensions.DependencyInjection.Extensions", "ServiceCollectionDescriptorExtensions", "TryAddSingleton", "(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Type)", "summary", "df-generated"]
+      - ["Microsoft.Extensions.DependencyInjection.Extensions", "ServiceCollectionDescriptorExtensions", "TryAddSingleton", "(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Type,System.Func<System.IServiceProvider,System.Object>)", "summary", "df-generated"]
       - ["Microsoft.Extensions.DependencyInjection.Extensions", "ServiceCollectionDescriptorExtensions", "TryAddSingleton", "(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Type,System.Type)", "summary", "df-generated"]
       - ["Microsoft.Extensions.DependencyInjection.Extensions", "ServiceCollectionDescriptorExtensions", "TryAddSingleton<TService,TImplementation>", "(Microsoft.Extensions.DependencyInjection.IServiceCollection)", "summary", "df-generated"]
       - ["Microsoft.Extensions.DependencyInjection.Extensions", "ServiceCollectionDescriptorExtensions", "TryAddSingleton<TService>", "(Microsoft.Extensions.DependencyInjection.IServiceCollection)", "summary", "df-generated"]
+      - ["Microsoft.Extensions.DependencyInjection.Extensions", "ServiceCollectionDescriptorExtensions", "TryAddSingleton<TService>", "(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Func<System.IServiceProvider,TService>)", "summary", "df-generated"]
       - ["Microsoft.Extensions.DependencyInjection.Extensions", "ServiceCollectionDescriptorExtensions", "TryAddSingleton<TService>", "(Microsoft.Extensions.DependencyInjection.IServiceCollection,TService)", "summary", "df-generated"]
       - ["Microsoft.Extensions.DependencyInjection.Extensions", "ServiceCollectionDescriptorExtensions", "TryAddTransient", "(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Type)", "summary", "df-generated"]
+      - ["Microsoft.Extensions.DependencyInjection.Extensions", "ServiceCollectionDescriptorExtensions", "TryAddTransient", "(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Type,System.Func<System.IServiceProvider,System.Object>)", "summary", "df-generated"]
       - ["Microsoft.Extensions.DependencyInjection.Extensions", "ServiceCollectionDescriptorExtensions", "TryAddTransient", "(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Type,System.Type)", "summary", "df-generated"]
       - ["Microsoft.Extensions.DependencyInjection.Extensions", "ServiceCollectionDescriptorExtensions", "TryAddTransient<TService,TImplementation>", "(Microsoft.Extensions.DependencyInjection.IServiceCollection)", "summary", "df-generated"]
       - ["Microsoft.Extensions.DependencyInjection.Extensions", "ServiceCollectionDescriptorExtensions", "TryAddTransient<TService>", "(Microsoft.Extensions.DependencyInjection.IServiceCollection)", "summary", "df-generated"]
+      - ["Microsoft.Extensions.DependencyInjection.Extensions", "ServiceCollectionDescriptorExtensions", "TryAddTransient<TService>", "(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Func<System.IServiceProvider,TService>)", "summary", "df-generated"]
diff --git a/csharp/ql/lib/ext/generated/Microsoft.Extensions.DependencyInjection.Specification.Fakes.model.yml b/csharp/ql/lib/ext/generated/Microsoft.Extensions.DependencyInjection.Specification.Fakes.model.yml
index 4af5404eeb1..f4a11a88d76 100644
--- a/csharp/ql/lib/ext/generated/Microsoft.Extensions.DependencyInjection.Specification.Fakes.model.yml
+++ b/csharp/ql/lib/ext/generated/Microsoft.Extensions.DependencyInjection.Specification.Fakes.model.yml
@@ -4,30 +4,30 @@ extensions:
       pack: codeql/csharp-all
       extensible: summaryModel
     data:
-      - ["Microsoft.Extensions.DependencyInjection.Specification.Fakes", "AnotherClass", False, "AnotherClass", "(Microsoft.Extensions.DependencyInjection.Specification.Fakes.IFakeService)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["Microsoft.Extensions.DependencyInjection.Specification.Fakes", "AnotherClassAcceptingData", False, "AnotherClassAcceptingData", "(Microsoft.Extensions.DependencyInjection.Specification.Fakes.IFakeService,System.String,System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["Microsoft.Extensions.DependencyInjection.Specification.Fakes", "AnotherClassAcceptingData", False, "AnotherClassAcceptingData", "(Microsoft.Extensions.DependencyInjection.Specification.Fakes.IFakeService,System.String,System.String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["Microsoft.Extensions.DependencyInjection.Specification.Fakes", "AnotherClassAcceptingData", False, "AnotherClassAcceptingData", "(Microsoft.Extensions.DependencyInjection.Specification.Fakes.IFakeService,System.String,System.String)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
-      - ["Microsoft.Extensions.DependencyInjection.Specification.Fakes", "ClassWithAbstractClassConstraint<T>", False, "ClassWithAbstractClassConstraint", "(T)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["Microsoft.Extensions.DependencyInjection.Specification.Fakes", "ClassWithAmbiguousCtors", False, "ClassWithAmbiguousCtors", "(Microsoft.Extensions.DependencyInjection.Specification.Fakes.IFakeService,System.String,System.Int32)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["Microsoft.Extensions.DependencyInjection.Specification.Fakes", "ClassWithAmbiguousCtors", False, "ClassWithAmbiguousCtors", "(Microsoft.Extensions.DependencyInjection.Specification.Fakes.IFakeService,System.String,System.Int32)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["Microsoft.Extensions.DependencyInjection.Specification.Fakes", "ClassWithInterfaceConstraint<T>", False, "ClassWithInterfaceConstraint", "(T)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["Microsoft.Extensions.DependencyInjection.Specification.Fakes", "AnotherClass", False, "AnotherClass", "(Microsoft.Extensions.DependencyInjection.Specification.Fakes.IFakeService)", "", "Argument[0]", "Argument[this].Property[Microsoft.Extensions.DependencyInjection.Specification.Fakes.AnotherClass.FakeService]", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.DependencyInjection.Specification.Fakes", "AnotherClassAcceptingData", False, "AnotherClassAcceptingData", "(Microsoft.Extensions.DependencyInjection.Specification.Fakes.IFakeService,System.String,System.String)", "", "Argument[0]", "Argument[this].Property[Microsoft.Extensions.DependencyInjection.Specification.Fakes.AnotherClassAcceptingData.FakeService]", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.DependencyInjection.Specification.Fakes", "AnotherClassAcceptingData", False, "AnotherClassAcceptingData", "(Microsoft.Extensions.DependencyInjection.Specification.Fakes.IFakeService,System.String,System.String)", "", "Argument[1]", "Argument[this].Property[Microsoft.Extensions.DependencyInjection.Specification.Fakes.AnotherClassAcceptingData.One]", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.DependencyInjection.Specification.Fakes", "AnotherClassAcceptingData", False, "AnotherClassAcceptingData", "(Microsoft.Extensions.DependencyInjection.Specification.Fakes.IFakeService,System.String,System.String)", "", "Argument[2]", "Argument[this].Property[Microsoft.Extensions.DependencyInjection.Specification.Fakes.AnotherClassAcceptingData.Two]", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.DependencyInjection.Specification.Fakes", "ClassWithAbstractClassConstraint<T>", False, "ClassWithAbstractClassConstraint", "(T)", "", "Argument[0]", "Argument[this].Property[Microsoft.Extensions.DependencyInjection.Specification.Fakes.ClassWithAbstractClassConstraint`1.Value]", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.DependencyInjection.Specification.Fakes", "ClassWithAmbiguousCtors", False, "ClassWithAmbiguousCtors", "(Microsoft.Extensions.DependencyInjection.Specification.Fakes.IFakeService,System.String,System.Int32)", "", "Argument[0]", "Argument[this].Property[Microsoft.Extensions.DependencyInjection.Specification.Fakes.ClassWithAmbiguousCtors.FakeService]", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.DependencyInjection.Specification.Fakes", "ClassWithAmbiguousCtors", False, "ClassWithAmbiguousCtors", "(Microsoft.Extensions.DependencyInjection.Specification.Fakes.IFakeService,System.String,System.Int32)", "", "Argument[1]", "Argument[this].Property[Microsoft.Extensions.DependencyInjection.Specification.Fakes.ClassWithAmbiguousCtors.Data1]", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.DependencyInjection.Specification.Fakes", "ClassWithInterfaceConstraint<T>", False, "ClassWithInterfaceConstraint", "(T)", "", "Argument[0]", "Argument[this].Property[Microsoft.Extensions.DependencyInjection.Specification.Fakes.ClassWithInterfaceConstraint`1.Value]", "value", "dfc-generated"]
       - ["Microsoft.Extensions.DependencyInjection.Specification.Fakes", "ClassWithNestedReferencesToProvider", False, "ClassWithNestedReferencesToProvider", "(System.IServiceProvider)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["Microsoft.Extensions.DependencyInjection.Specification.Fakes", "ClassWithSelfReferencingConstraint<T>", False, "ClassWithSelfReferencingConstraint", "(T)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["Microsoft.Extensions.DependencyInjection.Specification.Fakes", "ClassWithServiceProvider", False, "ClassWithServiceProvider", "(System.IServiceProvider)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["Microsoft.Extensions.DependencyInjection.Specification.Fakes", "ConstrainedFakeOpenGenericService<TVal>", False, "ConstrainedFakeOpenGenericService", "(TVal)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["Microsoft.Extensions.DependencyInjection.Specification.Fakes", "FakeDisposableCallbackOuterService", False, "FakeDisposableCallbackOuterService", "(Microsoft.Extensions.DependencyInjection.Specification.Fakes.IFakeService,System.Collections.Generic.IEnumerable<Microsoft.Extensions.DependencyInjection.Specification.Fakes.IFakeMultipleService>,Microsoft.Extensions.DependencyInjection.Specification.Fakes.FakeDisposeCallback)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["Microsoft.Extensions.DependencyInjection.Specification.Fakes", "FakeDisposableCallbackOuterService", False, "FakeDisposableCallbackOuterService", "(Microsoft.Extensions.DependencyInjection.Specification.Fakes.IFakeService,System.Collections.Generic.IEnumerable<Microsoft.Extensions.DependencyInjection.Specification.Fakes.IFakeMultipleService>,Microsoft.Extensions.DependencyInjection.Specification.Fakes.FakeDisposeCallback)", "", "Argument[1].Element", "Argument[this]", "taint", "df-generated"]
+      - ["Microsoft.Extensions.DependencyInjection.Specification.Fakes", "ClassWithSelfReferencingConstraint<T>", False, "ClassWithSelfReferencingConstraint", "(T)", "", "Argument[0]", "Argument[this].Property[Microsoft.Extensions.DependencyInjection.Specification.Fakes.ClassWithSelfReferencingConstraint`1.Value]", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.DependencyInjection.Specification.Fakes", "ClassWithServiceProvider", False, "ClassWithServiceProvider", "(System.IServiceProvider)", "", "Argument[0]", "Argument[this].Property[Microsoft.Extensions.DependencyInjection.Specification.Fakes.ClassWithServiceProvider.ServiceProvider]", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.DependencyInjection.Specification.Fakes", "ConstrainedFakeOpenGenericService<TVal>", False, "ConstrainedFakeOpenGenericService", "(TVal)", "", "Argument[0]", "Argument[this].Property[Microsoft.Extensions.DependencyInjection.Specification.Fakes.ConstrainedFakeOpenGenericService`1.Value]", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.DependencyInjection.Specification.Fakes", "FakeDisposableCallbackOuterService", False, "FakeDisposableCallbackOuterService", "(Microsoft.Extensions.DependencyInjection.Specification.Fakes.IFakeService,System.Collections.Generic.IEnumerable<Microsoft.Extensions.DependencyInjection.Specification.Fakes.IFakeMultipleService>,Microsoft.Extensions.DependencyInjection.Specification.Fakes.FakeDisposeCallback)", "", "Argument[0]", "Argument[this].Property[Microsoft.Extensions.DependencyInjection.Specification.Fakes.FakeDisposableCallbackOuterService.SingleService]", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.DependencyInjection.Specification.Fakes", "FakeDisposableCallbackOuterService", False, "FakeDisposableCallbackOuterService", "(Microsoft.Extensions.DependencyInjection.Specification.Fakes.IFakeService,System.Collections.Generic.IEnumerable<Microsoft.Extensions.DependencyInjection.Specification.Fakes.IFakeMultipleService>,Microsoft.Extensions.DependencyInjection.Specification.Fakes.FakeDisposeCallback)", "", "Argument[1].Element", "Argument[this].Property[Microsoft.Extensions.DependencyInjection.Specification.Fakes.FakeDisposableCallbackOuterService.MultipleServices].Element", "value", "dfc-generated"]
       - ["Microsoft.Extensions.DependencyInjection.Specification.Fakes", "FakeDisposableCallbackService", False, "FakeDisposableCallbackService", "(Microsoft.Extensions.DependencyInjection.Specification.Fakes.FakeDisposeCallback)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["Microsoft.Extensions.DependencyInjection.Specification.Fakes", "FakeOpenGenericService<TVal>", False, "FakeOpenGenericService", "(TVal)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["Microsoft.Extensions.DependencyInjection.Specification.Fakes", "FakeOuterService", False, "FakeOuterService", "(Microsoft.Extensions.DependencyInjection.Specification.Fakes.IFakeService,System.Collections.Generic.IEnumerable<Microsoft.Extensions.DependencyInjection.Specification.Fakes.IFakeMultipleService>)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["Microsoft.Extensions.DependencyInjection.Specification.Fakes", "FakeOuterService", False, "FakeOuterService", "(Microsoft.Extensions.DependencyInjection.Specification.Fakes.IFakeService,System.Collections.Generic.IEnumerable<Microsoft.Extensions.DependencyInjection.Specification.Fakes.IFakeMultipleService>)", "", "Argument[1].Element", "Argument[this]", "taint", "df-generated"]
-      - ["Microsoft.Extensions.DependencyInjection.Specification.Fakes", "ServiceAcceptingFactoryService", False, "ServiceAcceptingFactoryService", "(Microsoft.Extensions.DependencyInjection.Specification.Fakes.ScopedFactoryService,Microsoft.Extensions.DependencyInjection.Specification.Fakes.IFactoryService)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["Microsoft.Extensions.DependencyInjection.Specification.Fakes", "ServiceAcceptingFactoryService", False, "ServiceAcceptingFactoryService", "(Microsoft.Extensions.DependencyInjection.Specification.Fakes.ScopedFactoryService,Microsoft.Extensions.DependencyInjection.Specification.Fakes.IFactoryService)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["Microsoft.Extensions.DependencyInjection.Specification.Fakes", "TypeWithSupersetConstructors", False, "TypeWithSupersetConstructors", "(Microsoft.Extensions.DependencyInjection.Specification.Fakes.IFakeMultipleService,Microsoft.Extensions.DependencyInjection.Specification.Fakes.IFactoryService,Microsoft.Extensions.DependencyInjection.Specification.Fakes.IFakeService,Microsoft.Extensions.DependencyInjection.Specification.Fakes.IFakeScopedService)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["Microsoft.Extensions.DependencyInjection.Specification.Fakes", "TypeWithSupersetConstructors", False, "TypeWithSupersetConstructors", "(Microsoft.Extensions.DependencyInjection.Specification.Fakes.IFakeMultipleService,Microsoft.Extensions.DependencyInjection.Specification.Fakes.IFactoryService,Microsoft.Extensions.DependencyInjection.Specification.Fakes.IFakeService,Microsoft.Extensions.DependencyInjection.Specification.Fakes.IFakeScopedService)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["Microsoft.Extensions.DependencyInjection.Specification.Fakes", "TypeWithSupersetConstructors", False, "TypeWithSupersetConstructors", "(Microsoft.Extensions.DependencyInjection.Specification.Fakes.IFakeMultipleService,Microsoft.Extensions.DependencyInjection.Specification.Fakes.IFactoryService,Microsoft.Extensions.DependencyInjection.Specification.Fakes.IFakeService,Microsoft.Extensions.DependencyInjection.Specification.Fakes.IFakeScopedService)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
-      - ["Microsoft.Extensions.DependencyInjection.Specification.Fakes", "TypeWithSupersetConstructors", False, "TypeWithSupersetConstructors", "(Microsoft.Extensions.DependencyInjection.Specification.Fakes.IFakeMultipleService,Microsoft.Extensions.DependencyInjection.Specification.Fakes.IFactoryService,Microsoft.Extensions.DependencyInjection.Specification.Fakes.IFakeService,Microsoft.Extensions.DependencyInjection.Specification.Fakes.IFakeScopedService)", "", "Argument[3]", "Argument[this]", "taint", "df-generated"]
+      - ["Microsoft.Extensions.DependencyInjection.Specification.Fakes", "FakeOpenGenericService<TVal>", False, "FakeOpenGenericService", "(TVal)", "", "Argument[0]", "Argument[this].Property[Microsoft.Extensions.DependencyInjection.Specification.Fakes.FakeOpenGenericService`1.Value]", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.DependencyInjection.Specification.Fakes", "FakeOuterService", False, "FakeOuterService", "(Microsoft.Extensions.DependencyInjection.Specification.Fakes.IFakeService,System.Collections.Generic.IEnumerable<Microsoft.Extensions.DependencyInjection.Specification.Fakes.IFakeMultipleService>)", "", "Argument[0]", "Argument[this].Property[Microsoft.Extensions.DependencyInjection.Specification.Fakes.FakeOuterService.SingleService]", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.DependencyInjection.Specification.Fakes", "FakeOuterService", False, "FakeOuterService", "(Microsoft.Extensions.DependencyInjection.Specification.Fakes.IFakeService,System.Collections.Generic.IEnumerable<Microsoft.Extensions.DependencyInjection.Specification.Fakes.IFakeMultipleService>)", "", "Argument[1]", "Argument[this].Property[Microsoft.Extensions.DependencyInjection.Specification.Fakes.FakeOuterService.MultipleServices]", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.DependencyInjection.Specification.Fakes", "ServiceAcceptingFactoryService", False, "ServiceAcceptingFactoryService", "(Microsoft.Extensions.DependencyInjection.Specification.Fakes.ScopedFactoryService,Microsoft.Extensions.DependencyInjection.Specification.Fakes.IFactoryService)", "", "Argument[0]", "Argument[this].Property[Microsoft.Extensions.DependencyInjection.Specification.Fakes.ServiceAcceptingFactoryService.ScopedService]", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.DependencyInjection.Specification.Fakes", "ServiceAcceptingFactoryService", False, "ServiceAcceptingFactoryService", "(Microsoft.Extensions.DependencyInjection.Specification.Fakes.ScopedFactoryService,Microsoft.Extensions.DependencyInjection.Specification.Fakes.IFactoryService)", "", "Argument[1]", "Argument[this].Property[Microsoft.Extensions.DependencyInjection.Specification.Fakes.ServiceAcceptingFactoryService.TransientService]", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.DependencyInjection.Specification.Fakes", "TypeWithSupersetConstructors", False, "TypeWithSupersetConstructors", "(Microsoft.Extensions.DependencyInjection.Specification.Fakes.IFakeMultipleService,Microsoft.Extensions.DependencyInjection.Specification.Fakes.IFactoryService,Microsoft.Extensions.DependencyInjection.Specification.Fakes.IFakeService,Microsoft.Extensions.DependencyInjection.Specification.Fakes.IFakeScopedService)", "", "Argument[0]", "Argument[this].Property[Microsoft.Extensions.DependencyInjection.Specification.Fakes.TypeWithSupersetConstructors.MultipleService]", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.DependencyInjection.Specification.Fakes", "TypeWithSupersetConstructors", False, "TypeWithSupersetConstructors", "(Microsoft.Extensions.DependencyInjection.Specification.Fakes.IFakeMultipleService,Microsoft.Extensions.DependencyInjection.Specification.Fakes.IFactoryService,Microsoft.Extensions.DependencyInjection.Specification.Fakes.IFakeService,Microsoft.Extensions.DependencyInjection.Specification.Fakes.IFakeScopedService)", "", "Argument[1]", "Argument[this].Property[Microsoft.Extensions.DependencyInjection.Specification.Fakes.TypeWithSupersetConstructors.FactoryService]", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.DependencyInjection.Specification.Fakes", "TypeWithSupersetConstructors", False, "TypeWithSupersetConstructors", "(Microsoft.Extensions.DependencyInjection.Specification.Fakes.IFakeMultipleService,Microsoft.Extensions.DependencyInjection.Specification.Fakes.IFactoryService,Microsoft.Extensions.DependencyInjection.Specification.Fakes.IFakeService,Microsoft.Extensions.DependencyInjection.Specification.Fakes.IFakeScopedService)", "", "Argument[2]", "Argument[this].Property[Microsoft.Extensions.DependencyInjection.Specification.Fakes.TypeWithSupersetConstructors.Service]", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.DependencyInjection.Specification.Fakes", "TypeWithSupersetConstructors", False, "TypeWithSupersetConstructors", "(Microsoft.Extensions.DependencyInjection.Specification.Fakes.IFakeMultipleService,Microsoft.Extensions.DependencyInjection.Specification.Fakes.IFactoryService,Microsoft.Extensions.DependencyInjection.Specification.Fakes.IFakeService,Microsoft.Extensions.DependencyInjection.Specification.Fakes.IFakeScopedService)", "", "Argument[3]", "Argument[this].Property[Microsoft.Extensions.DependencyInjection.Specification.Fakes.TypeWithSupersetConstructors.ScopedService]", "value", "dfc-generated"]
   - addsTo:
       pack: codeql/csharp-all
       extensible: neutralModel
diff --git a/csharp/ql/lib/ext/generated/Microsoft.Extensions.DependencyInjection.Specification.model.yml b/csharp/ql/lib/ext/generated/Microsoft.Extensions.DependencyInjection.Specification.model.yml
index d5bf9e3ad66..f476329784d 100644
--- a/csharp/ql/lib/ext/generated/Microsoft.Extensions.DependencyInjection.Specification.model.yml
+++ b/csharp/ql/lib/ext/generated/Microsoft.Extensions.DependencyInjection.Specification.model.yml
@@ -4,12 +4,12 @@ extensions:
       pack: codeql/csharp-all
       extensible: summaryModel
     data:
-      - ["Microsoft.Extensions.DependencyInjection.Specification", "ClassWithOptionalArgsCtor", False, "ClassWithOptionalArgsCtor", "(System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["Microsoft.Extensions.DependencyInjection.Specification", "ClassWithOptionalArgsCtorWithStructs", False, "ClassWithOptionalArgsCtorWithStructs", "(System.DateTime,System.DateTime,System.TimeSpan,System.TimeSpan,System.DateTimeOffset,System.DateTimeOffset,System.Guid,System.Guid,Microsoft.Extensions.DependencyInjection.Specification.ClassWithOptionalArgsCtorWithStructs+CustomStruct,Microsoft.Extensions.DependencyInjection.Specification.ClassWithOptionalArgsCtorWithStructs+CustomStruct,System.Nullable<System.ConsoleColor>,System.Nullable<System.ConsoleColor>,System.Nullable<System.Int32>,System.Nullable<System.Int32>,Microsoft.Extensions.DependencyInjection.Specification.ClassWithOptionalArgsCtorWithStructs+StructWithPublicDefaultConstructor)", "", "Argument[10]", "Argument[this]", "taint", "df-generated"]
-      - ["Microsoft.Extensions.DependencyInjection.Specification", "ClassWithOptionalArgsCtorWithStructs", False, "ClassWithOptionalArgsCtorWithStructs", "(System.DateTime,System.DateTime,System.TimeSpan,System.TimeSpan,System.DateTimeOffset,System.DateTimeOffset,System.Guid,System.Guid,Microsoft.Extensions.DependencyInjection.Specification.ClassWithOptionalArgsCtorWithStructs+CustomStruct,Microsoft.Extensions.DependencyInjection.Specification.ClassWithOptionalArgsCtorWithStructs+CustomStruct,System.Nullable<System.ConsoleColor>,System.Nullable<System.ConsoleColor>,System.Nullable<System.Int32>,System.Nullable<System.Int32>,Microsoft.Extensions.DependencyInjection.Specification.ClassWithOptionalArgsCtorWithStructs+StructWithPublicDefaultConstructor)", "", "Argument[11]", "Argument[this]", "taint", "df-generated"]
-      - ["Microsoft.Extensions.DependencyInjection.Specification", "ClassWithOptionalArgsCtorWithStructs", False, "ClassWithOptionalArgsCtorWithStructs", "(System.DateTime,System.DateTime,System.TimeSpan,System.TimeSpan,System.DateTimeOffset,System.DateTimeOffset,System.Guid,System.Guid,Microsoft.Extensions.DependencyInjection.Specification.ClassWithOptionalArgsCtorWithStructs+CustomStruct,Microsoft.Extensions.DependencyInjection.Specification.ClassWithOptionalArgsCtorWithStructs+CustomStruct,System.Nullable<System.ConsoleColor>,System.Nullable<System.ConsoleColor>,System.Nullable<System.Int32>,System.Nullable<System.Int32>,Microsoft.Extensions.DependencyInjection.Specification.ClassWithOptionalArgsCtorWithStructs+StructWithPublicDefaultConstructor)", "", "Argument[12]", "Argument[this]", "taint", "df-generated"]
-      - ["Microsoft.Extensions.DependencyInjection.Specification", "ClassWithOptionalArgsCtorWithStructs", False, "ClassWithOptionalArgsCtorWithStructs", "(System.DateTime,System.DateTime,System.TimeSpan,System.TimeSpan,System.DateTimeOffset,System.DateTimeOffset,System.Guid,System.Guid,Microsoft.Extensions.DependencyInjection.Specification.ClassWithOptionalArgsCtorWithStructs+CustomStruct,Microsoft.Extensions.DependencyInjection.Specification.ClassWithOptionalArgsCtorWithStructs+CustomStruct,System.Nullable<System.ConsoleColor>,System.Nullable<System.ConsoleColor>,System.Nullable<System.Int32>,System.Nullable<System.Int32>,Microsoft.Extensions.DependencyInjection.Specification.ClassWithOptionalArgsCtorWithStructs+StructWithPublicDefaultConstructor)", "", "Argument[13]", "Argument[this]", "taint", "df-generated"]
-      - ["Microsoft.Extensions.DependencyInjection.Specification", "ClassWithOptionalArgsCtorWithStructs", False, "ClassWithOptionalArgsCtorWithStructs", "(System.DateTime,System.DateTime,System.TimeSpan,System.TimeSpan,System.DateTimeOffset,System.DateTimeOffset,System.Guid,System.Guid,Microsoft.Extensions.DependencyInjection.Specification.ClassWithOptionalArgsCtorWithStructs+CustomStruct,Microsoft.Extensions.DependencyInjection.Specification.ClassWithOptionalArgsCtorWithStructs+CustomStruct,System.Nullable<System.ConsoleColor>,System.Nullable<System.ConsoleColor>,System.Nullable<System.Int32>,System.Nullable<System.Int32>,Microsoft.Extensions.DependencyInjection.Specification.ClassWithOptionalArgsCtorWithStructs+StructWithPublicDefaultConstructor)", "", "Argument[14]", "Argument[this]", "taint", "df-generated"]
+      - ["Microsoft.Extensions.DependencyInjection.Specification", "ClassWithOptionalArgsCtor", False, "ClassWithOptionalArgsCtor", "(System.String)", "", "Argument[0]", "Argument[this].Property[Microsoft.Extensions.DependencyInjection.Specification.ClassWithOptionalArgsCtor.Whatever]", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.DependencyInjection.Specification", "ClassWithOptionalArgsCtorWithStructs", False, "ClassWithOptionalArgsCtorWithStructs", "(System.DateTime,System.DateTime,System.TimeSpan,System.TimeSpan,System.DateTimeOffset,System.DateTimeOffset,System.Guid,System.Guid,Microsoft.Extensions.DependencyInjection.Specification.ClassWithOptionalArgsCtorWithStructs+CustomStruct,Microsoft.Extensions.DependencyInjection.Specification.ClassWithOptionalArgsCtorWithStructs+CustomStruct,System.Nullable<System.ConsoleColor>,System.Nullable<System.ConsoleColor>,System.Nullable<System.Int32>,System.Nullable<System.Int32>,Microsoft.Extensions.DependencyInjection.Specification.ClassWithOptionalArgsCtorWithStructs+StructWithPublicDefaultConstructor)", "", "Argument[10]", "Argument[this].Property[Microsoft.Extensions.DependencyInjection.Specification.ClassWithOptionalArgsCtorWithStructs.Color]", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.DependencyInjection.Specification", "ClassWithOptionalArgsCtorWithStructs", False, "ClassWithOptionalArgsCtorWithStructs", "(System.DateTime,System.DateTime,System.TimeSpan,System.TimeSpan,System.DateTimeOffset,System.DateTimeOffset,System.Guid,System.Guid,Microsoft.Extensions.DependencyInjection.Specification.ClassWithOptionalArgsCtorWithStructs+CustomStruct,Microsoft.Extensions.DependencyInjection.Specification.ClassWithOptionalArgsCtorWithStructs+CustomStruct,System.Nullable<System.ConsoleColor>,System.Nullable<System.ConsoleColor>,System.Nullable<System.Int32>,System.Nullable<System.Int32>,Microsoft.Extensions.DependencyInjection.Specification.ClassWithOptionalArgsCtorWithStructs+StructWithPublicDefaultConstructor)", "", "Argument[11]", "Argument[this].Property[Microsoft.Extensions.DependencyInjection.Specification.ClassWithOptionalArgsCtorWithStructs.ColorNull]", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.DependencyInjection.Specification", "ClassWithOptionalArgsCtorWithStructs", False, "ClassWithOptionalArgsCtorWithStructs", "(System.DateTime,System.DateTime,System.TimeSpan,System.TimeSpan,System.DateTimeOffset,System.DateTimeOffset,System.Guid,System.Guid,Microsoft.Extensions.DependencyInjection.Specification.ClassWithOptionalArgsCtorWithStructs+CustomStruct,Microsoft.Extensions.DependencyInjection.Specification.ClassWithOptionalArgsCtorWithStructs+CustomStruct,System.Nullable<System.ConsoleColor>,System.Nullable<System.ConsoleColor>,System.Nullable<System.Int32>,System.Nullable<System.Int32>,Microsoft.Extensions.DependencyInjection.Specification.ClassWithOptionalArgsCtorWithStructs+StructWithPublicDefaultConstructor)", "", "Argument[12]", "Argument[this].Property[Microsoft.Extensions.DependencyInjection.Specification.ClassWithOptionalArgsCtorWithStructs.Integer]", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.DependencyInjection.Specification", "ClassWithOptionalArgsCtorWithStructs", False, "ClassWithOptionalArgsCtorWithStructs", "(System.DateTime,System.DateTime,System.TimeSpan,System.TimeSpan,System.DateTimeOffset,System.DateTimeOffset,System.Guid,System.Guid,Microsoft.Extensions.DependencyInjection.Specification.ClassWithOptionalArgsCtorWithStructs+CustomStruct,Microsoft.Extensions.DependencyInjection.Specification.ClassWithOptionalArgsCtorWithStructs+CustomStruct,System.Nullable<System.ConsoleColor>,System.Nullable<System.ConsoleColor>,System.Nullable<System.Int32>,System.Nullable<System.Int32>,Microsoft.Extensions.DependencyInjection.Specification.ClassWithOptionalArgsCtorWithStructs+StructWithPublicDefaultConstructor)", "", "Argument[13]", "Argument[this].Property[Microsoft.Extensions.DependencyInjection.Specification.ClassWithOptionalArgsCtorWithStructs.IntegerNull]", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.DependencyInjection.Specification", "ClassWithOptionalArgsCtorWithStructs", False, "ClassWithOptionalArgsCtorWithStructs", "(System.DateTime,System.DateTime,System.TimeSpan,System.TimeSpan,System.DateTimeOffset,System.DateTimeOffset,System.Guid,System.Guid,Microsoft.Extensions.DependencyInjection.Specification.ClassWithOptionalArgsCtorWithStructs+CustomStruct,Microsoft.Extensions.DependencyInjection.Specification.ClassWithOptionalArgsCtorWithStructs+CustomStruct,System.Nullable<System.ConsoleColor>,System.Nullable<System.ConsoleColor>,System.Nullable<System.Int32>,System.Nullable<System.Int32>,Microsoft.Extensions.DependencyInjection.Specification.ClassWithOptionalArgsCtorWithStructs+StructWithPublicDefaultConstructor)", "", "Argument[14]", "Argument[this].Property[Microsoft.Extensions.DependencyInjection.Specification.ClassWithOptionalArgsCtorWithStructs.StructWithConstructor]", "value", "dfc-generated"]
       - ["Microsoft.Extensions.DependencyInjection.Specification", "KeyedDependencyInjectionSpecificationTests+SimpleParentWithDynamicKeyedService", False, "SimpleParentWithDynamicKeyedService", "(System.IServiceProvider)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
   - addsTo:
       pack: codeql/csharp-all
@@ -72,8 +72,21 @@ extensions:
       - ["Microsoft.Extensions.DependencyInjection.Specification", "DependencyInjectionSpecificationTests", "SingletonServicesComeFromRootProvider", "()", "summary", "df-generated"]
       - ["Microsoft.Extensions.DependencyInjection.Specification", "DependencyInjectionSpecificationTests", "TransientServiceCanBeResolvedFromProvider", "()", "summary", "df-generated"]
       - ["Microsoft.Extensions.DependencyInjection.Specification", "DependencyInjectionSpecificationTests", "TransientServiceCanBeResolvedFromScope", "()", "summary", "df-generated"]
+      - ["Microsoft.Extensions.DependencyInjection.Specification", "DependencyInjectionSpecificationTests", "TypeActivatorAcceptsAnyNumberOfAdditionalConstructorParametersToProvide", "(Microsoft.Extensions.DependencyInjection.Specification.DependencyInjectionSpecificationTests+CreateInstanceFunc)", "summary", "df-generated"]
+      - ["Microsoft.Extensions.DependencyInjection.Specification", "DependencyInjectionSpecificationTests", "TypeActivatorCanDisambiguateConstructorsWithUniqueArguments", "(Microsoft.Extensions.DependencyInjection.Specification.DependencyInjectionSpecificationTests+CreateInstanceFunc)", "summary", "df-generated"]
       - ["Microsoft.Extensions.DependencyInjection.Specification", "DependencyInjectionSpecificationTests", "TypeActivatorCreateFactoryDoesNotAllowForAmbiguousConstructorMatches", "(System.Type)", "summary", "df-generated"]
       - ["Microsoft.Extensions.DependencyInjection.Specification", "DependencyInjectionSpecificationTests", "TypeActivatorCreateInstanceUsesLongestAvailableConstructor", "(System.Object,System.String)", "summary", "df-generated"]
+      - ["Microsoft.Extensions.DependencyInjection.Specification", "DependencyInjectionSpecificationTests", "TypeActivatorEnablesYouToCreateAnyTypeWithServicesEvenWhenNotInIocContainer", "(Microsoft.Extensions.DependencyInjection.Specification.DependencyInjectionSpecificationTests+CreateInstanceFunc)", "summary", "df-generated"]
+      - ["Microsoft.Extensions.DependencyInjection.Specification", "DependencyInjectionSpecificationTests", "TypeActivatorRequiresAllArgumentsCanBeAccepted", "(Microsoft.Extensions.DependencyInjection.Specification.DependencyInjectionSpecificationTests+CreateInstanceFunc)", "summary", "df-generated"]
+      - ["Microsoft.Extensions.DependencyInjection.Specification", "DependencyInjectionSpecificationTests", "TypeActivatorRequiresPublicConstructor", "(Microsoft.Extensions.DependencyInjection.Specification.DependencyInjectionSpecificationTests+CreateInstanceFunc,System.Type)", "summary", "df-generated"]
+      - ["Microsoft.Extensions.DependencyInjection.Specification", "DependencyInjectionSpecificationTests", "TypeActivatorRethrowsOriginalExceptionFromConstructor", "(Microsoft.Extensions.DependencyInjection.Specification.DependencyInjectionSpecificationTests+CreateInstanceFunc)", "summary", "df-generated"]
+      - ["Microsoft.Extensions.DependencyInjection.Specification", "DependencyInjectionSpecificationTests", "TypeActivatorThrowsOnMultipleMarkedCtors", "(Microsoft.Extensions.DependencyInjection.Specification.DependencyInjectionSpecificationTests+CreateInstanceFunc)", "summary", "df-generated"]
+      - ["Microsoft.Extensions.DependencyInjection.Specification", "DependencyInjectionSpecificationTests", "TypeActivatorThrowsWhenMarkedCtorDoesntAcceptArguments", "(Microsoft.Extensions.DependencyInjection.Specification.DependencyInjectionSpecificationTests+CreateInstanceFunc)", "summary", "df-generated"]
+      - ["Microsoft.Extensions.DependencyInjection.Specification", "DependencyInjectionSpecificationTests", "TypeActivatorUsesMarkedConstructor", "(Microsoft.Extensions.DependencyInjection.Specification.DependencyInjectionSpecificationTests+CreateInstanceFunc)", "summary", "df-generated"]
+      - ["Microsoft.Extensions.DependencyInjection.Specification", "DependencyInjectionSpecificationTests", "TypeActivatorWorksWithCtorWithOptionalArgs", "(Microsoft.Extensions.DependencyInjection.Specification.DependencyInjectionSpecificationTests+CreateInstanceFunc)", "summary", "df-generated"]
+      - ["Microsoft.Extensions.DependencyInjection.Specification", "DependencyInjectionSpecificationTests", "TypeActivatorWorksWithCtorWithOptionalArgs_WithStructDefaults", "(Microsoft.Extensions.DependencyInjection.Specification.DependencyInjectionSpecificationTests+CreateInstanceFunc)", "summary", "df-generated"]
+      - ["Microsoft.Extensions.DependencyInjection.Specification", "DependencyInjectionSpecificationTests", "TypeActivatorWorksWithStaticCtor", "(Microsoft.Extensions.DependencyInjection.Specification.DependencyInjectionSpecificationTests+CreateInstanceFunc)", "summary", "df-generated"]
+      - ["Microsoft.Extensions.DependencyInjection.Specification", "DependencyInjectionSpecificationTests", "UnRegisteredServiceAsConstructorParameterThrowsException", "(Microsoft.Extensions.DependencyInjection.Specification.DependencyInjectionSpecificationTests+CreateInstanceFunc)", "summary", "df-generated"]
       - ["Microsoft.Extensions.DependencyInjection.Specification", "DependencyInjectionSpecificationTests", "get_CreateInstanceFuncs", "()", "summary", "df-generated"]
       - ["Microsoft.Extensions.DependencyInjection.Specification", "DependencyInjectionSpecificationTests", "get_ExpectStructWithPublicDefaultConstructorInvoked", "()", "summary", "df-generated"]
       - ["Microsoft.Extensions.DependencyInjection.Specification", "DependencyInjectionSpecificationTests", "get_ServiceContainerPicksConstructorWithLongestMatchesData", "()", "summary", "df-generated"]
diff --git a/csharp/ql/lib/ext/generated/Microsoft.Extensions.DependencyInjection.model.yml b/csharp/ql/lib/ext/generated/Microsoft.Extensions.DependencyInjection.model.yml
index bda1f5036d7..2d9fe696bca 100644
--- a/csharp/ql/lib/ext/generated/Microsoft.Extensions.DependencyInjection.model.yml
+++ b/csharp/ql/lib/ext/generated/Microsoft.Extensions.DependencyInjection.model.yml
@@ -4,21 +4,38 @@ extensions:
       pack: codeql/csharp-all
       extensible: summaryModel
     data:
-      - ["Microsoft.Extensions.DependencyInjection", "ActivatorUtilities", False, "GetServiceOrCreateInstance", "(System.IServiceProvider,System.Type)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Extensions.DependencyInjection", "ActivatorUtilities", False, "GetServiceOrCreateInstance<T>", "(System.IServiceProvider)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Extensions.DependencyInjection", "AsyncServiceScope", False, "AsyncServiceScope", "(Microsoft.Extensions.DependencyInjection.IServiceScope)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["Microsoft.Extensions.DependencyInjection", "DefaultServiceProviderFactory", False, "CreateBuilder", "(Microsoft.Extensions.DependencyInjection.IServiceCollection)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
+      - ["Microsoft.Extensions.DependencyInjection", "ActivatorUtilities", False, "GetServiceOrCreateInstance", "(System.IServiceProvider,System.Type)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.DependencyInjection", "ActivatorUtilities", False, "GetServiceOrCreateInstance<T>", "(System.IServiceProvider)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.DependencyInjection", "AsyncServiceScope", False, "AsyncServiceScope", "(Microsoft.Extensions.DependencyInjection.IServiceScope)", "", "Argument[0]", "Argument[this].SyntheticField[Microsoft.Extensions.DependencyInjection.AsyncServiceScope._serviceScope]", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.DependencyInjection", "AsyncServiceScope", False, "get_ServiceProvider", "()", "", "Argument[this].SyntheticField[Microsoft.Extensions.DependencyInjection.AsyncServiceScope._serviceScope].Property[Microsoft.Extensions.DependencyInjection.IServiceScope.ServiceProvider]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.DependencyInjection", "AsyncServiceScope", False, "get_ServiceProvider", "()", "", "Argument[this].SyntheticField[Microsoft.Extensions.DependencyInjection.AsyncServiceScope._serviceScope]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.DependencyInjection", "DefaultServiceProviderFactory", False, "CreateBuilder", "(Microsoft.Extensions.DependencyInjection.IServiceCollection)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
       - ["Microsoft.Extensions.DependencyInjection", "DefaultServiceProviderFactory", False, "DefaultServiceProviderFactory", "(Microsoft.Extensions.DependencyInjection.ServiceProviderOptions)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["Microsoft.Extensions.DependencyInjection", "HttpClientBuilderExtensions", False, "AddDefaultLogger", "(Microsoft.Extensions.DependencyInjection.IHttpClientBuilder)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Extensions.DependencyInjection", "HttpClientBuilderExtensions", False, "AddHttpMessageHandler<THandler>", "(Microsoft.Extensions.DependencyInjection.IHttpClientBuilder)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Extensions.DependencyInjection", "HttpClientBuilderExtensions", False, "AddLogger<TLogger>", "(Microsoft.Extensions.DependencyInjection.IHttpClientBuilder,System.Boolean)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Extensions.DependencyInjection", "HttpClientBuilderExtensions", False, "AddTypedClient<TClient,TImplementation>", "(Microsoft.Extensions.DependencyInjection.IHttpClientBuilder)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Extensions.DependencyInjection", "HttpClientBuilderExtensions", False, "AddTypedClient<TClient>", "(Microsoft.Extensions.DependencyInjection.IHttpClientBuilder)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Extensions.DependencyInjection", "HttpClientBuilderExtensions", False, "ConfigurePrimaryHttpMessageHandler<THandler>", "(Microsoft.Extensions.DependencyInjection.IHttpClientBuilder)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Extensions.DependencyInjection", "HttpClientBuilderExtensions", False, "RedactLoggedHeaders", "(Microsoft.Extensions.DependencyInjection.IHttpClientBuilder,System.Collections.Generic.IEnumerable<System.String>)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Extensions.DependencyInjection", "HttpClientBuilderExtensions", False, "RemoveAllLoggers", "(Microsoft.Extensions.DependencyInjection.IHttpClientBuilder)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Extensions.DependencyInjection", "HttpClientBuilderExtensions", False, "SetHandlerLifetime", "(Microsoft.Extensions.DependencyInjection.IHttpClientBuilder,System.TimeSpan)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Extensions.DependencyInjection", "HttpClientFactoryServiceCollectionExtensions", False, "AddHttpClient", "(Microsoft.Extensions.DependencyInjection.IServiceCollection)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
+      - ["Microsoft.Extensions.DependencyInjection", "HttpClientBuilderExtensions", False, "AddDefaultLogger", "(Microsoft.Extensions.DependencyInjection.IHttpClientBuilder)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.DependencyInjection", "HttpClientBuilderExtensions", False, "AddHttpMessageHandler", "(Microsoft.Extensions.DependencyInjection.IHttpClientBuilder,System.Func<System.IServiceProvider,System.Net.Http.DelegatingHandler>)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.DependencyInjection", "HttpClientBuilderExtensions", False, "AddHttpMessageHandler", "(Microsoft.Extensions.DependencyInjection.IHttpClientBuilder,System.Func<System.Net.Http.DelegatingHandler>)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.DependencyInjection", "HttpClientBuilderExtensions", False, "AddHttpMessageHandler<THandler>", "(Microsoft.Extensions.DependencyInjection.IHttpClientBuilder)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.DependencyInjection", "HttpClientBuilderExtensions", False, "AddLogger", "(Microsoft.Extensions.DependencyInjection.IHttpClientBuilder,System.Func<System.IServiceProvider,Microsoft.Extensions.Http.Logging.IHttpClientLogger>,System.Boolean)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.DependencyInjection", "HttpClientBuilderExtensions", False, "AddLogger<TLogger>", "(Microsoft.Extensions.DependencyInjection.IHttpClientBuilder,System.Boolean)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.DependencyInjection", "HttpClientBuilderExtensions", False, "AddTypedClient<TClient,TImplementation>", "(Microsoft.Extensions.DependencyInjection.IHttpClientBuilder)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.DependencyInjection", "HttpClientBuilderExtensions", False, "AddTypedClient<TClient>", "(Microsoft.Extensions.DependencyInjection.IHttpClientBuilder)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.DependencyInjection", "HttpClientBuilderExtensions", False, "AddTypedClient<TClient>", "(Microsoft.Extensions.DependencyInjection.IHttpClientBuilder,System.Func<System.Net.Http.HttpClient,System.IServiceProvider,TClient>)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.DependencyInjection", "HttpClientBuilderExtensions", False, "AddTypedClient<TClient>", "(Microsoft.Extensions.DependencyInjection.IHttpClientBuilder,System.Func<System.Net.Http.HttpClient,TClient>)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.DependencyInjection", "HttpClientBuilderExtensions", False, "ConfigureAdditionalHttpMessageHandlers", "(Microsoft.Extensions.DependencyInjection.IHttpClientBuilder,System.Action<System.Collections.Generic.IList<System.Net.Http.DelegatingHandler>,System.IServiceProvider>)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.DependencyInjection", "HttpClientBuilderExtensions", False, "ConfigureHttpClient", "(Microsoft.Extensions.DependencyInjection.IHttpClientBuilder,System.Action<System.IServiceProvider,System.Net.Http.HttpClient>)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.DependencyInjection", "HttpClientBuilderExtensions", False, "ConfigureHttpClient", "(Microsoft.Extensions.DependencyInjection.IHttpClientBuilder,System.Action<System.Net.Http.HttpClient>)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.DependencyInjection", "HttpClientBuilderExtensions", False, "ConfigureHttpMessageHandlerBuilder", "(Microsoft.Extensions.DependencyInjection.IHttpClientBuilder,System.Action<Microsoft.Extensions.Http.HttpMessageHandlerBuilder>)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.DependencyInjection", "HttpClientBuilderExtensions", False, "ConfigurePrimaryHttpMessageHandler", "(Microsoft.Extensions.DependencyInjection.IHttpClientBuilder,System.Action<System.Net.Http.HttpMessageHandler,System.IServiceProvider>)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.DependencyInjection", "HttpClientBuilderExtensions", False, "ConfigurePrimaryHttpMessageHandler", "(Microsoft.Extensions.DependencyInjection.IHttpClientBuilder,System.Func<System.IServiceProvider,System.Net.Http.HttpMessageHandler>)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.DependencyInjection", "HttpClientBuilderExtensions", False, "ConfigurePrimaryHttpMessageHandler", "(Microsoft.Extensions.DependencyInjection.IHttpClientBuilder,System.Func<System.Net.Http.HttpMessageHandler>)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.DependencyInjection", "HttpClientBuilderExtensions", False, "ConfigurePrimaryHttpMessageHandler<THandler>", "(Microsoft.Extensions.DependencyInjection.IHttpClientBuilder)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.DependencyInjection", "HttpClientBuilderExtensions", False, "RedactLoggedHeaders", "(Microsoft.Extensions.DependencyInjection.IHttpClientBuilder,System.Collections.Generic.IEnumerable<System.String>)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.DependencyInjection", "HttpClientBuilderExtensions", False, "RedactLoggedHeaders", "(Microsoft.Extensions.DependencyInjection.IHttpClientBuilder,System.Func<System.String,System.Boolean>)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.DependencyInjection", "HttpClientBuilderExtensions", False, "RemoveAllLoggers", "(Microsoft.Extensions.DependencyInjection.IHttpClientBuilder)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.DependencyInjection", "HttpClientBuilderExtensions", False, "SetHandlerLifetime", "(Microsoft.Extensions.DependencyInjection.IHttpClientBuilder,System.TimeSpan)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.DependencyInjection", "HttpClientBuilderExtensions", False, "UseSocketsHttpHandler", "(Microsoft.Extensions.DependencyInjection.IHttpClientBuilder,System.Action<Microsoft.Extensions.DependencyInjection.ISocketsHttpHandlerBuilder>)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.DependencyInjection", "HttpClientBuilderExtensions", False, "UseSocketsHttpHandler", "(Microsoft.Extensions.DependencyInjection.IHttpClientBuilder,System.Action<System.Net.Http.SocketsHttpHandler,System.IServiceProvider>)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.DependencyInjection", "HttpClientFactoryServiceCollectionExtensions", False, "AddHttpClient", "(Microsoft.Extensions.DependencyInjection.IServiceCollection)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
       - ["Microsoft.Extensions.DependencyInjection", "HttpClientFactoryServiceCollectionExtensions", False, "AddHttpClient", "(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.String)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
       - ["Microsoft.Extensions.DependencyInjection", "HttpClientFactoryServiceCollectionExtensions", False, "AddHttpClient", "(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.String)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
       - ["Microsoft.Extensions.DependencyInjection", "HttpClientFactoryServiceCollectionExtensions", False, "AddHttpClient<TClient,TImplementation>", "(Microsoft.Extensions.DependencyInjection.IServiceCollection)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
@@ -27,68 +44,119 @@ extensions:
       - ["Microsoft.Extensions.DependencyInjection", "HttpClientFactoryServiceCollectionExtensions", False, "AddHttpClient<TClient>", "(Microsoft.Extensions.DependencyInjection.IServiceCollection)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
       - ["Microsoft.Extensions.DependencyInjection", "HttpClientFactoryServiceCollectionExtensions", False, "AddHttpClient<TClient>", "(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.String)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
       - ["Microsoft.Extensions.DependencyInjection", "HttpClientFactoryServiceCollectionExtensions", False, "AddHttpClient<TClient>", "(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.String)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Extensions.DependencyInjection", "IServiceScope", True, "get_ServiceProvider", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Extensions.DependencyInjection", "IServiceScope", True, "get_ServiceProvider", "()", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["Microsoft.Extensions.DependencyInjection", "HttpClientFactoryServiceCollectionExtensions", False, "ConfigureHttpClientDefaults", "(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Action<Microsoft.Extensions.DependencyInjection.IHttpClientBuilder>)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.DependencyInjection", "IServiceScope", True, "get_ServiceProvider", "()", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
       - ["Microsoft.Extensions.DependencyInjection", "IServiceScopeFactory", True, "CreateScope", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Extensions.DependencyInjection", "LoggingServiceCollectionExtensions", False, "AddLogging", "(Microsoft.Extensions.DependencyInjection.IServiceCollection)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Extensions.DependencyInjection", "MemoryCacheServiceCollectionExtensions", False, "AddDistributedMemoryCache", "(Microsoft.Extensions.DependencyInjection.IServiceCollection)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Extensions.DependencyInjection", "MemoryCacheServiceCollectionExtensions", False, "AddMemoryCache", "(Microsoft.Extensions.DependencyInjection.IServiceCollection)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Extensions.DependencyInjection", "MetricsServiceExtensions", False, "AddMetrics", "(Microsoft.Extensions.DependencyInjection.IServiceCollection)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Extensions.DependencyInjection", "OptionsBuilderConfigurationExtensions", False, "Bind<TOptions>", "(Microsoft.Extensions.Options.OptionsBuilder<TOptions>,Microsoft.Extensions.Configuration.IConfiguration)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Extensions.DependencyInjection", "OptionsBuilderDataAnnotationsExtensions", False, "ValidateDataAnnotations<TOptions>", "(Microsoft.Extensions.Options.OptionsBuilder<TOptions>)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Extensions.DependencyInjection", "OptionsBuilderExtensions", False, "ValidateOnStart<TOptions>", "(Microsoft.Extensions.Options.OptionsBuilder<TOptions>)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Extensions.DependencyInjection", "OptionsConfigurationServiceCollectionExtensions", False, "Configure<TOptions>", "(Microsoft.Extensions.DependencyInjection.IServiceCollection,Microsoft.Extensions.Configuration.IConfiguration)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Extensions.DependencyInjection", "OptionsConfigurationServiceCollectionExtensions", False, "Configure<TOptions>", "(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.String,Microsoft.Extensions.Configuration.IConfiguration)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Extensions.DependencyInjection", "OptionsServiceCollectionExtensions", False, "AddOptions", "(Microsoft.Extensions.DependencyInjection.IServiceCollection)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Extensions.DependencyInjection", "OptionsServiceCollectionExtensions", False, "ConfigureOptions", "(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Object)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Extensions.DependencyInjection", "OptionsServiceCollectionExtensions", False, "ConfigureOptions", "(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Type)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Extensions.DependencyInjection", "OptionsServiceCollectionExtensions", False, "ConfigureOptions<TConfigureOptions>", "(Microsoft.Extensions.DependencyInjection.IServiceCollection)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Extensions.DependencyInjection", "ServiceCollectionHostedServiceExtensions", False, "AddHostedService<THostedService>", "(Microsoft.Extensions.DependencyInjection.IServiceCollection)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Extensions.DependencyInjection", "ServiceCollectionServiceExtensions", False, "AddKeyedScoped", "(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Type,System.Object)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Extensions.DependencyInjection", "ServiceCollectionServiceExtensions", False, "AddKeyedScoped", "(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Type,System.Object,System.Type)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Extensions.DependencyInjection", "ServiceCollectionServiceExtensions", False, "AddKeyedScoped<TService,TImplementation>", "(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Object)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Extensions.DependencyInjection", "ServiceCollectionServiceExtensions", False, "AddKeyedScoped<TService>", "(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Object)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Extensions.DependencyInjection", "ServiceCollectionServiceExtensions", False, "AddKeyedSingleton", "(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Type,System.Object)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Extensions.DependencyInjection", "ServiceCollectionServiceExtensions", False, "AddKeyedSingleton", "(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Type,System.Object,System.Object)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Extensions.DependencyInjection", "ServiceCollectionServiceExtensions", False, "AddKeyedSingleton", "(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Type,System.Object,System.Object)", "", "Argument[3]", "Argument[0].Element", "taint", "df-generated"]
-      - ["Microsoft.Extensions.DependencyInjection", "ServiceCollectionServiceExtensions", False, "AddKeyedSingleton", "(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Type,System.Object,System.Object)", "", "Argument[3]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Extensions.DependencyInjection", "ServiceCollectionServiceExtensions", False, "AddKeyedSingleton", "(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Type,System.Object,System.Type)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Extensions.DependencyInjection", "ServiceCollectionServiceExtensions", False, "AddKeyedSingleton<TService,TImplementation>", "(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Object)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Extensions.DependencyInjection", "ServiceCollectionServiceExtensions", False, "AddKeyedSingleton<TService>", "(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Object)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Extensions.DependencyInjection", "ServiceCollectionServiceExtensions", False, "AddKeyedSingleton<TService>", "(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Object,TService)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Extensions.DependencyInjection", "ServiceCollectionServiceExtensions", False, "AddKeyedSingleton<TService>", "(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Object,TService)", "", "Argument[2]", "Argument[0].Element", "taint", "df-generated"]
-      - ["Microsoft.Extensions.DependencyInjection", "ServiceCollectionServiceExtensions", False, "AddKeyedSingleton<TService>", "(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Object,TService)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Extensions.DependencyInjection", "ServiceCollectionServiceExtensions", False, "AddKeyedTransient", "(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Type,System.Object)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Extensions.DependencyInjection", "ServiceCollectionServiceExtensions", False, "AddKeyedTransient", "(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Type,System.Object,System.Type)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Extensions.DependencyInjection", "ServiceCollectionServiceExtensions", False, "AddKeyedTransient<TService,TImplementation>", "(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Object)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Extensions.DependencyInjection", "ServiceCollectionServiceExtensions", False, "AddKeyedTransient<TService>", "(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Object)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Extensions.DependencyInjection", "ServiceCollectionServiceExtensions", False, "AddScoped", "(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Type)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Extensions.DependencyInjection", "ServiceCollectionServiceExtensions", False, "AddScoped", "(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Type,System.Type)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Extensions.DependencyInjection", "ServiceCollectionServiceExtensions", False, "AddScoped<TService,TImplementation>", "(Microsoft.Extensions.DependencyInjection.IServiceCollection)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Extensions.DependencyInjection", "ServiceCollectionServiceExtensions", False, "AddScoped<TService>", "(Microsoft.Extensions.DependencyInjection.IServiceCollection)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Extensions.DependencyInjection", "ServiceCollectionServiceExtensions", False, "AddSingleton", "(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Type)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Extensions.DependencyInjection", "ServiceCollectionServiceExtensions", False, "AddSingleton", "(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Type,System.Object)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Extensions.DependencyInjection", "ServiceCollectionServiceExtensions", False, "AddSingleton", "(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Type,System.Type)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Extensions.DependencyInjection", "ServiceCollectionServiceExtensions", False, "AddSingleton<TService,TImplementation>", "(Microsoft.Extensions.DependencyInjection.IServiceCollection)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Extensions.DependencyInjection", "ServiceCollectionServiceExtensions", False, "AddSingleton<TService>", "(Microsoft.Extensions.DependencyInjection.IServiceCollection)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Extensions.DependencyInjection", "ServiceCollectionServiceExtensions", False, "AddSingleton<TService>", "(Microsoft.Extensions.DependencyInjection.IServiceCollection,TService)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Extensions.DependencyInjection", "ServiceCollectionServiceExtensions", False, "AddTransient", "(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Type)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Extensions.DependencyInjection", "ServiceCollectionServiceExtensions", False, "AddTransient", "(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Type,System.Type)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Extensions.DependencyInjection", "ServiceCollectionServiceExtensions", False, "AddTransient<TService,TImplementation>", "(Microsoft.Extensions.DependencyInjection.IServiceCollection)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Extensions.DependencyInjection", "ServiceCollectionServiceExtensions", False, "AddTransient<TService>", "(Microsoft.Extensions.DependencyInjection.IServiceCollection)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Extensions.DependencyInjection", "ServiceDescriptor", False, "KeyedSingleton", "(System.Type,System.Object,System.Object)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Extensions.DependencyInjection", "ServiceDescriptor", False, "KeyedSingleton<TService>", "(System.Object,TService)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Extensions.DependencyInjection", "ServiceDescriptor", False, "ServiceDescriptor", "(System.Type,System.Object,System.Object)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
+      - ["Microsoft.Extensions.DependencyInjection", "LoggingServiceCollectionExtensions", False, "AddLogging", "(Microsoft.Extensions.DependencyInjection.IServiceCollection)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.DependencyInjection", "LoggingServiceCollectionExtensions", False, "AddLogging", "(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Action<Microsoft.Extensions.Logging.ILoggingBuilder>)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.DependencyInjection", "MemoryCacheServiceCollectionExtensions", False, "AddDistributedMemoryCache", "(Microsoft.Extensions.DependencyInjection.IServiceCollection)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.DependencyInjection", "MemoryCacheServiceCollectionExtensions", False, "AddDistributedMemoryCache", "(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Action<Microsoft.Extensions.Caching.Memory.MemoryDistributedCacheOptions>)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.DependencyInjection", "MemoryCacheServiceCollectionExtensions", False, "AddMemoryCache", "(Microsoft.Extensions.DependencyInjection.IServiceCollection)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.DependencyInjection", "MemoryCacheServiceCollectionExtensions", False, "AddMemoryCache", "(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Action<Microsoft.Extensions.Caching.Memory.MemoryCacheOptions>)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.DependencyInjection", "MetricsServiceExtensions", False, "AddMetrics", "(Microsoft.Extensions.DependencyInjection.IServiceCollection)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.DependencyInjection", "MetricsServiceExtensions", False, "AddMetrics", "(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Action<Microsoft.Extensions.Diagnostics.Metrics.IMetricsBuilder>)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.DependencyInjection", "OptionsBuilderConfigurationExtensions", False, "Bind<TOptions>", "(Microsoft.Extensions.Options.OptionsBuilder<TOptions>,Microsoft.Extensions.Configuration.IConfiguration)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.DependencyInjection", "OptionsBuilderConfigurationExtensions", False, "Bind<TOptions>", "(Microsoft.Extensions.Options.OptionsBuilder<TOptions>,Microsoft.Extensions.Configuration.IConfiguration,System.Action<Microsoft.Extensions.Configuration.BinderOptions>)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.DependencyInjection", "OptionsBuilderConfigurationExtensions", False, "BindConfiguration<TOptions>", "(Microsoft.Extensions.Options.OptionsBuilder<TOptions>,System.String,System.Action<Microsoft.Extensions.Configuration.BinderOptions>)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.DependencyInjection", "OptionsBuilderDataAnnotationsExtensions", False, "ValidateDataAnnotations<TOptions>", "(Microsoft.Extensions.Options.OptionsBuilder<TOptions>)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.DependencyInjection", "OptionsBuilderExtensions", False, "ValidateOnStart<TOptions>", "(Microsoft.Extensions.Options.OptionsBuilder<TOptions>)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.DependencyInjection", "OptionsConfigurationServiceCollectionExtensions", False, "Configure<TOptions>", "(Microsoft.Extensions.DependencyInjection.IServiceCollection,Microsoft.Extensions.Configuration.IConfiguration)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.DependencyInjection", "OptionsConfigurationServiceCollectionExtensions", False, "Configure<TOptions>", "(Microsoft.Extensions.DependencyInjection.IServiceCollection,Microsoft.Extensions.Configuration.IConfiguration,System.Action<Microsoft.Extensions.Configuration.BinderOptions>)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.DependencyInjection", "OptionsConfigurationServiceCollectionExtensions", False, "Configure<TOptions>", "(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.String,Microsoft.Extensions.Configuration.IConfiguration)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.DependencyInjection", "OptionsConfigurationServiceCollectionExtensions", False, "Configure<TOptions>", "(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.String,Microsoft.Extensions.Configuration.IConfiguration,System.Action<Microsoft.Extensions.Configuration.BinderOptions>)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.DependencyInjection", "OptionsServiceCollectionExtensions", False, "AddOptions", "(Microsoft.Extensions.DependencyInjection.IServiceCollection)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.DependencyInjection", "OptionsServiceCollectionExtensions", False, "Configure<TOptions>", "(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Action<TOptions>)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.DependencyInjection", "OptionsServiceCollectionExtensions", False, "Configure<TOptions>", "(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.String,System.Action<TOptions>)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.DependencyInjection", "OptionsServiceCollectionExtensions", False, "ConfigureAll<TOptions>", "(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Action<TOptions>)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.DependencyInjection", "OptionsServiceCollectionExtensions", False, "ConfigureOptions", "(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Object)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.DependencyInjection", "OptionsServiceCollectionExtensions", False, "ConfigureOptions", "(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Type)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.DependencyInjection", "OptionsServiceCollectionExtensions", False, "ConfigureOptions<TConfigureOptions>", "(Microsoft.Extensions.DependencyInjection.IServiceCollection)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.DependencyInjection", "OptionsServiceCollectionExtensions", False, "PostConfigure<TOptions>", "(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Action<TOptions>)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.DependencyInjection", "OptionsServiceCollectionExtensions", False, "PostConfigure<TOptions>", "(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.String,System.Action<TOptions>)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.DependencyInjection", "OptionsServiceCollectionExtensions", False, "PostConfigureAll<TOptions>", "(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Action<TOptions>)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.DependencyInjection", "ServiceCollectionHostedServiceExtensions", False, "AddHostedService<THostedService>", "(Microsoft.Extensions.DependencyInjection.IServiceCollection)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.DependencyInjection", "ServiceCollectionHostedServiceExtensions", False, "AddHostedService<THostedService>", "(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Func<System.IServiceProvider,THostedService>)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.DependencyInjection", "ServiceCollectionServiceExtensions", False, "AddKeyedScoped", "(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Type,System.Object)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.DependencyInjection", "ServiceCollectionServiceExtensions", False, "AddKeyedScoped", "(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Type,System.Object,System.Func<System.IServiceProvider,System.Object,System.Object>)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.DependencyInjection", "ServiceCollectionServiceExtensions", False, "AddKeyedScoped", "(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Type,System.Object,System.Type)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.DependencyInjection", "ServiceCollectionServiceExtensions", False, "AddKeyedScoped<TService,TImplementation>", "(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Object)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.DependencyInjection", "ServiceCollectionServiceExtensions", False, "AddKeyedScoped<TService,TImplementation>", "(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Object,System.Func<System.IServiceProvider,System.Object,TImplementation>)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.DependencyInjection", "ServiceCollectionServiceExtensions", False, "AddKeyedScoped<TService>", "(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Object)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.DependencyInjection", "ServiceCollectionServiceExtensions", False, "AddKeyedScoped<TService>", "(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Object,System.Func<System.IServiceProvider,System.Object,TService>)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.DependencyInjection", "ServiceCollectionServiceExtensions", False, "AddKeyedSingleton", "(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Type,System.Object)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.DependencyInjection", "ServiceCollectionServiceExtensions", False, "AddKeyedSingleton", "(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Type,System.Object,System.Func<System.IServiceProvider,System.Object,System.Object>)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.DependencyInjection", "ServiceCollectionServiceExtensions", False, "AddKeyedSingleton", "(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Type,System.Object,System.Object)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.DependencyInjection", "ServiceCollectionServiceExtensions", False, "AddKeyedSingleton", "(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Type,System.Object,System.Type)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.DependencyInjection", "ServiceCollectionServiceExtensions", False, "AddKeyedSingleton<TService,TImplementation>", "(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Object)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.DependencyInjection", "ServiceCollectionServiceExtensions", False, "AddKeyedSingleton<TService,TImplementation>", "(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Object,System.Func<System.IServiceProvider,System.Object,TImplementation>)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.DependencyInjection", "ServiceCollectionServiceExtensions", False, "AddKeyedSingleton<TService>", "(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Object)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.DependencyInjection", "ServiceCollectionServiceExtensions", False, "AddKeyedSingleton<TService>", "(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Object,System.Func<System.IServiceProvider,System.Object,TService>)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.DependencyInjection", "ServiceCollectionServiceExtensions", False, "AddKeyedSingleton<TService>", "(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Object,TService)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.DependencyInjection", "ServiceCollectionServiceExtensions", False, "AddKeyedTransient", "(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Type,System.Object)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.DependencyInjection", "ServiceCollectionServiceExtensions", False, "AddKeyedTransient", "(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Type,System.Object,System.Func<System.IServiceProvider,System.Object,System.Object>)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.DependencyInjection", "ServiceCollectionServiceExtensions", False, "AddKeyedTransient", "(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Type,System.Object,System.Type)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.DependencyInjection", "ServiceCollectionServiceExtensions", False, "AddKeyedTransient<TService,TImplementation>", "(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Object)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.DependencyInjection", "ServiceCollectionServiceExtensions", False, "AddKeyedTransient<TService,TImplementation>", "(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Object,System.Func<System.IServiceProvider,System.Object,TImplementation>)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.DependencyInjection", "ServiceCollectionServiceExtensions", False, "AddKeyedTransient<TService>", "(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Object)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.DependencyInjection", "ServiceCollectionServiceExtensions", False, "AddKeyedTransient<TService>", "(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Object,System.Func<System.IServiceProvider,System.Object,TService>)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.DependencyInjection", "ServiceCollectionServiceExtensions", False, "AddScoped", "(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Type)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.DependencyInjection", "ServiceCollectionServiceExtensions", False, "AddScoped", "(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Type,System.Func<System.IServiceProvider,System.Object>)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.DependencyInjection", "ServiceCollectionServiceExtensions", False, "AddScoped", "(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Type,System.Type)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.DependencyInjection", "ServiceCollectionServiceExtensions", False, "AddScoped<TService,TImplementation>", "(Microsoft.Extensions.DependencyInjection.IServiceCollection)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.DependencyInjection", "ServiceCollectionServiceExtensions", False, "AddScoped<TService,TImplementation>", "(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Func<System.IServiceProvider,TImplementation>)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.DependencyInjection", "ServiceCollectionServiceExtensions", False, "AddScoped<TService>", "(Microsoft.Extensions.DependencyInjection.IServiceCollection)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.DependencyInjection", "ServiceCollectionServiceExtensions", False, "AddScoped<TService>", "(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Func<System.IServiceProvider,TService>)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.DependencyInjection", "ServiceCollectionServiceExtensions", False, "AddSingleton", "(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Type)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.DependencyInjection", "ServiceCollectionServiceExtensions", False, "AddSingleton", "(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Type,System.Func<System.IServiceProvider,System.Object>)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.DependencyInjection", "ServiceCollectionServiceExtensions", False, "AddSingleton", "(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Type,System.Object)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.DependencyInjection", "ServiceCollectionServiceExtensions", False, "AddSingleton", "(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Type,System.Type)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.DependencyInjection", "ServiceCollectionServiceExtensions", False, "AddSingleton<TService,TImplementation>", "(Microsoft.Extensions.DependencyInjection.IServiceCollection)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.DependencyInjection", "ServiceCollectionServiceExtensions", False, "AddSingleton<TService,TImplementation>", "(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Func<System.IServiceProvider,TImplementation>)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.DependencyInjection", "ServiceCollectionServiceExtensions", False, "AddSingleton<TService>", "(Microsoft.Extensions.DependencyInjection.IServiceCollection)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.DependencyInjection", "ServiceCollectionServiceExtensions", False, "AddSingleton<TService>", "(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Func<System.IServiceProvider,TService>)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.DependencyInjection", "ServiceCollectionServiceExtensions", False, "AddSingleton<TService>", "(Microsoft.Extensions.DependencyInjection.IServiceCollection,TService)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.DependencyInjection", "ServiceCollectionServiceExtensions", False, "AddTransient", "(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Type)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.DependencyInjection", "ServiceCollectionServiceExtensions", False, "AddTransient", "(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Type,System.Func<System.IServiceProvider,System.Object>)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.DependencyInjection", "ServiceCollectionServiceExtensions", False, "AddTransient", "(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Type,System.Type)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.DependencyInjection", "ServiceCollectionServiceExtensions", False, "AddTransient<TService,TImplementation>", "(Microsoft.Extensions.DependencyInjection.IServiceCollection)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.DependencyInjection", "ServiceCollectionServiceExtensions", False, "AddTransient<TService,TImplementation>", "(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Func<System.IServiceProvider,TImplementation>)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.DependencyInjection", "ServiceCollectionServiceExtensions", False, "AddTransient<TService>", "(Microsoft.Extensions.DependencyInjection.IServiceCollection)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.DependencyInjection", "ServiceCollectionServiceExtensions", False, "AddTransient<TService>", "(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Func<System.IServiceProvider,TService>)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.DependencyInjection", "ServiceDescriptor", False, "Describe", "(System.Type,System.Func<System.IServiceProvider,System.Object>,Microsoft.Extensions.DependencyInjection.ServiceLifetime)", "", "Argument[1]", "ReturnValue.SyntheticField[Microsoft.Extensions.DependencyInjection.ServiceDescriptor._implementationFactory]", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.DependencyInjection", "ServiceDescriptor", False, "DescribeKeyed", "(System.Type,System.Object,System.Func<System.IServiceProvider,System.Object,System.Object>,Microsoft.Extensions.DependencyInjection.ServiceLifetime)", "", "Argument[2]", "ReturnValue.SyntheticField[Microsoft.Extensions.DependencyInjection.ServiceDescriptor._implementationFactory]", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.DependencyInjection", "ServiceDescriptor", False, "KeyedScoped", "(System.Type,System.Object,System.Func<System.IServiceProvider,System.Object,System.Object>)", "", "Argument[2]", "ReturnValue.SyntheticField[Microsoft.Extensions.DependencyInjection.ServiceDescriptor._implementationFactory]", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.DependencyInjection", "ServiceDescriptor", False, "KeyedScoped<TService,TImplementation>", "(System.Object,System.Func<System.IServiceProvider,System.Object,TImplementation>)", "", "Argument[1]", "ReturnValue.SyntheticField[Microsoft.Extensions.DependencyInjection.ServiceDescriptor._implementationFactory]", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.DependencyInjection", "ServiceDescriptor", False, "KeyedScoped<TService>", "(System.Object,System.Func<System.IServiceProvider,System.Object,TService>)", "", "Argument[1]", "ReturnValue.SyntheticField[Microsoft.Extensions.DependencyInjection.ServiceDescriptor._implementationFactory]", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.DependencyInjection", "ServiceDescriptor", False, "KeyedSingleton", "(System.Type,System.Object,System.Func<System.IServiceProvider,System.Object,System.Object>)", "", "Argument[2]", "ReturnValue.SyntheticField[Microsoft.Extensions.DependencyInjection.ServiceDescriptor._implementationFactory]", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.DependencyInjection", "ServiceDescriptor", False, "KeyedSingleton", "(System.Type,System.Object,System.Object)", "", "Argument[2]", "ReturnValue.SyntheticField[Microsoft.Extensions.DependencyInjection.ServiceDescriptor._implementationInstance]", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.DependencyInjection", "ServiceDescriptor", False, "KeyedSingleton<TService,TImplementation>", "(System.Object,System.Func<System.IServiceProvider,System.Object,TImplementation>)", "", "Argument[1]", "ReturnValue.SyntheticField[Microsoft.Extensions.DependencyInjection.ServiceDescriptor._implementationFactory]", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.DependencyInjection", "ServiceDescriptor", False, "KeyedSingleton<TService>", "(System.Object,System.Func<System.IServiceProvider,System.Object,TService>)", "", "Argument[1]", "ReturnValue.SyntheticField[Microsoft.Extensions.DependencyInjection.ServiceDescriptor._implementationFactory]", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.DependencyInjection", "ServiceDescriptor", False, "KeyedSingleton<TService>", "(System.Object,TService)", "", "Argument[1]", "ReturnValue.SyntheticField[Microsoft.Extensions.DependencyInjection.ServiceDescriptor._implementationInstance]", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.DependencyInjection", "ServiceDescriptor", False, "KeyedTransient", "(System.Type,System.Object,System.Func<System.IServiceProvider,System.Object,System.Object>)", "", "Argument[2]", "ReturnValue.SyntheticField[Microsoft.Extensions.DependencyInjection.ServiceDescriptor._implementationFactory]", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.DependencyInjection", "ServiceDescriptor", False, "KeyedTransient<TService,TImplementation>", "(System.Object,System.Func<System.IServiceProvider,System.Object,TImplementation>)", "", "Argument[1]", "ReturnValue.SyntheticField[Microsoft.Extensions.DependencyInjection.ServiceDescriptor._implementationFactory]", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.DependencyInjection", "ServiceDescriptor", False, "KeyedTransient<TService>", "(System.Object,System.Func<System.IServiceProvider,System.Object,TService>)", "", "Argument[1]", "ReturnValue.SyntheticField[Microsoft.Extensions.DependencyInjection.ServiceDescriptor._implementationFactory]", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.DependencyInjection", "ServiceDescriptor", False, "Scoped", "(System.Type,System.Func<System.IServiceProvider,System.Object>)", "", "Argument[1]", "ReturnValue.SyntheticField[Microsoft.Extensions.DependencyInjection.ServiceDescriptor._implementationFactory]", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.DependencyInjection", "ServiceDescriptor", False, "Scoped<TService,TImplementation>", "(System.Func<System.IServiceProvider,TImplementation>)", "", "Argument[0]", "ReturnValue.SyntheticField[Microsoft.Extensions.DependencyInjection.ServiceDescriptor._implementationFactory]", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.DependencyInjection", "ServiceDescriptor", False, "Scoped<TService>", "(System.Func<System.IServiceProvider,TService>)", "", "Argument[0]", "ReturnValue.SyntheticField[Microsoft.Extensions.DependencyInjection.ServiceDescriptor._implementationFactory]", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.DependencyInjection", "ServiceDescriptor", False, "ServiceDescriptor", "(System.Type,System.Func<System.IServiceProvider,System.Object>,Microsoft.Extensions.DependencyInjection.ServiceLifetime)", "", "Argument[1]", "Argument[this].SyntheticField[Microsoft.Extensions.DependencyInjection.ServiceDescriptor._implementationFactory]", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.DependencyInjection", "ServiceDescriptor", False, "ServiceDescriptor", "(System.Type,System.Object,System.Func<System.IServiceProvider,System.Object,System.Object>,Microsoft.Extensions.DependencyInjection.ServiceLifetime)", "", "Argument[2]", "Argument[this].SyntheticField[Microsoft.Extensions.DependencyInjection.ServiceDescriptor._implementationFactory]", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.DependencyInjection", "ServiceDescriptor", False, "ServiceDescriptor", "(System.Type,System.Object,System.Object)", "", "Argument[2]", "Argument[this].SyntheticField[Microsoft.Extensions.DependencyInjection.ServiceDescriptor._implementationInstance]", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.DependencyInjection", "ServiceDescriptor", False, "Singleton", "(System.Type,System.Func<System.IServiceProvider,System.Object>)", "", "Argument[1]", "ReturnValue.SyntheticField[Microsoft.Extensions.DependencyInjection.ServiceDescriptor._implementationFactory]", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.DependencyInjection", "ServiceDescriptor", False, "Singleton<TService,TImplementation>", "(System.Func<System.IServiceProvider,TImplementation>)", "", "Argument[0]", "ReturnValue.SyntheticField[Microsoft.Extensions.DependencyInjection.ServiceDescriptor._implementationFactory]", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.DependencyInjection", "ServiceDescriptor", False, "Singleton<TService>", "(System.Func<System.IServiceProvider,TService>)", "", "Argument[0]", "ReturnValue.SyntheticField[Microsoft.Extensions.DependencyInjection.ServiceDescriptor._implementationFactory]", "value", "dfc-generated"]
       - ["Microsoft.Extensions.DependencyInjection", "ServiceDescriptor", False, "ToString", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Extensions.DependencyInjection", "ServiceDescriptor", False, "get_ImplementationFactory", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Extensions.DependencyInjection", "ServiceDescriptor", False, "get_ImplementationInstance", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Extensions.DependencyInjection", "ServiceDescriptor", False, "get_KeyedImplementationFactory", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Extensions.DependencyInjection", "ServiceDescriptor", False, "get_KeyedImplementationInstance", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Extensions.DependencyInjection", "ServiceProviderServiceExtensions", False, "CreateAsyncScope", "(Microsoft.Extensions.DependencyInjection.IServiceScopeFactory)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Extensions.DependencyInjection", "ServiceProviderServiceExtensions", False, "GetRequiredService", "(System.IServiceProvider,System.Type)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Extensions.DependencyInjection", "ServiceProviderServiceExtensions", False, "GetRequiredService<T>", "(System.IServiceProvider)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Extensions.DependencyInjection", "ServiceProviderServiceExtensions", False, "GetService<T>", "(System.IServiceProvider)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Extensions.DependencyInjection", "SocketsHttpHandlerBuilderExtensions", False, "Configure", "(Microsoft.Extensions.DependencyInjection.ISocketsHttpHandlerBuilder,Microsoft.Extensions.Configuration.IConfiguration)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["Microsoft.Extensions.DependencyInjection", "ServiceDescriptor", False, "Transient", "(System.Type,System.Func<System.IServiceProvider,System.Object>)", "", "Argument[1]", "ReturnValue.SyntheticField[Microsoft.Extensions.DependencyInjection.ServiceDescriptor._implementationFactory]", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.DependencyInjection", "ServiceDescriptor", False, "Transient<TService,TImplementation>", "(System.Func<System.IServiceProvider,TImplementation>)", "", "Argument[0]", "ReturnValue.SyntheticField[Microsoft.Extensions.DependencyInjection.ServiceDescriptor._implementationFactory]", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.DependencyInjection", "ServiceDescriptor", False, "Transient<TService>", "(System.Func<System.IServiceProvider,TService>)", "", "Argument[0]", "ReturnValue.SyntheticField[Microsoft.Extensions.DependencyInjection.ServiceDescriptor._implementationFactory]", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.DependencyInjection", "ServiceDescriptor", False, "get_ImplementationFactory", "()", "", "Argument[this].SyntheticField[Microsoft.Extensions.DependencyInjection.ServiceDescriptor._implementationFactory]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.DependencyInjection", "ServiceDescriptor", False, "get_ImplementationInstance", "()", "", "Argument[this].SyntheticField[Microsoft.Extensions.DependencyInjection.ServiceDescriptor._implementationInstance]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.DependencyInjection", "ServiceDescriptor", False, "get_KeyedImplementationFactory", "()", "", "Argument[this].SyntheticField[Microsoft.Extensions.DependencyInjection.ServiceDescriptor._implementationFactory]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.DependencyInjection", "ServiceDescriptor", False, "get_KeyedImplementationInstance", "()", "", "Argument[this].SyntheticField[Microsoft.Extensions.DependencyInjection.ServiceDescriptor._implementationInstance]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.DependencyInjection", "ServiceProviderServiceExtensions", False, "GetRequiredService", "(System.IServiceProvider,System.Type)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.DependencyInjection", "ServiceProviderServiceExtensions", False, "GetRequiredService<T>", "(System.IServiceProvider)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.DependencyInjection", "ServiceProviderServiceExtensions", False, "GetService<T>", "(System.IServiceProvider)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.DependencyInjection", "SocketsHttpHandlerBuilderExtensions", False, "Configure", "(Microsoft.Extensions.DependencyInjection.ISocketsHttpHandlerBuilder,Microsoft.Extensions.Configuration.IConfiguration)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.DependencyInjection", "SocketsHttpHandlerBuilderExtensions", False, "Configure", "(Microsoft.Extensions.DependencyInjection.ISocketsHttpHandlerBuilder,System.Action<System.Net.Http.SocketsHttpHandler,System.IServiceProvider>)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
   - addsTo:
       pack: codeql/csharp-all
       extensible: neutralModel
@@ -101,6 +169,20 @@ extensions:
       - ["Microsoft.Extensions.DependencyInjection", "DefaultServiceProviderFactory", "CreateServiceProvider", "(Microsoft.Extensions.DependencyInjection.IServiceCollection)", "summary", "df-generated"]
       - ["Microsoft.Extensions.DependencyInjection", "FromKeyedServicesAttribute", "FromKeyedServicesAttribute", "(System.Object)", "summary", "df-generated"]
       - ["Microsoft.Extensions.DependencyInjection", "FromKeyedServicesAttribute", "get_Key", "()", "summary", "df-generated"]
+      - ["Microsoft.Extensions.DependencyInjection", "HttpClientFactoryServiceCollectionExtensions", "AddHttpClient", "(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.String,System.Action<System.IServiceProvider,System.Net.Http.HttpClient>)", "summary", "df-generated"]
+      - ["Microsoft.Extensions.DependencyInjection", "HttpClientFactoryServiceCollectionExtensions", "AddHttpClient", "(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.String,System.Action<System.Net.Http.HttpClient>)", "summary", "df-generated"]
+      - ["Microsoft.Extensions.DependencyInjection", "HttpClientFactoryServiceCollectionExtensions", "AddHttpClient<TClient,TImplementation>", "(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Action<System.IServiceProvider,System.Net.Http.HttpClient>)", "summary", "df-generated"]
+      - ["Microsoft.Extensions.DependencyInjection", "HttpClientFactoryServiceCollectionExtensions", "AddHttpClient<TClient,TImplementation>", "(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Action<System.Net.Http.HttpClient>)", "summary", "df-generated"]
+      - ["Microsoft.Extensions.DependencyInjection", "HttpClientFactoryServiceCollectionExtensions", "AddHttpClient<TClient,TImplementation>", "(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Func<System.Net.Http.HttpClient,System.IServiceProvider,TImplementation>)", "summary", "df-generated"]
+      - ["Microsoft.Extensions.DependencyInjection", "HttpClientFactoryServiceCollectionExtensions", "AddHttpClient<TClient,TImplementation>", "(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Func<System.Net.Http.HttpClient,TImplementation>)", "summary", "df-generated"]
+      - ["Microsoft.Extensions.DependencyInjection", "HttpClientFactoryServiceCollectionExtensions", "AddHttpClient<TClient,TImplementation>", "(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.String,System.Action<System.IServiceProvider,System.Net.Http.HttpClient>)", "summary", "df-generated"]
+      - ["Microsoft.Extensions.DependencyInjection", "HttpClientFactoryServiceCollectionExtensions", "AddHttpClient<TClient,TImplementation>", "(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.String,System.Action<System.Net.Http.HttpClient>)", "summary", "df-generated"]
+      - ["Microsoft.Extensions.DependencyInjection", "HttpClientFactoryServiceCollectionExtensions", "AddHttpClient<TClient,TImplementation>", "(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.String,System.Func<System.Net.Http.HttpClient,System.IServiceProvider,TImplementation>)", "summary", "df-generated"]
+      - ["Microsoft.Extensions.DependencyInjection", "HttpClientFactoryServiceCollectionExtensions", "AddHttpClient<TClient,TImplementation>", "(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.String,System.Func<System.Net.Http.HttpClient,TImplementation>)", "summary", "df-generated"]
+      - ["Microsoft.Extensions.DependencyInjection", "HttpClientFactoryServiceCollectionExtensions", "AddHttpClient<TClient>", "(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Action<System.IServiceProvider,System.Net.Http.HttpClient>)", "summary", "df-generated"]
+      - ["Microsoft.Extensions.DependencyInjection", "HttpClientFactoryServiceCollectionExtensions", "AddHttpClient<TClient>", "(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Action<System.Net.Http.HttpClient>)", "summary", "df-generated"]
+      - ["Microsoft.Extensions.DependencyInjection", "HttpClientFactoryServiceCollectionExtensions", "AddHttpClient<TClient>", "(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.String,System.Action<System.IServiceProvider,System.Net.Http.HttpClient>)", "summary", "df-generated"]
+      - ["Microsoft.Extensions.DependencyInjection", "HttpClientFactoryServiceCollectionExtensions", "AddHttpClient<TClient>", "(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.String,System.Action<System.Net.Http.HttpClient>)", "summary", "df-generated"]
       - ["Microsoft.Extensions.DependencyInjection", "IHttpClientBuilder", "get_Name", "()", "summary", "df-generated"]
       - ["Microsoft.Extensions.DependencyInjection", "IHttpClientBuilder", "get_Services", "()", "summary", "df-generated"]
       - ["Microsoft.Extensions.DependencyInjection", "IKeyedServiceProvider", "GetKeyedService", "(System.Type,System.Object)", "summary", "df-generated"]
@@ -160,6 +242,7 @@ extensions:
       - ["Microsoft.Extensions.DependencyInjection", "ServiceProviderKeyedServiceExtensions", "GetKeyedServices<T>", "(System.IServiceProvider,System.Object)", "summary", "df-generated"]
       - ["Microsoft.Extensions.DependencyInjection", "ServiceProviderKeyedServiceExtensions", "GetRequiredKeyedService", "(System.IServiceProvider,System.Type,System.Object)", "summary", "df-generated"]
       - ["Microsoft.Extensions.DependencyInjection", "ServiceProviderKeyedServiceExtensions", "GetRequiredKeyedService<T>", "(System.IServiceProvider,System.Object)", "summary", "df-generated"]
+      - ["Microsoft.Extensions.DependencyInjection", "ServiceProviderServiceExtensions", "CreateAsyncScope", "(Microsoft.Extensions.DependencyInjection.IServiceScopeFactory)", "summary", "df-generated"]
       - ["Microsoft.Extensions.DependencyInjection", "ServiceProviderServiceExtensions", "CreateAsyncScope", "(System.IServiceProvider)", "summary", "df-generated"]
       - ["Microsoft.Extensions.DependencyInjection", "ServiceProviderServiceExtensions", "CreateScope", "(System.IServiceProvider)", "summary", "df-generated"]
       - ["Microsoft.Extensions.DependencyInjection", "ServiceProviderServiceExtensions", "GetServices", "(System.IServiceProvider,System.Type)", "summary", "df-generated"]
diff --git a/csharp/ql/lib/ext/generated/Microsoft.Extensions.DependencyModel.Resolution.model.yml b/csharp/ql/lib/ext/generated/Microsoft.Extensions.DependencyModel.Resolution.model.yml
index f3bfe2eb2d2..b4f97b366be 100644
--- a/csharp/ql/lib/ext/generated/Microsoft.Extensions.DependencyModel.Resolution.model.yml
+++ b/csharp/ql/lib/ext/generated/Microsoft.Extensions.DependencyModel.Resolution.model.yml
@@ -4,9 +4,11 @@ extensions:
       pack: codeql/csharp-all
       extensible: summaryModel
     data:
+      - ["Microsoft.Extensions.DependencyModel.Resolution", "AppBaseCompilationAssemblyResolver", False, "TryResolveAssemblyPaths", "(Microsoft.Extensions.DependencyModel.CompilationLibrary,System.Collections.Generic.List<System.String>)", "", "Argument[0].Property[Microsoft.Extensions.DependencyModel.CompilationLibrary.Assemblies].Element", "Argument[1].Element", "taint", "dfc-generated"]
       - ["Microsoft.Extensions.DependencyModel.Resolution", "CompositeCompilationAssemblyResolver", False, "CompositeCompilationAssemblyResolver", "(Microsoft.Extensions.DependencyModel.Resolution.ICompilationAssemblyResolver[])", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
       - ["Microsoft.Extensions.DependencyModel.Resolution", "ICompilationAssemblyResolver", True, "TryResolveAssemblyPaths", "(Microsoft.Extensions.DependencyModel.CompilationLibrary,System.Collections.Generic.List<System.String>)", "", "Argument[0]", "Argument[1].Element", "taint", "df-generated"]
       - ["Microsoft.Extensions.DependencyModel.Resolution", "ICompilationAssemblyResolver", True, "TryResolveAssemblyPaths", "(Microsoft.Extensions.DependencyModel.CompilationLibrary,System.Collections.Generic.List<System.String>)", "", "Argument[this]", "Argument[1].Element", "taint", "df-generated"]
+      - ["Microsoft.Extensions.DependencyModel.Resolution", "ReferenceAssemblyPathResolver", False, "TryResolveAssemblyPaths", "(Microsoft.Extensions.DependencyModel.CompilationLibrary,System.Collections.Generic.List<System.String>)", "", "Argument[0].Property[Microsoft.Extensions.DependencyModel.CompilationLibrary.Assemblies].Element", "Argument[1].Element", "taint", "dfc-generated"]
   - addsTo:
       pack: codeql/csharp-all
       extensible: sourceModel
diff --git a/csharp/ql/lib/ext/generated/Microsoft.Extensions.DependencyModel.model.yml b/csharp/ql/lib/ext/generated/Microsoft.Extensions.DependencyModel.model.yml
index 79f2f7112a0..3b1f1aa1e0a 100644
--- a/csharp/ql/lib/ext/generated/Microsoft.Extensions.DependencyModel.model.yml
+++ b/csharp/ql/lib/ext/generated/Microsoft.Extensions.DependencyModel.model.yml
@@ -7,18 +7,14 @@ extensions:
       - ["Microsoft.Extensions.DependencyModel", "CompilationLibrary", False, "ResolveReferencePaths", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["Microsoft.Extensions.DependencyModel", "CompilationLibrary", False, "ResolveReferencePaths", "(Microsoft.Extensions.DependencyModel.Resolution.ICompilationAssemblyResolver[])", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
       - ["Microsoft.Extensions.DependencyModel", "CompilationLibrary", False, "ResolveReferencePaths", "(Microsoft.Extensions.DependencyModel.Resolution.ICompilationAssemblyResolver[])", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Extensions.DependencyModel", "DependencyContextExtensions", False, "GetDefaultAssemblyNames", "(Microsoft.Extensions.DependencyModel.RuntimeLibrary,Microsoft.Extensions.DependencyModel.DependencyContext)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["Microsoft.Extensions.DependencyModel", "DependencyContextExtensions", False, "GetDefaultNativeAssets", "(Microsoft.Extensions.DependencyModel.RuntimeLibrary,Microsoft.Extensions.DependencyModel.DependencyContext)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["Microsoft.Extensions.DependencyModel", "DependencyContextExtensions", False, "GetDefaultNativeRuntimeFileAssets", "(Microsoft.Extensions.DependencyModel.RuntimeLibrary,Microsoft.Extensions.DependencyModel.DependencyContext)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Extensions.DependencyModel", "DependencyContextExtensions", False, "GetRuntimeAssemblyNames", "(Microsoft.Extensions.DependencyModel.RuntimeLibrary,Microsoft.Extensions.DependencyModel.DependencyContext,System.String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["Microsoft.Extensions.DependencyModel", "DependencyContextExtensions", False, "GetRuntimeNativeAssets", "(Microsoft.Extensions.DependencyModel.RuntimeLibrary,Microsoft.Extensions.DependencyModel.DependencyContext,System.String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["Microsoft.Extensions.DependencyModel", "DependencyContextExtensions", False, "GetRuntimeNativeRuntimeFileAssets", "(Microsoft.Extensions.DependencyModel.RuntimeLibrary,Microsoft.Extensions.DependencyModel.DependencyContext,System.String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Extensions.DependencyModel", "RuntimeAssembly", False, "Create", "(System.String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["Microsoft.Extensions.DependencyModel", "RuntimeAssembly", False, "RuntimeAssembly", "(System.String,System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["Microsoft.Extensions.DependencyModel", "RuntimeAssetGroup", False, "RuntimeAssetGroup", "(System.String,System.Collections.Generic.IEnumerable<Microsoft.Extensions.DependencyModel.RuntimeFile>)", "", "Argument[1].Element", "Argument[this]", "taint", "df-generated"]
-      - ["Microsoft.Extensions.DependencyModel", "RuntimeAssetGroup", False, "RuntimeAssetGroup", "(System.String,System.Collections.Generic.IEnumerable<System.String>)", "", "Argument[1].Element", "Argument[this]", "taint", "df-generated"]
+      - ["Microsoft.Extensions.DependencyModel", "RuntimeAssetGroup", False, "RuntimeAssetGroup", "(System.String,System.Collections.Generic.IEnumerable<Microsoft.Extensions.DependencyModel.RuntimeFile>)", "", "Argument[1].Element", "Argument[this].SyntheticField[Microsoft.Extensions.DependencyModel.RuntimeAssetGroup._runtimeFiles].Element", "value", "dfc-generated"]
       - ["Microsoft.Extensions.DependencyModel", "RuntimeAssetGroup", False, "get_AssetPaths", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Extensions.DependencyModel", "RuntimeAssetGroup", False, "get_RuntimeFiles", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["Microsoft.Extensions.DependencyModel", "RuntimeAssetGroup", False, "get_RuntimeFiles", "()", "", "Argument[this].SyntheticField[Microsoft.Extensions.DependencyModel.RuntimeAssetGroup._runtimeFiles]", "ReturnValue", "value", "dfc-generated"]
   - addsTo:
       pack: codeql/csharp-all
       extensible: neutralModel
@@ -56,9 +52,11 @@ extensions:
       - ["Microsoft.Extensions.DependencyModel", "DependencyContext", "get_RuntimeLibraries", "()", "summary", "df-generated"]
       - ["Microsoft.Extensions.DependencyModel", "DependencyContext", "get_Target", "()", "summary", "df-generated"]
       - ["Microsoft.Extensions.DependencyModel", "DependencyContextExtensions", "GetDefaultAssemblyNames", "(Microsoft.Extensions.DependencyModel.DependencyContext)", "summary", "df-generated"]
+      - ["Microsoft.Extensions.DependencyModel", "DependencyContextExtensions", "GetDefaultAssemblyNames", "(Microsoft.Extensions.DependencyModel.RuntimeLibrary,Microsoft.Extensions.DependencyModel.DependencyContext)", "summary", "df-generated"]
       - ["Microsoft.Extensions.DependencyModel", "DependencyContextExtensions", "GetDefaultNativeAssets", "(Microsoft.Extensions.DependencyModel.DependencyContext)", "summary", "df-generated"]
       - ["Microsoft.Extensions.DependencyModel", "DependencyContextExtensions", "GetDefaultNativeRuntimeFileAssets", "(Microsoft.Extensions.DependencyModel.DependencyContext)", "summary", "df-generated"]
       - ["Microsoft.Extensions.DependencyModel", "DependencyContextExtensions", "GetRuntimeAssemblyNames", "(Microsoft.Extensions.DependencyModel.DependencyContext,System.String)", "summary", "df-generated"]
+      - ["Microsoft.Extensions.DependencyModel", "DependencyContextExtensions", "GetRuntimeAssemblyNames", "(Microsoft.Extensions.DependencyModel.RuntimeLibrary,Microsoft.Extensions.DependencyModel.DependencyContext,System.String)", "summary", "df-generated"]
       - ["Microsoft.Extensions.DependencyModel", "DependencyContextExtensions", "GetRuntimeNativeAssets", "(Microsoft.Extensions.DependencyModel.DependencyContext,System.String)", "summary", "df-generated"]
       - ["Microsoft.Extensions.DependencyModel", "DependencyContextExtensions", "GetRuntimeNativeRuntimeFileAssets", "(Microsoft.Extensions.DependencyModel.DependencyContext,System.String)", "summary", "df-generated"]
       - ["Microsoft.Extensions.DependencyModel", "DependencyContextJsonReader", "Dispose", "()", "summary", "df-generated"]
@@ -81,8 +79,10 @@ extensions:
       - ["Microsoft.Extensions.DependencyModel", "Library", "get_Type", "()", "summary", "df-generated"]
       - ["Microsoft.Extensions.DependencyModel", "Library", "get_Version", "()", "summary", "df-generated"]
       - ["Microsoft.Extensions.DependencyModel", "ResourceAssembly", "ResourceAssembly", "(System.String,System.String)", "summary", "df-generated"]
+      - ["Microsoft.Extensions.DependencyModel", "RuntimeAssembly", "Create", "(System.String)", "summary", "df-generated"]
       - ["Microsoft.Extensions.DependencyModel", "RuntimeAssembly", "get_Name", "()", "summary", "df-generated"]
       - ["Microsoft.Extensions.DependencyModel", "RuntimeAssembly", "get_Path", "()", "summary", "df-generated"]
+      - ["Microsoft.Extensions.DependencyModel", "RuntimeAssetGroup", "RuntimeAssetGroup", "(System.String,System.Collections.Generic.IEnumerable<System.String>)", "summary", "df-generated"]
       - ["Microsoft.Extensions.DependencyModel", "RuntimeAssetGroup", "RuntimeAssetGroup", "(System.String,System.String[])", "summary", "df-generated"]
       - ["Microsoft.Extensions.DependencyModel", "RuntimeAssetGroup", "get_Runtime", "()", "summary", "df-generated"]
       - ["Microsoft.Extensions.DependencyModel", "RuntimeFallbacks", "RuntimeFallbacks", "(System.String,System.Collections.Generic.IEnumerable<System.String>)", "summary", "df-generated"]
diff --git a/csharp/ql/lib/ext/generated/Microsoft.Extensions.Diagnostics.Metrics.model.yml b/csharp/ql/lib/ext/generated/Microsoft.Extensions.Diagnostics.Metrics.model.yml
index f168533433e..00fd3977b49 100644
--- a/csharp/ql/lib/ext/generated/Microsoft.Extensions.Diagnostics.Metrics.model.yml
+++ b/csharp/ql/lib/ext/generated/Microsoft.Extensions.Diagnostics.Metrics.model.yml
@@ -5,20 +5,19 @@ extensions:
       extensible: summaryModel
     data:
       - ["Microsoft.Extensions.Diagnostics.Metrics", "IMetricsListener", True, "Initialize", "(Microsoft.Extensions.Diagnostics.Metrics.IObservableInstrumentsSource)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["Microsoft.Extensions.Diagnostics.Metrics", "IMetricsListener", True, "InstrumentPublished", "(System.Diagnostics.Metrics.Instrument,System.Object)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Extensions.Diagnostics.Metrics", "MetricsBuilderConfigurationExtensions", False, "AddConfiguration", "(Microsoft.Extensions.Diagnostics.Metrics.IMetricsBuilder,Microsoft.Extensions.Configuration.IConfiguration)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Extensions.Diagnostics.Metrics", "MetricsBuilderConsoleExtensions", False, "AddDebugConsole", "(Microsoft.Extensions.Diagnostics.Metrics.IMetricsBuilder)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Extensions.Diagnostics.Metrics", "MetricsBuilderExtensions", False, "AddListener", "(Microsoft.Extensions.Diagnostics.Metrics.IMetricsBuilder,Microsoft.Extensions.Diagnostics.Metrics.IMetricsListener)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Extensions.Diagnostics.Metrics", "MetricsBuilderExtensions", False, "AddListener<T>", "(Microsoft.Extensions.Diagnostics.Metrics.IMetricsBuilder)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Extensions.Diagnostics.Metrics", "MetricsBuilderExtensions", False, "ClearListeners", "(Microsoft.Extensions.Diagnostics.Metrics.IMetricsBuilder)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Extensions.Diagnostics.Metrics", "MetricsBuilderExtensions", False, "DisableMetrics", "(Microsoft.Extensions.Diagnostics.Metrics.IMetricsBuilder,System.String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Extensions.Diagnostics.Metrics", "MetricsBuilderExtensions", False, "DisableMetrics", "(Microsoft.Extensions.Diagnostics.Metrics.IMetricsBuilder,System.String,System.String,System.String,Microsoft.Extensions.Diagnostics.Metrics.MeterScope)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Extensions.Diagnostics.Metrics", "MetricsBuilderExtensions", False, "DisableMetrics", "(Microsoft.Extensions.Diagnostics.Metrics.MetricsOptions,System.String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Extensions.Diagnostics.Metrics", "MetricsBuilderExtensions", False, "DisableMetrics", "(Microsoft.Extensions.Diagnostics.Metrics.MetricsOptions,System.String,System.String,System.String,Microsoft.Extensions.Diagnostics.Metrics.MeterScope)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Extensions.Diagnostics.Metrics", "MetricsBuilderExtensions", False, "EnableMetrics", "(Microsoft.Extensions.Diagnostics.Metrics.IMetricsBuilder,System.String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Extensions.Diagnostics.Metrics", "MetricsBuilderExtensions", False, "EnableMetrics", "(Microsoft.Extensions.Diagnostics.Metrics.IMetricsBuilder,System.String,System.String,System.String,Microsoft.Extensions.Diagnostics.Metrics.MeterScope)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Extensions.Diagnostics.Metrics", "MetricsBuilderExtensions", False, "EnableMetrics", "(Microsoft.Extensions.Diagnostics.Metrics.MetricsOptions,System.String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Extensions.Diagnostics.Metrics", "MetricsBuilderExtensions", False, "EnableMetrics", "(Microsoft.Extensions.Diagnostics.Metrics.MetricsOptions,System.String,System.String,System.String,Microsoft.Extensions.Diagnostics.Metrics.MeterScope)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["Microsoft.Extensions.Diagnostics.Metrics", "IMetricsListener", True, "InstrumentPublished", "(System.Diagnostics.Metrics.Instrument,System.Object)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.Diagnostics.Metrics", "MetricsBuilderConfigurationExtensions", False, "AddConfiguration", "(Microsoft.Extensions.Diagnostics.Metrics.IMetricsBuilder,Microsoft.Extensions.Configuration.IConfiguration)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.Diagnostics.Metrics", "MetricsBuilderExtensions", False, "AddListener", "(Microsoft.Extensions.Diagnostics.Metrics.IMetricsBuilder,Microsoft.Extensions.Diagnostics.Metrics.IMetricsListener)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.Diagnostics.Metrics", "MetricsBuilderExtensions", False, "AddListener<T>", "(Microsoft.Extensions.Diagnostics.Metrics.IMetricsBuilder)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.Diagnostics.Metrics", "MetricsBuilderExtensions", False, "ClearListeners", "(Microsoft.Extensions.Diagnostics.Metrics.IMetricsBuilder)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.Diagnostics.Metrics", "MetricsBuilderExtensions", False, "DisableMetrics", "(Microsoft.Extensions.Diagnostics.Metrics.IMetricsBuilder,System.String)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.Diagnostics.Metrics", "MetricsBuilderExtensions", False, "DisableMetrics", "(Microsoft.Extensions.Diagnostics.Metrics.IMetricsBuilder,System.String,System.String,System.String,Microsoft.Extensions.Diagnostics.Metrics.MeterScope)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.Diagnostics.Metrics", "MetricsBuilderExtensions", False, "DisableMetrics", "(Microsoft.Extensions.Diagnostics.Metrics.MetricsOptions,System.String)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.Diagnostics.Metrics", "MetricsBuilderExtensions", False, "DisableMetrics", "(Microsoft.Extensions.Diagnostics.Metrics.MetricsOptions,System.String,System.String,System.String,Microsoft.Extensions.Diagnostics.Metrics.MeterScope)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.Diagnostics.Metrics", "MetricsBuilderExtensions", False, "EnableMetrics", "(Microsoft.Extensions.Diagnostics.Metrics.IMetricsBuilder,System.String)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.Diagnostics.Metrics", "MetricsBuilderExtensions", False, "EnableMetrics", "(Microsoft.Extensions.Diagnostics.Metrics.IMetricsBuilder,System.String,System.String,System.String,Microsoft.Extensions.Diagnostics.Metrics.MeterScope)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.Diagnostics.Metrics", "MetricsBuilderExtensions", False, "EnableMetrics", "(Microsoft.Extensions.Diagnostics.Metrics.MetricsOptions,System.String)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.Diagnostics.Metrics", "MetricsBuilderExtensions", False, "EnableMetrics", "(Microsoft.Extensions.Diagnostics.Metrics.MetricsOptions,System.String,System.String,System.String,Microsoft.Extensions.Diagnostics.Metrics.MeterScope)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
   - addsTo:
       pack: codeql/csharp-all
       extensible: neutralModel
@@ -35,4 +34,5 @@ extensions:
       - ["Microsoft.Extensions.Diagnostics.Metrics", "InstrumentRule", "get_ListenerName", "()", "summary", "df-generated"]
       - ["Microsoft.Extensions.Diagnostics.Metrics", "InstrumentRule", "get_MeterName", "()", "summary", "df-generated"]
       - ["Microsoft.Extensions.Diagnostics.Metrics", "InstrumentRule", "get_Scopes", "()", "summary", "df-generated"]
+      - ["Microsoft.Extensions.Diagnostics.Metrics", "MetricsBuilderConsoleExtensions", "AddDebugConsole", "(Microsoft.Extensions.Diagnostics.Metrics.IMetricsBuilder)", "summary", "df-generated"]
       - ["Microsoft.Extensions.Diagnostics.Metrics", "MetricsOptions", "get_Rules", "()", "summary", "df-generated"]
diff --git a/csharp/ql/lib/ext/generated/Microsoft.Extensions.FileProviders.Physical.model.yml b/csharp/ql/lib/ext/generated/Microsoft.Extensions.FileProviders.Physical.model.yml
index 357d284aa3f..778e72b617f 100644
--- a/csharp/ql/lib/ext/generated/Microsoft.Extensions.FileProviders.Physical.model.yml
+++ b/csharp/ql/lib/ext/generated/Microsoft.Extensions.FileProviders.Physical.model.yml
@@ -4,8 +4,15 @@ extensions:
       pack: codeql/csharp-all
       extensible: summaryModel
     data:
-      - ["Microsoft.Extensions.FileProviders.Physical", "PhysicalDirectoryInfo", False, "PhysicalDirectoryInfo", "(System.IO.DirectoryInfo)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["Microsoft.Extensions.FileProviders.Physical", "PhysicalFileInfo", False, "PhysicalFileInfo", "(System.IO.FileInfo)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["Microsoft.Extensions.FileProviders.Physical", "PhysicalDirectoryInfo", False, "PhysicalDirectoryInfo", "(System.IO.DirectoryInfo)", "", "Argument[0]", "Argument[this].SyntheticField[Microsoft.Extensions.FileProviders.Physical.PhysicalDirectoryInfo._info]", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.FileProviders.Physical", "PhysicalDirectoryInfo", False, "get_Name", "()", "", "Argument[this].SyntheticField[Microsoft.Extensions.FileProviders.Physical.PhysicalDirectoryInfo._info].Property[System.IO.DirectoryInfo.Name]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.FileProviders.Physical", "PhysicalDirectoryInfo", False, "get_PhysicalPath", "()", "", "Argument[this].SyntheticField[Microsoft.Extensions.FileProviders.Physical.PhysicalDirectoryInfo._info].Field[System.IO.FileSystemInfo.FullPath]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.FileProviders.Physical", "PhysicalDirectoryInfo", False, "get_PhysicalPath", "()", "", "Argument[this].SyntheticField[Microsoft.Extensions.FileProviders.Physical.PhysicalDirectoryInfo._info].Property[System.IO.FileSystemInfo.FullName]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.FileProviders.Physical", "PhysicalFileInfo", False, "CreateReadStream", "()", "", "Argument[this].Property[Microsoft.Extensions.FileProviders.Physical.PhysicalFileInfo.PhysicalPath]", "ReturnValue", "taint", "dfc-generated"]
+      - ["Microsoft.Extensions.FileProviders.Physical", "PhysicalFileInfo", False, "CreateReadStream", "()", "", "Argument[this].SyntheticField[Microsoft.Extensions.FileProviders.Physical.PhysicalFileInfo._info].Property[System.IO.FileSystemInfo.FullName]", "ReturnValue", "taint", "dfc-generated"]
+      - ["Microsoft.Extensions.FileProviders.Physical", "PhysicalFileInfo", False, "PhysicalFileInfo", "(System.IO.FileInfo)", "", "Argument[0]", "Argument[this].SyntheticField[Microsoft.Extensions.FileProviders.Physical.PhysicalFileInfo._info]", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.FileProviders.Physical", "PhysicalFileInfo", False, "get_Name", "()", "", "Argument[this].SyntheticField[Microsoft.Extensions.FileProviders.Physical.PhysicalFileInfo._info].Property[System.IO.FileInfo.Name]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.FileProviders.Physical", "PhysicalFileInfo", False, "get_PhysicalPath", "()", "", "Argument[this].SyntheticField[Microsoft.Extensions.FileProviders.Physical.PhysicalFileInfo._info].Property[System.IO.FileSystemInfo.FullName]", "ReturnValue", "value", "dfc-generated"]
       - ["Microsoft.Extensions.FileProviders.Physical", "PhysicalFilesWatcher", False, "PhysicalFilesWatcher", "(System.String,System.IO.FileSystemWatcher,System.Boolean,Microsoft.Extensions.FileProviders.Physical.ExclusionFilters)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["Microsoft.Extensions.FileProviders.Physical", "PhysicalFilesWatcher", False, "PhysicalFilesWatcher", "(System.String,System.IO.FileSystemWatcher,System.Boolean,Microsoft.Extensions.FileProviders.Physical.ExclusionFilters)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
       - ["Microsoft.Extensions.FileProviders.Physical", "PollingFileChangeToken", False, "PollingFileChangeToken", "(System.IO.FileInfo)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
@@ -13,6 +20,7 @@ extensions:
       pack: codeql/csharp-all
       extensible: neutralModel
     data:
+      - ["Microsoft.Extensions.FileProviders.Physical", "PhysicalDirectoryInfo", "CreateReadStream", "()", "summary", "df-generated"]
       - ["Microsoft.Extensions.FileProviders.Physical", "PhysicalDirectoryInfo", "get_Exists", "()", "summary", "df-generated"]
       - ["Microsoft.Extensions.FileProviders.Physical", "PhysicalDirectoryInfo", "get_IsDirectory", "()", "summary", "df-generated"]
       - ["Microsoft.Extensions.FileProviders.Physical", "PhysicalDirectoryInfo", "get_LastModified", "()", "summary", "df-generated"]
diff --git a/csharp/ql/lib/ext/generated/Microsoft.Extensions.FileProviders.model.yml b/csharp/ql/lib/ext/generated/Microsoft.Extensions.FileProviders.model.yml
index 943b4f8eb4e..e9a6ddcb600 100644
--- a/csharp/ql/lib/ext/generated/Microsoft.Extensions.FileProviders.model.yml
+++ b/csharp/ql/lib/ext/generated/Microsoft.Extensions.FileProviders.model.yml
@@ -4,41 +4,46 @@ extensions:
       pack: codeql/csharp-all
       extensible: summaryModel
     data:
-      - ["Microsoft.Extensions.FileProviders", "CompositeFileProvider", False, "CompositeFileProvider", "(Microsoft.Extensions.FileProviders.IFileProvider[])", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["Microsoft.Extensions.FileProviders", "CompositeFileProvider", False, "CompositeFileProvider", "(System.Collections.Generic.IEnumerable<Microsoft.Extensions.FileProviders.IFileProvider>)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["Microsoft.Extensions.FileProviders", "CompositeFileProvider", False, "get_FileProviders", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Extensions.FileProviders", "IFileInfo", True, "CreateReadStream", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Extensions.FileProviders", "IFileInfo", True, "get_Name", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Extensions.FileProviders", "IFileInfo", True, "get_PhysicalPath", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Extensions.FileProviders", "IFileProvider", True, "GetDirectoryContents", "(System.String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Extensions.FileProviders", "IFileProvider", True, "GetDirectoryContents", "(System.String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["Microsoft.Extensions.FileProviders", "CompositeFileProvider", False, "CompositeFileProvider", "(Microsoft.Extensions.FileProviders.IFileProvider[])", "", "Argument[0]", "Argument[this].SyntheticField[Microsoft.Extensions.FileProviders.CompositeFileProvider._fileProviders]", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.FileProviders", "CompositeFileProvider", False, "CompositeFileProvider", "(System.Collections.Generic.IEnumerable<Microsoft.Extensions.FileProviders.IFileProvider>)", "", "Argument[0].Element", "Argument[this].SyntheticField[Microsoft.Extensions.FileProviders.CompositeFileProvider._fileProviders].Element", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.FileProviders", "CompositeFileProvider", False, "get_FileProviders", "()", "", "Argument[this].SyntheticField[Microsoft.Extensions.FileProviders.CompositeFileProvider._fileProviders]", "ReturnValue", "value", "dfc-generated"]
   - addsTo:
       pack: codeql/csharp-all
       extensible: neutralModel
     data:
+      - ["Microsoft.Extensions.FileProviders", "CompositeFileProvider", "GetDirectoryContents", "(System.String)", "summary", "df-generated"]
       - ["Microsoft.Extensions.FileProviders", "CompositeFileProvider", "GetFileInfo", "(System.String)", "summary", "df-generated"]
       - ["Microsoft.Extensions.FileProviders", "CompositeFileProvider", "Watch", "(System.String)", "summary", "df-generated"]
       - ["Microsoft.Extensions.FileProviders", "IDirectoryContents", "get_Exists", "()", "summary", "df-generated"]
+      - ["Microsoft.Extensions.FileProviders", "IFileInfo", "CreateReadStream", "()", "summary", "df-generated"]
       - ["Microsoft.Extensions.FileProviders", "IFileInfo", "get_Exists", "()", "summary", "df-generated"]
       - ["Microsoft.Extensions.FileProviders", "IFileInfo", "get_IsDirectory", "()", "summary", "df-generated"]
       - ["Microsoft.Extensions.FileProviders", "IFileInfo", "get_LastModified", "()", "summary", "df-generated"]
       - ["Microsoft.Extensions.FileProviders", "IFileInfo", "get_Length", "()", "summary", "df-generated"]
+      - ["Microsoft.Extensions.FileProviders", "IFileInfo", "get_Name", "()", "summary", "df-generated"]
+      - ["Microsoft.Extensions.FileProviders", "IFileInfo", "get_PhysicalPath", "()", "summary", "df-generated"]
+      - ["Microsoft.Extensions.FileProviders", "IFileProvider", "GetDirectoryContents", "(System.String)", "summary", "df-generated"]
       - ["Microsoft.Extensions.FileProviders", "IFileProvider", "GetFileInfo", "(System.String)", "summary", "df-generated"]
       - ["Microsoft.Extensions.FileProviders", "IFileProvider", "Watch", "(System.String)", "summary", "df-generated"]
       - ["Microsoft.Extensions.FileProviders", "NotFoundDirectoryContents", "get_Exists", "()", "summary", "df-generated"]
       - ["Microsoft.Extensions.FileProviders", "NotFoundDirectoryContents", "get_Singleton", "()", "summary", "df-generated"]
+      - ["Microsoft.Extensions.FileProviders", "NotFoundFileInfo", "CreateReadStream", "()", "summary", "df-generated"]
       - ["Microsoft.Extensions.FileProviders", "NotFoundFileInfo", "NotFoundFileInfo", "(System.String)", "summary", "df-generated"]
       - ["Microsoft.Extensions.FileProviders", "NotFoundFileInfo", "get_Exists", "()", "summary", "df-generated"]
       - ["Microsoft.Extensions.FileProviders", "NotFoundFileInfo", "get_IsDirectory", "()", "summary", "df-generated"]
       - ["Microsoft.Extensions.FileProviders", "NotFoundFileInfo", "get_LastModified", "()", "summary", "df-generated"]
       - ["Microsoft.Extensions.FileProviders", "NotFoundFileInfo", "get_Length", "()", "summary", "df-generated"]
+      - ["Microsoft.Extensions.FileProviders", "NotFoundFileInfo", "get_Name", "()", "summary", "df-generated"]
+      - ["Microsoft.Extensions.FileProviders", "NotFoundFileInfo", "get_PhysicalPath", "()", "summary", "df-generated"]
       - ["Microsoft.Extensions.FileProviders", "NullChangeToken", "get_ActiveChangeCallbacks", "()", "summary", "df-generated"]
       - ["Microsoft.Extensions.FileProviders", "NullChangeToken", "get_HasChanged", "()", "summary", "df-generated"]
       - ["Microsoft.Extensions.FileProviders", "NullChangeToken", "get_Singleton", "()", "summary", "df-generated"]
+      - ["Microsoft.Extensions.FileProviders", "NullFileProvider", "GetDirectoryContents", "(System.String)", "summary", "df-generated"]
       - ["Microsoft.Extensions.FileProviders", "NullFileProvider", "GetFileInfo", "(System.String)", "summary", "df-generated"]
       - ["Microsoft.Extensions.FileProviders", "NullFileProvider", "Watch", "(System.String)", "summary", "df-generated"]
       - ["Microsoft.Extensions.FileProviders", "PhysicalFileProvider", "Dispose", "()", "summary", "df-generated"]
       - ["Microsoft.Extensions.FileProviders", "PhysicalFileProvider", "Dispose", "(System.Boolean)", "summary", "df-generated"]
+      - ["Microsoft.Extensions.FileProviders", "PhysicalFileProvider", "GetDirectoryContents", "(System.String)", "summary", "df-generated"]
       - ["Microsoft.Extensions.FileProviders", "PhysicalFileProvider", "GetFileInfo", "(System.String)", "summary", "df-generated"]
       - ["Microsoft.Extensions.FileProviders", "PhysicalFileProvider", "PhysicalFileProvider", "(System.String)", "summary", "df-generated"]
       - ["Microsoft.Extensions.FileProviders", "PhysicalFileProvider", "PhysicalFileProvider", "(System.String,Microsoft.Extensions.FileProviders.Physical.ExclusionFilters)", "summary", "df-generated"]
diff --git a/csharp/ql/lib/ext/generated/Microsoft.Extensions.FileSystemGlobbing.Abstractions.model.yml b/csharp/ql/lib/ext/generated/Microsoft.Extensions.FileSystemGlobbing.Abstractions.model.yml
index 22625f46473..cd8826bccf0 100644
--- a/csharp/ql/lib/ext/generated/Microsoft.Extensions.FileSystemGlobbing.Abstractions.model.yml
+++ b/csharp/ql/lib/ext/generated/Microsoft.Extensions.FileSystemGlobbing.Abstractions.model.yml
@@ -5,10 +5,10 @@ extensions:
       extensible: summaryModel
     data:
       - ["Microsoft.Extensions.FileSystemGlobbing.Abstractions", "DirectoryInfoBase", True, "EnumerateFileSystemInfos", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Extensions.FileSystemGlobbing.Abstractions", "DirectoryInfoBase", True, "GetDirectory", "(System.String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["Microsoft.Extensions.FileSystemGlobbing.Abstractions", "DirectoryInfoBase", True, "GetDirectory", "(System.String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Extensions.FileSystemGlobbing.Abstractions", "DirectoryInfoBase", True, "GetFile", "(System.String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Extensions.FileSystemGlobbing.Abstractions", "FileInfoWrapper", False, "FileInfoWrapper", "(System.IO.FileInfo)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["Microsoft.Extensions.FileSystemGlobbing.Abstractions", "FileInfoWrapper", False, "FileInfoWrapper", "(System.IO.FileInfo)", "", "Argument[0]", "Argument[this].SyntheticField[Microsoft.Extensions.FileSystemGlobbing.Abstractions.FileInfoWrapper._fileInfo]", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.FileSystemGlobbing.Abstractions", "FileInfoWrapper", True, "get_FullName", "()", "", "Argument[this].SyntheticField[Microsoft.Extensions.FileSystemGlobbing.Abstractions.FileInfoWrapper._fileInfo].Property[System.IO.FileSystemInfo.FullName]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.FileSystemGlobbing.Abstractions", "FileInfoWrapper", True, "get_Name", "()", "", "Argument[this].SyntheticField[Microsoft.Extensions.FileSystemGlobbing.Abstractions.FileInfoWrapper._fileInfo].Property[System.IO.FileInfo.Name]", "ReturnValue", "value", "dfc-generated"]
       - ["Microsoft.Extensions.FileSystemGlobbing.Abstractions", "FileSystemInfoBase", True, "get_FullName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["Microsoft.Extensions.FileSystemGlobbing.Abstractions", "FileSystemInfoBase", True, "get_Name", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["Microsoft.Extensions.FileSystemGlobbing.Abstractions", "FileSystemInfoBase", True, "get_ParentDirectory", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
@@ -16,4 +16,6 @@ extensions:
       pack: codeql/csharp-all
       extensible: neutralModel
     data:
+      - ["Microsoft.Extensions.FileSystemGlobbing.Abstractions", "DirectoryInfoBase", "GetFile", "(System.String)", "summary", "df-generated"]
       - ["Microsoft.Extensions.FileSystemGlobbing.Abstractions", "DirectoryInfoWrapper", "DirectoryInfoWrapper", "(System.IO.DirectoryInfo)", "summary", "df-generated"]
+      - ["Microsoft.Extensions.FileSystemGlobbing.Abstractions", "DirectoryInfoWrapper", "GetFile", "(System.String)", "summary", "df-generated"]
diff --git a/csharp/ql/lib/ext/generated/Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts.model.yml b/csharp/ql/lib/ext/generated/Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts.model.yml
index 66616543576..7c016072636 100644
--- a/csharp/ql/lib/ext/generated/Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts.model.yml
+++ b/csharp/ql/lib/ext/generated/Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts.model.yml
@@ -4,17 +4,20 @@ extensions:
       pack: codeql/csharp-all
       extensible: summaryModel
     data:
-      - ["Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts", "PatternContext<TFrame>", False, "PushDataFrame", "(TFrame)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts", "PatternContext<TFrame>", False, "PushDataFrame", "(TFrame)", "", "Argument[0]", "Argument[this].Field[Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts.PatternContext`1.Frame]", "value", "dfc-generated"]
       - ["Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts", "PatternContextLinear+FrameData", False, "get_Stem", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts", "PatternContextLinear", False, "CalculateStem", "(Microsoft.Extensions.FileSystemGlobbing.Abstractions.FileInfoBase)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts", "PatternContextLinear", False, "CalculateStem", "(Microsoft.Extensions.FileSystemGlobbing.Abstractions.FileInfoBase)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts", "PatternContextLinear", False, "CalculateStem", "(Microsoft.Extensions.FileSystemGlobbing.Abstractions.FileInfoBase)", "", "Argument[0].Property[Microsoft.Extensions.FileSystemGlobbing.Abstractions.FileSystemInfoBase.Name]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts", "PatternContextLinear", False, "CalculateStem", "(Microsoft.Extensions.FileSystemGlobbing.Abstractions.FileInfoBase)", "", "Argument[this].Field[Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts.PatternContext`1.Frame].Property[Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts.PatternContextLinear+FrameData.Stem]", "ReturnValue", "taint", "dfc-generated"]
       - ["Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts", "PatternContextRagged+FrameData", False, "get_Stem", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts", "PatternContextRagged", False, "CalculateStem", "(Microsoft.Extensions.FileSystemGlobbing.Abstractions.FileInfoBase)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts", "PatternContextRagged", False, "CalculateStem", "(Microsoft.Extensions.FileSystemGlobbing.Abstractions.FileInfoBase)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts", "PatternContextRagged", False, "CalculateStem", "(Microsoft.Extensions.FileSystemGlobbing.Abstractions.FileInfoBase)", "", "Argument[0].Property[Microsoft.Extensions.FileSystemGlobbing.Abstractions.FileSystemInfoBase.Name]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts", "PatternContextRagged", False, "CalculateStem", "(Microsoft.Extensions.FileSystemGlobbing.Abstractions.FileInfoBase)", "", "Argument[this].Field[Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts.PatternContext`1.Frame].Property[Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts.PatternContextRagged+FrameData.Stem]", "ReturnValue", "taint", "dfc-generated"]
+      - ["Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts", "PatternContextRagged", False, "PushDirectory", "(Microsoft.Extensions.FileSystemGlobbing.Abstractions.DirectoryInfoBase)", "", "Argument[this].Property[Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts.PatternContextRagged.Pattern].Property[Microsoft.Extensions.FileSystemGlobbing.Internal.IRaggedPattern.EndsWith]", "Argument[this].Field[Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts.PatternContext`1.Frame].Field[Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts.PatternContextRagged+FrameData.SegmentGroup]", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts", "PatternContextRagged", False, "PushDirectory", "(Microsoft.Extensions.FileSystemGlobbing.Abstractions.DirectoryInfoBase)", "", "Argument[this].Property[Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts.PatternContextRagged.Pattern].Property[Microsoft.Extensions.FileSystemGlobbing.Internal.IRaggedPattern.StartsWith]", "Argument[this].Field[Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts.PatternContext`1.Frame].Field[Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts.PatternContextRagged+FrameData.SegmentGroup]", "value", "dfc-generated"]
   - addsTo:
       pack: codeql/csharp-all
       extensible: neutralModel
     data:
+      - ["Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts", "PatternContext<TFrame>", "Declare", "(System.Action<Microsoft.Extensions.FileSystemGlobbing.Internal.IPathSegment,System.Boolean>)", "summary", "df-generated"]
       - ["Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts", "PatternContext<TFrame>", "IsStackEmpty", "()", "summary", "df-generated"]
       - ["Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts", "PatternContext<TFrame>", "PopDirectory", "()", "summary", "df-generated"]
       - ["Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts", "PatternContext<TFrame>", "PushDirectory", "(Microsoft.Extensions.FileSystemGlobbing.Abstractions.DirectoryInfoBase)", "summary", "df-generated"]
@@ -29,6 +32,7 @@ extensions:
       - ["Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts", "PatternContextLinear", "get_Pattern", "()", "summary", "df-generated"]
       - ["Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts", "PatternContextLinearExclude", "PatternContextLinearExclude", "(Microsoft.Extensions.FileSystemGlobbing.Internal.ILinearPattern)", "summary", "df-generated"]
       - ["Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts", "PatternContextLinearExclude", "Test", "(Microsoft.Extensions.FileSystemGlobbing.Abstractions.DirectoryInfoBase)", "summary", "df-generated"]
+      - ["Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts", "PatternContextLinearInclude", "Declare", "(System.Action<Microsoft.Extensions.FileSystemGlobbing.Internal.IPathSegment,System.Boolean>)", "summary", "df-generated"]
       - ["Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts", "PatternContextLinearInclude", "PatternContextLinearInclude", "(Microsoft.Extensions.FileSystemGlobbing.Internal.ILinearPattern)", "summary", "df-generated"]
       - ["Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts", "PatternContextLinearInclude", "Test", "(Microsoft.Extensions.FileSystemGlobbing.Abstractions.DirectoryInfoBase)", "summary", "df-generated"]
       - ["Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts", "PatternContextRagged+FrameData", "get_StemItems", "()", "summary", "df-generated"]
@@ -36,12 +40,12 @@ extensions:
       - ["Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts", "PatternContextRagged", "IsStartingGroup", "()", "summary", "df-generated"]
       - ["Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts", "PatternContextRagged", "PatternContextRagged", "(Microsoft.Extensions.FileSystemGlobbing.Internal.IRaggedPattern)", "summary", "df-generated"]
       - ["Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts", "PatternContextRagged", "PopDirectory", "()", "summary", "df-generated"]
-      - ["Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts", "PatternContextRagged", "PushDirectory", "(Microsoft.Extensions.FileSystemGlobbing.Abstractions.DirectoryInfoBase)", "summary", "df-generated"]
       - ["Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts", "PatternContextRagged", "Test", "(Microsoft.Extensions.FileSystemGlobbing.Abstractions.FileInfoBase)", "summary", "df-generated"]
       - ["Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts", "PatternContextRagged", "TestMatchingGroup", "(Microsoft.Extensions.FileSystemGlobbing.Abstractions.FileSystemInfoBase)", "summary", "df-generated"]
       - ["Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts", "PatternContextRagged", "TestMatchingSegment", "(System.String)", "summary", "df-generated"]
       - ["Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts", "PatternContextRagged", "get_Pattern", "()", "summary", "df-generated"]
       - ["Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts", "PatternContextRaggedExclude", "PatternContextRaggedExclude", "(Microsoft.Extensions.FileSystemGlobbing.Internal.IRaggedPattern)", "summary", "df-generated"]
       - ["Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts", "PatternContextRaggedExclude", "Test", "(Microsoft.Extensions.FileSystemGlobbing.Abstractions.DirectoryInfoBase)", "summary", "df-generated"]
+      - ["Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts", "PatternContextRaggedInclude", "Declare", "(System.Action<Microsoft.Extensions.FileSystemGlobbing.Internal.IPathSegment,System.Boolean>)", "summary", "df-generated"]
       - ["Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts", "PatternContextRaggedInclude", "PatternContextRaggedInclude", "(Microsoft.Extensions.FileSystemGlobbing.Internal.IRaggedPattern)", "summary", "df-generated"]
       - ["Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts", "PatternContextRaggedInclude", "Test", "(Microsoft.Extensions.FileSystemGlobbing.Abstractions.DirectoryInfoBase)", "summary", "df-generated"]
diff --git a/csharp/ql/lib/ext/generated/Microsoft.Extensions.FileSystemGlobbing.Internal.model.yml b/csharp/ql/lib/ext/generated/Microsoft.Extensions.FileSystemGlobbing.Internal.model.yml
index 02661532296..704921ea8f0 100644
--- a/csharp/ql/lib/ext/generated/Microsoft.Extensions.FileSystemGlobbing.Internal.model.yml
+++ b/csharp/ql/lib/ext/generated/Microsoft.Extensions.FileSystemGlobbing.Internal.model.yml
@@ -14,6 +14,7 @@ extensions:
       - ["Microsoft.Extensions.FileSystemGlobbing.Internal", "IPathSegment", "get_CanProduceStem", "()", "summary", "df-generated"]
       - ["Microsoft.Extensions.FileSystemGlobbing.Internal", "IPattern", "CreatePatternContextForExclude", "()", "summary", "df-generated"]
       - ["Microsoft.Extensions.FileSystemGlobbing.Internal", "IPattern", "CreatePatternContextForInclude", "()", "summary", "df-generated"]
+      - ["Microsoft.Extensions.FileSystemGlobbing.Internal", "IPatternContext", "Declare", "(System.Action<Microsoft.Extensions.FileSystemGlobbing.Internal.IPathSegment,System.Boolean>)", "summary", "df-generated"]
       - ["Microsoft.Extensions.FileSystemGlobbing.Internal", "IPatternContext", "PopDirectory", "()", "summary", "df-generated"]
       - ["Microsoft.Extensions.FileSystemGlobbing.Internal", "IPatternContext", "PushDirectory", "(Microsoft.Extensions.FileSystemGlobbing.Abstractions.DirectoryInfoBase)", "summary", "df-generated"]
       - ["Microsoft.Extensions.FileSystemGlobbing.Internal", "IPatternContext", "Test", "(Microsoft.Extensions.FileSystemGlobbing.Abstractions.DirectoryInfoBase)", "summary", "df-generated"]
diff --git a/csharp/ql/lib/ext/generated/Microsoft.Extensions.FileSystemGlobbing.model.yml b/csharp/ql/lib/ext/generated/Microsoft.Extensions.FileSystemGlobbing.model.yml
index cf911daa347..6d9cc350b03 100644
--- a/csharp/ql/lib/ext/generated/Microsoft.Extensions.FileSystemGlobbing.model.yml
+++ b/csharp/ql/lib/ext/generated/Microsoft.Extensions.FileSystemGlobbing.model.yml
@@ -4,8 +4,9 @@ extensions:
       pack: codeql/csharp-all
       extensible: summaryModel
     data:
-      - ["Microsoft.Extensions.FileSystemGlobbing", "Matcher", True, "AddExclude", "(System.String)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["Microsoft.Extensions.FileSystemGlobbing", "Matcher", True, "AddInclude", "(System.String)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["Microsoft.Extensions.FileSystemGlobbing", "InMemoryDirectoryInfo", True, "GetFile", "(System.String)", "", "Argument[this]", "ReturnValue.SyntheticField[Microsoft.Extensions.FileSystemGlobbing.Internal.InMemoryFileInfo._parent]", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.FileSystemGlobbing", "Matcher", True, "AddExclude", "(System.String)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.FileSystemGlobbing", "Matcher", True, "AddInclude", "(System.String)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
   - addsTo:
       pack: codeql/csharp-all
       extensible: neutralModel
diff --git a/csharp/ql/lib/ext/generated/Microsoft.Extensions.Hosting.Systemd.model.yml b/csharp/ql/lib/ext/generated/Microsoft.Extensions.Hosting.Systemd.model.yml
index 3fb6135f447..fad127d9a1f 100644
--- a/csharp/ql/lib/ext/generated/Microsoft.Extensions.Hosting.Systemd.model.yml
+++ b/csharp/ql/lib/ext/generated/Microsoft.Extensions.Hosting.Systemd.model.yml
@@ -4,8 +4,8 @@ extensions:
       pack: codeql/csharp-all
       extensible: summaryModel
     data:
-      - ["Microsoft.Extensions.Hosting.Systemd", "ServiceState", False, "ServiceState", "(System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["Microsoft.Extensions.Hosting.Systemd", "ServiceState", False, "ToString", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["Microsoft.Extensions.Hosting.Systemd", "ServiceState", False, "ServiceState", "(System.String)", "", "Argument[0]", "Argument[this].SyntheticField[Microsoft.Extensions.Hosting.Systemd.ServiceState._data]", "taint", "dfc-generated"]
+      - ["Microsoft.Extensions.Hosting.Systemd", "ServiceState", False, "ToString", "()", "", "Argument[this].SyntheticField[Microsoft.Extensions.Hosting.Systemd.ServiceState._data].Element", "ReturnValue", "taint", "dfc-generated"]
       - ["Microsoft.Extensions.Hosting.Systemd", "SystemdLifetime", False, "SystemdLifetime", "(Microsoft.Extensions.Hosting.IHostEnvironment,Microsoft.Extensions.Hosting.IHostApplicationLifetime,Microsoft.Extensions.Hosting.Systemd.ISystemdNotifier,Microsoft.Extensions.Logging.ILoggerFactory)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["Microsoft.Extensions.Hosting.Systemd", "SystemdLifetime", False, "SystemdLifetime", "(Microsoft.Extensions.Hosting.IHostEnvironment,Microsoft.Extensions.Hosting.IHostApplicationLifetime,Microsoft.Extensions.Hosting.Systemd.ISystemdNotifier,Microsoft.Extensions.Logging.ILoggerFactory)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
       - ["Microsoft.Extensions.Hosting.Systemd", "SystemdLifetime", False, "SystemdLifetime", "(Microsoft.Extensions.Hosting.IHostEnvironment,Microsoft.Extensions.Hosting.IHostApplicationLifetime,Microsoft.Extensions.Hosting.Systemd.ISystemdNotifier,Microsoft.Extensions.Logging.ILoggerFactory)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
diff --git a/csharp/ql/lib/ext/generated/Microsoft.Extensions.Hosting.model.yml b/csharp/ql/lib/ext/generated/Microsoft.Extensions.Hosting.model.yml
index c8616bc914a..7a6af8383e4 100644
--- a/csharp/ql/lib/ext/generated/Microsoft.Extensions.Hosting.model.yml
+++ b/csharp/ql/lib/ext/generated/Microsoft.Extensions.Hosting.model.yml
@@ -5,17 +5,28 @@ extensions:
       extensible: summaryModel
     data:
       - ["Microsoft.Extensions.Hosting", "BackgroundService", True, "get_ExecuteTask", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Extensions.Hosting", "Host", False, "CreateApplicationBuilder", "(Microsoft.Extensions.Hosting.HostApplicationBuilderSettings)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Extensions.Hosting", "Host", False, "CreateEmptyApplicationBuilder", "(Microsoft.Extensions.Hosting.HostApplicationBuilderSettings)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Extensions.Hosting", "HostApplicationBuilder", False, "HostApplicationBuilder", "(Microsoft.Extensions.Hosting.HostApplicationBuilderSettings)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["Microsoft.Extensions.Hosting", "HostingHostBuilderExtensions", False, "ConfigureDefaults", "(Microsoft.Extensions.Hosting.IHostBuilder,System.String[])", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Extensions.Hosting", "HostingHostBuilderExtensions", False, "UseConsoleLifetime", "(Microsoft.Extensions.Hosting.IHostBuilder)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Extensions.Hosting", "HostingHostBuilderExtensions", False, "UseContentRoot", "(Microsoft.Extensions.Hosting.IHostBuilder,System.String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Extensions.Hosting", "HostingHostBuilderExtensions", False, "UseEnvironment", "(Microsoft.Extensions.Hosting.IHostBuilder,System.String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["Microsoft.Extensions.Hosting", "Host", False, "CreateEmptyApplicationBuilder", "(Microsoft.Extensions.Hosting.HostApplicationBuilderSettings)", "", "Argument[0].Property[Microsoft.Extensions.Hosting.HostApplicationBuilderSettings.Args]", "ReturnValue.Property[Microsoft.Extensions.Hosting.HostApplicationBuilder.Configuration]", "taint", "dfc-generated"]
+      - ["Microsoft.Extensions.Hosting", "HostApplicationBuilder", False, "HostApplicationBuilder", "(Microsoft.Extensions.Hosting.HostApplicationBuilderSettings)", "", "Argument[0].Property[Microsoft.Extensions.Hosting.HostApplicationBuilderSettings.Args]", "Argument[this].Property[Microsoft.Extensions.Hosting.HostApplicationBuilder.Configuration]", "taint", "dfc-generated"]
+      - ["Microsoft.Extensions.Hosting", "HostApplicationBuilder", False, "get_Configuration", "()", "", "Argument[this].Property[Microsoft.Extensions.Hosting.HostApplicationBuilder.Configuration]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.Hosting", "HostingHostBuilderExtensions", False, "ConfigureAppConfiguration", "(Microsoft.Extensions.Hosting.IHostBuilder,System.Action<Microsoft.Extensions.Configuration.IConfigurationBuilder>)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.Hosting", "HostingHostBuilderExtensions", False, "ConfigureContainer<TContainerBuilder>", "(Microsoft.Extensions.Hosting.IHostBuilder,System.Action<TContainerBuilder>)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.Hosting", "HostingHostBuilderExtensions", False, "ConfigureDefaults", "(Microsoft.Extensions.Hosting.IHostBuilder,System.String[])", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.Hosting", "HostingHostBuilderExtensions", False, "ConfigureHostOptions", "(Microsoft.Extensions.Hosting.IHostBuilder,System.Action<Microsoft.Extensions.Hosting.HostBuilderContext,Microsoft.Extensions.Hosting.HostOptions>)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.Hosting", "HostingHostBuilderExtensions", False, "ConfigureHostOptions", "(Microsoft.Extensions.Hosting.IHostBuilder,System.Action<Microsoft.Extensions.Hosting.HostOptions>)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.Hosting", "HostingHostBuilderExtensions", False, "ConfigureLogging", "(Microsoft.Extensions.Hosting.IHostBuilder,System.Action<Microsoft.Extensions.Hosting.HostBuilderContext,Microsoft.Extensions.Logging.ILoggingBuilder>)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.Hosting", "HostingHostBuilderExtensions", False, "ConfigureLogging", "(Microsoft.Extensions.Hosting.IHostBuilder,System.Action<Microsoft.Extensions.Logging.ILoggingBuilder>)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.Hosting", "HostingHostBuilderExtensions", False, "ConfigureMetrics", "(Microsoft.Extensions.Hosting.IHostBuilder,System.Action<Microsoft.Extensions.Diagnostics.Metrics.IMetricsBuilder>)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.Hosting", "HostingHostBuilderExtensions", False, "ConfigureMetrics", "(Microsoft.Extensions.Hosting.IHostBuilder,System.Action<Microsoft.Extensions.Hosting.HostBuilderContext,Microsoft.Extensions.Diagnostics.Metrics.IMetricsBuilder>)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.Hosting", "HostingHostBuilderExtensions", False, "ConfigureServices", "(Microsoft.Extensions.Hosting.IHostBuilder,System.Action<Microsoft.Extensions.DependencyInjection.IServiceCollection>)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.Hosting", "HostingHostBuilderExtensions", False, "UseConsoleLifetime", "(Microsoft.Extensions.Hosting.IHostBuilder)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.Hosting", "HostingHostBuilderExtensions", False, "UseConsoleLifetime", "(Microsoft.Extensions.Hosting.IHostBuilder,System.Action<Microsoft.Extensions.Hosting.ConsoleLifetimeOptions>)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.Hosting", "HostingHostBuilderExtensions", False, "UseContentRoot", "(Microsoft.Extensions.Hosting.IHostBuilder,System.String)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.Hosting", "HostingHostBuilderExtensions", False, "UseDefaultServiceProvider", "(Microsoft.Extensions.Hosting.IHostBuilder,System.Action<Microsoft.Extensions.DependencyInjection.ServiceProviderOptions>)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.Hosting", "HostingHostBuilderExtensions", False, "UseDefaultServiceProvider", "(Microsoft.Extensions.Hosting.IHostBuilder,System.Action<Microsoft.Extensions.Hosting.HostBuilderContext,Microsoft.Extensions.DependencyInjection.ServiceProviderOptions>)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.Hosting", "HostingHostBuilderExtensions", False, "UseEnvironment", "(Microsoft.Extensions.Hosting.IHostBuilder,System.String)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
       - ["Microsoft.Extensions.Hosting", "IApplicationLifetime", True, "get_ApplicationStarted", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["Microsoft.Extensions.Hosting", "IApplicationLifetime", True, "get_ApplicationStopped", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["Microsoft.Extensions.Hosting", "IApplicationLifetime", True, "get_ApplicationStopping", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Extensions.Hosting", "IHostApplicationBuilder", True, "get_Configuration", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["Microsoft.Extensions.Hosting", "IHostApplicationBuilder", True, "get_Environment", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["Microsoft.Extensions.Hosting", "IHostApplicationBuilder", True, "get_Logging", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["Microsoft.Extensions.Hosting", "IHostApplicationBuilder", True, "get_Metrics", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
@@ -24,14 +35,20 @@ extensions:
       - ["Microsoft.Extensions.Hosting", "IHostApplicationLifetime", True, "get_ApplicationStarted", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["Microsoft.Extensions.Hosting", "IHostApplicationLifetime", True, "get_ApplicationStopped", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["Microsoft.Extensions.Hosting", "IHostApplicationLifetime", True, "get_ApplicationStopping", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Extensions.Hosting", "IHostBuilder", True, "UseServiceProviderFactory<TContainerBuilder>", "(Microsoft.Extensions.DependencyInjection.IServiceProviderFactory<TContainerBuilder>)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["Microsoft.Extensions.Hosting", "IHostBuilder", True, "UseServiceProviderFactory<TContainerBuilder>", "(Microsoft.Extensions.DependencyInjection.IServiceProviderFactory<TContainerBuilder>)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["Microsoft.Extensions.Hosting", "IHostBuilder", True, "ConfigureAppConfiguration", "(System.Action<Microsoft.Extensions.Hosting.HostBuilderContext,Microsoft.Extensions.Configuration.IConfigurationBuilder>)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.Hosting", "IHostBuilder", True, "ConfigureContainer<TContainerBuilder>", "(System.Action<Microsoft.Extensions.Hosting.HostBuilderContext,TContainerBuilder>)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.Hosting", "IHostBuilder", True, "ConfigureHostConfiguration", "(System.Action<Microsoft.Extensions.Configuration.IConfigurationBuilder>)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.Hosting", "IHostBuilder", True, "ConfigureServices", "(System.Action<Microsoft.Extensions.Hosting.HostBuilderContext,Microsoft.Extensions.DependencyInjection.IServiceCollection>)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.Hosting", "IHostBuilder", True, "UseServiceProviderFactory<TContainerBuilder>", "(Microsoft.Extensions.DependencyInjection.IServiceProviderFactory<TContainerBuilder>)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.Hosting", "IHostBuilder", True, "UseServiceProviderFactory<TContainerBuilder>", "(System.Func<Microsoft.Extensions.Hosting.HostBuilderContext,Microsoft.Extensions.DependencyInjection.IServiceProviderFactory<TContainerBuilder>>)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
       - ["Microsoft.Extensions.Hosting", "IHostLifetime", True, "WaitForStartAsync", "(System.Threading.CancellationToken)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["Microsoft.Extensions.Hosting", "IHostedService", True, "StartAsync", "(System.Threading.CancellationToken)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Extensions.Hosting", "SystemdHostBuilderExtensions", False, "AddSystemd", "(Microsoft.Extensions.DependencyInjection.IServiceCollection)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Extensions.Hosting", "SystemdHostBuilderExtensions", False, "UseSystemd", "(Microsoft.Extensions.Hosting.IHostBuilder)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Extensions.Hosting", "WindowsServiceLifetimeHostBuilderExtensions", False, "AddWindowsService", "(Microsoft.Extensions.DependencyInjection.IServiceCollection)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Extensions.Hosting", "WindowsServiceLifetimeHostBuilderExtensions", False, "UseWindowsService", "(Microsoft.Extensions.Hosting.IHostBuilder)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["Microsoft.Extensions.Hosting", "SystemdHostBuilderExtensions", False, "AddSystemd", "(Microsoft.Extensions.DependencyInjection.IServiceCollection)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.Hosting", "SystemdHostBuilderExtensions", False, "UseSystemd", "(Microsoft.Extensions.Hosting.IHostBuilder)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.Hosting", "WindowsServiceLifetimeHostBuilderExtensions", False, "AddWindowsService", "(Microsoft.Extensions.DependencyInjection.IServiceCollection)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.Hosting", "WindowsServiceLifetimeHostBuilderExtensions", False, "AddWindowsService", "(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Action<Microsoft.Extensions.Hosting.WindowsServiceLifetimeOptions>)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.Hosting", "WindowsServiceLifetimeHostBuilderExtensions", False, "UseWindowsService", "(Microsoft.Extensions.Hosting.IHostBuilder)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.Hosting", "WindowsServiceLifetimeHostBuilderExtensions", False, "UseWindowsService", "(Microsoft.Extensions.Hosting.IHostBuilder,System.Action<Microsoft.Extensions.Hosting.WindowsServiceLifetimeOptions>)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
   - addsTo:
       pack: codeql/csharp-all
       extensible: neutralModel
@@ -40,12 +57,14 @@ extensions:
       - ["Microsoft.Extensions.Hosting", "BackgroundService", "ExecuteAsync", "(System.Threading.CancellationToken)", "summary", "df-generated"]
       - ["Microsoft.Extensions.Hosting", "BackgroundService", "StopAsync", "(System.Threading.CancellationToken)", "summary", "df-generated"]
       - ["Microsoft.Extensions.Hosting", "Host", "CreateApplicationBuilder", "()", "summary", "df-generated"]
+      - ["Microsoft.Extensions.Hosting", "Host", "CreateApplicationBuilder", "(Microsoft.Extensions.Hosting.HostApplicationBuilderSettings)", "summary", "df-generated"]
       - ["Microsoft.Extensions.Hosting", "Host", "CreateApplicationBuilder", "(System.String[])", "summary", "df-generated"]
       - ["Microsoft.Extensions.Hosting", "Host", "CreateDefaultBuilder", "()", "summary", "df-generated"]
       - ["Microsoft.Extensions.Hosting", "Host", "CreateDefaultBuilder", "(System.String[])", "summary", "df-generated"]
       - ["Microsoft.Extensions.Hosting", "HostAbortedException", "HostAbortedException", "(System.String)", "summary", "df-generated"]
       - ["Microsoft.Extensions.Hosting", "HostAbortedException", "HostAbortedException", "(System.String,System.Exception)", "summary", "df-generated"]
       - ["Microsoft.Extensions.Hosting", "HostApplicationBuilder", "Build", "()", "summary", "df-generated"]
+      - ["Microsoft.Extensions.Hosting", "HostApplicationBuilder", "ConfigureContainer<TContainerBuilder>", "(Microsoft.Extensions.DependencyInjection.IServiceProviderFactory<TContainerBuilder>,System.Action<TContainerBuilder>)", "summary", "df-generated"]
       - ["Microsoft.Extensions.Hosting", "HostApplicationBuilder", "HostApplicationBuilder", "(System.String[])", "summary", "df-generated"]
       - ["Microsoft.Extensions.Hosting", "HostApplicationBuilder", "get_Configuration", "()", "summary", "df-generated"]
       - ["Microsoft.Extensions.Hosting", "HostBuilder", "Build", "()", "summary", "df-generated"]
@@ -68,11 +87,14 @@ extensions:
       - ["Microsoft.Extensions.Hosting", "HostingEnvironmentExtensions", "IsEnvironment", "(Microsoft.Extensions.Hosting.IHostingEnvironment,System.String)", "summary", "df-generated"]
       - ["Microsoft.Extensions.Hosting", "HostingEnvironmentExtensions", "IsProduction", "(Microsoft.Extensions.Hosting.IHostingEnvironment)", "summary", "df-generated"]
       - ["Microsoft.Extensions.Hosting", "HostingEnvironmentExtensions", "IsStaging", "(Microsoft.Extensions.Hosting.IHostingEnvironment)", "summary", "df-generated"]
+      - ["Microsoft.Extensions.Hosting", "HostingHostBuilderExtensions", "RunConsoleAsync", "(Microsoft.Extensions.Hosting.IHostBuilder,System.Action<Microsoft.Extensions.Hosting.ConsoleLifetimeOptions>,System.Threading.CancellationToken)", "summary", "df-generated"]
       - ["Microsoft.Extensions.Hosting", "HostingHostBuilderExtensions", "RunConsoleAsync", "(Microsoft.Extensions.Hosting.IHostBuilder,System.Threading.CancellationToken)", "summary", "df-generated"]
       - ["Microsoft.Extensions.Hosting", "IApplicationLifetime", "StopApplication", "()", "summary", "df-generated"]
       - ["Microsoft.Extensions.Hosting", "IHost", "StartAsync", "(System.Threading.CancellationToken)", "summary", "df-generated"]
       - ["Microsoft.Extensions.Hosting", "IHost", "StopAsync", "(System.Threading.CancellationToken)", "summary", "df-generated"]
       - ["Microsoft.Extensions.Hosting", "IHost", "get_Services", "()", "summary", "df-generated"]
+      - ["Microsoft.Extensions.Hosting", "IHostApplicationBuilder", "ConfigureContainer<TContainerBuilder>", "(Microsoft.Extensions.DependencyInjection.IServiceProviderFactory<TContainerBuilder>,System.Action<TContainerBuilder>)", "summary", "df-generated"]
+      - ["Microsoft.Extensions.Hosting", "IHostApplicationBuilder", "get_Configuration", "()", "summary", "df-generated"]
       - ["Microsoft.Extensions.Hosting", "IHostApplicationLifetime", "StopApplication", "()", "summary", "df-generated"]
       - ["Microsoft.Extensions.Hosting", "IHostBuilder", "Build", "()", "summary", "df-generated"]
       - ["Microsoft.Extensions.Hosting", "IHostBuilder", "get_Properties", "()", "summary", "df-generated"]
diff --git a/csharp/ql/lib/ext/generated/Microsoft.Extensions.Http.Logging.model.yml b/csharp/ql/lib/ext/generated/Microsoft.Extensions.Http.Logging.model.yml
index 4981d744ede..8f1e80d0e20 100644
--- a/csharp/ql/lib/ext/generated/Microsoft.Extensions.Http.Logging.model.yml
+++ b/csharp/ql/lib/ext/generated/Microsoft.Extensions.Http.Logging.model.yml
@@ -21,4 +21,6 @@ extensions:
       - ["Microsoft.Extensions.Http.Logging", "IHttpClientLogger", "LogRequestStart", "(System.Net.Http.HttpRequestMessage)", "summary", "df-generated"]
       - ["Microsoft.Extensions.Http.Logging", "IHttpClientLogger", "LogRequestStop", "(System.Object,System.Net.Http.HttpRequestMessage,System.Net.Http.HttpResponseMessage,System.TimeSpan)", "summary", "df-generated"]
       - ["Microsoft.Extensions.Http.Logging", "LoggingHttpMessageHandler", "Send", "(System.Net.Http.HttpRequestMessage,System.Threading.CancellationToken)", "summary", "df-generated"]
+      - ["Microsoft.Extensions.Http.Logging", "LoggingHttpMessageHandler", "SendAsync", "(System.Net.Http.HttpRequestMessage,System.Threading.CancellationToken)", "summary", "df-generated"]
       - ["Microsoft.Extensions.Http.Logging", "LoggingScopeHttpMessageHandler", "Send", "(System.Net.Http.HttpRequestMessage,System.Threading.CancellationToken)", "summary", "df-generated"]
+      - ["Microsoft.Extensions.Http.Logging", "LoggingScopeHttpMessageHandler", "SendAsync", "(System.Net.Http.HttpRequestMessage,System.Threading.CancellationToken)", "summary", "df-generated"]
diff --git a/csharp/ql/lib/ext/generated/Microsoft.Extensions.Http.model.yml b/csharp/ql/lib/ext/generated/Microsoft.Extensions.Http.model.yml
index 29d2dd91784..928156e1617 100644
--- a/csharp/ql/lib/ext/generated/Microsoft.Extensions.Http.model.yml
+++ b/csharp/ql/lib/ext/generated/Microsoft.Extensions.Http.model.yml
@@ -4,8 +4,8 @@ extensions:
       pack: codeql/csharp-all
       extensible: summaryModel
     data:
-      - ["Microsoft.Extensions.Http", "HttpMessageHandlerBuilder", False, "CreateHandlerPipeline", "(System.Net.Http.HttpMessageHandler,System.Collections.Generic.IEnumerable<System.Net.Http.DelegatingHandler>)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Extensions.Http", "HttpMessageHandlerBuilder", False, "CreateHandlerPipeline", "(System.Net.Http.HttpMessageHandler,System.Collections.Generic.IEnumerable<System.Net.Http.DelegatingHandler>)", "", "Argument[1].Element", "ReturnValue", "taint", "df-generated"]
+      - ["Microsoft.Extensions.Http", "HttpMessageHandlerBuilder", False, "CreateHandlerPipeline", "(System.Net.Http.HttpMessageHandler,System.Collections.Generic.IEnumerable<System.Net.Http.DelegatingHandler>)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.Http", "HttpMessageHandlerBuilder", False, "CreateHandlerPipeline", "(System.Net.Http.HttpMessageHandler,System.Collections.Generic.IEnumerable<System.Net.Http.DelegatingHandler>)", "", "Argument[1].Element", "ReturnValue", "value", "dfc-generated"]
       - ["Microsoft.Extensions.Http", "HttpMessageHandlerBuilder", True, "Build", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
   - addsTo:
       pack: codeql/csharp-all
@@ -15,4 +15,5 @@ extensions:
       - ["Microsoft.Extensions.Http", "HttpClientFactoryOptions", "get_HttpMessageHandlerBuilderActions", "()", "summary", "df-generated"]
       - ["Microsoft.Extensions.Http", "HttpMessageHandlerBuilder", "get_AdditionalHandlers", "()", "summary", "df-generated"]
       - ["Microsoft.Extensions.Http", "HttpMessageHandlerBuilder", "get_Services", "()", "summary", "df-generated"]
+      - ["Microsoft.Extensions.Http", "IHttpMessageHandlerBuilderFilter", "Configure", "(System.Action<Microsoft.Extensions.Http.HttpMessageHandlerBuilder>)", "summary", "df-generated"]
       - ["Microsoft.Extensions.Http", "ITypedHttpClientFactory<TClient>", "CreateClient", "(System.Net.Http.HttpClient)", "summary", "df-generated"]
diff --git a/csharp/ql/lib/ext/generated/Microsoft.Extensions.Logging.Abstractions.model.yml b/csharp/ql/lib/ext/generated/Microsoft.Extensions.Logging.Abstractions.model.yml
index 8cbf7c330b2..78b72199f65 100644
--- a/csharp/ql/lib/ext/generated/Microsoft.Extensions.Logging.Abstractions.model.yml
+++ b/csharp/ql/lib/ext/generated/Microsoft.Extensions.Logging.Abstractions.model.yml
@@ -4,6 +4,7 @@ extensions:
       pack: codeql/csharp-all
       extensible: neutralModel
     data:
+      - ["Microsoft.Extensions.Logging.Abstractions", "LogEntry<TState>", "LogEntry", "(Microsoft.Extensions.Logging.LogLevel,System.String,Microsoft.Extensions.Logging.EventId,TState,System.Exception,System.Func<TState,System.Exception,System.String>)", "summary", "df-generated"]
       - ["Microsoft.Extensions.Logging.Abstractions", "LogEntry<TState>", "get_Category", "()", "summary", "df-generated"]
       - ["Microsoft.Extensions.Logging.Abstractions", "LogEntry<TState>", "get_EventId", "()", "summary", "df-generated"]
       - ["Microsoft.Extensions.Logging.Abstractions", "LogEntry<TState>", "get_Exception", "()", "summary", "df-generated"]
diff --git a/csharp/ql/lib/ext/generated/Microsoft.Extensions.Logging.Console.model.yml b/csharp/ql/lib/ext/generated/Microsoft.Extensions.Logging.Console.model.yml
index 9bc58dc4d33..40e4e40223d 100644
--- a/csharp/ql/lib/ext/generated/Microsoft.Extensions.Logging.Console.model.yml
+++ b/csharp/ql/lib/ext/generated/Microsoft.Extensions.Logging.Console.model.yml
@@ -7,8 +7,7 @@ extensions:
       - ["Microsoft.Extensions.Logging.Console", "ConfigurationConsoleLoggerSettings", False, "ConfigurationConsoleLoggerSettings", "(Microsoft.Extensions.Configuration.IConfiguration)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["Microsoft.Extensions.Logging.Console", "ConsoleFormatter", True, "Write<TState>", "(Microsoft.Extensions.Logging.Abstractions.LogEntry<TState>,Microsoft.Extensions.Logging.IExternalScopeProvider,System.IO.TextWriter)", "", "Argument[0]", "Argument[2]", "taint", "df-generated"]
       - ["Microsoft.Extensions.Logging.Console", "ConsoleLoggerProvider", False, "ConsoleLoggerProvider", "(Microsoft.Extensions.Options.IOptionsMonitor<Microsoft.Extensions.Logging.Console.ConsoleLoggerOptions>,System.Collections.Generic.IEnumerable<Microsoft.Extensions.Logging.Console.ConsoleFormatter>)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["Microsoft.Extensions.Logging.Console", "IConsoleLoggerSettings", True, "Reload", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Extensions.Logging.Console", "IConsoleLoggerSettings", True, "Reload", "()", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["Microsoft.Extensions.Logging.Console", "IConsoleLoggerSettings", True, "Reload", "()", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
   - addsTo:
       pack: codeql/csharp-all
       extensible: neutralModel
diff --git a/csharp/ql/lib/ext/generated/Microsoft.Extensions.Logging.model.yml b/csharp/ql/lib/ext/generated/Microsoft.Extensions.Logging.model.yml
index bef633a527b..22ca3029111 100644
--- a/csharp/ql/lib/ext/generated/Microsoft.Extensions.Logging.model.yml
+++ b/csharp/ql/lib/ext/generated/Microsoft.Extensions.Logging.model.yml
@@ -4,36 +4,62 @@ extensions:
       pack: codeql/csharp-all
       extensible: summaryModel
     data:
-      - ["Microsoft.Extensions.Logging", "ConsoleLoggerExtensions", False, "AddConsole", "(Microsoft.Extensions.Logging.ILoggerFactory)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Extensions.Logging", "ConsoleLoggerExtensions", False, "AddConsole", "(Microsoft.Extensions.Logging.ILoggerFactory,Microsoft.Extensions.Configuration.IConfiguration)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Extensions.Logging", "ConsoleLoggerExtensions", False, "AddConsole", "(Microsoft.Extensions.Logging.ILoggerFactory,Microsoft.Extensions.Logging.Console.IConsoleLoggerSettings)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Extensions.Logging", "ConsoleLoggerExtensions", False, "AddConsole", "(Microsoft.Extensions.Logging.ILoggerFactory,Microsoft.Extensions.Logging.LogLevel)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Extensions.Logging", "ConsoleLoggerExtensions", False, "AddConsole", "(Microsoft.Extensions.Logging.ILoggerFactory,Microsoft.Extensions.Logging.LogLevel,System.Boolean)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Extensions.Logging", "ConsoleLoggerExtensions", False, "AddConsole", "(Microsoft.Extensions.Logging.ILoggerFactory,System.Boolean)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Extensions.Logging", "ConsoleLoggerExtensions", False, "AddConsole", "(Microsoft.Extensions.Logging.ILoggingBuilder)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Extensions.Logging", "ConsoleLoggerExtensions", False, "AddConsoleFormatter<TFormatter,TOptions>", "(Microsoft.Extensions.Logging.ILoggingBuilder)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Extensions.Logging", "ConsoleLoggerExtensions", False, "AddJsonConsole", "(Microsoft.Extensions.Logging.ILoggingBuilder)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Extensions.Logging", "ConsoleLoggerExtensions", False, "AddSimpleConsole", "(Microsoft.Extensions.Logging.ILoggingBuilder)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Extensions.Logging", "ConsoleLoggerExtensions", False, "AddSystemdConsole", "(Microsoft.Extensions.Logging.ILoggingBuilder)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Extensions.Logging", "DebugLoggerFactoryExtensions", False, "AddDebug", "(Microsoft.Extensions.Logging.ILoggerFactory)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Extensions.Logging", "DebugLoggerFactoryExtensions", False, "AddDebug", "(Microsoft.Extensions.Logging.ILoggerFactory,Microsoft.Extensions.Logging.LogLevel)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Extensions.Logging", "DebugLoggerFactoryExtensions", False, "AddDebug", "(Microsoft.Extensions.Logging.ILoggingBuilder)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Extensions.Logging", "EventId", False, "ToString", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Extensions.Logging", "EventLoggerFactoryExtensions", False, "AddEventLog", "(Microsoft.Extensions.Logging.ILoggerFactory)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Extensions.Logging", "EventLoggerFactoryExtensions", False, "AddEventLog", "(Microsoft.Extensions.Logging.ILoggerFactory,Microsoft.Extensions.Logging.EventLog.EventLogSettings)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Extensions.Logging", "EventLoggerFactoryExtensions", False, "AddEventLog", "(Microsoft.Extensions.Logging.ILoggerFactory,Microsoft.Extensions.Logging.LogLevel)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Extensions.Logging", "EventLoggerFactoryExtensions", False, "AddEventLog", "(Microsoft.Extensions.Logging.ILoggingBuilder)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Extensions.Logging", "EventLoggerFactoryExtensions", False, "AddEventLog", "(Microsoft.Extensions.Logging.ILoggingBuilder,Microsoft.Extensions.Logging.EventLog.EventLogSettings)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Extensions.Logging", "EventSourceLoggerFactoryExtensions", False, "AddEventSourceLogger", "(Microsoft.Extensions.Logging.ILoggerFactory)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Extensions.Logging", "EventSourceLoggerFactoryExtensions", False, "AddEventSourceLogger", "(Microsoft.Extensions.Logging.ILoggingBuilder)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Extensions.Logging", "FilterLoggingBuilderExtensions", False, "AddFilter", "(Microsoft.Extensions.Logging.ILoggingBuilder,System.String,Microsoft.Extensions.Logging.LogLevel)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Extensions.Logging", "FilterLoggingBuilderExtensions", False, "AddFilter", "(Microsoft.Extensions.Logging.LoggerFilterOptions,System.String,Microsoft.Extensions.Logging.LogLevel)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Extensions.Logging", "FilterLoggingBuilderExtensions", False, "AddFilter<T>", "(Microsoft.Extensions.Logging.ILoggingBuilder,System.String,Microsoft.Extensions.Logging.LogLevel)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Extensions.Logging", "FilterLoggingBuilderExtensions", False, "AddFilter<T>", "(Microsoft.Extensions.Logging.LoggerFilterOptions,System.String,Microsoft.Extensions.Logging.LogLevel)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["Microsoft.Extensions.Logging", "ConsoleLoggerExtensions", False, "AddConsole", "(Microsoft.Extensions.Logging.ILoggerFactory)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.Logging", "ConsoleLoggerExtensions", False, "AddConsole", "(Microsoft.Extensions.Logging.ILoggerFactory,Microsoft.Extensions.Configuration.IConfiguration)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.Logging", "ConsoleLoggerExtensions", False, "AddConsole", "(Microsoft.Extensions.Logging.ILoggerFactory,Microsoft.Extensions.Logging.Console.IConsoleLoggerSettings)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.Logging", "ConsoleLoggerExtensions", False, "AddConsole", "(Microsoft.Extensions.Logging.ILoggerFactory,Microsoft.Extensions.Logging.LogLevel)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.Logging", "ConsoleLoggerExtensions", False, "AddConsole", "(Microsoft.Extensions.Logging.ILoggerFactory,Microsoft.Extensions.Logging.LogLevel,System.Boolean)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.Logging", "ConsoleLoggerExtensions", False, "AddConsole", "(Microsoft.Extensions.Logging.ILoggerFactory,System.Boolean)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.Logging", "ConsoleLoggerExtensions", False, "AddConsole", "(Microsoft.Extensions.Logging.ILoggerFactory,System.Func<System.String,Microsoft.Extensions.Logging.LogLevel,System.Boolean>)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.Logging", "ConsoleLoggerExtensions", False, "AddConsole", "(Microsoft.Extensions.Logging.ILoggerFactory,System.Func<System.String,Microsoft.Extensions.Logging.LogLevel,System.Boolean>,System.Boolean)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.Logging", "ConsoleLoggerExtensions", False, "AddConsole", "(Microsoft.Extensions.Logging.ILoggingBuilder)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.Logging", "ConsoleLoggerExtensions", False, "AddConsole", "(Microsoft.Extensions.Logging.ILoggingBuilder,System.Action<Microsoft.Extensions.Logging.Console.ConsoleLoggerOptions>)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.Logging", "ConsoleLoggerExtensions", False, "AddConsoleFormatter<TFormatter,TOptions>", "(Microsoft.Extensions.Logging.ILoggingBuilder)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.Logging", "ConsoleLoggerExtensions", False, "AddConsoleFormatter<TFormatter,TOptions>", "(Microsoft.Extensions.Logging.ILoggingBuilder,System.Action<TOptions>)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.Logging", "ConsoleLoggerExtensions", False, "AddJsonConsole", "(Microsoft.Extensions.Logging.ILoggingBuilder)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.Logging", "ConsoleLoggerExtensions", False, "AddJsonConsole", "(Microsoft.Extensions.Logging.ILoggingBuilder,System.Action<Microsoft.Extensions.Logging.Console.JsonConsoleFormatterOptions>)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.Logging", "ConsoleLoggerExtensions", False, "AddSimpleConsole", "(Microsoft.Extensions.Logging.ILoggingBuilder)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.Logging", "ConsoleLoggerExtensions", False, "AddSimpleConsole", "(Microsoft.Extensions.Logging.ILoggingBuilder,System.Action<Microsoft.Extensions.Logging.Console.SimpleConsoleFormatterOptions>)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.Logging", "ConsoleLoggerExtensions", False, "AddSystemdConsole", "(Microsoft.Extensions.Logging.ILoggingBuilder)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.Logging", "ConsoleLoggerExtensions", False, "AddSystemdConsole", "(Microsoft.Extensions.Logging.ILoggingBuilder,System.Action<Microsoft.Extensions.Logging.Console.ConsoleFormatterOptions>)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.Logging", "DebugLoggerFactoryExtensions", False, "AddDebug", "(Microsoft.Extensions.Logging.ILoggerFactory)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.Logging", "DebugLoggerFactoryExtensions", False, "AddDebug", "(Microsoft.Extensions.Logging.ILoggerFactory,Microsoft.Extensions.Logging.LogLevel)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.Logging", "DebugLoggerFactoryExtensions", False, "AddDebug", "(Microsoft.Extensions.Logging.ILoggerFactory,System.Func<System.String,Microsoft.Extensions.Logging.LogLevel,System.Boolean>)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.Logging", "DebugLoggerFactoryExtensions", False, "AddDebug", "(Microsoft.Extensions.Logging.ILoggingBuilder)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.Logging", "EventId", False, "ToString", "()", "", "Argument[this].Property[Microsoft.Extensions.Logging.EventId.Name]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.Logging", "EventLoggerFactoryExtensions", False, "AddEventLog", "(Microsoft.Extensions.Logging.ILoggerFactory)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.Logging", "EventLoggerFactoryExtensions", False, "AddEventLog", "(Microsoft.Extensions.Logging.ILoggerFactory,Microsoft.Extensions.Logging.EventLog.EventLogSettings)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.Logging", "EventLoggerFactoryExtensions", False, "AddEventLog", "(Microsoft.Extensions.Logging.ILoggerFactory,Microsoft.Extensions.Logging.LogLevel)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.Logging", "EventLoggerFactoryExtensions", False, "AddEventLog", "(Microsoft.Extensions.Logging.ILoggingBuilder)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.Logging", "EventLoggerFactoryExtensions", False, "AddEventLog", "(Microsoft.Extensions.Logging.ILoggingBuilder,Microsoft.Extensions.Logging.EventLog.EventLogSettings)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.Logging", "EventLoggerFactoryExtensions", False, "AddEventLog", "(Microsoft.Extensions.Logging.ILoggingBuilder,System.Action<Microsoft.Extensions.Logging.EventLog.EventLogSettings>)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.Logging", "EventSourceLoggerFactoryExtensions", False, "AddEventSourceLogger", "(Microsoft.Extensions.Logging.ILoggerFactory)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.Logging", "EventSourceLoggerFactoryExtensions", False, "AddEventSourceLogger", "(Microsoft.Extensions.Logging.ILoggingBuilder)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.Logging", "FilterLoggingBuilderExtensions", False, "AddFilter", "(Microsoft.Extensions.Logging.ILoggingBuilder,System.Func<Microsoft.Extensions.Logging.LogLevel,System.Boolean>)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.Logging", "FilterLoggingBuilderExtensions", False, "AddFilter", "(Microsoft.Extensions.Logging.ILoggingBuilder,System.Func<System.String,Microsoft.Extensions.Logging.LogLevel,System.Boolean>)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.Logging", "FilterLoggingBuilderExtensions", False, "AddFilter", "(Microsoft.Extensions.Logging.ILoggingBuilder,System.Func<System.String,System.String,Microsoft.Extensions.Logging.LogLevel,System.Boolean>)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.Logging", "FilterLoggingBuilderExtensions", False, "AddFilter", "(Microsoft.Extensions.Logging.ILoggingBuilder,System.String,Microsoft.Extensions.Logging.LogLevel)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.Logging", "FilterLoggingBuilderExtensions", False, "AddFilter", "(Microsoft.Extensions.Logging.ILoggingBuilder,System.String,System.Func<Microsoft.Extensions.Logging.LogLevel,System.Boolean>)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.Logging", "FilterLoggingBuilderExtensions", False, "AddFilter", "(Microsoft.Extensions.Logging.LoggerFilterOptions,System.Func<Microsoft.Extensions.Logging.LogLevel,System.Boolean>)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.Logging", "FilterLoggingBuilderExtensions", False, "AddFilter", "(Microsoft.Extensions.Logging.LoggerFilterOptions,System.Func<System.String,Microsoft.Extensions.Logging.LogLevel,System.Boolean>)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.Logging", "FilterLoggingBuilderExtensions", False, "AddFilter", "(Microsoft.Extensions.Logging.LoggerFilterOptions,System.Func<System.String,System.String,Microsoft.Extensions.Logging.LogLevel,System.Boolean>)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.Logging", "FilterLoggingBuilderExtensions", False, "AddFilter", "(Microsoft.Extensions.Logging.LoggerFilterOptions,System.String,Microsoft.Extensions.Logging.LogLevel)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.Logging", "FilterLoggingBuilderExtensions", False, "AddFilter", "(Microsoft.Extensions.Logging.LoggerFilterOptions,System.String,System.Func<Microsoft.Extensions.Logging.LogLevel,System.Boolean>)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.Logging", "FilterLoggingBuilderExtensions", False, "AddFilter<T>", "(Microsoft.Extensions.Logging.ILoggingBuilder,System.Func<Microsoft.Extensions.Logging.LogLevel,System.Boolean>)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.Logging", "FilterLoggingBuilderExtensions", False, "AddFilter<T>", "(Microsoft.Extensions.Logging.ILoggingBuilder,System.Func<System.String,Microsoft.Extensions.Logging.LogLevel,System.Boolean>)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.Logging", "FilterLoggingBuilderExtensions", False, "AddFilter<T>", "(Microsoft.Extensions.Logging.ILoggingBuilder,System.String,Microsoft.Extensions.Logging.LogLevel)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.Logging", "FilterLoggingBuilderExtensions", False, "AddFilter<T>", "(Microsoft.Extensions.Logging.ILoggingBuilder,System.String,System.Func<Microsoft.Extensions.Logging.LogLevel,System.Boolean>)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.Logging", "FilterLoggingBuilderExtensions", False, "AddFilter<T>", "(Microsoft.Extensions.Logging.LoggerFilterOptions,System.Func<Microsoft.Extensions.Logging.LogLevel,System.Boolean>)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.Logging", "FilterLoggingBuilderExtensions", False, "AddFilter<T>", "(Microsoft.Extensions.Logging.LoggerFilterOptions,System.Func<System.String,Microsoft.Extensions.Logging.LogLevel,System.Boolean>)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.Logging", "FilterLoggingBuilderExtensions", False, "AddFilter<T>", "(Microsoft.Extensions.Logging.LoggerFilterOptions,System.String,Microsoft.Extensions.Logging.LogLevel)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.Logging", "FilterLoggingBuilderExtensions", False, "AddFilter<T>", "(Microsoft.Extensions.Logging.LoggerFilterOptions,System.String,System.Func<Microsoft.Extensions.Logging.LogLevel,System.Boolean>)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.Logging", "IExternalScopeProvider", True, "ForEachScope<TState>", "(System.Action<System.Object,TState>,TState)", "", "Argument[1]", "Argument[0].Parameter[1]", "value", "dfc-generated"]
       - ["Microsoft.Extensions.Logging", "IExternalScopeProvider", True, "Push", "(System.Object)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["Microsoft.Extensions.Logging", "IExternalScopeProvider", True, "Push", "(System.Object)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["Microsoft.Extensions.Logging", "ILogger", True, "BeginScope<TState>", "(TState)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["Microsoft.Extensions.Logging", "ILogger", True, "BeginScope<TState>", "(TState)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["Microsoft.Extensions.Logging", "ILogger", True, "Log<TState>", "(Microsoft.Extensions.Logging.LogLevel,Microsoft.Extensions.Logging.EventId,TState,System.Exception,System.Func<TState,System.Exception,System.String>)", "", "Argument[2]", "Argument[4].Parameter[0]", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.Logging", "ILogger", True, "Log<TState>", "(Microsoft.Extensions.Logging.LogLevel,Microsoft.Extensions.Logging.EventId,TState,System.Exception,System.Func<TState,System.Exception,System.String>)", "", "Argument[3]", "Argument[4].Parameter[1]", "value", "dfc-generated"]
       - ["Microsoft.Extensions.Logging", "ILoggerFactory", True, "AddProvider", "(Microsoft.Extensions.Logging.ILoggerProvider)", "", "Argument[this]", "Argument[0]", "taint", "df-generated"]
       - ["Microsoft.Extensions.Logging", "ILoggerFactory", True, "CreateLogger", "(System.String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["Microsoft.Extensions.Logging", "ILoggerProvider", True, "CreateLogger", "(System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
@@ -48,18 +74,19 @@ extensions:
       - ["Microsoft.Extensions.Logging", "LoggerFactory", False, "LoggerFactory", "(System.Collections.Generic.IEnumerable<Microsoft.Extensions.Logging.ILoggerProvider>,Microsoft.Extensions.Options.IOptionsMonitor<Microsoft.Extensions.Logging.LoggerFilterOptions>,Microsoft.Extensions.Options.IOptions<Microsoft.Extensions.Logging.LoggerFactoryOptions>,Microsoft.Extensions.Logging.IExternalScopeProvider)", "", "Argument[3]", "Argument[this]", "taint", "df-generated"]
       - ["Microsoft.Extensions.Logging", "LoggerFilterOptions", False, "get_Rules", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["Microsoft.Extensions.Logging", "LoggerFilterRule", False, "ToString", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Extensions.Logging", "LoggingBuilderExtensions", False, "AddConfiguration", "(Microsoft.Extensions.Logging.ILoggingBuilder,Microsoft.Extensions.Configuration.IConfiguration)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Extensions.Logging", "LoggingBuilderExtensions", False, "AddProvider", "(Microsoft.Extensions.Logging.ILoggingBuilder,Microsoft.Extensions.Logging.ILoggerProvider)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Extensions.Logging", "LoggingBuilderExtensions", False, "ClearProviders", "(Microsoft.Extensions.Logging.ILoggingBuilder)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Extensions.Logging", "LoggingBuilderExtensions", False, "SetMinimumLevel", "(Microsoft.Extensions.Logging.ILoggingBuilder,Microsoft.Extensions.Logging.LogLevel)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Extensions.Logging", "TraceSourceFactoryExtensions", False, "AddTraceSource", "(Microsoft.Extensions.Logging.ILoggerFactory,System.Diagnostics.SourceSwitch)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Extensions.Logging", "TraceSourceFactoryExtensions", False, "AddTraceSource", "(Microsoft.Extensions.Logging.ILoggerFactory,System.Diagnostics.SourceSwitch,System.Diagnostics.TraceListener)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Extensions.Logging", "TraceSourceFactoryExtensions", False, "AddTraceSource", "(Microsoft.Extensions.Logging.ILoggerFactory,System.String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Extensions.Logging", "TraceSourceFactoryExtensions", False, "AddTraceSource", "(Microsoft.Extensions.Logging.ILoggerFactory,System.String,System.Diagnostics.TraceListener)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Extensions.Logging", "TraceSourceFactoryExtensions", False, "AddTraceSource", "(Microsoft.Extensions.Logging.ILoggingBuilder,System.Diagnostics.SourceSwitch)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Extensions.Logging", "TraceSourceFactoryExtensions", False, "AddTraceSource", "(Microsoft.Extensions.Logging.ILoggingBuilder,System.Diagnostics.SourceSwitch,System.Diagnostics.TraceListener)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Extensions.Logging", "TraceSourceFactoryExtensions", False, "AddTraceSource", "(Microsoft.Extensions.Logging.ILoggingBuilder,System.String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Extensions.Logging", "TraceSourceFactoryExtensions", False, "AddTraceSource", "(Microsoft.Extensions.Logging.ILoggingBuilder,System.String,System.Diagnostics.TraceListener)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["Microsoft.Extensions.Logging", "LoggingBuilderExtensions", False, "AddConfiguration", "(Microsoft.Extensions.Logging.ILoggingBuilder,Microsoft.Extensions.Configuration.IConfiguration)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.Logging", "LoggingBuilderExtensions", False, "AddProvider", "(Microsoft.Extensions.Logging.ILoggingBuilder,Microsoft.Extensions.Logging.ILoggerProvider)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.Logging", "LoggingBuilderExtensions", False, "ClearProviders", "(Microsoft.Extensions.Logging.ILoggingBuilder)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.Logging", "LoggingBuilderExtensions", False, "Configure", "(Microsoft.Extensions.Logging.ILoggingBuilder,System.Action<Microsoft.Extensions.Logging.LoggerFactoryOptions>)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.Logging", "LoggingBuilderExtensions", False, "SetMinimumLevel", "(Microsoft.Extensions.Logging.ILoggingBuilder,Microsoft.Extensions.Logging.LogLevel)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.Logging", "TraceSourceFactoryExtensions", False, "AddTraceSource", "(Microsoft.Extensions.Logging.ILoggerFactory,System.Diagnostics.SourceSwitch)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.Logging", "TraceSourceFactoryExtensions", False, "AddTraceSource", "(Microsoft.Extensions.Logging.ILoggerFactory,System.Diagnostics.SourceSwitch,System.Diagnostics.TraceListener)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.Logging", "TraceSourceFactoryExtensions", False, "AddTraceSource", "(Microsoft.Extensions.Logging.ILoggerFactory,System.String)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.Logging", "TraceSourceFactoryExtensions", False, "AddTraceSource", "(Microsoft.Extensions.Logging.ILoggerFactory,System.String,System.Diagnostics.TraceListener)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.Logging", "TraceSourceFactoryExtensions", False, "AddTraceSource", "(Microsoft.Extensions.Logging.ILoggingBuilder,System.Diagnostics.SourceSwitch)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.Logging", "TraceSourceFactoryExtensions", False, "AddTraceSource", "(Microsoft.Extensions.Logging.ILoggingBuilder,System.Diagnostics.SourceSwitch,System.Diagnostics.TraceListener)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.Logging", "TraceSourceFactoryExtensions", False, "AddTraceSource", "(Microsoft.Extensions.Logging.ILoggingBuilder,System.String)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.Logging", "TraceSourceFactoryExtensions", False, "AddTraceSource", "(Microsoft.Extensions.Logging.ILoggingBuilder,System.String,System.Diagnostics.TraceListener)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
   - addsTo:
       pack: codeql/csharp-all
       extensible: neutralModel
@@ -105,6 +132,7 @@ extensions:
       - ["Microsoft.Extensions.Logging", "LoggerExtensions", "LogWarning", "(Microsoft.Extensions.Logging.ILogger,System.Exception,System.String,System.Object[])", "summary", "df-generated"]
       - ["Microsoft.Extensions.Logging", "LoggerExtensions", "LogWarning", "(Microsoft.Extensions.Logging.ILogger,System.String,System.Object[])", "summary", "df-generated"]
       - ["Microsoft.Extensions.Logging", "LoggerFactory", "CheckDisposed", "()", "summary", "df-generated"]
+      - ["Microsoft.Extensions.Logging", "LoggerFactory", "Create", "(System.Action<Microsoft.Extensions.Logging.ILoggingBuilder>)", "summary", "df-generated"]
       - ["Microsoft.Extensions.Logging", "LoggerFactory", "Dispose", "()", "summary", "df-generated"]
       - ["Microsoft.Extensions.Logging", "LoggerFactory", "LoggerFactory", "(System.Collections.Generic.IEnumerable<Microsoft.Extensions.Logging.ILoggerProvider>)", "summary", "df-generated"]
       - ["Microsoft.Extensions.Logging", "LoggerFactory", "LoggerFactory", "(System.Collections.Generic.IEnumerable<Microsoft.Extensions.Logging.ILoggerProvider>,Microsoft.Extensions.Logging.LoggerFilterOptions)", "summary", "df-generated"]
@@ -112,6 +140,7 @@ extensions:
       - ["Microsoft.Extensions.Logging", "LoggerFactory", "LoggerFactory", "(System.Collections.Generic.IEnumerable<Microsoft.Extensions.Logging.ILoggerProvider>,Microsoft.Extensions.Options.IOptionsMonitor<Microsoft.Extensions.Logging.LoggerFilterOptions>,Microsoft.Extensions.Options.IOptions<Microsoft.Extensions.Logging.LoggerFactoryOptions>)", "summary", "df-generated"]
       - ["Microsoft.Extensions.Logging", "LoggerFactoryExtensions", "CreateLogger", "(Microsoft.Extensions.Logging.ILoggerFactory,System.Type)", "summary", "df-generated"]
       - ["Microsoft.Extensions.Logging", "LoggerFactoryExtensions", "CreateLogger<T>", "(Microsoft.Extensions.Logging.ILoggerFactory)", "summary", "df-generated"]
+      - ["Microsoft.Extensions.Logging", "LoggerFilterRule", "LoggerFilterRule", "(System.String,System.String,System.Nullable<Microsoft.Extensions.Logging.LogLevel>,System.Func<System.String,System.String,Microsoft.Extensions.Logging.LogLevel,System.Boolean>)", "summary", "df-generated"]
       - ["Microsoft.Extensions.Logging", "LoggerFilterRule", "get_CategoryName", "()", "summary", "df-generated"]
       - ["Microsoft.Extensions.Logging", "LoggerFilterRule", "get_Filter", "()", "summary", "df-generated"]
       - ["Microsoft.Extensions.Logging", "LoggerFilterRule", "get_LogLevel", "()", "summary", "df-generated"]
diff --git a/csharp/ql/lib/ext/generated/Microsoft.Extensions.Options.model.yml b/csharp/ql/lib/ext/generated/Microsoft.Extensions.Options.model.yml
index b0669f73b62..94bcb441f53 100644
--- a/csharp/ql/lib/ext/generated/Microsoft.Extensions.Options.model.yml
+++ b/csharp/ql/lib/ext/generated/Microsoft.Extensions.Options.model.yml
@@ -6,12 +6,67 @@ extensions:
     data:
       - ["Microsoft.Extensions.Options", "ConfigurationChangeTokenSource<TOptions>", False, "ConfigurationChangeTokenSource", "(System.String,Microsoft.Extensions.Configuration.IConfiguration)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
       - ["Microsoft.Extensions.Options", "ConfigurationChangeTokenSource<TOptions>", False, "GetChangeToken", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["Microsoft.Extensions.Options", "ConfigureNamedOptions<TOptions,TDep1,TDep2,TDep3,TDep4,TDep5>", False, "Configure", "(TOptions)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["Microsoft.Extensions.Options", "ConfigureNamedOptions<TOptions,TDep1,TDep2,TDep3,TDep4,TDep5>", True, "Configure", "(System.String,TOptions)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["Microsoft.Extensions.Options", "ConfigureNamedOptions<TOptions,TDep1,TDep2,TDep3,TDep4>", False, "Configure", "(TOptions)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["Microsoft.Extensions.Options", "ConfigureNamedOptions<TOptions,TDep1,TDep2,TDep3,TDep4>", True, "Configure", "(System.String,TOptions)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["Microsoft.Extensions.Options", "ConfigureNamedOptions<TOptions,TDep1,TDep2,TDep3>", False, "Configure", "(TOptions)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["Microsoft.Extensions.Options", "ConfigureNamedOptions<TOptions,TDep1,TDep2,TDep3>", True, "Configure", "(System.String,TOptions)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["Microsoft.Extensions.Options", "ConfigureNamedOptions<TOptions,TDep1,TDep2>", False, "Configure", "(TOptions)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["Microsoft.Extensions.Options", "ConfigureNamedOptions<TOptions,TDep1,TDep2>", True, "Configure", "(System.String,TOptions)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["Microsoft.Extensions.Options", "ConfigureNamedOptions<TOptions,TDep>", False, "Configure", "(TOptions)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["Microsoft.Extensions.Options", "ConfigureNamedOptions<TOptions,TDep>", True, "Configure", "(System.String,TOptions)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["Microsoft.Extensions.Options", "ConfigureNamedOptions<TOptions>", False, "Configure", "(TOptions)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["Microsoft.Extensions.Options", "ConfigureNamedOptions<TOptions>", True, "Configure", "(System.String,TOptions)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["Microsoft.Extensions.Options", "ConfigureOptions<TOptions>", True, "Configure", "(TOptions)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["Microsoft.Extensions.Options", "OptionsBuilder<TOptions>", True, "Configure", "(System.Action<TOptions>)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.Options", "OptionsBuilder<TOptions>", True, "Configure<TDep1,TDep2,TDep3,TDep4,TDep5>", "(System.Action<TOptions,TDep1,TDep2,TDep3,TDep4,TDep5>)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.Options", "OptionsBuilder<TOptions>", True, "Configure<TDep1,TDep2,TDep3,TDep4>", "(System.Action<TOptions,TDep1,TDep2,TDep3,TDep4>)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.Options", "OptionsBuilder<TOptions>", True, "Configure<TDep1,TDep2,TDep3>", "(System.Action<TOptions,TDep1,TDep2,TDep3>)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.Options", "OptionsBuilder<TOptions>", True, "Configure<TDep1,TDep2>", "(System.Action<TOptions,TDep1,TDep2>)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.Options", "OptionsBuilder<TOptions>", True, "Configure<TDep>", "(System.Action<TOptions,TDep>)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.Options", "OptionsBuilder<TOptions>", True, "PostConfigure", "(System.Action<TOptions>)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.Options", "OptionsBuilder<TOptions>", True, "PostConfigure<TDep1,TDep2,TDep3,TDep4,TDep5>", "(System.Action<TOptions,TDep1,TDep2,TDep3,TDep4,TDep5>)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.Options", "OptionsBuilder<TOptions>", True, "PostConfigure<TDep1,TDep2,TDep3,TDep4>", "(System.Action<TOptions,TDep1,TDep2,TDep3,TDep4>)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.Options", "OptionsBuilder<TOptions>", True, "PostConfigure<TDep1,TDep2,TDep3>", "(System.Action<TOptions,TDep1,TDep2,TDep3>)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.Options", "OptionsBuilder<TOptions>", True, "PostConfigure<TDep1,TDep2>", "(System.Action<TOptions,TDep1,TDep2>)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.Options", "OptionsBuilder<TOptions>", True, "PostConfigure<TDep>", "(System.Action<TOptions,TDep>)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.Options", "OptionsBuilder<TOptions>", True, "Validate", "(System.Func<TOptions,System.Boolean>)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.Options", "OptionsBuilder<TOptions>", True, "Validate", "(System.Func<TOptions,System.Boolean>,System.String)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.Options", "OptionsBuilder<TOptions>", True, "Validate<TDep1,TDep2,TDep3,TDep4,TDep5>", "(System.Func<TOptions,TDep1,TDep2,TDep3,TDep4,TDep5,System.Boolean>)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.Options", "OptionsBuilder<TOptions>", True, "Validate<TDep1,TDep2,TDep3,TDep4,TDep5>", "(System.Func<TOptions,TDep1,TDep2,TDep3,TDep4,TDep5,System.Boolean>,System.String)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.Options", "OptionsBuilder<TOptions>", True, "Validate<TDep1,TDep2,TDep3,TDep4>", "(System.Func<TOptions,TDep1,TDep2,TDep3,TDep4,System.Boolean>)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.Options", "OptionsBuilder<TOptions>", True, "Validate<TDep1,TDep2,TDep3,TDep4>", "(System.Func<TOptions,TDep1,TDep2,TDep3,TDep4,System.Boolean>,System.String)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.Options", "OptionsBuilder<TOptions>", True, "Validate<TDep1,TDep2,TDep3>", "(System.Func<TOptions,TDep1,TDep2,TDep3,System.Boolean>)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.Options", "OptionsBuilder<TOptions>", True, "Validate<TDep1,TDep2,TDep3>", "(System.Func<TOptions,TDep1,TDep2,TDep3,System.Boolean>,System.String)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.Options", "OptionsBuilder<TOptions>", True, "Validate<TDep1,TDep2>", "(System.Func<TOptions,TDep1,TDep2,System.Boolean>)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.Options", "OptionsBuilder<TOptions>", True, "Validate<TDep1,TDep2>", "(System.Func<TOptions,TDep1,TDep2,System.Boolean>,System.String)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.Options", "OptionsBuilder<TOptions>", True, "Validate<TDep>", "(System.Func<TOptions,TDep,System.Boolean>)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.Options", "OptionsBuilder<TOptions>", True, "Validate<TDep>", "(System.Func<TOptions,TDep,System.Boolean>,System.String)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
       - ["Microsoft.Extensions.Options", "OptionsFactory<TOptions>", False, "OptionsFactory", "(System.Collections.Generic.IEnumerable<Microsoft.Extensions.Options.IConfigureOptions<TOptions>>,System.Collections.Generic.IEnumerable<Microsoft.Extensions.Options.IPostConfigureOptions<TOptions>>,System.Collections.Generic.IEnumerable<Microsoft.Extensions.Options.IValidateOptions<TOptions>>)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
       - ["Microsoft.Extensions.Options", "OptionsFactory<TOptions>", False, "OptionsFactory", "(System.Collections.Generic.IEnumerable<Microsoft.Extensions.Options.IConfigureOptions<TOptions>>,System.Collections.Generic.IEnumerable<Microsoft.Extensions.Options.IPostConfigureOptions<TOptions>>,System.Collections.Generic.IEnumerable<Microsoft.Extensions.Options.IValidateOptions<TOptions>>)", "", "Argument[1].Element", "Argument[this]", "taint", "df-generated"]
       - ["Microsoft.Extensions.Options", "OptionsFactory<TOptions>", False, "OptionsFactory", "(System.Collections.Generic.IEnumerable<Microsoft.Extensions.Options.IConfigureOptions<TOptions>>,System.Collections.Generic.IEnumerable<Microsoft.Extensions.Options.IPostConfigureOptions<TOptions>>,System.Collections.Generic.IEnumerable<Microsoft.Extensions.Options.IValidateOptions<TOptions>>)", "", "Argument[2].Element", "Argument[this]", "taint", "df-generated"]
       - ["Microsoft.Extensions.Options", "OptionsManager<TOptions>", False, "OptionsManager", "(Microsoft.Extensions.Options.IOptionsFactory<TOptions>)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["Microsoft.Extensions.Options", "OptionsMonitor<TOptions>", False, "OptionsMonitor", "(Microsoft.Extensions.Options.IOptionsFactory<TOptions>,System.Collections.Generic.IEnumerable<Microsoft.Extensions.Options.IOptionsChangeTokenSource<TOptions>>,Microsoft.Extensions.Options.IOptionsMonitorCache<TOptions>)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["Microsoft.Extensions.Options", "OptionsMonitor<TOptions>", False, "OptionsMonitor", "(Microsoft.Extensions.Options.IOptionsFactory<TOptions>,System.Collections.Generic.IEnumerable<Microsoft.Extensions.Options.IOptionsChangeTokenSource<TOptions>>,Microsoft.Extensions.Options.IOptionsMonitorCache<TOptions>)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
+      - ["Microsoft.Extensions.Options", "OptionsValidationException", True, "get_Message", "()", "", "Argument[this].Property[Microsoft.Extensions.Options.OptionsValidationException.Failures].Element", "ReturnValue", "taint", "dfc-generated"]
+      - ["Microsoft.Extensions.Options", "PostConfigureOptions<TOptions,TDep1,TDep2,TDep3,TDep4,TDep5>", False, "PostConfigure", "(TOptions)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["Microsoft.Extensions.Options", "PostConfigureOptions<TOptions,TDep1,TDep2,TDep3,TDep4,TDep5>", True, "PostConfigure", "(System.String,TOptions)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["Microsoft.Extensions.Options", "PostConfigureOptions<TOptions,TDep1,TDep2,TDep3,TDep4>", False, "PostConfigure", "(TOptions)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["Microsoft.Extensions.Options", "PostConfigureOptions<TOptions,TDep1,TDep2,TDep3,TDep4>", True, "PostConfigure", "(System.String,TOptions)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["Microsoft.Extensions.Options", "PostConfigureOptions<TOptions,TDep1,TDep2,TDep3>", False, "PostConfigure", "(TOptions)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["Microsoft.Extensions.Options", "PostConfigureOptions<TOptions,TDep1,TDep2,TDep3>", True, "PostConfigure", "(System.String,TOptions)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["Microsoft.Extensions.Options", "PostConfigureOptions<TOptions,TDep1,TDep2>", False, "PostConfigure", "(TOptions)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["Microsoft.Extensions.Options", "PostConfigureOptions<TOptions,TDep1,TDep2>", True, "PostConfigure", "(System.String,TOptions)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["Microsoft.Extensions.Options", "PostConfigureOptions<TOptions,TDep>", False, "PostConfigure", "(TOptions)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["Microsoft.Extensions.Options", "PostConfigureOptions<TOptions,TDep>", True, "PostConfigure", "(System.String,TOptions)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["Microsoft.Extensions.Options", "PostConfigureOptions<TOptions>", True, "PostConfigure", "(System.String,TOptions)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["Microsoft.Extensions.Options", "ValidateOptions<TOptions,TDep1,TDep2,TDep3,TDep4,TDep5>", False, "Validate", "(System.String,TOptions)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["Microsoft.Extensions.Options", "ValidateOptions<TOptions,TDep1,TDep2,TDep3,TDep4>", False, "Validate", "(System.String,TOptions)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["Microsoft.Extensions.Options", "ValidateOptions<TOptions,TDep1,TDep2,TDep3>", False, "Validate", "(System.String,TOptions)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["Microsoft.Extensions.Options", "ValidateOptions<TOptions,TDep1,TDep2>", False, "Validate", "(System.String,TOptions)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["Microsoft.Extensions.Options", "ValidateOptions<TOptions,TDep>", False, "Validate", "(System.String,TOptions)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["Microsoft.Extensions.Options", "ValidateOptions<TOptions>", False, "Validate", "(System.String,TOptions)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
       - ["Microsoft.Extensions.Options", "ValidateOptionsResultBuilder", False, "AddError", "(System.String,System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["Microsoft.Extensions.Options", "ValidateOptionsResultBuilder", False, "AddError", "(System.String,System.String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
       - ["Microsoft.Extensions.Options", "ValidateOptionsResultBuilder", False, "AddResult", "(Microsoft.Extensions.Options.ValidateOptionsResult)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
@@ -24,8 +79,7 @@ extensions:
       - ["Microsoft.Extensions.Options", "ConfigurationChangeTokenSource<TOptions>", "ConfigurationChangeTokenSource", "(Microsoft.Extensions.Configuration.IConfiguration)", "summary", "df-generated"]
       - ["Microsoft.Extensions.Options", "ConfigurationChangeTokenSource<TOptions>", "get_Name", "()", "summary", "df-generated"]
       - ["Microsoft.Extensions.Options", "ConfigureFromConfigurationOptions<TOptions>", "ConfigureFromConfigurationOptions", "(Microsoft.Extensions.Configuration.IConfiguration)", "summary", "df-generated"]
-      - ["Microsoft.Extensions.Options", "ConfigureNamedOptions<TOptions,TDep1,TDep2,TDep3,TDep4,TDep5>", "Configure", "(System.String,TOptions)", "summary", "df-generated"]
-      - ["Microsoft.Extensions.Options", "ConfigureNamedOptions<TOptions,TDep1,TDep2,TDep3,TDep4,TDep5>", "Configure", "(TOptions)", "summary", "df-generated"]
+      - ["Microsoft.Extensions.Options", "ConfigureNamedOptions<TOptions,TDep1,TDep2,TDep3,TDep4,TDep5>", "ConfigureNamedOptions", "(System.String,TDep1,TDep2,TDep3,TDep4,TDep5,System.Action<TOptions,TDep1,TDep2,TDep3,TDep4,TDep5>)", "summary", "df-generated"]
       - ["Microsoft.Extensions.Options", "ConfigureNamedOptions<TOptions,TDep1,TDep2,TDep3,TDep4,TDep5>", "get_Action", "()", "summary", "df-generated"]
       - ["Microsoft.Extensions.Options", "ConfigureNamedOptions<TOptions,TDep1,TDep2,TDep3,TDep4,TDep5>", "get_Dependency1", "()", "summary", "df-generated"]
       - ["Microsoft.Extensions.Options", "ConfigureNamedOptions<TOptions,TDep1,TDep2,TDep3,TDep4,TDep5>", "get_Dependency2", "()", "summary", "df-generated"]
@@ -33,37 +87,32 @@ extensions:
       - ["Microsoft.Extensions.Options", "ConfigureNamedOptions<TOptions,TDep1,TDep2,TDep3,TDep4,TDep5>", "get_Dependency4", "()", "summary", "df-generated"]
       - ["Microsoft.Extensions.Options", "ConfigureNamedOptions<TOptions,TDep1,TDep2,TDep3,TDep4,TDep5>", "get_Dependency5", "()", "summary", "df-generated"]
       - ["Microsoft.Extensions.Options", "ConfigureNamedOptions<TOptions,TDep1,TDep2,TDep3,TDep4,TDep5>", "get_Name", "()", "summary", "df-generated"]
-      - ["Microsoft.Extensions.Options", "ConfigureNamedOptions<TOptions,TDep1,TDep2,TDep3,TDep4>", "Configure", "(System.String,TOptions)", "summary", "df-generated"]
-      - ["Microsoft.Extensions.Options", "ConfigureNamedOptions<TOptions,TDep1,TDep2,TDep3,TDep4>", "Configure", "(TOptions)", "summary", "df-generated"]
+      - ["Microsoft.Extensions.Options", "ConfigureNamedOptions<TOptions,TDep1,TDep2,TDep3,TDep4>", "ConfigureNamedOptions", "(System.String,TDep1,TDep2,TDep3,TDep4,System.Action<TOptions,TDep1,TDep2,TDep3,TDep4>)", "summary", "df-generated"]
       - ["Microsoft.Extensions.Options", "ConfigureNamedOptions<TOptions,TDep1,TDep2,TDep3,TDep4>", "get_Action", "()", "summary", "df-generated"]
       - ["Microsoft.Extensions.Options", "ConfigureNamedOptions<TOptions,TDep1,TDep2,TDep3,TDep4>", "get_Dependency1", "()", "summary", "df-generated"]
       - ["Microsoft.Extensions.Options", "ConfigureNamedOptions<TOptions,TDep1,TDep2,TDep3,TDep4>", "get_Dependency2", "()", "summary", "df-generated"]
       - ["Microsoft.Extensions.Options", "ConfigureNamedOptions<TOptions,TDep1,TDep2,TDep3,TDep4>", "get_Dependency3", "()", "summary", "df-generated"]
       - ["Microsoft.Extensions.Options", "ConfigureNamedOptions<TOptions,TDep1,TDep2,TDep3,TDep4>", "get_Dependency4", "()", "summary", "df-generated"]
       - ["Microsoft.Extensions.Options", "ConfigureNamedOptions<TOptions,TDep1,TDep2,TDep3,TDep4>", "get_Name", "()", "summary", "df-generated"]
-      - ["Microsoft.Extensions.Options", "ConfigureNamedOptions<TOptions,TDep1,TDep2,TDep3>", "Configure", "(System.String,TOptions)", "summary", "df-generated"]
-      - ["Microsoft.Extensions.Options", "ConfigureNamedOptions<TOptions,TDep1,TDep2,TDep3>", "Configure", "(TOptions)", "summary", "df-generated"]
+      - ["Microsoft.Extensions.Options", "ConfigureNamedOptions<TOptions,TDep1,TDep2,TDep3>", "ConfigureNamedOptions", "(System.String,TDep1,TDep2,TDep3,System.Action<TOptions,TDep1,TDep2,TDep3>)", "summary", "df-generated"]
       - ["Microsoft.Extensions.Options", "ConfigureNamedOptions<TOptions,TDep1,TDep2,TDep3>", "get_Action", "()", "summary", "df-generated"]
       - ["Microsoft.Extensions.Options", "ConfigureNamedOptions<TOptions,TDep1,TDep2,TDep3>", "get_Dependency1", "()", "summary", "df-generated"]
       - ["Microsoft.Extensions.Options", "ConfigureNamedOptions<TOptions,TDep1,TDep2,TDep3>", "get_Dependency2", "()", "summary", "df-generated"]
       - ["Microsoft.Extensions.Options", "ConfigureNamedOptions<TOptions,TDep1,TDep2,TDep3>", "get_Dependency3", "()", "summary", "df-generated"]
       - ["Microsoft.Extensions.Options", "ConfigureNamedOptions<TOptions,TDep1,TDep2,TDep3>", "get_Name", "()", "summary", "df-generated"]
-      - ["Microsoft.Extensions.Options", "ConfigureNamedOptions<TOptions,TDep1,TDep2>", "Configure", "(System.String,TOptions)", "summary", "df-generated"]
-      - ["Microsoft.Extensions.Options", "ConfigureNamedOptions<TOptions,TDep1,TDep2>", "Configure", "(TOptions)", "summary", "df-generated"]
+      - ["Microsoft.Extensions.Options", "ConfigureNamedOptions<TOptions,TDep1,TDep2>", "ConfigureNamedOptions", "(System.String,TDep1,TDep2,System.Action<TOptions,TDep1,TDep2>)", "summary", "df-generated"]
       - ["Microsoft.Extensions.Options", "ConfigureNamedOptions<TOptions,TDep1,TDep2>", "get_Action", "()", "summary", "df-generated"]
       - ["Microsoft.Extensions.Options", "ConfigureNamedOptions<TOptions,TDep1,TDep2>", "get_Dependency1", "()", "summary", "df-generated"]
       - ["Microsoft.Extensions.Options", "ConfigureNamedOptions<TOptions,TDep1,TDep2>", "get_Dependency2", "()", "summary", "df-generated"]
       - ["Microsoft.Extensions.Options", "ConfigureNamedOptions<TOptions,TDep1,TDep2>", "get_Name", "()", "summary", "df-generated"]
-      - ["Microsoft.Extensions.Options", "ConfigureNamedOptions<TOptions,TDep>", "Configure", "(System.String,TOptions)", "summary", "df-generated"]
-      - ["Microsoft.Extensions.Options", "ConfigureNamedOptions<TOptions,TDep>", "Configure", "(TOptions)", "summary", "df-generated"]
+      - ["Microsoft.Extensions.Options", "ConfigureNamedOptions<TOptions,TDep>", "ConfigureNamedOptions", "(System.String,TDep,System.Action<TOptions,TDep>)", "summary", "df-generated"]
       - ["Microsoft.Extensions.Options", "ConfigureNamedOptions<TOptions,TDep>", "get_Action", "()", "summary", "df-generated"]
       - ["Microsoft.Extensions.Options", "ConfigureNamedOptions<TOptions,TDep>", "get_Dependency", "()", "summary", "df-generated"]
       - ["Microsoft.Extensions.Options", "ConfigureNamedOptions<TOptions,TDep>", "get_Name", "()", "summary", "df-generated"]
-      - ["Microsoft.Extensions.Options", "ConfigureNamedOptions<TOptions>", "Configure", "(System.String,TOptions)", "summary", "df-generated"]
-      - ["Microsoft.Extensions.Options", "ConfigureNamedOptions<TOptions>", "Configure", "(TOptions)", "summary", "df-generated"]
+      - ["Microsoft.Extensions.Options", "ConfigureNamedOptions<TOptions>", "ConfigureNamedOptions", "(System.String,System.Action<TOptions>)", "summary", "df-generated"]
       - ["Microsoft.Extensions.Options", "ConfigureNamedOptions<TOptions>", "get_Action", "()", "summary", "df-generated"]
       - ["Microsoft.Extensions.Options", "ConfigureNamedOptions<TOptions>", "get_Name", "()", "summary", "df-generated"]
-      - ["Microsoft.Extensions.Options", "ConfigureOptions<TOptions>", "Configure", "(TOptions)", "summary", "df-generated"]
+      - ["Microsoft.Extensions.Options", "ConfigureOptions<TOptions>", "ConfigureOptions", "(System.Action<TOptions>)", "summary", "df-generated"]
       - ["Microsoft.Extensions.Options", "ConfigureOptions<TOptions>", "get_Action", "()", "summary", "df-generated"]
       - ["Microsoft.Extensions.Options", "DataAnnotationValidateOptions<TOptions>", "DataAnnotationValidateOptions", "(System.String)", "summary", "df-generated"]
       - ["Microsoft.Extensions.Options", "DataAnnotationValidateOptions<TOptions>", "Validate", "(System.String,TOptions)", "summary", "df-generated"]
@@ -75,8 +124,10 @@ extensions:
       - ["Microsoft.Extensions.Options", "IOptionsChangeTokenSource<TOptions>", "get_Name", "()", "summary", "df-generated"]
       - ["Microsoft.Extensions.Options", "IOptionsFactory<TOptions>", "Create", "(System.String)", "summary", "df-generated"]
       - ["Microsoft.Extensions.Options", "IOptionsMonitor<TOptions>", "Get", "(System.String)", "summary", "df-generated"]
+      - ["Microsoft.Extensions.Options", "IOptionsMonitor<TOptions>", "OnChange", "(System.Action<TOptions,System.String>)", "summary", "df-generated"]
       - ["Microsoft.Extensions.Options", "IOptionsMonitor<TOptions>", "get_CurrentValue", "()", "summary", "df-generated"]
       - ["Microsoft.Extensions.Options", "IOptionsMonitorCache<TOptions>", "Clear", "()", "summary", "df-generated"]
+      - ["Microsoft.Extensions.Options", "IOptionsMonitorCache<TOptions>", "GetOrAdd", "(System.String,System.Func<TOptions>)", "summary", "df-generated"]
       - ["Microsoft.Extensions.Options", "IOptionsMonitorCache<TOptions>", "TryAdd", "(System.String,TOptions)", "summary", "df-generated"]
       - ["Microsoft.Extensions.Options", "IOptionsMonitorCache<TOptions>", "TryRemove", "(System.String)", "summary", "df-generated"]
       - ["Microsoft.Extensions.Options", "IOptionsSnapshot<TOptions>", "Get", "(System.String)", "summary", "df-generated"]
@@ -84,11 +135,13 @@ extensions:
       - ["Microsoft.Extensions.Options", "IStartupValidator", "Validate", "()", "summary", "df-generated"]
       - ["Microsoft.Extensions.Options", "IValidateOptions<TOptions>", "Validate", "(System.String,TOptions)", "summary", "df-generated"]
       - ["Microsoft.Extensions.Options", "NamedConfigureFromConfigurationOptions<TOptions>", "NamedConfigureFromConfigurationOptions", "(System.String,Microsoft.Extensions.Configuration.IConfiguration)", "summary", "df-generated"]
+      - ["Microsoft.Extensions.Options", "NamedConfigureFromConfigurationOptions<TOptions>", "NamedConfigureFromConfigurationOptions", "(System.String,Microsoft.Extensions.Configuration.IConfiguration,System.Action<Microsoft.Extensions.Configuration.BinderOptions>)", "summary", "df-generated"]
       - ["Microsoft.Extensions.Options", "Options", "Create<TOptions>", "(TOptions)", "summary", "df-generated"]
       - ["Microsoft.Extensions.Options", "OptionsBuilder<TOptions>", "OptionsBuilder", "(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.String)", "summary", "df-generated"]
       - ["Microsoft.Extensions.Options", "OptionsBuilder<TOptions>", "get_Name", "()", "summary", "df-generated"]
       - ["Microsoft.Extensions.Options", "OptionsBuilder<TOptions>", "get_Services", "()", "summary", "df-generated"]
       - ["Microsoft.Extensions.Options", "OptionsCache<TOptions>", "Clear", "()", "summary", "df-generated"]
+      - ["Microsoft.Extensions.Options", "OptionsCache<TOptions>", "GetOrAdd", "(System.String,System.Func<TOptions>)", "summary", "df-generated"]
       - ["Microsoft.Extensions.Options", "OptionsCache<TOptions>", "TryAdd", "(System.String,TOptions)", "summary", "df-generated"]
       - ["Microsoft.Extensions.Options", "OptionsCache<TOptions>", "TryRemove", "(System.String)", "summary", "df-generated"]
       - ["Microsoft.Extensions.Options", "OptionsFactory<TOptions>", "Create", "(System.String)", "summary", "df-generated"]
@@ -98,15 +151,16 @@ extensions:
       - ["Microsoft.Extensions.Options", "OptionsManager<TOptions>", "get_Value", "()", "summary", "df-generated"]
       - ["Microsoft.Extensions.Options", "OptionsMonitor<TOptions>", "Dispose", "()", "summary", "df-generated"]
       - ["Microsoft.Extensions.Options", "OptionsMonitor<TOptions>", "Get", "(System.String)", "summary", "df-generated"]
+      - ["Microsoft.Extensions.Options", "OptionsMonitor<TOptions>", "OnChange", "(System.Action<TOptions,System.String>)", "summary", "df-generated"]
       - ["Microsoft.Extensions.Options", "OptionsMonitor<TOptions>", "get_CurrentValue", "()", "summary", "df-generated"]
+      - ["Microsoft.Extensions.Options", "OptionsMonitorExtensions", "OnChange<TOptions>", "(Microsoft.Extensions.Options.IOptionsMonitor<TOptions>,System.Action<TOptions>)", "summary", "df-generated"]
       - ["Microsoft.Extensions.Options", "OptionsValidationException", "OptionsValidationException", "(System.String,System.Type,System.Collections.Generic.IEnumerable<System.String>)", "summary", "df-generated"]
       - ["Microsoft.Extensions.Options", "OptionsValidationException", "get_Failures", "()", "summary", "df-generated"]
       - ["Microsoft.Extensions.Options", "OptionsValidationException", "get_OptionsName", "()", "summary", "df-generated"]
       - ["Microsoft.Extensions.Options", "OptionsValidationException", "get_OptionsType", "()", "summary", "df-generated"]
       - ["Microsoft.Extensions.Options", "OptionsWrapper<TOptions>", "OptionsWrapper", "(TOptions)", "summary", "df-generated"]
       - ["Microsoft.Extensions.Options", "OptionsWrapper<TOptions>", "get_Value", "()", "summary", "df-generated"]
-      - ["Microsoft.Extensions.Options", "PostConfigureOptions<TOptions,TDep1,TDep2,TDep3,TDep4,TDep5>", "PostConfigure", "(System.String,TOptions)", "summary", "df-generated"]
-      - ["Microsoft.Extensions.Options", "PostConfigureOptions<TOptions,TDep1,TDep2,TDep3,TDep4,TDep5>", "PostConfigure", "(TOptions)", "summary", "df-generated"]
+      - ["Microsoft.Extensions.Options", "PostConfigureOptions<TOptions,TDep1,TDep2,TDep3,TDep4,TDep5>", "PostConfigureOptions", "(System.String,TDep1,TDep2,TDep3,TDep4,TDep5,System.Action<TOptions,TDep1,TDep2,TDep3,TDep4,TDep5>)", "summary", "df-generated"]
       - ["Microsoft.Extensions.Options", "PostConfigureOptions<TOptions,TDep1,TDep2,TDep3,TDep4,TDep5>", "get_Action", "()", "summary", "df-generated"]
       - ["Microsoft.Extensions.Options", "PostConfigureOptions<TOptions,TDep1,TDep2,TDep3,TDep4,TDep5>", "get_Dependency1", "()", "summary", "df-generated"]
       - ["Microsoft.Extensions.Options", "PostConfigureOptions<TOptions,TDep1,TDep2,TDep3,TDep4,TDep5>", "get_Dependency2", "()", "summary", "df-generated"]
@@ -114,40 +168,36 @@ extensions:
       - ["Microsoft.Extensions.Options", "PostConfigureOptions<TOptions,TDep1,TDep2,TDep3,TDep4,TDep5>", "get_Dependency4", "()", "summary", "df-generated"]
       - ["Microsoft.Extensions.Options", "PostConfigureOptions<TOptions,TDep1,TDep2,TDep3,TDep4,TDep5>", "get_Dependency5", "()", "summary", "df-generated"]
       - ["Microsoft.Extensions.Options", "PostConfigureOptions<TOptions,TDep1,TDep2,TDep3,TDep4,TDep5>", "get_Name", "()", "summary", "df-generated"]
-      - ["Microsoft.Extensions.Options", "PostConfigureOptions<TOptions,TDep1,TDep2,TDep3,TDep4>", "PostConfigure", "(System.String,TOptions)", "summary", "df-generated"]
-      - ["Microsoft.Extensions.Options", "PostConfigureOptions<TOptions,TDep1,TDep2,TDep3,TDep4>", "PostConfigure", "(TOptions)", "summary", "df-generated"]
+      - ["Microsoft.Extensions.Options", "PostConfigureOptions<TOptions,TDep1,TDep2,TDep3,TDep4>", "PostConfigureOptions", "(System.String,TDep1,TDep2,TDep3,TDep4,System.Action<TOptions,TDep1,TDep2,TDep3,TDep4>)", "summary", "df-generated"]
       - ["Microsoft.Extensions.Options", "PostConfigureOptions<TOptions,TDep1,TDep2,TDep3,TDep4>", "get_Action", "()", "summary", "df-generated"]
       - ["Microsoft.Extensions.Options", "PostConfigureOptions<TOptions,TDep1,TDep2,TDep3,TDep4>", "get_Dependency1", "()", "summary", "df-generated"]
       - ["Microsoft.Extensions.Options", "PostConfigureOptions<TOptions,TDep1,TDep2,TDep3,TDep4>", "get_Dependency2", "()", "summary", "df-generated"]
       - ["Microsoft.Extensions.Options", "PostConfigureOptions<TOptions,TDep1,TDep2,TDep3,TDep4>", "get_Dependency3", "()", "summary", "df-generated"]
       - ["Microsoft.Extensions.Options", "PostConfigureOptions<TOptions,TDep1,TDep2,TDep3,TDep4>", "get_Dependency4", "()", "summary", "df-generated"]
       - ["Microsoft.Extensions.Options", "PostConfigureOptions<TOptions,TDep1,TDep2,TDep3,TDep4>", "get_Name", "()", "summary", "df-generated"]
-      - ["Microsoft.Extensions.Options", "PostConfigureOptions<TOptions,TDep1,TDep2,TDep3>", "PostConfigure", "(System.String,TOptions)", "summary", "df-generated"]
-      - ["Microsoft.Extensions.Options", "PostConfigureOptions<TOptions,TDep1,TDep2,TDep3>", "PostConfigure", "(TOptions)", "summary", "df-generated"]
+      - ["Microsoft.Extensions.Options", "PostConfigureOptions<TOptions,TDep1,TDep2,TDep3>", "PostConfigureOptions", "(System.String,TDep1,TDep2,TDep3,System.Action<TOptions,TDep1,TDep2,TDep3>)", "summary", "df-generated"]
       - ["Microsoft.Extensions.Options", "PostConfigureOptions<TOptions,TDep1,TDep2,TDep3>", "get_Action", "()", "summary", "df-generated"]
       - ["Microsoft.Extensions.Options", "PostConfigureOptions<TOptions,TDep1,TDep2,TDep3>", "get_Dependency1", "()", "summary", "df-generated"]
       - ["Microsoft.Extensions.Options", "PostConfigureOptions<TOptions,TDep1,TDep2,TDep3>", "get_Dependency2", "()", "summary", "df-generated"]
       - ["Microsoft.Extensions.Options", "PostConfigureOptions<TOptions,TDep1,TDep2,TDep3>", "get_Dependency3", "()", "summary", "df-generated"]
       - ["Microsoft.Extensions.Options", "PostConfigureOptions<TOptions,TDep1,TDep2,TDep3>", "get_Name", "()", "summary", "df-generated"]
-      - ["Microsoft.Extensions.Options", "PostConfigureOptions<TOptions,TDep1,TDep2>", "PostConfigure", "(System.String,TOptions)", "summary", "df-generated"]
-      - ["Microsoft.Extensions.Options", "PostConfigureOptions<TOptions,TDep1,TDep2>", "PostConfigure", "(TOptions)", "summary", "df-generated"]
+      - ["Microsoft.Extensions.Options", "PostConfigureOptions<TOptions,TDep1,TDep2>", "PostConfigureOptions", "(System.String,TDep1,TDep2,System.Action<TOptions,TDep1,TDep2>)", "summary", "df-generated"]
       - ["Microsoft.Extensions.Options", "PostConfigureOptions<TOptions,TDep1,TDep2>", "get_Action", "()", "summary", "df-generated"]
       - ["Microsoft.Extensions.Options", "PostConfigureOptions<TOptions,TDep1,TDep2>", "get_Dependency1", "()", "summary", "df-generated"]
       - ["Microsoft.Extensions.Options", "PostConfigureOptions<TOptions,TDep1,TDep2>", "get_Dependency2", "()", "summary", "df-generated"]
       - ["Microsoft.Extensions.Options", "PostConfigureOptions<TOptions,TDep1,TDep2>", "get_Name", "()", "summary", "df-generated"]
-      - ["Microsoft.Extensions.Options", "PostConfigureOptions<TOptions,TDep>", "PostConfigure", "(System.String,TOptions)", "summary", "df-generated"]
-      - ["Microsoft.Extensions.Options", "PostConfigureOptions<TOptions,TDep>", "PostConfigure", "(TOptions)", "summary", "df-generated"]
+      - ["Microsoft.Extensions.Options", "PostConfigureOptions<TOptions,TDep>", "PostConfigureOptions", "(System.String,TDep,System.Action<TOptions,TDep>)", "summary", "df-generated"]
       - ["Microsoft.Extensions.Options", "PostConfigureOptions<TOptions,TDep>", "get_Action", "()", "summary", "df-generated"]
       - ["Microsoft.Extensions.Options", "PostConfigureOptions<TOptions,TDep>", "get_Dependency", "()", "summary", "df-generated"]
       - ["Microsoft.Extensions.Options", "PostConfigureOptions<TOptions,TDep>", "get_Name", "()", "summary", "df-generated"]
-      - ["Microsoft.Extensions.Options", "PostConfigureOptions<TOptions>", "PostConfigure", "(System.String,TOptions)", "summary", "df-generated"]
+      - ["Microsoft.Extensions.Options", "PostConfigureOptions<TOptions>", "PostConfigureOptions", "(System.String,System.Action<TOptions>)", "summary", "df-generated"]
       - ["Microsoft.Extensions.Options", "PostConfigureOptions<TOptions>", "get_Action", "()", "summary", "df-generated"]
       - ["Microsoft.Extensions.Options", "PostConfigureOptions<TOptions>", "get_Name", "()", "summary", "df-generated"]
       - ["Microsoft.Extensions.Options", "ValidateEnumeratedItemsAttribute", "ValidateEnumeratedItemsAttribute", "(System.Type)", "summary", "df-generated"]
       - ["Microsoft.Extensions.Options", "ValidateEnumeratedItemsAttribute", "get_Validator", "()", "summary", "df-generated"]
       - ["Microsoft.Extensions.Options", "ValidateObjectMembersAttribute", "ValidateObjectMembersAttribute", "(System.Type)", "summary", "df-generated"]
       - ["Microsoft.Extensions.Options", "ValidateObjectMembersAttribute", "get_Validator", "()", "summary", "df-generated"]
-      - ["Microsoft.Extensions.Options", "ValidateOptions<TOptions,TDep1,TDep2,TDep3,TDep4,TDep5>", "Validate", "(System.String,TOptions)", "summary", "df-generated"]
+      - ["Microsoft.Extensions.Options", "ValidateOptions<TOptions,TDep1,TDep2,TDep3,TDep4,TDep5>", "ValidateOptions", "(System.String,TDep1,TDep2,TDep3,TDep4,TDep5,System.Func<TOptions,TDep1,TDep2,TDep3,TDep4,TDep5,System.Boolean>,System.String)", "summary", "df-generated"]
       - ["Microsoft.Extensions.Options", "ValidateOptions<TOptions,TDep1,TDep2,TDep3,TDep4,TDep5>", "get_Dependency1", "()", "summary", "df-generated"]
       - ["Microsoft.Extensions.Options", "ValidateOptions<TOptions,TDep1,TDep2,TDep3,TDep4,TDep5>", "get_Dependency2", "()", "summary", "df-generated"]
       - ["Microsoft.Extensions.Options", "ValidateOptions<TOptions,TDep1,TDep2,TDep3,TDep4,TDep5>", "get_Dependency3", "()", "summary", "df-generated"]
@@ -156,7 +206,7 @@ extensions:
       - ["Microsoft.Extensions.Options", "ValidateOptions<TOptions,TDep1,TDep2,TDep3,TDep4,TDep5>", "get_FailureMessage", "()", "summary", "df-generated"]
       - ["Microsoft.Extensions.Options", "ValidateOptions<TOptions,TDep1,TDep2,TDep3,TDep4,TDep5>", "get_Name", "()", "summary", "df-generated"]
       - ["Microsoft.Extensions.Options", "ValidateOptions<TOptions,TDep1,TDep2,TDep3,TDep4,TDep5>", "get_Validation", "()", "summary", "df-generated"]
-      - ["Microsoft.Extensions.Options", "ValidateOptions<TOptions,TDep1,TDep2,TDep3,TDep4>", "Validate", "(System.String,TOptions)", "summary", "df-generated"]
+      - ["Microsoft.Extensions.Options", "ValidateOptions<TOptions,TDep1,TDep2,TDep3,TDep4>", "ValidateOptions", "(System.String,TDep1,TDep2,TDep3,TDep4,System.Func<TOptions,TDep1,TDep2,TDep3,TDep4,System.Boolean>,System.String)", "summary", "df-generated"]
       - ["Microsoft.Extensions.Options", "ValidateOptions<TOptions,TDep1,TDep2,TDep3,TDep4>", "get_Dependency1", "()", "summary", "df-generated"]
       - ["Microsoft.Extensions.Options", "ValidateOptions<TOptions,TDep1,TDep2,TDep3,TDep4>", "get_Dependency2", "()", "summary", "df-generated"]
       - ["Microsoft.Extensions.Options", "ValidateOptions<TOptions,TDep1,TDep2,TDep3,TDep4>", "get_Dependency3", "()", "summary", "df-generated"]
@@ -164,25 +214,25 @@ extensions:
       - ["Microsoft.Extensions.Options", "ValidateOptions<TOptions,TDep1,TDep2,TDep3,TDep4>", "get_FailureMessage", "()", "summary", "df-generated"]
       - ["Microsoft.Extensions.Options", "ValidateOptions<TOptions,TDep1,TDep2,TDep3,TDep4>", "get_Name", "()", "summary", "df-generated"]
       - ["Microsoft.Extensions.Options", "ValidateOptions<TOptions,TDep1,TDep2,TDep3,TDep4>", "get_Validation", "()", "summary", "df-generated"]
-      - ["Microsoft.Extensions.Options", "ValidateOptions<TOptions,TDep1,TDep2,TDep3>", "Validate", "(System.String,TOptions)", "summary", "df-generated"]
+      - ["Microsoft.Extensions.Options", "ValidateOptions<TOptions,TDep1,TDep2,TDep3>", "ValidateOptions", "(System.String,TDep1,TDep2,TDep3,System.Func<TOptions,TDep1,TDep2,TDep3,System.Boolean>,System.String)", "summary", "df-generated"]
       - ["Microsoft.Extensions.Options", "ValidateOptions<TOptions,TDep1,TDep2,TDep3>", "get_Dependency1", "()", "summary", "df-generated"]
       - ["Microsoft.Extensions.Options", "ValidateOptions<TOptions,TDep1,TDep2,TDep3>", "get_Dependency2", "()", "summary", "df-generated"]
       - ["Microsoft.Extensions.Options", "ValidateOptions<TOptions,TDep1,TDep2,TDep3>", "get_Dependency3", "()", "summary", "df-generated"]
       - ["Microsoft.Extensions.Options", "ValidateOptions<TOptions,TDep1,TDep2,TDep3>", "get_FailureMessage", "()", "summary", "df-generated"]
       - ["Microsoft.Extensions.Options", "ValidateOptions<TOptions,TDep1,TDep2,TDep3>", "get_Name", "()", "summary", "df-generated"]
       - ["Microsoft.Extensions.Options", "ValidateOptions<TOptions,TDep1,TDep2,TDep3>", "get_Validation", "()", "summary", "df-generated"]
-      - ["Microsoft.Extensions.Options", "ValidateOptions<TOptions,TDep1,TDep2>", "Validate", "(System.String,TOptions)", "summary", "df-generated"]
+      - ["Microsoft.Extensions.Options", "ValidateOptions<TOptions,TDep1,TDep2>", "ValidateOptions", "(System.String,TDep1,TDep2,System.Func<TOptions,TDep1,TDep2,System.Boolean>,System.String)", "summary", "df-generated"]
       - ["Microsoft.Extensions.Options", "ValidateOptions<TOptions,TDep1,TDep2>", "get_Dependency1", "()", "summary", "df-generated"]
       - ["Microsoft.Extensions.Options", "ValidateOptions<TOptions,TDep1,TDep2>", "get_Dependency2", "()", "summary", "df-generated"]
       - ["Microsoft.Extensions.Options", "ValidateOptions<TOptions,TDep1,TDep2>", "get_FailureMessage", "()", "summary", "df-generated"]
       - ["Microsoft.Extensions.Options", "ValidateOptions<TOptions,TDep1,TDep2>", "get_Name", "()", "summary", "df-generated"]
       - ["Microsoft.Extensions.Options", "ValidateOptions<TOptions,TDep1,TDep2>", "get_Validation", "()", "summary", "df-generated"]
-      - ["Microsoft.Extensions.Options", "ValidateOptions<TOptions,TDep>", "Validate", "(System.String,TOptions)", "summary", "df-generated"]
+      - ["Microsoft.Extensions.Options", "ValidateOptions<TOptions,TDep>", "ValidateOptions", "(System.String,TDep,System.Func<TOptions,TDep,System.Boolean>,System.String)", "summary", "df-generated"]
       - ["Microsoft.Extensions.Options", "ValidateOptions<TOptions,TDep>", "get_Dependency", "()", "summary", "df-generated"]
       - ["Microsoft.Extensions.Options", "ValidateOptions<TOptions,TDep>", "get_FailureMessage", "()", "summary", "df-generated"]
       - ["Microsoft.Extensions.Options", "ValidateOptions<TOptions,TDep>", "get_Name", "()", "summary", "df-generated"]
       - ["Microsoft.Extensions.Options", "ValidateOptions<TOptions,TDep>", "get_Validation", "()", "summary", "df-generated"]
-      - ["Microsoft.Extensions.Options", "ValidateOptions<TOptions>", "Validate", "(System.String,TOptions)", "summary", "df-generated"]
+      - ["Microsoft.Extensions.Options", "ValidateOptions<TOptions>", "ValidateOptions", "(System.String,System.Func<TOptions,System.Boolean>,System.String)", "summary", "df-generated"]
       - ["Microsoft.Extensions.Options", "ValidateOptions<TOptions>", "get_FailureMessage", "()", "summary", "df-generated"]
       - ["Microsoft.Extensions.Options", "ValidateOptions<TOptions>", "get_Name", "()", "summary", "df-generated"]
       - ["Microsoft.Extensions.Options", "ValidateOptions<TOptions>", "get_Validation", "()", "summary", "df-generated"]
diff --git a/csharp/ql/lib/ext/generated/Microsoft.Extensions.Primitives.model.yml b/csharp/ql/lib/ext/generated/Microsoft.Extensions.Primitives.model.yml
index effaccc3822..0938e03690c 100644
--- a/csharp/ql/lib/ext/generated/Microsoft.Extensions.Primitives.model.yml
+++ b/csharp/ql/lib/ext/generated/Microsoft.Extensions.Primitives.model.yml
@@ -5,28 +5,31 @@ extensions:
       extensible: summaryModel
     data:
       - ["Microsoft.Extensions.Primitives", "CancellationChangeToken", False, "CancellationChangeToken", "(System.Threading.CancellationToken)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["Microsoft.Extensions.Primitives", "Extensions", False, "Append", "(System.Text.StringBuilder,Microsoft.Extensions.Primitives.StringSegment)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Extensions.Primitives", "Extensions", False, "Append", "(System.Text.StringBuilder,Microsoft.Extensions.Primitives.StringSegment)", "", "Argument[1]", "Argument[0]", "taint", "df-generated"]
-      - ["Microsoft.Extensions.Primitives", "Extensions", False, "Append", "(System.Text.StringBuilder,Microsoft.Extensions.Primitives.StringSegment)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["Microsoft.Extensions.Primitives", "Extensions", False, "Append", "(System.Text.StringBuilder,Microsoft.Extensions.Primitives.StringSegment)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.Primitives", "Extensions", False, "Append", "(System.Text.StringBuilder,Microsoft.Extensions.Primitives.StringSegment)", "", "Argument[1].Property[Microsoft.Extensions.Primitives.StringSegment.Buffer]", "Argument[0]", "taint", "dfc-generated"]
+      - ["Microsoft.Extensions.Primitives", "Extensions", False, "Append", "(System.Text.StringBuilder,Microsoft.Extensions.Primitives.StringSegment)", "", "Argument[1].Property[Microsoft.Extensions.Primitives.StringSegment.Buffer]", "ReturnValue", "taint", "dfc-generated"]
+      - ["Microsoft.Extensions.Primitives", "IChangeToken", True, "RegisterChangeCallback", "(System.Action<System.Object>,System.Object)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
       - ["Microsoft.Extensions.Primitives", "InplaceStringBuilder", False, "ToString", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Extensions.Primitives", "StringSegment", False, "AsMemory", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Extensions.Primitives", "StringSegment", False, "Split", "(System.Char[])", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Extensions.Primitives", "StringSegment", False, "Split", "(System.Char[])", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Extensions.Primitives", "StringSegment", False, "Substring", "(System.Int32)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Extensions.Primitives", "StringSegment", False, "Substring", "(System.Int32,System.Int32)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Extensions.Primitives", "StringSegment", False, "ToString", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Extensions.Primitives", "StringSegment", False, "get_Value", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Extensions.Primitives", "StringTokenizer+Enumerator", False, "Enumerator", "(Microsoft.Extensions.Primitives.StringTokenizer)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
+      - ["Microsoft.Extensions.Primitives", "StringSegment", False, "Substring", "(System.Int32)", "", "Argument[this].Property[Microsoft.Extensions.Primitives.StringSegment.Buffer]", "ReturnValue", "taint", "dfc-generated"]
+      - ["Microsoft.Extensions.Primitives", "StringSegment", False, "Substring", "(System.Int32,System.Int32)", "", "Argument[this].Property[Microsoft.Extensions.Primitives.StringSegment.Buffer]", "ReturnValue", "taint", "dfc-generated"]
+      - ["Microsoft.Extensions.Primitives", "StringSegment", False, "ToString", "()", "", "Argument[this].Property[Microsoft.Extensions.Primitives.StringSegment.Buffer]", "ReturnValue", "taint", "dfc-generated"]
+      - ["Microsoft.Extensions.Primitives", "StringSegment", False, "ToString", "()", "", "Argument[this].Property[Microsoft.Extensions.Primitives.StringSegment.Value]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.Primitives", "StringSegment", False, "get_Value", "()", "", "Argument[this].Property[Microsoft.Extensions.Primitives.StringSegment.Buffer]", "ReturnValue", "taint", "dfc-generated"]
+      - ["Microsoft.Extensions.Primitives", "StringTokenizer+Enumerator", False, "Enumerator", "(Microsoft.Extensions.Primitives.StringTokenizer)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Extensions.Primitives", "StringTokenizer+Enumerator", False, "get_Current", "()", "", "Argument[this].Property[Microsoft.Extensions.Primitives.StringTokenizer+Enumerator.Current]", "ReturnValue", "value", "dfc-generated"]
       - ["Microsoft.Extensions.Primitives", "StringTokenizer", False, "GetEnumerator", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["Microsoft.Extensions.Primitives", "StringTokenizer", False, "StringTokenizer", "(Microsoft.Extensions.Primitives.StringSegment,System.Char[])", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["Microsoft.Extensions.Primitives", "StringTokenizer", False, "StringTokenizer", "(Microsoft.Extensions.Primitives.StringSegment,System.Char[])", "", "Argument[1].Element", "Argument[this]", "taint", "df-generated"]
       - ["Microsoft.Extensions.Primitives", "StringTokenizer", False, "StringTokenizer", "(System.String,System.Char[])", "", "Argument[1].Element", "Argument[this]", "taint", "df-generated"]
+      - ["Microsoft.Extensions.Primitives", "StringValues+Enumerator", False, "Enumerator", "(Microsoft.Extensions.Primitives.StringValues)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
       - ["Microsoft.Extensions.Primitives", "StringValues+Enumerator", False, "get_Current", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
   - addsTo:
       pack: codeql/csharp-all
       extensible: neutralModel
     data:
       - ["Microsoft.Extensions.Primitives", "CancellationChangeToken", "get_HasChanged", "()", "summary", "df-generated"]
+      - ["Microsoft.Extensions.Primitives", "ChangeToken", "OnChange", "(System.Func<Microsoft.Extensions.Primitives.IChangeToken>,System.Action)", "summary", "df-generated"]
+      - ["Microsoft.Extensions.Primitives", "ChangeToken", "OnChange<TState>", "(System.Func<Microsoft.Extensions.Primitives.IChangeToken>,System.Action<TState>,TState)", "summary", "df-generated"]
       - ["Microsoft.Extensions.Primitives", "CompositeChangeToken", "CompositeChangeToken", "(System.Collections.Generic.IReadOnlyList<Microsoft.Extensions.Primitives.IChangeToken>)", "summary", "df-generated"]
       - ["Microsoft.Extensions.Primitives", "CompositeChangeToken", "get_ActiveChangeCallbacks", "()", "summary", "df-generated"]
       - ["Microsoft.Extensions.Primitives", "CompositeChangeToken", "get_ChangeTokens", "()", "summary", "df-generated"]
@@ -38,6 +41,7 @@ extensions:
       - ["Microsoft.Extensions.Primitives", "InplaceStringBuilder", "Append", "(System.String)", "summary", "df-generated"]
       - ["Microsoft.Extensions.Primitives", "InplaceStringBuilder", "Append", "(System.String,System.Int32,System.Int32)", "summary", "df-generated"]
       - ["Microsoft.Extensions.Primitives", "InplaceStringBuilder", "InplaceStringBuilder", "(System.Int32)", "summary", "df-generated"]
+      - ["Microsoft.Extensions.Primitives", "StringSegment", "AsMemory", "()", "summary", "df-generated"]
       - ["Microsoft.Extensions.Primitives", "StringSegment", "AsSpan", "()", "summary", "df-generated"]
       - ["Microsoft.Extensions.Primitives", "StringSegment", "AsSpan", "(System.Int32)", "summary", "df-generated"]
       - ["Microsoft.Extensions.Primitives", "StringSegment", "AsSpan", "(System.Int32,System.Int32)", "summary", "df-generated"]
@@ -58,6 +62,7 @@ extensions:
       - ["Microsoft.Extensions.Primitives", "StringSegment", "IndexOfAny", "(System.Char[],System.Int32,System.Int32)", "summary", "df-generated"]
       - ["Microsoft.Extensions.Primitives", "StringSegment", "IsNullOrEmpty", "(Microsoft.Extensions.Primitives.StringSegment)", "summary", "df-generated"]
       - ["Microsoft.Extensions.Primitives", "StringSegment", "LastIndexOf", "(System.Char)", "summary", "df-generated"]
+      - ["Microsoft.Extensions.Primitives", "StringSegment", "Split", "(System.Char[])", "summary", "df-generated"]
       - ["Microsoft.Extensions.Primitives", "StringSegment", "StartsWith", "(System.String,System.StringComparison)", "summary", "df-generated"]
       - ["Microsoft.Extensions.Primitives", "StringSegment", "StringSegment", "(System.String)", "summary", "df-generated"]
       - ["Microsoft.Extensions.Primitives", "StringSegment", "StringSegment", "(System.String,System.Int32,System.Int32)", "summary", "df-generated"]
@@ -82,7 +87,6 @@ extensions:
       - ["Microsoft.Extensions.Primitives", "StringTokenizer+Enumerator", "MoveNext", "()", "summary", "df-generated"]
       - ["Microsoft.Extensions.Primitives", "StringTokenizer+Enumerator", "Reset", "()", "summary", "df-generated"]
       - ["Microsoft.Extensions.Primitives", "StringValues+Enumerator", "Dispose", "()", "summary", "df-generated"]
-      - ["Microsoft.Extensions.Primitives", "StringValues+Enumerator", "Enumerator", "(Microsoft.Extensions.Primitives.StringValues)", "summary", "df-generated"]
       - ["Microsoft.Extensions.Primitives", "StringValues+Enumerator", "MoveNext", "()", "summary", "df-generated"]
       - ["Microsoft.Extensions.Primitives", "StringValues+Enumerator", "Reset", "()", "summary", "df-generated"]
       - ["Microsoft.Extensions.Primitives", "StringValues", "op_Equality", "(Microsoft.Extensions.Primitives.StringValues,Microsoft.Extensions.Primitives.StringValues)", "summary", "df-generated"]
diff --git a/csharp/ql/lib/ext/generated/Microsoft.Interop.Analyzers.model.yml b/csharp/ql/lib/ext/generated/Microsoft.Interop.Analyzers.model.yml
index 97f22986574..33bec5f1ec7 100644
--- a/csharp/ql/lib/ext/generated/Microsoft.Interop.Analyzers.model.yml
+++ b/csharp/ql/lib/ext/generated/Microsoft.Interop.Analyzers.model.yml
@@ -4,12 +4,18 @@ extensions:
       pack: codeql/csharp-all
       extensible: summaryModel
     data:
-      - ["Microsoft.Interop.Analyzers", "ConvertToSourceGeneratedInteropFixer+Option+String", False, "ToString", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Interop.Analyzers", "ConvertToSourceGeneratedInteropFixer+Option", False, "CreateEquivalenceKeyFromOptions", "(System.String,System.Collections.Immutable.ImmutableDictionary<System.String,Microsoft.Interop.Analyzers.ConvertToSourceGeneratedInteropFixer+Option>)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Interop.Analyzers", "ConvertToSourceGeneratedInteropFixer+Option", False, "CreateEquivalenceKeyFromOptions", "(System.String,System.Collections.Immutable.ImmutableDictionary<System.String,Microsoft.Interop.Analyzers.ConvertToSourceGeneratedInteropFixer+Option>)", "", "Argument[1].Element", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Interop.Analyzers", "ConvertToSourceGeneratedInteropFixer", False, "AddExplicitDefaultBoolMarshalling", "(Microsoft.CodeAnalysis.Editing.SyntaxGenerator,Microsoft.CodeAnalysis.IMethodSymbol,Microsoft.CodeAnalysis.SyntaxNode,System.String)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Interop.Analyzers", "ConvertToSourceGeneratedInteropFixer", False, "AddHResultStructAsErrorMarshalling", "(Microsoft.CodeAnalysis.Editing.SyntaxGenerator,Microsoft.CodeAnalysis.IMethodSymbol,Microsoft.CodeAnalysis.SyntaxNode)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Interop.Analyzers", "CustomMarshallerAttributeAnalyzer+DefaultMarshalModeDiagnostics", False, "GetDefaultMarshalModeDiagnostic", "(Microsoft.CodeAnalysis.DiagnosticDescriptor)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["Microsoft.Interop.Analyzers", "ConvertToSourceGeneratedInteropFixer+Option+String", False, "ToString", "()", "", "Argument[this].Property[Microsoft.Interop.Analyzers.ConvertToSourceGeneratedInteropFixer+Option+String.Value]", "ReturnValue", "taint", "dfc-generated"]
+      - ["Microsoft.Interop.Analyzers", "ConvertToSourceGeneratedInteropFixer+Option", False, "CreateEquivalenceKeyFromOptions", "(System.String,System.Collections.Immutable.ImmutableDictionary<System.String,Microsoft.Interop.Analyzers.ConvertToSourceGeneratedInteropFixer+Option>)", "", "Argument[0]", "ReturnValue", "taint", "dfc-generated"]
+      - ["Microsoft.Interop.Analyzers", "ConvertToSourceGeneratedInteropFixer+Option", False, "CreateEquivalenceKeyFromOptions", "(System.String,System.Collections.Immutable.ImmutableDictionary<System.String,Microsoft.Interop.Analyzers.ConvertToSourceGeneratedInteropFixer+Option>)", "", "Argument[1].Element.Property[System.Collections.Generic.KeyValuePair`2.Key]", "ReturnValue", "taint", "dfc-generated"]
+      - ["Microsoft.Interop.Analyzers", "ConvertToSourceGeneratedInteropFixer+Option", False, "CreateEquivalenceKeyFromOptions", "(System.String,System.Collections.Immutable.ImmutableDictionary<System.String,Microsoft.Interop.Analyzers.ConvertToSourceGeneratedInteropFixer+Option>)", "", "Argument[1].Element.Property[System.Collections.Generic.KeyValuePair`2.Value]", "ReturnValue", "taint", "dfc-generated"]
+      - ["Microsoft.Interop.Analyzers", "ConvertToSourceGeneratedInteropFixer", False, "AddExplicitDefaultBoolMarshalling", "(Microsoft.CodeAnalysis.Editing.SyntaxGenerator,Microsoft.CodeAnalysis.IMethodSymbol,Microsoft.CodeAnalysis.SyntaxNode,System.String)", "", "Argument[2]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Interop.Analyzers", "ConvertToSourceGeneratedInteropFixer", False, "AddHResultStructAsErrorMarshalling", "(Microsoft.CodeAnalysis.Editing.SyntaxGenerator,Microsoft.CodeAnalysis.IMethodSymbol,Microsoft.CodeAnalysis.SyntaxNode)", "", "Argument[2]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Interop.Analyzers", "CustomMarshallerAttributeAnalyzer+DefaultMarshalModeDiagnostics", False, "GetDefaultMarshalModeDiagnostic", "(Microsoft.CodeAnalysis.DiagnosticDescriptor)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Interop.Analyzers", "DiagnosticReporter", False, "CreateAndReportDiagnostic", "(Microsoft.CodeAnalysis.DiagnosticDescriptor,System.Collections.Immutable.ImmutableDictionary<System.String,System.String>,System.Object[])", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["Microsoft.Interop.Analyzers", "DiagnosticReporter", False, "CreateAndReportDiagnostic", "(Microsoft.CodeAnalysis.DiagnosticDescriptor,System.Collections.Immutable.ImmutableDictionary<System.String,System.String>,System.Object[])", "", "Argument[1].Element", "Argument[this]", "taint", "df-generated"]
+      - ["Microsoft.Interop.Analyzers", "DiagnosticReporter", False, "CreateAndReportDiagnostic", "(Microsoft.CodeAnalysis.DiagnosticDescriptor,System.Collections.Immutable.ImmutableDictionary<System.String,System.String>,System.Object[])", "", "Argument[2].Element", "Argument[this]", "taint", "df-generated"]
+      - ["Microsoft.Interop.Analyzers", "DiagnosticReporter", False, "CreateAndReportDiagnostic", "(Microsoft.CodeAnalysis.DiagnosticDescriptor,System.Object[])", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["Microsoft.Interop.Analyzers", "DiagnosticReporter", False, "CreateAndReportDiagnostic", "(Microsoft.CodeAnalysis.DiagnosticDescriptor,System.Object[])", "", "Argument[1].Element", "Argument[this]", "taint", "df-generated"]
   - addsTo:
       pack: codeql/csharp-all
       extensible: neutralModel
@@ -44,6 +50,7 @@ extensions:
       - ["Microsoft.Interop.Analyzers", "ConvertToLibraryImportFixer", "ParseOptionsFromDiagnostic", "(Microsoft.CodeAnalysis.Diagnostic)", "summary", "df-generated"]
       - ["Microsoft.Interop.Analyzers", "ConvertToLibraryImportFixer", "get_BaseEquivalenceKey", "()", "summary", "df-generated"]
       - ["Microsoft.Interop.Analyzers", "ConvertToLibraryImportFixer", "get_FixableDiagnosticIds", "()", "summary", "df-generated"]
+      - ["Microsoft.Interop.Analyzers", "ConvertToSourceGeneratedInteropFixer+ConvertToSourceGeneratedInteropFix", "ConvertToSourceGeneratedInteropFix", "(System.Func<Microsoft.CodeAnalysis.Editing.DocumentEditor,System.Threading.CancellationToken,System.Threading.Tasks.Task>,System.Collections.Immutable.ImmutableDictionary<System.String,Microsoft.Interop.Analyzers.ConvertToSourceGeneratedInteropFixer+Option>)", "summary", "df-generated"]
       - ["Microsoft.Interop.Analyzers", "ConvertToSourceGeneratedInteropFixer+ConvertToSourceGeneratedInteropFix", "op_Equality", "(Microsoft.Interop.Analyzers.ConvertToSourceGeneratedInteropFixer+ConvertToSourceGeneratedInteropFix,Microsoft.Interop.Analyzers.ConvertToSourceGeneratedInteropFixer+ConvertToSourceGeneratedInteropFix)", "summary", "df-generated"]
       - ["Microsoft.Interop.Analyzers", "ConvertToSourceGeneratedInteropFixer+ConvertToSourceGeneratedInteropFix", "op_Inequality", "(Microsoft.Interop.Analyzers.ConvertToSourceGeneratedInteropFixer+ConvertToSourceGeneratedInteropFix,Microsoft.Interop.Analyzers.ConvertToSourceGeneratedInteropFixer+ConvertToSourceGeneratedInteropFix)", "summary", "df-generated"]
       - ["Microsoft.Interop.Analyzers", "ConvertToSourceGeneratedInteropFixer+Option+Bool", "Bool", "(System.Boolean)", "summary", "df-generated"]
@@ -74,8 +81,8 @@ extensions:
       - ["Microsoft.Interop.Analyzers", "CustomMarshallerAttributeFixer", "GetFixAllProvider", "()", "summary", "df-generated"]
       - ["Microsoft.Interop.Analyzers", "CustomMarshallerAttributeFixer", "RegisterCodeFixesAsync", "(Microsoft.CodeAnalysis.CodeFixes.CodeFixContext)", "summary", "df-generated"]
       - ["Microsoft.Interop.Analyzers", "CustomMarshallerAttributeFixer", "get_FixableDiagnosticIds", "()", "summary", "df-generated"]
-      - ["Microsoft.Interop.Analyzers", "DiagnosticReporter", "CreateAndReportDiagnostic", "(Microsoft.CodeAnalysis.DiagnosticDescriptor,System.Collections.Immutable.ImmutableDictionary<System.String,System.String>,System.Object[])", "summary", "df-generated"]
-      - ["Microsoft.Interop.Analyzers", "DiagnosticReporter", "CreateAndReportDiagnostic", "(Microsoft.CodeAnalysis.DiagnosticDescriptor,System.Object[])", "summary", "df-generated"]
+      - ["Microsoft.Interop.Analyzers", "DiagnosticReporter", "CreateForLocation", "(Microsoft.CodeAnalysis.Location,System.Action<Microsoft.CodeAnalysis.Diagnostic>)", "summary", "df-generated"]
+      - ["Microsoft.Interop.Analyzers", "DiagnosticReporter", "DiagnosticReporter", "(System.Action<Microsoft.CodeAnalysis.DiagnosticDescriptor,System.Collections.Immutable.ImmutableDictionary<System.String,System.String>,System.Object[]>)", "summary", "df-generated"]
       - ["Microsoft.Interop.Analyzers", "GeneratedComInterfaceAttributeAnalyzer", "Initialize", "(Microsoft.CodeAnalysis.Diagnostics.AnalysisContext)", "summary", "df-generated"]
       - ["Microsoft.Interop.Analyzers", "GeneratedComInterfaceAttributeAnalyzer", "get_SupportedDiagnostics", "()", "summary", "df-generated"]
       - ["Microsoft.Interop.Analyzers", "NativeMarshallingAttributeAnalyzer", "Initialize", "(Microsoft.CodeAnalysis.Diagnostics.AnalysisContext)", "summary", "df-generated"]
diff --git a/csharp/ql/lib/ext/generated/Microsoft.Interop.model.yml b/csharp/ql/lib/ext/generated/Microsoft.Interop.model.yml
index 07d5d071b61..af1dff370c6 100644
--- a/csharp/ql/lib/ext/generated/Microsoft.Interop.model.yml
+++ b/csharp/ql/lib/ext/generated/Microsoft.Interop.model.yml
@@ -5,65 +5,92 @@ extensions:
       extensible: summaryModel
     data:
       - ["Microsoft.Interop", "ArrayMarshallingInfoProvider", False, "ArrayMarshallingInfoProvider", "(Microsoft.CodeAnalysis.Compilation)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["Microsoft.Interop", "ArrayMarshallingInfoProvider", False, "GetMarshallingInfo", "(Microsoft.CodeAnalysis.ITypeSymbol,System.Int32,Microsoft.Interop.UseSiteAttributeProvider,Microsoft.Interop.GetMarshallingInfoCallback)", "", "Argument[0].Property[Microsoft.CodeAnalysis.IArrayTypeSymbol.ElementType]", "Argument[3].Parameter[0]", "value", "dfc-generated"]
       - ["Microsoft.Interop", "AttributedMarshallingModelGeneratorFactory", False, "AttributedMarshallingModelGeneratorFactory", "(Microsoft.Interop.IMarshallingGeneratorFactory,Microsoft.Interop.AttributedMarshallingModelOptions)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["Microsoft.Interop", "AttributedMarshallingModelGeneratorFactory", False, "AttributedMarshallingModelGeneratorFactory", "(Microsoft.Interop.IMarshallingGeneratorFactory,Microsoft.Interop.AttributedMarshallingModelOptions)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
       - ["Microsoft.Interop", "AttributedMarshallingModelGeneratorFactory", False, "AttributedMarshallingModelGeneratorFactory", "(Microsoft.Interop.IMarshallingGeneratorFactory,Microsoft.Interop.IMarshallingGeneratorFactory,Microsoft.Interop.AttributedMarshallingModelOptions)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["Microsoft.Interop", "AttributedMarshallingModelGeneratorFactory", False, "AttributedMarshallingModelGeneratorFactory", "(Microsoft.Interop.IMarshallingGeneratorFactory,Microsoft.Interop.IMarshallingGeneratorFactory,Microsoft.Interop.AttributedMarshallingModelOptions)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
       - ["Microsoft.Interop", "AttributedMarshallingModelGeneratorFactory", False, "AttributedMarshallingModelGeneratorFactory", "(Microsoft.Interop.IMarshallingGeneratorFactory,Microsoft.Interop.IMarshallingGeneratorFactory,Microsoft.Interop.AttributedMarshallingModelOptions)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
+      - ["Microsoft.Interop", "BlittableMarshaller", False, "AsNativeType", "(Microsoft.Interop.TypePositionInfo)", "", "Argument[0].Property[Microsoft.Interop.TypePositionInfo.ManagedType]", "ReturnValue", "value", "dfc-generated"]
       - ["Microsoft.Interop", "BlittableTypeMarshallingInfoProvider", False, "BlittableTypeMarshallingInfoProvider", "(Microsoft.CodeAnalysis.Compilation)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["Microsoft.Interop", "BoolMarshallerBase", False, "BoolMarshallerBase", "(Microsoft.Interop.ManagedTypeInfo,System.Int32,System.Int32,System.Boolean)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["Microsoft.Interop", "BoolMarshallerBase", False, "AsNativeType", "(Microsoft.Interop.TypePositionInfo)", "", "Argument[this].SyntheticField[Microsoft.Interop.BoolMarshallerBase._nativeType]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Interop", "BoolMarshallerBase", False, "BoolMarshallerBase", "(Microsoft.Interop.ManagedTypeInfo,System.Int32,System.Int32,System.Boolean)", "", "Argument[0]", "Argument[this].SyntheticField[Microsoft.Interop.BoolMarshallerBase._nativeType]", "value", "dfc-generated"]
+      - ["Microsoft.Interop", "BoundGenerators", False, "Create", "(System.Collections.Immutable.ImmutableArray<Microsoft.Interop.TypePositionInfo>,Microsoft.Interop.IMarshallingGeneratorFactory,Microsoft.Interop.StubCodeContext,Microsoft.Interop.IMarshallingGenerator,System.Collections.Immutable.ImmutableArray<Microsoft.Interop.GeneratorDiagnostic>)", "", "Argument[0].Element", "Argument[1]", "taint", "df-generated"]
       - ["Microsoft.Interop", "ByValueContentsMarshalKindValidator", False, "ByValueContentsMarshalKindValidator", "(Microsoft.Interop.IMarshallingGeneratorFactory)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["Microsoft.Interop", "ByValueMarshalKindSupportDescriptor", False, "GetSupport", "(Microsoft.Interop.ByValueContentsMarshalKind,Microsoft.Interop.TypePositionInfo,Microsoft.Interop.StubCodeContext,Microsoft.Interop.GeneratorDiagnostic)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Interop", "ByValueMarshalKindSupportInfo", False, "GetSupport", "(Microsoft.Interop.TypePositionInfo,Microsoft.Interop.StubCodeContext,Microsoft.Interop.GeneratorDiagnostic)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["Microsoft.Interop", "ByValueMarshalKindSupportInfo", False, "GetSupport", "(Microsoft.Interop.TypePositionInfo,Microsoft.Interop.StubCodeContext,Microsoft.Interop.GeneratorDiagnostic)", "", "Argument[this].Property[Microsoft.Interop.ByValueMarshalKindSupportInfo.details]", "ReturnValue.Property[Microsoft.Interop.GeneratorDiagnostic+NotRecommended.Details]", "value", "dfc-generated"]
+      - ["Microsoft.Interop", "ByValueMarshalKindSupportInfo", False, "GetSupport", "(Microsoft.Interop.TypePositionInfo,Microsoft.Interop.StubCodeContext,Microsoft.Interop.GeneratorDiagnostic)", "", "Argument[this].Property[Microsoft.Interop.ByValueMarshalKindSupportInfo.details]", "ReturnValue.Property[Microsoft.Interop.GeneratorDiagnostic+NotSupported.NotSupportedDetails]", "value", "dfc-generated"]
+      - ["Microsoft.Interop", "ByValueMarshalKindSupportInfo", False, "GetSupport", "(Microsoft.Interop.TypePositionInfo,Microsoft.Interop.StubCodeContext,Microsoft.Interop.GeneratorDiagnostic)", "", "Argument[this].Property[Microsoft.Interop.ByValueMarshalKindSupportInfo.details]", "ReturnValue.Property[Microsoft.Interop.GeneratorDiagnostic+UnnecessaryData.UnnecessaryDataDetails]", "value", "dfc-generated"]
       - ["Microsoft.Interop", "CharMarshallingGeneratorFactory", False, "CharMarshallingGeneratorFactory", "(Microsoft.Interop.IMarshallingGeneratorFactory,System.Boolean,System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["Microsoft.Interop", "CharMarshallingGeneratorFactory", False, "CharMarshallingGeneratorFactory", "(Microsoft.Interop.IMarshallingGeneratorFactory,System.Boolean,System.String)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
       - ["Microsoft.Interop", "CharMarshallingInfoProvider", False, "CharMarshallingInfoProvider", "(Microsoft.Interop.DefaultMarshallingInfo)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["Microsoft.Interop", "ComInterfaceMarshallingInfoProvider", False, "ComInterfaceMarshallingInfoProvider", "(Microsoft.CodeAnalysis.Compilation)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["Microsoft.Interop", "ContainingSyntaxContext", False, "AddContainingSyntax", "(Microsoft.Interop.ContainingSyntax)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Interop", "ContainingSyntaxContext", False, "WrapMemberInContainingSyntaxWithUnsafeModifier", "(Microsoft.CodeAnalysis.CSharp.Syntax.MemberDeclarationSyntax)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Interop", "DiagnosticExtensions", False, "CreateDiagnosticInfo", "(Microsoft.CodeAnalysis.AttributeData,Microsoft.CodeAnalysis.DiagnosticDescriptor,System.Collections.Immutable.ImmutableDictionary<System.String,System.String>,System.Object[])", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Interop", "DiagnosticExtensions", False, "CreateDiagnosticInfo", "(Microsoft.CodeAnalysis.AttributeData,Microsoft.CodeAnalysis.DiagnosticDescriptor,System.Object[])", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Interop", "DiagnosticExtensions", False, "CreateDiagnosticInfo", "(Microsoft.CodeAnalysis.ISymbol,Microsoft.CodeAnalysis.DiagnosticDescriptor,System.Collections.Immutable.ImmutableDictionary<System.String,System.String>,System.Object[])", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Interop", "DiagnosticExtensions", False, "CreateDiagnosticInfo", "(Microsoft.CodeAnalysis.ISymbol,Microsoft.CodeAnalysis.DiagnosticDescriptor,System.Collections.Immutable.ImmutableDictionary<System.String,System.String>,System.Object[])", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Interop", "DiagnosticExtensions", False, "CreateDiagnosticInfo", "(Microsoft.CodeAnalysis.ISymbol,Microsoft.CodeAnalysis.DiagnosticDescriptor,System.Object[])", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Interop", "DiagnosticExtensions", False, "CreateDiagnosticInfo", "(Microsoft.CodeAnalysis.ISymbol,Microsoft.CodeAnalysis.DiagnosticDescriptor,System.Object[])", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Interop", "DiagnosticExtensions", False, "CreateDiagnosticInfo", "(Microsoft.CodeAnalysis.Location,Microsoft.CodeAnalysis.DiagnosticDescriptor,System.Collections.Immutable.ImmutableDictionary<System.String,System.String>,System.Object[])", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Interop", "DiagnosticExtensions", False, "CreateDiagnosticInfo", "(Microsoft.CodeAnalysis.Location,Microsoft.CodeAnalysis.DiagnosticDescriptor,System.Collections.Immutable.ImmutableDictionary<System.String,System.String>,System.Object[])", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Interop", "DiagnosticExtensions", False, "CreateDiagnosticInfo", "(Microsoft.CodeAnalysis.Location,Microsoft.CodeAnalysis.DiagnosticDescriptor,System.Object[])", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Interop", "DiagnosticExtensions", False, "CreateDiagnosticInfo", "(Microsoft.CodeAnalysis.Location,Microsoft.CodeAnalysis.DiagnosticDescriptor,System.Object[])", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Interop", "DiagnosticExtensions", False, "CreateDiagnosticInfo", "(System.Collections.Immutable.ImmutableArray<Microsoft.CodeAnalysis.Location>,Microsoft.CodeAnalysis.DiagnosticDescriptor,System.Collections.Immutable.ImmutableDictionary<System.String,System.String>,System.Object[])", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Interop", "DiagnosticExtensions", False, "CreateDiagnosticInfo", "(System.Collections.Immutable.ImmutableArray<Microsoft.CodeAnalysis.Location>,Microsoft.CodeAnalysis.DiagnosticDescriptor,System.Collections.Immutable.ImmutableDictionary<System.String,System.String>,System.Object[])", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Interop", "DiagnosticExtensions", False, "CreateDiagnosticInfo", "(System.Collections.Immutable.ImmutableArray<Microsoft.CodeAnalysis.Location>,Microsoft.CodeAnalysis.DiagnosticDescriptor,System.Object[])", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Interop", "DiagnosticExtensions", False, "CreateDiagnosticInfo", "(System.Collections.Immutable.ImmutableArray<Microsoft.CodeAnalysis.Location>,Microsoft.CodeAnalysis.DiagnosticDescriptor,System.Object[])", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Interop", "DiagnosticInfo", False, "Create", "(Microsoft.CodeAnalysis.DiagnosticDescriptor,Microsoft.CodeAnalysis.Location,System.Collections.Generic.IEnumerable<Microsoft.CodeAnalysis.Location>,System.Collections.Immutable.ImmutableDictionary<System.String,System.String>,System.Object[])", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Interop", "DiagnosticInfo", False, "Create", "(Microsoft.CodeAnalysis.DiagnosticDescriptor,Microsoft.CodeAnalysis.Location,System.Collections.Generic.IEnumerable<Microsoft.CodeAnalysis.Location>,System.Collections.Immutable.ImmutableDictionary<System.String,System.String>,System.Object[])", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Interop", "DiagnosticInfo", False, "Create", "(Microsoft.CodeAnalysis.DiagnosticDescriptor,Microsoft.CodeAnalysis.Location,System.Collections.Immutable.ImmutableDictionary<System.String,System.String>,System.Object[])", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Interop", "DiagnosticInfo", False, "Create", "(Microsoft.CodeAnalysis.DiagnosticDescriptor,Microsoft.CodeAnalysis.Location,System.Collections.Immutable.ImmutableDictionary<System.String,System.String>,System.Object[])", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Interop", "DiagnosticInfo", False, "Create", "(Microsoft.CodeAnalysis.DiagnosticDescriptor,Microsoft.CodeAnalysis.Location,System.Object[])", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Interop", "DiagnosticInfo", False, "Create", "(Microsoft.CodeAnalysis.DiagnosticDescriptor,Microsoft.CodeAnalysis.Location,System.Object[])", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["Microsoft.Interop", "ContainingSyntaxContext", False, "AddContainingSyntax", "(Microsoft.Interop.ContainingSyntax)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Interop", "ContainingSyntaxContext", False, "WrapMemberInContainingSyntaxWithUnsafeModifier", "(Microsoft.CodeAnalysis.CSharp.Syntax.MemberDeclarationSyntax)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Interop", "DiagnosticExtensions", False, "CreateDiagnosticInfo", "(Microsoft.CodeAnalysis.AttributeData,Microsoft.CodeAnalysis.DiagnosticDescriptor,System.Collections.Immutable.ImmutableDictionary<System.String,System.String>,System.Object[])", "", "Argument[1]", "ReturnValue.Property[Microsoft.Interop.DiagnosticInfo.Descriptor]", "value", "dfc-generated"]
+      - ["Microsoft.Interop", "DiagnosticExtensions", False, "CreateDiagnosticInfo", "(Microsoft.CodeAnalysis.AttributeData,Microsoft.CodeAnalysis.DiagnosticDescriptor,System.Object[])", "", "Argument[1]", "ReturnValue.Property[Microsoft.Interop.DiagnosticInfo.Descriptor]", "value", "dfc-generated"]
+      - ["Microsoft.Interop", "DiagnosticExtensions", False, "CreateDiagnosticInfo", "(Microsoft.CodeAnalysis.ISymbol,Microsoft.CodeAnalysis.DiagnosticDescriptor,System.Collections.Immutable.ImmutableDictionary<System.String,System.String>,System.Object[])", "", "Argument[0].Property[Microsoft.CodeAnalysis.ISymbol.Locations].Element", "ReturnValue.Property[Microsoft.Interop.DiagnosticInfo.Location]", "value", "dfc-generated"]
+      - ["Microsoft.Interop", "DiagnosticExtensions", False, "CreateDiagnosticInfo", "(Microsoft.CodeAnalysis.ISymbol,Microsoft.CodeAnalysis.DiagnosticDescriptor,System.Collections.Immutable.ImmutableDictionary<System.String,System.String>,System.Object[])", "", "Argument[1]", "ReturnValue.Property[Microsoft.Interop.DiagnosticInfo.Descriptor]", "value", "dfc-generated"]
+      - ["Microsoft.Interop", "DiagnosticExtensions", False, "CreateDiagnosticInfo", "(Microsoft.CodeAnalysis.ISymbol,Microsoft.CodeAnalysis.DiagnosticDescriptor,System.Object[])", "", "Argument[0].Property[Microsoft.CodeAnalysis.ISymbol.Locations].Element", "ReturnValue.Property[Microsoft.Interop.DiagnosticInfo.Location]", "value", "dfc-generated"]
+      - ["Microsoft.Interop", "DiagnosticExtensions", False, "CreateDiagnosticInfo", "(Microsoft.CodeAnalysis.ISymbol,Microsoft.CodeAnalysis.DiagnosticDescriptor,System.Object[])", "", "Argument[1]", "ReturnValue.Property[Microsoft.Interop.DiagnosticInfo.Descriptor]", "value", "dfc-generated"]
+      - ["Microsoft.Interop", "DiagnosticExtensions", False, "CreateDiagnosticInfo", "(Microsoft.CodeAnalysis.Location,Microsoft.CodeAnalysis.DiagnosticDescriptor,System.Collections.Immutable.ImmutableDictionary<System.String,System.String>,System.Object[])", "", "Argument[0]", "ReturnValue.Property[Microsoft.Interop.DiagnosticInfo.Location]", "value", "dfc-generated"]
+      - ["Microsoft.Interop", "DiagnosticExtensions", False, "CreateDiagnosticInfo", "(Microsoft.CodeAnalysis.Location,Microsoft.CodeAnalysis.DiagnosticDescriptor,System.Collections.Immutable.ImmutableDictionary<System.String,System.String>,System.Object[])", "", "Argument[1]", "ReturnValue.Property[Microsoft.Interop.DiagnosticInfo.Descriptor]", "value", "dfc-generated"]
+      - ["Microsoft.Interop", "DiagnosticExtensions", False, "CreateDiagnosticInfo", "(Microsoft.CodeAnalysis.Location,Microsoft.CodeAnalysis.DiagnosticDescriptor,System.Object[])", "", "Argument[0]", "ReturnValue.Property[Microsoft.Interop.DiagnosticInfo.Location]", "value", "dfc-generated"]
+      - ["Microsoft.Interop", "DiagnosticExtensions", False, "CreateDiagnosticInfo", "(Microsoft.CodeAnalysis.Location,Microsoft.CodeAnalysis.DiagnosticDescriptor,System.Object[])", "", "Argument[1]", "ReturnValue.Property[Microsoft.Interop.DiagnosticInfo.Descriptor]", "value", "dfc-generated"]
+      - ["Microsoft.Interop", "DiagnosticExtensions", False, "CreateDiagnosticInfo", "(System.Collections.Immutable.ImmutableArray<Microsoft.CodeAnalysis.Location>,Microsoft.CodeAnalysis.DiagnosticDescriptor,System.Collections.Immutable.ImmutableDictionary<System.String,System.String>,System.Object[])", "", "Argument[0].Element", "ReturnValue.Property[Microsoft.Interop.DiagnosticInfo.Location]", "value", "dfc-generated"]
+      - ["Microsoft.Interop", "DiagnosticExtensions", False, "CreateDiagnosticInfo", "(System.Collections.Immutable.ImmutableArray<Microsoft.CodeAnalysis.Location>,Microsoft.CodeAnalysis.DiagnosticDescriptor,System.Collections.Immutable.ImmutableDictionary<System.String,System.String>,System.Object[])", "", "Argument[1]", "ReturnValue.Property[Microsoft.Interop.DiagnosticInfo.Descriptor]", "value", "dfc-generated"]
+      - ["Microsoft.Interop", "DiagnosticExtensions", False, "CreateDiagnosticInfo", "(System.Collections.Immutable.ImmutableArray<Microsoft.CodeAnalysis.Location>,Microsoft.CodeAnalysis.DiagnosticDescriptor,System.Object[])", "", "Argument[0].Element", "ReturnValue.Property[Microsoft.Interop.DiagnosticInfo.Location]", "value", "dfc-generated"]
+      - ["Microsoft.Interop", "DiagnosticExtensions", False, "CreateDiagnosticInfo", "(System.Collections.Immutable.ImmutableArray<Microsoft.CodeAnalysis.Location>,Microsoft.CodeAnalysis.DiagnosticDescriptor,System.Object[])", "", "Argument[1]", "ReturnValue.Property[Microsoft.Interop.DiagnosticInfo.Descriptor]", "value", "dfc-generated"]
+      - ["Microsoft.Interop", "DiagnosticInfo", False, "Create", "(Microsoft.CodeAnalysis.DiagnosticDescriptor,Microsoft.CodeAnalysis.Location,System.Collections.Generic.IEnumerable<Microsoft.CodeAnalysis.Location>,System.Collections.Immutable.ImmutableDictionary<System.String,System.String>,System.Object[])", "", "Argument[0]", "ReturnValue.Property[Microsoft.Interop.DiagnosticInfo.Descriptor]", "value", "dfc-generated"]
+      - ["Microsoft.Interop", "DiagnosticInfo", False, "Create", "(Microsoft.CodeAnalysis.DiagnosticDescriptor,Microsoft.CodeAnalysis.Location,System.Collections.Generic.IEnumerable<Microsoft.CodeAnalysis.Location>,System.Collections.Immutable.ImmutableDictionary<System.String,System.String>,System.Object[])", "", "Argument[1]", "ReturnValue.Property[Microsoft.Interop.DiagnosticInfo.Location]", "value", "dfc-generated"]
+      - ["Microsoft.Interop", "DiagnosticInfo", False, "Create", "(Microsoft.CodeAnalysis.DiagnosticDescriptor,Microsoft.CodeAnalysis.Location,System.Collections.Immutable.ImmutableDictionary<System.String,System.String>,System.Object[])", "", "Argument[0]", "ReturnValue.Property[Microsoft.Interop.DiagnosticInfo.Descriptor]", "value", "dfc-generated"]
+      - ["Microsoft.Interop", "DiagnosticInfo", False, "Create", "(Microsoft.CodeAnalysis.DiagnosticDescriptor,Microsoft.CodeAnalysis.Location,System.Collections.Immutable.ImmutableDictionary<System.String,System.String>,System.Object[])", "", "Argument[1]", "ReturnValue.Property[Microsoft.Interop.DiagnosticInfo.Location]", "value", "dfc-generated"]
+      - ["Microsoft.Interop", "DiagnosticInfo", False, "Create", "(Microsoft.CodeAnalysis.DiagnosticDescriptor,Microsoft.CodeAnalysis.Location,System.Object[])", "", "Argument[0]", "ReturnValue.Property[Microsoft.Interop.DiagnosticInfo.Descriptor]", "value", "dfc-generated"]
+      - ["Microsoft.Interop", "DiagnosticInfo", False, "Create", "(Microsoft.CodeAnalysis.DiagnosticDescriptor,Microsoft.CodeAnalysis.Location,System.Object[])", "", "Argument[1]", "ReturnValue.Property[Microsoft.Interop.DiagnosticInfo.Location]", "value", "dfc-generated"]
       - ["Microsoft.Interop", "DiagnosticOr<T>", False, "AddDiagnostic", "(Microsoft.Interop.DiagnosticInfo)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Interop", "DiagnosticOr<T>", False, "From", "(T)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Interop", "DiagnosticOr<T>", False, "From", "(T,Microsoft.Interop.DiagnosticInfo[])", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["Microsoft.Interop", "DiagnosticOr<T>", False, "From", "(T)", "", "Argument[0]", "ReturnValue.SyntheticField[Microsoft.Interop.DiagnosticOr`1+Val._value]", "value", "dfc-generated"]
+      - ["Microsoft.Interop", "DiagnosticOr<T>", False, "From", "(T,Microsoft.Interop.DiagnosticInfo[])", "", "Argument[0]", "ReturnValue.SyntheticField[Microsoft.Interop.DiagnosticOr`1+ValueAndDiagnostic._value]", "value", "dfc-generated"]
       - ["Microsoft.Interop", "DiagnosticOr<T>", False, "WithValue", "(T)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["Microsoft.Interop", "DiagnosticOr<T>", True, "get_Diagnostics", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["Microsoft.Interop", "DiagnosticOr<T>", True, "get_Value", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Interop", "GeneratorDiagnostic", True, "ToDiagnosticInfo", "(Microsoft.CodeAnalysis.DiagnosticDescriptor,Microsoft.CodeAnalysis.Location,System.String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Interop", "GeneratorDiagnostic", True, "ToDiagnosticInfo", "(Microsoft.CodeAnalysis.DiagnosticDescriptor,Microsoft.CodeAnalysis.Location,System.String)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["Microsoft.Interop", "Forwarder", False, "AsNativeType", "(Microsoft.Interop.TypePositionInfo)", "", "Argument[0].Property[Microsoft.Interop.TypePositionInfo.ManagedType]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Interop", "GeneratorDiagnostic+NotRecommended", False, "ToDiagnosticInfo", "(Microsoft.CodeAnalysis.DiagnosticDescriptor,Microsoft.CodeAnalysis.Location,System.String)", "", "Argument[0]", "ReturnValue.Property[Microsoft.Interop.DiagnosticInfo.Descriptor]", "value", "dfc-generated"]
+      - ["Microsoft.Interop", "GeneratorDiagnostic+NotRecommended", False, "ToDiagnosticInfo", "(Microsoft.CodeAnalysis.DiagnosticDescriptor,Microsoft.CodeAnalysis.Location,System.String)", "", "Argument[1]", "ReturnValue.Property[Microsoft.Interop.DiagnosticInfo.Location]", "value", "dfc-generated"]
+      - ["Microsoft.Interop", "GeneratorDiagnostic+NotSupported", False, "ToDiagnosticInfo", "(Microsoft.CodeAnalysis.DiagnosticDescriptor,Microsoft.CodeAnalysis.Location,System.String)", "", "Argument[0]", "ReturnValue.Property[Microsoft.Interop.DiagnosticInfo.Descriptor]", "value", "dfc-generated"]
+      - ["Microsoft.Interop", "GeneratorDiagnostic+NotSupported", False, "ToDiagnosticInfo", "(Microsoft.CodeAnalysis.DiagnosticDescriptor,Microsoft.CodeAnalysis.Location,System.String)", "", "Argument[1]", "ReturnValue.Property[Microsoft.Interop.DiagnosticInfo.Location]", "value", "dfc-generated"]
+      - ["Microsoft.Interop", "GeneratorDiagnostic+UnnecessaryData", False, "ToDiagnosticInfo", "(Microsoft.CodeAnalysis.DiagnosticDescriptor,Microsoft.CodeAnalysis.Location,System.String)", "", "Argument[0]", "ReturnValue.Property[Microsoft.Interop.DiagnosticInfo.Descriptor]", "value", "dfc-generated"]
+      - ["Microsoft.Interop", "GeneratorDiagnostic+UnnecessaryData", False, "ToDiagnosticInfo", "(Microsoft.CodeAnalysis.DiagnosticDescriptor,Microsoft.CodeAnalysis.Location,System.String)", "", "Argument[1]", "ReturnValue.Property[Microsoft.Interop.DiagnosticInfo.Location]", "value", "dfc-generated"]
       - ["Microsoft.Interop", "GeneratorDiagnosticsBag", False, "GeneratorDiagnosticsBag", "(Microsoft.Interop.IDiagnosticDescriptorProvider,Microsoft.Interop.ISignatureDiagnosticLocations,System.Resources.ResourceManager,System.Type)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["Microsoft.Interop", "GeneratorDiagnosticsBag", False, "GeneratorDiagnosticsBag", "(Microsoft.Interop.IDiagnosticDescriptorProvider,Microsoft.Interop.ISignatureDiagnosticLocations,System.Resources.ResourceManager,System.Type)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
       - ["Microsoft.Interop", "GeneratorDiagnosticsBag", False, "GeneratorDiagnosticsBag", "(Microsoft.Interop.IDiagnosticDescriptorProvider,Microsoft.Interop.ISignatureDiagnosticLocations,System.Resources.ResourceManager,System.Type)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
-      - ["Microsoft.Interop", "GeneratorDiagnosticsBag", False, "ReportDiagnostic", "(Microsoft.Interop.DiagnosticInfo)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["Microsoft.Interop", "GeneratorDiagnosticsBag", False, "get_Diagnostics", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["Microsoft.Interop", "GeneratorDiagnosticsBag", False, "ReportDiagnostic", "(Microsoft.Interop.DiagnosticInfo)", "", "Argument[0]", "Argument[this].SyntheticField[Microsoft.Interop.GeneratorDiagnosticsBag._diagnostics].Element", "value", "dfc-generated"]
+      - ["Microsoft.Interop", "GeneratorDiagnosticsBag", False, "get_Diagnostics", "()", "", "Argument[this].SyntheticField[Microsoft.Interop.GeneratorDiagnosticsBag._diagnostics]", "ReturnValue", "value", "dfc-generated"]
       - ["Microsoft.Interop", "IMarshallingGenerator", True, "AsNativeType", "(Microsoft.Interop.TypePositionInfo)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["Microsoft.Interop", "IMarshallingGenerator", True, "AsNativeType", "(Microsoft.Interop.TypePositionInfo)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Interop", "ISignatureDiagnosticLocations", True, "CreateDiagnosticInfo", "(Microsoft.CodeAnalysis.DiagnosticDescriptor,Microsoft.Interop.GeneratorDiagnostic)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Interop", "ISignatureDiagnosticLocations", True, "CreateDiagnosticInfo", "(Microsoft.CodeAnalysis.DiagnosticDescriptor,Microsoft.Interop.GeneratorDiagnostic)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Interop", "InteropAttributeDataExtensions", False, "WithValuesFromNamedArguments<T>", "(T,System.Collections.Immutable.ImmutableDictionary<System.String,Microsoft.CodeAnalysis.TypedConstant>)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Interop", "ManagedToNativeStubCodeContext", False, "ManagedToNativeStubCodeContext", "(System.String,System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["Microsoft.Interop", "ManagedToNativeStubCodeContext", False, "ManagedToNativeStubCodeContext", "(System.String,System.String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["Microsoft.Interop", "ManagedTypeInfo", False, "ManagedTypeInfo", "(Microsoft.Interop.ManagedTypeInfo)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["Microsoft.Interop", "ManualTypeMarshallingHelper", False, "ReplaceGenericPlaceholderInType", "(Microsoft.CodeAnalysis.ITypeSymbol,Microsoft.CodeAnalysis.INamedTypeSymbol,Microsoft.CodeAnalysis.Compilation)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Interop", "ManualTypeMarshallingHelper", False, "ReplaceGenericPlaceholderInType", "(Microsoft.CodeAnalysis.ITypeSymbol,Microsoft.CodeAnalysis.INamedTypeSymbol,Microsoft.CodeAnalysis.Compilation)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["Microsoft.Interop", "IMarshallingGeneratorFactory", True, "Create", "(Microsoft.Interop.TypePositionInfo,Microsoft.Interop.StubCodeContext)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["Microsoft.Interop", "IMarshallingGeneratorFactory", True, "Create", "(Microsoft.Interop.TypePositionInfo,Microsoft.Interop.StubCodeContext)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["Microsoft.Interop", "IMarshallingGeneratorFactory", True, "Create", "(Microsoft.Interop.TypePositionInfo,Microsoft.Interop.StubCodeContext)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["Microsoft.Interop", "IMarshallingInfoAttributeParser", True, "ParseAttribute", "(Microsoft.CodeAnalysis.AttributeData,Microsoft.CodeAnalysis.ITypeSymbol,System.Int32,Microsoft.Interop.UseSiteAttributeProvider,Microsoft.Interop.GetMarshallingInfoCallback)", "", "Argument[3]", "Argument[4].Parameter[1]", "value", "dfc-generated"]
+      - ["Microsoft.Interop", "ITypeBasedMarshallingInfoProvider", True, "GetMarshallingInfo", "(Microsoft.CodeAnalysis.ITypeSymbol,System.Int32,Microsoft.Interop.UseSiteAttributeProvider,Microsoft.Interop.GetMarshallingInfoCallback)", "", "Argument[2]", "Argument[3].Parameter[1]", "value", "dfc-generated"]
+      - ["Microsoft.Interop", "InteropAttributeDataExtensions", False, "WithValuesFromNamedArguments<T>", "(T,System.Collections.Immutable.ImmutableDictionary<System.String,Microsoft.CodeAnalysis.TypedConstant>)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Interop", "ManagedToNativeStubCodeContext", False, "GetIdentifiers", "(Microsoft.Interop.TypePositionInfo)", "", "Argument[0].Property[Microsoft.Interop.TypePositionInfo.InstanceIdentifier]", "ReturnValue.Field[System.ValueTuple`2.Item1]", "value", "dfc-generated"]
+      - ["Microsoft.Interop", "ManagedToNativeStubCodeContext", False, "GetIdentifiers", "(Microsoft.Interop.TypePositionInfo)", "", "Argument[0].Property[Microsoft.Interop.TypePositionInfo.InstanceIdentifier]", "ReturnValue.Field[System.ValueTuple`2.Item2]", "taint", "dfc-generated"]
+      - ["Microsoft.Interop", "ManagedToNativeStubCodeContext", False, "GetIdentifiers", "(Microsoft.Interop.TypePositionInfo)", "", "Argument[this].SyntheticField[Microsoft.Interop.ManagedToNativeStubCodeContext._nativeReturnIdentifier]", "ReturnValue.Field[System.ValueTuple`2.Item2]", "value", "dfc-generated"]
+      - ["Microsoft.Interop", "ManagedToNativeStubCodeContext", False, "GetIdentifiers", "(Microsoft.Interop.TypePositionInfo)", "", "Argument[this].SyntheticField[Microsoft.Interop.ManagedToNativeStubCodeContext._returnIdentifier]", "ReturnValue.Field[System.ValueTuple`2.Item1]", "value", "dfc-generated"]
+      - ["Microsoft.Interop", "ManagedToNativeStubCodeContext", False, "ManagedToNativeStubCodeContext", "(System.String,System.String)", "", "Argument[0]", "Argument[this].SyntheticField[Microsoft.Interop.ManagedToNativeStubCodeContext._returnIdentifier]", "value", "dfc-generated"]
+      - ["Microsoft.Interop", "ManagedToNativeStubCodeContext", False, "ManagedToNativeStubCodeContext", "(System.String,System.String)", "", "Argument[1]", "Argument[this].SyntheticField[Microsoft.Interop.ManagedToNativeStubCodeContext._nativeReturnIdentifier]", "value", "dfc-generated"]
+      - ["Microsoft.Interop", "ManagedTypeInfo", False, "ManagedTypeInfo", "(Microsoft.Interop.ManagedTypeInfo)", "", "Argument[0].Property[Microsoft.Interop.ManagedTypeInfo.DiagnosticFormattedName]", "Argument[this].Property[Microsoft.Interop.ManagedTypeInfo.DiagnosticFormattedName]", "value", "dfc-generated"]
+      - ["Microsoft.Interop", "ManagedTypeInfo", False, "ManagedTypeInfo", "(Microsoft.Interop.ManagedTypeInfo)", "", "Argument[0].Property[Microsoft.Interop.ManagedTypeInfo.FullTypeName]", "Argument[this].Property[Microsoft.Interop.ManagedTypeInfo.FullTypeName]", "value", "dfc-generated"]
+      - ["Microsoft.Interop", "ManualTypeMarshallingHelper", False, "ReplaceGenericPlaceholderInType", "(Microsoft.CodeAnalysis.ITypeSymbol,Microsoft.CodeAnalysis.INamedTypeSymbol,Microsoft.CodeAnalysis.Compilation)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Interop", "ManualTypeMarshallingHelper", False, "TryGetLinearCollectionMarshallersFromEntryType", "(Microsoft.CodeAnalysis.INamedTypeSymbol,Microsoft.CodeAnalysis.ITypeSymbol,Microsoft.CodeAnalysis.Compilation,System.Func<Microsoft.CodeAnalysis.ITypeSymbol,Microsoft.Interop.MarshallingInfo>,System.Action<Microsoft.CodeAnalysis.INamedTypeSymbol,Microsoft.CodeAnalysis.INamedTypeSymbol>,System.Nullable<Microsoft.Interop.CustomTypeMarshallers>)", "", "Argument[0].Property[Microsoft.CodeAnalysis.INamedTypeSymbol.OriginalDefinition]", "Argument[4].Parameter[0]", "value", "dfc-generated"]
+      - ["Microsoft.Interop", "ManualTypeMarshallingHelper", False, "TryGetMarshallersFromEntryTypeIgnoringElements", "(Microsoft.CodeAnalysis.INamedTypeSymbol,Microsoft.CodeAnalysis.ITypeSymbol,Microsoft.CodeAnalysis.Compilation,System.Action<Microsoft.CodeAnalysis.INamedTypeSymbol,Microsoft.CodeAnalysis.INamedTypeSymbol>,System.Nullable<Microsoft.Interop.CustomTypeMarshallers>)", "", "Argument[0].Property[Microsoft.CodeAnalysis.INamedTypeSymbol.OriginalDefinition]", "Argument[3].Parameter[0]", "value", "dfc-generated"]
+      - ["Microsoft.Interop", "ManualTypeMarshallingHelper", False, "TryGetValueMarshallersFromEntryType", "(Microsoft.CodeAnalysis.INamedTypeSymbol,Microsoft.CodeAnalysis.ITypeSymbol,Microsoft.CodeAnalysis.Compilation,System.Action<Microsoft.CodeAnalysis.INamedTypeSymbol,Microsoft.CodeAnalysis.INamedTypeSymbol>,System.Nullable<Microsoft.Interop.CustomTypeMarshallers>)", "", "Argument[0].Property[Microsoft.CodeAnalysis.INamedTypeSymbol.OriginalDefinition]", "Argument[3].Parameter[0]", "value", "dfc-generated"]
+      - ["Microsoft.Interop", "ManualTypeMarshallingHelper", False, "TryResolveEntryPointType", "(Microsoft.CodeAnalysis.INamedTypeSymbol,Microsoft.CodeAnalysis.ITypeSymbol,System.Boolean,System.Action<Microsoft.CodeAnalysis.INamedTypeSymbol,Microsoft.CodeAnalysis.INamedTypeSymbol>,Microsoft.CodeAnalysis.ITypeSymbol)", "", "Argument[0].Property[Microsoft.CodeAnalysis.INamedTypeSymbol.OriginalDefinition]", "Argument[3].Parameter[0]", "value", "dfc-generated"]
+      - ["Microsoft.Interop", "ManualTypeMarshallingHelper", False, "TryResolveEntryPointType", "(Microsoft.CodeAnalysis.INamedTypeSymbol,Microsoft.CodeAnalysis.ITypeSymbol,System.Boolean,System.Action<Microsoft.CodeAnalysis.INamedTypeSymbol,Microsoft.CodeAnalysis.INamedTypeSymbol>,Microsoft.CodeAnalysis.ITypeSymbol)", "", "Argument[1]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Interop", "ManualTypeMarshallingHelper", False, "TryResolveManagedType", "(Microsoft.CodeAnalysis.INamedTypeSymbol,Microsoft.CodeAnalysis.ITypeSymbol,System.Boolean,System.Action<Microsoft.CodeAnalysis.INamedTypeSymbol,Microsoft.CodeAnalysis.INamedTypeSymbol>,Microsoft.CodeAnalysis.ITypeSymbol)", "", "Argument[0].Property[Microsoft.CodeAnalysis.INamedTypeSymbol.OriginalDefinition]", "Argument[3].Parameter[0]", "value", "dfc-generated"]
+      - ["Microsoft.Interop", "ManualTypeMarshallingHelper", False, "TryResolveManagedType", "(Microsoft.CodeAnalysis.INamedTypeSymbol,Microsoft.CodeAnalysis.ITypeSymbol,System.Boolean,System.Action<Microsoft.CodeAnalysis.INamedTypeSymbol,Microsoft.CodeAnalysis.INamedTypeSymbol>,Microsoft.CodeAnalysis.ITypeSymbol)", "", "Argument[1]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Interop", "ManualTypeMarshallingHelper", False, "TryResolveMarshallerType", "(Microsoft.CodeAnalysis.INamedTypeSymbol,Microsoft.CodeAnalysis.ITypeSymbol,System.Action<Microsoft.CodeAnalysis.INamedTypeSymbol,Microsoft.CodeAnalysis.INamedTypeSymbol>,Microsoft.CodeAnalysis.ITypeSymbol)", "", "Argument[0].Property[Microsoft.CodeAnalysis.INamedTypeSymbol.OriginalDefinition]", "Argument[2].Parameter[0]", "value", "dfc-generated"]
+      - ["Microsoft.Interop", "ManualTypeMarshallingHelper", False, "TryResolveMarshallerType", "(Microsoft.CodeAnalysis.INamedTypeSymbol,Microsoft.CodeAnalysis.ITypeSymbol,System.Action<Microsoft.CodeAnalysis.INamedTypeSymbol,Microsoft.CodeAnalysis.INamedTypeSymbol>,Microsoft.CodeAnalysis.ITypeSymbol)", "", "Argument[1]", "ReturnValue", "value", "dfc-generated"]
       - ["Microsoft.Interop", "MarshalAsAttributeParser", False, "MarshalAsAttributeParser", "(Microsoft.Interop.GeneratorDiagnosticsBag,Microsoft.Interop.DefaultMarshallingInfo)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["Microsoft.Interop", "MarshalAsAttributeParser", False, "MarshalAsAttributeParser", "(Microsoft.Interop.GeneratorDiagnosticsBag,Microsoft.Interop.DefaultMarshallingInfo)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
       - ["Microsoft.Interop", "MarshalAsMarshallingGeneratorFactory", False, "MarshalAsMarshallingGeneratorFactory", "(Microsoft.Interop.InteropGenerationOptions,Microsoft.Interop.IMarshallingGeneratorFactory)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
@@ -73,59 +100,63 @@ extensions:
       - ["Microsoft.Interop", "MarshalAsWithCustomMarshallersParser", False, "MarshalAsWithCustomMarshallersParser", "(Microsoft.CodeAnalysis.Compilation,Microsoft.Interop.GeneratorDiagnosticsBag,Microsoft.Interop.IMarshallingInfoAttributeParser)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
       - ["Microsoft.Interop", "MarshalUsingAttributeParser", False, "MarshalUsingAttributeParser", "(Microsoft.CodeAnalysis.Compilation,Microsoft.Interop.GeneratorDiagnosticsBag)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["Microsoft.Interop", "MarshalUsingAttributeParser", False, "MarshalUsingAttributeParser", "(Microsoft.CodeAnalysis.Compilation,Microsoft.Interop.GeneratorDiagnosticsBag)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["Microsoft.Interop", "MarshallerHelpers", False, "GetCompatibleGenericTypeParameterSyntax", "(Microsoft.CodeAnalysis.CSharp.Syntax.TypeSyntax)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["Microsoft.Interop", "MarshallerHelpers", False, "GetCompatibleGenericTypeParameterSyntax", "(Microsoft.CodeAnalysis.CSharp.Syntax.TypeSyntax)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
       - ["Microsoft.Interop", "MarshallerHelpers", False, "GetLastIndexMarshalledIdentifier", "(Microsoft.Interop.TypePositionInfo,Microsoft.Interop.StubCodeContext)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
       - ["Microsoft.Interop", "MarshallerHelpers", False, "GetManagedSpanIdentifier", "(Microsoft.Interop.TypePositionInfo,Microsoft.Interop.StubCodeContext)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
       - ["Microsoft.Interop", "MarshallerHelpers", False, "GetMarshallerIdentifier", "(Microsoft.Interop.TypePositionInfo,Microsoft.Interop.StubCodeContext)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
       - ["Microsoft.Interop", "MarshallerHelpers", False, "GetNativeSpanIdentifier", "(Microsoft.Interop.TypePositionInfo,Microsoft.Interop.StubCodeContext)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
       - ["Microsoft.Interop", "MarshallerHelpers", False, "GetNumElementsIdentifier", "(Microsoft.Interop.TypePositionInfo,Microsoft.Interop.StubCodeContext)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Interop", "MarshallingGeneratorExtensions", False, "AsReturnType", "(Microsoft.Interop.IMarshallingGenerator,Microsoft.Interop.TypePositionInfo)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Interop", "MarshallingGeneratorExtensions", False, "AsReturnType", "(Microsoft.Interop.IMarshallingGenerator,Microsoft.Interop.TypePositionInfo)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["Microsoft.Interop", "MarshallerHelpers", False, "GetTopologicallySortedElements<T,U>", "(System.Collections.Generic.ICollection<T>,System.Func<T,U>,System.Func<T,System.Collections.Generic.IEnumerable<U>>)", "", "Argument[0].Element", "Argument[1].Parameter[0]", "value", "dfc-generated"]
+      - ["Microsoft.Interop", "MarshallerHelpers", False, "GetTopologicallySortedElements<T,U>", "(System.Collections.Generic.ICollection<T>,System.Func<T,U>,System.Func<T,System.Collections.Generic.IEnumerable<U>>)", "", "Argument[0].Element", "Argument[2].Parameter[0]", "value", "dfc-generated"]
+      - ["Microsoft.Interop", "MarshallerHelpers", False, "GetTopologicallySortedElements<T,U>", "(System.Collections.Generic.ICollection<T>,System.Func<T,U>,System.Func<T,System.Collections.Generic.IEnumerable<U>>)", "", "Argument[0].Element", "ReturnValue.Element", "value", "dfc-generated"]
+      - ["Microsoft.Interop", "MarshallingGeneratorExtensions", False, "AsReturnType", "(Microsoft.Interop.IMarshallingGenerator,Microsoft.Interop.TypePositionInfo)", "", "Argument[1].Property[Microsoft.Interop.TypePositionInfo.ManagedType].Property[Microsoft.Interop.ManagedTypeInfo.Syntax]", "ReturnValue", "value", "dfc-generated"]
       - ["Microsoft.Interop", "MarshallingInfoParser", False, "MarshallingInfoParser", "(Microsoft.Interop.GeneratorDiagnosticsBag,Microsoft.Interop.IElementInfoProvider,System.Collections.Immutable.ImmutableArray<Microsoft.Interop.IUseSiteAttributeParser>,System.Collections.Immutable.ImmutableArray<Microsoft.Interop.IMarshallingInfoAttributeParser>,System.Collections.Immutable.ImmutableArray<Microsoft.Interop.ITypeBasedMarshallingInfoProvider>)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["Microsoft.Interop", "MarshallingInfoParser", False, "MarshallingInfoParser", "(Microsoft.Interop.GeneratorDiagnosticsBag,Microsoft.Interop.IElementInfoProvider,System.Collections.Immutable.ImmutableArray<Microsoft.Interop.IUseSiteAttributeParser>,System.Collections.Immutable.ImmutableArray<Microsoft.Interop.IMarshallingInfoAttributeParser>,System.Collections.Immutable.ImmutableArray<Microsoft.Interop.ITypeBasedMarshallingInfoProvider>)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
       - ["Microsoft.Interop", "MarshallingInfoParser", False, "MarshallingInfoParser", "(Microsoft.Interop.GeneratorDiagnosticsBag,Microsoft.Interop.IElementInfoProvider,System.Collections.Immutable.ImmutableArray<Microsoft.Interop.IUseSiteAttributeParser>,System.Collections.Immutable.ImmutableArray<Microsoft.Interop.IMarshallingInfoAttributeParser>,System.Collections.Immutable.ImmutableArray<Microsoft.Interop.ITypeBasedMarshallingInfoProvider>)", "", "Argument[2].Element", "Argument[this]", "taint", "df-generated"]
       - ["Microsoft.Interop", "MarshallingInfoParser", False, "MarshallingInfoParser", "(Microsoft.Interop.GeneratorDiagnosticsBag,Microsoft.Interop.IElementInfoProvider,System.Collections.Immutable.ImmutableArray<Microsoft.Interop.IUseSiteAttributeParser>,System.Collections.Immutable.ImmutableArray<Microsoft.Interop.IMarshallingInfoAttributeParser>,System.Collections.Immutable.ImmutableArray<Microsoft.Interop.ITypeBasedMarshallingInfoProvider>)", "", "Argument[3].Element", "Argument[this]", "taint", "df-generated"]
       - ["Microsoft.Interop", "MarshallingInfoParser", False, "MarshallingInfoParser", "(Microsoft.Interop.GeneratorDiagnosticsBag,Microsoft.Interop.IElementInfoProvider,System.Collections.Immutable.ImmutableArray<Microsoft.Interop.IUseSiteAttributeParser>,System.Collections.Immutable.ImmutableArray<Microsoft.Interop.IMarshallingInfoAttributeParser>,System.Collections.Immutable.ImmutableArray<Microsoft.Interop.ITypeBasedMarshallingInfoProvider>)", "", "Argument[4].Element", "Argument[this]", "taint", "df-generated"]
-      - ["Microsoft.Interop", "MethodSignatureElementInfoProvider", False, "MethodSignatureElementInfoProvider", "(Microsoft.CodeAnalysis.Compilation,Microsoft.Interop.GeneratorDiagnosticsBag,Microsoft.CodeAnalysis.IMethodSymbol,System.Collections.Immutable.ImmutableArray<Microsoft.Interop.IUseSiteAttributeParser>)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["Microsoft.Interop", "MethodSignatureElementInfoProvider", False, "MethodSignatureElementInfoProvider", "(Microsoft.CodeAnalysis.Compilation,Microsoft.Interop.GeneratorDiagnosticsBag,Microsoft.CodeAnalysis.IMethodSymbol,System.Collections.Immutable.ImmutableArray<Microsoft.Interop.IUseSiteAttributeParser>)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["Microsoft.Interop", "MethodSignatureElementInfoProvider", False, "MethodSignatureElementInfoProvider", "(Microsoft.CodeAnalysis.Compilation,Microsoft.Interop.GeneratorDiagnosticsBag,Microsoft.CodeAnalysis.IMethodSymbol,System.Collections.Immutable.ImmutableArray<Microsoft.Interop.IUseSiteAttributeParser>)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
-      - ["Microsoft.Interop", "MethodSignatureElementInfoProvider", False, "MethodSignatureElementInfoProvider", "(Microsoft.CodeAnalysis.Compilation,Microsoft.Interop.GeneratorDiagnosticsBag,Microsoft.CodeAnalysis.IMethodSymbol,System.Collections.Immutable.ImmutableArray<Microsoft.Interop.IUseSiteAttributeParser>)", "", "Argument[3].Element", "Argument[this]", "taint", "df-generated"]
+      - ["Microsoft.Interop", "MethodSignatureDiagnosticLocations", False, "CreateDiagnosticInfo", "(Microsoft.CodeAnalysis.DiagnosticDescriptor,Microsoft.Interop.GeneratorDiagnostic)", "", "Argument[0]", "ReturnValue.Property[Microsoft.Interop.DiagnosticInfo.Descriptor]", "value", "dfc-generated"]
+      - ["Microsoft.Interop", "MethodSignatureDiagnosticLocations", False, "CreateDiagnosticInfo", "(Microsoft.CodeAnalysis.DiagnosticDescriptor,Microsoft.Interop.GeneratorDiagnostic)", "", "Argument[this].Property[Microsoft.Interop.MethodSignatureDiagnosticLocations.FallbackLocation]", "ReturnValue.Property[Microsoft.Interop.DiagnosticInfo.Location]", "value", "dfc-generated"]
+      - ["Microsoft.Interop", "MethodSignatureElementInfoProvider", False, "MethodSignatureElementInfoProvider", "(Microsoft.CodeAnalysis.Compilation,Microsoft.Interop.GeneratorDiagnosticsBag,Microsoft.CodeAnalysis.IMethodSymbol,System.Collections.Immutable.ImmutableArray<Microsoft.Interop.IUseSiteAttributeParser>)", "", "Argument[2]", "Argument[this].SyntheticField[Microsoft.Interop.MethodSignatureElementInfoProvider._method]", "value", "dfc-generated"]
+      - ["Microsoft.Interop", "MethodSignatureElementInfoProvider", False, "TryGetInfoForElementName", "(Microsoft.CodeAnalysis.AttributeData,System.String,Microsoft.Interop.GetMarshallingInfoCallback,Microsoft.Interop.IElementInfoProvider,Microsoft.Interop.TypePositionInfo)", "", "Argument[this].SyntheticField[Microsoft.Interop.MethodSignatureElementInfoProvider._method].Property[Microsoft.CodeAnalysis.IMethodSymbol.ReturnType]", "Argument[2].Parameter[0]", "value", "dfc-generated"]
       - ["Microsoft.Interop", "NativeMarshallingAttributeParser", False, "NativeMarshallingAttributeParser", "(Microsoft.CodeAnalysis.Compilation,Microsoft.Interop.GeneratorDiagnosticsBag)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["Microsoft.Interop", "NativeMarshallingAttributeParser", False, "NativeMarshallingAttributeParser", "(Microsoft.CodeAnalysis.Compilation,Microsoft.Interop.GeneratorDiagnosticsBag)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["Microsoft.Interop", "NativeToManagedStubCodeContext", False, "NativeToManagedStubCodeContext", "(System.String,System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["Microsoft.Interop", "NativeToManagedStubCodeContext", False, "NativeToManagedStubCodeContext", "(System.String,System.String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["Microsoft.Interop", "NativeToManagedStubCodeContext", False, "GetIdentifiers", "(Microsoft.Interop.TypePositionInfo)", "", "Argument[0].Property[Microsoft.Interop.TypePositionInfo.InstanceIdentifier]", "ReturnValue.Field[System.ValueTuple`2.Item1]", "value", "dfc-generated"]
+      - ["Microsoft.Interop", "NativeToManagedStubCodeContext", False, "GetIdentifiers", "(Microsoft.Interop.TypePositionInfo)", "", "Argument[0].Property[Microsoft.Interop.TypePositionInfo.InstanceIdentifier]", "ReturnValue.Field[System.ValueTuple`2.Item2]", "taint", "dfc-generated"]
+      - ["Microsoft.Interop", "NativeToManagedStubCodeContext", False, "GetIdentifiers", "(Microsoft.Interop.TypePositionInfo)", "", "Argument[this].SyntheticField[Microsoft.Interop.NativeToManagedStubCodeContext._nativeReturnIdentifier]", "ReturnValue.Field[System.ValueTuple`2.Item2]", "value", "dfc-generated"]
+      - ["Microsoft.Interop", "NativeToManagedStubCodeContext", False, "GetIdentifiers", "(Microsoft.Interop.TypePositionInfo)", "", "Argument[this].SyntheticField[Microsoft.Interop.NativeToManagedStubCodeContext._returnIdentifier]", "ReturnValue.Field[System.ValueTuple`2.Item1]", "value", "dfc-generated"]
+      - ["Microsoft.Interop", "NativeToManagedStubCodeContext", False, "NativeToManagedStubCodeContext", "(System.String,System.String)", "", "Argument[0]", "Argument[this].SyntheticField[Microsoft.Interop.NativeToManagedStubCodeContext._returnIdentifier]", "value", "dfc-generated"]
+      - ["Microsoft.Interop", "NativeToManagedStubCodeContext", False, "NativeToManagedStubCodeContext", "(System.String,System.String)", "", "Argument[1]", "Argument[this].SyntheticField[Microsoft.Interop.NativeToManagedStubCodeContext._nativeReturnIdentifier]", "value", "dfc-generated"]
       - ["Microsoft.Interop", "OwnedValueCodeContext", False, "OwnedValueCodeContext", "(Microsoft.Interop.StubCodeContext)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["Microsoft.Interop", "SafeHandleMarshallingInfoProvider", False, "SafeHandleMarshallingInfoProvider", "(Microsoft.CodeAnalysis.Compilation,Microsoft.CodeAnalysis.ITypeSymbol)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["Microsoft.Interop", "SafeHandleMarshallingInfoProvider", False, "SafeHandleMarshallingInfoProvider", "(Microsoft.CodeAnalysis.Compilation,Microsoft.CodeAnalysis.ITypeSymbol)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
       - ["Microsoft.Interop", "SequenceEqualImmutableArray<T>", False, "get_Item", "(System.Int32)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Interop", "SignatureContext", False, "get_ManagedParameters", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["Microsoft.Interop", "StaticPinnableManagedValueMarshaller", False, "AsNativeType", "(Microsoft.Interop.TypePositionInfo)", "", "Argument[0].Property[Microsoft.Interop.TypePositionInfo.ManagedType]", "ReturnValue", "value", "dfc-generated"]
       - ["Microsoft.Interop", "StaticPinnableManagedValueMarshaller", False, "StaticPinnableManagedValueMarshaller", "(Microsoft.Interop.IMarshallingGenerator,Microsoft.CodeAnalysis.CSharp.Syntax.TypeSyntax)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["Microsoft.Interop", "StaticPinnableManagedValueMarshaller", False, "StaticPinnableManagedValueMarshaller", "(Microsoft.Interop.IMarshallingGenerator,Microsoft.CodeAnalysis.CSharp.Syntax.TypeSyntax)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
       - ["Microsoft.Interop", "StringMarshallingInfoProvider", False, "StringMarshallingInfoProvider", "(Microsoft.CodeAnalysis.Compilation,Microsoft.Interop.GeneratorDiagnosticsBag,Microsoft.CodeAnalysis.AttributeData,Microsoft.Interop.DefaultMarshallingInfo)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["Microsoft.Interop", "StringMarshallingInfoProvider", False, "StringMarshallingInfoProvider", "(Microsoft.CodeAnalysis.Compilation,Microsoft.Interop.GeneratorDiagnosticsBag,Microsoft.CodeAnalysis.AttributeData,Microsoft.Interop.DefaultMarshallingInfo)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
       - ["Microsoft.Interop", "StringMarshallingInfoProvider", False, "StringMarshallingInfoProvider", "(Microsoft.CodeAnalysis.Compilation,Microsoft.Interop.GeneratorDiagnosticsBag,Microsoft.CodeAnalysis.AttributeData,Microsoft.Interop.DefaultMarshallingInfo)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
       - ["Microsoft.Interop", "StringMarshallingInfoProvider", False, "StringMarshallingInfoProvider", "(Microsoft.CodeAnalysis.Compilation,Microsoft.Interop.GeneratorDiagnosticsBag,Microsoft.CodeAnalysis.AttributeData,Microsoft.Interop.DefaultMarshallingInfo)", "", "Argument[3]", "Argument[this]", "taint", "df-generated"]
-      - ["Microsoft.Interop", "StubCodeContext", True, "GetAdditionalIdentifier", "(Microsoft.Interop.TypePositionInfo,System.String)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Interop", "StubCodeContext", True, "GetAdditionalIdentifier", "(Microsoft.Interop.TypePositionInfo,System.String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Interop", "StubCodeContext", True, "GetIdentifiers", "(Microsoft.Interop.TypePositionInfo)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Interop", "StubCodeContext", True, "GetIdentifiers", "(Microsoft.Interop.TypePositionInfo)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["Microsoft.Interop", "StubCodeContext", True, "GetAdditionalIdentifier", "(Microsoft.Interop.TypePositionInfo,System.String)", "", "Argument[1]", "ReturnValue", "taint", "dfc-generated"]
+      - ["Microsoft.Interop", "StubCodeContext", True, "GetIdentifiers", "(Microsoft.Interop.TypePositionInfo)", "", "Argument[0].Property[Microsoft.Interop.TypePositionInfo.InstanceIdentifier]", "ReturnValue.Field[System.ValueTuple`2.Item1]", "value", "dfc-generated"]
+      - ["Microsoft.Interop", "StubCodeContext", True, "GetIdentifiers", "(Microsoft.Interop.TypePositionInfo)", "", "Argument[0].Property[Microsoft.Interop.TypePositionInfo.InstanceIdentifier]", "ReturnValue.Field[System.ValueTuple`2.Item2]", "taint", "dfc-generated"]
       - ["Microsoft.Interop", "StubEnvironment", False, "get_DefaultDllImportSearchPathsAttrType", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["Microsoft.Interop", "StubEnvironment", False, "get_LcidConversionAttrType", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["Microsoft.Interop", "StubEnvironment", False, "get_SuppressGCTransitionAttrType", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["Microsoft.Interop", "StubEnvironment", False, "get_UnmanagedCallConvAttrType", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Interop", "SyntaxExtensions", False, "AddToModifiers", "(Microsoft.CodeAnalysis.SyntaxTokenList,Microsoft.CodeAnalysis.CSharp.SyntaxKind)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Interop", "SyntaxExtensions", False, "IsInPartialContext", "(Microsoft.CodeAnalysis.CSharp.Syntax.TypeDeclarationSyntax,System.Nullable<Microsoft.CodeAnalysis.SyntaxToken>)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Interop", "SyntaxExtensions", False, "NestFixedStatements", "(System.Collections.Immutable.ImmutableArray<Microsoft.CodeAnalysis.CSharp.Syntax.FixedStatementSyntax>,Microsoft.CodeAnalysis.CSharp.Syntax.StatementSyntax)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Interop", "TypePositionInfo", False, "CreateForParameter", "(Microsoft.CodeAnalysis.IParameterSymbol,Microsoft.Interop.MarshallingInfo,Microsoft.CodeAnalysis.Compilation)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["Microsoft.Interop", "SyntaxExtensions", False, "AddToModifiers", "(Microsoft.CodeAnalysis.SyntaxTokenList,Microsoft.CodeAnalysis.CSharp.SyntaxKind)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Interop", "SyntaxExtensions", False, "IsInPartialContext", "(Microsoft.CodeAnalysis.CSharp.Syntax.TypeDeclarationSyntax,System.Nullable<Microsoft.CodeAnalysis.SyntaxToken>)", "", "Argument[0].Property[Microsoft.CodeAnalysis.CSharp.Syntax.BaseTypeDeclarationSyntax.Identifier]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Interop", "SyntaxExtensions", False, "IsInPartialContext", "(Microsoft.CodeAnalysis.CSharp.Syntax.TypeDeclarationSyntax,System.Nullable<Microsoft.CodeAnalysis.SyntaxToken>)", "", "Argument[0].Property[Microsoft.CodeAnalysis.SyntaxNode.Parent].Property[Microsoft.CodeAnalysis.CSharp.Syntax.BaseTypeDeclarationSyntax.Identifier]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Interop", "SyntaxExtensions", False, "NestFixedStatements", "(System.Collections.Immutable.ImmutableArray<Microsoft.CodeAnalysis.CSharp.Syntax.FixedStatementSyntax>,Microsoft.CodeAnalysis.CSharp.Syntax.StatementSyntax)", "", "Argument[1]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.Interop", "TypePositionInfo", False, "CreateForParameter", "(Microsoft.CodeAnalysis.IParameterSymbol,Microsoft.Interop.MarshallingInfo,Microsoft.CodeAnalysis.Compilation)", "", "Argument[0].Property[Microsoft.CodeAnalysis.ISymbol.Name]", "ReturnValue.Property[Microsoft.Interop.TypePositionInfo.InstanceIdentifier]", "value", "dfc-generated"]
       - ["Microsoft.Interop", "TypePositionInfo", False, "GetLocation", "(Microsoft.Interop.TypePositionInfo,Microsoft.CodeAnalysis.IMethodSymbol)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.Interop", "TypeSymbolExtensions", False, "ResolveUnboundConstructedTypeToConstructedType", "(Microsoft.CodeAnalysis.INamedTypeSymbol,Microsoft.CodeAnalysis.INamedTypeSymbol,System.Int32,System.Int32)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
   - addsTo:
       pack: codeql/csharp-all
       extensible: neutralModel
     data:
       - ["Microsoft.Interop", "ArrayMarshallingInfoProvider", "CanProvideMarshallingInfoForType", "(Microsoft.CodeAnalysis.ITypeSymbol)", "summary", "df-generated"]
       - ["Microsoft.Interop", "ArrayMarshallingInfoProvider", "CreateArrayMarshallingInfo", "(Microsoft.CodeAnalysis.Compilation,Microsoft.CodeAnalysis.ITypeSymbol,Microsoft.CodeAnalysis.ITypeSymbol,Microsoft.Interop.CountInfo,Microsoft.Interop.MarshallingInfo)", "summary", "df-generated"]
-      - ["Microsoft.Interop", "AttributedMarshallingModelGeneratorFactory", "Create", "(Microsoft.Interop.TypePositionInfo,Microsoft.Interop.StubCodeContext)", "summary", "df-generated"]
       - ["Microsoft.Interop", "AttributedMarshallingModelOptions", "AttributedMarshallingModelOptions", "(System.Boolean,Microsoft.Interop.MarshalMode,Microsoft.Interop.MarshalMode,Microsoft.Interop.MarshalMode)", "summary", "df-generated"]
       - ["Microsoft.Interop", "AttributedMarshallingModelOptions", "op_Equality", "(Microsoft.Interop.AttributedMarshallingModelOptions,Microsoft.Interop.AttributedMarshallingModelOptions)", "summary", "df-generated"]
       - ["Microsoft.Interop", "AttributedMarshallingModelOptions", "op_Inequality", "(Microsoft.Interop.AttributedMarshallingModelOptions,Microsoft.Interop.AttributedMarshallingModelOptions)", "summary", "df-generated"]
@@ -144,15 +175,12 @@ extensions:
       - ["Microsoft.Interop", "BoundGenerator", "BoundGenerator", "(Microsoft.Interop.TypePositionInfo,Microsoft.Interop.IMarshallingGenerator)", "summary", "df-generated"]
       - ["Microsoft.Interop", "BoundGenerator", "op_Equality", "(Microsoft.Interop.BoundGenerator,Microsoft.Interop.BoundGenerator)", "summary", "df-generated"]
       - ["Microsoft.Interop", "BoundGenerator", "op_Inequality", "(Microsoft.Interop.BoundGenerator,Microsoft.Interop.BoundGenerator)", "summary", "df-generated"]
-      - ["Microsoft.Interop", "BoundGenerators", "Create", "(System.Collections.Immutable.ImmutableArray<Microsoft.Interop.TypePositionInfo>,Microsoft.Interop.IMarshallingGeneratorFactory,Microsoft.Interop.StubCodeContext,Microsoft.Interop.IMarshallingGenerator,System.Collections.Immutable.ImmutableArray<Microsoft.Interop.GeneratorDiagnostic>)", "summary", "df-generated"]
       - ["Microsoft.Interop", "BoundGenerators", "GenerateTargetMethodSignatureData", "(Microsoft.Interop.StubCodeContext)", "summary", "df-generated"]
       - ["Microsoft.Interop", "BoundGenerators", "get_HasManagedExceptionMarshaller", "()", "summary", "df-generated"]
       - ["Microsoft.Interop", "BoundGenerators", "get_IsManagedVoidReturn", "()", "summary", "df-generated"]
       - ["Microsoft.Interop", "BoundGenerators", "get_IsUnmanagedVoidReturn", "()", "summary", "df-generated"]
       - ["Microsoft.Interop", "BoundGenerators", "get_ManagedNativeSameReturn", "()", "summary", "df-generated"]
       - ["Microsoft.Interop", "BreakingChangeDetector", "BreakingChangeDetector", "(Microsoft.Interop.IMarshallingGeneratorFactory)", "summary", "df-generated"]
-      - ["Microsoft.Interop", "BreakingChangeDetector", "Create", "(Microsoft.Interop.TypePositionInfo,Microsoft.Interop.StubCodeContext)", "summary", "df-generated"]
-      - ["Microsoft.Interop", "ByValueContentsMarshalKindValidator", "Create", "(Microsoft.Interop.TypePositionInfo,Microsoft.Interop.StubCodeContext)", "summary", "df-generated"]
       - ["Microsoft.Interop", "ByValueMarshalKindSupportDescriptor", "ByValueMarshalKindSupportDescriptor", "(Microsoft.Interop.ByValueMarshalKindSupportInfo,Microsoft.Interop.ByValueMarshalKindSupportInfo,Microsoft.Interop.ByValueMarshalKindSupportInfo,Microsoft.Interop.ByValueMarshalKindSupportInfo)", "summary", "df-generated"]
       - ["Microsoft.Interop", "ByValueMarshalKindSupportDescriptor", "get_EqualityContract", "()", "summary", "df-generated"]
       - ["Microsoft.Interop", "ByValueMarshalKindSupportDescriptor", "op_Equality", "(Microsoft.Interop.ByValueMarshalKindSupportDescriptor,Microsoft.Interop.ByValueMarshalKindSupportDescriptor)", "summary", "df-generated"]
@@ -161,7 +189,6 @@ extensions:
       - ["Microsoft.Interop", "ByValueMarshalKindSupportInfo", "op_Equality", "(Microsoft.Interop.ByValueMarshalKindSupportInfo,Microsoft.Interop.ByValueMarshalKindSupportInfo)", "summary", "df-generated"]
       - ["Microsoft.Interop", "ByValueMarshalKindSupportInfo", "op_Inequality", "(Microsoft.Interop.ByValueMarshalKindSupportInfo,Microsoft.Interop.ByValueMarshalKindSupportInfo)", "summary", "df-generated"]
       - ["Microsoft.Interop", "ByteBoolMarshaller", "ByteBoolMarshaller", "(System.Boolean)", "summary", "df-generated"]
-      - ["Microsoft.Interop", "CharMarshallingGeneratorFactory", "Create", "(Microsoft.Interop.TypePositionInfo,Microsoft.Interop.StubCodeContext)", "summary", "df-generated"]
       - ["Microsoft.Interop", "CharMarshallingInfoProvider", "CanProvideMarshallingInfoForType", "(Microsoft.CodeAnalysis.ITypeSymbol)", "summary", "df-generated"]
       - ["Microsoft.Interop", "CodeEmitOptions", "CodeEmitOptions", "(System.Boolean)", "summary", "df-generated"]
       - ["Microsoft.Interop", "CodeEmitOptions", "op_Equality", "(Microsoft.Interop.CodeEmitOptions,Microsoft.Interop.CodeEmitOptions)", "summary", "df-generated"]
@@ -247,6 +274,8 @@ extensions:
       - ["Microsoft.Interop", "DiagnosticOrTHelperExtensions", "Split<T,T2>", "(Microsoft.CodeAnalysis.IncrementalValuesProvider<System.ValueTuple<Microsoft.Interop.DiagnosticOr<T>,T2>>)", "summary", "df-generated"]
       - ["Microsoft.Interop", "DiagnosticOrTHelperExtensions", "Split<T>", "(Microsoft.CodeAnalysis.IncrementalValuesProvider<Microsoft.Interop.DiagnosticOr<T>>)", "summary", "df-generated"]
       - ["Microsoft.Interop", "DiagnosticOrTHelperExtensions", "SplitArrays<T>", "(Microsoft.CodeAnalysis.IncrementalValuesProvider<Microsoft.Interop.SequenceEqualImmutableArray<Microsoft.Interop.DiagnosticOr<T>>>)", "summary", "df-generated"]
+      - ["Microsoft.Interop", "ElementInfoProviderExtensions", "TryGetInfoForElementName", "(Microsoft.Interop.IElementInfoProvider,Microsoft.CodeAnalysis.AttributeData,System.String,Microsoft.Interop.GetMarshallingInfoCallback,Microsoft.Interop.TypePositionInfo)", "summary", "df-generated"]
+      - ["Microsoft.Interop", "ElementInfoProviderExtensions", "TryGetInfoForParamIndex", "(Microsoft.Interop.IElementInfoProvider,Microsoft.CodeAnalysis.AttributeData,System.Int32,Microsoft.Interop.GetMarshallingInfoCallback,Microsoft.Interop.TypePositionInfo)", "summary", "df-generated"]
       - ["Microsoft.Interop", "ElementsMarshallingCollectionSourceExtensions", "GetNumElementsAssignmentFromManagedValuesDestination", "(Microsoft.Interop.IElementsMarshallingCollectionSource,Microsoft.Interop.TypePositionInfo,Microsoft.Interop.StubCodeContext)", "summary", "df-generated"]
       - ["Microsoft.Interop", "ElementsMarshallingCollectionSourceExtensions", "GetNumElementsAssignmentFromManagedValuesSource", "(Microsoft.Interop.IElementsMarshallingCollectionSource,Microsoft.Interop.TypePositionInfo,Microsoft.Interop.StubCodeContext)", "summary", "df-generated"]
       - ["Microsoft.Interop", "EnumTypeInfo", "EnumTypeInfo", "(System.String,System.String,Microsoft.CodeAnalysis.SpecialType)", "summary", "df-generated"]
@@ -272,6 +301,7 @@ extensions:
       - ["Microsoft.Interop", "GeneratorDiagnostic+UnnecessaryData", "get_EqualityContract", "()", "summary", "df-generated"]
       - ["Microsoft.Interop", "GeneratorDiagnostic+UnnecessaryData", "op_Equality", "(Microsoft.Interop.GeneratorDiagnostic+UnnecessaryData,Microsoft.Interop.GeneratorDiagnostic+UnnecessaryData)", "summary", "df-generated"]
       - ["Microsoft.Interop", "GeneratorDiagnostic+UnnecessaryData", "op_Inequality", "(Microsoft.Interop.GeneratorDiagnostic+UnnecessaryData,Microsoft.Interop.GeneratorDiagnostic+UnnecessaryData)", "summary", "df-generated"]
+      - ["Microsoft.Interop", "GeneratorDiagnostic", "ToDiagnosticInfo", "(Microsoft.CodeAnalysis.DiagnosticDescriptor,Microsoft.CodeAnalysis.Location,System.String)", "summary", "df-generated"]
       - ["Microsoft.Interop", "GeneratorDiagnostic", "get_EqualityContract", "()", "summary", "df-generated"]
       - ["Microsoft.Interop", "GeneratorDiagnostic", "get_IsFatal", "()", "summary", "df-generated"]
       - ["Microsoft.Interop", "GeneratorDiagnostic", "get_StubCodeContext", "()", "summary", "df-generated"]
@@ -299,16 +329,19 @@ extensions:
       - ["Microsoft.Interop", "IDiagnosticDescriptorProvider", "get_ConfigurationValueNotSupported", "()", "summary", "df-generated"]
       - ["Microsoft.Interop", "IDiagnosticDescriptorProvider", "get_InvalidMarshallingAttributeInfo", "()", "summary", "df-generated"]
       - ["Microsoft.Interop", "IElementInfoProvider", "FindNameForParamIndex", "(System.Int32)", "summary", "df-generated"]
+      - ["Microsoft.Interop", "IElementInfoProvider", "TryGetInfoForElementName", "(Microsoft.CodeAnalysis.AttributeData,System.String,Microsoft.Interop.GetMarshallingInfoCallback,Microsoft.Interop.IElementInfoProvider,Microsoft.Interop.TypePositionInfo)", "summary", "df-generated"]
+      - ["Microsoft.Interop", "IElementInfoProvider", "TryGetInfoForParamIndex", "(Microsoft.CodeAnalysis.AttributeData,System.Int32,Microsoft.Interop.GetMarshallingInfoCallback,Microsoft.Interop.IElementInfoProvider,Microsoft.Interop.TypePositionInfo)", "summary", "df-generated"]
       - ["Microsoft.Interop", "IMarshallingGenerator", "Generate", "(Microsoft.Interop.TypePositionInfo,Microsoft.Interop.StubCodeContext)", "summary", "df-generated"]
       - ["Microsoft.Interop", "IMarshallingGenerator", "GetNativeSignatureBehavior", "(Microsoft.Interop.TypePositionInfo)", "summary", "df-generated"]
       - ["Microsoft.Interop", "IMarshallingGenerator", "GetValueBoundaryBehavior", "(Microsoft.Interop.TypePositionInfo,Microsoft.Interop.StubCodeContext)", "summary", "df-generated"]
       - ["Microsoft.Interop", "IMarshallingGenerator", "SupportsByValueMarshalKind", "(Microsoft.Interop.ByValueContentsMarshalKind,Microsoft.Interop.TypePositionInfo,Microsoft.Interop.StubCodeContext,Microsoft.Interop.GeneratorDiagnostic)", "summary", "df-generated"]
       - ["Microsoft.Interop", "IMarshallingGenerator", "UsesNativeIdentifier", "(Microsoft.Interop.TypePositionInfo,Microsoft.Interop.StubCodeContext)", "summary", "df-generated"]
-      - ["Microsoft.Interop", "IMarshallingGeneratorFactory", "Create", "(Microsoft.Interop.TypePositionInfo,Microsoft.Interop.StubCodeContext)", "summary", "df-generated"]
       - ["Microsoft.Interop", "IMarshallingInfoAttributeParser", "CanParseAttributeType", "(Microsoft.CodeAnalysis.INamedTypeSymbol)", "summary", "df-generated"]
+      - ["Microsoft.Interop", "ISignatureDiagnosticLocations", "CreateDiagnosticInfo", "(Microsoft.CodeAnalysis.DiagnosticDescriptor,Microsoft.Interop.GeneratorDiagnostic)", "summary", "df-generated"]
       - ["Microsoft.Interop", "ISymbolExtensions", "IsAccessibleFromFileScopedClass", "(Microsoft.CodeAnalysis.INamedTypeSymbol,System.String)", "summary", "df-generated"]
       - ["Microsoft.Interop", "ITypeBasedMarshallingInfoProvider", "CanProvideMarshallingInfoForType", "(Microsoft.CodeAnalysis.ITypeSymbol)", "summary", "df-generated"]
       - ["Microsoft.Interop", "IUseSiteAttributeParser", "CanParseAttributeType", "(Microsoft.CodeAnalysis.INamedTypeSymbol)", "summary", "df-generated"]
+      - ["Microsoft.Interop", "IUseSiteAttributeParser", "ParseAttribute", "(Microsoft.CodeAnalysis.AttributeData,Microsoft.Interop.IElementInfoProvider,Microsoft.Interop.GetMarshallingInfoCallback)", "summary", "df-generated"]
       - ["Microsoft.Interop", "IncrementalGeneratorInitializationContextExtensions", "CreateEnvironmentFlagsProvider", "(Microsoft.CodeAnalysis.IncrementalGeneratorInitializationContext)", "summary", "df-generated"]
       - ["Microsoft.Interop", "IncrementalGeneratorInitializationContextExtensions", "CreateStubEnvironmentProvider", "(Microsoft.CodeAnalysis.IncrementalGeneratorInitializationContext)", "summary", "df-generated"]
       - ["Microsoft.Interop", "IncrementalGeneratorInitializationContextExtensions", "RegisterConcatenatedSyntaxOutputs<TNode>", "(Microsoft.CodeAnalysis.IncrementalGeneratorInitializationContext,Microsoft.CodeAnalysis.IncrementalValuesProvider<TNode>,System.String)", "summary", "df-generated"]
@@ -344,23 +377,25 @@ extensions:
       - ["Microsoft.Interop", "ManualTypeMarshallingHelper", "IsLinearCollectionEntryPoint", "(Microsoft.CodeAnalysis.INamedTypeSymbol)", "summary", "df-generated"]
       - ["Microsoft.Interop", "ManualTypeMarshallingHelper", "ModeUsesManagedToUnmanagedShape", "(Microsoft.Interop.MarshalMode)", "summary", "df-generated"]
       - ["Microsoft.Interop", "ManualTypeMarshallingHelper", "ModeUsesUnmanagedToManagedShape", "(Microsoft.Interop.MarshalMode)", "summary", "df-generated"]
+      - ["Microsoft.Interop", "ManualTypeMarshallingHelper", "TryGetLinearCollectionMarshallersFromEntryType", "(Microsoft.CodeAnalysis.INamedTypeSymbol,Microsoft.CodeAnalysis.ITypeSymbol,Microsoft.CodeAnalysis.Compilation,System.Func<Microsoft.CodeAnalysis.ITypeSymbol,Microsoft.Interop.MarshallingInfo>,System.Nullable<Microsoft.Interop.CustomTypeMarshallers>)", "summary", "df-generated"]
       - ["Microsoft.Interop", "ManualTypeMarshallingHelper", "TryGetValueMarshallersFromEntryType", "(Microsoft.CodeAnalysis.INamedTypeSymbol,Microsoft.CodeAnalysis.ITypeSymbol,Microsoft.CodeAnalysis.Compilation,System.Nullable<Microsoft.Interop.CustomTypeMarshallers>)", "summary", "df-generated"]
       - ["Microsoft.Interop", "MarshalAsArrayInfo", "MarshalAsArrayInfo", "(System.Runtime.InteropServices.UnmanagedType,Microsoft.Interop.CharEncoding,System.Runtime.InteropServices.UnmanagedType,Microsoft.Interop.CountInfo)", "summary", "df-generated"]
       - ["Microsoft.Interop", "MarshalAsArrayInfo", "get_EqualityContract", "()", "summary", "df-generated"]
       - ["Microsoft.Interop", "MarshalAsArrayInfo", "op_Equality", "(Microsoft.Interop.MarshalAsArrayInfo,Microsoft.Interop.MarshalAsArrayInfo)", "summary", "df-generated"]
       - ["Microsoft.Interop", "MarshalAsArrayInfo", "op_Inequality", "(Microsoft.Interop.MarshalAsArrayInfo,Microsoft.Interop.MarshalAsArrayInfo)", "summary", "df-generated"]
       - ["Microsoft.Interop", "MarshalAsAttributeParser", "CanParseAttributeType", "(Microsoft.CodeAnalysis.INamedTypeSymbol)", "summary", "df-generated"]
+      - ["Microsoft.Interop", "MarshalAsAttributeParser", "ParseAttribute", "(Microsoft.CodeAnalysis.AttributeData,Microsoft.Interop.IElementInfoProvider,Microsoft.Interop.GetMarshallingInfoCallback)", "summary", "df-generated"]
       - ["Microsoft.Interop", "MarshalAsInfo", "MarshalAsInfo", "(System.Runtime.InteropServices.UnmanagedType,Microsoft.Interop.CharEncoding)", "summary", "df-generated"]
       - ["Microsoft.Interop", "MarshalAsInfo", "get_EqualityContract", "()", "summary", "df-generated"]
       - ["Microsoft.Interop", "MarshalAsInfo", "op_Equality", "(Microsoft.Interop.MarshalAsInfo,Microsoft.Interop.MarshalAsInfo)", "summary", "df-generated"]
       - ["Microsoft.Interop", "MarshalAsInfo", "op_Inequality", "(Microsoft.Interop.MarshalAsInfo,Microsoft.Interop.MarshalAsInfo)", "summary", "df-generated"]
-      - ["Microsoft.Interop", "MarshalAsMarshallingGeneratorFactory", "Create", "(Microsoft.Interop.TypePositionInfo,Microsoft.Interop.StubCodeContext)", "summary", "df-generated"]
       - ["Microsoft.Interop", "MarshalAsScalarInfo", "MarshalAsScalarInfo", "(System.Runtime.InteropServices.UnmanagedType,Microsoft.Interop.CharEncoding)", "summary", "df-generated"]
       - ["Microsoft.Interop", "MarshalAsScalarInfo", "get_EqualityContract", "()", "summary", "df-generated"]
       - ["Microsoft.Interop", "MarshalAsScalarInfo", "op_Equality", "(Microsoft.Interop.MarshalAsScalarInfo,Microsoft.Interop.MarshalAsScalarInfo)", "summary", "df-generated"]
       - ["Microsoft.Interop", "MarshalAsScalarInfo", "op_Inequality", "(Microsoft.Interop.MarshalAsScalarInfo,Microsoft.Interop.MarshalAsScalarInfo)", "summary", "df-generated"]
       - ["Microsoft.Interop", "MarshalAsWithCustomMarshallersParser", "CanParseAttributeType", "(Microsoft.CodeAnalysis.INamedTypeSymbol)", "summary", "df-generated"]
       - ["Microsoft.Interop", "MarshalUsingAttributeParser", "CanParseAttributeType", "(Microsoft.CodeAnalysis.INamedTypeSymbol)", "summary", "df-generated"]
+      - ["Microsoft.Interop", "MarshalUsingAttributeParser", "ParseAttribute", "(Microsoft.CodeAnalysis.AttributeData,Microsoft.Interop.IElementInfoProvider,Microsoft.Interop.GetMarshallingInfoCallback)", "summary", "df-generated"]
       - ["Microsoft.Interop", "MarshallerHelpers", "CreateClearLastSystemErrorStatement", "(System.Int32)", "summary", "df-generated"]
       - ["Microsoft.Interop", "MarshallerHelpers", "CreateGetLastSystemErrorStatement", "(System.String)", "summary", "df-generated"]
       - ["Microsoft.Interop", "MarshallerHelpers", "CreateSetLastPInvokeErrorStatement", "(System.String)", "summary", "df-generated"]
@@ -390,6 +425,7 @@ extensions:
       - ["Microsoft.Interop", "MethodSignatureDiagnosticLocations", "op_Equality", "(Microsoft.Interop.MethodSignatureDiagnosticLocations,Microsoft.Interop.MethodSignatureDiagnosticLocations)", "summary", "df-generated"]
       - ["Microsoft.Interop", "MethodSignatureDiagnosticLocations", "op_Inequality", "(Microsoft.Interop.MethodSignatureDiagnosticLocations,Microsoft.Interop.MethodSignatureDiagnosticLocations)", "summary", "df-generated"]
       - ["Microsoft.Interop", "MethodSignatureElementInfoProvider", "FindNameForParamIndex", "(System.Int32)", "summary", "df-generated"]
+      - ["Microsoft.Interop", "MethodSignatureElementInfoProvider", "TryGetInfoForParamIndex", "(Microsoft.CodeAnalysis.AttributeData,System.Int32,Microsoft.Interop.GetMarshallingInfoCallback,Microsoft.Interop.IElementInfoProvider,Microsoft.Interop.TypePositionInfo)", "summary", "df-generated"]
       - ["Microsoft.Interop", "MissingSupportCollectionMarshallingInfo", "MissingSupportCollectionMarshallingInfo", "(Microsoft.Interop.CountInfo,Microsoft.Interop.MarshallingInfo)", "summary", "df-generated"]
       - ["Microsoft.Interop", "MissingSupportCollectionMarshallingInfo", "get_EqualityContract", "()", "summary", "df-generated"]
       - ["Microsoft.Interop", "MissingSupportCollectionMarshallingInfo", "op_Equality", "(Microsoft.Interop.MissingSupportCollectionMarshallingInfo,Microsoft.Interop.MissingSupportCollectionMarshallingInfo)", "summary", "df-generated"]
@@ -427,7 +463,6 @@ extensions:
       - ["Microsoft.Interop", "NoMarshallingInfo", "get_EqualityContract", "()", "summary", "df-generated"]
       - ["Microsoft.Interop", "NoMarshallingInfo", "op_Equality", "(Microsoft.Interop.NoMarshallingInfo,Microsoft.Interop.NoMarshallingInfo)", "summary", "df-generated"]
       - ["Microsoft.Interop", "NoMarshallingInfo", "op_Inequality", "(Microsoft.Interop.NoMarshallingInfo,Microsoft.Interop.NoMarshallingInfo)", "summary", "df-generated"]
-      - ["Microsoft.Interop", "NoMarshallingInfoErrorMarshallingFactory", "Create", "(Microsoft.Interop.TypePositionInfo,Microsoft.Interop.StubCodeContext)", "summary", "df-generated"]
       - ["Microsoft.Interop", "NoMarshallingInfoErrorMarshallingFactory", "NoMarshallingInfoErrorMarshallingFactory", "(Microsoft.Interop.IMarshallingGeneratorFactory,System.String)", "summary", "df-generated"]
       - ["Microsoft.Interop", "NoMarshallingInfoErrorMarshallingFactory", "get_CustomTypeToErrorMessageMap", "()", "summary", "df-generated"]
       - ["Microsoft.Interop", "OwnedValueCodeContext", "get_AdditionalTemporaryStateLivesAcrossStages", "()", "summary", "df-generated"]
@@ -464,6 +499,7 @@ extensions:
       - ["Microsoft.Interop", "SignatureContext", "Create", "(Microsoft.CodeAnalysis.IMethodSymbol,Microsoft.Interop.MarshallingInfoParser,Microsoft.Interop.StubEnvironment,Microsoft.Interop.CodeEmitOptions,System.Reflection.Assembly)", "summary", "df-generated"]
       - ["Microsoft.Interop", "SignatureContext", "Equals", "(Microsoft.Interop.SignatureContext)", "summary", "df-generated"]
       - ["Microsoft.Interop", "SignatureContext", "GetHashCode", "()", "summary", "df-generated"]
+      - ["Microsoft.Interop", "SignatureContext", "get_ManagedParameters", "()", "summary", "df-generated"]
       - ["Microsoft.Interop", "SignatureContext", "get_StubParameters", "()", "summary", "df-generated"]
       - ["Microsoft.Interop", "SignatureContext", "op_Equality", "(Microsoft.Interop.SignatureContext,Microsoft.Interop.SignatureContext)", "summary", "df-generated"]
       - ["Microsoft.Interop", "SignatureContext", "op_Inequality", "(Microsoft.Interop.SignatureContext,Microsoft.Interop.SignatureContext)", "summary", "df-generated"]
@@ -558,6 +594,7 @@ extensions:
       - ["Microsoft.Interop", "TypeSymbolExtensions", "IsIntegralType", "(Microsoft.CodeAnalysis.SpecialType)", "summary", "df-generated"]
       - ["Microsoft.Interop", "TypeSymbolExtensions", "IsOfType", "(Microsoft.CodeAnalysis.INamedTypeSymbol,System.String)", "summary", "df-generated"]
       - ["Microsoft.Interop", "TypeSymbolExtensions", "IsStrictlyBlittableInContext", "(Microsoft.CodeAnalysis.ITypeSymbol,Microsoft.CodeAnalysis.Compilation)", "summary", "df-generated"]
+      - ["Microsoft.Interop", "TypeSymbolExtensions", "ResolveUnboundConstructedTypeToConstructedType", "(Microsoft.CodeAnalysis.INamedTypeSymbol,Microsoft.CodeAnalysis.INamedTypeSymbol,System.Int32,System.Int32)", "summary", "df-generated"]
       - ["Microsoft.Interop", "TypeSyntaxes", "CallConv", "(System.String)", "summary", "df-generated"]
       - ["Microsoft.Interop", "TypeSyntaxes", "get_DllImportSearchPath", "()", "summary", "df-generated"]
       - ["Microsoft.Interop", "TypeSyntaxes", "get_IComExposedClass", "()", "summary", "df-generated"]
@@ -591,7 +628,6 @@ extensions:
       - ["Microsoft.Interop", "UnmanagedBlittableMarshallingInfo", "get_EqualityContract", "()", "summary", "df-generated"]
       - ["Microsoft.Interop", "UnmanagedBlittableMarshallingInfo", "op_Equality", "(Microsoft.Interop.UnmanagedBlittableMarshallingInfo,Microsoft.Interop.UnmanagedBlittableMarshallingInfo)", "summary", "df-generated"]
       - ["Microsoft.Interop", "UnmanagedBlittableMarshallingInfo", "op_Inequality", "(Microsoft.Interop.UnmanagedBlittableMarshallingInfo,Microsoft.Interop.UnmanagedBlittableMarshallingInfo)", "summary", "df-generated"]
-      - ["Microsoft.Interop", "UnsupportedMarshallingFactory", "Create", "(Microsoft.Interop.TypePositionInfo,Microsoft.Interop.StubCodeContext)", "summary", "df-generated"]
       - ["Microsoft.Interop", "UseSiteAttributeData", "UseSiteAttributeData", "(System.Int32,Microsoft.Interop.CountInfo,Microsoft.CodeAnalysis.AttributeData)", "summary", "df-generated"]
       - ["Microsoft.Interop", "UseSiteAttributeData", "op_Equality", "(Microsoft.Interop.UseSiteAttributeData,Microsoft.Interop.UseSiteAttributeData)", "summary", "df-generated"]
       - ["Microsoft.Interop", "UseSiteAttributeData", "op_Inequality", "(Microsoft.Interop.UseSiteAttributeData,Microsoft.Interop.UseSiteAttributeData)", "summary", "df-generated"]
@@ -613,6 +649,7 @@ extensions:
       - ["Microsoft.Interop", "ValueEqualityImmutableDictionary<T,U>", "get_IsReadOnly", "()", "summary", "df-generated"]
       - ["Microsoft.Interop", "ValueEqualityImmutableDictionary<T,U>", "op_Equality", "(Microsoft.Interop.ValueEqualityImmutableDictionary<T,U>,Microsoft.Interop.ValueEqualityImmutableDictionary<T,U>)", "summary", "df-generated"]
       - ["Microsoft.Interop", "ValueEqualityImmutableDictionary<T,U>", "op_Inequality", "(Microsoft.Interop.ValueEqualityImmutableDictionary<T,U>,Microsoft.Interop.ValueEqualityImmutableDictionary<T,U>)", "summary", "df-generated"]
+      - ["Microsoft.Interop", "ValueEqualityImmutableDictionaryHelperExtensions", "ToValueEqualityImmutableDictionary<TSource,TKey,TValue>", "(System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,TKey>,System.Func<TSource,TValue>)", "summary", "df-generated"]
       - ["Microsoft.Interop", "ValueEqualityImmutableDictionaryHelperExtensions", "ToValueEquals<TKey,TValue>", "(System.Collections.Immutable.ImmutableDictionary<TKey,TValue>)", "summary", "df-generated"]
       - ["Microsoft.Interop", "ValueTypeInfo", "ValueTypeInfo", "(System.String,System.String,System.Boolean)", "summary", "df-generated"]
       - ["Microsoft.Interop", "ValueTypeInfo", "get_EqualityContract", "()", "summary", "df-generated"]
diff --git a/csharp/ql/lib/ext/generated/Microsoft.NET.Build.Tasks.model.yml b/csharp/ql/lib/ext/generated/Microsoft.NET.Build.Tasks.model.yml
index 5f0f0021a57..a4bbd1766cc 100644
--- a/csharp/ql/lib/ext/generated/Microsoft.NET.Build.Tasks.model.yml
+++ b/csharp/ql/lib/ext/generated/Microsoft.NET.Build.Tasks.model.yml
@@ -4,10 +4,11 @@ extensions:
       pack: codeql/csharp-all
       extensible: summaryModel
     data:
-      - ["Microsoft.NET.Build.Tasks", "RunReadyToRunCompiler", True, "GenerateCommandLineCommands", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["Microsoft.NET.Build.Tasks", "RunReadyToRunCompiler", True, "GenerateCommandLineCommands", "()", "", "Argument[this].Property[Microsoft.NET.Build.Tasks.RunReadyToRunCompiler.Crossgen2Tool].Property[Microsoft.Build.Framework.ITaskItem.ItemSpec]", "ReturnValue", "taint", "dfc-generated"]
       - ["Microsoft.NET.Build.Tasks", "RunReadyToRunCompiler", True, "GenerateFullPathToTool", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["Microsoft.NET.Build.Tasks", "RunReadyToRunCompiler", True, "GenerateResponseFileCommands", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.NET.Build.Tasks", "RunReadyToRunCompiler", True, "get_ToolName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["Microsoft.NET.Build.Tasks", "RunReadyToRunCompiler", True, "get_ToolName", "()", "", "Argument[this].Property[Microsoft.NET.Build.Tasks.RunReadyToRunCompiler.Crossgen2Tool].Property[Microsoft.Build.Framework.ITaskItem.ItemSpec]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.NET.Build.Tasks", "RunReadyToRunCompiler", True, "get_ToolName", "()", "", "Argument[this].Property[Microsoft.NET.Build.Tasks.RunReadyToRunCompiler.CrossgenTool].Property[Microsoft.Build.Framework.ITaskItem.ItemSpec]", "ReturnValue", "value", "dfc-generated"]
   - addsTo:
       pack: codeql/csharp-all
       extensible: neutralModel
diff --git a/csharp/ql/lib/ext/generated/Microsoft.NET.Sdk.WebAssembly.model.yml b/csharp/ql/lib/ext/generated/Microsoft.NET.Sdk.WebAssembly.model.yml
index 4dafb4de50f..d412cf13e60 100644
--- a/csharp/ql/lib/ext/generated/Microsoft.NET.Sdk.WebAssembly.model.yml
+++ b/csharp/ql/lib/ext/generated/Microsoft.NET.Sdk.WebAssembly.model.yml
@@ -1,5 +1,11 @@
 # THIS FILE IS AN AUTO-GENERATED MODELS AS DATA FILE. DO NOT EDIT.
 extensions:
+  - addsTo:
+      pack: codeql/csharp-all
+      extensible: summaryModel
+    data:
+      - ["Microsoft.NET.Sdk.WebAssembly", "ConvertDllsToWebCil", True, "Execute", "()", "", "Argument[this].Property[Microsoft.NET.Sdk.WebAssembly.ConvertDllsToWebCil.Candidates]", "Argument[this].Property[Microsoft.NET.Sdk.WebAssembly.ConvertDllsToWebCil.WebCilCandidates]", "value", "dfc-generated"]
+      - ["Microsoft.NET.Sdk.WebAssembly", "ConvertDllsToWebCil", True, "Execute", "()", "", "Argument[this].Property[Microsoft.NET.Sdk.WebAssembly.ConvertDllsToWebCil.OutputPath]", "Argument[this].Field[Microsoft.NET.Sdk.WebAssembly.ConvertDllsToWebCil._fileWrites].Element", "taint", "dfc-generated"]
   - addsTo:
       pack: codeql/csharp-all
       extensible: neutralModel
@@ -13,7 +19,6 @@ extensions:
       - ["Microsoft.NET.Sdk.WebAssembly", "BootJsonBuilderHelper", "GetNativeResourceTargetInBootConfig", "(Microsoft.NET.Sdk.WebAssembly.BootJsonData,System.String)", "summary", "df-generated"]
       - ["Microsoft.NET.Sdk.WebAssembly", "ComputeWasmBuildAssets", "Execute", "()", "summary", "df-generated"]
       - ["Microsoft.NET.Sdk.WebAssembly", "ComputeWasmPublishAssets", "Execute", "()", "summary", "df-generated"]
-      - ["Microsoft.NET.Sdk.WebAssembly", "ConvertDllsToWebCil", "Execute", "()", "summary", "df-generated"]
       - ["Microsoft.NET.Sdk.WebAssembly", "ConvertDllsToWebCil", "get_FileWrites", "()", "summary", "df-generated"]
       - ["Microsoft.NET.Sdk.WebAssembly", "FileHasher", "GetFileHash", "(System.String)", "summary", "df-generated"]
       - ["Microsoft.NET.Sdk.WebAssembly", "GenerateWasmBootJson", "Execute", "()", "summary", "df-generated"]
diff --git a/csharp/ql/lib/ext/generated/Microsoft.NET.WebAssembly.Webcil.model.yml b/csharp/ql/lib/ext/generated/Microsoft.NET.WebAssembly.Webcil.model.yml
index 2d22e548fd1..b9ba2d178cc 100644
--- a/csharp/ql/lib/ext/generated/Microsoft.NET.WebAssembly.Webcil.model.yml
+++ b/csharp/ql/lib/ext/generated/Microsoft.NET.WebAssembly.Webcil.model.yml
@@ -6,8 +6,6 @@ extensions:
     data:
       - ["Microsoft.NET.WebAssembly.Webcil", "WebcilConverter", False, "FromPortableExecutable", "(System.String,System.String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["Microsoft.NET.WebAssembly.Webcil", "WebcilConverter", False, "FromPortableExecutable", "(System.String,System.String)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["Microsoft.NET.WebAssembly.Webcil", "WebcilConverter", False, "WriteConversionTo", "(System.IO.Stream,System.IO.FileStream,Microsoft.NET.WebAssembly.Webcil.WebcilConverter+PEFileInfo,Microsoft.NET.WebAssembly.Webcil.WebcilConverter+WCFileInfo)", "", "Argument[1]", "Argument[0]", "taint", "df-generated"]
-      - ["Microsoft.NET.WebAssembly.Webcil", "WebcilReader", False, "GetMetadataReader", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["Microsoft.NET.WebAssembly.Webcil", "WebcilReader", False, "GetMetadataReaderProvider", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["Microsoft.NET.WebAssembly.Webcil", "WebcilReader", False, "WebcilReader", "(System.IO.Stream)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["Microsoft.NET.WebAssembly.Webcil", "WebcilReader", False, "WebcilReader", "(System.IO.Stream,System.String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
@@ -30,7 +28,9 @@ extensions:
       - ["Microsoft.NET.WebAssembly.Webcil", "WebcilConverter+WCFileInfo", "op_Inequality", "(Microsoft.NET.WebAssembly.Webcil.WebcilConverter+WCFileInfo,Microsoft.NET.WebAssembly.Webcil.WebcilConverter+WCFileInfo)", "summary", "df-generated"]
       - ["Microsoft.NET.WebAssembly.Webcil", "WebcilConverter", "ConvertToWebcil", "()", "summary", "df-generated"]
       - ["Microsoft.NET.WebAssembly.Webcil", "WebcilConverter", "GatherInfo", "(System.Reflection.PortableExecutable.PEReader,Microsoft.NET.WebAssembly.Webcil.WebcilConverter+WCFileInfo,Microsoft.NET.WebAssembly.Webcil.WebcilConverter+PEFileInfo)", "summary", "df-generated"]
+      - ["Microsoft.NET.WebAssembly.Webcil", "WebcilConverter", "WriteConversionTo", "(System.IO.Stream,System.IO.FileStream,Microsoft.NET.WebAssembly.Webcil.WebcilConverter+PEFileInfo,Microsoft.NET.WebAssembly.Webcil.WebcilConverter+WCFileInfo)", "summary", "df-generated"]
       - ["Microsoft.NET.WebAssembly.Webcil", "WebcilReader", "Dispose", "()", "summary", "df-generated"]
+      - ["Microsoft.NET.WebAssembly.Webcil", "WebcilReader", "GetMetadataReader", "()", "summary", "df-generated"]
       - ["Microsoft.NET.WebAssembly.Webcil", "WebcilReader", "ReadCodeViewDebugDirectoryData", "(System.Reflection.PortableExecutable.DebugDirectoryEntry)", "summary", "df-generated"]
       - ["Microsoft.NET.WebAssembly.Webcil", "WebcilReader", "ReadDebugDirectory", "()", "summary", "df-generated"]
       - ["Microsoft.NET.WebAssembly.Webcil", "WebcilReader", "ReadEmbeddedPortablePdbDebugDirectoryData", "(System.Reflection.PortableExecutable.DebugDirectoryEntry)", "summary", "df-generated"]
diff --git a/csharp/ql/lib/ext/generated/Microsoft.VisualBasic.CompilerServices.model.yml b/csharp/ql/lib/ext/generated/Microsoft.VisualBasic.CompilerServices.model.yml
index 5123bb49724..043830b1d67 100644
--- a/csharp/ql/lib/ext/generated/Microsoft.VisualBasic.CompilerServices.model.yml
+++ b/csharp/ql/lib/ext/generated/Microsoft.VisualBasic.CompilerServices.model.yml
@@ -1,5 +1,10 @@
 # THIS FILE IS AN AUTO-GENERATED MODELS AS DATA FILE. DO NOT EDIT.
 extensions:
+  - addsTo:
+      pack: codeql/csharp-all
+      extensible: summaryModel
+    data:
+      - ["Microsoft.VisualBasic.CompilerServices", "StringType", False, "MidStmtStr", "(System.String,System.Int32,System.Int32,System.String)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
   - addsTo:
       pack: codeql/csharp-all
       extensible: neutralModel
@@ -192,7 +197,6 @@ extensions:
       - ["Microsoft.VisualBasic.CompilerServices", "StringType", "FromShort", "(System.Int16)", "summary", "df-generated"]
       - ["Microsoft.VisualBasic.CompilerServices", "StringType", "FromSingle", "(System.Single)", "summary", "df-generated"]
       - ["Microsoft.VisualBasic.CompilerServices", "StringType", "FromSingle", "(System.Single,System.Globalization.NumberFormatInfo)", "summary", "df-generated"]
-      - ["Microsoft.VisualBasic.CompilerServices", "StringType", "MidStmtStr", "(System.String,System.Int32,System.Int32,System.String)", "summary", "df-generated"]
       - ["Microsoft.VisualBasic.CompilerServices", "StringType", "StrCmp", "(System.String,System.String,System.Boolean)", "summary", "df-generated"]
       - ["Microsoft.VisualBasic.CompilerServices", "StringType", "StrLike", "(System.String,System.String,Microsoft.VisualBasic.CompareMethod)", "summary", "df-generated"]
       - ["Microsoft.VisualBasic.CompilerServices", "StringType", "StrLikeBinary", "(System.String,System.String)", "summary", "df-generated"]
diff --git a/csharp/ql/lib/ext/generated/Microsoft.VisualBasic.model.yml b/csharp/ql/lib/ext/generated/Microsoft.VisualBasic.model.yml
index 1f7b6b17f13..f471594f30f 100644
--- a/csharp/ql/lib/ext/generated/Microsoft.VisualBasic.model.yml
+++ b/csharp/ql/lib/ext/generated/Microsoft.VisualBasic.model.yml
@@ -4,6 +4,12 @@ extensions:
       pack: codeql/csharp-all
       extensible: summaryModel
     data:
+      - ["Microsoft.VisualBasic", "FileSystem", False, "FileGet", "(System.Int32,System.Array,System.Int64,System.Boolean,System.Boolean)", "", "Argument[1]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.VisualBasic", "FileSystem", False, "FileGet", "(System.Int32,System.String,System.Int64,System.Boolean)", "", "Argument[1]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.VisualBasic", "FileSystem", False, "FileGet", "(System.Int32,System.ValueType,System.Int64)", "", "Argument[1]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.VisualBasic", "FileSystem", False, "FileGetObject", "(System.Int32,System.Object,System.Int64)", "", "Argument[1]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.VisualBasic", "FileSystem", False, "Input", "(System.Int32,System.Object)", "", "Argument[1]", "ReturnValue", "value", "dfc-generated"]
+      - ["Microsoft.VisualBasic", "FileSystem", False, "Input", "(System.Int32,System.String)", "", "Argument[1]", "ReturnValue", "value", "dfc-generated"]
       - ["Microsoft.VisualBasic", "VBCodeProvider", False, "VBCodeProvider", "(System.Collections.Generic.IDictionary<System.String,System.String>)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
   - addsTo:
       pack: codeql/csharp-all
@@ -14,6 +20,7 @@ extensions:
       - ["Microsoft.VisualBasic", "Collection", "Contains", "(System.String)", "summary", "df-generated"]
       - ["Microsoft.VisualBasic", "Collection", "IndexOf", "(System.Object)", "summary", "df-generated"]
       - ["Microsoft.VisualBasic", "Collection", "Remove", "(System.Int32)", "summary", "df-generated"]
+      - ["Microsoft.VisualBasic", "Collection", "Remove", "(System.Object)", "summary", "df-generated"]
       - ["Microsoft.VisualBasic", "Collection", "Remove", "(System.String)", "summary", "df-generated"]
       - ["Microsoft.VisualBasic", "Collection", "RemoveAt", "(System.Int32)", "summary", "df-generated"]
       - ["Microsoft.VisualBasic", "Collection", "get_Count", "()", "summary", "df-generated"]
@@ -104,7 +111,6 @@ extensions:
       - ["Microsoft.VisualBasic", "FileSystem", "FileClose", "(System.Int32[])", "summary", "df-generated"]
       - ["Microsoft.VisualBasic", "FileSystem", "FileCopy", "(System.String,System.String)", "summary", "df-generated"]
       - ["Microsoft.VisualBasic", "FileSystem", "FileDateTime", "(System.String)", "summary", "df-generated"]
-      - ["Microsoft.VisualBasic", "FileSystem", "FileGet", "(System.Int32,System.Array,System.Int64,System.Boolean,System.Boolean)", "summary", "df-generated"]
       - ["Microsoft.VisualBasic", "FileSystem", "FileGet", "(System.Int32,System.Boolean,System.Int64)", "summary", "df-generated"]
       - ["Microsoft.VisualBasic", "FileSystem", "FileGet", "(System.Int32,System.Byte,System.Int64)", "summary", "df-generated"]
       - ["Microsoft.VisualBasic", "FileSystem", "FileGet", "(System.Int32,System.Char,System.Int64)", "summary", "df-generated"]
@@ -115,9 +121,6 @@ extensions:
       - ["Microsoft.VisualBasic", "FileSystem", "FileGet", "(System.Int32,System.Int32,System.Int64)", "summary", "df-generated"]
       - ["Microsoft.VisualBasic", "FileSystem", "FileGet", "(System.Int32,System.Int64,System.Int64)", "summary", "df-generated"]
       - ["Microsoft.VisualBasic", "FileSystem", "FileGet", "(System.Int32,System.Single,System.Int64)", "summary", "df-generated"]
-      - ["Microsoft.VisualBasic", "FileSystem", "FileGet", "(System.Int32,System.String,System.Int64,System.Boolean)", "summary", "df-generated"]
-      - ["Microsoft.VisualBasic", "FileSystem", "FileGet", "(System.Int32,System.ValueType,System.Int64)", "summary", "df-generated"]
-      - ["Microsoft.VisualBasic", "FileSystem", "FileGetObject", "(System.Int32,System.Object,System.Int64)", "summary", "df-generated"]
       - ["Microsoft.VisualBasic", "FileSystem", "FileLen", "(System.String)", "summary", "df-generated"]
       - ["Microsoft.VisualBasic", "FileSystem", "FileOpen", "(System.Int32,System.String,Microsoft.VisualBasic.OpenMode,Microsoft.VisualBasic.OpenAccess,Microsoft.VisualBasic.OpenShare,System.Int32)", "summary", "df-generated"]
       - ["Microsoft.VisualBasic", "FileSystem", "FilePut", "(System.Int32,System.Array,System.Int64,System.Boolean,System.Boolean)", "summary", "df-generated"]
@@ -147,9 +150,7 @@ extensions:
       - ["Microsoft.VisualBasic", "FileSystem", "Input", "(System.Int32,System.Int16)", "summary", "df-generated"]
       - ["Microsoft.VisualBasic", "FileSystem", "Input", "(System.Int32,System.Int32)", "summary", "df-generated"]
       - ["Microsoft.VisualBasic", "FileSystem", "Input", "(System.Int32,System.Int64)", "summary", "df-generated"]
-      - ["Microsoft.VisualBasic", "FileSystem", "Input", "(System.Int32,System.Object)", "summary", "df-generated"]
       - ["Microsoft.VisualBasic", "FileSystem", "Input", "(System.Int32,System.Single)", "summary", "df-generated"]
-      - ["Microsoft.VisualBasic", "FileSystem", "Input", "(System.Int32,System.String)", "summary", "df-generated"]
       - ["Microsoft.VisualBasic", "FileSystem", "InputString", "(System.Int32,System.Int32)", "summary", "df-generated"]
       - ["Microsoft.VisualBasic", "FileSystem", "Kill", "(System.String)", "summary", "df-generated"]
       - ["Microsoft.VisualBasic", "FileSystem", "LOF", "(System.Int32)", "summary", "df-generated"]
diff --git a/csharp/ql/lib/ext/generated/Microsoft.WebAssembly.Build.Tasks.model.yml b/csharp/ql/lib/ext/generated/Microsoft.WebAssembly.Build.Tasks.model.yml
index 2d4baf0164e..b66f35842d6 100644
--- a/csharp/ql/lib/ext/generated/Microsoft.WebAssembly.Build.Tasks.model.yml
+++ b/csharp/ql/lib/ext/generated/Microsoft.WebAssembly.Build.Tasks.model.yml
@@ -4,7 +4,12 @@ extensions:
       pack: codeql/csharp-all
       extensible: summaryModel
     data:
-      - ["Microsoft.WebAssembly.Build.Tasks", "WasmAppBuilderBaseTask", False, "FileCopyChecked", "(System.String,System.String,System.String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["Microsoft.WebAssembly.Build.Tasks", "RunWithEmSdkEnv", True, "Execute", "()", "", "Argument[this].Property[Microsoft.WebAssembly.Build.Tasks.RunWithEmSdkEnv.EmSdkPath]", "Argument[this].Property[Microsoft.Build.Tasks.Exec.Command]", "taint", "dfc-generated"]
+      - ["Microsoft.WebAssembly.Build.Tasks", "WasiAppBuilder", True, "ExecuteInternal", "()", "", "Argument[this].Property[Microsoft.WebAssembly.Build.Tasks.WasmAppBuilderBaseTask.AppDir]", "Argument[this].Field[Microsoft.WebAssembly.Build.Tasks.WasmAppBuilderBaseTask._fileWrites].Element", "taint", "dfc-generated"]
+      - ["Microsoft.WebAssembly.Build.Tasks", "WasiAppBuilder", True, "ExecuteInternal", "()", "", "Argument[this].Property[Microsoft.WebAssembly.Build.Tasks.WasmAppBuilderBaseTask.Assemblies].Element", "Argument[this].Field[Microsoft.WebAssembly.Build.Tasks.WasmAppBuilderBaseTask._fileWrites].Element", "taint", "dfc-generated"]
+      - ["Microsoft.WebAssembly.Build.Tasks", "WasmAppBuilderBaseTask", False, "FileCopyChecked", "(System.String,System.String,System.String)", "", "Argument[1]", "Argument[this].Field[Microsoft.WebAssembly.Build.Tasks.WasmAppBuilderBaseTask._fileWrites].Element", "value", "dfc-generated"]
+      - ["Microsoft.WebAssembly.Build.Tasks", "WasmAppBuilderBaseTask", True, "UpdateRuntimeConfigJson", "()", "", "Argument[this].Property[Microsoft.WebAssembly.Build.Tasks.WasmAppBuilderBaseTask.AppDir]", "Argument[this].Field[Microsoft.WebAssembly.Build.Tasks.WasmAppBuilderBaseTask._fileWrites].Element", "taint", "dfc-generated"]
+      - ["Microsoft.WebAssembly.Build.Tasks", "WasmAppBuilderBaseTask", True, "UpdateRuntimeConfigJson", "()", "", "Argument[this].Property[Microsoft.WebAssembly.Build.Tasks.WasmAppBuilderBaseTask.RuntimeConfigJsonPath]", "Argument[this].Field[Microsoft.WebAssembly.Build.Tasks.WasmAppBuilderBaseTask._fileWrites].Element", "taint", "dfc-generated"]
       - ["Microsoft.WebAssembly.Build.Tasks", "WebcilConverter", False, "FromPortableExecutable", "(System.String,System.String,Microsoft.Build.Utilities.TaskLoggingHelper)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["Microsoft.WebAssembly.Build.Tasks", "WebcilConverter", False, "FromPortableExecutable", "(System.String,System.String,Microsoft.Build.Utilities.TaskLoggingHelper)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
       - ["Microsoft.WebAssembly.Build.Tasks", "WebcilConverter", False, "FromPortableExecutable", "(System.String,System.String,Microsoft.Build.Utilities.TaskLoggingHelper)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
@@ -17,16 +22,14 @@ extensions:
       - ["Microsoft.WebAssembly.Build.Tasks", "GetChromeVersions", "Execute", "()", "summary", "df-generated"]
       - ["Microsoft.WebAssembly.Build.Tasks", "ManagedToNativeGenerator", "Execute", "()", "summary", "df-generated"]
       - ["Microsoft.WebAssembly.Build.Tasks", "ManagedToNativeGenerator", "FixupSymbolName", "(System.String)", "summary", "df-generated"]
-      - ["Microsoft.WebAssembly.Build.Tasks", "RunWithEmSdkEnv", "Execute", "()", "summary", "df-generated"]
       - ["Microsoft.WebAssembly.Build.Tasks", "WasiAppBuilder", "AddToRuntimeConfig", "(System.Text.Json.Nodes.JsonObject,System.Text.Json.Nodes.JsonArray,System.Text.Json.Nodes.JsonArray)", "summary", "df-generated"]
-      - ["Microsoft.WebAssembly.Build.Tasks", "WasiAppBuilder", "ExecuteInternal", "()", "summary", "df-generated"]
       - ["Microsoft.WebAssembly.Build.Tasks", "WasiAppBuilder", "ValidateArguments", "()", "summary", "df-generated"]
       - ["Microsoft.WebAssembly.Build.Tasks", "WasmAppBuilder", "ExecuteInternal", "()", "summary", "df-generated"]
       - ["Microsoft.WebAssembly.Build.Tasks", "WasmAppBuilder", "ValidateArguments", "()", "summary", "df-generated"]
       - ["Microsoft.WebAssembly.Build.Tasks", "WasmAppBuilderBaseTask", "AddToRuntimeConfig", "(System.Text.Json.Nodes.JsonObject,System.Text.Json.Nodes.JsonArray,System.Text.Json.Nodes.JsonArray)", "summary", "df-generated"]
       - ["Microsoft.WebAssembly.Build.Tasks", "WasmAppBuilderBaseTask", "Execute", "()", "summary", "df-generated"]
       - ["Microsoft.WebAssembly.Build.Tasks", "WasmAppBuilderBaseTask", "ExecuteInternal", "()", "summary", "df-generated"]
-      - ["Microsoft.WebAssembly.Build.Tasks", "WasmAppBuilderBaseTask", "UpdateRuntimeConfigJson", "()", "summary", "df-generated"]
+      - ["Microsoft.WebAssembly.Build.Tasks", "WasmAppBuilderBaseTask", "ProcessSatelliteAssemblies", "(System.Action<System.ValueTuple<System.String,System.String>>)", "summary", "df-generated"]
       - ["Microsoft.WebAssembly.Build.Tasks", "WasmAppBuilderBaseTask", "ValidateArguments", "()", "summary", "df-generated"]
       - ["Microsoft.WebAssembly.Build.Tasks", "WasmAppBuilderBaseTask", "get_FileWrites", "()", "summary", "df-generated"]
       - ["Microsoft.WebAssembly.Build.Tasks", "WasmCalculateInitialHeapSize", "Execute", "()", "summary", "df-generated"]
diff --git a/csharp/ql/lib/ext/generated/Microsoft.Win32.SafeHandles.model.yml b/csharp/ql/lib/ext/generated/Microsoft.Win32.SafeHandles.model.yml
index 04163d23876..9cce0173f12 100644
--- a/csharp/ql/lib/ext/generated/Microsoft.Win32.SafeHandles.model.yml
+++ b/csharp/ql/lib/ext/generated/Microsoft.Win32.SafeHandles.model.yml
@@ -4,10 +4,8 @@ extensions:
       pack: codeql/csharp-all
       extensible: summaryModel
     data:
-      - ["Microsoft.Win32.SafeHandles", "SafeFileHandle", False, "SafeFileHandle", "(System.IntPtr,System.Boolean)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["Microsoft.Win32.SafeHandles", "SafePipeHandle", False, "SafePipeHandle", "(System.IntPtr,System.Boolean)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["Microsoft.Win32.SafeHandles", "SafeProcessHandle", False, "SafeProcessHandle", "(System.IntPtr,System.Boolean)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["Microsoft.Win32.SafeHandles", "SafeWaitHandle", False, "SafeWaitHandle", "(System.IntPtr,System.Boolean)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["Microsoft.Win32.SafeHandles", "SafeFileHandle", False, "SafeFileHandle", "(System.IntPtr,System.Boolean)", "", "Argument[0]", "Argument[this].Field[System.Runtime.InteropServices.SafeHandle.handle]", "value", "dfc-generated"]
+      - ["Microsoft.Win32.SafeHandles", "SafeWaitHandle", False, "SafeWaitHandle", "(System.IntPtr,System.Boolean)", "", "Argument[0]", "Argument[this].Field[System.Runtime.InteropServices.SafeHandle.handle]", "value", "dfc-generated"]
   - addsTo:
       pack: codeql/csharp-all
       extensible: neutralModel
@@ -36,8 +34,10 @@ extensions:
       - ["Microsoft.Win32.SafeHandles", "SafeNCryptSecretHandle", "ReleaseNativeHandle", "()", "summary", "df-generated"]
       - ["Microsoft.Win32.SafeHandles", "SafePipeHandle", "Dispose", "(System.Boolean)", "summary", "df-generated"]
       - ["Microsoft.Win32.SafeHandles", "SafePipeHandle", "ReleaseHandle", "()", "summary", "df-generated"]
+      - ["Microsoft.Win32.SafeHandles", "SafePipeHandle", "SafePipeHandle", "(System.IntPtr,System.Boolean)", "summary", "df-generated"]
       - ["Microsoft.Win32.SafeHandles", "SafePipeHandle", "get_IsInvalid", "()", "summary", "df-generated"]
       - ["Microsoft.Win32.SafeHandles", "SafeProcessHandle", "ReleaseHandle", "()", "summary", "df-generated"]
+      - ["Microsoft.Win32.SafeHandles", "SafeProcessHandle", "SafeProcessHandle", "(System.IntPtr,System.Boolean)", "summary", "df-generated"]
       - ["Microsoft.Win32.SafeHandles", "SafeRegistryHandle", "ReleaseHandle", "()", "summary", "df-generated"]
       - ["Microsoft.Win32.SafeHandles", "SafeRegistryHandle", "SafeRegistryHandle", "(System.IntPtr,System.Boolean)", "summary", "df-generated"]
       - ["Microsoft.Win32.SafeHandles", "SafeWaitHandle", "ReleaseHandle", "()", "summary", "df-generated"]
diff --git a/csharp/ql/lib/ext/generated/Microsoft.Win32.model.yml b/csharp/ql/lib/ext/generated/Microsoft.Win32.model.yml
index a918d43fa13..5410725c154 100644
--- a/csharp/ql/lib/ext/generated/Microsoft.Win32.model.yml
+++ b/csharp/ql/lib/ext/generated/Microsoft.Win32.model.yml
@@ -64,6 +64,34 @@ extensions:
       - ["Microsoft.Win32", "SystemEvents", "CreateTimer", "(System.Int32)", "summary", "df-generated"]
       - ["Microsoft.Win32", "SystemEvents", "InvokeOnEventsThread", "(System.Delegate)", "summary", "df-generated"]
       - ["Microsoft.Win32", "SystemEvents", "KillTimer", "(System.IntPtr)", "summary", "df-generated"]
+      - ["Microsoft.Win32", "SystemEvents", "add_DisplaySettingsChanged", "(System.EventHandler)", "summary", "df-generated"]
+      - ["Microsoft.Win32", "SystemEvents", "add_DisplaySettingsChanging", "(System.EventHandler)", "summary", "df-generated"]
+      - ["Microsoft.Win32", "SystemEvents", "add_EventsThreadShutdown", "(System.EventHandler)", "summary", "df-generated"]
+      - ["Microsoft.Win32", "SystemEvents", "add_InstalledFontsChanged", "(System.EventHandler)", "summary", "df-generated"]
+      - ["Microsoft.Win32", "SystemEvents", "add_LowMemory", "(System.EventHandler)", "summary", "df-generated"]
+      - ["Microsoft.Win32", "SystemEvents", "add_PaletteChanged", "(System.EventHandler)", "summary", "df-generated"]
+      - ["Microsoft.Win32", "SystemEvents", "add_PowerModeChanged", "(Microsoft.Win32.PowerModeChangedEventHandler)", "summary", "df-generated"]
+      - ["Microsoft.Win32", "SystemEvents", "add_SessionEnded", "(Microsoft.Win32.SessionEndedEventHandler)", "summary", "df-generated"]
+      - ["Microsoft.Win32", "SystemEvents", "add_SessionEnding", "(Microsoft.Win32.SessionEndingEventHandler)", "summary", "df-generated"]
+      - ["Microsoft.Win32", "SystemEvents", "add_SessionSwitch", "(Microsoft.Win32.SessionSwitchEventHandler)", "summary", "df-generated"]
+      - ["Microsoft.Win32", "SystemEvents", "add_TimeChanged", "(System.EventHandler)", "summary", "df-generated"]
+      - ["Microsoft.Win32", "SystemEvents", "add_TimerElapsed", "(Microsoft.Win32.TimerElapsedEventHandler)", "summary", "df-generated"]
+      - ["Microsoft.Win32", "SystemEvents", "add_UserPreferenceChanged", "(Microsoft.Win32.UserPreferenceChangedEventHandler)", "summary", "df-generated"]
+      - ["Microsoft.Win32", "SystemEvents", "add_UserPreferenceChanging", "(Microsoft.Win32.UserPreferenceChangingEventHandler)", "summary", "df-generated"]
+      - ["Microsoft.Win32", "SystemEvents", "remove_DisplaySettingsChanged", "(System.EventHandler)", "summary", "df-generated"]
+      - ["Microsoft.Win32", "SystemEvents", "remove_DisplaySettingsChanging", "(System.EventHandler)", "summary", "df-generated"]
+      - ["Microsoft.Win32", "SystemEvents", "remove_EventsThreadShutdown", "(System.EventHandler)", "summary", "df-generated"]
+      - ["Microsoft.Win32", "SystemEvents", "remove_InstalledFontsChanged", "(System.EventHandler)", "summary", "df-generated"]
+      - ["Microsoft.Win32", "SystemEvents", "remove_LowMemory", "(System.EventHandler)", "summary", "df-generated"]
+      - ["Microsoft.Win32", "SystemEvents", "remove_PaletteChanged", "(System.EventHandler)", "summary", "df-generated"]
+      - ["Microsoft.Win32", "SystemEvents", "remove_PowerModeChanged", "(Microsoft.Win32.PowerModeChangedEventHandler)", "summary", "df-generated"]
+      - ["Microsoft.Win32", "SystemEvents", "remove_SessionEnded", "(Microsoft.Win32.SessionEndedEventHandler)", "summary", "df-generated"]
+      - ["Microsoft.Win32", "SystemEvents", "remove_SessionEnding", "(Microsoft.Win32.SessionEndingEventHandler)", "summary", "df-generated"]
+      - ["Microsoft.Win32", "SystemEvents", "remove_SessionSwitch", "(Microsoft.Win32.SessionSwitchEventHandler)", "summary", "df-generated"]
+      - ["Microsoft.Win32", "SystemEvents", "remove_TimeChanged", "(System.EventHandler)", "summary", "df-generated"]
+      - ["Microsoft.Win32", "SystemEvents", "remove_TimerElapsed", "(Microsoft.Win32.TimerElapsedEventHandler)", "summary", "df-generated"]
+      - ["Microsoft.Win32", "SystemEvents", "remove_UserPreferenceChanged", "(Microsoft.Win32.UserPreferenceChangedEventHandler)", "summary", "df-generated"]
+      - ["Microsoft.Win32", "SystemEvents", "remove_UserPreferenceChanging", "(Microsoft.Win32.UserPreferenceChangingEventHandler)", "summary", "df-generated"]
       - ["Microsoft.Win32", "TimerElapsedEventArgs", "TimerElapsedEventArgs", "(System.IntPtr)", "summary", "df-generated"]
       - ["Microsoft.Win32", "TimerElapsedEventArgs", "get_TimerId", "()", "summary", "df-generated"]
       - ["Microsoft.Win32", "UserPreferenceChangedEventArgs", "UserPreferenceChangedEventArgs", "(Microsoft.Win32.UserPreferenceCategory)", "summary", "df-generated"]
diff --git a/csharp/ql/lib/ext/generated/Mono.Linker.Dataflow.model.yml b/csharp/ql/lib/ext/generated/Mono.Linker.Dataflow.model.yml
index 436f7a39c8c..d56e107dff1 100644
--- a/csharp/ql/lib/ext/generated/Mono.Linker.Dataflow.model.yml
+++ b/csharp/ql/lib/ext/generated/Mono.Linker.Dataflow.model.yml
@@ -16,18 +16,17 @@ extensions:
       - ["Mono.Linker.Dataflow", "ReflectionMarker", False, "ReflectionMarker", "(Mono.Linker.LinkContext,Mono.Linker.Steps.MarkStep,System.Boolean)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
       - ["Mono.Linker.Dataflow", "TrimAnalysisAssignmentPattern", False, "Merge", "(ILLink.Shared.DataFlow.ValueSetLattice<ILLink.Shared.DataFlow.SingleValue>,Mono.Linker.Dataflow.TrimAnalysisAssignmentPattern)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
       - ["Mono.Linker.Dataflow", "TrimAnalysisAssignmentPattern", False, "Merge", "(ILLink.Shared.DataFlow.ValueSetLattice<ILLink.Shared.DataFlow.SingleValue>,Mono.Linker.Dataflow.TrimAnalysisAssignmentPattern)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["Mono.Linker.Dataflow", "TrimAnalysisAssignmentPattern", False, "TrimAnalysisAssignmentPattern", "(ILLink.Shared.DataFlow.ValueSet<ILLink.Shared.DataFlow.SingleValue>,ILLink.Shared.DataFlow.ValueSet<ILLink.Shared.DataFlow.SingleValue>,Mono.Linker.MessageOrigin)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["Mono.Linker.Dataflow", "TrimAnalysisAssignmentPattern", False, "TrimAnalysisAssignmentPattern", "(ILLink.Shared.DataFlow.ValueSet<ILLink.Shared.DataFlow.SingleValue>,ILLink.Shared.DataFlow.ValueSet<ILLink.Shared.DataFlow.SingleValue>,Mono.Linker.MessageOrigin)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["Mono.Linker.Dataflow", "TrimAnalysisAssignmentPattern", False, "TrimAnalysisAssignmentPattern", "(ILLink.Shared.DataFlow.ValueSet<ILLink.Shared.DataFlow.SingleValue>,ILLink.Shared.DataFlow.ValueSet<ILLink.Shared.DataFlow.SingleValue>,Mono.Linker.MessageOrigin)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
-      - ["Mono.Linker.Dataflow", "TrimAnalysisMethodCallPattern", False, "Merge", "(ILLink.Shared.DataFlow.ValueSetLattice<ILLink.Shared.DataFlow.SingleValue>,Mono.Linker.Dataflow.TrimAnalysisMethodCallPattern)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["Mono.Linker.Dataflow", "TrimAnalysisMethodCallPattern", False, "Merge", "(ILLink.Shared.DataFlow.ValueSetLattice<ILLink.Shared.DataFlow.SingleValue>,Mono.Linker.Dataflow.TrimAnalysisMethodCallPattern)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["Mono.Linker.Dataflow", "TrimAnalysisMethodCallPattern", False, "TrimAnalysisMethodCallPattern", "(Mono.Cecil.Cil.Instruction,Mono.Cecil.MethodReference,ILLink.Shared.DataFlow.ValueSet<ILLink.Shared.DataFlow.SingleValue>,System.Collections.Immutable.ImmutableArray<ILLink.Shared.DataFlow.ValueSet<ILLink.Shared.DataFlow.SingleValue>>,Mono.Linker.MessageOrigin)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["Mono.Linker.Dataflow", "TrimAnalysisMethodCallPattern", False, "TrimAnalysisMethodCallPattern", "(Mono.Cecil.Cil.Instruction,Mono.Cecil.MethodReference,ILLink.Shared.DataFlow.ValueSet<ILLink.Shared.DataFlow.SingleValue>,System.Collections.Immutable.ImmutableArray<ILLink.Shared.DataFlow.ValueSet<ILLink.Shared.DataFlow.SingleValue>>,Mono.Linker.MessageOrigin)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["Mono.Linker.Dataflow", "TrimAnalysisMethodCallPattern", False, "TrimAnalysisMethodCallPattern", "(Mono.Cecil.Cil.Instruction,Mono.Cecil.MethodReference,ILLink.Shared.DataFlow.ValueSet<ILLink.Shared.DataFlow.SingleValue>,System.Collections.Immutable.ImmutableArray<ILLink.Shared.DataFlow.ValueSet<ILLink.Shared.DataFlow.SingleValue>>,Mono.Linker.MessageOrigin)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
-      - ["Mono.Linker.Dataflow", "TrimAnalysisMethodCallPattern", False, "TrimAnalysisMethodCallPattern", "(Mono.Cecil.Cil.Instruction,Mono.Cecil.MethodReference,ILLink.Shared.DataFlow.ValueSet<ILLink.Shared.DataFlow.SingleValue>,System.Collections.Immutable.ImmutableArray<ILLink.Shared.DataFlow.ValueSet<ILLink.Shared.DataFlow.SingleValue>>,Mono.Linker.MessageOrigin)", "", "Argument[4]", "Argument[this]", "taint", "df-generated"]
+      - ["Mono.Linker.Dataflow", "TrimAnalysisAssignmentPattern", False, "TrimAnalysisAssignmentPattern", "(ILLink.Shared.DataFlow.ValueSet<ILLink.Shared.DataFlow.SingleValue>,ILLink.Shared.DataFlow.ValueSet<ILLink.Shared.DataFlow.SingleValue>,Mono.Linker.MessageOrigin)", "", "Argument[0]", "Argument[this].Property[Mono.Linker.Dataflow.TrimAnalysisAssignmentPattern.Source]", "value", "dfc-generated"]
+      - ["Mono.Linker.Dataflow", "TrimAnalysisAssignmentPattern", False, "TrimAnalysisAssignmentPattern", "(ILLink.Shared.DataFlow.ValueSet<ILLink.Shared.DataFlow.SingleValue>,ILLink.Shared.DataFlow.ValueSet<ILLink.Shared.DataFlow.SingleValue>,Mono.Linker.MessageOrigin)", "", "Argument[1]", "Argument[this].Property[Mono.Linker.Dataflow.TrimAnalysisAssignmentPattern.Target]", "value", "dfc-generated"]
+      - ["Mono.Linker.Dataflow", "TrimAnalysisAssignmentPattern", False, "TrimAnalysisAssignmentPattern", "(ILLink.Shared.DataFlow.ValueSet<ILLink.Shared.DataFlow.SingleValue>,ILLink.Shared.DataFlow.ValueSet<ILLink.Shared.DataFlow.SingleValue>,Mono.Linker.MessageOrigin)", "", "Argument[2]", "Argument[this].Property[Mono.Linker.Dataflow.TrimAnalysisAssignmentPattern.Origin]", "value", "dfc-generated"]
+      - ["Mono.Linker.Dataflow", "TrimAnalysisMethodCallPattern", False, "Merge", "(ILLink.Shared.DataFlow.ValueSetLattice<ILLink.Shared.DataFlow.SingleValue>,Mono.Linker.Dataflow.TrimAnalysisMethodCallPattern)", "", "Argument[1].Field[Mono.Linker.Dataflow.TrimAnalysisMethodCallPattern.Instance]", "ReturnValue.Field[Mono.Linker.Dataflow.TrimAnalysisMethodCallPattern.Instance]", "value", "dfc-generated"]
+      - ["Mono.Linker.Dataflow", "TrimAnalysisMethodCallPattern", False, "TrimAnalysisMethodCallPattern", "(Mono.Cecil.Cil.Instruction,Mono.Cecil.MethodReference,ILLink.Shared.DataFlow.ValueSet<ILLink.Shared.DataFlow.SingleValue>,System.Collections.Immutable.ImmutableArray<ILLink.Shared.DataFlow.ValueSet<ILLink.Shared.DataFlow.SingleValue>>,Mono.Linker.MessageOrigin)", "", "Argument[0]", "Argument[this].Field[Mono.Linker.Dataflow.TrimAnalysisMethodCallPattern.Operation]", "value", "dfc-generated"]
+      - ["Mono.Linker.Dataflow", "TrimAnalysisMethodCallPattern", False, "TrimAnalysisMethodCallPattern", "(Mono.Cecil.Cil.Instruction,Mono.Cecil.MethodReference,ILLink.Shared.DataFlow.ValueSet<ILLink.Shared.DataFlow.SingleValue>,System.Collections.Immutable.ImmutableArray<ILLink.Shared.DataFlow.ValueSet<ILLink.Shared.DataFlow.SingleValue>>,Mono.Linker.MessageOrigin)", "", "Argument[1]", "Argument[this].Field[Mono.Linker.Dataflow.TrimAnalysisMethodCallPattern.CalledMethod]", "value", "dfc-generated"]
+      - ["Mono.Linker.Dataflow", "TrimAnalysisMethodCallPattern", False, "TrimAnalysisMethodCallPattern", "(Mono.Cecil.Cil.Instruction,Mono.Cecil.MethodReference,ILLink.Shared.DataFlow.ValueSet<ILLink.Shared.DataFlow.SingleValue>,System.Collections.Immutable.ImmutableArray<ILLink.Shared.DataFlow.ValueSet<ILLink.Shared.DataFlow.SingleValue>>,Mono.Linker.MessageOrigin)", "", "Argument[2]", "Argument[this].Field[Mono.Linker.Dataflow.TrimAnalysisMethodCallPattern.Instance]", "value", "dfc-generated"]
+      - ["Mono.Linker.Dataflow", "TrimAnalysisMethodCallPattern", False, "TrimAnalysisMethodCallPattern", "(Mono.Cecil.Cil.Instruction,Mono.Cecil.MethodReference,ILLink.Shared.DataFlow.ValueSet<ILLink.Shared.DataFlow.SingleValue>,System.Collections.Immutable.ImmutableArray<ILLink.Shared.DataFlow.ValueSet<ILLink.Shared.DataFlow.SingleValue>>,Mono.Linker.MessageOrigin)", "", "Argument[4]", "Argument[this].Field[Mono.Linker.Dataflow.TrimAnalysisMethodCallPattern.Origin]", "value", "dfc-generated"]
       - ["Mono.Linker.Dataflow", "TrimAnalysisPatternStore", False, "TrimAnalysisPatternStore", "(ILLink.Shared.DataFlow.ValueSetLattice<ILLink.Shared.DataFlow.SingleValue>,Mono.Linker.LinkContext)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["Mono.Linker.Dataflow", "TrimAnalysisPatternStore", False, "TrimAnalysisPatternStore", "(ILLink.Shared.DataFlow.ValueSetLattice<ILLink.Shared.DataFlow.SingleValue>,Mono.Linker.LinkContext)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["Mono.Linker.Dataflow", "ValueBasicBlockPair", False, "ValueBasicBlockPair", "(ILLink.Shared.DataFlow.ValueSet<ILLink.Shared.DataFlow.SingleValue>,System.Int32)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["Mono.Linker.Dataflow", "ValueBasicBlockPair", False, "ValueBasicBlockPair", "(ILLink.Shared.DataFlow.ValueSet<ILLink.Shared.DataFlow.SingleValue>,System.Int32)", "", "Argument[0]", "Argument[this].Property[Mono.Linker.Dataflow.ValueBasicBlockPair.Value]", "value", "dfc-generated"]
   - addsTo:
       pack: codeql/csharp-all
       extensible: neutralModel
diff --git a/csharp/ql/lib/ext/generated/Mono.Linker.Steps.model.yml b/csharp/ql/lib/ext/generated/Mono.Linker.Steps.model.yml
index 4669f3bf70f..999d5e420ca 100644
--- a/csharp/ql/lib/ext/generated/Mono.Linker.Steps.model.yml
+++ b/csharp/ql/lib/ext/generated/Mono.Linker.Steps.model.yml
@@ -4,47 +4,53 @@ extensions:
       pack: codeql/csharp-all
       extensible: summaryModel
     data:
+      - ["Mono.Linker.Steps", "BaseStep", False, "Process", "(Mono.Linker.LinkContext)", "", "Argument[0]", "Argument[this].SyntheticField[Mono.Linker.Steps.BaseStep._context]", "value", "dfc-generated"]
       - ["Mono.Linker.Steps", "BaseStep", False, "get_Annotations", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["Mono.Linker.Steps", "BaseStep", False, "get_Context", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["Mono.Linker.Steps", "BaseStep", False, "get_MarkingHelpers", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["Mono.Linker.Steps", "BaseStep", False, "get_Tracer", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["Mono.Linker.Steps", "BaseStep", False, "get_Context", "()", "", "Argument[this].SyntheticField[Mono.Linker.Steps.BaseStep._context]", "ReturnValue", "value", "dfc-generated"]
+      - ["Mono.Linker.Steps", "BaseStep", False, "get_MarkingHelpers", "()", "", "Argument[this].Property[Mono.Linker.Steps.BaseStep.Context].Property[Mono.Linker.LinkContext.MarkingHelpers]", "ReturnValue", "value", "dfc-generated"]
+      - ["Mono.Linker.Steps", "BaseStep", False, "get_MarkingHelpers", "()", "", "Argument[this].SyntheticField[Mono.Linker.Steps.BaseStep._context].Property[Mono.Linker.LinkContext.MarkingHelpers]", "ReturnValue", "value", "dfc-generated"]
+      - ["Mono.Linker.Steps", "BaseStep", False, "get_Tracer", "()", "", "Argument[this].Property[Mono.Linker.Steps.BaseStep.Context].Property[Mono.Linker.LinkContext.Tracer]", "ReturnValue", "value", "dfc-generated"]
+      - ["Mono.Linker.Steps", "BaseStep", False, "get_Tracer", "()", "", "Argument[this].SyntheticField[Mono.Linker.Steps.BaseStep._context].Property[Mono.Linker.LinkContext.Tracer]", "ReturnValue", "value", "dfc-generated"]
       - ["Mono.Linker.Steps", "BaseStep", True, "ProcessAssembly", "(Mono.Cecil.AssemblyDefinition)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["Mono.Linker.Steps", "BaseSubStep", False, "get_Annotations", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["Mono.Linker.Steps", "BaseSubStep", False, "get_Context", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["Mono.Linker.Steps", "BaseSubStep", False, "get_Context", "()", "", "Argument[this].SyntheticField[Mono.Linker.Steps.BaseSubStep._context]", "ReturnValue", "value", "dfc-generated"]
+      - ["Mono.Linker.Steps", "BaseSubStep", True, "Initialize", "(Mono.Linker.LinkContext)", "", "Argument[0]", "Argument[this].SyntheticField[Mono.Linker.Steps.BaseSubStep._context]", "value", "dfc-generated"]
       - ["Mono.Linker.Steps", "BodySubstitutionParser", False, "Parse", "(Mono.Linker.SubstitutionInfo)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["Mono.Linker.Steps", "DescriptorMarker", False, "GetAccessors", "(System.Xml.XPath.XPathNavigator)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["Mono.Linker.Steps", "DescriptorMarker", False, "GetMethodSignature", "(Mono.Cecil.MethodDefinition,System.Boolean)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["Mono.Linker.Steps", "DescriptorMarker", False, "GetMethodSignature", "(Mono.Cecil.MethodDefinition,System.Boolean)", "", "Argument[0].Property[Mono.Cecil.MethodDefinition.Name]", "ReturnValue", "taint", "dfc-generated"]
+      - ["Mono.Linker.Steps", "DescriptorMarker", False, "GetMethodSignature", "(Mono.Cecil.MethodDefinition,System.Boolean)", "", "Argument[0].Property[Mono.Cecil.MethodReference.ReturnType].Property[Mono.Cecil.TypeReference.FullName]", "ReturnValue", "taint", "dfc-generated"]
+      - ["Mono.Linker.Steps", "DescriptorMarker", True, "GetMethod", "(Mono.Cecil.TypeDefinition,System.String)", "", "Argument[0].Property[Mono.Cecil.TypeDefinition.Methods].Element", "ReturnValue", "value", "dfc-generated"]
       - ["Mono.Linker.Steps", "IMarkHandler", True, "Initialize", "(Mono.Linker.LinkContext,Mono.Linker.Steps.MarkContext)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["Mono.Linker.Steps", "IStep", True, "Process", "(Mono.Linker.LinkContext)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["Mono.Linker.Steps", "ISubStep", True, "Initialize", "(Mono.Linker.LinkContext)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["Mono.Linker.Steps", "LinkAttributesParser", False, "Parse", "(Mono.Linker.AttributeInfo)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["Mono.Linker.Steps", "MarkScopeStack+Scope", False, "Scope", "(Mono.Linker.MessageOrigin)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["Mono.Linker.Steps", "LinkAttributesParser", True, "GetMethod", "(Mono.Cecil.TypeDefinition,System.String)", "", "Argument[0].Property[Mono.Cecil.TypeDefinition.Methods].Element", "ReturnValue", "value", "dfc-generated"]
+      - ["Mono.Linker.Steps", "MarkScopeStack+Scope", False, "Scope", "(Mono.Linker.MessageOrigin)", "", "Argument[0]", "Argument[this].Field[Mono.Linker.Steps.MarkScopeStack+Scope.Origin]", "value", "dfc-generated"]
       - ["Mono.Linker.Steps", "MarkScopeStack", False, "PopToParent", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["Mono.Linker.Steps", "MarkScopeStack", False, "PushScope", "(Mono.Linker.MessageOrigin)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["Mono.Linker.Steps", "MarkScopeStack", False, "PushScope", "(Mono.Linker.MessageOrigin)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["Mono.Linker.Steps", "MarkScopeStack", False, "PushScope", "(Mono.Linker.Steps.MarkScopeStack+Scope)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["Mono.Linker.Steps", "MarkScopeStack", False, "PushScope", "(Mono.Linker.Steps.MarkScopeStack+Scope)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["Mono.Linker.Steps", "MarkScopeStack", False, "get_CurrentScope", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["Mono.Linker.Steps", "MarkStep+AttributeProviderPair", False, "AttributeProviderPair", "(Mono.Cecil.CustomAttribute,Mono.Cecil.ICustomAttributeProvider)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["Mono.Linker.Steps", "MarkStep+AttributeProviderPair", False, "AttributeProviderPair", "(Mono.Cecil.CustomAttribute,Mono.Cecil.ICustomAttributeProvider)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["Mono.Linker.Steps", "MarkStep", False, "GetOriginalMethod", "(Mono.Cecil.MethodReference,Mono.Linker.DependencyInfo)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["Mono.Linker.Steps", "MarkStep", False, "GetOriginalMethod", "(Mono.Cecil.MethodReference,Mono.Linker.DependencyInfo)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["Mono.Linker.Steps", "MarkStep", False, "GetOriginalMethod", "(Mono.Cecil.MethodReference,Mono.Linker.DependencyInfo)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["Mono.Linker.Steps", "MarkStep", False, "GetOriginalType", "(Mono.Cecil.TypeReference,Mono.Linker.DependencyInfo)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["Mono.Linker.Steps", "MarkStep", False, "GetOriginalType", "(Mono.Cecil.TypeReference,Mono.Linker.DependencyInfo)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["Mono.Linker.Steps", "MarkStep", False, "GetOriginalType", "(Mono.Cecil.TypeReference,Mono.Linker.DependencyInfo)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["Mono.Linker.Steps", "MarkStep+AttributeProviderPair", False, "AttributeProviderPair", "(Mono.Cecil.CustomAttribute,Mono.Cecil.ICustomAttributeProvider)", "", "Argument[0]", "Argument[this].Property[Mono.Linker.Steps.MarkStep+AttributeProviderPair.Attribute]", "value", "dfc-generated"]
+      - ["Mono.Linker.Steps", "MarkStep+AttributeProviderPair", False, "AttributeProviderPair", "(Mono.Cecil.CustomAttribute,Mono.Cecil.ICustomAttributeProvider)", "", "Argument[1]", "Argument[this].Property[Mono.Linker.Steps.MarkStep+AttributeProviderPair.Provider]", "value", "dfc-generated"]
+      - ["Mono.Linker.Steps", "MarkStep", False, "GetOriginalMethod", "(Mono.Cecil.MethodReference,Mono.Linker.DependencyInfo)", "", "Argument[1]", "ReturnValue.Field[System.ValueTuple`2.Item2]", "value", "dfc-generated"]
+      - ["Mono.Linker.Steps", "MarkStep", False, "GetOriginalType", "(Mono.Cecil.TypeReference,Mono.Linker.DependencyInfo)", "", "Argument[1]", "ReturnValue.Field[System.ValueTuple`2.Item2]", "value", "dfc-generated"]
       - ["Mono.Linker.Steps", "MarkStep", False, "MarkCustomAttributeField", "(Mono.Cecil.CustomAttributeNamedArgument,Mono.Cecil.TypeDefinition,Mono.Cecil.ICustomAttribute)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
       - ["Mono.Linker.Steps", "MarkStep", False, "MarkCustomAttributeFields", "(Mono.Cecil.ICustomAttribute,Mono.Cecil.TypeDefinition)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
       - ["Mono.Linker.Steps", "MarkStep", False, "MarkField", "(Mono.Cecil.FieldReference,Mono.Linker.DependencyInfo,Mono.Linker.MessageOrigin)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["Mono.Linker.Steps", "MarkStep", False, "MarkFields", "(Mono.Cecil.TypeDefinition,System.Boolean,Mono.Linker.DependencyInfo,System.Boolean)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["Mono.Linker.Steps", "MarkStep", False, "MarkMethodIf", "(Mono.Collections.Generic.Collection<Mono.Cecil.MethodDefinition>,System.Func<Mono.Cecil.MethodDefinition,System.Boolean>,Mono.Linker.DependencyInfo,Mono.Linker.MessageOrigin)", "", "Argument[0].Element", "Argument[1].Parameter[0]", "value", "dfc-generated"]
+      - ["Mono.Linker.Steps", "MarkStep", False, "MarkMethodIf", "(Mono.Collections.Generic.Collection<Mono.Cecil.MethodDefinition>,System.Func<Mono.Cecil.MethodDefinition,System.Boolean>,Mono.Linker.DependencyInfo,Mono.Linker.MessageOrigin)", "", "Argument[0].Element", "ReturnValue", "value", "dfc-generated"]
+      - ["Mono.Linker.Steps", "MarkStep", False, "MarkMethodsIf", "(Mono.Collections.Generic.Collection<Mono.Cecil.MethodDefinition>,System.Func<Mono.Cecil.MethodDefinition,System.Boolean>,Mono.Linker.DependencyInfo,Mono.Linker.MessageOrigin)", "", "Argument[0].Element", "Argument[1].Parameter[0]", "value", "dfc-generated"]
       - ["Mono.Linker.Steps", "MarkStep", False, "MarkProperty", "(Mono.Cecil.PropertyDefinition,Mono.Linker.DependencyInfo)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["Mono.Linker.Steps", "MarkStep", False, "MarkStaticFields", "(Mono.Cecil.TypeDefinition,Mono.Linker.DependencyInfo)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["Mono.Linker.Steps", "MarkStep", False, "get_Annotations", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["Mono.Linker.Steps", "MarkStep", False, "get_Context", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["Mono.Linker.Steps", "MarkStep", False, "get_EmbeddedXmlInfo", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["Mono.Linker.Steps", "MarkStep", False, "get_MarkingHelpers", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["Mono.Linker.Steps", "MarkStep", False, "get_Context", "()", "", "Argument[this].SyntheticField[Mono.Linker.Steps.MarkStep._context]", "ReturnValue", "value", "dfc-generated"]
+      - ["Mono.Linker.Steps", "MarkStep", False, "get_EmbeddedXmlInfo", "()", "", "Argument[this].Property[Mono.Linker.Steps.MarkStep.Context].Property[Mono.Linker.LinkContext.EmbeddedXmlInfo]", "ReturnValue", "value", "dfc-generated"]
+      - ["Mono.Linker.Steps", "MarkStep", False, "get_EmbeddedXmlInfo", "()", "", "Argument[this].SyntheticField[Mono.Linker.Steps.MarkStep._context].Property[Mono.Linker.LinkContext.EmbeddedXmlInfo]", "ReturnValue", "value", "dfc-generated"]
+      - ["Mono.Linker.Steps", "MarkStep", False, "get_MarkingHelpers", "()", "", "Argument[this].Property[Mono.Linker.Steps.MarkStep.Context].Property[Mono.Linker.LinkContext.MarkingHelpers]", "ReturnValue", "value", "dfc-generated"]
+      - ["Mono.Linker.Steps", "MarkStep", False, "get_MarkingHelpers", "()", "", "Argument[this].SyntheticField[Mono.Linker.Steps.MarkStep._context].Property[Mono.Linker.LinkContext.MarkingHelpers]", "ReturnValue", "value", "dfc-generated"]
       - ["Mono.Linker.Steps", "MarkStep", False, "get_ScopeStack", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["Mono.Linker.Steps", "MarkStep", False, "get_Tracer", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["Mono.Linker.Steps", "MarkStep", False, "get_Tracer", "()", "", "Argument[this].Property[Mono.Linker.Steps.MarkStep.Context].Property[Mono.Linker.LinkContext.Tracer]", "ReturnValue", "value", "dfc-generated"]
+      - ["Mono.Linker.Steps", "MarkStep", False, "get_Tracer", "()", "", "Argument[this].SyntheticField[Mono.Linker.Steps.MarkStep._context].Property[Mono.Linker.LinkContext.Tracer]", "ReturnValue", "value", "dfc-generated"]
       - ["Mono.Linker.Steps", "MarkStep", True, "MarkAssembly", "(Mono.Cecil.AssemblyDefinition,Mono.Linker.DependencyInfo)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["Mono.Linker.Steps", "MarkStep", True, "MarkEvent", "(Mono.Cecil.EventDefinition,Mono.Linker.DependencyInfo)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["Mono.Linker.Steps", "MarkStep", True, "MarkInstruction", "(Mono.Cecil.Cil.Instruction,Mono.Cecil.MethodDefinition,System.Boolean)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
@@ -59,30 +65,32 @@ extensions:
       - ["Mono.Linker.Steps", "MarkStep", True, "MarkTypeVisibleToReflection", "(Mono.Cecil.TypeReference,Mono.Cecil.TypeDefinition,Mono.Linker.DependencyInfo,Mono.Linker.MessageOrigin)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["Mono.Linker.Steps", "MarkStep", True, "MarkTypeVisibleToReflection", "(Mono.Cecil.TypeReference,Mono.Cecil.TypeDefinition,Mono.Linker.DependencyInfo,Mono.Linker.MessageOrigin)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
       - ["Mono.Linker.Steps", "MarkStep", True, "MarkUserDependency", "(Mono.Cecil.IMemberDefinition,Mono.Cecil.CustomAttribute)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["Mono.Linker.Steps", "MarkStep", True, "Process", "(Mono.Linker.LinkContext)", "", "Argument[0]", "Argument[this].SyntheticField[Mono.Linker.Steps.MarkStep._context]", "value", "dfc-generated"]
       - ["Mono.Linker.Steps", "MarkStep", True, "ProcessLinkerSpecialAttribute", "(Mono.Cecil.CustomAttribute,Mono.Cecil.ICustomAttributeProvider,Mono.Linker.DependencyInfo)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
       - ["Mono.Linker.Steps", "MarkStep", True, "ProcessMethod", "(Mono.Cecil.MethodDefinition,Mono.Linker.DependencyInfo,Mono.Linker.MessageOrigin)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["Mono.Linker.Steps", "MarkSubStepsDispatcher", False, "MarkSubStepsDispatcher", "(System.Collections.Generic.IEnumerable<Mono.Linker.Steps.ISubStep>)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["Mono.Linker.Steps", "OutputStep", True, "GetAssemblyFileName", "(Mono.Cecil.AssemblyDefinition,System.String)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["Mono.Linker.Steps", "MarkStepContext", True, "RegisterMarkAssemblyAction", "(System.Action<Mono.Cecil.AssemblyDefinition>)", "", "Argument[0]", "Argument[this].Property[Mono.Linker.Steps.MarkStepContext.MarkAssemblyActions].Element", "value", "dfc-generated"]
+      - ["Mono.Linker.Steps", "MarkStepContext", True, "RegisterMarkMethodAction", "(System.Action<Mono.Cecil.MethodDefinition>)", "", "Argument[0]", "Argument[this].Property[Mono.Linker.Steps.MarkStepContext.MarkMethodActions].Element", "value", "dfc-generated"]
+      - ["Mono.Linker.Steps", "MarkStepContext", True, "RegisterMarkTypeAction", "(System.Action<Mono.Cecil.TypeDefinition>)", "", "Argument[0]", "Argument[this].Property[Mono.Linker.Steps.MarkStepContext.MarkTypeActions].Element", "value", "dfc-generated"]
+      - ["Mono.Linker.Steps", "OutputStep", True, "GetAssemblyFileName", "(Mono.Cecil.AssemblyDefinition,System.String)", "", "Argument[1]", "ReturnValue", "taint", "dfc-generated"]
       - ["Mono.Linker.Steps", "ProcessLinkerXmlBase", False, "GetAttribute", "(System.Xml.XPath.XPathNavigator,System.String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["Mono.Linker.Steps", "ProcessLinkerXmlBase", False, "GetEvent", "(Mono.Cecil.TypeDefinition,System.String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["Mono.Linker.Steps", "ProcessLinkerXmlBase", False, "GetField", "(Mono.Cecil.TypeDefinition,System.String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["Mono.Linker.Steps", "ProcessLinkerXmlBase", False, "GetEvent", "(Mono.Cecil.TypeDefinition,System.String)", "", "Argument[0].Property[Mono.Cecil.TypeDefinition.Events].Element", "ReturnValue", "value", "dfc-generated"]
+      - ["Mono.Linker.Steps", "ProcessLinkerXmlBase", False, "GetField", "(Mono.Cecil.TypeDefinition,System.String)", "", "Argument[0].Property[Mono.Cecil.TypeDefinition.Fields].Element", "ReturnValue", "value", "dfc-generated"]
       - ["Mono.Linker.Steps", "ProcessLinkerXmlBase", False, "GetFullName", "(System.Xml.XPath.XPathNavigator)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["Mono.Linker.Steps", "ProcessLinkerXmlBase", False, "GetMessageOriginForPosition", "(System.Xml.XPath.XPathNavigator)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["Mono.Linker.Steps", "ProcessLinkerXmlBase", False, "GetMessageOriginForPosition", "(System.Xml.XPath.XPathNavigator)", "", "Argument[this].Field[Mono.Linker.Steps.ProcessLinkerXmlBase._resource].Field[System.ValueTuple`2.Item2]", "ReturnValue.Property[Mono.Linker.MessageOrigin.Provider]", "value", "dfc-generated"]
+      - ["Mono.Linker.Steps", "ProcessLinkerXmlBase", False, "GetMessageOriginForPosition", "(System.Xml.XPath.XPathNavigator)", "", "Argument[this].Field[Mono.Linker.Steps.ProcessLinkerXmlBase._xmlDocumentLocation]", "ReturnValue.Property[Mono.Linker.MessageOrigin.FileName]", "value", "dfc-generated"]
       - ["Mono.Linker.Steps", "ProcessLinkerXmlBase", False, "GetName", "(System.Xml.XPath.XPathNavigator)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["Mono.Linker.Steps", "ProcessLinkerXmlBase", False, "GetProperty", "(Mono.Cecil.TypeDefinition,System.String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["Mono.Linker.Steps", "ProcessLinkerXmlBase", False, "GetProperty", "(Mono.Cecil.TypeDefinition,System.String)", "", "Argument[0].Property[Mono.Cecil.TypeDefinition.Properties].Element", "ReturnValue", "value", "dfc-generated"]
       - ["Mono.Linker.Steps", "ProcessLinkerXmlBase", False, "GetSignature", "(System.Xml.XPath.XPathNavigator)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["Mono.Linker.Steps", "ProcessLinkerXmlBase", False, "ProcessLinkerXmlBase", "(Mono.Linker.LinkContext,System.IO.Stream,Mono.Cecil.EmbeddedResource,Mono.Cecil.AssemblyDefinition,System.String)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
-      - ["Mono.Linker.Steps", "ProcessLinkerXmlBase", False, "ProcessLinkerXmlBase", "(Mono.Linker.LinkContext,System.IO.Stream,Mono.Cecil.EmbeddedResource,Mono.Cecil.AssemblyDefinition,System.String)", "", "Argument[3]", "Argument[this]", "taint", "df-generated"]
-      - ["Mono.Linker.Steps", "ProcessLinkerXmlBase", False, "ProcessLinkerXmlBase", "(Mono.Linker.LinkContext,System.IO.Stream,System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["Mono.Linker.Steps", "ProcessLinkerXmlBase", False, "ProcessLinkerXmlBase", "(Mono.Linker.LinkContext,System.IO.Stream,System.String)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
-      - ["Mono.Linker.Steps", "ProcessLinkerXmlBase", False, "ToString", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["Mono.Linker.Steps", "ProcessLinkerXmlBase", False, "TryConvertValue", "(System.String,Mono.Cecil.TypeReference,System.Object)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["Mono.Linker.Steps", "ProcessLinkerXmlBase", True, "GetMethod", "(Mono.Cecil.TypeDefinition,System.String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["Mono.Linker.Steps", "ProcessLinkerXmlStepBase", False, "ProcessLinkerXmlStepBase", "(System.IO.Stream,System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["Mono.Linker.Steps", "ProcessLinkerXmlStepBase", False, "ProcessLinkerXmlStepBase", "(System.IO.Stream,System.String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["Mono.Linker.Steps", "ProcessLinkerXmlBase", False, "ProcessLinkerXmlBase", "(Mono.Linker.LinkContext,System.IO.Stream,Mono.Cecil.EmbeddedResource,Mono.Cecil.AssemblyDefinition,System.String)", "", "Argument[2]", "Argument[this].Field[Mono.Linker.Steps.ProcessLinkerXmlBase._resource].Field[System.ValueTuple`2.Item1]", "value", "dfc-generated"]
+      - ["Mono.Linker.Steps", "ProcessLinkerXmlBase", False, "ProcessLinkerXmlBase", "(Mono.Linker.LinkContext,System.IO.Stream,Mono.Cecil.EmbeddedResource,Mono.Cecil.AssemblyDefinition,System.String)", "", "Argument[3]", "Argument[this].Field[Mono.Linker.Steps.ProcessLinkerXmlBase._resource].Field[System.ValueTuple`2.Item2]", "value", "dfc-generated"]
+      - ["Mono.Linker.Steps", "ProcessLinkerXmlBase", False, "ProcessLinkerXmlBase", "(Mono.Linker.LinkContext,System.IO.Stream,System.String)", "", "Argument[0]", "Argument[this].Field[Mono.Linker.Steps.ProcessLinkerXmlBase._context]", "value", "dfc-generated"]
+      - ["Mono.Linker.Steps", "ProcessLinkerXmlBase", False, "ProcessLinkerXmlBase", "(Mono.Linker.LinkContext,System.IO.Stream,System.String)", "", "Argument[2]", "Argument[this].Field[Mono.Linker.Steps.ProcessLinkerXmlBase._xmlDocumentLocation]", "value", "dfc-generated"]
+      - ["Mono.Linker.Steps", "ProcessLinkerXmlBase", False, "ToString", "()", "", "Argument[this].Field[Mono.Linker.Steps.ProcessLinkerXmlBase._xmlDocumentLocation]", "ReturnValue", "taint", "dfc-generated"]
+      - ["Mono.Linker.Steps", "ProcessLinkerXmlBase", False, "TryConvertValue", "(System.String,Mono.Cecil.TypeReference,System.Object)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Mono.Linker.Steps", "ProcessLinkerXmlStepBase", False, "ProcessLinkerXmlStepBase", "(System.IO.Stream,System.String)", "", "Argument[0]", "Argument[this].Field[Mono.Linker.Steps.ProcessLinkerXmlStepBase._documentStream]", "value", "dfc-generated"]
+      - ["Mono.Linker.Steps", "ProcessLinkerXmlStepBase", False, "ProcessLinkerXmlStepBase", "(System.IO.Stream,System.String)", "", "Argument[1]", "Argument[this].Field[Mono.Linker.Steps.ProcessLinkerXmlStepBase._xmlDocumentLocation]", "value", "dfc-generated"]
       - ["Mono.Linker.Steps", "RootAssemblyInput", False, "RootAssemblyInput", "(System.String,Mono.Linker.AssemblyRootMode)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["Mono.Linker.Steps", "SubStepsDispatcher", False, "Add", "(Mono.Linker.Steps.ISubStep)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["Mono.Linker.Steps", "SubStepsDispatcher", False, "SubStepsDispatcher", "(System.Collections.Generic.IEnumerable<Mono.Linker.Steps.ISubStep>)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
       - ["Mono.Linker.Steps", "UnreachableBlocksOptimizer", False, "UnreachableBlocksOptimizer", "(Mono.Linker.LinkContext)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
   - addsTo:
       pack: codeql/csharp-all
@@ -133,6 +141,8 @@ extensions:
       - ["Mono.Linker.Steps", "DescriptorMarker", "ProcessProperty", "(Mono.Cecil.TypeDefinition,Mono.Cecil.PropertyDefinition,System.Xml.XPath.XPathNavigator,System.Object,System.Boolean)", "summary", "df-generated"]
       - ["Mono.Linker.Steps", "DescriptorMarker", "ProcessType", "(Mono.Cecil.TypeDefinition,System.Xml.XPath.XPathNavigator)", "summary", "df-generated"]
       - ["Mono.Linker.Steps", "DescriptorMarker", "get_AllowedAssemblySelector", "()", "summary", "df-generated"]
+      - ["Mono.Linker.Steps", "IStep", "Process", "(Mono.Linker.LinkContext)", "summary", "df-generated"]
+      - ["Mono.Linker.Steps", "ISubStep", "Initialize", "(Mono.Linker.LinkContext)", "summary", "df-generated"]
       - ["Mono.Linker.Steps", "ISubStep", "IsActiveFor", "(Mono.Cecil.AssemblyDefinition)", "summary", "df-generated"]
       - ["Mono.Linker.Steps", "ISubStep", "ProcessAssembly", "(Mono.Cecil.AssemblyDefinition)", "summary", "df-generated"]
       - ["Mono.Linker.Steps", "ISubStep", "ProcessEvent", "(Mono.Cecil.EventDefinition)", "summary", "df-generated"]
@@ -152,9 +162,13 @@ extensions:
       - ["Mono.Linker.Steps", "LinkAttributesParser", "get_AllowedAssemblySelector", "()", "summary", "df-generated"]
       - ["Mono.Linker.Steps", "LinkAttributesStep", "LinkAttributesStep", "(System.IO.Stream,System.String)", "summary", "df-generated"]
       - ["Mono.Linker.Steps", "LinkAttributesStep", "Process", "()", "summary", "df-generated"]
+      - ["Mono.Linker.Steps", "MarkContext", "RegisterMarkAssemblyAction", "(System.Action<Mono.Cecil.AssemblyDefinition>)", "summary", "df-generated"]
+      - ["Mono.Linker.Steps", "MarkContext", "RegisterMarkMethodAction", "(System.Action<Mono.Cecil.MethodDefinition>)", "summary", "df-generated"]
+      - ["Mono.Linker.Steps", "MarkContext", "RegisterMarkTypeAction", "(System.Action<Mono.Cecil.TypeDefinition>)", "summary", "df-generated"]
       - ["Mono.Linker.Steps", "MarkExportedTypesTarget", "ProcessAssembly", "(Mono.Cecil.AssemblyDefinition,Mono.Linker.LinkContext)", "summary", "df-generated"]
       - ["Mono.Linker.Steps", "MarkScopeStack", "AssertIsEmpty", "()", "summary", "df-generated"]
       - ["Mono.Linker.Steps", "MarkScopeStack", "UpdateCurrentScopeInstructionOffset", "(System.Int32)", "summary", "df-generated"]
+      - ["Mono.Linker.Steps", "MarkScopeStack", "get_CurrentScope", "()", "summary", "df-generated"]
       - ["Mono.Linker.Steps", "MarkStep", "AlwaysMarkTypeAsInstantiated", "(Mono.Cecil.TypeDefinition)", "summary", "df-generated"]
       - ["Mono.Linker.Steps", "MarkStep", "CheckProcessed", "(Mono.Cecil.IMetadataTokenProvider)", "summary", "df-generated"]
       - ["Mono.Linker.Steps", "MarkStep", "Complete", "()", "summary", "df-generated"]
@@ -194,6 +208,7 @@ extensions:
       - ["Mono.Linker.Steps", "MarkStepContext", "get_MarkAssemblyActions", "()", "summary", "df-generated"]
       - ["Mono.Linker.Steps", "MarkStepContext", "get_MarkMethodActions", "()", "summary", "df-generated"]
       - ["Mono.Linker.Steps", "MarkStepContext", "get_MarkTypeActions", "()", "summary", "df-generated"]
+      - ["Mono.Linker.Steps", "MarkSubStepsDispatcher", "MarkSubStepsDispatcher", "(System.Collections.Generic.IEnumerable<Mono.Linker.Steps.ISubStep>)", "summary", "df-generated"]
       - ["Mono.Linker.Steps", "OutputStep", "ConditionToProcess", "()", "summary", "df-generated"]
       - ["Mono.Linker.Steps", "OutputStep", "CopyAssembly", "(Mono.Cecil.AssemblyDefinition,System.String)", "summary", "df-generated"]
       - ["Mono.Linker.Steps", "OutputStep", "DeleteAssembly", "(Mono.Cecil.AssemblyDefinition,System.String)", "summary", "df-generated"]
@@ -204,6 +219,7 @@ extensions:
       - ["Mono.Linker.Steps", "OutputWarningSuppressions", "ConditionToProcess", "()", "summary", "df-generated"]
       - ["Mono.Linker.Steps", "OutputWarningSuppressions", "Process", "()", "summary", "df-generated"]
       - ["Mono.Linker.Steps", "ProcessLinkerXmlBase", "GetAssemblyName", "(System.Xml.XPath.XPathNavigator)", "summary", "df-generated"]
+      - ["Mono.Linker.Steps", "ProcessLinkerXmlBase", "GetMethod", "(Mono.Cecil.TypeDefinition,System.String)", "summary", "df-generated"]
       - ["Mono.Linker.Steps", "ProcessLinkerXmlBase", "LogWarning", "(System.String,System.Int32,System.Xml.XPath.XPathNavigator)", "summary", "df-generated"]
       - ["Mono.Linker.Steps", "ProcessLinkerXmlBase", "LogWarning", "(System.Xml.XPath.XPathNavigator,ILLink.Shared.DiagnosticId,System.String[])", "summary", "df-generated"]
       - ["Mono.Linker.Steps", "ProcessLinkerXmlBase", "ProcessAssemblies", "(System.Xml.XPath.XPathNavigator)", "summary", "df-generated"]
@@ -235,6 +251,7 @@ extensions:
       - ["Mono.Linker.Steps", "SealerStep", "SealMethod", "(Mono.Cecil.MethodDefinition)", "summary", "df-generated"]
       - ["Mono.Linker.Steps", "SealerStep", "SealType", "(Mono.Cecil.TypeDefinition)", "summary", "df-generated"]
       - ["Mono.Linker.Steps", "SubStepsDispatcher", "Process", "(Mono.Linker.LinkContext)", "summary", "df-generated"]
+      - ["Mono.Linker.Steps", "SubStepsDispatcher", "SubStepsDispatcher", "(System.Collections.Generic.IEnumerable<Mono.Linker.Steps.ISubStep>)", "summary", "df-generated"]
       - ["Mono.Linker.Steps", "SweepStep", "CustomAttributeUsageRemoved", "(Mono.Cecil.ICustomAttributeProvider,Mono.Cecil.CustomAttribute)", "summary", "df-generated"]
       - ["Mono.Linker.Steps", "SweepStep", "ElementRemoved", "(Mono.Cecil.IMetadataTokenProvider)", "summary", "df-generated"]
       - ["Mono.Linker.Steps", "SweepStep", "InterfaceRemoved", "(Mono.Cecil.TypeDefinition,Mono.Cecil.InterfaceImplementation)", "summary", "df-generated"]
diff --git a/csharp/ql/lib/ext/generated/Mono.Linker.model.yml b/csharp/ql/lib/ext/generated/Mono.Linker.model.yml
index be05eaf5e00..639886d3b89 100644
--- a/csharp/ql/lib/ext/generated/Mono.Linker.model.yml
+++ b/csharp/ql/lib/ext/generated/Mono.Linker.model.yml
@@ -6,183 +6,184 @@ extensions:
     data:
       - ["Mono.Linker", "AnnotationStore", False, "AnnotationStore", "(Mono.Linker.LinkContext)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["Mono.Linker", "AnnotationStore", False, "EnqueueVirtualMethod", "(Mono.Cecil.MethodDefinition)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["Mono.Linker", "AnnotationStore", False, "GetAssemblies", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["Mono.Linker", "AnnotationStore", False, "GetMarkedPending", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["Mono.Linker", "AnnotationStore", False, "GetPendingPreserve", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["Mono.Linker", "AnnotationStore", False, "Mark", "(Mono.Cecil.CustomAttribute)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["Mono.Linker", "AnnotationStore", False, "Mark", "(Mono.Cecil.CustomAttribute,Mono.Linker.DependencyInfo)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["Mono.Linker", "AnnotationStore", False, "MarkIndirectlyCalledMethod", "(Mono.Cecil.MethodDefinition)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["Mono.Linker", "AnnotationStore", False, "MarkInstantiated", "(Mono.Cecil.TypeDefinition)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["Mono.Linker", "AnnotationStore", False, "MarkProcessed", "(Mono.Cecil.IMetadataTokenProvider,Mono.Linker.DependencyInfo)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["Mono.Linker", "AnnotationStore", False, "GetAssemblies", "()", "", "Argument[this].Field[Mono.Linker.AnnotationStore.assembly_actions].Property[System.Collections.Generic.Dictionary`2.Keys]", "ReturnValue", "value", "dfc-generated"]
+      - ["Mono.Linker", "AnnotationStore", False, "GetMarkedPending", "()", "", "Argument[this].Field[Mono.Linker.AnnotationStore.marked_pending].Element", "ReturnValue.Element", "value", "dfc-generated"]
+      - ["Mono.Linker", "AnnotationStore", False, "GetPendingPreserve", "()", "", "Argument[this].Field[Mono.Linker.AnnotationStore.pending_preserve].Element", "ReturnValue.Element", "value", "dfc-generated"]
+      - ["Mono.Linker", "AnnotationStore", False, "Mark", "(Mono.Cecil.CustomAttribute)", "", "Argument[0]", "Argument[this].Field[Mono.Linker.AnnotationStore.marked_attributes].Element", "value", "dfc-generated"]
+      - ["Mono.Linker", "AnnotationStore", False, "Mark", "(Mono.Cecil.CustomAttribute,Mono.Linker.DependencyInfo)", "", "Argument[0]", "Argument[this].Field[Mono.Linker.AnnotationStore.marked_attributes].Element", "value", "dfc-generated"]
+      - ["Mono.Linker", "AnnotationStore", False, "MarkIndirectlyCalledMethod", "(Mono.Cecil.MethodDefinition)", "", "Argument[0]", "Argument[this].Field[Mono.Linker.AnnotationStore.indirectly_called].Element", "value", "dfc-generated"]
+      - ["Mono.Linker", "AnnotationStore", False, "MarkInstantiated", "(Mono.Cecil.TypeDefinition)", "", "Argument[0]", "Argument[this].Field[Mono.Linker.AnnotationStore.marked_instantiated].Element", "value", "dfc-generated"]
+      - ["Mono.Linker", "AnnotationStore", False, "MarkProcessed", "(Mono.Cecil.IMetadataTokenProvider,Mono.Linker.DependencyInfo)", "", "Argument[0]", "Argument[this].Field[Mono.Linker.AnnotationStore.processed].Element", "value", "dfc-generated"]
       - ["Mono.Linker", "AnnotationStore", False, "MarkReflectionUsed", "(Mono.Cecil.IMemberDefinition)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["Mono.Linker", "AnnotationStore", False, "MarkRelevantToVariantCasting", "(Mono.Cecil.TypeDefinition)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["Mono.Linker", "AnnotationStore", False, "SetPreserve", "(Mono.Cecil.TypeDefinition,Mono.Linker.TypePreserve)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["Mono.Linker", "AnnotationStore", False, "MarkRelevantToVariantCasting", "(Mono.Cecil.TypeDefinition)", "", "Argument[0]", "Argument[this].Field[Mono.Linker.AnnotationStore.types_relevant_to_variant_casting].Element", "value", "dfc-generated"]
+      - ["Mono.Linker", "AnnotationStore", False, "SetPreserve", "(Mono.Cecil.TypeDefinition,Mono.Linker.TypePreserve)", "", "Argument[0]", "Argument[this].Field[Mono.Linker.AnnotationStore.pending_preserve].Element", "value", "dfc-generated"]
       - ["Mono.Linker", "AnnotationStore", False, "SetPreservedStaticCtor", "(Mono.Cecil.TypeDefinition)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["Mono.Linker", "AnnotationStore", False, "SetProcessed", "(Mono.Cecil.IMetadataTokenProvider)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["Mono.Linker", "AnnotationStore", False, "SetPublic", "(Mono.Cecil.IMetadataTokenProvider)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["Mono.Linker", "AnnotationStore", False, "SetSubstitutedInit", "(Mono.Cecil.TypeDefinition)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["Mono.Linker", "AnnotationStore", False, "get_Tracer", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["Mono.Linker", "AnnotationStore", False, "SetProcessed", "(Mono.Cecil.IMetadataTokenProvider)", "", "Argument[0]", "Argument[this].Field[Mono.Linker.AnnotationStore.processed].Element", "value", "dfc-generated"]
+      - ["Mono.Linker", "AnnotationStore", False, "SetPublic", "(Mono.Cecil.IMetadataTokenProvider)", "", "Argument[0]", "Argument[this].Field[Mono.Linker.AnnotationStore.public_api].Element", "value", "dfc-generated"]
+      - ["Mono.Linker", "AnnotationStore", False, "SetSubstitutedInit", "(Mono.Cecil.TypeDefinition)", "", "Argument[0]", "Argument[this].Field[Mono.Linker.AnnotationStore.fieldType_init].Element", "value", "dfc-generated"]
+      - ["Mono.Linker", "AnnotationStore", False, "get_Tracer", "()", "", "Argument[this].Field[Mono.Linker.AnnotationStore.context].Property[Mono.Linker.LinkContext.Tracer]", "ReturnValue", "value", "dfc-generated"]
       - ["Mono.Linker", "AssemblyDefinitionExtensions", False, "FindEmbeddedResource", "(Mono.Cecil.AssemblyDefinition,System.String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["Mono.Linker", "AssemblyResolver", False, "AddReferenceAssembly", "(System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["Mono.Linker", "AssemblyResolver", False, "AssemblyResolver", "(Mono.Linker.LinkContext,Mono.Cecil.ReaderParameters)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["Mono.Linker", "AssemblyResolver", False, "AssemblyResolver", "(Mono.Linker.LinkContext,Mono.Cecil.ReaderParameters)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["Mono.Linker", "AssemblyResolver", False, "AssemblyResolver", "(Mono.Linker.LinkContext,Mono.Cecil.ReaderParameters)", "", "Argument[this]", "Argument[1]", "taint", "df-generated"]
-      - ["Mono.Linker", "AssemblyResolver", False, "GetReferencePaths", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["Mono.Linker", "AssemblyResolver", False, "AddReferenceAssembly", "(System.String)", "", "Argument[0]", "Argument[this].SyntheticField[Mono.Linker.AssemblyResolver._references].Element", "value", "dfc-generated"]
+      - ["Mono.Linker", "AssemblyResolver", False, "AssemblyResolver", "(Mono.Linker.LinkContext,Mono.Cecil.ReaderParameters)", "", "Argument[this]", "Argument[1].Property[Mono.Cecil.ReaderParameters.AssemblyResolver]", "value", "dfc-generated"]
+      - ["Mono.Linker", "AssemblyResolver", False, "GetReferencePaths", "()", "", "Argument[this].SyntheticField[Mono.Linker.AssemblyResolver._references]", "ReturnValue", "value", "dfc-generated"]
       - ["Mono.Linker", "AssemblyResolver", False, "Resolve", "(Mono.Cecil.AssemblyNameReference,System.Boolean)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["Mono.Linker", "AssemblyResolver", True, "AddSearchDirectory", "(System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["Mono.Linker", "AssemblyResolver", True, "Resolve", "(Mono.Cecil.AssemblyNameReference)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["Mono.Linker", "BCL+EventTracingForWindows", False, "IsEventSourceImplementation", "(Mono.Cecil.TypeDefinition,Mono.Linker.LinkContext)", "", "Argument[0]", "Argument[1]", "taint", "df-generated"]
       - ["Mono.Linker", "BannedApiExtensions", False, "ExceptionHandlers", "(Mono.Cecil.Cil.MethodBody,Mono.Linker.LinkContext)", "", "Argument[0]", "Argument[1]", "taint", "df-generated"]
-      - ["Mono.Linker", "BannedApiExtensions", False, "GetMethodIL", "(Mono.Cecil.Cil.MethodBody,Mono.Linker.LinkContext)", "", "Argument[0]", "Argument[1]", "taint", "df-generated"]
-      - ["Mono.Linker", "BannedApiExtensions", False, "GetMethodIL", "(Mono.Cecil.Cil.MethodBody,Mono.Linker.LinkContext)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["Mono.Linker", "BannedApiExtensions", False, "GetMethodIL", "(Mono.Cecil.MethodDefinition,Mono.Linker.LinkContext)", "", "Argument[0]", "Argument[1]", "taint", "df-generated"]
-      - ["Mono.Linker", "BannedApiExtensions", False, "GetMethodIL", "(Mono.Cecil.MethodDefinition,Mono.Linker.LinkContext)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["Mono.Linker", "BannedApiExtensions", False, "GetMethodIL", "(Mono.Cecil.Cil.MethodBody,Mono.Linker.LinkContext)", "", "Argument[0].Property[Mono.Cecil.Cil.MethodBody.Method].Property[Mono.Cecil.MethodDefinition.Body]", "ReturnValue.Field[Mono.Linker.MethodIL.Body]", "value", "dfc-generated"]
+      - ["Mono.Linker", "BannedApiExtensions", False, "GetMethodIL", "(Mono.Cecil.MethodDefinition,Mono.Linker.LinkContext)", "", "Argument[0].Property[Mono.Cecil.MethodDefinition.Body]", "ReturnValue.Field[Mono.Linker.MethodIL.Body]", "value", "dfc-generated"]
       - ["Mono.Linker", "BannedApiExtensions", False, "Instructions", "(Mono.Cecil.Cil.MethodBody,Mono.Linker.LinkContext)", "", "Argument[0]", "Argument[1]", "taint", "df-generated"]
       - ["Mono.Linker", "BannedApiExtensions", False, "Resolve", "(Mono.Cecil.ExportedType,Mono.Linker.LinkContext)", "", "Argument[0]", "Argument[1]", "taint", "df-generated"]
-      - ["Mono.Linker", "BannedApiExtensions", False, "Resolve", "(Mono.Cecil.MethodReference,Mono.Linker.LinkContext)", "", "Argument[0]", "Argument[1]", "taint", "df-generated"]
-      - ["Mono.Linker", "BannedApiExtensions", False, "Resolve", "(Mono.Cecil.MethodReference,Mono.Linker.LinkContext)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["Mono.Linker", "BannedApiExtensions", False, "Resolve", "(Mono.Cecil.TypeReference,Mono.Linker.LinkContext)", "", "Argument[0]", "Argument[1]", "taint", "df-generated"]
-      - ["Mono.Linker", "BannedApiExtensions", False, "Resolve", "(Mono.Cecil.TypeReference,Mono.Linker.LinkContext)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["Mono.Linker", "BannedApiExtensions", False, "TryResolve", "(Mono.Cecil.MethodReference,Mono.Linker.LinkContext)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["Mono.Linker", "BannedApiExtensions", False, "TryResolve", "(Mono.Cecil.TypeReference,Mono.Linker.LinkContext)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["Mono.Linker", "BannedApiExtensions", False, "Resolve", "(Mono.Cecil.MethodReference,Mono.Linker.LinkContext)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Mono.Linker", "BannedApiExtensions", False, "Resolve", "(Mono.Cecil.TypeReference,Mono.Linker.LinkContext)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Mono.Linker", "BannedApiExtensions", False, "TryResolve", "(Mono.Cecil.MethodReference,Mono.Linker.LinkContext)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Mono.Linker", "BannedApiExtensions", False, "TryResolve", "(Mono.Cecil.TypeReference,Mono.Linker.LinkContext)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
       - ["Mono.Linker", "BannedApiExtensions", False, "Variables", "(Mono.Cecil.Cil.MethodBody,Mono.Linker.LinkContext)", "", "Argument[0]", "Argument[1]", "taint", "df-generated"]
       - ["Mono.Linker", "CustomAttributeSource", False, "CustomAttributeSource", "(Mono.Linker.LinkContext)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["Mono.Linker", "CustomAttributeSource", False, "GetAssemblyFromCustomAttributeProvider", "(Mono.Cecil.ICustomAttributeProvider)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["Mono.Linker", "CustomAttributeSource", False, "GetCustomAttributes", "(Mono.Cecil.ICustomAttributeProvider)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["Mono.Linker", "DependencyInfo", False, "DependencyInfo", "(Mono.Linker.DependencyKind,System.Object)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["Mono.Linker", "DependencyRecorderHelper", False, "TokenString", "(Mono.Linker.LinkContext,System.Object)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["Mono.Linker", "CustomAttributeSource", False, "GetAssemblyFromCustomAttributeProvider", "(Mono.Cecil.ICustomAttributeProvider)", "", "Argument[0].Property[Mono.Cecil.MemberReference.Module].Property[Mono.Cecil.ModuleDefinition.Assembly]", "ReturnValue", "value", "dfc-generated"]
+      - ["Mono.Linker", "CustomAttributeSource", False, "GetAssemblyFromCustomAttributeProvider", "(Mono.Cecil.ICustomAttributeProvider)", "", "Argument[0].Property[Mono.Cecil.ModuleDefinition.Assembly]", "ReturnValue", "value", "dfc-generated"]
+      - ["Mono.Linker", "CustomAttributeSource", False, "GetAssemblyFromCustomAttributeProvider", "(Mono.Cecil.ICustomAttributeProvider)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Mono.Linker", "CustomAttributeSource", False, "GetCustomAttributes", "(Mono.Cecil.ICustomAttributeProvider)", "", "Argument[0].Property[Mono.Cecil.ICustomAttributeProvider.CustomAttributes].Element", "ReturnValue.Element", "value", "dfc-generated"]
+      - ["Mono.Linker", "DependencyInfo", False, "DependencyInfo", "(Mono.Linker.DependencyKind,System.Object)", "", "Argument[1]", "Argument[this].Property[Mono.Linker.DependencyInfo.Source]", "value", "dfc-generated"]
+      - ["Mono.Linker", "DependencyRecorderHelper", False, "TokenString", "(Mono.Linker.LinkContext,System.Object)", "", "Argument[1].Property[Mono.Cecil.TypeReference.Module]", "ReturnValue", "taint", "dfc-generated"]
+      - ["Mono.Linker", "DependencyRecorderHelper", False, "TokenString", "(Mono.Linker.LinkContext,System.Object)", "", "Argument[1]", "ReturnValue", "taint", "dfc-generated"]
       - ["Mono.Linker", "DgmlDependencyRecorder", False, "DgmlDependencyRecorder", "(Mono.Linker.LinkContext,System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["Mono.Linker", "DgmlDependencyRecorder", False, "DgmlDependencyRecorder", "(Mono.Linker.LinkContext,System.String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
       - ["Mono.Linker", "DocumentationSignatureGenerator", False, "VisitMember", "(Mono.Cecil.IMemberDefinition,System.Text.StringBuilder,Mono.Linker.ITryResolveMetadata)", "", "Argument[0]", "Argument[1]", "taint", "df-generated"]
       - ["Mono.Linker", "DocumentationSignatureParser", False, "GetMatchingMembers", "(System.String,System.Int32,Mono.Cecil.ModuleDefinition,Mono.Cecil.TypeDefinition,System.String,System.Int32,Mono.Linker.DocumentationSignatureParser+MemberType,System.Collections.Generic.List<Mono.Cecil.IMemberDefinition>,Mono.Linker.ITryResolveMetadata,System.Boolean)", "", "Argument[3]", "Argument[7].Element", "taint", "df-generated"]
       - ["Mono.Linker", "DocumentationSignatureParser", False, "GetMembersByDocumentationSignature", "(Mono.Cecil.TypeDefinition,System.String,Mono.Linker.ITryResolveMetadata,System.Boolean)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["Mono.Linker", "DocumentationSignatureParser", False, "ParseTypeOrNamespaceName", "(System.String,System.Int32,System.Text.StringBuilder)", "", "Argument[0]", "Argument[2]", "taint", "df-generated"]
-      - ["Mono.Linker", "DocumentationSignatureParser", False, "ParseTypeOrNamespaceName", "(System.String,System.Int32,System.Text.StringBuilder)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["Mono.Linker", "DocumentationSignatureParser", False, "ParseTypeOrNamespaceName", "(System.String,System.Int32,System.Text.StringBuilder)", "", "Argument[0]", "Argument[2]", "taint", "dfc-generated"]
+      - ["Mono.Linker", "DocumentationSignatureParser", False, "ParseTypeOrNamespaceName", "(System.String,System.Int32,System.Text.StringBuilder)", "", "Argument[0]", "ReturnValue.Field[System.ValueTuple`2.Item1]", "taint", "dfc-generated"]
       - ["Mono.Linker", "Driver", False, "Driver", "(System.Collections.Generic.Queue<System.String>)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
       - ["Mono.Linker", "FeatureSettings", False, "GetAttribute", "(System.Xml.XPath.XPathNavigator,System.String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["Mono.Linker", "IDependencyRecorder", True, "RecordDependency", "(System.Object,System.Object,System.Boolean)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["Mono.Linker", "IDependencyRecorder", True, "RecordDependency", "(System.Object,System.Object,System.Boolean)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["Mono.Linker", "ITryResolveMetadata", True, "TryResolve", "(Mono.Cecil.MethodReference)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["Mono.Linker", "ITryResolveMetadata", True, "TryResolve", "(Mono.Cecil.TypeReference)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["Mono.Linker", "LinkContext", False, "GetMethodIL", "(Mono.Cecil.Cil.MethodBody)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["Mono.Linker", "LinkContext", False, "GetMethodIL", "(Mono.Cecil.Cil.MethodBody)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["Mono.Linker", "LinkContext", False, "GetMethodIL", "(Mono.Cecil.MethodDefinition)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["Mono.Linker", "LinkContext", False, "GetMethodIL", "(Mono.Cecil.MethodDefinition)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["Mono.Linker", "LinkContext", False, "LinkContext", "(Mono.Linker.Pipeline,Mono.Linker.ILogger,System.String,Mono.Linker.UnintializedContextFactory)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["Mono.Linker", "LinkContext", False, "LinkContext", "(Mono.Linker.Pipeline,Mono.Linker.ILogger,System.String,Mono.Linker.UnintializedContextFactory)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["Mono.Linker", "LinkContext", False, "LinkContext", "(Mono.Linker.Pipeline,Mono.Linker.ILogger,System.String,Mono.Linker.UnintializedContextFactory)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
+      - ["Mono.Linker", "ITryResolveMetadata", True, "TryResolve", "(Mono.Cecil.MethodReference)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Mono.Linker", "ITryResolveMetadata", True, "TryResolve", "(Mono.Cecil.TypeReference)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Mono.Linker", "LinkContext", False, "GetMethodIL", "(Mono.Cecil.Cil.MethodBody)", "", "Argument[0].Property[Mono.Cecil.Cil.MethodBody.Method].Property[Mono.Cecil.MethodDefinition.Body]", "ReturnValue.Field[Mono.Linker.MethodIL.Body]", "value", "dfc-generated"]
+      - ["Mono.Linker", "LinkContext", False, "GetMethodIL", "(Mono.Cecil.MethodDefinition)", "", "Argument[0].Property[Mono.Cecil.MethodDefinition.Body]", "ReturnValue.Field[Mono.Linker.MethodIL.Body]", "value", "dfc-generated"]
+      - ["Mono.Linker", "LinkContext", False, "LinkContext", "(Mono.Linker.Pipeline,Mono.Linker.ILogger,System.String,Mono.Linker.UnintializedContextFactory)", "", "Argument[0]", "Argument[this].SyntheticField[Mono.Linker.LinkContext._pipeline]", "value", "dfc-generated"]
+      - ["Mono.Linker", "LinkContext", False, "LinkContext", "(Mono.Linker.Pipeline,Mono.Linker.ILogger,System.String,Mono.Linker.UnintializedContextFactory)", "", "Argument[2]", "Argument[this].Property[Mono.Linker.LinkContext.OutputDirectory]", "value", "dfc-generated"]
       - ["Mono.Linker", "LinkContext", False, "Resolve", "(Mono.Cecil.ExportedType)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["Mono.Linker", "LinkContext", False, "Resolve", "(Mono.Cecil.FieldReference)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["Mono.Linker", "LinkContext", False, "Resolve", "(Mono.Cecil.FieldReference)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["Mono.Linker", "LinkContext", False, "Resolve", "(Mono.Cecil.MethodReference)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["Mono.Linker", "LinkContext", False, "Resolve", "(Mono.Cecil.MethodReference)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["Mono.Linker", "LinkContext", False, "Resolve", "(Mono.Cecil.TypeReference)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["Mono.Linker", "LinkContext", False, "Resolve", "(Mono.Cecil.TypeReference)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["Mono.Linker", "LinkContext", False, "TryResolve", "(Mono.Cecil.FieldReference)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["Mono.Linker", "LinkContext", False, "Resolve", "(Mono.Cecil.FieldReference)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Mono.Linker", "LinkContext", False, "Resolve", "(Mono.Cecil.MethodReference)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Mono.Linker", "LinkContext", False, "Resolve", "(Mono.Cecil.TypeReference)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Mono.Linker", "LinkContext", False, "TryResolve", "(Mono.Cecil.FieldReference)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
       - ["Mono.Linker", "LinkContext", False, "get_Actions", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["Mono.Linker", "LinkContext", False, "get_Annotations", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["Mono.Linker", "LinkContext", False, "get_CompilerGeneratedState", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["Mono.Linker", "LinkContext", False, "get_CustomAttributes", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["Mono.Linker", "LinkContext", False, "get_Pipeline", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["Mono.Linker", "LinkContext", False, "get_Pipeline", "()", "", "Argument[this].SyntheticField[Mono.Linker.LinkContext._pipeline]", "ReturnValue", "value", "dfc-generated"]
       - ["Mono.Linker", "LinkContext", False, "get_Resolver", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["Mono.Linker", "LinkContext", True, "ReportUnresolved", "(Mono.Cecil.ExportedType)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["Mono.Linker", "LinkContext", True, "ReportUnresolved", "(Mono.Cecil.FieldReference)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["Mono.Linker", "LinkContext", True, "ReportUnresolved", "(Mono.Cecil.MethodReference)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["Mono.Linker", "LinkContext", True, "ReportUnresolved", "(Mono.Cecil.TypeReference)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["Mono.Linker", "LinkerFatalErrorException", False, "LinkerFatalErrorException", "(Mono.Linker.MessageContainer)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["Mono.Linker", "LinkerFatalErrorException", False, "LinkerFatalErrorException", "(Mono.Linker.MessageContainer,System.Exception)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["Mono.Linker", "MarkingHelpers", False, "MarkingHelpers", "(Mono.Linker.LinkContext)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["Mono.Linker", "LinkerFatalErrorException", False, "LinkerFatalErrorException", "(Mono.Linker.MessageContainer)", "", "Argument[0]", "Argument[this].Property[Mono.Linker.LinkerFatalErrorException.MessageContainer]", "value", "dfc-generated"]
+      - ["Mono.Linker", "LinkerFatalErrorException", False, "LinkerFatalErrorException", "(Mono.Linker.MessageContainer,System.Exception)", "", "Argument[0]", "Argument[this].Property[Mono.Linker.LinkerFatalErrorException.MessageContainer]", "value", "dfc-generated"]
+      - ["Mono.Linker", "MarkingHelpers", False, "MarkingHelpers", "(Mono.Linker.LinkContext)", "", "Argument[0]", "Argument[this].Field[Mono.Linker.MarkingHelpers._context]", "value", "dfc-generated"]
       - ["Mono.Linker", "MemberActionStore", False, "MemberActionStore", "(Mono.Linker.LinkContext)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["Mono.Linker", "MemberReferenceExtensions", False, "GetDisplayName", "(Mono.Cecil.MemberReference)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["Mono.Linker", "MemberReferenceExtensions", False, "GetNamespaceDisplayName", "(Mono.Cecil.MemberReference)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["Mono.Linker", "MessageContainer", False, "CreateCustomErrorMessage", "(System.String,System.Int32,System.String,System.Nullable<Mono.Linker.MessageOrigin>)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["Mono.Linker", "MessageContainer", False, "CreateCustomErrorMessage", "(System.String,System.Int32,System.String,System.Nullable<Mono.Linker.MessageOrigin>)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
-      - ["Mono.Linker", "MessageContainer", False, "CreateCustomErrorMessage", "(System.String,System.Int32,System.String,System.Nullable<Mono.Linker.MessageOrigin>)", "", "Argument[3]", "ReturnValue", "taint", "df-generated"]
-      - ["Mono.Linker", "MessageContainer", False, "CreateCustomWarningMessage", "(Mono.Linker.LinkContext,System.String,System.Int32,Mono.Linker.MessageOrigin,Mono.Linker.WarnVersion,System.String)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["Mono.Linker", "MessageContainer", False, "CreateCustomWarningMessage", "(Mono.Linker.LinkContext,System.String,System.Int32,Mono.Linker.MessageOrigin,Mono.Linker.WarnVersion,System.String)", "", "Argument[3]", "ReturnValue", "taint", "df-generated"]
-      - ["Mono.Linker", "MessageContainer", False, "CreateCustomWarningMessage", "(Mono.Linker.LinkContext,System.String,System.Int32,Mono.Linker.MessageOrigin,Mono.Linker.WarnVersion,System.String)", "", "Argument[5]", "ReturnValue", "taint", "df-generated"]
-      - ["Mono.Linker", "MessageContainer", False, "CreateDiagnosticMessage", "(System.String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["Mono.Linker", "MessageContainer", False, "CreateInfoMessage", "(System.String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["Mono.Linker", "MessageContainer", False, "IsWarningMessage", "(System.Nullable<System.Int32>)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["Mono.Linker", "MessageContainer", False, "ToMSBuildString", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["Mono.Linker", "MessageContainer", False, "ToString", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["Mono.Linker", "MessageOrigin", False, "MessageOrigin", "(Mono.Cecil.ICustomAttributeProvider,System.Nullable<System.Int32>)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["Mono.Linker", "MessageOrigin", False, "MessageOrigin", "(Mono.Cecil.ICustomAttributeProvider,System.Nullable<System.Int32>)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["Mono.Linker", "MessageOrigin", False, "MessageOrigin", "(Mono.Linker.MessageOrigin)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["Mono.Linker", "MessageOrigin", False, "MessageOrigin", "(Mono.Linker.MessageOrigin,System.Int32)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["Mono.Linker", "MessageOrigin", False, "MessageOrigin", "(System.String,System.Int32,System.Int32,Mono.Cecil.AssemblyDefinition)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["Mono.Linker", "MessageOrigin", False, "MessageOrigin", "(System.String,System.Int32,System.Int32,Mono.Cecil.AssemblyDefinition)", "", "Argument[3]", "Argument[this]", "taint", "df-generated"]
-      - ["Mono.Linker", "MessageOrigin", False, "ToString", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["Mono.Linker", "MessageOrigin", False, "WithInstructionOffset", "(System.Int32)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["Mono.Linker", "MemberReferenceExtensions", False, "GetDisplayName", "(Mono.Cecil.MemberReference)", "", "Argument[0].Property[Mono.Cecil.IMemberDefinition.Name]", "ReturnValue", "taint", "dfc-generated"]
+      - ["Mono.Linker", "MemberReferenceExtensions", False, "GetNamespaceDisplayName", "(Mono.Cecil.MemberReference)", "", "Argument[0].Property[Mono.Cecil.MemberReference.DeclaringType].Property[Mono.Cecil.TypeReference.Namespace]", "ReturnValue", "value", "dfc-generated"]
+      - ["Mono.Linker", "MemberReferenceExtensions", False, "GetNamespaceDisplayName", "(Mono.Cecil.MemberReference)", "", "Argument[0].Property[Mono.Cecil.TypeReference.DeclaringType].Property[Mono.Cecil.TypeReference.Namespace]", "ReturnValue", "value", "dfc-generated"]
+      - ["Mono.Linker", "MemberReferenceExtensions", False, "GetNamespaceDisplayName", "(Mono.Cecil.MemberReference)", "", "Argument[0].Property[Mono.Cecil.TypeReference.Namespace]", "ReturnValue", "value", "dfc-generated"]
+      - ["Mono.Linker", "MessageContainer", False, "CreateCustomErrorMessage", "(System.String,System.Int32,System.String,System.Nullable<Mono.Linker.MessageOrigin>)", "", "Argument[0]", "ReturnValue.Property[Mono.Linker.MessageContainer.Text]", "value", "dfc-generated"]
+      - ["Mono.Linker", "MessageContainer", False, "CreateCustomErrorMessage", "(System.String,System.Int32,System.String,System.Nullable<Mono.Linker.MessageOrigin>)", "", "Argument[2]", "ReturnValue.Property[Mono.Linker.MessageContainer.SubCategory]", "value", "dfc-generated"]
+      - ["Mono.Linker", "MessageContainer", False, "CreateCustomErrorMessage", "(System.String,System.Int32,System.String,System.Nullable<Mono.Linker.MessageOrigin>)", "", "Argument[3]", "ReturnValue.Property[Mono.Linker.MessageContainer.Origin]", "value", "dfc-generated"]
+      - ["Mono.Linker", "MessageContainer", False, "CreateCustomWarningMessage", "(Mono.Linker.LinkContext,System.String,System.Int32,Mono.Linker.MessageOrigin,Mono.Linker.WarnVersion,System.String)", "", "Argument[1]", "ReturnValue.Property[Mono.Linker.MessageContainer.Text]", "value", "dfc-generated"]
+      - ["Mono.Linker", "MessageContainer", False, "CreateCustomWarningMessage", "(Mono.Linker.LinkContext,System.String,System.Int32,Mono.Linker.MessageOrigin,Mono.Linker.WarnVersion,System.String)", "", "Argument[3]", "ReturnValue.Property[Mono.Linker.MessageContainer.Origin]", "value", "dfc-generated"]
+      - ["Mono.Linker", "MessageContainer", False, "CreateCustomWarningMessage", "(Mono.Linker.LinkContext,System.String,System.Int32,Mono.Linker.MessageOrigin,Mono.Linker.WarnVersion,System.String)", "", "Argument[5]", "ReturnValue.Property[Mono.Linker.MessageContainer.SubCategory]", "value", "dfc-generated"]
+      - ["Mono.Linker", "MessageContainer", False, "CreateDiagnosticMessage", "(System.String)", "", "Argument[0]", "ReturnValue.Property[Mono.Linker.MessageContainer.Text]", "value", "dfc-generated"]
+      - ["Mono.Linker", "MessageContainer", False, "CreateInfoMessage", "(System.String)", "", "Argument[0]", "ReturnValue.Property[Mono.Linker.MessageContainer.Text]", "value", "dfc-generated"]
+      - ["Mono.Linker", "MessageContainer", False, "IsWarningMessage", "(System.Nullable<System.Int32>)", "", "Argument[this].Property[Mono.Linker.MessageContainer.Code]", "ReturnValue", "value", "dfc-generated"]
+      - ["Mono.Linker", "MessageContainer", False, "ToMSBuildString", "()", "", "Argument[this].Property[Mono.Linker.MessageContainer.Origin].Property[Mono.Linker.MessageOrigin.FileName]", "ReturnValue", "taint", "dfc-generated"]
+      - ["Mono.Linker", "MessageContainer", False, "ToMSBuildString", "()", "", "Argument[this].Property[Mono.Linker.MessageContainer.SubCategory]", "ReturnValue", "taint", "dfc-generated"]
+      - ["Mono.Linker", "MessageContainer", False, "ToMSBuildString", "()", "", "Argument[this].Property[Mono.Linker.MessageContainer.Text]", "ReturnValue", "taint", "dfc-generated"]
+      - ["Mono.Linker", "MessageContainer", False, "ToString", "()", "", "Argument[this].Property[Mono.Linker.MessageContainer.Origin].Property[Mono.Linker.MessageOrigin.FileName]", "ReturnValue", "taint", "dfc-generated"]
+      - ["Mono.Linker", "MessageContainer", False, "ToString", "()", "", "Argument[this].Property[Mono.Linker.MessageContainer.SubCategory]", "ReturnValue", "taint", "dfc-generated"]
+      - ["Mono.Linker", "MessageContainer", False, "ToString", "()", "", "Argument[this].Property[Mono.Linker.MessageContainer.Text]", "ReturnValue", "taint", "dfc-generated"]
+      - ["Mono.Linker", "MessageOrigin", False, "MessageOrigin", "(Mono.Cecil.ICustomAttributeProvider,System.Nullable<System.Int32>)", "", "Argument[0]", "Argument[this].Property[Mono.Linker.MessageOrigin.Provider]", "value", "dfc-generated"]
+      - ["Mono.Linker", "MessageOrigin", False, "MessageOrigin", "(Mono.Cecil.ICustomAttributeProvider,System.Nullable<System.Int32>)", "", "Argument[1]", "Argument[this].Property[Mono.Linker.MessageOrigin.ILOffset]", "value", "dfc-generated"]
+      - ["Mono.Linker", "MessageOrigin", False, "MessageOrigin", "(Mono.Linker.MessageOrigin)", "", "Argument[0].Property[Mono.Linker.MessageOrigin.FileName]", "Argument[this].Property[Mono.Linker.MessageOrigin.FileName]", "value", "dfc-generated"]
+      - ["Mono.Linker", "MessageOrigin", False, "MessageOrigin", "(Mono.Linker.MessageOrigin)", "", "Argument[0].Property[Mono.Linker.MessageOrigin.ILOffset]", "Argument[this].Property[Mono.Linker.MessageOrigin.ILOffset]", "value", "dfc-generated"]
+      - ["Mono.Linker", "MessageOrigin", False, "MessageOrigin", "(Mono.Linker.MessageOrigin)", "", "Argument[0].Property[Mono.Linker.MessageOrigin.Provider]", "Argument[this].Property[Mono.Linker.MessageOrigin.Provider]", "value", "dfc-generated"]
+      - ["Mono.Linker", "MessageOrigin", False, "MessageOrigin", "(Mono.Linker.MessageOrigin,System.Int32)", "", "Argument[0].Property[Mono.Linker.MessageOrigin.FileName]", "Argument[this].Property[Mono.Linker.MessageOrigin.FileName]", "value", "dfc-generated"]
+      - ["Mono.Linker", "MessageOrigin", False, "MessageOrigin", "(Mono.Linker.MessageOrigin,System.Int32)", "", "Argument[0].Property[Mono.Linker.MessageOrigin.Provider]", "Argument[this].Property[Mono.Linker.MessageOrigin.Provider]", "value", "dfc-generated"]
+      - ["Mono.Linker", "MessageOrigin", False, "MessageOrigin", "(System.String,System.Int32,System.Int32,Mono.Cecil.AssemblyDefinition)", "", "Argument[0]", "Argument[this].Property[Mono.Linker.MessageOrigin.FileName]", "value", "dfc-generated"]
+      - ["Mono.Linker", "MessageOrigin", False, "MessageOrigin", "(System.String,System.Int32,System.Int32,Mono.Cecil.AssemblyDefinition)", "", "Argument[3]", "Argument[this].Property[Mono.Linker.MessageOrigin.Provider]", "value", "dfc-generated"]
+      - ["Mono.Linker", "MessageOrigin", False, "ToString", "()", "", "Argument[this].Property[Mono.Linker.MessageOrigin.FileName]", "ReturnValue", "taint", "dfc-generated"]
+      - ["Mono.Linker", "MessageOrigin", False, "WithInstructionOffset", "(System.Int32)", "", "Argument[this].Property[Mono.Linker.MessageOrigin.FileName]", "ReturnValue.Property[Mono.Linker.MessageOrigin.FileName]", "value", "dfc-generated"]
+      - ["Mono.Linker", "MessageOrigin", False, "WithInstructionOffset", "(System.Int32)", "", "Argument[this].Property[Mono.Linker.MessageOrigin.Provider]", "ReturnValue.Property[Mono.Linker.MessageOrigin.Provider]", "value", "dfc-generated"]
       - ["Mono.Linker", "MethodDefinitionExtensions", False, "TryGetEvent", "(Mono.Cecil.MethodDefinition,Mono.Cecil.EventDefinition)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["Mono.Linker", "MethodDefinitionExtensions", False, "TryGetProperty", "(Mono.Cecil.MethodDefinition,Mono.Cecil.PropertyDefinition)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["Mono.Linker", "MethodIL", False, "Create", "(Mono.Cecil.Cil.MethodBody)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["Mono.Linker", "MethodIL", False, "get_ExceptionHandlers", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["Mono.Linker", "MethodIL", False, "get_Instructions", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["Mono.Linker", "MethodIL", False, "get_Method", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["Mono.Linker", "MethodIL", False, "get_Variables", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["Mono.Linker", "MethodIL", False, "Create", "(Mono.Cecil.Cil.MethodBody)", "", "Argument[0]", "ReturnValue.Field[Mono.Linker.MethodIL.Body]", "value", "dfc-generated"]
+      - ["Mono.Linker", "MethodIL", False, "get_ExceptionHandlers", "()", "", "Argument[this].Field[Mono.Linker.MethodIL.Body].Property[Mono.Cecil.Cil.MethodBody.ExceptionHandlers]", "ReturnValue", "value", "dfc-generated"]
+      - ["Mono.Linker", "MethodIL", False, "get_Instructions", "()", "", "Argument[this].Field[Mono.Linker.MethodIL.Body].Property[Mono.Cecil.Cil.MethodBody.Instructions]", "ReturnValue", "value", "dfc-generated"]
+      - ["Mono.Linker", "MethodIL", False, "get_Method", "()", "", "Argument[this].Field[Mono.Linker.MethodIL.Body].Property[Mono.Cecil.Cil.MethodBody.Method]", "ReturnValue", "value", "dfc-generated"]
+      - ["Mono.Linker", "MethodIL", False, "get_Variables", "()", "", "Argument[this].Field[Mono.Linker.MethodIL.Body].Property[Mono.Cecil.Cil.MethodBody.Variables]", "ReturnValue", "value", "dfc-generated"]
       - ["Mono.Linker", "MethodReferenceExtensions", False, "GetInflatedParameterType", "(Mono.Cecil.MethodReference,System.Int32,Mono.Linker.LinkContext)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["Mono.Linker", "MethodReferenceExtensions", False, "GetReturnType", "(Mono.Cecil.MethodReference,Mono.Linker.LinkContext)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["Mono.Linker", "ModuleDefinitionExtensions", False, "GetMatchingExportedType", "(Mono.Cecil.ModuleDefinition,Mono.Cecil.TypeDefinition,Mono.Linker.LinkContext,Mono.Cecil.ExportedType)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["Mono.Linker", "OverrideInformation", False, "OverrideInformation", "(Mono.Cecil.MethodDefinition,Mono.Cecil.MethodDefinition,Mono.Linker.ITryResolveMetadata,Mono.Cecil.InterfaceImplementation)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
-      - ["Mono.Linker", "OverrideInformation", False, "OverrideInformation", "(Mono.Cecil.MethodDefinition,Mono.Cecil.MethodDefinition,Mono.Linker.ITryResolveMetadata,Mono.Cecil.InterfaceImplementation)", "", "Argument[3]", "Argument[this]", "taint", "df-generated"]
+      - ["Mono.Linker", "MethodReferenceExtensions", False, "GetReturnType", "(Mono.Cecil.MethodReference,Mono.Linker.LinkContext)", "", "Argument[0].Property[Mono.Cecil.MethodReference.ReturnType].Property[Mono.Cecil.FunctionPointerType.ReturnType]", "ReturnValue.Property[Mono.Cecil.FunctionPointerType.ReturnType]", "value", "dfc-generated"]
+      - ["Mono.Linker", "MethodReferenceExtensions", False, "GetReturnType", "(Mono.Cecil.MethodReference,Mono.Linker.LinkContext)", "", "Argument[0].Property[Mono.Cecil.MethodReference.ReturnType]", "ReturnValue", "value", "dfc-generated"]
+      - ["Mono.Linker", "ModuleDefinitionExtensions", False, "GetMatchingExportedType", "(Mono.Cecil.ModuleDefinition,Mono.Cecil.TypeDefinition,Mono.Linker.LinkContext,Mono.Cecil.ExportedType)", "", "Argument[0].Property[Mono.Cecil.ModuleDefinition.ExportedTypes].Element", "ReturnValue", "value", "dfc-generated"]
+      - ["Mono.Linker", "OverrideInformation", False, "OverrideInformation", "(Mono.Cecil.MethodDefinition,Mono.Cecil.MethodDefinition,Mono.Linker.ITryResolveMetadata,Mono.Cecil.InterfaceImplementation)", "", "Argument[3]", "Argument[this].SyntheticField[Mono.Linker.OverrideInformation._matchingInterfaceImplementation]", "value", "dfc-generated"]
       - ["Mono.Linker", "OverrideInformation", False, "get_Base", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["Mono.Linker", "OverrideInformation", False, "get_InterfaceType", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["Mono.Linker", "OverrideInformation", False, "get_MatchingInterfaceImplementation", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["Mono.Linker", "OverrideInformation", False, "get_InterfaceType", "()", "", "Argument[this].Property[Mono.Linker.OverrideInformation.Base].Property[Mono.Cecil.MethodDefinition.DeclaringType]", "ReturnValue", "value", "dfc-generated"]
+      - ["Mono.Linker", "OverrideInformation", False, "get_InterfaceType", "()", "", "Argument[this].Property[Mono.Linker.OverrideInformation.MatchingInterfaceImplementation].Property[Mono.Cecil.InterfaceImplementation.InterfaceType]", "ReturnValue", "value", "dfc-generated"]
+      - ["Mono.Linker", "OverrideInformation", False, "get_InterfaceType", "()", "", "Argument[this].SyntheticField[Mono.Linker.OverrideInformation._matchingInterfaceImplementation].Property[Mono.Cecil.InterfaceImplementation.InterfaceType]", "ReturnValue", "value", "dfc-generated"]
+      - ["Mono.Linker", "OverrideInformation", False, "get_MatchingInterfaceImplementation", "()", "", "Argument[this].SyntheticField[Mono.Linker.OverrideInformation._matchingInterfaceImplementation]", "ReturnValue", "value", "dfc-generated"]
       - ["Mono.Linker", "OverrideInformation", False, "get_Override", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["Mono.Linker", "PInvokeInfo", False, "PInvokeInfo", "(System.String,System.String,System.String,System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["Mono.Linker", "PInvokeInfo", False, "PInvokeInfo", "(System.String,System.String,System.String,System.String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
       - ["Mono.Linker", "PInvokeInfo", False, "PInvokeInfo", "(System.String,System.String,System.String,System.String)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
       - ["Mono.Linker", "PInvokeInfo", False, "PInvokeInfo", "(System.String,System.String,System.String,System.String)", "", "Argument[3]", "Argument[this]", "taint", "df-generated"]
-      - ["Mono.Linker", "Pipeline", False, "AddMarkHandlerAfter", "(Mono.Linker.Steps.IMarkHandler,Mono.Linker.Steps.IMarkHandler)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["Mono.Linker", "Pipeline", False, "AddMarkHandlerBefore", "(Mono.Linker.Steps.IMarkHandler,Mono.Linker.Steps.IMarkHandler)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["Mono.Linker", "Pipeline", False, "AddMarkHandlerAfter", "(Mono.Linker.Steps.IMarkHandler,Mono.Linker.Steps.IMarkHandler)", "", "Argument[1]", "Argument[this].Property[Mono.Linker.Pipeline.MarkHandlers].Element", "value", "dfc-generated"]
+      - ["Mono.Linker", "Pipeline", False, "AddMarkHandlerBefore", "(Mono.Linker.Steps.IMarkHandler,Mono.Linker.Steps.IMarkHandler)", "", "Argument[1]", "Argument[this].Property[Mono.Linker.Pipeline.MarkHandlers].Element", "value", "dfc-generated"]
       - ["Mono.Linker", "Pipeline", False, "AddStepAfter", "(Mono.Linker.Steps.IStep,Mono.Linker.Steps.IStep)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
       - ["Mono.Linker", "Pipeline", False, "AddStepAfter", "(System.Type,Mono.Linker.Steps.IStep)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
       - ["Mono.Linker", "Pipeline", False, "AddStepBefore", "(Mono.Linker.Steps.IStep,Mono.Linker.Steps.IStep)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
       - ["Mono.Linker", "Pipeline", False, "AddStepBefore", "(System.Type,Mono.Linker.Steps.IStep)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["Mono.Linker", "Pipeline", False, "AppendMarkHandler", "(Mono.Linker.Steps.IMarkHandler)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["Mono.Linker", "Pipeline", False, "AppendMarkHandler", "(Mono.Linker.Steps.IMarkHandler)", "", "Argument[0]", "Argument[this].Property[Mono.Linker.Pipeline.MarkHandlers].Element", "value", "dfc-generated"]
       - ["Mono.Linker", "Pipeline", False, "AppendStep", "(Mono.Linker.Steps.IStep)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["Mono.Linker", "Pipeline", False, "PrependStep", "(Mono.Linker.Steps.IStep)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["Mono.Linker", "Pipeline", False, "ReplaceStep", "(System.Type,Mono.Linker.Steps.IStep)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
       - ["Mono.Linker", "Pipeline", True, "ProcessStep", "(Mono.Linker.LinkContext,Mono.Linker.Steps.IStep)", "", "Argument[0]", "Argument[1]", "taint", "df-generated"]
-      - ["Mono.Linker", "RemoveAttributeInstancesAttribute", False, "RemoveAttributeInstancesAttribute", "(Mono.Collections.Generic.Collection<Mono.Cecil.CustomAttributeArgument>)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
+      - ["Mono.Linker", "RemoveAttributeInstancesAttribute", False, "RemoveAttributeInstancesAttribute", "(Mono.Collections.Generic.Collection<Mono.Cecil.CustomAttributeArgument>)", "", "Argument[0].Element.Property[Mono.Cecil.CustomAttributeArgument.Value]", "Argument[this].Property[Mono.Linker.RemoveAttributeInstancesAttribute.Arguments].Element", "value", "dfc-generated"]
       - ["Mono.Linker", "SerializationMarker", False, "MarkRecursiveMembers", "(Mono.Cecil.ICustomAttributeProvider,Mono.Linker.SerializerKind)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["Mono.Linker", "SerializationMarker", False, "SerializationMarker", "(Mono.Linker.LinkContext)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["Mono.Linker", "SerializationMarker", False, "TrackForSerialization", "(Mono.Cecil.ICustomAttributeProvider,Mono.Linker.SerializerKind)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["Mono.Linker", "SubstitutionInfo", False, "SetFieldInit", "(Mono.Cecil.FieldDefinition)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["Mono.Linker", "SubstitutionInfo", False, "SetFieldInit", "(Mono.Cecil.FieldDefinition)", "", "Argument[0]", "Argument[this].Property[Mono.Linker.SubstitutionInfo.FieldInit].Element", "value", "dfc-generated"]
       - ["Mono.Linker", "Tracer", False, "AddRecorder", "(Mono.Linker.IDependencyRecorder)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["Mono.Linker", "Tracer", False, "Tracer", "(Mono.Linker.LinkContext)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["Mono.Linker", "Tracer", False, "Tracer", "(Mono.Linker.LinkContext)", "", "Argument[0]", "Argument[this].Field[Mono.Linker.Tracer.context]", "value", "dfc-generated"]
       - ["Mono.Linker", "TypeDefinitionExtensions", False, "GetEnumUnderlyingType", "(Mono.Cecil.TypeDefinition)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["Mono.Linker", "TypeMapInfo", False, "EnsureProcessed", "(Mono.Cecil.AssemblyDefinition)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["Mono.Linker", "TypeMapInfo", False, "GetBaseMethods", "(Mono.Cecil.MethodDefinition)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["Mono.Linker", "TypeMapInfo", False, "GetOverrides", "(Mono.Cecil.MethodDefinition)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["Mono.Linker", "TypeMapInfo", False, "TypeMapInfo", "(Mono.Linker.LinkContext)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["Mono.Linker", "TypeMapInfo", False, "get_MethodsWithOverrideInformation", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["Mono.Linker", "TypeReferenceExtensions", False, "GetDefaultInstanceConstructor", "(Mono.Cecil.TypeDefinition,Mono.Linker.LinkContext)", "", "Argument[0]", "Argument[1]", "taint", "df-generated"]
-      - ["Mono.Linker", "TypeReferenceExtensions", False, "GetDefaultInstanceConstructor", "(Mono.Cecil.TypeDefinition,Mono.Linker.LinkContext)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["Mono.Linker", "TypeMapInfo", False, "get_MethodsWithOverrideInformation", "()", "", "Argument[this].Field[Mono.Linker.TypeMapInfo.override_methods].Property[System.Collections.Generic.Dictionary`2.Keys]", "ReturnValue", "value", "dfc-generated"]
+      - ["Mono.Linker", "TypeReferenceExtensions", False, "GetDefaultInstanceConstructor", "(Mono.Cecil.TypeDefinition,Mono.Linker.LinkContext)", "", "Argument[0].Property[Mono.Cecil.TypeDefinition.Methods].Element", "ReturnValue", "value", "dfc-generated"]
       - ["Mono.Linker", "TypeReferenceExtensions", False, "GetInflatedDeclaringType", "(Mono.Cecil.TypeReference,Mono.Linker.ITryResolveMetadata)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["Mono.Linker", "TypeReferenceExtensions", False, "GetInflatedInterfaces", "(Mono.Cecil.TypeReference,Mono.Linker.ITryResolveMetadata)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["Mono.Linker", "TypeReferenceExtensions", False, "GetMethods", "(Mono.Cecil.TypeReference,Mono.Linker.ITryResolveMetadata)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["Mono.Linker", "TypeReferenceExtensions", False, "GetInflatedInterfaces", "(Mono.Cecil.TypeReference,Mono.Linker.ITryResolveMetadata)", "", "Argument[0].Property[Mono.Cecil.GenericInstanceType.GenericArguments].Element", "ReturnValue.Element.Field[System.ValueTuple`2.Item1]", "value", "dfc-generated"]
+      - ["Mono.Linker", "TypeReferenceExtensions", False, "GetInflatedInterfaces", "(Mono.Cecil.TypeReference,Mono.Linker.ITryResolveMetadata)", "", "Argument[0].Property[Mono.Cecil.TypeDefinition.Interfaces].Element", "ReturnValue.Element.Field[System.ValueTuple`2.Item2]", "value", "dfc-generated"]
+      - ["Mono.Linker", "TypeReferenceExtensions", False, "GetMethods", "(Mono.Cecil.TypeReference,Mono.Linker.ITryResolveMetadata)", "", "Argument[0].Property[Mono.Cecil.TypeDefinition.Methods].Element", "ReturnValue.Element", "value", "dfc-generated"]
       - ["Mono.Linker", "TypeReferenceExtensions", False, "HasDefaultConstructor", "(Mono.Cecil.TypeDefinition,Mono.Linker.LinkContext)", "", "Argument[0]", "Argument[1]", "taint", "df-generated"]
       - ["Mono.Linker", "TypeReferenceExtensions", False, "InflateGenericType", "(Mono.Cecil.GenericInstanceType,Mono.Cecil.TypeReference,Mono.Linker.ITryResolveMetadata)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["Mono.Linker", "TypeReferenceExtensions", False, "InflateGenericType", "(Mono.Cecil.GenericInstanceType,Mono.Cecil.TypeReference,Mono.Linker.ITryResolveMetadata)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["Mono.Linker", "TypeReferenceExtensions", False, "ResolveToTypeDefinition", "(Mono.Cecil.TypeReference,Mono.Linker.LinkContext)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["Mono.Linker", "TypeReferenceExtensions", False, "ToCecilName", "(System.String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["Mono.Linker", "TypeReferenceExtensions", False, "WithoutModifiers", "(Mono.Cecil.TypeReference)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["Mono.Linker", "UnconditionalSuppressMessageAttributeState+Suppression", False, "Suppression", "(Mono.Linker.SuppressMessageInfo,Mono.Cecil.CustomAttribute,Mono.Cecil.ICustomAttributeProvider)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["Mono.Linker", "UnconditionalSuppressMessageAttributeState+Suppression", False, "Suppression", "(Mono.Linker.SuppressMessageInfo,Mono.Cecil.CustomAttribute,Mono.Cecil.ICustomAttributeProvider)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["Mono.Linker", "UnconditionalSuppressMessageAttributeState+Suppression", False, "Suppression", "(Mono.Linker.SuppressMessageInfo,Mono.Cecil.CustomAttribute,Mono.Cecil.ICustomAttributeProvider)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
+      - ["Mono.Linker", "TypeReferenceExtensions", False, "ResolveToTypeDefinition", "(Mono.Cecil.TypeReference,Mono.Linker.LinkContext)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Mono.Linker", "TypeReferenceExtensions", False, "ToCecilName", "(System.String)", "", "Argument[0]", "ReturnValue", "taint", "dfc-generated"]
+      - ["Mono.Linker", "TypeReferenceExtensions", False, "WithoutModifiers", "(Mono.Cecil.TypeReference)", "", "Argument[0].Property[Mono.Cecil.IModifierType.ElementType].Property[Mono.Cecil.IModifierType.ElementType]", "ReturnValue", "value", "dfc-generated"]
+      - ["Mono.Linker", "TypeReferenceExtensions", False, "WithoutModifiers", "(Mono.Cecil.TypeReference)", "", "Argument[0].Property[Mono.Cecil.IModifierType.ElementType]", "ReturnValue", "value", "dfc-generated"]
+      - ["Mono.Linker", "TypeReferenceExtensions", False, "WithoutModifiers", "(Mono.Cecil.TypeReference)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["Mono.Linker", "UnconditionalSuppressMessageAttributeState+Suppression", False, "Suppression", "(Mono.Linker.SuppressMessageInfo,Mono.Cecil.CustomAttribute,Mono.Cecil.ICustomAttributeProvider)", "", "Argument[0]", "Argument[this].Property[Mono.Linker.UnconditionalSuppressMessageAttributeState+Suppression.SuppressMessageInfo]", "value", "dfc-generated"]
+      - ["Mono.Linker", "UnconditionalSuppressMessageAttributeState+Suppression", False, "Suppression", "(Mono.Linker.SuppressMessageInfo,Mono.Cecil.CustomAttribute,Mono.Cecil.ICustomAttributeProvider)", "", "Argument[1]", "Argument[this].Property[Mono.Linker.UnconditionalSuppressMessageAttributeState+Suppression.OriginAttribute]", "value", "dfc-generated"]
+      - ["Mono.Linker", "UnconditionalSuppressMessageAttributeState+Suppression", False, "Suppression", "(Mono.Linker.SuppressMessageInfo,Mono.Cecil.CustomAttribute,Mono.Cecil.ICustomAttributeProvider)", "", "Argument[2]", "Argument[this].Property[Mono.Linker.UnconditionalSuppressMessageAttributeState+Suppression.Provider]", "value", "dfc-generated"]
       - ["Mono.Linker", "UnconditionalSuppressMessageAttributeState", False, "GatherSuppressions", "(Mono.Cecil.ICustomAttributeProvider)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["Mono.Linker", "UnconditionalSuppressMessageAttributeState", False, "GetModuleFromProvider", "(Mono.Cecil.ICustomAttributeProvider)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["Mono.Linker", "UnconditionalSuppressMessageAttributeState", False, "IsSuppressed", "(System.Int32,Mono.Linker.MessageOrigin,Mono.Linker.SuppressMessageInfo)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
       - ["Mono.Linker", "UnconditionalSuppressMessageAttributeState", False, "UnconditionalSuppressMessageAttributeState", "(Mono.Linker.LinkContext)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["Mono.Linker", "UnintializedContextFactory", True, "CreateAnnotationStore", "(Mono.Linker.LinkContext)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["Mono.Linker", "UnintializedContextFactory", True, "CreateMarkingHelpers", "(Mono.Linker.LinkContext)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["Mono.Linker", "UnintializedContextFactory", True, "CreateMarkingHelpers", "(Mono.Linker.LinkContext)", "", "Argument[0]", "ReturnValue.Field[Mono.Linker.MarkingHelpers._context]", "value", "dfc-generated"]
       - ["Mono.Linker", "UnintializedContextFactory", True, "CreateResolver", "(Mono.Linker.LinkContext)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["Mono.Linker", "UnintializedContextFactory", True, "CreateTracer", "(Mono.Linker.LinkContext)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["Mono.Linker", "UnintializedContextFactory", True, "CreateTracer", "(Mono.Linker.LinkContext)", "", "Argument[0]", "ReturnValue.Field[Mono.Linker.Tracer.context]", "value", "dfc-generated"]
       - ["Mono.Linker", "WarningSuppressionWriter", False, "WarningSuppressionWriter", "(Mono.Linker.LinkContext,Mono.Linker.WarningSuppressionWriter+FileOutputKind)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["Mono.Linker", "XmlDependencyRecorder", False, "RecordDependency", "(System.Object,Mono.Linker.DependencyInfo,System.Boolean)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["Mono.Linker", "XmlDependencyRecorder", False, "RecordDependency", "(System.Object,Mono.Linker.DependencyInfo,System.Boolean)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
       - ["Mono.Linker", "XmlDependencyRecorder", False, "XmlDependencyRecorder", "(Mono.Linker.LinkContext,System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["Mono.Linker", "XmlDependencyRecorder", False, "XmlDependencyRecorder", "(Mono.Linker.LinkContext,System.String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
   - addsTo:
@@ -281,6 +282,7 @@ extensions:
       - ["Mono.Linker", "DgmlDependencyRecorder", "Dispose", "()", "summary", "df-generated"]
       - ["Mono.Linker", "DgmlDependencyRecorder", "FinishRecording", "()", "summary", "df-generated"]
       - ["Mono.Linker", "DgmlDependencyRecorder", "RecordDependency", "(System.Object,Mono.Linker.DependencyInfo,System.Boolean)", "summary", "df-generated"]
+      - ["Mono.Linker", "DgmlDependencyRecorder", "RecordDependency", "(System.Object,System.Object,System.Boolean)", "summary", "df-generated"]
       - ["Mono.Linker", "DgmlDependencyRecorder", "RecordDependency", "(System.Object,System.Object,System.Object)", "summary", "df-generated"]
       - ["Mono.Linker", "DocumentationSignatureParser", "GetMembersForDocumentationSignature", "(System.String,Mono.Cecil.ModuleDefinition,Mono.Linker.ITryResolveMetadata)", "summary", "df-generated"]
       - ["Mono.Linker", "DocumentationSignatureParser", "GetTypeByDocumentationSignature", "(Mono.Cecil.AssemblyDefinition,System.String,Mono.Linker.ITryResolveMetadata)", "summary", "df-generated"]
@@ -311,6 +313,7 @@ extensions:
       - ["Mono.Linker", "FeatureSettings", "ShouldProcessElement", "(System.Xml.XPath.XPathNavigator,Mono.Linker.LinkContext,System.String)", "summary", "df-generated"]
       - ["Mono.Linker", "IDependencyRecorder", "FinishRecording", "()", "summary", "df-generated"]
       - ["Mono.Linker", "IDependencyRecorder", "RecordDependency", "(System.Object,Mono.Linker.DependencyInfo,System.Boolean)", "summary", "df-generated"]
+      - ["Mono.Linker", "IDependencyRecorder", "RecordDependency", "(System.Object,System.Object,System.Boolean)", "summary", "df-generated"]
       - ["Mono.Linker", "ILogger", "LogMessage", "(Mono.Linker.MessageContainer)", "summary", "df-generated"]
       - ["Mono.Linker", "IXApiVisitor", "OnAssembly", "(System.Xml.XPath.XPathNavigator,Mono.Cecil.AssemblyDefinition)", "summary", "df-generated"]
       - ["Mono.Linker", "IXApiVisitor", "OnAttribute", "(System.Xml.XPath.XPathNavigator)", "summary", "df-generated"]
@@ -497,3 +500,5 @@ extensions:
       - ["Mono.Linker", "WarningSuppressionWriter", "get_IsEmpty", "()", "summary", "df-generated"]
       - ["Mono.Linker", "XmlDependencyRecorder", "Dispose", "()", "summary", "df-generated"]
       - ["Mono.Linker", "XmlDependencyRecorder", "FinishRecording", "()", "summary", "df-generated"]
+      - ["Mono.Linker", "XmlDependencyRecorder", "RecordDependency", "(System.Object,Mono.Linker.DependencyInfo,System.Boolean)", "summary", "df-generated"]
+      - ["Mono.Linker", "XmlDependencyRecorder", "RecordDependency", "(System.Object,System.Object,System.Boolean)", "summary", "df-generated"]
diff --git a/csharp/ql/lib/ext/generated/SourceGenerators.model.yml b/csharp/ql/lib/ext/generated/SourceGenerators.model.yml
index 8958a14b9b3..f7d407c6e10 100644
--- a/csharp/ql/lib/ext/generated/SourceGenerators.model.yml
+++ b/csharp/ql/lib/ext/generated/SourceGenerators.model.yml
@@ -4,11 +4,11 @@ extensions:
       pack: codeql/csharp-all
       extensible: summaryModel
     data:
-      - ["SourceGenerators", "ImmutableEquatableArray<T>+Enumerator", False, "get_Current", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["SourceGenerators", "ImmutableEquatableArray<T>", False, "GetEnumerator", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["SourceGenerators", "ImmutableEquatableArray<T>", False, "ImmutableEquatableArray", "(System.Collections.Generic.IEnumerable<T>)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["SourceGenerators", "ImmutableEquatableArray<T>", False, "get_Item", "(System.Int32)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["SourceGenerators", "TypeRef", False, "TypeRef", "(Microsoft.CodeAnalysis.ITypeSymbol)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["SourceGenerators", "ImmutableEquatableArray<T>+Enumerator", False, "get_Current", "()", "", "Argument[this].SyntheticField[SourceGenerators.ImmutableEquatableArray`1+Enumerator._values].Element", "ReturnValue", "value", "dfc-generated"]
+      - ["SourceGenerators", "ImmutableEquatableArray<T>", False, "GetEnumerator", "()", "", "Argument[this].SyntheticField[SourceGenerators.ImmutableEquatableArray`1._values]", "ReturnValue.SyntheticField[SourceGenerators.ImmutableEquatableArray`1+Enumerator._values]", "value", "dfc-generated"]
+      - ["SourceGenerators", "ImmutableEquatableArray<T>", False, "ImmutableEquatableArray", "(System.Collections.Generic.IEnumerable<T>)", "", "Argument[0].Element", "Argument[this].SyntheticField[SourceGenerators.ImmutableEquatableArray`1._values].Element", "value", "dfc-generated"]
+      - ["SourceGenerators", "ImmutableEquatableArray<T>", False, "get_Item", "(System.Int32)", "", "Argument[this].SyntheticField[SourceGenerators.ImmutableEquatableArray`1._values].Element", "ReturnValue", "value", "dfc-generated"]
+      - ["SourceGenerators", "TypeRef", False, "TypeRef", "(Microsoft.CodeAnalysis.ITypeSymbol)", "", "Argument[0].Property[Microsoft.CodeAnalysis.ISymbol.Name]", "Argument[this].Property[SourceGenerators.TypeRef.Name]", "value", "dfc-generated"]
   - addsTo:
       pack: codeql/csharp-all
       extensible: neutralModel
diff --git a/csharp/ql/lib/ext/generated/System.Buffers.model.yml b/csharp/ql/lib/ext/generated/System.Buffers.model.yml
index e6734f4427e..560ee94f838 100644
--- a/csharp/ql/lib/ext/generated/System.Buffers.model.yml
+++ b/csharp/ql/lib/ext/generated/System.Buffers.model.yml
@@ -4,67 +4,58 @@ extensions:
       pack: codeql/csharp-all
       extensible: summaryModel
     data:
-      - ["System.Buffers", "ArrayBufferWriter<T>", False, "GetMemory", "(System.Int32)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Buffers", "ArrayBufferWriter<T>", False, "get_WrittenMemory", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Buffers", "ArrayBufferWriter<T>", False, "get_WrittenSpan", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Buffers", "BuffersExtensions", False, "CopyTo<T>", "(System.Buffers.ReadOnlySequence<T>,System.Span<T>)", "", "Argument[0]", "Argument[1]", "taint", "df-generated"]
-      - ["System.Buffers", "BuffersExtensions", False, "PositionOf<T>", "(System.Buffers.ReadOnlySequence<T>,T)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Buffers", "MemoryHandle", False, "MemoryHandle", "(System.Void*,System.Runtime.InteropServices.GCHandle,System.Buffers.IPinnable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Buffers", "MemoryHandle", False, "MemoryHandle", "(System.Void*,System.Runtime.InteropServices.GCHandle,System.Buffers.IPinnable)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Buffers", "MemoryHandle", False, "MemoryHandle", "(System.Void*,System.Runtime.InteropServices.GCHandle,System.Buffers.IPinnable)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Buffers", "MemoryHandle", False, "get_Pointer", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Buffers", "MemoryHandle", False, "MemoryHandle", "(System.Void*,System.Runtime.InteropServices.GCHandle,System.Buffers.IPinnable)", "", "Argument[0]", "Argument[this].SyntheticField[System.Buffers.MemoryHandle._pointer]", "value", "dfc-generated"]
+      - ["System.Buffers", "MemoryHandle", False, "get_Pointer", "()", "", "Argument[this].SyntheticField[System.Buffers.MemoryHandle._pointer]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Buffers", "MemoryManager<T>", False, "CreateMemory", "(System.Int32)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Buffers", "MemoryManager<T>", False, "CreateMemory", "(System.Int32,System.Int32)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Buffers", "MemoryManager<T>", True, "get_Memory", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Buffers", "ReadOnlySequence<T>+Enumerator", False, "Enumerator", "(System.Buffers.ReadOnlySequence<T>)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Buffers", "ReadOnlySequence<T>+Enumerator", False, "get_Current", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Buffers", "ReadOnlySequence<T>", False, "GetEnumerator", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Buffers", "ReadOnlySequence<T>", False, "GetPosition", "(System.Int64)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Buffers", "ReadOnlySequence<T>", False, "GetPosition", "(System.Int64,System.SequencePosition)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
       - ["System.Buffers", "ReadOnlySequence<T>", False, "ReadOnlySequence", "(System.Buffers.ReadOnlySequenceSegment<T>,System.Int32,System.Buffers.ReadOnlySequenceSegment<T>,System.Int32)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Buffers", "ReadOnlySequence<T>", False, "ReadOnlySequence", "(System.Buffers.ReadOnlySequenceSegment<T>,System.Int32,System.Buffers.ReadOnlySequenceSegment<T>,System.Int32)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Buffers", "ReadOnlySequence<T>", False, "ReadOnlySequence", "(System.ReadOnlyMemory<T>)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Buffers", "ReadOnlySequence<T>", False, "ReadOnlySequence", "(T[])", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
       - ["System.Buffers", "ReadOnlySequence<T>", False, "ReadOnlySequence", "(T[],System.Int32,System.Int32)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["System.Buffers", "ReadOnlySequence<T>", False, "Slice", "(System.Int32,System.Int32)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Buffers", "ReadOnlySequence<T>", False, "Slice", "(System.Int32,System.SequencePosition)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Buffers", "ReadOnlySequence<T>", False, "Slice", "(System.Int32,System.SequencePosition)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Buffers", "ReadOnlySequence<T>", False, "Slice", "(System.Int64)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["System.Buffers", "ReadOnlySequence<T>", False, "Slice", "(System.Int64,System.Int64)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Buffers", "ReadOnlySequence<T>", False, "Slice", "(System.Int64)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Buffers", "ReadOnlySequence<T>", False, "Slice", "(System.Int64,System.SequencePosition)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Buffers", "ReadOnlySequence<T>", False, "Slice", "(System.Int64,System.SequencePosition)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Buffers", "ReadOnlySequence<T>", False, "Slice", "(System.SequencePosition)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["System.Buffers", "ReadOnlySequence<T>", False, "Slice", "(System.SequencePosition)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Buffers", "ReadOnlySequence<T>", False, "Slice", "(System.SequencePosition,System.Int32)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Buffers", "ReadOnlySequence<T>", False, "Slice", "(System.SequencePosition,System.Int32)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Buffers", "ReadOnlySequence<T>", False, "Slice", "(System.SequencePosition,System.Int64)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Buffers", "ReadOnlySequence<T>", False, "Slice", "(System.SequencePosition,System.Int64)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Buffers", "ReadOnlySequence<T>", False, "Slice", "(System.SequencePosition,System.SequencePosition)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["System.Buffers", "ReadOnlySequence<T>", False, "Slice", "(System.SequencePosition,System.SequencePosition)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Buffers", "ReadOnlySequence<T>", False, "TryGet", "(System.SequencePosition,System.ReadOnlyMemory<T>,System.Boolean)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Buffers", "ReadOnlySequence<T>", False, "get_End", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Buffers", "ReadOnlySequence<T>", False, "get_First", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Buffers", "ReadOnlySequence<T>", False, "TryGet", "(System.SequencePosition,System.ReadOnlyMemory<T>,System.Boolean)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Buffers", "ReadOnlySequence<T>", False, "get_FirstSpan", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Buffers", "ReadOnlySequence<T>", False, "get_Start", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Buffers", "SearchValues", False, "Create", "(System.ReadOnlySpan<System.Byte>)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["System.Buffers", "SearchValues", False, "Create", "(System.ReadOnlySpan<System.String>,System.StringComparison)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["System.Buffers", "SequenceReader<T>", False, "SequenceReader", "(System.Buffers.ReadOnlySequence<T>)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Buffers", "SequenceReader<T>", False, "TryCopyTo", "(System.Span<T>)", "", "Argument[this]", "Argument[0]", "taint", "df-generated"]
-      - ["System.Buffers", "SequenceReader<T>", False, "TryPeek", "(System.Int64,T)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Buffers", "SequenceReader<T>", False, "TryPeek", "(T)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Buffers", "SequenceReader<T>", False, "TryRead", "(T)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Buffers", "SequenceReader<T>", False, "TryCopyTo", "(System.Span<T>)", "", "Argument[this].Property[System.Buffers.SequenceReader`1.CurrentSpan].Element", "Argument[0].Element", "value", "dfc-generated"]
+      - ["System.Buffers", "SequenceReader<T>", False, "TryCopyTo", "(System.Span<T>)", "", "Argument[this].Property[System.Buffers.SequenceReader`1.UnreadSpan].Element", "Argument[0].Element", "value", "dfc-generated"]
+      - ["System.Buffers", "SequenceReader<T>", False, "TryPeek", "(System.Int64,T)", "", "Argument[this].Property[System.Buffers.SequenceReader`1.CurrentSpan].Element", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Buffers", "SequenceReader<T>", False, "TryPeek", "(T)", "", "Argument[this].Property[System.Buffers.SequenceReader`1.CurrentSpan].Element", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Buffers", "SequenceReader<T>", False, "TryRead", "(T)", "", "Argument[this].Property[System.Buffers.SequenceReader`1.CurrentSpan].Element", "ReturnValue", "value", "dfc-generated"]
       - ["System.Buffers", "SequenceReader<T>", False, "TryReadExact", "(System.Int32,System.Buffers.ReadOnlySequence<T>)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Buffers", "SequenceReader<T>", False, "TryReadTo", "(System.Buffers.ReadOnlySequence<T>,System.ReadOnlySpan<T>,System.Boolean)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Buffers", "SequenceReader<T>", False, "TryReadTo", "(System.Buffers.ReadOnlySequence<T>,T,System.Boolean)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Buffers", "SequenceReader<T>", False, "TryReadTo", "(System.Buffers.ReadOnlySequence<T>,T,T,System.Boolean)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Buffers", "SequenceReader<T>", False, "TryReadTo", "(System.ReadOnlySpan<T>,System.ReadOnlySpan<T>,System.Boolean)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Buffers", "SequenceReader<T>", False, "TryReadTo", "(System.ReadOnlySpan<T>,T,System.Boolean)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Buffers", "SequenceReader<T>", False, "TryReadTo", "(System.ReadOnlySpan<T>,T,T,System.Boolean)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Buffers", "SequenceReader<T>", False, "TryReadTo", "(System.ReadOnlySpan<T>,System.ReadOnlySpan<T>,System.Boolean)", "", "Argument[this].Property[System.Buffers.SequenceReader`1.CurrentSpan].Element", "ReturnValue.Element", "value", "dfc-generated"]
+      - ["System.Buffers", "SequenceReader<T>", False, "TryReadTo", "(System.ReadOnlySpan<T>,System.ReadOnlySpan<T>,System.Boolean)", "", "Argument[this].Property[System.Buffers.SequenceReader`1.UnreadSpan].Element", "ReturnValue.Element", "value", "dfc-generated"]
+      - ["System.Buffers", "SequenceReader<T>", False, "TryReadTo", "(System.ReadOnlySpan<T>,T,System.Boolean)", "", "Argument[this].Property[System.Buffers.SequenceReader`1.CurrentSpan].Element", "ReturnValue.Element", "value", "dfc-generated"]
+      - ["System.Buffers", "SequenceReader<T>", False, "TryReadTo", "(System.ReadOnlySpan<T>,T,System.Boolean)", "", "Argument[this].Property[System.Buffers.SequenceReader`1.UnreadSpan].Element", "ReturnValue.Element", "value", "dfc-generated"]
+      - ["System.Buffers", "SequenceReader<T>", False, "TryReadTo", "(System.ReadOnlySpan<T>,T,T,System.Boolean)", "", "Argument[this].Property[System.Buffers.SequenceReader`1.CurrentSpan].Element", "ReturnValue.Element", "value", "dfc-generated"]
+      - ["System.Buffers", "SequenceReader<T>", False, "TryReadTo", "(System.ReadOnlySpan<T>,T,T,System.Boolean)", "", "Argument[this].Property[System.Buffers.SequenceReader`1.UnreadSpan].Element", "ReturnValue.Element", "value", "dfc-generated"]
       - ["System.Buffers", "SequenceReader<T>", False, "TryReadToAny", "(System.Buffers.ReadOnlySequence<T>,System.ReadOnlySpan<T>,System.Boolean)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Buffers", "SequenceReader<T>", False, "TryReadToAny", "(System.ReadOnlySpan<T>,System.ReadOnlySpan<T>,System.Boolean)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Buffers", "SequenceReader<T>", False, "get_Position", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Buffers", "SequenceReader<T>", False, "TryReadToAny", "(System.ReadOnlySpan<T>,System.ReadOnlySpan<T>,System.Boolean)", "", "Argument[this].Property[System.Buffers.SequenceReader`1.CurrentSpan].Element", "ReturnValue.Element", "value", "dfc-generated"]
+      - ["System.Buffers", "SequenceReader<T>", False, "TryReadToAny", "(System.ReadOnlySpan<T>,System.ReadOnlySpan<T>,System.Boolean)", "", "Argument[this].Property[System.Buffers.SequenceReader`1.UnreadSpan].Element", "ReturnValue.Element", "value", "dfc-generated"]
       - ["System.Buffers", "SequenceReader<T>", False, "get_UnreadSequence", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Buffers", "SequenceReader<T>", False, "get_UnreadSpan", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Buffers", "SequenceReader<T>", False, "get_UnreadSpan", "()", "", "Argument[this].Property[System.Buffers.SequenceReader`1.CurrentSpan].Element", "ReturnValue.Element", "value", "dfc-generated"]
+      - ["System.Buffers", "SequenceReaderExtensions", False, "TryReadBigEndian", "(System.Buffers.SequenceReader<System.Byte>,System.Int16)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Buffers", "SequenceReaderExtensions", False, "TryReadBigEndian", "(System.Buffers.SequenceReader<System.Byte>,System.Int32)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Buffers", "SequenceReaderExtensions", False, "TryReadBigEndian", "(System.Buffers.SequenceReader<System.Byte>,System.Int64)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Buffers", "SequenceReaderExtensions", False, "TryReadLittleEndian", "(System.Buffers.SequenceReader<System.Byte>,System.Int16)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Buffers", "SequenceReaderExtensions", False, "TryReadLittleEndian", "(System.Buffers.SequenceReader<System.Byte>,System.Int32)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Buffers", "SequenceReaderExtensions", False, "TryReadLittleEndian", "(System.Buffers.SequenceReader<System.Byte>,System.Int64)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
   - addsTo:
       pack: codeql/csharp-all
       extensible: neutralModel
@@ -72,16 +63,20 @@ extensions:
       - ["System.Buffers", "ArrayBufferWriter<T>", "Advance", "(System.Int32)", "summary", "df-generated"]
       - ["System.Buffers", "ArrayBufferWriter<T>", "ArrayBufferWriter", "(System.Int32)", "summary", "df-generated"]
       - ["System.Buffers", "ArrayBufferWriter<T>", "Clear", "()", "summary", "df-generated"]
+      - ["System.Buffers", "ArrayBufferWriter<T>", "GetMemory", "(System.Int32)", "summary", "df-generated"]
       - ["System.Buffers", "ArrayBufferWriter<T>", "GetSpan", "(System.Int32)", "summary", "df-generated"]
       - ["System.Buffers", "ArrayBufferWriter<T>", "ResetWrittenCount", "()", "summary", "df-generated"]
       - ["System.Buffers", "ArrayBufferWriter<T>", "get_Capacity", "()", "summary", "df-generated"]
       - ["System.Buffers", "ArrayBufferWriter<T>", "get_FreeCapacity", "()", "summary", "df-generated"]
       - ["System.Buffers", "ArrayBufferWriter<T>", "get_WrittenCount", "()", "summary", "df-generated"]
+      - ["System.Buffers", "ArrayBufferWriter<T>", "get_WrittenMemory", "()", "summary", "df-generated"]
+      - ["System.Buffers", "ArrayBufferWriter<T>", "get_WrittenSpan", "()", "summary", "df-generated"]
       - ["System.Buffers", "ArrayPool<T>", "Create", "()", "summary", "df-generated"]
       - ["System.Buffers", "ArrayPool<T>", "Create", "(System.Int32,System.Int32)", "summary", "df-generated"]
       - ["System.Buffers", "ArrayPool<T>", "Rent", "(System.Int32)", "summary", "df-generated"]
       - ["System.Buffers", "ArrayPool<T>", "Return", "(T[],System.Boolean)", "summary", "df-generated"]
       - ["System.Buffers", "ArrayPool<T>", "get_Shared", "()", "summary", "df-generated"]
+      - ["System.Buffers", "BuffersExtensions", "PositionOf<T>", "(System.Buffers.ReadOnlySequence<T>,T)", "summary", "df-generated"]
       - ["System.Buffers", "BuffersExtensions", "ToArray<T>", "(System.Buffers.ReadOnlySequence<T>)", "summary", "df-generated"]
       - ["System.Buffers", "BuffersExtensions", "Write<T>", "(System.Buffers.IBufferWriter<T>,System.ReadOnlySpan<T>)", "summary", "df-generated"]
       - ["System.Buffers", "IBufferWriter<T>", "Advance", "(System.Int32)", "summary", "df-generated"]
@@ -103,11 +98,20 @@ extensions:
       - ["System.Buffers", "MemoryPool<T>", "get_MaxBufferSize", "()", "summary", "df-generated"]
       - ["System.Buffers", "MemoryPool<T>", "get_Shared", "()", "summary", "df-generated"]
       - ["System.Buffers", "ReadOnlySequence<T>+Enumerator", "MoveNext", "()", "summary", "df-generated"]
+      - ["System.Buffers", "ReadOnlySequence<T>", "GetEnumerator", "()", "summary", "df-generated"]
       - ["System.Buffers", "ReadOnlySequence<T>", "GetOffset", "(System.SequencePosition)", "summary", "df-generated"]
+      - ["System.Buffers", "ReadOnlySequence<T>", "GetPosition", "(System.Int64)", "summary", "df-generated"]
+      - ["System.Buffers", "ReadOnlySequence<T>", "GetPosition", "(System.Int64,System.SequencePosition)", "summary", "df-generated"]
+      - ["System.Buffers", "ReadOnlySequence<T>", "ReadOnlySequence", "(System.ReadOnlyMemory<T>)", "summary", "df-generated"]
+      - ["System.Buffers", "ReadOnlySequence<T>", "Slice", "(System.Int32,System.Int32)", "summary", "df-generated"]
+      - ["System.Buffers", "ReadOnlySequence<T>", "Slice", "(System.Int64,System.Int64)", "summary", "df-generated"]
       - ["System.Buffers", "ReadOnlySequence<T>", "ToString", "()", "summary", "df-generated"]
+      - ["System.Buffers", "ReadOnlySequence<T>", "get_End", "()", "summary", "df-generated"]
+      - ["System.Buffers", "ReadOnlySequence<T>", "get_First", "()", "summary", "df-generated"]
       - ["System.Buffers", "ReadOnlySequence<T>", "get_IsEmpty", "()", "summary", "df-generated"]
       - ["System.Buffers", "ReadOnlySequence<T>", "get_IsSingleSegment", "()", "summary", "df-generated"]
       - ["System.Buffers", "ReadOnlySequence<T>", "get_Length", "()", "summary", "df-generated"]
+      - ["System.Buffers", "ReadOnlySequence<T>", "get_Start", "()", "summary", "df-generated"]
       - ["System.Buffers", "SearchValues", "Create", "(System.ReadOnlySpan<System.Char>)", "summary", "df-generated"]
       - ["System.Buffers", "SearchValues<T>", "Contains", "(T)", "summary", "df-generated"]
       - ["System.Buffers", "SequenceReader<T>", "Advance", "(System.Int64)", "summary", "df-generated"]
@@ -124,14 +128,9 @@ extensions:
       - ["System.Buffers", "SequenceReader<T>", "TryAdvanceToAny", "(System.ReadOnlySpan<T>,System.Boolean)", "summary", "df-generated"]
       - ["System.Buffers", "SequenceReader<T>", "get_End", "()", "summary", "df-generated"]
       - ["System.Buffers", "SequenceReader<T>", "get_Length", "()", "summary", "df-generated"]
+      - ["System.Buffers", "SequenceReader<T>", "get_Position", "()", "summary", "df-generated"]
       - ["System.Buffers", "SequenceReader<T>", "get_Remaining", "()", "summary", "df-generated"]
       - ["System.Buffers", "SequenceReader<T>", "get_Sequence", "()", "summary", "df-generated"]
-      - ["System.Buffers", "SequenceReaderExtensions", "TryReadBigEndian", "(System.Buffers.SequenceReader<System.Byte>,System.Int16)", "summary", "df-generated"]
-      - ["System.Buffers", "SequenceReaderExtensions", "TryReadBigEndian", "(System.Buffers.SequenceReader<System.Byte>,System.Int32)", "summary", "df-generated"]
-      - ["System.Buffers", "SequenceReaderExtensions", "TryReadBigEndian", "(System.Buffers.SequenceReader<System.Byte>,System.Int64)", "summary", "df-generated"]
-      - ["System.Buffers", "SequenceReaderExtensions", "TryReadLittleEndian", "(System.Buffers.SequenceReader<System.Byte>,System.Int16)", "summary", "df-generated"]
-      - ["System.Buffers", "SequenceReaderExtensions", "TryReadLittleEndian", "(System.Buffers.SequenceReader<System.Byte>,System.Int32)", "summary", "df-generated"]
-      - ["System.Buffers", "SequenceReaderExtensions", "TryReadLittleEndian", "(System.Buffers.SequenceReader<System.Byte>,System.Int64)", "summary", "df-generated"]
       - ["System.Buffers", "StandardFormat", "Equals", "(System.Buffers.StandardFormat)", "summary", "df-generated"]
       - ["System.Buffers", "StandardFormat", "Equals", "(System.Object)", "summary", "df-generated"]
       - ["System.Buffers", "StandardFormat", "GetHashCode", "()", "summary", "df-generated"]
diff --git a/csharp/ql/lib/ext/generated/System.CodeDom.Compiler.model.yml b/csharp/ql/lib/ext/generated/System.CodeDom.Compiler.model.yml
index d247db11477..ed946467225 100644
--- a/csharp/ql/lib/ext/generated/System.CodeDom.Compiler.model.yml
+++ b/csharp/ql/lib/ext/generated/System.CodeDom.Compiler.model.yml
@@ -4,81 +4,79 @@ extensions:
       pack: codeql/csharp-all
       extensible: summaryModel
     data:
-      - ["System.CodeDom.Compiler", "CodeCompiler", False, "JoinStringArray", "(System.String[],System.String)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["System.CodeDom.Compiler", "CodeCompiler", False, "JoinStringArray", "(System.String[],System.String)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["System.CodeDom.Compiler", "CodeCompiler", False, "JoinStringArray", "(System.String[],System.String)", "", "Argument[0].Element", "ReturnValue", "taint", "dfc-generated"]
+      - ["System.CodeDom.Compiler", "CodeCompiler", False, "JoinStringArray", "(System.String[],System.String)", "", "Argument[1]", "ReturnValue", "taint", "dfc-generated"]
       - ["System.CodeDom.Compiler", "CodeCompiler", True, "FromDom", "(System.CodeDom.Compiler.CompilerParameters,System.CodeDom.CodeCompileUnit)", "", "Argument[1]", "Argument[0]", "taint", "df-generated"]
       - ["System.CodeDom.Compiler", "CodeCompiler", True, "FromDom", "(System.CodeDom.Compiler.CompilerParameters,System.CodeDom.CodeCompileUnit)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
       - ["System.CodeDom.Compiler", "CodeCompiler", True, "FromDomBatch", "(System.CodeDom.Compiler.CompilerParameters,System.CodeDom.CodeCompileUnit[])", "", "Argument[1].Element", "Argument[0]", "taint", "df-generated"]
       - ["System.CodeDom.Compiler", "CodeCompiler", True, "FromDomBatch", "(System.CodeDom.Compiler.CompilerParameters,System.CodeDom.CodeCompileUnit[])", "", "Argument[1].Element", "Argument[this]", "taint", "df-generated"]
-      - ["System.CodeDom.Compiler", "CodeCompiler", True, "GetResponseFileCmdArgs", "(System.CodeDom.Compiler.CompilerParameters,System.String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["System.CodeDom.Compiler", "CodeDomProvider", True, "CompileAssemblyFromDom", "(System.CodeDom.Compiler.CompilerParameters,System.CodeDom.CodeCompileUnit[])", "", "Argument[1].Element", "Argument[0]", "taint", "df-generated"]
       - ["System.CodeDom.Compiler", "CodeDomProvider", True, "CompileAssemblyFromDom", "(System.CodeDom.Compiler.CompilerParameters,System.CodeDom.CodeCompileUnit[])", "", "Argument[1].Element", "Argument[this]", "taint", "df-generated"]
       - ["System.CodeDom.Compiler", "CodeDomProvider", True, "CreateCompiler", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.CodeDom.Compiler", "CodeDomProvider", True, "CreateEscapedIdentifier", "(System.String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["System.CodeDom.Compiler", "CodeDomProvider", True, "CreateEscapedIdentifier", "(System.String)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
       - ["System.CodeDom.Compiler", "CodeDomProvider", True, "CreateGenerator", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.CodeDom.Compiler", "CodeDomProvider", True, "CreateGenerator", "(System.IO.TextWriter)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.CodeDom.Compiler", "CodeDomProvider", True, "CreateGenerator", "(System.String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.CodeDom.Compiler", "CodeDomProvider", True, "CreateValidIdentifier", "(System.String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["System.CodeDom.Compiler", "CodeDomProvider", True, "CreateValidIdentifier", "(System.String)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
       - ["System.CodeDom.Compiler", "CodeDomProvider", True, "GenerateCodeFromCompileUnit", "(System.CodeDom.CodeCompileUnit,System.IO.TextWriter,System.CodeDom.Compiler.CodeGeneratorOptions)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.CodeDom.Compiler", "CodeDomProvider", True, "GenerateCodeFromCompileUnit", "(System.CodeDom.CodeCompileUnit,System.IO.TextWriter,System.CodeDom.Compiler.CodeGeneratorOptions)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
+      - ["System.CodeDom.Compiler", "CodeDomProvider", True, "GenerateCodeFromExpression", "(System.CodeDom.CodeExpression,System.IO.TextWriter,System.CodeDom.Compiler.CodeGeneratorOptions)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.CodeDom.Compiler", "CodeDomProvider", True, "GenerateCodeFromExpression", "(System.CodeDom.CodeExpression,System.IO.TextWriter,System.CodeDom.Compiler.CodeGeneratorOptions)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
       - ["System.CodeDom.Compiler", "CodeDomProvider", True, "GenerateCodeFromMember", "(System.CodeDom.CodeTypeMember,System.IO.TextWriter,System.CodeDom.Compiler.CodeGeneratorOptions)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.CodeDom.Compiler", "CodeDomProvider", True, "GenerateCodeFromMember", "(System.CodeDom.CodeTypeMember,System.IO.TextWriter,System.CodeDom.Compiler.CodeGeneratorOptions)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
       - ["System.CodeDom.Compiler", "CodeDomProvider", True, "GenerateCodeFromNamespace", "(System.CodeDom.CodeNamespace,System.IO.TextWriter,System.CodeDom.Compiler.CodeGeneratorOptions)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.CodeDom.Compiler", "CodeDomProvider", True, "GenerateCodeFromNamespace", "(System.CodeDom.CodeNamespace,System.IO.TextWriter,System.CodeDom.Compiler.CodeGeneratorOptions)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
+      - ["System.CodeDom.Compiler", "CodeDomProvider", True, "GenerateCodeFromStatement", "(System.CodeDom.CodeStatement,System.IO.TextWriter,System.CodeDom.Compiler.CodeGeneratorOptions)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.CodeDom.Compiler", "CodeDomProvider", True, "GenerateCodeFromStatement", "(System.CodeDom.CodeStatement,System.IO.TextWriter,System.CodeDom.Compiler.CodeGeneratorOptions)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
       - ["System.CodeDom.Compiler", "CodeDomProvider", True, "GenerateCodeFromType", "(System.CodeDom.CodeTypeDeclaration,System.IO.TextWriter,System.CodeDom.Compiler.CodeGeneratorOptions)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.CodeDom.Compiler", "CodeDomProvider", True, "GenerateCodeFromType", "(System.CodeDom.CodeTypeDeclaration,System.IO.TextWriter,System.CodeDom.Compiler.CodeGeneratorOptions)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
-      - ["System.CodeDom.Compiler", "CodeDomProvider", True, "GetTypeOutput", "(System.CodeDom.CodeTypeReference)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["System.CodeDom.Compiler", "CodeDomProvider", True, "GetTypeOutput", "(System.CodeDom.CodeTypeReference)", "", "Argument[0].Property[System.CodeDom.CodeTypeReference.ArrayElementType].Property[System.CodeDom.CodeTypeReference.BaseType]", "ReturnValue", "taint", "dfc-generated"]
+      - ["System.CodeDom.Compiler", "CodeDomProvider", True, "GetTypeOutput", "(System.CodeDom.CodeTypeReference)", "", "Argument[0].Property[System.CodeDom.CodeTypeReference.BaseType]", "ReturnValue", "taint", "dfc-generated"]
+      - ["System.CodeDom.Compiler", "CodeGenerator", False, "GenerateCodeFromCompileUnit", "(System.CodeDom.CodeCompileUnit,System.IO.TextWriter,System.CodeDom.Compiler.CodeGeneratorOptions)", "", "Argument[2]", "Argument[this].SyntheticField[System.CodeDom.Compiler.CodeGenerator._options]", "value", "dfc-generated"]
+      - ["System.CodeDom.Compiler", "CodeGenerator", False, "GenerateCodeFromExpression", "(System.CodeDom.CodeExpression,System.IO.TextWriter,System.CodeDom.Compiler.CodeGeneratorOptions)", "", "Argument[2]", "Argument[this].SyntheticField[System.CodeDom.Compiler.CodeGenerator._options]", "value", "dfc-generated"]
+      - ["System.CodeDom.Compiler", "CodeGenerator", False, "GenerateCodeFromNamespace", "(System.CodeDom.CodeNamespace,System.IO.TextWriter,System.CodeDom.Compiler.CodeGeneratorOptions)", "", "Argument[2]", "Argument[this].SyntheticField[System.CodeDom.Compiler.CodeGenerator._options]", "value", "dfc-generated"]
+      - ["System.CodeDom.Compiler", "CodeGenerator", False, "GenerateCodeFromStatement", "(System.CodeDom.CodeStatement,System.IO.TextWriter,System.CodeDom.Compiler.CodeGeneratorOptions)", "", "Argument[2]", "Argument[this].SyntheticField[System.CodeDom.Compiler.CodeGenerator._options]", "value", "dfc-generated"]
+      - ["System.CodeDom.Compiler", "CodeGenerator", False, "GenerateCodeFromType", "(System.CodeDom.CodeTypeDeclaration,System.IO.TextWriter,System.CodeDom.Compiler.CodeGeneratorOptions)", "", "Argument[2]", "Argument[this].SyntheticField[System.CodeDom.Compiler.CodeGenerator._options]", "value", "dfc-generated"]
       - ["System.CodeDom.Compiler", "CodeGenerator", False, "GenerateExpression", "(System.CodeDom.CodeExpression)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.CodeDom.Compiler", "CodeGenerator", False, "GenerateNamespaceImports", "(System.CodeDom.CodeNamespace)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.CodeDom.Compiler", "CodeGenerator", False, "GenerateNamespaces", "(System.CodeDom.CodeCompileUnit)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.CodeDom.Compiler", "CodeGenerator", False, "GenerateStatement", "(System.CodeDom.CodeStatement)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.CodeDom.Compiler", "CodeGenerator", False, "GenerateStatements", "(System.CodeDom.CodeStatementCollection)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["System.CodeDom.Compiler", "CodeGenerator", False, "GenerateTypes", "(System.CodeDom.CodeNamespace)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.CodeDom.Compiler", "CodeGenerator", False, "get_CurrentClass", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.CodeDom.Compiler", "CodeGenerator", False, "GenerateTypes", "(System.CodeDom.CodeNamespace)", "", "Argument[0].Property[System.CodeDom.CodeNamespace.Types].Element", "Argument[this].SyntheticField[System.CodeDom.Compiler.CodeGenerator._currentClass]", "value", "dfc-generated"]
+      - ["System.CodeDom.Compiler", "CodeGenerator", False, "GetTypeOutput", "(System.CodeDom.CodeTypeReference)", "", "Argument[0].Property[System.CodeDom.CodeTypeReference.ArrayElementType].Property[System.CodeDom.CodeTypeReference.BaseType]", "ReturnValue", "taint", "dfc-generated"]
+      - ["System.CodeDom.Compiler", "CodeGenerator", False, "GetTypeOutput", "(System.CodeDom.CodeTypeReference)", "", "Argument[0].Property[System.CodeDom.CodeTypeReference.BaseType]", "ReturnValue", "taint", "dfc-generated"]
+      - ["System.CodeDom.Compiler", "CodeGenerator", False, "get_CurrentClass", "()", "", "Argument[this].SyntheticField[System.CodeDom.Compiler.CodeGenerator._currentClass]", "ReturnValue", "value", "dfc-generated"]
       - ["System.CodeDom.Compiler", "CodeGenerator", False, "get_CurrentMember", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.CodeDom.Compiler", "CodeGenerator", False, "get_CurrentMemberName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.CodeDom.Compiler", "CodeGenerator", False, "get_CurrentTypeName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.CodeDom.Compiler", "CodeGenerator", False, "get_Options", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.CodeDom.Compiler", "CodeGenerator", False, "get_CurrentTypeName", "()", "", "Argument[this].SyntheticField[System.CodeDom.Compiler.CodeGenerator._currentClass].Property[System.CodeDom.CodeTypeMember.Name]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.CodeDom.Compiler", "CodeGenerator", False, "get_Options", "()", "", "Argument[this].SyntheticField[System.CodeDom.Compiler.CodeGenerator._options]", "ReturnValue", "value", "dfc-generated"]
       - ["System.CodeDom.Compiler", "CodeGenerator", False, "get_Output", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.CodeDom.Compiler", "CodeGenerator", True, "ContinueOnNewLine", "(System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.CodeDom.Compiler", "CodeGenerator", True, "CreateEscapedIdentifier", "(System.String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.CodeDom.Compiler", "CodeGenerator", True, "CreateValidIdentifier", "(System.String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["System.CodeDom.Compiler", "CodeGenerator", True, "CreateEscapedIdentifier", "(System.String)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.CodeDom.Compiler", "CodeGenerator", True, "CreateValidIdentifier", "(System.String)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
       - ["System.CodeDom.Compiler", "CodeGenerator", True, "GenerateArgumentReferenceExpression", "(System.CodeDom.CodeArgumentReferenceExpression)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.CodeDom.Compiler", "CodeGenerator", True, "GenerateArrayCreateExpression", "(System.CodeDom.CodeArrayCreateExpression)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.CodeDom.Compiler", "CodeGenerator", True, "GenerateArrayIndexerExpression", "(System.CodeDom.CodeArrayIndexerExpression)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.CodeDom.Compiler", "CodeGenerator", True, "GenerateAssignStatement", "(System.CodeDom.CodeAssignStatement)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.CodeDom.Compiler", "CodeGenerator", True, "GenerateAttachEventStatement", "(System.CodeDom.CodeAttachEventStatement)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.CodeDom.Compiler", "CodeGenerator", True, "GenerateBinaryOperatorExpression", "(System.CodeDom.CodeBinaryOperatorExpression)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.CodeDom.Compiler", "CodeGenerator", True, "GenerateCastExpression", "(System.CodeDom.CodeCastExpression)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.CodeDom.Compiler", "CodeGenerator", True, "GenerateCodeFromMember", "(System.CodeDom.CodeTypeMember,System.IO.TextWriter,System.CodeDom.Compiler.CodeGeneratorOptions)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.CodeDom.Compiler", "CodeGenerator", True, "GenerateCodeFromMember", "(System.CodeDom.CodeTypeMember,System.IO.TextWriter,System.CodeDom.Compiler.CodeGeneratorOptions)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
+      - ["System.CodeDom.Compiler", "CodeGenerator", True, "GenerateCodeFromMember", "(System.CodeDom.CodeTypeMember,System.IO.TextWriter,System.CodeDom.Compiler.CodeGeneratorOptions)", "", "Argument[2]", "Argument[this].SyntheticField[System.CodeDom.Compiler.CodeGenerator._options]", "value", "dfc-generated"]
       - ["System.CodeDom.Compiler", "CodeGenerator", True, "GenerateCompileUnit", "(System.CodeDom.CodeCompileUnit)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.CodeDom.Compiler", "CodeGenerator", True, "GenerateCompileUnitEnd", "(System.CodeDom.CodeCompileUnit)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.CodeDom.Compiler", "CodeGenerator", True, "GenerateCompileUnitStart", "(System.CodeDom.CodeCompileUnit)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.CodeDom.Compiler", "CodeGenerator", True, "GenerateConditionStatement", "(System.CodeDom.CodeConditionStatement)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.CodeDom.Compiler", "CodeGenerator", True, "GenerateConstructor", "(System.CodeDom.CodeConstructor,System.CodeDom.CodeTypeDeclaration)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.CodeDom.Compiler", "CodeGenerator", True, "GenerateDefaultValueExpression", "(System.CodeDom.CodeDefaultValueExpression)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.CodeDom.Compiler", "CodeGenerator", True, "GenerateDelegateCreateExpression", "(System.CodeDom.CodeDelegateCreateExpression)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.CodeDom.Compiler", "CodeGenerator", True, "GenerateDelegateInvokeExpression", "(System.CodeDom.CodeDelegateInvokeExpression)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.CodeDom.Compiler", "CodeGenerator", True, "GenerateDirectionExpression", "(System.CodeDom.CodeDirectionExpression)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.CodeDom.Compiler", "CodeGenerator", True, "GenerateDirectives", "(System.CodeDom.CodeDirectiveCollection)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["System.CodeDom.Compiler", "CodeGenerator", True, "GenerateEntryPointMethod", "(System.CodeDom.CodeEntryPointMethod,System.CodeDom.CodeTypeDeclaration)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.CodeDom.Compiler", "CodeGenerator", True, "GenerateEvent", "(System.CodeDom.CodeMemberEvent,System.CodeDom.CodeTypeDeclaration)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.CodeDom.Compiler", "CodeGenerator", True, "GenerateEventReferenceExpression", "(System.CodeDom.CodeEventReferenceExpression)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.CodeDom.Compiler", "CodeGenerator", True, "GenerateExpressionStatement", "(System.CodeDom.CodeExpressionStatement)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.CodeDom.Compiler", "CodeGenerator", True, "GenerateField", "(System.CodeDom.CodeMemberField)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.CodeDom.Compiler", "CodeGenerator", True, "GenerateFieldReferenceExpression", "(System.CodeDom.CodeFieldReferenceExpression)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.CodeDom.Compiler", "CodeGenerator", True, "GenerateGotoStatement", "(System.CodeDom.CodeGotoStatement)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.CodeDom.Compiler", "CodeGenerator", True, "GenerateIndexerExpression", "(System.CodeDom.CodeIndexerExpression)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.CodeDom.Compiler", "CodeGenerator", True, "GenerateIterationStatement", "(System.CodeDom.CodeIterationStatement)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.CodeDom.Compiler", "CodeGenerator", True, "GenerateLabeledStatement", "(System.CodeDom.CodeLabeledStatement)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.CodeDom.Compiler", "CodeGenerator", True, "GenerateLinePragmaStart", "(System.CodeDom.CodeLinePragma)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.CodeDom.Compiler", "CodeGenerator", True, "GenerateMethod", "(System.CodeDom.CodeMemberMethod,System.CodeDom.CodeTypeDeclaration)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.CodeDom.Compiler", "CodeGenerator", True, "GenerateMethodInvokeExpression", "(System.CodeDom.CodeMethodInvokeExpression)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.CodeDom.Compiler", "CodeGenerator", True, "GenerateMethodReferenceExpression", "(System.CodeDom.CodeMethodReferenceExpression)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.CodeDom.Compiler", "CodeGenerator", True, "GenerateMethodReturnStatement", "(System.CodeDom.CodeMethodReturnStatement)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.CodeDom.Compiler", "CodeGenerator", True, "GenerateNamespace", "(System.CodeDom.CodeNamespace)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.CodeDom.Compiler", "CodeGenerator", True, "GenerateNamespaceImport", "(System.CodeDom.CodeNamespaceImport)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.CodeDom.Compiler", "CodeGenerator", True, "GenerateNamespaceStart", "(System.CodeDom.CodeNamespace)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
@@ -91,12 +89,9 @@ extensions:
       - ["System.CodeDom.Compiler", "CodeGenerator", True, "GenerateSnippetCompileUnit", "(System.CodeDom.CodeSnippetCompileUnit)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.CodeDom.Compiler", "CodeGenerator", True, "GenerateSnippetExpression", "(System.CodeDom.CodeSnippetExpression)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.CodeDom.Compiler", "CodeGenerator", True, "GenerateSnippetMember", "(System.CodeDom.CodeSnippetTypeMember)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.CodeDom.Compiler", "CodeGenerator", True, "GenerateSnippetStatement", "(System.CodeDom.CodeSnippetStatement)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.CodeDom.Compiler", "CodeGenerator", True, "GenerateThrowExceptionStatement", "(System.CodeDom.CodeThrowExceptionStatement)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.CodeDom.Compiler", "CodeGenerator", True, "GenerateTryCatchFinallyStatement", "(System.CodeDom.CodeTryCatchFinallyStatement)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.CodeDom.Compiler", "CodeGenerator", True, "GenerateTypeConstructor", "(System.CodeDom.CodeTypeConstructor)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.CodeDom.Compiler", "CodeGenerator", True, "GenerateTypeOfExpression", "(System.CodeDom.CodeTypeOfExpression)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.CodeDom.Compiler", "CodeGenerator", True, "GenerateTypeReferenceExpression", "(System.CodeDom.CodeTypeReferenceExpression)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["System.CodeDom.Compiler", "CodeGenerator", True, "GenerateTypeOfExpression", "(System.CodeDom.CodeTypeOfExpression)", "", "Argument[0].Property[System.CodeDom.CodeTypeOfExpression.Type].Property[System.CodeDom.CodeTypeReference.BaseType]", "Argument[this].Property[System.CodeDom.Compiler.CodeGenerator.Output]", "taint", "dfc-generated"]
+      - ["System.CodeDom.Compiler", "CodeGenerator", True, "GenerateTypeReferenceExpression", "(System.CodeDom.CodeTypeReferenceExpression)", "", "Argument[0].Property[System.CodeDom.CodeTypeReferenceExpression.Type].Property[System.CodeDom.CodeTypeReference.BaseType]", "Argument[this].Property[System.CodeDom.Compiler.CodeGenerator.Output]", "taint", "dfc-generated"]
       - ["System.CodeDom.Compiler", "CodeGenerator", True, "GenerateTypeStart", "(System.CodeDom.CodeTypeDeclaration)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.CodeDom.Compiler", "CodeGenerator", True, "GenerateVariableDeclarationStatement", "(System.CodeDom.CodeVariableDeclarationStatement)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.CodeDom.Compiler", "CodeGenerator", True, "GenerateVariableReferenceExpression", "(System.CodeDom.CodeVariableReferenceExpression)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
@@ -113,66 +108,87 @@ extensions:
       - ["System.CodeDom.Compiler", "CodeGenerator", True, "QuoteSnippetString", "(System.String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.CodeDom.Compiler", "CodeGeneratorOptions", False, "get_Item", "(System.String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.CodeDom.Compiler", "CompilerError", False, "ToString", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.CodeDom.Compiler", "CompilerErrorCollection", False, "Add", "(System.CodeDom.Compiler.CompilerError)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.CodeDom.Compiler", "CompilerErrorCollection", False, "AddRange", "(System.CodeDom.Compiler.CompilerErrorCollection)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["System.CodeDom.Compiler", "CompilerErrorCollection", False, "AddRange", "(System.CodeDom.Compiler.CompilerError[])", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["System.CodeDom.Compiler", "CompilerErrorCollection", False, "CompilerErrorCollection", "(System.CodeDom.Compiler.CompilerErrorCollection)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["System.CodeDom.Compiler", "CompilerErrorCollection", False, "CompilerErrorCollection", "(System.CodeDom.Compiler.CompilerError[])", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["System.CodeDom.Compiler", "CompilerErrorCollection", False, "CopyTo", "(System.CodeDom.Compiler.CompilerError[],System.Int32)", "", "Argument[this]", "Argument[0].Element", "taint", "df-generated"]
-      - ["System.CodeDom.Compiler", "CompilerErrorCollection", False, "Insert", "(System.Int32,System.CodeDom.Compiler.CompilerError)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["System.CodeDom.Compiler", "CompilerErrorCollection", False, "Remove", "(System.CodeDom.Compiler.CompilerError)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.CodeDom.Compiler", "CompilerErrorCollection", False, "get_Item", "(System.Int32)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.CodeDom.Compiler", "CompilerErrorCollection", False, "set_Item", "(System.Int32,System.CodeDom.Compiler.CompilerError)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["System.CodeDom.Compiler", "CompilerErrorCollection", False, "Add", "(System.CodeDom.Compiler.CompilerError)", "", "Argument[0]", "Argument[this].Property[System.Collections.CollectionBase.List].Element", "value", "dfc-generated"]
+      - ["System.CodeDom.Compiler", "CompilerErrorCollection", False, "AddRange", "(System.CodeDom.Compiler.CompilerErrorCollection)", "", "Argument[0].Property[System.Collections.CollectionBase.List].Element", "Argument[this].Property[System.Collections.CollectionBase.List].Element", "value", "dfc-generated"]
+      - ["System.CodeDom.Compiler", "CompilerErrorCollection", False, "AddRange", "(System.CodeDom.Compiler.CompilerError[])", "", "Argument[0].Element", "Argument[this].Property[System.Collections.CollectionBase.List].Element", "value", "dfc-generated"]
+      - ["System.CodeDom.Compiler", "CompilerErrorCollection", False, "CompilerErrorCollection", "(System.CodeDom.Compiler.CompilerErrorCollection)", "", "Argument[0].Property[System.Collections.CollectionBase.List].Element", "Argument[this].Property[System.Collections.CollectionBase.List].Element", "value", "dfc-generated"]
+      - ["System.CodeDom.Compiler", "CompilerErrorCollection", False, "CompilerErrorCollection", "(System.CodeDom.Compiler.CompilerError[])", "", "Argument[0].Element", "Argument[this].Property[System.Collections.CollectionBase.List].Element", "value", "dfc-generated"]
+      - ["System.CodeDom.Compiler", "CompilerErrorCollection", False, "CopyTo", "(System.CodeDom.Compiler.CompilerError[],System.Int32)", "", "Argument[this].Property[System.Collections.CollectionBase.List].Element", "Argument[0].Element", "value", "dfc-generated"]
+      - ["System.CodeDom.Compiler", "CompilerErrorCollection", False, "Insert", "(System.Int32,System.CodeDom.Compiler.CompilerError)", "", "Argument[1]", "Argument[this].Property[System.Collections.CollectionBase.List].Element", "value", "dfc-generated"]
+      - ["System.CodeDom.Compiler", "CompilerErrorCollection", False, "get_Item", "(System.Int32)", "", "Argument[this].Property[System.Collections.CollectionBase.List].Element", "ReturnValue", "value", "dfc-generated"]
+      - ["System.CodeDom.Compiler", "CompilerErrorCollection", False, "set_Item", "(System.Int32,System.CodeDom.Compiler.CompilerError)", "", "Argument[1]", "Argument[this].Property[System.Collections.CollectionBase.List].Element", "value", "dfc-generated"]
       - ["System.CodeDom.Compiler", "CompilerInfo", False, "GetExtensions", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.CodeDom.Compiler", "CompilerInfo", False, "GetLanguages", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.CodeDom.Compiler", "CompilerParameters", False, "CompilerParameters", "(System.String[],System.String,System.Boolean)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["System.CodeDom.Compiler", "Executor", False, "ExecWaitWithCapture", "(System.IntPtr,System.String,System.CodeDom.Compiler.TempFileCollection,System.String,System.String)", "", "Argument[2].Element", "ReturnValue", "taint", "df-generated"]
-      - ["System.CodeDom.Compiler", "Executor", False, "ExecWaitWithCapture", "(System.IntPtr,System.String,System.CodeDom.Compiler.TempFileCollection,System.String,System.String)", "", "Argument[3]", "ReturnValue", "taint", "df-generated"]
-      - ["System.CodeDom.Compiler", "Executor", False, "ExecWaitWithCapture", "(System.IntPtr,System.String,System.CodeDom.Compiler.TempFileCollection,System.String,System.String)", "", "Argument[4]", "ReturnValue", "taint", "df-generated"]
-      - ["System.CodeDom.Compiler", "Executor", False, "ExecWaitWithCapture", "(System.IntPtr,System.String,System.String,System.CodeDom.Compiler.TempFileCollection,System.String,System.String)", "", "Argument[3].Element", "ReturnValue", "taint", "df-generated"]
-      - ["System.CodeDom.Compiler", "Executor", False, "ExecWaitWithCapture", "(System.String,System.CodeDom.Compiler.TempFileCollection,System.String,System.String)", "", "Argument[1].Element", "ReturnValue", "taint", "df-generated"]
-      - ["System.CodeDom.Compiler", "Executor", False, "ExecWaitWithCapture", "(System.String,System.CodeDom.Compiler.TempFileCollection,System.String,System.String)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
-      - ["System.CodeDom.Compiler", "Executor", False, "ExecWaitWithCapture", "(System.String,System.CodeDom.Compiler.TempFileCollection,System.String,System.String)", "", "Argument[3]", "ReturnValue", "taint", "df-generated"]
-      - ["System.CodeDom.Compiler", "Executor", False, "ExecWaitWithCapture", "(System.String,System.String,System.CodeDom.Compiler.TempFileCollection,System.String,System.String)", "", "Argument[2].Element", "ReturnValue", "taint", "df-generated"]
-      - ["System.CodeDom.Compiler", "Executor", False, "ExecWaitWithCapture", "(System.String,System.String,System.CodeDom.Compiler.TempFileCollection,System.String,System.String)", "", "Argument[3]", "ReturnValue", "taint", "df-generated"]
-      - ["System.CodeDom.Compiler", "Executor", False, "ExecWaitWithCapture", "(System.String,System.String,System.CodeDom.Compiler.TempFileCollection,System.String,System.String)", "", "Argument[4]", "ReturnValue", "taint", "df-generated"]
-      - ["System.CodeDom.Compiler", "GeneratedCodeAttribute", False, "GeneratedCodeAttribute", "(System.String,System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.CodeDom.Compiler", "GeneratedCodeAttribute", False, "GeneratedCodeAttribute", "(System.String,System.String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["System.CodeDom.Compiler", "GeneratedCodeAttribute", False, "get_Tool", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.CodeDom.Compiler", "GeneratedCodeAttribute", False, "get_Version", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.CodeDom.Compiler", "CompilerParameters", False, "CompilerParameters", "(System.String[],System.String,System.Boolean)", "", "Argument[0].Element", "Argument[this].Property[System.CodeDom.Compiler.CompilerParameters.ReferencedAssemblies].Element", "value", "dfc-generated"]
+      - ["System.CodeDom.Compiler", "Executor", False, "ExecWaitWithCapture", "(System.IntPtr,System.String,System.CodeDom.Compiler.TempFileCollection,System.String,System.String)", "", "Argument[3]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.CodeDom.Compiler", "Executor", False, "ExecWaitWithCapture", "(System.IntPtr,System.String,System.CodeDom.Compiler.TempFileCollection,System.String,System.String)", "", "Argument[4]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.CodeDom.Compiler", "Executor", False, "ExecWaitWithCapture", "(System.IntPtr,System.String,System.String,System.CodeDom.Compiler.TempFileCollection,System.String,System.String)", "", "Argument[4]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.CodeDom.Compiler", "Executor", False, "ExecWaitWithCapture", "(System.IntPtr,System.String,System.String,System.CodeDom.Compiler.TempFileCollection,System.String,System.String)", "", "Argument[5]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.CodeDom.Compiler", "Executor", False, "ExecWaitWithCapture", "(System.String,System.CodeDom.Compiler.TempFileCollection,System.String,System.String)", "", "Argument[2]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.CodeDom.Compiler", "Executor", False, "ExecWaitWithCapture", "(System.String,System.CodeDom.Compiler.TempFileCollection,System.String,System.String)", "", "Argument[3]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.CodeDom.Compiler", "Executor", False, "ExecWaitWithCapture", "(System.String,System.String,System.CodeDom.Compiler.TempFileCollection,System.String,System.String)", "", "Argument[3]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.CodeDom.Compiler", "Executor", False, "ExecWaitWithCapture", "(System.String,System.String,System.CodeDom.Compiler.TempFileCollection,System.String,System.String)", "", "Argument[4]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.CodeDom.Compiler", "GeneratedCodeAttribute", False, "GeneratedCodeAttribute", "(System.String,System.String)", "", "Argument[0]", "Argument[this].SyntheticField[System.CodeDom.Compiler.GeneratedCodeAttribute._tool]", "value", "dfc-generated"]
+      - ["System.CodeDom.Compiler", "GeneratedCodeAttribute", False, "GeneratedCodeAttribute", "(System.String,System.String)", "", "Argument[1]", "Argument[this].SyntheticField[System.CodeDom.Compiler.GeneratedCodeAttribute._version]", "value", "dfc-generated"]
+      - ["System.CodeDom.Compiler", "GeneratedCodeAttribute", False, "get_Tool", "()", "", "Argument[this].SyntheticField[System.CodeDom.Compiler.GeneratedCodeAttribute._tool]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.CodeDom.Compiler", "GeneratedCodeAttribute", False, "get_Version", "()", "", "Argument[this].SyntheticField[System.CodeDom.Compiler.GeneratedCodeAttribute._version]", "ReturnValue", "value", "dfc-generated"]
       - ["System.CodeDom.Compiler", "ICodeCompiler", True, "CompileAssemblyFromDom", "(System.CodeDom.Compiler.CompilerParameters,System.CodeDom.CodeCompileUnit)", "", "Argument[1]", "Argument[0]", "taint", "df-generated"]
       - ["System.CodeDom.Compiler", "ICodeCompiler", True, "CompileAssemblyFromDom", "(System.CodeDom.Compiler.CompilerParameters,System.CodeDom.CodeCompileUnit)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
       - ["System.CodeDom.Compiler", "ICodeCompiler", True, "CompileAssemblyFromDomBatch", "(System.CodeDom.Compiler.CompilerParameters,System.CodeDom.CodeCompileUnit[])", "", "Argument[1].Element", "Argument[0]", "taint", "df-generated"]
       - ["System.CodeDom.Compiler", "ICodeCompiler", True, "CompileAssemblyFromDomBatch", "(System.CodeDom.Compiler.CompilerParameters,System.CodeDom.CodeCompileUnit[])", "", "Argument[1].Element", "Argument[this]", "taint", "df-generated"]
-      - ["System.CodeDom.Compiler", "ICodeGenerator", True, "CreateEscapedIdentifier", "(System.String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.CodeDom.Compiler", "ICodeGenerator", True, "CreateValidIdentifier", "(System.String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["System.CodeDom.Compiler", "ICodeGenerator", True, "CreateEscapedIdentifier", "(System.String)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.CodeDom.Compiler", "ICodeGenerator", True, "CreateValidIdentifier", "(System.String)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
       - ["System.CodeDom.Compiler", "ICodeGenerator", True, "GenerateCodeFromCompileUnit", "(System.CodeDom.CodeCompileUnit,System.IO.TextWriter,System.CodeDom.Compiler.CodeGeneratorOptions)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.CodeDom.Compiler", "ICodeGenerator", True, "GenerateCodeFromCompileUnit", "(System.CodeDom.CodeCompileUnit,System.IO.TextWriter,System.CodeDom.Compiler.CodeGeneratorOptions)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
-      - ["System.CodeDom.Compiler", "ICodeGenerator", True, "GenerateCodeFromExpression", "(System.CodeDom.CodeExpression,System.IO.TextWriter,System.CodeDom.Compiler.CodeGeneratorOptions)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.CodeDom.Compiler", "ICodeGenerator", True, "GenerateCodeFromExpression", "(System.CodeDom.CodeExpression,System.IO.TextWriter,System.CodeDom.Compiler.CodeGeneratorOptions)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
       - ["System.CodeDom.Compiler", "ICodeGenerator", True, "GenerateCodeFromNamespace", "(System.CodeDom.CodeNamespace,System.IO.TextWriter,System.CodeDom.Compiler.CodeGeneratorOptions)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.CodeDom.Compiler", "ICodeGenerator", True, "GenerateCodeFromNamespace", "(System.CodeDom.CodeNamespace,System.IO.TextWriter,System.CodeDom.Compiler.CodeGeneratorOptions)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
-      - ["System.CodeDom.Compiler", "ICodeGenerator", True, "GenerateCodeFromStatement", "(System.CodeDom.CodeStatement,System.IO.TextWriter,System.CodeDom.Compiler.CodeGeneratorOptions)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.CodeDom.Compiler", "ICodeGenerator", True, "GenerateCodeFromStatement", "(System.CodeDom.CodeStatement,System.IO.TextWriter,System.CodeDom.Compiler.CodeGeneratorOptions)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
       - ["System.CodeDom.Compiler", "ICodeGenerator", True, "GenerateCodeFromType", "(System.CodeDom.CodeTypeDeclaration,System.IO.TextWriter,System.CodeDom.Compiler.CodeGeneratorOptions)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.CodeDom.Compiler", "ICodeGenerator", True, "GenerateCodeFromType", "(System.CodeDom.CodeTypeDeclaration,System.IO.TextWriter,System.CodeDom.Compiler.CodeGeneratorOptions)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
       - ["System.CodeDom.Compiler", "ICodeGenerator", True, "GetTypeOutput", "(System.CodeDom.CodeTypeReference)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.CodeDom.Compiler", "IndentedTextWriter", False, "IndentedTextWriter", "(System.IO.TextWriter,System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.CodeDom.Compiler", "IndentedTextWriter", False, "IndentedTextWriter", "(System.IO.TextWriter,System.String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["System.CodeDom.Compiler", "IndentedTextWriter", False, "WriteLineNoTabs", "(System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["System.CodeDom.Compiler", "IndentedTextWriter", False, "IndentedTextWriter", "(System.IO.TextWriter,System.String)", "", "Argument[0]", "Argument[this].SyntheticField[System.CodeDom.Compiler.IndentedTextWriter._writer]", "value", "dfc-generated"]
+      - ["System.CodeDom.Compiler", "IndentedTextWriter", False, "WriteLineNoTabs", "(System.String)", "", "Argument[0]", "Argument[this].SyntheticField[System.CodeDom.Compiler.IndentedTextWriter._writer].SyntheticField[System.CodeDom.Compiler.IndentedTextWriter._writer]", "taint", "dfc-generated"]
       - ["System.CodeDom.Compiler", "IndentedTextWriter", False, "WriteLineNoTabsAsync", "(System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.CodeDom.Compiler", "IndentedTextWriter", False, "WriteLineNoTabsAsync", "(System.String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["System.CodeDom.Compiler", "IndentedTextWriter", False, "WriteLineNoTabsAsync", "(System.String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.CodeDom.Compiler", "IndentedTextWriter", False, "get_InnerWriter", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.CodeDom.Compiler", "TempFileCollection", False, "AddExtension", "(System.String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.CodeDom.Compiler", "TempFileCollection", False, "AddExtension", "(System.String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.CodeDom.Compiler", "TempFileCollection", False, "AddExtension", "(System.String,System.Boolean)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.CodeDom.Compiler", "TempFileCollection", False, "AddExtension", "(System.String,System.Boolean)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.CodeDom.Compiler", "IndentedTextWriter", False, "get_InnerWriter", "()", "", "Argument[this].SyntheticField[System.CodeDom.Compiler.IndentedTextWriter._writer]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.CodeDom.Compiler", "IndentedTextWriter", True, "FlushAsync", "()", "", "Argument[this].SyntheticField[System.CodeDom.Compiler.IndentedTextWriter._writer].SyntheticField[System.CodeDom.Compiler.IndentedTextWriter._writer]", "ReturnValue.SyntheticField[System.Threading.Tasks.Task.m_stateObject]", "value", "dfc-generated"]
+      - ["System.CodeDom.Compiler", "IndentedTextWriter", True, "FlushAsync", "()", "", "Argument[this].SyntheticField[System.CodeDom.Compiler.IndentedTextWriter._writer]", "ReturnValue.SyntheticField[System.Threading.Tasks.Task.m_stateObject]", "value", "dfc-generated"]
+      - ["System.CodeDom.Compiler", "IndentedTextWriter", True, "FlushAsync", "(System.Threading.CancellationToken)", "", "Argument[this].SyntheticField[System.CodeDom.Compiler.IndentedTextWriter._writer].SyntheticField[System.CodeDom.Compiler.IndentedTextWriter._writer]", "ReturnValue.SyntheticField[System.Threading.Tasks.Task.m_stateObject]", "value", "dfc-generated"]
+      - ["System.CodeDom.Compiler", "IndentedTextWriter", True, "FlushAsync", "(System.Threading.CancellationToken)", "", "Argument[this].SyntheticField[System.CodeDom.Compiler.IndentedTextWriter._writer]", "ReturnValue.SyntheticField[System.Threading.Tasks.Task.m_stateObject]", "value", "dfc-generated"]
+      - ["System.CodeDom.Compiler", "IndentedTextWriter", True, "Write", "(System.Char[])", "", "Argument[0].Element", "Argument[this].SyntheticField[System.CodeDom.Compiler.IndentedTextWriter._writer].SyntheticField[System.CodeDom.Compiler.IndentedTextWriter._writer]", "taint", "dfc-generated"]
+      - ["System.CodeDom.Compiler", "IndentedTextWriter", True, "Write", "(System.String,System.Object)", "", "Argument[0]", "Argument[this].SyntheticField[System.CodeDom.Compiler.IndentedTextWriter._writer].SyntheticField[System.CodeDom.Compiler.IndentedTextWriter._writer]", "taint", "dfc-generated"]
+      - ["System.CodeDom.Compiler", "IndentedTextWriter", True, "Write", "(System.String,System.Object)", "", "Argument[1]", "Argument[this].SyntheticField[System.CodeDom.Compiler.IndentedTextWriter._writer].SyntheticField[System.CodeDom.Compiler.IndentedTextWriter._writer]", "taint", "dfc-generated"]
+      - ["System.CodeDom.Compiler", "IndentedTextWriter", True, "Write", "(System.String,System.Object,System.Object)", "", "Argument[0]", "Argument[this].SyntheticField[System.CodeDom.Compiler.IndentedTextWriter._writer].SyntheticField[System.CodeDom.Compiler.IndentedTextWriter._writer]", "taint", "dfc-generated"]
+      - ["System.CodeDom.Compiler", "IndentedTextWriter", True, "Write", "(System.String,System.Object,System.Object)", "", "Argument[1]", "Argument[this].SyntheticField[System.CodeDom.Compiler.IndentedTextWriter._writer].SyntheticField[System.CodeDom.Compiler.IndentedTextWriter._writer]", "taint", "dfc-generated"]
+      - ["System.CodeDom.Compiler", "IndentedTextWriter", True, "Write", "(System.String,System.Object,System.Object)", "", "Argument[2]", "Argument[this].SyntheticField[System.CodeDom.Compiler.IndentedTextWriter._writer].SyntheticField[System.CodeDom.Compiler.IndentedTextWriter._writer]", "taint", "dfc-generated"]
+      - ["System.CodeDom.Compiler", "IndentedTextWriter", True, "Write", "(System.String,System.Object[])", "", "Argument[0]", "Argument[this].SyntheticField[System.CodeDom.Compiler.IndentedTextWriter._writer].SyntheticField[System.CodeDom.Compiler.IndentedTextWriter._writer]", "taint", "dfc-generated"]
+      - ["System.CodeDom.Compiler", "IndentedTextWriter", True, "Write", "(System.String,System.Object[])", "", "Argument[1].Element", "Argument[this].SyntheticField[System.CodeDom.Compiler.IndentedTextWriter._writer].SyntheticField[System.CodeDom.Compiler.IndentedTextWriter._writer]", "taint", "dfc-generated"]
+      - ["System.CodeDom.Compiler", "IndentedTextWriter", True, "WriteLine", "(System.Char[])", "", "Argument[0].Element", "Argument[this].SyntheticField[System.CodeDom.Compiler.IndentedTextWriter._writer].SyntheticField[System.CodeDom.Compiler.IndentedTextWriter._writer]", "taint", "dfc-generated"]
+      - ["System.CodeDom.Compiler", "IndentedTextWriter", True, "WriteLine", "(System.Char[],System.Int32,System.Int32)", "", "Argument[0].Element", "Argument[this].SyntheticField[System.CodeDom.Compiler.IndentedTextWriter._writer].SyntheticField[System.CodeDom.Compiler.IndentedTextWriter._writer]", "taint", "dfc-generated"]
+      - ["System.CodeDom.Compiler", "IndentedTextWriter", True, "WriteLine", "(System.String)", "", "Argument[0]", "Argument[this].SyntheticField[System.CodeDom.Compiler.IndentedTextWriter._writer].SyntheticField[System.CodeDom.Compiler.IndentedTextWriter._writer]", "taint", "dfc-generated"]
+      - ["System.CodeDom.Compiler", "IndentedTextWriter", True, "WriteLine", "(System.String,System.Object)", "", "Argument[0]", "Argument[this].SyntheticField[System.CodeDom.Compiler.IndentedTextWriter._writer].SyntheticField[System.CodeDom.Compiler.IndentedTextWriter._writer]", "taint", "dfc-generated"]
+      - ["System.CodeDom.Compiler", "IndentedTextWriter", True, "WriteLine", "(System.String,System.Object)", "", "Argument[1]", "Argument[this].SyntheticField[System.CodeDom.Compiler.IndentedTextWriter._writer].SyntheticField[System.CodeDom.Compiler.IndentedTextWriter._writer]", "taint", "dfc-generated"]
+      - ["System.CodeDom.Compiler", "IndentedTextWriter", True, "WriteLine", "(System.String,System.Object,System.Object)", "", "Argument[0]", "Argument[this].SyntheticField[System.CodeDom.Compiler.IndentedTextWriter._writer].SyntheticField[System.CodeDom.Compiler.IndentedTextWriter._writer]", "taint", "dfc-generated"]
+      - ["System.CodeDom.Compiler", "IndentedTextWriter", True, "WriteLine", "(System.String,System.Object,System.Object)", "", "Argument[1]", "Argument[this].SyntheticField[System.CodeDom.Compiler.IndentedTextWriter._writer].SyntheticField[System.CodeDom.Compiler.IndentedTextWriter._writer]", "taint", "dfc-generated"]
+      - ["System.CodeDom.Compiler", "IndentedTextWriter", True, "WriteLine", "(System.String,System.Object,System.Object)", "", "Argument[2]", "Argument[this].SyntheticField[System.CodeDom.Compiler.IndentedTextWriter._writer].SyntheticField[System.CodeDom.Compiler.IndentedTextWriter._writer]", "taint", "dfc-generated"]
+      - ["System.CodeDom.Compiler", "IndentedTextWriter", True, "WriteLine", "(System.String,System.Object[])", "", "Argument[0]", "Argument[this].SyntheticField[System.CodeDom.Compiler.IndentedTextWriter._writer].SyntheticField[System.CodeDom.Compiler.IndentedTextWriter._writer]", "taint", "dfc-generated"]
+      - ["System.CodeDom.Compiler", "IndentedTextWriter", True, "WriteLine", "(System.String,System.Object[])", "", "Argument[1].Element", "Argument[this].SyntheticField[System.CodeDom.Compiler.IndentedTextWriter._writer].SyntheticField[System.CodeDom.Compiler.IndentedTextWriter._writer]", "taint", "dfc-generated"]
+      - ["System.CodeDom.Compiler", "IndentedTextWriter", True, "WriteLineAsync", "(System.Char[],System.Int32,System.Int32)", "", "Argument[0].Element", "Argument[this].SyntheticField[System.CodeDom.Compiler.IndentedTextWriter._writer].SyntheticField[System.CodeDom.Compiler.IndentedTextWriter._writer]", "taint", "dfc-generated"]
+      - ["System.CodeDom.Compiler", "IndentedTextWriter", True, "WriteLineAsync", "(System.Char[],System.Int32,System.Int32)", "", "Argument[0].Element", "Argument[this].SyntheticField[System.CodeDom.Compiler.IndentedTextWriter._writer]", "taint", "dfc-generated"]
+      - ["System.CodeDom.Compiler", "IndentedTextWriter", True, "WriteLineAsync", "(System.String)", "", "Argument[0]", "Argument[this].SyntheticField[System.CodeDom.Compiler.IndentedTextWriter._writer].SyntheticField[System.CodeDom.Compiler.IndentedTextWriter._writer]", "taint", "dfc-generated"]
+      - ["System.CodeDom.Compiler", "IndentedTextWriter", True, "WriteLineAsync", "(System.String)", "", "Argument[0]", "Argument[this].SyntheticField[System.CodeDom.Compiler.IndentedTextWriter._writer]", "taint", "dfc-generated"]
+      - ["System.CodeDom.Compiler", "IndentedTextWriter", True, "get_Encoding", "()", "", "Argument[this].SyntheticField[System.CodeDom.Compiler.IndentedTextWriter._writer].Property[System.IO.TextWriter.Encoding]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.CodeDom.Compiler", "TempFileCollection", False, "AddExtension", "(System.String)", "", "Argument[0]", "ReturnValue", "taint", "dfc-generated"]
+      - ["System.CodeDom.Compiler", "TempFileCollection", False, "AddExtension", "(System.String)", "", "Argument[this].Property[System.CodeDom.Compiler.TempFileCollection.BasePath]", "ReturnValue", "taint", "dfc-generated"]
+      - ["System.CodeDom.Compiler", "TempFileCollection", False, "AddExtension", "(System.String,System.Boolean)", "", "Argument[0]", "ReturnValue", "taint", "dfc-generated"]
+      - ["System.CodeDom.Compiler", "TempFileCollection", False, "AddExtension", "(System.String,System.Boolean)", "", "Argument[this].Property[System.CodeDom.Compiler.TempFileCollection.BasePath]", "ReturnValue", "taint", "dfc-generated"]
       - ["System.CodeDom.Compiler", "TempFileCollection", False, "CopyTo", "(System.String[],System.Int32)", "", "Argument[this]", "Argument[0].Element", "taint", "df-generated"]
       - ["System.CodeDom.Compiler", "TempFileCollection", False, "GetEnumerator", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.CodeDom.Compiler", "TempFileCollection", False, "TempFileCollection", "(System.String,System.Boolean)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["System.CodeDom.Compiler", "TempFileCollection", False, "TempFileCollection", "(System.String,System.Boolean)", "", "Argument[0]", "Argument[this].SyntheticField[System.CodeDom.Compiler.TempFileCollection._tempDir]", "value", "dfc-generated"]
       - ["System.CodeDom.Compiler", "TempFileCollection", False, "get_BasePath", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.CodeDom.Compiler", "TempFileCollection", False, "get_TempDir", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.CodeDom.Compiler", "TempFileCollection", False, "get_TempDir", "()", "", "Argument[this].SyntheticField[System.CodeDom.Compiler.TempFileCollection._tempDir]", "ReturnValue", "value", "dfc-generated"]
   - addsTo:
       pack: codeql/csharp-all
       extensible: neutralModel
@@ -186,6 +202,7 @@ extensions:
       - ["System.CodeDom.Compiler", "CodeCompiler", "FromFileBatch", "(System.CodeDom.Compiler.CompilerParameters,System.String[])", "summary", "df-generated"]
       - ["System.CodeDom.Compiler", "CodeCompiler", "FromSource", "(System.CodeDom.Compiler.CompilerParameters,System.String)", "summary", "df-generated"]
       - ["System.CodeDom.Compiler", "CodeCompiler", "FromSourceBatch", "(System.CodeDom.Compiler.CompilerParameters,System.String[])", "summary", "df-generated"]
+      - ["System.CodeDom.Compiler", "CodeCompiler", "GetResponseFileCmdArgs", "(System.CodeDom.Compiler.CompilerParameters,System.String)", "summary", "df-generated"]
       - ["System.CodeDom.Compiler", "CodeCompiler", "ProcessCompilerOutputLine", "(System.CodeDom.Compiler.CompilerResults,System.String)", "summary", "df-generated"]
       - ["System.CodeDom.Compiler", "CodeCompiler", "get_CompilerName", "()", "summary", "df-generated"]
       - ["System.CodeDom.Compiler", "CodeCompiler", "get_FileExtension", "()", "summary", "df-generated"]
@@ -205,19 +222,32 @@ extensions:
       - ["System.CodeDom.Compiler", "CodeDomProvider", "Supports", "(System.CodeDom.Compiler.GeneratorSupport)", "summary", "df-generated"]
       - ["System.CodeDom.Compiler", "CodeDomProvider", "get_FileExtension", "()", "summary", "df-generated"]
       - ["System.CodeDom.Compiler", "CodeDomProvider", "get_LanguageOptions", "()", "summary", "df-generated"]
+      - ["System.CodeDom.Compiler", "CodeGenerator", "GenerateArrayIndexerExpression", "(System.CodeDom.CodeArrayIndexerExpression)", "summary", "df-generated"]
+      - ["System.CodeDom.Compiler", "CodeGenerator", "GenerateAssignStatement", "(System.CodeDom.CodeAssignStatement)", "summary", "df-generated"]
       - ["System.CodeDom.Compiler", "CodeGenerator", "GenerateAttributeDeclarationsEnd", "(System.CodeDom.CodeAttributeDeclarationCollection)", "summary", "df-generated"]
       - ["System.CodeDom.Compiler", "CodeGenerator", "GenerateAttributeDeclarationsStart", "(System.CodeDom.CodeAttributeDeclarationCollection)", "summary", "df-generated"]
       - ["System.CodeDom.Compiler", "CodeGenerator", "GenerateBaseReferenceExpression", "(System.CodeDom.CodeBaseReferenceExpression)", "summary", "df-generated"]
       - ["System.CodeDom.Compiler", "CodeGenerator", "GenerateComment", "(System.CodeDom.CodeComment)", "summary", "df-generated"]
       - ["System.CodeDom.Compiler", "CodeGenerator", "GenerateCommentStatement", "(System.CodeDom.CodeCommentStatement)", "summary", "df-generated"]
       - ["System.CodeDom.Compiler", "CodeGenerator", "GenerateCommentStatements", "(System.CodeDom.CodeCommentStatementCollection)", "summary", "df-generated"]
+      - ["System.CodeDom.Compiler", "CodeGenerator", "GenerateConditionStatement", "(System.CodeDom.CodeConditionStatement)", "summary", "df-generated"]
+      - ["System.CodeDom.Compiler", "CodeGenerator", "GenerateConstructor", "(System.CodeDom.CodeConstructor,System.CodeDom.CodeTypeDeclaration)", "summary", "df-generated"]
       - ["System.CodeDom.Compiler", "CodeGenerator", "GenerateDecimalValue", "(System.Decimal)", "summary", "df-generated"]
       - ["System.CodeDom.Compiler", "CodeGenerator", "GenerateDoubleValue", "(System.Double)", "summary", "df-generated"]
+      - ["System.CodeDom.Compiler", "CodeGenerator", "GenerateEntryPointMethod", "(System.CodeDom.CodeEntryPointMethod,System.CodeDom.CodeTypeDeclaration)", "summary", "df-generated"]
+      - ["System.CodeDom.Compiler", "CodeGenerator", "GenerateExpressionStatement", "(System.CodeDom.CodeExpressionStatement)", "summary", "df-generated"]
+      - ["System.CodeDom.Compiler", "CodeGenerator", "GenerateGotoStatement", "(System.CodeDom.CodeGotoStatement)", "summary", "df-generated"]
+      - ["System.CodeDom.Compiler", "CodeGenerator", "GenerateIndexerExpression", "(System.CodeDom.CodeIndexerExpression)", "summary", "df-generated"]
+      - ["System.CodeDom.Compiler", "CodeGenerator", "GenerateIterationStatement", "(System.CodeDom.CodeIterationStatement)", "summary", "df-generated"]
       - ["System.CodeDom.Compiler", "CodeGenerator", "GenerateLinePragmaEnd", "(System.CodeDom.CodeLinePragma)", "summary", "df-generated"]
+      - ["System.CodeDom.Compiler", "CodeGenerator", "GenerateMethodReturnStatement", "(System.CodeDom.CodeMethodReturnStatement)", "summary", "df-generated"]
       - ["System.CodeDom.Compiler", "CodeGenerator", "GenerateNamespaceEnd", "(System.CodeDom.CodeNamespace)", "summary", "df-generated"]
       - ["System.CodeDom.Compiler", "CodeGenerator", "GeneratePropertySetValueReferenceExpression", "(System.CodeDom.CodePropertySetValueReferenceExpression)", "summary", "df-generated"]
       - ["System.CodeDom.Compiler", "CodeGenerator", "GenerateSingleFloatValue", "(System.Single)", "summary", "df-generated"]
+      - ["System.CodeDom.Compiler", "CodeGenerator", "GenerateSnippetStatement", "(System.CodeDom.CodeSnippetStatement)", "summary", "df-generated"]
       - ["System.CodeDom.Compiler", "CodeGenerator", "GenerateThisReferenceExpression", "(System.CodeDom.CodeThisReferenceExpression)", "summary", "df-generated"]
+      - ["System.CodeDom.Compiler", "CodeGenerator", "GenerateThrowExceptionStatement", "(System.CodeDom.CodeThrowExceptionStatement)", "summary", "df-generated"]
+      - ["System.CodeDom.Compiler", "CodeGenerator", "GenerateTypeConstructor", "(System.CodeDom.CodeTypeConstructor)", "summary", "df-generated"]
       - ["System.CodeDom.Compiler", "CodeGenerator", "GenerateTypeEnd", "(System.CodeDom.CodeTypeDeclaration)", "summary", "df-generated"]
       - ["System.CodeDom.Compiler", "CodeGenerator", "IsValidIdentifier", "(System.String)", "summary", "df-generated"]
       - ["System.CodeDom.Compiler", "CodeGenerator", "IsValidLanguageIndependentIdentifier", "(System.String)", "summary", "df-generated"]
@@ -241,6 +271,7 @@ extensions:
       - ["System.CodeDom.Compiler", "CompilerError", "CompilerError", "(System.String,System.Int32,System.Int32,System.String,System.String)", "summary", "df-generated"]
       - ["System.CodeDom.Compiler", "CompilerErrorCollection", "Contains", "(System.CodeDom.Compiler.CompilerError)", "summary", "df-generated"]
       - ["System.CodeDom.Compiler", "CompilerErrorCollection", "IndexOf", "(System.CodeDom.Compiler.CompilerError)", "summary", "df-generated"]
+      - ["System.CodeDom.Compiler", "CompilerErrorCollection", "Remove", "(System.CodeDom.Compiler.CompilerError)", "summary", "df-generated"]
       - ["System.CodeDom.Compiler", "CompilerErrorCollection", "get_HasErrors", "()", "summary", "df-generated"]
       - ["System.CodeDom.Compiler", "CompilerErrorCollection", "get_HasWarnings", "()", "summary", "df-generated"]
       - ["System.CodeDom.Compiler", "CompilerInfo", "CreateDefaultCompilerParameters", "()", "summary", "df-generated"]
diff --git a/csharp/ql/lib/ext/generated/System.CodeDom.model.yml b/csharp/ql/lib/ext/generated/System.CodeDom.model.yml
index 1e20b829686..53acccecc0f 100644
--- a/csharp/ql/lib/ext/generated/System.CodeDom.model.yml
+++ b/csharp/ql/lib/ext/generated/System.CodeDom.model.yml
@@ -7,250 +7,197 @@ extensions:
       - ["System.CodeDom", "CodeArgumentReferenceExpression", False, "CodeArgumentReferenceExpression", "(System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.CodeDom", "CodeArrayCreateExpression", False, "CodeArrayCreateExpression", "(System.CodeDom.CodeTypeReference,System.CodeDom.CodeExpression)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.CodeDom", "CodeArrayCreateExpression", False, "CodeArrayCreateExpression", "(System.CodeDom.CodeTypeReference,System.CodeDom.CodeExpression[])", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.CodeDom", "CodeArrayCreateExpression", False, "CodeArrayCreateExpression", "(System.CodeDom.CodeTypeReference,System.CodeDom.CodeExpression[])", "", "Argument[1].Element", "Argument[this]", "taint", "df-generated"]
       - ["System.CodeDom", "CodeArrayCreateExpression", False, "CodeArrayCreateExpression", "(System.CodeDom.CodeTypeReference,System.Int32)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.CodeDom", "CodeArrayCreateExpression", False, "CodeArrayCreateExpression", "(System.String,System.CodeDom.CodeExpression)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.CodeDom", "CodeArrayCreateExpression", False, "CodeArrayCreateExpression", "(System.String,System.CodeDom.CodeExpression[])", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.CodeDom", "CodeArrayCreateExpression", False, "CodeArrayCreateExpression", "(System.String,System.CodeDom.CodeExpression[])", "", "Argument[1].Element", "Argument[this]", "taint", "df-generated"]
-      - ["System.CodeDom", "CodeArrayCreateExpression", False, "CodeArrayCreateExpression", "(System.String,System.Int32)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.CodeDom", "CodeArrayCreateExpression", False, "CodeArrayCreateExpression", "(System.Type,System.CodeDom.CodeExpression[])", "", "Argument[1].Element", "Argument[this]", "taint", "df-generated"]
       - ["System.CodeDom", "CodeArrayCreateExpression", False, "get_Initializers", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.CodeDom", "CodeArrayIndexerExpression", False, "CodeArrayIndexerExpression", "(System.CodeDom.CodeExpression,System.CodeDom.CodeExpression[])", "", "Argument[1].Element", "Argument[this]", "taint", "df-generated"]
       - ["System.CodeDom", "CodeAttachEventStatement", False, "CodeAttachEventStatement", "(System.CodeDom.CodeEventReferenceExpression,System.CodeDom.CodeExpression)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.CodeDom", "CodeAttributeArgument", False, "CodeAttributeArgument", "(System.String,System.CodeDom.CodeExpression)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.CodeDom", "CodeAttributeArgumentCollection", False, "Add", "(System.CodeDom.CodeAttributeArgument)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.CodeDom", "CodeAttributeArgumentCollection", False, "AddRange", "(System.CodeDom.CodeAttributeArgumentCollection)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["System.CodeDom", "CodeAttributeArgumentCollection", False, "AddRange", "(System.CodeDom.CodeAttributeArgument[])", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["System.CodeDom", "CodeAttributeArgumentCollection", False, "CodeAttributeArgumentCollection", "(System.CodeDom.CodeAttributeArgumentCollection)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["System.CodeDom", "CodeAttributeArgumentCollection", False, "CodeAttributeArgumentCollection", "(System.CodeDom.CodeAttributeArgument[])", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["System.CodeDom", "CodeAttributeArgumentCollection", False, "CopyTo", "(System.CodeDom.CodeAttributeArgument[],System.Int32)", "", "Argument[this]", "Argument[0].Element", "taint", "df-generated"]
-      - ["System.CodeDom", "CodeAttributeArgumentCollection", False, "Insert", "(System.Int32,System.CodeDom.CodeAttributeArgument)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["System.CodeDom", "CodeAttributeArgumentCollection", False, "Remove", "(System.CodeDom.CodeAttributeArgument)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.CodeDom", "CodeAttributeArgumentCollection", False, "get_Item", "(System.Int32)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.CodeDom", "CodeAttributeArgumentCollection", False, "set_Item", "(System.Int32,System.CodeDom.CodeAttributeArgument)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["System.CodeDom", "CodeAttributeDeclaration", False, "CodeAttributeDeclaration", "(System.CodeDom.CodeTypeReference,System.CodeDom.CodeAttributeArgument[])", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.CodeDom", "CodeAttributeDeclaration", False, "CodeAttributeDeclaration", "(System.CodeDom.CodeTypeReference,System.CodeDom.CodeAttributeArgument[])", "", "Argument[1].Element", "Argument[this]", "taint", "df-generated"]
+      - ["System.CodeDom", "CodeAttributeArgumentCollection", False, "Add", "(System.CodeDom.CodeAttributeArgument)", "", "Argument[0]", "Argument[this].Property[System.Collections.CollectionBase.List].Element", "value", "dfc-generated"]
+      - ["System.CodeDom", "CodeAttributeArgumentCollection", False, "AddRange", "(System.CodeDom.CodeAttributeArgumentCollection)", "", "Argument[0].Property[System.Collections.CollectionBase.List].Element", "Argument[this].Property[System.Collections.CollectionBase.List].Element", "value", "dfc-generated"]
+      - ["System.CodeDom", "CodeAttributeArgumentCollection", False, "AddRange", "(System.CodeDom.CodeAttributeArgument[])", "", "Argument[0].Element", "Argument[this].Property[System.Collections.CollectionBase.List].Element", "value", "dfc-generated"]
+      - ["System.CodeDom", "CodeAttributeArgumentCollection", False, "CodeAttributeArgumentCollection", "(System.CodeDom.CodeAttributeArgumentCollection)", "", "Argument[0].Property[System.Collections.CollectionBase.List].Element", "Argument[this].Property[System.Collections.CollectionBase.List].Element", "value", "dfc-generated"]
+      - ["System.CodeDom", "CodeAttributeArgumentCollection", False, "CodeAttributeArgumentCollection", "(System.CodeDom.CodeAttributeArgument[])", "", "Argument[0].Element", "Argument[this].Property[System.Collections.CollectionBase.List].Element", "value", "dfc-generated"]
+      - ["System.CodeDom", "CodeAttributeArgumentCollection", False, "CopyTo", "(System.CodeDom.CodeAttributeArgument[],System.Int32)", "", "Argument[this].Property[System.Collections.CollectionBase.List].Element", "Argument[0].Element", "value", "dfc-generated"]
+      - ["System.CodeDom", "CodeAttributeArgumentCollection", False, "Insert", "(System.Int32,System.CodeDom.CodeAttributeArgument)", "", "Argument[1]", "Argument[this].Property[System.Collections.CollectionBase.List].Element", "value", "dfc-generated"]
+      - ["System.CodeDom", "CodeAttributeArgumentCollection", False, "get_Item", "(System.Int32)", "", "Argument[this].Property[System.Collections.CollectionBase.List].Element", "ReturnValue", "value", "dfc-generated"]
+      - ["System.CodeDom", "CodeAttributeArgumentCollection", False, "set_Item", "(System.Int32,System.CodeDom.CodeAttributeArgument)", "", "Argument[1]", "Argument[this].Property[System.Collections.CollectionBase.List].Element", "value", "dfc-generated"]
+      - ["System.CodeDom", "CodeAttributeDeclaration", False, "CodeAttributeDeclaration", "(System.CodeDom.CodeTypeReference,System.CodeDom.CodeAttributeArgument[])", "", "Argument[0]", "Argument[this].SyntheticField[System.CodeDom.CodeAttributeDeclaration._attributeType]", "value", "dfc-generated"]
       - ["System.CodeDom", "CodeAttributeDeclaration", False, "CodeAttributeDeclaration", "(System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.CodeDom", "CodeAttributeDeclaration", False, "CodeAttributeDeclaration", "(System.String,System.CodeDom.CodeAttributeArgument[])", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.CodeDom", "CodeAttributeDeclaration", False, "CodeAttributeDeclaration", "(System.String,System.CodeDom.CodeAttributeArgument[])", "", "Argument[1].Element", "Argument[this]", "taint", "df-generated"]
       - ["System.CodeDom", "CodeAttributeDeclaration", False, "get_Arguments", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.CodeDom", "CodeAttributeDeclaration", False, "get_AttributeType", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.CodeDom", "CodeAttributeDeclarationCollection", False, "Add", "(System.CodeDom.CodeAttributeDeclaration)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.CodeDom", "CodeAttributeDeclarationCollection", False, "AddRange", "(System.CodeDom.CodeAttributeDeclarationCollection)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["System.CodeDom", "CodeAttributeDeclarationCollection", False, "AddRange", "(System.CodeDom.CodeAttributeDeclaration[])", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["System.CodeDom", "CodeAttributeDeclarationCollection", False, "CodeAttributeDeclarationCollection", "(System.CodeDom.CodeAttributeDeclarationCollection)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["System.CodeDom", "CodeAttributeDeclarationCollection", False, "CodeAttributeDeclarationCollection", "(System.CodeDom.CodeAttributeDeclaration[])", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["System.CodeDom", "CodeAttributeDeclarationCollection", False, "CopyTo", "(System.CodeDom.CodeAttributeDeclaration[],System.Int32)", "", "Argument[this]", "Argument[0].Element", "taint", "df-generated"]
-      - ["System.CodeDom", "CodeAttributeDeclarationCollection", False, "Insert", "(System.Int32,System.CodeDom.CodeAttributeDeclaration)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["System.CodeDom", "CodeAttributeDeclarationCollection", False, "Remove", "(System.CodeDom.CodeAttributeDeclaration)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.CodeDom", "CodeAttributeDeclarationCollection", False, "get_Item", "(System.Int32)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.CodeDom", "CodeAttributeDeclarationCollection", False, "set_Item", "(System.Int32,System.CodeDom.CodeAttributeDeclaration)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["System.CodeDom", "CodeAttributeDeclaration", False, "get_AttributeType", "()", "", "Argument[this].SyntheticField[System.CodeDom.CodeAttributeDeclaration._attributeType]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.CodeDom", "CodeAttributeDeclarationCollection", False, "Add", "(System.CodeDom.CodeAttributeDeclaration)", "", "Argument[0]", "Argument[this].Property[System.Collections.CollectionBase.List].Element", "value", "dfc-generated"]
+      - ["System.CodeDom", "CodeAttributeDeclarationCollection", False, "AddRange", "(System.CodeDom.CodeAttributeDeclarationCollection)", "", "Argument[0].Property[System.Collections.CollectionBase.List].Element", "Argument[this].Property[System.Collections.CollectionBase.List].Element", "value", "dfc-generated"]
+      - ["System.CodeDom", "CodeAttributeDeclarationCollection", False, "AddRange", "(System.CodeDom.CodeAttributeDeclaration[])", "", "Argument[0].Element", "Argument[this].Property[System.Collections.CollectionBase.List].Element", "value", "dfc-generated"]
+      - ["System.CodeDom", "CodeAttributeDeclarationCollection", False, "CodeAttributeDeclarationCollection", "(System.CodeDom.CodeAttributeDeclarationCollection)", "", "Argument[0].Property[System.Collections.CollectionBase.List].Element", "Argument[this].Property[System.Collections.CollectionBase.List].Element", "value", "dfc-generated"]
+      - ["System.CodeDom", "CodeAttributeDeclarationCollection", False, "CodeAttributeDeclarationCollection", "(System.CodeDom.CodeAttributeDeclaration[])", "", "Argument[0].Element", "Argument[this].Property[System.Collections.CollectionBase.List].Element", "value", "dfc-generated"]
+      - ["System.CodeDom", "CodeAttributeDeclarationCollection", False, "CopyTo", "(System.CodeDom.CodeAttributeDeclaration[],System.Int32)", "", "Argument[this].Property[System.Collections.CollectionBase.List].Element", "Argument[0].Element", "value", "dfc-generated"]
+      - ["System.CodeDom", "CodeAttributeDeclarationCollection", False, "Insert", "(System.Int32,System.CodeDom.CodeAttributeDeclaration)", "", "Argument[1]", "Argument[this].Property[System.Collections.CollectionBase.List].Element", "value", "dfc-generated"]
+      - ["System.CodeDom", "CodeAttributeDeclarationCollection", False, "get_Item", "(System.Int32)", "", "Argument[this].Property[System.Collections.CollectionBase.List].Element", "ReturnValue", "value", "dfc-generated"]
+      - ["System.CodeDom", "CodeAttributeDeclarationCollection", False, "set_Item", "(System.Int32,System.CodeDom.CodeAttributeDeclaration)", "", "Argument[1]", "Argument[this].Property[System.Collections.CollectionBase.List].Element", "value", "dfc-generated"]
       - ["System.CodeDom", "CodeCastExpression", False, "CodeCastExpression", "(System.CodeDom.CodeTypeReference,System.CodeDom.CodeExpression)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.CodeDom", "CodeCastExpression", False, "CodeCastExpression", "(System.String,System.CodeDom.CodeExpression)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.CodeDom", "CodeCatchClause", False, "CodeCatchClause", "(System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.CodeDom", "CodeCatchClause", False, "CodeCatchClause", "(System.String,System.CodeDom.CodeTypeReference)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.CodeDom", "CodeCatchClause", False, "CodeCatchClause", "(System.String,System.CodeDom.CodeTypeReference)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
       - ["System.CodeDom", "CodeCatchClause", False, "CodeCatchClause", "(System.String,System.CodeDom.CodeTypeReference,System.CodeDom.CodeStatement[])", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.CodeDom", "CodeCatchClause", False, "CodeCatchClause", "(System.String,System.CodeDom.CodeTypeReference,System.CodeDom.CodeStatement[])", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["System.CodeDom", "CodeCatchClause", False, "CodeCatchClause", "(System.String,System.CodeDom.CodeTypeReference,System.CodeDom.CodeStatement[])", "", "Argument[2].Element", "Argument[this]", "taint", "df-generated"]
-      - ["System.CodeDom", "CodeCatchClauseCollection", False, "Add", "(System.CodeDom.CodeCatchClause)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.CodeDom", "CodeCatchClauseCollection", False, "AddRange", "(System.CodeDom.CodeCatchClauseCollection)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["System.CodeDom", "CodeCatchClauseCollection", False, "AddRange", "(System.CodeDom.CodeCatchClause[])", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["System.CodeDom", "CodeCatchClauseCollection", False, "CodeCatchClauseCollection", "(System.CodeDom.CodeCatchClauseCollection)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["System.CodeDom", "CodeCatchClauseCollection", False, "CodeCatchClauseCollection", "(System.CodeDom.CodeCatchClause[])", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["System.CodeDom", "CodeCatchClauseCollection", False, "CopyTo", "(System.CodeDom.CodeCatchClause[],System.Int32)", "", "Argument[this]", "Argument[0].Element", "taint", "df-generated"]
-      - ["System.CodeDom", "CodeCatchClauseCollection", False, "Insert", "(System.Int32,System.CodeDom.CodeCatchClause)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["System.CodeDom", "CodeCatchClauseCollection", False, "Remove", "(System.CodeDom.CodeCatchClause)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.CodeDom", "CodeCatchClauseCollection", False, "get_Item", "(System.Int32)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.CodeDom", "CodeCatchClauseCollection", False, "set_Item", "(System.Int32,System.CodeDom.CodeCatchClause)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["System.CodeDom", "CodeCatchClauseCollection", False, "Add", "(System.CodeDom.CodeCatchClause)", "", "Argument[0]", "Argument[this].Property[System.Collections.CollectionBase.List].Element", "value", "dfc-generated"]
+      - ["System.CodeDom", "CodeCatchClauseCollection", False, "AddRange", "(System.CodeDom.CodeCatchClauseCollection)", "", "Argument[0].Property[System.Collections.CollectionBase.List].Element", "Argument[this].Property[System.Collections.CollectionBase.List].Element", "value", "dfc-generated"]
+      - ["System.CodeDom", "CodeCatchClauseCollection", False, "AddRange", "(System.CodeDom.CodeCatchClause[])", "", "Argument[0].Element", "Argument[this].Property[System.Collections.CollectionBase.List].Element", "value", "dfc-generated"]
+      - ["System.CodeDom", "CodeCatchClauseCollection", False, "CodeCatchClauseCollection", "(System.CodeDom.CodeCatchClauseCollection)", "", "Argument[0].Property[System.Collections.CollectionBase.List].Element", "Argument[this].Property[System.Collections.CollectionBase.List].Element", "value", "dfc-generated"]
+      - ["System.CodeDom", "CodeCatchClauseCollection", False, "CodeCatchClauseCollection", "(System.CodeDom.CodeCatchClause[])", "", "Argument[0].Element", "Argument[this].Property[System.Collections.CollectionBase.List].Element", "value", "dfc-generated"]
+      - ["System.CodeDom", "CodeCatchClauseCollection", False, "CopyTo", "(System.CodeDom.CodeCatchClause[],System.Int32)", "", "Argument[this].Property[System.Collections.CollectionBase.List].Element", "Argument[0].Element", "value", "dfc-generated"]
+      - ["System.CodeDom", "CodeCatchClauseCollection", False, "Insert", "(System.Int32,System.CodeDom.CodeCatchClause)", "", "Argument[1]", "Argument[this].Property[System.Collections.CollectionBase.List].Element", "value", "dfc-generated"]
+      - ["System.CodeDom", "CodeCatchClauseCollection", False, "get_Item", "(System.Int32)", "", "Argument[this].Property[System.Collections.CollectionBase.List].Element", "ReturnValue", "value", "dfc-generated"]
+      - ["System.CodeDom", "CodeCatchClauseCollection", False, "set_Item", "(System.Int32,System.CodeDom.CodeCatchClause)", "", "Argument[1]", "Argument[this].Property[System.Collections.CollectionBase.List].Element", "value", "dfc-generated"]
       - ["System.CodeDom", "CodeChecksumPragma", False, "CodeChecksumPragma", "(System.String,System.Guid,System.Byte[])", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.CodeDom", "CodeComment", False, "CodeComment", "(System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.CodeDom", "CodeComment", False, "CodeComment", "(System.String,System.Boolean)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.CodeDom", "CodeCommentStatementCollection", False, "Add", "(System.CodeDom.CodeCommentStatement)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.CodeDom", "CodeCommentStatementCollection", False, "AddRange", "(System.CodeDom.CodeCommentStatementCollection)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["System.CodeDom", "CodeCommentStatementCollection", False, "AddRange", "(System.CodeDom.CodeCommentStatement[])", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["System.CodeDom", "CodeCommentStatementCollection", False, "CodeCommentStatementCollection", "(System.CodeDom.CodeCommentStatementCollection)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["System.CodeDom", "CodeCommentStatementCollection", False, "CodeCommentStatementCollection", "(System.CodeDom.CodeCommentStatement[])", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["System.CodeDom", "CodeCommentStatementCollection", False, "CopyTo", "(System.CodeDom.CodeCommentStatement[],System.Int32)", "", "Argument[this]", "Argument[0].Element", "taint", "df-generated"]
-      - ["System.CodeDom", "CodeCommentStatementCollection", False, "Insert", "(System.Int32,System.CodeDom.CodeCommentStatement)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["System.CodeDom", "CodeCommentStatementCollection", False, "Remove", "(System.CodeDom.CodeCommentStatement)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.CodeDom", "CodeCommentStatementCollection", False, "get_Item", "(System.Int32)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.CodeDom", "CodeCommentStatementCollection", False, "set_Item", "(System.Int32,System.CodeDom.CodeCommentStatement)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["System.CodeDom", "CodeConditionStatement", False, "CodeConditionStatement", "(System.CodeDom.CodeExpression,System.CodeDom.CodeStatement[])", "", "Argument[1].Element", "Argument[this]", "taint", "df-generated"]
-      - ["System.CodeDom", "CodeConditionStatement", False, "CodeConditionStatement", "(System.CodeDom.CodeExpression,System.CodeDom.CodeStatement[],System.CodeDom.CodeStatement[])", "", "Argument[1].Element", "Argument[this]", "taint", "df-generated"]
-      - ["System.CodeDom", "CodeConditionStatement", False, "CodeConditionStatement", "(System.CodeDom.CodeExpression,System.CodeDom.CodeStatement[],System.CodeDom.CodeStatement[])", "", "Argument[2].Element", "Argument[this]", "taint", "df-generated"]
+      - ["System.CodeDom", "CodeCommentStatementCollection", False, "Add", "(System.CodeDom.CodeCommentStatement)", "", "Argument[0]", "Argument[this].Property[System.Collections.CollectionBase.List].Element", "value", "dfc-generated"]
+      - ["System.CodeDom", "CodeCommentStatementCollection", False, "AddRange", "(System.CodeDom.CodeCommentStatementCollection)", "", "Argument[0].Property[System.Collections.CollectionBase.List].Element", "Argument[this].Property[System.Collections.CollectionBase.List].Element", "value", "dfc-generated"]
+      - ["System.CodeDom", "CodeCommentStatementCollection", False, "AddRange", "(System.CodeDom.CodeCommentStatement[])", "", "Argument[0].Element", "Argument[this].Property[System.Collections.CollectionBase.List].Element", "value", "dfc-generated"]
+      - ["System.CodeDom", "CodeCommentStatementCollection", False, "CodeCommentStatementCollection", "(System.CodeDom.CodeCommentStatementCollection)", "", "Argument[0].Property[System.Collections.CollectionBase.List].Element", "Argument[this].Property[System.Collections.CollectionBase.List].Element", "value", "dfc-generated"]
+      - ["System.CodeDom", "CodeCommentStatementCollection", False, "CodeCommentStatementCollection", "(System.CodeDom.CodeCommentStatement[])", "", "Argument[0].Element", "Argument[this].Property[System.Collections.CollectionBase.List].Element", "value", "dfc-generated"]
+      - ["System.CodeDom", "CodeCommentStatementCollection", False, "CopyTo", "(System.CodeDom.CodeCommentStatement[],System.Int32)", "", "Argument[this].Property[System.Collections.CollectionBase.List].Element", "Argument[0].Element", "value", "dfc-generated"]
+      - ["System.CodeDom", "CodeCommentStatementCollection", False, "Insert", "(System.Int32,System.CodeDom.CodeCommentStatement)", "", "Argument[1]", "Argument[this].Property[System.Collections.CollectionBase.List].Element", "value", "dfc-generated"]
+      - ["System.CodeDom", "CodeCommentStatementCollection", False, "get_Item", "(System.Int32)", "", "Argument[this].Property[System.Collections.CollectionBase.List].Element", "ReturnValue", "value", "dfc-generated"]
+      - ["System.CodeDom", "CodeCommentStatementCollection", False, "set_Item", "(System.Int32,System.CodeDom.CodeCommentStatement)", "", "Argument[1]", "Argument[this].Property[System.Collections.CollectionBase.List].Element", "value", "dfc-generated"]
       - ["System.CodeDom", "CodeDefaultValueExpression", False, "CodeDefaultValueExpression", "(System.CodeDom.CodeTypeReference)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.CodeDom", "CodeDelegateCreateExpression", False, "CodeDelegateCreateExpression", "(System.CodeDom.CodeTypeReference,System.CodeDom.CodeExpression,System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.CodeDom", "CodeDelegateCreateExpression", False, "CodeDelegateCreateExpression", "(System.CodeDom.CodeTypeReference,System.CodeDom.CodeExpression,System.String)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
-      - ["System.CodeDom", "CodeDelegateInvokeExpression", False, "CodeDelegateInvokeExpression", "(System.CodeDom.CodeExpression,System.CodeDom.CodeExpression[])", "", "Argument[1].Element", "Argument[this]", "taint", "df-generated"]
-      - ["System.CodeDom", "CodeDirectiveCollection", False, "Add", "(System.CodeDom.CodeDirective)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.CodeDom", "CodeDirectiveCollection", False, "AddRange", "(System.CodeDom.CodeDirectiveCollection)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["System.CodeDom", "CodeDirectiveCollection", False, "AddRange", "(System.CodeDom.CodeDirective[])", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["System.CodeDom", "CodeDirectiveCollection", False, "CodeDirectiveCollection", "(System.CodeDom.CodeDirectiveCollection)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["System.CodeDom", "CodeDirectiveCollection", False, "CodeDirectiveCollection", "(System.CodeDom.CodeDirective[])", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["System.CodeDom", "CodeDirectiveCollection", False, "CopyTo", "(System.CodeDom.CodeDirective[],System.Int32)", "", "Argument[this]", "Argument[0].Element", "taint", "df-generated"]
-      - ["System.CodeDom", "CodeDirectiveCollection", False, "Insert", "(System.Int32,System.CodeDom.CodeDirective)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["System.CodeDom", "CodeDirectiveCollection", False, "Remove", "(System.CodeDom.CodeDirective)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.CodeDom", "CodeDirectiveCollection", False, "get_Item", "(System.Int32)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.CodeDom", "CodeDirectiveCollection", False, "set_Item", "(System.Int32,System.CodeDom.CodeDirective)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["System.CodeDom", "CodeDirectiveCollection", False, "Add", "(System.CodeDom.CodeDirective)", "", "Argument[0]", "Argument[this].Property[System.Collections.CollectionBase.List].Element", "value", "dfc-generated"]
+      - ["System.CodeDom", "CodeDirectiveCollection", False, "AddRange", "(System.CodeDom.CodeDirectiveCollection)", "", "Argument[0].Property[System.Collections.CollectionBase.List].Element", "Argument[this].Property[System.Collections.CollectionBase.List].Element", "value", "dfc-generated"]
+      - ["System.CodeDom", "CodeDirectiveCollection", False, "AddRange", "(System.CodeDom.CodeDirective[])", "", "Argument[0].Element", "Argument[this].Property[System.Collections.CollectionBase.List].Element", "value", "dfc-generated"]
+      - ["System.CodeDom", "CodeDirectiveCollection", False, "CodeDirectiveCollection", "(System.CodeDom.CodeDirectiveCollection)", "", "Argument[0].Property[System.Collections.CollectionBase.List].Element", "Argument[this].Property[System.Collections.CollectionBase.List].Element", "value", "dfc-generated"]
+      - ["System.CodeDom", "CodeDirectiveCollection", False, "CodeDirectiveCollection", "(System.CodeDom.CodeDirective[])", "", "Argument[0].Element", "Argument[this].Property[System.Collections.CollectionBase.List].Element", "value", "dfc-generated"]
+      - ["System.CodeDom", "CodeDirectiveCollection", False, "CopyTo", "(System.CodeDom.CodeDirective[],System.Int32)", "", "Argument[this].Property[System.Collections.CollectionBase.List].Element", "Argument[0].Element", "value", "dfc-generated"]
+      - ["System.CodeDom", "CodeDirectiveCollection", False, "Insert", "(System.Int32,System.CodeDom.CodeDirective)", "", "Argument[1]", "Argument[this].Property[System.Collections.CollectionBase.List].Element", "value", "dfc-generated"]
+      - ["System.CodeDom", "CodeDirectiveCollection", False, "get_Item", "(System.Int32)", "", "Argument[this].Property[System.Collections.CollectionBase.List].Element", "ReturnValue", "value", "dfc-generated"]
+      - ["System.CodeDom", "CodeDirectiveCollection", False, "set_Item", "(System.Int32,System.CodeDom.CodeDirective)", "", "Argument[1]", "Argument[this].Property[System.Collections.CollectionBase.List].Element", "value", "dfc-generated"]
       - ["System.CodeDom", "CodeEventReferenceExpression", False, "CodeEventReferenceExpression", "(System.CodeDom.CodeExpression,System.String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["System.CodeDom", "CodeExpressionCollection", False, "Add", "(System.CodeDom.CodeExpression)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.CodeDom", "CodeExpressionCollection", False, "AddRange", "(System.CodeDom.CodeExpressionCollection)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["System.CodeDom", "CodeExpressionCollection", False, "AddRange", "(System.CodeDom.CodeExpression[])", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["System.CodeDom", "CodeExpressionCollection", False, "CodeExpressionCollection", "(System.CodeDom.CodeExpressionCollection)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["System.CodeDom", "CodeExpressionCollection", False, "CodeExpressionCollection", "(System.CodeDom.CodeExpression[])", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["System.CodeDom", "CodeExpressionCollection", False, "CopyTo", "(System.CodeDom.CodeExpression[],System.Int32)", "", "Argument[this]", "Argument[0].Element", "taint", "df-generated"]
-      - ["System.CodeDom", "CodeExpressionCollection", False, "Insert", "(System.Int32,System.CodeDom.CodeExpression)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["System.CodeDom", "CodeExpressionCollection", False, "Remove", "(System.CodeDom.CodeExpression)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.CodeDom", "CodeExpressionCollection", False, "get_Item", "(System.Int32)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.CodeDom", "CodeExpressionCollection", False, "set_Item", "(System.Int32,System.CodeDom.CodeExpression)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["System.CodeDom", "CodeExpressionCollection", False, "Add", "(System.CodeDom.CodeExpression)", "", "Argument[0]", "Argument[this].Property[System.Collections.CollectionBase.List].Element", "value", "dfc-generated"]
+      - ["System.CodeDom", "CodeExpressionCollection", False, "AddRange", "(System.CodeDom.CodeExpressionCollection)", "", "Argument[0].Property[System.Collections.CollectionBase.List].Element", "Argument[this].Property[System.Collections.CollectionBase.List].Element", "value", "dfc-generated"]
+      - ["System.CodeDom", "CodeExpressionCollection", False, "AddRange", "(System.CodeDom.CodeExpression[])", "", "Argument[0].Element", "Argument[this].Property[System.Collections.CollectionBase.List].Element", "value", "dfc-generated"]
+      - ["System.CodeDom", "CodeExpressionCollection", False, "CodeExpressionCollection", "(System.CodeDom.CodeExpressionCollection)", "", "Argument[0].Property[System.Collections.CollectionBase.List].Element", "Argument[this].Property[System.Collections.CollectionBase.List].Element", "value", "dfc-generated"]
+      - ["System.CodeDom", "CodeExpressionCollection", False, "CodeExpressionCollection", "(System.CodeDom.CodeExpression[])", "", "Argument[0].Element", "Argument[this].Property[System.Collections.CollectionBase.List].Element", "value", "dfc-generated"]
+      - ["System.CodeDom", "CodeExpressionCollection", False, "CopyTo", "(System.CodeDom.CodeExpression[],System.Int32)", "", "Argument[this].Property[System.Collections.CollectionBase.List].Element", "Argument[0].Element", "value", "dfc-generated"]
+      - ["System.CodeDom", "CodeExpressionCollection", False, "Insert", "(System.Int32,System.CodeDom.CodeExpression)", "", "Argument[1]", "Argument[this].Property[System.Collections.CollectionBase.List].Element", "value", "dfc-generated"]
+      - ["System.CodeDom", "CodeExpressionCollection", False, "get_Item", "(System.Int32)", "", "Argument[this].Property[System.Collections.CollectionBase.List].Element", "ReturnValue", "value", "dfc-generated"]
+      - ["System.CodeDom", "CodeExpressionCollection", False, "set_Item", "(System.Int32,System.CodeDom.CodeExpression)", "", "Argument[1]", "Argument[this].Property[System.Collections.CollectionBase.List].Element", "value", "dfc-generated"]
       - ["System.CodeDom", "CodeFieldReferenceExpression", False, "CodeFieldReferenceExpression", "(System.CodeDom.CodeExpression,System.String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
       - ["System.CodeDom", "CodeGotoStatement", False, "CodeGotoStatement", "(System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.CodeDom", "CodeIndexerExpression", False, "CodeIndexerExpression", "(System.CodeDom.CodeExpression,System.CodeDom.CodeExpression[])", "", "Argument[1].Element", "Argument[this]", "taint", "df-generated"]
-      - ["System.CodeDom", "CodeIterationStatement", False, "CodeIterationStatement", "(System.CodeDom.CodeStatement,System.CodeDom.CodeExpression,System.CodeDom.CodeStatement,System.CodeDom.CodeStatement[])", "", "Argument[3].Element", "Argument[this]", "taint", "df-generated"]
       - ["System.CodeDom", "CodeLabeledStatement", False, "CodeLabeledStatement", "(System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.CodeDom", "CodeLabeledStatement", False, "CodeLabeledStatement", "(System.String,System.CodeDom.CodeStatement)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.CodeDom", "CodeLinePragma", False, "CodeLinePragma", "(System.String,System.Int32)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.CodeDom", "CodeMemberField", False, "CodeMemberField", "(System.CodeDom.CodeTypeReference,System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.CodeDom", "CodeMemberField", False, "CodeMemberField", "(System.CodeDom.CodeTypeReference,System.String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["System.CodeDom", "CodeMemberField", False, "CodeMemberField", "(System.String,System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.CodeDom", "CodeMemberField", False, "CodeMemberField", "(System.String,System.String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
       - ["System.CodeDom", "CodeMemberField", False, "CodeMemberField", "(System.Type,System.String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
       - ["System.CodeDom", "CodeMemberMethod", False, "get_ImplementationTypes", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.CodeDom", "CodeMemberMethod", False, "get_Parameters", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.CodeDom", "CodeMemberMethod", False, "get_Statements", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.CodeDom", "CodeMethodInvokeExpression", False, "CodeMethodInvokeExpression", "(System.CodeDom.CodeExpression,System.String,System.CodeDom.CodeExpression[])", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["System.CodeDom", "CodeMethodInvokeExpression", False, "CodeMethodInvokeExpression", "(System.CodeDom.CodeExpression,System.String,System.CodeDom.CodeExpression[])", "", "Argument[2].Element", "Argument[this]", "taint", "df-generated"]
       - ["System.CodeDom", "CodeMethodInvokeExpression", False, "CodeMethodInvokeExpression", "(System.CodeDom.CodeMethodReferenceExpression,System.CodeDom.CodeExpression[])", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.CodeDom", "CodeMethodInvokeExpression", False, "CodeMethodInvokeExpression", "(System.CodeDom.CodeMethodReferenceExpression,System.CodeDom.CodeExpression[])", "", "Argument[1].Element", "Argument[this]", "taint", "df-generated"]
       - ["System.CodeDom", "CodeMethodReferenceExpression", False, "CodeMethodReferenceExpression", "(System.CodeDom.CodeExpression,System.String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
       - ["System.CodeDom", "CodeMethodReferenceExpression", False, "CodeMethodReferenceExpression", "(System.CodeDom.CodeExpression,System.String,System.CodeDom.CodeTypeReference[])", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["System.CodeDom", "CodeMethodReferenceExpression", False, "CodeMethodReferenceExpression", "(System.CodeDom.CodeExpression,System.String,System.CodeDom.CodeTypeReference[])", "", "Argument[2].Element", "Argument[this]", "taint", "df-generated"]
       - ["System.CodeDom", "CodeNamespace", False, "CodeNamespace", "(System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.CodeDom", "CodeNamespace", False, "get_Comments", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.CodeDom", "CodeNamespace", False, "get_Imports", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.CodeDom", "CodeNamespace", False, "get_Types", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.CodeDom", "CodeNamespaceCollection", False, "Add", "(System.CodeDom.CodeNamespace)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.CodeDom", "CodeNamespaceCollection", False, "AddRange", "(System.CodeDom.CodeNamespaceCollection)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["System.CodeDom", "CodeNamespaceCollection", False, "AddRange", "(System.CodeDom.CodeNamespace[])", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["System.CodeDom", "CodeNamespaceCollection", False, "CodeNamespaceCollection", "(System.CodeDom.CodeNamespaceCollection)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["System.CodeDom", "CodeNamespaceCollection", False, "CodeNamespaceCollection", "(System.CodeDom.CodeNamespace[])", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["System.CodeDom", "CodeNamespaceCollection", False, "CopyTo", "(System.CodeDom.CodeNamespace[],System.Int32)", "", "Argument[this]", "Argument[0].Element", "taint", "df-generated"]
-      - ["System.CodeDom", "CodeNamespaceCollection", False, "Insert", "(System.Int32,System.CodeDom.CodeNamespace)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["System.CodeDom", "CodeNamespaceCollection", False, "Remove", "(System.CodeDom.CodeNamespace)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.CodeDom", "CodeNamespaceCollection", False, "get_Item", "(System.Int32)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.CodeDom", "CodeNamespaceCollection", False, "set_Item", "(System.Int32,System.CodeDom.CodeNamespace)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["System.CodeDom", "CodeNamespaceCollection", False, "Add", "(System.CodeDom.CodeNamespace)", "", "Argument[0]", "Argument[this].Property[System.Collections.CollectionBase.List].Element", "value", "dfc-generated"]
+      - ["System.CodeDom", "CodeNamespaceCollection", False, "AddRange", "(System.CodeDom.CodeNamespaceCollection)", "", "Argument[0].Property[System.Collections.CollectionBase.List].Element", "Argument[this].Property[System.Collections.CollectionBase.List].Element", "value", "dfc-generated"]
+      - ["System.CodeDom", "CodeNamespaceCollection", False, "AddRange", "(System.CodeDom.CodeNamespace[])", "", "Argument[0].Element", "Argument[this].Property[System.Collections.CollectionBase.List].Element", "value", "dfc-generated"]
+      - ["System.CodeDom", "CodeNamespaceCollection", False, "CodeNamespaceCollection", "(System.CodeDom.CodeNamespaceCollection)", "", "Argument[0].Property[System.Collections.CollectionBase.List].Element", "Argument[this].Property[System.Collections.CollectionBase.List].Element", "value", "dfc-generated"]
+      - ["System.CodeDom", "CodeNamespaceCollection", False, "CodeNamespaceCollection", "(System.CodeDom.CodeNamespace[])", "", "Argument[0].Element", "Argument[this].Property[System.Collections.CollectionBase.List].Element", "value", "dfc-generated"]
+      - ["System.CodeDom", "CodeNamespaceCollection", False, "CopyTo", "(System.CodeDom.CodeNamespace[],System.Int32)", "", "Argument[this].Property[System.Collections.CollectionBase.List].Element", "Argument[0].Element", "value", "dfc-generated"]
+      - ["System.CodeDom", "CodeNamespaceCollection", False, "Insert", "(System.Int32,System.CodeDom.CodeNamespace)", "", "Argument[1]", "Argument[this].Property[System.Collections.CollectionBase.List].Element", "value", "dfc-generated"]
+      - ["System.CodeDom", "CodeNamespaceCollection", False, "get_Item", "(System.Int32)", "", "Argument[this].Property[System.Collections.CollectionBase.List].Element", "ReturnValue", "value", "dfc-generated"]
+      - ["System.CodeDom", "CodeNamespaceCollection", False, "set_Item", "(System.Int32,System.CodeDom.CodeNamespace)", "", "Argument[1]", "Argument[this].Property[System.Collections.CollectionBase.List].Element", "value", "dfc-generated"]
       - ["System.CodeDom", "CodeNamespaceImport", False, "CodeNamespaceImport", "(System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.CodeDom", "CodeNamespaceImportCollection", False, "Add", "(System.CodeDom.CodeNamespaceImport)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.CodeDom", "CodeNamespaceImportCollection", False, "AddRange", "(System.CodeDom.CodeNamespaceImport[])", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["System.CodeDom", "CodeNamespaceImportCollection", False, "GetEnumerator", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.CodeDom", "CodeNamespaceImportCollection", False, "get_Item", "(System.Int32)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.CodeDom", "CodeNamespaceImportCollection", False, "set_Item", "(System.Int32,System.CodeDom.CodeNamespaceImport)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["System.CodeDom", "CodeNamespaceImportCollection", False, "Add", "(System.CodeDom.CodeNamespaceImport)", "", "Argument[0]", "Argument[this].SyntheticField[System.CodeDom.CodeNamespaceImportCollection._data].Element", "value", "dfc-generated"]
+      - ["System.CodeDom", "CodeNamespaceImportCollection", False, "AddRange", "(System.CodeDom.CodeNamespaceImport[])", "", "Argument[0].Element", "Argument[this].SyntheticField[System.CodeDom.CodeNamespaceImportCollection._data].Element", "value", "dfc-generated"]
+      - ["System.CodeDom", "CodeNamespaceImportCollection", False, "GetEnumerator", "()", "", "Argument[this].SyntheticField[System.CodeDom.CodeNamespaceImportCollection._data].Element", "ReturnValue.Property[System.Collections.IEnumerator.Current]", "value", "dfc-generated"]
+      - ["System.CodeDom", "CodeNamespaceImportCollection", False, "get_Item", "(System.Int32)", "", "Argument[this].SyntheticField[System.CodeDom.CodeNamespaceImportCollection._data].Element", "ReturnValue", "value", "dfc-generated"]
+      - ["System.CodeDom", "CodeNamespaceImportCollection", False, "set_Item", "(System.Int32,System.CodeDom.CodeNamespaceImport)", "", "Argument[1]", "Argument[this].SyntheticField[System.CodeDom.CodeNamespaceImportCollection._data].Element", "value", "dfc-generated"]
       - ["System.CodeDom", "CodeObjectCreateExpression", False, "CodeObjectCreateExpression", "(System.CodeDom.CodeTypeReference,System.CodeDom.CodeExpression[])", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.CodeDom", "CodeObjectCreateExpression", False, "CodeObjectCreateExpression", "(System.CodeDom.CodeTypeReference,System.CodeDom.CodeExpression[])", "", "Argument[1].Element", "Argument[this]", "taint", "df-generated"]
-      - ["System.CodeDom", "CodeObjectCreateExpression", False, "CodeObjectCreateExpression", "(System.String,System.CodeDom.CodeExpression[])", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.CodeDom", "CodeObjectCreateExpression", False, "CodeObjectCreateExpression", "(System.String,System.CodeDom.CodeExpression[])", "", "Argument[1].Element", "Argument[this]", "taint", "df-generated"]
-      - ["System.CodeDom", "CodeObjectCreateExpression", False, "CodeObjectCreateExpression", "(System.Type,System.CodeDom.CodeExpression[])", "", "Argument[1].Element", "Argument[this]", "taint", "df-generated"]
       - ["System.CodeDom", "CodeParameterDeclarationExpression", False, "CodeParameterDeclarationExpression", "(System.CodeDom.CodeTypeReference,System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.CodeDom", "CodeParameterDeclarationExpression", False, "CodeParameterDeclarationExpression", "(System.CodeDom.CodeTypeReference,System.String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["System.CodeDom", "CodeParameterDeclarationExpression", False, "CodeParameterDeclarationExpression", "(System.String,System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.CodeDom", "CodeParameterDeclarationExpression", False, "CodeParameterDeclarationExpression", "(System.String,System.String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
       - ["System.CodeDom", "CodeParameterDeclarationExpression", False, "CodeParameterDeclarationExpression", "(System.Type,System.String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["System.CodeDom", "CodeParameterDeclarationExpressionCollection", False, "Add", "(System.CodeDom.CodeParameterDeclarationExpression)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.CodeDom", "CodeParameterDeclarationExpressionCollection", False, "AddRange", "(System.CodeDom.CodeParameterDeclarationExpressionCollection)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["System.CodeDom", "CodeParameterDeclarationExpressionCollection", False, "AddRange", "(System.CodeDom.CodeParameterDeclarationExpression[])", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["System.CodeDom", "CodeParameterDeclarationExpressionCollection", False, "CodeParameterDeclarationExpressionCollection", "(System.CodeDom.CodeParameterDeclarationExpressionCollection)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["System.CodeDom", "CodeParameterDeclarationExpressionCollection", False, "CodeParameterDeclarationExpressionCollection", "(System.CodeDom.CodeParameterDeclarationExpression[])", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["System.CodeDom", "CodeParameterDeclarationExpressionCollection", False, "CopyTo", "(System.CodeDom.CodeParameterDeclarationExpression[],System.Int32)", "", "Argument[this]", "Argument[0].Element", "taint", "df-generated"]
-      - ["System.CodeDom", "CodeParameterDeclarationExpressionCollection", False, "Insert", "(System.Int32,System.CodeDom.CodeParameterDeclarationExpression)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["System.CodeDom", "CodeParameterDeclarationExpressionCollection", False, "Remove", "(System.CodeDom.CodeParameterDeclarationExpression)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.CodeDom", "CodeParameterDeclarationExpressionCollection", False, "get_Item", "(System.Int32)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.CodeDom", "CodeParameterDeclarationExpressionCollection", False, "set_Item", "(System.Int32,System.CodeDom.CodeParameterDeclarationExpression)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["System.CodeDom", "CodeParameterDeclarationExpressionCollection", False, "Add", "(System.CodeDom.CodeParameterDeclarationExpression)", "", "Argument[0]", "Argument[this].Property[System.Collections.CollectionBase.List].Element", "value", "dfc-generated"]
+      - ["System.CodeDom", "CodeParameterDeclarationExpressionCollection", False, "AddRange", "(System.CodeDom.CodeParameterDeclarationExpressionCollection)", "", "Argument[0].Property[System.Collections.CollectionBase.List].Element", "Argument[this].Property[System.Collections.CollectionBase.List].Element", "value", "dfc-generated"]
+      - ["System.CodeDom", "CodeParameterDeclarationExpressionCollection", False, "AddRange", "(System.CodeDom.CodeParameterDeclarationExpression[])", "", "Argument[0].Element", "Argument[this].Property[System.Collections.CollectionBase.List].Element", "value", "dfc-generated"]
+      - ["System.CodeDom", "CodeParameterDeclarationExpressionCollection", False, "CodeParameterDeclarationExpressionCollection", "(System.CodeDom.CodeParameterDeclarationExpressionCollection)", "", "Argument[0].Property[System.Collections.CollectionBase.List].Element", "Argument[this].Property[System.Collections.CollectionBase.List].Element", "value", "dfc-generated"]
+      - ["System.CodeDom", "CodeParameterDeclarationExpressionCollection", False, "CodeParameterDeclarationExpressionCollection", "(System.CodeDom.CodeParameterDeclarationExpression[])", "", "Argument[0].Element", "Argument[this].Property[System.Collections.CollectionBase.List].Element", "value", "dfc-generated"]
+      - ["System.CodeDom", "CodeParameterDeclarationExpressionCollection", False, "CopyTo", "(System.CodeDom.CodeParameterDeclarationExpression[],System.Int32)", "", "Argument[this].Property[System.Collections.CollectionBase.List].Element", "Argument[0].Element", "value", "dfc-generated"]
+      - ["System.CodeDom", "CodeParameterDeclarationExpressionCollection", False, "Insert", "(System.Int32,System.CodeDom.CodeParameterDeclarationExpression)", "", "Argument[1]", "Argument[this].Property[System.Collections.CollectionBase.List].Element", "value", "dfc-generated"]
+      - ["System.CodeDom", "CodeParameterDeclarationExpressionCollection", False, "get_Item", "(System.Int32)", "", "Argument[this].Property[System.Collections.CollectionBase.List].Element", "ReturnValue", "value", "dfc-generated"]
+      - ["System.CodeDom", "CodeParameterDeclarationExpressionCollection", False, "set_Item", "(System.Int32,System.CodeDom.CodeParameterDeclarationExpression)", "", "Argument[1]", "Argument[this].Property[System.Collections.CollectionBase.List].Element", "value", "dfc-generated"]
       - ["System.CodeDom", "CodePropertyReferenceExpression", False, "CodePropertyReferenceExpression", "(System.CodeDom.CodeExpression,System.String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
       - ["System.CodeDom", "CodeRegionDirective", False, "CodeRegionDirective", "(System.CodeDom.CodeRegionMode,System.String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
       - ["System.CodeDom", "CodeRemoveEventStatement", False, "CodeRemoveEventStatement", "(System.CodeDom.CodeEventReferenceExpression,System.CodeDom.CodeExpression)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.CodeDom", "CodeRemoveEventStatement", False, "CodeRemoveEventStatement", "(System.CodeDom.CodeExpression,System.String,System.CodeDom.CodeExpression)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
       - ["System.CodeDom", "CodeSnippetCompileUnit", False, "CodeSnippetCompileUnit", "(System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.CodeDom", "CodeSnippetExpression", False, "CodeSnippetExpression", "(System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.CodeDom", "CodeSnippetStatement", False, "CodeSnippetStatement", "(System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.CodeDom", "CodeSnippetTypeMember", False, "CodeSnippetTypeMember", "(System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.CodeDom", "CodeStatementCollection", False, "Add", "(System.CodeDom.CodeStatement)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.CodeDom", "CodeStatementCollection", False, "AddRange", "(System.CodeDom.CodeStatementCollection)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["System.CodeDom", "CodeStatementCollection", False, "AddRange", "(System.CodeDom.CodeStatement[])", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["System.CodeDom", "CodeStatementCollection", False, "CodeStatementCollection", "(System.CodeDom.CodeStatementCollection)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["System.CodeDom", "CodeStatementCollection", False, "CodeStatementCollection", "(System.CodeDom.CodeStatement[])", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["System.CodeDom", "CodeStatementCollection", False, "CopyTo", "(System.CodeDom.CodeStatement[],System.Int32)", "", "Argument[this]", "Argument[0].Element", "taint", "df-generated"]
-      - ["System.CodeDom", "CodeStatementCollection", False, "Insert", "(System.Int32,System.CodeDom.CodeStatement)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["System.CodeDom", "CodeStatementCollection", False, "Remove", "(System.CodeDom.CodeStatement)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.CodeDom", "CodeStatementCollection", False, "get_Item", "(System.Int32)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.CodeDom", "CodeStatementCollection", False, "set_Item", "(System.Int32,System.CodeDom.CodeStatement)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["System.CodeDom", "CodeTryCatchFinallyStatement", False, "CodeTryCatchFinallyStatement", "(System.CodeDom.CodeStatement[],System.CodeDom.CodeCatchClause[])", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["System.CodeDom", "CodeTryCatchFinallyStatement", False, "CodeTryCatchFinallyStatement", "(System.CodeDom.CodeStatement[],System.CodeDom.CodeCatchClause[])", "", "Argument[1].Element", "Argument[this]", "taint", "df-generated"]
-      - ["System.CodeDom", "CodeTryCatchFinallyStatement", False, "CodeTryCatchFinallyStatement", "(System.CodeDom.CodeStatement[],System.CodeDom.CodeCatchClause[],System.CodeDom.CodeStatement[])", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["System.CodeDom", "CodeTryCatchFinallyStatement", False, "CodeTryCatchFinallyStatement", "(System.CodeDom.CodeStatement[],System.CodeDom.CodeCatchClause[],System.CodeDom.CodeStatement[])", "", "Argument[1].Element", "Argument[this]", "taint", "df-generated"]
-      - ["System.CodeDom", "CodeTryCatchFinallyStatement", False, "CodeTryCatchFinallyStatement", "(System.CodeDom.CodeStatement[],System.CodeDom.CodeCatchClause[],System.CodeDom.CodeStatement[])", "", "Argument[2].Element", "Argument[this]", "taint", "df-generated"]
+      - ["System.CodeDom", "CodeStatementCollection", False, "Add", "(System.CodeDom.CodeStatement)", "", "Argument[0]", "Argument[this].Property[System.Collections.CollectionBase.List].Element", "value", "dfc-generated"]
+      - ["System.CodeDom", "CodeStatementCollection", False, "AddRange", "(System.CodeDom.CodeStatementCollection)", "", "Argument[0].Property[System.Collections.CollectionBase.List].Element", "Argument[this].Property[System.Collections.CollectionBase.List].Element", "value", "dfc-generated"]
+      - ["System.CodeDom", "CodeStatementCollection", False, "AddRange", "(System.CodeDom.CodeStatement[])", "", "Argument[0].Element", "Argument[this].Property[System.Collections.CollectionBase.List].Element", "value", "dfc-generated"]
+      - ["System.CodeDom", "CodeStatementCollection", False, "CodeStatementCollection", "(System.CodeDom.CodeStatementCollection)", "", "Argument[0].Property[System.Collections.CollectionBase.List].Element", "Argument[this].Property[System.Collections.CollectionBase.List].Element", "value", "dfc-generated"]
+      - ["System.CodeDom", "CodeStatementCollection", False, "CodeStatementCollection", "(System.CodeDom.CodeStatement[])", "", "Argument[0].Element", "Argument[this].Property[System.Collections.CollectionBase.List].Element", "value", "dfc-generated"]
+      - ["System.CodeDom", "CodeStatementCollection", False, "CopyTo", "(System.CodeDom.CodeStatement[],System.Int32)", "", "Argument[this].Property[System.Collections.CollectionBase.List].Element", "Argument[0].Element", "value", "dfc-generated"]
+      - ["System.CodeDom", "CodeStatementCollection", False, "Insert", "(System.Int32,System.CodeDom.CodeStatement)", "", "Argument[1]", "Argument[this].Property[System.Collections.CollectionBase.List].Element", "value", "dfc-generated"]
+      - ["System.CodeDom", "CodeStatementCollection", False, "get_Item", "(System.Int32)", "", "Argument[this].Property[System.Collections.CollectionBase.List].Element", "ReturnValue", "value", "dfc-generated"]
+      - ["System.CodeDom", "CodeStatementCollection", False, "set_Item", "(System.Int32,System.CodeDom.CodeStatement)", "", "Argument[1]", "Argument[this].Property[System.Collections.CollectionBase.List].Element", "value", "dfc-generated"]
       - ["System.CodeDom", "CodeTypeDeclaration", False, "CodeTypeDeclaration", "(System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.CodeDom", "CodeTypeDeclaration", False, "get_BaseTypes", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.CodeDom", "CodeTypeDeclaration", False, "get_Members", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.CodeDom", "CodeTypeDeclarationCollection", False, "Add", "(System.CodeDom.CodeTypeDeclaration)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.CodeDom", "CodeTypeDeclarationCollection", False, "AddRange", "(System.CodeDom.CodeTypeDeclarationCollection)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["System.CodeDom", "CodeTypeDeclarationCollection", False, "AddRange", "(System.CodeDom.CodeTypeDeclaration[])", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["System.CodeDom", "CodeTypeDeclarationCollection", False, "CodeTypeDeclarationCollection", "(System.CodeDom.CodeTypeDeclarationCollection)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["System.CodeDom", "CodeTypeDeclarationCollection", False, "CodeTypeDeclarationCollection", "(System.CodeDom.CodeTypeDeclaration[])", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["System.CodeDom", "CodeTypeDeclarationCollection", False, "CopyTo", "(System.CodeDom.CodeTypeDeclaration[],System.Int32)", "", "Argument[this]", "Argument[0].Element", "taint", "df-generated"]
-      - ["System.CodeDom", "CodeTypeDeclarationCollection", False, "Insert", "(System.Int32,System.CodeDom.CodeTypeDeclaration)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["System.CodeDom", "CodeTypeDeclarationCollection", False, "Remove", "(System.CodeDom.CodeTypeDeclaration)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.CodeDom", "CodeTypeDeclarationCollection", False, "get_Item", "(System.Int32)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.CodeDom", "CodeTypeDeclarationCollection", False, "set_Item", "(System.Int32,System.CodeDom.CodeTypeDeclaration)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["System.CodeDom", "CodeTypeDeclarationCollection", False, "Add", "(System.CodeDom.CodeTypeDeclaration)", "", "Argument[0]", "Argument[this].Property[System.Collections.CollectionBase.List].Element", "value", "dfc-generated"]
+      - ["System.CodeDom", "CodeTypeDeclarationCollection", False, "AddRange", "(System.CodeDom.CodeTypeDeclarationCollection)", "", "Argument[0].Property[System.Collections.CollectionBase.List].Element", "Argument[this].Property[System.Collections.CollectionBase.List].Element", "value", "dfc-generated"]
+      - ["System.CodeDom", "CodeTypeDeclarationCollection", False, "AddRange", "(System.CodeDom.CodeTypeDeclaration[])", "", "Argument[0].Element", "Argument[this].Property[System.Collections.CollectionBase.List].Element", "value", "dfc-generated"]
+      - ["System.CodeDom", "CodeTypeDeclarationCollection", False, "CodeTypeDeclarationCollection", "(System.CodeDom.CodeTypeDeclarationCollection)", "", "Argument[0].Property[System.Collections.CollectionBase.List].Element", "Argument[this].Property[System.Collections.CollectionBase.List].Element", "value", "dfc-generated"]
+      - ["System.CodeDom", "CodeTypeDeclarationCollection", False, "CodeTypeDeclarationCollection", "(System.CodeDom.CodeTypeDeclaration[])", "", "Argument[0].Element", "Argument[this].Property[System.Collections.CollectionBase.List].Element", "value", "dfc-generated"]
+      - ["System.CodeDom", "CodeTypeDeclarationCollection", False, "CopyTo", "(System.CodeDom.CodeTypeDeclaration[],System.Int32)", "", "Argument[this].Property[System.Collections.CollectionBase.List].Element", "Argument[0].Element", "value", "dfc-generated"]
+      - ["System.CodeDom", "CodeTypeDeclarationCollection", False, "Insert", "(System.Int32,System.CodeDom.CodeTypeDeclaration)", "", "Argument[1]", "Argument[this].Property[System.Collections.CollectionBase.List].Element", "value", "dfc-generated"]
+      - ["System.CodeDom", "CodeTypeDeclarationCollection", False, "get_Item", "(System.Int32)", "", "Argument[this].Property[System.Collections.CollectionBase.List].Element", "ReturnValue", "value", "dfc-generated"]
+      - ["System.CodeDom", "CodeTypeDeclarationCollection", False, "set_Item", "(System.Int32,System.CodeDom.CodeTypeDeclaration)", "", "Argument[1]", "Argument[this].Property[System.Collections.CollectionBase.List].Element", "value", "dfc-generated"]
       - ["System.CodeDom", "CodeTypeDelegate", False, "CodeTypeDelegate", "(System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.CodeDom", "CodeTypeMemberCollection", False, "Add", "(System.CodeDom.CodeTypeMember)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.CodeDom", "CodeTypeMemberCollection", False, "AddRange", "(System.CodeDom.CodeTypeMemberCollection)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["System.CodeDom", "CodeTypeMemberCollection", False, "AddRange", "(System.CodeDom.CodeTypeMember[])", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["System.CodeDom", "CodeTypeMemberCollection", False, "CodeTypeMemberCollection", "(System.CodeDom.CodeTypeMemberCollection)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["System.CodeDom", "CodeTypeMemberCollection", False, "CodeTypeMemberCollection", "(System.CodeDom.CodeTypeMember[])", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["System.CodeDom", "CodeTypeMemberCollection", False, "CopyTo", "(System.CodeDom.CodeTypeMember[],System.Int32)", "", "Argument[this]", "Argument[0].Element", "taint", "df-generated"]
-      - ["System.CodeDom", "CodeTypeMemberCollection", False, "Insert", "(System.Int32,System.CodeDom.CodeTypeMember)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["System.CodeDom", "CodeTypeMemberCollection", False, "Remove", "(System.CodeDom.CodeTypeMember)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.CodeDom", "CodeTypeMemberCollection", False, "get_Item", "(System.Int32)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.CodeDom", "CodeTypeMemberCollection", False, "set_Item", "(System.Int32,System.CodeDom.CodeTypeMember)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["System.CodeDom", "CodeTypeMemberCollection", False, "Add", "(System.CodeDom.CodeTypeMember)", "", "Argument[0]", "Argument[this].Property[System.Collections.CollectionBase.List].Element", "value", "dfc-generated"]
+      - ["System.CodeDom", "CodeTypeMemberCollection", False, "AddRange", "(System.CodeDom.CodeTypeMemberCollection)", "", "Argument[0].Property[System.Collections.CollectionBase.List].Element", "Argument[this].Property[System.Collections.CollectionBase.List].Element", "value", "dfc-generated"]
+      - ["System.CodeDom", "CodeTypeMemberCollection", False, "AddRange", "(System.CodeDom.CodeTypeMember[])", "", "Argument[0].Element", "Argument[this].Property[System.Collections.CollectionBase.List].Element", "value", "dfc-generated"]
+      - ["System.CodeDom", "CodeTypeMemberCollection", False, "CodeTypeMemberCollection", "(System.CodeDom.CodeTypeMemberCollection)", "", "Argument[0].Property[System.Collections.CollectionBase.List].Element", "Argument[this].Property[System.Collections.CollectionBase.List].Element", "value", "dfc-generated"]
+      - ["System.CodeDom", "CodeTypeMemberCollection", False, "CodeTypeMemberCollection", "(System.CodeDom.CodeTypeMember[])", "", "Argument[0].Element", "Argument[this].Property[System.Collections.CollectionBase.List].Element", "value", "dfc-generated"]
+      - ["System.CodeDom", "CodeTypeMemberCollection", False, "CopyTo", "(System.CodeDom.CodeTypeMember[],System.Int32)", "", "Argument[this].Property[System.Collections.CollectionBase.List].Element", "Argument[0].Element", "value", "dfc-generated"]
+      - ["System.CodeDom", "CodeTypeMemberCollection", False, "Insert", "(System.Int32,System.CodeDom.CodeTypeMember)", "", "Argument[1]", "Argument[this].Property[System.Collections.CollectionBase.List].Element", "value", "dfc-generated"]
+      - ["System.CodeDom", "CodeTypeMemberCollection", False, "get_Item", "(System.Int32)", "", "Argument[this].Property[System.Collections.CollectionBase.List].Element", "ReturnValue", "value", "dfc-generated"]
+      - ["System.CodeDom", "CodeTypeMemberCollection", False, "set_Item", "(System.Int32,System.CodeDom.CodeTypeMember)", "", "Argument[1]", "Argument[this].Property[System.Collections.CollectionBase.List].Element", "value", "dfc-generated"]
       - ["System.CodeDom", "CodeTypeOfExpression", False, "CodeTypeOfExpression", "(System.CodeDom.CodeTypeReference)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.CodeDom", "CodeTypeOfExpression", False, "CodeTypeOfExpression", "(System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.CodeDom", "CodeTypeParameter", False, "CodeTypeParameter", "(System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.CodeDom", "CodeTypeParameterCollection", False, "Add", "(System.CodeDom.CodeTypeParameter)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.CodeDom", "CodeTypeParameterCollection", False, "Add", "(System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.CodeDom", "CodeTypeParameterCollection", False, "AddRange", "(System.CodeDom.CodeTypeParameterCollection)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["System.CodeDom", "CodeTypeParameterCollection", False, "AddRange", "(System.CodeDom.CodeTypeParameter[])", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["System.CodeDom", "CodeTypeParameterCollection", False, "CodeTypeParameterCollection", "(System.CodeDom.CodeTypeParameterCollection)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["System.CodeDom", "CodeTypeParameterCollection", False, "CodeTypeParameterCollection", "(System.CodeDom.CodeTypeParameter[])", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["System.CodeDom", "CodeTypeParameterCollection", False, "CopyTo", "(System.CodeDom.CodeTypeParameter[],System.Int32)", "", "Argument[this]", "Argument[0].Element", "taint", "df-generated"]
-      - ["System.CodeDom", "CodeTypeParameterCollection", False, "Insert", "(System.Int32,System.CodeDom.CodeTypeParameter)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["System.CodeDom", "CodeTypeParameterCollection", False, "Remove", "(System.CodeDom.CodeTypeParameter)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.CodeDom", "CodeTypeParameterCollection", False, "get_Item", "(System.Int32)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.CodeDom", "CodeTypeParameterCollection", False, "set_Item", "(System.Int32,System.CodeDom.CodeTypeParameter)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["System.CodeDom", "CodeTypeParameterCollection", False, "Add", "(System.CodeDom.CodeTypeParameter)", "", "Argument[0]", "Argument[this].Property[System.Collections.CollectionBase.List].Element", "value", "dfc-generated"]
+      - ["System.CodeDom", "CodeTypeParameterCollection", False, "AddRange", "(System.CodeDom.CodeTypeParameterCollection)", "", "Argument[0].Property[System.Collections.CollectionBase.List].Element", "Argument[this].Property[System.Collections.CollectionBase.List].Element", "value", "dfc-generated"]
+      - ["System.CodeDom", "CodeTypeParameterCollection", False, "AddRange", "(System.CodeDom.CodeTypeParameter[])", "", "Argument[0].Element", "Argument[this].Property[System.Collections.CollectionBase.List].Element", "value", "dfc-generated"]
+      - ["System.CodeDom", "CodeTypeParameterCollection", False, "CodeTypeParameterCollection", "(System.CodeDom.CodeTypeParameterCollection)", "", "Argument[0].Property[System.Collections.CollectionBase.List].Element", "Argument[this].Property[System.Collections.CollectionBase.List].Element", "value", "dfc-generated"]
+      - ["System.CodeDom", "CodeTypeParameterCollection", False, "CodeTypeParameterCollection", "(System.CodeDom.CodeTypeParameter[])", "", "Argument[0].Element", "Argument[this].Property[System.Collections.CollectionBase.List].Element", "value", "dfc-generated"]
+      - ["System.CodeDom", "CodeTypeParameterCollection", False, "CopyTo", "(System.CodeDom.CodeTypeParameter[],System.Int32)", "", "Argument[this].Property[System.Collections.CollectionBase.List].Element", "Argument[0].Element", "value", "dfc-generated"]
+      - ["System.CodeDom", "CodeTypeParameterCollection", False, "Insert", "(System.Int32,System.CodeDom.CodeTypeParameter)", "", "Argument[1]", "Argument[this].Property[System.Collections.CollectionBase.List].Element", "value", "dfc-generated"]
+      - ["System.CodeDom", "CodeTypeParameterCollection", False, "get_Item", "(System.Int32)", "", "Argument[this].Property[System.Collections.CollectionBase.List].Element", "ReturnValue", "value", "dfc-generated"]
+      - ["System.CodeDom", "CodeTypeParameterCollection", False, "set_Item", "(System.Int32,System.CodeDom.CodeTypeParameter)", "", "Argument[1]", "Argument[this].Property[System.Collections.CollectionBase.List].Element", "value", "dfc-generated"]
       - ["System.CodeDom", "CodeTypeReference", False, "CodeTypeReference", "(System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.CodeDom", "CodeTypeReference", False, "CodeTypeReference", "(System.String,System.CodeDom.CodeTypeReferenceOptions)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.CodeDom", "CodeTypeReference", False, "CodeTypeReference", "(System.String,System.CodeDom.CodeTypeReference[])", "", "Argument[1].Element", "Argument[this]", "taint", "df-generated"]
-      - ["System.CodeDom", "CodeTypeReference", False, "get_TypeArguments", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.CodeDom", "CodeTypeReferenceCollection", False, "Add", "(System.CodeDom.CodeTypeReference)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.CodeDom", "CodeTypeReferenceCollection", False, "Add", "(System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.CodeDom", "CodeTypeReferenceCollection", False, "AddRange", "(System.CodeDom.CodeTypeReferenceCollection)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["System.CodeDom", "CodeTypeReferenceCollection", False, "AddRange", "(System.CodeDom.CodeTypeReference[])", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["System.CodeDom", "CodeTypeReferenceCollection", False, "CodeTypeReferenceCollection", "(System.CodeDom.CodeTypeReferenceCollection)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["System.CodeDom", "CodeTypeReferenceCollection", False, "CodeTypeReferenceCollection", "(System.CodeDom.CodeTypeReference[])", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["System.CodeDom", "CodeTypeReferenceCollection", False, "CopyTo", "(System.CodeDom.CodeTypeReference[],System.Int32)", "", "Argument[this]", "Argument[0].Element", "taint", "df-generated"]
-      - ["System.CodeDom", "CodeTypeReferenceCollection", False, "Insert", "(System.Int32,System.CodeDom.CodeTypeReference)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["System.CodeDom", "CodeTypeReferenceCollection", False, "Remove", "(System.CodeDom.CodeTypeReference)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.CodeDom", "CodeTypeReferenceCollection", False, "get_Item", "(System.Int32)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.CodeDom", "CodeTypeReferenceCollection", False, "set_Item", "(System.Int32,System.CodeDom.CodeTypeReference)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["System.CodeDom", "CodeTypeReference", False, "get_TypeArguments", "()", "", "Argument[this].Property[System.CodeDom.CodeTypeReference.ArrayElementType].Property[System.CodeDom.CodeTypeReference.TypeArguments]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.CodeDom", "CodeTypeReferenceCollection", False, "Add", "(System.CodeDom.CodeTypeReference)", "", "Argument[0]", "Argument[this].Property[System.Collections.CollectionBase.List].Element", "value", "dfc-generated"]
+      - ["System.CodeDom", "CodeTypeReferenceCollection", False, "AddRange", "(System.CodeDom.CodeTypeReferenceCollection)", "", "Argument[0].Property[System.Collections.CollectionBase.List].Element", "Argument[this].Property[System.Collections.CollectionBase.List].Element", "value", "dfc-generated"]
+      - ["System.CodeDom", "CodeTypeReferenceCollection", False, "AddRange", "(System.CodeDom.CodeTypeReference[])", "", "Argument[0].Element", "Argument[this].Property[System.Collections.CollectionBase.List].Element", "value", "dfc-generated"]
+      - ["System.CodeDom", "CodeTypeReferenceCollection", False, "CodeTypeReferenceCollection", "(System.CodeDom.CodeTypeReferenceCollection)", "", "Argument[0].Property[System.Collections.CollectionBase.List].Element", "Argument[this].Property[System.Collections.CollectionBase.List].Element", "value", "dfc-generated"]
+      - ["System.CodeDom", "CodeTypeReferenceCollection", False, "CodeTypeReferenceCollection", "(System.CodeDom.CodeTypeReference[])", "", "Argument[0].Element", "Argument[this].Property[System.Collections.CollectionBase.List].Element", "value", "dfc-generated"]
+      - ["System.CodeDom", "CodeTypeReferenceCollection", False, "CopyTo", "(System.CodeDom.CodeTypeReference[],System.Int32)", "", "Argument[this].Property[System.Collections.CollectionBase.List].Element", "Argument[0].Element", "value", "dfc-generated"]
+      - ["System.CodeDom", "CodeTypeReferenceCollection", False, "Insert", "(System.Int32,System.CodeDom.CodeTypeReference)", "", "Argument[1]", "Argument[this].Property[System.Collections.CollectionBase.List].Element", "value", "dfc-generated"]
+      - ["System.CodeDom", "CodeTypeReferenceCollection", False, "get_Item", "(System.Int32)", "", "Argument[this].Property[System.Collections.CollectionBase.List].Element", "ReturnValue", "value", "dfc-generated"]
+      - ["System.CodeDom", "CodeTypeReferenceCollection", False, "set_Item", "(System.Int32,System.CodeDom.CodeTypeReference)", "", "Argument[1]", "Argument[this].Property[System.Collections.CollectionBase.List].Element", "value", "dfc-generated"]
       - ["System.CodeDom", "CodeTypeReferenceExpression", False, "CodeTypeReferenceExpression", "(System.CodeDom.CodeTypeReference)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.CodeDom", "CodeTypeReferenceExpression", False, "CodeTypeReferenceExpression", "(System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.CodeDom", "CodeVariableDeclarationStatement", False, "CodeVariableDeclarationStatement", "(System.CodeDom.CodeTypeReference,System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.CodeDom", "CodeVariableDeclarationStatement", False, "CodeVariableDeclarationStatement", "(System.CodeDom.CodeTypeReference,System.String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
       - ["System.CodeDom", "CodeVariableDeclarationStatement", False, "CodeVariableDeclarationStatement", "(System.CodeDom.CodeTypeReference,System.String,System.CodeDom.CodeExpression)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.CodeDom", "CodeVariableDeclarationStatement", False, "CodeVariableDeclarationStatement", "(System.CodeDom.CodeTypeReference,System.String,System.CodeDom.CodeExpression)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["System.CodeDom", "CodeVariableDeclarationStatement", False, "CodeVariableDeclarationStatement", "(System.String,System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.CodeDom", "CodeVariableDeclarationStatement", False, "CodeVariableDeclarationStatement", "(System.String,System.String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["System.CodeDom", "CodeVariableDeclarationStatement", False, "CodeVariableDeclarationStatement", "(System.String,System.String,System.CodeDom.CodeExpression)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.CodeDom", "CodeVariableDeclarationStatement", False, "CodeVariableDeclarationStatement", "(System.String,System.String,System.CodeDom.CodeExpression)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
       - ["System.CodeDom", "CodeVariableDeclarationStatement", False, "CodeVariableDeclarationStatement", "(System.Type,System.String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
       - ["System.CodeDom", "CodeVariableDeclarationStatement", False, "CodeVariableDeclarationStatement", "(System.Type,System.String,System.CodeDom.CodeExpression)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
@@ -259,99 +206,151 @@ extensions:
       pack: codeql/csharp-all
       extensible: neutralModel
     data:
+      - ["System.CodeDom", "CodeArrayCreateExpression", "CodeArrayCreateExpression", "(System.String,System.CodeDom.CodeExpression)", "summary", "df-generated"]
+      - ["System.CodeDom", "CodeArrayCreateExpression", "CodeArrayCreateExpression", "(System.String,System.CodeDom.CodeExpression[])", "summary", "df-generated"]
+      - ["System.CodeDom", "CodeArrayCreateExpression", "CodeArrayCreateExpression", "(System.String,System.Int32)", "summary", "df-generated"]
       - ["System.CodeDom", "CodeArrayCreateExpression", "CodeArrayCreateExpression", "(System.Type,System.CodeDom.CodeExpression)", "summary", "df-generated"]
+      - ["System.CodeDom", "CodeArrayCreateExpression", "CodeArrayCreateExpression", "(System.Type,System.CodeDom.CodeExpression[])", "summary", "df-generated"]
       - ["System.CodeDom", "CodeArrayCreateExpression", "CodeArrayCreateExpression", "(System.Type,System.Int32)", "summary", "df-generated"]
+      - ["System.CodeDom", "CodeArrayIndexerExpression", "CodeArrayIndexerExpression", "(System.CodeDom.CodeExpression,System.CodeDom.CodeExpression[])", "summary", "df-generated"]
       - ["System.CodeDom", "CodeArrayIndexerExpression", "get_Indices", "()", "summary", "df-generated"]
       - ["System.CodeDom", "CodeAssignStatement", "CodeAssignStatement", "(System.CodeDom.CodeExpression,System.CodeDom.CodeExpression)", "summary", "df-generated"]
       - ["System.CodeDom", "CodeAttachEventStatement", "CodeAttachEventStatement", "(System.CodeDom.CodeExpression,System.String,System.CodeDom.CodeExpression)", "summary", "df-generated"]
       - ["System.CodeDom", "CodeAttributeArgument", "CodeAttributeArgument", "(System.CodeDom.CodeExpression)", "summary", "df-generated"]
       - ["System.CodeDom", "CodeAttributeArgumentCollection", "Contains", "(System.CodeDom.CodeAttributeArgument)", "summary", "df-generated"]
       - ["System.CodeDom", "CodeAttributeArgumentCollection", "IndexOf", "(System.CodeDom.CodeAttributeArgument)", "summary", "df-generated"]
+      - ["System.CodeDom", "CodeAttributeArgumentCollection", "Remove", "(System.CodeDom.CodeAttributeArgument)", "summary", "df-generated"]
       - ["System.CodeDom", "CodeAttributeDeclaration", "CodeAttributeDeclaration", "(System.CodeDom.CodeTypeReference)", "summary", "df-generated"]
       - ["System.CodeDom", "CodeAttributeDeclarationCollection", "Contains", "(System.CodeDom.CodeAttributeDeclaration)", "summary", "df-generated"]
       - ["System.CodeDom", "CodeAttributeDeclarationCollection", "IndexOf", "(System.CodeDom.CodeAttributeDeclaration)", "summary", "df-generated"]
+      - ["System.CodeDom", "CodeAttributeDeclarationCollection", "Remove", "(System.CodeDom.CodeAttributeDeclaration)", "summary", "df-generated"]
       - ["System.CodeDom", "CodeBinaryOperatorExpression", "CodeBinaryOperatorExpression", "(System.CodeDom.CodeExpression,System.CodeDom.CodeBinaryOperatorType,System.CodeDom.CodeExpression)", "summary", "df-generated"]
+      - ["System.CodeDom", "CodeCastExpression", "CodeCastExpression", "(System.String,System.CodeDom.CodeExpression)", "summary", "df-generated"]
       - ["System.CodeDom", "CodeCastExpression", "CodeCastExpression", "(System.Type,System.CodeDom.CodeExpression)", "summary", "df-generated"]
       - ["System.CodeDom", "CodeCatchClause", "get_Statements", "()", "summary", "df-generated"]
       - ["System.CodeDom", "CodeCatchClauseCollection", "Contains", "(System.CodeDom.CodeCatchClause)", "summary", "df-generated"]
       - ["System.CodeDom", "CodeCatchClauseCollection", "IndexOf", "(System.CodeDom.CodeCatchClause)", "summary", "df-generated"]
+      - ["System.CodeDom", "CodeCatchClauseCollection", "Remove", "(System.CodeDom.CodeCatchClause)", "summary", "df-generated"]
       - ["System.CodeDom", "CodeCommentStatement", "CodeCommentStatement", "(System.CodeDom.CodeComment)", "summary", "df-generated"]
       - ["System.CodeDom", "CodeCommentStatement", "CodeCommentStatement", "(System.String)", "summary", "df-generated"]
       - ["System.CodeDom", "CodeCommentStatement", "CodeCommentStatement", "(System.String,System.Boolean)", "summary", "df-generated"]
       - ["System.CodeDom", "CodeCommentStatementCollection", "Contains", "(System.CodeDom.CodeCommentStatement)", "summary", "df-generated"]
       - ["System.CodeDom", "CodeCommentStatementCollection", "IndexOf", "(System.CodeDom.CodeCommentStatement)", "summary", "df-generated"]
+      - ["System.CodeDom", "CodeCommentStatementCollection", "Remove", "(System.CodeDom.CodeCommentStatement)", "summary", "df-generated"]
       - ["System.CodeDom", "CodeCompileUnit", "get_AssemblyCustomAttributes", "()", "summary", "df-generated"]
       - ["System.CodeDom", "CodeCompileUnit", "get_EndDirectives", "()", "summary", "df-generated"]
       - ["System.CodeDom", "CodeCompileUnit", "get_Namespaces", "()", "summary", "df-generated"]
       - ["System.CodeDom", "CodeCompileUnit", "get_ReferencedAssemblies", "()", "summary", "df-generated"]
       - ["System.CodeDom", "CodeCompileUnit", "get_StartDirectives", "()", "summary", "df-generated"]
+      - ["System.CodeDom", "CodeConditionStatement", "CodeConditionStatement", "(System.CodeDom.CodeExpression,System.CodeDom.CodeStatement[])", "summary", "df-generated"]
+      - ["System.CodeDom", "CodeConditionStatement", "CodeConditionStatement", "(System.CodeDom.CodeExpression,System.CodeDom.CodeStatement[],System.CodeDom.CodeStatement[])", "summary", "df-generated"]
       - ["System.CodeDom", "CodeConditionStatement", "get_FalseStatements", "()", "summary", "df-generated"]
       - ["System.CodeDom", "CodeConditionStatement", "get_TrueStatements", "()", "summary", "df-generated"]
       - ["System.CodeDom", "CodeConstructor", "get_BaseConstructorArgs", "()", "summary", "df-generated"]
       - ["System.CodeDom", "CodeConstructor", "get_ChainedConstructorArgs", "()", "summary", "df-generated"]
       - ["System.CodeDom", "CodeDelegateInvokeExpression", "CodeDelegateInvokeExpression", "(System.CodeDom.CodeExpression)", "summary", "df-generated"]
+      - ["System.CodeDom", "CodeDelegateInvokeExpression", "CodeDelegateInvokeExpression", "(System.CodeDom.CodeExpression,System.CodeDom.CodeExpression[])", "summary", "df-generated"]
       - ["System.CodeDom", "CodeDelegateInvokeExpression", "get_Parameters", "()", "summary", "df-generated"]
       - ["System.CodeDom", "CodeDirectionExpression", "CodeDirectionExpression", "(System.CodeDom.FieldDirection,System.CodeDom.CodeExpression)", "summary", "df-generated"]
       - ["System.CodeDom", "CodeDirectiveCollection", "Contains", "(System.CodeDom.CodeDirective)", "summary", "df-generated"]
       - ["System.CodeDom", "CodeDirectiveCollection", "IndexOf", "(System.CodeDom.CodeDirective)", "summary", "df-generated"]
+      - ["System.CodeDom", "CodeDirectiveCollection", "Remove", "(System.CodeDom.CodeDirective)", "summary", "df-generated"]
       - ["System.CodeDom", "CodeExpressionCollection", "Contains", "(System.CodeDom.CodeExpression)", "summary", "df-generated"]
       - ["System.CodeDom", "CodeExpressionCollection", "IndexOf", "(System.CodeDom.CodeExpression)", "summary", "df-generated"]
+      - ["System.CodeDom", "CodeExpressionCollection", "Remove", "(System.CodeDom.CodeExpression)", "summary", "df-generated"]
       - ["System.CodeDom", "CodeExpressionStatement", "CodeExpressionStatement", "(System.CodeDom.CodeExpression)", "summary", "df-generated"]
+      - ["System.CodeDom", "CodeIndexerExpression", "CodeIndexerExpression", "(System.CodeDom.CodeExpression,System.CodeDom.CodeExpression[])", "summary", "df-generated"]
       - ["System.CodeDom", "CodeIndexerExpression", "get_Indices", "()", "summary", "df-generated"]
+      - ["System.CodeDom", "CodeIterationStatement", "CodeIterationStatement", "(System.CodeDom.CodeStatement,System.CodeDom.CodeExpression,System.CodeDom.CodeStatement,System.CodeDom.CodeStatement[])", "summary", "df-generated"]
       - ["System.CodeDom", "CodeIterationStatement", "get_Statements", "()", "summary", "df-generated"]
       - ["System.CodeDom", "CodeMemberEvent", "get_ImplementationTypes", "()", "summary", "df-generated"]
+      - ["System.CodeDom", "CodeMemberMethod", "add_PopulateImplementationTypes", "(System.EventHandler)", "summary", "df-generated"]
+      - ["System.CodeDom", "CodeMemberMethod", "add_PopulateParameters", "(System.EventHandler)", "summary", "df-generated"]
+      - ["System.CodeDom", "CodeMemberMethod", "add_PopulateStatements", "(System.EventHandler)", "summary", "df-generated"]
       - ["System.CodeDom", "CodeMemberMethod", "get_ReturnTypeCustomAttributes", "()", "summary", "df-generated"]
       - ["System.CodeDom", "CodeMemberMethod", "get_TypeParameters", "()", "summary", "df-generated"]
+      - ["System.CodeDom", "CodeMemberMethod", "remove_PopulateImplementationTypes", "(System.EventHandler)", "summary", "df-generated"]
+      - ["System.CodeDom", "CodeMemberMethod", "remove_PopulateParameters", "(System.EventHandler)", "summary", "df-generated"]
+      - ["System.CodeDom", "CodeMemberMethod", "remove_PopulateStatements", "(System.EventHandler)", "summary", "df-generated"]
       - ["System.CodeDom", "CodeMemberProperty", "get_GetStatements", "()", "summary", "df-generated"]
       - ["System.CodeDom", "CodeMemberProperty", "get_ImplementationTypes", "()", "summary", "df-generated"]
       - ["System.CodeDom", "CodeMemberProperty", "get_Parameters", "()", "summary", "df-generated"]
       - ["System.CodeDom", "CodeMemberProperty", "get_SetStatements", "()", "summary", "df-generated"]
+      - ["System.CodeDom", "CodeMethodInvokeExpression", "CodeMethodInvokeExpression", "(System.CodeDom.CodeExpression,System.String,System.CodeDom.CodeExpression[])", "summary", "df-generated"]
       - ["System.CodeDom", "CodeMethodInvokeExpression", "get_Parameters", "()", "summary", "df-generated"]
       - ["System.CodeDom", "CodeMethodReferenceExpression", "get_TypeArguments", "()", "summary", "df-generated"]
       - ["System.CodeDom", "CodeMethodReturnStatement", "CodeMethodReturnStatement", "(System.CodeDom.CodeExpression)", "summary", "df-generated"]
+      - ["System.CodeDom", "CodeNamespace", "add_PopulateComments", "(System.EventHandler)", "summary", "df-generated"]
+      - ["System.CodeDom", "CodeNamespace", "add_PopulateImports", "(System.EventHandler)", "summary", "df-generated"]
+      - ["System.CodeDom", "CodeNamespace", "add_PopulateTypes", "(System.EventHandler)", "summary", "df-generated"]
+      - ["System.CodeDom", "CodeNamespace", "remove_PopulateComments", "(System.EventHandler)", "summary", "df-generated"]
+      - ["System.CodeDom", "CodeNamespace", "remove_PopulateImports", "(System.EventHandler)", "summary", "df-generated"]
+      - ["System.CodeDom", "CodeNamespace", "remove_PopulateTypes", "(System.EventHandler)", "summary", "df-generated"]
       - ["System.CodeDom", "CodeNamespaceCollection", "Contains", "(System.CodeDom.CodeNamespace)", "summary", "df-generated"]
       - ["System.CodeDom", "CodeNamespaceCollection", "IndexOf", "(System.CodeDom.CodeNamespace)", "summary", "df-generated"]
+      - ["System.CodeDom", "CodeNamespaceCollection", "Remove", "(System.CodeDom.CodeNamespace)", "summary", "df-generated"]
       - ["System.CodeDom", "CodeNamespaceImportCollection", "Contains", "(System.Object)", "summary", "df-generated"]
       - ["System.CodeDom", "CodeNamespaceImportCollection", "IndexOf", "(System.Object)", "summary", "df-generated"]
+      - ["System.CodeDom", "CodeNamespaceImportCollection", "Remove", "(System.Object)", "summary", "df-generated"]
       - ["System.CodeDom", "CodeNamespaceImportCollection", "RemoveAt", "(System.Int32)", "summary", "df-generated"]
       - ["System.CodeDom", "CodeNamespaceImportCollection", "get_Count", "()", "summary", "df-generated"]
       - ["System.CodeDom", "CodeNamespaceImportCollection", "get_IsFixedSize", "()", "summary", "df-generated"]
       - ["System.CodeDom", "CodeNamespaceImportCollection", "get_IsReadOnly", "()", "summary", "df-generated"]
       - ["System.CodeDom", "CodeNamespaceImportCollection", "get_IsSynchronized", "()", "summary", "df-generated"]
       - ["System.CodeDom", "CodeObject", "get_UserData", "()", "summary", "df-generated"]
+      - ["System.CodeDom", "CodeObjectCreateExpression", "CodeObjectCreateExpression", "(System.String,System.CodeDom.CodeExpression[])", "summary", "df-generated"]
+      - ["System.CodeDom", "CodeObjectCreateExpression", "CodeObjectCreateExpression", "(System.Type,System.CodeDom.CodeExpression[])", "summary", "df-generated"]
       - ["System.CodeDom", "CodeObjectCreateExpression", "get_Parameters", "()", "summary", "df-generated"]
       - ["System.CodeDom", "CodeParameterDeclarationExpressionCollection", "Contains", "(System.CodeDom.CodeParameterDeclarationExpression)", "summary", "df-generated"]
       - ["System.CodeDom", "CodeParameterDeclarationExpressionCollection", "IndexOf", "(System.CodeDom.CodeParameterDeclarationExpression)", "summary", "df-generated"]
+      - ["System.CodeDom", "CodeParameterDeclarationExpressionCollection", "Remove", "(System.CodeDom.CodeParameterDeclarationExpression)", "summary", "df-generated"]
       - ["System.CodeDom", "CodePrimitiveExpression", "CodePrimitiveExpression", "(System.Object)", "summary", "df-generated"]
+      - ["System.CodeDom", "CodeRemoveEventStatement", "CodeRemoveEventStatement", "(System.CodeDom.CodeExpression,System.String,System.CodeDom.CodeExpression)", "summary", "df-generated"]
       - ["System.CodeDom", "CodeStatement", "get_EndDirectives", "()", "summary", "df-generated"]
       - ["System.CodeDom", "CodeStatement", "get_StartDirectives", "()", "summary", "df-generated"]
       - ["System.CodeDom", "CodeStatementCollection", "Add", "(System.CodeDom.CodeExpression)", "summary", "df-generated"]
       - ["System.CodeDom", "CodeStatementCollection", "Contains", "(System.CodeDom.CodeStatement)", "summary", "df-generated"]
       - ["System.CodeDom", "CodeStatementCollection", "IndexOf", "(System.CodeDom.CodeStatement)", "summary", "df-generated"]
+      - ["System.CodeDom", "CodeStatementCollection", "Remove", "(System.CodeDom.CodeStatement)", "summary", "df-generated"]
       - ["System.CodeDom", "CodeThrowExceptionStatement", "CodeThrowExceptionStatement", "(System.CodeDom.CodeExpression)", "summary", "df-generated"]
+      - ["System.CodeDom", "CodeTryCatchFinallyStatement", "CodeTryCatchFinallyStatement", "(System.CodeDom.CodeStatement[],System.CodeDom.CodeCatchClause[])", "summary", "df-generated"]
+      - ["System.CodeDom", "CodeTryCatchFinallyStatement", "CodeTryCatchFinallyStatement", "(System.CodeDom.CodeStatement[],System.CodeDom.CodeCatchClause[],System.CodeDom.CodeStatement[])", "summary", "df-generated"]
       - ["System.CodeDom", "CodeTryCatchFinallyStatement", "get_CatchClauses", "()", "summary", "df-generated"]
       - ["System.CodeDom", "CodeTryCatchFinallyStatement", "get_FinallyStatements", "()", "summary", "df-generated"]
       - ["System.CodeDom", "CodeTryCatchFinallyStatement", "get_TryStatements", "()", "summary", "df-generated"]
+      - ["System.CodeDom", "CodeTypeDeclaration", "add_PopulateBaseTypes", "(System.EventHandler)", "summary", "df-generated"]
+      - ["System.CodeDom", "CodeTypeDeclaration", "add_PopulateMembers", "(System.EventHandler)", "summary", "df-generated"]
       - ["System.CodeDom", "CodeTypeDeclaration", "get_TypeParameters", "()", "summary", "df-generated"]
+      - ["System.CodeDom", "CodeTypeDeclaration", "remove_PopulateBaseTypes", "(System.EventHandler)", "summary", "df-generated"]
+      - ["System.CodeDom", "CodeTypeDeclaration", "remove_PopulateMembers", "(System.EventHandler)", "summary", "df-generated"]
       - ["System.CodeDom", "CodeTypeDeclarationCollection", "Contains", "(System.CodeDom.CodeTypeDeclaration)", "summary", "df-generated"]
       - ["System.CodeDom", "CodeTypeDeclarationCollection", "IndexOf", "(System.CodeDom.CodeTypeDeclaration)", "summary", "df-generated"]
+      - ["System.CodeDom", "CodeTypeDeclarationCollection", "Remove", "(System.CodeDom.CodeTypeDeclaration)", "summary", "df-generated"]
       - ["System.CodeDom", "CodeTypeDelegate", "get_Parameters", "()", "summary", "df-generated"]
       - ["System.CodeDom", "CodeTypeMember", "get_Comments", "()", "summary", "df-generated"]
       - ["System.CodeDom", "CodeTypeMember", "get_EndDirectives", "()", "summary", "df-generated"]
       - ["System.CodeDom", "CodeTypeMember", "get_StartDirectives", "()", "summary", "df-generated"]
       - ["System.CodeDom", "CodeTypeMemberCollection", "Contains", "(System.CodeDom.CodeTypeMember)", "summary", "df-generated"]
       - ["System.CodeDom", "CodeTypeMemberCollection", "IndexOf", "(System.CodeDom.CodeTypeMember)", "summary", "df-generated"]
+      - ["System.CodeDom", "CodeTypeMemberCollection", "Remove", "(System.CodeDom.CodeTypeMember)", "summary", "df-generated"]
+      - ["System.CodeDom", "CodeTypeOfExpression", "CodeTypeOfExpression", "(System.String)", "summary", "df-generated"]
       - ["System.CodeDom", "CodeTypeOfExpression", "CodeTypeOfExpression", "(System.Type)", "summary", "df-generated"]
       - ["System.CodeDom", "CodeTypeParameter", "get_Constraints", "()", "summary", "df-generated"]
       - ["System.CodeDom", "CodeTypeParameter", "get_CustomAttributes", "()", "summary", "df-generated"]
+      - ["System.CodeDom", "CodeTypeParameterCollection", "Add", "(System.String)", "summary", "df-generated"]
       - ["System.CodeDom", "CodeTypeParameterCollection", "Contains", "(System.CodeDom.CodeTypeParameter)", "summary", "df-generated"]
       - ["System.CodeDom", "CodeTypeParameterCollection", "IndexOf", "(System.CodeDom.CodeTypeParameter)", "summary", "df-generated"]
+      - ["System.CodeDom", "CodeTypeParameterCollection", "Remove", "(System.CodeDom.CodeTypeParameter)", "summary", "df-generated"]
       - ["System.CodeDom", "CodeTypeReference", "CodeTypeReference", "(System.CodeDom.CodeTypeParameter)", "summary", "df-generated"]
       - ["System.CodeDom", "CodeTypeReference", "CodeTypeReference", "(System.CodeDom.CodeTypeReference,System.Int32)", "summary", "df-generated"]
+      - ["System.CodeDom", "CodeTypeReference", "CodeTypeReference", "(System.String,System.CodeDom.CodeTypeReference[])", "summary", "df-generated"]
       - ["System.CodeDom", "CodeTypeReference", "CodeTypeReference", "(System.String,System.Int32)", "summary", "df-generated"]
       - ["System.CodeDom", "CodeTypeReference", "CodeTypeReference", "(System.Type)", "summary", "df-generated"]
       - ["System.CodeDom", "CodeTypeReference", "CodeTypeReference", "(System.Type,System.CodeDom.CodeTypeReferenceOptions)", "summary", "df-generated"]
+      - ["System.CodeDom", "CodeTypeReferenceCollection", "Add", "(System.String)", "summary", "df-generated"]
       - ["System.CodeDom", "CodeTypeReferenceCollection", "Add", "(System.Type)", "summary", "df-generated"]
       - ["System.CodeDom", "CodeTypeReferenceCollection", "Contains", "(System.CodeDom.CodeTypeReference)", "summary", "df-generated"]
       - ["System.CodeDom", "CodeTypeReferenceCollection", "IndexOf", "(System.CodeDom.CodeTypeReference)", "summary", "df-generated"]
+      - ["System.CodeDom", "CodeTypeReferenceCollection", "Remove", "(System.CodeDom.CodeTypeReference)", "summary", "df-generated"]
+      - ["System.CodeDom", "CodeTypeReferenceExpression", "CodeTypeReferenceExpression", "(System.String)", "summary", "df-generated"]
       - ["System.CodeDom", "CodeTypeReferenceExpression", "CodeTypeReferenceExpression", "(System.Type)", "summary", "df-generated"]
diff --git a/csharp/ql/lib/ext/generated/System.Collections.Concurrent.model.yml b/csharp/ql/lib/ext/generated/System.Collections.Concurrent.model.yml
index 975ddd46a0b..7b3be3d8da6 100644
--- a/csharp/ql/lib/ext/generated/System.Collections.Concurrent.model.yml
+++ b/csharp/ql/lib/ext/generated/System.Collections.Concurrent.model.yml
@@ -12,17 +12,36 @@ extensions:
       - ["System.Collections.Concurrent", "BlockingCollection<T>", False, "TryAdd", "(T,System.Int32,System.Threading.CancellationToken)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Collections.Concurrent", "BlockingCollection<T>", False, "TryAdd", "(T,System.TimeSpan)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Collections.Concurrent", "ConcurrentBag<T>", False, "ToArray", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Collections.Concurrent", "ConcurrentBag<T>", False, "TryAdd", "(T)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["System.Collections.Concurrent", "ConcurrentBag<T>", False, "TryAdd", "(T)", "", "Argument[0]", "Argument[this].Element", "value", "dfc-generated"]
       - ["System.Collections.Concurrent", "ConcurrentBag<T>", False, "TryPeek", "(T)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Collections.Concurrent", "ConcurrentBag<T>", False, "TryTake", "(T)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Collections.Concurrent", "ConcurrentDictionary<TKey,TValue>", False, "GetOrAdd", "(TKey,TValue)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Collections.Concurrent", "ConcurrentDictionary<TKey,TValue>", False, "AddOrUpdate", "(TKey,System.Func<TKey,TValue>,System.Func<TKey,TValue,TValue>)", "", "Argument[0]", "Argument[1].Parameter[0]", "value", "dfc-generated"]
+      - ["System.Collections.Concurrent", "ConcurrentDictionary<TKey,TValue>", False, "AddOrUpdate", "(TKey,System.Func<TKey,TValue>,System.Func<TKey,TValue,TValue>)", "", "Argument[0]", "Argument[2].Parameter[0]", "value", "dfc-generated"]
+      - ["System.Collections.Concurrent", "ConcurrentDictionary<TKey,TValue>", False, "AddOrUpdate", "(TKey,System.Func<TKey,TValue>,System.Func<TKey,TValue,TValue>)", "", "Argument[1].ReturnValue", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Collections.Concurrent", "ConcurrentDictionary<TKey,TValue>", False, "AddOrUpdate", "(TKey,System.Func<TKey,TValue>,System.Func<TKey,TValue,TValue>)", "", "Argument[2].ReturnValue", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Collections.Concurrent", "ConcurrentDictionary<TKey,TValue>", False, "AddOrUpdate", "(TKey,TValue,System.Func<TKey,TValue,TValue>)", "", "Argument[0]", "Argument[2].Parameter[0]", "value", "dfc-generated"]
+      - ["System.Collections.Concurrent", "ConcurrentDictionary<TKey,TValue>", False, "AddOrUpdate", "(TKey,TValue,System.Func<TKey,TValue,TValue>)", "", "Argument[1]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Collections.Concurrent", "ConcurrentDictionary<TKey,TValue>", False, "AddOrUpdate", "(TKey,TValue,System.Func<TKey,TValue,TValue>)", "", "Argument[2].ReturnValue", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Collections.Concurrent", "ConcurrentDictionary<TKey,TValue>", False, "AddOrUpdate<TArg>", "(TKey,System.Func<TKey,TArg,TValue>,System.Func<TKey,TValue,TArg,TValue>,TArg)", "", "Argument[0]", "Argument[1].Parameter[0]", "value", "dfc-generated"]
+      - ["System.Collections.Concurrent", "ConcurrentDictionary<TKey,TValue>", False, "AddOrUpdate<TArg>", "(TKey,System.Func<TKey,TArg,TValue>,System.Func<TKey,TValue,TArg,TValue>,TArg)", "", "Argument[0]", "Argument[2].Parameter[0]", "value", "dfc-generated"]
+      - ["System.Collections.Concurrent", "ConcurrentDictionary<TKey,TValue>", False, "AddOrUpdate<TArg>", "(TKey,System.Func<TKey,TArg,TValue>,System.Func<TKey,TValue,TArg,TValue>,TArg)", "", "Argument[1].ReturnValue", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Collections.Concurrent", "ConcurrentDictionary<TKey,TValue>", False, "AddOrUpdate<TArg>", "(TKey,System.Func<TKey,TArg,TValue>,System.Func<TKey,TValue,TArg,TValue>,TArg)", "", "Argument[2].ReturnValue", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Collections.Concurrent", "ConcurrentDictionary<TKey,TValue>", False, "AddOrUpdate<TArg>", "(TKey,System.Func<TKey,TArg,TValue>,System.Func<TKey,TValue,TArg,TValue>,TArg)", "", "Argument[3]", "Argument[1].Parameter[1]", "value", "dfc-generated"]
+      - ["System.Collections.Concurrent", "ConcurrentDictionary<TKey,TValue>", False, "AddOrUpdate<TArg>", "(TKey,System.Func<TKey,TArg,TValue>,System.Func<TKey,TValue,TArg,TValue>,TArg)", "", "Argument[3]", "Argument[2].Parameter[2]", "value", "dfc-generated"]
+      - ["System.Collections.Concurrent", "ConcurrentDictionary<TKey,TValue>", False, "GetOrAdd", "(TKey,System.Func<TKey,TValue>)", "", "Argument[0]", "Argument[1].Parameter[0]", "value", "dfc-generated"]
+      - ["System.Collections.Concurrent", "ConcurrentDictionary<TKey,TValue>", False, "GetOrAdd", "(TKey,System.Func<TKey,TValue>)", "", "Argument[1].ReturnValue", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Collections.Concurrent", "ConcurrentDictionary<TKey,TValue>", False, "GetOrAdd", "(TKey,TValue)", "", "Argument[1]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Collections.Concurrent", "ConcurrentDictionary<TKey,TValue>", False, "GetOrAdd<TArg>", "(TKey,System.Func<TKey,TArg,TValue>,TArg)", "", "Argument[0]", "Argument[1].Parameter[0]", "value", "dfc-generated"]
+      - ["System.Collections.Concurrent", "ConcurrentDictionary<TKey,TValue>", False, "GetOrAdd<TArg>", "(TKey,System.Func<TKey,TArg,TValue>,TArg)", "", "Argument[1].ReturnValue", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Collections.Concurrent", "ConcurrentDictionary<TKey,TValue>", False, "GetOrAdd<TArg>", "(TKey,System.Func<TKey,TArg,TValue>,TArg)", "", "Argument[2]", "Argument[1].Parameter[1]", "value", "dfc-generated"]
       - ["System.Collections.Concurrent", "ConcurrentDictionary<TKey,TValue>", False, "get_Comparer", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Collections.Concurrent", "ConcurrentStack<T>", False, "ConcurrentStack", "(System.Collections.Generic.IEnumerable<T>)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["System.Collections.Concurrent", "ConcurrentStack<T>", False, "TryPeek", "(T)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Collections.Concurrent", "ConcurrentStack<T>", False, "TryPop", "(T)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Collections.Concurrent", "ConcurrentStack<T>", False, "TryPopRange", "(T[])", "", "Argument[this]", "Argument[0].Element", "taint", "df-generated"]
-      - ["System.Collections.Concurrent", "ConcurrentStack<T>", False, "TryPopRange", "(T[],System.Int32,System.Int32)", "", "Argument[this]", "Argument[0].Element", "taint", "df-generated"]
-      - ["System.Collections.Concurrent", "ConcurrentStack<T>", False, "TryTake", "(T)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Collections.Concurrent", "ConcurrentStack<T>", False, "ConcurrentStack", "(System.Collections.Generic.IEnumerable<T>)", "", "Argument[0].Element", "Argument[this].SyntheticField[System.Collections.Concurrent.ConcurrentStack`1._head].SyntheticField[System.Collections.Concurrent.ConcurrentStack`1+Node._value]", "value", "dfc-generated"]
+      - ["System.Collections.Concurrent", "ConcurrentStack<T>", False, "TryPeek", "(T)", "", "Argument[this].SyntheticField[System.Collections.Concurrent.ConcurrentStack`1._head].SyntheticField[System.Collections.Concurrent.ConcurrentStack`1+Node._value]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Collections.Concurrent", "ConcurrentStack<T>", False, "TryPop", "(T)", "", "Argument[this].SyntheticField[System.Collections.Concurrent.ConcurrentStack`1._head].SyntheticField[System.Collections.Concurrent.ConcurrentStack`1+Node._value]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Collections.Concurrent", "ConcurrentStack<T>", False, "TryPopRange", "(T[])", "", "Argument[this].SyntheticField[System.Collections.Concurrent.ConcurrentStack`1._head].SyntheticField[System.Collections.Concurrent.ConcurrentStack`1+Node._value]", "Argument[0].Element", "value", "dfc-generated"]
+      - ["System.Collections.Concurrent", "ConcurrentStack<T>", False, "TryPopRange", "(T[],System.Int32,System.Int32)", "", "Argument[this].SyntheticField[System.Collections.Concurrent.ConcurrentStack`1._head].SyntheticField[System.Collections.Concurrent.ConcurrentStack`1+Node._value]", "Argument[0].Element", "value", "dfc-generated"]
+      - ["System.Collections.Concurrent", "ConcurrentStack<T>", False, "TryTake", "(T)", "", "Argument[this].SyntheticField[System.Collections.Concurrent.ConcurrentStack`1._head].SyntheticField[System.Collections.Concurrent.ConcurrentStack`1+Node._value]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Collections.Concurrent", "OrderablePartitioner<TSource>", True, "GetDynamicPartitions", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Collections.Concurrent", "Partitioner", False, "Create<TSource>", "(System.Collections.Generic.IEnumerable<TSource>)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
       - ["System.Collections.Concurrent", "Partitioner", False, "Create<TSource>", "(System.Collections.Generic.IEnumerable<TSource>,System.Collections.Concurrent.EnumerablePartitionerOptions)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
       - ["System.Collections.Concurrent", "Partitioner", False, "Create<TSource>", "(System.Collections.Generic.IList<TSource>,System.Boolean)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
@@ -106,7 +125,6 @@ extensions:
       - ["System.Collections.Concurrent", "IProducerConsumerCollection<T>", "ToArray", "()", "summary", "df-generated"]
       - ["System.Collections.Concurrent", "IProducerConsumerCollection<T>", "TryAdd", "(T)", "summary", "df-generated"]
       - ["System.Collections.Concurrent", "IProducerConsumerCollection<T>", "TryTake", "(T)", "summary", "df-generated"]
-      - ["System.Collections.Concurrent", "OrderablePartitioner<TSource>", "GetDynamicPartitions", "()", "summary", "df-generated"]
       - ["System.Collections.Concurrent", "OrderablePartitioner<TSource>", "GetOrderableDynamicPartitions", "()", "summary", "df-generated"]
       - ["System.Collections.Concurrent", "OrderablePartitioner<TSource>", "GetOrderablePartitions", "(System.Int32)", "summary", "df-generated"]
       - ["System.Collections.Concurrent", "OrderablePartitioner<TSource>", "GetPartitions", "(System.Int32)", "summary", "df-generated"]
diff --git a/csharp/ql/lib/ext/generated/System.Collections.Frozen.model.yml b/csharp/ql/lib/ext/generated/System.Collections.Frozen.model.yml
index 725850f1550..03b5409fa09 100644
--- a/csharp/ql/lib/ext/generated/System.Collections.Frozen.model.yml
+++ b/csharp/ql/lib/ext/generated/System.Collections.Frozen.model.yml
@@ -5,18 +5,22 @@ extensions:
       extensible: summaryModel
     data:
       - ["System.Collections.Frozen", "FrozenDictionary", False, "ToFrozenDictionary<TKey,TValue>", "(System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<TKey,TValue>>,System.Collections.Generic.IEqualityComparer<TKey>)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
+      - ["System.Collections.Frozen", "FrozenDictionary<TKey,TValue>+Enumerator", False, "get_Current", "()", "", "Argument[this].Property[System.Collections.Frozen.FrozenDictionary`2+Enumerator.Current]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Collections.Frozen", "FrozenDictionary<TKey,TValue>+Enumerator", False, "get_Current", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Collections.Frozen", "FrozenDictionary<TKey,TValue>", False, "get_Keys", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Collections.Frozen", "FrozenDictionary<TKey,TValue>", False, "get_Values", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Collections.Frozen", "FrozenSet", False, "ToFrozenSet<T>", "(System.Collections.Generic.IEnumerable<T>,System.Collections.Generic.IEqualityComparer<T>)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
+      - ["System.Collections.Frozen", "FrozenSet<T>+Enumerator", False, "get_Current", "()", "", "Argument[this].Property[System.Collections.Frozen.FrozenSet`1+Enumerator.Current]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Collections.Frozen", "FrozenSet<T>+Enumerator", False, "get_Current", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Collections.Frozen", "FrozenSet<T>", False, "CopyTo", "(System.Span<T>)", "", "Argument[this]", "Argument[0]", "taint", "df-generated"]
-      - ["System.Collections.Frozen", "FrozenSet<T>", False, "TryGetValue", "(T,T)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Collections.Frozen", "FrozenSet<T>", False, "CopyTo", "(System.Span<T>)", "", "Argument[this].Property[System.Collections.Frozen.FrozenSet`1.Items].Element", "Argument[0].Element", "value", "dfc-generated"]
+      - ["System.Collections.Frozen", "FrozenSet<T>", False, "TryGetValue", "(T,T)", "", "Argument[this].Property[System.Collections.Frozen.FrozenSet`1.Items].Element", "ReturnValue", "value", "dfc-generated"]
       - ["System.Collections.Frozen", "FrozenSet<T>", False, "get_Items", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
   - addsTo:
       pack: codeql/csharp-all
       extensible: neutralModel
     data:
+      - ["System.Collections.Frozen", "FrozenDictionary", "ToFrozenDictionary<TSource,TKey,TElement>", "(System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,TKey>,System.Func<TSource,TElement>,System.Collections.Generic.IEqualityComparer<TKey>)", "summary", "df-generated"]
+      - ["System.Collections.Frozen", "FrozenDictionary", "ToFrozenDictionary<TSource,TKey>", "(System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,TKey>,System.Collections.Generic.IEqualityComparer<TKey>)", "summary", "df-generated"]
       - ["System.Collections.Frozen", "FrozenDictionary<TKey,TValue>+Enumerator", "Dispose", "()", "summary", "df-generated"]
       - ["System.Collections.Frozen", "FrozenDictionary<TKey,TValue>+Enumerator", "MoveNext", "()", "summary", "df-generated"]
       - ["System.Collections.Frozen", "FrozenDictionary<TKey,TValue>+Enumerator", "Reset", "()", "summary", "df-generated"]
diff --git a/csharp/ql/lib/ext/generated/System.Collections.Generic.model.yml b/csharp/ql/lib/ext/generated/System.Collections.Generic.model.yml
index 72e28a0029d..c81dffa0510 100644
--- a/csharp/ql/lib/ext/generated/System.Collections.Generic.model.yml
+++ b/csharp/ql/lib/ext/generated/System.Collections.Generic.model.yml
@@ -5,51 +5,49 @@ extensions:
       extensible: summaryModel
     data:
       - ["System.Collections.Generic", "CollectionExtensions", False, "AsReadOnly<T>", "(System.Collections.Generic.IList<T>)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["System.Collections.Generic", "CollectionExtensions", False, "AsReadOnly<TKey,TValue>", "(System.Collections.Generic.IDictionary<TKey,TValue>)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
+      - ["System.Collections.Generic", "CollectionExtensions", False, "AsReadOnly<TKey,TValue>", "(System.Collections.Generic.IDictionary<TKey,TValue>)", "", "Argument[0].Element.Property[System.Collections.Generic.KeyValuePair`2.Key]", "ReturnValue.Element.Property[System.Collections.Generic.KeyValuePair`2.Key]", "value", "dfc-generated"]
+      - ["System.Collections.Generic", "CollectionExtensions", False, "AsReadOnly<TKey,TValue>", "(System.Collections.Generic.IDictionary<TKey,TValue>)", "", "Argument[0].Element.Property[System.Collections.Generic.KeyValuePair`2.Value]", "ReturnValue.Element.Property[System.Collections.Generic.KeyValuePair`2.Value]", "value", "dfc-generated"]
       - ["System.Collections.Generic", "CollectionExtensions", False, "CopyTo<T>", "(System.Collections.Generic.List<T>,System.Span<T>)", "", "Argument[0].Element", "Argument[1]", "taint", "df-generated"]
       - ["System.Collections.Generic", "CollectionExtensions", False, "GetDefaultAssets", "(System.Collections.Generic.IEnumerable<Microsoft.Extensions.DependencyModel.RuntimeAssetGroup>)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["System.Collections.Generic", "CollectionExtensions", False, "GetDefaultGroup", "(System.Collections.Generic.IEnumerable<Microsoft.Extensions.DependencyModel.RuntimeAssetGroup>)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
+      - ["System.Collections.Generic", "CollectionExtensions", False, "GetDefaultGroup", "(System.Collections.Generic.IEnumerable<Microsoft.Extensions.DependencyModel.RuntimeAssetGroup>)", "", "Argument[0].Element", "ReturnValue", "value", "dfc-generated"]
       - ["System.Collections.Generic", "CollectionExtensions", False, "GetDefaultRuntimeFileAssets", "(System.Collections.Generic.IEnumerable<Microsoft.Extensions.DependencyModel.RuntimeAssetGroup>)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
       - ["System.Collections.Generic", "CollectionExtensions", False, "GetRuntimeAssets", "(System.Collections.Generic.IEnumerable<Microsoft.Extensions.DependencyModel.RuntimeAssetGroup>,System.String)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
       - ["System.Collections.Generic", "CollectionExtensions", False, "GetRuntimeFileAssets", "(System.Collections.Generic.IEnumerable<Microsoft.Extensions.DependencyModel.RuntimeAssetGroup>,System.String)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["System.Collections.Generic", "CollectionExtensions", False, "GetRuntimeGroup", "(System.Collections.Generic.IEnumerable<Microsoft.Extensions.DependencyModel.RuntimeAssetGroup>,System.String)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["System.Collections.Generic", "CollectionExtensions", False, "GetValueOrDefault<TKey,TValue>", "(System.Collections.Generic.IReadOnlyDictionary<TKey,TValue>,TKey)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["System.Collections.Generic", "CollectionExtensions", False, "GetValueOrDefault<TKey,TValue>", "(System.Collections.Generic.IReadOnlyDictionary<TKey,TValue>,TKey)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Collections.Generic", "CollectionExtensions", False, "GetValueOrDefault<TKey,TValue>", "(System.Collections.Generic.IReadOnlyDictionary<TKey,TValue>,TKey,TValue)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["System.Collections.Generic", "CollectionExtensions", False, "GetValueOrDefault<TKey,TValue>", "(System.Collections.Generic.IReadOnlyDictionary<TKey,TValue>,TKey,TValue)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Collections.Generic", "CollectionExtensions", False, "GetValueOrDefault<TKey,TValue>", "(System.Collections.Generic.IReadOnlyDictionary<TKey,TValue>,TKey,TValue)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Collections.Generic", "CollectionExtensions", False, "GetRuntimeGroup", "(System.Collections.Generic.IEnumerable<Microsoft.Extensions.DependencyModel.RuntimeAssetGroup>,System.String)", "", "Argument[0].Element", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Collections.Generic", "CollectionExtensions", False, "GetValueOrDefault<TKey,TValue>", "(System.Collections.Generic.IReadOnlyDictionary<TKey,TValue>,TKey,TValue)", "", "Argument[2]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Collections.Generic", "CollectionExtensions", False, "Remove<TKey,TValue>", "(System.Collections.Generic.IDictionary<TKey,TValue>,TKey,TValue)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["System.Collections.Generic", "CollectionExtensions", False, "TryAdd<TKey,TValue>", "(System.Collections.Generic.IDictionary<TKey,TValue>,TKey,TValue)", "", "Argument[0].Element", "Argument[2]", "taint", "df-generated"]
-      - ["System.Collections.Generic", "CollectionExtensions", False, "TryAdd<TKey,TValue>", "(System.Collections.Generic.IDictionary<TKey,TValue>,TKey,TValue)", "", "Argument[1]", "Argument[0].Element", "taint", "df-generated"]
-      - ["System.Collections.Generic", "CollectionExtensions", False, "TryAdd<TKey,TValue>", "(System.Collections.Generic.IDictionary<TKey,TValue>,TKey,TValue)", "", "Argument[2]", "Argument[0].Element", "taint", "df-generated"]
+      - ["System.Collections.Generic", "CollectionExtensions", False, "TryAdd<TKey,TValue>", "(System.Collections.Generic.IDictionary<TKey,TValue>,TKey,TValue)", "", "Argument[1]", "Argument[0].Element.Property[System.Collections.Generic.KeyValuePair`2.Key]", "value", "dfc-generated"]
+      - ["System.Collections.Generic", "CollectionExtensions", False, "TryAdd<TKey,TValue>", "(System.Collections.Generic.IDictionary<TKey,TValue>,TKey,TValue)", "", "Argument[2]", "Argument[0].Element.Property[System.Collections.Generic.KeyValuePair`2.Value]", "value", "dfc-generated"]
       - ["System.Collections.Generic", "Dictionary<TKey,TValue>+Enumerator", False, "get_Current", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Collections.Generic", "Dictionary<TKey,TValue>+KeyCollection+Enumerator", False, "get_Current", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Collections.Generic", "Dictionary<TKey,TValue>+KeyCollection", False, "KeyCollection", "(System.Collections.Generic.Dictionary<TKey,TValue>)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
+      - ["System.Collections.Generic", "Dictionary<TKey,TValue>+KeyCollection", False, "KeyCollection", "(System.Collections.Generic.Dictionary<TKey,TValue>)", "", "Argument[0]", "Argument[this].SyntheticField[System.Collections.Generic.Dictionary`2+KeyCollection._dictionary]", "value", "dfc-generated"]
+      - ["System.Collections.Generic", "Dictionary<TKey,TValue>+KeyCollection", False, "get_SyncRoot", "()", "", "Argument[this].SyntheticField[System.Collections.Generic.Dictionary`2+KeyCollection._dictionary].Property[System.Collections.ICollection.SyncRoot]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Collections.Generic", "Dictionary<TKey,TValue>+KeyCollection", False, "get_SyncRoot", "()", "", "Argument[this].SyntheticField[System.Collections.Generic.Dictionary`2+KeyCollection._dictionary]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Collections.Generic", "Dictionary<TKey,TValue>+ValueCollection+Enumerator", False, "get_Current", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Collections.Generic", "Dictionary<TKey,TValue>+ValueCollection", False, "ValueCollection", "(System.Collections.Generic.Dictionary<TKey,TValue>)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["System.Collections.Generic", "Dictionary<TKey,TValue>", False, "Dictionary", "(System.Int32,System.Collections.Generic.IEqualityComparer<TKey>)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Collections.Generic", "Dictionary<TKey,TValue>", False, "get_Comparer", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Collections.Generic", "Dictionary<TKey,TValue>+ValueCollection", False, "ValueCollection", "(System.Collections.Generic.Dictionary<TKey,TValue>)", "", "Argument[0]", "Argument[this].SyntheticField[System.Collections.Generic.Dictionary`2+ValueCollection._dictionary]", "value", "dfc-generated"]
+      - ["System.Collections.Generic", "Dictionary<TKey,TValue>+ValueCollection", False, "get_SyncRoot", "()", "", "Argument[this].SyntheticField[System.Collections.Generic.Dictionary`2+ValueCollection._dictionary].Property[System.Collections.ICollection.SyncRoot]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Collections.Generic", "Dictionary<TKey,TValue>+ValueCollection", False, "get_SyncRoot", "()", "", "Argument[this].SyntheticField[System.Collections.Generic.Dictionary`2+ValueCollection._dictionary]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Collections.Generic", "Dictionary<TKey,TValue>", False, "Dictionary", "(System.Int32,System.Collections.Generic.IEqualityComparer<TKey>)", "", "Argument[1]", "Argument[this].SyntheticField[System.Collections.Generic.Dictionary`2._comparer]", "value", "dfc-generated"]
+      - ["System.Collections.Generic", "Dictionary<TKey,TValue>", False, "get_Comparer", "()", "", "Argument[this].SyntheticField[System.Collections.Generic.Dictionary`2._comparer]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Collections.Generic", "Dictionary<TKey,TValue>", True, "GetObjectData", "(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)", "", "Argument[this].Property[System.Collections.Generic.Dictionary`2.Comparer]", "Argument[0].SyntheticField[System.Runtime.Serialization.SerializationInfo._values].Element", "value", "dfc-generated"]
+      - ["System.Collections.Generic", "Dictionary<TKey,TValue>", True, "GetObjectData", "(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)", "", "Argument[this].SyntheticField[System.Collections.Generic.Dictionary`2._comparer]", "Argument[0].SyntheticField[System.Runtime.Serialization.SerializationInfo._values].Element", "value", "dfc-generated"]
       - ["System.Collections.Generic", "HashSet<T>+Enumerator", False, "get_Current", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Collections.Generic", "HashSet<T>", False, "HashSet", "(System.Collections.Generic.IEnumerable<T>,System.Collections.Generic.IEqualityComparer<T>)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["System.Collections.Generic", "HashSet<T>", False, "HashSet", "(System.Collections.Generic.IEqualityComparer<T>)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["System.Collections.Generic", "HashSet<T>", False, "HashSet", "(System.Collections.Generic.IEqualityComparer<T>)", "", "Argument[0]", "Argument[this].SyntheticField[System.Collections.Generic.HashSet`1._comparer]", "value", "dfc-generated"]
       - ["System.Collections.Generic", "HashSet<T>", False, "TryGetValue", "(T,T)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Collections.Generic", "HashSet<T>", False, "get_Comparer", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Collections.Generic", "KeyValuePair", False, "Create<TKey,TValue>", "(TKey,TValue)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Collections.Generic", "KeyValuePair", False, "Create<TKey,TValue>", "(TKey,TValue)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Collections.Generic", "HashSet<T>", False, "get_Comparer", "()", "", "Argument[this].SyntheticField[System.Collections.Generic.HashSet`1._comparer]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Collections.Generic", "HashSet<T>", True, "GetObjectData", "(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)", "", "Argument[this].Property[System.Collections.Generic.HashSet`1.Comparer]", "Argument[0].SyntheticField[System.Runtime.Serialization.SerializationInfo._values].Element", "value", "dfc-generated"]
+      - ["System.Collections.Generic", "HashSet<T>", True, "GetObjectData", "(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)", "", "Argument[this].SyntheticField[System.Collections.Generic.HashSet`1._comparer]", "Argument[0].SyntheticField[System.Runtime.Serialization.SerializationInfo._values].Element", "value", "dfc-generated"]
+      - ["System.Collections.Generic", "KeyValuePair", False, "Create<TKey,TValue>", "(TKey,TValue)", "", "Argument[0]", "ReturnValue.Property[System.Collections.Generic.KeyValuePair`2.Key]", "value", "dfc-generated"]
+      - ["System.Collections.Generic", "KeyValuePair", False, "Create<TKey,TValue>", "(TKey,TValue)", "", "Argument[1]", "ReturnValue.Property[System.Collections.Generic.KeyValuePair`2.Value]", "value", "dfc-generated"]
       - ["System.Collections.Generic", "KeyValuePair<TKey,TValue>", False, "Deconstruct", "(TKey,TValue)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Collections.Generic", "KeyValuePair<TKey,TValue>", False, "get_Key", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Collections.Generic", "KeyValuePair<TKey,TValue>", False, "get_Value", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Collections.Generic", "LinkedList<T>+Enumerator", False, "get_Current", "()", "", "Argument[this].Property[System.Collections.Generic.LinkedList`1+Enumerator.Current]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Collections.Generic", "LinkedList<T>+Enumerator", False, "get_Current", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Collections.Generic", "LinkedList<T>", False, "AddAfter", "(System.Collections.Generic.LinkedListNode<T>,System.Collections.Generic.LinkedListNode<T>)", "", "Argument[0]", "Argument[1]", "taint", "df-generated"]
-      - ["System.Collections.Generic", "LinkedList<T>", False, "AddAfter", "(System.Collections.Generic.LinkedListNode<T>,System.Collections.Generic.LinkedListNode<T>)", "", "Argument[1]", "Argument[0]", "taint", "df-generated"]
-      - ["System.Collections.Generic", "LinkedList<T>", False, "AddAfter", "(System.Collections.Generic.LinkedListNode<T>,System.Collections.Generic.LinkedListNode<T>)", "", "Argument[this]", "Argument[1]", "taint", "df-generated"]
-      - ["System.Collections.Generic", "LinkedList<T>", False, "AddAfter", "(System.Collections.Generic.LinkedListNode<T>,T)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Collections.Generic", "LinkedList<T>", False, "AddAfter", "(System.Collections.Generic.LinkedListNode<T>,T)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Collections.Generic", "LinkedList<T>", False, "AddBefore", "(System.Collections.Generic.LinkedListNode<T>,System.Collections.Generic.LinkedListNode<T>)", "", "Argument[0]", "Argument[1]", "taint", "df-generated"]
-      - ["System.Collections.Generic", "LinkedList<T>", False, "AddBefore", "(System.Collections.Generic.LinkedListNode<T>,System.Collections.Generic.LinkedListNode<T>)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Collections.Generic", "LinkedList<T>", False, "AddBefore", "(System.Collections.Generic.LinkedListNode<T>,System.Collections.Generic.LinkedListNode<T>)", "", "Argument[1]", "Argument[0]", "taint", "df-generated"]
-      - ["System.Collections.Generic", "LinkedList<T>", False, "AddBefore", "(System.Collections.Generic.LinkedListNode<T>,System.Collections.Generic.LinkedListNode<T>)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Collections.Generic", "LinkedList<T>", False, "AddBefore", "(System.Collections.Generic.LinkedListNode<T>,System.Collections.Generic.LinkedListNode<T>)", "", "Argument[this]", "Argument[1]", "taint", "df-generated"]
+      - ["System.Collections.Generic", "LinkedList<T>", False, "AddAfter", "(System.Collections.Generic.LinkedListNode<T>,System.Collections.Generic.LinkedListNode<T>)", "", "Argument[0].SyntheticField[System.Collections.Generic.LinkedListNode`1.next]", "Argument[1].SyntheticField[System.Collections.Generic.LinkedListNode`1.next]", "value", "dfc-generated"]
+      - ["System.Collections.Generic", "LinkedList<T>", False, "AddAfter", "(System.Collections.Generic.LinkedListNode<T>,T)", "", "Argument[0].SyntheticField[System.Collections.Generic.LinkedListNode`1.next]", "ReturnValue.SyntheticField[System.Collections.Generic.LinkedListNode`1.next]", "value", "dfc-generated"]
+      - ["System.Collections.Generic", "LinkedList<T>", False, "AddBefore", "(System.Collections.Generic.LinkedListNode<T>,System.Collections.Generic.LinkedListNode<T>)", "", "Argument[1]", "Argument[this].SyntheticField[System.Collections.Generic.LinkedList`1.head]", "value", "dfc-generated"]
       - ["System.Collections.Generic", "LinkedList<T>", False, "AddBefore", "(System.Collections.Generic.LinkedListNode<T>,T)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Collections.Generic", "LinkedList<T>", False, "AddBefore", "(System.Collections.Generic.LinkedListNode<T>,T)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["System.Collections.Generic", "LinkedList<T>", False, "AddBefore", "(System.Collections.Generic.LinkedListNode<T>,T)", "", "Argument[1]", "Argument[0]", "taint", "df-generated"]
@@ -60,80 +58,92 @@ extensions:
       - ["System.Collections.Generic", "LinkedList<T>", False, "AddFirst", "(T)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Collections.Generic", "LinkedList<T>", False, "AddFirst", "(T)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["System.Collections.Generic", "LinkedList<T>", False, "AddFirst", "(T)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Collections.Generic", "LinkedList<T>", False, "AddLast", "(System.Collections.Generic.LinkedListNode<T>)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Collections.Generic", "LinkedList<T>", False, "AddLast", "(System.Collections.Generic.LinkedListNode<T>)", "", "Argument[this]", "Argument[0]", "taint", "df-generated"]
+      - ["System.Collections.Generic", "LinkedList<T>", False, "AddLast", "(System.Collections.Generic.LinkedListNode<T>)", "", "Argument[this].SyntheticField[System.Collections.Generic.LinkedList`1.head]", "Argument[0].SyntheticField[System.Collections.Generic.LinkedListNode`1.next]", "value", "dfc-generated"]
       - ["System.Collections.Generic", "LinkedList<T>", False, "AddLast", "(T)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Collections.Generic", "LinkedList<T>", False, "AddLast", "(T)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["System.Collections.Generic", "LinkedList<T>", False, "AddLast", "(T)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Collections.Generic", "LinkedList<T>", False, "LinkedList", "(System.Collections.Generic.IEnumerable<T>)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
       - ["System.Collections.Generic", "LinkedList<T>", False, "LinkedList", "(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Collections.Generic", "LinkedList<T>", False, "Remove", "(System.Collections.Generic.LinkedListNode<T>)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Collections.Generic", "LinkedList<T>", False, "get_First", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Collections.Generic", "LinkedList<T>", False, "Remove", "(System.Collections.Generic.LinkedListNode<T>)", "", "Argument[0].SyntheticField[System.Collections.Generic.LinkedListNode`1.next]", "Argument[this].SyntheticField[System.Collections.Generic.LinkedList`1.head]", "value", "dfc-generated"]
+      - ["System.Collections.Generic", "LinkedList<T>", False, "get_First", "()", "", "Argument[this].SyntheticField[System.Collections.Generic.LinkedList`1.head]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Collections.Generic", "LinkedList<T>", False, "get_Last", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Collections.Generic", "LinkedListNode<T>", False, "LinkedListNode", "(T)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Collections.Generic", "LinkedListNode<T>", False, "get_List", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Collections.Generic", "LinkedListNode<T>", False, "get_Next", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Collections.Generic", "LinkedListNode<T>", False, "get_Previous", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Collections.Generic", "List<T>+Enumerator", False, "get_Current", "()", "", "Argument[this].Property[System.Collections.Generic.List`1+Enumerator.Current]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Collections.Generic", "List<T>+Enumerator", False, "get_Current", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Collections.Generic", "List<T>", False, "CopyTo", "(T[])", "", "Argument[this]", "Argument[0].Element", "taint", "df-generated"]
+      - ["System.Collections.Generic", "List<T>", False, "CopyTo", "(T[])", "", "Argument[this].Element", "Argument[0].Element", "value", "dfc-generated"]
       - ["System.Collections.Generic", "List<T>", False, "List", "(System.Collections.Generic.IEnumerable<T>)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["System.Collections.Generic", "List<T>", False, "Slice", "(System.Int32,System.Int32)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Collections.Generic", "List<T>", False, "Slice", "(System.Int32,System.Int32)", "", "Argument[this].Element", "ReturnValue.Element", "value", "dfc-generated"]
       - ["System.Collections.Generic", "NonRandomizedStringEqualityComparer", True, "GetUnderlyingEqualityComparer", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Collections.Generic", "PriorityQueue<TElement,TPriority>+UnorderedItemsCollection+Enumerator", False, "get_Current", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Collections.Generic", "PriorityQueue<TElement,TPriority>+UnorderedItemsCollection", False, "GetEnumerator", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Collections.Generic", "PriorityQueue<TElement,TPriority>", False, "Dequeue", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Collections.Generic", "PriorityQueue<TElement,TPriority>", False, "DequeueEnqueue", "(TElement,TPriority)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Collections.Generic", "PriorityQueue<TElement,TPriority>", False, "EnqueueDequeue", "(TElement,TPriority)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Collections.Generic", "PriorityQueue<TElement,TPriority>", False, "EnqueueDequeue", "(TElement,TPriority)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Collections.Generic", "PriorityQueue<TElement,TPriority>", False, "EnqueueDequeue", "(TElement,TPriority)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Collections.Generic", "PriorityQueue<TElement,TPriority>", False, "EnqueueRange", "(System.Collections.Generic.IEnumerable<System.ValueTuple<TElement,TPriority>>)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
       - ["System.Collections.Generic", "PriorityQueue<TElement,TPriority>", False, "Peek", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Collections.Generic", "PriorityQueue<TElement,TPriority>", False, "PriorityQueue", "(System.Collections.Generic.IComparer<TPriority>)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Collections.Generic", "PriorityQueue<TElement,TPriority>", False, "PriorityQueue", "(System.Collections.Generic.IEnumerable<System.ValueTuple<TElement,TPriority>>,System.Collections.Generic.IComparer<TPriority>)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["System.Collections.Generic", "PriorityQueue<TElement,TPriority>", False, "PriorityQueue", "(System.Collections.Generic.IEnumerable<System.ValueTuple<TElement,TPriority>>,System.Collections.Generic.IComparer<TPriority>)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Collections.Generic", "PriorityQueue<TElement,TPriority>", False, "PriorityQueue", "(System.Int32,System.Collections.Generic.IComparer<TPriority>)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["System.Collections.Generic", "PriorityQueue<TElement,TPriority>", False, "PriorityQueue", "(System.Collections.Generic.IComparer<TPriority>)", "", "Argument[0]", "Argument[this].SyntheticField[System.Collections.Generic.PriorityQueue`2._comparer]", "value", "dfc-generated"]
+      - ["System.Collections.Generic", "PriorityQueue<TElement,TPriority>", False, "PriorityQueue", "(System.Collections.Generic.IEnumerable<System.ValueTuple<TElement,TPriority>>,System.Collections.Generic.IComparer<TPriority>)", "", "Argument[1]", "Argument[this].SyntheticField[System.Collections.Generic.PriorityQueue`2._comparer]", "value", "dfc-generated"]
+      - ["System.Collections.Generic", "PriorityQueue<TElement,TPriority>", False, "PriorityQueue", "(System.Int32,System.Collections.Generic.IComparer<TPriority>)", "", "Argument[1]", "Argument[this].SyntheticField[System.Collections.Generic.PriorityQueue`2._comparer]", "value", "dfc-generated"]
+      - ["System.Collections.Generic", "PriorityQueue<TElement,TPriority>", False, "Remove", "(TElement,TElement,TPriority,System.Collections.Generic.IEqualityComparer<TElement>)", "", "Argument[0]", "Argument[3]", "taint", "df-generated"]
       - ["System.Collections.Generic", "PriorityQueue<TElement,TPriority>", False, "Remove", "(TElement,TElement,TPriority,System.Collections.Generic.IEqualityComparer<TElement>)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Collections.Generic", "PriorityQueue<TElement,TPriority>", False, "TryDequeue", "(TElement,TPriority)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Collections.Generic", "PriorityQueue<TElement,TPriority>", False, "TryPeek", "(TElement,TPriority)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Collections.Generic", "PriorityQueue<TElement,TPriority>", False, "get_Comparer", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Collections.Generic", "PriorityQueue<TElement,TPriority>", False, "get_Comparer", "()", "", "Argument[this].SyntheticField[System.Collections.Generic.PriorityQueue`2._comparer]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Collections.Generic", "Queue<T>+Enumerator", False, "get_Current", "()", "", "Argument[this].Property[System.Collections.Generic.Queue`1+Enumerator.Current]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Collections.Generic", "Queue<T>+Enumerator", False, "get_Current", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Collections.Generic", "Queue<T>", False, "Dequeue", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Collections.Generic", "Queue<T>", False, "Enqueue", "(T)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Collections.Generic", "Queue<T>", False, "Queue", "(System.Collections.Generic.IEnumerable<T>)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["System.Collections.Generic", "Queue<T>", False, "TryDequeue", "(T)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Collections.Generic", "Queue<T>", False, "TryPeek", "(T)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Collections.Generic", "Queue<T>", False, "Dequeue", "()", "", "Argument[this].SyntheticField[System.Collections.Generic.Queue`1._array].Element", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Collections.Generic", "Queue<T>", False, "Enqueue", "(T)", "", "Argument[0]", "Argument[this].SyntheticField[System.Collections.Generic.Queue`1._array].Element", "value", "dfc-generated"]
+      - ["System.Collections.Generic", "Queue<T>", False, "Queue", "(System.Collections.Generic.IEnumerable<T>)", "", "Argument[0].Element", "Argument[this].SyntheticField[System.Collections.Generic.Queue`1._array].Element", "value", "dfc-generated"]
+      - ["System.Collections.Generic", "Queue<T>", False, "TryDequeue", "(T)", "", "Argument[this].SyntheticField[System.Collections.Generic.Queue`1._array].Element", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Collections.Generic", "Queue<T>", False, "TryPeek", "(T)", "", "Argument[this].SyntheticField[System.Collections.Generic.Queue`1._array].Element", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Collections.Generic", "SortedDictionary<TKey,TValue>+Enumerator", False, "get_Current", "()", "", "Argument[this].Property[System.Collections.Generic.SortedDictionary`2+Enumerator.Current].Property[System.Collections.Generic.KeyValuePair`2.Key]", "ReturnValue.Property[System.Collections.Generic.KeyValuePair`2.Key]", "value", "dfc-generated"]
+      - ["System.Collections.Generic", "SortedDictionary<TKey,TValue>+Enumerator", False, "get_Current", "()", "", "Argument[this].Property[System.Collections.Generic.SortedDictionary`2+Enumerator.Current].Property[System.Collections.Generic.KeyValuePair`2.Value]", "ReturnValue.Property[System.Collections.Generic.KeyValuePair`2.Value]", "value", "dfc-generated"]
       - ["System.Collections.Generic", "SortedDictionary<TKey,TValue>+Enumerator", False, "get_Current", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Collections.Generic", "SortedDictionary<TKey,TValue>+KeyCollection", False, "KeyCollection", "(System.Collections.Generic.SortedDictionary<TKey,TValue>)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
+      - ["System.Collections.Generic", "SortedDictionary<TKey,TValue>+Enumerator", False, "get_Key", "()", "", "Argument[this].Property[System.Collections.Generic.SortedDictionary`2+Enumerator.Current].Property[System.Collections.Generic.KeyValuePair`2.Key]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Collections.Generic", "SortedDictionary<TKey,TValue>+Enumerator", False, "get_Value", "()", "", "Argument[this].Property[System.Collections.Generic.SortedDictionary`2+Enumerator.Current].Property[System.Collections.Generic.KeyValuePair`2.Value]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Collections.Generic", "SortedDictionary<TKey,TValue>+KeyCollection+Enumerator", False, "get_Current", "()", "", "Argument[this].Property[System.Collections.Generic.SortedDictionary`2+KeyCollection+Enumerator.Current]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Collections.Generic", "SortedDictionary<TKey,TValue>+KeyCollection", False, "KeyCollection", "(System.Collections.Generic.SortedDictionary<TKey,TValue>)", "", "Argument[0]", "Argument[this].SyntheticField[System.Collections.Generic.SortedDictionary`2+KeyCollection._dictionary]", "value", "dfc-generated"]
+      - ["System.Collections.Generic", "SortedDictionary<TKey,TValue>+KeyCollection", False, "get_SyncRoot", "()", "", "Argument[this].SyntheticField[System.Collections.Generic.SortedDictionary`2+KeyCollection._dictionary].Property[System.Collections.ICollection.SyncRoot]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Collections.Generic", "SortedDictionary<TKey,TValue>+KeyValuePairComparer", False, "KeyValuePairComparer", "(System.Collections.Generic.IComparer<TKey>)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Collections.Generic", "SortedDictionary<TKey,TValue>+ValueCollection", False, "ValueCollection", "(System.Collections.Generic.SortedDictionary<TKey,TValue>)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
+      - ["System.Collections.Generic", "SortedDictionary<TKey,TValue>+ValueCollection+Enumerator", False, "get_Current", "()", "", "Argument[this].Property[System.Collections.Generic.SortedDictionary`2+ValueCollection+Enumerator.Current]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Collections.Generic", "SortedDictionary<TKey,TValue>+ValueCollection", False, "ValueCollection", "(System.Collections.Generic.SortedDictionary<TKey,TValue>)", "", "Argument[0]", "Argument[this].SyntheticField[System.Collections.Generic.SortedDictionary`2+ValueCollection._dictionary]", "value", "dfc-generated"]
+      - ["System.Collections.Generic", "SortedDictionary<TKey,TValue>+ValueCollection", False, "get_SyncRoot", "()", "", "Argument[this].SyntheticField[System.Collections.Generic.SortedDictionary`2+ValueCollection._dictionary].Property[System.Collections.ICollection.SyncRoot]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Collections.Generic", "SortedList<TKey,TValue>", False, "GetKeyAtIndex", "(System.Int32)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Collections.Generic", "SortedList<TKey,TValue>", False, "GetValueAtIndex", "(System.Int32)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Collections.Generic", "SortedList<TKey,TValue>", False, "SetValueAtIndex", "(System.Int32,TValue)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Collections.Generic", "SortedList<TKey,TValue>", False, "SortedList", "(System.Collections.Generic.IComparer<TKey>)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Collections.Generic", "SortedList<TKey,TValue>", False, "TryGetValue", "(TKey,TValue)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Collections.Generic", "SortedList<TKey,TValue>", False, "get_Comparer", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Collections.Generic", "SortedList<TKey,TValue>", False, "GetValueAtIndex", "(System.Int32)", "", "Argument[this].SyntheticField[System.Collections.Generic.SortedList`2.values].Element", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Collections.Generic", "SortedList<TKey,TValue>", False, "SetValueAtIndex", "(System.Int32,TValue)", "", "Argument[1]", "Argument[this].SyntheticField[System.Collections.Generic.SortedList`2.values].Element", "value", "dfc-generated"]
+      - ["System.Collections.Generic", "SortedList<TKey,TValue>", False, "SortedList", "(System.Collections.Generic.IComparer<TKey>)", "", "Argument[0]", "Argument[this].SyntheticField[System.Collections.Generic.SortedList`2.comparer]", "value", "dfc-generated"]
+      - ["System.Collections.Generic", "SortedList<TKey,TValue>", False, "TryGetValue", "(TKey,TValue)", "", "Argument[this].SyntheticField[System.Collections.Generic.SortedList`2.values].Element", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Collections.Generic", "SortedList<TKey,TValue>", False, "get_Comparer", "()", "", "Argument[this].SyntheticField[System.Collections.Generic.SortedList`2.comparer]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Collections.Generic", "SortedSet<T>+Enumerator", False, "get_Current", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Collections.Generic", "SortedSet<T>", False, "CopyTo", "(T[])", "", "Argument[this]", "Argument[0].Element", "taint", "df-generated"]
-      - ["System.Collections.Generic", "SortedSet<T>", False, "CopyTo", "(T[],System.Int32,System.Int32)", "", "Argument[this]", "Argument[0].Element", "taint", "df-generated"]
-      - ["System.Collections.Generic", "SortedSet<T>", False, "SortedSet", "(System.Collections.Generic.IComparer<T>)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Collections.Generic", "SortedSet<T>", False, "SortedSet", "(System.Collections.Generic.IEnumerable<T>,System.Collections.Generic.IComparer<T>)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
+      - ["System.Collections.Generic", "SortedSet<T>", False, "CopyTo", "(T[])", "", "Argument[this].SyntheticField[System.Collections.Generic.SortedSet`1.root].SyntheticField[System.Collections.Generic.SortedSet`1+Node.Item]", "Argument[0].Element", "value", "dfc-generated"]
+      - ["System.Collections.Generic", "SortedSet<T>", False, "CopyTo", "(T[],System.Int32,System.Int32)", "", "Argument[this].SyntheticField[System.Collections.Generic.SortedSet`1.root].SyntheticField[System.Collections.Generic.SortedSet`1+Node.Item]", "Argument[0].Element", "value", "dfc-generated"]
+      - ["System.Collections.Generic", "SortedSet<T>", False, "SortedSet", "(System.Collections.Generic.IComparer<T>)", "", "Argument[0]", "Argument[this].SyntheticField[System.Collections.Generic.SortedSet`1.comparer]", "value", "dfc-generated"]
+      - ["System.Collections.Generic", "SortedSet<T>", False, "SortedSet", "(System.Collections.Generic.IEnumerable<T>,System.Collections.Generic.IComparer<T>)", "", "Argument[0].Element", "Argument[this].SyntheticField[System.Collections.Generic.SortedSet`1.root].SyntheticField[System.Collections.Generic.SortedSet`1+Node.Item]", "value", "dfc-generated"]
       - ["System.Collections.Generic", "SortedSet<T>", False, "SortedSet", "(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Collections.Generic", "SortedSet<T>", False, "SymmetricExceptWith", "(System.Collections.Generic.IEnumerable<T>)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["System.Collections.Generic", "SortedSet<T>", False, "TryGetValue", "(T,T)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Collections.Generic", "SortedSet<T>", False, "UnionWith", "(System.Collections.Generic.IEnumerable<T>)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["System.Collections.Generic", "SortedSet<T>", False, "get_Comparer", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Collections.Generic", "SortedSet<T>", False, "get_Max", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Collections.Generic", "SortedSet<T>", False, "get_Min", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Collections.Generic", "SortedSet<T>", True, "GetObjectData", "(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)", "", "Argument[this]", "Argument[0]", "taint", "df-generated"]
+      - ["System.Collections.Generic", "SortedSet<T>", False, "SymmetricExceptWith", "(System.Collections.Generic.IEnumerable<T>)", "", "Argument[0].Element", "Argument[this].Element", "value", "dfc-generated"]
+      - ["System.Collections.Generic", "SortedSet<T>", False, "SymmetricExceptWith", "(System.Collections.Generic.IEnumerable<T>)", "", "Argument[0].Element", "Argument[this].SyntheticField[System.Collections.Generic.SortedSet`1.root].SyntheticField[System.Collections.Generic.SortedSet`1+Node.Item]", "value", "dfc-generated"]
+      - ["System.Collections.Generic", "SortedSet<T>", False, "TryGetValue", "(T,T)", "", "Argument[this].SyntheticField[System.Collections.Generic.SortedSet`1.root].SyntheticField[System.Collections.Generic.SortedSet`1+Node.Item]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Collections.Generic", "SortedSet<T>", False, "UnionWith", "(System.Collections.Generic.IEnumerable<T>)", "", "Argument[0].Element", "Argument[this].Element", "value", "dfc-generated"]
+      - ["System.Collections.Generic", "SortedSet<T>", False, "UnionWith", "(System.Collections.Generic.IEnumerable<T>)", "", "Argument[0].Element", "Argument[this].SyntheticField[System.Collections.Generic.SortedSet`1.root].SyntheticField[System.Collections.Generic.SortedSet`1+Node.Item]", "value", "dfc-generated"]
+      - ["System.Collections.Generic", "SortedSet<T>", False, "UnionWith", "(System.Collections.Generic.IEnumerable<T>)", "", "Argument[this].Element", "Argument[this].SyntheticField[System.Collections.Generic.SortedSet`1.root].SyntheticField[System.Collections.Generic.SortedSet`1+Node.Item]", "value", "dfc-generated"]
+      - ["System.Collections.Generic", "SortedSet<T>", False, "get_Comparer", "()", "", "Argument[this].SyntheticField[System.Collections.Generic.SortedSet`1.comparer]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Collections.Generic", "SortedSet<T>", False, "get_Max", "()", "", "Argument[this].SyntheticField[System.Collections.Generic.SortedSet`1.root].SyntheticField[System.Collections.Generic.SortedSet`1+Node.Item]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Collections.Generic", "SortedSet<T>", False, "get_Min", "()", "", "Argument[this].SyntheticField[System.Collections.Generic.SortedSet`1.root].SyntheticField[System.Collections.Generic.SortedSet`1+Node.Item]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Collections.Generic", "SortedSet<T>", True, "GetViewBetween", "(T,T)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["System.Collections.Generic", "SortedSet<T>", True, "GetViewBetween", "(T,T)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
       - ["System.Collections.Generic", "SortedSet<T>", True, "GetViewBetween", "(T,T)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Collections.Generic", "SortedSet<T>", True, "IntersectWith", "(System.Collections.Generic.IEnumerable<T>)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
+      - ["System.Collections.Generic", "SortedSet<T>", True, "IntersectWith", "(System.Collections.Generic.IEnumerable<T>)", "", "Argument[0].Element", "Argument[this].Element", "value", "dfc-generated"]
+      - ["System.Collections.Generic", "SortedSet<T>", True, "IntersectWith", "(System.Collections.Generic.IEnumerable<T>)", "", "Argument[0].Element", "Argument[this].SyntheticField[System.Collections.Generic.SortedSet`1.root].SyntheticField[System.Collections.Generic.SortedSet`1+Node.Item]", "value", "dfc-generated"]
+      - ["System.Collections.Generic", "Stack<T>+Enumerator", False, "get_Current", "()", "", "Argument[this].Property[System.Collections.Generic.Stack`1+Enumerator.Current]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Collections.Generic", "Stack<T>+Enumerator", False, "get_Current", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Collections.Generic", "Stack<T>", False, "Push", "(T)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Collections.Generic", "Stack<T>", False, "Stack", "(System.Collections.Generic.IEnumerable<T>)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["System.Collections.Generic", "Stack<T>", False, "ToArray", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Collections.Generic", "Stack<T>", False, "TryPeek", "(T)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Collections.Generic", "Stack<T>", False, "TryPop", "(T)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Collections.Generic", "Stack<T>", False, "Push", "(T)", "", "Argument[0]", "Argument[this].SyntheticField[System.Collections.Generic.Stack`1._array].Element", "value", "dfc-generated"]
+      - ["System.Collections.Generic", "Stack<T>", False, "Stack", "(System.Collections.Generic.IEnumerable<T>)", "", "Argument[0].Element", "Argument[this].SyntheticField[System.Collections.Generic.Stack`1._array].Element", "value", "dfc-generated"]
+      - ["System.Collections.Generic", "Stack<T>", False, "ToArray", "()", "", "Argument[this].SyntheticField[System.Collections.Generic.Stack`1._array].Element", "ReturnValue.Element", "value", "dfc-generated"]
+      - ["System.Collections.Generic", "Stack<T>", False, "TryPeek", "(T)", "", "Argument[this].SyntheticField[System.Collections.Generic.Stack`1._array].Element", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Collections.Generic", "Stack<T>", False, "TryPop", "(T)", "", "Argument[this].SyntheticField[System.Collections.Generic.Stack`1._array].Element", "ReturnValue", "value", "dfc-generated"]
   - addsTo:
       pack: codeql/csharp-all
       extensible: neutralModel
@@ -143,9 +153,10 @@ extensions:
       - ["System.Collections.Generic", "ByteEqualityComparer", "GetHashCode", "()", "summary", "df-generated"]
       - ["System.Collections.Generic", "ByteEqualityComparer", "GetHashCode", "(System.Byte)", "summary", "df-generated"]
       - ["System.Collections.Generic", "CollectionExtensions", "AddRange<T>", "(System.Collections.Generic.List<T>,System.ReadOnlySpan<T>)", "summary", "df-generated"]
+      - ["System.Collections.Generic", "CollectionExtensions", "GetValueOrDefault<TKey,TValue>", "(System.Collections.Generic.IReadOnlyDictionary<TKey,TValue>,TKey)", "summary", "df-generated"]
       - ["System.Collections.Generic", "CollectionExtensions", "InsertRange<T>", "(System.Collections.Generic.List<T>,System.Int32,System.ReadOnlySpan<T>)", "summary", "df-generated"]
-      - ["System.Collections.Generic", "Comparer<T>", "Compare", "(System.Object,System.Object)", "summary", "df-generated"]
       - ["System.Collections.Generic", "Comparer<T>", "Compare", "(T,T)", "summary", "df-generated"]
+      - ["System.Collections.Generic", "Comparer<T>", "Create", "(System.Comparison<T>)", "summary", "df-generated"]
       - ["System.Collections.Generic", "Comparer<T>", "get_Default", "()", "summary", "df-generated"]
       - ["System.Collections.Generic", "Dictionary<TKey,TValue>+Enumerator", "Dispose", "()", "summary", "df-generated"]
       - ["System.Collections.Generic", "Dictionary<TKey,TValue>+Enumerator", "MoveNext", "()", "summary", "df-generated"]
@@ -192,9 +203,8 @@ extensions:
       - ["System.Collections.Generic", "EnumEqualityComparer<T>", "Equals", "(T,T)", "summary", "df-generated"]
       - ["System.Collections.Generic", "EnumEqualityComparer<T>", "GetHashCode", "()", "summary", "df-generated"]
       - ["System.Collections.Generic", "EnumEqualityComparer<T>", "GetHashCode", "(T)", "summary", "df-generated"]
-      - ["System.Collections.Generic", "EqualityComparer<T>", "Equals", "(System.Object,System.Object)", "summary", "df-generated"]
+      - ["System.Collections.Generic", "EqualityComparer<T>", "Create", "(System.Func<T,T,System.Boolean>,System.Func<T,System.Int32>)", "summary", "df-generated"]
       - ["System.Collections.Generic", "EqualityComparer<T>", "Equals", "(T,T)", "summary", "df-generated"]
-      - ["System.Collections.Generic", "EqualityComparer<T>", "GetHashCode", "(System.Object)", "summary", "df-generated"]
       - ["System.Collections.Generic", "EqualityComparer<T>", "GetHashCode", "(T)", "summary", "df-generated"]
       - ["System.Collections.Generic", "EqualityComparer<T>", "get_Default", "()", "summary", "df-generated"]
       - ["System.Collections.Generic", "GenericComparer<T>", "Compare", "(T,T)", "summary", "df-generated"]
@@ -225,6 +235,7 @@ extensions:
       - ["System.Collections.Generic", "HashSet<T>", "OnDeserialization", "(System.Object)", "summary", "df-generated"]
       - ["System.Collections.Generic", "HashSet<T>", "Overlaps", "(System.Collections.Generic.IEnumerable<T>)", "summary", "df-generated"]
       - ["System.Collections.Generic", "HashSet<T>", "Remove", "(T)", "summary", "df-generated"]
+      - ["System.Collections.Generic", "HashSet<T>", "RemoveWhere", "(System.Predicate<T>)", "summary", "df-generated"]
       - ["System.Collections.Generic", "HashSet<T>", "SetEquals", "(System.Collections.Generic.IEnumerable<T>)", "summary", "df-generated"]
       - ["System.Collections.Generic", "HashSet<T>", "SymmetricExceptWith", "(System.Collections.Generic.IEnumerable<T>)", "summary", "df-generated"]
       - ["System.Collections.Generic", "HashSet<T>", "TrimExcess", "()", "summary", "df-generated"]
@@ -298,8 +309,16 @@ extensions:
       - ["System.Collections.Generic", "List<T>", "BinarySearch", "(T,System.Collections.Generic.IComparer<T>)", "summary", "df-generated"]
       - ["System.Collections.Generic", "List<T>", "Contains", "(System.Object)", "summary", "df-generated"]
       - ["System.Collections.Generic", "List<T>", "Contains", "(T)", "summary", "df-generated"]
+      - ["System.Collections.Generic", "List<T>", "ConvertAll<TOutput>", "(System.Converter<T,TOutput>)", "summary", "df-generated"]
       - ["System.Collections.Generic", "List<T>", "CopyTo", "(System.Int32,T[],System.Int32,System.Int32)", "summary", "df-generated"]
       - ["System.Collections.Generic", "List<T>", "EnsureCapacity", "(System.Int32)", "summary", "df-generated"]
+      - ["System.Collections.Generic", "List<T>", "Exists", "(System.Predicate<T>)", "summary", "df-generated"]
+      - ["System.Collections.Generic", "List<T>", "FindIndex", "(System.Int32,System.Int32,System.Predicate<T>)", "summary", "df-generated"]
+      - ["System.Collections.Generic", "List<T>", "FindIndex", "(System.Int32,System.Predicate<T>)", "summary", "df-generated"]
+      - ["System.Collections.Generic", "List<T>", "FindIndex", "(System.Predicate<T>)", "summary", "df-generated"]
+      - ["System.Collections.Generic", "List<T>", "FindLastIndex", "(System.Int32,System.Int32,System.Predicate<T>)", "summary", "df-generated"]
+      - ["System.Collections.Generic", "List<T>", "FindLastIndex", "(System.Int32,System.Predicate<T>)", "summary", "df-generated"]
+      - ["System.Collections.Generic", "List<T>", "FindLastIndex", "(System.Predicate<T>)", "summary", "df-generated"]
       - ["System.Collections.Generic", "List<T>", "IndexOf", "(System.Object)", "summary", "df-generated"]
       - ["System.Collections.Generic", "List<T>", "IndexOf", "(T)", "summary", "df-generated"]
       - ["System.Collections.Generic", "List<T>", "IndexOf", "(T,System.Int32)", "summary", "df-generated"]
@@ -308,16 +327,20 @@ extensions:
       - ["System.Collections.Generic", "List<T>", "LastIndexOf", "(T,System.Int32)", "summary", "df-generated"]
       - ["System.Collections.Generic", "List<T>", "LastIndexOf", "(T,System.Int32,System.Int32)", "summary", "df-generated"]
       - ["System.Collections.Generic", "List<T>", "List", "(System.Int32)", "summary", "df-generated"]
+      - ["System.Collections.Generic", "List<T>", "Remove", "(System.Object)", "summary", "df-generated"]
       - ["System.Collections.Generic", "List<T>", "Remove", "(T)", "summary", "df-generated"]
+      - ["System.Collections.Generic", "List<T>", "RemoveAll", "(System.Predicate<T>)", "summary", "df-generated"]
       - ["System.Collections.Generic", "List<T>", "RemoveAt", "(System.Int32)", "summary", "df-generated"]
       - ["System.Collections.Generic", "List<T>", "RemoveRange", "(System.Int32,System.Int32)", "summary", "df-generated"]
       - ["System.Collections.Generic", "List<T>", "Reverse", "()", "summary", "df-generated"]
       - ["System.Collections.Generic", "List<T>", "Reverse", "(System.Int32,System.Int32)", "summary", "df-generated"]
       - ["System.Collections.Generic", "List<T>", "Sort", "()", "summary", "df-generated"]
       - ["System.Collections.Generic", "List<T>", "Sort", "(System.Collections.Generic.IComparer<T>)", "summary", "df-generated"]
+      - ["System.Collections.Generic", "List<T>", "Sort", "(System.Comparison<T>)", "summary", "df-generated"]
       - ["System.Collections.Generic", "List<T>", "Sort", "(System.Int32,System.Int32,System.Collections.Generic.IComparer<T>)", "summary", "df-generated"]
       - ["System.Collections.Generic", "List<T>", "ToArray", "()", "summary", "df-generated"]
       - ["System.Collections.Generic", "List<T>", "TrimExcess", "()", "summary", "df-generated"]
+      - ["System.Collections.Generic", "List<T>", "TrueForAll", "(System.Predicate<T>)", "summary", "df-generated"]
       - ["System.Collections.Generic", "List<T>", "get_Count", "()", "summary", "df-generated"]
       - ["System.Collections.Generic", "List<T>", "get_IsFixedSize", "()", "summary", "df-generated"]
       - ["System.Collections.Generic", "List<T>", "get_IsReadOnly", "()", "summary", "df-generated"]
@@ -367,8 +390,6 @@ extensions:
       - ["System.Collections.Generic", "Queue<T>", "get_Capacity", "()", "summary", "df-generated"]
       - ["System.Collections.Generic", "Queue<T>", "get_Count", "()", "summary", "df-generated"]
       - ["System.Collections.Generic", "Queue<T>", "get_IsSynchronized", "()", "summary", "df-generated"]
-      - ["System.Collections.Generic", "ReferenceEqualityComparer", "Equals", "(System.Object,System.Object)", "summary", "df-generated"]
-      - ["System.Collections.Generic", "ReferenceEqualityComparer", "GetHashCode", "(System.Object)", "summary", "df-generated"]
       - ["System.Collections.Generic", "ReferenceEqualityComparer", "get_Instance", "()", "summary", "df-generated"]
       - ["System.Collections.Generic", "SortedDictionary<TKey,TValue>+Enumerator", "Dispose", "()", "summary", "df-generated"]
       - ["System.Collections.Generic", "SortedDictionary<TKey,TValue>+Enumerator", "MoveNext", "()", "summary", "df-generated"]
@@ -447,6 +468,7 @@ extensions:
       - ["System.Collections.Generic", "SortedSet<T>", "CreateSetComparer", "()", "summary", "df-generated"]
       - ["System.Collections.Generic", "SortedSet<T>", "CreateSetComparer", "(System.Collections.Generic.IEqualityComparer<T>)", "summary", "df-generated"]
       - ["System.Collections.Generic", "SortedSet<T>", "ExceptWith", "(System.Collections.Generic.IEnumerable<T>)", "summary", "df-generated"]
+      - ["System.Collections.Generic", "SortedSet<T>", "GetObjectData", "(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)", "summary", "df-generated"]
       - ["System.Collections.Generic", "SortedSet<T>", "IsProperSubsetOf", "(System.Collections.Generic.IEnumerable<T>)", "summary", "df-generated"]
       - ["System.Collections.Generic", "SortedSet<T>", "IsProperSupersetOf", "(System.Collections.Generic.IEnumerable<T>)", "summary", "df-generated"]
       - ["System.Collections.Generic", "SortedSet<T>", "IsSubsetOf", "(System.Collections.Generic.IEnumerable<T>)", "summary", "df-generated"]
@@ -454,6 +476,7 @@ extensions:
       - ["System.Collections.Generic", "SortedSet<T>", "OnDeserialization", "(System.Object)", "summary", "df-generated"]
       - ["System.Collections.Generic", "SortedSet<T>", "Overlaps", "(System.Collections.Generic.IEnumerable<T>)", "summary", "df-generated"]
       - ["System.Collections.Generic", "SortedSet<T>", "Remove", "(T)", "summary", "df-generated"]
+      - ["System.Collections.Generic", "SortedSet<T>", "RemoveWhere", "(System.Predicate<T>)", "summary", "df-generated"]
       - ["System.Collections.Generic", "SortedSet<T>", "SetEquals", "(System.Collections.Generic.IEnumerable<T>)", "summary", "df-generated"]
       - ["System.Collections.Generic", "SortedSet<T>", "SortedSet", "(System.Collections.Generic.IEnumerable<T>)", "summary", "df-generated"]
       - ["System.Collections.Generic", "SortedSet<T>", "get_Count", "()", "summary", "df-generated"]
diff --git a/csharp/ql/lib/ext/generated/System.Collections.Immutable.model.yml b/csharp/ql/lib/ext/generated/System.Collections.Immutable.model.yml
index 36ab7f0ae82..5acd310b865 100644
--- a/csharp/ql/lib/ext/generated/System.Collections.Immutable.model.yml
+++ b/csharp/ql/lib/ext/generated/System.Collections.Immutable.model.yml
@@ -4,7 +4,7 @@ extensions:
       pack: codeql/csharp-all
       extensible: summaryModel
     data:
-      - ["System.Collections.Immutable", "ImmutableArray", False, "Create<T>", "(System.Collections.Immutable.ImmutableArray<T>,System.Int32,System.Int32)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
+      - ["System.Collections.Immutable", "ImmutableArray", False, "Create<T>", "(System.Collections.Immutable.ImmutableArray<T>,System.Int32,System.Int32)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Collections.Immutable", "ImmutableArray", False, "Create<T>", "(System.ReadOnlySpan<T>)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["System.Collections.Immutable", "ImmutableArray", False, "Create<T>", "(System.Span<T>)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["System.Collections.Immutable", "ImmutableArray", False, "Create<T>", "(T)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
@@ -19,92 +19,118 @@ extensions:
       - ["System.Collections.Immutable", "ImmutableArray", False, "Create<T>", "(T,T,T,T)", "", "Argument[3]", "ReturnValue", "taint", "df-generated"]
       - ["System.Collections.Immutable", "ImmutableArray", False, "Create<T>", "(T[],System.Int32,System.Int32)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
       - ["System.Collections.Immutable", "ImmutableArray", False, "CreateRange<T>", "(System.Collections.Generic.IEnumerable<T>)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["System.Collections.Immutable", "ImmutableArray", False, "ToImmutableArray<TSource>", "(System.Collections.Generic.IEnumerable<TSource>)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["System.Collections.Immutable", "ImmutableArray<T>+Builder", False, "CopyTo", "(System.Span<T>)", "", "Argument[this]", "Argument[0]", "taint", "df-generated"]
-      - ["System.Collections.Immutable", "ImmutableArray<T>+Builder", False, "DrainToImmutable", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Collections.Immutable", "ImmutableArray<T>+Builder", False, "InsertRange", "(System.Int32,System.Collections.Generic.IEnumerable<T>)", "", "Argument[1].Element", "Argument[this]", "taint", "df-generated"]
-      - ["System.Collections.Immutable", "ImmutableArray<T>+Builder", False, "MoveToImmutable", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Collections.Immutable", "ImmutableArray<T>+Builder", False, "Replace", "(T,T)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Collections.Immutable", "ImmutableArray<T>+Builder", False, "Replace", "(T,T,System.Collections.Generic.IEqualityComparer<T>)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Collections.Immutable", "ImmutableArray<T>+Enumerator", False, "get_Current", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Collections.Immutable", "ImmutableArray<T>", False, "Add", "(T)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Collections.Immutable", "ImmutableArray<T>", False, "AddRange", "(System.Collections.Generic.IEnumerable<T>)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["System.Collections.Immutable", "ImmutableArray<T>", False, "AddRange", "(System.Collections.Generic.IEnumerable<T>)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Collections.Immutable", "ImmutableArray<T>", False, "AddRange", "(System.Collections.Immutable.ImmutableArray<T>)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["System.Collections.Immutable", "ImmutableArray<T>", False, "AddRange", "(System.Collections.Immutable.ImmutableArray<T>)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Collections.Immutable", "ImmutableArray<T>", False, "AddRange", "(System.Collections.Immutable.ImmutableArray<T>,System.Int32)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["System.Collections.Immutable", "ImmutableArray<T>", False, "AddRange", "(System.Collections.Immutable.ImmutableArray<T>,System.Int32)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Collections.Immutable", "ImmutableArray<T>", False, "AddRange", "(System.ReadOnlySpan<T>)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Collections.Immutable", "ImmutableArray<T>", False, "AddRange", "(System.ReadOnlySpan<T>)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Collections.Immutable", "ImmutableArray<T>", False, "AddRange", "(T[])", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["System.Collections.Immutable", "ImmutableArray<T>", False, "AddRange", "(T[])", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Collections.Immutable", "ImmutableArray<T>", False, "AddRange", "(T[],System.Int32)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["System.Collections.Immutable", "ImmutableArray<T>", False, "AddRange", "(T[],System.Int32)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Collections.Immutable", "ImmutableArray<T>", False, "AddRange<TDerived>", "(System.Collections.Immutable.ImmutableArray<TDerived>)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Collections.Immutable", "ImmutableArray<T>", False, "AddRange<TDerived>", "(TDerived[])", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Collections.Immutable", "ImmutableArray", False, "CreateRange<TSource,TArg,TResult>", "(System.Collections.Immutable.ImmutableArray<TSource>,System.Func<TSource,TArg,TResult>,TArg)", "", "Argument[2]", "Argument[1].Parameter[1]", "value", "dfc-generated"]
+      - ["System.Collections.Immutable", "ImmutableArray", False, "CreateRange<TSource,TArg,TResult>", "(System.Collections.Immutable.ImmutableArray<TSource>,System.Int32,System.Int32,System.Func<TSource,TArg,TResult>,TArg)", "", "Argument[4]", "Argument[3].Parameter[1]", "value", "dfc-generated"]
+      - ["System.Collections.Immutable", "ImmutableArray", False, "ToImmutableArray<TSource>", "(System.Collections.Generic.IEnumerable<TSource>)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Collections.Immutable", "ImmutableArray<T>+Builder", False, "CopyTo", "(System.Span<T>)", "", "Argument[this].SyntheticField[System.Collections.Immutable.ImmutableArray`1+Builder._elements].Element", "Argument[0].Element", "value", "dfc-generated"]
+      - ["System.Collections.Immutable", "ImmutableArray<T>+Builder", False, "DrainToImmutable", "()", "", "Argument[this].SyntheticField[System.Collections.Immutable.ImmutableArray`1+Builder._elements]", "ReturnValue.SyntheticField[System.Collections.Immutable.ImmutableArray`1.array]", "value", "dfc-generated"]
+      - ["System.Collections.Immutable", "ImmutableArray<T>+Builder", False, "IndexOf", "(T,System.Int32,System.Collections.Generic.IEqualityComparer<T>)", "", "Argument[0]", "Argument[2]", "taint", "df-generated"]
+      - ["System.Collections.Immutable", "ImmutableArray<T>+Builder", False, "IndexOf", "(T,System.Int32,System.Collections.Generic.IEqualityComparer<T>)", "", "Argument[this]", "Argument[2]", "taint", "df-generated"]
+      - ["System.Collections.Immutable", "ImmutableArray<T>+Builder", False, "IndexOf", "(T,System.Int32,System.Int32,System.Collections.Generic.IEqualityComparer<T>)", "", "Argument[0]", "Argument[3]", "taint", "df-generated"]
+      - ["System.Collections.Immutable", "ImmutableArray<T>+Builder", False, "IndexOf", "(T,System.Int32,System.Int32,System.Collections.Generic.IEqualityComparer<T>)", "", "Argument[this]", "Argument[3]", "taint", "df-generated"]
+      - ["System.Collections.Immutable", "ImmutableArray<T>+Builder", False, "InsertRange", "(System.Int32,System.Collections.Generic.IEnumerable<T>)", "", "Argument[1].Element", "Argument[this].SyntheticField[System.Collections.Immutable.ImmutableArray`1+Builder._elements].Element", "value", "dfc-generated"]
+      - ["System.Collections.Immutable", "ImmutableArray<T>+Builder", False, "LastIndexOf", "(T,System.Int32,System.Int32,System.Collections.Generic.IEqualityComparer<T>)", "", "Argument[0]", "Argument[3]", "taint", "df-generated"]
+      - ["System.Collections.Immutable", "ImmutableArray<T>+Builder", False, "LastIndexOf", "(T,System.Int32,System.Int32,System.Collections.Generic.IEqualityComparer<T>)", "", "Argument[this]", "Argument[3]", "taint", "df-generated"]
+      - ["System.Collections.Immutable", "ImmutableArray<T>+Builder", False, "MoveToImmutable", "()", "", "Argument[this].SyntheticField[System.Collections.Immutable.ImmutableArray`1+Builder._elements]", "ReturnValue.SyntheticField[System.Collections.Immutable.ImmutableArray`1.array]", "value", "dfc-generated"]
+      - ["System.Collections.Immutable", "ImmutableArray<T>+Builder", False, "Remove", "(T,System.Collections.Generic.IEqualityComparer<T>)", "", "Argument[0]", "Argument[1]", "taint", "df-generated"]
+      - ["System.Collections.Immutable", "ImmutableArray<T>+Builder", False, "Remove", "(T,System.Collections.Generic.IEqualityComparer<T>)", "", "Argument[this]", "Argument[1]", "taint", "df-generated"]
+      - ["System.Collections.Immutable", "ImmutableArray<T>+Builder", False, "RemoveAll", "(System.Predicate<T>)", "", "Argument[this].SyntheticField[System.Collections.Immutable.ImmutableArray`1+Builder._elements].Element", "Argument[0].Parameter[0]", "value", "dfc-generated"]
+      - ["System.Collections.Immutable", "ImmutableArray<T>+Builder", False, "RemoveRange", "(System.Collections.Generic.IEnumerable<T>,System.Collections.Generic.IEqualityComparer<T>)", "", "Argument[0].Element", "Argument[1]", "taint", "df-generated"]
+      - ["System.Collections.Immutable", "ImmutableArray<T>+Builder", False, "RemoveRange", "(System.Collections.Generic.IEnumerable<T>,System.Collections.Generic.IEqualityComparer<T>)", "", "Argument[this]", "Argument[1]", "taint", "df-generated"]
+      - ["System.Collections.Immutable", "ImmutableArray<T>+Builder", False, "Replace", "(T,T)", "", "Argument[1]", "Argument[this].SyntheticField[System.Collections.Immutable.ImmutableArray`1+Builder._elements].Element", "value", "dfc-generated"]
+      - ["System.Collections.Immutable", "ImmutableArray<T>+Builder", False, "Replace", "(T,T,System.Collections.Generic.IEqualityComparer<T>)", "", "Argument[1]", "Argument[this].SyntheticField[System.Collections.Immutable.ImmutableArray`1+Builder._elements].Element", "value", "dfc-generated"]
+      - ["System.Collections.Immutable", "ImmutableArray<T>+Enumerator", False, "get_Current", "()", "", "Argument[this].SyntheticField[System.Collections.Immutable.ImmutableArray`1+Enumerator._array].Element", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Collections.Immutable", "ImmutableArray<T>", False, "Add", "(T)", "", "Argument[0]", "ReturnValue.SyntheticField[System.Collections.Immutable.ImmutableArray`1.array].Element", "value", "dfc-generated"]
+      - ["System.Collections.Immutable", "ImmutableArray<T>", False, "AddRange", "(System.Collections.Generic.IEnumerable<T>)", "", "Argument[0].Element", "ReturnValue.SyntheticField[System.Collections.Immutable.ImmutableArray`1.array].Element", "value", "dfc-generated"]
+      - ["System.Collections.Immutable", "ImmutableArray<T>", False, "AddRange", "(System.Collections.Generic.IEnumerable<T>)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Collections.Immutable", "ImmutableArray<T>", False, "AddRange", "(System.Collections.Immutable.ImmutableArray<T>)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Collections.Immutable", "ImmutableArray<T>", False, "AddRange", "(System.Collections.Immutable.ImmutableArray<T>)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Collections.Immutable", "ImmutableArray<T>", False, "AddRange", "(System.Collections.Immutable.ImmutableArray<T>,System.Int32)", "", "Argument[0].SyntheticField[System.Collections.Immutable.ImmutableArray`1.array].Element", "ReturnValue.SyntheticField[System.Collections.Immutable.ImmutableArray`1.array].Element", "value", "dfc-generated"]
+      - ["System.Collections.Immutable", "ImmutableArray<T>", False, "AddRange", "(System.Collections.Immutable.ImmutableArray<T>,System.Int32)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Collections.Immutable", "ImmutableArray<T>", False, "AddRange", "(System.ReadOnlySpan<T>)", "", "Argument[0].Element", "ReturnValue.Element", "value", "dfc-generated"]
+      - ["System.Collections.Immutable", "ImmutableArray<T>", False, "AddRange", "(System.ReadOnlySpan<T>)", "", "Argument[0].Element", "ReturnValue.SyntheticField[System.Collections.Immutable.ImmutableArray`1.array].Element", "value", "dfc-generated"]
+      - ["System.Collections.Immutable", "ImmutableArray<T>", False, "AddRange", "(System.ReadOnlySpan<T>)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Collections.Immutable", "ImmutableArray<T>", False, "AddRange", "(T[])", "", "Argument[0]", "ReturnValue.SyntheticField[System.Collections.Immutable.ImmutableArray`1.array]", "value", "dfc-generated"]
+      - ["System.Collections.Immutable", "ImmutableArray<T>", False, "AddRange", "(T[])", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Collections.Immutable", "ImmutableArray<T>", False, "AddRange", "(T[],System.Int32)", "", "Argument[0].Element", "ReturnValue.SyntheticField[System.Collections.Immutable.ImmutableArray`1.array].Element", "value", "dfc-generated"]
+      - ["System.Collections.Immutable", "ImmutableArray<T>", False, "AddRange", "(T[],System.Int32)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Collections.Immutable", "ImmutableArray<T>", False, "AddRange<TDerived>", "(System.Collections.Immutable.ImmutableArray<TDerived>)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Collections.Immutable", "ImmutableArray<T>", False, "AddRange<TDerived>", "(TDerived[])", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Collections.Immutable", "ImmutableArray<T>", False, "As<TOther>", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Collections.Immutable", "ImmutableArray<T>", False, "AsMemory", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Collections.Immutable", "ImmutableArray<T>", False, "AsSpan", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Collections.Immutable", "ImmutableArray<T>", False, "AsSpan", "(System.Int32,System.Int32)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Collections.Immutable", "ImmutableArray<T>", False, "AsSpan", "(System.Range)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Collections.Immutable", "ImmutableArray<T>", False, "AsSpan", "()", "", "Argument[this].SyntheticField[System.Collections.Immutable.ImmutableArray`1.array].Element", "ReturnValue.Element", "value", "dfc-generated"]
+      - ["System.Collections.Immutable", "ImmutableArray<T>", False, "AsSpan", "(System.Int32,System.Int32)", "", "Argument[this].SyntheticField[System.Collections.Immutable.ImmutableArray`1.array].Element", "ReturnValue.Element", "value", "dfc-generated"]
+      - ["System.Collections.Immutable", "ImmutableArray<T>", False, "AsSpan", "(System.Range)", "", "Argument[this].SyntheticField[System.Collections.Immutable.ImmutableArray`1.array].Element", "ReturnValue.Element", "value", "dfc-generated"]
       - ["System.Collections.Immutable", "ImmutableArray<T>", False, "CastArray<TOther>", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Collections.Immutable", "ImmutableArray<T>", False, "CastUp<TDerived>", "(System.Collections.Immutable.ImmutableArray<TDerived>)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["System.Collections.Immutable", "ImmutableArray<T>", False, "CopyTo", "(System.Span<T>)", "", "Argument[this]", "Argument[0]", "taint", "df-generated"]
-      - ["System.Collections.Immutable", "ImmutableArray<T>", False, "GetEnumerator", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Collections.Immutable", "ImmutableArray<T>", False, "Contains", "(T,System.Collections.Generic.IEqualityComparer<T>)", "", "Argument[0]", "Argument[1]", "taint", "df-generated"]
+      - ["System.Collections.Immutable", "ImmutableArray<T>", False, "Contains", "(T,System.Collections.Generic.IEqualityComparer<T>)", "", "Argument[this]", "Argument[1]", "taint", "df-generated"]
+      - ["System.Collections.Immutable", "ImmutableArray<T>", False, "CopyTo", "(System.Span<T>)", "", "Argument[this].SyntheticField[System.Collections.Immutable.ImmutableArray`1.array].Element", "Argument[0].Element", "value", "dfc-generated"]
+      - ["System.Collections.Immutable", "ImmutableArray<T>", False, "GetEnumerator", "()", "", "Argument[this].SyntheticField[System.Collections.Immutable.ImmutableArray`1.array]", "ReturnValue.SyntheticField[System.Collections.Immutable.ImmutableArray`1+Enumerator._array]", "value", "dfc-generated"]
+      - ["System.Collections.Immutable", "ImmutableArray<T>", False, "IndexOf", "(T,System.Int32,System.Collections.Generic.IEqualityComparer<T>)", "", "Argument[0]", "Argument[2]", "taint", "df-generated"]
+      - ["System.Collections.Immutable", "ImmutableArray<T>", False, "IndexOf", "(T,System.Int32,System.Collections.Generic.IEqualityComparer<T>)", "", "Argument[this]", "Argument[2]", "taint", "df-generated"]
+      - ["System.Collections.Immutable", "ImmutableArray<T>", False, "IndexOf", "(T,System.Int32,System.Int32,System.Collections.Generic.IEqualityComparer<T>)", "", "Argument[0]", "Argument[3]", "taint", "df-generated"]
+      - ["System.Collections.Immutable", "ImmutableArray<T>", False, "IndexOf", "(T,System.Int32,System.Int32,System.Collections.Generic.IEqualityComparer<T>)", "", "Argument[this]", "Argument[3]", "taint", "df-generated"]
+      - ["System.Collections.Immutable", "ImmutableArray<T>", False, "Insert", "(System.Int32,T)", "", "Argument[1]", "ReturnValue.SyntheticField[System.Collections.Immutable.ImmutableArray`1.array].Element", "value", "dfc-generated"]
       - ["System.Collections.Immutable", "ImmutableArray<T>", False, "Insert", "(System.Int32,T)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Collections.Immutable", "ImmutableArray<T>", False, "InsertRange", "(System.Int32,System.Collections.Generic.IEnumerable<T>)", "", "Argument[1].Element", "ReturnValue", "taint", "df-generated"]
-      - ["System.Collections.Immutable", "ImmutableArray<T>", False, "InsertRange", "(System.Int32,System.Collections.Generic.IEnumerable<T>)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Collections.Immutable", "ImmutableArray<T>", False, "InsertRange", "(System.Int32,System.Collections.Immutable.ImmutableArray<T>)", "", "Argument[1].Element", "ReturnValue", "taint", "df-generated"]
-      - ["System.Collections.Immutable", "ImmutableArray<T>", False, "InsertRange", "(System.Int32,System.Collections.Immutable.ImmutableArray<T>)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Collections.Immutable", "ImmutableArray<T>", False, "InsertRange", "(System.Int32,System.ReadOnlySpan<T>)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Collections.Immutable", "ImmutableArray<T>", False, "InsertRange", "(System.Int32,System.ReadOnlySpan<T>)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Collections.Immutable", "ImmutableArray<T>", False, "InsertRange", "(System.Int32,T[])", "", "Argument[1].Element", "ReturnValue", "taint", "df-generated"]
-      - ["System.Collections.Immutable", "ImmutableArray<T>", False, "InsertRange", "(System.Int32,T[])", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Collections.Immutable", "ImmutableArray<T>", False, "OfType<TResult>", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Collections.Immutable", "ImmutableArray<T>", False, "Remove", "(T)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Collections.Immutable", "ImmutableArray<T>", False, "Remove", "(T,System.Collections.Generic.IEqualityComparer<T>)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Collections.Immutable", "ImmutableArray<T>", False, "RemoveAt", "(System.Int32)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Collections.Immutable", "ImmutableArray<T>", False, "RemoveRange", "(System.Collections.Generic.IEnumerable<T>)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Collections.Immutable", "ImmutableArray<T>", False, "RemoveRange", "(System.Collections.Generic.IEnumerable<T>,System.Collections.Generic.IEqualityComparer<T>)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Collections.Immutable", "ImmutableArray<T>", False, "RemoveRange", "(System.Collections.Immutable.ImmutableArray<T>)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Collections.Immutable", "ImmutableArray<T>", False, "RemoveRange", "(System.Collections.Immutable.ImmutableArray<T>,System.Collections.Generic.IEqualityComparer<T>)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Collections.Immutable", "ImmutableArray<T>", False, "RemoveRange", "(System.Int32,System.Int32)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Collections.Immutable", "ImmutableArray<T>", False, "RemoveRange", "(System.ReadOnlySpan<T>,System.Collections.Generic.IEqualityComparer<T>)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Collections.Immutable", "ImmutableArray<T>", False, "RemoveRange", "(T[],System.Collections.Generic.IEqualityComparer<T>)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Collections.Immutable", "ImmutableArray<T>", False, "Replace", "(T,T)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Collections.Immutable", "ImmutableArray<T>", False, "InsertRange", "(System.Int32,System.Collections.Generic.IEnumerable<T>)", "", "Argument[1].Element", "ReturnValue.SyntheticField[System.Collections.Immutable.ImmutableArray`1.array].Element", "value", "dfc-generated"]
+      - ["System.Collections.Immutable", "ImmutableArray<T>", False, "InsertRange", "(System.Int32,System.Collections.Generic.IEnumerable<T>)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Collections.Immutable", "ImmutableArray<T>", False, "InsertRange", "(System.Int32,System.Collections.Immutable.ImmutableArray<T>)", "", "Argument[1]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Collections.Immutable", "ImmutableArray<T>", False, "InsertRange", "(System.Int32,System.Collections.Immutable.ImmutableArray<T>)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Collections.Immutable", "ImmutableArray<T>", False, "InsertRange", "(System.Int32,System.ReadOnlySpan<T>)", "", "Argument[1].Element", "ReturnValue.Element", "value", "dfc-generated"]
+      - ["System.Collections.Immutable", "ImmutableArray<T>", False, "InsertRange", "(System.Int32,System.ReadOnlySpan<T>)", "", "Argument[1].Element", "ReturnValue.SyntheticField[System.Collections.Immutable.ImmutableArray`1.array].Element", "value", "dfc-generated"]
+      - ["System.Collections.Immutable", "ImmutableArray<T>", False, "InsertRange", "(System.Int32,System.ReadOnlySpan<T>)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Collections.Immutable", "ImmutableArray<T>", False, "InsertRange", "(System.Int32,T[])", "", "Argument[1]", "ReturnValue.SyntheticField[System.Collections.Immutable.ImmutableArray`1.array]", "value", "dfc-generated"]
+      - ["System.Collections.Immutable", "ImmutableArray<T>", False, "InsertRange", "(System.Int32,T[])", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Collections.Immutable", "ImmutableArray<T>", False, "LastIndexOf", "(T,System.Int32,System.Int32,System.Collections.Generic.IEqualityComparer<T>)", "", "Argument[0]", "Argument[3]", "taint", "df-generated"]
+      - ["System.Collections.Immutable", "ImmutableArray<T>", False, "LastIndexOf", "(T,System.Int32,System.Int32,System.Collections.Generic.IEqualityComparer<T>)", "", "Argument[this]", "Argument[3]", "taint", "df-generated"]
+      - ["System.Collections.Immutable", "ImmutableArray<T>", False, "OfType<TResult>", "()", "", "Argument[this].SyntheticField[System.Collections.Immutable.ImmutableArray`1.array].Element", "ReturnValue.Element", "value", "dfc-generated"]
+      - ["System.Collections.Immutable", "ImmutableArray<T>", False, "Remove", "(T)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Collections.Immutable", "ImmutableArray<T>", False, "Remove", "(T,System.Collections.Generic.IEqualityComparer<T>)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Collections.Immutable", "ImmutableArray<T>", False, "RemoveAll", "(System.Predicate<T>)", "", "Argument[this].SyntheticField[System.Collections.Immutable.ImmutableArray`1.array].Element", "Argument[0].Parameter[0]", "value", "dfc-generated"]
+      - ["System.Collections.Immutable", "ImmutableArray<T>", False, "RemoveAll", "(System.Predicate<T>)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Collections.Immutable", "ImmutableArray<T>", False, "RemoveAt", "(System.Int32)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Collections.Immutable", "ImmutableArray<T>", False, "RemoveRange", "(System.Collections.Generic.IEnumerable<T>)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Collections.Immutable", "ImmutableArray<T>", False, "RemoveRange", "(System.Collections.Generic.IEnumerable<T>,System.Collections.Generic.IEqualityComparer<T>)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Collections.Immutable", "ImmutableArray<T>", False, "RemoveRange", "(System.Collections.Immutable.ImmutableArray<T>)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Collections.Immutable", "ImmutableArray<T>", False, "RemoveRange", "(System.Collections.Immutable.ImmutableArray<T>,System.Collections.Generic.IEqualityComparer<T>)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Collections.Immutable", "ImmutableArray<T>", False, "RemoveRange", "(System.Int32,System.Int32)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Collections.Immutable", "ImmutableArray<T>", False, "RemoveRange", "(System.ReadOnlySpan<T>,System.Collections.Generic.IEqualityComparer<T>)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Collections.Immutable", "ImmutableArray<T>", False, "RemoveRange", "(T[],System.Collections.Generic.IEqualityComparer<T>)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Collections.Immutable", "ImmutableArray<T>", False, "Replace", "(T,T)", "", "Argument[1]", "ReturnValue.SyntheticField[System.Collections.Immutable.ImmutableArray`1.array].Element", "value", "dfc-generated"]
+      - ["System.Collections.Immutable", "ImmutableArray<T>", False, "Replace", "(T,T,System.Collections.Generic.IEqualityComparer<T>)", "", "Argument[0]", "Argument[2]", "taint", "df-generated"]
+      - ["System.Collections.Immutable", "ImmutableArray<T>", False, "Replace", "(T,T,System.Collections.Generic.IEqualityComparer<T>)", "", "Argument[1]", "ReturnValue.SyntheticField[System.Collections.Immutable.ImmutableArray`1.array].Element", "value", "dfc-generated"]
       - ["System.Collections.Immutable", "ImmutableArray<T>", False, "Replace", "(T,T,System.Collections.Generic.IEqualityComparer<T>)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Collections.Immutable", "ImmutableArray<T>", False, "Replace", "(T,T,System.Collections.Generic.IEqualityComparer<T>)", "", "Argument[this]", "Argument[2]", "taint", "df-generated"]
+      - ["System.Collections.Immutable", "ImmutableArray<T>", False, "SetItem", "(System.Int32,T)", "", "Argument[1]", "ReturnValue.SyntheticField[System.Collections.Immutable.ImmutableArray`1.array].Element", "value", "dfc-generated"]
       - ["System.Collections.Immutable", "ImmutableArray<T>", False, "SetItem", "(System.Int32,T)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Collections.Immutable", "ImmutableArray<T>", False, "Slice", "(System.Int32,System.Int32)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Collections.Immutable", "ImmutableArray<T>", False, "Sort", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Collections.Immutable", "ImmutableArray<T>", False, "Slice", "(System.Int32,System.Int32)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Collections.Immutable", "ImmutableArray<T>", False, "Sort", "()", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Collections.Immutable", "ImmutableArray<T>", False, "Sort", "(System.Collections.Generic.IComparer<T>)", "", "Argument[this]", "Argument[0]", "taint", "df-generated"]
       - ["System.Collections.Immutable", "ImmutableArray<T>", False, "Sort", "(System.Collections.Generic.IComparer<T>)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Collections.Immutable", "ImmutableArray<T>", False, "Sort", "(System.Comparison<T>)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Collections.Immutable", "ImmutableArray<T>", False, "Sort", "(System.Int32,System.Int32,System.Collections.Generic.IComparer<T>)", "", "Argument[this]", "Argument[2]", "taint", "df-generated"]
       - ["System.Collections.Immutable", "ImmutableArray<T>", False, "Sort", "(System.Int32,System.Int32,System.Collections.Generic.IComparer<T>)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Collections.Immutable", "ImmutableArray<T>", False, "ToBuilder", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Collections.Immutable", "ImmutableArray<T>", False, "get_Item", "(System.Int32)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Collections.Immutable", "ImmutableArray<T>", False, "ToBuilder", "()", "", "Argument[this].Element", "ReturnValue.Element", "value", "dfc-generated"]
+      - ["System.Collections.Immutable", "ImmutableArray<T>", False, "get_Item", "(System.Int32)", "", "Argument[this].SyntheticField[System.Collections.Immutable.ImmutableArray`1.array].Element", "ReturnValue", "value", "dfc-generated"]
       - ["System.Collections.Immutable", "ImmutableDictionary", False, "Create<TKey,TValue>", "(System.Collections.Generic.IEqualityComparer<TKey>)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["System.Collections.Immutable", "ImmutableDictionary", False, "Create<TKey,TValue>", "(System.Collections.Generic.IEqualityComparer<TKey>,System.Collections.Generic.IEqualityComparer<TValue>)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["System.Collections.Immutable", "ImmutableDictionary", False, "Create<TKey,TValue>", "(System.Collections.Generic.IEqualityComparer<TKey>,System.Collections.Generic.IEqualityComparer<TValue>)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
       - ["System.Collections.Immutable", "ImmutableDictionary", False, "CreateBuilder<TKey,TValue>", "(System.Collections.Generic.IEqualityComparer<TKey>)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["System.Collections.Immutable", "ImmutableDictionary", False, "CreateBuilder<TKey,TValue>", "(System.Collections.Generic.IEqualityComparer<TKey>,System.Collections.Generic.IEqualityComparer<TValue>)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["System.Collections.Immutable", "ImmutableDictionary", False, "CreateBuilder<TKey,TValue>", "(System.Collections.Generic.IEqualityComparer<TKey>,System.Collections.Generic.IEqualityComparer<TValue>)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Collections.Immutable", "ImmutableDictionary", False, "CreateRange<TKey,TValue>", "(System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<TKey,TValue>>)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["System.Collections.Immutable", "ImmutableDictionary", False, "CreateRange<TKey,TValue>", "(System.Collections.Generic.IEqualityComparer<TKey>,System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<TKey,TValue>>)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Collections.Immutable", "ImmutableDictionary", False, "CreateRange<TKey,TValue>", "(System.Collections.Generic.IEqualityComparer<TKey>,System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<TKey,TValue>>)", "", "Argument[1].Element", "ReturnValue", "taint", "df-generated"]
-      - ["System.Collections.Immutable", "ImmutableDictionary", False, "CreateRange<TKey,TValue>", "(System.Collections.Generic.IEqualityComparer<TKey>,System.Collections.Generic.IEqualityComparer<TValue>,System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<TKey,TValue>>)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Collections.Immutable", "ImmutableDictionary", False, "CreateRange<TKey,TValue>", "(System.Collections.Generic.IEqualityComparer<TKey>,System.Collections.Generic.IEqualityComparer<TValue>,System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<TKey,TValue>>)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Collections.Immutable", "ImmutableDictionary", False, "CreateRange<TKey,TValue>", "(System.Collections.Generic.IEqualityComparer<TKey>,System.Collections.Generic.IEqualityComparer<TValue>,System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<TKey,TValue>>)", "", "Argument[2].Element", "ReturnValue", "taint", "df-generated"]
-      - ["System.Collections.Immutable", "ImmutableDictionary", False, "GetValueOrDefault<TKey,TValue>", "(System.Collections.Immutable.IImmutableDictionary<TKey,TValue>,TKey,TValue)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Collections.Immutable", "ImmutableDictionary", False, "ToImmutableDictionary<TKey,TValue>", "(System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<TKey,TValue>>)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["System.Collections.Immutable", "ImmutableDictionary", False, "ToImmutableDictionary<TKey,TValue>", "(System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<TKey,TValue>>,System.Collections.Generic.IEqualityComparer<TKey>)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["System.Collections.Immutable", "ImmutableDictionary", False, "ToImmutableDictionary<TKey,TValue>", "(System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<TKey,TValue>>,System.Collections.Generic.IEqualityComparer<TKey>)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Collections.Immutable", "ImmutableDictionary", False, "ToImmutableDictionary<TKey,TValue>", "(System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<TKey,TValue>>,System.Collections.Generic.IEqualityComparer<TKey>,System.Collections.Generic.IEqualityComparer<TValue>)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["System.Collections.Immutable", "ImmutableDictionary", False, "ToImmutableDictionary<TKey,TValue>", "(System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<TKey,TValue>>,System.Collections.Generic.IEqualityComparer<TKey>,System.Collections.Generic.IEqualityComparer<TValue>)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Collections.Immutable", "ImmutableDictionary", False, "ToImmutableDictionary<TKey,TValue>", "(System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<TKey,TValue>>,System.Collections.Generic.IEqualityComparer<TKey>,System.Collections.Generic.IEqualityComparer<TValue>)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Collections.Immutable", "ImmutableDictionary<TKey,TValue>+Builder", False, "GetValueOrDefault", "(TKey,TValue)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Collections.Immutable", "ImmutableDictionary<TKey,TValue>+Builder", False, "TryGetKey", "(TKey,TKey)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Collections.Immutable", "ImmutableDictionary", False, "CreateRange<TKey,TValue>", "(System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<TKey,TValue>>)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Collections.Immutable", "ImmutableDictionary", False, "CreateRange<TKey,TValue>", "(System.Collections.Generic.IEqualityComparer<TKey>,System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<TKey,TValue>>)", "", "Argument[1]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Collections.Immutable", "ImmutableDictionary", False, "CreateRange<TKey,TValue>", "(System.Collections.Generic.IEqualityComparer<TKey>,System.Collections.Generic.IEqualityComparer<TValue>,System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<TKey,TValue>>)", "", "Argument[2]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Collections.Immutable", "ImmutableDictionary", False, "GetValueOrDefault<TKey,TValue>", "(System.Collections.Immutable.IImmutableDictionary<TKey,TValue>,TKey,TValue)", "", "Argument[2]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Collections.Immutable", "ImmutableDictionary", False, "ToImmutableDictionary<TKey,TValue>", "(System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<TKey,TValue>>)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Collections.Immutable", "ImmutableDictionary", False, "ToImmutableDictionary<TKey,TValue>", "(System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<TKey,TValue>>,System.Collections.Generic.IEqualityComparer<TKey>)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Collections.Immutable", "ImmutableDictionary", False, "ToImmutableDictionary<TKey,TValue>", "(System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<TKey,TValue>>,System.Collections.Generic.IEqualityComparer<TKey>,System.Collections.Generic.IEqualityComparer<TValue>)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Collections.Immutable", "ImmutableDictionary<TKey,TValue>+Builder", False, "GetValueOrDefault", "(TKey,TValue)", "", "Argument[1]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Collections.Immutable", "ImmutableDictionary<TKey,TValue>+Builder", False, "TryGetKey", "(TKey,TKey)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Collections.Immutable", "ImmutableDictionary<TKey,TValue>+Builder", False, "TryGetValue", "(TKey,TValue)", "", "Argument[1]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Collections.Immutable", "ImmutableDictionary<TKey,TValue>+Enumerator", False, "get_Current", "()", "", "Argument[this].Property[System.Collections.Immutable.ImmutableDictionary`2+Enumerator.Current]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Collections.Immutable", "ImmutableDictionary<TKey,TValue>+Enumerator", False, "get_Current", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Collections.Immutable", "ImmutableDictionary<TKey,TValue>", False, "Clear", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Collections.Immutable", "ImmutableDictionary<TKey,TValue>", False, "Clear", "()", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Collections.Immutable", "ImmutableDictionary<TKey,TValue>", False, "Remove", "(TKey)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Collections.Immutable", "ImmutableDictionary<TKey,TValue>", False, "RemoveRange", "(System.Collections.Generic.IEnumerable<TKey>)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Collections.Immutable", "ImmutableDictionary<TKey,TValue>", False, "SetItem", "(TKey,TValue)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
@@ -113,41 +139,80 @@ extensions:
       - ["System.Collections.Immutable", "ImmutableDictionary<TKey,TValue>", False, "SetItems", "(System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<TKey,TValue>>)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
       - ["System.Collections.Immutable", "ImmutableDictionary<TKey,TValue>", False, "SetItems", "(System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<TKey,TValue>>)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Collections.Immutable", "ImmutableDictionary<TKey,TValue>", False, "ToBuilder", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Collections.Immutable", "ImmutableDictionary<TKey,TValue>", False, "TryGetKey", "(TKey,TKey)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Collections.Immutable", "ImmutableDictionary<TKey,TValue>", False, "WithComparers", "(System.Collections.Generic.IEqualityComparer<TKey>)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Collections.Immutable", "ImmutableDictionary<TKey,TValue>", False, "WithComparers", "(System.Collections.Generic.IEqualityComparer<TKey>)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Collections.Immutable", "ImmutableDictionary<TKey,TValue>", False, "WithComparers", "(System.Collections.Generic.IEqualityComparer<TKey>,System.Collections.Generic.IEqualityComparer<TValue>)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["System.Collections.Immutable", "ImmutableDictionary<TKey,TValue>", False, "get_KeyComparer", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Collections.Immutable", "ImmutableDictionary<TKey,TValue>", False, "get_ValueComparer", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Collections.Immutable", "ImmutableDictionary<TKey,TValue>", False, "TryGetKey", "(TKey,TKey)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Collections.Immutable", "ImmutableDictionary<TKey,TValue>", False, "TryGetValue", "(TKey,TValue)", "", "Argument[1]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Collections.Immutable", "ImmutableDictionary<TKey,TValue>", False, "WithComparers", "(System.Collections.Generic.IEqualityComparer<TKey>)", "", "Argument[0]", "ReturnValue.SyntheticField[System.Collections.Immutable.ImmutableDictionary`2._comparers].SyntheticField[System.Collections.Immutable.ImmutableDictionary`2+Comparers._keyComparer]", "value", "dfc-generated"]
+      - ["System.Collections.Immutable", "ImmutableDictionary<TKey,TValue>", False, "WithComparers", "(System.Collections.Generic.IEqualityComparer<TKey>,System.Collections.Generic.IEqualityComparer<TValue>)", "", "Argument[0]", "ReturnValue.SyntheticField[System.Collections.Immutable.ImmutableDictionary`2._comparers].SyntheticField[System.Collections.Immutable.ImmutableDictionary`2+Comparers._keyComparer]", "value", "dfc-generated"]
+      - ["System.Collections.Immutable", "ImmutableDictionary<TKey,TValue>", False, "WithComparers", "(System.Collections.Generic.IEqualityComparer<TKey>,System.Collections.Generic.IEqualityComparer<TValue>)", "", "Argument[1]", "ReturnValue.SyntheticField[System.Collections.Immutable.ImmutableDictionary`2._comparers].SyntheticField[System.Collections.Immutable.ImmutableDictionary`2+Comparers._valueComparer]", "value", "dfc-generated"]
+      - ["System.Collections.Immutable", "ImmutableDictionary<TKey,TValue>", False, "WithComparers", "(System.Collections.Generic.IEqualityComparer<TKey>,System.Collections.Generic.IEqualityComparer<TValue>)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Collections.Immutable", "ImmutableDictionary<TKey,TValue>", False, "get_KeyComparer", "()", "", "Argument[this].SyntheticField[System.Collections.Immutable.ImmutableDictionary`2._comparers].SyntheticField[System.Collections.Immutable.ImmutableDictionary`2+Comparers._keyComparer]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Collections.Immutable", "ImmutableDictionary<TKey,TValue>", False, "get_ValueComparer", "()", "", "Argument[this].SyntheticField[System.Collections.Immutable.ImmutableDictionary`2._comparers].SyntheticField[System.Collections.Immutable.ImmutableDictionary`2+Comparers._valueComparer]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Collections.Immutable", "ImmutableHashSet", False, "Create<T>", "(System.Collections.Generic.IEqualityComparer<T>,System.ReadOnlySpan<T>)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
       - ["System.Collections.Immutable", "ImmutableHashSet", False, "Create<T>", "(System.Collections.Generic.IEqualityComparer<T>,T)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
       - ["System.Collections.Immutable", "ImmutableHashSet", False, "Create<T>", "(System.Collections.Generic.IEqualityComparer<T>,T[])", "", "Argument[1].Element", "ReturnValue", "taint", "df-generated"]
       - ["System.Collections.Immutable", "ImmutableHashSet", False, "Create<T>", "(System.ReadOnlySpan<T>)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["System.Collections.Immutable", "ImmutableHashSet", False, "Create<T>", "(T)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["System.Collections.Immutable", "ImmutableHashSet", False, "Create<T>", "(T[])", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["System.Collections.Immutable", "ImmutableHashSet", False, "CreateRange<T>", "(System.Collections.Generic.IEnumerable<T>)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["System.Collections.Immutable", "ImmutableHashSet", False, "CreateRange<T>", "(System.Collections.Generic.IEqualityComparer<T>,System.Collections.Generic.IEnumerable<T>)", "", "Argument[1].Element", "ReturnValue", "taint", "df-generated"]
-      - ["System.Collections.Immutable", "ImmutableHashSet", False, "ToImmutableHashSet<TSource>", "(System.Collections.Generic.IEnumerable<TSource>)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["System.Collections.Immutable", "ImmutableHashSet", False, "ToImmutableHashSet<TSource>", "(System.Collections.Generic.IEnumerable<TSource>,System.Collections.Generic.IEqualityComparer<TSource>)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
+      - ["System.Collections.Immutable", "ImmutableHashSet", False, "CreateRange<T>", "(System.Collections.Generic.IEnumerable<T>)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Collections.Immutable", "ImmutableHashSet", False, "CreateRange<T>", "(System.Collections.Generic.IEqualityComparer<T>,System.Collections.Generic.IEnumerable<T>)", "", "Argument[1]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Collections.Immutable", "ImmutableHashSet", False, "ToImmutableHashSet<TSource>", "(System.Collections.Generic.IEnumerable<TSource>)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Collections.Immutable", "ImmutableHashSet", False, "ToImmutableHashSet<TSource>", "(System.Collections.Generic.IEnumerable<TSource>,System.Collections.Generic.IEqualityComparer<TSource>)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Collections.Immutable", "ImmutableHashSet<T>+Builder", False, "SymmetricExceptWith", "(System.Collections.Generic.IEnumerable<T>)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["System.Collections.Immutable", "ImmutableHashSet<T>+Builder", False, "TryGetValue", "(T,T)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Collections.Immutable", "ImmutableHashSet<T>+Builder", False, "TryGetValue", "(T,T)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Collections.Immutable", "ImmutableHashSet<T>+Enumerator", False, "get_Current", "()", "", "Argument[this].Property[System.Collections.Immutable.ImmutableHashSet`1+Enumerator.Current]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Collections.Immutable", "ImmutableHashSet<T>+Enumerator", False, "get_Current", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Collections.Immutable", "ImmutableHashSet<T>", False, "Except", "(System.Collections.Generic.IEnumerable<T>)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Collections.Immutable", "ImmutableHashSet<T>", False, "Intersect", "(System.Collections.Generic.IEnumerable<T>)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Collections.Immutable", "ImmutableHashSet<T>", False, "Intersect", "(System.Collections.Generic.IEnumerable<T>)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Collections.Immutable", "ImmutableHashSet<T>", False, "Remove", "(T)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Collections.Immutable", "ImmutableHashSet<T>", False, "SymmetricExcept", "(System.Collections.Generic.IEnumerable<T>)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["System.Collections.Immutable", "ImmutableHashSet<T>", False, "SymmetricExcept", "(System.Collections.Generic.IEnumerable<T>)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Collections.Immutable", "ImmutableHashSet<T>", False, "SymmetricExcept", "(System.Collections.Generic.IEnumerable<T>)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Collections.Immutable", "ImmutableHashSet<T>", False, "ToBuilder", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Collections.Immutable", "ImmutableHashSet<T>", False, "TryGetValue", "(T,T)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Collections.Immutable", "ImmutableHashSet<T>", False, "Union", "(System.Collections.Generic.IEnumerable<T>)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["System.Collections.Immutable", "ImmutableHashSet<T>", False, "Union", "(System.Collections.Generic.IEnumerable<T>)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Collections.Immutable", "ImmutableHashSet<T>", False, "WithComparer", "(System.Collections.Generic.IEqualityComparer<T>)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["System.Collections.Immutable", "ImmutableHashSet<T>", False, "TryGetValue", "(T,T)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Collections.Immutable", "ImmutableHashSet<T>", False, "Union", "(System.Collections.Generic.IEnumerable<T>)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Collections.Immutable", "ImmutableHashSet<T>", False, "WithComparer", "(System.Collections.Generic.IEqualityComparer<T>)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Collections.Immutable", "ImmutableHashSet<T>", False, "get_KeyComparer", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Collections.Immutable", "ImmutableInterlocked", False, "GetOrAdd<TKey,TValue>", "(System.Collections.Immutable.ImmutableDictionary<TKey,TValue>,TKey,TValue)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Collections.Immutable", "ImmutableInterlocked", False, "AddOrUpdate<TKey,TValue>", "(System.Collections.Immutable.ImmutableDictionary<TKey,TValue>,TKey,System.Func<TKey,TValue>,System.Func<TKey,TValue,TValue>)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Collections.Immutable", "ImmutableInterlocked", False, "AddOrUpdate<TKey,TValue>", "(System.Collections.Immutable.ImmutableDictionary<TKey,TValue>,TKey,System.Func<TKey,TValue>,System.Func<TKey,TValue,TValue>)", "", "Argument[1]", "Argument[2].Parameter[0]", "value", "dfc-generated"]
+      - ["System.Collections.Immutable", "ImmutableInterlocked", False, "AddOrUpdate<TKey,TValue>", "(System.Collections.Immutable.ImmutableDictionary<TKey,TValue>,TKey,System.Func<TKey,TValue>,System.Func<TKey,TValue,TValue>)", "", "Argument[1]", "Argument[3].Parameter[0]", "value", "dfc-generated"]
+      - ["System.Collections.Immutable", "ImmutableInterlocked", False, "AddOrUpdate<TKey,TValue>", "(System.Collections.Immutable.ImmutableDictionary<TKey,TValue>,TKey,System.Func<TKey,TValue>,System.Func<TKey,TValue,TValue>)", "", "Argument[2].ReturnValue", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Collections.Immutable", "ImmutableInterlocked", False, "AddOrUpdate<TKey,TValue>", "(System.Collections.Immutable.ImmutableDictionary<TKey,TValue>,TKey,System.Func<TKey,TValue>,System.Func<TKey,TValue,TValue>)", "", "Argument[3].ReturnValue", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Collections.Immutable", "ImmutableInterlocked", False, "AddOrUpdate<TKey,TValue>", "(System.Collections.Immutable.ImmutableDictionary<TKey,TValue>,TKey,TValue,System.Func<TKey,TValue,TValue>)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Collections.Immutable", "ImmutableInterlocked", False, "AddOrUpdate<TKey,TValue>", "(System.Collections.Immutable.ImmutableDictionary<TKey,TValue>,TKey,TValue,System.Func<TKey,TValue,TValue>)", "", "Argument[1]", "Argument[3].Parameter[0]", "value", "dfc-generated"]
+      - ["System.Collections.Immutable", "ImmutableInterlocked", False, "AddOrUpdate<TKey,TValue>", "(System.Collections.Immutable.ImmutableDictionary<TKey,TValue>,TKey,TValue,System.Func<TKey,TValue,TValue>)", "", "Argument[2]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Collections.Immutable", "ImmutableInterlocked", False, "AddOrUpdate<TKey,TValue>", "(System.Collections.Immutable.ImmutableDictionary<TKey,TValue>,TKey,TValue,System.Func<TKey,TValue,TValue>)", "", "Argument[3].ReturnValue", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Collections.Immutable", "ImmutableInterlocked", False, "Enqueue<T>", "(System.Collections.Immutable.ImmutableQueue<T>,T)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Collections.Immutable", "ImmutableInterlocked", False, "GetOrAdd<TKey,TValue,TArg>", "(System.Collections.Immutable.ImmutableDictionary<TKey,TValue>,TKey,System.Func<TKey,TArg,TValue>,TArg)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Collections.Immutable", "ImmutableInterlocked", False, "GetOrAdd<TKey,TValue,TArg>", "(System.Collections.Immutable.ImmutableDictionary<TKey,TValue>,TKey,System.Func<TKey,TArg,TValue>,TArg)", "", "Argument[1]", "Argument[2].Parameter[0]", "value", "dfc-generated"]
+      - ["System.Collections.Immutable", "ImmutableInterlocked", False, "GetOrAdd<TKey,TValue,TArg>", "(System.Collections.Immutable.ImmutableDictionary<TKey,TValue>,TKey,System.Func<TKey,TArg,TValue>,TArg)", "", "Argument[2].ReturnValue", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Collections.Immutable", "ImmutableInterlocked", False, "GetOrAdd<TKey,TValue,TArg>", "(System.Collections.Immutable.ImmutableDictionary<TKey,TValue>,TKey,System.Func<TKey,TArg,TValue>,TArg)", "", "Argument[3]", "Argument[2].Parameter[1]", "value", "dfc-generated"]
+      - ["System.Collections.Immutable", "ImmutableInterlocked", False, "GetOrAdd<TKey,TValue>", "(System.Collections.Immutable.ImmutableDictionary<TKey,TValue>,TKey,System.Func<TKey,TValue>)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Collections.Immutable", "ImmutableInterlocked", False, "GetOrAdd<TKey,TValue>", "(System.Collections.Immutable.ImmutableDictionary<TKey,TValue>,TKey,System.Func<TKey,TValue>)", "", "Argument[1]", "Argument[2].Parameter[0]", "value", "dfc-generated"]
+      - ["System.Collections.Immutable", "ImmutableInterlocked", False, "GetOrAdd<TKey,TValue>", "(System.Collections.Immutable.ImmutableDictionary<TKey,TValue>,TKey,System.Func<TKey,TValue>)", "", "Argument[2].ReturnValue", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Collections.Immutable", "ImmutableInterlocked", False, "GetOrAdd<TKey,TValue>", "(System.Collections.Immutable.ImmutableDictionary<TKey,TValue>,TKey,TValue)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Collections.Immutable", "ImmutableInterlocked", False, "GetOrAdd<TKey,TValue>", "(System.Collections.Immutable.ImmutableDictionary<TKey,TValue>,TKey,TValue)", "", "Argument[2]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Collections.Immutable", "ImmutableInterlocked", False, "InterlockedCompareExchange<T>", "(System.Collections.Immutable.ImmutableArray<T>,System.Collections.Immutable.ImmutableArray<T>,System.Collections.Immutable.ImmutableArray<T>)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Collections.Immutable", "ImmutableInterlocked", False, "InterlockedExchange<T>", "(System.Collections.Immutable.ImmutableArray<T>,System.Collections.Immutable.ImmutableArray<T>)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Collections.Immutable", "ImmutableInterlocked", False, "InterlockedInitialize<T>", "(System.Collections.Immutable.ImmutableArray<T>,System.Collections.Immutable.ImmutableArray<T>)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Collections.Immutable", "ImmutableInterlocked", False, "Push<T>", "(System.Collections.Immutable.ImmutableStack<T>,T)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Collections.Immutable", "ImmutableInterlocked", False, "TryAdd<TKey,TValue>", "(System.Collections.Immutable.ImmutableDictionary<TKey,TValue>,TKey,TValue)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Collections.Immutable", "ImmutableInterlocked", False, "TryDequeue<T>", "(System.Collections.Immutable.ImmutableQueue<T>,T)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Collections.Immutable", "ImmutableInterlocked", False, "TryPop<T>", "(System.Collections.Immutable.ImmutableStack<T>,T)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Collections.Immutable", "ImmutableInterlocked", False, "TryRemove<TKey,TValue>", "(System.Collections.Immutable.ImmutableDictionary<TKey,TValue>,TKey,TValue)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Collections.Immutable", "ImmutableInterlocked", False, "TryRemove<TKey,TValue>", "(System.Collections.Immutable.ImmutableDictionary<TKey,TValue>,TKey,TValue)", "", "Argument[2]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Collections.Immutable", "ImmutableInterlocked", False, "TryUpdate<TKey,TValue>", "(System.Collections.Immutable.ImmutableDictionary<TKey,TValue>,TKey,TValue,TValue)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Collections.Immutable", "ImmutableInterlocked", False, "Update<T,TArg>", "(System.Collections.Immutable.ImmutableArray<T>,System.Func<System.Collections.Immutable.ImmutableArray<T>,TArg,System.Collections.Immutable.ImmutableArray<T>>,TArg)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Collections.Immutable", "ImmutableInterlocked", False, "Update<T,TArg>", "(System.Collections.Immutable.ImmutableArray<T>,System.Func<System.Collections.Immutable.ImmutableArray<T>,TArg,System.Collections.Immutable.ImmutableArray<T>>,TArg)", "", "Argument[2]", "Argument[1].Parameter[1]", "value", "dfc-generated"]
+      - ["System.Collections.Immutable", "ImmutableInterlocked", False, "Update<T,TArg>", "(T,System.Func<T,TArg,T>,TArg)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Collections.Immutable", "ImmutableInterlocked", False, "Update<T,TArg>", "(T,System.Func<T,TArg,T>,TArg)", "", "Argument[2]", "Argument[1].Parameter[1]", "value", "dfc-generated"]
+      - ["System.Collections.Immutable", "ImmutableInterlocked", False, "Update<T>", "(System.Collections.Immutable.ImmutableArray<T>,System.Func<System.Collections.Immutable.ImmutableArray<T>,System.Collections.Immutable.ImmutableArray<T>>)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Collections.Immutable", "ImmutableInterlocked", False, "Update<T>", "(T,System.Func<T,T>)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Collections.Immutable", "ImmutableList", False, "Create<T>", "(System.ReadOnlySpan<T>)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["System.Collections.Immutable", "ImmutableList", False, "Create<T>", "(T)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["System.Collections.Immutable", "ImmutableList", False, "Create<T>", "(T[])", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
       - ["System.Collections.Immutable", "ImmutableList", False, "CreateRange<T>", "(System.Collections.Generic.IEnumerable<T>)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
+      - ["System.Collections.Immutable", "ImmutableList", False, "IndexOf<T>", "(System.Collections.Immutable.IImmutableList<T>,T,System.Collections.Generic.IEqualityComparer<T>)", "", "Argument[0].Element", "Argument[2]", "taint", "df-generated"]
+      - ["System.Collections.Immutable", "ImmutableList", False, "IndexOf<T>", "(System.Collections.Immutable.IImmutableList<T>,T,System.Collections.Generic.IEqualityComparer<T>)", "", "Argument[1]", "Argument[2]", "taint", "df-generated"]
+      - ["System.Collections.Immutable", "ImmutableList", False, "LastIndexOf<T>", "(System.Collections.Immutable.IImmutableList<T>,T,System.Collections.Generic.IEqualityComparer<T>)", "", "Argument[0].Element", "Argument[2]", "taint", "df-generated"]
+      - ["System.Collections.Immutable", "ImmutableList", False, "LastIndexOf<T>", "(System.Collections.Immutable.IImmutableList<T>,T,System.Collections.Generic.IEqualityComparer<T>)", "", "Argument[1]", "Argument[2]", "taint", "df-generated"]
       - ["System.Collections.Immutable", "ImmutableList", False, "Remove<T>", "(System.Collections.Immutable.IImmutableList<T>,T)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
       - ["System.Collections.Immutable", "ImmutableList", False, "RemoveRange<T>", "(System.Collections.Immutable.IImmutableList<T>,System.Collections.Generic.IEnumerable<T>)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
       - ["System.Collections.Immutable", "ImmutableList", False, "Replace<T>", "(System.Collections.Immutable.IImmutableList<T>,T,T)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
@@ -159,16 +224,26 @@ extensions:
       - ["System.Collections.Immutable", "ImmutableList<T>+Builder", False, "BinarySearch", "(T,System.Collections.Generic.IComparer<T>)", "", "Argument[0]", "Argument[1]", "taint", "df-generated"]
       - ["System.Collections.Immutable", "ImmutableList<T>+Builder", False, "BinarySearch", "(T,System.Collections.Generic.IComparer<T>)", "", "Argument[this]", "Argument[1]", "taint", "df-generated"]
       - ["System.Collections.Immutable", "ImmutableList<T>+Builder", False, "CopyTo", "(T[])", "", "Argument[this]", "Argument[0].Element", "taint", "df-generated"]
+      - ["System.Collections.Immutable", "ImmutableList<T>+Builder", False, "ForEach", "(System.Action<T>)", "", "Argument[this].Element", "Argument[0].Parameter[0]", "value", "dfc-generated"]
+      - ["System.Collections.Immutable", "ImmutableList<T>+Builder", False, "IndexOf", "(T,System.Int32,System.Int32,System.Collections.Generic.IEqualityComparer<T>)", "", "Argument[0]", "Argument[3]", "taint", "df-generated"]
+      - ["System.Collections.Immutable", "ImmutableList<T>+Builder", False, "LastIndexOf", "(T,System.Int32,System.Int32,System.Collections.Generic.IEqualityComparer<T>)", "", "Argument[0]", "Argument[3]", "taint", "df-generated"]
+      - ["System.Collections.Immutable", "ImmutableList<T>+Builder", False, "Remove", "(T,System.Collections.Generic.IEqualityComparer<T>)", "", "Argument[0]", "Argument[1]", "taint", "df-generated"]
       - ["System.Collections.Immutable", "ImmutableList<T>+Builder", False, "Replace", "(T,T)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["System.Collections.Immutable", "ImmutableList<T>+Builder", False, "Replace", "(T,T,System.Collections.Generic.IEqualityComparer<T>)", "", "Argument[0]", "Argument[2]", "taint", "df-generated"]
       - ["System.Collections.Immutable", "ImmutableList<T>+Builder", False, "Replace", "(T,T,System.Collections.Generic.IEqualityComparer<T>)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
       - ["System.Collections.Immutable", "ImmutableList<T>+Builder", False, "set_Item", "(System.Int32,T)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["System.Collections.Immutable", "ImmutableList<T>+Enumerator", False, "get_Current", "()", "", "Argument[this].Property[System.Collections.Immutable.ImmutableList`1+Enumerator.Current]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Collections.Immutable", "ImmutableList<T>+Enumerator", False, "get_Current", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Collections.Immutable", "ImmutableList<T>", False, "BinarySearch", "(System.Int32,System.Int32,T,System.Collections.Generic.IComparer<T>)", "", "Argument[2]", "Argument[3]", "taint", "df-generated"]
       - ["System.Collections.Immutable", "ImmutableList<T>", False, "BinarySearch", "(System.Int32,System.Int32,T,System.Collections.Generic.IComparer<T>)", "", "Argument[this]", "Argument[3]", "taint", "df-generated"]
       - ["System.Collections.Immutable", "ImmutableList<T>", False, "BinarySearch", "(T,System.Collections.Generic.IComparer<T>)", "", "Argument[0]", "Argument[1]", "taint", "df-generated"]
       - ["System.Collections.Immutable", "ImmutableList<T>", False, "BinarySearch", "(T,System.Collections.Generic.IComparer<T>)", "", "Argument[this]", "Argument[1]", "taint", "df-generated"]
       - ["System.Collections.Immutable", "ImmutableList<T>", False, "CopyTo", "(T[])", "", "Argument[this]", "Argument[0].Element", "taint", "df-generated"]
+      - ["System.Collections.Immutable", "ImmutableList<T>", False, "ForEach", "(System.Action<T>)", "", "Argument[this].Element", "Argument[0].Parameter[0]", "value", "dfc-generated"]
+      - ["System.Collections.Immutable", "ImmutableList<T>", False, "IndexOf", "(T,System.Int32,System.Int32,System.Collections.Generic.IEqualityComparer<T>)", "", "Argument[0]", "Argument[3]", "taint", "df-generated"]
+      - ["System.Collections.Immutable", "ImmutableList<T>", False, "LastIndexOf", "(T,System.Int32,System.Int32,System.Collections.Generic.IEqualityComparer<T>)", "", "Argument[0]", "Argument[3]", "taint", "df-generated"]
       - ["System.Collections.Immutable", "ImmutableList<T>", False, "Remove", "(T)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Collections.Immutable", "ImmutableList<T>", False, "Remove", "(T,System.Collections.Generic.IEqualityComparer<T>)", "", "Argument[0]", "Argument[1]", "taint", "df-generated"]
       - ["System.Collections.Immutable", "ImmutableList<T>", False, "Remove", "(T,System.Collections.Generic.IEqualityComparer<T>)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Collections.Immutable", "ImmutableList<T>", False, "RemoveAt", "(System.Int32)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Collections.Immutable", "ImmutableList<T>", False, "RemoveRange", "(System.Collections.Generic.IEnumerable<T>)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
@@ -178,15 +253,17 @@ extensions:
       - ["System.Collections.Immutable", "ImmutableList<T>", False, "Replace", "(T,T)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
       - ["System.Collections.Immutable", "ImmutableList<T>", False, "Replace", "(T,T)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
       - ["System.Collections.Immutable", "ImmutableList<T>", False, "Replace", "(T,T)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Collections.Immutable", "ImmutableList<T>", False, "Replace", "(T,T,System.Collections.Generic.IEqualityComparer<T>)", "", "Argument[0]", "Argument[2]", "taint", "df-generated"]
       - ["System.Collections.Immutable", "ImmutableList<T>", False, "Replace", "(T,T,System.Collections.Generic.IEqualityComparer<T>)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
       - ["System.Collections.Immutable", "ImmutableList<T>", False, "Replace", "(T,T,System.Collections.Generic.IEqualityComparer<T>)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
       - ["System.Collections.Immutable", "ImmutableList<T>", False, "Replace", "(T,T,System.Collections.Generic.IEqualityComparer<T>)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Collections.Immutable", "ImmutableList<T>", False, "SetItem", "(System.Int32,T)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
       - ["System.Collections.Immutable", "ImmutableList<T>", False, "SetItem", "(System.Int32,T)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
       - ["System.Collections.Immutable", "ImmutableList<T>", False, "SetItem", "(System.Int32,T)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Collections.Immutable", "ImmutableList<T>", False, "Sort", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Collections.Immutable", "ImmutableList<T>", False, "Sort", "(System.Collections.Generic.IComparer<T>)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Collections.Immutable", "ImmutableList<T>", False, "Sort", "(System.Int32,System.Int32,System.Collections.Generic.IComparer<T>)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Collections.Immutable", "ImmutableList<T>", False, "Sort", "()", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Collections.Immutable", "ImmutableList<T>", False, "Sort", "(System.Collections.Generic.IComparer<T>)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Collections.Immutable", "ImmutableList<T>", False, "Sort", "(System.Comparison<T>)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Collections.Immutable", "ImmutableList<T>", False, "Sort", "(System.Int32,System.Int32,System.Collections.Generic.IComparer<T>)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Collections.Immutable", "ImmutableList<T>", False, "ToBuilder", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Collections.Immutable", "ImmutableQueue", False, "Create<T>", "(System.ReadOnlySpan<T>)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["System.Collections.Immutable", "ImmutableQueue", False, "Create<T>", "(T)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
@@ -196,9 +273,8 @@ extensions:
       - ["System.Collections.Immutable", "ImmutableQueue<T>+Enumerator", False, "get_Current", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Collections.Immutable", "ImmutableQueue<T>", False, "Dequeue", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Collections.Immutable", "ImmutableQueue<T>", False, "Dequeue", "(T)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Collections.Immutable", "ImmutableQueue<T>", False, "Enqueue", "(T)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Collections.Immutable", "ImmutableQueue<T>", False, "Enqueue", "(T)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Collections.Immutable", "ImmutableQueue<T>", False, "Peek", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Collections.Immutable", "ImmutableQueue<T>", False, "Enqueue", "(T)", "", "Argument[0]", "ReturnValue.SyntheticField[System.Collections.Immutable.ImmutableQueue`1._forwards].SyntheticField[System.Collections.Immutable.ImmutableStack`1._head]", "value", "dfc-generated"]
+      - ["System.Collections.Immutable", "ImmutableQueue<T>", False, "Peek", "()", "", "Argument[this].SyntheticField[System.Collections.Immutable.ImmutableQueue`1._forwards].SyntheticField[System.Collections.Immutable.ImmutableStack`1._head]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Collections.Immutable", "ImmutableSortedDictionary", False, "Create<TKey,TValue>", "(System.Collections.Generic.IComparer<TKey>)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["System.Collections.Immutable", "ImmutableSortedDictionary", False, "Create<TKey,TValue>", "(System.Collections.Generic.IComparer<TKey>,System.Collections.Generic.IEqualityComparer<TValue>)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["System.Collections.Immutable", "ImmutableSortedDictionary", False, "Create<TKey,TValue>", "(System.Collections.Generic.IComparer<TKey>,System.Collections.Generic.IEqualityComparer<TValue>)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
@@ -217,28 +293,27 @@ extensions:
       - ["System.Collections.Immutable", "ImmutableSortedDictionary", False, "ToImmutableSortedDictionary<TKey,TValue>", "(System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<TKey,TValue>>,System.Collections.Generic.IComparer<TKey>,System.Collections.Generic.IEqualityComparer<TValue>)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
       - ["System.Collections.Immutable", "ImmutableSortedDictionary", False, "ToImmutableSortedDictionary<TKey,TValue>", "(System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<TKey,TValue>>,System.Collections.Generic.IComparer<TKey>,System.Collections.Generic.IEqualityComparer<TValue>)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
       - ["System.Collections.Immutable", "ImmutableSortedDictionary", False, "ToImmutableSortedDictionary<TKey,TValue>", "(System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<TKey,TValue>>,System.Collections.Generic.IComparer<TKey>,System.Collections.Generic.IEqualityComparer<TValue>)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Collections.Immutable", "ImmutableSortedDictionary<TKey,TValue>+Builder", False, "GetValueOrDefault", "(TKey,TValue)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Collections.Immutable", "ImmutableSortedDictionary<TKey,TValue>+Builder", False, "TryGetKey", "(TKey,TKey)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Collections.Immutable", "ImmutableSortedDictionary<TKey,TValue>+Builder", False, "TryGetKey", "(TKey,TKey)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Collections.Immutable", "ImmutableSortedDictionary<TKey,TValue>+Builder", False, "GetValueOrDefault", "(TKey,TValue)", "", "Argument[1]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Collections.Immutable", "ImmutableSortedDictionary<TKey,TValue>+Builder", False, "TryGetKey", "(TKey,TKey)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Collections.Immutable", "ImmutableSortedDictionary<TKey,TValue>+Builder", False, "TryGetValue", "(TKey,TValue)", "", "Argument[1]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Collections.Immutable", "ImmutableSortedDictionary<TKey,TValue>+Enumerator", False, "get_Current", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Collections.Immutable", "ImmutableSortedDictionary<TKey,TValue>", False, "Clear", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Collections.Immutable", "ImmutableSortedDictionary<TKey,TValue>", False, "Clear", "()", "", "Argument[this].SyntheticField[System.Collections.Immutable.ImmutableSortedDictionary`2._keyComparer]", "ReturnValue.SyntheticField[System.Collections.Immutable.ImmutableSortedDictionary`2._keyComparer]", "value", "dfc-generated"]
+      - ["System.Collections.Immutable", "ImmutableSortedDictionary<TKey,TValue>", False, "Clear", "()", "", "Argument[this].SyntheticField[System.Collections.Immutable.ImmutableSortedDictionary`2._valueComparer]", "ReturnValue.SyntheticField[System.Collections.Immutable.ImmutableSortedDictionary`2._valueComparer]", "value", "dfc-generated"]
+      - ["System.Collections.Immutable", "ImmutableSortedDictionary<TKey,TValue>", False, "Clear", "()", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Collections.Immutable", "ImmutableSortedDictionary<TKey,TValue>", False, "Remove", "(TKey)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Collections.Immutable", "ImmutableSortedDictionary<TKey,TValue>", False, "RemoveRange", "(System.Collections.Generic.IEnumerable<TKey>)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Collections.Immutable", "ImmutableSortedDictionary<TKey,TValue>", False, "SetItem", "(TKey,TValue)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Collections.Immutable", "ImmutableSortedDictionary<TKey,TValue>", False, "SetItem", "(TKey,TValue)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Collections.Immutable", "ImmutableSortedDictionary<TKey,TValue>", False, "SetItem", "(TKey,TValue)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Collections.Immutable", "ImmutableSortedDictionary<TKey,TValue>", False, "SetItem", "(TKey,TValue)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Collections.Immutable", "ImmutableSortedDictionary<TKey,TValue>", False, "SetItem", "(TKey,TValue)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Collections.Immutable", "ImmutableSortedDictionary<TKey,TValue>", False, "SetItem", "(TKey,TValue)", "", "Argument[0]", "ReturnValue.SyntheticField[System.Collections.Immutable.ImmutableSortedDictionary`2._root].SyntheticField[System.Collections.Immutable.ImmutableSortedDictionary`2+Node._key]", "value", "dfc-generated"]
       - ["System.Collections.Immutable", "ImmutableSortedDictionary<TKey,TValue>", False, "SetItems", "(System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<TKey,TValue>>)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
       - ["System.Collections.Immutable", "ImmutableSortedDictionary<TKey,TValue>", False, "SetItems", "(System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<TKey,TValue>>)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Collections.Immutable", "ImmutableSortedDictionary<TKey,TValue>", False, "ToBuilder", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Collections.Immutable", "ImmutableSortedDictionary<TKey,TValue>", False, "TryGetKey", "(TKey,TKey)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Collections.Immutable", "ImmutableSortedDictionary<TKey,TValue>", False, "TryGetKey", "(TKey,TKey)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Collections.Immutable", "ImmutableSortedDictionary<TKey,TValue>", False, "WithComparers", "(System.Collections.Generic.IComparer<TKey>)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Collections.Immutable", "ImmutableSortedDictionary<TKey,TValue>", False, "WithComparers", "(System.Collections.Generic.IComparer<TKey>)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Collections.Immutable", "ImmutableSortedDictionary<TKey,TValue>", False, "WithComparers", "(System.Collections.Generic.IComparer<TKey>,System.Collections.Generic.IEqualityComparer<TValue>)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["System.Collections.Immutable", "ImmutableSortedDictionary<TKey,TValue>", False, "get_KeyComparer", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Collections.Immutable", "ImmutableSortedDictionary<TKey,TValue>", False, "get_ValueComparer", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Collections.Immutable", "ImmutableSortedDictionary<TKey,TValue>", False, "TryGetKey", "(TKey,TKey)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Collections.Immutable", "ImmutableSortedDictionary<TKey,TValue>", False, "TryGetKey", "(TKey,TKey)", "", "Argument[this].SyntheticField[System.Collections.Immutable.ImmutableSortedDictionary`2._root].SyntheticField[System.Collections.Immutable.ImmutableSortedDictionary`2+Node._key]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Collections.Immutable", "ImmutableSortedDictionary<TKey,TValue>", False, "TryGetValue", "(TKey,TValue)", "", "Argument[1]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Collections.Immutable", "ImmutableSortedDictionary<TKey,TValue>", False, "WithComparers", "(System.Collections.Generic.IComparer<TKey>)", "", "Argument[0]", "ReturnValue.SyntheticField[System.Collections.Immutable.ImmutableSortedDictionary`2._keyComparer]", "value", "dfc-generated"]
+      - ["System.Collections.Immutable", "ImmutableSortedDictionary<TKey,TValue>", False, "WithComparers", "(System.Collections.Generic.IComparer<TKey>,System.Collections.Generic.IEqualityComparer<TValue>)", "", "Argument[0]", "ReturnValue.SyntheticField[System.Collections.Immutable.ImmutableSortedDictionary`2._keyComparer]", "value", "dfc-generated"]
+      - ["System.Collections.Immutable", "ImmutableSortedDictionary<TKey,TValue>", False, "WithComparers", "(System.Collections.Generic.IComparer<TKey>,System.Collections.Generic.IEqualityComparer<TValue>)", "", "Argument[1]", "ReturnValue.SyntheticField[System.Collections.Immutable.ImmutableSortedDictionary`2._valueComparer]", "value", "dfc-generated"]
+      - ["System.Collections.Immutable", "ImmutableSortedDictionary<TKey,TValue>", False, "get_KeyComparer", "()", "", "Argument[this].SyntheticField[System.Collections.Immutable.ImmutableSortedDictionary`2._keyComparer]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Collections.Immutable", "ImmutableSortedDictionary<TKey,TValue>", False, "get_ValueComparer", "()", "", "Argument[this].SyntheticField[System.Collections.Immutable.ImmutableSortedDictionary`2._valueComparer]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Collections.Immutable", "ImmutableSortedSet", False, "Create<T>", "(System.Collections.Generic.IComparer<T>)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["System.Collections.Immutable", "ImmutableSortedSet", False, "Create<T>", "(System.Collections.Generic.IComparer<T>,System.ReadOnlySpan<T>)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["System.Collections.Immutable", "ImmutableSortedSet", False, "Create<T>", "(System.Collections.Generic.IComparer<T>,System.ReadOnlySpan<T>)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
@@ -256,42 +331,44 @@ extensions:
       - ["System.Collections.Immutable", "ImmutableSortedSet", False, "ToImmutableSortedSet<TSource>", "(System.Collections.Generic.IEnumerable<TSource>)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
       - ["System.Collections.Immutable", "ImmutableSortedSet", False, "ToImmutableSortedSet<TSource>", "(System.Collections.Generic.IEnumerable<TSource>,System.Collections.Generic.IComparer<TSource>)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
       - ["System.Collections.Immutable", "ImmutableSortedSet", False, "ToImmutableSortedSet<TSource>", "(System.Collections.Generic.IEnumerable<TSource>,System.Collections.Generic.IComparer<TSource>)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Collections.Immutable", "ImmutableSortedSet<T>+Builder", False, "IntersectWith", "(System.Collections.Generic.IEnumerable<T>)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["System.Collections.Immutable", "ImmutableSortedSet<T>+Builder", False, "SymmetricExceptWith", "(System.Collections.Generic.IEnumerable<T>)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["System.Collections.Immutable", "ImmutableSortedSet<T>+Builder", False, "TryGetValue", "(T,T)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Collections.Immutable", "ImmutableSortedSet<T>+Builder", False, "TryGetValue", "(T,T)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Collections.Immutable", "ImmutableSortedSet<T>+Builder", False, "UnionWith", "(System.Collections.Generic.IEnumerable<T>)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["System.Collections.Immutable", "ImmutableSortedSet<T>+Builder", False, "get_Max", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Collections.Immutable", "ImmutableSortedSet<T>+Builder", False, "get_Min", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Collections.Immutable", "ImmutableSortedSet<T>+Builder", False, "IntersectWith", "(System.Collections.Generic.IEnumerable<T>)", "", "Argument[0].Element", "Argument[this].SyntheticField[System.Collections.Immutable.ImmutableSortedSet`1+Builder._root].SyntheticField[System.Collections.Immutable.ImmutableSortedSet`1+Node._key]", "value", "dfc-generated"]
+      - ["System.Collections.Immutable", "ImmutableSortedSet<T>+Builder", False, "SymmetricExceptWith", "(System.Collections.Generic.IEnumerable<T>)", "", "Argument[0].Element", "Argument[this].SyntheticField[System.Collections.Immutable.ImmutableSortedSet`1+Builder._root].SyntheticField[System.Collections.Immutable.ImmutableSortedSet`1+Node._key]", "value", "dfc-generated"]
+      - ["System.Collections.Immutable", "ImmutableSortedSet<T>+Builder", False, "TryGetValue", "(T,T)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Collections.Immutable", "ImmutableSortedSet<T>+Builder", False, "TryGetValue", "(T,T)", "", "Argument[this].SyntheticField[System.Collections.Immutable.ImmutableSortedSet`1+Builder._root].SyntheticField[System.Collections.Immutable.ImmutableSortedSet`1+Node._key]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Collections.Immutable", "ImmutableSortedSet<T>+Builder", False, "UnionWith", "(System.Collections.Generic.IEnumerable<T>)", "", "Argument[0].Element", "Argument[this].SyntheticField[System.Collections.Immutable.ImmutableSortedSet`1+Builder._root].SyntheticField[System.Collections.Immutable.ImmutableSortedSet`1+Node._key]", "value", "dfc-generated"]
+      - ["System.Collections.Immutable", "ImmutableSortedSet<T>+Builder", False, "get_Max", "()", "", "Argument[this].SyntheticField[System.Collections.Immutable.ImmutableSortedSet`1+Builder._root].SyntheticField[System.Collections.Immutable.ImmutableSortedSet`1+Node._key]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Collections.Immutable", "ImmutableSortedSet<T>+Builder", False, "get_Min", "()", "", "Argument[this].SyntheticField[System.Collections.Immutable.ImmutableSortedSet`1+Builder._root].SyntheticField[System.Collections.Immutable.ImmutableSortedSet`1+Node._key]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Collections.Immutable", "ImmutableSortedSet<T>+Enumerator", False, "get_Current", "()", "", "Argument[this].Property[System.Collections.Immutable.ImmutableSortedSet`1+Enumerator.Current]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Collections.Immutable", "ImmutableSortedSet<T>+Enumerator", False, "get_Current", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Collections.Immutable", "ImmutableSortedSet<T>", False, "Clear", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Collections.Immutable", "ImmutableSortedSet<T>", False, "Clear", "()", "", "Argument[this].SyntheticField[System.Collections.Immutable.ImmutableSortedSet`1._comparer]", "ReturnValue.SyntheticField[System.Collections.Immutable.ImmutableSortedSet`1._comparer]", "value", "dfc-generated"]
+      - ["System.Collections.Immutable", "ImmutableSortedSet<T>", False, "Clear", "()", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Collections.Immutable", "ImmutableSortedSet<T>", False, "Except", "(System.Collections.Generic.IEnumerable<T>)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Collections.Immutable", "ImmutableSortedSet<T>", False, "Intersect", "(System.Collections.Generic.IEnumerable<T>)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Collections.Immutable", "ImmutableSortedSet<T>", False, "Remove", "(T)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Collections.Immutable", "ImmutableSortedSet<T>", False, "SymmetricExcept", "(System.Collections.Generic.IEnumerable<T>)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["System.Collections.Immutable", "ImmutableSortedSet<T>", False, "SymmetricExcept", "(System.Collections.Generic.IEnumerable<T>)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["System.Collections.Immutable", "ImmutableSortedSet<T>", False, "SymmetricExcept", "(System.Collections.Generic.IEnumerable<T>)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Collections.Immutable", "ImmutableSortedSet<T>", False, "SymmetricExcept", "(System.Collections.Generic.IEnumerable<T>)", "", "Argument[0].Element", "Argument[this].Element", "value", "dfc-generated"]
+      - ["System.Collections.Immutable", "ImmutableSortedSet<T>", False, "SymmetricExcept", "(System.Collections.Generic.IEnumerable<T>)", "", "Argument[0].Element", "ReturnValue.SyntheticField[System.Collections.Immutable.ImmutableSortedSet`1._root].SyntheticField[System.Collections.Immutable.ImmutableSortedSet`1+Node._key]", "value", "dfc-generated"]
       - ["System.Collections.Immutable", "ImmutableSortedSet<T>", False, "ToBuilder", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Collections.Immutable", "ImmutableSortedSet<T>", False, "TryGetValue", "(T,T)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Collections.Immutable", "ImmutableSortedSet<T>", False, "TryGetValue", "(T,T)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Collections.Immutable", "ImmutableSortedSet<T>", False, "TryGetValue", "(T,T)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Collections.Immutable", "ImmutableSortedSet<T>", False, "TryGetValue", "(T,T)", "", "Argument[this].SyntheticField[System.Collections.Immutable.ImmutableSortedSet`1._root].SyntheticField[System.Collections.Immutable.ImmutableSortedSet`1+Node._key]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Collections.Immutable", "ImmutableSortedSet<T>", False, "Union", "(System.Collections.Generic.IEnumerable<T>)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
       - ["System.Collections.Immutable", "ImmutableSortedSet<T>", False, "Union", "(System.Collections.Generic.IEnumerable<T>)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Collections.Immutable", "ImmutableSortedSet<T>", False, "Union", "(System.Collections.Generic.IEnumerable<T>)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["System.Collections.Immutable", "ImmutableSortedSet<T>", False, "WithComparer", "(System.Collections.Generic.IComparer<T>)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["System.Collections.Immutable", "ImmutableSortedSet<T>", False, "get_KeyComparer", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Collections.Immutable", "ImmutableSortedSet<T>", False, "get_Max", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Collections.Immutable", "ImmutableSortedSet<T>", False, "get_Min", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Collections.Immutable", "ImmutableSortedSet<T>", False, "WithComparer", "(System.Collections.Generic.IComparer<T>)", "", "Argument[0]", "ReturnValue.SyntheticField[System.Collections.Immutable.ImmutableSortedSet`1._comparer]", "value", "dfc-generated"]
+      - ["System.Collections.Immutable", "ImmutableSortedSet<T>", False, "get_KeyComparer", "()", "", "Argument[this].SyntheticField[System.Collections.Immutable.ImmutableSortedSet`1._comparer]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Collections.Immutable", "ImmutableSortedSet<T>", False, "get_Max", "()", "", "Argument[this].SyntheticField[System.Collections.Immutable.ImmutableSortedSet`1._root].SyntheticField[System.Collections.Immutable.ImmutableSortedSet`1+Node._key]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Collections.Immutable", "ImmutableSortedSet<T>", False, "get_Min", "()", "", "Argument[this].SyntheticField[System.Collections.Immutable.ImmutableSortedSet`1._root].SyntheticField[System.Collections.Immutable.ImmutableSortedSet`1+Node._key]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Collections.Immutable", "ImmutableStack", False, "Create<T>", "(System.ReadOnlySpan<T>)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["System.Collections.Immutable", "ImmutableStack", False, "Create<T>", "(T)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["System.Collections.Immutable", "ImmutableStack", False, "Create<T>", "(T[])", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
       - ["System.Collections.Immutable", "ImmutableStack", False, "CreateRange<T>", "(System.Collections.Generic.IEnumerable<T>)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
       - ["System.Collections.Immutable", "ImmutableStack", False, "Pop<T>", "(System.Collections.Immutable.IImmutableStack<T>,T)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
       - ["System.Collections.Immutable", "ImmutableStack<T>+Enumerator", False, "get_Current", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Collections.Immutable", "ImmutableStack<T>", False, "Peek", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Collections.Immutable", "ImmutableStack<T>", False, "Pop", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Collections.Immutable", "ImmutableStack<T>", False, "Pop", "(T)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Collections.Immutable", "ImmutableStack<T>", False, "Push", "(T)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Collections.Immutable", "ImmutableStack<T>", False, "Push", "(T)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Collections.Immutable", "ImmutableStack<T>", False, "Peek", "()", "", "Argument[this].SyntheticField[System.Collections.Immutable.ImmutableStack`1._head]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Collections.Immutable", "ImmutableStack<T>", False, "Pop", "()", "", "Argument[this].SyntheticField[System.Collections.Immutable.ImmutableStack`1._tail]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Collections.Immutable", "ImmutableStack<T>", False, "Pop", "(T)", "", "Argument[this].SyntheticField[System.Collections.Immutable.ImmutableStack`1._head]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Collections.Immutable", "ImmutableStack<T>", False, "Pop", "(T)", "", "Argument[this].SyntheticField[System.Collections.Immutable.ImmutableStack`1._tail]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Collections.Immutable", "ImmutableStack<T>", False, "Push", "(T)", "", "Argument[0]", "ReturnValue.SyntheticField[System.Collections.Immutable.ImmutableStack`1._head]", "value", "dfc-generated"]
+      - ["System.Collections.Immutable", "ImmutableStack<T>", False, "Push", "(T)", "", "Argument[this]", "ReturnValue.SyntheticField[System.Collections.Immutable.ImmutableStack`1._tail]", "value", "dfc-generated"]
   - addsTo:
       pack: codeql/csharp-all
       extensible: neutralModel
@@ -308,6 +385,7 @@ extensions:
       - ["System.Collections.Immutable", "IImmutableList<T>", "InsertRange", "(System.Int32,System.Collections.Generic.IEnumerable<T>)", "summary", "df-generated"]
       - ["System.Collections.Immutable", "IImmutableList<T>", "LastIndexOf", "(T,System.Int32,System.Int32,System.Collections.Generic.IEqualityComparer<T>)", "summary", "df-generated"]
       - ["System.Collections.Immutable", "IImmutableList<T>", "Remove", "(T,System.Collections.Generic.IEqualityComparer<T>)", "summary", "df-generated"]
+      - ["System.Collections.Immutable", "IImmutableList<T>", "RemoveAll", "(System.Predicate<T>)", "summary", "df-generated"]
       - ["System.Collections.Immutable", "IImmutableList<T>", "RemoveAt", "(System.Int32)", "summary", "df-generated"]
       - ["System.Collections.Immutable", "IImmutableList<T>", "RemoveRange", "(System.Collections.Generic.IEnumerable<T>,System.Collections.Generic.IEqualityComparer<T>)", "summary", "df-generated"]
       - ["System.Collections.Immutable", "IImmutableList<T>", "RemoveRange", "(System.Int32,System.Int32)", "summary", "df-generated"]
@@ -342,6 +420,8 @@ extensions:
       - ["System.Collections.Immutable", "ImmutableArray", "Create<T>", "(T[])", "summary", "df-generated"]
       - ["System.Collections.Immutable", "ImmutableArray", "CreateBuilder<T>", "()", "summary", "df-generated"]
       - ["System.Collections.Immutable", "ImmutableArray", "CreateBuilder<T>", "(System.Int32)", "summary", "df-generated"]
+      - ["System.Collections.Immutable", "ImmutableArray", "CreateRange<TSource,TResult>", "(System.Collections.Immutable.ImmutableArray<TSource>,System.Func<TSource,TResult>)", "summary", "df-generated"]
+      - ["System.Collections.Immutable", "ImmutableArray", "CreateRange<TSource,TResult>", "(System.Collections.Immutable.ImmutableArray<TSource>,System.Int32,System.Int32,System.Func<TSource,TResult>)", "summary", "df-generated"]
       - ["System.Collections.Immutable", "ImmutableArray", "ToImmutableArray<TSource>", "(System.Collections.Immutable.ImmutableArray<TSource>+Builder)", "summary", "df-generated"]
       - ["System.Collections.Immutable", "ImmutableArray<T>+Builder", "AddRange", "(System.Collections.Immutable.ImmutableArray<T>,System.Int32)", "summary", "df-generated"]
       - ["System.Collections.Immutable", "ImmutableArray<T>+Builder", "AddRange", "(System.ReadOnlySpan<T>)", "summary", "df-generated"]
@@ -352,34 +432,30 @@ extensions:
       - ["System.Collections.Immutable", "ImmutableArray<T>+Builder", "CopyTo", "(T[])", "summary", "df-generated"]
       - ["System.Collections.Immutable", "ImmutableArray<T>+Builder", "IndexOf", "(T)", "summary", "df-generated"]
       - ["System.Collections.Immutable", "ImmutableArray<T>+Builder", "IndexOf", "(T,System.Int32)", "summary", "df-generated"]
-      - ["System.Collections.Immutable", "ImmutableArray<T>+Builder", "IndexOf", "(T,System.Int32,System.Collections.Generic.IEqualityComparer<T>)", "summary", "df-generated"]
       - ["System.Collections.Immutable", "ImmutableArray<T>+Builder", "IndexOf", "(T,System.Int32,System.Int32)", "summary", "df-generated"]
-      - ["System.Collections.Immutable", "ImmutableArray<T>+Builder", "IndexOf", "(T,System.Int32,System.Int32,System.Collections.Generic.IEqualityComparer<T>)", "summary", "df-generated"]
       - ["System.Collections.Immutable", "ImmutableArray<T>+Builder", "InsertRange", "(System.Int32,System.Collections.Immutable.ImmutableArray<T>)", "summary", "df-generated"]
       - ["System.Collections.Immutable", "ImmutableArray<T>+Builder", "ItemRef", "(System.Int32)", "summary", "df-generated"]
       - ["System.Collections.Immutable", "ImmutableArray<T>+Builder", "LastIndexOf", "(T)", "summary", "df-generated"]
       - ["System.Collections.Immutable", "ImmutableArray<T>+Builder", "LastIndexOf", "(T,System.Int32)", "summary", "df-generated"]
       - ["System.Collections.Immutable", "ImmutableArray<T>+Builder", "LastIndexOf", "(T,System.Int32,System.Int32)", "summary", "df-generated"]
-      - ["System.Collections.Immutable", "ImmutableArray<T>+Builder", "LastIndexOf", "(T,System.Int32,System.Int32,System.Collections.Generic.IEqualityComparer<T>)", "summary", "df-generated"]
       - ["System.Collections.Immutable", "ImmutableArray<T>+Builder", "Remove", "(T)", "summary", "df-generated"]
-      - ["System.Collections.Immutable", "ImmutableArray<T>+Builder", "Remove", "(T,System.Collections.Generic.IEqualityComparer<T>)", "summary", "df-generated"]
       - ["System.Collections.Immutable", "ImmutableArray<T>+Builder", "RemoveAt", "(System.Int32)", "summary", "df-generated"]
       - ["System.Collections.Immutable", "ImmutableArray<T>+Builder", "RemoveRange", "(System.Collections.Generic.IEnumerable<T>)", "summary", "df-generated"]
-      - ["System.Collections.Immutable", "ImmutableArray<T>+Builder", "RemoveRange", "(System.Collections.Generic.IEnumerable<T>,System.Collections.Generic.IEqualityComparer<T>)", "summary", "df-generated"]
       - ["System.Collections.Immutable", "ImmutableArray<T>+Builder", "RemoveRange", "(System.Int32,System.Int32)", "summary", "df-generated"]
       - ["System.Collections.Immutable", "ImmutableArray<T>+Builder", "Reverse", "()", "summary", "df-generated"]
       - ["System.Collections.Immutable", "ImmutableArray<T>+Builder", "Sort", "()", "summary", "df-generated"]
       - ["System.Collections.Immutable", "ImmutableArray<T>+Builder", "Sort", "(System.Collections.Generic.IComparer<T>)", "summary", "df-generated"]
+      - ["System.Collections.Immutable", "ImmutableArray<T>+Builder", "Sort", "(System.Comparison<T>)", "summary", "df-generated"]
       - ["System.Collections.Immutable", "ImmutableArray<T>+Builder", "Sort", "(System.Int32,System.Int32,System.Collections.Generic.IComparer<T>)", "summary", "df-generated"]
       - ["System.Collections.Immutable", "ImmutableArray<T>+Builder", "ToArray", "()", "summary", "df-generated"]
       - ["System.Collections.Immutable", "ImmutableArray<T>+Builder", "ToImmutable", "()", "summary", "df-generated"]
       - ["System.Collections.Immutable", "ImmutableArray<T>+Builder", "get_IsReadOnly", "()", "summary", "df-generated"]
       - ["System.Collections.Immutable", "ImmutableArray<T>+Enumerator", "MoveNext", "()", "summary", "df-generated"]
+      - ["System.Collections.Immutable", "ImmutableArray<T>", "AsMemory", "()", "summary", "df-generated"]
       - ["System.Collections.Immutable", "ImmutableArray<T>", "Clear", "()", "summary", "df-generated"]
       - ["System.Collections.Immutable", "ImmutableArray<T>", "CompareTo", "(System.Object,System.Collections.IComparer)", "summary", "df-generated"]
       - ["System.Collections.Immutable", "ImmutableArray<T>", "Contains", "(System.Object)", "summary", "df-generated"]
       - ["System.Collections.Immutable", "ImmutableArray<T>", "Contains", "(T)", "summary", "df-generated"]
-      - ["System.Collections.Immutable", "ImmutableArray<T>", "Contains", "(T,System.Collections.Generic.IEqualityComparer<T>)", "summary", "df-generated"]
       - ["System.Collections.Immutable", "ImmutableArray<T>", "CopyTo", "(System.Int32,T[],System.Int32,System.Int32)", "summary", "df-generated"]
       - ["System.Collections.Immutable", "ImmutableArray<T>", "CopyTo", "(T[])", "summary", "df-generated"]
       - ["System.Collections.Immutable", "ImmutableArray<T>", "Equals", "(System.Collections.Immutable.ImmutableArray<T>)", "summary", "df-generated"]
@@ -390,14 +466,12 @@ extensions:
       - ["System.Collections.Immutable", "ImmutableArray<T>", "IndexOf", "(System.Object)", "summary", "df-generated"]
       - ["System.Collections.Immutable", "ImmutableArray<T>", "IndexOf", "(T)", "summary", "df-generated"]
       - ["System.Collections.Immutable", "ImmutableArray<T>", "IndexOf", "(T,System.Int32)", "summary", "df-generated"]
-      - ["System.Collections.Immutable", "ImmutableArray<T>", "IndexOf", "(T,System.Int32,System.Collections.Generic.IEqualityComparer<T>)", "summary", "df-generated"]
       - ["System.Collections.Immutable", "ImmutableArray<T>", "IndexOf", "(T,System.Int32,System.Int32)", "summary", "df-generated"]
-      - ["System.Collections.Immutable", "ImmutableArray<T>", "IndexOf", "(T,System.Int32,System.Int32,System.Collections.Generic.IEqualityComparer<T>)", "summary", "df-generated"]
       - ["System.Collections.Immutable", "ImmutableArray<T>", "ItemRef", "(System.Int32)", "summary", "df-generated"]
       - ["System.Collections.Immutable", "ImmutableArray<T>", "LastIndexOf", "(T)", "summary", "df-generated"]
       - ["System.Collections.Immutable", "ImmutableArray<T>", "LastIndexOf", "(T,System.Int32)", "summary", "df-generated"]
       - ["System.Collections.Immutable", "ImmutableArray<T>", "LastIndexOf", "(T,System.Int32,System.Int32)", "summary", "df-generated"]
-      - ["System.Collections.Immutable", "ImmutableArray<T>", "LastIndexOf", "(T,System.Int32,System.Int32,System.Collections.Generic.IEqualityComparer<T>)", "summary", "df-generated"]
+      - ["System.Collections.Immutable", "ImmutableArray<T>", "Remove", "(System.Object)", "summary", "df-generated"]
       - ["System.Collections.Immutable", "ImmutableArray<T>", "Remove", "(T)", "summary", "df-generated"]
       - ["System.Collections.Immutable", "ImmutableArray<T>", "RemoveAt", "(System.Int32)", "summary", "df-generated"]
       - ["System.Collections.Immutable", "ImmutableArray<T>", "get_Count", "()", "summary", "df-generated"]
@@ -417,6 +491,11 @@ extensions:
       - ["System.Collections.Immutable", "ImmutableDictionary", "CreateBuilder<TKey,TValue>", "()", "summary", "df-generated"]
       - ["System.Collections.Immutable", "ImmutableDictionary", "GetValueOrDefault<TKey,TValue>", "(System.Collections.Immutable.IImmutableDictionary<TKey,TValue>,TKey)", "summary", "df-generated"]
       - ["System.Collections.Immutable", "ImmutableDictionary", "ToImmutableDictionary<TKey,TValue>", "(System.Collections.Immutable.ImmutableDictionary<TKey,TValue>+Builder)", "summary", "df-generated"]
+      - ["System.Collections.Immutable", "ImmutableDictionary", "ToImmutableDictionary<TSource,TKey,TValue>", "(System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,TKey>,System.Func<TSource,TValue>)", "summary", "df-generated"]
+      - ["System.Collections.Immutable", "ImmutableDictionary", "ToImmutableDictionary<TSource,TKey,TValue>", "(System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,TKey>,System.Func<TSource,TValue>,System.Collections.Generic.IEqualityComparer<TKey>)", "summary", "df-generated"]
+      - ["System.Collections.Immutable", "ImmutableDictionary", "ToImmutableDictionary<TSource,TKey,TValue>", "(System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,TKey>,System.Func<TSource,TValue>,System.Collections.Generic.IEqualityComparer<TKey>,System.Collections.Generic.IEqualityComparer<TValue>)", "summary", "df-generated"]
+      - ["System.Collections.Immutable", "ImmutableDictionary", "ToImmutableDictionary<TSource,TKey>", "(System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,TKey>)", "summary", "df-generated"]
+      - ["System.Collections.Immutable", "ImmutableDictionary", "ToImmutableDictionary<TSource,TKey>", "(System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,TKey>,System.Collections.Generic.IEqualityComparer<TKey>)", "summary", "df-generated"]
       - ["System.Collections.Immutable", "ImmutableDictionary<TKey,TValue>+Builder", "Contains", "(System.Collections.Generic.KeyValuePair<TKey,TValue>)", "summary", "df-generated"]
       - ["System.Collections.Immutable", "ImmutableDictionary<TKey,TValue>+Builder", "Contains", "(System.Object)", "summary", "df-generated"]
       - ["System.Collections.Immutable", "ImmutableDictionary<TKey,TValue>+Builder", "ContainsKey", "(TKey)", "summary", "df-generated"]
@@ -427,7 +506,6 @@ extensions:
       - ["System.Collections.Immutable", "ImmutableDictionary<TKey,TValue>+Builder", "Remove", "(TKey)", "summary", "df-generated"]
       - ["System.Collections.Immutable", "ImmutableDictionary<TKey,TValue>+Builder", "RemoveRange", "(System.Collections.Generic.IEnumerable<TKey>)", "summary", "df-generated"]
       - ["System.Collections.Immutable", "ImmutableDictionary<TKey,TValue>+Builder", "ToImmutable", "()", "summary", "df-generated"]
-      - ["System.Collections.Immutable", "ImmutableDictionary<TKey,TValue>+Builder", "TryGetValue", "(TKey,TValue)", "summary", "df-generated"]
       - ["System.Collections.Immutable", "ImmutableDictionary<TKey,TValue>+Builder", "get_Count", "()", "summary", "df-generated"]
       - ["System.Collections.Immutable", "ImmutableDictionary<TKey,TValue>+Builder", "get_IsFixedSize", "()", "summary", "df-generated"]
       - ["System.Collections.Immutable", "ImmutableDictionary<TKey,TValue>+Builder", "get_IsReadOnly", "()", "summary", "df-generated"]
@@ -442,7 +520,6 @@ extensions:
       - ["System.Collections.Immutable", "ImmutableDictionary<TKey,TValue>", "Remove", "(System.Collections.Generic.KeyValuePair<TKey,TValue>)", "summary", "df-generated"]
       - ["System.Collections.Immutable", "ImmutableDictionary<TKey,TValue>", "Remove", "(System.Object)", "summary", "df-generated"]
       - ["System.Collections.Immutable", "ImmutableDictionary<TKey,TValue>", "Remove", "(TKey)", "summary", "df-generated"]
-      - ["System.Collections.Immutable", "ImmutableDictionary<TKey,TValue>", "TryGetValue", "(TKey,TValue)", "summary", "df-generated"]
       - ["System.Collections.Immutable", "ImmutableDictionary<TKey,TValue>", "get_Count", "()", "summary", "df-generated"]
       - ["System.Collections.Immutable", "ImmutableDictionary<TKey,TValue>", "get_IsEmpty", "()", "summary", "df-generated"]
       - ["System.Collections.Immutable", "ImmutableDictionary<TKey,TValue>", "get_IsFixedSize", "()", "summary", "df-generated"]
@@ -486,24 +563,12 @@ extensions:
       - ["System.Collections.Immutable", "ImmutableHashSet<T>", "get_IsEmpty", "()", "summary", "df-generated"]
       - ["System.Collections.Immutable", "ImmutableHashSet<T>", "get_IsReadOnly", "()", "summary", "df-generated"]
       - ["System.Collections.Immutable", "ImmutableHashSet<T>", "get_IsSynchronized", "()", "summary", "df-generated"]
-      - ["System.Collections.Immutable", "ImmutableInterlocked", "Enqueue<T>", "(System.Collections.Immutable.ImmutableQueue<T>,T)", "summary", "df-generated"]
-      - ["System.Collections.Immutable", "ImmutableInterlocked", "InterlockedCompareExchange<T>", "(System.Collections.Immutable.ImmutableArray<T>,System.Collections.Immutable.ImmutableArray<T>,System.Collections.Immutable.ImmutableArray<T>)", "summary", "df-generated"]
-      - ["System.Collections.Immutable", "ImmutableInterlocked", "InterlockedExchange<T>", "(System.Collections.Immutable.ImmutableArray<T>,System.Collections.Immutable.ImmutableArray<T>)", "summary", "df-generated"]
-      - ["System.Collections.Immutable", "ImmutableInterlocked", "InterlockedInitialize<T>", "(System.Collections.Immutable.ImmutableArray<T>,System.Collections.Immutable.ImmutableArray<T>)", "summary", "df-generated"]
-      - ["System.Collections.Immutable", "ImmutableInterlocked", "Push<T>", "(System.Collections.Immutable.ImmutableStack<T>,T)", "summary", "df-generated"]
-      - ["System.Collections.Immutable", "ImmutableInterlocked", "TryAdd<TKey,TValue>", "(System.Collections.Immutable.ImmutableDictionary<TKey,TValue>,TKey,TValue)", "summary", "df-generated"]
-      - ["System.Collections.Immutable", "ImmutableInterlocked", "TryDequeue<T>", "(System.Collections.Immutable.ImmutableQueue<T>,T)", "summary", "df-generated"]
-      - ["System.Collections.Immutable", "ImmutableInterlocked", "TryPop<T>", "(System.Collections.Immutable.ImmutableStack<T>,T)", "summary", "df-generated"]
-      - ["System.Collections.Immutable", "ImmutableInterlocked", "TryRemove<TKey,TValue>", "(System.Collections.Immutable.ImmutableDictionary<TKey,TValue>,TKey,TValue)", "summary", "df-generated"]
-      - ["System.Collections.Immutable", "ImmutableInterlocked", "TryUpdate<TKey,TValue>", "(System.Collections.Immutable.ImmutableDictionary<TKey,TValue>,TKey,TValue,TValue)", "summary", "df-generated"]
       - ["System.Collections.Immutable", "ImmutableList", "Create<T>", "()", "summary", "df-generated"]
       - ["System.Collections.Immutable", "ImmutableList", "CreateBuilder<T>", "()", "summary", "df-generated"]
       - ["System.Collections.Immutable", "ImmutableList", "IndexOf<T>", "(System.Collections.Immutable.IImmutableList<T>,T)", "summary", "df-generated"]
-      - ["System.Collections.Immutable", "ImmutableList", "IndexOf<T>", "(System.Collections.Immutable.IImmutableList<T>,T,System.Collections.Generic.IEqualityComparer<T>)", "summary", "df-generated"]
       - ["System.Collections.Immutable", "ImmutableList", "IndexOf<T>", "(System.Collections.Immutable.IImmutableList<T>,T,System.Int32)", "summary", "df-generated"]
       - ["System.Collections.Immutable", "ImmutableList", "IndexOf<T>", "(System.Collections.Immutable.IImmutableList<T>,T,System.Int32,System.Int32)", "summary", "df-generated"]
       - ["System.Collections.Immutable", "ImmutableList", "LastIndexOf<T>", "(System.Collections.Immutable.IImmutableList<T>,T)", "summary", "df-generated"]
-      - ["System.Collections.Immutable", "ImmutableList", "LastIndexOf<T>", "(System.Collections.Immutable.IImmutableList<T>,T,System.Collections.Generic.IEqualityComparer<T>)", "summary", "df-generated"]
       - ["System.Collections.Immutable", "ImmutableList", "LastIndexOf<T>", "(System.Collections.Immutable.IImmutableList<T>,T,System.Int32)", "summary", "df-generated"]
       - ["System.Collections.Immutable", "ImmutableList", "LastIndexOf<T>", "(System.Collections.Immutable.IImmutableList<T>,T,System.Int32,System.Int32)", "summary", "df-generated"]
       - ["System.Collections.Immutable", "ImmutableList", "ToImmutableList<TSource>", "(System.Collections.Immutable.ImmutableList<TSource>+Builder)", "summary", "df-generated"]
@@ -511,19 +576,26 @@ extensions:
       - ["System.Collections.Immutable", "ImmutableList<T>+Builder", "Clear", "()", "summary", "df-generated"]
       - ["System.Collections.Immutable", "ImmutableList<T>+Builder", "Contains", "(System.Object)", "summary", "df-generated"]
       - ["System.Collections.Immutable", "ImmutableList<T>+Builder", "Contains", "(T)", "summary", "df-generated"]
+      - ["System.Collections.Immutable", "ImmutableList<T>+Builder", "ConvertAll<TOutput>", "(System.Func<T,TOutput>)", "summary", "df-generated"]
       - ["System.Collections.Immutable", "ImmutableList<T>+Builder", "CopyTo", "(System.Int32,T[],System.Int32,System.Int32)", "summary", "df-generated"]
+      - ["System.Collections.Immutable", "ImmutableList<T>+Builder", "Exists", "(System.Predicate<T>)", "summary", "df-generated"]
+      - ["System.Collections.Immutable", "ImmutableList<T>+Builder", "FindIndex", "(System.Int32,System.Int32,System.Predicate<T>)", "summary", "df-generated"]
+      - ["System.Collections.Immutable", "ImmutableList<T>+Builder", "FindIndex", "(System.Int32,System.Predicate<T>)", "summary", "df-generated"]
+      - ["System.Collections.Immutable", "ImmutableList<T>+Builder", "FindIndex", "(System.Predicate<T>)", "summary", "df-generated"]
+      - ["System.Collections.Immutable", "ImmutableList<T>+Builder", "FindLastIndex", "(System.Int32,System.Int32,System.Predicate<T>)", "summary", "df-generated"]
+      - ["System.Collections.Immutable", "ImmutableList<T>+Builder", "FindLastIndex", "(System.Int32,System.Predicate<T>)", "summary", "df-generated"]
+      - ["System.Collections.Immutable", "ImmutableList<T>+Builder", "FindLastIndex", "(System.Predicate<T>)", "summary", "df-generated"]
       - ["System.Collections.Immutable", "ImmutableList<T>+Builder", "IndexOf", "(System.Object)", "summary", "df-generated"]
       - ["System.Collections.Immutable", "ImmutableList<T>+Builder", "IndexOf", "(T)", "summary", "df-generated"]
       - ["System.Collections.Immutable", "ImmutableList<T>+Builder", "IndexOf", "(T,System.Int32)", "summary", "df-generated"]
       - ["System.Collections.Immutable", "ImmutableList<T>+Builder", "IndexOf", "(T,System.Int32,System.Int32)", "summary", "df-generated"]
-      - ["System.Collections.Immutable", "ImmutableList<T>+Builder", "IndexOf", "(T,System.Int32,System.Int32,System.Collections.Generic.IEqualityComparer<T>)", "summary", "df-generated"]
       - ["System.Collections.Immutable", "ImmutableList<T>+Builder", "ItemRef", "(System.Int32)", "summary", "df-generated"]
       - ["System.Collections.Immutable", "ImmutableList<T>+Builder", "LastIndexOf", "(T)", "summary", "df-generated"]
       - ["System.Collections.Immutable", "ImmutableList<T>+Builder", "LastIndexOf", "(T,System.Int32)", "summary", "df-generated"]
       - ["System.Collections.Immutable", "ImmutableList<T>+Builder", "LastIndexOf", "(T,System.Int32,System.Int32)", "summary", "df-generated"]
-      - ["System.Collections.Immutable", "ImmutableList<T>+Builder", "LastIndexOf", "(T,System.Int32,System.Int32,System.Collections.Generic.IEqualityComparer<T>)", "summary", "df-generated"]
+      - ["System.Collections.Immutable", "ImmutableList<T>+Builder", "Remove", "(System.Object)", "summary", "df-generated"]
       - ["System.Collections.Immutable", "ImmutableList<T>+Builder", "Remove", "(T)", "summary", "df-generated"]
-      - ["System.Collections.Immutable", "ImmutableList<T>+Builder", "Remove", "(T,System.Collections.Generic.IEqualityComparer<T>)", "summary", "df-generated"]
+      - ["System.Collections.Immutable", "ImmutableList<T>+Builder", "RemoveAll", "(System.Predicate<T>)", "summary", "df-generated"]
       - ["System.Collections.Immutable", "ImmutableList<T>+Builder", "RemoveAt", "(System.Int32)", "summary", "df-generated"]
       - ["System.Collections.Immutable", "ImmutableList<T>+Builder", "RemoveRange", "(System.Collections.Generic.IEnumerable<T>)", "summary", "df-generated"]
       - ["System.Collections.Immutable", "ImmutableList<T>+Builder", "RemoveRange", "(System.Collections.Generic.IEnumerable<T>,System.Collections.Generic.IEqualityComparer<T>)", "summary", "df-generated"]
@@ -532,8 +604,10 @@ extensions:
       - ["System.Collections.Immutable", "ImmutableList<T>+Builder", "Reverse", "(System.Int32,System.Int32)", "summary", "df-generated"]
       - ["System.Collections.Immutable", "ImmutableList<T>+Builder", "Sort", "()", "summary", "df-generated"]
       - ["System.Collections.Immutable", "ImmutableList<T>+Builder", "Sort", "(System.Collections.Generic.IComparer<T>)", "summary", "df-generated"]
+      - ["System.Collections.Immutable", "ImmutableList<T>+Builder", "Sort", "(System.Comparison<T>)", "summary", "df-generated"]
       - ["System.Collections.Immutable", "ImmutableList<T>+Builder", "Sort", "(System.Int32,System.Int32,System.Collections.Generic.IComparer<T>)", "summary", "df-generated"]
       - ["System.Collections.Immutable", "ImmutableList<T>+Builder", "ToImmutable", "()", "summary", "df-generated"]
+      - ["System.Collections.Immutable", "ImmutableList<T>+Builder", "TrueForAll", "(System.Predicate<T>)", "summary", "df-generated"]
       - ["System.Collections.Immutable", "ImmutableList<T>+Builder", "get_Count", "()", "summary", "df-generated"]
       - ["System.Collections.Immutable", "ImmutableList<T>+Builder", "get_IsFixedSize", "()", "summary", "df-generated"]
       - ["System.Collections.Immutable", "ImmutableList<T>+Builder", "get_IsReadOnly", "()", "summary", "df-generated"]
@@ -546,14 +620,23 @@ extensions:
       - ["System.Collections.Immutable", "ImmutableList<T>", "Clear", "()", "summary", "df-generated"]
       - ["System.Collections.Immutable", "ImmutableList<T>", "Contains", "(System.Object)", "summary", "df-generated"]
       - ["System.Collections.Immutable", "ImmutableList<T>", "Contains", "(T)", "summary", "df-generated"]
+      - ["System.Collections.Immutable", "ImmutableList<T>", "ConvertAll<TOutput>", "(System.Func<T,TOutput>)", "summary", "df-generated"]
       - ["System.Collections.Immutable", "ImmutableList<T>", "CopyTo", "(System.Int32,T[],System.Int32,System.Int32)", "summary", "df-generated"]
+      - ["System.Collections.Immutable", "ImmutableList<T>", "Exists", "(System.Predicate<T>)", "summary", "df-generated"]
+      - ["System.Collections.Immutable", "ImmutableList<T>", "FindIndex", "(System.Int32,System.Int32,System.Predicate<T>)", "summary", "df-generated"]
+      - ["System.Collections.Immutable", "ImmutableList<T>", "FindIndex", "(System.Int32,System.Predicate<T>)", "summary", "df-generated"]
+      - ["System.Collections.Immutable", "ImmutableList<T>", "FindIndex", "(System.Predicate<T>)", "summary", "df-generated"]
+      - ["System.Collections.Immutable", "ImmutableList<T>", "FindLastIndex", "(System.Int32,System.Int32,System.Predicate<T>)", "summary", "df-generated"]
+      - ["System.Collections.Immutable", "ImmutableList<T>", "FindLastIndex", "(System.Int32,System.Predicate<T>)", "summary", "df-generated"]
+      - ["System.Collections.Immutable", "ImmutableList<T>", "FindLastIndex", "(System.Predicate<T>)", "summary", "df-generated"]
       - ["System.Collections.Immutable", "ImmutableList<T>", "IndexOf", "(System.Object)", "summary", "df-generated"]
       - ["System.Collections.Immutable", "ImmutableList<T>", "IndexOf", "(T)", "summary", "df-generated"]
-      - ["System.Collections.Immutable", "ImmutableList<T>", "IndexOf", "(T,System.Int32,System.Int32,System.Collections.Generic.IEqualityComparer<T>)", "summary", "df-generated"]
       - ["System.Collections.Immutable", "ImmutableList<T>", "ItemRef", "(System.Int32)", "summary", "df-generated"]
-      - ["System.Collections.Immutable", "ImmutableList<T>", "LastIndexOf", "(T,System.Int32,System.Int32,System.Collections.Generic.IEqualityComparer<T>)", "summary", "df-generated"]
+      - ["System.Collections.Immutable", "ImmutableList<T>", "Remove", "(System.Object)", "summary", "df-generated"]
       - ["System.Collections.Immutable", "ImmutableList<T>", "Remove", "(T)", "summary", "df-generated"]
+      - ["System.Collections.Immutable", "ImmutableList<T>", "RemoveAll", "(System.Predicate<T>)", "summary", "df-generated"]
       - ["System.Collections.Immutable", "ImmutableList<T>", "RemoveAt", "(System.Int32)", "summary", "df-generated"]
+      - ["System.Collections.Immutable", "ImmutableList<T>", "TrueForAll", "(System.Predicate<T>)", "summary", "df-generated"]
       - ["System.Collections.Immutable", "ImmutableList<T>", "get_Count", "()", "summary", "df-generated"]
       - ["System.Collections.Immutable", "ImmutableList<T>", "get_IsEmpty", "()", "summary", "df-generated"]
       - ["System.Collections.Immutable", "ImmutableList<T>", "get_IsFixedSize", "()", "summary", "df-generated"]
@@ -568,6 +651,9 @@ extensions:
       - ["System.Collections.Immutable", "ImmutableSortedDictionary", "Create<TKey,TValue>", "()", "summary", "df-generated"]
       - ["System.Collections.Immutable", "ImmutableSortedDictionary", "CreateBuilder<TKey,TValue>", "()", "summary", "df-generated"]
       - ["System.Collections.Immutable", "ImmutableSortedDictionary", "ToImmutableSortedDictionary<TKey,TValue>", "(System.Collections.Immutable.ImmutableSortedDictionary<TKey,TValue>+Builder)", "summary", "df-generated"]
+      - ["System.Collections.Immutable", "ImmutableSortedDictionary", "ToImmutableSortedDictionary<TSource,TKey,TValue>", "(System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,TKey>,System.Func<TSource,TValue>)", "summary", "df-generated"]
+      - ["System.Collections.Immutable", "ImmutableSortedDictionary", "ToImmutableSortedDictionary<TSource,TKey,TValue>", "(System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,TKey>,System.Func<TSource,TValue>,System.Collections.Generic.IComparer<TKey>)", "summary", "df-generated"]
+      - ["System.Collections.Immutable", "ImmutableSortedDictionary", "ToImmutableSortedDictionary<TSource,TKey,TValue>", "(System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,TKey>,System.Func<TSource,TValue>,System.Collections.Generic.IComparer<TKey>,System.Collections.Generic.IEqualityComparer<TValue>)", "summary", "df-generated"]
       - ["System.Collections.Immutable", "ImmutableSortedDictionary<TKey,TValue>+Builder", "Contains", "(System.Collections.Generic.KeyValuePair<TKey,TValue>)", "summary", "df-generated"]
       - ["System.Collections.Immutable", "ImmutableSortedDictionary<TKey,TValue>+Builder", "Contains", "(System.Object)", "summary", "df-generated"]
       - ["System.Collections.Immutable", "ImmutableSortedDictionary<TKey,TValue>+Builder", "ContainsKey", "(TKey)", "summary", "df-generated"]
@@ -578,7 +664,6 @@ extensions:
       - ["System.Collections.Immutable", "ImmutableSortedDictionary<TKey,TValue>+Builder", "Remove", "(TKey)", "summary", "df-generated"]
       - ["System.Collections.Immutable", "ImmutableSortedDictionary<TKey,TValue>+Builder", "RemoveRange", "(System.Collections.Generic.IEnumerable<TKey>)", "summary", "df-generated"]
       - ["System.Collections.Immutable", "ImmutableSortedDictionary<TKey,TValue>+Builder", "ToImmutable", "()", "summary", "df-generated"]
-      - ["System.Collections.Immutable", "ImmutableSortedDictionary<TKey,TValue>+Builder", "TryGetValue", "(TKey,TValue)", "summary", "df-generated"]
       - ["System.Collections.Immutable", "ImmutableSortedDictionary<TKey,TValue>+Builder", "ValueRef", "(TKey)", "summary", "df-generated"]
       - ["System.Collections.Immutable", "ImmutableSortedDictionary<TKey,TValue>+Builder", "get_Count", "()", "summary", "df-generated"]
       - ["System.Collections.Immutable", "ImmutableSortedDictionary<TKey,TValue>+Builder", "get_IsFixedSize", "()", "summary", "df-generated"]
@@ -594,7 +679,6 @@ extensions:
       - ["System.Collections.Immutable", "ImmutableSortedDictionary<TKey,TValue>", "Remove", "(System.Collections.Generic.KeyValuePair<TKey,TValue>)", "summary", "df-generated"]
       - ["System.Collections.Immutable", "ImmutableSortedDictionary<TKey,TValue>", "Remove", "(System.Object)", "summary", "df-generated"]
       - ["System.Collections.Immutable", "ImmutableSortedDictionary<TKey,TValue>", "Remove", "(TKey)", "summary", "df-generated"]
-      - ["System.Collections.Immutable", "ImmutableSortedDictionary<TKey,TValue>", "TryGetValue", "(TKey,TValue)", "summary", "df-generated"]
       - ["System.Collections.Immutable", "ImmutableSortedDictionary<TKey,TValue>", "ValueRef", "(TKey)", "summary", "df-generated"]
       - ["System.Collections.Immutable", "ImmutableSortedDictionary<TKey,TValue>", "get_Count", "()", "summary", "df-generated"]
       - ["System.Collections.Immutable", "ImmutableSortedDictionary<TKey,TValue>", "get_IsEmpty", "()", "summary", "df-generated"]
@@ -635,6 +719,7 @@ extensions:
       - ["System.Collections.Immutable", "ImmutableSortedSet<T>", "IsSupersetOf", "(System.Collections.Generic.IEnumerable<T>)", "summary", "df-generated"]
       - ["System.Collections.Immutable", "ImmutableSortedSet<T>", "ItemRef", "(System.Int32)", "summary", "df-generated"]
       - ["System.Collections.Immutable", "ImmutableSortedSet<T>", "Overlaps", "(System.Collections.Generic.IEnumerable<T>)", "summary", "df-generated"]
+      - ["System.Collections.Immutable", "ImmutableSortedSet<T>", "Remove", "(System.Object)", "summary", "df-generated"]
       - ["System.Collections.Immutable", "ImmutableSortedSet<T>", "Remove", "(T)", "summary", "df-generated"]
       - ["System.Collections.Immutable", "ImmutableSortedSet<T>", "RemoveAt", "(System.Int32)", "summary", "df-generated"]
       - ["System.Collections.Immutable", "ImmutableSortedSet<T>", "SetEquals", "(System.Collections.Generic.IEnumerable<T>)", "summary", "df-generated"]
diff --git a/csharp/ql/lib/ext/generated/System.Collections.ObjectModel.model.yml b/csharp/ql/lib/ext/generated/System.Collections.ObjectModel.model.yml
index 37bde11a9f9..c062f8b806d 100644
--- a/csharp/ql/lib/ext/generated/System.Collections.ObjectModel.model.yml
+++ b/csharp/ql/lib/ext/generated/System.Collections.ObjectModel.model.yml
@@ -4,26 +4,21 @@ extensions:
       pack: codeql/csharp-all
       extensible: summaryModel
     data:
-      - ["System.Collections.ObjectModel", "Collection<T>", False, "Collection", "(System.Collections.Generic.IList<T>)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["System.Collections.ObjectModel", "Collection<T>", False, "get_Items", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Collections.ObjectModel", "Collection<T>", True, "InsertItem", "(System.Int32,T)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Collections.ObjectModel", "Collection<T>", True, "InsertItem", "(System.Int32,T)", "", "Argument[this]", "Argument[1]", "taint", "df-generated"]
+      - ["System.Collections.ObjectModel", "Collection<T>", False, "Collection", "(System.Collections.Generic.IList<T>)", "", "Argument[0]", "Argument[this].SyntheticField[System.Collections.ObjectModel.Collection`1.items]", "value", "dfc-generated"]
+      - ["System.Collections.ObjectModel", "Collection<T>", False, "get_Items", "()", "", "Argument[this].SyntheticField[System.Collections.ObjectModel.Collection`1.items]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Collections.ObjectModel", "Collection<T>", False, "get_SyncRoot", "()", "", "Argument[this].SyntheticField[System.Collections.ObjectModel.Collection`1.items].Property[System.Collections.ICollection.SyncRoot]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Collections.ObjectModel", "Collection<T>", False, "get_SyncRoot", "()", "", "Argument[this].SyntheticField[System.Collections.ObjectModel.Collection`1.items]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Collections.ObjectModel", "Collection<T>", True, "InsertItem", "(System.Int32,T)", "", "Argument[1]", "Argument[this].SyntheticField[System.Collections.ObjectModel.Collection`1.items].Element", "value", "dfc-generated"]
       - ["System.Collections.ObjectModel", "Collection<T>", True, "SetItem", "(System.Int32,T)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Collections.ObjectModel", "Collection<T>", True, "SetItem", "(System.Int32,T)", "", "Argument[this]", "Argument[1]", "taint", "df-generated"]
-      - ["System.Collections.ObjectModel", "KeyedCollection<TKey,TItem>", False, "KeyedCollection", "(System.Collections.Generic.IEqualityComparer<TKey>,System.Int32)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Collections.ObjectModel", "KeyedCollection<TKey,TItem>", False, "TryGetValue", "(TKey,TItem)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Collections.ObjectModel", "KeyedCollection<TKey,TItem>", False, "get_Comparer", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Collections.ObjectModel", "KeyedCollection<TKey,TItem>", False, "KeyedCollection", "(System.Collections.Generic.IEqualityComparer<TKey>,System.Int32)", "", "Argument[0]", "Argument[this].SyntheticField[System.Collections.ObjectModel.KeyedCollection`2.comparer]", "value", "dfc-generated"]
+      - ["System.Collections.ObjectModel", "KeyedCollection<TKey,TItem>", False, "TryGetValue", "(TKey,TItem)", "", "Argument[1]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Collections.ObjectModel", "KeyedCollection<TKey,TItem>", False, "TryGetValue", "(TKey,TItem)", "", "Argument[this].Property[System.Collections.ObjectModel.Collection`1.Items].Element", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Collections.ObjectModel", "KeyedCollection<TKey,TItem>", False, "get_Comparer", "()", "", "Argument[this].SyntheticField[System.Collections.ObjectModel.KeyedCollection`2.comparer]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Collections.ObjectModel", "KeyedCollection<TKey,TItem>", False, "get_Dictionary", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Collections.ObjectModel", "KeyedCollection<TKey,TItem>", True, "InsertItem", "(System.Int32,TItem)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Collections.ObjectModel", "KeyedCollection<TKey,TItem>", True, "InsertItem", "(System.Int32,TItem)", "", "Argument[this]", "Argument[1]", "taint", "df-generated"]
-      - ["System.Collections.ObjectModel", "KeyedCollection<TKey,TItem>", True, "SetItem", "(System.Int32,TItem)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Collections.ObjectModel", "KeyedCollection<TKey,TItem>", True, "SetItem", "(System.Int32,TItem)", "", "Argument[this]", "Argument[1]", "taint", "df-generated"]
-      - ["System.Collections.ObjectModel", "ObservableCollection<T>", True, "InsertItem", "(System.Int32,T)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Collections.ObjectModel", "ObservableCollection<T>", True, "InsertItem", "(System.Int32,T)", "", "Argument[this]", "Argument[1]", "taint", "df-generated"]
-      - ["System.Collections.ObjectModel", "ObservableCollection<T>", True, "SetItem", "(System.Int32,T)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Collections.ObjectModel", "ObservableCollection<T>", True, "SetItem", "(System.Int32,T)", "", "Argument[this]", "Argument[1]", "taint", "df-generated"]
-      - ["System.Collections.ObjectModel", "ReadOnlyCollection<T>", False, "ReadOnlyCollection", "(System.Collections.Generic.IList<T>)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["System.Collections.ObjectModel", "ReadOnlyCollection<T>", False, "get_Items", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Collections.ObjectModel", "ReadOnlyCollection<T>", False, "ReadOnlyCollection", "(System.Collections.Generic.IList<T>)", "", "Argument[0]", "Argument[this].SyntheticField[System.Collections.ObjectModel.ReadOnlyCollection`1.list]", "value", "dfc-generated"]
+      - ["System.Collections.ObjectModel", "ReadOnlyCollection<T>", False, "get_Items", "()", "", "Argument[this].SyntheticField[System.Collections.ObjectModel.ReadOnlyCollection`1.list]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Collections.ObjectModel", "ReadOnlyCollection<T>", False, "get_SyncRoot", "()", "", "Argument[this].SyntheticField[System.Collections.ObjectModel.ReadOnlyCollection`1.list].Property[System.Collections.ICollection.SyncRoot]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Collections.ObjectModel", "ReadOnlyDictionary<TKey,TValue>", False, "TryGetValue", "(TKey,TValue)", "", "Argument[1]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Collections.ObjectModel", "ReadOnlyDictionary<TKey,TValue>", False, "get_Dictionary", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
   - addsTo:
       pack: codeql/csharp-all
@@ -34,6 +29,7 @@ extensions:
       - ["System.Collections.ObjectModel", "Collection<T>", "Contains", "(T)", "summary", "df-generated"]
       - ["System.Collections.ObjectModel", "Collection<T>", "IndexOf", "(System.Object)", "summary", "df-generated"]
       - ["System.Collections.ObjectModel", "Collection<T>", "IndexOf", "(T)", "summary", "df-generated"]
+      - ["System.Collections.ObjectModel", "Collection<T>", "Remove", "(System.Object)", "summary", "df-generated"]
       - ["System.Collections.ObjectModel", "Collection<T>", "Remove", "(T)", "summary", "df-generated"]
       - ["System.Collections.ObjectModel", "Collection<T>", "RemoveAt", "(System.Int32)", "summary", "df-generated"]
       - ["System.Collections.ObjectModel", "Collection<T>", "RemoveItem", "(System.Int32)", "summary", "df-generated"]
@@ -45,12 +41,15 @@ extensions:
       - ["System.Collections.ObjectModel", "KeyedCollection<TKey,TItem>", "ClearItems", "()", "summary", "df-generated"]
       - ["System.Collections.ObjectModel", "KeyedCollection<TKey,TItem>", "Contains", "(TKey)", "summary", "df-generated"]
       - ["System.Collections.ObjectModel", "KeyedCollection<TKey,TItem>", "GetKeyForItem", "(TItem)", "summary", "df-generated"]
+      - ["System.Collections.ObjectModel", "KeyedCollection<TKey,TItem>", "InsertItem", "(System.Int32,TItem)", "summary", "df-generated"]
       - ["System.Collections.ObjectModel", "KeyedCollection<TKey,TItem>", "KeyedCollection", "(System.Collections.Generic.IEqualityComparer<TKey>)", "summary", "df-generated"]
       - ["System.Collections.ObjectModel", "KeyedCollection<TKey,TItem>", "Remove", "(TKey)", "summary", "df-generated"]
       - ["System.Collections.ObjectModel", "KeyedCollection<TKey,TItem>", "RemoveItem", "(System.Int32)", "summary", "df-generated"]
+      - ["System.Collections.ObjectModel", "KeyedCollection<TKey,TItem>", "SetItem", "(System.Int32,TItem)", "summary", "df-generated"]
       - ["System.Collections.ObjectModel", "ObservableCollection<T>", "BlockReentrancy", "()", "summary", "df-generated"]
       - ["System.Collections.ObjectModel", "ObservableCollection<T>", "CheckReentrancy", "()", "summary", "df-generated"]
       - ["System.Collections.ObjectModel", "ObservableCollection<T>", "ClearItems", "()", "summary", "df-generated"]
+      - ["System.Collections.ObjectModel", "ObservableCollection<T>", "InsertItem", "(System.Int32,T)", "summary", "df-generated"]
       - ["System.Collections.ObjectModel", "ObservableCollection<T>", "Move", "(System.Int32,System.Int32)", "summary", "df-generated"]
       - ["System.Collections.ObjectModel", "ObservableCollection<T>", "MoveItem", "(System.Int32,System.Int32)", "summary", "df-generated"]
       - ["System.Collections.ObjectModel", "ObservableCollection<T>", "ObservableCollection", "(System.Collections.Generic.IEnumerable<T>)", "summary", "df-generated"]
@@ -58,10 +57,16 @@ extensions:
       - ["System.Collections.ObjectModel", "ObservableCollection<T>", "OnCollectionChanged", "(System.Collections.Specialized.NotifyCollectionChangedEventArgs)", "summary", "df-generated"]
       - ["System.Collections.ObjectModel", "ObservableCollection<T>", "OnPropertyChanged", "(System.ComponentModel.PropertyChangedEventArgs)", "summary", "df-generated"]
       - ["System.Collections.ObjectModel", "ObservableCollection<T>", "RemoveItem", "(System.Int32)", "summary", "df-generated"]
+      - ["System.Collections.ObjectModel", "ObservableCollection<T>", "SetItem", "(System.Int32,T)", "summary", "df-generated"]
+      - ["System.Collections.ObjectModel", "ObservableCollection<T>", "add_CollectionChanged", "(System.Collections.Specialized.NotifyCollectionChangedEventHandler)", "summary", "df-generated"]
+      - ["System.Collections.ObjectModel", "ObservableCollection<T>", "add_PropertyChanged", "(System.ComponentModel.PropertyChangedEventHandler)", "summary", "df-generated"]
+      - ["System.Collections.ObjectModel", "ObservableCollection<T>", "remove_CollectionChanged", "(System.Collections.Specialized.NotifyCollectionChangedEventHandler)", "summary", "df-generated"]
+      - ["System.Collections.ObjectModel", "ObservableCollection<T>", "remove_PropertyChanged", "(System.ComponentModel.PropertyChangedEventHandler)", "summary", "df-generated"]
       - ["System.Collections.ObjectModel", "ReadOnlyCollection<T>", "Contains", "(System.Object)", "summary", "df-generated"]
       - ["System.Collections.ObjectModel", "ReadOnlyCollection<T>", "Contains", "(T)", "summary", "df-generated"]
       - ["System.Collections.ObjectModel", "ReadOnlyCollection<T>", "IndexOf", "(System.Object)", "summary", "df-generated"]
       - ["System.Collections.ObjectModel", "ReadOnlyCollection<T>", "IndexOf", "(T)", "summary", "df-generated"]
+      - ["System.Collections.ObjectModel", "ReadOnlyCollection<T>", "Remove", "(System.Object)", "summary", "df-generated"]
       - ["System.Collections.ObjectModel", "ReadOnlyCollection<T>", "Remove", "(T)", "summary", "df-generated"]
       - ["System.Collections.ObjectModel", "ReadOnlyCollection<T>", "RemoveAt", "(System.Int32)", "summary", "df-generated"]
       - ["System.Collections.ObjectModel", "ReadOnlyCollection<T>", "get_Count", "()", "summary", "df-generated"]
@@ -85,7 +90,6 @@ extensions:
       - ["System.Collections.ObjectModel", "ReadOnlyDictionary<TKey,TValue>", "Remove", "(System.Collections.Generic.KeyValuePair<TKey,TValue>)", "summary", "df-generated"]
       - ["System.Collections.ObjectModel", "ReadOnlyDictionary<TKey,TValue>", "Remove", "(System.Object)", "summary", "df-generated"]
       - ["System.Collections.ObjectModel", "ReadOnlyDictionary<TKey,TValue>", "Remove", "(TKey)", "summary", "df-generated"]
-      - ["System.Collections.ObjectModel", "ReadOnlyDictionary<TKey,TValue>", "TryGetValue", "(TKey,TValue)", "summary", "df-generated"]
       - ["System.Collections.ObjectModel", "ReadOnlyDictionary<TKey,TValue>", "get_Count", "()", "summary", "df-generated"]
       - ["System.Collections.ObjectModel", "ReadOnlyDictionary<TKey,TValue>", "get_Empty", "()", "summary", "df-generated"]
       - ["System.Collections.ObjectModel", "ReadOnlyDictionary<TKey,TValue>", "get_IsFixedSize", "()", "summary", "df-generated"]
@@ -94,4 +98,8 @@ extensions:
       - ["System.Collections.ObjectModel", "ReadOnlyObservableCollection<T>", "OnCollectionChanged", "(System.Collections.Specialized.NotifyCollectionChangedEventArgs)", "summary", "df-generated"]
       - ["System.Collections.ObjectModel", "ReadOnlyObservableCollection<T>", "OnPropertyChanged", "(System.ComponentModel.PropertyChangedEventArgs)", "summary", "df-generated"]
       - ["System.Collections.ObjectModel", "ReadOnlyObservableCollection<T>", "ReadOnlyObservableCollection", "(System.Collections.ObjectModel.ObservableCollection<T>)", "summary", "df-generated"]
+      - ["System.Collections.ObjectModel", "ReadOnlyObservableCollection<T>", "add_CollectionChanged", "(System.Collections.Specialized.NotifyCollectionChangedEventHandler)", "summary", "df-generated"]
+      - ["System.Collections.ObjectModel", "ReadOnlyObservableCollection<T>", "add_PropertyChanged", "(System.ComponentModel.PropertyChangedEventHandler)", "summary", "df-generated"]
       - ["System.Collections.ObjectModel", "ReadOnlyObservableCollection<T>", "get_Empty", "()", "summary", "df-generated"]
+      - ["System.Collections.ObjectModel", "ReadOnlyObservableCollection<T>", "remove_CollectionChanged", "(System.Collections.Specialized.NotifyCollectionChangedEventHandler)", "summary", "df-generated"]
+      - ["System.Collections.ObjectModel", "ReadOnlyObservableCollection<T>", "remove_PropertyChanged", "(System.ComponentModel.PropertyChangedEventHandler)", "summary", "df-generated"]
diff --git a/csharp/ql/lib/ext/generated/System.Collections.Specialized.model.yml b/csharp/ql/lib/ext/generated/System.Collections.Specialized.model.yml
index 82d6e3b7403..482edc03ea6 100644
--- a/csharp/ql/lib/ext/generated/System.Collections.Specialized.model.yml
+++ b/csharp/ql/lib/ext/generated/System.Collections.Specialized.model.yml
@@ -4,26 +4,25 @@ extensions:
       pack: codeql/csharp-all
       extensible: summaryModel
     data:
-      - ["System.Collections.Specialized", "CollectionsUtil", False, "CreateCaseInsensitiveHashtable", "(System.Collections.IDictionary)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
+      - ["System.Collections.Specialized", "CollectionsUtil", False, "CreateCaseInsensitiveHashtable", "(System.Collections.IDictionary)", "", "Argument[0].Element.Property[System.Collections.Generic.KeyValuePair`2.Key]", "ReturnValue.Element.Property[System.Collections.Generic.KeyValuePair`2.Key]", "value", "dfc-generated"]
+      - ["System.Collections.Specialized", "CollectionsUtil", False, "CreateCaseInsensitiveHashtable", "(System.Collections.IDictionary)", "", "Argument[0].Element.Property[System.Collections.Generic.KeyValuePair`2.Value]", "ReturnValue.Element.Property[System.Collections.Generic.KeyValuePair`2.Value]", "value", "dfc-generated"]
       - ["System.Collections.Specialized", "ListDictionary", False, "ListDictionary", "(System.Collections.IComparer)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Collections.Specialized", "NameObjectCollectionBase", False, "BaseAdd", "(System.String,System.Object)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Collections.Specialized", "NameObjectCollectionBase", False, "BaseAdd", "(System.String,System.Object)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["System.Collections.Specialized", "NameObjectCollectionBase", False, "BaseAdd", "(System.String,System.Object)", "", "Argument[1]", "Argument[this].SyntheticField[System.Collections.Specialized.NameObjectCollectionBase._nullKeyEntry].SyntheticField[System.Collections.Specialized.NameObjectCollectionBase+NameObjectEntry.Value]", "value", "dfc-generated"]
       - ["System.Collections.Specialized", "NameObjectCollectionBase", False, "BaseGet", "(System.Int32)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Collections.Specialized", "NameObjectCollectionBase", False, "BaseGet", "(System.String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Collections.Specialized", "NameObjectCollectionBase", False, "BaseGet", "(System.String)", "", "Argument[this].SyntheticField[System.Collections.Specialized.NameObjectCollectionBase._nullKeyEntry].SyntheticField[System.Collections.Specialized.NameObjectCollectionBase+NameObjectEntry.Value]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Collections.Specialized", "NameObjectCollectionBase", False, "BaseGetAllKeys", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Collections.Specialized", "NameObjectCollectionBase", False, "BaseGetAllValues", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Collections.Specialized", "NameObjectCollectionBase", False, "BaseGetAllValues", "(System.Type)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Collections.Specialized", "NameObjectCollectionBase", False, "BaseGetKey", "(System.Int32)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Collections.Specialized", "NameObjectCollectionBase", False, "BaseSet", "(System.String,System.Object)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Collections.Specialized", "NameObjectCollectionBase", False, "BaseSet", "(System.String,System.Object)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["System.Collections.Specialized", "NameObjectCollectionBase", False, "BaseSet", "(System.String,System.Object)", "", "Argument[1]", "Argument[this].SyntheticField[System.Collections.Specialized.NameObjectCollectionBase._nullKeyEntry].SyntheticField[System.Collections.Specialized.NameObjectCollectionBase+NameObjectEntry.Value]", "value", "dfc-generated"]
       - ["System.Collections.Specialized", "NameObjectCollectionBase", False, "NameObjectCollectionBase", "(System.Collections.IEqualityComparer)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Collections.Specialized", "NameObjectCollectionBase", False, "NameObjectCollectionBase", "(System.Collections.IHashCodeProvider,System.Collections.IComparer)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Collections.Specialized", "NameObjectCollectionBase", False, "NameObjectCollectionBase", "(System.Collections.IHashCodeProvider,System.Collections.IComparer)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
       - ["System.Collections.Specialized", "NameObjectCollectionBase", False, "NameObjectCollectionBase", "(System.Int32,System.Collections.IHashCodeProvider,System.Collections.IComparer)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
       - ["System.Collections.Specialized", "NameObjectCollectionBase", False, "NameObjectCollectionBase", "(System.Int32,System.Collections.IHashCodeProvider,System.Collections.IComparer)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
       - ["System.Collections.Specialized", "NameObjectCollectionBase", True, "get_Keys", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Collections.Specialized", "NameValueCollection", False, "NameValueCollection", "(System.Collections.Specialized.NameValueCollection)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["System.Collections.Specialized", "NameValueCollection", False, "NameValueCollection", "(System.Int32,System.Collections.Specialized.NameValueCollection)", "", "Argument[1].Element", "Argument[this]", "taint", "df-generated"]
+      - ["System.Collections.Specialized", "NameValueCollection", False, "NameValueCollection", "(System.Collections.Specialized.NameValueCollection)", "", "Argument[0]", "Argument[this].Element", "value", "dfc-generated"]
+      - ["System.Collections.Specialized", "NameValueCollection", False, "NameValueCollection", "(System.Int32,System.Collections.Specialized.NameValueCollection)", "", "Argument[1]", "Argument[this].Element", "value", "dfc-generated"]
       - ["System.Collections.Specialized", "NameValueCollection", False, "get_Item", "(System.Int32)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Collections.Specialized", "NameValueCollection", False, "get_Item", "(System.String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Collections.Specialized", "NameValueCollection", False, "set_Item", "(System.String,System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
@@ -92,6 +91,8 @@ extensions:
       - ["System.Collections.Specialized", "HybridDictionary", "get_IsFixedSize", "()", "summary", "df-generated"]
       - ["System.Collections.Specialized", "HybridDictionary", "get_IsReadOnly", "()", "summary", "df-generated"]
       - ["System.Collections.Specialized", "HybridDictionary", "get_IsSynchronized", "()", "summary", "df-generated"]
+      - ["System.Collections.Specialized", "INotifyCollectionChanged", "add_CollectionChanged", "(System.Collections.Specialized.NotifyCollectionChangedEventHandler)", "summary", "df-generated"]
+      - ["System.Collections.Specialized", "INotifyCollectionChanged", "remove_CollectionChanged", "(System.Collections.Specialized.NotifyCollectionChangedEventHandler)", "summary", "df-generated"]
       - ["System.Collections.Specialized", "IOrderedDictionary", "GetEnumerator", "()", "summary", "df-generated"]
       - ["System.Collections.Specialized", "IOrderedDictionary", "Insert", "(System.Int32,System.Object,System.Object)", "summary", "df-generated"]
       - ["System.Collections.Specialized", "IOrderedDictionary", "RemoveAt", "(System.Int32)", "summary", "df-generated"]
@@ -150,6 +151,7 @@ extensions:
       - ["System.Collections.Specialized", "StringCollection", "Contains", "(System.String)", "summary", "df-generated"]
       - ["System.Collections.Specialized", "StringCollection", "IndexOf", "(System.Object)", "summary", "df-generated"]
       - ["System.Collections.Specialized", "StringCollection", "IndexOf", "(System.String)", "summary", "df-generated"]
+      - ["System.Collections.Specialized", "StringCollection", "Remove", "(System.Object)", "summary", "df-generated"]
       - ["System.Collections.Specialized", "StringCollection", "Remove", "(System.String)", "summary", "df-generated"]
       - ["System.Collections.Specialized", "StringCollection", "RemoveAt", "(System.Int32)", "summary", "df-generated"]
       - ["System.Collections.Specialized", "StringCollection", "get_Count", "()", "summary", "df-generated"]
diff --git a/csharp/ql/lib/ext/generated/System.Collections.model.yml b/csharp/ql/lib/ext/generated/System.Collections.model.yml
index e9e2c7265c8..72ced0a5f67 100644
--- a/csharp/ql/lib/ext/generated/System.Collections.model.yml
+++ b/csharp/ql/lib/ext/generated/System.Collections.model.yml
@@ -4,59 +4,65 @@ extensions:
       pack: codeql/csharp-all
       extensible: summaryModel
     data:
-      - ["System.Collections", "ArrayList", False, "Adapter", "(System.Collections.IList)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
+      - ["System.Collections", "ArrayList", False, "Adapter", "(System.Collections.IList)", "", "Argument[0]", "ReturnValue.SyntheticField[System.Collections.ArrayList+IListWrapper._list]", "value", "dfc-generated"]
       - ["System.Collections", "ArrayList", False, "ReadOnly", "(System.Collections.ArrayList)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["System.Collections", "ArrayList", False, "ReadOnly", "(System.Collections.IList)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
+      - ["System.Collections", "ArrayList", False, "ReadOnly", "(System.Collections.IList)", "", "Argument[0]", "ReturnValue.SyntheticField[System.Collections.ArrayList+ReadOnlyList._list]", "value", "dfc-generated"]
       - ["System.Collections", "ArrayList", False, "Synchronized", "(System.Collections.ArrayList)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["System.Collections", "ArrayList", False, "Synchronized", "(System.Collections.IList)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
+      - ["System.Collections", "ArrayList", False, "Synchronized", "(System.Collections.IList)", "", "Argument[0].Property[System.Collections.ICollection.SyncRoot]", "ReturnValue.SyntheticField[System.Collections.ArrayList+SyncIList._root]", "value", "dfc-generated"]
       - ["System.Collections", "ArrayList", True, "CopyTo", "(System.Array)", "", "Argument[this]", "Argument[0].Element", "taint", "df-generated"]
       - ["System.Collections", "ArrayList", True, "SetRange", "(System.Int32,System.Collections.ICollection)", "", "Argument[1].Element", "Argument[this]", "taint", "df-generated"]
       - ["System.Collections", "ArrayList", True, "ToArray", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Collections", "ArrayList", True, "ToArray", "(System.Type)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Collections", "BitArray", False, "And", "(System.Collections.BitArray)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["System.Collections", "BitArray", False, "LeftShift", "(System.Int32)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["System.Collections", "BitArray", False, "Not", "()", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["System.Collections", "BitArray", False, "Or", "(System.Collections.BitArray)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["System.Collections", "BitArray", False, "RightShift", "(System.Int32)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["System.Collections", "BitArray", False, "Xor", "(System.Collections.BitArray)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["System.Collections", "BitArray", False, "And", "(System.Collections.BitArray)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Collections", "BitArray", False, "LeftShift", "(System.Int32)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Collections", "BitArray", False, "Not", "()", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Collections", "BitArray", False, "Or", "(System.Collections.BitArray)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Collections", "BitArray", False, "RightShift", "(System.Int32)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Collections", "BitArray", False, "Xor", "(System.Collections.BitArray)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Collections", "CaseInsensitiveComparer", False, "CaseInsensitiveComparer", "(System.Globalization.CultureInfo)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Collections", "CaseInsensitiveHashCodeProvider", False, "CaseInsensitiveHashCodeProvider", "(System.Globalization.CultureInfo)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Collections", "CollectionBase", False, "get_InnerList", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Collections", "CollectionBase", False, "get_List", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Collections", "CollectionBase", False, "Remove", "(System.Object)", "", "Argument[0]", "Argument[this].Property[System.Collections.CollectionBase.InnerList].Element", "value", "dfc-generated"]
+      - ["System.Collections", "CollectionBase", False, "Remove", "(System.Object)", "", "Argument[0]", "Argument[this].SyntheticField[System.Collections.CollectionBase._list].Element", "value", "dfc-generated"]
+      - ["System.Collections", "CollectionBase", False, "get_InnerList", "()", "", "Argument[this].SyntheticField[System.Collections.CollectionBase._list]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Collections", "CollectionBase", False, "get_List", "()", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Collections", "CollectionBase", True, "OnInsert", "(System.Int32,System.Object)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
       - ["System.Collections", "CollectionBase", True, "OnSet", "(System.Int32,System.Object,System.Object)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Collections", "Comparer", False, "Comparer", "(System.Globalization.CultureInfo)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Collections", "DictionaryBase", False, "get_Dictionary", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Collections", "DictionaryBase", True, "OnGet", "(System.Object,System.Object)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Collections", "Comparer", False, "Comparer", "(System.Globalization.CultureInfo)", "", "Argument[0].Property[System.Globalization.CultureInfo.CompareInfo]", "Argument[this].SyntheticField[System.Collections.Comparer._compareInfo]", "value", "dfc-generated"]
+      - ["System.Collections", "Comparer", False, "GetObjectData", "(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)", "", "Argument[this].SyntheticField[System.Collections.Comparer._compareInfo]", "Argument[0].SyntheticField[System.Runtime.Serialization.SerializationInfo._values].Element", "value", "dfc-generated"]
+      - ["System.Collections", "DictionaryBase", False, "get_Dictionary", "()", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Collections", "DictionaryBase", False, "get_SyncRoot", "()", "", "Argument[this].Property[System.Collections.DictionaryBase.InnerHashtable].Property[System.Collections.Hashtable.SyncRoot]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Collections", "DictionaryBase", True, "OnGet", "(System.Object,System.Object)", "", "Argument[1]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Collections", "DictionaryEntry", False, "Deconstruct", "(System.Object,System.Object)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Collections", "DictionaryEntry", False, "DictionaryEntry", "(System.Object,System.Object)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Collections", "DictionaryEntry", False, "DictionaryEntry", "(System.Object,System.Object)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Collections", "Hashtable", False, "Hashtable", "(System.Int32,System.Single,System.Collections.IEqualityComparer)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
+      - ["System.Collections", "Hashtable", False, "Hashtable", "(System.Int32,System.Single,System.Collections.IEqualityComparer)", "", "Argument[2]", "Argument[this].SyntheticField[System.Collections.Hashtable._keycomparer]", "value", "dfc-generated"]
       - ["System.Collections", "Hashtable", False, "Hashtable", "(System.Int32,System.Single,System.Collections.IHashCodeProvider,System.Collections.IComparer)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
       - ["System.Collections", "Hashtable", False, "Hashtable", "(System.Int32,System.Single,System.Collections.IHashCodeProvider,System.Collections.IComparer)", "", "Argument[3]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Collections", "Hashtable", False, "Synchronized", "(System.Collections.Hashtable)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["System.Collections", "Hashtable", False, "get_EqualityComparer", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Collections", "ICollection", True, "get_SyncRoot", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Collections", "ICollection", True, "get_SyncRoot", "()", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["System.Collections", "Hashtable", False, "Synchronized", "(System.Collections.Hashtable)", "", "Argument[0]", "ReturnValue.SyntheticField[System.Collections.Hashtable+SyncHashtable._table]", "value", "dfc-generated"]
+      - ["System.Collections", "Hashtable", False, "get_EqualityComparer", "()", "", "Argument[this].SyntheticField[System.Collections.Hashtable._keycomparer]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Collections", "ICollection", True, "get_SyncRoot", "()", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Collections", "IComparer", True, "Compare", "(System.Object,System.Object)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["System.Collections", "IComparer", True, "Compare", "(System.Object,System.Object)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
       - ["System.Collections", "IDictionary", True, "GetEnumerator", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Collections", "IDictionaryEnumerator", True, "get_Entry", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Collections", "IDictionaryEnumerator", True, "get_Key", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Collections", "IDictionaryEnumerator", True, "get_Value", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Collections", "IEnumerator", True, "get_Current", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Collections", "IList", True, "Remove", "(System.Object)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Collections", "IList", True, "Remove", "(System.Object)", "", "Argument[this]", "Argument[0]", "taint", "df-generated"]
-      - ["System.Collections", "Queue", False, "Queue", "(System.Collections.ICollection)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
+      - ["System.Collections", "IEqualityComparer", True, "Equals", "(System.Object,System.Object)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["System.Collections", "IEqualityComparer", True, "Equals", "(System.Object,System.Object)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["System.Collections", "IEqualityComparer", True, "GetHashCode", "(System.Object)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["System.Collections", "Queue", False, "Queue", "(System.Collections.ICollection)", "", "Argument[0].Element", "Argument[this].SyntheticField[System.Collections.Queue._array].Element", "value", "dfc-generated"]
       - ["System.Collections", "Queue", False, "Synchronized", "(System.Collections.Queue)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["System.Collections", "Queue", True, "Dequeue", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Collections", "Queue", True, "Enqueue", "(System.Object)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["System.Collections", "Queue", True, "Dequeue", "()", "", "Argument[this].SyntheticField[System.Collections.Queue._array].Element", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Collections", "Queue", True, "Enqueue", "(System.Object)", "", "Argument[0]", "Argument[this].SyntheticField[System.Collections.Queue._array].Element", "value", "dfc-generated"]
       - ["System.Collections", "SortedList", False, "SortedList", "(System.Collections.IComparer)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Collections", "SortedList", False, "Synchronized", "(System.Collections.SortedList)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
       - ["System.Collections", "SortedList", True, "GetKey", "(System.Int32)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Collections", "SortedList", True, "SetByIndex", "(System.Int32,System.Object)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Collections", "Stack", False, "Stack", "(System.Collections.ICollection)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
+      - ["System.Collections", "Stack", False, "Stack", "(System.Collections.ICollection)", "", "Argument[0].Element", "Argument[this].SyntheticField[System.Collections.Stack._array].Element", "value", "dfc-generated"]
       - ["System.Collections", "Stack", False, "Synchronized", "(System.Collections.Stack)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["System.Collections", "Stack", True, "Push", "(System.Object)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Collections", "Stack", True, "ToArray", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Collections", "Stack", True, "Push", "(System.Object)", "", "Argument[0]", "Argument[this].SyntheticField[System.Collections.Stack._array].Element", "value", "dfc-generated"]
+      - ["System.Collections", "Stack", True, "ToArray", "()", "", "Argument[this].SyntheticField[System.Collections.Stack._array].Element", "ReturnValue.Element", "value", "dfc-generated"]
   - addsTo:
       pack: codeql/csharp-all
       extensible: neutralModel
@@ -74,6 +80,7 @@ extensions:
       - ["System.Collections", "ArrayList", "LastIndexOf", "(System.Object)", "summary", "df-generated"]
       - ["System.Collections", "ArrayList", "LastIndexOf", "(System.Object,System.Int32)", "summary", "df-generated"]
       - ["System.Collections", "ArrayList", "LastIndexOf", "(System.Object,System.Int32,System.Int32)", "summary", "df-generated"]
+      - ["System.Collections", "ArrayList", "Remove", "(System.Object)", "summary", "df-generated"]
       - ["System.Collections", "ArrayList", "RemoveAt", "(System.Int32)", "summary", "df-generated"]
       - ["System.Collections", "ArrayList", "RemoveRange", "(System.Int32,System.Int32)", "summary", "df-generated"]
       - ["System.Collections", "ArrayList", "Reverse", "()", "summary", "df-generated"]
@@ -102,7 +109,6 @@ extensions:
       - ["System.Collections", "BitArray", "get_IsSynchronized", "()", "summary", "df-generated"]
       - ["System.Collections", "BitArray", "get_Item", "(System.Int32)", "summary", "df-generated"]
       - ["System.Collections", "BitArray", "set_Item", "(System.Int32,System.Boolean)", "summary", "df-generated"]
-      - ["System.Collections", "CaseInsensitiveComparer", "Compare", "(System.Object,System.Object)", "summary", "df-generated"]
       - ["System.Collections", "CaseInsensitiveComparer", "get_Default", "()", "summary", "df-generated"]
       - ["System.Collections", "CaseInsensitiveComparer", "get_DefaultInvariant", "()", "summary", "df-generated"]
       - ["System.Collections", "CaseInsensitiveHashCodeProvider", "GetHashCode", "(System.Object)", "summary", "df-generated"]
@@ -123,7 +129,6 @@ extensions:
       - ["System.Collections", "CollectionBase", "get_IsFixedSize", "()", "summary", "df-generated"]
       - ["System.Collections", "CollectionBase", "get_IsReadOnly", "()", "summary", "df-generated"]
       - ["System.Collections", "CollectionBase", "get_IsSynchronized", "()", "summary", "df-generated"]
-      - ["System.Collections", "Comparer", "Compare", "(System.Object,System.Object)", "summary", "df-generated"]
       - ["System.Collections", "DictionaryBase", "Contains", "(System.Object)", "summary", "df-generated"]
       - ["System.Collections", "DictionaryBase", "OnClear", "()", "summary", "df-generated"]
       - ["System.Collections", "DictionaryBase", "OnClearComplete", "()", "summary", "df-generated"]
@@ -161,18 +166,16 @@ extensions:
       - ["System.Collections", "Hashtable", "get_IsSynchronized", "()", "summary", "df-generated"]
       - ["System.Collections", "ICollection", "get_Count", "()", "summary", "df-generated"]
       - ["System.Collections", "ICollection", "get_IsSynchronized", "()", "summary", "df-generated"]
-      - ["System.Collections", "IComparer", "Compare", "(System.Object,System.Object)", "summary", "df-generated"]
       - ["System.Collections", "IDictionary", "Contains", "(System.Object)", "summary", "df-generated"]
       - ["System.Collections", "IDictionary", "Remove", "(System.Object)", "summary", "df-generated"]
       - ["System.Collections", "IDictionary", "get_IsFixedSize", "()", "summary", "df-generated"]
       - ["System.Collections", "IDictionary", "get_IsReadOnly", "()", "summary", "df-generated"]
       - ["System.Collections", "IEnumerator", "MoveNext", "()", "summary", "df-generated"]
       - ["System.Collections", "IEnumerator", "Reset", "()", "summary", "df-generated"]
-      - ["System.Collections", "IEqualityComparer", "Equals", "(System.Object,System.Object)", "summary", "df-generated"]
-      - ["System.Collections", "IEqualityComparer", "GetHashCode", "(System.Object)", "summary", "df-generated"]
       - ["System.Collections", "IHashCodeProvider", "GetHashCode", "(System.Object)", "summary", "df-generated"]
       - ["System.Collections", "IList", "Contains", "(System.Object)", "summary", "df-generated"]
       - ["System.Collections", "IList", "IndexOf", "(System.Object)", "summary", "df-generated"]
+      - ["System.Collections", "IList", "Remove", "(System.Object)", "summary", "df-generated"]
       - ["System.Collections", "IList", "RemoveAt", "(System.Int32)", "summary", "df-generated"]
       - ["System.Collections", "IList", "get_IsFixedSize", "()", "summary", "df-generated"]
       - ["System.Collections", "IList", "get_IsReadOnly", "()", "summary", "df-generated"]
diff --git a/csharp/ql/lib/ext/generated/System.ComponentModel.Composition.Hosting.model.yml b/csharp/ql/lib/ext/generated/System.ComponentModel.Composition.Hosting.model.yml
index 26a003eabcf..2ce7efbd276 100644
--- a/csharp/ql/lib/ext/generated/System.ComponentModel.Composition.Hosting.model.yml
+++ b/csharp/ql/lib/ext/generated/System.ComponentModel.Composition.Hosting.model.yml
@@ -5,84 +5,99 @@ extensions:
       extensible: summaryModel
     data:
       - ["System.ComponentModel.Composition.Hosting", "AggregateCatalog", False, "get_Catalogs", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.ComponentModel.Composition.Hosting", "AggregateExportProvider", False, "AggregateExportProvider", "(System.ComponentModel.Composition.Hosting.ExportProvider[])", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["System.ComponentModel.Composition.Hosting", "AggregateExportProvider", False, "get_Providers", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.ComponentModel.Composition.Hosting", "AggregateExportProvider", False, "AggregateExportProvider", "(System.ComponentModel.Composition.Hosting.ExportProvider[])", "", "Argument[0].Element", "Argument[this].SyntheticField[System.ComponentModel.Composition.Hosting.AggregateExportProvider._providers].Element", "value", "dfc-generated"]
+      - ["System.ComponentModel.Composition.Hosting", "AggregateExportProvider", False, "AggregateExportProvider", "(System.ComponentModel.Composition.Hosting.ExportProvider[])", "", "Argument[0].Element", "Argument[this].SyntheticField[System.ComponentModel.Composition.Hosting.AggregateExportProvider._readOnlyProviders].Element", "value", "dfc-generated"]
+      - ["System.ComponentModel.Composition.Hosting", "AggregateExportProvider", False, "AggregateExportProvider", "(System.ComponentModel.Composition.Hosting.ExportProvider[])", "", "Argument[this].SyntheticField[System.ComponentModel.Composition.Hosting.AggregateExportProvider._providers].Element", "Argument[this].SyntheticField[System.ComponentModel.Composition.Hosting.AggregateExportProvider._readOnlyProviders].Element", "value", "dfc-generated"]
+      - ["System.ComponentModel.Composition.Hosting", "AggregateExportProvider", False, "get_Providers", "()", "", "Argument[this].SyntheticField[System.ComponentModel.Composition.Hosting.AggregateExportProvider._readOnlyProviders]", "ReturnValue", "value", "dfc-generated"]
       - ["System.ComponentModel.Composition.Hosting", "ApplicationCatalog", False, "ApplicationCatalog", "(System.ComponentModel.Composition.Primitives.ICompositionElement)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.ComponentModel.Composition.Hosting", "ApplicationCatalog", False, "ApplicationCatalog", "(System.Reflection.ReflectionContext)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.ComponentModel.Composition.Hosting", "ApplicationCatalog", False, "ApplicationCatalog", "(System.Reflection.ReflectionContext,System.ComponentModel.Composition.Primitives.ICompositionElement)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.ComponentModel.Composition.Hosting", "ApplicationCatalog", False, "ApplicationCatalog", "(System.Reflection.ReflectionContext,System.ComponentModel.Composition.Primitives.ICompositionElement)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["System.ComponentModel.Composition.Hosting", "AssemblyCatalog", False, "AssemblyCatalog", "(System.Reflection.Assembly)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.ComponentModel.Composition.Hosting", "AssemblyCatalog", False, "AssemblyCatalog", "(System.Reflection.Assembly,System.ComponentModel.Composition.Primitives.ICompositionElement)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.ComponentModel.Composition.Hosting", "AssemblyCatalog", False, "AssemblyCatalog", "(System.Reflection.Assembly,System.ComponentModel.Composition.Primitives.ICompositionElement)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["System.ComponentModel.Composition.Hosting", "AssemblyCatalog", False, "AssemblyCatalog", "(System.Reflection.Assembly,System.Reflection.ReflectionContext)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.ComponentModel.Composition.Hosting", "AssemblyCatalog", False, "AssemblyCatalog", "(System.Reflection.Assembly,System.Reflection.ReflectionContext)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["System.ComponentModel.Composition.Hosting", "AssemblyCatalog", False, "AssemblyCatalog", "(System.Reflection.Assembly,System.Reflection.ReflectionContext,System.ComponentModel.Composition.Primitives.ICompositionElement)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.ComponentModel.Composition.Hosting", "AssemblyCatalog", False, "AssemblyCatalog", "(System.Reflection.Assembly,System.Reflection.ReflectionContext,System.ComponentModel.Composition.Primitives.ICompositionElement)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["System.ComponentModel.Composition.Hosting", "AssemblyCatalog", False, "AssemblyCatalog", "(System.Reflection.Assembly,System.Reflection.ReflectionContext,System.ComponentModel.Composition.Primitives.ICompositionElement)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
+      - ["System.ComponentModel.Composition.Hosting", "AssemblyCatalog", False, "AssemblyCatalog", "(System.Reflection.Assembly)", "", "Argument[0]", "Argument[this].SyntheticField[System.ComponentModel.Composition.Hosting.AssemblyCatalog._assembly]", "value", "dfc-generated"]
+      - ["System.ComponentModel.Composition.Hosting", "AssemblyCatalog", False, "AssemblyCatalog", "(System.Reflection.Assembly,System.ComponentModel.Composition.Primitives.ICompositionElement)", "", "Argument[0]", "Argument[this].SyntheticField[System.ComponentModel.Composition.Hosting.AssemblyCatalog._assembly]", "value", "dfc-generated"]
+      - ["System.ComponentModel.Composition.Hosting", "AssemblyCatalog", False, "AssemblyCatalog", "(System.Reflection.Assembly,System.Reflection.ReflectionContext)", "", "Argument[0]", "Argument[this].SyntheticField[System.ComponentModel.Composition.Hosting.AssemblyCatalog._assembly]", "value", "dfc-generated"]
+      - ["System.ComponentModel.Composition.Hosting", "AssemblyCatalog", False, "AssemblyCatalog", "(System.Reflection.Assembly,System.Reflection.ReflectionContext,System.ComponentModel.Composition.Primitives.ICompositionElement)", "", "Argument[0]", "Argument[this].SyntheticField[System.ComponentModel.Composition.Hosting.AssemblyCatalog._assembly]", "value", "dfc-generated"]
       - ["System.ComponentModel.Composition.Hosting", "AssemblyCatalog", False, "AssemblyCatalog", "(System.String,System.ComponentModel.Composition.Primitives.ICompositionElement)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
       - ["System.ComponentModel.Composition.Hosting", "AssemblyCatalog", False, "AssemblyCatalog", "(System.String,System.Reflection.ReflectionContext)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
       - ["System.ComponentModel.Composition.Hosting", "AssemblyCatalog", False, "AssemblyCatalog", "(System.String,System.Reflection.ReflectionContext,System.ComponentModel.Composition.Primitives.ICompositionElement)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
       - ["System.ComponentModel.Composition.Hosting", "AssemblyCatalog", False, "AssemblyCatalog", "(System.String,System.Reflection.ReflectionContext,System.ComponentModel.Composition.Primitives.ICompositionElement)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
-      - ["System.ComponentModel.Composition.Hosting", "AssemblyCatalog", False, "ToString", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.ComponentModel.Composition.Hosting", "AssemblyCatalog", False, "get_Assembly", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.ComponentModel.Composition.Hosting", "AssemblyCatalog", False, "ToString", "()", "", "Argument[this].Property[System.ComponentModel.Composition.Hosting.AssemblyCatalog.Assembly].Property[System.Reflection.Assembly.FullName]", "ReturnValue", "taint", "dfc-generated"]
+      - ["System.ComponentModel.Composition.Hosting", "AssemblyCatalog", False, "ToString", "()", "", "Argument[this].SyntheticField[System.ComponentModel.Composition.Hosting.AssemblyCatalog._assembly].Property[System.Reflection.Assembly.FullName]", "ReturnValue", "taint", "dfc-generated"]
+      - ["System.ComponentModel.Composition.Hosting", "AssemblyCatalog", False, "get_Assembly", "()", "", "Argument[this].SyntheticField[System.ComponentModel.Composition.Hosting.AssemblyCatalog._assembly]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.ComponentModel.Composition.Hosting", "AssemblyCatalog", False, "get_DisplayName", "()", "", "Argument[this].Property[System.ComponentModel.Composition.Hosting.AssemblyCatalog.Assembly].Property[System.Reflection.Assembly.FullName]", "ReturnValue", "taint", "dfc-generated"]
+      - ["System.ComponentModel.Composition.Hosting", "AssemblyCatalog", False, "get_DisplayName", "()", "", "Argument[this].SyntheticField[System.ComponentModel.Composition.Hosting.AssemblyCatalog._assembly].Property[System.Reflection.Assembly.FullName]", "ReturnValue", "taint", "dfc-generated"]
       - ["System.ComponentModel.Composition.Hosting", "AtomicComposition", False, "AtomicComposition", "(System.ComponentModel.Composition.Hosting.AtomicComposition)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.ComponentModel.Composition.Hosting", "AtomicComposition", False, "TryGetValue<T>", "(System.Object,System.Boolean,T)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.ComponentModel.Composition.Hosting", "AtomicComposition", False, "TryGetValue<T>", "(System.Object,T)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.ComponentModel.Composition.Hosting", "CatalogExportProvider", False, "CatalogExportProvider", "(System.ComponentModel.Composition.Primitives.ComposablePartCatalog,System.ComponentModel.Composition.Hosting.CompositionOptions)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["System.ComponentModel.Composition.Hosting", "CatalogExportProvider", False, "get_Catalog", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.ComponentModel.Composition.Hosting", "CatalogExportProvider", False, "CatalogExportProvider", "(System.ComponentModel.Composition.Primitives.ComposablePartCatalog,System.ComponentModel.Composition.Hosting.CompositionOptions)", "", "Argument[0]", "Argument[this].SyntheticField[System.ComponentModel.Composition.Hosting.CatalogExportProvider._catalog]", "value", "dfc-generated"]
+      - ["System.ComponentModel.Composition.Hosting", "CatalogExportProvider", False, "get_Catalog", "()", "", "Argument[this].SyntheticField[System.ComponentModel.Composition.Hosting.CatalogExportProvider._catalog]", "ReturnValue", "value", "dfc-generated"]
       - ["System.ComponentModel.Composition.Hosting", "CatalogExtensions", False, "CreateCompositionService", "(System.ComponentModel.Composition.Primitives.ComposablePartCatalog)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["System.ComponentModel.Composition.Hosting", "ComposablePartCatalogChangeEventArgs", False, "ComposablePartCatalogChangeEventArgs", "(System.Collections.Generic.IEnumerable<System.ComponentModel.Composition.Primitives.ComposablePartDefinition>,System.Collections.Generic.IEnumerable<System.ComponentModel.Composition.Primitives.ComposablePartDefinition>,System.ComponentModel.Composition.Hosting.AtomicComposition)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["System.ComponentModel.Composition.Hosting", "ComposablePartCatalogChangeEventArgs", False, "ComposablePartCatalogChangeEventArgs", "(System.Collections.Generic.IEnumerable<System.ComponentModel.Composition.Primitives.ComposablePartDefinition>,System.Collections.Generic.IEnumerable<System.ComponentModel.Composition.Primitives.ComposablePartDefinition>,System.ComponentModel.Composition.Hosting.AtomicComposition)", "", "Argument[1].Element", "Argument[this]", "taint", "df-generated"]
-      - ["System.ComponentModel.Composition.Hosting", "ComposablePartCatalogChangeEventArgs", False, "get_AddedDefinitions", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.ComponentModel.Composition.Hosting", "ComposablePartCatalogChangeEventArgs", False, "get_RemovedDefinitions", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.ComponentModel.Composition.Hosting", "ComposablePartCatalogChangeEventArgs", False, "ComposablePartCatalogChangeEventArgs", "(System.Collections.Generic.IEnumerable<System.ComponentModel.Composition.Primitives.ComposablePartDefinition>,System.Collections.Generic.IEnumerable<System.ComponentModel.Composition.Primitives.ComposablePartDefinition>,System.ComponentModel.Composition.Hosting.AtomicComposition)", "", "Argument[0].Element", "Argument[this].SyntheticField[System.ComponentModel.Composition.Hosting.ComposablePartCatalogChangeEventArgs._addedDefinitions].Element", "value", "dfc-generated"]
+      - ["System.ComponentModel.Composition.Hosting", "ComposablePartCatalogChangeEventArgs", False, "ComposablePartCatalogChangeEventArgs", "(System.Collections.Generic.IEnumerable<System.ComponentModel.Composition.Primitives.ComposablePartDefinition>,System.Collections.Generic.IEnumerable<System.ComponentModel.Composition.Primitives.ComposablePartDefinition>,System.ComponentModel.Composition.Hosting.AtomicComposition)", "", "Argument[0]", "Argument[this].SyntheticField[System.ComponentModel.Composition.Hosting.ComposablePartCatalogChangeEventArgs._addedDefinitions]", "value", "dfc-generated"]
+      - ["System.ComponentModel.Composition.Hosting", "ComposablePartCatalogChangeEventArgs", False, "ComposablePartCatalogChangeEventArgs", "(System.Collections.Generic.IEnumerable<System.ComponentModel.Composition.Primitives.ComposablePartDefinition>,System.Collections.Generic.IEnumerable<System.ComponentModel.Composition.Primitives.ComposablePartDefinition>,System.ComponentModel.Composition.Hosting.AtomicComposition)", "", "Argument[1].Element", "Argument[this].SyntheticField[System.ComponentModel.Composition.Hosting.ComposablePartCatalogChangeEventArgs._removedDefinitions].Element", "value", "dfc-generated"]
+      - ["System.ComponentModel.Composition.Hosting", "ComposablePartCatalogChangeEventArgs", False, "ComposablePartCatalogChangeEventArgs", "(System.Collections.Generic.IEnumerable<System.ComponentModel.Composition.Primitives.ComposablePartDefinition>,System.Collections.Generic.IEnumerable<System.ComponentModel.Composition.Primitives.ComposablePartDefinition>,System.ComponentModel.Composition.Hosting.AtomicComposition)", "", "Argument[1]", "Argument[this].SyntheticField[System.ComponentModel.Composition.Hosting.ComposablePartCatalogChangeEventArgs._removedDefinitions]", "value", "dfc-generated"]
+      - ["System.ComponentModel.Composition.Hosting", "ComposablePartCatalogChangeEventArgs", False, "get_AddedDefinitions", "()", "", "Argument[this].SyntheticField[System.ComponentModel.Composition.Hosting.ComposablePartCatalogChangeEventArgs._addedDefinitions]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.ComponentModel.Composition.Hosting", "ComposablePartCatalogChangeEventArgs", False, "get_RemovedDefinitions", "()", "", "Argument[this].SyntheticField[System.ComponentModel.Composition.Hosting.ComposablePartCatalogChangeEventArgs._removedDefinitions]", "ReturnValue", "value", "dfc-generated"]
       - ["System.ComponentModel.Composition.Hosting", "ComposablePartExportProvider", False, "Compose", "(System.ComponentModel.Composition.Hosting.CompositionBatch)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.ComponentModel.Composition.Hosting", "CompositionBatch", False, "AddExport", "(System.ComponentModel.Composition.Primitives.Export)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.ComponentModel.Composition.Hosting", "CompositionBatch", False, "AddPart", "(System.ComponentModel.Composition.Primitives.ComposablePart)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.ComponentModel.Composition.Hosting", "CompositionBatch", False, "CompositionBatch", "(System.Collections.Generic.IEnumerable<System.ComponentModel.Composition.Primitives.ComposablePart>,System.Collections.Generic.IEnumerable<System.ComponentModel.Composition.Primitives.ComposablePart>)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["System.ComponentModel.Composition.Hosting", "CompositionBatch", False, "CompositionBatch", "(System.Collections.Generic.IEnumerable<System.ComponentModel.Composition.Primitives.ComposablePart>,System.Collections.Generic.IEnumerable<System.ComponentModel.Composition.Primitives.ComposablePart>)", "", "Argument[1].Element", "Argument[this]", "taint", "df-generated"]
-      - ["System.ComponentModel.Composition.Hosting", "CompositionBatch", False, "RemovePart", "(System.ComponentModel.Composition.Primitives.ComposablePart)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.ComponentModel.Composition.Hosting", "CompositionBatch", False, "get_PartsToAdd", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.ComponentModel.Composition.Hosting", "CompositionBatch", False, "get_PartsToRemove", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.ComponentModel.Composition.Hosting", "CompositionContainer", False, "CompositionContainer", "(System.ComponentModel.Composition.Primitives.ComposablePartCatalog,System.ComponentModel.Composition.Hosting.CompositionOptions,System.ComponentModel.Composition.Hosting.ExportProvider[])", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["System.ComponentModel.Composition.Hosting", "CompositionContainer", False, "CompositionContainer", "(System.ComponentModel.Composition.Primitives.ComposablePartCatalog,System.ComponentModel.Composition.Hosting.CompositionOptions,System.ComponentModel.Composition.Hosting.ExportProvider[])", "", "Argument[2].Element", "Argument[this]", "taint", "df-generated"]
+      - ["System.ComponentModel.Composition.Hosting", "CompositionBatch", False, "AddPart", "(System.ComponentModel.Composition.Primitives.ComposablePart)", "", "Argument[0]", "Argument[this].SyntheticField[System.ComponentModel.Composition.Hosting.CompositionBatch._partsToAdd].Element", "value", "dfc-generated"]
+      - ["System.ComponentModel.Composition.Hosting", "CompositionBatch", False, "AddPart", "(System.ComponentModel.Composition.Primitives.ComposablePart)", "", "Argument[this].SyntheticField[System.ComponentModel.Composition.Hosting.CompositionBatch._partsToAdd].Element", "Argument[this].SyntheticField[System.ComponentModel.Composition.Hosting.CompositionBatch._readOnlyPartsToAdd].Element", "value", "dfc-generated"]
+      - ["System.ComponentModel.Composition.Hosting", "CompositionBatch", False, "CompositionBatch", "(System.Collections.Generic.IEnumerable<System.ComponentModel.Composition.Primitives.ComposablePart>,System.Collections.Generic.IEnumerable<System.ComponentModel.Composition.Primitives.ComposablePart>)", "", "Argument[0].Element", "Argument[this].SyntheticField[System.ComponentModel.Composition.Hosting.CompositionBatch._partsToAdd].Element", "value", "dfc-generated"]
+      - ["System.ComponentModel.Composition.Hosting", "CompositionBatch", False, "CompositionBatch", "(System.Collections.Generic.IEnumerable<System.ComponentModel.Composition.Primitives.ComposablePart>,System.Collections.Generic.IEnumerable<System.ComponentModel.Composition.Primitives.ComposablePart>)", "", "Argument[0].Element", "Argument[this].SyntheticField[System.ComponentModel.Composition.Hosting.CompositionBatch._readOnlyPartsToAdd].Element", "value", "dfc-generated"]
+      - ["System.ComponentModel.Composition.Hosting", "CompositionBatch", False, "CompositionBatch", "(System.Collections.Generic.IEnumerable<System.ComponentModel.Composition.Primitives.ComposablePart>,System.Collections.Generic.IEnumerable<System.ComponentModel.Composition.Primitives.ComposablePart>)", "", "Argument[1].Element", "Argument[this].SyntheticField[System.ComponentModel.Composition.Hosting.CompositionBatch._partsToRemove].Element", "value", "dfc-generated"]
+      - ["System.ComponentModel.Composition.Hosting", "CompositionBatch", False, "CompositionBatch", "(System.Collections.Generic.IEnumerable<System.ComponentModel.Composition.Primitives.ComposablePart>,System.Collections.Generic.IEnumerable<System.ComponentModel.Composition.Primitives.ComposablePart>)", "", "Argument[1].Element", "Argument[this].SyntheticField[System.ComponentModel.Composition.Hosting.CompositionBatch._readOnlyPartsToRemove].Element", "value", "dfc-generated"]
+      - ["System.ComponentModel.Composition.Hosting", "CompositionBatch", False, "CompositionBatch", "(System.Collections.Generic.IEnumerable<System.ComponentModel.Composition.Primitives.ComposablePart>,System.Collections.Generic.IEnumerable<System.ComponentModel.Composition.Primitives.ComposablePart>)", "", "Argument[this].SyntheticField[System.ComponentModel.Composition.Hosting.CompositionBatch._partsToAdd].Element", "Argument[this].SyntheticField[System.ComponentModel.Composition.Hosting.CompositionBatch._readOnlyPartsToAdd].Element", "value", "dfc-generated"]
+      - ["System.ComponentModel.Composition.Hosting", "CompositionBatch", False, "CompositionBatch", "(System.Collections.Generic.IEnumerable<System.ComponentModel.Composition.Primitives.ComposablePart>,System.Collections.Generic.IEnumerable<System.ComponentModel.Composition.Primitives.ComposablePart>)", "", "Argument[this].SyntheticField[System.ComponentModel.Composition.Hosting.CompositionBatch._partsToRemove].Element", "Argument[this].SyntheticField[System.ComponentModel.Composition.Hosting.CompositionBatch._readOnlyPartsToRemove].Element", "value", "dfc-generated"]
+      - ["System.ComponentModel.Composition.Hosting", "CompositionBatch", False, "RemovePart", "(System.ComponentModel.Composition.Primitives.ComposablePart)", "", "Argument[0]", "Argument[this].SyntheticField[System.ComponentModel.Composition.Hosting.CompositionBatch._partsToRemove].Element", "value", "dfc-generated"]
+      - ["System.ComponentModel.Composition.Hosting", "CompositionBatch", False, "RemovePart", "(System.ComponentModel.Composition.Primitives.ComposablePart)", "", "Argument[this].SyntheticField[System.ComponentModel.Composition.Hosting.CompositionBatch._partsToRemove].Element", "Argument[this].SyntheticField[System.ComponentModel.Composition.Hosting.CompositionBatch._readOnlyPartsToRemove].Element", "value", "dfc-generated"]
+      - ["System.ComponentModel.Composition.Hosting", "CompositionBatch", False, "get_PartsToAdd", "()", "", "Argument[this].SyntheticField[System.ComponentModel.Composition.Hosting.CompositionBatch._readOnlyPartsToAdd]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.ComponentModel.Composition.Hosting", "CompositionBatch", False, "get_PartsToRemove", "()", "", "Argument[this].SyntheticField[System.ComponentModel.Composition.Hosting.CompositionBatch._readOnlyPartsToRemove]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.ComponentModel.Composition.Hosting", "CompositionContainer", False, "CompositionContainer", "(System.ComponentModel.Composition.Primitives.ComposablePartCatalog,System.ComponentModel.Composition.Hosting.CompositionOptions,System.ComponentModel.Composition.Hosting.ExportProvider[])", "", "Argument[2].Element", "Argument[this].SyntheticField[System.ComponentModel.Composition.Hosting.CompositionContainer._providers].Element", "value", "dfc-generated"]
       - ["System.ComponentModel.Composition.Hosting", "CompositionContainer", False, "get_Catalog", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.ComponentModel.Composition.Hosting", "CompositionContainer", False, "get_Providers", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.ComponentModel.Composition.Hosting", "CompositionScopeDefinition", False, "CompositionScopeDefinition", "(System.ComponentModel.Composition.Primitives.ComposablePartCatalog,System.Collections.Generic.IEnumerable<System.ComponentModel.Composition.Hosting.CompositionScopeDefinition>)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["System.ComponentModel.Composition.Hosting", "CompositionScopeDefinition", False, "CompositionScopeDefinition", "(System.ComponentModel.Composition.Primitives.ComposablePartCatalog,System.Collections.Generic.IEnumerable<System.ComponentModel.Composition.Hosting.CompositionScopeDefinition>)", "", "Argument[1].Element", "Argument[this]", "taint", "df-generated"]
-      - ["System.ComponentModel.Composition.Hosting", "CompositionScopeDefinition", False, "CompositionScopeDefinition", "(System.ComponentModel.Composition.Primitives.ComposablePartCatalog,System.Collections.Generic.IEnumerable<System.ComponentModel.Composition.Hosting.CompositionScopeDefinition>,System.Collections.Generic.IEnumerable<System.ComponentModel.Composition.Primitives.ExportDefinition>)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["System.ComponentModel.Composition.Hosting", "CompositionScopeDefinition", False, "CompositionScopeDefinition", "(System.ComponentModel.Composition.Primitives.ComposablePartCatalog,System.Collections.Generic.IEnumerable<System.ComponentModel.Composition.Hosting.CompositionScopeDefinition>,System.Collections.Generic.IEnumerable<System.ComponentModel.Composition.Primitives.ExportDefinition>)", "", "Argument[1].Element", "Argument[this]", "taint", "df-generated"]
-      - ["System.ComponentModel.Composition.Hosting", "CompositionScopeDefinition", False, "CompositionScopeDefinition", "(System.ComponentModel.Composition.Primitives.ComposablePartCatalog,System.Collections.Generic.IEnumerable<System.ComponentModel.Composition.Hosting.CompositionScopeDefinition>,System.Collections.Generic.IEnumerable<System.ComponentModel.Composition.Primitives.ExportDefinition>)", "", "Argument[2].Element", "Argument[this]", "taint", "df-generated"]
-      - ["System.ComponentModel.Composition.Hosting", "CompositionScopeDefinition", True, "get_Children", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.ComponentModel.Composition.Hosting", "CompositionScopeDefinition", True, "get_PublicSurface", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.ComponentModel.Composition.Hosting", "DirectoryCatalog", False, "DirectoryCatalog", "(System.String,System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.ComponentModel.Composition.Hosting", "DirectoryCatalog", False, "DirectoryCatalog", "(System.String,System.String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["System.ComponentModel.Composition.Hosting", "DirectoryCatalog", False, "DirectoryCatalog", "(System.String,System.String,System.ComponentModel.Composition.Primitives.ICompositionElement)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.ComponentModel.Composition.Hosting", "DirectoryCatalog", False, "DirectoryCatalog", "(System.String,System.String,System.ComponentModel.Composition.Primitives.ICompositionElement)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["System.ComponentModel.Composition.Hosting", "DirectoryCatalog", False, "DirectoryCatalog", "(System.String,System.String,System.ComponentModel.Composition.Primitives.ICompositionElement)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
-      - ["System.ComponentModel.Composition.Hosting", "DirectoryCatalog", False, "DirectoryCatalog", "(System.String,System.String,System.Reflection.ReflectionContext)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.ComponentModel.Composition.Hosting", "DirectoryCatalog", False, "DirectoryCatalog", "(System.String,System.String,System.Reflection.ReflectionContext)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["System.ComponentModel.Composition.Hosting", "DirectoryCatalog", False, "DirectoryCatalog", "(System.String,System.String,System.Reflection.ReflectionContext)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
-      - ["System.ComponentModel.Composition.Hosting", "DirectoryCatalog", False, "DirectoryCatalog", "(System.String,System.String,System.Reflection.ReflectionContext,System.ComponentModel.Composition.Primitives.ICompositionElement)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.ComponentModel.Composition.Hosting", "DirectoryCatalog", False, "DirectoryCatalog", "(System.String,System.String,System.Reflection.ReflectionContext,System.ComponentModel.Composition.Primitives.ICompositionElement)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["System.ComponentModel.Composition.Hosting", "DirectoryCatalog", False, "DirectoryCatalog", "(System.String,System.String,System.Reflection.ReflectionContext,System.ComponentModel.Composition.Primitives.ICompositionElement)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
-      - ["System.ComponentModel.Composition.Hosting", "DirectoryCatalog", False, "DirectoryCatalog", "(System.String,System.String,System.Reflection.ReflectionContext,System.ComponentModel.Composition.Primitives.ICompositionElement)", "", "Argument[3]", "Argument[this]", "taint", "df-generated"]
-      - ["System.ComponentModel.Composition.Hosting", "DirectoryCatalog", False, "ToString", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.ComponentModel.Composition.Hosting", "DirectoryCatalog", False, "get_FullPath", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.ComponentModel.Composition.Hosting", "CompositionContainer", False, "get_Providers", "()", "", "Argument[this].SyntheticField[System.ComponentModel.Composition.Hosting.CompositionContainer._providers]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.ComponentModel.Composition.Hosting", "CompositionScopeDefinition", False, "CompositionScopeDefinition", "(System.ComponentModel.Composition.Primitives.ComposablePartCatalog,System.Collections.Generic.IEnumerable<System.ComponentModel.Composition.Hosting.CompositionScopeDefinition>)", "", "Argument[0]", "Argument[this].SyntheticField[System.ComponentModel.Composition.Hosting.CompositionScopeDefinition._catalog]", "value", "dfc-generated"]
+      - ["System.ComponentModel.Composition.Hosting", "CompositionScopeDefinition", False, "CompositionScopeDefinition", "(System.ComponentModel.Composition.Primitives.ComposablePartCatalog,System.Collections.Generic.IEnumerable<System.ComponentModel.Composition.Hosting.CompositionScopeDefinition>)", "", "Argument[1].Element", "Argument[this].SyntheticField[System.ComponentModel.Composition.Hosting.CompositionScopeDefinition._children].Element", "value", "dfc-generated"]
+      - ["System.ComponentModel.Composition.Hosting", "CompositionScopeDefinition", False, "CompositionScopeDefinition", "(System.ComponentModel.Composition.Primitives.ComposablePartCatalog,System.Collections.Generic.IEnumerable<System.ComponentModel.Composition.Hosting.CompositionScopeDefinition>,System.Collections.Generic.IEnumerable<System.ComponentModel.Composition.Primitives.ExportDefinition>)", "", "Argument[0]", "Argument[this].SyntheticField[System.ComponentModel.Composition.Hosting.CompositionScopeDefinition._catalog]", "value", "dfc-generated"]
+      - ["System.ComponentModel.Composition.Hosting", "CompositionScopeDefinition", False, "CompositionScopeDefinition", "(System.ComponentModel.Composition.Primitives.ComposablePartCatalog,System.Collections.Generic.IEnumerable<System.ComponentModel.Composition.Hosting.CompositionScopeDefinition>,System.Collections.Generic.IEnumerable<System.ComponentModel.Composition.Primitives.ExportDefinition>)", "", "Argument[1].Element", "Argument[this].SyntheticField[System.ComponentModel.Composition.Hosting.CompositionScopeDefinition._children].Element", "value", "dfc-generated"]
+      - ["System.ComponentModel.Composition.Hosting", "CompositionScopeDefinition", False, "CompositionScopeDefinition", "(System.ComponentModel.Composition.Primitives.ComposablePartCatalog,System.Collections.Generic.IEnumerable<System.ComponentModel.Composition.Hosting.CompositionScopeDefinition>,System.Collections.Generic.IEnumerable<System.ComponentModel.Composition.Primitives.ExportDefinition>)", "", "Argument[2]", "Argument[this].SyntheticField[System.ComponentModel.Composition.Hosting.CompositionScopeDefinition._publicSurface]", "value", "dfc-generated"]
+      - ["System.ComponentModel.Composition.Hosting", "CompositionScopeDefinition", True, "GetExports", "(System.ComponentModel.Composition.Primitives.ImportDefinition)", "", "Argument[this].SyntheticField[System.ComponentModel.Composition.Hosting.CompositionScopeDefinition._catalog].Element", "ReturnValue.Element.Property[System.Tuple`2.Item1]", "value", "dfc-generated"]
+      - ["System.ComponentModel.Composition.Hosting", "CompositionScopeDefinition", True, "get_Children", "()", "", "Argument[this].SyntheticField[System.ComponentModel.Composition.Hosting.CompositionScopeDefinition._children]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.ComponentModel.Composition.Hosting", "CompositionScopeDefinition", True, "get_PublicSurface", "()", "", "Argument[this].Element.Property[System.ComponentModel.Composition.Primitives.ComposablePartDefinition.ExportDefinitions]", "ReturnValue.Element", "value", "dfc-generated"]
+      - ["System.ComponentModel.Composition.Hosting", "CompositionScopeDefinition", True, "get_PublicSurface", "()", "", "Argument[this].SyntheticField[System.ComponentModel.Composition.Hosting.CompositionScopeDefinition._publicSurface]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.ComponentModel.Composition.Hosting", "DirectoryCatalog", False, "DirectoryCatalog", "(System.String,System.String)", "", "Argument[0]", "Argument[this].SyntheticField[System.ComponentModel.Composition.Hosting.DirectoryCatalog._fullPath]", "taint", "dfc-generated"]
+      - ["System.ComponentModel.Composition.Hosting", "DirectoryCatalog", False, "DirectoryCatalog", "(System.String,System.String)", "", "Argument[0]", "Argument[this].SyntheticField[System.ComponentModel.Composition.Hosting.DirectoryCatalog._path]", "value", "dfc-generated"]
+      - ["System.ComponentModel.Composition.Hosting", "DirectoryCatalog", False, "DirectoryCatalog", "(System.String,System.String)", "", "Argument[1]", "Argument[this].SyntheticField[System.ComponentModel.Composition.Hosting.DirectoryCatalog._searchPattern]", "value", "dfc-generated"]
+      - ["System.ComponentModel.Composition.Hosting", "DirectoryCatalog", False, "DirectoryCatalog", "(System.String,System.String,System.ComponentModel.Composition.Primitives.ICompositionElement)", "", "Argument[0]", "Argument[this].SyntheticField[System.ComponentModel.Composition.Hosting.DirectoryCatalog._fullPath]", "taint", "dfc-generated"]
+      - ["System.ComponentModel.Composition.Hosting", "DirectoryCatalog", False, "DirectoryCatalog", "(System.String,System.String,System.ComponentModel.Composition.Primitives.ICompositionElement)", "", "Argument[0]", "Argument[this].SyntheticField[System.ComponentModel.Composition.Hosting.DirectoryCatalog._path]", "value", "dfc-generated"]
+      - ["System.ComponentModel.Composition.Hosting", "DirectoryCatalog", False, "DirectoryCatalog", "(System.String,System.String,System.ComponentModel.Composition.Primitives.ICompositionElement)", "", "Argument[1]", "Argument[this].SyntheticField[System.ComponentModel.Composition.Hosting.DirectoryCatalog._searchPattern]", "value", "dfc-generated"]
+      - ["System.ComponentModel.Composition.Hosting", "DirectoryCatalog", False, "DirectoryCatalog", "(System.String,System.String,System.Reflection.ReflectionContext)", "", "Argument[0]", "Argument[this].SyntheticField[System.ComponentModel.Composition.Hosting.DirectoryCatalog._fullPath]", "taint", "dfc-generated"]
+      - ["System.ComponentModel.Composition.Hosting", "DirectoryCatalog", False, "DirectoryCatalog", "(System.String,System.String,System.Reflection.ReflectionContext)", "", "Argument[0]", "Argument[this].SyntheticField[System.ComponentModel.Composition.Hosting.DirectoryCatalog._path]", "value", "dfc-generated"]
+      - ["System.ComponentModel.Composition.Hosting", "DirectoryCatalog", False, "DirectoryCatalog", "(System.String,System.String,System.Reflection.ReflectionContext)", "", "Argument[1]", "Argument[this].SyntheticField[System.ComponentModel.Composition.Hosting.DirectoryCatalog._searchPattern]", "value", "dfc-generated"]
+      - ["System.ComponentModel.Composition.Hosting", "DirectoryCatalog", False, "DirectoryCatalog", "(System.String,System.String,System.Reflection.ReflectionContext,System.ComponentModel.Composition.Primitives.ICompositionElement)", "", "Argument[0]", "Argument[this].SyntheticField[System.ComponentModel.Composition.Hosting.DirectoryCatalog._fullPath]", "taint", "dfc-generated"]
+      - ["System.ComponentModel.Composition.Hosting", "DirectoryCatalog", False, "DirectoryCatalog", "(System.String,System.String,System.Reflection.ReflectionContext,System.ComponentModel.Composition.Primitives.ICompositionElement)", "", "Argument[0]", "Argument[this].SyntheticField[System.ComponentModel.Composition.Hosting.DirectoryCatalog._path]", "value", "dfc-generated"]
+      - ["System.ComponentModel.Composition.Hosting", "DirectoryCatalog", False, "DirectoryCatalog", "(System.String,System.String,System.Reflection.ReflectionContext,System.ComponentModel.Composition.Primitives.ICompositionElement)", "", "Argument[1]", "Argument[this].SyntheticField[System.ComponentModel.Composition.Hosting.DirectoryCatalog._searchPattern]", "value", "dfc-generated"]
+      - ["System.ComponentModel.Composition.Hosting", "DirectoryCatalog", False, "ToString", "()", "", "Argument[this].SyntheticField[System.ComponentModel.Composition.Hosting.DirectoryCatalog._path]", "ReturnValue", "taint", "dfc-generated"]
+      - ["System.ComponentModel.Composition.Hosting", "DirectoryCatalog", False, "get_DisplayName", "()", "", "Argument[this].SyntheticField[System.ComponentModel.Composition.Hosting.DirectoryCatalog._path]", "ReturnValue", "taint", "dfc-generated"]
+      - ["System.ComponentModel.Composition.Hosting", "DirectoryCatalog", False, "get_FullPath", "()", "", "Argument[this].SyntheticField[System.ComponentModel.Composition.Hosting.DirectoryCatalog._fullPath]", "ReturnValue", "value", "dfc-generated"]
       - ["System.ComponentModel.Composition.Hosting", "DirectoryCatalog", False, "get_LoadedFiles", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.ComponentModel.Composition.Hosting", "DirectoryCatalog", False, "get_Path", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.ComponentModel.Composition.Hosting", "DirectoryCatalog", False, "get_SearchPattern", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.ComponentModel.Composition.Hosting", "DirectoryCatalog", False, "get_Path", "()", "", "Argument[this].SyntheticField[System.ComponentModel.Composition.Hosting.DirectoryCatalog._path]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.ComponentModel.Composition.Hosting", "DirectoryCatalog", False, "get_SearchPattern", "()", "", "Argument[this].SyntheticField[System.ComponentModel.Composition.Hosting.DirectoryCatalog._searchPattern]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.ComponentModel.Composition.Hosting", "ExportProvider", False, "GetExports", "(System.ComponentModel.Composition.Primitives.ImportDefinition)", "", "Argument[this]", "Argument[0]", "taint", "df-generated"]
       - ["System.ComponentModel.Composition.Hosting", "ExportProvider", False, "GetExports", "(System.ComponentModel.Composition.Primitives.ImportDefinition)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.ComponentModel.Composition.Hosting", "ExportProvider", False, "GetExports", "(System.ComponentModel.Composition.Primitives.ImportDefinition,System.ComponentModel.Composition.Hosting.AtomicComposition)", "", "Argument[this]", "Argument[0]", "taint", "df-generated"]
       - ["System.ComponentModel.Composition.Hosting", "ExportProvider", False, "GetExports", "(System.ComponentModel.Composition.Primitives.ImportDefinition,System.ComponentModel.Composition.Hosting.AtomicComposition)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.ComponentModel.Composition.Hosting", "ExportProvider", False, "TryGetExports", "(System.ComponentModel.Composition.Primitives.ImportDefinition,System.ComponentModel.Composition.Hosting.AtomicComposition,System.Collections.Generic.IEnumerable<System.ComponentModel.Composition.Primitives.Export>)", "", "Argument[this]", "Argument[0]", "taint", "df-generated"]
       - ["System.ComponentModel.Composition.Hosting", "ExportProvider", False, "TryGetExports", "(System.ComponentModel.Composition.Primitives.ImportDefinition,System.ComponentModel.Composition.Hosting.AtomicComposition,System.Collections.Generic.IEnumerable<System.ComponentModel.Composition.Primitives.Export>)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.ComponentModel.Composition.Hosting", "ExportProvider", True, "GetExportsCore", "(System.ComponentModel.Composition.Primitives.ImportDefinition,System.ComponentModel.Composition.Hosting.AtomicComposition)", "", "Argument[this]", "Argument[0]", "taint", "df-generated"]
       - ["System.ComponentModel.Composition.Hosting", "ExportProvider", True, "GetExportsCore", "(System.ComponentModel.Composition.Primitives.ImportDefinition,System.ComponentModel.Composition.Hosting.AtomicComposition)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.ComponentModel.Composition.Hosting", "ExportsChangeEventArgs", False, "ExportsChangeEventArgs", "(System.Collections.Generic.IEnumerable<System.ComponentModel.Composition.Primitives.ExportDefinition>,System.Collections.Generic.IEnumerable<System.ComponentModel.Composition.Primitives.ExportDefinition>,System.ComponentModel.Composition.Hosting.AtomicComposition)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["System.ComponentModel.Composition.Hosting", "ExportsChangeEventArgs", False, "ExportsChangeEventArgs", "(System.Collections.Generic.IEnumerable<System.ComponentModel.Composition.Primitives.ExportDefinition>,System.Collections.Generic.IEnumerable<System.ComponentModel.Composition.Primitives.ExportDefinition>,System.ComponentModel.Composition.Hosting.AtomicComposition)", "", "Argument[1].Element", "Argument[this]", "taint", "df-generated"]
-      - ["System.ComponentModel.Composition.Hosting", "ExportsChangeEventArgs", False, "get_AddedExports", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.ComponentModel.Composition.Hosting", "ExportsChangeEventArgs", False, "get_RemovedExports", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.ComponentModel.Composition.Hosting", "ExportsChangeEventArgs", False, "ExportsChangeEventArgs", "(System.Collections.Generic.IEnumerable<System.ComponentModel.Composition.Primitives.ExportDefinition>,System.Collections.Generic.IEnumerable<System.ComponentModel.Composition.Primitives.ExportDefinition>,System.ComponentModel.Composition.Hosting.AtomicComposition)", "", "Argument[0].Element", "Argument[this].SyntheticField[System.ComponentModel.Composition.Hosting.ExportsChangeEventArgs._addedExports].Element", "value", "dfc-generated"]
+      - ["System.ComponentModel.Composition.Hosting", "ExportsChangeEventArgs", False, "ExportsChangeEventArgs", "(System.Collections.Generic.IEnumerable<System.ComponentModel.Composition.Primitives.ExportDefinition>,System.Collections.Generic.IEnumerable<System.ComponentModel.Composition.Primitives.ExportDefinition>,System.ComponentModel.Composition.Hosting.AtomicComposition)", "", "Argument[0]", "Argument[this].SyntheticField[System.ComponentModel.Composition.Hosting.ExportsChangeEventArgs._addedExports]", "value", "dfc-generated"]
+      - ["System.ComponentModel.Composition.Hosting", "ExportsChangeEventArgs", False, "ExportsChangeEventArgs", "(System.Collections.Generic.IEnumerable<System.ComponentModel.Composition.Primitives.ExportDefinition>,System.Collections.Generic.IEnumerable<System.ComponentModel.Composition.Primitives.ExportDefinition>,System.ComponentModel.Composition.Hosting.AtomicComposition)", "", "Argument[1].Element", "Argument[this].SyntheticField[System.ComponentModel.Composition.Hosting.ExportsChangeEventArgs._removedExports].Element", "value", "dfc-generated"]
+      - ["System.ComponentModel.Composition.Hosting", "ExportsChangeEventArgs", False, "ExportsChangeEventArgs", "(System.Collections.Generic.IEnumerable<System.ComponentModel.Composition.Primitives.ExportDefinition>,System.Collections.Generic.IEnumerable<System.ComponentModel.Composition.Primitives.ExportDefinition>,System.ComponentModel.Composition.Hosting.AtomicComposition)", "", "Argument[1]", "Argument[this].SyntheticField[System.ComponentModel.Composition.Hosting.ExportsChangeEventArgs._removedExports]", "value", "dfc-generated"]
+      - ["System.ComponentModel.Composition.Hosting", "ExportsChangeEventArgs", False, "get_AddedExports", "()", "", "Argument[this].SyntheticField[System.ComponentModel.Composition.Hosting.ExportsChangeEventArgs._addedExports]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.ComponentModel.Composition.Hosting", "ExportsChangeEventArgs", False, "get_RemovedExports", "()", "", "Argument[this].SyntheticField[System.ComponentModel.Composition.Hosting.ExportsChangeEventArgs._removedExports]", "ReturnValue", "value", "dfc-generated"]
       - ["System.ComponentModel.Composition.Hosting", "FilteredCatalog", False, "get_Complement", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.ComponentModel.Composition.Hosting", "ImportEngine", False, "ImportEngine", "(System.ComponentModel.Composition.Hosting.ExportProvider,System.ComponentModel.Composition.Hosting.CompositionOptions)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.ComponentModel.Composition.Hosting", "TypeCatalog", False, "TypeCatalog", "(System.Collections.Generic.IEnumerable<System.Type>)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["System.ComponentModel.Composition.Hosting", "TypeCatalog", False, "TypeCatalog", "(System.Collections.Generic.IEnumerable<System.Type>,System.ComponentModel.Composition.Primitives.ICompositionElement)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
       - ["System.ComponentModel.Composition.Hosting", "TypeCatalog", False, "TypeCatalog", "(System.Collections.Generic.IEnumerable<System.Type>,System.ComponentModel.Composition.Primitives.ICompositionElement)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
       - ["System.ComponentModel.Composition.Hosting", "TypeCatalog", False, "TypeCatalog", "(System.Collections.Generic.IEnumerable<System.Type>,System.Reflection.ReflectionContext,System.ComponentModel.Composition.Primitives.ICompositionElement)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
   - addsTo:
@@ -94,6 +109,10 @@ extensions:
       - ["System.ComponentModel.Composition.Hosting", "AggregateCatalog", "Dispose", "(System.Boolean)", "summary", "df-generated"]
       - ["System.ComponentModel.Composition.Hosting", "AggregateCatalog", "OnChanged", "(System.ComponentModel.Composition.Hosting.ComposablePartCatalogChangeEventArgs)", "summary", "df-generated"]
       - ["System.ComponentModel.Composition.Hosting", "AggregateCatalog", "OnChanging", "(System.ComponentModel.Composition.Hosting.ComposablePartCatalogChangeEventArgs)", "summary", "df-generated"]
+      - ["System.ComponentModel.Composition.Hosting", "AggregateCatalog", "add_Changed", "(System.EventHandler<System.ComponentModel.Composition.Hosting.ComposablePartCatalogChangeEventArgs>)", "summary", "df-generated"]
+      - ["System.ComponentModel.Composition.Hosting", "AggregateCatalog", "add_Changing", "(System.EventHandler<System.ComponentModel.Composition.Hosting.ComposablePartCatalogChangeEventArgs>)", "summary", "df-generated"]
+      - ["System.ComponentModel.Composition.Hosting", "AggregateCatalog", "remove_Changed", "(System.EventHandler<System.ComponentModel.Composition.Hosting.ComposablePartCatalogChangeEventArgs>)", "summary", "df-generated"]
+      - ["System.ComponentModel.Composition.Hosting", "AggregateCatalog", "remove_Changing", "(System.EventHandler<System.ComponentModel.Composition.Hosting.ComposablePartCatalogChangeEventArgs>)", "summary", "df-generated"]
       - ["System.ComponentModel.Composition.Hosting", "AggregateExportProvider", "AggregateExportProvider", "(System.Collections.Generic.IEnumerable<System.ComponentModel.Composition.Hosting.ExportProvider>)", "summary", "df-generated"]
       - ["System.ComponentModel.Composition.Hosting", "AggregateExportProvider", "Dispose", "()", "summary", "df-generated"]
       - ["System.ComponentModel.Composition.Hosting", "AggregateExportProvider", "Dispose", "(System.Boolean)", "summary", "df-generated"]
@@ -101,6 +120,8 @@ extensions:
       - ["System.ComponentModel.Composition.Hosting", "ApplicationCatalog", "ToString", "()", "summary", "df-generated"]
       - ["System.ComponentModel.Composition.Hosting", "AssemblyCatalog", "AssemblyCatalog", "(System.String)", "summary", "df-generated"]
       - ["System.ComponentModel.Composition.Hosting", "AssemblyCatalog", "Dispose", "(System.Boolean)", "summary", "df-generated"]
+      - ["System.ComponentModel.Composition.Hosting", "AtomicComposition", "AddCompleteAction", "(System.Action)", "summary", "df-generated"]
+      - ["System.ComponentModel.Composition.Hosting", "AtomicComposition", "AddRevertAction", "(System.Action)", "summary", "df-generated"]
       - ["System.ComponentModel.Composition.Hosting", "AtomicComposition", "Complete", "()", "summary", "df-generated"]
       - ["System.ComponentModel.Composition.Hosting", "AtomicComposition", "Dispose", "()", "summary", "df-generated"]
       - ["System.ComponentModel.Composition.Hosting", "AtomicComposition", "Dispose", "(System.Boolean)", "summary", "df-generated"]
@@ -129,6 +150,10 @@ extensions:
       - ["System.ComponentModel.Composition.Hosting", "CompositionScopeDefinition", "Dispose", "(System.Boolean)", "summary", "df-generated"]
       - ["System.ComponentModel.Composition.Hosting", "CompositionScopeDefinition", "OnChanged", "(System.ComponentModel.Composition.Hosting.ComposablePartCatalogChangeEventArgs)", "summary", "df-generated"]
       - ["System.ComponentModel.Composition.Hosting", "CompositionScopeDefinition", "OnChanging", "(System.ComponentModel.Composition.Hosting.ComposablePartCatalogChangeEventArgs)", "summary", "df-generated"]
+      - ["System.ComponentModel.Composition.Hosting", "CompositionScopeDefinition", "add_Changed", "(System.EventHandler<System.ComponentModel.Composition.Hosting.ComposablePartCatalogChangeEventArgs>)", "summary", "df-generated"]
+      - ["System.ComponentModel.Composition.Hosting", "CompositionScopeDefinition", "add_Changing", "(System.EventHandler<System.ComponentModel.Composition.Hosting.ComposablePartCatalogChangeEventArgs>)", "summary", "df-generated"]
+      - ["System.ComponentModel.Composition.Hosting", "CompositionScopeDefinition", "remove_Changed", "(System.EventHandler<System.ComponentModel.Composition.Hosting.ComposablePartCatalogChangeEventArgs>)", "summary", "df-generated"]
+      - ["System.ComponentModel.Composition.Hosting", "CompositionScopeDefinition", "remove_Changing", "(System.EventHandler<System.ComponentModel.Composition.Hosting.ComposablePartCatalogChangeEventArgs>)", "summary", "df-generated"]
       - ["System.ComponentModel.Composition.Hosting", "CompositionService", "Dispose", "()", "summary", "df-generated"]
       - ["System.ComponentModel.Composition.Hosting", "CompositionService", "SatisfyImportsOnce", "(System.ComponentModel.Composition.Primitives.ComposablePart)", "summary", "df-generated"]
       - ["System.ComponentModel.Composition.Hosting", "DirectoryCatalog", "DirectoryCatalog", "(System.String)", "summary", "df-generated"]
@@ -139,6 +164,10 @@ extensions:
       - ["System.ComponentModel.Composition.Hosting", "DirectoryCatalog", "OnChanged", "(System.ComponentModel.Composition.Hosting.ComposablePartCatalogChangeEventArgs)", "summary", "df-generated"]
       - ["System.ComponentModel.Composition.Hosting", "DirectoryCatalog", "OnChanging", "(System.ComponentModel.Composition.Hosting.ComposablePartCatalogChangeEventArgs)", "summary", "df-generated"]
       - ["System.ComponentModel.Composition.Hosting", "DirectoryCatalog", "Refresh", "()", "summary", "df-generated"]
+      - ["System.ComponentModel.Composition.Hosting", "DirectoryCatalog", "add_Changed", "(System.EventHandler<System.ComponentModel.Composition.Hosting.ComposablePartCatalogChangeEventArgs>)", "summary", "df-generated"]
+      - ["System.ComponentModel.Composition.Hosting", "DirectoryCatalog", "add_Changing", "(System.EventHandler<System.ComponentModel.Composition.Hosting.ComposablePartCatalogChangeEventArgs>)", "summary", "df-generated"]
+      - ["System.ComponentModel.Composition.Hosting", "DirectoryCatalog", "remove_Changed", "(System.EventHandler<System.ComponentModel.Composition.Hosting.ComposablePartCatalogChangeEventArgs>)", "summary", "df-generated"]
+      - ["System.ComponentModel.Composition.Hosting", "DirectoryCatalog", "remove_Changing", "(System.EventHandler<System.ComponentModel.Composition.Hosting.ComposablePartCatalogChangeEventArgs>)", "summary", "df-generated"]
       - ["System.ComponentModel.Composition.Hosting", "ExportProvider", "GetExport<T,TMetadataView>", "()", "summary", "df-generated"]
       - ["System.ComponentModel.Composition.Hosting", "ExportProvider", "GetExport<T,TMetadataView>", "(System.String)", "summary", "df-generated"]
       - ["System.ComponentModel.Composition.Hosting", "ExportProvider", "GetExport<T>", "()", "summary", "df-generated"]
@@ -156,12 +185,27 @@ extensions:
       - ["System.ComponentModel.Composition.Hosting", "ExportProvider", "GetExports<T>", "(System.String)", "summary", "df-generated"]
       - ["System.ComponentModel.Composition.Hosting", "ExportProvider", "OnExportsChanged", "(System.ComponentModel.Composition.Hosting.ExportsChangeEventArgs)", "summary", "df-generated"]
       - ["System.ComponentModel.Composition.Hosting", "ExportProvider", "OnExportsChanging", "(System.ComponentModel.Composition.Hosting.ExportsChangeEventArgs)", "summary", "df-generated"]
+      - ["System.ComponentModel.Composition.Hosting", "ExportProvider", "add_ExportsChanged", "(System.EventHandler<System.ComponentModel.Composition.Hosting.ExportsChangeEventArgs>)", "summary", "df-generated"]
+      - ["System.ComponentModel.Composition.Hosting", "ExportProvider", "add_ExportsChanging", "(System.EventHandler<System.ComponentModel.Composition.Hosting.ExportsChangeEventArgs>)", "summary", "df-generated"]
+      - ["System.ComponentModel.Composition.Hosting", "ExportProvider", "remove_ExportsChanged", "(System.EventHandler<System.ComponentModel.Composition.Hosting.ExportsChangeEventArgs>)", "summary", "df-generated"]
+      - ["System.ComponentModel.Composition.Hosting", "ExportProvider", "remove_ExportsChanging", "(System.EventHandler<System.ComponentModel.Composition.Hosting.ExportsChangeEventArgs>)", "summary", "df-generated"]
       - ["System.ComponentModel.Composition.Hosting", "ExportsChangeEventArgs", "get_ChangedContractNames", "()", "summary", "df-generated"]
       - ["System.ComponentModel.Composition.Hosting", "FilteredCatalog", "Dispose", "(System.Boolean)", "summary", "df-generated"]
+      - ["System.ComponentModel.Composition.Hosting", "FilteredCatalog", "FilteredCatalog", "(System.ComponentModel.Composition.Primitives.ComposablePartCatalog,System.Func<System.ComponentModel.Composition.Primitives.ComposablePartDefinition,System.Boolean>)", "summary", "df-generated"]
       - ["System.ComponentModel.Composition.Hosting", "FilteredCatalog", "IncludeDependencies", "()", "summary", "df-generated"]
+      - ["System.ComponentModel.Composition.Hosting", "FilteredCatalog", "IncludeDependencies", "(System.Func<System.ComponentModel.Composition.Primitives.ImportDefinition,System.Boolean>)", "summary", "df-generated"]
       - ["System.ComponentModel.Composition.Hosting", "FilteredCatalog", "IncludeDependents", "()", "summary", "df-generated"]
+      - ["System.ComponentModel.Composition.Hosting", "FilteredCatalog", "IncludeDependents", "(System.Func<System.ComponentModel.Composition.Primitives.ImportDefinition,System.Boolean>)", "summary", "df-generated"]
       - ["System.ComponentModel.Composition.Hosting", "FilteredCatalog", "OnChanged", "(System.ComponentModel.Composition.Hosting.ComposablePartCatalogChangeEventArgs)", "summary", "df-generated"]
       - ["System.ComponentModel.Composition.Hosting", "FilteredCatalog", "OnChanging", "(System.ComponentModel.Composition.Hosting.ComposablePartCatalogChangeEventArgs)", "summary", "df-generated"]
+      - ["System.ComponentModel.Composition.Hosting", "FilteredCatalog", "add_Changed", "(System.EventHandler<System.ComponentModel.Composition.Hosting.ComposablePartCatalogChangeEventArgs>)", "summary", "df-generated"]
+      - ["System.ComponentModel.Composition.Hosting", "FilteredCatalog", "add_Changing", "(System.EventHandler<System.ComponentModel.Composition.Hosting.ComposablePartCatalogChangeEventArgs>)", "summary", "df-generated"]
+      - ["System.ComponentModel.Composition.Hosting", "FilteredCatalog", "remove_Changed", "(System.EventHandler<System.ComponentModel.Composition.Hosting.ComposablePartCatalogChangeEventArgs>)", "summary", "df-generated"]
+      - ["System.ComponentModel.Composition.Hosting", "FilteredCatalog", "remove_Changing", "(System.EventHandler<System.ComponentModel.Composition.Hosting.ComposablePartCatalogChangeEventArgs>)", "summary", "df-generated"]
+      - ["System.ComponentModel.Composition.Hosting", "INotifyComposablePartCatalogChanged", "add_Changed", "(System.EventHandler<System.ComponentModel.Composition.Hosting.ComposablePartCatalogChangeEventArgs>)", "summary", "df-generated"]
+      - ["System.ComponentModel.Composition.Hosting", "INotifyComposablePartCatalogChanged", "add_Changing", "(System.EventHandler<System.ComponentModel.Composition.Hosting.ComposablePartCatalogChangeEventArgs>)", "summary", "df-generated"]
+      - ["System.ComponentModel.Composition.Hosting", "INotifyComposablePartCatalogChanged", "remove_Changed", "(System.EventHandler<System.ComponentModel.Composition.Hosting.ComposablePartCatalogChangeEventArgs>)", "summary", "df-generated"]
+      - ["System.ComponentModel.Composition.Hosting", "INotifyComposablePartCatalogChanged", "remove_Changing", "(System.EventHandler<System.ComponentModel.Composition.Hosting.ComposablePartCatalogChangeEventArgs>)", "summary", "df-generated"]
       - ["System.ComponentModel.Composition.Hosting", "ImportEngine", "Dispose", "()", "summary", "df-generated"]
       - ["System.ComponentModel.Composition.Hosting", "ImportEngine", "Dispose", "(System.Boolean)", "summary", "df-generated"]
       - ["System.ComponentModel.Composition.Hosting", "ImportEngine", "ImportEngine", "(System.ComponentModel.Composition.Hosting.ExportProvider)", "summary", "df-generated"]
@@ -173,9 +217,11 @@ extensions:
       - ["System.ComponentModel.Composition.Hosting", "ScopingExtensions", "ContainsPartMetadata<T>", "(System.ComponentModel.Composition.Primitives.ComposablePartDefinition,System.String,T)", "summary", "df-generated"]
       - ["System.ComponentModel.Composition.Hosting", "ScopingExtensions", "ContainsPartMetadataWithKey", "(System.ComponentModel.Composition.Primitives.ComposablePartDefinition,System.String)", "summary", "df-generated"]
       - ["System.ComponentModel.Composition.Hosting", "ScopingExtensions", "Exports", "(System.ComponentModel.Composition.Primitives.ComposablePartDefinition,System.String)", "summary", "df-generated"]
+      - ["System.ComponentModel.Composition.Hosting", "ScopingExtensions", "Filter", "(System.ComponentModel.Composition.Primitives.ComposablePartCatalog,System.Func<System.ComponentModel.Composition.Primitives.ComposablePartDefinition,System.Boolean>)", "summary", "df-generated"]
       - ["System.ComponentModel.Composition.Hosting", "ScopingExtensions", "Imports", "(System.ComponentModel.Composition.Primitives.ComposablePartDefinition,System.String)", "summary", "df-generated"]
       - ["System.ComponentModel.Composition.Hosting", "ScopingExtensions", "Imports", "(System.ComponentModel.Composition.Primitives.ComposablePartDefinition,System.String,System.ComponentModel.Composition.Primitives.ImportCardinality)", "summary", "df-generated"]
       - ["System.ComponentModel.Composition.Hosting", "TypeCatalog", "Dispose", "(System.Boolean)", "summary", "df-generated"]
       - ["System.ComponentModel.Composition.Hosting", "TypeCatalog", "ToString", "()", "summary", "df-generated"]
+      - ["System.ComponentModel.Composition.Hosting", "TypeCatalog", "TypeCatalog", "(System.Collections.Generic.IEnumerable<System.Type>)", "summary", "df-generated"]
       - ["System.ComponentModel.Composition.Hosting", "TypeCatalog", "TypeCatalog", "(System.Collections.Generic.IEnumerable<System.Type>,System.Reflection.ReflectionContext)", "summary", "df-generated"]
       - ["System.ComponentModel.Composition.Hosting", "TypeCatalog", "TypeCatalog", "(System.Type[])", "summary", "df-generated"]
diff --git a/csharp/ql/lib/ext/generated/System.ComponentModel.Composition.Primitives.model.yml b/csharp/ql/lib/ext/generated/System.ComponentModel.Composition.Primitives.model.yml
index 4f588d2af1f..c2263116a71 100644
--- a/csharp/ql/lib/ext/generated/System.ComponentModel.Composition.Primitives.model.yml
+++ b/csharp/ql/lib/ext/generated/System.ComponentModel.Composition.Primitives.model.yml
@@ -4,41 +4,42 @@ extensions:
       pack: codeql/csharp-all
       extensible: summaryModel
     data:
-      - ["System.ComponentModel.Composition.Primitives", "ComposablePart", True, "GetExportedValue", "(System.ComponentModel.Composition.Primitives.ExportDefinition)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["System.ComponentModel.Composition.Primitives", "ComposablePart", True, "GetExportedValue", "(System.ComponentModel.Composition.Primitives.ExportDefinition)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.ComponentModel.Composition.Primitives", "ComposablePart", True, "get_ExportDefinitions", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.ComponentModel.Composition.Primitives", "ComposablePart", True, "get_ImportDefinitions", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.ComponentModel.Composition.Primitives", "ComposablePart", True, "get_Metadata", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.ComponentModel.Composition.Primitives", "ComposablePartCatalog", True, "GetExports", "(System.ComponentModel.Composition.Primitives.ImportDefinition)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.ComponentModel.Composition.Primitives", "ComposablePartCatalog", True, "GetExports", "(System.ComponentModel.Composition.Primitives.ImportDefinition)", "", "Argument[this].Element", "ReturnValue.Element.Property[System.Tuple`2.Item1]", "value", "dfc-generated"]
       - ["System.ComponentModel.Composition.Primitives", "ComposablePartCatalog", True, "get_Parts", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.ComponentModel.Composition.Primitives", "ComposablePartDefinition", True, "CreatePart", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.ComponentModel.Composition.Primitives", "ComposablePartDefinition", True, "get_ExportDefinitions", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.ComponentModel.Composition.Primitives", "ComposablePartDefinition", True, "get_ImportDefinitions", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.ComponentModel.Composition.Primitives", "ComposablePartDefinition", True, "get_Metadata", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.ComponentModel.Composition.Primitives", "ComposablePartException", False, "ComposablePartException", "(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.ComponentModel.Composition.Primitives", "ComposablePartException", False, "ComposablePartException", "(System.String,System.ComponentModel.Composition.Primitives.ICompositionElement,System.Exception)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["System.ComponentModel.Composition.Primitives", "ComposablePartException", False, "get_Element", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.ComponentModel.Composition.Primitives", "ContractBasedImportDefinition", False, "ContractBasedImportDefinition", "(System.String,System.String,System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<System.String,System.Type>>,System.ComponentModel.Composition.Primitives.ImportCardinality,System.Boolean,System.Boolean,System.ComponentModel.Composition.CreationPolicy,System.Collections.Generic.IDictionary<System.String,System.Object>)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["System.ComponentModel.Composition.Primitives", "ContractBasedImportDefinition", False, "ContractBasedImportDefinition", "(System.String,System.String,System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<System.String,System.Type>>,System.ComponentModel.Composition.Primitives.ImportCardinality,System.Boolean,System.Boolean,System.ComponentModel.Composition.CreationPolicy,System.Collections.Generic.IDictionary<System.String,System.Object>)", "", "Argument[2].Element", "Argument[this]", "taint", "df-generated"]
-      - ["System.ComponentModel.Composition.Primitives", "ContractBasedImportDefinition", True, "get_RequiredMetadata", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.ComponentModel.Composition.Primitives", "ContractBasedImportDefinition", True, "get_RequiredTypeIdentity", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.ComponentModel.Composition.Primitives", "ComposablePartException", False, "ComposablePartException", "(System.String,System.ComponentModel.Composition.Primitives.ICompositionElement,System.Exception)", "", "Argument[1]", "Argument[this].SyntheticField[System.ComponentModel.Composition.Primitives.ComposablePartException._element]", "value", "dfc-generated"]
+      - ["System.ComponentModel.Composition.Primitives", "ComposablePartException", False, "get_Element", "()", "", "Argument[this].SyntheticField[System.ComponentModel.Composition.Primitives.ComposablePartException._element]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.ComponentModel.Composition.Primitives", "ContractBasedImportDefinition", False, "ContractBasedImportDefinition", "(System.String,System.String,System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<System.String,System.Type>>,System.ComponentModel.Composition.Primitives.ImportCardinality,System.Boolean,System.Boolean,System.ComponentModel.Composition.CreationPolicy,System.Collections.Generic.IDictionary<System.String,System.Object>)", "", "Argument[1]", "Argument[this].SyntheticField[System.ComponentModel.Composition.Primitives.ContractBasedImportDefinition._requiredTypeIdentity]", "value", "dfc-generated"]
+      - ["System.ComponentModel.Composition.Primitives", "ContractBasedImportDefinition", False, "ContractBasedImportDefinition", "(System.String,System.String,System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<System.String,System.Type>>,System.ComponentModel.Composition.Primitives.ImportCardinality,System.Boolean,System.Boolean,System.ComponentModel.Composition.CreationPolicy,System.Collections.Generic.IDictionary<System.String,System.Object>)", "", "Argument[2]", "Argument[this].SyntheticField[System.ComponentModel.Composition.Primitives.ContractBasedImportDefinition._requiredMetadata]", "value", "dfc-generated"]
+      - ["System.ComponentModel.Composition.Primitives", "ContractBasedImportDefinition", True, "get_RequiredMetadata", "()", "", "Argument[this].SyntheticField[System.ComponentModel.Composition.Primitives.ContractBasedImportDefinition._requiredMetadata]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.ComponentModel.Composition.Primitives", "ContractBasedImportDefinition", True, "get_RequiredTypeIdentity", "()", "", "Argument[this].SyntheticField[System.ComponentModel.Composition.Primitives.ContractBasedImportDefinition._requiredTypeIdentity]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.ComponentModel.Composition.Primitives", "Export", False, "Export", "(System.ComponentModel.Composition.Primitives.ExportDefinition,System.Func<System.Object>)", "", "Argument[0]", "Argument[this].SyntheticField[System.ComponentModel.Composition.Primitives.Export._definition]", "value", "dfc-generated"]
+      - ["System.ComponentModel.Composition.Primitives", "Export", False, "Export", "(System.ComponentModel.Composition.Primitives.ExportDefinition,System.Func<System.Object>)", "", "Argument[1]", "Argument[this].SyntheticField[System.ComponentModel.Composition.Primitives.Export._exportedValueGetter]", "value", "dfc-generated"]
       - ["System.ComponentModel.Composition.Primitives", "Export", False, "get_Metadata", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.ComponentModel.Composition.Primitives", "Export", False, "get_Value", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.ComponentModel.Composition.Primitives", "Export", True, "GetExportedValueCore", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.ComponentModel.Composition.Primitives", "Export", True, "get_Definition", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.ComponentModel.Composition.Primitives", "ExportDefinition", False, "ExportDefinition", "(System.String,System.Collections.Generic.IDictionary<System.String,System.Object>)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.ComponentModel.Composition.Primitives", "ExportDefinition", False, "ExportDefinition", "(System.String,System.Collections.Generic.IDictionary<System.String,System.Object>)", "", "Argument[1].Element", "Argument[this]", "taint", "df-generated"]
+      - ["System.ComponentModel.Composition.Primitives", "Export", True, "get_Definition", "()", "", "Argument[this].SyntheticField[System.ComponentModel.Composition.Primitives.Export._definition]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.ComponentModel.Composition.Primitives", "ExportDefinition", False, "ExportDefinition", "(System.String,System.Collections.Generic.IDictionary<System.String,System.Object>)", "", "Argument[0]", "Argument[this].SyntheticField[System.ComponentModel.Composition.Primitives.ExportDefinition._contractName]", "value", "dfc-generated"]
+      - ["System.ComponentModel.Composition.Primitives", "ExportDefinition", False, "ExportDefinition", "(System.String,System.Collections.Generic.IDictionary<System.String,System.Object>)", "", "Argument[1]", "Argument[this].SyntheticField[System.ComponentModel.Composition.Primitives.ExportDefinition._metadata]", "value", "dfc-generated"]
       - ["System.ComponentModel.Composition.Primitives", "ExportDefinition", False, "ToString", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.ComponentModel.Composition.Primitives", "ExportDefinition", True, "get_ContractName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.ComponentModel.Composition.Primitives", "ExportDefinition", True, "get_Metadata", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.ComponentModel.Composition.Primitives", "ExportDefinition", True, "get_ContractName", "()", "", "Argument[this].SyntheticField[System.ComponentModel.Composition.Primitives.ExportDefinition._contractName]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.ComponentModel.Composition.Primitives", "ExportDefinition", True, "get_Metadata", "()", "", "Argument[this].SyntheticField[System.ComponentModel.Composition.Primitives.ExportDefinition._metadata]", "ReturnValue", "value", "dfc-generated"]
       - ["System.ComponentModel.Composition.Primitives", "ExportedDelegate", False, "ExportedDelegate", "(System.Object,System.Reflection.MethodInfo)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.ComponentModel.Composition.Primitives", "ExportedDelegate", False, "ExportedDelegate", "(System.Object,System.Reflection.MethodInfo)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
       - ["System.ComponentModel.Composition.Primitives", "ICompositionElement", True, "get_DisplayName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.ComponentModel.Composition.Primitives", "ICompositionElement", True, "get_Origin", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.ComponentModel.Composition.Primitives", "ImportDefinition", False, "ImportDefinition", "(System.Linq.Expressions.Expression<System.Func<System.ComponentModel.Composition.Primitives.ExportDefinition,System.Boolean>>,System.String,System.ComponentModel.Composition.Primitives.ImportCardinality,System.Boolean,System.Boolean)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.ComponentModel.Composition.Primitives", "ImportDefinition", False, "ImportDefinition", "(System.Linq.Expressions.Expression<System.Func<System.ComponentModel.Composition.Primitives.ExportDefinition,System.Boolean>>,System.String,System.ComponentModel.Composition.Primitives.ImportCardinality,System.Boolean,System.Boolean,System.Collections.Generic.IDictionary<System.String,System.Object>)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["System.ComponentModel.Composition.Primitives", "ImportDefinition", False, "ImportDefinition", "(System.Linq.Expressions.Expression<System.Func<System.ComponentModel.Composition.Primitives.ExportDefinition,System.Boolean>>,System.String,System.ComponentModel.Composition.Primitives.ImportCardinality,System.Boolean,System.Boolean)", "", "Argument[0]", "Argument[this].SyntheticField[System.ComponentModel.Composition.Primitives.ImportDefinition._constraint]", "value", "dfc-generated"]
+      - ["System.ComponentModel.Composition.Primitives", "ImportDefinition", False, "ImportDefinition", "(System.Linq.Expressions.Expression<System.Func<System.ComponentModel.Composition.Primitives.ExportDefinition,System.Boolean>>,System.String,System.ComponentModel.Composition.Primitives.ImportCardinality,System.Boolean,System.Boolean,System.Collections.Generic.IDictionary<System.String,System.Object>)", "", "Argument[0]", "Argument[this].SyntheticField[System.ComponentModel.Composition.Primitives.ImportDefinition._constraint]", "value", "dfc-generated"]
       - ["System.ComponentModel.Composition.Primitives", "ImportDefinition", False, "ToString", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.ComponentModel.Composition.Primitives", "ImportDefinition", True, "get_Constraint", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.ComponentModel.Composition.Primitives", "ImportDefinition", True, "IsConstraintSatisfiedBy", "(System.ComponentModel.Composition.Primitives.ExportDefinition)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["System.ComponentModel.Composition.Primitives", "ImportDefinition", True, "get_Constraint", "()", "", "Argument[this].SyntheticField[System.ComponentModel.Composition.Primitives.ImportDefinition._constraint]", "ReturnValue", "value", "dfc-generated"]
       - ["System.ComponentModel.Composition.Primitives", "ImportDefinition", True, "get_ContractName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.ComponentModel.Composition.Primitives", "ImportDefinition", True, "get_Metadata", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
   - addsTo:
@@ -49,14 +50,15 @@ extensions:
       - ["System.ComponentModel.Composition.Primitives", "ComposablePart", "SetImport", "(System.ComponentModel.Composition.Primitives.ImportDefinition,System.Collections.Generic.IEnumerable<System.ComponentModel.Composition.Primitives.Export>)", "summary", "df-generated"]
       - ["System.ComponentModel.Composition.Primitives", "ComposablePartCatalog", "Dispose", "()", "summary", "df-generated"]
       - ["System.ComponentModel.Composition.Primitives", "ComposablePartCatalog", "Dispose", "(System.Boolean)", "summary", "df-generated"]
+      - ["System.ComponentModel.Composition.Primitives", "ComposablePartException", "ComposablePartException", "(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)", "summary", "df-generated"]
       - ["System.ComponentModel.Composition.Primitives", "ComposablePartException", "ComposablePartException", "(System.String)", "summary", "df-generated"]
       - ["System.ComponentModel.Composition.Primitives", "ComposablePartException", "ComposablePartException", "(System.String,System.ComponentModel.Composition.Primitives.ICompositionElement)", "summary", "df-generated"]
       - ["System.ComponentModel.Composition.Primitives", "ComposablePartException", "ComposablePartException", "(System.String,System.Exception)", "summary", "df-generated"]
       - ["System.ComponentModel.Composition.Primitives", "ContractBasedImportDefinition", "ContractBasedImportDefinition", "(System.String,System.String,System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<System.String,System.Type>>,System.ComponentModel.Composition.Primitives.ImportCardinality,System.Boolean,System.Boolean,System.ComponentModel.Composition.CreationPolicy)", "summary", "df-generated"]
-      - ["System.ComponentModel.Composition.Primitives", "ContractBasedImportDefinition", "IsConstraintSatisfiedBy", "(System.ComponentModel.Composition.Primitives.ExportDefinition)", "summary", "df-generated"]
       - ["System.ComponentModel.Composition.Primitives", "ContractBasedImportDefinition", "get_RequiredCreationPolicy", "()", "summary", "df-generated"]
+      - ["System.ComponentModel.Composition.Primitives", "Export", "Export", "(System.String,System.Collections.Generic.IDictionary<System.String,System.Object>,System.Func<System.Object>)", "summary", "df-generated"]
+      - ["System.ComponentModel.Composition.Primitives", "Export", "Export", "(System.String,System.Func<System.Object>)", "summary", "df-generated"]
       - ["System.ComponentModel.Composition.Primitives", "ExportedDelegate", "CreateDelegate", "(System.Type)", "summary", "df-generated"]
-      - ["System.ComponentModel.Composition.Primitives", "ImportDefinition", "IsConstraintSatisfiedBy", "(System.ComponentModel.Composition.Primitives.ExportDefinition)", "summary", "df-generated"]
       - ["System.ComponentModel.Composition.Primitives", "ImportDefinition", "get_Cardinality", "()", "summary", "df-generated"]
       - ["System.ComponentModel.Composition.Primitives", "ImportDefinition", "get_IsPrerequisite", "()", "summary", "df-generated"]
       - ["System.ComponentModel.Composition.Primitives", "ImportDefinition", "get_IsRecomposable", "()", "summary", "df-generated"]
diff --git a/csharp/ql/lib/ext/generated/System.ComponentModel.Composition.ReflectionModel.model.yml b/csharp/ql/lib/ext/generated/System.ComponentModel.Composition.ReflectionModel.model.yml
index 4c042bb5241..28167ef8f89 100644
--- a/csharp/ql/lib/ext/generated/System.ComponentModel.Composition.ReflectionModel.model.yml
+++ b/csharp/ql/lib/ext/generated/System.ComponentModel.Composition.ReflectionModel.model.yml
@@ -4,12 +4,11 @@ extensions:
       pack: codeql/csharp-all
       extensible: summaryModel
     data:
-      - ["System.ComponentModel.Composition.ReflectionModel", "LazyMemberInfo", False, "GetAccessors", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.ComponentModel.Composition.ReflectionModel", "LazyMemberInfo", False, "GetAccessors", "()", "", "Argument[this].SyntheticField[System.ComponentModel.Composition.ReflectionModel.LazyMemberInfo._accessors]", "ReturnValue", "value", "dfc-generated"]
       - ["System.ComponentModel.Composition.ReflectionModel", "LazyMemberInfo", False, "LazyMemberInfo", "(System.Reflection.MemberInfo)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.ComponentModel.Composition.ReflectionModel", "LazyMemberInfo", False, "LazyMemberInfo", "(System.Reflection.MemberTypes,System.Reflection.MemberInfo[])", "", "Argument[1].Element", "Argument[this]", "taint", "df-generated"]
-      - ["System.ComponentModel.Composition.ReflectionModel", "ReflectionModelServices", False, "CreateExportDefinition", "(System.ComponentModel.Composition.ReflectionModel.LazyMemberInfo,System.String,System.Lazy<System.Collections.Generic.IDictionary<System.String,System.Object>>,System.ComponentModel.Composition.Primitives.ICompositionElement)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.ComponentModel.Composition.ReflectionModel", "ReflectionModelServices", False, "CreateExportDefinition", "(System.ComponentModel.Composition.ReflectionModel.LazyMemberInfo,System.String,System.Lazy<System.Collections.Generic.IDictionary<System.String,System.Object>>,System.ComponentModel.Composition.Primitives.ICompositionElement)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
-      - ["System.ComponentModel.Composition.ReflectionModel", "ReflectionModelServices", False, "CreateExportDefinition", "(System.ComponentModel.Composition.ReflectionModel.LazyMemberInfo,System.String,System.Lazy<System.Collections.Generic.IDictionary<System.String,System.Object>>,System.ComponentModel.Composition.Primitives.ICompositionElement)", "", "Argument[3]", "ReturnValue", "taint", "df-generated"]
+      - ["System.ComponentModel.Composition.ReflectionModel", "LazyMemberInfo", False, "LazyMemberInfo", "(System.Reflection.MemberTypes,System.Func<System.Reflection.MemberInfo[]>)", "", "Argument[1]", "Argument[this].SyntheticField[System.ComponentModel.Composition.ReflectionModel.LazyMemberInfo._accessorsCreator]", "value", "dfc-generated"]
+      - ["System.ComponentModel.Composition.ReflectionModel", "LazyMemberInfo", False, "LazyMemberInfo", "(System.Reflection.MemberTypes,System.Reflection.MemberInfo[])", "", "Argument[1]", "Argument[this].SyntheticField[System.ComponentModel.Composition.ReflectionModel.LazyMemberInfo._accessors]", "value", "dfc-generated"]
+      - ["System.ComponentModel.Composition.ReflectionModel", "ReflectionModelServices", False, "CreateExportDefinition", "(System.ComponentModel.Composition.ReflectionModel.LazyMemberInfo,System.String,System.Lazy<System.Collections.Generic.IDictionary<System.String,System.Object>>,System.ComponentModel.Composition.Primitives.ICompositionElement)", "", "Argument[3]", "ReturnValue.SyntheticField[System.ComponentModel.Composition.ReflectionModel.ReflectionMemberExportDefinition._origin]", "value", "dfc-generated"]
       - ["System.ComponentModel.Composition.ReflectionModel", "ReflectionModelServices", False, "CreateImportDefinition", "(System.ComponentModel.Composition.ReflectionModel.LazyMemberInfo,System.String,System.String,System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<System.String,System.Type>>,System.ComponentModel.Composition.Primitives.ImportCardinality,System.Boolean,System.Boolean,System.ComponentModel.Composition.CreationPolicy,System.Collections.Generic.IDictionary<System.String,System.Object>,System.Boolean,System.ComponentModel.Composition.Primitives.ICompositionElement)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["System.ComponentModel.Composition.ReflectionModel", "ReflectionModelServices", False, "CreateImportDefinition", "(System.ComponentModel.Composition.ReflectionModel.LazyMemberInfo,System.String,System.String,System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<System.String,System.Type>>,System.ComponentModel.Composition.Primitives.ImportCardinality,System.Boolean,System.Boolean,System.ComponentModel.Composition.CreationPolicy,System.Collections.Generic.IDictionary<System.String,System.Object>,System.Boolean,System.ComponentModel.Composition.Primitives.ICompositionElement)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
       - ["System.ComponentModel.Composition.ReflectionModel", "ReflectionModelServices", False, "CreateImportDefinition", "(System.ComponentModel.Composition.ReflectionModel.LazyMemberInfo,System.String,System.String,System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<System.String,System.Type>>,System.ComponentModel.Composition.Primitives.ImportCardinality,System.Boolean,System.Boolean,System.ComponentModel.Composition.CreationPolicy,System.Collections.Generic.IDictionary<System.String,System.Object>,System.Boolean,System.ComponentModel.Composition.Primitives.ICompositionElement)", "", "Argument[3].Element", "ReturnValue", "taint", "df-generated"]
@@ -23,11 +22,7 @@ extensions:
       - ["System.ComponentModel.Composition.ReflectionModel", "ReflectionModelServices", False, "CreateImportDefinition", "(System.Lazy<System.Reflection.ParameterInfo>,System.String,System.String,System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<System.String,System.Type>>,System.ComponentModel.Composition.Primitives.ImportCardinality,System.ComponentModel.Composition.CreationPolicy,System.Collections.Generic.IDictionary<System.String,System.Object>,System.Boolean,System.ComponentModel.Composition.Primitives.ICompositionElement)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
       - ["System.ComponentModel.Composition.ReflectionModel", "ReflectionModelServices", False, "CreateImportDefinition", "(System.Lazy<System.Reflection.ParameterInfo>,System.String,System.String,System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<System.String,System.Type>>,System.ComponentModel.Composition.Primitives.ImportCardinality,System.ComponentModel.Composition.CreationPolicy,System.Collections.Generic.IDictionary<System.String,System.Object>,System.Boolean,System.ComponentModel.Composition.Primitives.ICompositionElement)", "", "Argument[3].Element", "ReturnValue", "taint", "df-generated"]
       - ["System.ComponentModel.Composition.ReflectionModel", "ReflectionModelServices", False, "CreateImportDefinition", "(System.Lazy<System.Reflection.ParameterInfo>,System.String,System.String,System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<System.String,System.Type>>,System.ComponentModel.Composition.Primitives.ImportCardinality,System.ComponentModel.Composition.CreationPolicy,System.ComponentModel.Composition.Primitives.ICompositionElement)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.ComponentModel.Composition.ReflectionModel", "ReflectionModelServices", False, "CreatePartDefinition", "(System.Lazy<System.Type>,System.Boolean,System.Lazy<System.Collections.Generic.IEnumerable<System.ComponentModel.Composition.Primitives.ImportDefinition>>,System.Lazy<System.Collections.Generic.IEnumerable<System.ComponentModel.Composition.Primitives.ExportDefinition>>,System.Lazy<System.Collections.Generic.IDictionary<System.String,System.Object>>,System.ComponentModel.Composition.Primitives.ICompositionElement)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.ComponentModel.Composition.ReflectionModel", "ReflectionModelServices", False, "CreatePartDefinition", "(System.Lazy<System.Type>,System.Boolean,System.Lazy<System.Collections.Generic.IEnumerable<System.ComponentModel.Composition.Primitives.ImportDefinition>>,System.Lazy<System.Collections.Generic.IEnumerable<System.ComponentModel.Composition.Primitives.ExportDefinition>>,System.Lazy<System.Collections.Generic.IDictionary<System.String,System.Object>>,System.ComponentModel.Composition.Primitives.ICompositionElement)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
-      - ["System.ComponentModel.Composition.ReflectionModel", "ReflectionModelServices", False, "CreatePartDefinition", "(System.Lazy<System.Type>,System.Boolean,System.Lazy<System.Collections.Generic.IEnumerable<System.ComponentModel.Composition.Primitives.ImportDefinition>>,System.Lazy<System.Collections.Generic.IEnumerable<System.ComponentModel.Composition.Primitives.ExportDefinition>>,System.Lazy<System.Collections.Generic.IDictionary<System.String,System.Object>>,System.ComponentModel.Composition.Primitives.ICompositionElement)", "", "Argument[3]", "ReturnValue", "taint", "df-generated"]
-      - ["System.ComponentModel.Composition.ReflectionModel", "ReflectionModelServices", False, "CreatePartDefinition", "(System.Lazy<System.Type>,System.Boolean,System.Lazy<System.Collections.Generic.IEnumerable<System.ComponentModel.Composition.Primitives.ImportDefinition>>,System.Lazy<System.Collections.Generic.IEnumerable<System.ComponentModel.Composition.Primitives.ExportDefinition>>,System.Lazy<System.Collections.Generic.IDictionary<System.String,System.Object>>,System.ComponentModel.Composition.Primitives.ICompositionElement)", "", "Argument[4]", "ReturnValue", "taint", "df-generated"]
-      - ["System.ComponentModel.Composition.ReflectionModel", "ReflectionModelServices", False, "CreatePartDefinition", "(System.Lazy<System.Type>,System.Boolean,System.Lazy<System.Collections.Generic.IEnumerable<System.ComponentModel.Composition.Primitives.ImportDefinition>>,System.Lazy<System.Collections.Generic.IEnumerable<System.ComponentModel.Composition.Primitives.ExportDefinition>>,System.Lazy<System.Collections.Generic.IDictionary<System.String,System.Object>>,System.ComponentModel.Composition.Primitives.ICompositionElement)", "", "Argument[5]", "ReturnValue", "taint", "df-generated"]
+      - ["System.ComponentModel.Composition.ReflectionModel", "ReflectionModelServices", False, "CreatePartDefinition", "(System.Lazy<System.Type>,System.Boolean,System.Lazy<System.Collections.Generic.IEnumerable<System.ComponentModel.Composition.Primitives.ImportDefinition>>,System.Lazy<System.Collections.Generic.IEnumerable<System.ComponentModel.Composition.Primitives.ExportDefinition>>,System.Lazy<System.Collections.Generic.IDictionary<System.String,System.Object>>,System.ComponentModel.Composition.Primitives.ICompositionElement)", "", "Argument[5]", "ReturnValue.SyntheticField[System.ComponentModel.Composition.ReflectionModel.ReflectionComposablePartDefinition._creationInfo].SyntheticField[System.ComponentModel.Composition.ReflectionModel.ReflectionPartCreationInfo._origin]", "value", "dfc-generated"]
       - ["System.ComponentModel.Composition.ReflectionModel", "ReflectionModelServices", False, "GetExportFactoryProductImportDefinition", "(System.ComponentModel.Composition.Primitives.ImportDefinition)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["System.ComponentModel.Composition.ReflectionModel", "ReflectionModelServices", False, "GetExportingMember", "(System.ComponentModel.Composition.Primitives.ExportDefinition)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["System.ComponentModel.Composition.ReflectionModel", "ReflectionModelServices", False, "GetImportingMember", "(System.ComponentModel.Composition.Primitives.ImportDefinition)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
diff --git a/csharp/ql/lib/ext/generated/System.ComponentModel.Composition.Registration.model.yml b/csharp/ql/lib/ext/generated/System.ComponentModel.Composition.Registration.model.yml
index a72e87e37ed..91d301de49b 100644
--- a/csharp/ql/lib/ext/generated/System.ComponentModel.Composition.Registration.model.yml
+++ b/csharp/ql/lib/ext/generated/System.ComponentModel.Composition.Registration.model.yml
@@ -4,37 +4,58 @@ extensions:
       pack: codeql/csharp-all
       extensible: summaryModel
     data:
-      - ["System.ComponentModel.Composition.Registration", "ExportBuilder", False, "AddMetadata", "(System.String,System.Object)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["System.ComponentModel.Composition.Registration", "ExportBuilder", False, "AsContractName", "(System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.ComponentModel.Composition.Registration", "ExportBuilder", False, "AsContractName", "(System.String)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["System.ComponentModel.Composition.Registration", "ExportBuilder", False, "AsContractType", "(System.Type)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["System.ComponentModel.Composition.Registration", "ExportBuilder", False, "AsContractType<T>", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.ComponentModel.Composition.Registration", "ExportBuilder", False, "Inherited", "()", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["System.ComponentModel.Composition.Registration", "ImportBuilder", False, "AllowDefault", "()", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["System.ComponentModel.Composition.Registration", "ImportBuilder", False, "AllowRecomposition", "()", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["System.ComponentModel.Composition.Registration", "ImportBuilder", False, "AsContractName", "(System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.ComponentModel.Composition.Registration", "ImportBuilder", False, "AsContractName", "(System.String)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["System.ComponentModel.Composition.Registration", "ImportBuilder", False, "AsContractType", "(System.Type)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["System.ComponentModel.Composition.Registration", "ImportBuilder", False, "AsContractType<T>", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.ComponentModel.Composition.Registration", "ImportBuilder", False, "AsMany", "(System.Boolean)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["System.ComponentModel.Composition.Registration", "ImportBuilder", False, "RequiredCreationPolicy", "(System.ComponentModel.Composition.CreationPolicy)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["System.ComponentModel.Composition.Registration", "ImportBuilder", False, "Source", "(System.ComponentModel.Composition.ImportSource)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["System.ComponentModel.Composition.Registration", "PartBuilder", False, "AddMetadata", "(System.String,System.Object)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["System.ComponentModel.Composition.Registration", "PartBuilder", False, "Export", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.ComponentModel.Composition.Registration", "PartBuilder", False, "Export<T>", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.ComponentModel.Composition.Registration", "PartBuilder", False, "ExportInterfaces", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.ComponentModel.Composition.Registration", "PartBuilder", False, "SetCreationPolicy", "(System.ComponentModel.Composition.CreationPolicy)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["System.ComponentModel.Composition.Registration", "PartBuilder<T>", False, "ExportProperty", "(System.Linq.Expressions.Expression<System.Func<T,System.Object>>)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.ComponentModel.Composition.Registration", "PartBuilder<T>", False, "ExportProperty<TContract>", "(System.Linq.Expressions.Expression<System.Func<T,System.Object>>)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.ComponentModel.Composition.Registration", "PartBuilder<T>", False, "ImportProperty", "(System.Linq.Expressions.Expression<System.Func<T,System.Object>>)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.ComponentModel.Composition.Registration", "PartBuilder<T>", False, "ImportProperty<TContract>", "(System.Linq.Expressions.Expression<System.Func<T,System.Object>>)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.ComponentModel.Composition.Registration", "PartBuilder<T>", False, "SelectConstructor", "(System.Linq.Expressions.Expression<System.Func<System.ComponentModel.Composition.Registration.ParameterImportBuilder,T>>)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["System.ComponentModel.Composition.Registration", "ExportBuilder", False, "AddMetadata", "(System.String,System.Func<System.Type,System.Object>)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.ComponentModel.Composition.Registration", "ExportBuilder", False, "AddMetadata", "(System.String,System.Object)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.ComponentModel.Composition.Registration", "ExportBuilder", False, "AsContractName", "(System.String)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.ComponentModel.Composition.Registration", "ExportBuilder", False, "AsContractType", "(System.Type)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.ComponentModel.Composition.Registration", "ExportBuilder", False, "AsContractType<T>", "()", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.ComponentModel.Composition.Registration", "ExportBuilder", False, "Inherited", "()", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.ComponentModel.Composition.Registration", "ImportBuilder", False, "AllowDefault", "()", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.ComponentModel.Composition.Registration", "ImportBuilder", False, "AllowRecomposition", "()", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.ComponentModel.Composition.Registration", "ImportBuilder", False, "AsContractName", "(System.String)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.ComponentModel.Composition.Registration", "ImportBuilder", False, "AsContractType", "(System.Type)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.ComponentModel.Composition.Registration", "ImportBuilder", False, "AsContractType<T>", "()", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.ComponentModel.Composition.Registration", "ImportBuilder", False, "AsMany", "(System.Boolean)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.ComponentModel.Composition.Registration", "ImportBuilder", False, "RequiredCreationPolicy", "(System.ComponentModel.Composition.CreationPolicy)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.ComponentModel.Composition.Registration", "ImportBuilder", False, "Source", "(System.ComponentModel.Composition.ImportSource)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.ComponentModel.Composition.Registration", "PartBuilder", False, "AddMetadata", "(System.String,System.Func<System.Type,System.Object>)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.ComponentModel.Composition.Registration", "PartBuilder", False, "AddMetadata", "(System.String,System.Object)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.ComponentModel.Composition.Registration", "PartBuilder", False, "Export", "()", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.ComponentModel.Composition.Registration", "PartBuilder", False, "Export", "(System.Action<System.ComponentModel.Composition.Registration.ExportBuilder>)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.ComponentModel.Composition.Registration", "PartBuilder", False, "Export<T>", "()", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.ComponentModel.Composition.Registration", "PartBuilder", False, "Export<T>", "(System.Action<System.ComponentModel.Composition.Registration.ExportBuilder>)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.ComponentModel.Composition.Registration", "PartBuilder", False, "ExportInterfaces", "()", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.ComponentModel.Composition.Registration", "PartBuilder", False, "ExportInterfaces", "(System.Predicate<System.Type>)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.ComponentModel.Composition.Registration", "PartBuilder", False, "ExportInterfaces", "(System.Predicate<System.Type>,System.Action<System.Type,System.ComponentModel.Composition.Registration.ExportBuilder>)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.ComponentModel.Composition.Registration", "PartBuilder", False, "ExportProperties", "(System.Predicate<System.Reflection.PropertyInfo>)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.ComponentModel.Composition.Registration", "PartBuilder", False, "ExportProperties", "(System.Predicate<System.Reflection.PropertyInfo>,System.Action<System.Reflection.PropertyInfo,System.ComponentModel.Composition.Registration.ExportBuilder>)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.ComponentModel.Composition.Registration", "PartBuilder", False, "ExportProperties<T>", "(System.Predicate<System.Reflection.PropertyInfo>)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.ComponentModel.Composition.Registration", "PartBuilder", False, "ExportProperties<T>", "(System.Predicate<System.Reflection.PropertyInfo>,System.Action<System.Reflection.PropertyInfo,System.ComponentModel.Composition.Registration.ExportBuilder>)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.ComponentModel.Composition.Registration", "PartBuilder", False, "ImportProperties", "(System.Predicate<System.Reflection.PropertyInfo>)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.ComponentModel.Composition.Registration", "PartBuilder", False, "ImportProperties", "(System.Predicate<System.Reflection.PropertyInfo>,System.Action<System.Reflection.PropertyInfo,System.ComponentModel.Composition.Registration.ImportBuilder>)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.ComponentModel.Composition.Registration", "PartBuilder", False, "ImportProperties<T>", "(System.Predicate<System.Reflection.PropertyInfo>)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.ComponentModel.Composition.Registration", "PartBuilder", False, "ImportProperties<T>", "(System.Predicate<System.Reflection.PropertyInfo>,System.Action<System.Reflection.PropertyInfo,System.ComponentModel.Composition.Registration.ImportBuilder>)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.ComponentModel.Composition.Registration", "PartBuilder", False, "SelectConstructor", "(System.Func<System.Reflection.ConstructorInfo[],System.Reflection.ConstructorInfo>)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.ComponentModel.Composition.Registration", "PartBuilder", False, "SelectConstructor", "(System.Func<System.Reflection.ConstructorInfo[],System.Reflection.ConstructorInfo>,System.Action<System.Reflection.ParameterInfo,System.ComponentModel.Composition.Registration.ImportBuilder>)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.ComponentModel.Composition.Registration", "PartBuilder", False, "SetCreationPolicy", "(System.ComponentModel.Composition.CreationPolicy)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.ComponentModel.Composition.Registration", "PartBuilder<T>", False, "ExportProperty", "(System.Linq.Expressions.Expression<System.Func<T,System.Object>>)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.ComponentModel.Composition.Registration", "PartBuilder<T>", False, "ExportProperty", "(System.Linq.Expressions.Expression<System.Func<T,System.Object>>,System.Action<System.ComponentModel.Composition.Registration.ExportBuilder>)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.ComponentModel.Composition.Registration", "PartBuilder<T>", False, "ExportProperty<TContract>", "(System.Linq.Expressions.Expression<System.Func<T,System.Object>>)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.ComponentModel.Composition.Registration", "PartBuilder<T>", False, "ExportProperty<TContract>", "(System.Linq.Expressions.Expression<System.Func<T,System.Object>>,System.Action<System.ComponentModel.Composition.Registration.ExportBuilder>)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.ComponentModel.Composition.Registration", "PartBuilder<T>", False, "ImportProperty", "(System.Linq.Expressions.Expression<System.Func<T,System.Object>>)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.ComponentModel.Composition.Registration", "PartBuilder<T>", False, "ImportProperty", "(System.Linq.Expressions.Expression<System.Func<T,System.Object>>,System.Action<System.ComponentModel.Composition.Registration.ImportBuilder>)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.ComponentModel.Composition.Registration", "PartBuilder<T>", False, "ImportProperty<TContract>", "(System.Linq.Expressions.Expression<System.Func<T,System.Object>>)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.ComponentModel.Composition.Registration", "PartBuilder<T>", False, "ImportProperty<TContract>", "(System.Linq.Expressions.Expression<System.Func<T,System.Object>>,System.Action<System.ComponentModel.Composition.Registration.ImportBuilder>)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.ComponentModel.Composition.Registration", "PartBuilder<T>", False, "SelectConstructor", "(System.Linq.Expressions.Expression<System.Func<System.ComponentModel.Composition.Registration.ParameterImportBuilder,T>>)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
   - addsTo:
       pack: codeql/csharp-all
       extensible: neutralModel
     data:
       - ["System.ComponentModel.Composition.Registration", "ParameterImportBuilder", "Import<T>", "()", "summary", "df-generated"]
+      - ["System.ComponentModel.Composition.Registration", "ParameterImportBuilder", "Import<T>", "(System.Action<System.ComponentModel.Composition.Registration.ImportBuilder>)", "summary", "df-generated"]
       - ["System.ComponentModel.Composition.Registration", "RegistrationBuilder", "ForType", "(System.Type)", "summary", "df-generated"]
       - ["System.ComponentModel.Composition.Registration", "RegistrationBuilder", "ForType<T>", "()", "summary", "df-generated"]
       - ["System.ComponentModel.Composition.Registration", "RegistrationBuilder", "ForTypesDerivedFrom", "(System.Type)", "summary", "df-generated"]
       - ["System.ComponentModel.Composition.Registration", "RegistrationBuilder", "ForTypesDerivedFrom<T>", "()", "summary", "df-generated"]
+      - ["System.ComponentModel.Composition.Registration", "RegistrationBuilder", "ForTypesMatching", "(System.Predicate<System.Type>)", "summary", "df-generated"]
+      - ["System.ComponentModel.Composition.Registration", "RegistrationBuilder", "ForTypesMatching<T>", "(System.Predicate<System.Type>)", "summary", "df-generated"]
diff --git a/csharp/ql/lib/ext/generated/System.ComponentModel.Composition.model.yml b/csharp/ql/lib/ext/generated/System.ComponentModel.Composition.model.yml
index f355920cdf4..40544f41714 100644
--- a/csharp/ql/lib/ext/generated/System.ComponentModel.Composition.model.yml
+++ b/csharp/ql/lib/ext/generated/System.ComponentModel.Composition.model.yml
@@ -5,23 +5,28 @@ extensions:
       extensible: summaryModel
     data:
       - ["System.ComponentModel.Composition", "AttributedModelServices", False, "AddPart", "(System.ComponentModel.Composition.Hosting.CompositionBatch,System.Object)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["System.ComponentModel.Composition", "AttributedModelServices", False, "CreatePart", "(System.ComponentModel.Composition.Primitives.ComposablePartDefinition,System.Object)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.ComponentModel.Composition", "AttributedModelServices", False, "CreatePart", "(System.ComponentModel.Composition.Primitives.ComposablePartDefinition,System.Object)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["System.ComponentModel.Composition", "AttributedModelServices", False, "CreatePart", "(System.Object)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.ComponentModel.Composition", "AttributedModelServices", False, "CreatePart", "(System.Object,System.Reflection.ReflectionContext)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["System.ComponentModel.Composition", "AttributedModelServices", False, "CreatePart", "(System.ComponentModel.Composition.Primitives.ComposablePartDefinition,System.Object)", "", "Argument[0]", "ReturnValue.SyntheticField[System.ComponentModel.Composition.ReflectionModel.ReflectionComposablePart._definition]", "value", "dfc-generated"]
+      - ["System.ComponentModel.Composition", "AttributedModelServices", False, "CreatePart", "(System.ComponentModel.Composition.Primitives.ComposablePartDefinition,System.Object)", "", "Argument[1]", "ReturnValue.SyntheticField[System.ComponentModel.Composition.ReflectionModel.ReflectionComposablePart._cachedInstance]", "value", "dfc-generated"]
+      - ["System.ComponentModel.Composition", "AttributedModelServices", False, "CreatePart", "(System.Object)", "", "Argument[0]", "ReturnValue.SyntheticField[System.ComponentModel.Composition.ReflectionModel.ReflectionComposablePart._cachedInstance]", "value", "dfc-generated"]
+      - ["System.ComponentModel.Composition", "AttributedModelServices", False, "CreatePart", "(System.Object,System.Reflection.ReflectionContext)", "", "Argument[0]", "ReturnValue.SyntheticField[System.ComponentModel.Composition.ReflectionModel.ReflectionComposablePart._cachedInstance]", "value", "dfc-generated"]
       - ["System.ComponentModel.Composition", "AttributedModelServices", False, "CreatePartDefinition", "(System.Type,System.ComponentModel.Composition.Primitives.ICompositionElement)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["System.ComponentModel.Composition", "AttributedModelServices", False, "CreatePartDefinition", "(System.Type,System.ComponentModel.Composition.Primitives.ICompositionElement,System.Boolean)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["System.ComponentModel.Composition", "AttributedModelServices", False, "GetMetadataView<TMetadataView>", "(System.Collections.Generic.IDictionary<System.String,System.Object>)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
+      - ["System.ComponentModel.Composition", "AttributedModelServices", False, "CreatePartDefinition", "(System.Type,System.ComponentModel.Composition.Primitives.ICompositionElement,System.Boolean)", "", "Argument[1]", "ReturnValue.SyntheticField[System.ComponentModel.Composition.ReflectionModel.ReflectionComposablePartDefinition._creationInfo].SyntheticField[System.ComponentModel.Composition.AttributedModel.AttributedPartCreationInfo._origin]", "value", "dfc-generated"]
+      - ["System.ComponentModel.Composition", "AttributedModelServices", False, "GetMetadataView<TMetadataView>", "(System.Collections.Generic.IDictionary<System.String,System.Object>)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
       - ["System.ComponentModel.Composition", "AttributedModelServices", False, "SatisfyImportsOnce", "(System.ComponentModel.Composition.ICompositionService,System.Object)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
       - ["System.ComponentModel.Composition", "AttributedModelServices", False, "SatisfyImportsOnce", "(System.ComponentModel.Composition.ICompositionService,System.Object,System.Reflection.ReflectionContext)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["System.ComponentModel.Composition", "CompositionError", False, "ToString", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.ComponentModel.Composition", "ChangeRejectedException", True, "get_Message", "()", "", "Argument[this].Property[System.ComponentModel.Composition.CompositionException.Message]", "ReturnValue", "taint", "dfc-generated"]
+      - ["System.ComponentModel.Composition", "ChangeRejectedException", True, "get_Message", "()", "", "Argument[this].Property[System.Exception.Message]", "ReturnValue", "taint", "dfc-generated"]
+      - ["System.ComponentModel.Composition", "CompositionError", False, "ToString", "()", "", "Argument[this].Property[System.ComponentModel.Composition.CompositionError.Description]", "ReturnValue", "value", "dfc-generated"]
       - ["System.ComponentModel.Composition", "CompositionError", False, "get_Description", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.ComponentModel.Composition", "CompositionError", False, "get_Element", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.ComponentModel.Composition", "CompositionError", False, "get_Exception", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.ComponentModel.Composition", "CompositionException", False, "get_Errors", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.ComponentModel.Composition", "CompositionException", False, "get_RootCauses", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.ComponentModel.Composition", "ExportFactory<T,TMetadata>", False, "get_Metadata", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.ComponentModel.Composition", "ExportLifetimeContext<T>", False, "get_Value", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.ComponentModel.Composition", "CompositionException", True, "get_Message", "()", "", "Argument[this].Property[System.Exception.Message]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.ComponentModel.Composition", "ExportFactory<T,TMetadata>", False, "ExportFactory", "(System.Func<System.Tuple<T,System.Action>>,TMetadata)", "", "Argument[1]", "Argument[this].SyntheticField[System.ComponentModel.Composition.ExportFactory`2._metadata]", "value", "dfc-generated"]
+      - ["System.ComponentModel.Composition", "ExportFactory<T,TMetadata>", False, "get_Metadata", "()", "", "Argument[this].SyntheticField[System.ComponentModel.Composition.ExportFactory`2._metadata]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.ComponentModel.Composition", "ExportLifetimeContext<T>", False, "ExportLifetimeContext", "(T,System.Action)", "", "Argument[0]", "Argument[this].SyntheticField[System.ComponentModel.Composition.ExportLifetimeContext`1._value]", "value", "dfc-generated"]
+      - ["System.ComponentModel.Composition", "ExportLifetimeContext<T>", False, "get_Value", "()", "", "Argument[this].SyntheticField[System.ComponentModel.Composition.ExportLifetimeContext`1._value]", "ReturnValue", "value", "dfc-generated"]
   - addsTo:
       pack: codeql/csharp-all
       extensible: neutralModel
@@ -59,6 +64,7 @@ extensions:
       - ["System.ComponentModel.Composition", "ExportAttribute", "ExportAttribute", "(System.String,System.Type)", "summary", "df-generated"]
       - ["System.ComponentModel.Composition", "ExportAttribute", "ExportAttribute", "(System.Type)", "summary", "df-generated"]
       - ["System.ComponentModel.Composition", "ExportFactory<T>", "CreateExport", "()", "summary", "df-generated"]
+      - ["System.ComponentModel.Composition", "ExportFactory<T>", "ExportFactory", "(System.Func<System.Tuple<T,System.Action>>)", "summary", "df-generated"]
       - ["System.ComponentModel.Composition", "ExportLifetimeContext<T>", "Dispose", "()", "summary", "df-generated"]
       - ["System.ComponentModel.Composition", "ExportMetadataAttribute", "ExportMetadataAttribute", "(System.String,System.Object)", "summary", "df-generated"]
       - ["System.ComponentModel.Composition", "ICompositionService", "SatisfyImportsOnce", "(System.ComponentModel.Composition.Primitives.ComposablePart)", "summary", "df-generated"]
diff --git a/csharp/ql/lib/ext/generated/System.ComponentModel.DataAnnotations.model.yml b/csharp/ql/lib/ext/generated/System.ComponentModel.DataAnnotations.model.yml
index 07cf050866b..64d3aad5217 100644
--- a/csharp/ql/lib/ext/generated/System.ComponentModel.DataAnnotations.model.yml
+++ b/csharp/ql/lib/ext/generated/System.ComponentModel.DataAnnotations.model.yml
@@ -4,9 +4,10 @@ extensions:
       pack: codeql/csharp-all
       extensible: summaryModel
     data:
-      - ["System.ComponentModel.DataAnnotations", "AssociationAttribute", False, "get_OtherKeyMembers", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.ComponentModel.DataAnnotations", "AssociationAttribute", False, "get_ThisKeyMembers", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.ComponentModel.DataAnnotations", "DataTypeAttribute", True, "GetDataTypeName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.ComponentModel.DataAnnotations", "AssociationAttribute", False, "get_OtherKeyMembers", "()", "", "Argument[this].Property[System.ComponentModel.DataAnnotations.AssociationAttribute.OtherKey]", "ReturnValue.Element", "taint", "dfc-generated"]
+      - ["System.ComponentModel.DataAnnotations", "AssociationAttribute", False, "get_ThisKeyMembers", "()", "", "Argument[this].Property[System.ComponentModel.DataAnnotations.AssociationAttribute.ThisKey]", "ReturnValue.Element", "taint", "dfc-generated"]
+      - ["System.ComponentModel.DataAnnotations", "CustomValidationAttribute", False, "FormatErrorMessage", "(System.String)", "", "Argument[this].Property[System.ComponentModel.DataAnnotations.ValidationAttribute.ErrorMessageString]", "ReturnValue", "taint", "dfc-generated"]
+      - ["System.ComponentModel.DataAnnotations", "DataTypeAttribute", True, "GetDataTypeName", "()", "", "Argument[this].Property[System.ComponentModel.DataAnnotations.DataTypeAttribute.CustomDataType]", "ReturnValue", "value", "dfc-generated"]
       - ["System.ComponentModel.DataAnnotations", "DisplayAttribute", False, "GetAutoGenerateField", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.ComponentModel.DataAnnotations", "DisplayAttribute", False, "GetAutoGenerateFilter", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.ComponentModel.DataAnnotations", "DisplayAttribute", False, "GetDescription", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
@@ -16,21 +17,30 @@ extensions:
       - ["System.ComponentModel.DataAnnotations", "DisplayAttribute", False, "GetPrompt", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.ComponentModel.DataAnnotations", "DisplayAttribute", False, "GetShortName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.ComponentModel.DataAnnotations", "DisplayFormatAttribute", False, "GetNullDisplayText", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.ComponentModel.DataAnnotations", "FilterUIHintAttribute", False, "FilterUIHintAttribute", "(System.String,System.String,System.Object[])", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.ComponentModel.DataAnnotations", "FilterUIHintAttribute", False, "FilterUIHintAttribute", "(System.String,System.String,System.Object[])", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["System.ComponentModel.DataAnnotations", "FilterUIHintAttribute", False, "FilterUIHintAttribute", "(System.String,System.String,System.Object[])", "", "Argument[0]", "Argument[this].SyntheticField[System.ComponentModel.DataAnnotations.FilterUIHintAttribute._implementation].SyntheticField[System.ComponentModel.DataAnnotations.UIHintAttribute+UIHintImplementation.UIHint]", "value", "dfc-generated"]
+      - ["System.ComponentModel.DataAnnotations", "FilterUIHintAttribute", False, "FilterUIHintAttribute", "(System.String,System.String,System.Object[])", "", "Argument[1]", "Argument[this].SyntheticField[System.ComponentModel.DataAnnotations.FilterUIHintAttribute._implementation].SyntheticField[System.ComponentModel.DataAnnotations.UIHintAttribute+UIHintImplementation.PresentationLayer]", "value", "dfc-generated"]
       - ["System.ComponentModel.DataAnnotations", "FilterUIHintAttribute", False, "get_ControlParameters", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.ComponentModel.DataAnnotations", "FilterUIHintAttribute", False, "get_FilterUIHint", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.ComponentModel.DataAnnotations", "FilterUIHintAttribute", False, "get_PresentationLayer", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.ComponentModel.DataAnnotations", "UIHintAttribute", False, "UIHintAttribute", "(System.String,System.String,System.Object[])", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.ComponentModel.DataAnnotations", "UIHintAttribute", False, "UIHintAttribute", "(System.String,System.String,System.Object[])", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["System.ComponentModel.DataAnnotations", "FilterUIHintAttribute", False, "get_FilterUIHint", "()", "", "Argument[this].SyntheticField[System.ComponentModel.DataAnnotations.FilterUIHintAttribute._implementation].SyntheticField[System.ComponentModel.DataAnnotations.UIHintAttribute+UIHintImplementation.UIHint]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.ComponentModel.DataAnnotations", "FilterUIHintAttribute", False, "get_PresentationLayer", "()", "", "Argument[this].SyntheticField[System.ComponentModel.DataAnnotations.FilterUIHintAttribute._implementation].SyntheticField[System.ComponentModel.DataAnnotations.UIHintAttribute+UIHintImplementation.PresentationLayer]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.ComponentModel.DataAnnotations", "LengthAttribute", True, "FormatErrorMessage", "(System.String)", "", "Argument[this].Property[System.ComponentModel.DataAnnotations.ValidationAttribute.ErrorMessageString]", "ReturnValue", "taint", "dfc-generated"]
+      - ["System.ComponentModel.DataAnnotations", "MaxLengthAttribute", True, "FormatErrorMessage", "(System.String)", "", "Argument[this].Property[System.ComponentModel.DataAnnotations.ValidationAttribute.ErrorMessageString]", "ReturnValue", "taint", "dfc-generated"]
+      - ["System.ComponentModel.DataAnnotations", "MinLengthAttribute", True, "FormatErrorMessage", "(System.String)", "", "Argument[this].Property[System.ComponentModel.DataAnnotations.ValidationAttribute.ErrorMessageString]", "ReturnValue", "taint", "dfc-generated"]
+      - ["System.ComponentModel.DataAnnotations", "RegularExpressionAttribute", True, "FormatErrorMessage", "(System.String)", "", "Argument[this].Property[System.ComponentModel.DataAnnotations.RegularExpressionAttribute.Pattern]", "ReturnValue", "taint", "dfc-generated"]
+      - ["System.ComponentModel.DataAnnotations", "RegularExpressionAttribute", True, "FormatErrorMessage", "(System.String)", "", "Argument[this].Property[System.ComponentModel.DataAnnotations.ValidationAttribute.ErrorMessageString]", "ReturnValue", "taint", "dfc-generated"]
+      - ["System.ComponentModel.DataAnnotations", "StringLengthAttribute", True, "FormatErrorMessage", "(System.String)", "", "Argument[this].Property[System.ComponentModel.DataAnnotations.ValidationAttribute.ErrorMessageString]", "ReturnValue", "taint", "dfc-generated"]
+      - ["System.ComponentModel.DataAnnotations", "UIHintAttribute", False, "UIHintAttribute", "(System.String,System.String,System.Object[])", "", "Argument[0]", "Argument[this].SyntheticField[System.ComponentModel.DataAnnotations.UIHintAttribute._implementation].SyntheticField[System.ComponentModel.DataAnnotations.UIHintAttribute+UIHintImplementation.UIHint]", "value", "dfc-generated"]
+      - ["System.ComponentModel.DataAnnotations", "UIHintAttribute", False, "UIHintAttribute", "(System.String,System.String,System.Object[])", "", "Argument[1]", "Argument[this].SyntheticField[System.ComponentModel.DataAnnotations.UIHintAttribute._implementation].SyntheticField[System.ComponentModel.DataAnnotations.UIHintAttribute+UIHintImplementation.PresentationLayer]", "value", "dfc-generated"]
       - ["System.ComponentModel.DataAnnotations", "UIHintAttribute", False, "get_ControlParameters", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.ComponentModel.DataAnnotations", "UIHintAttribute", False, "get_PresentationLayer", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.ComponentModel.DataAnnotations", "UIHintAttribute", False, "get_UIHint", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.ComponentModel.DataAnnotations", "ValidationAttribute", True, "FormatErrorMessage", "(System.String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.ComponentModel.DataAnnotations", "ValidationAttribute", True, "FormatErrorMessage", "(System.String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.ComponentModel.DataAnnotations", "UIHintAttribute", False, "get_PresentationLayer", "()", "", "Argument[this].SyntheticField[System.ComponentModel.DataAnnotations.UIHintAttribute._implementation].SyntheticField[System.ComponentModel.DataAnnotations.UIHintAttribute+UIHintImplementation.PresentationLayer]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.ComponentModel.DataAnnotations", "UIHintAttribute", False, "get_UIHint", "()", "", "Argument[this].SyntheticField[System.ComponentModel.DataAnnotations.UIHintAttribute._implementation].SyntheticField[System.ComponentModel.DataAnnotations.UIHintAttribute+UIHintImplementation.UIHint]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.ComponentModel.DataAnnotations", "ValidationAttribute", False, "ValidationAttribute", "(System.Func<System.String>)", "", "Argument[0]", "Argument[this].SyntheticField[System.ComponentModel.DataAnnotations.ValidationAttribute._errorMessageResourceAccessor]", "value", "dfc-generated"]
+      - ["System.ComponentModel.DataAnnotations", "ValidationAttribute", False, "get_ErrorMessageString", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.ComponentModel.DataAnnotations", "ValidationAttribute", True, "FormatErrorMessage", "(System.String)", "", "Argument[0]", "ReturnValue", "taint", "dfc-generated"]
+      - ["System.ComponentModel.DataAnnotations", "ValidationAttribute", True, "FormatErrorMessage", "(System.String)", "", "Argument[this].Property[System.ComponentModel.DataAnnotations.ValidationAttribute.ErrorMessageString]", "ReturnValue", "taint", "dfc-generated"]
+      - ["System.ComponentModel.DataAnnotations", "ValidationContext", False, "InitializeServiceProvider", "(System.Func<System.Type,System.Object>)", "", "Argument[0]", "Argument[this].SyntheticField[System.ComponentModel.DataAnnotations.ValidationContext._serviceProvider]", "value", "dfc-generated"]
       - ["System.ComponentModel.DataAnnotations", "ValidationContext", False, "get_Items", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.ComponentModel.DataAnnotations", "ValidationException", False, "ValidationException", "(System.ComponentModel.DataAnnotations.ValidationResult,System.ComponentModel.DataAnnotations.ValidationAttribute,System.Object)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.ComponentModel.DataAnnotations", "ValidationResult", False, "ToString", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.ComponentModel.DataAnnotations", "ValidationResult", False, "ToString", "()", "", "Argument[this].Property[System.ComponentModel.DataAnnotations.ValidationResult.ErrorMessage]", "ReturnValue", "value", "dfc-generated"]
   - addsTo:
       pack: codeql/csharp-all
       extensible: neutralModel
@@ -120,7 +130,6 @@ extensions:
       - ["System.ComponentModel.DataAnnotations", "ValidationAttribute", "Validate", "(System.Object,System.ComponentModel.DataAnnotations.ValidationContext)", "summary", "df-generated"]
       - ["System.ComponentModel.DataAnnotations", "ValidationAttribute", "Validate", "(System.Object,System.String)", "summary", "df-generated"]
       - ["System.ComponentModel.DataAnnotations", "ValidationAttribute", "ValidationAttribute", "(System.String)", "summary", "df-generated"]
-      - ["System.ComponentModel.DataAnnotations", "ValidationAttribute", "get_ErrorMessageString", "()", "summary", "df-generated"]
       - ["System.ComponentModel.DataAnnotations", "ValidationAttribute", "get_RequiresValidationContext", "()", "summary", "df-generated"]
       - ["System.ComponentModel.DataAnnotations", "ValidationContext", "ValidationContext", "(System.Object)", "summary", "df-generated"]
       - ["System.ComponentModel.DataAnnotations", "ValidationContext", "ValidationContext", "(System.Object,System.Collections.Generic.IDictionary<System.Object,System.Object>)", "summary", "df-generated"]
diff --git a/csharp/ql/lib/ext/generated/System.ComponentModel.Design.Serialization.model.yml b/csharp/ql/lib/ext/generated/System.ComponentModel.Design.Serialization.model.yml
index 0f1dfffcf48..d17d977c261 100644
--- a/csharp/ql/lib/ext/generated/System.ComponentModel.Design.Serialization.model.yml
+++ b/csharp/ql/lib/ext/generated/System.ComponentModel.Design.Serialization.model.yml
@@ -4,12 +4,15 @@ extensions:
       pack: codeql/csharp-all
       extensible: summaryModel
     data:
-      - ["System.ComponentModel.Design.Serialization", "ContextStack", False, "Append", "(System.Object)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.ComponentModel.Design.Serialization", "ContextStack", False, "Pop", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.ComponentModel.Design.Serialization", "ContextStack", False, "Push", "(System.Object)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.ComponentModel.Design.Serialization", "ContextStack", False, "get_Current", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.ComponentModel.Design.Serialization", "ContextStack", False, "get_Item", "(System.Int32)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.ComponentModel.Design.Serialization", "ContextStack", False, "get_Item", "(System.Type)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.ComponentModel.Design.Serialization", "ContextStack", False, "Append", "(System.Object)", "", "Argument[0]", "Argument[this].SyntheticField[System.ComponentModel.Design.Serialization.ContextStack._contextStack].Element", "value", "dfc-generated"]
+      - ["System.ComponentModel.Design.Serialization", "ContextStack", False, "Pop", "()", "", "Argument[this].SyntheticField[System.ComponentModel.Design.Serialization.ContextStack._contextStack].Element", "ReturnValue", "value", "dfc-generated"]
+      - ["System.ComponentModel.Design.Serialization", "ContextStack", False, "Push", "(System.Object)", "", "Argument[0]", "Argument[this].SyntheticField[System.ComponentModel.Design.Serialization.ContextStack._contextStack].Element", "value", "dfc-generated"]
+      - ["System.ComponentModel.Design.Serialization", "ContextStack", False, "get_Current", "()", "", "Argument[this].SyntheticField[System.ComponentModel.Design.Serialization.ContextStack._contextStack].Element", "ReturnValue", "value", "dfc-generated"]
+      - ["System.ComponentModel.Design.Serialization", "ContextStack", False, "get_Item", "(System.Int32)", "", "Argument[this].SyntheticField[System.ComponentModel.Design.Serialization.ContextStack._contextStack].Element", "ReturnValue", "value", "dfc-generated"]
+      - ["System.ComponentModel.Design.Serialization", "ContextStack", False, "get_Item", "(System.Type)", "", "Argument[this].SyntheticField[System.ComponentModel.Design.Serialization.ContextStack._contextStack].Element", "ReturnValue", "value", "dfc-generated"]
+      - ["System.ComponentModel.Design.Serialization", "DesignerSerializerAttribute", False, "get_TypeId", "()", "", "Argument[this].Property[System.ComponentModel.Design.Serialization.DesignerSerializerAttribute.SerializerBaseTypeName]", "Argument[this].SyntheticField[System.ComponentModel.Design.Serialization.DesignerSerializerAttribute._typeId]", "taint", "dfc-generated"]
+      - ["System.ComponentModel.Design.Serialization", "DesignerSerializerAttribute", False, "get_TypeId", "()", "", "Argument[this].Property[System.ComponentModel.Design.Serialization.DesignerSerializerAttribute.SerializerBaseTypeName]", "ReturnValue", "taint", "dfc-generated"]
+      - ["System.ComponentModel.Design.Serialization", "DesignerSerializerAttribute", False, "get_TypeId", "()", "", "Argument[this].SyntheticField[System.ComponentModel.Design.Serialization.DesignerSerializerAttribute._typeId]", "ReturnValue", "value", "dfc-generated"]
   - addsTo:
       pack: codeql/csharp-all
       extensible: neutralModel
@@ -51,8 +54,12 @@ extensions:
       - ["System.ComponentModel.Design.Serialization", "IDesignerSerializationManager", "RemoveSerializationProvider", "(System.ComponentModel.Design.Serialization.IDesignerSerializationProvider)", "summary", "df-generated"]
       - ["System.ComponentModel.Design.Serialization", "IDesignerSerializationManager", "ReportError", "(System.Object)", "summary", "df-generated"]
       - ["System.ComponentModel.Design.Serialization", "IDesignerSerializationManager", "SetName", "(System.Object,System.String)", "summary", "df-generated"]
+      - ["System.ComponentModel.Design.Serialization", "IDesignerSerializationManager", "add_ResolveName", "(System.ComponentModel.Design.Serialization.ResolveNameEventHandler)", "summary", "df-generated"]
+      - ["System.ComponentModel.Design.Serialization", "IDesignerSerializationManager", "add_SerializationComplete", "(System.EventHandler)", "summary", "df-generated"]
       - ["System.ComponentModel.Design.Serialization", "IDesignerSerializationManager", "get_Context", "()", "summary", "df-generated"]
       - ["System.ComponentModel.Design.Serialization", "IDesignerSerializationManager", "get_Properties", "()", "summary", "df-generated"]
+      - ["System.ComponentModel.Design.Serialization", "IDesignerSerializationManager", "remove_ResolveName", "(System.ComponentModel.Design.Serialization.ResolveNameEventHandler)", "summary", "df-generated"]
+      - ["System.ComponentModel.Design.Serialization", "IDesignerSerializationManager", "remove_SerializationComplete", "(System.EventHandler)", "summary", "df-generated"]
       - ["System.ComponentModel.Design.Serialization", "IDesignerSerializationProvider", "GetSerializer", "(System.ComponentModel.Design.Serialization.IDesignerSerializationManager,System.Object,System.Type,System.Type)", "summary", "df-generated"]
       - ["System.ComponentModel.Design.Serialization", "IDesignerSerializationService", "Deserialize", "(System.Object)", "summary", "df-generated"]
       - ["System.ComponentModel.Design.Serialization", "IDesignerSerializationService", "Serialize", "(System.Collections.ICollection)", "summary", "df-generated"]
diff --git a/csharp/ql/lib/ext/generated/System.ComponentModel.Design.model.yml b/csharp/ql/lib/ext/generated/System.ComponentModel.Design.model.yml
index ca899904f81..5e3e81843e1 100644
--- a/csharp/ql/lib/ext/generated/System.ComponentModel.Design.model.yml
+++ b/csharp/ql/lib/ext/generated/System.ComponentModel.Design.model.yml
@@ -4,16 +4,19 @@ extensions:
       pack: codeql/csharp-all
       extensible: summaryModel
     data:
-      - ["System.ComponentModel.Design", "CommandID", False, "ToString", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.ComponentModel.Design", "DesignerCollection", False, "DesignerCollection", "(System.Collections.IList)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["System.ComponentModel.Design", "DesignerCollection", True, "get_Item", "(System.Int32)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.ComponentModel.Design", "CommandID", False, "ToString", "()", "", "Argument[this].Property[System.ComponentModel.Design.CommandID.Guid]", "ReturnValue", "taint", "dfc-generated"]
+      - ["System.ComponentModel.Design", "DesignerCollection", False, "DesignerCollection", "(System.Collections.IList)", "", "Argument[0]", "Argument[this].SyntheticField[System.ComponentModel.Design.DesignerCollection._designers]", "value", "dfc-generated"]
+      - ["System.ComponentModel.Design", "DesignerCollection", True, "get_Item", "(System.Int32)", "", "Argument[this].SyntheticField[System.ComponentModel.Design.DesignerCollection._designers].Element", "ReturnValue", "value", "dfc-generated"]
       - ["System.ComponentModel.Design", "DesignerOptionService+DesignerOptionCollection", False, "get_Properties", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.ComponentModel.Design", "DesignerOptionService", False, "CreateOptionCollection", "(System.ComponentModel.Design.DesignerOptionService+DesignerOptionCollection,System.String,System.Object)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
       - ["System.ComponentModel.Design", "DesignerOptionService", False, "CreateOptionCollection", "(System.ComponentModel.Design.DesignerOptionService+DesignerOptionCollection,System.String,System.Object)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.ComponentModel.Design", "DesignerVerb", False, "get_Text", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.ComponentModel.Design", "DesignerVerbCollection", False, "DesignerVerbCollection", "(System.ComponentModel.Design.DesignerVerb[])", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["System.ComponentModel.Design", "DesignerVerbCollection", False, "Remove", "(System.ComponentModel.Design.DesignerVerb)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.ComponentModel.Design", "MenuCommand", False, "ToString", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.ComponentModel.Design", "DesignerVerb", False, "ToString", "()", "", "Argument[this].Property[System.ComponentModel.Design.DesignerVerb.Text]", "ReturnValue", "taint", "dfc-generated"]
+      - ["System.ComponentModel.Design", "DesignerVerb", False, "ToString", "()", "", "Argument[this].Property[System.ComponentModel.Design.MenuCommand.CommandID].Property[System.ComponentModel.Design.CommandID.Guid]", "ReturnValue", "taint", "dfc-generated"]
+      - ["System.ComponentModel.Design", "DesignerVerb", False, "ToString", "()", "", "Argument[this].Property[System.ComponentModel.Design.MenuCommand.Properties].Element", "ReturnValue", "taint", "dfc-generated"]
+      - ["System.ComponentModel.Design", "DesignerVerb", False, "get_Text", "()", "", "Argument[this].Property[System.ComponentModel.Design.MenuCommand.Properties].Element", "ReturnValue", "value", "dfc-generated"]
+      - ["System.ComponentModel.Design", "DesignerVerbCollection", False, "DesignerVerbCollection", "(System.ComponentModel.Design.DesignerVerb[])", "", "Argument[0].Element", "Argument[this].Element", "value", "dfc-generated"]
+      - ["System.ComponentModel.Design", "DesignerVerbCollection", False, "DesignerVerbCollection", "(System.ComponentModel.Design.DesignerVerb[])", "", "Argument[0].Element", "Argument[this].Property[System.Collections.CollectionBase.List].Element", "value", "dfc-generated"]
+      - ["System.ComponentModel.Design", "MenuCommand", False, "ToString", "()", "", "Argument[this].Property[System.ComponentModel.Design.MenuCommand.CommandID].Property[System.ComponentModel.Design.CommandID.Guid]", "ReturnValue", "taint", "dfc-generated"]
       - ["System.ComponentModel.Design", "ServiceContainer", False, "ServiceContainer", "(System.IServiceProvider)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
   - addsTo:
       pack: codeql/csharp-all
@@ -53,6 +56,7 @@ extensions:
       - ["System.ComponentModel.Design", "DesignerOptionService+DesignerOptionCollection", "Contains", "(System.Object)", "summary", "df-generated"]
       - ["System.ComponentModel.Design", "DesignerOptionService+DesignerOptionCollection", "IndexOf", "(System.ComponentModel.Design.DesignerOptionService+DesignerOptionCollection)", "summary", "df-generated"]
       - ["System.ComponentModel.Design", "DesignerOptionService+DesignerOptionCollection", "IndexOf", "(System.Object)", "summary", "df-generated"]
+      - ["System.ComponentModel.Design", "DesignerOptionService+DesignerOptionCollection", "Remove", "(System.Object)", "summary", "df-generated"]
       - ["System.ComponentModel.Design", "DesignerOptionService+DesignerOptionCollection", "RemoveAt", "(System.Int32)", "summary", "df-generated"]
       - ["System.ComponentModel.Design", "DesignerOptionService+DesignerOptionCollection", "ShowDialog", "()", "summary", "df-generated"]
       - ["System.ComponentModel.Design", "DesignerOptionService+DesignerOptionCollection", "get_Count", "()", "summary", "df-generated"]
@@ -78,9 +82,12 @@ extensions:
       - ["System.ComponentModel.Design", "DesignerTransactionCloseEventArgs", "DesignerTransactionCloseEventArgs", "(System.Boolean,System.Boolean)", "summary", "df-generated"]
       - ["System.ComponentModel.Design", "DesignerTransactionCloseEventArgs", "get_LastTransaction", "()", "summary", "df-generated"]
       - ["System.ComponentModel.Design", "DesignerTransactionCloseEventArgs", "get_TransactionCommitted", "()", "summary", "df-generated"]
+      - ["System.ComponentModel.Design", "DesignerVerb", "DesignerVerb", "(System.String,System.EventHandler)", "summary", "df-generated"]
+      - ["System.ComponentModel.Design", "DesignerVerb", "DesignerVerb", "(System.String,System.EventHandler,System.ComponentModel.Design.CommandID)", "summary", "df-generated"]
       - ["System.ComponentModel.Design", "DesignerVerbCollection", "Contains", "(System.ComponentModel.Design.DesignerVerb)", "summary", "df-generated"]
       - ["System.ComponentModel.Design", "DesignerVerbCollection", "IndexOf", "(System.ComponentModel.Design.DesignerVerb)", "summary", "df-generated"]
       - ["System.ComponentModel.Design", "DesignerVerbCollection", "OnValidate", "(System.Object)", "summary", "df-generated"]
+      - ["System.ComponentModel.Design", "DesignerVerbCollection", "Remove", "(System.ComponentModel.Design.DesignerVerb)", "summary", "df-generated"]
       - ["System.ComponentModel.Design", "DesigntimeLicenseContext", "get_UsageMode", "()", "summary", "df-generated"]
       - ["System.ComponentModel.Design", "DesigntimeLicenseContextSerializer", "Serialize", "(System.IO.Stream,System.String,System.ComponentModel.Design.DesigntimeLicenseContext)", "summary", "df-generated"]
       - ["System.ComponentModel.Design", "HelpKeywordAttribute", "Equals", "(System.Object)", "summary", "df-generated"]
@@ -91,6 +98,20 @@ extensions:
       - ["System.ComponentModel.Design", "HelpKeywordAttribute", "get_HelpKeyword", "()", "summary", "df-generated"]
       - ["System.ComponentModel.Design", "IComponentChangeService", "OnComponentChanged", "(System.Object,System.ComponentModel.MemberDescriptor,System.Object,System.Object)", "summary", "df-generated"]
       - ["System.ComponentModel.Design", "IComponentChangeService", "OnComponentChanging", "(System.Object,System.ComponentModel.MemberDescriptor)", "summary", "df-generated"]
+      - ["System.ComponentModel.Design", "IComponentChangeService", "add_ComponentAdded", "(System.ComponentModel.Design.ComponentEventHandler)", "summary", "df-generated"]
+      - ["System.ComponentModel.Design", "IComponentChangeService", "add_ComponentAdding", "(System.ComponentModel.Design.ComponentEventHandler)", "summary", "df-generated"]
+      - ["System.ComponentModel.Design", "IComponentChangeService", "add_ComponentChanged", "(System.ComponentModel.Design.ComponentChangedEventHandler)", "summary", "df-generated"]
+      - ["System.ComponentModel.Design", "IComponentChangeService", "add_ComponentChanging", "(System.ComponentModel.Design.ComponentChangingEventHandler)", "summary", "df-generated"]
+      - ["System.ComponentModel.Design", "IComponentChangeService", "add_ComponentRemoved", "(System.ComponentModel.Design.ComponentEventHandler)", "summary", "df-generated"]
+      - ["System.ComponentModel.Design", "IComponentChangeService", "add_ComponentRemoving", "(System.ComponentModel.Design.ComponentEventHandler)", "summary", "df-generated"]
+      - ["System.ComponentModel.Design", "IComponentChangeService", "add_ComponentRename", "(System.ComponentModel.Design.ComponentRenameEventHandler)", "summary", "df-generated"]
+      - ["System.ComponentModel.Design", "IComponentChangeService", "remove_ComponentAdded", "(System.ComponentModel.Design.ComponentEventHandler)", "summary", "df-generated"]
+      - ["System.ComponentModel.Design", "IComponentChangeService", "remove_ComponentAdding", "(System.ComponentModel.Design.ComponentEventHandler)", "summary", "df-generated"]
+      - ["System.ComponentModel.Design", "IComponentChangeService", "remove_ComponentChanged", "(System.ComponentModel.Design.ComponentChangedEventHandler)", "summary", "df-generated"]
+      - ["System.ComponentModel.Design", "IComponentChangeService", "remove_ComponentChanging", "(System.ComponentModel.Design.ComponentChangingEventHandler)", "summary", "df-generated"]
+      - ["System.ComponentModel.Design", "IComponentChangeService", "remove_ComponentRemoved", "(System.ComponentModel.Design.ComponentEventHandler)", "summary", "df-generated"]
+      - ["System.ComponentModel.Design", "IComponentChangeService", "remove_ComponentRemoving", "(System.ComponentModel.Design.ComponentEventHandler)", "summary", "df-generated"]
+      - ["System.ComponentModel.Design", "IComponentChangeService", "remove_ComponentRename", "(System.ComponentModel.Design.ComponentRenameEventHandler)", "summary", "df-generated"]
       - ["System.ComponentModel.Design", "IComponentDiscoveryService", "GetComponentTypes", "(System.ComponentModel.Design.IDesignerHost,System.Type)", "summary", "df-generated"]
       - ["System.ComponentModel.Design", "IComponentInitializer", "InitializeExistingComponent", "(System.Collections.IDictionary)", "summary", "df-generated"]
       - ["System.ComponentModel.Design", "IComponentInitializer", "InitializeNewComponent", "(System.Collections.IDictionary)", "summary", "df-generated"]
@@ -98,8 +119,16 @@ extensions:
       - ["System.ComponentModel.Design", "IDesigner", "Initialize", "(System.ComponentModel.IComponent)", "summary", "df-generated"]
       - ["System.ComponentModel.Design", "IDesigner", "get_Component", "()", "summary", "df-generated"]
       - ["System.ComponentModel.Design", "IDesigner", "get_Verbs", "()", "summary", "df-generated"]
+      - ["System.ComponentModel.Design", "IDesignerEventService", "add_ActiveDesignerChanged", "(System.ComponentModel.Design.ActiveDesignerEventHandler)", "summary", "df-generated"]
+      - ["System.ComponentModel.Design", "IDesignerEventService", "add_DesignerCreated", "(System.ComponentModel.Design.DesignerEventHandler)", "summary", "df-generated"]
+      - ["System.ComponentModel.Design", "IDesignerEventService", "add_DesignerDisposed", "(System.ComponentModel.Design.DesignerEventHandler)", "summary", "df-generated"]
+      - ["System.ComponentModel.Design", "IDesignerEventService", "add_SelectionChanged", "(System.EventHandler)", "summary", "df-generated"]
       - ["System.ComponentModel.Design", "IDesignerEventService", "get_ActiveDesigner", "()", "summary", "df-generated"]
       - ["System.ComponentModel.Design", "IDesignerEventService", "get_Designers", "()", "summary", "df-generated"]
+      - ["System.ComponentModel.Design", "IDesignerEventService", "remove_ActiveDesignerChanged", "(System.ComponentModel.Design.ActiveDesignerEventHandler)", "summary", "df-generated"]
+      - ["System.ComponentModel.Design", "IDesignerEventService", "remove_DesignerCreated", "(System.ComponentModel.Design.DesignerEventHandler)", "summary", "df-generated"]
+      - ["System.ComponentModel.Design", "IDesignerEventService", "remove_DesignerDisposed", "(System.ComponentModel.Design.DesignerEventHandler)", "summary", "df-generated"]
+      - ["System.ComponentModel.Design", "IDesignerEventService", "remove_SelectionChanged", "(System.EventHandler)", "summary", "df-generated"]
       - ["System.ComponentModel.Design", "IDesignerFilter", "PostFilterAttributes", "(System.Collections.IDictionary)", "summary", "df-generated"]
       - ["System.ComponentModel.Design", "IDesignerFilter", "PostFilterEvents", "(System.Collections.IDictionary)", "summary", "df-generated"]
       - ["System.ComponentModel.Design", "IDesignerFilter", "PostFilterProperties", "(System.Collections.IDictionary)", "summary", "df-generated"]
@@ -114,12 +143,26 @@ extensions:
       - ["System.ComponentModel.Design", "IDesignerHost", "DestroyComponent", "(System.ComponentModel.IComponent)", "summary", "df-generated"]
       - ["System.ComponentModel.Design", "IDesignerHost", "GetDesigner", "(System.ComponentModel.IComponent)", "summary", "df-generated"]
       - ["System.ComponentModel.Design", "IDesignerHost", "GetType", "(System.String)", "summary", "df-generated"]
+      - ["System.ComponentModel.Design", "IDesignerHost", "add_Activated", "(System.EventHandler)", "summary", "df-generated"]
+      - ["System.ComponentModel.Design", "IDesignerHost", "add_Deactivated", "(System.EventHandler)", "summary", "df-generated"]
+      - ["System.ComponentModel.Design", "IDesignerHost", "add_LoadComplete", "(System.EventHandler)", "summary", "df-generated"]
+      - ["System.ComponentModel.Design", "IDesignerHost", "add_TransactionClosed", "(System.ComponentModel.Design.DesignerTransactionCloseEventHandler)", "summary", "df-generated"]
+      - ["System.ComponentModel.Design", "IDesignerHost", "add_TransactionClosing", "(System.ComponentModel.Design.DesignerTransactionCloseEventHandler)", "summary", "df-generated"]
+      - ["System.ComponentModel.Design", "IDesignerHost", "add_TransactionOpened", "(System.EventHandler)", "summary", "df-generated"]
+      - ["System.ComponentModel.Design", "IDesignerHost", "add_TransactionOpening", "(System.EventHandler)", "summary", "df-generated"]
       - ["System.ComponentModel.Design", "IDesignerHost", "get_Container", "()", "summary", "df-generated"]
       - ["System.ComponentModel.Design", "IDesignerHost", "get_InTransaction", "()", "summary", "df-generated"]
       - ["System.ComponentModel.Design", "IDesignerHost", "get_Loading", "()", "summary", "df-generated"]
       - ["System.ComponentModel.Design", "IDesignerHost", "get_RootComponent", "()", "summary", "df-generated"]
       - ["System.ComponentModel.Design", "IDesignerHost", "get_RootComponentClassName", "()", "summary", "df-generated"]
       - ["System.ComponentModel.Design", "IDesignerHost", "get_TransactionDescription", "()", "summary", "df-generated"]
+      - ["System.ComponentModel.Design", "IDesignerHost", "remove_Activated", "(System.EventHandler)", "summary", "df-generated"]
+      - ["System.ComponentModel.Design", "IDesignerHost", "remove_Deactivated", "(System.EventHandler)", "summary", "df-generated"]
+      - ["System.ComponentModel.Design", "IDesignerHost", "remove_LoadComplete", "(System.EventHandler)", "summary", "df-generated"]
+      - ["System.ComponentModel.Design", "IDesignerHost", "remove_TransactionClosed", "(System.ComponentModel.Design.DesignerTransactionCloseEventHandler)", "summary", "df-generated"]
+      - ["System.ComponentModel.Design", "IDesignerHost", "remove_TransactionClosing", "(System.ComponentModel.Design.DesignerTransactionCloseEventHandler)", "summary", "df-generated"]
+      - ["System.ComponentModel.Design", "IDesignerHost", "remove_TransactionOpened", "(System.EventHandler)", "summary", "df-generated"]
+      - ["System.ComponentModel.Design", "IDesignerHost", "remove_TransactionOpening", "(System.EventHandler)", "summary", "df-generated"]
       - ["System.ComponentModel.Design", "IDesignerHostTransactionState", "get_IsClosingTransaction", "()", "summary", "df-generated"]
       - ["System.ComponentModel.Design", "IDesignerOptionService", "GetOptionValue", "(System.String,System.String)", "summary", "df-generated"]
       - ["System.ComponentModel.Design", "IDesignerOptionService", "SetOptionValue", "(System.String,System.String,System.Object)", "summary", "df-generated"]
@@ -167,8 +210,14 @@ extensions:
       - ["System.ComponentModel.Design", "ISelectionService", "GetSelectedComponents", "()", "summary", "df-generated"]
       - ["System.ComponentModel.Design", "ISelectionService", "SetSelectedComponents", "(System.Collections.ICollection)", "summary", "df-generated"]
       - ["System.ComponentModel.Design", "ISelectionService", "SetSelectedComponents", "(System.Collections.ICollection,System.ComponentModel.Design.SelectionTypes)", "summary", "df-generated"]
+      - ["System.ComponentModel.Design", "ISelectionService", "add_SelectionChanged", "(System.EventHandler)", "summary", "df-generated"]
+      - ["System.ComponentModel.Design", "ISelectionService", "add_SelectionChanging", "(System.EventHandler)", "summary", "df-generated"]
       - ["System.ComponentModel.Design", "ISelectionService", "get_PrimarySelection", "()", "summary", "df-generated"]
       - ["System.ComponentModel.Design", "ISelectionService", "get_SelectionCount", "()", "summary", "df-generated"]
+      - ["System.ComponentModel.Design", "ISelectionService", "remove_SelectionChanged", "(System.EventHandler)", "summary", "df-generated"]
+      - ["System.ComponentModel.Design", "ISelectionService", "remove_SelectionChanging", "(System.EventHandler)", "summary", "df-generated"]
+      - ["System.ComponentModel.Design", "IServiceContainer", "AddService", "(System.Type,System.ComponentModel.Design.ServiceCreatorCallback)", "summary", "df-generated"]
+      - ["System.ComponentModel.Design", "IServiceContainer", "AddService", "(System.Type,System.ComponentModel.Design.ServiceCreatorCallback,System.Boolean)", "summary", "df-generated"]
       - ["System.ComponentModel.Design", "IServiceContainer", "AddService", "(System.Type,System.Object)", "summary", "df-generated"]
       - ["System.ComponentModel.Design", "IServiceContainer", "AddService", "(System.Type,System.Object,System.Boolean)", "summary", "df-generated"]
       - ["System.ComponentModel.Design", "IServiceContainer", "RemoveService", "(System.Type)", "summary", "df-generated"]
@@ -188,10 +237,15 @@ extensions:
       - ["System.ComponentModel.Design", "ITypeResolutionService", "ReferenceAssembly", "(System.Reflection.AssemblyName)", "summary", "df-generated"]
       - ["System.ComponentModel.Design", "MenuCommand", "Invoke", "()", "summary", "df-generated"]
       - ["System.ComponentModel.Design", "MenuCommand", "Invoke", "(System.Object)", "summary", "df-generated"]
+      - ["System.ComponentModel.Design", "MenuCommand", "MenuCommand", "(System.EventHandler,System.ComponentModel.Design.CommandID)", "summary", "df-generated"]
       - ["System.ComponentModel.Design", "MenuCommand", "OnCommandChanged", "(System.EventArgs)", "summary", "df-generated"]
+      - ["System.ComponentModel.Design", "MenuCommand", "add_CommandChanged", "(System.EventHandler)", "summary", "df-generated"]
       - ["System.ComponentModel.Design", "MenuCommand", "get_CommandID", "()", "summary", "df-generated"]
       - ["System.ComponentModel.Design", "MenuCommand", "get_OleStatus", "()", "summary", "df-generated"]
       - ["System.ComponentModel.Design", "MenuCommand", "get_Properties", "()", "summary", "df-generated"]
+      - ["System.ComponentModel.Design", "MenuCommand", "remove_CommandChanged", "(System.EventHandler)", "summary", "df-generated"]
+      - ["System.ComponentModel.Design", "ServiceContainer", "AddService", "(System.Type,System.ComponentModel.Design.ServiceCreatorCallback)", "summary", "df-generated"]
+      - ["System.ComponentModel.Design", "ServiceContainer", "AddService", "(System.Type,System.ComponentModel.Design.ServiceCreatorCallback,System.Boolean)", "summary", "df-generated"]
       - ["System.ComponentModel.Design", "ServiceContainer", "AddService", "(System.Type,System.Object)", "summary", "df-generated"]
       - ["System.ComponentModel.Design", "ServiceContainer", "AddService", "(System.Type,System.Object,System.Boolean)", "summary", "df-generated"]
       - ["System.ComponentModel.Design", "ServiceContainer", "Dispose", "()", "summary", "df-generated"]
diff --git a/csharp/ql/lib/ext/generated/System.ComponentModel.model.yml b/csharp/ql/lib/ext/generated/System.ComponentModel.model.yml
index f9c4466a3c3..1727ca01edf 100644
--- a/csharp/ql/lib/ext/generated/System.ComponentModel.model.yml
+++ b/csharp/ql/lib/ext/generated/System.ComponentModel.model.yml
@@ -5,39 +5,43 @@ extensions:
       extensible: summaryModel
     data:
       - ["System.ComponentModel", "AsyncOperation", False, "get_SynchronizationContext", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.ComponentModel", "AttributeCollection", False, "AttributeCollection", "(System.Attribute[])", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["System.ComponentModel", "AttributeCollection", False, "FromExisting", "(System.ComponentModel.AttributeCollection,System.Attribute[])", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["System.ComponentModel", "AttributeCollection", False, "FromExisting", "(System.ComponentModel.AttributeCollection,System.Attribute[])", "", "Argument[1].Element", "ReturnValue", "taint", "df-generated"]
-      - ["System.ComponentModel", "AttributeCollection", True, "get_Attributes", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.ComponentModel", "AttributeCollection", True, "get_Item", "(System.Int32)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.ComponentModel", "AttributeCollection", True, "get_Item", "(System.Type)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.ComponentModel", "BindingList<T>", True, "AddNewCore", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.ComponentModel", "BindingList<T>", True, "InsertItem", "(System.Int32,T)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["System.ComponentModel", "BindingList<T>", True, "InsertItem", "(System.Int32,T)", "", "Argument[this]", "Argument[1]", "taint", "df-generated"]
-      - ["System.ComponentModel", "BindingList<T>", True, "SetItem", "(System.Int32,T)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["System.ComponentModel", "BindingList<T>", True, "SetItem", "(System.Int32,T)", "", "Argument[this]", "Argument[1]", "taint", "df-generated"]
-      - ["System.ComponentModel", "CategoryAttribute", False, "CategoryAttribute", "(System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.ComponentModel", "CategoryAttribute", False, "get_Category", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.ComponentModel", "AttributeCollection", False, "AttributeCollection", "(System.Attribute[])", "", "Argument[0]", "Argument[this].SyntheticField[System.ComponentModel.AttributeCollection._attributes]", "value", "dfc-generated"]
+      - ["System.ComponentModel", "AttributeCollection", True, "get_Attributes", "()", "", "Argument[this].SyntheticField[System.ComponentModel.AttributeCollection._attributes]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.ComponentModel", "AttributeCollection", True, "get_Item", "(System.Int32)", "", "Argument[this].Property[System.ComponentModel.AttributeCollection.Attributes].Element", "ReturnValue", "value", "dfc-generated"]
+      - ["System.ComponentModel", "AttributeCollection", True, "get_Item", "(System.Int32)", "", "Argument[this].SyntheticField[System.ComponentModel.AttributeCollection._attributes].Element", "ReturnValue", "value", "dfc-generated"]
+      - ["System.ComponentModel", "AttributeCollection", True, "get_Item", "(System.Type)", "", "Argument[this].Property[System.ComponentModel.AttributeCollection.Attributes].Element", "ReturnValue", "value", "dfc-generated"]
+      - ["System.ComponentModel", "AttributeCollection", True, "get_Item", "(System.Type)", "", "Argument[this].SyntheticField[System.ComponentModel.AttributeCollection._attributes].Element", "ReturnValue", "value", "dfc-generated"]
+      - ["System.ComponentModel", "BindingList<T>", False, "get_SortProperty", "()", "", "Argument[this].Property[System.ComponentModel.BindingList`1.SortPropertyCore]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.ComponentModel", "BindingList<T>", True, "OnAddingNew", "(System.ComponentModel.AddingNewEventArgs)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["System.ComponentModel", "BindingList<T>", True, "OnListChanged", "(System.ComponentModel.ListChangedEventArgs)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["System.ComponentModel", "CategoryAttribute", False, "CategoryAttribute", "(System.String)", "", "Argument[0]", "Argument[this].SyntheticField[System.ComponentModel.CategoryAttribute._categoryValue]", "value", "dfc-generated"]
+      - ["System.ComponentModel", "CategoryAttribute", False, "get_Category", "()", "", "Argument[this].SyntheticField[System.ComponentModel.CategoryAttribute._categoryValue]", "ReturnValue", "value", "dfc-generated"]
       - ["System.ComponentModel", "Component", False, "ToString", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.ComponentModel", "Component", False, "get_Container", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.ComponentModel", "ComponentCollection", False, "ComponentCollection", "(System.ComponentModel.IComponent[])", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["System.ComponentModel", "ComponentCollection", True, "get_Item", "(System.Int32)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.ComponentModel", "ComponentCollection", True, "get_Item", "(System.String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.ComponentModel", "Container", True, "CreateSite", "(System.ComponentModel.IComponent,System.String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.ComponentModel", "Container", True, "CreateSite", "(System.ComponentModel.IComponent,System.String)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["System.ComponentModel", "Container", True, "CreateSite", "(System.ComponentModel.IComponent,System.String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.ComponentModel", "Container", True, "GetService", "(System.Type)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.ComponentModel", "Container", True, "GetService", "(System.Type)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["System.ComponentModel", "ContainerFilterService", True, "FilterComponents", "(System.ComponentModel.ComponentCollection)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["System.ComponentModel", "CultureInfoConverter", True, "GetCultureName", "(System.Globalization.CultureInfo)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["System.ComponentModel", "ComponentCollection", False, "ComponentCollection", "(System.ComponentModel.IComponent[])", "", "Argument[0].Element", "Argument[this].Property[System.Collections.ReadOnlyCollectionBase.InnerList].Element", "value", "dfc-generated"]
+      - ["System.ComponentModel", "ComponentCollection", True, "get_Item", "(System.Int32)", "", "Argument[this].Property[System.Collections.ReadOnlyCollectionBase.InnerList].Element", "ReturnValue", "value", "dfc-generated"]
+      - ["System.ComponentModel", "ComponentCollection", True, "get_Item", "(System.String)", "", "Argument[this].Property[System.Collections.ReadOnlyCollectionBase.InnerList].Element", "ReturnValue", "value", "dfc-generated"]
+      - ["System.ComponentModel", "Container", True, "CreateSite", "(System.ComponentModel.IComponent,System.String)", "", "Argument[this]", "ReturnValue.SyntheticField[System.ComponentModel.Container+Site.Container]", "value", "dfc-generated"]
+      - ["System.ComponentModel", "Container", True, "GetService", "(System.Type)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.ComponentModel", "ContainerFilterService", True, "FilterComponents", "(System.ComponentModel.ComponentCollection)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.ComponentModel", "CultureInfoConverter", True, "GetCultureName", "(System.Globalization.CultureInfo)", "", "Argument[0].Property[System.Globalization.CultureInfo.Name]", "ReturnValue", "value", "dfc-generated"]
       - ["System.ComponentModel", "CustomTypeDescriptor", False, "CustomTypeDescriptor", "(System.ComponentModel.ICustomTypeDescriptor)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.ComponentModel", "DefaultValueAttribute", False, "DefaultValueAttribute", "(System.Object)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.ComponentModel", "DefaultValueAttribute", False, "DefaultValueAttribute", "(System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.ComponentModel", "DefaultValueAttribute", False, "DefaultValueAttribute", "(System.Type,System.String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["System.ComponentModel", "DefaultValueAttribute", False, "SetValue", "(System.Object)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.ComponentModel", "DefaultValueAttribute", True, "get_Value", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.ComponentModel", "DescriptionAttribute", True, "get_Description", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.ComponentModel", "DisplayNameAttribute", True, "get_DisplayName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.ComponentModel", "DefaultValueAttribute", False, "DefaultValueAttribute", "(System.Object)", "", "Argument[0]", "Argument[this].SyntheticField[System.ComponentModel.DefaultValueAttribute._value]", "value", "dfc-generated"]
+      - ["System.ComponentModel", "DefaultValueAttribute", False, "DefaultValueAttribute", "(System.String)", "", "Argument[0]", "Argument[this].SyntheticField[System.ComponentModel.DefaultValueAttribute._value]", "value", "dfc-generated"]
+      - ["System.ComponentModel", "DefaultValueAttribute", False, "DefaultValueAttribute", "(System.Type,System.String)", "", "Argument[1]", "Argument[this].SyntheticField[System.ComponentModel.DefaultValueAttribute._value]", "value", "dfc-generated"]
+      - ["System.ComponentModel", "DefaultValueAttribute", False, "SetValue", "(System.Object)", "", "Argument[0]", "Argument[this].SyntheticField[System.ComponentModel.DefaultValueAttribute._value]", "value", "dfc-generated"]
+      - ["System.ComponentModel", "DefaultValueAttribute", True, "get_Value", "()", "", "Argument[this].SyntheticField[System.ComponentModel.DefaultValueAttribute._value]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.ComponentModel", "DescriptionAttribute", False, "DescriptionAttribute", "(System.String)", "", "Argument[0]", "Argument[this].Property[System.ComponentModel.DescriptionAttribute.DescriptionValue]", "value", "dfc-generated"]
+      - ["System.ComponentModel", "DescriptionAttribute", True, "get_Description", "()", "", "Argument[this].Property[System.ComponentModel.DescriptionAttribute.DescriptionValue]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.ComponentModel", "DesignerAttribute", False, "get_TypeId", "()", "", "Argument[this].Property[System.ComponentModel.DesignerAttribute.DesignerBaseTypeName]", "Argument[this].SyntheticField[System.ComponentModel.DesignerAttribute._typeId]", "taint", "dfc-generated"]
+      - ["System.ComponentModel", "DesignerAttribute", False, "get_TypeId", "()", "", "Argument[this].Property[System.ComponentModel.DesignerAttribute.DesignerBaseTypeName]", "ReturnValue", "taint", "dfc-generated"]
+      - ["System.ComponentModel", "DesignerAttribute", False, "get_TypeId", "()", "", "Argument[this].SyntheticField[System.ComponentModel.DesignerAttribute._typeId]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.ComponentModel", "DesignerCategoryAttribute", False, "get_TypeId", "()", "", "Argument[this].Property[System.ComponentModel.DesignerCategoryAttribute.Category]", "ReturnValue", "taint", "dfc-generated"]
+      - ["System.ComponentModel", "DisplayNameAttribute", True, "get_DisplayName", "()", "", "Argument[this].Property[System.ComponentModel.DisplayNameAttribute.DisplayNameValue]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.ComponentModel", "EditorAttribute", False, "get_TypeId", "()", "", "Argument[this].Property[System.ComponentModel.EditorAttribute.EditorBaseTypeName]", "Argument[this].SyntheticField[System.ComponentModel.EditorAttribute._typeId]", "taint", "dfc-generated"]
+      - ["System.ComponentModel", "EditorAttribute", False, "get_TypeId", "()", "", "Argument[this].Property[System.ComponentModel.EditorAttribute.EditorBaseTypeName]", "ReturnValue", "taint", "dfc-generated"]
+      - ["System.ComponentModel", "EditorAttribute", False, "get_TypeId", "()", "", "Argument[this].SyntheticField[System.ComponentModel.EditorAttribute._typeId]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.ComponentModel", "EnumConverter", True, "GetStandardValues", "(System.ComponentModel.ITypeDescriptorContext)", "", "Argument[this].Property[System.ComponentModel.EnumConverter.Values]", "ReturnValue", "value", "dfc-generated"]
       - ["System.ComponentModel", "EventDescriptorCollection", False, "EventDescriptorCollection", "(System.ComponentModel.EventDescriptor[])", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
       - ["System.ComponentModel", "EventDescriptorCollection", True, "Sort", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.ComponentModel", "EventDescriptorCollection", True, "Sort", "(System.Collections.IComparer)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
@@ -47,26 +51,19 @@ extensions:
       - ["System.ComponentModel", "EventDescriptorCollection", True, "Sort", "(System.String[],System.Collections.IComparer)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
       - ["System.ComponentModel", "EventDescriptorCollection", True, "Sort", "(System.String[],System.Collections.IComparer)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
       - ["System.ComponentModel", "EventDescriptorCollection", True, "Sort", "(System.String[],System.Collections.IComparer)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.ComponentModel", "EventHandlerList", False, "AddHandler", "(System.Object,System.Delegate)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.ComponentModel", "EventHandlerList", False, "AddHandler", "(System.Object,System.Delegate)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["System.ComponentModel", "EventHandlerList", False, "AddHandlers", "(System.ComponentModel.EventHandlerList)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.ComponentModel", "EventHandlerList", False, "get_Item", "(System.Object)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.ComponentModel", "EventHandlerList", False, "set_Item", "(System.Object,System.Delegate)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.ComponentModel", "EventHandlerList", False, "set_Item", "(System.Object,System.Delegate)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["System.ComponentModel", "IBindingList", True, "AddNew", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.ComponentModel", "EventHandlerList", False, "AddHandler", "(System.Object,System.Delegate)", "", "Argument[1]", "Argument[this].SyntheticField[System.ComponentModel.EventHandlerList._head].SyntheticField[System.ComponentModel.EventHandlerList+ListEntry._handler]", "value", "dfc-generated"]
+      - ["System.ComponentModel", "EventHandlerList", False, "AddHandlers", "(System.ComponentModel.EventHandlerList)", "", "Argument[0].SyntheticField[System.ComponentModel.EventHandlerList._head].SyntheticField[System.ComponentModel.EventHandlerList+ListEntry._handler]", "Argument[this].SyntheticField[System.ComponentModel.EventHandlerList._head].SyntheticField[System.ComponentModel.EventHandlerList+ListEntry._handler]", "value", "dfc-generated"]
+      - ["System.ComponentModel", "EventHandlerList", False, "get_Item", "(System.Object)", "", "Argument[this].SyntheticField[System.ComponentModel.EventHandlerList._head].SyntheticField[System.ComponentModel.EventHandlerList+ListEntry._handler]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.ComponentModel", "EventHandlerList", False, "set_Item", "(System.Object,System.Delegate)", "", "Argument[1]", "Argument[this].SyntheticField[System.ComponentModel.EventHandlerList._head].SyntheticField[System.ComponentModel.EventHandlerList+ListEntry._handler]", "value", "dfc-generated"]
       - ["System.ComponentModel", "IBindingList", True, "ApplySort", "(System.ComponentModel.PropertyDescriptor,System.ComponentModel.ListSortDirection)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.ComponentModel", "IBindingList", True, "get_SortProperty", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.ComponentModel", "IBindingListView", True, "ApplySort", "(System.ComponentModel.ListSortDescriptionCollection)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
       - ["System.ComponentModel", "IContainer", True, "Add", "(System.ComponentModel.IComponent)", "", "Argument[this]", "Argument[0]", "taint", "df-generated"]
       - ["System.ComponentModel", "IContainer", True, "Add", "(System.ComponentModel.IComponent,System.String)", "", "Argument[1]", "Argument[0]", "taint", "df-generated"]
       - ["System.ComponentModel", "IContainer", True, "Add", "(System.ComponentModel.IComponent,System.String)", "", "Argument[this]", "Argument[0]", "taint", "df-generated"]
       - ["System.ComponentModel", "IContainer", True, "get_Components", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.ComponentModel", "ICustomTypeDescriptor", True, "GetAttributes", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.ComponentModel", "ICustomTypeDescriptor", True, "GetProperties", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.ComponentModel", "ICustomTypeDescriptor", True, "GetProperties", "(System.Attribute[])", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.ComponentModel", "ICustomTypeDescriptor", True, "GetPropertyOwner", "(System.ComponentModel.PropertyDescriptor)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.ComponentModel", "ICustomTypeDescriptor", True, "GetPropertyOwner", "(System.ComponentModel.PropertyDescriptor)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["System.ComponentModel", "IDataErrorInfo", True, "get_Error", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.ComponentModel", "ICustomTypeDescriptor", True, "GetPropertyOwner", "(System.ComponentModel.PropertyDescriptor)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
       - ["System.ComponentModel", "IListSource", True, "GetList", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.ComponentModel", "INestedSite", True, "get_FullName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.ComponentModel", "ITypedList", True, "GetItemProperties", "(System.ComponentModel.PropertyDescriptor[])", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
@@ -80,7 +77,8 @@ extensions:
       - ["System.ComponentModel", "LicenseException", False, "LicenseException", "(System.Type,System.Object,System.String,System.Exception)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
       - ["System.ComponentModel", "LicenseProvider", True, "GetLicense", "(System.ComponentModel.LicenseContext,System.Type,System.Object,System.Boolean)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["System.ComponentModel", "LicenseProvider", True, "GetLicense", "(System.ComponentModel.LicenseContext,System.Type,System.Object,System.Boolean)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.ComponentModel", "LicenseProviderAttribute", False, "LicenseProviderAttribute", "(System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["System.ComponentModel", "LicenseProviderAttribute", False, "LicenseProviderAttribute", "(System.String)", "", "Argument[0]", "Argument[this].SyntheticField[System.ComponentModel.LicenseProviderAttribute._licenseProviderName]", "value", "dfc-generated"]
+      - ["System.ComponentModel", "LicenseProviderAttribute", False, "get_TypeId", "()", "", "Argument[this].SyntheticField[System.ComponentModel.LicenseProviderAttribute._licenseProviderName]", "ReturnValue", "taint", "dfc-generated"]
       - ["System.ComponentModel", "ListSortDescriptionCollection", False, "ListSortDescriptionCollection", "(System.ComponentModel.ListSortDescription[])", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
       - ["System.ComponentModel", "MarshalByValueComponent", False, "ToString", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.ComponentModel", "MarshalByValueComponent", True, "get_Container", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
@@ -92,29 +90,30 @@ extensions:
       - ["System.ComponentModel", "MaskedTextProvider", False, "ToString", "(System.Boolean,System.Boolean,System.Int32,System.Int32)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.ComponentModel", "MaskedTextProvider", False, "ToString", "(System.Boolean,System.Int32,System.Int32)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.ComponentModel", "MaskedTextProvider", False, "ToString", "(System.Int32,System.Int32)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.ComponentModel", "MemberDescriptor", False, "GetInvokee", "(System.Type,System.Object)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["System.ComponentModel", "MemberDescriptor", False, "GetSite", "(System.Object)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.ComponentModel", "MemberDescriptor", False, "MemberDescriptor", "(System.ComponentModel.MemberDescriptor)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["System.ComponentModel", "MemberDescriptor", False, "GetInvokee", "(System.Type,System.Object)", "", "Argument[1]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.ComponentModel", "MemberDescriptor", False, "GetSite", "(System.Object)", "", "Argument[0].Property[System.ComponentModel.Component.Site]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.ComponentModel", "MemberDescriptor", False, "GetSite", "(System.Object)", "", "Argument[0].Property[System.ComponentModel.IComponent.Site]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.ComponentModel", "MemberDescriptor", False, "MemberDescriptor", "(System.ComponentModel.MemberDescriptor)", "", "Argument[this].SyntheticField[System.ComponentModel.MemberDescriptor._name]", "Argument[this].SyntheticField[System.ComponentModel.MemberDescriptor._displayName]", "value", "dfc-generated"]
       - ["System.ComponentModel", "MemberDescriptor", False, "MemberDescriptor", "(System.ComponentModel.MemberDescriptor,System.Attribute[])", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.ComponentModel", "MemberDescriptor", False, "MemberDescriptor", "(System.ComponentModel.MemberDescriptor,System.Attribute[])", "", "Argument[1].Element", "Argument[this]", "taint", "df-generated"]
-      - ["System.ComponentModel", "MemberDescriptor", False, "MemberDescriptor", "(System.String,System.Attribute[])", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.ComponentModel", "MemberDescriptor", False, "MemberDescriptor", "(System.String,System.Attribute[])", "", "Argument[1].Element", "Argument[this]", "taint", "df-generated"]
-      - ["System.ComponentModel", "MemberDescriptor", True, "CreateAttributeCollection", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.ComponentModel", "MemberDescriptor", False, "MemberDescriptor", "(System.String,System.Attribute[])", "", "Argument[0]", "Argument[this].SyntheticField[System.ComponentModel.MemberDescriptor._displayName]", "value", "dfc-generated"]
+      - ["System.ComponentModel", "MemberDescriptor", False, "MemberDescriptor", "(System.String,System.Attribute[])", "", "Argument[0]", "Argument[this].SyntheticField[System.ComponentModel.MemberDescriptor._name]", "value", "dfc-generated"]
       - ["System.ComponentModel", "MemberDescriptor", True, "FillAttributes", "(System.Collections.IList)", "", "Argument[this]", "Argument[0].Element", "taint", "df-generated"]
-      - ["System.ComponentModel", "MemberDescriptor", True, "GetInvocationTarget", "(System.Type,System.Object)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["System.ComponentModel", "MemberDescriptor", True, "GetInvocationTarget", "(System.Type,System.Object)", "", "Argument[1]", "ReturnValue", "value", "dfc-generated"]
       - ["System.ComponentModel", "MemberDescriptor", True, "get_Attributes", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.ComponentModel", "MemberDescriptor", True, "get_DisplayName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.ComponentModel", "MemberDescriptor", True, "get_Name", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.ComponentModel", "ProgressChangedEventArgs", False, "ProgressChangedEventArgs", "(System.Int32,System.Object)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["System.ComponentModel", "ProgressChangedEventArgs", False, "get_UserState", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.ComponentModel", "MemberDescriptor", True, "get_DisplayName", "()", "", "Argument[this].SyntheticField[System.ComponentModel.MemberDescriptor._displayName]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.ComponentModel", "MemberDescriptor", True, "get_Name", "()", "", "Argument[this].SyntheticField[System.ComponentModel.MemberDescriptor._name]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.ComponentModel", "NestedContainer", True, "CreateSite", "(System.ComponentModel.IComponent,System.String)", "", "Argument[1]", "ReturnValue.SyntheticField[System.ComponentModel.NestedContainer+Site._name]", "value", "dfc-generated"]
+      - ["System.ComponentModel", "NestedContainer", True, "CreateSite", "(System.ComponentModel.IComponent,System.String)", "", "Argument[this]", "ReturnValue.SyntheticField[System.ComponentModel.NestedContainer+Site.Container]", "value", "dfc-generated"]
+      - ["System.ComponentModel", "NullableConverter", True, "ConvertFrom", "(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object)", "", "Argument[2].Property[System.Uri.OriginalString]", "ReturnValue", "taint", "dfc-generated"]
+      - ["System.ComponentModel", "NullableConverter", True, "ConvertTo", "(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type)", "", "Argument[1].Property[System.Globalization.CultureInfo.TextInfo].Property[System.Globalization.TextInfo.ListSeparator]", "ReturnValue", "taint", "dfc-generated"]
+      - ["System.ComponentModel", "ProgressChangedEventArgs", False, "ProgressChangedEventArgs", "(System.Int32,System.Object)", "", "Argument[1]", "Argument[this].SyntheticField[System.ComponentModel.ProgressChangedEventArgs._userState]", "value", "dfc-generated"]
+      - ["System.ComponentModel", "ProgressChangedEventArgs", False, "get_UserState", "()", "", "Argument[this].SyntheticField[System.ComponentModel.ProgressChangedEventArgs._userState]", "ReturnValue", "value", "dfc-generated"]
       - ["System.ComponentModel", "PropertyDescriptor", True, "GetEditor", "(System.Type)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.ComponentModel", "PropertyDescriptor", True, "GetValue", "(System.Object)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.ComponentModel", "PropertyDescriptor", True, "GetValue", "(System.Object)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.ComponentModel", "PropertyDescriptor", True, "GetValue", "(System.Object)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.ComponentModel", "PropertyDescriptor", True, "GetValue", "(System.Object)", "", "Argument[0]", "ReturnValue", "taint", "dfc-generated"]
       - ["System.ComponentModel", "PropertyDescriptor", True, "ResetValue", "(System.Object)", "", "Argument[this]", "Argument[0]", "taint", "df-generated"]
       - ["System.ComponentModel", "PropertyDescriptor", True, "SetValue", "(System.Object,System.Object)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.ComponentModel", "PropertyDescriptor", True, "SetValue", "(System.Object,System.Object)", "", "Argument[1]", "Argument[0]", "taint", "df-generated"]
-      - ["System.ComponentModel", "PropertyDescriptor", True, "SetValue", "(System.Object,System.Object)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
       - ["System.ComponentModel", "PropertyDescriptor", True, "SetValue", "(System.Object,System.Object)", "", "Argument[this]", "Argument[0]", "taint", "df-generated"]
       - ["System.ComponentModel", "PropertyDescriptor", True, "get_Converter", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.ComponentModel", "PropertyDescriptorCollection", True, "Sort", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
@@ -125,45 +124,36 @@ extensions:
       - ["System.ComponentModel", "PropertyDescriptorCollection", True, "Sort", "(System.String[],System.Collections.IComparer)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
       - ["System.ComponentModel", "PropertyDescriptorCollection", True, "Sort", "(System.String[],System.Collections.IComparer)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
       - ["System.ComponentModel", "PropertyDescriptorCollection", True, "Sort", "(System.String[],System.Collections.IComparer)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.ComponentModel", "PropertyTabAttribute", False, "InitializeArrays", "(System.String[],System.ComponentModel.PropertyTabScope[])", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["System.ComponentModel", "PropertyTabAttribute", False, "InitializeArrays", "(System.Type[],System.ComponentModel.PropertyTabScope[])", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["System.ComponentModel", "PropertyTabAttribute", False, "PropertyTabAttribute", "(System.String,System.ComponentModel.PropertyTabScope)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.ComponentModel", "PropertyTabAttribute", False, "get_TabClassNames", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.ComponentModel", "PropertyTabAttribute", False, "get_TabClasses", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.ComponentModel", "RunWorkerCompletedEventArgs", False, "RunWorkerCompletedEventArgs", "(System.Object,System.Exception,System.Boolean)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.ComponentModel", "RunWorkerCompletedEventArgs", False, "get_Result", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.ComponentModel", "RunWorkerCompletedEventArgs", False, "get_UserState", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.ComponentModel", "ToolboxItemAttribute", False, "ToolboxItemAttribute", "(System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.ComponentModel", "ToolboxItemAttribute", False, "get_ToolboxItemTypeName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.ComponentModel", "ToolboxItemFilterAttribute", False, "ToString", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.ComponentModel", "TypeConverter+StandardValuesCollection", False, "CopyTo", "(System.Array,System.Int32)", "", "Argument[this]", "Argument[0].Element", "taint", "df-generated"]
-      - ["System.ComponentModel", "TypeConverter+StandardValuesCollection", False, "GetEnumerator", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.ComponentModel", "TypeConverter+StandardValuesCollection", False, "StandardValuesCollection", "(System.Collections.ICollection)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["System.ComponentModel", "TypeConverter+StandardValuesCollection", False, "get_Item", "(System.Int32)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.ComponentModel", "TypeConverter", False, "ConvertFrom", "(System.Object)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.ComponentModel", "TypeConverter", False, "ConvertFrom", "(System.Object)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.ComponentModel", "TypeConverter", False, "ConvertFromInvariantString", "(System.ComponentModel.ITypeDescriptorContext,System.String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.ComponentModel", "TypeConverter", False, "ConvertFromInvariantString", "(System.ComponentModel.ITypeDescriptorContext,System.String)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["System.ComponentModel", "TypeConverter", False, "ConvertFromInvariantString", "(System.ComponentModel.ITypeDescriptorContext,System.String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.ComponentModel", "TypeConverter", False, "ConvertFromInvariantString", "(System.String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.ComponentModel", "TypeConverter", False, "ConvertFromInvariantString", "(System.String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.ComponentModel", "TypeConverter", False, "ConvertFromString", "(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.ComponentModel", "TypeConverter", False, "ConvertFromString", "(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.String)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
-      - ["System.ComponentModel", "TypeConverter", False, "ConvertFromString", "(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.ComponentModel", "TypeConverter", False, "ConvertFromString", "(System.ComponentModel.ITypeDescriptorContext,System.String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.ComponentModel", "TypeConverter", False, "ConvertFromString", "(System.ComponentModel.ITypeDescriptorContext,System.String)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["System.ComponentModel", "TypeConverter", False, "ConvertFromString", "(System.ComponentModel.ITypeDescriptorContext,System.String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.ComponentModel", "TypeConverter", False, "ConvertFromString", "(System.String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.ComponentModel", "TypeConverter", False, "ConvertFromString", "(System.String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.ComponentModel", "PropertyTabAttribute", False, "InitializeArrays", "(System.String[],System.ComponentModel.PropertyTabScope[])", "", "Argument[0].Element", "Argument[this].SyntheticField[System.ComponentModel.PropertyTabAttribute._tabClassNames].Element", "value", "dfc-generated"]
+      - ["System.ComponentModel", "PropertyTabAttribute", False, "InitializeArrays", "(System.Type[],System.ComponentModel.PropertyTabScope[])", "", "Argument[0].Element", "Argument[this].SyntheticField[System.ComponentModel.PropertyTabAttribute._tabClasses].Element", "value", "dfc-generated"]
+      - ["System.ComponentModel", "PropertyTabAttribute", False, "PropertyTabAttribute", "(System.String,System.ComponentModel.PropertyTabScope)", "", "Argument[0]", "Argument[this].SyntheticField[System.ComponentModel.PropertyTabAttribute._tabClassNames].Element", "value", "dfc-generated"]
+      - ["System.ComponentModel", "PropertyTabAttribute", False, "get_TabClassNames", "()", "", "Argument[this].SyntheticField[System.ComponentModel.PropertyTabAttribute._tabClassNames].Element", "ReturnValue.Element", "value", "dfc-generated"]
+      - ["System.ComponentModel", "PropertyTabAttribute", False, "get_TabClasses", "()", "", "Argument[this].SyntheticField[System.ComponentModel.PropertyTabAttribute._tabClasses]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.ComponentModel", "ProvidePropertyAttribute", False, "get_TypeId", "()", "", "Argument[this].Property[System.ComponentModel.ProvidePropertyAttribute.PropertyName]", "ReturnValue", "taint", "dfc-generated"]
+      - ["System.ComponentModel", "RunWorkerCompletedEventArgs", False, "RunWorkerCompletedEventArgs", "(System.Object,System.Exception,System.Boolean)", "", "Argument[0]", "Argument[this].SyntheticField[System.ComponentModel.RunWorkerCompletedEventArgs._result]", "value", "dfc-generated"]
+      - ["System.ComponentModel", "RunWorkerCompletedEventArgs", False, "get_Result", "()", "", "Argument[this].SyntheticField[System.ComponentModel.RunWorkerCompletedEventArgs._result]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.ComponentModel", "RunWorkerCompletedEventArgs", False, "get_UserState", "()", "", "Argument[this].Property[System.ComponentModel.AsyncCompletedEventArgs.UserState]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.ComponentModel", "ToolboxItemAttribute", False, "ToolboxItemAttribute", "(System.String)", "", "Argument[0]", "Argument[this].SyntheticField[System.ComponentModel.ToolboxItemAttribute._toolboxItemTypeName]", "value", "dfc-generated"]
+      - ["System.ComponentModel", "ToolboxItemAttribute", False, "get_ToolboxItemTypeName", "()", "", "Argument[this].SyntheticField[System.ComponentModel.ToolboxItemAttribute._toolboxItemTypeName]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.ComponentModel", "ToolboxItemFilterAttribute", False, "ToString", "()", "", "Argument[this].Property[System.ComponentModel.ToolboxItemFilterAttribute.FilterString]", "ReturnValue", "taint", "dfc-generated"]
+      - ["System.ComponentModel", "TypeConverter+StandardValuesCollection", False, "CopyTo", "(System.Array,System.Int32)", "", "Argument[this].SyntheticField[System.ComponentModel.TypeConverter+StandardValuesCollection._values].Element", "Argument[0].Element", "value", "dfc-generated"]
+      - ["System.ComponentModel", "TypeConverter+StandardValuesCollection", False, "GetEnumerator", "()", "", "Argument[this].SyntheticField[System.ComponentModel.TypeConverter+StandardValuesCollection._values].Element", "ReturnValue.Property[System.Collections.IEnumerator.Current]", "value", "dfc-generated"]
+      - ["System.ComponentModel", "TypeConverter+StandardValuesCollection", False, "StandardValuesCollection", "(System.Collections.ICollection)", "", "Argument[0]", "Argument[this].SyntheticField[System.ComponentModel.TypeConverter+StandardValuesCollection._values]", "value", "dfc-generated"]
+      - ["System.ComponentModel", "TypeConverter+StandardValuesCollection", False, "get_Item", "(System.Int32)", "", "Argument[this].SyntheticField[System.ComponentModel.TypeConverter+StandardValuesCollection._values].Element", "ReturnValue", "value", "dfc-generated"]
+      - ["System.ComponentModel", "TypeConverter", False, "ConvertFrom", "(System.Object)", "", "Argument[0].Property[System.Uri.OriginalString]", "ReturnValue", "taint", "dfc-generated"]
+      - ["System.ComponentModel", "TypeConverter", False, "ConvertFrom", "(System.Object)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.ComponentModel", "TypeConverter", False, "ConvertFromInvariantString", "(System.ComponentModel.ITypeDescriptorContext,System.String)", "", "Argument[1]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.ComponentModel", "TypeConverter", False, "ConvertFromInvariantString", "(System.String)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.ComponentModel", "TypeConverter", False, "ConvertFromString", "(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.String)", "", "Argument[2]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.ComponentModel", "TypeConverter", False, "ConvertFromString", "(System.ComponentModel.ITypeDescriptorContext,System.String)", "", "Argument[1]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.ComponentModel", "TypeConverter", False, "ConvertFromString", "(System.String)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
       - ["System.ComponentModel", "TypeConverter", False, "ConvertTo", "(System.Object,System.Type)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["System.ComponentModel", "TypeConverter", False, "ConvertTo", "(System.Object,System.Type)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.ComponentModel", "TypeConverter", False, "ConvertToInvariantString", "(System.ComponentModel.ITypeDescriptorContext,System.Object)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
       - ["System.ComponentModel", "TypeConverter", False, "ConvertToInvariantString", "(System.ComponentModel.ITypeDescriptorContext,System.Object)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.ComponentModel", "TypeConverter", False, "ConvertToInvariantString", "(System.Object)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["System.ComponentModel", "TypeConverter", False, "ConvertToInvariantString", "(System.Object)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.ComponentModel", "TypeConverter", False, "ConvertToString", "(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["System.ComponentModel", "TypeConverter", False, "ConvertToString", "(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
-      - ["System.ComponentModel", "TypeConverter", False, "ConvertToString", "(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.ComponentModel", "TypeConverter", False, "ConvertToString", "(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object)", "", "Argument[1].Property[System.Globalization.CultureInfo.TextInfo].Property[System.Globalization.TextInfo.ListSeparator]", "ReturnValue", "taint", "dfc-generated"]
       - ["System.ComponentModel", "TypeConverter", False, "ConvertToString", "(System.ComponentModel.ITypeDescriptorContext,System.Object)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
       - ["System.ComponentModel", "TypeConverter", False, "ConvertToString", "(System.ComponentModel.ITypeDescriptorContext,System.Object)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.ComponentModel", "TypeConverter", False, "ConvertToString", "(System.Object)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
@@ -171,15 +161,13 @@ extensions:
       - ["System.ComponentModel", "TypeConverter", False, "GetProperties", "(System.ComponentModel.ITypeDescriptorContext,System.Object)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
       - ["System.ComponentModel", "TypeConverter", False, "GetProperties", "(System.Object)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["System.ComponentModel", "TypeConverter", False, "GetStandardValues", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.ComponentModel", "TypeConverter", False, "SortProperties", "(System.ComponentModel.PropertyDescriptorCollection,System.String[])", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["System.ComponentModel", "TypeConverter", True, "ConvertFrom", "(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.ComponentModel", "TypeConverter", True, "ConvertFrom", "(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
-      - ["System.ComponentModel", "TypeConverter", True, "ConvertFrom", "(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.ComponentModel", "TypeConverter", True, "ConvertTo", "(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["System.ComponentModel", "TypeConverter", True, "ConvertTo", "(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
-      - ["System.ComponentModel", "TypeConverter", True, "ConvertTo", "(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.ComponentModel", "TypeConverter", False, "SortProperties", "(System.ComponentModel.PropertyDescriptorCollection,System.String[])", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.ComponentModel", "TypeConverter", True, "ConvertFrom", "(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object)", "", "Argument[2]", "ReturnValue.Element", "taint", "dfc-generated"]
+      - ["System.ComponentModel", "TypeConverter", True, "ConvertFrom", "(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object)", "", "Argument[2]", "ReturnValue", "taint", "dfc-generated"]
+      - ["System.ComponentModel", "TypeConverter", True, "ConvertFrom", "(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object)", "", "Argument[2]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.ComponentModel", "TypeConverter", True, "ConvertTo", "(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type)", "", "Argument[2].Element", "ReturnValue", "taint", "dfc-generated"]
+      - ["System.ComponentModel", "TypeConverter", True, "ConvertTo", "(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type)", "", "Argument[2]", "ReturnValue", "taint", "dfc-generated"]
       - ["System.ComponentModel", "TypeConverter", True, "GetProperties", "(System.ComponentModel.ITypeDescriptorContext,System.Object,System.Attribute[])", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["System.ComponentModel", "TypeConverter", True, "GetStandardValues", "(System.ComponentModel.ITypeDescriptorContext)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["System.ComponentModel", "TypeConverter", True, "GetStandardValues", "(System.ComponentModel.ITypeDescriptorContext)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.ComponentModel", "TypeDescriptionProvider", False, "GetTypeDescriptor", "(System.Object)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["System.ComponentModel", "TypeDescriptionProvider", False, "GetTypeDescriptor", "(System.Object)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
@@ -195,7 +183,7 @@ extensions:
       - ["System.ComponentModel", "TypeDescriptor", False, "CreateEvent", "(System.Type,System.ComponentModel.EventDescriptor,System.Attribute[])", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
       - ["System.ComponentModel", "TypeDescriptor", False, "CreateProperty", "(System.Type,System.ComponentModel.PropertyDescriptor,System.Attribute[])", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
       - ["System.ComponentModel", "TypeDescriptor", False, "CreateProperty", "(System.Type,System.ComponentModel.PropertyDescriptor,System.Attribute[])", "", "Argument[2].Element", "ReturnValue", "taint", "df-generated"]
-      - ["System.ComponentModel", "TypeDescriptor", False, "GetAssociation", "(System.Type,System.Object)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["System.ComponentModel", "TypeDescriptor", False, "GetAssociation", "(System.Type,System.Object)", "", "Argument[1]", "ReturnValue", "value", "dfc-generated"]
       - ["System.ComponentModel", "TypeDescriptor", False, "GetFullComponentName", "(System.Object)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["System.ComponentModel", "TypeListConverter", False, "TypeListConverter", "(System.Type[])", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
   - addsTo:
@@ -224,10 +212,13 @@ extensions:
       - ["System.ComponentModel", "AsyncCompletedEventArgs", "get_Error", "()", "summary", "df-generated"]
       - ["System.ComponentModel", "AsyncCompletedEventArgs", "get_UserState", "()", "summary", "df-generated"]
       - ["System.ComponentModel", "AsyncOperation", "OperationCompleted", "()", "summary", "df-generated"]
+      - ["System.ComponentModel", "AsyncOperation", "Post", "(System.Threading.SendOrPostCallback,System.Object)", "summary", "df-generated"]
+      - ["System.ComponentModel", "AsyncOperation", "PostOperationCompleted", "(System.Threading.SendOrPostCallback,System.Object)", "summary", "df-generated"]
       - ["System.ComponentModel", "AsyncOperation", "get_UserSuppliedState", "()", "summary", "df-generated"]
       - ["System.ComponentModel", "AsyncOperationManager", "CreateOperation", "(System.Object)", "summary", "df-generated"]
       - ["System.ComponentModel", "AttributeCollection", "Contains", "(System.Attribute)", "summary", "df-generated"]
       - ["System.ComponentModel", "AttributeCollection", "Contains", "(System.Attribute[])", "summary", "df-generated"]
+      - ["System.ComponentModel", "AttributeCollection", "FromExisting", "(System.ComponentModel.AttributeCollection,System.Attribute[])", "summary", "df-generated"]
       - ["System.ComponentModel", "AttributeCollection", "GetDefaultAttribute", "(System.Type)", "summary", "df-generated"]
       - ["System.ComponentModel", "AttributeCollection", "Matches", "(System.Attribute)", "summary", "df-generated"]
       - ["System.ComponentModel", "AttributeCollection", "Matches", "(System.Attribute[])", "summary", "df-generated"]
@@ -247,8 +238,14 @@ extensions:
       - ["System.ComponentModel", "BackgroundWorker", "ReportProgress", "(System.Int32,System.Object)", "summary", "df-generated"]
       - ["System.ComponentModel", "BackgroundWorker", "RunWorkerAsync", "()", "summary", "df-generated"]
       - ["System.ComponentModel", "BackgroundWorker", "RunWorkerAsync", "(System.Object)", "summary", "df-generated"]
+      - ["System.ComponentModel", "BackgroundWorker", "add_DoWork", "(System.ComponentModel.DoWorkEventHandler)", "summary", "df-generated"]
+      - ["System.ComponentModel", "BackgroundWorker", "add_ProgressChanged", "(System.ComponentModel.ProgressChangedEventHandler)", "summary", "df-generated"]
+      - ["System.ComponentModel", "BackgroundWorker", "add_RunWorkerCompleted", "(System.ComponentModel.RunWorkerCompletedEventHandler)", "summary", "df-generated"]
       - ["System.ComponentModel", "BackgroundWorker", "get_CancellationPending", "()", "summary", "df-generated"]
       - ["System.ComponentModel", "BackgroundWorker", "get_IsBusy", "()", "summary", "df-generated"]
+      - ["System.ComponentModel", "BackgroundWorker", "remove_DoWork", "(System.ComponentModel.DoWorkEventHandler)", "summary", "df-generated"]
+      - ["System.ComponentModel", "BackgroundWorker", "remove_ProgressChanged", "(System.ComponentModel.ProgressChangedEventHandler)", "summary", "df-generated"]
+      - ["System.ComponentModel", "BackgroundWorker", "remove_RunWorkerCompleted", "(System.ComponentModel.RunWorkerCompletedEventHandler)", "summary", "df-generated"]
       - ["System.ComponentModel", "BaseNumberConverter", "CanConvertFrom", "(System.ComponentModel.ITypeDescriptorContext,System.Type)", "summary", "df-generated"]
       - ["System.ComponentModel", "BaseNumberConverter", "CanConvertTo", "(System.ComponentModel.ITypeDescriptorContext,System.Type)", "summary", "df-generated"]
       - ["System.ComponentModel", "BindableAttribute", "BindableAttribute", "(System.Boolean)", "summary", "df-generated"]
@@ -262,20 +259,23 @@ extensions:
       - ["System.ComponentModel", "BindableAttribute", "get_Direction", "()", "summary", "df-generated"]
       - ["System.ComponentModel", "BindingList<T>", "AddIndex", "(System.ComponentModel.PropertyDescriptor)", "summary", "df-generated"]
       - ["System.ComponentModel", "BindingList<T>", "AddNew", "()", "summary", "df-generated"]
+      - ["System.ComponentModel", "BindingList<T>", "AddNewCore", "()", "summary", "df-generated"]
       - ["System.ComponentModel", "BindingList<T>", "ApplySortCore", "(System.ComponentModel.PropertyDescriptor,System.ComponentModel.ListSortDirection)", "summary", "df-generated"]
       - ["System.ComponentModel", "BindingList<T>", "BindingList", "(System.Collections.Generic.IList<T>)", "summary", "df-generated"]
       - ["System.ComponentModel", "BindingList<T>", "CancelNew", "(System.Int32)", "summary", "df-generated"]
       - ["System.ComponentModel", "BindingList<T>", "ClearItems", "()", "summary", "df-generated"]
       - ["System.ComponentModel", "BindingList<T>", "EndNew", "(System.Int32)", "summary", "df-generated"]
       - ["System.ComponentModel", "BindingList<T>", "FindCore", "(System.ComponentModel.PropertyDescriptor,System.Object)", "summary", "df-generated"]
-      - ["System.ComponentModel", "BindingList<T>", "OnAddingNew", "(System.ComponentModel.AddingNewEventArgs)", "summary", "df-generated"]
-      - ["System.ComponentModel", "BindingList<T>", "OnListChanged", "(System.ComponentModel.ListChangedEventArgs)", "summary", "df-generated"]
+      - ["System.ComponentModel", "BindingList<T>", "InsertItem", "(System.Int32,T)", "summary", "df-generated"]
       - ["System.ComponentModel", "BindingList<T>", "RemoveIndex", "(System.ComponentModel.PropertyDescriptor)", "summary", "df-generated"]
       - ["System.ComponentModel", "BindingList<T>", "RemoveItem", "(System.Int32)", "summary", "df-generated"]
       - ["System.ComponentModel", "BindingList<T>", "RemoveSort", "()", "summary", "df-generated"]
       - ["System.ComponentModel", "BindingList<T>", "RemoveSortCore", "()", "summary", "df-generated"]
       - ["System.ComponentModel", "BindingList<T>", "ResetBindings", "()", "summary", "df-generated"]
       - ["System.ComponentModel", "BindingList<T>", "ResetItem", "(System.Int32)", "summary", "df-generated"]
+      - ["System.ComponentModel", "BindingList<T>", "SetItem", "(System.Int32,T)", "summary", "df-generated"]
+      - ["System.ComponentModel", "BindingList<T>", "add_AddingNew", "(System.ComponentModel.AddingNewEventHandler)", "summary", "df-generated"]
+      - ["System.ComponentModel", "BindingList<T>", "add_ListChanged", "(System.ComponentModel.ListChangedEventHandler)", "summary", "df-generated"]
       - ["System.ComponentModel", "BindingList<T>", "get_AllowEdit", "()", "summary", "df-generated"]
       - ["System.ComponentModel", "BindingList<T>", "get_AllowNew", "()", "summary", "df-generated"]
       - ["System.ComponentModel", "BindingList<T>", "get_AllowRemove", "()", "summary", "df-generated"]
@@ -291,6 +291,8 @@ extensions:
       - ["System.ComponentModel", "BindingList<T>", "get_SupportsSearchingCore", "()", "summary", "df-generated"]
       - ["System.ComponentModel", "BindingList<T>", "get_SupportsSorting", "()", "summary", "df-generated"]
       - ["System.ComponentModel", "BindingList<T>", "get_SupportsSortingCore", "()", "summary", "df-generated"]
+      - ["System.ComponentModel", "BindingList<T>", "remove_AddingNew", "(System.ComponentModel.AddingNewEventHandler)", "summary", "df-generated"]
+      - ["System.ComponentModel", "BindingList<T>", "remove_ListChanged", "(System.ComponentModel.ListChangedEventHandler)", "summary", "df-generated"]
       - ["System.ComponentModel", "BooleanConverter", "CanConvertFrom", "(System.ComponentModel.ITypeDescriptorContext,System.Type)", "summary", "df-generated"]
       - ["System.ComponentModel", "BooleanConverter", "GetStandardValuesExclusive", "(System.ComponentModel.ITypeDescriptorContext)", "summary", "df-generated"]
       - ["System.ComponentModel", "BooleanConverter", "GetStandardValuesSupported", "(System.ComponentModel.ITypeDescriptorContext)", "summary", "df-generated"]
@@ -331,9 +333,11 @@ extensions:
       - ["System.ComponentModel", "Component", "Dispose", "()", "summary", "df-generated"]
       - ["System.ComponentModel", "Component", "Dispose", "(System.Boolean)", "summary", "df-generated"]
       - ["System.ComponentModel", "Component", "GetService", "(System.Type)", "summary", "df-generated"]
+      - ["System.ComponentModel", "Component", "add_Disposed", "(System.EventHandler)", "summary", "df-generated"]
       - ["System.ComponentModel", "Component", "get_CanRaiseEvents", "()", "summary", "df-generated"]
       - ["System.ComponentModel", "Component", "get_DesignMode", "()", "summary", "df-generated"]
       - ["System.ComponentModel", "Component", "get_Events", "()", "summary", "df-generated"]
+      - ["System.ComponentModel", "Component", "remove_Disposed", "(System.EventHandler)", "summary", "df-generated"]
       - ["System.ComponentModel", "ComponentConverter", "ComponentConverter", "(System.Type)", "summary", "df-generated"]
       - ["System.ComponentModel", "ComponentConverter", "GetPropertiesSupported", "(System.ComponentModel.ITypeDescriptorContext)", "summary", "df-generated"]
       - ["System.ComponentModel", "ComponentEditor", "EditComponent", "(System.ComponentModel.ITypeDescriptorContext,System.Object)", "summary", "df-generated"]
@@ -350,6 +354,7 @@ extensions:
       - ["System.ComponentModel", "CultureInfoConverter", "CanConvertTo", "(System.ComponentModel.ITypeDescriptorContext,System.Type)", "summary", "df-generated"]
       - ["System.ComponentModel", "CultureInfoConverter", "GetStandardValuesExclusive", "(System.ComponentModel.ITypeDescriptorContext)", "summary", "df-generated"]
       - ["System.ComponentModel", "CultureInfoConverter", "GetStandardValuesSupported", "(System.ComponentModel.ITypeDescriptorContext)", "summary", "df-generated"]
+      - ["System.ComponentModel", "CustomTypeDescriptor", "GetAttributes", "()", "summary", "df-generated"]
       - ["System.ComponentModel", "CustomTypeDescriptor", "GetClassName", "()", "summary", "df-generated"]
       - ["System.ComponentModel", "CustomTypeDescriptor", "GetComponentName", "()", "summary", "df-generated"]
       - ["System.ComponentModel", "CustomTypeDescriptor", "GetConverter", "()", "summary", "df-generated"]
@@ -415,7 +420,6 @@ extensions:
       - ["System.ComponentModel", "DefaultValueAttribute", "DefaultValueAttribute", "(System.UInt64)", "summary", "df-generated"]
       - ["System.ComponentModel", "DefaultValueAttribute", "Equals", "(System.Object)", "summary", "df-generated"]
       - ["System.ComponentModel", "DefaultValueAttribute", "GetHashCode", "()", "summary", "df-generated"]
-      - ["System.ComponentModel", "DescriptionAttribute", "DescriptionAttribute", "(System.String)", "summary", "df-generated"]
       - ["System.ComponentModel", "DescriptionAttribute", "Equals", "(System.Object)", "summary", "df-generated"]
       - ["System.ComponentModel", "DescriptionAttribute", "GetHashCode", "()", "summary", "df-generated"]
       - ["System.ComponentModel", "DescriptionAttribute", "IsDefaultAttribute", "()", "summary", "df-generated"]
@@ -489,6 +493,7 @@ extensions:
       - ["System.ComponentModel", "EventDescriptorCollection", "InternalSort", "(System.Collections.IComparer)", "summary", "df-generated"]
       - ["System.ComponentModel", "EventDescriptorCollection", "InternalSort", "(System.String[])", "summary", "df-generated"]
       - ["System.ComponentModel", "EventDescriptorCollection", "Remove", "(System.ComponentModel.EventDescriptor)", "summary", "df-generated"]
+      - ["System.ComponentModel", "EventDescriptorCollection", "Remove", "(System.Object)", "summary", "df-generated"]
       - ["System.ComponentModel", "EventDescriptorCollection", "RemoveAt", "(System.Int32)", "summary", "df-generated"]
       - ["System.ComponentModel", "EventDescriptorCollection", "get_Count", "()", "summary", "df-generated"]
       - ["System.ComponentModel", "EventDescriptorCollection", "get_IsFixedSize", "()", "summary", "df-generated"]
@@ -504,16 +509,20 @@ extensions:
       - ["System.ComponentModel", "GuidConverter", "CanConvertTo", "(System.ComponentModel.ITypeDescriptorContext,System.Type)", "summary", "df-generated"]
       - ["System.ComponentModel", "HandledEventArgs", "HandledEventArgs", "(System.Boolean)", "summary", "df-generated"]
       - ["System.ComponentModel", "IBindingList", "AddIndex", "(System.ComponentModel.PropertyDescriptor)", "summary", "df-generated"]
+      - ["System.ComponentModel", "IBindingList", "AddNew", "()", "summary", "df-generated"]
       - ["System.ComponentModel", "IBindingList", "RemoveIndex", "(System.ComponentModel.PropertyDescriptor)", "summary", "df-generated"]
       - ["System.ComponentModel", "IBindingList", "RemoveSort", "()", "summary", "df-generated"]
+      - ["System.ComponentModel", "IBindingList", "add_ListChanged", "(System.ComponentModel.ListChangedEventHandler)", "summary", "df-generated"]
       - ["System.ComponentModel", "IBindingList", "get_AllowEdit", "()", "summary", "df-generated"]
       - ["System.ComponentModel", "IBindingList", "get_AllowNew", "()", "summary", "df-generated"]
       - ["System.ComponentModel", "IBindingList", "get_AllowRemove", "()", "summary", "df-generated"]
       - ["System.ComponentModel", "IBindingList", "get_IsSorted", "()", "summary", "df-generated"]
       - ["System.ComponentModel", "IBindingList", "get_SortDirection", "()", "summary", "df-generated"]
+      - ["System.ComponentModel", "IBindingList", "get_SortProperty", "()", "summary", "df-generated"]
       - ["System.ComponentModel", "IBindingList", "get_SupportsChangeNotification", "()", "summary", "df-generated"]
       - ["System.ComponentModel", "IBindingList", "get_SupportsSearching", "()", "summary", "df-generated"]
       - ["System.ComponentModel", "IBindingList", "get_SupportsSorting", "()", "summary", "df-generated"]
+      - ["System.ComponentModel", "IBindingList", "remove_ListChanged", "(System.ComponentModel.ListChangedEventHandler)", "summary", "df-generated"]
       - ["System.ComponentModel", "IBindingListView", "RemoveFilter", "()", "summary", "df-generated"]
       - ["System.ComponentModel", "IBindingListView", "get_SortDescriptions", "()", "summary", "df-generated"]
       - ["System.ComponentModel", "IBindingListView", "get_SupportsAdvancedSorting", "()", "summary", "df-generated"]
@@ -534,7 +543,10 @@ extensions:
       - ["System.ComponentModel", "IComNativeDescriptorHandler", "GetProperties", "(System.Object,System.Attribute[])", "summary", "df-generated"]
       - ["System.ComponentModel", "IComNativeDescriptorHandler", "GetPropertyValue", "(System.Object,System.Int32,System.Boolean)", "summary", "df-generated"]
       - ["System.ComponentModel", "IComNativeDescriptorHandler", "GetPropertyValue", "(System.Object,System.String,System.Boolean)", "summary", "df-generated"]
+      - ["System.ComponentModel", "IComponent", "add_Disposed", "(System.EventHandler)", "summary", "df-generated"]
+      - ["System.ComponentModel", "IComponent", "remove_Disposed", "(System.EventHandler)", "summary", "df-generated"]
       - ["System.ComponentModel", "IContainer", "Remove", "(System.ComponentModel.IComponent)", "summary", "df-generated"]
+      - ["System.ComponentModel", "ICustomTypeDescriptor", "GetAttributes", "()", "summary", "df-generated"]
       - ["System.ComponentModel", "ICustomTypeDescriptor", "GetClassName", "()", "summary", "df-generated"]
       - ["System.ComponentModel", "ICustomTypeDescriptor", "GetComponentName", "()", "summary", "df-generated"]
       - ["System.ComponentModel", "ICustomTypeDescriptor", "GetConverter", "()", "summary", "df-generated"]
@@ -543,6 +555,7 @@ extensions:
       - ["System.ComponentModel", "ICustomTypeDescriptor", "GetEditor", "(System.Type)", "summary", "df-generated"]
       - ["System.ComponentModel", "ICustomTypeDescriptor", "GetEvents", "()", "summary", "df-generated"]
       - ["System.ComponentModel", "ICustomTypeDescriptor", "GetEvents", "(System.Attribute[])", "summary", "df-generated"]
+      - ["System.ComponentModel", "IDataErrorInfo", "get_Error", "()", "summary", "df-generated"]
       - ["System.ComponentModel", "IDataErrorInfo", "get_Item", "(System.String)", "summary", "df-generated"]
       - ["System.ComponentModel", "IEditableObject", "BeginEdit", "()", "summary", "df-generated"]
       - ["System.ComponentModel", "IEditableObject", "CancelEdit", "()", "summary", "df-generated"]
@@ -553,7 +566,13 @@ extensions:
       - ["System.ComponentModel", "IListSource", "get_ContainsListCollection", "()", "summary", "df-generated"]
       - ["System.ComponentModel", "INestedContainer", "get_Owner", "()", "summary", "df-generated"]
       - ["System.ComponentModel", "INotifyDataErrorInfo", "GetErrors", "(System.String)", "summary", "df-generated"]
+      - ["System.ComponentModel", "INotifyDataErrorInfo", "add_ErrorsChanged", "(System.EventHandler<System.ComponentModel.DataErrorsChangedEventArgs>)", "summary", "df-generated"]
       - ["System.ComponentModel", "INotifyDataErrorInfo", "get_HasErrors", "()", "summary", "df-generated"]
+      - ["System.ComponentModel", "INotifyDataErrorInfo", "remove_ErrorsChanged", "(System.EventHandler<System.ComponentModel.DataErrorsChangedEventArgs>)", "summary", "df-generated"]
+      - ["System.ComponentModel", "INotifyPropertyChanged", "add_PropertyChanged", "(System.ComponentModel.PropertyChangedEventHandler)", "summary", "df-generated"]
+      - ["System.ComponentModel", "INotifyPropertyChanged", "remove_PropertyChanged", "(System.ComponentModel.PropertyChangedEventHandler)", "summary", "df-generated"]
+      - ["System.ComponentModel", "INotifyPropertyChanging", "add_PropertyChanging", "(System.ComponentModel.PropertyChangingEventHandler)", "summary", "df-generated"]
+      - ["System.ComponentModel", "INotifyPropertyChanging", "remove_PropertyChanging", "(System.ComponentModel.PropertyChangingEventHandler)", "summary", "df-generated"]
       - ["System.ComponentModel", "IRaiseItemChangedEvents", "get_RaisesItemChangedEvents", "()", "summary", "df-generated"]
       - ["System.ComponentModel", "IRevertibleChangeTracking", "RejectChanges", "()", "summary", "df-generated"]
       - ["System.ComponentModel", "ISite", "get_Component", "()", "summary", "df-generated"]
@@ -561,7 +580,9 @@ extensions:
       - ["System.ComponentModel", "ISite", "get_DesignMode", "()", "summary", "df-generated"]
       - ["System.ComponentModel", "ISupportInitialize", "BeginInit", "()", "summary", "df-generated"]
       - ["System.ComponentModel", "ISupportInitialize", "EndInit", "()", "summary", "df-generated"]
+      - ["System.ComponentModel", "ISupportInitializeNotification", "add_Initialized", "(System.EventHandler)", "summary", "df-generated"]
       - ["System.ComponentModel", "ISupportInitializeNotification", "get_IsInitialized", "()", "summary", "df-generated"]
+      - ["System.ComponentModel", "ISupportInitializeNotification", "remove_Initialized", "(System.EventHandler)", "summary", "df-generated"]
       - ["System.ComponentModel", "ISynchronizeInvoke", "BeginInvoke", "(System.Delegate,System.Object[])", "summary", "df-generated"]
       - ["System.ComponentModel", "ISynchronizeInvoke", "EndInvoke", "(System.IAsyncResult)", "summary", "df-generated"]
       - ["System.ComponentModel", "ISynchronizeInvoke", "Invoke", "(System.Delegate,System.Object[])", "summary", "df-generated"]
@@ -637,6 +658,7 @@ extensions:
       - ["System.ComponentModel", "ListSortDescription", "ListSortDescription", "(System.ComponentModel.PropertyDescriptor,System.ComponentModel.ListSortDirection)", "summary", "df-generated"]
       - ["System.ComponentModel", "ListSortDescriptionCollection", "Contains", "(System.Object)", "summary", "df-generated"]
       - ["System.ComponentModel", "ListSortDescriptionCollection", "IndexOf", "(System.Object)", "summary", "df-generated"]
+      - ["System.ComponentModel", "ListSortDescriptionCollection", "Remove", "(System.Object)", "summary", "df-generated"]
       - ["System.ComponentModel", "ListSortDescriptionCollection", "RemoveAt", "(System.Int32)", "summary", "df-generated"]
       - ["System.ComponentModel", "ListSortDescriptionCollection", "get_Count", "()", "summary", "df-generated"]
       - ["System.ComponentModel", "ListSortDescriptionCollection", "get_IsFixedSize", "()", "summary", "df-generated"]
@@ -656,8 +678,10 @@ extensions:
       - ["System.ComponentModel", "LookupBindingPropertiesAttribute", "get_ValueMember", "()", "summary", "df-generated"]
       - ["System.ComponentModel", "MarshalByValueComponent", "Dispose", "()", "summary", "df-generated"]
       - ["System.ComponentModel", "MarshalByValueComponent", "Dispose", "(System.Boolean)", "summary", "df-generated"]
+      - ["System.ComponentModel", "MarshalByValueComponent", "add_Disposed", "(System.EventHandler)", "summary", "df-generated"]
       - ["System.ComponentModel", "MarshalByValueComponent", "get_DesignMode", "()", "summary", "df-generated"]
       - ["System.ComponentModel", "MarshalByValueComponent", "get_Events", "()", "summary", "df-generated"]
+      - ["System.ComponentModel", "MarshalByValueComponent", "remove_Disposed", "(System.EventHandler)", "summary", "df-generated"]
       - ["System.ComponentModel", "MaskedTextProvider", "Add", "(System.Char)", "summary", "df-generated"]
       - ["System.ComponentModel", "MaskedTextProvider", "Add", "(System.Char,System.Int32,System.ComponentModel.MaskedTextResultHint)", "summary", "df-generated"]
       - ["System.ComponentModel", "MaskedTextProvider", "Add", "(System.String)", "summary", "df-generated"]
@@ -720,6 +744,7 @@ extensions:
       - ["System.ComponentModel", "MaskedTextProvider", "get_Mask", "()", "summary", "df-generated"]
       - ["System.ComponentModel", "MaskedTextProvider", "get_MaskCompleted", "()", "summary", "df-generated"]
       - ["System.ComponentModel", "MaskedTextProvider", "get_MaskFull", "()", "summary", "df-generated"]
+      - ["System.ComponentModel", "MemberDescriptor", "CreateAttributeCollection", "()", "summary", "df-generated"]
       - ["System.ComponentModel", "MemberDescriptor", "Equals", "(System.Object)", "summary", "df-generated"]
       - ["System.ComponentModel", "MemberDescriptor", "FindMethod", "(System.Type,System.String,System.Type[],System.Type)", "summary", "df-generated"]
       - ["System.ComponentModel", "MemberDescriptor", "FindMethod", "(System.Type,System.String,System.Type[],System.Type,System.Boolean)", "summary", "df-generated"]
@@ -772,6 +797,7 @@ extensions:
       - ["System.ComponentModel", "PropertyChangedEventArgs", "get_PropertyName", "()", "summary", "df-generated"]
       - ["System.ComponentModel", "PropertyChangingEventArgs", "PropertyChangingEventArgs", "(System.String)", "summary", "df-generated"]
       - ["System.ComponentModel", "PropertyChangingEventArgs", "get_PropertyName", "()", "summary", "df-generated"]
+      - ["System.ComponentModel", "PropertyDescriptor", "AddValueChanged", "(System.Object,System.EventHandler)", "summary", "df-generated"]
       - ["System.ComponentModel", "PropertyDescriptor", "CanResetValue", "(System.Object)", "summary", "df-generated"]
       - ["System.ComponentModel", "PropertyDescriptor", "CreateInstance", "(System.Type)", "summary", "df-generated"]
       - ["System.ComponentModel", "PropertyDescriptor", "Equals", "(System.Object)", "summary", "df-generated"]
@@ -786,6 +812,7 @@ extensions:
       - ["System.ComponentModel", "PropertyDescriptor", "PropertyDescriptor", "(System.ComponentModel.MemberDescriptor)", "summary", "df-generated"]
       - ["System.ComponentModel", "PropertyDescriptor", "PropertyDescriptor", "(System.ComponentModel.MemberDescriptor,System.Attribute[])", "summary", "df-generated"]
       - ["System.ComponentModel", "PropertyDescriptor", "PropertyDescriptor", "(System.String,System.Attribute[])", "summary", "df-generated"]
+      - ["System.ComponentModel", "PropertyDescriptor", "RemoveValueChanged", "(System.Object,System.EventHandler)", "summary", "df-generated"]
       - ["System.ComponentModel", "PropertyDescriptor", "ShouldSerializeValue", "(System.Object)", "summary", "df-generated"]
       - ["System.ComponentModel", "PropertyDescriptor", "get_ComponentType", "()", "summary", "df-generated"]
       - ["System.ComponentModel", "PropertyDescriptor", "get_IsLocalizable", "()", "summary", "df-generated"]
@@ -800,6 +827,7 @@ extensions:
       - ["System.ComponentModel", "PropertyDescriptorCollection", "InternalSort", "(System.Collections.IComparer)", "summary", "df-generated"]
       - ["System.ComponentModel", "PropertyDescriptorCollection", "InternalSort", "(System.String[])", "summary", "df-generated"]
       - ["System.ComponentModel", "PropertyDescriptorCollection", "Remove", "(System.ComponentModel.PropertyDescriptor)", "summary", "df-generated"]
+      - ["System.ComponentModel", "PropertyDescriptorCollection", "Remove", "(System.Object)", "summary", "df-generated"]
       - ["System.ComponentModel", "PropertyDescriptorCollection", "RemoveAt", "(System.Int32)", "summary", "df-generated"]
       - ["System.ComponentModel", "PropertyDescriptorCollection", "get_Count", "()", "summary", "df-generated"]
       - ["System.ComponentModel", "PropertyDescriptorCollection", "get_IsFixedSize", "()", "summary", "df-generated"]
@@ -971,8 +999,10 @@ extensions:
       - ["System.ComponentModel", "TypeDescriptor", "RemoveProviderTransparent", "(System.ComponentModel.TypeDescriptionProvider,System.Object)", "summary", "df-generated"]
       - ["System.ComponentModel", "TypeDescriptor", "RemoveProviderTransparent", "(System.ComponentModel.TypeDescriptionProvider,System.Type)", "summary", "df-generated"]
       - ["System.ComponentModel", "TypeDescriptor", "SortDescriptorArray", "(System.Collections.IList)", "summary", "df-generated"]
+      - ["System.ComponentModel", "TypeDescriptor", "add_Refreshed", "(System.ComponentModel.RefreshEventHandler)", "summary", "df-generated"]
       - ["System.ComponentModel", "TypeDescriptor", "get_ComObjectType", "()", "summary", "df-generated"]
       - ["System.ComponentModel", "TypeDescriptor", "get_InterfaceType", "()", "summary", "df-generated"]
+      - ["System.ComponentModel", "TypeDescriptor", "remove_Refreshed", "(System.ComponentModel.RefreshEventHandler)", "summary", "df-generated"]
       - ["System.ComponentModel", "TypeListConverter", "CanConvertFrom", "(System.ComponentModel.ITypeDescriptorContext,System.Type)", "summary", "df-generated"]
       - ["System.ComponentModel", "TypeListConverter", "CanConvertTo", "(System.ComponentModel.ITypeDescriptorContext,System.Type)", "summary", "df-generated"]
       - ["System.ComponentModel", "TypeListConverter", "GetStandardValuesExclusive", "(System.ComponentModel.ITypeDescriptorContext)", "summary", "df-generated"]
diff --git a/csharp/ql/lib/ext/generated/System.Composition.Convention.model.yml b/csharp/ql/lib/ext/generated/System.Composition.Convention.model.yml
index d84a2718b84..a35c00574db 100644
--- a/csharp/ql/lib/ext/generated/System.Composition.Convention.model.yml
+++ b/csharp/ql/lib/ext/generated/System.Composition.Convention.model.yml
@@ -4,31 +4,51 @@ extensions:
       pack: codeql/csharp-all
       extensible: summaryModel
     data:
-      - ["System.Composition.Convention", "ExportConventionBuilder", False, "AddMetadata", "(System.String,System.Object)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["System.Composition.Convention", "ExportConventionBuilder", False, "AsContractName", "(System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Composition.Convention", "ExportConventionBuilder", False, "AsContractName", "(System.String)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["System.Composition.Convention", "ExportConventionBuilder", False, "AsContractType", "(System.Type)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["System.Composition.Convention", "ExportConventionBuilder", False, "AsContractType<T>", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Composition.Convention", "ImportConventionBuilder", False, "AddMetadataConstraint", "(System.String,System.Object)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["System.Composition.Convention", "ImportConventionBuilder", False, "AllowDefault", "()", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["System.Composition.Convention", "ImportConventionBuilder", False, "AsContractName", "(System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Composition.Convention", "ImportConventionBuilder", False, "AsContractName", "(System.String)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["System.Composition.Convention", "ImportConventionBuilder", False, "AsMany", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Composition.Convention", "ImportConventionBuilder", False, "AsMany", "(System.Boolean)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["System.Composition.Convention", "PartConventionBuilder", False, "AddPartMetadata", "(System.String,System.Object)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["System.Composition.Convention", "PartConventionBuilder", False, "Export", "()", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["System.Composition.Convention", "PartConventionBuilder", False, "Export<T>", "()", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["System.Composition.Convention", "PartConventionBuilder", False, "ExportInterfaces", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Composition.Convention", "PartConventionBuilder", False, "Shared", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Composition.Convention", "PartConventionBuilder", False, "Shared", "(System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Composition.Convention", "PartConventionBuilder", False, "Shared", "(System.String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Composition.Convention", "PartConventionBuilder", False, "Shared", "(System.String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Composition.Convention", "PartConventionBuilder<T>", False, "ExportProperty", "(System.Linq.Expressions.Expression<System.Func<T,System.Object>>)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Composition.Convention", "PartConventionBuilder<T>", False, "ExportProperty<TContract>", "(System.Linq.Expressions.Expression<System.Func<T,System.Object>>)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Composition.Convention", "PartConventionBuilder<T>", False, "ImportProperty", "(System.Linq.Expressions.Expression<System.Func<T,System.Object>>)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Composition.Convention", "PartConventionBuilder<T>", False, "ImportProperty<TContract>", "(System.Linq.Expressions.Expression<System.Func<T,System.Object>>)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Composition.Convention", "PartConventionBuilder<T>", False, "NotifyImportsSatisfied", "(System.Linq.Expressions.Expression<System.Action<T>>)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["System.Composition.Convention", "PartConventionBuilder<T>", False, "SelectConstructor", "(System.Linq.Expressions.Expression<System.Func<System.Composition.Convention.ParameterImportConventionBuilder,T>>)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["System.Composition.Convention", "ExportConventionBuilder", False, "AddMetadata", "(System.String,System.Func<System.Type,System.Object>)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Composition.Convention", "ExportConventionBuilder", False, "AddMetadata", "(System.String,System.Object)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Composition.Convention", "ExportConventionBuilder", False, "AsContractName", "(System.Func<System.Type,System.String>)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Composition.Convention", "ExportConventionBuilder", False, "AsContractName", "(System.String)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Composition.Convention", "ExportConventionBuilder", False, "AsContractType", "(System.Type)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Composition.Convention", "ExportConventionBuilder", False, "AsContractType<T>", "()", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Composition.Convention", "ImportConventionBuilder", False, "AddMetadataConstraint", "(System.String,System.Func<System.Type,System.Object>)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Composition.Convention", "ImportConventionBuilder", False, "AddMetadataConstraint", "(System.String,System.Object)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Composition.Convention", "ImportConventionBuilder", False, "AllowDefault", "()", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Composition.Convention", "ImportConventionBuilder", False, "AsContractName", "(System.Func<System.Type,System.String>)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Composition.Convention", "ImportConventionBuilder", False, "AsContractName", "(System.String)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Composition.Convention", "ImportConventionBuilder", False, "AsMany", "()", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Composition.Convention", "ImportConventionBuilder", False, "AsMany", "(System.Boolean)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Composition.Convention", "PartConventionBuilder", False, "AddPartMetadata", "(System.String,System.Func<System.Type,System.Object>)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Composition.Convention", "PartConventionBuilder", False, "AddPartMetadata", "(System.String,System.Object)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Composition.Convention", "PartConventionBuilder", False, "Export", "()", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Composition.Convention", "PartConventionBuilder", False, "Export", "(System.Action<System.Composition.Convention.ExportConventionBuilder>)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Composition.Convention", "PartConventionBuilder", False, "Export<T>", "()", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Composition.Convention", "PartConventionBuilder", False, "Export<T>", "(System.Action<System.Composition.Convention.ExportConventionBuilder>)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Composition.Convention", "PartConventionBuilder", False, "ExportInterfaces", "()", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Composition.Convention", "PartConventionBuilder", False, "ExportInterfaces", "(System.Predicate<System.Type>)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Composition.Convention", "PartConventionBuilder", False, "ExportInterfaces", "(System.Predicate<System.Type>,System.Action<System.Type,System.Composition.Convention.ExportConventionBuilder>)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Composition.Convention", "PartConventionBuilder", False, "ExportProperties", "(System.Predicate<System.Reflection.PropertyInfo>)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Composition.Convention", "PartConventionBuilder", False, "ExportProperties", "(System.Predicate<System.Reflection.PropertyInfo>,System.Action<System.Reflection.PropertyInfo,System.Composition.Convention.ExportConventionBuilder>)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Composition.Convention", "PartConventionBuilder", False, "ExportProperties<T>", "(System.Predicate<System.Reflection.PropertyInfo>)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Composition.Convention", "PartConventionBuilder", False, "ExportProperties<T>", "(System.Predicate<System.Reflection.PropertyInfo>,System.Action<System.Reflection.PropertyInfo,System.Composition.Convention.ExportConventionBuilder>)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Composition.Convention", "PartConventionBuilder", False, "ImportProperties", "(System.Predicate<System.Reflection.PropertyInfo>)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Composition.Convention", "PartConventionBuilder", False, "ImportProperties", "(System.Predicate<System.Reflection.PropertyInfo>,System.Action<System.Reflection.PropertyInfo,System.Composition.Convention.ImportConventionBuilder>)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Composition.Convention", "PartConventionBuilder", False, "ImportProperties<T>", "(System.Predicate<System.Reflection.PropertyInfo>)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Composition.Convention", "PartConventionBuilder", False, "ImportProperties<T>", "(System.Predicate<System.Reflection.PropertyInfo>,System.Action<System.Reflection.PropertyInfo,System.Composition.Convention.ImportConventionBuilder>)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Composition.Convention", "PartConventionBuilder", False, "NotifyImportsSatisfied", "(System.Predicate<System.Reflection.MethodInfo>)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Composition.Convention", "PartConventionBuilder", False, "SelectConstructor", "(System.Func<System.Collections.Generic.IEnumerable<System.Reflection.ConstructorInfo>,System.Reflection.ConstructorInfo>)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Composition.Convention", "PartConventionBuilder", False, "SelectConstructor", "(System.Func<System.Collections.Generic.IEnumerable<System.Reflection.ConstructorInfo>,System.Reflection.ConstructorInfo>,System.Action<System.Reflection.ParameterInfo,System.Composition.Convention.ImportConventionBuilder>)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Composition.Convention", "PartConventionBuilder", False, "Shared", "()", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Composition.Convention", "PartConventionBuilder", False, "Shared", "(System.String)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Composition.Convention", "PartConventionBuilder<T>", False, "ExportProperty", "(System.Linq.Expressions.Expression<System.Func<T,System.Object>>)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Composition.Convention", "PartConventionBuilder<T>", False, "ExportProperty", "(System.Linq.Expressions.Expression<System.Func<T,System.Object>>,System.Action<System.Composition.Convention.ExportConventionBuilder>)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Composition.Convention", "PartConventionBuilder<T>", False, "ExportProperty<TContract>", "(System.Linq.Expressions.Expression<System.Func<T,System.Object>>)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Composition.Convention", "PartConventionBuilder<T>", False, "ExportProperty<TContract>", "(System.Linq.Expressions.Expression<System.Func<T,System.Object>>,System.Action<System.Composition.Convention.ExportConventionBuilder>)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Composition.Convention", "PartConventionBuilder<T>", False, "ImportProperty", "(System.Linq.Expressions.Expression<System.Func<T,System.Object>>)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Composition.Convention", "PartConventionBuilder<T>", False, "ImportProperty", "(System.Linq.Expressions.Expression<System.Func<T,System.Object>>,System.Action<System.Composition.Convention.ImportConventionBuilder>)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Composition.Convention", "PartConventionBuilder<T>", False, "ImportProperty<TContract>", "(System.Linq.Expressions.Expression<System.Func<T,System.Object>>)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Composition.Convention", "PartConventionBuilder<T>", False, "ImportProperty<TContract>", "(System.Linq.Expressions.Expression<System.Func<T,System.Object>>,System.Action<System.Composition.Convention.ImportConventionBuilder>)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Composition.Convention", "PartConventionBuilder<T>", False, "NotifyImportsSatisfied", "(System.Linq.Expressions.Expression<System.Action<T>>)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Composition.Convention", "PartConventionBuilder<T>", False, "SelectConstructor", "(System.Linq.Expressions.Expression<System.Func<System.Composition.Convention.ParameterImportConventionBuilder,T>>)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
   - addsTo:
       pack: codeql/csharp-all
       extensible: neutralModel
@@ -39,6 +59,9 @@ extensions:
       - ["System.Composition.Convention", "ConventionBuilder", "ForType<T>", "()", "summary", "df-generated"]
       - ["System.Composition.Convention", "ConventionBuilder", "ForTypesDerivedFrom", "(System.Type)", "summary", "df-generated"]
       - ["System.Composition.Convention", "ConventionBuilder", "ForTypesDerivedFrom<T>", "()", "summary", "df-generated"]
+      - ["System.Composition.Convention", "ConventionBuilder", "ForTypesMatching", "(System.Predicate<System.Type>)", "summary", "df-generated"]
+      - ["System.Composition.Convention", "ConventionBuilder", "ForTypesMatching<T>", "(System.Predicate<System.Type>)", "summary", "df-generated"]
       - ["System.Composition.Convention", "ConventionBuilder", "GetCustomAttributes", "(System.Type,System.Reflection.MemberInfo)", "summary", "df-generated"]
       - ["System.Composition.Convention", "ConventionBuilder", "GetCustomAttributes", "(System.Type,System.Reflection.ParameterInfo)", "summary", "df-generated"]
       - ["System.Composition.Convention", "ParameterImportConventionBuilder", "Import<T>", "()", "summary", "df-generated"]
+      - ["System.Composition.Convention", "ParameterImportConventionBuilder", "Import<T>", "(System.Action<System.Composition.Convention.ImportConventionBuilder>)", "summary", "df-generated"]
diff --git a/csharp/ql/lib/ext/generated/System.Composition.Hosting.Core.model.yml b/csharp/ql/lib/ext/generated/System.Composition.Hosting.Core.model.yml
index 3e6a00e3dcb..1f9acd8139b 100644
--- a/csharp/ql/lib/ext/generated/System.Composition.Hosting.Core.model.yml
+++ b/csharp/ql/lib/ext/generated/System.Composition.Hosting.Core.model.yml
@@ -4,43 +4,56 @@ extensions:
       pack: codeql/csharp-all
       extensible: summaryModel
     data:
-      - ["System.Composition.Hosting.Core", "CompositionContract", False, "ChangeType", "(System.Type)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Composition.Hosting.Core", "CompositionContract", False, "CompositionContract", "(System.Type,System.String,System.Collections.Generic.IDictionary<System.String,System.Object>)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Composition.Hosting.Core", "CompositionContract", False, "CompositionContract", "(System.Type,System.String,System.Collections.Generic.IDictionary<System.String,System.Object>)", "", "Argument[2].Element", "Argument[this]", "taint", "df-generated"]
-      - ["System.Composition.Hosting.Core", "CompositionContract", False, "ToString", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Composition.Hosting.Core", "CompositionContract", False, "TryUnwrapMetadataConstraint<T>", "(System.String,T,System.Composition.Hosting.Core.CompositionContract)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Composition.Hosting.Core", "CompositionContract", False, "get_ContractName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Composition.Hosting.Core", "CompositionContract", False, "get_MetadataConstraints", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Composition.Hosting.Core", "CompositionDependency", False, "Missing", "(System.Composition.Hosting.Core.CompositionContract,System.Object)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Composition.Hosting.Core", "CompositionDependency", False, "Missing", "(System.Composition.Hosting.Core.CompositionContract,System.Object)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Composition.Hosting.Core", "CompositionDependency", False, "Oversupplied", "(System.Composition.Hosting.Core.CompositionContract,System.Collections.Generic.IEnumerable<System.Composition.Hosting.Core.ExportDescriptorPromise>,System.Object)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Composition.Hosting.Core", "CompositionDependency", False, "Oversupplied", "(System.Composition.Hosting.Core.CompositionContract,System.Collections.Generic.IEnumerable<System.Composition.Hosting.Core.ExportDescriptorPromise>,System.Object)", "", "Argument[1].Element", "ReturnValue", "taint", "df-generated"]
-      - ["System.Composition.Hosting.Core", "CompositionDependency", False, "Oversupplied", "(System.Composition.Hosting.Core.CompositionContract,System.Collections.Generic.IEnumerable<System.Composition.Hosting.Core.ExportDescriptorPromise>,System.Object)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Composition.Hosting.Core", "CompositionDependency", False, "Satisfied", "(System.Composition.Hosting.Core.CompositionContract,System.Composition.Hosting.Core.ExportDescriptorPromise,System.Boolean,System.Object)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Composition.Hosting.Core", "CompositionDependency", False, "Satisfied", "(System.Composition.Hosting.Core.CompositionContract,System.Composition.Hosting.Core.ExportDescriptorPromise,System.Boolean,System.Object)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Composition.Hosting.Core", "CompositionDependency", False, "Satisfied", "(System.Composition.Hosting.Core.CompositionContract,System.Composition.Hosting.Core.ExportDescriptorPromise,System.Boolean,System.Object)", "", "Argument[3]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Composition.Hosting.Core", "CompositionContract", False, "ChangeType", "(System.Type)", "", "Argument[this].SyntheticField[System.Composition.Hosting.Core.CompositionContract._contractName]", "ReturnValue.SyntheticField[System.Composition.Hosting.Core.CompositionContract._contractName]", "value", "dfc-generated"]
+      - ["System.Composition.Hosting.Core", "CompositionContract", False, "ChangeType", "(System.Type)", "", "Argument[this].SyntheticField[System.Composition.Hosting.Core.CompositionContract._metadataConstraints]", "ReturnValue.SyntheticField[System.Composition.Hosting.Core.CompositionContract._metadataConstraints]", "value", "dfc-generated"]
+      - ["System.Composition.Hosting.Core", "CompositionContract", False, "CompositionContract", "(System.Type,System.String,System.Collections.Generic.IDictionary<System.String,System.Object>)", "", "Argument[1]", "Argument[this].SyntheticField[System.Composition.Hosting.Core.CompositionContract._contractName]", "value", "dfc-generated"]
+      - ["System.Composition.Hosting.Core", "CompositionContract", False, "CompositionContract", "(System.Type,System.String,System.Collections.Generic.IDictionary<System.String,System.Object>)", "", "Argument[2]", "Argument[this].SyntheticField[System.Composition.Hosting.Core.CompositionContract._metadataConstraints]", "value", "dfc-generated"]
+      - ["System.Composition.Hosting.Core", "CompositionContract", False, "ToString", "()", "", "Argument[this].SyntheticField[System.Composition.Hosting.Core.CompositionContract._contractName]", "ReturnValue", "taint", "dfc-generated"]
+      - ["System.Composition.Hosting.Core", "CompositionContract", False, "TryUnwrapMetadataConstraint<T>", "(System.String,T,System.Composition.Hosting.Core.CompositionContract)", "", "Argument[this].SyntheticField[System.Composition.Hosting.Core.CompositionContract._contractName]", "ReturnValue.SyntheticField[System.Composition.Hosting.Core.CompositionContract._contractName]", "value", "dfc-generated"]
+      - ["System.Composition.Hosting.Core", "CompositionContract", False, "get_ContractName", "()", "", "Argument[this].SyntheticField[System.Composition.Hosting.Core.CompositionContract._contractName]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Composition.Hosting.Core", "CompositionContract", False, "get_MetadataConstraints", "()", "", "Argument[this].SyntheticField[System.Composition.Hosting.Core.CompositionContract._metadataConstraints]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Composition.Hosting.Core", "CompositionDependency", False, "Missing", "(System.Composition.Hosting.Core.CompositionContract,System.Object)", "", "Argument[0]", "ReturnValue.SyntheticField[System.Composition.Hosting.Core.CompositionDependency._contract]", "value", "dfc-generated"]
+      - ["System.Composition.Hosting.Core", "CompositionDependency", False, "Missing", "(System.Composition.Hosting.Core.CompositionContract,System.Object)", "", "Argument[1]", "ReturnValue.SyntheticField[System.Composition.Hosting.Core.CompositionDependency._site]", "value", "dfc-generated"]
+      - ["System.Composition.Hosting.Core", "CompositionDependency", False, "Oversupplied", "(System.Composition.Hosting.Core.CompositionContract,System.Collections.Generic.IEnumerable<System.Composition.Hosting.Core.ExportDescriptorPromise>,System.Object)", "", "Argument[0]", "ReturnValue.SyntheticField[System.Composition.Hosting.Core.CompositionDependency._contract]", "value", "dfc-generated"]
+      - ["System.Composition.Hosting.Core", "CompositionDependency", False, "Oversupplied", "(System.Composition.Hosting.Core.CompositionContract,System.Collections.Generic.IEnumerable<System.Composition.Hosting.Core.ExportDescriptorPromise>,System.Object)", "", "Argument[2]", "ReturnValue.SyntheticField[System.Composition.Hosting.Core.CompositionDependency._site]", "value", "dfc-generated"]
+      - ["System.Composition.Hosting.Core", "CompositionDependency", False, "Satisfied", "(System.Composition.Hosting.Core.CompositionContract,System.Composition.Hosting.Core.ExportDescriptorPromise,System.Boolean,System.Object)", "", "Argument[0]", "ReturnValue.SyntheticField[System.Composition.Hosting.Core.CompositionDependency._contract]", "value", "dfc-generated"]
+      - ["System.Composition.Hosting.Core", "CompositionDependency", False, "Satisfied", "(System.Composition.Hosting.Core.CompositionContract,System.Composition.Hosting.Core.ExportDescriptorPromise,System.Boolean,System.Object)", "", "Argument[1]", "ReturnValue.SyntheticField[System.Composition.Hosting.Core.CompositionDependency._target]", "value", "dfc-generated"]
+      - ["System.Composition.Hosting.Core", "CompositionDependency", False, "Satisfied", "(System.Composition.Hosting.Core.CompositionContract,System.Composition.Hosting.Core.ExportDescriptorPromise,System.Boolean,System.Object)", "", "Argument[3]", "ReturnValue.SyntheticField[System.Composition.Hosting.Core.CompositionDependency._site]", "value", "dfc-generated"]
       - ["System.Composition.Hosting.Core", "CompositionDependency", False, "ToString", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Composition.Hosting.Core", "CompositionDependency", False, "get_Contract", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Composition.Hosting.Core", "CompositionDependency", False, "get_Site", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Composition.Hosting.Core", "CompositionDependency", False, "get_Target", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Composition.Hosting.Core", "CompositionDependency", False, "get_Contract", "()", "", "Argument[this].SyntheticField[System.Composition.Hosting.Core.CompositionDependency._contract]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Composition.Hosting.Core", "CompositionDependency", False, "get_Site", "()", "", "Argument[this].SyntheticField[System.Composition.Hosting.Core.CompositionDependency._site]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Composition.Hosting.Core", "CompositionDependency", False, "get_Target", "()", "", "Argument[this].SyntheticField[System.Composition.Hosting.Core.CompositionDependency._target]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Composition.Hosting.Core", "CompositionOperation", False, "Run", "(System.Composition.Hosting.Core.LifetimeContext,System.Composition.Hosting.Core.CompositeActivator)", "", "Argument[1].ReturnValue", "ReturnValue", "value", "dfc-generated"]
       - ["System.Composition.Hosting.Core", "DependencyAccessor", False, "ResolveDependencies", "(System.Object,System.Composition.Hosting.Core.CompositionContract,System.Boolean)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["System.Composition.Hosting.Core", "DependencyAccessor", False, "ResolveDependencies", "(System.Object,System.Composition.Hosting.Core.CompositionContract,System.Boolean)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Composition.Hosting.Core", "DependencyAccessor", False, "ResolveRequiredDependency", "(System.Object,System.Composition.Hosting.Core.CompositionContract,System.Boolean)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Composition.Hosting.Core", "DependencyAccessor", False, "ResolveRequiredDependency", "(System.Object,System.Composition.Hosting.Core.CompositionContract,System.Boolean)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Composition.Hosting.Core", "DependencyAccessor", False, "TryResolveOptionalDependency", "(System.Object,System.Composition.Hosting.Core.CompositionContract,System.Boolean,System.Composition.Hosting.Core.CompositionDependency)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Composition.Hosting.Core", "DependencyAccessor", False, "TryResolveOptionalDependency", "(System.Object,System.Composition.Hosting.Core.CompositionContract,System.Boolean,System.Composition.Hosting.Core.CompositionDependency)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Composition.Hosting.Core", "DependencyAccessor", False, "ResolveRequiredDependency", "(System.Object,System.Composition.Hosting.Core.CompositionContract,System.Boolean)", "", "Argument[0]", "ReturnValue.SyntheticField[System.Composition.Hosting.Core.CompositionDependency._site]", "value", "dfc-generated"]
+      - ["System.Composition.Hosting.Core", "DependencyAccessor", False, "ResolveRequiredDependency", "(System.Object,System.Composition.Hosting.Core.CompositionContract,System.Boolean)", "", "Argument[1]", "ReturnValue.SyntheticField[System.Composition.Hosting.Core.CompositionDependency._contract]", "value", "dfc-generated"]
+      - ["System.Composition.Hosting.Core", "DependencyAccessor", False, "TryResolveOptionalDependency", "(System.Object,System.Composition.Hosting.Core.CompositionContract,System.Boolean,System.Composition.Hosting.Core.CompositionDependency)", "", "Argument[0]", "ReturnValue.SyntheticField[System.Composition.Hosting.Core.CompositionDependency._site]", "value", "dfc-generated"]
+      - ["System.Composition.Hosting.Core", "DependencyAccessor", False, "TryResolveOptionalDependency", "(System.Object,System.Composition.Hosting.Core.CompositionContract,System.Boolean,System.Composition.Hosting.Core.CompositionDependency)", "", "Argument[1]", "ReturnValue.SyntheticField[System.Composition.Hosting.Core.CompositionDependency._contract]", "value", "dfc-generated"]
+      - ["System.Composition.Hosting.Core", "DependencyAccessor", True, "GetPromises", "(System.Composition.Hosting.Core.CompositionContract)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Composition.Hosting.Core", "ExportDescriptor", False, "Create", "(System.Composition.Hosting.Core.CompositeActivator,System.Collections.Generic.IDictionary<System.String,System.Object>)", "", "Argument[0]", "ReturnValue.SyntheticField[System.Composition.Hosting.Core.DirectExportDescriptor._activator]", "value", "dfc-generated"]
+      - ["System.Composition.Hosting.Core", "ExportDescriptor", False, "Create", "(System.Composition.Hosting.Core.CompositeActivator,System.Collections.Generic.IDictionary<System.String,System.Object>)", "", "Argument[1]", "ReturnValue.SyntheticField[System.Composition.Hosting.Core.DirectExportDescriptor._metadata]", "value", "dfc-generated"]
       - ["System.Composition.Hosting.Core", "ExportDescriptor", True, "get_Activator", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Composition.Hosting.Core", "ExportDescriptor", True, "get_Metadata", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Composition.Hosting.Core", "ExportDescriptorPromise", False, "GetDescriptor", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Composition.Hosting.Core", "ExportDescriptorPromise", False, "ExportDescriptorPromise", "(System.Composition.Hosting.Core.CompositionContract,System.String,System.Boolean,System.Func<System.Collections.Generic.IEnumerable<System.Composition.Hosting.Core.CompositionDependency>>,System.Func<System.Collections.Generic.IEnumerable<System.Composition.Hosting.Core.CompositionDependency>,System.Composition.Hosting.Core.ExportDescriptor>)", "", "Argument[0]", "Argument[this].SyntheticField[System.Composition.Hosting.Core.ExportDescriptorPromise._contract]", "value", "dfc-generated"]
+      - ["System.Composition.Hosting.Core", "ExportDescriptorPromise", False, "ExportDescriptorPromise", "(System.Composition.Hosting.Core.CompositionContract,System.String,System.Boolean,System.Func<System.Collections.Generic.IEnumerable<System.Composition.Hosting.Core.CompositionDependency>>,System.Func<System.Collections.Generic.IEnumerable<System.Composition.Hosting.Core.CompositionDependency>,System.Composition.Hosting.Core.ExportDescriptor>)", "", "Argument[1]", "Argument[this].SyntheticField[System.Composition.Hosting.Core.ExportDescriptorPromise._origin]", "value", "dfc-generated"]
+      - ["System.Composition.Hosting.Core", "ExportDescriptorPromise", False, "ExportDescriptorPromise", "(System.Composition.Hosting.Core.CompositionContract,System.String,System.Boolean,System.Func<System.Collections.Generic.IEnumerable<System.Composition.Hosting.Core.CompositionDependency>>,System.Func<System.Collections.Generic.IEnumerable<System.Composition.Hosting.Core.CompositionDependency>,System.Composition.Hosting.Core.ExportDescriptor>)", "", "Argument[4].ReturnValue", "Argument[this].SyntheticField[System.Composition.Hosting.Core.ExportDescriptorPromise._descriptor].Property[System.Lazy`1.Value]", "value", "dfc-generated"]
+      - ["System.Composition.Hosting.Core", "ExportDescriptorPromise", False, "GetDescriptor", "()", "", "Argument[this].SyntheticField[System.Composition.Hosting.Core.ExportDescriptorPromise._descriptor].Property[System.Lazy`1.Value]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Composition.Hosting.Core", "ExportDescriptorPromise", False, "GetDescriptor", "()", "", "Argument[this].SyntheticField[System.Composition.Hosting.Core.ExportDescriptorPromise._descriptor]", "ReturnValue", "taint", "dfc-generated"]
       - ["System.Composition.Hosting.Core", "ExportDescriptorPromise", False, "ToString", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Composition.Hosting.Core", "ExportDescriptorPromise", False, "get_Contract", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Composition.Hosting.Core", "ExportDescriptorPromise", False, "get_Contract", "()", "", "Argument[this].SyntheticField[System.Composition.Hosting.Core.ExportDescriptorPromise._contract]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Composition.Hosting.Core", "ExportDescriptorPromise", False, "get_Dependencies", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Composition.Hosting.Core", "ExportDescriptorPromise", False, "get_Origin", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Composition.Hosting.Core", "ExportDescriptorPromise", False, "get_Origin", "()", "", "Argument[this].SyntheticField[System.Composition.Hosting.Core.ExportDescriptorPromise._origin]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Composition.Hosting.Core", "ExportDescriptorProvider", True, "GetExportDescriptors", "(System.Composition.Hosting.Core.CompositionContract,System.Composition.Hosting.Core.DependencyAccessor)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["System.Composition.Hosting.Core", "ExportDescriptorProvider", True, "GetExportDescriptors", "(System.Composition.Hosting.Core.CompositionContract,System.Composition.Hosting.Core.DependencyAccessor)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Composition.Hosting.Core", "LifetimeContext", False, "AddBoundInstance", "(System.IDisposable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Composition.Hosting.Core", "LifetimeContext", False, "FindContextWithin", "(System.String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Composition.Hosting.Core", "LifetimeContext", False, "GetOrCreate", "(System.Int32,System.Composition.Hosting.Core.CompositionOperation,System.Composition.Hosting.Core.CompositeActivator)", "", "Argument[1]", "Argument[2].Parameter[1]", "value", "dfc-generated"]
+      - ["System.Composition.Hosting.Core", "LifetimeContext", False, "GetOrCreate", "(System.Int32,System.Composition.Hosting.Core.CompositionOperation,System.Composition.Hosting.Core.CompositeActivator)", "", "Argument[2].ReturnValue", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Composition.Hosting.Core", "LifetimeContext", False, "GetOrCreate", "(System.Int32,System.Composition.Hosting.Core.CompositionOperation,System.Composition.Hosting.Core.CompositeActivator)", "", "Argument[this]", "Argument[2].Parameter[0]", "value", "dfc-generated"]
       - ["System.Composition.Hosting.Core", "LifetimeContext", False, "ToString", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Composition.Hosting.Core", "LifetimeContext", False, "TryGetExport", "(System.Composition.Hosting.Core.CompositionContract,System.Object)", "", "Argument[this]", "ReturnValue.Property[System.Lazy`1.Value].Property[System.Lazy`1.Value]", "value", "dfc-generated"]
+      - ["System.Composition.Hosting.Core", "LifetimeContext", False, "TryGetExport", "(System.Composition.Hosting.Core.CompositionContract,System.Object)", "", "Argument[this]", "ReturnValue.Property[System.Lazy`1.Value]", "value", "dfc-generated"]
   - addsTo:
       pack: codeql/csharp-all
       extensible: neutralModel
@@ -51,8 +64,9 @@ extensions:
       - ["System.Composition.Hosting.Core", "CompositionContract", "GetHashCode", "()", "summary", "df-generated"]
       - ["System.Composition.Hosting.Core", "CompositionContract", "get_ContractType", "()", "summary", "df-generated"]
       - ["System.Composition.Hosting.Core", "CompositionDependency", "get_IsPrerequisite", "()", "summary", "df-generated"]
+      - ["System.Composition.Hosting.Core", "CompositionOperation", "AddNonPrerequisiteAction", "(System.Action)", "summary", "df-generated"]
+      - ["System.Composition.Hosting.Core", "CompositionOperation", "AddPostCompositionAction", "(System.Action)", "summary", "df-generated"]
       - ["System.Composition.Hosting.Core", "CompositionOperation", "Dispose", "()", "summary", "df-generated"]
-      - ["System.Composition.Hosting.Core", "DependencyAccessor", "GetPromises", "(System.Composition.Hosting.Core.CompositionContract)", "summary", "df-generated"]
       - ["System.Composition.Hosting.Core", "ExportDescriptorPromise", "get_IsShared", "()", "summary", "df-generated"]
       - ["System.Composition.Hosting.Core", "LifetimeContext", "AllocateSharingId", "()", "summary", "df-generated"]
       - ["System.Composition.Hosting.Core", "LifetimeContext", "Dispose", "()", "summary", "df-generated"]
diff --git a/csharp/ql/lib/ext/generated/System.Composition.Hosting.model.yml b/csharp/ql/lib/ext/generated/System.Composition.Hosting.model.yml
index 18540ab1252..7f2b2cb5fd0 100644
--- a/csharp/ql/lib/ext/generated/System.Composition.Hosting.model.yml
+++ b/csharp/ql/lib/ext/generated/System.Composition.Hosting.model.yml
@@ -4,25 +4,23 @@ extensions:
       pack: codeql/csharp-all
       extensible: summaryModel
     data:
-      - ["System.Composition.Hosting", "ContainerConfiguration", False, "WithAssemblies", "(System.Collections.Generic.IEnumerable<System.Reflection.Assembly>)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Composition.Hosting", "ContainerConfiguration", False, "WithAssemblies", "(System.Collections.Generic.IEnumerable<System.Reflection.Assembly>,System.Composition.Convention.AttributedModelProvider)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Composition.Hosting", "ContainerConfiguration", False, "WithAssembly", "(System.Reflection.Assembly)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Composition.Hosting", "ContainerConfiguration", False, "WithAssembly", "(System.Reflection.Assembly,System.Composition.Convention.AttributedModelProvider)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Composition.Hosting", "ContainerConfiguration", False, "WithDefaultConventions", "(System.Composition.Convention.AttributedModelProvider)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Composition.Hosting", "ContainerConfiguration", False, "WithDefaultConventions", "(System.Composition.Convention.AttributedModelProvider)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["System.Composition.Hosting", "ContainerConfiguration", False, "WithExport", "(System.Type,System.Object)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Composition.Hosting", "ContainerConfiguration", False, "WithExport", "(System.Type,System.Object,System.String,System.Collections.Generic.IDictionary<System.String,System.Object>)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Composition.Hosting", "ContainerConfiguration", False, "WithExport<TExport>", "(TExport)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Composition.Hosting", "ContainerConfiguration", False, "WithExport<TExport>", "(TExport,System.String,System.Collections.Generic.IDictionary<System.String,System.Object>)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Composition.Hosting", "ContainerConfiguration", False, "WithPart", "(System.Type)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Composition.Hosting", "ContainerConfiguration", False, "WithPart", "(System.Type,System.Composition.Convention.AttributedModelProvider)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Composition.Hosting", "ContainerConfiguration", False, "WithPart<TPart>", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Composition.Hosting", "ContainerConfiguration", False, "WithPart<TPart>", "(System.Composition.Convention.AttributedModelProvider)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Composition.Hosting", "ContainerConfiguration", False, "WithParts", "(System.Collections.Generic.IEnumerable<System.Type>)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Composition.Hosting", "ContainerConfiguration", False, "WithParts", "(System.Collections.Generic.IEnumerable<System.Type>,System.Composition.Convention.AttributedModelProvider)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["System.Composition.Hosting", "ContainerConfiguration", False, "WithParts", "(System.Type[])", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Composition.Hosting", "ContainerConfiguration", False, "WithProvider", "(System.Composition.Hosting.Core.ExportDescriptorProvider)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Composition.Hosting", "ContainerConfiguration", False, "WithProvider", "(System.Composition.Hosting.Core.ExportDescriptorProvider)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["System.Composition.Hosting", "ContainerConfiguration", False, "WithAssemblies", "(System.Collections.Generic.IEnumerable<System.Reflection.Assembly>)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Composition.Hosting", "ContainerConfiguration", False, "WithAssemblies", "(System.Collections.Generic.IEnumerable<System.Reflection.Assembly>,System.Composition.Convention.AttributedModelProvider)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Composition.Hosting", "ContainerConfiguration", False, "WithAssembly", "(System.Reflection.Assembly)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Composition.Hosting", "ContainerConfiguration", False, "WithAssembly", "(System.Reflection.Assembly,System.Composition.Convention.AttributedModelProvider)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Composition.Hosting", "ContainerConfiguration", False, "WithDefaultConventions", "(System.Composition.Convention.AttributedModelProvider)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Composition.Hosting", "ContainerConfiguration", False, "WithExport", "(System.Type,System.Object)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Composition.Hosting", "ContainerConfiguration", False, "WithExport", "(System.Type,System.Object,System.String,System.Collections.Generic.IDictionary<System.String,System.Object>)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Composition.Hosting", "ContainerConfiguration", False, "WithExport<TExport>", "(TExport)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Composition.Hosting", "ContainerConfiguration", False, "WithExport<TExport>", "(TExport,System.String,System.Collections.Generic.IDictionary<System.String,System.Object>)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Composition.Hosting", "ContainerConfiguration", False, "WithPart", "(System.Type)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Composition.Hosting", "ContainerConfiguration", False, "WithPart", "(System.Type,System.Composition.Convention.AttributedModelProvider)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Composition.Hosting", "ContainerConfiguration", False, "WithPart<TPart>", "()", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Composition.Hosting", "ContainerConfiguration", False, "WithPart<TPart>", "(System.Composition.Convention.AttributedModelProvider)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Composition.Hosting", "ContainerConfiguration", False, "WithParts", "(System.Collections.Generic.IEnumerable<System.Type>)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Composition.Hosting", "ContainerConfiguration", False, "WithParts", "(System.Collections.Generic.IEnumerable<System.Type>,System.Composition.Convention.AttributedModelProvider)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Composition.Hosting", "ContainerConfiguration", False, "WithParts", "(System.Type[])", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Composition.Hosting", "ContainerConfiguration", False, "WithProvider", "(System.Composition.Hosting.Core.ExportDescriptorProvider)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
   - addsTo:
       pack: codeql/csharp-all
       extensible: neutralModel
diff --git a/csharp/ql/lib/ext/generated/System.Composition.model.yml b/csharp/ql/lib/ext/generated/System.Composition.model.yml
index 7e2fde9d912..2c6d61b647a 100644
--- a/csharp/ql/lib/ext/generated/System.Composition.model.yml
+++ b/csharp/ql/lib/ext/generated/System.Composition.model.yml
@@ -13,19 +13,21 @@ extensions:
       - ["System.Composition", "CompositionContext", False, "TryGetExport", "(System.Type,System.String,System.Object)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Composition", "CompositionContext", False, "TryGetExport<TExport>", "(System.String,TExport)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Composition", "CompositionContext", False, "TryGetExport<TExport>", "(TExport)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Composition", "CompositionContext", True, "TryGetExport", "(System.Composition.Hosting.Core.CompositionContract,System.Object)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Composition", "ExportAttribute", False, "ExportAttribute", "(System.String,System.Type)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Composition", "ExportMetadataAttribute", False, "ExportMetadataAttribute", "(System.String,System.Object)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Composition", "ExportMetadataAttribute", False, "ExportMetadataAttribute", "(System.String,System.Object)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Composition", "ImportAttribute", False, "ImportAttribute", "(System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Composition", "ImportManyAttribute", False, "ImportManyAttribute", "(System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Composition", "ImportMetadataConstraintAttribute", False, "ImportMetadataConstraintAttribute", "(System.String,System.Object)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Composition", "ImportMetadataConstraintAttribute", False, "ImportMetadataConstraintAttribute", "(System.String,System.Object)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Composition", "PartMetadataAttribute", False, "PartMetadataAttribute", "(System.String,System.Object)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Composition", "PartMetadataAttribute", False, "PartMetadataAttribute", "(System.String,System.Object)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Composition", "SharedAttribute", False, "get_SharingBoundary", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Composition", "SharingBoundaryAttribute", False, "SharingBoundaryAttribute", "(System.String[])", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["System.Composition", "SharingBoundaryAttribute", False, "get_SharingBoundaryNames", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Composition", "CompositionContext", True, "TryGetExport", "(System.Composition.Hosting.Core.CompositionContract,System.Object)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Composition", "Export<T>", False, "Export", "(T,System.Action)", "", "Argument[0]", "Argument[this].Property[System.Composition.Export`1.Value]", "value", "dfc-generated"]
+      - ["System.Composition", "ExportAttribute", False, "ExportAttribute", "(System.String,System.Type)", "", "Argument[0]", "Argument[this].Property[System.Composition.ExportAttribute.ContractName]", "value", "dfc-generated"]
+      - ["System.Composition", "ExportFactory<T,TMetadata>", False, "ExportFactory", "(System.Func<System.Tuple<T,System.Action>>,TMetadata)", "", "Argument[1]", "Argument[this].Property[System.Composition.ExportFactory`2.Metadata]", "value", "dfc-generated"]
+      - ["System.Composition", "ExportMetadataAttribute", False, "ExportMetadataAttribute", "(System.String,System.Object)", "", "Argument[0]", "Argument[this].Property[System.Composition.ExportMetadataAttribute.Name]", "value", "dfc-generated"]
+      - ["System.Composition", "ExportMetadataAttribute", False, "ExportMetadataAttribute", "(System.String,System.Object)", "", "Argument[1]", "Argument[this].Property[System.Composition.ExportMetadataAttribute.Value]", "value", "dfc-generated"]
+      - ["System.Composition", "ImportAttribute", False, "ImportAttribute", "(System.String)", "", "Argument[0]", "Argument[this].Property[System.Composition.ImportAttribute.ContractName]", "value", "dfc-generated"]
+      - ["System.Composition", "ImportManyAttribute", False, "ImportManyAttribute", "(System.String)", "", "Argument[0]", "Argument[this].Property[System.Composition.ImportManyAttribute.ContractName]", "value", "dfc-generated"]
+      - ["System.Composition", "ImportMetadataConstraintAttribute", False, "ImportMetadataConstraintAttribute", "(System.String,System.Object)", "", "Argument[0]", "Argument[this].Property[System.Composition.ImportMetadataConstraintAttribute.Name]", "value", "dfc-generated"]
+      - ["System.Composition", "ImportMetadataConstraintAttribute", False, "ImportMetadataConstraintAttribute", "(System.String,System.Object)", "", "Argument[1]", "Argument[this].Property[System.Composition.ImportMetadataConstraintAttribute.Value]", "value", "dfc-generated"]
+      - ["System.Composition", "PartMetadataAttribute", False, "PartMetadataAttribute", "(System.String,System.Object)", "", "Argument[0]", "Argument[this].Property[System.Composition.PartMetadataAttribute.Name]", "value", "dfc-generated"]
+      - ["System.Composition", "PartMetadataAttribute", False, "PartMetadataAttribute", "(System.String,System.Object)", "", "Argument[1]", "Argument[this].Property[System.Composition.PartMetadataAttribute.Value]", "value", "dfc-generated"]
+      - ["System.Composition", "SharedAttribute", False, "get_SharingBoundary", "()", "", "Argument[this].Property[System.Composition.PartMetadataAttribute.Value]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Composition", "SharingBoundaryAttribute", False, "SharingBoundaryAttribute", "(System.String[])", "", "Argument[0]", "Argument[this].SyntheticField[System.Composition.SharingBoundaryAttribute._sharingBoundaryNames]", "value", "dfc-generated"]
+      - ["System.Composition", "SharingBoundaryAttribute", False, "get_SharingBoundaryNames", "()", "", "Argument[this].SyntheticField[System.Composition.SharingBoundaryAttribute._sharingBoundaryNames].Element", "ReturnValue.Element", "value", "dfc-generated"]
   - addsTo:
       pack: codeql/csharp-all
       extensible: neutralModel
@@ -42,6 +44,7 @@ extensions:
       - ["System.Composition", "ExportAttribute", "ExportAttribute", "(System.Type)", "summary", "df-generated"]
       - ["System.Composition", "ExportFactory<T,TMetadata>", "get_Metadata", "()", "summary", "df-generated"]
       - ["System.Composition", "ExportFactory<T>", "CreateExport", "()", "summary", "df-generated"]
+      - ["System.Composition", "ExportFactory<T>", "ExportFactory", "(System.Func<System.Tuple<T,System.Action>>)", "summary", "df-generated"]
       - ["System.Composition", "ImportMetadataConstraintAttribute", "get_Name", "()", "summary", "df-generated"]
       - ["System.Composition", "ImportMetadataConstraintAttribute", "get_Value", "()", "summary", "df-generated"]
       - ["System.Composition", "SharedAttribute", "SharedAttribute", "(System.String)", "summary", "df-generated"]
diff --git a/csharp/ql/lib/ext/generated/System.Configuration.Internal.model.yml b/csharp/ql/lib/ext/generated/System.Configuration.Internal.model.yml
index 950c2c4505c..5fbf0e0eae6 100644
--- a/csharp/ql/lib/ext/generated/System.Configuration.Internal.model.yml
+++ b/csharp/ql/lib/ext/generated/System.Configuration.Internal.model.yml
@@ -9,20 +9,17 @@ extensions:
       - ["System.Configuration.Internal", "IConfigSystem", True, "get_Host", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Configuration.Internal", "IConfigSystem", True, "get_Root", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Configuration.Internal", "IInternalConfigConfigurationFactory", True, "Create", "(System.Type,System.Object[])", "", "Argument[1].Element", "ReturnValue", "taint", "df-generated"]
-      - ["System.Configuration.Internal", "IInternalConfigConfigurationFactory", True, "NormalizeLocationSubPath", "(System.String,System.Configuration.Internal.IConfigErrorInfo)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Configuration.Internal", "IInternalConfigConfigurationFactory", True, "NormalizeLocationSubPath", "(System.String,System.Configuration.Internal.IConfigErrorInfo)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Configuration.Internal", "IInternalConfigHost", True, "GetStreamName", "(System.String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Configuration.Internal", "IInternalConfigHost", True, "GetStreamNameForConfigSource", "(System.String,System.String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Configuration.Internal", "IInternalConfigHost", True, "GetStreamNameForConfigSource", "(System.String,System.String)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Configuration.Internal", "IInternalConfigHost", True, "GetStreamNameForConfigSource", "(System.String,System.String)", "", "Argument[0]", "ReturnValue", "taint", "dfc-generated"]
+      - ["System.Configuration.Internal", "IInternalConfigHost", True, "GetStreamNameForConfigSource", "(System.String,System.String)", "", "Argument[1]", "ReturnValue", "taint", "dfc-generated"]
       - ["System.Configuration.Internal", "IInternalConfigHost", True, "Init", "(System.Configuration.Internal.IInternalConfigRoot,System.Object[])", "", "Argument[1].Element", "Argument[this]", "taint", "df-generated"]
-      - ["System.Configuration.Internal", "IInternalConfigHost", True, "InitForConfiguration", "(System.String,System.String,System.String,System.Configuration.Internal.IInternalConfigRoot,System.Object[])", "", "Argument[4].Element", "Argument[this]", "taint", "df-generated"]
-      - ["System.Configuration.Internal", "IInternalConfigHost", True, "InitForConfiguration", "(System.String,System.String,System.String,System.Configuration.Internal.IInternalConfigRoot,System.Object[])", "", "Argument[4].Element", "ReturnValue", "taint", "df-generated"]
-      - ["System.Configuration.Internal", "IInternalConfigHost", True, "OpenStreamForRead", "(System.String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Configuration.Internal", "IInternalConfigHost", True, "OpenStreamForRead", "(System.String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Configuration.Internal", "IInternalConfigHost", True, "OpenStreamForRead", "(System.String,System.Boolean)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Configuration.Internal", "IInternalConfigHost", True, "OpenStreamForWrite", "(System.String,System.String,System.Object)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Configuration.Internal", "IInternalConfigHost", True, "OpenStreamForWrite", "(System.String,System.String,System.Object)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Configuration.Internal", "IInternalConfigHost", True, "OpenStreamForWrite", "(System.String,System.String,System.Object,System.Boolean)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Configuration.Internal", "IInternalConfigHost", True, "OpenStreamForWrite", "(System.String,System.String,System.Object,System.Boolean)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Configuration.Internal", "IInternalConfigHost", True, "InitForConfiguration", "(System.String,System.String,System.String,System.Configuration.Internal.IInternalConfigRoot,System.Object[])", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Configuration.Internal", "IInternalConfigHost", True, "InitForConfiguration", "(System.String,System.String,System.String,System.Configuration.Internal.IInternalConfigRoot,System.Object[])", "", "Argument[4].Element", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Configuration.Internal", "IInternalConfigHost", True, "OpenStreamForRead", "(System.String)", "", "Argument[0]", "ReturnValue", "taint", "dfc-generated"]
+      - ["System.Configuration.Internal", "IInternalConfigHost", True, "OpenStreamForRead", "(System.String,System.Boolean)", "", "Argument[0]", "ReturnValue", "taint", "dfc-generated"]
+      - ["System.Configuration.Internal", "IInternalConfigHost", True, "OpenStreamForWrite", "(System.String,System.String,System.Object)", "", "Argument[2]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Configuration.Internal", "IInternalConfigHost", True, "OpenStreamForWrite", "(System.String,System.String,System.Object,System.Boolean)", "", "Argument[2]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Configuration.Internal", "IInternalConfigRecord", True, "GetLkgSection", "(System.String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Configuration.Internal", "IInternalConfigRecord", True, "GetSection", "(System.String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Configuration.Internal", "IInternalConfigRecord", True, "get_ConfigPath", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
@@ -65,6 +62,8 @@ extensions:
       - ["System.Configuration.Internal", "DelegatingConfigHost", "PrefetchSection", "(System.String,System.String)", "summary", "df-generated"]
       - ["System.Configuration.Internal", "DelegatingConfigHost", "RefreshConfigPaths", "()", "summary", "df-generated"]
       - ["System.Configuration.Internal", "DelegatingConfigHost", "RequireCompleteInit", "(System.Configuration.Internal.IInternalConfigRecord)", "summary", "df-generated"]
+      - ["System.Configuration.Internal", "DelegatingConfigHost", "StartMonitoringStreamForChanges", "(System.String,System.Configuration.Internal.StreamChangeCallback)", "summary", "df-generated"]
+      - ["System.Configuration.Internal", "DelegatingConfigHost", "StopMonitoringStreamForChanges", "(System.String,System.Configuration.Internal.StreamChangeCallback)", "summary", "df-generated"]
       - ["System.Configuration.Internal", "DelegatingConfigHost", "VerifyDefinitionAllowed", "(System.String,System.Configuration.ConfigurationAllowDefinition,System.Configuration.ConfigurationAllowExeDefinition,System.Configuration.Internal.IConfigErrorInfo)", "summary", "df-generated"]
       - ["System.Configuration.Internal", "DelegatingConfigHost", "WriteCompleted", "(System.String,System.Boolean,System.Object)", "summary", "df-generated"]
       - ["System.Configuration.Internal", "DelegatingConfigHost", "WriteCompleted", "(System.String,System.Boolean,System.Object,System.Boolean)", "summary", "df-generated"]
@@ -118,6 +117,8 @@ extensions:
       - ["System.Configuration.Internal", "IInternalConfigHost", "PrefetchAll", "(System.String,System.String)", "summary", "df-generated"]
       - ["System.Configuration.Internal", "IInternalConfigHost", "PrefetchSection", "(System.String,System.String)", "summary", "df-generated"]
       - ["System.Configuration.Internal", "IInternalConfigHost", "RequireCompleteInit", "(System.Configuration.Internal.IInternalConfigRecord)", "summary", "df-generated"]
+      - ["System.Configuration.Internal", "IInternalConfigHost", "StartMonitoringStreamForChanges", "(System.String,System.Configuration.Internal.StreamChangeCallback)", "summary", "df-generated"]
+      - ["System.Configuration.Internal", "IInternalConfigHost", "StopMonitoringStreamForChanges", "(System.String,System.Configuration.Internal.StreamChangeCallback)", "summary", "df-generated"]
       - ["System.Configuration.Internal", "IInternalConfigHost", "VerifyDefinitionAllowed", "(System.String,System.Configuration.ConfigurationAllowDefinition,System.Configuration.ConfigurationAllowExeDefinition,System.Configuration.Internal.IConfigErrorInfo)", "summary", "df-generated"]
       - ["System.Configuration.Internal", "IInternalConfigHost", "WriteCompleted", "(System.String,System.Boolean,System.Object)", "summary", "df-generated"]
       - ["System.Configuration.Internal", "IInternalConfigHost", "WriteCompleted", "(System.String,System.Boolean,System.Object,System.Boolean)", "summary", "df-generated"]
@@ -131,7 +132,11 @@ extensions:
       - ["System.Configuration.Internal", "IInternalConfigRecord", "ThrowIfInitErrors", "()", "summary", "df-generated"]
       - ["System.Configuration.Internal", "IInternalConfigRecord", "get_HasInitErrors", "()", "summary", "df-generated"]
       - ["System.Configuration.Internal", "IInternalConfigRoot", "RemoveConfig", "(System.String)", "summary", "df-generated"]
+      - ["System.Configuration.Internal", "IInternalConfigRoot", "add_ConfigChanged", "(System.Configuration.Internal.InternalConfigEventHandler)", "summary", "df-generated"]
+      - ["System.Configuration.Internal", "IInternalConfigRoot", "add_ConfigRemoved", "(System.Configuration.Internal.InternalConfigEventHandler)", "summary", "df-generated"]
       - ["System.Configuration.Internal", "IInternalConfigRoot", "get_IsDesignTime", "()", "summary", "df-generated"]
+      - ["System.Configuration.Internal", "IInternalConfigRoot", "remove_ConfigChanged", "(System.Configuration.Internal.InternalConfigEventHandler)", "summary", "df-generated"]
+      - ["System.Configuration.Internal", "IInternalConfigRoot", "remove_ConfigRemoved", "(System.Configuration.Internal.InternalConfigEventHandler)", "summary", "df-generated"]
       - ["System.Configuration.Internal", "IInternalConfigSettingsFactory", "CompleteInit", "()", "summary", "df-generated"]
       - ["System.Configuration.Internal", "IInternalConfigSettingsFactory", "SetConfigurationSystem", "(System.Configuration.Internal.IInternalConfigSystem,System.Boolean)", "summary", "df-generated"]
       - ["System.Configuration.Internal", "IInternalConfigSystem", "RefreshConfig", "(System.String)", "summary", "df-generated"]
diff --git a/csharp/ql/lib/ext/generated/System.Configuration.Provider.model.yml b/csharp/ql/lib/ext/generated/System.Configuration.Provider.model.yml
index e24f840b72a..f8182a96149 100644
--- a/csharp/ql/lib/ext/generated/System.Configuration.Provider.model.yml
+++ b/csharp/ql/lib/ext/generated/System.Configuration.Provider.model.yml
@@ -4,11 +4,11 @@ extensions:
       pack: codeql/csharp-all
       extensible: summaryModel
     data:
-      - ["System.Configuration.Provider", "ProviderBase", True, "Initialize", "(System.String,System.Collections.Specialized.NameValueCollection)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Configuration.Provider", "ProviderBase", True, "Initialize", "(System.String,System.Collections.Specialized.NameValueCollection)", "", "Argument[1].Element", "Argument[this]", "taint", "df-generated"]
-      - ["System.Configuration.Provider", "ProviderBase", True, "get_Description", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Configuration.Provider", "ProviderBase", True, "get_Name", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Configuration.Provider", "ProviderCollection", False, "CopyTo", "(System.Configuration.Provider.ProviderBase[],System.Int32)", "", "Argument[this]", "Argument[0].Element", "taint", "df-generated"]
+      - ["System.Configuration.Provider", "ProviderBase", True, "Initialize", "(System.String,System.Collections.Specialized.NameValueCollection)", "", "Argument[0]", "Argument[this].SyntheticField[System.Configuration.Provider.ProviderBase._name]", "value", "dfc-generated"]
+      - ["System.Configuration.Provider", "ProviderBase", True, "get_Description", "()", "", "Argument[this].Property[System.Configuration.Provider.ProviderBase.Name]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Configuration.Provider", "ProviderBase", True, "get_Description", "()", "", "Argument[this].SyntheticField[System.Configuration.Provider.ProviderBase._name]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Configuration.Provider", "ProviderBase", True, "get_Name", "()", "", "Argument[this].SyntheticField[System.Configuration.Provider.ProviderBase._name]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Configuration.Provider", "ProviderCollection", False, "CopyTo", "(System.Configuration.Provider.ProviderBase[],System.Int32)", "", "Argument[this].Element", "Argument[0].Element", "value", "dfc-generated"]
       - ["System.Configuration.Provider", "ProviderCollection", False, "get_Item", "(System.String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
   - addsTo:
       pack: codeql/csharp-all
diff --git a/csharp/ql/lib/ext/generated/System.Configuration.model.yml b/csharp/ql/lib/ext/generated/System.Configuration.model.yml
index 609add7d83b..0aebabce66d 100644
--- a/csharp/ql/lib/ext/generated/System.Configuration.model.yml
+++ b/csharp/ql/lib/ext/generated/System.Configuration.model.yml
@@ -8,16 +8,28 @@ extensions:
       - ["System.Configuration", "AppSettingsSection", False, "get_Settings", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Configuration", "ApplicationSettingsBase", False, "ApplicationSettingsBase", "(System.ComponentModel.IComponent,System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Configuration", "ApplicationSettingsBase", False, "ApplicationSettingsBase", "(System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["System.Configuration", "ApplicationSettingsBase", True, "OnPropertyChanged", "(System.Object,System.ComponentModel.PropertyChangedEventArgs)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["System.Configuration", "ApplicationSettingsBase", True, "OnSettingChanging", "(System.Object,System.Configuration.SettingChangingEventArgs)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["System.Configuration", "ApplicationSettingsBase", True, "OnSettingsLoaded", "(System.Object,System.Configuration.SettingsLoadedEventArgs)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["System.Configuration", "ApplicationSettingsBase", True, "OnSettingsSaving", "(System.Object,System.ComponentModel.CancelEventArgs)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["System.Configuration", "ApplicationSettingsBase", True, "get_PropertyValues", "()", "", "Argument[this].Property[System.Configuration.SettingsBase.PropertyValues]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Configuration", "ClientSettingsSection", False, "get_Settings", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Configuration", "CommaDelimitedStringCollection", False, "Add", "(System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Configuration", "CommaDelimitedStringCollection", False, "AddRange", "(System.String[])", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["System.Configuration", "CommaDelimitedStringCollection", False, "Clone", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Configuration", "CommaDelimitedStringCollection", False, "Insert", "(System.Int32,System.String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Configuration", "CommaDelimitedStringCollection", False, "ToString", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Configuration", "CommaDelimitedStringCollection", False, "get_Item", "(System.Int32)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Configuration", "CommaDelimitedStringCollection", False, "set_Item", "(System.Int32,System.String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Configuration", "ConfigXmlDocument", False, "LoadSingleElement", "(System.String,System.Xml.XmlTextReader)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Configuration", "ConfigXmlDocument", False, "get_Filename", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Configuration", "CommaDelimitedStringCollection", False, "Add", "(System.String)", "", "Argument[0]", "Argument[this].Element", "taint", "dfc-generated"]
+      - ["System.Configuration", "CommaDelimitedStringCollection", False, "AddRange", "(System.String[])", "", "Argument[0].Element", "Argument[this].Element", "taint", "dfc-generated"]
+      - ["System.Configuration", "CommaDelimitedStringCollection", False, "Clone", "()", "", "Argument[this].Element", "ReturnValue.Element", "taint", "dfc-generated"]
+      - ["System.Configuration", "CommaDelimitedStringCollection", False, "Insert", "(System.Int32,System.String)", "", "Argument[1]", "Argument[this].Element", "taint", "dfc-generated"]
+      - ["System.Configuration", "CommaDelimitedStringCollection", False, "ToString", "()", "", "Argument[this].Element", "ReturnValue", "taint", "dfc-generated"]
+      - ["System.Configuration", "CommaDelimitedStringCollection", False, "get_Item", "(System.Int32)", "", "Argument[this].Element", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Configuration", "CommaDelimitedStringCollection", False, "set_Item", "(System.Int32,System.String)", "", "Argument[1]", "Argument[this].Element", "taint", "dfc-generated"]
+      - ["System.Configuration", "ConfigXmlDocument", False, "CreateAttribute", "(System.String,System.String,System.String)", "", "Argument[this].SyntheticField[System.Configuration.ConfigXmlDocument._filename]", "ReturnValue.SyntheticField[System.Configuration.ConfigXmlAttribute._filename]", "value", "dfc-generated"]
+      - ["System.Configuration", "ConfigXmlDocument", False, "CreateCDataSection", "(System.String)", "", "Argument[this].SyntheticField[System.Configuration.ConfigXmlDocument._filename]", "ReturnValue.SyntheticField[System.Configuration.ConfigXmlCDataSection._filename]", "value", "dfc-generated"]
+      - ["System.Configuration", "ConfigXmlDocument", False, "CreateComment", "(System.String)", "", "Argument[this].SyntheticField[System.Configuration.ConfigXmlDocument._filename]", "ReturnValue.SyntheticField[System.Configuration.ConfigXmlComment._filename]", "value", "dfc-generated"]
+      - ["System.Configuration", "ConfigXmlDocument", False, "CreateElement", "(System.String,System.String,System.String)", "", "Argument[this].SyntheticField[System.Configuration.ConfigXmlDocument._filename]", "ReturnValue.SyntheticField[System.Configuration.ConfigXmlElement._filename]", "value", "dfc-generated"]
+      - ["System.Configuration", "ConfigXmlDocument", False, "CreateSignificantWhitespace", "(System.String)", "", "Argument[this].SyntheticField[System.Configuration.ConfigXmlDocument._filename]", "ReturnValue.SyntheticField[System.Configuration.ConfigXmlSignificantWhitespace._filename]", "value", "dfc-generated"]
+      - ["System.Configuration", "ConfigXmlDocument", False, "CreateTextNode", "(System.String)", "", "Argument[this].SyntheticField[System.Configuration.ConfigXmlDocument._filename]", "ReturnValue.SyntheticField[System.Configuration.ConfigXmlText._filename]", "value", "dfc-generated"]
+      - ["System.Configuration", "ConfigXmlDocument", False, "CreateWhitespace", "(System.String)", "", "Argument[this].SyntheticField[System.Configuration.ConfigXmlDocument._filename]", "ReturnValue.SyntheticField[System.Configuration.ConfigXmlWhitespace._filename]", "value", "dfc-generated"]
+      - ["System.Configuration", "ConfigXmlDocument", False, "LoadSingleElement", "(System.String,System.Xml.XmlTextReader)", "", "Argument[0]", "Argument[this].SyntheticField[System.Configuration.ConfigXmlDocument._filename]", "value", "dfc-generated"]
+      - ["System.Configuration", "ConfigXmlDocument", False, "get_Filename", "()", "", "Argument[this].SyntheticField[System.Configuration.ConfigXmlDocument._filename]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Configuration", "Configuration", False, "GetSection", "(System.String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Configuration", "Configuration", False, "GetSectionGroup", "(System.String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Configuration", "Configuration", False, "get_AppSettings", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
@@ -29,18 +41,15 @@ extensions:
       - ["System.Configuration", "ConfigurationElement", False, "SetPropertyValue", "(System.Configuration.ConfigurationProperty,System.Object,System.Boolean)", "", "Argument[this]", "Argument[1]", "taint", "df-generated"]
       - ["System.Configuration", "ConfigurationElement", False, "get_CurrentConfiguration", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Configuration", "ConfigurationElement", False, "get_EvaluationContext", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Configuration", "ConfigurationElement", False, "get_Item", "(System.Configuration.ConfigurationProperty)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Configuration", "ConfigurationElement", False, "get_Item", "(System.Configuration.ConfigurationProperty)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Configuration", "ConfigurationElement", False, "get_Item", "(System.Configuration.ConfigurationProperty)", "", "Argument[0].Property[System.Configuration.ConfigurationProperty.DefaultValue]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Configuration", "ConfigurationElement", False, "get_Item", "(System.String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Configuration", "ConfigurationElement", False, "set_Item", "(System.Configuration.ConfigurationProperty,System.Object)", "", "Argument[this]", "Argument[1]", "taint", "df-generated"]
       - ["System.Configuration", "ConfigurationElement", False, "set_Item", "(System.String,System.Object)", "", "Argument[this]", "Argument[1]", "taint", "df-generated"]
       - ["System.Configuration", "ConfigurationElement", True, "DeserializeElement", "(System.Xml.XmlReader,System.Boolean)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Configuration", "ConfigurationElement", True, "DeserializeElement", "(System.Xml.XmlReader,System.Boolean)", "", "Argument[this]", "Argument[0]", "taint", "df-generated"]
-      - ["System.Configuration", "ConfigurationElement", True, "GetTransformedAssemblyString", "(System.String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Configuration", "ConfigurationElement", True, "GetTransformedTypeString", "(System.String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Configuration", "ConfigurationElement", True, "GetTransformedAssemblyString", "(System.String)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Configuration", "ConfigurationElement", True, "GetTransformedTypeString", "(System.String)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Configuration", "ConfigurationElement", True, "Reset", "(System.Configuration.ConfigurationElement)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Configuration", "ConfigurationElement", True, "SerializeElement", "(System.Xml.XmlWriter,System.Boolean)", "", "Argument[this]", "Argument[0]", "taint", "df-generated"]
-      - ["System.Configuration", "ConfigurationElement", True, "SerializeToXmlElement", "(System.Xml.XmlWriter,System.String)", "", "Argument[1]", "Argument[0]", "taint", "df-generated"]
       - ["System.Configuration", "ConfigurationElement", True, "SerializeToXmlElement", "(System.Xml.XmlWriter,System.String)", "", "Argument[this]", "Argument[0]", "taint", "df-generated"]
       - ["System.Configuration", "ConfigurationElement", True, "Unmerge", "(System.Configuration.ConfigurationElement,System.Configuration.ConfigurationElement,System.Configuration.ConfigurationSaveMode)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Configuration", "ConfigurationElement", True, "get_ElementProperty", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
@@ -51,81 +60,84 @@ extensions:
       - ["System.Configuration", "ConfigurationElementCollection", False, "BaseGetAllKeys", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Configuration", "ConfigurationElementCollection", False, "BaseGetKey", "(System.Int32)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Configuration", "ConfigurationElementCollection", False, "ConfigurationElementCollection", "(System.Collections.IComparer)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Configuration", "ConfigurationElementCollection", False, "CopyTo", "(System.Configuration.ConfigurationElement[],System.Int32)", "", "Argument[this]", "Argument[0].Element", "taint", "df-generated"]
+      - ["System.Configuration", "ConfigurationElementCollection", False, "CopyTo", "(System.Configuration.ConfigurationElement[],System.Int32)", "", "Argument[this].Element", "Argument[0].Element", "value", "dfc-generated"]
       - ["System.Configuration", "ConfigurationElementCollection", True, "BaseAdd", "(System.Configuration.ConfigurationElement)", "", "Argument[this]", "Argument[0]", "taint", "df-generated"]
       - ["System.Configuration", "ConfigurationElementCollection", True, "BaseAdd", "(System.Int32,System.Configuration.ConfigurationElement)", "", "Argument[this]", "Argument[1]", "taint", "df-generated"]
       - ["System.Configuration", "ConfigurationElementCollection", True, "GetElementKey", "(System.Configuration.ConfigurationElement)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Configuration", "ConfigurationErrorsException", False, "ConfigurationErrorsException", "(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Configuration", "ConfigurationErrorsException", False, "ConfigurationErrorsException", "(System.String,System.Exception,System.String,System.Int32)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
+      - ["System.Configuration", "ConfigurationErrorsException", False, "ConfigurationErrorsException", "(System.String,System.Exception,System.String,System.Int32)", "", "Argument[2]", "Argument[this].SyntheticField[System.Configuration.ConfigurationErrorsException._firstFilename]", "value", "dfc-generated"]
       - ["System.Configuration", "ConfigurationErrorsException", False, "GetFilename", "(System.Xml.XmlNode)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["System.Configuration", "ConfigurationErrorsException", False, "GetFilename", "(System.Xml.XmlReader)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Configuration", "ConfigurationErrorsException", False, "GetFilename", "(System.Xml.XmlReader)", "", "Argument[0].Property[System.Configuration.Internal.IConfigErrorInfo.Filename]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Configuration", "ConfigurationErrorsException", False, "get_Errors", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Configuration", "ConfigurationException", False, "ConfigurationException", "(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Configuration", "ConfigurationException", False, "ConfigurationException", "(System.String,System.Exception,System.String,System.Int32)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
+      - ["System.Configuration", "ConfigurationErrorsException", True, "get_Filename", "()", "", "Argument[this].SyntheticField[System.Configuration.ConfigurationErrorsException._firstFilename]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Configuration", "ConfigurationErrorsException", True, "get_Message", "()", "", "Argument[this].Property[System.Configuration.ConfigurationErrorsException.Filename]", "ReturnValue", "taint", "dfc-generated"]
+      - ["System.Configuration", "ConfigurationErrorsException", True, "get_Message", "()", "", "Argument[this].Property[System.Configuration.ConfigurationException.BareMessage]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Configuration", "ConfigurationErrorsException", True, "get_Message", "()", "", "Argument[this].SyntheticField[System.Configuration.ConfigurationErrorsException._firstFilename]", "ReturnValue", "taint", "dfc-generated"]
+      - ["System.Configuration", "ConfigurationException", False, "ConfigurationException", "(System.String,System.Exception,System.String,System.Int32)", "", "Argument[2]", "Argument[this].SyntheticField[System.Configuration.ConfigurationException._filename]", "value", "dfc-generated"]
       - ["System.Configuration", "ConfigurationException", False, "GetXmlNodeFilename", "(System.Xml.XmlNode)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["System.Configuration", "ConfigurationException", True, "get_BareMessage", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Configuration", "ConfigurationException", True, "get_Filename", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Configuration", "ConfigurationException", True, "get_BareMessage", "()", "", "Argument[this].Property[System.Exception.Message]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Configuration", "ConfigurationException", True, "get_Filename", "()", "", "Argument[this].SyntheticField[System.Configuration.ConfigurationException._filename]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Configuration", "ConfigurationException", True, "get_Message", "()", "", "Argument[this].Property[System.Configuration.ConfigurationException.BareMessage]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Configuration", "ConfigurationException", True, "get_Message", "()", "", "Argument[this].Property[System.Configuration.ConfigurationException.Filename]", "ReturnValue", "taint", "dfc-generated"]
       - ["System.Configuration", "ConfigurationLocation", False, "OpenConfiguration", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Configuration", "ConfigurationLocationCollection", False, "get_Item", "(System.Int32)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Configuration", "ConfigurationLockCollection", False, "Add", "(System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Configuration", "ConfigurationLockCollection", False, "CopyTo", "(System.String[],System.Int32)", "", "Argument[this]", "Argument[0].Element", "taint", "df-generated"]
-      - ["System.Configuration", "ConfigurationLockCollection", False, "SetFromList", "(System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["System.Configuration", "ConfigurationLocationCollection", False, "get_Item", "(System.Int32)", "", "Argument[this].Property[System.Collections.ReadOnlyCollectionBase.InnerList].Element", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Configuration", "ConfigurationLockCollection", False, "Add", "(System.String)", "", "Argument[0]", "Argument[this].SyntheticField[System.Configuration.ConfigurationLockCollection._internalArraylist].Element", "value", "dfc-generated"]
+      - ["System.Configuration", "ConfigurationLockCollection", False, "CopyTo", "(System.String[],System.Int32)", "", "Argument[this].Element", "Argument[0].Element", "value", "dfc-generated"]
+      - ["System.Configuration", "ConfigurationLockCollection", False, "CopyTo", "(System.String[],System.Int32)", "", "Argument[this].SyntheticField[System.Configuration.ConfigurationLockCollection._internalArraylist].Element", "Argument[0].Element", "value", "dfc-generated"]
+      - ["System.Configuration", "ConfigurationLockCollection", False, "SetFromList", "(System.String)", "", "Argument[0]", "Argument[this].SyntheticField[System.Configuration.ConfigurationLockCollection._internalArraylist].Element", "taint", "dfc-generated"]
       - ["System.Configuration", "ConfigurationLockCollection", False, "get_AttributeList", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Configuration", "ConfigurationManager", False, "OpenExeConfiguration", "(System.String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["System.Configuration", "ConfigurationManager", False, "OpenMappedExeConfiguration", "(System.Configuration.ExeConfigurationFileMap,System.Configuration.ConfigurationUserLevel)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["System.Configuration", "ConfigurationManager", False, "OpenMappedExeConfiguration", "(System.Configuration.ExeConfigurationFileMap,System.Configuration.ConfigurationUserLevel,System.Boolean)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["System.Configuration", "ConfigurationManager", False, "OpenMappedMachineConfiguration", "(System.Configuration.ConfigurationFileMap)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["System.Configuration", "ConfigurationProperty", False, "ConfigurationProperty", "(System.String,System.Type)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Configuration", "ConfigurationProperty", False, "ConfigurationProperty", "(System.String,System.Type,System.Object,System.ComponentModel.TypeConverter,System.Configuration.ConfigurationValidatorBase,System.Configuration.ConfigurationPropertyOptions,System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Configuration", "ConfigurationProperty", False, "ConfigurationProperty", "(System.String,System.Type,System.Object,System.ComponentModel.TypeConverter,System.Configuration.ConfigurationValidatorBase,System.Configuration.ConfigurationPropertyOptions,System.String)", "", "Argument[3]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Configuration", "ConfigurationProperty", False, "get_Converter", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Configuration", "ConfigurationPropertyCollection", False, "Add", "(System.Configuration.ConfigurationProperty)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Configuration", "ConfigurationPropertyCollection", False, "CopyTo", "(System.Configuration.ConfigurationProperty[],System.Int32)", "", "Argument[this]", "Argument[0].Element", "taint", "df-generated"]
-      - ["System.Configuration", "ConfigurationPropertyCollection", False, "get_Item", "(System.String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Configuration", "ConfigurationProperty", False, "ConfigurationProperty", "(System.String,System.Type,System.Object,System.ComponentModel.TypeConverter,System.Configuration.ConfigurationValidatorBase,System.Configuration.ConfigurationPropertyOptions,System.String)", "", "Argument[3]", "Argument[this].SyntheticField[System.Configuration.ConfigurationProperty._converter]", "value", "dfc-generated"]
+      - ["System.Configuration", "ConfigurationProperty", False, "get_Converter", "()", "", "Argument[this].SyntheticField[System.Configuration.ConfigurationProperty._converter]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Configuration", "ConfigurationPropertyCollection", False, "Add", "(System.Configuration.ConfigurationProperty)", "", "Argument[0]", "Argument[this].SyntheticField[System.Configuration.ConfigurationPropertyCollection._items].Element", "value", "dfc-generated"]
+      - ["System.Configuration", "ConfigurationPropertyCollection", False, "CopyTo", "(System.Configuration.ConfigurationProperty[],System.Int32)", "", "Argument[this].Element", "Argument[0].Element", "value", "dfc-generated"]
+      - ["System.Configuration", "ConfigurationPropertyCollection", False, "CopyTo", "(System.Configuration.ConfigurationProperty[],System.Int32)", "", "Argument[this].SyntheticField[System.Configuration.ConfigurationPropertyCollection._items].Element", "Argument[0].Element", "value", "dfc-generated"]
+      - ["System.Configuration", "ConfigurationPropertyCollection", False, "get_Item", "(System.String)", "", "Argument[this].SyntheticField[System.Configuration.ConfigurationPropertyCollection._items].Element", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Configuration", "ConfigurationPropertyCollection", False, "get_SyncRoot", "()", "", "Argument[this].SyntheticField[System.Configuration.ConfigurationPropertyCollection._items]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Configuration", "ConfigurationSection", True, "DeserializeSection", "(System.Xml.XmlReader)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Configuration", "ConfigurationSection", True, "DeserializeSection", "(System.Xml.XmlReader)", "", "Argument[this]", "Argument[0]", "taint", "df-generated"]
-      - ["System.Configuration", "ConfigurationSection", True, "GetRuntimeObject", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Configuration", "ConfigurationSection", True, "GetRuntimeObject", "()", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["System.Configuration", "ConfigurationSection", True, "GetRuntimeObject", "()", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Configuration", "ConfigurationSection", True, "SerializeSection", "(System.Configuration.ConfigurationElement,System.String,System.Configuration.ConfigurationSaveMode)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Configuration", "ConfigurationSectionCollection", False, "Add", "(System.String,System.Configuration.ConfigurationSection)", "", "Argument[0]", "Argument[1]", "taint", "df-generated"]
-      - ["System.Configuration", "ConfigurationSectionCollection", False, "Add", "(System.String,System.Configuration.ConfigurationSection)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Configuration", "ConfigurationSectionCollection", False, "Add", "(System.String,System.Configuration.ConfigurationSection)", "", "Argument[this]", "Argument[1]", "taint", "df-generated"]
       - ["System.Configuration", "ConfigurationSectionCollection", False, "Get", "(System.Int32)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Configuration", "ConfigurationSectionCollection", False, "Get", "(System.String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Configuration", "ConfigurationSectionCollection", False, "GetKey", "(System.Int32)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Configuration", "ConfigurationSectionCollection", False, "get_Item", "(System.Int32)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Configuration", "ConfigurationSectionCollection", False, "get_Item", "(System.String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Configuration", "ConfigurationSectionGroup", False, "get_SectionGroups", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Configuration", "ConfigurationSectionGroup", False, "get_Sections", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Configuration", "ConfigurationSectionGroupCollection", False, "Add", "(System.String,System.Configuration.ConfigurationSectionGroup)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Configuration", "ConfigurationSectionGroupCollection", False, "Add", "(System.String,System.Configuration.ConfigurationSectionGroup)", "", "Argument[this]", "Argument[1]", "taint", "df-generated"]
       - ["System.Configuration", "ConfigurationSectionGroupCollection", False, "CopyTo", "(System.Configuration.ConfigurationSectionGroup[],System.Int32)", "", "Argument[this]", "Argument[0].Element", "taint", "df-generated"]
       - ["System.Configuration", "ConfigurationSectionGroupCollection", False, "Get", "(System.Int32)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Configuration", "ConfigurationSectionGroupCollection", False, "Get", "(System.String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Configuration", "ConfigurationSectionGroupCollection", False, "GetKey", "(System.Int32)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Configuration", "ConfigurationSectionGroupCollection", False, "get_Item", "(System.Int32)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Configuration", "ConfigurationSectionGroupCollection", False, "get_Item", "(System.String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Configuration", "ConfigurationValidatorAttribute", True, "get_ValidatorInstance", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Configuration", "ConnectionStringSettings", False, "ToString", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Configuration", "ConfigurationValidatorBase", True, "Validate", "(System.Object)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["System.Configuration", "ConnectionStringSettings", False, "ToString", "()", "", "Argument[this].Property[System.Configuration.ConnectionStringSettings.ConnectionString]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Configuration", "ConnectionStringSettingsCollection", False, "Add", "(System.Configuration.ConnectionStringSettings)", "", "Argument[this]", "Argument[0]", "taint", "df-generated"]
+      - ["System.Configuration", "ConnectionStringSettingsCollection", False, "GetElementKey", "(System.Configuration.ConfigurationElement)", "", "Argument[0].Property[System.Configuration.ConnectionStringSettings.Name]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Configuration", "ConnectionStringSettingsCollection", False, "get_Item", "(System.Int32)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Configuration", "ConnectionStringSettingsCollection", False, "get_Item", "(System.String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Configuration", "ConnectionStringSettingsCollection", False, "set_Item", "(System.Int32,System.Configuration.ConnectionStringSettings)", "", "Argument[this]", "Argument[1]", "taint", "df-generated"]
       - ["System.Configuration", "ConnectionStringsSection", False, "get_ConnectionStrings", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Configuration", "ContextInformation", False, "GetSection", "(System.String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Configuration", "ContextInformation", False, "get_HostingContext", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Configuration", "DefaultSettingValueAttribute", False, "DefaultSettingValueAttribute", "(System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Configuration", "DefaultSettingValueAttribute", False, "get_Value", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Configuration", "DefaultSettingValueAttribute", False, "DefaultSettingValueAttribute", "(System.String)", "", "Argument[0]", "Argument[this].SyntheticField[System.Configuration.DefaultSettingValueAttribute._value]", "value", "dfc-generated"]
+      - ["System.Configuration", "DefaultSettingValueAttribute", False, "get_Value", "()", "", "Argument[this].SyntheticField[System.Configuration.DefaultSettingValueAttribute._value]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Configuration", "IApplicationSettingsProvider", True, "GetPreviousVersion", "(System.Configuration.SettingsContext,System.Configuration.SettingsProperty)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Configuration", "IConfigurationSectionHandler", True, "Create", "(System.Object,System.Object,System.Xml.XmlNode)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Configuration", "IConfigurationSectionHandler", True, "Create", "(System.Object,System.Object,System.Xml.XmlNode)", "", "Argument[2].Element", "ReturnValue", "taint", "df-generated"]
+      - ["System.Configuration", "IConfigurationSectionHandler", True, "Create", "(System.Object,System.Object,System.Xml.XmlNode)", "", "Argument[0].Element", "ReturnValue.Element", "value", "dfc-generated"]
       - ["System.Configuration", "KeyValueConfigurationCollection", False, "Add", "(System.Configuration.KeyValueConfigurationElement)", "", "Argument[this]", "Argument[0]", "taint", "df-generated"]
       - ["System.Configuration", "KeyValueConfigurationCollection", False, "get_AllKeys", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Configuration", "KeyValueConfigurationCollection", False, "get_Item", "(System.String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Configuration", "KeyValueConfigurationCollection", True, "GetElementKey", "(System.Configuration.ConfigurationElement)", "", "Argument[0].Property[System.Configuration.KeyValueConfigurationElement.Key]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Configuration", "KeyValueConfigurationElement", False, "KeyValueConfigurationElement", "(System.String,System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Configuration", "KeyValueConfigurationElement", False, "KeyValueConfigurationElement", "(System.String,System.String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
       - ["System.Configuration", "KeyValueConfigurationElement", False, "get_Key", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Configuration", "NameValueConfigurationCollection", False, "Add", "(System.Configuration.NameValueConfigurationElement)", "", "Argument[this]", "Argument[0]", "taint", "df-generated"]
+      - ["System.Configuration", "NameValueConfigurationCollection", False, "GetElementKey", "(System.Configuration.ConfigurationElement)", "", "Argument[0].Property[System.Configuration.NameValueConfigurationElement.Name]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Configuration", "NameValueConfigurationCollection", False, "get_AllKeys", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Configuration", "NameValueConfigurationCollection", False, "get_Item", "(System.String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Configuration", "NameValueConfigurationCollection", False, "set_Item", "(System.String,System.Configuration.NameValueConfigurationElement)", "", "Argument[this]", "Argument[1]", "taint", "df-generated"]
@@ -134,60 +146,64 @@ extensions:
       - ["System.Configuration", "PropertyInformation", False, "get_DefaultValue", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Configuration", "PropertyInformation", False, "get_Description", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Configuration", "PropertyInformation", False, "get_Validator", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Configuration", "PropertyInformationCollection", False, "CopyTo", "(System.Configuration.PropertyInformation[],System.Int32)", "", "Argument[this]", "Argument[0].Element", "taint", "df-generated"]
-      - ["System.Configuration", "PropertyInformationCollection", False, "get_Item", "(System.String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Configuration", "PropertyInformationCollection", False, "CopyTo", "(System.Configuration.PropertyInformation[],System.Int32)", "", "Argument[this].Element", "Argument[0].Element", "value", "dfc-generated"]
       - ["System.Configuration", "ProtectedConfigurationProviderCollection", False, "get_Item", "(System.String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Configuration", "ProtectedConfigurationSection", False, "get_Providers", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Configuration", "ProtectedProviderSettings", False, "get_Providers", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Configuration", "ProviderSettings", False, "get_Parameters", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Configuration", "ProviderSettingsCollection", False, "Add", "(System.Configuration.ProviderSettings)", "", "Argument[this]", "Argument[0]", "taint", "df-generated"]
+      - ["System.Configuration", "ProviderSettingsCollection", False, "GetElementKey", "(System.Configuration.ConfigurationElement)", "", "Argument[0].Property[System.Configuration.ProviderSettings.Name]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Configuration", "ProviderSettingsCollection", False, "get_Item", "(System.Int32)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Configuration", "ProviderSettingsCollection", False, "get_Item", "(System.String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Configuration", "ProviderSettingsCollection", False, "set_Item", "(System.Int32,System.Configuration.ProviderSettings)", "", "Argument[this]", "Argument[1]", "taint", "df-generated"]
       - ["System.Configuration", "RegexStringValidator", False, "RegexStringValidator", "(System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Configuration", "SchemeSettingElement", False, "get_Name", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Configuration", "SchemeSettingElementCollection", False, "GetElementKey", "(System.Configuration.ConfigurationElement)", "", "Argument[0].Property[System.Configuration.SchemeSettingElement.Name]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Configuration", "SchemeSettingElementCollection", False, "get_Item", "(System.Int32)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Configuration", "SchemeSettingElementCollection", False, "get_Item", "(System.String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Configuration", "SectionInformation", False, "GetParentSection", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Configuration", "SectionInformation", False, "GetRawXml", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Configuration", "SectionInformation", False, "GetRawXml", "()", "", "Argument[this].SyntheticField[System.Configuration.SectionInformation.RawXml]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Configuration", "SectionInformation", False, "ProtectSection", "(System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Configuration", "SectionInformation", False, "SetRawXml", "(System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["System.Configuration", "SectionInformation", False, "SetRawXml", "(System.String)", "", "Argument[0]", "Argument[this].SyntheticField[System.Configuration.SectionInformation.RawXml]", "value", "dfc-generated"]
       - ["System.Configuration", "SectionInformation", False, "get_ProtectionProvider", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Configuration", "SectionInformation", False, "get_SectionName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Configuration", "SettingChangingEventArgs", False, "SettingChangingEventArgs", "(System.String,System.String,System.String,System.Object,System.Boolean)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Configuration", "SettingChangingEventArgs", False, "SettingChangingEventArgs", "(System.String,System.String,System.String,System.Object,System.Boolean)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Configuration", "SettingChangingEventArgs", False, "SettingChangingEventArgs", "(System.String,System.String,System.String,System.Object,System.Boolean)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Configuration", "SettingChangingEventArgs", False, "SettingChangingEventArgs", "(System.String,System.String,System.String,System.Object,System.Boolean)", "", "Argument[3]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Configuration", "SettingChangingEventArgs", False, "get_NewValue", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Configuration", "SettingChangingEventArgs", False, "get_SettingClass", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Configuration", "SettingChangingEventArgs", False, "get_SettingKey", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Configuration", "SettingChangingEventArgs", False, "get_SettingName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Configuration", "SettingChangingEventArgs", False, "SettingChangingEventArgs", "(System.String,System.String,System.String,System.Object,System.Boolean)", "", "Argument[0]", "Argument[this].SyntheticField[System.Configuration.SettingChangingEventArgs._settingName]", "value", "dfc-generated"]
+      - ["System.Configuration", "SettingChangingEventArgs", False, "SettingChangingEventArgs", "(System.String,System.String,System.String,System.Object,System.Boolean)", "", "Argument[1]", "Argument[this].SyntheticField[System.Configuration.SettingChangingEventArgs._settingClass]", "value", "dfc-generated"]
+      - ["System.Configuration", "SettingChangingEventArgs", False, "SettingChangingEventArgs", "(System.String,System.String,System.String,System.Object,System.Boolean)", "", "Argument[2]", "Argument[this].SyntheticField[System.Configuration.SettingChangingEventArgs._settingKey]", "value", "dfc-generated"]
+      - ["System.Configuration", "SettingChangingEventArgs", False, "SettingChangingEventArgs", "(System.String,System.String,System.String,System.Object,System.Boolean)", "", "Argument[3]", "Argument[this].SyntheticField[System.Configuration.SettingChangingEventArgs._newValue]", "value", "dfc-generated"]
+      - ["System.Configuration", "SettingChangingEventArgs", False, "get_NewValue", "()", "", "Argument[this].SyntheticField[System.Configuration.SettingChangingEventArgs._newValue]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Configuration", "SettingChangingEventArgs", False, "get_SettingClass", "()", "", "Argument[this].SyntheticField[System.Configuration.SettingChangingEventArgs._settingClass]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Configuration", "SettingChangingEventArgs", False, "get_SettingKey", "()", "", "Argument[this].SyntheticField[System.Configuration.SettingChangingEventArgs._settingKey]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Configuration", "SettingChangingEventArgs", False, "get_SettingName", "()", "", "Argument[this].SyntheticField[System.Configuration.SettingChangingEventArgs._settingName]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Configuration", "SettingElementCollection", False, "Add", "(System.Configuration.SettingElement)", "", "Argument[this]", "Argument[0]", "taint", "df-generated"]
       - ["System.Configuration", "SettingElementCollection", False, "Get", "(System.String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Configuration", "SettingsBase", False, "Initialize", "(System.Configuration.SettingsContext,System.Configuration.SettingsPropertyCollection,System.Configuration.SettingsProviderCollection)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["System.Configuration", "SettingsBase", False, "Initialize", "(System.Configuration.SettingsContext,System.Configuration.SettingsPropertyCollection,System.Configuration.SettingsProviderCollection)", "", "Argument[1].Element", "Argument[this]", "taint", "df-generated"]
-      - ["System.Configuration", "SettingsBase", False, "Initialize", "(System.Configuration.SettingsContext,System.Configuration.SettingsPropertyCollection,System.Configuration.SettingsProviderCollection)", "", "Argument[2].Element", "Argument[this]", "taint", "df-generated"]
-      - ["System.Configuration", "SettingsBase", False, "Synchronized", "(System.Configuration.SettingsBase)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Configuration", "SettingsBase", True, "get_Context", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Configuration", "SettingElementCollection", False, "GetElementKey", "(System.Configuration.ConfigurationElement)", "", "Argument[0].Property[System.Configuration.SettingElement.Name]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Configuration", "SettingsBase", False, "Initialize", "(System.Configuration.SettingsContext,System.Configuration.SettingsPropertyCollection,System.Configuration.SettingsProviderCollection)", "", "Argument[0]", "Argument[this].SyntheticField[System.Configuration.SettingsBase._context]", "value", "dfc-generated"]
+      - ["System.Configuration", "SettingsBase", False, "Initialize", "(System.Configuration.SettingsContext,System.Configuration.SettingsPropertyCollection,System.Configuration.SettingsProviderCollection)", "", "Argument[1]", "Argument[this].SyntheticField[System.Configuration.SettingsBase._properties]", "value", "dfc-generated"]
+      - ["System.Configuration", "SettingsBase", False, "Initialize", "(System.Configuration.SettingsContext,System.Configuration.SettingsPropertyCollection,System.Configuration.SettingsProviderCollection)", "", "Argument[2]", "Argument[this].SyntheticField[System.Configuration.SettingsBase._providers]", "value", "dfc-generated"]
+      - ["System.Configuration", "SettingsBase", False, "Synchronized", "(System.Configuration.SettingsBase)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Configuration", "SettingsBase", True, "get_Context", "()", "", "Argument[this].SyntheticField[System.Configuration.SettingsBase._context]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Configuration", "SettingsBase", True, "get_Item", "(System.String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Configuration", "SettingsBase", True, "get_Properties", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Configuration", "SettingsBase", True, "get_Properties", "()", "", "Argument[this].SyntheticField[System.Configuration.SettingsBase._properties]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Configuration", "SettingsBase", True, "get_PropertyValues", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Configuration", "SettingsBase", True, "get_Providers", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Configuration", "SettingsDescriptionAttribute", False, "SettingsDescriptionAttribute", "(System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Configuration", "SettingsDescriptionAttribute", False, "get_Description", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Configuration", "SettingsGroupDescriptionAttribute", False, "SettingsGroupDescriptionAttribute", "(System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Configuration", "SettingsGroupDescriptionAttribute", False, "get_Description", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Configuration", "SettingsGroupNameAttribute", False, "SettingsGroupNameAttribute", "(System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Configuration", "SettingsGroupNameAttribute", False, "get_GroupName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Configuration", "SettingsLoadedEventArgs", False, "SettingsLoadedEventArgs", "(System.Configuration.SettingsProvider)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Configuration", "SettingsLoadedEventArgs", False, "get_Provider", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Configuration", "SettingsBase", True, "get_Providers", "()", "", "Argument[this].SyntheticField[System.Configuration.SettingsBase._providers]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Configuration", "SettingsDescriptionAttribute", False, "SettingsDescriptionAttribute", "(System.String)", "", "Argument[0]", "Argument[this].SyntheticField[System.Configuration.SettingsDescriptionAttribute._description]", "value", "dfc-generated"]
+      - ["System.Configuration", "SettingsDescriptionAttribute", False, "get_Description", "()", "", "Argument[this].SyntheticField[System.Configuration.SettingsDescriptionAttribute._description]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Configuration", "SettingsGroupDescriptionAttribute", False, "SettingsGroupDescriptionAttribute", "(System.String)", "", "Argument[0]", "Argument[this].SyntheticField[System.Configuration.SettingsGroupDescriptionAttribute._description]", "value", "dfc-generated"]
+      - ["System.Configuration", "SettingsGroupDescriptionAttribute", False, "get_Description", "()", "", "Argument[this].SyntheticField[System.Configuration.SettingsGroupDescriptionAttribute._description]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Configuration", "SettingsGroupNameAttribute", False, "SettingsGroupNameAttribute", "(System.String)", "", "Argument[0]", "Argument[this].SyntheticField[System.Configuration.SettingsGroupNameAttribute._groupName]", "value", "dfc-generated"]
+      - ["System.Configuration", "SettingsGroupNameAttribute", False, "get_GroupName", "()", "", "Argument[this].SyntheticField[System.Configuration.SettingsGroupNameAttribute._groupName]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Configuration", "SettingsLoadedEventArgs", False, "SettingsLoadedEventArgs", "(System.Configuration.SettingsProvider)", "", "Argument[0]", "Argument[this].SyntheticField[System.Configuration.SettingsLoadedEventArgs._provider]", "value", "dfc-generated"]
+      - ["System.Configuration", "SettingsLoadedEventArgs", False, "get_Provider", "()", "", "Argument[this].SyntheticField[System.Configuration.SettingsLoadedEventArgs._provider]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Configuration", "SettingsPropertyCollection", False, "get_Item", "(System.String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Configuration", "SettingsPropertyValue", False, "get_Name", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Configuration", "SettingsPropertyValueCollection", False, "Add", "(System.Configuration.SettingsPropertyValue)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Configuration", "SettingsPropertyValueCollection", False, "get_Item", "(System.String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Configuration", "SettingsProviderAttribute", False, "SettingsProviderAttribute", "(System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Configuration", "SettingsProviderAttribute", False, "get_ProviderTypeName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Configuration", "SettingsPropertyValue", False, "get_Name", "()", "", "Argument[this].Property[System.Configuration.SettingsPropertyValue.Property].Property[System.Configuration.SettingsProperty.Name]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Configuration", "SettingsPropertyValueCollection", False, "Add", "(System.Configuration.SettingsPropertyValue)", "", "Argument[0]", "Argument[this].SyntheticField[System.Configuration.SettingsPropertyValueCollection._values].Element", "value", "dfc-generated"]
+      - ["System.Configuration", "SettingsPropertyValueCollection", False, "get_Item", "(System.String)", "", "Argument[this].SyntheticField[System.Configuration.SettingsPropertyValueCollection._values].Element", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Configuration", "SettingsProviderAttribute", False, "SettingsProviderAttribute", "(System.String)", "", "Argument[0]", "Argument[this].SyntheticField[System.Configuration.SettingsProviderAttribute._providerTypeName]", "value", "dfc-generated"]
+      - ["System.Configuration", "SettingsProviderAttribute", False, "get_ProviderTypeName", "()", "", "Argument[this].SyntheticField[System.Configuration.SettingsProviderAttribute._providerTypeName]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Configuration", "SettingsProviderCollection", False, "get_Item", "(System.String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Configuration", "SingleTagSectionHandler", True, "Create", "(System.Object,System.Object,System.Xml.XmlNode)", "", "Argument[0].Element.Property[System.Collections.Generic.KeyValuePair`2.Key]", "ReturnValue.Element.Property[System.Collections.Generic.KeyValuePair`2.Key]", "value", "dfc-generated"]
+      - ["System.Configuration", "SingleTagSectionHandler", True, "Create", "(System.Object,System.Object,System.Xml.XmlNode)", "", "Argument[0].Element.Property[System.Collections.Generic.KeyValuePair`2.Value]", "ReturnValue.Element.Property[System.Collections.Generic.KeyValuePair`2.Value]", "value", "dfc-generated"]
       - ["System.Configuration", "StringValidator", False, "StringValidator", "(System.Int32,System.Int32,System.String)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
       - ["System.Configuration", "TimeSpanValidator", False, "TimeSpanValidator", "(System.TimeSpan,System.TimeSpan,System.Boolean,System.Int64)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Configuration", "TimeSpanValidator", False, "TimeSpanValidator", "(System.TimeSpan,System.TimeSpan,System.Boolean,System.Int64)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
@@ -201,17 +217,21 @@ extensions:
       - ["System.Configuration", "AppSettingsSection", "IsModified", "()", "summary", "df-generated"]
       - ["System.Configuration", "ApplicationSettingsBase", "ApplicationSettingsBase", "(System.ComponentModel.IComponent)", "summary", "df-generated"]
       - ["System.Configuration", "ApplicationSettingsBase", "GetPreviousVersion", "(System.String)", "summary", "df-generated"]
-      - ["System.Configuration", "ApplicationSettingsBase", "OnPropertyChanged", "(System.Object,System.ComponentModel.PropertyChangedEventArgs)", "summary", "df-generated"]
-      - ["System.Configuration", "ApplicationSettingsBase", "OnSettingChanging", "(System.Object,System.Configuration.SettingChangingEventArgs)", "summary", "df-generated"]
-      - ["System.Configuration", "ApplicationSettingsBase", "OnSettingsLoaded", "(System.Object,System.Configuration.SettingsLoadedEventArgs)", "summary", "df-generated"]
-      - ["System.Configuration", "ApplicationSettingsBase", "OnSettingsSaving", "(System.Object,System.ComponentModel.CancelEventArgs)", "summary", "df-generated"]
       - ["System.Configuration", "ApplicationSettingsBase", "Reload", "()", "summary", "df-generated"]
       - ["System.Configuration", "ApplicationSettingsBase", "Reset", "()", "summary", "df-generated"]
       - ["System.Configuration", "ApplicationSettingsBase", "Save", "()", "summary", "df-generated"]
       - ["System.Configuration", "ApplicationSettingsBase", "Upgrade", "()", "summary", "df-generated"]
+      - ["System.Configuration", "ApplicationSettingsBase", "add_PropertyChanged", "(System.ComponentModel.PropertyChangedEventHandler)", "summary", "df-generated"]
+      - ["System.Configuration", "ApplicationSettingsBase", "add_SettingChanging", "(System.Configuration.SettingChangingEventHandler)", "summary", "df-generated"]
+      - ["System.Configuration", "ApplicationSettingsBase", "add_SettingsLoaded", "(System.Configuration.SettingsLoadedEventHandler)", "summary", "df-generated"]
+      - ["System.Configuration", "ApplicationSettingsBase", "add_SettingsSaving", "(System.Configuration.SettingsSavingEventHandler)", "summary", "df-generated"]
+      - ["System.Configuration", "ApplicationSettingsBase", "remove_PropertyChanged", "(System.ComponentModel.PropertyChangedEventHandler)", "summary", "df-generated"]
+      - ["System.Configuration", "ApplicationSettingsBase", "remove_SettingChanging", "(System.Configuration.SettingChangingEventHandler)", "summary", "df-generated"]
+      - ["System.Configuration", "ApplicationSettingsBase", "remove_SettingsLoaded", "(System.Configuration.SettingsLoadedEventHandler)", "summary", "df-generated"]
+      - ["System.Configuration", "ApplicationSettingsBase", "remove_SettingsSaving", "(System.Configuration.SettingsSavingEventHandler)", "summary", "df-generated"]
       - ["System.Configuration", "ApplicationSettingsBase", "set_Item", "(System.String,System.Object)", "summary", "df-generated"]
+      - ["System.Configuration", "CallbackValidator", "CallbackValidator", "(System.Type,System.Configuration.ValidatorCallback)", "summary", "df-generated"]
       - ["System.Configuration", "CallbackValidator", "CanValidate", "(System.Type)", "summary", "df-generated"]
-      - ["System.Configuration", "CallbackValidator", "Validate", "(System.Object)", "summary", "df-generated"]
       - ["System.Configuration", "CommaDelimitedStringCollection", "Remove", "(System.String)", "summary", "df-generated"]
       - ["System.Configuration", "CommaDelimitedStringCollection", "SetReadOnly", "()", "summary", "df-generated"]
       - ["System.Configuration", "CommaDelimitedStringCollection", "get_IsModified", "()", "summary", "df-generated"]
@@ -272,6 +292,7 @@ extensions:
       - ["System.Configuration", "ConfigurationElementCollection", "get_ThrowOnDuplicate", "()", "summary", "df-generated"]
       - ["System.Configuration", "ConfigurationElementProperty", "ConfigurationElementProperty", "(System.Configuration.ConfigurationValidatorBase)", "summary", "df-generated"]
       - ["System.Configuration", "ConfigurationElementProperty", "get_Validator", "()", "summary", "df-generated"]
+      - ["System.Configuration", "ConfigurationErrorsException", "ConfigurationErrorsException", "(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)", "summary", "df-generated"]
       - ["System.Configuration", "ConfigurationErrorsException", "ConfigurationErrorsException", "(System.String)", "summary", "df-generated"]
       - ["System.Configuration", "ConfigurationErrorsException", "ConfigurationErrorsException", "(System.String,System.Exception)", "summary", "df-generated"]
       - ["System.Configuration", "ConfigurationErrorsException", "ConfigurationErrorsException", "(System.String,System.Exception,System.Xml.XmlNode)", "summary", "df-generated"]
@@ -282,6 +303,7 @@ extensions:
       - ["System.Configuration", "ConfigurationErrorsException", "GetLineNumber", "(System.Xml.XmlNode)", "summary", "df-generated"]
       - ["System.Configuration", "ConfigurationErrorsException", "GetLineNumber", "(System.Xml.XmlReader)", "summary", "df-generated"]
       - ["System.Configuration", "ConfigurationErrorsException", "get_Line", "()", "summary", "df-generated"]
+      - ["System.Configuration", "ConfigurationException", "ConfigurationException", "(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)", "summary", "df-generated"]
       - ["System.Configuration", "ConfigurationException", "ConfigurationException", "(System.String)", "summary", "df-generated"]
       - ["System.Configuration", "ConfigurationException", "ConfigurationException", "(System.String,System.Exception)", "summary", "df-generated"]
       - ["System.Configuration", "ConfigurationException", "ConfigurationException", "(System.String,System.Exception,System.Xml.XmlNode)", "summary", "df-generated"]
@@ -332,12 +354,14 @@ extensions:
       - ["System.Configuration", "ConfigurationSection", "ShouldSerializeSectionInTargetVersion", "(System.Runtime.Versioning.FrameworkName)", "summary", "df-generated"]
       - ["System.Configuration", "ConfigurationSection", "get_SectionInformation", "()", "summary", "df-generated"]
       - ["System.Configuration", "ConfigurationSectionCollection", "CopyTo", "(System.Configuration.ConfigurationSection[],System.Int32)", "summary", "df-generated"]
+      - ["System.Configuration", "ConfigurationSectionCollection", "GetKey", "(System.Int32)", "summary", "df-generated"]
       - ["System.Configuration", "ConfigurationSectionCollection", "Remove", "(System.String)", "summary", "df-generated"]
       - ["System.Configuration", "ConfigurationSectionCollection", "RemoveAt", "(System.Int32)", "summary", "df-generated"]
       - ["System.Configuration", "ConfigurationSectionCollection", "get_Count", "()", "summary", "df-generated"]
       - ["System.Configuration", "ConfigurationSectionGroup", "ForceDeclaration", "()", "summary", "df-generated"]
       - ["System.Configuration", "ConfigurationSectionGroup", "ForceDeclaration", "(System.Boolean)", "summary", "df-generated"]
       - ["System.Configuration", "ConfigurationSectionGroup", "ShouldSerializeSectionGroupInTargetVersion", "(System.Runtime.Versioning.FrameworkName)", "summary", "df-generated"]
+      - ["System.Configuration", "ConfigurationSectionGroupCollection", "GetKey", "(System.Int32)", "summary", "df-generated"]
       - ["System.Configuration", "ConfigurationSectionGroupCollection", "Remove", "(System.String)", "summary", "df-generated"]
       - ["System.Configuration", "ConfigurationSectionGroupCollection", "RemoveAt", "(System.Int32)", "summary", "df-generated"]
       - ["System.Configuration", "ConfigurationSectionGroupCollection", "get_Count", "()", "summary", "df-generated"]
@@ -346,7 +370,6 @@ extensions:
       - ["System.Configuration", "ConfigurationValidatorAttribute", "ConfigurationValidatorAttribute", "(System.Type)", "summary", "df-generated"]
       - ["System.Configuration", "ConfigurationValidatorAttribute", "get_ValidatorType", "()", "summary", "df-generated"]
       - ["System.Configuration", "ConfigurationValidatorBase", "CanValidate", "(System.Type)", "summary", "df-generated"]
-      - ["System.Configuration", "ConfigurationValidatorBase", "Validate", "(System.Object)", "summary", "df-generated"]
       - ["System.Configuration", "ConnectionStringSettings", "ConnectionStringSettings", "(System.String,System.String)", "summary", "df-generated"]
       - ["System.Configuration", "ConnectionStringSettings", "ConnectionStringSettings", "(System.String,System.String,System.String)", "summary", "df-generated"]
       - ["System.Configuration", "ConnectionStringSettingsCollection", "CreateNewElement", "()", "summary", "df-generated"]
@@ -358,7 +381,6 @@ extensions:
       - ["System.Configuration", "DefaultSection", "IsModified", "()", "summary", "df-generated"]
       - ["System.Configuration", "DefaultSection", "ResetModified", "()", "summary", "df-generated"]
       - ["System.Configuration", "DefaultValidator", "CanValidate", "(System.Type)", "summary", "df-generated"]
-      - ["System.Configuration", "DefaultValidator", "Validate", "(System.Object)", "summary", "df-generated"]
       - ["System.Configuration", "DictionarySectionHandler", "get_KeyAttributeName", "()", "summary", "df-generated"]
       - ["System.Configuration", "DictionarySectionHandler", "get_ValueAttributeName", "()", "summary", "df-generated"]
       - ["System.Configuration", "DpapiProtectedConfigurationProvider", "Decrypt", "(System.Xml.XmlNode)", "summary", "df-generated"]
@@ -391,7 +413,6 @@ extensions:
       - ["System.Configuration", "IntegerValidator", "IntegerValidator", "(System.Int32,System.Int32)", "summary", "df-generated"]
       - ["System.Configuration", "IntegerValidator", "IntegerValidator", "(System.Int32,System.Int32,System.Boolean)", "summary", "df-generated"]
       - ["System.Configuration", "IntegerValidator", "IntegerValidator", "(System.Int32,System.Int32,System.Boolean,System.Int32)", "summary", "df-generated"]
-      - ["System.Configuration", "IntegerValidator", "Validate", "(System.Object)", "summary", "df-generated"]
       - ["System.Configuration", "KeyValueConfigurationCollection", "Add", "(System.String,System.String)", "summary", "df-generated"]
       - ["System.Configuration", "KeyValueConfigurationCollection", "CreateNewElement", "()", "summary", "df-generated"]
       - ["System.Configuration", "KeyValueConfigurationCollection", "Remove", "(System.String)", "summary", "df-generated"]
@@ -405,7 +426,6 @@ extensions:
       - ["System.Configuration", "LongValidator", "LongValidator", "(System.Int64,System.Int64)", "summary", "df-generated"]
       - ["System.Configuration", "LongValidator", "LongValidator", "(System.Int64,System.Int64,System.Boolean)", "summary", "df-generated"]
       - ["System.Configuration", "LongValidator", "LongValidator", "(System.Int64,System.Int64,System.Boolean,System.Int64)", "summary", "df-generated"]
-      - ["System.Configuration", "LongValidator", "Validate", "(System.Object)", "summary", "df-generated"]
       - ["System.Configuration", "NameValueConfigurationCollection", "CreateNewElement", "()", "summary", "df-generated"]
       - ["System.Configuration", "NameValueConfigurationCollection", "Remove", "(System.Configuration.NameValueConfigurationElement)", "summary", "df-generated"]
       - ["System.Configuration", "NameValueConfigurationCollection", "Remove", "(System.String)", "summary", "df-generated"]
@@ -413,7 +433,6 @@ extensions:
       - ["System.Configuration", "NameValueSectionHandler", "get_KeyAttributeName", "()", "summary", "df-generated"]
       - ["System.Configuration", "NameValueSectionHandler", "get_ValueAttributeName", "()", "summary", "df-generated"]
       - ["System.Configuration", "PositiveTimeSpanValidator", "CanValidate", "(System.Type)", "summary", "df-generated"]
-      - ["System.Configuration", "PositiveTimeSpanValidator", "Validate", "(System.Object)", "summary", "df-generated"]
       - ["System.Configuration", "PropertyInformation", "get_IsKey", "()", "summary", "df-generated"]
       - ["System.Configuration", "PropertyInformation", "get_IsLocked", "()", "summary", "df-generated"]
       - ["System.Configuration", "PropertyInformation", "get_IsModified", "()", "summary", "df-generated"]
@@ -423,6 +442,7 @@ extensions:
       - ["System.Configuration", "PropertyInformation", "get_Source", "()", "summary", "df-generated"]
       - ["System.Configuration", "PropertyInformation", "get_Type", "()", "summary", "df-generated"]
       - ["System.Configuration", "PropertyInformation", "get_ValueOrigin", "()", "summary", "df-generated"]
+      - ["System.Configuration", "PropertyInformationCollection", "get_Item", "(System.String)", "summary", "df-generated"]
       - ["System.Configuration", "ProtectedConfiguration", "get_DefaultProvider", "()", "summary", "df-generated"]
       - ["System.Configuration", "ProtectedConfiguration", "get_Providers", "()", "summary", "df-generated"]
       - ["System.Configuration", "ProtectedConfigurationProvider", "Decrypt", "(System.Xml.XmlNode)", "summary", "df-generated"]
@@ -434,7 +454,6 @@ extensions:
       - ["System.Configuration", "ProviderSettingsCollection", "CreateNewElement", "()", "summary", "df-generated"]
       - ["System.Configuration", "ProviderSettingsCollection", "Remove", "(System.String)", "summary", "df-generated"]
       - ["System.Configuration", "RegexStringValidator", "CanValidate", "(System.Type)", "summary", "df-generated"]
-      - ["System.Configuration", "RegexStringValidator", "Validate", "(System.Object)", "summary", "df-generated"]
       - ["System.Configuration", "RegexStringValidatorAttribute", "RegexStringValidatorAttribute", "(System.String)", "summary", "df-generated"]
       - ["System.Configuration", "RegexStringValidatorAttribute", "get_Regex", "()", "summary", "df-generated"]
       - ["System.Configuration", "RsaProtectedConfigurationProvider", "AddKey", "(System.Int32,System.Boolean)", "summary", "df-generated"]
@@ -520,13 +539,10 @@ extensions:
       - ["System.Configuration", "StringValidator", "CanValidate", "(System.Type)", "summary", "df-generated"]
       - ["System.Configuration", "StringValidator", "StringValidator", "(System.Int32)", "summary", "df-generated"]
       - ["System.Configuration", "StringValidator", "StringValidator", "(System.Int32,System.Int32)", "summary", "df-generated"]
-      - ["System.Configuration", "StringValidator", "Validate", "(System.Object)", "summary", "df-generated"]
       - ["System.Configuration", "SubclassTypeValidator", "CanValidate", "(System.Type)", "summary", "df-generated"]
       - ["System.Configuration", "SubclassTypeValidator", "SubclassTypeValidator", "(System.Type)", "summary", "df-generated"]
-      - ["System.Configuration", "SubclassTypeValidator", "Validate", "(System.Object)", "summary", "df-generated"]
       - ["System.Configuration", "SubclassTypeValidatorAttribute", "SubclassTypeValidatorAttribute", "(System.Type)", "summary", "df-generated"]
       - ["System.Configuration", "SubclassTypeValidatorAttribute", "get_BaseClass", "()", "summary", "df-generated"]
       - ["System.Configuration", "TimeSpanValidator", "CanValidate", "(System.Type)", "summary", "df-generated"]
       - ["System.Configuration", "TimeSpanValidator", "TimeSpanValidator", "(System.TimeSpan,System.TimeSpan)", "summary", "df-generated"]
       - ["System.Configuration", "TimeSpanValidator", "TimeSpanValidator", "(System.TimeSpan,System.TimeSpan,System.Boolean)", "summary", "df-generated"]
-      - ["System.Configuration", "TimeSpanValidator", "Validate", "(System.Object)", "summary", "df-generated"]
diff --git a/csharp/ql/lib/ext/generated/System.Data.Common.model.yml b/csharp/ql/lib/ext/generated/System.Data.Common.model.yml
index 3468643f6fe..ac729ebdbea 100644
--- a/csharp/ql/lib/ext/generated/System.Data.Common.model.yml
+++ b/csharp/ql/lib/ext/generated/System.Data.Common.model.yml
@@ -4,56 +4,42 @@ extensions:
       pack: codeql/csharp-all
       extensible: summaryModel
     data:
+      - ["System.Data.Common", "DataAdapter", False, "get_TableMappings", "()", "", "Argument[this].Property[System.Data.Common.DataAdapter.TableMappings]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Data.Common", "DataAdapter", False, "get_TableMappings", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Data.Common", "DataAdapter", True, "FillSchema", "(System.Data.DataTable,System.Data.SchemaType,System.Data.IDataReader)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Data.Common", "DataAdapter", True, "FillSchema", "(System.Data.DataTable,System.Data.SchemaType,System.Data.IDataReader)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Data.Common", "DataColumnMapping", False, "DataColumnMapping", "(System.String,System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Data.Common", "DataColumnMapping", False, "DataColumnMapping", "(System.String,System.String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["System.Data.Common", "DataAdapter", True, "FillSchema", "(System.Data.DataTable,System.Data.SchemaType,System.Data.IDataReader)", "", "Argument[0]", "ReturnValue.Element", "value", "dfc-generated"]
+      - ["System.Data.Common", "DataAdapter", True, "FillSchema", "(System.Data.DataTable,System.Data.SchemaType,System.Data.IDataReader)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Data.Common", "DataColumnMapping", False, "Clone", "()", "", "Argument[this].SyntheticField[System.Data.Common.DataColumnMapping._sourceColumnName]", "ReturnValue.SyntheticField[System.Data.Common.DataColumnMapping._sourceColumnName]", "value", "dfc-generated"]
+      - ["System.Data.Common", "DataColumnMapping", False, "DataColumnMapping", "(System.String,System.String)", "", "Argument[0]", "Argument[this].SyntheticField[System.Data.Common.DataColumnMapping._sourceColumnName]", "value", "dfc-generated"]
       - ["System.Data.Common", "DataColumnMapping", False, "GetDataColumnBySchemaAction", "(System.Data.DataTable,System.Type,System.Data.MissingSchemaAction)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["System.Data.Common", "DataColumnMapping", False, "GetDataColumnBySchemaAction", "(System.String,System.String,System.Data.DataTable,System.Type,System.Data.MissingSchemaAction)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Data.Common", "DataColumnMapping", False, "ToString", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Data.Common", "DataColumnMappingCollection", False, "Add", "(System.String,System.String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Data.Common", "DataColumnMappingCollection", False, "Add", "(System.String,System.String)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Data.Common", "DataColumnMapping", False, "ToString", "()", "", "Argument[this].Property[System.Data.Common.DataColumnMapping.SourceColumn]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Data.Common", "DataColumnMapping", False, "ToString", "()", "", "Argument[this].SyntheticField[System.Data.Common.DataColumnMapping._sourceColumnName]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Data.Common", "DataColumnMappingCollection", False, "Add", "(System.String,System.String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Data.Common", "DataColumnMappingCollection", False, "GetByDataSetColumn", "(System.String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Data.Common", "DataColumnMappingCollection", False, "GetColumnMappingBySchemaAction", "(System.Data.Common.DataColumnMappingCollection,System.String,System.Data.MissingMappingAction)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["System.Data.Common", "DataColumnMappingCollection", False, "GetColumnMappingBySchemaAction", "(System.Data.Common.DataColumnMappingCollection,System.String,System.Data.MissingMappingAction)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
       - ["System.Data.Common", "DataColumnMappingCollection", False, "GetDataColumn", "(System.Data.Common.DataColumnMappingCollection,System.String,System.Type,System.Data.DataTable,System.Data.MissingMappingAction,System.Data.MissingSchemaAction)", "", "Argument[3]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Data.Common", "DataTableMapping", False, "DataTableMapping", "(System.String,System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Data.Common", "DataTableMapping", False, "DataTableMapping", "(System.String,System.String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Data.Common", "DataTableMapping", False, "DataTableMapping", "(System.String,System.String,System.Data.Common.DataColumnMapping[])", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Data.Common", "DataTableMapping", False, "DataTableMapping", "(System.String,System.String,System.Data.Common.DataColumnMapping[])", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Data.Common", "DataTableMapping", False, "DataTableMapping", "(System.String,System.String,System.Data.Common.DataColumnMapping[])", "", "Argument[2].Element", "Argument[this]", "taint", "df-generated"]
-      - ["System.Data.Common", "DataTableMapping", False, "GetColumnMappingBySchemaAction", "(System.String,System.Data.MissingMappingAction)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Data.Common", "DataTableMapping", False, "Clone", "()", "", "Argument[this].SyntheticField[System.Data.Common.DataTableMapping._sourceTableName]", "ReturnValue.SyntheticField[System.Data.Common.DataTableMapping._sourceTableName]", "value", "dfc-generated"]
+      - ["System.Data.Common", "DataTableMapping", False, "DataTableMapping", "(System.String,System.String)", "", "Argument[0]", "Argument[this].SyntheticField[System.Data.Common.DataTableMapping._sourceTableName]", "value", "dfc-generated"]
+      - ["System.Data.Common", "DataTableMapping", False, "DataTableMapping", "(System.String,System.String,System.Data.Common.DataColumnMapping[])", "", "Argument[0]", "Argument[this].SyntheticField[System.Data.Common.DataTableMapping._sourceTableName]", "value", "dfc-generated"]
+      - ["System.Data.Common", "DataTableMapping", False, "DataTableMapping", "(System.String,System.String,System.Data.Common.DataColumnMapping[])", "", "Argument[2].Element", "Argument[this].Property[System.Data.Common.DataTableMapping.ColumnMappings].Element", "value", "dfc-generated"]
+      - ["System.Data.Common", "DataTableMapping", False, "DataTableMapping", "(System.String,System.String,System.Data.Common.DataColumnMapping[])", "", "Argument[2].Element", "Argument[this].SyntheticField[System.Data.Common.DataTableMapping._columnMappings].Element", "value", "dfc-generated"]
       - ["System.Data.Common", "DataTableMapping", False, "GetColumnMappingBySchemaAction", "(System.String,System.Data.MissingMappingAction)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Data.Common", "DataTableMapping", False, "GetDataColumn", "(System.String,System.Type,System.Data.DataTable,System.Data.MissingMappingAction,System.Data.MissingSchemaAction)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
       - ["System.Data.Common", "DataTableMapping", False, "GetDataTableBySchemaAction", "(System.Data.DataSet,System.Data.MissingSchemaAction)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["System.Data.Common", "DataTableMapping", False, "GetDataTableBySchemaAction", "(System.Data.DataSet,System.Data.MissingSchemaAction)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Data.Common", "DataTableMapping", False, "ToString", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Data.Common", "DataTableMapping", False, "get_ColumnMappings", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Data.Common", "DataTableMappingCollection", False, "Add", "(System.String,System.String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Data.Common", "DataTableMappingCollection", False, "Add", "(System.String,System.String)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Data.Common", "DataTableMapping", False, "ToString", "()", "", "Argument[this].Property[System.Data.Common.DataTableMapping.SourceTable]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Data.Common", "DataTableMapping", False, "ToString", "()", "", "Argument[this].SyntheticField[System.Data.Common.DataTableMapping._sourceTableName]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Data.Common", "DataTableMapping", False, "get_ColumnMappings", "()", "", "Argument[this].Property[System.Data.Common.DataTableMapping.ColumnMappings]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Data.Common", "DataTableMapping", False, "get_ColumnMappings", "()", "", "Argument[this].SyntheticField[System.Data.Common.DataTableMapping._columnMappings]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Data.Common", "DataTableMappingCollection", False, "Add", "(System.String,System.String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Data.Common", "DataTableMappingCollection", False, "GetByDataSetTable", "(System.String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Data.Common", "DataTableMappingCollection", False, "GetTableMappingBySchemaAction", "(System.Data.Common.DataTableMappingCollection,System.String,System.String,System.Data.MissingMappingAction)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["System.Data.Common", "DataTableMappingCollection", False, "GetTableMappingBySchemaAction", "(System.Data.Common.DataTableMappingCollection,System.String,System.String,System.Data.MissingMappingAction)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Data.Common", "DataTableMappingCollection", False, "GetTableMappingBySchemaAction", "(System.Data.Common.DataTableMappingCollection,System.String,System.String,System.Data.MissingMappingAction)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Data.Common", "DbBatch", False, "get_BatchCommands", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Data.Common", "DbBatch", False, "get_BatchCommands", "()", "", "Argument[this].Property[System.Data.Common.DbBatch.DbBatchCommands]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Data.Common", "DbBatch", True, "get_DbBatchCommands", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Data.Common", "DbBatchCommand", False, "get_Parameters", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Data.Common", "DbBatchCommand", False, "get_Parameters", "()", "", "Argument[this].Property[System.Data.Common.DbBatchCommand.DbParameterCollection]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Data.Common", "DbColumn", True, "get_Item", "(System.String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Data.Common", "DbCommand", False, "ExecuteReader", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Data.Common", "DbCommand", False, "ExecuteReader", "(System.Data.CommandBehavior)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Data.Common", "DbCommand", False, "ExecuteReaderAsync", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Data.Common", "DbCommand", False, "ExecuteReaderAsync", "(System.Data.CommandBehavior)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Data.Common", "DbCommand", False, "ExecuteReaderAsync", "(System.Data.CommandBehavior,System.Threading.CancellationToken)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Data.Common", "DbCommand", False, "ExecuteReaderAsync", "(System.Threading.CancellationToken)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Data.Common", "DbCommand", False, "ExecuteScalarAsync", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Data.Common", "DbCommand", False, "get_Parameters", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Data.Common", "DbCommand", False, "get_Parameters", "()", "", "Argument[this].Property[System.Data.Common.DbCommand.DbParameterCollection]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Data.Common", "DbCommand", True, "ExecuteDbDataReader", "(System.Data.CommandBehavior)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Data.Common", "DbCommand", True, "ExecuteDbDataReaderAsync", "(System.Data.CommandBehavior,System.Threading.CancellationToken)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Data.Common", "DbCommand", True, "ExecuteScalarAsync", "(System.Threading.CancellationToken)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Data.Common", "DbCommand", True, "PrepareAsync", "(System.Threading.CancellationToken)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["System.Data.Common", "DbCommand", True, "get_DbParameterCollection", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Data.Common", "DbCommandBuilder", False, "GetDeleteCommand", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Data.Common", "DbCommandBuilder", False, "GetDeleteCommand", "(System.Boolean)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
@@ -62,81 +48,53 @@ extensions:
       - ["System.Data.Common", "DbCommandBuilder", False, "GetUpdateCommand", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Data.Common", "DbCommandBuilder", False, "GetUpdateCommand", "(System.Boolean)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Data.Common", "DbCommandBuilder", False, "RowUpdatingHandler", "(System.Data.Common.RowUpdatingEventArgs)", "", "Argument[this]", "Argument[0]", "taint", "df-generated"]
-      - ["System.Data.Common", "DbCommandBuilder", True, "GetParameterName", "(System.String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Data.Common", "DbCommandBuilder", True, "InitializeCommand", "(System.Data.Common.DbCommand)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Data.Common", "DbCommandBuilder", True, "QuoteIdentifier", "(System.String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Data.Common", "DbCommandBuilder", True, "QuoteIdentifier", "(System.String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Data.Common", "DbCommandBuilder", True, "UnquoteIdentifier", "(System.String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Data.Common", "DbCommandBuilder", True, "UnquoteIdentifier", "(System.String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Data.Common", "DbConnection", False, "BeginTransaction", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Data.Common", "DbConnection", False, "BeginTransaction", "(System.Data.IsolationLevel)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Data.Common", "DbConnection", False, "BeginTransactionAsync", "(System.Data.IsolationLevel,System.Threading.CancellationToken)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Data.Common", "DbConnection", False, "BeginTransactionAsync", "(System.Threading.CancellationToken)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Data.Common", "DbConnection", False, "CreateCommand", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Data.Common", "DbCommandBuilder", True, "GetParameterName", "(System.String)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Data.Common", "DbCommandBuilder", True, "InitializeCommand", "(System.Data.Common.DbCommand)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Data.Common", "DbCommandBuilder", True, "QuoteIdentifier", "(System.String)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Data.Common", "DbCommandBuilder", True, "UnquoteIdentifier", "(System.String)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Data.Common", "DbConnection", True, "BeginDbTransaction", "(System.Data.IsolationLevel)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Data.Common", "DbConnection", True, "BeginDbTransactionAsync", "(System.Data.IsolationLevel,System.Threading.CancellationToken)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Data.Common", "DbConnection", True, "ChangeDatabaseAsync", "(System.String,System.Threading.CancellationToken)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Data.Common", "DbConnection", True, "CreateDbCommand", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Data.Common", "DbConnection", True, "OpenAsync", "(System.Threading.CancellationToken)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["System.Data.Common", "DbConnection", True, "get_ServerVersion", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Data.Common", "DbConnectionStringBuilder", False, "AppendKeyValuePair", "(System.Text.StringBuilder,System.String,System.String)", "", "Argument[1]", "Argument[0]", "taint", "df-generated"]
-      - ["System.Data.Common", "DbConnectionStringBuilder", False, "AppendKeyValuePair", "(System.Text.StringBuilder,System.String,System.String)", "", "Argument[2]", "Argument[0]", "taint", "df-generated"]
-      - ["System.Data.Common", "DbConnectionStringBuilder", False, "AppendKeyValuePair", "(System.Text.StringBuilder,System.String,System.String,System.Boolean)", "", "Argument[1]", "Argument[0]", "taint", "df-generated"]
-      - ["System.Data.Common", "DbConnectionStringBuilder", False, "AppendKeyValuePair", "(System.Text.StringBuilder,System.String,System.String,System.Boolean)", "", "Argument[2]", "Argument[0]", "taint", "df-generated"]
-      - ["System.Data.Common", "DbConnectionStringBuilder", False, "ToString", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Data.Common", "DbConnectionStringBuilder", True, "GetProperties", "(System.Collections.Hashtable)", "", "Argument[this]", "Argument[0].Element", "taint", "df-generated"]
+      - ["System.Data.Common", "DbConnectionStringBuilder", False, "AppendKeyValuePair", "(System.Text.StringBuilder,System.String,System.String)", "", "Argument[1]", "Argument[0]", "taint", "dfc-generated"]
+      - ["System.Data.Common", "DbConnectionStringBuilder", False, "AppendKeyValuePair", "(System.Text.StringBuilder,System.String,System.String)", "", "Argument[2]", "Argument[0]", "taint", "dfc-generated"]
+      - ["System.Data.Common", "DbConnectionStringBuilder", False, "AppendKeyValuePair", "(System.Text.StringBuilder,System.String,System.String,System.Boolean)", "", "Argument[1]", "Argument[0]", "taint", "dfc-generated"]
+      - ["System.Data.Common", "DbConnectionStringBuilder", False, "AppendKeyValuePair", "(System.Text.StringBuilder,System.String,System.String,System.Boolean)", "", "Argument[2]", "Argument[0]", "taint", "dfc-generated"]
+      - ["System.Data.Common", "DbConnectionStringBuilder", False, "ToString", "()", "", "Argument[this].Property[System.Data.Common.DbConnectionStringBuilder.ConnectionString]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Data.Common", "DbConnectionStringBuilder", False, "ToString", "()", "", "Argument[this].Property[System.Data.Common.DbConnectionStringBuilder.Keys].Element", "ReturnValue", "taint", "dfc-generated"]
+      - ["System.Data.Common", "DbConnectionStringBuilder", True, "GetProperties", "(System.Collections.Hashtable)", "", "Argument[this].Property[System.Data.Common.DbConnectionStringBuilder.Keys].Element", "Argument[0].Element.Property[System.Collections.Generic.KeyValuePair`2.Key]", "value", "dfc-generated"]
       - ["System.Data.Common", "DbConnectionStringBuilder", True, "TryGetValue", "(System.String,System.Object)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Data.Common", "DbDataAdapter", False, "DbDataAdapter", "(System.Data.Common.DbDataAdapter)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Data.Common", "DbDataAdapter", False, "FillSchema", "(System.Data.DataTable,System.Data.SchemaType)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Data.Common", "DbDataAdapter", False, "FillSchema", "(System.Data.DataTable,System.Data.SchemaType)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Data.Common", "DbDataAdapter", True, "CreateRowUpdatedEvent", "(System.Data.DataRow,System.Data.IDbCommand,System.Data.StatementType,System.Data.Common.DataTableMapping)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Data.Common", "DbDataAdapter", True, "CreateRowUpdatedEvent", "(System.Data.DataRow,System.Data.IDbCommand,System.Data.StatementType,System.Data.Common.DataTableMapping)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Data.Common", "DbDataAdapter", True, "CreateRowUpdatedEvent", "(System.Data.DataRow,System.Data.IDbCommand,System.Data.StatementType,System.Data.Common.DataTableMapping)", "", "Argument[3]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Data.Common", "DbDataAdapter", True, "CreateRowUpdatingEvent", "(System.Data.DataRow,System.Data.IDbCommand,System.Data.StatementType,System.Data.Common.DataTableMapping)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Data.Common", "DbDataAdapter", True, "CreateRowUpdatingEvent", "(System.Data.DataRow,System.Data.IDbCommand,System.Data.StatementType,System.Data.Common.DataTableMapping)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Data.Common", "DbDataAdapter", True, "CreateRowUpdatingEvent", "(System.Data.DataRow,System.Data.IDbCommand,System.Data.StatementType,System.Data.Common.DataTableMapping)", "", "Argument[3]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Data.Common", "DbDataAdapter", True, "FillSchema", "(System.Data.DataTable,System.Data.SchemaType,System.Data.IDbCommand,System.Data.CommandBehavior)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Data.Common", "DbDataAdapter", True, "FillSchema", "(System.Data.DataTable,System.Data.SchemaType,System.Data.IDbCommand,System.Data.CommandBehavior)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Data.Common", "DbDataReader", False, "GetFieldValueAsync<T>", "(System.Int32)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Data.Common", "DbDataReader", True, "GetFieldValue<T>", "(System.Int32)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Data.Common", "DbDataReader", True, "GetFieldValueAsync<T>", "(System.Int32,System.Threading.CancellationToken)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Data.Common", "DbDataReader", True, "GetProviderSpecificValue", "(System.Int32)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Data.Common", "DbDataReader", True, "GetProviderSpecificValues", "(System.Object[])", "", "Argument[this]", "Argument[0].Element", "taint", "df-generated"]
-      - ["System.Data.Common", "DbDataReader", True, "GetSchemaTableAsync", "(System.Threading.CancellationToken)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Data.Common", "DbDataReader", True, "GetTextReader", "(System.Int32)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Data.Common", "DbDataSource", False, "CreateCommand", "(System.String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Data.Common", "DbDataSource", True, "CreateDbCommand", "(System.String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Data.Common", "DbDataAdapter", False, "FillSchema", "(System.Data.DataTable,System.Data.SchemaType)", "", "Argument[0]", "ReturnValue.Element", "value", "dfc-generated"]
+      - ["System.Data.Common", "DbDataAdapter", False, "FillSchema", "(System.Data.DataTable,System.Data.SchemaType)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Data.Common", "DbDataAdapter", True, "FillSchema", "(System.Data.DataTable,System.Data.SchemaType,System.Data.IDbCommand,System.Data.CommandBehavior)", "", "Argument[0]", "ReturnValue.Element", "value", "dfc-generated"]
+      - ["System.Data.Common", "DbDataAdapter", True, "FillSchema", "(System.Data.DataTable,System.Data.SchemaType,System.Data.IDbCommand,System.Data.CommandBehavior)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Data.Common", "DbDataReader", False, "GetFieldValueAsync<T>", "(System.Int32)", "", "Argument[this]", "ReturnValue.Property[System.Threading.Tasks.Task`1.Result]", "taint", "dfc-generated"]
+      - ["System.Data.Common", "DbDataReader", True, "GetFieldValue<T>", "(System.Int32)", "", "Argument[this]", "ReturnValue", "taint", "dfc-generated"]
+      - ["System.Data.Common", "DbDataReader", True, "GetFieldValueAsync<T>", "(System.Int32,System.Threading.CancellationToken)", "", "Argument[this]", "ReturnValue.Property[System.Threading.Tasks.Task`1.Result]", "taint", "dfc-generated"]
+      - ["System.Data.Common", "DbDataReader", True, "GetProviderSpecificValue", "(System.Int32)", "", "Argument[this]", "ReturnValue", "taint", "dfc-generated"]
+      - ["System.Data.Common", "DbDataReader", True, "GetProviderSpecificValues", "(System.Object[])", "", "Argument[this]", "Argument[0].Element", "taint", "dfc-generated"]
+      - ["System.Data.Common", "DbDataReader", True, "GetTextReader", "(System.Int32)", "", "Argument[this]", "ReturnValue", "taint", "dfc-generated"]
       - ["System.Data.Common", "DbDataSource", True, "get_ConnectionString", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Data.Common", "DbEnumerator", False, "DbEnumerator", "(System.Data.IDataReader)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Data.Common", "DbEnumerator", False, "DbEnumerator", "(System.Data.IDataReader,System.Boolean)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Data.Common", "DbException", False, "get_BatchCommand", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Data.Common", "DbParameterCollection", True, "GetParameter", "(System.Int32)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Data.Common", "DbParameterCollection", True, "GetParameter", "(System.String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Data.Common", "DbException", False, "get_BatchCommand", "()", "", "Argument[this].Property[System.Data.Common.DbException.DbBatchCommand]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Data.Common", "DbParameterCollection", True, "SetParameter", "(System.Int32,System.Data.Common.DbParameter)", "", "Argument[this]", "Argument[1]", "taint", "df-generated"]
       - ["System.Data.Common", "DbParameterCollection", True, "SetParameter", "(System.String,System.Data.Common.DbParameter)", "", "Argument[this]", "Argument[1]", "taint", "df-generated"]
-      - ["System.Data.Common", "DbProviderFactories", False, "GetFactory", "(System.Data.Common.DbConnection)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Data.Common", "DbProviderFactory", True, "CreateDataSource", "(System.String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Data.Common", "DbProviderFactory", True, "CreateDataSource", "(System.String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Data.Common", "DbTransaction", False, "get_Connection", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Data.Common", "DbTransaction", True, "CommitAsync", "(System.Threading.CancellationToken)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Data.Common", "DbTransaction", True, "ReleaseAsync", "(System.String,System.Threading.CancellationToken)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Data.Common", "DbTransaction", True, "RollbackAsync", "(System.String,System.Threading.CancellationToken)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Data.Common", "DbTransaction", True, "RollbackAsync", "(System.Threading.CancellationToken)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Data.Common", "DbTransaction", True, "SaveAsync", "(System.String,System.Threading.CancellationToken)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Data.Common", "DbTransaction", True, "get_DbConnection", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Data.Common", "RowUpdatedEventArgs", False, "CopyToRows", "(System.Data.DataRow[])", "", "Argument[this]", "Argument[0].Element", "taint", "df-generated"]
-      - ["System.Data.Common", "RowUpdatedEventArgs", False, "CopyToRows", "(System.Data.DataRow[],System.Int32)", "", "Argument[this]", "Argument[0].Element", "taint", "df-generated"]
-      - ["System.Data.Common", "RowUpdatedEventArgs", False, "RowUpdatedEventArgs", "(System.Data.DataRow,System.Data.IDbCommand,System.Data.StatementType,System.Data.Common.DataTableMapping)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Data.Common", "RowUpdatedEventArgs", False, "RowUpdatedEventArgs", "(System.Data.DataRow,System.Data.IDbCommand,System.Data.StatementType,System.Data.Common.DataTableMapping)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Data.Common", "RowUpdatedEventArgs", False, "RowUpdatedEventArgs", "(System.Data.DataRow,System.Data.IDbCommand,System.Data.StatementType,System.Data.Common.DataTableMapping)", "", "Argument[3]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Data.Common", "RowUpdatedEventArgs", False, "get_Command", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Data.Common", "RowUpdatedEventArgs", False, "get_Row", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Data.Common", "RowUpdatedEventArgs", False, "get_TableMapping", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Data.Common", "RowUpdatingEventArgs", False, "RowUpdatingEventArgs", "(System.Data.DataRow,System.Data.IDbCommand,System.Data.StatementType,System.Data.Common.DataTableMapping)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Data.Common", "RowUpdatingEventArgs", False, "RowUpdatingEventArgs", "(System.Data.DataRow,System.Data.IDbCommand,System.Data.StatementType,System.Data.Common.DataTableMapping)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Data.Common", "RowUpdatingEventArgs", False, "RowUpdatingEventArgs", "(System.Data.DataRow,System.Data.IDbCommand,System.Data.StatementType,System.Data.Common.DataTableMapping)", "", "Argument[3]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Data.Common", "RowUpdatingEventArgs", False, "get_Row", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Data.Common", "RowUpdatingEventArgs", False, "get_TableMapping", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Data.Common", "DbProviderFactories", False, "GetFactory", "(System.Data.Common.DbConnection)", "", "Argument[0].Property[System.Data.Common.DbConnection.DbProviderFactory]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Data.Common", "DbProviderFactory", True, "CreateDataSource", "(System.String)", "", "Argument[0]", "ReturnValue.SyntheticField[System.Data.Common.DefaultDataSource._connectionString]", "value", "dfc-generated"]
+      - ["System.Data.Common", "DbTransaction", False, "get_Connection", "()", "", "Argument[this].Property[System.Data.Common.DbTransaction.DbConnection]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Data.Common", "RowUpdatedEventArgs", False, "CopyToRows", "(System.Data.DataRow[])", "", "Argument[this].Property[System.Data.Common.RowUpdatedEventArgs.Row]", "Argument[0].Element", "value", "dfc-generated"]
+      - ["System.Data.Common", "RowUpdatedEventArgs", False, "CopyToRows", "(System.Data.DataRow[])", "", "Argument[this].SyntheticField[System.Data.Common.RowUpdatedEventArgs._dataRow]", "Argument[0].Element", "value", "dfc-generated"]
+      - ["System.Data.Common", "RowUpdatedEventArgs", False, "CopyToRows", "(System.Data.DataRow[],System.Int32)", "", "Argument[this].Property[System.Data.Common.RowUpdatedEventArgs.Row]", "Argument[0].Element", "value", "dfc-generated"]
+      - ["System.Data.Common", "RowUpdatedEventArgs", False, "CopyToRows", "(System.Data.DataRow[],System.Int32)", "", "Argument[this].SyntheticField[System.Data.Common.RowUpdatedEventArgs._dataRow]", "Argument[0].Element", "value", "dfc-generated"]
+      - ["System.Data.Common", "RowUpdatedEventArgs", False, "RowUpdatedEventArgs", "(System.Data.DataRow,System.Data.IDbCommand,System.Data.StatementType,System.Data.Common.DataTableMapping)", "", "Argument[0]", "Argument[this].SyntheticField[System.Data.Common.RowUpdatedEventArgs._dataRow]", "value", "dfc-generated"]
+      - ["System.Data.Common", "RowUpdatedEventArgs", False, "RowUpdatedEventArgs", "(System.Data.DataRow,System.Data.IDbCommand,System.Data.StatementType,System.Data.Common.DataTableMapping)", "", "Argument[1]", "Argument[this].SyntheticField[System.Data.Common.RowUpdatedEventArgs._command]", "value", "dfc-generated"]
+      - ["System.Data.Common", "RowUpdatedEventArgs", False, "RowUpdatedEventArgs", "(System.Data.DataRow,System.Data.IDbCommand,System.Data.StatementType,System.Data.Common.DataTableMapping)", "", "Argument[3]", "Argument[this].SyntheticField[System.Data.Common.RowUpdatedEventArgs._tableMapping]", "value", "dfc-generated"]
+      - ["System.Data.Common", "RowUpdatedEventArgs", False, "get_Command", "()", "", "Argument[this].SyntheticField[System.Data.Common.RowUpdatedEventArgs._command]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Data.Common", "RowUpdatedEventArgs", False, "get_Row", "()", "", "Argument[this].SyntheticField[System.Data.Common.RowUpdatedEventArgs._dataRow]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Data.Common", "RowUpdatedEventArgs", False, "get_TableMapping", "()", "", "Argument[this].SyntheticField[System.Data.Common.RowUpdatedEventArgs._tableMapping]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Data.Common", "RowUpdatingEventArgs", False, "RowUpdatingEventArgs", "(System.Data.DataRow,System.Data.IDbCommand,System.Data.StatementType,System.Data.Common.DataTableMapping)", "", "Argument[0]", "Argument[this].SyntheticField[System.Data.Common.RowUpdatingEventArgs._dataRow]", "value", "dfc-generated"]
+      - ["System.Data.Common", "RowUpdatingEventArgs", False, "RowUpdatingEventArgs", "(System.Data.DataRow,System.Data.IDbCommand,System.Data.StatementType,System.Data.Common.DataTableMapping)", "", "Argument[3]", "Argument[this].SyntheticField[System.Data.Common.RowUpdatingEventArgs._tableMapping]", "value", "dfc-generated"]
+      - ["System.Data.Common", "RowUpdatingEventArgs", False, "get_Row", "()", "", "Argument[this].SyntheticField[System.Data.Common.RowUpdatingEventArgs._dataRow]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Data.Common", "RowUpdatingEventArgs", False, "get_TableMapping", "()", "", "Argument[this].SyntheticField[System.Data.Common.RowUpdatingEventArgs._tableMapping]", "ReturnValue", "value", "dfc-generated"]
   - addsTo:
       pack: codeql/csharp-all
       extensible: neutralModel
@@ -172,12 +130,15 @@ extensions:
       - ["System.Data.Common", "DataAdapter", "ShouldSerializeFillLoadOption", "()", "summary", "df-generated"]
       - ["System.Data.Common", "DataAdapter", "ShouldSerializeTableMappings", "()", "summary", "df-generated"]
       - ["System.Data.Common", "DataAdapter", "Update", "(System.Data.DataSet)", "summary", "df-generated"]
+      - ["System.Data.Common", "DataAdapter", "add_FillError", "(System.Data.FillErrorEventHandler)", "summary", "df-generated"]
+      - ["System.Data.Common", "DataAdapter", "remove_FillError", "(System.Data.FillErrorEventHandler)", "summary", "df-generated"]
       - ["System.Data.Common", "DataColumnMappingCollection", "Contains", "(System.Object)", "summary", "df-generated"]
       - ["System.Data.Common", "DataColumnMappingCollection", "Contains", "(System.String)", "summary", "df-generated"]
       - ["System.Data.Common", "DataColumnMappingCollection", "IndexOf", "(System.Object)", "summary", "df-generated"]
       - ["System.Data.Common", "DataColumnMappingCollection", "IndexOf", "(System.String)", "summary", "df-generated"]
       - ["System.Data.Common", "DataColumnMappingCollection", "IndexOfDataSetColumn", "(System.String)", "summary", "df-generated"]
       - ["System.Data.Common", "DataColumnMappingCollection", "Remove", "(System.Data.Common.DataColumnMapping)", "summary", "df-generated"]
+      - ["System.Data.Common", "DataColumnMappingCollection", "Remove", "(System.Object)", "summary", "df-generated"]
       - ["System.Data.Common", "DataColumnMappingCollection", "RemoveAt", "(System.Int32)", "summary", "df-generated"]
       - ["System.Data.Common", "DataColumnMappingCollection", "RemoveAt", "(System.String)", "summary", "df-generated"]
       - ["System.Data.Common", "DataColumnMappingCollection", "get_Count", "()", "summary", "df-generated"]
@@ -190,6 +151,7 @@ extensions:
       - ["System.Data.Common", "DataTableMappingCollection", "IndexOf", "(System.String)", "summary", "df-generated"]
       - ["System.Data.Common", "DataTableMappingCollection", "IndexOfDataSetTable", "(System.String)", "summary", "df-generated"]
       - ["System.Data.Common", "DataTableMappingCollection", "Remove", "(System.Data.Common.DataTableMapping)", "summary", "df-generated"]
+      - ["System.Data.Common", "DataTableMappingCollection", "Remove", "(System.Object)", "summary", "df-generated"]
       - ["System.Data.Common", "DataTableMappingCollection", "RemoveAt", "(System.Int32)", "summary", "df-generated"]
       - ["System.Data.Common", "DataTableMappingCollection", "RemoveAt", "(System.String)", "summary", "df-generated"]
       - ["System.Data.Common", "DataTableMappingCollection", "get_Count", "()", "summary", "df-generated"]
@@ -226,11 +188,20 @@ extensions:
       - ["System.Data.Common", "DbCommand", "Cancel", "()", "summary", "df-generated"]
       - ["System.Data.Common", "DbCommand", "CreateDbParameter", "()", "summary", "df-generated"]
       - ["System.Data.Common", "DbCommand", "CreateParameter", "()", "summary", "df-generated"]
+      - ["System.Data.Common", "DbCommand", "ExecuteDbDataReaderAsync", "(System.Data.CommandBehavior,System.Threading.CancellationToken)", "summary", "df-generated"]
       - ["System.Data.Common", "DbCommand", "ExecuteNonQuery", "()", "summary", "df-generated"]
       - ["System.Data.Common", "DbCommand", "ExecuteNonQueryAsync", "()", "summary", "df-generated"]
       - ["System.Data.Common", "DbCommand", "ExecuteNonQueryAsync", "(System.Threading.CancellationToken)", "summary", "df-generated"]
+      - ["System.Data.Common", "DbCommand", "ExecuteReader", "()", "summary", "df-generated"]
       - ["System.Data.Common", "DbCommand", "ExecuteReader", "(System.Data.CommandBehavior)", "summary", "df-generated"]
+      - ["System.Data.Common", "DbCommand", "ExecuteReaderAsync", "()", "summary", "df-generated"]
+      - ["System.Data.Common", "DbCommand", "ExecuteReaderAsync", "(System.Data.CommandBehavior)", "summary", "df-generated"]
+      - ["System.Data.Common", "DbCommand", "ExecuteReaderAsync", "(System.Data.CommandBehavior,System.Threading.CancellationToken)", "summary", "df-generated"]
+      - ["System.Data.Common", "DbCommand", "ExecuteReaderAsync", "(System.Threading.CancellationToken)", "summary", "df-generated"]
+      - ["System.Data.Common", "DbCommand", "ExecuteScalarAsync", "()", "summary", "df-generated"]
+      - ["System.Data.Common", "DbCommand", "ExecuteScalarAsync", "(System.Threading.CancellationToken)", "summary", "df-generated"]
       - ["System.Data.Common", "DbCommand", "Prepare", "()", "summary", "df-generated"]
+      - ["System.Data.Common", "DbCommand", "PrepareAsync", "(System.Threading.CancellationToken)", "summary", "df-generated"]
       - ["System.Data.Common", "DbCommandBuilder", "ApplyParameterInfo", "(System.Data.Common.DbParameter,System.Data.DataRow,System.Data.StatementType,System.Boolean)", "summary", "df-generated"]
       - ["System.Data.Common", "DbCommandBuilder", "Dispose", "(System.Boolean)", "summary", "df-generated"]
       - ["System.Data.Common", "DbCommandBuilder", "GetParameterName", "(System.Int32)", "summary", "df-generated"]
@@ -238,11 +209,19 @@ extensions:
       - ["System.Data.Common", "DbCommandBuilder", "GetSchemaTable", "(System.Data.Common.DbCommand)", "summary", "df-generated"]
       - ["System.Data.Common", "DbCommandBuilder", "RefreshSchema", "()", "summary", "df-generated"]
       - ["System.Data.Common", "DbCommandBuilder", "SetRowUpdatingHandler", "(System.Data.Common.DbDataAdapter)", "summary", "df-generated"]
+      - ["System.Data.Common", "DbConnection", "BeginDbTransactionAsync", "(System.Data.IsolationLevel,System.Threading.CancellationToken)", "summary", "df-generated"]
+      - ["System.Data.Common", "DbConnection", "BeginTransaction", "()", "summary", "df-generated"]
+      - ["System.Data.Common", "DbConnection", "BeginTransaction", "(System.Data.IsolationLevel)", "summary", "df-generated"]
+      - ["System.Data.Common", "DbConnection", "BeginTransactionAsync", "(System.Data.IsolationLevel,System.Threading.CancellationToken)", "summary", "df-generated"]
+      - ["System.Data.Common", "DbConnection", "BeginTransactionAsync", "(System.Threading.CancellationToken)", "summary", "df-generated"]
       - ["System.Data.Common", "DbConnection", "ChangeDatabase", "(System.String)", "summary", "df-generated"]
+      - ["System.Data.Common", "DbConnection", "ChangeDatabaseAsync", "(System.String,System.Threading.CancellationToken)", "summary", "df-generated"]
       - ["System.Data.Common", "DbConnection", "Close", "()", "summary", "df-generated"]
       - ["System.Data.Common", "DbConnection", "CloseAsync", "()", "summary", "df-generated"]
       - ["System.Data.Common", "DbConnection", "CreateBatch", "()", "summary", "df-generated"]
+      - ["System.Data.Common", "DbConnection", "CreateCommand", "()", "summary", "df-generated"]
       - ["System.Data.Common", "DbConnection", "CreateDbBatch", "()", "summary", "df-generated"]
+      - ["System.Data.Common", "DbConnection", "CreateDbCommand", "()", "summary", "df-generated"]
       - ["System.Data.Common", "DbConnection", "EnlistTransaction", "(System.Transactions.Transaction)", "summary", "df-generated"]
       - ["System.Data.Common", "DbConnection", "GetSchema", "()", "summary", "df-generated"]
       - ["System.Data.Common", "DbConnection", "GetSchema", "(System.String)", "summary", "df-generated"]
@@ -253,17 +232,21 @@ extensions:
       - ["System.Data.Common", "DbConnection", "OnStateChange", "(System.Data.StateChangeEventArgs)", "summary", "df-generated"]
       - ["System.Data.Common", "DbConnection", "Open", "()", "summary", "df-generated"]
       - ["System.Data.Common", "DbConnection", "OpenAsync", "()", "summary", "df-generated"]
+      - ["System.Data.Common", "DbConnection", "OpenAsync", "(System.Threading.CancellationToken)", "summary", "df-generated"]
+      - ["System.Data.Common", "DbConnection", "add_StateChange", "(System.Data.StateChangeEventHandler)", "summary", "df-generated"]
       - ["System.Data.Common", "DbConnection", "get_CanCreateBatch", "()", "summary", "df-generated"]
       - ["System.Data.Common", "DbConnection", "get_ConnectionTimeout", "()", "summary", "df-generated"]
       - ["System.Data.Common", "DbConnection", "get_DataSource", "()", "summary", "df-generated"]
       - ["System.Data.Common", "DbConnection", "get_Database", "()", "summary", "df-generated"]
       - ["System.Data.Common", "DbConnection", "get_DbProviderFactory", "()", "summary", "df-generated"]
       - ["System.Data.Common", "DbConnection", "get_State", "()", "summary", "df-generated"]
+      - ["System.Data.Common", "DbConnection", "remove_StateChange", "(System.Data.StateChangeEventHandler)", "summary", "df-generated"]
       - ["System.Data.Common", "DbConnectionStringBuilder", "ClearPropertyDescriptors", "()", "summary", "df-generated"]
       - ["System.Data.Common", "DbConnectionStringBuilder", "Contains", "(System.Object)", "summary", "df-generated"]
       - ["System.Data.Common", "DbConnectionStringBuilder", "ContainsKey", "(System.String)", "summary", "df-generated"]
       - ["System.Data.Common", "DbConnectionStringBuilder", "DbConnectionStringBuilder", "(System.Boolean)", "summary", "df-generated"]
       - ["System.Data.Common", "DbConnectionStringBuilder", "EquivalentTo", "(System.Data.Common.DbConnectionStringBuilder)", "summary", "df-generated"]
+      - ["System.Data.Common", "DbConnectionStringBuilder", "GetAttributes", "()", "summary", "df-generated"]
       - ["System.Data.Common", "DbConnectionStringBuilder", "GetClassName", "()", "summary", "df-generated"]
       - ["System.Data.Common", "DbConnectionStringBuilder", "GetComponentName", "()", "summary", "df-generated"]
       - ["System.Data.Common", "DbConnectionStringBuilder", "GetConverter", "()", "summary", "df-generated"]
@@ -281,6 +264,9 @@ extensions:
       - ["System.Data.Common", "DbConnectionStringBuilder", "get_IsSynchronized", "()", "summary", "df-generated"]
       - ["System.Data.Common", "DbDataAdapter", "AddToBatch", "(System.Data.IDbCommand)", "summary", "df-generated"]
       - ["System.Data.Common", "DbDataAdapter", "ClearBatch", "()", "summary", "df-generated"]
+      - ["System.Data.Common", "DbDataAdapter", "CreateRowUpdatedEvent", "(System.Data.DataRow,System.Data.IDbCommand,System.Data.StatementType,System.Data.Common.DataTableMapping)", "summary", "df-generated"]
+      - ["System.Data.Common", "DbDataAdapter", "CreateRowUpdatingEvent", "(System.Data.DataRow,System.Data.IDbCommand,System.Data.StatementType,System.Data.Common.DataTableMapping)", "summary", "df-generated"]
+      - ["System.Data.Common", "DbDataAdapter", "DbDataAdapter", "(System.Data.Common.DbDataAdapter)", "summary", "df-generated"]
       - ["System.Data.Common", "DbDataAdapter", "Dispose", "(System.Boolean)", "summary", "df-generated"]
       - ["System.Data.Common", "DbDataAdapter", "ExecuteBatch", "()", "summary", "df-generated"]
       - ["System.Data.Common", "DbDataAdapter", "Fill", "(System.Data.DataSet)", "summary", "df-generated"]
@@ -327,6 +313,7 @@ extensions:
       - ["System.Data.Common", "DbDataReader", "GetInt64", "(System.Int32)", "summary", "df-generated"]
       - ["System.Data.Common", "DbDataReader", "GetOrdinal", "(System.String)", "summary", "df-generated"]
       - ["System.Data.Common", "DbDataReader", "GetProviderSpecificFieldType", "(System.Int32)", "summary", "df-generated"]
+      - ["System.Data.Common", "DbDataReader", "GetSchemaTableAsync", "(System.Threading.CancellationToken)", "summary", "df-generated"]
       - ["System.Data.Common", "DbDataReader", "GetStream", "(System.Int32)", "summary", "df-generated"]
       - ["System.Data.Common", "DbDataReader", "IsDBNull", "(System.Int32)", "summary", "df-generated"]
       - ["System.Data.Common", "DbDataReader", "IsDBNullAsync", "(System.Int32)", "summary", "df-generated"]
@@ -345,6 +332,7 @@ extensions:
       - ["System.Data.Common", "DbDataReader", "get_VisibleFieldCount", "()", "summary", "df-generated"]
       - ["System.Data.Common", "DbDataReaderExtensions", "CanGetColumnSchema", "(System.Data.Common.DbDataReader)", "summary", "df-generated"]
       - ["System.Data.Common", "DbDataReaderExtensions", "GetColumnSchema", "(System.Data.Common.DbDataReader)", "summary", "df-generated"]
+      - ["System.Data.Common", "DbDataRecord", "GetAttributes", "()", "summary", "df-generated"]
       - ["System.Data.Common", "DbDataRecord", "GetBoolean", "(System.Int32)", "summary", "df-generated"]
       - ["System.Data.Common", "DbDataRecord", "GetByte", "(System.Int32)", "summary", "df-generated"]
       - ["System.Data.Common", "DbDataRecord", "GetBytes", "(System.Int32,System.Int64,System.Byte[],System.Int32,System.Int32)", "summary", "df-generated"]
@@ -372,8 +360,10 @@ extensions:
       - ["System.Data.Common", "DbDataRecord", "IsDBNull", "(System.Int32)", "summary", "df-generated"]
       - ["System.Data.Common", "DbDataRecord", "get_FieldCount", "()", "summary", "df-generated"]
       - ["System.Data.Common", "DbDataSource", "CreateBatch", "()", "summary", "df-generated"]
+      - ["System.Data.Common", "DbDataSource", "CreateCommand", "(System.String)", "summary", "df-generated"]
       - ["System.Data.Common", "DbDataSource", "CreateConnection", "()", "summary", "df-generated"]
       - ["System.Data.Common", "DbDataSource", "CreateDbBatch", "()", "summary", "df-generated"]
+      - ["System.Data.Common", "DbDataSource", "CreateDbCommand", "(System.String)", "summary", "df-generated"]
       - ["System.Data.Common", "DbDataSource", "CreateDbConnection", "()", "summary", "df-generated"]
       - ["System.Data.Common", "DbDataSource", "Dispose", "()", "summary", "df-generated"]
       - ["System.Data.Common", "DbDataSource", "Dispose", "(System.Boolean)", "summary", "df-generated"]
@@ -397,6 +387,8 @@ extensions:
       - ["System.Data.Common", "DbParameter", "ResetDbType", "()", "summary", "df-generated"]
       - ["System.Data.Common", "DbParameterCollection", "Contains", "(System.Object)", "summary", "df-generated"]
       - ["System.Data.Common", "DbParameterCollection", "Contains", "(System.String)", "summary", "df-generated"]
+      - ["System.Data.Common", "DbParameterCollection", "GetParameter", "(System.Int32)", "summary", "df-generated"]
+      - ["System.Data.Common", "DbParameterCollection", "GetParameter", "(System.String)", "summary", "df-generated"]
       - ["System.Data.Common", "DbParameterCollection", "IndexOf", "(System.Object)", "summary", "df-generated"]
       - ["System.Data.Common", "DbParameterCollection", "IndexOf", "(System.String)", "summary", "df-generated"]
       - ["System.Data.Common", "DbParameterCollection", "Remove", "(System.Object)", "summary", "df-generated"]
@@ -431,12 +423,18 @@ extensions:
       - ["System.Data.Common", "DbProviderSpecificTypePropertyAttribute", "DbProviderSpecificTypePropertyAttribute", "(System.Boolean)", "summary", "df-generated"]
       - ["System.Data.Common", "DbProviderSpecificTypePropertyAttribute", "get_IsProviderSpecificTypeProperty", "()", "summary", "df-generated"]
       - ["System.Data.Common", "DbTransaction", "Commit", "()", "summary", "df-generated"]
+      - ["System.Data.Common", "DbTransaction", "CommitAsync", "(System.Threading.CancellationToken)", "summary", "df-generated"]
       - ["System.Data.Common", "DbTransaction", "Dispose", "()", "summary", "df-generated"]
       - ["System.Data.Common", "DbTransaction", "Dispose", "(System.Boolean)", "summary", "df-generated"]
       - ["System.Data.Common", "DbTransaction", "Release", "(System.String)", "summary", "df-generated"]
+      - ["System.Data.Common", "DbTransaction", "ReleaseAsync", "(System.String,System.Threading.CancellationToken)", "summary", "df-generated"]
       - ["System.Data.Common", "DbTransaction", "Rollback", "()", "summary", "df-generated"]
       - ["System.Data.Common", "DbTransaction", "Rollback", "(System.String)", "summary", "df-generated"]
+      - ["System.Data.Common", "DbTransaction", "RollbackAsync", "(System.String,System.Threading.CancellationToken)", "summary", "df-generated"]
+      - ["System.Data.Common", "DbTransaction", "RollbackAsync", "(System.Threading.CancellationToken)", "summary", "df-generated"]
       - ["System.Data.Common", "DbTransaction", "Save", "(System.String)", "summary", "df-generated"]
+      - ["System.Data.Common", "DbTransaction", "SaveAsync", "(System.String,System.Threading.CancellationToken)", "summary", "df-generated"]
+      - ["System.Data.Common", "DbTransaction", "get_DbConnection", "()", "summary", "df-generated"]
       - ["System.Data.Common", "DbTransaction", "get_IsolationLevel", "()", "summary", "df-generated"]
       - ["System.Data.Common", "DbTransaction", "get_SupportsSavepoints", "()", "summary", "df-generated"]
       - ["System.Data.Common", "IDbColumnSchemaGenerator", "GetColumnSchema", "()", "summary", "df-generated"]
diff --git a/csharp/ql/lib/ext/generated/System.Data.Odbc.model.yml b/csharp/ql/lib/ext/generated/System.Data.Odbc.model.yml
index d4a86ef3f55..474c57e73cf 100644
--- a/csharp/ql/lib/ext/generated/System.Data.Odbc.model.yml
+++ b/csharp/ql/lib/ext/generated/System.Data.Odbc.model.yml
@@ -12,20 +12,16 @@ extensions:
       - ["System.Data.Odbc", "OdbcCommand", False, "OdbcCommand", "(System.String,System.Data.Odbc.OdbcConnection,System.Data.Odbc.OdbcTransaction)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Data.Odbc", "OdbcCommand", False, "OdbcCommand", "(System.String,System.Data.Odbc.OdbcConnection,System.Data.Odbc.OdbcTransaction)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
       - ["System.Data.Odbc", "OdbcCommand", False, "OdbcCommand", "(System.String,System.Data.Odbc.OdbcConnection,System.Data.Odbc.OdbcTransaction)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
+      - ["System.Data.Odbc", "OdbcCommand", False, "get_DbParameterCollection", "()", "", "Argument[this].Property[System.Data.Odbc.OdbcCommand.Parameters]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Data.Odbc", "OdbcCommand", False, "get_Parameters", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Data.Odbc", "OdbcCommandBuilder", False, "GetDeleteCommand", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Data.Odbc", "OdbcCommandBuilder", False, "GetDeleteCommand", "(System.Boolean)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Data.Odbc", "OdbcCommandBuilder", False, "GetInsertCommand", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Data.Odbc", "OdbcCommandBuilder", False, "GetInsertCommand", "(System.Boolean)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Data.Odbc", "OdbcCommandBuilder", False, "GetUpdateCommand", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Data.Odbc", "OdbcCommandBuilder", False, "GetUpdateCommand", "(System.Boolean)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Data.Odbc", "OdbcCommandBuilder", False, "OdbcCommandBuilder", "(System.Data.Odbc.OdbcDataAdapter)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Data.Odbc", "OdbcCommandBuilder", False, "QuoteIdentifier", "(System.String,System.Data.Odbc.OdbcConnection)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Data.Odbc", "OdbcCommandBuilder", False, "QuoteIdentifier", "(System.String,System.Data.Odbc.OdbcConnection)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Data.Odbc", "OdbcCommandBuilder", False, "QuoteIdentifier", "(System.String,System.Data.Odbc.OdbcConnection)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Data.Odbc", "OdbcCommandBuilder", False, "UnquoteIdentifier", "(System.String,System.Data.Odbc.OdbcConnection)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Data.Odbc", "OdbcCommandBuilder", False, "UnquoteIdentifier", "(System.String,System.Data.Odbc.OdbcConnection)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Data.Odbc", "OdbcCommandBuilder", False, "UnquoteIdentifier", "(System.String,System.Data.Odbc.OdbcConnection)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Data.Odbc", "OdbcCommandBuilder", False, "QuoteIdentifier", "(System.String)", "", "Argument[this].Property[System.Data.Common.DbCommandBuilder.QuotePrefix]", "ReturnValue", "taint", "dfc-generated"]
+      - ["System.Data.Odbc", "OdbcCommandBuilder", False, "QuoteIdentifier", "(System.String)", "", "Argument[this].Property[System.Data.Common.DbCommandBuilder.QuoteSuffix]", "ReturnValue", "taint", "dfc-generated"]
+      - ["System.Data.Odbc", "OdbcCommandBuilder", False, "QuoteIdentifier", "(System.String,System.Data.Odbc.OdbcConnection)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Data.Odbc", "OdbcCommandBuilder", False, "QuoteIdentifier", "(System.String,System.Data.Odbc.OdbcConnection)", "", "Argument[this].Property[System.Data.Common.DbCommandBuilder.QuotePrefix]", "ReturnValue", "taint", "dfc-generated"]
+      - ["System.Data.Odbc", "OdbcCommandBuilder", False, "QuoteIdentifier", "(System.String,System.Data.Odbc.OdbcConnection)", "", "Argument[this].Property[System.Data.Common.DbCommandBuilder.QuoteSuffix]", "ReturnValue", "taint", "dfc-generated"]
+      - ["System.Data.Odbc", "OdbcCommandBuilder", False, "UnquoteIdentifier", "(System.String)", "", "Argument[this].Property[System.Data.Common.DbCommandBuilder.QuoteSuffix]", "ReturnValue", "taint", "dfc-generated"]
+      - ["System.Data.Odbc", "OdbcCommandBuilder", False, "UnquoteIdentifier", "(System.String,System.Data.Odbc.OdbcConnection)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Data.Odbc", "OdbcCommandBuilder", False, "UnquoteIdentifier", "(System.String,System.Data.Odbc.OdbcConnection)", "", "Argument[this].Property[System.Data.Common.DbCommandBuilder.QuoteSuffix]", "ReturnValue", "taint", "dfc-generated"]
       - ["System.Data.Odbc", "OdbcConnection", False, "BeginTransaction", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Data.Odbc", "OdbcConnection", False, "BeginTransaction", "(System.Data.IsolationLevel)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Data.Odbc", "OdbcConnection", False, "CreateCommand", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
@@ -34,64 +30,57 @@ extensions:
       - ["System.Data.Odbc", "OdbcDataAdapter", False, "OdbcDataAdapter", "(System.String,System.Data.Odbc.OdbcConnection)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
       - ["System.Data.Odbc", "OdbcDataAdapter", False, "OdbcDataAdapter", "(System.String,System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Data.Odbc", "OdbcDataReader", False, "GetTime", "(System.Int32)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Data.Odbc", "OdbcError", False, "ToString", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Data.Odbc", "OdbcError", False, "ToString", "()", "", "Argument[this].Property[System.Data.Odbc.OdbcError.Message]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Data.Odbc", "OdbcError", False, "get_Message", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Data.Odbc", "OdbcError", False, "get_SQLState", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Data.Odbc", "OdbcError", False, "get_Source", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Data.Odbc", "OdbcErrorCollection", False, "CopyTo", "(System.Data.Odbc.OdbcError[],System.Int32)", "", "Argument[this]", "Argument[0].Element", "taint", "df-generated"]
       - ["System.Data.Odbc", "OdbcErrorCollection", False, "get_Item", "(System.Int32)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Data.Odbc", "OdbcException", False, "get_Errors", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Data.Odbc", "OdbcInfoMessageEventArgs", False, "ToString", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Data.Odbc", "OdbcInfoMessageEventArgs", False, "ToString", "()", "", "Argument[this].Property[System.Data.Odbc.OdbcInfoMessageEventArgs.Message]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Data.Odbc", "OdbcInfoMessageEventArgs", False, "get_Errors", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Data.Odbc", "OdbcInfoMessageEventArgs", False, "get_Message", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Data.Odbc", "OdbcParameter", False, "OdbcParameter", "(System.String,System.Data.Odbc.OdbcType)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Data.Odbc", "OdbcParameter", False, "OdbcParameter", "(System.String,System.Data.Odbc.OdbcType,System.Int32)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Data.Odbc", "OdbcParameter", False, "OdbcParameter", "(System.String,System.Data.Odbc.OdbcType,System.Int32,System.Data.ParameterDirection,System.Boolean,System.Byte,System.Byte,System.String,System.Data.DataRowVersion,System.Object)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Data.Odbc", "OdbcParameter", False, "OdbcParameter", "(System.String,System.Data.Odbc.OdbcType,System.Int32,System.Data.ParameterDirection,System.Boolean,System.Byte,System.Byte,System.String,System.Data.DataRowVersion,System.Object)", "", "Argument[7]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Data.Odbc", "OdbcParameter", False, "OdbcParameter", "(System.String,System.Data.Odbc.OdbcType,System.Int32,System.Data.ParameterDirection,System.Boolean,System.Byte,System.Byte,System.String,System.Data.DataRowVersion,System.Object)", "", "Argument[9]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Data.Odbc", "OdbcParameter", False, "OdbcParameter", "(System.String,System.Data.Odbc.OdbcType,System.Int32,System.Data.ParameterDirection,System.Byte,System.Byte,System.String,System.Data.DataRowVersion,System.Boolean,System.Object)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Data.Odbc", "OdbcParameter", False, "OdbcParameter", "(System.String,System.Data.Odbc.OdbcType,System.Int32,System.Data.ParameterDirection,System.Byte,System.Byte,System.String,System.Data.DataRowVersion,System.Boolean,System.Object)", "", "Argument[6]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Data.Odbc", "OdbcParameter", False, "OdbcParameter", "(System.String,System.Data.Odbc.OdbcType,System.Int32,System.Data.ParameterDirection,System.Byte,System.Byte,System.String,System.Data.DataRowVersion,System.Boolean,System.Object)", "", "Argument[9]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Data.Odbc", "OdbcParameter", False, "OdbcParameter", "(System.String,System.Data.Odbc.OdbcType,System.Int32,System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Data.Odbc", "OdbcParameter", False, "OdbcParameter", "(System.String,System.Data.Odbc.OdbcType,System.Int32,System.String)", "", "Argument[3]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Data.Odbc", "OdbcParameter", False, "OdbcParameter", "(System.String,System.Object)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Data.Odbc", "OdbcParameter", False, "OdbcParameter", "(System.String,System.Object)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Data.Odbc", "OdbcParameter", False, "ToString", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Data.Odbc", "OdbcParameter", False, "OdbcParameter", "(System.String,System.Data.Odbc.OdbcType)", "", "Argument[0]", "Argument[this].SyntheticField[System.Data.Odbc.OdbcParameter._parameterName]", "value", "dfc-generated"]
+      - ["System.Data.Odbc", "OdbcParameter", False, "OdbcParameter", "(System.String,System.Data.Odbc.OdbcType,System.Int32)", "", "Argument[0]", "Argument[this].SyntheticField[System.Data.Odbc.OdbcParameter._parameterName]", "value", "dfc-generated"]
+      - ["System.Data.Odbc", "OdbcParameter", False, "OdbcParameter", "(System.String,System.Data.Odbc.OdbcType,System.Int32,System.Data.ParameterDirection,System.Boolean,System.Byte,System.Byte,System.String,System.Data.DataRowVersion,System.Object)", "", "Argument[0]", "Argument[this].SyntheticField[System.Data.Odbc.OdbcParameter._parameterName]", "value", "dfc-generated"]
+      - ["System.Data.Odbc", "OdbcParameter", False, "OdbcParameter", "(System.String,System.Data.Odbc.OdbcType,System.Int32,System.Data.ParameterDirection,System.Byte,System.Byte,System.String,System.Data.DataRowVersion,System.Boolean,System.Object)", "", "Argument[0]", "Argument[this].SyntheticField[System.Data.Odbc.OdbcParameter._parameterName]", "value", "dfc-generated"]
+      - ["System.Data.Odbc", "OdbcParameter", False, "OdbcParameter", "(System.String,System.Data.Odbc.OdbcType,System.Int32,System.String)", "", "Argument[0]", "Argument[this].SyntheticField[System.Data.Odbc.OdbcParameter._parameterName]", "value", "dfc-generated"]
+      - ["System.Data.Odbc", "OdbcParameter", False, "OdbcParameter", "(System.String,System.Object)", "", "Argument[0]", "Argument[this].SyntheticField[System.Data.Odbc.OdbcParameter._parameterName]", "value", "dfc-generated"]
+      - ["System.Data.Odbc", "OdbcParameter", False, "ToString", "()", "", "Argument[this].Property[System.Data.Odbc.OdbcParameter.ParameterName]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Data.Odbc", "OdbcParameter", False, "ToString", "()", "", "Argument[this].SyntheticField[System.Data.Odbc.OdbcParameter._parameterName]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Data.Odbc", "OdbcParameterCollection", False, "Add", "(System.Data.Odbc.OdbcParameter)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Data.Odbc", "OdbcParameterCollection", False, "Add", "(System.Data.Odbc.OdbcParameter)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["System.Data.Odbc", "OdbcParameterCollection", False, "Add", "(System.Data.Odbc.OdbcParameter)", "", "Argument[this]", "Argument[0]", "taint", "df-generated"]
       - ["System.Data.Odbc", "OdbcParameterCollection", False, "Add", "(System.Data.Odbc.OdbcParameter)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Data.Odbc", "OdbcParameterCollection", False, "Add", "(System.String,System.Data.Odbc.OdbcType)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Data.Odbc", "OdbcParameterCollection", False, "Add", "(System.String,System.Data.Odbc.OdbcType)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Data.Odbc", "OdbcParameterCollection", False, "Add", "(System.String,System.Data.Odbc.OdbcType)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Data.Odbc", "OdbcParameterCollection", False, "Add", "(System.String,System.Data.Odbc.OdbcType,System.Int32)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Data.Odbc", "OdbcParameterCollection", False, "Add", "(System.String,System.Data.Odbc.OdbcType,System.Int32)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Data.Odbc", "OdbcParameterCollection", False, "Add", "(System.String,System.Data.Odbc.OdbcType,System.Int32)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Data.Odbc", "OdbcParameterCollection", False, "Add", "(System.String,System.Data.Odbc.OdbcType,System.Int32,System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Data.Odbc", "OdbcParameterCollection", False, "Add", "(System.String,System.Data.Odbc.OdbcType,System.Int32,System.String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Data.Odbc", "OdbcParameterCollection", False, "Add", "(System.String,System.Data.Odbc.OdbcType,System.Int32,System.String)", "", "Argument[3]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Data.Odbc", "OdbcParameterCollection", False, "Add", "(System.String,System.Data.Odbc.OdbcType,System.Int32,System.String)", "", "Argument[3]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Data.Odbc", "OdbcParameterCollection", False, "Add", "(System.String,System.Data.Odbc.OdbcType,System.Int32,System.String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Data.Odbc", "OdbcParameterCollection", False, "Add", "(System.String,System.Object)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Data.Odbc", "OdbcParameterCollection", False, "Add", "(System.String,System.Object)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Data.Odbc", "OdbcParameterCollection", False, "Add", "(System.String,System.Object)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Data.Odbc", "OdbcParameterCollection", False, "Add", "(System.String,System.Object)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Data.Odbc", "OdbcParameterCollection", False, "Add", "(System.String,System.Object)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Data.Odbc", "OdbcParameterCollection", False, "AddRange", "(System.Data.Odbc.OdbcParameter[])", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["System.Data.Odbc", "OdbcParameterCollection", False, "AddWithValue", "(System.String,System.Object)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Data.Odbc", "OdbcParameterCollection", False, "AddWithValue", "(System.String,System.Object)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Data.Odbc", "OdbcParameterCollection", False, "AddWithValue", "(System.String,System.Object)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Data.Odbc", "OdbcParameterCollection", False, "AddWithValue", "(System.String,System.Object)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Data.Odbc", "OdbcParameterCollection", False, "AddWithValue", "(System.String,System.Object)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Data.Odbc", "OdbcParameterCollection", False, "CopyTo", "(System.Data.Odbc.OdbcParameter[],System.Int32)", "", "Argument[this]", "Argument[0].Element", "taint", "df-generated"]
-      - ["System.Data.Odbc", "OdbcParameterCollection", False, "Insert", "(System.Int32,System.Data.Odbc.OdbcParameter)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Data.Odbc", "OdbcParameterCollection", False, "Insert", "(System.Int32,System.Data.Odbc.OdbcParameter)", "", "Argument[this]", "Argument[1]", "taint", "df-generated"]
-      - ["System.Data.Odbc", "OdbcParameterCollection", False, "get_Item", "(System.Int32)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Data.Odbc", "OdbcParameterCollection", False, "get_Item", "(System.String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Data.Odbc", "OdbcParameterCollection", False, "Add", "(System.String,System.Data.Odbc.OdbcType)", "", "Argument[0]", "ReturnValue.SyntheticField[System.Data.Odbc.OdbcParameter._parameterName]", "value", "dfc-generated"]
+      - ["System.Data.Odbc", "OdbcParameterCollection", False, "Add", "(System.String,System.Data.Odbc.OdbcType,System.Int32)", "", "Argument[0]", "ReturnValue.SyntheticField[System.Data.Odbc.OdbcParameter._parameterName]", "value", "dfc-generated"]
+      - ["System.Data.Odbc", "OdbcParameterCollection", False, "Add", "(System.String,System.Data.Odbc.OdbcType,System.Int32,System.String)", "", "Argument[0]", "ReturnValue.SyntheticField[System.Data.Odbc.OdbcParameter._parameterName]", "value", "dfc-generated"]
+      - ["System.Data.Odbc", "OdbcParameterCollection", False, "Add", "(System.String,System.Object)", "", "Argument[0]", "ReturnValue.SyntheticField[System.Data.Odbc.OdbcParameter._parameterName]", "value", "dfc-generated"]
+      - ["System.Data.Odbc", "OdbcParameterCollection", False, "AddRange", "(System.Data.Odbc.OdbcParameter[])", "", "Argument[0].Element", "Argument[this].Element", "value", "dfc-generated"]
+      - ["System.Data.Odbc", "OdbcParameterCollection", False, "AddRange", "(System.Data.Odbc.OdbcParameter[])", "", "Argument[0].Element", "Argument[this].SyntheticField[System.Data.Odbc.OdbcParameterCollection.InnerList].Element", "value", "dfc-generated"]
+      - ["System.Data.Odbc", "OdbcParameterCollection", False, "AddRange", "(System.Data.Odbc.OdbcParameter[])", "", "Argument[0].Element", "Argument[this].SyntheticField[System.Data.Odbc.OdbcParameterCollection._items].Element", "value", "dfc-generated"]
+      - ["System.Data.Odbc", "OdbcParameterCollection", False, "AddWithValue", "(System.String,System.Object)", "", "Argument[0]", "ReturnValue.SyntheticField[System.Data.Odbc.OdbcParameter._parameterName]", "value", "dfc-generated"]
+      - ["System.Data.Odbc", "OdbcParameterCollection", False, "CopyTo", "(System.Data.Odbc.OdbcParameter[],System.Int32)", "", "Argument[this].Element", "Argument[0].Element", "value", "dfc-generated"]
+      - ["System.Data.Odbc", "OdbcParameterCollection", False, "CopyTo", "(System.Data.Odbc.OdbcParameter[],System.Int32)", "", "Argument[this].SyntheticField[System.Data.Odbc.OdbcParameterCollection.InnerList].Element", "Argument[0].Element", "value", "dfc-generated"]
+      - ["System.Data.Odbc", "OdbcParameterCollection", False, "CopyTo", "(System.Data.Odbc.OdbcParameter[],System.Int32)", "", "Argument[this].SyntheticField[System.Data.Odbc.OdbcParameterCollection._items].Element", "Argument[0].Element", "value", "dfc-generated"]
+      - ["System.Data.Odbc", "OdbcParameterCollection", False, "GetParameter", "(System.Int32)", "", "Argument[this].SyntheticField[System.Data.Odbc.OdbcParameterCollection.InnerList].Element", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Data.Odbc", "OdbcParameterCollection", False, "GetParameter", "(System.Int32)", "", "Argument[this].SyntheticField[System.Data.Odbc.OdbcParameterCollection._items].Element", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Data.Odbc", "OdbcParameterCollection", False, "GetParameter", "(System.String)", "", "Argument[this].SyntheticField[System.Data.Odbc.OdbcParameterCollection.InnerList].Element", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Data.Odbc", "OdbcParameterCollection", False, "GetParameter", "(System.String)", "", "Argument[this].SyntheticField[System.Data.Odbc.OdbcParameterCollection._items].Element", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Data.Odbc", "OdbcParameterCollection", False, "Insert", "(System.Int32,System.Data.Odbc.OdbcParameter)", "", "Argument[1]", "Argument[this].Element", "value", "dfc-generated"]
+      - ["System.Data.Odbc", "OdbcParameterCollection", False, "Insert", "(System.Int32,System.Data.Odbc.OdbcParameter)", "", "Argument[1]", "Argument[this].SyntheticField[System.Data.Odbc.OdbcParameterCollection.InnerList].Element", "value", "dfc-generated"]
+      - ["System.Data.Odbc", "OdbcParameterCollection", False, "Insert", "(System.Int32,System.Data.Odbc.OdbcParameter)", "", "Argument[1]", "Argument[this].SyntheticField[System.Data.Odbc.OdbcParameterCollection._items].Element", "value", "dfc-generated"]
+      - ["System.Data.Odbc", "OdbcParameterCollection", False, "get_Item", "(System.Int32)", "", "Argument[this].SyntheticField[System.Data.Odbc.OdbcParameterCollection.InnerList].Element", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Data.Odbc", "OdbcParameterCollection", False, "get_Item", "(System.Int32)", "", "Argument[this].SyntheticField[System.Data.Odbc.OdbcParameterCollection._items].Element", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Data.Odbc", "OdbcParameterCollection", False, "get_Item", "(System.String)", "", "Argument[this].SyntheticField[System.Data.Odbc.OdbcParameterCollection.InnerList].Element", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Data.Odbc", "OdbcParameterCollection", False, "get_Item", "(System.String)", "", "Argument[this].SyntheticField[System.Data.Odbc.OdbcParameterCollection._items].Element", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Data.Odbc", "OdbcParameterCollection", False, "get_SyncRoot", "()", "", "Argument[this].SyntheticField[System.Data.Odbc.OdbcParameterCollection.InnerList].Property[System.Collections.ICollection.SyncRoot]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Data.Odbc", "OdbcParameterCollection", False, "get_SyncRoot", "()", "", "Argument[this].SyntheticField[System.Data.Odbc.OdbcParameterCollection._items].Property[System.Collections.ICollection.SyncRoot]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Data.Odbc", "OdbcParameterCollection", False, "set_Item", "(System.Int32,System.Data.Odbc.OdbcParameter)", "", "Argument[this]", "Argument[1]", "taint", "df-generated"]
       - ["System.Data.Odbc", "OdbcParameterCollection", False, "set_Item", "(System.String,System.Data.Odbc.OdbcParameter)", "", "Argument[this]", "Argument[1]", "taint", "df-generated"]
-      - ["System.Data.Odbc", "OdbcRowUpdatedEventArgs", False, "get_Command", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Data.Odbc", "OdbcRowUpdatedEventArgs", False, "get_Command", "()", "", "Argument[this].Property[System.Data.Common.RowUpdatedEventArgs.Command]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Data.Odbc", "OdbcTransaction", False, "get_Connection", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Data.Odbc", "OdbcTransaction", False, "get_DbConnection", "()", "", "Argument[this].Property[System.Data.Odbc.OdbcTransaction.Connection]", "ReturnValue", "value", "dfc-generated"]
   - addsTo:
       pack: codeql/csharp-all
       extensible: sinkModel
@@ -111,11 +100,19 @@ extensions:
       - ["System.Data.Odbc", "OdbcCommand", "ResetCommandTimeout", "()", "summary", "df-generated"]
       - ["System.Data.Odbc", "OdbcCommandBuilder", "ApplyParameterInfo", "(System.Data.Common.DbParameter,System.Data.DataRow,System.Data.StatementType,System.Boolean)", "summary", "df-generated"]
       - ["System.Data.Odbc", "OdbcCommandBuilder", "DeriveParameters", "(System.Data.Odbc.OdbcCommand)", "summary", "df-generated"]
+      - ["System.Data.Odbc", "OdbcCommandBuilder", "GetDeleteCommand", "()", "summary", "df-generated"]
+      - ["System.Data.Odbc", "OdbcCommandBuilder", "GetDeleteCommand", "(System.Boolean)", "summary", "df-generated"]
+      - ["System.Data.Odbc", "OdbcCommandBuilder", "GetInsertCommand", "()", "summary", "df-generated"]
+      - ["System.Data.Odbc", "OdbcCommandBuilder", "GetInsertCommand", "(System.Boolean)", "summary", "df-generated"]
       - ["System.Data.Odbc", "OdbcCommandBuilder", "GetParameterName", "(System.Int32)", "summary", "df-generated"]
       - ["System.Data.Odbc", "OdbcCommandBuilder", "GetParameterPlaceholder", "(System.Int32)", "summary", "df-generated"]
+      - ["System.Data.Odbc", "OdbcCommandBuilder", "GetUpdateCommand", "()", "summary", "df-generated"]
+      - ["System.Data.Odbc", "OdbcCommandBuilder", "GetUpdateCommand", "(System.Boolean)", "summary", "df-generated"]
+      - ["System.Data.Odbc", "OdbcCommandBuilder", "OdbcCommandBuilder", "(System.Data.Odbc.OdbcDataAdapter)", "summary", "df-generated"]
       - ["System.Data.Odbc", "OdbcCommandBuilder", "SetRowUpdatingHandler", "(System.Data.Common.DbDataAdapter)", "summary", "df-generated"]
       - ["System.Data.Odbc", "OdbcConnection", "ChangeDatabase", "(System.String)", "summary", "df-generated"]
       - ["System.Data.Odbc", "OdbcConnection", "Close", "()", "summary", "df-generated"]
+      - ["System.Data.Odbc", "OdbcConnection", "CreateDbCommand", "()", "summary", "df-generated"]
       - ["System.Data.Odbc", "OdbcConnection", "Dispose", "(System.Boolean)", "summary", "df-generated"]
       - ["System.Data.Odbc", "OdbcConnection", "GetSchema", "()", "summary", "df-generated"]
       - ["System.Data.Odbc", "OdbcConnection", "GetSchema", "(System.String)", "summary", "df-generated"]
@@ -123,15 +120,23 @@ extensions:
       - ["System.Data.Odbc", "OdbcConnection", "OdbcConnection", "(System.String)", "summary", "df-generated"]
       - ["System.Data.Odbc", "OdbcConnection", "Open", "()", "summary", "df-generated"]
       - ["System.Data.Odbc", "OdbcConnection", "ReleaseObjectPool", "()", "summary", "df-generated"]
+      - ["System.Data.Odbc", "OdbcConnection", "add_InfoMessage", "(System.Data.Odbc.OdbcInfoMessageEventHandler)", "summary", "df-generated"]
       - ["System.Data.Odbc", "OdbcConnection", "get_DataSource", "()", "summary", "df-generated"]
       - ["System.Data.Odbc", "OdbcConnection", "get_Database", "()", "summary", "df-generated"]
       - ["System.Data.Odbc", "OdbcConnection", "get_Driver", "()", "summary", "df-generated"]
       - ["System.Data.Odbc", "OdbcConnection", "get_State", "()", "summary", "df-generated"]
+      - ["System.Data.Odbc", "OdbcConnection", "remove_InfoMessage", "(System.Data.Odbc.OdbcInfoMessageEventHandler)", "summary", "df-generated"]
       - ["System.Data.Odbc", "OdbcConnectionStringBuilder", "ContainsKey", "(System.String)", "summary", "df-generated"]
       - ["System.Data.Odbc", "OdbcConnectionStringBuilder", "OdbcConnectionStringBuilder", "(System.String)", "summary", "df-generated"]
       - ["System.Data.Odbc", "OdbcConnectionStringBuilder", "Remove", "(System.String)", "summary", "df-generated"]
+      - ["System.Data.Odbc", "OdbcDataAdapter", "CreateRowUpdatedEvent", "(System.Data.DataRow,System.Data.IDbCommand,System.Data.StatementType,System.Data.Common.DataTableMapping)", "summary", "df-generated"]
+      - ["System.Data.Odbc", "OdbcDataAdapter", "CreateRowUpdatingEvent", "(System.Data.DataRow,System.Data.IDbCommand,System.Data.StatementType,System.Data.Common.DataTableMapping)", "summary", "df-generated"]
       - ["System.Data.Odbc", "OdbcDataAdapter", "OnRowUpdated", "(System.Data.Common.RowUpdatedEventArgs)", "summary", "df-generated"]
       - ["System.Data.Odbc", "OdbcDataAdapter", "OnRowUpdating", "(System.Data.Common.RowUpdatingEventArgs)", "summary", "df-generated"]
+      - ["System.Data.Odbc", "OdbcDataAdapter", "add_RowUpdated", "(System.Data.Odbc.OdbcRowUpdatedEventHandler)", "summary", "df-generated"]
+      - ["System.Data.Odbc", "OdbcDataAdapter", "add_RowUpdating", "(System.Data.Odbc.OdbcRowUpdatingEventHandler)", "summary", "df-generated"]
+      - ["System.Data.Odbc", "OdbcDataAdapter", "remove_RowUpdated", "(System.Data.Odbc.OdbcRowUpdatedEventHandler)", "summary", "df-generated"]
+      - ["System.Data.Odbc", "OdbcDataAdapter", "remove_RowUpdating", "(System.Data.Odbc.OdbcRowUpdatingEventHandler)", "summary", "df-generated"]
       - ["System.Data.Odbc", "OdbcDataReader", "Close", "()", "summary", "df-generated"]
       - ["System.Data.Odbc", "OdbcDataReader", "Dispose", "(System.Boolean)", "summary", "df-generated"]
       - ["System.Data.Odbc", "OdbcDataReader", "GetBoolean", "(System.Int32)", "summary", "df-generated"]
diff --git a/csharp/ql/lib/ext/generated/System.Data.OleDb.model.yml b/csharp/ql/lib/ext/generated/System.Data.OleDb.model.yml
index 56f55bcf3eb..6339ad912fe 100644
--- a/csharp/ql/lib/ext/generated/System.Data.OleDb.model.yml
+++ b/csharp/ql/lib/ext/generated/System.Data.OleDb.model.yml
@@ -37,6 +37,7 @@ extensions:
       - ["System.Data.OleDb", "OleDbConnection", "ChangeDatabase", "(System.String)", "summary", "df-generated"]
       - ["System.Data.OleDb", "OleDbConnection", "Close", "()", "summary", "df-generated"]
       - ["System.Data.OleDb", "OleDbConnection", "CreateCommand", "()", "summary", "df-generated"]
+      - ["System.Data.OleDb", "OleDbConnection", "CreateDbCommand", "()", "summary", "df-generated"]
       - ["System.Data.OleDb", "OleDbConnection", "Dispose", "(System.Boolean)", "summary", "df-generated"]
       - ["System.Data.OleDb", "OleDbConnection", "EnlistTransaction", "(System.Transactions.Transaction)", "summary", "df-generated"]
       - ["System.Data.OleDb", "OleDbConnection", "GetOleDbSchemaTable", "(System.Guid,System.Object[])", "summary", "df-generated"]
@@ -47,14 +48,18 @@ extensions:
       - ["System.Data.OleDb", "OleDbConnection", "Open", "()", "summary", "df-generated"]
       - ["System.Data.OleDb", "OleDbConnection", "ReleaseObjectPool", "()", "summary", "df-generated"]
       - ["System.Data.OleDb", "OleDbConnection", "ResetState", "()", "summary", "df-generated"]
+      - ["System.Data.OleDb", "OleDbConnection", "add_InfoMessage", "(System.Data.OleDb.OleDbInfoMessageEventHandler)", "summary", "df-generated"]
       - ["System.Data.OleDb", "OleDbConnection", "get_ConnectionTimeout", "()", "summary", "df-generated"]
       - ["System.Data.OleDb", "OleDbConnection", "get_DataSource", "()", "summary", "df-generated"]
       - ["System.Data.OleDb", "OleDbConnection", "get_Database", "()", "summary", "df-generated"]
       - ["System.Data.OleDb", "OleDbConnection", "get_Provider", "()", "summary", "df-generated"]
       - ["System.Data.OleDb", "OleDbConnection", "get_State", "()", "summary", "df-generated"]
+      - ["System.Data.OleDb", "OleDbConnection", "remove_InfoMessage", "(System.Data.OleDb.OleDbInfoMessageEventHandler)", "summary", "df-generated"]
       - ["System.Data.OleDb", "OleDbConnectionStringBuilder", "ContainsKey", "(System.String)", "summary", "df-generated"]
       - ["System.Data.OleDb", "OleDbConnectionStringBuilder", "OleDbConnectionStringBuilder", "(System.String)", "summary", "df-generated"]
       - ["System.Data.OleDb", "OleDbConnectionStringBuilder", "Remove", "(System.String)", "summary", "df-generated"]
+      - ["System.Data.OleDb", "OleDbDataAdapter", "CreateRowUpdatedEvent", "(System.Data.DataRow,System.Data.IDbCommand,System.Data.StatementType,System.Data.Common.DataTableMapping)", "summary", "df-generated"]
+      - ["System.Data.OleDb", "OleDbDataAdapter", "CreateRowUpdatingEvent", "(System.Data.DataRow,System.Data.IDbCommand,System.Data.StatementType,System.Data.Common.DataTableMapping)", "summary", "df-generated"]
       - ["System.Data.OleDb", "OleDbDataAdapter", "Fill", "(System.Data.DataSet,System.Object,System.String)", "summary", "df-generated"]
       - ["System.Data.OleDb", "OleDbDataAdapter", "Fill", "(System.Data.DataTable,System.Object)", "summary", "df-generated"]
       - ["System.Data.OleDb", "OleDbDataAdapter", "OleDbDataAdapter", "(System.Data.OleDb.OleDbCommand)", "summary", "df-generated"]
@@ -62,6 +67,10 @@ extensions:
       - ["System.Data.OleDb", "OleDbDataAdapter", "OleDbDataAdapter", "(System.String,System.String)", "summary", "df-generated"]
       - ["System.Data.OleDb", "OleDbDataAdapter", "OnRowUpdated", "(System.Data.Common.RowUpdatedEventArgs)", "summary", "df-generated"]
       - ["System.Data.OleDb", "OleDbDataAdapter", "OnRowUpdating", "(System.Data.Common.RowUpdatingEventArgs)", "summary", "df-generated"]
+      - ["System.Data.OleDb", "OleDbDataAdapter", "add_RowUpdated", "(System.Data.OleDb.OleDbRowUpdatedEventHandler)", "summary", "df-generated"]
+      - ["System.Data.OleDb", "OleDbDataAdapter", "add_RowUpdating", "(System.Data.OleDb.OleDbRowUpdatingEventHandler)", "summary", "df-generated"]
+      - ["System.Data.OleDb", "OleDbDataAdapter", "remove_RowUpdated", "(System.Data.OleDb.OleDbRowUpdatedEventHandler)", "summary", "df-generated"]
+      - ["System.Data.OleDb", "OleDbDataAdapter", "remove_RowUpdating", "(System.Data.OleDb.OleDbRowUpdatingEventHandler)", "summary", "df-generated"]
       - ["System.Data.OleDb", "OleDbDataReader", "Close", "()", "summary", "df-generated"]
       - ["System.Data.OleDb", "OleDbDataReader", "GetBoolean", "(System.Int32)", "summary", "df-generated"]
       - ["System.Data.OleDb", "OleDbDataReader", "GetByte", "(System.Int32)", "summary", "df-generated"]
@@ -134,6 +143,8 @@ extensions:
       - ["System.Data.OleDb", "OleDbParameterCollection", "Contains", "(System.Object)", "summary", "df-generated"]
       - ["System.Data.OleDb", "OleDbParameterCollection", "Contains", "(System.String)", "summary", "df-generated"]
       - ["System.Data.OleDb", "OleDbParameterCollection", "CopyTo", "(System.Data.OleDb.OleDbParameter[],System.Int32)", "summary", "df-generated"]
+      - ["System.Data.OleDb", "OleDbParameterCollection", "GetParameter", "(System.Int32)", "summary", "df-generated"]
+      - ["System.Data.OleDb", "OleDbParameterCollection", "GetParameter", "(System.String)", "summary", "df-generated"]
       - ["System.Data.OleDb", "OleDbParameterCollection", "IndexOf", "(System.Data.OleDb.OleDbParameter)", "summary", "df-generated"]
       - ["System.Data.OleDb", "OleDbParameterCollection", "IndexOf", "(System.Object)", "summary", "df-generated"]
       - ["System.Data.OleDb", "OleDbParameterCollection", "IndexOf", "(System.String)", "summary", "df-generated"]
@@ -163,4 +174,5 @@ extensions:
       - ["System.Data.OleDb", "OleDbTransaction", "Dispose", "(System.Boolean)", "summary", "df-generated"]
       - ["System.Data.OleDb", "OleDbTransaction", "Rollback", "()", "summary", "df-generated"]
       - ["System.Data.OleDb", "OleDbTransaction", "get_Connection", "()", "summary", "df-generated"]
+      - ["System.Data.OleDb", "OleDbTransaction", "get_DbConnection", "()", "summary", "df-generated"]
       - ["System.Data.OleDb", "OleDbTransaction", "get_IsolationLevel", "()", "summary", "df-generated"]
diff --git a/csharp/ql/lib/ext/generated/System.Data.SqlTypes.model.yml b/csharp/ql/lib/ext/generated/System.Data.SqlTypes.model.yml
index 711023fab2e..195a8c9c7b1 100644
--- a/csharp/ql/lib/ext/generated/System.Data.SqlTypes.model.yml
+++ b/csharp/ql/lib/ext/generated/System.Data.SqlTypes.model.yml
@@ -4,48 +4,40 @@ extensions:
       pack: codeql/csharp-all
       extensible: summaryModel
     data:
-      - ["System.Data.SqlTypes", "SqlBinary", False, "Add", "(System.Data.SqlTypes.SqlBinary,System.Data.SqlTypes.SqlBinary)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Data.SqlTypes", "SqlBinary", False, "Add", "(System.Data.SqlTypes.SqlBinary,System.Data.SqlTypes.SqlBinary)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Data.SqlTypes", "SqlBinary", False, "Concat", "(System.Data.SqlTypes.SqlBinary,System.Data.SqlTypes.SqlBinary)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Data.SqlTypes", "SqlBinary", False, "Concat", "(System.Data.SqlTypes.SqlBinary,System.Data.SqlTypes.SqlBinary)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Data.SqlTypes", "SqlBinary", False, "SqlBinary", "(System.Byte[])", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["System.Data.SqlTypes", "SqlBinary", False, "WrapBytes", "(System.Byte[])", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["System.Data.SqlTypes", "SqlBinary", False, "get_Value", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Data.SqlTypes", "SqlBinary", False, "op_Addition", "(System.Data.SqlTypes.SqlBinary,System.Data.SqlTypes.SqlBinary)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Data.SqlTypes", "SqlBinary", False, "op_Addition", "(System.Data.SqlTypes.SqlBinary,System.Data.SqlTypes.SqlBinary)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Data.SqlTypes", "SqlBinary", False, "SqlBinary", "(System.Byte[])", "", "Argument[0].Element", "Argument[this].SyntheticField[System.Data.SqlTypes.SqlBinary._value].Element", "value", "dfc-generated"]
+      - ["System.Data.SqlTypes", "SqlBinary", False, "WrapBytes", "(System.Byte[])", "", "Argument[0]", "ReturnValue.SyntheticField[System.Data.SqlTypes.SqlBinary._value]", "value", "dfc-generated"]
+      - ["System.Data.SqlTypes", "SqlBinary", False, "get_Value", "()", "", "Argument[this].SyntheticField[System.Data.SqlTypes.SqlBinary._value].Element", "ReturnValue.Element", "value", "dfc-generated"]
       - ["System.Data.SqlTypes", "SqlBytes", False, "Read", "(System.Int64,System.Byte[],System.Int32,System.Int32)", "", "Argument[this]", "Argument[1].Element", "taint", "df-generated"]
-      - ["System.Data.SqlTypes", "SqlBytes", False, "SqlBytes", "(System.Byte[])", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["System.Data.SqlTypes", "SqlBytes", False, "SqlBytes", "(System.IO.Stream)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Data.SqlTypes", "SqlBytes", False, "ToSqlBinary", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Data.SqlTypes", "SqlBytes", False, "SqlBytes", "(System.Byte[])", "", "Argument[0]", "Argument[this].SyntheticField[System.Data.SqlTypes.SqlBytes._rgbBuf]", "value", "dfc-generated"]
+      - ["System.Data.SqlTypes", "SqlBytes", False, "SqlBytes", "(System.IO.Stream)", "", "Argument[0]", "Argument[this].SyntheticField[System.Data.SqlTypes.SqlBytes._stream]", "value", "dfc-generated"]
       - ["System.Data.SqlTypes", "SqlBytes", False, "Write", "(System.Int64,System.Byte[],System.Int32,System.Int32)", "", "Argument[1].Element", "Argument[this]", "taint", "df-generated"]
-      - ["System.Data.SqlTypes", "SqlBytes", False, "get_Buffer", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Data.SqlTypes", "SqlBytes", False, "get_Value", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Data.SqlTypes", "SqlChars", False, "SqlChars", "(System.Char[])", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["System.Data.SqlTypes", "SqlChars", False, "get_Buffer", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Data.SqlTypes", "SqlDecimal", False, "Abs", "(System.Data.SqlTypes.SqlDecimal)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Data.SqlTypes", "SqlDecimal", False, "AdjustScale", "(System.Data.SqlTypes.SqlDecimal,System.Int32,System.Boolean)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Data.SqlTypes", "SqlDecimal", False, "Ceiling", "(System.Data.SqlTypes.SqlDecimal)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Data.SqlTypes", "SqlDecimal", False, "ConvertToPrecScale", "(System.Data.SqlTypes.SqlDecimal,System.Int32,System.Int32)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Data.SqlTypes", "SqlDecimal", False, "Floor", "(System.Data.SqlTypes.SqlDecimal)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Data.SqlTypes", "SqlDecimal", False, "Round", "(System.Data.SqlTypes.SqlDecimal,System.Int32)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Data.SqlTypes", "SqlDecimal", False, "Truncate", "(System.Data.SqlTypes.SqlDecimal,System.Int32)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Data.SqlTypes", "SqlDecimal", False, "op_UnaryNegation", "(System.Data.SqlTypes.SqlDecimal)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Data.SqlTypes", "SqlGuid", False, "SqlGuid", "(System.Guid)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Data.SqlTypes", "SqlGuid", False, "get_Value", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Data.SqlTypes", "SqlString", False, "Add", "(System.Data.SqlTypes.SqlString,System.Data.SqlTypes.SqlString)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Data.SqlTypes", "SqlString", False, "Add", "(System.Data.SqlTypes.SqlString,System.Data.SqlTypes.SqlString)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Data.SqlTypes", "SqlString", False, "Clone", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Data.SqlTypes", "SqlString", False, "Concat", "(System.Data.SqlTypes.SqlString,System.Data.SqlTypes.SqlString)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Data.SqlTypes", "SqlString", False, "Concat", "(System.Data.SqlTypes.SqlString,System.Data.SqlTypes.SqlString)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Data.SqlTypes", "SqlString", False, "GetNonUnicodeBytes", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Data.SqlTypes", "SqlString", False, "GetUnicodeBytes", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Data.SqlTypes", "SqlString", False, "SqlString", "(System.Int32,System.Data.SqlTypes.SqlCompareOptions,System.Byte[],System.Int32,System.Int32,System.Boolean)", "", "Argument[2].Element", "Argument[this]", "taint", "df-generated"]
-      - ["System.Data.SqlTypes", "SqlString", False, "SqlString", "(System.String,System.Int32,System.Data.SqlTypes.SqlCompareOptions)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Data.SqlTypes", "SqlString", False, "ToString", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Data.SqlTypes", "SqlBytes", False, "get_Buffer", "()", "", "Argument[this].SyntheticField[System.Data.SqlTypes.SqlBytes._rgbBuf]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Data.SqlTypes", "SqlBytes", False, "get_Value", "()", "", "Argument[this].SyntheticField[System.Data.SqlTypes.SqlBytes._stream]", "ReturnValue.Element", "taint", "dfc-generated"]
+      - ["System.Data.SqlTypes", "SqlChars", False, "SqlChars", "(System.Char[])", "", "Argument[0]", "Argument[this].SyntheticField[System.Data.SqlTypes.SqlChars._rgchBuf]", "value", "dfc-generated"]
+      - ["System.Data.SqlTypes", "SqlChars", False, "get_Buffer", "()", "", "Argument[this].SyntheticField[System.Data.SqlTypes.SqlChars._rgchBuf]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Data.SqlTypes", "SqlDecimal", False, "Abs", "(System.Data.SqlTypes.SqlDecimal)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Data.SqlTypes", "SqlDecimal", False, "AdjustScale", "(System.Data.SqlTypes.SqlDecimal,System.Int32,System.Boolean)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Data.SqlTypes", "SqlDecimal", False, "Ceiling", "(System.Data.SqlTypes.SqlDecimal)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Data.SqlTypes", "SqlDecimal", False, "ConvertToPrecScale", "(System.Data.SqlTypes.SqlDecimal,System.Int32,System.Int32)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Data.SqlTypes", "SqlDecimal", False, "Floor", "(System.Data.SqlTypes.SqlDecimal)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Data.SqlTypes", "SqlDecimal", False, "Round", "(System.Data.SqlTypes.SqlDecimal,System.Int32)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Data.SqlTypes", "SqlDecimal", False, "Truncate", "(System.Data.SqlTypes.SqlDecimal,System.Int32)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Data.SqlTypes", "SqlDecimal", False, "op_UnaryNegation", "(System.Data.SqlTypes.SqlDecimal)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Data.SqlTypes", "SqlGuid", False, "SqlGuid", "(System.Guid)", "", "Argument[0]", "Argument[this].SyntheticField[System.Data.SqlTypes.SqlGuid._value]", "value", "dfc-generated"]
+      - ["System.Data.SqlTypes", "SqlGuid", False, "get_Value", "()", "", "Argument[this].SyntheticField[System.Data.SqlTypes.SqlGuid._value]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Data.SqlTypes", "SqlString", False, "Add", "(System.Data.SqlTypes.SqlString,System.Data.SqlTypes.SqlString)", "", "Argument[0].SyntheticField[System.Data.SqlTypes.SqlString.m_value]", "ReturnValue.SyntheticField[System.Data.SqlTypes.SqlString.m_value]", "taint", "dfc-generated"]
+      - ["System.Data.SqlTypes", "SqlString", False, "Add", "(System.Data.SqlTypes.SqlString,System.Data.SqlTypes.SqlString)", "", "Argument[1].SyntheticField[System.Data.SqlTypes.SqlString.m_value]", "ReturnValue.SyntheticField[System.Data.SqlTypes.SqlString.m_value]", "taint", "dfc-generated"]
+      - ["System.Data.SqlTypes", "SqlString", False, "Concat", "(System.Data.SqlTypes.SqlString,System.Data.SqlTypes.SqlString)", "", "Argument[0].SyntheticField[System.Data.SqlTypes.SqlString.m_value]", "ReturnValue.SyntheticField[System.Data.SqlTypes.SqlString.m_value]", "taint", "dfc-generated"]
+      - ["System.Data.SqlTypes", "SqlString", False, "Concat", "(System.Data.SqlTypes.SqlString,System.Data.SqlTypes.SqlString)", "", "Argument[1].SyntheticField[System.Data.SqlTypes.SqlString.m_value]", "ReturnValue.SyntheticField[System.Data.SqlTypes.SqlString.m_value]", "taint", "dfc-generated"]
+      - ["System.Data.SqlTypes", "SqlString", False, "GetNonUnicodeBytes", "()", "", "Argument[this].SyntheticField[System.Data.SqlTypes.SqlString.m_value]", "ReturnValue", "taint", "dfc-generated"]
+      - ["System.Data.SqlTypes", "SqlString", False, "GetUnicodeBytes", "()", "", "Argument[this].SyntheticField[System.Data.SqlTypes.SqlString.m_value]", "ReturnValue", "taint", "dfc-generated"]
+      - ["System.Data.SqlTypes", "SqlString", False, "SqlString", "(System.Int32,System.Data.SqlTypes.SqlCompareOptions,System.Byte[],System.Int32,System.Int32,System.Boolean)", "", "Argument[2].Element", "Argument[this].SyntheticField[System.Data.SqlTypes.SqlString.m_value]", "taint", "dfc-generated"]
+      - ["System.Data.SqlTypes", "SqlString", False, "SqlString", "(System.String,System.Int32,System.Data.SqlTypes.SqlCompareOptions)", "", "Argument[0]", "Argument[this].SyntheticField[System.Data.SqlTypes.SqlString.m_value]", "value", "dfc-generated"]
+      - ["System.Data.SqlTypes", "SqlString", False, "ToString", "()", "", "Argument[this].SyntheticField[System.Data.SqlTypes.SqlString.m_value]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Data.SqlTypes", "SqlString", False, "get_CompareInfo", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Data.SqlTypes", "SqlString", False, "get_Value", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Data.SqlTypes", "SqlString", False, "op_Addition", "(System.Data.SqlTypes.SqlString,System.Data.SqlTypes.SqlString)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Data.SqlTypes", "SqlString", False, "op_Addition", "(System.Data.SqlTypes.SqlString,System.Data.SqlTypes.SqlString)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Data.SqlTypes", "SqlString", False, "get_Value", "()", "", "Argument[this].SyntheticField[System.Data.SqlTypes.SqlString.m_value]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Data.SqlTypes", "SqlString", False, "op_Addition", "(System.Data.SqlTypes.SqlString,System.Data.SqlTypes.SqlString)", "", "Argument[0].SyntheticField[System.Data.SqlTypes.SqlString.m_value]", "ReturnValue.SyntheticField[System.Data.SqlTypes.SqlString.m_value]", "taint", "dfc-generated"]
+      - ["System.Data.SqlTypes", "SqlString", False, "op_Addition", "(System.Data.SqlTypes.SqlString,System.Data.SqlTypes.SqlString)", "", "Argument[1].SyntheticField[System.Data.SqlTypes.SqlString.m_value]", "ReturnValue.SyntheticField[System.Data.SqlTypes.SqlString.m_value]", "taint", "dfc-generated"]
       - ["System.Data.SqlTypes", "SqlXml", False, "SqlXml", "(System.IO.Stream)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
   - addsTo:
       pack: codeql/csharp-all
@@ -54,8 +46,10 @@ extensions:
       - ["System.Data.SqlTypes", "INullable", "get_IsNull", "()", "summary", "df-generated"]
       - ["System.Data.SqlTypes", "SqlAlreadyFilledException", "SqlAlreadyFilledException", "(System.String)", "summary", "df-generated"]
       - ["System.Data.SqlTypes", "SqlAlreadyFilledException", "SqlAlreadyFilledException", "(System.String,System.Exception)", "summary", "df-generated"]
+      - ["System.Data.SqlTypes", "SqlBinary", "Add", "(System.Data.SqlTypes.SqlBinary,System.Data.SqlTypes.SqlBinary)", "summary", "df-generated"]
       - ["System.Data.SqlTypes", "SqlBinary", "CompareTo", "(System.Data.SqlTypes.SqlBinary)", "summary", "df-generated"]
       - ["System.Data.SqlTypes", "SqlBinary", "CompareTo", "(System.Object)", "summary", "df-generated"]
+      - ["System.Data.SqlTypes", "SqlBinary", "Concat", "(System.Data.SqlTypes.SqlBinary,System.Data.SqlTypes.SqlBinary)", "summary", "df-generated"]
       - ["System.Data.SqlTypes", "SqlBinary", "Equals", "(System.Data.SqlTypes.SqlBinary)", "summary", "df-generated"]
       - ["System.Data.SqlTypes", "SqlBinary", "Equals", "(System.Data.SqlTypes.SqlBinary,System.Data.SqlTypes.SqlBinary)", "summary", "df-generated"]
       - ["System.Data.SqlTypes", "SqlBinary", "Equals", "(System.Object)", "summary", "df-generated"]
@@ -72,6 +66,7 @@ extensions:
       - ["System.Data.SqlTypes", "SqlBinary", "get_IsNull", "()", "summary", "df-generated"]
       - ["System.Data.SqlTypes", "SqlBinary", "get_Item", "(System.Int32)", "summary", "df-generated"]
       - ["System.Data.SqlTypes", "SqlBinary", "get_Length", "()", "summary", "df-generated"]
+      - ["System.Data.SqlTypes", "SqlBinary", "op_Addition", "(System.Data.SqlTypes.SqlBinary,System.Data.SqlTypes.SqlBinary)", "summary", "df-generated"]
       - ["System.Data.SqlTypes", "SqlBinary", "op_Equality", "(System.Data.SqlTypes.SqlBinary,System.Data.SqlTypes.SqlBinary)", "summary", "df-generated"]
       - ["System.Data.SqlTypes", "SqlBinary", "op_GreaterThan", "(System.Data.SqlTypes.SqlBinary,System.Data.SqlTypes.SqlBinary)", "summary", "df-generated"]
       - ["System.Data.SqlTypes", "SqlBinary", "op_GreaterThanOrEqual", "(System.Data.SqlTypes.SqlBinary,System.Data.SqlTypes.SqlBinary)", "summary", "df-generated"]
@@ -183,6 +178,7 @@ extensions:
       - ["System.Data.SqlTypes", "SqlBytes", "SetLength", "(System.Int64)", "summary", "df-generated"]
       - ["System.Data.SqlTypes", "SqlBytes", "SetNull", "()", "summary", "df-generated"]
       - ["System.Data.SqlTypes", "SqlBytes", "SqlBytes", "(System.Data.SqlTypes.SqlBinary)", "summary", "df-generated"]
+      - ["System.Data.SqlTypes", "SqlBytes", "ToSqlBinary", "()", "summary", "df-generated"]
       - ["System.Data.SqlTypes", "SqlBytes", "get_IsNull", "()", "summary", "df-generated"]
       - ["System.Data.SqlTypes", "SqlBytes", "get_Item", "(System.Int64)", "summary", "df-generated"]
       - ["System.Data.SqlTypes", "SqlBytes", "get_Length", "()", "summary", "df-generated"]
@@ -624,6 +620,7 @@ extensions:
       - ["System.Data.SqlTypes", "SqlSingle", "op_Multiply", "(System.Data.SqlTypes.SqlSingle,System.Data.SqlTypes.SqlSingle)", "summary", "df-generated"]
       - ["System.Data.SqlTypes", "SqlSingle", "op_Subtraction", "(System.Data.SqlTypes.SqlSingle,System.Data.SqlTypes.SqlSingle)", "summary", "df-generated"]
       - ["System.Data.SqlTypes", "SqlSingle", "op_UnaryNegation", "(System.Data.SqlTypes.SqlSingle)", "summary", "df-generated"]
+      - ["System.Data.SqlTypes", "SqlString", "Clone", "()", "summary", "df-generated"]
       - ["System.Data.SqlTypes", "SqlString", "CompareOptionsFromSqlCompareOptions", "(System.Data.SqlTypes.SqlCompareOptions)", "summary", "df-generated"]
       - ["System.Data.SqlTypes", "SqlString", "CompareTo", "(System.Data.SqlTypes.SqlString)", "summary", "df-generated"]
       - ["System.Data.SqlTypes", "SqlString", "CompareTo", "(System.Object)", "summary", "df-generated"]
diff --git a/csharp/ql/lib/ext/generated/System.Data.model.yml b/csharp/ql/lib/ext/generated/System.Data.model.yml
index 3d143d2d5f7..51c3c7c0026 100644
--- a/csharp/ql/lib/ext/generated/System.Data.model.yml
+++ b/csharp/ql/lib/ext/generated/System.Data.model.yml
@@ -4,56 +4,39 @@ extensions:
       pack: codeql/csharp-all
       extensible: summaryModel
     data:
-      - ["System.Data", "Constraint", False, "SetDataSet", "(System.Data.DataSet)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Data", "Constraint", False, "ToString", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Data", "Constraint", False, "SetDataSet", "(System.Data.DataSet)", "", "Argument[0]", "Argument[this].SyntheticField[System.Data.Constraint._dataSet]", "value", "dfc-generated"]
+      - ["System.Data", "Constraint", False, "ToString", "()", "", "Argument[this].Property[System.Data.Constraint.ConstraintName]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Data", "Constraint", True, "get_Table", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Data", "Constraint", True, "get__DataSet", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Data", "ConstraintCollection", False, "Add", "(System.String,System.Data.DataColumn,System.Boolean)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Data", "ConstraintCollection", False, "Add", "(System.String,System.Data.DataColumn,System.Boolean)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Data", "ConstraintCollection", False, "Add", "(System.String,System.Data.DataColumn,System.Data.DataColumn)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Data", "ConstraintCollection", False, "Add", "(System.String,System.Data.DataColumn,System.Data.DataColumn)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Data", "ConstraintCollection", False, "Add", "(System.String,System.Data.DataColumn[],System.Boolean)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Data", "ConstraintCollection", False, "Add", "(System.String,System.Data.DataColumn[],System.Boolean)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Data", "Constraint", True, "get__DataSet", "()", "", "Argument[this].SyntheticField[System.Data.Constraint._dataSet]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Data", "ConstraintCollection", False, "Add", "(System.String,System.Data.DataColumn[],System.Boolean)", "", "Argument[1].Element", "Argument[this]", "taint", "df-generated"]
-      - ["System.Data", "ConstraintCollection", False, "Add", "(System.String,System.Data.DataColumn[],System.Data.DataColumn[])", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Data", "ConstraintCollection", False, "Add", "(System.String,System.Data.DataColumn[],System.Data.DataColumn[])", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Data", "ConstraintCollection", False, "get_Item", "(System.Int32)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Data", "ConstraintCollection", False, "get_Item", "(System.String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Data", "DBConcurrencyException", False, "CopyToRows", "(System.Data.DataRow[])", "", "Argument[this]", "Argument[0].Element", "taint", "df-generated"]
-      - ["System.Data", "DBConcurrencyException", False, "CopyToRows", "(System.Data.DataRow[],System.Int32)", "", "Argument[this]", "Argument[0].Element", "taint", "df-generated"]
-      - ["System.Data", "DBConcurrencyException", False, "DBConcurrencyException", "(System.String,System.Exception,System.Data.DataRow[])", "", "Argument[2].Element", "Argument[this]", "taint", "df-generated"]
+      - ["System.Data", "ConstraintCollection", False, "get_Item", "(System.Int32)", "", "Argument[this].Property[System.Data.ConstraintCollection.List].Element", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Data", "ConstraintCollection", False, "get_Item", "(System.String)", "", "Argument[this].Property[System.Data.ConstraintCollection.List].Element", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Data", "DBConcurrencyException", False, "CopyToRows", "(System.Data.DataRow[])", "", "Argument[this].SyntheticField[System.Data.DBConcurrencyException._dataRows].Element", "Argument[0].Element", "value", "dfc-generated"]
+      - ["System.Data", "DBConcurrencyException", False, "CopyToRows", "(System.Data.DataRow[],System.Int32)", "", "Argument[this].SyntheticField[System.Data.DBConcurrencyException._dataRows].Element", "Argument[0].Element", "value", "dfc-generated"]
+      - ["System.Data", "DBConcurrencyException", False, "DBConcurrencyException", "(System.String,System.Exception,System.Data.DataRow[])", "", "Argument[2]", "Argument[this].SyntheticField[System.Data.DBConcurrencyException._dataRows]", "value", "dfc-generated"]
       - ["System.Data", "DataColumn", False, "DataColumn", "(System.String,System.Type,System.String,System.Data.MappingType)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Data", "DataColumn", False, "DataColumn", "(System.String,System.Type,System.String,System.Data.MappingType)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
       - ["System.Data", "DataColumn", False, "get_Table", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Data", "DataColumnChangeEventArgs", False, "DataColumnChangeEventArgs", "(System.Data.DataRow,System.Data.DataColumn,System.Object)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Data", "DataColumnChangeEventArgs", False, "get_Column", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Data", "DataColumnChangeEventArgs", False, "DataColumnChangeEventArgs", "(System.Data.DataRow,System.Data.DataColumn,System.Object)", "", "Argument[1]", "Argument[this].SyntheticField[System.Data.DataColumnChangeEventArgs._column]", "value", "dfc-generated"]
+      - ["System.Data", "DataColumnChangeEventArgs", False, "get_Column", "()", "", "Argument[this].SyntheticField[System.Data.DataColumnChangeEventArgs._column]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Data", "DataColumnCollection", False, "Add", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Data", "DataColumnCollection", False, "Add", "(System.String,System.Type)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Data", "DataColumnCollection", False, "Add", "(System.String,System.Type,System.String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Data", "DataColumnCollection", False, "get_Item", "(System.Int32)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Data", "DataColumnCollection", False, "get_Item", "(System.String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Data", "DataReaderExtensions", False, "GetFieldValue<T>", "(System.Data.Common.DbDataReader,System.String)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["System.Data", "DataReaderExtensions", False, "GetFieldValueAsync<T>", "(System.Data.Common.DbDataReader,System.String,System.Threading.CancellationToken)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
+      - ["System.Data", "DataReaderExtensions", False, "GetFieldValue<T>", "(System.Data.Common.DbDataReader,System.String)", "", "Argument[0]", "ReturnValue", "taint", "dfc-generated"]
+      - ["System.Data", "DataReaderExtensions", False, "GetFieldValueAsync<T>", "(System.Data.Common.DbDataReader,System.String,System.Threading.CancellationToken)", "", "Argument[0]", "ReturnValue.Property[System.Threading.Tasks.Task`1.Result]", "taint", "dfc-generated"]
       - ["System.Data", "DataReaderExtensions", False, "GetGuid", "(System.Data.Common.DbDataReader,System.String)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["System.Data", "DataReaderExtensions", False, "GetProviderSpecificValue", "(System.Data.Common.DbDataReader,System.String)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["System.Data", "DataReaderExtensions", False, "GetString", "(System.Data.Common.DbDataReader,System.String)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["System.Data", "DataReaderExtensions", False, "GetTextReader", "(System.Data.Common.DbDataReader,System.String)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["System.Data", "DataReaderExtensions", False, "GetValue", "(System.Data.Common.DbDataReader,System.String)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["System.Data", "DataRelation", False, "DataRelation", "(System.String,System.Data.DataColumn,System.Data.DataColumn,System.Boolean)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Data", "DataRelation", False, "DataRelation", "(System.String,System.Data.DataColumn[],System.Data.DataColumn[],System.Boolean)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Data", "DataRelation", False, "DataRelation", "(System.String,System.String,System.String,System.String,System.String,System.String[],System.String[],System.Boolean)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Data", "DataRelation", False, "DataRelation", "(System.String,System.String,System.String,System.String,System.String,System.String[],System.String[],System.Boolean)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Data", "DataRelation", False, "DataRelation", "(System.String,System.String,System.String,System.String,System.String,System.String[],System.String[],System.Boolean)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Data", "DataRelation", False, "DataRelation", "(System.String,System.String,System.String,System.String,System.String,System.String[],System.String[],System.Boolean)", "", "Argument[3]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Data", "DataRelation", False, "DataRelation", "(System.String,System.String,System.String,System.String,System.String,System.String[],System.String[],System.Boolean)", "", "Argument[4]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Data", "DataRelation", False, "DataRelation", "(System.String,System.String,System.String,System.String,System.String,System.String[],System.String[],System.Boolean)", "", "Argument[5].Element", "Argument[this]", "taint", "df-generated"]
-      - ["System.Data", "DataRelation", False, "DataRelation", "(System.String,System.String,System.String,System.String,System.String,System.String[],System.String[],System.Boolean)", "", "Argument[6].Element", "Argument[this]", "taint", "df-generated"]
-      - ["System.Data", "DataRelation", False, "DataRelation", "(System.String,System.String,System.String,System.String[],System.String[],System.Boolean)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Data", "DataRelation", False, "DataRelation", "(System.String,System.String,System.String,System.String[],System.String[],System.Boolean)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Data", "DataRelation", False, "DataRelation", "(System.String,System.String,System.String,System.String[],System.String[],System.Boolean)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Data", "DataRelation", False, "DataRelation", "(System.String,System.String,System.String,System.String[],System.String[],System.Boolean)", "", "Argument[3].Element", "Argument[this]", "taint", "df-generated"]
-      - ["System.Data", "DataRelation", False, "DataRelation", "(System.String,System.String,System.String,System.String[],System.String[],System.Boolean)", "", "Argument[4].Element", "Argument[this]", "taint", "df-generated"]
-      - ["System.Data", "DataRelation", False, "ToString", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Data", "DataReaderExtensions", False, "GetProviderSpecificValue", "(System.Data.Common.DbDataReader,System.String)", "", "Argument[0]", "ReturnValue", "taint", "dfc-generated"]
+      - ["System.Data", "DataReaderExtensions", False, "GetString", "(System.Data.Common.DbDataReader,System.String)", "", "Argument[0]", "ReturnValue", "taint", "dfc-generated"]
+      - ["System.Data", "DataReaderExtensions", False, "GetTextReader", "(System.Data.Common.DbDataReader,System.String)", "", "Argument[0]", "ReturnValue", "taint", "dfc-generated"]
+      - ["System.Data", "DataReaderExtensions", False, "GetValue", "(System.Data.Common.DbDataReader,System.String)", "", "Argument[0]", "ReturnValue", "taint", "dfc-generated"]
+      - ["System.Data", "DataRelation", False, "DataRelation", "(System.String,System.Data.DataColumn,System.Data.DataColumn,System.Boolean)", "", "Argument[0]", "Argument[this].SyntheticField[System.Data.DataRelation._relationName]", "value", "dfc-generated"]
+      - ["System.Data", "DataRelation", False, "DataRelation", "(System.String,System.Data.DataColumn[],System.Data.DataColumn[],System.Boolean)", "", "Argument[0]", "Argument[this].SyntheticField[System.Data.DataRelation._relationName]", "value", "dfc-generated"]
+      - ["System.Data", "DataRelation", False, "DataRelation", "(System.String,System.String,System.String,System.String,System.String,System.String[],System.String[],System.Boolean)", "", "Argument[0]", "Argument[this].SyntheticField[System.Data.DataRelation._relationName]", "value", "dfc-generated"]
+      - ["System.Data", "DataRelation", False, "DataRelation", "(System.String,System.String,System.String,System.String[],System.String[],System.Boolean)", "", "Argument[0]", "Argument[this].SyntheticField[System.Data.DataRelation._relationName]", "value", "dfc-generated"]
+      - ["System.Data", "DataRelation", False, "ToString", "()", "", "Argument[this].Property[System.Data.DataRelation.RelationName]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Data", "DataRelation", False, "ToString", "()", "", "Argument[this].SyntheticField[System.Data.DataRelation._relationName]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Data", "DataRelation", True, "get_ChildColumns", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Data", "DataRelation", True, "get_ChildKeyConstraint", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Data", "DataRelation", True, "get_ChildTable", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
@@ -65,16 +48,14 @@ extensions:
       - ["System.Data", "DataRelationCollection", True, "Add", "(System.Data.DataColumn,System.Data.DataColumn)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Data", "DataRelationCollection", True, "Add", "(System.Data.DataColumn[],System.Data.DataColumn[])", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Data", "DataRelationCollection", True, "Add", "(System.String,System.Data.DataColumn,System.Data.DataColumn)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Data", "DataRelationCollection", True, "Add", "(System.String,System.Data.DataColumn,System.Data.DataColumn,System.Boolean)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Data", "DataRelationCollection", True, "Add", "(System.String,System.Data.DataColumn,System.Data.DataColumn,System.Boolean)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["System.Data", "DataRelationCollection", True, "Add", "(System.String,System.Data.DataColumn,System.Data.DataColumn,System.Boolean)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Data", "DataRelationCollection", True, "Add", "(System.String,System.Data.DataColumn[],System.Data.DataColumn[])", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Data", "DataRelationCollection", True, "Add", "(System.String,System.Data.DataColumn[],System.Data.DataColumn[],System.Boolean)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Data", "DataRelationCollection", True, "Add", "(System.String,System.Data.DataColumn[],System.Data.DataColumn[],System.Boolean)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["System.Data", "DataRelationCollection", True, "Add", "(System.String,System.Data.DataColumn[],System.Data.DataColumn[],System.Boolean)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Data", "DataRelationCollection", True, "AddCore", "(System.Data.DataRelation)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Data", "DataRelationCollection", True, "AddCore", "(System.Data.DataRelation)", "", "Argument[this]", "Argument[0]", "taint", "df-generated"]
       - ["System.Data", "DataRelationCollection", True, "GetDataSet", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Data", "DataRelationCollection", True, "OnCollectionChanged", "(System.ComponentModel.CollectionChangeEventArgs)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["System.Data", "DataRelationCollection", True, "OnCollectionChanging", "(System.ComponentModel.CollectionChangeEventArgs)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Data", "DataRelationCollection", True, "get_Item", "(System.Int32)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Data", "DataRelationCollection", True, "get_Item", "(System.String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Data", "DataRow", False, "DataRow", "(System.Data.DataRowBuilder)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
@@ -104,14 +85,12 @@ extensions:
       - ["System.Data", "DataRowView", False, "CreateChildView", "(System.Data.DataRelation,System.Boolean)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Data", "DataRowView", False, "CreateChildView", "(System.String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Data", "DataRowView", False, "CreateChildView", "(System.String,System.Boolean)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Data", "DataRowView", False, "get_DataView", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Data", "DataRowView", False, "get_DataView", "()", "", "Argument[this].SyntheticField[System.Data.DataRowView._dataView]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Data", "DataRowView", False, "get_Error", "()", "", "Argument[this].Property[System.Data.DataRowView.Row].Property[System.Data.DataRow.RowError]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Data", "DataRowView", False, "get_Item", "(System.Int32)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Data", "DataRowView", False, "get_Item", "(System.String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Data", "DataRowView", False, "get_Row", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Data", "DataSet", False, "Copy", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Data", "DataSet", False, "CreateDataReader", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Data", "DataSet", False, "CreateDataReader", "(System.Data.DataTable[])", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["System.Data", "DataSet", False, "DataSet", "(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext,System.Boolean)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Data", "DataSet", False, "DataSet", "(System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Data", "DataSet", False, "GetChanges", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Data", "DataSet", False, "GetChanges", "(System.Data.DataRowState)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
@@ -119,18 +98,18 @@ extensions:
       - ["System.Data", "DataSet", False, "get_Relations", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Data", "DataSet", False, "get_Tables", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Data", "DataSet", True, "Clone", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Data", "DataSysDescriptionAttribute", True, "get_Description", "()", "", "Argument[this].Property[System.ComponentModel.DescriptionAttribute.Description]", "Argument[this].Property[System.ComponentModel.DescriptionAttribute.DescriptionValue]", "value", "dfc-generated"]
+      - ["System.Data", "DataSysDescriptionAttribute", True, "get_Description", "()", "", "Argument[this].Property[System.ComponentModel.DescriptionAttribute.Description]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Data", "DataTable", False, "Copy", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Data", "DataTable", False, "CreateDataReader", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Data", "DataTable", False, "DataTable", "(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Data", "DataTable", False, "DataTable", "(System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Data", "DataTable", False, "DataTable", "(System.String,System.String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
       - ["System.Data", "DataTable", False, "GetChanges", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Data", "DataTable", False, "GetChanges", "(System.Data.DataRowState)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Data", "DataTable", False, "GetErrors", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Data", "DataTable", False, "LoadDataRow", "(System.Object[],System.Boolean)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["System.Data", "DataTable", False, "LoadDataRow", "(System.Object[],System.Boolean)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Data", "DataTable", False, "GetList", "()", "", "Argument[this].Property[System.Data.DataTable.DefaultView]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Data", "DataTable", False, "LoadDataRow", "(System.Object[],System.Boolean)", "", "Argument[0]", "Argument[this].Property[System.Data.DataTable.Rows].Element", "value", "dfc-generated"]
+      - ["System.Data", "DataTable", False, "LoadDataRow", "(System.Object[],System.Boolean)", "", "Argument[0]", "Argument[this].SyntheticField[System.Data.DataTable._rowCollection].Element", "value", "dfc-generated"]
       - ["System.Data", "DataTable", False, "LoadDataRow", "(System.Object[],System.Data.LoadOption)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Data", "DataTable", False, "NewRow", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Data", "DataTable", False, "NewRowArray", "(System.Int32)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Data", "DataTable", False, "Select", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Data", "DataTable", False, "Select", "(System.String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
@@ -140,11 +119,20 @@ extensions:
       - ["System.Data", "DataTable", False, "get_Constraints", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Data", "DataTable", False, "get_DataSet", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Data", "DataTable", False, "get_DefaultView", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Data", "DataTable", False, "get_Rows", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Data", "DataTable", False, "get_Rows", "()", "", "Argument[this].SyntheticField[System.Data.DataTable._rowCollection]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Data", "DataTable", True, "Clone", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Data", "DataTable", True, "NewRowFromBuilder", "(System.Data.DataRowBuilder)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Data", "DataTableClearEventArgs", False, "get_TableName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Data", "DataTableClearEventArgs", False, "get_TableNamespace", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Data", "DataTable", True, "OnColumnChanged", "(System.Data.DataColumnChangeEventArgs)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["System.Data", "DataTable", True, "OnColumnChanging", "(System.Data.DataColumnChangeEventArgs)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["System.Data", "DataTable", True, "OnPropertyChanging", "(System.ComponentModel.PropertyChangedEventArgs)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["System.Data", "DataTable", True, "OnRowChanged", "(System.Data.DataRowChangeEventArgs)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["System.Data", "DataTable", True, "OnRowChanging", "(System.Data.DataRowChangeEventArgs)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["System.Data", "DataTable", True, "OnRowDeleted", "(System.Data.DataRowChangeEventArgs)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["System.Data", "DataTable", True, "OnRowDeleting", "(System.Data.DataRowChangeEventArgs)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["System.Data", "DataTable", True, "OnTableCleared", "(System.Data.DataTableClearEventArgs)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["System.Data", "DataTable", True, "OnTableClearing", "(System.Data.DataTableClearEventArgs)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["System.Data", "DataTable", True, "OnTableNewRow", "(System.Data.DataTableNewRowEventArgs)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["System.Data", "DataTableClearEventArgs", False, "get_TableName", "()", "", "Argument[this].Property[System.Data.DataTableClearEventArgs.Table].Property[System.Data.DataTable.TableName]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Data", "DataTableClearEventArgs", False, "get_TableNamespace", "()", "", "Argument[this].Property[System.Data.DataTableClearEventArgs.Table].Property[System.Data.DataTable.Namespace]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Data", "DataTableCollection", False, "Add", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Data", "DataTableCollection", False, "Add", "(System.String,System.String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
       - ["System.Data", "DataTableCollection", False, "Add", "(System.String,System.String)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
@@ -153,37 +141,40 @@ extensions:
       - ["System.Data", "DataTableCollection", False, "get_Item", "(System.String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Data", "DataTableCollection", False, "get_Item", "(System.String,System.String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Data", "DataTableExtensions", False, "AsEnumerable", "(System.Data.DataTable)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Data", "DataTableExtensions", False, "CopyToDataTable<T>", "(System.Collections.Generic.IEnumerable<T>)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["System.Data", "DataTableExtensions", False, "CopyToDataTable<T>", "(System.Collections.Generic.IEnumerable<T>,System.Data.DataTable,System.Data.LoadOption)", "", "Argument[0].Element", "Argument[1]", "taint", "df-generated"]
+      - ["System.Data", "DataTableExtensions", False, "CopyToDataTable<T>", "(System.Collections.Generic.IEnumerable<T>)", "", "Argument[0].Element.Property[System.Data.DataRow.ItemArray]", "ReturnValue.Property[System.Data.DataTable.Rows].Element", "value", "dfc-generated"]
+      - ["System.Data", "DataTableExtensions", False, "CopyToDataTable<T>", "(System.Collections.Generic.IEnumerable<T>)", "", "Argument[0].Element.Property[System.Data.DataRow.ItemArray]", "ReturnValue.SyntheticField[System.Data.DataTable._rowCollection].Element", "value", "dfc-generated"]
+      - ["System.Data", "DataTableExtensions", False, "CopyToDataTable<T>", "(System.Collections.Generic.IEnumerable<T>,System.Data.DataTable,System.Data.LoadOption)", "", "Argument[0].Element.Property[System.Data.DataRow.ItemArray]", "Argument[1].Property[System.Data.DataTable.Rows].Element", "value", "dfc-generated"]
+      - ["System.Data", "DataTableExtensions", False, "CopyToDataTable<T>", "(System.Collections.Generic.IEnumerable<T>,System.Data.DataTable,System.Data.LoadOption)", "", "Argument[0].Element.Property[System.Data.DataRow.ItemArray]", "Argument[1].SyntheticField[System.Data.DataTable._rowCollection].Element", "value", "dfc-generated"]
+      - ["System.Data", "DataTableExtensions", False, "CopyToDataTable<T>", "(System.Collections.Generic.IEnumerable<T>,System.Data.DataTable,System.Data.LoadOption,System.Data.FillErrorEventHandler)", "", "Argument[0].Element.Property[System.Data.DataRow.ItemArray]", "Argument[1].Property[System.Data.DataTable.Rows].Element", "value", "dfc-generated"]
+      - ["System.Data", "DataTableExtensions", False, "CopyToDataTable<T>", "(System.Collections.Generic.IEnumerable<T>,System.Data.DataTable,System.Data.LoadOption,System.Data.FillErrorEventHandler)", "", "Argument[0].Element.Property[System.Data.DataRow.ItemArray]", "Argument[1].SyntheticField[System.Data.DataTable._rowCollection].Element", "value", "dfc-generated"]
       - ["System.Data", "DataTableReader", False, "DataTableReader", "(System.Data.DataTable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Data", "DataTableReader", False, "DataTableReader", "(System.Data.DataTable[])", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["System.Data", "DataView", False, "DataView", "(System.Data.DataTable,System.String,System.String,System.Data.DataViewRowState)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Data", "DataView", False, "DataView", "(System.Data.DataTable,System.String,System.String,System.Data.DataViewRowState)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Data", "DataView", False, "FindRows", "(System.Object)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Data", "DataView", False, "FindRows", "(System.Object[])", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Data", "DataView", False, "AddNew", "()", "", "Argument[this]", "ReturnValue.SyntheticField[System.Data.DataRowView._dataView]", "value", "dfc-generated"]
+      - ["System.Data", "DataView", False, "DataView", "(System.Data.DataTable,System.String,System.String,System.Data.DataViewRowState)", "", "Argument[0]", "Argument[this].SyntheticField[System.Data.DataView._table]", "value", "dfc-generated"]
+      - ["System.Data", "DataView", False, "FindRows", "(System.Object)", "", "Argument[this].Element", "ReturnValue.Element", "value", "dfc-generated"]
+      - ["System.Data", "DataView", False, "FindRows", "(System.Object[])", "", "Argument[this].Element", "ReturnValue.Element", "value", "dfc-generated"]
+      - ["System.Data", "DataView", False, "GetListName", "(System.ComponentModel.PropertyDescriptor[])", "", "Argument[this].SyntheticField[System.Data.DataView._table].Property[System.Data.DataTable.TableName]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Data", "DataView", False, "ToTable", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Data", "DataView", False, "ToTable", "(System.Boolean,System.String[])", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Data", "DataView", False, "ToTable", "(System.String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Data", "DataView", False, "ToTable", "(System.String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Data", "DataView", False, "ToTable", "(System.String,System.Boolean,System.String[])", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Data", "DataView", False, "ToTable", "(System.String,System.Boolean,System.String[])", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Data", "DataView", False, "get_DataViewManager", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Data", "DataView", True, "AddNew", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Data", "DataViewManager", False, "CreateDataView", "(System.Data.DataTable)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Data", "DataView", False, "ToTable", "(System.String)", "", "Argument[0]", "ReturnValue.Property[System.Data.DataTable.TableName]", "value", "dfc-generated"]
+      - ["System.Data", "DataView", False, "ToTable", "(System.String,System.Boolean,System.String[])", "", "Argument[0]", "ReturnValue.Property[System.Data.DataTable.TableName]", "value", "dfc-generated"]
+      - ["System.Data", "DataView", False, "get_DataViewManager", "()", "", "Argument[this].SyntheticField[System.Data.DataView._dataViewManager]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Data", "DataView", True, "AddNew", "()", "", "Argument[this]", "ReturnValue.SyntheticField[System.Data.DataRowView._dataView]", "value", "dfc-generated"]
+      - ["System.Data", "DataView", True, "IndexListChanged", "(System.Object,System.ComponentModel.ListChangedEventArgs)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["System.Data", "DataView", True, "OnListChanged", "(System.ComponentModel.ListChangedEventArgs)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["System.Data", "DataViewManager", False, "CreateDataView", "(System.Data.DataTable)", "", "Argument[this]", "ReturnValue.SyntheticField[System.Data.DataView._dataViewManager]", "value", "dfc-generated"]
       - ["System.Data", "DataViewManager", False, "get_DataViewSettings", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Data", "DataViewSetting", False, "get_DataViewManager", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Data", "DataViewSetting", False, "get_Table", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Data", "DataViewSettingCollection", True, "get_Item", "(System.Data.DataTable)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Data", "DataViewSettingCollection", True, "get_Item", "(System.Data.DataTable)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Data", "DataViewSetting", False, "get_Table", "()", "", "Argument[this].SyntheticField[System.Data.DataViewSetting._table]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Data", "DataViewSettingCollection", True, "get_Item", "(System.Data.DataTable)", "", "Argument[0]", "ReturnValue.SyntheticField[System.Data.DataViewSetting._table]", "value", "dfc-generated"]
       - ["System.Data", "DataViewSettingCollection", True, "get_Item", "(System.Int32)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Data", "DataViewSettingCollection", True, "get_Item", "(System.String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Data", "DataViewSettingCollection", True, "set_Item", "(System.Data.DataTable,System.Data.DataViewSetting)", "", "Argument[0]", "Argument[1]", "taint", "df-generated"]
-      - ["System.Data", "DataViewSettingCollection", True, "set_Item", "(System.Data.DataTable,System.Data.DataViewSetting)", "", "Argument[this]", "Argument[1]", "taint", "df-generated"]
+      - ["System.Data", "DataViewSettingCollection", True, "set_Item", "(System.Data.DataTable,System.Data.DataViewSetting)", "", "Argument[0]", "Argument[1].SyntheticField[System.Data.DataViewSetting._table]", "value", "dfc-generated"]
       - ["System.Data", "DataViewSettingCollection", True, "set_Item", "(System.Int32,System.Data.DataViewSetting)", "", "Argument[this]", "Argument[1]", "taint", "df-generated"]
-      - ["System.Data", "FillErrorEventArgs", False, "FillErrorEventArgs", "(System.Data.DataTable,System.Object[])", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Data", "FillErrorEventArgs", False, "FillErrorEventArgs", "(System.Data.DataTable,System.Object[])", "", "Argument[1].Element", "Argument[this]", "taint", "df-generated"]
-      - ["System.Data", "FillErrorEventArgs", False, "get_DataTable", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Data", "FillErrorEventArgs", False, "get_Values", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Data", "FillErrorEventArgs", False, "FillErrorEventArgs", "(System.Data.DataTable,System.Object[])", "", "Argument[0]", "Argument[this].SyntheticField[System.Data.FillErrorEventArgs._dataTable]", "value", "dfc-generated"]
+      - ["System.Data", "FillErrorEventArgs", False, "FillErrorEventArgs", "(System.Data.DataTable,System.Object[])", "", "Argument[1]", "Argument[this].SyntheticField[System.Data.FillErrorEventArgs._values]", "value", "dfc-generated"]
+      - ["System.Data", "FillErrorEventArgs", False, "get_DataTable", "()", "", "Argument[this].SyntheticField[System.Data.FillErrorEventArgs._dataTable]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Data", "FillErrorEventArgs", False, "get_Values", "()", "", "Argument[this].SyntheticField[System.Data.FillErrorEventArgs._values].Element", "ReturnValue.Element", "value", "dfc-generated"]
       - ["System.Data", "ForeignKeyConstraint", False, "ForeignKeyConstraint", "(System.String,System.Data.DataColumn,System.Data.DataColumn)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Data", "ForeignKeyConstraint", False, "ForeignKeyConstraint", "(System.String,System.Data.DataColumn[],System.Data.DataColumn[])", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Data", "ForeignKeyConstraint", False, "ForeignKeyConstraint", "(System.String,System.String,System.String,System.String[],System.String[],System.Data.AcceptRejectRule,System.Data.Rule,System.Data.Rule)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
@@ -198,22 +189,11 @@ extensions:
       - ["System.Data", "ForeignKeyConstraint", True, "get_Columns", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Data", "ForeignKeyConstraint", True, "get_RelatedColumns", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Data", "ForeignKeyConstraint", True, "get_RelatedTable", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Data", "IColumnMappingCollection", True, "Add", "(System.String,System.String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Data", "IColumnMappingCollection", True, "Add", "(System.String,System.String)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
       - ["System.Data", "IColumnMappingCollection", True, "Add", "(System.String,System.String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Data", "IColumnMappingCollection", True, "GetByDataSetColumn", "(System.String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Data", "IDataAdapter", True, "GetFillParameters", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Data", "IDataAdapter", True, "get_TableMappings", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Data", "IDataReader", True, "GetSchemaTable", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Data", "IDbCommand", True, "ExecuteScalar", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Data", "IDbCommand", True, "get_Parameters", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Data", "IDbConnection", True, "BeginTransaction", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Data", "IDbConnection", True, "BeginTransaction", "(System.Data.IsolationLevel)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Data", "IDbConnection", True, "CreateCommand", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Data", "IDbTransaction", True, "get_Connection", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Data", "ITableMapping", True, "get_ColumnMappings", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Data", "ITableMappingCollection", True, "Add", "(System.String,System.String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Data", "ITableMappingCollection", True, "Add", "(System.String,System.String)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
       - ["System.Data", "ITableMappingCollection", True, "Add", "(System.String,System.String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Data", "ITableMappingCollection", True, "GetByDataSetTable", "(System.String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Data", "InternalDataCollectionBase", True, "get_List", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
@@ -231,6 +211,9 @@ extensions:
     data:
       - ["System.Data", "Constraint", "CheckStateForProperty", "()", "summary", "df-generated"]
       - ["System.Data", "Constraint", "get_ExtendedProperties", "()", "summary", "df-generated"]
+      - ["System.Data", "ConstraintCollection", "Add", "(System.String,System.Data.DataColumn,System.Boolean)", "summary", "df-generated"]
+      - ["System.Data", "ConstraintCollection", "Add", "(System.String,System.Data.DataColumn,System.Data.DataColumn)", "summary", "df-generated"]
+      - ["System.Data", "ConstraintCollection", "Add", "(System.String,System.Data.DataColumn[],System.Data.DataColumn[])", "summary", "df-generated"]
       - ["System.Data", "ConstraintCollection", "CanRemove", "(System.Data.Constraint)", "summary", "df-generated"]
       - ["System.Data", "ConstraintCollection", "Contains", "(System.String)", "summary", "df-generated"]
       - ["System.Data", "ConstraintCollection", "IndexOf", "(System.Data.Constraint)", "summary", "df-generated"]
@@ -238,6 +221,8 @@ extensions:
       - ["System.Data", "ConstraintCollection", "Remove", "(System.Data.Constraint)", "summary", "df-generated"]
       - ["System.Data", "ConstraintCollection", "Remove", "(System.String)", "summary", "df-generated"]
       - ["System.Data", "ConstraintCollection", "RemoveAt", "(System.Int32)", "summary", "df-generated"]
+      - ["System.Data", "ConstraintCollection", "add_CollectionChanged", "(System.ComponentModel.CollectionChangeEventHandler)", "summary", "df-generated"]
+      - ["System.Data", "ConstraintCollection", "remove_CollectionChanged", "(System.ComponentModel.CollectionChangeEventHandler)", "summary", "df-generated"]
       - ["System.Data", "ConstraintException", "ConstraintException", "(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)", "summary", "df-generated"]
       - ["System.Data", "ConstraintException", "ConstraintException", "(System.String)", "summary", "df-generated"]
       - ["System.Data", "ConstraintException", "ConstraintException", "(System.String,System.Exception)", "summary", "df-generated"]
@@ -262,6 +247,8 @@ extensions:
       - ["System.Data", "DataColumnCollection", "Remove", "(System.Data.DataColumn)", "summary", "df-generated"]
       - ["System.Data", "DataColumnCollection", "Remove", "(System.String)", "summary", "df-generated"]
       - ["System.Data", "DataColumnCollection", "RemoveAt", "(System.Int32)", "summary", "df-generated"]
+      - ["System.Data", "DataColumnCollection", "add_CollectionChanged", "(System.ComponentModel.CollectionChangeEventHandler)", "summary", "df-generated"]
+      - ["System.Data", "DataColumnCollection", "remove_CollectionChanged", "(System.ComponentModel.CollectionChangeEventHandler)", "summary", "df-generated"]
       - ["System.Data", "DataException", "DataException", "(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)", "summary", "df-generated"]
       - ["System.Data", "DataException", "DataException", "(System.String)", "summary", "df-generated"]
       - ["System.Data", "DataException", "DataException", "(System.String,System.Exception)", "summary", "df-generated"]
@@ -294,11 +281,11 @@ extensions:
       - ["System.Data", "DataRelationCollection", "Contains", "(System.String)", "summary", "df-generated"]
       - ["System.Data", "DataRelationCollection", "IndexOf", "(System.Data.DataRelation)", "summary", "df-generated"]
       - ["System.Data", "DataRelationCollection", "IndexOf", "(System.String)", "summary", "df-generated"]
-      - ["System.Data", "DataRelationCollection", "OnCollectionChanged", "(System.ComponentModel.CollectionChangeEventArgs)", "summary", "df-generated"]
-      - ["System.Data", "DataRelationCollection", "OnCollectionChanging", "(System.ComponentModel.CollectionChangeEventArgs)", "summary", "df-generated"]
       - ["System.Data", "DataRelationCollection", "Remove", "(System.String)", "summary", "df-generated"]
       - ["System.Data", "DataRelationCollection", "RemoveAt", "(System.Int32)", "summary", "df-generated"]
       - ["System.Data", "DataRelationCollection", "RemoveCore", "(System.Data.DataRelation)", "summary", "df-generated"]
+      - ["System.Data", "DataRelationCollection", "add_CollectionChanged", "(System.ComponentModel.CollectionChangeEventHandler)", "summary", "df-generated"]
+      - ["System.Data", "DataRelationCollection", "remove_CollectionChanged", "(System.ComponentModel.CollectionChangeEventHandler)", "summary", "df-generated"]
       - ["System.Data", "DataRow", "AcceptChanges", "()", "summary", "df-generated"]
       - ["System.Data", "DataRow", "BeginEdit", "()", "summary", "df-generated"]
       - ["System.Data", "DataRow", "CancelEdit", "()", "summary", "df-generated"]
@@ -356,6 +343,7 @@ extensions:
       - ["System.Data", "DataRowView", "Delete", "()", "summary", "df-generated"]
       - ["System.Data", "DataRowView", "EndEdit", "()", "summary", "df-generated"]
       - ["System.Data", "DataRowView", "Equals", "(System.Object)", "summary", "df-generated"]
+      - ["System.Data", "DataRowView", "GetAttributes", "()", "summary", "df-generated"]
       - ["System.Data", "DataRowView", "GetClassName", "()", "summary", "df-generated"]
       - ["System.Data", "DataRowView", "GetComponentName", "()", "summary", "df-generated"]
       - ["System.Data", "DataRowView", "GetConverter", "()", "summary", "df-generated"]
@@ -365,16 +353,21 @@ extensions:
       - ["System.Data", "DataRowView", "GetEvents", "()", "summary", "df-generated"]
       - ["System.Data", "DataRowView", "GetEvents", "(System.Attribute[])", "summary", "df-generated"]
       - ["System.Data", "DataRowView", "GetHashCode", "()", "summary", "df-generated"]
+      - ["System.Data", "DataRowView", "add_PropertyChanged", "(System.ComponentModel.PropertyChangedEventHandler)", "summary", "df-generated"]
       - ["System.Data", "DataRowView", "get_IsEdit", "()", "summary", "df-generated"]
       - ["System.Data", "DataRowView", "get_IsNew", "()", "summary", "df-generated"]
       - ["System.Data", "DataRowView", "get_Item", "(System.String)", "summary", "df-generated"]
       - ["System.Data", "DataRowView", "get_RowVersion", "()", "summary", "df-generated"]
+      - ["System.Data", "DataRowView", "remove_PropertyChanged", "(System.ComponentModel.PropertyChangedEventHandler)", "summary", "df-generated"]
       - ["System.Data", "DataRowView", "set_Item", "(System.Int32,System.Object)", "summary", "df-generated"]
       - ["System.Data", "DataRowView", "set_Item", "(System.String,System.Object)", "summary", "df-generated"]
       - ["System.Data", "DataSet", "AcceptChanges", "()", "summary", "df-generated"]
       - ["System.Data", "DataSet", "BeginInit", "()", "summary", "df-generated"]
       - ["System.Data", "DataSet", "Clear", "()", "summary", "df-generated"]
+      - ["System.Data", "DataSet", "CreateDataReader", "()", "summary", "df-generated"]
+      - ["System.Data", "DataSet", "CreateDataReader", "(System.Data.DataTable[])", "summary", "df-generated"]
       - ["System.Data", "DataSet", "DataSet", "(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)", "summary", "df-generated"]
+      - ["System.Data", "DataSet", "DataSet", "(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext,System.Boolean)", "summary", "df-generated"]
       - ["System.Data", "DataSet", "DetermineSchemaSerializationMode", "(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)", "summary", "df-generated"]
       - ["System.Data", "DataSet", "DetermineSchemaSerializationMode", "(System.Xml.XmlReader)", "summary", "df-generated"]
       - ["System.Data", "DataSet", "EndInit", "()", "summary", "df-generated"]
@@ -393,6 +386,7 @@ extensions:
       - ["System.Data", "DataSet", "InitializeDerivedDataSet", "()", "summary", "df-generated"]
       - ["System.Data", "DataSet", "IsBinarySerialized", "(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)", "summary", "df-generated"]
       - ["System.Data", "DataSet", "Load", "(System.Data.IDataReader,System.Data.LoadOption,System.Data.DataTable[])", "summary", "df-generated"]
+      - ["System.Data", "DataSet", "Load", "(System.Data.IDataReader,System.Data.LoadOption,System.Data.FillErrorEventHandler,System.Data.DataTable[])", "summary", "df-generated"]
       - ["System.Data", "DataSet", "Load", "(System.Data.IDataReader,System.Data.LoadOption,System.String[])", "summary", "df-generated"]
       - ["System.Data", "DataSet", "Merge", "(System.Data.DataRow[])", "summary", "df-generated"]
       - ["System.Data", "DataSet", "Merge", "(System.Data.DataRow[],System.Boolean,System.Data.MissingSchemaAction)", "summary", "df-generated"]
@@ -431,20 +425,30 @@ extensions:
       - ["System.Data", "DataSet", "WriteXml", "(System.Xml.XmlWriter)", "summary", "df-generated"]
       - ["System.Data", "DataSet", "WriteXml", "(System.Xml.XmlWriter,System.Data.XmlWriteMode)", "summary", "df-generated"]
       - ["System.Data", "DataSet", "WriteXmlSchema", "(System.IO.Stream)", "summary", "df-generated"]
+      - ["System.Data", "DataSet", "WriteXmlSchema", "(System.IO.Stream,System.Converter<System.Type,System.String>)", "summary", "df-generated"]
       - ["System.Data", "DataSet", "WriteXmlSchema", "(System.IO.TextWriter)", "summary", "df-generated"]
+      - ["System.Data", "DataSet", "WriteXmlSchema", "(System.IO.TextWriter,System.Converter<System.Type,System.String>)", "summary", "df-generated"]
       - ["System.Data", "DataSet", "WriteXmlSchema", "(System.String)", "summary", "df-generated"]
+      - ["System.Data", "DataSet", "WriteXmlSchema", "(System.String,System.Converter<System.Type,System.String>)", "summary", "df-generated"]
       - ["System.Data", "DataSet", "WriteXmlSchema", "(System.Xml.XmlWriter)", "summary", "df-generated"]
+      - ["System.Data", "DataSet", "WriteXmlSchema", "(System.Xml.XmlWriter,System.Converter<System.Type,System.String>)", "summary", "df-generated"]
+      - ["System.Data", "DataSet", "add_Initialized", "(System.EventHandler)", "summary", "df-generated"]
+      - ["System.Data", "DataSet", "add_MergeFailed", "(System.Data.MergeFailedEventHandler)", "summary", "df-generated"]
       - ["System.Data", "DataSet", "get_ContainsListCollection", "()", "summary", "df-generated"]
       - ["System.Data", "DataSet", "get_ExtendedProperties", "()", "summary", "df-generated"]
       - ["System.Data", "DataSet", "get_HasErrors", "()", "summary", "df-generated"]
       - ["System.Data", "DataSet", "get_IsInitialized", "()", "summary", "df-generated"]
+      - ["System.Data", "DataSet", "remove_Initialized", "(System.EventHandler)", "summary", "df-generated"]
+      - ["System.Data", "DataSet", "remove_MergeFailed", "(System.Data.MergeFailedEventHandler)", "summary", "df-generated"]
       - ["System.Data", "DataSysDescriptionAttribute", "DataSysDescriptionAttribute", "(System.String)", "summary", "df-generated"]
       - ["System.Data", "DataTable", "AcceptChanges", "()", "summary", "df-generated"]
       - ["System.Data", "DataTable", "BeginInit", "()", "summary", "df-generated"]
       - ["System.Data", "DataTable", "BeginLoadData", "()", "summary", "df-generated"]
       - ["System.Data", "DataTable", "Clear", "()", "summary", "df-generated"]
       - ["System.Data", "DataTable", "Compute", "(System.String,System.String)", "summary", "df-generated"]
+      - ["System.Data", "DataTable", "CreateDataReader", "()", "summary", "df-generated"]
       - ["System.Data", "DataTable", "CreateInstance", "()", "summary", "df-generated"]
+      - ["System.Data", "DataTable", "DataTable", "(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)", "summary", "df-generated"]
       - ["System.Data", "DataTable", "EndInit", "()", "summary", "df-generated"]
       - ["System.Data", "DataTable", "EndLoadData", "()", "summary", "df-generated"]
       - ["System.Data", "DataTable", "GetDataTableSchema", "(System.Xml.Schema.XmlSchemaSet)", "summary", "df-generated"]
@@ -453,20 +457,13 @@ extensions:
       - ["System.Data", "DataTable", "ImportRow", "(System.Data.DataRow)", "summary", "df-generated"]
       - ["System.Data", "DataTable", "Load", "(System.Data.IDataReader)", "summary", "df-generated"]
       - ["System.Data", "DataTable", "Load", "(System.Data.IDataReader,System.Data.LoadOption)", "summary", "df-generated"]
+      - ["System.Data", "DataTable", "Load", "(System.Data.IDataReader,System.Data.LoadOption,System.Data.FillErrorEventHandler)", "summary", "df-generated"]
       - ["System.Data", "DataTable", "Merge", "(System.Data.DataTable)", "summary", "df-generated"]
       - ["System.Data", "DataTable", "Merge", "(System.Data.DataTable,System.Boolean)", "summary", "df-generated"]
       - ["System.Data", "DataTable", "Merge", "(System.Data.DataTable,System.Boolean,System.Data.MissingSchemaAction)", "summary", "df-generated"]
-      - ["System.Data", "DataTable", "OnColumnChanged", "(System.Data.DataColumnChangeEventArgs)", "summary", "df-generated"]
-      - ["System.Data", "DataTable", "OnColumnChanging", "(System.Data.DataColumnChangeEventArgs)", "summary", "df-generated"]
-      - ["System.Data", "DataTable", "OnPropertyChanging", "(System.ComponentModel.PropertyChangedEventArgs)", "summary", "df-generated"]
+      - ["System.Data", "DataTable", "NewRow", "()", "summary", "df-generated"]
+      - ["System.Data", "DataTable", "NewRowFromBuilder", "(System.Data.DataRowBuilder)", "summary", "df-generated"]
       - ["System.Data", "DataTable", "OnRemoveColumn", "(System.Data.DataColumn)", "summary", "df-generated"]
-      - ["System.Data", "DataTable", "OnRowChanged", "(System.Data.DataRowChangeEventArgs)", "summary", "df-generated"]
-      - ["System.Data", "DataTable", "OnRowChanging", "(System.Data.DataRowChangeEventArgs)", "summary", "df-generated"]
-      - ["System.Data", "DataTable", "OnRowDeleted", "(System.Data.DataRowChangeEventArgs)", "summary", "df-generated"]
-      - ["System.Data", "DataTable", "OnRowDeleting", "(System.Data.DataRowChangeEventArgs)", "summary", "df-generated"]
-      - ["System.Data", "DataTable", "OnTableCleared", "(System.Data.DataTableClearEventArgs)", "summary", "df-generated"]
-      - ["System.Data", "DataTable", "OnTableClearing", "(System.Data.DataTableClearEventArgs)", "summary", "df-generated"]
-      - ["System.Data", "DataTable", "OnTableNewRow", "(System.Data.DataTableNewRowEventArgs)", "summary", "df-generated"]
       - ["System.Data", "DataTable", "ReadXml", "(System.IO.Stream)", "summary", "df-generated"]
       - ["System.Data", "DataTable", "ReadXml", "(System.IO.TextReader)", "summary", "df-generated"]
       - ["System.Data", "DataTable", "ReadXml", "(System.String)", "summary", "df-generated"]
@@ -502,12 +499,32 @@ extensions:
       - ["System.Data", "DataTable", "WriteXmlSchema", "(System.String,System.Boolean)", "summary", "df-generated"]
       - ["System.Data", "DataTable", "WriteXmlSchema", "(System.Xml.XmlWriter)", "summary", "df-generated"]
       - ["System.Data", "DataTable", "WriteXmlSchema", "(System.Xml.XmlWriter,System.Boolean)", "summary", "df-generated"]
+      - ["System.Data", "DataTable", "add_ColumnChanged", "(System.Data.DataColumnChangeEventHandler)", "summary", "df-generated"]
+      - ["System.Data", "DataTable", "add_ColumnChanging", "(System.Data.DataColumnChangeEventHandler)", "summary", "df-generated"]
+      - ["System.Data", "DataTable", "add_Initialized", "(System.EventHandler)", "summary", "df-generated"]
+      - ["System.Data", "DataTable", "add_RowChanged", "(System.Data.DataRowChangeEventHandler)", "summary", "df-generated"]
+      - ["System.Data", "DataTable", "add_RowChanging", "(System.Data.DataRowChangeEventHandler)", "summary", "df-generated"]
+      - ["System.Data", "DataTable", "add_RowDeleted", "(System.Data.DataRowChangeEventHandler)", "summary", "df-generated"]
+      - ["System.Data", "DataTable", "add_RowDeleting", "(System.Data.DataRowChangeEventHandler)", "summary", "df-generated"]
+      - ["System.Data", "DataTable", "add_TableCleared", "(System.Data.DataTableClearEventHandler)", "summary", "df-generated"]
+      - ["System.Data", "DataTable", "add_TableClearing", "(System.Data.DataTableClearEventHandler)", "summary", "df-generated"]
+      - ["System.Data", "DataTable", "add_TableNewRow", "(System.Data.DataTableNewRowEventHandler)", "summary", "df-generated"]
       - ["System.Data", "DataTable", "get_ChildRelations", "()", "summary", "df-generated"]
       - ["System.Data", "DataTable", "get_ContainsListCollection", "()", "summary", "df-generated"]
       - ["System.Data", "DataTable", "get_ExtendedProperties", "()", "summary", "df-generated"]
       - ["System.Data", "DataTable", "get_HasErrors", "()", "summary", "df-generated"]
       - ["System.Data", "DataTable", "get_IsInitialized", "()", "summary", "df-generated"]
       - ["System.Data", "DataTable", "get_ParentRelations", "()", "summary", "df-generated"]
+      - ["System.Data", "DataTable", "remove_ColumnChanged", "(System.Data.DataColumnChangeEventHandler)", "summary", "df-generated"]
+      - ["System.Data", "DataTable", "remove_ColumnChanging", "(System.Data.DataColumnChangeEventHandler)", "summary", "df-generated"]
+      - ["System.Data", "DataTable", "remove_Initialized", "(System.EventHandler)", "summary", "df-generated"]
+      - ["System.Data", "DataTable", "remove_RowChanged", "(System.Data.DataRowChangeEventHandler)", "summary", "df-generated"]
+      - ["System.Data", "DataTable", "remove_RowChanging", "(System.Data.DataRowChangeEventHandler)", "summary", "df-generated"]
+      - ["System.Data", "DataTable", "remove_RowDeleted", "(System.Data.DataRowChangeEventHandler)", "summary", "df-generated"]
+      - ["System.Data", "DataTable", "remove_RowDeleting", "(System.Data.DataRowChangeEventHandler)", "summary", "df-generated"]
+      - ["System.Data", "DataTable", "remove_TableCleared", "(System.Data.DataTableClearEventHandler)", "summary", "df-generated"]
+      - ["System.Data", "DataTable", "remove_TableClearing", "(System.Data.DataTableClearEventHandler)", "summary", "df-generated"]
+      - ["System.Data", "DataTable", "remove_TableNewRow", "(System.Data.DataTableNewRowEventHandler)", "summary", "df-generated"]
       - ["System.Data", "DataTableClearEventArgs", "DataTableClearEventArgs", "(System.Data.DataTable)", "summary", "df-generated"]
       - ["System.Data", "DataTableClearEventArgs", "get_Table", "()", "summary", "df-generated"]
       - ["System.Data", "DataTableCollection", "CanRemove", "(System.Data.DataTable)", "summary", "df-generated"]
@@ -520,6 +537,10 @@ extensions:
       - ["System.Data", "DataTableCollection", "Remove", "(System.String)", "summary", "df-generated"]
       - ["System.Data", "DataTableCollection", "Remove", "(System.String,System.String)", "summary", "df-generated"]
       - ["System.Data", "DataTableCollection", "RemoveAt", "(System.Int32)", "summary", "df-generated"]
+      - ["System.Data", "DataTableCollection", "add_CollectionChanged", "(System.ComponentModel.CollectionChangeEventHandler)", "summary", "df-generated"]
+      - ["System.Data", "DataTableCollection", "add_CollectionChanging", "(System.ComponentModel.CollectionChangeEventHandler)", "summary", "df-generated"]
+      - ["System.Data", "DataTableCollection", "remove_CollectionChanged", "(System.ComponentModel.CollectionChangeEventHandler)", "summary", "df-generated"]
+      - ["System.Data", "DataTableCollection", "remove_CollectionChanging", "(System.ComponentModel.CollectionChangeEventHandler)", "summary", "df-generated"]
       - ["System.Data", "DataTableExtensions", "AsDataView", "(System.Data.DataTable)", "summary", "df-generated"]
       - ["System.Data", "DataTableExtensions", "AsDataView<T>", "(System.Data.EnumerableRowCollection<T>)", "summary", "df-generated"]
       - ["System.Data", "DataTableNewRowEventArgs", "DataTableNewRowEventArgs", "(System.Data.DataRow)", "summary", "df-generated"]
@@ -558,10 +579,9 @@ extensions:
       - ["System.Data", "DataView", "Dispose", "(System.Boolean)", "summary", "df-generated"]
       - ["System.Data", "DataView", "EndInit", "()", "summary", "df-generated"]
       - ["System.Data", "DataView", "Equals", "(System.Data.DataView)", "summary", "df-generated"]
-      - ["System.Data", "DataView", "IndexListChanged", "(System.Object,System.ComponentModel.ListChangedEventArgs)", "summary", "df-generated"]
       - ["System.Data", "DataView", "IndexOf", "(System.Object)", "summary", "df-generated"]
-      - ["System.Data", "DataView", "OnListChanged", "(System.ComponentModel.ListChangedEventArgs)", "summary", "df-generated"]
       - ["System.Data", "DataView", "Open", "()", "summary", "df-generated"]
+      - ["System.Data", "DataView", "Remove", "(System.Object)", "summary", "df-generated"]
       - ["System.Data", "DataView", "RemoveAt", "(System.Int32)", "summary", "df-generated"]
       - ["System.Data", "DataView", "RemoveFilter", "()", "summary", "df-generated"]
       - ["System.Data", "DataView", "RemoveIndex", "(System.ComponentModel.PropertyDescriptor)", "summary", "df-generated"]
@@ -569,6 +589,8 @@ extensions:
       - ["System.Data", "DataView", "Reset", "()", "summary", "df-generated"]
       - ["System.Data", "DataView", "UpdateIndex", "()", "summary", "df-generated"]
       - ["System.Data", "DataView", "UpdateIndex", "(System.Boolean)", "summary", "df-generated"]
+      - ["System.Data", "DataView", "add_Initialized", "(System.EventHandler)", "summary", "df-generated"]
+      - ["System.Data", "DataView", "add_ListChanged", "(System.ComponentModel.ListChangedEventHandler)", "summary", "df-generated"]
       - ["System.Data", "DataView", "get_AllowEdit", "()", "summary", "df-generated"]
       - ["System.Data", "DataView", "get_AllowNew", "()", "summary", "df-generated"]
       - ["System.Data", "DataView", "get_AllowRemove", "()", "summary", "df-generated"]
@@ -581,21 +603,27 @@ extensions:
       - ["System.Data", "DataView", "get_IsSynchronized", "()", "summary", "df-generated"]
       - ["System.Data", "DataView", "get_SortDescriptions", "()", "summary", "df-generated"]
       - ["System.Data", "DataView", "get_SortDirection", "()", "summary", "df-generated"]
+      - ["System.Data", "DataView", "get_SortProperty", "()", "summary", "df-generated"]
       - ["System.Data", "DataView", "get_SupportsAdvancedSorting", "()", "summary", "df-generated"]
       - ["System.Data", "DataView", "get_SupportsChangeNotification", "()", "summary", "df-generated"]
       - ["System.Data", "DataView", "get_SupportsFiltering", "()", "summary", "df-generated"]
       - ["System.Data", "DataView", "get_SupportsSearching", "()", "summary", "df-generated"]
       - ["System.Data", "DataView", "get_SupportsSorting", "()", "summary", "df-generated"]
+      - ["System.Data", "DataView", "remove_Initialized", "(System.EventHandler)", "summary", "df-generated"]
+      - ["System.Data", "DataView", "remove_ListChanged", "(System.ComponentModel.ListChangedEventHandler)", "summary", "df-generated"]
       - ["System.Data", "DataViewManager", "AddIndex", "(System.ComponentModel.PropertyDescriptor)", "summary", "df-generated"]
+      - ["System.Data", "DataViewManager", "AddNew", "()", "summary", "df-generated"]
       - ["System.Data", "DataViewManager", "Contains", "(System.Object)", "summary", "df-generated"]
       - ["System.Data", "DataViewManager", "DataViewManager", "(System.Data.DataSet)", "summary", "df-generated"]
       - ["System.Data", "DataViewManager", "IndexOf", "(System.Object)", "summary", "df-generated"]
       - ["System.Data", "DataViewManager", "OnListChanged", "(System.ComponentModel.ListChangedEventArgs)", "summary", "df-generated"]
       - ["System.Data", "DataViewManager", "RelationCollectionChanged", "(System.Object,System.ComponentModel.CollectionChangeEventArgs)", "summary", "df-generated"]
+      - ["System.Data", "DataViewManager", "Remove", "(System.Object)", "summary", "df-generated"]
       - ["System.Data", "DataViewManager", "RemoveAt", "(System.Int32)", "summary", "df-generated"]
       - ["System.Data", "DataViewManager", "RemoveIndex", "(System.ComponentModel.PropertyDescriptor)", "summary", "df-generated"]
       - ["System.Data", "DataViewManager", "RemoveSort", "()", "summary", "df-generated"]
       - ["System.Data", "DataViewManager", "TableCollectionChanged", "(System.Object,System.ComponentModel.CollectionChangeEventArgs)", "summary", "df-generated"]
+      - ["System.Data", "DataViewManager", "add_ListChanged", "(System.ComponentModel.ListChangedEventHandler)", "summary", "df-generated"]
       - ["System.Data", "DataViewManager", "get_AllowEdit", "()", "summary", "df-generated"]
       - ["System.Data", "DataViewManager", "get_AllowNew", "()", "summary", "df-generated"]
       - ["System.Data", "DataViewManager", "get_AllowRemove", "()", "summary", "df-generated"]
@@ -605,9 +633,11 @@ extensions:
       - ["System.Data", "DataViewManager", "get_IsSorted", "()", "summary", "df-generated"]
       - ["System.Data", "DataViewManager", "get_IsSynchronized", "()", "summary", "df-generated"]
       - ["System.Data", "DataViewManager", "get_SortDirection", "()", "summary", "df-generated"]
+      - ["System.Data", "DataViewManager", "get_SortProperty", "()", "summary", "df-generated"]
       - ["System.Data", "DataViewManager", "get_SupportsChangeNotification", "()", "summary", "df-generated"]
       - ["System.Data", "DataViewManager", "get_SupportsSearching", "()", "summary", "df-generated"]
       - ["System.Data", "DataViewManager", "get_SupportsSorting", "()", "summary", "df-generated"]
+      - ["System.Data", "DataViewManager", "remove_ListChanged", "(System.ComponentModel.ListChangedEventHandler)", "summary", "df-generated"]
       - ["System.Data", "DataViewSettingCollection", "get_Count", "()", "summary", "df-generated"]
       - ["System.Data", "DataViewSettingCollection", "get_IsReadOnly", "()", "summary", "df-generated"]
       - ["System.Data", "DataViewSettingCollection", "get_IsSynchronized", "()", "summary", "df-generated"]
@@ -630,6 +660,7 @@ extensions:
       - ["System.Data", "IDataAdapter", "Fill", "(System.Data.DataSet)", "summary", "df-generated"]
       - ["System.Data", "IDataAdapter", "FillSchema", "(System.Data.DataSet,System.Data.SchemaType)", "summary", "df-generated"]
       - ["System.Data", "IDataAdapter", "Update", "(System.Data.DataSet)", "summary", "df-generated"]
+      - ["System.Data", "IDataAdapter", "get_TableMappings", "()", "summary", "df-generated"]
       - ["System.Data", "IDataParameter", "get_IsNullable", "()", "summary", "df-generated"]
       - ["System.Data", "IDataParameterCollection", "Contains", "(System.String)", "summary", "df-generated"]
       - ["System.Data", "IDataParameterCollection", "IndexOf", "(System.String)", "summary", "df-generated"]
@@ -662,15 +693,21 @@ extensions:
       - ["System.Data", "IDbCommand", "ExecuteNonQuery", "()", "summary", "df-generated"]
       - ["System.Data", "IDbCommand", "ExecuteReader", "(System.Data.CommandBehavior)", "summary", "df-generated"]
       - ["System.Data", "IDbCommand", "Prepare", "()", "summary", "df-generated"]
+      - ["System.Data", "IDbCommand", "get_Parameters", "()", "summary", "df-generated"]
+      - ["System.Data", "IDbConnection", "BeginTransaction", "()", "summary", "df-generated"]
+      - ["System.Data", "IDbConnection", "BeginTransaction", "(System.Data.IsolationLevel)", "summary", "df-generated"]
       - ["System.Data", "IDbConnection", "ChangeDatabase", "(System.String)", "summary", "df-generated"]
       - ["System.Data", "IDbConnection", "Close", "()", "summary", "df-generated"]
+      - ["System.Data", "IDbConnection", "CreateCommand", "()", "summary", "df-generated"]
       - ["System.Data", "IDbConnection", "Open", "()", "summary", "df-generated"]
       - ["System.Data", "IDbConnection", "get_ConnectionTimeout", "()", "summary", "df-generated"]
       - ["System.Data", "IDbConnection", "get_Database", "()", "summary", "df-generated"]
       - ["System.Data", "IDbConnection", "get_State", "()", "summary", "df-generated"]
       - ["System.Data", "IDbTransaction", "Commit", "()", "summary", "df-generated"]
       - ["System.Data", "IDbTransaction", "Rollback", "()", "summary", "df-generated"]
+      - ["System.Data", "IDbTransaction", "get_Connection", "()", "summary", "df-generated"]
       - ["System.Data", "IDbTransaction", "get_IsolationLevel", "()", "summary", "df-generated"]
+      - ["System.Data", "ITableMapping", "get_ColumnMappings", "()", "summary", "df-generated"]
       - ["System.Data", "ITableMappingCollection", "Contains", "(System.String)", "summary", "df-generated"]
       - ["System.Data", "ITableMappingCollection", "IndexOf", "(System.String)", "summary", "df-generated"]
       - ["System.Data", "ITableMappingCollection", "RemoveAt", "(System.String)", "summary", "df-generated"]
diff --git a/csharp/ql/lib/ext/generated/System.Diagnostics.Contracts.model.yml b/csharp/ql/lib/ext/generated/System.Diagnostics.Contracts.model.yml
index 56a60fcc475..8a7eba3c5bb 100644
--- a/csharp/ql/lib/ext/generated/System.Diagnostics.Contracts.model.yml
+++ b/csharp/ql/lib/ext/generated/System.Diagnostics.Contracts.model.yml
@@ -4,27 +4,29 @@ extensions:
       pack: codeql/csharp-all
       extensible: summaryModel
     data:
-      - ["System.Diagnostics.Contracts", "ContractException", False, "ContractException", "(System.Diagnostics.Contracts.ContractFailureKind,System.String,System.String,System.String,System.Exception)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Diagnostics.Contracts", "ContractException", False, "ContractException", "(System.Diagnostics.Contracts.ContractFailureKind,System.String,System.String,System.String,System.Exception)", "", "Argument[3]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Diagnostics.Contracts", "ContractException", False, "get_Condition", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Diagnostics.Contracts", "ContractException", False, "get_Failure", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Diagnostics.Contracts", "ContractException", False, "get_UserMessage", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Diagnostics.Contracts", "ContractFailedEventArgs", False, "ContractFailedEventArgs", "(System.Diagnostics.Contracts.ContractFailureKind,System.String,System.String,System.Exception)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Diagnostics.Contracts", "ContractFailedEventArgs", False, "ContractFailedEventArgs", "(System.Diagnostics.Contracts.ContractFailureKind,System.String,System.String,System.Exception)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Diagnostics.Contracts", "ContractFailedEventArgs", False, "ContractFailedEventArgs", "(System.Diagnostics.Contracts.ContractFailureKind,System.String,System.String,System.Exception)", "", "Argument[3]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Diagnostics.Contracts", "ContractFailedEventArgs", False, "get_Condition", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Diagnostics.Contracts", "ContractFailedEventArgs", False, "get_Message", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Diagnostics.Contracts", "ContractFailedEventArgs", False, "get_OriginalException", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Diagnostics.Contracts", "ContractOptionAttribute", False, "ContractOptionAttribute", "(System.String,System.String,System.Boolean)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Diagnostics.Contracts", "ContractOptionAttribute", False, "ContractOptionAttribute", "(System.String,System.String,System.Boolean)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Diagnostics.Contracts", "ContractOptionAttribute", False, "ContractOptionAttribute", "(System.String,System.String,System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Diagnostics.Contracts", "ContractOptionAttribute", False, "ContractOptionAttribute", "(System.String,System.String,System.String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Diagnostics.Contracts", "ContractOptionAttribute", False, "ContractOptionAttribute", "(System.String,System.String,System.String)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Diagnostics.Contracts", "ContractOptionAttribute", False, "get_Category", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Diagnostics.Contracts", "ContractOptionAttribute", False, "get_Setting", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Diagnostics.Contracts", "ContractOptionAttribute", False, "get_Value", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Diagnostics.Contracts", "ContractPublicPropertyNameAttribute", False, "ContractPublicPropertyNameAttribute", "(System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Diagnostics.Contracts", "ContractPublicPropertyNameAttribute", False, "get_Name", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Diagnostics.Contracts", "Contract", False, "Exists<T>", "(System.Collections.Generic.IEnumerable<T>,System.Predicate<T>)", "", "Argument[0].Element", "Argument[1].Parameter[0]", "value", "dfc-generated"]
+      - ["System.Diagnostics.Contracts", "Contract", False, "ForAll<T>", "(System.Collections.Generic.IEnumerable<T>,System.Predicate<T>)", "", "Argument[0].Element", "Argument[1].Parameter[0]", "value", "dfc-generated"]
+      - ["System.Diagnostics.Contracts", "ContractException", False, "ContractException", "(System.Diagnostics.Contracts.ContractFailureKind,System.String,System.String,System.String,System.Exception)", "", "Argument[2]", "Argument[this].SyntheticField[System.Diagnostics.Contracts.ContractException._userMessage]", "value", "dfc-generated"]
+      - ["System.Diagnostics.Contracts", "ContractException", False, "ContractException", "(System.Diagnostics.Contracts.ContractFailureKind,System.String,System.String,System.String,System.Exception)", "", "Argument[3]", "Argument[this].SyntheticField[System.Diagnostics.Contracts.ContractException._condition]", "value", "dfc-generated"]
+      - ["System.Diagnostics.Contracts", "ContractException", False, "get_Condition", "()", "", "Argument[this].SyntheticField[System.Diagnostics.Contracts.ContractException._condition]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Diagnostics.Contracts", "ContractException", False, "get_Failure", "()", "", "Argument[this].Property[System.Exception.Message]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Diagnostics.Contracts", "ContractException", False, "get_UserMessage", "()", "", "Argument[this].SyntheticField[System.Diagnostics.Contracts.ContractException._userMessage]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Diagnostics.Contracts", "ContractFailedEventArgs", False, "ContractFailedEventArgs", "(System.Diagnostics.Contracts.ContractFailureKind,System.String,System.String,System.Exception)", "", "Argument[1]", "Argument[this].SyntheticField[System.Diagnostics.Contracts.ContractFailedEventArgs._message]", "value", "dfc-generated"]
+      - ["System.Diagnostics.Contracts", "ContractFailedEventArgs", False, "ContractFailedEventArgs", "(System.Diagnostics.Contracts.ContractFailureKind,System.String,System.String,System.Exception)", "", "Argument[2]", "Argument[this].SyntheticField[System.Diagnostics.Contracts.ContractFailedEventArgs._condition]", "value", "dfc-generated"]
+      - ["System.Diagnostics.Contracts", "ContractFailedEventArgs", False, "ContractFailedEventArgs", "(System.Diagnostics.Contracts.ContractFailureKind,System.String,System.String,System.Exception)", "", "Argument[3]", "Argument[this].SyntheticField[System.Diagnostics.Contracts.ContractFailedEventArgs._originalException]", "value", "dfc-generated"]
+      - ["System.Diagnostics.Contracts", "ContractFailedEventArgs", False, "get_Condition", "()", "", "Argument[this].SyntheticField[System.Diagnostics.Contracts.ContractFailedEventArgs._condition]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Diagnostics.Contracts", "ContractFailedEventArgs", False, "get_Message", "()", "", "Argument[this].SyntheticField[System.Diagnostics.Contracts.ContractFailedEventArgs._message]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Diagnostics.Contracts", "ContractFailedEventArgs", False, "get_OriginalException", "()", "", "Argument[this].SyntheticField[System.Diagnostics.Contracts.ContractFailedEventArgs._originalException]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Diagnostics.Contracts", "ContractOptionAttribute", False, "ContractOptionAttribute", "(System.String,System.String,System.Boolean)", "", "Argument[0]", "Argument[this].SyntheticField[System.Diagnostics.Contracts.ContractOptionAttribute._category]", "value", "dfc-generated"]
+      - ["System.Diagnostics.Contracts", "ContractOptionAttribute", False, "ContractOptionAttribute", "(System.String,System.String,System.Boolean)", "", "Argument[1]", "Argument[this].SyntheticField[System.Diagnostics.Contracts.ContractOptionAttribute._setting]", "value", "dfc-generated"]
+      - ["System.Diagnostics.Contracts", "ContractOptionAttribute", False, "ContractOptionAttribute", "(System.String,System.String,System.String)", "", "Argument[0]", "Argument[this].SyntheticField[System.Diagnostics.Contracts.ContractOptionAttribute._category]", "value", "dfc-generated"]
+      - ["System.Diagnostics.Contracts", "ContractOptionAttribute", False, "ContractOptionAttribute", "(System.String,System.String,System.String)", "", "Argument[1]", "Argument[this].SyntheticField[System.Diagnostics.Contracts.ContractOptionAttribute._setting]", "value", "dfc-generated"]
+      - ["System.Diagnostics.Contracts", "ContractOptionAttribute", False, "ContractOptionAttribute", "(System.String,System.String,System.String)", "", "Argument[2]", "Argument[this].SyntheticField[System.Diagnostics.Contracts.ContractOptionAttribute._value]", "value", "dfc-generated"]
+      - ["System.Diagnostics.Contracts", "ContractOptionAttribute", False, "get_Category", "()", "", "Argument[this].SyntheticField[System.Diagnostics.Contracts.ContractOptionAttribute._category]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Diagnostics.Contracts", "ContractOptionAttribute", False, "get_Setting", "()", "", "Argument[this].SyntheticField[System.Diagnostics.Contracts.ContractOptionAttribute._setting]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Diagnostics.Contracts", "ContractOptionAttribute", False, "get_Value", "()", "", "Argument[this].SyntheticField[System.Diagnostics.Contracts.ContractOptionAttribute._value]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Diagnostics.Contracts", "ContractPublicPropertyNameAttribute", False, "ContractPublicPropertyNameAttribute", "(System.String)", "", "Argument[0]", "Argument[this].SyntheticField[System.Diagnostics.Contracts.ContractPublicPropertyNameAttribute._publicName]", "value", "dfc-generated"]
+      - ["System.Diagnostics.Contracts", "ContractPublicPropertyNameAttribute", False, "get_Name", "()", "", "Argument[this].SyntheticField[System.Diagnostics.Contracts.ContractPublicPropertyNameAttribute._publicName]", "ReturnValue", "value", "dfc-generated"]
   - addsTo:
       pack: codeql/csharp-all
       extensible: neutralModel
@@ -38,6 +40,8 @@ extensions:
       - ["System.Diagnostics.Contracts", "Contract", "Ensures", "(System.Boolean,System.String)", "summary", "df-generated"]
       - ["System.Diagnostics.Contracts", "Contract", "EnsuresOnThrow<TException>", "(System.Boolean)", "summary", "df-generated"]
       - ["System.Diagnostics.Contracts", "Contract", "EnsuresOnThrow<TException>", "(System.Boolean,System.String)", "summary", "df-generated"]
+      - ["System.Diagnostics.Contracts", "Contract", "Exists", "(System.Int32,System.Int32,System.Predicate<System.Int32>)", "summary", "df-generated"]
+      - ["System.Diagnostics.Contracts", "Contract", "ForAll", "(System.Int32,System.Int32,System.Predicate<System.Int32>)", "summary", "df-generated"]
       - ["System.Diagnostics.Contracts", "Contract", "Invariant", "(System.Boolean)", "summary", "df-generated"]
       - ["System.Diagnostics.Contracts", "Contract", "Invariant", "(System.Boolean,System.String)", "summary", "df-generated"]
       - ["System.Diagnostics.Contracts", "Contract", "OldValue<T>", "(T)", "summary", "df-generated"]
@@ -47,6 +51,8 @@ extensions:
       - ["System.Diagnostics.Contracts", "Contract", "Requires<TException>", "(System.Boolean,System.String)", "summary", "df-generated"]
       - ["System.Diagnostics.Contracts", "Contract", "Result<T>", "()", "summary", "df-generated"]
       - ["System.Diagnostics.Contracts", "Contract", "ValueAtReturn<T>", "(T)", "summary", "df-generated"]
+      - ["System.Diagnostics.Contracts", "Contract", "add_ContractFailed", "(System.EventHandler<System.Diagnostics.Contracts.ContractFailedEventArgs>)", "summary", "df-generated"]
+      - ["System.Diagnostics.Contracts", "Contract", "remove_ContractFailed", "(System.EventHandler<System.Diagnostics.Contracts.ContractFailedEventArgs>)", "summary", "df-generated"]
       - ["System.Diagnostics.Contracts", "ContractClassAttribute", "ContractClassAttribute", "(System.Type)", "summary", "df-generated"]
       - ["System.Diagnostics.Contracts", "ContractClassAttribute", "get_TypeContainingContracts", "()", "summary", "df-generated"]
       - ["System.Diagnostics.Contracts", "ContractClassForAttribute", "ContractClassForAttribute", "(System.Type)", "summary", "df-generated"]
diff --git a/csharp/ql/lib/ext/generated/System.Diagnostics.Eventing.Reader.model.yml b/csharp/ql/lib/ext/generated/System.Diagnostics.Eventing.Reader.model.yml
index a4f8754109c..2344d50665c 100644
--- a/csharp/ql/lib/ext/generated/System.Diagnostics.Eventing.Reader.model.yml
+++ b/csharp/ql/lib/ext/generated/System.Diagnostics.Eventing.Reader.model.yml
@@ -127,6 +127,8 @@ extensions:
       - ["System.Diagnostics.Eventing.Reader", "EventLogWatcher", "EventLogWatcher", "(System.Diagnostics.Eventing.Reader.EventLogQuery,System.Diagnostics.Eventing.Reader.EventBookmark)", "summary", "df-generated"]
       - ["System.Diagnostics.Eventing.Reader", "EventLogWatcher", "EventLogWatcher", "(System.Diagnostics.Eventing.Reader.EventLogQuery,System.Diagnostics.Eventing.Reader.EventBookmark,System.Boolean)", "summary", "df-generated"]
       - ["System.Diagnostics.Eventing.Reader", "EventLogWatcher", "EventLogWatcher", "(System.String)", "summary", "df-generated"]
+      - ["System.Diagnostics.Eventing.Reader", "EventLogWatcher", "add_EventRecordWritten", "(System.EventHandler<System.Diagnostics.Eventing.Reader.EventRecordWrittenEventArgs>)", "summary", "df-generated"]
+      - ["System.Diagnostics.Eventing.Reader", "EventLogWatcher", "remove_EventRecordWritten", "(System.EventHandler<System.Diagnostics.Eventing.Reader.EventRecordWrittenEventArgs>)", "summary", "df-generated"]
       - ["System.Diagnostics.Eventing.Reader", "EventMetadata", "get_Description", "()", "summary", "df-generated"]
       - ["System.Diagnostics.Eventing.Reader", "EventMetadata", "get_Id", "()", "summary", "df-generated"]
       - ["System.Diagnostics.Eventing.Reader", "EventMetadata", "get_Keywords", "()", "summary", "df-generated"]
diff --git a/csharp/ql/lib/ext/generated/System.Diagnostics.Metrics.model.yml b/csharp/ql/lib/ext/generated/System.Diagnostics.Metrics.model.yml
index 6180df37f47..e59fe98d29d 100644
--- a/csharp/ql/lib/ext/generated/System.Diagnostics.Metrics.model.yml
+++ b/csharp/ql/lib/ext/generated/System.Diagnostics.Metrics.model.yml
@@ -4,11 +4,15 @@ extensions:
       pack: codeql/csharp-all
       extensible: summaryModel
     data:
-      - ["System.Diagnostics.Metrics", "Instrument", False, "Instrument", "(System.Diagnostics.Metrics.Meter,System.String,System.String,System.String,System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<System.String,System.Object>>)", "", "Argument[4].Element", "Argument[this]", "taint", "df-generated"]
       - ["System.Diagnostics.Metrics", "Measurement<T>", False, "Measurement", "(T,System.Collections.Generic.KeyValuePair<System.String,System.Object>[])", "", "Argument[1].Element", "Argument[this]", "taint", "df-generated"]
       - ["System.Diagnostics.Metrics", "Measurement<T>", False, "Measurement", "(T,System.ReadOnlySpan<System.Collections.Generic.KeyValuePair<System.String,System.Object>>)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Diagnostics.Metrics", "Measurement<T>", False, "get_Tags", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Diagnostics.Metrics", "MeterListener", False, "DisableMeasurementEvents", "(System.Diagnostics.Metrics.Instrument)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["System.Diagnostics.Metrics", "MeterListener", False, "EnableMeasurementEvents", "(System.Diagnostics.Metrics.Instrument,System.Object)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["System.Diagnostics.Metrics", "MeterListener", False, "EnableMeasurementEvents", "(System.Diagnostics.Metrics.Instrument,System.Object)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
       - ["System.Diagnostics.Metrics", "MeterOptions", False, "MeterOptions", "(System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["System.Diagnostics.Metrics", "ObservableCounter<T>", False, "Observe", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Diagnostics.Metrics", "ObservableGauge<T>", False, "Observe", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Diagnostics.Metrics", "ObservableUpDownCounter<T>", False, "Observe", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
   - addsTo:
       pack: codeql/csharp-all
       extensible: neutralModel
@@ -29,6 +33,7 @@ extensions:
       - ["System.Diagnostics.Metrics", "Histogram<T>", "Record", "(T,System.ReadOnlySpan<System.Collections.Generic.KeyValuePair<System.String,System.Object>>)", "summary", "df-generated"]
       - ["System.Diagnostics.Metrics", "IMeterFactory", "Create", "(System.Diagnostics.Metrics.MeterOptions)", "summary", "df-generated"]
       - ["System.Diagnostics.Metrics", "Instrument", "Instrument", "(System.Diagnostics.Metrics.Meter,System.String,System.String,System.String)", "summary", "df-generated"]
+      - ["System.Diagnostics.Metrics", "Instrument", "Instrument", "(System.Diagnostics.Metrics.Meter,System.String,System.String,System.String,System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<System.String,System.Object>>)", "summary", "df-generated"]
       - ["System.Diagnostics.Metrics", "Instrument", "Publish", "()", "summary", "df-generated"]
       - ["System.Diagnostics.Metrics", "Instrument", "get_Description", "()", "summary", "df-generated"]
       - ["System.Diagnostics.Metrics", "Instrument", "get_Enabled", "()", "summary", "df-generated"]
@@ -47,11 +52,30 @@ extensions:
       - ["System.Diagnostics.Metrics", "Instrument<T>", "RecordMeasurement", "(T,System.ReadOnlySpan<System.Collections.Generic.KeyValuePair<System.String,System.Object>>)", "summary", "df-generated"]
       - ["System.Diagnostics.Metrics", "Measurement<T>", "Measurement", "(T)", "summary", "df-generated"]
       - ["System.Diagnostics.Metrics", "Measurement<T>", "Measurement", "(T,System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<System.String,System.Object>>)", "summary", "df-generated"]
+      - ["System.Diagnostics.Metrics", "Measurement<T>", "get_Tags", "()", "summary", "df-generated"]
       - ["System.Diagnostics.Metrics", "Measurement<T>", "get_Value", "()", "summary", "df-generated"]
       - ["System.Diagnostics.Metrics", "Meter", "CreateCounter<T>", "(System.String,System.String,System.String)", "summary", "df-generated"]
       - ["System.Diagnostics.Metrics", "Meter", "CreateCounter<T>", "(System.String,System.String,System.String,System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<System.String,System.Object>>)", "summary", "df-generated"]
       - ["System.Diagnostics.Metrics", "Meter", "CreateHistogram<T>", "(System.String,System.String,System.String)", "summary", "df-generated"]
       - ["System.Diagnostics.Metrics", "Meter", "CreateHistogram<T>", "(System.String,System.String,System.String,System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<System.String,System.Object>>)", "summary", "df-generated"]
+      - ["System.Diagnostics.Metrics", "Meter", "CreateObservableCounter<T>", "(System.String,System.Func<System.Collections.Generic.IEnumerable<System.Diagnostics.Metrics.Measurement<T>>>,System.String,System.String)", "summary", "df-generated"]
+      - ["System.Diagnostics.Metrics", "Meter", "CreateObservableCounter<T>", "(System.String,System.Func<System.Collections.Generic.IEnumerable<System.Diagnostics.Metrics.Measurement<T>>>,System.String,System.String,System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<System.String,System.Object>>)", "summary", "df-generated"]
+      - ["System.Diagnostics.Metrics", "Meter", "CreateObservableCounter<T>", "(System.String,System.Func<System.Diagnostics.Metrics.Measurement<T>>,System.String,System.String)", "summary", "df-generated"]
+      - ["System.Diagnostics.Metrics", "Meter", "CreateObservableCounter<T>", "(System.String,System.Func<System.Diagnostics.Metrics.Measurement<T>>,System.String,System.String,System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<System.String,System.Object>>)", "summary", "df-generated"]
+      - ["System.Diagnostics.Metrics", "Meter", "CreateObservableCounter<T>", "(System.String,System.Func<T>,System.String,System.String)", "summary", "df-generated"]
+      - ["System.Diagnostics.Metrics", "Meter", "CreateObservableCounter<T>", "(System.String,System.Func<T>,System.String,System.String,System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<System.String,System.Object>>)", "summary", "df-generated"]
+      - ["System.Diagnostics.Metrics", "Meter", "CreateObservableGauge<T>", "(System.String,System.Func<System.Collections.Generic.IEnumerable<System.Diagnostics.Metrics.Measurement<T>>>,System.String,System.String)", "summary", "df-generated"]
+      - ["System.Diagnostics.Metrics", "Meter", "CreateObservableGauge<T>", "(System.String,System.Func<System.Collections.Generic.IEnumerable<System.Diagnostics.Metrics.Measurement<T>>>,System.String,System.String,System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<System.String,System.Object>>)", "summary", "df-generated"]
+      - ["System.Diagnostics.Metrics", "Meter", "CreateObservableGauge<T>", "(System.String,System.Func<System.Diagnostics.Metrics.Measurement<T>>,System.String,System.String)", "summary", "df-generated"]
+      - ["System.Diagnostics.Metrics", "Meter", "CreateObservableGauge<T>", "(System.String,System.Func<System.Diagnostics.Metrics.Measurement<T>>,System.String,System.String,System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<System.String,System.Object>>)", "summary", "df-generated"]
+      - ["System.Diagnostics.Metrics", "Meter", "CreateObservableGauge<T>", "(System.String,System.Func<T>,System.String,System.String)", "summary", "df-generated"]
+      - ["System.Diagnostics.Metrics", "Meter", "CreateObservableGauge<T>", "(System.String,System.Func<T>,System.String,System.String,System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<System.String,System.Object>>)", "summary", "df-generated"]
+      - ["System.Diagnostics.Metrics", "Meter", "CreateObservableUpDownCounter<T>", "(System.String,System.Func<System.Collections.Generic.IEnumerable<System.Diagnostics.Metrics.Measurement<T>>>,System.String,System.String)", "summary", "df-generated"]
+      - ["System.Diagnostics.Metrics", "Meter", "CreateObservableUpDownCounter<T>", "(System.String,System.Func<System.Collections.Generic.IEnumerable<System.Diagnostics.Metrics.Measurement<T>>>,System.String,System.String,System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<System.String,System.Object>>)", "summary", "df-generated"]
+      - ["System.Diagnostics.Metrics", "Meter", "CreateObservableUpDownCounter<T>", "(System.String,System.Func<System.Diagnostics.Metrics.Measurement<T>>,System.String,System.String)", "summary", "df-generated"]
+      - ["System.Diagnostics.Metrics", "Meter", "CreateObservableUpDownCounter<T>", "(System.String,System.Func<System.Diagnostics.Metrics.Measurement<T>>,System.String,System.String,System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<System.String,System.Object>>)", "summary", "df-generated"]
+      - ["System.Diagnostics.Metrics", "Meter", "CreateObservableUpDownCounter<T>", "(System.String,System.Func<T>,System.String,System.String)", "summary", "df-generated"]
+      - ["System.Diagnostics.Metrics", "Meter", "CreateObservableUpDownCounter<T>", "(System.String,System.Func<T>,System.String,System.String,System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<System.String,System.Object>>)", "summary", "df-generated"]
       - ["System.Diagnostics.Metrics", "Meter", "CreateUpDownCounter<T>", "(System.String,System.String,System.String)", "summary", "df-generated"]
       - ["System.Diagnostics.Metrics", "Meter", "CreateUpDownCounter<T>", "(System.String,System.String,System.String,System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<System.String,System.Object>>)", "summary", "df-generated"]
       - ["System.Diagnostics.Metrics", "Meter", "Dispose", "()", "summary", "df-generated"]
@@ -61,18 +85,14 @@ extensions:
       - ["System.Diagnostics.Metrics", "Meter", "Meter", "(System.String,System.String)", "summary", "df-generated"]
       - ["System.Diagnostics.Metrics", "Meter", "Meter", "(System.String,System.String,System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<System.String,System.Object>>,System.Object)", "summary", "df-generated"]
       - ["System.Diagnostics.Metrics", "MeterFactoryExtensions", "Create", "(System.Diagnostics.Metrics.IMeterFactory,System.String,System.String,System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<System.String,System.Object>>)", "summary", "df-generated"]
-      - ["System.Diagnostics.Metrics", "MeterListener", "DisableMeasurementEvents", "(System.Diagnostics.Metrics.Instrument)", "summary", "df-generated"]
       - ["System.Diagnostics.Metrics", "MeterListener", "Dispose", "()", "summary", "df-generated"]
-      - ["System.Diagnostics.Metrics", "MeterListener", "EnableMeasurementEvents", "(System.Diagnostics.Metrics.Instrument,System.Object)", "summary", "df-generated"]
       - ["System.Diagnostics.Metrics", "MeterListener", "RecordObservableInstruments", "()", "summary", "df-generated"]
+      - ["System.Diagnostics.Metrics", "MeterListener", "SetMeasurementEventCallback<T>", "(System.Diagnostics.Metrics.MeasurementCallback<T>)", "summary", "df-generated"]
       - ["System.Diagnostics.Metrics", "MeterListener", "Start", "()", "summary", "df-generated"]
-      - ["System.Diagnostics.Metrics", "ObservableCounter<T>", "Observe", "()", "summary", "df-generated"]
-      - ["System.Diagnostics.Metrics", "ObservableGauge<T>", "Observe", "()", "summary", "df-generated"]
       - ["System.Diagnostics.Metrics", "ObservableInstrument<T>", "ObservableInstrument", "(System.Diagnostics.Metrics.Meter,System.String,System.String,System.String)", "summary", "df-generated"]
       - ["System.Diagnostics.Metrics", "ObservableInstrument<T>", "ObservableInstrument", "(System.Diagnostics.Metrics.Meter,System.String,System.String,System.String,System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<System.String,System.Object>>)", "summary", "df-generated"]
       - ["System.Diagnostics.Metrics", "ObservableInstrument<T>", "Observe", "()", "summary", "df-generated"]
       - ["System.Diagnostics.Metrics", "ObservableInstrument<T>", "get_IsObservable", "()", "summary", "df-generated"]
-      - ["System.Diagnostics.Metrics", "ObservableUpDownCounter<T>", "Observe", "()", "summary", "df-generated"]
       - ["System.Diagnostics.Metrics", "UpDownCounter<T>", "Add", "(T)", "summary", "df-generated"]
       - ["System.Diagnostics.Metrics", "UpDownCounter<T>", "Add", "(T,System.Collections.Generic.KeyValuePair<System.String,System.Object>)", "summary", "df-generated"]
       - ["System.Diagnostics.Metrics", "UpDownCounter<T>", "Add", "(T,System.Collections.Generic.KeyValuePair<System.String,System.Object>,System.Collections.Generic.KeyValuePair<System.String,System.Object>)", "summary", "df-generated"]
diff --git a/csharp/ql/lib/ext/generated/System.Diagnostics.Tracing.model.yml b/csharp/ql/lib/ext/generated/System.Diagnostics.Tracing.model.yml
index 1777f2b1f82..951ceef50d5 100644
--- a/csharp/ql/lib/ext/generated/System.Diagnostics.Tracing.model.yml
+++ b/csharp/ql/lib/ext/generated/System.Diagnostics.Tracing.model.yml
@@ -4,23 +4,31 @@ extensions:
       pack: codeql/csharp-all
       extensible: summaryModel
     data:
-      - ["System.Diagnostics.Tracing", "EventCounter", False, "ToString", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Diagnostics.Tracing", "EventCounter", False, "ToString", "()", "", "Argument[this].Property[System.Diagnostics.Tracing.DiagnosticCounter.Name]", "ReturnValue", "taint", "dfc-generated"]
       - ["System.Diagnostics.Tracing", "EventListener", False, "DisableEvents", "(System.Diagnostics.Tracing.EventSource)", "", "Argument[this]", "Argument[0]", "taint", "df-generated"]
       - ["System.Diagnostics.Tracing", "EventListener", False, "EnableEvents", "(System.Diagnostics.Tracing.EventSource,System.Diagnostics.Tracing.EventLevel)", "", "Argument[this]", "Argument[0]", "taint", "df-generated"]
       - ["System.Diagnostics.Tracing", "EventListener", False, "EnableEvents", "(System.Diagnostics.Tracing.EventSource,System.Diagnostics.Tracing.EventLevel,System.Diagnostics.Tracing.EventKeywords)", "", "Argument[this]", "Argument[0]", "taint", "df-generated"]
       - ["System.Diagnostics.Tracing", "EventListener", False, "EnableEvents", "(System.Diagnostics.Tracing.EventSource,System.Diagnostics.Tracing.EventLevel,System.Diagnostics.Tracing.EventKeywords,System.Collections.Generic.IDictionary<System.String,System.String>)", "", "Argument[this]", "Argument[0]", "taint", "df-generated"]
-      - ["System.Diagnostics.Tracing", "EventSource", False, "EventSource", "(System.Diagnostics.Tracing.EventSourceSettings,System.String[])", "", "Argument[1].Element", "Argument[this]", "taint", "df-generated"]
+      - ["System.Diagnostics.Tracing", "EventListener", False, "add_EventSourceCreated", "(System.EventHandler<System.Diagnostics.Tracing.EventSourceCreatedEventArgs>)", "", "Argument[this]", "Argument[0].Parameter[0]", "value", "dfc-generated"]
+      - ["System.Diagnostics.Tracing", "EventSource", False, "EventSource", "(System.Diagnostics.Tracing.EventSourceSettings,System.String[])", "", "Argument[1]", "Argument[this].SyntheticField[System.Diagnostics.Tracing.EventSource.m_traits]", "value", "dfc-generated"]
       - ["System.Diagnostics.Tracing", "EventSource", False, "GenerateManifest", "(System.Type,System.String)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
       - ["System.Diagnostics.Tracing", "EventSource", False, "GenerateManifest", "(System.Type,System.String,System.Diagnostics.Tracing.EventManifestOptions)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Diagnostics.Tracing", "EventSource", False, "GetTrait", "(System.String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Diagnostics.Tracing", "EventSource", False, "GetTrait", "(System.String)", "", "Argument[this].SyntheticField[System.Diagnostics.Tracing.EventSource.m_traits].Element", "ReturnValue", "value", "dfc-generated"]
       - ["System.Diagnostics.Tracing", "EventSource", False, "ToString", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Diagnostics.Tracing", "EventSource", False, "Write<T>", "(System.String,System.Diagnostics.Tracing.EventSourceOptions,System.Guid,System.Guid,T)", "", "Argument[1]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Diagnostics.Tracing", "EventSource", False, "Write<T>", "(System.String,System.Diagnostics.Tracing.EventSourceOptions,System.Guid,System.Guid,T)", "", "Argument[2]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Diagnostics.Tracing", "EventSource", False, "Write<T>", "(System.String,System.Diagnostics.Tracing.EventSourceOptions,System.Guid,System.Guid,T)", "", "Argument[3]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Diagnostics.Tracing", "EventSource", False, "Write<T>", "(System.String,System.Diagnostics.Tracing.EventSourceOptions,System.Guid,System.Guid,T)", "", "Argument[4]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Diagnostics.Tracing", "EventSource", False, "Write<T>", "(System.String,System.Diagnostics.Tracing.EventSourceOptions,T)", "", "Argument[1]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Diagnostics.Tracing", "EventSource", False, "Write<T>", "(System.String,System.Diagnostics.Tracing.EventSourceOptions,T)", "", "Argument[2]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Diagnostics.Tracing", "EventSource", False, "add_EventCommandExecuted", "(System.EventHandler<System.Diagnostics.Tracing.EventCommandEventArgs>)", "", "Argument[this]", "Argument[0].Parameter[0]", "value", "dfc-generated"]
       - ["System.Diagnostics.Tracing", "EventSource", False, "get_ConstructionException", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Diagnostics.Tracing", "EventSource", False, "get_Guid", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Diagnostics.Tracing", "EventSource", False, "get_Name", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Diagnostics.Tracing", "EventWrittenEventArgs", False, "get_ActivityId", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Diagnostics.Tracing", "IncrementingEventCounter", False, "ToString", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Diagnostics.Tracing", "IncrementingPollingCounter", False, "ToString", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Diagnostics.Tracing", "PollingCounter", False, "ToString", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Diagnostics.Tracing", "IncrementingEventCounter", False, "ToString", "()", "", "Argument[this].Property[System.Diagnostics.Tracing.DiagnosticCounter.Name]", "ReturnValue", "taint", "dfc-generated"]
+      - ["System.Diagnostics.Tracing", "IncrementingPollingCounter", False, "ToString", "()", "", "Argument[this].Property[System.Diagnostics.Tracing.DiagnosticCounter.Name]", "ReturnValue", "taint", "dfc-generated"]
+      - ["System.Diagnostics.Tracing", "PollingCounter", False, "ToString", "()", "", "Argument[this].Property[System.Diagnostics.Tracing.DiagnosticCounter.Name]", "ReturnValue", "taint", "dfc-generated"]
   - addsTo:
       pack: codeql/csharp-all
       extensible: neutralModel
@@ -39,6 +47,9 @@ extensions:
       - ["System.Diagnostics.Tracing", "EventListener", "EventSourceIndex", "(System.Diagnostics.Tracing.EventSource)", "summary", "df-generated"]
       - ["System.Diagnostics.Tracing", "EventListener", "OnEventSourceCreated", "(System.Diagnostics.Tracing.EventSource)", "summary", "df-generated"]
       - ["System.Diagnostics.Tracing", "EventListener", "OnEventWritten", "(System.Diagnostics.Tracing.EventWrittenEventArgs)", "summary", "df-generated"]
+      - ["System.Diagnostics.Tracing", "EventListener", "add_EventWritten", "(System.EventHandler<System.Diagnostics.Tracing.EventWrittenEventArgs>)", "summary", "df-generated"]
+      - ["System.Diagnostics.Tracing", "EventListener", "remove_EventSourceCreated", "(System.EventHandler<System.Diagnostics.Tracing.EventSourceCreatedEventArgs>)", "summary", "df-generated"]
+      - ["System.Diagnostics.Tracing", "EventListener", "remove_EventWritten", "(System.EventHandler<System.Diagnostics.Tracing.EventWrittenEventArgs>)", "summary", "df-generated"]
       - ["System.Diagnostics.Tracing", "EventSource", "Dispose", "()", "summary", "df-generated"]
       - ["System.Diagnostics.Tracing", "EventSource", "Dispose", "(System.Boolean)", "summary", "df-generated"]
       - ["System.Diagnostics.Tracing", "EventSource", "EventSource", "(System.Boolean)", "summary", "df-generated"]
@@ -58,7 +69,6 @@ extensions:
       - ["System.Diagnostics.Tracing", "EventSource", "SetCurrentThreadActivityId", "(System.Guid,System.Guid)", "summary", "df-generated"]
       - ["System.Diagnostics.Tracing", "EventSource", "Write", "(System.String)", "summary", "df-generated"]
       - ["System.Diagnostics.Tracing", "EventSource", "Write", "(System.String,System.Diagnostics.Tracing.EventSourceOptions)", "summary", "df-generated"]
-      - ["System.Diagnostics.Tracing", "EventSource", "Write<T>", "(System.String,System.Diagnostics.Tracing.EventSourceOptions,System.Guid,System.Guid,T)", "summary", "df-generated"]
       - ["System.Diagnostics.Tracing", "EventSource", "Write<T>", "(System.String,System.Diagnostics.Tracing.EventSourceOptions,T)", "summary", "df-generated"]
       - ["System.Diagnostics.Tracing", "EventSource", "Write<T>", "(System.String,T)", "summary", "df-generated"]
       - ["System.Diagnostics.Tracing", "EventSource", "WriteEvent", "(System.Int32)", "summary", "df-generated"]
@@ -85,6 +95,7 @@ extensions:
       - ["System.Diagnostics.Tracing", "EventSource", "WriteEventWithRelatedActivityIdCore", "(System.Int32,System.Guid*,System.Int32,System.Diagnostics.Tracing.EventSource+EventData*)", "summary", "df-generated"]
       - ["System.Diagnostics.Tracing", "EventSource", "get_CurrentThreadActivityId", "()", "summary", "df-generated"]
       - ["System.Diagnostics.Tracing", "EventSource", "get_Settings", "()", "summary", "df-generated"]
+      - ["System.Diagnostics.Tracing", "EventSource", "remove_EventCommandExecuted", "(System.EventHandler<System.Diagnostics.Tracing.EventCommandEventArgs>)", "summary", "df-generated"]
       - ["System.Diagnostics.Tracing", "EventSourceException", "EventSourceException", "(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)", "summary", "df-generated"]
       - ["System.Diagnostics.Tracing", "EventSourceException", "EventSourceException", "(System.String)", "summary", "df-generated"]
       - ["System.Diagnostics.Tracing", "EventSourceException", "EventSourceException", "(System.String,System.Exception)", "summary", "df-generated"]
@@ -94,3 +105,5 @@ extensions:
       - ["System.Diagnostics.Tracing", "EventWrittenEventArgs", "get_Version", "()", "summary", "df-generated"]
       - ["System.Diagnostics.Tracing", "IncrementingEventCounter", "Increment", "(System.Double)", "summary", "df-generated"]
       - ["System.Diagnostics.Tracing", "IncrementingEventCounter", "IncrementingEventCounter", "(System.String,System.Diagnostics.Tracing.EventSource)", "summary", "df-generated"]
+      - ["System.Diagnostics.Tracing", "IncrementingPollingCounter", "IncrementingPollingCounter", "(System.String,System.Diagnostics.Tracing.EventSource,System.Func<System.Double>)", "summary", "df-generated"]
+      - ["System.Diagnostics.Tracing", "PollingCounter", "PollingCounter", "(System.String,System.Diagnostics.Tracing.EventSource,System.Func<System.Double>)", "summary", "df-generated"]
diff --git a/csharp/ql/lib/ext/generated/System.Diagnostics.model.yml b/csharp/ql/lib/ext/generated/System.Diagnostics.model.yml
index 825ccc11f5c..88a83e4f3b6 100644
--- a/csharp/ql/lib/ext/generated/System.Diagnostics.model.yml
+++ b/csharp/ql/lib/ext/generated/System.Diagnostics.model.yml
@@ -4,36 +4,36 @@ extensions:
       pack: codeql/csharp-all
       extensible: summaryModel
     data:
-      - ["System.Diagnostics", "Activity+Enumerator<T>", False, "GetEnumerator", "()", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["System.Diagnostics", "Activity", False, "AddBaggage", "(System.String,System.String)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["System.Diagnostics", "Activity", False, "AddEvent", "(System.Diagnostics.ActivityEvent)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["System.Diagnostics", "Activity", False, "AddTag", "(System.String,System.Object)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["System.Diagnostics", "Activity", False, "AddTag", "(System.String,System.String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Diagnostics", "Activity+Enumerator<T>", False, "GetEnumerator", "()", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Diagnostics", "Activity", False, "AddBaggage", "(System.String,System.String)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Diagnostics", "Activity", False, "AddEvent", "(System.Diagnostics.ActivityEvent)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Diagnostics", "Activity", False, "AddTag", "(System.String,System.Object)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Diagnostics", "Activity", False, "AddTag", "(System.String,System.String)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Diagnostics", "Activity", False, "EnumerateEvents", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Diagnostics", "Activity", False, "EnumerateLinks", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Diagnostics", "Activity", False, "EnumerateTagObjects", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Diagnostics", "Activity", False, "GetBaggageItem", "(System.String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Diagnostics", "Activity", False, "SetBaggage", "(System.String,System.String)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["System.Diagnostics", "Activity", False, "SetEndTime", "(System.DateTime)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["System.Diagnostics", "Activity", False, "SetIdFormat", "(System.Diagnostics.ActivityIdFormat)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["System.Diagnostics", "Activity", False, "SetParentId", "(System.Diagnostics.ActivityTraceId,System.Diagnostics.ActivitySpanId,System.Diagnostics.ActivityTraceFlags)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Diagnostics", "Activity", False, "SetParentId", "(System.Diagnostics.ActivityTraceId,System.Diagnostics.ActivitySpanId,System.Diagnostics.ActivityTraceFlags)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Diagnostics", "Activity", False, "SetParentId", "(System.Diagnostics.ActivityTraceId,System.Diagnostics.ActivitySpanId,System.Diagnostics.ActivityTraceFlags)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["System.Diagnostics", "Activity", False, "SetParentId", "(System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Diagnostics", "Activity", False, "SetParentId", "(System.String)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["System.Diagnostics", "Activity", False, "SetStartTime", "(System.DateTime)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["System.Diagnostics", "Activity", False, "SetStatus", "(System.Diagnostics.ActivityStatusCode,System.String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Diagnostics", "Activity", False, "SetStatus", "(System.Diagnostics.ActivityStatusCode,System.String)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["System.Diagnostics", "Activity", False, "SetTag", "(System.String,System.Object)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["System.Diagnostics", "Activity", False, "SetBaggage", "(System.String,System.String)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Diagnostics", "Activity", False, "SetEndTime", "(System.DateTime)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Diagnostics", "Activity", False, "SetIdFormat", "(System.Diagnostics.ActivityIdFormat)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Diagnostics", "Activity", False, "SetParentId", "(System.Diagnostics.ActivityTraceId,System.Diagnostics.ActivitySpanId,System.Diagnostics.ActivityTraceFlags)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Diagnostics", "Activity", False, "SetParentId", "(System.String)", "", "Argument[0]", "Argument[this].SyntheticField[System.Diagnostics.Activity._parentId]", "value", "dfc-generated"]
+      - ["System.Diagnostics", "Activity", False, "SetParentId", "(System.String)", "", "Argument[0]", "ReturnValue.SyntheticField[System.Diagnostics.Activity._parentId]", "value", "dfc-generated"]
+      - ["System.Diagnostics", "Activity", False, "SetParentId", "(System.String)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Diagnostics", "Activity", False, "SetStartTime", "(System.DateTime)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Diagnostics", "Activity", False, "SetStatus", "(System.Diagnostics.ActivityStatusCode,System.String)", "", "Argument[1]", "Argument[this].SyntheticField[System.Diagnostics.Activity._statusDescription]", "value", "dfc-generated"]
+      - ["System.Diagnostics", "Activity", False, "SetStatus", "(System.Diagnostics.ActivityStatusCode,System.String)", "", "Argument[1]", "ReturnValue.SyntheticField[System.Diagnostics.Activity._statusDescription]", "value", "dfc-generated"]
+      - ["System.Diagnostics", "Activity", False, "SetStatus", "(System.Diagnostics.ActivityStatusCode,System.String)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Diagnostics", "Activity", False, "SetTag", "(System.String,System.Object)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Diagnostics", "Activity", False, "Start", "()", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
       - ["System.Diagnostics", "Activity", False, "get_Events", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Diagnostics", "Activity", False, "get_Id", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Diagnostics", "Activity", False, "get_Links", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Diagnostics", "Activity", False, "get_ParentId", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Diagnostics", "Activity", False, "get_ParentId", "()", "", "Argument[this].SyntheticField[System.Diagnostics.Activity._parentId]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Diagnostics", "Activity", False, "get_ParentSpanId", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Diagnostics", "Activity", False, "get_RootId", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Diagnostics", "Activity", False, "get_SpanId", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Diagnostics", "Activity", False, "get_StatusDescription", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Diagnostics", "Activity", False, "get_StatusDescription", "()", "", "Argument[this].SyntheticField[System.Diagnostics.Activity._statusDescription]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Diagnostics", "Activity", False, "get_TagObjects", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Diagnostics", "Activity", False, "get_TraceId", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Diagnostics", "ActivityCreationOptions<T>", False, "get_SamplingTags", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
@@ -43,10 +43,10 @@ extensions:
       - ["System.Diagnostics", "ActivityLink", False, "EnumerateTagObjects", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Diagnostics", "ActivityLink", False, "get_Tags", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Diagnostics", "ActivitySource", False, "CreateActivity", "(System.String,System.Diagnostics.ActivityKind,System.Diagnostics.ActivityContext,System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<System.String,System.Object>>,System.Collections.Generic.IEnumerable<System.Diagnostics.ActivityLink>,System.Diagnostics.ActivityIdFormat)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Diagnostics", "ActivitySource", False, "CreateActivity", "(System.String,System.Diagnostics.ActivityKind,System.String,System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<System.String,System.Object>>,System.Collections.Generic.IEnumerable<System.Diagnostics.ActivityLink>,System.Diagnostics.ActivityIdFormat)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Diagnostics", "ActivitySource", False, "CreateActivity", "(System.String,System.Diagnostics.ActivityKind,System.String,System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<System.String,System.Object>>,System.Collections.Generic.IEnumerable<System.Diagnostics.ActivityLink>,System.Diagnostics.ActivityIdFormat)", "", "Argument[2]", "ReturnValue.SyntheticField[System.Diagnostics.Activity._parentId]", "value", "dfc-generated"]
       - ["System.Diagnostics", "ActivitySource", False, "StartActivity", "(System.Diagnostics.ActivityKind,System.Diagnostics.ActivityContext,System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<System.String,System.Object>>,System.Collections.Generic.IEnumerable<System.Diagnostics.ActivityLink>,System.DateTimeOffset,System.String)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
       - ["System.Diagnostics", "ActivitySource", False, "StartActivity", "(System.String,System.Diagnostics.ActivityKind,System.Diagnostics.ActivityContext,System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<System.String,System.Object>>,System.Collections.Generic.IEnumerable<System.Diagnostics.ActivityLink>,System.DateTimeOffset)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Diagnostics", "ActivitySource", False, "StartActivity", "(System.String,System.Diagnostics.ActivityKind,System.String,System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<System.String,System.Object>>,System.Collections.Generic.IEnumerable<System.Diagnostics.ActivityLink>,System.DateTimeOffset)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Diagnostics", "ActivitySource", False, "StartActivity", "(System.String,System.Diagnostics.ActivityKind,System.String,System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<System.String,System.Object>>,System.Collections.Generic.IEnumerable<System.Diagnostics.ActivityLink>,System.DateTimeOffset)", "", "Argument[2]", "ReturnValue.SyntheticField[System.Diagnostics.Activity._parentId]", "value", "dfc-generated"]
       - ["System.Diagnostics", "ActivitySpanId", False, "ToHexString", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Diagnostics", "ActivitySpanId", False, "ToString", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Diagnostics", "ActivityTagsCollection+Enumerator", False, "get_Current", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
@@ -55,17 +55,27 @@ extensions:
       - ["System.Diagnostics", "ActivityTraceId", False, "ToString", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Diagnostics", "CorrelationManager", False, "get_LogicalOperationStack", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Diagnostics", "DataReceivedEventArgs", False, "get_Data", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Diagnostics", "DiagnosticListener", False, "ToString", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Diagnostics", "Debug", False, "Assert", "(System.Boolean,System.Diagnostics.Debug+AssertInterpolatedStringHandler)", "", "Argument[1]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Diagnostics", "Debug", False, "Assert", "(System.Boolean,System.Diagnostics.Debug+AssertInterpolatedStringHandler,System.Diagnostics.Debug+AssertInterpolatedStringHandler)", "", "Argument[1]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Diagnostics", "Debug", False, "Assert", "(System.Boolean,System.Diagnostics.Debug+AssertInterpolatedStringHandler,System.Diagnostics.Debug+AssertInterpolatedStringHandler)", "", "Argument[2]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Diagnostics", "Debug", False, "WriteIf", "(System.Boolean,System.Diagnostics.Debug+WriteIfInterpolatedStringHandler)", "", "Argument[1]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Diagnostics", "Debug", False, "WriteIf", "(System.Boolean,System.Diagnostics.Debug+WriteIfInterpolatedStringHandler,System.String)", "", "Argument[1]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Diagnostics", "Debug", False, "WriteLineIf", "(System.Boolean,System.Diagnostics.Debug+WriteIfInterpolatedStringHandler)", "", "Argument[1]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Diagnostics", "Debug", False, "WriteLineIf", "(System.Boolean,System.Diagnostics.Debug+WriteIfInterpolatedStringHandler,System.String)", "", "Argument[1]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Diagnostics", "DiagnosticListener", False, "ToString", "()", "", "Argument[this].Property[System.Diagnostics.DiagnosticListener.Name]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Diagnostics", "DiagnosticListener", True, "Subscribe", "(System.IObserver<System.Collections.Generic.KeyValuePair<System.String,System.Object>>)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["System.Diagnostics", "DiagnosticListener", True, "Subscribe", "(System.IObserver<System.Collections.Generic.KeyValuePair<System.String,System.Object>>)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Diagnostics", "DiagnosticSource", False, "StartActivity", "(System.Diagnostics.Activity,System.Object)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Diagnostics", "DiagnosticSource", False, "StartActivity<T>", "(System.Diagnostics.Activity,T)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Diagnostics", "FileVersionInfo", False, "GetVersionInfo", "(System.String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Diagnostics", "DiagnosticSource", False, "StartActivity", "(System.Diagnostics.Activity,System.Object)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Diagnostics", "DiagnosticSource", False, "StartActivity<T>", "(System.Diagnostics.Activity,T)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Diagnostics", "DistributedContextPropagator", True, "ExtractBaggage", "(System.Object,System.Diagnostics.DistributedContextPropagator+PropagatorGetterCallback)", "", "Argument[0]", "Argument[1].Parameter[0]", "value", "dfc-generated"]
+      - ["System.Diagnostics", "DistributedContextPropagator", True, "ExtractTraceIdAndState", "(System.Object,System.Diagnostics.DistributedContextPropagator+PropagatorGetterCallback,System.String,System.String)", "", "Argument[0]", "Argument[1].Parameter[0]", "value", "dfc-generated"]
+      - ["System.Diagnostics", "DistributedContextPropagator", True, "Inject", "(System.Diagnostics.Activity,System.Object,System.Diagnostics.DistributedContextPropagator+PropagatorSetterCallback)", "", "Argument[1]", "Argument[2].Parameter[0]", "value", "dfc-generated"]
+      - ["System.Diagnostics", "FileVersionInfo", False, "GetVersionInfo", "(System.String)", "", "Argument[0]", "ReturnValue.SyntheticField[System.Diagnostics.FileVersionInfo._fileName]", "value", "dfc-generated"]
       - ["System.Diagnostics", "FileVersionInfo", False, "ToString", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Diagnostics", "FileVersionInfo", False, "get_Comments", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Diagnostics", "FileVersionInfo", False, "get_CompanyName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Diagnostics", "FileVersionInfo", False, "get_FileDescription", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Diagnostics", "FileVersionInfo", False, "get_FileName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Diagnostics", "FileVersionInfo", False, "get_FileName", "()", "", "Argument[this].SyntheticField[System.Diagnostics.FileVersionInfo._fileName]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Diagnostics", "FileVersionInfo", False, "get_FileVersion", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Diagnostics", "FileVersionInfo", False, "get_InternalName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Diagnostics", "FileVersionInfo", False, "get_Language", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
@@ -76,11 +86,12 @@ extensions:
       - ["System.Diagnostics", "FileVersionInfo", False, "get_ProductName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Diagnostics", "FileVersionInfo", False, "get_ProductVersion", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Diagnostics", "FileVersionInfo", False, "get_SpecialBuild", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Diagnostics", "Process", False, "GetProcessById", "(System.Int32,System.String)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Diagnostics", "MonitoringDescriptionAttribute", True, "get_Description", "()", "", "Argument[this].Property[System.ComponentModel.DescriptionAttribute.Description]", "Argument[this].Property[System.ComponentModel.DescriptionAttribute.DescriptionValue]", "value", "dfc-generated"]
+      - ["System.Diagnostics", "MonitoringDescriptionAttribute", True, "get_Description", "()", "", "Argument[this].Property[System.ComponentModel.DescriptionAttribute.Description]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Diagnostics", "Process", False, "GetProcessById", "(System.Int32,System.String)", "", "Argument[1]", "ReturnValue.SyntheticField[System.Diagnostics.Process._machineName]", "value", "dfc-generated"]
       - ["System.Diagnostics", "Process", False, "GetProcesses", "(System.String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["System.Diagnostics", "Process", False, "Start", "(System.Diagnostics.ProcessStartInfo)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Diagnostics", "Process", False, "get_Handle", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Diagnostics", "Process", False, "get_MachineName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Diagnostics", "Process", False, "get_MachineName", "()", "", "Argument[this].SyntheticField[System.Diagnostics.Process._machineName]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Diagnostics", "Process", False, "get_MainModule", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Diagnostics", "Process", False, "get_Modules", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Diagnostics", "Process", False, "get_ProcessName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
@@ -89,50 +100,45 @@ extensions:
       - ["System.Diagnostics", "Process", False, "get_StandardInput", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Diagnostics", "Process", False, "get_StandardOutput", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Diagnostics", "Process", False, "get_Threads", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Diagnostics", "ProcessModule", False, "ToString", "()", "", "Argument[this].Property[System.Diagnostics.ProcessModule.ModuleName]", "ReturnValue", "taint", "dfc-generated"]
       - ["System.Diagnostics", "ProcessModule", False, "get_FileName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Diagnostics", "ProcessModule", False, "get_ModuleName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Diagnostics", "ProcessModuleCollection", False, "ProcessModuleCollection", "(System.Diagnostics.ProcessModule[])", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["System.Diagnostics", "ProcessModuleCollection", False, "get_Item", "(System.Int32)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Diagnostics", "ProcessModuleCollection", False, "ProcessModuleCollection", "(System.Diagnostics.ProcessModule[])", "", "Argument[0].Element", "Argument[this].Property[System.Collections.ReadOnlyCollectionBase.InnerList].Element", "value", "dfc-generated"]
+      - ["System.Diagnostics", "ProcessModuleCollection", False, "get_Item", "(System.Int32)", "", "Argument[this].Property[System.Collections.ReadOnlyCollectionBase.InnerList].Element", "ReturnValue", "value", "dfc-generated"]
       - ["System.Diagnostics", "ProcessStartInfo", False, "ProcessStartInfo", "(System.String,System.Collections.Generic.IEnumerable<System.String>)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Diagnostics", "ProcessStartInfo", False, "get_Environment", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Diagnostics", "ProcessStartInfo", False, "get_EnvironmentVariables", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Diagnostics", "ProcessThreadCollection", False, "Insert", "(System.Int32,System.Diagnostics.ProcessThread)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Diagnostics", "ProcessThreadCollection", False, "ProcessThreadCollection", "(System.Diagnostics.ProcessThread[])", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["System.Diagnostics", "ProcessThreadCollection", False, "get_Item", "(System.Int32)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Diagnostics", "ProcessStartInfo", False, "get_EnvironmentVariables", "()", "", "Argument[this].Property[System.Diagnostics.ProcessStartInfo.Environment]", "ReturnValue.SyntheticField[System.Collections.Specialized.StringDictionaryWrapper._contents]", "value", "dfc-generated"]
+      - ["System.Diagnostics", "ProcessThreadCollection", False, "Insert", "(System.Int32,System.Diagnostics.ProcessThread)", "", "Argument[1]", "Argument[this].Property[System.Collections.ReadOnlyCollectionBase.InnerList].Element", "value", "dfc-generated"]
+      - ["System.Diagnostics", "ProcessThreadCollection", False, "ProcessThreadCollection", "(System.Diagnostics.ProcessThread[])", "", "Argument[0].Element", "Argument[this].Property[System.Collections.ReadOnlyCollectionBase.InnerList].Element", "value", "dfc-generated"]
+      - ["System.Diagnostics", "ProcessThreadCollection", False, "get_Item", "(System.Int32)", "", "Argument[this].Property[System.Collections.ReadOnlyCollectionBase.InnerList].Element", "ReturnValue", "value", "dfc-generated"]
       - ["System.Diagnostics", "SourceFilter", False, "SourceFilter", "(System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Diagnostics", "StackFrame", False, "StackFrame", "(System.String,System.Int32)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Diagnostics", "StackFrame", False, "StackFrame", "(System.String,System.Int32,System.Int32)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["System.Diagnostics", "StackFrame", False, "StackFrame", "(System.String,System.Int32)", "", "Argument[0]", "Argument[this].SyntheticField[System.Diagnostics.StackFrame._fileName]", "value", "dfc-generated"]
+      - ["System.Diagnostics", "StackFrame", False, "StackFrame", "(System.String,System.Int32,System.Int32)", "", "Argument[0]", "Argument[this].SyntheticField[System.Diagnostics.StackFrame._fileName]", "value", "dfc-generated"]
       - ["System.Diagnostics", "StackFrame", False, "ToString", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Diagnostics", "StackFrame", True, "GetFileName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Diagnostics", "StackFrame", True, "GetFileName", "()", "", "Argument[this].SyntheticField[System.Diagnostics.StackFrame._fileName]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Diagnostics", "StackFrame", True, "GetMethod", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Diagnostics", "StackTrace", False, "StackTrace", "(System.Diagnostics.StackFrame)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["System.Diagnostics", "StackTrace", False, "StackTrace", "(System.Diagnostics.StackFrame)", "", "Argument[0]", "Argument[this].SyntheticField[System.Diagnostics.StackTrace._stackFrames].Element", "value", "dfc-generated"]
       - ["System.Diagnostics", "StackTrace", False, "ToString", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Diagnostics", "StackTrace", True, "GetFrame", "(System.Int32)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Diagnostics", "Switch", False, "Switch", "(System.String,System.String,System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Diagnostics", "Switch", False, "Switch", "(System.String,System.String,System.String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Diagnostics", "Switch", False, "Switch", "(System.String,System.String,System.String)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Diagnostics", "Switch", False, "get_DefaultValue", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Diagnostics", "Switch", False, "get_Description", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Diagnostics", "Switch", False, "get_DisplayName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Diagnostics", "StackTrace", True, "GetFrame", "(System.Int32)", "", "Argument[this].SyntheticField[System.Diagnostics.StackTrace._stackFrames].Element", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Diagnostics", "Switch", False, "Switch", "(System.String,System.String,System.String)", "", "Argument[0]", "Argument[this].SyntheticField[System.Diagnostics.Switch._displayName]", "value", "dfc-generated"]
+      - ["System.Diagnostics", "Switch", False, "Switch", "(System.String,System.String,System.String)", "", "Argument[1]", "Argument[this].SyntheticField[System.Diagnostics.Switch._description]", "value", "dfc-generated"]
+      - ["System.Diagnostics", "Switch", False, "Switch", "(System.String,System.String,System.String)", "", "Argument[2]", "Argument[this].SyntheticField[System.Diagnostics.Switch._defaultValue]", "value", "dfc-generated"]
+      - ["System.Diagnostics", "Switch", False, "get_DefaultValue", "()", "", "Argument[this].SyntheticField[System.Diagnostics.Switch._defaultValue]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Diagnostics", "Switch", False, "get_Description", "()", "", "Argument[this].SyntheticField[System.Diagnostics.Switch._description]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Diagnostics", "Switch", False, "get_DisplayName", "()", "", "Argument[this].SyntheticField[System.Diagnostics.Switch._displayName]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Diagnostics", "SwitchAttribute", False, "SwitchAttribute", "(System.String,System.Type)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Diagnostics", "TagList+Enumerator", False, "get_Current", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Diagnostics", "TagList", False, "CopyTo", "(System.Span<System.Collections.Generic.KeyValuePair<System.String,System.Object>>)", "", "Argument[this]", "Argument[0]", "taint", "df-generated"]
       - ["System.Diagnostics", "TagList", False, "TagList", "(System.ReadOnlySpan<System.Collections.Generic.KeyValuePair<System.String,System.Object>>)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Diagnostics", "TextWriterTraceListener", False, "TextWriterTraceListener", "(System.IO.TextWriter,System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Diagnostics", "TextWriterTraceListener", False, "TextWriterTraceListener", "(System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Diagnostics", "TextWriterTraceListener", False, "TextWriterTraceListener", "(System.String,System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Diagnostics", "TraceListener", False, "TraceListener", "(System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Diagnostics", "TraceListener", True, "Fail", "(System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Diagnostics", "TraceListener", True, "Fail", "(System.String,System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Diagnostics", "TraceListener", True, "Fail", "(System.String,System.String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
       - ["System.Diagnostics", "TraceListener", True, "TraceData", "(System.Diagnostics.TraceEventCache,System.String,System.Diagnostics.TraceEventType,System.Int32,System.Object)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Diagnostics", "TraceListener", True, "TraceData", "(System.Diagnostics.TraceEventCache,System.String,System.Diagnostics.TraceEventType,System.Int32,System.Object)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
       - ["System.Diagnostics", "TraceListener", True, "TraceData", "(System.Diagnostics.TraceEventCache,System.String,System.Diagnostics.TraceEventType,System.Int32,System.Object)", "", "Argument[4]", "Argument[this]", "taint", "df-generated"]
       - ["System.Diagnostics", "TraceListener", True, "TraceData", "(System.Diagnostics.TraceEventCache,System.String,System.Diagnostics.TraceEventType,System.Int32,System.Object[])", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Diagnostics", "TraceListener", True, "TraceData", "(System.Diagnostics.TraceEventCache,System.String,System.Diagnostics.TraceEventType,System.Int32,System.Object[])", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
       - ["System.Diagnostics", "TraceListener", True, "TraceData", "(System.Diagnostics.TraceEventCache,System.String,System.Diagnostics.TraceEventType,System.Int32,System.Object[])", "", "Argument[4].Element", "Argument[this]", "taint", "df-generated"]
-      - ["System.Diagnostics", "TraceListener", True, "TraceEvent", "(System.Diagnostics.TraceEventCache,System.String,System.Diagnostics.TraceEventType,System.Int32)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Diagnostics", "TraceListener", True, "TraceEvent", "(System.Diagnostics.TraceEventCache,System.String,System.Diagnostics.TraceEventType,System.Int32)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
       - ["System.Diagnostics", "TraceListener", True, "TraceEvent", "(System.Diagnostics.TraceEventCache,System.String,System.Diagnostics.TraceEventType,System.Int32,System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Diagnostics", "TraceListener", True, "TraceEvent", "(System.Diagnostics.TraceEventCache,System.String,System.Diagnostics.TraceEventType,System.Int32,System.String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
       - ["System.Diagnostics", "TraceListener", True, "TraceEvent", "(System.Diagnostics.TraceEventCache,System.String,System.Diagnostics.TraceEventType,System.Int32,System.String)", "", "Argument[4]", "Argument[this]", "taint", "df-generated"]
@@ -140,23 +146,10 @@ extensions:
       - ["System.Diagnostics", "TraceListener", True, "TraceEvent", "(System.Diagnostics.TraceEventCache,System.String,System.Diagnostics.TraceEventType,System.Int32,System.String,System.Object[])", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
       - ["System.Diagnostics", "TraceListener", True, "TraceEvent", "(System.Diagnostics.TraceEventCache,System.String,System.Diagnostics.TraceEventType,System.Int32,System.String,System.Object[])", "", "Argument[4]", "Argument[this]", "taint", "df-generated"]
       - ["System.Diagnostics", "TraceListener", True, "TraceEvent", "(System.Diagnostics.TraceEventCache,System.String,System.Diagnostics.TraceEventType,System.Int32,System.String,System.Object[])", "", "Argument[5].Element", "Argument[this]", "taint", "df-generated"]
-      - ["System.Diagnostics", "TraceListener", True, "TraceTransfer", "(System.Diagnostics.TraceEventCache,System.String,System.Int32,System.String,System.Guid)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Diagnostics", "TraceListener", True, "TraceTransfer", "(System.Diagnostics.TraceEventCache,System.String,System.Int32,System.String,System.Guid)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Diagnostics", "TraceListener", True, "Write", "(System.Object)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Diagnostics", "TraceListener", True, "Write", "(System.Object,System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Diagnostics", "TraceListener", True, "Write", "(System.Object,System.String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
       - ["System.Diagnostics", "TraceListener", True, "Write", "(System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Diagnostics", "TraceListener", True, "Write", "(System.String,System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Diagnostics", "TraceListener", True, "Write", "(System.String,System.String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Diagnostics", "TraceListener", True, "WriteLine", "(System.Object)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Diagnostics", "TraceListener", True, "WriteLine", "(System.Object,System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Diagnostics", "TraceListener", True, "WriteLine", "(System.Object,System.String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Diagnostics", "TraceListener", True, "WriteLine", "(System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Diagnostics", "TraceListener", True, "WriteLine", "(System.String,System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Diagnostics", "TraceListener", True, "WriteLine", "(System.String,System.String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Diagnostics", "TraceSource", False, "TraceSource", "(System.String,System.Diagnostics.SourceLevels)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["System.Diagnostics", "TraceSource", False, "TraceSource", "(System.String,System.Diagnostics.SourceLevels)", "", "Argument[0]", "Argument[this].SyntheticField[System.Diagnostics.TraceSource._sourceName]", "value", "dfc-generated"]
       - ["System.Diagnostics", "TraceSource", False, "get_Listeners", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Diagnostics", "TraceSource", False, "get_Name", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Diagnostics", "TraceSource", False, "get_Name", "()", "", "Argument[this].SyntheticField[System.Diagnostics.TraceSource._sourceName]", "ReturnValue", "value", "dfc-generated"]
   - addsTo:
       pack: codeql/csharp-all
       extensible: neutralModel
@@ -170,12 +163,14 @@ extensions:
       - ["System.Diagnostics", "Activity", "GetTagItem", "(System.String)", "summary", "df-generated"]
       - ["System.Diagnostics", "Activity", "SetCustomProperty", "(System.String,System.Object)", "summary", "df-generated"]
       - ["System.Diagnostics", "Activity", "Stop", "()", "summary", "df-generated"]
+      - ["System.Diagnostics", "Activity", "add_CurrentChanged", "(System.EventHandler<System.Diagnostics.ActivityChangedEventArgs>)", "summary", "df-generated"]
       - ["System.Diagnostics", "Activity", "get_Baggage", "()", "summary", "df-generated"]
       - ["System.Diagnostics", "Activity", "get_Context", "()", "summary", "df-generated"]
       - ["System.Diagnostics", "Activity", "get_OperationName", "()", "summary", "df-generated"]
       - ["System.Diagnostics", "Activity", "get_Recorded", "()", "summary", "df-generated"]
       - ["System.Diagnostics", "Activity", "get_Status", "()", "summary", "df-generated"]
       - ["System.Diagnostics", "Activity", "get_Tags", "()", "summary", "df-generated"]
+      - ["System.Diagnostics", "Activity", "remove_CurrentChanged", "(System.EventHandler<System.Diagnostics.ActivityChangedEventArgs>)", "summary", "df-generated"]
       - ["System.Diagnostics", "ActivityContext", "ActivityContext", "(System.Diagnostics.ActivityTraceId,System.Diagnostics.ActivitySpanId,System.Diagnostics.ActivityTraceFlags,System.String,System.Boolean)", "summary", "df-generated"]
       - ["System.Diagnostics", "ActivityContext", "Equals", "(System.Diagnostics.ActivityContext)", "summary", "df-generated"]
       - ["System.Diagnostics", "ActivityContext", "Equals", "(System.Object)", "summary", "df-generated"]
@@ -311,8 +306,6 @@ extensions:
       - ["System.Diagnostics", "Debug+WriteIfInterpolatedStringHandler", "AppendLiteral", "(System.String)", "summary", "df-generated"]
       - ["System.Diagnostics", "Debug+WriteIfInterpolatedStringHandler", "WriteIfInterpolatedStringHandler", "(System.Int32,System.Int32,System.Boolean,System.Boolean)", "summary", "df-generated"]
       - ["System.Diagnostics", "Debug", "Assert", "(System.Boolean)", "summary", "df-generated"]
-      - ["System.Diagnostics", "Debug", "Assert", "(System.Boolean,System.Diagnostics.Debug+AssertInterpolatedStringHandler)", "summary", "df-generated"]
-      - ["System.Diagnostics", "Debug", "Assert", "(System.Boolean,System.Diagnostics.Debug+AssertInterpolatedStringHandler,System.Diagnostics.Debug+AssertInterpolatedStringHandler)", "summary", "df-generated"]
       - ["System.Diagnostics", "Debug", "Assert", "(System.Boolean,System.String)", "summary", "df-generated"]
       - ["System.Diagnostics", "Debug", "Assert", "(System.Boolean,System.String,System.String)", "summary", "df-generated"]
       - ["System.Diagnostics", "Debug", "Assert", "(System.Boolean,System.String,System.String,System.Object[])", "summary", "df-generated"]
@@ -329,8 +322,6 @@ extensions:
       - ["System.Diagnostics", "Debug", "Write", "(System.Object,System.String)", "summary", "df-generated"]
       - ["System.Diagnostics", "Debug", "Write", "(System.String)", "summary", "df-generated"]
       - ["System.Diagnostics", "Debug", "Write", "(System.String,System.String)", "summary", "df-generated"]
-      - ["System.Diagnostics", "Debug", "WriteIf", "(System.Boolean,System.Diagnostics.Debug+WriteIfInterpolatedStringHandler)", "summary", "df-generated"]
-      - ["System.Diagnostics", "Debug", "WriteIf", "(System.Boolean,System.Diagnostics.Debug+WriteIfInterpolatedStringHandler,System.String)", "summary", "df-generated"]
       - ["System.Diagnostics", "Debug", "WriteIf", "(System.Boolean,System.Object)", "summary", "df-generated"]
       - ["System.Diagnostics", "Debug", "WriteIf", "(System.Boolean,System.Object,System.String)", "summary", "df-generated"]
       - ["System.Diagnostics", "Debug", "WriteIf", "(System.Boolean,System.String)", "summary", "df-generated"]
@@ -340,8 +331,6 @@ extensions:
       - ["System.Diagnostics", "Debug", "WriteLine", "(System.String)", "summary", "df-generated"]
       - ["System.Diagnostics", "Debug", "WriteLine", "(System.String,System.Object[])", "summary", "df-generated"]
       - ["System.Diagnostics", "Debug", "WriteLine", "(System.String,System.String)", "summary", "df-generated"]
-      - ["System.Diagnostics", "Debug", "WriteLineIf", "(System.Boolean,System.Diagnostics.Debug+WriteIfInterpolatedStringHandler)", "summary", "df-generated"]
-      - ["System.Diagnostics", "Debug", "WriteLineIf", "(System.Boolean,System.Diagnostics.Debug+WriteIfInterpolatedStringHandler,System.String)", "summary", "df-generated"]
       - ["System.Diagnostics", "Debug", "WriteLineIf", "(System.Boolean,System.Object)", "summary", "df-generated"]
       - ["System.Diagnostics", "Debug", "WriteLineIf", "(System.Boolean,System.Object,System.String)", "summary", "df-generated"]
       - ["System.Diagnostics", "Debug", "WriteLineIf", "(System.Boolean,System.String)", "summary", "df-generated"]
@@ -379,6 +368,9 @@ extensions:
       - ["System.Diagnostics", "DebuggerVisualizerAttribute", "DebuggerVisualizerAttribute", "(System.Type,System.Type)", "summary", "df-generated"]
       - ["System.Diagnostics", "DebuggerVisualizerAttribute", "get_VisualizerObjectSourceTypeName", "()", "summary", "df-generated"]
       - ["System.Diagnostics", "DebuggerVisualizerAttribute", "get_VisualizerTypeName", "()", "summary", "df-generated"]
+      - ["System.Diagnostics", "DefaultTraceListener", "Fail", "(System.String)", "summary", "df-generated"]
+      - ["System.Diagnostics", "DefaultTraceListener", "Fail", "(System.String,System.String)", "summary", "df-generated"]
+      - ["System.Diagnostics", "DefaultTraceListener", "WriteLine", "(System.String)", "summary", "df-generated"]
       - ["System.Diagnostics", "DelimitedListTraceListener", "DelimitedListTraceListener", "(System.IO.Stream)", "summary", "df-generated"]
       - ["System.Diagnostics", "DelimitedListTraceListener", "DelimitedListTraceListener", "(System.IO.Stream,System.String)", "summary", "df-generated"]
       - ["System.Diagnostics", "DelimitedListTraceListener", "DelimitedListTraceListener", "(System.IO.TextWriter)", "summary", "df-generated"]
@@ -393,6 +385,9 @@ extensions:
       - ["System.Diagnostics", "DiagnosticListener", "IsEnabled", "(System.String,System.Object,System.Object)", "summary", "df-generated"]
       - ["System.Diagnostics", "DiagnosticListener", "OnActivityExport", "(System.Diagnostics.Activity,System.Object)", "summary", "df-generated"]
       - ["System.Diagnostics", "DiagnosticListener", "OnActivityImport", "(System.Diagnostics.Activity,System.Object)", "summary", "df-generated"]
+      - ["System.Diagnostics", "DiagnosticListener", "Subscribe", "(System.IObserver<System.Collections.Generic.KeyValuePair<System.String,System.Object>>,System.Func<System.String,System.Object,System.Object,System.Boolean>)", "summary", "df-generated"]
+      - ["System.Diagnostics", "DiagnosticListener", "Subscribe", "(System.IObserver<System.Collections.Generic.KeyValuePair<System.String,System.Object>>,System.Func<System.String,System.Object,System.Object,System.Boolean>,System.Action<System.Diagnostics.Activity,System.Object>,System.Action<System.Diagnostics.Activity,System.Object>)", "summary", "df-generated"]
+      - ["System.Diagnostics", "DiagnosticListener", "Subscribe", "(System.IObserver<System.Collections.Generic.KeyValuePair<System.String,System.Object>>,System.Predicate<System.String>)", "summary", "df-generated"]
       - ["System.Diagnostics", "DiagnosticListener", "Write", "(System.String,System.Object)", "summary", "df-generated"]
       - ["System.Diagnostics", "DiagnosticListener", "get_AllListeners", "()", "summary", "df-generated"]
       - ["System.Diagnostics", "DiagnosticSource", "IsEnabled", "(System.String)", "summary", "df-generated"]
@@ -449,10 +444,12 @@ extensions:
       - ["System.Diagnostics", "EventLog", "WriteEvent", "(System.Diagnostics.EventInstance,System.Object[])", "summary", "df-generated"]
       - ["System.Diagnostics", "EventLog", "WriteEvent", "(System.String,System.Diagnostics.EventInstance,System.Byte[],System.Object[])", "summary", "df-generated"]
       - ["System.Diagnostics", "EventLog", "WriteEvent", "(System.String,System.Diagnostics.EventInstance,System.Object[])", "summary", "df-generated"]
+      - ["System.Diagnostics", "EventLog", "add_EntryWritten", "(System.Diagnostics.EntryWrittenEventHandler)", "summary", "df-generated"]
       - ["System.Diagnostics", "EventLog", "get_Entries", "()", "summary", "df-generated"]
       - ["System.Diagnostics", "EventLog", "get_LogDisplayName", "()", "summary", "df-generated"]
       - ["System.Diagnostics", "EventLog", "get_MinimumRetentionDays", "()", "summary", "df-generated"]
       - ["System.Diagnostics", "EventLog", "get_OverflowAction", "()", "summary", "df-generated"]
+      - ["System.Diagnostics", "EventLog", "remove_EntryWritten", "(System.Diagnostics.EntryWrittenEventHandler)", "summary", "df-generated"]
       - ["System.Diagnostics", "EventLogEntry", "Equals", "(System.Diagnostics.EventLogEntry)", "summary", "df-generated"]
       - ["System.Diagnostics", "EventLogEntry", "get_Category", "()", "summary", "df-generated"]
       - ["System.Diagnostics", "EventLogEntry", "get_CategoryNumber", "()", "summary", "df-generated"]
@@ -497,6 +494,7 @@ extensions:
       - ["System.Diagnostics", "EventLogTraceListener", "Dispose", "(System.Boolean)", "summary", "df-generated"]
       - ["System.Diagnostics", "EventLogTraceListener", "EventLogTraceListener", "(System.Diagnostics.EventLog)", "summary", "df-generated"]
       - ["System.Diagnostics", "EventLogTraceListener", "EventLogTraceListener", "(System.String)", "summary", "df-generated"]
+      - ["System.Diagnostics", "EventLogTraceListener", "WriteLine", "(System.String)", "summary", "df-generated"]
       - ["System.Diagnostics", "EventSourceCreationData", "EventSourceCreationData", "(System.String,System.String)", "summary", "df-generated"]
       - ["System.Diagnostics", "EventTypeFilter", "EventTypeFilter", "(System.Diagnostics.SourceLevels)", "summary", "df-generated"]
       - ["System.Diagnostics", "EventTypeFilter", "ShouldTrace", "(System.Diagnostics.TraceEventCache,System.String,System.Diagnostics.TraceEventType,System.Int32,System.String,System.Object[],System.Object,System.Object[])", "summary", "df-generated"]
@@ -632,9 +630,13 @@ extensions:
       - ["System.Diagnostics", "Process", "WaitForInputIdle", "()", "summary", "df-generated"]
       - ["System.Diagnostics", "Process", "WaitForInputIdle", "(System.Int32)", "summary", "df-generated"]
       - ["System.Diagnostics", "Process", "WaitForInputIdle", "(System.TimeSpan)", "summary", "df-generated"]
+      - ["System.Diagnostics", "Process", "add_ErrorDataReceived", "(System.Diagnostics.DataReceivedEventHandler)", "summary", "df-generated"]
+      - ["System.Diagnostics", "Process", "add_Exited", "(System.EventHandler)", "summary", "df-generated"]
+      - ["System.Diagnostics", "Process", "add_OutputDataReceived", "(System.Diagnostics.DataReceivedEventHandler)", "summary", "df-generated"]
       - ["System.Diagnostics", "Process", "get_BasePriority", "()", "summary", "df-generated"]
       - ["System.Diagnostics", "Process", "get_ExitCode", "()", "summary", "df-generated"]
       - ["System.Diagnostics", "Process", "get_ExitTime", "()", "summary", "df-generated"]
+      - ["System.Diagnostics", "Process", "get_Handle", "()", "summary", "df-generated"]
       - ["System.Diagnostics", "Process", "get_HandleCount", "()", "summary", "df-generated"]
       - ["System.Diagnostics", "Process", "get_HasExited", "()", "summary", "df-generated"]
       - ["System.Diagnostics", "Process", "get_Id", "()", "summary", "df-generated"]
@@ -664,6 +666,9 @@ extensions:
       - ["System.Diagnostics", "Process", "get_VirtualMemorySize", "()", "summary", "df-generated"]
       - ["System.Diagnostics", "Process", "get_WorkingSet64", "()", "summary", "df-generated"]
       - ["System.Diagnostics", "Process", "get_WorkingSet", "()", "summary", "df-generated"]
+      - ["System.Diagnostics", "Process", "remove_ErrorDataReceived", "(System.Diagnostics.DataReceivedEventHandler)", "summary", "df-generated"]
+      - ["System.Diagnostics", "Process", "remove_Exited", "(System.EventHandler)", "summary", "df-generated"]
+      - ["System.Diagnostics", "Process", "remove_OutputDataReceived", "(System.Diagnostics.DataReceivedEventHandler)", "summary", "df-generated"]
       - ["System.Diagnostics", "ProcessModule", "get_FileVersionInfo", "()", "summary", "df-generated"]
       - ["System.Diagnostics", "ProcessModuleCollection", "Contains", "(System.Diagnostics.ProcessModule)", "summary", "df-generated"]
       - ["System.Diagnostics", "ProcessModuleCollection", "IndexOf", "(System.Diagnostics.ProcessModule)", "summary", "df-generated"]
@@ -731,7 +736,9 @@ extensions:
       - ["System.Diagnostics", "Switch", "OnValueChanged", "()", "summary", "df-generated"]
       - ["System.Diagnostics", "Switch", "Refresh", "()", "summary", "df-generated"]
       - ["System.Diagnostics", "Switch", "Switch", "(System.String,System.String)", "summary", "df-generated"]
+      - ["System.Diagnostics", "Switch", "add_Initializing", "(System.EventHandler<System.Diagnostics.InitializingSwitchEventArgs>)", "summary", "df-generated"]
       - ["System.Diagnostics", "Switch", "get_Attributes", "()", "summary", "df-generated"]
+      - ["System.Diagnostics", "Switch", "remove_Initializing", "(System.EventHandler<System.Diagnostics.InitializingSwitchEventArgs>)", "summary", "df-generated"]
       - ["System.Diagnostics", "SwitchAttribute", "GetAll", "(System.Reflection.Assembly)", "summary", "df-generated"]
       - ["System.Diagnostics", "SwitchLevelAttribute", "SwitchLevelAttribute", "(System.Type)", "summary", "df-generated"]
       - ["System.Diagnostics", "TagList+Enumerator", "Dispose", "()", "summary", "df-generated"]
@@ -739,6 +746,7 @@ extensions:
       - ["System.Diagnostics", "TagList+Enumerator", "Reset", "()", "summary", "df-generated"]
       - ["System.Diagnostics", "TagList", "Add", "(System.String,System.Object)", "summary", "df-generated"]
       - ["System.Diagnostics", "TagList", "Contains", "(System.Collections.Generic.KeyValuePair<System.String,System.Object>)", "summary", "df-generated"]
+      - ["System.Diagnostics", "TagList", "CopyTo", "(System.Span<System.Collections.Generic.KeyValuePair<System.String,System.Object>>)", "summary", "df-generated"]
       - ["System.Diagnostics", "TagList", "IndexOf", "(System.Collections.Generic.KeyValuePair<System.String,System.Object>)", "summary", "df-generated"]
       - ["System.Diagnostics", "TagList", "Remove", "(System.Collections.Generic.KeyValuePair<System.String,System.Object>)", "summary", "df-generated"]
       - ["System.Diagnostics", "TagList", "RemoveAt", "(System.Int32)", "summary", "df-generated"]
@@ -750,6 +758,7 @@ extensions:
       - ["System.Diagnostics", "TextWriterTraceListener", "TextWriterTraceListener", "(System.IO.Stream)", "summary", "df-generated"]
       - ["System.Diagnostics", "TextWriterTraceListener", "TextWriterTraceListener", "(System.IO.Stream,System.String)", "summary", "df-generated"]
       - ["System.Diagnostics", "TextWriterTraceListener", "TextWriterTraceListener", "(System.IO.TextWriter)", "summary", "df-generated"]
+      - ["System.Diagnostics", "TextWriterTraceListener", "WriteLine", "(System.String)", "summary", "df-generated"]
       - ["System.Diagnostics", "Trace", "Assert", "(System.Boolean)", "summary", "df-generated"]
       - ["System.Diagnostics", "Trace", "Assert", "(System.Boolean,System.String)", "summary", "df-generated"]
       - ["System.Diagnostics", "Trace", "Assert", "(System.Boolean,System.String,System.String)", "summary", "df-generated"]
@@ -782,8 +791,10 @@ extensions:
       - ["System.Diagnostics", "Trace", "WriteLineIf", "(System.Boolean,System.Object,System.String)", "summary", "df-generated"]
       - ["System.Diagnostics", "Trace", "WriteLineIf", "(System.Boolean,System.String)", "summary", "df-generated"]
       - ["System.Diagnostics", "Trace", "WriteLineIf", "(System.Boolean,System.String,System.String)", "summary", "df-generated"]
+      - ["System.Diagnostics", "Trace", "add_Refreshing", "(System.EventHandler)", "summary", "df-generated"]
       - ["System.Diagnostics", "Trace", "get_CorrelationManager", "()", "summary", "df-generated"]
       - ["System.Diagnostics", "Trace", "get_Listeners", "()", "summary", "df-generated"]
+      - ["System.Diagnostics", "Trace", "remove_Refreshing", "(System.EventHandler)", "summary", "df-generated"]
       - ["System.Diagnostics", "TraceConfiguration", "Register", "()", "summary", "df-generated"]
       - ["System.Diagnostics", "TraceEventCache", "get_Callstack", "()", "summary", "df-generated"]
       - ["System.Diagnostics", "TraceEventCache", "get_DateTime", "()", "summary", "df-generated"]
@@ -795,9 +806,20 @@ extensions:
       - ["System.Diagnostics", "TraceListener", "Close", "()", "summary", "df-generated"]
       - ["System.Diagnostics", "TraceListener", "Dispose", "()", "summary", "df-generated"]
       - ["System.Diagnostics", "TraceListener", "Dispose", "(System.Boolean)", "summary", "df-generated"]
+      - ["System.Diagnostics", "TraceListener", "Fail", "(System.String)", "summary", "df-generated"]
+      - ["System.Diagnostics", "TraceListener", "Fail", "(System.String,System.String)", "summary", "df-generated"]
       - ["System.Diagnostics", "TraceListener", "Flush", "()", "summary", "df-generated"]
       - ["System.Diagnostics", "TraceListener", "GetSupportedAttributes", "()", "summary", "df-generated"]
+      - ["System.Diagnostics", "TraceListener", "TraceEvent", "(System.Diagnostics.TraceEventCache,System.String,System.Diagnostics.TraceEventType,System.Int32)", "summary", "df-generated"]
+      - ["System.Diagnostics", "TraceListener", "TraceTransfer", "(System.Diagnostics.TraceEventCache,System.String,System.Int32,System.String,System.Guid)", "summary", "df-generated"]
+      - ["System.Diagnostics", "TraceListener", "Write", "(System.Object)", "summary", "df-generated"]
+      - ["System.Diagnostics", "TraceListener", "Write", "(System.Object,System.String)", "summary", "df-generated"]
+      - ["System.Diagnostics", "TraceListener", "Write", "(System.String,System.String)", "summary", "df-generated"]
       - ["System.Diagnostics", "TraceListener", "WriteIndent", "()", "summary", "df-generated"]
+      - ["System.Diagnostics", "TraceListener", "WriteLine", "(System.Object)", "summary", "df-generated"]
+      - ["System.Diagnostics", "TraceListener", "WriteLine", "(System.Object,System.String)", "summary", "df-generated"]
+      - ["System.Diagnostics", "TraceListener", "WriteLine", "(System.String)", "summary", "df-generated"]
+      - ["System.Diagnostics", "TraceListener", "WriteLine", "(System.String,System.String)", "summary", "df-generated"]
       - ["System.Diagnostics", "TraceListener", "get_Attributes", "()", "summary", "df-generated"]
       - ["System.Diagnostics", "TraceListener", "get_IsThreadSafe", "()", "summary", "df-generated"]
       - ["System.Diagnostics", "TraceListenerCollection", "Contains", "(System.Diagnostics.TraceListener)", "summary", "df-generated"]
@@ -805,6 +827,7 @@ extensions:
       - ["System.Diagnostics", "TraceListenerCollection", "IndexOf", "(System.Diagnostics.TraceListener)", "summary", "df-generated"]
       - ["System.Diagnostics", "TraceListenerCollection", "IndexOf", "(System.Object)", "summary", "df-generated"]
       - ["System.Diagnostics", "TraceListenerCollection", "Remove", "(System.Diagnostics.TraceListener)", "summary", "df-generated"]
+      - ["System.Diagnostics", "TraceListenerCollection", "Remove", "(System.Object)", "summary", "df-generated"]
       - ["System.Diagnostics", "TraceListenerCollection", "Remove", "(System.String)", "summary", "df-generated"]
       - ["System.Diagnostics", "TraceListenerCollection", "RemoveAt", "(System.Int32)", "summary", "df-generated"]
       - ["System.Diagnostics", "TraceListenerCollection", "get_Count", "()", "summary", "df-generated"]
@@ -823,8 +846,10 @@ extensions:
       - ["System.Diagnostics", "TraceSource", "TraceInformation", "(System.String,System.Object[])", "summary", "df-generated"]
       - ["System.Diagnostics", "TraceSource", "TraceSource", "(System.String)", "summary", "df-generated"]
       - ["System.Diagnostics", "TraceSource", "TraceTransfer", "(System.Int32,System.String,System.Guid)", "summary", "df-generated"]
+      - ["System.Diagnostics", "TraceSource", "add_Initializing", "(System.EventHandler<System.Diagnostics.InitializingTraceSourceEventArgs>)", "summary", "df-generated"]
       - ["System.Diagnostics", "TraceSource", "get_Attributes", "()", "summary", "df-generated"]
       - ["System.Diagnostics", "TraceSource", "get_DefaultLevel", "()", "summary", "df-generated"]
+      - ["System.Diagnostics", "TraceSource", "remove_Initializing", "(System.EventHandler<System.Diagnostics.InitializingTraceSourceEventArgs>)", "summary", "df-generated"]
       - ["System.Diagnostics", "TraceSwitch", "OnSwitchSettingChanged", "()", "summary", "df-generated"]
       - ["System.Diagnostics", "TraceSwitch", "OnValueChanged", "()", "summary", "df-generated"]
       - ["System.Diagnostics", "TraceSwitch", "TraceSwitch", "(System.String,System.String)", "summary", "df-generated"]
@@ -836,6 +861,9 @@ extensions:
       - ["System.Diagnostics", "UnreachableException", "UnreachableException", "(System.String)", "summary", "df-generated"]
       - ["System.Diagnostics", "UnreachableException", "UnreachableException", "(System.String,System.Exception)", "summary", "df-generated"]
       - ["System.Diagnostics", "XmlWriterTraceListener", "Close", "()", "summary", "df-generated"]
+      - ["System.Diagnostics", "XmlWriterTraceListener", "Fail", "(System.String,System.String)", "summary", "df-generated"]
+      - ["System.Diagnostics", "XmlWriterTraceListener", "TraceTransfer", "(System.Diagnostics.TraceEventCache,System.String,System.Int32,System.String,System.Guid)", "summary", "df-generated"]
+      - ["System.Diagnostics", "XmlWriterTraceListener", "WriteLine", "(System.String)", "summary", "df-generated"]
       - ["System.Diagnostics", "XmlWriterTraceListener", "XmlWriterTraceListener", "(System.IO.Stream)", "summary", "df-generated"]
       - ["System.Diagnostics", "XmlWriterTraceListener", "XmlWriterTraceListener", "(System.IO.Stream,System.String)", "summary", "df-generated"]
       - ["System.Diagnostics", "XmlWriterTraceListener", "XmlWriterTraceListener", "(System.IO.TextWriter)", "summary", "df-generated"]
diff --git a/csharp/ql/lib/ext/generated/System.DirectoryServices.AccountManagement.model.yml b/csharp/ql/lib/ext/generated/System.DirectoryServices.AccountManagement.model.yml
index 32ab1b1972c..f5a8df2b873 100644
--- a/csharp/ql/lib/ext/generated/System.DirectoryServices.AccountManagement.model.yml
+++ b/csharp/ql/lib/ext/generated/System.DirectoryServices.AccountManagement.model.yml
@@ -162,6 +162,7 @@ extensions:
       - ["System.DirectoryServices.AccountManagement", "PrincipalValueCollection<T>", "Contains", "(T)", "summary", "df-generated"]
       - ["System.DirectoryServices.AccountManagement", "PrincipalValueCollection<T>", "IndexOf", "(System.Object)", "summary", "df-generated"]
       - ["System.DirectoryServices.AccountManagement", "PrincipalValueCollection<T>", "IndexOf", "(T)", "summary", "df-generated"]
+      - ["System.DirectoryServices.AccountManagement", "PrincipalValueCollection<T>", "Remove", "(System.Object)", "summary", "df-generated"]
       - ["System.DirectoryServices.AccountManagement", "PrincipalValueCollection<T>", "Remove", "(T)", "summary", "df-generated"]
       - ["System.DirectoryServices.AccountManagement", "PrincipalValueCollection<T>", "RemoveAt", "(System.Int32)", "summary", "df-generated"]
       - ["System.DirectoryServices.AccountManagement", "PrincipalValueCollection<T>", "get_Count", "()", "summary", "df-generated"]
diff --git a/csharp/ql/lib/ext/generated/System.DirectoryServices.Protocols.model.yml b/csharp/ql/lib/ext/generated/System.DirectoryServices.Protocols.model.yml
index e14462d71f5..4f8b1bd08ee 100644
--- a/csharp/ql/lib/ext/generated/System.DirectoryServices.Protocols.model.yml
+++ b/csharp/ql/lib/ext/generated/System.DirectoryServices.Protocols.model.yml
@@ -4,83 +4,67 @@ extensions:
       pack: codeql/csharp-all
       extensible: summaryModel
     data:
-      - ["System.DirectoryServices.Protocols", "AddRequest", False, "AddRequest", "(System.String,System.DirectoryServices.Protocols.DirectoryAttribute[])", "", "Argument[1].Element", "Argument[this]", "taint", "df-generated"]
       - ["System.DirectoryServices.Protocols", "CompareRequest", False, "CompareRequest", "(System.String,System.DirectoryServices.Protocols.DirectoryAttribute)", "", "Argument[1].Element", "Argument[this]", "taint", "df-generated"]
-      - ["System.DirectoryServices.Protocols", "CompareRequest", False, "CompareRequest", "(System.String,System.DirectoryServices.Protocols.DirectoryAttribute)", "", "Argument[this]", "Argument[1].Element", "taint", "df-generated"]
       - ["System.DirectoryServices.Protocols", "CompareRequest", False, "CompareRequest", "(System.String,System.String,System.Byte[])", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["System.DirectoryServices.Protocols", "CompareRequest", False, "CompareRequest", "(System.String,System.String,System.Byte[])", "", "Argument[2].Element", "Argument[this]", "taint", "df-generated"]
       - ["System.DirectoryServices.Protocols", "CompareRequest", False, "CompareRequest", "(System.String,System.String,System.String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["System.DirectoryServices.Protocols", "CompareRequest", False, "CompareRequest", "(System.String,System.String,System.String)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
       - ["System.DirectoryServices.Protocols", "CompareRequest", False, "CompareRequest", "(System.String,System.String,System.Uri)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["System.DirectoryServices.Protocols", "CompareRequest", False, "CompareRequest", "(System.String,System.String,System.Uri)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
       - ["System.DirectoryServices.Protocols", "DirSyncRequestControl", False, "DirSyncRequestControl", "(System.Byte[])", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["System.DirectoryServices.Protocols", "DirectoryAttribute", False, "Add", "(System.Byte[])", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["System.DirectoryServices.Protocols", "DirectoryAttribute", False, "Add", "(System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.DirectoryServices.Protocols", "DirectoryAttribute", False, "Add", "(System.Uri)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.DirectoryServices.Protocols", "DirectoryAttribute", False, "AddRange", "(System.Object[])", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["System.DirectoryServices.Protocols", "DirectoryAttribute", False, "CopyTo", "(System.Object[],System.Int32)", "", "Argument[this]", "Argument[0].Element", "taint", "df-generated"]
-      - ["System.DirectoryServices.Protocols", "DirectoryAttribute", False, "DirectoryAttribute", "(System.String,System.Object[])", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.DirectoryServices.Protocols", "DirectoryAttribute", False, "DirectoryAttribute", "(System.String,System.Object[])", "", "Argument[1].Element", "Argument[this]", "taint", "df-generated"]
-      - ["System.DirectoryServices.Protocols", "DirectoryAttribute", False, "DirectoryAttribute", "(System.String,System.Object[])", "", "Argument[this]", "Argument[1].Element", "taint", "df-generated"]
-      - ["System.DirectoryServices.Protocols", "DirectoryAttribute", False, "GetValues", "(System.Type)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.DirectoryServices.Protocols", "DirectoryAttribute", False, "Insert", "(System.Int32,System.Byte[])", "", "Argument[1].Element", "Argument[this]", "taint", "df-generated"]
-      - ["System.DirectoryServices.Protocols", "DirectoryAttribute", False, "Insert", "(System.Int32,System.String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["System.DirectoryServices.Protocols", "DirectoryAttribute", False, "Insert", "(System.Int32,System.Uri)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["System.DirectoryServices.Protocols", "DirectoryAttribute", False, "Remove", "(System.Object)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.DirectoryServices.Protocols", "DirectoryAttribute", False, "Remove", "(System.Object)", "", "Argument[this]", "Argument[0]", "taint", "df-generated"]
-      - ["System.DirectoryServices.Protocols", "DirectoryAttribute", False, "get_Item", "(System.Int32)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.DirectoryServices.Protocols", "DirectoryAttribute", False, "set_Item", "(System.Int32,System.Object)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["System.DirectoryServices.Protocols", "DirectoryAttribute", False, "set_Item", "(System.Int32,System.Object)", "", "Argument[this]", "Argument[1]", "taint", "df-generated"]
-      - ["System.DirectoryServices.Protocols", "DirectoryAttributeCollection", False, "Add", "(System.DirectoryServices.Protocols.DirectoryAttribute)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["System.DirectoryServices.Protocols", "DirectoryAttributeCollection", False, "AddRange", "(System.DirectoryServices.Protocols.DirectoryAttributeCollection)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["System.DirectoryServices.Protocols", "DirectoryAttributeCollection", False, "AddRange", "(System.DirectoryServices.Protocols.DirectoryAttribute[])", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["System.DirectoryServices.Protocols", "DirectoryAttributeCollection", False, "CopyTo", "(System.DirectoryServices.Protocols.DirectoryAttribute[],System.Int32)", "", "Argument[this]", "Argument[0].Element", "taint", "df-generated"]
-      - ["System.DirectoryServices.Protocols", "DirectoryAttributeCollection", False, "Insert", "(System.Int32,System.DirectoryServices.Protocols.DirectoryAttribute)", "", "Argument[1].Element", "Argument[this]", "taint", "df-generated"]
-      - ["System.DirectoryServices.Protocols", "DirectoryAttributeCollection", False, "Remove", "(System.DirectoryServices.Protocols.DirectoryAttribute)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["System.DirectoryServices.Protocols", "DirectoryAttributeCollection", False, "get_Item", "(System.Int32)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.DirectoryServices.Protocols", "DirectoryAttributeCollection", False, "set_Item", "(System.Int32,System.DirectoryServices.Protocols.DirectoryAttribute)", "", "Argument[1].Element", "Argument[this]", "taint", "df-generated"]
-      - ["System.DirectoryServices.Protocols", "DirectoryAttributeModificationCollection", False, "Add", "(System.DirectoryServices.Protocols.DirectoryAttributeModification)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["System.DirectoryServices.Protocols", "DirectoryAttributeModificationCollection", False, "AddRange", "(System.DirectoryServices.Protocols.DirectoryAttributeModificationCollection)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["System.DirectoryServices.Protocols", "DirectoryAttributeModificationCollection", False, "AddRange", "(System.DirectoryServices.Protocols.DirectoryAttributeModification[])", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["System.DirectoryServices.Protocols", "DirectoryAttributeModificationCollection", False, "CopyTo", "(System.DirectoryServices.Protocols.DirectoryAttributeModification[],System.Int32)", "", "Argument[this]", "Argument[0].Element", "taint", "df-generated"]
-      - ["System.DirectoryServices.Protocols", "DirectoryAttributeModificationCollection", False, "Insert", "(System.Int32,System.DirectoryServices.Protocols.DirectoryAttributeModification)", "", "Argument[1].Element", "Argument[this]", "taint", "df-generated"]
-      - ["System.DirectoryServices.Protocols", "DirectoryAttributeModificationCollection", False, "Remove", "(System.DirectoryServices.Protocols.DirectoryAttributeModification)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["System.DirectoryServices.Protocols", "DirectoryAttributeModificationCollection", False, "get_Item", "(System.Int32)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.DirectoryServices.Protocols", "DirectoryAttributeModificationCollection", False, "set_Item", "(System.Int32,System.DirectoryServices.Protocols.DirectoryAttributeModification)", "", "Argument[1].Element", "Argument[this]", "taint", "df-generated"]
+      - ["System.DirectoryServices.Protocols", "DirectoryAttribute", False, "Add", "(System.Byte[])", "", "Argument[0]", "Argument[this].Property[System.Collections.CollectionBase.List].Element", "value", "dfc-generated"]
+      - ["System.DirectoryServices.Protocols", "DirectoryAttribute", False, "Add", "(System.String)", "", "Argument[0]", "Argument[this].Property[System.Collections.CollectionBase.List].Element", "value", "dfc-generated"]
+      - ["System.DirectoryServices.Protocols", "DirectoryAttribute", False, "Add", "(System.Uri)", "", "Argument[0]", "Argument[this].Property[System.Collections.CollectionBase.List].Element", "value", "dfc-generated"]
+      - ["System.DirectoryServices.Protocols", "DirectoryAttribute", False, "AddRange", "(System.Object[])", "", "Argument[0].Element", "Argument[this].Property[System.Collections.CollectionBase.InnerList].Element", "value", "dfc-generated"]
+      - ["System.DirectoryServices.Protocols", "DirectoryAttribute", False, "CopyTo", "(System.Object[],System.Int32)", "", "Argument[this].Property[System.Collections.CollectionBase.List].Element", "Argument[0].Element", "value", "dfc-generated"]
+      - ["System.DirectoryServices.Protocols", "DirectoryAttribute", False, "DirectoryAttribute", "(System.String,System.Object[])", "", "Argument[1].Element", "Argument[this].Property[System.Collections.CollectionBase.List].Element", "value", "dfc-generated"]
+      - ["System.DirectoryServices.Protocols", "DirectoryAttribute", False, "GetValues", "(System.Type)", "", "Argument[this].Property[System.Collections.CollectionBase.List].Element", "ReturnValue.Element", "value", "dfc-generated"]
+      - ["System.DirectoryServices.Protocols", "DirectoryAttribute", False, "Insert", "(System.Int32,System.Byte[])", "", "Argument[1]", "Argument[this].Property[System.Collections.CollectionBase.List].Element", "value", "dfc-generated"]
+      - ["System.DirectoryServices.Protocols", "DirectoryAttribute", False, "Insert", "(System.Int32,System.String)", "", "Argument[1]", "Argument[this].Property[System.Collections.CollectionBase.List].Element", "value", "dfc-generated"]
+      - ["System.DirectoryServices.Protocols", "DirectoryAttribute", False, "Insert", "(System.Int32,System.Uri)", "", "Argument[1]", "Argument[this].Property[System.Collections.CollectionBase.List].Element", "value", "dfc-generated"]
+      - ["System.DirectoryServices.Protocols", "DirectoryAttribute", False, "get_Item", "(System.Int32)", "", "Argument[this].Property[System.Collections.CollectionBase.List].Element", "ReturnValue", "value", "dfc-generated"]
+      - ["System.DirectoryServices.Protocols", "DirectoryAttribute", False, "set_Item", "(System.Int32,System.Object)", "", "Argument[1]", "Argument[this].Property[System.Collections.CollectionBase.List].Element", "value", "dfc-generated"]
+      - ["System.DirectoryServices.Protocols", "DirectoryAttributeCollection", False, "Add", "(System.DirectoryServices.Protocols.DirectoryAttribute)", "", "Argument[0]", "Argument[this].Property[System.Collections.CollectionBase.List].Element", "value", "dfc-generated"]
+      - ["System.DirectoryServices.Protocols", "DirectoryAttributeCollection", False, "AddRange", "(System.DirectoryServices.Protocols.DirectoryAttributeCollection)", "", "Argument[0].Property[System.Collections.CollectionBase.List].Element", "Argument[this].Property[System.Collections.CollectionBase.List].Element", "value", "dfc-generated"]
+      - ["System.DirectoryServices.Protocols", "DirectoryAttributeCollection", False, "AddRange", "(System.DirectoryServices.Protocols.DirectoryAttribute[])", "", "Argument[0].Element", "Argument[this].Property[System.Collections.CollectionBase.InnerList].Element", "value", "dfc-generated"]
+      - ["System.DirectoryServices.Protocols", "DirectoryAttributeCollection", False, "CopyTo", "(System.DirectoryServices.Protocols.DirectoryAttribute[],System.Int32)", "", "Argument[this].Property[System.Collections.CollectionBase.List].Element", "Argument[0].Element", "value", "dfc-generated"]
+      - ["System.DirectoryServices.Protocols", "DirectoryAttributeCollection", False, "Insert", "(System.Int32,System.DirectoryServices.Protocols.DirectoryAttribute)", "", "Argument[1]", "Argument[this].Property[System.Collections.CollectionBase.List].Element", "value", "dfc-generated"]
+      - ["System.DirectoryServices.Protocols", "DirectoryAttributeCollection", False, "get_Item", "(System.Int32)", "", "Argument[this].Property[System.Collections.CollectionBase.List].Element", "ReturnValue", "value", "dfc-generated"]
+      - ["System.DirectoryServices.Protocols", "DirectoryAttributeCollection", False, "set_Item", "(System.Int32,System.DirectoryServices.Protocols.DirectoryAttribute)", "", "Argument[1]", "Argument[this].Property[System.Collections.CollectionBase.List].Element", "value", "dfc-generated"]
+      - ["System.DirectoryServices.Protocols", "DirectoryAttributeModificationCollection", False, "Add", "(System.DirectoryServices.Protocols.DirectoryAttributeModification)", "", "Argument[0]", "Argument[this].Property[System.Collections.CollectionBase.List].Element", "value", "dfc-generated"]
+      - ["System.DirectoryServices.Protocols", "DirectoryAttributeModificationCollection", False, "AddRange", "(System.DirectoryServices.Protocols.DirectoryAttributeModificationCollection)", "", "Argument[0].Property[System.Collections.CollectionBase.List].Element", "Argument[this].Property[System.Collections.CollectionBase.List].Element", "value", "dfc-generated"]
+      - ["System.DirectoryServices.Protocols", "DirectoryAttributeModificationCollection", False, "AddRange", "(System.DirectoryServices.Protocols.DirectoryAttributeModification[])", "", "Argument[0].Element", "Argument[this].Property[System.Collections.CollectionBase.InnerList].Element", "value", "dfc-generated"]
+      - ["System.DirectoryServices.Protocols", "DirectoryAttributeModificationCollection", False, "CopyTo", "(System.DirectoryServices.Protocols.DirectoryAttributeModification[],System.Int32)", "", "Argument[this].Property[System.Collections.CollectionBase.List].Element", "Argument[0].Element", "value", "dfc-generated"]
+      - ["System.DirectoryServices.Protocols", "DirectoryAttributeModificationCollection", False, "Insert", "(System.Int32,System.DirectoryServices.Protocols.DirectoryAttributeModification)", "", "Argument[1]", "Argument[this].Property[System.Collections.CollectionBase.List].Element", "value", "dfc-generated"]
+      - ["System.DirectoryServices.Protocols", "DirectoryAttributeModificationCollection", False, "get_Item", "(System.Int32)", "", "Argument[this].Property[System.Collections.CollectionBase.List].Element", "ReturnValue", "value", "dfc-generated"]
+      - ["System.DirectoryServices.Protocols", "DirectoryAttributeModificationCollection", False, "set_Item", "(System.Int32,System.DirectoryServices.Protocols.DirectoryAttributeModification)", "", "Argument[1]", "Argument[this].Property[System.Collections.CollectionBase.List].Element", "value", "dfc-generated"]
       - ["System.DirectoryServices.Protocols", "DirectoryConnection", False, "get_ClientCertificates", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.DirectoryServices.Protocols", "DirectoryConnection", True, "get_Directory", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.DirectoryServices.Protocols", "DirectoryConnection", True, "set_Credential", "(System.Net.NetworkCredential)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.DirectoryServices.Protocols", "DirectoryControlCollection", False, "Add", "(System.DirectoryServices.Protocols.DirectoryControl)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.DirectoryServices.Protocols", "DirectoryControlCollection", False, "AddRange", "(System.DirectoryServices.Protocols.DirectoryControlCollection)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["System.DirectoryServices.Protocols", "DirectoryControlCollection", False, "AddRange", "(System.DirectoryServices.Protocols.DirectoryControl[])", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["System.DirectoryServices.Protocols", "DirectoryControlCollection", False, "CopyTo", "(System.DirectoryServices.Protocols.DirectoryControl[],System.Int32)", "", "Argument[this]", "Argument[0].Element", "taint", "df-generated"]
-      - ["System.DirectoryServices.Protocols", "DirectoryControlCollection", False, "Insert", "(System.Int32,System.DirectoryServices.Protocols.DirectoryControl)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["System.DirectoryServices.Protocols", "DirectoryControlCollection", False, "Remove", "(System.DirectoryServices.Protocols.DirectoryControl)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.DirectoryServices.Protocols", "DirectoryControlCollection", False, "get_Item", "(System.Int32)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.DirectoryServices.Protocols", "DirectoryControlCollection", False, "set_Item", "(System.Int32,System.DirectoryServices.Protocols.DirectoryControl)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["System.DirectoryServices.Protocols", "DirectoryConnection", True, "get_Directory", "()", "", "Argument[this].SyntheticField[System.DirectoryServices.Protocols.DirectoryConnection._directoryIdentifier]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.DirectoryServices.Protocols", "DirectoryControlCollection", False, "Add", "(System.DirectoryServices.Protocols.DirectoryControl)", "", "Argument[0]", "Argument[this].Property[System.Collections.CollectionBase.List].Element", "value", "dfc-generated"]
+      - ["System.DirectoryServices.Protocols", "DirectoryControlCollection", False, "AddRange", "(System.DirectoryServices.Protocols.DirectoryControlCollection)", "", "Argument[0].Property[System.Collections.CollectionBase.List].Element", "Argument[this].Property[System.Collections.CollectionBase.List].Element", "value", "dfc-generated"]
+      - ["System.DirectoryServices.Protocols", "DirectoryControlCollection", False, "AddRange", "(System.DirectoryServices.Protocols.DirectoryControl[])", "", "Argument[0].Element", "Argument[this].Property[System.Collections.CollectionBase.InnerList].Element", "value", "dfc-generated"]
+      - ["System.DirectoryServices.Protocols", "DirectoryControlCollection", False, "CopyTo", "(System.DirectoryServices.Protocols.DirectoryControl[],System.Int32)", "", "Argument[this].Property[System.Collections.CollectionBase.List].Element", "Argument[0].Element", "value", "dfc-generated"]
+      - ["System.DirectoryServices.Protocols", "DirectoryControlCollection", False, "Insert", "(System.Int32,System.DirectoryServices.Protocols.DirectoryControl)", "", "Argument[1]", "Argument[this].Property[System.Collections.CollectionBase.List].Element", "value", "dfc-generated"]
+      - ["System.DirectoryServices.Protocols", "DirectoryControlCollection", False, "get_Item", "(System.Int32)", "", "Argument[this].Property[System.Collections.CollectionBase.List].Element", "ReturnValue", "value", "dfc-generated"]
+      - ["System.DirectoryServices.Protocols", "DirectoryControlCollection", False, "set_Item", "(System.Int32,System.DirectoryServices.Protocols.DirectoryControl)", "", "Argument[1]", "Argument[this].Property[System.Collections.CollectionBase.List].Element", "value", "dfc-generated"]
       - ["System.DirectoryServices.Protocols", "DirectoryResponse", True, "get_Referral", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.DirectoryServices.Protocols", "ExtendedRequest", False, "ExtendedRequest", "(System.String,System.Byte[])", "", "Argument[1].Element", "Argument[this]", "taint", "df-generated"]
-      - ["System.DirectoryServices.Protocols", "LdapConnection", False, "Bind", "(System.Net.NetworkCredential)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["System.DirectoryServices.Protocols", "LdapConnection", False, "BeginSendRequest", "(System.DirectoryServices.Protocols.DirectoryRequest,System.TimeSpan,System.DirectoryServices.Protocols.PartialResultProcessing,System.AsyncCallback,System.Object)", "", "Argument[4]", "ReturnValue.SyntheticField[System.DirectoryServices.Protocols.LdapAsyncResult._stateObject]", "value", "dfc-generated"]
       - ["System.DirectoryServices.Protocols", "LdapConnection", False, "EndSendRequest", "(System.IAsyncResult)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["System.DirectoryServices.Protocols", "LdapConnection", False, "GetPartialResults", "(System.IAsyncResult)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.DirectoryServices.Protocols", "LdapConnection", False, "LdapConnection", "(System.DirectoryServices.Protocols.LdapDirectoryIdentifier,System.Net.NetworkCredential,System.DirectoryServices.Protocols.AuthType)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.DirectoryServices.Protocols", "LdapConnection", False, "LdapConnection", "(System.DirectoryServices.Protocols.LdapDirectoryIdentifier,System.Net.NetworkCredential,System.DirectoryServices.Protocols.AuthType)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["System.DirectoryServices.Protocols", "LdapDirectoryIdentifier", False, "LdapDirectoryIdentifier", "(System.String[],System.Boolean,System.Boolean)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["System.DirectoryServices.Protocols", "LdapDirectoryIdentifier", False, "get_Servers", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.DirectoryServices.Protocols", "LdapConnection", False, "LdapConnection", "(System.DirectoryServices.Protocols.LdapDirectoryIdentifier,System.Net.NetworkCredential,System.DirectoryServices.Protocols.AuthType)", "", "Argument[0]", "Argument[this].SyntheticField[System.DirectoryServices.Protocols.DirectoryConnection._directoryIdentifier]", "value", "dfc-generated"]
+      - ["System.DirectoryServices.Protocols", "LdapDirectoryIdentifier", False, "LdapDirectoryIdentifier", "(System.String[],System.Boolean,System.Boolean)", "", "Argument[0].Element", "Argument[this].SyntheticField[System.DirectoryServices.Protocols.LdapDirectoryIdentifier._servers].Element", "taint", "dfc-generated"]
+      - ["System.DirectoryServices.Protocols", "LdapDirectoryIdentifier", False, "get_Servers", "()", "", "Argument[this].SyntheticField[System.DirectoryServices.Protocols.LdapDirectoryIdentifier._servers].Element", "ReturnValue.Element", "value", "dfc-generated"]
       - ["System.DirectoryServices.Protocols", "PageResultRequestControl", False, "PageResultRequestControl", "(System.Byte[])", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["System.DirectoryServices.Protocols", "PartialResultsCollection", False, "CopyTo", "(System.Object[],System.Int32)", "", "Argument[this]", "Argument[0].Element", "taint", "df-generated"]
-      - ["System.DirectoryServices.Protocols", "PartialResultsCollection", False, "get_Item", "(System.Int32)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.DirectoryServices.Protocols", "SearchRequest", False, "SearchRequest", "(System.String,System.String,System.DirectoryServices.Protocols.SearchScope,System.String[])", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["System.DirectoryServices.Protocols", "SearchRequest", False, "SearchRequest", "(System.String,System.String,System.DirectoryServices.Protocols.SearchScope,System.String[])", "", "Argument[3].Element", "Argument[this]", "taint", "df-generated"]
+      - ["System.DirectoryServices.Protocols", "PartialResultsCollection", False, "CopyTo", "(System.Object[],System.Int32)", "", "Argument[this].Property[System.Collections.ReadOnlyCollectionBase.InnerList].Element", "Argument[0].Element", "value", "dfc-generated"]
+      - ["System.DirectoryServices.Protocols", "PartialResultsCollection", False, "get_Item", "(System.Int32)", "", "Argument[this].Property[System.Collections.ReadOnlyCollectionBase.InnerList].Element", "ReturnValue", "value", "dfc-generated"]
+      - ["System.DirectoryServices.Protocols", "SearchRequest", False, "SearchRequest", "(System.String,System.String,System.DirectoryServices.Protocols.SearchScope,System.String[])", "", "Argument[3].Element", "Argument[this].Property[System.DirectoryServices.Protocols.SearchRequest.Attributes].Element", "value", "dfc-generated"]
       - ["System.DirectoryServices.Protocols", "SearchResultAttributeCollection", False, "CopyTo", "(System.DirectoryServices.Protocols.DirectoryAttribute[],System.Int32)", "", "Argument[this]", "Argument[0].Element", "taint", "df-generated"]
-      - ["System.DirectoryServices.Protocols", "SearchResultAttributeCollection", False, "get_AttributeNames", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.DirectoryServices.Protocols", "SearchResultAttributeCollection", False, "get_AttributeNames", "()", "", "Argument[this].Property[System.Collections.DictionaryBase.Dictionary].Property[System.Collections.IDictionary.Keys]", "ReturnValue", "value", "dfc-generated"]
       - ["System.DirectoryServices.Protocols", "SearchResultAttributeCollection", False, "get_Item", "(System.String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.DirectoryServices.Protocols", "SearchResultAttributeCollection", False, "get_Values", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.DirectoryServices.Protocols", "SearchResultEntryCollection", False, "CopyTo", "(System.DirectoryServices.Protocols.SearchResultEntry[],System.Int32)", "", "Argument[this]", "Argument[0].Element", "taint", "df-generated"]
-      - ["System.DirectoryServices.Protocols", "SearchResultEntryCollection", False, "get_Item", "(System.Int32)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.DirectoryServices.Protocols", "SearchResultAttributeCollection", False, "get_Values", "()", "", "Argument[this].Property[System.Collections.DictionaryBase.Dictionary].Property[System.Collections.IDictionary.Values]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.DirectoryServices.Protocols", "SearchResultEntryCollection", False, "CopyTo", "(System.DirectoryServices.Protocols.SearchResultEntry[],System.Int32)", "", "Argument[this].Property[System.Collections.ReadOnlyCollectionBase.InnerList].Element", "Argument[0].Element", "value", "dfc-generated"]
+      - ["System.DirectoryServices.Protocols", "SearchResultEntryCollection", False, "get_Item", "(System.Int32)", "", "Argument[this].Property[System.Collections.ReadOnlyCollectionBase.InnerList].Element", "ReturnValue", "value", "dfc-generated"]
       - ["System.DirectoryServices.Protocols", "SearchResultReference", False, "get_Reference", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.DirectoryServices.Protocols", "SearchResultReferenceCollection", False, "CopyTo", "(System.DirectoryServices.Protocols.SearchResultReference[],System.Int32)", "", "Argument[this]", "Argument[0].Element", "taint", "df-generated"]
-      - ["System.DirectoryServices.Protocols", "SearchResultReferenceCollection", False, "get_Item", "(System.Int32)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.DirectoryServices.Protocols", "SearchResultReferenceCollection", False, "CopyTo", "(System.DirectoryServices.Protocols.SearchResultReference[],System.Int32)", "", "Argument[this].Property[System.Collections.ReadOnlyCollectionBase.InnerList].Element", "Argument[0].Element", "value", "dfc-generated"]
+      - ["System.DirectoryServices.Protocols", "SearchResultReferenceCollection", False, "get_Item", "(System.Int32)", "", "Argument[this].Property[System.Collections.ReadOnlyCollectionBase.InnerList].Element", "ReturnValue", "value", "dfc-generated"]
       - ["System.DirectoryServices.Protocols", "SortKey", False, "SortKey", "(System.String,System.String,System.Boolean)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.DirectoryServices.Protocols", "SortKey", False, "SortKey", "(System.String,System.String,System.Boolean)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
       - ["System.DirectoryServices.Protocols", "VerifyNameControl", False, "VerifyNameControl", "(System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
@@ -90,6 +74,7 @@ extensions:
       pack: codeql/csharp-all
       extensible: neutralModel
     data:
+      - ["System.DirectoryServices.Protocols", "AddRequest", "AddRequest", "(System.String,System.DirectoryServices.Protocols.DirectoryAttribute[])", "summary", "df-generated"]
       - ["System.DirectoryServices.Protocols", "AddRequest", "AddRequest", "(System.String,System.String)", "summary", "df-generated"]
       - ["System.DirectoryServices.Protocols", "AddRequest", "get_Attributes", "()", "summary", "df-generated"]
       - ["System.DirectoryServices.Protocols", "AsqRequestControl", "AsqRequestControl", "(System.String)", "summary", "df-generated"]
@@ -116,19 +101,24 @@ extensions:
       - ["System.DirectoryServices.Protocols", "DirectoryAttribute", "DirectoryAttribute", "(System.String,System.Uri)", "summary", "df-generated"]
       - ["System.DirectoryServices.Protocols", "DirectoryAttribute", "IndexOf", "(System.Object)", "summary", "df-generated"]
       - ["System.DirectoryServices.Protocols", "DirectoryAttribute", "OnValidate", "(System.Object)", "summary", "df-generated"]
+      - ["System.DirectoryServices.Protocols", "DirectoryAttribute", "Remove", "(System.Object)", "summary", "df-generated"]
       - ["System.DirectoryServices.Protocols", "DirectoryAttributeCollection", "Contains", "(System.DirectoryServices.Protocols.DirectoryAttribute)", "summary", "df-generated"]
       - ["System.DirectoryServices.Protocols", "DirectoryAttributeCollection", "IndexOf", "(System.DirectoryServices.Protocols.DirectoryAttribute)", "summary", "df-generated"]
       - ["System.DirectoryServices.Protocols", "DirectoryAttributeCollection", "OnValidate", "(System.Object)", "summary", "df-generated"]
+      - ["System.DirectoryServices.Protocols", "DirectoryAttributeCollection", "Remove", "(System.DirectoryServices.Protocols.DirectoryAttribute)", "summary", "df-generated"]
       - ["System.DirectoryServices.Protocols", "DirectoryAttributeModificationCollection", "Contains", "(System.DirectoryServices.Protocols.DirectoryAttributeModification)", "summary", "df-generated"]
       - ["System.DirectoryServices.Protocols", "DirectoryAttributeModificationCollection", "IndexOf", "(System.DirectoryServices.Protocols.DirectoryAttributeModification)", "summary", "df-generated"]
       - ["System.DirectoryServices.Protocols", "DirectoryAttributeModificationCollection", "OnValidate", "(System.Object)", "summary", "df-generated"]
+      - ["System.DirectoryServices.Protocols", "DirectoryAttributeModificationCollection", "Remove", "(System.DirectoryServices.Protocols.DirectoryAttributeModification)", "summary", "df-generated"]
       - ["System.DirectoryServices.Protocols", "DirectoryConnection", "SendRequest", "(System.DirectoryServices.Protocols.DirectoryRequest)", "summary", "df-generated"]
+      - ["System.DirectoryServices.Protocols", "DirectoryConnection", "set_Credential", "(System.Net.NetworkCredential)", "summary", "df-generated"]
       - ["System.DirectoryServices.Protocols", "DirectoryControl", "DirectoryControl", "(System.String,System.Byte[],System.Boolean,System.Boolean)", "summary", "df-generated"]
       - ["System.DirectoryServices.Protocols", "DirectoryControl", "GetValue", "()", "summary", "df-generated"]
       - ["System.DirectoryServices.Protocols", "DirectoryControl", "get_Type", "()", "summary", "df-generated"]
       - ["System.DirectoryServices.Protocols", "DirectoryControlCollection", "Contains", "(System.DirectoryServices.Protocols.DirectoryControl)", "summary", "df-generated"]
       - ["System.DirectoryServices.Protocols", "DirectoryControlCollection", "IndexOf", "(System.DirectoryServices.Protocols.DirectoryControl)", "summary", "df-generated"]
       - ["System.DirectoryServices.Protocols", "DirectoryControlCollection", "OnValidate", "(System.Object)", "summary", "df-generated"]
+      - ["System.DirectoryServices.Protocols", "DirectoryControlCollection", "Remove", "(System.DirectoryServices.Protocols.DirectoryControl)", "summary", "df-generated"]
       - ["System.DirectoryServices.Protocols", "DirectoryException", "DirectoryException", "(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)", "summary", "df-generated"]
       - ["System.DirectoryServices.Protocols", "DirectoryException", "DirectoryException", "(System.String)", "summary", "df-generated"]
       - ["System.DirectoryServices.Protocols", "DirectoryException", "DirectoryException", "(System.String,System.Exception)", "summary", "df-generated"]
@@ -149,7 +139,9 @@ extensions:
       - ["System.DirectoryServices.Protocols", "ExtendedDNControl", "GetValue", "()", "summary", "df-generated"]
       - ["System.DirectoryServices.Protocols", "ExtendedRequest", "ExtendedRequest", "(System.String)", "summary", "df-generated"]
       - ["System.DirectoryServices.Protocols", "LdapConnection", "Abort", "(System.IAsyncResult)", "summary", "df-generated"]
+      - ["System.DirectoryServices.Protocols", "LdapConnection", "BeginSendRequest", "(System.DirectoryServices.Protocols.DirectoryRequest,System.DirectoryServices.Protocols.PartialResultProcessing,System.AsyncCallback,System.Object)", "summary", "df-generated"]
       - ["System.DirectoryServices.Protocols", "LdapConnection", "Bind", "()", "summary", "df-generated"]
+      - ["System.DirectoryServices.Protocols", "LdapConnection", "Bind", "(System.Net.NetworkCredential)", "summary", "df-generated"]
       - ["System.DirectoryServices.Protocols", "LdapConnection", "Dispose", "()", "summary", "df-generated"]
       - ["System.DirectoryServices.Protocols", "LdapConnection", "Dispose", "(System.Boolean)", "summary", "df-generated"]
       - ["System.DirectoryServices.Protocols", "LdapConnection", "LdapConnection", "(System.DirectoryServices.Protocols.LdapDirectoryIdentifier)", "summary", "df-generated"]
@@ -158,6 +150,7 @@ extensions:
       - ["System.DirectoryServices.Protocols", "LdapConnection", "SendRequest", "(System.DirectoryServices.Protocols.DirectoryRequest)", "summary", "df-generated"]
       - ["System.DirectoryServices.Protocols", "LdapConnection", "SendRequest", "(System.DirectoryServices.Protocols.DirectoryRequest,System.TimeSpan)", "summary", "df-generated"]
       - ["System.DirectoryServices.Protocols", "LdapConnection", "get_SessionOptions", "()", "summary", "df-generated"]
+      - ["System.DirectoryServices.Protocols", "LdapConnection", "set_Credential", "(System.Net.NetworkCredential)", "summary", "df-generated"]
       - ["System.DirectoryServices.Protocols", "LdapDirectoryIdentifier", "LdapDirectoryIdentifier", "(System.String)", "summary", "df-generated"]
       - ["System.DirectoryServices.Protocols", "LdapDirectoryIdentifier", "LdapDirectoryIdentifier", "(System.String,System.Boolean,System.Boolean)", "summary", "df-generated"]
       - ["System.DirectoryServices.Protocols", "LdapDirectoryIdentifier", "LdapDirectoryIdentifier", "(System.String,System.Int32)", "summary", "df-generated"]
diff --git a/csharp/ql/lib/ext/generated/System.DirectoryServices.model.yml b/csharp/ql/lib/ext/generated/System.DirectoryServices.model.yml
index 7dec3728229..596f2447cf8 100644
--- a/csharp/ql/lib/ext/generated/System.DirectoryServices.model.yml
+++ b/csharp/ql/lib/ext/generated/System.DirectoryServices.model.yml
@@ -207,6 +207,7 @@ extensions:
       - ["System.DirectoryServices", "SchemaNameCollection", "IndexOf", "(System.Object)", "summary", "df-generated"]
       - ["System.DirectoryServices", "SchemaNameCollection", "IndexOf", "(System.String)", "summary", "df-generated"]
       - ["System.DirectoryServices", "SchemaNameCollection", "Insert", "(System.Int32,System.String)", "summary", "df-generated"]
+      - ["System.DirectoryServices", "SchemaNameCollection", "Remove", "(System.Object)", "summary", "df-generated"]
       - ["System.DirectoryServices", "SchemaNameCollection", "Remove", "(System.String)", "summary", "df-generated"]
       - ["System.DirectoryServices", "SchemaNameCollection", "RemoveAt", "(System.Int32)", "summary", "df-generated"]
       - ["System.DirectoryServices", "SchemaNameCollection", "get_Count", "()", "summary", "df-generated"]
diff --git a/csharp/ql/lib/ext/generated/System.Drawing.model.yml b/csharp/ql/lib/ext/generated/System.Drawing.model.yml
index 1671ac56f23..b4ee8e5e206 100644
--- a/csharp/ql/lib/ext/generated/System.Drawing.model.yml
+++ b/csharp/ql/lib/ext/generated/System.Drawing.model.yml
@@ -4,13 +4,19 @@ extensions:
       pack: codeql/csharp-all
       extensible: summaryModel
     data:
-      - ["System.Drawing", "Color", False, "FromName", "(System.String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Drawing", "Color", False, "ToString", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Drawing", "Color", False, "get_Name", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Drawing", "ColorTranslator", False, "FromHtml", "(System.String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Drawing", "ColorTranslator", False, "ToHtml", "(System.Drawing.Color)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Drawing", "Rectangle", False, "Inflate", "(System.Drawing.Rectangle,System.Int32,System.Int32)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Drawing", "RectangleF", False, "Inflate", "(System.Drawing.RectangleF,System.Single,System.Single)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Drawing", "Color", False, "FromName", "(System.String)", "", "Argument[0]", "ReturnValue.SyntheticField[System.Drawing.Color.name]", "value", "dfc-generated"]
+      - ["System.Drawing", "Color", False, "ToString", "()", "", "Argument[this].Property[System.Drawing.Color.Name]", "ReturnValue", "taint", "dfc-generated"]
+      - ["System.Drawing", "Color", False, "ToString", "()", "", "Argument[this].SyntheticField[System.Drawing.Color.name]", "ReturnValue", "taint", "dfc-generated"]
+      - ["System.Drawing", "Color", False, "get_Name", "()", "", "Argument[this].SyntheticField[System.Drawing.Color.name]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Drawing", "ColorConverter", True, "ConvertTo", "(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type)", "", "Argument[1].Property[System.Globalization.CultureInfo.TextInfo].Property[System.Globalization.TextInfo.ListSeparator]", "ReturnValue", "taint", "dfc-generated"]
+      - ["System.Drawing", "ColorTranslator", False, "ToHtml", "(System.Drawing.Color)", "", "Argument[0].Property[System.Drawing.Color.Name]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Drawing", "ColorTranslator", False, "ToHtml", "(System.Drawing.Color)", "", "Argument[0].SyntheticField[System.Drawing.Color.name]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Drawing", "PointConverter", True, "ConvertTo", "(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type)", "", "Argument[1].Property[System.Globalization.CultureInfo.TextInfo].Property[System.Globalization.TextInfo.ListSeparator]", "ReturnValue", "taint", "dfc-generated"]
+      - ["System.Drawing", "Rectangle", False, "Inflate", "(System.Drawing.Rectangle,System.Int32,System.Int32)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Drawing", "RectangleConverter", True, "ConvertTo", "(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type)", "", "Argument[1].Property[System.Globalization.CultureInfo.TextInfo].Property[System.Globalization.TextInfo.ListSeparator]", "ReturnValue", "taint", "dfc-generated"]
+      - ["System.Drawing", "RectangleF", False, "Inflate", "(System.Drawing.RectangleF,System.Single,System.Single)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Drawing", "SizeConverter", True, "ConvertTo", "(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type)", "", "Argument[1].Property[System.Globalization.CultureInfo.TextInfo].Property[System.Globalization.TextInfo.ListSeparator]", "ReturnValue", "taint", "dfc-generated"]
+      - ["System.Drawing", "SizeFConverter", True, "ConvertTo", "(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type)", "", "Argument[1].Property[System.Globalization.CultureInfo.TextInfo].Property[System.Globalization.TextInfo.ListSeparator]", "ReturnValue", "taint", "dfc-generated"]
   - addsTo:
       pack: codeql/csharp-all
       extensible: neutralModel
@@ -183,6 +189,7 @@ extensions:
       - ["System.Drawing", "ColorConverter", "CanConvertFrom", "(System.ComponentModel.ITypeDescriptorContext,System.Type)", "summary", "df-generated"]
       - ["System.Drawing", "ColorConverter", "CanConvertTo", "(System.ComponentModel.ITypeDescriptorContext,System.Type)", "summary", "df-generated"]
       - ["System.Drawing", "ColorConverter", "GetStandardValuesSupported", "(System.ComponentModel.ITypeDescriptorContext)", "summary", "df-generated"]
+      - ["System.Drawing", "ColorTranslator", "FromHtml", "(System.String)", "summary", "df-generated"]
       - ["System.Drawing", "ColorTranslator", "FromOle", "(System.Int32)", "summary", "df-generated"]
       - ["System.Drawing", "ColorTranslator", "FromWin32", "(System.Int32)", "summary", "df-generated"]
       - ["System.Drawing", "ColorTranslator", "ToOle", "(System.Drawing.Color)", "summary", "df-generated"]
diff --git a/csharp/ql/lib/ext/generated/System.Dynamic.model.yml b/csharp/ql/lib/ext/generated/System.Dynamic.model.yml
index d8d5e2e0cd2..f12000d073a 100644
--- a/csharp/ql/lib/ext/generated/System.Dynamic.model.yml
+++ b/csharp/ql/lib/ext/generated/System.Dynamic.model.yml
@@ -4,26 +4,27 @@ extensions:
       pack: codeql/csharp-all
       extensible: summaryModel
     data:
-      - ["System.Dynamic", "BinaryOperationBinder", True, "FallbackBinaryOperation", "(System.Dynamic.DynamicMetaObject,System.Dynamic.DynamicMetaObject,System.Dynamic.DynamicMetaObject)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Dynamic", "BinaryOperationBinder", True, "FallbackBinaryOperation", "(System.Dynamic.DynamicMetaObject,System.Dynamic.DynamicMetaObject,System.Dynamic.DynamicMetaObject)", "", "Argument[2]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Dynamic", "BindingRestrictions", False, "Combine", "(System.Collections.Generic.IList<System.Dynamic.DynamicMetaObject>)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
       - ["System.Dynamic", "BindingRestrictions", False, "GetExpressionRestriction", "(System.Linq.Expressions.Expression)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["System.Dynamic", "BindingRestrictions", False, "GetInstanceRestriction", "(System.Linq.Expressions.Expression,System.Object)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["System.Dynamic", "BindingRestrictions", False, "GetInstanceRestriction", "(System.Linq.Expressions.Expression,System.Object)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
       - ["System.Dynamic", "BindingRestrictions", False, "GetTypeRestriction", "(System.Linq.Expressions.Expression,System.Type)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Dynamic", "BindingRestrictions", False, "Merge", "(System.Dynamic.BindingRestrictions)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["System.Dynamic", "BindingRestrictions", False, "Merge", "(System.Dynamic.BindingRestrictions)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Dynamic", "BindingRestrictions", False, "Merge", "(System.Dynamic.BindingRestrictions)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Dynamic", "BindingRestrictions", False, "ToExpression", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Dynamic", "ConvertBinder", True, "FallbackConvert", "(System.Dynamic.DynamicMetaObject,System.Dynamic.DynamicMetaObject)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Dynamic", "DynamicMetaObject", False, "Create", "(System.Object,System.Linq.Expressions.Expression)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Dynamic", "DynamicMetaObject", False, "DynamicMetaObject", "(System.Linq.Expressions.Expression,System.Dynamic.BindingRestrictions,System.Object)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Dynamic", "DynamicMetaObject", False, "get_Value", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Dynamic", "ConvertBinder", True, "FallbackConvert", "(System.Dynamic.DynamicMetaObject,System.Dynamic.DynamicMetaObject)", "", "Argument[1]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Dynamic", "DynamicMetaObject", False, "Create", "(System.Object,System.Linq.Expressions.Expression)", "", "Argument[0]", "ReturnValue.SyntheticField[System.Dynamic.DynamicMetaObject._value]", "value", "dfc-generated"]
+      - ["System.Dynamic", "DynamicMetaObject", False, "DynamicMetaObject", "(System.Linq.Expressions.Expression,System.Dynamic.BindingRestrictions,System.Object)", "", "Argument[2]", "Argument[this].SyntheticField[System.Dynamic.DynamicMetaObject._value]", "value", "dfc-generated"]
+      - ["System.Dynamic", "DynamicMetaObject", False, "get_Value", "()", "", "Argument[this].SyntheticField[System.Dynamic.DynamicMetaObject._value]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Dynamic", "ExpandoObject", False, "TryGetValue", "(System.String,System.Object)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Dynamic", "GetIndexBinder", True, "FallbackGetIndex", "(System.Dynamic.DynamicMetaObject,System.Dynamic.DynamicMetaObject[],System.Dynamic.DynamicMetaObject)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Dynamic", "GetMemberBinder", True, "FallbackGetMember", "(System.Dynamic.DynamicMetaObject,System.Dynamic.DynamicMetaObject)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Dynamic", "InvokeBinder", True, "FallbackInvoke", "(System.Dynamic.DynamicMetaObject,System.Dynamic.DynamicMetaObject[],System.Dynamic.DynamicMetaObject)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Dynamic", "InvokeMemberBinder", True, "FallbackInvokeMember", "(System.Dynamic.DynamicMetaObject,System.Dynamic.DynamicMetaObject[],System.Dynamic.DynamicMetaObject)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Dynamic", "SetIndexBinder", True, "FallbackSetIndex", "(System.Dynamic.DynamicMetaObject,System.Dynamic.DynamicMetaObject[],System.Dynamic.DynamicMetaObject,System.Dynamic.DynamicMetaObject)", "", "Argument[3]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Dynamic", "SetMemberBinder", True, "FallbackSetMember", "(System.Dynamic.DynamicMetaObject,System.Dynamic.DynamicMetaObject,System.Dynamic.DynamicMetaObject)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Dynamic", "UnaryOperationBinder", True, "FallbackUnaryOperation", "(System.Dynamic.DynamicMetaObject,System.Dynamic.DynamicMetaObject)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Dynamic", "GetIndexBinder", True, "FallbackGetIndex", "(System.Dynamic.DynamicMetaObject,System.Dynamic.DynamicMetaObject[],System.Dynamic.DynamicMetaObject)", "", "Argument[2]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Dynamic", "GetMemberBinder", True, "FallbackGetMember", "(System.Dynamic.DynamicMetaObject,System.Dynamic.DynamicMetaObject)", "", "Argument[1]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Dynamic", "InvokeBinder", True, "FallbackInvoke", "(System.Dynamic.DynamicMetaObject,System.Dynamic.DynamicMetaObject[],System.Dynamic.DynamicMetaObject)", "", "Argument[2]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Dynamic", "InvokeMemberBinder", True, "FallbackInvokeMember", "(System.Dynamic.DynamicMetaObject,System.Dynamic.DynamicMetaObject[],System.Dynamic.DynamicMetaObject)", "", "Argument[2]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Dynamic", "SetIndexBinder", True, "FallbackSetIndex", "(System.Dynamic.DynamicMetaObject,System.Dynamic.DynamicMetaObject[],System.Dynamic.DynamicMetaObject,System.Dynamic.DynamicMetaObject)", "", "Argument[3]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Dynamic", "SetMemberBinder", True, "FallbackSetMember", "(System.Dynamic.DynamicMetaObject,System.Dynamic.DynamicMetaObject,System.Dynamic.DynamicMetaObject)", "", "Argument[2]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Dynamic", "UnaryOperationBinder", True, "FallbackUnaryOperation", "(System.Dynamic.DynamicMetaObject,System.Dynamic.DynamicMetaObject)", "", "Argument[1]", "ReturnValue", "value", "dfc-generated"]
   - addsTo:
       pack: codeql/csharp-all
       extensible: neutralModel
@@ -108,8 +109,10 @@ extensions:
       - ["System.Dynamic", "ExpandoObject", "GetMetaObject", "(System.Linq.Expressions.Expression)", "summary", "df-generated"]
       - ["System.Dynamic", "ExpandoObject", "Remove", "(System.Collections.Generic.KeyValuePair<System.String,System.Object>)", "summary", "df-generated"]
       - ["System.Dynamic", "ExpandoObject", "Remove", "(System.String)", "summary", "df-generated"]
+      - ["System.Dynamic", "ExpandoObject", "add_PropertyChanged", "(System.ComponentModel.PropertyChangedEventHandler)", "summary", "df-generated"]
       - ["System.Dynamic", "ExpandoObject", "get_Count", "()", "summary", "df-generated"]
       - ["System.Dynamic", "ExpandoObject", "get_IsReadOnly", "()", "summary", "df-generated"]
+      - ["System.Dynamic", "ExpandoObject", "remove_PropertyChanged", "(System.ComponentModel.PropertyChangedEventHandler)", "summary", "df-generated"]
       - ["System.Dynamic", "GetIndexBinder", "Bind", "(System.Dynamic.DynamicMetaObject,System.Dynamic.DynamicMetaObject[])", "summary", "df-generated"]
       - ["System.Dynamic", "GetIndexBinder", "FallbackGetIndex", "(System.Dynamic.DynamicMetaObject,System.Dynamic.DynamicMetaObject[])", "summary", "df-generated"]
       - ["System.Dynamic", "GetIndexBinder", "GetIndexBinder", "(System.Dynamic.CallInfo)", "summary", "df-generated"]
diff --git a/csharp/ql/lib/ext/generated/System.Formats.Asn1.model.yml b/csharp/ql/lib/ext/generated/System.Formats.Asn1.model.yml
index 2ffca6ae101..78e5ff152ce 100644
--- a/csharp/ql/lib/ext/generated/System.Formats.Asn1.model.yml
+++ b/csharp/ql/lib/ext/generated/System.Formats.Asn1.model.yml
@@ -4,41 +4,26 @@ extensions:
       pack: codeql/csharp-all
       extensible: summaryModel
     data:
-      - ["System.Formats.Asn1", "AsnDecoder", False, "ReadBitString", "(System.ReadOnlySpan<System.Byte>,System.Formats.Asn1.AsnEncodingRules,System.Int32,System.Int32,System.Nullable<System.Formats.Asn1.Asn1Tag>)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Formats.Asn1", "AsnDecoder", False, "ReadEnumeratedBytes", "(System.ReadOnlySpan<System.Byte>,System.Formats.Asn1.AsnEncodingRules,System.Int32,System.Nullable<System.Formats.Asn1.Asn1Tag>)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Formats.Asn1", "AsnDecoder", False, "ReadIntegerBytes", "(System.ReadOnlySpan<System.Byte>,System.Formats.Asn1.AsnEncodingRules,System.Int32,System.Nullable<System.Formats.Asn1.Asn1Tag>)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Formats.Asn1", "AsnDecoder", False, "ReadOctetString", "(System.ReadOnlySpan<System.Byte>,System.Formats.Asn1.AsnEncodingRules,System.Int32,System.Nullable<System.Formats.Asn1.Asn1Tag>)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Formats.Asn1", "AsnDecoder", False, "TryReadBitString", "(System.ReadOnlySpan<System.Byte>,System.Span<System.Byte>,System.Formats.Asn1.AsnEncodingRules,System.Int32,System.Int32,System.Int32,System.Nullable<System.Formats.Asn1.Asn1Tag>)", "", "Argument[0]", "Argument[1]", "taint", "df-generated"]
-      - ["System.Formats.Asn1", "AsnDecoder", False, "TryReadCharacterStringBytes", "(System.ReadOnlySpan<System.Byte>,System.Span<System.Byte>,System.Formats.Asn1.AsnEncodingRules,System.Formats.Asn1.Asn1Tag,System.Int32,System.Int32)", "", "Argument[0]", "Argument[1]", "taint", "df-generated"]
-      - ["System.Formats.Asn1", "AsnDecoder", False, "TryReadOctetString", "(System.ReadOnlySpan<System.Byte>,System.Span<System.Byte>,System.Formats.Asn1.AsnEncodingRules,System.Int32,System.Int32,System.Nullable<System.Formats.Asn1.Asn1Tag>)", "", "Argument[0]", "Argument[1]", "taint", "df-generated"]
-      - ["System.Formats.Asn1", "AsnDecoder", False, "TryReadPrimitiveBitString", "(System.ReadOnlySpan<System.Byte>,System.Formats.Asn1.AsnEncodingRules,System.Int32,System.ReadOnlySpan<System.Byte>,System.Int32,System.Nullable<System.Formats.Asn1.Asn1Tag>)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Formats.Asn1", "AsnDecoder", False, "TryReadPrimitiveCharacterStringBytes", "(System.ReadOnlySpan<System.Byte>,System.Formats.Asn1.AsnEncodingRules,System.Formats.Asn1.Asn1Tag,System.ReadOnlySpan<System.Byte>,System.Int32)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Formats.Asn1", "AsnDecoder", False, "TryReadPrimitiveOctetString", "(System.ReadOnlySpan<System.Byte>,System.Formats.Asn1.AsnEncodingRules,System.ReadOnlySpan<System.Byte>,System.Int32,System.Nullable<System.Formats.Asn1.Asn1Tag>)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Formats.Asn1", "AsnDecoder", False, "ReadBitString", "(System.ReadOnlySpan<System.Byte>,System.Formats.Asn1.AsnEncodingRules,System.Int32,System.Int32,System.Nullable<System.Formats.Asn1.Asn1Tag>)", "", "Argument[0].Element", "ReturnValue.Element", "value", "dfc-generated"]
+      - ["System.Formats.Asn1", "AsnDecoder", False, "ReadEnumeratedBytes", "(System.ReadOnlySpan<System.Byte>,System.Formats.Asn1.AsnEncodingRules,System.Int32,System.Nullable<System.Formats.Asn1.Asn1Tag>)", "", "Argument[0].Element", "ReturnValue.Element", "value", "dfc-generated"]
+      - ["System.Formats.Asn1", "AsnDecoder", False, "ReadIntegerBytes", "(System.ReadOnlySpan<System.Byte>,System.Formats.Asn1.AsnEncodingRules,System.Int32,System.Nullable<System.Formats.Asn1.Asn1Tag>)", "", "Argument[0].Element", "ReturnValue.Element", "value", "dfc-generated"]
+      - ["System.Formats.Asn1", "AsnDecoder", False, "ReadOctetString", "(System.ReadOnlySpan<System.Byte>,System.Formats.Asn1.AsnEncodingRules,System.Int32,System.Nullable<System.Formats.Asn1.Asn1Tag>)", "", "Argument[0].Element", "ReturnValue.Element", "value", "dfc-generated"]
+      - ["System.Formats.Asn1", "AsnDecoder", False, "TryReadBitString", "(System.ReadOnlySpan<System.Byte>,System.Span<System.Byte>,System.Formats.Asn1.AsnEncodingRules,System.Int32,System.Int32,System.Int32,System.Nullable<System.Formats.Asn1.Asn1Tag>)", "", "Argument[0].Element", "Argument[1].Element", "value", "dfc-generated"]
+      - ["System.Formats.Asn1", "AsnDecoder", False, "TryReadCharacterStringBytes", "(System.ReadOnlySpan<System.Byte>,System.Span<System.Byte>,System.Formats.Asn1.AsnEncodingRules,System.Formats.Asn1.Asn1Tag,System.Int32,System.Int32)", "", "Argument[0].Element", "Argument[1].Element", "value", "dfc-generated"]
+      - ["System.Formats.Asn1", "AsnDecoder", False, "TryReadOctetString", "(System.ReadOnlySpan<System.Byte>,System.Span<System.Byte>,System.Formats.Asn1.AsnEncodingRules,System.Int32,System.Int32,System.Nullable<System.Formats.Asn1.Asn1Tag>)", "", "Argument[0].Element", "Argument[1].Element", "value", "dfc-generated"]
+      - ["System.Formats.Asn1", "AsnDecoder", False, "TryReadPrimitiveBitString", "(System.ReadOnlySpan<System.Byte>,System.Formats.Asn1.AsnEncodingRules,System.Int32,System.ReadOnlySpan<System.Byte>,System.Int32,System.Nullable<System.Formats.Asn1.Asn1Tag>)", "", "Argument[0].Element", "ReturnValue.Element", "value", "dfc-generated"]
+      - ["System.Formats.Asn1", "AsnDecoder", False, "TryReadPrimitiveCharacterStringBytes", "(System.ReadOnlySpan<System.Byte>,System.Formats.Asn1.AsnEncodingRules,System.Formats.Asn1.Asn1Tag,System.ReadOnlySpan<System.Byte>,System.Int32)", "", "Argument[0].Element", "ReturnValue.Element", "value", "dfc-generated"]
+      - ["System.Formats.Asn1", "AsnDecoder", False, "TryReadPrimitiveOctetString", "(System.ReadOnlySpan<System.Byte>,System.Formats.Asn1.AsnEncodingRules,System.ReadOnlySpan<System.Byte>,System.Int32,System.Nullable<System.Formats.Asn1.Asn1Tag>)", "", "Argument[0].Element", "ReturnValue.Element", "value", "dfc-generated"]
       - ["System.Formats.Asn1", "AsnReader", False, "AsnReader", "(System.ReadOnlyMemory<System.Byte>,System.Formats.Asn1.AsnEncodingRules,System.Formats.Asn1.AsnReaderOptions)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Formats.Asn1", "AsnReader", False, "AsnReader", "(System.ReadOnlyMemory<System.Byte>,System.Formats.Asn1.AsnEncodingRules,System.Formats.Asn1.AsnReaderOptions)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Formats.Asn1", "AsnReader", False, "Clone", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Formats.Asn1", "AsnReader", False, "PeekContentBytes", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Formats.Asn1", "AsnReader", False, "PeekEncodedValue", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Formats.Asn1", "AsnReader", False, "ReadBitString", "(System.Int32,System.Nullable<System.Formats.Asn1.Asn1Tag>)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Formats.Asn1", "AsnReader", False, "ReadEncodedValue", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Formats.Asn1", "AsnReader", False, "ReadEnumeratedBytes", "(System.Nullable<System.Formats.Asn1.Asn1Tag>)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Formats.Asn1", "AsnReader", False, "ReadIntegerBytes", "(System.Nullable<System.Formats.Asn1.Asn1Tag>)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Formats.Asn1", "AsnReader", False, "ReadOctetString", "(System.Nullable<System.Formats.Asn1.Asn1Tag>)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Formats.Asn1", "AsnReader", False, "ReadSequence", "(System.Nullable<System.Formats.Asn1.Asn1Tag>)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Formats.Asn1", "AsnReader", False, "ReadSetOf", "(System.Boolean,System.Nullable<System.Formats.Asn1.Asn1Tag>)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Formats.Asn1", "AsnReader", False, "ReadSetOf", "(System.Nullable<System.Formats.Asn1.Asn1Tag>)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Formats.Asn1", "AsnReader", False, "TryReadBitString", "(System.Span<System.Byte>,System.Int32,System.Int32,System.Nullable<System.Formats.Asn1.Asn1Tag>)", "", "Argument[this]", "Argument[0]", "taint", "df-generated"]
       - ["System.Formats.Asn1", "AsnReader", False, "TryReadCharacterStringBytes", "(System.Span<System.Byte>,System.Formats.Asn1.Asn1Tag,System.Int32)", "", "Argument[this]", "Argument[0]", "taint", "df-generated"]
       - ["System.Formats.Asn1", "AsnReader", False, "TryReadOctetString", "(System.Span<System.Byte>,System.Int32,System.Nullable<System.Formats.Asn1.Asn1Tag>)", "", "Argument[this]", "Argument[0]", "taint", "df-generated"]
-      - ["System.Formats.Asn1", "AsnReader", False, "TryReadPrimitiveBitString", "(System.Int32,System.ReadOnlyMemory<System.Byte>,System.Nullable<System.Formats.Asn1.Asn1Tag>)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Formats.Asn1", "AsnReader", False, "TryReadPrimitiveCharacterStringBytes", "(System.Formats.Asn1.Asn1Tag,System.ReadOnlyMemory<System.Byte>)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Formats.Asn1", "AsnReader", False, "TryReadPrimitiveOctetString", "(System.ReadOnlyMemory<System.Byte>,System.Nullable<System.Formats.Asn1.Asn1Tag>)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Formats.Asn1", "AsnWriter", False, "Encode", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Formats.Asn1", "AsnWriter", False, "Encode", "(System.Span<System.Byte>)", "", "Argument[this]", "Argument[0]", "taint", "df-generated"]
       - ["System.Formats.Asn1", "AsnWriter", False, "PushOctetString", "(System.Nullable<System.Formats.Asn1.Asn1Tag>)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Formats.Asn1", "AsnWriter", False, "PushSequence", "(System.Nullable<System.Formats.Asn1.Asn1Tag>)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Formats.Asn1", "AsnWriter", False, "PushSetOf", "(System.Nullable<System.Formats.Asn1.Asn1Tag>)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Formats.Asn1", "AsnWriter", False, "TryEncode", "(System.Span<System.Byte>,System.Int32)", "", "Argument[this]", "Argument[0]", "taint", "df-generated"]
   - addsTo:
       pack: codeql/csharp-all
       extensible: neutralModel
@@ -86,24 +71,36 @@ extensions:
       - ["System.Formats.Asn1", "AsnDecoder", "TryReadInt64", "(System.ReadOnlySpan<System.Byte>,System.Formats.Asn1.AsnEncodingRules,System.Int64,System.Int32,System.Nullable<System.Formats.Asn1.Asn1Tag>)", "summary", "df-generated"]
       - ["System.Formats.Asn1", "AsnDecoder", "TryReadUInt32", "(System.ReadOnlySpan<System.Byte>,System.Formats.Asn1.AsnEncodingRules,System.UInt32,System.Int32,System.Nullable<System.Formats.Asn1.Asn1Tag>)", "summary", "df-generated"]
       - ["System.Formats.Asn1", "AsnDecoder", "TryReadUInt64", "(System.ReadOnlySpan<System.Byte>,System.Formats.Asn1.AsnEncodingRules,System.UInt64,System.Int32,System.Nullable<System.Formats.Asn1.Asn1Tag>)", "summary", "df-generated"]
+      - ["System.Formats.Asn1", "AsnReader", "Clone", "()", "summary", "df-generated"]
+      - ["System.Formats.Asn1", "AsnReader", "PeekContentBytes", "()", "summary", "df-generated"]
+      - ["System.Formats.Asn1", "AsnReader", "PeekEncodedValue", "()", "summary", "df-generated"]
       - ["System.Formats.Asn1", "AsnReader", "PeekTag", "()", "summary", "df-generated"]
       - ["System.Formats.Asn1", "AsnReader", "ReadBoolean", "(System.Nullable<System.Formats.Asn1.Asn1Tag>)", "summary", "df-generated"]
       - ["System.Formats.Asn1", "AsnReader", "ReadCharacterString", "(System.Formats.Asn1.UniversalTagNumber,System.Nullable<System.Formats.Asn1.Asn1Tag>)", "summary", "df-generated"]
+      - ["System.Formats.Asn1", "AsnReader", "ReadEncodedValue", "()", "summary", "df-generated"]
+      - ["System.Formats.Asn1", "AsnReader", "ReadEnumeratedBytes", "(System.Nullable<System.Formats.Asn1.Asn1Tag>)", "summary", "df-generated"]
       - ["System.Formats.Asn1", "AsnReader", "ReadEnumeratedValue", "(System.Type,System.Nullable<System.Formats.Asn1.Asn1Tag>)", "summary", "df-generated"]
       - ["System.Formats.Asn1", "AsnReader", "ReadEnumeratedValue<TEnum>", "(System.Nullable<System.Formats.Asn1.Asn1Tag>)", "summary", "df-generated"]
       - ["System.Formats.Asn1", "AsnReader", "ReadGeneralizedTime", "(System.Nullable<System.Formats.Asn1.Asn1Tag>)", "summary", "df-generated"]
       - ["System.Formats.Asn1", "AsnReader", "ReadInteger", "(System.Nullable<System.Formats.Asn1.Asn1Tag>)", "summary", "df-generated"]
+      - ["System.Formats.Asn1", "AsnReader", "ReadIntegerBytes", "(System.Nullable<System.Formats.Asn1.Asn1Tag>)", "summary", "df-generated"]
       - ["System.Formats.Asn1", "AsnReader", "ReadNamedBitList", "(System.Nullable<System.Formats.Asn1.Asn1Tag>)", "summary", "df-generated"]
       - ["System.Formats.Asn1", "AsnReader", "ReadNamedBitListValue", "(System.Type,System.Nullable<System.Formats.Asn1.Asn1Tag>)", "summary", "df-generated"]
       - ["System.Formats.Asn1", "AsnReader", "ReadNamedBitListValue<TFlagsEnum>", "(System.Nullable<System.Formats.Asn1.Asn1Tag>)", "summary", "df-generated"]
       - ["System.Formats.Asn1", "AsnReader", "ReadNull", "(System.Nullable<System.Formats.Asn1.Asn1Tag>)", "summary", "df-generated"]
       - ["System.Formats.Asn1", "AsnReader", "ReadObjectIdentifier", "(System.Nullable<System.Formats.Asn1.Asn1Tag>)", "summary", "df-generated"]
+      - ["System.Formats.Asn1", "AsnReader", "ReadSequence", "(System.Nullable<System.Formats.Asn1.Asn1Tag>)", "summary", "df-generated"]
+      - ["System.Formats.Asn1", "AsnReader", "ReadSetOf", "(System.Boolean,System.Nullable<System.Formats.Asn1.Asn1Tag>)", "summary", "df-generated"]
+      - ["System.Formats.Asn1", "AsnReader", "ReadSetOf", "(System.Nullable<System.Formats.Asn1.Asn1Tag>)", "summary", "df-generated"]
       - ["System.Formats.Asn1", "AsnReader", "ReadUtcTime", "(System.Int32,System.Nullable<System.Formats.Asn1.Asn1Tag>)", "summary", "df-generated"]
       - ["System.Formats.Asn1", "AsnReader", "ReadUtcTime", "(System.Nullable<System.Formats.Asn1.Asn1Tag>)", "summary", "df-generated"]
       - ["System.Formats.Asn1", "AsnReader", "ThrowIfNotEmpty", "()", "summary", "df-generated"]
       - ["System.Formats.Asn1", "AsnReader", "TryReadCharacterString", "(System.Span<System.Char>,System.Formats.Asn1.UniversalTagNumber,System.Int32,System.Nullable<System.Formats.Asn1.Asn1Tag>)", "summary", "df-generated"]
       - ["System.Formats.Asn1", "AsnReader", "TryReadInt32", "(System.Int32,System.Nullable<System.Formats.Asn1.Asn1Tag>)", "summary", "df-generated"]
       - ["System.Formats.Asn1", "AsnReader", "TryReadInt64", "(System.Int64,System.Nullable<System.Formats.Asn1.Asn1Tag>)", "summary", "df-generated"]
+      - ["System.Formats.Asn1", "AsnReader", "TryReadPrimitiveBitString", "(System.Int32,System.ReadOnlyMemory<System.Byte>,System.Nullable<System.Formats.Asn1.Asn1Tag>)", "summary", "df-generated"]
+      - ["System.Formats.Asn1", "AsnReader", "TryReadPrimitiveCharacterStringBytes", "(System.Formats.Asn1.Asn1Tag,System.ReadOnlyMemory<System.Byte>)", "summary", "df-generated"]
+      - ["System.Formats.Asn1", "AsnReader", "TryReadPrimitiveOctetString", "(System.ReadOnlyMemory<System.Byte>,System.Nullable<System.Formats.Asn1.Asn1Tag>)", "summary", "df-generated"]
       - ["System.Formats.Asn1", "AsnReader", "TryReadUInt32", "(System.UInt32,System.Nullable<System.Formats.Asn1.Asn1Tag>)", "summary", "df-generated"]
       - ["System.Formats.Asn1", "AsnReader", "TryReadUInt64", "(System.UInt64,System.Nullable<System.Formats.Asn1.Asn1Tag>)", "summary", "df-generated"]
       - ["System.Formats.Asn1", "AsnReader", "get_HasData", "()", "summary", "df-generated"]
@@ -112,6 +109,8 @@ extensions:
       - ["System.Formats.Asn1", "AsnWriter", "AsnWriter", "(System.Formats.Asn1.AsnEncodingRules)", "summary", "df-generated"]
       - ["System.Formats.Asn1", "AsnWriter", "AsnWriter", "(System.Formats.Asn1.AsnEncodingRules,System.Int32)", "summary", "df-generated"]
       - ["System.Formats.Asn1", "AsnWriter", "CopyTo", "(System.Formats.Asn1.AsnWriter)", "summary", "df-generated"]
+      - ["System.Formats.Asn1", "AsnWriter", "Encode", "()", "summary", "df-generated"]
+      - ["System.Formats.Asn1", "AsnWriter", "Encode", "(System.Span<System.Byte>)", "summary", "df-generated"]
       - ["System.Formats.Asn1", "AsnWriter", "EncodedValueEquals", "(System.Formats.Asn1.AsnWriter)", "summary", "df-generated"]
       - ["System.Formats.Asn1", "AsnWriter", "EncodedValueEquals", "(System.ReadOnlySpan<System.Byte>)", "summary", "df-generated"]
       - ["System.Formats.Asn1", "AsnWriter", "GetEncodedLength", "()", "summary", "df-generated"]
@@ -119,6 +118,7 @@ extensions:
       - ["System.Formats.Asn1", "AsnWriter", "PopSequence", "(System.Nullable<System.Formats.Asn1.Asn1Tag>)", "summary", "df-generated"]
       - ["System.Formats.Asn1", "AsnWriter", "PopSetOf", "(System.Nullable<System.Formats.Asn1.Asn1Tag>)", "summary", "df-generated"]
       - ["System.Formats.Asn1", "AsnWriter", "Reset", "()", "summary", "df-generated"]
+      - ["System.Formats.Asn1", "AsnWriter", "TryEncode", "(System.Span<System.Byte>,System.Int32)", "summary", "df-generated"]
       - ["System.Formats.Asn1", "AsnWriter", "WriteBitString", "(System.ReadOnlySpan<System.Byte>,System.Int32,System.Nullable<System.Formats.Asn1.Asn1Tag>)", "summary", "df-generated"]
       - ["System.Formats.Asn1", "AsnWriter", "WriteBoolean", "(System.Boolean,System.Nullable<System.Formats.Asn1.Asn1Tag>)", "summary", "df-generated"]
       - ["System.Formats.Asn1", "AsnWriter", "WriteCharacterString", "(System.Formats.Asn1.UniversalTagNumber,System.ReadOnlySpan<System.Char>,System.Nullable<System.Formats.Asn1.Asn1Tag>)", "summary", "df-generated"]
diff --git a/csharp/ql/lib/ext/generated/System.Formats.Cbor.model.yml b/csharp/ql/lib/ext/generated/System.Formats.Cbor.model.yml
index eb070c31233..8600bc47ffd 100644
--- a/csharp/ql/lib/ext/generated/System.Formats.Cbor.model.yml
+++ b/csharp/ql/lib/ext/generated/System.Formats.Cbor.model.yml
@@ -5,9 +5,6 @@ extensions:
       extensible: summaryModel
     data:
       - ["System.Formats.Cbor", "CborReader", False, "CborReader", "(System.ReadOnlyMemory<System.Byte>,System.Formats.Cbor.CborConformanceMode,System.Boolean)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Formats.Cbor", "CborReader", False, "ReadDefiniteLengthByteString", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Formats.Cbor", "CborReader", False, "ReadDefiniteLengthTextStringBytes", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Formats.Cbor", "CborReader", False, "ReadEncodedValue", "(System.Boolean)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Formats.Cbor", "CborReader", False, "ReadTextString", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Formats.Cbor", "CborReader", False, "Reset", "(System.ReadOnlyMemory<System.Byte>)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Formats.Cbor", "CborReader", False, "TryReadByteString", "(System.Span<System.Byte>,System.Int32)", "", "Argument[this]", "Argument[0]", "taint", "df-generated"]
@@ -29,7 +26,10 @@ extensions:
       - ["System.Formats.Cbor", "CborReader", "ReadCborNegativeIntegerRepresentation", "()", "summary", "df-generated"]
       - ["System.Formats.Cbor", "CborReader", "ReadDateTimeOffset", "()", "summary", "df-generated"]
       - ["System.Formats.Cbor", "CborReader", "ReadDecimal", "()", "summary", "df-generated"]
+      - ["System.Formats.Cbor", "CborReader", "ReadDefiniteLengthByteString", "()", "summary", "df-generated"]
+      - ["System.Formats.Cbor", "CborReader", "ReadDefiniteLengthTextStringBytes", "()", "summary", "df-generated"]
       - ["System.Formats.Cbor", "CborReader", "ReadDouble", "()", "summary", "df-generated"]
+      - ["System.Formats.Cbor", "CborReader", "ReadEncodedValue", "(System.Boolean)", "summary", "df-generated"]
       - ["System.Formats.Cbor", "CborReader", "ReadEndArray", "()", "summary", "df-generated"]
       - ["System.Formats.Cbor", "CborReader", "ReadEndIndefiniteLengthByteString", "()", "summary", "df-generated"]
       - ["System.Formats.Cbor", "CborReader", "ReadEndIndefiniteLengthTextString", "()", "summary", "df-generated"]
diff --git a/csharp/ql/lib/ext/generated/System.Formats.Tar.model.yml b/csharp/ql/lib/ext/generated/System.Formats.Tar.model.yml
index b9c9c766b52..47a4aa105bd 100644
--- a/csharp/ql/lib/ext/generated/System.Formats.Tar.model.yml
+++ b/csharp/ql/lib/ext/generated/System.Formats.Tar.model.yml
@@ -6,20 +6,13 @@ extensions:
     data:
       - ["System.Formats.Tar", "GnuTarEntry", False, "GnuTarEntry", "(System.Formats.Tar.TarEntry)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Formats.Tar", "PaxTarEntry", False, "PaxTarEntry", "(System.Formats.Tar.TarEntry)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Formats.Tar", "TarEntry", False, "ExtractToFileAsync", "(System.String,System.Boolean,System.Threading.CancellationToken)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Formats.Tar", "TarEntry", False, "ToString", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Formats.Tar", "TarFile", False, "CreateFromDirectoryAsync", "(System.String,System.IO.Stream,System.Boolean,System.Threading.CancellationToken)", "", "Argument[3]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Formats.Tar", "TarFile", False, "CreateFromDirectoryAsync", "(System.String,System.String,System.Boolean,System.Threading.CancellationToken)", "", "Argument[3]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Formats.Tar", "TarFile", False, "ExtractToDirectoryAsync", "(System.IO.Stream,System.String,System.Boolean,System.Threading.CancellationToken)", "", "Argument[3]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Formats.Tar", "TarFile", False, "ExtractToDirectoryAsync", "(System.String,System.String,System.Boolean,System.Threading.CancellationToken)", "", "Argument[3]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Formats.Tar", "TarEntry", False, "ToString", "()", "", "Argument[this].Property[System.Formats.Tar.TarEntry.Name]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Formats.Tar", "TarReader", False, "TarReader", "(System.IO.Stream,System.Boolean)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Formats.Tar", "TarWriter", False, "TarWriter", "(System.IO.Stream,System.Formats.Tar.TarEntryFormat,System.Boolean)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Formats.Tar", "TarWriter", False, "WriteEntry", "(System.Formats.Tar.TarEntry)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Formats.Tar", "TarWriter", False, "WriteEntry", "(System.String,System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Formats.Tar", "TarWriter", False, "WriteEntryAsync", "(System.Formats.Tar.TarEntry,System.Threading.CancellationToken)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Formats.Tar", "TarWriter", False, "WriteEntryAsync", "(System.Formats.Tar.TarEntry,System.Threading.CancellationToken)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
       - ["System.Formats.Tar", "TarWriter", False, "WriteEntryAsync", "(System.String,System.String,System.Threading.CancellationToken)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Formats.Tar", "TarWriter", False, "WriteEntryAsync", "(System.String,System.String,System.Threading.CancellationToken)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
       - ["System.Formats.Tar", "UstarTarEntry", False, "UstarTarEntry", "(System.Formats.Tar.TarEntry)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
   - addsTo:
       pack: codeql/csharp-all
@@ -32,14 +25,19 @@ extensions:
       - ["System.Formats.Tar", "PaxTarEntry", "PaxTarEntry", "(System.Formats.Tar.TarEntryType,System.String,System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<System.String,System.String>>)", "summary", "df-generated"]
       - ["System.Formats.Tar", "PaxTarEntry", "get_ExtendedAttributes", "()", "summary", "df-generated"]
       - ["System.Formats.Tar", "TarEntry", "ExtractToFile", "(System.String,System.Boolean)", "summary", "df-generated"]
+      - ["System.Formats.Tar", "TarEntry", "ExtractToFileAsync", "(System.String,System.Boolean,System.Threading.CancellationToken)", "summary", "df-generated"]
       - ["System.Formats.Tar", "TarEntry", "get_Checksum", "()", "summary", "df-generated"]
       - ["System.Formats.Tar", "TarEntry", "get_EntryType", "()", "summary", "df-generated"]
       - ["System.Formats.Tar", "TarEntry", "get_Format", "()", "summary", "df-generated"]
       - ["System.Formats.Tar", "TarEntry", "get_Length", "()", "summary", "df-generated"]
       - ["System.Formats.Tar", "TarFile", "CreateFromDirectory", "(System.String,System.IO.Stream,System.Boolean)", "summary", "df-generated"]
       - ["System.Formats.Tar", "TarFile", "CreateFromDirectory", "(System.String,System.String,System.Boolean)", "summary", "df-generated"]
+      - ["System.Formats.Tar", "TarFile", "CreateFromDirectoryAsync", "(System.String,System.IO.Stream,System.Boolean,System.Threading.CancellationToken)", "summary", "df-generated"]
+      - ["System.Formats.Tar", "TarFile", "CreateFromDirectoryAsync", "(System.String,System.String,System.Boolean,System.Threading.CancellationToken)", "summary", "df-generated"]
       - ["System.Formats.Tar", "TarFile", "ExtractToDirectory", "(System.IO.Stream,System.String,System.Boolean)", "summary", "df-generated"]
       - ["System.Formats.Tar", "TarFile", "ExtractToDirectory", "(System.String,System.String,System.Boolean)", "summary", "df-generated"]
+      - ["System.Formats.Tar", "TarFile", "ExtractToDirectoryAsync", "(System.IO.Stream,System.String,System.Boolean,System.Threading.CancellationToken)", "summary", "df-generated"]
+      - ["System.Formats.Tar", "TarFile", "ExtractToDirectoryAsync", "(System.String,System.String,System.Boolean,System.Threading.CancellationToken)", "summary", "df-generated"]
       - ["System.Formats.Tar", "TarReader", "Dispose", "()", "summary", "df-generated"]
       - ["System.Formats.Tar", "TarReader", "GetNextEntry", "(System.Boolean)", "summary", "df-generated"]
       - ["System.Formats.Tar", "TarReader", "GetNextEntryAsync", "(System.Boolean,System.Threading.CancellationToken)", "summary", "df-generated"]
diff --git a/csharp/ql/lib/ext/generated/System.Globalization.model.yml b/csharp/ql/lib/ext/generated/System.Globalization.model.yml
index b1156c26b1a..6e831269161 100644
--- a/csharp/ql/lib/ext/generated/System.Globalization.model.yml
+++ b/csharp/ql/lib/ext/generated/System.Globalization.model.yml
@@ -4,12 +4,10 @@ extensions:
       pack: codeql/csharp-all
       extensible: summaryModel
     data:
-      - ["System.Globalization", "Calendar", False, "ReadOnly", "(System.Globalization.Calendar)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Globalization", "CompareInfo", False, "GetSortKey", "(System.String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Globalization", "CompareInfo", False, "GetSortKey", "(System.String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Globalization", "CompareInfo", False, "GetSortKey", "(System.String,System.Globalization.CompareOptions)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Globalization", "CompareInfo", False, "GetSortKey", "(System.String,System.Globalization.CompareOptions)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Globalization", "CompareInfo", False, "ToString", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Globalization", "Calendar", False, "ReadOnly", "(System.Globalization.Calendar)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Globalization", "CompareInfo", False, "GetSortKey", "(System.String)", "", "Argument[0]", "ReturnValue.SyntheticField[System.Globalization.SortKey._string]", "value", "dfc-generated"]
+      - ["System.Globalization", "CompareInfo", False, "GetSortKey", "(System.String,System.Globalization.CompareOptions)", "", "Argument[0]", "ReturnValue.SyntheticField[System.Globalization.SortKey._string]", "value", "dfc-generated"]
+      - ["System.Globalization", "CompareInfo", False, "ToString", "()", "", "Argument[this].Property[System.Globalization.CompareInfo.Name]", "ReturnValue", "taint", "dfc-generated"]
       - ["System.Globalization", "CompareInfo", False, "get_Name", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Globalization", "CompareInfo", False, "get_Version", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Globalization", "CultureInfo", False, "CultureInfo", "(System.String,System.Boolean)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
@@ -21,7 +19,7 @@ extensions:
       - ["System.Globalization", "CultureInfo", False, "GetCultureInfoByIetfLanguageTag", "(System.String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["System.Globalization", "CultureInfo", False, "ReadOnly", "(System.Globalization.CultureInfo)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["System.Globalization", "CultureInfo", False, "ToString", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Globalization", "CultureInfo", False, "get_IetfLanguageTag", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Globalization", "CultureInfo", False, "get_IetfLanguageTag", "()", "", "Argument[this].Property[System.Globalization.CultureInfo.Name]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Globalization", "CultureInfo", True, "get_Calendar", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Globalization", "CultureInfo", True, "get_DisplayName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Globalization", "CultureInfo", True, "get_EnglishName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
@@ -31,35 +29,38 @@ extensions:
       - ["System.Globalization", "CultureInfo", True, "get_ThreeLetterISOLanguageName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Globalization", "CultureInfo", True, "get_ThreeLetterWindowsLanguageName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Globalization", "CultureInfo", True, "get_TwoLetterISOLanguageName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Globalization", "CultureNotFoundException", False, "CultureNotFoundException", "(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Globalization", "CultureNotFoundException", False, "CultureNotFoundException", "(System.String,System.String,System.Exception)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Globalization", "CultureNotFoundException", False, "CultureNotFoundException", "(System.String,System.String,System.String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Globalization", "CultureNotFoundException", True, "get_InvalidCultureId", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Globalization", "CultureNotFoundException", True, "get_InvalidCultureName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Globalization", "CultureNotFoundException", False, "CultureNotFoundException", "(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)", "", "Argument[0].SyntheticField[System.Runtime.Serialization.SerializationInfo._values].Element", "Argument[this].SyntheticField[System.Globalization.CultureNotFoundException._invalidCultureId]", "value", "dfc-generated"]
+      - ["System.Globalization", "CultureNotFoundException", False, "CultureNotFoundException", "(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)", "", "Argument[0].SyntheticField[System.Runtime.Serialization.SerializationInfo._values].Element", "Argument[this].SyntheticField[System.Globalization.CultureNotFoundException._invalidCultureName]", "value", "dfc-generated"]
+      - ["System.Globalization", "CultureNotFoundException", False, "CultureNotFoundException", "(System.String,System.String,System.Exception)", "", "Argument[1]", "Argument[this].SyntheticField[System.Globalization.CultureNotFoundException._invalidCultureName]", "value", "dfc-generated"]
+      - ["System.Globalization", "CultureNotFoundException", False, "CultureNotFoundException", "(System.String,System.String,System.String)", "", "Argument[1]", "Argument[this].SyntheticField[System.Globalization.CultureNotFoundException._invalidCultureName]", "value", "dfc-generated"]
+      - ["System.Globalization", "CultureNotFoundException", True, "get_InvalidCultureId", "()", "", "Argument[this].SyntheticField[System.Globalization.CultureNotFoundException._invalidCultureId]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Globalization", "CultureNotFoundException", True, "get_InvalidCultureName", "()", "", "Argument[this].SyntheticField[System.Globalization.CultureNotFoundException._invalidCultureName]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Globalization", "DateTimeFormatInfo", False, "GetAbbreviatedDayName", "(System.DayOfWeek)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Globalization", "DateTimeFormatInfo", False, "GetAbbreviatedEraName", "(System.Int32)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Globalization", "DateTimeFormatInfo", False, "GetAbbreviatedMonthName", "(System.Int32)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Globalization", "DateTimeFormatInfo", False, "GetAllDateTimePatterns", "(System.Char)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Globalization", "DateTimeFormatInfo", False, "GetDayName", "(System.DayOfWeek)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Globalization", "DateTimeFormatInfo", False, "GetEraName", "(System.Int32)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Globalization", "DateTimeFormatInfo", False, "GetInstance", "(System.IFormatProvider)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Globalization", "DateTimeFormatInfo", False, "GetInstance", "(System.IFormatProvider)", "", "Argument[0].Property[System.Globalization.CultureInfo.DateTimeFormat]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Globalization", "DateTimeFormatInfo", False, "GetInstance", "(System.IFormatProvider)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Globalization", "DateTimeFormatInfo", False, "GetMonthName", "(System.Int32)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Globalization", "DateTimeFormatInfo", False, "GetShortestDayName", "(System.DayOfWeek)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Globalization", "DateTimeFormatInfo", False, "ReadOnly", "(System.Globalization.DateTimeFormatInfo)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Globalization", "DateTimeFormatInfo", False, "ReadOnly", "(System.Globalization.DateTimeFormatInfo)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Globalization", "DateTimeFormatInfo", False, "SetAllDateTimePatterns", "(System.String[],System.Char)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["System.Globalization", "DaylightTime", False, "DaylightTime", "(System.DateTime,System.DateTime,System.TimeSpan)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Globalization", "DaylightTime", False, "get_Delta", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Globalization", "GlobalizationExtensions", False, "GetStringComparer", "(System.Globalization.CompareInfo,System.Globalization.CompareOptions)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Globalization", "IdnMapping", False, "GetAscii", "(System.String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Globalization", "IdnMapping", False, "GetAscii", "(System.String,System.Int32)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Globalization", "IdnMapping", False, "GetAscii", "(System.String,System.Int32,System.Int32)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Globalization", "IdnMapping", False, "GetUnicode", "(System.String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Globalization", "IdnMapping", False, "GetUnicode", "(System.String,System.Int32)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Globalization", "IdnMapping", False, "GetUnicode", "(System.String,System.Int32,System.Int32)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Globalization", "NumberFormatInfo", False, "GetInstance", "(System.IFormatProvider)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Globalization", "NumberFormatInfo", False, "ReadOnly", "(System.Globalization.NumberFormatInfo)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Globalization", "DaylightTime", False, "DaylightTime", "(System.DateTime,System.DateTime,System.TimeSpan)", "", "Argument[2]", "Argument[this].SyntheticField[System.Globalization.DaylightTime._delta]", "value", "dfc-generated"]
+      - ["System.Globalization", "DaylightTime", False, "get_Delta", "()", "", "Argument[this].SyntheticField[System.Globalization.DaylightTime._delta]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Globalization", "GlobalizationExtensions", False, "GetStringComparer", "(System.Globalization.CompareInfo,System.Globalization.CompareOptions)", "", "Argument[0]", "ReturnValue.SyntheticField[System.CultureAwareComparer._compareInfo]", "value", "dfc-generated"]
+      - ["System.Globalization", "IdnMapping", False, "GetAscii", "(System.String)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Globalization", "IdnMapping", False, "GetAscii", "(System.String,System.Int32)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Globalization", "IdnMapping", False, "GetAscii", "(System.String,System.Int32,System.Int32)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Globalization", "IdnMapping", False, "GetUnicode", "(System.String)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Globalization", "IdnMapping", False, "GetUnicode", "(System.String,System.Int32)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Globalization", "IdnMapping", False, "GetUnicode", "(System.String,System.Int32,System.Int32)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Globalization", "NumberFormatInfo", False, "GetInstance", "(System.IFormatProvider)", "", "Argument[0].Property[System.Globalization.CultureInfo.NumberFormat]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Globalization", "NumberFormatInfo", False, "GetInstance", "(System.IFormatProvider)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Globalization", "NumberFormatInfo", False, "ReadOnly", "(System.Globalization.NumberFormatInfo)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Globalization", "RegionInfo", False, "RegionInfo", "(System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Globalization", "RegionInfo", False, "ToString", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Globalization", "RegionInfo", False, "ToString", "()", "", "Argument[this].Property[System.Globalization.RegionInfo.Name]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Globalization", "RegionInfo", True, "get_CurrencyEnglishName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Globalization", "RegionInfo", True, "get_CurrencyNativeName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Globalization", "RegionInfo", True, "get_CurrencySymbol", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
@@ -69,26 +70,30 @@ extensions:
       - ["System.Globalization", "RegionInfo", True, "get_Name", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Globalization", "RegionInfo", True, "get_NativeName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Globalization", "RegionInfo", True, "get_ThreeLetterISORegionName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Globalization", "RegionInfo", True, "get_ThreeLetterWindowsRegionName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Globalization", "RegionInfo", True, "get_ThreeLetterWindowsRegionName", "()", "", "Argument[this].Property[System.Globalization.RegionInfo.ThreeLetterISORegionName]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Globalization", "RegionInfo", True, "get_TwoLetterISORegionName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Globalization", "SortKey", False, "ToString", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Globalization", "SortKey", False, "get_KeyData", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Globalization", "SortKey", False, "get_OriginalString", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Globalization", "SortVersion", False, "SortVersion", "(System.Int32,System.Guid)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Globalization", "SortVersion", False, "get_SortId", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Globalization", "StringInfo", False, "GetNextTextElement", "(System.String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Globalization", "StringInfo", False, "GetNextTextElement", "(System.String,System.Int32)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Globalization", "StringInfo", False, "GetTextElementEnumerator", "(System.String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Globalization", "StringInfo", False, "GetTextElementEnumerator", "(System.String,System.Int32)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Globalization", "SortKey", False, "get_OriginalString", "()", "", "Argument[this].SyntheticField[System.Globalization.SortKey._string]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Globalization", "SortVersion", False, "SortVersion", "(System.Int32,System.Guid)", "", "Argument[1]", "Argument[this].SyntheticField[System.Globalization.SortVersion.m_SortId]", "value", "dfc-generated"]
+      - ["System.Globalization", "SortVersion", False, "get_SortId", "()", "", "Argument[this].SyntheticField[System.Globalization.SortVersion.m_SortId]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Globalization", "StringInfo", False, "GetNextTextElement", "(System.String)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Globalization", "StringInfo", False, "GetNextTextElement", "(System.String,System.Int32)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Globalization", "StringInfo", False, "GetTextElementEnumerator", "(System.String)", "", "Argument[0]", "ReturnValue.SyntheticField[System.Globalization.TextElementEnumerator._str]", "value", "dfc-generated"]
+      - ["System.Globalization", "StringInfo", False, "GetTextElementEnumerator", "(System.String,System.Int32)", "", "Argument[0]", "ReturnValue.SyntheticField[System.Globalization.TextElementEnumerator._str]", "value", "dfc-generated"]
       - ["System.Globalization", "StringInfo", False, "StringInfo", "(System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Globalization", "StringInfo", False, "SubstringByTextElements", "(System.Int32)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Globalization", "StringInfo", False, "SubstringByTextElements", "(System.Int32,System.Int32)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Globalization", "TextElementEnumerator", False, "GetTextElement", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Globalization", "TextInfo", False, "ReadOnly", "(System.Globalization.TextInfo)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Globalization", "TextInfo", False, "ToLower", "(System.String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Globalization", "TextElementEnumerator", False, "GetTextElement", "()", "", "Argument[this].SyntheticField[System.Globalization.TextElementEnumerator._currentTextElementSubstr]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Globalization", "TextElementEnumerator", False, "GetTextElement", "()", "", "Argument[this].SyntheticField[System.Globalization.TextElementEnumerator._str]", "Argument[this].SyntheticField[System.Globalization.TextElementEnumerator._currentTextElementSubstr]", "value", "dfc-generated"]
+      - ["System.Globalization", "TextElementEnumerator", False, "GetTextElement", "()", "", "Argument[this].SyntheticField[System.Globalization.TextElementEnumerator._str]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Globalization", "TextElementEnumerator", False, "get_Current", "()", "", "Argument[this].SyntheticField[System.Globalization.TextElementEnumerator._currentTextElementSubstr]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Globalization", "TextElementEnumerator", False, "get_Current", "()", "", "Argument[this].SyntheticField[System.Globalization.TextElementEnumerator._str]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Globalization", "TextInfo", False, "ReadOnly", "(System.Globalization.TextInfo)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Globalization", "TextInfo", False, "ToLower", "(System.String)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Globalization", "TextInfo", False, "ToString", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Globalization", "TextInfo", False, "ToTitleCase", "(System.String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Globalization", "TextInfo", False, "ToUpper", "(System.String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Globalization", "TextInfo", False, "ToTitleCase", "(System.String)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Globalization", "TextInfo", False, "ToUpper", "(System.String)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Globalization", "TextInfo", False, "get_CultureName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
   - addsTo:
       pack: codeql/csharp-all
diff --git a/csharp/ql/lib/ext/generated/System.IO.Compression.model.yml b/csharp/ql/lib/ext/generated/System.IO.Compression.model.yml
index 623fb6f56e9..cdad89ab171 100644
--- a/csharp/ql/lib/ext/generated/System.IO.Compression.model.yml
+++ b/csharp/ql/lib/ext/generated/System.IO.Compression.model.yml
@@ -4,37 +4,30 @@ extensions:
       pack: codeql/csharp-all
       extensible: summaryModel
     data:
-      - ["System.IO.Compression", "BrotliStream", False, "BrotliStream", "(System.IO.Stream,System.IO.Compression.CompressionMode,System.Boolean)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.IO.Compression", "BrotliStream", False, "get_BaseStream", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.IO.Compression", "BrotliStream", False, "BrotliStream", "(System.IO.Stream,System.IO.Compression.CompressionMode,System.Boolean)", "", "Argument[0]", "Argument[this].SyntheticField[System.IO.Compression.BrotliStream._stream]", "value", "dfc-generated"]
+      - ["System.IO.Compression", "BrotliStream", False, "get_BaseStream", "()", "", "Argument[this].SyntheticField[System.IO.Compression.BrotliStream._stream]", "ReturnValue", "value", "dfc-generated"]
       - ["System.IO.Compression", "DeflateStream", False, "get_BaseStream", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.IO.Compression", "GZipStream", False, "GZipStream", "(System.IO.Stream,System.IO.Compression.CompressionLevel,System.Boolean)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.IO.Compression", "GZipStream", False, "GZipStream", "(System.IO.Stream,System.IO.Compression.CompressionMode,System.Boolean)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.IO.Compression", "GZipStream", False, "get_BaseStream", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.IO.Compression", "ZLibException", False, "ZLibException", "(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["System.IO.Compression", "GZipStream", False, "GZipStream", "(System.IO.Stream,System.IO.Compression.CompressionLevel,System.Boolean)", "", "Argument[0]", "Argument[this].SyntheticField[System.IO.Compression.GZipStream._deflateStream].SyntheticField[System.IO.Compression.DeflateStream._stream]", "value", "dfc-generated"]
+      - ["System.IO.Compression", "GZipStream", False, "GZipStream", "(System.IO.Stream,System.IO.Compression.CompressionMode,System.Boolean)", "", "Argument[0]", "Argument[this].SyntheticField[System.IO.Compression.GZipStream._deflateStream].SyntheticField[System.IO.Compression.DeflateStream._stream]", "value", "dfc-generated"]
+      - ["System.IO.Compression", "GZipStream", False, "get_BaseStream", "()", "", "Argument[this].SyntheticField[System.IO.Compression.GZipStream._deflateStream].SyntheticField[System.IO.Compression.DeflateStream._stream]", "ReturnValue", "value", "dfc-generated"]
       - ["System.IO.Compression", "ZLibException", False, "ZLibException", "(System.String,System.String,System.Int32,System.String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
       - ["System.IO.Compression", "ZLibException", False, "ZLibException", "(System.String,System.String,System.Int32,System.String)", "", "Argument[3]", "Argument[this]", "taint", "df-generated"]
-      - ["System.IO.Compression", "ZLibStream", False, "ZLibStream", "(System.IO.Stream,System.IO.Compression.CompressionLevel,System.Boolean)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.IO.Compression", "ZLibStream", False, "ZLibStream", "(System.IO.Stream,System.IO.Compression.CompressionMode,System.Boolean)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.IO.Compression", "ZLibStream", False, "get_BaseStream", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.IO.Compression", "ZipArchive", False, "CreateEntry", "(System.String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.IO.Compression", "ZipArchive", False, "CreateEntry", "(System.String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.IO.Compression", "ZipArchive", False, "CreateEntry", "(System.String,System.IO.Compression.CompressionLevel)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.IO.Compression", "ZipArchive", False, "CreateEntry", "(System.String,System.IO.Compression.CompressionLevel)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.IO.Compression", "ZLibStream", False, "ZLibStream", "(System.IO.Stream,System.IO.Compression.CompressionLevel,System.Boolean)", "", "Argument[0]", "Argument[this].SyntheticField[System.IO.Compression.ZLibStream._deflateStream].SyntheticField[System.IO.Compression.DeflateStream._stream]", "value", "dfc-generated"]
+      - ["System.IO.Compression", "ZLibStream", False, "ZLibStream", "(System.IO.Stream,System.IO.Compression.CompressionMode,System.Boolean)", "", "Argument[0]", "Argument[this].SyntheticField[System.IO.Compression.ZLibStream._deflateStream].SyntheticField[System.IO.Compression.DeflateStream._stream]", "value", "dfc-generated"]
+      - ["System.IO.Compression", "ZLibStream", False, "get_BaseStream", "()", "", "Argument[this].SyntheticField[System.IO.Compression.ZLibStream._deflateStream].SyntheticField[System.IO.Compression.DeflateStream._stream]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.IO.Compression", "ZipArchive", False, "CreateEntry", "(System.String)", "", "Argument[0]", "ReturnValue.SyntheticField[System.IO.Compression.ZipArchiveEntry._storedEntryName]", "value", "dfc-generated"]
+      - ["System.IO.Compression", "ZipArchive", False, "CreateEntry", "(System.String)", "", "Argument[this]", "ReturnValue.SyntheticField[System.IO.Compression.ZipArchiveEntry._archive]", "value", "dfc-generated"]
+      - ["System.IO.Compression", "ZipArchive", False, "CreateEntry", "(System.String,System.IO.Compression.CompressionLevel)", "", "Argument[0]", "ReturnValue.SyntheticField[System.IO.Compression.ZipArchiveEntry._storedEntryName]", "value", "dfc-generated"]
+      - ["System.IO.Compression", "ZipArchive", False, "CreateEntry", "(System.String,System.IO.Compression.CompressionLevel)", "", "Argument[this]", "ReturnValue.SyntheticField[System.IO.Compression.ZipArchiveEntry._archive]", "value", "dfc-generated"]
       - ["System.IO.Compression", "ZipArchive", False, "ZipArchive", "(System.IO.Stream,System.IO.Compression.ZipArchiveMode,System.Boolean,System.Text.Encoding)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.IO.Compression", "ZipArchive", False, "ZipArchive", "(System.IO.Stream,System.IO.Compression.ZipArchiveMode,System.Boolean,System.Text.Encoding)", "", "Argument[3]", "Argument[this]", "taint", "df-generated"]
       - ["System.IO.Compression", "ZipArchive", False, "get_Entries", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.IO.Compression", "ZipArchiveEntry", False, "Open", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.IO.Compression", "ZipArchiveEntry", False, "ToString", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.IO.Compression", "ZipArchiveEntry", False, "get_Archive", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.IO.Compression", "ZipArchiveEntry", False, "get_Name", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.IO.Compression", "ZipFile", False, "Open", "(System.String,System.IO.Compression.ZipArchiveMode)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.IO.Compression", "ZipFile", False, "Open", "(System.String,System.IO.Compression.ZipArchiveMode,System.Text.Encoding)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.IO.Compression", "ZipFile", False, "Open", "(System.String,System.IO.Compression.ZipArchiveMode,System.Text.Encoding)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
-      - ["System.IO.Compression", "ZipFile", False, "OpenRead", "(System.String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.IO.Compression", "ZipFileExtensions", False, "CreateEntryFromFile", "(System.IO.Compression.ZipArchive,System.String,System.String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.IO.Compression", "ZipFileExtensions", False, "CreateEntryFromFile", "(System.IO.Compression.ZipArchive,System.String,System.String)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
-      - ["System.IO.Compression", "ZipFileExtensions", False, "CreateEntryFromFile", "(System.IO.Compression.ZipArchive,System.String,System.String,System.IO.Compression.CompressionLevel)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.IO.Compression", "ZipFileExtensions", False, "CreateEntryFromFile", "(System.IO.Compression.ZipArchive,System.String,System.String,System.IO.Compression.CompressionLevel)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
+      - ["System.IO.Compression", "ZipArchiveEntry", False, "ToString", "()", "", "Argument[this].Property[System.IO.Compression.ZipArchiveEntry.FullName]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.IO.Compression", "ZipArchiveEntry", False, "ToString", "()", "", "Argument[this].SyntheticField[System.IO.Compression.ZipArchiveEntry._storedEntryName]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.IO.Compression", "ZipArchiveEntry", False, "get_Archive", "()", "", "Argument[this].SyntheticField[System.IO.Compression.ZipArchiveEntry._archive]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.IO.Compression", "ZipArchiveEntry", False, "get_Name", "()", "", "Argument[this].Property[System.IO.Compression.ZipArchiveEntry.FullName]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.IO.Compression", "ZipArchiveEntry", False, "get_Name", "()", "", "Argument[this].SyntheticField[System.IO.Compression.ZipArchiveEntry._storedEntryName]", "ReturnValue", "value", "dfc-generated"]
   - addsTo:
       pack: codeql/csharp-all
       extensible: neutralModel
@@ -93,6 +86,7 @@ extensions:
       - ["System.IO.Compression", "GZipStream", "get_CanSeek", "()", "summary", "df-generated"]
       - ["System.IO.Compression", "GZipStream", "get_CanWrite", "()", "summary", "df-generated"]
       - ["System.IO.Compression", "GZipStream", "get_Length", "()", "summary", "df-generated"]
+      - ["System.IO.Compression", "ZLibException", "ZLibException", "(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)", "summary", "df-generated"]
       - ["System.IO.Compression", "ZLibException", "ZLibException", "(System.String,System.Exception)", "summary", "df-generated"]
       - ["System.IO.Compression", "ZLibStream", "Dispose", "(System.Boolean)", "summary", "df-generated"]
       - ["System.IO.Compression", "ZLibStream", "EndRead", "(System.IAsyncResult)", "summary", "df-generated"]
@@ -135,6 +129,11 @@ extensions:
       - ["System.IO.Compression", "ZipFile", "ExtractToDirectory", "(System.String,System.String,System.Boolean)", "summary", "df-generated"]
       - ["System.IO.Compression", "ZipFile", "ExtractToDirectory", "(System.String,System.String,System.Text.Encoding)", "summary", "df-generated"]
       - ["System.IO.Compression", "ZipFile", "ExtractToDirectory", "(System.String,System.String,System.Text.Encoding,System.Boolean)", "summary", "df-generated"]
+      - ["System.IO.Compression", "ZipFile", "Open", "(System.String,System.IO.Compression.ZipArchiveMode)", "summary", "df-generated"]
+      - ["System.IO.Compression", "ZipFile", "Open", "(System.String,System.IO.Compression.ZipArchiveMode,System.Text.Encoding)", "summary", "df-generated"]
+      - ["System.IO.Compression", "ZipFile", "OpenRead", "(System.String)", "summary", "df-generated"]
+      - ["System.IO.Compression", "ZipFileExtensions", "CreateEntryFromFile", "(System.IO.Compression.ZipArchive,System.String,System.String)", "summary", "df-generated"]
+      - ["System.IO.Compression", "ZipFileExtensions", "CreateEntryFromFile", "(System.IO.Compression.ZipArchive,System.String,System.String,System.IO.Compression.CompressionLevel)", "summary", "df-generated"]
       - ["System.IO.Compression", "ZipFileExtensions", "ExtractToDirectory", "(System.IO.Compression.ZipArchive,System.String)", "summary", "df-generated"]
       - ["System.IO.Compression", "ZipFileExtensions", "ExtractToDirectory", "(System.IO.Compression.ZipArchive,System.String,System.Boolean)", "summary", "df-generated"]
       - ["System.IO.Compression", "ZipFileExtensions", "ExtractToFile", "(System.IO.Compression.ZipArchiveEntry,System.String)", "summary", "df-generated"]
diff --git a/csharp/ql/lib/ext/generated/System.IO.Enumeration.model.yml b/csharp/ql/lib/ext/generated/System.IO.Enumeration.model.yml
index be161f158ae..d61db4da190 100644
--- a/csharp/ql/lib/ext/generated/System.IO.Enumeration.model.yml
+++ b/csharp/ql/lib/ext/generated/System.IO.Enumeration.model.yml
@@ -7,8 +7,11 @@ extensions:
       - ["System.IO.Enumeration", "FileSystemEntry", False, "ToFileSystemInfo", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.IO.Enumeration", "FileSystemEntry", False, "ToSpecifiedFullPath", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.IO.Enumeration", "FileSystemEntry", False, "get_FileName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.IO.Enumeration", "FileSystemEnumerator<TResult>", False, "get_Current", "()", "", "Argument[this].Property[System.IO.Enumeration.FileSystemEnumerator`1.Current]", "ReturnValue", "value", "dfc-generated"]
       - ["System.IO.Enumeration", "FileSystemEnumerator<TResult>", False, "get_Current", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.IO.Enumeration", "FileSystemName", False, "TranslateWin32Expression", "(System.String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["System.IO.Enumeration", "FileSystemEnumerator<TResult>", True, "ShouldIncludeEntry", "(System.IO.Enumeration.FileSystemEntry)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.IO.Enumeration", "FileSystemEnumerator<TResult>", True, "ShouldRecurseIntoEntry", "(System.IO.Enumeration.FileSystemEntry)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.IO.Enumeration", "FileSystemName", False, "TranslateWin32Expression", "(System.String)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
   - addsTo:
       pack: codeql/csharp-all
       extensible: neutralModel
@@ -21,6 +24,7 @@ extensions:
       - ["System.IO.Enumeration", "FileSystemEntry", "get_LastAccessTimeUtc", "()", "summary", "df-generated"]
       - ["System.IO.Enumeration", "FileSystemEntry", "get_LastWriteTimeUtc", "()", "summary", "df-generated"]
       - ["System.IO.Enumeration", "FileSystemEntry", "get_Length", "()", "summary", "df-generated"]
+      - ["System.IO.Enumeration", "FileSystemEnumerable<TResult>", "FileSystemEnumerable", "(System.String,System.IO.Enumeration.FileSystemEnumerable<TResult>+FindTransform,System.IO.EnumerationOptions)", "summary", "df-generated"]
       - ["System.IO.Enumeration", "FileSystemEnumerator<TResult>", "ContinueOnError", "(System.Int32)", "summary", "df-generated"]
       - ["System.IO.Enumeration", "FileSystemEnumerator<TResult>", "Dispose", "()", "summary", "df-generated"]
       - ["System.IO.Enumeration", "FileSystemEnumerator<TResult>", "Dispose", "(System.Boolean)", "summary", "df-generated"]
@@ -28,8 +32,6 @@ extensions:
       - ["System.IO.Enumeration", "FileSystemEnumerator<TResult>", "MoveNext", "()", "summary", "df-generated"]
       - ["System.IO.Enumeration", "FileSystemEnumerator<TResult>", "OnDirectoryFinished", "(System.ReadOnlySpan<System.Char>)", "summary", "df-generated"]
       - ["System.IO.Enumeration", "FileSystemEnumerator<TResult>", "Reset", "()", "summary", "df-generated"]
-      - ["System.IO.Enumeration", "FileSystemEnumerator<TResult>", "ShouldIncludeEntry", "(System.IO.Enumeration.FileSystemEntry)", "summary", "df-generated"]
-      - ["System.IO.Enumeration", "FileSystemEnumerator<TResult>", "ShouldRecurseIntoEntry", "(System.IO.Enumeration.FileSystemEntry)", "summary", "df-generated"]
       - ["System.IO.Enumeration", "FileSystemEnumerator<TResult>", "TransformEntry", "(System.IO.Enumeration.FileSystemEntry)", "summary", "df-generated"]
       - ["System.IO.Enumeration", "FileSystemName", "MatchesSimpleExpression", "(System.ReadOnlySpan<System.Char>,System.ReadOnlySpan<System.Char>,System.Boolean)", "summary", "df-generated"]
       - ["System.IO.Enumeration", "FileSystemName", "MatchesWin32Expression", "(System.ReadOnlySpan<System.Char>,System.ReadOnlySpan<System.Char>,System.Boolean)", "summary", "df-generated"]
diff --git a/csharp/ql/lib/ext/generated/System.IO.MemoryMappedFiles.model.yml b/csharp/ql/lib/ext/generated/System.IO.MemoryMappedFiles.model.yml
index 20eff5a1564..9f587335597 100644
--- a/csharp/ql/lib/ext/generated/System.IO.MemoryMappedFiles.model.yml
+++ b/csharp/ql/lib/ext/generated/System.IO.MemoryMappedFiles.model.yml
@@ -6,11 +6,6 @@ extensions:
     data:
       - ["System.IO.MemoryMappedFiles", "MemoryMappedFile", False, "CreateFromFile", "(Microsoft.Win32.SafeHandles.SafeFileHandle,System.String,System.Int64,System.IO.MemoryMappedFiles.MemoryMappedFileAccess,System.IO.HandleInheritability,System.Boolean)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["System.IO.MemoryMappedFiles", "MemoryMappedFile", False, "CreateFromFile", "(System.IO.FileStream,System.String,System.Int64,System.IO.MemoryMappedFiles.MemoryMappedFileAccess,System.IO.HandleInheritability,System.Boolean)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.IO.MemoryMappedFiles", "MemoryMappedFile", False, "CreateFromFile", "(System.String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.IO.MemoryMappedFiles", "MemoryMappedFile", False, "CreateFromFile", "(System.String,System.IO.FileMode)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.IO.MemoryMappedFiles", "MemoryMappedFile", False, "CreateFromFile", "(System.String,System.IO.FileMode,System.String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.IO.MemoryMappedFiles", "MemoryMappedFile", False, "CreateFromFile", "(System.String,System.IO.FileMode,System.String,System.Int64)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.IO.MemoryMappedFiles", "MemoryMappedFile", False, "CreateFromFile", "(System.String,System.IO.FileMode,System.String,System.Int64,System.IO.MemoryMappedFiles.MemoryMappedFileAccess)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["System.IO.MemoryMappedFiles", "MemoryMappedFile", False, "get_SafeMemoryMappedFileHandle", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.IO.MemoryMappedFiles", "MemoryMappedViewAccessor", False, "get_SafeMemoryMappedViewHandle", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.IO.MemoryMappedFiles", "MemoryMappedViewStream", False, "get_SafeMemoryMappedViewHandle", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
@@ -18,6 +13,11 @@ extensions:
       pack: codeql/csharp-all
       extensible: neutralModel
     data:
+      - ["System.IO.MemoryMappedFiles", "MemoryMappedFile", "CreateFromFile", "(System.String)", "summary", "df-generated"]
+      - ["System.IO.MemoryMappedFiles", "MemoryMappedFile", "CreateFromFile", "(System.String,System.IO.FileMode)", "summary", "df-generated"]
+      - ["System.IO.MemoryMappedFiles", "MemoryMappedFile", "CreateFromFile", "(System.String,System.IO.FileMode,System.String)", "summary", "df-generated"]
+      - ["System.IO.MemoryMappedFiles", "MemoryMappedFile", "CreateFromFile", "(System.String,System.IO.FileMode,System.String,System.Int64)", "summary", "df-generated"]
+      - ["System.IO.MemoryMappedFiles", "MemoryMappedFile", "CreateFromFile", "(System.String,System.IO.FileMode,System.String,System.Int64,System.IO.MemoryMappedFiles.MemoryMappedFileAccess)", "summary", "df-generated"]
       - ["System.IO.MemoryMappedFiles", "MemoryMappedFile", "CreateNew", "(System.String,System.Int64)", "summary", "df-generated"]
       - ["System.IO.MemoryMappedFiles", "MemoryMappedFile", "CreateNew", "(System.String,System.Int64,System.IO.MemoryMappedFiles.MemoryMappedFileAccess)", "summary", "df-generated"]
       - ["System.IO.MemoryMappedFiles", "MemoryMappedFile", "CreateNew", "(System.String,System.Int64,System.IO.MemoryMappedFiles.MemoryMappedFileAccess,System.IO.MemoryMappedFiles.MemoryMappedFileOptions,System.IO.HandleInheritability)", "summary", "df-generated"]
diff --git a/csharp/ql/lib/ext/generated/System.IO.Packaging.model.yml b/csharp/ql/lib/ext/generated/System.IO.Packaging.model.yml
index af8efff17f5..23d6dcbccf3 100644
--- a/csharp/ql/lib/ext/generated/System.IO.Packaging.model.yml
+++ b/csharp/ql/lib/ext/generated/System.IO.Packaging.model.yml
@@ -4,28 +4,14 @@ extensions:
       pack: codeql/csharp-all
       extensible: summaryModel
     data:
-      - ["System.IO.Packaging", "PackUriHelper", False, "Create", "(System.Uri)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.IO.Packaging", "PackUriHelper", False, "Create", "(System.Uri,System.Uri)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.IO.Packaging", "PackUriHelper", False, "Create", "(System.Uri,System.Uri)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["System.IO.Packaging", "PackUriHelper", False, "Create", "(System.Uri,System.Uri,System.String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.IO.Packaging", "PackUriHelper", False, "Create", "(System.Uri,System.Uri,System.String)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["System.IO.Packaging", "PackUriHelper", False, "Create", "(System.Uri,System.Uri,System.String)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
       - ["System.IO.Packaging", "PackUriHelper", False, "GetNormalizedPartUri", "(System.Uri)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.IO.Packaging", "PackUriHelper", False, "GetPackageUri", "(System.Uri)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.IO.Packaging", "PackUriHelper", False, "GetPartUri", "(System.Uri)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.IO.Packaging", "PackUriHelper", False, "GetRelativeUri", "(System.Uri,System.Uri)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["System.IO.Packaging", "Package", False, "CreatePart", "(System.Uri,System.String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["System.IO.Packaging", "Package", False, "CreatePart", "(System.Uri,System.String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.IO.Packaging", "Package", False, "CreatePart", "(System.Uri,System.String,System.IO.Packaging.CompressionOption)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["System.IO.Packaging", "Package", False, "CreatePart", "(System.Uri,System.String,System.IO.Packaging.CompressionOption)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.IO.Packaging", "Package", False, "CreateRelationship", "(System.Uri,System.IO.Packaging.TargetMode,System.String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.IO.Packaging", "Package", False, "CreateRelationship", "(System.Uri,System.IO.Packaging.TargetMode,System.String)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
-      - ["System.IO.Packaging", "Package", False, "CreateRelationship", "(System.Uri,System.IO.Packaging.TargetMode,System.String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.IO.Packaging", "Package", False, "CreateRelationship", "(System.Uri,System.IO.Packaging.TargetMode,System.String,System.String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.IO.Packaging", "Package", False, "CreateRelationship", "(System.Uri,System.IO.Packaging.TargetMode,System.String,System.String)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
-      - ["System.IO.Packaging", "Package", False, "CreateRelationship", "(System.Uri,System.IO.Packaging.TargetMode,System.String,System.String)", "", "Argument[3]", "ReturnValue", "taint", "df-generated"]
-      - ["System.IO.Packaging", "Package", False, "CreateRelationship", "(System.Uri,System.IO.Packaging.TargetMode,System.String,System.String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.IO.Packaging", "Package", False, "GetPart", "(System.Uri)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.IO.Packaging", "Package", False, "CreateRelationship", "(System.Uri,System.IO.Packaging.TargetMode,System.String)", "", "Argument[0]", "ReturnValue.SyntheticField[System.IO.Packaging.PackageRelationship._targetUri]", "value", "dfc-generated"]
+      - ["System.IO.Packaging", "Package", False, "CreateRelationship", "(System.Uri,System.IO.Packaging.TargetMode,System.String)", "", "Argument[2]", "ReturnValue.SyntheticField[System.IO.Packaging.PackageRelationship._relationshipType]", "value", "dfc-generated"]
+      - ["System.IO.Packaging", "Package", False, "CreateRelationship", "(System.Uri,System.IO.Packaging.TargetMode,System.String,System.String)", "", "Argument[0]", "ReturnValue.SyntheticField[System.IO.Packaging.PackageRelationship._targetUri]", "value", "dfc-generated"]
+      - ["System.IO.Packaging", "Package", False, "CreateRelationship", "(System.Uri,System.IO.Packaging.TargetMode,System.String,System.String)", "", "Argument[2]", "ReturnValue.SyntheticField[System.IO.Packaging.PackageRelationship._relationshipType]", "value", "dfc-generated"]
+      - ["System.IO.Packaging", "Package", False, "CreateRelationship", "(System.Uri,System.IO.Packaging.TargetMode,System.String,System.String)", "", "Argument[3]", "ReturnValue.SyntheticField[System.IO.Packaging.PackageRelationship._id]", "value", "dfc-generated"]
       - ["System.IO.Packaging", "Package", False, "GetParts", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.IO.Packaging", "Package", False, "GetRelationships", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.IO.Packaging", "Package", False, "GetRelationshipsByType", "(System.String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
@@ -33,47 +19,50 @@ extensions:
       - ["System.IO.Packaging", "Package", False, "Open", "(System.IO.Stream)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["System.IO.Packaging", "Package", False, "Open", "(System.IO.Stream,System.IO.FileMode)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["System.IO.Packaging", "Package", False, "Open", "(System.IO.Stream,System.IO.FileMode,System.IO.FileAccess)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.IO.Packaging", "Package", True, "CreatePartCore", "(System.Uri,System.String,System.IO.Packaging.CompressionOption)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["System.IO.Packaging", "Package", True, "CreatePartCore", "(System.Uri,System.String,System.IO.Packaging.CompressionOption)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.IO.Packaging", "PackagePart", False, "CreateRelationship", "(System.Uri,System.IO.Packaging.TargetMode,System.String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.IO.Packaging", "PackagePart", False, "CreateRelationship", "(System.Uri,System.IO.Packaging.TargetMode,System.String)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
-      - ["System.IO.Packaging", "PackagePart", False, "CreateRelationship", "(System.Uri,System.IO.Packaging.TargetMode,System.String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.IO.Packaging", "PackagePart", False, "CreateRelationship", "(System.Uri,System.IO.Packaging.TargetMode,System.String,System.String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.IO.Packaging", "PackagePart", False, "CreateRelationship", "(System.Uri,System.IO.Packaging.TargetMode,System.String,System.String)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
-      - ["System.IO.Packaging", "PackagePart", False, "CreateRelationship", "(System.Uri,System.IO.Packaging.TargetMode,System.String,System.String)", "", "Argument[3]", "ReturnValue", "taint", "df-generated"]
-      - ["System.IO.Packaging", "PackagePart", False, "CreateRelationship", "(System.Uri,System.IO.Packaging.TargetMode,System.String,System.String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.IO.Packaging", "PackagePart", False, "CreateRelationship", "(System.Uri,System.IO.Packaging.TargetMode,System.String)", "", "Argument[0]", "ReturnValue.SyntheticField[System.IO.Packaging.PackageRelationship._targetUri]", "value", "dfc-generated"]
+      - ["System.IO.Packaging", "PackagePart", False, "CreateRelationship", "(System.Uri,System.IO.Packaging.TargetMode,System.String)", "", "Argument[2]", "ReturnValue.SyntheticField[System.IO.Packaging.PackageRelationship._relationshipType]", "value", "dfc-generated"]
+      - ["System.IO.Packaging", "PackagePart", False, "CreateRelationship", "(System.Uri,System.IO.Packaging.TargetMode,System.String,System.String)", "", "Argument[0]", "ReturnValue.SyntheticField[System.IO.Packaging.PackageRelationship._targetUri]", "value", "dfc-generated"]
+      - ["System.IO.Packaging", "PackagePart", False, "CreateRelationship", "(System.Uri,System.IO.Packaging.TargetMode,System.String,System.String)", "", "Argument[2]", "ReturnValue.SyntheticField[System.IO.Packaging.PackageRelationship._relationshipType]", "value", "dfc-generated"]
+      - ["System.IO.Packaging", "PackagePart", False, "CreateRelationship", "(System.Uri,System.IO.Packaging.TargetMode,System.String,System.String)", "", "Argument[3]", "ReturnValue.SyntheticField[System.IO.Packaging.PackageRelationship._id]", "value", "dfc-generated"]
       - ["System.IO.Packaging", "PackagePart", False, "GetRelationships", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.IO.Packaging", "PackagePart", False, "GetRelationshipsByType", "(System.String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["System.IO.Packaging", "PackagePart", False, "GetRelationshipsByType", "(System.String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.IO.Packaging", "PackagePart", False, "GetStream", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.IO.Packaging", "PackagePart", False, "GetStream", "(System.IO.FileMode)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.IO.Packaging", "PackagePart", False, "GetStream", "(System.IO.FileMode,System.IO.FileAccess)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.IO.Packaging", "PackagePart", False, "PackagePart", "(System.IO.Packaging.Package,System.Uri,System.String,System.IO.Packaging.CompressionOption)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.IO.Packaging", "PackagePart", False, "PackagePart", "(System.IO.Packaging.Package,System.Uri,System.String,System.IO.Packaging.CompressionOption)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["System.IO.Packaging", "PackagePart", False, "PackagePart", "(System.IO.Packaging.Package,System.Uri,System.String,System.IO.Packaging.CompressionOption)", "", "Argument[0]", "Argument[this].SyntheticField[System.IO.Packaging.PackagePart._container]", "value", "dfc-generated"]
+      - ["System.IO.Packaging", "PackagePart", False, "PackagePart", "(System.IO.Packaging.Package,System.Uri,System.String,System.IO.Packaging.CompressionOption)", "", "Argument[1]", "Argument[this].SyntheticField[System.IO.Packaging.PackagePart._uri]", "value", "dfc-generated"]
       - ["System.IO.Packaging", "PackagePart", False, "get_ContentType", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.IO.Packaging", "PackagePart", False, "get_Package", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.IO.Packaging", "PackagePart", False, "get_Uri", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.IO.Packaging", "PackagePart", False, "get_Package", "()", "", "Argument[this].SyntheticField[System.IO.Packaging.PackagePart._container]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.IO.Packaging", "PackagePart", False, "get_Uri", "()", "", "Argument[this].SyntheticField[System.IO.Packaging.PackagePart._uri]", "ReturnValue", "value", "dfc-generated"]
       - ["System.IO.Packaging", "PackagePart", True, "GetStreamCore", "(System.IO.FileMode,System.IO.FileAccess)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.IO.Packaging", "PackagePartCollection", False, "GetEnumerator", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.IO.Packaging", "PackageRelationship", False, "get_Id", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.IO.Packaging", "PackageRelationship", False, "get_Id", "()", "", "Argument[this].SyntheticField[System.IO.Packaging.PackageRelationship._id]", "ReturnValue", "value", "dfc-generated"]
       - ["System.IO.Packaging", "PackageRelationship", False, "get_Package", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.IO.Packaging", "PackageRelationship", False, "get_RelationshipType", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.IO.Packaging", "PackageRelationship", False, "get_RelationshipType", "()", "", "Argument[this].SyntheticField[System.IO.Packaging.PackageRelationship._relationshipType]", "ReturnValue", "value", "dfc-generated"]
       - ["System.IO.Packaging", "PackageRelationship", False, "get_SourceUri", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.IO.Packaging", "PackageRelationship", False, "get_TargetUri", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.IO.Packaging", "PackageRelationshipSelector", False, "PackageRelationshipSelector", "(System.Uri,System.IO.Packaging.PackageRelationshipSelectorType,System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.IO.Packaging", "PackageRelationshipSelector", False, "PackageRelationshipSelector", "(System.Uri,System.IO.Packaging.PackageRelationshipSelectorType,System.String)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
+      - ["System.IO.Packaging", "PackageRelationship", False, "get_TargetUri", "()", "", "Argument[this].SyntheticField[System.IO.Packaging.PackageRelationship._targetUri]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.IO.Packaging", "PackageRelationshipSelector", False, "PackageRelationshipSelector", "(System.Uri,System.IO.Packaging.PackageRelationshipSelectorType,System.String)", "", "Argument[0]", "Argument[this].SyntheticField[System.IO.Packaging.PackageRelationshipSelector._sourceUri]", "value", "dfc-generated"]
+      - ["System.IO.Packaging", "PackageRelationshipSelector", False, "PackageRelationshipSelector", "(System.Uri,System.IO.Packaging.PackageRelationshipSelectorType,System.String)", "", "Argument[2]", "Argument[this].SyntheticField[System.IO.Packaging.PackageRelationshipSelector._selectionCriteria]", "value", "dfc-generated"]
       - ["System.IO.Packaging", "PackageRelationshipSelector", False, "Select", "(System.IO.Packaging.Package)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["System.IO.Packaging", "PackageRelationshipSelector", False, "Select", "(System.IO.Packaging.Package)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.IO.Packaging", "PackageRelationshipSelector", False, "get_SelectionCriteria", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.IO.Packaging", "PackageRelationshipSelector", False, "get_SourceUri", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.IO.Packaging", "PackageRelationshipSelector", False, "get_SelectionCriteria", "()", "", "Argument[this].SyntheticField[System.IO.Packaging.PackageRelationshipSelector._selectionCriteria]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.IO.Packaging", "PackageRelationshipSelector", False, "get_SourceUri", "()", "", "Argument[this].SyntheticField[System.IO.Packaging.PackageRelationshipSelector._sourceUri]", "ReturnValue", "value", "dfc-generated"]
   - addsTo:
       pack: codeql/csharp-all
       extensible: neutralModel
     data:
       - ["System.IO.Packaging", "PackUriHelper", "ComparePackUri", "(System.Uri,System.Uri)", "summary", "df-generated"]
       - ["System.IO.Packaging", "PackUriHelper", "ComparePartUri", "(System.Uri,System.Uri)", "summary", "df-generated"]
+      - ["System.IO.Packaging", "PackUriHelper", "Create", "(System.Uri)", "summary", "df-generated"]
+      - ["System.IO.Packaging", "PackUriHelper", "Create", "(System.Uri,System.Uri)", "summary", "df-generated"]
+      - ["System.IO.Packaging", "PackUriHelper", "Create", "(System.Uri,System.Uri,System.String)", "summary", "df-generated"]
       - ["System.IO.Packaging", "PackUriHelper", "CreatePartUri", "(System.Uri)", "summary", "df-generated"]
+      - ["System.IO.Packaging", "PackUriHelper", "GetPackageUri", "(System.Uri)", "summary", "df-generated"]
+      - ["System.IO.Packaging", "PackUriHelper", "GetPartUri", "(System.Uri)", "summary", "df-generated"]
       - ["System.IO.Packaging", "PackUriHelper", "GetRelationshipPartUri", "(System.Uri)", "summary", "df-generated"]
+      - ["System.IO.Packaging", "PackUriHelper", "GetRelativeUri", "(System.Uri,System.Uri)", "summary", "df-generated"]
       - ["System.IO.Packaging", "PackUriHelper", "GetSourcePartUriFromRelationshipPartUri", "(System.Uri)", "summary", "df-generated"]
       - ["System.IO.Packaging", "PackUriHelper", "IsRelationshipPartUri", "(System.Uri)", "summary", "df-generated"]
       - ["System.IO.Packaging", "PackUriHelper", "ResolvePartUri", "(System.Uri,System.Uri)", "summary", "df-generated"]
@@ -85,6 +74,7 @@ extensions:
       - ["System.IO.Packaging", "Package", "Dispose", "(System.Boolean)", "summary", "df-generated"]
       - ["System.IO.Packaging", "Package", "Flush", "()", "summary", "df-generated"]
       - ["System.IO.Packaging", "Package", "FlushCore", "()", "summary", "df-generated"]
+      - ["System.IO.Packaging", "Package", "GetPart", "(System.Uri)", "summary", "df-generated"]
       - ["System.IO.Packaging", "Package", "GetPartCore", "(System.Uri)", "summary", "df-generated"]
       - ["System.IO.Packaging", "Package", "GetPartsCore", "()", "summary", "df-generated"]
       - ["System.IO.Packaging", "Package", "GetRelationship", "(System.String)", "summary", "df-generated"]
diff --git a/csharp/ql/lib/ext/generated/System.IO.Pipelines.model.yml b/csharp/ql/lib/ext/generated/System.IO.Pipelines.model.yml
index 29a3859cdbc..f2069362d71 100644
--- a/csharp/ql/lib/ext/generated/System.IO.Pipelines.model.yml
+++ b/csharp/ql/lib/ext/generated/System.IO.Pipelines.model.yml
@@ -10,27 +10,16 @@ extensions:
       - ["System.IO.Pipelines", "PipeReader", False, "Create", "(System.Buffers.ReadOnlySequence<System.Byte>)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["System.IO.Pipelines", "PipeReader", False, "Create", "(System.IO.Stream,System.IO.Pipelines.StreamPipeReaderOptions)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["System.IO.Pipelines", "PipeReader", False, "Create", "(System.IO.Stream,System.IO.Pipelines.StreamPipeReaderOptions)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["System.IO.Pipelines", "PipeReader", False, "ReadAtLeastAsync", "(System.Int32,System.Threading.CancellationToken)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.IO.Pipelines", "PipeReader", True, "AdvanceTo", "(System.SequencePosition)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.IO.Pipelines", "PipeReader", True, "AdvanceTo", "(System.SequencePosition,System.SequencePosition)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.IO.Pipelines", "PipeReader", True, "AsStream", "(System.Boolean)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.IO.Pipelines", "PipeReader", True, "CompleteAsync", "(System.Exception)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.IO.Pipelines", "PipeReader", True, "CopyToAsync", "(System.IO.Pipelines.PipeWriter,System.Threading.CancellationToken)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["System.IO.Pipelines", "PipeReader", True, "CopyToAsync", "(System.IO.Stream,System.Threading.CancellationToken)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
       - ["System.IO.Pipelines", "PipeReader", True, "CopyToAsync", "(System.IO.Stream,System.Threading.CancellationToken)", "", "Argument[this]", "Argument[0]", "taint", "df-generated"]
-      - ["System.IO.Pipelines", "PipeReader", True, "ReadAsync", "(System.Threading.CancellationToken)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.IO.Pipelines", "PipeReader", True, "ReadAtLeastAsyncCore", "(System.Int32,System.Threading.CancellationToken)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.IO.Pipelines", "PipeReader", True, "TryRead", "(System.IO.Pipelines.ReadResult)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.IO.Pipelines", "PipeScheduler", True, "Schedule", "(System.Action<System.Object>,System.Object)", "", "Argument[1]", "Argument[0].Parameter[0]", "value", "dfc-generated"]
       - ["System.IO.Pipelines", "PipeWriter", False, "Create", "(System.IO.Stream,System.IO.Pipelines.StreamPipeWriterOptions)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["System.IO.Pipelines", "PipeWriter", False, "Create", "(System.IO.Stream,System.IO.Pipelines.StreamPipeWriterOptions)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
       - ["System.IO.Pipelines", "PipeWriter", True, "AsStream", "(System.Boolean)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.IO.Pipelines", "PipeWriter", True, "FlushAsync", "(System.Threading.CancellationToken)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.IO.Pipelines", "PipeWriter", True, "GetMemory", "(System.Int32)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.IO.Pipelines", "PipeWriter", True, "GetSpan", "(System.Int32)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.IO.Pipelines", "PipeWriter", True, "WriteAsync", "(System.ReadOnlyMemory<System.Byte>,System.Threading.CancellationToken)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.IO.Pipelines", "ReadResult", False, "ReadResult", "(System.Buffers.ReadOnlySequence<System.Byte>,System.Boolean,System.Boolean)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.IO.Pipelines", "ReadResult", False, "get_Buffer", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.IO.Pipelines", "StreamPipeExtensions", False, "CopyToAsync", "(System.IO.Stream,System.IO.Pipelines.PipeWriter,System.Threading.CancellationToken)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
+      - ["System.IO.Pipelines", "ReadResult", False, "ReadResult", "(System.Buffers.ReadOnlySequence<System.Byte>,System.Boolean,System.Boolean)", "", "Argument[0]", "Argument[this].SyntheticField[System.IO.Pipelines.ReadResult._resultBuffer]", "value", "dfc-generated"]
+      - ["System.IO.Pipelines", "ReadResult", False, "get_Buffer", "()", "", "Argument[this].SyntheticField[System.IO.Pipelines.ReadResult._resultBuffer]", "ReturnValue", "value", "dfc-generated"]
   - addsTo:
       pack: codeql/csharp-all
       extensible: neutralModel
@@ -50,8 +39,17 @@ extensions:
       - ["System.IO.Pipelines", "PipeOptions", "get_ResumeWriterThreshold", "()", "summary", "df-generated"]
       - ["System.IO.Pipelines", "PipeOptions", "get_UseSynchronizationContext", "()", "summary", "df-generated"]
       - ["System.IO.Pipelines", "PipeOptions", "get_WriterScheduler", "()", "summary", "df-generated"]
+      - ["System.IO.Pipelines", "PipeReader", "AdvanceTo", "(System.SequencePosition)", "summary", "df-generated"]
+      - ["System.IO.Pipelines", "PipeReader", "AdvanceTo", "(System.SequencePosition,System.SequencePosition)", "summary", "df-generated"]
       - ["System.IO.Pipelines", "PipeReader", "CancelPendingRead", "()", "summary", "df-generated"]
       - ["System.IO.Pipelines", "PipeReader", "Complete", "(System.Exception)", "summary", "df-generated"]
+      - ["System.IO.Pipelines", "PipeReader", "CompleteAsync", "(System.Exception)", "summary", "df-generated"]
+      - ["System.IO.Pipelines", "PipeReader", "CopyToAsync", "(System.IO.Pipelines.PipeWriter,System.Threading.CancellationToken)", "summary", "df-generated"]
+      - ["System.IO.Pipelines", "PipeReader", "OnWriterCompleted", "(System.Action<System.Exception,System.Object>,System.Object)", "summary", "df-generated"]
+      - ["System.IO.Pipelines", "PipeReader", "ReadAsync", "(System.Threading.CancellationToken)", "summary", "df-generated"]
+      - ["System.IO.Pipelines", "PipeReader", "ReadAtLeastAsync", "(System.Int32,System.Threading.CancellationToken)", "summary", "df-generated"]
+      - ["System.IO.Pipelines", "PipeReader", "ReadAtLeastAsyncCore", "(System.Int32,System.Threading.CancellationToken)", "summary", "df-generated"]
+      - ["System.IO.Pipelines", "PipeReader", "TryRead", "(System.IO.Pipelines.ReadResult)", "summary", "df-generated"]
       - ["System.IO.Pipelines", "PipeScheduler", "get_Inline", "()", "summary", "df-generated"]
       - ["System.IO.Pipelines", "PipeScheduler", "get_ThreadPool", "()", "summary", "df-generated"]
       - ["System.IO.Pipelines", "PipeWriter", "Advance", "(System.Int32)", "summary", "df-generated"]
@@ -59,10 +57,14 @@ extensions:
       - ["System.IO.Pipelines", "PipeWriter", "Complete", "(System.Exception)", "summary", "df-generated"]
       - ["System.IO.Pipelines", "PipeWriter", "CompleteAsync", "(System.Exception)", "summary", "df-generated"]
       - ["System.IO.Pipelines", "PipeWriter", "CopyFromAsync", "(System.IO.Stream,System.Threading.CancellationToken)", "summary", "df-generated"]
+      - ["System.IO.Pipelines", "PipeWriter", "FlushAsync", "(System.Threading.CancellationToken)", "summary", "df-generated"]
+      - ["System.IO.Pipelines", "PipeWriter", "OnReaderCompleted", "(System.Action<System.Exception,System.Object>,System.Object)", "summary", "df-generated"]
+      - ["System.IO.Pipelines", "PipeWriter", "WriteAsync", "(System.ReadOnlyMemory<System.Byte>,System.Threading.CancellationToken)", "summary", "df-generated"]
       - ["System.IO.Pipelines", "PipeWriter", "get_CanGetUnflushedBytes", "()", "summary", "df-generated"]
       - ["System.IO.Pipelines", "PipeWriter", "get_UnflushedBytes", "()", "summary", "df-generated"]
       - ["System.IO.Pipelines", "ReadResult", "get_IsCanceled", "()", "summary", "df-generated"]
       - ["System.IO.Pipelines", "ReadResult", "get_IsCompleted", "()", "summary", "df-generated"]
+      - ["System.IO.Pipelines", "StreamPipeExtensions", "CopyToAsync", "(System.IO.Stream,System.IO.Pipelines.PipeWriter,System.Threading.CancellationToken)", "summary", "df-generated"]
       - ["System.IO.Pipelines", "StreamPipeReaderOptions", "StreamPipeReaderOptions", "(System.Buffers.MemoryPool<System.Byte>,System.Int32,System.Int32,System.Boolean)", "summary", "df-generated"]
       - ["System.IO.Pipelines", "StreamPipeReaderOptions", "StreamPipeReaderOptions", "(System.Buffers.MemoryPool<System.Byte>,System.Int32,System.Int32,System.Boolean,System.Boolean)", "summary", "df-generated"]
       - ["System.IO.Pipelines", "StreamPipeReaderOptions", "get_BufferSize", "()", "summary", "df-generated"]
diff --git a/csharp/ql/lib/ext/generated/System.IO.Pipes.model.yml b/csharp/ql/lib/ext/generated/System.IO.Pipes.model.yml
index 108308a6797..dde109e4579 100644
--- a/csharp/ql/lib/ext/generated/System.IO.Pipes.model.yml
+++ b/csharp/ql/lib/ext/generated/System.IO.Pipes.model.yml
@@ -5,23 +5,13 @@ extensions:
       extensible: summaryModel
     data:
       - ["System.IO.Pipes", "AnonymousPipeClientStream", False, "AnonymousPipeClientStream", "(System.IO.Pipes.PipeDirection,Microsoft.Win32.SafeHandles.SafePipeHandle)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["System.IO.Pipes", "AnonymousPipeServerStream", False, "AnonymousPipeServerStream", "(System.IO.Pipes.PipeDirection,Microsoft.Win32.SafeHandles.SafePipeHandle,Microsoft.Win32.SafeHandles.SafePipeHandle)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["System.IO.Pipes", "AnonymousPipeServerStream", False, "AnonymousPipeServerStream", "(System.IO.Pipes.PipeDirection,Microsoft.Win32.SafeHandles.SafePipeHandle,Microsoft.Win32.SafeHandles.SafePipeHandle)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
-      - ["System.IO.Pipes", "AnonymousPipeServerStream", False, "get_ClientSafePipeHandle", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.IO.Pipes", "NamedPipeClientStream", False, "ConnectAsync", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.IO.Pipes", "NamedPipeClientStream", False, "ConnectAsync", "(System.Int32)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.IO.Pipes", "NamedPipeClientStream", False, "ConnectAsync", "(System.Int32,System.Threading.CancellationToken)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["System.IO.Pipes", "NamedPipeClientStream", False, "ConnectAsync", "(System.Int32,System.Threading.CancellationToken)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.IO.Pipes", "NamedPipeClientStream", False, "ConnectAsync", "(System.Threading.CancellationToken)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.IO.Pipes", "NamedPipeClientStream", False, "ConnectAsync", "(System.Threading.CancellationToken)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.IO.Pipes", "NamedPipeClientStream", False, "ConnectAsync", "(System.TimeSpan,System.Threading.CancellationToken)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["System.IO.Pipes", "NamedPipeClientStream", False, "ConnectAsync", "(System.TimeSpan,System.Threading.CancellationToken)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.IO.Pipes", "AnonymousPipeServerStream", False, "AnonymousPipeServerStream", "(System.IO.Pipes.PipeDirection,Microsoft.Win32.SafeHandles.SafePipeHandle,Microsoft.Win32.SafeHandles.SafePipeHandle)", "", "Argument[2]", "Argument[this].SyntheticField[System.IO.Pipes.AnonymousPipeServerStream._clientHandle]", "value", "dfc-generated"]
+      - ["System.IO.Pipes", "AnonymousPipeServerStream", False, "get_ClientSafePipeHandle", "()", "", "Argument[this].SyntheticField[System.IO.Pipes.AnonymousPipeServerStream._clientHandle]", "ReturnValue", "value", "dfc-generated"]
       - ["System.IO.Pipes", "NamedPipeClientStream", False, "NamedPipeClientStream", "(System.IO.Pipes.PipeDirection,System.Boolean,System.Boolean,Microsoft.Win32.SafeHandles.SafePipeHandle)", "", "Argument[3]", "Argument[this]", "taint", "df-generated"]
       - ["System.IO.Pipes", "NamedPipeClientStream", False, "NamedPipeClientStream", "(System.String,System.String,System.IO.Pipes.PipeDirection,System.IO.Pipes.PipeOptions,System.Security.Principal.TokenImpersonationLevel,System.IO.HandleInheritability)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
       - ["System.IO.Pipes", "NamedPipeServerStream", False, "NamedPipeServerStream", "(System.IO.Pipes.PipeDirection,System.Boolean,System.Boolean,Microsoft.Win32.SafeHandles.SafePipeHandle)", "", "Argument[3]", "Argument[this]", "taint", "df-generated"]
-      - ["System.IO.Pipes", "NamedPipeServerStream", False, "WaitForConnectionAsync", "(System.Threading.CancellationToken)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.IO.Pipes", "PipeStream", False, "InitializeHandle", "(Microsoft.Win32.SafeHandles.SafePipeHandle,System.Boolean,System.Boolean)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.IO.Pipes", "PipeStream", False, "get_SafePipeHandle", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.IO.Pipes", "PipeStream", False, "InitializeHandle", "(Microsoft.Win32.SafeHandles.SafePipeHandle,System.Boolean,System.Boolean)", "", "Argument[0]", "Argument[this].SyntheticField[System.IO.Pipes.PipeStream._handle]", "value", "dfc-generated"]
+      - ["System.IO.Pipes", "PipeStream", False, "get_SafePipeHandle", "()", "", "Argument[this].SyntheticField[System.IO.Pipes.PipeStream._handle]", "ReturnValue", "value", "dfc-generated"]
   - addsTo:
       pack: codeql/csharp-all
       extensible: neutralModel
@@ -41,6 +31,11 @@ extensions:
       - ["System.IO.Pipes", "NamedPipeClientStream", "Connect", "()", "summary", "df-generated"]
       - ["System.IO.Pipes", "NamedPipeClientStream", "Connect", "(System.Int32)", "summary", "df-generated"]
       - ["System.IO.Pipes", "NamedPipeClientStream", "Connect", "(System.TimeSpan)", "summary", "df-generated"]
+      - ["System.IO.Pipes", "NamedPipeClientStream", "ConnectAsync", "()", "summary", "df-generated"]
+      - ["System.IO.Pipes", "NamedPipeClientStream", "ConnectAsync", "(System.Int32)", "summary", "df-generated"]
+      - ["System.IO.Pipes", "NamedPipeClientStream", "ConnectAsync", "(System.Int32,System.Threading.CancellationToken)", "summary", "df-generated"]
+      - ["System.IO.Pipes", "NamedPipeClientStream", "ConnectAsync", "(System.Threading.CancellationToken)", "summary", "df-generated"]
+      - ["System.IO.Pipes", "NamedPipeClientStream", "ConnectAsync", "(System.TimeSpan,System.Threading.CancellationToken)", "summary", "df-generated"]
       - ["System.IO.Pipes", "NamedPipeClientStream", "NamedPipeClientStream", "(System.String)", "summary", "df-generated"]
       - ["System.IO.Pipes", "NamedPipeClientStream", "NamedPipeClientStream", "(System.String,System.String)", "summary", "df-generated"]
       - ["System.IO.Pipes", "NamedPipeClientStream", "NamedPipeClientStream", "(System.String,System.String,System.IO.Pipes.PipeDirection)", "summary", "df-generated"]
@@ -49,6 +44,7 @@ extensions:
       - ["System.IO.Pipes", "NamedPipeClientStream", "get_InBufferSize", "()", "summary", "df-generated"]
       - ["System.IO.Pipes", "NamedPipeClientStream", "get_NumberOfServerInstances", "()", "summary", "df-generated"]
       - ["System.IO.Pipes", "NamedPipeClientStream", "get_OutBufferSize", "()", "summary", "df-generated"]
+      - ["System.IO.Pipes", "NamedPipeServerStream", "BeginWaitForConnection", "(System.AsyncCallback,System.Object)", "summary", "df-generated"]
       - ["System.IO.Pipes", "NamedPipeServerStream", "Disconnect", "()", "summary", "df-generated"]
       - ["System.IO.Pipes", "NamedPipeServerStream", "EndWaitForConnection", "(System.IAsyncResult)", "summary", "df-generated"]
       - ["System.IO.Pipes", "NamedPipeServerStream", "GetImpersonationUserName", "()", "summary", "df-generated"]
@@ -58,8 +54,10 @@ extensions:
       - ["System.IO.Pipes", "NamedPipeServerStream", "NamedPipeServerStream", "(System.String,System.IO.Pipes.PipeDirection,System.Int32,System.IO.Pipes.PipeTransmissionMode)", "summary", "df-generated"]
       - ["System.IO.Pipes", "NamedPipeServerStream", "NamedPipeServerStream", "(System.String,System.IO.Pipes.PipeDirection,System.Int32,System.IO.Pipes.PipeTransmissionMode,System.IO.Pipes.PipeOptions)", "summary", "df-generated"]
       - ["System.IO.Pipes", "NamedPipeServerStream", "NamedPipeServerStream", "(System.String,System.IO.Pipes.PipeDirection,System.Int32,System.IO.Pipes.PipeTransmissionMode,System.IO.Pipes.PipeOptions,System.Int32,System.Int32)", "summary", "df-generated"]
+      - ["System.IO.Pipes", "NamedPipeServerStream", "RunAsClient", "(System.IO.Pipes.PipeStreamImpersonationWorker)", "summary", "df-generated"]
       - ["System.IO.Pipes", "NamedPipeServerStream", "WaitForConnection", "()", "summary", "df-generated"]
       - ["System.IO.Pipes", "NamedPipeServerStream", "WaitForConnectionAsync", "()", "summary", "df-generated"]
+      - ["System.IO.Pipes", "NamedPipeServerStream", "WaitForConnectionAsync", "(System.Threading.CancellationToken)", "summary", "df-generated"]
       - ["System.IO.Pipes", "NamedPipeServerStream", "get_InBufferSize", "()", "summary", "df-generated"]
       - ["System.IO.Pipes", "NamedPipeServerStream", "get_OutBufferSize", "()", "summary", "df-generated"]
       - ["System.IO.Pipes", "NamedPipeServerStreamAcl", "Create", "(System.String,System.IO.Pipes.PipeDirection,System.Int32,System.IO.Pipes.PipeTransmissionMode,System.IO.Pipes.PipeOptions,System.Int32,System.Int32,System.IO.Pipes.PipeSecurity,System.IO.HandleInheritability,System.IO.Pipes.PipeAccessRights)", "summary", "df-generated"]
diff --git a/csharp/ql/lib/ext/generated/System.IO.Ports.model.yml b/csharp/ql/lib/ext/generated/System.IO.Ports.model.yml
index 61b2b7eae89..de8de9cd544 100644
--- a/csharp/ql/lib/ext/generated/System.IO.Ports.model.yml
+++ b/csharp/ql/lib/ext/generated/System.IO.Ports.model.yml
@@ -4,17 +4,16 @@ extensions:
       pack: codeql/csharp-all
       extensible: summaryModel
     data:
-      - ["System.IO.Ports", "SerialPort", False, "Read", "(System.Byte[],System.Int32,System.Int32)", "", "Argument[this]", "Argument[0].Element", "taint", "df-generated"]
+      - ["System.IO.Ports", "SerialPort", False, "Read", "(System.Byte[],System.Int32,System.Int32)", "", "Argument[this].SyntheticField[System.IO.Ports.SerialPort._internalSerialStream]", "Argument[0].Element", "taint", "dfc-generated"]
       - ["System.IO.Ports", "SerialPort", False, "ReadExisting", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.IO.Ports", "SerialPort", False, "ReadLine", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.IO.Ports", "SerialPort", False, "ReadTo", "(System.String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.IO.Ports", "SerialPort", False, "SerialPort", "(System.ComponentModel.IContainer)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.IO.Ports", "SerialPort", False, "SerialPort", "(System.String,System.Int32,System.IO.Ports.Parity,System.Int32,System.IO.Ports.StopBits)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.IO.Ports", "SerialPort", False, "Write", "(System.Byte[],System.Int32,System.Int32)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
+      - ["System.IO.Ports", "SerialPort", False, "Write", "(System.Byte[],System.Int32,System.Int32)", "", "Argument[0].Element", "Argument[this].SyntheticField[System.IO.Ports.SerialPort._internalSerialStream]", "taint", "dfc-generated"]
       - ["System.IO.Ports", "SerialPort", False, "Write", "(System.Char[],System.Int32,System.Int32)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
       - ["System.IO.Ports", "SerialPort", False, "Write", "(System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.IO.Ports", "SerialPort", False, "WriteLine", "(System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.IO.Ports", "SerialPort", False, "get_BaseStream", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.IO.Ports", "SerialPort", False, "get_BaseStream", "()", "", "Argument[this].SyntheticField[System.IO.Ports.SerialPort._internalSerialStream]", "ReturnValue", "value", "dfc-generated"]
   - addsTo:
       pack: codeql/csharp-all
       extensible: neutralModel
@@ -28,13 +27,20 @@ extensions:
       - ["System.IO.Ports", "SerialPort", "Read", "(System.Char[],System.Int32,System.Int32)", "summary", "df-generated"]
       - ["System.IO.Ports", "SerialPort", "ReadByte", "()", "summary", "df-generated"]
       - ["System.IO.Ports", "SerialPort", "ReadChar", "()", "summary", "df-generated"]
+      - ["System.IO.Ports", "SerialPort", "SerialPort", "(System.ComponentModel.IContainer)", "summary", "df-generated"]
       - ["System.IO.Ports", "SerialPort", "SerialPort", "(System.String)", "summary", "df-generated"]
       - ["System.IO.Ports", "SerialPort", "SerialPort", "(System.String,System.Int32)", "summary", "df-generated"]
       - ["System.IO.Ports", "SerialPort", "SerialPort", "(System.String,System.Int32,System.IO.Ports.Parity)", "summary", "df-generated"]
       - ["System.IO.Ports", "SerialPort", "SerialPort", "(System.String,System.Int32,System.IO.Ports.Parity,System.Int32)", "summary", "df-generated"]
+      - ["System.IO.Ports", "SerialPort", "add_DataReceived", "(System.IO.Ports.SerialDataReceivedEventHandler)", "summary", "df-generated"]
+      - ["System.IO.Ports", "SerialPort", "add_ErrorReceived", "(System.IO.Ports.SerialErrorReceivedEventHandler)", "summary", "df-generated"]
+      - ["System.IO.Ports", "SerialPort", "add_PinChanged", "(System.IO.Ports.SerialPinChangedEventHandler)", "summary", "df-generated"]
       - ["System.IO.Ports", "SerialPort", "get_BytesToRead", "()", "summary", "df-generated"]
       - ["System.IO.Ports", "SerialPort", "get_BytesToWrite", "()", "summary", "df-generated"]
       - ["System.IO.Ports", "SerialPort", "get_CDHolding", "()", "summary", "df-generated"]
       - ["System.IO.Ports", "SerialPort", "get_CtsHolding", "()", "summary", "df-generated"]
       - ["System.IO.Ports", "SerialPort", "get_DsrHolding", "()", "summary", "df-generated"]
       - ["System.IO.Ports", "SerialPort", "get_IsOpen", "()", "summary", "df-generated"]
+      - ["System.IO.Ports", "SerialPort", "remove_DataReceived", "(System.IO.Ports.SerialDataReceivedEventHandler)", "summary", "df-generated"]
+      - ["System.IO.Ports", "SerialPort", "remove_ErrorReceived", "(System.IO.Ports.SerialErrorReceivedEventHandler)", "summary", "df-generated"]
+      - ["System.IO.Ports", "SerialPort", "remove_PinChanged", "(System.IO.Ports.SerialPinChangedEventHandler)", "summary", "df-generated"]
diff --git a/csharp/ql/lib/ext/generated/System.IO.model.yml b/csharp/ql/lib/ext/generated/System.IO.model.yml
index 4dc5013b0d9..7af940d5382 100644
--- a/csharp/ql/lib/ext/generated/System.IO.model.yml
+++ b/csharp/ql/lib/ext/generated/System.IO.model.yml
@@ -4,25 +4,30 @@ extensions:
       pack: codeql/csharp-all
       extensible: summaryModel
     data:
-      - ["System.IO", "BinaryReader", False, "BinaryReader", "(System.IO.Stream,System.Text.Encoding,System.Boolean)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.IO", "BinaryReader", False, "BinaryReader", "(System.IO.Stream,System.Text.Encoding,System.Boolean)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["System.IO", "BinaryReader", False, "BinaryReader", "(System.IO.Stream,System.Text.Encoding,System.Boolean)", "", "Argument[0]", "Argument[this].SyntheticField[System.IO.BinaryReader._stream]", "value", "dfc-generated"]
       - ["System.IO", "BinaryReader", True, "Read", "(System.Byte[],System.Int32,System.Int32)", "", "Argument[this]", "Argument[0].Element", "taint", "df-generated"]
       - ["System.IO", "BinaryReader", True, "Read", "(System.Span<System.Byte>)", "", "Argument[this]", "Argument[0]", "taint", "df-generated"]
       - ["System.IO", "BinaryReader", True, "ReadString", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.IO", "BinaryReader", True, "get_BaseStream", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.IO", "BinaryWriter", False, "BinaryWriter", "(System.IO.Stream,System.Text.Encoding,System.Boolean)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.IO", "BinaryWriter", False, "BinaryWriter", "(System.IO.Stream,System.Text.Encoding,System.Boolean)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["System.IO", "BinaryReader", True, "get_BaseStream", "()", "", "Argument[this].SyntheticField[System.IO.BinaryReader._stream]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.IO", "BinaryWriter", False, "BinaryWriter", "(System.IO.Stream,System.Text.Encoding,System.Boolean)", "", "Argument[0]", "Argument[this].Field[System.IO.BinaryWriter.OutStream]", "value", "dfc-generated"]
       - ["System.IO", "BinaryWriter", True, "Write", "(System.Byte[])", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
       - ["System.IO", "BinaryWriter", True, "Write", "(System.Byte[],System.Int32,System.Int32)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["System.IO", "BinaryWriter", True, "get_BaseStream", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.IO", "BinaryWriter", True, "get_BaseStream", "()", "", "Argument[this].Field[System.IO.BinaryWriter.OutStream]", "ReturnValue", "value", "dfc-generated"]
       - ["System.IO", "BufferedStream", False, "get_UnderlyingStream", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.IO", "Directory", False, "CreateDirectory", "(System.String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.IO", "Directory", False, "CreateDirectory", "(System.String,System.IO.UnixFileMode)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.IO", "Directory", False, "CreateSymbolicLink", "(System.String,System.String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.IO", "Directory", False, "GetParent", "(System.String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.IO", "DirectoryInfo", False, "CreateSubdirectory", "(System.String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.IO", "DirectoryInfo", False, "CreateSubdirectory", "(System.String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.IO", "DirectoryInfo", False, "DirectoryInfo", "(System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["System.IO", "Directory", False, "CreateDirectory", "(System.String)", "", "Argument[0]", "ReturnValue.Field[System.IO.FileSystemInfo.FullPath]", "value", "dfc-generated"]
+      - ["System.IO", "Directory", False, "CreateDirectory", "(System.String)", "", "Argument[0]", "ReturnValue.Field[System.IO.FileSystemInfo.OriginalPath]", "value", "dfc-generated"]
+      - ["System.IO", "Directory", False, "CreateDirectory", "(System.String,System.IO.UnixFileMode)", "", "Argument[0]", "ReturnValue.Field[System.IO.FileSystemInfo.FullPath]", "value", "dfc-generated"]
+      - ["System.IO", "Directory", False, "CreateDirectory", "(System.String,System.IO.UnixFileMode)", "", "Argument[0]", "ReturnValue.Field[System.IO.FileSystemInfo.OriginalPath]", "value", "dfc-generated"]
+      - ["System.IO", "Directory", False, "CreateSymbolicLink", "(System.String,System.String)", "", "Argument[0]", "ReturnValue.Field[System.IO.FileSystemInfo.FullPath]", "value", "dfc-generated"]
+      - ["System.IO", "Directory", False, "CreateSymbolicLink", "(System.String,System.String)", "", "Argument[0]", "ReturnValue.Field[System.IO.FileSystemInfo.OriginalPath]", "value", "dfc-generated"]
+      - ["System.IO", "Directory", False, "GetParent", "(System.String)", "", "Argument[0]", "ReturnValue.Field[System.IO.FileSystemInfo.FullPath]", "value", "dfc-generated"]
+      - ["System.IO", "Directory", False, "GetParent", "(System.String)", "", "Argument[0]", "ReturnValue.Field[System.IO.FileSystemInfo.OriginalPath]", "value", "dfc-generated"]
+      - ["System.IO", "DirectoryInfo", False, "CreateSubdirectory", "(System.String)", "", "Argument[0]", "ReturnValue.Field[System.IO.FileSystemInfo.FullPath]", "value", "dfc-generated"]
+      - ["System.IO", "DirectoryInfo", False, "CreateSubdirectory", "(System.String)", "", "Argument[0]", "ReturnValue.Field[System.IO.FileSystemInfo.OriginalPath]", "value", "dfc-generated"]
+      - ["System.IO", "DirectoryInfo", False, "CreateSubdirectory", "(System.String)", "", "Argument[this].Field[System.IO.FileSystemInfo.FullPath]", "ReturnValue.Field[System.IO.FileSystemInfo.FullPath]", "value", "dfc-generated"]
+      - ["System.IO", "DirectoryInfo", False, "CreateSubdirectory", "(System.String)", "", "Argument[this].Field[System.IO.FileSystemInfo.FullPath]", "ReturnValue.Field[System.IO.FileSystemInfo.OriginalPath]", "value", "dfc-generated"]
+      - ["System.IO", "DirectoryInfo", False, "DirectoryInfo", "(System.String)", "", "Argument[0]", "Argument[this].Field[System.IO.FileSystemInfo.FullPath]", "value", "dfc-generated"]
+      - ["System.IO", "DirectoryInfo", False, "DirectoryInfo", "(System.String)", "", "Argument[0]", "Argument[this].Field[System.IO.FileSystemInfo.OriginalPath]", "value", "dfc-generated"]
       - ["System.IO", "DirectoryInfo", False, "EnumerateDirectories", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.IO", "DirectoryInfo", False, "EnumerateDirectories", "(System.String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.IO", "DirectoryInfo", False, "EnumerateDirectories", "(System.String,System.IO.EnumerationOptions)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
@@ -38,32 +43,35 @@ extensions:
       - ["System.IO", "DirectoryInfo", False, "EnumerateFiles", "(System.String,System.IO.EnumerationOptions)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
       - ["System.IO", "DirectoryInfo", False, "EnumerateFiles", "(System.String,System.IO.EnumerationOptions)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.IO", "DirectoryInfo", False, "EnumerateFiles", "(System.String,System.IO.SearchOption)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.IO", "DirectoryInfo", False, "MoveTo", "(System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.IO", "DirectoryInfo", False, "get_Parent", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.IO", "DriveInfo", False, "DriveInfo", "(System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.IO", "DriveInfo", False, "ToString", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.IO", "DriveInfo", False, "get_Name", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.IO", "DriveInfo", False, "get_RootDirectory", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.IO", "ErrorEventArgs", False, "ErrorEventArgs", "(System.Exception)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.IO", "ErrorEventArgs", True, "GetException", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.IO", "DirectoryInfo", False, "MoveTo", "(System.String)", "", "Argument[0]", "Argument[this].Field[System.IO.FileSystemInfo.FullPath]", "value", "dfc-generated"]
+      - ["System.IO", "DirectoryInfo", False, "MoveTo", "(System.String)", "", "Argument[0]", "Argument[this].Field[System.IO.FileSystemInfo.OriginalPath]", "value", "dfc-generated"]
+      - ["System.IO", "DirectoryInfo", False, "get_Parent", "()", "", "Argument[this].Field[System.IO.FileSystemInfo.FullPath]", "ReturnValue.Field[System.IO.FileSystemInfo.FullPath]", "value", "dfc-generated"]
+      - ["System.IO", "DirectoryInfo", False, "get_Parent", "()", "", "Argument[this].Field[System.IO.FileSystemInfo.FullPath]", "ReturnValue.Field[System.IO.FileSystemInfo.OriginalPath]", "value", "dfc-generated"]
+      - ["System.IO", "DriveInfo", False, "DriveInfo", "(System.String)", "", "Argument[0]", "Argument[this].SyntheticField[System.IO.DriveInfo._name]", "value", "dfc-generated"]
+      - ["System.IO", "DriveInfo", False, "ToString", "()", "", "Argument[this].Property[System.IO.DriveInfo.Name]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.IO", "DriveInfo", False, "ToString", "()", "", "Argument[this].SyntheticField[System.IO.DriveInfo._name]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.IO", "DriveInfo", False, "get_Name", "()", "", "Argument[this].SyntheticField[System.IO.DriveInfo._name]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.IO", "ErrorEventArgs", False, "ErrorEventArgs", "(System.Exception)", "", "Argument[0]", "Argument[this].SyntheticField[System.IO.ErrorEventArgs._exception]", "value", "dfc-generated"]
+      - ["System.IO", "ErrorEventArgs", True, "GetException", "()", "", "Argument[this].SyntheticField[System.IO.ErrorEventArgs._exception]", "ReturnValue", "value", "dfc-generated"]
       - ["System.IO", "File", False, "AppendAllBytesAsync", "(System.String,System.Byte[],System.Threading.CancellationToken)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
       - ["System.IO", "File", False, "AppendAllLinesAsync", "(System.String,System.Collections.Generic.IEnumerable<System.String>,System.Text.Encoding,System.Threading.CancellationToken)", "", "Argument[3]", "ReturnValue", "taint", "df-generated"]
       - ["System.IO", "File", False, "AppendAllLinesAsync", "(System.String,System.Collections.Generic.IEnumerable<System.String>,System.Threading.CancellationToken)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
       - ["System.IO", "File", False, "AppendAllTextAsync", "(System.String,System.String,System.Text.Encoding,System.Threading.CancellationToken)", "", "Argument[3]", "ReturnValue", "taint", "df-generated"]
       - ["System.IO", "File", False, "AppendAllTextAsync", "(System.String,System.String,System.Threading.CancellationToken)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
-      - ["System.IO", "File", False, "Create", "(System.String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.IO", "File", False, "Create", "(System.String,System.Int32)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.IO", "File", False, "Create", "(System.String,System.Int32,System.IO.FileOptions)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.IO", "File", False, "CreateSymbolicLink", "(System.String,System.String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.IO", "File", False, "Open", "(System.String,System.IO.FileMode)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.IO", "File", False, "Open", "(System.String,System.IO.FileMode,System.IO.FileAccess)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.IO", "File", False, "Open", "(System.String,System.IO.FileMode,System.IO.FileAccess,System.IO.FileShare)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["System.IO", "File", False, "Create", "(System.String)", "", "Argument[0]", "ReturnValue", "taint", "dfc-generated"]
+      - ["System.IO", "File", False, "Create", "(System.String,System.Int32)", "", "Argument[0]", "ReturnValue", "taint", "dfc-generated"]
+      - ["System.IO", "File", False, "Create", "(System.String,System.Int32,System.IO.FileOptions)", "", "Argument[0]", "ReturnValue", "taint", "dfc-generated"]
+      - ["System.IO", "File", False, "CreateSymbolicLink", "(System.String,System.String)", "", "Argument[0]", "ReturnValue.Field[System.IO.FileSystemInfo.FullPath]", "value", "dfc-generated"]
+      - ["System.IO", "File", False, "CreateSymbolicLink", "(System.String,System.String)", "", "Argument[0]", "ReturnValue.Field[System.IO.FileSystemInfo.OriginalPath]", "value", "dfc-generated"]
+      - ["System.IO", "File", False, "Open", "(System.String,System.IO.FileMode)", "", "Argument[0]", "ReturnValue", "taint", "dfc-generated"]
+      - ["System.IO", "File", False, "Open", "(System.String,System.IO.FileMode,System.IO.FileAccess)", "", "Argument[0]", "ReturnValue", "taint", "dfc-generated"]
+      - ["System.IO", "File", False, "Open", "(System.String,System.IO.FileMode,System.IO.FileAccess,System.IO.FileShare)", "", "Argument[0]", "ReturnValue", "taint", "dfc-generated"]
       - ["System.IO", "File", False, "OpenHandle", "(System.String,System.IO.FileMode,System.IO.FileAccess,System.IO.FileShare,System.IO.FileOptions,System.Int64)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.IO", "File", False, "OpenRead", "(System.String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.IO", "File", False, "OpenText", "(System.String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.IO", "File", False, "OpenWrite", "(System.String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.IO", "File", False, "ReadAllText", "(System.String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.IO", "File", False, "ReadAllText", "(System.String,System.Text.Encoding)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["System.IO", "File", False, "OpenRead", "(System.String)", "", "Argument[0]", "ReturnValue", "taint", "dfc-generated"]
+      - ["System.IO", "File", False, "OpenText", "(System.String)", "", "Argument[0]", "ReturnValue", "taint", "dfc-generated"]
+      - ["System.IO", "File", False, "OpenWrite", "(System.String)", "", "Argument[0]", "ReturnValue", "taint", "dfc-generated"]
+      - ["System.IO", "File", False, "ReadAllText", "(System.String)", "", "Argument[0]", "ReturnValue", "taint", "dfc-generated"]
+      - ["System.IO", "File", False, "ReadAllText", "(System.String,System.Text.Encoding)", "", "Argument[0]", "ReturnValue", "taint", "dfc-generated"]
       - ["System.IO", "File", False, "ReadLines", "(System.String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["System.IO", "File", False, "ReadLines", "(System.String,System.Text.Encoding)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["System.IO", "File", False, "ReadLines", "(System.String,System.Text.Encoding)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
@@ -72,68 +80,81 @@ extensions:
       - ["System.IO", "File", False, "WriteAllLinesAsync", "(System.String,System.Collections.Generic.IEnumerable<System.String>,System.Threading.CancellationToken)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
       - ["System.IO", "File", False, "WriteAllTextAsync", "(System.String,System.String,System.Text.Encoding,System.Threading.CancellationToken)", "", "Argument[3]", "ReturnValue", "taint", "df-generated"]
       - ["System.IO", "File", False, "WriteAllTextAsync", "(System.String,System.String,System.Threading.CancellationToken)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
-      - ["System.IO", "FileFormatException", False, "FileFormatException", "(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.IO", "FileFormatException", False, "FileFormatException", "(System.Uri)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.IO", "FileFormatException", False, "FileFormatException", "(System.Uri,System.Exception)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.IO", "FileFormatException", False, "FileFormatException", "(System.Uri,System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.IO", "FileFormatException", False, "FileFormatException", "(System.Uri,System.String,System.Exception)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.IO", "FileFormatException", False, "get_SourceUri", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.IO", "FileInfo", False, "CopyTo", "(System.String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.IO", "FileInfo", False, "CopyTo", "(System.String,System.Boolean)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.IO", "FileInfo", False, "Create", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.IO", "FileInfo", False, "MoveTo", "(System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.IO", "FileInfo", False, "MoveTo", "(System.String,System.Boolean)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.IO", "FileInfo", False, "Open", "(System.IO.FileMode)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.IO", "FileInfo", False, "Open", "(System.IO.FileMode,System.IO.FileAccess)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.IO", "FileInfo", False, "Open", "(System.IO.FileMode,System.IO.FileAccess,System.IO.FileShare)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.IO", "FileInfo", False, "OpenRead", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.IO", "FileInfo", False, "OpenText", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.IO", "FileInfo", False, "OpenWrite", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.IO", "FileFormatException", False, "FileFormatException", "(System.Uri)", "", "Argument[0]", "Argument[this].SyntheticField[System.IO.FileFormatException._sourceUri]", "value", "dfc-generated"]
+      - ["System.IO", "FileFormatException", False, "FileFormatException", "(System.Uri,System.Exception)", "", "Argument[0]", "Argument[this].SyntheticField[System.IO.FileFormatException._sourceUri]", "value", "dfc-generated"]
+      - ["System.IO", "FileFormatException", False, "FileFormatException", "(System.Uri,System.String)", "", "Argument[0]", "Argument[this].SyntheticField[System.IO.FileFormatException._sourceUri]", "value", "dfc-generated"]
+      - ["System.IO", "FileFormatException", False, "FileFormatException", "(System.Uri,System.String,System.Exception)", "", "Argument[0]", "Argument[this].SyntheticField[System.IO.FileFormatException._sourceUri]", "value", "dfc-generated"]
+      - ["System.IO", "FileFormatException", False, "get_SourceUri", "()", "", "Argument[this].SyntheticField[System.IO.FileFormatException._sourceUri]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.IO", "FileInfo", False, "CopyTo", "(System.String)", "", "Argument[0]", "ReturnValue.Field[System.IO.FileSystemInfo.FullPath]", "value", "dfc-generated"]
+      - ["System.IO", "FileInfo", False, "CopyTo", "(System.String)", "", "Argument[0]", "ReturnValue.Field[System.IO.FileSystemInfo.OriginalPath]", "value", "dfc-generated"]
+      - ["System.IO", "FileInfo", False, "CopyTo", "(System.String,System.Boolean)", "", "Argument[0]", "ReturnValue.Field[System.IO.FileSystemInfo.FullPath]", "value", "dfc-generated"]
+      - ["System.IO", "FileInfo", False, "CopyTo", "(System.String,System.Boolean)", "", "Argument[0]", "ReturnValue.Field[System.IO.FileSystemInfo.OriginalPath]", "value", "dfc-generated"]
+      - ["System.IO", "FileInfo", False, "Create", "()", "", "Argument[this].Field[System.IO.FileSystemInfo.FullPath]", "ReturnValue", "taint", "dfc-generated"]
+      - ["System.IO", "FileInfo", False, "MoveTo", "(System.String)", "", "Argument[0]", "Argument[this].Field[System.IO.FileSystemInfo.FullPath]", "value", "dfc-generated"]
+      - ["System.IO", "FileInfo", False, "MoveTo", "(System.String)", "", "Argument[0]", "Argument[this].Field[System.IO.FileSystemInfo.OriginalPath]", "value", "dfc-generated"]
+      - ["System.IO", "FileInfo", False, "MoveTo", "(System.String,System.Boolean)", "", "Argument[0]", "Argument[this].Field[System.IO.FileSystemInfo.FullPath]", "value", "dfc-generated"]
+      - ["System.IO", "FileInfo", False, "MoveTo", "(System.String,System.Boolean)", "", "Argument[0]", "Argument[this].Field[System.IO.FileSystemInfo.OriginalPath]", "value", "dfc-generated"]
+      - ["System.IO", "FileInfo", False, "Open", "(System.IO.FileMode)", "", "Argument[this].Field[System.IO.FileSystemInfo.FullPath]", "ReturnValue", "taint", "dfc-generated"]
+      - ["System.IO", "FileInfo", False, "Open", "(System.IO.FileMode,System.IO.FileAccess)", "", "Argument[this].Field[System.IO.FileSystemInfo.FullPath]", "ReturnValue", "taint", "dfc-generated"]
+      - ["System.IO", "FileInfo", False, "Open", "(System.IO.FileMode,System.IO.FileAccess,System.IO.FileShare)", "", "Argument[this].Field[System.IO.FileSystemInfo.FullPath]", "ReturnValue", "taint", "dfc-generated"]
+      - ["System.IO", "FileInfo", False, "OpenRead", "()", "", "Argument[this].Field[System.IO.FileSystemInfo.FullPath]", "ReturnValue", "taint", "dfc-generated"]
+      - ["System.IO", "FileInfo", False, "OpenText", "()", "", "Argument[this].Field[System.IO.FileSystemInfo.FullPath]", "ReturnValue", "taint", "dfc-generated"]
+      - ["System.IO", "FileInfo", False, "OpenWrite", "()", "", "Argument[this].Field[System.IO.FileSystemInfo.FullPath]", "ReturnValue", "taint", "dfc-generated"]
       - ["System.IO", "FileInfo", False, "get_Directory", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.IO", "FileInfo", False, "get_DirectoryName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.IO", "FileInfo", False, "get_DirectoryName", "()", "", "Argument[this].Field[System.IO.FileSystemInfo.FullPath]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.IO", "FileStream", False, "FileStream", "(Microsoft.Win32.SafeHandles.SafeFileHandle,System.IO.FileAccess,System.Int32)", "", "Argument[this]", "Argument[this].SyntheticField[System.IO.FileStream._strategy].SyntheticField[System.IO.Strategies.DerivedFileStreamStrategy._fileStream]", "value", "dfc-generated"]
+      - ["System.IO", "FileStream", False, "FileStream", "(Microsoft.Win32.SafeHandles.SafeFileHandle,System.IO.FileAccess,System.Int32,System.Boolean)", "", "Argument[this]", "Argument[this].SyntheticField[System.IO.FileStream._strategy].SyntheticField[System.IO.Strategies.DerivedFileStreamStrategy._fileStream]", "value", "dfc-generated"]
+      - ["System.IO", "FileStream", False, "FileStream", "(System.IntPtr,System.IO.FileAccess,System.Boolean,System.Int32,System.Boolean)", "", "Argument[this]", "Argument[this].SyntheticField[System.IO.FileStream._strategy].SyntheticField[System.IO.Strategies.DerivedFileStreamStrategy._fileStream]", "value", "dfc-generated"]
+      - ["System.IO", "FileStream", False, "FileStream", "(System.String,System.IO.FileStreamOptions)", "", "Argument[this]", "Argument[this].SyntheticField[System.IO.FileStream._strategy].SyntheticField[System.IO.Strategies.DerivedFileStreamStrategy._fileStream]", "value", "dfc-generated"]
+      - ["System.IO", "FileStream", True, "FlushAsync", "(System.Threading.CancellationToken)", "", "Argument[this].SyntheticField[System.IO.FileStream._strategy].SyntheticField[System.IO.Strategies.DerivedFileStreamStrategy._fileStream]", "ReturnValue.SyntheticField[System.Threading.Tasks.Task.m_stateObject]", "value", "dfc-generated"]
       - ["System.IO", "FileStream", True, "get_Handle", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.IO", "FileStream", True, "get_Name", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.IO", "FileStream", True, "get_SafeFileHandle", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.IO", "FileSystemEventArgs", False, "FileSystemEventArgs", "(System.IO.WatcherChangeTypes,System.String,System.String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["System.IO", "FileSystemEventArgs", False, "FileSystemEventArgs", "(System.IO.WatcherChangeTypes,System.String,System.String)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
-      - ["System.IO", "FileSystemEventArgs", False, "get_FullPath", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.IO", "FileSystemEventArgs", False, "get_Name", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.IO", "FileSystemInfo", False, "ToString", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.IO", "FileSystemInfo", False, "get_Extension", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.IO", "FileSystemEventArgs", False, "FileSystemEventArgs", "(System.IO.WatcherChangeTypes,System.String,System.String)", "", "Argument[1]", "Argument[this].SyntheticField[System.IO.FileSystemEventArgs._fullPath]", "taint", "dfc-generated"]
+      - ["System.IO", "FileSystemEventArgs", False, "FileSystemEventArgs", "(System.IO.WatcherChangeTypes,System.String,System.String)", "", "Argument[2]", "Argument[this].SyntheticField[System.IO.FileSystemEventArgs._fullPath]", "taint", "dfc-generated"]
+      - ["System.IO", "FileSystemEventArgs", False, "FileSystemEventArgs", "(System.IO.WatcherChangeTypes,System.String,System.String)", "", "Argument[2]", "Argument[this].SyntheticField[System.IO.FileSystemEventArgs._name]", "value", "dfc-generated"]
+      - ["System.IO", "FileSystemEventArgs", False, "get_FullPath", "()", "", "Argument[this].SyntheticField[System.IO.FileSystemEventArgs._fullPath]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.IO", "FileSystemEventArgs", False, "get_Name", "()", "", "Argument[this].SyntheticField[System.IO.FileSystemEventArgs._name]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.IO", "FileSystemInfo", False, "ToString", "()", "", "Argument[this].Field[System.IO.FileSystemInfo.OriginalPath]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.IO", "FileSystemInfo", False, "get_Extension", "()", "", "Argument[this].Field[System.IO.FileSystemInfo.FullPath]", "ReturnValue", "value", "dfc-generated"]
       - ["System.IO", "FileSystemInfo", False, "get_LinkTarget", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.IO", "FileSystemInfo", True, "get_FullName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.IO", "FileSystemInfo", True, "get_FullName", "()", "", "Argument[this].Field[System.IO.FileSystemInfo.FullPath]", "ReturnValue", "value", "dfc-generated"]
       - ["System.IO", "FileSystemInfo", True, "get_Name", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.IO", "FileSystemWatcher", False, "FileSystemWatcher", "(System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.IO", "FileSystemWatcher", False, "FileSystemWatcher", "(System.String,System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.IO", "FileSystemWatcher", False, "FileSystemWatcher", "(System.String,System.String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["System.IO", "FileSystemWatcher", False, "get_Filters", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.IO", "FileSystemWatcher", False, "FileSystemWatcher", "(System.String,System.String)", "", "Argument[1]", "Argument[this].Property[System.IO.FileSystemWatcher.Filters].Element", "value", "dfc-generated"]
+      - ["System.IO", "FileSystemWatcher", False, "FileSystemWatcher", "(System.String,System.String)", "", "Argument[1]", "Argument[this].SyntheticField[System.IO.FileSystemWatcher._filters].Element", "value", "dfc-generated"]
+      - ["System.IO", "FileSystemWatcher", False, "OnChanged", "(System.IO.FileSystemEventArgs)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["System.IO", "FileSystemWatcher", False, "OnCreated", "(System.IO.FileSystemEventArgs)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["System.IO", "FileSystemWatcher", False, "OnDeleted", "(System.IO.FileSystemEventArgs)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["System.IO", "FileSystemWatcher", False, "get_Filters", "()", "", "Argument[this].SyntheticField[System.IO.FileSystemWatcher._filters]", "ReturnValue", "value", "dfc-generated"]
       - ["System.IO", "MemoryStream", True, "GetBuffer", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.IO", "MemoryStream", True, "TryGetBuffer", "(System.ArraySegment<System.Byte>)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.IO", "MemoryStream", True, "WriteTo", "(System.IO.Stream)", "", "Argument[this]", "Argument[0]", "taint", "df-generated"]
-      - ["System.IO", "Path", False, "ChangeExtension", "(System.String,System.String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.IO", "Path", False, "Join", "(System.ReadOnlySpan<System.Char>,System.ReadOnlySpan<System.Char>)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.IO", "Path", False, "Join", "(System.ReadOnlySpan<System.Char>,System.ReadOnlySpan<System.Char>)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["System.IO", "Path", False, "Join", "(System.ReadOnlySpan<System.Char>,System.ReadOnlySpan<System.Char>,System.ReadOnlySpan<System.Char>)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.IO", "Path", False, "Join", "(System.ReadOnlySpan<System.Char>,System.ReadOnlySpan<System.Char>,System.ReadOnlySpan<System.Char>)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["System.IO", "Path", False, "Join", "(System.ReadOnlySpan<System.Char>,System.ReadOnlySpan<System.Char>,System.ReadOnlySpan<System.Char>)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
-      - ["System.IO", "Path", False, "Join", "(System.ReadOnlySpan<System.Char>,System.ReadOnlySpan<System.Char>,System.ReadOnlySpan<System.Char>,System.ReadOnlySpan<System.Char>)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.IO", "Path", False, "Join", "(System.ReadOnlySpan<System.Char>,System.ReadOnlySpan<System.Char>,System.ReadOnlySpan<System.Char>,System.ReadOnlySpan<System.Char>)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["System.IO", "Path", False, "Join", "(System.ReadOnlySpan<System.Char>,System.ReadOnlySpan<System.Char>,System.ReadOnlySpan<System.Char>,System.ReadOnlySpan<System.Char>)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
-      - ["System.IO", "Path", False, "Join", "(System.ReadOnlySpan<System.Char>,System.ReadOnlySpan<System.Char>,System.ReadOnlySpan<System.Char>,System.ReadOnlySpan<System.Char>)", "", "Argument[3]", "ReturnValue", "taint", "df-generated"]
-      - ["System.IO", "Path", False, "Join", "(System.String,System.String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.IO", "Path", False, "Join", "(System.String,System.String)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["System.IO", "Path", False, "Join", "(System.String,System.String,System.String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.IO", "Path", False, "Join", "(System.String,System.String,System.String)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["System.IO", "Path", False, "Join", "(System.String,System.String,System.String)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
-      - ["System.IO", "Path", False, "Join", "(System.String,System.String,System.String,System.String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.IO", "Path", False, "Join", "(System.String,System.String,System.String,System.String)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["System.IO", "Path", False, "Join", "(System.String,System.String,System.String,System.String)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
-      - ["System.IO", "Path", False, "Join", "(System.String,System.String,System.String,System.String)", "", "Argument[3]", "ReturnValue", "taint", "df-generated"]
-      - ["System.IO", "Path", False, "TrimEndingDirectorySeparator", "(System.ReadOnlySpan<System.Char>)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.IO", "Path", False, "TrimEndingDirectorySeparator", "(System.String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.IO", "Path", False, "TryJoin", "(System.ReadOnlySpan<System.Char>,System.ReadOnlySpan<System.Char>,System.ReadOnlySpan<System.Char>,System.Span<System.Char>,System.Int32)", "", "Argument[0]", "Argument[3]", "taint", "df-generated"]
-      - ["System.IO", "Path", False, "TryJoin", "(System.ReadOnlySpan<System.Char>,System.ReadOnlySpan<System.Char>,System.ReadOnlySpan<System.Char>,System.Span<System.Char>,System.Int32)", "", "Argument[1]", "Argument[3]", "taint", "df-generated"]
-      - ["System.IO", "Path", False, "TryJoin", "(System.ReadOnlySpan<System.Char>,System.ReadOnlySpan<System.Char>,System.Span<System.Char>,System.Int32)", "", "Argument[0]", "Argument[2]", "taint", "df-generated"]
+      - ["System.IO", "Path", False, "ChangeExtension", "(System.String,System.String)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.IO", "Path", False, "Join", "(System.ReadOnlySpan<System.Char>,System.ReadOnlySpan<System.Char>)", "", "Argument[0].Element", "ReturnValue", "taint", "dfc-generated"]
+      - ["System.IO", "Path", False, "Join", "(System.ReadOnlySpan<System.Char>,System.ReadOnlySpan<System.Char>)", "", "Argument[1].Element", "ReturnValue", "taint", "dfc-generated"]
+      - ["System.IO", "Path", False, "Join", "(System.ReadOnlySpan<System.Char>,System.ReadOnlySpan<System.Char>,System.ReadOnlySpan<System.Char>)", "", "Argument[0].Element", "ReturnValue", "taint", "dfc-generated"]
+      - ["System.IO", "Path", False, "Join", "(System.ReadOnlySpan<System.Char>,System.ReadOnlySpan<System.Char>,System.ReadOnlySpan<System.Char>)", "", "Argument[1].Element", "ReturnValue", "taint", "dfc-generated"]
+      - ["System.IO", "Path", False, "Join", "(System.ReadOnlySpan<System.Char>,System.ReadOnlySpan<System.Char>,System.ReadOnlySpan<System.Char>)", "", "Argument[2].Element", "ReturnValue", "taint", "dfc-generated"]
+      - ["System.IO", "Path", False, "Join", "(System.ReadOnlySpan<System.Char>,System.ReadOnlySpan<System.Char>,System.ReadOnlySpan<System.Char>,System.ReadOnlySpan<System.Char>)", "", "Argument[0].Element", "ReturnValue", "taint", "dfc-generated"]
+      - ["System.IO", "Path", False, "Join", "(System.ReadOnlySpan<System.Char>,System.ReadOnlySpan<System.Char>,System.ReadOnlySpan<System.Char>,System.ReadOnlySpan<System.Char>)", "", "Argument[1].Element", "ReturnValue", "taint", "dfc-generated"]
+      - ["System.IO", "Path", False, "Join", "(System.ReadOnlySpan<System.Char>,System.ReadOnlySpan<System.Char>,System.ReadOnlySpan<System.Char>,System.ReadOnlySpan<System.Char>)", "", "Argument[2].Element", "ReturnValue", "taint", "dfc-generated"]
+      - ["System.IO", "Path", False, "Join", "(System.ReadOnlySpan<System.Char>,System.ReadOnlySpan<System.Char>,System.ReadOnlySpan<System.Char>,System.ReadOnlySpan<System.Char>)", "", "Argument[3].Element", "ReturnValue", "taint", "dfc-generated"]
+      - ["System.IO", "Path", False, "Join", "(System.String,System.String)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.IO", "Path", False, "Join", "(System.String,System.String)", "", "Argument[1]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.IO", "Path", False, "Join", "(System.String,System.String,System.String)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.IO", "Path", False, "Join", "(System.String,System.String,System.String)", "", "Argument[1]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.IO", "Path", False, "Join", "(System.String,System.String,System.String)", "", "Argument[2]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.IO", "Path", False, "Join", "(System.String,System.String,System.String,System.String)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.IO", "Path", False, "Join", "(System.String,System.String,System.String,System.String)", "", "Argument[1]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.IO", "Path", False, "Join", "(System.String,System.String,System.String,System.String)", "", "Argument[2]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.IO", "Path", False, "Join", "(System.String,System.String,System.String,System.String)", "", "Argument[3]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.IO", "Path", False, "TrimEndingDirectorySeparator", "(System.ReadOnlySpan<System.Char>)", "", "Argument[0].Element", "ReturnValue.Element", "value", "dfc-generated"]
+      - ["System.IO", "Path", False, "TrimEndingDirectorySeparator", "(System.ReadOnlySpan<System.Char>)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.IO", "Path", False, "TrimEndingDirectorySeparator", "(System.String)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.IO", "Path", False, "TryJoin", "(System.ReadOnlySpan<System.Char>,System.ReadOnlySpan<System.Char>,System.ReadOnlySpan<System.Char>,System.Span<System.Char>,System.Int32)", "", "Argument[0].Element", "Argument[3].Element", "value", "dfc-generated"]
+      - ["System.IO", "Path", False, "TryJoin", "(System.ReadOnlySpan<System.Char>,System.ReadOnlySpan<System.Char>,System.ReadOnlySpan<System.Char>,System.Span<System.Char>,System.Int32)", "", "Argument[1].Element", "Argument[3].Element", "value", "dfc-generated"]
+      - ["System.IO", "Path", False, "TryJoin", "(System.ReadOnlySpan<System.Char>,System.ReadOnlySpan<System.Char>,System.Span<System.Char>,System.Int32)", "", "Argument[0].Element", "Argument[2].Element", "value", "dfc-generated"]
       - ["System.IO", "RandomAccess", False, "ReadAsync", "(Microsoft.Win32.SafeHandles.SafeFileHandle,System.Collections.Generic.IReadOnlyList<System.Memory<System.Byte>>,System.Int64,System.Threading.CancellationToken)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["System.IO", "RandomAccess", False, "ReadAsync", "(Microsoft.Win32.SafeHandles.SafeFileHandle,System.Collections.Generic.IReadOnlyList<System.Memory<System.Byte>>,System.Int64,System.Threading.CancellationToken)", "", "Argument[1].Element", "ReturnValue", "taint", "df-generated"]
       - ["System.IO", "RandomAccess", False, "ReadAsync", "(Microsoft.Win32.SafeHandles.SafeFileHandle,System.Collections.Generic.IReadOnlyList<System.Memory<System.Byte>>,System.Int64,System.Threading.CancellationToken)", "", "Argument[3]", "ReturnValue", "taint", "df-generated"]
@@ -145,39 +166,36 @@ extensions:
       - ["System.IO", "RandomAccess", False, "WriteAsync", "(Microsoft.Win32.SafeHandles.SafeFileHandle,System.ReadOnlyMemory<System.Byte>,System.Int64,System.Threading.CancellationToken)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["System.IO", "RandomAccess", False, "WriteAsync", "(Microsoft.Win32.SafeHandles.SafeFileHandle,System.ReadOnlyMemory<System.Byte>,System.Int64,System.Threading.CancellationToken)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
       - ["System.IO", "RandomAccess", False, "WriteAsync", "(Microsoft.Win32.SafeHandles.SafeFileHandle,System.ReadOnlyMemory<System.Byte>,System.Int64,System.Threading.CancellationToken)", "", "Argument[3]", "ReturnValue", "taint", "df-generated"]
-      - ["System.IO", "RenamedEventArgs", False, "RenamedEventArgs", "(System.IO.WatcherChangeTypes,System.String,System.String,System.String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["System.IO", "RenamedEventArgs", False, "RenamedEventArgs", "(System.IO.WatcherChangeTypes,System.String,System.String,System.String)", "", "Argument[3]", "Argument[this]", "taint", "df-generated"]
-      - ["System.IO", "RenamedEventArgs", False, "get_OldFullPath", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.IO", "RenamedEventArgs", False, "get_OldName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.IO", "RenamedEventArgs", False, "RenamedEventArgs", "(System.IO.WatcherChangeTypes,System.String,System.String,System.String)", "", "Argument[1]", "Argument[this].SyntheticField[System.IO.RenamedEventArgs._oldFullPath]", "taint", "dfc-generated"]
+      - ["System.IO", "RenamedEventArgs", False, "RenamedEventArgs", "(System.IO.WatcherChangeTypes,System.String,System.String,System.String)", "", "Argument[3]", "Argument[this].SyntheticField[System.IO.RenamedEventArgs._oldFullPath]", "taint", "dfc-generated"]
+      - ["System.IO", "RenamedEventArgs", False, "RenamedEventArgs", "(System.IO.WatcherChangeTypes,System.String,System.String,System.String)", "", "Argument[3]", "Argument[this].SyntheticField[System.IO.RenamedEventArgs._oldName]", "value", "dfc-generated"]
+      - ["System.IO", "RenamedEventArgs", False, "get_OldFullPath", "()", "", "Argument[this].SyntheticField[System.IO.RenamedEventArgs._oldFullPath]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.IO", "RenamedEventArgs", False, "get_OldName", "()", "", "Argument[this].SyntheticField[System.IO.RenamedEventArgs._oldName]", "ReturnValue", "value", "dfc-generated"]
       - ["System.IO", "Stream", False, "FlushAsync", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.IO", "Stream", False, "Synchronized", "(System.IO.Stream)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.IO", "Stream", True, "FlushAsync", "(System.Threading.CancellationToken)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.IO", "Stream", True, "FlushAsync", "(System.Threading.CancellationToken)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.IO", "Stream", False, "Synchronized", "(System.IO.Stream)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.IO", "Stream", True, "FlushAsync", "(System.Threading.CancellationToken)", "", "Argument[this]", "ReturnValue.SyntheticField[System.Threading.Tasks.Task.m_stateObject]", "value", "dfc-generated"]
       - ["System.IO", "Stream", True, "WriteAsync", "(System.ReadOnlyMemory<System.Byte>,System.Threading.CancellationToken)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["System.IO", "Stream", True, "WriteAsync", "(System.ReadOnlyMemory<System.Byte>,System.Threading.CancellationToken)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
       - ["System.IO", "Stream", True, "WriteAsync", "(System.ReadOnlyMemory<System.Byte>,System.Threading.CancellationToken)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.IO", "StreamReader", True, "get_BaseStream", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.IO", "StreamReader", True, "get_CurrentEncoding", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.IO", "StreamWriter", False, "StreamWriter", "(System.IO.Stream,System.Text.Encoding,System.Int32,System.Boolean)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.IO", "StreamWriter", False, "StreamWriter", "(System.IO.Stream,System.Text.Encoding,System.Int32,System.Boolean)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["System.IO", "StreamWriter", True, "get_BaseStream", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.IO", "StringWriter", False, "StringWriter", "(System.Text.StringBuilder,System.IFormatProvider)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.IO", "StringWriter", False, "ToString", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.IO", "StringWriter", True, "GetStringBuilder", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.IO", "TextReader", False, "Synchronized", "(System.IO.TextReader)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["System.IO", "StreamWriter", False, "StreamWriter", "(System.IO.Stream,System.Text.Encoding,System.Int32,System.Boolean)", "", "Argument[0]", "Argument[this].SyntheticField[System.IO.StreamWriter._stream]", "value", "dfc-generated"]
+      - ["System.IO", "StreamWriter", True, "FlushAsync", "()", "", "Argument[this]", "ReturnValue.SyntheticField[System.Threading.Tasks.Task.m_stateObject]", "value", "dfc-generated"]
+      - ["System.IO", "StreamWriter", True, "FlushAsync", "(System.Threading.CancellationToken)", "", "Argument[this]", "ReturnValue.SyntheticField[System.Threading.Tasks.Task.m_stateObject]", "value", "dfc-generated"]
+      - ["System.IO", "StreamWriter", True, "get_BaseStream", "()", "", "Argument[this].SyntheticField[System.IO.StreamWriter._stream]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.IO", "TextReader", False, "Synchronized", "(System.IO.TextReader)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
       - ["System.IO", "TextReader", True, "ReadLineAsync", "(System.Threading.CancellationToken)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.IO", "TextReader", True, "ReadToEndAsync", "(System.Threading.CancellationToken)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.IO", "TextWriter", False, "Synchronized", "(System.IO.TextWriter)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.IO", "TextWriter", False, "TextWriter", "(System.IFormatProvider)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["System.IO", "TextWriter", False, "Synchronized", "(System.IO.TextWriter)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.IO", "TextWriter", False, "TextWriter", "(System.IFormatProvider)", "", "Argument[0]", "Argument[this].SyntheticField[System.IO.TextWriter._internalFormatProvider]", "value", "dfc-generated"]
       - ["System.IO", "TextWriter", False, "WriteAsync", "(System.Char[])", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
       - ["System.IO", "TextWriter", False, "WriteAsync", "(System.Char[])", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
       - ["System.IO", "TextWriter", False, "WriteAsync", "(System.Char[])", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.IO", "TextWriter", False, "WriteLineAsync", "(System.Char[])", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
       - ["System.IO", "TextWriter", False, "WriteLineAsync", "(System.Char[])", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
       - ["System.IO", "TextWriter", False, "WriteLineAsync", "(System.Char[])", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.IO", "TextWriter", True, "FlushAsync", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.IO", "TextWriter", True, "FlushAsync", "(System.Threading.CancellationToken)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.IO", "TextWriter", True, "FlushAsync", "(System.Threading.CancellationToken)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.IO", "TextWriter", True, "FlushAsync", "()", "", "Argument[this]", "ReturnValue.SyntheticField[System.Threading.Tasks.Task.m_stateObject]", "value", "dfc-generated"]
+      - ["System.IO", "TextWriter", True, "FlushAsync", "(System.Threading.CancellationToken)", "", "Argument[this]", "ReturnValue.SyntheticField[System.Threading.Tasks.Task.m_stateObject]", "value", "dfc-generated"]
       - ["System.IO", "TextWriter", True, "Write", "(System.Char[])", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
       - ["System.IO", "TextWriter", True, "Write", "(System.Char[],System.Int32,System.Int32)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
       - ["System.IO", "TextWriter", True, "Write", "(System.Object)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
@@ -195,15 +213,11 @@ extensions:
       - ["System.IO", "TextWriter", True, "Write", "(System.String,System.Object[])", "", "Argument[1].Element", "Argument[this]", "taint", "df-generated"]
       - ["System.IO", "TextWriter", True, "Write", "(System.Text.StringBuilder)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.IO", "TextWriter", True, "WriteAsync", "(System.Char)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.IO", "TextWriter", True, "WriteAsync", "(System.Char[],System.Int32,System.Int32)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["System.IO", "TextWriter", True, "WriteAsync", "(System.Char[],System.Int32,System.Int32)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["System.IO", "TextWriter", True, "WriteAsync", "(System.Char[],System.Int32,System.Int32)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.IO", "TextWriter", True, "WriteAsync", "(System.Char[],System.Int32,System.Int32)", "", "Argument[0].Element", "Argument[this]", "taint", "dfc-generated"]
       - ["System.IO", "TextWriter", True, "WriteAsync", "(System.ReadOnlyMemory<System.Char>,System.Threading.CancellationToken)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["System.IO", "TextWriter", True, "WriteAsync", "(System.ReadOnlyMemory<System.Char>,System.Threading.CancellationToken)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
       - ["System.IO", "TextWriter", True, "WriteAsync", "(System.ReadOnlyMemory<System.Char>,System.Threading.CancellationToken)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.IO", "TextWriter", True, "WriteAsync", "(System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.IO", "TextWriter", True, "WriteAsync", "(System.String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.IO", "TextWriter", True, "WriteAsync", "(System.String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.IO", "TextWriter", True, "WriteAsync", "(System.String)", "", "Argument[0]", "Argument[this]", "taint", "dfc-generated"]
       - ["System.IO", "TextWriter", True, "WriteAsync", "(System.Text.StringBuilder,System.Threading.CancellationToken)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.IO", "TextWriter", True, "WriteAsync", "(System.Text.StringBuilder,System.Threading.CancellationToken)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
       - ["System.IO", "TextWriter", True, "WriteLine", "(System.Char[])", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
@@ -237,10 +251,11 @@ extensions:
       - ["System.IO", "TextWriter", True, "WriteLineAsync", "(System.Text.StringBuilder,System.Threading.CancellationToken)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
       - ["System.IO", "TextWriter", True, "WriteLineAsync", "(System.Text.StringBuilder,System.Threading.CancellationToken)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.IO", "TextWriter", True, "get_Encoding", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.IO", "TextWriter", True, "get_FormatProvider", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.IO", "TextWriter", True, "get_FormatProvider", "()", "", "Argument[this].SyntheticField[System.IO.TextWriter._internalFormatProvider]", "ReturnValue", "value", "dfc-generated"]
       - ["System.IO", "UnmanagedMemoryAccessor", False, "Initialize", "(System.Runtime.InteropServices.SafeBuffer,System.Int64,System.Int64,System.IO.FileAccess)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.IO", "UnmanagedMemoryAccessor", False, "UnmanagedMemoryAccessor", "(System.Runtime.InteropServices.SafeBuffer,System.Int64,System.Int64)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.IO", "UnmanagedMemoryAccessor", False, "UnmanagedMemoryAccessor", "(System.Runtime.InteropServices.SafeBuffer,System.Int64,System.Int64,System.IO.FileAccess)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["System.IO", "UnmanagedMemoryAccessor", False, "Write<T>", "(System.Int64,T)", "", "Argument[1]", "ReturnValue", "value", "dfc-generated"]
       - ["System.IO", "UnmanagedMemoryStream", False, "Initialize", "(System.Byte*,System.Int64,System.Int64,System.IO.FileAccess)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.IO", "UnmanagedMemoryStream", False, "Initialize", "(System.Runtime.InteropServices.SafeBuffer,System.Int64,System.Int64,System.IO.FileAccess)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.IO", "UnmanagedMemoryStream", False, "UnmanagedMemoryStream", "(System.Byte*,System.Int64)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
@@ -397,6 +412,7 @@ extensions:
       - ["System.IO", "DriveInfo", "get_DriveFormat", "()", "summary", "df-generated"]
       - ["System.IO", "DriveInfo", "get_DriveType", "()", "summary", "df-generated"]
       - ["System.IO", "DriveInfo", "get_IsReady", "()", "summary", "df-generated"]
+      - ["System.IO", "DriveInfo", "get_RootDirectory", "()", "summary", "df-generated"]
       - ["System.IO", "DriveInfo", "get_TotalFreeSpace", "()", "summary", "df-generated"]
       - ["System.IO", "DriveInfo", "get_TotalSize", "()", "summary", "df-generated"]
       - ["System.IO", "DriveNotFoundException", "DriveNotFoundException", "(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)", "summary", "df-generated"]
@@ -473,6 +489,7 @@ extensions:
       - ["System.IO", "File", "WriteAllLines", "(System.String,System.String[],System.Text.Encoding)", "summary", "df-generated"]
       - ["System.IO", "File", "WriteAllText", "(System.String,System.String)", "summary", "df-generated"]
       - ["System.IO", "File", "WriteAllText", "(System.String,System.String,System.Text.Encoding)", "summary", "df-generated"]
+      - ["System.IO", "FileFormatException", "FileFormatException", "(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)", "summary", "df-generated"]
       - ["System.IO", "FileFormatException", "FileFormatException", "(System.String)", "summary", "df-generated"]
       - ["System.IO", "FileFormatException", "FileFormatException", "(System.String,System.Exception)", "summary", "df-generated"]
       - ["System.IO", "FileInfo", "AppendText", "()", "summary", "df-generated"]
@@ -504,13 +521,9 @@ extensions:
       - ["System.IO", "FileStream", "EndRead", "(System.IAsyncResult)", "summary", "df-generated"]
       - ["System.IO", "FileStream", "EndWrite", "(System.IAsyncResult)", "summary", "df-generated"]
       - ["System.IO", "FileStream", "FileStream", "(Microsoft.Win32.SafeHandles.SafeFileHandle,System.IO.FileAccess)", "summary", "df-generated"]
-      - ["System.IO", "FileStream", "FileStream", "(Microsoft.Win32.SafeHandles.SafeFileHandle,System.IO.FileAccess,System.Int32)", "summary", "df-generated"]
-      - ["System.IO", "FileStream", "FileStream", "(Microsoft.Win32.SafeHandles.SafeFileHandle,System.IO.FileAccess,System.Int32,System.Boolean)", "summary", "df-generated"]
       - ["System.IO", "FileStream", "FileStream", "(System.IntPtr,System.IO.FileAccess)", "summary", "df-generated"]
       - ["System.IO", "FileStream", "FileStream", "(System.IntPtr,System.IO.FileAccess,System.Boolean)", "summary", "df-generated"]
       - ["System.IO", "FileStream", "FileStream", "(System.IntPtr,System.IO.FileAccess,System.Boolean,System.Int32)", "summary", "df-generated"]
-      - ["System.IO", "FileStream", "FileStream", "(System.IntPtr,System.IO.FileAccess,System.Boolean,System.Int32,System.Boolean)", "summary", "df-generated"]
-      - ["System.IO", "FileStream", "FileStream", "(System.String,System.IO.FileStreamOptions)", "summary", "df-generated"]
       - ["System.IO", "FileStream", "Flush", "()", "summary", "df-generated"]
       - ["System.IO", "FileStream", "Flush", "(System.Boolean)", "summary", "df-generated"]
       - ["System.IO", "FileStream", "Lock", "(System.Int64,System.Int64)", "summary", "df-generated"]
@@ -546,14 +559,21 @@ extensions:
       - ["System.IO", "FileSystemWatcher", "BeginInit", "()", "summary", "df-generated"]
       - ["System.IO", "FileSystemWatcher", "Dispose", "(System.Boolean)", "summary", "df-generated"]
       - ["System.IO", "FileSystemWatcher", "EndInit", "()", "summary", "df-generated"]
-      - ["System.IO", "FileSystemWatcher", "OnChanged", "(System.IO.FileSystemEventArgs)", "summary", "df-generated"]
-      - ["System.IO", "FileSystemWatcher", "OnCreated", "(System.IO.FileSystemEventArgs)", "summary", "df-generated"]
-      - ["System.IO", "FileSystemWatcher", "OnDeleted", "(System.IO.FileSystemEventArgs)", "summary", "df-generated"]
       - ["System.IO", "FileSystemWatcher", "OnError", "(System.IO.ErrorEventArgs)", "summary", "df-generated"]
       - ["System.IO", "FileSystemWatcher", "OnRenamed", "(System.IO.RenamedEventArgs)", "summary", "df-generated"]
       - ["System.IO", "FileSystemWatcher", "WaitForChanged", "(System.IO.WatcherChangeTypes)", "summary", "df-generated"]
       - ["System.IO", "FileSystemWatcher", "WaitForChanged", "(System.IO.WatcherChangeTypes,System.Int32)", "summary", "df-generated"]
       - ["System.IO", "FileSystemWatcher", "WaitForChanged", "(System.IO.WatcherChangeTypes,System.TimeSpan)", "summary", "df-generated"]
+      - ["System.IO", "FileSystemWatcher", "add_Changed", "(System.IO.FileSystemEventHandler)", "summary", "df-generated"]
+      - ["System.IO", "FileSystemWatcher", "add_Created", "(System.IO.FileSystemEventHandler)", "summary", "df-generated"]
+      - ["System.IO", "FileSystemWatcher", "add_Deleted", "(System.IO.FileSystemEventHandler)", "summary", "df-generated"]
+      - ["System.IO", "FileSystemWatcher", "add_Error", "(System.IO.ErrorEventHandler)", "summary", "df-generated"]
+      - ["System.IO", "FileSystemWatcher", "add_Renamed", "(System.IO.RenamedEventHandler)", "summary", "df-generated"]
+      - ["System.IO", "FileSystemWatcher", "remove_Changed", "(System.IO.FileSystemEventHandler)", "summary", "df-generated"]
+      - ["System.IO", "FileSystemWatcher", "remove_Created", "(System.IO.FileSystemEventHandler)", "summary", "df-generated"]
+      - ["System.IO", "FileSystemWatcher", "remove_Deleted", "(System.IO.FileSystemEventHandler)", "summary", "df-generated"]
+      - ["System.IO", "FileSystemWatcher", "remove_Error", "(System.IO.ErrorEventHandler)", "summary", "df-generated"]
+      - ["System.IO", "FileSystemWatcher", "remove_Renamed", "(System.IO.RenamedEventHandler)", "summary", "df-generated"]
       - ["System.IO", "IOException", "IOException", "(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)", "summary", "df-generated"]
       - ["System.IO", "IOException", "IOException", "(System.String)", "summary", "df-generated"]
       - ["System.IO", "IOException", "IOException", "(System.String,System.Exception)", "summary", "df-generated"]
@@ -713,7 +733,6 @@ extensions:
       - ["System.IO", "UnmanagedMemoryAccessor", "Write", "(System.Int64,System.UInt16)", "summary", "df-generated"]
       - ["System.IO", "UnmanagedMemoryAccessor", "Write", "(System.Int64,System.UInt32)", "summary", "df-generated"]
       - ["System.IO", "UnmanagedMemoryAccessor", "Write", "(System.Int64,System.UInt64)", "summary", "df-generated"]
-      - ["System.IO", "UnmanagedMemoryAccessor", "Write<T>", "(System.Int64,T)", "summary", "df-generated"]
       - ["System.IO", "UnmanagedMemoryAccessor", "WriteArray<T>", "(System.Int64,T[],System.Int32,System.Int32)", "summary", "df-generated"]
       - ["System.IO", "UnmanagedMemoryAccessor", "get_CanRead", "()", "summary", "df-generated"]
       - ["System.IO", "UnmanagedMemoryAccessor", "get_CanWrite", "()", "summary", "df-generated"]
diff --git a/csharp/ql/lib/ext/generated/System.Linq.Expressions.Interpreter.model.yml b/csharp/ql/lib/ext/generated/System.Linq.Expressions.Interpreter.model.yml
index 69a5b4f9eb2..403da658838 100644
--- a/csharp/ql/lib/ext/generated/System.Linq.Expressions.Interpreter.model.yml
+++ b/csharp/ql/lib/ext/generated/System.Linq.Expressions.Interpreter.model.yml
@@ -4,7 +4,7 @@ extensions:
       pack: codeql/csharp-all
       extensible: summaryModel
     data:
-      - ["System.Linq.Expressions.Interpreter", "LightLambda", False, "Run", "(System.Object[])", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
+      - ["System.Linq.Expressions.Interpreter", "LightLambda", False, "Run", "(System.Object[])", "", "Argument[0].Element", "ReturnValue", "value", "dfc-generated"]
   - addsTo:
       pack: codeql/csharp-all
       extensible: neutralModel
diff --git a/csharp/ql/lib/ext/generated/System.Linq.Expressions.model.yml b/csharp/ql/lib/ext/generated/System.Linq.Expressions.model.yml
index d06badb9b5e..01ee0e86843 100644
--- a/csharp/ql/lib/ext/generated/System.Linq.Expressions.model.yml
+++ b/csharp/ql/lib/ext/generated/System.Linq.Expressions.model.yml
@@ -4,17 +4,23 @@ extensions:
       pack: codeql/csharp-all
       extensible: summaryModel
     data:
-      - ["System.Linq.Expressions", "BinaryExpression", False, "Update", "(System.Linq.Expressions.Expression,System.Linq.Expressions.LambdaExpression,System.Linq.Expressions.Expression)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["System.Linq.Expressions", "BinaryExpression", False, "get_Conversion", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Linq.Expressions", "BinaryExpression", False, "get_Method", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Linq.Expressions", "BlockExpression", False, "Update", "(System.Collections.Generic.IEnumerable<System.Linq.Expressions.ParameterExpression>,System.Collections.Generic.IEnumerable<System.Linq.Expressions.Expression>)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["System.Linq.Expressions", "BinaryExpression", False, "Update", "(System.Linq.Expressions.Expression,System.Linq.Expressions.LambdaExpression,System.Linq.Expressions.Expression)", "", "Argument[1]", "ReturnValue.SyntheticField[System.Linq.Expressions.CoalesceConversionBinaryExpression._conversion]", "value", "dfc-generated"]
+      - ["System.Linq.Expressions", "BinaryExpression", False, "Update", "(System.Linq.Expressions.Expression,System.Linq.Expressions.LambdaExpression,System.Linq.Expressions.Expression)", "", "Argument[1]", "ReturnValue.SyntheticField[System.Linq.Expressions.OpAssignMethodConversionBinaryExpression._conversion]", "value", "dfc-generated"]
+      - ["System.Linq.Expressions", "BinaryExpression", False, "Update", "(System.Linq.Expressions.Expression,System.Linq.Expressions.LambdaExpression,System.Linq.Expressions.Expression)", "", "Argument[this].Property[System.Linq.Expressions.BinaryExpression.Method]", "ReturnValue.SyntheticField[System.Linq.Expressions.MethodBinaryExpression._method]", "value", "dfc-generated"]
+      - ["System.Linq.Expressions", "BinaryExpression", False, "Update", "(System.Linq.Expressions.Expression,System.Linq.Expressions.LambdaExpression,System.Linq.Expressions.Expression)", "", "Argument[this].SyntheticField[System.Linq.Expressions.MethodBinaryExpression._method]", "ReturnValue.SyntheticField[System.Linq.Expressions.MethodBinaryExpression._method]", "value", "dfc-generated"]
+      - ["System.Linq.Expressions", "BinaryExpression", False, "Update", "(System.Linq.Expressions.Expression,System.Linq.Expressions.LambdaExpression,System.Linq.Expressions.Expression)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Linq.Expressions", "BinaryExpression", False, "get_Conversion", "()", "", "Argument[this].SyntheticField[System.Linq.Expressions.CoalesceConversionBinaryExpression._conversion]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Linq.Expressions", "BinaryExpression", False, "get_Conversion", "()", "", "Argument[this].SyntheticField[System.Linq.Expressions.OpAssignMethodConversionBinaryExpression._conversion]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Linq.Expressions", "BinaryExpression", False, "get_Method", "()", "", "Argument[this].SyntheticField[System.Linq.Expressions.MethodBinaryExpression._method]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Linq.Expressions", "BlockExpression", False, "Update", "(System.Collections.Generic.IEnumerable<System.Linq.Expressions.ParameterExpression>,System.Collections.Generic.IEnumerable<System.Linq.Expressions.Expression>)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Linq.Expressions", "BlockExpression", False, "get_Expressions", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Linq.Expressions", "BlockExpression", False, "get_Result", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Linq.Expressions", "BlockExpression", False, "get_Variables", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Linq.Expressions", "CatchBlock", False, "ToString", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Linq.Expressions", "CatchBlock", False, "Update", "(System.Linq.Expressions.ParameterExpression,System.Linq.Expressions.Expression,System.Linq.Expressions.Expression)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["System.Linq.Expressions", "ConditionalExpression", False, "Update", "(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Linq.Expressions.Expression)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["System.Linq.Expressions", "ConditionalExpression", False, "get_IfFalse", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Linq.Expressions", "CatchBlock", False, "ToString", "()", "", "Argument[this].Property[System.Linq.Expressions.CatchBlock.Variable].Property[System.Linq.Expressions.ParameterExpression.Name]", "ReturnValue", "taint", "dfc-generated"]
+      - ["System.Linq.Expressions", "CatchBlock", False, "Update", "(System.Linq.Expressions.ParameterExpression,System.Linq.Expressions.Expression,System.Linq.Expressions.Expression)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Linq.Expressions", "ConditionalExpression", False, "Update", "(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Linq.Expressions.Expression)", "", "Argument[2]", "ReturnValue.SyntheticField[System.Linq.Expressions.FullConditionalExpression._false]", "value", "dfc-generated"]
+      - ["System.Linq.Expressions", "ConditionalExpression", False, "Update", "(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Linq.Expressions.Expression)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Linq.Expressions", "ConditionalExpression", False, "get_IfFalse", "()", "", "Argument[this].SyntheticField[System.Linq.Expressions.FullConditionalExpression._false]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Linq.Expressions", "DynamicExpression", False, "Dynamic", "(System.Runtime.CompilerServices.CallSiteBinder,System.Type,System.Collections.Generic.IEnumerable<System.Linq.Expressions.Expression>)", "", "Argument[2].Element", "ReturnValue", "taint", "df-generated"]
       - ["System.Linq.Expressions", "DynamicExpression", False, "Dynamic", "(System.Runtime.CompilerServices.CallSiteBinder,System.Type,System.Linq.Expressions.Expression)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
       - ["System.Linq.Expressions", "DynamicExpression", False, "Dynamic", "(System.Runtime.CompilerServices.CallSiteBinder,System.Type,System.Linq.Expressions.Expression,System.Linq.Expressions.Expression)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
@@ -37,28 +43,28 @@ extensions:
       - ["System.Linq.Expressions", "DynamicExpression", False, "MakeDynamic", "(System.Type,System.Runtime.CompilerServices.CallSiteBinder,System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Linq.Expressions.Expression)", "", "Argument[3]", "ReturnValue", "taint", "df-generated"]
       - ["System.Linq.Expressions", "DynamicExpression", False, "MakeDynamic", "(System.Type,System.Runtime.CompilerServices.CallSiteBinder,System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Linq.Expressions.Expression)", "", "Argument[4]", "ReturnValue", "taint", "df-generated"]
       - ["System.Linq.Expressions", "DynamicExpression", False, "MakeDynamic", "(System.Type,System.Runtime.CompilerServices.CallSiteBinder,System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Linq.Expressions.Expression)", "", "Argument[5]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Linq.Expressions", "DynamicExpression", False, "Update", "(System.Collections.Generic.IEnumerable<System.Linq.Expressions.Expression>)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["System.Linq.Expressions", "DynamicExpression", False, "Update", "(System.Collections.Generic.IEnumerable<System.Linq.Expressions.Expression>)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Linq.Expressions", "DynamicExpression", False, "get_Arguments", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Linq.Expressions", "ElementInit", False, "GetArgument", "(System.Int32)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Linq.Expressions", "ElementInit", False, "GetArgument", "(System.Int32)", "", "Argument[this].Property[System.Linq.Expressions.ElementInit.Arguments].Element", "ReturnValue", "value", "dfc-generated"]
       - ["System.Linq.Expressions", "ElementInit", False, "ToString", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Linq.Expressions", "ElementInit", False, "Update", "(System.Collections.Generic.IEnumerable<System.Linq.Expressions.Expression>)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["System.Linq.Expressions", "Expression", False, "Add", "(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Linq.Expressions", "Expression", False, "AddAssign", "(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Linq.Expressions", "Expression", False, "AddAssign", "(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo,System.Linq.Expressions.LambdaExpression)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Linq.Expressions", "Expression", False, "AddAssign", "(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo,System.Linq.Expressions.LambdaExpression)", "", "Argument[3]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Linq.Expressions", "Expression", False, "AddAssignChecked", "(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Linq.Expressions", "Expression", False, "AddAssignChecked", "(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo,System.Linq.Expressions.LambdaExpression)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Linq.Expressions", "Expression", False, "AddAssignChecked", "(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo,System.Linq.Expressions.LambdaExpression)", "", "Argument[3]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Linq.Expressions", "Expression", False, "AddChecked", "(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Linq.Expressions", "Expression", False, "And", "(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Linq.Expressions", "ElementInit", False, "Update", "(System.Collections.Generic.IEnumerable<System.Linq.Expressions.Expression>)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Linq.Expressions", "Expression", False, "Add", "(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo)", "", "Argument[2]", "ReturnValue.SyntheticField[System.Linq.Expressions.MethodBinaryExpression._method]", "value", "dfc-generated"]
+      - ["System.Linq.Expressions", "Expression", False, "AddAssign", "(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo)", "", "Argument[2]", "ReturnValue.SyntheticField[System.Linq.Expressions.MethodBinaryExpression._method]", "value", "dfc-generated"]
+      - ["System.Linq.Expressions", "Expression", False, "AddAssign", "(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo,System.Linq.Expressions.LambdaExpression)", "", "Argument[2]", "ReturnValue.SyntheticField[System.Linq.Expressions.MethodBinaryExpression._method]", "value", "dfc-generated"]
+      - ["System.Linq.Expressions", "Expression", False, "AddAssign", "(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo,System.Linq.Expressions.LambdaExpression)", "", "Argument[3]", "ReturnValue.SyntheticField[System.Linq.Expressions.OpAssignMethodConversionBinaryExpression._conversion]", "value", "dfc-generated"]
+      - ["System.Linq.Expressions", "Expression", False, "AddAssignChecked", "(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo)", "", "Argument[2]", "ReturnValue.SyntheticField[System.Linq.Expressions.MethodBinaryExpression._method]", "value", "dfc-generated"]
+      - ["System.Linq.Expressions", "Expression", False, "AddAssignChecked", "(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo,System.Linq.Expressions.LambdaExpression)", "", "Argument[2]", "ReturnValue.SyntheticField[System.Linq.Expressions.MethodBinaryExpression._method]", "value", "dfc-generated"]
+      - ["System.Linq.Expressions", "Expression", False, "AddAssignChecked", "(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo,System.Linq.Expressions.LambdaExpression)", "", "Argument[3]", "ReturnValue.SyntheticField[System.Linq.Expressions.OpAssignMethodConversionBinaryExpression._conversion]", "value", "dfc-generated"]
+      - ["System.Linq.Expressions", "Expression", False, "AddChecked", "(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo)", "", "Argument[2]", "ReturnValue.SyntheticField[System.Linq.Expressions.MethodBinaryExpression._method]", "value", "dfc-generated"]
+      - ["System.Linq.Expressions", "Expression", False, "And", "(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo)", "", "Argument[2]", "ReturnValue.SyntheticField[System.Linq.Expressions.MethodBinaryExpression._method]", "value", "dfc-generated"]
       - ["System.Linq.Expressions", "Expression", False, "AndAlso", "(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Linq.Expressions", "Expression", False, "AndAssign", "(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Linq.Expressions", "Expression", False, "AndAssign", "(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo,System.Linq.Expressions.LambdaExpression)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Linq.Expressions", "Expression", False, "AndAssign", "(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo,System.Linq.Expressions.LambdaExpression)", "", "Argument[3]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Linq.Expressions", "Expression", False, "ArrayAccess", "(System.Linq.Expressions.Expression,System.Collections.Generic.IEnumerable<System.Linq.Expressions.Expression>)", "", "Argument[1].Element", "ReturnValue", "taint", "df-generated"]
+      - ["System.Linq.Expressions", "Expression", False, "AndAssign", "(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo)", "", "Argument[2]", "ReturnValue.SyntheticField[System.Linq.Expressions.MethodBinaryExpression._method]", "value", "dfc-generated"]
+      - ["System.Linq.Expressions", "Expression", False, "AndAssign", "(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo,System.Linq.Expressions.LambdaExpression)", "", "Argument[2]", "ReturnValue.SyntheticField[System.Linq.Expressions.MethodBinaryExpression._method]", "value", "dfc-generated"]
+      - ["System.Linq.Expressions", "Expression", False, "AndAssign", "(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo,System.Linq.Expressions.LambdaExpression)", "", "Argument[3]", "ReturnValue.SyntheticField[System.Linq.Expressions.OpAssignMethodConversionBinaryExpression._conversion]", "value", "dfc-generated"]
+      - ["System.Linq.Expressions", "Expression", False, "ArrayAccess", "(System.Linq.Expressions.Expression,System.Collections.Generic.IEnumerable<System.Linq.Expressions.Expression>)", "", "Argument[1]", "ReturnValue.SyntheticField[System.Linq.Expressions.IndexExpression._arguments]", "value", "dfc-generated"]
       - ["System.Linq.Expressions", "Expression", False, "ArrayIndex", "(System.Linq.Expressions.Expression,System.Collections.Generic.IEnumerable<System.Linq.Expressions.Expression>)", "", "Argument[1].Element", "ReturnValue", "taint", "df-generated"]
-      - ["System.Linq.Expressions", "Expression", False, "Bind", "(System.Reflection.MemberInfo,System.Linq.Expressions.Expression)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Linq.Expressions", "Expression", False, "Bind", "(System.Reflection.MethodInfo,System.Linq.Expressions.Expression)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Linq.Expressions", "Expression", False, "Bind", "(System.Reflection.MemberInfo,System.Linq.Expressions.Expression)", "", "Argument[1]", "ReturnValue.SyntheticField[System.Linq.Expressions.MemberAssignment._expression]", "value", "dfc-generated"]
+      - ["System.Linq.Expressions", "Expression", False, "Bind", "(System.Reflection.MethodInfo,System.Linq.Expressions.Expression)", "", "Argument[1]", "ReturnValue.SyntheticField[System.Linq.Expressions.MemberAssignment._expression]", "value", "dfc-generated"]
       - ["System.Linq.Expressions", "Expression", False, "Block", "(System.Collections.Generic.IEnumerable<System.Linq.Expressions.Expression>)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
       - ["System.Linq.Expressions", "Expression", False, "Block", "(System.Collections.Generic.IEnumerable<System.Linq.Expressions.ParameterExpression>,System.Collections.Generic.IEnumerable<System.Linq.Expressions.Expression>)", "", "Argument[1].Element", "ReturnValue", "taint", "df-generated"]
       - ["System.Linq.Expressions", "Expression", False, "Block", "(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
@@ -78,15 +84,17 @@ extensions:
       - ["System.Linq.Expressions", "Expression", False, "Block", "(System.Type,System.Collections.Generic.IEnumerable<System.Linq.Expressions.Expression>)", "", "Argument[1].Element", "ReturnValue", "taint", "df-generated"]
       - ["System.Linq.Expressions", "Expression", False, "Block", "(System.Type,System.Collections.Generic.IEnumerable<System.Linq.Expressions.ParameterExpression>,System.Collections.Generic.IEnumerable<System.Linq.Expressions.Expression>)", "", "Argument[2].Element", "ReturnValue", "taint", "df-generated"]
       - ["System.Linq.Expressions", "Expression", False, "Call", "(System.Linq.Expressions.Expression,System.Reflection.MethodInfo,System.Collections.Generic.IEnumerable<System.Linq.Expressions.Expression>)", "", "Argument[2].Element", "ReturnValue", "taint", "df-generated"]
-      - ["System.Linq.Expressions", "Expression", False, "Call", "(System.Linq.Expressions.Expression,System.Reflection.MethodInfo,System.Linq.Expressions.Expression,System.Linq.Expressions.Expression)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Linq.Expressions", "Expression", False, "Call", "(System.Linq.Expressions.Expression,System.Reflection.MethodInfo,System.Linq.Expressions.Expression,System.Linq.Expressions.Expression)", "", "Argument[3]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Linq.Expressions", "Expression", False, "Call", "(System.Linq.Expressions.Expression,System.Reflection.MethodInfo,System.Linq.Expressions.Expression,System.Linq.Expressions.Expression)", "", "Argument[2]", "ReturnValue.SyntheticField[System.Linq.Expressions.InstanceMethodCallExpression2._arg0]", "value", "dfc-generated"]
+      - ["System.Linq.Expressions", "Expression", False, "Call", "(System.Linq.Expressions.Expression,System.Reflection.MethodInfo,System.Linq.Expressions.Expression,System.Linq.Expressions.Expression)", "", "Argument[2]", "ReturnValue.SyntheticField[System.Linq.Expressions.MethodCallExpression2._arg0]", "value", "dfc-generated"]
+      - ["System.Linq.Expressions", "Expression", False, "Call", "(System.Linq.Expressions.Expression,System.Reflection.MethodInfo,System.Linq.Expressions.Expression,System.Linq.Expressions.Expression)", "", "Argument[3]", "ReturnValue.SyntheticField[System.Linq.Expressions.InstanceMethodCallExpression2._arg1]", "value", "dfc-generated"]
+      - ["System.Linq.Expressions", "Expression", False, "Call", "(System.Linq.Expressions.Expression,System.Reflection.MethodInfo,System.Linq.Expressions.Expression,System.Linq.Expressions.Expression)", "", "Argument[3]", "ReturnValue.SyntheticField[System.Linq.Expressions.MethodCallExpression2._arg1]", "value", "dfc-generated"]
       - ["System.Linq.Expressions", "Expression", False, "Call", "(System.Linq.Expressions.Expression,System.Reflection.MethodInfo,System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Linq.Expressions.Expression)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
       - ["System.Linq.Expressions", "Expression", False, "Call", "(System.Linq.Expressions.Expression,System.Reflection.MethodInfo,System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Linq.Expressions.Expression)", "", "Argument[3]", "ReturnValue", "taint", "df-generated"]
       - ["System.Linq.Expressions", "Expression", False, "Call", "(System.Linq.Expressions.Expression,System.Reflection.MethodInfo,System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Linq.Expressions.Expression)", "", "Argument[4]", "ReturnValue", "taint", "df-generated"]
       - ["System.Linq.Expressions", "Expression", False, "Call", "(System.Reflection.MethodInfo,System.Collections.Generic.IEnumerable<System.Linq.Expressions.Expression>)", "", "Argument[1].Element", "ReturnValue", "taint", "df-generated"]
-      - ["System.Linq.Expressions", "Expression", False, "Call", "(System.Reflection.MethodInfo,System.Linq.Expressions.Expression)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Linq.Expressions", "Expression", False, "Call", "(System.Reflection.MethodInfo,System.Linq.Expressions.Expression,System.Linq.Expressions.Expression)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Linq.Expressions", "Expression", False, "Call", "(System.Reflection.MethodInfo,System.Linq.Expressions.Expression,System.Linq.Expressions.Expression)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Linq.Expressions", "Expression", False, "Call", "(System.Reflection.MethodInfo,System.Linq.Expressions.Expression)", "", "Argument[1]", "ReturnValue.SyntheticField[System.Linq.Expressions.MethodCallExpression1._arg0]", "value", "dfc-generated"]
+      - ["System.Linq.Expressions", "Expression", False, "Call", "(System.Reflection.MethodInfo,System.Linq.Expressions.Expression,System.Linq.Expressions.Expression)", "", "Argument[1]", "ReturnValue.SyntheticField[System.Linq.Expressions.MethodCallExpression2._arg0]", "value", "dfc-generated"]
+      - ["System.Linq.Expressions", "Expression", False, "Call", "(System.Reflection.MethodInfo,System.Linq.Expressions.Expression,System.Linq.Expressions.Expression)", "", "Argument[2]", "ReturnValue.SyntheticField[System.Linq.Expressions.MethodCallExpression2._arg1]", "value", "dfc-generated"]
       - ["System.Linq.Expressions", "Expression", False, "Call", "(System.Reflection.MethodInfo,System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Linq.Expressions.Expression)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
       - ["System.Linq.Expressions", "Expression", False, "Call", "(System.Reflection.MethodInfo,System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Linq.Expressions.Expression)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
       - ["System.Linq.Expressions", "Expression", False, "Call", "(System.Reflection.MethodInfo,System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Linq.Expressions.Expression)", "", "Argument[3]", "ReturnValue", "taint", "df-generated"]
@@ -100,12 +108,12 @@ extensions:
       - ["System.Linq.Expressions", "Expression", False, "Call", "(System.Reflection.MethodInfo,System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Linq.Expressions.Expression)", "", "Argument[4]", "ReturnValue", "taint", "df-generated"]
       - ["System.Linq.Expressions", "Expression", False, "Call", "(System.Reflection.MethodInfo,System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Linq.Expressions.Expression)", "", "Argument[5]", "ReturnValue", "taint", "df-generated"]
       - ["System.Linq.Expressions", "Expression", False, "Coalesce", "(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Linq.Expressions.LambdaExpression)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Linq.Expressions", "Expression", False, "Condition", "(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Linq.Expressions.Expression)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Linq.Expressions", "Expression", False, "Condition", "(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Type)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Linq.Expressions", "Expression", False, "Divide", "(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Linq.Expressions", "Expression", False, "DivideAssign", "(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Linq.Expressions", "Expression", False, "DivideAssign", "(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo,System.Linq.Expressions.LambdaExpression)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Linq.Expressions", "Expression", False, "DivideAssign", "(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo,System.Linq.Expressions.LambdaExpression)", "", "Argument[3]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Linq.Expressions", "Expression", False, "Condition", "(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Linq.Expressions.Expression)", "", "Argument[2]", "ReturnValue.SyntheticField[System.Linq.Expressions.FullConditionalExpression._false]", "value", "dfc-generated"]
+      - ["System.Linq.Expressions", "Expression", False, "Condition", "(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Type)", "", "Argument[2]", "ReturnValue.SyntheticField[System.Linq.Expressions.FullConditionalExpression._false]", "value", "dfc-generated"]
+      - ["System.Linq.Expressions", "Expression", False, "Divide", "(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo)", "", "Argument[2]", "ReturnValue.SyntheticField[System.Linq.Expressions.MethodBinaryExpression._method]", "value", "dfc-generated"]
+      - ["System.Linq.Expressions", "Expression", False, "DivideAssign", "(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo)", "", "Argument[2]", "ReturnValue.SyntheticField[System.Linq.Expressions.MethodBinaryExpression._method]", "value", "dfc-generated"]
+      - ["System.Linq.Expressions", "Expression", False, "DivideAssign", "(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo,System.Linq.Expressions.LambdaExpression)", "", "Argument[2]", "ReturnValue.SyntheticField[System.Linq.Expressions.MethodBinaryExpression._method]", "value", "dfc-generated"]
+      - ["System.Linq.Expressions", "Expression", False, "DivideAssign", "(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo,System.Linq.Expressions.LambdaExpression)", "", "Argument[3]", "ReturnValue.SyntheticField[System.Linq.Expressions.OpAssignMethodConversionBinaryExpression._conversion]", "value", "dfc-generated"]
       - ["System.Linq.Expressions", "Expression", False, "Dynamic", "(System.Runtime.CompilerServices.CallSiteBinder,System.Type,System.Collections.Generic.IEnumerable<System.Linq.Expressions.Expression>)", "", "Argument[2].Element", "ReturnValue", "taint", "df-generated"]
       - ["System.Linq.Expressions", "Expression", False, "Dynamic", "(System.Runtime.CompilerServices.CallSiteBinder,System.Type,System.Linq.Expressions.Expression)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
       - ["System.Linq.Expressions", "Expression", False, "Dynamic", "(System.Runtime.CompilerServices.CallSiteBinder,System.Type,System.Linq.Expressions.Expression,System.Linq.Expressions.Expression)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
@@ -117,15 +125,15 @@ extensions:
       - ["System.Linq.Expressions", "Expression", False, "Dynamic", "(System.Runtime.CompilerServices.CallSiteBinder,System.Type,System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Linq.Expressions.Expression)", "", "Argument[3]", "ReturnValue", "taint", "df-generated"]
       - ["System.Linq.Expressions", "Expression", False, "Dynamic", "(System.Runtime.CompilerServices.CallSiteBinder,System.Type,System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Linq.Expressions.Expression)", "", "Argument[4]", "ReturnValue", "taint", "df-generated"]
       - ["System.Linq.Expressions", "Expression", False, "Dynamic", "(System.Runtime.CompilerServices.CallSiteBinder,System.Type,System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Linq.Expressions.Expression)", "", "Argument[5]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Linq.Expressions", "Expression", False, "Equal", "(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Boolean,System.Reflection.MethodInfo)", "", "Argument[3]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Linq.Expressions", "Expression", False, "ExclusiveOr", "(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Linq.Expressions", "Expression", False, "ExclusiveOrAssign", "(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Linq.Expressions", "Expression", False, "ExclusiveOrAssign", "(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo,System.Linq.Expressions.LambdaExpression)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Linq.Expressions", "Expression", False, "ExclusiveOrAssign", "(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo,System.Linq.Expressions.LambdaExpression)", "", "Argument[3]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Linq.Expressions", "Expression", False, "Equal", "(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Boolean,System.Reflection.MethodInfo)", "", "Argument[3]", "ReturnValue.SyntheticField[System.Linq.Expressions.MethodBinaryExpression._method]", "value", "dfc-generated"]
+      - ["System.Linq.Expressions", "Expression", False, "ExclusiveOr", "(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo)", "", "Argument[2]", "ReturnValue.SyntheticField[System.Linq.Expressions.MethodBinaryExpression._method]", "value", "dfc-generated"]
+      - ["System.Linq.Expressions", "Expression", False, "ExclusiveOrAssign", "(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo)", "", "Argument[2]", "ReturnValue.SyntheticField[System.Linq.Expressions.MethodBinaryExpression._method]", "value", "dfc-generated"]
+      - ["System.Linq.Expressions", "Expression", False, "ExclusiveOrAssign", "(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo,System.Linq.Expressions.LambdaExpression)", "", "Argument[2]", "ReturnValue.SyntheticField[System.Linq.Expressions.MethodBinaryExpression._method]", "value", "dfc-generated"]
+      - ["System.Linq.Expressions", "Expression", False, "ExclusiveOrAssign", "(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo,System.Linq.Expressions.LambdaExpression)", "", "Argument[3]", "ReturnValue.SyntheticField[System.Linq.Expressions.OpAssignMethodConversionBinaryExpression._conversion]", "value", "dfc-generated"]
       - ["System.Linq.Expressions", "Expression", False, "Field", "(System.Linq.Expressions.Expression,System.Reflection.FieldInfo)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Linq.Expressions", "Expression", False, "GreaterThan", "(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Boolean,System.Reflection.MethodInfo)", "", "Argument[3]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Linq.Expressions", "Expression", False, "GreaterThanOrEqual", "(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Boolean,System.Reflection.MethodInfo)", "", "Argument[3]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Linq.Expressions", "Expression", False, "IfThenElse", "(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Linq.Expressions.Expression)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Linq.Expressions", "Expression", False, "GreaterThan", "(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Boolean,System.Reflection.MethodInfo)", "", "Argument[3]", "ReturnValue.SyntheticField[System.Linq.Expressions.MethodBinaryExpression._method]", "value", "dfc-generated"]
+      - ["System.Linq.Expressions", "Expression", False, "GreaterThanOrEqual", "(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Boolean,System.Reflection.MethodInfo)", "", "Argument[3]", "ReturnValue.SyntheticField[System.Linq.Expressions.MethodBinaryExpression._method]", "value", "dfc-generated"]
+      - ["System.Linq.Expressions", "Expression", False, "IfThenElse", "(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Linq.Expressions.Expression)", "", "Argument[2]", "ReturnValue.SyntheticField[System.Linq.Expressions.FullConditionalExpression._false]", "value", "dfc-generated"]
       - ["System.Linq.Expressions", "Expression", False, "Invoke", "(System.Linq.Expressions.Expression,System.Collections.Generic.IEnumerable<System.Linq.Expressions.Expression>)", "", "Argument[1].Element", "ReturnValue", "taint", "df-generated"]
       - ["System.Linq.Expressions", "Expression", False, "Lambda<TDelegate>", "(System.Linq.Expressions.Expression,System.Boolean,System.Collections.Generic.IEnumerable<System.Linq.Expressions.ParameterExpression>)", "", "Argument[2].Element", "ReturnValue", "taint", "df-generated"]
       - ["System.Linq.Expressions", "Expression", False, "Lambda<TDelegate>", "(System.Linq.Expressions.Expression,System.Collections.Generic.IEnumerable<System.Linq.Expressions.ParameterExpression>)", "", "Argument[1].Element", "ReturnValue", "taint", "df-generated"]
@@ -133,15 +141,16 @@ extensions:
       - ["System.Linq.Expressions", "Expression", False, "Lambda<TDelegate>", "(System.Linq.Expressions.Expression,System.String,System.Boolean,System.Collections.Generic.IEnumerable<System.Linq.Expressions.ParameterExpression>)", "", "Argument[3].Element", "ReturnValue", "taint", "df-generated"]
       - ["System.Linq.Expressions", "Expression", False, "Lambda<TDelegate>", "(System.Linq.Expressions.Expression,System.String,System.Collections.Generic.IEnumerable<System.Linq.Expressions.ParameterExpression>)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
       - ["System.Linq.Expressions", "Expression", False, "Lambda<TDelegate>", "(System.Linq.Expressions.Expression,System.String,System.Collections.Generic.IEnumerable<System.Linq.Expressions.ParameterExpression>)", "", "Argument[2].Element", "ReturnValue", "taint", "df-generated"]
-      - ["System.Linq.Expressions", "Expression", False, "LeftShift", "(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Linq.Expressions", "Expression", False, "LeftShiftAssign", "(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Linq.Expressions", "Expression", False, "LeftShiftAssign", "(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo,System.Linq.Expressions.LambdaExpression)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Linq.Expressions", "Expression", False, "LeftShiftAssign", "(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo,System.Linq.Expressions.LambdaExpression)", "", "Argument[3]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Linq.Expressions", "Expression", False, "LessThan", "(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Boolean,System.Reflection.MethodInfo)", "", "Argument[3]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Linq.Expressions", "Expression", False, "LessThanOrEqual", "(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Boolean,System.Reflection.MethodInfo)", "", "Argument[3]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Linq.Expressions", "Expression", False, "MakeBinary", "(System.Linq.Expressions.ExpressionType,System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Boolean,System.Reflection.MethodInfo)", "", "Argument[4]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Linq.Expressions", "Expression", False, "MakeBinary", "(System.Linq.Expressions.ExpressionType,System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Boolean,System.Reflection.MethodInfo,System.Linq.Expressions.LambdaExpression)", "", "Argument[4]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Linq.Expressions", "Expression", False, "MakeBinary", "(System.Linq.Expressions.ExpressionType,System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Boolean,System.Reflection.MethodInfo,System.Linq.Expressions.LambdaExpression)", "", "Argument[5]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Linq.Expressions", "Expression", False, "LeftShift", "(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo)", "", "Argument[2]", "ReturnValue.SyntheticField[System.Linq.Expressions.MethodBinaryExpression._method]", "value", "dfc-generated"]
+      - ["System.Linq.Expressions", "Expression", False, "LeftShiftAssign", "(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo)", "", "Argument[2]", "ReturnValue.SyntheticField[System.Linq.Expressions.MethodBinaryExpression._method]", "value", "dfc-generated"]
+      - ["System.Linq.Expressions", "Expression", False, "LeftShiftAssign", "(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo,System.Linq.Expressions.LambdaExpression)", "", "Argument[2]", "ReturnValue.SyntheticField[System.Linq.Expressions.MethodBinaryExpression._method]", "value", "dfc-generated"]
+      - ["System.Linq.Expressions", "Expression", False, "LeftShiftAssign", "(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo,System.Linq.Expressions.LambdaExpression)", "", "Argument[3]", "ReturnValue.SyntheticField[System.Linq.Expressions.OpAssignMethodConversionBinaryExpression._conversion]", "value", "dfc-generated"]
+      - ["System.Linq.Expressions", "Expression", False, "LessThan", "(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Boolean,System.Reflection.MethodInfo)", "", "Argument[3]", "ReturnValue.SyntheticField[System.Linq.Expressions.MethodBinaryExpression._method]", "value", "dfc-generated"]
+      - ["System.Linq.Expressions", "Expression", False, "LessThanOrEqual", "(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Boolean,System.Reflection.MethodInfo)", "", "Argument[3]", "ReturnValue.SyntheticField[System.Linq.Expressions.MethodBinaryExpression._method]", "value", "dfc-generated"]
+      - ["System.Linq.Expressions", "Expression", False, "MakeBinary", "(System.Linq.Expressions.ExpressionType,System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Boolean,System.Reflection.MethodInfo)", "", "Argument[4]", "ReturnValue.SyntheticField[System.Linq.Expressions.MethodBinaryExpression._method]", "value", "dfc-generated"]
+      - ["System.Linq.Expressions", "Expression", False, "MakeBinary", "(System.Linq.Expressions.ExpressionType,System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Boolean,System.Reflection.MethodInfo,System.Linq.Expressions.LambdaExpression)", "", "Argument[4]", "ReturnValue.SyntheticField[System.Linq.Expressions.MethodBinaryExpression._method]", "value", "dfc-generated"]
+      - ["System.Linq.Expressions", "Expression", False, "MakeBinary", "(System.Linq.Expressions.ExpressionType,System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Boolean,System.Reflection.MethodInfo,System.Linq.Expressions.LambdaExpression)", "", "Argument[5]", "ReturnValue.SyntheticField[System.Linq.Expressions.CoalesceConversionBinaryExpression._conversion]", "value", "dfc-generated"]
+      - ["System.Linq.Expressions", "Expression", False, "MakeBinary", "(System.Linq.Expressions.ExpressionType,System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Boolean,System.Reflection.MethodInfo,System.Linq.Expressions.LambdaExpression)", "", "Argument[5]", "ReturnValue.SyntheticField[System.Linq.Expressions.OpAssignMethodConversionBinaryExpression._conversion]", "value", "dfc-generated"]
       - ["System.Linq.Expressions", "Expression", False, "MakeDynamic", "(System.Type,System.Runtime.CompilerServices.CallSiteBinder,System.Collections.Generic.IEnumerable<System.Linq.Expressions.Expression>)", "", "Argument[2].Element", "ReturnValue", "taint", "df-generated"]
       - ["System.Linq.Expressions", "Expression", False, "MakeDynamic", "(System.Type,System.Runtime.CompilerServices.CallSiteBinder,System.Linq.Expressions.Expression)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
       - ["System.Linq.Expressions", "Expression", False, "MakeDynamic", "(System.Type,System.Runtime.CompilerServices.CallSiteBinder,System.Linq.Expressions.Expression,System.Linq.Expressions.Expression)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
@@ -153,168 +162,153 @@ extensions:
       - ["System.Linq.Expressions", "Expression", False, "MakeDynamic", "(System.Type,System.Runtime.CompilerServices.CallSiteBinder,System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Linq.Expressions.Expression)", "", "Argument[3]", "ReturnValue", "taint", "df-generated"]
       - ["System.Linq.Expressions", "Expression", False, "MakeDynamic", "(System.Type,System.Runtime.CompilerServices.CallSiteBinder,System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Linq.Expressions.Expression)", "", "Argument[4]", "ReturnValue", "taint", "df-generated"]
       - ["System.Linq.Expressions", "Expression", False, "MakeDynamic", "(System.Type,System.Runtime.CompilerServices.CallSiteBinder,System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Linq.Expressions.Expression)", "", "Argument[5]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Linq.Expressions", "Expression", False, "MakeIndex", "(System.Linq.Expressions.Expression,System.Reflection.PropertyInfo,System.Collections.Generic.IEnumerable<System.Linq.Expressions.Expression>)", "", "Argument[2].Element", "ReturnValue", "taint", "df-generated"]
-      - ["System.Linq.Expressions", "Expression", False, "MakeMemberAccess", "(System.Linq.Expressions.Expression,System.Reflection.MemberInfo)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Linq.Expressions", "Expression", False, "Modulo", "(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Linq.Expressions", "Expression", False, "ModuloAssign", "(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Linq.Expressions", "Expression", False, "ModuloAssign", "(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo,System.Linq.Expressions.LambdaExpression)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Linq.Expressions", "Expression", False, "ModuloAssign", "(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo,System.Linq.Expressions.LambdaExpression)", "", "Argument[3]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Linq.Expressions", "Expression", False, "Multiply", "(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Linq.Expressions", "Expression", False, "MultiplyAssign", "(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Linq.Expressions", "Expression", False, "MultiplyAssign", "(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo,System.Linq.Expressions.LambdaExpression)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Linq.Expressions", "Expression", False, "MultiplyAssign", "(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo,System.Linq.Expressions.LambdaExpression)", "", "Argument[3]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Linq.Expressions", "Expression", False, "MultiplyAssignChecked", "(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Linq.Expressions", "Expression", False, "MultiplyAssignChecked", "(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo,System.Linq.Expressions.LambdaExpression)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Linq.Expressions", "Expression", False, "MultiplyAssignChecked", "(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo,System.Linq.Expressions.LambdaExpression)", "", "Argument[3]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Linq.Expressions", "Expression", False, "MultiplyChecked", "(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Linq.Expressions", "Expression", False, "New", "(System.Reflection.ConstructorInfo,System.Collections.Generic.IEnumerable<System.Linq.Expressions.Expression>)", "", "Argument[1].Element", "ReturnValue", "taint", "df-generated"]
-      - ["System.Linq.Expressions", "Expression", False, "New", "(System.Reflection.ConstructorInfo,System.Collections.Generic.IEnumerable<System.Linq.Expressions.Expression>,System.Collections.Generic.IEnumerable<System.Reflection.MemberInfo>)", "", "Argument[1].Element", "ReturnValue", "taint", "df-generated"]
-      - ["System.Linq.Expressions", "Expression", False, "New", "(System.Reflection.ConstructorInfo,System.Collections.Generic.IEnumerable<System.Linq.Expressions.Expression>,System.Reflection.MemberInfo[])", "", "Argument[1].Element", "ReturnValue", "taint", "df-generated"]
-      - ["System.Linq.Expressions", "Expression", False, "NotEqual", "(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Boolean,System.Reflection.MethodInfo)", "", "Argument[3]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Linq.Expressions", "Expression", False, "Or", "(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Linq.Expressions", "Expression", False, "OrAssign", "(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Linq.Expressions", "Expression", False, "OrAssign", "(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo,System.Linq.Expressions.LambdaExpression)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Linq.Expressions", "Expression", False, "OrAssign", "(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo,System.Linq.Expressions.LambdaExpression)", "", "Argument[3]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Linq.Expressions", "Expression", False, "MakeIndex", "(System.Linq.Expressions.Expression,System.Reflection.PropertyInfo,System.Collections.Generic.IEnumerable<System.Linq.Expressions.Expression>)", "", "Argument[2]", "ReturnValue.SyntheticField[System.Linq.Expressions.IndexExpression._arguments]", "value", "dfc-generated"]
+      - ["System.Linq.Expressions", "Expression", False, "MakeMemberAccess", "(System.Linq.Expressions.Expression,System.Reflection.MemberInfo)", "", "Argument[1]", "ReturnValue.SyntheticField[System.Linq.Expressions.FieldExpression._field]", "value", "dfc-generated"]
+      - ["System.Linq.Expressions", "Expression", False, "MakeMemberAccess", "(System.Linq.Expressions.Expression,System.Reflection.MemberInfo)", "", "Argument[1]", "ReturnValue.SyntheticField[System.Linq.Expressions.PropertyExpression._property]", "value", "dfc-generated"]
+      - ["System.Linq.Expressions", "Expression", False, "Modulo", "(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo)", "", "Argument[2]", "ReturnValue.SyntheticField[System.Linq.Expressions.MethodBinaryExpression._method]", "value", "dfc-generated"]
+      - ["System.Linq.Expressions", "Expression", False, "ModuloAssign", "(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo)", "", "Argument[2]", "ReturnValue.SyntheticField[System.Linq.Expressions.MethodBinaryExpression._method]", "value", "dfc-generated"]
+      - ["System.Linq.Expressions", "Expression", False, "ModuloAssign", "(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo,System.Linq.Expressions.LambdaExpression)", "", "Argument[2]", "ReturnValue.SyntheticField[System.Linq.Expressions.MethodBinaryExpression._method]", "value", "dfc-generated"]
+      - ["System.Linq.Expressions", "Expression", False, "ModuloAssign", "(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo,System.Linq.Expressions.LambdaExpression)", "", "Argument[3]", "ReturnValue.SyntheticField[System.Linq.Expressions.OpAssignMethodConversionBinaryExpression._conversion]", "value", "dfc-generated"]
+      - ["System.Linq.Expressions", "Expression", False, "Multiply", "(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo)", "", "Argument[2]", "ReturnValue.SyntheticField[System.Linq.Expressions.MethodBinaryExpression._method]", "value", "dfc-generated"]
+      - ["System.Linq.Expressions", "Expression", False, "MultiplyAssign", "(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo)", "", "Argument[2]", "ReturnValue.SyntheticField[System.Linq.Expressions.MethodBinaryExpression._method]", "value", "dfc-generated"]
+      - ["System.Linq.Expressions", "Expression", False, "MultiplyAssign", "(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo,System.Linq.Expressions.LambdaExpression)", "", "Argument[2]", "ReturnValue.SyntheticField[System.Linq.Expressions.MethodBinaryExpression._method]", "value", "dfc-generated"]
+      - ["System.Linq.Expressions", "Expression", False, "MultiplyAssign", "(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo,System.Linq.Expressions.LambdaExpression)", "", "Argument[3]", "ReturnValue.SyntheticField[System.Linq.Expressions.OpAssignMethodConversionBinaryExpression._conversion]", "value", "dfc-generated"]
+      - ["System.Linq.Expressions", "Expression", False, "MultiplyAssignChecked", "(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo)", "", "Argument[2]", "ReturnValue.SyntheticField[System.Linq.Expressions.MethodBinaryExpression._method]", "value", "dfc-generated"]
+      - ["System.Linq.Expressions", "Expression", False, "MultiplyAssignChecked", "(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo,System.Linq.Expressions.LambdaExpression)", "", "Argument[2]", "ReturnValue.SyntheticField[System.Linq.Expressions.MethodBinaryExpression._method]", "value", "dfc-generated"]
+      - ["System.Linq.Expressions", "Expression", False, "MultiplyAssignChecked", "(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo,System.Linq.Expressions.LambdaExpression)", "", "Argument[3]", "ReturnValue.SyntheticField[System.Linq.Expressions.OpAssignMethodConversionBinaryExpression._conversion]", "value", "dfc-generated"]
+      - ["System.Linq.Expressions", "Expression", False, "MultiplyChecked", "(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo)", "", "Argument[2]", "ReturnValue.SyntheticField[System.Linq.Expressions.MethodBinaryExpression._method]", "value", "dfc-generated"]
+      - ["System.Linq.Expressions", "Expression", False, "New", "(System.Reflection.ConstructorInfo,System.Collections.Generic.IEnumerable<System.Linq.Expressions.Expression>)", "", "Argument[1]", "ReturnValue.SyntheticField[System.Linq.Expressions.NewExpression._arguments]", "value", "dfc-generated"]
+      - ["System.Linq.Expressions", "Expression", False, "New", "(System.Reflection.ConstructorInfo,System.Collections.Generic.IEnumerable<System.Linq.Expressions.Expression>,System.Collections.Generic.IEnumerable<System.Reflection.MemberInfo>)", "", "Argument[1]", "ReturnValue.SyntheticField[System.Linq.Expressions.NewExpression._arguments]", "value", "dfc-generated"]
+      - ["System.Linq.Expressions", "Expression", False, "New", "(System.Reflection.ConstructorInfo,System.Collections.Generic.IEnumerable<System.Linq.Expressions.Expression>,System.Reflection.MemberInfo[])", "", "Argument[1]", "ReturnValue.SyntheticField[System.Linq.Expressions.NewExpression._arguments]", "value", "dfc-generated"]
+      - ["System.Linq.Expressions", "Expression", False, "NotEqual", "(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Boolean,System.Reflection.MethodInfo)", "", "Argument[3]", "ReturnValue.SyntheticField[System.Linq.Expressions.MethodBinaryExpression._method]", "value", "dfc-generated"]
+      - ["System.Linq.Expressions", "Expression", False, "Or", "(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo)", "", "Argument[2]", "ReturnValue.SyntheticField[System.Linq.Expressions.MethodBinaryExpression._method]", "value", "dfc-generated"]
+      - ["System.Linq.Expressions", "Expression", False, "OrAssign", "(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo)", "", "Argument[2]", "ReturnValue.SyntheticField[System.Linq.Expressions.MethodBinaryExpression._method]", "value", "dfc-generated"]
+      - ["System.Linq.Expressions", "Expression", False, "OrAssign", "(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo,System.Linq.Expressions.LambdaExpression)", "", "Argument[2]", "ReturnValue.SyntheticField[System.Linq.Expressions.MethodBinaryExpression._method]", "value", "dfc-generated"]
+      - ["System.Linq.Expressions", "Expression", False, "OrAssign", "(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo,System.Linq.Expressions.LambdaExpression)", "", "Argument[3]", "ReturnValue.SyntheticField[System.Linq.Expressions.OpAssignMethodConversionBinaryExpression._conversion]", "value", "dfc-generated"]
       - ["System.Linq.Expressions", "Expression", False, "OrElse", "(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Linq.Expressions", "Expression", False, "Power", "(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Linq.Expressions", "Expression", False, "PowerAssign", "(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Linq.Expressions", "Expression", False, "PowerAssign", "(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo,System.Linq.Expressions.LambdaExpression)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Linq.Expressions", "Expression", False, "PowerAssign", "(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo,System.Linq.Expressions.LambdaExpression)", "", "Argument[3]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Linq.Expressions", "Expression", False, "Power", "(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo)", "", "Argument[2]", "ReturnValue.SyntheticField[System.Linq.Expressions.MethodBinaryExpression._method]", "value", "dfc-generated"]
+      - ["System.Linq.Expressions", "Expression", False, "PowerAssign", "(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo)", "", "Argument[2]", "ReturnValue.SyntheticField[System.Linq.Expressions.MethodBinaryExpression._method]", "value", "dfc-generated"]
+      - ["System.Linq.Expressions", "Expression", False, "PowerAssign", "(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo,System.Linq.Expressions.LambdaExpression)", "", "Argument[2]", "ReturnValue.SyntheticField[System.Linq.Expressions.MethodBinaryExpression._method]", "value", "dfc-generated"]
+      - ["System.Linq.Expressions", "Expression", False, "PowerAssign", "(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo,System.Linq.Expressions.LambdaExpression)", "", "Argument[3]", "ReturnValue.SyntheticField[System.Linq.Expressions.OpAssignMethodConversionBinaryExpression._conversion]", "value", "dfc-generated"]
       - ["System.Linq.Expressions", "Expression", False, "Property", "(System.Linq.Expressions.Expression,System.Reflection.PropertyInfo)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Linq.Expressions", "Expression", False, "Property", "(System.Linq.Expressions.Expression,System.Reflection.PropertyInfo,System.Collections.Generic.IEnumerable<System.Linq.Expressions.Expression>)", "", "Argument[2].Element", "ReturnValue", "taint", "df-generated"]
-      - ["System.Linq.Expressions", "Expression", False, "ReduceAndCheck", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Linq.Expressions", "Expression", False, "ReduceExtensions", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Linq.Expressions", "Expression", False, "RightShift", "(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Linq.Expressions", "Expression", False, "RightShiftAssign", "(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Linq.Expressions", "Expression", False, "RightShiftAssign", "(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo,System.Linq.Expressions.LambdaExpression)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Linq.Expressions", "Expression", False, "RightShiftAssign", "(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo,System.Linq.Expressions.LambdaExpression)", "", "Argument[3]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Linq.Expressions", "Expression", False, "Subtract", "(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Linq.Expressions", "Expression", False, "SubtractAssign", "(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Linq.Expressions", "Expression", False, "SubtractAssign", "(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo,System.Linq.Expressions.LambdaExpression)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Linq.Expressions", "Expression", False, "SubtractAssign", "(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo,System.Linq.Expressions.LambdaExpression)", "", "Argument[3]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Linq.Expressions", "Expression", False, "SubtractAssignChecked", "(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Linq.Expressions", "Expression", False, "SubtractAssignChecked", "(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo,System.Linq.Expressions.LambdaExpression)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Linq.Expressions", "Expression", False, "SubtractAssignChecked", "(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo,System.Linq.Expressions.LambdaExpression)", "", "Argument[3]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Linq.Expressions", "Expression", False, "SubtractChecked", "(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Linq.Expressions", "Expression", False, "Property", "(System.Linq.Expressions.Expression,System.Reflection.PropertyInfo,System.Collections.Generic.IEnumerable<System.Linq.Expressions.Expression>)", "", "Argument[2]", "ReturnValue.SyntheticField[System.Linq.Expressions.IndexExpression._arguments]", "value", "dfc-generated"]
+      - ["System.Linq.Expressions", "Expression", False, "ReduceAndCheck", "()", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Linq.Expressions", "Expression", False, "ReduceExtensions", "()", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Linq.Expressions", "Expression", False, "RightShift", "(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo)", "", "Argument[2]", "ReturnValue.SyntheticField[System.Linq.Expressions.MethodBinaryExpression._method]", "value", "dfc-generated"]
+      - ["System.Linq.Expressions", "Expression", False, "RightShiftAssign", "(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo)", "", "Argument[2]", "ReturnValue.SyntheticField[System.Linq.Expressions.MethodBinaryExpression._method]", "value", "dfc-generated"]
+      - ["System.Linq.Expressions", "Expression", False, "RightShiftAssign", "(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo,System.Linq.Expressions.LambdaExpression)", "", "Argument[2]", "ReturnValue.SyntheticField[System.Linq.Expressions.MethodBinaryExpression._method]", "value", "dfc-generated"]
+      - ["System.Linq.Expressions", "Expression", False, "RightShiftAssign", "(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo,System.Linq.Expressions.LambdaExpression)", "", "Argument[3]", "ReturnValue.SyntheticField[System.Linq.Expressions.OpAssignMethodConversionBinaryExpression._conversion]", "value", "dfc-generated"]
+      - ["System.Linq.Expressions", "Expression", False, "Subtract", "(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo)", "", "Argument[2]", "ReturnValue.SyntheticField[System.Linq.Expressions.MethodBinaryExpression._method]", "value", "dfc-generated"]
+      - ["System.Linq.Expressions", "Expression", False, "SubtractAssign", "(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo)", "", "Argument[2]", "ReturnValue.SyntheticField[System.Linq.Expressions.MethodBinaryExpression._method]", "value", "dfc-generated"]
+      - ["System.Linq.Expressions", "Expression", False, "SubtractAssign", "(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo,System.Linq.Expressions.LambdaExpression)", "", "Argument[2]", "ReturnValue.SyntheticField[System.Linq.Expressions.MethodBinaryExpression._method]", "value", "dfc-generated"]
+      - ["System.Linq.Expressions", "Expression", False, "SubtractAssign", "(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo,System.Linq.Expressions.LambdaExpression)", "", "Argument[3]", "ReturnValue.SyntheticField[System.Linq.Expressions.OpAssignMethodConversionBinaryExpression._conversion]", "value", "dfc-generated"]
+      - ["System.Linq.Expressions", "Expression", False, "SubtractAssignChecked", "(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo)", "", "Argument[2]", "ReturnValue.SyntheticField[System.Linq.Expressions.MethodBinaryExpression._method]", "value", "dfc-generated"]
+      - ["System.Linq.Expressions", "Expression", False, "SubtractAssignChecked", "(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo,System.Linq.Expressions.LambdaExpression)", "", "Argument[2]", "ReturnValue.SyntheticField[System.Linq.Expressions.MethodBinaryExpression._method]", "value", "dfc-generated"]
+      - ["System.Linq.Expressions", "Expression", False, "SubtractAssignChecked", "(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo,System.Linq.Expressions.LambdaExpression)", "", "Argument[3]", "ReturnValue.SyntheticField[System.Linq.Expressions.OpAssignMethodConversionBinaryExpression._conversion]", "value", "dfc-generated"]
+      - ["System.Linq.Expressions", "Expression", False, "SubtractChecked", "(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo)", "", "Argument[2]", "ReturnValue.SyntheticField[System.Linq.Expressions.MethodBinaryExpression._method]", "value", "dfc-generated"]
       - ["System.Linq.Expressions", "Expression", False, "SymbolDocument", "(System.String,System.Guid)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
       - ["System.Linq.Expressions", "Expression", False, "SymbolDocument", "(System.String,System.Guid,System.Guid)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
       - ["System.Linq.Expressions", "Expression", False, "SymbolDocument", "(System.String,System.Guid,System.Guid)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
       - ["System.Linq.Expressions", "Expression", False, "SymbolDocument", "(System.String,System.Guid,System.Guid,System.Guid)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
       - ["System.Linq.Expressions", "Expression", False, "SymbolDocument", "(System.String,System.Guid,System.Guid,System.Guid)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
       - ["System.Linq.Expressions", "Expression", False, "SymbolDocument", "(System.String,System.Guid,System.Guid,System.Guid)", "", "Argument[3]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Linq.Expressions", "Expression", True, "Accept", "(System.Linq.Expressions.ExpressionVisitor)", "", "Argument[this]", "Argument[0]", "taint", "df-generated"]
-      - ["System.Linq.Expressions", "Expression", True, "Accept", "(System.Linq.Expressions.ExpressionVisitor)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Linq.Expressions", "Expression", True, "Reduce", "()", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["System.Linq.Expressions", "Expression", True, "Accept", "(System.Linq.Expressions.ExpressionVisitor)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Linq.Expressions", "Expression", True, "Reduce", "()", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Linq.Expressions", "Expression", True, "VisitChildren", "(System.Linq.Expressions.ExpressionVisitor)", "", "Argument[this]", "Argument[0]", "taint", "df-generated"]
       - ["System.Linq.Expressions", "Expression", True, "VisitChildren", "(System.Linq.Expressions.ExpressionVisitor)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Linq.Expressions", "Expression<TDelegate>", False, "Update", "(System.Linq.Expressions.Expression,System.Collections.Generic.IEnumerable<System.Linq.Expressions.ParameterExpression>)", "", "Argument[1].Element", "ReturnValue", "taint", "df-generated"]
       - ["System.Linq.Expressions", "Expression<TDelegate>", False, "Update", "(System.Linq.Expressions.Expression,System.Collections.Generic.IEnumerable<System.Linq.Expressions.ParameterExpression>)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Linq.Expressions", "ExpressionVisitor", False, "Visit", "(System.Collections.ObjectModel.ReadOnlyCollection<System.Linq.Expressions.Expression>)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
       - ["System.Linq.Expressions", "ExpressionVisitor", False, "Visit", "(System.Collections.ObjectModel.ReadOnlyCollection<System.Linq.Expressions.Expression>)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
+      - ["System.Linq.Expressions", "ExpressionVisitor", False, "Visit<T>", "(System.Collections.ObjectModel.ReadOnlyCollection<T>,System.Func<T,T>)", "", "Argument[0].Element", "Argument[1].Parameter[0]", "value", "dfc-generated"]
+      - ["System.Linq.Expressions", "ExpressionVisitor", False, "Visit<T>", "(System.Collections.ObjectModel.ReadOnlyCollection<T>,System.Func<T,T>)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Linq.Expressions", "ExpressionVisitor", False, "VisitAndConvert<T>", "(System.Collections.ObjectModel.ReadOnlyCollection<T>,System.String)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
       - ["System.Linq.Expressions", "ExpressionVisitor", False, "VisitAndConvert<T>", "(System.Collections.ObjectModel.ReadOnlyCollection<T>,System.String)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
       - ["System.Linq.Expressions", "ExpressionVisitor", False, "VisitAndConvert<T>", "(T,System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Linq.Expressions", "ExpressionVisitor", False, "VisitAndConvert<T>", "(T,System.String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Linq.Expressions", "ExpressionVisitor", True, "Visit", "(System.Linq.Expressions.Expression)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Linq.Expressions", "ExpressionVisitor", True, "Visit", "(System.Linq.Expressions.Expression)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Linq.Expressions", "ExpressionVisitor", True, "Visit", "(System.Linq.Expressions.Expression)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Linq.Expressions", "ExpressionVisitor", True, "VisitBinary", "(System.Linq.Expressions.BinaryExpression)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Linq.Expressions", "ExpressionVisitor", True, "VisitBinary", "(System.Linq.Expressions.BinaryExpression)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Linq.Expressions", "ExpressionVisitor", True, "VisitBlock", "(System.Linq.Expressions.BlockExpression)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Linq.Expressions", "ExpressionVisitor", True, "VisitBlock", "(System.Linq.Expressions.BlockExpression)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Linq.Expressions", "ExpressionVisitor", True, "VisitCatchBlock", "(System.Linq.Expressions.CatchBlock)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Linq.Expressions", "ExpressionVisitor", True, "VisitCatchBlock", "(System.Linq.Expressions.CatchBlock)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Linq.Expressions", "ExpressionVisitor", True, "VisitBlock", "(System.Linq.Expressions.BlockExpression)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Linq.Expressions", "ExpressionVisitor", True, "VisitCatchBlock", "(System.Linq.Expressions.CatchBlock)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Linq.Expressions", "ExpressionVisitor", True, "VisitConditional", "(System.Linq.Expressions.ConditionalExpression)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Linq.Expressions", "ExpressionVisitor", True, "VisitConditional", "(System.Linq.Expressions.ConditionalExpression)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Linq.Expressions", "ExpressionVisitor", True, "VisitConstant", "(System.Linq.Expressions.ConstantExpression)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Linq.Expressions", "ExpressionVisitor", True, "VisitConstant", "(System.Linq.Expressions.ConstantExpression)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Linq.Expressions", "ExpressionVisitor", True, "VisitDebugInfo", "(System.Linq.Expressions.DebugInfoExpression)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Linq.Expressions", "ExpressionVisitor", True, "VisitDebugInfo", "(System.Linq.Expressions.DebugInfoExpression)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Linq.Expressions", "ExpressionVisitor", True, "VisitDefault", "(System.Linq.Expressions.DefaultExpression)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Linq.Expressions", "ExpressionVisitor", True, "VisitDynamic", "(System.Linq.Expressions.DynamicExpression)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Linq.Expressions", "ExpressionVisitor", True, "VisitElementInit", "(System.Linq.Expressions.ElementInit)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Linq.Expressions", "ExpressionVisitor", True, "VisitElementInit", "(System.Linq.Expressions.ElementInit)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Linq.Expressions", "ExpressionVisitor", True, "VisitExtension", "(System.Linq.Expressions.Expression)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Linq.Expressions", "ExpressionVisitor", True, "VisitExtension", "(System.Linq.Expressions.Expression)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Linq.Expressions", "ExpressionVisitor", True, "VisitConstant", "(System.Linq.Expressions.ConstantExpression)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Linq.Expressions", "ExpressionVisitor", True, "VisitDebugInfo", "(System.Linq.Expressions.DebugInfoExpression)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Linq.Expressions", "ExpressionVisitor", True, "VisitDefault", "(System.Linq.Expressions.DefaultExpression)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Linq.Expressions", "ExpressionVisitor", True, "VisitDynamic", "(System.Linq.Expressions.DynamicExpression)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Linq.Expressions", "ExpressionVisitor", True, "VisitElementInit", "(System.Linq.Expressions.ElementInit)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Linq.Expressions", "ExpressionVisitor", True, "VisitExtension", "(System.Linq.Expressions.Expression)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Linq.Expressions", "ExpressionVisitor", True, "VisitGoto", "(System.Linq.Expressions.GotoExpression)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Linq.Expressions", "ExpressionVisitor", True, "VisitGoto", "(System.Linq.Expressions.GotoExpression)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["System.Linq.Expressions", "ExpressionVisitor", True, "VisitIndex", "(System.Linq.Expressions.IndexExpression)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Linq.Expressions", "ExpressionVisitor", True, "VisitIndex", "(System.Linq.Expressions.IndexExpression)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["System.Linq.Expressions", "ExpressionVisitor", True, "VisitInvocation", "(System.Linq.Expressions.InvocationExpression)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Linq.Expressions", "ExpressionVisitor", True, "VisitInvocation", "(System.Linq.Expressions.InvocationExpression)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Linq.Expressions", "ExpressionVisitor", True, "VisitLabel", "(System.Linq.Expressions.LabelExpression)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Linq.Expressions", "ExpressionVisitor", True, "VisitLabel", "(System.Linq.Expressions.LabelExpression)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Linq.Expressions", "ExpressionVisitor", True, "VisitLabelTarget", "(System.Linq.Expressions.LabelTarget)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Linq.Expressions", "ExpressionVisitor", True, "VisitLambda<T>", "(System.Linq.Expressions.Expression<T>)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Linq.Expressions", "ExpressionVisitor", True, "VisitLambda<T>", "(System.Linq.Expressions.Expression<T>)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Linq.Expressions", "ExpressionVisitor", True, "VisitListInit", "(System.Linq.Expressions.ListInitExpression)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Linq.Expressions", "ExpressionVisitor", True, "VisitLoop", "(System.Linq.Expressions.LoopExpression)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Linq.Expressions", "ExpressionVisitor", True, "VisitLoop", "(System.Linq.Expressions.LoopExpression)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Linq.Expressions", "ExpressionVisitor", True, "VisitLabel", "(System.Linq.Expressions.LabelExpression)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Linq.Expressions", "ExpressionVisitor", True, "VisitLabelTarget", "(System.Linq.Expressions.LabelTarget)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Linq.Expressions", "ExpressionVisitor", True, "VisitLambda<T>", "(System.Linq.Expressions.Expression<T>)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Linq.Expressions", "ExpressionVisitor", True, "VisitListInit", "(System.Linq.Expressions.ListInitExpression)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Linq.Expressions", "ExpressionVisitor", True, "VisitLoop", "(System.Linq.Expressions.LoopExpression)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Linq.Expressions", "ExpressionVisitor", True, "VisitMember", "(System.Linq.Expressions.MemberExpression)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Linq.Expressions", "ExpressionVisitor", True, "VisitMember", "(System.Linq.Expressions.MemberExpression)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["System.Linq.Expressions", "ExpressionVisitor", True, "VisitMemberAssignment", "(System.Linq.Expressions.MemberAssignment)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Linq.Expressions", "ExpressionVisitor", True, "VisitMemberAssignment", "(System.Linq.Expressions.MemberAssignment)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["System.Linq.Expressions", "ExpressionVisitor", True, "VisitMemberBinding", "(System.Linq.Expressions.MemberBinding)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Linq.Expressions", "ExpressionVisitor", True, "VisitMemberBinding", "(System.Linq.Expressions.MemberBinding)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Linq.Expressions", "ExpressionVisitor", True, "VisitMemberInit", "(System.Linq.Expressions.MemberInitExpression)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Linq.Expressions", "ExpressionVisitor", True, "VisitMemberListBinding", "(System.Linq.Expressions.MemberListBinding)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Linq.Expressions", "ExpressionVisitor", True, "VisitMemberListBinding", "(System.Linq.Expressions.MemberListBinding)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Linq.Expressions", "ExpressionVisitor", True, "VisitMemberMemberBinding", "(System.Linq.Expressions.MemberMemberBinding)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Linq.Expressions", "ExpressionVisitor", True, "VisitMemberMemberBinding", "(System.Linq.Expressions.MemberMemberBinding)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Linq.Expressions", "ExpressionVisitor", True, "VisitMethodCall", "(System.Linq.Expressions.MethodCallExpression)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Linq.Expressions", "ExpressionVisitor", True, "VisitMethodCall", "(System.Linq.Expressions.MethodCallExpression)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Linq.Expressions", "ExpressionVisitor", True, "VisitNew", "(System.Linq.Expressions.NewExpression)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Linq.Expressions", "ExpressionVisitor", True, "VisitNew", "(System.Linq.Expressions.NewExpression)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Linq.Expressions", "ExpressionVisitor", True, "VisitNewArray", "(System.Linq.Expressions.NewArrayExpression)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Linq.Expressions", "ExpressionVisitor", True, "VisitNewArray", "(System.Linq.Expressions.NewArrayExpression)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Linq.Expressions", "ExpressionVisitor", True, "VisitParameter", "(System.Linq.Expressions.ParameterExpression)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Linq.Expressions", "ExpressionVisitor", True, "VisitParameter", "(System.Linq.Expressions.ParameterExpression)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Linq.Expressions", "ExpressionVisitor", True, "VisitRuntimeVariables", "(System.Linq.Expressions.RuntimeVariablesExpression)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Linq.Expressions", "ExpressionVisitor", True, "VisitRuntimeVariables", "(System.Linq.Expressions.RuntimeVariablesExpression)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Linq.Expressions", "ExpressionVisitor", True, "VisitSwitch", "(System.Linq.Expressions.SwitchExpression)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Linq.Expressions", "ExpressionVisitor", True, "VisitSwitch", "(System.Linq.Expressions.SwitchExpression)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Linq.Expressions", "ExpressionVisitor", True, "VisitSwitchCase", "(System.Linq.Expressions.SwitchCase)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Linq.Expressions", "ExpressionVisitor", True, "VisitSwitchCase", "(System.Linq.Expressions.SwitchCase)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Linq.Expressions", "ExpressionVisitor", True, "VisitTry", "(System.Linq.Expressions.TryExpression)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Linq.Expressions", "ExpressionVisitor", True, "VisitTry", "(System.Linq.Expressions.TryExpression)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Linq.Expressions", "ExpressionVisitor", True, "VisitTypeBinary", "(System.Linq.Expressions.TypeBinaryExpression)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Linq.Expressions", "ExpressionVisitor", True, "VisitTypeBinary", "(System.Linq.Expressions.TypeBinaryExpression)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Linq.Expressions", "ExpressionVisitor", True, "VisitUnary", "(System.Linq.Expressions.UnaryExpression)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Linq.Expressions", "ExpressionVisitor", True, "VisitUnary", "(System.Linq.Expressions.UnaryExpression)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Linq.Expressions", "GotoExpression", False, "Update", "(System.Linq.Expressions.LabelTarget,System.Linq.Expressions.Expression)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["System.Linq.Expressions", "ExpressionVisitor", True, "VisitMemberInit", "(System.Linq.Expressions.MemberInitExpression)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Linq.Expressions", "ExpressionVisitor", True, "VisitMemberListBinding", "(System.Linq.Expressions.MemberListBinding)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Linq.Expressions", "ExpressionVisitor", True, "VisitMemberMemberBinding", "(System.Linq.Expressions.MemberMemberBinding)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Linq.Expressions", "ExpressionVisitor", True, "VisitMethodCall", "(System.Linq.Expressions.MethodCallExpression)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Linq.Expressions", "ExpressionVisitor", True, "VisitNew", "(System.Linq.Expressions.NewExpression)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Linq.Expressions", "ExpressionVisitor", True, "VisitNewArray", "(System.Linq.Expressions.NewArrayExpression)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Linq.Expressions", "ExpressionVisitor", True, "VisitParameter", "(System.Linq.Expressions.ParameterExpression)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Linq.Expressions", "ExpressionVisitor", True, "VisitRuntimeVariables", "(System.Linq.Expressions.RuntimeVariablesExpression)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Linq.Expressions", "ExpressionVisitor", True, "VisitSwitch", "(System.Linq.Expressions.SwitchExpression)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Linq.Expressions", "ExpressionVisitor", True, "VisitSwitchCase", "(System.Linq.Expressions.SwitchCase)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Linq.Expressions", "ExpressionVisitor", True, "VisitTry", "(System.Linq.Expressions.TryExpression)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Linq.Expressions", "ExpressionVisitor", True, "VisitTypeBinary", "(System.Linq.Expressions.TypeBinaryExpression)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Linq.Expressions", "ExpressionVisitor", True, "VisitUnary", "(System.Linq.Expressions.UnaryExpression)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Linq.Expressions", "GotoExpression", False, "Update", "(System.Linq.Expressions.LabelTarget,System.Linq.Expressions.Expression)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Linq.Expressions", "IArgumentProvider", True, "GetArgument", "(System.Int32)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Linq.Expressions", "IndexExpression", False, "GetArgument", "(System.Int32)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Linq.Expressions", "IndexExpression", False, "Update", "(System.Linq.Expressions.Expression,System.Collections.Generic.IEnumerable<System.Linq.Expressions.Expression>)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["System.Linq.Expressions", "IndexExpression", False, "get_Arguments", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Linq.Expressions", "IndexExpression", False, "GetArgument", "(System.Int32)", "", "Argument[this].SyntheticField[System.Linq.Expressions.IndexExpression._arguments].Element", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Linq.Expressions", "IndexExpression", False, "Update", "(System.Linq.Expressions.Expression,System.Collections.Generic.IEnumerable<System.Linq.Expressions.Expression>)", "", "Argument[1]", "ReturnValue.SyntheticField[System.Linq.Expressions.IndexExpression._arguments]", "value", "dfc-generated"]
+      - ["System.Linq.Expressions", "IndexExpression", False, "Update", "(System.Linq.Expressions.Expression,System.Collections.Generic.IEnumerable<System.Linq.Expressions.Expression>)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Linq.Expressions", "IndexExpression", False, "get_Arguments", "()", "", "Argument[this].SyntheticField[System.Linq.Expressions.IndexExpression._arguments]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Linq.Expressions", "InvocationExpression", False, "GetArgument", "(System.Int32)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Linq.Expressions", "InvocationExpression", False, "Update", "(System.Linq.Expressions.Expression,System.Collections.Generic.IEnumerable<System.Linq.Expressions.Expression>)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["System.Linq.Expressions", "LabelExpression", False, "Update", "(System.Linq.Expressions.LabelTarget,System.Linq.Expressions.Expression)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["System.Linq.Expressions", "LabelTarget", False, "ToString", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Linq.Expressions", "InvocationExpression", False, "Update", "(System.Linq.Expressions.Expression,System.Collections.Generic.IEnumerable<System.Linq.Expressions.Expression>)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Linq.Expressions", "LabelExpression", False, "Update", "(System.Linq.Expressions.LabelTarget,System.Linq.Expressions.Expression)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Linq.Expressions", "LabelTarget", False, "ToString", "()", "", "Argument[this].Property[System.Linq.Expressions.LabelTarget.Name]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Linq.Expressions", "LambdaExpression", False, "get_Body", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Linq.Expressions", "LambdaExpression", False, "get_Name", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Linq.Expressions", "ListInitExpression", False, "Update", "(System.Linq.Expressions.NewExpression,System.Collections.Generic.IEnumerable<System.Linq.Expressions.ElementInit>)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["System.Linq.Expressions", "LoopExpression", False, "Update", "(System.Linq.Expressions.LabelTarget,System.Linq.Expressions.LabelTarget,System.Linq.Expressions.Expression)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["System.Linq.Expressions", "MemberAssignment", False, "Update", "(System.Linq.Expressions.Expression)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["System.Linq.Expressions", "MemberAssignment", False, "get_Expression", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Linq.Expressions", "LambdaExpression", False, "get_Parameters", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Linq.Expressions", "ListInitExpression", False, "Update", "(System.Linq.Expressions.NewExpression,System.Collections.Generic.IEnumerable<System.Linq.Expressions.ElementInit>)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Linq.Expressions", "LoopExpression", False, "Update", "(System.Linq.Expressions.LabelTarget,System.Linq.Expressions.LabelTarget,System.Linq.Expressions.Expression)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Linq.Expressions", "MemberAssignment", False, "Update", "(System.Linq.Expressions.Expression)", "", "Argument[0]", "ReturnValue.SyntheticField[System.Linq.Expressions.MemberAssignment._expression]", "value", "dfc-generated"]
+      - ["System.Linq.Expressions", "MemberAssignment", False, "Update", "(System.Linq.Expressions.Expression)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Linq.Expressions", "MemberAssignment", False, "get_Expression", "()", "", "Argument[this].SyntheticField[System.Linq.Expressions.MemberAssignment._expression]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Linq.Expressions", "MemberBinding", False, "ToString", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Linq.Expressions", "MemberExpression", False, "Update", "(System.Linq.Expressions.Expression)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["System.Linq.Expressions", "MemberExpression", False, "get_Member", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Linq.Expressions", "MemberInitExpression", False, "Update", "(System.Linq.Expressions.NewExpression,System.Collections.Generic.IEnumerable<System.Linq.Expressions.MemberBinding>)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["System.Linq.Expressions", "MemberListBinding", False, "Update", "(System.Collections.Generic.IEnumerable<System.Linq.Expressions.ElementInit>)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["System.Linq.Expressions", "MemberMemberBinding", False, "Update", "(System.Collections.Generic.IEnumerable<System.Linq.Expressions.MemberBinding>)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["System.Linq.Expressions", "MethodCallExpression", False, "Update", "(System.Linq.Expressions.Expression,System.Collections.Generic.IEnumerable<System.Linq.Expressions.Expression>)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["System.Linq.Expressions", "MemberExpression", False, "get_Member", "()", "", "Argument[this].SyntheticField[System.Linq.Expressions.FieldExpression._field]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Linq.Expressions", "MemberExpression", False, "get_Member", "()", "", "Argument[this].SyntheticField[System.Linq.Expressions.PropertyExpression._property]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Linq.Expressions", "MemberInitExpression", False, "Update", "(System.Linq.Expressions.NewExpression,System.Collections.Generic.IEnumerable<System.Linq.Expressions.MemberBinding>)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Linq.Expressions", "MemberListBinding", False, "Update", "(System.Collections.Generic.IEnumerable<System.Linq.Expressions.ElementInit>)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Linq.Expressions", "MemberMemberBinding", False, "Update", "(System.Collections.Generic.IEnumerable<System.Linq.Expressions.MemberBinding>)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Linq.Expressions", "MethodCallExpression", False, "Update", "(System.Linq.Expressions.Expression,System.Collections.Generic.IEnumerable<System.Linq.Expressions.Expression>)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Linq.Expressions", "MethodCallExpression", False, "get_Arguments", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Linq.Expressions", "MethodCallExpression", False, "get_Object", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Linq.Expressions", "MethodCallExpression", True, "GetArgument", "(System.Int32)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Linq.Expressions", "NewArrayExpression", False, "Update", "(System.Collections.Generic.IEnumerable<System.Linq.Expressions.Expression>)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["System.Linq.Expressions", "NewExpression", False, "GetArgument", "(System.Int32)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Linq.Expressions", "NewExpression", False, "Update", "(System.Collections.Generic.IEnumerable<System.Linq.Expressions.Expression>)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["System.Linq.Expressions", "NewExpression", False, "get_Arguments", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Linq.Expressions", "RuntimeVariablesExpression", False, "Update", "(System.Collections.Generic.IEnumerable<System.Linq.Expressions.ParameterExpression>)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["System.Linq.Expressions", "SwitchCase", False, "Update", "(System.Collections.Generic.IEnumerable<System.Linq.Expressions.Expression>,System.Linq.Expressions.Expression)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["System.Linq.Expressions", "SwitchExpression", False, "Update", "(System.Linq.Expressions.Expression,System.Collections.Generic.IEnumerable<System.Linq.Expressions.SwitchCase>,System.Linq.Expressions.Expression)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["System.Linq.Expressions", "TryExpression", False, "Update", "(System.Linq.Expressions.Expression,System.Collections.Generic.IEnumerable<System.Linq.Expressions.CatchBlock>,System.Linq.Expressions.Expression,System.Linq.Expressions.Expression)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["System.Linq.Expressions", "TypeBinaryExpression", False, "Update", "(System.Linq.Expressions.Expression)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["System.Linq.Expressions", "UnaryExpression", False, "Update", "(System.Linq.Expressions.Expression)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["System.Linq.Expressions", "NewArrayExpression", False, "Update", "(System.Collections.Generic.IEnumerable<System.Linq.Expressions.Expression>)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Linq.Expressions", "NewExpression", False, "GetArgument", "(System.Int32)", "", "Argument[this].SyntheticField[System.Linq.Expressions.NewExpression._arguments].Element", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Linq.Expressions", "NewExpression", False, "Update", "(System.Collections.Generic.IEnumerable<System.Linq.Expressions.Expression>)", "", "Argument[0]", "ReturnValue.SyntheticField[System.Linq.Expressions.NewExpression._arguments]", "value", "dfc-generated"]
+      - ["System.Linq.Expressions", "NewExpression", False, "Update", "(System.Collections.Generic.IEnumerable<System.Linq.Expressions.Expression>)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Linq.Expressions", "NewExpression", False, "get_Arguments", "()", "", "Argument[this].SyntheticField[System.Linq.Expressions.NewExpression._arguments]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Linq.Expressions", "RuntimeVariablesExpression", False, "Update", "(System.Collections.Generic.IEnumerable<System.Linq.Expressions.ParameterExpression>)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Linq.Expressions", "SwitchCase", False, "Update", "(System.Collections.Generic.IEnumerable<System.Linq.Expressions.Expression>,System.Linq.Expressions.Expression)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Linq.Expressions", "SwitchExpression", False, "Update", "(System.Linq.Expressions.Expression,System.Collections.Generic.IEnumerable<System.Linq.Expressions.SwitchCase>,System.Linq.Expressions.Expression)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Linq.Expressions", "TryExpression", False, "Update", "(System.Linq.Expressions.Expression,System.Collections.Generic.IEnumerable<System.Linq.Expressions.CatchBlock>,System.Linq.Expressions.Expression,System.Linq.Expressions.Expression)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Linq.Expressions", "TypeBinaryExpression", False, "Update", "(System.Linq.Expressions.Expression)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Linq.Expressions", "UnaryExpression", False, "Update", "(System.Linq.Expressions.Expression)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
   - addsTo:
       pack: codeql/csharp-all
       extensible: neutralModel
@@ -605,7 +599,6 @@ extensions:
       - ["System.Linq.Expressions", "LambdaExpression", "get_CanCompileToIL", "()", "summary", "df-generated"]
       - ["System.Linq.Expressions", "LambdaExpression", "get_CanInterpret", "()", "summary", "df-generated"]
       - ["System.Linq.Expressions", "LambdaExpression", "get_NodeType", "()", "summary", "df-generated"]
-      - ["System.Linq.Expressions", "LambdaExpression", "get_Parameters", "()", "summary", "df-generated"]
       - ["System.Linq.Expressions", "LambdaExpression", "get_ReturnType", "()", "summary", "df-generated"]
       - ["System.Linq.Expressions", "LambdaExpression", "get_TailCall", "()", "summary", "df-generated"]
       - ["System.Linq.Expressions", "LambdaExpression", "get_Type", "()", "summary", "df-generated"]
diff --git a/csharp/ql/lib/ext/generated/System.Linq.model.yml b/csharp/ql/lib/ext/generated/System.Linq.model.yml
index 2a9adf33b3b..02bb4cf3623 100644
--- a/csharp/ql/lib/ext/generated/System.Linq.model.yml
+++ b/csharp/ql/lib/ext/generated/System.Linq.model.yml
@@ -4,104 +4,156 @@ extensions:
       pack: codeql/csharp-all
       extensible: summaryModel
     data:
+      - ["System.Linq", "Enumerable", False, "AggregateBy<TSource,TKey,TAccumulate>", "(System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,TKey>,System.Func<TKey,TAccumulate>,System.Func<TAccumulate,TSource,TAccumulate>,System.Collections.Generic.IEqualityComparer<TKey>)", "", "Argument[0].Element", "Argument[1].Parameter[0]", "value", "dfc-generated"]
+      - ["System.Linq", "Enumerable", False, "AggregateBy<TSource,TKey,TAccumulate>", "(System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,TKey>,System.Func<TKey,TAccumulate>,System.Func<TAccumulate,TSource,TAccumulate>,System.Collections.Generic.IEqualityComparer<TKey>)", "", "Argument[0].Element", "Argument[3].Parameter[1]", "value", "dfc-generated"]
+      - ["System.Linq", "Enumerable", False, "AggregateBy<TSource,TKey,TAccumulate>", "(System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,TKey>,System.Func<TKey,TAccumulate>,System.Func<TAccumulate,TSource,TAccumulate>,System.Collections.Generic.IEqualityComparer<TKey>)", "", "Argument[1].ReturnValue", "Argument[2].Parameter[0]", "value", "dfc-generated"]
+      - ["System.Linq", "Enumerable", False, "AggregateBy<TSource,TKey,TAccumulate>", "(System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,TKey>,System.Func<TKey,TAccumulate>,System.Func<TAccumulate,TSource,TAccumulate>,System.Collections.Generic.IEqualityComparer<TKey>)", "", "Argument[2].ReturnValue", "Argument[3].Parameter[0]", "value", "dfc-generated"]
+      - ["System.Linq", "Enumerable", False, "AggregateBy<TSource,TKey,TAccumulate>", "(System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,TKey>,TAccumulate,System.Func<TAccumulate,TSource,TAccumulate>,System.Collections.Generic.IEqualityComparer<TKey>)", "", "Argument[0].Element", "Argument[1].Parameter[0]", "value", "dfc-generated"]
+      - ["System.Linq", "Enumerable", False, "AggregateBy<TSource,TKey,TAccumulate>", "(System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,TKey>,TAccumulate,System.Func<TAccumulate,TSource,TAccumulate>,System.Collections.Generic.IEqualityComparer<TKey>)", "", "Argument[0].Element", "Argument[3].Parameter[1]", "value", "dfc-generated"]
+      - ["System.Linq", "Enumerable", False, "AggregateBy<TSource,TKey,TAccumulate>", "(System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,TKey>,TAccumulate,System.Func<TAccumulate,TSource,TAccumulate>,System.Collections.Generic.IEqualityComparer<TKey>)", "", "Argument[2]", "Argument[3].Parameter[0]", "value", "dfc-generated"]
       - ["System.Linq", "Enumerable", False, "Append<TSource>", "(System.Collections.Generic.IEnumerable<TSource>,TSource)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Linq", "Enumerable", False, "Chunk<TSource>", "(System.Collections.Generic.IEnumerable<TSource>,System.Int32)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["System.Linq", "Enumerable", False, "ElementAt<TSource>", "(System.Collections.Generic.IEnumerable<TSource>,System.Index)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["System.Linq", "Enumerable", False, "ElementAtOrDefault<TSource>", "(System.Collections.Generic.IEnumerable<TSource>,System.Index)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["System.Linq", "Enumerable", False, "FirstOrDefault<TSource>", "(System.Collections.Generic.IEnumerable<TSource>,TSource)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["System.Linq", "Enumerable", False, "FirstOrDefault<TSource>", "(System.Collections.Generic.IEnumerable<TSource>,TSource)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Linq", "Enumerable", False, "Index<TSource>", "(System.Collections.Generic.IEnumerable<TSource>)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["System.Linq", "Enumerable", False, "LastOrDefault<TSource>", "(System.Collections.Generic.IEnumerable<TSource>,TSource)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["System.Linq", "Enumerable", False, "LastOrDefault<TSource>", "(System.Collections.Generic.IEnumerable<TSource>,TSource)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Linq", "Enumerable", False, "Max", "(System.Collections.Generic.IEnumerable<System.Nullable<System.Double>>)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["System.Linq", "Enumerable", False, "Max", "(System.Collections.Generic.IEnumerable<System.Nullable<System.Int32>>)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["System.Linq", "Enumerable", False, "Max", "(System.Collections.Generic.IEnumerable<System.Nullable<System.Int64>>)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["System.Linq", "Enumerable", False, "Max", "(System.Collections.Generic.IEnumerable<System.Nullable<System.Single>>)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
+      - ["System.Linq", "Enumerable", False, "Chunk<TSource>", "(System.Collections.Generic.IEnumerable<TSource>,System.Int32)", "", "Argument[0].Element", "ReturnValue.Element.Element", "value", "dfc-generated"]
+      - ["System.Linq", "Enumerable", False, "Contains<TSource>", "(System.Collections.Generic.IEnumerable<TSource>,TSource,System.Collections.Generic.IEqualityComparer<TSource>)", "", "Argument[0].Element", "Argument[2]", "taint", "df-generated"]
+      - ["System.Linq", "Enumerable", False, "Contains<TSource>", "(System.Collections.Generic.IEnumerable<TSource>,TSource,System.Collections.Generic.IEqualityComparer<TSource>)", "", "Argument[1]", "Argument[2]", "taint", "df-generated"]
+      - ["System.Linq", "Enumerable", False, "CountBy<TSource,TKey>", "(System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,TKey>,System.Collections.Generic.IEqualityComparer<TKey>)", "", "Argument[0].Element", "Argument[1].Parameter[0]", "value", "dfc-generated"]
+      - ["System.Linq", "Enumerable", False, "DistinctBy<TSource,TKey>", "(System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,TKey>)", "", "Argument[0].Element", "Argument[1].Parameter[0]", "value", "dfc-generated"]
+      - ["System.Linq", "Enumerable", False, "DistinctBy<TSource,TKey>", "(System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,TKey>)", "", "Argument[0].Element", "ReturnValue.Element", "value", "dfc-generated"]
+      - ["System.Linq", "Enumerable", False, "DistinctBy<TSource,TKey>", "(System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,TKey>,System.Collections.Generic.IEqualityComparer<TKey>)", "", "Argument[0].Element", "Argument[1].Parameter[0]", "value", "dfc-generated"]
+      - ["System.Linq", "Enumerable", False, "DistinctBy<TSource,TKey>", "(System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,TKey>,System.Collections.Generic.IEqualityComparer<TKey>)", "", "Argument[0].Element", "ReturnValue.Element", "value", "dfc-generated"]
+      - ["System.Linq", "Enumerable", False, "ElementAt<TSource>", "(System.Collections.Generic.IEnumerable<TSource>,System.Index)", "", "Argument[0].Element", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Linq", "Enumerable", False, "ElementAtOrDefault<TSource>", "(System.Collections.Generic.IEnumerable<TSource>,System.Index)", "", "Argument[0].Element", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Linq", "Enumerable", False, "ExceptBy<TSource,TKey>", "(System.Collections.Generic.IEnumerable<TSource>,System.Collections.Generic.IEnumerable<TKey>,System.Func<TSource,TKey>)", "", "Argument[0].Element", "Argument[2].Parameter[0]", "value", "dfc-generated"]
+      - ["System.Linq", "Enumerable", False, "ExceptBy<TSource,TKey>", "(System.Collections.Generic.IEnumerable<TSource>,System.Collections.Generic.IEnumerable<TKey>,System.Func<TSource,TKey>)", "", "Argument[0].Element", "ReturnValue.Element", "value", "dfc-generated"]
+      - ["System.Linq", "Enumerable", False, "ExceptBy<TSource,TKey>", "(System.Collections.Generic.IEnumerable<TSource>,System.Collections.Generic.IEnumerable<TKey>,System.Func<TSource,TKey>,System.Collections.Generic.IEqualityComparer<TKey>)", "", "Argument[0].Element", "Argument[2].Parameter[0]", "value", "dfc-generated"]
+      - ["System.Linq", "Enumerable", False, "ExceptBy<TSource,TKey>", "(System.Collections.Generic.IEnumerable<TSource>,System.Collections.Generic.IEnumerable<TKey>,System.Func<TSource,TKey>,System.Collections.Generic.IEqualityComparer<TKey>)", "", "Argument[0].Element", "ReturnValue.Element", "value", "dfc-generated"]
+      - ["System.Linq", "Enumerable", False, "FirstOrDefault<TSource>", "(System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,System.Boolean>,TSource)", "", "Argument[0].Element", "Argument[1].Parameter[0]", "value", "dfc-generated"]
+      - ["System.Linq", "Enumerable", False, "FirstOrDefault<TSource>", "(System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,System.Boolean>,TSource)", "", "Argument[0].Element", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Linq", "Enumerable", False, "FirstOrDefault<TSource>", "(System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,System.Boolean>,TSource)", "", "Argument[2]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Linq", "Enumerable", False, "FirstOrDefault<TSource>", "(System.Collections.Generic.IEnumerable<TSource>,TSource)", "", "Argument[0].Element", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Linq", "Enumerable", False, "FirstOrDefault<TSource>", "(System.Collections.Generic.IEnumerable<TSource>,TSource)", "", "Argument[1]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Linq", "Enumerable", False, "Index<TSource>", "(System.Collections.Generic.IEnumerable<TSource>)", "", "Argument[0].Element", "ReturnValue.Element.Field[System.ValueTuple`2.Item2]", "value", "dfc-generated"]
+      - ["System.Linq", "Enumerable", False, "IntersectBy<TSource,TKey>", "(System.Collections.Generic.IEnumerable<TSource>,System.Collections.Generic.IEnumerable<TKey>,System.Func<TSource,TKey>)", "", "Argument[0].Element", "Argument[2].Parameter[0]", "value", "dfc-generated"]
+      - ["System.Linq", "Enumerable", False, "IntersectBy<TSource,TKey>", "(System.Collections.Generic.IEnumerable<TSource>,System.Collections.Generic.IEnumerable<TKey>,System.Func<TSource,TKey>)", "", "Argument[0].Element", "ReturnValue.Element", "value", "dfc-generated"]
+      - ["System.Linq", "Enumerable", False, "IntersectBy<TSource,TKey>", "(System.Collections.Generic.IEnumerable<TSource>,System.Collections.Generic.IEnumerable<TKey>,System.Func<TSource,TKey>,System.Collections.Generic.IEqualityComparer<TKey>)", "", "Argument[0].Element", "Argument[2].Parameter[0]", "value", "dfc-generated"]
+      - ["System.Linq", "Enumerable", False, "IntersectBy<TSource,TKey>", "(System.Collections.Generic.IEnumerable<TSource>,System.Collections.Generic.IEnumerable<TKey>,System.Func<TSource,TKey>,System.Collections.Generic.IEqualityComparer<TKey>)", "", "Argument[0].Element", "ReturnValue.Element", "value", "dfc-generated"]
+      - ["System.Linq", "Enumerable", False, "LastOrDefault<TSource>", "(System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,System.Boolean>,TSource)", "", "Argument[2]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Linq", "Enumerable", False, "LastOrDefault<TSource>", "(System.Collections.Generic.IEnumerable<TSource>,TSource)", "", "Argument[0].Element", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Linq", "Enumerable", False, "LastOrDefault<TSource>", "(System.Collections.Generic.IEnumerable<TSource>,TSource)", "", "Argument[1]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Linq", "Enumerable", False, "Max", "(System.Collections.Generic.IEnumerable<System.Nullable<System.Double>>)", "", "Argument[0].Element", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Linq", "Enumerable", False, "Max", "(System.Collections.Generic.IEnumerable<System.Nullable<System.Int32>>)", "", "Argument[0].Element", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Linq", "Enumerable", False, "Max", "(System.Collections.Generic.IEnumerable<System.Nullable<System.Int64>>)", "", "Argument[0].Element", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Linq", "Enumerable", False, "Max", "(System.Collections.Generic.IEnumerable<System.Nullable<System.Single>>)", "", "Argument[0].Element", "ReturnValue", "value", "dfc-generated"]
       - ["System.Linq", "Enumerable", False, "Max<TSource>", "(System.Collections.Generic.IEnumerable<TSource>)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
       - ["System.Linq", "Enumerable", False, "Max<TSource>", "(System.Collections.Generic.IEnumerable<TSource>,System.Collections.Generic.IComparer<TSource>)", "", "Argument[0].Element", "Argument[1]", "taint", "df-generated"]
       - ["System.Linq", "Enumerable", False, "Max<TSource>", "(System.Collections.Generic.IEnumerable<TSource>,System.Collections.Generic.IComparer<TSource>)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["System.Linq", "Enumerable", False, "Min", "(System.Collections.Generic.IEnumerable<System.Nullable<System.Double>>)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["System.Linq", "Enumerable", False, "Min", "(System.Collections.Generic.IEnumerable<System.Nullable<System.Int32>>)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["System.Linq", "Enumerable", False, "Min", "(System.Collections.Generic.IEnumerable<System.Nullable<System.Int64>>)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["System.Linq", "Enumerable", False, "Min", "(System.Collections.Generic.IEnumerable<System.Nullable<System.Single>>)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
+      - ["System.Linq", "Enumerable", False, "Min", "(System.Collections.Generic.IEnumerable<System.Nullable<System.Double>>)", "", "Argument[0].Element", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Linq", "Enumerable", False, "Min", "(System.Collections.Generic.IEnumerable<System.Nullable<System.Int32>>)", "", "Argument[0].Element", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Linq", "Enumerable", False, "Min", "(System.Collections.Generic.IEnumerable<System.Nullable<System.Int64>>)", "", "Argument[0].Element", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Linq", "Enumerable", False, "Min", "(System.Collections.Generic.IEnumerable<System.Nullable<System.Single>>)", "", "Argument[0].Element", "ReturnValue", "value", "dfc-generated"]
       - ["System.Linq", "Enumerable", False, "Min<TSource>", "(System.Collections.Generic.IEnumerable<TSource>)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
       - ["System.Linq", "Enumerable", False, "Min<TSource>", "(System.Collections.Generic.IEnumerable<TSource>,System.Collections.Generic.IComparer<TSource>)", "", "Argument[0].Element", "Argument[1]", "taint", "df-generated"]
       - ["System.Linq", "Enumerable", False, "Min<TSource>", "(System.Collections.Generic.IEnumerable<TSource>,System.Collections.Generic.IComparer<TSource>)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["System.Linq", "Enumerable", False, "Order<T>", "(System.Collections.Generic.IEnumerable<T>)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["System.Linq", "Enumerable", False, "Order<T>", "(System.Collections.Generic.IEnumerable<T>,System.Collections.Generic.IComparer<T>)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["System.Linq", "Enumerable", False, "Order<T>", "(System.Collections.Generic.IEnumerable<T>,System.Collections.Generic.IComparer<T>)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Linq", "Enumerable", False, "OrderDescending<T>", "(System.Collections.Generic.IEnumerable<T>)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["System.Linq", "Enumerable", False, "OrderDescending<T>", "(System.Collections.Generic.IEnumerable<T>,System.Collections.Generic.IComparer<T>)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["System.Linq", "Enumerable", False, "OrderDescending<T>", "(System.Collections.Generic.IEnumerable<T>,System.Collections.Generic.IComparer<T>)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Linq", "Enumerable", False, "Order<T>", "(System.Collections.Generic.IEnumerable<T>)", "", "Argument[0].Element", "ReturnValue.Element", "value", "dfc-generated"]
+      - ["System.Linq", "Enumerable", False, "Order<T>", "(System.Collections.Generic.IEnumerable<T>,System.Collections.Generic.IComparer<T>)", "", "Argument[0].Element", "ReturnValue.Element", "value", "dfc-generated"]
+      - ["System.Linq", "Enumerable", False, "OrderDescending<T>", "(System.Collections.Generic.IEnumerable<T>)", "", "Argument[0].Element", "ReturnValue.Element", "value", "dfc-generated"]
+      - ["System.Linq", "Enumerable", False, "OrderDescending<T>", "(System.Collections.Generic.IEnumerable<T>,System.Collections.Generic.IComparer<T>)", "", "Argument[0].Element", "ReturnValue.Element", "value", "dfc-generated"]
       - ["System.Linq", "Enumerable", False, "Prepend<TSource>", "(System.Collections.Generic.IEnumerable<TSource>,TSource)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
       - ["System.Linq", "Enumerable", False, "Repeat<TResult>", "(TResult,System.Int32)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Linq", "Enumerable", False, "SingleOrDefault<TSource>", "(System.Collections.Generic.IEnumerable<TSource>,TSource)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["System.Linq", "Enumerable", False, "SingleOrDefault<TSource>", "(System.Collections.Generic.IEnumerable<TSource>,TSource)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Linq", "Enumerable", False, "SequenceEqual<TSource>", "(System.Collections.Generic.IEnumerable<TSource>,System.Collections.Generic.IEnumerable<TSource>,System.Collections.Generic.IEqualityComparer<TSource>)", "", "Argument[0].Element", "Argument[2]", "taint", "df-generated"]
+      - ["System.Linq", "Enumerable", False, "SequenceEqual<TSource>", "(System.Collections.Generic.IEnumerable<TSource>,System.Collections.Generic.IEnumerable<TSource>,System.Collections.Generic.IEqualityComparer<TSource>)", "", "Argument[1].Element", "Argument[2]", "taint", "df-generated"]
+      - ["System.Linq", "Enumerable", False, "SingleOrDefault<TSource>", "(System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,System.Boolean>,TSource)", "", "Argument[0].Element", "Argument[1].Parameter[0]", "value", "dfc-generated"]
+      - ["System.Linq", "Enumerable", False, "SingleOrDefault<TSource>", "(System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,System.Boolean>,TSource)", "", "Argument[0].Element", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Linq", "Enumerable", False, "SingleOrDefault<TSource>", "(System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,System.Boolean>,TSource)", "", "Argument[2]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Linq", "Enumerable", False, "SingleOrDefault<TSource>", "(System.Collections.Generic.IEnumerable<TSource>,TSource)", "", "Argument[0].Element", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Linq", "Enumerable", False, "SingleOrDefault<TSource>", "(System.Collections.Generic.IEnumerable<TSource>,TSource)", "", "Argument[1]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Linq", "Enumerable", False, "SkipLast<TSource>", "(System.Collections.Generic.IEnumerable<TSource>,System.Int32)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
       - ["System.Linq", "Enumerable", False, "Take<TSource>", "(System.Collections.Generic.IEnumerable<TSource>,System.Range)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
       - ["System.Linq", "Enumerable", False, "TakeLast<TSource>", "(System.Collections.Generic.IEnumerable<TSource>,System.Int32)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["System.Linq", "Enumerable", False, "ToDictionary<TKey,TValue>", "(System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<TKey,TValue>>)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["System.Linq", "Enumerable", False, "ToDictionary<TKey,TValue>", "(System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<TKey,TValue>>,System.Collections.Generic.IEqualityComparer<TKey>)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["System.Linq", "Enumerable", False, "ToDictionary<TKey,TValue>", "(System.Collections.Generic.IEnumerable<System.ValueTuple<TKey,TValue>>)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["System.Linq", "Enumerable", False, "ToDictionary<TKey,TValue>", "(System.Collections.Generic.IEnumerable<System.ValueTuple<TKey,TValue>>,System.Collections.Generic.IEqualityComparer<TKey>)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["System.Linq", "Enumerable", False, "ToDictionary<TKey,TValue>", "(System.Collections.Generic.IEnumerable<System.ValueTuple<TKey,TValue>>,System.Collections.Generic.IEqualityComparer<TKey>)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Linq", "Enumerable", False, "ToHashSet<TSource>", "(System.Collections.Generic.IEnumerable<TSource>)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["System.Linq", "Enumerable", False, "ToHashSet<TSource>", "(System.Collections.Generic.IEnumerable<TSource>,System.Collections.Generic.IEqualityComparer<TSource>)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["System.Linq", "Enumerable", False, "Zip<TFirst,TSecond,TThird>", "(System.Collections.Generic.IEnumerable<TFirst>,System.Collections.Generic.IEnumerable<TSecond>,System.Collections.Generic.IEnumerable<TThird>)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["System.Linq", "Enumerable", False, "Zip<TFirst,TSecond,TThird>", "(System.Collections.Generic.IEnumerable<TFirst>,System.Collections.Generic.IEnumerable<TSecond>,System.Collections.Generic.IEnumerable<TThird>)", "", "Argument[1].Element", "ReturnValue", "taint", "df-generated"]
-      - ["System.Linq", "Enumerable", False, "Zip<TFirst,TSecond,TThird>", "(System.Collections.Generic.IEnumerable<TFirst>,System.Collections.Generic.IEnumerable<TSecond>,System.Collections.Generic.IEnumerable<TThird>)", "", "Argument[2].Element", "ReturnValue", "taint", "df-generated"]
-      - ["System.Linq", "Enumerable", False, "Zip<TFirst,TSecond>", "(System.Collections.Generic.IEnumerable<TFirst>,System.Collections.Generic.IEnumerable<TSecond>)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["System.Linq", "Enumerable", False, "Zip<TFirst,TSecond>", "(System.Collections.Generic.IEnumerable<TFirst>,System.Collections.Generic.IEnumerable<TSecond>)", "", "Argument[1].Element", "ReturnValue", "taint", "df-generated"]
+      - ["System.Linq", "Enumerable", False, "ToDictionary<TKey,TValue>", "(System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<TKey,TValue>>)", "", "Argument[0].Element.Property[System.Collections.Generic.KeyValuePair`2.Key]", "ReturnValue.Element.Property[System.Collections.Generic.KeyValuePair`2.Key]", "value", "dfc-generated"]
+      - ["System.Linq", "Enumerable", False, "ToDictionary<TKey,TValue>", "(System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<TKey,TValue>>)", "", "Argument[0].Element.Property[System.Collections.Generic.KeyValuePair`2.Value]", "ReturnValue.Element.Property[System.Collections.Generic.KeyValuePair`2.Value]", "value", "dfc-generated"]
+      - ["System.Linq", "Enumerable", False, "ToDictionary<TKey,TValue>", "(System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<TKey,TValue>>,System.Collections.Generic.IEqualityComparer<TKey>)", "", "Argument[0].Element.Property[System.Collections.Generic.KeyValuePair`2.Key]", "ReturnValue.Element.Property[System.Collections.Generic.KeyValuePair`2.Key]", "value", "dfc-generated"]
+      - ["System.Linq", "Enumerable", False, "ToDictionary<TKey,TValue>", "(System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<TKey,TValue>>,System.Collections.Generic.IEqualityComparer<TKey>)", "", "Argument[0].Element.Property[System.Collections.Generic.KeyValuePair`2.Value]", "ReturnValue.Element.Property[System.Collections.Generic.KeyValuePair`2.Value]", "value", "dfc-generated"]
+      - ["System.Linq", "Enumerable", False, "ToDictionary<TKey,TValue>", "(System.Collections.Generic.IEnumerable<System.ValueTuple<TKey,TValue>>)", "", "Argument[0].Element.Field[System.ValueTuple`2.Item1]", "ReturnValue.Element.Property[System.Collections.Generic.KeyValuePair`2.Key]", "value", "dfc-generated"]
+      - ["System.Linq", "Enumerable", False, "ToDictionary<TKey,TValue>", "(System.Collections.Generic.IEnumerable<System.ValueTuple<TKey,TValue>>)", "", "Argument[0].Element.Field[System.ValueTuple`2.Item2]", "ReturnValue.Element.Property[System.Collections.Generic.KeyValuePair`2.Value]", "value", "dfc-generated"]
+      - ["System.Linq", "Enumerable", False, "ToDictionary<TKey,TValue>", "(System.Collections.Generic.IEnumerable<System.ValueTuple<TKey,TValue>>)", "", "Argument[0].Element.Field[System.ValueTuple`2.Item2]", "ReturnValue.Element", "value", "dfc-generated"]
+      - ["System.Linq", "Enumerable", False, "ToDictionary<TKey,TValue>", "(System.Collections.Generic.IEnumerable<System.ValueTuple<TKey,TValue>>,System.Collections.Generic.IEqualityComparer<TKey>)", "", "Argument[0].Element.Field[System.ValueTuple`2.Item1]", "ReturnValue.Element.Property[System.Collections.Generic.KeyValuePair`2.Key]", "value", "dfc-generated"]
+      - ["System.Linq", "Enumerable", False, "ToDictionary<TKey,TValue>", "(System.Collections.Generic.IEnumerable<System.ValueTuple<TKey,TValue>>,System.Collections.Generic.IEqualityComparer<TKey>)", "", "Argument[0].Element.Field[System.ValueTuple`2.Item2]", "ReturnValue.Element.Property[System.Collections.Generic.KeyValuePair`2.Value]", "value", "dfc-generated"]
+      - ["System.Linq", "Enumerable", False, "ToDictionary<TKey,TValue>", "(System.Collections.Generic.IEnumerable<System.ValueTuple<TKey,TValue>>,System.Collections.Generic.IEqualityComparer<TKey>)", "", "Argument[0].Element.Field[System.ValueTuple`2.Item2]", "ReturnValue.Element", "value", "dfc-generated"]
+      - ["System.Linq", "Enumerable", False, "UnionBy<TSource,TKey>", "(System.Collections.Generic.IEnumerable<TSource>,System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,TKey>)", "", "Argument[0].Element", "Argument[2].Parameter[0]", "value", "dfc-generated"]
+      - ["System.Linq", "Enumerable", False, "UnionBy<TSource,TKey>", "(System.Collections.Generic.IEnumerable<TSource>,System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,TKey>)", "", "Argument[0].Element", "ReturnValue.Element", "value", "dfc-generated"]
+      - ["System.Linq", "Enumerable", False, "UnionBy<TSource,TKey>", "(System.Collections.Generic.IEnumerable<TSource>,System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,TKey>)", "", "Argument[1].Element", "Argument[2].Parameter[0]", "value", "dfc-generated"]
+      - ["System.Linq", "Enumerable", False, "UnionBy<TSource,TKey>", "(System.Collections.Generic.IEnumerable<TSource>,System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,TKey>)", "", "Argument[1].Element", "ReturnValue.Element", "value", "dfc-generated"]
+      - ["System.Linq", "Enumerable", False, "UnionBy<TSource,TKey>", "(System.Collections.Generic.IEnumerable<TSource>,System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,TKey>,System.Collections.Generic.IEqualityComparer<TKey>)", "", "Argument[0].Element", "Argument[2].Parameter[0]", "value", "dfc-generated"]
+      - ["System.Linq", "Enumerable", False, "UnionBy<TSource,TKey>", "(System.Collections.Generic.IEnumerable<TSource>,System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,TKey>,System.Collections.Generic.IEqualityComparer<TKey>)", "", "Argument[0].Element", "ReturnValue.Element", "value", "dfc-generated"]
+      - ["System.Linq", "Enumerable", False, "UnionBy<TSource,TKey>", "(System.Collections.Generic.IEnumerable<TSource>,System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,TKey>,System.Collections.Generic.IEqualityComparer<TKey>)", "", "Argument[1].Element", "Argument[2].Parameter[0]", "value", "dfc-generated"]
+      - ["System.Linq", "Enumerable", False, "UnionBy<TSource,TKey>", "(System.Collections.Generic.IEnumerable<TSource>,System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,TKey>,System.Collections.Generic.IEqualityComparer<TKey>)", "", "Argument[1].Element", "ReturnValue.Element", "value", "dfc-generated"]
+      - ["System.Linq", "Enumerable", False, "Zip<TFirst,TSecond,TThird>", "(System.Collections.Generic.IEnumerable<TFirst>,System.Collections.Generic.IEnumerable<TSecond>,System.Collections.Generic.IEnumerable<TThird>)", "", "Argument[0].Element", "ReturnValue.Element.Field[System.ValueTuple`3.Item1]", "value", "dfc-generated"]
+      - ["System.Linq", "Enumerable", False, "Zip<TFirst,TSecond,TThird>", "(System.Collections.Generic.IEnumerable<TFirst>,System.Collections.Generic.IEnumerable<TSecond>,System.Collections.Generic.IEnumerable<TThird>)", "", "Argument[1].Element", "ReturnValue.Element.Field[System.ValueTuple`3.Item2]", "value", "dfc-generated"]
+      - ["System.Linq", "Enumerable", False, "Zip<TFirst,TSecond,TThird>", "(System.Collections.Generic.IEnumerable<TFirst>,System.Collections.Generic.IEnumerable<TSecond>,System.Collections.Generic.IEnumerable<TThird>)", "", "Argument[2].Element", "ReturnValue.Element.Field[System.ValueTuple`3.Item3]", "value", "dfc-generated"]
+      - ["System.Linq", "Enumerable", False, "Zip<TFirst,TSecond>", "(System.Collections.Generic.IEnumerable<TFirst>,System.Collections.Generic.IEnumerable<TSecond>)", "", "Argument[0].Element", "ReturnValue.Element.Field[System.ValueTuple`2.Item1]", "value", "dfc-generated"]
+      - ["System.Linq", "Enumerable", False, "Zip<TFirst,TSecond>", "(System.Collections.Generic.IEnumerable<TFirst>,System.Collections.Generic.IEnumerable<TSecond>)", "", "Argument[1].Element", "ReturnValue.Element.Field[System.ValueTuple`2.Item2]", "value", "dfc-generated"]
       - ["System.Linq", "EnumerableExecutor<T>", False, "EnumerableExecutor", "(System.Linq.Expressions.Expression)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Linq", "EnumerableQuery<T>", False, "EnumerableQuery", "(System.Collections.Generic.IEnumerable<T>)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["System.Linq", "EnumerableQuery<T>", False, "EnumerableQuery", "(System.Linq.Expressions.Expression)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["System.Linq", "EnumerableQuery<T>", False, "EnumerableQuery", "(System.Linq.Expressions.Expression)", "", "Argument[0]", "Argument[this].SyntheticField[System.Linq.EnumerableQuery`1._expression]", "value", "dfc-generated"]
       - ["System.Linq", "EnumerableQuery<T>", False, "ToString", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Linq", "EnumerableQuery<T>", False, "get_Expression", "()", "", "Argument[this].SyntheticField[System.Linq.EnumerableQuery`1._expression]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Linq", "Grouping<TKey,TElement>", False, "get_Key", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Linq", "IQueryProvider", True, "CreateQuery<TElement>", "(System.Linq.Expressions.Expression)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Linq", "IQueryable", True, "get_Expression", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Linq", "IQueryable", True, "get_Provider", "()", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["System.Linq", "IQueryable", True, "get_Provider", "()", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Linq", "ImmutableArrayExtensions", False, "Aggregate<T>", "(System.Collections.Immutable.ImmutableArray<T>,System.Func<T,T,T>)", "", "Argument[1].ReturnValue", "Argument[1].Parameter[0]", "value", "dfc-generated"]
+      - ["System.Linq", "ImmutableArrayExtensions", False, "Aggregate<T>", "(System.Collections.Immutable.ImmutableArray<T>,System.Func<T,T,T>)", "", "Argument[1].ReturnValue", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Linq", "ImmutableArrayExtensions", False, "Aggregate<TAccumulate,T>", "(System.Collections.Immutable.ImmutableArray<T>,TAccumulate,System.Func<TAccumulate,T,TAccumulate>)", "", "Argument[1]", "Argument[2].Parameter[0]", "value", "dfc-generated"]
+      - ["System.Linq", "ImmutableArrayExtensions", False, "Aggregate<TAccumulate,T>", "(System.Collections.Immutable.ImmutableArray<T>,TAccumulate,System.Func<TAccumulate,T,TAccumulate>)", "", "Argument[1]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Linq", "ImmutableArrayExtensions", False, "Aggregate<TAccumulate,T>", "(System.Collections.Immutable.ImmutableArray<T>,TAccumulate,System.Func<TAccumulate,T,TAccumulate>)", "", "Argument[2].ReturnValue", "Argument[2].Parameter[0]", "value", "dfc-generated"]
+      - ["System.Linq", "ImmutableArrayExtensions", False, "Aggregate<TAccumulate,T>", "(System.Collections.Immutable.ImmutableArray<T>,TAccumulate,System.Func<TAccumulate,T,TAccumulate>)", "", "Argument[2].ReturnValue", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Linq", "ImmutableArrayExtensions", False, "Aggregate<TAccumulate,TResult,T>", "(System.Collections.Immutable.ImmutableArray<T>,TAccumulate,System.Func<TAccumulate,T,TAccumulate>,System.Func<TAccumulate,TResult>)", "", "Argument[1]", "Argument[2].Parameter[0]", "value", "dfc-generated"]
+      - ["System.Linq", "ImmutableArrayExtensions", False, "Aggregate<TAccumulate,TResult,T>", "(System.Collections.Immutable.ImmutableArray<T>,TAccumulate,System.Func<TAccumulate,T,TAccumulate>,System.Func<TAccumulate,TResult>)", "", "Argument[1]", "Argument[3].Parameter[0]", "value", "dfc-generated"]
+      - ["System.Linq", "ImmutableArrayExtensions", False, "Aggregate<TAccumulate,TResult,T>", "(System.Collections.Immutable.ImmutableArray<T>,TAccumulate,System.Func<TAccumulate,T,TAccumulate>,System.Func<TAccumulate,TResult>)", "", "Argument[2].ReturnValue", "Argument[3].Parameter[0]", "value", "dfc-generated"]
+      - ["System.Linq", "ImmutableArrayExtensions", False, "Aggregate<TAccumulate,TResult,T>", "(System.Collections.Immutable.ImmutableArray<T>,TAccumulate,System.Func<TAccumulate,T,TAccumulate>,System.Func<TAccumulate,TResult>)", "", "Argument[3].ReturnValue", "ReturnValue", "value", "dfc-generated"]
       - ["System.Linq", "ImmutableArrayExtensions", False, "ElementAt<T>", "(System.Collections.Immutable.ImmutableArray<T>,System.Int32)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
       - ["System.Linq", "ImmutableArrayExtensions", False, "ElementAtOrDefault<T>", "(System.Collections.Immutable.ImmutableArray<T>,System.Int32)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
       - ["System.Linq", "ImmutableArrayExtensions", False, "First<T>", "(System.Collections.Immutable.ImmutableArray<T>)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
       - ["System.Linq", "ImmutableArrayExtensions", False, "FirstOrDefault<T>", "(System.Collections.Immutable.ImmutableArray<T>)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
       - ["System.Linq", "ImmutableArrayExtensions", False, "Last<T>", "(System.Collections.Immutable.ImmutableArray<T>)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
+      - ["System.Linq", "ImmutableArrayExtensions", False, "SelectMany<TSource,TCollection,TResult>", "(System.Collections.Immutable.ImmutableArray<TSource>,System.Func<TSource,System.Collections.Generic.IEnumerable<TCollection>>,System.Func<TSource,TCollection,TResult>)", "", "Argument[1].ReturnValue.Element", "Argument[2].Parameter[1]", "value", "dfc-generated"]
+      - ["System.Linq", "ImmutableArrayExtensions", False, "SelectMany<TSource,TCollection,TResult>", "(System.Collections.Immutable.ImmutableArray<TSource>,System.Func<TSource,System.Collections.Generic.IEnumerable<TCollection>>,System.Func<TSource,TCollection,TResult>)", "", "Argument[2].ReturnValue", "ReturnValue.Element", "value", "dfc-generated"]
+      - ["System.Linq", "ImmutableArrayExtensions", False, "SequenceEqual<TDerived,TBase>", "(System.Collections.Immutable.ImmutableArray<TBase>,System.Collections.Generic.IEnumerable<TDerived>,System.Collections.Generic.IEqualityComparer<TBase>)", "", "Argument[0].Element", "Argument[2]", "taint", "df-generated"]
+      - ["System.Linq", "ImmutableArrayExtensions", False, "SequenceEqual<TDerived,TBase>", "(System.Collections.Immutable.ImmutableArray<TBase>,System.Collections.Generic.IEnumerable<TDerived>,System.Collections.Generic.IEqualityComparer<TBase>)", "", "Argument[1].Element", "Argument[2]", "taint", "df-generated"]
+      - ["System.Linq", "ImmutableArrayExtensions", False, "SequenceEqual<TDerived,TBase>", "(System.Collections.Immutable.ImmutableArray<TBase>,System.Collections.Immutable.ImmutableArray<TDerived>,System.Collections.Generic.IEqualityComparer<TBase>)", "", "Argument[0].Element", "Argument[2]", "taint", "df-generated"]
+      - ["System.Linq", "ImmutableArrayExtensions", False, "SequenceEqual<TDerived,TBase>", "(System.Collections.Immutable.ImmutableArray<TBase>,System.Collections.Immutable.ImmutableArray<TDerived>,System.Collections.Generic.IEqualityComparer<TBase>)", "", "Argument[1].Element", "Argument[2]", "taint", "df-generated"]
       - ["System.Linq", "ImmutableArrayExtensions", False, "Single<T>", "(System.Collections.Immutable.ImmutableArray<T>)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
       - ["System.Linq", "ImmutableArrayExtensions", False, "ToArray<T>", "(System.Collections.Immutable.ImmutableArray<T>)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
+      - ["System.Linq", "ImmutableArrayExtensions", False, "ToDictionary<TKey,T>", "(System.Collections.Immutable.ImmutableArray<T>,System.Func<T,TKey>)", "", "Argument[0].Element", "Argument[1].Parameter[0]", "value", "dfc-generated"]
+      - ["System.Linq", "ImmutableArrayExtensions", False, "ToDictionary<TKey,T>", "(System.Collections.Immutable.ImmutableArray<T>,System.Func<T,TKey>)", "", "Argument[0].Element", "ReturnValue.Element.Property[System.Collections.Generic.KeyValuePair`2.Value]", "value", "dfc-generated"]
+      - ["System.Linq", "ImmutableArrayExtensions", False, "ToDictionary<TKey,T>", "(System.Collections.Immutable.ImmutableArray<T>,System.Func<T,TKey>)", "", "Argument[1].ReturnValue", "ReturnValue.Element.Property[System.Collections.Generic.KeyValuePair`2.Key]", "value", "dfc-generated"]
+      - ["System.Linq", "ImmutableArrayExtensions", False, "ToDictionary<TKey,T>", "(System.Collections.Immutable.ImmutableArray<T>,System.Func<T,TKey>,System.Collections.Generic.IEqualityComparer<TKey>)", "", "Argument[0].Element", "Argument[1].Parameter[0]", "value", "dfc-generated"]
+      - ["System.Linq", "ImmutableArrayExtensions", False, "ToDictionary<TKey,T>", "(System.Collections.Immutable.ImmutableArray<T>,System.Func<T,TKey>,System.Collections.Generic.IEqualityComparer<TKey>)", "", "Argument[0].Element", "ReturnValue.Element.Property[System.Collections.Generic.KeyValuePair`2.Value]", "value", "dfc-generated"]
+      - ["System.Linq", "ImmutableArrayExtensions", False, "ToDictionary<TKey,T>", "(System.Collections.Immutable.ImmutableArray<T>,System.Func<T,TKey>,System.Collections.Generic.IEqualityComparer<TKey>)", "", "Argument[1].ReturnValue", "ReturnValue.Element.Property[System.Collections.Generic.KeyValuePair`2.Key]", "value", "dfc-generated"]
+      - ["System.Linq", "ImmutableArrayExtensions", False, "ToDictionary<TKey,TElement,T>", "(System.Collections.Immutable.ImmutableArray<T>,System.Func<T,TKey>,System.Func<T,TElement>)", "", "Argument[1].ReturnValue", "ReturnValue.Element.Property[System.Collections.Generic.KeyValuePair`2.Key]", "value", "dfc-generated"]
+      - ["System.Linq", "ImmutableArrayExtensions", False, "ToDictionary<TKey,TElement,T>", "(System.Collections.Immutable.ImmutableArray<T>,System.Func<T,TKey>,System.Func<T,TElement>)", "", "Argument[2].ReturnValue", "ReturnValue.Element.Property[System.Collections.Generic.KeyValuePair`2.Value]", "value", "dfc-generated"]
+      - ["System.Linq", "ImmutableArrayExtensions", False, "ToDictionary<TKey,TElement,T>", "(System.Collections.Immutable.ImmutableArray<T>,System.Func<T,TKey>,System.Func<T,TElement>,System.Collections.Generic.IEqualityComparer<TKey>)", "", "Argument[1].ReturnValue", "ReturnValue.Element.Property[System.Collections.Generic.KeyValuePair`2.Key]", "value", "dfc-generated"]
+      - ["System.Linq", "ImmutableArrayExtensions", False, "ToDictionary<TKey,TElement,T>", "(System.Collections.Immutable.ImmutableArray<T>,System.Func<T,TKey>,System.Func<T,TElement>,System.Collections.Generic.IEqualityComparer<TKey>)", "", "Argument[2].ReturnValue", "ReturnValue.Element.Property[System.Collections.Generic.KeyValuePair`2.Value]", "value", "dfc-generated"]
+      - ["System.Linq", "Lookup<TKey,TElement>", False, "ApplyResultSelector<TResult>", "(System.Func<TKey,System.Collections.Generic.IEnumerable<TElement>,TResult>)", "", "Argument[0].ReturnValue", "ReturnValue.Element", "value", "dfc-generated"]
       - ["System.Linq", "Lookup<TKey,TElement>", False, "get_Item", "(TKey)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Linq", "ParallelEnumerable", False, "Aggregate<TSource,TAccumulate,TResult>", "(System.Linq.ParallelQuery<TSource>,System.Func<TAccumulate>,System.Func<TAccumulate,TSource,TAccumulate>,System.Func<TAccumulate,TAccumulate,TAccumulate>,System.Func<TAccumulate,TResult>)", "", "Argument[1].ReturnValue", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Linq", "ParallelEnumerable", False, "Aggregate<TSource,TAccumulate,TResult>", "(System.Linq.ParallelQuery<TSource>,System.Func<TAccumulate>,System.Func<TAccumulate,TSource,TAccumulate>,System.Func<TAccumulate,TAccumulate,TAccumulate>,System.Func<TAccumulate,TResult>)", "", "Argument[3].ReturnValue", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Linq", "ParallelEnumerable", False, "Aggregate<TSource,TAccumulate,TResult>", "(System.Linq.ParallelQuery<TSource>,System.Func<TAccumulate>,System.Func<TAccumulate,TSource,TAccumulate>,System.Func<TAccumulate,TAccumulate,TAccumulate>,System.Func<TAccumulate,TResult>)", "", "Argument[4].ReturnValue", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Linq", "ParallelEnumerable", False, "Aggregate<TSource,TAccumulate,TResult>", "(System.Linq.ParallelQuery<TSource>,TAccumulate,System.Func<TAccumulate,TSource,TAccumulate>,System.Func<TAccumulate,TAccumulate,TAccumulate>,System.Func<TAccumulate,TResult>)", "", "Argument[1]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Linq", "ParallelEnumerable", False, "Aggregate<TSource,TAccumulate,TResult>", "(System.Linq.ParallelQuery<TSource>,TAccumulate,System.Func<TAccumulate,TSource,TAccumulate>,System.Func<TAccumulate,TAccumulate,TAccumulate>,System.Func<TAccumulate,TResult>)", "", "Argument[3].ReturnValue", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Linq", "ParallelEnumerable", False, "Aggregate<TSource,TAccumulate,TResult>", "(System.Linq.ParallelQuery<TSource>,TAccumulate,System.Func<TAccumulate,TSource,TAccumulate>,System.Func<TAccumulate,TAccumulate,TAccumulate>,System.Func<TAccumulate,TResult>)", "", "Argument[4].ReturnValue", "ReturnValue", "value", "dfc-generated"]
       - ["System.Linq", "ParallelEnumerable", False, "AsOrdered", "(System.Linq.ParallelQuery)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
       - ["System.Linq", "ParallelEnumerable", False, "AsOrdered<TSource>", "(System.Linq.ParallelQuery<TSource>)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
       - ["System.Linq", "ParallelEnumerable", False, "AsParallel", "(System.Collections.IEnumerable)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
       - ["System.Linq", "ParallelEnumerable", False, "AsParallel<TSource>", "(System.Collections.Concurrent.Partitioner<TSource>)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["System.Linq", "ParallelEnumerable", False, "AsParallel<TSource>", "(System.Collections.Generic.IEnumerable<TSource>)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["System.Linq", "ParallelEnumerable", False, "AsSequential<TSource>", "(System.Linq.ParallelQuery<TSource>)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
+      - ["System.Linq", "ParallelEnumerable", False, "AsSequential<TSource>", "(System.Linq.ParallelQuery<TSource>)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Linq", "ParallelEnumerable", False, "AsUnordered<TSource>", "(System.Linq.ParallelQuery<TSource>)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
       - ["System.Linq", "ParallelEnumerable", False, "Repeat<TResult>", "(TResult,System.Int32)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Linq", "ParallelEnumerable", False, "SequenceEqual<TSource>", "(System.Linq.ParallelQuery<TSource>,System.Linq.ParallelQuery<TSource>,System.Collections.Generic.IEqualityComparer<TSource>)", "", "Argument[0].Element", "Argument[2]", "taint", "df-generated"]
+      - ["System.Linq", "ParallelEnumerable", False, "SequenceEqual<TSource>", "(System.Linq.ParallelQuery<TSource>,System.Linq.ParallelQuery<TSource>,System.Collections.Generic.IEqualityComparer<TSource>)", "", "Argument[1].Element", "Argument[2]", "taint", "df-generated"]
       - ["System.Linq", "ParallelEnumerable", False, "WithCancellation<TSource>", "(System.Linq.ParallelQuery<TSource>,System.Threading.CancellationToken)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
       - ["System.Linq", "ParallelEnumerable", False, "WithDegreeOfParallelism<TSource>", "(System.Linq.ParallelQuery<TSource>,System.Int32)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
       - ["System.Linq", "ParallelEnumerable", False, "WithExecutionMode<TSource>", "(System.Linq.ParallelQuery<TSource>,System.Linq.ParallelExecutionMode)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
       - ["System.Linq", "ParallelEnumerable", False, "WithMergeOptions<TSource>", "(System.Linq.ParallelQuery<TSource>,System.Linq.ParallelMergeOptions)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["System.Linq", "Queryable", False, "Append<TSource>", "(System.Linq.IQueryable<TSource>,TSource)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["System.Linq", "Queryable", False, "Chunk<TSource>", "(System.Linq.IQueryable<TSource>,System.Int32)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["System.Linq", "Queryable", False, "CountBy<TSource,TKey>", "(System.Linq.IQueryable<TSource>,System.Linq.Expressions.Expression<System.Func<TSource,TKey>>,System.Collections.Generic.IEqualityComparer<TKey>)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["System.Linq", "Queryable", False, "DistinctBy<TSource,TKey>", "(System.Linq.IQueryable<TSource>,System.Linq.Expressions.Expression<System.Func<TSource,TKey>>)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["System.Linq", "Queryable", False, "DistinctBy<TSource,TKey>", "(System.Linq.IQueryable<TSource>,System.Linq.Expressions.Expression<System.Func<TSource,TKey>>,System.Collections.Generic.IEqualityComparer<TKey>)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["System.Linq", "Queryable", False, "ExceptBy<TSource,TKey>", "(System.Linq.IQueryable<TSource>,System.Collections.Generic.IEnumerable<TKey>,System.Linq.Expressions.Expression<System.Func<TSource,TKey>>)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["System.Linq", "Queryable", False, "ExceptBy<TSource,TKey>", "(System.Linq.IQueryable<TSource>,System.Collections.Generic.IEnumerable<TKey>,System.Linq.Expressions.Expression<System.Func<TSource,TKey>>)", "", "Argument[1].Element", "ReturnValue", "taint", "df-generated"]
-      - ["System.Linq", "Queryable", False, "IntersectBy<TSource,TKey>", "(System.Linq.IQueryable<TSource>,System.Collections.Generic.IEnumerable<TKey>,System.Linq.Expressions.Expression<System.Func<TSource,TKey>>)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["System.Linq", "Queryable", False, "IntersectBy<TSource,TKey>", "(System.Linq.IQueryable<TSource>,System.Collections.Generic.IEnumerable<TKey>,System.Linq.Expressions.Expression<System.Func<TSource,TKey>>)", "", "Argument[1].Element", "ReturnValue", "taint", "df-generated"]
-      - ["System.Linq", "Queryable", False, "Order<T>", "(System.Linq.IQueryable<T>,System.Collections.Generic.IComparer<T>)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["System.Linq", "Queryable", False, "OrderDescending<T>", "(System.Linq.IQueryable<T>,System.Collections.Generic.IComparer<T>)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["System.Linq", "Queryable", False, "Prepend<TSource>", "(System.Linq.IQueryable<TSource>,TSource)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["System.Linq", "Queryable", False, "SkipLast<TSource>", "(System.Linq.IQueryable<TSource>,System.Int32)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["System.Linq", "Queryable", False, "Take<TSource>", "(System.Linq.IQueryable<TSource>,System.Range)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["System.Linq", "Queryable", False, "TakeLast<TSource>", "(System.Linq.IQueryable<TSource>,System.Int32)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["System.Linq", "Queryable", False, "UnionBy<TSource,TKey>", "(System.Linq.IQueryable<TSource>,System.Collections.Generic.IEnumerable<TSource>,System.Linq.Expressions.Expression<System.Func<TSource,TKey>>)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["System.Linq", "Queryable", False, "UnionBy<TSource,TKey>", "(System.Linq.IQueryable<TSource>,System.Collections.Generic.IEnumerable<TSource>,System.Linq.Expressions.Expression<System.Func<TSource,TKey>>)", "", "Argument[1].Element", "ReturnValue", "taint", "df-generated"]
-      - ["System.Linq", "Queryable", False, "Zip<TFirst,TSecond,TThird>", "(System.Linq.IQueryable<TFirst>,System.Collections.Generic.IEnumerable<TSecond>,System.Collections.Generic.IEnumerable<TThird>)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["System.Linq", "Queryable", False, "Zip<TFirst,TSecond,TThird>", "(System.Linq.IQueryable<TFirst>,System.Collections.Generic.IEnumerable<TSecond>,System.Collections.Generic.IEnumerable<TThird>)", "", "Argument[1].Element", "ReturnValue", "taint", "df-generated"]
-      - ["System.Linq", "Queryable", False, "Zip<TFirst,TSecond,TThird>", "(System.Linq.IQueryable<TFirst>,System.Collections.Generic.IEnumerable<TSecond>,System.Collections.Generic.IEnumerable<TThird>)", "", "Argument[2].Element", "ReturnValue", "taint", "df-generated"]
-      - ["System.Linq", "Queryable", False, "Zip<TFirst,TSecond>", "(System.Linq.IQueryable<TFirst>,System.Collections.Generic.IEnumerable<TSecond>)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["System.Linq", "Queryable", False, "Zip<TFirst,TSecond>", "(System.Linq.IQueryable<TFirst>,System.Collections.Generic.IEnumerable<TSecond>)", "", "Argument[1].Element", "ReturnValue", "taint", "df-generated"]
   - addsTo:
       pack: codeql/csharp-all
       extensible: neutralModel
@@ -118,7 +170,6 @@ extensions:
       - ["System.Linq", "Enumerable", "Average", "(System.Collections.Generic.IEnumerable<System.Nullable<System.Single>>)", "summary", "df-generated"]
       - ["System.Linq", "Enumerable", "Average", "(System.Collections.Generic.IEnumerable<System.Single>)", "summary", "df-generated"]
       - ["System.Linq", "Enumerable", "Contains<TSource>", "(System.Collections.Generic.IEnumerable<TSource>,TSource)", "summary", "df-generated"]
-      - ["System.Linq", "Enumerable", "Contains<TSource>", "(System.Collections.Generic.IEnumerable<TSource>,TSource,System.Collections.Generic.IEqualityComparer<TSource>)", "summary", "df-generated"]
       - ["System.Linq", "Enumerable", "Count<TSource>", "(System.Collections.Generic.IEnumerable<TSource>)", "summary", "df-generated"]
       - ["System.Linq", "Enumerable", "Empty<TResult>", "()", "summary", "df-generated"]
       - ["System.Linq", "Enumerable", "LongCount<TSource>", "(System.Collections.Generic.IEnumerable<TSource>)", "summary", "df-generated"]
@@ -128,15 +179,18 @@ extensions:
       - ["System.Linq", "Enumerable", "Max", "(System.Collections.Generic.IEnumerable<System.Int64>)", "summary", "df-generated"]
       - ["System.Linq", "Enumerable", "Max", "(System.Collections.Generic.IEnumerable<System.Nullable<System.Decimal>>)", "summary", "df-generated"]
       - ["System.Linq", "Enumerable", "Max", "(System.Collections.Generic.IEnumerable<System.Single>)", "summary", "df-generated"]
+      - ["System.Linq", "Enumerable", "MaxBy<TSource,TKey>", "(System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,TKey>)", "summary", "df-generated"]
+      - ["System.Linq", "Enumerable", "MaxBy<TSource,TKey>", "(System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,TKey>,System.Collections.Generic.IComparer<TKey>)", "summary", "df-generated"]
       - ["System.Linq", "Enumerable", "Min", "(System.Collections.Generic.IEnumerable<System.Decimal>)", "summary", "df-generated"]
       - ["System.Linq", "Enumerable", "Min", "(System.Collections.Generic.IEnumerable<System.Double>)", "summary", "df-generated"]
       - ["System.Linq", "Enumerable", "Min", "(System.Collections.Generic.IEnumerable<System.Int32>)", "summary", "df-generated"]
       - ["System.Linq", "Enumerable", "Min", "(System.Collections.Generic.IEnumerable<System.Int64>)", "summary", "df-generated"]
       - ["System.Linq", "Enumerable", "Min", "(System.Collections.Generic.IEnumerable<System.Nullable<System.Decimal>>)", "summary", "df-generated"]
       - ["System.Linq", "Enumerable", "Min", "(System.Collections.Generic.IEnumerable<System.Single>)", "summary", "df-generated"]
+      - ["System.Linq", "Enumerable", "MinBy<TSource,TKey>", "(System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,TKey>)", "summary", "df-generated"]
+      - ["System.Linq", "Enumerable", "MinBy<TSource,TKey>", "(System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,TKey>,System.Collections.Generic.IComparer<TKey>)", "summary", "df-generated"]
       - ["System.Linq", "Enumerable", "Range", "(System.Int32,System.Int32)", "summary", "df-generated"]
       - ["System.Linq", "Enumerable", "SequenceEqual<TSource>", "(System.Collections.Generic.IEnumerable<TSource>,System.Collections.Generic.IEnumerable<TSource>)", "summary", "df-generated"]
-      - ["System.Linq", "Enumerable", "SequenceEqual<TSource>", "(System.Collections.Generic.IEnumerable<TSource>,System.Collections.Generic.IEnumerable<TSource>,System.Collections.Generic.IEqualityComparer<TSource>)", "summary", "df-generated"]
       - ["System.Linq", "Enumerable", "Sum", "(System.Collections.Generic.IEnumerable<System.Decimal>)", "summary", "df-generated"]
       - ["System.Linq", "Enumerable", "Sum", "(System.Collections.Generic.IEnumerable<System.Double>)", "summary", "df-generated"]
       - ["System.Linq", "Enumerable", "Sum", "(System.Collections.Generic.IEnumerable<System.Int32>)", "summary", "df-generated"]
@@ -147,8 +201,11 @@ extensions:
       - ["System.Linq", "Enumerable", "Sum", "(System.Collections.Generic.IEnumerable<System.Nullable<System.Int64>>)", "summary", "df-generated"]
       - ["System.Linq", "Enumerable", "Sum", "(System.Collections.Generic.IEnumerable<System.Nullable<System.Single>>)", "summary", "df-generated"]
       - ["System.Linq", "Enumerable", "Sum", "(System.Collections.Generic.IEnumerable<System.Single>)", "summary", "df-generated"]
+      - ["System.Linq", "Enumerable", "ToHashSet<TSource>", "(System.Collections.Generic.IEnumerable<TSource>)", "summary", "df-generated"]
+      - ["System.Linq", "Enumerable", "ToHashSet<TSource>", "(System.Collections.Generic.IEnumerable<TSource>,System.Collections.Generic.IEqualityComparer<TSource>)", "summary", "df-generated"]
       - ["System.Linq", "Enumerable", "TryGetNonEnumeratedCount<TSource>", "(System.Collections.Generic.IEnumerable<TSource>,System.Int32)", "summary", "df-generated"]
       - ["System.Linq", "EnumerableQuery<T>", "CreateQuery", "(System.Linq.Expressions.Expression)", "summary", "df-generated"]
+      - ["System.Linq", "EnumerableQuery<T>", "CreateQuery<TElement>", "(System.Linq.Expressions.Expression)", "summary", "df-generated"]
       - ["System.Linq", "EnumerableQuery<T>", "Execute", "(System.Linq.Expressions.Expression)", "summary", "df-generated"]
       - ["System.Linq", "EnumerableQuery<T>", "Execute<TElement>", "(System.Linq.Expressions.Expression)", "summary", "df-generated"]
       - ["System.Linq", "EnumerableQuery<T>", "get_ElementType", "()", "summary", "df-generated"]
@@ -162,16 +219,28 @@ extensions:
       - ["System.Linq", "ILookup<TKey,TElement>", "Contains", "(TKey)", "summary", "df-generated"]
       - ["System.Linq", "ILookup<TKey,TElement>", "get_Count", "()", "summary", "df-generated"]
       - ["System.Linq", "ILookup<TKey,TElement>", "get_Item", "(TKey)", "summary", "df-generated"]
+      - ["System.Linq", "IOrderedEnumerable<TElement>", "CreateOrderedEnumerable<TKey>", "(System.Func<TElement,TKey>,System.Collections.Generic.IComparer<TKey>,System.Boolean)", "summary", "df-generated"]
       - ["System.Linq", "IQueryProvider", "CreateQuery", "(System.Linq.Expressions.Expression)", "summary", "df-generated"]
+      - ["System.Linq", "IQueryProvider", "CreateQuery<TElement>", "(System.Linq.Expressions.Expression)", "summary", "df-generated"]
       - ["System.Linq", "IQueryProvider", "Execute", "(System.Linq.Expressions.Expression)", "summary", "df-generated"]
       - ["System.Linq", "IQueryProvider", "Execute<TResult>", "(System.Linq.Expressions.Expression)", "summary", "df-generated"]
       - ["System.Linq", "IQueryable", "get_ElementType", "()", "summary", "df-generated"]
+      - ["System.Linq", "IQueryable", "get_Expression", "()", "summary", "df-generated"]
+      - ["System.Linq", "ImmutableArrayExtensions", "All<T>", "(System.Collections.Immutable.ImmutableArray<T>,System.Func<T,System.Boolean>)", "summary", "df-generated"]
       - ["System.Linq", "ImmutableArrayExtensions", "Any<T>", "(System.Collections.Immutable.ImmutableArray<T>)", "summary", "df-generated"]
       - ["System.Linq", "ImmutableArrayExtensions", "Any<T>", "(System.Collections.Immutable.ImmutableArray<T>+Builder)", "summary", "df-generated"]
+      - ["System.Linq", "ImmutableArrayExtensions", "Any<T>", "(System.Collections.Immutable.ImmutableArray<T>,System.Func<T,System.Boolean>)", "summary", "df-generated"]
+      - ["System.Linq", "ImmutableArrayExtensions", "First<T>", "(System.Collections.Immutable.ImmutableArray<T>,System.Func<T,System.Boolean>)", "summary", "df-generated"]
+      - ["System.Linq", "ImmutableArrayExtensions", "FirstOrDefault<T>", "(System.Collections.Immutable.ImmutableArray<T>,System.Func<T,System.Boolean>)", "summary", "df-generated"]
+      - ["System.Linq", "ImmutableArrayExtensions", "Last<T>", "(System.Collections.Immutable.ImmutableArray<T>,System.Func<T,System.Boolean>)", "summary", "df-generated"]
       - ["System.Linq", "ImmutableArrayExtensions", "LastOrDefault<T>", "(System.Collections.Immutable.ImmutableArray<T>)", "summary", "df-generated"]
-      - ["System.Linq", "ImmutableArrayExtensions", "SequenceEqual<TDerived,TBase>", "(System.Collections.Immutable.ImmutableArray<TBase>,System.Collections.Generic.IEnumerable<TDerived>,System.Collections.Generic.IEqualityComparer<TBase>)", "summary", "df-generated"]
-      - ["System.Linq", "ImmutableArrayExtensions", "SequenceEqual<TDerived,TBase>", "(System.Collections.Immutable.ImmutableArray<TBase>,System.Collections.Immutable.ImmutableArray<TDerived>,System.Collections.Generic.IEqualityComparer<TBase>)", "summary", "df-generated"]
+      - ["System.Linq", "ImmutableArrayExtensions", "LastOrDefault<T>", "(System.Collections.Immutable.ImmutableArray<T>,System.Func<T,System.Boolean>)", "summary", "df-generated"]
+      - ["System.Linq", "ImmutableArrayExtensions", "Select<T,TResult>", "(System.Collections.Immutable.ImmutableArray<T>,System.Func<T,TResult>)", "summary", "df-generated"]
+      - ["System.Linq", "ImmutableArrayExtensions", "SequenceEqual<TDerived,TBase>", "(System.Collections.Immutable.ImmutableArray<TBase>,System.Collections.Immutable.ImmutableArray<TDerived>,System.Func<TBase,TBase,System.Boolean>)", "summary", "df-generated"]
+      - ["System.Linq", "ImmutableArrayExtensions", "Single<T>", "(System.Collections.Immutable.ImmutableArray<T>,System.Func<T,System.Boolean>)", "summary", "df-generated"]
       - ["System.Linq", "ImmutableArrayExtensions", "SingleOrDefault<T>", "(System.Collections.Immutable.ImmutableArray<T>)", "summary", "df-generated"]
+      - ["System.Linq", "ImmutableArrayExtensions", "SingleOrDefault<T>", "(System.Collections.Immutable.ImmutableArray<T>,System.Func<T,System.Boolean>)", "summary", "df-generated"]
+      - ["System.Linq", "ImmutableArrayExtensions", "Where<T>", "(System.Collections.Immutable.ImmutableArray<T>,System.Func<T,System.Boolean>)", "summary", "df-generated"]
       - ["System.Linq", "Lookup<TKey,TElement>", "Contains", "(TKey)", "summary", "df-generated"]
       - ["System.Linq", "Lookup<TKey,TElement>", "get_Count", "()", "summary", "df-generated"]
       - ["System.Linq", "ParallelEnumerable", "Any<TSource>", "(System.Linq.ParallelQuery<TSource>)", "summary", "df-generated"]
@@ -189,6 +258,7 @@ extensions:
       - ["System.Linq", "ParallelEnumerable", "Contains<TSource>", "(System.Linq.ParallelQuery<TSource>,TSource,System.Collections.Generic.IEqualityComparer<TSource>)", "summary", "df-generated"]
       - ["System.Linq", "ParallelEnumerable", "Count<TSource>", "(System.Linq.ParallelQuery<TSource>)", "summary", "df-generated"]
       - ["System.Linq", "ParallelEnumerable", "Empty<TResult>", "()", "summary", "df-generated"]
+      - ["System.Linq", "ParallelEnumerable", "ForAll<TSource>", "(System.Linq.ParallelQuery<TSource>,System.Action<TSource>)", "summary", "df-generated"]
       - ["System.Linq", "ParallelEnumerable", "LongCount<TSource>", "(System.Linq.ParallelQuery<TSource>)", "summary", "df-generated"]
       - ["System.Linq", "ParallelEnumerable", "Max", "(System.Linq.ParallelQuery<System.Decimal>)", "summary", "df-generated"]
       - ["System.Linq", "ParallelEnumerable", "Max", "(System.Linq.ParallelQuery<System.Double>)", "summary", "df-generated"]
@@ -216,7 +286,6 @@ extensions:
       - ["System.Linq", "ParallelEnumerable", "SequenceEqual<TSource>", "(System.Linq.ParallelQuery<TSource>,System.Collections.Generic.IEnumerable<TSource>)", "summary", "df-generated"]
       - ["System.Linq", "ParallelEnumerable", "SequenceEqual<TSource>", "(System.Linq.ParallelQuery<TSource>,System.Collections.Generic.IEnumerable<TSource>,System.Collections.Generic.IEqualityComparer<TSource>)", "summary", "df-generated"]
       - ["System.Linq", "ParallelEnumerable", "SequenceEqual<TSource>", "(System.Linq.ParallelQuery<TSource>,System.Linq.ParallelQuery<TSource>)", "summary", "df-generated"]
-      - ["System.Linq", "ParallelEnumerable", "SequenceEqual<TSource>", "(System.Linq.ParallelQuery<TSource>,System.Linq.ParallelQuery<TSource>,System.Collections.Generic.IEqualityComparer<TSource>)", "summary", "df-generated"]
       - ["System.Linq", "ParallelEnumerable", "Sum", "(System.Linq.ParallelQuery<System.Decimal>)", "summary", "df-generated"]
       - ["System.Linq", "ParallelEnumerable", "Sum", "(System.Linq.ParallelQuery<System.Double>)", "summary", "df-generated"]
       - ["System.Linq", "ParallelEnumerable", "Sum", "(System.Linq.ParallelQuery<System.Int32>)", "summary", "df-generated"]
@@ -230,6 +299,7 @@ extensions:
       - ["System.Linq", "Queryable", "AggregateBy<TSource,TKey,TAccumulate>", "(System.Linq.IQueryable<TSource>,System.Linq.Expressions.Expression<System.Func<TSource,TKey>>,System.Linq.Expressions.Expression<System.Func<TKey,TAccumulate>>,System.Linq.Expressions.Expression<System.Func<TAccumulate,TSource,TAccumulate>>,System.Collections.Generic.IEqualityComparer<TKey>)", "summary", "df-generated"]
       - ["System.Linq", "Queryable", "AggregateBy<TSource,TKey,TAccumulate>", "(System.Linq.IQueryable<TSource>,System.Linq.Expressions.Expression<System.Func<TSource,TKey>>,TAccumulate,System.Linq.Expressions.Expression<System.Func<TAccumulate,TSource,TAccumulate>>,System.Collections.Generic.IEqualityComparer<TKey>)", "summary", "df-generated"]
       - ["System.Linq", "Queryable", "Any<TSource>", "(System.Linq.IQueryable<TSource>)", "summary", "df-generated"]
+      - ["System.Linq", "Queryable", "Append<TSource>", "(System.Linq.IQueryable<TSource>,TSource)", "summary", "df-generated"]
       - ["System.Linq", "Queryable", "Average", "(System.Linq.IQueryable<System.Decimal>)", "summary", "df-generated"]
       - ["System.Linq", "Queryable", "Average", "(System.Linq.IQueryable<System.Double>)", "summary", "df-generated"]
       - ["System.Linq", "Queryable", "Average", "(System.Linq.IQueryable<System.Int32>)", "summary", "df-generated"]
@@ -240,15 +310,21 @@ extensions:
       - ["System.Linq", "Queryable", "Average", "(System.Linq.IQueryable<System.Nullable<System.Int64>>)", "summary", "df-generated"]
       - ["System.Linq", "Queryable", "Average", "(System.Linq.IQueryable<System.Nullable<System.Single>>)", "summary", "df-generated"]
       - ["System.Linq", "Queryable", "Average", "(System.Linq.IQueryable<System.Single>)", "summary", "df-generated"]
+      - ["System.Linq", "Queryable", "Chunk<TSource>", "(System.Linq.IQueryable<TSource>,System.Int32)", "summary", "df-generated"]
       - ["System.Linq", "Queryable", "Contains<TSource>", "(System.Linq.IQueryable<TSource>,TSource)", "summary", "df-generated"]
       - ["System.Linq", "Queryable", "Contains<TSource>", "(System.Linq.IQueryable<TSource>,TSource,System.Collections.Generic.IEqualityComparer<TSource>)", "summary", "df-generated"]
       - ["System.Linq", "Queryable", "Count<TSource>", "(System.Linq.IQueryable<TSource>)", "summary", "df-generated"]
+      - ["System.Linq", "Queryable", "CountBy<TSource,TKey>", "(System.Linq.IQueryable<TSource>,System.Linq.Expressions.Expression<System.Func<TSource,TKey>>,System.Collections.Generic.IEqualityComparer<TKey>)", "summary", "df-generated"]
+      - ["System.Linq", "Queryable", "DistinctBy<TSource,TKey>", "(System.Linq.IQueryable<TSource>,System.Linq.Expressions.Expression<System.Func<TSource,TKey>>)", "summary", "df-generated"]
+      - ["System.Linq", "Queryable", "DistinctBy<TSource,TKey>", "(System.Linq.IQueryable<TSource>,System.Linq.Expressions.Expression<System.Func<TSource,TKey>>,System.Collections.Generic.IEqualityComparer<TKey>)", "summary", "df-generated"]
       - ["System.Linq", "Queryable", "ElementAt<TSource>", "(System.Linq.IQueryable<TSource>,System.Index)", "summary", "df-generated"]
       - ["System.Linq", "Queryable", "ElementAtOrDefault<TSource>", "(System.Linq.IQueryable<TSource>,System.Index)", "summary", "df-generated"]
+      - ["System.Linq", "Queryable", "ExceptBy<TSource,TKey>", "(System.Linq.IQueryable<TSource>,System.Collections.Generic.IEnumerable<TKey>,System.Linq.Expressions.Expression<System.Func<TSource,TKey>>)", "summary", "df-generated"]
       - ["System.Linq", "Queryable", "ExceptBy<TSource,TKey>", "(System.Linq.IQueryable<TSource>,System.Collections.Generic.IEnumerable<TKey>,System.Linq.Expressions.Expression<System.Func<TSource,TKey>>,System.Collections.Generic.IEqualityComparer<TKey>)", "summary", "df-generated"]
       - ["System.Linq", "Queryable", "FirstOrDefault<TSource>", "(System.Linq.IQueryable<TSource>,System.Linq.Expressions.Expression<System.Func<TSource,System.Boolean>>,TSource)", "summary", "df-generated"]
       - ["System.Linq", "Queryable", "FirstOrDefault<TSource>", "(System.Linq.IQueryable<TSource>,TSource)", "summary", "df-generated"]
       - ["System.Linq", "Queryable", "Index<TSource>", "(System.Linq.IQueryable<TSource>)", "summary", "df-generated"]
+      - ["System.Linq", "Queryable", "IntersectBy<TSource,TKey>", "(System.Linq.IQueryable<TSource>,System.Collections.Generic.IEnumerable<TKey>,System.Linq.Expressions.Expression<System.Func<TSource,TKey>>)", "summary", "df-generated"]
       - ["System.Linq", "Queryable", "IntersectBy<TSource,TKey>", "(System.Linq.IQueryable<TSource>,System.Collections.Generic.IEnumerable<TKey>,System.Linq.Expressions.Expression<System.Func<TSource,TKey>>,System.Collections.Generic.IEqualityComparer<TKey>)", "summary", "df-generated"]
       - ["System.Linq", "Queryable", "LastOrDefault<TSource>", "(System.Linq.IQueryable<TSource>,System.Linq.Expressions.Expression<System.Func<TSource,System.Boolean>>,TSource)", "summary", "df-generated"]
       - ["System.Linq", "Queryable", "LastOrDefault<TSource>", "(System.Linq.IQueryable<TSource>,TSource)", "summary", "df-generated"]
@@ -262,11 +338,15 @@ extensions:
       - ["System.Linq", "Queryable", "MinBy<TSource,TKey>", "(System.Linq.IQueryable<TSource>,System.Linq.Expressions.Expression<System.Func<TSource,TKey>>)", "summary", "df-generated"]
       - ["System.Linq", "Queryable", "MinBy<TSource,TKey>", "(System.Linq.IQueryable<TSource>,System.Linq.Expressions.Expression<System.Func<TSource,TKey>>,System.Collections.Generic.IComparer<TSource>)", "summary", "df-generated"]
       - ["System.Linq", "Queryable", "Order<T>", "(System.Linq.IQueryable<T>)", "summary", "df-generated"]
+      - ["System.Linq", "Queryable", "Order<T>", "(System.Linq.IQueryable<T>,System.Collections.Generic.IComparer<T>)", "summary", "df-generated"]
       - ["System.Linq", "Queryable", "OrderDescending<T>", "(System.Linq.IQueryable<T>)", "summary", "df-generated"]
+      - ["System.Linq", "Queryable", "OrderDescending<T>", "(System.Linq.IQueryable<T>,System.Collections.Generic.IComparer<T>)", "summary", "df-generated"]
+      - ["System.Linq", "Queryable", "Prepend<TSource>", "(System.Linq.IQueryable<TSource>,TSource)", "summary", "df-generated"]
       - ["System.Linq", "Queryable", "SequenceEqual<TSource>", "(System.Linq.IQueryable<TSource>,System.Collections.Generic.IEnumerable<TSource>)", "summary", "df-generated"]
       - ["System.Linq", "Queryable", "SequenceEqual<TSource>", "(System.Linq.IQueryable<TSource>,System.Collections.Generic.IEnumerable<TSource>,System.Collections.Generic.IEqualityComparer<TSource>)", "summary", "df-generated"]
       - ["System.Linq", "Queryable", "SingleOrDefault<TSource>", "(System.Linq.IQueryable<TSource>,System.Linq.Expressions.Expression<System.Func<TSource,System.Boolean>>,TSource)", "summary", "df-generated"]
       - ["System.Linq", "Queryable", "SingleOrDefault<TSource>", "(System.Linq.IQueryable<TSource>,TSource)", "summary", "df-generated"]
+      - ["System.Linq", "Queryable", "SkipLast<TSource>", "(System.Linq.IQueryable<TSource>,System.Int32)", "summary", "df-generated"]
       - ["System.Linq", "Queryable", "Sum", "(System.Linq.IQueryable<System.Decimal>)", "summary", "df-generated"]
       - ["System.Linq", "Queryable", "Sum", "(System.Linq.IQueryable<System.Double>)", "summary", "df-generated"]
       - ["System.Linq", "Queryable", "Sum", "(System.Linq.IQueryable<System.Int32>)", "summary", "df-generated"]
@@ -277,4 +357,9 @@ extensions:
       - ["System.Linq", "Queryable", "Sum", "(System.Linq.IQueryable<System.Nullable<System.Int64>>)", "summary", "df-generated"]
       - ["System.Linq", "Queryable", "Sum", "(System.Linq.IQueryable<System.Nullable<System.Single>>)", "summary", "df-generated"]
       - ["System.Linq", "Queryable", "Sum", "(System.Linq.IQueryable<System.Single>)", "summary", "df-generated"]
+      - ["System.Linq", "Queryable", "Take<TSource>", "(System.Linq.IQueryable<TSource>,System.Range)", "summary", "df-generated"]
+      - ["System.Linq", "Queryable", "TakeLast<TSource>", "(System.Linq.IQueryable<TSource>,System.Int32)", "summary", "df-generated"]
+      - ["System.Linq", "Queryable", "UnionBy<TSource,TKey>", "(System.Linq.IQueryable<TSource>,System.Collections.Generic.IEnumerable<TSource>,System.Linq.Expressions.Expression<System.Func<TSource,TKey>>)", "summary", "df-generated"]
       - ["System.Linq", "Queryable", "UnionBy<TSource,TKey>", "(System.Linq.IQueryable<TSource>,System.Collections.Generic.IEnumerable<TSource>,System.Linq.Expressions.Expression<System.Func<TSource,TKey>>,System.Collections.Generic.IEqualityComparer<TKey>)", "summary", "df-generated"]
+      - ["System.Linq", "Queryable", "Zip<TFirst,TSecond,TThird>", "(System.Linq.IQueryable<TFirst>,System.Collections.Generic.IEnumerable<TSecond>,System.Collections.Generic.IEnumerable<TThird>)", "summary", "df-generated"]
+      - ["System.Linq", "Queryable", "Zip<TFirst,TSecond>", "(System.Linq.IQueryable<TFirst>,System.Collections.Generic.IEnumerable<TSecond>)", "summary", "df-generated"]
diff --git a/csharp/ql/lib/ext/generated/System.Management.model.yml b/csharp/ql/lib/ext/generated/System.Management.model.yml
index 03b84032375..d348a495880 100644
--- a/csharp/ql/lib/ext/generated/System.Management.model.yml
+++ b/csharp/ql/lib/ext/generated/System.Management.model.yml
@@ -84,6 +84,10 @@ extensions:
       - ["System.Management", "ManagementEventWatcher", "Start", "()", "summary", "df-generated"]
       - ["System.Management", "ManagementEventWatcher", "Stop", "()", "summary", "df-generated"]
       - ["System.Management", "ManagementEventWatcher", "WaitForNextEvent", "()", "summary", "df-generated"]
+      - ["System.Management", "ManagementEventWatcher", "add_EventArrived", "(System.Management.EventArrivedEventHandler)", "summary", "df-generated"]
+      - ["System.Management", "ManagementEventWatcher", "add_Stopped", "(System.Management.StoppedEventHandler)", "summary", "df-generated"]
+      - ["System.Management", "ManagementEventWatcher", "remove_EventArrived", "(System.Management.EventArrivedEventHandler)", "summary", "df-generated"]
+      - ["System.Management", "ManagementEventWatcher", "remove_Stopped", "(System.Management.StoppedEventHandler)", "summary", "df-generated"]
       - ["System.Management", "ManagementException", "ManagementException", "(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)", "summary", "df-generated"]
       - ["System.Management", "ManagementException", "ManagementException", "(System.String)", "summary", "df-generated"]
       - ["System.Management", "ManagementException", "ManagementException", "(System.String,System.Exception)", "summary", "df-generated"]
@@ -158,6 +162,14 @@ extensions:
       - ["System.Management", "ManagementObjectSearcher", "ManagementObjectSearcher", "(System.String,System.String)", "summary", "df-generated"]
       - ["System.Management", "ManagementObjectSearcher", "ManagementObjectSearcher", "(System.String,System.String,System.Management.EnumerationOptions)", "summary", "df-generated"]
       - ["System.Management", "ManagementOperationObserver", "Cancel", "()", "summary", "df-generated"]
+      - ["System.Management", "ManagementOperationObserver", "add_Completed", "(System.Management.CompletedEventHandler)", "summary", "df-generated"]
+      - ["System.Management", "ManagementOperationObserver", "add_ObjectPut", "(System.Management.ObjectPutEventHandler)", "summary", "df-generated"]
+      - ["System.Management", "ManagementOperationObserver", "add_ObjectReady", "(System.Management.ObjectReadyEventHandler)", "summary", "df-generated"]
+      - ["System.Management", "ManagementOperationObserver", "add_Progress", "(System.Management.ProgressEventHandler)", "summary", "df-generated"]
+      - ["System.Management", "ManagementOperationObserver", "remove_Completed", "(System.Management.CompletedEventHandler)", "summary", "df-generated"]
+      - ["System.Management", "ManagementOperationObserver", "remove_ObjectPut", "(System.Management.ObjectPutEventHandler)", "summary", "df-generated"]
+      - ["System.Management", "ManagementOperationObserver", "remove_ObjectReady", "(System.Management.ObjectReadyEventHandler)", "summary", "df-generated"]
+      - ["System.Management", "ManagementOperationObserver", "remove_Progress", "(System.Management.ProgressEventHandler)", "summary", "df-generated"]
       - ["System.Management", "ManagementPath", "Clone", "()", "summary", "df-generated"]
       - ["System.Management", "ManagementPath", "ManagementPath", "(System.String)", "summary", "df-generated"]
       - ["System.Management", "ManagementPath", "SetAsClass", "()", "summary", "df-generated"]
diff --git a/csharp/ql/lib/ext/generated/System.Media.model.yml b/csharp/ql/lib/ext/generated/System.Media.model.yml
index 38b3aa41d13..ae6b14488c7 100644
--- a/csharp/ql/lib/ext/generated/System.Media.model.yml
+++ b/csharp/ql/lib/ext/generated/System.Media.model.yml
@@ -16,7 +16,13 @@ extensions:
       - ["System.Media", "SoundPlayer", "SoundPlayer", "(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)", "summary", "df-generated"]
       - ["System.Media", "SoundPlayer", "SoundPlayer", "(System.String)", "summary", "df-generated"]
       - ["System.Media", "SoundPlayer", "Stop", "()", "summary", "df-generated"]
+      - ["System.Media", "SoundPlayer", "add_LoadCompleted", "(System.ComponentModel.AsyncCompletedEventHandler)", "summary", "df-generated"]
+      - ["System.Media", "SoundPlayer", "add_SoundLocationChanged", "(System.EventHandler)", "summary", "df-generated"]
+      - ["System.Media", "SoundPlayer", "add_StreamChanged", "(System.EventHandler)", "summary", "df-generated"]
       - ["System.Media", "SoundPlayer", "get_IsLoadCompleted", "()", "summary", "df-generated"]
+      - ["System.Media", "SoundPlayer", "remove_LoadCompleted", "(System.ComponentModel.AsyncCompletedEventHandler)", "summary", "df-generated"]
+      - ["System.Media", "SoundPlayer", "remove_SoundLocationChanged", "(System.EventHandler)", "summary", "df-generated"]
+      - ["System.Media", "SoundPlayer", "remove_StreamChanged", "(System.EventHandler)", "summary", "df-generated"]
       - ["System.Media", "SystemSound", "Play", "()", "summary", "df-generated"]
       - ["System.Media", "SystemSounds", "get_Asterisk", "()", "summary", "df-generated"]
       - ["System.Media", "SystemSounds", "get_Beep", "()", "summary", "df-generated"]
diff --git a/csharp/ql/lib/ext/generated/System.Net.Cache.model.yml b/csharp/ql/lib/ext/generated/System.Net.Cache.model.yml
index c1393d026e1..23c663a7fc5 100644
--- a/csharp/ql/lib/ext/generated/System.Net.Cache.model.yml
+++ b/csharp/ql/lib/ext/generated/System.Net.Cache.model.yml
@@ -4,12 +4,15 @@ extensions:
       pack: codeql/csharp-all
       extensible: summaryModel
     data:
-      - ["System.Net.Cache", "HttpRequestCachePolicy", False, "HttpRequestCachePolicy", "(System.Net.Cache.HttpCacheAgeControl,System.TimeSpan)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Net.Cache", "HttpRequestCachePolicy", False, "HttpRequestCachePolicy", "(System.Net.Cache.HttpCacheAgeControl,System.TimeSpan,System.TimeSpan)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Net.Cache", "HttpRequestCachePolicy", False, "HttpRequestCachePolicy", "(System.Net.Cache.HttpCacheAgeControl,System.TimeSpan,System.TimeSpan)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Net.Cache", "HttpRequestCachePolicy", False, "get_MaxAge", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Net.Cache", "HttpRequestCachePolicy", False, "get_MaxStale", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Net.Cache", "HttpRequestCachePolicy", False, "get_MinFresh", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Net.Cache", "HttpRequestCachePolicy", False, "HttpRequestCachePolicy", "(System.Net.Cache.HttpCacheAgeControl,System.TimeSpan)", "", "Argument[1]", "Argument[this].SyntheticField[System.Net.Cache.HttpRequestCachePolicy._maxAge]", "value", "dfc-generated"]
+      - ["System.Net.Cache", "HttpRequestCachePolicy", False, "HttpRequestCachePolicy", "(System.Net.Cache.HttpCacheAgeControl,System.TimeSpan)", "", "Argument[1]", "Argument[this].SyntheticField[System.Net.Cache.HttpRequestCachePolicy._maxStale]", "value", "dfc-generated"]
+      - ["System.Net.Cache", "HttpRequestCachePolicy", False, "HttpRequestCachePolicy", "(System.Net.Cache.HttpCacheAgeControl,System.TimeSpan)", "", "Argument[1]", "Argument[this].SyntheticField[System.Net.Cache.HttpRequestCachePolicy._minFresh]", "value", "dfc-generated"]
+      - ["System.Net.Cache", "HttpRequestCachePolicy", False, "HttpRequestCachePolicy", "(System.Net.Cache.HttpCacheAgeControl,System.TimeSpan,System.TimeSpan)", "", "Argument[1]", "Argument[this].SyntheticField[System.Net.Cache.HttpRequestCachePolicy._maxAge]", "value", "dfc-generated"]
+      - ["System.Net.Cache", "HttpRequestCachePolicy", False, "HttpRequestCachePolicy", "(System.Net.Cache.HttpCacheAgeControl,System.TimeSpan,System.TimeSpan)", "", "Argument[2]", "Argument[this].SyntheticField[System.Net.Cache.HttpRequestCachePolicy._maxStale]", "value", "dfc-generated"]
+      - ["System.Net.Cache", "HttpRequestCachePolicy", False, "HttpRequestCachePolicy", "(System.Net.Cache.HttpCacheAgeControl,System.TimeSpan,System.TimeSpan)", "", "Argument[2]", "Argument[this].SyntheticField[System.Net.Cache.HttpRequestCachePolicy._minFresh]", "value", "dfc-generated"]
+      - ["System.Net.Cache", "HttpRequestCachePolicy", False, "get_MaxAge", "()", "", "Argument[this].SyntheticField[System.Net.Cache.HttpRequestCachePolicy._maxAge]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Net.Cache", "HttpRequestCachePolicy", False, "get_MaxStale", "()", "", "Argument[this].SyntheticField[System.Net.Cache.HttpRequestCachePolicy._maxStale]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Net.Cache", "HttpRequestCachePolicy", False, "get_MinFresh", "()", "", "Argument[this].SyntheticField[System.Net.Cache.HttpRequestCachePolicy._minFresh]", "ReturnValue", "value", "dfc-generated"]
   - addsTo:
       pack: codeql/csharp-all
       extensible: neutralModel
diff --git a/csharp/ql/lib/ext/generated/System.Net.Http.Headers.model.yml b/csharp/ql/lib/ext/generated/System.Net.Http.Headers.model.yml
index 90f7cf505fe..47dac35a7d2 100644
--- a/csharp/ql/lib/ext/generated/System.Net.Http.Headers.model.yml
+++ b/csharp/ql/lib/ext/generated/System.Net.Http.Headers.model.yml
@@ -4,18 +4,23 @@ extensions:
       pack: codeql/csharp-all
       extensible: summaryModel
     data:
-      - ["System.Net.Http.Headers", "AuthenticationHeaderValue", False, "AuthenticationHeaderValue", "(System.String,System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Net.Http.Headers", "AuthenticationHeaderValue", False, "AuthenticationHeaderValue", "(System.String,System.String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Net.Http.Headers", "AuthenticationHeaderValue", False, "ToString", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Net.Http.Headers", "AuthenticationHeaderValue", False, "get_Parameter", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Net.Http.Headers", "AuthenticationHeaderValue", False, "get_Scheme", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Net.Http.Headers", "AuthenticationHeaderValue", False, "AuthenticationHeaderValue", "(System.String,System.String)", "", "Argument[0]", "Argument[this].SyntheticField[System.Net.Http.Headers.AuthenticationHeaderValue._scheme]", "value", "dfc-generated"]
+      - ["System.Net.Http.Headers", "AuthenticationHeaderValue", False, "AuthenticationHeaderValue", "(System.String,System.String)", "", "Argument[1]", "Argument[this].SyntheticField[System.Net.Http.Headers.AuthenticationHeaderValue._parameter]", "value", "dfc-generated"]
+      - ["System.Net.Http.Headers", "AuthenticationHeaderValue", False, "Clone", "()", "", "Argument[this].SyntheticField[System.Net.Http.Headers.AuthenticationHeaderValue._parameter]", "ReturnValue.SyntheticField[System.Net.Http.Headers.AuthenticationHeaderValue._parameter]", "value", "dfc-generated"]
+      - ["System.Net.Http.Headers", "AuthenticationHeaderValue", False, "Clone", "()", "", "Argument[this].SyntheticField[System.Net.Http.Headers.AuthenticationHeaderValue._scheme]", "ReturnValue.SyntheticField[System.Net.Http.Headers.AuthenticationHeaderValue._scheme]", "value", "dfc-generated"]
+      - ["System.Net.Http.Headers", "AuthenticationHeaderValue", False, "ToString", "()", "", "Argument[this].SyntheticField[System.Net.Http.Headers.AuthenticationHeaderValue._parameter]", "ReturnValue", "taint", "dfc-generated"]
+      - ["System.Net.Http.Headers", "AuthenticationHeaderValue", False, "ToString", "()", "", "Argument[this].SyntheticField[System.Net.Http.Headers.AuthenticationHeaderValue._scheme]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Net.Http.Headers", "AuthenticationHeaderValue", False, "get_Parameter", "()", "", "Argument[this].SyntheticField[System.Net.Http.Headers.AuthenticationHeaderValue._parameter]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Net.Http.Headers", "AuthenticationHeaderValue", False, "get_Scheme", "()", "", "Argument[this].SyntheticField[System.Net.Http.Headers.AuthenticationHeaderValue._scheme]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Net.Http.Headers", "CacheControlHeaderValue", False, "ToString", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Net.Http.Headers", "ContentDispositionHeaderValue", False, "ContentDispositionHeaderValue", "(System.Net.Http.Headers.ContentDispositionHeaderValue)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Net.Http.Headers", "ContentDispositionHeaderValue", False, "ContentDispositionHeaderValue", "(System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Net.Http.Headers", "ContentDispositionHeaderValue", False, "ToString", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Net.Http.Headers", "EntityTagHeaderValue", False, "EntityTagHeaderValue", "(System.String,System.Boolean)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Net.Http.Headers", "EntityTagHeaderValue", False, "ToString", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Net.Http.Headers", "EntityTagHeaderValue", False, "get_Tag", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Net.Http.Headers", "ContentDispositionHeaderValue", False, "ContentDispositionHeaderValue", "(System.Net.Http.Headers.ContentDispositionHeaderValue)", "", "Argument[0].SyntheticField[System.Net.Http.Headers.ContentDispositionHeaderValue._dispositionType]", "Argument[this].SyntheticField[System.Net.Http.Headers.ContentDispositionHeaderValue._dispositionType]", "value", "dfc-generated"]
+      - ["System.Net.Http.Headers", "ContentDispositionHeaderValue", False, "ContentDispositionHeaderValue", "(System.String)", "", "Argument[0]", "Argument[this].SyntheticField[System.Net.Http.Headers.ContentDispositionHeaderValue._dispositionType]", "value", "dfc-generated"]
+      - ["System.Net.Http.Headers", "ContentDispositionHeaderValue", False, "ToString", "()", "", "Argument[this].SyntheticField[System.Net.Http.Headers.ContentDispositionHeaderValue._dispositionType]", "ReturnValue", "taint", "dfc-generated"]
+      - ["System.Net.Http.Headers", "EntityTagHeaderValue", False, "Clone", "()", "", "Argument[this].SyntheticField[System.Net.Http.Headers.EntityTagHeaderValue._tag]", "ReturnValue.SyntheticField[System.Net.Http.Headers.EntityTagHeaderValue._tag]", "value", "dfc-generated"]
+      - ["System.Net.Http.Headers", "EntityTagHeaderValue", False, "EntityTagHeaderValue", "(System.String,System.Boolean)", "", "Argument[0]", "Argument[this].SyntheticField[System.Net.Http.Headers.EntityTagHeaderValue._tag]", "value", "dfc-generated"]
+      - ["System.Net.Http.Headers", "EntityTagHeaderValue", False, "ToString", "()", "", "Argument[this].SyntheticField[System.Net.Http.Headers.EntityTagHeaderValue._tag]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Net.Http.Headers", "EntityTagHeaderValue", False, "get_Tag", "()", "", "Argument[this].SyntheticField[System.Net.Http.Headers.EntityTagHeaderValue._tag]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Net.Http.Headers", "HeaderStringValues+Enumerator", False, "get_Current", "()", "", "Argument[this].Property[System.Net.Http.Headers.HeaderStringValues+Enumerator.Current]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Net.Http.Headers", "HeaderStringValues+Enumerator", False, "get_Current", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Net.Http.Headers", "HeaderStringValues", False, "GetEnumerator", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Net.Http.Headers", "HeaderStringValues", False, "ToString", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
@@ -25,8 +30,8 @@ extensions:
       - ["System.Net.Http.Headers", "HttpHeadersNonValidated", False, "TryGetValue", "(System.String,System.Net.Http.Headers.HeaderStringValues)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["System.Net.Http.Headers", "HttpHeadersNonValidated", False, "TryGetValues", "(System.String,System.Net.Http.Headers.HeaderStringValues)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["System.Net.Http.Headers", "HttpHeadersNonValidated", False, "get_Item", "(System.String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Net.Http.Headers", "HttpHeadersNonValidated", False, "get_Keys", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Net.Http.Headers", "HttpHeadersNonValidated", False, "get_Values", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Net.Http.Headers", "HttpHeadersNonValidated", False, "get_Keys", "()", "", "Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Key]", "ReturnValue.Element", "value", "dfc-generated"]
+      - ["System.Net.Http.Headers", "HttpHeadersNonValidated", False, "get_Values", "()", "", "Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Value]", "ReturnValue.Element", "value", "dfc-generated"]
       - ["System.Net.Http.Headers", "HttpRequestHeaders", False, "get_Connection", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Net.Http.Headers", "HttpRequestHeaders", False, "get_Pragma", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Net.Http.Headers", "HttpRequestHeaders", False, "get_Trailer", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
@@ -41,63 +46,76 @@ extensions:
       - ["System.Net.Http.Headers", "HttpResponseHeaders", False, "get_Upgrade", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Net.Http.Headers", "HttpResponseHeaders", False, "get_Via", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Net.Http.Headers", "HttpResponseHeaders", False, "get_Warning", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Net.Http.Headers", "MediaTypeHeaderValue", False, "MediaTypeHeaderValue", "(System.Net.Http.Headers.MediaTypeHeaderValue)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Net.Http.Headers", "MediaTypeHeaderValue", False, "MediaTypeHeaderValue", "(System.String,System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Net.Http.Headers", "MediaTypeHeaderValue", False, "ToString", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Net.Http.Headers", "MediaTypeHeaderValue", False, "TryParse", "(System.String,System.Net.Http.Headers.MediaTypeHeaderValue)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Net.Http.Headers", "MediaTypeHeaderValue", False, "MediaTypeHeaderValue", "(System.Net.Http.Headers.MediaTypeHeaderValue)", "", "Argument[0].SyntheticField[System.Net.Http.Headers.MediaTypeHeaderValue._mediaType]", "Argument[this].SyntheticField[System.Net.Http.Headers.MediaTypeHeaderValue._mediaType]", "value", "dfc-generated"]
+      - ["System.Net.Http.Headers", "MediaTypeHeaderValue", False, "MediaTypeHeaderValue", "(System.String,System.String)", "", "Argument[0]", "Argument[this].SyntheticField[System.Net.Http.Headers.MediaTypeHeaderValue._mediaType]", "value", "dfc-generated"]
+      - ["System.Net.Http.Headers", "MediaTypeHeaderValue", False, "ToString", "()", "", "Argument[this].SyntheticField[System.Net.Http.Headers.MediaTypeHeaderValue._mediaType]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Net.Http.Headers", "MediaTypeHeaderValue", False, "TryParse", "(System.String,System.Net.Http.Headers.MediaTypeHeaderValue)", "", "Argument[0]", "ReturnValue.SyntheticField[System.Net.Http.Headers.MediaTypeHeaderValue._mediaType]", "taint", "dfc-generated"]
       - ["System.Net.Http.Headers", "MediaTypeWithQualityHeaderValue", False, "TryParse", "(System.String,System.Net.Http.Headers.MediaTypeWithQualityHeaderValue)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Net.Http.Headers", "NameValueHeaderValue", False, "NameValueHeaderValue", "(System.Net.Http.Headers.NameValueHeaderValue)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Net.Http.Headers", "NameValueHeaderValue", False, "NameValueHeaderValue", "(System.String,System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Net.Http.Headers", "NameValueHeaderValue", False, "NameValueHeaderValue", "(System.String,System.String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Net.Http.Headers", "NameValueHeaderValue", False, "ToString", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Net.Http.Headers", "NameValueHeaderValue", False, "get_Name", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Net.Http.Headers", "ProductHeaderValue", False, "ProductHeaderValue", "(System.String,System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Net.Http.Headers", "ProductHeaderValue", False, "ProductHeaderValue", "(System.String,System.String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Net.Http.Headers", "ProductHeaderValue", False, "ToString", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Net.Http.Headers", "ProductHeaderValue", False, "get_Name", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Net.Http.Headers", "ProductHeaderValue", False, "get_Version", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Net.Http.Headers", "ProductInfoHeaderValue", False, "Parse", "(System.String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Net.Http.Headers", "ProductInfoHeaderValue", False, "ProductInfoHeaderValue", "(System.Net.Http.Headers.ProductHeaderValue)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Net.Http.Headers", "ProductInfoHeaderValue", False, "ProductInfoHeaderValue", "(System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Net.Http.Headers", "ProductInfoHeaderValue", False, "ToString", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Net.Http.Headers", "ProductInfoHeaderValue", False, "TryParse", "(System.String,System.Net.Http.Headers.ProductInfoHeaderValue)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Net.Http.Headers", "ProductInfoHeaderValue", False, "get_Comment", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Net.Http.Headers", "ProductInfoHeaderValue", False, "get_Product", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Net.Http.Headers", "RangeConditionHeaderValue", False, "RangeConditionHeaderValue", "(System.DateTimeOffset)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Net.Http.Headers", "RangeConditionHeaderValue", False, "RangeConditionHeaderValue", "(System.Net.Http.Headers.EntityTagHeaderValue)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["System.Net.Http.Headers", "NameValueHeaderValue", False, "NameValueHeaderValue", "(System.Net.Http.Headers.NameValueHeaderValue)", "", "Argument[0].SyntheticField[System.Net.Http.Headers.NameValueHeaderValue._name]", "Argument[this].SyntheticField[System.Net.Http.Headers.NameValueHeaderValue._name]", "value", "dfc-generated"]
+      - ["System.Net.Http.Headers", "NameValueHeaderValue", False, "NameValueHeaderValue", "(System.Net.Http.Headers.NameValueHeaderValue)", "", "Argument[0].SyntheticField[System.Net.Http.Headers.NameValueHeaderValue._value]", "Argument[this].SyntheticField[System.Net.Http.Headers.NameValueHeaderValue._value]", "value", "dfc-generated"]
+      - ["System.Net.Http.Headers", "NameValueHeaderValue", False, "NameValueHeaderValue", "(System.String,System.String)", "", "Argument[0]", "Argument[this].SyntheticField[System.Net.Http.Headers.NameValueHeaderValue._name]", "value", "dfc-generated"]
+      - ["System.Net.Http.Headers", "NameValueHeaderValue", False, "NameValueHeaderValue", "(System.String,System.String)", "", "Argument[1]", "Argument[this].SyntheticField[System.Net.Http.Headers.NameValueHeaderValue._value]", "value", "dfc-generated"]
+      - ["System.Net.Http.Headers", "NameValueHeaderValue", False, "ToString", "()", "", "Argument[this].SyntheticField[System.Net.Http.Headers.NameValueHeaderValue._name]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Net.Http.Headers", "NameValueHeaderValue", False, "ToString", "()", "", "Argument[this].SyntheticField[System.Net.Http.Headers.NameValueHeaderValue._value]", "ReturnValue", "taint", "dfc-generated"]
+      - ["System.Net.Http.Headers", "NameValueHeaderValue", False, "get_Name", "()", "", "Argument[this].SyntheticField[System.Net.Http.Headers.NameValueHeaderValue._name]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Net.Http.Headers", "ProductHeaderValue", False, "Clone", "()", "", "Argument[this].SyntheticField[System.Net.Http.Headers.ProductHeaderValue._name]", "ReturnValue.SyntheticField[System.Net.Http.Headers.ProductHeaderValue._name]", "value", "dfc-generated"]
+      - ["System.Net.Http.Headers", "ProductHeaderValue", False, "Clone", "()", "", "Argument[this].SyntheticField[System.Net.Http.Headers.ProductHeaderValue._version]", "ReturnValue.SyntheticField[System.Net.Http.Headers.ProductHeaderValue._version]", "value", "dfc-generated"]
+      - ["System.Net.Http.Headers", "ProductHeaderValue", False, "ProductHeaderValue", "(System.String,System.String)", "", "Argument[0]", "Argument[this].SyntheticField[System.Net.Http.Headers.ProductHeaderValue._name]", "value", "dfc-generated"]
+      - ["System.Net.Http.Headers", "ProductHeaderValue", False, "ProductHeaderValue", "(System.String,System.String)", "", "Argument[1]", "Argument[this].SyntheticField[System.Net.Http.Headers.ProductHeaderValue._version]", "value", "dfc-generated"]
+      - ["System.Net.Http.Headers", "ProductHeaderValue", False, "ToString", "()", "", "Argument[this].SyntheticField[System.Net.Http.Headers.ProductHeaderValue._name]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Net.Http.Headers", "ProductHeaderValue", False, "ToString", "()", "", "Argument[this].SyntheticField[System.Net.Http.Headers.ProductHeaderValue._version]", "ReturnValue", "taint", "dfc-generated"]
+      - ["System.Net.Http.Headers", "ProductHeaderValue", False, "get_Name", "()", "", "Argument[this].SyntheticField[System.Net.Http.Headers.ProductHeaderValue._name]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Net.Http.Headers", "ProductHeaderValue", False, "get_Version", "()", "", "Argument[this].SyntheticField[System.Net.Http.Headers.ProductHeaderValue._version]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Net.Http.Headers", "ProductInfoHeaderValue", False, "Clone", "()", "", "Argument[this].SyntheticField[System.Net.Http.Headers.ProductInfoHeaderValue._comment]", "ReturnValue.SyntheticField[System.Net.Http.Headers.ProductInfoHeaderValue._comment]", "value", "dfc-generated"]
+      - ["System.Net.Http.Headers", "ProductInfoHeaderValue", False, "Clone", "()", "", "Argument[this].SyntheticField[System.Net.Http.Headers.ProductInfoHeaderValue._product]", "ReturnValue.SyntheticField[System.Net.Http.Headers.ProductInfoHeaderValue._product]", "value", "dfc-generated"]
+      - ["System.Net.Http.Headers", "ProductInfoHeaderValue", False, "ProductInfoHeaderValue", "(System.Net.Http.Headers.ProductHeaderValue)", "", "Argument[0]", "Argument[this].SyntheticField[System.Net.Http.Headers.ProductInfoHeaderValue._product]", "value", "dfc-generated"]
+      - ["System.Net.Http.Headers", "ProductInfoHeaderValue", False, "ProductInfoHeaderValue", "(System.String)", "", "Argument[0]", "Argument[this].SyntheticField[System.Net.Http.Headers.ProductInfoHeaderValue._comment]", "value", "dfc-generated"]
+      - ["System.Net.Http.Headers", "ProductInfoHeaderValue", False, "ToString", "()", "", "Argument[this].SyntheticField[System.Net.Http.Headers.ProductInfoHeaderValue._comment]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Net.Http.Headers", "ProductInfoHeaderValue", False, "get_Comment", "()", "", "Argument[this].SyntheticField[System.Net.Http.Headers.ProductInfoHeaderValue._comment]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Net.Http.Headers", "ProductInfoHeaderValue", False, "get_Product", "()", "", "Argument[this].SyntheticField[System.Net.Http.Headers.ProductInfoHeaderValue._product]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Net.Http.Headers", "RangeConditionHeaderValue", False, "Clone", "()", "", "Argument[this].SyntheticField[System.Net.Http.Headers.RangeConditionHeaderValue._date]", "ReturnValue.SyntheticField[System.Net.Http.Headers.RangeConditionHeaderValue._date]", "value", "dfc-generated"]
+      - ["System.Net.Http.Headers", "RangeConditionHeaderValue", False, "Clone", "()", "", "Argument[this].SyntheticField[System.Net.Http.Headers.RangeConditionHeaderValue._entityTag]", "ReturnValue.SyntheticField[System.Net.Http.Headers.RangeConditionHeaderValue._entityTag]", "value", "dfc-generated"]
+      - ["System.Net.Http.Headers", "RangeConditionHeaderValue", False, "RangeConditionHeaderValue", "(System.DateTimeOffset)", "", "Argument[0]", "Argument[this].SyntheticField[System.Net.Http.Headers.RangeConditionHeaderValue._date]", "value", "dfc-generated"]
+      - ["System.Net.Http.Headers", "RangeConditionHeaderValue", False, "RangeConditionHeaderValue", "(System.Net.Http.Headers.EntityTagHeaderValue)", "", "Argument[0]", "Argument[this].SyntheticField[System.Net.Http.Headers.RangeConditionHeaderValue._entityTag]", "value", "dfc-generated"]
       - ["System.Net.Http.Headers", "RangeConditionHeaderValue", False, "ToString", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Net.Http.Headers", "RangeConditionHeaderValue", False, "get_Date", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Net.Http.Headers", "RangeConditionHeaderValue", False, "get_EntityTag", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Net.Http.Headers", "RetryConditionHeaderValue", False, "RetryConditionHeaderValue", "(System.DateTimeOffset)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Net.Http.Headers", "RetryConditionHeaderValue", False, "RetryConditionHeaderValue", "(System.TimeSpan)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Net.Http.Headers", "RetryConditionHeaderValue", False, "get_Date", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Net.Http.Headers", "RetryConditionHeaderValue", False, "get_Delta", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Net.Http.Headers", "StringWithQualityHeaderValue", False, "StringWithQualityHeaderValue", "(System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Net.Http.Headers", "StringWithQualityHeaderValue", False, "StringWithQualityHeaderValue", "(System.String,System.Double)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Net.Http.Headers", "StringWithQualityHeaderValue", False, "ToString", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Net.Http.Headers", "StringWithQualityHeaderValue", False, "get_Value", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Net.Http.Headers", "TransferCodingHeaderValue", False, "ToString", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Net.Http.Headers", "TransferCodingHeaderValue", False, "TransferCodingHeaderValue", "(System.Net.Http.Headers.TransferCodingHeaderValue)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Net.Http.Headers", "TransferCodingHeaderValue", False, "TransferCodingHeaderValue", "(System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Net.Http.Headers", "TransferCodingHeaderValue", False, "TryParse", "(System.String,System.Net.Http.Headers.TransferCodingHeaderValue)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Net.Http.Headers", "TransferCodingHeaderValue", False, "get_Value", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Net.Http.Headers", "RangeConditionHeaderValue", False, "get_Date", "()", "", "Argument[this].SyntheticField[System.Net.Http.Headers.RangeConditionHeaderValue._date]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Net.Http.Headers", "RangeConditionHeaderValue", False, "get_EntityTag", "()", "", "Argument[this].SyntheticField[System.Net.Http.Headers.RangeConditionHeaderValue._entityTag]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Net.Http.Headers", "RetryConditionHeaderValue", False, "Clone", "()", "", "Argument[this].SyntheticField[System.Net.Http.Headers.RetryConditionHeaderValue._date]", "ReturnValue.SyntheticField[System.Net.Http.Headers.RetryConditionHeaderValue._date]", "value", "dfc-generated"]
+      - ["System.Net.Http.Headers", "RetryConditionHeaderValue", False, "Clone", "()", "", "Argument[this].SyntheticField[System.Net.Http.Headers.RetryConditionHeaderValue._delta]", "ReturnValue.SyntheticField[System.Net.Http.Headers.RetryConditionHeaderValue._delta]", "value", "dfc-generated"]
+      - ["System.Net.Http.Headers", "RetryConditionHeaderValue", False, "RetryConditionHeaderValue", "(System.DateTimeOffset)", "", "Argument[0]", "Argument[this].SyntheticField[System.Net.Http.Headers.RetryConditionHeaderValue._date]", "value", "dfc-generated"]
+      - ["System.Net.Http.Headers", "RetryConditionHeaderValue", False, "RetryConditionHeaderValue", "(System.TimeSpan)", "", "Argument[0]", "Argument[this].SyntheticField[System.Net.Http.Headers.RetryConditionHeaderValue._delta]", "value", "dfc-generated"]
+      - ["System.Net.Http.Headers", "RetryConditionHeaderValue", False, "get_Date", "()", "", "Argument[this].SyntheticField[System.Net.Http.Headers.RetryConditionHeaderValue._date]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Net.Http.Headers", "RetryConditionHeaderValue", False, "get_Delta", "()", "", "Argument[this].SyntheticField[System.Net.Http.Headers.RetryConditionHeaderValue._delta]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Net.Http.Headers", "StringWithQualityHeaderValue", False, "Clone", "()", "", "Argument[this].SyntheticField[System.Net.Http.Headers.StringWithQualityHeaderValue._value]", "ReturnValue.SyntheticField[System.Net.Http.Headers.StringWithQualityHeaderValue._value]", "value", "dfc-generated"]
+      - ["System.Net.Http.Headers", "StringWithQualityHeaderValue", False, "StringWithQualityHeaderValue", "(System.String)", "", "Argument[0]", "Argument[this].SyntheticField[System.Net.Http.Headers.StringWithQualityHeaderValue._value]", "value", "dfc-generated"]
+      - ["System.Net.Http.Headers", "StringWithQualityHeaderValue", False, "StringWithQualityHeaderValue", "(System.String,System.Double)", "", "Argument[0]", "Argument[this].SyntheticField[System.Net.Http.Headers.StringWithQualityHeaderValue._value]", "value", "dfc-generated"]
+      - ["System.Net.Http.Headers", "StringWithQualityHeaderValue", False, "ToString", "()", "", "Argument[this].SyntheticField[System.Net.Http.Headers.StringWithQualityHeaderValue._value]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Net.Http.Headers", "StringWithQualityHeaderValue", False, "get_Value", "()", "", "Argument[this].SyntheticField[System.Net.Http.Headers.StringWithQualityHeaderValue._value]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Net.Http.Headers", "TransferCodingHeaderValue", False, "ToString", "()", "", "Argument[this].SyntheticField[System.Net.Http.Headers.TransferCodingHeaderValue._value]", "ReturnValue", "taint", "dfc-generated"]
+      - ["System.Net.Http.Headers", "TransferCodingHeaderValue", False, "TransferCodingHeaderValue", "(System.Net.Http.Headers.TransferCodingHeaderValue)", "", "Argument[0].SyntheticField[System.Net.Http.Headers.TransferCodingHeaderValue._value]", "Argument[this].SyntheticField[System.Net.Http.Headers.TransferCodingHeaderValue._value]", "value", "dfc-generated"]
+      - ["System.Net.Http.Headers", "TransferCodingHeaderValue", False, "TransferCodingHeaderValue", "(System.String)", "", "Argument[0]", "Argument[this].SyntheticField[System.Net.Http.Headers.TransferCodingHeaderValue._value]", "value", "dfc-generated"]
+      - ["System.Net.Http.Headers", "TransferCodingHeaderValue", False, "TryParse", "(System.String,System.Net.Http.Headers.TransferCodingHeaderValue)", "", "Argument[0]", "ReturnValue.SyntheticField[System.Net.Http.Headers.TransferCodingHeaderValue._value]", "taint", "dfc-generated"]
+      - ["System.Net.Http.Headers", "TransferCodingHeaderValue", False, "get_Value", "()", "", "Argument[this].SyntheticField[System.Net.Http.Headers.TransferCodingHeaderValue._value]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Net.Http.Headers", "TransferCodingWithQualityHeaderValue", False, "TryParse", "(System.String,System.Net.Http.Headers.TransferCodingWithQualityHeaderValue)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Net.Http.Headers", "ViaHeaderValue", False, "ViaHeaderValue", "(System.String,System.String,System.String,System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Net.Http.Headers", "ViaHeaderValue", False, "ViaHeaderValue", "(System.String,System.String,System.String,System.String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Net.Http.Headers", "ViaHeaderValue", False, "ViaHeaderValue", "(System.String,System.String,System.String,System.String)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Net.Http.Headers", "ViaHeaderValue", False, "ViaHeaderValue", "(System.String,System.String,System.String,System.String)", "", "Argument[3]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Net.Http.Headers", "ViaHeaderValue", False, "get_Comment", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Net.Http.Headers", "ViaHeaderValue", False, "get_ProtocolName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Net.Http.Headers", "ViaHeaderValue", False, "get_ProtocolVersion", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Net.Http.Headers", "ViaHeaderValue", False, "get_ReceivedBy", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Net.Http.Headers", "WarningHeaderValue", False, "WarningHeaderValue", "(System.Int32,System.String,System.String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Net.Http.Headers", "WarningHeaderValue", False, "WarningHeaderValue", "(System.Int32,System.String,System.String)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Net.Http.Headers", "WarningHeaderValue", False, "WarningHeaderValue", "(System.Int32,System.String,System.String,System.DateTimeOffset)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Net.Http.Headers", "WarningHeaderValue", False, "WarningHeaderValue", "(System.Int32,System.String,System.String,System.DateTimeOffset)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Net.Http.Headers", "WarningHeaderValue", False, "WarningHeaderValue", "(System.Int32,System.String,System.String,System.DateTimeOffset)", "", "Argument[3]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Net.Http.Headers", "WarningHeaderValue", False, "get_Agent", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Net.Http.Headers", "WarningHeaderValue", False, "get_Date", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Net.Http.Headers", "WarningHeaderValue", False, "get_Text", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Net.Http.Headers", "ViaHeaderValue", False, "ViaHeaderValue", "(System.String,System.String,System.String,System.String)", "", "Argument[0]", "Argument[this].SyntheticField[System.Net.Http.Headers.ViaHeaderValue._protocolVersion]", "value", "dfc-generated"]
+      - ["System.Net.Http.Headers", "ViaHeaderValue", False, "ViaHeaderValue", "(System.String,System.String,System.String,System.String)", "", "Argument[1]", "Argument[this].SyntheticField[System.Net.Http.Headers.ViaHeaderValue._receivedBy]", "value", "dfc-generated"]
+      - ["System.Net.Http.Headers", "ViaHeaderValue", False, "ViaHeaderValue", "(System.String,System.String,System.String,System.String)", "", "Argument[2]", "Argument[this].SyntheticField[System.Net.Http.Headers.ViaHeaderValue._protocolName]", "value", "dfc-generated"]
+      - ["System.Net.Http.Headers", "ViaHeaderValue", False, "ViaHeaderValue", "(System.String,System.String,System.String,System.String)", "", "Argument[3]", "Argument[this].SyntheticField[System.Net.Http.Headers.ViaHeaderValue._comment]", "value", "dfc-generated"]
+      - ["System.Net.Http.Headers", "ViaHeaderValue", False, "get_Comment", "()", "", "Argument[this].SyntheticField[System.Net.Http.Headers.ViaHeaderValue._comment]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Net.Http.Headers", "ViaHeaderValue", False, "get_ProtocolName", "()", "", "Argument[this].SyntheticField[System.Net.Http.Headers.ViaHeaderValue._protocolName]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Net.Http.Headers", "ViaHeaderValue", False, "get_ProtocolVersion", "()", "", "Argument[this].SyntheticField[System.Net.Http.Headers.ViaHeaderValue._protocolVersion]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Net.Http.Headers", "ViaHeaderValue", False, "get_ReceivedBy", "()", "", "Argument[this].SyntheticField[System.Net.Http.Headers.ViaHeaderValue._receivedBy]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Net.Http.Headers", "WarningHeaderValue", False, "Clone", "()", "", "Argument[this].SyntheticField[System.Net.Http.Headers.WarningHeaderValue._agent]", "ReturnValue.SyntheticField[System.Net.Http.Headers.WarningHeaderValue._agent]", "value", "dfc-generated"]
+      - ["System.Net.Http.Headers", "WarningHeaderValue", False, "Clone", "()", "", "Argument[this].SyntheticField[System.Net.Http.Headers.WarningHeaderValue._date]", "ReturnValue.SyntheticField[System.Net.Http.Headers.WarningHeaderValue._date]", "value", "dfc-generated"]
+      - ["System.Net.Http.Headers", "WarningHeaderValue", False, "Clone", "()", "", "Argument[this].SyntheticField[System.Net.Http.Headers.WarningHeaderValue._text]", "ReturnValue.SyntheticField[System.Net.Http.Headers.WarningHeaderValue._text]", "value", "dfc-generated"]
+      - ["System.Net.Http.Headers", "WarningHeaderValue", False, "WarningHeaderValue", "(System.Int32,System.String,System.String)", "", "Argument[1]", "Argument[this].SyntheticField[System.Net.Http.Headers.WarningHeaderValue._agent]", "value", "dfc-generated"]
+      - ["System.Net.Http.Headers", "WarningHeaderValue", False, "WarningHeaderValue", "(System.Int32,System.String,System.String)", "", "Argument[2]", "Argument[this].SyntheticField[System.Net.Http.Headers.WarningHeaderValue._text]", "value", "dfc-generated"]
+      - ["System.Net.Http.Headers", "WarningHeaderValue", False, "WarningHeaderValue", "(System.Int32,System.String,System.String,System.DateTimeOffset)", "", "Argument[1]", "Argument[this].SyntheticField[System.Net.Http.Headers.WarningHeaderValue._agent]", "value", "dfc-generated"]
+      - ["System.Net.Http.Headers", "WarningHeaderValue", False, "WarningHeaderValue", "(System.Int32,System.String,System.String,System.DateTimeOffset)", "", "Argument[2]", "Argument[this].SyntheticField[System.Net.Http.Headers.WarningHeaderValue._text]", "value", "dfc-generated"]
+      - ["System.Net.Http.Headers", "WarningHeaderValue", False, "WarningHeaderValue", "(System.Int32,System.String,System.String,System.DateTimeOffset)", "", "Argument[3]", "Argument[this].SyntheticField[System.Net.Http.Headers.WarningHeaderValue._date]", "value", "dfc-generated"]
+      - ["System.Net.Http.Headers", "WarningHeaderValue", False, "get_Agent", "()", "", "Argument[this].SyntheticField[System.Net.Http.Headers.WarningHeaderValue._agent]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Net.Http.Headers", "WarningHeaderValue", False, "get_Date", "()", "", "Argument[this].SyntheticField[System.Net.Http.Headers.WarningHeaderValue._date]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Net.Http.Headers", "WarningHeaderValue", False, "get_Text", "()", "", "Argument[this].SyntheticField[System.Net.Http.Headers.WarningHeaderValue._text]", "ReturnValue", "value", "dfc-generated"]
   - addsTo:
       pack: codeql/csharp-all
       extensible: neutralModel
@@ -210,7 +228,9 @@ extensions:
       - ["System.Net.Http.Headers", "ProductHeaderValue", "TryParse", "(System.String,System.Net.Http.Headers.ProductHeaderValue)", "summary", "df-generated"]
       - ["System.Net.Http.Headers", "ProductInfoHeaderValue", "Equals", "(System.Object)", "summary", "df-generated"]
       - ["System.Net.Http.Headers", "ProductInfoHeaderValue", "GetHashCode", "()", "summary", "df-generated"]
+      - ["System.Net.Http.Headers", "ProductInfoHeaderValue", "Parse", "(System.String)", "summary", "df-generated"]
       - ["System.Net.Http.Headers", "ProductInfoHeaderValue", "ProductInfoHeaderValue", "(System.String,System.String)", "summary", "df-generated"]
+      - ["System.Net.Http.Headers", "ProductInfoHeaderValue", "TryParse", "(System.String,System.Net.Http.Headers.ProductInfoHeaderValue)", "summary", "df-generated"]
       - ["System.Net.Http.Headers", "RangeConditionHeaderValue", "Equals", "(System.Object)", "summary", "df-generated"]
       - ["System.Net.Http.Headers", "RangeConditionHeaderValue", "GetHashCode", "()", "summary", "df-generated"]
       - ["System.Net.Http.Headers", "RangeConditionHeaderValue", "Parse", "(System.String)", "summary", "df-generated"]
diff --git a/csharp/ql/lib/ext/generated/System.Net.Http.Json.model.yml b/csharp/ql/lib/ext/generated/System.Net.Http.Json.model.yml
index 966aa42f5bb..de5e42e91f6 100644
--- a/csharp/ql/lib/ext/generated/System.Net.Http.Json.model.yml
+++ b/csharp/ql/lib/ext/generated/System.Net.Http.Json.model.yml
@@ -5,8 +5,6 @@ extensions:
       extensible: summaryModel
     data:
       - ["System.Net.Http.Json", "JsonContent", False, "Create", "(System.Object,System.Text.Json.Serialization.Metadata.JsonTypeInfo,System.Net.Http.Headers.MediaTypeHeaderValue)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Net.Http.Json", "JsonContent", False, "Create", "(System.Object,System.Type,System.Net.Http.Headers.MediaTypeHeaderValue,System.Text.Json.JsonSerializerOptions)", "", "Argument[3]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Net.Http.Json", "JsonContent", False, "Create<T>", "(T,System.Net.Http.Headers.MediaTypeHeaderValue,System.Text.Json.JsonSerializerOptions)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
       - ["System.Net.Http.Json", "JsonContent", False, "Create<T>", "(T,System.Text.Json.Serialization.Metadata.JsonTypeInfo<T>,System.Net.Http.Headers.MediaTypeHeaderValue)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
   - addsTo:
       pack: codeql/csharp-all
@@ -69,6 +67,8 @@ extensions:
       - ["System.Net.Http.Json", "HttpContentJsonExtensions", "ReadFromJsonAsync<T>", "(System.Net.Http.HttpContent,System.Text.Json.JsonSerializerOptions,System.Threading.CancellationToken)", "summary", "df-generated"]
       - ["System.Net.Http.Json", "HttpContentJsonExtensions", "ReadFromJsonAsync<T>", "(System.Net.Http.HttpContent,System.Text.Json.Serialization.Metadata.JsonTypeInfo<T>,System.Threading.CancellationToken)", "summary", "df-generated"]
       - ["System.Net.Http.Json", "HttpContentJsonExtensions", "ReadFromJsonAsync<T>", "(System.Net.Http.HttpContent,System.Threading.CancellationToken)", "summary", "df-generated"]
+      - ["System.Net.Http.Json", "JsonContent", "Create", "(System.Object,System.Type,System.Net.Http.Headers.MediaTypeHeaderValue,System.Text.Json.JsonSerializerOptions)", "summary", "df-generated"]
+      - ["System.Net.Http.Json", "JsonContent", "Create<T>", "(T,System.Net.Http.Headers.MediaTypeHeaderValue,System.Text.Json.JsonSerializerOptions)", "summary", "df-generated"]
       - ["System.Net.Http.Json", "JsonContent", "TryComputeLength", "(System.Int64)", "summary", "df-generated"]
       - ["System.Net.Http.Json", "JsonContent", "get_ObjectType", "()", "summary", "df-generated"]
       - ["System.Net.Http.Json", "JsonContent", "get_Value", "()", "summary", "df-generated"]
diff --git a/csharp/ql/lib/ext/generated/System.Net.Http.Metrics.model.yml b/csharp/ql/lib/ext/generated/System.Net.Http.Metrics.model.yml
index aecf84dfdd7..4e42f24a13b 100644
--- a/csharp/ql/lib/ext/generated/System.Net.Http.Metrics.model.yml
+++ b/csharp/ql/lib/ext/generated/System.Net.Http.Metrics.model.yml
@@ -11,4 +11,5 @@ extensions:
       pack: codeql/csharp-all
       extensible: neutralModel
     data:
+      - ["System.Net.Http.Metrics", "HttpMetricsEnrichmentContext", "AddCallback", "(System.Net.Http.HttpRequestMessage,System.Action<System.Net.Http.Metrics.HttpMetricsEnrichmentContext>)", "summary", "df-generated"]
       - ["System.Net.Http.Metrics", "HttpMetricsEnrichmentContext", "AddCustomTag", "(System.String,System.Object)", "summary", "df-generated"]
diff --git a/csharp/ql/lib/ext/generated/System.Net.Http.model.yml b/csharp/ql/lib/ext/generated/System.Net.Http.model.yml
index 9c85c8e1adf..f06afdd5f43 100644
--- a/csharp/ql/lib/ext/generated/System.Net.Http.model.yml
+++ b/csharp/ql/lib/ext/generated/System.Net.Http.model.yml
@@ -4,8 +4,10 @@ extensions:
       pack: codeql/csharp-all
       extensible: summaryModel
     data:
-      - ["System.Net.Http", "ByteArrayContent", False, "ByteArrayContent", "(System.Byte[])", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["System.Net.Http", "ByteArrayContent", False, "ByteArrayContent", "(System.Byte[],System.Int32,System.Int32)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
+      - ["System.Net.Http", "ByteArrayContent", False, "ByteArrayContent", "(System.Byte[])", "", "Argument[0]", "Argument[this].SyntheticField[System.Net.Http.ByteArrayContent._content]", "value", "dfc-generated"]
+      - ["System.Net.Http", "ByteArrayContent", False, "ByteArrayContent", "(System.Byte[],System.Int32,System.Int32)", "", "Argument[0]", "Argument[this].SyntheticField[System.Net.Http.ByteArrayContent._content]", "value", "dfc-generated"]
+      - ["System.Net.Http", "ByteArrayContent", True, "CreateContentReadStream", "(System.Threading.CancellationToken)", "", "Argument[this].SyntheticField[System.Net.Http.ByteArrayContent._content].Element", "ReturnValue", "taint", "dfc-generated"]
+      - ["System.Net.Http", "ByteArrayContent", True, "CreateContentReadStreamAsync", "()", "", "Argument[this].SyntheticField[System.Net.Http.ByteArrayContent._content].Element", "ReturnValue.Property[System.Threading.Tasks.Task`1.Result]", "taint", "dfc-generated"]
       - ["System.Net.Http", "DelegatingHandler", False, "DelegatingHandler", "(System.Net.Http.HttpMessageHandler)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Net.Http", "HttpClient", False, "Send", "(System.Net.Http.HttpRequestMessage)", "", "Argument[this]", "Argument[0]", "taint", "df-generated"]
       - ["System.Net.Http", "HttpClient", False, "Send", "(System.Net.Http.HttpRequestMessage,System.Net.Http.HttpCompletionOption)", "", "Argument[this]", "Argument[0]", "taint", "df-generated"]
@@ -25,8 +27,6 @@ extensions:
       - ["System.Net.Http", "HttpContent", False, "ReadAsStream", "(System.Threading.CancellationToken)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Net.Http", "HttpContent", False, "ReadAsStreamAsync", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Net.Http", "HttpContent", False, "ReadAsStreamAsync", "(System.Threading.CancellationToken)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Net.Http", "HttpContent", False, "ReadAsStringAsync", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Net.Http", "HttpContent", False, "ReadAsStringAsync", "(System.Threading.CancellationToken)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Net.Http", "HttpContent", True, "CreateContentReadStream", "(System.Threading.CancellationToken)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Net.Http", "HttpContent", True, "CreateContentReadStreamAsync", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Net.Http", "HttpContent", True, "CreateContentReadStreamAsync", "(System.Threading.CancellationToken)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
@@ -38,25 +38,25 @@ extensions:
       - ["System.Net.Http", "HttpContent", True, "SerializeToStreamAsync", "(System.IO.Stream,System.Net.TransportContext,System.Threading.CancellationToken)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
       - ["System.Net.Http", "HttpContent", True, "SerializeToStreamAsync", "(System.IO.Stream,System.Net.TransportContext,System.Threading.CancellationToken)", "", "Argument[this]", "Argument[0]", "taint", "df-generated"]
       - ["System.Net.Http", "HttpContent", True, "SerializeToStreamAsync", "(System.IO.Stream,System.Net.TransportContext,System.Threading.CancellationToken)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Net.Http", "HttpMessageHandler", True, "SendAsync", "(System.Net.Http.HttpRequestMessage,System.Threading.CancellationToken)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Net.Http", "HttpIOException", True, "get_Message", "()", "", "Argument[this].Property[System.Exception.Message]", "ReturnValue", "taint", "dfc-generated"]
       - ["System.Net.Http", "HttpMessageInvoker", False, "HttpMessageInvoker", "(System.Net.Http.HttpMessageHandler,System.Boolean)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Net.Http", "HttpMessageInvoker", True, "Send", "(System.Net.Http.HttpRequestMessage,System.Threading.CancellationToken)", "", "Argument[this]", "Argument[0]", "taint", "df-generated"]
-      - ["System.Net.Http", "HttpMessageInvoker", True, "SendAsync", "(System.Net.Http.HttpRequestMessage,System.Threading.CancellationToken)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
       - ["System.Net.Http", "HttpMessageInvoker", True, "SendAsync", "(System.Net.Http.HttpRequestMessage,System.Threading.CancellationToken)", "", "Argument[this]", "Argument[0]", "taint", "df-generated"]
-      - ["System.Net.Http", "HttpMethod", False, "HttpMethod", "(System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Net.Http", "HttpMethod", False, "ToString", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Net.Http", "HttpMethod", False, "get_Method", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Net.Http", "HttpRequestMessage", False, "HttpRequestMessage", "(System.Net.Http.HttpMethod,System.Uri)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Net.Http", "HttpRequestMessage", False, "HttpRequestMessage", "(System.Net.Http.HttpMethod,System.Uri)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Net.Http", "HttpRequestMessage", False, "ToString", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Net.Http", "HttpRequestMessage", False, "get_Properties", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Net.Http", "HttpMethod", False, "HttpMethod", "(System.String)", "", "Argument[0]", "Argument[this].SyntheticField[System.Net.Http.HttpMethod._method]", "value", "dfc-generated"]
+      - ["System.Net.Http", "HttpMethod", False, "ToString", "()", "", "Argument[this].SyntheticField[System.Net.Http.HttpMethod._method]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Net.Http", "HttpMethod", False, "get_Method", "()", "", "Argument[this].SyntheticField[System.Net.Http.HttpMethod._method]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Net.Http", "HttpRequestMessage", False, "HttpRequestMessage", "(System.Net.Http.HttpMethod,System.Uri)", "", "Argument[0]", "Argument[this].SyntheticField[System.Net.Http.HttpRequestMessage._method]", "value", "dfc-generated"]
+      - ["System.Net.Http", "HttpRequestMessage", False, "HttpRequestMessage", "(System.Net.Http.HttpMethod,System.Uri)", "", "Argument[1]", "Argument[this].SyntheticField[System.Net.Http.HttpRequestMessage._requestUri]", "value", "dfc-generated"]
+      - ["System.Net.Http", "HttpRequestMessage", False, "ToString", "()", "", "Argument[this].SyntheticField[System.Net.Http.HttpRequestMessage._method]", "ReturnValue", "taint", "dfc-generated"]
+      - ["System.Net.Http", "HttpRequestMessage", False, "ToString", "()", "", "Argument[this].SyntheticField[System.Net.Http.HttpRequestMessage._requestUri]", "ReturnValue", "taint", "dfc-generated"]
+      - ["System.Net.Http", "HttpRequestMessage", False, "get_Properties", "()", "", "Argument[this].Property[System.Net.Http.HttpRequestMessage.Options]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Net.Http", "HttpRequestOptions", False, "get_Keys", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Net.Http", "HttpRequestOptions", False, "get_Values", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Net.Http", "HttpResponseMessage", False, "EnsureSuccessStatusCode", "()", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["System.Net.Http", "HttpResponseMessage", False, "ToString", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Net.Http", "HttpResponseMessage", False, "EnsureSuccessStatusCode", "()", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Net.Http", "HttpResponseMessage", False, "ToString", "()", "", "Argument[this].Property[System.Net.Http.HttpResponseMessage.ReasonPhrase]", "ReturnValue", "taint", "dfc-generated"]
       - ["System.Net.Http", "MultipartContent", False, "MultipartContent", "(System.String,System.String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Net.Http", "MultipartFormDataContent", False, "Add", "(System.Net.Http.HttpContent,System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Net.Http", "MultipartFormDataContent", False, "Add", "(System.Net.Http.HttpContent,System.String,System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["System.Net.Http", "MultipartFormDataContent", False, "Add", "(System.Net.Http.HttpContent,System.String)", "", "Argument[0]", "Argument[this].Element", "value", "dfc-generated"]
+      - ["System.Net.Http", "MultipartFormDataContent", False, "Add", "(System.Net.Http.HttpContent,System.String,System.String)", "", "Argument[0]", "Argument[this].Element", "value", "dfc-generated"]
       - ["System.Net.Http", "ReadOnlyMemoryContent", False, "ReadOnlyMemoryContent", "(System.ReadOnlyMemory<System.Byte>)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Net.Http", "SocketsHttpConnectionContext", False, "get_DnsEndPoint", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Net.Http", "SocketsHttpConnectionContext", False, "get_InitialRequestMessage", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
@@ -72,6 +72,7 @@ extensions:
       - ["System.Net.Http", "ByteArrayContent", "TryComputeLength", "(System.Int64)", "summary", "df-generated"]
       - ["System.Net.Http", "DelegatingHandler", "Dispose", "(System.Boolean)", "summary", "df-generated"]
       - ["System.Net.Http", "DelegatingHandler", "Send", "(System.Net.Http.HttpRequestMessage,System.Threading.CancellationToken)", "summary", "df-generated"]
+      - ["System.Net.Http", "DelegatingHandler", "SendAsync", "(System.Net.Http.HttpRequestMessage,System.Threading.CancellationToken)", "summary", "df-generated"]
       - ["System.Net.Http", "FormUrlEncodedContent", "FormUrlEncodedContent", "(System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<System.String,System.String>>)", "summary", "df-generated"]
       - ["System.Net.Http", "HttpClient", "CancelPendingRequests", "()", "summary", "df-generated"]
       - ["System.Net.Http", "HttpClient", "DeleteAsync", "(System.String)", "summary", "df-generated"]
@@ -117,6 +118,7 @@ extensions:
       - ["System.Net.Http", "HttpClientFactoryExtensions", "CreateClient", "(System.Net.Http.IHttpClientFactory)", "summary", "df-generated"]
       - ["System.Net.Http", "HttpClientHandler", "Dispose", "(System.Boolean)", "summary", "df-generated"]
       - ["System.Net.Http", "HttpClientHandler", "Send", "(System.Net.Http.HttpRequestMessage,System.Threading.CancellationToken)", "summary", "df-generated"]
+      - ["System.Net.Http", "HttpClientHandler", "SendAsync", "(System.Net.Http.HttpRequestMessage,System.Threading.CancellationToken)", "summary", "df-generated"]
       - ["System.Net.Http", "HttpClientHandler", "get_ClientCertificates", "()", "summary", "df-generated"]
       - ["System.Net.Http", "HttpClientHandler", "get_DangerousAcceptAnyServerCertificateValidator", "()", "summary", "df-generated"]
       - ["System.Net.Http", "HttpClientHandler", "get_SupportsAutomaticDecompression", "()", "summary", "df-generated"]
@@ -126,6 +128,8 @@ extensions:
       - ["System.Net.Http", "HttpContent", "Dispose", "(System.Boolean)", "summary", "df-generated"]
       - ["System.Net.Http", "HttpContent", "LoadIntoBufferAsync", "()", "summary", "df-generated"]
       - ["System.Net.Http", "HttpContent", "LoadIntoBufferAsync", "(System.Int64)", "summary", "df-generated"]
+      - ["System.Net.Http", "HttpContent", "ReadAsStringAsync", "()", "summary", "df-generated"]
+      - ["System.Net.Http", "HttpContent", "ReadAsStringAsync", "(System.Threading.CancellationToken)", "summary", "df-generated"]
       - ["System.Net.Http", "HttpContent", "TryComputeLength", "(System.Int64)", "summary", "df-generated"]
       - ["System.Net.Http", "HttpContent", "get_Headers", "()", "summary", "df-generated"]
       - ["System.Net.Http", "HttpIOException", "HttpIOException", "(System.Net.Http.HttpRequestError,System.String,System.Exception)", "summary", "df-generated"]
@@ -133,6 +137,7 @@ extensions:
       - ["System.Net.Http", "HttpMessageHandler", "Dispose", "()", "summary", "df-generated"]
       - ["System.Net.Http", "HttpMessageHandler", "Dispose", "(System.Boolean)", "summary", "df-generated"]
       - ["System.Net.Http", "HttpMessageHandler", "Send", "(System.Net.Http.HttpRequestMessage,System.Threading.CancellationToken)", "summary", "df-generated"]
+      - ["System.Net.Http", "HttpMessageHandler", "SendAsync", "(System.Net.Http.HttpRequestMessage,System.Threading.CancellationToken)", "summary", "df-generated"]
       - ["System.Net.Http", "HttpMessageHandlerFactoryExtensions", "CreateHandler", "(System.Net.Http.IHttpMessageHandlerFactory)", "summary", "df-generated"]
       - ["System.Net.Http", "HttpMessageInvoker", "Dispose", "()", "summary", "df-generated"]
       - ["System.Net.Http", "HttpMessageInvoker", "Dispose", "(System.Boolean)", "summary", "df-generated"]
@@ -187,6 +192,7 @@ extensions:
       - ["System.Net.Http", "MessageProcessingHandler", "ProcessRequest", "(System.Net.Http.HttpRequestMessage,System.Threading.CancellationToken)", "summary", "df-generated"]
       - ["System.Net.Http", "MessageProcessingHandler", "ProcessResponse", "(System.Net.Http.HttpResponseMessage,System.Threading.CancellationToken)", "summary", "df-generated"]
       - ["System.Net.Http", "MessageProcessingHandler", "Send", "(System.Net.Http.HttpRequestMessage,System.Threading.CancellationToken)", "summary", "df-generated"]
+      - ["System.Net.Http", "MessageProcessingHandler", "SendAsync", "(System.Net.Http.HttpRequestMessage,System.Threading.CancellationToken)", "summary", "df-generated"]
       - ["System.Net.Http", "MultipartContent", "Dispose", "(System.Boolean)", "summary", "df-generated"]
       - ["System.Net.Http", "MultipartContent", "MultipartContent", "(System.String)", "summary", "df-generated"]
       - ["System.Net.Http", "MultipartContent", "TryComputeLength", "(System.Int64)", "summary", "df-generated"]
@@ -194,6 +200,7 @@ extensions:
       - ["System.Net.Http", "ReadOnlyMemoryContent", "TryComputeLength", "(System.Int64)", "summary", "df-generated"]
       - ["System.Net.Http", "SocketsHttpHandler", "Dispose", "(System.Boolean)", "summary", "df-generated"]
       - ["System.Net.Http", "SocketsHttpHandler", "Send", "(System.Net.Http.HttpRequestMessage,System.Threading.CancellationToken)", "summary", "df-generated"]
+      - ["System.Net.Http", "SocketsHttpHandler", "SendAsync", "(System.Net.Http.HttpRequestMessage,System.Threading.CancellationToken)", "summary", "df-generated"]
       - ["System.Net.Http", "SocketsHttpHandler", "get_IsSupported", "()", "summary", "df-generated"]
       - ["System.Net.Http", "SocketsHttpHandler", "get_Properties", "()", "summary", "df-generated"]
       - ["System.Net.Http", "StreamContent", "Dispose", "(System.Boolean)", "summary", "df-generated"]
@@ -204,5 +211,6 @@ extensions:
       - ["System.Net.Http", "StringContent", "StringContent", "(System.String,System.Text.Encoding,System.Net.Http.Headers.MediaTypeHeaderValue)", "summary", "df-generated"]
       - ["System.Net.Http", "StringContent", "StringContent", "(System.String,System.Text.Encoding,System.String)", "summary", "df-generated"]
       - ["System.Net.Http", "WinHttpHandler", "Dispose", "(System.Boolean)", "summary", "df-generated"]
+      - ["System.Net.Http", "WinHttpHandler", "SendAsync", "(System.Net.Http.HttpRequestMessage,System.Threading.CancellationToken)", "summary", "df-generated"]
       - ["System.Net.Http", "WinHttpHandler", "get_ClientCertificates", "()", "summary", "df-generated"]
       - ["System.Net.Http", "WinHttpHandler", "get_Properties", "()", "summary", "df-generated"]
diff --git a/csharp/ql/lib/ext/generated/System.Net.Mail.model.yml b/csharp/ql/lib/ext/generated/System.Net.Mail.model.yml
index 07805e15ae6..a3399405d7f 100644
--- a/csharp/ql/lib/ext/generated/System.Net.Mail.model.yml
+++ b/csharp/ql/lib/ext/generated/System.Net.Mail.model.yml
@@ -8,8 +8,6 @@ extensions:
       - ["System.Net.Mail", "AlternateView", False, "CreateAlternateViewFromString", "(System.String,System.Net.Mime.ContentType)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["System.Net.Mail", "AlternateView", False, "CreateAlternateViewFromString", "(System.String,System.Net.Mime.ContentType)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
       - ["System.Net.Mail", "AlternateView", False, "CreateAlternateViewFromString", "(System.String,System.Text.Encoding,System.String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Net.Mail", "AlternateViewCollection", False, "InsertItem", "(System.Int32,System.Net.Mail.AlternateView)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Net.Mail", "AlternateViewCollection", False, "SetItem", "(System.Int32,System.Net.Mail.AlternateView)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
       - ["System.Net.Mail", "Attachment", False, "Attachment", "(System.IO.Stream,System.Net.Mime.ContentType)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
       - ["System.Net.Mail", "Attachment", False, "Attachment", "(System.IO.Stream,System.String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
       - ["System.Net.Mail", "Attachment", False, "Attachment", "(System.IO.Stream,System.String,System.String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
@@ -24,40 +22,39 @@ extensions:
       - ["System.Net.Mail", "Attachment", False, "CreateAttachmentFromString", "(System.String,System.String,System.Text.Encoding,System.String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["System.Net.Mail", "Attachment", False, "CreateAttachmentFromString", "(System.String,System.String,System.Text.Encoding,System.String)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
       - ["System.Net.Mail", "Attachment", False, "get_ContentDisposition", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Net.Mail", "AttachmentBase", False, "AttachmentBase", "(System.IO.Stream)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Net.Mail", "AttachmentBase", False, "AttachmentBase", "(System.IO.Stream,System.Net.Mime.ContentType)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Net.Mail", "AttachmentBase", False, "AttachmentBase", "(System.IO.Stream,System.Net.Mime.ContentType)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Net.Mail", "AttachmentBase", False, "AttachmentBase", "(System.IO.Stream,System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Net.Mail", "AttachmentBase", False, "AttachmentBase", "(System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Net.Mail", "AttachmentBase", False, "AttachmentBase", "(System.String,System.Net.Mime.ContentType)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Net.Mail", "AttachmentBase", False, "AttachmentBase", "(System.String,System.Net.Mime.ContentType)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Net.Mail", "AttachmentBase", False, "AttachmentBase", "(System.String,System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Net.Mail", "AttachmentBase", False, "get_ContentStream", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Net.Mail", "AttachmentCollection", False, "InsertItem", "(System.Int32,System.Net.Mail.Attachment)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Net.Mail", "AttachmentCollection", False, "SetItem", "(System.Int32,System.Net.Mail.Attachment)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["System.Net.Mail", "AttachmentBase", False, "AttachmentBase", "(System.IO.Stream)", "", "Argument[0]", "Argument[this].SyntheticField[System.Net.Mail.AttachmentBase._part].SyntheticField[System.Net.Mime.MimePart._stream]", "value", "dfc-generated"]
+      - ["System.Net.Mail", "AttachmentBase", False, "AttachmentBase", "(System.IO.Stream,System.Net.Mime.ContentType)", "", "Argument[0]", "Argument[this].SyntheticField[System.Net.Mail.AttachmentBase._part].SyntheticField[System.Net.Mime.MimePart._stream]", "value", "dfc-generated"]
+      - ["System.Net.Mail", "AttachmentBase", False, "AttachmentBase", "(System.IO.Stream,System.String)", "", "Argument[0]", "Argument[this].SyntheticField[System.Net.Mail.AttachmentBase._part].SyntheticField[System.Net.Mime.MimePart._stream]", "value", "dfc-generated"]
+      - ["System.Net.Mail", "AttachmentBase", False, "AttachmentBase", "(System.String)", "", "Argument[0]", "Argument[this].SyntheticField[System.Net.Mail.AttachmentBase._part].SyntheticField[System.Net.Mime.MimePart._stream]", "taint", "dfc-generated"]
+      - ["System.Net.Mail", "AttachmentBase", False, "AttachmentBase", "(System.String,System.Net.Mime.ContentType)", "", "Argument[0]", "Argument[this].SyntheticField[System.Net.Mail.AttachmentBase._part].SyntheticField[System.Net.Mime.MimePart._stream]", "taint", "dfc-generated"]
+      - ["System.Net.Mail", "AttachmentBase", False, "AttachmentBase", "(System.String,System.String)", "", "Argument[0]", "Argument[this].SyntheticField[System.Net.Mail.AttachmentBase._part].SyntheticField[System.Net.Mime.MimePart._stream]", "taint", "dfc-generated"]
+      - ["System.Net.Mail", "AttachmentBase", False, "get_ContentStream", "()", "", "Argument[this].SyntheticField[System.Net.Mail.AttachmentBase._part].SyntheticField[System.Net.Mime.MimePart._stream]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Net.Mail", "LinkedResource", False, "CreateLinkedResourceFromString", "(System.String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["System.Net.Mail", "LinkedResource", False, "CreateLinkedResourceFromString", "(System.String,System.Net.Mime.ContentType)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["System.Net.Mail", "LinkedResource", False, "CreateLinkedResourceFromString", "(System.String,System.Net.Mime.ContentType)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
       - ["System.Net.Mail", "LinkedResource", False, "CreateLinkedResourceFromString", "(System.String,System.Text.Encoding,System.String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Net.Mail", "LinkedResourceCollection", False, "InsertItem", "(System.Int32,System.Net.Mail.LinkedResource)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Net.Mail", "LinkedResourceCollection", False, "SetItem", "(System.Int32,System.Net.Mail.LinkedResource)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Net.Mail", "MailAddress", False, "MailAddress", "(System.String,System.String,System.Text.Encoding)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Net.Mail", "MailAddress", False, "MailAddress", "(System.String,System.String,System.Text.Encoding)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Net.Mail", "MailAddress", False, "MailAddress", "(System.String,System.String,System.Text.Encoding)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
+      - ["System.Net.Mail", "MailAddress", False, "MailAddress", "(System.String,System.String,System.Text.Encoding)", "", "Argument[0]", "Argument[this].SyntheticField[System.Net.Mail.MailAddress._displayName]", "taint", "dfc-generated"]
+      - ["System.Net.Mail", "MailAddress", False, "MailAddress", "(System.String,System.String,System.Text.Encoding)", "", "Argument[0]", "Argument[this].SyntheticField[System.Net.Mail.MailAddress._host]", "taint", "dfc-generated"]
+      - ["System.Net.Mail", "MailAddress", False, "MailAddress", "(System.String,System.String,System.Text.Encoding)", "", "Argument[0]", "Argument[this].SyntheticField[System.Net.Mail.MailAddress._userName]", "taint", "dfc-generated"]
+      - ["System.Net.Mail", "MailAddress", False, "MailAddress", "(System.String,System.String,System.Text.Encoding)", "", "Argument[1]", "Argument[this].SyntheticField[System.Net.Mail.MailAddress._displayName]", "value", "dfc-generated"]
       - ["System.Net.Mail", "MailAddress", False, "ToString", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Net.Mail", "MailAddress", False, "TryCreate", "(System.String,System.Net.Mail.MailAddress)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Net.Mail", "MailAddress", False, "TryCreate", "(System.String,System.String,System.Net.Mail.MailAddress)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Net.Mail", "MailAddress", False, "TryCreate", "(System.String,System.String,System.Net.Mail.MailAddress)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Net.Mail", "MailAddress", False, "TryCreate", "(System.String,System.String,System.Text.Encoding,System.Net.Mail.MailAddress)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Net.Mail", "MailAddress", False, "TryCreate", "(System.String,System.String,System.Text.Encoding,System.Net.Mail.MailAddress)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Net.Mail", "MailAddress", False, "TryCreate", "(System.String,System.String,System.Text.Encoding,System.Net.Mail.MailAddress)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Net.Mail", "MailAddress", False, "get_Address", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Net.Mail", "MailAddress", False, "get_DisplayName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Net.Mail", "MailAddress", False, "get_Host", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Net.Mail", "MailAddress", False, "get_User", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Net.Mail", "MailAddressCollection", False, "ToString", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Net.Mail", "MailAddressCollection", True, "InsertItem", "(System.Int32,System.Net.Mail.MailAddress)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Net.Mail", "MailAddressCollection", True, "SetItem", "(System.Int32,System.Net.Mail.MailAddress)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["System.Net.Mail", "MailAddress", False, "TryCreate", "(System.String,System.Net.Mail.MailAddress)", "", "Argument[0]", "ReturnValue.SyntheticField[System.Net.Mail.MailAddress._displayName]", "taint", "dfc-generated"]
+      - ["System.Net.Mail", "MailAddress", False, "TryCreate", "(System.String,System.Net.Mail.MailAddress)", "", "Argument[0]", "ReturnValue.SyntheticField[System.Net.Mail.MailAddress._host]", "taint", "dfc-generated"]
+      - ["System.Net.Mail", "MailAddress", False, "TryCreate", "(System.String,System.Net.Mail.MailAddress)", "", "Argument[0]", "ReturnValue.SyntheticField[System.Net.Mail.MailAddress._userName]", "taint", "dfc-generated"]
+      - ["System.Net.Mail", "MailAddress", False, "TryCreate", "(System.String,System.String,System.Net.Mail.MailAddress)", "", "Argument[0]", "ReturnValue.SyntheticField[System.Net.Mail.MailAddress._displayName]", "taint", "dfc-generated"]
+      - ["System.Net.Mail", "MailAddress", False, "TryCreate", "(System.String,System.String,System.Net.Mail.MailAddress)", "", "Argument[0]", "ReturnValue.SyntheticField[System.Net.Mail.MailAddress._host]", "taint", "dfc-generated"]
+      - ["System.Net.Mail", "MailAddress", False, "TryCreate", "(System.String,System.String,System.Net.Mail.MailAddress)", "", "Argument[0]", "ReturnValue.SyntheticField[System.Net.Mail.MailAddress._userName]", "taint", "dfc-generated"]
+      - ["System.Net.Mail", "MailAddress", False, "TryCreate", "(System.String,System.String,System.Net.Mail.MailAddress)", "", "Argument[1]", "ReturnValue.SyntheticField[System.Net.Mail.MailAddress._displayName]", "value", "dfc-generated"]
+      - ["System.Net.Mail", "MailAddress", False, "TryCreate", "(System.String,System.String,System.Text.Encoding,System.Net.Mail.MailAddress)", "", "Argument[0]", "ReturnValue.SyntheticField[System.Net.Mail.MailAddress._displayName]", "taint", "dfc-generated"]
+      - ["System.Net.Mail", "MailAddress", False, "TryCreate", "(System.String,System.String,System.Text.Encoding,System.Net.Mail.MailAddress)", "", "Argument[0]", "ReturnValue.SyntheticField[System.Net.Mail.MailAddress._host]", "taint", "dfc-generated"]
+      - ["System.Net.Mail", "MailAddress", False, "TryCreate", "(System.String,System.String,System.Text.Encoding,System.Net.Mail.MailAddress)", "", "Argument[0]", "ReturnValue.SyntheticField[System.Net.Mail.MailAddress._userName]", "taint", "dfc-generated"]
+      - ["System.Net.Mail", "MailAddress", False, "TryCreate", "(System.String,System.String,System.Text.Encoding,System.Net.Mail.MailAddress)", "", "Argument[1]", "ReturnValue.SyntheticField[System.Net.Mail.MailAddress._displayName]", "value", "dfc-generated"]
+      - ["System.Net.Mail", "MailAddress", False, "get_Address", "()", "", "Argument[this].SyntheticField[System.Net.Mail.MailAddress._host]", "ReturnValue", "taint", "dfc-generated"]
+      - ["System.Net.Mail", "MailAddress", False, "get_Address", "()", "", "Argument[this].SyntheticField[System.Net.Mail.MailAddress._userName]", "ReturnValue", "taint", "dfc-generated"]
+      - ["System.Net.Mail", "MailAddress", False, "get_DisplayName", "()", "", "Argument[this].SyntheticField[System.Net.Mail.MailAddress._displayName]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Net.Mail", "MailAddress", False, "get_Host", "()", "", "Argument[this].SyntheticField[System.Net.Mail.MailAddress._host]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Net.Mail", "MailAddress", False, "get_User", "()", "", "Argument[this].SyntheticField[System.Net.Mail.MailAddress._userName]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Net.Mail", "MailAddressCollection", False, "ToString", "()", "", "Argument[this].Element", "ReturnValue", "taint", "dfc-generated"]
       - ["System.Net.Mail", "MailMessage", False, "MailMessage", "(System.Net.Mail.MailAddress,System.Net.Mail.MailAddress)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Net.Mail", "MailMessage", False, "MailMessage", "(System.String,System.String,System.String,System.String)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
       - ["System.Net.Mail", "MailMessage", False, "MailMessage", "(System.String,System.String,System.String,System.String)", "", "Argument[3]", "Argument[this]", "taint", "df-generated"]
@@ -72,21 +69,18 @@ extensions:
       - ["System.Net.Mail", "SmtpClient", False, "SendAsync", "(System.String,System.String,System.String,System.String,System.Object)", "", "Argument[3]", "Argument[this]", "taint", "df-generated"]
       - ["System.Net.Mail", "SmtpClient", False, "SendMailAsync", "(System.Net.Mail.MailMessage)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Net.Mail", "SmtpClient", False, "SendMailAsync", "(System.Net.Mail.MailMessage,System.Threading.CancellationToken)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Net.Mail", "SmtpClient", False, "SendMailAsync", "(System.Net.Mail.MailMessage,System.Threading.CancellationToken)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
       - ["System.Net.Mail", "SmtpClient", False, "SendMailAsync", "(System.String,System.String,System.String,System.String)", "", "Argument[3]", "Argument[this]", "taint", "df-generated"]
       - ["System.Net.Mail", "SmtpClient", False, "SendMailAsync", "(System.String,System.String,System.String,System.String,System.Threading.CancellationToken)", "", "Argument[3]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Net.Mail", "SmtpClient", False, "SendMailAsync", "(System.String,System.String,System.String,System.String,System.Threading.CancellationToken)", "", "Argument[4]", "ReturnValue", "taint", "df-generated"]
       - ["System.Net.Mail", "SmtpClient", False, "SmtpClient", "(System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Net.Mail", "SmtpClient", False, "SmtpClient", "(System.String,System.Int32)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Net.Mail", "SmtpClient", False, "get_ClientCertificates", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Net.Mail", "SmtpFailedRecipientException", False, "SmtpFailedRecipientException", "(System.Net.Mail.SmtpStatusCode,System.String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Net.Mail", "SmtpFailedRecipientException", False, "SmtpFailedRecipientException", "(System.Net.Mail.SmtpStatusCode,System.String,System.String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Net.Mail", "SmtpFailedRecipientException", False, "SmtpFailedRecipientException", "(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Net.Mail", "SmtpFailedRecipientException", False, "SmtpFailedRecipientException", "(System.String,System.String,System.Exception)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Net.Mail", "SmtpFailedRecipientException", False, "get_FailedRecipient", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Net.Mail", "SmtpFailedRecipientsException", False, "SmtpFailedRecipientsException", "(System.String,System.Exception)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Net.Mail", "SmtpFailedRecipientsException", False, "SmtpFailedRecipientsException", "(System.String,System.Net.Mail.SmtpFailedRecipientException[])", "", "Argument[1].Element", "Argument[this]", "taint", "df-generated"]
-      - ["System.Net.Mail", "SmtpFailedRecipientsException", False, "get_InnerExceptions", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Net.Mail", "SmtpFailedRecipientException", False, "SmtpFailedRecipientException", "(System.Net.Mail.SmtpStatusCode,System.String)", "", "Argument[1]", "Argument[this].SyntheticField[System.Net.Mail.SmtpFailedRecipientException._failedRecipient]", "value", "dfc-generated"]
+      - ["System.Net.Mail", "SmtpFailedRecipientException", False, "SmtpFailedRecipientException", "(System.Net.Mail.SmtpStatusCode,System.String,System.String)", "", "Argument[1]", "Argument[this].SyntheticField[System.Net.Mail.SmtpFailedRecipientException._failedRecipient]", "value", "dfc-generated"]
+      - ["System.Net.Mail", "SmtpFailedRecipientException", False, "SmtpFailedRecipientException", "(System.String,System.String,System.Exception)", "", "Argument[1]", "Argument[this].SyntheticField[System.Net.Mail.SmtpFailedRecipientException._failedRecipient]", "value", "dfc-generated"]
+      - ["System.Net.Mail", "SmtpFailedRecipientException", False, "get_FailedRecipient", "()", "", "Argument[this].SyntheticField[System.Net.Mail.SmtpFailedRecipientException._failedRecipient]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Net.Mail", "SmtpFailedRecipientsException", False, "SmtpFailedRecipientsException", "(System.String,System.Exception)", "", "Argument[1]", "Argument[this].SyntheticField[System.Net.Mail.SmtpFailedRecipientsException._innerExceptions].Element", "value", "dfc-generated"]
+      - ["System.Net.Mail", "SmtpFailedRecipientsException", False, "SmtpFailedRecipientsException", "(System.String,System.Net.Mail.SmtpFailedRecipientException[])", "", "Argument[1]", "Argument[this].SyntheticField[System.Net.Mail.SmtpFailedRecipientsException._innerExceptions]", "value", "dfc-generated"]
+      - ["System.Net.Mail", "SmtpFailedRecipientsException", False, "get_InnerExceptions", "()", "", "Argument[this].SyntheticField[System.Net.Mail.SmtpFailedRecipientsException._innerExceptions]", "ReturnValue", "value", "dfc-generated"]
   - addsTo:
       pack: codeql/csharp-all
       extensible: neutralModel
@@ -101,12 +95,16 @@ extensions:
       - ["System.Net.Mail", "AlternateView", "get_LinkedResources", "()", "summary", "df-generated"]
       - ["System.Net.Mail", "AlternateViewCollection", "ClearItems", "()", "summary", "df-generated"]
       - ["System.Net.Mail", "AlternateViewCollection", "Dispose", "()", "summary", "df-generated"]
+      - ["System.Net.Mail", "AlternateViewCollection", "InsertItem", "(System.Int32,System.Net.Mail.AlternateView)", "summary", "df-generated"]
       - ["System.Net.Mail", "AlternateViewCollection", "RemoveItem", "(System.Int32)", "summary", "df-generated"]
+      - ["System.Net.Mail", "AlternateViewCollection", "SetItem", "(System.Int32,System.Net.Mail.AlternateView)", "summary", "df-generated"]
       - ["System.Net.Mail", "AttachmentBase", "Dispose", "()", "summary", "df-generated"]
       - ["System.Net.Mail", "AttachmentBase", "Dispose", "(System.Boolean)", "summary", "df-generated"]
       - ["System.Net.Mail", "AttachmentCollection", "ClearItems", "()", "summary", "df-generated"]
       - ["System.Net.Mail", "AttachmentCollection", "Dispose", "()", "summary", "df-generated"]
+      - ["System.Net.Mail", "AttachmentCollection", "InsertItem", "(System.Int32,System.Net.Mail.Attachment)", "summary", "df-generated"]
       - ["System.Net.Mail", "AttachmentCollection", "RemoveItem", "(System.Int32)", "summary", "df-generated"]
+      - ["System.Net.Mail", "AttachmentCollection", "SetItem", "(System.Int32,System.Net.Mail.Attachment)", "summary", "df-generated"]
       - ["System.Net.Mail", "LinkedResource", "LinkedResource", "(System.IO.Stream)", "summary", "df-generated"]
       - ["System.Net.Mail", "LinkedResource", "LinkedResource", "(System.IO.Stream,System.Net.Mime.ContentType)", "summary", "df-generated"]
       - ["System.Net.Mail", "LinkedResource", "LinkedResource", "(System.IO.Stream,System.String)", "summary", "df-generated"]
@@ -115,11 +113,15 @@ extensions:
       - ["System.Net.Mail", "LinkedResource", "LinkedResource", "(System.String,System.String)", "summary", "df-generated"]
       - ["System.Net.Mail", "LinkedResourceCollection", "ClearItems", "()", "summary", "df-generated"]
       - ["System.Net.Mail", "LinkedResourceCollection", "Dispose", "()", "summary", "df-generated"]
+      - ["System.Net.Mail", "LinkedResourceCollection", "InsertItem", "(System.Int32,System.Net.Mail.LinkedResource)", "summary", "df-generated"]
       - ["System.Net.Mail", "LinkedResourceCollection", "RemoveItem", "(System.Int32)", "summary", "df-generated"]
+      - ["System.Net.Mail", "LinkedResourceCollection", "SetItem", "(System.Int32,System.Net.Mail.LinkedResource)", "summary", "df-generated"]
       - ["System.Net.Mail", "MailAddress", "Equals", "(System.Object)", "summary", "df-generated"]
       - ["System.Net.Mail", "MailAddress", "GetHashCode", "()", "summary", "df-generated"]
       - ["System.Net.Mail", "MailAddress", "MailAddress", "(System.String)", "summary", "df-generated"]
       - ["System.Net.Mail", "MailAddress", "MailAddress", "(System.String,System.String)", "summary", "df-generated"]
+      - ["System.Net.Mail", "MailAddressCollection", "InsertItem", "(System.Int32,System.Net.Mail.MailAddress)", "summary", "df-generated"]
+      - ["System.Net.Mail", "MailAddressCollection", "SetItem", "(System.Int32,System.Net.Mail.MailAddress)", "summary", "df-generated"]
       - ["System.Net.Mail", "MailMessage", "Dispose", "()", "summary", "df-generated"]
       - ["System.Net.Mail", "MailMessage", "Dispose", "(System.Boolean)", "summary", "df-generated"]
       - ["System.Net.Mail", "MailMessage", "MailMessage", "(System.String,System.String)", "summary", "df-generated"]
@@ -129,12 +131,15 @@ extensions:
       - ["System.Net.Mail", "SmtpClient", "Dispose", "(System.Boolean)", "summary", "df-generated"]
       - ["System.Net.Mail", "SmtpClient", "OnSendCompleted", "(System.ComponentModel.AsyncCompletedEventArgs)", "summary", "df-generated"]
       - ["System.Net.Mail", "SmtpClient", "SendAsyncCancel", "()", "summary", "df-generated"]
+      - ["System.Net.Mail", "SmtpClient", "add_SendCompleted", "(System.Net.Mail.SendCompletedEventHandler)", "summary", "df-generated"]
       - ["System.Net.Mail", "SmtpClient", "get_ServicePoint", "()", "summary", "df-generated"]
+      - ["System.Net.Mail", "SmtpClient", "remove_SendCompleted", "(System.Net.Mail.SendCompletedEventHandler)", "summary", "df-generated"]
       - ["System.Net.Mail", "SmtpException", "SmtpException", "(System.Net.Mail.SmtpStatusCode)", "summary", "df-generated"]
       - ["System.Net.Mail", "SmtpException", "SmtpException", "(System.Net.Mail.SmtpStatusCode,System.String)", "summary", "df-generated"]
       - ["System.Net.Mail", "SmtpException", "SmtpException", "(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)", "summary", "df-generated"]
       - ["System.Net.Mail", "SmtpException", "SmtpException", "(System.String)", "summary", "df-generated"]
       - ["System.Net.Mail", "SmtpException", "SmtpException", "(System.String,System.Exception)", "summary", "df-generated"]
+      - ["System.Net.Mail", "SmtpFailedRecipientException", "SmtpFailedRecipientException", "(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)", "summary", "df-generated"]
       - ["System.Net.Mail", "SmtpFailedRecipientException", "SmtpFailedRecipientException", "(System.String)", "summary", "df-generated"]
       - ["System.Net.Mail", "SmtpFailedRecipientException", "SmtpFailedRecipientException", "(System.String,System.Exception)", "summary", "df-generated"]
       - ["System.Net.Mail", "SmtpFailedRecipientsException", "SmtpFailedRecipientsException", "(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)", "summary", "df-generated"]
diff --git a/csharp/ql/lib/ext/generated/System.Net.Mime.model.yml b/csharp/ql/lib/ext/generated/System.Net.Mime.model.yml
index b286946e2bf..0c23a4d6eb3 100644
--- a/csharp/ql/lib/ext/generated/System.Net.Mime.model.yml
+++ b/csharp/ql/lib/ext/generated/System.Net.Mime.model.yml
@@ -4,8 +4,8 @@ extensions:
       pack: codeql/csharp-all
       extensible: summaryModel
     data:
-      - ["System.Net.Mime", "ContentDisposition", False, "ContentDisposition", "(System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Net.Mime", "ContentDisposition", False, "ToString", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Net.Mime", "ContentDisposition", False, "ContentDisposition", "(System.String)", "", "Argument[0]", "Argument[this].SyntheticField[System.Net.Mime.ContentDisposition._disposition]", "value", "dfc-generated"]
+      - ["System.Net.Mime", "ContentDisposition", False, "ToString", "()", "", "Argument[this].SyntheticField[System.Net.Mime.ContentDisposition._disposition]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Net.Mime", "ContentType", False, "ContentType", "(System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Net.Mime", "ContentType", False, "ToString", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Net.Mime", "ContentType", False, "get_Parameters", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
diff --git a/csharp/ql/lib/ext/generated/System.Net.NetworkInformation.model.yml b/csharp/ql/lib/ext/generated/System.Net.NetworkInformation.model.yml
index be39cc21de5..6ed3c214d14 100644
--- a/csharp/ql/lib/ext/generated/System.Net.NetworkInformation.model.yml
+++ b/csharp/ql/lib/ext/generated/System.Net.NetworkInformation.model.yml
@@ -22,8 +22,8 @@ extensions:
       - ["System.Net.NetworkInformation", "NetworkInterface", True, "get_Description", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Net.NetworkInformation", "NetworkInterface", True, "get_Id", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Net.NetworkInformation", "NetworkInterface", True, "get_Name", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Net.NetworkInformation", "PhysicalAddress", False, "GetAddressBytes", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Net.NetworkInformation", "PhysicalAddress", False, "PhysicalAddress", "(System.Byte[])", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
+      - ["System.Net.NetworkInformation", "PhysicalAddress", False, "GetAddressBytes", "()", "", "Argument[this].SyntheticField[System.Net.NetworkInformation.PhysicalAddress._address].Element", "ReturnValue.Element", "value", "dfc-generated"]
+      - ["System.Net.NetworkInformation", "PhysicalAddress", False, "PhysicalAddress", "(System.Byte[])", "", "Argument[0]", "Argument[this].SyntheticField[System.Net.NetworkInformation.PhysicalAddress._address]", "value", "dfc-generated"]
       - ["System.Net.NetworkInformation", "UnicastIPAddressInformationCollection", True, "get_Item", "(System.Int32)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
   - addsTo:
       pack: codeql/csharp-all
@@ -43,6 +43,7 @@ extensions:
       - ["System.Net.NetworkInformation", "IPAddressInformationCollection", "Remove", "(System.Net.NetworkInformation.IPAddressInformation)", "summary", "df-generated"]
       - ["System.Net.NetworkInformation", "IPAddressInformationCollection", "get_Count", "()", "summary", "df-generated"]
       - ["System.Net.NetworkInformation", "IPAddressInformationCollection", "get_IsReadOnly", "()", "summary", "df-generated"]
+      - ["System.Net.NetworkInformation", "IPGlobalProperties", "BeginGetUnicastAddresses", "(System.AsyncCallback,System.Object)", "summary", "df-generated"]
       - ["System.Net.NetworkInformation", "IPGlobalProperties", "EndGetUnicastAddresses", "(System.IAsyncResult)", "summary", "df-generated"]
       - ["System.Net.NetworkInformation", "IPGlobalProperties", "GetActiveTcpConnections", "()", "summary", "df-generated"]
       - ["System.Net.NetworkInformation", "IPGlobalProperties", "GetActiveTcpListeners", "()", "summary", "df-generated"]
@@ -194,6 +195,10 @@ extensions:
       - ["System.Net.NetworkInformation", "MulticastIPAddressInformationCollection", "get_IsReadOnly", "()", "summary", "df-generated"]
       - ["System.Net.NetworkInformation", "NetworkAvailabilityEventArgs", "get_IsAvailable", "()", "summary", "df-generated"]
       - ["System.Net.NetworkInformation", "NetworkChange", "RegisterNetworkChange", "(System.Net.NetworkInformation.NetworkChange)", "summary", "df-generated"]
+      - ["System.Net.NetworkInformation", "NetworkChange", "add_NetworkAddressChanged", "(System.Net.NetworkInformation.NetworkAddressChangedEventHandler)", "summary", "df-generated"]
+      - ["System.Net.NetworkInformation", "NetworkChange", "add_NetworkAvailabilityChanged", "(System.Net.NetworkInformation.NetworkAvailabilityChangedEventHandler)", "summary", "df-generated"]
+      - ["System.Net.NetworkInformation", "NetworkChange", "remove_NetworkAddressChanged", "(System.Net.NetworkInformation.NetworkAddressChangedEventHandler)", "summary", "df-generated"]
+      - ["System.Net.NetworkInformation", "NetworkChange", "remove_NetworkAvailabilityChanged", "(System.Net.NetworkInformation.NetworkAvailabilityChangedEventHandler)", "summary", "df-generated"]
       - ["System.Net.NetworkInformation", "NetworkInformationException", "NetworkInformationException", "(System.Int32)", "summary", "df-generated"]
       - ["System.Net.NetworkInformation", "NetworkInformationException", "NetworkInformationException", "(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)", "summary", "df-generated"]
       - ["System.Net.NetworkInformation", "NetworkInformationException", "get_ErrorCode", "()", "summary", "df-generated"]
@@ -257,6 +262,8 @@ extensions:
       - ["System.Net.NetworkInformation", "Ping", "SendPingAsync", "(System.String,System.Int32,System.Byte[])", "summary", "df-generated"]
       - ["System.Net.NetworkInformation", "Ping", "SendPingAsync", "(System.String,System.Int32,System.Byte[],System.Net.NetworkInformation.PingOptions)", "summary", "df-generated"]
       - ["System.Net.NetworkInformation", "Ping", "SendPingAsync", "(System.String,System.TimeSpan,System.Byte[],System.Net.NetworkInformation.PingOptions,System.Threading.CancellationToken)", "summary", "df-generated"]
+      - ["System.Net.NetworkInformation", "Ping", "add_PingCompleted", "(System.Net.NetworkInformation.PingCompletedEventHandler)", "summary", "df-generated"]
+      - ["System.Net.NetworkInformation", "Ping", "remove_PingCompleted", "(System.Net.NetworkInformation.PingCompletedEventHandler)", "summary", "df-generated"]
       - ["System.Net.NetworkInformation", "PingCompletedEventArgs", "get_Reply", "()", "summary", "df-generated"]
       - ["System.Net.NetworkInformation", "PingException", "PingException", "(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)", "summary", "df-generated"]
       - ["System.Net.NetworkInformation", "PingException", "PingException", "(System.String)", "summary", "df-generated"]
diff --git a/csharp/ql/lib/ext/generated/System.Net.Quic.model.yml b/csharp/ql/lib/ext/generated/System.Net.Quic.model.yml
index 347883b19a3..a3c94722267 100644
--- a/csharp/ql/lib/ext/generated/System.Net.Quic.model.yml
+++ b/csharp/ql/lib/ext/generated/System.Net.Quic.model.yml
@@ -4,18 +4,17 @@ extensions:
       pack: codeql/csharp-all
       extensible: summaryModel
     data:
-      - ["System.Net.Quic", "QuicConnection", False, "CloseAsync", "(System.Int64,System.Threading.CancellationToken)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Net.Quic", "QuicConnection", False, "get_LocalEndPoint", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Net.Quic", "QuicConnection", False, "get_NegotiatedApplicationProtocol", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Net.Quic", "QuicConnection", False, "get_RemoteCertificate", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Net.Quic", "QuicConnection", False, "get_RemoteEndPoint", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Net.Quic", "QuicConnection", False, "get_TargetHostName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Net.Quic", "QuicListener", False, "ListenAsync", "(System.Net.Quic.QuicListenerOptions,System.Threading.CancellationToken)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
   - addsTo:
       pack: codeql/csharp-all
       extensible: neutralModel
     data:
       - ["System.Net.Quic", "QuicConnection", "AcceptInboundStreamAsync", "(System.Threading.CancellationToken)", "summary", "df-generated"]
+      - ["System.Net.Quic", "QuicConnection", "CloseAsync", "(System.Int64,System.Threading.CancellationToken)", "summary", "df-generated"]
       - ["System.Net.Quic", "QuicConnection", "ConnectAsync", "(System.Net.Quic.QuicClientConnectionOptions,System.Threading.CancellationToken)", "summary", "df-generated"]
       - ["System.Net.Quic", "QuicConnection", "OpenOutboundStreamAsync", "(System.Net.Quic.QuicStreamType,System.Threading.CancellationToken)", "summary", "df-generated"]
       - ["System.Net.Quic", "QuicConnection", "ToString", "()", "summary", "df-generated"]
@@ -25,6 +24,7 @@ extensions:
       - ["System.Net.Quic", "QuicException", "get_QuicError", "()", "summary", "df-generated"]
       - ["System.Net.Quic", "QuicException", "get_TransportErrorCode", "()", "summary", "df-generated"]
       - ["System.Net.Quic", "QuicListener", "AcceptConnectionAsync", "(System.Threading.CancellationToken)", "summary", "df-generated"]
+      - ["System.Net.Quic", "QuicListener", "ListenAsync", "(System.Net.Quic.QuicListenerOptions,System.Threading.CancellationToken)", "summary", "df-generated"]
       - ["System.Net.Quic", "QuicListener", "ToString", "()", "summary", "df-generated"]
       - ["System.Net.Quic", "QuicListener", "get_IsSupported", "()", "summary", "df-generated"]
       - ["System.Net.Quic", "QuicListener", "get_LocalEndPoint", "()", "summary", "df-generated"]
diff --git a/csharp/ql/lib/ext/generated/System.Net.Security.model.yml b/csharp/ql/lib/ext/generated/System.Net.Security.model.yml
index 95262dcc607..b052db90efa 100644
--- a/csharp/ql/lib/ext/generated/System.Net.Security.model.yml
+++ b/csharp/ql/lib/ext/generated/System.Net.Security.model.yml
@@ -4,8 +4,8 @@ extensions:
       pack: codeql/csharp-all
       extensible: summaryModel
     data:
-      - ["System.Net.Security", "AuthenticatedStream", False, "AuthenticatedStream", "(System.IO.Stream,System.Boolean)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Net.Security", "AuthenticatedStream", False, "get_InnerStream", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Net.Security", "AuthenticatedStream", False, "AuthenticatedStream", "(System.IO.Stream,System.Boolean)", "", "Argument[0]", "Argument[this].SyntheticField[System.Net.Security.AuthenticatedStream._innerStream]", "value", "dfc-generated"]
+      - ["System.Net.Security", "AuthenticatedStream", False, "get_InnerStream", "()", "", "Argument[this].SyntheticField[System.Net.Security.AuthenticatedStream._innerStream]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Net.Security", "NegotiateAuthentication", False, "GetOutgoingBlob", "(System.ReadOnlySpan<System.Byte>,System.Net.Security.NegotiateAuthenticationStatusCode)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Net.Security", "NegotiateAuthentication", False, "GetOutgoingBlob", "(System.String,System.Net.Security.NegotiateAuthenticationStatusCode)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Net.Security", "NegotiateAuthentication", False, "NegotiateAuthentication", "(System.Net.Security.NegotiateAuthenticationClientOptions)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
@@ -19,17 +19,19 @@ extensions:
       - ["System.Net.Security", "NegotiateStream", True, "AuthenticateAsServerAsync", "(System.Security.Authentication.ExtendedProtection.ExtendedProtectionPolicy)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Net.Security", "NegotiateStream", True, "get_RemoteIdentity", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Net.Security", "SslApplicationProtocol", False, "ToString", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Net.Security", "SslApplicationProtocol", False, "get_Protocol", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Net.Security", "SslCertificateTrust", False, "CreateForX509Collection", "(System.Security.Cryptography.X509Certificates.X509Certificate2Collection,System.Boolean)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
       - ["System.Net.Security", "SslCertificateTrust", False, "CreateForX509Store", "(System.Security.Cryptography.X509Certificates.X509Store,System.Boolean)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["System.Net.Security", "SslStream", False, "AuthenticateAsClient", "(System.Net.Security.SslClientAuthenticationOptions)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Net.Security", "SslStream", False, "AuthenticateAsClientAsync", "(System.Net.Security.SslClientAuthenticationOptions,System.Threading.CancellationToken)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["System.Net.Security", "SslStream", False, "AuthenticateAsClientAsync", "(System.Net.Security.SslClientAuthenticationOptions,System.Threading.CancellationToken)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
       - ["System.Net.Security", "SslStream", False, "AuthenticateAsServer", "(System.Net.Security.SslServerAuthenticationOptions)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Net.Security", "SslStream", False, "AuthenticateAsServerAsync", "(System.Net.Security.SslServerAuthenticationOptions,System.Threading.CancellationToken)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Net.Security", "SslStream", False, "Write", "(System.Byte[])", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
+      - ["System.Net.Security", "SslStream", False, "AuthenticateAsServerAsync", "(System.Net.Security.SslServerAuthenticationOptions,System.Threading.CancellationToken)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["System.Net.Security", "SslStream", False, "Write", "(System.Byte[])", "", "Argument[0].Element", "Argument[this]", "taint", "dfc-generated"]
       - ["System.Net.Security", "SslStream", False, "get_NegotiatedApplicationProtocol", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Net.Security", "SslStream", False, "get_TargetHostName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Net.Security", "SslStream", False, "get_TransportContext", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Net.Security", "SslStream", True, "NegotiateClientCertificateAsync", "(System.Threading.CancellationToken)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Net.Security", "SslStream", True, "get_LocalCertificate", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Net.Security", "SslStream", True, "get_RemoteCertificate", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Net.Security", "SslStreamCertificateContext", False, "Create", "(System.Security.Cryptography.X509Certificates.X509Certificate2,System.Security.Cryptography.X509Certificates.X509Certificate2Collection,System.Boolean,System.Net.Security.SslCertificateTrust)", "", "Argument[3]", "ReturnValue", "taint", "df-generated"]
@@ -71,6 +73,15 @@ extensions:
       - ["System.Net.Security", "NegotiateStream", "AuthenticateAsServer", "(System.Net.NetworkCredential,System.Net.Security.ProtectionLevel,System.Security.Principal.TokenImpersonationLevel)", "summary", "df-generated"]
       - ["System.Net.Security", "NegotiateStream", "AuthenticateAsServerAsync", "()", "summary", "df-generated"]
       - ["System.Net.Security", "NegotiateStream", "AuthenticateAsServerAsync", "(System.Net.NetworkCredential,System.Net.Security.ProtectionLevel,System.Security.Principal.TokenImpersonationLevel)", "summary", "df-generated"]
+      - ["System.Net.Security", "NegotiateStream", "BeginAuthenticateAsClient", "(System.AsyncCallback,System.Object)", "summary", "df-generated"]
+      - ["System.Net.Security", "NegotiateStream", "BeginAuthenticateAsClient", "(System.Net.NetworkCredential,System.Security.Authentication.ExtendedProtection.ChannelBinding,System.String,System.AsyncCallback,System.Object)", "summary", "df-generated"]
+      - ["System.Net.Security", "NegotiateStream", "BeginAuthenticateAsClient", "(System.Net.NetworkCredential,System.Security.Authentication.ExtendedProtection.ChannelBinding,System.String,System.Net.Security.ProtectionLevel,System.Security.Principal.TokenImpersonationLevel,System.AsyncCallback,System.Object)", "summary", "df-generated"]
+      - ["System.Net.Security", "NegotiateStream", "BeginAuthenticateAsClient", "(System.Net.NetworkCredential,System.String,System.AsyncCallback,System.Object)", "summary", "df-generated"]
+      - ["System.Net.Security", "NegotiateStream", "BeginAuthenticateAsClient", "(System.Net.NetworkCredential,System.String,System.Net.Security.ProtectionLevel,System.Security.Principal.TokenImpersonationLevel,System.AsyncCallback,System.Object)", "summary", "df-generated"]
+      - ["System.Net.Security", "NegotiateStream", "BeginAuthenticateAsServer", "(System.AsyncCallback,System.Object)", "summary", "df-generated"]
+      - ["System.Net.Security", "NegotiateStream", "BeginAuthenticateAsServer", "(System.Net.NetworkCredential,System.Net.Security.ProtectionLevel,System.Security.Principal.TokenImpersonationLevel,System.AsyncCallback,System.Object)", "summary", "df-generated"]
+      - ["System.Net.Security", "NegotiateStream", "BeginAuthenticateAsServer", "(System.Net.NetworkCredential,System.Security.Authentication.ExtendedProtection.ExtendedProtectionPolicy,System.Net.Security.ProtectionLevel,System.Security.Principal.TokenImpersonationLevel,System.AsyncCallback,System.Object)", "summary", "df-generated"]
+      - ["System.Net.Security", "NegotiateStream", "BeginAuthenticateAsServer", "(System.Security.Authentication.ExtendedProtection.ExtendedProtectionPolicy,System.AsyncCallback,System.Object)", "summary", "df-generated"]
       - ["System.Net.Security", "NegotiateStream", "Dispose", "(System.Boolean)", "summary", "df-generated"]
       - ["System.Net.Security", "NegotiateStream", "EndAuthenticateAsClient", "(System.IAsyncResult)", "summary", "df-generated"]
       - ["System.Net.Security", "NegotiateStream", "EndAuthenticateAsServer", "(System.IAsyncResult)", "summary", "df-generated"]
@@ -97,6 +108,7 @@ extensions:
       - ["System.Net.Security", "SslApplicationProtocol", "GetHashCode", "()", "summary", "df-generated"]
       - ["System.Net.Security", "SslApplicationProtocol", "SslApplicationProtocol", "(System.Byte[])", "summary", "df-generated"]
       - ["System.Net.Security", "SslApplicationProtocol", "SslApplicationProtocol", "(System.String)", "summary", "df-generated"]
+      - ["System.Net.Security", "SslApplicationProtocol", "get_Protocol", "()", "summary", "df-generated"]
       - ["System.Net.Security", "SslApplicationProtocol", "op_Equality", "(System.Net.Security.SslApplicationProtocol,System.Net.Security.SslApplicationProtocol)", "summary", "df-generated"]
       - ["System.Net.Security", "SslApplicationProtocol", "op_Inequality", "(System.Net.Security.SslApplicationProtocol,System.Net.Security.SslApplicationProtocol)", "summary", "df-generated"]
       - ["System.Net.Security", "SslClientHelloInfo", "SslClientHelloInfo", "(System.String,System.Security.Authentication.SslProtocols)", "summary", "df-generated"]
@@ -111,22 +123,31 @@ extensions:
       - ["System.Net.Security", "SslStream", "AuthenticateAsServer", "(System.Security.Cryptography.X509Certificates.X509Certificate)", "summary", "df-generated"]
       - ["System.Net.Security", "SslStream", "AuthenticateAsServer", "(System.Security.Cryptography.X509Certificates.X509Certificate,System.Boolean,System.Boolean)", "summary", "df-generated"]
       - ["System.Net.Security", "SslStream", "AuthenticateAsServer", "(System.Security.Cryptography.X509Certificates.X509Certificate,System.Boolean,System.Security.Authentication.SslProtocols,System.Boolean)", "summary", "df-generated"]
+      - ["System.Net.Security", "SslStream", "AuthenticateAsServerAsync", "(System.Net.Security.ServerOptionsSelectionCallback,System.Object,System.Threading.CancellationToken)", "summary", "df-generated"]
       - ["System.Net.Security", "SslStream", "AuthenticateAsServerAsync", "(System.Security.Cryptography.X509Certificates.X509Certificate)", "summary", "df-generated"]
       - ["System.Net.Security", "SslStream", "AuthenticateAsServerAsync", "(System.Security.Cryptography.X509Certificates.X509Certificate,System.Boolean,System.Boolean)", "summary", "df-generated"]
       - ["System.Net.Security", "SslStream", "AuthenticateAsServerAsync", "(System.Security.Cryptography.X509Certificates.X509Certificate,System.Boolean,System.Security.Authentication.SslProtocols,System.Boolean)", "summary", "df-generated"]
+      - ["System.Net.Security", "SslStream", "BeginAuthenticateAsClient", "(System.String,System.AsyncCallback,System.Object)", "summary", "df-generated"]
+      - ["System.Net.Security", "SslStream", "BeginAuthenticateAsClient", "(System.String,System.Security.Cryptography.X509Certificates.X509CertificateCollection,System.Boolean,System.AsyncCallback,System.Object)", "summary", "df-generated"]
+      - ["System.Net.Security", "SslStream", "BeginAuthenticateAsClient", "(System.String,System.Security.Cryptography.X509Certificates.X509CertificateCollection,System.Security.Authentication.SslProtocols,System.Boolean,System.AsyncCallback,System.Object)", "summary", "df-generated"]
+      - ["System.Net.Security", "SslStream", "BeginAuthenticateAsServer", "(System.Security.Cryptography.X509Certificates.X509Certificate,System.AsyncCallback,System.Object)", "summary", "df-generated"]
+      - ["System.Net.Security", "SslStream", "BeginAuthenticateAsServer", "(System.Security.Cryptography.X509Certificates.X509Certificate,System.Boolean,System.Boolean,System.AsyncCallback,System.Object)", "summary", "df-generated"]
+      - ["System.Net.Security", "SslStream", "BeginAuthenticateAsServer", "(System.Security.Cryptography.X509Certificates.X509Certificate,System.Boolean,System.Security.Authentication.SslProtocols,System.Boolean,System.AsyncCallback,System.Object)", "summary", "df-generated"]
       - ["System.Net.Security", "SslStream", "Dispose", "(System.Boolean)", "summary", "df-generated"]
       - ["System.Net.Security", "SslStream", "EndAuthenticateAsClient", "(System.IAsyncResult)", "summary", "df-generated"]
       - ["System.Net.Security", "SslStream", "EndAuthenticateAsServer", "(System.IAsyncResult)", "summary", "df-generated"]
       - ["System.Net.Security", "SslStream", "EndRead", "(System.IAsyncResult)", "summary", "df-generated"]
       - ["System.Net.Security", "SslStream", "EndWrite", "(System.IAsyncResult)", "summary", "df-generated"]
       - ["System.Net.Security", "SslStream", "Flush", "()", "summary", "df-generated"]
-      - ["System.Net.Security", "SslStream", "NegotiateClientCertificateAsync", "(System.Threading.CancellationToken)", "summary", "df-generated"]
       - ["System.Net.Security", "SslStream", "ReadByte", "()", "summary", "df-generated"]
       - ["System.Net.Security", "SslStream", "Seek", "(System.Int64,System.IO.SeekOrigin)", "summary", "df-generated"]
       - ["System.Net.Security", "SslStream", "SetLength", "(System.Int64)", "summary", "df-generated"]
       - ["System.Net.Security", "SslStream", "ShutdownAsync", "()", "summary", "df-generated"]
       - ["System.Net.Security", "SslStream", "SslStream", "(System.IO.Stream)", "summary", "df-generated"]
       - ["System.Net.Security", "SslStream", "SslStream", "(System.IO.Stream,System.Boolean)", "summary", "df-generated"]
+      - ["System.Net.Security", "SslStream", "SslStream", "(System.IO.Stream,System.Boolean,System.Net.Security.RemoteCertificateValidationCallback)", "summary", "df-generated"]
+      - ["System.Net.Security", "SslStream", "SslStream", "(System.IO.Stream,System.Boolean,System.Net.Security.RemoteCertificateValidationCallback,System.Net.Security.LocalCertificateSelectionCallback)", "summary", "df-generated"]
+      - ["System.Net.Security", "SslStream", "SslStream", "(System.IO.Stream,System.Boolean,System.Net.Security.RemoteCertificateValidationCallback,System.Net.Security.LocalCertificateSelectionCallback,System.Net.Security.EncryptionPolicy)", "summary", "df-generated"]
       - ["System.Net.Security", "SslStream", "Write", "(System.ReadOnlySpan<System.Byte>)", "summary", "df-generated"]
       - ["System.Net.Security", "SslStream", "WriteByte", "(System.Byte)", "summary", "df-generated"]
       - ["System.Net.Security", "SslStream", "get_CanRead", "()", "summary", "df-generated"]
diff --git a/csharp/ql/lib/ext/generated/System.Net.Sockets.model.yml b/csharp/ql/lib/ext/generated/System.Net.Sockets.model.yml
index dac3f6a70c5..ce05b06a782 100644
--- a/csharp/ql/lib/ext/generated/System.Net.Sockets.model.yml
+++ b/csharp/ql/lib/ext/generated/System.Net.Sockets.model.yml
@@ -11,88 +11,33 @@ extensions:
       - ["System.Net.Sockets", "MulticastOption", False, "MulticastOption", "(System.Net.IPAddress,System.Int32)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Net.Sockets", "MulticastOption", False, "MulticastOption", "(System.Net.IPAddress,System.Net.IPAddress)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Net.Sockets", "MulticastOption", False, "MulticastOption", "(System.Net.IPAddress,System.Net.IPAddress)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Net.Sockets", "NetworkStream", False, "NetworkStream", "(System.Net.Sockets.Socket,System.IO.FileAccess,System.Boolean)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Net.Sockets", "NetworkStream", False, "get_Socket", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Net.Sockets", "SafeSocketHandle", False, "SafeSocketHandle", "(System.IntPtr,System.Boolean)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["System.Net.Sockets", "NetworkStream", False, "NetworkStream", "(System.Net.Sockets.Socket,System.IO.FileAccess,System.Boolean)", "", "Argument[0]", "Argument[this].SyntheticField[System.Net.Sockets.NetworkStream._streamSocket]", "value", "dfc-generated"]
+      - ["System.Net.Sockets", "NetworkStream", False, "get_Socket", "()", "", "Argument[this].SyntheticField[System.Net.Sockets.NetworkStream._streamSocket]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Net.Sockets", "Socket", False, "Accept", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Net.Sockets", "Socket", False, "AcceptAsync", "(System.Net.Sockets.Socket)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Net.Sockets", "Socket", False, "AcceptAsync", "(System.Net.Sockets.Socket,System.Threading.CancellationToken)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Net.Sockets", "Socket", False, "AcceptAsync", "(System.Net.Sockets.Socket,System.Threading.CancellationToken)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Net.Sockets", "Socket", False, "AcceptAsync", "(System.Net.Sockets.Socket,System.Threading.CancellationToken)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Net.Sockets", "Socket", False, "AcceptAsync", "(System.Net.Sockets.SocketAsyncEventArgs)", "", "Argument[this]", "Argument[0]", "taint", "df-generated"]
-      - ["System.Net.Sockets", "Socket", False, "AcceptAsync", "(System.Threading.CancellationToken)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Net.Sockets", "Socket", False, "AcceptAsync", "(System.Threading.CancellationToken)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Net.Sockets", "Socket", False, "BeginReceiveFrom", "(System.Byte[],System.Int32,System.Int32,System.Net.Sockets.SocketFlags,System.Net.EndPoint,System.AsyncCallback,System.Object)", "", "Argument[4]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Net.Sockets", "Socket", False, "BeginReceiveMessageFrom", "(System.Byte[],System.Int32,System.Int32,System.Net.Sockets.SocketFlags,System.Net.EndPoint,System.AsyncCallback,System.Object)", "", "Argument[4]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Net.Sockets", "Socket", False, "Bind", "(System.Net.EndPoint)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Net.Sockets", "Socket", False, "Connect", "(System.Net.EndPoint)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Net.Sockets", "Socket", False, "Connect", "(System.Net.IPAddress,System.Int32)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Net.Sockets", "Socket", False, "Connect", "(System.Net.IPAddress[],System.Int32)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
       - ["System.Net.Sockets", "Socket", False, "ConnectAsync", "(System.Net.EndPoint)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Net.Sockets", "Socket", False, "ConnectAsync", "(System.Net.EndPoint,System.Threading.CancellationToken)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Net.Sockets", "Socket", False, "ConnectAsync", "(System.Net.EndPoint,System.Threading.CancellationToken)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Net.Sockets", "Socket", False, "ConnectAsync", "(System.Net.EndPoint,System.Threading.CancellationToken)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Net.Sockets", "Socket", False, "ConnectAsync", "(System.Net.IPAddress,System.Int32)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Net.Sockets", "Socket", False, "ConnectAsync", "(System.Net.IPAddress,System.Int32,System.Threading.CancellationToken)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Net.Sockets", "Socket", False, "ConnectAsync", "(System.Net.IPAddress,System.Int32,System.Threading.CancellationToken)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Net.Sockets", "Socket", False, "ConnectAsync", "(System.Net.Sockets.SocketAsyncEventArgs)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Net.Sockets", "Socket", False, "ConnectAsync", "(System.Net.Sockets.SocketAsyncEventArgs)", "", "Argument[this]", "Argument[0]", "taint", "df-generated"]
-      - ["System.Net.Sockets", "Socket", False, "ConnectAsync", "(System.String,System.Int32,System.Threading.CancellationToken)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Net.Sockets", "Socket", False, "DisconnectAsync", "(System.Boolean,System.Threading.CancellationToken)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Net.Sockets", "Socket", False, "DisconnectAsync", "(System.Boolean,System.Threading.CancellationToken)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Net.Sockets", "Socket", False, "DisconnectAsync", "(System.Net.Sockets.SocketAsyncEventArgs)", "", "Argument[this]", "Argument[0]", "taint", "df-generated"]
-      - ["System.Net.Sockets", "Socket", False, "ReceiveAsync", "(System.Memory<System.Byte>,System.Net.Sockets.SocketFlags,System.Threading.CancellationToken)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Net.Sockets", "Socket", False, "ReceiveAsync", "(System.Memory<System.Byte>,System.Net.Sockets.SocketFlags,System.Threading.CancellationToken)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Net.Sockets", "Socket", False, "ReceiveAsync", "(System.Memory<System.Byte>,System.Net.Sockets.SocketFlags,System.Threading.CancellationToken)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Net.Sockets", "Socket", False, "ReceiveAsync", "(System.Memory<System.Byte>,System.Threading.CancellationToken)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Net.Sockets", "Socket", False, "ReceiveAsync", "(System.Memory<System.Byte>,System.Threading.CancellationToken)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Net.Sockets", "Socket", False, "ReceiveAsync", "(System.Memory<System.Byte>,System.Threading.CancellationToken)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Net.Sockets", "Socket", False, "EndReceiveFrom", "(System.IAsyncResult,System.Net.EndPoint)", "", "Argument[1]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Net.Sockets", "Socket", False, "EndReceiveMessageFrom", "(System.IAsyncResult,System.Net.Sockets.SocketFlags,System.Net.EndPoint,System.Net.Sockets.IPPacketInformation)", "", "Argument[2]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Net.Sockets", "Socket", False, "ReceiveAsync", "(System.Net.Sockets.SocketAsyncEventArgs)", "", "Argument[this]", "Argument[0]", "taint", "df-generated"]
-      - ["System.Net.Sockets", "Socket", False, "ReceiveFrom", "(System.Byte[],System.Int32,System.Int32,System.Net.Sockets.SocketFlags,System.Net.EndPoint)", "", "Argument[4]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Net.Sockets", "Socket", False, "ReceiveFrom", "(System.Byte[],System.Int32,System.Net.Sockets.SocketFlags,System.Net.EndPoint)", "", "Argument[3]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Net.Sockets", "Socket", False, "ReceiveFrom", "(System.Byte[],System.Int32,System.Net.Sockets.SocketFlags,System.Net.EndPoint)", "", "Argument[3]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Net.Sockets", "Socket", False, "ReceiveFrom", "(System.Byte[],System.Net.EndPoint)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Net.Sockets", "Socket", False, "ReceiveFrom", "(System.Byte[],System.Net.EndPoint)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Net.Sockets", "Socket", False, "ReceiveFrom", "(System.Byte[],System.Net.Sockets.SocketFlags,System.Net.EndPoint)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Net.Sockets", "Socket", False, "ReceiveFrom", "(System.Byte[],System.Net.Sockets.SocketFlags,System.Net.EndPoint)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Net.Sockets", "Socket", False, "ReceiveFrom", "(System.Span<System.Byte>,System.Net.EndPoint)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Net.Sockets", "Socket", False, "ReceiveFrom", "(System.Span<System.Byte>,System.Net.EndPoint)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Net.Sockets", "Socket", False, "ReceiveFrom", "(System.Span<System.Byte>,System.Net.Sockets.SocketFlags,System.Net.EndPoint)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Net.Sockets", "Socket", False, "ReceiveFromAsync", "(System.ArraySegment<System.Byte>,System.Net.EndPoint)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Net.Sockets", "Socket", False, "ReceiveFromAsync", "(System.ArraySegment<System.Byte>,System.Net.Sockets.SocketFlags,System.Net.EndPoint)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Net.Sockets", "Socket", False, "ReceiveFromAsync", "(System.Memory<System.Byte>,System.Net.EndPoint,System.Threading.CancellationToken)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Net.Sockets", "Socket", False, "ReceiveFromAsync", "(System.Memory<System.Byte>,System.Net.EndPoint,System.Threading.CancellationToken)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Net.Sockets", "Socket", False, "ReceiveFromAsync", "(System.Memory<System.Byte>,System.Net.EndPoint,System.Threading.CancellationToken)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Net.Sockets", "Socket", False, "ReceiveFromAsync", "(System.Memory<System.Byte>,System.Net.EndPoint,System.Threading.CancellationToken)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Net.Sockets", "Socket", False, "ReceiveFromAsync", "(System.Memory<System.Byte>,System.Net.Sockets.SocketFlags,System.Net.EndPoint,System.Threading.CancellationToken)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Net.Sockets", "Socket", False, "ReceiveFromAsync", "(System.Memory<System.Byte>,System.Net.Sockets.SocketFlags,System.Net.EndPoint,System.Threading.CancellationToken)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Net.Sockets", "Socket", False, "ReceiveFromAsync", "(System.Memory<System.Byte>,System.Net.Sockets.SocketFlags,System.Net.EndPoint,System.Threading.CancellationToken)", "", "Argument[3]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Net.Sockets", "Socket", False, "ReceiveFromAsync", "(System.Memory<System.Byte>,System.Net.Sockets.SocketFlags,System.Net.EndPoint,System.Threading.CancellationToken)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Net.Sockets", "Socket", False, "ReceiveFromAsync", "(System.Memory<System.Byte>,System.Net.Sockets.SocketFlags,System.Net.SocketAddress,System.Threading.CancellationToken)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Net.Sockets", "Socket", False, "ReceiveFromAsync", "(System.Memory<System.Byte>,System.Net.Sockets.SocketFlags,System.Net.SocketAddress,System.Threading.CancellationToken)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Net.Sockets", "Socket", False, "ReceiveFromAsync", "(System.Memory<System.Byte>,System.Net.Sockets.SocketFlags,System.Net.SocketAddress,System.Threading.CancellationToken)", "", "Argument[3]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Net.Sockets", "Socket", False, "ReceiveFromAsync", "(System.Memory<System.Byte>,System.Net.Sockets.SocketFlags,System.Net.SocketAddress,System.Threading.CancellationToken)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Net.Sockets", "Socket", False, "ReceiveFrom", "(System.Byte[],System.Int32,System.Int32,System.Net.Sockets.SocketFlags,System.Net.EndPoint)", "", "Argument[4]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Net.Sockets", "Socket", False, "ReceiveFrom", "(System.Byte[],System.Int32,System.Net.Sockets.SocketFlags,System.Net.EndPoint)", "", "Argument[3]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Net.Sockets", "Socket", False, "ReceiveFrom", "(System.Byte[],System.Net.EndPoint)", "", "Argument[1]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Net.Sockets", "Socket", False, "ReceiveFrom", "(System.Byte[],System.Net.Sockets.SocketFlags,System.Net.EndPoint)", "", "Argument[2]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Net.Sockets", "Socket", False, "ReceiveFrom", "(System.Span<System.Byte>,System.Net.EndPoint)", "", "Argument[1]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Net.Sockets", "Socket", False, "ReceiveFrom", "(System.Span<System.Byte>,System.Net.Sockets.SocketFlags,System.Net.EndPoint)", "", "Argument[2]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Net.Sockets", "Socket", False, "ReceiveFromAsync", "(System.Net.Sockets.SocketAsyncEventArgs)", "", "Argument[this]", "Argument[0]", "taint", "df-generated"]
-      - ["System.Net.Sockets", "Socket", False, "ReceiveMessageFrom", "(System.Byte[],System.Int32,System.Int32,System.Net.Sockets.SocketFlags,System.Net.EndPoint,System.Net.Sockets.IPPacketInformation)", "", "Argument[4]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Net.Sockets", "Socket", False, "ReceiveMessageFrom", "(System.Span<System.Byte>,System.Net.Sockets.SocketFlags,System.Net.EndPoint,System.Net.Sockets.IPPacketInformation)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Net.Sockets", "Socket", False, "ReceiveMessageFromAsync", "(System.ArraySegment<System.Byte>,System.Net.EndPoint)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Net.Sockets", "Socket", False, "ReceiveMessageFromAsync", "(System.ArraySegment<System.Byte>,System.Net.Sockets.SocketFlags,System.Net.EndPoint)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Net.Sockets", "Socket", False, "ReceiveMessageFromAsync", "(System.Memory<System.Byte>,System.Net.EndPoint,System.Threading.CancellationToken)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Net.Sockets", "Socket", False, "ReceiveMessageFromAsync", "(System.Memory<System.Byte>,System.Net.EndPoint,System.Threading.CancellationToken)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Net.Sockets", "Socket", False, "ReceiveMessageFromAsync", "(System.Memory<System.Byte>,System.Net.EndPoint,System.Threading.CancellationToken)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Net.Sockets", "Socket", False, "ReceiveMessageFromAsync", "(System.Memory<System.Byte>,System.Net.EndPoint,System.Threading.CancellationToken)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Net.Sockets", "Socket", False, "ReceiveMessageFromAsync", "(System.Memory<System.Byte>,System.Net.Sockets.SocketFlags,System.Net.EndPoint,System.Threading.CancellationToken)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Net.Sockets", "Socket", False, "ReceiveMessageFromAsync", "(System.Memory<System.Byte>,System.Net.Sockets.SocketFlags,System.Net.EndPoint,System.Threading.CancellationToken)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Net.Sockets", "Socket", False, "ReceiveMessageFromAsync", "(System.Memory<System.Byte>,System.Net.Sockets.SocketFlags,System.Net.EndPoint,System.Threading.CancellationToken)", "", "Argument[3]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Net.Sockets", "Socket", False, "ReceiveMessageFromAsync", "(System.Memory<System.Byte>,System.Net.Sockets.SocketFlags,System.Net.EndPoint,System.Threading.CancellationToken)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Net.Sockets", "Socket", False, "ReceiveMessageFrom", "(System.Byte[],System.Int32,System.Int32,System.Net.Sockets.SocketFlags,System.Net.EndPoint,System.Net.Sockets.IPPacketInformation)", "", "Argument[4]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Net.Sockets", "Socket", False, "ReceiveMessageFrom", "(System.Span<System.Byte>,System.Net.Sockets.SocketFlags,System.Net.EndPoint,System.Net.Sockets.IPPacketInformation)", "", "Argument[2]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Net.Sockets", "Socket", False, "ReceiveMessageFromAsync", "(System.Net.Sockets.SocketAsyncEventArgs)", "", "Argument[this]", "Argument[0]", "taint", "df-generated"]
       - ["System.Net.Sockets", "Socket", False, "SendAsync", "(System.Net.Sockets.SocketAsyncEventArgs)", "", "Argument[this]", "Argument[0]", "taint", "df-generated"]
-      - ["System.Net.Sockets", "Socket", False, "SendAsync", "(System.ReadOnlyMemory<System.Byte>,System.Net.Sockets.SocketFlags,System.Threading.CancellationToken)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Net.Sockets", "Socket", False, "SendAsync", "(System.ReadOnlyMemory<System.Byte>,System.Net.Sockets.SocketFlags,System.Threading.CancellationToken)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Net.Sockets", "Socket", False, "SendAsync", "(System.ReadOnlyMemory<System.Byte>,System.Threading.CancellationToken)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Net.Sockets", "Socket", False, "SendAsync", "(System.ReadOnlyMemory<System.Byte>,System.Threading.CancellationToken)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Net.Sockets", "Socket", False, "SendFileAsync", "(System.String,System.ReadOnlyMemory<System.Byte>,System.ReadOnlyMemory<System.Byte>,System.Net.Sockets.TransmitFileOptions,System.Threading.CancellationToken)", "", "Argument[4]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Net.Sockets", "Socket", False, "SendFileAsync", "(System.String,System.ReadOnlyMemory<System.Byte>,System.ReadOnlyMemory<System.Byte>,System.Net.Sockets.TransmitFileOptions,System.Threading.CancellationToken)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Net.Sockets", "Socket", False, "SendFileAsync", "(System.String,System.Threading.CancellationToken)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Net.Sockets", "Socket", False, "SendFileAsync", "(System.String,System.Threading.CancellationToken)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Net.Sockets", "Socket", False, "SendPacketsAsync", "(System.Net.Sockets.SocketAsyncEventArgs)", "", "Argument[this]", "Argument[0]", "taint", "df-generated"]
       - ["System.Net.Sockets", "Socket", False, "SendTo", "(System.Byte[],System.Int32,System.Int32,System.Net.Sockets.SocketFlags,System.Net.EndPoint)", "", "Argument[4]", "Argument[this]", "taint", "df-generated"]
       - ["System.Net.Sockets", "Socket", False, "SendTo", "(System.Byte[],System.Int32,System.Net.Sockets.SocketFlags,System.Net.EndPoint)", "", "Argument[3]", "Argument[this]", "taint", "df-generated"]
@@ -105,54 +50,27 @@ extensions:
       - ["System.Net.Sockets", "Socket", False, "SendToAsync", "(System.Net.Sockets.SocketAsyncEventArgs)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Net.Sockets", "Socket", False, "SendToAsync", "(System.Net.Sockets.SocketAsyncEventArgs)", "", "Argument[this]", "Argument[0]", "taint", "df-generated"]
       - ["System.Net.Sockets", "Socket", False, "SendToAsync", "(System.ReadOnlyMemory<System.Byte>,System.Net.EndPoint,System.Threading.CancellationToken)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Net.Sockets", "Socket", False, "SendToAsync", "(System.ReadOnlyMemory<System.Byte>,System.Net.EndPoint,System.Threading.CancellationToken)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Net.Sockets", "Socket", False, "SendToAsync", "(System.ReadOnlyMemory<System.Byte>,System.Net.EndPoint,System.Threading.CancellationToken)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Net.Sockets", "Socket", False, "SendToAsync", "(System.ReadOnlyMemory<System.Byte>,System.Net.EndPoint,System.Threading.CancellationToken)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Net.Sockets", "Socket", False, "SendToAsync", "(System.ReadOnlyMemory<System.Byte>,System.Net.Sockets.SocketFlags,System.Net.EndPoint,System.Threading.CancellationToken)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Net.Sockets", "Socket", False, "SendToAsync", "(System.ReadOnlyMemory<System.Byte>,System.Net.Sockets.SocketFlags,System.Net.EndPoint,System.Threading.CancellationToken)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Net.Sockets", "Socket", False, "SendToAsync", "(System.ReadOnlyMemory<System.Byte>,System.Net.Sockets.SocketFlags,System.Net.EndPoint,System.Threading.CancellationToken)", "", "Argument[3]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Net.Sockets", "Socket", False, "SendToAsync", "(System.ReadOnlyMemory<System.Byte>,System.Net.Sockets.SocketFlags,System.Net.EndPoint,System.Threading.CancellationToken)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Net.Sockets", "Socket", False, "SendToAsync", "(System.ReadOnlyMemory<System.Byte>,System.Net.Sockets.SocketFlags,System.Net.SocketAddress,System.Threading.CancellationToken)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Net.Sockets", "Socket", False, "SendToAsync", "(System.ReadOnlyMemory<System.Byte>,System.Net.Sockets.SocketFlags,System.Net.SocketAddress,System.Threading.CancellationToken)", "", "Argument[3]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Net.Sockets", "Socket", False, "SendToAsync", "(System.ReadOnlyMemory<System.Byte>,System.Net.Sockets.SocketFlags,System.Net.SocketAddress,System.Threading.CancellationToken)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Net.Sockets", "Socket", False, "get_Handle", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Net.Sockets", "Socket", False, "get_LocalEndPoint", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Net.Sockets", "Socket", False, "get_RemoteEndPoint", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Net.Sockets", "Socket", False, "get_SafeHandle", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Net.Sockets", "SocketAsyncEventArgs", False, "SetBuffer", "(System.Byte[],System.Int32,System.Int32)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["System.Net.Sockets", "SocketAsyncEventArgs", False, "SetBuffer", "(System.Memory<System.Byte>)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["System.Net.Sockets", "SocketAsyncEventArgs", False, "SetBuffer", "(System.Memory<System.Byte>)", "", "Argument[0]", "Argument[this].SyntheticField[System.Net.Sockets.SocketAsyncEventArgs._buffer]", "value", "dfc-generated"]
       - ["System.Net.Sockets", "SocketAsyncEventArgs", False, "get_ConnectByNameError", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Net.Sockets", "SocketAsyncEventArgs", False, "get_ConnectSocket", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Net.Sockets", "SocketAsyncEventArgs", False, "get_MemoryBuffer", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Net.Sockets", "SocketAsyncEventArgs", False, "get_MemoryBuffer", "()", "", "Argument[this].SyntheticField[System.Net.Sockets.SocketAsyncEventArgs._buffer]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Net.Sockets", "SocketAsyncEventArgs", False, "get_ReceiveMessageFromPacketInfo", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Net.Sockets", "SocketTaskExtensions", False, "AcceptAsync", "(System.Net.Sockets.Socket,System.Net.Sockets.Socket)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Net.Sockets", "SocketException", True, "get_Message", "()", "", "Argument[this].Property[System.Exception.Message]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Net.Sockets", "SocketTaskExtensions", False, "ConnectAsync", "(System.Net.Sockets.Socket,System.Net.EndPoint)", "", "Argument[1]", "Argument[0]", "taint", "df-generated"]
-      - ["System.Net.Sockets", "SocketTaskExtensions", False, "ConnectAsync", "(System.Net.Sockets.Socket,System.Net.EndPoint,System.Threading.CancellationToken)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["System.Net.Sockets", "SocketTaskExtensions", False, "ConnectAsync", "(System.Net.Sockets.Socket,System.Net.EndPoint,System.Threading.CancellationToken)", "", "Argument[1]", "Argument[0]", "taint", "df-generated"]
-      - ["System.Net.Sockets", "SocketTaskExtensions", False, "ConnectAsync", "(System.Net.Sockets.Socket,System.Net.EndPoint,System.Threading.CancellationToken)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Net.Sockets", "SocketTaskExtensions", False, "ConnectAsync", "(System.Net.Sockets.Socket,System.Net.IPAddress,System.Int32)", "", "Argument[1]", "Argument[0]", "taint", "df-generated"]
-      - ["System.Net.Sockets", "SocketTaskExtensions", False, "ConnectAsync", "(System.Net.Sockets.Socket,System.Net.IPAddress,System.Int32,System.Threading.CancellationToken)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Net.Sockets", "SocketTaskExtensions", False, "ConnectAsync", "(System.Net.Sockets.Socket,System.Net.IPAddress,System.Int32,System.Threading.CancellationToken)", "", "Argument[1]", "Argument[0]", "taint", "df-generated"]
-      - ["System.Net.Sockets", "SocketTaskExtensions", False, "ConnectAsync", "(System.Net.Sockets.Socket,System.String,System.Int32,System.Threading.CancellationToken)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Net.Sockets", "SocketTaskExtensions", False, "ReceiveAsync", "(System.Net.Sockets.Socket,System.Memory<System.Byte>,System.Net.Sockets.SocketFlags,System.Threading.CancellationToken)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Net.Sockets", "SocketTaskExtensions", False, "ReceiveAsync", "(System.Net.Sockets.Socket,System.Memory<System.Byte>,System.Net.Sockets.SocketFlags,System.Threading.CancellationToken)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Net.Sockets", "SocketTaskExtensions", False, "ReceiveAsync", "(System.Net.Sockets.Socket,System.Memory<System.Byte>,System.Net.Sockets.SocketFlags,System.Threading.CancellationToken)", "", "Argument[3]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Net.Sockets", "SocketTaskExtensions", False, "ReceiveFromAsync", "(System.Net.Sockets.Socket,System.ArraySegment<System.Byte>,System.Net.Sockets.SocketFlags,System.Net.EndPoint)", "", "Argument[3]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Net.Sockets", "SocketTaskExtensions", False, "ReceiveMessageFromAsync", "(System.Net.Sockets.Socket,System.ArraySegment<System.Byte>,System.Net.Sockets.SocketFlags,System.Net.EndPoint)", "", "Argument[3]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Net.Sockets", "SocketTaskExtensions", False, "SendAsync", "(System.Net.Sockets.Socket,System.ReadOnlyMemory<System.Byte>,System.Net.Sockets.SocketFlags,System.Threading.CancellationToken)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Net.Sockets", "SocketTaskExtensions", False, "SendAsync", "(System.Net.Sockets.Socket,System.ReadOnlyMemory<System.Byte>,System.Net.Sockets.SocketFlags,System.Threading.CancellationToken)", "", "Argument[3]", "ReturnValue", "taint", "df-generated"]
       - ["System.Net.Sockets", "SocketTaskExtensions", False, "SendToAsync", "(System.Net.Sockets.Socket,System.ArraySegment<System.Byte>,System.Net.Sockets.SocketFlags,System.Net.EndPoint)", "", "Argument[3]", "Argument[0]", "taint", "df-generated"]
       - ["System.Net.Sockets", "TcpClient", False, "Connect", "(System.Net.IPEndPoint)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Net.Sockets", "TcpClient", False, "ConnectAsync", "(System.Net.IPEndPoint)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Net.Sockets", "TcpClient", False, "ConnectAsync", "(System.Net.IPEndPoint,System.Threading.CancellationToken)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Net.Sockets", "TcpClient", False, "TcpClient", "(System.Net.IPEndPoint)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Net.Sockets", "TcpListener", False, "AcceptSocket", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Net.Sockets", "TcpListener", False, "AcceptSocketAsync", "(System.Threading.CancellationToken)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Net.Sockets", "TcpListener", False, "AcceptSocketAsync", "(System.Threading.CancellationToken)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Net.Sockets", "TcpListener", False, "AcceptTcpClient", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Net.Sockets", "TcpListener", False, "TcpListener", "(System.Net.IPAddress,System.Int32)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Net.Sockets", "TcpListener", False, "TcpListener", "(System.Net.IPEndPoint)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Net.Sockets", "TcpListener", False, "get_LocalEndpoint", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Net.Sockets", "TcpListener", False, "TcpListener", "(System.Net.IPEndPoint)", "", "Argument[0]", "Argument[this].SyntheticField[System.Net.Sockets.TcpListener._serverSocketEP]", "value", "dfc-generated"]
+      - ["System.Net.Sockets", "TcpListener", False, "get_LocalEndpoint", "()", "", "Argument[this].SyntheticField[System.Net.Sockets.TcpListener._serverSocketEP]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Net.Sockets", "TcpListener", False, "get_Server", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Net.Sockets", "UdpClient", False, "Connect", "(System.Net.IPEndPoint)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Net.Sockets", "UdpClient", False, "EndReceive", "(System.IAsyncResult,System.Net.IPEndPoint)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
@@ -161,18 +79,11 @@ extensions:
       - ["System.Net.Sockets", "UdpClient", False, "Send", "(System.ReadOnlySpan<System.Byte>,System.Net.IPEndPoint)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
       - ["System.Net.Sockets", "UdpClient", False, "SendAsync", "(System.Byte[],System.Int32,System.Net.IPEndPoint)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
       - ["System.Net.Sockets", "UdpClient", False, "SendAsync", "(System.ReadOnlyMemory<System.Byte>,System.Net.IPEndPoint,System.Threading.CancellationToken)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Net.Sockets", "UdpClient", False, "SendAsync", "(System.ReadOnlyMemory<System.Byte>,System.Net.IPEndPoint,System.Threading.CancellationToken)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Net.Sockets", "UdpClient", False, "SendAsync", "(System.ReadOnlyMemory<System.Byte>,System.Net.IPEndPoint,System.Threading.CancellationToken)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Net.Sockets", "UdpClient", False, "SendAsync", "(System.ReadOnlyMemory<System.Byte>,System.Net.IPEndPoint,System.Threading.CancellationToken)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Net.Sockets", "UdpClient", False, "SendAsync", "(System.ReadOnlyMemory<System.Byte>,System.String,System.Int32,System.Threading.CancellationToken)", "", "Argument[3]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Net.Sockets", "UdpClient", False, "SendAsync", "(System.ReadOnlyMemory<System.Byte>,System.String,System.Int32,System.Threading.CancellationToken)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Net.Sockets", "UdpClient", False, "SendAsync", "(System.ReadOnlyMemory<System.Byte>,System.Threading.CancellationToken)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Net.Sockets", "UdpClient", False, "SendAsync", "(System.ReadOnlyMemory<System.Byte>,System.Threading.CancellationToken)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Net.Sockets", "UdpClient", False, "UdpClient", "(System.Net.IPEndPoint)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Net.Sockets", "UdpReceiveResult", False, "UdpReceiveResult", "(System.Byte[],System.Net.IPEndPoint)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["System.Net.Sockets", "UdpReceiveResult", False, "UdpReceiveResult", "(System.Byte[],System.Net.IPEndPoint)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Net.Sockets", "UdpReceiveResult", False, "get_Buffer", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Net.Sockets", "UdpReceiveResult", False, "get_RemoteEndPoint", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Net.Sockets", "UdpReceiveResult", False, "UdpReceiveResult", "(System.Byte[],System.Net.IPEndPoint)", "", "Argument[0]", "Argument[this].SyntheticField[System.Net.Sockets.UdpReceiveResult._buffer]", "value", "dfc-generated"]
+      - ["System.Net.Sockets", "UdpReceiveResult", False, "UdpReceiveResult", "(System.Byte[],System.Net.IPEndPoint)", "", "Argument[1]", "Argument[this].SyntheticField[System.Net.Sockets.UdpReceiveResult._remoteEndPoint]", "value", "dfc-generated"]
+      - ["System.Net.Sockets", "UdpReceiveResult", False, "get_Buffer", "()", "", "Argument[this].SyntheticField[System.Net.Sockets.UdpReceiveResult._buffer]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Net.Sockets", "UdpReceiveResult", False, "get_RemoteEndPoint", "()", "", "Argument[this].SyntheticField[System.Net.Sockets.UdpReceiveResult._remoteEndPoint]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Net.Sockets", "UnixDomainSocketEndPoint", False, "ToString", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
   - addsTo:
       pack: codeql/csharp-all
@@ -208,6 +119,7 @@ extensions:
       - ["System.Net.Sockets", "NetworkStream", "get_DataAvailable", "()", "summary", "df-generated"]
       - ["System.Net.Sockets", "NetworkStream", "get_Length", "()", "summary", "df-generated"]
       - ["System.Net.Sockets", "SafeSocketHandle", "ReleaseHandle", "()", "summary", "df-generated"]
+      - ["System.Net.Sockets", "SafeSocketHandle", "SafeSocketHandle", "(System.IntPtr,System.Boolean)", "summary", "df-generated"]
       - ["System.Net.Sockets", "SafeSocketHandle", "get_IsInvalid", "()", "summary", "df-generated"]
       - ["System.Net.Sockets", "SendPacketsElement", "SendPacketsElement", "(System.Byte[])", "summary", "df-generated"]
       - ["System.Net.Sockets", "SendPacketsElement", "SendPacketsElement", "(System.Byte[],System.Int32,System.Int32)", "summary", "df-generated"]
@@ -224,15 +136,43 @@ extensions:
       - ["System.Net.Sockets", "SendPacketsElement", "SendPacketsElement", "(System.String,System.Int64,System.Int32,System.Boolean)", "summary", "df-generated"]
       - ["System.Net.Sockets", "SendPacketsElement", "get_Offset", "()", "summary", "df-generated"]
       - ["System.Net.Sockets", "Socket", "AcceptAsync", "()", "summary", "df-generated"]
+      - ["System.Net.Sockets", "Socket", "AcceptAsync", "(System.Net.Sockets.Socket)", "summary", "df-generated"]
+      - ["System.Net.Sockets", "Socket", "AcceptAsync", "(System.Net.Sockets.Socket,System.Threading.CancellationToken)", "summary", "df-generated"]
+      - ["System.Net.Sockets", "Socket", "AcceptAsync", "(System.Threading.CancellationToken)", "summary", "df-generated"]
+      - ["System.Net.Sockets", "Socket", "BeginAccept", "(System.AsyncCallback,System.Object)", "summary", "df-generated"]
+      - ["System.Net.Sockets", "Socket", "BeginAccept", "(System.Int32,System.AsyncCallback,System.Object)", "summary", "df-generated"]
+      - ["System.Net.Sockets", "Socket", "BeginAccept", "(System.Net.Sockets.Socket,System.Int32,System.AsyncCallback,System.Object)", "summary", "df-generated"]
+      - ["System.Net.Sockets", "Socket", "BeginConnect", "(System.Net.EndPoint,System.AsyncCallback,System.Object)", "summary", "df-generated"]
+      - ["System.Net.Sockets", "Socket", "BeginConnect", "(System.Net.IPAddress,System.Int32,System.AsyncCallback,System.Object)", "summary", "df-generated"]
+      - ["System.Net.Sockets", "Socket", "BeginConnect", "(System.Net.IPAddress[],System.Int32,System.AsyncCallback,System.Object)", "summary", "df-generated"]
+      - ["System.Net.Sockets", "Socket", "BeginConnect", "(System.String,System.Int32,System.AsyncCallback,System.Object)", "summary", "df-generated"]
+      - ["System.Net.Sockets", "Socket", "BeginDisconnect", "(System.Boolean,System.AsyncCallback,System.Object)", "summary", "df-generated"]
+      - ["System.Net.Sockets", "Socket", "BeginReceive", "(System.Byte[],System.Int32,System.Int32,System.Net.Sockets.SocketFlags,System.AsyncCallback,System.Object)", "summary", "df-generated"]
+      - ["System.Net.Sockets", "Socket", "BeginReceive", "(System.Byte[],System.Int32,System.Int32,System.Net.Sockets.SocketFlags,System.Net.Sockets.SocketError,System.AsyncCallback,System.Object)", "summary", "df-generated"]
+      - ["System.Net.Sockets", "Socket", "BeginReceive", "(System.Collections.Generic.IList<System.ArraySegment<System.Byte>>,System.Net.Sockets.SocketFlags,System.AsyncCallback,System.Object)", "summary", "df-generated"]
+      - ["System.Net.Sockets", "Socket", "BeginReceive", "(System.Collections.Generic.IList<System.ArraySegment<System.Byte>>,System.Net.Sockets.SocketFlags,System.Net.Sockets.SocketError,System.AsyncCallback,System.Object)", "summary", "df-generated"]
+      - ["System.Net.Sockets", "Socket", "BeginSend", "(System.Byte[],System.Int32,System.Int32,System.Net.Sockets.SocketFlags,System.AsyncCallback,System.Object)", "summary", "df-generated"]
+      - ["System.Net.Sockets", "Socket", "BeginSend", "(System.Byte[],System.Int32,System.Int32,System.Net.Sockets.SocketFlags,System.Net.Sockets.SocketError,System.AsyncCallback,System.Object)", "summary", "df-generated"]
+      - ["System.Net.Sockets", "Socket", "BeginSend", "(System.Collections.Generic.IList<System.ArraySegment<System.Byte>>,System.Net.Sockets.SocketFlags,System.AsyncCallback,System.Object)", "summary", "df-generated"]
+      - ["System.Net.Sockets", "Socket", "BeginSend", "(System.Collections.Generic.IList<System.ArraySegment<System.Byte>>,System.Net.Sockets.SocketFlags,System.Net.Sockets.SocketError,System.AsyncCallback,System.Object)", "summary", "df-generated"]
+      - ["System.Net.Sockets", "Socket", "BeginSendFile", "(System.String,System.AsyncCallback,System.Object)", "summary", "df-generated"]
+      - ["System.Net.Sockets", "Socket", "BeginSendFile", "(System.String,System.Byte[],System.Byte[],System.Net.Sockets.TransmitFileOptions,System.AsyncCallback,System.Object)", "summary", "df-generated"]
+      - ["System.Net.Sockets", "Socket", "BeginSendTo", "(System.Byte[],System.Int32,System.Int32,System.Net.Sockets.SocketFlags,System.Net.EndPoint,System.AsyncCallback,System.Object)", "summary", "df-generated"]
       - ["System.Net.Sockets", "Socket", "CancelConnectAsync", "(System.Net.Sockets.SocketAsyncEventArgs)", "summary", "df-generated"]
       - ["System.Net.Sockets", "Socket", "Close", "()", "summary", "df-generated"]
       - ["System.Net.Sockets", "Socket", "Close", "(System.Int32)", "summary", "df-generated"]
+      - ["System.Net.Sockets", "Socket", "Connect", "(System.Net.IPAddress,System.Int32)", "summary", "df-generated"]
+      - ["System.Net.Sockets", "Socket", "Connect", "(System.Net.IPAddress[],System.Int32)", "summary", "df-generated"]
       - ["System.Net.Sockets", "Socket", "Connect", "(System.String,System.Int32)", "summary", "df-generated"]
+      - ["System.Net.Sockets", "Socket", "ConnectAsync", "(System.Net.IPAddress,System.Int32)", "summary", "df-generated"]
+      - ["System.Net.Sockets", "Socket", "ConnectAsync", "(System.Net.IPAddress,System.Int32,System.Threading.CancellationToken)", "summary", "df-generated"]
       - ["System.Net.Sockets", "Socket", "ConnectAsync", "(System.Net.IPAddress[],System.Int32)", "summary", "df-generated"]
       - ["System.Net.Sockets", "Socket", "ConnectAsync", "(System.Net.IPAddress[],System.Int32,System.Threading.CancellationToken)", "summary", "df-generated"]
       - ["System.Net.Sockets", "Socket", "ConnectAsync", "(System.Net.Sockets.SocketType,System.Net.Sockets.ProtocolType,System.Net.Sockets.SocketAsyncEventArgs)", "summary", "df-generated"]
       - ["System.Net.Sockets", "Socket", "ConnectAsync", "(System.String,System.Int32)", "summary", "df-generated"]
+      - ["System.Net.Sockets", "Socket", "ConnectAsync", "(System.String,System.Int32,System.Threading.CancellationToken)", "summary", "df-generated"]
       - ["System.Net.Sockets", "Socket", "Disconnect", "(System.Boolean)", "summary", "df-generated"]
+      - ["System.Net.Sockets", "Socket", "DisconnectAsync", "(System.Boolean,System.Threading.CancellationToken)", "summary", "df-generated"]
       - ["System.Net.Sockets", "Socket", "Dispose", "()", "summary", "df-generated"]
       - ["System.Net.Sockets", "Socket", "Dispose", "(System.Boolean)", "summary", "df-generated"]
       - ["System.Net.Sockets", "Socket", "DuplicateAndClose", "(System.Int32)", "summary", "df-generated"]
@@ -243,8 +183,6 @@ extensions:
       - ["System.Net.Sockets", "Socket", "EndDisconnect", "(System.IAsyncResult)", "summary", "df-generated"]
       - ["System.Net.Sockets", "Socket", "EndReceive", "(System.IAsyncResult)", "summary", "df-generated"]
       - ["System.Net.Sockets", "Socket", "EndReceive", "(System.IAsyncResult,System.Net.Sockets.SocketError)", "summary", "df-generated"]
-      - ["System.Net.Sockets", "Socket", "EndReceiveFrom", "(System.IAsyncResult,System.Net.EndPoint)", "summary", "df-generated"]
-      - ["System.Net.Sockets", "Socket", "EndReceiveMessageFrom", "(System.IAsyncResult,System.Net.Sockets.SocketFlags,System.Net.EndPoint,System.Net.Sockets.IPPacketInformation)", "summary", "df-generated"]
       - ["System.Net.Sockets", "Socket", "EndSend", "(System.IAsyncResult)", "summary", "df-generated"]
       - ["System.Net.Sockets", "Socket", "EndSend", "(System.IAsyncResult,System.Net.Sockets.SocketError)", "summary", "df-generated"]
       - ["System.Net.Sockets", "Socket", "EndSendFile", "(System.IAsyncResult)", "summary", "df-generated"]
@@ -274,7 +212,18 @@ extensions:
       - ["System.Net.Sockets", "Socket", "ReceiveAsync", "(System.ArraySegment<System.Byte>,System.Net.Sockets.SocketFlags)", "summary", "df-generated"]
       - ["System.Net.Sockets", "Socket", "ReceiveAsync", "(System.Collections.Generic.IList<System.ArraySegment<System.Byte>>)", "summary", "df-generated"]
       - ["System.Net.Sockets", "Socket", "ReceiveAsync", "(System.Collections.Generic.IList<System.ArraySegment<System.Byte>>,System.Net.Sockets.SocketFlags)", "summary", "df-generated"]
+      - ["System.Net.Sockets", "Socket", "ReceiveAsync", "(System.Memory<System.Byte>,System.Net.Sockets.SocketFlags,System.Threading.CancellationToken)", "summary", "df-generated"]
+      - ["System.Net.Sockets", "Socket", "ReceiveAsync", "(System.Memory<System.Byte>,System.Threading.CancellationToken)", "summary", "df-generated"]
       - ["System.Net.Sockets", "Socket", "ReceiveFrom", "(System.Span<System.Byte>,System.Net.Sockets.SocketFlags,System.Net.SocketAddress)", "summary", "df-generated"]
+      - ["System.Net.Sockets", "Socket", "ReceiveFromAsync", "(System.ArraySegment<System.Byte>,System.Net.EndPoint)", "summary", "df-generated"]
+      - ["System.Net.Sockets", "Socket", "ReceiveFromAsync", "(System.ArraySegment<System.Byte>,System.Net.Sockets.SocketFlags,System.Net.EndPoint)", "summary", "df-generated"]
+      - ["System.Net.Sockets", "Socket", "ReceiveFromAsync", "(System.Memory<System.Byte>,System.Net.EndPoint,System.Threading.CancellationToken)", "summary", "df-generated"]
+      - ["System.Net.Sockets", "Socket", "ReceiveFromAsync", "(System.Memory<System.Byte>,System.Net.Sockets.SocketFlags,System.Net.EndPoint,System.Threading.CancellationToken)", "summary", "df-generated"]
+      - ["System.Net.Sockets", "Socket", "ReceiveFromAsync", "(System.Memory<System.Byte>,System.Net.Sockets.SocketFlags,System.Net.SocketAddress,System.Threading.CancellationToken)", "summary", "df-generated"]
+      - ["System.Net.Sockets", "Socket", "ReceiveMessageFromAsync", "(System.ArraySegment<System.Byte>,System.Net.EndPoint)", "summary", "df-generated"]
+      - ["System.Net.Sockets", "Socket", "ReceiveMessageFromAsync", "(System.ArraySegment<System.Byte>,System.Net.Sockets.SocketFlags,System.Net.EndPoint)", "summary", "df-generated"]
+      - ["System.Net.Sockets", "Socket", "ReceiveMessageFromAsync", "(System.Memory<System.Byte>,System.Net.EndPoint,System.Threading.CancellationToken)", "summary", "df-generated"]
+      - ["System.Net.Sockets", "Socket", "ReceiveMessageFromAsync", "(System.Memory<System.Byte>,System.Net.Sockets.SocketFlags,System.Net.EndPoint,System.Threading.CancellationToken)", "summary", "df-generated"]
       - ["System.Net.Sockets", "Socket", "Select", "(System.Collections.IList,System.Collections.IList,System.Collections.IList,System.Int32)", "summary", "df-generated"]
       - ["System.Net.Sockets", "Socket", "Select", "(System.Collections.IList,System.Collections.IList,System.Collections.IList,System.TimeSpan)", "summary", "df-generated"]
       - ["System.Net.Sockets", "Socket", "Send", "(System.Byte[])", "summary", "df-generated"]
@@ -292,10 +241,15 @@ extensions:
       - ["System.Net.Sockets", "Socket", "SendAsync", "(System.ArraySegment<System.Byte>,System.Net.Sockets.SocketFlags)", "summary", "df-generated"]
       - ["System.Net.Sockets", "Socket", "SendAsync", "(System.Collections.Generic.IList<System.ArraySegment<System.Byte>>)", "summary", "df-generated"]
       - ["System.Net.Sockets", "Socket", "SendAsync", "(System.Collections.Generic.IList<System.ArraySegment<System.Byte>>,System.Net.Sockets.SocketFlags)", "summary", "df-generated"]
+      - ["System.Net.Sockets", "Socket", "SendAsync", "(System.ReadOnlyMemory<System.Byte>,System.Net.Sockets.SocketFlags,System.Threading.CancellationToken)", "summary", "df-generated"]
+      - ["System.Net.Sockets", "Socket", "SendAsync", "(System.ReadOnlyMemory<System.Byte>,System.Threading.CancellationToken)", "summary", "df-generated"]
       - ["System.Net.Sockets", "Socket", "SendFile", "(System.String)", "summary", "df-generated"]
       - ["System.Net.Sockets", "Socket", "SendFile", "(System.String,System.Byte[],System.Byte[],System.Net.Sockets.TransmitFileOptions)", "summary", "df-generated"]
       - ["System.Net.Sockets", "Socket", "SendFile", "(System.String,System.ReadOnlySpan<System.Byte>,System.ReadOnlySpan<System.Byte>,System.Net.Sockets.TransmitFileOptions)", "summary", "df-generated"]
+      - ["System.Net.Sockets", "Socket", "SendFileAsync", "(System.String,System.ReadOnlyMemory<System.Byte>,System.ReadOnlyMemory<System.Byte>,System.Net.Sockets.TransmitFileOptions,System.Threading.CancellationToken)", "summary", "df-generated"]
+      - ["System.Net.Sockets", "Socket", "SendFileAsync", "(System.String,System.Threading.CancellationToken)", "summary", "df-generated"]
       - ["System.Net.Sockets", "Socket", "SendTo", "(System.ReadOnlySpan<System.Byte>,System.Net.Sockets.SocketFlags,System.Net.SocketAddress)", "summary", "df-generated"]
+      - ["System.Net.Sockets", "Socket", "SendToAsync", "(System.ReadOnlyMemory<System.Byte>,System.Net.Sockets.SocketFlags,System.Net.SocketAddress,System.Threading.CancellationToken)", "summary", "df-generated"]
       - ["System.Net.Sockets", "Socket", "SetIPProtectionLevel", "(System.Net.Sockets.IPProtectionLevel)", "summary", "df-generated"]
       - ["System.Net.Sockets", "Socket", "SetRawSocketOption", "(System.Int32,System.Int32,System.ReadOnlySpan<System.Byte>)", "summary", "df-generated"]
       - ["System.Net.Sockets", "Socket", "SetSocketOption", "(System.Net.Sockets.SocketOptionLevel,System.Net.Sockets.SocketOptionName,System.Boolean)", "summary", "df-generated"]
@@ -310,6 +264,7 @@ extensions:
       - ["System.Net.Sockets", "Socket", "get_AddressFamily", "()", "summary", "df-generated"]
       - ["System.Net.Sockets", "Socket", "get_Available", "()", "summary", "df-generated"]
       - ["System.Net.Sockets", "Socket", "get_Connected", "()", "summary", "df-generated"]
+      - ["System.Net.Sockets", "Socket", "get_Handle", "()", "summary", "df-generated"]
       - ["System.Net.Sockets", "Socket", "get_IsBound", "()", "summary", "df-generated"]
       - ["System.Net.Sockets", "Socket", "get_OSSupportsIPv4", "()", "summary", "df-generated"]
       - ["System.Net.Sockets", "Socket", "get_OSSupportsIPv6", "()", "summary", "df-generated"]
@@ -320,26 +275,40 @@ extensions:
       - ["System.Net.Sockets", "Socket", "get_SupportsIPv6", "()", "summary", "df-generated"]
       - ["System.Net.Sockets", "SocketAsyncEventArgs", "Dispose", "()", "summary", "df-generated"]
       - ["System.Net.Sockets", "SocketAsyncEventArgs", "OnCompleted", "(System.Net.Sockets.SocketAsyncEventArgs)", "summary", "df-generated"]
+      - ["System.Net.Sockets", "SocketAsyncEventArgs", "SetBuffer", "(System.Byte[],System.Int32,System.Int32)", "summary", "df-generated"]
       - ["System.Net.Sockets", "SocketAsyncEventArgs", "SetBuffer", "(System.Int32,System.Int32)", "summary", "df-generated"]
       - ["System.Net.Sockets", "SocketAsyncEventArgs", "SocketAsyncEventArgs", "(System.Boolean)", "summary", "df-generated"]
+      - ["System.Net.Sockets", "SocketAsyncEventArgs", "add_Completed", "(System.EventHandler<System.Net.Sockets.SocketAsyncEventArgs>)", "summary", "df-generated"]
       - ["System.Net.Sockets", "SocketAsyncEventArgs", "get_Buffer", "()", "summary", "df-generated"]
       - ["System.Net.Sockets", "SocketAsyncEventArgs", "get_BytesTransferred", "()", "summary", "df-generated"]
       - ["System.Net.Sockets", "SocketAsyncEventArgs", "get_Count", "()", "summary", "df-generated"]
       - ["System.Net.Sockets", "SocketAsyncEventArgs", "get_LastOperation", "()", "summary", "df-generated"]
       - ["System.Net.Sockets", "SocketAsyncEventArgs", "get_Offset", "()", "summary", "df-generated"]
+      - ["System.Net.Sockets", "SocketAsyncEventArgs", "remove_Completed", "(System.EventHandler<System.Net.Sockets.SocketAsyncEventArgs>)", "summary", "df-generated"]
       - ["System.Net.Sockets", "SocketException", "SocketException", "(System.Int32)", "summary", "df-generated"]
       - ["System.Net.Sockets", "SocketException", "SocketException", "(System.Int32,System.String)", "summary", "df-generated"]
       - ["System.Net.Sockets", "SocketException", "SocketException", "(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)", "summary", "df-generated"]
       - ["System.Net.Sockets", "SocketException", "get_ErrorCode", "()", "summary", "df-generated"]
       - ["System.Net.Sockets", "SocketException", "get_SocketErrorCode", "()", "summary", "df-generated"]
       - ["System.Net.Sockets", "SocketTaskExtensions", "AcceptAsync", "(System.Net.Sockets.Socket)", "summary", "df-generated"]
+      - ["System.Net.Sockets", "SocketTaskExtensions", "AcceptAsync", "(System.Net.Sockets.Socket,System.Net.Sockets.Socket)", "summary", "df-generated"]
+      - ["System.Net.Sockets", "SocketTaskExtensions", "ConnectAsync", "(System.Net.Sockets.Socket,System.Net.IPAddress,System.Int32)", "summary", "df-generated"]
+      - ["System.Net.Sockets", "SocketTaskExtensions", "ConnectAsync", "(System.Net.Sockets.Socket,System.Net.IPAddress,System.Int32,System.Threading.CancellationToken)", "summary", "df-generated"]
       - ["System.Net.Sockets", "SocketTaskExtensions", "ConnectAsync", "(System.Net.Sockets.Socket,System.Net.IPAddress[],System.Int32)", "summary", "df-generated"]
       - ["System.Net.Sockets", "SocketTaskExtensions", "ConnectAsync", "(System.Net.Sockets.Socket,System.Net.IPAddress[],System.Int32,System.Threading.CancellationToken)", "summary", "df-generated"]
       - ["System.Net.Sockets", "SocketTaskExtensions", "ConnectAsync", "(System.Net.Sockets.Socket,System.String,System.Int32)", "summary", "df-generated"]
+      - ["System.Net.Sockets", "SocketTaskExtensions", "ConnectAsync", "(System.Net.Sockets.Socket,System.String,System.Int32,System.Threading.CancellationToken)", "summary", "df-generated"]
       - ["System.Net.Sockets", "SocketTaskExtensions", "ReceiveAsync", "(System.Net.Sockets.Socket,System.ArraySegment<System.Byte>,System.Net.Sockets.SocketFlags)", "summary", "df-generated"]
       - ["System.Net.Sockets", "SocketTaskExtensions", "ReceiveAsync", "(System.Net.Sockets.Socket,System.Collections.Generic.IList<System.ArraySegment<System.Byte>>,System.Net.Sockets.SocketFlags)", "summary", "df-generated"]
+      - ["System.Net.Sockets", "SocketTaskExtensions", "ReceiveAsync", "(System.Net.Sockets.Socket,System.Memory<System.Byte>,System.Net.Sockets.SocketFlags,System.Threading.CancellationToken)", "summary", "df-generated"]
+      - ["System.Net.Sockets", "SocketTaskExtensions", "ReceiveFromAsync", "(System.Net.Sockets.Socket,System.ArraySegment<System.Byte>,System.Net.Sockets.SocketFlags,System.Net.EndPoint)", "summary", "df-generated"]
+      - ["System.Net.Sockets", "SocketTaskExtensions", "ReceiveMessageFromAsync", "(System.Net.Sockets.Socket,System.ArraySegment<System.Byte>,System.Net.Sockets.SocketFlags,System.Net.EndPoint)", "summary", "df-generated"]
       - ["System.Net.Sockets", "SocketTaskExtensions", "SendAsync", "(System.Net.Sockets.Socket,System.ArraySegment<System.Byte>,System.Net.Sockets.SocketFlags)", "summary", "df-generated"]
       - ["System.Net.Sockets", "SocketTaskExtensions", "SendAsync", "(System.Net.Sockets.Socket,System.Collections.Generic.IList<System.ArraySegment<System.Byte>>,System.Net.Sockets.SocketFlags)", "summary", "df-generated"]
+      - ["System.Net.Sockets", "SocketTaskExtensions", "SendAsync", "(System.Net.Sockets.Socket,System.ReadOnlyMemory<System.Byte>,System.Net.Sockets.SocketFlags,System.Threading.CancellationToken)", "summary", "df-generated"]
+      - ["System.Net.Sockets", "TcpClient", "BeginConnect", "(System.Net.IPAddress,System.Int32,System.AsyncCallback,System.Object)", "summary", "df-generated"]
+      - ["System.Net.Sockets", "TcpClient", "BeginConnect", "(System.Net.IPAddress[],System.Int32,System.AsyncCallback,System.Object)", "summary", "df-generated"]
+      - ["System.Net.Sockets", "TcpClient", "BeginConnect", "(System.String,System.Int32,System.AsyncCallback,System.Object)", "summary", "df-generated"]
       - ["System.Net.Sockets", "TcpClient", "Close", "()", "summary", "df-generated"]
       - ["System.Net.Sockets", "TcpClient", "Connect", "(System.Net.IPAddress,System.Int32)", "summary", "df-generated"]
       - ["System.Net.Sockets", "TcpClient", "Connect", "(System.Net.IPAddress[],System.Int32)", "summary", "df-generated"]
@@ -359,9 +328,12 @@ extensions:
       - ["System.Net.Sockets", "TcpClient", "get_Available", "()", "summary", "df-generated"]
       - ["System.Net.Sockets", "TcpClient", "get_Connected", "()", "summary", "df-generated"]
       - ["System.Net.Sockets", "TcpListener", "AcceptSocketAsync", "()", "summary", "df-generated"]
+      - ["System.Net.Sockets", "TcpListener", "AcceptSocketAsync", "(System.Threading.CancellationToken)", "summary", "df-generated"]
       - ["System.Net.Sockets", "TcpListener", "AcceptTcpClientAsync", "()", "summary", "df-generated"]
       - ["System.Net.Sockets", "TcpListener", "AcceptTcpClientAsync", "(System.Threading.CancellationToken)", "summary", "df-generated"]
       - ["System.Net.Sockets", "TcpListener", "AllowNatTraversal", "(System.Boolean)", "summary", "df-generated"]
+      - ["System.Net.Sockets", "TcpListener", "BeginAcceptSocket", "(System.AsyncCallback,System.Object)", "summary", "df-generated"]
+      - ["System.Net.Sockets", "TcpListener", "BeginAcceptTcpClient", "(System.AsyncCallback,System.Object)", "summary", "df-generated"]
       - ["System.Net.Sockets", "TcpListener", "Create", "(System.Int32)", "summary", "df-generated"]
       - ["System.Net.Sockets", "TcpListener", "Dispose", "()", "summary", "df-generated"]
       - ["System.Net.Sockets", "TcpListener", "EndAcceptSocket", "(System.IAsyncResult)", "summary", "df-generated"]
@@ -371,8 +343,13 @@ extensions:
       - ["System.Net.Sockets", "TcpListener", "Start", "(System.Int32)", "summary", "df-generated"]
       - ["System.Net.Sockets", "TcpListener", "Stop", "()", "summary", "df-generated"]
       - ["System.Net.Sockets", "TcpListener", "TcpListener", "(System.Int32)", "summary", "df-generated"]
+      - ["System.Net.Sockets", "TcpListener", "TcpListener", "(System.Net.IPAddress,System.Int32)", "summary", "df-generated"]
       - ["System.Net.Sockets", "TcpListener", "get_Active", "()", "summary", "df-generated"]
       - ["System.Net.Sockets", "UdpClient", "AllowNatTraversal", "(System.Boolean)", "summary", "df-generated"]
+      - ["System.Net.Sockets", "UdpClient", "BeginReceive", "(System.AsyncCallback,System.Object)", "summary", "df-generated"]
+      - ["System.Net.Sockets", "UdpClient", "BeginSend", "(System.Byte[],System.Int32,System.AsyncCallback,System.Object)", "summary", "df-generated"]
+      - ["System.Net.Sockets", "UdpClient", "BeginSend", "(System.Byte[],System.Int32,System.Net.IPEndPoint,System.AsyncCallback,System.Object)", "summary", "df-generated"]
+      - ["System.Net.Sockets", "UdpClient", "BeginSend", "(System.Byte[],System.Int32,System.String,System.Int32,System.AsyncCallback,System.Object)", "summary", "df-generated"]
       - ["System.Net.Sockets", "UdpClient", "Close", "()", "summary", "df-generated"]
       - ["System.Net.Sockets", "UdpClient", "Connect", "(System.Net.IPAddress,System.Int32)", "summary", "df-generated"]
       - ["System.Net.Sockets", "UdpClient", "Connect", "(System.String,System.Int32)", "summary", "df-generated"]
@@ -393,6 +370,8 @@ extensions:
       - ["System.Net.Sockets", "UdpClient", "Send", "(System.ReadOnlySpan<System.Byte>,System.String,System.Int32)", "summary", "df-generated"]
       - ["System.Net.Sockets", "UdpClient", "SendAsync", "(System.Byte[],System.Int32)", "summary", "df-generated"]
       - ["System.Net.Sockets", "UdpClient", "SendAsync", "(System.Byte[],System.Int32,System.String,System.Int32)", "summary", "df-generated"]
+      - ["System.Net.Sockets", "UdpClient", "SendAsync", "(System.ReadOnlyMemory<System.Byte>,System.String,System.Int32,System.Threading.CancellationToken)", "summary", "df-generated"]
+      - ["System.Net.Sockets", "UdpClient", "SendAsync", "(System.ReadOnlyMemory<System.Byte>,System.Threading.CancellationToken)", "summary", "df-generated"]
       - ["System.Net.Sockets", "UdpClient", "UdpClient", "(System.Int32)", "summary", "df-generated"]
       - ["System.Net.Sockets", "UdpClient", "UdpClient", "(System.Int32,System.Net.Sockets.AddressFamily)", "summary", "df-generated"]
       - ["System.Net.Sockets", "UdpClient", "UdpClient", "(System.Net.Sockets.AddressFamily)", "summary", "df-generated"]
diff --git a/csharp/ql/lib/ext/generated/System.Net.WebSockets.model.yml b/csharp/ql/lib/ext/generated/System.Net.WebSockets.model.yml
index 11a4ef6492d..ceb5abb55d8 100644
--- a/csharp/ql/lib/ext/generated/System.Net.WebSockets.model.yml
+++ b/csharp/ql/lib/ext/generated/System.Net.WebSockets.model.yml
@@ -5,13 +5,8 @@ extensions:
       extensible: summaryModel
     data:
       - ["System.Net.WebSockets", "ClientWebSocketOptions", False, "SetBuffer", "(System.Int32,System.Int32,System.ArraySegment<System.Byte>)", "", "Argument[2].Element", "Argument[this]", "taint", "df-generated"]
-      - ["System.Net.WebSockets", "WebSocket", False, "CreateClientWebSocket", "(System.IO.Stream,System.String,System.Int32,System.Int32,System.TimeSpan,System.Boolean,System.ArraySegment<System.Byte>)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Net.WebSockets", "WebSocket", False, "CreateClientWebSocket", "(System.IO.Stream,System.String,System.Int32,System.Int32,System.TimeSpan,System.Boolean,System.ArraySegment<System.Byte>)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Net.WebSockets", "WebSocket", False, "CreateFromStream", "(System.IO.Stream,System.Boolean,System.String,System.TimeSpan)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Net.WebSockets", "WebSocket", False, "CreateFromStream", "(System.IO.Stream,System.Boolean,System.String,System.TimeSpan)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Net.WebSockets", "WebSocket", True, "SendAsync", "(System.ArraySegment<System.Byte>,System.Net.WebSockets.WebSocketMessageType,System.Boolean,System.Threading.CancellationToken)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Net.WebSockets", "WebSocket", True, "SendAsync", "(System.ReadOnlyMemory<System.Byte>,System.Net.WebSockets.WebSocketMessageType,System.Boolean,System.Threading.CancellationToken)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Net.WebSockets", "WebSocket", True, "SendAsync", "(System.ReadOnlyMemory<System.Byte>,System.Net.WebSockets.WebSocketMessageType,System.Net.WebSockets.WebSocketMessageFlags,System.Threading.CancellationToken)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Net.WebSockets", "WebSocket", False, "CreateClientWebSocket", "(System.IO.Stream,System.String,System.Int32,System.Int32,System.TimeSpan,System.Boolean,System.ArraySegment<System.Byte>)", "", "Argument[1]", "ReturnValue.SyntheticField[System.Net.WebSockets.ManagedWebSocket._subprotocol]", "value", "dfc-generated"]
+      - ["System.Net.WebSockets", "WebSocket", False, "CreateFromStream", "(System.IO.Stream,System.Boolean,System.String,System.TimeSpan)", "", "Argument[2]", "ReturnValue.SyntheticField[System.Net.WebSockets.ManagedWebSocket._subprotocol]", "value", "dfc-generated"]
       - ["System.Net.WebSockets", "WebSocket", True, "get_CloseStatus", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Net.WebSockets", "WebSocket", True, "get_CloseStatusDescription", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Net.WebSockets", "WebSocket", True, "get_SubProtocol", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
@@ -36,6 +31,9 @@ extensions:
       - ["System.Net.WebSockets", "ClientWebSocket", "Dispose", "()", "summary", "df-generated"]
       - ["System.Net.WebSockets", "ClientWebSocket", "ReceiveAsync", "(System.ArraySegment<System.Byte>,System.Threading.CancellationToken)", "summary", "df-generated"]
       - ["System.Net.WebSockets", "ClientWebSocket", "ReceiveAsync", "(System.Memory<System.Byte>,System.Threading.CancellationToken)", "summary", "df-generated"]
+      - ["System.Net.WebSockets", "ClientWebSocket", "SendAsync", "(System.ArraySegment<System.Byte>,System.Net.WebSockets.WebSocketMessageType,System.Boolean,System.Threading.CancellationToken)", "summary", "df-generated"]
+      - ["System.Net.WebSockets", "ClientWebSocket", "SendAsync", "(System.ReadOnlyMemory<System.Byte>,System.Net.WebSockets.WebSocketMessageType,System.Boolean,System.Threading.CancellationToken)", "summary", "df-generated"]
+      - ["System.Net.WebSockets", "ClientWebSocket", "SendAsync", "(System.ReadOnlyMemory<System.Byte>,System.Net.WebSockets.WebSocketMessageType,System.Net.WebSockets.WebSocketMessageFlags,System.Threading.CancellationToken)", "summary", "df-generated"]
       - ["System.Net.WebSockets", "ClientWebSocket", "get_HttpStatusCode", "()", "summary", "df-generated"]
       - ["System.Net.WebSockets", "ClientWebSocket", "get_Options", "()", "summary", "df-generated"]
       - ["System.Net.WebSockets", "ClientWebSocket", "get_State", "()", "summary", "df-generated"]
@@ -61,6 +59,9 @@ extensions:
       - ["System.Net.WebSockets", "WebSocket", "ReceiveAsync", "(System.ArraySegment<System.Byte>,System.Threading.CancellationToken)", "summary", "df-generated"]
       - ["System.Net.WebSockets", "WebSocket", "ReceiveAsync", "(System.Memory<System.Byte>,System.Threading.CancellationToken)", "summary", "df-generated"]
       - ["System.Net.WebSockets", "WebSocket", "RegisterPrefixes", "()", "summary", "df-generated"]
+      - ["System.Net.WebSockets", "WebSocket", "SendAsync", "(System.ArraySegment<System.Byte>,System.Net.WebSockets.WebSocketMessageType,System.Boolean,System.Threading.CancellationToken)", "summary", "df-generated"]
+      - ["System.Net.WebSockets", "WebSocket", "SendAsync", "(System.ReadOnlyMemory<System.Byte>,System.Net.WebSockets.WebSocketMessageType,System.Boolean,System.Threading.CancellationToken)", "summary", "df-generated"]
+      - ["System.Net.WebSockets", "WebSocket", "SendAsync", "(System.ReadOnlyMemory<System.Byte>,System.Net.WebSockets.WebSocketMessageType,System.Net.WebSockets.WebSocketMessageFlags,System.Threading.CancellationToken)", "summary", "df-generated"]
       - ["System.Net.WebSockets", "WebSocket", "ThrowOnInvalidState", "(System.Net.WebSockets.WebSocketState,System.Net.WebSockets.WebSocketState[])", "summary", "df-generated"]
       - ["System.Net.WebSockets", "WebSocket", "get_DefaultKeepAliveInterval", "()", "summary", "df-generated"]
       - ["System.Net.WebSockets", "WebSocket", "get_State", "()", "summary", "df-generated"]
diff --git a/csharp/ql/lib/ext/generated/System.Net.model.yml b/csharp/ql/lib/ext/generated/System.Net.model.yml
index 21bdbeb12bb..a236f8b1e60 100644
--- a/csharp/ql/lib/ext/generated/System.Net.model.yml
+++ b/csharp/ql/lib/ext/generated/System.Net.model.yml
@@ -11,15 +11,18 @@ extensions:
       - ["System.Net", "Cookie", False, "ToString", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Net", "CookieCollection", False, "get_Item", "(System.Int32)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Net", "CookieCollection", False, "get_Item", "(System.String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Net", "DnsEndPoint", False, "DnsEndPoint", "(System.String,System.Int32,System.Net.Sockets.AddressFamily)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Net", "DnsEndPoint", False, "ToString", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Net", "DnsEndPoint", False, "get_Host", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Net", "DnsEndPoint", False, "DnsEndPoint", "(System.String,System.Int32,System.Net.Sockets.AddressFamily)", "", "Argument[0]", "Argument[this].SyntheticField[System.Net.DnsEndPoint._host]", "value", "dfc-generated"]
+      - ["System.Net", "DnsEndPoint", False, "ToString", "()", "", "Argument[this].SyntheticField[System.Net.DnsEndPoint._host]", "ReturnValue", "taint", "dfc-generated"]
+      - ["System.Net", "DnsEndPoint", False, "get_Host", "()", "", "Argument[this].SyntheticField[System.Net.DnsEndPoint._host]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Net", "DownloadDataCompletedEventArgs", False, "get_Result", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Net", "DownloadStringCompletedEventArgs", False, "get_Result", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Net", "FileWebRequest", True, "get_RequestUri", "()", "", "Argument[this].SyntheticField[System.Net.FileWebRequest._uri]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Net", "FtpWebRequest", False, "get_RequestUri", "()", "", "Argument[this].SyntheticField[System.Net.FtpWebRequest._uri]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Net", "FtpWebResponse", False, "get_BannerMessage", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Net", "FtpWebResponse", False, "get_ExitMessage", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Net", "FtpWebResponse", False, "get_StatusDescription", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Net", "FtpWebResponse", False, "get_WelcomeMessage", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Net", "HttpListener", False, "BeginGetContext", "(System.AsyncCallback,System.Object)", "", "Argument[1]", "ReturnValue.SyntheticField[System.Net.ListenerAsyncResult._state]", "value", "dfc-generated"]
       - ["System.Net", "HttpListener", False, "get_DefaultServiceNames", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Net", "HttpListener", False, "get_Prefixes", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Net", "HttpListener", False, "get_TimeoutManager", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
@@ -38,31 +41,31 @@ extensions:
       - ["System.Net", "HttpListenerRequest", False, "get_ProtocolVersion", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Net", "HttpListenerRequest", False, "get_RawUrl", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Net", "HttpListenerRequest", False, "get_Url", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Net", "HttpListenerRequest", False, "get_UrlReferrer", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Net", "HttpListenerRequest", False, "get_UserAgent", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Net", "HttpListenerRequest", False, "get_UserHostName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Net", "HttpListenerResponse", False, "AppendCookie", "(System.Net.Cookie)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["System.Net", "HttpListenerResponse", False, "AppendCookie", "(System.Net.Cookie)", "", "Argument[0]", "Argument[this].Property[System.Net.HttpListenerResponse.Cookies].Element", "value", "dfc-generated"]
       - ["System.Net", "HttpListenerResponse", False, "Close", "(System.Byte[],System.Boolean)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
       - ["System.Net", "HttpListenerResponse", False, "CopyFrom", "(System.Net.HttpListenerResponse)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Net", "HttpListenerResponse", False, "get_OutputStream", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Net", "HttpWebRequest", False, "EndGetRequestStream", "(System.IAsyncResult,System.Net.TransportContext)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Net", "HttpWebRequest", False, "EndGetRequestStream", "(System.IAsyncResult,System.Net.TransportContext)", "", "Argument[0].Property[System.Threading.Tasks.Task`1.Result]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Net", "HttpWebRequest", False, "GetRequestStream", "(System.Net.TransportContext)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Net", "HttpWebRequest", False, "get_Address", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Net", "HttpWebRequest", False, "get_Address", "()", "", "Argument[this].SyntheticField[System.Net.HttpWebRequest._requestUri]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Net", "HttpWebRequest", True, "EndGetRequestStream", "(System.IAsyncResult)", "", "Argument[0].Property[System.Threading.Tasks.Task`1.Result]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Net", "HttpWebRequest", True, "EndGetResponse", "(System.IAsyncResult)", "", "Argument[0].Property[System.Threading.Tasks.Task`1.Result]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Net", "HttpWebRequest", True, "get_RequestUri", "()", "", "Argument[this].SyntheticField[System.Net.HttpWebRequest._requestUri]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Net", "HttpWebResponse", False, "GetResponseHeader", "(System.String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Net", "HttpWebResponse", False, "get_CharacterSet", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Net", "HttpWebResponse", False, "get_Server", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Net", "HttpWebResponse", True, "get_StatusDescription", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Net", "ICredentials", True, "GetCredential", "(System.Uri,System.String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Net", "ICredentials", True, "GetCredential", "(System.Uri,System.String)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["System.Net", "ICredentialsByHost", True, "GetCredential", "(System.String,System.Int32,System.String)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["System.Net", "IPAddress", False, "MapToIPv4", "()", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["System.Net", "IPAddress", False, "MapToIPv6", "()", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["System.Net", "ICredentials", True, "GetCredential", "(System.Uri,System.String)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Net", "ICredentialsByHost", True, "GetCredential", "(System.String,System.Int32,System.String)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Net", "IPAddress", False, "MapToIPv4", "()", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Net", "IPAddress", False, "MapToIPv6", "()", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Net", "IPAddress", False, "ToString", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Net", "IPEndPoint", False, "IPEndPoint", "(System.Net.IPAddress,System.Int32)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Net", "IPNetwork", False, "IPNetwork", "(System.Net.IPAddress,System.Int32)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Net", "IPNetwork", False, "get_BaseAddress", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Net", "IWebProxy", True, "GetProxy", "(System.Uri)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Net", "IWebProxy", True, "GetProxy", "(System.Uri)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Net", "IPNetwork", False, "IPNetwork", "(System.Net.IPAddress,System.Int32)", "", "Argument[0]", "Argument[this].SyntheticField[System.Net.IPNetwork._baseAddress]", "value", "dfc-generated"]
+      - ["System.Net", "IPNetwork", False, "get_BaseAddress", "()", "", "Argument[this].SyntheticField[System.Net.IPNetwork._baseAddress]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Net", "IWebProxy", True, "GetProxy", "(System.Uri)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Net", "IWebRequestCreate", True, "Create", "(System.Uri)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["System.Net", "NetworkCredential", False, "NetworkCredential", "(System.String,System.Security.SecureString,System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Net", "NetworkCredential", False, "NetworkCredential", "(System.String,System.Security.SecureString,System.String)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
@@ -74,164 +77,70 @@ extensions:
       - ["System.Net", "PathList", False, "get_Item", "(System.String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Net", "PathList", False, "get_SyncRoot", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Net", "PathList", False, "get_Values", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Net", "SocketAddress", False, "get_Buffer", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Net", "UploadDataCompletedEventArgs", False, "get_Result", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Net", "UploadFileCompletedEventArgs", False, "get_Result", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Net", "UploadStringCompletedEventArgs", False, "get_Result", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Net", "UploadValuesCompletedEventArgs", False, "get_Result", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Net", "WebClient", False, "DownloadData", "(System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Net", "WebClient", False, "DownloadData", "(System.Uri)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Net", "WebClient", False, "DownloadDataAsync", "(System.Uri)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Net", "WebClient", False, "DownloadDataAsync", "(System.Uri,System.Object)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Net", "WebClient", False, "DownloadDataTaskAsync", "(System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Net", "WebClient", False, "DownloadDataTaskAsync", "(System.Uri)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Net", "WebClient", False, "DownloadFile", "(System.String,System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Net", "WebClient", False, "DownloadFile", "(System.Uri,System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Net", "WebClient", False, "DownloadFileAsync", "(System.Uri,System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Net", "WebClient", False, "DownloadFileAsync", "(System.Uri,System.String,System.Object)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Net", "WebClient", False, "DownloadFileTaskAsync", "(System.String,System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Net", "WebClient", False, "DownloadFileTaskAsync", "(System.Uri,System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Net", "WebClient", False, "DownloadString", "(System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Net", "WebClient", False, "DownloadString", "(System.Uri)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Net", "WebClient", False, "DownloadStringAsync", "(System.Uri)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Net", "WebClient", False, "DownloadStringAsync", "(System.Uri,System.Object)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Net", "WebClient", False, "DownloadStringTaskAsync", "(System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Net", "WebClient", False, "DownloadStringTaskAsync", "(System.Uri)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Net", "WebClient", False, "OpenRead", "(System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Net", "WebClient", False, "OpenRead", "(System.Uri)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Net", "WebClient", False, "OpenReadAsync", "(System.Uri)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Net", "WebClient", False, "OpenReadAsync", "(System.Uri,System.Object)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Net", "WebClient", False, "OpenReadTaskAsync", "(System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Net", "WebClient", False, "OpenReadTaskAsync", "(System.Uri)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Net", "WebClient", False, "OpenWrite", "(System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Net", "WebClient", False, "OpenWrite", "(System.String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["System.Net", "WebClient", False, "OpenWrite", "(System.String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Net", "WebClient", False, "OpenWrite", "(System.String,System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Net", "WebClient", False, "OpenWrite", "(System.String,System.String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["System.Net", "WebClient", False, "OpenWrite", "(System.String,System.String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
       - ["System.Net", "WebClient", False, "OpenWrite", "(System.String,System.String)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
       - ["System.Net", "WebClient", False, "OpenWrite", "(System.String,System.String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Net", "WebClient", False, "OpenWrite", "(System.Uri)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Net", "WebClient", False, "OpenWrite", "(System.Uri)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["System.Net", "WebClient", False, "OpenWrite", "(System.Uri)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Net", "WebClient", False, "OpenWrite", "(System.Uri,System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Net", "WebClient", False, "OpenWrite", "(System.Uri,System.String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["System.Net", "WebClient", False, "OpenWrite", "(System.Uri,System.String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
       - ["System.Net", "WebClient", False, "OpenWrite", "(System.Uri,System.String)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
       - ["System.Net", "WebClient", False, "OpenWrite", "(System.Uri,System.String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Net", "WebClient", False, "OpenWriteAsync", "(System.Uri)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Net", "WebClient", False, "OpenWriteAsync", "(System.Uri,System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Net", "WebClient", False, "OpenWriteAsync", "(System.Uri,System.String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Net", "WebClient", False, "OpenWriteAsync", "(System.Uri,System.String,System.Object)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Net", "WebClient", False, "OpenWriteAsync", "(System.Uri,System.String,System.Object)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Net", "WebClient", False, "OpenWriteTaskAsync", "(System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Net", "WebClient", False, "OpenWriteTaskAsync", "(System.String,System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Net", "WebClient", False, "OpenWriteTaskAsync", "(System.String,System.String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Net", "WebClient", False, "OpenWriteTaskAsync", "(System.Uri)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Net", "WebClient", False, "OpenWriteTaskAsync", "(System.Uri,System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Net", "WebClient", False, "OpenWriteTaskAsync", "(System.Uri,System.String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Net", "WebClient", False, "UploadData", "(System.String,System.Byte[])", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Net", "WebClient", False, "UploadData", "(System.String,System.String,System.Byte[])", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Net", "WebClient", False, "UploadData", "(System.String,System.String,System.Byte[])", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Net", "WebClient", False, "UploadData", "(System.Uri,System.Byte[])", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Net", "WebClient", False, "UploadData", "(System.Uri,System.String,System.Byte[])", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Net", "WebClient", False, "UploadData", "(System.Uri,System.String,System.Byte[])", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Net", "WebClient", False, "UploadDataAsync", "(System.Uri,System.Byte[])", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Net", "WebClient", False, "UploadDataAsync", "(System.Uri,System.String,System.Byte[])", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Net", "WebClient", False, "UploadDataAsync", "(System.Uri,System.String,System.Byte[])", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Net", "WebClient", False, "UploadDataAsync", "(System.Uri,System.String,System.Byte[],System.Object)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Net", "WebClient", False, "UploadDataAsync", "(System.Uri,System.String,System.Byte[],System.Object)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Net", "WebClient", False, "UploadDataTaskAsync", "(System.String,System.Byte[])", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Net", "WebClient", False, "UploadDataTaskAsync", "(System.String,System.String,System.Byte[])", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Net", "WebClient", False, "UploadDataTaskAsync", "(System.String,System.String,System.Byte[])", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Net", "WebClient", False, "UploadDataTaskAsync", "(System.Uri,System.Byte[])", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Net", "WebClient", False, "UploadDataTaskAsync", "(System.Uri,System.String,System.Byte[])", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Net", "WebClient", False, "UploadDataTaskAsync", "(System.Uri,System.String,System.Byte[])", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Net", "WebClient", False, "UploadFile", "(System.String,System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Net", "WebClient", False, "UploadFile", "(System.String,System.String,System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Net", "WebClient", False, "UploadFile", "(System.String,System.String,System.String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Net", "WebClient", False, "UploadFile", "(System.Uri,System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Net", "WebClient", False, "UploadFile", "(System.Uri,System.String,System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Net", "WebClient", False, "UploadFile", "(System.Uri,System.String,System.String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Net", "WebClient", False, "UploadFileAsync", "(System.Uri,System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Net", "WebClient", False, "UploadFileAsync", "(System.Uri,System.String,System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Net", "WebClient", False, "UploadFileAsync", "(System.Uri,System.String,System.String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Net", "WebClient", False, "UploadFileAsync", "(System.Uri,System.String,System.String,System.Object)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Net", "WebClient", False, "UploadFileAsync", "(System.Uri,System.String,System.String,System.Object)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Net", "WebClient", False, "UploadFileTaskAsync", "(System.String,System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Net", "WebClient", False, "UploadFileTaskAsync", "(System.String,System.String,System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Net", "WebClient", False, "UploadFileTaskAsync", "(System.String,System.String,System.String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Net", "WebClient", False, "UploadFileTaskAsync", "(System.Uri,System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Net", "WebClient", False, "UploadFileTaskAsync", "(System.Uri,System.String,System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Net", "WebClient", False, "UploadFileTaskAsync", "(System.Uri,System.String,System.String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Net", "WebClient", False, "UploadString", "(System.String,System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Net", "WebClient", False, "UploadString", "(System.String,System.String,System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Net", "WebClient", False, "UploadString", "(System.String,System.String,System.String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Net", "WebClient", False, "UploadString", "(System.Uri,System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Net", "WebClient", False, "UploadString", "(System.Uri,System.String,System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Net", "WebClient", False, "UploadString", "(System.Uri,System.String,System.String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Net", "WebClient", False, "UploadStringAsync", "(System.Uri,System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Net", "WebClient", False, "UploadStringAsync", "(System.Uri,System.String,System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Net", "WebClient", False, "UploadStringAsync", "(System.Uri,System.String,System.String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Net", "WebClient", False, "UploadStringAsync", "(System.Uri,System.String,System.String,System.Object)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Net", "WebClient", False, "UploadStringAsync", "(System.Uri,System.String,System.String,System.Object)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Net", "WebClient", False, "UploadStringTaskAsync", "(System.String,System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Net", "WebClient", False, "UploadStringTaskAsync", "(System.String,System.String,System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Net", "WebClient", False, "UploadStringTaskAsync", "(System.String,System.String,System.String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Net", "WebClient", False, "UploadStringTaskAsync", "(System.Uri,System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Net", "WebClient", False, "UploadStringTaskAsync", "(System.Uri,System.String,System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Net", "WebClient", False, "UploadStringTaskAsync", "(System.Uri,System.String,System.String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Net", "WebClient", False, "UploadValues", "(System.String,System.Collections.Specialized.NameValueCollection)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Net", "WebClient", False, "UploadValues", "(System.String,System.String,System.Collections.Specialized.NameValueCollection)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Net", "WebClient", False, "UploadValues", "(System.String,System.String,System.Collections.Specialized.NameValueCollection)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Net", "WebClient", False, "UploadValues", "(System.Uri,System.Collections.Specialized.NameValueCollection)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Net", "WebClient", False, "UploadValues", "(System.Uri,System.String,System.Collections.Specialized.NameValueCollection)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Net", "WebClient", False, "UploadValues", "(System.Uri,System.String,System.Collections.Specialized.NameValueCollection)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Net", "WebClient", False, "UploadValuesAsync", "(System.Uri,System.Collections.Specialized.NameValueCollection)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Net", "WebClient", False, "UploadValuesAsync", "(System.Uri,System.String,System.Collections.Specialized.NameValueCollection)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Net", "WebClient", False, "UploadValuesAsync", "(System.Uri,System.String,System.Collections.Specialized.NameValueCollection)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Net", "WebClient", False, "UploadValuesAsync", "(System.Uri,System.String,System.Collections.Specialized.NameValueCollection,System.Object)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Net", "WebClient", False, "UploadValuesAsync", "(System.Uri,System.String,System.Collections.Specialized.NameValueCollection,System.Object)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Net", "WebClient", False, "UploadValuesTaskAsync", "(System.String,System.Collections.Specialized.NameValueCollection)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Net", "WebClient", False, "UploadValuesTaskAsync", "(System.String,System.String,System.Collections.Specialized.NameValueCollection)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Net", "WebClient", False, "UploadValuesTaskAsync", "(System.String,System.String,System.Collections.Specialized.NameValueCollection)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Net", "WebClient", False, "UploadValuesTaskAsync", "(System.Uri,System.Collections.Specialized.NameValueCollection)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Net", "WebClient", False, "UploadValuesTaskAsync", "(System.Uri,System.String,System.Collections.Specialized.NameValueCollection)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Net", "WebClient", False, "UploadValuesTaskAsync", "(System.Uri,System.String,System.Collections.Specialized.NameValueCollection)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
       - ["System.Net", "WebClient", False, "get_ResponseHeaders", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Net", "WebClient", True, "GetWebRequest", "(System.Uri)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Net", "WebClient", True, "GetWebRequest", "(System.Uri)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Net", "WebClient", True, "GetWebResponse", "(System.Net.WebRequest)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Net", "WebClient", True, "GetWebResponse", "(System.Net.WebRequest)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Net", "WebClient", True, "GetWebResponse", "(System.Net.WebRequest,System.IAsyncResult)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Net", "WebClient", True, "GetWebResponse", "(System.Net.WebRequest,System.IAsyncResult)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Net", "WebClient", True, "GetWebResponse", "(System.Net.WebRequest,System.IAsyncResult)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Net", "WebClient", True, "GetWebResponse", "(System.Net.WebRequest,System.IAsyncResult)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Net", "WebException", False, "WebException", "(System.String,System.Exception,System.Net.WebExceptionStatus,System.Net.WebResponse)", "", "Argument[3]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Net", "WebException", False, "get_Response", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Net", "WebException", False, "WebException", "(System.String,System.Exception,System.Net.WebExceptionStatus,System.Net.WebResponse)", "", "Argument[3]", "Argument[this].SyntheticField[System.Net.WebException._response]", "value", "dfc-generated"]
+      - ["System.Net", "WebException", False, "get_Response", "()", "", "Argument[this].SyntheticField[System.Net.WebException._response]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Net", "WebHeaderCollection", False, "ToByteArray", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Net", "WebHeaderCollection", False, "ToString", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Net", "WebHeaderCollection", False, "get_Item", "(System.Net.HttpRequestHeader)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Net", "WebHeaderCollection", False, "get_Item", "(System.Net.HttpResponseHeader)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Net", "WebProxy", False, "GetProxy", "(System.Uri)", "", "Argument[this].Property[System.Net.WebProxy.Address]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Net", "WebRequest", False, "Create", "(System.String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["System.Net", "WebRequest", False, "Create", "(System.Uri)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["System.Net", "WebRequest", False, "CreateDefault", "(System.Uri)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Net", "WebRequest", False, "CreateHttp", "(System.String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Net", "WebRequest", False, "CreateHttp", "(System.Uri)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Net", "WebRequest", True, "EndGetRequestStream", "(System.IAsyncResult)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Net", "WebRequest", False, "CreateHttp", "(System.String)", "", "Argument[0]", "ReturnValue.SyntheticField[System.Net.HttpWebRequest._requestUri]", "taint", "dfc-generated"]
+      - ["System.Net", "WebRequest", False, "CreateHttp", "(System.Uri)", "", "Argument[0]", "ReturnValue.SyntheticField[System.Net.HttpWebRequest._requestUri]", "value", "dfc-generated"]
       - ["System.Net", "WebRequest", True, "EndGetRequestStream", "(System.IAsyncResult)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Net", "WebRequest", True, "EndGetResponse", "(System.IAsyncResult)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["System.Net", "WebRequest", True, "EndGetResponse", "(System.IAsyncResult)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Net", "WebRequest", True, "GetRequestStream", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Net", "WebRequest", True, "GetRequestStreamAsync", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Net", "WebRequest", True, "GetResponse", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Net", "WebRequest", True, "get_RequestUri", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Net", "WebResponse", True, "GetResponseStream", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Net", "WebResponse", True, "get_Headers", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Net", "WebResponse", True, "get_ResponseUri", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Net", "WebUtility", False, "HtmlDecode", "(System.String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Net", "WebUtility", False, "HtmlDecode", "(System.String)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Net", "WebUtility", False, "HtmlDecode", "(System.String,System.IO.TextWriter)", "", "Argument[0]", "Argument[1]", "taint", "df-generated"]
-      - ["System.Net", "WebUtility", False, "UrlDecode", "(System.String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Net", "WebUtility", False, "UrlDecode", "(System.String)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
   - addsTo:
       pack: codeql/csharp-all
       extensible: neutralModel
@@ -274,6 +183,11 @@ extensions:
       - ["System.Net", "CredentialCache", "Remove", "(System.Uri,System.String)", "summary", "df-generated"]
       - ["System.Net", "CredentialCache", "get_DefaultCredentials", "()", "summary", "df-generated"]
       - ["System.Net", "CredentialCache", "get_DefaultNetworkCredentials", "()", "summary", "df-generated"]
+      - ["System.Net", "Dns", "BeginGetHostAddresses", "(System.String,System.AsyncCallback,System.Object)", "summary", "df-generated"]
+      - ["System.Net", "Dns", "BeginGetHostByName", "(System.String,System.AsyncCallback,System.Object)", "summary", "df-generated"]
+      - ["System.Net", "Dns", "BeginGetHostEntry", "(System.Net.IPAddress,System.AsyncCallback,System.Object)", "summary", "df-generated"]
+      - ["System.Net", "Dns", "BeginGetHostEntry", "(System.String,System.AsyncCallback,System.Object)", "summary", "df-generated"]
+      - ["System.Net", "Dns", "BeginResolve", "(System.String,System.AsyncCallback,System.Object)", "summary", "df-generated"]
       - ["System.Net", "Dns", "EndGetHostAddresses", "(System.IAsyncResult)", "summary", "df-generated"]
       - ["System.Net", "Dns", "EndGetHostByName", "(System.IAsyncResult)", "summary", "df-generated"]
       - ["System.Net", "Dns", "EndGetHostEntry", "(System.IAsyncResult)", "summary", "df-generated"]
@@ -318,6 +232,8 @@ extensions:
       - ["System.Net", "EndpointPermission", "get_Port", "()", "summary", "df-generated"]
       - ["System.Net", "EndpointPermission", "get_Transport", "()", "summary", "df-generated"]
       - ["System.Net", "FileWebRequest", "Abort", "()", "summary", "df-generated"]
+      - ["System.Net", "FileWebRequest", "BeginGetRequestStream", "(System.AsyncCallback,System.Object)", "summary", "df-generated"]
+      - ["System.Net", "FileWebRequest", "BeginGetResponse", "(System.AsyncCallback,System.Object)", "summary", "df-generated"]
       - ["System.Net", "FileWebRequest", "FileWebRequest", "(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)", "summary", "df-generated"]
       - ["System.Net", "FileWebRequest", "GetObjectData", "(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)", "summary", "df-generated"]
       - ["System.Net", "FileWebRequest", "GetResponseAsync", "()", "summary", "df-generated"]
@@ -326,6 +242,8 @@ extensions:
       - ["System.Net", "FileWebResponse", "GetObjectData", "(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)", "summary", "df-generated"]
       - ["System.Net", "FileWebResponse", "get_SupportsHeaders", "()", "summary", "df-generated"]
       - ["System.Net", "FtpWebRequest", "Abort", "()", "summary", "df-generated"]
+      - ["System.Net", "FtpWebRequest", "BeginGetRequestStream", "(System.AsyncCallback,System.Object)", "summary", "df-generated"]
+      - ["System.Net", "FtpWebRequest", "BeginGetResponse", "(System.AsyncCallback,System.Object)", "summary", "df-generated"]
       - ["System.Net", "FtpWebRequest", "get_ServicePoint", "()", "summary", "df-generated"]
       - ["System.Net", "FtpWebResponse", "Close", "()", "summary", "df-generated"]
       - ["System.Net", "FtpWebResponse", "get_LastModified", "()", "summary", "df-generated"]
@@ -355,6 +273,7 @@ extensions:
       - ["System.Net", "HttpListenerPrefixCollection", "get_Count", "()", "summary", "df-generated"]
       - ["System.Net", "HttpListenerPrefixCollection", "get_IsReadOnly", "()", "summary", "df-generated"]
       - ["System.Net", "HttpListenerPrefixCollection", "get_IsSynchronized", "()", "summary", "df-generated"]
+      - ["System.Net", "HttpListenerRequest", "BeginGetClientCertificate", "(System.AsyncCallback,System.Object)", "summary", "df-generated"]
       - ["System.Net", "HttpListenerRequest", "GetClientCertificateAsync", "()", "summary", "df-generated"]
       - ["System.Net", "HttpListenerRequest", "get_AcceptTypes", "()", "summary", "df-generated"]
       - ["System.Net", "HttpListenerRequest", "get_ClientCertificateError", "()", "summary", "df-generated"]
@@ -371,6 +290,7 @@ extensions:
       - ["System.Net", "HttpListenerRequest", "get_RemoteEndPoint", "()", "summary", "df-generated"]
       - ["System.Net", "HttpListenerRequest", "get_RequestTraceIdentifier", "()", "summary", "df-generated"]
       - ["System.Net", "HttpListenerRequest", "get_TransportContext", "()", "summary", "df-generated"]
+      - ["System.Net", "HttpListenerRequest", "get_UrlReferrer", "()", "summary", "df-generated"]
       - ["System.Net", "HttpListenerRequest", "get_UserHostAddress", "()", "summary", "df-generated"]
       - ["System.Net", "HttpListenerRequest", "get_UserLanguages", "()", "summary", "df-generated"]
       - ["System.Net", "HttpListenerResponse", "Abort", "()", "summary", "df-generated"]
@@ -389,6 +309,8 @@ extensions:
       - ["System.Net", "HttpWebRequest", "AddRange", "(System.String,System.Int32,System.Int32)", "summary", "df-generated"]
       - ["System.Net", "HttpWebRequest", "AddRange", "(System.String,System.Int64)", "summary", "df-generated"]
       - ["System.Net", "HttpWebRequest", "AddRange", "(System.String,System.Int64,System.Int64)", "summary", "df-generated"]
+      - ["System.Net", "HttpWebRequest", "BeginGetRequestStream", "(System.AsyncCallback,System.Object)", "summary", "df-generated"]
+      - ["System.Net", "HttpWebRequest", "BeginGetResponse", "(System.AsyncCallback,System.Object)", "summary", "df-generated"]
       - ["System.Net", "HttpWebRequest", "GetObjectData", "(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)", "summary", "df-generated"]
       - ["System.Net", "HttpWebRequest", "HttpWebRequest", "(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)", "summary", "df-generated"]
       - ["System.Net", "HttpWebRequest", "get_HaveResponse", "()", "summary", "df-generated"]
@@ -504,6 +426,7 @@ extensions:
       - ["System.Net", "SocketAddress", "SocketAddress", "(System.Net.Sockets.AddressFamily)", "summary", "df-generated"]
       - ["System.Net", "SocketAddress", "SocketAddress", "(System.Net.Sockets.AddressFamily,System.Int32)", "summary", "df-generated"]
       - ["System.Net", "SocketAddress", "ToString", "()", "summary", "df-generated"]
+      - ["System.Net", "SocketAddress", "get_Buffer", "()", "summary", "df-generated"]
       - ["System.Net", "SocketAddress", "get_Family", "()", "summary", "df-generated"]
       - ["System.Net", "SocketAddress", "get_Item", "(System.Int32)", "summary", "df-generated"]
       - ["System.Net", "SocketAddress", "set_Item", "(System.Int32,System.Byte)", "summary", "df-generated"]
@@ -524,6 +447,27 @@ extensions:
       - ["System.Net", "UploadProgressChangedEventArgs", "get_TotalBytesToReceive", "()", "summary", "df-generated"]
       - ["System.Net", "UploadProgressChangedEventArgs", "get_TotalBytesToSend", "()", "summary", "df-generated"]
       - ["System.Net", "WebClient", "CancelAsync", "()", "summary", "df-generated"]
+      - ["System.Net", "WebClient", "DownloadData", "(System.String)", "summary", "df-generated"]
+      - ["System.Net", "WebClient", "DownloadData", "(System.Uri)", "summary", "df-generated"]
+      - ["System.Net", "WebClient", "DownloadDataAsync", "(System.Uri)", "summary", "df-generated"]
+      - ["System.Net", "WebClient", "DownloadDataAsync", "(System.Uri,System.Object)", "summary", "df-generated"]
+      - ["System.Net", "WebClient", "DownloadDataTaskAsync", "(System.String)", "summary", "df-generated"]
+      - ["System.Net", "WebClient", "DownloadDataTaskAsync", "(System.Uri)", "summary", "df-generated"]
+      - ["System.Net", "WebClient", "DownloadFile", "(System.String,System.String)", "summary", "df-generated"]
+      - ["System.Net", "WebClient", "DownloadFile", "(System.Uri,System.String)", "summary", "df-generated"]
+      - ["System.Net", "WebClient", "DownloadFileAsync", "(System.Uri,System.String)", "summary", "df-generated"]
+      - ["System.Net", "WebClient", "DownloadFileAsync", "(System.Uri,System.String,System.Object)", "summary", "df-generated"]
+      - ["System.Net", "WebClient", "DownloadFileTaskAsync", "(System.String,System.String)", "summary", "df-generated"]
+      - ["System.Net", "WebClient", "DownloadFileTaskAsync", "(System.Uri,System.String)", "summary", "df-generated"]
+      - ["System.Net", "WebClient", "DownloadString", "(System.String)", "summary", "df-generated"]
+      - ["System.Net", "WebClient", "DownloadString", "(System.Uri)", "summary", "df-generated"]
+      - ["System.Net", "WebClient", "DownloadStringAsync", "(System.Uri)", "summary", "df-generated"]
+      - ["System.Net", "WebClient", "DownloadStringAsync", "(System.Uri,System.Object)", "summary", "df-generated"]
+      - ["System.Net", "WebClient", "DownloadStringTaskAsync", "(System.String)", "summary", "df-generated"]
+      - ["System.Net", "WebClient", "DownloadStringTaskAsync", "(System.Uri)", "summary", "df-generated"]
+      - ["System.Net", "WebClient", "GetWebRequest", "(System.Uri)", "summary", "df-generated"]
+      - ["System.Net", "WebClient", "GetWebResponse", "(System.Net.WebRequest)", "summary", "df-generated"]
+      - ["System.Net", "WebClient", "GetWebResponse", "(System.Net.WebRequest,System.IAsyncResult)", "summary", "df-generated"]
       - ["System.Net", "WebClient", "OnDownloadDataCompleted", "(System.Net.DownloadDataCompletedEventArgs)", "summary", "df-generated"]
       - ["System.Net", "WebClient", "OnDownloadFileCompleted", "(System.ComponentModel.AsyncCompletedEventArgs)", "summary", "df-generated"]
       - ["System.Net", "WebClient", "OnDownloadProgressChanged", "(System.Net.DownloadProgressChangedEventArgs)", "summary", "df-generated"]
@@ -536,7 +480,60 @@ extensions:
       - ["System.Net", "WebClient", "OnUploadStringCompleted", "(System.Net.UploadStringCompletedEventArgs)", "summary", "df-generated"]
       - ["System.Net", "WebClient", "OnUploadValuesCompleted", "(System.Net.UploadValuesCompletedEventArgs)", "summary", "df-generated"]
       - ["System.Net", "WebClient", "OnWriteStreamClosed", "(System.Net.WriteStreamClosedEventArgs)", "summary", "df-generated"]
+      - ["System.Net", "WebClient", "OpenRead", "(System.String)", "summary", "df-generated"]
+      - ["System.Net", "WebClient", "OpenRead", "(System.Uri)", "summary", "df-generated"]
+      - ["System.Net", "WebClient", "OpenReadAsync", "(System.Uri)", "summary", "df-generated"]
+      - ["System.Net", "WebClient", "OpenReadAsync", "(System.Uri,System.Object)", "summary", "df-generated"]
+      - ["System.Net", "WebClient", "OpenReadTaskAsync", "(System.String)", "summary", "df-generated"]
+      - ["System.Net", "WebClient", "OpenReadTaskAsync", "(System.Uri)", "summary", "df-generated"]
+      - ["System.Net", "WebClient", "OpenWriteAsync", "(System.Uri)", "summary", "df-generated"]
+      - ["System.Net", "WebClient", "OpenWriteTaskAsync", "(System.String)", "summary", "df-generated"]
+      - ["System.Net", "WebClient", "OpenWriteTaskAsync", "(System.Uri)", "summary", "df-generated"]
+      - ["System.Net", "WebClient", "UploadData", "(System.String,System.Byte[])", "summary", "df-generated"]
+      - ["System.Net", "WebClient", "UploadData", "(System.Uri,System.Byte[])", "summary", "df-generated"]
+      - ["System.Net", "WebClient", "UploadDataAsync", "(System.Uri,System.Byte[])", "summary", "df-generated"]
+      - ["System.Net", "WebClient", "UploadDataTaskAsync", "(System.String,System.Byte[])", "summary", "df-generated"]
+      - ["System.Net", "WebClient", "UploadDataTaskAsync", "(System.Uri,System.Byte[])", "summary", "df-generated"]
+      - ["System.Net", "WebClient", "UploadFile", "(System.String,System.String)", "summary", "df-generated"]
+      - ["System.Net", "WebClient", "UploadFile", "(System.Uri,System.String)", "summary", "df-generated"]
+      - ["System.Net", "WebClient", "UploadFileAsync", "(System.Uri,System.String)", "summary", "df-generated"]
+      - ["System.Net", "WebClient", "UploadFileTaskAsync", "(System.String,System.String)", "summary", "df-generated"]
+      - ["System.Net", "WebClient", "UploadFileTaskAsync", "(System.Uri,System.String)", "summary", "df-generated"]
+      - ["System.Net", "WebClient", "UploadString", "(System.String,System.String)", "summary", "df-generated"]
+      - ["System.Net", "WebClient", "UploadString", "(System.Uri,System.String)", "summary", "df-generated"]
+      - ["System.Net", "WebClient", "UploadStringAsync", "(System.Uri,System.String)", "summary", "df-generated"]
+      - ["System.Net", "WebClient", "UploadStringTaskAsync", "(System.String,System.String)", "summary", "df-generated"]
+      - ["System.Net", "WebClient", "UploadStringTaskAsync", "(System.Uri,System.String)", "summary", "df-generated"]
+      - ["System.Net", "WebClient", "UploadValues", "(System.String,System.Collections.Specialized.NameValueCollection)", "summary", "df-generated"]
+      - ["System.Net", "WebClient", "UploadValues", "(System.Uri,System.Collections.Specialized.NameValueCollection)", "summary", "df-generated"]
+      - ["System.Net", "WebClient", "UploadValuesAsync", "(System.Uri,System.Collections.Specialized.NameValueCollection)", "summary", "df-generated"]
+      - ["System.Net", "WebClient", "UploadValuesTaskAsync", "(System.String,System.Collections.Specialized.NameValueCollection)", "summary", "df-generated"]
+      - ["System.Net", "WebClient", "UploadValuesTaskAsync", "(System.Uri,System.Collections.Specialized.NameValueCollection)", "summary", "df-generated"]
+      - ["System.Net", "WebClient", "add_DownloadDataCompleted", "(System.Net.DownloadDataCompletedEventHandler)", "summary", "df-generated"]
+      - ["System.Net", "WebClient", "add_DownloadFileCompleted", "(System.ComponentModel.AsyncCompletedEventHandler)", "summary", "df-generated"]
+      - ["System.Net", "WebClient", "add_DownloadProgressChanged", "(System.Net.DownloadProgressChangedEventHandler)", "summary", "df-generated"]
+      - ["System.Net", "WebClient", "add_DownloadStringCompleted", "(System.Net.DownloadStringCompletedEventHandler)", "summary", "df-generated"]
+      - ["System.Net", "WebClient", "add_OpenReadCompleted", "(System.Net.OpenReadCompletedEventHandler)", "summary", "df-generated"]
+      - ["System.Net", "WebClient", "add_OpenWriteCompleted", "(System.Net.OpenWriteCompletedEventHandler)", "summary", "df-generated"]
+      - ["System.Net", "WebClient", "add_UploadDataCompleted", "(System.Net.UploadDataCompletedEventHandler)", "summary", "df-generated"]
+      - ["System.Net", "WebClient", "add_UploadFileCompleted", "(System.Net.UploadFileCompletedEventHandler)", "summary", "df-generated"]
+      - ["System.Net", "WebClient", "add_UploadProgressChanged", "(System.Net.UploadProgressChangedEventHandler)", "summary", "df-generated"]
+      - ["System.Net", "WebClient", "add_UploadStringCompleted", "(System.Net.UploadStringCompletedEventHandler)", "summary", "df-generated"]
+      - ["System.Net", "WebClient", "add_UploadValuesCompleted", "(System.Net.UploadValuesCompletedEventHandler)", "summary", "df-generated"]
+      - ["System.Net", "WebClient", "add_WriteStreamClosed", "(System.Net.WriteStreamClosedEventHandler)", "summary", "df-generated"]
       - ["System.Net", "WebClient", "get_IsBusy", "()", "summary", "df-generated"]
+      - ["System.Net", "WebClient", "remove_DownloadDataCompleted", "(System.Net.DownloadDataCompletedEventHandler)", "summary", "df-generated"]
+      - ["System.Net", "WebClient", "remove_DownloadFileCompleted", "(System.ComponentModel.AsyncCompletedEventHandler)", "summary", "df-generated"]
+      - ["System.Net", "WebClient", "remove_DownloadProgressChanged", "(System.Net.DownloadProgressChangedEventHandler)", "summary", "df-generated"]
+      - ["System.Net", "WebClient", "remove_DownloadStringCompleted", "(System.Net.DownloadStringCompletedEventHandler)", "summary", "df-generated"]
+      - ["System.Net", "WebClient", "remove_OpenReadCompleted", "(System.Net.OpenReadCompletedEventHandler)", "summary", "df-generated"]
+      - ["System.Net", "WebClient", "remove_OpenWriteCompleted", "(System.Net.OpenWriteCompletedEventHandler)", "summary", "df-generated"]
+      - ["System.Net", "WebClient", "remove_UploadDataCompleted", "(System.Net.UploadDataCompletedEventHandler)", "summary", "df-generated"]
+      - ["System.Net", "WebClient", "remove_UploadFileCompleted", "(System.Net.UploadFileCompletedEventHandler)", "summary", "df-generated"]
+      - ["System.Net", "WebClient", "remove_UploadProgressChanged", "(System.Net.UploadProgressChangedEventHandler)", "summary", "df-generated"]
+      - ["System.Net", "WebClient", "remove_UploadStringCompleted", "(System.Net.UploadStringCompletedEventHandler)", "summary", "df-generated"]
+      - ["System.Net", "WebClient", "remove_UploadValuesCompleted", "(System.Net.UploadValuesCompletedEventHandler)", "summary", "df-generated"]
+      - ["System.Net", "WebClient", "remove_WriteStreamClosed", "(System.Net.WriteStreamClosedEventHandler)", "summary", "df-generated"]
       - ["System.Net", "WebException", "WebException", "(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)", "summary", "df-generated"]
       - ["System.Net", "WebException", "WebException", "(System.String)", "summary", "df-generated"]
       - ["System.Net", "WebException", "WebException", "(System.String,System.Exception)", "summary", "df-generated"]
@@ -587,11 +584,14 @@ extensions:
       - ["System.Net", "WebProxy", "WebProxy", "(System.Uri,System.Boolean,System.String[],System.Net.ICredentials)", "summary", "df-generated"]
       - ["System.Net", "WebProxy", "get_BypassArrayList", "()", "summary", "df-generated"]
       - ["System.Net", "WebRequest", "Abort", "()", "summary", "df-generated"]
+      - ["System.Net", "WebRequest", "BeginGetRequestStream", "(System.AsyncCallback,System.Object)", "summary", "df-generated"]
+      - ["System.Net", "WebRequest", "BeginGetResponse", "(System.AsyncCallback,System.Object)", "summary", "df-generated"]
       - ["System.Net", "WebRequest", "GetObjectData", "(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)", "summary", "df-generated"]
       - ["System.Net", "WebRequest", "GetResponseAsync", "()", "summary", "df-generated"]
       - ["System.Net", "WebRequest", "GetSystemWebProxy", "()", "summary", "df-generated"]
       - ["System.Net", "WebRequest", "RegisterPrefix", "(System.String,System.Net.IWebRequestCreate)", "summary", "df-generated"]
       - ["System.Net", "WebRequest", "WebRequest", "(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)", "summary", "df-generated"]
+      - ["System.Net", "WebRequest", "get_RequestUri", "()", "summary", "df-generated"]
       - ["System.Net", "WebResponse", "Close", "()", "summary", "df-generated"]
       - ["System.Net", "WebResponse", "Dispose", "()", "summary", "df-generated"]
       - ["System.Net", "WebResponse", "Dispose", "(System.Boolean)", "summary", "df-generated"]
diff --git a/csharp/ql/lib/ext/generated/System.Numerics.model.yml b/csharp/ql/lib/ext/generated/System.Numerics.model.yml
index 3db3e76c90f..d2e81180446 100644
--- a/csharp/ql/lib/ext/generated/System.Numerics.model.yml
+++ b/csharp/ql/lib/ext/generated/System.Numerics.model.yml
@@ -4,78 +4,79 @@ extensions:
       pack: codeql/csharp-all
       extensible: summaryModel
     data:
-      - ["System.Numerics", "BigInteger", False, "Abs", "(System.Numerics.BigInteger)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Numerics", "BigInteger", False, "Clamp", "(System.Numerics.BigInteger,System.Numerics.BigInteger,System.Numerics.BigInteger)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Numerics", "BigInteger", False, "Clamp", "(System.Numerics.BigInteger,System.Numerics.BigInteger,System.Numerics.BigInteger)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Numerics", "BigInteger", False, "Clamp", "(System.Numerics.BigInteger,System.Numerics.BigInteger,System.Numerics.BigInteger)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Numerics", "BigInteger", False, "CopySign", "(System.Numerics.BigInteger,System.Numerics.BigInteger)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Numerics", "BigInteger", False, "CreateChecked<TOther>", "(TOther)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Numerics", "BigInteger", False, "CreateSaturating<TOther>", "(TOther)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Numerics", "BigInteger", False, "CreateTruncating<TOther>", "(TOther)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Numerics", "BigInteger", False, "DivRem", "(System.Numerics.BigInteger,System.Numerics.BigInteger)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Numerics", "BigInteger", False, "DivRem", "(System.Numerics.BigInteger,System.Numerics.BigInteger,System.Numerics.BigInteger)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Numerics", "BigInteger", False, "Max", "(System.Numerics.BigInteger,System.Numerics.BigInteger)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Numerics", "BigInteger", False, "Max", "(System.Numerics.BigInteger,System.Numerics.BigInteger)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Numerics", "BigInteger", False, "MaxMagnitude", "(System.Numerics.BigInteger,System.Numerics.BigInteger)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Numerics", "BigInteger", False, "MaxMagnitude", "(System.Numerics.BigInteger,System.Numerics.BigInteger)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Numerics", "BigInteger", False, "MaxMagnitudeNumber", "(System.Numerics.BigInteger,System.Numerics.BigInteger)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Numerics", "BigInteger", False, "MaxMagnitudeNumber", "(System.Numerics.BigInteger,System.Numerics.BigInteger)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Numerics", "BigInteger", False, "MaxNumber", "(System.Numerics.BigInteger,System.Numerics.BigInteger)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Numerics", "BigInteger", False, "MaxNumber", "(System.Numerics.BigInteger,System.Numerics.BigInteger)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Numerics", "BigInteger", False, "Min", "(System.Numerics.BigInteger,System.Numerics.BigInteger)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Numerics", "BigInteger", False, "Min", "(System.Numerics.BigInteger,System.Numerics.BigInteger)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Numerics", "BigInteger", False, "MinMagnitude", "(System.Numerics.BigInteger,System.Numerics.BigInteger)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Numerics", "BigInteger", False, "MinMagnitude", "(System.Numerics.BigInteger,System.Numerics.BigInteger)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Numerics", "BigInteger", False, "MinMagnitudeNumber", "(System.Numerics.BigInteger,System.Numerics.BigInteger)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Numerics", "BigInteger", False, "MinMagnitudeNumber", "(System.Numerics.BigInteger,System.Numerics.BigInteger)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Numerics", "BigInteger", False, "MinNumber", "(System.Numerics.BigInteger,System.Numerics.BigInteger)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Numerics", "BigInteger", False, "MinNumber", "(System.Numerics.BigInteger,System.Numerics.BigInteger)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Numerics", "BigInteger", False, "Pow", "(System.Numerics.BigInteger,System.Int32)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Numerics", "BigInteger", False, "Remainder", "(System.Numerics.BigInteger,System.Numerics.BigInteger)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Numerics", "BigInteger", False, "RotateLeft", "(System.Numerics.BigInteger,System.Int32)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Numerics", "BigInteger", False, "RotateRight", "(System.Numerics.BigInteger,System.Int32)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Numerics", "BigInteger", False, "op_BitwiseOr", "(System.Numerics.BigInteger,System.Numerics.BigInteger)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Numerics", "BigInteger", False, "op_BitwiseOr", "(System.Numerics.BigInteger,System.Numerics.BigInteger)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Numerics", "BigInteger", False, "op_LeftShift", "(System.Numerics.BigInteger,System.Int32)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Numerics", "BigInteger", False, "op_Modulus", "(System.Numerics.BigInteger,System.Numerics.BigInteger)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Numerics", "BigInteger", False, "op_RightShift", "(System.Numerics.BigInteger,System.Int32)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Numerics", "BigInteger", False, "op_UnaryPlus", "(System.Numerics.BigInteger)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Numerics", "BigInteger", False, "op_UnsignedRightShift", "(System.Numerics.BigInteger,System.Int32)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Numerics", "Complex", False, "CreateChecked<TOther>", "(TOther)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Numerics", "Complex", False, "CreateSaturating<TOther>", "(TOther)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Numerics", "Complex", False, "CreateTruncating<TOther>", "(TOther)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Numerics", "Complex", False, "MaxMagnitude", "(System.Numerics.Complex,System.Numerics.Complex)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Numerics", "Complex", False, "MaxMagnitude", "(System.Numerics.Complex,System.Numerics.Complex)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Numerics", "Complex", False, "MaxMagnitudeNumber", "(System.Numerics.Complex,System.Numerics.Complex)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Numerics", "Complex", False, "MaxMagnitudeNumber", "(System.Numerics.Complex,System.Numerics.Complex)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Numerics", "Complex", False, "MinMagnitude", "(System.Numerics.Complex,System.Numerics.Complex)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Numerics", "Complex", False, "MinMagnitude", "(System.Numerics.Complex,System.Numerics.Complex)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Numerics", "Complex", False, "MinMagnitudeNumber", "(System.Numerics.Complex,System.Numerics.Complex)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Numerics", "Complex", False, "MinMagnitudeNumber", "(System.Numerics.Complex,System.Numerics.Complex)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Numerics", "Complex", False, "op_UnaryPlus", "(System.Numerics.Complex)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Numerics", "IAdditionOperators<TSelf,TOther,TResult>", True, "op_CheckedAddition", "(TSelf,TOther)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Numerics", "IAdditionOperators<TSelf,TOther,TResult>", True, "op_CheckedAddition", "(TSelf,TOther)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Numerics", "INumber<TSelf>", True, "Clamp", "(TSelf,TSelf,TSelf)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Numerics", "INumber<TSelf>", True, "Clamp", "(TSelf,TSelf,TSelf)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Numerics", "INumber<TSelf>", True, "Clamp", "(TSelf,TSelf,TSelf)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Numerics", "INumber<TSelf>", True, "CopySign", "(TSelf,TSelf)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Numerics", "INumber<TSelf>", True, "Max", "(TSelf,TSelf)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Numerics", "INumber<TSelf>", True, "Max", "(TSelf,TSelf)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Numerics", "INumber<TSelf>", True, "MaxNumber", "(TSelf,TSelf)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Numerics", "INumber<TSelf>", True, "MaxNumber", "(TSelf,TSelf)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Numerics", "INumber<TSelf>", True, "Min", "(TSelf,TSelf)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Numerics", "INumber<TSelf>", True, "Min", "(TSelf,TSelf)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Numerics", "INumber<TSelf>", True, "MinNumber", "(TSelf,TSelf)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Numerics", "INumber<TSelf>", True, "MinNumber", "(TSelf,TSelf)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Numerics", "INumberBase<TSelf>", True, "CreateChecked<TOther>", "(TOther)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Numerics", "INumberBase<TSelf>", True, "CreateSaturating<TOther>", "(TOther)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Numerics", "INumberBase<TSelf>", True, "CreateTruncating<TOther>", "(TOther)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Numerics", "Plane", False, "Normalize", "(System.Numerics.Plane)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Numerics", "Plane", False, "Plane", "(System.Numerics.Vector3,System.Single)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Numerics", "Plane", False, "ToString", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Numerics", "Vector", False, "Abs<T>", "(System.Numerics.Vector<T>)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Numerics", "Vector", False, "WithElement<T>", "(System.Numerics.Vector<T>,System.Int32,T)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Numerics", "Vector<T>", False, "op_UnaryPlus", "(System.Numerics.Vector<T>)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Numerics", "BigInteger", False, "Abs", "(System.Numerics.BigInteger)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Numerics", "BigInteger", False, "Clamp", "(System.Numerics.BigInteger,System.Numerics.BigInteger,System.Numerics.BigInteger)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Numerics", "BigInteger", False, "Clamp", "(System.Numerics.BigInteger,System.Numerics.BigInteger,System.Numerics.BigInteger)", "", "Argument[1]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Numerics", "BigInteger", False, "Clamp", "(System.Numerics.BigInteger,System.Numerics.BigInteger,System.Numerics.BigInteger)", "", "Argument[2]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Numerics", "BigInteger", False, "CopySign", "(System.Numerics.BigInteger,System.Numerics.BigInteger)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Numerics", "BigInteger", False, "CreateChecked<TOther>", "(TOther)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Numerics", "BigInteger", False, "CreateSaturating<TOther>", "(TOther)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Numerics", "BigInteger", False, "CreateTruncating<TOther>", "(TOther)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Numerics", "BigInteger", False, "DivRem", "(System.Numerics.BigInteger,System.Numerics.BigInteger)", "", "Argument[0]", "ReturnValue.Field[System.ValueTuple`2.Item2]", "value", "dfc-generated"]
+      - ["System.Numerics", "BigInteger", False, "DivRem", "(System.Numerics.BigInteger,System.Numerics.BigInteger,System.Numerics.BigInteger)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Numerics", "BigInteger", False, "Max", "(System.Numerics.BigInteger,System.Numerics.BigInteger)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Numerics", "BigInteger", False, "Max", "(System.Numerics.BigInteger,System.Numerics.BigInteger)", "", "Argument[1]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Numerics", "BigInteger", False, "MaxMagnitude", "(System.Numerics.BigInteger,System.Numerics.BigInteger)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Numerics", "BigInteger", False, "MaxMagnitude", "(System.Numerics.BigInteger,System.Numerics.BigInteger)", "", "Argument[1]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Numerics", "BigInteger", False, "MaxMagnitudeNumber", "(System.Numerics.BigInteger,System.Numerics.BigInteger)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Numerics", "BigInteger", False, "MaxMagnitudeNumber", "(System.Numerics.BigInteger,System.Numerics.BigInteger)", "", "Argument[1]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Numerics", "BigInteger", False, "MaxNumber", "(System.Numerics.BigInteger,System.Numerics.BigInteger)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Numerics", "BigInteger", False, "MaxNumber", "(System.Numerics.BigInteger,System.Numerics.BigInteger)", "", "Argument[1]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Numerics", "BigInteger", False, "Min", "(System.Numerics.BigInteger,System.Numerics.BigInteger)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Numerics", "BigInteger", False, "Min", "(System.Numerics.BigInteger,System.Numerics.BigInteger)", "", "Argument[1]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Numerics", "BigInteger", False, "MinMagnitude", "(System.Numerics.BigInteger,System.Numerics.BigInteger)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Numerics", "BigInteger", False, "MinMagnitude", "(System.Numerics.BigInteger,System.Numerics.BigInteger)", "", "Argument[1]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Numerics", "BigInteger", False, "MinMagnitudeNumber", "(System.Numerics.BigInteger,System.Numerics.BigInteger)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Numerics", "BigInteger", False, "MinMagnitudeNumber", "(System.Numerics.BigInteger,System.Numerics.BigInteger)", "", "Argument[1]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Numerics", "BigInteger", False, "MinNumber", "(System.Numerics.BigInteger,System.Numerics.BigInteger)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Numerics", "BigInteger", False, "MinNumber", "(System.Numerics.BigInteger,System.Numerics.BigInteger)", "", "Argument[1]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Numerics", "BigInteger", False, "Pow", "(System.Numerics.BigInteger,System.Int32)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Numerics", "BigInteger", False, "Remainder", "(System.Numerics.BigInteger,System.Numerics.BigInteger)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Numerics", "BigInteger", False, "RotateLeft", "(System.Numerics.BigInteger,System.Int32)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Numerics", "BigInteger", False, "RotateRight", "(System.Numerics.BigInteger,System.Int32)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Numerics", "BigInteger", False, "op_BitwiseOr", "(System.Numerics.BigInteger,System.Numerics.BigInteger)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Numerics", "BigInteger", False, "op_BitwiseOr", "(System.Numerics.BigInteger,System.Numerics.BigInteger)", "", "Argument[1]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Numerics", "BigInteger", False, "op_LeftShift", "(System.Numerics.BigInteger,System.Int32)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Numerics", "BigInteger", False, "op_Modulus", "(System.Numerics.BigInteger,System.Numerics.BigInteger)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Numerics", "BigInteger", False, "op_RightShift", "(System.Numerics.BigInteger,System.Int32)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Numerics", "BigInteger", False, "op_UnaryPlus", "(System.Numerics.BigInteger)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Numerics", "BigInteger", False, "op_UnsignedRightShift", "(System.Numerics.BigInteger,System.Int32)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Numerics", "Complex", False, "CreateChecked<TOther>", "(TOther)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Numerics", "Complex", False, "CreateSaturating<TOther>", "(TOther)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Numerics", "Complex", False, "CreateTruncating<TOther>", "(TOther)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Numerics", "Complex", False, "MaxMagnitude", "(System.Numerics.Complex,System.Numerics.Complex)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Numerics", "Complex", False, "MaxMagnitude", "(System.Numerics.Complex,System.Numerics.Complex)", "", "Argument[1]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Numerics", "Complex", False, "MaxMagnitudeNumber", "(System.Numerics.Complex,System.Numerics.Complex)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Numerics", "Complex", False, "MaxMagnitudeNumber", "(System.Numerics.Complex,System.Numerics.Complex)", "", "Argument[1]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Numerics", "Complex", False, "MinMagnitude", "(System.Numerics.Complex,System.Numerics.Complex)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Numerics", "Complex", False, "MinMagnitude", "(System.Numerics.Complex,System.Numerics.Complex)", "", "Argument[1]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Numerics", "Complex", False, "MinMagnitudeNumber", "(System.Numerics.Complex,System.Numerics.Complex)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Numerics", "Complex", False, "MinMagnitudeNumber", "(System.Numerics.Complex,System.Numerics.Complex)", "", "Argument[1]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Numerics", "Complex", False, "op_UnaryPlus", "(System.Numerics.Complex)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Numerics", "IAdditionOperators<TSelf,TOther,TResult>", True, "op_CheckedAddition", "(TSelf,TOther)", "", "Argument[0]", "ReturnValue", "taint", "dfc-generated"]
+      - ["System.Numerics", "IAdditionOperators<TSelf,TOther,TResult>", True, "op_CheckedAddition", "(TSelf,TOther)", "", "Argument[1]", "ReturnValue", "taint", "dfc-generated"]
+      - ["System.Numerics", "INumber<TSelf>", True, "Clamp", "(TSelf,TSelf,TSelf)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Numerics", "INumber<TSelf>", True, "Clamp", "(TSelf,TSelf,TSelf)", "", "Argument[1]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Numerics", "INumber<TSelf>", True, "Clamp", "(TSelf,TSelf,TSelf)", "", "Argument[2]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Numerics", "INumber<TSelf>", True, "CopySign", "(TSelf,TSelf)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Numerics", "INumber<TSelf>", True, "Max", "(TSelf,TSelf)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Numerics", "INumber<TSelf>", True, "Max", "(TSelf,TSelf)", "", "Argument[1]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Numerics", "INumber<TSelf>", True, "MaxNumber", "(TSelf,TSelf)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Numerics", "INumber<TSelf>", True, "MaxNumber", "(TSelf,TSelf)", "", "Argument[1]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Numerics", "INumber<TSelf>", True, "Min", "(TSelf,TSelf)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Numerics", "INumber<TSelf>", True, "Min", "(TSelf,TSelf)", "", "Argument[1]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Numerics", "INumber<TSelf>", True, "MinNumber", "(TSelf,TSelf)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Numerics", "INumber<TSelf>", True, "MinNumber", "(TSelf,TSelf)", "", "Argument[1]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Numerics", "INumberBase<TSelf>", True, "CreateChecked<TOther>", "(TOther)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Numerics", "INumberBase<TSelf>", True, "CreateSaturating<TOther>", "(TOther)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Numerics", "INumberBase<TSelf>", True, "CreateTruncating<TOther>", "(TOther)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Numerics", "Plane", False, "Normalize", "(System.Numerics.Plane)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Numerics", "Plane", False, "Plane", "(System.Numerics.Vector3,System.Single)", "", "Argument[0]", "Argument[this].Field[System.Numerics.Plane.Normal]", "value", "dfc-generated"]
+      - ["System.Numerics", "Plane", False, "ToString", "()", "", "Argument[this].Field[System.Numerics.Plane.Normal]", "ReturnValue", "taint", "dfc-generated"]
+      - ["System.Numerics", "Vector", False, "Abs<T>", "(System.Numerics.Vector<T>)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Numerics", "Vector", False, "StoreUnsafe<T>", "(System.Numerics.Vector<T>,T)", "", "Argument[1]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Numerics", "Vector", False, "WithElement<T>", "(System.Numerics.Vector<T>,System.Int32,T)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Numerics", "Vector<T>", False, "op_UnaryPlus", "(System.Numerics.Vector<T>)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
   - addsTo:
       pack: codeql/csharp-all
       extensible: neutralModel
@@ -983,7 +984,6 @@ extensions:
       - ["System.Numerics", "Vector", "Store<T>", "(System.Numerics.Vector<T>,T*)", "summary", "df-generated"]
       - ["System.Numerics", "Vector", "StoreAligned<T>", "(System.Numerics.Vector<T>,T*)", "summary", "df-generated"]
       - ["System.Numerics", "Vector", "StoreAlignedNonTemporal<T>", "(System.Numerics.Vector<T>,T*)", "summary", "df-generated"]
-      - ["System.Numerics", "Vector", "StoreUnsafe<T>", "(System.Numerics.Vector<T>,T)", "summary", "df-generated"]
       - ["System.Numerics", "Vector", "StoreUnsafe<T>", "(System.Numerics.Vector<T>,T,System.UIntPtr)", "summary", "df-generated"]
       - ["System.Numerics", "Vector", "Subtract<T>", "(System.Numerics.Vector<T>,System.Numerics.Vector<T>)", "summary", "df-generated"]
       - ["System.Numerics", "Vector", "Sum<T>", "(System.Numerics.Vector<T>)", "summary", "df-generated"]
diff --git a/csharp/ql/lib/ext/generated/System.Reflection.Context.model.yml b/csharp/ql/lib/ext/generated/System.Reflection.Context.model.yml
index be14f78a0ad..db4615af7ac 100644
--- a/csharp/ql/lib/ext/generated/System.Reflection.Context.model.yml
+++ b/csharp/ql/lib/ext/generated/System.Reflection.Context.model.yml
@@ -5,10 +5,12 @@ extensions:
       extensible: summaryModel
     data:
       - ["System.Reflection.Context", "CustomReflectionContext", False, "CustomReflectionContext", "(System.Reflection.ReflectionContext)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Reflection.Context", "CustomReflectionContext", True, "GetCustomAttributes", "(System.Reflection.MemberInfo,System.Collections.Generic.IEnumerable<System.Object>)", "", "Argument[1].Element", "ReturnValue", "taint", "df-generated"]
-      - ["System.Reflection.Context", "CustomReflectionContext", True, "GetCustomAttributes", "(System.Reflection.ParameterInfo,System.Collections.Generic.IEnumerable<System.Object>)", "", "Argument[1].Element", "ReturnValue", "taint", "df-generated"]
+      - ["System.Reflection.Context", "CustomReflectionContext", True, "GetCustomAttributes", "(System.Reflection.MemberInfo,System.Collections.Generic.IEnumerable<System.Object>)", "", "Argument[1]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Reflection.Context", "CustomReflectionContext", True, "GetCustomAttributes", "(System.Reflection.ParameterInfo,System.Collections.Generic.IEnumerable<System.Object>)", "", "Argument[1]", "ReturnValue", "value", "dfc-generated"]
   - addsTo:
       pack: codeql/csharp-all
       extensible: neutralModel
     data:
       - ["System.Reflection.Context", "CustomReflectionContext", "AddProperties", "(System.Type)", "summary", "df-generated"]
+      - ["System.Reflection.Context", "CustomReflectionContext", "CreateProperty", "(System.Type,System.String,System.Func<System.Object,System.Object>,System.Action<System.Object,System.Object>)", "summary", "df-generated"]
+      - ["System.Reflection.Context", "CustomReflectionContext", "CreateProperty", "(System.Type,System.String,System.Func<System.Object,System.Object>,System.Action<System.Object,System.Object>,System.Collections.Generic.IEnumerable<System.Attribute>,System.Collections.Generic.IEnumerable<System.Attribute>,System.Collections.Generic.IEnumerable<System.Attribute>)", "summary", "df-generated"]
diff --git a/csharp/ql/lib/ext/generated/System.Reflection.Emit.model.yml b/csharp/ql/lib/ext/generated/System.Reflection.Emit.model.yml
index ef3a475d2e1..c17596ddc88 100644
--- a/csharp/ql/lib/ext/generated/System.Reflection.Emit.model.yml
+++ b/csharp/ql/lib/ext/generated/System.Reflection.Emit.model.yml
@@ -30,18 +30,22 @@ extensions:
       - ["System.Reflection.Emit", "CustomAttributeBuilder", False, "CustomAttributeBuilder", "(System.Reflection.ConstructorInfo,System.Object[],System.Reflection.PropertyInfo[],System.Object[],System.Reflection.FieldInfo[],System.Object[])", "", "Argument[4].Element", "Argument[this]", "taint", "df-generated"]
       - ["System.Reflection.Emit", "CustomAttributeBuilder", False, "CustomAttributeBuilder", "(System.Reflection.ConstructorInfo,System.Object[],System.Reflection.PropertyInfo[],System.Object[],System.Reflection.FieldInfo[],System.Object[])", "", "Argument[5].Element", "Argument[this]", "taint", "df-generated"]
       - ["System.Reflection.Emit", "DynamicILInfo", False, "get_DynamicMethod", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Reflection.Emit", "DynamicMethod", False, "DynamicMethod", "(System.String,System.Reflection.MethodAttributes,System.Reflection.CallingConventions,System.Type,System.Type[],System.Reflection.Module,System.Boolean)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Reflection.Emit", "DynamicMethod", False, "DynamicMethod", "(System.String,System.Reflection.MethodAttributes,System.Reflection.CallingConventions,System.Type,System.Type[],System.Reflection.Module,System.Boolean)", "", "Argument[5]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Reflection.Emit", "DynamicMethod", False, "DynamicMethod", "(System.String,System.Reflection.MethodAttributes,System.Reflection.CallingConventions,System.Type,System.Type[],System.Type,System.Boolean)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Reflection.Emit", "DynamicMethod", False, "DynamicMethod", "(System.String,System.Type,System.Type[])", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Reflection.Emit", "DynamicMethod", False, "DynamicMethod", "(System.String,System.Type,System.Type[],System.Boolean)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Reflection.Emit", "DynamicMethod", False, "DynamicMethod", "(System.String,System.Type,System.Type[],System.Reflection.Module)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Reflection.Emit", "DynamicMethod", False, "DynamicMethod", "(System.String,System.Type,System.Type[],System.Reflection.Module)", "", "Argument[3]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Reflection.Emit", "DynamicMethod", False, "DynamicMethod", "(System.String,System.Type,System.Type[],System.Reflection.Module,System.Boolean)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Reflection.Emit", "DynamicMethod", False, "DynamicMethod", "(System.String,System.Type,System.Type[],System.Reflection.Module,System.Boolean)", "", "Argument[3]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Reflection.Emit", "DynamicMethod", False, "DynamicMethod", "(System.String,System.Type,System.Type[],System.Type)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Reflection.Emit", "DynamicMethod", False, "DynamicMethod", "(System.String,System.Type,System.Type[],System.Type,System.Boolean)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Reflection.Emit", "EnumBuilder", False, "get_UnderlyingField", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Reflection.Emit", "DynamicMethod", False, "DynamicMethod", "(System.String,System.Reflection.MethodAttributes,System.Reflection.CallingConventions,System.Type,System.Type[],System.Reflection.Module,System.Boolean)", "", "Argument[0]", "Argument[this].SyntheticField[System.Reflection.Emit.DynamicMethod._name]", "value", "dfc-generated"]
+      - ["System.Reflection.Emit", "DynamicMethod", False, "DynamicMethod", "(System.String,System.Reflection.MethodAttributes,System.Reflection.CallingConventions,System.Type,System.Type[],System.Reflection.Module,System.Boolean)", "", "Argument[5]", "Argument[this].SyntheticField[System.Reflection.Emit.DynamicMethod._module]", "value", "dfc-generated"]
+      - ["System.Reflection.Emit", "DynamicMethod", False, "DynamicMethod", "(System.String,System.Reflection.MethodAttributes,System.Reflection.CallingConventions,System.Type,System.Type[],System.Type,System.Boolean)", "", "Argument[0]", "Argument[this].SyntheticField[System.Reflection.Emit.DynamicMethod._name]", "value", "dfc-generated"]
+      - ["System.Reflection.Emit", "DynamicMethod", False, "DynamicMethod", "(System.String,System.Type,System.Type[])", "", "Argument[0]", "Argument[this].SyntheticField[System.Reflection.Emit.DynamicMethod._name]", "value", "dfc-generated"]
+      - ["System.Reflection.Emit", "DynamicMethod", False, "DynamicMethod", "(System.String,System.Type,System.Type[],System.Boolean)", "", "Argument[0]", "Argument[this].SyntheticField[System.Reflection.Emit.DynamicMethod._name]", "value", "dfc-generated"]
+      - ["System.Reflection.Emit", "DynamicMethod", False, "DynamicMethod", "(System.String,System.Type,System.Type[],System.Reflection.Module)", "", "Argument[0]", "Argument[this].SyntheticField[System.Reflection.Emit.DynamicMethod._name]", "value", "dfc-generated"]
+      - ["System.Reflection.Emit", "DynamicMethod", False, "DynamicMethod", "(System.String,System.Type,System.Type[],System.Reflection.Module)", "", "Argument[3]", "Argument[this].SyntheticField[System.Reflection.Emit.DynamicMethod._module]", "value", "dfc-generated"]
+      - ["System.Reflection.Emit", "DynamicMethod", False, "DynamicMethod", "(System.String,System.Type,System.Type[],System.Reflection.Module,System.Boolean)", "", "Argument[0]", "Argument[this].SyntheticField[System.Reflection.Emit.DynamicMethod._name]", "value", "dfc-generated"]
+      - ["System.Reflection.Emit", "DynamicMethod", False, "DynamicMethod", "(System.String,System.Type,System.Type[],System.Reflection.Module,System.Boolean)", "", "Argument[3]", "Argument[this].SyntheticField[System.Reflection.Emit.DynamicMethod._module]", "value", "dfc-generated"]
+      - ["System.Reflection.Emit", "DynamicMethod", False, "DynamicMethod", "(System.String,System.Type,System.Type[],System.Type)", "", "Argument[0]", "Argument[this].SyntheticField[System.Reflection.Emit.DynamicMethod._name]", "value", "dfc-generated"]
+      - ["System.Reflection.Emit", "DynamicMethod", False, "DynamicMethod", "(System.String,System.Type,System.Type[],System.Type,System.Boolean)", "", "Argument[0]", "Argument[this].SyntheticField[System.Reflection.Emit.DynamicMethod._name]", "value", "dfc-generated"]
+      - ["System.Reflection.Emit", "DynamicMethod", False, "GetParameters", "()", "", "Argument[this]", "ReturnValue.Element.Field[System.Reflection.ParameterInfo.MemberImpl]", "value", "dfc-generated"]
+      - ["System.Reflection.Emit", "DynamicMethod", False, "get_Module", "()", "", "Argument[this].SyntheticField[System.Reflection.Emit.DynamicMethod._module]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Reflection.Emit", "DynamicMethod", False, "get_Name", "()", "", "Argument[this].SyntheticField[System.Reflection.Emit.DynamicMethod._name]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Reflection.Emit", "DynamicMethod", False, "get_ReturnParameter", "()", "", "Argument[this]", "ReturnValue.Field[System.Reflection.ParameterInfo.MemberImpl]", "value", "dfc-generated"]
+      - ["System.Reflection.Emit", "EnumBuilder", False, "get_UnderlyingField", "()", "", "Argument[this].Property[System.Reflection.Emit.EnumBuilder.UnderlyingFieldCore]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Reflection.Emit", "EnumBuilder", False, "get_UnderlyingFieldCore", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Reflection.Emit", "EventBuilder", False, "AddOtherMethodCore", "(System.Reflection.Emit.MethodBuilder)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Reflection.Emit", "EventBuilder", False, "SetAddOnMethodCore", "(System.Reflection.Emit.MethodBuilder)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
@@ -79,6 +83,8 @@ extensions:
       - ["System.Reflection.Emit", "ModuleBuilder", False, "DefineType", "(System.String,System.Reflection.TypeAttributes,System.Type,System.Reflection.Emit.PackingSize,System.Int32)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Reflection.Emit", "ModuleBuilder", False, "DefineType", "(System.String,System.Reflection.TypeAttributes,System.Type,System.Type[])", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["System.Reflection.Emit", "ModuleBuilder", False, "DefineType", "(System.String,System.Reflection.TypeAttributes,System.Type,System.Type[])", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Reflection.Emit", "ModuleBuilder", False, "GetArrayMethod", "(System.Type,System.String,System.Reflection.CallingConventions,System.Type,System.Type[])", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Reflection.Emit", "ModuleBuilder", False, "GetArrayMethod", "(System.Type,System.String,System.Reflection.CallingConventions,System.Type,System.Type[])", "", "Argument[4].Element", "ReturnValue", "taint", "df-generated"]
       - ["System.Reflection.Emit", "ModuleBuilder", True, "DefineEnumCore", "(System.String,System.Reflection.TypeAttributes,System.Type)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["System.Reflection.Emit", "ModuleBuilder", True, "DefineEnumCore", "(System.String,System.Reflection.TypeAttributes,System.Type)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Reflection.Emit", "ModuleBuilder", True, "DefineInitializedDataCore", "(System.String,System.Byte[],System.Reflection.FieldAttributes)", "", "Argument[1].Element", "ReturnValue", "taint", "df-generated"]
@@ -86,7 +92,7 @@ extensions:
       - ["System.Reflection.Emit", "ModuleBuilder", True, "DefineTypeCore", "(System.String,System.Reflection.TypeAttributes,System.Type,System.Type[],System.Reflection.Emit.PackingSize,System.Int32)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Reflection.Emit", "ModuleBuilder", True, "GetArrayMethodCore", "(System.Type,System.String,System.Reflection.CallingConventions,System.Type,System.Type[])", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
       - ["System.Reflection.Emit", "ModuleBuilder", True, "GetArrayMethodCore", "(System.Type,System.String,System.Reflection.CallingConventions,System.Type,System.Type[])", "", "Argument[4].Element", "ReturnValue", "taint", "df-generated"]
-      - ["System.Reflection.Emit", "OpCode", False, "ToString", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Reflection.Emit", "OpCode", False, "ToString", "()", "", "Argument[this].Property[System.Reflection.Emit.OpCode.Name]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Reflection.Emit", "ParameterBuilder", False, "SetCustomAttribute", "(System.Reflection.ConstructorInfo,System.Byte[])", "", "Argument[1].Element", "Argument[this]", "taint", "df-generated"]
       - ["System.Reflection.Emit", "ParameterBuilder", False, "SetCustomAttribute", "(System.Reflection.Emit.CustomAttributeBuilder)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Reflection.Emit", "ParameterBuilder", True, "SetConstant", "(System.Object)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
@@ -101,7 +107,7 @@ extensions:
       - ["System.Reflection.Emit", "SignatureHelper", False, "GetMethodSigHelper", "(System.Reflection.Module,System.Reflection.CallingConventions,System.Type)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["System.Reflection.Emit", "SignatureHelper", False, "GetMethodSigHelper", "(System.Reflection.Module,System.Runtime.InteropServices.CallingConvention,System.Type)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["System.Reflection.Emit", "SignatureHelper", False, "GetMethodSigHelper", "(System.Reflection.Module,System.Type,System.Type[])", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Reflection.Emit", "TypeBuilder", False, "CreateTypeInfoCore", "()", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["System.Reflection.Emit", "TypeBuilder", False, "CreateTypeInfoCore", "()", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Reflection.Emit", "TypeBuilder", False, "DefineConstructorCore", "(System.Reflection.MethodAttributes,System.Reflection.CallingConventions,System.Type[],System.Type[][],System.Type[][])", "", "Argument[3].Element", "ReturnValue", "taint", "df-generated"]
       - ["System.Reflection.Emit", "TypeBuilder", False, "DefineConstructorCore", "(System.Reflection.MethodAttributes,System.Reflection.CallingConventions,System.Type[],System.Type[][],System.Type[][])", "", "Argument[4].Element", "ReturnValue", "taint", "df-generated"]
       - ["System.Reflection.Emit", "TypeBuilder", False, "DefineConstructorCore", "(System.Reflection.MethodAttributes,System.Reflection.CallingConventions,System.Type[],System.Type[][],System.Type[][])", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
@@ -141,6 +147,7 @@ extensions:
     data:
       - ["System.Reflection.Emit", "AssemblyBuilder", "DefineDynamicModule", "(System.String)", "summary", "df-generated"]
       - ["System.Reflection.Emit", "AssemblyBuilder", "Equals", "(System.Object)", "summary", "df-generated"]
+      - ["System.Reflection.Emit", "AssemblyBuilder", "GetCustomAttributes", "(System.Boolean)", "summary", "df-generated"]
       - ["System.Reflection.Emit", "AssemblyBuilder", "GetCustomAttributes", "(System.Type,System.Boolean)", "summary", "df-generated"]
       - ["System.Reflection.Emit", "AssemblyBuilder", "GetCustomAttributesData", "()", "summary", "df-generated"]
       - ["System.Reflection.Emit", "AssemblyBuilder", "GetDynamicModule", "(System.String)", "summary", "df-generated"]
@@ -160,11 +167,11 @@ extensions:
       - ["System.Reflection.Emit", "AssemblyBuilder", "get_IsDynamic", "()", "summary", "df-generated"]
       - ["System.Reflection.Emit", "AssemblyBuilder", "get_ReflectionOnly", "()", "summary", "df-generated"]
       - ["System.Reflection.Emit", "ConstructorBuilder", "DefineParameter", "(System.Int32,System.Reflection.ParameterAttributes,System.String)", "summary", "df-generated"]
+      - ["System.Reflection.Emit", "ConstructorBuilder", "GetCustomAttributes", "(System.Boolean)", "summary", "df-generated"]
       - ["System.Reflection.Emit", "ConstructorBuilder", "GetCustomAttributes", "(System.Type,System.Boolean)", "summary", "df-generated"]
       - ["System.Reflection.Emit", "ConstructorBuilder", "GetILGenerator", "()", "summary", "df-generated"]
       - ["System.Reflection.Emit", "ConstructorBuilder", "GetILGenerator", "(System.Int32)", "summary", "df-generated"]
       - ["System.Reflection.Emit", "ConstructorBuilder", "GetMethodImplementationFlags", "()", "summary", "df-generated"]
-      - ["System.Reflection.Emit", "ConstructorBuilder", "Invoke", "(System.Object,System.Reflection.BindingFlags,System.Reflection.Binder,System.Object[],System.Globalization.CultureInfo)", "summary", "df-generated"]
       - ["System.Reflection.Emit", "ConstructorBuilder", "Invoke", "(System.Reflection.BindingFlags,System.Reflection.Binder,System.Object[],System.Globalization.CultureInfo)", "summary", "df-generated"]
       - ["System.Reflection.Emit", "ConstructorBuilder", "IsDefined", "(System.Type,System.Boolean)", "summary", "df-generated"]
       - ["System.Reflection.Emit", "ConstructorBuilder", "SetCustomAttribute", "(System.Reflection.ConstructorInfo,System.Byte[])", "summary", "df-generated"]
@@ -192,12 +199,12 @@ extensions:
       - ["System.Reflection.Emit", "DynamicILInfo", "SetLocalSignature", "(System.Byte[])", "summary", "df-generated"]
       - ["System.Reflection.Emit", "DynamicMethod", "CreateDelegate", "(System.Type,System.Object)", "summary", "df-generated"]
       - ["System.Reflection.Emit", "DynamicMethod", "DefineParameter", "(System.Int32,System.Reflection.ParameterAttributes,System.String)", "summary", "df-generated"]
+      - ["System.Reflection.Emit", "DynamicMethod", "GetCustomAttributes", "(System.Boolean)", "summary", "df-generated"]
       - ["System.Reflection.Emit", "DynamicMethod", "GetCustomAttributes", "(System.Type,System.Boolean)", "summary", "df-generated"]
       - ["System.Reflection.Emit", "DynamicMethod", "GetDynamicILInfo", "()", "summary", "df-generated"]
       - ["System.Reflection.Emit", "DynamicMethod", "GetILGenerator", "()", "summary", "df-generated"]
       - ["System.Reflection.Emit", "DynamicMethod", "GetILGenerator", "(System.Int32)", "summary", "df-generated"]
       - ["System.Reflection.Emit", "DynamicMethod", "GetMethodImplementationFlags", "()", "summary", "df-generated"]
-      - ["System.Reflection.Emit", "DynamicMethod", "Invoke", "(System.Object,System.Reflection.BindingFlags,System.Reflection.Binder,System.Object[],System.Globalization.CultureInfo)", "summary", "df-generated"]
       - ["System.Reflection.Emit", "DynamicMethod", "IsDefined", "(System.Type,System.Boolean)", "summary", "df-generated"]
       - ["System.Reflection.Emit", "DynamicMethod", "ToString", "()", "summary", "df-generated"]
       - ["System.Reflection.Emit", "DynamicMethod", "get_Attributes", "()", "summary", "df-generated"]
@@ -212,6 +219,7 @@ extensions:
       - ["System.Reflection.Emit", "EnumBuilder", "DefineLiteralCore", "(System.String,System.Object)", "summary", "df-generated"]
       - ["System.Reflection.Emit", "EnumBuilder", "GetAttributeFlagsImpl", "()", "summary", "df-generated"]
       - ["System.Reflection.Emit", "EnumBuilder", "GetConstructors", "(System.Reflection.BindingFlags)", "summary", "df-generated"]
+      - ["System.Reflection.Emit", "EnumBuilder", "GetCustomAttributes", "(System.Boolean)", "summary", "df-generated"]
       - ["System.Reflection.Emit", "EnumBuilder", "GetCustomAttributes", "(System.Type,System.Boolean)", "summary", "df-generated"]
       - ["System.Reflection.Emit", "EnumBuilder", "GetEvents", "()", "summary", "df-generated"]
       - ["System.Reflection.Emit", "EnumBuilder", "GetEvents", "(System.Reflection.BindingFlags)", "summary", "df-generated"]
@@ -258,6 +266,7 @@ extensions:
       - ["System.Reflection.Emit", "ExceptionHandler", "get_TryOffset", "()", "summary", "df-generated"]
       - ["System.Reflection.Emit", "ExceptionHandler", "op_Equality", "(System.Reflection.Emit.ExceptionHandler,System.Reflection.Emit.ExceptionHandler)", "summary", "df-generated"]
       - ["System.Reflection.Emit", "ExceptionHandler", "op_Inequality", "(System.Reflection.Emit.ExceptionHandler,System.Reflection.Emit.ExceptionHandler)", "summary", "df-generated"]
+      - ["System.Reflection.Emit", "FieldBuilder", "GetCustomAttributes", "(System.Boolean)", "summary", "df-generated"]
       - ["System.Reflection.Emit", "FieldBuilder", "GetCustomAttributes", "(System.Type,System.Boolean)", "summary", "df-generated"]
       - ["System.Reflection.Emit", "FieldBuilder", "GetValue", "(System.Object)", "summary", "df-generated"]
       - ["System.Reflection.Emit", "FieldBuilder", "IsDefined", "(System.Type,System.Boolean)", "summary", "df-generated"]
@@ -272,6 +281,7 @@ extensions:
       - ["System.Reflection.Emit", "GenericTypeParameterBuilder", "Equals", "(System.Object)", "summary", "df-generated"]
       - ["System.Reflection.Emit", "GenericTypeParameterBuilder", "GetAttributeFlagsImpl", "()", "summary", "df-generated"]
       - ["System.Reflection.Emit", "GenericTypeParameterBuilder", "GetConstructors", "(System.Reflection.BindingFlags)", "summary", "df-generated"]
+      - ["System.Reflection.Emit", "GenericTypeParameterBuilder", "GetCustomAttributes", "(System.Boolean)", "summary", "df-generated"]
       - ["System.Reflection.Emit", "GenericTypeParameterBuilder", "GetCustomAttributes", "(System.Type,System.Boolean)", "summary", "df-generated"]
       - ["System.Reflection.Emit", "GenericTypeParameterBuilder", "GetEvents", "()", "summary", "df-generated"]
       - ["System.Reflection.Emit", "GenericTypeParameterBuilder", "GetEvents", "(System.Reflection.BindingFlags)", "summary", "df-generated"]
@@ -362,12 +372,12 @@ extensions:
       - ["System.Reflection.Emit", "MethodBuilder", "DefineGenericParameters", "(System.String[])", "summary", "df-generated"]
       - ["System.Reflection.Emit", "MethodBuilder", "DefineParameter", "(System.Int32,System.Reflection.ParameterAttributes,System.String)", "summary", "df-generated"]
       - ["System.Reflection.Emit", "MethodBuilder", "Equals", "(System.Object)", "summary", "df-generated"]
+      - ["System.Reflection.Emit", "MethodBuilder", "GetCustomAttributes", "(System.Boolean)", "summary", "df-generated"]
       - ["System.Reflection.Emit", "MethodBuilder", "GetCustomAttributes", "(System.Type,System.Boolean)", "summary", "df-generated"]
       - ["System.Reflection.Emit", "MethodBuilder", "GetHashCode", "()", "summary", "df-generated"]
       - ["System.Reflection.Emit", "MethodBuilder", "GetILGenerator", "()", "summary", "df-generated"]
       - ["System.Reflection.Emit", "MethodBuilder", "GetILGenerator", "(System.Int32)", "summary", "df-generated"]
       - ["System.Reflection.Emit", "MethodBuilder", "GetMethodImplementationFlags", "()", "summary", "df-generated"]
-      - ["System.Reflection.Emit", "MethodBuilder", "Invoke", "(System.Object,System.Reflection.BindingFlags,System.Reflection.Binder,System.Object[],System.Globalization.CultureInfo)", "summary", "df-generated"]
       - ["System.Reflection.Emit", "MethodBuilder", "IsDefined", "(System.Type,System.Boolean)", "summary", "df-generated"]
       - ["System.Reflection.Emit", "MethodBuilder", "SetCustomAttribute", "(System.Reflection.ConstructorInfo,System.Byte[])", "summary", "df-generated"]
       - ["System.Reflection.Emit", "MethodBuilder", "SetCustomAttribute", "(System.Reflection.Emit.CustomAttributeBuilder)", "summary", "df-generated"]
@@ -398,7 +408,7 @@ extensions:
       - ["System.Reflection.Emit", "ModuleBuilder", "DefineUninitializedData", "(System.String,System.Int32,System.Reflection.FieldAttributes)", "summary", "df-generated"]
       - ["System.Reflection.Emit", "ModuleBuilder", "DefineUninitializedDataCore", "(System.String,System.Int32,System.Reflection.FieldAttributes)", "summary", "df-generated"]
       - ["System.Reflection.Emit", "ModuleBuilder", "Equals", "(System.Object)", "summary", "df-generated"]
-      - ["System.Reflection.Emit", "ModuleBuilder", "GetArrayMethod", "(System.Type,System.String,System.Reflection.CallingConventions,System.Type,System.Type[])", "summary", "df-generated"]
+      - ["System.Reflection.Emit", "ModuleBuilder", "GetCustomAttributes", "(System.Boolean)", "summary", "df-generated"]
       - ["System.Reflection.Emit", "ModuleBuilder", "GetCustomAttributes", "(System.Type,System.Boolean)", "summary", "df-generated"]
       - ["System.Reflection.Emit", "ModuleBuilder", "GetCustomAttributesData", "()", "summary", "df-generated"]
       - ["System.Reflection.Emit", "ModuleBuilder", "GetFieldMetadataToken", "(System.Reflection.FieldInfo)", "summary", "df-generated"]
@@ -444,8 +454,8 @@ extensions:
       - ["System.Reflection.Emit", "ParameterBuilder", "get_IsOut", "()", "summary", "df-generated"]
       - ["System.Reflection.Emit", "ParameterBuilder", "get_Position", "()", "summary", "df-generated"]
       - ["System.Reflection.Emit", "PropertyBuilder", "AddOtherMethod", "(System.Reflection.Emit.MethodBuilder)", "summary", "df-generated"]
+      - ["System.Reflection.Emit", "PropertyBuilder", "GetCustomAttributes", "(System.Boolean)", "summary", "df-generated"]
       - ["System.Reflection.Emit", "PropertyBuilder", "GetCustomAttributes", "(System.Type,System.Boolean)", "summary", "df-generated"]
-      - ["System.Reflection.Emit", "PropertyBuilder", "GetValue", "(System.Object,System.Object[])", "summary", "df-generated"]
       - ["System.Reflection.Emit", "PropertyBuilder", "GetValue", "(System.Object,System.Reflection.BindingFlags,System.Reflection.Binder,System.Object[],System.Globalization.CultureInfo)", "summary", "df-generated"]
       - ["System.Reflection.Emit", "PropertyBuilder", "IsDefined", "(System.Type,System.Boolean)", "summary", "df-generated"]
       - ["System.Reflection.Emit", "PropertyBuilder", "SetConstant", "(System.Object)", "summary", "df-generated"]
@@ -513,6 +523,7 @@ extensions:
       - ["System.Reflection.Emit", "TypeBuilder", "DefineUninitializedDataCore", "(System.String,System.Int32,System.Reflection.FieldAttributes)", "summary", "df-generated"]
       - ["System.Reflection.Emit", "TypeBuilder", "GetAttributeFlagsImpl", "()", "summary", "df-generated"]
       - ["System.Reflection.Emit", "TypeBuilder", "GetConstructors", "(System.Reflection.BindingFlags)", "summary", "df-generated"]
+      - ["System.Reflection.Emit", "TypeBuilder", "GetCustomAttributes", "(System.Boolean)", "summary", "df-generated"]
       - ["System.Reflection.Emit", "TypeBuilder", "GetCustomAttributes", "(System.Type,System.Boolean)", "summary", "df-generated"]
       - ["System.Reflection.Emit", "TypeBuilder", "GetEvents", "()", "summary", "df-generated"]
       - ["System.Reflection.Emit", "TypeBuilder", "GetEvents", "(System.Reflection.BindingFlags)", "summary", "df-generated"]
diff --git a/csharp/ql/lib/ext/generated/System.Reflection.Metadata.Ecma335.model.yml b/csharp/ql/lib/ext/generated/System.Reflection.Metadata.Ecma335.model.yml
index 47b473003d4..9eaeb30bf78 100644
--- a/csharp/ql/lib/ext/generated/System.Reflection.Metadata.Ecma335.model.yml
+++ b/csharp/ql/lib/ext/generated/System.Reflection.Metadata.Ecma335.model.yml
@@ -4,12 +4,12 @@ extensions:
       pack: codeql/csharp-all
       extensible: summaryModel
     data:
-      - ["System.Reflection.Metadata.Ecma335", "CustomModifiersEncoder", False, "AddModifier", "(System.Reflection.Metadata.EntityHandle,System.Boolean)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["System.Reflection.Metadata.Ecma335", "ExceptionRegionEncoder", False, "Add", "(System.Reflection.Metadata.ExceptionRegionKind,System.Int32,System.Int32,System.Int32,System.Int32,System.Reflection.Metadata.EntityHandle,System.Int32)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["System.Reflection.Metadata.Ecma335", "ExceptionRegionEncoder", False, "AddCatch", "(System.Int32,System.Int32,System.Int32,System.Int32,System.Reflection.Metadata.EntityHandle)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Reflection.Metadata.Ecma335", "ExceptionRegionEncoder", False, "AddFault", "(System.Int32,System.Int32,System.Int32,System.Int32)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Reflection.Metadata.Ecma335", "ExceptionRegionEncoder", False, "AddFilter", "(System.Int32,System.Int32,System.Int32,System.Int32,System.Int32)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Reflection.Metadata.Ecma335", "ExceptionRegionEncoder", False, "AddFinally", "(System.Int32,System.Int32,System.Int32,System.Int32)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Reflection.Metadata.Ecma335", "CustomModifiersEncoder", False, "AddModifier", "(System.Reflection.Metadata.EntityHandle,System.Boolean)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Reflection.Metadata.Ecma335", "ExceptionRegionEncoder", False, "Add", "(System.Reflection.Metadata.ExceptionRegionKind,System.Int32,System.Int32,System.Int32,System.Int32,System.Reflection.Metadata.EntityHandle,System.Int32)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Reflection.Metadata.Ecma335", "ExceptionRegionEncoder", False, "AddCatch", "(System.Int32,System.Int32,System.Int32,System.Int32,System.Reflection.Metadata.EntityHandle)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Reflection.Metadata.Ecma335", "ExceptionRegionEncoder", False, "AddFault", "(System.Int32,System.Int32,System.Int32,System.Int32)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Reflection.Metadata.Ecma335", "ExceptionRegionEncoder", False, "AddFilter", "(System.Int32,System.Int32,System.Int32,System.Int32,System.Int32)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Reflection.Metadata.Ecma335", "ExceptionRegionEncoder", False, "AddFinally", "(System.Int32,System.Int32,System.Int32,System.Int32)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Reflection.Metadata.Ecma335", "InstructionEncoder", False, "Switch", "(System.Int32)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Reflection.Metadata.Ecma335", "MetadataBuilder", False, "AddAssembly", "(System.Reflection.Metadata.StringHandle,System.Version,System.Reflection.Metadata.StringHandle,System.Reflection.Metadata.BlobHandle,System.Reflection.AssemblyFlags,System.Reflection.AssemblyHashAlgorithm)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Reflection.Metadata.Ecma335", "MetadataBuilder", False, "AddAssembly", "(System.Reflection.Metadata.StringHandle,System.Version,System.Reflection.Metadata.StringHandle,System.Reflection.Metadata.BlobHandle,System.Reflection.AssemblyFlags,System.Reflection.AssemblyHashAlgorithm)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
@@ -21,19 +21,22 @@ extensions:
       - ["System.Reflection.Metadata.Ecma335", "MetadataBuilder", False, "AddModule", "(System.Int32,System.Reflection.Metadata.StringHandle,System.Reflection.Metadata.GuidHandle,System.Reflection.Metadata.GuidHandle,System.Reflection.Metadata.GuidHandle)", "", "Argument[4]", "Argument[this]", "taint", "df-generated"]
       - ["System.Reflection.Metadata.Ecma335", "MetadataRootBuilder", False, "MetadataRootBuilder", "(System.Reflection.Metadata.Ecma335.MetadataBuilder,System.String,System.Boolean)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Reflection.Metadata.Ecma335", "MetadataRootBuilder", False, "get_Sizes", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Reflection.Metadata.Ecma335", "PermissionSetEncoder", False, "AddPermission", "(System.String,System.Collections.Immutable.ImmutableArray<System.Byte>)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["System.Reflection.Metadata.Ecma335", "PermissionSetEncoder", False, "AddPermission", "(System.String,System.Reflection.Metadata.BlobBuilder)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["System.Reflection.Metadata.Ecma335", "PermissionSetEncoder", False, "AddPermission", "(System.String,System.Collections.Immutable.ImmutableArray<System.Byte>)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Reflection.Metadata.Ecma335", "PermissionSetEncoder", False, "AddPermission", "(System.String,System.Reflection.Metadata.BlobBuilder)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Reflection.Metadata.Ecma335", "PortablePdbBuilder", False, "Serialize", "(System.Reflection.Metadata.BlobBuilder)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Reflection.Metadata.Ecma335", "SignatureDecoder<TType,TGenericContext>", False, "DecodeFieldSignature", "(System.Reflection.Metadata.BlobReader)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Reflection.Metadata.Ecma335", "SignatureDecoder<TType,TGenericContext>", False, "DecodeLocalSignature", "(System.Reflection.Metadata.BlobReader)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Reflection.Metadata.Ecma335", "SignatureDecoder<TType,TGenericContext>", False, "DecodeMethodSpecificationSignature", "(System.Reflection.Metadata.BlobReader)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Reflection.Metadata.Ecma335", "SignatureDecoder<TType,TGenericContext>", False, "DecodeType", "(System.Reflection.Metadata.BlobReader,System.Boolean)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Reflection.Metadata.Ecma335", "PortablePdbBuilder", False, "Serialize", "(System.Reflection.Metadata.BlobBuilder)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Reflection.Metadata.Ecma335", "SignatureDecoder<TType,TGenericContext>", False, "DecodeFieldSignature", "(System.Reflection.Metadata.BlobReader)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Reflection.Metadata.Ecma335", "SignatureDecoder<TType,TGenericContext>", False, "DecodeLocalSignature", "(System.Reflection.Metadata.BlobReader)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Reflection.Metadata.Ecma335", "SignatureDecoder<TType,TGenericContext>", False, "DecodeMethodSignature", "(System.Reflection.Metadata.BlobReader)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Reflection.Metadata.Ecma335", "SignatureDecoder<TType,TGenericContext>", False, "DecodeMethodSpecificationSignature", "(System.Reflection.Metadata.BlobReader)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Reflection.Metadata.Ecma335", "SignatureDecoder<TType,TGenericContext>", False, "DecodeType", "(System.Reflection.Metadata.BlobReader,System.Boolean)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Reflection.Metadata.Ecma335", "SignatureDecoder<TType,TGenericContext>", False, "SignatureDecoder", "(System.Reflection.Metadata.ISignatureTypeProvider<TType,TGenericContext>,System.Reflection.Metadata.MetadataReader,TGenericContext)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Reflection.Metadata.Ecma335", "SignatureDecoder<TType,TGenericContext>", False, "SignatureDecoder", "(System.Reflection.Metadata.ISignatureTypeProvider<TType,TGenericContext>,System.Reflection.Metadata.MetadataReader,TGenericContext)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
       - ["System.Reflection.Metadata.Ecma335", "SignatureDecoder<TType,TGenericContext>", False, "SignatureDecoder", "(System.Reflection.Metadata.ISignatureTypeProvider<TType,TGenericContext>,System.Reflection.Metadata.MetadataReader,TGenericContext)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Reflection.Metadata.Ecma335", "SignatureTypeEncoder", False, "Array", "(System.Reflection.Metadata.Ecma335.SignatureTypeEncoder,System.Reflection.Metadata.Ecma335.ArrayShapeEncoder)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Reflection.Metadata.Ecma335", "SignatureTypeEncoder", False, "Pointer", "()", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["System.Reflection.Metadata.Ecma335", "SignatureTypeEncoder", False, "SZArray", "()", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["System.Reflection.Metadata.Ecma335", "SignatureTypeEncoder", False, "Array", "(System.Action<System.Reflection.Metadata.Ecma335.SignatureTypeEncoder>,System.Action<System.Reflection.Metadata.Ecma335.ArrayShapeEncoder>)", "", "Argument[this]", "Argument[0].Parameter[0]", "value", "dfc-generated"]
+      - ["System.Reflection.Metadata.Ecma335", "SignatureTypeEncoder", False, "Array", "(System.Reflection.Metadata.Ecma335.SignatureTypeEncoder,System.Reflection.Metadata.Ecma335.ArrayShapeEncoder)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Reflection.Metadata.Ecma335", "SignatureTypeEncoder", False, "Pointer", "()", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Reflection.Metadata.Ecma335", "SignatureTypeEncoder", False, "SZArray", "()", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
   - addsTo:
       pack: codeql/csharp-all
       extensible: neutralModel
@@ -42,6 +45,7 @@ extensions:
       - ["System.Reflection.Metadata.Ecma335", "ArrayShapeEncoder", "Shape", "(System.Int32,System.Collections.Immutable.ImmutableArray<System.Int32>,System.Collections.Immutable.ImmutableArray<System.Int32>)", "summary", "df-generated"]
       - ["System.Reflection.Metadata.Ecma335", "ArrayShapeEncoder", "get_Builder", "()", "summary", "df-generated"]
       - ["System.Reflection.Metadata.Ecma335", "BlobEncoder", "BlobEncoder", "(System.Reflection.Metadata.BlobBuilder)", "summary", "df-generated"]
+      - ["System.Reflection.Metadata.Ecma335", "BlobEncoder", "CustomAttributeSignature", "(System.Action<System.Reflection.Metadata.Ecma335.FixedArgumentsEncoder>,System.Action<System.Reflection.Metadata.Ecma335.CustomAttributeNamedArgumentsEncoder>)", "summary", "df-generated"]
       - ["System.Reflection.Metadata.Ecma335", "BlobEncoder", "CustomAttributeSignature", "(System.Reflection.Metadata.Ecma335.FixedArgumentsEncoder,System.Reflection.Metadata.Ecma335.CustomAttributeNamedArgumentsEncoder)", "summary", "df-generated"]
       - ["System.Reflection.Metadata.Ecma335", "BlobEncoder", "Field", "()", "summary", "df-generated"]
       - ["System.Reflection.Metadata.Ecma335", "BlobEncoder", "FieldSignature", "()", "summary", "df-generated"]
@@ -157,7 +161,9 @@ extensions:
       - ["System.Reflection.Metadata.Ecma335", "LabelHandle", "op_Inequality", "(System.Reflection.Metadata.Ecma335.LabelHandle,System.Reflection.Metadata.Ecma335.LabelHandle)", "summary", "df-generated"]
       - ["System.Reflection.Metadata.Ecma335", "LiteralEncoder", "LiteralEncoder", "(System.Reflection.Metadata.BlobBuilder)", "summary", "df-generated"]
       - ["System.Reflection.Metadata.Ecma335", "LiteralEncoder", "Scalar", "()", "summary", "df-generated"]
+      - ["System.Reflection.Metadata.Ecma335", "LiteralEncoder", "TaggedScalar", "(System.Action<System.Reflection.Metadata.Ecma335.CustomAttributeElementTypeEncoder>,System.Action<System.Reflection.Metadata.Ecma335.ScalarEncoder>)", "summary", "df-generated"]
       - ["System.Reflection.Metadata.Ecma335", "LiteralEncoder", "TaggedScalar", "(System.Reflection.Metadata.Ecma335.CustomAttributeElementTypeEncoder,System.Reflection.Metadata.Ecma335.ScalarEncoder)", "summary", "df-generated"]
+      - ["System.Reflection.Metadata.Ecma335", "LiteralEncoder", "TaggedVector", "(System.Action<System.Reflection.Metadata.Ecma335.CustomAttributeArrayTypeEncoder>,System.Action<System.Reflection.Metadata.Ecma335.VectorEncoder>)", "summary", "df-generated"]
       - ["System.Reflection.Metadata.Ecma335", "LiteralEncoder", "TaggedVector", "(System.Reflection.Metadata.Ecma335.CustomAttributeArrayTypeEncoder,System.Reflection.Metadata.Ecma335.VectorEncoder)", "summary", "df-generated"]
       - ["System.Reflection.Metadata.Ecma335", "LiteralEncoder", "Vector", "()", "summary", "df-generated"]
       - ["System.Reflection.Metadata.Ecma335", "LiteralEncoder", "get_Builder", "()", "summary", "df-generated"]
@@ -317,6 +323,7 @@ extensions:
       - ["System.Reflection.Metadata.Ecma335", "MethodBodyStreamEncoder", "MethodBodyStreamEncoder", "(System.Reflection.Metadata.BlobBuilder)", "summary", "df-generated"]
       - ["System.Reflection.Metadata.Ecma335", "MethodBodyStreamEncoder", "get_Builder", "()", "summary", "df-generated"]
       - ["System.Reflection.Metadata.Ecma335", "MethodSignatureEncoder", "MethodSignatureEncoder", "(System.Reflection.Metadata.BlobBuilder,System.Boolean)", "summary", "df-generated"]
+      - ["System.Reflection.Metadata.Ecma335", "MethodSignatureEncoder", "Parameters", "(System.Int32,System.Action<System.Reflection.Metadata.Ecma335.ReturnTypeEncoder>,System.Action<System.Reflection.Metadata.Ecma335.ParametersEncoder>)", "summary", "df-generated"]
       - ["System.Reflection.Metadata.Ecma335", "MethodSignatureEncoder", "Parameters", "(System.Int32,System.Reflection.Metadata.Ecma335.ReturnTypeEncoder,System.Reflection.Metadata.Ecma335.ParametersEncoder)", "summary", "df-generated"]
       - ["System.Reflection.Metadata.Ecma335", "MethodSignatureEncoder", "get_Builder", "()", "summary", "df-generated"]
       - ["System.Reflection.Metadata.Ecma335", "MethodSignatureEncoder", "get_HasVarArgs", "()", "summary", "df-generated"]
@@ -328,6 +335,7 @@ extensions:
       - ["System.Reflection.Metadata.Ecma335", "NamedArgumentTypeEncoder", "SZArray", "()", "summary", "df-generated"]
       - ["System.Reflection.Metadata.Ecma335", "NamedArgumentTypeEncoder", "ScalarType", "()", "summary", "df-generated"]
       - ["System.Reflection.Metadata.Ecma335", "NamedArgumentTypeEncoder", "get_Builder", "()", "summary", "df-generated"]
+      - ["System.Reflection.Metadata.Ecma335", "NamedArgumentsEncoder", "AddArgument", "(System.Boolean,System.Action<System.Reflection.Metadata.Ecma335.NamedArgumentTypeEncoder>,System.Action<System.Reflection.Metadata.Ecma335.NameEncoder>,System.Action<System.Reflection.Metadata.Ecma335.LiteralEncoder>)", "summary", "df-generated"]
       - ["System.Reflection.Metadata.Ecma335", "NamedArgumentsEncoder", "AddArgument", "(System.Boolean,System.Reflection.Metadata.Ecma335.NamedArgumentTypeEncoder,System.Reflection.Metadata.Ecma335.NameEncoder,System.Reflection.Metadata.Ecma335.LiteralEncoder)", "summary", "df-generated"]
       - ["System.Reflection.Metadata.Ecma335", "NamedArgumentsEncoder", "NamedArgumentsEncoder", "(System.Reflection.Metadata.BlobBuilder)", "summary", "df-generated"]
       - ["System.Reflection.Metadata.Ecma335", "NamedArgumentsEncoder", "get_Builder", "()", "summary", "df-generated"]
@@ -343,6 +351,7 @@ extensions:
       - ["System.Reflection.Metadata.Ecma335", "ParametersEncoder", "get_HasVarArgs", "()", "summary", "df-generated"]
       - ["System.Reflection.Metadata.Ecma335", "PermissionSetEncoder", "PermissionSetEncoder", "(System.Reflection.Metadata.BlobBuilder)", "summary", "df-generated"]
       - ["System.Reflection.Metadata.Ecma335", "PermissionSetEncoder", "get_Builder", "()", "summary", "df-generated"]
+      - ["System.Reflection.Metadata.Ecma335", "PortablePdbBuilder", "PortablePdbBuilder", "(System.Reflection.Metadata.Ecma335.MetadataBuilder,System.Collections.Immutable.ImmutableArray<System.Int32>,System.Reflection.Metadata.MethodDefinitionHandle,System.Func<System.Collections.Generic.IEnumerable<System.Reflection.Metadata.Blob>,System.Reflection.Metadata.BlobContentId>)", "summary", "df-generated"]
       - ["System.Reflection.Metadata.Ecma335", "PortablePdbBuilder", "get_FormatVersion", "()", "summary", "df-generated"]
       - ["System.Reflection.Metadata.Ecma335", "PortablePdbBuilder", "get_IdProvider", "()", "summary", "df-generated"]
       - ["System.Reflection.Metadata.Ecma335", "PortablePdbBuilder", "get_MetadataVersion", "()", "summary", "df-generated"]
@@ -357,7 +366,6 @@ extensions:
       - ["System.Reflection.Metadata.Ecma335", "ScalarEncoder", "ScalarEncoder", "(System.Reflection.Metadata.BlobBuilder)", "summary", "df-generated"]
       - ["System.Reflection.Metadata.Ecma335", "ScalarEncoder", "SystemType", "(System.String)", "summary", "df-generated"]
       - ["System.Reflection.Metadata.Ecma335", "ScalarEncoder", "get_Builder", "()", "summary", "df-generated"]
-      - ["System.Reflection.Metadata.Ecma335", "SignatureDecoder<TType,TGenericContext>", "DecodeMethodSignature", "(System.Reflection.Metadata.BlobReader)", "summary", "df-generated"]
       - ["System.Reflection.Metadata.Ecma335", "SignatureTypeEncoder", "Boolean", "()", "summary", "df-generated"]
       - ["System.Reflection.Metadata.Ecma335", "SignatureTypeEncoder", "Byte", "()", "summary", "df-generated"]
       - ["System.Reflection.Metadata.Ecma335", "SignatureTypeEncoder", "Char", "()", "summary", "df-generated"]
diff --git a/csharp/ql/lib/ext/generated/System.Reflection.Metadata.model.yml b/csharp/ql/lib/ext/generated/System.Reflection.Metadata.model.yml
index e97dafb54c2..be276ab8b42 100644
--- a/csharp/ql/lib/ext/generated/System.Reflection.Metadata.model.yml
+++ b/csharp/ql/lib/ext/generated/System.Reflection.Metadata.model.yml
@@ -4,15 +4,15 @@ extensions:
       pack: codeql/csharp-all
       extensible: summaryModel
     data:
-      - ["System.Reflection.Metadata", "AssemblyDefinition", False, "GetAssemblyName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Reflection.Metadata", "AssemblyDefinition", False, "GetCustomAttributes", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Reflection.Metadata", "AssemblyDefinition", False, "GetDeclarativeSecurityAttributes", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Reflection.Metadata", "AssemblyFile", False, "GetCustomAttributes", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Reflection.Metadata", "AssemblyReference", False, "GetAssemblyName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Reflection.Metadata", "AssemblyFileHandleCollection+Enumerator", False, "get_Current", "()", "", "Argument[this].Property[System.Reflection.Metadata.AssemblyFileHandleCollection+Enumerator.Current]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Reflection.Metadata", "AssemblyReference", False, "GetCustomAttributes", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Reflection.Metadata", "AssemblyReferenceHandleCollection+Enumerator", False, "get_Current", "()", "", "Argument[this].Property[System.Reflection.Metadata.AssemblyReferenceHandleCollection+Enumerator.Current]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Reflection.Metadata", "AssemblyReferenceHandleCollection", False, "GetEnumerator", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Reflection.Metadata", "Blob", False, "GetBytes", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Reflection.Metadata", "BlobBuilder+Blobs", False, "GetEnumerator", "()", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["System.Reflection.Metadata", "BlobBuilder+Blobs", False, "GetEnumerator", "()", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Reflection.Metadata", "BlobBuilder+Blobs", False, "get_Current", "()", "", "Argument[this].Property[System.Reflection.Metadata.BlobBuilder+Blobs.Current]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Reflection.Metadata", "BlobBuilder", False, "GetBlobs", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Reflection.Metadata", "BlobBuilder", False, "LinkPrefix", "(System.Reflection.Metadata.BlobBuilder)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Reflection.Metadata", "BlobBuilder", False, "LinkPrefix", "(System.Reflection.Metadata.BlobBuilder)", "", "Argument[this]", "Argument[0]", "taint", "df-generated"]
@@ -20,8 +20,9 @@ extensions:
       - ["System.Reflection.Metadata", "BlobBuilder", False, "LinkSuffix", "(System.Reflection.Metadata.BlobBuilder)", "", "Argument[this]", "Argument[0]", "taint", "df-generated"]
       - ["System.Reflection.Metadata", "BlobBuilder", False, "ReserveBytes", "(System.Int32)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Reflection.Metadata", "BlobBuilder", False, "TryWriteBytes", "(System.IO.Stream,System.Int32)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Reflection.Metadata", "BlobContentId", False, "BlobContentId", "(System.Guid,System.UInt32)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Reflection.Metadata", "BlobContentId", False, "get_Guid", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Reflection.Metadata", "BlobBuilder", False, "WriteContentTo", "(System.Reflection.Metadata.BlobWriter)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Reflection.Metadata", "BlobContentId", False, "BlobContentId", "(System.Guid,System.UInt32)", "", "Argument[0]", "Argument[this].SyntheticField[System.Reflection.Metadata.BlobContentId._guid]", "value", "dfc-generated"]
+      - ["System.Reflection.Metadata", "BlobContentId", False, "get_Guid", "()", "", "Argument[this].SyntheticField[System.Reflection.Metadata.BlobContentId._guid]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Reflection.Metadata", "BlobReader", False, "ReadConstant", "(System.Reflection.Metadata.ConstantTypeCode)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Reflection.Metadata", "BlobReader", False, "ReadSerializedString", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Reflection.Metadata", "BlobReader", False, "ReadUTF16", "(System.Int32)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
@@ -29,39 +30,50 @@ extensions:
       - ["System.Reflection.Metadata", "BlobReader", False, "get_CurrentPointer", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Reflection.Metadata", "BlobReader", False, "get_StartPointer", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Reflection.Metadata", "BlobWriter", False, "BlobWriter", "(System.Byte[],System.Int32,System.Int32)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["System.Reflection.Metadata", "BlobWriter", False, "ToArray", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Reflection.Metadata", "BlobWriter", False, "ToArray", "(System.Int32,System.Int32)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Reflection.Metadata", "BlobWriter", False, "WriteBytes", "(System.IO.Stream,System.Int32)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Reflection.Metadata", "BlobWriter", False, "get_Blob", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Reflection.Metadata", "CustomAttributeHandleCollection+Enumerator", False, "get_Current", "()", "", "Argument[this].Property[System.Reflection.Metadata.CustomAttributeHandleCollection+Enumerator.Current]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Reflection.Metadata", "CustomAttributeHandleCollection", False, "GetEnumerator", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Reflection.Metadata", "CustomDebugInformationHandleCollection+Enumerator", False, "get_Current", "()", "", "Argument[this].Property[System.Reflection.Metadata.CustomDebugInformationHandleCollection+Enumerator.Current]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Reflection.Metadata", "CustomDebugInformationHandleCollection", False, "GetEnumerator", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Reflection.Metadata", "DeclarativeSecurityAttributeHandleCollection+Enumerator", False, "get_Current", "()", "", "Argument[this].Property[System.Reflection.Metadata.DeclarativeSecurityAttributeHandleCollection+Enumerator.Current]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Reflection.Metadata", "DeclarativeSecurityAttributeHandleCollection", False, "GetEnumerator", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Reflection.Metadata", "DocumentHandleCollection+Enumerator", False, "get_Current", "()", "", "Argument[this].Property[System.Reflection.Metadata.DocumentHandleCollection+Enumerator.Current]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Reflection.Metadata", "DocumentHandleCollection", False, "GetEnumerator", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Reflection.Metadata", "EventAccessors", False, "get_Others", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Reflection.Metadata", "EventDefinition", False, "GetCustomAttributes", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Reflection.Metadata", "EventDefinitionHandleCollection+Enumerator", False, "get_Current", "()", "", "Argument[this].Property[System.Reflection.Metadata.EventDefinitionHandleCollection+Enumerator.Current]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Reflection.Metadata", "EventDefinitionHandleCollection", False, "GetEnumerator", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Reflection.Metadata", "ExportedType", False, "GetCustomAttributes", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Reflection.Metadata", "FieldDefinition", False, "DecodeSignature<TType,TGenericContext>", "(System.Reflection.Metadata.ISignatureTypeProvider<TType,TGenericContext>,TGenericContext)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Reflection.Metadata", "FieldDefinition", False, "DecodeSignature<TType,TGenericContext>", "(System.Reflection.Metadata.ISignatureTypeProvider<TType,TGenericContext>,TGenericContext)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Reflection.Metadata", "ExportedTypeHandleCollection+Enumerator", False, "get_Current", "()", "", "Argument[this].Property[System.Reflection.Metadata.ExportedTypeHandleCollection+Enumerator.Current]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Reflection.Metadata", "FieldDefinition", False, "GetCustomAttributes", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Reflection.Metadata", "FieldDefinitionHandleCollection+Enumerator", False, "get_Current", "()", "", "Argument[this].Property[System.Reflection.Metadata.FieldDefinitionHandleCollection+Enumerator.Current]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Reflection.Metadata", "FieldDefinitionHandleCollection", False, "GetEnumerator", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Reflection.Metadata", "GenericParameter", False, "GetCustomAttributes", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Reflection.Metadata", "GenericParameterConstraint", False, "GetCustomAttributes", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Reflection.Metadata", "GenericParameterConstraintHandleCollection+Enumerator", False, "get_Current", "()", "", "Argument[this].Property[System.Reflection.Metadata.GenericParameterConstraintHandleCollection+Enumerator.Current]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Reflection.Metadata", "GenericParameterHandleCollection+Enumerator", False, "get_Current", "()", "", "Argument[this].Property[System.Reflection.Metadata.GenericParameterHandleCollection+Enumerator.Current]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Reflection.Metadata", "ImportDefinitionCollection+Enumerator", False, "get_Current", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Reflection.Metadata", "ImportDefinitionCollection", False, "GetEnumerator", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Reflection.Metadata", "ImportScopeCollection+Enumerator", False, "get_Current", "()", "", "Argument[this].Property[System.Reflection.Metadata.ImportScopeCollection+Enumerator.Current]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Reflection.Metadata", "ImportScopeCollection", False, "GetEnumerator", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Reflection.Metadata", "InterfaceImplementation", False, "GetCustomAttributes", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Reflection.Metadata", "InterfaceImplementationHandleCollection+Enumerator", False, "get_Current", "()", "", "Argument[this].Property[System.Reflection.Metadata.InterfaceImplementationHandleCollection+Enumerator.Current]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Reflection.Metadata", "InterfaceImplementationHandleCollection", False, "GetEnumerator", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Reflection.Metadata", "LocalConstantHandleCollection+Enumerator", False, "get_Current", "()", "", "Argument[this].Property[System.Reflection.Metadata.LocalConstantHandleCollection+Enumerator.Current]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Reflection.Metadata", "LocalConstantHandleCollection", False, "GetEnumerator", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Reflection.Metadata", "LocalScope", False, "GetChildren", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Reflection.Metadata", "LocalScope", False, "GetLocalConstants", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Reflection.Metadata", "LocalScope", False, "GetLocalVariables", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Reflection.Metadata", "LocalScopeHandleCollection+ChildrenEnumerator", False, "get_Current", "()", "", "Argument[this].Property[System.Reflection.Metadata.LocalScopeHandleCollection+ChildrenEnumerator.Current]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Reflection.Metadata", "LocalScopeHandleCollection+Enumerator", False, "get_Current", "()", "", "Argument[this].Property[System.Reflection.Metadata.LocalScopeHandleCollection+Enumerator.Current]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Reflection.Metadata", "LocalScopeHandleCollection", False, "GetEnumerator", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Reflection.Metadata", "LocalVariableHandleCollection+Enumerator", False, "get_Current", "()", "", "Argument[this].Property[System.Reflection.Metadata.LocalVariableHandleCollection+Enumerator.Current]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Reflection.Metadata", "LocalVariableHandleCollection", False, "GetEnumerator", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Reflection.Metadata", "ManifestResource", False, "GetCustomAttributes", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Reflection.Metadata", "MemberReference", False, "DecodeFieldSignature<TType,TGenericContext>", "(System.Reflection.Metadata.ISignatureTypeProvider<TType,TGenericContext>,TGenericContext)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Reflection.Metadata", "MemberReference", False, "DecodeFieldSignature<TType,TGenericContext>", "(System.Reflection.Metadata.ISignatureTypeProvider<TType,TGenericContext>,TGenericContext)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Reflection.Metadata", "ManifestResourceHandleCollection+Enumerator", False, "get_Current", "()", "", "Argument[this].Property[System.Reflection.Metadata.ManifestResourceHandleCollection+Enumerator.Current]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Reflection.Metadata", "MemberReference", False, "GetCustomAttributes", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Reflection.Metadata", "MemberReferenceHandleCollection+Enumerator", False, "get_Current", "()", "", "Argument[this].Property[System.Reflection.Metadata.MemberReferenceHandleCollection+Enumerator.Current]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Reflection.Metadata", "MetadataReader", False, "GetAssemblyDefinition", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Reflection.Metadata", "MetadataReader", False, "GetAssemblyFile", "(System.Reflection.Metadata.AssemblyFileHandle)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Reflection.Metadata", "MetadataReader", False, "GetAssemblyReference", "(System.Reflection.Metadata.AssemblyReferenceHandle)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
@@ -125,22 +137,23 @@ extensions:
       - ["System.Reflection.Metadata", "MetadataReaderProvider", False, "FromPortablePdbImage", "(System.Collections.Immutable.ImmutableArray<System.Byte>)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
       - ["System.Reflection.Metadata", "MetadataReaderProvider", False, "FromPortablePdbStream", "(System.IO.Stream,System.Reflection.Metadata.MetadataStreamOptions,System.Int32)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["System.Reflection.Metadata", "MetadataReaderProvider", False, "GetMetadataReader", "(System.Reflection.Metadata.MetadataReaderOptions,System.Reflection.Metadata.MetadataStringDecoder)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Reflection.Metadata", "MetadataStringDecoder", True, "GetString", "(System.Byte*,System.Int32)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Reflection.Metadata", "MetadataStringDecoder", True, "GetString", "(System.Byte*,System.Int32)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Reflection.Metadata", "MetadataStringDecoder", True, "GetString", "(System.Byte*,System.Int32)", "", "Argument[0].Element", "ReturnValue", "taint", "dfc-generated"]
       - ["System.Reflection.Metadata", "MethodBodyBlock", False, "Create", "(System.Reflection.Metadata.BlobReader)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["System.Reflection.Metadata", "MethodBodyBlock", False, "GetILReader", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Reflection.Metadata", "MethodBodyBlock", False, "get_ExceptionRegions", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Reflection.Metadata", "MethodBodyBlock", False, "get_LocalSignature", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Reflection.Metadata", "MethodDebugInformation", False, "GetSequencePoints", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Reflection.Metadata", "MethodDebugInformationHandleCollection+Enumerator", False, "get_Current", "()", "", "Argument[this].Property[System.Reflection.Metadata.MethodDebugInformationHandleCollection+Enumerator.Current]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Reflection.Metadata", "MethodDebugInformationHandleCollection", False, "GetEnumerator", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Reflection.Metadata", "MethodDefinition", False, "GetCustomAttributes", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Reflection.Metadata", "MethodDefinition", False, "GetDeclarativeSecurityAttributes", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Reflection.Metadata", "MethodDefinition", False, "GetParameters", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Reflection.Metadata", "MethodDefinitionHandleCollection+Enumerator", False, "get_Current", "()", "", "Argument[this].Property[System.Reflection.Metadata.MethodDefinitionHandleCollection+Enumerator.Current]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Reflection.Metadata", "MethodDefinitionHandleCollection", False, "GetEnumerator", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Reflection.Metadata", "MethodImplementation", False, "GetCustomAttributes", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Reflection.Metadata", "MethodImplementationHandleCollection+Enumerator", False, "get_Current", "()", "", "Argument[this].Property[System.Reflection.Metadata.MethodImplementationHandleCollection+Enumerator.Current]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Reflection.Metadata", "MethodImport", False, "get_Module", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Reflection.Metadata", "MethodImport", False, "get_Name", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Reflection.Metadata", "MethodSpecification", False, "DecodeSignature<TType,TGenericContext>", "(System.Reflection.Metadata.ISignatureTypeProvider<TType,TGenericContext>,TGenericContext)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
       - ["System.Reflection.Metadata", "MethodSpecification", False, "GetCustomAttributes", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Reflection.Metadata", "ModuleDefinition", False, "GetCustomAttributes", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Reflection.Metadata", "ModuleReference", False, "GetCustomAttributes", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
@@ -153,13 +166,14 @@ extensions:
       - ["System.Reflection.Metadata", "PEReaderExtensions", False, "GetMetadataReader", "(System.Reflection.PortableExecutable.PEReader,System.Reflection.Metadata.MetadataReaderOptions)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["System.Reflection.Metadata", "PEReaderExtensions", False, "GetMetadataReader", "(System.Reflection.PortableExecutable.PEReader,System.Reflection.Metadata.MetadataReaderOptions,System.Reflection.Metadata.MetadataStringDecoder)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["System.Reflection.Metadata", "Parameter", False, "GetCustomAttributes", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Reflection.Metadata", "ParameterHandleCollection+Enumerator", False, "get_Current", "()", "", "Argument[this].Property[System.Reflection.Metadata.ParameterHandleCollection+Enumerator.Current]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Reflection.Metadata", "ParameterHandleCollection", False, "GetEnumerator", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Reflection.Metadata", "PropertyAccessors", False, "get_Others", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Reflection.Metadata", "PropertyDefinition", False, "GetCustomAttributes", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Reflection.Metadata", "PropertyDefinitionHandleCollection+Enumerator", False, "get_Current", "()", "", "Argument[this].Property[System.Reflection.Metadata.PropertyDefinitionHandleCollection+Enumerator.Current]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Reflection.Metadata", "PropertyDefinitionHandleCollection", False, "GetEnumerator", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Reflection.Metadata", "SequencePointCollection+Enumerator", False, "get_Current", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Reflection.Metadata", "SequencePointCollection", False, "GetEnumerator", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Reflection.Metadata", "StandaloneSignature", False, "DecodeLocalSignature<TType,TGenericContext>", "(System.Reflection.Metadata.ISignatureTypeProvider<TType,TGenericContext>,TGenericContext)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
       - ["System.Reflection.Metadata", "StandaloneSignature", False, "GetCustomAttributes", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Reflection.Metadata", "TypeDefinition", False, "GetCustomAttributes", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Reflection.Metadata", "TypeDefinition", False, "GetDeclarativeSecurityAttributes", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
@@ -168,8 +182,8 @@ extensions:
       - ["System.Reflection.Metadata", "TypeDefinition", False, "GetInterfaceImplementations", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Reflection.Metadata", "TypeDefinition", False, "GetMethods", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Reflection.Metadata", "TypeDefinition", False, "GetProperties", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Reflection.Metadata", "TypeSpecification", False, "DecodeSignature<TType,TGenericContext>", "(System.Reflection.Metadata.ISignatureTypeProvider<TType,TGenericContext>,TGenericContext)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Reflection.Metadata", "TypeSpecification", False, "DecodeSignature<TType,TGenericContext>", "(System.Reflection.Metadata.ISignatureTypeProvider<TType,TGenericContext>,TGenericContext)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Reflection.Metadata", "TypeDefinitionHandleCollection+Enumerator", False, "get_Current", "()", "", "Argument[this].Property[System.Reflection.Metadata.TypeDefinitionHandleCollection+Enumerator.Current]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Reflection.Metadata", "TypeReferenceHandleCollection+Enumerator", False, "get_Current", "()", "", "Argument[this].Property[System.Reflection.Metadata.TypeReferenceHandleCollection+Enumerator.Current]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Reflection.Metadata", "TypeSpecification", False, "GetCustomAttributes", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
   - addsTo:
       pack: codeql/csharp-all
@@ -179,6 +193,7 @@ extensions:
       - ["System.Reflection.Metadata", "ArrayShape", "get_LowerBounds", "()", "summary", "df-generated"]
       - ["System.Reflection.Metadata", "ArrayShape", "get_Rank", "()", "summary", "df-generated"]
       - ["System.Reflection.Metadata", "ArrayShape", "get_Sizes", "()", "summary", "df-generated"]
+      - ["System.Reflection.Metadata", "AssemblyDefinition", "GetAssemblyName", "()", "summary", "df-generated"]
       - ["System.Reflection.Metadata", "AssemblyDefinition", "get_Culture", "()", "summary", "df-generated"]
       - ["System.Reflection.Metadata", "AssemblyDefinition", "get_Flags", "()", "summary", "df-generated"]
       - ["System.Reflection.Metadata", "AssemblyDefinition", "get_HashAlgorithm", "()", "summary", "df-generated"]
@@ -207,6 +222,7 @@ extensions:
       - ["System.Reflection.Metadata", "AssemblyFileHandleCollection+Enumerator", "get_Current", "()", "summary", "df-generated"]
       - ["System.Reflection.Metadata", "AssemblyFileHandleCollection", "GetEnumerator", "()", "summary", "df-generated"]
       - ["System.Reflection.Metadata", "AssemblyFileHandleCollection", "get_Count", "()", "summary", "df-generated"]
+      - ["System.Reflection.Metadata", "AssemblyReference", "GetAssemblyName", "()", "summary", "df-generated"]
       - ["System.Reflection.Metadata", "AssemblyReference", "get_Culture", "()", "summary", "df-generated"]
       - ["System.Reflection.Metadata", "AssemblyReference", "get_Flags", "()", "summary", "df-generated"]
       - ["System.Reflection.Metadata", "AssemblyReference", "get_HashValue", "()", "summary", "df-generated"]
@@ -224,6 +240,7 @@ extensions:
       - ["System.Reflection.Metadata", "AssemblyReferenceHandleCollection+Enumerator", "Reset", "()", "summary", "df-generated"]
       - ["System.Reflection.Metadata", "AssemblyReferenceHandleCollection+Enumerator", "get_Current", "()", "summary", "df-generated"]
       - ["System.Reflection.Metadata", "AssemblyReferenceHandleCollection", "get_Count", "()", "summary", "df-generated"]
+      - ["System.Reflection.Metadata", "Blob", "GetBytes", "()", "summary", "df-generated"]
       - ["System.Reflection.Metadata", "Blob", "get_IsDefault", "()", "summary", "df-generated"]
       - ["System.Reflection.Metadata", "Blob", "get_Length", "()", "summary", "df-generated"]
       - ["System.Reflection.Metadata", "BlobBuilder+Blobs", "Dispose", "()", "summary", "df-generated"]
@@ -255,7 +272,6 @@ extensions:
       - ["System.Reflection.Metadata", "BlobBuilder", "WriteConstant", "(System.Object)", "summary", "df-generated"]
       - ["System.Reflection.Metadata", "BlobBuilder", "WriteContentTo", "(System.IO.Stream)", "summary", "df-generated"]
       - ["System.Reflection.Metadata", "BlobBuilder", "WriteContentTo", "(System.Reflection.Metadata.BlobBuilder)", "summary", "df-generated"]
-      - ["System.Reflection.Metadata", "BlobBuilder", "WriteContentTo", "(System.Reflection.Metadata.BlobWriter)", "summary", "df-generated"]
       - ["System.Reflection.Metadata", "BlobBuilder", "WriteDateTime", "(System.DateTime)", "summary", "df-generated"]
       - ["System.Reflection.Metadata", "BlobBuilder", "WriteDecimal", "(System.Decimal)", "summary", "df-generated"]
       - ["System.Reflection.Metadata", "BlobBuilder", "WriteDouble", "(System.Double)", "summary", "df-generated"]
@@ -338,6 +354,8 @@ extensions:
       - ["System.Reflection.Metadata", "BlobWriter", "Clear", "()", "summary", "df-generated"]
       - ["System.Reflection.Metadata", "BlobWriter", "ContentEquals", "(System.Reflection.Metadata.BlobWriter)", "summary", "df-generated"]
       - ["System.Reflection.Metadata", "BlobWriter", "PadTo", "(System.Int32)", "summary", "df-generated"]
+      - ["System.Reflection.Metadata", "BlobWriter", "ToArray", "()", "summary", "df-generated"]
+      - ["System.Reflection.Metadata", "BlobWriter", "ToArray", "(System.Int32,System.Int32)", "summary", "df-generated"]
       - ["System.Reflection.Metadata", "BlobWriter", "ToImmutableArray", "()", "summary", "df-generated"]
       - ["System.Reflection.Metadata", "BlobWriter", "ToImmutableArray", "(System.Int32,System.Int32)", "summary", "df-generated"]
       - ["System.Reflection.Metadata", "BlobWriter", "WriteBoolean", "(System.Boolean)", "summary", "df-generated"]
@@ -513,6 +531,7 @@ extensions:
       - ["System.Reflection.Metadata", "ExportedTypeHandleCollection+Enumerator", "get_Current", "()", "summary", "df-generated"]
       - ["System.Reflection.Metadata", "ExportedTypeHandleCollection", "GetEnumerator", "()", "summary", "df-generated"]
       - ["System.Reflection.Metadata", "ExportedTypeHandleCollection", "get_Count", "()", "summary", "df-generated"]
+      - ["System.Reflection.Metadata", "FieldDefinition", "DecodeSignature<TType,TGenericContext>", "(System.Reflection.Metadata.ISignatureTypeProvider<TType,TGenericContext>,TGenericContext)", "summary", "df-generated"]
       - ["System.Reflection.Metadata", "FieldDefinition", "GetDeclaringType", "()", "summary", "df-generated"]
       - ["System.Reflection.Metadata", "FieldDefinition", "GetDefaultValue", "()", "summary", "df-generated"]
       - ["System.Reflection.Metadata", "FieldDefinition", "GetMarshallingDescriptor", "()", "summary", "df-generated"]
@@ -707,6 +726,7 @@ extensions:
       - ["System.Reflection.Metadata", "ManifestResourceHandleCollection+Enumerator", "get_Current", "()", "summary", "df-generated"]
       - ["System.Reflection.Metadata", "ManifestResourceHandleCollection", "GetEnumerator", "()", "summary", "df-generated"]
       - ["System.Reflection.Metadata", "ManifestResourceHandleCollection", "get_Count", "()", "summary", "df-generated"]
+      - ["System.Reflection.Metadata", "MemberReference", "DecodeFieldSignature<TType,TGenericContext>", "(System.Reflection.Metadata.ISignatureTypeProvider<TType,TGenericContext>,TGenericContext)", "summary", "df-generated"]
       - ["System.Reflection.Metadata", "MemberReference", "DecodeMethodSignature<TType,TGenericContext>", "(System.Reflection.Metadata.ISignatureTypeProvider<TType,TGenericContext>,TGenericContext)", "summary", "df-generated"]
       - ["System.Reflection.Metadata", "MemberReference", "GetKind", "()", "summary", "df-generated"]
       - ["System.Reflection.Metadata", "MemberReference", "get_Name", "()", "summary", "df-generated"]
@@ -829,6 +849,7 @@ extensions:
       - ["System.Reflection.Metadata", "MethodSignature<TType>", "get_ParameterTypes", "()", "summary", "df-generated"]
       - ["System.Reflection.Metadata", "MethodSignature<TType>", "get_RequiredParameterCount", "()", "summary", "df-generated"]
       - ["System.Reflection.Metadata", "MethodSignature<TType>", "get_ReturnType", "()", "summary", "df-generated"]
+      - ["System.Reflection.Metadata", "MethodSpecification", "DecodeSignature<TType,TGenericContext>", "(System.Reflection.Metadata.ISignatureTypeProvider<TType,TGenericContext>,TGenericContext)", "summary", "df-generated"]
       - ["System.Reflection.Metadata", "MethodSpecification", "get_Method", "()", "summary", "df-generated"]
       - ["System.Reflection.Metadata", "MethodSpecification", "get_Signature", "()", "summary", "df-generated"]
       - ["System.Reflection.Metadata", "MethodSpecificationHandle", "Equals", "(System.Object)", "summary", "df-generated"]
@@ -928,6 +949,7 @@ extensions:
       - ["System.Reflection.Metadata", "SignatureHeader", "get_RawValue", "()", "summary", "df-generated"]
       - ["System.Reflection.Metadata", "SignatureHeader", "op_Equality", "(System.Reflection.Metadata.SignatureHeader,System.Reflection.Metadata.SignatureHeader)", "summary", "df-generated"]
       - ["System.Reflection.Metadata", "SignatureHeader", "op_Inequality", "(System.Reflection.Metadata.SignatureHeader,System.Reflection.Metadata.SignatureHeader)", "summary", "df-generated"]
+      - ["System.Reflection.Metadata", "StandaloneSignature", "DecodeLocalSignature<TType,TGenericContext>", "(System.Reflection.Metadata.ISignatureTypeProvider<TType,TGenericContext>,TGenericContext)", "summary", "df-generated"]
       - ["System.Reflection.Metadata", "StandaloneSignature", "DecodeMethodSignature<TType,TGenericContext>", "(System.Reflection.Metadata.ISignatureTypeProvider<TType,TGenericContext>,TGenericContext)", "summary", "df-generated"]
       - ["System.Reflection.Metadata", "StandaloneSignature", "GetKind", "()", "summary", "df-generated"]
       - ["System.Reflection.Metadata", "StandaloneSignature", "get_Signature", "()", "summary", "df-generated"]
@@ -985,6 +1007,7 @@ extensions:
       - ["System.Reflection.Metadata", "TypeReferenceHandleCollection+Enumerator", "get_Current", "()", "summary", "df-generated"]
       - ["System.Reflection.Metadata", "TypeReferenceHandleCollection", "GetEnumerator", "()", "summary", "df-generated"]
       - ["System.Reflection.Metadata", "TypeReferenceHandleCollection", "get_Count", "()", "summary", "df-generated"]
+      - ["System.Reflection.Metadata", "TypeSpecification", "DecodeSignature<TType,TGenericContext>", "(System.Reflection.Metadata.ISignatureTypeProvider<TType,TGenericContext>,TGenericContext)", "summary", "df-generated"]
       - ["System.Reflection.Metadata", "TypeSpecification", "get_Signature", "()", "summary", "df-generated"]
       - ["System.Reflection.Metadata", "TypeSpecificationHandle", "Equals", "(System.Object)", "summary", "df-generated"]
       - ["System.Reflection.Metadata", "TypeSpecificationHandle", "Equals", "(System.Reflection.Metadata.TypeSpecificationHandle)", "summary", "df-generated"]
diff --git a/csharp/ql/lib/ext/generated/System.Reflection.PortableExecutable.model.yml b/csharp/ql/lib/ext/generated/System.Reflection.PortableExecutable.model.yml
index b7751f90032..762ad2ec3cc 100644
--- a/csharp/ql/lib/ext/generated/System.Reflection.PortableExecutable.model.yml
+++ b/csharp/ql/lib/ext/generated/System.Reflection.PortableExecutable.model.yml
@@ -4,9 +4,11 @@ extensions:
       pack: codeql/csharp-all
       extensible: summaryModel
     data:
-      - ["System.Reflection.PortableExecutable", "PEBuilder+Section", False, "Section", "(System.String,System.Reflection.PortableExecutable.SectionCharacteristics)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["System.Reflection.PortableExecutable", "DebugDirectoryBuilder", False, "AddEntry<TData>", "(System.Reflection.PortableExecutable.DebugDirectoryEntryType,System.UInt32,System.UInt32,TData,System.Action<System.Reflection.Metadata.BlobBuilder,TData>)", "", "Argument[3]", "Argument[4].Parameter[1]", "value", "dfc-generated"]
+      - ["System.Reflection.PortableExecutable", "PEBuilder+Section", False, "Section", "(System.String,System.Reflection.PortableExecutable.SectionCharacteristics)", "", "Argument[0]", "Argument[this].Field[System.Reflection.PortableExecutable.PEBuilder+Section.Name]", "value", "dfc-generated"]
       - ["System.Reflection.PortableExecutable", "PEBuilder", False, "GetSections", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Reflection.PortableExecutable", "PEBuilder", False, "Serialize", "(System.Reflection.Metadata.BlobBuilder)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["System.Reflection.PortableExecutable", "PEBuilder", False, "Serialize", "(System.Reflection.Metadata.BlobBuilder)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Reflection.PortableExecutable", "PEBuilder", True, "GetDirectories", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Reflection.PortableExecutable", "PEBuilder", True, "SerializeSection", "(System.String,System.Reflection.PortableExecutable.SectionLocation)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Reflection.PortableExecutable", "PEHeaders", False, "get_CoffHeader", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
@@ -21,6 +23,8 @@ extensions:
       - ["System.Reflection.PortableExecutable", "PEReader", False, "PEReader", "(System.Byte*,System.Int32,System.Boolean)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Reflection.PortableExecutable", "PEReader", False, "PEReader", "(System.Collections.Immutable.ImmutableArray<System.Byte>)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
       - ["System.Reflection.PortableExecutable", "PEReader", False, "PEReader", "(System.IO.Stream,System.Reflection.PortableExecutable.PEStreamOptions,System.Int32)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["System.Reflection.PortableExecutable", "PEReader", False, "TryOpenAssociatedPortablePdb", "(System.String,System.Func<System.String,System.IO.Stream>,System.Reflection.Metadata.MetadataReaderProvider,System.String)", "", "Argument[0]", "Argument[1].Parameter[0]", "taint", "dfc-generated"]
+      - ["System.Reflection.PortableExecutable", "PEReader", False, "TryOpenAssociatedPortablePdb", "(System.String,System.Func<System.String,System.IO.Stream>,System.Reflection.Metadata.MetadataReaderProvider,System.String)", "", "Argument[0]", "ReturnValue", "taint", "dfc-generated"]
       - ["System.Reflection.PortableExecutable", "PEReader", False, "get_PEHeaders", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
   - addsTo:
       pack: codeql/csharp-all
@@ -64,7 +68,10 @@ extensions:
       - ["System.Reflection.PortableExecutable", "DebugDirectoryEntry", "get_Type", "()", "summary", "df-generated"]
       - ["System.Reflection.PortableExecutable", "DirectoryEntry", "DirectoryEntry", "(System.Int32,System.Int32)", "summary", "df-generated"]
       - ["System.Reflection.PortableExecutable", "ManagedPEBuilder", "CreateSections", "()", "summary", "df-generated"]
+      - ["System.Reflection.PortableExecutable", "ManagedPEBuilder", "ManagedPEBuilder", "(System.Reflection.PortableExecutable.PEHeaderBuilder,System.Reflection.Metadata.Ecma335.MetadataRootBuilder,System.Reflection.Metadata.BlobBuilder,System.Reflection.Metadata.BlobBuilder,System.Reflection.Metadata.BlobBuilder,System.Reflection.PortableExecutable.ResourceSectionBuilder,System.Reflection.PortableExecutable.DebugDirectoryBuilder,System.Int32,System.Reflection.Metadata.MethodDefinitionHandle,System.Reflection.PortableExecutable.CorFlags,System.Func<System.Collections.Generic.IEnumerable<System.Reflection.Metadata.Blob>,System.Reflection.Metadata.BlobContentId>)", "summary", "df-generated"]
+      - ["System.Reflection.PortableExecutable", "ManagedPEBuilder", "Sign", "(System.Reflection.Metadata.BlobBuilder,System.Func<System.Collections.Generic.IEnumerable<System.Reflection.Metadata.Blob>,System.Byte[]>)", "summary", "df-generated"]
       - ["System.Reflection.PortableExecutable", "PEBuilder", "CreateSections", "()", "summary", "df-generated"]
+      - ["System.Reflection.PortableExecutable", "PEBuilder", "PEBuilder", "(System.Reflection.PortableExecutable.PEHeaderBuilder,System.Func<System.Collections.Generic.IEnumerable<System.Reflection.Metadata.Blob>,System.Reflection.Metadata.BlobContentId>)", "summary", "df-generated"]
       - ["System.Reflection.PortableExecutable", "PEBuilder", "get_Header", "()", "summary", "df-generated"]
       - ["System.Reflection.PortableExecutable", "PEBuilder", "get_IdProvider", "()", "summary", "df-generated"]
       - ["System.Reflection.PortableExecutable", "PEBuilder", "get_IsDeterministic", "()", "summary", "df-generated"]
diff --git a/csharp/ql/lib/ext/generated/System.Reflection.Runtime.TypeParsing.model.yml b/csharp/ql/lib/ext/generated/System.Reflection.Runtime.TypeParsing.model.yml
index 3a0d93bd581..5032a7a3267 100644
--- a/csharp/ql/lib/ext/generated/System.Reflection.Runtime.TypeParsing.model.yml
+++ b/csharp/ql/lib/ext/generated/System.Reflection.Runtime.TypeParsing.model.yml
@@ -4,8 +4,8 @@ extensions:
       pack: codeql/csharp-all
       extensible: summaryModel
     data:
-      - ["System.Reflection.Runtime.TypeParsing", "AssemblyQualifiedTypeName", False, "AssemblyQualifiedTypeName", "(System.Reflection.Runtime.TypeParsing.NonQualifiedTypeName,System.Reflection.RuntimeAssemblyName)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Reflection.Runtime.TypeParsing", "AssemblyQualifiedTypeName", False, "AssemblyQualifiedTypeName", "(System.Reflection.Runtime.TypeParsing.NonQualifiedTypeName,System.Reflection.RuntimeAssemblyName)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["System.Reflection.Runtime.TypeParsing", "AssemblyQualifiedTypeName", False, "AssemblyQualifiedTypeName", "(System.Reflection.Runtime.TypeParsing.NonQualifiedTypeName,System.Reflection.RuntimeAssemblyName)", "", "Argument[0]", "Argument[this].Property[System.Reflection.Runtime.TypeParsing.AssemblyQualifiedTypeName.TypeName]", "value", "dfc-generated"]
+      - ["System.Reflection.Runtime.TypeParsing", "AssemblyQualifiedTypeName", False, "AssemblyQualifiedTypeName", "(System.Reflection.Runtime.TypeParsing.NonQualifiedTypeName,System.Reflection.RuntimeAssemblyName)", "", "Argument[1]", "Argument[this].Property[System.Reflection.Runtime.TypeParsing.AssemblyQualifiedTypeName.AssemblyName]", "value", "dfc-generated"]
       - ["System.Reflection.Runtime.TypeParsing", "TypeName", False, "ToString", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
   - addsTo:
       pack: codeql/csharp-all
diff --git a/csharp/ql/lib/ext/generated/System.Reflection.model.yml b/csharp/ql/lib/ext/generated/System.Reflection.model.yml
index 283ca734779..229f1a5f091 100644
--- a/csharp/ql/lib/ext/generated/System.Reflection.model.yml
+++ b/csharp/ql/lib/ext/generated/System.Reflection.model.yml
@@ -4,12 +4,12 @@ extensions:
       pack: codeql/csharp-all
       extensible: summaryModel
     data:
-      - ["System.Reflection", "Assembly", False, "CreateQualifiedName", "(System.String,System.String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Reflection", "Assembly", False, "CreateQualifiedName", "(System.String,System.String)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Reflection", "Assembly", False, "CreateQualifiedName", "(System.String,System.String)", "", "Argument[0]", "ReturnValue", "taint", "dfc-generated"]
+      - ["System.Reflection", "Assembly", False, "CreateQualifiedName", "(System.String,System.String)", "", "Argument[1]", "ReturnValue", "taint", "dfc-generated"]
       - ["System.Reflection", "Assembly", False, "GetLoadedModules", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Reflection", "Assembly", False, "GetModules", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Reflection", "Assembly", False, "LoadModule", "(System.String,System.Byte[])", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Reflection", "Assembly", False, "ToString", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Reflection", "Assembly", False, "ToString", "()", "", "Argument[this].Property[System.Reflection.Assembly.FullName]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Reflection", "Assembly", True, "GetFile", "(System.String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Reflection", "Assembly", True, "GetLoadedModules", "(System.Boolean)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Reflection", "Assembly", True, "GetManifestResourceInfo", "(System.String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
@@ -18,45 +18,57 @@ extensions:
       - ["System.Reflection", "Assembly", True, "GetModules", "(System.Boolean)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Reflection", "Assembly", True, "GetSatelliteAssembly", "(System.Globalization.CultureInfo)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Reflection", "Assembly", True, "GetSatelliteAssembly", "(System.Globalization.CultureInfo,System.Version)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Reflection", "Assembly", True, "GetType", "(System.String,System.Boolean,System.Boolean)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["System.Reflection", "Assembly", True, "GetType", "(System.String,System.Boolean,System.Boolean)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Reflection", "Assembly", True, "LoadModule", "(System.String,System.Byte[],System.Byte[])", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Reflection", "Assembly", True, "get_CodeBase", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Reflection", "Assembly", True, "get_CustomAttributes", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Reflection", "Assembly", True, "get_EntryPoint", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Reflection", "Assembly", True, "get_EscapedCodeBase", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Reflection", "Assembly", True, "get_EscapedCodeBase", "()", "", "Argument[this].Property[System.Reflection.Assembly.CodeBase]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Reflection", "Assembly", True, "get_FullName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Reflection", "Assembly", True, "get_ImageRuntimeVersion", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Reflection", "Assembly", True, "get_Location", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Reflection", "Assembly", True, "get_ManifestModule", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Reflection", "Assembly", True, "get_Modules", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Reflection", "AssemblyExtensions", False, "GetModules", "(System.Reflection.Assembly)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Reflection", "AssemblyName", False, "GetPublicKey", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Reflection", "AssemblyName", False, "SetPublicKey", "(System.Byte[])", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
+      - ["System.Reflection", "AssemblyName", False, "GetPublicKey", "()", "", "Argument[this].SyntheticField[System.Reflection.AssemblyName._publicKey]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Reflection", "AssemblyName", False, "SetPublicKey", "(System.Byte[])", "", "Argument[0]", "Argument[this].SyntheticField[System.Reflection.AssemblyName._publicKey]", "value", "dfc-generated"]
       - ["System.Reflection", "AssemblyName", False, "SetPublicKeyToken", "(System.Byte[])", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["System.Reflection", "AssemblyName", False, "ToString", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Reflection", "AssemblyName", False, "ToString", "()", "", "Argument[this].Property[System.Reflection.AssemblyName.FullName]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Reflection", "AssemblyName", False, "get_EscapedCodeBase", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Reflection", "Binder", True, "BindToField", "(System.Reflection.BindingFlags,System.Reflection.FieldInfo[],System.Object,System.Globalization.CultureInfo)", "", "Argument[1].Element", "ReturnValue", "taint", "df-generated"]
-      - ["System.Reflection", "Binder", True, "BindToMethod", "(System.Reflection.BindingFlags,System.Reflection.MethodBase[],System.Object[],System.Reflection.ParameterModifier[],System.Globalization.CultureInfo,System.String[],System.Object)", "", "Argument[1].Element", "ReturnValue", "taint", "df-generated"]
-      - ["System.Reflection", "Binder", True, "BindToMethod", "(System.Reflection.BindingFlags,System.Reflection.MethodBase[],System.Object[],System.Reflection.ParameterModifier[],System.Globalization.CultureInfo,System.String[],System.Object)", "", "Argument[2].Element", "ReturnValue", "taint", "df-generated"]
-      - ["System.Reflection", "Binder", True, "ReorderArgumentArray", "(System.Object[],System.Object)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["System.Reflection", "Binder", True, "SelectMethod", "(System.Reflection.BindingFlags,System.Reflection.MethodBase[],System.Type[],System.Reflection.ParameterModifier[])", "", "Argument[1].Element", "ReturnValue", "taint", "df-generated"]
-      - ["System.Reflection", "Binder", True, "SelectProperty", "(System.Reflection.BindingFlags,System.Reflection.PropertyInfo[],System.Type,System.Type[],System.Reflection.ParameterModifier[])", "", "Argument[1].Element", "ReturnValue", "taint", "df-generated"]
+      - ["System.Reflection", "Binder", True, "BindToField", "(System.Reflection.BindingFlags,System.Reflection.FieldInfo[],System.Object,System.Globalization.CultureInfo)", "", "Argument[1].Element", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Reflection", "Binder", True, "BindToMethod", "(System.Reflection.BindingFlags,System.Reflection.MethodBase[],System.Object[],System.Reflection.ParameterModifier[],System.Globalization.CultureInfo,System.String[],System.Object)", "", "Argument[1].Element", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Reflection", "Binder", True, "BindToMethod", "(System.Reflection.BindingFlags,System.Reflection.MethodBase[],System.Object[],System.Reflection.ParameterModifier[],System.Globalization.CultureInfo,System.String[],System.Object)", "", "Argument[2].Element", "ReturnValue.Element", "value", "dfc-generated"]
+      - ["System.Reflection", "Binder", True, "BindToMethod", "(System.Reflection.BindingFlags,System.Reflection.MethodBase[],System.Object[],System.Reflection.ParameterModifier[],System.Globalization.CultureInfo,System.String[],System.Object)", "", "Argument[2]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Reflection", "Binder", True, "ReorderArgumentArray", "(System.Object[],System.Object)", "", "Argument[0].Element.Element", "Argument[0].Element", "value", "dfc-generated"]
+      - ["System.Reflection", "Binder", True, "ReorderArgumentArray", "(System.Object[],System.Object)", "", "Argument[0].Element.Element", "ReturnValue.Element", "value", "dfc-generated"]
+      - ["System.Reflection", "Binder", True, "ReorderArgumentArray", "(System.Object[],System.Object)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Reflection", "Binder", True, "SelectMethod", "(System.Reflection.BindingFlags,System.Reflection.MethodBase[],System.Type[],System.Reflection.ParameterModifier[])", "", "Argument[1].Element", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Reflection", "Binder", True, "SelectProperty", "(System.Reflection.BindingFlags,System.Reflection.PropertyInfo[],System.Type,System.Type[],System.Reflection.ParameterModifier[])", "", "Argument[1].Element", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Reflection", "ConstructorInvoker", False, "Invoke", "(System.Object)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["System.Reflection", "ConstructorInvoker", False, "Invoke", "(System.Object,System.Object)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["System.Reflection", "ConstructorInvoker", False, "Invoke", "(System.Object,System.Object)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["System.Reflection", "ConstructorInvoker", False, "Invoke", "(System.Object,System.Object,System.Object)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["System.Reflection", "ConstructorInvoker", False, "Invoke", "(System.Object,System.Object,System.Object)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["System.Reflection", "ConstructorInvoker", False, "Invoke", "(System.Object,System.Object,System.Object)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
+      - ["System.Reflection", "ConstructorInvoker", False, "Invoke", "(System.Object,System.Object,System.Object,System.Object)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["System.Reflection", "ConstructorInvoker", False, "Invoke", "(System.Object,System.Object,System.Object,System.Object)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["System.Reflection", "ConstructorInvoker", False, "Invoke", "(System.Object,System.Object,System.Object,System.Object)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
+      - ["System.Reflection", "ConstructorInvoker", False, "Invoke", "(System.Object,System.Object,System.Object,System.Object)", "", "Argument[3]", "Argument[this]", "taint", "df-generated"]
+      - ["System.Reflection", "ConstructorInvoker", False, "Invoke", "(System.Span<System.Object>)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Reflection", "CustomAttributeData", True, "get_Constructor", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Reflection", "CustomAttributeData", True, "get_ConstructorArguments", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Reflection", "CustomAttributeData", True, "get_NamedArguments", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Reflection", "CustomAttributeNamedArgument", False, "CustomAttributeNamedArgument", "(System.Reflection.MemberInfo,System.Object)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Reflection", "CustomAttributeNamedArgument", False, "CustomAttributeNamedArgument", "(System.Reflection.MemberInfo,System.Object)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Reflection", "CustomAttributeNamedArgument", False, "CustomAttributeNamedArgument", "(System.Reflection.MemberInfo,System.Reflection.CustomAttributeTypedArgument)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Reflection", "CustomAttributeNamedArgument", False, "CustomAttributeNamedArgument", "(System.Reflection.MemberInfo,System.Reflection.CustomAttributeTypedArgument)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["System.Reflection", "CustomAttributeNamedArgument", False, "CustomAttributeNamedArgument", "(System.Reflection.MemberInfo,System.Object)", "", "Argument[0]", "Argument[this].SyntheticField[System.Reflection.CustomAttributeNamedArgument._memberInfo]", "value", "dfc-generated"]
+      - ["System.Reflection", "CustomAttributeNamedArgument", False, "CustomAttributeNamedArgument", "(System.Reflection.MemberInfo,System.Reflection.CustomAttributeTypedArgument)", "", "Argument[0]", "Argument[this].SyntheticField[System.Reflection.CustomAttributeNamedArgument._memberInfo]", "value", "dfc-generated"]
+      - ["System.Reflection", "CustomAttributeNamedArgument", False, "CustomAttributeNamedArgument", "(System.Reflection.MemberInfo,System.Reflection.CustomAttributeTypedArgument)", "", "Argument[1]", "Argument[this].SyntheticField[System.Reflection.CustomAttributeNamedArgument._value]", "value", "dfc-generated"]
       - ["System.Reflection", "CustomAttributeNamedArgument", False, "ToString", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Reflection", "CustomAttributeNamedArgument", False, "get_MemberInfo", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Reflection", "CustomAttributeNamedArgument", False, "get_MemberInfo", "()", "", "Argument[this].SyntheticField[System.Reflection.CustomAttributeNamedArgument._memberInfo]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Reflection", "CustomAttributeNamedArgument", False, "get_MemberName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Reflection", "CustomAttributeNamedArgument", False, "get_TypedValue", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Reflection", "CustomAttributeTypedArgument", False, "CustomAttributeTypedArgument", "(System.Object)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Reflection", "CustomAttributeTypedArgument", False, "CustomAttributeTypedArgument", "(System.Type,System.Object)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Reflection", "CustomAttributeTypedArgument", False, "ToString", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Reflection", "CustomAttributeTypedArgument", False, "get_Value", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Reflection", "CustomAttributeNamedArgument", False, "get_TypedValue", "()", "", "Argument[this].SyntheticField[System.Reflection.CustomAttributeNamedArgument._value]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Reflection", "CustomAttributeTypedArgument", False, "CustomAttributeTypedArgument", "(System.Object)", "", "Argument[0]", "Argument[this].SyntheticField[System.Reflection.CustomAttributeTypedArgument._value]", "value", "dfc-generated"]
+      - ["System.Reflection", "CustomAttributeTypedArgument", False, "CustomAttributeTypedArgument", "(System.Type,System.Object)", "", "Argument[1]", "Argument[this].SyntheticField[System.Reflection.CustomAttributeTypedArgument._value]", "value", "dfc-generated"]
+      - ["System.Reflection", "CustomAttributeTypedArgument", False, "ToString", "()", "", "Argument[this].Property[System.Reflection.CustomAttributeTypedArgument.Value]", "ReturnValue", "taint", "dfc-generated"]
+      - ["System.Reflection", "CustomAttributeTypedArgument", False, "ToString", "()", "", "Argument[this].SyntheticField[System.Reflection.CustomAttributeTypedArgument._value]", "ReturnValue", "taint", "dfc-generated"]
+      - ["System.Reflection", "CustomAttributeTypedArgument", False, "get_Value", "()", "", "Argument[this].SyntheticField[System.Reflection.CustomAttributeTypedArgument._value]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Reflection", "EventInfo", False, "GetAddMethod", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Reflection", "EventInfo", False, "GetRaiseMethod", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Reflection", "EventInfo", False, "GetRemoveMethod", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
@@ -67,21 +79,16 @@ extensions:
       - ["System.Reflection", "EventInfo", True, "get_EventHandlerType", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Reflection", "EventInfo", True, "get_RaiseMethod", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Reflection", "EventInfo", True, "get_RemoveMethod", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Reflection", "EventInfoExtensions", False, "GetAddMethod", "(System.Reflection.EventInfo)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["System.Reflection", "EventInfoExtensions", False, "GetAddMethod", "(System.Reflection.EventInfo,System.Boolean)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Reflection", "EventInfoExtensions", False, "GetRaiseMethod", "(System.Reflection.EventInfo)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["System.Reflection", "EventInfoExtensions", False, "GetRaiseMethod", "(System.Reflection.EventInfo,System.Boolean)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Reflection", "EventInfoExtensions", False, "GetRemoveMethod", "(System.Reflection.EventInfo)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["System.Reflection", "EventInfoExtensions", False, "GetRemoveMethod", "(System.Reflection.EventInfo,System.Boolean)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["System.Reflection", "ExceptionHandlingClause", True, "get_CatchType", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Reflection", "FieldInfo", True, "GetModifiedFieldType", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Reflection", "FieldInfo", True, "get_FieldHandle", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Reflection", "FieldInfo", True, "get_FieldType", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Reflection", "ICustomAttributeProvider", True, "GetCustomAttributes", "(System.Boolean)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Reflection", "IReflect", True, "GetField", "(System.String,System.Reflection.BindingFlags)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Reflection", "IReflect", True, "get_UnderlyingSystemType", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Reflection", "IReflect", True, "get_UnderlyingSystemType", "()", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["System.Reflection", "IReflectableType", True, "GetTypeInfo", "()", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["System.Reflection", "IReflect", True, "get_UnderlyingSystemType", "()", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Reflection", "IReflectableType", True, "GetTypeInfo", "()", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Reflection", "LocalVariableInfo", True, "get_LocalType", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Reflection", "ManifestResourceInfo", True, "get_ReferencedAssembly", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Reflection", "MemberInfo", True, "get_CustomAttributes", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
@@ -89,33 +96,54 @@ extensions:
       - ["System.Reflection", "MemberInfo", True, "get_Module", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Reflection", "MemberInfo", True, "get_Name", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Reflection", "MemberInfo", True, "get_ReflectedType", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Reflection", "MetadataAssemblyResolver", True, "Resolve", "(System.Reflection.MetadataLoadContext,System.Reflection.AssemblyName)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Reflection", "MetadataAssemblyResolver", True, "Resolve", "(System.Reflection.MetadataLoadContext,System.Reflection.AssemblyName)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Reflection", "MetadataLoadContext", False, "GetAssemblies", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Reflection", "MetadataLoadContext", False, "LoadFromAssemblyName", "(System.Reflection.AssemblyName)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Reflection", "MetadataLoadContext", False, "LoadFromAssemblyPath", "(System.String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Reflection", "MetadataLoadContext", False, "LoadFromStream", "(System.IO.Stream)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["System.Reflection", "MetadataLoadContext", False, "MetadataLoadContext", "(System.Reflection.MetadataAssemblyResolver,System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Reflection", "MetadataLoadContext", False, "get_CoreAssembly", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Reflection", "MethodBase", False, "Invoke", "(System.Object,System.Object[])", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["System.Reflection", "MethodBase", False, "Invoke", "(System.Object,System.Object[])", "", "Argument[1].Element", "Argument[this]", "taint", "df-generated"]
+      - ["System.Reflection", "MethodBase", False, "Invoke", "(System.Object,System.Object[])", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Reflection", "MethodBase", True, "GetGenericArguments", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Reflection", "MethodBase", True, "GetMethodBody", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Reflection", "MethodBase", True, "GetParameters", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Reflection", "MethodBase", True, "Invoke", "(System.Object,System.Reflection.BindingFlags,System.Reflection.Binder,System.Object[],System.Globalization.CultureInfo)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["System.Reflection", "MethodBase", True, "Invoke", "(System.Object,System.Reflection.BindingFlags,System.Reflection.Binder,System.Object[],System.Globalization.CultureInfo)", "", "Argument[3].Element", "Argument[this]", "taint", "df-generated"]
+      - ["System.Reflection", "MethodBase", True, "Invoke", "(System.Object,System.Reflection.BindingFlags,System.Reflection.Binder,System.Object[],System.Globalization.CultureInfo)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Reflection", "MethodBase", True, "get_MethodHandle", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Reflection", "MethodBody", True, "GetILAsByteArray", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Reflection", "MethodBody", True, "get_ExceptionHandlingClauses", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Reflection", "MethodBody", True, "get_LocalVariables", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Reflection", "MethodInfo", False, "CreateDelegate<T>", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Reflection", "MethodInfo", True, "CreateDelegate", "(System.Type)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Reflection", "MethodInfo", True, "GetBaseDefinition", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Reflection", "MethodInfo", True, "GetBaseDefinition", "()", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["System.Reflection", "MethodInfo", True, "GetGenericMethodDefinition", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Reflection", "MethodInfo", True, "GetGenericMethodDefinition", "()", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["System.Reflection", "MethodInfo", True, "GetBaseDefinition", "()", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Reflection", "MethodInfo", True, "GetGenericMethodDefinition", "()", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Reflection", "MethodInfo", True, "MakeGenericMethod", "(System.Type[])", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
       - ["System.Reflection", "MethodInfo", True, "MakeGenericMethod", "(System.Type[])", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Reflection", "MethodInfo", True, "get_ReturnParameter", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Reflection", "MethodInfo", True, "get_ReturnType", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Reflection", "MethodInfo", True, "get_ReturnTypeCustomAttributes", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Reflection", "MethodInfoExtensions", False, "GetBaseDefinition", "(System.Reflection.MethodInfo)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Reflection", "MethodInvoker", False, "Invoke", "(System.Object)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["System.Reflection", "MethodInvoker", False, "Invoke", "(System.Object)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Reflection", "MethodInvoker", False, "Invoke", "(System.Object,System.Object)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["System.Reflection", "MethodInvoker", False, "Invoke", "(System.Object,System.Object)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["System.Reflection", "MethodInvoker", False, "Invoke", "(System.Object,System.Object)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Reflection", "MethodInvoker", False, "Invoke", "(System.Object,System.Object,System.Object)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["System.Reflection", "MethodInvoker", False, "Invoke", "(System.Object,System.Object,System.Object)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["System.Reflection", "MethodInvoker", False, "Invoke", "(System.Object,System.Object,System.Object)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
+      - ["System.Reflection", "MethodInvoker", False, "Invoke", "(System.Object,System.Object,System.Object)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Reflection", "MethodInvoker", False, "Invoke", "(System.Object,System.Object,System.Object,System.Object)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["System.Reflection", "MethodInvoker", False, "Invoke", "(System.Object,System.Object,System.Object,System.Object)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["System.Reflection", "MethodInvoker", False, "Invoke", "(System.Object,System.Object,System.Object,System.Object)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
+      - ["System.Reflection", "MethodInvoker", False, "Invoke", "(System.Object,System.Object,System.Object,System.Object)", "", "Argument[3]", "Argument[this]", "taint", "df-generated"]
+      - ["System.Reflection", "MethodInvoker", False, "Invoke", "(System.Object,System.Object,System.Object,System.Object)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Reflection", "MethodInvoker", False, "Invoke", "(System.Object,System.Object,System.Object,System.Object,System.Object)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["System.Reflection", "MethodInvoker", False, "Invoke", "(System.Object,System.Object,System.Object,System.Object,System.Object)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["System.Reflection", "MethodInvoker", False, "Invoke", "(System.Object,System.Object,System.Object,System.Object,System.Object)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
+      - ["System.Reflection", "MethodInvoker", False, "Invoke", "(System.Object,System.Object,System.Object,System.Object,System.Object)", "", "Argument[3]", "Argument[this]", "taint", "df-generated"]
+      - ["System.Reflection", "MethodInvoker", False, "Invoke", "(System.Object,System.Object,System.Object,System.Object,System.Object)", "", "Argument[4]", "Argument[this]", "taint", "df-generated"]
+      - ["System.Reflection", "MethodInvoker", False, "Invoke", "(System.Object,System.Object,System.Object,System.Object,System.Object)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Reflection", "MethodInvoker", False, "Invoke", "(System.Object,System.Span<System.Object>)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["System.Reflection", "MethodInvoker", False, "Invoke", "(System.Object,System.Span<System.Object>)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["System.Reflection", "MethodInvoker", False, "Invoke", "(System.Object,System.Span<System.Object>)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Reflection", "Module", False, "GetField", "(System.String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Reflection", "Module", False, "GetMethod", "(System.String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Reflection", "Module", False, "GetMethod", "(System.String,System.Reflection.BindingFlags,System.Reflection.Binder,System.Reflection.CallingConventions,System.Type[],System.Reflection.ParameterModifier[])", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
@@ -125,6 +153,7 @@ extensions:
       - ["System.Reflection", "Module", False, "ResolveMethod", "(System.Int32)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Reflection", "Module", False, "ToString", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Reflection", "Module", False, "get_ModuleHandle", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Reflection", "Module", True, "FindTypes", "(System.Reflection.TypeFilter,System.Object)", "", "Argument[1]", "Argument[0].Parameter[1]", "value", "dfc-generated"]
       - ["System.Reflection", "Module", True, "GetField", "(System.String,System.Reflection.BindingFlags)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Reflection", "Module", True, "GetMethodImpl", "(System.String,System.Reflection.BindingFlags,System.Reflection.Binder,System.Reflection.CallingConventions,System.Type[],System.Reflection.ParameterModifier[])", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Reflection", "Module", True, "GetType", "(System.String,System.Boolean,System.Boolean)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
@@ -138,13 +167,13 @@ extensions:
       - ["System.Reflection", "Module", True, "get_ModuleVersionId", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Reflection", "Module", True, "get_Name", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Reflection", "Module", True, "get_ScopeName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Reflection", "ModuleExtensions", False, "GetModuleVersionId", "(System.Reflection.Module)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Reflection", "ModuleExtensions", False, "GetModuleVersionId", "(System.Reflection.Module)", "", "Argument[0].Property[System.Reflection.Module.ModuleVersionId]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Reflection", "ParameterInfo", False, "ToString", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Reflection", "ParameterInfo", True, "GetModifiedParameterType", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Reflection", "ParameterInfo", True, "get_CustomAttributes", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Reflection", "ParameterInfo", True, "get_DefaultValue", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Reflection", "ParameterInfo", True, "get_Member", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Reflection", "ParameterInfo", True, "get_Name", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Reflection", "ParameterInfo", True, "get_Member", "()", "", "Argument[this].Field[System.Reflection.ParameterInfo.MemberImpl]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Reflection", "ParameterInfo", True, "get_Name", "()", "", "Argument[this].Field[System.Reflection.ParameterInfo.NameImpl]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Reflection", "ParameterInfo", True, "get_ParameterType", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Reflection", "ParameterInfo", True, "get_RawDefaultValue", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Reflection", "Pointer", False, "Box", "(System.Void*,System.Type)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
@@ -152,33 +181,32 @@ extensions:
       - ["System.Reflection", "PropertyInfo", False, "GetAccessors", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Reflection", "PropertyInfo", False, "GetGetMethod", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Reflection", "PropertyInfo", False, "GetSetMethod", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Reflection", "PropertyInfo", False, "GetValue", "(System.Object)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["System.Reflection", "PropertyInfo", False, "GetValue", "(System.Object)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Reflection", "PropertyInfo", True, "GetAccessors", "(System.Boolean)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Reflection", "PropertyInfo", True, "GetConstantValue", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Reflection", "PropertyInfo", True, "GetGetMethod", "(System.Boolean)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Reflection", "PropertyInfo", True, "GetIndexParameters", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Reflection", "PropertyInfo", True, "GetModifiedPropertyType", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Reflection", "PropertyInfo", True, "GetSetMethod", "(System.Boolean)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Reflection", "PropertyInfo", True, "GetValue", "(System.Object,System.Object[])", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["System.Reflection", "PropertyInfo", True, "GetValue", "(System.Object,System.Object[])", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Reflection", "PropertyInfo", True, "get_GetMethod", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Reflection", "PropertyInfo", True, "get_PropertyType", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Reflection", "PropertyInfo", True, "get_SetMethod", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Reflection", "PropertyInfoExtensions", False, "GetAccessors", "(System.Reflection.PropertyInfo)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["System.Reflection", "PropertyInfoExtensions", False, "GetAccessors", "(System.Reflection.PropertyInfo,System.Boolean)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Reflection", "PropertyInfoExtensions", False, "GetGetMethod", "(System.Reflection.PropertyInfo)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["System.Reflection", "PropertyInfoExtensions", False, "GetGetMethod", "(System.Reflection.PropertyInfo,System.Boolean)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Reflection", "PropertyInfoExtensions", False, "GetSetMethod", "(System.Reflection.PropertyInfo)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["System.Reflection", "PropertyInfoExtensions", False, "GetSetMethod", "(System.Reflection.PropertyInfo,System.Boolean)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Reflection", "ReflectionContext", True, "GetTypeForObject", "(System.Object)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Reflection", "ReflectionContext", True, "MapAssembly", "(System.Reflection.Assembly)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Reflection", "ReflectionContext", True, "MapAssembly", "(System.Reflection.Assembly)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Reflection", "ReflectionContext", True, "MapType", "(System.Reflection.TypeInfo)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Reflection", "ReflectionContext", True, "MapType", "(System.Reflection.TypeInfo)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Reflection", "RuntimeAssemblyName", False, "RuntimeAssemblyName", "(System.String,System.Version,System.String,System.Reflection.AssemblyNameFlags,System.Byte[])", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Reflection", "RuntimeAssemblyName", False, "RuntimeAssemblyName", "(System.String,System.Version,System.String,System.Reflection.AssemblyNameFlags,System.Byte[])", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Reflection", "RuntimeAssemblyName", False, "RuntimeAssemblyName", "(System.String,System.Version,System.String,System.Reflection.AssemblyNameFlags,System.Byte[])", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Reflection", "RuntimeAssemblyName", False, "RuntimeAssemblyName", "(System.String,System.Version,System.String,System.Reflection.AssemblyNameFlags,System.Byte[])", "", "Argument[4].Element", "Argument[this]", "taint", "df-generated"]
-      - ["System.Reflection", "RuntimeReflectionExtensions", False, "GetMethodInfo", "(System.Delegate)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Reflection", "ReflectionContext", True, "MapAssembly", "(System.Reflection.Assembly)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Reflection", "ReflectionContext", True, "MapType", "(System.Reflection.TypeInfo)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Reflection", "ReflectionTypeLoadException", False, "get_Message", "()", "", "Argument[this].Property[System.Exception.Message]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Reflection", "RuntimeAssemblyName", False, "RuntimeAssemblyName", "(System.String,System.Version,System.String,System.Reflection.AssemblyNameFlags,System.Byte[])", "", "Argument[0]", "Argument[this].Property[System.Reflection.RuntimeAssemblyName.Name]", "value", "dfc-generated"]
+      - ["System.Reflection", "RuntimeAssemblyName", False, "RuntimeAssemblyName", "(System.String,System.Version,System.String,System.Reflection.AssemblyNameFlags,System.Byte[])", "", "Argument[1]", "Argument[this].Property[System.Reflection.RuntimeAssemblyName.Version]", "value", "dfc-generated"]
+      - ["System.Reflection", "RuntimeAssemblyName", False, "RuntimeAssemblyName", "(System.String,System.Version,System.String,System.Reflection.AssemblyNameFlags,System.Byte[])", "", "Argument[2]", "Argument[this].Property[System.Reflection.RuntimeAssemblyName.CultureName]", "value", "dfc-generated"]
+      - ["System.Reflection", "RuntimeAssemblyName", False, "RuntimeAssemblyName", "(System.String,System.Version,System.String,System.Reflection.AssemblyNameFlags,System.Byte[])", "", "Argument[4]", "Argument[this].Property[System.Reflection.RuntimeAssemblyName.PublicKeyOrToken]", "value", "dfc-generated"]
+      - ["System.Reflection", "RuntimeReflectionExtensions", False, "GetMethodInfo", "(System.Delegate)", "", "Argument[0].Property[System.Delegate.Method]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Reflection", "RuntimeReflectionExtensions", False, "GetRuntimeBaseDefinition", "(System.Reflection.MethodInfo)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Reflection", "TypeInfo", True, "AsType", "()", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["System.Reflection", "TypeInfo", True, "AsType", "()", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Reflection", "TypeInfo", True, "GetDeclaredEvent", "(System.String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Reflection", "TypeInfo", True, "GetDeclaredField", "(System.String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Reflection", "TypeInfo", True, "get_GenericTypeParameters", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
@@ -195,6 +223,7 @@ extensions:
       - ["System.Reflection", "Assembly", "Equals", "(System.Object)", "summary", "df-generated"]
       - ["System.Reflection", "Assembly", "GetAssembly", "(System.Type)", "summary", "df-generated"]
       - ["System.Reflection", "Assembly", "GetCallingAssembly", "()", "summary", "df-generated"]
+      - ["System.Reflection", "Assembly", "GetCustomAttributes", "(System.Boolean)", "summary", "df-generated"]
       - ["System.Reflection", "Assembly", "GetCustomAttributes", "(System.Type,System.Boolean)", "summary", "df-generated"]
       - ["System.Reflection", "Assembly", "GetCustomAttributesData", "()", "summary", "df-generated"]
       - ["System.Reflection", "Assembly", "GetEntryAssembly", "()", "summary", "df-generated"]
@@ -225,6 +254,7 @@ extensions:
       - ["System.Reflection", "Assembly", "ReflectionOnlyLoad", "(System.String)", "summary", "df-generated"]
       - ["System.Reflection", "Assembly", "ReflectionOnlyLoadFrom", "(System.String)", "summary", "df-generated"]
       - ["System.Reflection", "Assembly", "UnsafeLoadFrom", "(System.String)", "summary", "df-generated"]
+      - ["System.Reflection", "Assembly", "add_ModuleResolve", "(System.Reflection.ModuleResolveEventHandler)", "summary", "df-generated"]
       - ["System.Reflection", "Assembly", "get_DefinedTypes", "()", "summary", "df-generated"]
       - ["System.Reflection", "Assembly", "get_ExportedTypes", "()", "summary", "df-generated"]
       - ["System.Reflection", "Assembly", "get_GlobalAssemblyCache", "()", "summary", "df-generated"]
@@ -236,6 +266,7 @@ extensions:
       - ["System.Reflection", "Assembly", "get_SecurityRuleSet", "()", "summary", "df-generated"]
       - ["System.Reflection", "Assembly", "op_Equality", "(System.Reflection.Assembly,System.Reflection.Assembly)", "summary", "df-generated"]
       - ["System.Reflection", "Assembly", "op_Inequality", "(System.Reflection.Assembly,System.Reflection.Assembly)", "summary", "df-generated"]
+      - ["System.Reflection", "Assembly", "remove_ModuleResolve", "(System.Reflection.ModuleResolveEventHandler)", "summary", "df-generated"]
       - ["System.Reflection", "AssemblyAlgorithmIdAttribute", "AssemblyAlgorithmIdAttribute", "(System.Configuration.Assemblies.AssemblyHashAlgorithm)", "summary", "df-generated"]
       - ["System.Reflection", "AssemblyAlgorithmIdAttribute", "AssemblyAlgorithmIdAttribute", "(System.UInt32)", "summary", "df-generated"]
       - ["System.Reflection", "AssemblyAlgorithmIdAttribute", "get_AlgorithmId", "()", "summary", "df-generated"]
@@ -254,6 +285,7 @@ extensions:
       - ["System.Reflection", "AssemblyDescriptionAttribute", "AssemblyDescriptionAttribute", "(System.String)", "summary", "df-generated"]
       - ["System.Reflection", "AssemblyDescriptionAttribute", "get_Description", "()", "summary", "df-generated"]
       - ["System.Reflection", "AssemblyExtensions", "GetExportedTypes", "(System.Reflection.Assembly)", "summary", "df-generated"]
+      - ["System.Reflection", "AssemblyExtensions", "GetModules", "(System.Reflection.Assembly)", "summary", "df-generated"]
       - ["System.Reflection", "AssemblyExtensions", "GetTypes", "(System.Reflection.Assembly)", "summary", "df-generated"]
       - ["System.Reflection", "AssemblyFileVersionAttribute", "AssemblyFileVersionAttribute", "(System.String)", "summary", "df-generated"]
       - ["System.Reflection", "AssemblyFileVersionAttribute", "get_Version", "()", "summary", "df-generated"]
@@ -301,11 +333,6 @@ extensions:
       - ["System.Reflection", "ConstructorInfo", "op_Inequality", "(System.Reflection.ConstructorInfo,System.Reflection.ConstructorInfo)", "summary", "df-generated"]
       - ["System.Reflection", "ConstructorInvoker", "Create", "(System.Reflection.ConstructorInfo)", "summary", "df-generated"]
       - ["System.Reflection", "ConstructorInvoker", "Invoke", "()", "summary", "df-generated"]
-      - ["System.Reflection", "ConstructorInvoker", "Invoke", "(System.Object)", "summary", "df-generated"]
-      - ["System.Reflection", "ConstructorInvoker", "Invoke", "(System.Object,System.Object)", "summary", "df-generated"]
-      - ["System.Reflection", "ConstructorInvoker", "Invoke", "(System.Object,System.Object,System.Object)", "summary", "df-generated"]
-      - ["System.Reflection", "ConstructorInvoker", "Invoke", "(System.Object,System.Object,System.Object,System.Object)", "summary", "df-generated"]
-      - ["System.Reflection", "ConstructorInvoker", "Invoke", "(System.Span<System.Object>)", "summary", "df-generated"]
       - ["System.Reflection", "CustomAttributeData", "Equals", "(System.Object)", "summary", "df-generated"]
       - ["System.Reflection", "CustomAttributeData", "GetCustomAttributes", "(System.Reflection.Assembly)", "summary", "df-generated"]
       - ["System.Reflection", "CustomAttributeData", "GetCustomAttributes", "(System.Reflection.MemberInfo)", "summary", "df-generated"]
@@ -382,6 +409,9 @@ extensions:
       - ["System.Reflection", "EventInfo", "get_MemberType", "()", "summary", "df-generated"]
       - ["System.Reflection", "EventInfo", "op_Equality", "(System.Reflection.EventInfo,System.Reflection.EventInfo)", "summary", "df-generated"]
       - ["System.Reflection", "EventInfo", "op_Inequality", "(System.Reflection.EventInfo,System.Reflection.EventInfo)", "summary", "df-generated"]
+      - ["System.Reflection", "EventInfoExtensions", "GetAddMethod", "(System.Reflection.EventInfo)", "summary", "df-generated"]
+      - ["System.Reflection", "EventInfoExtensions", "GetRaiseMethod", "(System.Reflection.EventInfo)", "summary", "df-generated"]
+      - ["System.Reflection", "EventInfoExtensions", "GetRemoveMethod", "(System.Reflection.EventInfo)", "summary", "df-generated"]
       - ["System.Reflection", "ExceptionHandlingClause", "ToString", "()", "summary", "df-generated"]
       - ["System.Reflection", "ExceptionHandlingClause", "get_FilterOffset", "()", "summary", "df-generated"]
       - ["System.Reflection", "ExceptionHandlingClause", "get_Flags", "()", "summary", "df-generated"]
@@ -420,6 +450,7 @@ extensions:
       - ["System.Reflection", "FieldInfo", "get_MemberType", "()", "summary", "df-generated"]
       - ["System.Reflection", "FieldInfo", "op_Equality", "(System.Reflection.FieldInfo,System.Reflection.FieldInfo)", "summary", "df-generated"]
       - ["System.Reflection", "FieldInfo", "op_Inequality", "(System.Reflection.FieldInfo,System.Reflection.FieldInfo)", "summary", "df-generated"]
+      - ["System.Reflection", "ICustomAttributeProvider", "GetCustomAttributes", "(System.Boolean)", "summary", "df-generated"]
       - ["System.Reflection", "ICustomAttributeProvider", "GetCustomAttributes", "(System.Type,System.Boolean)", "summary", "df-generated"]
       - ["System.Reflection", "ICustomAttributeProvider", "IsDefined", "(System.Type,System.Boolean)", "summary", "df-generated"]
       - ["System.Reflection", "ICustomTypeProvider", "GetCustomType", "()", "summary", "df-generated"]
@@ -444,6 +475,7 @@ extensions:
       - ["System.Reflection", "ManifestResourceInfo", "get_FileName", "()", "summary", "df-generated"]
       - ["System.Reflection", "ManifestResourceInfo", "get_ResourceLocation", "()", "summary", "df-generated"]
       - ["System.Reflection", "MemberInfo", "Equals", "(System.Object)", "summary", "df-generated"]
+      - ["System.Reflection", "MemberInfo", "GetCustomAttributes", "(System.Boolean)", "summary", "df-generated"]
       - ["System.Reflection", "MemberInfo", "GetCustomAttributes", "(System.Type,System.Boolean)", "summary", "df-generated"]
       - ["System.Reflection", "MemberInfo", "GetCustomAttributesData", "()", "summary", "df-generated"]
       - ["System.Reflection", "MemberInfo", "GetHashCode", "()", "summary", "df-generated"]
@@ -456,17 +488,19 @@ extensions:
       - ["System.Reflection", "MemberInfo", "op_Inequality", "(System.Reflection.MemberInfo,System.Reflection.MemberInfo)", "summary", "df-generated"]
       - ["System.Reflection", "MemberInfoExtensions", "GetMetadataToken", "(System.Reflection.MemberInfo)", "summary", "df-generated"]
       - ["System.Reflection", "MemberInfoExtensions", "HasMetadataToken", "(System.Reflection.MemberInfo)", "summary", "df-generated"]
+      - ["System.Reflection", "MetadataAssemblyResolver", "Resolve", "(System.Reflection.MetadataLoadContext,System.Reflection.AssemblyName)", "summary", "df-generated"]
       - ["System.Reflection", "MetadataLoadContext", "Dispose", "()", "summary", "df-generated"]
+      - ["System.Reflection", "MetadataLoadContext", "LoadFromAssemblyName", "(System.Reflection.AssemblyName)", "summary", "df-generated"]
       - ["System.Reflection", "MetadataLoadContext", "LoadFromAssemblyName", "(System.String)", "summary", "df-generated"]
+      - ["System.Reflection", "MetadataLoadContext", "LoadFromAssemblyPath", "(System.String)", "summary", "df-generated"]
       - ["System.Reflection", "MetadataLoadContext", "LoadFromByteArray", "(System.Byte[])", "summary", "df-generated"]
+      - ["System.Reflection", "MetadataLoadContext", "LoadFromStream", "(System.IO.Stream)", "summary", "df-generated"]
       - ["System.Reflection", "MethodBase", "Equals", "(System.Object)", "summary", "df-generated"]
       - ["System.Reflection", "MethodBase", "GetCurrentMethod", "()", "summary", "df-generated"]
       - ["System.Reflection", "MethodBase", "GetHashCode", "()", "summary", "df-generated"]
       - ["System.Reflection", "MethodBase", "GetMethodFromHandle", "(System.RuntimeMethodHandle)", "summary", "df-generated"]
       - ["System.Reflection", "MethodBase", "GetMethodFromHandle", "(System.RuntimeMethodHandle,System.RuntimeTypeHandle)", "summary", "df-generated"]
       - ["System.Reflection", "MethodBase", "GetMethodImplementationFlags", "()", "summary", "df-generated"]
-      - ["System.Reflection", "MethodBase", "Invoke", "(System.Object,System.Object[])", "summary", "df-generated"]
-      - ["System.Reflection", "MethodBase", "Invoke", "(System.Object,System.Reflection.BindingFlags,System.Reflection.Binder,System.Object[],System.Globalization.CultureInfo)", "summary", "df-generated"]
       - ["System.Reflection", "MethodBase", "get_Attributes", "()", "summary", "df-generated"]
       - ["System.Reflection", "MethodBase", "get_CallingConvention", "()", "summary", "df-generated"]
       - ["System.Reflection", "MethodBase", "get_ContainsGenericParameters", "()", "summary", "df-generated"]
@@ -496,6 +530,7 @@ extensions:
       - ["System.Reflection", "MethodBody", "get_LocalSignatureMetadataToken", "()", "summary", "df-generated"]
       - ["System.Reflection", "MethodBody", "get_MaxStackSize", "()", "summary", "df-generated"]
       - ["System.Reflection", "MethodInfo", "CreateDelegate", "(System.Type,System.Object)", "summary", "df-generated"]
+      - ["System.Reflection", "MethodInfo", "CreateDelegate<T>", "()", "summary", "df-generated"]
       - ["System.Reflection", "MethodInfo", "CreateDelegate<T>", "(System.Object)", "summary", "df-generated"]
       - ["System.Reflection", "MethodInfo", "Equals", "(System.Object)", "summary", "df-generated"]
       - ["System.Reflection", "MethodInfo", "GetHashCode", "()", "summary", "df-generated"]
@@ -503,13 +538,8 @@ extensions:
       - ["System.Reflection", "MethodInfo", "op_Equality", "(System.Reflection.MethodInfo,System.Reflection.MethodInfo)", "summary", "df-generated"]
       - ["System.Reflection", "MethodInfo", "op_Inequality", "(System.Reflection.MethodInfo,System.Reflection.MethodInfo)", "summary", "df-generated"]
       - ["System.Reflection", "MethodInvoker", "Create", "(System.Reflection.MethodBase)", "summary", "df-generated"]
-      - ["System.Reflection", "MethodInvoker", "Invoke", "(System.Object)", "summary", "df-generated"]
-      - ["System.Reflection", "MethodInvoker", "Invoke", "(System.Object,System.Object)", "summary", "df-generated"]
-      - ["System.Reflection", "MethodInvoker", "Invoke", "(System.Object,System.Object,System.Object)", "summary", "df-generated"]
-      - ["System.Reflection", "MethodInvoker", "Invoke", "(System.Object,System.Object,System.Object,System.Object)", "summary", "df-generated"]
-      - ["System.Reflection", "MethodInvoker", "Invoke", "(System.Object,System.Object,System.Object,System.Object,System.Object)", "summary", "df-generated"]
-      - ["System.Reflection", "MethodInvoker", "Invoke", "(System.Object,System.Span<System.Object>)", "summary", "df-generated"]
       - ["System.Reflection", "Module", "Equals", "(System.Object)", "summary", "df-generated"]
+      - ["System.Reflection", "Module", "GetCustomAttributes", "(System.Boolean)", "summary", "df-generated"]
       - ["System.Reflection", "Module", "GetCustomAttributes", "(System.Type,System.Boolean)", "summary", "df-generated"]
       - ["System.Reflection", "Module", "GetCustomAttributesData", "()", "summary", "df-generated"]
       - ["System.Reflection", "Module", "GetFields", "()", "summary", "df-generated"]
@@ -540,6 +570,7 @@ extensions:
       - ["System.Reflection", "NullabilityInfoContext", "Create", "(System.Reflection.PropertyInfo)", "summary", "df-generated"]
       - ["System.Reflection", "ObfuscateAssemblyAttribute", "ObfuscateAssemblyAttribute", "(System.Boolean)", "summary", "df-generated"]
       - ["System.Reflection", "ObfuscateAssemblyAttribute", "get_AssemblyIsPrivate", "()", "summary", "df-generated"]
+      - ["System.Reflection", "ParameterInfo", "GetCustomAttributes", "(System.Boolean)", "summary", "df-generated"]
       - ["System.Reflection", "ParameterInfo", "GetCustomAttributes", "(System.Type,System.Boolean)", "summary", "df-generated"]
       - ["System.Reflection", "ParameterInfo", "GetCustomAttributesData", "()", "summary", "df-generated"]
       - ["System.Reflection", "ParameterInfo", "GetOptionalCustomModifiers", "()", "summary", "df-generated"]
@@ -558,6 +589,7 @@ extensions:
       - ["System.Reflection", "ParameterModifier", "get_Item", "(System.Int32)", "summary", "df-generated"]
       - ["System.Reflection", "ParameterModifier", "set_Item", "(System.Int32,System.Boolean)", "summary", "df-generated"]
       - ["System.Reflection", "PathAssemblyResolver", "PathAssemblyResolver", "(System.Collections.Generic.IEnumerable<System.String>)", "summary", "df-generated"]
+      - ["System.Reflection", "PathAssemblyResolver", "Resolve", "(System.Reflection.MetadataLoadContext,System.Reflection.AssemblyName)", "summary", "df-generated"]
       - ["System.Reflection", "Pointer", "Equals", "(System.Object)", "summary", "df-generated"]
       - ["System.Reflection", "Pointer", "GetHashCode", "()", "summary", "df-generated"]
       - ["System.Reflection", "PropertyInfo", "Equals", "(System.Object)", "summary", "df-generated"]
@@ -565,8 +597,6 @@ extensions:
       - ["System.Reflection", "PropertyInfo", "GetOptionalCustomModifiers", "()", "summary", "df-generated"]
       - ["System.Reflection", "PropertyInfo", "GetRawConstantValue", "()", "summary", "df-generated"]
       - ["System.Reflection", "PropertyInfo", "GetRequiredCustomModifiers", "()", "summary", "df-generated"]
-      - ["System.Reflection", "PropertyInfo", "GetValue", "(System.Object)", "summary", "df-generated"]
-      - ["System.Reflection", "PropertyInfo", "GetValue", "(System.Object,System.Object[])", "summary", "df-generated"]
       - ["System.Reflection", "PropertyInfo", "GetValue", "(System.Object,System.Reflection.BindingFlags,System.Reflection.Binder,System.Object[],System.Globalization.CultureInfo)", "summary", "df-generated"]
       - ["System.Reflection", "PropertyInfo", "SetValue", "(System.Object,System.Object)", "summary", "df-generated"]
       - ["System.Reflection", "PropertyInfo", "SetValue", "(System.Object,System.Object,System.Object[])", "summary", "df-generated"]
@@ -578,6 +608,10 @@ extensions:
       - ["System.Reflection", "PropertyInfo", "get_MemberType", "()", "summary", "df-generated"]
       - ["System.Reflection", "PropertyInfo", "op_Equality", "(System.Reflection.PropertyInfo,System.Reflection.PropertyInfo)", "summary", "df-generated"]
       - ["System.Reflection", "PropertyInfo", "op_Inequality", "(System.Reflection.PropertyInfo,System.Reflection.PropertyInfo)", "summary", "df-generated"]
+      - ["System.Reflection", "PropertyInfoExtensions", "GetAccessors", "(System.Reflection.PropertyInfo)", "summary", "df-generated"]
+      - ["System.Reflection", "PropertyInfoExtensions", "GetGetMethod", "(System.Reflection.PropertyInfo)", "summary", "df-generated"]
+      - ["System.Reflection", "PropertyInfoExtensions", "GetSetMethod", "(System.Reflection.PropertyInfo)", "summary", "df-generated"]
+      - ["System.Reflection", "ReflectionContext", "GetTypeForObject", "(System.Object)", "summary", "df-generated"]
       - ["System.Reflection", "ReflectionTypeLoadException", "ReflectionTypeLoadException", "(System.Type[],System.Exception[])", "summary", "df-generated"]
       - ["System.Reflection", "ReflectionTypeLoadException", "ReflectionTypeLoadException", "(System.Type[],System.Exception[],System.String)", "summary", "df-generated"]
       - ["System.Reflection", "ReflectionTypeLoadException", "get_LoaderExceptions", "()", "summary", "df-generated"]
@@ -615,6 +649,7 @@ extensions:
       - ["System.Reflection", "TargetParameterCountException", "TargetParameterCountException", "(System.String,System.Exception)", "summary", "df-generated"]
       - ["System.Reflection", "TypeDelegator", "GetAttributeFlagsImpl", "()", "summary", "df-generated"]
       - ["System.Reflection", "TypeDelegator", "GetConstructors", "(System.Reflection.BindingFlags)", "summary", "df-generated"]
+      - ["System.Reflection", "TypeDelegator", "GetCustomAttributes", "(System.Boolean)", "summary", "df-generated"]
       - ["System.Reflection", "TypeDelegator", "GetCustomAttributes", "(System.Type,System.Boolean)", "summary", "df-generated"]
       - ["System.Reflection", "TypeDelegator", "GetEvents", "()", "summary", "df-generated"]
       - ["System.Reflection", "TypeDelegator", "GetEvents", "(System.Reflection.BindingFlags)", "summary", "df-generated"]
diff --git a/csharp/ql/lib/ext/generated/System.Resources.model.yml b/csharp/ql/lib/ext/generated/System.Resources.model.yml
index cf31fa759c8..e342044dafa 100644
--- a/csharp/ql/lib/ext/generated/System.Resources.model.yml
+++ b/csharp/ql/lib/ext/generated/System.Resources.model.yml
@@ -5,24 +5,23 @@ extensions:
       extensible: summaryModel
     data:
       - ["System.Resources", "IResourceReader", True, "GetEnumerator", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Resources", "MissingSatelliteAssemblyException", False, "MissingSatelliteAssemblyException", "(System.String,System.String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Resources", "MissingSatelliteAssemblyException", False, "get_CultureName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Resources", "ResourceManager", False, "CreateFileBasedResourceManager", "(System.String,System.String,System.Type)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Resources", "ResourceManager", False, "CreateFileBasedResourceManager", "(System.String,System.String,System.Type)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Resources", "MissingSatelliteAssemblyException", False, "MissingSatelliteAssemblyException", "(System.String,System.String)", "", "Argument[1]", "Argument[this].SyntheticField[System.Resources.MissingSatelliteAssemblyException._cultureName]", "value", "dfc-generated"]
+      - ["System.Resources", "MissingSatelliteAssemblyException", False, "get_CultureName", "()", "", "Argument[this].SyntheticField[System.Resources.MissingSatelliteAssemblyException._cultureName]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Resources", "ResourceManager", False, "CreateFileBasedResourceManager", "(System.String,System.String,System.Type)", "", "Argument[0]", "ReturnValue.Field[System.Resources.ResourceManager.BaseNameField]", "value", "dfc-generated"]
       - ["System.Resources", "ResourceManager", False, "GetStream", "(System.String,System.Globalization.CultureInfo)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Resources", "ResourceManager", False, "ResourceManager", "(System.String,System.Reflection.Assembly)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Resources", "ResourceManager", False, "ResourceManager", "(System.String,System.Reflection.Assembly)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Resources", "ResourceManager", False, "ResourceManager", "(System.String,System.Reflection.Assembly,System.Type)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Resources", "ResourceManager", False, "ResourceManager", "(System.String,System.Reflection.Assembly,System.Type)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["System.Resources", "ResourceManager", False, "ResourceManager", "(System.String,System.Reflection.Assembly)", "", "Argument[0]", "Argument[this].Field[System.Resources.ResourceManager.BaseNameField]", "value", "dfc-generated"]
+      - ["System.Resources", "ResourceManager", False, "ResourceManager", "(System.String,System.Reflection.Assembly)", "", "Argument[1]", "Argument[this].Field[System.Resources.ResourceManager.MainAssembly]", "value", "dfc-generated"]
+      - ["System.Resources", "ResourceManager", False, "ResourceManager", "(System.String,System.Reflection.Assembly,System.Type)", "", "Argument[0]", "Argument[this].Field[System.Resources.ResourceManager.BaseNameField]", "value", "dfc-generated"]
+      - ["System.Resources", "ResourceManager", False, "ResourceManager", "(System.String,System.Reflection.Assembly,System.Type)", "", "Argument[1]", "Argument[this].Field[System.Resources.ResourceManager.MainAssembly]", "value", "dfc-generated"]
       - ["System.Resources", "ResourceManager", True, "GetObject", "(System.String,System.Globalization.CultureInfo)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Resources", "ResourceManager", True, "GetResourceFileName", "(System.Globalization.CultureInfo)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Resources", "ResourceManager", True, "GetResourceFileName", "(System.Globalization.CultureInfo)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Resources", "ResourceManager", True, "GetResourceFileName", "(System.Globalization.CultureInfo)", "", "Argument[0].Property[System.Globalization.CultureInfo.Name]", "ReturnValue", "taint", "dfc-generated"]
+      - ["System.Resources", "ResourceManager", True, "GetResourceFileName", "(System.Globalization.CultureInfo)", "", "Argument[this].Field[System.Resources.ResourceManager.BaseNameField]", "ReturnValue", "taint", "dfc-generated"]
       - ["System.Resources", "ResourceManager", True, "GetString", "(System.String,System.Globalization.CultureInfo)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Resources", "ResourceManager", True, "get_BaseName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Resources", "ResourceManager", True, "get_BaseName", "()", "", "Argument[this].Field[System.Resources.ResourceManager.BaseNameField]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Resources", "ResourceReader", False, "GetResourceData", "(System.String,System.String,System.Byte[])", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Resources", "ResourceReader", False, "ResourceReader", "(System.IO.Stream)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Resources", "ResourceSet", False, "ResourceSet", "(System.IO.Stream)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Resources", "ResourceSet", False, "ResourceSet", "(System.Resources.IResourceReader)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
+      - ["System.Resources", "ResourceSet", False, "ResourceSet", "(System.Resources.IResourceReader)", "", "Argument[0]", "Argument[this].Field[System.Resources.ResourceSet.Reader]", "value", "dfc-generated"]
       - ["System.Resources", "ResourceSet", True, "GetEnumerator", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Resources", "ResourceSet", True, "GetObject", "(System.String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Resources", "ResourceSet", True, "GetObject", "(System.String,System.Boolean)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
diff --git a/csharp/ql/lib/ext/generated/System.Runtime.Caching.Hosting.model.yml b/csharp/ql/lib/ext/generated/System.Runtime.Caching.Hosting.model.yml
index 796a827b4bf..a04370bc211 100644
--- a/csharp/ql/lib/ext/generated/System.Runtime.Caching.Hosting.model.yml
+++ b/csharp/ql/lib/ext/generated/System.Runtime.Caching.Hosting.model.yml
@@ -5,6 +5,7 @@ extensions:
       extensible: neutralModel
     data:
       - ["System.Runtime.Caching.Hosting", "IApplicationIdentifier", "GetApplicationId", "()", "summary", "df-generated"]
+      - ["System.Runtime.Caching.Hosting", "IFileChangeNotificationSystem", "StartMonitoring", "(System.String,System.Runtime.Caching.OnChangedCallback,System.Object,System.DateTimeOffset,System.Int64)", "summary", "df-generated"]
       - ["System.Runtime.Caching.Hosting", "IFileChangeNotificationSystem", "StopMonitoring", "(System.String,System.Object)", "summary", "df-generated"]
       - ["System.Runtime.Caching.Hosting", "IMemoryCacheManager", "ReleaseCache", "(System.Runtime.Caching.MemoryCache)", "summary", "df-generated"]
       - ["System.Runtime.Caching.Hosting", "IMemoryCacheManager", "UpdateCacheSize", "(System.Int64,System.Runtime.Caching.MemoryCache)", "summary", "df-generated"]
diff --git a/csharp/ql/lib/ext/generated/System.Runtime.Caching.model.yml b/csharp/ql/lib/ext/generated/System.Runtime.Caching.model.yml
index 929cb1d4320..9173e86d1be 100644
--- a/csharp/ql/lib/ext/generated/System.Runtime.Caching.model.yml
+++ b/csharp/ql/lib/ext/generated/System.Runtime.Caching.model.yml
@@ -4,35 +4,34 @@ extensions:
       pack: codeql/csharp-all
       extensible: summaryModel
     data:
-      - ["System.Runtime.Caching", "CacheEntryChangeMonitor", True, "get_CacheKeys", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Runtime.Caching", "CacheEntryChangeMonitor", True, "get_LastModified", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Runtime.Caching", "CacheEntryChangeMonitor", True, "get_RegionName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Runtime.Caching", "CacheEntryRemovedArguments", False, "CacheEntryRemovedArguments", "(System.Runtime.Caching.ObjectCache,System.Runtime.Caching.CacheEntryRemovedReason,System.Runtime.Caching.CacheItem)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["System.Runtime.Caching", "CacheEntryRemovedArguments", False, "CacheEntryRemovedArguments", "(System.Runtime.Caching.ObjectCache,System.Runtime.Caching.CacheEntryRemovedReason,System.Runtime.Caching.CacheItem)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Runtime.Caching", "CacheEntryRemovedArguments", False, "get_CacheItem", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Runtime.Caching", "CacheEntryRemovedArguments", False, "get_Source", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Runtime.Caching", "CacheEntryUpdateArguments", False, "CacheEntryUpdateArguments", "(System.Runtime.Caching.ObjectCache,System.Runtime.Caching.CacheEntryRemovedReason,System.String,System.String)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["System.Runtime.Caching", "CacheEntryUpdateArguments", False, "CacheEntryUpdateArguments", "(System.Runtime.Caching.ObjectCache,System.Runtime.Caching.CacheEntryRemovedReason,System.String,System.String)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Runtime.Caching", "CacheEntryUpdateArguments", False, "CacheEntryUpdateArguments", "(System.Runtime.Caching.ObjectCache,System.Runtime.Caching.CacheEntryRemovedReason,System.String,System.String)", "", "Argument[3]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Runtime.Caching", "CacheEntryUpdateArguments", False, "get_Key", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Runtime.Caching", "CacheEntryUpdateArguments", False, "get_RegionName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Runtime.Caching", "CacheEntryUpdateArguments", False, "get_Source", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Runtime.Caching", "CacheEntryRemovedArguments", False, "CacheEntryRemovedArguments", "(System.Runtime.Caching.ObjectCache,System.Runtime.Caching.CacheEntryRemovedReason,System.Runtime.Caching.CacheItem)", "", "Argument[0]", "Argument[this].SyntheticField[System.Runtime.Caching.CacheEntryRemovedArguments._source]", "value", "dfc-generated"]
+      - ["System.Runtime.Caching", "CacheEntryRemovedArguments", False, "CacheEntryRemovedArguments", "(System.Runtime.Caching.ObjectCache,System.Runtime.Caching.CacheEntryRemovedReason,System.Runtime.Caching.CacheItem)", "", "Argument[2]", "Argument[this].SyntheticField[System.Runtime.Caching.CacheEntryRemovedArguments._cacheItem]", "value", "dfc-generated"]
+      - ["System.Runtime.Caching", "CacheEntryRemovedArguments", False, "get_CacheItem", "()", "", "Argument[this].SyntheticField[System.Runtime.Caching.CacheEntryRemovedArguments._cacheItem]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Runtime.Caching", "CacheEntryRemovedArguments", False, "get_Source", "()", "", "Argument[this].SyntheticField[System.Runtime.Caching.CacheEntryRemovedArguments._source]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Runtime.Caching", "CacheEntryUpdateArguments", False, "CacheEntryUpdateArguments", "(System.Runtime.Caching.ObjectCache,System.Runtime.Caching.CacheEntryRemovedReason,System.String,System.String)", "", "Argument[0]", "Argument[this].SyntheticField[System.Runtime.Caching.CacheEntryUpdateArguments._source]", "value", "dfc-generated"]
+      - ["System.Runtime.Caching", "CacheEntryUpdateArguments", False, "CacheEntryUpdateArguments", "(System.Runtime.Caching.ObjectCache,System.Runtime.Caching.CacheEntryRemovedReason,System.String,System.String)", "", "Argument[2]", "Argument[this].SyntheticField[System.Runtime.Caching.CacheEntryUpdateArguments._key]", "value", "dfc-generated"]
+      - ["System.Runtime.Caching", "CacheEntryUpdateArguments", False, "CacheEntryUpdateArguments", "(System.Runtime.Caching.ObjectCache,System.Runtime.Caching.CacheEntryRemovedReason,System.String,System.String)", "", "Argument[3]", "Argument[this].SyntheticField[System.Runtime.Caching.CacheEntryUpdateArguments._regionName]", "value", "dfc-generated"]
+      - ["System.Runtime.Caching", "CacheEntryUpdateArguments", False, "get_Key", "()", "", "Argument[this].SyntheticField[System.Runtime.Caching.CacheEntryUpdateArguments._key]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Runtime.Caching", "CacheEntryUpdateArguments", False, "get_RegionName", "()", "", "Argument[this].SyntheticField[System.Runtime.Caching.CacheEntryUpdateArguments._regionName]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Runtime.Caching", "CacheEntryUpdateArguments", False, "get_Source", "()", "", "Argument[this].SyntheticField[System.Runtime.Caching.CacheEntryUpdateArguments._source]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Runtime.Caching", "ChangeMonitor", True, "get_UniqueId", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Runtime.Caching", "FileChangeMonitor", True, "get_FilePaths", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Runtime.Caching", "FileChangeMonitor", True, "get_LastModified", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Runtime.Caching", "HostFileChangeMonitor", False, "HostFileChangeMonitor", "(System.Collections.Generic.IList<System.String>)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["System.Runtime.Caching", "MemoryCache", False, "MemoryCache", "(System.String,System.Collections.Specialized.NameValueCollection)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Runtime.Caching", "MemoryCache", False, "MemoryCache", "(System.String,System.Collections.Specialized.NameValueCollection,System.Boolean)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["System.Runtime.Caching", "HostFileChangeMonitor", False, "HostFileChangeMonitor", "(System.Collections.Generic.IList<System.String>)", "", "Argument[0].Element", "Argument[this].SyntheticField[System.Runtime.Caching.HostFileChangeMonitor._filePaths].Element", "value", "dfc-generated"]
+      - ["System.Runtime.Caching", "HostFileChangeMonitor", False, "get_FilePaths", "()", "", "Argument[this].SyntheticField[System.Runtime.Caching.HostFileChangeMonitor._filePaths]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Runtime.Caching", "MemoryCache", False, "MemoryCache", "(System.String,System.Collections.Specialized.NameValueCollection)", "", "Argument[0]", "Argument[this].SyntheticField[System.Runtime.Caching.MemoryCache._name]", "value", "dfc-generated"]
+      - ["System.Runtime.Caching", "MemoryCache", False, "MemoryCache", "(System.String,System.Collections.Specialized.NameValueCollection,System.Boolean)", "", "Argument[0]", "Argument[this].SyntheticField[System.Runtime.Caching.MemoryCache._name]", "value", "dfc-generated"]
       - ["System.Runtime.Caching", "MemoryCache", False, "get_PollingInterval", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Runtime.Caching", "ObjectCache", True, "CreateCacheEntryChangeMonitor", "(System.Collections.Generic.IEnumerable<System.String>,System.String)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["System.Runtime.Caching", "ObjectCache", True, "CreateCacheEntryChangeMonitor", "(System.Collections.Generic.IEnumerable<System.String>,System.String)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Runtime.Caching", "ObjectCache", True, "GetValues", "(System.Collections.Generic.IEnumerable<System.String>,System.String)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["System.Runtime.Caching", "ObjectCache", True, "GetValues", "(System.String,System.String[])", "", "Argument[1].Element", "ReturnValue", "taint", "df-generated"]
-      - ["System.Runtime.Caching", "ObjectCache", True, "get_Name", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Runtime.Caching", "MemoryCache", True, "CreateCacheEntryChangeMonitor", "(System.Collections.Generic.IEnumerable<System.String>,System.String)", "", "Argument[1]", "ReturnValue.SyntheticField[System.Runtime.Caching.MemoryCacheEntryChangeMonitor._regionName]", "value", "dfc-generated"]
+      - ["System.Runtime.Caching", "MemoryCache", True, "GetValues", "(System.Collections.Generic.IEnumerable<System.String>,System.String)", "", "Argument[0].Element", "ReturnValue.Element.Property[System.Collections.Generic.KeyValuePair`2.Key]", "value", "dfc-generated"]
+      - ["System.Runtime.Caching", "MemoryCache", True, "get_Name", "()", "", "Argument[this].SyntheticField[System.Runtime.Caching.MemoryCache._name]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Runtime.Caching", "ObjectCache", True, "GetValues", "(System.String,System.String[])", "", "Argument[1].Element", "ReturnValue.Element.Property[System.Collections.Generic.KeyValuePair`2.Key]", "value", "dfc-generated"]
   - addsTo:
       pack: codeql/csharp-all
       extensible: neutralModel
     data:
+      - ["System.Runtime.Caching", "CacheEntryChangeMonitor", "get_CacheKeys", "()", "summary", "df-generated"]
       - ["System.Runtime.Caching", "CacheEntryRemovedArguments", "get_RemovedReason", "()", "summary", "df-generated"]
       - ["System.Runtime.Caching", "CacheEntryUpdateArguments", "get_RemovedReason", "()", "summary", "df-generated"]
       - ["System.Runtime.Caching", "CacheItem", "CacheItem", "(System.String)", "summary", "df-generated"]
@@ -42,9 +41,11 @@ extensions:
       - ["System.Runtime.Caching", "ChangeMonitor", "Dispose", "()", "summary", "df-generated"]
       - ["System.Runtime.Caching", "ChangeMonitor", "Dispose", "(System.Boolean)", "summary", "df-generated"]
       - ["System.Runtime.Caching", "ChangeMonitor", "InitializationComplete", "()", "summary", "df-generated"]
+      - ["System.Runtime.Caching", "ChangeMonitor", "NotifyOnChanged", "(System.Runtime.Caching.OnChangedCallback)", "summary", "df-generated"]
       - ["System.Runtime.Caching", "ChangeMonitor", "OnChanged", "(System.Object)", "summary", "df-generated"]
       - ["System.Runtime.Caching", "ChangeMonitor", "get_HasChanged", "()", "summary", "df-generated"]
       - ["System.Runtime.Caching", "ChangeMonitor", "get_IsDisposed", "()", "summary", "df-generated"]
+      - ["System.Runtime.Caching", "FileChangeMonitor", "get_FilePaths", "()", "summary", "df-generated"]
       - ["System.Runtime.Caching", "HostFileChangeMonitor", "Dispose", "(System.Boolean)", "summary", "df-generated"]
       - ["System.Runtime.Caching", "MemoryCache", "Add", "(System.Runtime.Caching.CacheItem,System.Runtime.Caching.CacheItemPolicy)", "summary", "df-generated"]
       - ["System.Runtime.Caching", "MemoryCache", "AddOrGetExisting", "(System.Runtime.Caching.CacheItem,System.Runtime.Caching.CacheItemPolicy)", "summary", "df-generated"]
@@ -76,14 +77,17 @@ extensions:
       - ["System.Runtime.Caching", "ObjectCache", "AddOrGetExisting", "(System.String,System.Object,System.DateTimeOffset,System.String)", "summary", "df-generated"]
       - ["System.Runtime.Caching", "ObjectCache", "AddOrGetExisting", "(System.String,System.Object,System.Runtime.Caching.CacheItemPolicy,System.String)", "summary", "df-generated"]
       - ["System.Runtime.Caching", "ObjectCache", "Contains", "(System.String,System.String)", "summary", "df-generated"]
+      - ["System.Runtime.Caching", "ObjectCache", "CreateCacheEntryChangeMonitor", "(System.Collections.Generic.IEnumerable<System.String>,System.String)", "summary", "df-generated"]
       - ["System.Runtime.Caching", "ObjectCache", "Get", "(System.String,System.String)", "summary", "df-generated"]
       - ["System.Runtime.Caching", "ObjectCache", "GetCacheItem", "(System.String,System.String)", "summary", "df-generated"]
       - ["System.Runtime.Caching", "ObjectCache", "GetCount", "(System.String)", "summary", "df-generated"]
       - ["System.Runtime.Caching", "ObjectCache", "GetEnumerator", "()", "summary", "df-generated"]
+      - ["System.Runtime.Caching", "ObjectCache", "GetValues", "(System.Collections.Generic.IEnumerable<System.String>,System.String)", "summary", "df-generated"]
       - ["System.Runtime.Caching", "ObjectCache", "Remove", "(System.String,System.String)", "summary", "df-generated"]
       - ["System.Runtime.Caching", "ObjectCache", "Set", "(System.Runtime.Caching.CacheItem,System.Runtime.Caching.CacheItemPolicy)", "summary", "df-generated"]
       - ["System.Runtime.Caching", "ObjectCache", "Set", "(System.String,System.Object,System.DateTimeOffset,System.String)", "summary", "df-generated"]
       - ["System.Runtime.Caching", "ObjectCache", "Set", "(System.String,System.Object,System.Runtime.Caching.CacheItemPolicy,System.String)", "summary", "df-generated"]
       - ["System.Runtime.Caching", "ObjectCache", "get_DefaultCacheCapabilities", "()", "summary", "df-generated"]
       - ["System.Runtime.Caching", "ObjectCache", "get_Item", "(System.String)", "summary", "df-generated"]
+      - ["System.Runtime.Caching", "ObjectCache", "get_Name", "()", "summary", "df-generated"]
       - ["System.Runtime.Caching", "ObjectCache", "set_Item", "(System.String,System.Object)", "summary", "df-generated"]
diff --git a/csharp/ql/lib/ext/generated/System.Runtime.CompilerServices.model.yml b/csharp/ql/lib/ext/generated/System.Runtime.CompilerServices.model.yml
index fe27887c1e3..80f68fcf6e0 100644
--- a/csharp/ql/lib/ext/generated/System.Runtime.CompilerServices.model.yml
+++ b/csharp/ql/lib/ext/generated/System.Runtime.CompilerServices.model.yml
@@ -4,28 +4,49 @@ extensions:
       pack: codeql/csharp-all
       extensible: summaryModel
     data:
-      - ["System.Runtime.CompilerServices", "AsyncIteratorMethodBuilder", False, "AwaitOnCompleted<TAwaiter,TStateMachine>", "(TAwaiter,TStateMachine)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Runtime.CompilerServices", "AsyncIteratorMethodBuilder", False, "AwaitUnsafeOnCompleted<TAwaiter,TStateMachine>", "(TAwaiter,TStateMachine)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Runtime.CompilerServices", "AsyncTaskMethodBuilder", False, "AwaitOnCompleted<TAwaiter,TStateMachine>", "(TAwaiter,TStateMachine)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Runtime.CompilerServices", "AsyncTaskMethodBuilder", False, "AwaitUnsafeOnCompleted<TAwaiter,TStateMachine>", "(TAwaiter,TStateMachine)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["System.Runtime.CompilerServices", "AsyncIteratorMethodBuilder", False, "AwaitOnCompleted<TAwaiter,TStateMachine>", "(TAwaiter,TStateMachine)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Runtime.CompilerServices", "AsyncIteratorMethodBuilder", False, "AwaitOnCompleted<TAwaiter,TStateMachine>", "(TAwaiter,TStateMachine)", "", "Argument[1]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Runtime.CompilerServices", "AsyncIteratorMethodBuilder", False, "AwaitUnsafeOnCompleted<TAwaiter,TStateMachine>", "(TAwaiter,TStateMachine)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Runtime.CompilerServices", "AsyncIteratorMethodBuilder", False, "AwaitUnsafeOnCompleted<TAwaiter,TStateMachine>", "(TAwaiter,TStateMachine)", "", "Argument[1]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Runtime.CompilerServices", "AsyncIteratorMethodBuilder", False, "MoveNext<TStateMachine>", "(TStateMachine)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Runtime.CompilerServices", "AsyncTaskMethodBuilder", False, "AwaitOnCompleted<TAwaiter,TStateMachine>", "(TAwaiter,TStateMachine)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Runtime.CompilerServices", "AsyncTaskMethodBuilder", False, "AwaitOnCompleted<TAwaiter,TStateMachine>", "(TAwaiter,TStateMachine)", "", "Argument[1]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Runtime.CompilerServices", "AsyncTaskMethodBuilder", False, "AwaitUnsafeOnCompleted<TAwaiter,TStateMachine>", "(TAwaiter,TStateMachine)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Runtime.CompilerServices", "AsyncTaskMethodBuilder", False, "AwaitUnsafeOnCompleted<TAwaiter,TStateMachine>", "(TAwaiter,TStateMachine)", "", "Argument[1]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Runtime.CompilerServices", "AsyncTaskMethodBuilder", False, "Start<TStateMachine>", "(TStateMachine)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Runtime.CompilerServices", "AsyncTaskMethodBuilder", False, "get_Task", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Runtime.CompilerServices", "AsyncTaskMethodBuilder<TResult>", False, "AwaitOnCompleted<TAwaiter,TStateMachine>", "(TAwaiter,TStateMachine)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Runtime.CompilerServices", "AsyncTaskMethodBuilder<TResult>", False, "AwaitUnsafeOnCompleted<TAwaiter,TStateMachine>", "(TAwaiter,TStateMachine)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Runtime.CompilerServices", "AsyncTaskMethodBuilder<TResult>", False, "SetResult", "(TResult)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Runtime.CompilerServices", "AsyncTaskMethodBuilder<TResult>", False, "get_Task", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Runtime.CompilerServices", "AsyncValueTaskMethodBuilder", False, "AwaitOnCompleted<TAwaiter,TStateMachine>", "(TAwaiter,TStateMachine)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Runtime.CompilerServices", "AsyncValueTaskMethodBuilder", False, "AwaitUnsafeOnCompleted<TAwaiter,TStateMachine>", "(TAwaiter,TStateMachine)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Runtime.CompilerServices", "AsyncValueTaskMethodBuilder<TResult>", False, "AwaitOnCompleted<TAwaiter,TStateMachine>", "(TAwaiter,TStateMachine)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Runtime.CompilerServices", "AsyncValueTaskMethodBuilder<TResult>", False, "AwaitUnsafeOnCompleted<TAwaiter,TStateMachine>", "(TAwaiter,TStateMachine)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["System.Runtime.CompilerServices", "AsyncTaskMethodBuilder<TResult>", False, "AwaitOnCompleted<TAwaiter,TStateMachine>", "(TAwaiter,TStateMachine)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Runtime.CompilerServices", "AsyncTaskMethodBuilder<TResult>", False, "AwaitOnCompleted<TAwaiter,TStateMachine>", "(TAwaiter,TStateMachine)", "", "Argument[1]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Runtime.CompilerServices", "AsyncTaskMethodBuilder<TResult>", False, "AwaitUnsafeOnCompleted<TAwaiter,TStateMachine>", "(TAwaiter,TStateMachine)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Runtime.CompilerServices", "AsyncTaskMethodBuilder<TResult>", False, "AwaitUnsafeOnCompleted<TAwaiter,TStateMachine>", "(TAwaiter,TStateMachine)", "", "Argument[1]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Runtime.CompilerServices", "AsyncTaskMethodBuilder<TResult>", False, "SetResult", "(TResult)", "", "Argument[0]", "Argument[this].SyntheticField[System.Runtime.CompilerServices.AsyncTaskMethodBuilder`1.m_task].Property[System.Threading.Tasks.Task`1.Result]", "value", "dfc-generated"]
+      - ["System.Runtime.CompilerServices", "AsyncTaskMethodBuilder<TResult>", False, "Start<TStateMachine>", "(TStateMachine)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Runtime.CompilerServices", "AsyncTaskMethodBuilder<TResult>", False, "get_Task", "()", "", "Argument[this].SyntheticField[System.Runtime.CompilerServices.AsyncTaskMethodBuilder`1.m_task]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Runtime.CompilerServices", "AsyncValueTaskMethodBuilder", False, "AwaitOnCompleted<TAwaiter,TStateMachine>", "(TAwaiter,TStateMachine)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Runtime.CompilerServices", "AsyncValueTaskMethodBuilder", False, "AwaitOnCompleted<TAwaiter,TStateMachine>", "(TAwaiter,TStateMachine)", "", "Argument[1]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Runtime.CompilerServices", "AsyncValueTaskMethodBuilder", False, "AwaitUnsafeOnCompleted<TAwaiter,TStateMachine>", "(TAwaiter,TStateMachine)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Runtime.CompilerServices", "AsyncValueTaskMethodBuilder", False, "AwaitUnsafeOnCompleted<TAwaiter,TStateMachine>", "(TAwaiter,TStateMachine)", "", "Argument[1]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Runtime.CompilerServices", "AsyncValueTaskMethodBuilder", False, "Start<TStateMachine>", "(TStateMachine)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Runtime.CompilerServices", "AsyncValueTaskMethodBuilder<TResult>", False, "AwaitOnCompleted<TAwaiter,TStateMachine>", "(TAwaiter,TStateMachine)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Runtime.CompilerServices", "AsyncValueTaskMethodBuilder<TResult>", False, "AwaitOnCompleted<TAwaiter,TStateMachine>", "(TAwaiter,TStateMachine)", "", "Argument[1]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Runtime.CompilerServices", "AsyncValueTaskMethodBuilder<TResult>", False, "AwaitUnsafeOnCompleted<TAwaiter,TStateMachine>", "(TAwaiter,TStateMachine)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Runtime.CompilerServices", "AsyncValueTaskMethodBuilder<TResult>", False, "AwaitUnsafeOnCompleted<TAwaiter,TStateMachine>", "(TAwaiter,TStateMachine)", "", "Argument[1]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Runtime.CompilerServices", "AsyncValueTaskMethodBuilder<TResult>", False, "SetResult", "(TResult)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["System.Runtime.CompilerServices", "AsyncValueTaskMethodBuilder<TResult>", False, "Start<TStateMachine>", "(TStateMachine)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Runtime.CompilerServices", "AsyncValueTaskMethodBuilder<TResult>", False, "get_Task", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Runtime.CompilerServices", "AsyncVoidMethodBuilder", False, "AwaitOnCompleted<TAwaiter,TStateMachine>", "(TAwaiter,TStateMachine)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Runtime.CompilerServices", "AsyncVoidMethodBuilder", False, "AwaitOnCompleted<TAwaiter,TStateMachine>", "(TAwaiter,TStateMachine)", "", "Argument[1]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Runtime.CompilerServices", "AsyncVoidMethodBuilder", False, "AwaitUnsafeOnCompleted<TAwaiter,TStateMachine>", "(TAwaiter,TStateMachine)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Runtime.CompilerServices", "AsyncVoidMethodBuilder", False, "AwaitUnsafeOnCompleted<TAwaiter,TStateMachine>", "(TAwaiter,TStateMachine)", "", "Argument[1]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Runtime.CompilerServices", "AsyncVoidMethodBuilder", False, "Start<TStateMachine>", "(TStateMachine)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Runtime.CompilerServices", "CallSite", False, "get_Binder", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Runtime.CompilerServices", "CallSiteOps", False, "AddRule<T>", "(System.Runtime.CompilerServices.CallSite<T>,T)", "", "Argument[1]", "Argument[0]", "taint", "df-generated"]
       - ["System.Runtime.CompilerServices", "CallSiteOps", False, "GetCachedRules<T>", "(System.Runtime.CompilerServices.RuleCache<T>)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["System.Runtime.CompilerServices", "CallSiteOps", False, "GetRules<T>", "(System.Runtime.CompilerServices.CallSite<T>)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Runtime.CompilerServices", "Closure", False, "Closure", "(System.Object[],System.Object[])", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["System.Runtime.CompilerServices", "Closure", False, "Closure", "(System.Object[],System.Object[])", "", "Argument[1].Element", "Argument[this]", "taint", "df-generated"]
-      - ["System.Runtime.CompilerServices", "ConditionalWeakTable<TKey,TValue>", False, "GetOrCreateValue", "(TKey)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Runtime.CompilerServices", "Closure", False, "Closure", "(System.Object[],System.Object[])", "", "Argument[0]", "Argument[this].Field[System.Runtime.CompilerServices.Closure.Constants]", "value", "dfc-generated"]
+      - ["System.Runtime.CompilerServices", "Closure", False, "Closure", "(System.Object[],System.Object[])", "", "Argument[1]", "Argument[this].Field[System.Runtime.CompilerServices.Closure.Locals]", "value", "dfc-generated"]
+      - ["System.Runtime.CompilerServices", "ConditionalWeakTable<TKey,TValue>", False, "GetValue", "(TKey,System.Runtime.CompilerServices.ConditionalWeakTable<TKey,TValue>+CreateValueCallback)", "", "Argument[0]", "Argument[1].Parameter[0]", "value", "dfc-generated"]
+      - ["System.Runtime.CompilerServices", "ConditionalWeakTable<TKey,TValue>", False, "GetValue", "(TKey,System.Runtime.CompilerServices.ConditionalWeakTable<TKey,TValue>+CreateValueCallback)", "", "Argument[1].ReturnValue", "ReturnValue", "value", "dfc-generated"]
       - ["System.Runtime.CompilerServices", "ConfiguredCancelableAsyncEnumerable<T>+Enumerator", False, "get_Current", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Runtime.CompilerServices", "ConfiguredCancelableAsyncEnumerable<T>", False, "ConfigureAwait", "(System.Boolean)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Runtime.CompilerServices", "ConfiguredCancelableAsyncEnumerable<T>", False, "GetAsyncEnumerator", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
@@ -35,35 +56,54 @@ extensions:
       - ["System.Runtime.CompilerServices", "ConfiguredValueTaskAwaitable", False, "GetAwaiter", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Runtime.CompilerServices", "ConfiguredValueTaskAwaitable<TResult>+ConfiguredValueTaskAwaiter", False, "GetResult", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Runtime.CompilerServices", "ConfiguredValueTaskAwaitable<TResult>", False, "GetAwaiter", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Runtime.CompilerServices", "ContractHelper", False, "RaiseContractFailedEvent", "(System.Diagnostics.Contracts.ContractFailureKind,System.String,System.String,System.Exception)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Runtime.CompilerServices", "ContractHelper", False, "RaiseContractFailedEvent", "(System.Diagnostics.Contracts.ContractFailureKind,System.String,System.String,System.Exception)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Runtime.CompilerServices", "ContractHelper", False, "RaiseContractFailedEvent", "(System.Diagnostics.Contracts.ContractFailureKind,System.String,System.String,System.Exception)", "", "Argument[1]", "ReturnValue", "taint", "dfc-generated"]
+      - ["System.Runtime.CompilerServices", "ContractHelper", False, "RaiseContractFailedEvent", "(System.Diagnostics.Contracts.ContractFailureKind,System.String,System.String,System.Exception)", "", "Argument[2]", "ReturnValue", "taint", "dfc-generated"]
       - ["System.Runtime.CompilerServices", "DefaultInterpolatedStringHandler", False, "DefaultInterpolatedStringHandler", "(System.Int32,System.Int32,System.IFormatProvider)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
       - ["System.Runtime.CompilerServices", "DefaultInterpolatedStringHandler", False, "DefaultInterpolatedStringHandler", "(System.Int32,System.Int32,System.IFormatProvider,System.Span<System.Char>)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
       - ["System.Runtime.CompilerServices", "DefaultInterpolatedStringHandler", False, "DefaultInterpolatedStringHandler", "(System.Int32,System.Int32,System.IFormatProvider,System.Span<System.Char>)", "", "Argument[3]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Runtime.CompilerServices", "FormattableStringFactory", False, "Create", "(System.String,System.Object[])", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Runtime.CompilerServices", "FormattableStringFactory", False, "Create", "(System.String,System.Object[])", "", "Argument[1].Element", "ReturnValue", "taint", "df-generated"]
+      - ["System.Runtime.CompilerServices", "FormattableStringFactory", False, "Create", "(System.String,System.Object[])", "", "Argument[0]", "ReturnValue.SyntheticField[System.Runtime.CompilerServices.FormattableStringFactory+ConcreteFormattableString._format]", "value", "dfc-generated"]
+      - ["System.Runtime.CompilerServices", "FormattableStringFactory", False, "Create", "(System.String,System.Object[])", "", "Argument[1]", "ReturnValue.SyntheticField[System.Runtime.CompilerServices.FormattableStringFactory+ConcreteFormattableString._arguments]", "value", "dfc-generated"]
       - ["System.Runtime.CompilerServices", "IRuntimeVariables", True, "get_Item", "(System.Int32)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Runtime.CompilerServices", "ITuple", True, "get_Item", "(System.Int32)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Runtime.CompilerServices", "NullableAttribute", False, "NullableAttribute", "(System.Byte[])", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["System.Runtime.CompilerServices", "PoolingAsyncValueTaskMethodBuilder", False, "AwaitOnCompleted<TAwaiter,TStateMachine>", "(TAwaiter,TStateMachine)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Runtime.CompilerServices", "PoolingAsyncValueTaskMethodBuilder", False, "AwaitUnsafeOnCompleted<TAwaiter,TStateMachine>", "(TAwaiter,TStateMachine)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Runtime.CompilerServices", "PoolingAsyncValueTaskMethodBuilder<TResult>", False, "AwaitOnCompleted<TAwaiter,TStateMachine>", "(TAwaiter,TStateMachine)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Runtime.CompilerServices", "PoolingAsyncValueTaskMethodBuilder<TResult>", False, "AwaitUnsafeOnCompleted<TAwaiter,TStateMachine>", "(TAwaiter,TStateMachine)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["System.Runtime.CompilerServices", "NullableAttribute", False, "NullableAttribute", "(System.Byte[])", "", "Argument[0]", "Argument[this].Field[System.Runtime.CompilerServices.NullableAttribute.NullableFlags]", "value", "dfc-generated"]
+      - ["System.Runtime.CompilerServices", "PoolingAsyncValueTaskMethodBuilder", False, "AwaitOnCompleted<TAwaiter,TStateMachine>", "(TAwaiter,TStateMachine)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Runtime.CompilerServices", "PoolingAsyncValueTaskMethodBuilder", False, "AwaitOnCompleted<TAwaiter,TStateMachine>", "(TAwaiter,TStateMachine)", "", "Argument[1]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Runtime.CompilerServices", "PoolingAsyncValueTaskMethodBuilder", False, "AwaitUnsafeOnCompleted<TAwaiter,TStateMachine>", "(TAwaiter,TStateMachine)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Runtime.CompilerServices", "PoolingAsyncValueTaskMethodBuilder", False, "AwaitUnsafeOnCompleted<TAwaiter,TStateMachine>", "(TAwaiter,TStateMachine)", "", "Argument[1]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Runtime.CompilerServices", "PoolingAsyncValueTaskMethodBuilder", False, "Start<TStateMachine>", "(TStateMachine)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Runtime.CompilerServices", "PoolingAsyncValueTaskMethodBuilder<TResult>", False, "AwaitOnCompleted<TAwaiter,TStateMachine>", "(TAwaiter,TStateMachine)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Runtime.CompilerServices", "PoolingAsyncValueTaskMethodBuilder<TResult>", False, "AwaitOnCompleted<TAwaiter,TStateMachine>", "(TAwaiter,TStateMachine)", "", "Argument[1]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Runtime.CompilerServices", "PoolingAsyncValueTaskMethodBuilder<TResult>", False, "AwaitUnsafeOnCompleted<TAwaiter,TStateMachine>", "(TAwaiter,TStateMachine)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Runtime.CompilerServices", "PoolingAsyncValueTaskMethodBuilder<TResult>", False, "AwaitUnsafeOnCompleted<TAwaiter,TStateMachine>", "(TAwaiter,TStateMachine)", "", "Argument[1]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Runtime.CompilerServices", "PoolingAsyncValueTaskMethodBuilder<TResult>", False, "SetResult", "(TResult)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["System.Runtime.CompilerServices", "PoolingAsyncValueTaskMethodBuilder<TResult>", False, "Start<TStateMachine>", "(TStateMachine)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Runtime.CompilerServices", "PoolingAsyncValueTaskMethodBuilder<TResult>", False, "get_Task", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Runtime.CompilerServices", "ReadOnlyCollectionBuilder<T>", False, "ReadOnlyCollectionBuilder", "(System.Collections.Generic.IEnumerable<T>)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
+      - ["System.Runtime.CompilerServices", "RuntimeHelpers", False, "ExecuteCodeWithGuaranteedCleanup", "(System.Runtime.CompilerServices.RuntimeHelpers+TryCode,System.Runtime.CompilerServices.RuntimeHelpers+CleanupCode,System.Object)", "", "Argument[2]", "Argument[0].Parameter[0]", "value", "dfc-generated"]
+      - ["System.Runtime.CompilerServices", "RuntimeHelpers", False, "ExecuteCodeWithGuaranteedCleanup", "(System.Runtime.CompilerServices.RuntimeHelpers+TryCode,System.Runtime.CompilerServices.RuntimeHelpers+CleanupCode,System.Object)", "", "Argument[2]", "Argument[1].Parameter[0]", "value", "dfc-generated"]
       - ["System.Runtime.CompilerServices", "RuntimeOps", False, "CreateRuntimeVariables", "(System.Object[],System.Int64[])", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
       - ["System.Runtime.CompilerServices", "RuntimeOps", False, "ExpandoPromoteClass", "(System.Dynamic.ExpandoObject,System.Object,System.Object)", "", "Argument[2]", "Argument[0].Element", "taint", "df-generated"]
       - ["System.Runtime.CompilerServices", "RuntimeOps", False, "ExpandoTryGetValue", "(System.Dynamic.ExpandoObject,System.Object,System.Int32,System.String,System.Boolean,System.Object)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["System.Runtime.CompilerServices", "RuntimeOps", False, "ExpandoTrySetValue", "(System.Dynamic.ExpandoObject,System.Object,System.Int32,System.Object,System.String,System.Boolean)", "", "Argument[3]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Runtime.CompilerServices", "RuntimeOps", False, "ExpandoTrySetValue", "(System.Dynamic.ExpandoObject,System.Object,System.Int32,System.Object,System.String,System.Boolean)", "", "Argument[3]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Runtime.CompilerServices", "RuntimeOps", False, "MergeRuntimeVariables", "(System.Runtime.CompilerServices.IRuntimeVariables,System.Runtime.CompilerServices.IRuntimeVariables,System.Int32[])", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["System.Runtime.CompilerServices", "RuntimeOps", False, "MergeRuntimeVariables", "(System.Runtime.CompilerServices.IRuntimeVariables,System.Runtime.CompilerServices.IRuntimeVariables,System.Int32[])", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
       - ["System.Runtime.CompilerServices", "RuntimeOps", False, "Quote", "(System.Linq.Expressions.Expression,System.Object,System.Object[])", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Runtime.CompilerServices", "RuntimeWrappedException", False, "RuntimeWrappedException", "(System.Object)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Runtime.CompilerServices", "RuntimeWrappedException", False, "get_WrappedException", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Runtime.CompilerServices", "StrongBox<T>", False, "StrongBox", "(T)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Runtime.CompilerServices", "TupleElementNamesAttribute", False, "TupleElementNamesAttribute", "(System.String[])", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["System.Runtime.CompilerServices", "TupleElementNamesAttribute", False, "get_TransformNames", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Runtime.CompilerServices", "RuntimeWrappedException", False, "RuntimeWrappedException", "(System.Object)", "", "Argument[0]", "Argument[this].SyntheticField[System.Runtime.CompilerServices.RuntimeWrappedException._wrappedException]", "value", "dfc-generated"]
+      - ["System.Runtime.CompilerServices", "RuntimeWrappedException", False, "get_WrappedException", "()", "", "Argument[this].SyntheticField[System.Runtime.CompilerServices.RuntimeWrappedException._wrappedException]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Runtime.CompilerServices", "StrongBox<T>", False, "StrongBox", "(T)", "", "Argument[0]", "Argument[this].Field[System.Runtime.CompilerServices.StrongBox`1.Value]", "value", "dfc-generated"]
+      - ["System.Runtime.CompilerServices", "SwitchExpressionException", False, "get_Message", "()", "", "Argument[this].Property[System.Exception.Message]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Runtime.CompilerServices", "SwitchExpressionException", False, "get_Message", "()", "", "Argument[this].Property[System.Runtime.CompilerServices.SwitchExpressionException.UnmatchedValue]", "ReturnValue", "taint", "dfc-generated"]
+      - ["System.Runtime.CompilerServices", "TupleElementNamesAttribute", False, "TupleElementNamesAttribute", "(System.String[])", "", "Argument[0]", "Argument[this].SyntheticField[System.Runtime.CompilerServices.TupleElementNamesAttribute._transformNames]", "value", "dfc-generated"]
+      - ["System.Runtime.CompilerServices", "TupleElementNamesAttribute", False, "get_TransformNames", "()", "", "Argument[this].SyntheticField[System.Runtime.CompilerServices.TupleElementNamesAttribute._transformNames]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Runtime.CompilerServices", "Unsafe", False, "Add<T>", "(T,System.Int32)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Runtime.CompilerServices", "Unsafe", False, "Add<T>", "(T,System.IntPtr)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Runtime.CompilerServices", "Unsafe", False, "Add<T>", "(T,System.UIntPtr)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Runtime.CompilerServices", "Unsafe", False, "AddByteOffset<T>", "(T,System.UIntPtr)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Runtime.CompilerServices", "Unsafe", False, "Copy<T>", "(T,System.Void*)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Runtime.CompilerServices", "Unsafe", False, "Subtract<T>", "(T,System.Int32)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Runtime.CompilerServices", "Unsafe", False, "Subtract<T>", "(T,System.IntPtr)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Runtime.CompilerServices", "Unsafe", False, "Subtract<T>", "(T,System.UIntPtr)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Runtime.CompilerServices", "Unsafe", False, "SubtractByteOffset<T>", "(T,System.UIntPtr)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Runtime.CompilerServices", "ValueTaskAwaiter<TResult>", False, "GetResult", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
   - addsTo:
       pack: codeql/csharp-all
@@ -73,7 +113,6 @@ extensions:
       - ["System.Runtime.CompilerServices", "AccessedThroughPropertyAttribute", "get_PropertyName", "()", "summary", "df-generated"]
       - ["System.Runtime.CompilerServices", "AsyncIteratorMethodBuilder", "Complete", "()", "summary", "df-generated"]
       - ["System.Runtime.CompilerServices", "AsyncIteratorMethodBuilder", "Create", "()", "summary", "df-generated"]
-      - ["System.Runtime.CompilerServices", "AsyncIteratorMethodBuilder", "MoveNext<TStateMachine>", "(TStateMachine)", "summary", "df-generated"]
       - ["System.Runtime.CompilerServices", "AsyncIteratorStateMachineAttribute", "AsyncIteratorStateMachineAttribute", "(System.Type)", "summary", "df-generated"]
       - ["System.Runtime.CompilerServices", "AsyncMethodBuilderAttribute", "AsyncMethodBuilderAttribute", "(System.Type)", "summary", "df-generated"]
       - ["System.Runtime.CompilerServices", "AsyncMethodBuilderAttribute", "get_BuilderType", "()", "summary", "df-generated"]
@@ -82,28 +121,21 @@ extensions:
       - ["System.Runtime.CompilerServices", "AsyncTaskMethodBuilder", "SetException", "(System.Exception)", "summary", "df-generated"]
       - ["System.Runtime.CompilerServices", "AsyncTaskMethodBuilder", "SetResult", "()", "summary", "df-generated"]
       - ["System.Runtime.CompilerServices", "AsyncTaskMethodBuilder", "SetStateMachine", "(System.Runtime.CompilerServices.IAsyncStateMachine)", "summary", "df-generated"]
-      - ["System.Runtime.CompilerServices", "AsyncTaskMethodBuilder", "Start<TStateMachine>", "(TStateMachine)", "summary", "df-generated"]
       - ["System.Runtime.CompilerServices", "AsyncTaskMethodBuilder<TResult>", "Create", "()", "summary", "df-generated"]
       - ["System.Runtime.CompilerServices", "AsyncTaskMethodBuilder<TResult>", "SetException", "(System.Exception)", "summary", "df-generated"]
       - ["System.Runtime.CompilerServices", "AsyncTaskMethodBuilder<TResult>", "SetStateMachine", "(System.Runtime.CompilerServices.IAsyncStateMachine)", "summary", "df-generated"]
-      - ["System.Runtime.CompilerServices", "AsyncTaskMethodBuilder<TResult>", "Start<TStateMachine>", "(TStateMachine)", "summary", "df-generated"]
       - ["System.Runtime.CompilerServices", "AsyncValueTaskMethodBuilder", "Create", "()", "summary", "df-generated"]
       - ["System.Runtime.CompilerServices", "AsyncValueTaskMethodBuilder", "SetException", "(System.Exception)", "summary", "df-generated"]
       - ["System.Runtime.CompilerServices", "AsyncValueTaskMethodBuilder", "SetResult", "()", "summary", "df-generated"]
       - ["System.Runtime.CompilerServices", "AsyncValueTaskMethodBuilder", "SetStateMachine", "(System.Runtime.CompilerServices.IAsyncStateMachine)", "summary", "df-generated"]
-      - ["System.Runtime.CompilerServices", "AsyncValueTaskMethodBuilder", "Start<TStateMachine>", "(TStateMachine)", "summary", "df-generated"]
       - ["System.Runtime.CompilerServices", "AsyncValueTaskMethodBuilder", "get_Task", "()", "summary", "df-generated"]
       - ["System.Runtime.CompilerServices", "AsyncValueTaskMethodBuilder<TResult>", "Create", "()", "summary", "df-generated"]
       - ["System.Runtime.CompilerServices", "AsyncValueTaskMethodBuilder<TResult>", "SetException", "(System.Exception)", "summary", "df-generated"]
       - ["System.Runtime.CompilerServices", "AsyncValueTaskMethodBuilder<TResult>", "SetStateMachine", "(System.Runtime.CompilerServices.IAsyncStateMachine)", "summary", "df-generated"]
-      - ["System.Runtime.CompilerServices", "AsyncValueTaskMethodBuilder<TResult>", "Start<TStateMachine>", "(TStateMachine)", "summary", "df-generated"]
-      - ["System.Runtime.CompilerServices", "AsyncVoidMethodBuilder", "AwaitOnCompleted<TAwaiter,TStateMachine>", "(TAwaiter,TStateMachine)", "summary", "df-generated"]
-      - ["System.Runtime.CompilerServices", "AsyncVoidMethodBuilder", "AwaitUnsafeOnCompleted<TAwaiter,TStateMachine>", "(TAwaiter,TStateMachine)", "summary", "df-generated"]
       - ["System.Runtime.CompilerServices", "AsyncVoidMethodBuilder", "Create", "()", "summary", "df-generated"]
       - ["System.Runtime.CompilerServices", "AsyncVoidMethodBuilder", "SetException", "(System.Exception)", "summary", "df-generated"]
       - ["System.Runtime.CompilerServices", "AsyncVoidMethodBuilder", "SetResult", "()", "summary", "df-generated"]
       - ["System.Runtime.CompilerServices", "AsyncVoidMethodBuilder", "SetStateMachine", "(System.Runtime.CompilerServices.IAsyncStateMachine)", "summary", "df-generated"]
-      - ["System.Runtime.CompilerServices", "AsyncVoidMethodBuilder", "Start<TStateMachine>", "(TStateMachine)", "summary", "df-generated"]
       - ["System.Runtime.CompilerServices", "CallSite", "Create", "(System.Type,System.Runtime.CompilerServices.CallSiteBinder)", "summary", "df-generated"]
       - ["System.Runtime.CompilerServices", "CallSite<T>", "Create", "(System.Runtime.CompilerServices.CallSiteBinder)", "summary", "df-generated"]
       - ["System.Runtime.CompilerServices", "CallSite<T>", "get_Update", "()", "summary", "df-generated"]
@@ -132,6 +164,7 @@ extensions:
       - ["System.Runtime.CompilerServices", "CompilerFeatureRequiredAttribute", "get_FeatureName", "()", "summary", "df-generated"]
       - ["System.Runtime.CompilerServices", "ConditionalWeakTable<TKey,TValue>", "Add", "(TKey,TValue)", "summary", "df-generated"]
       - ["System.Runtime.CompilerServices", "ConditionalWeakTable<TKey,TValue>", "AddOrUpdate", "(TKey,TValue)", "summary", "df-generated"]
+      - ["System.Runtime.CompilerServices", "ConditionalWeakTable<TKey,TValue>", "GetOrCreateValue", "(TKey)", "summary", "df-generated"]
       - ["System.Runtime.CompilerServices", "ConditionalWeakTable<TKey,TValue>", "Remove", "(TKey)", "summary", "df-generated"]
       - ["System.Runtime.CompilerServices", "ConditionalWeakTable<TKey,TValue>", "TryAdd", "(TKey,TValue)", "summary", "df-generated"]
       - ["System.Runtime.CompilerServices", "ConditionalWeakTable<TKey,TValue>", "TryGetValue", "(TKey,TValue)", "summary", "df-generated"]
@@ -139,10 +172,18 @@ extensions:
       - ["System.Runtime.CompilerServices", "ConfiguredCancelableAsyncEnumerable<T>+Enumerator", "DisposeAsync", "()", "summary", "df-generated"]
       - ["System.Runtime.CompilerServices", "ConfiguredCancelableAsyncEnumerable<T>+Enumerator", "MoveNextAsync", "()", "summary", "df-generated"]
       - ["System.Runtime.CompilerServices", "ConfiguredTaskAwaitable+ConfiguredTaskAwaiter", "GetResult", "()", "summary", "df-generated"]
+      - ["System.Runtime.CompilerServices", "ConfiguredTaskAwaitable+ConfiguredTaskAwaiter", "OnCompleted", "(System.Action)", "summary", "df-generated"]
+      - ["System.Runtime.CompilerServices", "ConfiguredTaskAwaitable+ConfiguredTaskAwaiter", "UnsafeOnCompleted", "(System.Action)", "summary", "df-generated"]
       - ["System.Runtime.CompilerServices", "ConfiguredTaskAwaitable+ConfiguredTaskAwaiter", "get_IsCompleted", "()", "summary", "df-generated"]
+      - ["System.Runtime.CompilerServices", "ConfiguredTaskAwaitable<TResult>+ConfiguredTaskAwaiter", "OnCompleted", "(System.Action)", "summary", "df-generated"]
+      - ["System.Runtime.CompilerServices", "ConfiguredTaskAwaitable<TResult>+ConfiguredTaskAwaiter", "UnsafeOnCompleted", "(System.Action)", "summary", "df-generated"]
       - ["System.Runtime.CompilerServices", "ConfiguredTaskAwaitable<TResult>+ConfiguredTaskAwaiter", "get_IsCompleted", "()", "summary", "df-generated"]
       - ["System.Runtime.CompilerServices", "ConfiguredValueTaskAwaitable+ConfiguredValueTaskAwaiter", "GetResult", "()", "summary", "df-generated"]
+      - ["System.Runtime.CompilerServices", "ConfiguredValueTaskAwaitable+ConfiguredValueTaskAwaiter", "OnCompleted", "(System.Action)", "summary", "df-generated"]
+      - ["System.Runtime.CompilerServices", "ConfiguredValueTaskAwaitable+ConfiguredValueTaskAwaiter", "UnsafeOnCompleted", "(System.Action)", "summary", "df-generated"]
       - ["System.Runtime.CompilerServices", "ConfiguredValueTaskAwaitable+ConfiguredValueTaskAwaiter", "get_IsCompleted", "()", "summary", "df-generated"]
+      - ["System.Runtime.CompilerServices", "ConfiguredValueTaskAwaitable<TResult>+ConfiguredValueTaskAwaiter", "OnCompleted", "(System.Action)", "summary", "df-generated"]
+      - ["System.Runtime.CompilerServices", "ConfiguredValueTaskAwaitable<TResult>+ConfiguredValueTaskAwaiter", "UnsafeOnCompleted", "(System.Action)", "summary", "df-generated"]
       - ["System.Runtime.CompilerServices", "ConfiguredValueTaskAwaitable<TResult>+ConfiguredValueTaskAwaiter", "get_IsCompleted", "()", "summary", "df-generated"]
       - ["System.Runtime.CompilerServices", "ContractHelper", "TriggerFailure", "(System.Diagnostics.Contracts.ContractFailureKind,System.String,System.String,System.String,System.Exception)", "summary", "df-generated"]
       - ["System.Runtime.CompilerServices", "CppInlineNamespaceAttribute", "CppInlineNamespaceAttribute", "(System.String)", "summary", "df-generated"]
@@ -181,7 +222,9 @@ extensions:
       - ["System.Runtime.CompilerServices", "IAsyncStateMachine", "SetStateMachine", "(System.Runtime.CompilerServices.IAsyncStateMachine)", "summary", "df-generated"]
       - ["System.Runtime.CompilerServices", "ICastable", "GetImplType", "(System.RuntimeTypeHandle)", "summary", "df-generated"]
       - ["System.Runtime.CompilerServices", "ICastable", "IsInstanceOfInterface", "(System.RuntimeTypeHandle,System.Exception)", "summary", "df-generated"]
+      - ["System.Runtime.CompilerServices", "ICriticalNotifyCompletion", "UnsafeOnCompleted", "(System.Action)", "summary", "df-generated"]
       - ["System.Runtime.CompilerServices", "IDispatchConstantAttribute", "get_Value", "()", "summary", "df-generated"]
+      - ["System.Runtime.CompilerServices", "INotifyCompletion", "OnCompleted", "(System.Action)", "summary", "df-generated"]
       - ["System.Runtime.CompilerServices", "IRuntimeVariables", "get_Count", "()", "summary", "df-generated"]
       - ["System.Runtime.CompilerServices", "IRuntimeVariables", "set_Item", "(System.Int32,System.Object)", "summary", "df-generated"]
       - ["System.Runtime.CompilerServices", "ITuple", "get_Length", "()", "summary", "df-generated"]
@@ -208,17 +251,16 @@ extensions:
       - ["System.Runtime.CompilerServices", "PoolingAsyncValueTaskMethodBuilder", "SetException", "(System.Exception)", "summary", "df-generated"]
       - ["System.Runtime.CompilerServices", "PoolingAsyncValueTaskMethodBuilder", "SetResult", "()", "summary", "df-generated"]
       - ["System.Runtime.CompilerServices", "PoolingAsyncValueTaskMethodBuilder", "SetStateMachine", "(System.Runtime.CompilerServices.IAsyncStateMachine)", "summary", "df-generated"]
-      - ["System.Runtime.CompilerServices", "PoolingAsyncValueTaskMethodBuilder", "Start<TStateMachine>", "(TStateMachine)", "summary", "df-generated"]
       - ["System.Runtime.CompilerServices", "PoolingAsyncValueTaskMethodBuilder", "get_Task", "()", "summary", "df-generated"]
       - ["System.Runtime.CompilerServices", "PoolingAsyncValueTaskMethodBuilder<TResult>", "Create", "()", "summary", "df-generated"]
       - ["System.Runtime.CompilerServices", "PoolingAsyncValueTaskMethodBuilder<TResult>", "SetException", "(System.Exception)", "summary", "df-generated"]
       - ["System.Runtime.CompilerServices", "PoolingAsyncValueTaskMethodBuilder<TResult>", "SetStateMachine", "(System.Runtime.CompilerServices.IAsyncStateMachine)", "summary", "df-generated"]
-      - ["System.Runtime.CompilerServices", "PoolingAsyncValueTaskMethodBuilder<TResult>", "Start<TStateMachine>", "(TStateMachine)", "summary", "df-generated"]
       - ["System.Runtime.CompilerServices", "ReadOnlyCollectionBuilder<T>", "Contains", "(System.Object)", "summary", "df-generated"]
       - ["System.Runtime.CompilerServices", "ReadOnlyCollectionBuilder<T>", "Contains", "(T)", "summary", "df-generated"]
       - ["System.Runtime.CompilerServices", "ReadOnlyCollectionBuilder<T>", "IndexOf", "(System.Object)", "summary", "df-generated"]
       - ["System.Runtime.CompilerServices", "ReadOnlyCollectionBuilder<T>", "IndexOf", "(T)", "summary", "df-generated"]
       - ["System.Runtime.CompilerServices", "ReadOnlyCollectionBuilder<T>", "ReadOnlyCollectionBuilder", "(System.Int32)", "summary", "df-generated"]
+      - ["System.Runtime.CompilerServices", "ReadOnlyCollectionBuilder<T>", "Remove", "(System.Object)", "summary", "df-generated"]
       - ["System.Runtime.CompilerServices", "ReadOnlyCollectionBuilder<T>", "Remove", "(T)", "summary", "df-generated"]
       - ["System.Runtime.CompilerServices", "ReadOnlyCollectionBuilder<T>", "RemoveAt", "(System.Int32)", "summary", "df-generated"]
       - ["System.Runtime.CompilerServices", "ReadOnlyCollectionBuilder<T>", "Reverse", "()", "summary", "df-generated"]
@@ -269,18 +311,18 @@ extensions:
       - ["System.Runtime.CompilerServices", "SwitchExpressionException", "SwitchExpressionException", "(System.String,System.Exception)", "summary", "df-generated"]
       - ["System.Runtime.CompilerServices", "SwitchExpressionException", "get_UnmatchedValue", "()", "summary", "df-generated"]
       - ["System.Runtime.CompilerServices", "TaskAwaiter", "GetResult", "()", "summary", "df-generated"]
+      - ["System.Runtime.CompilerServices", "TaskAwaiter", "OnCompleted", "(System.Action)", "summary", "df-generated"]
+      - ["System.Runtime.CompilerServices", "TaskAwaiter", "UnsafeOnCompleted", "(System.Action)", "summary", "df-generated"]
       - ["System.Runtime.CompilerServices", "TaskAwaiter", "get_IsCompleted", "()", "summary", "df-generated"]
+      - ["System.Runtime.CompilerServices", "TaskAwaiter<TResult>", "OnCompleted", "(System.Action)", "summary", "df-generated"]
+      - ["System.Runtime.CompilerServices", "TaskAwaiter<TResult>", "UnsafeOnCompleted", "(System.Action)", "summary", "df-generated"]
       - ["System.Runtime.CompilerServices", "TaskAwaiter<TResult>", "get_IsCompleted", "()", "summary", "df-generated"]
       - ["System.Runtime.CompilerServices", "TypeForwardedFromAttribute", "TypeForwardedFromAttribute", "(System.String)", "summary", "df-generated"]
       - ["System.Runtime.CompilerServices", "TypeForwardedFromAttribute", "get_AssemblyFullName", "()", "summary", "df-generated"]
       - ["System.Runtime.CompilerServices", "TypeForwardedToAttribute", "TypeForwardedToAttribute", "(System.Type)", "summary", "df-generated"]
       - ["System.Runtime.CompilerServices", "TypeForwardedToAttribute", "get_Destination", "()", "summary", "df-generated"]
       - ["System.Runtime.CompilerServices", "Unsafe", "Add<T>", "(System.Void*,System.Int32)", "summary", "df-generated"]
-      - ["System.Runtime.CompilerServices", "Unsafe", "Add<T>", "(T,System.Int32)", "summary", "df-generated"]
-      - ["System.Runtime.CompilerServices", "Unsafe", "Add<T>", "(T,System.IntPtr)", "summary", "df-generated"]
-      - ["System.Runtime.CompilerServices", "Unsafe", "Add<T>", "(T,System.UIntPtr)", "summary", "df-generated"]
       - ["System.Runtime.CompilerServices", "Unsafe", "AddByteOffset<T>", "(T,System.IntPtr)", "summary", "df-generated"]
-      - ["System.Runtime.CompilerServices", "Unsafe", "AddByteOffset<T>", "(T,System.UIntPtr)", "summary", "df-generated"]
       - ["System.Runtime.CompilerServices", "Unsafe", "AreSame<T>", "(T,T)", "summary", "df-generated"]
       - ["System.Runtime.CompilerServices", "Unsafe", "As<T>", "(System.Object)", "summary", "df-generated"]
       - ["System.Runtime.CompilerServices", "Unsafe", "As<TFrom,TTo>", "(TFrom)", "summary", "df-generated"]
@@ -290,7 +332,6 @@ extensions:
       - ["System.Runtime.CompilerServices", "Unsafe", "BitCast<TFrom,TTo>", "(TFrom)", "summary", "df-generated"]
       - ["System.Runtime.CompilerServices", "Unsafe", "ByteOffset<T>", "(T,T)", "summary", "df-generated"]
       - ["System.Runtime.CompilerServices", "Unsafe", "Copy<T>", "(System.Void*,T)", "summary", "df-generated"]
-      - ["System.Runtime.CompilerServices", "Unsafe", "Copy<T>", "(T,System.Void*)", "summary", "df-generated"]
       - ["System.Runtime.CompilerServices", "Unsafe", "CopyBlock", "(System.Byte,System.Byte,System.UInt32)", "summary", "df-generated"]
       - ["System.Runtime.CompilerServices", "Unsafe", "CopyBlock", "(System.Void*,System.Void*,System.UInt32)", "summary", "df-generated"]
       - ["System.Runtime.CompilerServices", "Unsafe", "CopyBlockUnaligned", "(System.Byte,System.Byte,System.UInt32)", "summary", "df-generated"]
@@ -309,11 +350,7 @@ extensions:
       - ["System.Runtime.CompilerServices", "Unsafe", "SizeOf<T>", "()", "summary", "df-generated"]
       - ["System.Runtime.CompilerServices", "Unsafe", "SkipInit<T>", "(T)", "summary", "df-generated"]
       - ["System.Runtime.CompilerServices", "Unsafe", "Subtract<T>", "(System.Void*,System.Int32)", "summary", "df-generated"]
-      - ["System.Runtime.CompilerServices", "Unsafe", "Subtract<T>", "(T,System.Int32)", "summary", "df-generated"]
-      - ["System.Runtime.CompilerServices", "Unsafe", "Subtract<T>", "(T,System.IntPtr)", "summary", "df-generated"]
-      - ["System.Runtime.CompilerServices", "Unsafe", "Subtract<T>", "(T,System.UIntPtr)", "summary", "df-generated"]
       - ["System.Runtime.CompilerServices", "Unsafe", "SubtractByteOffset<T>", "(T,System.IntPtr)", "summary", "df-generated"]
-      - ["System.Runtime.CompilerServices", "Unsafe", "SubtractByteOffset<T>", "(T,System.UIntPtr)", "summary", "df-generated"]
       - ["System.Runtime.CompilerServices", "Unsafe", "Unbox<T>", "(System.Object)", "summary", "df-generated"]
       - ["System.Runtime.CompilerServices", "Unsafe", "Write<T>", "(System.Void*,T)", "summary", "df-generated"]
       - ["System.Runtime.CompilerServices", "Unsafe", "WriteUnaligned<T>", "(System.Byte,T)", "summary", "df-generated"]
@@ -321,8 +358,14 @@ extensions:
       - ["System.Runtime.CompilerServices", "UnsafeAccessorAttribute", "UnsafeAccessorAttribute", "(System.Runtime.CompilerServices.UnsafeAccessorKind)", "summary", "df-generated"]
       - ["System.Runtime.CompilerServices", "UnsafeAccessorAttribute", "get_Kind", "()", "summary", "df-generated"]
       - ["System.Runtime.CompilerServices", "ValueTaskAwaiter", "GetResult", "()", "summary", "df-generated"]
+      - ["System.Runtime.CompilerServices", "ValueTaskAwaiter", "OnCompleted", "(System.Action)", "summary", "df-generated"]
+      - ["System.Runtime.CompilerServices", "ValueTaskAwaiter", "UnsafeOnCompleted", "(System.Action)", "summary", "df-generated"]
       - ["System.Runtime.CompilerServices", "ValueTaskAwaiter", "get_IsCompleted", "()", "summary", "df-generated"]
+      - ["System.Runtime.CompilerServices", "ValueTaskAwaiter<TResult>", "OnCompleted", "(System.Action)", "summary", "df-generated"]
+      - ["System.Runtime.CompilerServices", "ValueTaskAwaiter<TResult>", "UnsafeOnCompleted", "(System.Action)", "summary", "df-generated"]
       - ["System.Runtime.CompilerServices", "ValueTaskAwaiter<TResult>", "get_IsCompleted", "()", "summary", "df-generated"]
       - ["System.Runtime.CompilerServices", "YieldAwaitable+YieldAwaiter", "GetResult", "()", "summary", "df-generated"]
+      - ["System.Runtime.CompilerServices", "YieldAwaitable+YieldAwaiter", "OnCompleted", "(System.Action)", "summary", "df-generated"]
+      - ["System.Runtime.CompilerServices", "YieldAwaitable+YieldAwaiter", "UnsafeOnCompleted", "(System.Action)", "summary", "df-generated"]
       - ["System.Runtime.CompilerServices", "YieldAwaitable+YieldAwaiter", "get_IsCompleted", "()", "summary", "df-generated"]
       - ["System.Runtime.CompilerServices", "YieldAwaitable", "GetAwaiter", "()", "summary", "df-generated"]
diff --git a/csharp/ql/lib/ext/generated/System.Runtime.ExceptionServices.model.yml b/csharp/ql/lib/ext/generated/System.Runtime.ExceptionServices.model.yml
index 31b608a3c33..7eac5a4a81c 100644
--- a/csharp/ql/lib/ext/generated/System.Runtime.ExceptionServices.model.yml
+++ b/csharp/ql/lib/ext/generated/System.Runtime.ExceptionServices.model.yml
@@ -4,12 +4,12 @@ extensions:
       pack: codeql/csharp-all
       extensible: summaryModel
     data:
-      - ["System.Runtime.ExceptionServices", "ExceptionDispatchInfo", False, "Capture", "(System.Exception)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Runtime.ExceptionServices", "ExceptionDispatchInfo", False, "SetCurrentStackTrace", "(System.Exception)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Runtime.ExceptionServices", "ExceptionDispatchInfo", False, "SetRemoteStackTrace", "(System.Exception,System.String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Runtime.ExceptionServices", "ExceptionDispatchInfo", False, "SetRemoteStackTrace", "(System.Exception,System.String)", "", "Argument[1]", "Argument[0]", "taint", "df-generated"]
-      - ["System.Runtime.ExceptionServices", "ExceptionDispatchInfo", False, "SetRemoteStackTrace", "(System.Exception,System.String)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Runtime.ExceptionServices", "ExceptionDispatchInfo", False, "get_SourceException", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Runtime.ExceptionServices", "ExceptionDispatchInfo", False, "Capture", "(System.Exception)", "", "Argument[0]", "ReturnValue.SyntheticField[System.Runtime.ExceptionServices.ExceptionDispatchInfo._exception]", "value", "dfc-generated"]
+      - ["System.Runtime.ExceptionServices", "ExceptionDispatchInfo", False, "SetCurrentStackTrace", "(System.Exception)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Runtime.ExceptionServices", "ExceptionDispatchInfo", False, "SetRemoteStackTrace", "(System.Exception,System.String)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Runtime.ExceptionServices", "ExceptionDispatchInfo", False, "SetRemoteStackTrace", "(System.Exception,System.String)", "", "Argument[1]", "Argument[0].SyntheticField[System.Exception._remoteStackTraceString]", "taint", "dfc-generated"]
+      - ["System.Runtime.ExceptionServices", "ExceptionDispatchInfo", False, "SetRemoteStackTrace", "(System.Exception,System.String)", "", "Argument[1]", "ReturnValue.SyntheticField[System.Exception._remoteStackTraceString]", "taint", "dfc-generated"]
+      - ["System.Runtime.ExceptionServices", "ExceptionDispatchInfo", False, "get_SourceException", "()", "", "Argument[this].SyntheticField[System.Runtime.ExceptionServices.ExceptionDispatchInfo._exception]", "ReturnValue", "value", "dfc-generated"]
   - addsTo:
       pack: codeql/csharp-all
       extensible: neutralModel
diff --git a/csharp/ql/lib/ext/generated/System.Runtime.InteropServices.JavaScript.model.yml b/csharp/ql/lib/ext/generated/System.Runtime.InteropServices.JavaScript.model.yml
index 51ddcb281a2..6a4775ca8d0 100644
--- a/csharp/ql/lib/ext/generated/System.Runtime.InteropServices.JavaScript.model.yml
+++ b/csharp/ql/lib/ext/generated/System.Runtime.InteropServices.JavaScript.model.yml
@@ -16,6 +16,7 @@ extensions:
       - ["System.Runtime.InteropServices.JavaScript", "JSImportAttribute", "get_FunctionName", "()", "summary", "df-generated"]
       - ["System.Runtime.InteropServices.JavaScript", "JSImportAttribute", "get_ModuleName", "()", "summary", "df-generated"]
       - ["System.Runtime.InteropServices.JavaScript", "JSMarshalerArgument", "Initialize", "()", "summary", "df-generated"]
+      - ["System.Runtime.InteropServices.JavaScript", "JSMarshalerArgument", "ToJS", "(System.Action)", "summary", "df-generated"]
       - ["System.Runtime.InteropServices.JavaScript", "JSMarshalerArgument", "ToJS", "(System.ArraySegment<System.Byte>)", "summary", "df-generated"]
       - ["System.Runtime.InteropServices.JavaScript", "JSMarshalerArgument", "ToJS", "(System.ArraySegment<System.Double>)", "summary", "df-generated"]
       - ["System.Runtime.InteropServices.JavaScript", "JSMarshalerArgument", "ToJS", "(System.ArraySegment<System.Int32>)", "summary", "df-generated"]
@@ -56,8 +57,17 @@ extensions:
       - ["System.Runtime.InteropServices.JavaScript", "JSMarshalerArgument", "ToJS", "(System.String[])", "summary", "df-generated"]
       - ["System.Runtime.InteropServices.JavaScript", "JSMarshalerArgument", "ToJS", "(System.Threading.Tasks.Task)", "summary", "df-generated"]
       - ["System.Runtime.InteropServices.JavaScript", "JSMarshalerArgument", "ToJS", "(System.Void*)", "summary", "df-generated"]
+      - ["System.Runtime.InteropServices.JavaScript", "JSMarshalerArgument", "ToJS<T,TResult>", "(System.Func<T,TResult>,System.Runtime.InteropServices.JavaScript.JSMarshalerArgument+ArgumentToManagedCallback<T>,System.Runtime.InteropServices.JavaScript.JSMarshalerArgument+ArgumentToJSCallback<TResult>)", "summary", "df-generated"]
+      - ["System.Runtime.InteropServices.JavaScript", "JSMarshalerArgument", "ToJS<T1,T2,T3,TResult>", "(System.Func<T1,T2,T3,TResult>,System.Runtime.InteropServices.JavaScript.JSMarshalerArgument+ArgumentToManagedCallback<T1>,System.Runtime.InteropServices.JavaScript.JSMarshalerArgument+ArgumentToManagedCallback<T2>,System.Runtime.InteropServices.JavaScript.JSMarshalerArgument+ArgumentToManagedCallback<T3>,System.Runtime.InteropServices.JavaScript.JSMarshalerArgument+ArgumentToJSCallback<TResult>)", "summary", "df-generated"]
+      - ["System.Runtime.InteropServices.JavaScript", "JSMarshalerArgument", "ToJS<T1,T2,T3>", "(System.Action<T1,T2,T3>,System.Runtime.InteropServices.JavaScript.JSMarshalerArgument+ArgumentToManagedCallback<T1>,System.Runtime.InteropServices.JavaScript.JSMarshalerArgument+ArgumentToManagedCallback<T2>,System.Runtime.InteropServices.JavaScript.JSMarshalerArgument+ArgumentToManagedCallback<T3>)", "summary", "df-generated"]
+      - ["System.Runtime.InteropServices.JavaScript", "JSMarshalerArgument", "ToJS<T1,T2,TResult>", "(System.Func<T1,T2,TResult>,System.Runtime.InteropServices.JavaScript.JSMarshalerArgument+ArgumentToManagedCallback<T1>,System.Runtime.InteropServices.JavaScript.JSMarshalerArgument+ArgumentToManagedCallback<T2>,System.Runtime.InteropServices.JavaScript.JSMarshalerArgument+ArgumentToJSCallback<TResult>)", "summary", "df-generated"]
+      - ["System.Runtime.InteropServices.JavaScript", "JSMarshalerArgument", "ToJS<T1,T2>", "(System.Action<T1,T2>,System.Runtime.InteropServices.JavaScript.JSMarshalerArgument+ArgumentToManagedCallback<T1>,System.Runtime.InteropServices.JavaScript.JSMarshalerArgument+ArgumentToManagedCallback<T2>)", "summary", "df-generated"]
+      - ["System.Runtime.InteropServices.JavaScript", "JSMarshalerArgument", "ToJS<T>", "(System.Action<T>,System.Runtime.InteropServices.JavaScript.JSMarshalerArgument+ArgumentToManagedCallback<T>)", "summary", "df-generated"]
+      - ["System.Runtime.InteropServices.JavaScript", "JSMarshalerArgument", "ToJS<T>", "(System.Threading.Tasks.Task<T>,System.Runtime.InteropServices.JavaScript.JSMarshalerArgument+ArgumentToJSCallback<T>)", "summary", "df-generated"]
+      - ["System.Runtime.InteropServices.JavaScript", "JSMarshalerArgument", "ToJS<TResult>", "(System.Func<TResult>,System.Runtime.InteropServices.JavaScript.JSMarshalerArgument+ArgumentToJSCallback<TResult>)", "summary", "df-generated"]
       - ["System.Runtime.InteropServices.JavaScript", "JSMarshalerArgument", "ToJSBig", "(System.Int64)", "summary", "df-generated"]
       - ["System.Runtime.InteropServices.JavaScript", "JSMarshalerArgument", "ToJSBig", "(System.Nullable<System.Int64>)", "summary", "df-generated"]
+      - ["System.Runtime.InteropServices.JavaScript", "JSMarshalerArgument", "ToManaged", "(System.Action)", "summary", "df-generated"]
       - ["System.Runtime.InteropServices.JavaScript", "JSMarshalerArgument", "ToManaged", "(System.ArraySegment<System.Byte>)", "summary", "df-generated"]
       - ["System.Runtime.InteropServices.JavaScript", "JSMarshalerArgument", "ToManaged", "(System.ArraySegment<System.Double>)", "summary", "df-generated"]
       - ["System.Runtime.InteropServices.JavaScript", "JSMarshalerArgument", "ToManaged", "(System.ArraySegment<System.Int32>)", "summary", "df-generated"]
@@ -98,6 +108,14 @@ extensions:
       - ["System.Runtime.InteropServices.JavaScript", "JSMarshalerArgument", "ToManaged", "(System.String[])", "summary", "df-generated"]
       - ["System.Runtime.InteropServices.JavaScript", "JSMarshalerArgument", "ToManaged", "(System.Threading.Tasks.Task)", "summary", "df-generated"]
       - ["System.Runtime.InteropServices.JavaScript", "JSMarshalerArgument", "ToManaged", "(System.Void*)", "summary", "df-generated"]
+      - ["System.Runtime.InteropServices.JavaScript", "JSMarshalerArgument", "ToManaged<T,TResult>", "(System.Func<T,TResult>,System.Runtime.InteropServices.JavaScript.JSMarshalerArgument+ArgumentToJSCallback<T>,System.Runtime.InteropServices.JavaScript.JSMarshalerArgument+ArgumentToManagedCallback<TResult>)", "summary", "df-generated"]
+      - ["System.Runtime.InteropServices.JavaScript", "JSMarshalerArgument", "ToManaged<T1,T2,T3,TResult>", "(System.Func<T1,T2,T3,TResult>,System.Runtime.InteropServices.JavaScript.JSMarshalerArgument+ArgumentToJSCallback<T1>,System.Runtime.InteropServices.JavaScript.JSMarshalerArgument+ArgumentToJSCallback<T2>,System.Runtime.InteropServices.JavaScript.JSMarshalerArgument+ArgumentToJSCallback<T3>,System.Runtime.InteropServices.JavaScript.JSMarshalerArgument+ArgumentToManagedCallback<TResult>)", "summary", "df-generated"]
+      - ["System.Runtime.InteropServices.JavaScript", "JSMarshalerArgument", "ToManaged<T1,T2,T3>", "(System.Action<T1,T2,T3>,System.Runtime.InteropServices.JavaScript.JSMarshalerArgument+ArgumentToJSCallback<T1>,System.Runtime.InteropServices.JavaScript.JSMarshalerArgument+ArgumentToJSCallback<T2>,System.Runtime.InteropServices.JavaScript.JSMarshalerArgument+ArgumentToJSCallback<T3>)", "summary", "df-generated"]
+      - ["System.Runtime.InteropServices.JavaScript", "JSMarshalerArgument", "ToManaged<T1,T2,TResult>", "(System.Func<T1,T2,TResult>,System.Runtime.InteropServices.JavaScript.JSMarshalerArgument+ArgumentToJSCallback<T1>,System.Runtime.InteropServices.JavaScript.JSMarshalerArgument+ArgumentToJSCallback<T2>,System.Runtime.InteropServices.JavaScript.JSMarshalerArgument+ArgumentToManagedCallback<TResult>)", "summary", "df-generated"]
+      - ["System.Runtime.InteropServices.JavaScript", "JSMarshalerArgument", "ToManaged<T1,T2>", "(System.Action<T1,T2>,System.Runtime.InteropServices.JavaScript.JSMarshalerArgument+ArgumentToJSCallback<T1>,System.Runtime.InteropServices.JavaScript.JSMarshalerArgument+ArgumentToJSCallback<T2>)", "summary", "df-generated"]
+      - ["System.Runtime.InteropServices.JavaScript", "JSMarshalerArgument", "ToManaged<T>", "(System.Action<T>,System.Runtime.InteropServices.JavaScript.JSMarshalerArgument+ArgumentToJSCallback<T>)", "summary", "df-generated"]
+      - ["System.Runtime.InteropServices.JavaScript", "JSMarshalerArgument", "ToManaged<T>", "(System.Threading.Tasks.Task<T>,System.Runtime.InteropServices.JavaScript.JSMarshalerArgument+ArgumentToManagedCallback<T>)", "summary", "df-generated"]
+      - ["System.Runtime.InteropServices.JavaScript", "JSMarshalerArgument", "ToManaged<TResult>", "(System.Func<TResult>,System.Runtime.InteropServices.JavaScript.JSMarshalerArgument+ArgumentToManagedCallback<TResult>)", "summary", "df-generated"]
       - ["System.Runtime.InteropServices.JavaScript", "JSMarshalerArgument", "ToManagedBig", "(System.Int64)", "summary", "df-generated"]
       - ["System.Runtime.InteropServices.JavaScript", "JSMarshalerArgument", "ToManagedBig", "(System.Nullable<System.Int64>)", "summary", "df-generated"]
       - ["System.Runtime.InteropServices.JavaScript", "JSMarshalerType", "Action", "()", "summary", "df-generated"]
diff --git a/csharp/ql/lib/ext/generated/System.Runtime.InteropServices.Marshalling.model.yml b/csharp/ql/lib/ext/generated/System.Runtime.InteropServices.Marshalling.model.yml
index 23366df9d05..4ec869949b0 100644
--- a/csharp/ql/lib/ext/generated/System.Runtime.InteropServices.Marshalling.model.yml
+++ b/csharp/ql/lib/ext/generated/System.Runtime.InteropServices.Marshalling.model.yml
@@ -5,39 +5,42 @@ extensions:
       extensible: summaryModel
     data:
       - ["System.Runtime.InteropServices.Marshalling", "AnsiStringMarshaller+ManagedToUnmanagedIn", False, "ToUnmanaged", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Runtime.InteropServices.Marshalling", "ArrayMarshaller<T,TUnmanagedElement>+ManagedToUnmanagedIn", False, "FromManaged", "(T[],System.Span<TUnmanagedElement>)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["System.Runtime.InteropServices.Marshalling", "ArrayMarshaller<T,TUnmanagedElement>+ManagedToUnmanagedIn", False, "FromManaged", "(T[],System.Span<TUnmanagedElement>)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Runtime.InteropServices.Marshalling", "ArrayMarshaller<T,TUnmanagedElement>+ManagedToUnmanagedIn", False, "GetManagedValuesSource", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Runtime.InteropServices.Marshalling", "ArrayMarshaller<T,TUnmanagedElement>+ManagedToUnmanagedIn", False, "FromManaged", "(T[],System.Span<TUnmanagedElement>)", "", "Argument[0]", "Argument[this].SyntheticField[System.Runtime.InteropServices.Marshalling.ArrayMarshaller`2+ManagedToUnmanagedIn._managedArray]", "value", "dfc-generated"]
+      - ["System.Runtime.InteropServices.Marshalling", "ArrayMarshaller<T,TUnmanagedElement>+ManagedToUnmanagedIn", False, "GetManagedValuesSource", "()", "", "Argument[this].SyntheticField[System.Runtime.InteropServices.Marshalling.ArrayMarshaller`2+ManagedToUnmanagedIn._managedArray].Element", "ReturnValue.Element", "value", "dfc-generated"]
       - ["System.Runtime.InteropServices.Marshalling", "ArrayMarshaller<T,TUnmanagedElement>+ManagedToUnmanagedIn", False, "GetUnmanagedValuesDestination", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Runtime.InteropServices.Marshalling", "ArrayMarshaller<T,TUnmanagedElement>", False, "GetManagedValuesDestination", "(T[])", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["System.Runtime.InteropServices.Marshalling", "ArrayMarshaller<T,TUnmanagedElement>", False, "GetManagedValuesSource", "(T[])", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
+      - ["System.Runtime.InteropServices.Marshalling", "ArrayMarshaller<T,TUnmanagedElement>", False, "GetManagedValuesDestination", "(T[])", "", "Argument[0].Element", "ReturnValue.Element", "value", "dfc-generated"]
+      - ["System.Runtime.InteropServices.Marshalling", "ArrayMarshaller<T,TUnmanagedElement>", False, "GetManagedValuesSource", "(T[])", "", "Argument[0].Element", "ReturnValue.Element", "value", "dfc-generated"]
       - ["System.Runtime.InteropServices.Marshalling", "BStrStringMarshaller+ManagedToUnmanagedIn", False, "ToUnmanaged", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Runtime.InteropServices.Marshalling", "ComVariantMarshaller+RefPropagate", False, "FromManaged", "(System.Object)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Runtime.InteropServices.Marshalling", "ComVariantMarshaller+RefPropagate", False, "FromUnmanaged", "(System.Runtime.InteropServices.Marshalling.ComVariant)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Runtime.InteropServices.Marshalling", "ComVariantMarshaller+RefPropagate", False, "ToUnmanaged", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Runtime.InteropServices.Marshalling", "IIUnknownStrategy", True, "CreateInstancePointer", "(System.Void*)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Runtime.InteropServices.Marshalling", "ComVariantMarshaller+RefPropagate", False, "FromUnmanaged", "(System.Runtime.InteropServices.Marshalling.ComVariant)", "", "Argument[0]", "Argument[this].SyntheticField[System.Runtime.InteropServices.Marshalling.ComVariantMarshaller+RefPropagate._unmanaged]", "value", "dfc-generated"]
+      - ["System.Runtime.InteropServices.Marshalling", "ComVariantMarshaller+RefPropagate", False, "ToUnmanaged", "()", "", "Argument[this].SyntheticField[System.Runtime.InteropServices.Marshalling.ComVariantMarshaller+RefPropagate._unmanaged]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Runtime.InteropServices.Marshalling", "IIUnknownStrategy", True, "CreateInstancePointer", "(System.Void*)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Runtime.InteropServices.Marshalling", "PointerArrayMarshaller<T,TUnmanagedElement>+ManagedToUnmanagedIn", False, "FromManaged", "(T*[],System.Span<TUnmanagedElement>)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
       - ["System.Runtime.InteropServices.Marshalling", "PointerArrayMarshaller<T,TUnmanagedElement>+ManagedToUnmanagedIn", False, "FromManaged", "(T*[],System.Span<TUnmanagedElement>)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
       - ["System.Runtime.InteropServices.Marshalling", "PointerArrayMarshaller<T,TUnmanagedElement>+ManagedToUnmanagedIn", False, "GetUnmanagedValuesDestination", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Runtime.InteropServices.Marshalling", "ReadOnlySpanMarshaller<T,TUnmanagedElement>+ManagedToUnmanagedIn", False, "FromManaged", "(System.ReadOnlySpan<T>,System.Span<TUnmanagedElement>)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Runtime.InteropServices.Marshalling", "ReadOnlySpanMarshaller<T,TUnmanagedElement>+ManagedToUnmanagedIn", False, "FromManaged", "(System.ReadOnlySpan<T>,System.Span<TUnmanagedElement>)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Runtime.InteropServices.Marshalling", "ReadOnlySpanMarshaller<T,TUnmanagedElement>+ManagedToUnmanagedIn", False, "GetManagedValuesSource", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Runtime.InteropServices.Marshalling", "ReadOnlySpanMarshaller<T,TUnmanagedElement>+ManagedToUnmanagedIn", False, "FromManaged", "(System.ReadOnlySpan<T>,System.Span<TUnmanagedElement>)", "", "Argument[0]", "Argument[this].SyntheticField[System.Runtime.InteropServices.Marshalling.ReadOnlySpanMarshaller`2+ManagedToUnmanagedIn._managedArray]", "value", "dfc-generated"]
+      - ["System.Runtime.InteropServices.Marshalling", "ReadOnlySpanMarshaller<T,TUnmanagedElement>+ManagedToUnmanagedIn", False, "GetManagedValuesSource", "()", "", "Argument[this].SyntheticField[System.Runtime.InteropServices.Marshalling.ReadOnlySpanMarshaller`2+ManagedToUnmanagedIn._managedArray]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Runtime.InteropServices.Marshalling", "ReadOnlySpanMarshaller<T,TUnmanagedElement>+ManagedToUnmanagedIn", False, "GetUnmanagedValuesDestination", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Runtime.InteropServices.Marshalling", "ReadOnlySpanMarshaller<T,TUnmanagedElement>+UnmanagedToManagedOut", False, "GetManagedValuesSource", "(System.ReadOnlySpan<T>)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Runtime.InteropServices.Marshalling", "SafeHandleMarshaller<T>+ManagedToUnmanagedIn", False, "FromManaged", "(T)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Runtime.InteropServices.Marshalling", "SafeHandleMarshaller<T>+ManagedToUnmanagedIn", False, "ToUnmanaged", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Runtime.InteropServices.Marshalling", "SafeHandleMarshaller<T>+ManagedToUnmanagedOut", False, "FromUnmanaged", "(System.IntPtr)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Runtime.InteropServices.Marshalling", "SafeHandleMarshaller<T>+ManagedToUnmanagedOut", False, "ToManaged", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Runtime.InteropServices.Marshalling", "SafeHandleMarshaller<T>+ManagedToUnmanagedRef", False, "FromManaged", "(T)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Runtime.InteropServices.Marshalling", "SafeHandleMarshaller<T>+ManagedToUnmanagedRef", False, "FromUnmanaged", "(System.IntPtr)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Runtime.InteropServices.Marshalling", "SafeHandleMarshaller<T>+ManagedToUnmanagedRef", False, "ToManagedFinally", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Runtime.InteropServices.Marshalling", "SafeHandleMarshaller<T>+ManagedToUnmanagedRef", False, "ToUnmanaged", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Runtime.InteropServices.Marshalling", "ReadOnlySpanMarshaller<T,TUnmanagedElement>+UnmanagedToManagedOut", False, "GetManagedValuesSource", "(System.ReadOnlySpan<T>)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Runtime.InteropServices.Marshalling", "SafeHandleMarshaller<T>+ManagedToUnmanagedIn", False, "FromManaged", "(T)", "", "Argument[0]", "Argument[this].SyntheticField[System.Runtime.InteropServices.Marshalling.SafeHandleMarshaller`1+ManagedToUnmanagedIn._handle]", "value", "dfc-generated"]
+      - ["System.Runtime.InteropServices.Marshalling", "SafeHandleMarshaller<T>+ManagedToUnmanagedIn", False, "ToUnmanaged", "()", "", "Argument[this].SyntheticField[System.Runtime.InteropServices.Marshalling.SafeHandleMarshaller`1+ManagedToUnmanagedIn._handle].Field[System.Runtime.InteropServices.SafeHandle.handle]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Runtime.InteropServices.Marshalling", "SafeHandleMarshaller<T>+ManagedToUnmanagedOut", False, "FromUnmanaged", "(System.IntPtr)", "", "Argument[0]", "Argument[this].SyntheticField[System.Runtime.InteropServices.Marshalling.SafeHandleMarshaller`1+ManagedToUnmanagedOut._newHandle].Field[System.Runtime.InteropServices.SafeHandle.handle]", "value", "dfc-generated"]
+      - ["System.Runtime.InteropServices.Marshalling", "SafeHandleMarshaller<T>+ManagedToUnmanagedOut", False, "ToManaged", "()", "", "Argument[this].SyntheticField[System.Runtime.InteropServices.Marshalling.SafeHandleMarshaller`1+ManagedToUnmanagedOut._newHandle]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Runtime.InteropServices.Marshalling", "SafeHandleMarshaller<T>+ManagedToUnmanagedRef", False, "FromManaged", "(T)", "", "Argument[0].Field[System.Runtime.InteropServices.SafeHandle.handle]", "Argument[this].SyntheticField[System.Runtime.InteropServices.Marshalling.SafeHandleMarshaller`1+ManagedToUnmanagedRef._originalHandleValue]", "value", "dfc-generated"]
+      - ["System.Runtime.InteropServices.Marshalling", "SafeHandleMarshaller<T>+ManagedToUnmanagedRef", False, "FromManaged", "(T)", "", "Argument[0]", "Argument[this].SyntheticField[System.Runtime.InteropServices.Marshalling.SafeHandleMarshaller`1+ManagedToUnmanagedRef._handle]", "value", "dfc-generated"]
+      - ["System.Runtime.InteropServices.Marshalling", "SafeHandleMarshaller<T>+ManagedToUnmanagedRef", False, "FromUnmanaged", "(System.IntPtr)", "", "Argument[0]", "Argument[this].SyntheticField[System.Runtime.InteropServices.Marshalling.SafeHandleMarshaller`1+ManagedToUnmanagedRef._handleToReturn].Field[System.Runtime.InteropServices.SafeHandle.handle]", "value", "dfc-generated"]
+      - ["System.Runtime.InteropServices.Marshalling", "SafeHandleMarshaller<T>+ManagedToUnmanagedRef", False, "FromUnmanaged", "(System.IntPtr)", "", "Argument[0]", "Argument[this].SyntheticField[System.Runtime.InteropServices.Marshalling.SafeHandleMarshaller`1+ManagedToUnmanagedRef._newHandle].Field[System.Runtime.InteropServices.SafeHandle.handle]", "value", "dfc-generated"]
+      - ["System.Runtime.InteropServices.Marshalling", "SafeHandleMarshaller<T>+ManagedToUnmanagedRef", False, "FromUnmanaged", "(System.IntPtr)", "", "Argument[this].SyntheticField[System.Runtime.InteropServices.Marshalling.SafeHandleMarshaller`1+ManagedToUnmanagedRef._handle]", "Argument[this].SyntheticField[System.Runtime.InteropServices.Marshalling.SafeHandleMarshaller`1+ManagedToUnmanagedRef._handleToReturn]", "value", "dfc-generated"]
+      - ["System.Runtime.InteropServices.Marshalling", "SafeHandleMarshaller<T>+ManagedToUnmanagedRef", False, "FromUnmanaged", "(System.IntPtr)", "", "Argument[this].SyntheticField[System.Runtime.InteropServices.Marshalling.SafeHandleMarshaller`1+ManagedToUnmanagedRef._newHandle]", "Argument[this].SyntheticField[System.Runtime.InteropServices.Marshalling.SafeHandleMarshaller`1+ManagedToUnmanagedRef._handleToReturn]", "value", "dfc-generated"]
+      - ["System.Runtime.InteropServices.Marshalling", "SafeHandleMarshaller<T>+ManagedToUnmanagedRef", False, "ToManagedFinally", "()", "", "Argument[this].SyntheticField[System.Runtime.InteropServices.Marshalling.SafeHandleMarshaller`1+ManagedToUnmanagedRef._handleToReturn]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Runtime.InteropServices.Marshalling", "SafeHandleMarshaller<T>+ManagedToUnmanagedRef", False, "ToUnmanaged", "()", "", "Argument[this].SyntheticField[System.Runtime.InteropServices.Marshalling.SafeHandleMarshaller`1+ManagedToUnmanagedRef._originalHandleValue]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Runtime.InteropServices.Marshalling", "SpanMarshaller<T,TUnmanagedElement>+ManagedToUnmanagedIn", False, "FromManaged", "(System.Span<T>,System.Span<TUnmanagedElement>)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Runtime.InteropServices.Marshalling", "SpanMarshaller<T,TUnmanagedElement>+ManagedToUnmanagedIn", False, "FromManaged", "(System.Span<T>,System.Span<TUnmanagedElement>)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
       - ["System.Runtime.InteropServices.Marshalling", "SpanMarshaller<T,TUnmanagedElement>+ManagedToUnmanagedIn", False, "GetUnmanagedValuesDestination", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Runtime.InteropServices.Marshalling", "SpanMarshaller<T,TUnmanagedElement>", False, "GetManagedValuesDestination", "(System.Span<T>)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Runtime.InteropServices.Marshalling", "SpanMarshaller<T,TUnmanagedElement>", False, "GetManagedValuesDestination", "(System.Span<T>)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Runtime.InteropServices.Marshalling", "Utf8StringMarshaller+ManagedToUnmanagedIn", False, "ToUnmanaged", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Runtime.InteropServices.Marshalling", "VirtualMethodTableInfo", False, "Deconstruct", "(System.Void*,System.Void**)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Runtime.InteropServices.Marshalling", "VirtualMethodTableInfo", False, "Deconstruct", "(System.Void*,System.Void**)", "", "Argument[this].Property[System.Runtime.InteropServices.Marshalling.VirtualMethodTableInfo.ThisPointer]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Runtime.InteropServices.Marshalling", "VirtualMethodTableInfo", False, "Deconstruct", "(System.Void*,System.Void**)", "", "Argument[this].Property[System.Runtime.InteropServices.Marshalling.VirtualMethodTableInfo.VirtualMethodTable]", "ReturnValue", "value", "dfc-generated"]
   - addsTo:
       pack: codeql/csharp-all
       extensible: neutralModel
diff --git a/csharp/ql/lib/ext/generated/System.Runtime.InteropServices.ObjectiveC.model.yml b/csharp/ql/lib/ext/generated/System.Runtime.InteropServices.ObjectiveC.model.yml
index 02f33a0a416..5541827dca2 100644
--- a/csharp/ql/lib/ext/generated/System.Runtime.InteropServices.ObjectiveC.model.yml
+++ b/csharp/ql/lib/ext/generated/System.Runtime.InteropServices.ObjectiveC.model.yml
@@ -5,5 +5,6 @@ extensions:
       extensible: neutralModel
     data:
       - ["System.Runtime.InteropServices.ObjectiveC", "ObjectiveCMarshal", "CreateReferenceTrackingHandle", "(System.Object,System.Span<System.IntPtr>)", "summary", "df-generated"]
+      - ["System.Runtime.InteropServices.ObjectiveC", "ObjectiveCMarshal", "Initialize", "(System.Runtime.InteropServices.ObjectiveC.ObjectiveCMarshal+UnhandledExceptionPropagationHandler)", "summary", "df-generated"]
       - ["System.Runtime.InteropServices.ObjectiveC", "ObjectiveCMarshal", "SetMessageSendCallback", "(System.Runtime.InteropServices.ObjectiveC.ObjectiveCMarshal+MessageSendFunction,System.IntPtr)", "summary", "df-generated"]
       - ["System.Runtime.InteropServices.ObjectiveC", "ObjectiveCMarshal", "SetMessageSendPendingException", "(System.Exception)", "summary", "df-generated"]
diff --git a/csharp/ql/lib/ext/generated/System.Runtime.InteropServices.model.yml b/csharp/ql/lib/ext/generated/System.Runtime.InteropServices.model.yml
index 5a631539aed..7934e8a4c0e 100644
--- a/csharp/ql/lib/ext/generated/System.Runtime.InteropServices.model.yml
+++ b/csharp/ql/lib/ext/generated/System.Runtime.InteropServices.model.yml
@@ -4,43 +4,45 @@ extensions:
       pack: codeql/csharp-all
       extensible: summaryModel
     data:
-      - ["System.Runtime.InteropServices", "ArrayWithOffset", False, "ArrayWithOffset", "(System.Object,System.Int32)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Runtime.InteropServices", "ArrayWithOffset", False, "GetArray", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Runtime.InteropServices", "CLong", False, "CLong", "(System.IntPtr)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Runtime.InteropServices", "CLong", False, "get_Value", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Runtime.InteropServices", "CULong", False, "CULong", "(System.UIntPtr)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Runtime.InteropServices", "CULong", False, "get_Value", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Runtime.InteropServices", "ArrayWithOffset", False, "ArrayWithOffset", "(System.Object,System.Int32)", "", "Argument[0]", "Argument[this].SyntheticField[System.Runtime.InteropServices.ArrayWithOffset.m_array]", "value", "dfc-generated"]
+      - ["System.Runtime.InteropServices", "ArrayWithOffset", False, "GetArray", "()", "", "Argument[this].SyntheticField[System.Runtime.InteropServices.ArrayWithOffset.m_array]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Runtime.InteropServices", "CLong", False, "CLong", "(System.IntPtr)", "", "Argument[0]", "Argument[this].SyntheticField[System.Runtime.InteropServices.CLong._value]", "value", "dfc-generated"]
+      - ["System.Runtime.InteropServices", "CLong", False, "get_Value", "()", "", "Argument[this].SyntheticField[System.Runtime.InteropServices.CLong._value]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Runtime.InteropServices", "CULong", False, "CULong", "(System.UIntPtr)", "", "Argument[0]", "Argument[this].SyntheticField[System.Runtime.InteropServices.CULong._value]", "value", "dfc-generated"]
+      - ["System.Runtime.InteropServices", "CULong", False, "get_Value", "()", "", "Argument[this].SyntheticField[System.Runtime.InteropServices.CULong._value]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Runtime.InteropServices", "CollectionsMarshal", False, "AsSpan<T>", "(System.Collections.Generic.List<T>)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["System.Runtime.InteropServices", "CriticalHandle", False, "CriticalHandle", "(System.IntPtr)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Runtime.InteropServices", "CriticalHandle", False, "SetHandle", "(System.IntPtr)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Runtime.InteropServices", "GCHandle", False, "FromIntPtr", "(System.IntPtr)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Runtime.InteropServices", "GCHandle", False, "ToIntPtr", "(System.Runtime.InteropServices.GCHandle)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Runtime.InteropServices", "HandleRef", False, "HandleRef", "(System.Object,System.IntPtr)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Runtime.InteropServices", "HandleRef", False, "HandleRef", "(System.Object,System.IntPtr)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Runtime.InteropServices", "HandleRef", False, "ToIntPtr", "(System.Runtime.InteropServices.HandleRef)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Runtime.InteropServices", "HandleRef", False, "get_Handle", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Runtime.InteropServices", "HandleRef", False, "get_Wrapper", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Runtime.InteropServices", "CriticalHandle", False, "CriticalHandle", "(System.IntPtr)", "", "Argument[0]", "Argument[this].Field[System.Runtime.InteropServices.CriticalHandle.handle]", "value", "dfc-generated"]
+      - ["System.Runtime.InteropServices", "CriticalHandle", False, "SetHandle", "(System.IntPtr)", "", "Argument[0]", "Argument[this].Field[System.Runtime.InteropServices.CriticalHandle.handle]", "value", "dfc-generated"]
+      - ["System.Runtime.InteropServices", "GCHandle", False, "FromIntPtr", "(System.IntPtr)", "", "Argument[0]", "ReturnValue.SyntheticField[System.Runtime.InteropServices.GCHandle._handle]", "value", "dfc-generated"]
+      - ["System.Runtime.InteropServices", "GCHandle", False, "ToIntPtr", "(System.Runtime.InteropServices.GCHandle)", "", "Argument[0].SyntheticField[System.Runtime.InteropServices.GCHandle._handle]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Runtime.InteropServices", "HandleRef", False, "HandleRef", "(System.Object,System.IntPtr)", "", "Argument[0]", "Argument[this].SyntheticField[System.Runtime.InteropServices.HandleRef._wrapper]", "value", "dfc-generated"]
+      - ["System.Runtime.InteropServices", "HandleRef", False, "HandleRef", "(System.Object,System.IntPtr)", "", "Argument[1]", "Argument[this].SyntheticField[System.Runtime.InteropServices.HandleRef._handle]", "value", "dfc-generated"]
+      - ["System.Runtime.InteropServices", "HandleRef", False, "ToIntPtr", "(System.Runtime.InteropServices.HandleRef)", "", "Argument[0].SyntheticField[System.Runtime.InteropServices.HandleRef._handle]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Runtime.InteropServices", "HandleRef", False, "get_Handle", "()", "", "Argument[this].SyntheticField[System.Runtime.InteropServices.HandleRef._handle]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Runtime.InteropServices", "HandleRef", False, "get_Wrapper", "()", "", "Argument[this].SyntheticField[System.Runtime.InteropServices.HandleRef._wrapper]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Runtime.InteropServices", "ImmutableCollectionsMarshal", False, "AsArray<T>", "(System.Collections.Immutable.ImmutableArray<T>)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
       - ["System.Runtime.InteropServices", "ImmutableCollectionsMarshal", False, "AsImmutableArray<T>", "(T[])", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["System.Runtime.InteropServices", "Marshal", False, "InitHandle", "(System.Runtime.InteropServices.SafeHandle,System.IntPtr)", "", "Argument[1]", "Argument[0]", "taint", "df-generated"]
+      - ["System.Runtime.InteropServices", "Marshal", False, "InitHandle", "(System.Runtime.InteropServices.SafeHandle,System.IntPtr)", "", "Argument[1]", "Argument[0].Field[System.Runtime.InteropServices.SafeHandle.handle]", "value", "dfc-generated"]
       - ["System.Runtime.InteropServices", "MemoryMarshal", False, "CreateFromPinnedArray<T>", "(T[],System.Int32,System.Int32)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["System.Runtime.InteropServices", "MemoryMarshal", False, "ToEnumerable<T>", "(System.ReadOnlyMemory<T>)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Runtime.InteropServices", "MemoryMarshal", False, "CreateSpan<T>", "(T,System.Int32)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Runtime.InteropServices", "MemoryMarshal", False, "ToEnumerable<T>", "(System.ReadOnlyMemory<T>)", "", "Argument[0].Property[System.ReadOnlyMemory`1.Span].Element", "ReturnValue.Element", "value", "dfc-generated"]
       - ["System.Runtime.InteropServices", "MemoryMarshal", False, "TryGetMemoryManager<T,TManager>", "(System.ReadOnlyMemory<T>,TManager)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["System.Runtime.InteropServices", "MemoryMarshal", False, "TryGetMemoryManager<T,TManager>", "(System.ReadOnlyMemory<T>,TManager,System.Int32,System.Int32)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Runtime.InteropServices", "MemoryMarshal", False, "TryGetString", "(System.ReadOnlyMemory<System.Char>,System.String,System.Int32,System.Int32)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Runtime.InteropServices", "NFloat", False, "CreateChecked<TOther>", "(TOther)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Runtime.InteropServices", "NFloat", False, "CreateSaturating<TOther>", "(TOther)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Runtime.InteropServices", "NFloat", False, "CreateTruncating<TOther>", "(TOther)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Runtime.InteropServices", "MemoryMarshal", False, "TryGetString", "(System.ReadOnlyMemory<System.Char>,System.String,System.Int32,System.Int32)", "", "Argument[0].SyntheticField[System.ReadOnlyMemory`1._object]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Runtime.InteropServices", "NFloat", False, "CreateChecked<TOther>", "(TOther)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Runtime.InteropServices", "NFloat", False, "CreateSaturating<TOther>", "(TOther)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Runtime.InteropServices", "NFloat", False, "CreateTruncating<TOther>", "(TOther)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Runtime.InteropServices", "NFloat", False, "ToString", "(System.IFormatProvider)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Runtime.InteropServices", "NFloat", False, "op_UnaryPlus", "(System.Runtime.InteropServices.NFloat)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Runtime.InteropServices", "OSPlatform", False, "Create", "(System.String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Runtime.InteropServices", "OSPlatform", False, "ToString", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Runtime.InteropServices", "SafeHandle", False, "DangerousGetHandle", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Runtime.InteropServices", "SafeHandle", False, "SafeHandle", "(System.IntPtr,System.Boolean)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Runtime.InteropServices", "SafeHandle", False, "SetHandle", "(System.IntPtr)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Runtime.InteropServices", "SequenceMarshal", False, "TryGetArray<T>", "(System.Buffers.ReadOnlySequence<T>,System.ArraySegment<T>)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Runtime.InteropServices", "SequenceMarshal", False, "TryGetReadOnlyMemory<T>", "(System.Buffers.ReadOnlySequence<T>,System.ReadOnlyMemory<T>)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Runtime.InteropServices", "NFloat", False, "op_UnaryPlus", "(System.Runtime.InteropServices.NFloat)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Runtime.InteropServices", "OSPlatform", False, "Create", "(System.String)", "", "Argument[0]", "ReturnValue.SyntheticField[System.Runtime.InteropServices.OSPlatform.Name]", "value", "dfc-generated"]
+      - ["System.Runtime.InteropServices", "OSPlatform", False, "ToString", "()", "", "Argument[this].SyntheticField[System.Runtime.InteropServices.OSPlatform.Name]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Runtime.InteropServices", "SafeBuffer", False, "AcquirePointer", "(System.Byte*)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Runtime.InteropServices", "SafeHandle", False, "DangerousGetHandle", "()", "", "Argument[this].Field[System.Runtime.InteropServices.SafeHandle.handle]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Runtime.InteropServices", "SafeHandle", False, "SafeHandle", "(System.IntPtr,System.Boolean)", "", "Argument[0]", "Argument[this].Field[System.Runtime.InteropServices.SafeHandle.handle]", "value", "dfc-generated"]
+      - ["System.Runtime.InteropServices", "SafeHandle", False, "SetHandle", "(System.IntPtr)", "", "Argument[0]", "Argument[this].Field[System.Runtime.InteropServices.SafeHandle.handle]", "value", "dfc-generated"]
+      - ["System.Runtime.InteropServices", "SequenceMarshal", False, "TryGetReadOnlyMemory<T>", "(System.Buffers.ReadOnlySequence<T>,System.ReadOnlyMemory<T>)", "", "Argument[0].Property[System.Buffers.ReadOnlySequence`1.First]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Runtime.InteropServices", "SequenceMarshal", False, "TryGetReadOnlySequenceSegment<T>", "(System.Buffers.ReadOnlySequence<T>,System.Buffers.ReadOnlySequenceSegment<T>,System.Int32,System.Buffers.ReadOnlySequenceSegment<T>,System.Int32)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Runtime.InteropServices", "SequenceMarshal", False, "TryRead<T>", "(System.Buffers.SequenceReader<System.Byte>,T)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
   - addsTo:
       pack: codeql/csharp-all
       extensible: neutralModel
@@ -84,6 +86,7 @@ extensions:
       - ["System.Runtime.InteropServices", "ComAliasNameAttribute", "get_Value", "()", "summary", "df-generated"]
       - ["System.Runtime.InteropServices", "ComAwareEventInfo", "AddEventHandler", "(System.Object,System.Delegate)", "summary", "df-generated"]
       - ["System.Runtime.InteropServices", "ComAwareEventInfo", "ComAwareEventInfo", "(System.Type,System.String)", "summary", "df-generated"]
+      - ["System.Runtime.InteropServices", "ComAwareEventInfo", "GetCustomAttributes", "(System.Boolean)", "summary", "df-generated"]
       - ["System.Runtime.InteropServices", "ComAwareEventInfo", "GetCustomAttributes", "(System.Type,System.Boolean)", "summary", "df-generated"]
       - ["System.Runtime.InteropServices", "ComAwareEventInfo", "GetCustomAttributesData", "()", "summary", "df-generated"]
       - ["System.Runtime.InteropServices", "ComAwareEventInfo", "GetOtherMethods", "(System.Boolean)", "summary", "df-generated"]
@@ -381,7 +384,6 @@ extensions:
       - ["System.Runtime.InteropServices", "MemoryMarshal", "CreateReadOnlySpan<T>", "(T,System.Int32)", "summary", "df-generated"]
       - ["System.Runtime.InteropServices", "MemoryMarshal", "CreateReadOnlySpanFromNullTerminated", "(System.Byte*)", "summary", "df-generated"]
       - ["System.Runtime.InteropServices", "MemoryMarshal", "CreateReadOnlySpanFromNullTerminated", "(System.Char*)", "summary", "df-generated"]
-      - ["System.Runtime.InteropServices", "MemoryMarshal", "CreateSpan<T>", "(T,System.Int32)", "summary", "df-generated"]
       - ["System.Runtime.InteropServices", "MemoryMarshal", "GetArrayDataReference", "(System.Array)", "summary", "df-generated"]
       - ["System.Runtime.InteropServices", "MemoryMarshal", "GetArrayDataReference<T>", "(T[])", "summary", "df-generated"]
       - ["System.Runtime.InteropServices", "MemoryMarshal", "GetReference<T>", "(System.ReadOnlySpan<T>)", "summary", "df-generated"]
@@ -570,6 +572,7 @@ extensions:
       - ["System.Runtime.InteropServices", "NativeLibrary", "GetMainProgramHandle", "()", "summary", "df-generated"]
       - ["System.Runtime.InteropServices", "NativeLibrary", "Load", "(System.String)", "summary", "df-generated"]
       - ["System.Runtime.InteropServices", "NativeLibrary", "Load", "(System.String,System.Reflection.Assembly,System.Nullable<System.Runtime.InteropServices.DllImportSearchPath>)", "summary", "df-generated"]
+      - ["System.Runtime.InteropServices", "NativeLibrary", "SetDllImportResolver", "(System.Reflection.Assembly,System.Runtime.InteropServices.DllImportResolver)", "summary", "df-generated"]
       - ["System.Runtime.InteropServices", "NativeLibrary", "TryGetExport", "(System.IntPtr,System.String,System.IntPtr)", "summary", "df-generated"]
       - ["System.Runtime.InteropServices", "NativeLibrary", "TryLoad", "(System.String,System.IntPtr)", "summary", "df-generated"]
       - ["System.Runtime.InteropServices", "NativeLibrary", "TryLoad", "(System.String,System.Reflection.Assembly,System.Nullable<System.Runtime.InteropServices.DllImportSearchPath>,System.IntPtr)", "summary", "df-generated"]
@@ -595,6 +598,7 @@ extensions:
       - ["System.Runtime.InteropServices", "OSPlatform", "op_Equality", "(System.Runtime.InteropServices.OSPlatform,System.Runtime.InteropServices.OSPlatform)", "summary", "df-generated"]
       - ["System.Runtime.InteropServices", "OSPlatform", "op_Inequality", "(System.Runtime.InteropServices.OSPlatform,System.Runtime.InteropServices.OSPlatform)", "summary", "df-generated"]
       - ["System.Runtime.InteropServices", "PosixSignalContext", "PosixSignalContext", "(System.Runtime.InteropServices.PosixSignal)", "summary", "df-generated"]
+      - ["System.Runtime.InteropServices", "PosixSignalRegistration", "Create", "(System.Runtime.InteropServices.PosixSignal,System.Action<System.Runtime.InteropServices.PosixSignalContext>)", "summary", "df-generated"]
       - ["System.Runtime.InteropServices", "PosixSignalRegistration", "Dispose", "()", "summary", "df-generated"]
       - ["System.Runtime.InteropServices", "PrimaryInteropAssemblyAttribute", "PrimaryInteropAssemblyAttribute", "(System.Int32,System.Int32)", "summary", "df-generated"]
       - ["System.Runtime.InteropServices", "PrimaryInteropAssemblyAttribute", "get_MajorVersion", "()", "summary", "df-generated"]
@@ -623,7 +627,6 @@ extensions:
       - ["System.Runtime.InteropServices", "SafeArrayTypeMismatchException", "SafeArrayTypeMismatchException", "(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)", "summary", "df-generated"]
       - ["System.Runtime.InteropServices", "SafeArrayTypeMismatchException", "SafeArrayTypeMismatchException", "(System.String)", "summary", "df-generated"]
       - ["System.Runtime.InteropServices", "SafeArrayTypeMismatchException", "SafeArrayTypeMismatchException", "(System.String,System.Exception)", "summary", "df-generated"]
-      - ["System.Runtime.InteropServices", "SafeBuffer", "AcquirePointer", "(System.Byte*)", "summary", "df-generated"]
       - ["System.Runtime.InteropServices", "SafeBuffer", "Initialize", "(System.UInt32,System.UInt32)", "summary", "df-generated"]
       - ["System.Runtime.InteropServices", "SafeBuffer", "Initialize", "(System.UInt64)", "summary", "df-generated"]
       - ["System.Runtime.InteropServices", "SafeBuffer", "Initialize<T>", "(System.UInt32)", "summary", "df-generated"]
@@ -645,7 +648,7 @@ extensions:
       - ["System.Runtime.InteropServices", "SafeHandle", "SetHandleAsInvalid", "()", "summary", "df-generated"]
       - ["System.Runtime.InteropServices", "SafeHandle", "get_IsClosed", "()", "summary", "df-generated"]
       - ["System.Runtime.InteropServices", "SafeHandle", "get_IsInvalid", "()", "summary", "df-generated"]
-      - ["System.Runtime.InteropServices", "SequenceMarshal", "TryRead<T>", "(System.Buffers.SequenceReader<System.Byte>,T)", "summary", "df-generated"]
+      - ["System.Runtime.InteropServices", "SequenceMarshal", "TryGetArray<T>", "(System.Buffers.ReadOnlySequence<T>,System.ArraySegment<T>)", "summary", "df-generated"]
       - ["System.Runtime.InteropServices", "StructLayoutAttribute", "StructLayoutAttribute", "(System.Int16)", "summary", "df-generated"]
       - ["System.Runtime.InteropServices", "StructLayoutAttribute", "StructLayoutAttribute", "(System.Runtime.InteropServices.LayoutKind)", "summary", "df-generated"]
       - ["System.Runtime.InteropServices", "StructLayoutAttribute", "get_Value", "()", "summary", "df-generated"]
diff --git a/csharp/ql/lib/ext/generated/System.Runtime.Intrinsics.model.yml b/csharp/ql/lib/ext/generated/System.Runtime.Intrinsics.model.yml
index a2be64a441a..4e6658c2762 100644
--- a/csharp/ql/lib/ext/generated/System.Runtime.Intrinsics.model.yml
+++ b/csharp/ql/lib/ext/generated/System.Runtime.Intrinsics.model.yml
@@ -6,29 +6,33 @@ extensions:
     data:
       - ["System.Runtime.Intrinsics", "Vector128", False, "GetLower<T>", "(System.Runtime.Intrinsics.Vector128<T>)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["System.Runtime.Intrinsics", "Vector128", False, "GetUpper<T>", "(System.Runtime.Intrinsics.Vector128<T>)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Runtime.Intrinsics", "Vector128", False, "WithElement<T>", "(System.Runtime.Intrinsics.Vector128<T>,System.Int32,T)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Runtime.Intrinsics", "Vector128", False, "WithLower<T>", "(System.Runtime.Intrinsics.Vector128<T>,System.Runtime.Intrinsics.Vector64<T>)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Runtime.Intrinsics", "Vector128", False, "WithUpper<T>", "(System.Runtime.Intrinsics.Vector128<T>,System.Runtime.Intrinsics.Vector64<T>)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Runtime.Intrinsics", "Vector128<T>", False, "op_UnaryPlus", "(System.Runtime.Intrinsics.Vector128<T>)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Runtime.Intrinsics", "Vector128", False, "StoreUnsafe<T>", "(System.Runtime.Intrinsics.Vector128<T>,T)", "", "Argument[1]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Runtime.Intrinsics", "Vector128", False, "WithElement<T>", "(System.Runtime.Intrinsics.Vector128<T>,System.Int32,T)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Runtime.Intrinsics", "Vector128", False, "WithLower<T>", "(System.Runtime.Intrinsics.Vector128<T>,System.Runtime.Intrinsics.Vector64<T>)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Runtime.Intrinsics", "Vector128", False, "WithUpper<T>", "(System.Runtime.Intrinsics.Vector128<T>,System.Runtime.Intrinsics.Vector64<T>)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Runtime.Intrinsics", "Vector128<T>", False, "op_UnaryPlus", "(System.Runtime.Intrinsics.Vector128<T>)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Runtime.Intrinsics", "Vector256", False, "GetLower<T>", "(System.Runtime.Intrinsics.Vector256<T>)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["System.Runtime.Intrinsics", "Vector256", False, "GetUpper<T>", "(System.Runtime.Intrinsics.Vector256<T>)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Runtime.Intrinsics", "Vector256", False, "WithElement<T>", "(System.Runtime.Intrinsics.Vector256<T>,System.Int32,T)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Runtime.Intrinsics", "Vector256", False, "WithLower<T>", "(System.Runtime.Intrinsics.Vector256<T>,System.Runtime.Intrinsics.Vector128<T>)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Runtime.Intrinsics", "Vector256", False, "WithUpper<T>", "(System.Runtime.Intrinsics.Vector256<T>,System.Runtime.Intrinsics.Vector128<T>)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Runtime.Intrinsics", "Vector256<T>", False, "op_UnaryPlus", "(System.Runtime.Intrinsics.Vector256<T>)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Runtime.Intrinsics", "Vector256", False, "StoreUnsafe<T>", "(System.Runtime.Intrinsics.Vector256<T>,T)", "", "Argument[1]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Runtime.Intrinsics", "Vector256", False, "WithElement<T>", "(System.Runtime.Intrinsics.Vector256<T>,System.Int32,T)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Runtime.Intrinsics", "Vector256", False, "WithLower<T>", "(System.Runtime.Intrinsics.Vector256<T>,System.Runtime.Intrinsics.Vector128<T>)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Runtime.Intrinsics", "Vector256", False, "WithUpper<T>", "(System.Runtime.Intrinsics.Vector256<T>,System.Runtime.Intrinsics.Vector128<T>)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Runtime.Intrinsics", "Vector256<T>", False, "op_UnaryPlus", "(System.Runtime.Intrinsics.Vector256<T>)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Runtime.Intrinsics", "Vector512", False, "GetLower<T>", "(System.Runtime.Intrinsics.Vector512<T>)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["System.Runtime.Intrinsics", "Vector512", False, "GetUpper<T>", "(System.Runtime.Intrinsics.Vector512<T>)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Runtime.Intrinsics", "Vector512", False, "WithElement<T>", "(System.Runtime.Intrinsics.Vector512<T>,System.Int32,T)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Runtime.Intrinsics", "Vector512", False, "WithLower<T>", "(System.Runtime.Intrinsics.Vector512<T>,System.Runtime.Intrinsics.Vector256<T>)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Runtime.Intrinsics", "Vector512", False, "WithUpper<T>", "(System.Runtime.Intrinsics.Vector512<T>,System.Runtime.Intrinsics.Vector256<T>)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Runtime.Intrinsics", "Vector512<T>", False, "op_UnaryPlus", "(System.Runtime.Intrinsics.Vector512<T>)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Runtime.Intrinsics", "Vector64", False, "Abs<T>", "(System.Runtime.Intrinsics.Vector64<T>)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Runtime.Intrinsics", "Vector64", False, "Ceiling", "(System.Runtime.Intrinsics.Vector64<System.Double>)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Runtime.Intrinsics", "Vector64", False, "Ceiling", "(System.Runtime.Intrinsics.Vector64<System.Single>)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Runtime.Intrinsics", "Vector64", False, "Floor", "(System.Runtime.Intrinsics.Vector64<System.Double>)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Runtime.Intrinsics", "Vector64", False, "Floor", "(System.Runtime.Intrinsics.Vector64<System.Single>)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Runtime.Intrinsics", "Vector64", False, "WithElement<T>", "(System.Runtime.Intrinsics.Vector64<T>,System.Int32,T)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Runtime.Intrinsics", "Vector64<T>", False, "op_UnaryPlus", "(System.Runtime.Intrinsics.Vector64<T>)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Runtime.Intrinsics", "Vector512", False, "StoreUnsafe<T>", "(System.Runtime.Intrinsics.Vector512<T>,T)", "", "Argument[1]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Runtime.Intrinsics", "Vector512", False, "WithElement<T>", "(System.Runtime.Intrinsics.Vector512<T>,System.Int32,T)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Runtime.Intrinsics", "Vector512", False, "WithLower<T>", "(System.Runtime.Intrinsics.Vector512<T>,System.Runtime.Intrinsics.Vector256<T>)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Runtime.Intrinsics", "Vector512", False, "WithUpper<T>", "(System.Runtime.Intrinsics.Vector512<T>,System.Runtime.Intrinsics.Vector256<T>)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Runtime.Intrinsics", "Vector512<T>", False, "op_UnaryPlus", "(System.Runtime.Intrinsics.Vector512<T>)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Runtime.Intrinsics", "Vector64", False, "Abs<T>", "(System.Runtime.Intrinsics.Vector64<T>)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Runtime.Intrinsics", "Vector64", False, "Ceiling", "(System.Runtime.Intrinsics.Vector64<System.Double>)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Runtime.Intrinsics", "Vector64", False, "Ceiling", "(System.Runtime.Intrinsics.Vector64<System.Single>)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Runtime.Intrinsics", "Vector64", False, "Floor", "(System.Runtime.Intrinsics.Vector64<System.Double>)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Runtime.Intrinsics", "Vector64", False, "Floor", "(System.Runtime.Intrinsics.Vector64<System.Single>)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Runtime.Intrinsics", "Vector64", False, "StoreUnsafe<T>", "(System.Runtime.Intrinsics.Vector64<T>,T)", "", "Argument[1]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Runtime.Intrinsics", "Vector64", False, "WithElement<T>", "(System.Runtime.Intrinsics.Vector64<T>,System.Int32,T)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Runtime.Intrinsics", "Vector64<T>", False, "op_UnaryPlus", "(System.Runtime.Intrinsics.Vector64<T>)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
   - addsTo:
       pack: codeql/csharp-all
       extensible: neutralModel
@@ -218,7 +222,6 @@ extensions:
       - ["System.Runtime.Intrinsics", "Vector128", "Store<T>", "(System.Runtime.Intrinsics.Vector128<T>,T*)", "summary", "df-generated"]
       - ["System.Runtime.Intrinsics", "Vector128", "StoreAligned<T>", "(System.Runtime.Intrinsics.Vector128<T>,T*)", "summary", "df-generated"]
       - ["System.Runtime.Intrinsics", "Vector128", "StoreAlignedNonTemporal<T>", "(System.Runtime.Intrinsics.Vector128<T>,T*)", "summary", "df-generated"]
-      - ["System.Runtime.Intrinsics", "Vector128", "StoreUnsafe<T>", "(System.Runtime.Intrinsics.Vector128<T>,T)", "summary", "df-generated"]
       - ["System.Runtime.Intrinsics", "Vector128", "StoreUnsafe<T>", "(System.Runtime.Intrinsics.Vector128<T>,T,System.UIntPtr)", "summary", "df-generated"]
       - ["System.Runtime.Intrinsics", "Vector128", "Subtract<T>", "(System.Runtime.Intrinsics.Vector128<T>,System.Runtime.Intrinsics.Vector128<T>)", "summary", "df-generated"]
       - ["System.Runtime.Intrinsics", "Vector128", "Sum<T>", "(System.Runtime.Intrinsics.Vector128<T>)", "summary", "df-generated"]
@@ -455,7 +458,6 @@ extensions:
       - ["System.Runtime.Intrinsics", "Vector256", "Store<T>", "(System.Runtime.Intrinsics.Vector256<T>,T*)", "summary", "df-generated"]
       - ["System.Runtime.Intrinsics", "Vector256", "StoreAligned<T>", "(System.Runtime.Intrinsics.Vector256<T>,T*)", "summary", "df-generated"]
       - ["System.Runtime.Intrinsics", "Vector256", "StoreAlignedNonTemporal<T>", "(System.Runtime.Intrinsics.Vector256<T>,T*)", "summary", "df-generated"]
-      - ["System.Runtime.Intrinsics", "Vector256", "StoreUnsafe<T>", "(System.Runtime.Intrinsics.Vector256<T>,T)", "summary", "df-generated"]
       - ["System.Runtime.Intrinsics", "Vector256", "StoreUnsafe<T>", "(System.Runtime.Intrinsics.Vector256<T>,T,System.UIntPtr)", "summary", "df-generated"]
       - ["System.Runtime.Intrinsics", "Vector256", "Subtract<T>", "(System.Runtime.Intrinsics.Vector256<T>,System.Runtime.Intrinsics.Vector256<T>)", "summary", "df-generated"]
       - ["System.Runtime.Intrinsics", "Vector256", "Sum<T>", "(System.Runtime.Intrinsics.Vector256<T>)", "summary", "df-generated"]
@@ -692,7 +694,6 @@ extensions:
       - ["System.Runtime.Intrinsics", "Vector512", "Store<T>", "(System.Runtime.Intrinsics.Vector512<T>,T*)", "summary", "df-generated"]
       - ["System.Runtime.Intrinsics", "Vector512", "StoreAligned<T>", "(System.Runtime.Intrinsics.Vector512<T>,T*)", "summary", "df-generated"]
       - ["System.Runtime.Intrinsics", "Vector512", "StoreAlignedNonTemporal<T>", "(System.Runtime.Intrinsics.Vector512<T>,T*)", "summary", "df-generated"]
-      - ["System.Runtime.Intrinsics", "Vector512", "StoreUnsafe<T>", "(System.Runtime.Intrinsics.Vector512<T>,T)", "summary", "df-generated"]
       - ["System.Runtime.Intrinsics", "Vector512", "StoreUnsafe<T>", "(System.Runtime.Intrinsics.Vector512<T>,T,System.UIntPtr)", "summary", "df-generated"]
       - ["System.Runtime.Intrinsics", "Vector512", "Subtract<T>", "(System.Runtime.Intrinsics.Vector512<T>,System.Runtime.Intrinsics.Vector512<T>)", "summary", "df-generated"]
       - ["System.Runtime.Intrinsics", "Vector512", "Sum<T>", "(System.Runtime.Intrinsics.Vector512<T>)", "summary", "df-generated"]
@@ -901,7 +902,6 @@ extensions:
       - ["System.Runtime.Intrinsics", "Vector64", "Store<T>", "(System.Runtime.Intrinsics.Vector64<T>,T*)", "summary", "df-generated"]
       - ["System.Runtime.Intrinsics", "Vector64", "StoreAligned<T>", "(System.Runtime.Intrinsics.Vector64<T>,T*)", "summary", "df-generated"]
       - ["System.Runtime.Intrinsics", "Vector64", "StoreAlignedNonTemporal<T>", "(System.Runtime.Intrinsics.Vector64<T>,T*)", "summary", "df-generated"]
-      - ["System.Runtime.Intrinsics", "Vector64", "StoreUnsafe<T>", "(System.Runtime.Intrinsics.Vector64<T>,T)", "summary", "df-generated"]
       - ["System.Runtime.Intrinsics", "Vector64", "StoreUnsafe<T>", "(System.Runtime.Intrinsics.Vector64<T>,T,System.UIntPtr)", "summary", "df-generated"]
       - ["System.Runtime.Intrinsics", "Vector64", "Subtract<T>", "(System.Runtime.Intrinsics.Vector64<T>,System.Runtime.Intrinsics.Vector64<T>)", "summary", "df-generated"]
       - ["System.Runtime.Intrinsics", "Vector64", "Sum<T>", "(System.Runtime.Intrinsics.Vector64<T>)", "summary", "df-generated"]
diff --git a/csharp/ql/lib/ext/generated/System.Runtime.Loader.model.yml b/csharp/ql/lib/ext/generated/System.Runtime.Loader.model.yml
index cd86c9276e1..54431cf7dca 100644
--- a/csharp/ql/lib/ext/generated/System.Runtime.Loader.model.yml
+++ b/csharp/ql/lib/ext/generated/System.Runtime.Loader.model.yml
@@ -6,10 +6,9 @@ extensions:
     data:
       - ["System.Runtime.Loader", "AssemblyDependencyResolver", False, "ResolveAssemblyToPath", "(System.Reflection.AssemblyName)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["System.Runtime.Loader", "AssemblyDependencyResolver", False, "ResolveAssemblyToPath", "(System.Reflection.AssemblyName)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Runtime.Loader", "AssemblyDependencyResolver", False, "ResolveUnmanagedDllToPath", "(System.String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Runtime.Loader", "AssemblyDependencyResolver", False, "ResolveUnmanagedDllToPath", "(System.String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Runtime.Loader", "AssemblyDependencyResolver", False, "ResolveUnmanagedDllToPath", "(System.String)", "", "Argument[0]", "ReturnValue", "taint", "dfc-generated"]
       - ["System.Runtime.Loader", "AssemblyLoadContext", False, "EnterContextualReflection", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Runtime.Loader", "AssemblyLoadContext", False, "ToString", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Runtime.Loader", "AssemblyLoadContext", False, "ToString", "()", "", "Argument[this].Property[System.Runtime.Loader.AssemblyLoadContext.Name]", "ReturnValue", "taint", "dfc-generated"]
       - ["System.Runtime.Loader", "AssemblyLoadContext", False, "get_Name", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
   - addsTo:
       pack: codeql/csharp-all
@@ -33,8 +32,14 @@ extensions:
       - ["System.Runtime.Loader", "AssemblyLoadContext", "SetProfileOptimizationRoot", "(System.String)", "summary", "df-generated"]
       - ["System.Runtime.Loader", "AssemblyLoadContext", "StartProfileOptimization", "(System.String)", "summary", "df-generated"]
       - ["System.Runtime.Loader", "AssemblyLoadContext", "Unload", "()", "summary", "df-generated"]
+      - ["System.Runtime.Loader", "AssemblyLoadContext", "add_Resolving", "(System.Func<System.Runtime.Loader.AssemblyLoadContext,System.Reflection.AssemblyName,System.Reflection.Assembly>)", "summary", "df-generated"]
+      - ["System.Runtime.Loader", "AssemblyLoadContext", "add_ResolvingUnmanagedDll", "(System.Func<System.Reflection.Assembly,System.String,System.IntPtr>)", "summary", "df-generated"]
+      - ["System.Runtime.Loader", "AssemblyLoadContext", "add_Unloading", "(System.Action<System.Runtime.Loader.AssemblyLoadContext>)", "summary", "df-generated"]
       - ["System.Runtime.Loader", "AssemblyLoadContext", "get_All", "()", "summary", "df-generated"]
       - ["System.Runtime.Loader", "AssemblyLoadContext", "get_Assemblies", "()", "summary", "df-generated"]
       - ["System.Runtime.Loader", "AssemblyLoadContext", "get_CurrentContextualReflectionContext", "()", "summary", "df-generated"]
       - ["System.Runtime.Loader", "AssemblyLoadContext", "get_Default", "()", "summary", "df-generated"]
       - ["System.Runtime.Loader", "AssemblyLoadContext", "get_IsCollectible", "()", "summary", "df-generated"]
+      - ["System.Runtime.Loader", "AssemblyLoadContext", "remove_Resolving", "(System.Func<System.Runtime.Loader.AssemblyLoadContext,System.Reflection.AssemblyName,System.Reflection.Assembly>)", "summary", "df-generated"]
+      - ["System.Runtime.Loader", "AssemblyLoadContext", "remove_ResolvingUnmanagedDll", "(System.Func<System.Reflection.Assembly,System.String,System.IntPtr>)", "summary", "df-generated"]
+      - ["System.Runtime.Loader", "AssemblyLoadContext", "remove_Unloading", "(System.Action<System.Runtime.Loader.AssemblyLoadContext>)", "summary", "df-generated"]
diff --git a/csharp/ql/lib/ext/generated/System.Runtime.Remoting.model.yml b/csharp/ql/lib/ext/generated/System.Runtime.Remoting.model.yml
index 57880d82b24..d9139508f20 100644
--- a/csharp/ql/lib/ext/generated/System.Runtime.Remoting.model.yml
+++ b/csharp/ql/lib/ext/generated/System.Runtime.Remoting.model.yml
@@ -4,5 +4,5 @@ extensions:
       pack: codeql/csharp-all
       extensible: summaryModel
     data:
-      - ["System.Runtime.Remoting", "ObjectHandle", False, "ObjectHandle", "(System.Object)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Runtime.Remoting", "ObjectHandle", False, "Unwrap", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Runtime.Remoting", "ObjectHandle", False, "ObjectHandle", "(System.Object)", "", "Argument[0]", "Argument[this].SyntheticField[System.Runtime.Remoting.ObjectHandle._wrappedObject]", "value", "dfc-generated"]
+      - ["System.Runtime.Remoting", "ObjectHandle", False, "Unwrap", "()", "", "Argument[this].SyntheticField[System.Runtime.Remoting.ObjectHandle._wrappedObject]", "ReturnValue", "value", "dfc-generated"]
diff --git a/csharp/ql/lib/ext/generated/System.Runtime.Serialization.DataContracts.model.yml b/csharp/ql/lib/ext/generated/System.Runtime.Serialization.DataContracts.model.yml
index 396c8847db9..5acd6d53a1c 100644
--- a/csharp/ql/lib/ext/generated/System.Runtime.Serialization.DataContracts.model.yml
+++ b/csharp/ql/lib/ext/generated/System.Runtime.Serialization.DataContracts.model.yml
@@ -9,9 +9,7 @@ extensions:
       - ["System.Runtime.Serialization.DataContracts", "DataContract", True, "get_DataMembers", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Runtime.Serialization.DataContracts", "DataContractSet", False, "DataContractSet", "(System.Runtime.Serialization.DataContracts.DataContractSet)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Runtime.Serialization.DataContracts", "DataContractSet", False, "DataContractSet", "(System.Runtime.Serialization.ISerializationSurrogateProvider,System.Collections.Generic.IEnumerable<System.Type>,System.Collections.Generic.IEnumerable<System.Type>)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Runtime.Serialization.DataContracts", "DataContractSet", False, "DataContractSet", "(System.Runtime.Serialization.ISerializationSurrogateProvider,System.Collections.Generic.IEnumerable<System.Type>,System.Collections.Generic.IEnumerable<System.Type>)", "", "Argument[1].Element", "Argument[this]", "taint", "df-generated"]
-      - ["System.Runtime.Serialization.DataContracts", "DataContractSet", False, "DataContractSet", "(System.Runtime.Serialization.ISerializationSurrogateProvider,System.Collections.Generic.IEnumerable<System.Type>,System.Collections.Generic.IEnumerable<System.Type>)", "", "Argument[2].Element", "Argument[this]", "taint", "df-generated"]
-      - ["System.Runtime.Serialization.DataContracts", "DataContractSet", False, "ImportSchemaSet", "(System.Xml.Schema.XmlSchemaSet,System.Collections.Generic.IEnumerable<System.Xml.Schema.XmlSchemaElement>,System.Boolean)", "", "Argument[1].Element", "ReturnValue", "taint", "df-generated"]
+      - ["System.Runtime.Serialization.DataContracts", "DataContractSet", False, "ImportSchemaSet", "(System.Xml.Schema.XmlSchemaSet,System.Collections.Generic.IEnumerable<System.Xml.Schema.XmlSchemaElement>,System.Boolean)", "", "Argument[1].Element.Property[System.Xml.Schema.XmlSchemaElement.QualifiedName]", "ReturnValue.Element", "value", "dfc-generated"]
       - ["System.Runtime.Serialization.DataContracts", "DataMember", False, "get_MemberTypeContract", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
   - addsTo:
       pack: codeql/csharp-all
diff --git a/csharp/ql/lib/ext/generated/System.Runtime.Serialization.Json.model.yml b/csharp/ql/lib/ext/generated/System.Runtime.Serialization.Json.model.yml
index 0191e3dc100..85b0fd28ad9 100644
--- a/csharp/ql/lib/ext/generated/System.Runtime.Serialization.Json.model.yml
+++ b/csharp/ql/lib/ext/generated/System.Runtime.Serialization.Json.model.yml
@@ -4,16 +4,14 @@ extensions:
       pack: codeql/csharp-all
       extensible: summaryModel
     data:
-      - ["System.Runtime.Serialization.Json", "DataContractJsonSerializer", False, "DataContractJsonSerializer", "(System.Type,System.Runtime.Serialization.Json.DataContractJsonSerializerSettings)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Runtime.Serialization.Json", "DataContractJsonSerializer", False, "GetSerializationSurrogateProvider", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Runtime.Serialization.Json", "DataContractJsonSerializer", False, "SetSerializationSurrogateProvider", "(System.Runtime.Serialization.ISerializationSurrogateProvider)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Runtime.Serialization.Json", "DataContractJsonSerializer", False, "get_DateTimeFormat", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Runtime.Serialization.Json", "DataContractJsonSerializerExtensions", False, "GetSerializationSurrogateProvider", "(System.Runtime.Serialization.Json.DataContractJsonSerializer)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Runtime.Serialization.Json", "DataContractJsonSerializerExtensions", False, "SetSerializationSurrogateProvider", "(System.Runtime.Serialization.Json.DataContractJsonSerializer,System.Runtime.Serialization.ISerializationSurrogateProvider)", "", "Argument[1]", "Argument[0]", "taint", "df-generated"]
+      - ["System.Runtime.Serialization.Json", "DataContractJsonSerializer", False, "DataContractJsonSerializer", "(System.Type,System.Runtime.Serialization.Json.DataContractJsonSerializerSettings)", "", "Argument[1].Property[System.Runtime.Serialization.Json.DataContractJsonSerializerSettings.DateTimeFormat]", "Argument[this].SyntheticField[System.Runtime.Serialization.Json.DataContractJsonSerializer._dateTimeFormat]", "value", "dfc-generated"]
+      - ["System.Runtime.Serialization.Json", "DataContractJsonSerializer", False, "GetSerializationSurrogateProvider", "()", "", "Argument[this].SyntheticField[System.Runtime.Serialization.Json.DataContractJsonSerializer._serializationSurrogateProvider]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Runtime.Serialization.Json", "DataContractJsonSerializer", False, "SetSerializationSurrogateProvider", "(System.Runtime.Serialization.ISerializationSurrogateProvider)", "", "Argument[0]", "Argument[this].SyntheticField[System.Runtime.Serialization.Json.DataContractJsonSerializer._serializationSurrogateProvider]", "value", "dfc-generated"]
+      - ["System.Runtime.Serialization.Json", "DataContractJsonSerializer", False, "get_DateTimeFormat", "()", "", "Argument[this].SyntheticField[System.Runtime.Serialization.Json.DataContractJsonSerializer._dateTimeFormat]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Runtime.Serialization.Json", "DataContractJsonSerializerExtensions", False, "GetSerializationSurrogateProvider", "(System.Runtime.Serialization.Json.DataContractJsonSerializer)", "", "Argument[0].SyntheticField[System.Runtime.Serialization.Json.DataContractJsonSerializer._serializationSurrogateProvider]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Runtime.Serialization.Json", "DataContractJsonSerializerExtensions", False, "SetSerializationSurrogateProvider", "(System.Runtime.Serialization.Json.DataContractJsonSerializer,System.Runtime.Serialization.ISerializationSurrogateProvider)", "", "Argument[1]", "Argument[0].SyntheticField[System.Runtime.Serialization.Json.DataContractJsonSerializer._serializationSurrogateProvider]", "value", "dfc-generated"]
       - ["System.Runtime.Serialization.Json", "IXmlJsonWriterInitializer", True, "SetOutput", "(System.IO.Stream,System.Text.Encoding,System.Boolean)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Runtime.Serialization.Json", "IXmlJsonWriterInitializer", True, "SetOutput", "(System.IO.Stream,System.Text.Encoding,System.Boolean)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Runtime.Serialization.Json", "JsonReaderWriterFactory", False, "CreateJsonReader", "(System.Byte[],System.Int32,System.Int32,System.Xml.XmlDictionaryReaderQuotas)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["System.Runtime.Serialization.Json", "JsonReaderWriterFactory", False, "CreateJsonReader", "(System.Byte[],System.Xml.XmlDictionaryReaderQuotas)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
       - ["System.Runtime.Serialization.Json", "JsonReaderWriterFactory", False, "CreateJsonWriter", "(System.IO.Stream)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["System.Runtime.Serialization.Json", "JsonReaderWriterFactory", False, "CreateJsonWriter", "(System.IO.Stream,System.Text.Encoding)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["System.Runtime.Serialization.Json", "JsonReaderWriterFactory", False, "CreateJsonWriter", "(System.IO.Stream,System.Text.Encoding)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
@@ -36,11 +34,6 @@ extensions:
       - ["System.Runtime.Serialization.Json", "DataContractJsonSerializer", "DataContractJsonSerializer", "(System.Type,System.Xml.XmlDictionaryString,System.Collections.Generic.IEnumerable<System.Type>)", "summary", "df-generated"]
       - ["System.Runtime.Serialization.Json", "DataContractJsonSerializer", "IsStartObject", "(System.Xml.XmlDictionaryReader)", "summary", "df-generated"]
       - ["System.Runtime.Serialization.Json", "DataContractJsonSerializer", "IsStartObject", "(System.Xml.XmlReader)", "summary", "df-generated"]
-      - ["System.Runtime.Serialization.Json", "DataContractJsonSerializer", "ReadObject", "(System.IO.Stream)", "summary", "df-generated"]
-      - ["System.Runtime.Serialization.Json", "DataContractJsonSerializer", "ReadObject", "(System.Xml.XmlDictionaryReader)", "summary", "df-generated"]
-      - ["System.Runtime.Serialization.Json", "DataContractJsonSerializer", "ReadObject", "(System.Xml.XmlDictionaryReader,System.Boolean)", "summary", "df-generated"]
-      - ["System.Runtime.Serialization.Json", "DataContractJsonSerializer", "ReadObject", "(System.Xml.XmlReader)", "summary", "df-generated"]
-      - ["System.Runtime.Serialization.Json", "DataContractJsonSerializer", "ReadObject", "(System.Xml.XmlReader,System.Boolean)", "summary", "df-generated"]
       - ["System.Runtime.Serialization.Json", "DataContractJsonSerializer", "WriteEndObject", "(System.Xml.XmlDictionaryWriter)", "summary", "df-generated"]
       - ["System.Runtime.Serialization.Json", "DataContractJsonSerializer", "WriteEndObject", "(System.Xml.XmlWriter)", "summary", "df-generated"]
       - ["System.Runtime.Serialization.Json", "DataContractJsonSerializer", "WriteObject", "(System.IO.Stream,System.Object)", "summary", "df-generated"]
@@ -56,4 +49,10 @@ extensions:
       - ["System.Runtime.Serialization.Json", "DataContractJsonSerializer", "get_MaxItemsInObjectGraph", "()", "summary", "df-generated"]
       - ["System.Runtime.Serialization.Json", "DataContractJsonSerializer", "get_SerializeReadOnlyTypes", "()", "summary", "df-generated"]
       - ["System.Runtime.Serialization.Json", "DataContractJsonSerializer", "get_UseSimpleDictionaryFormat", "()", "summary", "df-generated"]
+      - ["System.Runtime.Serialization.Json", "IXmlJsonReaderInitializer", "SetInput", "(System.Byte[],System.Int32,System.Int32,System.Text.Encoding,System.Xml.XmlDictionaryReaderQuotas,System.Xml.OnXmlDictionaryReaderClose)", "summary", "df-generated"]
+      - ["System.Runtime.Serialization.Json", "IXmlJsonReaderInitializer", "SetInput", "(System.IO.Stream,System.Text.Encoding,System.Xml.XmlDictionaryReaderQuotas,System.Xml.OnXmlDictionaryReaderClose)", "summary", "df-generated"]
+      - ["System.Runtime.Serialization.Json", "JsonReaderWriterFactory", "CreateJsonReader", "(System.Byte[],System.Int32,System.Int32,System.Text.Encoding,System.Xml.XmlDictionaryReaderQuotas,System.Xml.OnXmlDictionaryReaderClose)", "summary", "df-generated"]
+      - ["System.Runtime.Serialization.Json", "JsonReaderWriterFactory", "CreateJsonReader", "(System.Byte[],System.Int32,System.Int32,System.Xml.XmlDictionaryReaderQuotas)", "summary", "df-generated"]
+      - ["System.Runtime.Serialization.Json", "JsonReaderWriterFactory", "CreateJsonReader", "(System.Byte[],System.Xml.XmlDictionaryReaderQuotas)", "summary", "df-generated"]
+      - ["System.Runtime.Serialization.Json", "JsonReaderWriterFactory", "CreateJsonReader", "(System.IO.Stream,System.Text.Encoding,System.Xml.XmlDictionaryReaderQuotas,System.Xml.OnXmlDictionaryReaderClose)", "summary", "df-generated"]
       - ["System.Runtime.Serialization.Json", "JsonReaderWriterFactory", "CreateJsonReader", "(System.IO.Stream,System.Xml.XmlDictionaryReaderQuotas)", "summary", "df-generated"]
diff --git a/csharp/ql/lib/ext/generated/System.Runtime.Serialization.model.yml b/csharp/ql/lib/ext/generated/System.Runtime.Serialization.model.yml
index b0c9de93348..fbe9b4b8f14 100644
--- a/csharp/ql/lib/ext/generated/System.Runtime.Serialization.model.yml
+++ b/csharp/ql/lib/ext/generated/System.Runtime.Serialization.model.yml
@@ -4,70 +4,76 @@ extensions:
       pack: codeql/csharp-all
       extensible: summaryModel
     data:
-      - ["System.Runtime.Serialization", "DataContractSerializer", False, "DataContractSerializer", "(System.Type,System.Runtime.Serialization.DataContractSerializerSettings)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["System.Runtime.Serialization", "DataContractSerializer", False, "DataContractSerializer", "(System.Type,System.Runtime.Serialization.DataContractSerializerSettings)", "", "Argument[1].Property[System.Runtime.Serialization.DataContractSerializerSettings.DataContractResolver]", "Argument[this].SyntheticField[System.Runtime.Serialization.DataContractSerializer._dataContractResolver]", "value", "dfc-generated"]
       - ["System.Runtime.Serialization", "DataContractSerializer", False, "DataContractSerializer", "(System.Type,System.Xml.XmlDictionaryString,System.Xml.XmlDictionaryString,System.Collections.Generic.IEnumerable<System.Type>)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
       - ["System.Runtime.Serialization", "DataContractSerializer", False, "DataContractSerializer", "(System.Type,System.Xml.XmlDictionaryString,System.Xml.XmlDictionaryString,System.Collections.Generic.IEnumerable<System.Type>)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Runtime.Serialization", "DataContractSerializer", False, "get_DataContractResolver", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Runtime.Serialization", "DataContractSerializerExtensions", False, "GetSerializationSurrogateProvider", "(System.Runtime.Serialization.DataContractSerializer)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Runtime.Serialization", "DataContractSerializerExtensions", False, "SetSerializationSurrogateProvider", "(System.Runtime.Serialization.DataContractSerializer,System.Runtime.Serialization.ISerializationSurrogateProvider)", "", "Argument[1]", "Argument[0]", "taint", "df-generated"]
-      - ["System.Runtime.Serialization", "DateTimeFormat", False, "DateTimeFormat", "(System.String,System.IFormatProvider)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Runtime.Serialization", "DateTimeFormat", False, "DateTimeFormat", "(System.String,System.IFormatProvider)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Runtime.Serialization", "DateTimeFormat", False, "get_FormatProvider", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Runtime.Serialization", "DateTimeFormat", False, "get_FormatString", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Runtime.Serialization", "DataContractSerializer", False, "ReadObject", "(System.Xml.XmlDictionaryReader,System.Boolean,System.Runtime.Serialization.DataContractResolver)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Runtime.Serialization", "DataContractSerializer", False, "get_DataContractResolver", "()", "", "Argument[this].SyntheticField[System.Runtime.Serialization.DataContractSerializer._dataContractResolver]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Runtime.Serialization", "DataContractSerializerExtensions", False, "GetSerializationSurrogateProvider", "(System.Runtime.Serialization.DataContractSerializer)", "", "Argument[0].SyntheticField[System.Runtime.Serialization.DataContractSerializer._serializationSurrogateProvider]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Runtime.Serialization", "DataContractSerializerExtensions", False, "SetSerializationSurrogateProvider", "(System.Runtime.Serialization.DataContractSerializer,System.Runtime.Serialization.ISerializationSurrogateProvider)", "", "Argument[1]", "Argument[0].SyntheticField[System.Runtime.Serialization.DataContractSerializer._serializationSurrogateProvider]", "value", "dfc-generated"]
+      - ["System.Runtime.Serialization", "DateTimeFormat", False, "DateTimeFormat", "(System.String,System.IFormatProvider)", "", "Argument[0]", "Argument[this].SyntheticField[System.Runtime.Serialization.DateTimeFormat._formatString]", "value", "dfc-generated"]
+      - ["System.Runtime.Serialization", "DateTimeFormat", False, "DateTimeFormat", "(System.String,System.IFormatProvider)", "", "Argument[1]", "Argument[this].SyntheticField[System.Runtime.Serialization.DateTimeFormat._formatProvider]", "value", "dfc-generated"]
+      - ["System.Runtime.Serialization", "DateTimeFormat", False, "get_FormatProvider", "()", "", "Argument[this].SyntheticField[System.Runtime.Serialization.DateTimeFormat._formatProvider]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Runtime.Serialization", "DateTimeFormat", False, "get_FormatString", "()", "", "Argument[this].SyntheticField[System.Runtime.Serialization.DateTimeFormat._formatString]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Runtime.Serialization", "FormatterServices", False, "GetSurrogateForCyclicalReference", "(System.Runtime.Serialization.ISerializationSurrogate)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Runtime.Serialization", "FormatterServices", False, "PopulateObjectMembers", "(System.Object,System.Reflection.MemberInfo[],System.Object[])", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Runtime.Serialization", "IFormatterConverter", True, "Convert", "(System.Object,System.Type)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Runtime.Serialization", "IFormatterConverter", True, "Convert", "(System.Object,System.TypeCode)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Runtime.Serialization", "IFormatterConverter", True, "ToString", "(System.Object)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Runtime.Serialization", "FormatterServices", False, "PopulateObjectMembers", "(System.Object,System.Reflection.MemberInfo[],System.Object[])", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Runtime.Serialization", "IFormatterConverter", True, "Convert", "(System.Object,System.Type)", "", "Argument[0]", "ReturnValue", "taint", "dfc-generated"]
+      - ["System.Runtime.Serialization", "IFormatterConverter", True, "Convert", "(System.Object,System.TypeCode)", "", "Argument[0]", "ReturnValue", "taint", "dfc-generated"]
+      - ["System.Runtime.Serialization", "IFormatterConverter", True, "ToString", "(System.Object)", "", "Argument[0]", "ReturnValue", "taint", "dfc-generated"]
       - ["System.Runtime.Serialization", "IObjectReference", True, "GetRealObject", "(System.Runtime.Serialization.StreamingContext)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Runtime.Serialization", "ISerializable", True, "GetObjectData", "(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)", "", "Argument[this]", "Argument[0]", "taint", "df-generated"]
-      - ["System.Runtime.Serialization", "ISurrogateSelector", True, "ChainSelector", "(System.Runtime.Serialization.ISurrogateSelector)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Runtime.Serialization", "ISurrogateSelector", True, "ChainSelector", "(System.Runtime.Serialization.ISurrogateSelector)", "", "Argument[this]", "Argument[0]", "taint", "df-generated"]
-      - ["System.Runtime.Serialization", "ISurrogateSelector", True, "GetNextSelector", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Runtime.Serialization", "ISurrogateSelector", True, "GetSurrogate", "(System.Type,System.Runtime.Serialization.StreamingContext,System.Runtime.Serialization.ISurrogateSelector)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Runtime.Serialization", "ISurrogateSelector", True, "GetSurrogate", "(System.Type,System.Runtime.Serialization.StreamingContext,System.Runtime.Serialization.ISurrogateSelector)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Runtime.Serialization", "ObjectIDGenerator", True, "GetId", "(System.Object,System.Boolean)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Runtime.Serialization", "ObjectManager", False, "ObjectManager", "(System.Runtime.Serialization.ISurrogateSelector,System.Runtime.Serialization.StreamingContext)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Runtime.Serialization", "ObjectManager", False, "ObjectManager", "(System.Runtime.Serialization.ISurrogateSelector,System.Runtime.Serialization.StreamingContext)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
       - ["System.Runtime.Serialization", "ObjectManager", True, "GetObject", "(System.Int64)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Runtime.Serialization", "SerializationEntry", False, "get_Name", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Runtime.Serialization", "SerializationEntry", False, "get_Value", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Runtime.Serialization", "SerializationInfo", False, "AddValue", "(System.String,System.Boolean)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Runtime.Serialization", "SerializationInfo", False, "AddValue", "(System.String,System.Byte)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Runtime.Serialization", "SerializationInfo", False, "AddValue", "(System.String,System.Char)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Runtime.Serialization", "SerializationInfo", False, "AddValue", "(System.String,System.DateTime)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Runtime.Serialization", "SerializationInfo", False, "AddValue", "(System.String,System.Decimal)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Runtime.Serialization", "SerializationInfo", False, "AddValue", "(System.String,System.Double)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Runtime.Serialization", "SerializationInfo", False, "AddValue", "(System.String,System.Int16)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Runtime.Serialization", "SerializationInfo", False, "AddValue", "(System.String,System.Int32)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Runtime.Serialization", "SerializationInfo", False, "AddValue", "(System.String,System.Int64)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Runtime.Serialization", "SerializationInfo", False, "AddValue", "(System.String,System.Object)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Runtime.Serialization", "SerializationInfo", False, "AddValue", "(System.String,System.Object)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Runtime.Serialization", "SerializationInfo", False, "AddValue", "(System.String,System.Object,System.Type)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Runtime.Serialization", "SerializationInfo", False, "AddValue", "(System.String,System.Object,System.Type)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Runtime.Serialization", "SerializationInfo", False, "AddValue", "(System.String,System.SByte)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Runtime.Serialization", "SerializationInfo", False, "AddValue", "(System.String,System.Single)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Runtime.Serialization", "SerializationInfo", False, "AddValue", "(System.String,System.UInt16)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Runtime.Serialization", "SerializationInfo", False, "AddValue", "(System.String,System.UInt32)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Runtime.Serialization", "SerializationInfo", False, "AddValue", "(System.String,System.UInt64)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Runtime.Serialization", "SerializationInfo", False, "GetEnumerator", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Runtime.Serialization", "SerializationInfo", False, "GetString", "(System.String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Runtime.Serialization", "SerializationInfo", False, "GetValue", "(System.String,System.Type)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Runtime.Serialization", "SerializationEntry", False, "get_Name", "()", "", "Argument[this].SyntheticField[System.Runtime.Serialization.SerializationEntry._name]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Runtime.Serialization", "SerializationEntry", False, "get_Value", "()", "", "Argument[this].SyntheticField[System.Runtime.Serialization.SerializationEntry._value]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Runtime.Serialization", "SerializationInfo", False, "AddValue", "(System.String,System.Boolean)", "", "Argument[0]", "Argument[this].SyntheticField[System.Runtime.Serialization.SerializationInfo._names].Element", "value", "dfc-generated"]
+      - ["System.Runtime.Serialization", "SerializationInfo", False, "AddValue", "(System.String,System.Byte)", "", "Argument[0]", "Argument[this].SyntheticField[System.Runtime.Serialization.SerializationInfo._names].Element", "value", "dfc-generated"]
+      - ["System.Runtime.Serialization", "SerializationInfo", False, "AddValue", "(System.String,System.Char)", "", "Argument[0]", "Argument[this].SyntheticField[System.Runtime.Serialization.SerializationInfo._names].Element", "value", "dfc-generated"]
+      - ["System.Runtime.Serialization", "SerializationInfo", False, "AddValue", "(System.String,System.DateTime)", "", "Argument[0]", "Argument[this].SyntheticField[System.Runtime.Serialization.SerializationInfo._names].Element", "value", "dfc-generated"]
+      - ["System.Runtime.Serialization", "SerializationInfo", False, "AddValue", "(System.String,System.Decimal)", "", "Argument[0]", "Argument[this].SyntheticField[System.Runtime.Serialization.SerializationInfo._names].Element", "value", "dfc-generated"]
+      - ["System.Runtime.Serialization", "SerializationInfo", False, "AddValue", "(System.String,System.Double)", "", "Argument[0]", "Argument[this].SyntheticField[System.Runtime.Serialization.SerializationInfo._names].Element", "value", "dfc-generated"]
+      - ["System.Runtime.Serialization", "SerializationInfo", False, "AddValue", "(System.String,System.Int16)", "", "Argument[0]", "Argument[this].SyntheticField[System.Runtime.Serialization.SerializationInfo._names].Element", "value", "dfc-generated"]
+      - ["System.Runtime.Serialization", "SerializationInfo", False, "AddValue", "(System.String,System.Int32)", "", "Argument[0]", "Argument[this].SyntheticField[System.Runtime.Serialization.SerializationInfo._names].Element", "value", "dfc-generated"]
+      - ["System.Runtime.Serialization", "SerializationInfo", False, "AddValue", "(System.String,System.Int64)", "", "Argument[0]", "Argument[this].SyntheticField[System.Runtime.Serialization.SerializationInfo._names].Element", "value", "dfc-generated"]
+      - ["System.Runtime.Serialization", "SerializationInfo", False, "AddValue", "(System.String,System.Object)", "", "Argument[0]", "Argument[this].SyntheticField[System.Runtime.Serialization.SerializationInfo._names].Element", "value", "dfc-generated"]
+      - ["System.Runtime.Serialization", "SerializationInfo", False, "AddValue", "(System.String,System.Object)", "", "Argument[1]", "Argument[this].SyntheticField[System.Runtime.Serialization.SerializationInfo._values].Element", "value", "dfc-generated"]
+      - ["System.Runtime.Serialization", "SerializationInfo", False, "AddValue", "(System.String,System.Object,System.Type)", "", "Argument[0]", "Argument[this].SyntheticField[System.Runtime.Serialization.SerializationInfo._names].Element", "value", "dfc-generated"]
+      - ["System.Runtime.Serialization", "SerializationInfo", False, "AddValue", "(System.String,System.Object,System.Type)", "", "Argument[1]", "Argument[this].SyntheticField[System.Runtime.Serialization.SerializationInfo._values].Element", "value", "dfc-generated"]
+      - ["System.Runtime.Serialization", "SerializationInfo", False, "AddValue", "(System.String,System.SByte)", "", "Argument[0]", "Argument[this].SyntheticField[System.Runtime.Serialization.SerializationInfo._names].Element", "value", "dfc-generated"]
+      - ["System.Runtime.Serialization", "SerializationInfo", False, "AddValue", "(System.String,System.Single)", "", "Argument[0]", "Argument[this].SyntheticField[System.Runtime.Serialization.SerializationInfo._names].Element", "value", "dfc-generated"]
+      - ["System.Runtime.Serialization", "SerializationInfo", False, "AddValue", "(System.String,System.UInt16)", "", "Argument[0]", "Argument[this].SyntheticField[System.Runtime.Serialization.SerializationInfo._names].Element", "value", "dfc-generated"]
+      - ["System.Runtime.Serialization", "SerializationInfo", False, "AddValue", "(System.String,System.UInt32)", "", "Argument[0]", "Argument[this].SyntheticField[System.Runtime.Serialization.SerializationInfo._names].Element", "value", "dfc-generated"]
+      - ["System.Runtime.Serialization", "SerializationInfo", False, "AddValue", "(System.String,System.UInt64)", "", "Argument[0]", "Argument[this].SyntheticField[System.Runtime.Serialization.SerializationInfo._names].Element", "value", "dfc-generated"]
+      - ["System.Runtime.Serialization", "SerializationInfo", False, "GetEnumerator", "()", "", "Argument[this].SyntheticField[System.Runtime.Serialization.SerializationInfo._names]", "ReturnValue.SyntheticField[System.Runtime.Serialization.SerializationInfoEnumerator._members]", "value", "dfc-generated"]
+      - ["System.Runtime.Serialization", "SerializationInfo", False, "GetEnumerator", "()", "", "Argument[this].SyntheticField[System.Runtime.Serialization.SerializationInfo._values]", "ReturnValue.SyntheticField[System.Runtime.Serialization.SerializationInfoEnumerator._data]", "value", "dfc-generated"]
+      - ["System.Runtime.Serialization", "SerializationInfo", False, "GetString", "(System.String)", "", "Argument[this].SyntheticField[System.Runtime.Serialization.SerializationInfo._values].Element", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Runtime.Serialization", "SerializationInfo", False, "GetValue", "(System.String,System.Type)", "", "Argument[this].SyntheticField[System.Runtime.Serialization.SerializationInfo._values].Element", "ReturnValue", "value", "dfc-generated"]
       - ["System.Runtime.Serialization", "SerializationInfo", False, "SerializationInfo", "(System.Type,System.Runtime.Serialization.IFormatterConverter)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Runtime.Serialization", "SerializationInfoEnumerator", False, "get_Current", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Runtime.Serialization", "SerializationInfoEnumerator", False, "get_Name", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Runtime.Serialization", "SerializationInfoEnumerator", False, "get_Value", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Runtime.Serialization", "SerializationInfoEnumerator", False, "get_Current", "()", "", "Argument[this].Property[System.Runtime.Serialization.SerializationInfoEnumerator.Current]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Runtime.Serialization", "SerializationInfoEnumerator", False, "get_Current", "()", "", "Argument[this].SyntheticField[System.Runtime.Serialization.SerializationInfoEnumerator._data].Element", "ReturnValue.SyntheticField[System.Runtime.Serialization.SerializationEntry._value]", "value", "dfc-generated"]
+      - ["System.Runtime.Serialization", "SerializationInfoEnumerator", False, "get_Current", "()", "", "Argument[this].SyntheticField[System.Runtime.Serialization.SerializationInfoEnumerator._members].Element", "ReturnValue.SyntheticField[System.Runtime.Serialization.SerializationEntry._name]", "value", "dfc-generated"]
+      - ["System.Runtime.Serialization", "SerializationInfoEnumerator", False, "get_Name", "()", "", "Argument[this].SyntheticField[System.Runtime.Serialization.SerializationInfoEnumerator._members].Element", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Runtime.Serialization", "SerializationInfoEnumerator", False, "get_Value", "()", "", "Argument[this].SyntheticField[System.Runtime.Serialization.SerializationInfoEnumerator._data].Element", "ReturnValue", "value", "dfc-generated"]
       - ["System.Runtime.Serialization", "SerializationObjectManager", False, "SerializationObjectManager", "(System.Runtime.Serialization.StreamingContext)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Runtime.Serialization", "StreamingContext", False, "StreamingContext", "(System.Runtime.Serialization.StreamingContextStates,System.Object)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Runtime.Serialization", "StreamingContext", False, "get_Context", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Runtime.Serialization", "XPathQueryGenerator", False, "CreateFromDataContractSerializer", "(System.Type,System.Reflection.MemberInfo[],System.Text.StringBuilder,System.Xml.XmlNamespaceManager)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Runtime.Serialization", "XmlSerializableServices", False, "AddDefaultSchema", "(System.Xml.Schema.XmlSchemaSet,System.Xml.XmlQualifiedName)", "", "Argument[1]", "Argument[0]", "taint", "df-generated"]
+      - ["System.Runtime.Serialization", "StreamingContext", False, "StreamingContext", "(System.Runtime.Serialization.StreamingContextStates,System.Object)", "", "Argument[1]", "Argument[this].SyntheticField[System.Runtime.Serialization.StreamingContext._additionalContext]", "value", "dfc-generated"]
+      - ["System.Runtime.Serialization", "StreamingContext", False, "get_Context", "()", "", "Argument[this].SyntheticField[System.Runtime.Serialization.StreamingContext._additionalContext]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Runtime.Serialization", "SurrogateSelector", True, "ChainSelector", "(System.Runtime.Serialization.ISurrogateSelector)", "", "Argument[0]", "Argument[this].SyntheticField[System.Runtime.Serialization.SurrogateSelector._nextSelector]", "value", "dfc-generated"]
+      - ["System.Runtime.Serialization", "SurrogateSelector", True, "GetNextSelector", "()", "", "Argument[this].SyntheticField[System.Runtime.Serialization.SurrogateSelector._nextSelector]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Runtime.Serialization", "SurrogateSelector", True, "GetSurrogate", "(System.Type,System.Runtime.Serialization.StreamingContext,System.Runtime.Serialization.ISurrogateSelector)", "", "Argument[this].SyntheticField[System.Runtime.Serialization.SurrogateSelector._nextSelector]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Runtime.Serialization", "XPathQueryGenerator", False, "CreateFromDataContractSerializer", "(System.Type,System.Reflection.MemberInfo[],System.Text.StringBuilder,System.Xml.XmlNamespaceManager)", "", "Argument[2]", "ReturnValue", "taint", "dfc-generated"]
+      - ["System.Runtime.Serialization", "XmlObjectSerializer", True, "ReadObject", "(System.IO.Stream)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Runtime.Serialization", "XmlObjectSerializer", True, "ReadObject", "(System.Xml.XmlDictionaryReader)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Runtime.Serialization", "XmlObjectSerializer", True, "ReadObject", "(System.Xml.XmlDictionaryReader,System.Boolean)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Runtime.Serialization", "XmlObjectSerializer", True, "ReadObject", "(System.Xml.XmlReader)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Runtime.Serialization", "XmlObjectSerializer", True, "ReadObject", "(System.Xml.XmlReader,System.Boolean)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Runtime.Serialization", "XmlSerializableServices", False, "WriteNodes", "(System.Xml.XmlWriter,System.Xml.XmlNode[])", "", "Argument[1].Element", "Argument[0]", "taint", "df-generated"]
-      - ["System.Runtime.Serialization", "XsdDataContractExporter", False, "XsdDataContractExporter", "(System.Xml.Schema.XmlSchemaSet)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Runtime.Serialization", "XsdDataContractExporter", False, "get_Schemas", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Runtime.Serialization", "XsdDataContractExporter", False, "XsdDataContractExporter", "(System.Xml.Schema.XmlSchemaSet)", "", "Argument[0]", "Argument[this].SyntheticField[System.Runtime.Serialization.XsdDataContractExporter._schemas]", "value", "dfc-generated"]
+      - ["System.Runtime.Serialization", "XsdDataContractExporter", False, "get_Schemas", "()", "", "Argument[this].SyntheticField[System.Runtime.Serialization.XsdDataContractExporter._schemas]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Runtime.Serialization", "XsdDataContractImporter", False, "CanImport", "(System.Xml.Schema.XmlSchemaSet,System.Xml.Schema.XmlSchemaElement)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
       - ["System.Runtime.Serialization", "XsdDataContractImporter", False, "Import", "(System.Xml.Schema.XmlSchemaSet,System.Xml.Schema.XmlSchemaElement)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Runtime.Serialization", "XsdDataContractImporter", False, "Import", "(System.Xml.Schema.XmlSchemaSet,System.Xml.Schema.XmlSchemaElement)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Runtime.Serialization", "XsdDataContractImporter", False, "Import", "(System.Xml.Schema.XmlSchemaSet,System.Xml.Schema.XmlSchemaElement)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Runtime.Serialization", "XsdDataContractImporter", False, "Import", "(System.Xml.Schema.XmlSchemaSet,System.Xml.XmlQualifiedName)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
       - ["System.Runtime.Serialization", "XsdDataContractImporter", False, "XsdDataContractImporter", "(System.CodeDom.CodeCompileUnit)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
   - addsTo:
@@ -94,10 +100,6 @@ extensions:
       - ["System.Runtime.Serialization", "DataContractSerializer", "DataContractSerializer", "(System.Type,System.Xml.XmlDictionaryString,System.Xml.XmlDictionaryString)", "summary", "df-generated"]
       - ["System.Runtime.Serialization", "DataContractSerializer", "IsStartObject", "(System.Xml.XmlDictionaryReader)", "summary", "df-generated"]
       - ["System.Runtime.Serialization", "DataContractSerializer", "IsStartObject", "(System.Xml.XmlReader)", "summary", "df-generated"]
-      - ["System.Runtime.Serialization", "DataContractSerializer", "ReadObject", "(System.Xml.XmlDictionaryReader,System.Boolean)", "summary", "df-generated"]
-      - ["System.Runtime.Serialization", "DataContractSerializer", "ReadObject", "(System.Xml.XmlDictionaryReader,System.Boolean,System.Runtime.Serialization.DataContractResolver)", "summary", "df-generated"]
-      - ["System.Runtime.Serialization", "DataContractSerializer", "ReadObject", "(System.Xml.XmlReader)", "summary", "df-generated"]
-      - ["System.Runtime.Serialization", "DataContractSerializer", "ReadObject", "(System.Xml.XmlReader,System.Boolean)", "summary", "df-generated"]
       - ["System.Runtime.Serialization", "DataContractSerializer", "WriteEndObject", "(System.Xml.XmlDictionaryWriter)", "summary", "df-generated"]
       - ["System.Runtime.Serialization", "DataContractSerializer", "WriteEndObject", "(System.Xml.XmlWriter)", "summary", "df-generated"]
       - ["System.Runtime.Serialization", "DataContractSerializer", "WriteObject", "(System.Xml.XmlDictionaryWriter,System.Object,System.Runtime.Serialization.DataContractResolver)", "summary", "df-generated"]
@@ -188,6 +190,8 @@ extensions:
       - ["System.Runtime.Serialization", "ISerializationSurrogateProvider", "GetDeserializedObject", "(System.Object,System.Type)", "summary", "df-generated"]
       - ["System.Runtime.Serialization", "ISerializationSurrogateProvider", "GetObjectToSerialize", "(System.Object,System.Type)", "summary", "df-generated"]
       - ["System.Runtime.Serialization", "ISerializationSurrogateProvider", "GetSurrogateType", "(System.Type)", "summary", "df-generated"]
+      - ["System.Runtime.Serialization", "ISurrogateSelector", "ChainSelector", "(System.Runtime.Serialization.ISurrogateSelector)", "summary", "df-generated"]
+      - ["System.Runtime.Serialization", "ISurrogateSelector", "GetNextSelector", "()", "summary", "df-generated"]
       - ["System.Runtime.Serialization", "ImportOptions", "get_Namespaces", "()", "summary", "df-generated"]
       - ["System.Runtime.Serialization", "ImportOptions", "get_ReferencedCollectionTypes", "()", "summary", "df-generated"]
       - ["System.Runtime.Serialization", "ImportOptions", "get_ReferencedTypes", "()", "summary", "df-generated"]
@@ -287,11 +291,6 @@ extensions:
       - ["System.Runtime.Serialization", "XPathQueryGenerator", "CreateFromDataContractSerializer", "(System.Type,System.Reflection.MemberInfo[],System.Xml.XmlNamespaceManager)", "summary", "df-generated"]
       - ["System.Runtime.Serialization", "XmlObjectSerializer", "IsStartObject", "(System.Xml.XmlDictionaryReader)", "summary", "df-generated"]
       - ["System.Runtime.Serialization", "XmlObjectSerializer", "IsStartObject", "(System.Xml.XmlReader)", "summary", "df-generated"]
-      - ["System.Runtime.Serialization", "XmlObjectSerializer", "ReadObject", "(System.IO.Stream)", "summary", "df-generated"]
-      - ["System.Runtime.Serialization", "XmlObjectSerializer", "ReadObject", "(System.Xml.XmlDictionaryReader)", "summary", "df-generated"]
-      - ["System.Runtime.Serialization", "XmlObjectSerializer", "ReadObject", "(System.Xml.XmlDictionaryReader,System.Boolean)", "summary", "df-generated"]
-      - ["System.Runtime.Serialization", "XmlObjectSerializer", "ReadObject", "(System.Xml.XmlReader)", "summary", "df-generated"]
-      - ["System.Runtime.Serialization", "XmlObjectSerializer", "ReadObject", "(System.Xml.XmlReader,System.Boolean)", "summary", "df-generated"]
       - ["System.Runtime.Serialization", "XmlObjectSerializer", "WriteEndObject", "(System.Xml.XmlDictionaryWriter)", "summary", "df-generated"]
       - ["System.Runtime.Serialization", "XmlObjectSerializer", "WriteEndObject", "(System.Xml.XmlWriter)", "summary", "df-generated"]
       - ["System.Runtime.Serialization", "XmlObjectSerializer", "WriteObject", "(System.IO.Stream,System.Object)", "summary", "df-generated"]
@@ -301,6 +300,7 @@ extensions:
       - ["System.Runtime.Serialization", "XmlObjectSerializer", "WriteObjectContent", "(System.Xml.XmlWriter,System.Object)", "summary", "df-generated"]
       - ["System.Runtime.Serialization", "XmlObjectSerializer", "WriteStartObject", "(System.Xml.XmlDictionaryWriter,System.Object)", "summary", "df-generated"]
       - ["System.Runtime.Serialization", "XmlObjectSerializer", "WriteStartObject", "(System.Xml.XmlWriter,System.Object)", "summary", "df-generated"]
+      - ["System.Runtime.Serialization", "XmlSerializableServices", "AddDefaultSchema", "(System.Xml.Schema.XmlSchemaSet,System.Xml.XmlQualifiedName)", "summary", "df-generated"]
       - ["System.Runtime.Serialization", "XmlSerializableServices", "ReadNodes", "(System.Xml.XmlReader)", "summary", "df-generated"]
       - ["System.Runtime.Serialization", "XsdDataContractExporter", "CanExport", "(System.Collections.Generic.ICollection<System.Reflection.Assembly>)", "summary", "df-generated"]
       - ["System.Runtime.Serialization", "XsdDataContractExporter", "CanExport", "(System.Collections.Generic.ICollection<System.Type>)", "summary", "df-generated"]
diff --git a/csharp/ql/lib/ext/generated/System.Runtime.Versioning.model.yml b/csharp/ql/lib/ext/generated/System.Runtime.Versioning.model.yml
index d1646894bf9..f66858400f8 100644
--- a/csharp/ql/lib/ext/generated/System.Runtime.Versioning.model.yml
+++ b/csharp/ql/lib/ext/generated/System.Runtime.Versioning.model.yml
@@ -4,18 +4,18 @@ extensions:
       pack: codeql/csharp-all
       extensible: summaryModel
     data:
-      - ["System.Runtime.Versioning", "FrameworkName", False, "FrameworkName", "(System.String,System.Version,System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Runtime.Versioning", "FrameworkName", False, "FrameworkName", "(System.String,System.Version,System.String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Runtime.Versioning", "FrameworkName", False, "FrameworkName", "(System.String,System.Version,System.String)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
+      - ["System.Runtime.Versioning", "FrameworkName", False, "FrameworkName", "(System.String,System.Version,System.String)", "", "Argument[0]", "Argument[this].SyntheticField[System.Runtime.Versioning.FrameworkName._identifier]", "value", "dfc-generated"]
+      - ["System.Runtime.Versioning", "FrameworkName", False, "FrameworkName", "(System.String,System.Version,System.String)", "", "Argument[1]", "Argument[this].SyntheticField[System.Runtime.Versioning.FrameworkName._version]", "value", "dfc-generated"]
+      - ["System.Runtime.Versioning", "FrameworkName", False, "FrameworkName", "(System.String,System.Version,System.String)", "", "Argument[2]", "Argument[this].SyntheticField[System.Runtime.Versioning.FrameworkName._profile]", "value", "dfc-generated"]
       - ["System.Runtime.Versioning", "FrameworkName", False, "ToString", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Runtime.Versioning", "FrameworkName", False, "get_FullName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Runtime.Versioning", "FrameworkName", False, "get_Identifier", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Runtime.Versioning", "FrameworkName", False, "get_Profile", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Runtime.Versioning", "FrameworkName", False, "get_Version", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Runtime.Versioning", "TargetFrameworkAttribute", False, "TargetFrameworkAttribute", "(System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Runtime.Versioning", "TargetFrameworkAttribute", False, "get_FrameworkName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Runtime.Versioning", "VersioningHelper", False, "MakeVersionSafeName", "(System.String,System.Runtime.Versioning.ResourceScope,System.Runtime.Versioning.ResourceScope)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Runtime.Versioning", "VersioningHelper", False, "MakeVersionSafeName", "(System.String,System.Runtime.Versioning.ResourceScope,System.Runtime.Versioning.ResourceScope,System.Type)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Runtime.Versioning", "FrameworkName", False, "get_Identifier", "()", "", "Argument[this].SyntheticField[System.Runtime.Versioning.FrameworkName._identifier]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Runtime.Versioning", "FrameworkName", False, "get_Profile", "()", "", "Argument[this].SyntheticField[System.Runtime.Versioning.FrameworkName._profile]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Runtime.Versioning", "FrameworkName", False, "get_Version", "()", "", "Argument[this].SyntheticField[System.Runtime.Versioning.FrameworkName._version]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Runtime.Versioning", "TargetFrameworkAttribute", False, "TargetFrameworkAttribute", "(System.String)", "", "Argument[0]", "Argument[this].SyntheticField[System.Runtime.Versioning.TargetFrameworkAttribute._frameworkName]", "value", "dfc-generated"]
+      - ["System.Runtime.Versioning", "TargetFrameworkAttribute", False, "get_FrameworkName", "()", "", "Argument[this].SyntheticField[System.Runtime.Versioning.TargetFrameworkAttribute._frameworkName]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Runtime.Versioning", "VersioningHelper", False, "MakeVersionSafeName", "(System.String,System.Runtime.Versioning.ResourceScope,System.Runtime.Versioning.ResourceScope)", "", "Argument[0]", "ReturnValue", "taint", "dfc-generated"]
+      - ["System.Runtime.Versioning", "VersioningHelper", False, "MakeVersionSafeName", "(System.String,System.Runtime.Versioning.ResourceScope,System.Runtime.Versioning.ResourceScope,System.Type)", "", "Argument[0]", "ReturnValue", "taint", "dfc-generated"]
   - addsTo:
       pack: codeql/csharp-all
       extensible: neutralModel
diff --git a/csharp/ql/lib/ext/generated/System.Runtime.model.yml b/csharp/ql/lib/ext/generated/System.Runtime.model.yml
index 5dcc6d7aa7a..e611cdc47a7 100644
--- a/csharp/ql/lib/ext/generated/System.Runtime.model.yml
+++ b/csharp/ql/lib/ext/generated/System.Runtime.model.yml
@@ -13,6 +13,7 @@ extensions:
       - ["System.Runtime", "AmbiguousImplementationException", "AmbiguousImplementationException", "(System.String,System.Exception)", "summary", "df-generated"]
       - ["System.Runtime", "AssemblyTargetedPatchBandAttribute", "AssemblyTargetedPatchBandAttribute", "(System.String)", "summary", "df-generated"]
       - ["System.Runtime", "AssemblyTargetedPatchBandAttribute", "get_TargetedPatchBand", "()", "summary", "df-generated"]
+      - ["System.Runtime", "ControlledExecution", "Run", "(System.Action,System.Threading.CancellationToken)", "summary", "df-generated"]
       - ["System.Runtime", "DependentHandle", "DependentHandle", "(System.Object,System.Object)", "summary", "df-generated"]
       - ["System.Runtime", "DependentHandle", "Dispose", "()", "summary", "df-generated"]
       - ["System.Runtime", "DependentHandle", "get_IsAllocated", "()", "summary", "df-generated"]
diff --git a/csharp/ql/lib/ext/generated/System.Security.AccessControl.model.yml b/csharp/ql/lib/ext/generated/System.Security.AccessControl.model.yml
index 36074b6eb72..05e970edbe0 100644
--- a/csharp/ql/lib/ext/generated/System.Security.AccessControl.model.yml
+++ b/csharp/ql/lib/ext/generated/System.Security.AccessControl.model.yml
@@ -219,7 +219,10 @@ extensions:
       - ["System.Security.AccessControl", "MutexSecurity", "get_AuditRuleType", "()", "summary", "df-generated"]
       - ["System.Security.AccessControl", "NativeObjectSecurity", "NativeObjectSecurity", "(System.Boolean,System.Security.AccessControl.ResourceType)", "summary", "df-generated"]
       - ["System.Security.AccessControl", "NativeObjectSecurity", "NativeObjectSecurity", "(System.Boolean,System.Security.AccessControl.ResourceType,System.Runtime.InteropServices.SafeHandle,System.Security.AccessControl.AccessControlSections)", "summary", "df-generated"]
+      - ["System.Security.AccessControl", "NativeObjectSecurity", "NativeObjectSecurity", "(System.Boolean,System.Security.AccessControl.ResourceType,System.Runtime.InteropServices.SafeHandle,System.Security.AccessControl.AccessControlSections,System.Security.AccessControl.NativeObjectSecurity+ExceptionFromErrorCode,System.Object)", "summary", "df-generated"]
+      - ["System.Security.AccessControl", "NativeObjectSecurity", "NativeObjectSecurity", "(System.Boolean,System.Security.AccessControl.ResourceType,System.Security.AccessControl.NativeObjectSecurity+ExceptionFromErrorCode,System.Object)", "summary", "df-generated"]
       - ["System.Security.AccessControl", "NativeObjectSecurity", "NativeObjectSecurity", "(System.Boolean,System.Security.AccessControl.ResourceType,System.String,System.Security.AccessControl.AccessControlSections)", "summary", "df-generated"]
+      - ["System.Security.AccessControl", "NativeObjectSecurity", "NativeObjectSecurity", "(System.Boolean,System.Security.AccessControl.ResourceType,System.String,System.Security.AccessControl.AccessControlSections,System.Security.AccessControl.NativeObjectSecurity+ExceptionFromErrorCode,System.Object)", "summary", "df-generated"]
       - ["System.Security.AccessControl", "NativeObjectSecurity", "Persist", "(System.Runtime.InteropServices.SafeHandle,System.Security.AccessControl.AccessControlSections)", "summary", "df-generated"]
       - ["System.Security.AccessControl", "NativeObjectSecurity", "Persist", "(System.Runtime.InteropServices.SafeHandle,System.Security.AccessControl.AccessControlSections,System.Object)", "summary", "df-generated"]
       - ["System.Security.AccessControl", "NativeObjectSecurity", "Persist", "(System.String,System.Security.AccessControl.AccessControlSections)", "summary", "df-generated"]
@@ -282,7 +285,9 @@ extensions:
       - ["System.Security.AccessControl", "ObjectSecurity<T>", "AuditRuleFactory", "(System.Security.Principal.IdentityReference,System.Int32,System.Boolean,System.Security.AccessControl.InheritanceFlags,System.Security.AccessControl.PropagationFlags,System.Security.AccessControl.AuditFlags)", "summary", "df-generated"]
       - ["System.Security.AccessControl", "ObjectSecurity<T>", "ObjectSecurity", "(System.Boolean,System.Security.AccessControl.ResourceType)", "summary", "df-generated"]
       - ["System.Security.AccessControl", "ObjectSecurity<T>", "ObjectSecurity", "(System.Boolean,System.Security.AccessControl.ResourceType,System.Runtime.InteropServices.SafeHandle,System.Security.AccessControl.AccessControlSections)", "summary", "df-generated"]
+      - ["System.Security.AccessControl", "ObjectSecurity<T>", "ObjectSecurity", "(System.Boolean,System.Security.AccessControl.ResourceType,System.Runtime.InteropServices.SafeHandle,System.Security.AccessControl.AccessControlSections,System.Security.AccessControl.NativeObjectSecurity+ExceptionFromErrorCode,System.Object)", "summary", "df-generated"]
       - ["System.Security.AccessControl", "ObjectSecurity<T>", "ObjectSecurity", "(System.Boolean,System.Security.AccessControl.ResourceType,System.String,System.Security.AccessControl.AccessControlSections)", "summary", "df-generated"]
+      - ["System.Security.AccessControl", "ObjectSecurity<T>", "ObjectSecurity", "(System.Boolean,System.Security.AccessControl.ResourceType,System.String,System.Security.AccessControl.AccessControlSections,System.Security.AccessControl.NativeObjectSecurity+ExceptionFromErrorCode,System.Object)", "summary", "df-generated"]
       - ["System.Security.AccessControl", "ObjectSecurity<T>", "Persist", "(System.Runtime.InteropServices.SafeHandle)", "summary", "df-generated"]
       - ["System.Security.AccessControl", "ObjectSecurity<T>", "Persist", "(System.String)", "summary", "df-generated"]
       - ["System.Security.AccessControl", "ObjectSecurity<T>", "RemoveAccessRule", "(System.Security.AccessControl.AccessRule<T>)", "summary", "df-generated"]
diff --git a/csharp/ql/lib/ext/generated/System.Security.Authentication.ExtendedProtection.model.yml b/csharp/ql/lib/ext/generated/System.Security.Authentication.ExtendedProtection.model.yml
index e356ad3d80e..09bb8fc681d 100644
--- a/csharp/ql/lib/ext/generated/System.Security.Authentication.ExtendedProtection.model.yml
+++ b/csharp/ql/lib/ext/generated/System.Security.Authentication.ExtendedProtection.model.yml
@@ -4,14 +4,16 @@ extensions:
       pack: codeql/csharp-all
       extensible: summaryModel
     data:
-      - ["System.Security.Authentication.ExtendedProtection", "ExtendedProtectionPolicy", False, "ExtendedProtectionPolicy", "(System.Security.Authentication.ExtendedProtection.PolicyEnforcement,System.Security.Authentication.ExtendedProtection.ChannelBinding)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Security.Authentication.ExtendedProtection", "ExtendedProtectionPolicy", False, "ExtendedProtectionPolicy", "(System.Security.Authentication.ExtendedProtection.PolicyEnforcement,System.Security.Authentication.ExtendedProtection.ProtectionScenario,System.Security.Authentication.ExtendedProtection.ServiceNameCollection)", "", "Argument[2].Element", "Argument[this]", "taint", "df-generated"]
-      - ["System.Security.Authentication.ExtendedProtection", "ExtendedProtectionPolicy", False, "ToString", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Security.Authentication.ExtendedProtection", "ExtendedProtectionPolicy", False, "get_CustomChannelBinding", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Security.Authentication.ExtendedProtection", "ExtendedProtectionPolicy", False, "get_CustomServiceNames", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Security.Authentication.ExtendedProtection", "ServiceNameCollection", False, "Merge", "(System.Collections.IEnumerable)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["System.Security.Authentication.ExtendedProtection", "ServiceNameCollection", False, "Merge", "(System.String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Security.Authentication.ExtendedProtection", "ServiceNameCollection", False, "ServiceNameCollection", "(System.Collections.ICollection)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
+      - ["System.Security.Authentication.ExtendedProtection", "ExtendedProtectionPolicy", False, "ExtendedProtectionPolicy", "(System.Security.Authentication.ExtendedProtection.PolicyEnforcement,System.Security.Authentication.ExtendedProtection.ChannelBinding)", "", "Argument[1]", "Argument[this].SyntheticField[System.Security.Authentication.ExtendedProtection.ExtendedProtectionPolicy._customChannelBinding]", "value", "dfc-generated"]
+      - ["System.Security.Authentication.ExtendedProtection", "ExtendedProtectionPolicy", False, "ExtendedProtectionPolicy", "(System.Security.Authentication.ExtendedProtection.PolicyEnforcement,System.Security.Authentication.ExtendedProtection.ProtectionScenario,System.Security.Authentication.ExtendedProtection.ServiceNameCollection)", "", "Argument[2]", "Argument[this].SyntheticField[System.Security.Authentication.ExtendedProtection.ExtendedProtectionPolicy._customServiceNames]", "value", "dfc-generated"]
+      - ["System.Security.Authentication.ExtendedProtection", "ExtendedProtectionPolicy", False, "ToString", "()", "", "Argument[this].SyntheticField[System.Security.Authentication.ExtendedProtection.ExtendedProtectionPolicy._customServiceNames].Element", "ReturnValue", "taint", "dfc-generated"]
+      - ["System.Security.Authentication.ExtendedProtection", "ExtendedProtectionPolicy", False, "get_CustomChannelBinding", "()", "", "Argument[this].SyntheticField[System.Security.Authentication.ExtendedProtection.ExtendedProtectionPolicy._customChannelBinding]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Security.Authentication.ExtendedProtection", "ExtendedProtectionPolicy", False, "get_CustomServiceNames", "()", "", "Argument[this].SyntheticField[System.Security.Authentication.ExtendedProtection.ExtendedProtectionPolicy._customServiceNames]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Security.Authentication.ExtendedProtection", "ServiceNameCollection", False, "Merge", "(System.Collections.IEnumerable)", "", "Argument[0].Element", "ReturnValue.Property[System.Collections.ReadOnlyCollectionBase.InnerList].Element", "value", "dfc-generated"]
+      - ["System.Security.Authentication.ExtendedProtection", "ServiceNameCollection", False, "Merge", "(System.Collections.IEnumerable)", "", "Argument[0].Property[System.Collections.ReadOnlyCollectionBase.InnerList].Element", "ReturnValue.Property[System.Collections.ReadOnlyCollectionBase.InnerList].Element", "value", "dfc-generated"]
+      - ["System.Security.Authentication.ExtendedProtection", "ServiceNameCollection", False, "Merge", "(System.String)", "", "Argument[0]", "ReturnValue.Property[System.Collections.ReadOnlyCollectionBase.InnerList].Element", "value", "dfc-generated"]
+      - ["System.Security.Authentication.ExtendedProtection", "ServiceNameCollection", False, "ServiceNameCollection", "(System.Collections.ICollection)", "", "Argument[0].Element", "Argument[this].Property[System.Collections.ReadOnlyCollectionBase.InnerList].Element", "value", "dfc-generated"]
+      - ["System.Security.Authentication.ExtendedProtection", "ServiceNameCollection", False, "ServiceNameCollection", "(System.Collections.ICollection)", "", "Argument[0].Property[System.Collections.ReadOnlyCollectionBase.InnerList].Element", "Argument[this].Property[System.Collections.ReadOnlyCollectionBase.InnerList].Element", "value", "dfc-generated"]
   - addsTo:
       pack: codeql/csharp-all
       extensible: neutralModel
diff --git a/csharp/ql/lib/ext/generated/System.Security.Claims.model.yml b/csharp/ql/lib/ext/generated/System.Security.Claims.model.yml
index e6f5f24c6dd..3dc907cd1ab 100644
--- a/csharp/ql/lib/ext/generated/System.Security.Claims.model.yml
+++ b/csharp/ql/lib/ext/generated/System.Security.Claims.model.yml
@@ -4,7 +4,6 @@ extensions:
       pack: codeql/csharp-all
       extensible: summaryModel
     data:
-      - ["System.Security.Claims", "Claim", False, "Claim", "(System.IO.BinaryReader,System.Security.Claims.ClaimsIdentity)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Security.Claims", "Claim", False, "Claim", "(System.IO.BinaryReader,System.Security.Claims.ClaimsIdentity)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
       - ["System.Security.Claims", "Claim", False, "Claim", "(System.Security.Claims.Claim,System.Security.Claims.ClaimsIdentity)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Security.Claims", "Claim", False, "Claim", "(System.Security.Claims.Claim,System.Security.Claims.ClaimsIdentity)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
@@ -14,41 +13,34 @@ extensions:
       - ["System.Security.Claims", "Claim", False, "get_Type", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Security.Claims", "Claim", False, "get_Value", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Security.Claims", "Claim", False, "get_ValueType", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Security.Claims", "Claim", True, "Clone", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Security.Claims", "Claim", True, "Clone", "(System.Security.Claims.ClaimsIdentity)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Security.Claims", "Claim", True, "Clone", "(System.Security.Claims.ClaimsIdentity)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Security.Claims", "Claim", True, "WriteTo", "(System.IO.BinaryWriter,System.Byte[])", "", "Argument[1].Element", "Argument[0]", "taint", "df-generated"]
       - ["System.Security.Claims", "Claim", True, "get_CustomSerializationData", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Security.Claims", "ClaimsIdentity", False, "ClaimsIdentity", "(System.IO.BinaryReader)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Security.Claims", "ClaimsIdentity", False, "ClaimsIdentity", "(System.Security.Claims.ClaimsIdentity)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Security.Claims", "ClaimsIdentity", False, "ClaimsIdentity", "(System.Security.Principal.IIdentity,System.Collections.Generic.IEnumerable<System.Security.Claims.Claim>,System.String,System.String,System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Security.Claims", "ClaimsIdentity", False, "ClaimsIdentity", "(System.Security.Principal.IIdentity,System.Collections.Generic.IEnumerable<System.Security.Claims.Claim>,System.String,System.String,System.String)", "", "Argument[1].Element", "Argument[this]", "taint", "df-generated"]
-      - ["System.Security.Claims", "ClaimsIdentity", False, "ClaimsIdentity", "(System.Security.Principal.IIdentity,System.Collections.Generic.IEnumerable<System.Security.Claims.Claim>,System.String,System.String,System.String)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Security.Claims", "ClaimsIdentity", False, "ClaimsIdentity", "(System.Security.Principal.IIdentity,System.Collections.Generic.IEnumerable<System.Security.Claims.Claim>,System.String,System.String,System.String)", "", "Argument[3]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Security.Claims", "ClaimsIdentity", False, "ClaimsIdentity", "(System.Security.Principal.IIdentity,System.Collections.Generic.IEnumerable<System.Security.Claims.Claim>,System.String,System.String,System.String)", "", "Argument[4]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Security.Claims", "ClaimsIdentity", False, "get_NameClaimType", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Security.Claims", "ClaimsIdentity", False, "get_RoleClaimType", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Security.Claims", "ClaimsIdentity", True, "AddClaim", "(System.Security.Claims.Claim)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Security.Claims", "ClaimsIdentity", True, "AddClaims", "(System.Collections.Generic.IEnumerable<System.Security.Claims.Claim>)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["System.Security.Claims", "ClaimsIdentity", True, "Clone", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Security.Claims", "ClaimsIdentity", True, "CreateClaim", "(System.IO.BinaryReader)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Security.Claims", "ClaimsIdentity", True, "CreateClaim", "(System.IO.BinaryReader)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Security.Claims", "ClaimsIdentity", True, "FindFirst", "(System.String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Security.Claims", "ClaimsIdentity", True, "WriteTo", "(System.IO.BinaryWriter,System.Byte[])", "", "Argument[1].Element", "Argument[0]", "taint", "df-generated"]
-      - ["System.Security.Claims", "ClaimsIdentity", True, "get_Claims", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Security.Claims", "ClaimsIdentity", False, "ClaimsIdentity", "(System.Security.Principal.IIdentity,System.Collections.Generic.IEnumerable<System.Security.Claims.Claim>,System.String,System.String,System.String)", "", "Argument[1].Element", "Argument[this].SyntheticField[System.Security.Claims.ClaimsIdentity._instanceClaims].Element", "value", "dfc-generated"]
+      - ["System.Security.Claims", "ClaimsIdentity", False, "ClaimsIdentity", "(System.Security.Principal.IIdentity,System.Collections.Generic.IEnumerable<System.Security.Claims.Claim>,System.String,System.String,System.String)", "", "Argument[2]", "Argument[this].SyntheticField[System.Security.Claims.ClaimsIdentity._authenticationType]", "value", "dfc-generated"]
+      - ["System.Security.Claims", "ClaimsIdentity", False, "ClaimsIdentity", "(System.Security.Principal.IIdentity,System.Collections.Generic.IEnumerable<System.Security.Claims.Claim>,System.String,System.String,System.String)", "", "Argument[3]", "Argument[this].SyntheticField[System.Security.Claims.ClaimsIdentity._nameClaimType]", "value", "dfc-generated"]
+      - ["System.Security.Claims", "ClaimsIdentity", False, "ClaimsIdentity", "(System.Security.Principal.IIdentity,System.Collections.Generic.IEnumerable<System.Security.Claims.Claim>,System.String,System.String,System.String)", "", "Argument[4]", "Argument[this].SyntheticField[System.Security.Claims.ClaimsIdentity._roleClaimType]", "value", "dfc-generated"]
+      - ["System.Security.Claims", "ClaimsIdentity", False, "get_NameClaimType", "()", "", "Argument[this].SyntheticField[System.Security.Claims.ClaimsIdentity._nameClaimType]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Security.Claims", "ClaimsIdentity", False, "get_RoleClaimType", "()", "", "Argument[this].SyntheticField[System.Security.Claims.ClaimsIdentity._roleClaimType]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Security.Claims", "ClaimsIdentity", True, "AddClaim", "(System.Security.Claims.Claim)", "", "Argument[0]", "Argument[this].SyntheticField[System.Security.Claims.ClaimsIdentity._instanceClaims].Element", "value", "dfc-generated"]
+      - ["System.Security.Claims", "ClaimsIdentity", True, "AddClaims", "(System.Collections.Generic.IEnumerable<System.Security.Claims.Claim>)", "", "Argument[0].Element", "Argument[this].SyntheticField[System.Security.Claims.ClaimsIdentity._instanceClaims].Element", "value", "dfc-generated"]
+      - ["System.Security.Claims", "ClaimsIdentity", True, "FindFirst", "(System.String)", "", "Argument[this].Property[System.Security.Claims.ClaimsIdentity.Claims].Element", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Security.Claims", "ClaimsIdentity", True, "FindFirst", "(System.String)", "", "Argument[this].SyntheticField[System.Security.Claims.ClaimsIdentity._instanceClaims].Element", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Security.Claims", "ClaimsIdentity", True, "HasClaim", "(System.Predicate<System.Security.Claims.Claim>)", "", "Argument[this].Property[System.Security.Claims.ClaimsIdentity.Claims].Element", "Argument[0].Parameter[0]", "value", "dfc-generated"]
+      - ["System.Security.Claims", "ClaimsIdentity", True, "HasClaim", "(System.Predicate<System.Security.Claims.Claim>)", "", "Argument[this].SyntheticField[System.Security.Claims.ClaimsIdentity._instanceClaims].Element", "Argument[0].Parameter[0]", "value", "dfc-generated"]
+      - ["System.Security.Claims", "ClaimsIdentity", True, "get_AuthenticationType", "()", "", "Argument[this].SyntheticField[System.Security.Claims.ClaimsIdentity._authenticationType]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Security.Claims", "ClaimsIdentity", True, "get_Claims", "()", "", "Argument[this].SyntheticField[System.Security.Claims.ClaimsIdentity._instanceClaims].Element", "ReturnValue.Element", "value", "dfc-generated"]
+      - ["System.Security.Claims", "ClaimsIdentity", True, "get_Claims", "()", "", "Argument[this].SyntheticField[System.Security.Claims.ClaimsIdentity._instanceClaims]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Security.Claims", "ClaimsIdentity", True, "get_CustomSerializationData", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Security.Claims", "ClaimsPrincipal", False, "ClaimsPrincipal", "(System.Collections.Generic.IEnumerable<System.Security.Claims.ClaimsIdentity>)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["System.Security.Claims", "ClaimsPrincipal", False, "ClaimsPrincipal", "(System.Security.Principal.IIdentity)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Security.Claims", "ClaimsPrincipal", False, "ClaimsPrincipal", "(System.Security.Principal.IPrincipal)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Security.Claims", "ClaimsPrincipal", True, "AddIdentities", "(System.Collections.Generic.IEnumerable<System.Security.Claims.ClaimsIdentity>)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["System.Security.Claims", "ClaimsPrincipal", True, "AddIdentity", "(System.Security.Claims.ClaimsIdentity)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Security.Claims", "ClaimsPrincipal", True, "Clone", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Security.Claims", "ClaimsPrincipal", True, "CreateClaimsIdentity", "(System.IO.BinaryReader)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Security.Claims", "ClaimsPrincipal", False, "ClaimsPrincipal", "(System.Collections.Generic.IEnumerable<System.Security.Claims.ClaimsIdentity>)", "", "Argument[0].Element", "Argument[this].SyntheticField[System.Security.Claims.ClaimsPrincipal._identities].Element", "value", "dfc-generated"]
+      - ["System.Security.Claims", "ClaimsPrincipal", False, "ClaimsPrincipal", "(System.Security.Principal.IIdentity)", "", "Argument[0]", "Argument[this].SyntheticField[System.Security.Claims.ClaimsPrincipal._identities].Element", "value", "dfc-generated"]
+      - ["System.Security.Claims", "ClaimsPrincipal", False, "ClaimsPrincipal", "(System.Security.Principal.IPrincipal)", "", "Argument[0].Property[System.Security.Claims.ClaimsPrincipal.Identities].Element", "Argument[this].SyntheticField[System.Security.Claims.ClaimsPrincipal._identities].Element", "value", "dfc-generated"]
+      - ["System.Security.Claims", "ClaimsPrincipal", True, "AddIdentities", "(System.Collections.Generic.IEnumerable<System.Security.Claims.ClaimsIdentity>)", "", "Argument[0].Element", "Argument[this].SyntheticField[System.Security.Claims.ClaimsPrincipal._identities].Element", "value", "dfc-generated"]
+      - ["System.Security.Claims", "ClaimsPrincipal", True, "AddIdentity", "(System.Security.Claims.ClaimsIdentity)", "", "Argument[0]", "Argument[this].SyntheticField[System.Security.Claims.ClaimsPrincipal._identities].Element", "value", "dfc-generated"]
       - ["System.Security.Claims", "ClaimsPrincipal", True, "FindFirst", "(System.String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Security.Claims", "ClaimsPrincipal", True, "WriteTo", "(System.IO.BinaryWriter,System.Byte[])", "", "Argument[1].Element", "Argument[0]", "taint", "df-generated"]
       - ["System.Security.Claims", "ClaimsPrincipal", True, "get_Claims", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Security.Claims", "ClaimsPrincipal", True, "get_CustomSerializationData", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Security.Claims", "ClaimsPrincipal", True, "get_Identities", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Security.Claims", "ClaimsPrincipal", True, "get_Identities", "()", "", "Argument[this].SyntheticField[System.Security.Claims.ClaimsPrincipal._identities]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Security.Claims", "ClaimsPrincipal", True, "get_Identity", "()", "", "Argument[this].SyntheticField[System.Security.Claims.ClaimsPrincipal._identities].Element", "ReturnValue", "value", "dfc-generated"]
   - addsTo:
       pack: codeql/csharp-all
       extensible: neutralModel
@@ -60,29 +52,44 @@ extensions:
       - ["System.Security.Claims", "Claim", "Claim", "(System.String,System.String,System.String,System.String)", "summary", "df-generated"]
       - ["System.Security.Claims", "Claim", "Claim", "(System.String,System.String,System.String,System.String,System.String)", "summary", "df-generated"]
       - ["System.Security.Claims", "Claim", "Claim", "(System.String,System.String,System.String,System.String,System.String,System.Security.Claims.ClaimsIdentity)", "summary", "df-generated"]
+      - ["System.Security.Claims", "Claim", "Clone", "()", "summary", "df-generated"]
+      - ["System.Security.Claims", "Claim", "Clone", "(System.Security.Claims.ClaimsIdentity)", "summary", "df-generated"]
       - ["System.Security.Claims", "Claim", "WriteTo", "(System.IO.BinaryWriter)", "summary", "df-generated"]
+      - ["System.Security.Claims", "Claim", "WriteTo", "(System.IO.BinaryWriter,System.Byte[])", "summary", "df-generated"]
       - ["System.Security.Claims", "Claim", "get_Properties", "()", "summary", "df-generated"]
       - ["System.Security.Claims", "ClaimsIdentity", "ClaimsIdentity", "(System.Collections.Generic.IEnumerable<System.Security.Claims.Claim>)", "summary", "df-generated"]
       - ["System.Security.Claims", "ClaimsIdentity", "ClaimsIdentity", "(System.Collections.Generic.IEnumerable<System.Security.Claims.Claim>,System.String)", "summary", "df-generated"]
       - ["System.Security.Claims", "ClaimsIdentity", "ClaimsIdentity", "(System.Collections.Generic.IEnumerable<System.Security.Claims.Claim>,System.String,System.String,System.String)", "summary", "df-generated"]
+      - ["System.Security.Claims", "ClaimsIdentity", "ClaimsIdentity", "(System.IO.BinaryReader)", "summary", "df-generated"]
       - ["System.Security.Claims", "ClaimsIdentity", "ClaimsIdentity", "(System.Runtime.Serialization.SerializationInfo)", "summary", "df-generated"]
       - ["System.Security.Claims", "ClaimsIdentity", "ClaimsIdentity", "(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)", "summary", "df-generated"]
       - ["System.Security.Claims", "ClaimsIdentity", "ClaimsIdentity", "(System.Security.Principal.IIdentity)", "summary", "df-generated"]
       - ["System.Security.Claims", "ClaimsIdentity", "ClaimsIdentity", "(System.Security.Principal.IIdentity,System.Collections.Generic.IEnumerable<System.Security.Claims.Claim>)", "summary", "df-generated"]
       - ["System.Security.Claims", "ClaimsIdentity", "ClaimsIdentity", "(System.String)", "summary", "df-generated"]
       - ["System.Security.Claims", "ClaimsIdentity", "ClaimsIdentity", "(System.String,System.String,System.String)", "summary", "df-generated"]
+      - ["System.Security.Claims", "ClaimsIdentity", "Clone", "()", "summary", "df-generated"]
+      - ["System.Security.Claims", "ClaimsIdentity", "CreateClaim", "(System.IO.BinaryReader)", "summary", "df-generated"]
+      - ["System.Security.Claims", "ClaimsIdentity", "FindAll", "(System.Predicate<System.Security.Claims.Claim>)", "summary", "df-generated"]
       - ["System.Security.Claims", "ClaimsIdentity", "FindAll", "(System.String)", "summary", "df-generated"]
+      - ["System.Security.Claims", "ClaimsIdentity", "FindFirst", "(System.Predicate<System.Security.Claims.Claim>)", "summary", "df-generated"]
       - ["System.Security.Claims", "ClaimsIdentity", "GetObjectData", "(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)", "summary", "df-generated"]
       - ["System.Security.Claims", "ClaimsIdentity", "HasClaim", "(System.String,System.String)", "summary", "df-generated"]
       - ["System.Security.Claims", "ClaimsIdentity", "RemoveClaim", "(System.Security.Claims.Claim)", "summary", "df-generated"]
       - ["System.Security.Claims", "ClaimsIdentity", "TryRemoveClaim", "(System.Security.Claims.Claim)", "summary", "df-generated"]
       - ["System.Security.Claims", "ClaimsIdentity", "WriteTo", "(System.IO.BinaryWriter)", "summary", "df-generated"]
+      - ["System.Security.Claims", "ClaimsIdentity", "WriteTo", "(System.IO.BinaryWriter,System.Byte[])", "summary", "df-generated"]
       - ["System.Security.Claims", "ClaimsIdentity", "get_IsAuthenticated", "()", "summary", "df-generated"]
       - ["System.Security.Claims", "ClaimsPrincipal", "ClaimsPrincipal", "(System.IO.BinaryReader)", "summary", "df-generated"]
       - ["System.Security.Claims", "ClaimsPrincipal", "ClaimsPrincipal", "(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)", "summary", "df-generated"]
+      - ["System.Security.Claims", "ClaimsPrincipal", "Clone", "()", "summary", "df-generated"]
+      - ["System.Security.Claims", "ClaimsPrincipal", "CreateClaimsIdentity", "(System.IO.BinaryReader)", "summary", "df-generated"]
+      - ["System.Security.Claims", "ClaimsPrincipal", "FindAll", "(System.Predicate<System.Security.Claims.Claim>)", "summary", "df-generated"]
       - ["System.Security.Claims", "ClaimsPrincipal", "FindAll", "(System.String)", "summary", "df-generated"]
+      - ["System.Security.Claims", "ClaimsPrincipal", "FindFirst", "(System.Predicate<System.Security.Claims.Claim>)", "summary", "df-generated"]
       - ["System.Security.Claims", "ClaimsPrincipal", "GetObjectData", "(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)", "summary", "df-generated"]
+      - ["System.Security.Claims", "ClaimsPrincipal", "HasClaim", "(System.Predicate<System.Security.Claims.Claim>)", "summary", "df-generated"]
       - ["System.Security.Claims", "ClaimsPrincipal", "HasClaim", "(System.String,System.String)", "summary", "df-generated"]
       - ["System.Security.Claims", "ClaimsPrincipal", "IsInRole", "(System.String)", "summary", "df-generated"]
       - ["System.Security.Claims", "ClaimsPrincipal", "WriteTo", "(System.IO.BinaryWriter)", "summary", "df-generated"]
+      - ["System.Security.Claims", "ClaimsPrincipal", "WriteTo", "(System.IO.BinaryWriter,System.Byte[])", "summary", "df-generated"]
       - ["System.Security.Claims", "ClaimsPrincipal", "get_Current", "()", "summary", "df-generated"]
diff --git a/csharp/ql/lib/ext/generated/System.Security.Cryptography.Cose.model.yml b/csharp/ql/lib/ext/generated/System.Security.Cryptography.Cose.model.yml
index 0f164845a53..57e6aa1f4d6 100644
--- a/csharp/ql/lib/ext/generated/System.Security.Cryptography.Cose.model.yml
+++ b/csharp/ql/lib/ext/generated/System.Security.Cryptography.Cose.model.yml
@@ -5,21 +5,14 @@ extensions:
       extensible: summaryModel
     data:
       - ["System.Security.Cryptography.Cose", "CoseHeaderLabel", False, "CoseHeaderLabel", "(System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Security.Cryptography.Cose", "CoseHeaderMap", False, "Add", "(System.Security.Cryptography.Cose.CoseHeaderLabel,System.Byte[])", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Security.Cryptography.Cose", "CoseHeaderMap", False, "Add", "(System.Security.Cryptography.Cose.CoseHeaderLabel,System.Int32)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Security.Cryptography.Cose", "CoseHeaderMap", False, "Add", "(System.Security.Cryptography.Cose.CoseHeaderLabel,System.ReadOnlySpan<System.Byte>)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Security.Cryptography.Cose", "CoseHeaderMap", False, "Add", "(System.Security.Cryptography.Cose.CoseHeaderLabel,System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["System.Security.Cryptography.Cose", "CoseHeaderMap", False, "Add", "(System.Security.Cryptography.Cose.CoseHeaderLabel,System.Byte[])", "", "Argument[0]", "Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Key]", "value", "dfc-generated"]
+      - ["System.Security.Cryptography.Cose", "CoseHeaderMap", False, "Add", "(System.Security.Cryptography.Cose.CoseHeaderLabel,System.Int32)", "", "Argument[0]", "Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Key]", "value", "dfc-generated"]
+      - ["System.Security.Cryptography.Cose", "CoseHeaderMap", False, "Add", "(System.Security.Cryptography.Cose.CoseHeaderLabel,System.ReadOnlySpan<System.Byte>)", "", "Argument[0]", "Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Key]", "value", "dfc-generated"]
+      - ["System.Security.Cryptography.Cose", "CoseHeaderMap", False, "Add", "(System.Security.Cryptography.Cose.CoseHeaderLabel,System.String)", "", "Argument[0]", "Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Key]", "value", "dfc-generated"]
       - ["System.Security.Cryptography.Cose", "CoseHeaderMap", False, "get_Keys", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Security.Cryptography.Cose", "CoseHeaderMap", False, "get_Values", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Security.Cryptography.Cose", "CoseHeaderValue", False, "GetValueAsBytes", "(System.Span<System.Byte>)", "", "Argument[this]", "Argument[0]", "taint", "df-generated"]
-      - ["System.Security.Cryptography.Cose", "CoseHeaderValue", False, "GetValueAsString", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Security.Cryptography.Cose", "CoseMessage", False, "get_Content", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Security.Cryptography.Cose", "CoseMessage", False, "get_ProtectedHeaders", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Security.Cryptography.Cose", "CoseMessage", False, "get_RawProtectedHeaders", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Security.Cryptography.Cose", "CoseMessage", False, "get_UnprotectedHeaders", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Security.Cryptography.Cose", "CoseSign1Message", False, "get_Signature", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Security.Cryptography.Cose", "CoseSignature", False, "get_RawProtectedHeaders", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Security.Cryptography.Cose", "CoseSignature", False, "get_Signature", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Security.Cryptography.Cose", "CoseSigner", False, "CoseSigner", "(System.Security.Cryptography.AsymmetricAlgorithm,System.Security.Cryptography.HashAlgorithmName,System.Security.Cryptography.Cose.CoseHeaderMap,System.Security.Cryptography.Cose.CoseHeaderMap)", "", "Argument[2].Element", "Argument[this]", "taint", "df-generated"]
       - ["System.Security.Cryptography.Cose", "CoseSigner", False, "CoseSigner", "(System.Security.Cryptography.AsymmetricAlgorithm,System.Security.Cryptography.HashAlgorithmName,System.Security.Cryptography.Cose.CoseHeaderMap,System.Security.Cryptography.Cose.CoseHeaderMap)", "", "Argument[3].Element", "Argument[this]", "taint", "df-generated"]
       - ["System.Security.Cryptography.Cose", "CoseSigner", False, "CoseSigner", "(System.Security.Cryptography.RSA,System.Security.Cryptography.RSASignaturePadding,System.Security.Cryptography.HashAlgorithmName,System.Security.Cryptography.Cose.CoseHeaderMap,System.Security.Cryptography.Cose.CoseHeaderMap)", "", "Argument[3].Element", "Argument[this]", "taint", "df-generated"]
@@ -58,7 +51,9 @@ extensions:
       - ["System.Security.Cryptography.Cose", "CoseHeaderValue", "FromString", "(System.String)", "summary", "df-generated"]
       - ["System.Security.Cryptography.Cose", "CoseHeaderValue", "GetHashCode", "()", "summary", "df-generated"]
       - ["System.Security.Cryptography.Cose", "CoseHeaderValue", "GetValueAsBytes", "()", "summary", "df-generated"]
+      - ["System.Security.Cryptography.Cose", "CoseHeaderValue", "GetValueAsBytes", "(System.Span<System.Byte>)", "summary", "df-generated"]
       - ["System.Security.Cryptography.Cose", "CoseHeaderValue", "GetValueAsInt32", "()", "summary", "df-generated"]
+      - ["System.Security.Cryptography.Cose", "CoseHeaderValue", "GetValueAsString", "()", "summary", "df-generated"]
       - ["System.Security.Cryptography.Cose", "CoseHeaderValue", "get_EncodedValue", "()", "summary", "df-generated"]
       - ["System.Security.Cryptography.Cose", "CoseHeaderValue", "op_Equality", "(System.Security.Cryptography.Cose.CoseHeaderValue,System.Security.Cryptography.Cose.CoseHeaderValue)", "summary", "df-generated"]
       - ["System.Security.Cryptography.Cose", "CoseHeaderValue", "op_Inequality", "(System.Security.Cryptography.Cose.CoseHeaderValue,System.Security.Cryptography.Cose.CoseHeaderValue)", "summary", "df-generated"]
@@ -70,6 +65,8 @@ extensions:
       - ["System.Security.Cryptography.Cose", "CoseMessage", "Encode", "(System.Span<System.Byte>)", "summary", "df-generated"]
       - ["System.Security.Cryptography.Cose", "CoseMessage", "GetEncodedLength", "()", "summary", "df-generated"]
       - ["System.Security.Cryptography.Cose", "CoseMessage", "TryEncode", "(System.Span<System.Byte>,System.Int32)", "summary", "df-generated"]
+      - ["System.Security.Cryptography.Cose", "CoseMessage", "get_Content", "()", "summary", "df-generated"]
+      - ["System.Security.Cryptography.Cose", "CoseMessage", "get_RawProtectedHeaders", "()", "summary", "df-generated"]
       - ["System.Security.Cryptography.Cose", "CoseMultiSignMessage", "AddSignatureForDetached", "(System.Byte[],System.Security.Cryptography.Cose.CoseSigner,System.Byte[])", "summary", "df-generated"]
       - ["System.Security.Cryptography.Cose", "CoseMultiSignMessage", "AddSignatureForDetached", "(System.IO.Stream,System.Security.Cryptography.Cose.CoseSigner,System.ReadOnlySpan<System.Byte>)", "summary", "df-generated"]
       - ["System.Security.Cryptography.Cose", "CoseMultiSignMessage", "AddSignatureForDetached", "(System.ReadOnlySpan<System.Byte>,System.Security.Cryptography.Cose.CoseSigner,System.ReadOnlySpan<System.Byte>)", "summary", "df-generated"]
@@ -105,6 +102,7 @@ extensions:
       - ["System.Security.Cryptography.Cose", "CoseSign1Message", "VerifyDetachedAsync", "(System.Security.Cryptography.AsymmetricAlgorithm,System.IO.Stream,System.ReadOnlyMemory<System.Byte>,System.Threading.CancellationToken)", "summary", "df-generated"]
       - ["System.Security.Cryptography.Cose", "CoseSign1Message", "VerifyEmbedded", "(System.Security.Cryptography.AsymmetricAlgorithm,System.Byte[])", "summary", "df-generated"]
       - ["System.Security.Cryptography.Cose", "CoseSign1Message", "VerifyEmbedded", "(System.Security.Cryptography.AsymmetricAlgorithm,System.ReadOnlySpan<System.Byte>)", "summary", "df-generated"]
+      - ["System.Security.Cryptography.Cose", "CoseSign1Message", "get_Signature", "()", "summary", "df-generated"]
       - ["System.Security.Cryptography.Cose", "CoseSignature", "VerifyDetached", "(System.Security.Cryptography.AsymmetricAlgorithm,System.Byte[],System.Byte[])", "summary", "df-generated"]
       - ["System.Security.Cryptography.Cose", "CoseSignature", "VerifyDetached", "(System.Security.Cryptography.AsymmetricAlgorithm,System.IO.Stream,System.ReadOnlySpan<System.Byte>)", "summary", "df-generated"]
       - ["System.Security.Cryptography.Cose", "CoseSignature", "VerifyDetached", "(System.Security.Cryptography.AsymmetricAlgorithm,System.ReadOnlySpan<System.Byte>,System.ReadOnlySpan<System.Byte>)", "summary", "df-generated"]
@@ -112,6 +110,8 @@ extensions:
       - ["System.Security.Cryptography.Cose", "CoseSignature", "VerifyEmbedded", "(System.Security.Cryptography.AsymmetricAlgorithm,System.Byte[])", "summary", "df-generated"]
       - ["System.Security.Cryptography.Cose", "CoseSignature", "VerifyEmbedded", "(System.Security.Cryptography.AsymmetricAlgorithm,System.ReadOnlySpan<System.Byte>)", "summary", "df-generated"]
       - ["System.Security.Cryptography.Cose", "CoseSignature", "get_ProtectedHeaders", "()", "summary", "df-generated"]
+      - ["System.Security.Cryptography.Cose", "CoseSignature", "get_RawProtectedHeaders", "()", "summary", "df-generated"]
+      - ["System.Security.Cryptography.Cose", "CoseSignature", "get_Signature", "()", "summary", "df-generated"]
       - ["System.Security.Cryptography.Cose", "CoseSignature", "get_UnprotectedHeaders", "()", "summary", "df-generated"]
       - ["System.Security.Cryptography.Cose", "CoseSigner", "get_HashAlgorithm", "()", "summary", "df-generated"]
       - ["System.Security.Cryptography.Cose", "CoseSigner", "get_Key", "()", "summary", "df-generated"]
diff --git a/csharp/ql/lib/ext/generated/System.Security.Cryptography.Pkcs.model.yml b/csharp/ql/lib/ext/generated/System.Security.Cryptography.Pkcs.model.yml
index 1439d88d22b..a349bfae145 100644
--- a/csharp/ql/lib/ext/generated/System.Security.Cryptography.Pkcs.model.yml
+++ b/csharp/ql/lib/ext/generated/System.Security.Cryptography.Pkcs.model.yml
@@ -4,58 +4,48 @@ extensions:
       pack: codeql/csharp-all
       extensible: summaryModel
     data:
-      - ["System.Security.Cryptography.Pkcs", "CmsRecipientCollection", False, "Add", "(System.Security.Cryptography.Pkcs.CmsRecipient)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Security.Cryptography.Pkcs", "CmsRecipientCollection", False, "CmsRecipientCollection", "(System.Security.Cryptography.Pkcs.CmsRecipient)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Security.Cryptography.Pkcs", "CmsRecipientCollection", False, "CopyTo", "(System.Security.Cryptography.Pkcs.CmsRecipient[],System.Int32)", "", "Argument[this]", "Argument[0].Element", "taint", "df-generated"]
+      - ["System.Security.Cryptography.Pkcs", "CmsRecipientCollection", False, "Add", "(System.Security.Cryptography.Pkcs.CmsRecipient)", "", "Argument[0]", "Argument[this].SyntheticField[System.Security.Cryptography.Pkcs.CmsRecipientCollection._recipients].Element", "value", "dfc-generated"]
+      - ["System.Security.Cryptography.Pkcs", "CmsRecipientCollection", False, "CmsRecipientCollection", "(System.Security.Cryptography.Pkcs.CmsRecipient)", "", "Argument[0]", "Argument[this].SyntheticField[System.Security.Cryptography.Pkcs.CmsRecipientCollection._recipients].Element", "value", "dfc-generated"]
+      - ["System.Security.Cryptography.Pkcs", "CmsRecipientCollection", False, "CopyTo", "(System.Security.Cryptography.Pkcs.CmsRecipient[],System.Int32)", "", "Argument[this].SyntheticField[System.Security.Cryptography.Pkcs.CmsRecipientCollection._recipients].Element", "Argument[0].Element", "value", "dfc-generated"]
       - ["System.Security.Cryptography.Pkcs", "CmsRecipientCollection", False, "GetEnumerator", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Security.Cryptography.Pkcs", "CmsRecipientCollection", False, "get_Item", "(System.Int32)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Security.Cryptography.Pkcs", "CmsRecipientCollection", False, "get_Item", "(System.Int32)", "", "Argument[this].SyntheticField[System.Security.Cryptography.Pkcs.CmsRecipientCollection._recipients].Element", "ReturnValue", "value", "dfc-generated"]
       - ["System.Security.Cryptography.Pkcs", "CmsRecipientEnumerator", False, "get_Current", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Security.Cryptography.Pkcs", "EnvelopedCms", False, "Encode", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Security.Cryptography.Pkcs", "EnvelopedCms", False, "get_RecipientInfos", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Security.Cryptography.Pkcs", "Pkcs12Builder", False, "Encode", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Security.Cryptography.Pkcs", "Pkcs12Builder", False, "TryEncode", "(System.Span<System.Byte>,System.Int32)", "", "Argument[this]", "Argument[0]", "taint", "df-generated"]
-      - ["System.Security.Cryptography.Pkcs", "Pkcs12CertBag", False, "GetCertificateType", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Security.Cryptography.Pkcs", "Pkcs12CertBag", False, "Pkcs12CertBag", "(System.Security.Cryptography.Oid,System.ReadOnlyMemory<System.Byte>)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["System.Security.Cryptography.Pkcs", "Pkcs12CertBag", False, "GetCertificateType", "()", "", "Argument[this].SyntheticField[System.Security.Cryptography.Pkcs.Pkcs12CertBag._certTypeOid]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Security.Cryptography.Pkcs", "Pkcs12CertBag", False, "Pkcs12CertBag", "(System.Security.Cryptography.Oid,System.ReadOnlyMemory<System.Byte>)", "", "Argument[0]", "Argument[this].SyntheticField[System.Security.Cryptography.Pkcs.Pkcs12CertBag._certTypeOid]", "value", "dfc-generated"]
       - ["System.Security.Cryptography.Pkcs", "Pkcs12CertBag", False, "get_EncodedCertificate", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Security.Cryptography.Pkcs", "Pkcs12KeyBag", False, "get_Pkcs8PrivateKey", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Security.Cryptography.Pkcs", "Pkcs12KeyBag", False, "get_Pkcs8PrivateKey", "()", "", "Argument[this].Property[System.Security.Cryptography.Pkcs.Pkcs12SafeBag.EncodedBagValue]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Security.Cryptography.Pkcs", "Pkcs12SafeBag", False, "GetBagId", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Security.Cryptography.Pkcs", "Pkcs12SafeBag", False, "Pkcs12SafeBag", "(System.String,System.ReadOnlyMemory<System.Byte>,System.Boolean)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Security.Cryptography.Pkcs", "Pkcs12SafeContents", False, "AddSafeBag", "(System.Security.Cryptography.Pkcs.Pkcs12SafeBag)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Security.Cryptography.Pkcs", "Pkcs12SafeContents", False, "AddSecret", "(System.Security.Cryptography.Oid,System.ReadOnlyMemory<System.Byte>)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Security.Cryptography.Pkcs", "Pkcs12SafeContents", False, "GetBags", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Security.Cryptography.Pkcs", "Pkcs12SafeContents", False, "AddSafeBag", "(System.Security.Cryptography.Pkcs.Pkcs12SafeBag)", "", "Argument[0]", "Argument[this].SyntheticField[System.Security.Cryptography.Pkcs.Pkcs12SafeContents._bags].Element", "value", "dfc-generated"]
+      - ["System.Security.Cryptography.Pkcs", "Pkcs12SafeContents", False, "GetBags", "()", "", "Argument[this].SyntheticField[System.Security.Cryptography.Pkcs.Pkcs12SafeContents._bags].Element", "ReturnValue.Element", "value", "dfc-generated"]
       - ["System.Security.Cryptography.Pkcs", "Pkcs12SecretBag", False, "GetSecretType", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Security.Cryptography.Pkcs", "Pkcs12SecretBag", False, "get_SecretValue", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Security.Cryptography.Pkcs", "Pkcs12ShroudedKeyBag", False, "get_EncryptedPkcs8PrivateKey", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Security.Cryptography.Pkcs", "Pkcs9AttributeObject", False, "get_Oid", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Security.Cryptography.Pkcs", "Pkcs12ShroudedKeyBag", False, "get_EncryptedPkcs8PrivateKey", "()", "", "Argument[this].Property[System.Security.Cryptography.Pkcs.Pkcs12SafeBag.EncodedBagValue]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Security.Cryptography.Pkcs", "Pkcs9AttributeObject", False, "get_Oid", "()", "", "Argument[this].Property[System.Security.Cryptography.AsnEncodedData.Oid]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Security.Cryptography.Pkcs", "Pkcs9DocumentDescription", False, "Pkcs9DocumentDescription", "(System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Security.Cryptography.Pkcs", "Pkcs9DocumentName", False, "Pkcs9DocumentName", "(System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Security.Cryptography.Pkcs", "RecipientInfoCollection", False, "CopyTo", "(System.Security.Cryptography.Pkcs.RecipientInfo[],System.Int32)", "", "Argument[this]", "Argument[0].Element", "taint", "df-generated"]
       - ["System.Security.Cryptography.Pkcs", "RecipientInfoCollection", False, "GetEnumerator", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Security.Cryptography.Pkcs", "RecipientInfoCollection", False, "get_Item", "(System.Int32)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Security.Cryptography.Pkcs", "RecipientInfoEnumerator", False, "get_Current", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Security.Cryptography.Pkcs", "Rfc3161TimestampRequest", False, "Encode", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Security.Cryptography.Pkcs", "Rfc3161TimestampRequest", False, "Encode", "()", "", "Argument[this].SyntheticField[System.Security.Cryptography.Pkcs.Rfc3161TimestampRequest._encodedBytes].Element", "ReturnValue.Element", "value", "dfc-generated"]
+      - ["System.Security.Cryptography.Pkcs", "Rfc3161TimestampRequest", False, "Encode", "()", "", "Argument[this].SyntheticField[System.Security.Cryptography.Pkcs.Rfc3161TimestampRequest._encodedBytes]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Security.Cryptography.Pkcs", "Rfc3161TimestampRequest", False, "GetNonce", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Security.Cryptography.Pkcs", "Rfc3161TimestampRequest", False, "TryDecode", "(System.ReadOnlyMemory<System.Byte>,System.Security.Cryptography.Pkcs.Rfc3161TimestampRequest,System.Int32)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Security.Cryptography.Pkcs", "Rfc3161TimestampRequest", False, "TryEncode", "(System.Span<System.Byte>,System.Int32)", "", "Argument[this]", "Argument[0]", "taint", "df-generated"]
+      - ["System.Security.Cryptography.Pkcs", "Rfc3161TimestampRequest", False, "TryDecode", "(System.ReadOnlyMemory<System.Byte>,System.Security.Cryptography.Pkcs.Rfc3161TimestampRequest,System.Int32)", "", "Argument[0].Property[System.ReadOnlyMemory`1.Span].Element", "ReturnValue.SyntheticField[System.Security.Cryptography.Pkcs.Rfc3161TimestampRequest._encodedBytes].Element", "value", "dfc-generated"]
       - ["System.Security.Cryptography.Pkcs", "Rfc3161TimestampToken", False, "AsSignedCms", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Security.Cryptography.Pkcs", "Rfc3161TimestampToken", False, "VerifySignatureForData", "(System.ReadOnlySpan<System.Byte>,System.Security.Cryptography.X509Certificates.X509Certificate2,System.Security.Cryptography.X509Certificates.X509Certificate2Collection)", "", "Argument[2].Element", "ReturnValue", "taint", "df-generated"]
-      - ["System.Security.Cryptography.Pkcs", "Rfc3161TimestampToken", False, "VerifySignatureForData", "(System.ReadOnlySpan<System.Byte>,System.Security.Cryptography.X509Certificates.X509Certificate2,System.Security.Cryptography.X509Certificates.X509Certificate2Collection)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Security.Cryptography.Pkcs", "Rfc3161TimestampToken", False, "VerifySignatureForHash", "(System.ReadOnlySpan<System.Byte>,System.Security.Cryptography.HashAlgorithmName,System.Security.Cryptography.X509Certificates.X509Certificate2,System.Security.Cryptography.X509Certificates.X509Certificate2Collection)", "", "Argument[3].Element", "ReturnValue", "taint", "df-generated"]
-      - ["System.Security.Cryptography.Pkcs", "Rfc3161TimestampToken", False, "VerifySignatureForHash", "(System.ReadOnlySpan<System.Byte>,System.Security.Cryptography.HashAlgorithmName,System.Security.Cryptography.X509Certificates.X509Certificate2,System.Security.Cryptography.X509Certificates.X509Certificate2Collection)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Security.Cryptography.Pkcs", "Rfc3161TimestampToken", False, "VerifySignatureForHash", "(System.ReadOnlySpan<System.Byte>,System.Security.Cryptography.Oid,System.Security.Cryptography.X509Certificates.X509Certificate2,System.Security.Cryptography.X509Certificates.X509Certificate2Collection)", "", "Argument[3].Element", "ReturnValue", "taint", "df-generated"]
-      - ["System.Security.Cryptography.Pkcs", "Rfc3161TimestampToken", False, "VerifySignatureForHash", "(System.ReadOnlySpan<System.Byte>,System.Security.Cryptography.Oid,System.Security.Cryptography.X509Certificates.X509Certificate2,System.Security.Cryptography.X509Certificates.X509Certificate2Collection)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Security.Cryptography.Pkcs", "Rfc3161TimestampToken", False, "VerifySignatureForSignerInfo", "(System.Security.Cryptography.Pkcs.SignerInfo,System.Security.Cryptography.X509Certificates.X509Certificate2,System.Security.Cryptography.X509Certificates.X509Certificate2Collection)", "", "Argument[2].Element", "ReturnValue", "taint", "df-generated"]
-      - ["System.Security.Cryptography.Pkcs", "Rfc3161TimestampToken", False, "VerifySignatureForSignerInfo", "(System.Security.Cryptography.Pkcs.SignerInfo,System.Security.Cryptography.X509Certificates.X509Certificate2,System.Security.Cryptography.X509Certificates.X509Certificate2Collection)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Security.Cryptography.Pkcs", "Rfc3161TimestampToken", False, "VerifySignatureForData", "(System.ReadOnlySpan<System.Byte>,System.Security.Cryptography.X509Certificates.X509Certificate2,System.Security.Cryptography.X509Certificates.X509Certificate2Collection)", "", "Argument[2].Element", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Security.Cryptography.Pkcs", "Rfc3161TimestampToken", False, "VerifySignatureForHash", "(System.ReadOnlySpan<System.Byte>,System.Security.Cryptography.HashAlgorithmName,System.Security.Cryptography.X509Certificates.X509Certificate2,System.Security.Cryptography.X509Certificates.X509Certificate2Collection)", "", "Argument[3].Element", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Security.Cryptography.Pkcs", "Rfc3161TimestampToken", False, "VerifySignatureForHash", "(System.ReadOnlySpan<System.Byte>,System.Security.Cryptography.Oid,System.Security.Cryptography.X509Certificates.X509Certificate2,System.Security.Cryptography.X509Certificates.X509Certificate2Collection)", "", "Argument[3].Element", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Security.Cryptography.Pkcs", "Rfc3161TimestampToken", False, "VerifySignatureForSignerInfo", "(System.Security.Cryptography.Pkcs.SignerInfo,System.Security.Cryptography.X509Certificates.X509Certificate2,System.Security.Cryptography.X509Certificates.X509Certificate2Collection)", "", "Argument[2].Element", "ReturnValue", "value", "dfc-generated"]
       - ["System.Security.Cryptography.Pkcs", "Rfc3161TimestampTokenInfo", False, "Encode", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Security.Cryptography.Pkcs", "Rfc3161TimestampTokenInfo", False, "GetNonce", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Security.Cryptography.Pkcs", "Rfc3161TimestampTokenInfo", False, "GetSerialNumber", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Security.Cryptography.Pkcs", "Rfc3161TimestampTokenInfo", False, "GetTimestampAuthorityName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Security.Cryptography.Pkcs", "Rfc3161TimestampTokenInfo", False, "TryEncode", "(System.Span<System.Byte>,System.Int32)", "", "Argument[this]", "Argument[0]", "taint", "df-generated"]
       - ["System.Security.Cryptography.Pkcs", "Rfc3161TimestampTokenInfo", False, "get_Timestamp", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Security.Cryptography.Pkcs", "SignerInfo", False, "GetSignature", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Security.Cryptography.Pkcs", "SignerInfo", False, "get_DigestAlgorithm", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Security.Cryptography.Pkcs", "SignerInfo", False, "get_SignatureAlgorithm", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Security.Cryptography.Pkcs", "SignerInfoCollection", False, "CopyTo", "(System.Security.Cryptography.Pkcs.SignerInfo[],System.Int32)", "", "Argument[this]", "Argument[0].Element", "taint", "df-generated"]
+      - ["System.Security.Cryptography.Pkcs", "SignerInfoCollection", False, "CopyTo", "(System.Security.Cryptography.Pkcs.SignerInfo[],System.Int32)", "", "Argument[this].Element", "Argument[0].Element", "value", "dfc-generated"]
       - ["System.Security.Cryptography.Pkcs", "SignerInfoCollection", False, "GetEnumerator", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Security.Cryptography.Pkcs", "SignerInfoCollection", False, "get_Item", "(System.Int32)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Security.Cryptography.Pkcs", "SignerInfoEnumerator", False, "get_Current", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
@@ -117,6 +107,7 @@ extensions:
       - ["System.Security.Cryptography.Pkcs", "Pkcs12Builder", "AddSafeContentsEncrypted", "(System.Security.Cryptography.Pkcs.Pkcs12SafeContents,System.ReadOnlySpan<System.Char>,System.Security.Cryptography.PbeParameters)", "summary", "df-generated"]
       - ["System.Security.Cryptography.Pkcs", "Pkcs12Builder", "AddSafeContentsEncrypted", "(System.Security.Cryptography.Pkcs.Pkcs12SafeContents,System.String,System.Security.Cryptography.PbeParameters)", "summary", "df-generated"]
       - ["System.Security.Cryptography.Pkcs", "Pkcs12Builder", "AddSafeContentsUnencrypted", "(System.Security.Cryptography.Pkcs.Pkcs12SafeContents)", "summary", "df-generated"]
+      - ["System.Security.Cryptography.Pkcs", "Pkcs12Builder", "Encode", "()", "summary", "df-generated"]
       - ["System.Security.Cryptography.Pkcs", "Pkcs12Builder", "SealWithMac", "(System.ReadOnlySpan<System.Char>,System.Security.Cryptography.HashAlgorithmName,System.Int32)", "summary", "df-generated"]
       - ["System.Security.Cryptography.Pkcs", "Pkcs12Builder", "SealWithMac", "(System.String,System.Security.Cryptography.HashAlgorithmName,System.Int32)", "summary", "df-generated"]
       - ["System.Security.Cryptography.Pkcs", "Pkcs12Builder", "SealWithoutIntegrity", "()", "summary", "df-generated"]
@@ -133,6 +124,7 @@ extensions:
       - ["System.Security.Cryptography.Pkcs", "Pkcs12SafeContents", "AddCertificate", "(System.Security.Cryptography.X509Certificates.X509Certificate2)", "summary", "df-generated"]
       - ["System.Security.Cryptography.Pkcs", "Pkcs12SafeContents", "AddKeyUnencrypted", "(System.Security.Cryptography.AsymmetricAlgorithm)", "summary", "df-generated"]
       - ["System.Security.Cryptography.Pkcs", "Pkcs12SafeContents", "AddNestedContents", "(System.Security.Cryptography.Pkcs.Pkcs12SafeContents)", "summary", "df-generated"]
+      - ["System.Security.Cryptography.Pkcs", "Pkcs12SafeContents", "AddSecret", "(System.Security.Cryptography.Oid,System.ReadOnlyMemory<System.Byte>)", "summary", "df-generated"]
       - ["System.Security.Cryptography.Pkcs", "Pkcs12SafeContents", "AddShroudedKey", "(System.Security.Cryptography.AsymmetricAlgorithm,System.Byte[],System.Security.Cryptography.PbeParameters)", "summary", "df-generated"]
       - ["System.Security.Cryptography.Pkcs", "Pkcs12SafeContents", "AddShroudedKey", "(System.Security.Cryptography.AsymmetricAlgorithm,System.ReadOnlySpan<System.Byte>,System.Security.Cryptography.PbeParameters)", "summary", "df-generated"]
       - ["System.Security.Cryptography.Pkcs", "Pkcs12SafeContents", "AddShroudedKey", "(System.Security.Cryptography.AsymmetricAlgorithm,System.ReadOnlySpan<System.Char>,System.Security.Cryptography.PbeParameters)", "summary", "df-generated"]
@@ -191,6 +183,7 @@ extensions:
       - ["System.Security.Cryptography.Pkcs", "Rfc3161TimestampRequest", "GetExtensions", "()", "summary", "df-generated"]
       - ["System.Security.Cryptography.Pkcs", "Rfc3161TimestampRequest", "GetMessageHash", "()", "summary", "df-generated"]
       - ["System.Security.Cryptography.Pkcs", "Rfc3161TimestampRequest", "ProcessResponse", "(System.ReadOnlyMemory<System.Byte>,System.Int32)", "summary", "df-generated"]
+      - ["System.Security.Cryptography.Pkcs", "Rfc3161TimestampRequest", "TryEncode", "(System.Span<System.Byte>,System.Int32)", "summary", "df-generated"]
       - ["System.Security.Cryptography.Pkcs", "Rfc3161TimestampRequest", "get_HasExtensions", "()", "summary", "df-generated"]
       - ["System.Security.Cryptography.Pkcs", "Rfc3161TimestampRequest", "get_HashAlgorithmId", "()", "summary", "df-generated"]
       - ["System.Security.Cryptography.Pkcs", "Rfc3161TimestampRequest", "get_RequestSignerCertificate", "()", "summary", "df-generated"]
@@ -201,6 +194,7 @@ extensions:
       - ["System.Security.Cryptography.Pkcs", "Rfc3161TimestampTokenInfo", "GetMessageHash", "()", "summary", "df-generated"]
       - ["System.Security.Cryptography.Pkcs", "Rfc3161TimestampTokenInfo", "Rfc3161TimestampTokenInfo", "(System.Security.Cryptography.Oid,System.Security.Cryptography.Oid,System.ReadOnlyMemory<System.Byte>,System.ReadOnlyMemory<System.Byte>,System.DateTimeOffset,System.Nullable<System.Int64>,System.Boolean,System.Nullable<System.ReadOnlyMemory<System.Byte>>,System.Nullable<System.ReadOnlyMemory<System.Byte>>,System.Security.Cryptography.X509Certificates.X509ExtensionCollection)", "summary", "df-generated"]
       - ["System.Security.Cryptography.Pkcs", "Rfc3161TimestampTokenInfo", "TryDecode", "(System.ReadOnlyMemory<System.Byte>,System.Security.Cryptography.Pkcs.Rfc3161TimestampTokenInfo,System.Int32)", "summary", "df-generated"]
+      - ["System.Security.Cryptography.Pkcs", "Rfc3161TimestampTokenInfo", "TryEncode", "(System.Span<System.Byte>,System.Int32)", "summary", "df-generated"]
       - ["System.Security.Cryptography.Pkcs", "Rfc3161TimestampTokenInfo", "get_AccuracyInMicroseconds", "()", "summary", "df-generated"]
       - ["System.Security.Cryptography.Pkcs", "Rfc3161TimestampTokenInfo", "get_HasExtensions", "()", "summary", "df-generated"]
       - ["System.Security.Cryptography.Pkcs", "Rfc3161TimestampTokenInfo", "get_HashAlgorithmId", "()", "summary", "df-generated"]
@@ -233,11 +227,14 @@ extensions:
       - ["System.Security.Cryptography.Pkcs", "SignerInfo", "CheckSignature", "(System.Security.Cryptography.X509Certificates.X509Certificate2Collection,System.Boolean)", "summary", "df-generated"]
       - ["System.Security.Cryptography.Pkcs", "SignerInfo", "ComputeCounterSignature", "()", "summary", "df-generated"]
       - ["System.Security.Cryptography.Pkcs", "SignerInfo", "ComputeCounterSignature", "(System.Security.Cryptography.Pkcs.CmsSigner)", "summary", "df-generated"]
+      - ["System.Security.Cryptography.Pkcs", "SignerInfo", "GetSignature", "()", "summary", "df-generated"]
       - ["System.Security.Cryptography.Pkcs", "SignerInfo", "RemoveCounterSignature", "(System.Int32)", "summary", "df-generated"]
       - ["System.Security.Cryptography.Pkcs", "SignerInfo", "RemoveCounterSignature", "(System.Security.Cryptography.Pkcs.SignerInfo)", "summary", "df-generated"]
       - ["System.Security.Cryptography.Pkcs", "SignerInfo", "RemoveUnsignedAttribute", "(System.Security.Cryptography.AsnEncodedData)", "summary", "df-generated"]
       - ["System.Security.Cryptography.Pkcs", "SignerInfo", "get_Certificate", "()", "summary", "df-generated"]
       - ["System.Security.Cryptography.Pkcs", "SignerInfo", "get_CounterSignerInfos", "()", "summary", "df-generated"]
+      - ["System.Security.Cryptography.Pkcs", "SignerInfo", "get_DigestAlgorithm", "()", "summary", "df-generated"]
+      - ["System.Security.Cryptography.Pkcs", "SignerInfo", "get_SignatureAlgorithm", "()", "summary", "df-generated"]
       - ["System.Security.Cryptography.Pkcs", "SignerInfo", "get_SignedAttributes", "()", "summary", "df-generated"]
       - ["System.Security.Cryptography.Pkcs", "SignerInfo", "get_SignerIdentifier", "()", "summary", "df-generated"]
       - ["System.Security.Cryptography.Pkcs", "SignerInfo", "get_UnsignedAttributes", "()", "summary", "df-generated"]
diff --git a/csharp/ql/lib/ext/generated/System.Security.Cryptography.X509Certificates.model.yml b/csharp/ql/lib/ext/generated/System.Security.Cryptography.X509Certificates.model.yml
index 1377f990987..bab54dd9f91 100644
--- a/csharp/ql/lib/ext/generated/System.Security.Cryptography.X509Certificates.model.yml
+++ b/csharp/ql/lib/ext/generated/System.Security.Cryptography.X509Certificates.model.yml
@@ -11,13 +11,9 @@ extensions:
       - ["System.Security.Cryptography.X509Certificates", "CertificateRequest", False, "CertificateRequest", "(System.String,System.Security.Cryptography.ECDsa,System.Security.Cryptography.HashAlgorithmName)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
       - ["System.Security.Cryptography.X509Certificates", "CertificateRequest", False, "CertificateRequest", "(System.String,System.Security.Cryptography.RSA,System.Security.Cryptography.HashAlgorithmName,System.Security.Cryptography.RSASignaturePadding)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
       - ["System.Security.Cryptography.X509Certificates", "CertificateRequest", False, "CertificateRequest", "(System.String,System.Security.Cryptography.RSA,System.Security.Cryptography.HashAlgorithmName,System.Security.Cryptography.RSASignaturePadding)", "", "Argument[3]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Security.Cryptography.X509Certificates", "CertificateRequest", False, "LoadSigningRequest", "(System.Byte[],System.Security.Cryptography.HashAlgorithmName,System.Security.Cryptography.X509Certificates.CertificateRequestLoadOptions,System.Security.Cryptography.RSASignaturePadding)", "", "Argument[3]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Security.Cryptography.X509Certificates", "CertificateRequest", False, "LoadSigningRequest", "(System.ReadOnlySpan<System.Byte>,System.Security.Cryptography.HashAlgorithmName,System.Int32,System.Security.Cryptography.X509Certificates.CertificateRequestLoadOptions,System.Security.Cryptography.RSASignaturePadding)", "", "Argument[4]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Security.Cryptography.X509Certificates", "CertificateRequest", False, "LoadSigningRequestPem", "(System.ReadOnlySpan<System.Char>,System.Security.Cryptography.HashAlgorithmName,System.Security.Cryptography.X509Certificates.CertificateRequestLoadOptions,System.Security.Cryptography.RSASignaturePadding)", "", "Argument[3]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Security.Cryptography.X509Certificates", "CertificateRequest", False, "LoadSigningRequestPem", "(System.String,System.Security.Cryptography.HashAlgorithmName,System.Security.Cryptography.X509Certificates.CertificateRequestLoadOptions,System.Security.Cryptography.RSASignaturePadding)", "", "Argument[3]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Security.Cryptography.X509Certificates", "PublicKey", False, "PublicKey", "(System.Security.Cryptography.Oid,System.Security.Cryptography.AsnEncodedData,System.Security.Cryptography.AsnEncodedData)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["System.Security.Cryptography.X509Certificates", "PublicKey", False, "PublicKey", "(System.Security.Cryptography.Oid,System.Security.Cryptography.AsnEncodedData,System.Security.Cryptography.AsnEncodedData)", "", "Argument[0]", "Argument[this].SyntheticField[System.Security.Cryptography.X509Certificates.PublicKey._oid]", "value", "dfc-generated"]
       - ["System.Security.Cryptography.X509Certificates", "PublicKey", False, "get_Key", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Security.Cryptography.X509Certificates", "PublicKey", False, "get_Oid", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Security.Cryptography.X509Certificates", "PublicKey", False, "get_Oid", "()", "", "Argument[this].SyntheticField[System.Security.Cryptography.X509Certificates.PublicKey._oid]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Security.Cryptography.X509Certificates", "X500DistinguishedName", False, "X500DistinguishedName", "(System.Security.Cryptography.X509Certificates.X500DistinguishedName)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Security.Cryptography.X509Certificates", "X500DistinguishedName", False, "X500DistinguishedName", "(System.String,System.Security.Cryptography.X509Certificates.X500DistinguishedNameFlags)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Security.Cryptography.X509Certificates", "X500RelativeDistinguishedName", False, "GetSingleElementType", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
@@ -25,15 +21,16 @@ extensions:
       - ["System.Security.Cryptography.X509Certificates", "X509AuthorityKeyIdentifierExtension", False, "get_NamedIssuer", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Security.Cryptography.X509Certificates", "X509AuthorityKeyIdentifierExtension", False, "get_RawIssuer", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Security.Cryptography.X509Certificates", "X509AuthorityKeyIdentifierExtension", False, "get_SerialNumber", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Security.Cryptography.X509Certificates", "X509Certificate2", False, "ToString", "()", "", "Argument[this].Property[System.Security.Cryptography.X509Certificates.X509Certificate.Issuer]", "ReturnValue", "taint", "dfc-generated"]
+      - ["System.Security.Cryptography.X509Certificates", "X509Certificate2", False, "ToString", "()", "", "Argument[this].Property[System.Security.Cryptography.X509Certificates.X509Certificate.Subject]", "ReturnValue", "taint", "dfc-generated"]
       - ["System.Security.Cryptography.X509Certificates", "X509Certificate2", False, "get_Extensions", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Security.Cryptography.X509Certificates", "X509Certificate2", False, "get_PublicKey", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Security.Cryptography.X509Certificates", "X509Certificate2", False, "get_RawData", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Security.Cryptography.X509Certificates", "X509Certificate2Collection", False, "Remove", "(System.Security.Cryptography.X509Certificates.X509Certificate2)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Security.Cryptography.X509Certificates", "X509Certificate2Collection", False, "RemoveRange", "(System.Security.Cryptography.X509Certificates.X509Certificate2Collection)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["System.Security.Cryptography.X509Certificates", "X509Certificate2Collection", False, "RemoveRange", "(System.Security.Cryptography.X509Certificates.X509Certificate2[])", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["System.Security.Cryptography.X509Certificates", "X509Certificate2Collection", False, "X509Certificate2Collection", "(System.Security.Cryptography.X509Certificates.X509Certificate2)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["System.Security.Cryptography.X509Certificates", "X509Certificate2Collection", False, "RemoveRange", "(System.Security.Cryptography.X509Certificates.X509Certificate2[])", "", "Argument[0].Element", "Argument[this].Element", "value", "dfc-generated"]
+      - ["System.Security.Cryptography.X509Certificates", "X509Certificate2Collection", False, "RemoveRange", "(System.Security.Cryptography.X509Certificates.X509Certificate2[])", "", "Argument[0].Element", "Argument[this].Property[System.Collections.CollectionBase.List].Element", "value", "dfc-generated"]
       - ["System.Security.Cryptography.X509Certificates", "X509Certificate2Collection", False, "X509Certificate2Collection", "(System.Security.Cryptography.X509Certificates.X509Certificate2Collection)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["System.Security.Cryptography.X509Certificates", "X509Certificate2Collection", False, "X509Certificate2Collection", "(System.Security.Cryptography.X509Certificates.X509Certificate2[])", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
+      - ["System.Security.Cryptography.X509Certificates", "X509Certificate2Collection", False, "X509Certificate2Collection", "(System.Security.Cryptography.X509Certificates.X509Certificate2[])", "", "Argument[0].Element", "Argument[this].Element", "value", "dfc-generated"]
+      - ["System.Security.Cryptography.X509Certificates", "X509Certificate2Collection", False, "X509Certificate2Collection", "(System.Security.Cryptography.X509Certificates.X509Certificate2[])", "", "Argument[0].Element", "Argument[this].Property[System.Collections.CollectionBase.List].Element", "value", "dfc-generated"]
       - ["System.Security.Cryptography.X509Certificates", "X509Certificate2Enumerator", False, "get_Current", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Security.Cryptography.X509Certificates", "X509Certificate", False, "ToString", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Security.Cryptography.X509Certificates", "X509Certificate", False, "get_Handle", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
@@ -41,27 +38,28 @@ extensions:
       - ["System.Security.Cryptography.X509Certificates", "X509Certificate", True, "GetName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Security.Cryptography.X509Certificates", "X509Certificate", True, "GetRawCertData", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Security.Cryptography.X509Certificates", "X509Certificate", True, "GetRawCertDataString", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Security.Cryptography.X509Certificates", "X509Certificate", True, "ToString", "(System.Boolean)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Security.Cryptography.X509Certificates", "X509CertificateCollection+X509CertificateEnumerator", False, "X509CertificateEnumerator", "(System.Security.Cryptography.X509Certificates.X509CertificateCollection)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
+      - ["System.Security.Cryptography.X509Certificates", "X509Certificate", True, "ToString", "(System.Boolean)", "", "Argument[this].Property[System.Security.Cryptography.X509Certificates.X509Certificate.Issuer]", "ReturnValue", "taint", "dfc-generated"]
+      - ["System.Security.Cryptography.X509Certificates", "X509Certificate", True, "ToString", "(System.Boolean)", "", "Argument[this].Property[System.Security.Cryptography.X509Certificates.X509Certificate.Subject]", "ReturnValue", "taint", "dfc-generated"]
       - ["System.Security.Cryptography.X509Certificates", "X509CertificateCollection+X509CertificateEnumerator", False, "get_Current", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Security.Cryptography.X509Certificates", "X509CertificateCollection", False, "Remove", "(System.Security.Cryptography.X509Certificates.X509Certificate)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Security.Cryptography.X509Certificates", "X509CertificateCollection", False, "X509CertificateCollection", "(System.Security.Cryptography.X509Certificates.X509CertificateCollection)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["System.Security.Cryptography.X509Certificates", "X509CertificateCollection", False, "X509CertificateCollection", "(System.Security.Cryptography.X509Certificates.X509Certificate[])", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["System.Security.Cryptography.X509Certificates", "X509Chain", False, "Build", "(System.Security.Cryptography.X509Certificates.X509Certificate2)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Security.Cryptography.X509Certificates", "X509Chain", False, "get_ChainContext", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Security.Cryptography.X509Certificates", "X509CertificateCollection", False, "X509CertificateCollection", "(System.Security.Cryptography.X509Certificates.X509Certificate[])", "", "Argument[0].Element", "Argument[this].Element", "value", "dfc-generated"]
+      - ["System.Security.Cryptography.X509Certificates", "X509CertificateCollection", False, "X509CertificateCollection", "(System.Security.Cryptography.X509Certificates.X509Certificate[])", "", "Argument[0].Element", "Argument[this].Property[System.Collections.CollectionBase.List].Element", "value", "dfc-generated"]
       - ["System.Security.Cryptography.X509Certificates", "X509Chain", False, "get_SafeHandle", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Security.Cryptography.X509Certificates", "X509ChainElementCollection", False, "get_Item", "(System.Int32)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Security.Cryptography.X509Certificates", "X509ChainElementEnumerator", False, "get_Current", "()", "", "Argument[this].Property[System.Security.Cryptography.X509Certificates.X509ChainElementEnumerator.Current]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Security.Cryptography.X509Certificates", "X509ChainElementEnumerator", False, "get_Current", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Security.Cryptography.X509Certificates", "X509ChainPolicy", False, "Clone", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Security.Cryptography.X509Certificates", "X509EnhancedKeyUsageExtension", False, "get_EnhancedKeyUsages", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Security.Cryptography.X509Certificates", "X509Extension", True, "CopyFrom", "(System.Security.Cryptography.AsnEncodedData)", "", "Argument[0].SyntheticField[System.Security.Cryptography.AsnEncodedData._rawData].Element", "Argument[this].SyntheticField[System.Security.Cryptography.AsnEncodedData._rawData].Element", "value", "dfc-generated"]
+      - ["System.Security.Cryptography.X509Certificates", "X509Extension", True, "CopyFrom", "(System.Security.Cryptography.AsnEncodedData)", "", "Argument[0].SyntheticField[System.Security.Cryptography.AsnEncodedData._rawData]", "Argument[this].SyntheticField[System.Security.Cryptography.AsnEncodedData._rawData]", "value", "dfc-generated"]
       - ["System.Security.Cryptography.X509Certificates", "X509ExtensionCollection", False, "get_Item", "(System.Int32)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Security.Cryptography.X509Certificates", "X509ExtensionCollection", False, "get_Item", "(System.String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Security.Cryptography.X509Certificates", "X509ExtensionEnumerator", False, "get_Current", "()", "", "Argument[this].Property[System.Security.Cryptography.X509Certificates.X509ExtensionEnumerator.Current]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Security.Cryptography.X509Certificates", "X509ExtensionEnumerator", False, "get_Current", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Security.Cryptography.X509Certificates", "X509SignatureGenerator", False, "CreateForECDsa", "(System.Security.Cryptography.ECDsa)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["System.Security.Cryptography.X509Certificates", "X509SignatureGenerator", False, "CreateForRSA", "(System.Security.Cryptography.RSA,System.Security.Cryptography.RSASignaturePadding)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["System.Security.Cryptography.X509Certificates", "X509SignatureGenerator", False, "CreateForRSA", "(System.Security.Cryptography.RSA,System.Security.Cryptography.RSASignaturePadding)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
       - ["System.Security.Cryptography.X509Certificates", "X509SubjectKeyIdentifierExtension", False, "get_SubjectKeyIdentifier", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Security.Cryptography.X509Certificates", "X509SubjectKeyIdentifierExtension", False, "get_SubjectKeyIdentifierBytes", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
   - addsTo:
       pack: codeql/csharp-all
       extensible: neutralModel
@@ -76,6 +74,10 @@ extensions:
       - ["System.Security.Cryptography.X509Certificates", "CertificateRequest", "CreateSigningRequest", "(System.Security.Cryptography.X509Certificates.X509SignatureGenerator)", "summary", "df-generated"]
       - ["System.Security.Cryptography.X509Certificates", "CertificateRequest", "CreateSigningRequestPem", "()", "summary", "df-generated"]
       - ["System.Security.Cryptography.X509Certificates", "CertificateRequest", "CreateSigningRequestPem", "(System.Security.Cryptography.X509Certificates.X509SignatureGenerator)", "summary", "df-generated"]
+      - ["System.Security.Cryptography.X509Certificates", "CertificateRequest", "LoadSigningRequest", "(System.Byte[],System.Security.Cryptography.HashAlgorithmName,System.Security.Cryptography.X509Certificates.CertificateRequestLoadOptions,System.Security.Cryptography.RSASignaturePadding)", "summary", "df-generated"]
+      - ["System.Security.Cryptography.X509Certificates", "CertificateRequest", "LoadSigningRequest", "(System.ReadOnlySpan<System.Byte>,System.Security.Cryptography.HashAlgorithmName,System.Int32,System.Security.Cryptography.X509Certificates.CertificateRequestLoadOptions,System.Security.Cryptography.RSASignaturePadding)", "summary", "df-generated"]
+      - ["System.Security.Cryptography.X509Certificates", "CertificateRequest", "LoadSigningRequestPem", "(System.ReadOnlySpan<System.Char>,System.Security.Cryptography.HashAlgorithmName,System.Security.Cryptography.X509Certificates.CertificateRequestLoadOptions,System.Security.Cryptography.RSASignaturePadding)", "summary", "df-generated"]
+      - ["System.Security.Cryptography.X509Certificates", "CertificateRequest", "LoadSigningRequestPem", "(System.String,System.Security.Cryptography.HashAlgorithmName,System.Security.Cryptography.X509Certificates.CertificateRequestLoadOptions,System.Security.Cryptography.RSASignaturePadding)", "summary", "df-generated"]
       - ["System.Security.Cryptography.X509Certificates", "CertificateRequest", "get_CertificateExtensions", "()", "summary", "df-generated"]
       - ["System.Security.Cryptography.X509Certificates", "CertificateRequest", "get_HashAlgorithm", "()", "summary", "df-generated"]
       - ["System.Security.Cryptography.X509Certificates", "CertificateRequest", "get_OtherRequestAttributes", "()", "summary", "df-generated"]
@@ -204,6 +206,7 @@ extensions:
       - ["System.Security.Cryptography.X509Certificates", "X509Certificate2", "get_IssuerName", "()", "summary", "df-generated"]
       - ["System.Security.Cryptography.X509Certificates", "X509Certificate2", "get_NotAfter", "()", "summary", "df-generated"]
       - ["System.Security.Cryptography.X509Certificates", "X509Certificate2", "get_NotBefore", "()", "summary", "df-generated"]
+      - ["System.Security.Cryptography.X509Certificates", "X509Certificate2", "get_RawData", "()", "summary", "df-generated"]
       - ["System.Security.Cryptography.X509Certificates", "X509Certificate2", "get_RawDataMemory", "()", "summary", "df-generated"]
       - ["System.Security.Cryptography.X509Certificates", "X509Certificate2", "get_SerialNumber", "()", "summary", "df-generated"]
       - ["System.Security.Cryptography.X509Certificates", "X509Certificate2", "get_SignatureAlgorithm", "()", "summary", "df-generated"]
@@ -225,8 +228,10 @@ extensions:
       - ["System.Security.Cryptography.X509Certificates", "X509Certificate2Collection", "Import", "(System.String,System.String,System.Security.Cryptography.X509Certificates.X509KeyStorageFlags)", "summary", "df-generated"]
       - ["System.Security.Cryptography.X509Certificates", "X509Certificate2Collection", "ImportFromPem", "(System.ReadOnlySpan<System.Char>)", "summary", "df-generated"]
       - ["System.Security.Cryptography.X509Certificates", "X509Certificate2Collection", "ImportFromPemFile", "(System.String)", "summary", "df-generated"]
+      - ["System.Security.Cryptography.X509Certificates", "X509Certificate2Collection", "Remove", "(System.Security.Cryptography.X509Certificates.X509Certificate2)", "summary", "df-generated"]
       - ["System.Security.Cryptography.X509Certificates", "X509Certificate2Collection", "TryExportCertificatePems", "(System.Span<System.Char>,System.Int32)", "summary", "df-generated"]
       - ["System.Security.Cryptography.X509Certificates", "X509Certificate2Collection", "TryExportPkcs7Pem", "(System.Span<System.Char>,System.Int32)", "summary", "df-generated"]
+      - ["System.Security.Cryptography.X509Certificates", "X509Certificate2Collection", "X509Certificate2Collection", "(System.Security.Cryptography.X509Certificates.X509Certificate2)", "summary", "df-generated"]
       - ["System.Security.Cryptography.X509Certificates", "X509Certificate2Enumerator", "Dispose", "()", "summary", "df-generated"]
       - ["System.Security.Cryptography.X509Certificates", "X509Certificate2Enumerator", "MoveNext", "()", "summary", "df-generated"]
       - ["System.Security.Cryptography.X509Certificates", "X509Certificate2Enumerator", "Reset", "()", "summary", "df-generated"]
@@ -286,16 +291,20 @@ extensions:
       - ["System.Security.Cryptography.X509Certificates", "X509Certificate", "get_Subject", "()", "summary", "df-generated"]
       - ["System.Security.Cryptography.X509Certificates", "X509CertificateCollection+X509CertificateEnumerator", "MoveNext", "()", "summary", "df-generated"]
       - ["System.Security.Cryptography.X509Certificates", "X509CertificateCollection+X509CertificateEnumerator", "Reset", "()", "summary", "df-generated"]
+      - ["System.Security.Cryptography.X509Certificates", "X509CertificateCollection+X509CertificateEnumerator", "X509CertificateEnumerator", "(System.Security.Cryptography.X509Certificates.X509CertificateCollection)", "summary", "df-generated"]
       - ["System.Security.Cryptography.X509Certificates", "X509CertificateCollection", "Contains", "(System.Security.Cryptography.X509Certificates.X509Certificate)", "summary", "df-generated"]
       - ["System.Security.Cryptography.X509Certificates", "X509CertificateCollection", "GetHashCode", "()", "summary", "df-generated"]
       - ["System.Security.Cryptography.X509Certificates", "X509CertificateCollection", "IndexOf", "(System.Security.Cryptography.X509Certificates.X509Certificate)", "summary", "df-generated"]
       - ["System.Security.Cryptography.X509Certificates", "X509CertificateCollection", "OnValidate", "(System.Object)", "summary", "df-generated"]
+      - ["System.Security.Cryptography.X509Certificates", "X509CertificateCollection", "Remove", "(System.Security.Cryptography.X509Certificates.X509Certificate)", "summary", "df-generated"]
+      - ["System.Security.Cryptography.X509Certificates", "X509Chain", "Build", "(System.Security.Cryptography.X509Certificates.X509Certificate2)", "summary", "df-generated"]
       - ["System.Security.Cryptography.X509Certificates", "X509Chain", "Create", "()", "summary", "df-generated"]
       - ["System.Security.Cryptography.X509Certificates", "X509Chain", "Dispose", "()", "summary", "df-generated"]
       - ["System.Security.Cryptography.X509Certificates", "X509Chain", "Dispose", "(System.Boolean)", "summary", "df-generated"]
       - ["System.Security.Cryptography.X509Certificates", "X509Chain", "Reset", "()", "summary", "df-generated"]
       - ["System.Security.Cryptography.X509Certificates", "X509Chain", "X509Chain", "(System.Boolean)", "summary", "df-generated"]
       - ["System.Security.Cryptography.X509Certificates", "X509Chain", "X509Chain", "(System.IntPtr)", "summary", "df-generated"]
+      - ["System.Security.Cryptography.X509Certificates", "X509Chain", "get_ChainContext", "()", "summary", "df-generated"]
       - ["System.Security.Cryptography.X509Certificates", "X509Chain", "get_ChainElements", "()", "summary", "df-generated"]
       - ["System.Security.Cryptography.X509Certificates", "X509Chain", "get_ChainStatus", "()", "summary", "df-generated"]
       - ["System.Security.Cryptography.X509Certificates", "X509ChainElementCollection", "get_Count", "()", "summary", "df-generated"]
@@ -355,3 +364,4 @@ extensions:
       - ["System.Security.Cryptography.X509Certificates", "X509SubjectKeyIdentifierExtension", "X509SubjectKeyIdentifierExtension", "(System.Security.Cryptography.X509Certificates.PublicKey,System.Boolean)", "summary", "df-generated"]
       - ["System.Security.Cryptography.X509Certificates", "X509SubjectKeyIdentifierExtension", "X509SubjectKeyIdentifierExtension", "(System.Security.Cryptography.X509Certificates.PublicKey,System.Security.Cryptography.X509Certificates.X509SubjectKeyIdentifierHashAlgorithm,System.Boolean)", "summary", "df-generated"]
       - ["System.Security.Cryptography.X509Certificates", "X509SubjectKeyIdentifierExtension", "X509SubjectKeyIdentifierExtension", "(System.String,System.Boolean)", "summary", "df-generated"]
+      - ["System.Security.Cryptography.X509Certificates", "X509SubjectKeyIdentifierExtension", "get_SubjectKeyIdentifierBytes", "()", "summary", "df-generated"]
diff --git a/csharp/ql/lib/ext/generated/System.Security.Cryptography.Xml.model.yml b/csharp/ql/lib/ext/generated/System.Security.Cryptography.Xml.model.yml
index 57139c41f7d..f238a45abd5 100644
--- a/csharp/ql/lib/ext/generated/System.Security.Cryptography.Xml.model.yml
+++ b/csharp/ql/lib/ext/generated/System.Security.Cryptography.Xml.model.yml
@@ -6,21 +6,22 @@ extensions:
     data:
       - ["System.Security.Cryptography.Xml", "CipherData", False, "CipherData", "(System.Byte[])", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
       - ["System.Security.Cryptography.Xml", "CipherData", False, "CipherData", "(System.Security.Cryptography.Xml.CipherReference)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Security.Cryptography.Xml", "CipherData", False, "GetXml", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Security.Cryptography.Xml", "CipherData", False, "LoadXml", "(System.Xml.XmlElement)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
+      - ["System.Security.Cryptography.Xml", "CipherData", False, "GetXml", "()", "", "Argument[this].SyntheticField[System.Security.Cryptography.Xml.CipherData._cachedXml]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Security.Cryptography.Xml", "CipherData", False, "LoadXml", "(System.Xml.XmlElement)", "", "Argument[0]", "Argument[this].SyntheticField[System.Security.Cryptography.Xml.CipherData._cachedXml]", "value", "dfc-generated"]
+      - ["System.Security.Cryptography.Xml", "CipherReference", False, "LoadXml", "(System.Xml.XmlElement)", "", "Argument[0]", "Argument[this].SyntheticField[System.Security.Cryptography.Xml.EncryptedReference._cachedXml]", "value", "dfc-generated"]
       - ["System.Security.Cryptography.Xml", "DSAKeyValue", False, "DSAKeyValue", "(System.Security.Cryptography.DSA)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Security.Cryptography.Xml", "DataObject", False, "DataObject", "(System.String,System.String,System.String,System.Xml.XmlElement)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Security.Cryptography.Xml", "DataObject", False, "DataObject", "(System.String,System.String,System.String,System.Xml.XmlElement)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
       - ["System.Security.Cryptography.Xml", "DataObject", False, "DataObject", "(System.String,System.String,System.String,System.Xml.XmlElement)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
       - ["System.Security.Cryptography.Xml", "DataObject", False, "DataObject", "(System.String,System.String,System.String,System.Xml.XmlElement)", "", "Argument[3].Element", "Argument[this]", "taint", "df-generated"]
-      - ["System.Security.Cryptography.Xml", "DataObject", False, "GetXml", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Security.Cryptography.Xml", "DataObject", False, "LoadXml", "(System.Xml.XmlElement)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["System.Security.Cryptography.Xml", "EncryptedKey", False, "AddReference", "(System.Security.Cryptography.Xml.DataReference)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Security.Cryptography.Xml", "EncryptedKey", False, "AddReference", "(System.Security.Cryptography.Xml.KeyReference)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["System.Security.Cryptography.Xml", "DataObject", False, "GetXml", "()", "", "Argument[this].SyntheticField[System.Security.Cryptography.Xml.DataObject._cachedXml]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Security.Cryptography.Xml", "DataObject", False, "LoadXml", "(System.Xml.XmlElement)", "", "Argument[0]", "Argument[this].SyntheticField[System.Security.Cryptography.Xml.DataObject._cachedXml]", "value", "dfc-generated"]
+      - ["System.Security.Cryptography.Xml", "EncryptedKey", False, "AddReference", "(System.Security.Cryptography.Xml.DataReference)", "", "Argument[0]", "Argument[this].Property[System.Security.Cryptography.Xml.EncryptedKey.ReferenceList].Element", "value", "dfc-generated"]
+      - ["System.Security.Cryptography.Xml", "EncryptedKey", False, "AddReference", "(System.Security.Cryptography.Xml.KeyReference)", "", "Argument[0]", "Argument[this].Property[System.Security.Cryptography.Xml.EncryptedKey.ReferenceList].Element", "value", "dfc-generated"]
       - ["System.Security.Cryptography.Xml", "EncryptedReference", False, "EncryptedReference", "(System.String,System.Security.Cryptography.Xml.TransformChain)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Security.Cryptography.Xml", "EncryptedReference", False, "EncryptedReference", "(System.String,System.Security.Cryptography.Xml.TransformChain)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Security.Cryptography.Xml", "EncryptedReference", True, "GetXml", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Security.Cryptography.Xml", "EncryptedReference", True, "LoadXml", "(System.Xml.XmlElement)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
+      - ["System.Security.Cryptography.Xml", "EncryptedReference", True, "GetXml", "()", "", "Argument[this].SyntheticField[System.Security.Cryptography.Xml.EncryptedReference._cachedXml]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Security.Cryptography.Xml", "EncryptedReference", True, "LoadXml", "(System.Xml.XmlElement)", "", "Argument[0]", "Argument[this].SyntheticField[System.Security.Cryptography.Xml.EncryptedReference._cachedXml]", "value", "dfc-generated"]
       - ["System.Security.Cryptography.Xml", "EncryptedType", True, "GetXml", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Security.Cryptography.Xml", "EncryptedType", True, "LoadXml", "(System.Xml.XmlElement)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
       - ["System.Security.Cryptography.Xml", "EncryptedXml", False, "EncryptedXml", "(System.Xml.XmlDocument,System.Security.Policy.Evidence)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
@@ -28,81 +29,88 @@ extensions:
       - ["System.Security.Cryptography.Xml", "EncryptedXml", True, "GetDecryptionKey", "(System.Security.Cryptography.Xml.EncryptedData,System.String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Security.Cryptography.Xml", "EncryptedXml", True, "GetIdElement", "(System.Xml.XmlDocument,System.String)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
       - ["System.Security.Cryptography.Xml", "EncryptionMethod", False, "EncryptionMethod", "(System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Security.Cryptography.Xml", "EncryptionMethod", False, "GetXml", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Security.Cryptography.Xml", "EncryptionMethod", False, "LoadXml", "(System.Xml.XmlElement)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
+      - ["System.Security.Cryptography.Xml", "EncryptionMethod", False, "GetXml", "()", "", "Argument[this].SyntheticField[System.Security.Cryptography.Xml.EncryptionMethod._cachedXml]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Security.Cryptography.Xml", "EncryptionMethod", False, "LoadXml", "(System.Xml.XmlElement)", "", "Argument[0]", "Argument[this].SyntheticField[System.Security.Cryptography.Xml.EncryptionMethod._cachedXml]", "value", "dfc-generated"]
       - ["System.Security.Cryptography.Xml", "EncryptionProperty", False, "EncryptionProperty", "(System.Xml.XmlElement)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["System.Security.Cryptography.Xml", "EncryptionProperty", False, "GetXml", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Security.Cryptography.Xml", "EncryptionProperty", False, "LoadXml", "(System.Xml.XmlElement)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
+      - ["System.Security.Cryptography.Xml", "EncryptionProperty", False, "GetXml", "()", "", "Argument[this].SyntheticField[System.Security.Cryptography.Xml.EncryptionProperty._cachedXml]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Security.Cryptography.Xml", "EncryptionProperty", False, "LoadXml", "(System.Xml.XmlElement)", "", "Argument[0]", "Argument[this].SyntheticField[System.Security.Cryptography.Xml.EncryptionProperty._cachedXml]", "value", "dfc-generated"]
       - ["System.Security.Cryptography.Xml", "EncryptionProperty", False, "get_Id", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Security.Cryptography.Xml", "EncryptionProperty", False, "get_Target", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Security.Cryptography.Xml", "EncryptionPropertyCollection", False, "Add", "(System.Security.Cryptography.Xml.EncryptionProperty)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Security.Cryptography.Xml", "EncryptionPropertyCollection", False, "CopyTo", "(System.Security.Cryptography.Xml.EncryptionProperty[],System.Int32)", "", "Argument[this]", "Argument[0].Element", "taint", "df-generated"]
-      - ["System.Security.Cryptography.Xml", "EncryptionPropertyCollection", False, "Insert", "(System.Int32,System.Security.Cryptography.Xml.EncryptionProperty)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Security.Cryptography.Xml", "EncryptionPropertyCollection", False, "Item", "(System.Int32)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Security.Cryptography.Xml", "EncryptionPropertyCollection", False, "get_ItemOf", "(System.Int32)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Security.Cryptography.Xml", "EncryptionPropertyCollection", False, "set_ItemOf", "(System.Int32,System.Security.Cryptography.Xml.EncryptionProperty)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Security.Cryptography.Xml", "KeyInfo", False, "AddClause", "(System.Security.Cryptography.Xml.KeyInfoClause)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Security.Cryptography.Xml", "KeyInfo", False, "GetEnumerator", "(System.Type)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Security.Cryptography.Xml", "KeyInfo", False, "LoadXml", "(System.Xml.XmlElement)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["System.Security.Cryptography.Xml", "KeyInfoClause", True, "GetXml", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Security.Cryptography.Xml", "EncryptionPropertyCollection", False, "Add", "(System.Security.Cryptography.Xml.EncryptionProperty)", "", "Argument[0]", "Argument[this].SyntheticField[System.Security.Cryptography.Xml.EncryptionPropertyCollection._props].Element", "value", "dfc-generated"]
+      - ["System.Security.Cryptography.Xml", "EncryptionPropertyCollection", False, "CopyTo", "(System.Security.Cryptography.Xml.EncryptionProperty[],System.Int32)", "", "Argument[this].SyntheticField[System.Security.Cryptography.Xml.EncryptionPropertyCollection._props].Element", "Argument[0].Element", "value", "dfc-generated"]
+      - ["System.Security.Cryptography.Xml", "EncryptionPropertyCollection", False, "Insert", "(System.Int32,System.Security.Cryptography.Xml.EncryptionProperty)", "", "Argument[1]", "Argument[this].SyntheticField[System.Security.Cryptography.Xml.EncryptionPropertyCollection._props].Element", "value", "dfc-generated"]
+      - ["System.Security.Cryptography.Xml", "EncryptionPropertyCollection", False, "Item", "(System.Int32)", "", "Argument[this].SyntheticField[System.Security.Cryptography.Xml.EncryptionPropertyCollection._props].Element", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Security.Cryptography.Xml", "EncryptionPropertyCollection", False, "get_ItemOf", "(System.Int32)", "", "Argument[this].Element", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Security.Cryptography.Xml", "EncryptionPropertyCollection", False, "get_ItemOf", "(System.Int32)", "", "Argument[this].SyntheticField[System.Security.Cryptography.Xml.EncryptionPropertyCollection._props].Element", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Security.Cryptography.Xml", "EncryptionPropertyCollection", False, "get_SyncRoot", "()", "", "Argument[this].SyntheticField[System.Security.Cryptography.Xml.EncryptionPropertyCollection._props].Property[System.Collections.ArrayList.SyncRoot]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Security.Cryptography.Xml", "EncryptionPropertyCollection", False, "set_ItemOf", "(System.Int32,System.Security.Cryptography.Xml.EncryptionProperty)", "", "Argument[1]", "Argument[this].Element", "value", "dfc-generated"]
+      - ["System.Security.Cryptography.Xml", "EncryptionPropertyCollection", False, "set_ItemOf", "(System.Int32,System.Security.Cryptography.Xml.EncryptionProperty)", "", "Argument[1]", "Argument[this].SyntheticField[System.Security.Cryptography.Xml.EncryptionPropertyCollection._props].Element", "value", "dfc-generated"]
+      - ["System.Security.Cryptography.Xml", "KeyInfo", False, "AddClause", "(System.Security.Cryptography.Xml.KeyInfoClause)", "", "Argument[0]", "Argument[this].SyntheticField[System.Security.Cryptography.Xml.KeyInfo._keyInfoClauses].Element", "value", "dfc-generated"]
+      - ["System.Security.Cryptography.Xml", "KeyInfo", False, "GetEnumerator", "(System.Type)", "", "Argument[this].SyntheticField[System.Security.Cryptography.Xml.KeyInfo._keyInfoClauses].Element", "ReturnValue.Property[System.Collections.IEnumerator.Current]", "value", "dfc-generated"]
       - ["System.Security.Cryptography.Xml", "KeyInfoClause", True, "LoadXml", "(System.Xml.XmlElement)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
       - ["System.Security.Cryptography.Xml", "KeyInfoEncryptedKey", False, "KeyInfoEncryptedKey", "(System.Security.Cryptography.Xml.EncryptedKey)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["System.Security.Cryptography.Xml", "KeyInfoEncryptedKey", True, "GetXml", "()", "", "Argument[this].SyntheticField[System.Security.Cryptography.Xml.KeyInfoEncryptedKey._encryptedKey].SyntheticField[System.Security.Cryptography.Xml.EncryptedType._cachedXml]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Security.Cryptography.Xml", "KeyInfoEncryptedKey", True, "LoadXml", "(System.Xml.XmlElement)", "", "Argument[0]", "Argument[this].SyntheticField[System.Security.Cryptography.Xml.KeyInfoEncryptedKey._encryptedKey].SyntheticField[System.Security.Cryptography.Xml.EncryptedType._cachedXml]", "value", "dfc-generated"]
       - ["System.Security.Cryptography.Xml", "KeyInfoName", False, "KeyInfoName", "(System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Security.Cryptography.Xml", "KeyInfoNode", False, "KeyInfoNode", "(System.Xml.XmlElement)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
       - ["System.Security.Cryptography.Xml", "KeyInfoRetrievalMethod", False, "KeyInfoRetrievalMethod", "(System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Security.Cryptography.Xml", "KeyInfoRetrievalMethod", False, "KeyInfoRetrievalMethod", "(System.String,System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Security.Cryptography.Xml", "KeyInfoRetrievalMethod", False, "KeyInfoRetrievalMethod", "(System.String,System.String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Security.Cryptography.Xml", "KeyInfoX509Data", False, "AddSubjectKeyId", "(System.Byte[])", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["System.Security.Cryptography.Xml", "KeyInfoX509Data", False, "AddSubjectName", "(System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["System.Security.Cryptography.Xml", "KeyInfoX509Data", False, "AddSubjectKeyId", "(System.Byte[])", "", "Argument[0]", "Argument[this].SyntheticField[System.Security.Cryptography.Xml.KeyInfoX509Data._subjectKeyIds].Element", "value", "dfc-generated"]
+      - ["System.Security.Cryptography.Xml", "KeyInfoX509Data", False, "AddSubjectName", "(System.String)", "", "Argument[0]", "Argument[this].SyntheticField[System.Security.Cryptography.Xml.KeyInfoX509Data._subjectNames].Element", "value", "dfc-generated"]
       - ["System.Security.Cryptography.Xml", "KeyInfoX509Data", False, "get_Certificates", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Security.Cryptography.Xml", "KeyInfoX509Data", False, "get_IssuerSerials", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Security.Cryptography.Xml", "KeyInfoX509Data", False, "get_SubjectKeyIds", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Security.Cryptography.Xml", "KeyInfoX509Data", False, "get_SubjectNames", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Security.Cryptography.Xml", "KeyInfoX509Data", False, "get_SubjectKeyIds", "()", "", "Argument[this].SyntheticField[System.Security.Cryptography.Xml.KeyInfoX509Data._subjectKeyIds]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Security.Cryptography.Xml", "KeyInfoX509Data", False, "get_SubjectNames", "()", "", "Argument[this].SyntheticField[System.Security.Cryptography.Xml.KeyInfoX509Data._subjectNames]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Security.Cryptography.Xml", "RSAKeyValue", False, "RSAKeyValue", "(System.Security.Cryptography.RSA)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Security.Cryptography.Xml", "Reference", False, "AddTransform", "(System.Security.Cryptography.Xml.Transform)", "", "Argument[this]", "Argument[0]", "taint", "df-generated"]
-      - ["System.Security.Cryptography.Xml", "Reference", False, "GetXml", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Security.Cryptography.Xml", "Reference", False, "LoadXml", "(System.Xml.XmlElement)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
+      - ["System.Security.Cryptography.Xml", "Reference", False, "GetXml", "()", "", "Argument[this].SyntheticField[System.Security.Cryptography.Xml.Reference._cachedXml]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Security.Cryptography.Xml", "Reference", False, "LoadXml", "(System.Xml.XmlElement)", "", "Argument[0]", "Argument[this].SyntheticField[System.Security.Cryptography.Xml.Reference._cachedXml]", "value", "dfc-generated"]
       - ["System.Security.Cryptography.Xml", "Reference", False, "Reference", "(System.IO.Stream)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Security.Cryptography.Xml", "Reference", False, "Reference", "(System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Security.Cryptography.Xml", "ReferenceList", False, "Item", "(System.Int32)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Security.Cryptography.Xml", "ReferenceList", False, "set_ItemOf", "(System.Int32,System.Security.Cryptography.Xml.EncryptedReference)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["System.Security.Cryptography.Xml", "ReferenceList", False, "Item", "(System.Int32)", "", "Argument[this].SyntheticField[System.Security.Cryptography.Xml.ReferenceList._references].Element", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Security.Cryptography.Xml", "ReferenceList", False, "get_SyncRoot", "()", "", "Argument[this].SyntheticField[System.Security.Cryptography.Xml.ReferenceList._references].Property[System.Collections.ArrayList.SyncRoot]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Security.Cryptography.Xml", "ReferenceList", False, "set_ItemOf", "(System.Int32,System.Security.Cryptography.Xml.EncryptedReference)", "", "Argument[1]", "Argument[this].Element", "value", "dfc-generated"]
+      - ["System.Security.Cryptography.Xml", "ReferenceList", False, "set_ItemOf", "(System.Int32,System.Security.Cryptography.Xml.EncryptedReference)", "", "Argument[1]", "Argument[this].SyntheticField[System.Security.Cryptography.Xml.ReferenceList._references].Element", "value", "dfc-generated"]
       - ["System.Security.Cryptography.Xml", "Signature", False, "AddObject", "(System.Security.Cryptography.Xml.DataObject)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Security.Cryptography.Xml", "Signature", False, "LoadXml", "(System.Xml.XmlElement)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["System.Security.Cryptography.Xml", "SignedInfo", False, "AddReference", "(System.Security.Cryptography.Xml.Reference)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Security.Cryptography.Xml", "SignedInfo", False, "AddReference", "(System.Security.Cryptography.Xml.Reference)", "", "Argument[this]", "Argument[0]", "taint", "df-generated"]
-      - ["System.Security.Cryptography.Xml", "SignedInfo", False, "GetXml", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Security.Cryptography.Xml", "SignedInfo", False, "LoadXml", "(System.Xml.XmlElement)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
+      - ["System.Security.Cryptography.Xml", "SignedInfo", False, "AddReference", "(System.Security.Cryptography.Xml.Reference)", "", "Argument[0]", "Argument[this].SyntheticField[System.Security.Cryptography.Xml.SignedInfo._references].Element", "value", "dfc-generated"]
+      - ["System.Security.Cryptography.Xml", "SignedInfo", False, "GetXml", "()", "", "Argument[this].SyntheticField[System.Security.Cryptography.Xml.SignedInfo._cachedXml]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Security.Cryptography.Xml", "SignedInfo", False, "LoadXml", "(System.Xml.XmlElement)", "", "Argument[0]", "Argument[this].SyntheticField[System.Security.Cryptography.Xml.SignedInfo._cachedXml]", "value", "dfc-generated"]
       - ["System.Security.Cryptography.Xml", "SignedInfo", False, "get_CanonicalizationMethodObject", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Security.Cryptography.Xml", "SignedInfo", False, "get_References", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Security.Cryptography.Xml", "SignedInfo", False, "get_References", "()", "", "Argument[this].SyntheticField[System.Security.Cryptography.Xml.SignedInfo._references]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Security.Cryptography.Xml", "SignedXml", False, "CheckSignature", "(System.Security.Cryptography.KeyedHashAlgorithm)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Security.Cryptography.Xml", "SignedXml", False, "CheckSignatureReturningKey", "(System.Security.Cryptography.AsymmetricAlgorithm)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Security.Cryptography.Xml", "SignedXml", False, "ComputeSignature", "(System.Security.Cryptography.KeyedHashAlgorithm)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Security.Cryptography.Xml", "SignedXml", False, "GetXml", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Security.Cryptography.Xml", "SignedXml", False, "LoadXml", "(System.Xml.XmlElement)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
       - ["System.Security.Cryptography.Xml", "SignedXml", False, "SignedXml", "(System.Xml.XmlDocument)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
       - ["System.Security.Cryptography.Xml", "SignedXml", False, "SignedXml", "(System.Xml.XmlElement)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
       - ["System.Security.Cryptography.Xml", "SignedXml", False, "get_SafeCanonicalizationMethods", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Security.Cryptography.Xml", "SignedXml", False, "get_Signature", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Security.Cryptography.Xml", "SignedXml", False, "get_SignatureValue", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Security.Cryptography.Xml", "SignedXml", False, "get_SignedInfo", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Security.Cryptography.Xml", "SignedXml", False, "get_Signature", "()", "", "Argument[this].Field[System.Security.Cryptography.Xml.SignedXml.m_signature]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Security.Cryptography.Xml", "SignedXml", False, "get_SignatureValue", "()", "", "Argument[this].Field[System.Security.Cryptography.Xml.SignedXml.m_signature].Property[System.Security.Cryptography.Xml.Signature.SignatureValue]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Security.Cryptography.Xml", "SignedXml", False, "get_SignedInfo", "()", "", "Argument[this].Field[System.Security.Cryptography.Xml.SignedXml.m_signature].Property[System.Security.Cryptography.Xml.Signature.SignedInfo]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Security.Cryptography.Xml", "SignedXml", False, "set_Resolver", "(System.Xml.XmlResolver)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Security.Cryptography.Xml", "SignedXml", True, "GetIdElement", "(System.Xml.XmlDocument,System.String)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
       - ["System.Security.Cryptography.Xml", "SignedXml", True, "GetPublicKey", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Security.Cryptography.Xml", "Transform", False, "GetXml", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Security.Cryptography.Xml", "Transform", False, "get_PropagatedNamespaces", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Security.Cryptography.Xml", "Transform", True, "GetDigestedOutput", "(System.Security.Cryptography.HashAlgorithm)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Security.Cryptography.Xml", "Transform", True, "GetInnerXml", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Security.Cryptography.Xml", "Transform", True, "GetOutput", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Security.Cryptography.Xml", "Transform", True, "GetOutput", "(System.Type)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Security.Cryptography.Xml", "Transform", True, "LoadInnerXml", "(System.Xml.XmlNodeList)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
       - ["System.Security.Cryptography.Xml", "Transform", True, "LoadInput", "(System.Object)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Security.Cryptography.Xml", "Transform", True, "get_InputTypes", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Security.Cryptography.Xml", "Transform", True, "get_OutputTypes", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Security.Cryptography.Xml", "TransformChain", False, "Add", "(System.Security.Cryptography.Xml.Transform)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Security.Cryptography.Xml", "TransformChain", False, "GetEnumerator", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Security.Cryptography.Xml", "TransformChain", False, "get_Item", "(System.Int32)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Security.Cryptography.Xml", "TransformChain", False, "Add", "(System.Security.Cryptography.Xml.Transform)", "", "Argument[0]", "Argument[this].SyntheticField[System.Security.Cryptography.Xml.TransformChain._transforms].Element", "value", "dfc-generated"]
+      - ["System.Security.Cryptography.Xml", "TransformChain", False, "GetEnumerator", "()", "", "Argument[this].SyntheticField[System.Security.Cryptography.Xml.TransformChain._transforms].Element", "ReturnValue.Property[System.Collections.IEnumerator.Current]", "value", "dfc-generated"]
+      - ["System.Security.Cryptography.Xml", "TransformChain", False, "get_Item", "(System.Int32)", "", "Argument[this].SyntheticField[System.Security.Cryptography.Xml.TransformChain._transforms].Element", "ReturnValue", "value", "dfc-generated"]
       - ["System.Security.Cryptography.Xml", "XmlDecryptionTransform", False, "AddExceptUri", "(System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["System.Security.Cryptography.Xml", "XmlDecryptionTransform", True, "GetOutput", "()", "", "Argument[this].SyntheticField[System.Security.Cryptography.Xml.XmlDecryptionTransform._containingDocument]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Security.Cryptography.Xml", "XmlDecryptionTransform", True, "GetOutput", "(System.Type)", "", "Argument[this].SyntheticField[System.Security.Cryptography.Xml.XmlDecryptionTransform._containingDocument]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Security.Cryptography.Xml", "XmlDecryptionTransform", True, "LoadInput", "(System.Object)", "", "Argument[0]", "Argument[this].SyntheticField[System.Security.Cryptography.Xml.XmlDecryptionTransform._containingDocument]", "value", "dfc-generated"]
+      - ["System.Security.Cryptography.Xml", "XmlDsigC14NTransform", True, "GetDigestedOutput", "(System.Security.Cryptography.HashAlgorithm)", "", "Argument[0].Property[System.Security.Cryptography.HashAlgorithm.Hash].Element", "ReturnValue.Element", "value", "dfc-generated"]
       - ["System.Security.Cryptography.Xml", "XmlDsigExcC14NTransform", False, "XmlDsigExcC14NTransform", "(System.Boolean,System.String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["System.Security.Cryptography.Xml", "XmlDsigExcC14NTransform", True, "GetDigestedOutput", "(System.Security.Cryptography.HashAlgorithm)", "", "Argument[0].Property[System.Security.Cryptography.HashAlgorithm.Hash].Element", "ReturnValue.Element", "value", "dfc-generated"]
+      - ["System.Security.Cryptography.Xml", "XmlDsigXsltTransform", True, "GetInnerXml", "()", "", "Argument[this].SyntheticField[System.Security.Cryptography.Xml.XmlDsigXsltTransform._xslNodes]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Security.Cryptography.Xml", "XmlDsigXsltTransform", True, "LoadInnerXml", "(System.Xml.XmlNodeList)", "", "Argument[0]", "Argument[this].SyntheticField[System.Security.Cryptography.Xml.XmlDsigXsltTransform._xslNodes]", "value", "dfc-generated"]
   - addsTo:
       pack: codeql/csharp-all
       extensible: sinkModel
@@ -127,6 +135,7 @@ extensions:
       - ["System.Security.Cryptography.Xml", "CryptoSignedXmlRecursionException", "CryptoSignedXmlRecursionException", "(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)", "summary", "df-generated"]
       - ["System.Security.Cryptography.Xml", "CryptoSignedXmlRecursionException", "CryptoSignedXmlRecursionException", "(System.String)", "summary", "df-generated"]
       - ["System.Security.Cryptography.Xml", "CryptoSignedXmlRecursionException", "CryptoSignedXmlRecursionException", "(System.String,System.Exception)", "summary", "df-generated"]
+      - ["System.Security.Cryptography.Xml", "DSAKeyValue", "GetXml", "()", "summary", "df-generated"]
       - ["System.Security.Cryptography.Xml", "DataReference", "DataReference", "(System.String)", "summary", "df-generated"]
       - ["System.Security.Cryptography.Xml", "DataReference", "DataReference", "(System.String,System.Security.Cryptography.Xml.TransformChain)", "summary", "df-generated"]
       - ["System.Security.Cryptography.Xml", "EncryptedKey", "get_ReferenceList", "()", "summary", "df-generated"]
@@ -156,6 +165,7 @@ extensions:
       - ["System.Security.Cryptography.Xml", "EncryptionPropertyCollection", "Contains", "(System.Security.Cryptography.Xml.EncryptionProperty)", "summary", "df-generated"]
       - ["System.Security.Cryptography.Xml", "EncryptionPropertyCollection", "IndexOf", "(System.Object)", "summary", "df-generated"]
       - ["System.Security.Cryptography.Xml", "EncryptionPropertyCollection", "IndexOf", "(System.Security.Cryptography.Xml.EncryptionProperty)", "summary", "df-generated"]
+      - ["System.Security.Cryptography.Xml", "EncryptionPropertyCollection", "Remove", "(System.Object)", "summary", "df-generated"]
       - ["System.Security.Cryptography.Xml", "EncryptionPropertyCollection", "Remove", "(System.Security.Cryptography.Xml.EncryptionProperty)", "summary", "df-generated"]
       - ["System.Security.Cryptography.Xml", "EncryptionPropertyCollection", "RemoveAt", "(System.Int32)", "summary", "df-generated"]
       - ["System.Security.Cryptography.Xml", "EncryptionPropertyCollection", "get_Count", "()", "summary", "df-generated"]
@@ -164,17 +174,25 @@ extensions:
       - ["System.Security.Cryptography.Xml", "EncryptionPropertyCollection", "get_IsSynchronized", "()", "summary", "df-generated"]
       - ["System.Security.Cryptography.Xml", "IRelDecryptor", "Decrypt", "(System.Security.Cryptography.Xml.EncryptionMethod,System.Security.Cryptography.Xml.KeyInfo,System.IO.Stream)", "summary", "df-generated"]
       - ["System.Security.Cryptography.Xml", "KeyInfo", "GetXml", "()", "summary", "df-generated"]
+      - ["System.Security.Cryptography.Xml", "KeyInfo", "LoadXml", "(System.Xml.XmlElement)", "summary", "df-generated"]
       - ["System.Security.Cryptography.Xml", "KeyInfo", "get_Count", "()", "summary", "df-generated"]
+      - ["System.Security.Cryptography.Xml", "KeyInfoClause", "GetXml", "()", "summary", "df-generated"]
+      - ["System.Security.Cryptography.Xml", "KeyInfoName", "GetXml", "()", "summary", "df-generated"]
+      - ["System.Security.Cryptography.Xml", "KeyInfoNode", "GetXml", "()", "summary", "df-generated"]
+      - ["System.Security.Cryptography.Xml", "KeyInfoRetrievalMethod", "GetXml", "()", "summary", "df-generated"]
       - ["System.Security.Cryptography.Xml", "KeyInfoX509Data", "AddCertificate", "(System.Security.Cryptography.X509Certificates.X509Certificate)", "summary", "df-generated"]
       - ["System.Security.Cryptography.Xml", "KeyInfoX509Data", "AddIssuerSerial", "(System.String,System.String)", "summary", "df-generated"]
       - ["System.Security.Cryptography.Xml", "KeyInfoX509Data", "AddSubjectKeyId", "(System.String)", "summary", "df-generated"]
+      - ["System.Security.Cryptography.Xml", "KeyInfoX509Data", "GetXml", "()", "summary", "df-generated"]
       - ["System.Security.Cryptography.Xml", "KeyInfoX509Data", "KeyInfoX509Data", "(System.Byte[])", "summary", "df-generated"]
       - ["System.Security.Cryptography.Xml", "KeyInfoX509Data", "KeyInfoX509Data", "(System.Security.Cryptography.X509Certificates.X509Certificate)", "summary", "df-generated"]
       - ["System.Security.Cryptography.Xml", "KeyInfoX509Data", "KeyInfoX509Data", "(System.Security.Cryptography.X509Certificates.X509Certificate,System.Security.Cryptography.X509Certificates.X509IncludeOption)", "summary", "df-generated"]
       - ["System.Security.Cryptography.Xml", "KeyReference", "KeyReference", "(System.String)", "summary", "df-generated"]
       - ["System.Security.Cryptography.Xml", "KeyReference", "KeyReference", "(System.String,System.Security.Cryptography.Xml.TransformChain)", "summary", "df-generated"]
+      - ["System.Security.Cryptography.Xml", "RSAKeyValue", "GetXml", "()", "summary", "df-generated"]
       - ["System.Security.Cryptography.Xml", "ReferenceList", "Contains", "(System.Object)", "summary", "df-generated"]
       - ["System.Security.Cryptography.Xml", "ReferenceList", "IndexOf", "(System.Object)", "summary", "df-generated"]
+      - ["System.Security.Cryptography.Xml", "ReferenceList", "Remove", "(System.Object)", "summary", "df-generated"]
       - ["System.Security.Cryptography.Xml", "ReferenceList", "RemoveAt", "(System.Int32)", "summary", "df-generated"]
       - ["System.Security.Cryptography.Xml", "ReferenceList", "get_Count", "()", "summary", "df-generated"]
       - ["System.Security.Cryptography.Xml", "ReferenceList", "get_IsFixedSize", "()", "summary", "df-generated"]
@@ -191,13 +209,24 @@ extensions:
       - ["System.Security.Cryptography.Xml", "SignedXml", "CheckSignature", "(System.Security.Cryptography.AsymmetricAlgorithm)", "summary", "df-generated"]
       - ["System.Security.Cryptography.Xml", "SignedXml", "CheckSignature", "(System.Security.Cryptography.X509Certificates.X509Certificate2,System.Boolean)", "summary", "df-generated"]
       - ["System.Security.Cryptography.Xml", "SignedXml", "ComputeSignature", "()", "summary", "df-generated"]
+      - ["System.Security.Cryptography.Xml", "SignedXml", "GetXml", "()", "summary", "df-generated"]
       - ["System.Security.Cryptography.Xml", "SignedXml", "get_SignatureLength", "()", "summary", "df-generated"]
       - ["System.Security.Cryptography.Xml", "SignedXml", "get_SignatureMethod", "()", "summary", "df-generated"]
+      - ["System.Security.Cryptography.Xml", "Transform", "GetDigestedOutput", "(System.Security.Cryptography.HashAlgorithm)", "summary", "df-generated"]
+      - ["System.Security.Cryptography.Xml", "Transform", "GetInnerXml", "()", "summary", "df-generated"]
+      - ["System.Security.Cryptography.Xml", "Transform", "GetXml", "()", "summary", "df-generated"]
       - ["System.Security.Cryptography.Xml", "TransformChain", "get_Count", "()", "summary", "df-generated"]
+      - ["System.Security.Cryptography.Xml", "XmlDecryptionTransform", "GetInnerXml", "()", "summary", "df-generated"]
       - ["System.Security.Cryptography.Xml", "XmlDecryptionTransform", "IsTargetElement", "(System.Xml.XmlElement,System.String)", "summary", "df-generated"]
+      - ["System.Security.Cryptography.Xml", "XmlDsigBase64Transform", "GetInnerXml", "()", "summary", "df-generated"]
+      - ["System.Security.Cryptography.Xml", "XmlDsigC14NTransform", "GetInnerXml", "()", "summary", "df-generated"]
       - ["System.Security.Cryptography.Xml", "XmlDsigC14NTransform", "XmlDsigC14NTransform", "(System.Boolean)", "summary", "df-generated"]
+      - ["System.Security.Cryptography.Xml", "XmlDsigEnvelopedSignatureTransform", "GetInnerXml", "()", "summary", "df-generated"]
       - ["System.Security.Cryptography.Xml", "XmlDsigEnvelopedSignatureTransform", "XmlDsigEnvelopedSignatureTransform", "(System.Boolean)", "summary", "df-generated"]
+      - ["System.Security.Cryptography.Xml", "XmlDsigExcC14NTransform", "GetInnerXml", "()", "summary", "df-generated"]
       - ["System.Security.Cryptography.Xml", "XmlDsigExcC14NTransform", "XmlDsigExcC14NTransform", "(System.Boolean)", "summary", "df-generated"]
       - ["System.Security.Cryptography.Xml", "XmlDsigExcC14NTransform", "XmlDsigExcC14NTransform", "(System.String)", "summary", "df-generated"]
       - ["System.Security.Cryptography.Xml", "XmlDsigExcC14NWithCommentsTransform", "XmlDsigExcC14NWithCommentsTransform", "(System.String)", "summary", "df-generated"]
+      - ["System.Security.Cryptography.Xml", "XmlDsigXPathTransform", "GetInnerXml", "()", "summary", "df-generated"]
       - ["System.Security.Cryptography.Xml", "XmlDsigXsltTransform", "XmlDsigXsltTransform", "(System.Boolean)", "summary", "df-generated"]
+      - ["System.Security.Cryptography.Xml", "XmlLicenseTransform", "GetInnerXml", "()", "summary", "df-generated"]
diff --git a/csharp/ql/lib/ext/generated/System.Security.Cryptography.model.yml b/csharp/ql/lib/ext/generated/System.Security.Cryptography.model.yml
index afd8556bdbd..47a63e5c882 100644
--- a/csharp/ql/lib/ext/generated/System.Security.Cryptography.model.yml
+++ b/csharp/ql/lib/ext/generated/System.Security.Cryptography.model.yml
@@ -4,20 +4,21 @@ extensions:
       pack: codeql/csharp-all
       extensible: summaryModel
     data:
-      - ["System.Security.Cryptography", "AsnEncodedData", False, "AsnEncodedData", "(System.Byte[])", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["System.Security.Cryptography", "AsnEncodedData", False, "AsnEncodedData", "(System.ReadOnlySpan<System.Byte>)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Security.Cryptography", "AsnEncodedData", False, "AsnEncodedData", "(System.Security.Cryptography.AsnEncodedData)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Security.Cryptography", "AsnEncodedData", False, "AsnEncodedData", "(System.Security.Cryptography.Oid,System.ReadOnlySpan<System.Byte>)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Security.Cryptography", "AsnEncodedData", False, "AsnEncodedData", "(System.Security.Cryptography.Oid,System.ReadOnlySpan<System.Byte>)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Security.Cryptography", "AsnEncodedData", False, "AsnEncodedData", "(System.String,System.ReadOnlySpan<System.Byte>)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Security.Cryptography", "AsnEncodedData", False, "AsnEncodedData", "(System.String,System.ReadOnlySpan<System.Byte>)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Security.Cryptography", "AsnEncodedData", True, "CopyFrom", "(System.Security.Cryptography.AsnEncodedData)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Security.Cryptography", "AsnEncodedData", True, "Format", "(System.Boolean)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Security.Cryptography", "AsnEncodedDataCollection", False, "AsnEncodedDataCollection", "(System.Security.Cryptography.AsnEncodedData)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Security.Cryptography", "AsnEncodedDataCollection", False, "get_Item", "(System.Int32)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Security.Cryptography", "AsnEncodedData", False, "AsnEncodedData", "(System.Byte[])", "", "Argument[0].Element", "Argument[this].SyntheticField[System.Security.Cryptography.AsnEncodedData._rawData].Element", "value", "dfc-generated"]
+      - ["System.Security.Cryptography", "AsnEncodedData", False, "AsnEncodedData", "(System.Byte[])", "", "Argument[0]", "Argument[this].SyntheticField[System.Security.Cryptography.AsnEncodedData._rawData]", "value", "dfc-generated"]
+      - ["System.Security.Cryptography", "AsnEncodedData", False, "AsnEncodedData", "(System.ReadOnlySpan<System.Byte>)", "", "Argument[0].Element", "Argument[this].SyntheticField[System.Security.Cryptography.AsnEncodedData._rawData].Element", "value", "dfc-generated"]
+      - ["System.Security.Cryptography", "AsnEncodedData", False, "AsnEncodedData", "(System.Security.Cryptography.AsnEncodedData)", "", "Argument[0].SyntheticField[System.Security.Cryptography.AsnEncodedData._rawData].Element", "Argument[this].SyntheticField[System.Security.Cryptography.AsnEncodedData._rawData].Element", "value", "dfc-generated"]
+      - ["System.Security.Cryptography", "AsnEncodedData", False, "AsnEncodedData", "(System.Security.Cryptography.AsnEncodedData)", "", "Argument[0].SyntheticField[System.Security.Cryptography.AsnEncodedData._rawData]", "Argument[this].SyntheticField[System.Security.Cryptography.AsnEncodedData._rawData]", "value", "dfc-generated"]
+      - ["System.Security.Cryptography", "AsnEncodedData", False, "AsnEncodedData", "(System.Security.Cryptography.Oid,System.ReadOnlySpan<System.Byte>)", "", "Argument[1].Element", "Argument[this].SyntheticField[System.Security.Cryptography.AsnEncodedData._rawData].Element", "value", "dfc-generated"]
+      - ["System.Security.Cryptography", "AsnEncodedData", False, "AsnEncodedData", "(System.String,System.ReadOnlySpan<System.Byte>)", "", "Argument[1].Element", "Argument[this].SyntheticField[System.Security.Cryptography.AsnEncodedData._rawData].Element", "value", "dfc-generated"]
+      - ["System.Security.Cryptography", "AsnEncodedData", True, "CopyFrom", "(System.Security.Cryptography.AsnEncodedData)", "", "Argument[0].SyntheticField[System.Security.Cryptography.AsnEncodedData._rawData].Element", "Argument[this].SyntheticField[System.Security.Cryptography.AsnEncodedData._rawData].Element", "value", "dfc-generated"]
+      - ["System.Security.Cryptography", "AsnEncodedData", True, "CopyFrom", "(System.Security.Cryptography.AsnEncodedData)", "", "Argument[0].SyntheticField[System.Security.Cryptography.AsnEncodedData._rawData]", "Argument[this].SyntheticField[System.Security.Cryptography.AsnEncodedData._rawData]", "value", "dfc-generated"]
+      - ["System.Security.Cryptography", "AsnEncodedData", True, "Format", "(System.Boolean)", "", "Argument[this].SyntheticField[System.Security.Cryptography.AsnEncodedData._rawData].Element", "ReturnValue", "taint", "dfc-generated"]
+      - ["System.Security.Cryptography", "AsnEncodedDataCollection", False, "AsnEncodedDataCollection", "(System.Security.Cryptography.AsnEncodedData)", "", "Argument[0]", "Argument[this].SyntheticField[System.Security.Cryptography.AsnEncodedDataCollection._list].Element", "value", "dfc-generated"]
+      - ["System.Security.Cryptography", "AsnEncodedDataCollection", False, "get_Item", "(System.Int32)", "", "Argument[this].SyntheticField[System.Security.Cryptography.AsnEncodedDataCollection._list].Element", "ReturnValue", "value", "dfc-generated"]
       - ["System.Security.Cryptography", "AsnEncodedDataEnumerator", False, "get_Current", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Security.Cryptography", "AsymmetricAlgorithm", True, "get_KeyExchangeAlgorithm", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Security.Cryptography", "AsymmetricAlgorithm", True, "get_LegalKeySizes", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Security.Cryptography", "AsymmetricAlgorithm", True, "get_LegalKeySizes", "()", "", "Argument[this].Field[System.Security.Cryptography.AsymmetricAlgorithm.LegalKeySizesValue].Element", "ReturnValue.Element", "value", "dfc-generated"]
       - ["System.Security.Cryptography", "AsymmetricAlgorithm", True, "get_SignatureAlgorithm", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Security.Cryptography", "AsymmetricKeyExchangeDeformatter", True, "SetKey", "(System.Security.Cryptography.AsymmetricAlgorithm)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Security.Cryptography", "AsymmetricKeyExchangeFormatter", True, "SetKey", "(System.Security.Cryptography.AsymmetricAlgorithm)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
@@ -25,55 +26,82 @@ extensions:
       - ["System.Security.Cryptography", "AsymmetricSignatureDeformatter", True, "SetKey", "(System.Security.Cryptography.AsymmetricAlgorithm)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Security.Cryptography", "AsymmetricSignatureFormatter", True, "SetHashAlgorithm", "(System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Security.Cryptography", "AsymmetricSignatureFormatter", True, "SetKey", "(System.Security.Cryptography.AsymmetricAlgorithm)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Security.Cryptography", "CngAlgorithm", False, "CngAlgorithm", "(System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Security.Cryptography", "CngAlgorithm", False, "ToString", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Security.Cryptography", "CngAlgorithm", False, "get_Algorithm", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Security.Cryptography", "CngAlgorithmGroup", False, "CngAlgorithmGroup", "(System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Security.Cryptography", "CngAlgorithmGroup", False, "ToString", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Security.Cryptography", "CngAlgorithmGroup", False, "get_AlgorithmGroup", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Security.Cryptography", "CngKeyBlobFormat", False, "CngKeyBlobFormat", "(System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Security.Cryptography", "CngKeyBlobFormat", False, "ToString", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Security.Cryptography", "CngKeyBlobFormat", False, "get_Format", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Security.Cryptography", "CngProperty", False, "CngProperty", "(System.String,System.Byte[],System.Security.Cryptography.CngPropertyOptions)", "", "Argument[1].Element", "Argument[this]", "taint", "df-generated"]
-      - ["System.Security.Cryptography", "CngProperty", False, "GetValue", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Security.Cryptography", "CngProvider", False, "CngProvider", "(System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Security.Cryptography", "CngProvider", False, "ToString", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Security.Cryptography", "CngProvider", False, "get_Provider", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Security.Cryptography", "CngAlgorithm", False, "CngAlgorithm", "(System.String)", "", "Argument[0]", "Argument[this].SyntheticField[System.Security.Cryptography.CngAlgorithm._algorithm]", "value", "dfc-generated"]
+      - ["System.Security.Cryptography", "CngAlgorithm", False, "ToString", "()", "", "Argument[this].SyntheticField[System.Security.Cryptography.CngAlgorithm._algorithm]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Security.Cryptography", "CngAlgorithm", False, "get_Algorithm", "()", "", "Argument[this].SyntheticField[System.Security.Cryptography.CngAlgorithm._algorithm]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Security.Cryptography", "CngAlgorithmGroup", False, "CngAlgorithmGroup", "(System.String)", "", "Argument[0]", "Argument[this].SyntheticField[System.Security.Cryptography.CngAlgorithmGroup._algorithmGroup]", "value", "dfc-generated"]
+      - ["System.Security.Cryptography", "CngAlgorithmGroup", False, "ToString", "()", "", "Argument[this].SyntheticField[System.Security.Cryptography.CngAlgorithmGroup._algorithmGroup]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Security.Cryptography", "CngAlgorithmGroup", False, "get_AlgorithmGroup", "()", "", "Argument[this].SyntheticField[System.Security.Cryptography.CngAlgorithmGroup._algorithmGroup]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Security.Cryptography", "CngKeyBlobFormat", False, "CngKeyBlobFormat", "(System.String)", "", "Argument[0]", "Argument[this].SyntheticField[System.Security.Cryptography.CngKeyBlobFormat._format]", "value", "dfc-generated"]
+      - ["System.Security.Cryptography", "CngKeyBlobFormat", False, "ToString", "()", "", "Argument[this].SyntheticField[System.Security.Cryptography.CngKeyBlobFormat._format]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Security.Cryptography", "CngKeyBlobFormat", False, "get_Format", "()", "", "Argument[this].SyntheticField[System.Security.Cryptography.CngKeyBlobFormat._format]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Security.Cryptography", "CngProperty", False, "CngProperty", "(System.String,System.Byte[],System.Security.Cryptography.CngPropertyOptions)", "", "Argument[1].Element", "Argument[this].SyntheticField[System.Security.Cryptography.CngProperty._value].Element", "value", "dfc-generated"]
+      - ["System.Security.Cryptography", "CngProperty", False, "CngProperty", "(System.String,System.Byte[],System.Security.Cryptography.CngPropertyOptions)", "", "Argument[1]", "Argument[this].SyntheticField[System.Security.Cryptography.CngProperty._value]", "value", "dfc-generated"]
+      - ["System.Security.Cryptography", "CngProperty", False, "GetValue", "()", "", "Argument[this].SyntheticField[System.Security.Cryptography.CngProperty._value].Element", "ReturnValue.Element", "value", "dfc-generated"]
+      - ["System.Security.Cryptography", "CngProperty", False, "GetValue", "()", "", "Argument[this].SyntheticField[System.Security.Cryptography.CngProperty._value]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Security.Cryptography", "CngProvider", False, "CngProvider", "(System.String)", "", "Argument[0]", "Argument[this].SyntheticField[System.Security.Cryptography.CngProvider._provider]", "value", "dfc-generated"]
+      - ["System.Security.Cryptography", "CngProvider", False, "ToString", "()", "", "Argument[this].SyntheticField[System.Security.Cryptography.CngProvider._provider]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Security.Cryptography", "CngProvider", False, "get_Provider", "()", "", "Argument[this].SyntheticField[System.Security.Cryptography.CngProvider._provider]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Security.Cryptography", "CryptoStream", False, "CryptoStream", "(System.IO.Stream,System.Security.Cryptography.ICryptoTransform,System.Security.Cryptography.CryptoStreamMode,System.Boolean)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Security.Cryptography", "CryptoStream", False, "CryptoStream", "(System.IO.Stream,System.Security.Cryptography.ICryptoTransform,System.Security.Cryptography.CryptoStreamMode,System.Boolean)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Security.Cryptography", "CryptographicAttributeObject", False, "CryptographicAttributeObject", "(System.Security.Cryptography.Oid,System.Security.Cryptography.AsnEncodedDataCollection)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Security.Cryptography", "CryptographicAttributeObject", False, "get_Oid", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Security.Cryptography", "CryptographicAttributeObjectCollection", False, "Add", "(System.Security.Cryptography.CryptographicAttributeObject)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Security.Cryptography", "CryptographicAttributeObjectCollection", False, "CopyTo", "(System.Security.Cryptography.CryptographicAttributeObject[],System.Int32)", "", "Argument[this]", "Argument[0].Element", "taint", "df-generated"]
-      - ["System.Security.Cryptography", "CryptographicAttributeObjectCollection", False, "CryptographicAttributeObjectCollection", "(System.Security.Cryptography.CryptographicAttributeObject)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["System.Security.Cryptography", "CryptographicAttributeObject", False, "CryptographicAttributeObject", "(System.Security.Cryptography.Oid,System.Security.Cryptography.AsnEncodedDataCollection)", "", "Argument[0]", "Argument[this].SyntheticField[System.Security.Cryptography.CryptographicAttributeObject._oid]", "value", "dfc-generated"]
+      - ["System.Security.Cryptography", "CryptographicAttributeObject", False, "get_Oid", "()", "", "Argument[this].SyntheticField[System.Security.Cryptography.CryptographicAttributeObject._oid]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Security.Cryptography", "CryptographicAttributeObjectCollection", False, "Add", "(System.Security.Cryptography.CryptographicAttributeObject)", "", "Argument[0]", "Argument[this].SyntheticField[System.Security.Cryptography.CryptographicAttributeObjectCollection._list].Element", "value", "dfc-generated"]
+      - ["System.Security.Cryptography", "CryptographicAttributeObjectCollection", False, "CopyTo", "(System.Security.Cryptography.CryptographicAttributeObject[],System.Int32)", "", "Argument[this].SyntheticField[System.Security.Cryptography.CryptographicAttributeObjectCollection._list].Element", "Argument[0].Element", "value", "dfc-generated"]
+      - ["System.Security.Cryptography", "CryptographicAttributeObjectCollection", False, "CryptographicAttributeObjectCollection", "(System.Security.Cryptography.CryptographicAttributeObject)", "", "Argument[0]", "Argument[this].SyntheticField[System.Security.Cryptography.CryptographicAttributeObjectCollection._list].Element", "value", "dfc-generated"]
       - ["System.Security.Cryptography", "CryptographicAttributeObjectCollection", False, "GetEnumerator", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Security.Cryptography", "CryptographicAttributeObjectCollection", False, "get_Item", "(System.Int32)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Security.Cryptography", "CryptographicAttributeObjectCollection", False, "get_Item", "(System.Int32)", "", "Argument[this].SyntheticField[System.Security.Cryptography.CryptographicAttributeObjectCollection._list].Element", "ReturnValue", "value", "dfc-generated"]
       - ["System.Security.Cryptography", "CryptographicAttributeObjectEnumerator", False, "get_Current", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Security.Cryptography", "DSAOpenSsl", False, "get_LegalKeySizes", "()", "", "Argument[this].Property[System.Security.Cryptography.AsymmetricAlgorithm.LegalKeySizes]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Security.Cryptography", "DSASignatureDeformatter", False, "DSASignatureDeformatter", "(System.Security.Cryptography.AsymmetricAlgorithm)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Security.Cryptography", "DSASignatureFormatter", False, "DSASignatureFormatter", "(System.Security.Cryptography.AsymmetricAlgorithm)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Security.Cryptography", "ECDiffieHellman", True, "get_PublicKey", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Security.Cryptography", "ECDiffieHellmanPublicKey", False, "ECDiffieHellmanPublicKey", "(System.Byte[])", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["System.Security.Cryptography", "ECDiffieHellmanPublicKey", True, "ToByteArray", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Security.Cryptography", "HMACMD5", False, "HMACMD5", "(System.Byte[])", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["System.Security.Cryptography", "HMACSHA1", False, "HMACSHA1", "(System.Byte[])", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["System.Security.Cryptography", "HMACSHA256", False, "HMACSHA256", "(System.Byte[])", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["System.Security.Cryptography", "HMACSHA384", False, "HMACSHA384", "(System.Byte[])", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["System.Security.Cryptography", "HMACSHA3_256", False, "HMACSHA3_256", "(System.Byte[])", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["System.Security.Cryptography", "HMACSHA3_384", False, "HMACSHA3_384", "(System.Byte[])", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["System.Security.Cryptography", "HMACSHA3_512", False, "HMACSHA3_512", "(System.Byte[])", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["System.Security.Cryptography", "HMACSHA512", False, "HMACSHA512", "(System.Byte[])", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["System.Security.Cryptography", "HashAlgorithm", False, "ComputeHash", "(System.Byte[])", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Security.Cryptography", "HashAlgorithm", False, "ComputeHash", "(System.Byte[],System.Int32,System.Int32)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Security.Cryptography", "HashAlgorithm", False, "ComputeHash", "(System.IO.Stream)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Security.Cryptography", "HashAlgorithm", False, "ComputeHashAsync", "(System.IO.Stream,System.Threading.CancellationToken)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Security.Cryptography", "HashAlgorithm", True, "get_Hash", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Security.Cryptography", "HashAlgorithmName", False, "HashAlgorithmName", "(System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Security.Cryptography", "HashAlgorithmName", False, "ToString", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Security.Cryptography", "HashAlgorithmName", False, "get_Name", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Security.Cryptography", "ECDiffieHellmanPublicKey", False, "ECDiffieHellmanPublicKey", "(System.Byte[])", "", "Argument[0].Element", "Argument[this].SyntheticField[System.Security.Cryptography.ECDiffieHellmanPublicKey._keyBlob].Element", "value", "dfc-generated"]
+      - ["System.Security.Cryptography", "ECDiffieHellmanPublicKey", True, "ToByteArray", "()", "", "Argument[this].SyntheticField[System.Security.Cryptography.ECDiffieHellmanPublicKey._keyBlob].Element", "ReturnValue.Element", "value", "dfc-generated"]
+      - ["System.Security.Cryptography", "HMACMD5", False, "HMACMD5", "(System.Byte[])", "", "Argument[0].Element", "Argument[this].Field[System.Security.Cryptography.KeyedHashAlgorithm.KeyValue].Element", "value", "dfc-generated"]
+      - ["System.Security.Cryptography", "HMACMD5", False, "HMACMD5", "(System.Byte[])", "", "Argument[0]", "Argument[this].Field[System.Security.Cryptography.KeyedHashAlgorithm.KeyValue]", "value", "dfc-generated"]
+      - ["System.Security.Cryptography", "HMACMD5", False, "HMACMD5", "(System.Byte[])", "", "Argument[0]", "Argument[this].SyntheticField[System.Security.Cryptography.HMACMD5._hMacCommon].SyntheticField[System.Security.Cryptography.HMACCommon.ActualKey]", "value", "dfc-generated"]
+      - ["System.Security.Cryptography", "HMACMD5", False, "HMACMD5", "(System.Byte[])", "", "Argument[this].SyntheticField[System.Security.Cryptography.HMACMD5._hMacCommon].SyntheticField[System.Security.Cryptography.HMACCommon.ActualKey]", "Argument[this].Field[System.Security.Cryptography.KeyedHashAlgorithm.KeyValue]", "value", "dfc-generated"]
+      - ["System.Security.Cryptography", "HMACSHA1", False, "HMACSHA1", "(System.Byte[])", "", "Argument[0].Element", "Argument[this].Field[System.Security.Cryptography.KeyedHashAlgorithm.KeyValue].Element", "value", "dfc-generated"]
+      - ["System.Security.Cryptography", "HMACSHA1", False, "HMACSHA1", "(System.Byte[])", "", "Argument[0]", "Argument[this].Field[System.Security.Cryptography.KeyedHashAlgorithm.KeyValue]", "value", "dfc-generated"]
+      - ["System.Security.Cryptography", "HMACSHA1", False, "HMACSHA1", "(System.Byte[])", "", "Argument[0]", "Argument[this].SyntheticField[System.Security.Cryptography.HMACSHA1._hMacCommon].SyntheticField[System.Security.Cryptography.HMACCommon.ActualKey]", "value", "dfc-generated"]
+      - ["System.Security.Cryptography", "HMACSHA1", False, "HMACSHA1", "(System.Byte[])", "", "Argument[this].SyntheticField[System.Security.Cryptography.HMACSHA1._hMacCommon].SyntheticField[System.Security.Cryptography.HMACCommon.ActualKey]", "Argument[this].Field[System.Security.Cryptography.KeyedHashAlgorithm.KeyValue]", "value", "dfc-generated"]
+      - ["System.Security.Cryptography", "HMACSHA256", False, "HMACSHA256", "(System.Byte[])", "", "Argument[0].Element", "Argument[this].Field[System.Security.Cryptography.KeyedHashAlgorithm.KeyValue].Element", "value", "dfc-generated"]
+      - ["System.Security.Cryptography", "HMACSHA256", False, "HMACSHA256", "(System.Byte[])", "", "Argument[0]", "Argument[this].Field[System.Security.Cryptography.KeyedHashAlgorithm.KeyValue]", "value", "dfc-generated"]
+      - ["System.Security.Cryptography", "HMACSHA256", False, "HMACSHA256", "(System.Byte[])", "", "Argument[0]", "Argument[this].SyntheticField[System.Security.Cryptography.HMACSHA256._hMacCommon].SyntheticField[System.Security.Cryptography.HMACCommon.ActualKey]", "value", "dfc-generated"]
+      - ["System.Security.Cryptography", "HMACSHA256", False, "HMACSHA256", "(System.Byte[])", "", "Argument[this].SyntheticField[System.Security.Cryptography.HMACSHA256._hMacCommon].SyntheticField[System.Security.Cryptography.HMACCommon.ActualKey]", "Argument[this].Field[System.Security.Cryptography.KeyedHashAlgorithm.KeyValue]", "value", "dfc-generated"]
+      - ["System.Security.Cryptography", "HMACSHA384", False, "HMACSHA384", "(System.Byte[])", "", "Argument[0].Element", "Argument[this].Field[System.Security.Cryptography.KeyedHashAlgorithm.KeyValue].Element", "value", "dfc-generated"]
+      - ["System.Security.Cryptography", "HMACSHA384", False, "HMACSHA384", "(System.Byte[])", "", "Argument[0]", "Argument[this].Field[System.Security.Cryptography.KeyedHashAlgorithm.KeyValue]", "value", "dfc-generated"]
+      - ["System.Security.Cryptography", "HMACSHA384", False, "HMACSHA384", "(System.Byte[])", "", "Argument[0]", "Argument[this].SyntheticField[System.Security.Cryptography.HMACSHA384._hMacCommon].SyntheticField[System.Security.Cryptography.HMACCommon.ActualKey]", "value", "dfc-generated"]
+      - ["System.Security.Cryptography", "HMACSHA384", False, "HMACSHA384", "(System.Byte[])", "", "Argument[this].SyntheticField[System.Security.Cryptography.HMACSHA384._hMacCommon].SyntheticField[System.Security.Cryptography.HMACCommon.ActualKey]", "Argument[this].Field[System.Security.Cryptography.KeyedHashAlgorithm.KeyValue]", "value", "dfc-generated"]
+      - ["System.Security.Cryptography", "HMACSHA3_256", False, "HMACSHA3_256", "(System.Byte[])", "", "Argument[0].Element", "Argument[this].Field[System.Security.Cryptography.KeyedHashAlgorithm.KeyValue].Element", "value", "dfc-generated"]
+      - ["System.Security.Cryptography", "HMACSHA3_256", False, "HMACSHA3_256", "(System.Byte[])", "", "Argument[0]", "Argument[this].Field[System.Security.Cryptography.KeyedHashAlgorithm.KeyValue]", "value", "dfc-generated"]
+      - ["System.Security.Cryptography", "HMACSHA3_256", False, "HMACSHA3_256", "(System.Byte[])", "", "Argument[0]", "Argument[this].SyntheticField[System.Security.Cryptography.HMACSHA3_256._hMacCommon].SyntheticField[System.Security.Cryptography.HMACCommon.ActualKey]", "value", "dfc-generated"]
+      - ["System.Security.Cryptography", "HMACSHA3_256", False, "HMACSHA3_256", "(System.Byte[])", "", "Argument[this].SyntheticField[System.Security.Cryptography.HMACSHA3_256._hMacCommon].SyntheticField[System.Security.Cryptography.HMACCommon.ActualKey]", "Argument[this].Field[System.Security.Cryptography.KeyedHashAlgorithm.KeyValue]", "value", "dfc-generated"]
+      - ["System.Security.Cryptography", "HMACSHA3_384", False, "HMACSHA3_384", "(System.Byte[])", "", "Argument[0].Element", "Argument[this].Field[System.Security.Cryptography.KeyedHashAlgorithm.KeyValue].Element", "value", "dfc-generated"]
+      - ["System.Security.Cryptography", "HMACSHA3_384", False, "HMACSHA3_384", "(System.Byte[])", "", "Argument[0]", "Argument[this].Field[System.Security.Cryptography.KeyedHashAlgorithm.KeyValue]", "value", "dfc-generated"]
+      - ["System.Security.Cryptography", "HMACSHA3_384", False, "HMACSHA3_384", "(System.Byte[])", "", "Argument[0]", "Argument[this].SyntheticField[System.Security.Cryptography.HMACSHA3_384._hMacCommon].SyntheticField[System.Security.Cryptography.HMACCommon.ActualKey]", "value", "dfc-generated"]
+      - ["System.Security.Cryptography", "HMACSHA3_384", False, "HMACSHA3_384", "(System.Byte[])", "", "Argument[this].SyntheticField[System.Security.Cryptography.HMACSHA3_384._hMacCommon].SyntheticField[System.Security.Cryptography.HMACCommon.ActualKey]", "Argument[this].Field[System.Security.Cryptography.KeyedHashAlgorithm.KeyValue]", "value", "dfc-generated"]
+      - ["System.Security.Cryptography", "HMACSHA3_512", False, "HMACSHA3_512", "(System.Byte[])", "", "Argument[0].Element", "Argument[this].Field[System.Security.Cryptography.KeyedHashAlgorithm.KeyValue].Element", "value", "dfc-generated"]
+      - ["System.Security.Cryptography", "HMACSHA3_512", False, "HMACSHA3_512", "(System.Byte[])", "", "Argument[0]", "Argument[this].Field[System.Security.Cryptography.KeyedHashAlgorithm.KeyValue]", "value", "dfc-generated"]
+      - ["System.Security.Cryptography", "HMACSHA3_512", False, "HMACSHA3_512", "(System.Byte[])", "", "Argument[0]", "Argument[this].SyntheticField[System.Security.Cryptography.HMACSHA3_512._hMacCommon].SyntheticField[System.Security.Cryptography.HMACCommon.ActualKey]", "value", "dfc-generated"]
+      - ["System.Security.Cryptography", "HMACSHA3_512", False, "HMACSHA3_512", "(System.Byte[])", "", "Argument[this].SyntheticField[System.Security.Cryptography.HMACSHA3_512._hMacCommon].SyntheticField[System.Security.Cryptography.HMACCommon.ActualKey]", "Argument[this].Field[System.Security.Cryptography.KeyedHashAlgorithm.KeyValue]", "value", "dfc-generated"]
+      - ["System.Security.Cryptography", "HMACSHA512", False, "HMACSHA512", "(System.Byte[])", "", "Argument[0].Element", "Argument[this].Field[System.Security.Cryptography.KeyedHashAlgorithm.KeyValue].Element", "value", "dfc-generated"]
+      - ["System.Security.Cryptography", "HMACSHA512", False, "HMACSHA512", "(System.Byte[])", "", "Argument[0]", "Argument[this].Field[System.Security.Cryptography.KeyedHashAlgorithm.KeyValue]", "value", "dfc-generated"]
+      - ["System.Security.Cryptography", "HMACSHA512", False, "HMACSHA512", "(System.Byte[])", "", "Argument[0]", "Argument[this].SyntheticField[System.Security.Cryptography.HMACSHA512._hMacCommon].SyntheticField[System.Security.Cryptography.HMACCommon.ActualKey]", "value", "dfc-generated"]
+      - ["System.Security.Cryptography", "HMACSHA512", False, "HMACSHA512", "(System.Byte[])", "", "Argument[this].SyntheticField[System.Security.Cryptography.HMACSHA512._hMacCommon].SyntheticField[System.Security.Cryptography.HMACCommon.ActualKey]", "Argument[this].Field[System.Security.Cryptography.KeyedHashAlgorithm.KeyValue]", "value", "dfc-generated"]
+      - ["System.Security.Cryptography", "HashAlgorithm", False, "ComputeHash", "(System.Byte[])", "", "Argument[this].Field[System.Security.Cryptography.HashAlgorithm.HashValue].Element", "ReturnValue.Element", "value", "dfc-generated"]
+      - ["System.Security.Cryptography", "HashAlgorithm", False, "ComputeHash", "(System.Byte[],System.Int32,System.Int32)", "", "Argument[this].Field[System.Security.Cryptography.HashAlgorithm.HashValue].Element", "ReturnValue.Element", "value", "dfc-generated"]
+      - ["System.Security.Cryptography", "HashAlgorithm", False, "ComputeHash", "(System.IO.Stream)", "", "Argument[this].Field[System.Security.Cryptography.HashAlgorithm.HashValue].Element", "ReturnValue.Element", "value", "dfc-generated"]
+      - ["System.Security.Cryptography", "HashAlgorithm", False, "ComputeHashAsync", "(System.IO.Stream,System.Threading.CancellationToken)", "", "Argument[this].Field[System.Security.Cryptography.HashAlgorithm.HashValue].Element", "ReturnValue.Property[System.Threading.Tasks.Task`1.Result].Element", "value", "dfc-generated"]
+      - ["System.Security.Cryptography", "HashAlgorithm", True, "get_Hash", "()", "", "Argument[this].Field[System.Security.Cryptography.HashAlgorithm.HashValue].Element", "ReturnValue.Element", "value", "dfc-generated"]
+      - ["System.Security.Cryptography", "HashAlgorithmName", False, "HashAlgorithmName", "(System.String)", "", "Argument[0]", "Argument[this].SyntheticField[System.Security.Cryptography.HashAlgorithmName._name]", "value", "dfc-generated"]
+      - ["System.Security.Cryptography", "HashAlgorithmName", False, "ToString", "()", "", "Argument[this].SyntheticField[System.Security.Cryptography.HashAlgorithmName._name]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Security.Cryptography", "HashAlgorithmName", False, "get_Name", "()", "", "Argument[this].SyntheticField[System.Security.Cryptography.HashAlgorithmName._name]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Security.Cryptography", "IncrementalHash", False, "CreateHMAC", "(System.Security.Cryptography.HashAlgorithmName,System.Byte[])", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["System.Security.Cryptography", "IncrementalHash", False, "CreateHMAC", "(System.Security.Cryptography.HashAlgorithmName,System.ReadOnlySpan<System.Byte>)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Security.Cryptography", "IncrementalHash", False, "CreateHash", "(System.Security.Cryptography.HashAlgorithmName)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Security.Cryptography", "IncrementalHash", False, "get_AlgorithmName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Security.Cryptography", "IncrementalHash", False, "CreateHash", "(System.Security.Cryptography.HashAlgorithmName)", "", "Argument[0]", "ReturnValue.SyntheticField[System.Security.Cryptography.IncrementalHash._algorithmName]", "value", "dfc-generated"]
+      - ["System.Security.Cryptography", "IncrementalHash", False, "get_AlgorithmName", "()", "", "Argument[this].SyntheticField[System.Security.Cryptography.IncrementalHash._algorithmName]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Security.Cryptography", "Oid", False, "FromFriendlyName", "(System.String,System.Security.Cryptography.OidGroup)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["System.Security.Cryptography", "Oid", False, "FromOidValue", "(System.String,System.Security.Cryptography.OidGroup)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["System.Security.Cryptography", "Oid", False, "Oid", "(System.Security.Cryptography.Oid)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
@@ -82,14 +110,15 @@ extensions:
       - ["System.Security.Cryptography", "Oid", False, "Oid", "(System.String,System.String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
       - ["System.Security.Cryptography", "OidCollection", False, "get_Item", "(System.Int32)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Security.Cryptography", "OidCollection", False, "get_Item", "(System.String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Security.Cryptography", "OidEnumerator", False, "get_Current", "()", "", "Argument[this].Property[System.Security.Cryptography.OidEnumerator.Current]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Security.Cryptography", "OidEnumerator", False, "get_Current", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Security.Cryptography", "PasswordDeriveBytes", False, "PasswordDeriveBytes", "(System.Byte[],System.Byte[],System.String,System.Int32,System.Security.Cryptography.CspParameters)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
       - ["System.Security.Cryptography", "PasswordDeriveBytes", False, "PasswordDeriveBytes", "(System.Byte[],System.Byte[],System.String,System.Int32,System.Security.Cryptography.CspParameters)", "", "Argument[1].Element", "Argument[this]", "taint", "df-generated"]
       - ["System.Security.Cryptography", "PasswordDeriveBytes", False, "PasswordDeriveBytes", "(System.Byte[],System.Byte[],System.String,System.Int32,System.Security.Cryptography.CspParameters)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
       - ["System.Security.Cryptography", "PasswordDeriveBytes", False, "PasswordDeriveBytes", "(System.Byte[],System.Byte[],System.String,System.Int32,System.Security.Cryptography.CspParameters)", "", "Argument[4]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Security.Cryptography", "RSAEncryptionPadding", False, "CreateOaep", "(System.Security.Cryptography.HashAlgorithmName)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Security.Cryptography", "RSAEncryptionPadding", False, "ToString", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Security.Cryptography", "RSAEncryptionPadding", False, "get_OaepHashAlgorithm", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Security.Cryptography", "RSAEncryptionPadding", False, "CreateOaep", "(System.Security.Cryptography.HashAlgorithmName)", "", "Argument[0]", "ReturnValue.SyntheticField[System.Security.Cryptography.RSAEncryptionPadding._oaepHashAlgorithm]", "value", "dfc-generated"]
+      - ["System.Security.Cryptography", "RSAEncryptionPadding", False, "ToString", "()", "", "Argument[this].SyntheticField[System.Security.Cryptography.RSAEncryptionPadding._oaepHashAlgorithm].Property[System.Security.Cryptography.HashAlgorithmName.Name]", "ReturnValue", "taint", "dfc-generated"]
+      - ["System.Security.Cryptography", "RSAEncryptionPadding", False, "get_OaepHashAlgorithm", "()", "", "Argument[this].SyntheticField[System.Security.Cryptography.RSAEncryptionPadding._oaepHashAlgorithm]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Security.Cryptography", "RSAOAEPKeyExchangeDeformatter", False, "RSAOAEPKeyExchangeDeformatter", "(System.Security.Cryptography.AsymmetricAlgorithm)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Security.Cryptography", "RSAOAEPKeyExchangeFormatter", False, "RSAOAEPKeyExchangeFormatter", "(System.Security.Cryptography.AsymmetricAlgorithm)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Security.Cryptography", "RSAPKCS1KeyExchangeDeformatter", False, "RSAPKCS1KeyExchangeDeformatter", "(System.Security.Cryptography.AsymmetricAlgorithm)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
@@ -98,22 +127,19 @@ extensions:
       - ["System.Security.Cryptography", "RSAPKCS1SignatureFormatter", False, "RSAPKCS1SignatureFormatter", "(System.Security.Cryptography.AsymmetricAlgorithm)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Security.Cryptography", "SP800108HmacCounterKdf", False, "SP800108HmacCounterKdf", "(System.Byte[],System.Security.Cryptography.HashAlgorithmName)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
       - ["System.Security.Cryptography", "SP800108HmacCounterKdf", False, "SP800108HmacCounterKdf", "(System.ReadOnlySpan<System.Byte>,System.Security.Cryptography.HashAlgorithmName)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Security.Cryptography", "SafeEvpPKeyHandle", False, "DuplicateHandle", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Security.Cryptography", "SignatureDescription", True, "CreateDeformatter", "(System.Security.Cryptography.AsymmetricAlgorithm)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Security.Cryptography", "SignatureDescription", True, "CreateDeformatter", "(System.Security.Cryptography.AsymmetricAlgorithm)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Security.Cryptography", "SignatureDescription", True, "CreateFormatter", "(System.Security.Cryptography.AsymmetricAlgorithm)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Security.Cryptography", "SignatureDescription", True, "CreateFormatter", "(System.Security.Cryptography.AsymmetricAlgorithm)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Security.Cryptography", "SymmetricAlgorithm", False, "EncryptCbc", "(System.ReadOnlySpan<System.Byte>,System.ReadOnlySpan<System.Byte>,System.Span<System.Byte>,System.Security.Cryptography.PaddingMode)", "", "Argument[0]", "Argument[2]", "taint", "df-generated"]
-      - ["System.Security.Cryptography", "SymmetricAlgorithm", False, "EncryptCfb", "(System.ReadOnlySpan<System.Byte>,System.ReadOnlySpan<System.Byte>,System.Span<System.Byte>,System.Security.Cryptography.PaddingMode,System.Int32)", "", "Argument[0]", "Argument[2]", "taint", "df-generated"]
-      - ["System.Security.Cryptography", "SymmetricAlgorithm", False, "EncryptEcb", "(System.ReadOnlySpan<System.Byte>,System.Span<System.Byte>,System.Security.Cryptography.PaddingMode)", "", "Argument[0]", "Argument[1]", "taint", "df-generated"]
-      - ["System.Security.Cryptography", "SymmetricAlgorithm", False, "TryEncryptCbc", "(System.ReadOnlySpan<System.Byte>,System.ReadOnlySpan<System.Byte>,System.Span<System.Byte>,System.Int32,System.Security.Cryptography.PaddingMode)", "", "Argument[0]", "Argument[2]", "taint", "df-generated"]
-      - ["System.Security.Cryptography", "SymmetricAlgorithm", False, "TryEncryptCfb", "(System.ReadOnlySpan<System.Byte>,System.ReadOnlySpan<System.Byte>,System.Span<System.Byte>,System.Int32,System.Security.Cryptography.PaddingMode,System.Int32)", "", "Argument[0]", "Argument[2]", "taint", "df-generated"]
-      - ["System.Security.Cryptography", "SymmetricAlgorithm", False, "TryEncryptEcb", "(System.ReadOnlySpan<System.Byte>,System.Span<System.Byte>,System.Security.Cryptography.PaddingMode,System.Int32)", "", "Argument[0]", "Argument[1]", "taint", "df-generated"]
-      - ["System.Security.Cryptography", "SymmetricAlgorithm", True, "TryEncryptCbcCore", "(System.ReadOnlySpan<System.Byte>,System.ReadOnlySpan<System.Byte>,System.Span<System.Byte>,System.Security.Cryptography.PaddingMode,System.Int32)", "", "Argument[0]", "Argument[2]", "taint", "df-generated"]
-      - ["System.Security.Cryptography", "SymmetricAlgorithm", True, "TryEncryptCfbCore", "(System.ReadOnlySpan<System.Byte>,System.ReadOnlySpan<System.Byte>,System.Span<System.Byte>,System.Security.Cryptography.PaddingMode,System.Int32,System.Int32)", "", "Argument[0]", "Argument[2]", "taint", "df-generated"]
-      - ["System.Security.Cryptography", "SymmetricAlgorithm", True, "TryEncryptEcbCore", "(System.ReadOnlySpan<System.Byte>,System.Span<System.Byte>,System.Security.Cryptography.PaddingMode,System.Int32)", "", "Argument[0]", "Argument[1]", "taint", "df-generated"]
-      - ["System.Security.Cryptography", "SymmetricAlgorithm", True, "get_LegalBlockSizes", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Security.Cryptography", "SymmetricAlgorithm", True, "get_LegalKeySizes", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Security.Cryptography", "SymmetricAlgorithm", False, "EncryptCbc", "(System.ReadOnlySpan<System.Byte>,System.ReadOnlySpan<System.Byte>,System.Span<System.Byte>,System.Security.Cryptography.PaddingMode)", "", "Argument[0].Element", "Argument[2].Element", "value", "dfc-generated"]
+      - ["System.Security.Cryptography", "SymmetricAlgorithm", False, "EncryptCfb", "(System.ReadOnlySpan<System.Byte>,System.ReadOnlySpan<System.Byte>,System.Span<System.Byte>,System.Security.Cryptography.PaddingMode,System.Int32)", "", "Argument[0].Element", "Argument[2].Element", "value", "dfc-generated"]
+      - ["System.Security.Cryptography", "SymmetricAlgorithm", False, "EncryptEcb", "(System.ReadOnlySpan<System.Byte>,System.Span<System.Byte>,System.Security.Cryptography.PaddingMode)", "", "Argument[0].Element", "Argument[1].Element", "value", "dfc-generated"]
+      - ["System.Security.Cryptography", "SymmetricAlgorithm", False, "TryEncryptCbc", "(System.ReadOnlySpan<System.Byte>,System.ReadOnlySpan<System.Byte>,System.Span<System.Byte>,System.Int32,System.Security.Cryptography.PaddingMode)", "", "Argument[0].Element", "Argument[2].Element", "value", "dfc-generated"]
+      - ["System.Security.Cryptography", "SymmetricAlgorithm", False, "TryEncryptCfb", "(System.ReadOnlySpan<System.Byte>,System.ReadOnlySpan<System.Byte>,System.Span<System.Byte>,System.Int32,System.Security.Cryptography.PaddingMode,System.Int32)", "", "Argument[0].Element", "Argument[2].Element", "value", "dfc-generated"]
+      - ["System.Security.Cryptography", "SymmetricAlgorithm", False, "TryEncryptEcb", "(System.ReadOnlySpan<System.Byte>,System.Span<System.Byte>,System.Security.Cryptography.PaddingMode,System.Int32)", "", "Argument[0].Element", "Argument[1].Element", "value", "dfc-generated"]
+      - ["System.Security.Cryptography", "SymmetricAlgorithm", True, "TryEncryptCbcCore", "(System.ReadOnlySpan<System.Byte>,System.ReadOnlySpan<System.Byte>,System.Span<System.Byte>,System.Security.Cryptography.PaddingMode,System.Int32)", "", "Argument[0].Element", "Argument[2].Element", "value", "dfc-generated"]
+      - ["System.Security.Cryptography", "SymmetricAlgorithm", True, "TryEncryptCfbCore", "(System.ReadOnlySpan<System.Byte>,System.ReadOnlySpan<System.Byte>,System.Span<System.Byte>,System.Security.Cryptography.PaddingMode,System.Int32,System.Int32)", "", "Argument[0].Element", "Argument[2].Element", "value", "dfc-generated"]
+      - ["System.Security.Cryptography", "SymmetricAlgorithm", True, "TryEncryptEcbCore", "(System.ReadOnlySpan<System.Byte>,System.Span<System.Byte>,System.Security.Cryptography.PaddingMode,System.Int32)", "", "Argument[0].Element", "Argument[1].Element", "value", "dfc-generated"]
+      - ["System.Security.Cryptography", "SymmetricAlgorithm", True, "get_LegalBlockSizes", "()", "", "Argument[this].Field[System.Security.Cryptography.SymmetricAlgorithm.LegalBlockSizesValue].Element", "ReturnValue.Element", "value", "dfc-generated"]
+      - ["System.Security.Cryptography", "SymmetricAlgorithm", True, "get_LegalKeySizes", "()", "", "Argument[this].Field[System.Security.Cryptography.SymmetricAlgorithm.LegalKeySizesValue].Element", "ReturnValue.Element", "value", "dfc-generated"]
   - addsTo:
       pack: codeql/csharp-all
       extensible: sinkModel
@@ -1388,6 +1414,7 @@ extensions:
       - ["System.Security.Cryptography", "SP800108HmacCounterKdf", "DeriveKey", "(System.ReadOnlySpan<System.Char>,System.ReadOnlySpan<System.Char>,System.Span<System.Byte>)", "summary", "df-generated"]
       - ["System.Security.Cryptography", "SP800108HmacCounterKdf", "DeriveKey", "(System.String,System.String,System.Int32)", "summary", "df-generated"]
       - ["System.Security.Cryptography", "SP800108HmacCounterKdf", "Dispose", "()", "summary", "df-generated"]
+      - ["System.Security.Cryptography", "SafeEvpPKeyHandle", "DuplicateHandle", "()", "summary", "df-generated"]
       - ["System.Security.Cryptography", "SafeEvpPKeyHandle", "OpenPrivateKeyFromEngine", "(System.String,System.String)", "summary", "df-generated"]
       - ["System.Security.Cryptography", "SafeEvpPKeyHandle", "OpenPublicKeyFromEngine", "(System.String,System.String)", "summary", "df-generated"]
       - ["System.Security.Cryptography", "SafeEvpPKeyHandle", "ReleaseHandle", "()", "summary", "df-generated"]
diff --git a/csharp/ql/lib/ext/generated/System.Security.Policy.model.yml b/csharp/ql/lib/ext/generated/System.Security.Policy.model.yml
index b3b6319ae53..60f3597071e 100644
--- a/csharp/ql/lib/ext/generated/System.Security.Policy.model.yml
+++ b/csharp/ql/lib/ext/generated/System.Security.Policy.model.yml
@@ -4,8 +4,8 @@ extensions:
       pack: codeql/csharp-all
       extensible: summaryModel
     data:
-      - ["System.Security.Policy", "IMembershipCondition", True, "Copy", "()", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["System.Security.Policy", "PolicyStatement", False, "Copy", "()", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["System.Security.Policy", "IMembershipCondition", True, "Copy", "()", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Security.Policy", "PolicyStatement", False, "Copy", "()", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
   - addsTo:
       pack: codeql/csharp-all
       extensible: neutralModel
diff --git a/csharp/ql/lib/ext/generated/System.Security.Principal.model.yml b/csharp/ql/lib/ext/generated/System.Security.Principal.model.yml
index dccb0e8c1a4..06afc2a07ca 100644
--- a/csharp/ql/lib/ext/generated/System.Security.Principal.model.yml
+++ b/csharp/ql/lib/ext/generated/System.Security.Principal.model.yml
@@ -4,23 +4,29 @@ extensions:
       pack: codeql/csharp-all
       extensible: summaryModel
     data:
-      - ["System.Security.Principal", "GenericIdentity", False, "GenericIdentity", "(System.Security.Principal.GenericIdentity)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Security.Principal", "GenericIdentity", False, "GenericIdentity", "(System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Security.Principal", "GenericIdentity", False, "GenericIdentity", "(System.String,System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Security.Principal", "GenericIdentity", False, "GenericIdentity", "(System.String,System.String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Security.Principal", "GenericPrincipal", False, "GenericPrincipal", "(System.Security.Principal.IIdentity,System.String[])", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Security.Principal", "GenericPrincipal", False, "GenericPrincipal", "(System.Security.Principal.IIdentity,System.String[])", "", "Argument[1].Element", "Argument[this]", "taint", "df-generated"]
-      - ["System.Security.Principal", "IIdentity", True, "get_AuthenticationType", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Security.Principal", "GenericIdentity", False, "GenericIdentity", "(System.Security.Principal.GenericIdentity)", "", "Argument[0].SyntheticField[System.Security.Principal.GenericIdentity.m_name]", "Argument[this].SyntheticField[System.Security.Principal.GenericIdentity.m_name]", "value", "dfc-generated"]
+      - ["System.Security.Principal", "GenericIdentity", False, "GenericIdentity", "(System.Security.Principal.GenericIdentity)", "", "Argument[0].SyntheticField[System.Security.Principal.GenericIdentity.m_type]", "Argument[this].SyntheticField[System.Security.Principal.GenericIdentity.m_type]", "value", "dfc-generated"]
+      - ["System.Security.Principal", "GenericIdentity", False, "GenericIdentity", "(System.String)", "", "Argument[0]", "Argument[this].SyntheticField[System.Security.Principal.GenericIdentity.m_name]", "value", "dfc-generated"]
+      - ["System.Security.Principal", "GenericIdentity", False, "GenericIdentity", "(System.String,System.String)", "", "Argument[0]", "Argument[this].SyntheticField[System.Security.Principal.GenericIdentity.m_name]", "value", "dfc-generated"]
+      - ["System.Security.Principal", "GenericIdentity", False, "GenericIdentity", "(System.String,System.String)", "", "Argument[1]", "Argument[this].SyntheticField[System.Security.Principal.GenericIdentity.m_type]", "value", "dfc-generated"]
+      - ["System.Security.Principal", "GenericIdentity", True, "Clone", "()", "", "Argument[this].SyntheticField[System.Security.Principal.GenericIdentity.m_name]", "ReturnValue.SyntheticField[System.Security.Principal.GenericIdentity.m_name]", "value", "dfc-generated"]
+      - ["System.Security.Principal", "GenericIdentity", True, "Clone", "()", "", "Argument[this].SyntheticField[System.Security.Principal.GenericIdentity.m_type]", "ReturnValue.SyntheticField[System.Security.Principal.GenericIdentity.m_type]", "value", "dfc-generated"]
+      - ["System.Security.Principal", "GenericIdentity", True, "get_AuthenticationType", "()", "", "Argument[this].SyntheticField[System.Security.Principal.GenericIdentity.m_type]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Security.Principal", "GenericIdentity", True, "get_Claims", "()", "", "Argument[this].Property[System.Security.Claims.ClaimsIdentity.Claims]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Security.Principal", "GenericIdentity", True, "get_Name", "()", "", "Argument[this].SyntheticField[System.Security.Principal.GenericIdentity.m_name]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Security.Principal", "GenericPrincipal", False, "GenericPrincipal", "(System.Security.Principal.IIdentity,System.String[])", "", "Argument[0]", "Argument[this].SyntheticField[System.Security.Principal.GenericPrincipal.m_identity]", "value", "dfc-generated"]
+      - ["System.Security.Principal", "GenericPrincipal", True, "get_Identity", "()", "", "Argument[this].SyntheticField[System.Security.Principal.GenericPrincipal.m_identity]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Security.Principal", "IIdentity", True, "get_Name", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Security.Principal", "IPrincipal", True, "get_Identity", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
   - addsTo:
       pack: codeql/csharp-all
       extensible: neutralModel
     data:
       - ["System.Security.Principal", "GenericIdentity", "get_IsAuthenticated", "()", "summary", "df-generated"]
       - ["System.Security.Principal", "GenericPrincipal", "IsInRole", "(System.String)", "summary", "df-generated"]
+      - ["System.Security.Principal", "IIdentity", "get_AuthenticationType", "()", "summary", "df-generated"]
       - ["System.Security.Principal", "IIdentity", "get_IsAuthenticated", "()", "summary", "df-generated"]
       - ["System.Security.Principal", "IPrincipal", "IsInRole", "(System.String)", "summary", "df-generated"]
+      - ["System.Security.Principal", "IPrincipal", "get_Identity", "()", "summary", "df-generated"]
       - ["System.Security.Principal", "IdentityNotMappedException", "IdentityNotMappedException", "(System.String)", "summary", "df-generated"]
       - ["System.Security.Principal", "IdentityNotMappedException", "IdentityNotMappedException", "(System.String,System.Exception)", "summary", "df-generated"]
       - ["System.Security.Principal", "IdentityNotMappedException", "get_UnmappedIdentities", "()", "summary", "df-generated"]
@@ -71,6 +77,7 @@ extensions:
       - ["System.Security.Principal", "SecurityIdentifier", "get_Value", "()", "summary", "df-generated"]
       - ["System.Security.Principal", "SecurityIdentifier", "op_Equality", "(System.Security.Principal.SecurityIdentifier,System.Security.Principal.SecurityIdentifier)", "summary", "df-generated"]
       - ["System.Security.Principal", "SecurityIdentifier", "op_Inequality", "(System.Security.Principal.SecurityIdentifier,System.Security.Principal.SecurityIdentifier)", "summary", "df-generated"]
+      - ["System.Security.Principal", "WindowsIdentity", "Clone", "()", "summary", "df-generated"]
       - ["System.Security.Principal", "WindowsIdentity", "Dispose", "()", "summary", "df-generated"]
       - ["System.Security.Principal", "WindowsIdentity", "Dispose", "(System.Boolean)", "summary", "df-generated"]
       - ["System.Security.Principal", "WindowsIdentity", "GetAnonymous", "()", "summary", "df-generated"]
@@ -78,6 +85,10 @@ extensions:
       - ["System.Security.Principal", "WindowsIdentity", "GetCurrent", "(System.Boolean)", "summary", "df-generated"]
       - ["System.Security.Principal", "WindowsIdentity", "GetCurrent", "(System.Security.Principal.TokenAccessLevels)", "summary", "df-generated"]
       - ["System.Security.Principal", "WindowsIdentity", "OnDeserialization", "(System.Object)", "summary", "df-generated"]
+      - ["System.Security.Principal", "WindowsIdentity", "RunImpersonated", "(Microsoft.Win32.SafeHandles.SafeAccessTokenHandle,System.Action)", "summary", "df-generated"]
+      - ["System.Security.Principal", "WindowsIdentity", "RunImpersonated<T>", "(Microsoft.Win32.SafeHandles.SafeAccessTokenHandle,System.Func<T>)", "summary", "df-generated"]
+      - ["System.Security.Principal", "WindowsIdentity", "RunImpersonatedAsync", "(Microsoft.Win32.SafeHandles.SafeAccessTokenHandle,System.Func<System.Threading.Tasks.Task>)", "summary", "df-generated"]
+      - ["System.Security.Principal", "WindowsIdentity", "RunImpersonatedAsync<T>", "(Microsoft.Win32.SafeHandles.SafeAccessTokenHandle,System.Func<System.Threading.Tasks.Task<T>>)", "summary", "df-generated"]
       - ["System.Security.Principal", "WindowsIdentity", "WindowsIdentity", "(System.IntPtr)", "summary", "df-generated"]
       - ["System.Security.Principal", "WindowsIdentity", "WindowsIdentity", "(System.IntPtr,System.String)", "summary", "df-generated"]
       - ["System.Security.Principal", "WindowsIdentity", "WindowsIdentity", "(System.IntPtr,System.String,System.Security.Principal.WindowsAccountType)", "summary", "df-generated"]
@@ -86,6 +97,7 @@ extensions:
       - ["System.Security.Principal", "WindowsIdentity", "WindowsIdentity", "(System.Security.Principal.WindowsIdentity)", "summary", "df-generated"]
       - ["System.Security.Principal", "WindowsIdentity", "WindowsIdentity", "(System.String)", "summary", "df-generated"]
       - ["System.Security.Principal", "WindowsIdentity", "get_AccessToken", "()", "summary", "df-generated"]
+      - ["System.Security.Principal", "WindowsIdentity", "get_AuthenticationType", "()", "summary", "df-generated"]
       - ["System.Security.Principal", "WindowsIdentity", "get_DeviceClaims", "()", "summary", "df-generated"]
       - ["System.Security.Principal", "WindowsIdentity", "get_Groups", "()", "summary", "df-generated"]
       - ["System.Security.Principal", "WindowsIdentity", "get_ImpersonationLevel", "()", "summary", "df-generated"]
@@ -103,4 +115,5 @@ extensions:
       - ["System.Security.Principal", "WindowsPrincipal", "IsInRole", "(System.String)", "summary", "df-generated"]
       - ["System.Security.Principal", "WindowsPrincipal", "WindowsPrincipal", "(System.Security.Principal.WindowsIdentity)", "summary", "df-generated"]
       - ["System.Security.Principal", "WindowsPrincipal", "get_DeviceClaims", "()", "summary", "df-generated"]
+      - ["System.Security.Principal", "WindowsPrincipal", "get_Identity", "()", "summary", "df-generated"]
       - ["System.Security.Principal", "WindowsPrincipal", "get_UserClaims", "()", "summary", "df-generated"]
diff --git a/csharp/ql/lib/ext/generated/System.Security.model.yml b/csharp/ql/lib/ext/generated/System.Security.model.yml
index 0d525a02f05..2677b7bc793 100644
--- a/csharp/ql/lib/ext/generated/System.Security.model.yml
+++ b/csharp/ql/lib/ext/generated/System.Security.model.yml
@@ -4,23 +4,24 @@ extensions:
       pack: codeql/csharp-all
       extensible: summaryModel
     data:
-      - ["System.Security", "IPermission", True, "Copy", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Security", "IPermission", True, "Copy", "()", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["System.Security", "IPermission", True, "Intersect", "(System.Security.IPermission)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Security", "IPermission", True, "Intersect", "(System.Security.IPermission)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Security", "IPermission", True, "Copy", "()", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Security", "IPermission", True, "Intersect", "(System.Security.IPermission)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Security", "IPermission", True, "Union", "(System.Security.IPermission)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Security", "SecurityElement", False, "AddAttribute", "(System.String,System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Security", "SecurityElement", False, "AddAttribute", "(System.String,System.String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Security", "SecurityElement", False, "AddChild", "(System.Security.SecurityElement)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Security", "SecurityElement", False, "Attribute", "(System.String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Security", "SecurityElement", False, "Copy", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Security", "SecurityElement", False, "Escape", "(System.String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Security", "SecurityElement", False, "SearchForChildByTag", "(System.String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Security", "SecurityElement", False, "SearchForTextOfTag", "(System.String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Security", "SecurityElement", False, "SecurityElement", "(System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Security", "SecurityElement", False, "SecurityElement", "(System.String,System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Security", "SecurityElement", False, "SecurityElement", "(System.String,System.String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Security", "SecurityElement", False, "ToString", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Security", "SecurityElement", False, "AddAttribute", "(System.String,System.String)", "", "Argument[0]", "Argument[this].SyntheticField[System.Security.SecurityElement._attributes].Element", "value", "dfc-generated"]
+      - ["System.Security", "SecurityElement", False, "AddAttribute", "(System.String,System.String)", "", "Argument[1]", "Argument[this].SyntheticField[System.Security.SecurityElement._attributes].Element", "value", "dfc-generated"]
+      - ["System.Security", "SecurityElement", False, "AddChild", "(System.Security.SecurityElement)", "", "Argument[0]", "Argument[this].SyntheticField[System.Security.SecurityElement._children].Element", "value", "dfc-generated"]
+      - ["System.Security", "SecurityElement", False, "Attribute", "(System.String)", "", "Argument[this].SyntheticField[System.Security.SecurityElement._attributes].Element", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Security", "SecurityElement", False, "Copy", "()", "", "Argument[this].SyntheticField[System.Security.SecurityElement._tag]", "ReturnValue.SyntheticField[System.Security.SecurityElement._tag]", "value", "dfc-generated"]
+      - ["System.Security", "SecurityElement", False, "Copy", "()", "", "Argument[this].SyntheticField[System.Security.SecurityElement._text]", "ReturnValue.SyntheticField[System.Security.SecurityElement._text]", "value", "dfc-generated"]
+      - ["System.Security", "SecurityElement", False, "Escape", "(System.String)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Security", "SecurityElement", False, "SearchForChildByTag", "(System.String)", "", "Argument[this].SyntheticField[System.Security.SecurityElement._children].Element", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Security", "SecurityElement", False, "SearchForTextOfTag", "(System.String)", "", "Argument[this].SyntheticField[System.Security.SecurityElement._text]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Security", "SecurityElement", False, "SecurityElement", "(System.String)", "", "Argument[0]", "Argument[this].SyntheticField[System.Security.SecurityElement._tag]", "value", "dfc-generated"]
+      - ["System.Security", "SecurityElement", False, "SecurityElement", "(System.String,System.String)", "", "Argument[0]", "Argument[this].SyntheticField[System.Security.SecurityElement._tag]", "value", "dfc-generated"]
+      - ["System.Security", "SecurityElement", False, "SecurityElement", "(System.String,System.String)", "", "Argument[1]", "Argument[this].SyntheticField[System.Security.SecurityElement._text]", "value", "dfc-generated"]
+      - ["System.Security", "SecurityElement", False, "ToString", "()", "", "Argument[this].SyntheticField[System.Security.SecurityElement._attributes].Element", "ReturnValue", "taint", "dfc-generated"]
+      - ["System.Security", "SecurityElement", False, "ToString", "()", "", "Argument[this].SyntheticField[System.Security.SecurityElement._tag]", "ReturnValue", "taint", "dfc-generated"]
+      - ["System.Security", "SecurityElement", False, "ToString", "()", "", "Argument[this].SyntheticField[System.Security.SecurityElement._text]", "ReturnValue", "taint", "dfc-generated"]
   - addsTo:
       pack: codeql/csharp-all
       extensible: neutralModel
@@ -130,6 +131,7 @@ extensions:
       - ["System.Security", "SecurityContext", "IsFlowSuppressed", "()", "summary", "df-generated"]
       - ["System.Security", "SecurityContext", "IsWindowsIdentityFlowSuppressed", "()", "summary", "df-generated"]
       - ["System.Security", "SecurityContext", "RestoreFlow", "()", "summary", "df-generated"]
+      - ["System.Security", "SecurityContext", "Run", "(System.Security.SecurityContext,System.Threading.ContextCallback,System.Object)", "summary", "df-generated"]
       - ["System.Security", "SecurityContext", "SuppressFlow", "()", "summary", "df-generated"]
       - ["System.Security", "SecurityContext", "SuppressFlowWindowsIdentity", "()", "summary", "df-generated"]
       - ["System.Security", "SecurityCriticalAttribute", "SecurityCriticalAttribute", "(System.Security.SecurityCriticalScope)", "summary", "df-generated"]
diff --git a/csharp/ql/lib/ext/generated/System.ServiceModel.Syndication.model.yml b/csharp/ql/lib/ext/generated/System.ServiceModel.Syndication.model.yml
index d1d34eeb871..ddaeda1ac9a 100644
--- a/csharp/ql/lib/ext/generated/System.ServiceModel.Syndication.model.yml
+++ b/csharp/ql/lib/ext/generated/System.ServiceModel.Syndication.model.yml
@@ -6,129 +6,85 @@ extensions:
     data:
       - ["System.ServiceModel.Syndication", "Atom10FeedFormatter", True, "WriteItem", "(System.Xml.XmlWriter,System.ServiceModel.Syndication.SyndicationItem,System.Uri)", "", "Argument[1]", "Argument[0]", "taint", "df-generated"]
       - ["System.ServiceModel.Syndication", "Atom10FeedFormatter", True, "WriteItems", "(System.Xml.XmlWriter,System.Collections.Generic.IEnumerable<System.ServiceModel.Syndication.SyndicationItem>,System.Uri)", "", "Argument[1].Element", "Argument[0]", "taint", "df-generated"]
-      - ["System.ServiceModel.Syndication", "CategoriesDocument", False, "Create", "(System.Collections.ObjectModel.Collection<System.ServiceModel.Syndication.SyndicationCategory>,System.Boolean,System.String)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
       - ["System.ServiceModel.Syndication", "CategoriesDocument", False, "get_AttributeExtensions", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.ServiceModel.Syndication", "CategoriesDocument", False, "get_ElementExtensions", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.ServiceModel.Syndication", "CategoriesDocument", True, "WriteAttributeExtensions", "(System.Xml.XmlWriter,System.String)", "", "Argument[this]", "Argument[0]", "taint", "df-generated"]
-      - ["System.ServiceModel.Syndication", "CategoriesDocumentFormatter", False, "CategoriesDocumentFormatter", "(System.ServiceModel.Syndication.CategoriesDocument)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.ServiceModel.Syndication", "CategoriesDocumentFormatter", False, "get_Document", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.ServiceModel.Syndication", "CategoriesDocumentFormatter", True, "SetDocument", "(System.ServiceModel.Syndication.CategoriesDocument)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.ServiceModel.Syndication", "CategoriesDocumentFormatter", True, "WriteTo", "(System.Xml.XmlWriter)", "", "Argument[this]", "Argument[0]", "taint", "df-generated"]
+      - ["System.ServiceModel.Syndication", "CategoriesDocumentFormatter", False, "CategoriesDocumentFormatter", "(System.ServiceModel.Syndication.CategoriesDocument)", "", "Argument[0]", "Argument[this].SyntheticField[System.ServiceModel.Syndication.CategoriesDocumentFormatter._document]", "value", "dfc-generated"]
+      - ["System.ServiceModel.Syndication", "CategoriesDocumentFormatter", False, "get_Document", "()", "", "Argument[this].SyntheticField[System.ServiceModel.Syndication.CategoriesDocumentFormatter._document]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.ServiceModel.Syndication", "CategoriesDocumentFormatter", True, "SetDocument", "(System.ServiceModel.Syndication.CategoriesDocument)", "", "Argument[0]", "Argument[this].SyntheticField[System.ServiceModel.Syndication.CategoriesDocumentFormatter._document]", "value", "dfc-generated"]
       - ["System.ServiceModel.Syndication", "InlineCategoriesDocument", False, "InlineCategoriesDocument", "(System.Collections.Generic.IEnumerable<System.ServiceModel.Syndication.SyndicationCategory>,System.Boolean,System.String)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
       - ["System.ServiceModel.Syndication", "ResourceCollectionInfo", False, "ResourceCollectionInfo", "(System.ServiceModel.Syndication.TextSyndicationContent,System.Uri,System.Collections.Generic.IEnumerable<System.ServiceModel.Syndication.CategoriesDocument>,System.Collections.Generic.IEnumerable<System.String>)", "", "Argument[2].Element", "Argument[this]", "taint", "df-generated"]
       - ["System.ServiceModel.Syndication", "ResourceCollectionInfo", False, "ResourceCollectionInfo", "(System.ServiceModel.Syndication.TextSyndicationContent,System.Uri,System.Collections.Generic.IEnumerable<System.ServiceModel.Syndication.CategoriesDocument>,System.Collections.Generic.IEnumerable<System.String>)", "", "Argument[3].Element", "Argument[this]", "taint", "df-generated"]
       - ["System.ServiceModel.Syndication", "ResourceCollectionInfo", False, "get_AttributeExtensions", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.ServiceModel.Syndication", "ResourceCollectionInfo", False, "get_ElementExtensions", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.ServiceModel.Syndication", "ResourceCollectionInfo", True, "WriteAttributeExtensions", "(System.Xml.XmlWriter,System.String)", "", "Argument[this]", "Argument[0]", "taint", "df-generated"]
+      - ["System.ServiceModel.Syndication", "Rss20FeedFormatter", True, "SetFeed", "(System.ServiceModel.Syndication.SyndicationFeed)", "", "Argument[0]", "Argument[this].SyntheticField[System.ServiceModel.Syndication.SyndicationFeedFormatter._feed]", "value", "dfc-generated"]
       - ["System.ServiceModel.Syndication", "Rss20FeedFormatter", True, "WriteItem", "(System.Xml.XmlWriter,System.ServiceModel.Syndication.SyndicationItem,System.Uri)", "", "Argument[1]", "Argument[0]", "taint", "df-generated"]
       - ["System.ServiceModel.Syndication", "Rss20FeedFormatter", True, "WriteItems", "(System.Xml.XmlWriter,System.Collections.Generic.IEnumerable<System.ServiceModel.Syndication.SyndicationItem>,System.Uri)", "", "Argument[1].Element", "Argument[0]", "taint", "df-generated"]
       - ["System.ServiceModel.Syndication", "ServiceDocument", False, "ServiceDocument", "(System.Collections.Generic.IEnumerable<System.ServiceModel.Syndication.Workspace>)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
       - ["System.ServiceModel.Syndication", "ServiceDocument", False, "get_AttributeExtensions", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.ServiceModel.Syndication", "ServiceDocument", False, "get_ElementExtensions", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.ServiceModel.Syndication", "ServiceDocument", True, "WriteAttributeExtensions", "(System.Xml.XmlWriter,System.String)", "", "Argument[this]", "Argument[0]", "taint", "df-generated"]
-      - ["System.ServiceModel.Syndication", "ServiceDocumentFormatter", False, "ServiceDocumentFormatter", "(System.ServiceModel.Syndication.ServiceDocument)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.ServiceModel.Syndication", "ServiceDocumentFormatter", False, "WriteAttributeExtensions", "(System.Xml.XmlWriter,System.ServiceModel.Syndication.CategoriesDocument,System.String)", "", "Argument[1]", "Argument[0]", "taint", "df-generated"]
-      - ["System.ServiceModel.Syndication", "ServiceDocumentFormatter", False, "WriteAttributeExtensions", "(System.Xml.XmlWriter,System.ServiceModel.Syndication.ResourceCollectionInfo,System.String)", "", "Argument[1]", "Argument[0]", "taint", "df-generated"]
-      - ["System.ServiceModel.Syndication", "ServiceDocumentFormatter", False, "WriteAttributeExtensions", "(System.Xml.XmlWriter,System.ServiceModel.Syndication.ServiceDocument,System.String)", "", "Argument[1]", "Argument[0]", "taint", "df-generated"]
-      - ["System.ServiceModel.Syndication", "ServiceDocumentFormatter", False, "WriteAttributeExtensions", "(System.Xml.XmlWriter,System.ServiceModel.Syndication.Workspace,System.String)", "", "Argument[1]", "Argument[0]", "taint", "df-generated"]
-      - ["System.ServiceModel.Syndication", "ServiceDocumentFormatter", False, "get_Document", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.ServiceModel.Syndication", "ServiceDocumentFormatter", True, "SetDocument", "(System.ServiceModel.Syndication.ServiceDocument)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.ServiceModel.Syndication", "ServiceDocumentFormatter", True, "WriteTo", "(System.Xml.XmlWriter)", "", "Argument[this]", "Argument[0]", "taint", "df-generated"]
+      - ["System.ServiceModel.Syndication", "ServiceDocumentFormatter", False, "ServiceDocumentFormatter", "(System.ServiceModel.Syndication.ServiceDocument)", "", "Argument[0]", "Argument[this].SyntheticField[System.ServiceModel.Syndication.ServiceDocumentFormatter._document]", "value", "dfc-generated"]
+      - ["System.ServiceModel.Syndication", "ServiceDocumentFormatter", False, "get_Document", "()", "", "Argument[this].SyntheticField[System.ServiceModel.Syndication.ServiceDocumentFormatter._document]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.ServiceModel.Syndication", "ServiceDocumentFormatter", True, "SetDocument", "(System.ServiceModel.Syndication.ServiceDocument)", "", "Argument[0]", "Argument[this].SyntheticField[System.ServiceModel.Syndication.ServiceDocumentFormatter._document]", "value", "dfc-generated"]
       - ["System.ServiceModel.Syndication", "SyndicationCategory", False, "get_AttributeExtensions", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.ServiceModel.Syndication", "SyndicationCategory", False, "get_ElementExtensions", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.ServiceModel.Syndication", "SyndicationCategory", True, "WriteAttributeExtensions", "(System.Xml.XmlWriter,System.String)", "", "Argument[this]", "Argument[0]", "taint", "df-generated"]
-      - ["System.ServiceModel.Syndication", "SyndicationContent", False, "CreateUrlContent", "(System.Uri,System.String)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["System.ServiceModel.Syndication", "SyndicationContent", False, "CreateXmlContent", "(System.Xml.XmlReader)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.ServiceModel.Syndication", "SyndicationContent", False, "WriteTo", "(System.Xml.XmlWriter,System.String,System.String)", "", "Argument[1]", "Argument[0]", "taint", "df-generated"]
+      - ["System.ServiceModel.Syndication", "SyndicationContent", False, "CreateUrlContent", "(System.Uri,System.String)", "", "Argument[1]", "ReturnValue.SyntheticField[System.ServiceModel.Syndication.UrlSyndicationContent._mediaType]", "value", "dfc-generated"]
       - ["System.ServiceModel.Syndication", "SyndicationContent", False, "WriteTo", "(System.Xml.XmlWriter,System.String,System.String)", "", "Argument[this]", "Argument[0]", "taint", "df-generated"]
-      - ["System.ServiceModel.Syndication", "SyndicationContent", True, "Clone", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.ServiceModel.Syndication", "SyndicationContent", True, "WriteContentsTo", "(System.Xml.XmlWriter)", "", "Argument[this]", "Argument[0]", "taint", "df-generated"]
-      - ["System.ServiceModel.Syndication", "SyndicationContent", True, "get_Type", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.ServiceModel.Syndication", "SyndicationElementExtension", False, "GetObject<TExtension>", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.ServiceModel.Syndication", "SyndicationElementExtension", False, "GetObject<TExtension>", "(System.Runtime.Serialization.XmlObjectSerializer)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.ServiceModel.Syndication", "SyndicationElementExtension", False, "GetObject<TExtension>", "(System.Xml.Serialization.XmlSerializer)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.ServiceModel.Syndication", "SyndicationElementExtension", False, "GetReader", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.ServiceModel.Syndication", "SyndicationElementExtension", False, "SyndicationElementExtension", "(System.Object,System.Xml.Serialization.XmlSerializer)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.ServiceModel.Syndication", "SyndicationElementExtension", False, "SyndicationElementExtension", "(System.Object,System.Xml.Serialization.XmlSerializer)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["System.ServiceModel.Syndication", "SyndicationElementExtension", False, "SyndicationElementExtension", "(System.String,System.String,System.Object,System.Runtime.Serialization.XmlObjectSerializer)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.ServiceModel.Syndication", "SyndicationElementExtension", False, "SyndicationElementExtension", "(System.String,System.String,System.Object,System.Runtime.Serialization.XmlObjectSerializer)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["System.ServiceModel.Syndication", "SyndicationElementExtension", False, "SyndicationElementExtension", "(System.String,System.String,System.Object,System.Runtime.Serialization.XmlObjectSerializer)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
-      - ["System.ServiceModel.Syndication", "SyndicationElementExtension", False, "SyndicationElementExtension", "(System.String,System.String,System.Object,System.Runtime.Serialization.XmlObjectSerializer)", "", "Argument[3]", "Argument[this]", "taint", "df-generated"]
-      - ["System.ServiceModel.Syndication", "SyndicationElementExtension", False, "SyndicationElementExtension", "(System.Xml.XmlReader)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.ServiceModel.Syndication", "SyndicationElementExtension", False, "WriteTo", "(System.Xml.XmlWriter)", "", "Argument[this]", "Argument[0]", "taint", "df-generated"]
-      - ["System.ServiceModel.Syndication", "SyndicationElementExtension", False, "get_OuterName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.ServiceModel.Syndication", "SyndicationElementExtension", False, "get_OuterNamespace", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.ServiceModel.Syndication", "SyndicationElementExtensionCollection", False, "Add", "(System.Object)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.ServiceModel.Syndication", "SyndicationElementExtensionCollection", False, "Add", "(System.Object,System.Runtime.Serialization.DataContractSerializer)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.ServiceModel.Syndication", "SyndicationElementExtensionCollection", False, "Add", "(System.Object,System.Xml.Serialization.XmlSerializer)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.ServiceModel.Syndication", "SyndicationElementExtensionCollection", False, "Add", "(System.String,System.String,System.Object)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.ServiceModel.Syndication", "SyndicationElementExtensionCollection", False, "Add", "(System.String,System.String,System.Object)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["System.ServiceModel.Syndication", "SyndicationElementExtensionCollection", False, "Add", "(System.String,System.String,System.Object)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
-      - ["System.ServiceModel.Syndication", "SyndicationElementExtensionCollection", False, "Add", "(System.String,System.String,System.Object,System.Runtime.Serialization.XmlObjectSerializer)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.ServiceModel.Syndication", "SyndicationElementExtensionCollection", False, "Add", "(System.String,System.String,System.Object,System.Runtime.Serialization.XmlObjectSerializer)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["System.ServiceModel.Syndication", "SyndicationElementExtensionCollection", False, "Add", "(System.String,System.String,System.Object,System.Runtime.Serialization.XmlObjectSerializer)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
-      - ["System.ServiceModel.Syndication", "SyndicationElementExtensionCollection", False, "Add", "(System.Xml.XmlReader)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.ServiceModel.Syndication", "SyndicationElementExtensionCollection", False, "GetReaderAtElementExtensions", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.ServiceModel.Syndication", "SyndicationElementExtensionCollection", False, "InsertItem", "(System.Int32,System.ServiceModel.Syndication.SyndicationElementExtension)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["System.ServiceModel.Syndication", "SyndicationElementExtension", False, "GetObject<TExtension>", "()", "", "Argument[this].SyntheticField[System.ServiceModel.Syndication.SyndicationElementExtension._extensionData]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.ServiceModel.Syndication", "SyndicationElementExtension", False, "GetObject<TExtension>", "(System.Runtime.Serialization.XmlObjectSerializer)", "", "Argument[this].SyntheticField[System.ServiceModel.Syndication.SyndicationElementExtension._extensionData]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.ServiceModel.Syndication", "SyndicationElementExtension", False, "GetObject<TExtension>", "(System.Xml.Serialization.XmlSerializer)", "", "Argument[this].SyntheticField[System.ServiceModel.Syndication.SyndicationElementExtension._extensionData]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.ServiceModel.Syndication", "SyndicationElementExtension", False, "SyndicationElementExtension", "(System.Object,System.Xml.Serialization.XmlSerializer)", "", "Argument[0]", "Argument[this].SyntheticField[System.ServiceModel.Syndication.SyndicationElementExtension._extensionData]", "value", "dfc-generated"]
+      - ["System.ServiceModel.Syndication", "SyndicationElementExtension", False, "SyndicationElementExtension", "(System.String,System.String,System.Object,System.Runtime.Serialization.XmlObjectSerializer)", "", "Argument[0]", "Argument[this].SyntheticField[System.ServiceModel.Syndication.SyndicationElementExtension._outerName]", "value", "dfc-generated"]
+      - ["System.ServiceModel.Syndication", "SyndicationElementExtension", False, "SyndicationElementExtension", "(System.String,System.String,System.Object,System.Runtime.Serialization.XmlObjectSerializer)", "", "Argument[1]", "Argument[this].SyntheticField[System.ServiceModel.Syndication.SyndicationElementExtension._outerNamespace]", "value", "dfc-generated"]
+      - ["System.ServiceModel.Syndication", "SyndicationElementExtension", False, "SyndicationElementExtension", "(System.String,System.String,System.Object,System.Runtime.Serialization.XmlObjectSerializer)", "", "Argument[2]", "Argument[this].SyntheticField[System.ServiceModel.Syndication.SyndicationElementExtension._extensionData]", "value", "dfc-generated"]
+      - ["System.ServiceModel.Syndication", "SyndicationElementExtension", False, "SyndicationElementExtension", "(System.Xml.XmlReader)", "", "Argument[0].Property[System.Xml.XmlReader.LocalName]", "Argument[this].SyntheticField[System.ServiceModel.Syndication.SyndicationElementExtension._outerName]", "value", "dfc-generated"]
+      - ["System.ServiceModel.Syndication", "SyndicationElementExtension", False, "SyndicationElementExtension", "(System.Xml.XmlReader)", "", "Argument[0].Property[System.Xml.XmlReader.NamespaceURI]", "Argument[this].SyntheticField[System.ServiceModel.Syndication.SyndicationElementExtension._outerNamespace]", "value", "dfc-generated"]
+      - ["System.ServiceModel.Syndication", "SyndicationElementExtension", False, "get_OuterName", "()", "", "Argument[this].SyntheticField[System.ServiceModel.Syndication.SyndicationElementExtension._outerName]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.ServiceModel.Syndication", "SyndicationElementExtension", False, "get_OuterNamespace", "()", "", "Argument[this].SyntheticField[System.ServiceModel.Syndication.SyndicationElementExtension._outerNamespace]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.ServiceModel.Syndication", "SyndicationElementExtensionCollection", False, "Add", "(System.Object)", "", "Argument[0]", "Argument[this].Element", "value", "dfc-generated"]
       - ["System.ServiceModel.Syndication", "SyndicationElementExtensionCollection", False, "ReadElementExtensions<TExtension>", "(System.String,System.String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.ServiceModel.Syndication", "SyndicationElementExtensionCollection", False, "ReadElementExtensions<TExtension>", "(System.String,System.String,System.Runtime.Serialization.XmlObjectSerializer)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.ServiceModel.Syndication", "SyndicationElementExtensionCollection", False, "ReadElementExtensions<TExtension>", "(System.String,System.String,System.Xml.Serialization.XmlSerializer)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.ServiceModel.Syndication", "SyndicationElementExtensionCollection", False, "SetItem", "(System.Int32,System.ServiceModel.Syndication.SyndicationElementExtension)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
       - ["System.ServiceModel.Syndication", "SyndicationFeed", False, "SyndicationFeed", "(System.ServiceModel.Syndication.SyndicationFeed,System.Boolean)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.ServiceModel.Syndication", "SyndicationFeed", False, "SyndicationFeed", "(System.String,System.String,System.Uri,System.String,System.DateTimeOffset,System.Collections.Generic.IEnumerable<System.ServiceModel.Syndication.SyndicationItem>)", "", "Argument[4]", "Argument[this]", "taint", "df-generated"]
       - ["System.ServiceModel.Syndication", "SyndicationFeed", False, "SyndicationFeed", "(System.String,System.String,System.Uri,System.String,System.DateTimeOffset,System.Collections.Generic.IEnumerable<System.ServiceModel.Syndication.SyndicationItem>)", "", "Argument[5].Element", "Argument[this]", "taint", "df-generated"]
       - ["System.ServiceModel.Syndication", "SyndicationFeed", False, "get_AttributeExtensions", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.ServiceModel.Syndication", "SyndicationFeed", False, "get_ElementExtensions", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.ServiceModel.Syndication", "SyndicationFeed", False, "get_SkipDays", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.ServiceModel.Syndication", "SyndicationFeed", True, "Clone", "(System.Boolean)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.ServiceModel.Syndication", "SyndicationFeed", True, "WriteAttributeExtensions", "(System.Xml.XmlWriter,System.String)", "", "Argument[this]", "Argument[0]", "taint", "df-generated"]
-      - ["System.ServiceModel.Syndication", "SyndicationFeedFormatter", False, "SyndicationFeedFormatter", "(System.ServiceModel.Syndication.SyndicationFeed)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.ServiceModel.Syndication", "SyndicationFeedFormatter", False, "ToString", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.ServiceModel.Syndication", "SyndicationFeedFormatter", False, "WriteAttributeExtensions", "(System.Xml.XmlWriter,System.ServiceModel.Syndication.SyndicationCategory,System.String)", "", "Argument[1]", "Argument[0]", "taint", "df-generated"]
-      - ["System.ServiceModel.Syndication", "SyndicationFeedFormatter", False, "WriteAttributeExtensions", "(System.Xml.XmlWriter,System.ServiceModel.Syndication.SyndicationFeed,System.String)", "", "Argument[1]", "Argument[0]", "taint", "df-generated"]
-      - ["System.ServiceModel.Syndication", "SyndicationFeedFormatter", False, "WriteAttributeExtensions", "(System.Xml.XmlWriter,System.ServiceModel.Syndication.SyndicationItem,System.String)", "", "Argument[1]", "Argument[0]", "taint", "df-generated"]
-      - ["System.ServiceModel.Syndication", "SyndicationFeedFormatter", False, "WriteAttributeExtensions", "(System.Xml.XmlWriter,System.ServiceModel.Syndication.SyndicationLink,System.String)", "", "Argument[1]", "Argument[0]", "taint", "df-generated"]
-      - ["System.ServiceModel.Syndication", "SyndicationFeedFormatter", False, "WriteAttributeExtensions", "(System.Xml.XmlWriter,System.ServiceModel.Syndication.SyndicationPerson,System.String)", "", "Argument[1]", "Argument[0]", "taint", "df-generated"]
-      - ["System.ServiceModel.Syndication", "SyndicationFeedFormatter", False, "get_Feed", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.ServiceModel.Syndication", "SyndicationFeedFormatter", True, "SetFeed", "(System.ServiceModel.Syndication.SyndicationFeed)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.ServiceModel.Syndication", "SyndicationFeedFormatter", True, "WriteTo", "(System.Xml.XmlWriter)", "", "Argument[this]", "Argument[0]", "taint", "df-generated"]
+      - ["System.ServiceModel.Syndication", "SyndicationFeedFormatter", False, "SyndicationFeedFormatter", "(System.ServiceModel.Syndication.SyndicationFeed)", "", "Argument[0]", "Argument[this].SyntheticField[System.ServiceModel.Syndication.SyndicationFeedFormatter._feed]", "value", "dfc-generated"]
+      - ["System.ServiceModel.Syndication", "SyndicationFeedFormatter", False, "ToString", "()", "", "Argument[this].Property[System.ServiceModel.Syndication.SyndicationFeedFormatter.Version]", "ReturnValue", "taint", "dfc-generated"]
+      - ["System.ServiceModel.Syndication", "SyndicationFeedFormatter", False, "get_Feed", "()", "", "Argument[this].SyntheticField[System.ServiceModel.Syndication.SyndicationFeedFormatter._feed]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.ServiceModel.Syndication", "SyndicationFeedFormatter", True, "SetFeed", "(System.ServiceModel.Syndication.SyndicationFeed)", "", "Argument[0]", "Argument[this].SyntheticField[System.ServiceModel.Syndication.SyndicationFeedFormatter._feed]", "value", "dfc-generated"]
       - ["System.ServiceModel.Syndication", "SyndicationItem", False, "SyndicationItem", "(System.ServiceModel.Syndication.SyndicationItem)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.ServiceModel.Syndication", "SyndicationItem", False, "SyndicationItem", "(System.String,System.ServiceModel.Syndication.SyndicationContent,System.Uri,System.String,System.DateTimeOffset)", "", "Argument[4]", "Argument[this]", "taint", "df-generated"]
       - ["System.ServiceModel.Syndication", "SyndicationItem", False, "get_AttributeExtensions", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.ServiceModel.Syndication", "SyndicationItem", False, "get_ElementExtensions", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.ServiceModel.Syndication", "SyndicationItem", True, "Clone", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.ServiceModel.Syndication", "SyndicationItem", True, "WriteAttributeExtensions", "(System.Xml.XmlWriter,System.String)", "", "Argument[this]", "Argument[0]", "taint", "df-generated"]
-      - ["System.ServiceModel.Syndication", "SyndicationItemFormatter", False, "SyndicationItemFormatter", "(System.ServiceModel.Syndication.SyndicationItem)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.ServiceModel.Syndication", "SyndicationItemFormatter", False, "ToString", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.ServiceModel.Syndication", "SyndicationItemFormatter", False, "WriteAttributeExtensions", "(System.Xml.XmlWriter,System.ServiceModel.Syndication.SyndicationCategory,System.String)", "", "Argument[1]", "Argument[0]", "taint", "df-generated"]
-      - ["System.ServiceModel.Syndication", "SyndicationItemFormatter", False, "WriteAttributeExtensions", "(System.Xml.XmlWriter,System.ServiceModel.Syndication.SyndicationItem,System.String)", "", "Argument[1]", "Argument[0]", "taint", "df-generated"]
-      - ["System.ServiceModel.Syndication", "SyndicationItemFormatter", False, "WriteAttributeExtensions", "(System.Xml.XmlWriter,System.ServiceModel.Syndication.SyndicationLink,System.String)", "", "Argument[1]", "Argument[0]", "taint", "df-generated"]
-      - ["System.ServiceModel.Syndication", "SyndicationItemFormatter", False, "WriteAttributeExtensions", "(System.Xml.XmlWriter,System.ServiceModel.Syndication.SyndicationPerson,System.String)", "", "Argument[1]", "Argument[0]", "taint", "df-generated"]
-      - ["System.ServiceModel.Syndication", "SyndicationItemFormatter", False, "get_Item", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.ServiceModel.Syndication", "SyndicationItemFormatter", True, "SetItem", "(System.ServiceModel.Syndication.SyndicationItem)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.ServiceModel.Syndication", "SyndicationItemFormatter", True, "WriteTo", "(System.Xml.XmlWriter)", "", "Argument[this]", "Argument[0]", "taint", "df-generated"]
-      - ["System.ServiceModel.Syndication", "SyndicationLink", False, "GetAbsoluteUri", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.ServiceModel.Syndication", "SyndicationItemFormatter", False, "SyndicationItemFormatter", "(System.ServiceModel.Syndication.SyndicationItem)", "", "Argument[0]", "Argument[this].SyntheticField[System.ServiceModel.Syndication.SyndicationItemFormatter._item]", "value", "dfc-generated"]
+      - ["System.ServiceModel.Syndication", "SyndicationItemFormatter", False, "ToString", "()", "", "Argument[this].Property[System.ServiceModel.Syndication.SyndicationItemFormatter.Version]", "ReturnValue", "taint", "dfc-generated"]
+      - ["System.ServiceModel.Syndication", "SyndicationItemFormatter", False, "get_Item", "()", "", "Argument[this].SyntheticField[System.ServiceModel.Syndication.SyndicationItemFormatter._item]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.ServiceModel.Syndication", "SyndicationItemFormatter", True, "SetItem", "(System.ServiceModel.Syndication.SyndicationItem)", "", "Argument[0]", "Argument[this].SyntheticField[System.ServiceModel.Syndication.SyndicationItemFormatter._item]", "value", "dfc-generated"]
+      - ["System.ServiceModel.Syndication", "SyndicationLink", False, "GetAbsoluteUri", "()", "", "Argument[this].Property[System.ServiceModel.Syndication.SyndicationLink.Uri]", "ReturnValue", "value", "dfc-generated"]
       - ["System.ServiceModel.Syndication", "SyndicationLink", False, "get_AttributeExtensions", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.ServiceModel.Syndication", "SyndicationLink", False, "get_ElementExtensions", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.ServiceModel.Syndication", "SyndicationLink", True, "WriteAttributeExtensions", "(System.Xml.XmlWriter,System.String)", "", "Argument[this]", "Argument[0]", "taint", "df-generated"]
       - ["System.ServiceModel.Syndication", "SyndicationPerson", False, "get_AttributeExtensions", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.ServiceModel.Syndication", "SyndicationPerson", False, "get_ElementExtensions", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.ServiceModel.Syndication", "SyndicationPerson", True, "WriteAttributeExtensions", "(System.Xml.XmlWriter,System.String)", "", "Argument[this]", "Argument[0]", "taint", "df-generated"]
-      - ["System.ServiceModel.Syndication", "UrlSyndicationContent", False, "UrlSyndicationContent", "(System.ServiceModel.Syndication.UrlSyndicationContent)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.ServiceModel.Syndication", "UrlSyndicationContent", False, "UrlSyndicationContent", "(System.Uri,System.String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["System.ServiceModel.Syndication", "UrlSyndicationContent", False, "UrlSyndicationContent", "(System.ServiceModel.Syndication.UrlSyndicationContent)", "", "Argument[0].SyntheticField[System.ServiceModel.Syndication.UrlSyndicationContent._mediaType]", "Argument[this].SyntheticField[System.ServiceModel.Syndication.UrlSyndicationContent._mediaType]", "value", "dfc-generated"]
+      - ["System.ServiceModel.Syndication", "UrlSyndicationContent", False, "UrlSyndicationContent", "(System.Uri,System.String)", "", "Argument[1]", "Argument[this].SyntheticField[System.ServiceModel.Syndication.UrlSyndicationContent._mediaType]", "value", "dfc-generated"]
+      - ["System.ServiceModel.Syndication", "UrlSyndicationContent", True, "Clone", "()", "", "Argument[this].SyntheticField[System.ServiceModel.Syndication.UrlSyndicationContent._mediaType]", "ReturnValue.SyntheticField[System.ServiceModel.Syndication.UrlSyndicationContent._mediaType]", "value", "dfc-generated"]
+      - ["System.ServiceModel.Syndication", "UrlSyndicationContent", True, "get_Type", "()", "", "Argument[this].SyntheticField[System.ServiceModel.Syndication.UrlSyndicationContent._mediaType]", "ReturnValue", "value", "dfc-generated"]
       - ["System.ServiceModel.Syndication", "Workspace", False, "Workspace", "(System.ServiceModel.Syndication.TextSyndicationContent,System.Collections.Generic.IEnumerable<System.ServiceModel.Syndication.ResourceCollectionInfo>)", "", "Argument[1].Element", "Argument[this]", "taint", "df-generated"]
       - ["System.ServiceModel.Syndication", "Workspace", False, "get_AttributeExtensions", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.ServiceModel.Syndication", "Workspace", False, "get_ElementExtensions", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.ServiceModel.Syndication", "Workspace", True, "WriteAttributeExtensions", "(System.Xml.XmlWriter,System.String)", "", "Argument[this]", "Argument[0]", "taint", "df-generated"]
-      - ["System.ServiceModel.Syndication", "XmlSyndicationContent", False, "GetReaderAtContent", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.ServiceModel.Syndication", "XmlSyndicationContent", False, "ReadContent<TContent>", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.ServiceModel.Syndication", "XmlSyndicationContent", False, "ReadContent<TContent>", "(System.Runtime.Serialization.XmlObjectSerializer)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.ServiceModel.Syndication", "XmlSyndicationContent", False, "ReadContent<TContent>", "(System.Xml.Serialization.XmlSerializer)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.ServiceModel.Syndication", "XmlSyndicationContent", False, "XmlSyndicationContent", "(System.ServiceModel.Syndication.XmlSyndicationContent)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.ServiceModel.Syndication", "XmlSyndicationContent", False, "XmlSyndicationContent", "(System.String,System.Object,System.Runtime.Serialization.XmlObjectSerializer)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.ServiceModel.Syndication", "XmlSyndicationContent", False, "XmlSyndicationContent", "(System.String,System.Object,System.Xml.Serialization.XmlSerializer)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.ServiceModel.Syndication", "XmlSyndicationContent", False, "XmlSyndicationContent", "(System.String,System.ServiceModel.Syndication.SyndicationElementExtension)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.ServiceModel.Syndication", "XmlSyndicationContent", False, "XmlSyndicationContent", "(System.Xml.XmlReader)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["System.ServiceModel.Syndication", "XmlSyndicationContent", False, "XmlSyndicationContent", "(System.ServiceModel.Syndication.XmlSyndicationContent)", "", "Argument[0].SyntheticField[System.ServiceModel.Syndication.XmlSyndicationContent._type]", "Argument[this].SyntheticField[System.ServiceModel.Syndication.XmlSyndicationContent._type]", "value", "dfc-generated"]
+      - ["System.ServiceModel.Syndication", "XmlSyndicationContent", False, "XmlSyndicationContent", "(System.String,System.Object,System.Runtime.Serialization.XmlObjectSerializer)", "", "Argument[0]", "Argument[this].SyntheticField[System.ServiceModel.Syndication.XmlSyndicationContent._type]", "value", "dfc-generated"]
+      - ["System.ServiceModel.Syndication", "XmlSyndicationContent", False, "XmlSyndicationContent", "(System.String,System.Object,System.Xml.Serialization.XmlSerializer)", "", "Argument[0]", "Argument[this].SyntheticField[System.ServiceModel.Syndication.XmlSyndicationContent._type]", "value", "dfc-generated"]
+      - ["System.ServiceModel.Syndication", "XmlSyndicationContent", False, "XmlSyndicationContent", "(System.String,System.ServiceModel.Syndication.SyndicationElementExtension)", "", "Argument[0]", "Argument[this].SyntheticField[System.ServiceModel.Syndication.XmlSyndicationContent._type]", "value", "dfc-generated"]
+      - ["System.ServiceModel.Syndication", "XmlSyndicationContent", False, "XmlSyndicationContent", "(System.Xml.XmlReader)", "", "Argument[0].Property[System.Xml.XmlReader.Value]", "Argument[this].SyntheticField[System.ServiceModel.Syndication.XmlSyndicationContent._type]", "value", "dfc-generated"]
+      - ["System.ServiceModel.Syndication", "XmlSyndicationContent", True, "Clone", "()", "", "Argument[this].SyntheticField[System.ServiceModel.Syndication.XmlSyndicationContent._type]", "ReturnValue.SyntheticField[System.ServiceModel.Syndication.XmlSyndicationContent._type]", "value", "dfc-generated"]
+      - ["System.ServiceModel.Syndication", "XmlSyndicationContent", True, "get_Type", "()", "", "Argument[this].SyntheticField[System.ServiceModel.Syndication.XmlSyndicationContent._type]", "ReturnValue", "value", "dfc-generated"]
   - addsTo:
       pack: codeql/csharp-all
       extensible: neutralModel
@@ -141,6 +97,7 @@ extensions:
       - ["System.ServiceModel.Syndication", "Atom10FeedFormatter", "ReadFrom", "(System.Xml.XmlReader)", "summary", "df-generated"]
       - ["System.ServiceModel.Syndication", "Atom10FeedFormatter", "ReadItem", "(System.Xml.XmlReader,System.ServiceModel.Syndication.SyndicationFeed)", "summary", "df-generated"]
       - ["System.ServiceModel.Syndication", "Atom10FeedFormatter", "ReadItems", "(System.Xml.XmlReader,System.ServiceModel.Syndication.SyndicationFeed,System.Boolean)", "summary", "df-generated"]
+      - ["System.ServiceModel.Syndication", "Atom10FeedFormatter", "WriteTo", "(System.Xml.XmlWriter)", "summary", "df-generated"]
       - ["System.ServiceModel.Syndication", "Atom10FeedFormatter", "get_FeedType", "()", "summary", "df-generated"]
       - ["System.ServiceModel.Syndication", "Atom10FeedFormatter", "get_Version", "()", "summary", "df-generated"]
       - ["System.ServiceModel.Syndication", "Atom10FeedFormatter<T,TSyndicationFeed>", "Atom10FeedFormatter", "(T,TSyndicationFeed)", "summary", "df-generated"]
@@ -151,6 +108,7 @@ extensions:
       - ["System.ServiceModel.Syndication", "Atom10ItemFormatter", "CreateItemInstance", "()", "summary", "df-generated"]
       - ["System.ServiceModel.Syndication", "Atom10ItemFormatter", "GetSchema", "()", "summary", "df-generated"]
       - ["System.ServiceModel.Syndication", "Atom10ItemFormatter", "ReadFrom", "(System.Xml.XmlReader)", "summary", "df-generated"]
+      - ["System.ServiceModel.Syndication", "Atom10ItemFormatter", "WriteTo", "(System.Xml.XmlWriter)", "summary", "df-generated"]
       - ["System.ServiceModel.Syndication", "Atom10ItemFormatter", "get_ItemType", "()", "summary", "df-generated"]
       - ["System.ServiceModel.Syndication", "Atom10ItemFormatter", "get_Version", "()", "summary", "df-generated"]
       - ["System.ServiceModel.Syndication", "Atom10ItemFormatter<T,TSyndicationItem>", "Atom10ItemFormatter", "(T,TSyndicationItem)", "summary", "df-generated"]
@@ -162,6 +120,7 @@ extensions:
       - ["System.ServiceModel.Syndication", "AtomPub10CategoriesDocumentFormatter", "CreateReferencedCategoriesDocument", "()", "summary", "df-generated"]
       - ["System.ServiceModel.Syndication", "AtomPub10CategoriesDocumentFormatter", "GetSchema", "()", "summary", "df-generated"]
       - ["System.ServiceModel.Syndication", "AtomPub10CategoriesDocumentFormatter", "ReadFrom", "(System.Xml.XmlReader)", "summary", "df-generated"]
+      - ["System.ServiceModel.Syndication", "AtomPub10CategoriesDocumentFormatter", "WriteTo", "(System.Xml.XmlWriter)", "summary", "df-generated"]
       - ["System.ServiceModel.Syndication", "AtomPub10CategoriesDocumentFormatter", "get_Version", "()", "summary", "df-generated"]
       - ["System.ServiceModel.Syndication", "AtomPub10ServiceDocumentFormatter", "AtomPub10ServiceDocumentFormatter", "(System.ServiceModel.Syndication.ServiceDocument)", "summary", "df-generated"]
       - ["System.ServiceModel.Syndication", "AtomPub10ServiceDocumentFormatter", "AtomPub10ServiceDocumentFormatter", "(System.Type)", "summary", "df-generated"]
@@ -169,21 +128,25 @@ extensions:
       - ["System.ServiceModel.Syndication", "AtomPub10ServiceDocumentFormatter", "CreateDocumentInstance", "()", "summary", "df-generated"]
       - ["System.ServiceModel.Syndication", "AtomPub10ServiceDocumentFormatter", "GetSchema", "()", "summary", "df-generated"]
       - ["System.ServiceModel.Syndication", "AtomPub10ServiceDocumentFormatter", "ReadFrom", "(System.Xml.XmlReader)", "summary", "df-generated"]
+      - ["System.ServiceModel.Syndication", "AtomPub10ServiceDocumentFormatter", "WriteTo", "(System.Xml.XmlWriter)", "summary", "df-generated"]
       - ["System.ServiceModel.Syndication", "AtomPub10ServiceDocumentFormatter", "get_Version", "()", "summary", "df-generated"]
       - ["System.ServiceModel.Syndication", "AtomPub10ServiceDocumentFormatter<T,TServiceDocument>", "AtomPub10ServiceDocumentFormatter", "(T,TServiceDocument)", "summary", "df-generated"]
       - ["System.ServiceModel.Syndication", "AtomPub10ServiceDocumentFormatter<T,TServiceDocument>", "CreateDocumentInstance", "()", "summary", "df-generated"]
       - ["System.ServiceModel.Syndication", "CategoriesDocument", "Create", "(System.Collections.ObjectModel.Collection<System.ServiceModel.Syndication.SyndicationCategory>)", "summary", "df-generated"]
+      - ["System.ServiceModel.Syndication", "CategoriesDocument", "Create", "(System.Collections.ObjectModel.Collection<System.ServiceModel.Syndication.SyndicationCategory>,System.Boolean,System.String)", "summary", "df-generated"]
       - ["System.ServiceModel.Syndication", "CategoriesDocument", "Create", "(System.Uri)", "summary", "df-generated"]
       - ["System.ServiceModel.Syndication", "CategoriesDocument", "GetFormatter", "()", "summary", "df-generated"]
       - ["System.ServiceModel.Syndication", "CategoriesDocument", "Load", "(System.Xml.XmlReader)", "summary", "df-generated"]
       - ["System.ServiceModel.Syndication", "CategoriesDocument", "Save", "(System.Xml.XmlWriter)", "summary", "df-generated"]
       - ["System.ServiceModel.Syndication", "CategoriesDocument", "TryParseAttribute", "(System.String,System.String,System.String,System.String)", "summary", "df-generated"]
       - ["System.ServiceModel.Syndication", "CategoriesDocument", "TryParseElement", "(System.Xml.XmlReader,System.String)", "summary", "df-generated"]
+      - ["System.ServiceModel.Syndication", "CategoriesDocument", "WriteAttributeExtensions", "(System.Xml.XmlWriter,System.String)", "summary", "df-generated"]
       - ["System.ServiceModel.Syndication", "CategoriesDocument", "WriteElementExtensions", "(System.Xml.XmlWriter,System.String)", "summary", "df-generated"]
       - ["System.ServiceModel.Syndication", "CategoriesDocumentFormatter", "CanRead", "(System.Xml.XmlReader)", "summary", "df-generated"]
       - ["System.ServiceModel.Syndication", "CategoriesDocumentFormatter", "CreateInlineCategoriesDocument", "()", "summary", "df-generated"]
       - ["System.ServiceModel.Syndication", "CategoriesDocumentFormatter", "CreateReferencedCategoriesDocument", "()", "summary", "df-generated"]
       - ["System.ServiceModel.Syndication", "CategoriesDocumentFormatter", "ReadFrom", "(System.Xml.XmlReader)", "summary", "df-generated"]
+      - ["System.ServiceModel.Syndication", "CategoriesDocumentFormatter", "WriteTo", "(System.Xml.XmlWriter)", "summary", "df-generated"]
       - ["System.ServiceModel.Syndication", "CategoriesDocumentFormatter", "get_Version", "()", "summary", "df-generated"]
       - ["System.ServiceModel.Syndication", "InlineCategoriesDocument", "CreateCategory", "()", "summary", "df-generated"]
       - ["System.ServiceModel.Syndication", "InlineCategoriesDocument", "InlineCategoriesDocument", "(System.Collections.Generic.IEnumerable<System.ServiceModel.Syndication.SyndicationCategory>)", "summary", "df-generated"]
@@ -196,6 +159,7 @@ extensions:
       - ["System.ServiceModel.Syndication", "ResourceCollectionInfo", "ResourceCollectionInfo", "(System.String,System.Uri)", "summary", "df-generated"]
       - ["System.ServiceModel.Syndication", "ResourceCollectionInfo", "TryParseAttribute", "(System.String,System.String,System.String,System.String)", "summary", "df-generated"]
       - ["System.ServiceModel.Syndication", "ResourceCollectionInfo", "TryParseElement", "(System.Xml.XmlReader,System.String)", "summary", "df-generated"]
+      - ["System.ServiceModel.Syndication", "ResourceCollectionInfo", "WriteAttributeExtensions", "(System.Xml.XmlWriter,System.String)", "summary", "df-generated"]
       - ["System.ServiceModel.Syndication", "ResourceCollectionInfo", "WriteElementExtensions", "(System.Xml.XmlWriter,System.String)", "summary", "df-generated"]
       - ["System.ServiceModel.Syndication", "ResourceCollectionInfo", "get_Accepts", "()", "summary", "df-generated"]
       - ["System.ServiceModel.Syndication", "ResourceCollectionInfo", "get_Categories", "()", "summary", "df-generated"]
@@ -208,6 +172,7 @@ extensions:
       - ["System.ServiceModel.Syndication", "Rss20FeedFormatter", "Rss20FeedFormatter", "(System.ServiceModel.Syndication.SyndicationFeed)", "summary", "df-generated"]
       - ["System.ServiceModel.Syndication", "Rss20FeedFormatter", "Rss20FeedFormatter", "(System.ServiceModel.Syndication.SyndicationFeed,System.Boolean)", "summary", "df-generated"]
       - ["System.ServiceModel.Syndication", "Rss20FeedFormatter", "Rss20FeedFormatter", "(System.Type)", "summary", "df-generated"]
+      - ["System.ServiceModel.Syndication", "Rss20FeedFormatter", "WriteTo", "(System.Xml.XmlWriter)", "summary", "df-generated"]
       - ["System.ServiceModel.Syndication", "Rss20FeedFormatter", "get_FeedType", "()", "summary", "df-generated"]
       - ["System.ServiceModel.Syndication", "Rss20FeedFormatter", "get_Version", "()", "summary", "df-generated"]
       - ["System.ServiceModel.Syndication", "Rss20FeedFormatter<T,TSyndicationFeed>", "CreateFeedInstance", "()", "summary", "df-generated"]
@@ -220,6 +185,7 @@ extensions:
       - ["System.ServiceModel.Syndication", "Rss20ItemFormatter", "Rss20ItemFormatter", "(System.ServiceModel.Syndication.SyndicationItem)", "summary", "df-generated"]
       - ["System.ServiceModel.Syndication", "Rss20ItemFormatter", "Rss20ItemFormatter", "(System.ServiceModel.Syndication.SyndicationItem,System.Boolean)", "summary", "df-generated"]
       - ["System.ServiceModel.Syndication", "Rss20ItemFormatter", "Rss20ItemFormatter", "(System.Type)", "summary", "df-generated"]
+      - ["System.ServiceModel.Syndication", "Rss20ItemFormatter", "WriteTo", "(System.Xml.XmlWriter)", "summary", "df-generated"]
       - ["System.ServiceModel.Syndication", "Rss20ItemFormatter", "get_ItemType", "()", "summary", "df-generated"]
       - ["System.ServiceModel.Syndication", "Rss20ItemFormatter", "get_Version", "()", "summary", "df-generated"]
       - ["System.ServiceModel.Syndication", "Rss20ItemFormatter<T,TSyndicationItem>", "CreateItemInstance", "()", "summary", "df-generated"]
@@ -232,6 +198,7 @@ extensions:
       - ["System.ServiceModel.Syndication", "ServiceDocument", "Save", "(System.Xml.XmlWriter)", "summary", "df-generated"]
       - ["System.ServiceModel.Syndication", "ServiceDocument", "TryParseAttribute", "(System.String,System.String,System.String,System.String)", "summary", "df-generated"]
       - ["System.ServiceModel.Syndication", "ServiceDocument", "TryParseElement", "(System.Xml.XmlReader,System.String)", "summary", "df-generated"]
+      - ["System.ServiceModel.Syndication", "ServiceDocument", "WriteAttributeExtensions", "(System.Xml.XmlWriter,System.String)", "summary", "df-generated"]
       - ["System.ServiceModel.Syndication", "ServiceDocument", "WriteElementExtensions", "(System.Xml.XmlWriter,System.String)", "summary", "df-generated"]
       - ["System.ServiceModel.Syndication", "ServiceDocument", "get_Workspaces", "()", "summary", "df-generated"]
       - ["System.ServiceModel.Syndication", "ServiceDocumentFormatter", "CanRead", "(System.Xml.XmlReader)", "summary", "df-generated"]
@@ -254,10 +221,15 @@ extensions:
       - ["System.ServiceModel.Syndication", "ServiceDocumentFormatter", "TryParseElement", "(System.Xml.XmlReader,System.ServiceModel.Syndication.ResourceCollectionInfo,System.String)", "summary", "df-generated"]
       - ["System.ServiceModel.Syndication", "ServiceDocumentFormatter", "TryParseElement", "(System.Xml.XmlReader,System.ServiceModel.Syndication.ServiceDocument,System.String)", "summary", "df-generated"]
       - ["System.ServiceModel.Syndication", "ServiceDocumentFormatter", "TryParseElement", "(System.Xml.XmlReader,System.ServiceModel.Syndication.Workspace,System.String)", "summary", "df-generated"]
+      - ["System.ServiceModel.Syndication", "ServiceDocumentFormatter", "WriteAttributeExtensions", "(System.Xml.XmlWriter,System.ServiceModel.Syndication.CategoriesDocument,System.String)", "summary", "df-generated"]
+      - ["System.ServiceModel.Syndication", "ServiceDocumentFormatter", "WriteAttributeExtensions", "(System.Xml.XmlWriter,System.ServiceModel.Syndication.ResourceCollectionInfo,System.String)", "summary", "df-generated"]
+      - ["System.ServiceModel.Syndication", "ServiceDocumentFormatter", "WriteAttributeExtensions", "(System.Xml.XmlWriter,System.ServiceModel.Syndication.ServiceDocument,System.String)", "summary", "df-generated"]
+      - ["System.ServiceModel.Syndication", "ServiceDocumentFormatter", "WriteAttributeExtensions", "(System.Xml.XmlWriter,System.ServiceModel.Syndication.Workspace,System.String)", "summary", "df-generated"]
       - ["System.ServiceModel.Syndication", "ServiceDocumentFormatter", "WriteElementExtensions", "(System.Xml.XmlWriter,System.ServiceModel.Syndication.CategoriesDocument,System.String)", "summary", "df-generated"]
       - ["System.ServiceModel.Syndication", "ServiceDocumentFormatter", "WriteElementExtensions", "(System.Xml.XmlWriter,System.ServiceModel.Syndication.ResourceCollectionInfo,System.String)", "summary", "df-generated"]
       - ["System.ServiceModel.Syndication", "ServiceDocumentFormatter", "WriteElementExtensions", "(System.Xml.XmlWriter,System.ServiceModel.Syndication.ServiceDocument,System.String)", "summary", "df-generated"]
       - ["System.ServiceModel.Syndication", "ServiceDocumentFormatter", "WriteElementExtensions", "(System.Xml.XmlWriter,System.ServiceModel.Syndication.Workspace,System.String)", "summary", "df-generated"]
+      - ["System.ServiceModel.Syndication", "ServiceDocumentFormatter", "WriteTo", "(System.Xml.XmlWriter)", "summary", "df-generated"]
       - ["System.ServiceModel.Syndication", "ServiceDocumentFormatter", "get_Version", "()", "summary", "df-generated"]
       - ["System.ServiceModel.Syndication", "SyndicationCategory", "Clone", "()", "summary", "df-generated"]
       - ["System.ServiceModel.Syndication", "SyndicationCategory", "SyndicationCategory", "(System.ServiceModel.Syndication.SyndicationCategory)", "summary", "df-generated"]
@@ -265,20 +237,35 @@ extensions:
       - ["System.ServiceModel.Syndication", "SyndicationCategory", "SyndicationCategory", "(System.String,System.String,System.String)", "summary", "df-generated"]
       - ["System.ServiceModel.Syndication", "SyndicationCategory", "TryParseAttribute", "(System.String,System.String,System.String,System.String)", "summary", "df-generated"]
       - ["System.ServiceModel.Syndication", "SyndicationCategory", "TryParseElement", "(System.Xml.XmlReader,System.String)", "summary", "df-generated"]
+      - ["System.ServiceModel.Syndication", "SyndicationCategory", "WriteAttributeExtensions", "(System.Xml.XmlWriter,System.String)", "summary", "df-generated"]
       - ["System.ServiceModel.Syndication", "SyndicationCategory", "WriteElementExtensions", "(System.Xml.XmlWriter,System.String)", "summary", "df-generated"]
+      - ["System.ServiceModel.Syndication", "SyndicationContent", "Clone", "()", "summary", "df-generated"]
       - ["System.ServiceModel.Syndication", "SyndicationContent", "CreateHtmlContent", "(System.String)", "summary", "df-generated"]
       - ["System.ServiceModel.Syndication", "SyndicationContent", "CreatePlaintextContent", "(System.String)", "summary", "df-generated"]
       - ["System.ServiceModel.Syndication", "SyndicationContent", "CreateXhtmlContent", "(System.String)", "summary", "df-generated"]
       - ["System.ServiceModel.Syndication", "SyndicationContent", "CreateXmlContent", "(System.Object)", "summary", "df-generated"]
       - ["System.ServiceModel.Syndication", "SyndicationContent", "CreateXmlContent", "(System.Object,System.Runtime.Serialization.XmlObjectSerializer)", "summary", "df-generated"]
       - ["System.ServiceModel.Syndication", "SyndicationContent", "CreateXmlContent", "(System.Object,System.Xml.Serialization.XmlSerializer)", "summary", "df-generated"]
+      - ["System.ServiceModel.Syndication", "SyndicationContent", "CreateXmlContent", "(System.Xml.XmlReader)", "summary", "df-generated"]
       - ["System.ServiceModel.Syndication", "SyndicationContent", "SyndicationContent", "(System.ServiceModel.Syndication.SyndicationContent)", "summary", "df-generated"]
       - ["System.ServiceModel.Syndication", "SyndicationContent", "get_AttributeExtensions", "()", "summary", "df-generated"]
+      - ["System.ServiceModel.Syndication", "SyndicationContent", "get_Type", "()", "summary", "df-generated"]
+      - ["System.ServiceModel.Syndication", "SyndicationElementExtension", "GetReader", "()", "summary", "df-generated"]
       - ["System.ServiceModel.Syndication", "SyndicationElementExtension", "SyndicationElementExtension", "(System.Object)", "summary", "df-generated"]
       - ["System.ServiceModel.Syndication", "SyndicationElementExtension", "SyndicationElementExtension", "(System.Object,System.Runtime.Serialization.XmlObjectSerializer)", "summary", "df-generated"]
       - ["System.ServiceModel.Syndication", "SyndicationElementExtension", "SyndicationElementExtension", "(System.String,System.String,System.Object)", "summary", "df-generated"]
+      - ["System.ServiceModel.Syndication", "SyndicationElementExtension", "WriteTo", "(System.Xml.XmlWriter)", "summary", "df-generated"]
+      - ["System.ServiceModel.Syndication", "SyndicationElementExtensionCollection", "Add", "(System.Object,System.Runtime.Serialization.DataContractSerializer)", "summary", "df-generated"]
+      - ["System.ServiceModel.Syndication", "SyndicationElementExtensionCollection", "Add", "(System.Object,System.Xml.Serialization.XmlSerializer)", "summary", "df-generated"]
+      - ["System.ServiceModel.Syndication", "SyndicationElementExtensionCollection", "Add", "(System.String,System.String,System.Object)", "summary", "df-generated"]
+      - ["System.ServiceModel.Syndication", "SyndicationElementExtensionCollection", "Add", "(System.String,System.String,System.Object,System.Runtime.Serialization.XmlObjectSerializer)", "summary", "df-generated"]
+      - ["System.ServiceModel.Syndication", "SyndicationElementExtensionCollection", "Add", "(System.Xml.XmlReader)", "summary", "df-generated"]
       - ["System.ServiceModel.Syndication", "SyndicationElementExtensionCollection", "ClearItems", "()", "summary", "df-generated"]
+      - ["System.ServiceModel.Syndication", "SyndicationElementExtensionCollection", "GetReaderAtElementExtensions", "()", "summary", "df-generated"]
+      - ["System.ServiceModel.Syndication", "SyndicationElementExtensionCollection", "InsertItem", "(System.Int32,System.ServiceModel.Syndication.SyndicationElementExtension)", "summary", "df-generated"]
       - ["System.ServiceModel.Syndication", "SyndicationElementExtensionCollection", "RemoveItem", "(System.Int32)", "summary", "df-generated"]
+      - ["System.ServiceModel.Syndication", "SyndicationElementExtensionCollection", "SetItem", "(System.Int32,System.ServiceModel.Syndication.SyndicationElementExtension)", "summary", "df-generated"]
+      - ["System.ServiceModel.Syndication", "SyndicationFeed", "Clone", "(System.Boolean)", "summary", "df-generated"]
       - ["System.ServiceModel.Syndication", "SyndicationFeed", "CreateCategory", "()", "summary", "df-generated"]
       - ["System.ServiceModel.Syndication", "SyndicationFeed", "CreateItem", "()", "summary", "df-generated"]
       - ["System.ServiceModel.Syndication", "SyndicationFeed", "CreateLink", "()", "summary", "df-generated"]
@@ -296,6 +283,7 @@ extensions:
       - ["System.ServiceModel.Syndication", "SyndicationFeed", "SyndicationFeed", "(System.String,System.String,System.Uri,System.String,System.DateTimeOffset)", "summary", "df-generated"]
       - ["System.ServiceModel.Syndication", "SyndicationFeed", "TryParseAttribute", "(System.String,System.String,System.String,System.String)", "summary", "df-generated"]
       - ["System.ServiceModel.Syndication", "SyndicationFeed", "TryParseElement", "(System.Xml.XmlReader,System.String)", "summary", "df-generated"]
+      - ["System.ServiceModel.Syndication", "SyndicationFeed", "WriteAttributeExtensions", "(System.Xml.XmlWriter,System.String)", "summary", "df-generated"]
       - ["System.ServiceModel.Syndication", "SyndicationFeed", "WriteElementExtensions", "(System.Xml.XmlWriter,System.String)", "summary", "df-generated"]
       - ["System.ServiceModel.Syndication", "SyndicationFeed", "get_Authors", "()", "summary", "df-generated"]
       - ["System.ServiceModel.Syndication", "SyndicationFeed", "get_Categories", "()", "summary", "df-generated"]
@@ -328,13 +316,20 @@ extensions:
       - ["System.ServiceModel.Syndication", "SyndicationFeedFormatter", "TryParseElement", "(System.Xml.XmlReader,System.ServiceModel.Syndication.SyndicationItem,System.String)", "summary", "df-generated"]
       - ["System.ServiceModel.Syndication", "SyndicationFeedFormatter", "TryParseElement", "(System.Xml.XmlReader,System.ServiceModel.Syndication.SyndicationLink,System.String)", "summary", "df-generated"]
       - ["System.ServiceModel.Syndication", "SyndicationFeedFormatter", "TryParseElement", "(System.Xml.XmlReader,System.ServiceModel.Syndication.SyndicationPerson,System.String)", "summary", "df-generated"]
+      - ["System.ServiceModel.Syndication", "SyndicationFeedFormatter", "WriteAttributeExtensions", "(System.Xml.XmlWriter,System.ServiceModel.Syndication.SyndicationCategory,System.String)", "summary", "df-generated"]
+      - ["System.ServiceModel.Syndication", "SyndicationFeedFormatter", "WriteAttributeExtensions", "(System.Xml.XmlWriter,System.ServiceModel.Syndication.SyndicationFeed,System.String)", "summary", "df-generated"]
+      - ["System.ServiceModel.Syndication", "SyndicationFeedFormatter", "WriteAttributeExtensions", "(System.Xml.XmlWriter,System.ServiceModel.Syndication.SyndicationItem,System.String)", "summary", "df-generated"]
+      - ["System.ServiceModel.Syndication", "SyndicationFeedFormatter", "WriteAttributeExtensions", "(System.Xml.XmlWriter,System.ServiceModel.Syndication.SyndicationLink,System.String)", "summary", "df-generated"]
+      - ["System.ServiceModel.Syndication", "SyndicationFeedFormatter", "WriteAttributeExtensions", "(System.Xml.XmlWriter,System.ServiceModel.Syndication.SyndicationPerson,System.String)", "summary", "df-generated"]
       - ["System.ServiceModel.Syndication", "SyndicationFeedFormatter", "WriteElementExtensions", "(System.Xml.XmlWriter,System.ServiceModel.Syndication.SyndicationCategory,System.String)", "summary", "df-generated"]
       - ["System.ServiceModel.Syndication", "SyndicationFeedFormatter", "WriteElementExtensions", "(System.Xml.XmlWriter,System.ServiceModel.Syndication.SyndicationFeed,System.String)", "summary", "df-generated"]
       - ["System.ServiceModel.Syndication", "SyndicationFeedFormatter", "WriteElementExtensions", "(System.Xml.XmlWriter,System.ServiceModel.Syndication.SyndicationItem,System.String)", "summary", "df-generated"]
       - ["System.ServiceModel.Syndication", "SyndicationFeedFormatter", "WriteElementExtensions", "(System.Xml.XmlWriter,System.ServiceModel.Syndication.SyndicationLink,System.String)", "summary", "df-generated"]
       - ["System.ServiceModel.Syndication", "SyndicationFeedFormatter", "WriteElementExtensions", "(System.Xml.XmlWriter,System.ServiceModel.Syndication.SyndicationPerson,System.String)", "summary", "df-generated"]
+      - ["System.ServiceModel.Syndication", "SyndicationFeedFormatter", "WriteTo", "(System.Xml.XmlWriter)", "summary", "df-generated"]
       - ["System.ServiceModel.Syndication", "SyndicationFeedFormatter", "get_Version", "()", "summary", "df-generated"]
       - ["System.ServiceModel.Syndication", "SyndicationItem", "AddPermalink", "(System.Uri)", "summary", "df-generated"]
+      - ["System.ServiceModel.Syndication", "SyndicationItem", "Clone", "()", "summary", "df-generated"]
       - ["System.ServiceModel.Syndication", "SyndicationItem", "CreateCategory", "()", "summary", "df-generated"]
       - ["System.ServiceModel.Syndication", "SyndicationItem", "CreateLink", "()", "summary", "df-generated"]
       - ["System.ServiceModel.Syndication", "SyndicationItem", "CreatePerson", "()", "summary", "df-generated"]
@@ -350,6 +345,7 @@ extensions:
       - ["System.ServiceModel.Syndication", "SyndicationItem", "TryParseAttribute", "(System.String,System.String,System.String,System.String)", "summary", "df-generated"]
       - ["System.ServiceModel.Syndication", "SyndicationItem", "TryParseContent", "(System.Xml.XmlReader,System.String,System.String,System.ServiceModel.Syndication.SyndicationContent)", "summary", "df-generated"]
       - ["System.ServiceModel.Syndication", "SyndicationItem", "TryParseElement", "(System.Xml.XmlReader,System.String)", "summary", "df-generated"]
+      - ["System.ServiceModel.Syndication", "SyndicationItem", "WriteAttributeExtensions", "(System.Xml.XmlWriter,System.String)", "summary", "df-generated"]
       - ["System.ServiceModel.Syndication", "SyndicationItem", "WriteElementExtensions", "(System.Xml.XmlWriter,System.String)", "summary", "df-generated"]
       - ["System.ServiceModel.Syndication", "SyndicationItem", "get_Authors", "()", "summary", "df-generated"]
       - ["System.ServiceModel.Syndication", "SyndicationItem", "get_Categories", "()", "summary", "df-generated"]
@@ -374,10 +370,15 @@ extensions:
       - ["System.ServiceModel.Syndication", "SyndicationItemFormatter", "TryParseElement", "(System.Xml.XmlReader,System.ServiceModel.Syndication.SyndicationItem,System.String)", "summary", "df-generated"]
       - ["System.ServiceModel.Syndication", "SyndicationItemFormatter", "TryParseElement", "(System.Xml.XmlReader,System.ServiceModel.Syndication.SyndicationLink,System.String)", "summary", "df-generated"]
       - ["System.ServiceModel.Syndication", "SyndicationItemFormatter", "TryParseElement", "(System.Xml.XmlReader,System.ServiceModel.Syndication.SyndicationPerson,System.String)", "summary", "df-generated"]
+      - ["System.ServiceModel.Syndication", "SyndicationItemFormatter", "WriteAttributeExtensions", "(System.Xml.XmlWriter,System.ServiceModel.Syndication.SyndicationCategory,System.String)", "summary", "df-generated"]
+      - ["System.ServiceModel.Syndication", "SyndicationItemFormatter", "WriteAttributeExtensions", "(System.Xml.XmlWriter,System.ServiceModel.Syndication.SyndicationItem,System.String)", "summary", "df-generated"]
+      - ["System.ServiceModel.Syndication", "SyndicationItemFormatter", "WriteAttributeExtensions", "(System.Xml.XmlWriter,System.ServiceModel.Syndication.SyndicationLink,System.String)", "summary", "df-generated"]
+      - ["System.ServiceModel.Syndication", "SyndicationItemFormatter", "WriteAttributeExtensions", "(System.Xml.XmlWriter,System.ServiceModel.Syndication.SyndicationPerson,System.String)", "summary", "df-generated"]
       - ["System.ServiceModel.Syndication", "SyndicationItemFormatter", "WriteElementExtensions", "(System.Xml.XmlWriter,System.ServiceModel.Syndication.SyndicationCategory,System.String)", "summary", "df-generated"]
       - ["System.ServiceModel.Syndication", "SyndicationItemFormatter", "WriteElementExtensions", "(System.Xml.XmlWriter,System.ServiceModel.Syndication.SyndicationItem,System.String)", "summary", "df-generated"]
       - ["System.ServiceModel.Syndication", "SyndicationItemFormatter", "WriteElementExtensions", "(System.Xml.XmlWriter,System.ServiceModel.Syndication.SyndicationLink,System.String)", "summary", "df-generated"]
       - ["System.ServiceModel.Syndication", "SyndicationItemFormatter", "WriteElementExtensions", "(System.Xml.XmlWriter,System.ServiceModel.Syndication.SyndicationPerson,System.String)", "summary", "df-generated"]
+      - ["System.ServiceModel.Syndication", "SyndicationItemFormatter", "WriteTo", "(System.Xml.XmlWriter)", "summary", "df-generated"]
       - ["System.ServiceModel.Syndication", "SyndicationItemFormatter", "get_Version", "()", "summary", "df-generated"]
       - ["System.ServiceModel.Syndication", "SyndicationLink", "Clone", "()", "summary", "df-generated"]
       - ["System.ServiceModel.Syndication", "SyndicationLink", "CreateAlternateLink", "(System.Uri)", "summary", "df-generated"]
@@ -390,6 +391,7 @@ extensions:
       - ["System.ServiceModel.Syndication", "SyndicationLink", "SyndicationLink", "(System.Uri,System.String,System.String,System.String,System.Int64)", "summary", "df-generated"]
       - ["System.ServiceModel.Syndication", "SyndicationLink", "TryParseAttribute", "(System.String,System.String,System.String,System.String)", "summary", "df-generated"]
       - ["System.ServiceModel.Syndication", "SyndicationLink", "TryParseElement", "(System.Xml.XmlReader,System.String)", "summary", "df-generated"]
+      - ["System.ServiceModel.Syndication", "SyndicationLink", "WriteAttributeExtensions", "(System.Xml.XmlWriter,System.String)", "summary", "df-generated"]
       - ["System.ServiceModel.Syndication", "SyndicationLink", "WriteElementExtensions", "(System.Xml.XmlWriter,System.String)", "summary", "df-generated"]
       - ["System.ServiceModel.Syndication", "SyndicationPerson", "Clone", "()", "summary", "df-generated"]
       - ["System.ServiceModel.Syndication", "SyndicationPerson", "SyndicationPerson", "(System.ServiceModel.Syndication.SyndicationPerson)", "summary", "df-generated"]
@@ -397,21 +399,26 @@ extensions:
       - ["System.ServiceModel.Syndication", "SyndicationPerson", "SyndicationPerson", "(System.String,System.String,System.String)", "summary", "df-generated"]
       - ["System.ServiceModel.Syndication", "SyndicationPerson", "TryParseAttribute", "(System.String,System.String,System.String,System.String)", "summary", "df-generated"]
       - ["System.ServiceModel.Syndication", "SyndicationPerson", "TryParseElement", "(System.Xml.XmlReader,System.String)", "summary", "df-generated"]
+      - ["System.ServiceModel.Syndication", "SyndicationPerson", "WriteAttributeExtensions", "(System.Xml.XmlWriter,System.String)", "summary", "df-generated"]
       - ["System.ServiceModel.Syndication", "SyndicationPerson", "WriteElementExtensions", "(System.Xml.XmlWriter,System.String)", "summary", "df-generated"]
+      - ["System.ServiceModel.Syndication", "TextSyndicationContent", "Clone", "()", "summary", "df-generated"]
       - ["System.ServiceModel.Syndication", "TextSyndicationContent", "TextSyndicationContent", "(System.ServiceModel.Syndication.TextSyndicationContent)", "summary", "df-generated"]
       - ["System.ServiceModel.Syndication", "TextSyndicationContent", "TextSyndicationContent", "(System.String)", "summary", "df-generated"]
       - ["System.ServiceModel.Syndication", "TextSyndicationContent", "TextSyndicationContent", "(System.String,System.ServiceModel.Syndication.TextSyndicationContentKind)", "summary", "df-generated"]
       - ["System.ServiceModel.Syndication", "TextSyndicationContent", "get_Text", "()", "summary", "df-generated"]
+      - ["System.ServiceModel.Syndication", "TextSyndicationContent", "get_Type", "()", "summary", "df-generated"]
       - ["System.ServiceModel.Syndication", "UrlSyndicationContent", "get_Url", "()", "summary", "df-generated"]
       - ["System.ServiceModel.Syndication", "Workspace", "CreateResourceCollection", "()", "summary", "df-generated"]
       - ["System.ServiceModel.Syndication", "Workspace", "TryParseAttribute", "(System.String,System.String,System.String,System.String)", "summary", "df-generated"]
       - ["System.ServiceModel.Syndication", "Workspace", "TryParseElement", "(System.Xml.XmlReader,System.String)", "summary", "df-generated"]
       - ["System.ServiceModel.Syndication", "Workspace", "Workspace", "(System.String,System.Collections.Generic.IEnumerable<System.ServiceModel.Syndication.ResourceCollectionInfo>)", "summary", "df-generated"]
+      - ["System.ServiceModel.Syndication", "Workspace", "WriteAttributeExtensions", "(System.Xml.XmlWriter,System.String)", "summary", "df-generated"]
       - ["System.ServiceModel.Syndication", "Workspace", "WriteElementExtensions", "(System.Xml.XmlWriter,System.String)", "summary", "df-generated"]
       - ["System.ServiceModel.Syndication", "Workspace", "get_Collections", "()", "summary", "df-generated"]
       - ["System.ServiceModel.Syndication", "XmlDateTimeData", "XmlDateTimeData", "(System.String,System.Xml.XmlQualifiedName)", "summary", "df-generated"]
       - ["System.ServiceModel.Syndication", "XmlDateTimeData", "get_DateTimeString", "()", "summary", "df-generated"]
       - ["System.ServiceModel.Syndication", "XmlDateTimeData", "get_ElementQualifiedName", "()", "summary", "df-generated"]
+      - ["System.ServiceModel.Syndication", "XmlSyndicationContent", "GetReaderAtContent", "()", "summary", "df-generated"]
       - ["System.ServiceModel.Syndication", "XmlSyndicationContent", "get_Extension", "()", "summary", "df-generated"]
       - ["System.ServiceModel.Syndication", "XmlUriData", "XmlUriData", "(System.String,System.UriKind,System.Xml.XmlQualifiedName)", "summary", "df-generated"]
       - ["System.ServiceModel.Syndication", "XmlUriData", "get_ElementQualifiedName", "()", "summary", "df-generated"]
diff --git a/csharp/ql/lib/ext/generated/System.Speech.Recognition.model.yml b/csharp/ql/lib/ext/generated/System.Speech.Recognition.model.yml
index b7fa8312dda..0b37c0832b9 100644
--- a/csharp/ql/lib/ext/generated/System.Speech.Recognition.model.yml
+++ b/csharp/ql/lib/ext/generated/System.Speech.Recognition.model.yml
@@ -34,9 +34,11 @@ extensions:
       - ["System.Speech.Recognition", "Grammar", "Grammar", "(System.String,System.String,System.Object[])", "summary", "df-generated"]
       - ["System.Speech.Recognition", "Grammar", "LoadLocalizedGrammarFromType", "(System.Type,System.Object[])", "summary", "df-generated"]
       - ["System.Speech.Recognition", "Grammar", "StgInit", "(System.Object[])", "summary", "df-generated"]
+      - ["System.Speech.Recognition", "Grammar", "add_SpeechRecognized", "(System.EventHandler<System.Speech.Recognition.SpeechRecognizedEventArgs>)", "summary", "df-generated"]
       - ["System.Speech.Recognition", "Grammar", "get_IsStg", "()", "summary", "df-generated"]
       - ["System.Speech.Recognition", "Grammar", "get_Loaded", "()", "summary", "df-generated"]
       - ["System.Speech.Recognition", "Grammar", "get_RuleName", "()", "summary", "df-generated"]
+      - ["System.Speech.Recognition", "Grammar", "remove_SpeechRecognized", "(System.EventHandler<System.Speech.Recognition.SpeechRecognizedEventArgs>)", "summary", "df-generated"]
       - ["System.Speech.Recognition", "GrammarBuilder", "Add", "(System.Speech.Recognition.Choices,System.Speech.Recognition.GrammarBuilder)", "summary", "df-generated"]
       - ["System.Speech.Recognition", "GrammarBuilder", "Add", "(System.Speech.Recognition.GrammarBuilder,System.Speech.Recognition.Choices)", "summary", "df-generated"]
       - ["System.Speech.Recognition", "GrammarBuilder", "Add", "(System.Speech.Recognition.GrammarBuilder,System.Speech.Recognition.GrammarBuilder)", "summary", "df-generated"]
@@ -167,6 +169,17 @@ extensions:
       - ["System.Speech.Recognition", "SpeechRecognitionEngine", "UnloadGrammar", "(System.Speech.Recognition.Grammar)", "summary", "df-generated"]
       - ["System.Speech.Recognition", "SpeechRecognitionEngine", "UpdateRecognizerSetting", "(System.String,System.Int32)", "summary", "df-generated"]
       - ["System.Speech.Recognition", "SpeechRecognitionEngine", "UpdateRecognizerSetting", "(System.String,System.String)", "summary", "df-generated"]
+      - ["System.Speech.Recognition", "SpeechRecognitionEngine", "add_AudioLevelUpdated", "(System.EventHandler<System.Speech.Recognition.AudioLevelUpdatedEventArgs>)", "summary", "df-generated"]
+      - ["System.Speech.Recognition", "SpeechRecognitionEngine", "add_AudioSignalProblemOccurred", "(System.EventHandler<System.Speech.Recognition.AudioSignalProblemOccurredEventArgs>)", "summary", "df-generated"]
+      - ["System.Speech.Recognition", "SpeechRecognitionEngine", "add_AudioStateChanged", "(System.EventHandler<System.Speech.Recognition.AudioStateChangedEventArgs>)", "summary", "df-generated"]
+      - ["System.Speech.Recognition", "SpeechRecognitionEngine", "add_EmulateRecognizeCompleted", "(System.EventHandler<System.Speech.Recognition.EmulateRecognizeCompletedEventArgs>)", "summary", "df-generated"]
+      - ["System.Speech.Recognition", "SpeechRecognitionEngine", "add_LoadGrammarCompleted", "(System.EventHandler<System.Speech.Recognition.LoadGrammarCompletedEventArgs>)", "summary", "df-generated"]
+      - ["System.Speech.Recognition", "SpeechRecognitionEngine", "add_RecognizeCompleted", "(System.EventHandler<System.Speech.Recognition.RecognizeCompletedEventArgs>)", "summary", "df-generated"]
+      - ["System.Speech.Recognition", "SpeechRecognitionEngine", "add_RecognizerUpdateReached", "(System.EventHandler<System.Speech.Recognition.RecognizerUpdateReachedEventArgs>)", "summary", "df-generated"]
+      - ["System.Speech.Recognition", "SpeechRecognitionEngine", "add_SpeechDetected", "(System.EventHandler<System.Speech.Recognition.SpeechDetectedEventArgs>)", "summary", "df-generated"]
+      - ["System.Speech.Recognition", "SpeechRecognitionEngine", "add_SpeechHypothesized", "(System.EventHandler<System.Speech.Recognition.SpeechHypothesizedEventArgs>)", "summary", "df-generated"]
+      - ["System.Speech.Recognition", "SpeechRecognitionEngine", "add_SpeechRecognitionRejected", "(System.EventHandler<System.Speech.Recognition.SpeechRecognitionRejectedEventArgs>)", "summary", "df-generated"]
+      - ["System.Speech.Recognition", "SpeechRecognitionEngine", "add_SpeechRecognized", "(System.EventHandler<System.Speech.Recognition.SpeechRecognizedEventArgs>)", "summary", "df-generated"]
       - ["System.Speech.Recognition", "SpeechRecognitionEngine", "get_AudioFormat", "()", "summary", "df-generated"]
       - ["System.Speech.Recognition", "SpeechRecognitionEngine", "get_AudioLevel", "()", "summary", "df-generated"]
       - ["System.Speech.Recognition", "SpeechRecognitionEngine", "get_AudioPosition", "()", "summary", "df-generated"]
@@ -174,6 +187,17 @@ extensions:
       - ["System.Speech.Recognition", "SpeechRecognitionEngine", "get_Grammars", "()", "summary", "df-generated"]
       - ["System.Speech.Recognition", "SpeechRecognitionEngine", "get_RecognizerAudioPosition", "()", "summary", "df-generated"]
       - ["System.Speech.Recognition", "SpeechRecognitionEngine", "get_RecognizerInfo", "()", "summary", "df-generated"]
+      - ["System.Speech.Recognition", "SpeechRecognitionEngine", "remove_AudioLevelUpdated", "(System.EventHandler<System.Speech.Recognition.AudioLevelUpdatedEventArgs>)", "summary", "df-generated"]
+      - ["System.Speech.Recognition", "SpeechRecognitionEngine", "remove_AudioSignalProblemOccurred", "(System.EventHandler<System.Speech.Recognition.AudioSignalProblemOccurredEventArgs>)", "summary", "df-generated"]
+      - ["System.Speech.Recognition", "SpeechRecognitionEngine", "remove_AudioStateChanged", "(System.EventHandler<System.Speech.Recognition.AudioStateChangedEventArgs>)", "summary", "df-generated"]
+      - ["System.Speech.Recognition", "SpeechRecognitionEngine", "remove_EmulateRecognizeCompleted", "(System.EventHandler<System.Speech.Recognition.EmulateRecognizeCompletedEventArgs>)", "summary", "df-generated"]
+      - ["System.Speech.Recognition", "SpeechRecognitionEngine", "remove_LoadGrammarCompleted", "(System.EventHandler<System.Speech.Recognition.LoadGrammarCompletedEventArgs>)", "summary", "df-generated"]
+      - ["System.Speech.Recognition", "SpeechRecognitionEngine", "remove_RecognizeCompleted", "(System.EventHandler<System.Speech.Recognition.RecognizeCompletedEventArgs>)", "summary", "df-generated"]
+      - ["System.Speech.Recognition", "SpeechRecognitionEngine", "remove_RecognizerUpdateReached", "(System.EventHandler<System.Speech.Recognition.RecognizerUpdateReachedEventArgs>)", "summary", "df-generated"]
+      - ["System.Speech.Recognition", "SpeechRecognitionEngine", "remove_SpeechDetected", "(System.EventHandler<System.Speech.Recognition.SpeechDetectedEventArgs>)", "summary", "df-generated"]
+      - ["System.Speech.Recognition", "SpeechRecognitionEngine", "remove_SpeechHypothesized", "(System.EventHandler<System.Speech.Recognition.SpeechHypothesizedEventArgs>)", "summary", "df-generated"]
+      - ["System.Speech.Recognition", "SpeechRecognitionEngine", "remove_SpeechRecognitionRejected", "(System.EventHandler<System.Speech.Recognition.SpeechRecognitionRejectedEventArgs>)", "summary", "df-generated"]
+      - ["System.Speech.Recognition", "SpeechRecognitionEngine", "remove_SpeechRecognized", "(System.EventHandler<System.Speech.Recognition.SpeechRecognizedEventArgs>)", "summary", "df-generated"]
       - ["System.Speech.Recognition", "SpeechRecognizer", "Dispose", "()", "summary", "df-generated"]
       - ["System.Speech.Recognition", "SpeechRecognizer", "Dispose", "(System.Boolean)", "summary", "df-generated"]
       - ["System.Speech.Recognition", "SpeechRecognizer", "EmulateRecognize", "(System.Speech.Recognition.RecognizedWordUnit[],System.Globalization.CompareOptions)", "summary", "df-generated"]
@@ -189,6 +213,17 @@ extensions:
       - ["System.Speech.Recognition", "SpeechRecognizer", "RequestRecognizerUpdate", "(System.Object,System.TimeSpan)", "summary", "df-generated"]
       - ["System.Speech.Recognition", "SpeechRecognizer", "UnloadAllGrammars", "()", "summary", "df-generated"]
       - ["System.Speech.Recognition", "SpeechRecognizer", "UnloadGrammar", "(System.Speech.Recognition.Grammar)", "summary", "df-generated"]
+      - ["System.Speech.Recognition", "SpeechRecognizer", "add_AudioLevelUpdated", "(System.EventHandler<System.Speech.Recognition.AudioLevelUpdatedEventArgs>)", "summary", "df-generated"]
+      - ["System.Speech.Recognition", "SpeechRecognizer", "add_AudioSignalProblemOccurred", "(System.EventHandler<System.Speech.Recognition.AudioSignalProblemOccurredEventArgs>)", "summary", "df-generated"]
+      - ["System.Speech.Recognition", "SpeechRecognizer", "add_AudioStateChanged", "(System.EventHandler<System.Speech.Recognition.AudioStateChangedEventArgs>)", "summary", "df-generated"]
+      - ["System.Speech.Recognition", "SpeechRecognizer", "add_EmulateRecognizeCompleted", "(System.EventHandler<System.Speech.Recognition.EmulateRecognizeCompletedEventArgs>)", "summary", "df-generated"]
+      - ["System.Speech.Recognition", "SpeechRecognizer", "add_LoadGrammarCompleted", "(System.EventHandler<System.Speech.Recognition.LoadGrammarCompletedEventArgs>)", "summary", "df-generated"]
+      - ["System.Speech.Recognition", "SpeechRecognizer", "add_RecognizerUpdateReached", "(System.EventHandler<System.Speech.Recognition.RecognizerUpdateReachedEventArgs>)", "summary", "df-generated"]
+      - ["System.Speech.Recognition", "SpeechRecognizer", "add_SpeechDetected", "(System.EventHandler<System.Speech.Recognition.SpeechDetectedEventArgs>)", "summary", "df-generated"]
+      - ["System.Speech.Recognition", "SpeechRecognizer", "add_SpeechHypothesized", "(System.EventHandler<System.Speech.Recognition.SpeechHypothesizedEventArgs>)", "summary", "df-generated"]
+      - ["System.Speech.Recognition", "SpeechRecognizer", "add_SpeechRecognitionRejected", "(System.EventHandler<System.Speech.Recognition.SpeechRecognitionRejectedEventArgs>)", "summary", "df-generated"]
+      - ["System.Speech.Recognition", "SpeechRecognizer", "add_SpeechRecognized", "(System.EventHandler<System.Speech.Recognition.SpeechRecognizedEventArgs>)", "summary", "df-generated"]
+      - ["System.Speech.Recognition", "SpeechRecognizer", "add_StateChanged", "(System.EventHandler<System.Speech.Recognition.StateChangedEventArgs>)", "summary", "df-generated"]
       - ["System.Speech.Recognition", "SpeechRecognizer", "get_AudioFormat", "()", "summary", "df-generated"]
       - ["System.Speech.Recognition", "SpeechRecognizer", "get_AudioLevel", "()", "summary", "df-generated"]
       - ["System.Speech.Recognition", "SpeechRecognizer", "get_AudioPosition", "()", "summary", "df-generated"]
@@ -197,5 +232,16 @@ extensions:
       - ["System.Speech.Recognition", "SpeechRecognizer", "get_RecognizerAudioPosition", "()", "summary", "df-generated"]
       - ["System.Speech.Recognition", "SpeechRecognizer", "get_RecognizerInfo", "()", "summary", "df-generated"]
       - ["System.Speech.Recognition", "SpeechRecognizer", "get_State", "()", "summary", "df-generated"]
+      - ["System.Speech.Recognition", "SpeechRecognizer", "remove_AudioLevelUpdated", "(System.EventHandler<System.Speech.Recognition.AudioLevelUpdatedEventArgs>)", "summary", "df-generated"]
+      - ["System.Speech.Recognition", "SpeechRecognizer", "remove_AudioSignalProblemOccurred", "(System.EventHandler<System.Speech.Recognition.AudioSignalProblemOccurredEventArgs>)", "summary", "df-generated"]
+      - ["System.Speech.Recognition", "SpeechRecognizer", "remove_AudioStateChanged", "(System.EventHandler<System.Speech.Recognition.AudioStateChangedEventArgs>)", "summary", "df-generated"]
+      - ["System.Speech.Recognition", "SpeechRecognizer", "remove_EmulateRecognizeCompleted", "(System.EventHandler<System.Speech.Recognition.EmulateRecognizeCompletedEventArgs>)", "summary", "df-generated"]
+      - ["System.Speech.Recognition", "SpeechRecognizer", "remove_LoadGrammarCompleted", "(System.EventHandler<System.Speech.Recognition.LoadGrammarCompletedEventArgs>)", "summary", "df-generated"]
+      - ["System.Speech.Recognition", "SpeechRecognizer", "remove_RecognizerUpdateReached", "(System.EventHandler<System.Speech.Recognition.RecognizerUpdateReachedEventArgs>)", "summary", "df-generated"]
+      - ["System.Speech.Recognition", "SpeechRecognizer", "remove_SpeechDetected", "(System.EventHandler<System.Speech.Recognition.SpeechDetectedEventArgs>)", "summary", "df-generated"]
+      - ["System.Speech.Recognition", "SpeechRecognizer", "remove_SpeechHypothesized", "(System.EventHandler<System.Speech.Recognition.SpeechHypothesizedEventArgs>)", "summary", "df-generated"]
+      - ["System.Speech.Recognition", "SpeechRecognizer", "remove_SpeechRecognitionRejected", "(System.EventHandler<System.Speech.Recognition.SpeechRecognitionRejectedEventArgs>)", "summary", "df-generated"]
+      - ["System.Speech.Recognition", "SpeechRecognizer", "remove_SpeechRecognized", "(System.EventHandler<System.Speech.Recognition.SpeechRecognizedEventArgs>)", "summary", "df-generated"]
+      - ["System.Speech.Recognition", "SpeechRecognizer", "remove_StateChanged", "(System.EventHandler<System.Speech.Recognition.StateChangedEventArgs>)", "summary", "df-generated"]
       - ["System.Speech.Recognition", "SpeechUI", "SendTextFeedback", "(System.Speech.Recognition.RecognitionResult,System.String,System.Boolean)", "summary", "df-generated"]
       - ["System.Speech.Recognition", "StateChangedEventArgs", "get_RecognizerState", "()", "summary", "df-generated"]
diff --git a/csharp/ql/lib/ext/generated/System.Speech.Synthesis.model.yml b/csharp/ql/lib/ext/generated/System.Speech.Synthesis.model.yml
index 5c8a51bfb73..4f0421c4450 100644
--- a/csharp/ql/lib/ext/generated/System.Speech.Synthesis.model.yml
+++ b/csharp/ql/lib/ext/generated/System.Speech.Synthesis.model.yml
@@ -96,8 +96,24 @@ extensions:
       - ["System.Speech.Synthesis", "SpeechSynthesizer", "SpeakAsyncCancelAll", "()", "summary", "df-generated"]
       - ["System.Speech.Synthesis", "SpeechSynthesizer", "SpeakSsml", "(System.String)", "summary", "df-generated"]
       - ["System.Speech.Synthesis", "SpeechSynthesizer", "SpeakSsmlAsync", "(System.String)", "summary", "df-generated"]
+      - ["System.Speech.Synthesis", "SpeechSynthesizer", "add_BookmarkReached", "(System.EventHandler<System.Speech.Synthesis.BookmarkReachedEventArgs>)", "summary", "df-generated"]
+      - ["System.Speech.Synthesis", "SpeechSynthesizer", "add_PhonemeReached", "(System.EventHandler<System.Speech.Synthesis.PhonemeReachedEventArgs>)", "summary", "df-generated"]
+      - ["System.Speech.Synthesis", "SpeechSynthesizer", "add_SpeakCompleted", "(System.EventHandler<System.Speech.Synthesis.SpeakCompletedEventArgs>)", "summary", "df-generated"]
+      - ["System.Speech.Synthesis", "SpeechSynthesizer", "add_SpeakProgress", "(System.EventHandler<System.Speech.Synthesis.SpeakProgressEventArgs>)", "summary", "df-generated"]
+      - ["System.Speech.Synthesis", "SpeechSynthesizer", "add_SpeakStarted", "(System.EventHandler<System.Speech.Synthesis.SpeakStartedEventArgs>)", "summary", "df-generated"]
+      - ["System.Speech.Synthesis", "SpeechSynthesizer", "add_StateChanged", "(System.EventHandler<System.Speech.Synthesis.StateChangedEventArgs>)", "summary", "df-generated"]
+      - ["System.Speech.Synthesis", "SpeechSynthesizer", "add_VisemeReached", "(System.EventHandler<System.Speech.Synthesis.VisemeReachedEventArgs>)", "summary", "df-generated"]
+      - ["System.Speech.Synthesis", "SpeechSynthesizer", "add_VoiceChange", "(System.EventHandler<System.Speech.Synthesis.VoiceChangeEventArgs>)", "summary", "df-generated"]
       - ["System.Speech.Synthesis", "SpeechSynthesizer", "get_State", "()", "summary", "df-generated"]
       - ["System.Speech.Synthesis", "SpeechSynthesizer", "get_Voice", "()", "summary", "df-generated"]
+      - ["System.Speech.Synthesis", "SpeechSynthesizer", "remove_BookmarkReached", "(System.EventHandler<System.Speech.Synthesis.BookmarkReachedEventArgs>)", "summary", "df-generated"]
+      - ["System.Speech.Synthesis", "SpeechSynthesizer", "remove_PhonemeReached", "(System.EventHandler<System.Speech.Synthesis.PhonemeReachedEventArgs>)", "summary", "df-generated"]
+      - ["System.Speech.Synthesis", "SpeechSynthesizer", "remove_SpeakCompleted", "(System.EventHandler<System.Speech.Synthesis.SpeakCompletedEventArgs>)", "summary", "df-generated"]
+      - ["System.Speech.Synthesis", "SpeechSynthesizer", "remove_SpeakProgress", "(System.EventHandler<System.Speech.Synthesis.SpeakProgressEventArgs>)", "summary", "df-generated"]
+      - ["System.Speech.Synthesis", "SpeechSynthesizer", "remove_SpeakStarted", "(System.EventHandler<System.Speech.Synthesis.SpeakStartedEventArgs>)", "summary", "df-generated"]
+      - ["System.Speech.Synthesis", "SpeechSynthesizer", "remove_StateChanged", "(System.EventHandler<System.Speech.Synthesis.StateChangedEventArgs>)", "summary", "df-generated"]
+      - ["System.Speech.Synthesis", "SpeechSynthesizer", "remove_VisemeReached", "(System.EventHandler<System.Speech.Synthesis.VisemeReachedEventArgs>)", "summary", "df-generated"]
+      - ["System.Speech.Synthesis", "SpeechSynthesizer", "remove_VoiceChange", "(System.EventHandler<System.Speech.Synthesis.VoiceChangeEventArgs>)", "summary", "df-generated"]
       - ["System.Speech.Synthesis", "StateChangedEventArgs", "get_PreviousState", "()", "summary", "df-generated"]
       - ["System.Speech.Synthesis", "StateChangedEventArgs", "get_State", "()", "summary", "df-generated"]
       - ["System.Speech.Synthesis", "VisemeReachedEventArgs", "get_AudioPosition", "()", "summary", "df-generated"]
diff --git a/csharp/ql/lib/ext/generated/System.Text.Encodings.Web.model.yml b/csharp/ql/lib/ext/generated/System.Text.Encodings.Web.model.yml
index 2f41e287524..7f939b4b250 100644
--- a/csharp/ql/lib/ext/generated/System.Text.Encodings.Web.model.yml
+++ b/csharp/ql/lib/ext/generated/System.Text.Encodings.Web.model.yml
@@ -7,9 +7,9 @@ extensions:
       - ["System.Text.Encodings.Web", "TextEncoder", False, "Encode", "(System.IO.TextWriter,System.String)", "", "Argument[1]", "Argument[0]", "taint", "df-generated"]
       - ["System.Text.Encodings.Web", "TextEncoder", True, "Encode", "(System.IO.TextWriter,System.Char[],System.Int32,System.Int32)", "", "Argument[1].Element", "Argument[0]", "taint", "df-generated"]
       - ["System.Text.Encodings.Web", "TextEncoder", True, "Encode", "(System.IO.TextWriter,System.String,System.Int32,System.Int32)", "", "Argument[1]", "Argument[0]", "taint", "df-generated"]
-      - ["System.Text.Encodings.Web", "TextEncoder", True, "Encode", "(System.ReadOnlySpan<System.Char>,System.Span<System.Char>,System.Int32,System.Int32,System.Boolean)", "", "Argument[0]", "Argument[1]", "taint", "df-generated"]
-      - ["System.Text.Encodings.Web", "TextEncoder", True, "Encode", "(System.String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Text.Encodings.Web", "TextEncoder", True, "EncodeUtf8", "(System.ReadOnlySpan<System.Byte>,System.Span<System.Byte>,System.Int32,System.Int32,System.Boolean)", "", "Argument[0]", "Argument[1]", "taint", "df-generated"]
+      - ["System.Text.Encodings.Web", "TextEncoder", True, "Encode", "(System.ReadOnlySpan<System.Char>,System.Span<System.Char>,System.Int32,System.Int32,System.Boolean)", "", "Argument[0].Element", "Argument[1].Element", "value", "dfc-generated"]
+      - ["System.Text.Encodings.Web", "TextEncoder", True, "Encode", "(System.String)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Text.Encodings.Web", "TextEncoder", True, "EncodeUtf8", "(System.ReadOnlySpan<System.Byte>,System.Span<System.Byte>,System.Int32,System.Int32,System.Boolean)", "", "Argument[0].Element", "Argument[1].Element", "value", "dfc-generated"]
   - addsTo:
       pack: codeql/csharp-all
       extensible: neutralModel
diff --git a/csharp/ql/lib/ext/generated/System.Text.Json.Nodes.model.yml b/csharp/ql/lib/ext/generated/System.Text.Json.Nodes.model.yml
index 80a41f10f09..4941bf404c9 100644
--- a/csharp/ql/lib/ext/generated/System.Text.Json.Nodes.model.yml
+++ b/csharp/ql/lib/ext/generated/System.Text.Json.Nodes.model.yml
@@ -10,18 +10,19 @@ extensions:
       - ["System.Text.Json.Nodes", "JsonArray", False, "GetValues<T>", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Text.Json.Nodes", "JsonArray", False, "JsonArray", "(System.Text.Json.Nodes.JsonNodeOptions,System.Text.Json.Nodes.JsonNode[])", "", "Argument[this]", "Argument[1].Element", "taint", "df-generated"]
       - ["System.Text.Json.Nodes", "JsonArray", False, "JsonArray", "(System.Text.Json.Nodes.JsonNode[])", "", "Argument[this]", "Argument[0].Element", "taint", "df-generated"]
-      - ["System.Text.Json.Nodes", "JsonNode", False, "AsArray", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Text.Json.Nodes", "JsonNode", False, "AsObject", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Text.Json.Nodes", "JsonNode", False, "AsValue", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Text.Json.Nodes", "JsonNode", False, "AsArray", "()", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Text.Json.Nodes", "JsonNode", False, "AsObject", "()", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Text.Json.Nodes", "JsonNode", False, "AsValue", "()", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Text.Json.Nodes", "JsonNode", False, "DeepClone", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Text.Json.Nodes", "JsonNode", False, "Parse", "(System.Text.Json.Utf8JsonReader,System.Nullable<System.Text.Json.Nodes.JsonNodeOptions>)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Text.Json.Nodes", "JsonNode", False, "Parse", "(System.Text.Json.Utf8JsonReader,System.Nullable<System.Text.Json.Nodes.JsonNodeOptions>)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Text.Json.Nodes", "JsonNode", False, "ReplaceWith<T>", "(T)", "", "Argument[this]", "Argument[0]", "taint", "df-generated"]
       - ["System.Text.Json.Nodes", "JsonNode", False, "ToString", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Text.Json.Nodes", "JsonNode", False, "get_Options", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Text.Json.Nodes", "JsonNode", False, "get_Root", "()", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
       - ["System.Text.Json.Nodes", "JsonNode", True, "GetValue<T>", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Text.Json.Nodes", "JsonObject", False, "Create", "(System.Text.Json.JsonElement,System.Nullable<System.Text.Json.Nodes.JsonNodeOptions>)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Text.Json.Nodes", "JsonObject", False, "JsonObject", "(System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<System.String,System.Text.Json.Nodes.JsonNode>>,System.Nullable<System.Text.Json.Nodes.JsonNodeOptions>)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
+      - ["System.Text.Json.Nodes", "JsonObject", False, "JsonObject", "(System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<System.String,System.Text.Json.Nodes.JsonNode>>,System.Nullable<System.Text.Json.Nodes.JsonNodeOptions>)", "", "Argument[0].Element.Property[System.Collections.Generic.KeyValuePair`2.Key]", "Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Key]", "value", "dfc-generated"]
+      - ["System.Text.Json.Nodes", "JsonObject", False, "JsonObject", "(System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<System.String,System.Text.Json.Nodes.JsonNode>>,System.Nullable<System.Text.Json.Nodes.JsonNodeOptions>)", "", "Argument[0].Element.Property[System.Collections.Generic.KeyValuePair`2.Value]", "Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Value]", "value", "dfc-generated"]
       - ["System.Text.Json.Nodes", "JsonObject", False, "TryGetPropertyValue", "(System.String,System.Text.Json.Nodes.JsonNode)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Text.Json.Nodes", "JsonObject", False, "TryGetValue", "(System.String,System.Text.Json.Nodes.JsonNode)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Text.Json.Nodes", "JsonValue", False, "Create<T>", "(T,System.Text.Json.Serialization.Metadata.JsonTypeInfo<T>,System.Nullable<System.Text.Json.Nodes.JsonNodeOptions>)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
diff --git a/csharp/ql/lib/ext/generated/System.Text.Json.Serialization.Metadata.model.yml b/csharp/ql/lib/ext/generated/System.Text.Json.Serialization.Metadata.model.yml
index 9bdfa5d2672..faaaff0bdfd 100644
--- a/csharp/ql/lib/ext/generated/System.Text.Json.Serialization.Metadata.model.yml
+++ b/csharp/ql/lib/ext/generated/System.Text.Json.Serialization.Metadata.model.yml
@@ -44,6 +44,10 @@ extensions:
       - ["System.Text.Json.Serialization.Metadata", "JsonDerivedType", "JsonDerivedType", "(System.Type,System.String)", "summary", "df-generated"]
       - ["System.Text.Json.Serialization.Metadata", "JsonDerivedType", "get_DerivedType", "()", "summary", "df-generated"]
       - ["System.Text.Json.Serialization.Metadata", "JsonDerivedType", "get_TypeDiscriminator", "()", "summary", "df-generated"]
+      - ["System.Text.Json.Serialization.Metadata", "JsonMetadataServices", "CreateImmutableDictionaryInfo<TCollection,TKey,TValue>", "(System.Text.Json.JsonSerializerOptions,System.Text.Json.Serialization.Metadata.JsonCollectionInfoValues<TCollection>,System.Func<System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<TKey,TValue>>,TCollection>)", "summary", "df-generated"]
+      - ["System.Text.Json.Serialization.Metadata", "JsonMetadataServices", "CreateImmutableEnumerableInfo<TCollection,TElement>", "(System.Text.Json.JsonSerializerOptions,System.Text.Json.Serialization.Metadata.JsonCollectionInfoValues<TCollection>,System.Func<System.Collections.Generic.IEnumerable<TElement>,TCollection>)", "summary", "df-generated"]
+      - ["System.Text.Json.Serialization.Metadata", "JsonMetadataServices", "CreateQueueInfo<TCollection>", "(System.Text.Json.JsonSerializerOptions,System.Text.Json.Serialization.Metadata.JsonCollectionInfoValues<TCollection>,System.Action<TCollection,System.Object>)", "summary", "df-generated"]
+      - ["System.Text.Json.Serialization.Metadata", "JsonMetadataServices", "CreateStackInfo<TCollection>", "(System.Text.Json.JsonSerializerOptions,System.Text.Json.Serialization.Metadata.JsonCollectionInfoValues<TCollection>,System.Action<TCollection,System.Object>)", "summary", "df-generated"]
       - ["System.Text.Json.Serialization.Metadata", "JsonMetadataServices", "GetEnumConverter<T>", "(System.Text.Json.JsonSerializerOptions)", "summary", "df-generated"]
       - ["System.Text.Json.Serialization.Metadata", "JsonMetadataServices", "GetNullableConverter<T>", "(System.Text.Json.JsonSerializerOptions)", "summary", "df-generated"]
       - ["System.Text.Json.Serialization.Metadata", "JsonMetadataServices", "GetUnsupportedTypeConverter<T>", "()", "summary", "df-generated"]
@@ -86,3 +90,4 @@ extensions:
       - ["System.Text.Json.Serialization.Metadata", "JsonPropertyInfo", "get_PropertyType", "()", "summary", "df-generated"]
       - ["System.Text.Json.Serialization.Metadata", "JsonTypeInfo", "MakeReadOnly", "()", "summary", "df-generated"]
       - ["System.Text.Json.Serialization.Metadata", "JsonTypeInfo", "get_Converter", "()", "summary", "df-generated"]
+      - ["System.Text.Json.Serialization.Metadata", "JsonTypeInfoResolver", "WithAddedModifier", "(System.Text.Json.Serialization.Metadata.IJsonTypeInfoResolver,System.Action<System.Text.Json.Serialization.Metadata.JsonTypeInfo>)", "summary", "df-generated"]
diff --git a/csharp/ql/lib/ext/generated/System.Text.Json.Serialization.model.yml b/csharp/ql/lib/ext/generated/System.Text.Json.Serialization.model.yml
index ea389df05e2..c2b0c857367 100644
--- a/csharp/ql/lib/ext/generated/System.Text.Json.Serialization.model.yml
+++ b/csharp/ql/lib/ext/generated/System.Text.Json.Serialization.model.yml
@@ -4,18 +4,17 @@ extensions:
       pack: codeql/csharp-all
       extensible: summaryModel
     data:
-      - ["System.Text.Json.Serialization", "JsonConverter<T>", True, "ReadAsPropertyName", "(System.Text.Json.Utf8JsonReader,System.Type,System.Text.Json.JsonSerializerOptions)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Text.Json.Serialization", "BinaryDataJsonConverter", False, "Read", "(System.Text.Json.Utf8JsonReader,System.Type,System.Text.Json.JsonSerializerOptions)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Text.Json.Serialization", "JsonConverter<T>", True, "ReadAsPropertyName", "(System.Text.Json.Utf8JsonReader,System.Type,System.Text.Json.JsonSerializerOptions)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Text.Json.Serialization", "JsonConverterFactory", True, "CreateConverter", "(System.Type,System.Text.Json.JsonSerializerOptions)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Text.Json.Serialization", "JsonSerializerContext", False, "JsonSerializerContext", "(System.Text.Json.JsonSerializerOptions)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Text.Json.Serialization", "JsonSerializerContext", False, "JsonSerializerContext", "(System.Text.Json.JsonSerializerOptions)", "", "Argument[this]", "Argument[0]", "taint", "df-generated"]
-      - ["System.Text.Json.Serialization", "JsonSerializerContext", False, "get_Options", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Text.Json.Serialization", "JsonSerializerContext", False, "JsonSerializerContext", "(System.Text.Json.JsonSerializerOptions)", "", "Argument[0]", "Argument[this].SyntheticField[System.Text.Json.Serialization.JsonSerializerContext._options]", "value", "dfc-generated"]
+      - ["System.Text.Json.Serialization", "JsonSerializerContext", False, "get_Options", "()", "", "Argument[this].SyntheticField[System.Text.Json.Serialization.JsonSerializerContext._options]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Text.Json.Serialization", "JsonStringEnumConverter", False, "JsonStringEnumConverter", "(System.Text.Json.JsonNamingPolicy,System.Boolean)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Text.Json.Serialization", "JsonStringEnumConverter<TEnum>", False, "JsonStringEnumConverter", "(System.Text.Json.JsonNamingPolicy,System.Boolean)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
   - addsTo:
       pack: codeql/csharp-all
       extensible: neutralModel
     data:
-      - ["System.Text.Json.Serialization", "BinaryDataJsonConverter", "Read", "(System.Text.Json.Utf8JsonReader,System.Type,System.Text.Json.JsonSerializerOptions)", "summary", "df-generated"]
       - ["System.Text.Json.Serialization", "BinaryDataJsonConverter", "Write", "(System.Text.Json.Utf8JsonWriter,System.BinaryData,System.Text.Json.JsonSerializerOptions)", "summary", "df-generated"]
       - ["System.Text.Json.Serialization", "IJsonOnDeserialized", "OnDeserialized", "()", "summary", "df-generated"]
       - ["System.Text.Json.Serialization", "IJsonOnDeserializing", "OnDeserializing", "()", "summary", "df-generated"]
diff --git a/csharp/ql/lib/ext/generated/System.Text.Json.SourceGeneration.model.yml b/csharp/ql/lib/ext/generated/System.Text.Json.SourceGeneration.model.yml
index eace622cbdf..1b537148b86 100644
--- a/csharp/ql/lib/ext/generated/System.Text.Json.SourceGeneration.model.yml
+++ b/csharp/ql/lib/ext/generated/System.Text.Json.SourceGeneration.model.yml
@@ -4,7 +4,7 @@ extensions:
       pack: codeql/csharp-all
       extensible: summaryModel
     data:
-      - ["System.Text.Json.SourceGeneration", "SourceGenerationOptionsSpec", False, "GetEffectivePropertyNamingPolicy", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Text.Json.SourceGeneration", "SourceGenerationOptionsSpec", False, "GetEffectivePropertyNamingPolicy", "()", "", "Argument[this].Property[System.Text.Json.SourceGeneration.SourceGenerationOptionsSpec.PropertyNamingPolicy]", "ReturnValue", "value", "dfc-generated"]
   - addsTo:
       pack: codeql/csharp-all
       extensible: neutralModel
diff --git a/csharp/ql/lib/ext/generated/System.Text.Json.model.yml b/csharp/ql/lib/ext/generated/System.Text.Json.model.yml
index 2c6cb9f0e3d..527d46fd4a5 100644
--- a/csharp/ql/lib/ext/generated/System.Text.Json.model.yml
+++ b/csharp/ql/lib/ext/generated/System.Text.Json.model.yml
@@ -5,69 +5,84 @@ extensions:
       extensible: summaryModel
     data:
       - ["System.Text.Json", "JsonDocument", False, "Parse", "(System.Buffers.ReadOnlySequence<System.Byte>,System.Text.Json.JsonDocumentOptions)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Text.Json", "JsonDocument", False, "Parse", "(System.IO.Stream,System.Text.Json.JsonDocumentOptions)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["System.Text.Json", "JsonDocument", False, "Parse", "(System.ReadOnlyMemory<System.Byte>,System.Text.Json.JsonDocumentOptions)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Text.Json", "JsonDocument", False, "ParseValue", "(System.Text.Json.Utf8JsonReader)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Text.Json", "JsonDocument", False, "TryParseValue", "(System.Text.Json.Utf8JsonReader,System.Text.Json.JsonDocument)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Text.Json", "JsonDocument", False, "ParseValue", "(System.Text.Json.Utf8JsonReader)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Text.Json", "JsonDocument", False, "TryParseValue", "(System.Text.Json.Utf8JsonReader,System.Text.Json.JsonDocument)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Text.Json", "JsonDocument", False, "get_RootElement", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Text.Json", "JsonElement+ArrayEnumerator", False, "GetEnumerator", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Text.Json", "JsonElement+ArrayEnumerator", False, "GetEnumerator", "()", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Text.Json", "JsonElement+ArrayEnumerator", False, "get_Current", "()", "", "Argument[this].Property[System.Text.Json.JsonElement+ArrayEnumerator.Current]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Text.Json", "JsonElement+ArrayEnumerator", False, "get_Current", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Text.Json", "JsonElement+ObjectEnumerator", False, "GetEnumerator", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Text.Json", "JsonElement", False, "Clone", "()", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["System.Text.Json", "JsonElement+ObjectEnumerator", False, "GetEnumerator", "()", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Text.Json", "JsonElement+ObjectEnumerator", False, "get_Current", "()", "", "Argument[this].Property[System.Text.Json.JsonElement+ObjectEnumerator.Current]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Text.Json", "JsonElement", False, "Clone", "()", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Text.Json", "JsonElement", False, "EnumerateArray", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Text.Json", "JsonElement", False, "EnumerateObject", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Text.Json", "JsonElement", False, "GetProperty", "(System.ReadOnlySpan<System.Byte>)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Text.Json", "JsonElement", False, "GetProperty", "(System.ReadOnlySpan<System.Char>)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Text.Json", "JsonElement", False, "GetProperty", "(System.String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Text.Json", "JsonElement", False, "ParseValue", "(System.Text.Json.Utf8JsonReader)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Text.Json", "JsonElement", False, "ParseValue", "(System.Text.Json.Utf8JsonReader)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Text.Json", "JsonElement", False, "TryGetProperty", "(System.ReadOnlySpan<System.Byte>,System.Text.Json.JsonElement)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Text.Json", "JsonElement", False, "TryGetProperty", "(System.ReadOnlySpan<System.Char>,System.Text.Json.JsonElement)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Text.Json", "JsonElement", False, "TryGetProperty", "(System.String,System.Text.Json.JsonElement)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Text.Json", "JsonElement", False, "TryParseValue", "(System.Text.Json.Utf8JsonReader,System.Nullable<System.Text.Json.JsonElement>)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Text.Json", "JsonElement", False, "TryParseValue", "(System.Text.Json.Utf8JsonReader,System.Nullable<System.Text.Json.JsonElement>)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Text.Json", "JsonElement", False, "get_Item", "(System.Int32)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Text.Json", "JsonEncodedText", False, "Encode", "(System.ReadOnlySpan<System.Byte>,System.Text.Encodings.Web.JavaScriptEncoder)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["System.Text.Json", "JsonEncodedText", False, "ToString", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Text.Json", "JsonEncodedText", False, "get_EncodedUtf8Bytes", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Text.Json", "JsonEncodedText", False, "get_Value", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Text.Json", "JsonException", False, "JsonException", "(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Text.Json", "JsonException", False, "JsonException", "(System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Text.Json", "JsonException", False, "JsonException", "(System.String,System.Exception)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Text.Json", "JsonException", False, "JsonException", "(System.String,System.String,System.Nullable<System.Int64>,System.Nullable<System.Int64>)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Text.Json", "JsonException", False, "JsonException", "(System.String,System.String,System.Nullable<System.Int64>,System.Nullable<System.Int64>,System.Exception)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Text.Json", "JsonNamingPolicy", True, "ConvertName", "(System.String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Text.Json", "JsonException", False, "JsonException", "(System.String)", "", "Argument[0]", "Argument[this].SyntheticField[System.Text.Json.JsonException._message]", "value", "dfc-generated"]
+      - ["System.Text.Json", "JsonException", False, "JsonException", "(System.String,System.Exception)", "", "Argument[0]", "Argument[this].SyntheticField[System.Text.Json.JsonException._message]", "value", "dfc-generated"]
+      - ["System.Text.Json", "JsonException", False, "JsonException", "(System.String,System.String,System.Nullable<System.Int64>,System.Nullable<System.Int64>)", "", "Argument[0]", "Argument[this].SyntheticField[System.Text.Json.JsonException._message]", "value", "dfc-generated"]
+      - ["System.Text.Json", "JsonException", False, "JsonException", "(System.String,System.String,System.Nullable<System.Int64>,System.Nullable<System.Int64>,System.Exception)", "", "Argument[0]", "Argument[this].SyntheticField[System.Text.Json.JsonException._message]", "value", "dfc-generated"]
+      - ["System.Text.Json", "JsonException", True, "get_Message", "()", "", "Argument[this].Property[System.Exception.Message]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Text.Json", "JsonException", True, "get_Message", "()", "", "Argument[this].SyntheticField[System.Text.Json.JsonException._message]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Text.Json", "JsonNamingPolicy", True, "ConvertName", "(System.String)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Text.Json", "JsonProperty", False, "get_Name", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Text.Json", "JsonReaderState", False, "JsonReaderState", "(System.Text.Json.JsonReaderOptions)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Text.Json", "JsonReaderState", False, "get_Options", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Text.Json", "JsonSerializer", False, "Deserialize", "(System.Text.Json.Utf8JsonReader,System.Text.Json.Serialization.Metadata.JsonTypeInfo)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Text.Json", "JsonSerializer", False, "Deserialize", "(System.Text.Json.Utf8JsonReader,System.Type,System.Text.Json.JsonSerializerOptions)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Text.Json", "JsonSerializer", False, "Deserialize", "(System.Text.Json.Utf8JsonReader,System.Type,System.Text.Json.Serialization.JsonSerializerContext)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Text.Json", "JsonSerializer", False, "Deserialize<TValue>", "(System.Text.Json.Utf8JsonReader,System.Text.Json.JsonSerializerOptions)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Text.Json", "JsonSerializer", False, "Deserialize<TValue>", "(System.Text.Json.Utf8JsonReader,System.Text.Json.Serialization.Metadata.JsonTypeInfo<TValue>)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Text.Json", "JsonReaderState", False, "JsonReaderState", "(System.Text.Json.JsonReaderOptions)", "", "Argument[0]", "Argument[this].SyntheticField[System.Text.Json.JsonReaderState._readerOptions]", "value", "dfc-generated"]
+      - ["System.Text.Json", "JsonReaderState", False, "get_Options", "()", "", "Argument[this].SyntheticField[System.Text.Json.JsonReaderState._readerOptions]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Text.Json", "JsonSerializer", False, "Deserialize", "(System.Text.Json.Utf8JsonReader,System.Text.Json.Serialization.Metadata.JsonTypeInfo)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Text.Json", "JsonSerializer", False, "Deserialize", "(System.Text.Json.Utf8JsonReader,System.Type,System.Text.Json.JsonSerializerOptions)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Text.Json", "JsonSerializer", False, "Deserialize", "(System.Text.Json.Utf8JsonReader,System.Type,System.Text.Json.Serialization.JsonSerializerContext)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Text.Json", "JsonSerializer", False, "Deserialize<TValue>", "(System.Text.Json.Utf8JsonReader,System.Text.Json.JsonSerializerOptions)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Text.Json", "JsonSerializer", False, "Deserialize<TValue>", "(System.Text.Json.Utf8JsonReader,System.Text.Json.Serialization.Metadata.JsonTypeInfo<TValue>)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Text.Json", "JsonSerializer", False, "Serialize", "(System.IO.Stream,System.Object,System.Text.Json.Serialization.Metadata.JsonTypeInfo)", "", "Argument[1]", "Argument[2]", "taint", "df-generated"]
+      - ["System.Text.Json", "JsonSerializer", False, "Serialize", "(System.Object,System.Text.Json.Serialization.Metadata.JsonTypeInfo)", "", "Argument[0]", "Argument[1]", "taint", "df-generated"]
+      - ["System.Text.Json", "JsonSerializer", False, "Serialize", "(System.Text.Json.Utf8JsonWriter,System.Object,System.Text.Json.Serialization.Metadata.JsonTypeInfo)", "", "Argument[0]", "Argument[2]", "taint", "df-generated"]
+      - ["System.Text.Json", "JsonSerializer", False, "Serialize", "(System.Text.Json.Utf8JsonWriter,System.Object,System.Text.Json.Serialization.Metadata.JsonTypeInfo)", "", "Argument[1]", "Argument[2]", "taint", "df-generated"]
+      - ["System.Text.Json", "JsonSerializer", False, "Serialize<TValue>", "(System.IO.Stream,TValue,System.Text.Json.Serialization.Metadata.JsonTypeInfo<TValue>)", "", "Argument[1]", "Argument[2]", "taint", "df-generated"]
+      - ["System.Text.Json", "JsonSerializer", False, "Serialize<TValue>", "(System.Text.Json.Utf8JsonWriter,TValue,System.Text.Json.Serialization.Metadata.JsonTypeInfo<TValue>)", "", "Argument[0]", "Argument[2]", "taint", "df-generated"]
+      - ["System.Text.Json", "JsonSerializer", False, "Serialize<TValue>", "(System.Text.Json.Utf8JsonWriter,TValue,System.Text.Json.Serialization.Metadata.JsonTypeInfo<TValue>)", "", "Argument[1]", "Argument[2]", "taint", "df-generated"]
+      - ["System.Text.Json", "JsonSerializer", False, "Serialize<TValue>", "(TValue,System.Text.Json.Serialization.Metadata.JsonTypeInfo<TValue>)", "", "Argument[0]", "Argument[1]", "taint", "df-generated"]
+      - ["System.Text.Json", "JsonSerializer", False, "SerializeAsync", "(System.IO.Stream,System.Object,System.Text.Json.Serialization.Metadata.JsonTypeInfo,System.Threading.CancellationToken)", "", "Argument[1]", "Argument[2]", "taint", "df-generated"]
+      - ["System.Text.Json", "JsonSerializer", False, "SerializeAsync<TValue>", "(System.IO.Stream,TValue,System.Text.Json.Serialization.Metadata.JsonTypeInfo<TValue>,System.Threading.CancellationToken)", "", "Argument[1]", "Argument[2]", "taint", "df-generated"]
+      - ["System.Text.Json", "JsonSerializer", False, "SerializeToDocument", "(System.Object,System.Text.Json.Serialization.Metadata.JsonTypeInfo)", "", "Argument[0]", "Argument[1]", "taint", "df-generated"]
+      - ["System.Text.Json", "JsonSerializer", False, "SerializeToDocument<TValue>", "(TValue,System.Text.Json.Serialization.Metadata.JsonTypeInfo<TValue>)", "", "Argument[0]", "Argument[1]", "taint", "df-generated"]
+      - ["System.Text.Json", "JsonSerializer", False, "SerializeToElement", "(System.Object,System.Text.Json.Serialization.Metadata.JsonTypeInfo)", "", "Argument[0]", "Argument[1]", "taint", "df-generated"]
+      - ["System.Text.Json", "JsonSerializer", False, "SerializeToElement<TValue>", "(TValue,System.Text.Json.Serialization.Metadata.JsonTypeInfo<TValue>)", "", "Argument[0]", "Argument[1]", "taint", "df-generated"]
+      - ["System.Text.Json", "JsonSerializer", False, "SerializeToNode", "(System.Object,System.Text.Json.Serialization.Metadata.JsonTypeInfo)", "", "Argument[0]", "Argument[1]", "taint", "df-generated"]
+      - ["System.Text.Json", "JsonSerializer", False, "SerializeToNode<TValue>", "(TValue,System.Text.Json.Serialization.Metadata.JsonTypeInfo<TValue>)", "", "Argument[0]", "Argument[1]", "taint", "df-generated"]
+      - ["System.Text.Json", "JsonSerializer", False, "SerializeToUtf8Bytes", "(System.Object,System.Text.Json.Serialization.Metadata.JsonTypeInfo)", "", "Argument[0]", "Argument[1]", "taint", "df-generated"]
+      - ["System.Text.Json", "JsonSerializer", False, "SerializeToUtf8Bytes<TValue>", "(TValue,System.Text.Json.Serialization.Metadata.JsonTypeInfo<TValue>)", "", "Argument[0]", "Argument[1]", "taint", "df-generated"]
       - ["System.Text.Json", "JsonSerializerOptions", False, "GetConverter", "(System.Type)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Text.Json", "JsonSerializerOptions", False, "GetTypeInfo", "(System.Type)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Text.Json", "JsonSerializerOptions", False, "JsonSerializerOptions", "(System.Text.Json.JsonSerializerOptions)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Text.Json", "JsonSerializerOptions", False, "TryGetTypeInfo", "(System.Type,System.Text.Json.Serialization.Metadata.JsonTypeInfo)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Text.Json", "Utf8JsonReader", False, "CopyString", "(System.Span<System.Byte>)", "", "Argument[this]", "Argument[0]", "taint", "df-generated"]
-      - ["System.Text.Json", "Utf8JsonReader", False, "GetComment", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Text.Json", "Utf8JsonReader", False, "GetString", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Text.Json", "Utf8JsonReader", False, "Utf8JsonReader", "(System.Buffers.ReadOnlySequence<System.Byte>,System.Boolean,System.Text.Json.JsonReaderState)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Text.Json", "Utf8JsonReader", False, "Utf8JsonReader", "(System.Buffers.ReadOnlySequence<System.Byte>,System.Boolean,System.Text.Json.JsonReaderState)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Text.Json", "Utf8JsonReader", False, "Utf8JsonReader", "(System.ReadOnlySpan<System.Byte>,System.Boolean,System.Text.Json.JsonReaderState)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Text.Json", "Utf8JsonReader", False, "Utf8JsonReader", "(System.ReadOnlySpan<System.Byte>,System.Boolean,System.Text.Json.JsonReaderState)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Text.Json", "Utf8JsonReader", False, "get_CurrentState", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Text.Json", "Utf8JsonReader", False, "get_Position", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Text.Json", "Utf8JsonReader", False, "CopyString", "(System.Span<System.Byte>)", "", "Argument[this].Property[System.Text.Json.Utf8JsonReader.ValueSpan].Element", "Argument[0].Element", "value", "dfc-generated"]
+      - ["System.Text.Json", "Utf8JsonReader", False, "GetComment", "()", "", "Argument[this].Property[System.Text.Json.Utf8JsonReader.ValueSpan].Element", "ReturnValue", "taint", "dfc-generated"]
+      - ["System.Text.Json", "Utf8JsonReader", False, "GetString", "()", "", "Argument[this].Property[System.Text.Json.Utf8JsonReader.ValueSpan].Element", "ReturnValue", "taint", "dfc-generated"]
+      - ["System.Text.Json", "Utf8JsonReader", False, "Utf8JsonReader", "(System.Buffers.ReadOnlySequence<System.Byte>,System.Boolean,System.Text.Json.JsonReaderState)", "", "Argument[2].SyntheticField[System.Text.Json.JsonReaderState._readerOptions]", "Argument[this].SyntheticField[System.Text.Json.Utf8JsonReader._readerOptions]", "value", "dfc-generated"]
+      - ["System.Text.Json", "Utf8JsonReader", False, "Utf8JsonReader", "(System.ReadOnlySpan<System.Byte>,System.Boolean,System.Text.Json.JsonReaderState)", "", "Argument[2].SyntheticField[System.Text.Json.JsonReaderState._readerOptions]", "Argument[this].SyntheticField[System.Text.Json.Utf8JsonReader._readerOptions]", "value", "dfc-generated"]
+      - ["System.Text.Json", "Utf8JsonReader", False, "get_CurrentState", "()", "", "Argument[this].SyntheticField[System.Text.Json.Utf8JsonReader._readerOptions]", "ReturnValue.SyntheticField[System.Text.Json.JsonReaderState._readerOptions]", "value", "dfc-generated"]
       - ["System.Text.Json", "Utf8JsonWriter", False, "Reset", "(System.Buffers.IBufferWriter<System.Byte>)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Text.Json", "Utf8JsonWriter", False, "Reset", "(System.IO.Stream)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Text.Json", "Utf8JsonWriter", False, "Utf8JsonWriter", "(System.Buffers.IBufferWriter<System.Byte>,System.Text.Json.JsonWriterOptions)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Text.Json", "Utf8JsonWriter", False, "Utf8JsonWriter", "(System.Buffers.IBufferWriter<System.Byte>,System.Text.Json.JsonWriterOptions)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Text.Json", "Utf8JsonWriter", False, "Utf8JsonWriter", "(System.IO.Stream,System.Text.Json.JsonWriterOptions)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Text.Json", "Utf8JsonWriter", False, "Utf8JsonWriter", "(System.IO.Stream,System.Text.Json.JsonWriterOptions)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Text.Json", "Utf8JsonWriter", False, "get_Options", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Text.Json", "Utf8JsonWriter", False, "Utf8JsonWriter", "(System.Buffers.IBufferWriter<System.Byte>,System.Text.Json.JsonWriterOptions)", "", "Argument[1]", "Argument[this].SyntheticField[System.Text.Json.Utf8JsonWriter._options]", "value", "dfc-generated"]
+      - ["System.Text.Json", "Utf8JsonWriter", False, "Utf8JsonWriter", "(System.IO.Stream,System.Text.Json.JsonWriterOptions)", "", "Argument[1]", "Argument[this].SyntheticField[System.Text.Json.Utf8JsonWriter._options]", "value", "dfc-generated"]
+      - ["System.Text.Json", "Utf8JsonWriter", False, "get_Options", "()", "", "Argument[this].SyntheticField[System.Text.Json.Utf8JsonWriter._options]", "ReturnValue", "value", "dfc-generated"]
   - addsTo:
       pack: codeql/csharp-all
       extensible: neutralModel
     data:
       - ["System.Text.Json", "JsonDocument", "Dispose", "()", "summary", "df-generated"]
+      - ["System.Text.Json", "JsonDocument", "Parse", "(System.IO.Stream,System.Text.Json.JsonDocumentOptions)", "summary", "df-generated"]
       - ["System.Text.Json", "JsonDocument", "Parse", "(System.ReadOnlyMemory<System.Char>,System.Text.Json.JsonDocumentOptions)", "summary", "df-generated"]
       - ["System.Text.Json", "JsonDocument", "Parse", "(System.String,System.Text.Json.JsonDocumentOptions)", "summary", "df-generated"]
       - ["System.Text.Json", "JsonDocument", "ParseAsync", "(System.IO.Stream,System.Text.Json.JsonDocumentOptions,System.Threading.CancellationToken)", "summary", "df-generated"]
@@ -124,6 +139,8 @@ extensions:
       - ["System.Text.Json", "JsonEncodedText", "Equals", "(System.Object)", "summary", "df-generated"]
       - ["System.Text.Json", "JsonEncodedText", "Equals", "(System.Text.Json.JsonEncodedText)", "summary", "df-generated"]
       - ["System.Text.Json", "JsonEncodedText", "GetHashCode", "()", "summary", "df-generated"]
+      - ["System.Text.Json", "JsonEncodedText", "get_EncodedUtf8Bytes", "()", "summary", "df-generated"]
+      - ["System.Text.Json", "JsonException", "JsonException", "(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)", "summary", "df-generated"]
       - ["System.Text.Json", "JsonNamingPolicy", "get_CamelCase", "()", "summary", "df-generated"]
       - ["System.Text.Json", "JsonNamingPolicy", "get_KebabCaseLower", "()", "summary", "df-generated"]
       - ["System.Text.Json", "JsonNamingPolicy", "get_KebabCaseUpper", "()", "summary", "df-generated"]
@@ -177,46 +194,30 @@ extensions:
       - ["System.Text.Json", "JsonSerializer", "DeserializeAsync<TValue>", "(System.IO.Stream,System.Text.Json.Serialization.Metadata.JsonTypeInfo<TValue>,System.Threading.CancellationToken)", "summary", "df-generated"]
       - ["System.Text.Json", "JsonSerializer", "DeserializeAsyncEnumerable<TValue>", "(System.IO.Stream,System.Text.Json.JsonSerializerOptions,System.Threading.CancellationToken)", "summary", "df-generated"]
       - ["System.Text.Json", "JsonSerializer", "DeserializeAsyncEnumerable<TValue>", "(System.IO.Stream,System.Text.Json.Serialization.Metadata.JsonTypeInfo<TValue>,System.Threading.CancellationToken)", "summary", "df-generated"]
-      - ["System.Text.Json", "JsonSerializer", "Serialize", "(System.IO.Stream,System.Object,System.Text.Json.Serialization.Metadata.JsonTypeInfo)", "summary", "df-generated"]
       - ["System.Text.Json", "JsonSerializer", "Serialize", "(System.IO.Stream,System.Object,System.Type,System.Text.Json.JsonSerializerOptions)", "summary", "df-generated"]
       - ["System.Text.Json", "JsonSerializer", "Serialize", "(System.IO.Stream,System.Object,System.Type,System.Text.Json.Serialization.JsonSerializerContext)", "summary", "df-generated"]
-      - ["System.Text.Json", "JsonSerializer", "Serialize", "(System.Object,System.Text.Json.Serialization.Metadata.JsonTypeInfo)", "summary", "df-generated"]
       - ["System.Text.Json", "JsonSerializer", "Serialize", "(System.Object,System.Type,System.Text.Json.JsonSerializerOptions)", "summary", "df-generated"]
       - ["System.Text.Json", "JsonSerializer", "Serialize", "(System.Object,System.Type,System.Text.Json.Serialization.JsonSerializerContext)", "summary", "df-generated"]
-      - ["System.Text.Json", "JsonSerializer", "Serialize", "(System.Text.Json.Utf8JsonWriter,System.Object,System.Text.Json.Serialization.Metadata.JsonTypeInfo)", "summary", "df-generated"]
       - ["System.Text.Json", "JsonSerializer", "Serialize", "(System.Text.Json.Utf8JsonWriter,System.Object,System.Type,System.Text.Json.JsonSerializerOptions)", "summary", "df-generated"]
       - ["System.Text.Json", "JsonSerializer", "Serialize", "(System.Text.Json.Utf8JsonWriter,System.Object,System.Type,System.Text.Json.Serialization.JsonSerializerContext)", "summary", "df-generated"]
       - ["System.Text.Json", "JsonSerializer", "Serialize<TValue>", "(System.IO.Stream,TValue,System.Text.Json.JsonSerializerOptions)", "summary", "df-generated"]
-      - ["System.Text.Json", "JsonSerializer", "Serialize<TValue>", "(System.IO.Stream,TValue,System.Text.Json.Serialization.Metadata.JsonTypeInfo<TValue>)", "summary", "df-generated"]
       - ["System.Text.Json", "JsonSerializer", "Serialize<TValue>", "(System.Text.Json.Utf8JsonWriter,TValue,System.Text.Json.JsonSerializerOptions)", "summary", "df-generated"]
-      - ["System.Text.Json", "JsonSerializer", "Serialize<TValue>", "(System.Text.Json.Utf8JsonWriter,TValue,System.Text.Json.Serialization.Metadata.JsonTypeInfo<TValue>)", "summary", "df-generated"]
       - ["System.Text.Json", "JsonSerializer", "Serialize<TValue>", "(TValue,System.Text.Json.JsonSerializerOptions)", "summary", "df-generated"]
-      - ["System.Text.Json", "JsonSerializer", "Serialize<TValue>", "(TValue,System.Text.Json.Serialization.Metadata.JsonTypeInfo<TValue>)", "summary", "df-generated"]
-      - ["System.Text.Json", "JsonSerializer", "SerializeAsync", "(System.IO.Stream,System.Object,System.Text.Json.Serialization.Metadata.JsonTypeInfo,System.Threading.CancellationToken)", "summary", "df-generated"]
       - ["System.Text.Json", "JsonSerializer", "SerializeAsync", "(System.IO.Stream,System.Object,System.Type,System.Text.Json.JsonSerializerOptions,System.Threading.CancellationToken)", "summary", "df-generated"]
       - ["System.Text.Json", "JsonSerializer", "SerializeAsync", "(System.IO.Stream,System.Object,System.Type,System.Text.Json.Serialization.JsonSerializerContext,System.Threading.CancellationToken)", "summary", "df-generated"]
       - ["System.Text.Json", "JsonSerializer", "SerializeAsync<TValue>", "(System.IO.Stream,TValue,System.Text.Json.JsonSerializerOptions,System.Threading.CancellationToken)", "summary", "df-generated"]
-      - ["System.Text.Json", "JsonSerializer", "SerializeAsync<TValue>", "(System.IO.Stream,TValue,System.Text.Json.Serialization.Metadata.JsonTypeInfo<TValue>,System.Threading.CancellationToken)", "summary", "df-generated"]
-      - ["System.Text.Json", "JsonSerializer", "SerializeToDocument", "(System.Object,System.Text.Json.Serialization.Metadata.JsonTypeInfo)", "summary", "df-generated"]
       - ["System.Text.Json", "JsonSerializer", "SerializeToDocument", "(System.Object,System.Type,System.Text.Json.JsonSerializerOptions)", "summary", "df-generated"]
       - ["System.Text.Json", "JsonSerializer", "SerializeToDocument", "(System.Object,System.Type,System.Text.Json.Serialization.JsonSerializerContext)", "summary", "df-generated"]
       - ["System.Text.Json", "JsonSerializer", "SerializeToDocument<TValue>", "(TValue,System.Text.Json.JsonSerializerOptions)", "summary", "df-generated"]
-      - ["System.Text.Json", "JsonSerializer", "SerializeToDocument<TValue>", "(TValue,System.Text.Json.Serialization.Metadata.JsonTypeInfo<TValue>)", "summary", "df-generated"]
-      - ["System.Text.Json", "JsonSerializer", "SerializeToElement", "(System.Object,System.Text.Json.Serialization.Metadata.JsonTypeInfo)", "summary", "df-generated"]
       - ["System.Text.Json", "JsonSerializer", "SerializeToElement", "(System.Object,System.Type,System.Text.Json.JsonSerializerOptions)", "summary", "df-generated"]
       - ["System.Text.Json", "JsonSerializer", "SerializeToElement", "(System.Object,System.Type,System.Text.Json.Serialization.JsonSerializerContext)", "summary", "df-generated"]
       - ["System.Text.Json", "JsonSerializer", "SerializeToElement<TValue>", "(TValue,System.Text.Json.JsonSerializerOptions)", "summary", "df-generated"]
-      - ["System.Text.Json", "JsonSerializer", "SerializeToElement<TValue>", "(TValue,System.Text.Json.Serialization.Metadata.JsonTypeInfo<TValue>)", "summary", "df-generated"]
-      - ["System.Text.Json", "JsonSerializer", "SerializeToNode", "(System.Object,System.Text.Json.Serialization.Metadata.JsonTypeInfo)", "summary", "df-generated"]
       - ["System.Text.Json", "JsonSerializer", "SerializeToNode", "(System.Object,System.Type,System.Text.Json.JsonSerializerOptions)", "summary", "df-generated"]
       - ["System.Text.Json", "JsonSerializer", "SerializeToNode", "(System.Object,System.Type,System.Text.Json.Serialization.JsonSerializerContext)", "summary", "df-generated"]
       - ["System.Text.Json", "JsonSerializer", "SerializeToNode<TValue>", "(TValue,System.Text.Json.JsonSerializerOptions)", "summary", "df-generated"]
-      - ["System.Text.Json", "JsonSerializer", "SerializeToNode<TValue>", "(TValue,System.Text.Json.Serialization.Metadata.JsonTypeInfo<TValue>)", "summary", "df-generated"]
-      - ["System.Text.Json", "JsonSerializer", "SerializeToUtf8Bytes", "(System.Object,System.Text.Json.Serialization.Metadata.JsonTypeInfo)", "summary", "df-generated"]
       - ["System.Text.Json", "JsonSerializer", "SerializeToUtf8Bytes", "(System.Object,System.Type,System.Text.Json.JsonSerializerOptions)", "summary", "df-generated"]
       - ["System.Text.Json", "JsonSerializer", "SerializeToUtf8Bytes", "(System.Object,System.Type,System.Text.Json.Serialization.JsonSerializerContext)", "summary", "df-generated"]
       - ["System.Text.Json", "JsonSerializer", "SerializeToUtf8Bytes<TValue>", "(TValue,System.Text.Json.JsonSerializerOptions)", "summary", "df-generated"]
-      - ["System.Text.Json", "JsonSerializer", "SerializeToUtf8Bytes<TValue>", "(TValue,System.Text.Json.Serialization.Metadata.JsonTypeInfo<TValue>)", "summary", "df-generated"]
       - ["System.Text.Json", "JsonSerializer", "get_IsReflectionEnabledByDefault", "()", "summary", "df-generated"]
       - ["System.Text.Json", "JsonSerializerOptions", "AddContext<TContext>", "()", "summary", "df-generated"]
       - ["System.Text.Json", "JsonSerializerOptions", "JsonSerializerOptions", "(System.Text.Json.JsonSerializerDefaults)", "summary", "df-generated"]
@@ -270,6 +271,7 @@ extensions:
       - ["System.Text.Json", "Utf8JsonReader", "get_BytesConsumed", "()", "summary", "df-generated"]
       - ["System.Text.Json", "Utf8JsonReader", "get_CurrentDepth", "()", "summary", "df-generated"]
       - ["System.Text.Json", "Utf8JsonReader", "get_IsFinalBlock", "()", "summary", "df-generated"]
+      - ["System.Text.Json", "Utf8JsonReader", "get_Position", "()", "summary", "df-generated"]
       - ["System.Text.Json", "Utf8JsonReader", "get_TokenType", "()", "summary", "df-generated"]
       - ["System.Text.Json", "Utf8JsonWriter", "Dispose", "()", "summary", "df-generated"]
       - ["System.Text.Json", "Utf8JsonWriter", "Flush", "()", "summary", "df-generated"]
diff --git a/csharp/ql/lib/ext/generated/System.Text.RegularExpressions.model.yml b/csharp/ql/lib/ext/generated/System.Text.RegularExpressions.model.yml
index b8ce1145392..31972f8827f 100644
--- a/csharp/ql/lib/ext/generated/System.Text.RegularExpressions.model.yml
+++ b/csharp/ql/lib/ext/generated/System.Text.RegularExpressions.model.yml
@@ -4,17 +4,17 @@ extensions:
       pack: codeql/csharp-all
       extensible: summaryModel
     data:
-      - ["System.Text.RegularExpressions", "Capture", False, "ToString", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Text.RegularExpressions", "Capture", False, "ToString", "()", "", "Argument[this].Property[System.Text.RegularExpressions.Capture.Value]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Text.RegularExpressions", "Capture", False, "get_Value", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Text.RegularExpressions", "GeneratedRegexAttribute", False, "GeneratedRegexAttribute", "(System.String,System.Text.RegularExpressions.RegexOptions,System.Int32,System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Text.RegularExpressions", "GeneratedRegexAttribute", False, "GeneratedRegexAttribute", "(System.String,System.Text.RegularExpressions.RegexOptions,System.Int32,System.String)", "", "Argument[3]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Text.RegularExpressions", "Group", False, "Synchronized", "(System.Text.RegularExpressions.Group)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Text.RegularExpressions", "GroupCollection", False, "TryGetValue", "(System.String,System.Text.RegularExpressions.Group)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Text.RegularExpressions", "GeneratedRegexAttribute", False, "GeneratedRegexAttribute", "(System.String,System.Text.RegularExpressions.RegexOptions,System.Int32,System.String)", "", "Argument[0]", "Argument[this].Property[System.Text.RegularExpressions.GeneratedRegexAttribute.Pattern]", "value", "dfc-generated"]
+      - ["System.Text.RegularExpressions", "GeneratedRegexAttribute", False, "GeneratedRegexAttribute", "(System.String,System.Text.RegularExpressions.RegexOptions,System.Int32,System.String)", "", "Argument[3]", "Argument[this].Property[System.Text.RegularExpressions.GeneratedRegexAttribute.CultureName]", "value", "dfc-generated"]
+      - ["System.Text.RegularExpressions", "Group", False, "Synchronized", "(System.Text.RegularExpressions.Group)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Text.RegularExpressions", "GroupCollection", False, "TryGetValue", "(System.String,System.Text.RegularExpressions.Group)", "", "Argument[this].Element", "ReturnValue", "value", "dfc-generated"]
       - ["System.Text.RegularExpressions", "GroupCollection", False, "get_Keys", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Text.RegularExpressions", "GroupCollection", False, "get_Values", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Text.RegularExpressions", "Match", False, "NextMatch", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Text.RegularExpressions", "Match", False, "Synchronized", "(System.Text.RegularExpressions.Match)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Text.RegularExpressions", "Regex+ValueMatchEnumerator", False, "GetEnumerator", "()", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["System.Text.RegularExpressions", "Match", False, "NextMatch", "()", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Text.RegularExpressions", "Match", False, "Synchronized", "(System.Text.RegularExpressions.Match)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Text.RegularExpressions", "Regex+ValueMatchEnumerator", False, "GetEnumerator", "()", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Text.RegularExpressions", "Regex+ValueMatchEnumerator", False, "get_Current", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Text.RegularExpressions", "Regex", False, "Count", "(System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Text.RegularExpressions", "Regex", False, "EnumerateMatches", "(System.ReadOnlySpan<System.Char>)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
@@ -28,9 +28,8 @@ extensions:
       - ["System.Text.RegularExpressions", "Regex", False, "EnumerateMatches", "(System.ReadOnlySpan<System.Char>,System.String,System.Text.RegularExpressions.RegexOptions,System.TimeSpan)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["System.Text.RegularExpressions", "Regex", False, "EnumerateMatches", "(System.ReadOnlySpan<System.Char>,System.String,System.Text.RegularExpressions.RegexOptions,System.TimeSpan)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
       - ["System.Text.RegularExpressions", "Regex", False, "EnumerateMatches", "(System.ReadOnlySpan<System.Char>,System.String,System.Text.RegularExpressions.RegexOptions,System.TimeSpan)", "", "Argument[3]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Text.RegularExpressions", "Regex", False, "Escape", "(System.String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Text.RegularExpressions", "Regex", False, "GetGroupNames", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Text.RegularExpressions", "Regex", False, "GroupNameFromNumber", "(System.Int32)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Text.RegularExpressions", "Regex", False, "Escape", "(System.String)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Text.RegularExpressions", "Regex", False, "GroupNameFromNumber", "(System.Int32)", "", "Argument[this].Field[System.Text.RegularExpressions.Regex.capslist].Element", "ReturnValue", "value", "dfc-generated"]
       - ["System.Text.RegularExpressions", "Regex", False, "IsMatch", "(System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Text.RegularExpressions", "Regex", False, "IsMatch", "(System.String,System.Int32)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Text.RegularExpressions", "Regex", False, "Match", "(System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
@@ -47,39 +46,36 @@ extensions:
       - ["System.Text.RegularExpressions", "Regex", False, "Matches", "(System.String,System.String,System.Text.RegularExpressions.RegexOptions,System.TimeSpan)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["System.Text.RegularExpressions", "Regex", False, "Matches", "(System.String,System.String,System.Text.RegularExpressions.RegexOptions,System.TimeSpan)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
       - ["System.Text.RegularExpressions", "Regex", False, "Matches", "(System.String,System.String,System.Text.RegularExpressions.RegexOptions,System.TimeSpan)", "", "Argument[3]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Text.RegularExpressions", "Regex", False, "Replace", "(System.String,System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Text.RegularExpressions", "Regex", False, "Replace", "(System.String,System.String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Text.RegularExpressions", "Regex", False, "Replace", "(System.String,System.String,System.Int32)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Text.RegularExpressions", "Regex", False, "Replace", "(System.String,System.String,System.Int32)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Text.RegularExpressions", "Regex", False, "Replace", "(System.String,System.String,System.Int32,System.Int32)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Text.RegularExpressions", "Regex", False, "Replace", "(System.String,System.String,System.Int32,System.Int32)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Text.RegularExpressions", "Regex", False, "Replace", "(System.String,System.String,System.String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Text.RegularExpressions", "Regex", False, "Replace", "(System.String,System.String,System.String,System.Text.RegularExpressions.RegexOptions)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Text.RegularExpressions", "Regex", False, "Replace", "(System.String,System.String,System.String,System.Text.RegularExpressions.RegexOptions,System.TimeSpan)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Text.RegularExpressions", "Regex", False, "Split", "(System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Text.RegularExpressions", "Regex", False, "Split", "(System.String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Text.RegularExpressions", "Regex", False, "Split", "(System.String,System.Int32)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Text.RegularExpressions", "Regex", False, "Split", "(System.String,System.Int32)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Text.RegularExpressions", "Regex", False, "Split", "(System.String,System.Int32,System.Int32)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Text.RegularExpressions", "Regex", False, "Split", "(System.String,System.Int32,System.Int32)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Text.RegularExpressions", "Regex", False, "Split", "(System.String,System.String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Text.RegularExpressions", "Regex", False, "Split", "(System.String,System.String,System.Text.RegularExpressions.RegexOptions)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Text.RegularExpressions", "Regex", False, "Split", "(System.String,System.String,System.Text.RegularExpressions.RegexOptions,System.TimeSpan)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Text.RegularExpressions", "Regex", False, "ToString", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Text.RegularExpressions", "Regex", False, "Unescape", "(System.String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Text.RegularExpressions", "Regex", False, "get_MatchTimeout", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Text.RegularExpressions", "Regex", False, "Replace", "(System.String,System.String)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Text.RegularExpressions", "Regex", False, "Replace", "(System.String,System.String,System.Int32)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Text.RegularExpressions", "Regex", False, "Replace", "(System.String,System.String,System.Int32,System.Int32)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Text.RegularExpressions", "Regex", False, "Replace", "(System.String,System.String,System.String)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Text.RegularExpressions", "Regex", False, "Replace", "(System.String,System.String,System.String,System.Text.RegularExpressions.RegexOptions)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Text.RegularExpressions", "Regex", False, "Replace", "(System.String,System.String,System.String,System.Text.RegularExpressions.RegexOptions,System.TimeSpan)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Text.RegularExpressions", "Regex", False, "Replace", "(System.String,System.String,System.Text.RegularExpressions.MatchEvaluator)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Text.RegularExpressions", "Regex", False, "Replace", "(System.String,System.String,System.Text.RegularExpressions.MatchEvaluator,System.Text.RegularExpressions.RegexOptions)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Text.RegularExpressions", "Regex", False, "Replace", "(System.String,System.String,System.Text.RegularExpressions.MatchEvaluator,System.Text.RegularExpressions.RegexOptions,System.TimeSpan)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Text.RegularExpressions", "Regex", False, "Replace", "(System.String,System.Text.RegularExpressions.MatchEvaluator)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Text.RegularExpressions", "Regex", False, "Replace", "(System.String,System.Text.RegularExpressions.MatchEvaluator,System.Int32)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Text.RegularExpressions", "Regex", False, "Replace", "(System.String,System.Text.RegularExpressions.MatchEvaluator,System.Int32,System.Int32)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Text.RegularExpressions", "Regex", False, "Split", "(System.String)", "", "Argument[0]", "ReturnValue.Element", "value", "dfc-generated"]
+      - ["System.Text.RegularExpressions", "Regex", False, "Split", "(System.String,System.Int32)", "", "Argument[0]", "ReturnValue.Element", "value", "dfc-generated"]
+      - ["System.Text.RegularExpressions", "Regex", False, "Split", "(System.String,System.Int32,System.Int32)", "", "Argument[0]", "ReturnValue.Element", "value", "dfc-generated"]
+      - ["System.Text.RegularExpressions", "Regex", False, "Split", "(System.String,System.String)", "", "Argument[0]", "ReturnValue.Element", "value", "dfc-generated"]
+      - ["System.Text.RegularExpressions", "Regex", False, "Split", "(System.String,System.String,System.Text.RegularExpressions.RegexOptions)", "", "Argument[0]", "ReturnValue.Element", "value", "dfc-generated"]
+      - ["System.Text.RegularExpressions", "Regex", False, "Split", "(System.String,System.String,System.Text.RegularExpressions.RegexOptions,System.TimeSpan)", "", "Argument[0]", "ReturnValue.Element", "value", "dfc-generated"]
+      - ["System.Text.RegularExpressions", "Regex", False, "ToString", "()", "", "Argument[this].Field[System.Text.RegularExpressions.Regex.pattern]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Text.RegularExpressions", "Regex", False, "Unescape", "(System.String)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Text.RegularExpressions", "Regex", False, "get_MatchTimeout", "()", "", "Argument[this].Field[System.Text.RegularExpressions.Regex.internalMatchTimeout]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Text.RegularExpressions", "RegexCompilationInfo", False, "RegexCompilationInfo", "(System.String,System.Text.RegularExpressions.RegexOptions,System.String,System.String,System.Boolean,System.TimeSpan)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Text.RegularExpressions", "RegexCompilationInfo", False, "RegexCompilationInfo", "(System.String,System.Text.RegularExpressions.RegexOptions,System.String,System.String,System.Boolean,System.TimeSpan)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
       - ["System.Text.RegularExpressions", "RegexCompilationInfo", False, "RegexCompilationInfo", "(System.String,System.Text.RegularExpressions.RegexOptions,System.String,System.String,System.Boolean,System.TimeSpan)", "", "Argument[3]", "Argument[this]", "taint", "df-generated"]
       - ["System.Text.RegularExpressions", "RegexCompilationInfo", False, "RegexCompilationInfo", "(System.String,System.Text.RegularExpressions.RegexOptions,System.String,System.String,System.Boolean,System.TimeSpan)", "", "Argument[5]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Text.RegularExpressions", "RegexRunner", False, "Scan", "(System.Text.RegularExpressions.Regex,System.String,System.Int32,System.Int32,System.Int32,System.Int32,System.Boolean)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Text.RegularExpressions", "RegexRunner", False, "Scan", "(System.Text.RegularExpressions.Regex,System.String,System.Int32,System.Int32,System.Int32,System.Int32,System.Boolean)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Text.RegularExpressions", "RegexRunner", False, "Scan", "(System.Text.RegularExpressions.Regex,System.String,System.Int32,System.Int32,System.Int32,System.Int32,System.Boolean)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Text.RegularExpressions", "RegexRunner", False, "Scan", "(System.Text.RegularExpressions.Regex,System.String,System.Int32,System.Int32,System.Int32,System.Int32,System.Boolean)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Text.RegularExpressions", "RegexRunner", False, "Scan", "(System.Text.RegularExpressions.Regex,System.String,System.Int32,System.Int32,System.Int32,System.Int32,System.Boolean,System.TimeSpan)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Text.RegularExpressions", "RegexRunner", False, "Scan", "(System.Text.RegularExpressions.Regex,System.String,System.Int32,System.Int32,System.Int32,System.Int32,System.Boolean,System.TimeSpan)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Text.RegularExpressions", "RegexRunner", False, "Scan", "(System.Text.RegularExpressions.Regex,System.String,System.Int32,System.Int32,System.Int32,System.Int32,System.Boolean,System.TimeSpan)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Text.RegularExpressions", "RegexRunner", False, "Scan", "(System.Text.RegularExpressions.Regex,System.String,System.Int32,System.Int32,System.Int32,System.Int32,System.Boolean,System.TimeSpan)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Text.RegularExpressions", "RegexRunner", False, "Scan", "(System.Text.RegularExpressions.Regex,System.String,System.Int32,System.Int32,System.Int32,System.Int32,System.Boolean)", "", "Argument[1]", "Argument[this].Field[System.Text.RegularExpressions.RegexRunner.runtext]", "value", "dfc-generated"]
+      - ["System.Text.RegularExpressions", "RegexRunner", False, "Scan", "(System.Text.RegularExpressions.Regex,System.String,System.Int32,System.Int32,System.Int32,System.Int32,System.Boolean)", "", "Argument[this].Field[System.Text.RegularExpressions.RegexRunner.runmatch]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Text.RegularExpressions", "RegexRunner", False, "Scan", "(System.Text.RegularExpressions.Regex,System.String,System.Int32,System.Int32,System.Int32,System.Int32,System.Boolean,System.TimeSpan)", "", "Argument[1]", "Argument[this].Field[System.Text.RegularExpressions.RegexRunner.runtext]", "value", "dfc-generated"]
+      - ["System.Text.RegularExpressions", "RegexRunner", False, "Scan", "(System.Text.RegularExpressions.Regex,System.String,System.Int32,System.Int32,System.Int32,System.Int32,System.Boolean,System.TimeSpan)", "", "Argument[this].Field[System.Text.RegularExpressions.RegexRunner.runmatch]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Text.RegularExpressions", "RegexRunner", True, "Scan", "(System.ReadOnlySpan<System.Char>)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Text.RegularExpressions", "RegexRunnerFactory", True, "CreateInstance", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
   - addsTo:
       pack: codeql/csharp-all
@@ -90,6 +86,7 @@ extensions:
       - ["System.Text.RegularExpressions", "CaptureCollection", "Contains", "(System.Text.RegularExpressions.Capture)", "summary", "df-generated"]
       - ["System.Text.RegularExpressions", "CaptureCollection", "IndexOf", "(System.Object)", "summary", "df-generated"]
       - ["System.Text.RegularExpressions", "CaptureCollection", "IndexOf", "(System.Text.RegularExpressions.Capture)", "summary", "df-generated"]
+      - ["System.Text.RegularExpressions", "CaptureCollection", "Remove", "(System.Object)", "summary", "df-generated"]
       - ["System.Text.RegularExpressions", "CaptureCollection", "Remove", "(System.Text.RegularExpressions.Capture)", "summary", "df-generated"]
       - ["System.Text.RegularExpressions", "CaptureCollection", "RemoveAt", "(System.Int32)", "summary", "df-generated"]
       - ["System.Text.RegularExpressions", "CaptureCollection", "get_Count", "()", "summary", "df-generated"]
@@ -112,6 +109,7 @@ extensions:
       - ["System.Text.RegularExpressions", "GroupCollection", "ContainsKey", "(System.String)", "summary", "df-generated"]
       - ["System.Text.RegularExpressions", "GroupCollection", "IndexOf", "(System.Object)", "summary", "df-generated"]
       - ["System.Text.RegularExpressions", "GroupCollection", "IndexOf", "(System.Text.RegularExpressions.Group)", "summary", "df-generated"]
+      - ["System.Text.RegularExpressions", "GroupCollection", "Remove", "(System.Object)", "summary", "df-generated"]
       - ["System.Text.RegularExpressions", "GroupCollection", "Remove", "(System.Text.RegularExpressions.Group)", "summary", "df-generated"]
       - ["System.Text.RegularExpressions", "GroupCollection", "RemoveAt", "(System.Int32)", "summary", "df-generated"]
       - ["System.Text.RegularExpressions", "GroupCollection", "get_Count", "()", "summary", "df-generated"]
@@ -125,6 +123,7 @@ extensions:
       - ["System.Text.RegularExpressions", "MatchCollection", "Contains", "(System.Text.RegularExpressions.Match)", "summary", "df-generated"]
       - ["System.Text.RegularExpressions", "MatchCollection", "IndexOf", "(System.Object)", "summary", "df-generated"]
       - ["System.Text.RegularExpressions", "MatchCollection", "IndexOf", "(System.Text.RegularExpressions.Match)", "summary", "df-generated"]
+      - ["System.Text.RegularExpressions", "MatchCollection", "Remove", "(System.Object)", "summary", "df-generated"]
       - ["System.Text.RegularExpressions", "MatchCollection", "Remove", "(System.Text.RegularExpressions.Match)", "summary", "df-generated"]
       - ["System.Text.RegularExpressions", "MatchCollection", "RemoveAt", "(System.Int32)", "summary", "df-generated"]
       - ["System.Text.RegularExpressions", "MatchCollection", "get_Count", "()", "summary", "df-generated"]
@@ -143,6 +142,7 @@ extensions:
       - ["System.Text.RegularExpressions", "Regex", "Count", "(System.String,System.String)", "summary", "df-generated"]
       - ["System.Text.RegularExpressions", "Regex", "Count", "(System.String,System.String,System.Text.RegularExpressions.RegexOptions)", "summary", "df-generated"]
       - ["System.Text.RegularExpressions", "Regex", "Count", "(System.String,System.String,System.Text.RegularExpressions.RegexOptions,System.TimeSpan)", "summary", "df-generated"]
+      - ["System.Text.RegularExpressions", "Regex", "GetGroupNames", "()", "summary", "df-generated"]
       - ["System.Text.RegularExpressions", "Regex", "GetGroupNumbers", "()", "summary", "df-generated"]
       - ["System.Text.RegularExpressions", "Regex", "GroupNumberFromName", "(System.String)", "summary", "df-generated"]
       - ["System.Text.RegularExpressions", "Regex", "InitializeReferences", "()", "summary", "df-generated"]
@@ -195,7 +195,6 @@ extensions:
       - ["System.Text.RegularExpressions", "RegexRunner", "MatchIndex", "(System.Int32)", "summary", "df-generated"]
       - ["System.Text.RegularExpressions", "RegexRunner", "MatchLength", "(System.Int32)", "summary", "df-generated"]
       - ["System.Text.RegularExpressions", "RegexRunner", "Popcrawl", "()", "summary", "df-generated"]
-      - ["System.Text.RegularExpressions", "RegexRunner", "Scan", "(System.ReadOnlySpan<System.Char>)", "summary", "df-generated"]
       - ["System.Text.RegularExpressions", "RegexRunner", "TransferCapture", "(System.Int32,System.Int32,System.Int32,System.Int32)", "summary", "df-generated"]
       - ["System.Text.RegularExpressions", "RegexRunner", "Uncapture", "()", "summary", "df-generated"]
       - ["System.Text.RegularExpressions", "ValueMatch", "get_Index", "()", "summary", "df-generated"]
diff --git a/csharp/ql/lib/ext/generated/System.Text.Unicode.model.yml b/csharp/ql/lib/ext/generated/System.Text.Unicode.model.yml
index 2f70569ba05..b3ee03ba08c 100644
--- a/csharp/ql/lib/ext/generated/System.Text.Unicode.model.yml
+++ b/csharp/ql/lib/ext/generated/System.Text.Unicode.model.yml
@@ -7,6 +7,8 @@ extensions:
       - ["System.Text.Unicode", "Utf8+TryWriteInterpolatedStringHandler", False, "TryWriteInterpolatedStringHandler", "(System.Int32,System.Int32,System.Span<System.Byte>,System.Boolean)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
       - ["System.Text.Unicode", "Utf8+TryWriteInterpolatedStringHandler", False, "TryWriteInterpolatedStringHandler", "(System.Int32,System.Int32,System.Span<System.Byte>,System.IFormatProvider,System.Boolean)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
       - ["System.Text.Unicode", "Utf8+TryWriteInterpolatedStringHandler", False, "TryWriteInterpolatedStringHandler", "(System.Int32,System.Int32,System.Span<System.Byte>,System.IFormatProvider,System.Boolean)", "", "Argument[3]", "Argument[this]", "taint", "df-generated"]
+      - ["System.Text.Unicode", "Utf8", False, "TryWrite", "(System.Span<System.Byte>,System.IFormatProvider,System.Text.Unicode.Utf8+TryWriteInterpolatedStringHandler,System.Int32)", "", "Argument[2]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Text.Unicode", "Utf8", False, "TryWrite", "(System.Span<System.Byte>,System.Text.Unicode.Utf8+TryWriteInterpolatedStringHandler,System.Int32)", "", "Argument[1]", "ReturnValue", "value", "dfc-generated"]
   - addsTo:
       pack: codeql/csharp-all
       extensible: neutralModel
@@ -190,5 +192,3 @@ extensions:
       - ["System.Text.Unicode", "Utf8", "FromUtf16", "(System.ReadOnlySpan<System.Char>,System.Span<System.Byte>,System.Int32,System.Int32,System.Boolean,System.Boolean)", "summary", "df-generated"]
       - ["System.Text.Unicode", "Utf8", "IsValid", "(System.ReadOnlySpan<System.Byte>)", "summary", "df-generated"]
       - ["System.Text.Unicode", "Utf8", "ToUtf16", "(System.ReadOnlySpan<System.Byte>,System.Span<System.Char>,System.Int32,System.Int32,System.Boolean,System.Boolean)", "summary", "df-generated"]
-      - ["System.Text.Unicode", "Utf8", "TryWrite", "(System.Span<System.Byte>,System.IFormatProvider,System.Text.Unicode.Utf8+TryWriteInterpolatedStringHandler,System.Int32)", "summary", "df-generated"]
-      - ["System.Text.Unicode", "Utf8", "TryWrite", "(System.Span<System.Byte>,System.Text.Unicode.Utf8+TryWriteInterpolatedStringHandler,System.Int32)", "summary", "df-generated"]
diff --git a/csharp/ql/lib/ext/generated/System.Text.model.yml b/csharp/ql/lib/ext/generated/System.Text.model.yml
index 37ed5306f7b..5294b935a05 100644
--- a/csharp/ql/lib/ext/generated/System.Text.model.yml
+++ b/csharp/ql/lib/ext/generated/System.Text.model.yml
@@ -6,15 +6,15 @@ extensions:
     data:
       - ["System.Text", "Decoder", False, "get_FallbackBuffer", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Text", "DecoderFallback", True, "CreateFallbackBuffer", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Text", "DecoderFallbackException", False, "DecoderFallbackException", "(System.String,System.Byte[],System.Int32)", "", "Argument[1].Element", "Argument[this]", "taint", "df-generated"]
-      - ["System.Text", "DecoderFallbackException", False, "get_BytesUnknown", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Text", "DecoderReplacementFallback", False, "DecoderReplacementFallback", "(System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Text", "DecoderReplacementFallback", False, "get_DefaultString", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Text", "DecoderFallbackException", False, "DecoderFallbackException", "(System.String,System.Byte[],System.Int32)", "", "Argument[1]", "Argument[this].SyntheticField[System.Text.DecoderFallbackException._bytesUnknown]", "value", "dfc-generated"]
+      - ["System.Text", "DecoderFallbackException", False, "get_BytesUnknown", "()", "", "Argument[this].SyntheticField[System.Text.DecoderFallbackException._bytesUnknown]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Text", "DecoderReplacementFallback", False, "DecoderReplacementFallback", "(System.String)", "", "Argument[0]", "Argument[this].SyntheticField[System.Text.DecoderReplacementFallback._strDefault]", "value", "dfc-generated"]
+      - ["System.Text", "DecoderReplacementFallback", False, "get_DefaultString", "()", "", "Argument[this].SyntheticField[System.Text.DecoderReplacementFallback._strDefault]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Text", "DecoderReplacementFallbackBuffer", False, "DecoderReplacementFallbackBuffer", "(System.Text.DecoderReplacementFallback)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Text", "Encoder", False, "get_FallbackBuffer", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Text", "EncoderFallback", True, "CreateFallbackBuffer", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Text", "EncoderReplacementFallback", False, "EncoderReplacementFallback", "(System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Text", "EncoderReplacementFallback", False, "get_DefaultString", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Text", "EncoderReplacementFallback", False, "EncoderReplacementFallback", "(System.String)", "", "Argument[0]", "Argument[this].SyntheticField[System.Text.EncoderReplacementFallback._strDefault]", "value", "dfc-generated"]
+      - ["System.Text", "EncoderReplacementFallback", False, "get_DefaultString", "()", "", "Argument[this].SyntheticField[System.Text.EncoderReplacementFallback._strDefault]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Text", "EncoderReplacementFallbackBuffer", False, "EncoderReplacementFallbackBuffer", "(System.Text.EncoderReplacementFallback)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Text", "Encoding", False, "Convert", "(System.Text.Encoding,System.Text.Encoding,System.Byte[])", "", "Argument[2].Element", "ReturnValue", "taint", "df-generated"]
       - ["System.Text", "Encoding", False, "Convert", "(System.Text.Encoding,System.Text.Encoding,System.Byte[],System.Int32,System.Int32)", "", "Argument[2].Element", "ReturnValue", "taint", "df-generated"]
@@ -33,17 +33,19 @@ extensions:
       - ["System.Text", "Encoding", True, "get_EncodingName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Text", "Encoding", True, "get_HeaderName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Text", "Encoding", True, "get_WebName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Text", "EncodingExtensions", False, "GetString", "(System.Text.Encoding,System.Buffers.ReadOnlySequence<System.Byte>)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Text", "EncodingExtensions", False, "RemovePreamble", "(System.Text.Encoding)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Text", "EncodingExtensions", False, "GetString", "(System.Text.Encoding,System.Buffers.ReadOnlySequence<System.Byte>)", "", "Argument[1].Property[System.Buffers.ReadOnlySequence`1.FirstSpan].Element", "ReturnValue", "taint", "dfc-generated"]
+      - ["System.Text", "EncodingExtensions", False, "RemovePreamble", "(System.Text.Encoding)", "", "Argument[0]", "ReturnValue.SyntheticField[System.Text.ConsoleEncoding._encoding]", "value", "dfc-generated"]
+      - ["System.Text", "EncodingExtensions", False, "RemovePreamble", "(System.Text.Encoding)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Text", "EncodingInfo", False, "EncodingInfo", "(System.Text.EncodingProvider,System.Int32,System.String,System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Text", "EncodingProvider", True, "GetEncoding", "(System.Int32,System.Text.EncoderFallback,System.Text.DecoderFallback)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
       - ["System.Text", "EncodingProvider", True, "GetEncoding", "(System.Int32,System.Text.EncoderFallback,System.Text.DecoderFallback)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
       - ["System.Text", "EncodingProvider", True, "GetEncoding", "(System.String,System.Text.EncoderFallback,System.Text.DecoderFallback)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
       - ["System.Text", "EncodingProvider", True, "GetEncoding", "(System.String,System.Text.EncoderFallback,System.Text.DecoderFallback)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Text", "EncodingProvider", True, "GetEncodings", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Text", "SpanLineEnumerator", False, "GetEnumerator", "()", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["System.Text", "SpanLineEnumerator", False, "get_Current", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Text", "SpanRuneEnumerator", False, "GetEnumerator", "()", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["System.Text", "SpanLineEnumerator", False, "GetEnumerator", "()", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Text", "SpanLineEnumerator", False, "MoveNext", "()", "", "Argument[this].SyntheticField[System.Text.SpanLineEnumerator._remaining].Element", "Argument[this].SyntheticField[System.Text.SpanLineEnumerator._current].Element", "value", "dfc-generated"]
+      - ["System.Text", "SpanLineEnumerator", False, "MoveNext", "()", "", "Argument[this].SyntheticField[System.Text.SpanLineEnumerator._remaining]", "Argument[this].SyntheticField[System.Text.SpanLineEnumerator._current]", "value", "dfc-generated"]
+      - ["System.Text", "SpanLineEnumerator", False, "get_Current", "()", "", "Argument[this].SyntheticField[System.Text.SpanLineEnumerator._current]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Text", "SpanRuneEnumerator", False, "GetEnumerator", "()", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Text", "SpanRuneEnumerator", False, "get_Current", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Text", "StringBuilder+AppendInterpolatedStringHandler", False, "AppendFormatted", "(System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Text", "StringBuilder+AppendInterpolatedStringHandler", False, "AppendFormatted<T>", "(T)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
@@ -52,52 +54,43 @@ extensions:
       - ["System.Text", "StringBuilder+AppendInterpolatedStringHandler", False, "AppendInterpolatedStringHandler", "(System.Int32,System.Int32,System.Text.StringBuilder,System.IFormatProvider)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
       - ["System.Text", "StringBuilder+AppendInterpolatedStringHandler", False, "AppendInterpolatedStringHandler", "(System.Int32,System.Int32,System.Text.StringBuilder,System.IFormatProvider)", "", "Argument[3]", "Argument[this]", "taint", "df-generated"]
       - ["System.Text", "StringBuilder+AppendInterpolatedStringHandler", False, "AppendLiteral", "(System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Text", "StringBuilder+ChunkEnumerator", False, "GetEnumerator", "()", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["System.Text", "StringBuilder+ChunkEnumerator", False, "GetEnumerator", "()", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Text", "StringBuilder+ChunkEnumerator", False, "get_Current", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Text", "StringBuilder", False, "AppendFormat", "(System.IFormatProvider,System.Text.CompositeFormat,System.Object[])", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Text", "StringBuilder", False, "AppendFormat", "(System.IFormatProvider,System.Text.CompositeFormat,System.Object[])", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Text", "StringBuilder", False, "AppendFormat", "(System.IFormatProvider,System.Text.CompositeFormat,System.Object[])", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Text", "StringBuilder", False, "AppendFormat", "(System.IFormatProvider,System.Text.CompositeFormat,System.ReadOnlySpan<System.Object>)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Text", "StringBuilder", False, "AppendFormat", "(System.IFormatProvider,System.Text.CompositeFormat,System.ReadOnlySpan<System.Object>)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Text", "StringBuilder", False, "AppendFormat", "(System.IFormatProvider,System.Text.CompositeFormat,System.ReadOnlySpan<System.Object>)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Text", "StringBuilder", False, "AppendFormat<TArg0,TArg1,TArg2>", "(System.IFormatProvider,System.Text.CompositeFormat,TArg0,TArg1,TArg2)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Text", "StringBuilder", False, "AppendFormat<TArg0,TArg1,TArg2>", "(System.IFormatProvider,System.Text.CompositeFormat,TArg0,TArg1,TArg2)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Text", "StringBuilder", False, "AppendFormat<TArg0,TArg1,TArg2>", "(System.IFormatProvider,System.Text.CompositeFormat,TArg0,TArg1,TArg2)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Text", "StringBuilder", False, "AppendFormat<TArg0,TArg1>", "(System.IFormatProvider,System.Text.CompositeFormat,TArg0,TArg1)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Text", "StringBuilder", False, "AppendFormat<TArg0,TArg1>", "(System.IFormatProvider,System.Text.CompositeFormat,TArg0,TArg1)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Text", "StringBuilder", False, "AppendFormat<TArg0,TArg1>", "(System.IFormatProvider,System.Text.CompositeFormat,TArg0,TArg1)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Text", "StringBuilder", False, "AppendFormat<TArg0>", "(System.IFormatProvider,System.Text.CompositeFormat,TArg0)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Text", "StringBuilder", False, "AppendFormat<TArg0>", "(System.IFormatProvider,System.Text.CompositeFormat,TArg0)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Text", "StringBuilder", False, "AppendFormat<TArg0>", "(System.IFormatProvider,System.Text.CompositeFormat,TArg0)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Text", "StringBuilder", False, "Clear", "()", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["System.Text", "StringBuilder", False, "AppendFormat", "(System.IFormatProvider,System.Text.CompositeFormat,System.Object[])", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Text", "StringBuilder", False, "AppendFormat", "(System.IFormatProvider,System.Text.CompositeFormat,System.ReadOnlySpan<System.Object>)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Text", "StringBuilder", False, "AppendFormat<TArg0,TArg1,TArg2>", "(System.IFormatProvider,System.Text.CompositeFormat,TArg0,TArg1,TArg2)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Text", "StringBuilder", False, "AppendFormat<TArg0,TArg1>", "(System.IFormatProvider,System.Text.CompositeFormat,TArg0,TArg1)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Text", "StringBuilder", False, "AppendFormat<TArg0>", "(System.IFormatProvider,System.Text.CompositeFormat,TArg0)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Text", "StringBuilder", False, "Clear", "()", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Text", "StringBuilder", False, "GetChunks", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Text", "StringBuilder", False, "Insert", "(System.Int32,System.Boolean)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Text", "StringBuilder", False, "Insert", "(System.Int32,System.Byte)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Text", "StringBuilder", False, "Insert", "(System.Int32,System.Char)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["System.Text", "StringBuilder", False, "Insert", "(System.Int32,System.Char[])", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["System.Text", "StringBuilder", False, "Insert", "(System.Int32,System.Char[],System.Int32,System.Int32)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["System.Text", "StringBuilder", False, "Insert", "(System.Int32,System.Decimal)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Text", "StringBuilder", False, "Insert", "(System.Int32,System.Double)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Text", "StringBuilder", False, "Insert", "(System.Int32,System.Int16)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Text", "StringBuilder", False, "Insert", "(System.Int32,System.Int32)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Text", "StringBuilder", False, "Insert", "(System.Int32,System.Int64)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Text", "StringBuilder", False, "Insert", "(System.Int32,System.Object)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Text", "StringBuilder", False, "Insert", "(System.Int32,System.ReadOnlySpan<System.Char>)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["System.Text", "StringBuilder", False, "Insert", "(System.Int32,System.SByte)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Text", "StringBuilder", False, "Insert", "(System.Int32,System.Single)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Text", "StringBuilder", False, "Insert", "(System.Int32,System.String)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["System.Text", "StringBuilder", False, "Insert", "(System.Int32,System.String,System.Int32)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Text", "StringBuilder", False, "Insert", "(System.Int32,System.UInt16)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Text", "StringBuilder", False, "Insert", "(System.Int32,System.UInt32)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Text", "StringBuilder", False, "Insert", "(System.Int32,System.UInt64)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Text", "StringBuilder", False, "Remove", "(System.Int32,System.Int32)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["System.Text", "StringBuilder", False, "Replace", "(System.Char,System.Char)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Text", "StringBuilder", False, "Replace", "(System.Char,System.Char,System.Int32,System.Int32)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["System.Text", "StringBuilder", False, "Replace", "(System.ReadOnlySpan<System.Char>,System.ReadOnlySpan<System.Char>)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Text", "StringBuilder", False, "Replace", "(System.ReadOnlySpan<System.Char>,System.ReadOnlySpan<System.Char>,System.Int32,System.Int32)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["System.Text", "StringBuilder", False, "Replace", "(System.String,System.String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Text", "StringBuilder", False, "Replace", "(System.String,System.String,System.Int32,System.Int32)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Text", "StringRuneEnumerator", False, "GetEnumerator", "()", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["System.Text", "StringBuilder", False, "GetObjectData", "(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)", "", "Argument[this]", "Argument[0].SyntheticField[System.Runtime.Serialization.SerializationInfo._values].Element", "taint", "dfc-generated"]
+      - ["System.Text", "StringBuilder", False, "Insert", "(System.Int32,System.Boolean)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Text", "StringBuilder", False, "Insert", "(System.Int32,System.Byte)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Text", "StringBuilder", False, "Insert", "(System.Int32,System.Char)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Text", "StringBuilder", False, "Insert", "(System.Int32,System.Char[])", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Text", "StringBuilder", False, "Insert", "(System.Int32,System.Char[],System.Int32,System.Int32)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Text", "StringBuilder", False, "Insert", "(System.Int32,System.Decimal)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Text", "StringBuilder", False, "Insert", "(System.Int32,System.Double)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Text", "StringBuilder", False, "Insert", "(System.Int32,System.Int16)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Text", "StringBuilder", False, "Insert", "(System.Int32,System.Int32)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Text", "StringBuilder", False, "Insert", "(System.Int32,System.Int64)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Text", "StringBuilder", False, "Insert", "(System.Int32,System.Object)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Text", "StringBuilder", False, "Insert", "(System.Int32,System.ReadOnlySpan<System.Char>)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Text", "StringBuilder", False, "Insert", "(System.Int32,System.SByte)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Text", "StringBuilder", False, "Insert", "(System.Int32,System.Single)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Text", "StringBuilder", False, "Insert", "(System.Int32,System.String)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Text", "StringBuilder", False, "Insert", "(System.Int32,System.String,System.Int32)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Text", "StringBuilder", False, "Insert", "(System.Int32,System.UInt16)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Text", "StringBuilder", False, "Insert", "(System.Int32,System.UInt32)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Text", "StringBuilder", False, "Insert", "(System.Int32,System.UInt64)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Text", "StringBuilder", False, "Remove", "(System.Int32,System.Int32)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Text", "StringBuilder", False, "Replace", "(System.Char,System.Char)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Text", "StringBuilder", False, "Replace", "(System.Char,System.Char,System.Int32,System.Int32)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Text", "StringBuilder", False, "Replace", "(System.ReadOnlySpan<System.Char>,System.ReadOnlySpan<System.Char>)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Text", "StringBuilder", False, "Replace", "(System.ReadOnlySpan<System.Char>,System.ReadOnlySpan<System.Char>,System.Int32,System.Int32)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Text", "StringBuilder", False, "Replace", "(System.String,System.String)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Text", "StringBuilder", False, "Replace", "(System.String,System.String,System.Int32,System.Int32)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Text", "StringRuneEnumerator", False, "GetEnumerator", "()", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Text", "StringRuneEnumerator", False, "get_Current", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
   - addsTo:
       pack: codeql/csharp-all
@@ -149,6 +142,7 @@ extensions:
       - ["System.Text", "Ascii", "TrimStart", "(System.ReadOnlySpan<System.Char>)", "summary", "df-generated"]
       - ["System.Text", "CodePagesEncodingProvider", "GetEncoding", "(System.Int32)", "summary", "df-generated"]
       - ["System.Text", "CodePagesEncodingProvider", "GetEncoding", "(System.String)", "summary", "df-generated"]
+      - ["System.Text", "CodePagesEncodingProvider", "GetEncodings", "()", "summary", "df-generated"]
       - ["System.Text", "CodePagesEncodingProvider", "get_Instance", "()", "summary", "df-generated"]
       - ["System.Text", "CompositeFormat", "Parse", "(System.String)", "summary", "df-generated"]
       - ["System.Text", "CompositeFormat", "get_Format", "()", "summary", "df-generated"]
@@ -293,6 +287,7 @@ extensions:
       - ["System.Text", "EncodingInfo", "get_Name", "()", "summary", "df-generated"]
       - ["System.Text", "EncodingProvider", "GetEncoding", "(System.Int32)", "summary", "df-generated"]
       - ["System.Text", "EncodingProvider", "GetEncoding", "(System.String)", "summary", "df-generated"]
+      - ["System.Text", "EncodingProvider", "GetEncodings", "()", "summary", "df-generated"]
       - ["System.Text", "Rune", "CompareTo", "(System.Object)", "summary", "df-generated"]
       - ["System.Text", "Rune", "CompareTo", "(System.Text.Rune)", "summary", "df-generated"]
       - ["System.Text", "Rune", "DecodeFromUtf16", "(System.ReadOnlySpan<System.Char>,System.Text.Rune,System.Int32)", "summary", "df-generated"]
@@ -351,7 +346,6 @@ extensions:
       - ["System.Text", "Rune", "op_Inequality", "(System.Text.Rune,System.Text.Rune)", "summary", "df-generated"]
       - ["System.Text", "Rune", "op_LessThan", "(System.Text.Rune,System.Text.Rune)", "summary", "df-generated"]
       - ["System.Text", "Rune", "op_LessThanOrEqual", "(System.Text.Rune,System.Text.Rune)", "summary", "df-generated"]
-      - ["System.Text", "SpanLineEnumerator", "MoveNext", "()", "summary", "df-generated"]
       - ["System.Text", "SpanRuneEnumerator", "MoveNext", "()", "summary", "df-generated"]
       - ["System.Text", "StringBuilder+AppendInterpolatedStringHandler", "AppendFormatted", "(System.Object,System.Int32,System.String)", "summary", "df-generated"]
       - ["System.Text", "StringBuilder+AppendInterpolatedStringHandler", "AppendFormatted", "(System.ReadOnlySpan<System.Char>)", "summary", "df-generated"]
diff --git a/csharp/ql/lib/ext/generated/System.Threading.Channels.model.yml b/csharp/ql/lib/ext/generated/System.Threading.Channels.model.yml
index 5c44f2a9e66..34db6510078 100644
--- a/csharp/ql/lib/ext/generated/System.Threading.Channels.model.yml
+++ b/csharp/ql/lib/ext/generated/System.Threading.Channels.model.yml
@@ -7,6 +7,7 @@ extensions:
       - ["System.Threading.Channels", "BoundedChannelOptions", "BoundedChannelOptions", "(System.Int32)", "summary", "df-generated"]
       - ["System.Threading.Channels", "Channel", "CreateBounded<T>", "(System.Int32)", "summary", "df-generated"]
       - ["System.Threading.Channels", "Channel", "CreateBounded<T>", "(System.Threading.Channels.BoundedChannelOptions)", "summary", "df-generated"]
+      - ["System.Threading.Channels", "Channel", "CreateBounded<T>", "(System.Threading.Channels.BoundedChannelOptions,System.Action<T>)", "summary", "df-generated"]
       - ["System.Threading.Channels", "Channel", "CreateUnbounded<T>", "()", "summary", "df-generated"]
       - ["System.Threading.Channels", "Channel", "CreateUnbounded<T>", "(System.Threading.Channels.UnboundedChannelOptions)", "summary", "df-generated"]
       - ["System.Threading.Channels", "ChannelClosedException", "ChannelClosedException", "(System.Exception)", "summary", "df-generated"]
diff --git a/csharp/ql/lib/ext/generated/System.Threading.RateLimiting.model.yml b/csharp/ql/lib/ext/generated/System.Threading.RateLimiting.model.yml
index 2ab389863d7..ef7a037da23 100644
--- a/csharp/ql/lib/ext/generated/System.Threading.RateLimiting.model.yml
+++ b/csharp/ql/lib/ext/generated/System.Threading.RateLimiting.model.yml
@@ -4,29 +4,28 @@ extensions:
       pack: codeql/csharp-all
       extensible: summaryModel
     data:
-      - ["System.Threading.RateLimiting", "MetadataName", False, "Create<T>", "(System.String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Threading.RateLimiting", "MetadataName<T>", False, "MetadataName", "(System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Threading.RateLimiting", "MetadataName<T>", False, "ToString", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Threading.RateLimiting", "MetadataName<T>", False, "get_Name", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Threading.RateLimiting", "MetadataName<T>", False, "MetadataName", "(System.String)", "", "Argument[0]", "Argument[this].SyntheticField[System.Threading.RateLimiting.MetadataName`1._name]", "value", "dfc-generated"]
+      - ["System.Threading.RateLimiting", "MetadataName<T>", False, "ToString", "()", "", "Argument[this].SyntheticField[System.Threading.RateLimiting.MetadataName`1._name]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Threading.RateLimiting", "MetadataName<T>", False, "get_Name", "()", "", "Argument[this].SyntheticField[System.Threading.RateLimiting.MetadataName`1._name]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Threading.RateLimiting", "PartitionedRateLimiter", False, "CreateChained<TResource>", "(System.Threading.RateLimiting.PartitionedRateLimiter<TResource>[])", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
       - ["System.Threading.RateLimiting", "RateLimitLease", False, "TryGetMetadata<T>", "(System.Threading.RateLimiting.MetadataName<T>,T)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Threading.RateLimiting", "RateLimitLease", True, "GetAllMetadata", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Threading.RateLimiting", "RateLimitLease", True, "TryGetMetadata", "(System.String,System.Object)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Threading.RateLimiting", "RateLimitLease", True, "get_MetadataNames", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Threading.RateLimiting", "RateLimiter", False, "AcquireAsync", "(System.Int32,System.Threading.CancellationToken)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Threading.RateLimiting", "RateLimiter", False, "AttemptAcquire", "(System.Int32)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Threading.RateLimiting", "RateLimiter", True, "AcquireAsyncCore", "(System.Int32,System.Threading.CancellationToken)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Threading.RateLimiting", "RateLimiter", True, "AttemptAcquireCore", "(System.Int32)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Threading.RateLimiting", "ReplenishingRateLimiter", True, "get_ReplenishmentPeriod", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
   - addsTo:
       pack: codeql/csharp-all
       extensible: neutralModel
     data:
+      - ["System.Threading.RateLimiting", "ConcurrencyLimiter", "AcquireAsyncCore", "(System.Int32,System.Threading.CancellationToken)", "summary", "df-generated"]
       - ["System.Threading.RateLimiting", "ConcurrencyLimiter", "ConcurrencyLimiter", "(System.Threading.RateLimiting.ConcurrencyLimiterOptions)", "summary", "df-generated"]
       - ["System.Threading.RateLimiting", "ConcurrencyLimiter", "Dispose", "(System.Boolean)", "summary", "df-generated"]
       - ["System.Threading.RateLimiting", "ConcurrencyLimiter", "DisposeAsyncCore", "()", "summary", "df-generated"]
       - ["System.Threading.RateLimiting", "ConcurrencyLimiter", "GetStatistics", "()", "summary", "df-generated"]
       - ["System.Threading.RateLimiting", "ConcurrencyLimiter", "get_IdleDuration", "()", "summary", "df-generated"]
+      - ["System.Threading.RateLimiting", "FixedWindowRateLimiter", "AcquireAsyncCore", "(System.Int32,System.Threading.CancellationToken)", "summary", "df-generated"]
       - ["System.Threading.RateLimiting", "FixedWindowRateLimiter", "Dispose", "(System.Boolean)", "summary", "df-generated"]
       - ["System.Threading.RateLimiting", "FixedWindowRateLimiter", "DisposeAsyncCore", "()", "summary", "df-generated"]
       - ["System.Threading.RateLimiting", "FixedWindowRateLimiter", "FixedWindowRateLimiter", "(System.Threading.RateLimiting.FixedWindowRateLimiterOptions)", "summary", "df-generated"]
@@ -34,6 +33,7 @@ extensions:
       - ["System.Threading.RateLimiting", "FixedWindowRateLimiter", "TryReplenish", "()", "summary", "df-generated"]
       - ["System.Threading.RateLimiting", "FixedWindowRateLimiter", "get_IdleDuration", "()", "summary", "df-generated"]
       - ["System.Threading.RateLimiting", "FixedWindowRateLimiter", "get_IsAutoReplenishing", "()", "summary", "df-generated"]
+      - ["System.Threading.RateLimiting", "MetadataName", "Create<T>", "(System.String)", "summary", "df-generated"]
       - ["System.Threading.RateLimiting", "MetadataName", "get_ReasonPhrase", "()", "summary", "df-generated"]
       - ["System.Threading.RateLimiting", "MetadataName", "get_RetryAfter", "()", "summary", "df-generated"]
       - ["System.Threading.RateLimiting", "MetadataName<T>", "Equals", "(System.Object)", "summary", "df-generated"]
@@ -41,6 +41,7 @@ extensions:
       - ["System.Threading.RateLimiting", "MetadataName<T>", "GetHashCode", "()", "summary", "df-generated"]
       - ["System.Threading.RateLimiting", "MetadataName<T>", "op_Equality", "(System.Threading.RateLimiting.MetadataName<T>,System.Threading.RateLimiting.MetadataName<T>)", "summary", "df-generated"]
       - ["System.Threading.RateLimiting", "MetadataName<T>", "op_Inequality", "(System.Threading.RateLimiting.MetadataName<T>,System.Threading.RateLimiting.MetadataName<T>)", "summary", "df-generated"]
+      - ["System.Threading.RateLimiting", "PartitionedRateLimiter", "Create<TResource,TPartitionKey>", "(System.Func<TResource,System.Threading.RateLimiting.RateLimitPartition<TPartitionKey>>,System.Collections.Generic.IEqualityComparer<TPartitionKey>)", "summary", "df-generated"]
       - ["System.Threading.RateLimiting", "PartitionedRateLimiter<TResource>", "AcquireAsync", "(TResource,System.Int32,System.Threading.CancellationToken)", "summary", "df-generated"]
       - ["System.Threading.RateLimiting", "PartitionedRateLimiter<TResource>", "AcquireAsyncCore", "(TResource,System.Int32,System.Threading.CancellationToken)", "summary", "df-generated"]
       - ["System.Threading.RateLimiting", "PartitionedRateLimiter<TResource>", "AttemptAcquire", "(TResource,System.Int32)", "summary", "df-generated"]
@@ -49,12 +50,21 @@ extensions:
       - ["System.Threading.RateLimiting", "PartitionedRateLimiter<TResource>", "Dispose", "(System.Boolean)", "summary", "df-generated"]
       - ["System.Threading.RateLimiting", "PartitionedRateLimiter<TResource>", "DisposeAsyncCore", "()", "summary", "df-generated"]
       - ["System.Threading.RateLimiting", "PartitionedRateLimiter<TResource>", "GetStatistics", "(TResource)", "summary", "df-generated"]
+      - ["System.Threading.RateLimiting", "PartitionedRateLimiter<TResource>", "WithTranslatedKey<TOuter>", "(System.Func<TOuter,TResource>,System.Boolean)", "summary", "df-generated"]
       - ["System.Threading.RateLimiting", "RateLimitLease", "Dispose", "()", "summary", "df-generated"]
       - ["System.Threading.RateLimiting", "RateLimitLease", "Dispose", "(System.Boolean)", "summary", "df-generated"]
       - ["System.Threading.RateLimiting", "RateLimitLease", "get_IsAcquired", "()", "summary", "df-generated"]
+      - ["System.Threading.RateLimiting", "RateLimitPartition", "Get<TKey>", "(TKey,System.Func<TKey,System.Threading.RateLimiting.RateLimiter>)", "summary", "df-generated"]
+      - ["System.Threading.RateLimiting", "RateLimitPartition", "GetConcurrencyLimiter<TKey>", "(TKey,System.Func<TKey,System.Threading.RateLimiting.ConcurrencyLimiterOptions>)", "summary", "df-generated"]
+      - ["System.Threading.RateLimiting", "RateLimitPartition", "GetFixedWindowLimiter<TKey>", "(TKey,System.Func<TKey,System.Threading.RateLimiting.FixedWindowRateLimiterOptions>)", "summary", "df-generated"]
       - ["System.Threading.RateLimiting", "RateLimitPartition", "GetNoLimiter<TKey>", "(TKey)", "summary", "df-generated"]
+      - ["System.Threading.RateLimiting", "RateLimitPartition", "GetSlidingWindowLimiter<TKey>", "(TKey,System.Func<TKey,System.Threading.RateLimiting.SlidingWindowRateLimiterOptions>)", "summary", "df-generated"]
+      - ["System.Threading.RateLimiting", "RateLimitPartition", "GetTokenBucketLimiter<TKey>", "(TKey,System.Func<TKey,System.Threading.RateLimiting.TokenBucketRateLimiterOptions>)", "summary", "df-generated"]
+      - ["System.Threading.RateLimiting", "RateLimitPartition<TKey>", "RateLimitPartition", "(TKey,System.Func<TKey,System.Threading.RateLimiting.RateLimiter>)", "summary", "df-generated"]
       - ["System.Threading.RateLimiting", "RateLimitPartition<TKey>", "get_Factory", "()", "summary", "df-generated"]
       - ["System.Threading.RateLimiting", "RateLimitPartition<TKey>", "get_PartitionKey", "()", "summary", "df-generated"]
+      - ["System.Threading.RateLimiting", "RateLimiter", "AcquireAsync", "(System.Int32,System.Threading.CancellationToken)", "summary", "df-generated"]
+      - ["System.Threading.RateLimiting", "RateLimiter", "AcquireAsyncCore", "(System.Int32,System.Threading.CancellationToken)", "summary", "df-generated"]
       - ["System.Threading.RateLimiting", "RateLimiter", "Dispose", "()", "summary", "df-generated"]
       - ["System.Threading.RateLimiting", "RateLimiter", "Dispose", "(System.Boolean)", "summary", "df-generated"]
       - ["System.Threading.RateLimiting", "RateLimiter", "DisposeAsyncCore", "()", "summary", "df-generated"]
@@ -62,6 +72,7 @@ extensions:
       - ["System.Threading.RateLimiting", "RateLimiter", "get_IdleDuration", "()", "summary", "df-generated"]
       - ["System.Threading.RateLimiting", "ReplenishingRateLimiter", "TryReplenish", "()", "summary", "df-generated"]
       - ["System.Threading.RateLimiting", "ReplenishingRateLimiter", "get_IsAutoReplenishing", "()", "summary", "df-generated"]
+      - ["System.Threading.RateLimiting", "SlidingWindowRateLimiter", "AcquireAsyncCore", "(System.Int32,System.Threading.CancellationToken)", "summary", "df-generated"]
       - ["System.Threading.RateLimiting", "SlidingWindowRateLimiter", "Dispose", "(System.Boolean)", "summary", "df-generated"]
       - ["System.Threading.RateLimiting", "SlidingWindowRateLimiter", "DisposeAsyncCore", "()", "summary", "df-generated"]
       - ["System.Threading.RateLimiting", "SlidingWindowRateLimiter", "GetStatistics", "()", "summary", "df-generated"]
@@ -69,6 +80,7 @@ extensions:
       - ["System.Threading.RateLimiting", "SlidingWindowRateLimiter", "TryReplenish", "()", "summary", "df-generated"]
       - ["System.Threading.RateLimiting", "SlidingWindowRateLimiter", "get_IdleDuration", "()", "summary", "df-generated"]
       - ["System.Threading.RateLimiting", "SlidingWindowRateLimiter", "get_IsAutoReplenishing", "()", "summary", "df-generated"]
+      - ["System.Threading.RateLimiting", "TokenBucketRateLimiter", "AcquireAsyncCore", "(System.Int32,System.Threading.CancellationToken)", "summary", "df-generated"]
       - ["System.Threading.RateLimiting", "TokenBucketRateLimiter", "Dispose", "(System.Boolean)", "summary", "df-generated"]
       - ["System.Threading.RateLimiting", "TokenBucketRateLimiter", "DisposeAsyncCore", "()", "summary", "df-generated"]
       - ["System.Threading.RateLimiting", "TokenBucketRateLimiter", "GetStatistics", "()", "summary", "df-generated"]
diff --git a/csharp/ql/lib/ext/generated/System.Threading.Tasks.Dataflow.model.yml b/csharp/ql/lib/ext/generated/System.Threading.Tasks.Dataflow.model.yml
index 1555a3521a9..832754f553a 100644
--- a/csharp/ql/lib/ext/generated/System.Threading.Tasks.Dataflow.model.yml
+++ b/csharp/ql/lib/ext/generated/System.Threading.Tasks.Dataflow.model.yml
@@ -30,7 +30,6 @@ extensions:
       - ["System.Threading.Tasks.Dataflow", "BufferBlock<T>", False, "LinkTo", "(System.Threading.Tasks.Dataflow.ITargetBlock<T>,System.Threading.Tasks.Dataflow.DataflowLinkOptions)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["System.Threading.Tasks.Dataflow", "BufferBlock<T>", False, "LinkTo", "(System.Threading.Tasks.Dataflow.ITargetBlock<T>,System.Threading.Tasks.Dataflow.DataflowLinkOptions)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Threading.Tasks.Dataflow", "BufferBlock<T>", False, "ReserveMessage", "(System.Threading.Tasks.Dataflow.DataflowMessageHeader,System.Threading.Tasks.Dataflow.ITargetBlock<T>)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Threading.Tasks.Dataflow", "DataflowBlock", False, "AsObservable<TOutput>", "(System.Threading.Tasks.Dataflow.ISourceBlock<TOutput>)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["System.Threading.Tasks.Dataflow", "DataflowBlock", False, "AsObserver<TInput>", "(System.Threading.Tasks.Dataflow.ITargetBlock<TInput>)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["System.Threading.Tasks.Dataflow", "DataflowBlock", False, "Encapsulate<TInput,TOutput>", "(System.Threading.Tasks.Dataflow.ITargetBlock<TInput>,System.Threading.Tasks.Dataflow.ISourceBlock<TOutput>)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["System.Threading.Tasks.Dataflow", "DataflowBlock", False, "Encapsulate<TInput,TOutput>", "(System.Threading.Tasks.Dataflow.ITargetBlock<TInput>,System.Threading.Tasks.Dataflow.ISourceBlock<TOutput>)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
@@ -50,6 +49,7 @@ extensions:
       - ["System.Threading.Tasks.Dataflow", "DataflowBlock", False, "SendAsync<TInput>", "(System.Threading.Tasks.Dataflow.ITargetBlock<TInput>,TInput)", "", "Argument[1]", "Argument[0]", "taint", "df-generated"]
       - ["System.Threading.Tasks.Dataflow", "DataflowBlock", False, "SendAsync<TInput>", "(System.Threading.Tasks.Dataflow.ITargetBlock<TInput>,TInput,System.Threading.CancellationToken)", "", "Argument[1]", "Argument[0]", "taint", "df-generated"]
       - ["System.Threading.Tasks.Dataflow", "DataflowBlock", False, "TryReceive<TOutput>", "(System.Threading.Tasks.Dataflow.IReceivableSourceBlock<TOutput>,TOutput)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Threading.Tasks.Dataflow", "IDataflowBlock", True, "Fault", "(System.Exception)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Threading.Tasks.Dataflow", "IDataflowBlock", True, "get_Completion", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Threading.Tasks.Dataflow", "JoinBlock<T1,T2,T3>", False, "JoinBlock", "(System.Threading.Tasks.Dataflow.GroupingDataflowBlockOptions)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Threading.Tasks.Dataflow", "JoinBlock<T1,T2,T3>", False, "LinkTo", "(System.Threading.Tasks.Dataflow.ITargetBlock<System.Tuple<T1,T2,T3>>,System.Threading.Tasks.Dataflow.DataflowLinkOptions)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
@@ -70,20 +70,24 @@ extensions:
       - ["System.Threading.Tasks.Dataflow", "TransformManyBlock<TInput,TOutput>", False, "LinkTo", "(System.Threading.Tasks.Dataflow.ITargetBlock<TOutput>,System.Threading.Tasks.Dataflow.DataflowLinkOptions)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["System.Threading.Tasks.Dataflow", "TransformManyBlock<TInput,TOutput>", False, "LinkTo", "(System.Threading.Tasks.Dataflow.ITargetBlock<TOutput>,System.Threading.Tasks.Dataflow.DataflowLinkOptions)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Threading.Tasks.Dataflow", "TransformManyBlock<TInput,TOutput>", False, "ReserveMessage", "(System.Threading.Tasks.Dataflow.DataflowMessageHeader,System.Threading.Tasks.Dataflow.ITargetBlock<TOutput>)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Threading.Tasks.Dataflow", "WriteOnceBlock<T>", False, "ConsumeMessage", "(System.Threading.Tasks.Dataflow.DataflowMessageHeader,System.Threading.Tasks.Dataflow.ITargetBlock<T>,System.Boolean)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Threading.Tasks.Dataflow", "WriteOnceBlock<T>", False, "ConsumeMessage", "(System.Threading.Tasks.Dataflow.DataflowMessageHeader,System.Threading.Tasks.Dataflow.ITargetBlock<T>,System.Boolean)", "", "Argument[this].SyntheticField[System.Threading.Tasks.Dataflow.WriteOnceBlock`1._value]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Threading.Tasks.Dataflow", "WriteOnceBlock<T>", False, "LinkTo", "(System.Threading.Tasks.Dataflow.ITargetBlock<T>,System.Threading.Tasks.Dataflow.DataflowLinkOptions)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["System.Threading.Tasks.Dataflow", "WriteOnceBlock<T>", False, "LinkTo", "(System.Threading.Tasks.Dataflow.ITargetBlock<T>,System.Threading.Tasks.Dataflow.DataflowLinkOptions)", "", "Argument[this]", "Argument[0]", "taint", "df-generated"]
       - ["System.Threading.Tasks.Dataflow", "WriteOnceBlock<T>", False, "LinkTo", "(System.Threading.Tasks.Dataflow.ITargetBlock<T>,System.Threading.Tasks.Dataflow.DataflowLinkOptions)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Threading.Tasks.Dataflow", "WriteOnceBlock<T>", False, "OfferMessage", "(System.Threading.Tasks.Dataflow.DataflowMessageHeader,T,System.Threading.Tasks.Dataflow.ISourceBlock<T>,System.Boolean)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["System.Threading.Tasks.Dataflow", "WriteOnceBlock<T>", False, "OfferMessage", "(System.Threading.Tasks.Dataflow.DataflowMessageHeader,T,System.Threading.Tasks.Dataflow.ISourceBlock<T>,System.Boolean)", "", "Argument[1]", "Argument[this].SyntheticField[System.Threading.Tasks.Dataflow.WriteOnceBlock`1._value]", "value", "dfc-generated"]
       - ["System.Threading.Tasks.Dataflow", "WriteOnceBlock<T>", False, "ReleaseReservation", "(System.Threading.Tasks.Dataflow.DataflowMessageHeader,System.Threading.Tasks.Dataflow.ITargetBlock<T>)", "", "Argument[this]", "Argument[1]", "taint", "df-generated"]
       - ["System.Threading.Tasks.Dataflow", "WriteOnceBlock<T>", False, "ToString", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Threading.Tasks.Dataflow", "WriteOnceBlock<T>", False, "TryReceiveAll", "(System.Collections.Generic.IList<T>)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Threading.Tasks.Dataflow", "WriteOnceBlock<T>", False, "TryReceiveAll", "(System.Collections.Generic.IList<T>)", "", "Argument[this].SyntheticField[System.Threading.Tasks.Dataflow.WriteOnceBlock`1._value]", "ReturnValue.Element", "value", "dfc-generated"]
+      - ["System.Threading.Tasks.Dataflow", "WriteOnceBlock<T>", False, "WriteOnceBlock", "(System.Func<T,T>,System.Threading.Tasks.Dataflow.DataflowBlockOptions)", "", "Argument[0]", "Argument[this].SyntheticField[System.Threading.Tasks.Dataflow.WriteOnceBlock`1._cloningFunction]", "value", "dfc-generated"]
   - addsTo:
       pack: codeql/csharp-all
       extensible: neutralModel
     data:
+      - ["System.Threading.Tasks.Dataflow", "ActionBlock<TInput>", "ActionBlock", "(System.Action<TInput>)", "summary", "df-generated"]
+      - ["System.Threading.Tasks.Dataflow", "ActionBlock<TInput>", "ActionBlock", "(System.Action<TInput>,System.Threading.Tasks.Dataflow.ExecutionDataflowBlockOptions)", "summary", "df-generated"]
+      - ["System.Threading.Tasks.Dataflow", "ActionBlock<TInput>", "ActionBlock", "(System.Func<TInput,System.Threading.Tasks.Task>)", "summary", "df-generated"]
+      - ["System.Threading.Tasks.Dataflow", "ActionBlock<TInput>", "ActionBlock", "(System.Func<TInput,System.Threading.Tasks.Task>,System.Threading.Tasks.Dataflow.ExecutionDataflowBlockOptions)", "summary", "df-generated"]
       - ["System.Threading.Tasks.Dataflow", "ActionBlock<TInput>", "Complete", "()", "summary", "df-generated"]
-      - ["System.Threading.Tasks.Dataflow", "ActionBlock<TInput>", "Fault", "(System.Exception)", "summary", "df-generated"]
       - ["System.Threading.Tasks.Dataflow", "ActionBlock<TInput>", "OfferMessage", "(System.Threading.Tasks.Dataflow.DataflowMessageHeader,TInput,System.Threading.Tasks.Dataflow.ISourceBlock<TInput>,System.Boolean)", "summary", "df-generated"]
       - ["System.Threading.Tasks.Dataflow", "ActionBlock<TInput>", "Post", "(TInput)", "summary", "df-generated"]
       - ["System.Threading.Tasks.Dataflow", "ActionBlock<TInput>", "ToString", "()", "summary", "df-generated"]
@@ -91,45 +95,54 @@ extensions:
       - ["System.Threading.Tasks.Dataflow", "BatchBlock<T>", "BatchBlock", "(System.Int32)", "summary", "df-generated"]
       - ["System.Threading.Tasks.Dataflow", "BatchBlock<T>", "Complete", "()", "summary", "df-generated"]
       - ["System.Threading.Tasks.Dataflow", "BatchBlock<T>", "ConsumeMessage", "(System.Threading.Tasks.Dataflow.DataflowMessageHeader,System.Threading.Tasks.Dataflow.ITargetBlock<T[]>,System.Boolean)", "summary", "df-generated"]
-      - ["System.Threading.Tasks.Dataflow", "BatchBlock<T>", "Fault", "(System.Exception)", "summary", "df-generated"]
       - ["System.Threading.Tasks.Dataflow", "BatchBlock<T>", "OfferMessage", "(System.Threading.Tasks.Dataflow.DataflowMessageHeader,T,System.Threading.Tasks.Dataflow.ISourceBlock<T>,System.Boolean)", "summary", "df-generated"]
       - ["System.Threading.Tasks.Dataflow", "BatchBlock<T>", "ReleaseReservation", "(System.Threading.Tasks.Dataflow.DataflowMessageHeader,System.Threading.Tasks.Dataflow.ITargetBlock<T[]>)", "summary", "df-generated"]
       - ["System.Threading.Tasks.Dataflow", "BatchBlock<T>", "ToString", "()", "summary", "df-generated"]
       - ["System.Threading.Tasks.Dataflow", "BatchBlock<T>", "TriggerBatch", "()", "summary", "df-generated"]
+      - ["System.Threading.Tasks.Dataflow", "BatchBlock<T>", "TryReceive", "(System.Predicate<T[]>,T[])", "summary", "df-generated"]
       - ["System.Threading.Tasks.Dataflow", "BatchBlock<T>", "TryReceiveAll", "(System.Collections.Generic.IList<T[]>)", "summary", "df-generated"]
       - ["System.Threading.Tasks.Dataflow", "BatchBlock<T>", "get_BatchSize", "()", "summary", "df-generated"]
       - ["System.Threading.Tasks.Dataflow", "BatchBlock<T>", "get_OutputCount", "()", "summary", "df-generated"]
       - ["System.Threading.Tasks.Dataflow", "BatchedJoinBlock<T1,T2,T3>", "BatchedJoinBlock", "(System.Int32)", "summary", "df-generated"]
       - ["System.Threading.Tasks.Dataflow", "BatchedJoinBlock<T1,T2,T3>", "Complete", "()", "summary", "df-generated"]
       - ["System.Threading.Tasks.Dataflow", "BatchedJoinBlock<T1,T2,T3>", "ConsumeMessage", "(System.Threading.Tasks.Dataflow.DataflowMessageHeader,System.Threading.Tasks.Dataflow.ITargetBlock<System.Tuple<System.Collections.Generic.IList<T1>,System.Collections.Generic.IList<T2>,System.Collections.Generic.IList<T3>>>,System.Boolean)", "summary", "df-generated"]
-      - ["System.Threading.Tasks.Dataflow", "BatchedJoinBlock<T1,T2,T3>", "Fault", "(System.Exception)", "summary", "df-generated"]
       - ["System.Threading.Tasks.Dataflow", "BatchedJoinBlock<T1,T2,T3>", "ReleaseReservation", "(System.Threading.Tasks.Dataflow.DataflowMessageHeader,System.Threading.Tasks.Dataflow.ITargetBlock<System.Tuple<System.Collections.Generic.IList<T1>,System.Collections.Generic.IList<T2>,System.Collections.Generic.IList<T3>>>)", "summary", "df-generated"]
       - ["System.Threading.Tasks.Dataflow", "BatchedJoinBlock<T1,T2,T3>", "ToString", "()", "summary", "df-generated"]
+      - ["System.Threading.Tasks.Dataflow", "BatchedJoinBlock<T1,T2,T3>", "TryReceive", "(System.Predicate<System.Tuple<System.Collections.Generic.IList<T1>,System.Collections.Generic.IList<T2>,System.Collections.Generic.IList<T3>>>,System.Tuple<System.Collections.Generic.IList<T1>,System.Collections.Generic.IList<T2>,System.Collections.Generic.IList<T3>>)", "summary", "df-generated"]
       - ["System.Threading.Tasks.Dataflow", "BatchedJoinBlock<T1,T2,T3>", "TryReceiveAll", "(System.Collections.Generic.IList<System.Tuple<System.Collections.Generic.IList<T1>,System.Collections.Generic.IList<T2>,System.Collections.Generic.IList<T3>>>)", "summary", "df-generated"]
       - ["System.Threading.Tasks.Dataflow", "BatchedJoinBlock<T1,T2,T3>", "get_BatchSize", "()", "summary", "df-generated"]
       - ["System.Threading.Tasks.Dataflow", "BatchedJoinBlock<T1,T2,T3>", "get_OutputCount", "()", "summary", "df-generated"]
       - ["System.Threading.Tasks.Dataflow", "BatchedJoinBlock<T1,T2>", "BatchedJoinBlock", "(System.Int32)", "summary", "df-generated"]
       - ["System.Threading.Tasks.Dataflow", "BatchedJoinBlock<T1,T2>", "Complete", "()", "summary", "df-generated"]
       - ["System.Threading.Tasks.Dataflow", "BatchedJoinBlock<T1,T2>", "ConsumeMessage", "(System.Threading.Tasks.Dataflow.DataflowMessageHeader,System.Threading.Tasks.Dataflow.ITargetBlock<System.Tuple<System.Collections.Generic.IList<T1>,System.Collections.Generic.IList<T2>>>,System.Boolean)", "summary", "df-generated"]
-      - ["System.Threading.Tasks.Dataflow", "BatchedJoinBlock<T1,T2>", "Fault", "(System.Exception)", "summary", "df-generated"]
       - ["System.Threading.Tasks.Dataflow", "BatchedJoinBlock<T1,T2>", "ReleaseReservation", "(System.Threading.Tasks.Dataflow.DataflowMessageHeader,System.Threading.Tasks.Dataflow.ITargetBlock<System.Tuple<System.Collections.Generic.IList<T1>,System.Collections.Generic.IList<T2>>>)", "summary", "df-generated"]
       - ["System.Threading.Tasks.Dataflow", "BatchedJoinBlock<T1,T2>", "ToString", "()", "summary", "df-generated"]
+      - ["System.Threading.Tasks.Dataflow", "BatchedJoinBlock<T1,T2>", "TryReceive", "(System.Predicate<System.Tuple<System.Collections.Generic.IList<T1>,System.Collections.Generic.IList<T2>>>,System.Tuple<System.Collections.Generic.IList<T1>,System.Collections.Generic.IList<T2>>)", "summary", "df-generated"]
       - ["System.Threading.Tasks.Dataflow", "BatchedJoinBlock<T1,T2>", "TryReceiveAll", "(System.Collections.Generic.IList<System.Tuple<System.Collections.Generic.IList<T1>,System.Collections.Generic.IList<T2>>>)", "summary", "df-generated"]
       - ["System.Threading.Tasks.Dataflow", "BatchedJoinBlock<T1,T2>", "get_BatchSize", "()", "summary", "df-generated"]
       - ["System.Threading.Tasks.Dataflow", "BatchedJoinBlock<T1,T2>", "get_OutputCount", "()", "summary", "df-generated"]
+      - ["System.Threading.Tasks.Dataflow", "BroadcastBlock<T>", "BroadcastBlock", "(System.Func<T,T>)", "summary", "df-generated"]
+      - ["System.Threading.Tasks.Dataflow", "BroadcastBlock<T>", "BroadcastBlock", "(System.Func<T,T>,System.Threading.Tasks.Dataflow.DataflowBlockOptions)", "summary", "df-generated"]
       - ["System.Threading.Tasks.Dataflow", "BroadcastBlock<T>", "Complete", "()", "summary", "df-generated"]
-      - ["System.Threading.Tasks.Dataflow", "BroadcastBlock<T>", "Fault", "(System.Exception)", "summary", "df-generated"]
       - ["System.Threading.Tasks.Dataflow", "BroadcastBlock<T>", "OfferMessage", "(System.Threading.Tasks.Dataflow.DataflowMessageHeader,T,System.Threading.Tasks.Dataflow.ISourceBlock<T>,System.Boolean)", "summary", "df-generated"]
       - ["System.Threading.Tasks.Dataflow", "BroadcastBlock<T>", "ReleaseReservation", "(System.Threading.Tasks.Dataflow.DataflowMessageHeader,System.Threading.Tasks.Dataflow.ITargetBlock<T>)", "summary", "df-generated"]
       - ["System.Threading.Tasks.Dataflow", "BroadcastBlock<T>", "ToString", "()", "summary", "df-generated"]
+      - ["System.Threading.Tasks.Dataflow", "BroadcastBlock<T>", "TryReceive", "(System.Predicate<T>,T)", "summary", "df-generated"]
       - ["System.Threading.Tasks.Dataflow", "BufferBlock<T>", "Complete", "()", "summary", "df-generated"]
       - ["System.Threading.Tasks.Dataflow", "BufferBlock<T>", "ConsumeMessage", "(System.Threading.Tasks.Dataflow.DataflowMessageHeader,System.Threading.Tasks.Dataflow.ITargetBlock<T>,System.Boolean)", "summary", "df-generated"]
-      - ["System.Threading.Tasks.Dataflow", "BufferBlock<T>", "Fault", "(System.Exception)", "summary", "df-generated"]
       - ["System.Threading.Tasks.Dataflow", "BufferBlock<T>", "OfferMessage", "(System.Threading.Tasks.Dataflow.DataflowMessageHeader,T,System.Threading.Tasks.Dataflow.ISourceBlock<T>,System.Boolean)", "summary", "df-generated"]
       - ["System.Threading.Tasks.Dataflow", "BufferBlock<T>", "ReleaseReservation", "(System.Threading.Tasks.Dataflow.DataflowMessageHeader,System.Threading.Tasks.Dataflow.ITargetBlock<T>)", "summary", "df-generated"]
       - ["System.Threading.Tasks.Dataflow", "BufferBlock<T>", "ToString", "()", "summary", "df-generated"]
+      - ["System.Threading.Tasks.Dataflow", "BufferBlock<T>", "TryReceive", "(System.Predicate<T>,T)", "summary", "df-generated"]
       - ["System.Threading.Tasks.Dataflow", "BufferBlock<T>", "TryReceiveAll", "(System.Collections.Generic.IList<T>)", "summary", "df-generated"]
       - ["System.Threading.Tasks.Dataflow", "BufferBlock<T>", "get_Count", "()", "summary", "df-generated"]
+      - ["System.Threading.Tasks.Dataflow", "DataflowBlock", "AsObservable<TOutput>", "(System.Threading.Tasks.Dataflow.ISourceBlock<TOutput>)", "summary", "df-generated"]
+      - ["System.Threading.Tasks.Dataflow", "DataflowBlock", "Choose<T1,T2,T3>", "(System.Threading.Tasks.Dataflow.ISourceBlock<T1>,System.Action<T1>,System.Threading.Tasks.Dataflow.ISourceBlock<T2>,System.Action<T2>,System.Threading.Tasks.Dataflow.ISourceBlock<T3>,System.Action<T3>)", "summary", "df-generated"]
+      - ["System.Threading.Tasks.Dataflow", "DataflowBlock", "Choose<T1,T2,T3>", "(System.Threading.Tasks.Dataflow.ISourceBlock<T1>,System.Action<T1>,System.Threading.Tasks.Dataflow.ISourceBlock<T2>,System.Action<T2>,System.Threading.Tasks.Dataflow.ISourceBlock<T3>,System.Action<T3>,System.Threading.Tasks.Dataflow.DataflowBlockOptions)", "summary", "df-generated"]
+      - ["System.Threading.Tasks.Dataflow", "DataflowBlock", "Choose<T1,T2>", "(System.Threading.Tasks.Dataflow.ISourceBlock<T1>,System.Action<T1>,System.Threading.Tasks.Dataflow.ISourceBlock<T2>,System.Action<T2>)", "summary", "df-generated"]
+      - ["System.Threading.Tasks.Dataflow", "DataflowBlock", "Choose<T1,T2>", "(System.Threading.Tasks.Dataflow.ISourceBlock<T1>,System.Action<T1>,System.Threading.Tasks.Dataflow.ISourceBlock<T2>,System.Action<T2>,System.Threading.Tasks.Dataflow.DataflowBlockOptions)", "summary", "df-generated"]
+      - ["System.Threading.Tasks.Dataflow", "DataflowBlock", "LinkTo<TOutput>", "(System.Threading.Tasks.Dataflow.ISourceBlock<TOutput>,System.Threading.Tasks.Dataflow.ITargetBlock<TOutput>,System.Predicate<TOutput>)", "summary", "df-generated"]
+      - ["System.Threading.Tasks.Dataflow", "DataflowBlock", "LinkTo<TOutput>", "(System.Threading.Tasks.Dataflow.ISourceBlock<TOutput>,System.Threading.Tasks.Dataflow.ITargetBlock<TOutput>,System.Threading.Tasks.Dataflow.DataflowLinkOptions,System.Predicate<TOutput>)", "summary", "df-generated"]
       - ["System.Threading.Tasks.Dataflow", "DataflowBlock", "NullTarget<TInput>", "()", "summary", "df-generated"]
       - ["System.Threading.Tasks.Dataflow", "DataflowBlock", "OutputAvailableAsync<TOutput>", "(System.Threading.Tasks.Dataflow.ISourceBlock<TOutput>)", "summary", "df-generated"]
       - ["System.Threading.Tasks.Dataflow", "DataflowBlock", "OutputAvailableAsync<TOutput>", "(System.Threading.Tasks.Dataflow.ISourceBlock<TOutput>,System.Threading.CancellationToken)", "summary", "df-generated"]
@@ -142,7 +155,7 @@ extensions:
       - ["System.Threading.Tasks.Dataflow", "DataflowMessageHeader", "op_Equality", "(System.Threading.Tasks.Dataflow.DataflowMessageHeader,System.Threading.Tasks.Dataflow.DataflowMessageHeader)", "summary", "df-generated"]
       - ["System.Threading.Tasks.Dataflow", "DataflowMessageHeader", "op_Inequality", "(System.Threading.Tasks.Dataflow.DataflowMessageHeader,System.Threading.Tasks.Dataflow.DataflowMessageHeader)", "summary", "df-generated"]
       - ["System.Threading.Tasks.Dataflow", "IDataflowBlock", "Complete", "()", "summary", "df-generated"]
-      - ["System.Threading.Tasks.Dataflow", "IDataflowBlock", "Fault", "(System.Exception)", "summary", "df-generated"]
+      - ["System.Threading.Tasks.Dataflow", "IReceivableSourceBlock<TOutput>", "TryReceive", "(System.Predicate<TOutput>,TOutput)", "summary", "df-generated"]
       - ["System.Threading.Tasks.Dataflow", "IReceivableSourceBlock<TOutput>", "TryReceiveAll", "(System.Collections.Generic.IList<TOutput>)", "summary", "df-generated"]
       - ["System.Threading.Tasks.Dataflow", "ISourceBlock<TOutput>", "ConsumeMessage", "(System.Threading.Tasks.Dataflow.DataflowMessageHeader,System.Threading.Tasks.Dataflow.ITargetBlock<TOutput>,System.Boolean)", "summary", "df-generated"]
       - ["System.Threading.Tasks.Dataflow", "ISourceBlock<TOutput>", "LinkTo", "(System.Threading.Tasks.Dataflow.ITargetBlock<TOutput>,System.Threading.Tasks.Dataflow.DataflowLinkOptions)", "summary", "df-generated"]
@@ -151,36 +164,47 @@ extensions:
       - ["System.Threading.Tasks.Dataflow", "ITargetBlock<TInput>", "OfferMessage", "(System.Threading.Tasks.Dataflow.DataflowMessageHeader,TInput,System.Threading.Tasks.Dataflow.ISourceBlock<TInput>,System.Boolean)", "summary", "df-generated"]
       - ["System.Threading.Tasks.Dataflow", "JoinBlock<T1,T2,T3>", "Complete", "()", "summary", "df-generated"]
       - ["System.Threading.Tasks.Dataflow", "JoinBlock<T1,T2,T3>", "ConsumeMessage", "(System.Threading.Tasks.Dataflow.DataflowMessageHeader,System.Threading.Tasks.Dataflow.ITargetBlock<System.Tuple<T1,T2,T3>>,System.Boolean)", "summary", "df-generated"]
-      - ["System.Threading.Tasks.Dataflow", "JoinBlock<T1,T2,T3>", "Fault", "(System.Exception)", "summary", "df-generated"]
       - ["System.Threading.Tasks.Dataflow", "JoinBlock<T1,T2,T3>", "ReleaseReservation", "(System.Threading.Tasks.Dataflow.DataflowMessageHeader,System.Threading.Tasks.Dataflow.ITargetBlock<System.Tuple<T1,T2,T3>>)", "summary", "df-generated"]
       - ["System.Threading.Tasks.Dataflow", "JoinBlock<T1,T2,T3>", "ToString", "()", "summary", "df-generated"]
+      - ["System.Threading.Tasks.Dataflow", "JoinBlock<T1,T2,T3>", "TryReceive", "(System.Predicate<System.Tuple<T1,T2,T3>>,System.Tuple<T1,T2,T3>)", "summary", "df-generated"]
       - ["System.Threading.Tasks.Dataflow", "JoinBlock<T1,T2,T3>", "TryReceiveAll", "(System.Collections.Generic.IList<System.Tuple<T1,T2,T3>>)", "summary", "df-generated"]
       - ["System.Threading.Tasks.Dataflow", "JoinBlock<T1,T2,T3>", "get_OutputCount", "()", "summary", "df-generated"]
       - ["System.Threading.Tasks.Dataflow", "JoinBlock<T1,T2>", "Complete", "()", "summary", "df-generated"]
       - ["System.Threading.Tasks.Dataflow", "JoinBlock<T1,T2>", "ConsumeMessage", "(System.Threading.Tasks.Dataflow.DataflowMessageHeader,System.Threading.Tasks.Dataflow.ITargetBlock<System.Tuple<T1,T2>>,System.Boolean)", "summary", "df-generated"]
-      - ["System.Threading.Tasks.Dataflow", "JoinBlock<T1,T2>", "Fault", "(System.Exception)", "summary", "df-generated"]
       - ["System.Threading.Tasks.Dataflow", "JoinBlock<T1,T2>", "ReleaseReservation", "(System.Threading.Tasks.Dataflow.DataflowMessageHeader,System.Threading.Tasks.Dataflow.ITargetBlock<System.Tuple<T1,T2>>)", "summary", "df-generated"]
       - ["System.Threading.Tasks.Dataflow", "JoinBlock<T1,T2>", "ToString", "()", "summary", "df-generated"]
+      - ["System.Threading.Tasks.Dataflow", "JoinBlock<T1,T2>", "TryReceive", "(System.Predicate<System.Tuple<T1,T2>>,System.Tuple<T1,T2>)", "summary", "df-generated"]
       - ["System.Threading.Tasks.Dataflow", "JoinBlock<T1,T2>", "TryReceiveAll", "(System.Collections.Generic.IList<System.Tuple<T1,T2>>)", "summary", "df-generated"]
       - ["System.Threading.Tasks.Dataflow", "JoinBlock<T1,T2>", "get_OutputCount", "()", "summary", "df-generated"]
       - ["System.Threading.Tasks.Dataflow", "TransformBlock<TInput,TOutput>", "Complete", "()", "summary", "df-generated"]
       - ["System.Threading.Tasks.Dataflow", "TransformBlock<TInput,TOutput>", "ConsumeMessage", "(System.Threading.Tasks.Dataflow.DataflowMessageHeader,System.Threading.Tasks.Dataflow.ITargetBlock<TOutput>,System.Boolean)", "summary", "df-generated"]
-      - ["System.Threading.Tasks.Dataflow", "TransformBlock<TInput,TOutput>", "Fault", "(System.Exception)", "summary", "df-generated"]
       - ["System.Threading.Tasks.Dataflow", "TransformBlock<TInput,TOutput>", "OfferMessage", "(System.Threading.Tasks.Dataflow.DataflowMessageHeader,TInput,System.Threading.Tasks.Dataflow.ISourceBlock<TInput>,System.Boolean)", "summary", "df-generated"]
       - ["System.Threading.Tasks.Dataflow", "TransformBlock<TInput,TOutput>", "ReleaseReservation", "(System.Threading.Tasks.Dataflow.DataflowMessageHeader,System.Threading.Tasks.Dataflow.ITargetBlock<TOutput>)", "summary", "df-generated"]
       - ["System.Threading.Tasks.Dataflow", "TransformBlock<TInput,TOutput>", "ToString", "()", "summary", "df-generated"]
+      - ["System.Threading.Tasks.Dataflow", "TransformBlock<TInput,TOutput>", "TransformBlock", "(System.Func<TInput,System.Threading.Tasks.Task<TOutput>>)", "summary", "df-generated"]
+      - ["System.Threading.Tasks.Dataflow", "TransformBlock<TInput,TOutput>", "TransformBlock", "(System.Func<TInput,System.Threading.Tasks.Task<TOutput>>,System.Threading.Tasks.Dataflow.ExecutionDataflowBlockOptions)", "summary", "df-generated"]
+      - ["System.Threading.Tasks.Dataflow", "TransformBlock<TInput,TOutput>", "TransformBlock", "(System.Func<TInput,TOutput>)", "summary", "df-generated"]
+      - ["System.Threading.Tasks.Dataflow", "TransformBlock<TInput,TOutput>", "TransformBlock", "(System.Func<TInput,TOutput>,System.Threading.Tasks.Dataflow.ExecutionDataflowBlockOptions)", "summary", "df-generated"]
+      - ["System.Threading.Tasks.Dataflow", "TransformBlock<TInput,TOutput>", "TryReceive", "(System.Predicate<TOutput>,TOutput)", "summary", "df-generated"]
       - ["System.Threading.Tasks.Dataflow", "TransformBlock<TInput,TOutput>", "TryReceiveAll", "(System.Collections.Generic.IList<TOutput>)", "summary", "df-generated"]
       - ["System.Threading.Tasks.Dataflow", "TransformBlock<TInput,TOutput>", "get_InputCount", "()", "summary", "df-generated"]
       - ["System.Threading.Tasks.Dataflow", "TransformBlock<TInput,TOutput>", "get_OutputCount", "()", "summary", "df-generated"]
       - ["System.Threading.Tasks.Dataflow", "TransformManyBlock<TInput,TOutput>", "Complete", "()", "summary", "df-generated"]
       - ["System.Threading.Tasks.Dataflow", "TransformManyBlock<TInput,TOutput>", "ConsumeMessage", "(System.Threading.Tasks.Dataflow.DataflowMessageHeader,System.Threading.Tasks.Dataflow.ITargetBlock<TOutput>,System.Boolean)", "summary", "df-generated"]
-      - ["System.Threading.Tasks.Dataflow", "TransformManyBlock<TInput,TOutput>", "Fault", "(System.Exception)", "summary", "df-generated"]
       - ["System.Threading.Tasks.Dataflow", "TransformManyBlock<TInput,TOutput>", "OfferMessage", "(System.Threading.Tasks.Dataflow.DataflowMessageHeader,TInput,System.Threading.Tasks.Dataflow.ISourceBlock<TInput>,System.Boolean)", "summary", "df-generated"]
       - ["System.Threading.Tasks.Dataflow", "TransformManyBlock<TInput,TOutput>", "ReleaseReservation", "(System.Threading.Tasks.Dataflow.DataflowMessageHeader,System.Threading.Tasks.Dataflow.ITargetBlock<TOutput>)", "summary", "df-generated"]
       - ["System.Threading.Tasks.Dataflow", "TransformManyBlock<TInput,TOutput>", "ToString", "()", "summary", "df-generated"]
+      - ["System.Threading.Tasks.Dataflow", "TransformManyBlock<TInput,TOutput>", "TransformManyBlock", "(System.Func<TInput,System.Collections.Generic.IAsyncEnumerable<TOutput>>)", "summary", "df-generated"]
+      - ["System.Threading.Tasks.Dataflow", "TransformManyBlock<TInput,TOutput>", "TransformManyBlock", "(System.Func<TInput,System.Collections.Generic.IAsyncEnumerable<TOutput>>,System.Threading.Tasks.Dataflow.ExecutionDataflowBlockOptions)", "summary", "df-generated"]
+      - ["System.Threading.Tasks.Dataflow", "TransformManyBlock<TInput,TOutput>", "TransformManyBlock", "(System.Func<TInput,System.Collections.Generic.IEnumerable<TOutput>>)", "summary", "df-generated"]
+      - ["System.Threading.Tasks.Dataflow", "TransformManyBlock<TInput,TOutput>", "TransformManyBlock", "(System.Func<TInput,System.Collections.Generic.IEnumerable<TOutput>>,System.Threading.Tasks.Dataflow.ExecutionDataflowBlockOptions)", "summary", "df-generated"]
+      - ["System.Threading.Tasks.Dataflow", "TransformManyBlock<TInput,TOutput>", "TransformManyBlock", "(System.Func<TInput,System.Threading.Tasks.Task<System.Collections.Generic.IEnumerable<TOutput>>>)", "summary", "df-generated"]
+      - ["System.Threading.Tasks.Dataflow", "TransformManyBlock<TInput,TOutput>", "TransformManyBlock", "(System.Func<TInput,System.Threading.Tasks.Task<System.Collections.Generic.IEnumerable<TOutput>>>,System.Threading.Tasks.Dataflow.ExecutionDataflowBlockOptions)", "summary", "df-generated"]
+      - ["System.Threading.Tasks.Dataflow", "TransformManyBlock<TInput,TOutput>", "TryReceive", "(System.Predicate<TOutput>,TOutput)", "summary", "df-generated"]
       - ["System.Threading.Tasks.Dataflow", "TransformManyBlock<TInput,TOutput>", "TryReceiveAll", "(System.Collections.Generic.IList<TOutput>)", "summary", "df-generated"]
       - ["System.Threading.Tasks.Dataflow", "TransformManyBlock<TInput,TOutput>", "get_InputCount", "()", "summary", "df-generated"]
       - ["System.Threading.Tasks.Dataflow", "TransformManyBlock<TInput,TOutput>", "get_OutputCount", "()", "summary", "df-generated"]
       - ["System.Threading.Tasks.Dataflow", "WriteOnceBlock<T>", "Complete", "()", "summary", "df-generated"]
-      - ["System.Threading.Tasks.Dataflow", "WriteOnceBlock<T>", "Fault", "(System.Exception)", "summary", "df-generated"]
       - ["System.Threading.Tasks.Dataflow", "WriteOnceBlock<T>", "ReserveMessage", "(System.Threading.Tasks.Dataflow.DataflowMessageHeader,System.Threading.Tasks.Dataflow.ITargetBlock<T>)", "summary", "df-generated"]
+      - ["System.Threading.Tasks.Dataflow", "WriteOnceBlock<T>", "TryReceive", "(System.Predicate<T>,T)", "summary", "df-generated"]
+      - ["System.Threading.Tasks.Dataflow", "WriteOnceBlock<T>", "WriteOnceBlock", "(System.Func<T,T>)", "summary", "df-generated"]
diff --git a/csharp/ql/lib/ext/generated/System.Threading.Tasks.Sources.model.yml b/csharp/ql/lib/ext/generated/System.Threading.Tasks.Sources.model.yml
index b11bb25db07..9fc4e443461 100644
--- a/csharp/ql/lib/ext/generated/System.Threading.Tasks.Sources.model.yml
+++ b/csharp/ql/lib/ext/generated/System.Threading.Tasks.Sources.model.yml
@@ -4,17 +4,20 @@ extensions:
       pack: codeql/csharp-all
       extensible: summaryModel
     data:
-      - ["System.Threading.Tasks.Sources", "ManualResetValueTaskSourceCore<TResult>", False, "GetResult", "(System.Int16)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Threading.Tasks.Sources", "ManualResetValueTaskSourceCore<TResult>", False, "GetResult", "(System.Int16)", "", "Argument[this].SyntheticField[System.Threading.Tasks.Sources.ManualResetValueTaskSourceCore`1._result]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Threading.Tasks.Sources", "ManualResetValueTaskSourceCore<TResult>", False, "SetException", "(System.Exception)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Threading.Tasks.Sources", "ManualResetValueTaskSourceCore<TResult>", False, "SetResult", "(TResult)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["System.Threading.Tasks.Sources", "ManualResetValueTaskSourceCore<TResult>", False, "SetResult", "(TResult)", "", "Argument[0]", "Argument[this].SyntheticField[System.Threading.Tasks.Sources.ManualResetValueTaskSourceCore`1._result]", "value", "dfc-generated"]
   - addsTo:
       pack: codeql/csharp-all
       extensible: neutralModel
     data:
       - ["System.Threading.Tasks.Sources", "IValueTaskSource", "GetResult", "(System.Int16)", "summary", "df-generated"]
       - ["System.Threading.Tasks.Sources", "IValueTaskSource", "GetStatus", "(System.Int16)", "summary", "df-generated"]
+      - ["System.Threading.Tasks.Sources", "IValueTaskSource", "OnCompleted", "(System.Action<System.Object>,System.Object,System.Int16,System.Threading.Tasks.Sources.ValueTaskSourceOnCompletedFlags)", "summary", "df-generated"]
       - ["System.Threading.Tasks.Sources", "IValueTaskSource<TResult>", "GetResult", "(System.Int16)", "summary", "df-generated"]
       - ["System.Threading.Tasks.Sources", "IValueTaskSource<TResult>", "GetStatus", "(System.Int16)", "summary", "df-generated"]
+      - ["System.Threading.Tasks.Sources", "IValueTaskSource<TResult>", "OnCompleted", "(System.Action<System.Object>,System.Object,System.Int16,System.Threading.Tasks.Sources.ValueTaskSourceOnCompletedFlags)", "summary", "df-generated"]
       - ["System.Threading.Tasks.Sources", "ManualResetValueTaskSourceCore<TResult>", "GetStatus", "(System.Int16)", "summary", "df-generated"]
+      - ["System.Threading.Tasks.Sources", "ManualResetValueTaskSourceCore<TResult>", "OnCompleted", "(System.Action<System.Object>,System.Object,System.Int16,System.Threading.Tasks.Sources.ValueTaskSourceOnCompletedFlags)", "summary", "df-generated"]
       - ["System.Threading.Tasks.Sources", "ManualResetValueTaskSourceCore<TResult>", "Reset", "()", "summary", "df-generated"]
       - ["System.Threading.Tasks.Sources", "ManualResetValueTaskSourceCore<TResult>", "get_Version", "()", "summary", "df-generated"]
diff --git a/csharp/ql/lib/ext/generated/System.Threading.Tasks.model.yml b/csharp/ql/lib/ext/generated/System.Threading.Tasks.model.yml
index 66f58dd2358..2e64b63e1c2 100644
--- a/csharp/ql/lib/ext/generated/System.Threading.Tasks.model.yml
+++ b/csharp/ql/lib/ext/generated/System.Threading.Tasks.model.yml
@@ -25,9 +25,10 @@ extensions:
       - ["System.Threading.Tasks", "Task", False, "WaitAsync", "(System.TimeSpan,System.TimeProvider,System.Threading.CancellationToken)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
       - ["System.Threading.Tasks", "Task", False, "WaitAsync", "(System.TimeSpan,System.TimeProvider,System.Threading.CancellationToken)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Threading.Tasks", "Task", False, "WhenAny", "(System.Collections.Generic.IEnumerable<System.Threading.Tasks.Task>)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["System.Threading.Tasks", "Task", False, "WhenAny", "(System.Threading.Tasks.Task,System.Threading.Tasks.Task)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Threading.Tasks", "Task", False, "WhenAny", "(System.Threading.Tasks.Task,System.Threading.Tasks.Task)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Threading.Tasks", "Task", False, "WhenAny", "(System.Threading.Tasks.Task,System.Threading.Tasks.Task)", "", "Argument[0]", "ReturnValue.Property[System.Threading.Tasks.Task`1.Result]", "value", "dfc-generated"]
+      - ["System.Threading.Tasks", "Task", False, "WhenAny", "(System.Threading.Tasks.Task,System.Threading.Tasks.Task)", "", "Argument[1]", "ReturnValue.Property[System.Threading.Tasks.Task`1.Result]", "value", "dfc-generated"]
       - ["System.Threading.Tasks", "Task", False, "WhenAny", "(System.Threading.Tasks.Task[])", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
+      - ["System.Threading.Tasks", "Task", False, "get_AsyncState", "()", "", "Argument[this].SyntheticField[System.Threading.Tasks.Task.m_stateObject]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Threading.Tasks", "Task<TResult>", False, "ConfigureAwait", "(System.Threading.Tasks.ConfigureAwaitOptions)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Threading.Tasks", "Task<TResult>", False, "WaitAsync", "(System.Threading.CancellationToken)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Threading.Tasks", "Task<TResult>", False, "WaitAsync", "(System.TimeSpan)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
@@ -38,8 +39,8 @@ extensions:
       - ["System.Threading.Tasks", "TaskAsyncEnumerableExtensions", False, "ConfigureAwait<T>", "(System.Collections.Generic.IAsyncEnumerable<T>,System.Boolean)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["System.Threading.Tasks", "TaskAsyncEnumerableExtensions", False, "WithCancellation<T>", "(System.Collections.Generic.IAsyncEnumerable<T>,System.Threading.CancellationToken)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["System.Threading.Tasks", "TaskAsyncEnumerableExtensions", False, "WithCancellation<T>", "(System.Collections.Generic.IAsyncEnumerable<T>,System.Threading.CancellationToken)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Threading.Tasks", "TaskCanceledException", False, "TaskCanceledException", "(System.Threading.Tasks.Task)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Threading.Tasks", "TaskCanceledException", False, "get_Task", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Threading.Tasks", "TaskCanceledException", False, "TaskCanceledException", "(System.Threading.Tasks.Task)", "", "Argument[0]", "Argument[this].SyntheticField[System.Threading.Tasks.TaskCanceledException._canceledTask]", "value", "dfc-generated"]
+      - ["System.Threading.Tasks", "TaskCanceledException", False, "get_Task", "()", "", "Argument[this].SyntheticField[System.Threading.Tasks.TaskCanceledException._canceledTask]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Threading.Tasks", "TaskCompletionSource", False, "TaskCompletionSource", "(System.Object,System.Threading.Tasks.TaskCreationOptions)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Threading.Tasks", "TaskCompletionSource", False, "get_Task", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Threading.Tasks", "TaskCompletionSource<TResult>", False, "SetResult", "(TResult)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
@@ -47,41 +48,124 @@ extensions:
       - ["System.Threading.Tasks", "TaskCompletionSource<TResult>", False, "get_Task", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Threading.Tasks", "TaskExtensions", False, "Unwrap", "(System.Threading.Tasks.Task<System.Threading.Tasks.Task>)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["System.Threading.Tasks", "TaskExtensions", False, "Unwrap<TResult>", "(System.Threading.Tasks.Task<System.Threading.Tasks.Task<TResult>>)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Threading.Tasks", "TaskFactory", False, "TaskFactory", "(System.Threading.CancellationToken)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Threading.Tasks", "TaskFactory", False, "TaskFactory", "(System.Threading.CancellationToken,System.Threading.Tasks.TaskCreationOptions,System.Threading.Tasks.TaskContinuationOptions,System.Threading.Tasks.TaskScheduler)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Threading.Tasks", "TaskFactory", False, "TaskFactory", "(System.Threading.CancellationToken,System.Threading.Tasks.TaskCreationOptions,System.Threading.Tasks.TaskContinuationOptions,System.Threading.Tasks.TaskScheduler)", "", "Argument[3]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Threading.Tasks", "TaskFactory", False, "TaskFactory", "(System.Threading.Tasks.TaskScheduler)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Threading.Tasks", "TaskFactory", False, "get_CancellationToken", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Threading.Tasks", "TaskFactory", False, "get_Scheduler", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Threading.Tasks", "TaskFactory<TResult>", False, "TaskFactory", "(System.Threading.CancellationToken)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Threading.Tasks", "TaskFactory<TResult>", False, "TaskFactory", "(System.Threading.CancellationToken,System.Threading.Tasks.TaskCreationOptions,System.Threading.Tasks.TaskContinuationOptions,System.Threading.Tasks.TaskScheduler)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Threading.Tasks", "TaskFactory<TResult>", False, "TaskFactory", "(System.Threading.CancellationToken,System.Threading.Tasks.TaskCreationOptions,System.Threading.Tasks.TaskContinuationOptions,System.Threading.Tasks.TaskScheduler)", "", "Argument[3]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Threading.Tasks", "TaskFactory<TResult>", False, "TaskFactory", "(System.Threading.Tasks.TaskScheduler)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Threading.Tasks", "TaskFactory<TResult>", False, "get_CancellationToken", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Threading.Tasks", "TaskFactory<TResult>", False, "get_Scheduler", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Threading.Tasks", "TaskFactory", False, "FromAsync", "(System.Func<System.AsyncCallback,System.Object,System.IAsyncResult>,System.Action<System.IAsyncResult>,System.Object)", "", "Argument[0].ReturnValue", "Argument[1].Parameter[0]", "value", "dfc-generated"]
+      - ["System.Threading.Tasks", "TaskFactory", False, "FromAsync", "(System.Func<System.AsyncCallback,System.Object,System.IAsyncResult>,System.Action<System.IAsyncResult>,System.Object)", "", "Argument[2]", "Argument[0].Parameter[1]", "value", "dfc-generated"]
+      - ["System.Threading.Tasks", "TaskFactory", False, "FromAsync", "(System.Func<System.AsyncCallback,System.Object,System.IAsyncResult>,System.Action<System.IAsyncResult>,System.Object,System.Threading.Tasks.TaskCreationOptions)", "", "Argument[0].ReturnValue", "Argument[1].Parameter[0]", "value", "dfc-generated"]
+      - ["System.Threading.Tasks", "TaskFactory", False, "FromAsync", "(System.Func<System.AsyncCallback,System.Object,System.IAsyncResult>,System.Action<System.IAsyncResult>,System.Object,System.Threading.Tasks.TaskCreationOptions)", "", "Argument[2]", "Argument[0].Parameter[1]", "value", "dfc-generated"]
+      - ["System.Threading.Tasks", "TaskFactory", False, "FromAsync<TArg1,TArg2,TArg3,TResult>", "(System.Func<TArg1,TArg2,TArg3,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,TArg2,TArg3,System.Object)", "", "Argument[0].ReturnValue", "Argument[1].Parameter[0]", "value", "dfc-generated"]
+      - ["System.Threading.Tasks", "TaskFactory", False, "FromAsync<TArg1,TArg2,TArg3,TResult>", "(System.Func<TArg1,TArg2,TArg3,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,TArg2,TArg3,System.Object)", "", "Argument[2]", "Argument[0].Parameter[0]", "value", "dfc-generated"]
+      - ["System.Threading.Tasks", "TaskFactory", False, "FromAsync<TArg1,TArg2,TArg3,TResult>", "(System.Func<TArg1,TArg2,TArg3,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,TArg2,TArg3,System.Object)", "", "Argument[3]", "Argument[0].Parameter[1]", "value", "dfc-generated"]
+      - ["System.Threading.Tasks", "TaskFactory", False, "FromAsync<TArg1,TArg2,TArg3,TResult>", "(System.Func<TArg1,TArg2,TArg3,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,TArg2,TArg3,System.Object)", "", "Argument[4]", "Argument[0].Parameter[2]", "value", "dfc-generated"]
+      - ["System.Threading.Tasks", "TaskFactory", False, "FromAsync<TArg1,TArg2,TArg3,TResult>", "(System.Func<TArg1,TArg2,TArg3,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,TArg2,TArg3,System.Object)", "", "Argument[5]", "Argument[0].Parameter[4]", "value", "dfc-generated"]
+      - ["System.Threading.Tasks", "TaskFactory", False, "FromAsync<TArg1,TArg2,TArg3,TResult>", "(System.Func<TArg1,TArg2,TArg3,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,TArg2,TArg3,System.Object,System.Threading.Tasks.TaskCreationOptions)", "", "Argument[0].ReturnValue", "Argument[1].Parameter[0]", "value", "dfc-generated"]
+      - ["System.Threading.Tasks", "TaskFactory", False, "FromAsync<TArg1,TArg2,TArg3,TResult>", "(System.Func<TArg1,TArg2,TArg3,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,TArg2,TArg3,System.Object,System.Threading.Tasks.TaskCreationOptions)", "", "Argument[2]", "Argument[0].Parameter[0]", "value", "dfc-generated"]
+      - ["System.Threading.Tasks", "TaskFactory", False, "FromAsync<TArg1,TArg2,TArg3,TResult>", "(System.Func<TArg1,TArg2,TArg3,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,TArg2,TArg3,System.Object,System.Threading.Tasks.TaskCreationOptions)", "", "Argument[3]", "Argument[0].Parameter[1]", "value", "dfc-generated"]
+      - ["System.Threading.Tasks", "TaskFactory", False, "FromAsync<TArg1,TArg2,TArg3,TResult>", "(System.Func<TArg1,TArg2,TArg3,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,TArg2,TArg3,System.Object,System.Threading.Tasks.TaskCreationOptions)", "", "Argument[4]", "Argument[0].Parameter[2]", "value", "dfc-generated"]
+      - ["System.Threading.Tasks", "TaskFactory", False, "FromAsync<TArg1,TArg2,TArg3,TResult>", "(System.Func<TArg1,TArg2,TArg3,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,TArg2,TArg3,System.Object,System.Threading.Tasks.TaskCreationOptions)", "", "Argument[5]", "Argument[0].Parameter[4]", "value", "dfc-generated"]
+      - ["System.Threading.Tasks", "TaskFactory", False, "FromAsync<TArg1,TArg2,TArg3>", "(System.Func<TArg1,TArg2,TArg3,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Action<System.IAsyncResult>,TArg1,TArg2,TArg3,System.Object)", "", "Argument[0].ReturnValue", "Argument[1].Parameter[0]", "value", "dfc-generated"]
+      - ["System.Threading.Tasks", "TaskFactory", False, "FromAsync<TArg1,TArg2,TArg3>", "(System.Func<TArg1,TArg2,TArg3,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Action<System.IAsyncResult>,TArg1,TArg2,TArg3,System.Object)", "", "Argument[2]", "Argument[0].Parameter[0]", "value", "dfc-generated"]
+      - ["System.Threading.Tasks", "TaskFactory", False, "FromAsync<TArg1,TArg2,TArg3>", "(System.Func<TArg1,TArg2,TArg3,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Action<System.IAsyncResult>,TArg1,TArg2,TArg3,System.Object)", "", "Argument[3]", "Argument[0].Parameter[1]", "value", "dfc-generated"]
+      - ["System.Threading.Tasks", "TaskFactory", False, "FromAsync<TArg1,TArg2,TArg3>", "(System.Func<TArg1,TArg2,TArg3,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Action<System.IAsyncResult>,TArg1,TArg2,TArg3,System.Object)", "", "Argument[4]", "Argument[0].Parameter[2]", "value", "dfc-generated"]
+      - ["System.Threading.Tasks", "TaskFactory", False, "FromAsync<TArg1,TArg2,TArg3>", "(System.Func<TArg1,TArg2,TArg3,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Action<System.IAsyncResult>,TArg1,TArg2,TArg3,System.Object)", "", "Argument[5]", "Argument[0].Parameter[4]", "value", "dfc-generated"]
+      - ["System.Threading.Tasks", "TaskFactory", False, "FromAsync<TArg1,TArg2,TArg3>", "(System.Func<TArg1,TArg2,TArg3,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Action<System.IAsyncResult>,TArg1,TArg2,TArg3,System.Object,System.Threading.Tasks.TaskCreationOptions)", "", "Argument[0].ReturnValue", "Argument[1].Parameter[0]", "value", "dfc-generated"]
+      - ["System.Threading.Tasks", "TaskFactory", False, "FromAsync<TArg1,TArg2,TArg3>", "(System.Func<TArg1,TArg2,TArg3,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Action<System.IAsyncResult>,TArg1,TArg2,TArg3,System.Object,System.Threading.Tasks.TaskCreationOptions)", "", "Argument[2]", "Argument[0].Parameter[0]", "value", "dfc-generated"]
+      - ["System.Threading.Tasks", "TaskFactory", False, "FromAsync<TArg1,TArg2,TArg3>", "(System.Func<TArg1,TArg2,TArg3,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Action<System.IAsyncResult>,TArg1,TArg2,TArg3,System.Object,System.Threading.Tasks.TaskCreationOptions)", "", "Argument[3]", "Argument[0].Parameter[1]", "value", "dfc-generated"]
+      - ["System.Threading.Tasks", "TaskFactory", False, "FromAsync<TArg1,TArg2,TArg3>", "(System.Func<TArg1,TArg2,TArg3,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Action<System.IAsyncResult>,TArg1,TArg2,TArg3,System.Object,System.Threading.Tasks.TaskCreationOptions)", "", "Argument[4]", "Argument[0].Parameter[2]", "value", "dfc-generated"]
+      - ["System.Threading.Tasks", "TaskFactory", False, "FromAsync<TArg1,TArg2,TArg3>", "(System.Func<TArg1,TArg2,TArg3,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Action<System.IAsyncResult>,TArg1,TArg2,TArg3,System.Object,System.Threading.Tasks.TaskCreationOptions)", "", "Argument[5]", "Argument[0].Parameter[4]", "value", "dfc-generated"]
+      - ["System.Threading.Tasks", "TaskFactory", False, "FromAsync<TArg1,TArg2,TResult>", "(System.Func<TArg1,TArg2,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,TArg2,System.Object)", "", "Argument[0].ReturnValue", "Argument[1].Parameter[0]", "value", "dfc-generated"]
+      - ["System.Threading.Tasks", "TaskFactory", False, "FromAsync<TArg1,TArg2,TResult>", "(System.Func<TArg1,TArg2,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,TArg2,System.Object)", "", "Argument[2]", "Argument[0].Parameter[0]", "value", "dfc-generated"]
+      - ["System.Threading.Tasks", "TaskFactory", False, "FromAsync<TArg1,TArg2,TResult>", "(System.Func<TArg1,TArg2,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,TArg2,System.Object)", "", "Argument[3]", "Argument[0].Parameter[1]", "value", "dfc-generated"]
+      - ["System.Threading.Tasks", "TaskFactory", False, "FromAsync<TArg1,TArg2,TResult>", "(System.Func<TArg1,TArg2,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,TArg2,System.Object)", "", "Argument[4]", "Argument[0].Parameter[3]", "value", "dfc-generated"]
+      - ["System.Threading.Tasks", "TaskFactory", False, "FromAsync<TArg1,TArg2,TResult>", "(System.Func<TArg1,TArg2,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,TArg2,System.Object,System.Threading.Tasks.TaskCreationOptions)", "", "Argument[0].ReturnValue", "Argument[1].Parameter[0]", "value", "dfc-generated"]
+      - ["System.Threading.Tasks", "TaskFactory", False, "FromAsync<TArg1,TArg2,TResult>", "(System.Func<TArg1,TArg2,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,TArg2,System.Object,System.Threading.Tasks.TaskCreationOptions)", "", "Argument[2]", "Argument[0].Parameter[0]", "value", "dfc-generated"]
+      - ["System.Threading.Tasks", "TaskFactory", False, "FromAsync<TArg1,TArg2,TResult>", "(System.Func<TArg1,TArg2,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,TArg2,System.Object,System.Threading.Tasks.TaskCreationOptions)", "", "Argument[3]", "Argument[0].Parameter[1]", "value", "dfc-generated"]
+      - ["System.Threading.Tasks", "TaskFactory", False, "FromAsync<TArg1,TArg2,TResult>", "(System.Func<TArg1,TArg2,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,TArg2,System.Object,System.Threading.Tasks.TaskCreationOptions)", "", "Argument[4]", "Argument[0].Parameter[3]", "value", "dfc-generated"]
+      - ["System.Threading.Tasks", "TaskFactory", False, "FromAsync<TArg1,TArg2>", "(System.Func<TArg1,TArg2,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Action<System.IAsyncResult>,TArg1,TArg2,System.Object)", "", "Argument[0].ReturnValue", "Argument[1].Parameter[0]", "value", "dfc-generated"]
+      - ["System.Threading.Tasks", "TaskFactory", False, "FromAsync<TArg1,TArg2>", "(System.Func<TArg1,TArg2,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Action<System.IAsyncResult>,TArg1,TArg2,System.Object)", "", "Argument[2]", "Argument[0].Parameter[0]", "value", "dfc-generated"]
+      - ["System.Threading.Tasks", "TaskFactory", False, "FromAsync<TArg1,TArg2>", "(System.Func<TArg1,TArg2,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Action<System.IAsyncResult>,TArg1,TArg2,System.Object)", "", "Argument[3]", "Argument[0].Parameter[1]", "value", "dfc-generated"]
+      - ["System.Threading.Tasks", "TaskFactory", False, "FromAsync<TArg1,TArg2>", "(System.Func<TArg1,TArg2,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Action<System.IAsyncResult>,TArg1,TArg2,System.Object)", "", "Argument[4]", "Argument[0].Parameter[3]", "value", "dfc-generated"]
+      - ["System.Threading.Tasks", "TaskFactory", False, "FromAsync<TArg1,TArg2>", "(System.Func<TArg1,TArg2,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Action<System.IAsyncResult>,TArg1,TArg2,System.Object,System.Threading.Tasks.TaskCreationOptions)", "", "Argument[0].ReturnValue", "Argument[1].Parameter[0]", "value", "dfc-generated"]
+      - ["System.Threading.Tasks", "TaskFactory", False, "FromAsync<TArg1,TArg2>", "(System.Func<TArg1,TArg2,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Action<System.IAsyncResult>,TArg1,TArg2,System.Object,System.Threading.Tasks.TaskCreationOptions)", "", "Argument[2]", "Argument[0].Parameter[0]", "value", "dfc-generated"]
+      - ["System.Threading.Tasks", "TaskFactory", False, "FromAsync<TArg1,TArg2>", "(System.Func<TArg1,TArg2,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Action<System.IAsyncResult>,TArg1,TArg2,System.Object,System.Threading.Tasks.TaskCreationOptions)", "", "Argument[3]", "Argument[0].Parameter[1]", "value", "dfc-generated"]
+      - ["System.Threading.Tasks", "TaskFactory", False, "FromAsync<TArg1,TArg2>", "(System.Func<TArg1,TArg2,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Action<System.IAsyncResult>,TArg1,TArg2,System.Object,System.Threading.Tasks.TaskCreationOptions)", "", "Argument[4]", "Argument[0].Parameter[3]", "value", "dfc-generated"]
+      - ["System.Threading.Tasks", "TaskFactory", False, "FromAsync<TArg1,TResult>", "(System.Func<TArg1,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,System.Object)", "", "Argument[0].ReturnValue", "Argument[1].Parameter[0]", "value", "dfc-generated"]
+      - ["System.Threading.Tasks", "TaskFactory", False, "FromAsync<TArg1,TResult>", "(System.Func<TArg1,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,System.Object)", "", "Argument[2]", "Argument[0].Parameter[0]", "value", "dfc-generated"]
+      - ["System.Threading.Tasks", "TaskFactory", False, "FromAsync<TArg1,TResult>", "(System.Func<TArg1,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,System.Object)", "", "Argument[3]", "Argument[0].Parameter[2]", "value", "dfc-generated"]
+      - ["System.Threading.Tasks", "TaskFactory", False, "FromAsync<TArg1,TResult>", "(System.Func<TArg1,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,System.Object,System.Threading.Tasks.TaskCreationOptions)", "", "Argument[0].ReturnValue", "Argument[1].Parameter[0]", "value", "dfc-generated"]
+      - ["System.Threading.Tasks", "TaskFactory", False, "FromAsync<TArg1,TResult>", "(System.Func<TArg1,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,System.Object,System.Threading.Tasks.TaskCreationOptions)", "", "Argument[2]", "Argument[0].Parameter[0]", "value", "dfc-generated"]
+      - ["System.Threading.Tasks", "TaskFactory", False, "FromAsync<TArg1,TResult>", "(System.Func<TArg1,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,System.Object,System.Threading.Tasks.TaskCreationOptions)", "", "Argument[3]", "Argument[0].Parameter[2]", "value", "dfc-generated"]
+      - ["System.Threading.Tasks", "TaskFactory", False, "FromAsync<TArg1>", "(System.Func<TArg1,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Action<System.IAsyncResult>,TArg1,System.Object)", "", "Argument[0].ReturnValue", "Argument[1].Parameter[0]", "value", "dfc-generated"]
+      - ["System.Threading.Tasks", "TaskFactory", False, "FromAsync<TArg1>", "(System.Func<TArg1,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Action<System.IAsyncResult>,TArg1,System.Object)", "", "Argument[2]", "Argument[0].Parameter[0]", "value", "dfc-generated"]
+      - ["System.Threading.Tasks", "TaskFactory", False, "FromAsync<TArg1>", "(System.Func<TArg1,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Action<System.IAsyncResult>,TArg1,System.Object)", "", "Argument[3]", "Argument[0].Parameter[2]", "value", "dfc-generated"]
+      - ["System.Threading.Tasks", "TaskFactory", False, "FromAsync<TArg1>", "(System.Func<TArg1,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Action<System.IAsyncResult>,TArg1,System.Object,System.Threading.Tasks.TaskCreationOptions)", "", "Argument[0].ReturnValue", "Argument[1].Parameter[0]", "value", "dfc-generated"]
+      - ["System.Threading.Tasks", "TaskFactory", False, "FromAsync<TArg1>", "(System.Func<TArg1,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Action<System.IAsyncResult>,TArg1,System.Object,System.Threading.Tasks.TaskCreationOptions)", "", "Argument[2]", "Argument[0].Parameter[0]", "value", "dfc-generated"]
+      - ["System.Threading.Tasks", "TaskFactory", False, "FromAsync<TArg1>", "(System.Func<TArg1,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Action<System.IAsyncResult>,TArg1,System.Object,System.Threading.Tasks.TaskCreationOptions)", "", "Argument[3]", "Argument[0].Parameter[2]", "value", "dfc-generated"]
+      - ["System.Threading.Tasks", "TaskFactory", False, "FromAsync<TResult>", "(System.Func<System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,System.Object)", "", "Argument[0].ReturnValue", "Argument[1].Parameter[0]", "value", "dfc-generated"]
+      - ["System.Threading.Tasks", "TaskFactory", False, "FromAsync<TResult>", "(System.Func<System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,System.Object)", "", "Argument[2]", "Argument[0].Parameter[1]", "value", "dfc-generated"]
+      - ["System.Threading.Tasks", "TaskFactory", False, "FromAsync<TResult>", "(System.Func<System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,System.Object,System.Threading.Tasks.TaskCreationOptions)", "", "Argument[0].ReturnValue", "Argument[1].Parameter[0]", "value", "dfc-generated"]
+      - ["System.Threading.Tasks", "TaskFactory", False, "FromAsync<TResult>", "(System.Func<System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,System.Object,System.Threading.Tasks.TaskCreationOptions)", "", "Argument[2]", "Argument[0].Parameter[1]", "value", "dfc-generated"]
+      - ["System.Threading.Tasks", "TaskFactory", False, "TaskFactory", "(System.Threading.CancellationToken)", "", "Argument[0]", "Argument[this].SyntheticField[System.Threading.Tasks.TaskFactory.m_defaultCancellationToken]", "value", "dfc-generated"]
+      - ["System.Threading.Tasks", "TaskFactory", False, "TaskFactory", "(System.Threading.CancellationToken,System.Threading.Tasks.TaskCreationOptions,System.Threading.Tasks.TaskContinuationOptions,System.Threading.Tasks.TaskScheduler)", "", "Argument[0]", "Argument[this].SyntheticField[System.Threading.Tasks.TaskFactory.m_defaultCancellationToken]", "value", "dfc-generated"]
+      - ["System.Threading.Tasks", "TaskFactory", False, "TaskFactory", "(System.Threading.CancellationToken,System.Threading.Tasks.TaskCreationOptions,System.Threading.Tasks.TaskContinuationOptions,System.Threading.Tasks.TaskScheduler)", "", "Argument[3]", "Argument[this].SyntheticField[System.Threading.Tasks.TaskFactory.m_defaultScheduler]", "value", "dfc-generated"]
+      - ["System.Threading.Tasks", "TaskFactory", False, "TaskFactory", "(System.Threading.Tasks.TaskScheduler)", "", "Argument[0]", "Argument[this].SyntheticField[System.Threading.Tasks.TaskFactory.m_defaultScheduler]", "value", "dfc-generated"]
+      - ["System.Threading.Tasks", "TaskFactory", False, "get_CancellationToken", "()", "", "Argument[this].SyntheticField[System.Threading.Tasks.TaskFactory.m_defaultCancellationToken]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Threading.Tasks", "TaskFactory", False, "get_Scheduler", "()", "", "Argument[this].SyntheticField[System.Threading.Tasks.TaskFactory.m_defaultScheduler]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Threading.Tasks", "TaskFactory<TResult>", False, "FromAsync", "(System.Func<System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,System.Object)", "", "Argument[0].ReturnValue", "Argument[1].Parameter[0]", "value", "dfc-generated"]
+      - ["System.Threading.Tasks", "TaskFactory<TResult>", False, "FromAsync", "(System.Func<System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,System.Object)", "", "Argument[2]", "Argument[0].Parameter[1]", "value", "dfc-generated"]
+      - ["System.Threading.Tasks", "TaskFactory<TResult>", False, "FromAsync", "(System.Func<System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,System.Object,System.Threading.Tasks.TaskCreationOptions)", "", "Argument[0].ReturnValue", "Argument[1].Parameter[0]", "value", "dfc-generated"]
+      - ["System.Threading.Tasks", "TaskFactory<TResult>", False, "FromAsync", "(System.Func<System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,System.Object,System.Threading.Tasks.TaskCreationOptions)", "", "Argument[2]", "Argument[0].Parameter[1]", "value", "dfc-generated"]
+      - ["System.Threading.Tasks", "TaskFactory<TResult>", False, "FromAsync<TArg1,TArg2,TArg3>", "(System.Func<TArg1,TArg2,TArg3,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,TArg2,TArg3,System.Object)", "", "Argument[0].ReturnValue", "Argument[1].Parameter[0]", "value", "dfc-generated"]
+      - ["System.Threading.Tasks", "TaskFactory<TResult>", False, "FromAsync<TArg1,TArg2,TArg3>", "(System.Func<TArg1,TArg2,TArg3,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,TArg2,TArg3,System.Object)", "", "Argument[2]", "Argument[0].Parameter[0]", "value", "dfc-generated"]
+      - ["System.Threading.Tasks", "TaskFactory<TResult>", False, "FromAsync<TArg1,TArg2,TArg3>", "(System.Func<TArg1,TArg2,TArg3,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,TArg2,TArg3,System.Object)", "", "Argument[3]", "Argument[0].Parameter[1]", "value", "dfc-generated"]
+      - ["System.Threading.Tasks", "TaskFactory<TResult>", False, "FromAsync<TArg1,TArg2,TArg3>", "(System.Func<TArg1,TArg2,TArg3,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,TArg2,TArg3,System.Object)", "", "Argument[4]", "Argument[0].Parameter[2]", "value", "dfc-generated"]
+      - ["System.Threading.Tasks", "TaskFactory<TResult>", False, "FromAsync<TArg1,TArg2,TArg3>", "(System.Func<TArg1,TArg2,TArg3,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,TArg2,TArg3,System.Object)", "", "Argument[5]", "Argument[0].Parameter[4]", "value", "dfc-generated"]
+      - ["System.Threading.Tasks", "TaskFactory<TResult>", False, "FromAsync<TArg1,TArg2,TArg3>", "(System.Func<TArg1,TArg2,TArg3,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,TArg2,TArg3,System.Object,System.Threading.Tasks.TaskCreationOptions)", "", "Argument[0].ReturnValue", "Argument[1].Parameter[0]", "value", "dfc-generated"]
+      - ["System.Threading.Tasks", "TaskFactory<TResult>", False, "FromAsync<TArg1,TArg2,TArg3>", "(System.Func<TArg1,TArg2,TArg3,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,TArg2,TArg3,System.Object,System.Threading.Tasks.TaskCreationOptions)", "", "Argument[2]", "Argument[0].Parameter[0]", "value", "dfc-generated"]
+      - ["System.Threading.Tasks", "TaskFactory<TResult>", False, "FromAsync<TArg1,TArg2,TArg3>", "(System.Func<TArg1,TArg2,TArg3,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,TArg2,TArg3,System.Object,System.Threading.Tasks.TaskCreationOptions)", "", "Argument[3]", "Argument[0].Parameter[1]", "value", "dfc-generated"]
+      - ["System.Threading.Tasks", "TaskFactory<TResult>", False, "FromAsync<TArg1,TArg2,TArg3>", "(System.Func<TArg1,TArg2,TArg3,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,TArg2,TArg3,System.Object,System.Threading.Tasks.TaskCreationOptions)", "", "Argument[4]", "Argument[0].Parameter[2]", "value", "dfc-generated"]
+      - ["System.Threading.Tasks", "TaskFactory<TResult>", False, "FromAsync<TArg1,TArg2,TArg3>", "(System.Func<TArg1,TArg2,TArg3,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,TArg2,TArg3,System.Object,System.Threading.Tasks.TaskCreationOptions)", "", "Argument[5]", "Argument[0].Parameter[4]", "value", "dfc-generated"]
+      - ["System.Threading.Tasks", "TaskFactory<TResult>", False, "FromAsync<TArg1,TArg2>", "(System.Func<TArg1,TArg2,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,TArg2,System.Object)", "", "Argument[0].ReturnValue", "Argument[1].Parameter[0]", "value", "dfc-generated"]
+      - ["System.Threading.Tasks", "TaskFactory<TResult>", False, "FromAsync<TArg1,TArg2>", "(System.Func<TArg1,TArg2,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,TArg2,System.Object)", "", "Argument[2]", "Argument[0].Parameter[0]", "value", "dfc-generated"]
+      - ["System.Threading.Tasks", "TaskFactory<TResult>", False, "FromAsync<TArg1,TArg2>", "(System.Func<TArg1,TArg2,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,TArg2,System.Object)", "", "Argument[3]", "Argument[0].Parameter[1]", "value", "dfc-generated"]
+      - ["System.Threading.Tasks", "TaskFactory<TResult>", False, "FromAsync<TArg1,TArg2>", "(System.Func<TArg1,TArg2,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,TArg2,System.Object)", "", "Argument[4]", "Argument[0].Parameter[3]", "value", "dfc-generated"]
+      - ["System.Threading.Tasks", "TaskFactory<TResult>", False, "FromAsync<TArg1,TArg2>", "(System.Func<TArg1,TArg2,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,TArg2,System.Object,System.Threading.Tasks.TaskCreationOptions)", "", "Argument[0].ReturnValue", "Argument[1].Parameter[0]", "value", "dfc-generated"]
+      - ["System.Threading.Tasks", "TaskFactory<TResult>", False, "FromAsync<TArg1,TArg2>", "(System.Func<TArg1,TArg2,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,TArg2,System.Object,System.Threading.Tasks.TaskCreationOptions)", "", "Argument[2]", "Argument[0].Parameter[0]", "value", "dfc-generated"]
+      - ["System.Threading.Tasks", "TaskFactory<TResult>", False, "FromAsync<TArg1,TArg2>", "(System.Func<TArg1,TArg2,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,TArg2,System.Object,System.Threading.Tasks.TaskCreationOptions)", "", "Argument[3]", "Argument[0].Parameter[1]", "value", "dfc-generated"]
+      - ["System.Threading.Tasks", "TaskFactory<TResult>", False, "FromAsync<TArg1,TArg2>", "(System.Func<TArg1,TArg2,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,TArg2,System.Object,System.Threading.Tasks.TaskCreationOptions)", "", "Argument[4]", "Argument[0].Parameter[3]", "value", "dfc-generated"]
+      - ["System.Threading.Tasks", "TaskFactory<TResult>", False, "FromAsync<TArg1>", "(System.Func<TArg1,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,System.Object)", "", "Argument[0].ReturnValue", "Argument[1].Parameter[0]", "value", "dfc-generated"]
+      - ["System.Threading.Tasks", "TaskFactory<TResult>", False, "FromAsync<TArg1>", "(System.Func<TArg1,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,System.Object)", "", "Argument[2]", "Argument[0].Parameter[0]", "value", "dfc-generated"]
+      - ["System.Threading.Tasks", "TaskFactory<TResult>", False, "FromAsync<TArg1>", "(System.Func<TArg1,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,System.Object)", "", "Argument[3]", "Argument[0].Parameter[2]", "value", "dfc-generated"]
+      - ["System.Threading.Tasks", "TaskFactory<TResult>", False, "FromAsync<TArg1>", "(System.Func<TArg1,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,System.Object,System.Threading.Tasks.TaskCreationOptions)", "", "Argument[0].ReturnValue", "Argument[1].Parameter[0]", "value", "dfc-generated"]
+      - ["System.Threading.Tasks", "TaskFactory<TResult>", False, "FromAsync<TArg1>", "(System.Func<TArg1,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,System.Object,System.Threading.Tasks.TaskCreationOptions)", "", "Argument[2]", "Argument[0].Parameter[0]", "value", "dfc-generated"]
+      - ["System.Threading.Tasks", "TaskFactory<TResult>", False, "FromAsync<TArg1>", "(System.Func<TArg1,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,System.Object,System.Threading.Tasks.TaskCreationOptions)", "", "Argument[3]", "Argument[0].Parameter[2]", "value", "dfc-generated"]
+      - ["System.Threading.Tasks", "TaskFactory<TResult>", False, "TaskFactory", "(System.Threading.CancellationToken)", "", "Argument[0]", "Argument[this].SyntheticField[System.Threading.Tasks.TaskFactory`1.m_defaultCancellationToken]", "value", "dfc-generated"]
+      - ["System.Threading.Tasks", "TaskFactory<TResult>", False, "TaskFactory", "(System.Threading.CancellationToken,System.Threading.Tasks.TaskCreationOptions,System.Threading.Tasks.TaskContinuationOptions,System.Threading.Tasks.TaskScheduler)", "", "Argument[0]", "Argument[this].SyntheticField[System.Threading.Tasks.TaskFactory`1.m_defaultCancellationToken]", "value", "dfc-generated"]
+      - ["System.Threading.Tasks", "TaskFactory<TResult>", False, "TaskFactory", "(System.Threading.CancellationToken,System.Threading.Tasks.TaskCreationOptions,System.Threading.Tasks.TaskContinuationOptions,System.Threading.Tasks.TaskScheduler)", "", "Argument[3]", "Argument[this].SyntheticField[System.Threading.Tasks.TaskFactory`1.m_defaultScheduler]", "value", "dfc-generated"]
+      - ["System.Threading.Tasks", "TaskFactory<TResult>", False, "TaskFactory", "(System.Threading.Tasks.TaskScheduler)", "", "Argument[0]", "Argument[this].SyntheticField[System.Threading.Tasks.TaskFactory`1.m_defaultScheduler]", "value", "dfc-generated"]
+      - ["System.Threading.Tasks", "TaskFactory<TResult>", False, "get_CancellationToken", "()", "", "Argument[this].SyntheticField[System.Threading.Tasks.TaskFactory`1.m_defaultCancellationToken]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Threading.Tasks", "TaskFactory<TResult>", False, "get_Scheduler", "()", "", "Argument[this].SyntheticField[System.Threading.Tasks.TaskFactory`1.m_defaultScheduler]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Threading.Tasks", "TaskScheduler", True, "GetScheduledTasks", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Threading.Tasks", "TimeProviderTaskExtensions", False, "Delay", "(System.TimeProvider,System.TimeSpan,System.Threading.CancellationToken)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Threading.Tasks", "TimeProviderTaskExtensions", False, "WaitAsync", "(System.Threading.Tasks.Task,System.TimeSpan,System.TimeProvider,System.Threading.CancellationToken)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Threading.Tasks", "TimeProviderTaskExtensions", False, "WaitAsync", "(System.Threading.Tasks.Task,System.TimeSpan,System.TimeProvider,System.Threading.CancellationToken)", "", "Argument[3]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Threading.Tasks", "TimeProviderTaskExtensions", False, "WaitAsync<TResult>", "(System.Threading.Tasks.Task<TResult>,System.TimeSpan,System.TimeProvider,System.Threading.CancellationToken)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Threading.Tasks", "UnobservedTaskExceptionEventArgs", False, "UnobservedTaskExceptionEventArgs", "(System.AggregateException)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Threading.Tasks", "UnobservedTaskExceptionEventArgs", False, "get_Exception", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Threading.Tasks", "ValueTask", False, "AsTask", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Threading.Tasks", "TaskToAsyncResult", False, "Begin", "(System.Threading.Tasks.Task,System.AsyncCallback,System.Object)", "", "Argument[0]", "ReturnValue.SyntheticField[System.Threading.Tasks.TaskToAsyncResult+TaskAsyncResult._task]", "value", "dfc-generated"]
+      - ["System.Threading.Tasks", "UnobservedTaskExceptionEventArgs", False, "UnobservedTaskExceptionEventArgs", "(System.AggregateException)", "", "Argument[0]", "Argument[this].SyntheticField[System.Threading.Tasks.UnobservedTaskExceptionEventArgs.m_exception]", "value", "dfc-generated"]
+      - ["System.Threading.Tasks", "UnobservedTaskExceptionEventArgs", False, "get_Exception", "()", "", "Argument[this].SyntheticField[System.Threading.Tasks.UnobservedTaskExceptionEventArgs.m_exception]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Threading.Tasks", "ValueTask", False, "AsTask", "()", "", "Argument[this].SyntheticField[System.Threading.Tasks.ValueTask._obj]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Threading.Tasks", "ValueTask", False, "ConfigureAwait", "(System.Boolean)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Threading.Tasks", "ValueTask", False, "FromResult<TResult>", "(TResult)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["System.Threading.Tasks", "ValueTask", False, "GetAwaiter", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Threading.Tasks", "ValueTask", False, "Preserve", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Threading.Tasks", "ValueTask", False, "ValueTask", "(System.Threading.Tasks.Sources.IValueTaskSource,System.Int16)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Threading.Tasks", "ValueTask", False, "ValueTask", "(System.Threading.Tasks.Task)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Threading.Tasks", "ValueTask<TResult>", False, "AsTask", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Threading.Tasks", "ValueTask", False, "Preserve", "()", "", "Argument[this].SyntheticField[System.Threading.Tasks.ValueTask._obj]", "ReturnValue.SyntheticField[System.Threading.Tasks.ValueTask._obj]", "value", "dfc-generated"]
+      - ["System.Threading.Tasks", "ValueTask", False, "Preserve", "()", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Threading.Tasks", "ValueTask", False, "ValueTask", "(System.Threading.Tasks.Sources.IValueTaskSource,System.Int16)", "", "Argument[0]", "Argument[this].SyntheticField[System.Threading.Tasks.ValueTask._obj]", "value", "dfc-generated"]
+      - ["System.Threading.Tasks", "ValueTask", False, "ValueTask", "(System.Threading.Tasks.Task)", "", "Argument[0]", "Argument[this].SyntheticField[System.Threading.Tasks.ValueTask._obj]", "value", "dfc-generated"]
+      - ["System.Threading.Tasks", "ValueTask<TResult>", False, "AsTask", "()", "", "Argument[this].SyntheticField[System.Threading.Tasks.ValueTask`1._obj]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Threading.Tasks", "ValueTask<TResult>", False, "AsTask", "()", "", "Argument[this].SyntheticField[System.Threading.Tasks.ValueTask`1._result]", "ReturnValue.Property[System.Threading.Tasks.Task`1.Result]", "value", "dfc-generated"]
       - ["System.Threading.Tasks", "ValueTask<TResult>", False, "ConfigureAwait", "(System.Boolean)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Threading.Tasks", "ValueTask<TResult>", False, "GetAwaiter", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Threading.Tasks", "ValueTask<TResult>", False, "Preserve", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Threading.Tasks", "ValueTask<TResult>", False, "ToString", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Threading.Tasks", "ValueTask<TResult>", False, "ValueTask", "(System.Threading.Tasks.Sources.IValueTaskSource<TResult>,System.Int16)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Threading.Tasks", "ValueTask<TResult>", False, "ValueTask", "(System.Threading.Tasks.Task<TResult>)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Threading.Tasks", "ValueTask<TResult>", False, "ValueTask", "(TResult)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Threading.Tasks", "ValueTask<TResult>", False, "get_Result", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Threading.Tasks", "ValueTask<TResult>", False, "ValueTask", "(System.Threading.Tasks.Sources.IValueTaskSource<TResult>,System.Int16)", "", "Argument[0]", "Argument[this].SyntheticField[System.Threading.Tasks.ValueTask`1._obj]", "value", "dfc-generated"]
+      - ["System.Threading.Tasks", "ValueTask<TResult>", False, "ValueTask", "(System.Threading.Tasks.Task<TResult>)", "", "Argument[0]", "Argument[this].SyntheticField[System.Threading.Tasks.ValueTask`1._obj]", "value", "dfc-generated"]
+      - ["System.Threading.Tasks", "ValueTask<TResult>", False, "ValueTask", "(TResult)", "", "Argument[0]", "Argument[this].SyntheticField[System.Threading.Tasks.ValueTask`1._result]", "value", "dfc-generated"]
+      - ["System.Threading.Tasks", "ValueTask<TResult>", False, "get_Result", "()", "", "Argument[this].SyntheticField[System.Threading.Tasks.ValueTask`1._result]", "ReturnValue", "value", "dfc-generated"]
   - addsTo:
       pack: codeql/csharp-all
       extensible: neutralModel
@@ -90,6 +174,47 @@ extensions:
       - ["System.Threading.Tasks", "ConcurrentExclusiveSchedulerPair", "ConcurrentExclusiveSchedulerPair", "(System.Threading.Tasks.TaskScheduler)", "summary", "df-generated"]
       - ["System.Threading.Tasks", "ConcurrentExclusiveSchedulerPair", "ConcurrentExclusiveSchedulerPair", "(System.Threading.Tasks.TaskScheduler,System.Int32)", "summary", "df-generated"]
       - ["System.Threading.Tasks", "ConcurrentExclusiveSchedulerPair", "get_Completion", "()", "summary", "df-generated"]
+      - ["System.Threading.Tasks", "Parallel", "For", "(System.Int32,System.Int32,System.Action<System.Int32,System.Threading.Tasks.ParallelLoopState>)", "summary", "df-generated"]
+      - ["System.Threading.Tasks", "Parallel", "For", "(System.Int32,System.Int32,System.Action<System.Int32>)", "summary", "df-generated"]
+      - ["System.Threading.Tasks", "Parallel", "For", "(System.Int32,System.Int32,System.Threading.Tasks.ParallelOptions,System.Action<System.Int32,System.Threading.Tasks.ParallelLoopState>)", "summary", "df-generated"]
+      - ["System.Threading.Tasks", "Parallel", "For", "(System.Int32,System.Int32,System.Threading.Tasks.ParallelOptions,System.Action<System.Int32>)", "summary", "df-generated"]
+      - ["System.Threading.Tasks", "Parallel", "For", "(System.Int64,System.Int64,System.Action<System.Int64,System.Threading.Tasks.ParallelLoopState>)", "summary", "df-generated"]
+      - ["System.Threading.Tasks", "Parallel", "For", "(System.Int64,System.Int64,System.Action<System.Int64>)", "summary", "df-generated"]
+      - ["System.Threading.Tasks", "Parallel", "For", "(System.Int64,System.Int64,System.Threading.Tasks.ParallelOptions,System.Action<System.Int64,System.Threading.Tasks.ParallelLoopState>)", "summary", "df-generated"]
+      - ["System.Threading.Tasks", "Parallel", "For", "(System.Int64,System.Int64,System.Threading.Tasks.ParallelOptions,System.Action<System.Int64>)", "summary", "df-generated"]
+      - ["System.Threading.Tasks", "Parallel", "For<TLocal>", "(System.Int32,System.Int32,System.Func<TLocal>,System.Func<System.Int32,System.Threading.Tasks.ParallelLoopState,TLocal,TLocal>,System.Action<TLocal>)", "summary", "df-generated"]
+      - ["System.Threading.Tasks", "Parallel", "For<TLocal>", "(System.Int32,System.Int32,System.Threading.Tasks.ParallelOptions,System.Func<TLocal>,System.Func<System.Int32,System.Threading.Tasks.ParallelLoopState,TLocal,TLocal>,System.Action<TLocal>)", "summary", "df-generated"]
+      - ["System.Threading.Tasks", "Parallel", "For<TLocal>", "(System.Int64,System.Int64,System.Func<TLocal>,System.Func<System.Int64,System.Threading.Tasks.ParallelLoopState,TLocal,TLocal>,System.Action<TLocal>)", "summary", "df-generated"]
+      - ["System.Threading.Tasks", "Parallel", "For<TLocal>", "(System.Int64,System.Int64,System.Threading.Tasks.ParallelOptions,System.Func<TLocal>,System.Func<System.Int64,System.Threading.Tasks.ParallelLoopState,TLocal,TLocal>,System.Action<TLocal>)", "summary", "df-generated"]
+      - ["System.Threading.Tasks", "Parallel", "ForAsync<T>", "(T,T,System.Func<T,System.Threading.CancellationToken,System.Threading.Tasks.ValueTask>)", "summary", "df-generated"]
+      - ["System.Threading.Tasks", "Parallel", "ForAsync<T>", "(T,T,System.Threading.CancellationToken,System.Func<T,System.Threading.CancellationToken,System.Threading.Tasks.ValueTask>)", "summary", "df-generated"]
+      - ["System.Threading.Tasks", "Parallel", "ForAsync<T>", "(T,T,System.Threading.Tasks.ParallelOptions,System.Func<T,System.Threading.CancellationToken,System.Threading.Tasks.ValueTask>)", "summary", "df-generated"]
+      - ["System.Threading.Tasks", "Parallel", "ForEach<TSource,TLocal>", "(System.Collections.Concurrent.OrderablePartitioner<TSource>,System.Func<TLocal>,System.Func<TSource,System.Threading.Tasks.ParallelLoopState,System.Int64,TLocal,TLocal>,System.Action<TLocal>)", "summary", "df-generated"]
+      - ["System.Threading.Tasks", "Parallel", "ForEach<TSource,TLocal>", "(System.Collections.Concurrent.OrderablePartitioner<TSource>,System.Threading.Tasks.ParallelOptions,System.Func<TLocal>,System.Func<TSource,System.Threading.Tasks.ParallelLoopState,System.Int64,TLocal,TLocal>,System.Action<TLocal>)", "summary", "df-generated"]
+      - ["System.Threading.Tasks", "Parallel", "ForEach<TSource,TLocal>", "(System.Collections.Concurrent.Partitioner<TSource>,System.Func<TLocal>,System.Func<TSource,System.Threading.Tasks.ParallelLoopState,TLocal,TLocal>,System.Action<TLocal>)", "summary", "df-generated"]
+      - ["System.Threading.Tasks", "Parallel", "ForEach<TSource,TLocal>", "(System.Collections.Concurrent.Partitioner<TSource>,System.Threading.Tasks.ParallelOptions,System.Func<TLocal>,System.Func<TSource,System.Threading.Tasks.ParallelLoopState,TLocal,TLocal>,System.Action<TLocal>)", "summary", "df-generated"]
+      - ["System.Threading.Tasks", "Parallel", "ForEach<TSource,TLocal>", "(System.Collections.Generic.IEnumerable<TSource>,System.Func<TLocal>,System.Func<TSource,System.Threading.Tasks.ParallelLoopState,System.Int64,TLocal,TLocal>,System.Action<TLocal>)", "summary", "df-generated"]
+      - ["System.Threading.Tasks", "Parallel", "ForEach<TSource,TLocal>", "(System.Collections.Generic.IEnumerable<TSource>,System.Func<TLocal>,System.Func<TSource,System.Threading.Tasks.ParallelLoopState,TLocal,TLocal>,System.Action<TLocal>)", "summary", "df-generated"]
+      - ["System.Threading.Tasks", "Parallel", "ForEach<TSource,TLocal>", "(System.Collections.Generic.IEnumerable<TSource>,System.Threading.Tasks.ParallelOptions,System.Func<TLocal>,System.Func<TSource,System.Threading.Tasks.ParallelLoopState,System.Int64,TLocal,TLocal>,System.Action<TLocal>)", "summary", "df-generated"]
+      - ["System.Threading.Tasks", "Parallel", "ForEach<TSource,TLocal>", "(System.Collections.Generic.IEnumerable<TSource>,System.Threading.Tasks.ParallelOptions,System.Func<TLocal>,System.Func<TSource,System.Threading.Tasks.ParallelLoopState,TLocal,TLocal>,System.Action<TLocal>)", "summary", "df-generated"]
+      - ["System.Threading.Tasks", "Parallel", "ForEach<TSource>", "(System.Collections.Concurrent.OrderablePartitioner<TSource>,System.Action<TSource,System.Threading.Tasks.ParallelLoopState,System.Int64>)", "summary", "df-generated"]
+      - ["System.Threading.Tasks", "Parallel", "ForEach<TSource>", "(System.Collections.Concurrent.OrderablePartitioner<TSource>,System.Threading.Tasks.ParallelOptions,System.Action<TSource,System.Threading.Tasks.ParallelLoopState,System.Int64>)", "summary", "df-generated"]
+      - ["System.Threading.Tasks", "Parallel", "ForEach<TSource>", "(System.Collections.Concurrent.Partitioner<TSource>,System.Action<TSource,System.Threading.Tasks.ParallelLoopState>)", "summary", "df-generated"]
+      - ["System.Threading.Tasks", "Parallel", "ForEach<TSource>", "(System.Collections.Concurrent.Partitioner<TSource>,System.Action<TSource>)", "summary", "df-generated"]
+      - ["System.Threading.Tasks", "Parallel", "ForEach<TSource>", "(System.Collections.Concurrent.Partitioner<TSource>,System.Threading.Tasks.ParallelOptions,System.Action<TSource,System.Threading.Tasks.ParallelLoopState>)", "summary", "df-generated"]
+      - ["System.Threading.Tasks", "Parallel", "ForEach<TSource>", "(System.Collections.Concurrent.Partitioner<TSource>,System.Threading.Tasks.ParallelOptions,System.Action<TSource>)", "summary", "df-generated"]
+      - ["System.Threading.Tasks", "Parallel", "ForEach<TSource>", "(System.Collections.Generic.IEnumerable<TSource>,System.Action<TSource,System.Threading.Tasks.ParallelLoopState,System.Int64>)", "summary", "df-generated"]
+      - ["System.Threading.Tasks", "Parallel", "ForEach<TSource>", "(System.Collections.Generic.IEnumerable<TSource>,System.Action<TSource,System.Threading.Tasks.ParallelLoopState>)", "summary", "df-generated"]
+      - ["System.Threading.Tasks", "Parallel", "ForEach<TSource>", "(System.Collections.Generic.IEnumerable<TSource>,System.Action<TSource>)", "summary", "df-generated"]
+      - ["System.Threading.Tasks", "Parallel", "ForEach<TSource>", "(System.Collections.Generic.IEnumerable<TSource>,System.Threading.Tasks.ParallelOptions,System.Action<TSource,System.Threading.Tasks.ParallelLoopState,System.Int64>)", "summary", "df-generated"]
+      - ["System.Threading.Tasks", "Parallel", "ForEach<TSource>", "(System.Collections.Generic.IEnumerable<TSource>,System.Threading.Tasks.ParallelOptions,System.Action<TSource,System.Threading.Tasks.ParallelLoopState>)", "summary", "df-generated"]
+      - ["System.Threading.Tasks", "Parallel", "ForEach<TSource>", "(System.Collections.Generic.IEnumerable<TSource>,System.Threading.Tasks.ParallelOptions,System.Action<TSource>)", "summary", "df-generated"]
+      - ["System.Threading.Tasks", "Parallel", "ForEachAsync<TSource>", "(System.Collections.Generic.IAsyncEnumerable<TSource>,System.Func<TSource,System.Threading.CancellationToken,System.Threading.Tasks.ValueTask>)", "summary", "df-generated"]
+      - ["System.Threading.Tasks", "Parallel", "ForEachAsync<TSource>", "(System.Collections.Generic.IAsyncEnumerable<TSource>,System.Threading.CancellationToken,System.Func<TSource,System.Threading.CancellationToken,System.Threading.Tasks.ValueTask>)", "summary", "df-generated"]
+      - ["System.Threading.Tasks", "Parallel", "ForEachAsync<TSource>", "(System.Collections.Generic.IAsyncEnumerable<TSource>,System.Threading.Tasks.ParallelOptions,System.Func<TSource,System.Threading.CancellationToken,System.Threading.Tasks.ValueTask>)", "summary", "df-generated"]
+      - ["System.Threading.Tasks", "Parallel", "ForEachAsync<TSource>", "(System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,System.Threading.CancellationToken,System.Threading.Tasks.ValueTask>)", "summary", "df-generated"]
+      - ["System.Threading.Tasks", "Parallel", "ForEachAsync<TSource>", "(System.Collections.Generic.IEnumerable<TSource>,System.Threading.CancellationToken,System.Func<TSource,System.Threading.CancellationToken,System.Threading.Tasks.ValueTask>)", "summary", "df-generated"]
+      - ["System.Threading.Tasks", "Parallel", "ForEachAsync<TSource>", "(System.Collections.Generic.IEnumerable<TSource>,System.Threading.Tasks.ParallelOptions,System.Func<TSource,System.Threading.CancellationToken,System.Threading.Tasks.ValueTask>)", "summary", "df-generated"]
       - ["System.Threading.Tasks", "Parallel", "Invoke", "(System.Action[])", "summary", "df-generated"]
       - ["System.Threading.Tasks", "Parallel", "Invoke", "(System.Threading.Tasks.ParallelOptions,System.Action[])", "summary", "df-generated"]
       - ["System.Threading.Tasks", "ParallelLoopResult", "get_IsCompleted", "()", "summary", "df-generated"]
@@ -98,6 +223,11 @@ extensions:
       - ["System.Threading.Tasks", "ParallelLoopState", "get_IsExceptional", "()", "summary", "df-generated"]
       - ["System.Threading.Tasks", "ParallelLoopState", "get_IsStopped", "()", "summary", "df-generated"]
       - ["System.Threading.Tasks", "ParallelLoopState", "get_ShouldExitCurrentIteration", "()", "summary", "df-generated"]
+      - ["System.Threading.Tasks", "Task", "ContinueWith", "(System.Action<System.Threading.Tasks.Task>)", "summary", "df-generated"]
+      - ["System.Threading.Tasks", "Task", "ContinueWith", "(System.Action<System.Threading.Tasks.Task>,System.Threading.CancellationToken)", "summary", "df-generated"]
+      - ["System.Threading.Tasks", "Task", "ContinueWith", "(System.Action<System.Threading.Tasks.Task>,System.Threading.CancellationToken,System.Threading.Tasks.TaskContinuationOptions,System.Threading.Tasks.TaskScheduler)", "summary", "df-generated"]
+      - ["System.Threading.Tasks", "Task", "ContinueWith", "(System.Action<System.Threading.Tasks.Task>,System.Threading.Tasks.TaskContinuationOptions)", "summary", "df-generated"]
+      - ["System.Threading.Tasks", "Task", "ContinueWith", "(System.Action<System.Threading.Tasks.Task>,System.Threading.Tasks.TaskScheduler)", "summary", "df-generated"]
       - ["System.Threading.Tasks", "Task", "Delay", "(System.Int32)", "summary", "df-generated"]
       - ["System.Threading.Tasks", "Task", "Delay", "(System.TimeSpan)", "summary", "df-generated"]
       - ["System.Threading.Tasks", "Task", "Delay", "(System.TimeSpan,System.TimeProvider)", "summary", "df-generated"]
@@ -106,10 +236,18 @@ extensions:
       - ["System.Threading.Tasks", "Task", "FromCanceled<TResult>", "(System.Threading.CancellationToken)", "summary", "df-generated"]
       - ["System.Threading.Tasks", "Task", "FromException", "(System.Exception)", "summary", "df-generated"]
       - ["System.Threading.Tasks", "Task", "FromException<TResult>", "(System.Exception)", "summary", "df-generated"]
+      - ["System.Threading.Tasks", "Task", "Run", "(System.Action)", "summary", "df-generated"]
+      - ["System.Threading.Tasks", "Task", "Run", "(System.Action,System.Threading.CancellationToken)", "summary", "df-generated"]
+      - ["System.Threading.Tasks", "Task", "Run", "(System.Func<System.Threading.Tasks.Task>)", "summary", "df-generated"]
+      - ["System.Threading.Tasks", "Task", "Run", "(System.Func<System.Threading.Tasks.Task>,System.Threading.CancellationToken)", "summary", "df-generated"]
       - ["System.Threading.Tasks", "Task", "RunSynchronously", "()", "summary", "df-generated"]
       - ["System.Threading.Tasks", "Task", "RunSynchronously", "(System.Threading.Tasks.TaskScheduler)", "summary", "df-generated"]
       - ["System.Threading.Tasks", "Task", "Start", "()", "summary", "df-generated"]
       - ["System.Threading.Tasks", "Task", "Start", "(System.Threading.Tasks.TaskScheduler)", "summary", "df-generated"]
+      - ["System.Threading.Tasks", "Task", "Task", "(System.Action)", "summary", "df-generated"]
+      - ["System.Threading.Tasks", "Task", "Task", "(System.Action,System.Threading.CancellationToken)", "summary", "df-generated"]
+      - ["System.Threading.Tasks", "Task", "Task", "(System.Action,System.Threading.CancellationToken,System.Threading.Tasks.TaskCreationOptions)", "summary", "df-generated"]
+      - ["System.Threading.Tasks", "Task", "Task", "(System.Action,System.Threading.Tasks.TaskCreationOptions)", "summary", "df-generated"]
       - ["System.Threading.Tasks", "Task", "Wait", "()", "summary", "df-generated"]
       - ["System.Threading.Tasks", "Task", "Wait", "(System.Int32)", "summary", "df-generated"]
       - ["System.Threading.Tasks", "Task", "Wait", "(System.Int32,System.Threading.CancellationToken)", "summary", "df-generated"]
@@ -170,9 +308,30 @@ extensions:
       - ["System.Threading.Tasks", "TaskCompletionSource<TResult>", "TrySetCanceled", "(System.Threading.CancellationToken)", "summary", "df-generated"]
       - ["System.Threading.Tasks", "TaskCompletionSource<TResult>", "TrySetException", "(System.Collections.Generic.IEnumerable<System.Exception>)", "summary", "df-generated"]
       - ["System.Threading.Tasks", "TaskCompletionSource<TResult>", "TrySetException", "(System.Exception)", "summary", "df-generated"]
+      - ["System.Threading.Tasks", "TaskFactory", "ContinueWhenAll", "(System.Threading.Tasks.Task[],System.Action<System.Threading.Tasks.Task[]>)", "summary", "df-generated"]
+      - ["System.Threading.Tasks", "TaskFactory", "ContinueWhenAll", "(System.Threading.Tasks.Task[],System.Action<System.Threading.Tasks.Task[]>,System.Threading.CancellationToken)", "summary", "df-generated"]
+      - ["System.Threading.Tasks", "TaskFactory", "ContinueWhenAll", "(System.Threading.Tasks.Task[],System.Action<System.Threading.Tasks.Task[]>,System.Threading.CancellationToken,System.Threading.Tasks.TaskContinuationOptions,System.Threading.Tasks.TaskScheduler)", "summary", "df-generated"]
+      - ["System.Threading.Tasks", "TaskFactory", "ContinueWhenAll", "(System.Threading.Tasks.Task[],System.Action<System.Threading.Tasks.Task[]>,System.Threading.Tasks.TaskContinuationOptions)", "summary", "df-generated"]
+      - ["System.Threading.Tasks", "TaskFactory", "ContinueWhenAny", "(System.Threading.Tasks.Task[],System.Action<System.Threading.Tasks.Task>)", "summary", "df-generated"]
+      - ["System.Threading.Tasks", "TaskFactory", "ContinueWhenAny", "(System.Threading.Tasks.Task[],System.Action<System.Threading.Tasks.Task>,System.Threading.CancellationToken)", "summary", "df-generated"]
+      - ["System.Threading.Tasks", "TaskFactory", "ContinueWhenAny", "(System.Threading.Tasks.Task[],System.Action<System.Threading.Tasks.Task>,System.Threading.CancellationToken,System.Threading.Tasks.TaskContinuationOptions,System.Threading.Tasks.TaskScheduler)", "summary", "df-generated"]
+      - ["System.Threading.Tasks", "TaskFactory", "ContinueWhenAny", "(System.Threading.Tasks.Task[],System.Action<System.Threading.Tasks.Task>,System.Threading.Tasks.TaskContinuationOptions)", "summary", "df-generated"]
+      - ["System.Threading.Tasks", "TaskFactory", "FromAsync", "(System.IAsyncResult,System.Action<System.IAsyncResult>)", "summary", "df-generated"]
+      - ["System.Threading.Tasks", "TaskFactory", "FromAsync", "(System.IAsyncResult,System.Action<System.IAsyncResult>,System.Threading.Tasks.TaskCreationOptions)", "summary", "df-generated"]
+      - ["System.Threading.Tasks", "TaskFactory", "FromAsync", "(System.IAsyncResult,System.Action<System.IAsyncResult>,System.Threading.Tasks.TaskCreationOptions,System.Threading.Tasks.TaskScheduler)", "summary", "df-generated"]
+      - ["System.Threading.Tasks", "TaskFactory", "FromAsync<TResult>", "(System.IAsyncResult,System.Func<System.IAsyncResult,TResult>)", "summary", "df-generated"]
+      - ["System.Threading.Tasks", "TaskFactory", "FromAsync<TResult>", "(System.IAsyncResult,System.Func<System.IAsyncResult,TResult>,System.Threading.Tasks.TaskCreationOptions)", "summary", "df-generated"]
+      - ["System.Threading.Tasks", "TaskFactory", "FromAsync<TResult>", "(System.IAsyncResult,System.Func<System.IAsyncResult,TResult>,System.Threading.Tasks.TaskCreationOptions,System.Threading.Tasks.TaskScheduler)", "summary", "df-generated"]
+      - ["System.Threading.Tasks", "TaskFactory", "StartNew", "(System.Action)", "summary", "df-generated"]
+      - ["System.Threading.Tasks", "TaskFactory", "StartNew", "(System.Action,System.Threading.CancellationToken)", "summary", "df-generated"]
+      - ["System.Threading.Tasks", "TaskFactory", "StartNew", "(System.Action,System.Threading.CancellationToken,System.Threading.Tasks.TaskCreationOptions,System.Threading.Tasks.TaskScheduler)", "summary", "df-generated"]
+      - ["System.Threading.Tasks", "TaskFactory", "StartNew", "(System.Action,System.Threading.Tasks.TaskCreationOptions)", "summary", "df-generated"]
       - ["System.Threading.Tasks", "TaskFactory", "TaskFactory", "(System.Threading.Tasks.TaskCreationOptions,System.Threading.Tasks.TaskContinuationOptions)", "summary", "df-generated"]
       - ["System.Threading.Tasks", "TaskFactory", "get_ContinuationOptions", "()", "summary", "df-generated"]
       - ["System.Threading.Tasks", "TaskFactory", "get_CreationOptions", "()", "summary", "df-generated"]
+      - ["System.Threading.Tasks", "TaskFactory<TResult>", "FromAsync", "(System.IAsyncResult,System.Func<System.IAsyncResult,TResult>)", "summary", "df-generated"]
+      - ["System.Threading.Tasks", "TaskFactory<TResult>", "FromAsync", "(System.IAsyncResult,System.Func<System.IAsyncResult,TResult>,System.Threading.Tasks.TaskCreationOptions)", "summary", "df-generated"]
+      - ["System.Threading.Tasks", "TaskFactory<TResult>", "FromAsync", "(System.IAsyncResult,System.Func<System.IAsyncResult,TResult>,System.Threading.Tasks.TaskCreationOptions,System.Threading.Tasks.TaskScheduler)", "summary", "df-generated"]
       - ["System.Threading.Tasks", "TaskFactory<TResult>", "TaskFactory", "(System.Threading.Tasks.TaskCreationOptions,System.Threading.Tasks.TaskContinuationOptions)", "summary", "df-generated"]
       - ["System.Threading.Tasks", "TaskFactory<TResult>", "get_ContinuationOptions", "()", "summary", "df-generated"]
       - ["System.Threading.Tasks", "TaskFactory<TResult>", "get_CreationOptions", "()", "summary", "df-generated"]
@@ -181,10 +340,12 @@ extensions:
       - ["System.Threading.Tasks", "TaskScheduler", "TryDequeue", "(System.Threading.Tasks.Task)", "summary", "df-generated"]
       - ["System.Threading.Tasks", "TaskScheduler", "TryExecuteTask", "(System.Threading.Tasks.Task)", "summary", "df-generated"]
       - ["System.Threading.Tasks", "TaskScheduler", "TryExecuteTaskInline", "(System.Threading.Tasks.Task,System.Boolean)", "summary", "df-generated"]
+      - ["System.Threading.Tasks", "TaskScheduler", "add_UnobservedTaskException", "(System.EventHandler<System.Threading.Tasks.UnobservedTaskExceptionEventArgs>)", "summary", "df-generated"]
       - ["System.Threading.Tasks", "TaskScheduler", "get_Current", "()", "summary", "df-generated"]
       - ["System.Threading.Tasks", "TaskScheduler", "get_Default", "()", "summary", "df-generated"]
       - ["System.Threading.Tasks", "TaskScheduler", "get_Id", "()", "summary", "df-generated"]
       - ["System.Threading.Tasks", "TaskScheduler", "get_MaximumConcurrencyLevel", "()", "summary", "df-generated"]
+      - ["System.Threading.Tasks", "TaskScheduler", "remove_UnobservedTaskException", "(System.EventHandler<System.Threading.Tasks.UnobservedTaskExceptionEventArgs>)", "summary", "df-generated"]
       - ["System.Threading.Tasks", "TaskSchedulerException", "TaskSchedulerException", "(System.Exception)", "summary", "df-generated"]
       - ["System.Threading.Tasks", "TaskSchedulerException", "TaskSchedulerException", "(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)", "summary", "df-generated"]
       - ["System.Threading.Tasks", "TaskSchedulerException", "TaskSchedulerException", "(System.String)", "summary", "df-generated"]
@@ -194,6 +355,9 @@ extensions:
       - ["System.Threading.Tasks", "TaskToAsyncResult", "Unwrap", "(System.IAsyncResult)", "summary", "df-generated"]
       - ["System.Threading.Tasks", "TaskToAsyncResult", "Unwrap<TResult>", "(System.IAsyncResult)", "summary", "df-generated"]
       - ["System.Threading.Tasks", "TimeProviderTaskExtensions", "CreateCancellationTokenSource", "(System.TimeProvider,System.TimeSpan)", "summary", "df-generated"]
+      - ["System.Threading.Tasks", "TimeProviderTaskExtensions", "Delay", "(System.TimeProvider,System.TimeSpan,System.Threading.CancellationToken)", "summary", "df-generated"]
+      - ["System.Threading.Tasks", "TimeProviderTaskExtensions", "WaitAsync", "(System.Threading.Tasks.Task,System.TimeSpan,System.TimeProvider,System.Threading.CancellationToken)", "summary", "df-generated"]
+      - ["System.Threading.Tasks", "TimeProviderTaskExtensions", "WaitAsync<TResult>", "(System.Threading.Tasks.Task<TResult>,System.TimeSpan,System.TimeProvider,System.Threading.CancellationToken)", "summary", "df-generated"]
       - ["System.Threading.Tasks", "UnobservedTaskExceptionEventArgs", "SetObserved", "()", "summary", "df-generated"]
       - ["System.Threading.Tasks", "UnobservedTaskExceptionEventArgs", "get_Observed", "()", "summary", "df-generated"]
       - ["System.Threading.Tasks", "ValueTask", "Equals", "(System.Object)", "summary", "df-generated"]
diff --git a/csharp/ql/lib/ext/generated/System.Threading.model.yml b/csharp/ql/lib/ext/generated/System.Threading.model.yml
index 7d5b8aa605b..4453e4b157b 100644
--- a/csharp/ql/lib/ext/generated/System.Threading.model.yml
+++ b/csharp/ql/lib/ext/generated/System.Threading.model.yml
@@ -4,27 +4,49 @@ extensions:
       pack: codeql/csharp-all
       extensible: summaryModel
     data:
-      - ["System.Threading", "AbandonedMutexException", False, "AbandonedMutexException", "(System.Int32,System.Threading.WaitHandle)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Threading", "AbandonedMutexException", False, "AbandonedMutexException", "(System.String,System.Exception,System.Int32,System.Threading.WaitHandle)", "", "Argument[3]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Threading", "AbandonedMutexException", False, "AbandonedMutexException", "(System.String,System.Int32,System.Threading.WaitHandle)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Threading", "AbandonedMutexException", False, "get_Mutex", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Threading", "AbandonedMutexException", False, "AbandonedMutexException", "(System.Int32,System.Threading.WaitHandle)", "", "Argument[1]", "Argument[this].SyntheticField[System.Threading.AbandonedMutexException._mutex]", "value", "dfc-generated"]
+      - ["System.Threading", "AbandonedMutexException", False, "AbandonedMutexException", "(System.String,System.Exception,System.Int32,System.Threading.WaitHandle)", "", "Argument[3]", "Argument[this].SyntheticField[System.Threading.AbandonedMutexException._mutex]", "value", "dfc-generated"]
+      - ["System.Threading", "AbandonedMutexException", False, "AbandonedMutexException", "(System.String,System.Int32,System.Threading.WaitHandle)", "", "Argument[2]", "Argument[this].SyntheticField[System.Threading.AbandonedMutexException._mutex]", "value", "dfc-generated"]
+      - ["System.Threading", "AbandonedMutexException", False, "get_Mutex", "()", "", "Argument[this].SyntheticField[System.Threading.AbandonedMutexException._mutex]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Threading", "CancellationToken", False, "Register", "(System.Action<System.Object,System.Threading.CancellationToken>,System.Object)", "", "Argument[1]", "Argument[0].Parameter[0]", "value", "dfc-generated"]
+      - ["System.Threading", "CancellationToken", False, "Register", "(System.Action<System.Object>,System.Object)", "", "Argument[1]", "Argument[0].Parameter[0]", "value", "dfc-generated"]
+      - ["System.Threading", "CancellationToken", False, "Register", "(System.Action<System.Object>,System.Object,System.Boolean)", "", "Argument[1]", "Argument[0].Parameter[0]", "value", "dfc-generated"]
+      - ["System.Threading", "CancellationToken", False, "UnsafeRegister", "(System.Action<System.Object,System.Threading.CancellationToken>,System.Object)", "", "Argument[1]", "Argument[0].Parameter[0]", "value", "dfc-generated"]
+      - ["System.Threading", "CancellationToken", False, "UnsafeRegister", "(System.Action<System.Object>,System.Object)", "", "Argument[1]", "Argument[0].Parameter[0]", "value", "dfc-generated"]
       - ["System.Threading", "CancellationToken", False, "get_WaitHandle", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Threading", "CancellationTokenSource", False, "CancelAsync", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Threading", "CancellationTokenSource", False, "CancelAsync", "()", "", "Argument[this]", "ReturnValue.SyntheticField[System.Threading.Tasks.Task.m_stateObject]", "value", "dfc-generated"]
       - ["System.Threading", "CancellationTokenSource", False, "get_Token", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Threading", "CompressedStack", False, "CreateCopy", "()", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["System.Threading", "CompressedStack", False, "CreateCopy", "()", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Threading", "CompressedStack", False, "Run", "(System.Threading.CompressedStack,System.Threading.ContextCallback,System.Object)", "", "Argument[2]", "Argument[1].Parameter[0]", "value", "dfc-generated"]
       - ["System.Threading", "CountdownEvent", False, "get_WaitHandle", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Threading", "ExecutionContext", False, "CreateCopy", "()", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["System.Threading", "ExecutionContext", False, "CreateCopy", "()", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Threading", "ExecutionContext", False, "Run", "(System.Threading.ExecutionContext,System.Threading.ContextCallback,System.Object)", "", "Argument[2]", "Argument[1].Parameter[0]", "value", "dfc-generated"]
       - ["System.Threading", "HostExecutionContextManager", True, "SetHostExecutionContext", "(System.Threading.HostExecutionContext)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Threading", "LazyInitializer", False, "EnsureInitialized<T>", "(T)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Threading", "LazyInitializer", False, "EnsureInitialized<T>", "(T,System.Boolean,System.Object)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Threading", "LazyInitializer", False, "EnsureInitialized<T>", "(T,System.Boolean,System.Object)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Threading", "Interlocked", False, "CompareExchange", "(System.IntPtr,System.IntPtr,System.IntPtr)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Threading", "Interlocked", False, "CompareExchange", "(System.UIntPtr,System.UIntPtr,System.UIntPtr)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Threading", "Interlocked", False, "CompareExchange<T>", "(T,T,T)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Threading", "Interlocked", False, "Exchange", "(System.IntPtr,System.IntPtr)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Threading", "Interlocked", False, "Exchange", "(System.UIntPtr,System.UIntPtr)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Threading", "Interlocked", False, "Exchange<T>", "(T,T)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Threading", "LazyInitializer", False, "EnsureInitialized<T>", "(T)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Threading", "LazyInitializer", False, "EnsureInitialized<T>", "(T,System.Boolean,System.Object)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Threading", "LazyInitializer", False, "EnsureInitialized<T>", "(T,System.Boolean,System.Object)", "", "Argument[2]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Threading", "LazyInitializer", False, "EnsureInitialized<T>", "(T,System.Boolean,System.Object,System.Func<T>)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Threading", "LazyInitializer", False, "EnsureInitialized<T>", "(T,System.Boolean,System.Object,System.Func<T>)", "", "Argument[2]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Threading", "LazyInitializer", False, "EnsureInitialized<T>", "(T,System.Boolean,System.Object,System.Func<T>)", "", "Argument[3].ReturnValue", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Threading", "LazyInitializer", False, "EnsureInitialized<T>", "(T,System.Func<T>)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Threading", "LazyInitializer", False, "EnsureInitialized<T>", "(T,System.Object,System.Func<T>)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Threading", "LazyInitializer", False, "EnsureInitialized<T>", "(T,System.Object,System.Func<T>)", "", "Argument[1]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Threading", "Lock", False, "EnterScope", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Threading", "ManualResetEventSlim", False, "get_WaitHandle", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Threading", "Mutex", False, "TryOpenExisting", "(System.String,System.Threading.Mutex)", "", "Argument[1]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Threading", "Overlapped", False, "Overlapped", "(System.Int32,System.Int32,System.IntPtr,System.IAsyncResult)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
       - ["System.Threading", "Overlapped", False, "Overlapped", "(System.Int32,System.Int32,System.IntPtr,System.IAsyncResult)", "", "Argument[3]", "Argument[this]", "taint", "df-generated"]
       - ["System.Threading", "PeriodicTimer", False, "PeriodicTimer", "(System.TimeSpan)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Threading", "PeriodicTimer", False, "PeriodicTimer", "(System.TimeSpan,System.TimeProvider)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Threading", "PeriodicTimer", False, "WaitForNextTickAsync", "(System.Threading.CancellationToken)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Threading", "ReaderWriterLock", False, "DowngradeFromWriterLock", "(System.Threading.LockCookie)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Threading", "ReaderWriterLock", False, "RestoreLock", "(System.Threading.LockCookie)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Threading", "RegisteredWaitHandle", False, "Unregister", "(System.Threading.WaitHandle)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Threading", "SemaphoreSlim", False, "WaitAsync", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Threading", "SemaphoreSlim", False, "WaitAsync", "(System.Int32)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
@@ -33,14 +55,24 @@ extensions:
       - ["System.Threading", "SemaphoreSlim", False, "WaitAsync", "(System.TimeSpan)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Threading", "SemaphoreSlim", False, "WaitAsync", "(System.TimeSpan,System.Threading.CancellationToken)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Threading", "SemaphoreSlim", False, "get_AvailableWaitHandle", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Threading", "Thread", False, "GetData", "(System.LocalDataStoreSlot)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Threading", "Thread", False, "SetData", "(System.LocalDataStoreSlot,System.Object)", "", "Argument[1]", "Argument[0]", "taint", "df-generated"]
-      - ["System.Threading", "ThreadExceptionEventArgs", False, "ThreadExceptionEventArgs", "(System.Exception)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Threading", "ThreadExceptionEventArgs", False, "get_Exception", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Threading", "SynchronizationContext", True, "Send", "(System.Threading.SendOrPostCallback,System.Object)", "", "Argument[1]", "Argument[0].Parameter[0]", "value", "dfc-generated"]
+      - ["System.Threading", "Thread", False, "GetData", "(System.LocalDataStoreSlot)", "", "Argument[0].SyntheticField[System.LocalDataStoreSlot.Data].Property[System.Threading.ThreadLocal`1.Value]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Threading", "Thread", False, "SetData", "(System.LocalDataStoreSlot,System.Object)", "", "Argument[1]", "Argument[0].SyntheticField[System.LocalDataStoreSlot.Data].Property[System.Threading.ThreadLocal`1.Value]", "value", "dfc-generated"]
+      - ["System.Threading", "Thread", False, "VolatileRead", "(System.IntPtr)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Threading", "Thread", False, "VolatileRead", "(System.Object)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Threading", "Thread", False, "VolatileRead", "(System.UIntPtr)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Threading", "Thread", False, "VolatileWrite", "(System.IntPtr,System.IntPtr)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Threading", "Thread", False, "VolatileWrite", "(System.Object,System.Object)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Threading", "Thread", False, "VolatileWrite", "(System.UIntPtr,System.UIntPtr)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Threading", "ThreadExceptionEventArgs", False, "ThreadExceptionEventArgs", "(System.Exception)", "", "Argument[0]", "Argument[this].SyntheticField[System.Threading.ThreadExceptionEventArgs.m_exception]", "value", "dfc-generated"]
+      - ["System.Threading", "ThreadExceptionEventArgs", False, "get_Exception", "()", "", "Argument[this].SyntheticField[System.Threading.ThreadExceptionEventArgs.m_exception]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Threading", "ThreadLocal<T>", False, "ToString", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Threading", "ThreadPoolBoundHandle", False, "AllocateNativeOverlapped", "(System.Threading.PreAllocatedOverlapped)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["System.Threading", "ThreadPoolBoundHandle", False, "get_Handle", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Threading", "WaitHandleExtensions", False, "GetSafeWaitHandle", "(System.Threading.WaitHandle)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Threading", "Volatile", False, "Write", "(System.IntPtr,System.IntPtr)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Threading", "Volatile", False, "Write", "(System.UIntPtr,System.UIntPtr)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Threading", "Volatile", False, "Write<T>", "(T,T)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Threading", "WaitHandleExtensions", False, "GetSafeWaitHandle", "(System.Threading.WaitHandle)", "", "Argument[0].Property[System.Threading.WaitHandle.SafeWaitHandle]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Threading", "WaitHandleExtensions", False, "SetSafeWaitHandle", "(System.Threading.WaitHandle,Microsoft.Win32.SafeHandles.SafeWaitHandle)", "", "Argument[1]", "Argument[0]", "taint", "df-generated"]
   - addsTo:
       pack: codeql/csharp-all
@@ -57,10 +89,12 @@ extensions:
       - ["System.Threading", "AsyncFlowControl", "Undo", "()", "summary", "df-generated"]
       - ["System.Threading", "AsyncFlowControl", "op_Equality", "(System.Threading.AsyncFlowControl,System.Threading.AsyncFlowControl)", "summary", "df-generated"]
       - ["System.Threading", "AsyncFlowControl", "op_Inequality", "(System.Threading.AsyncFlowControl,System.Threading.AsyncFlowControl)", "summary", "df-generated"]
+      - ["System.Threading", "AsyncLocal<T>", "AsyncLocal", "(System.Action<System.Threading.AsyncLocalValueChangedArgs<T>>)", "summary", "df-generated"]
       - ["System.Threading", "AutoResetEvent", "AutoResetEvent", "(System.Boolean)", "summary", "df-generated"]
       - ["System.Threading", "Barrier", "AddParticipant", "()", "summary", "df-generated"]
       - ["System.Threading", "Barrier", "AddParticipants", "(System.Int32)", "summary", "df-generated"]
       - ["System.Threading", "Barrier", "Barrier", "(System.Int32)", "summary", "df-generated"]
+      - ["System.Threading", "Barrier", "Barrier", "(System.Int32,System.Action<System.Threading.Barrier>)", "summary", "df-generated"]
       - ["System.Threading", "Barrier", "Dispose", "()", "summary", "df-generated"]
       - ["System.Threading", "Barrier", "Dispose", "(System.Boolean)", "summary", "df-generated"]
       - ["System.Threading", "Barrier", "RemoveParticipant", "()", "summary", "df-generated"]
@@ -81,6 +115,8 @@ extensions:
       - ["System.Threading", "CancellationToken", "Equals", "(System.Object)", "summary", "df-generated"]
       - ["System.Threading", "CancellationToken", "Equals", "(System.Threading.CancellationToken)", "summary", "df-generated"]
       - ["System.Threading", "CancellationToken", "GetHashCode", "()", "summary", "df-generated"]
+      - ["System.Threading", "CancellationToken", "Register", "(System.Action)", "summary", "df-generated"]
+      - ["System.Threading", "CancellationToken", "Register", "(System.Action,System.Boolean)", "summary", "df-generated"]
       - ["System.Threading", "CancellationToken", "ThrowIfCancellationRequested", "()", "summary", "df-generated"]
       - ["System.Threading", "CancellationToken", "get_CanBeCanceled", "()", "summary", "df-generated"]
       - ["System.Threading", "CancellationToken", "get_IsCancellationRequested", "()", "summary", "df-generated"]
@@ -166,13 +202,10 @@ extensions:
       - ["System.Threading", "Interlocked", "CompareExchange", "(System.Double,System.Double,System.Double)", "summary", "df-generated"]
       - ["System.Threading", "Interlocked", "CompareExchange", "(System.Int32,System.Int32,System.Int32)", "summary", "df-generated"]
       - ["System.Threading", "Interlocked", "CompareExchange", "(System.Int64,System.Int64,System.Int64)", "summary", "df-generated"]
-      - ["System.Threading", "Interlocked", "CompareExchange", "(System.IntPtr,System.IntPtr,System.IntPtr)", "summary", "df-generated"]
       - ["System.Threading", "Interlocked", "CompareExchange", "(System.Object,System.Object,System.Object)", "summary", "df-generated"]
       - ["System.Threading", "Interlocked", "CompareExchange", "(System.Single,System.Single,System.Single)", "summary", "df-generated"]
       - ["System.Threading", "Interlocked", "CompareExchange", "(System.UInt32,System.UInt32,System.UInt32)", "summary", "df-generated"]
       - ["System.Threading", "Interlocked", "CompareExchange", "(System.UInt64,System.UInt64,System.UInt64)", "summary", "df-generated"]
-      - ["System.Threading", "Interlocked", "CompareExchange", "(System.UIntPtr,System.UIntPtr,System.UIntPtr)", "summary", "df-generated"]
-      - ["System.Threading", "Interlocked", "CompareExchange<T>", "(T,T,T)", "summary", "df-generated"]
       - ["System.Threading", "Interlocked", "Decrement", "(System.Int32)", "summary", "df-generated"]
       - ["System.Threading", "Interlocked", "Decrement", "(System.Int64)", "summary", "df-generated"]
       - ["System.Threading", "Interlocked", "Decrement", "(System.UInt32)", "summary", "df-generated"]
@@ -180,13 +213,10 @@ extensions:
       - ["System.Threading", "Interlocked", "Exchange", "(System.Double,System.Double)", "summary", "df-generated"]
       - ["System.Threading", "Interlocked", "Exchange", "(System.Int32,System.Int32)", "summary", "df-generated"]
       - ["System.Threading", "Interlocked", "Exchange", "(System.Int64,System.Int64)", "summary", "df-generated"]
-      - ["System.Threading", "Interlocked", "Exchange", "(System.IntPtr,System.IntPtr)", "summary", "df-generated"]
       - ["System.Threading", "Interlocked", "Exchange", "(System.Object,System.Object)", "summary", "df-generated"]
       - ["System.Threading", "Interlocked", "Exchange", "(System.Single,System.Single)", "summary", "df-generated"]
       - ["System.Threading", "Interlocked", "Exchange", "(System.UInt32,System.UInt32)", "summary", "df-generated"]
       - ["System.Threading", "Interlocked", "Exchange", "(System.UInt64,System.UInt64)", "summary", "df-generated"]
-      - ["System.Threading", "Interlocked", "Exchange", "(System.UIntPtr,System.UIntPtr)", "summary", "df-generated"]
-      - ["System.Threading", "Interlocked", "Exchange<T>", "(T,T)", "summary", "df-generated"]
       - ["System.Threading", "Interlocked", "Increment", "(System.Int32)", "summary", "df-generated"]
       - ["System.Threading", "Interlocked", "Increment", "(System.Int64)", "summary", "df-generated"]
       - ["System.Threading", "Interlocked", "Increment", "(System.UInt32)", "summary", "df-generated"]
@@ -250,25 +280,28 @@ extensions:
       - ["System.Threading", "Mutex", "Mutex", "(System.Boolean,System.String,System.Boolean)", "summary", "df-generated"]
       - ["System.Threading", "Mutex", "OpenExisting", "(System.String)", "summary", "df-generated"]
       - ["System.Threading", "Mutex", "ReleaseMutex", "()", "summary", "df-generated"]
-      - ["System.Threading", "Mutex", "TryOpenExisting", "(System.String,System.Threading.Mutex)", "summary", "df-generated"]
       - ["System.Threading", "MutexAcl", "Create", "(System.Boolean,System.String,System.Boolean,System.Security.AccessControl.MutexSecurity)", "summary", "df-generated"]
       - ["System.Threading", "MutexAcl", "OpenExisting", "(System.String,System.Security.AccessControl.MutexRights)", "summary", "df-generated"]
       - ["System.Threading", "MutexAcl", "TryOpenExisting", "(System.String,System.Security.AccessControl.MutexRights,System.Threading.Mutex)", "summary", "df-generated"]
       - ["System.Threading", "Overlapped", "Free", "(System.Threading.NativeOverlapped*)", "summary", "df-generated"]
       - ["System.Threading", "Overlapped", "Overlapped", "(System.Int32,System.Int32,System.Int32,System.IAsyncResult)", "summary", "df-generated"]
+      - ["System.Threading", "Overlapped", "Pack", "(System.Threading.IOCompletionCallback)", "summary", "df-generated"]
+      - ["System.Threading", "Overlapped", "Pack", "(System.Threading.IOCompletionCallback,System.Object)", "summary", "df-generated"]
       - ["System.Threading", "Overlapped", "Unpack", "(System.Threading.NativeOverlapped*)", "summary", "df-generated"]
+      - ["System.Threading", "Overlapped", "UnsafePack", "(System.Threading.IOCompletionCallback)", "summary", "df-generated"]
+      - ["System.Threading", "Overlapped", "UnsafePack", "(System.Threading.IOCompletionCallback,System.Object)", "summary", "df-generated"]
       - ["System.Threading", "PeriodicTimer", "Dispose", "()", "summary", "df-generated"]
       - ["System.Threading", "PreAllocatedOverlapped", "Dispose", "()", "summary", "df-generated"]
+      - ["System.Threading", "PreAllocatedOverlapped", "PreAllocatedOverlapped", "(System.Threading.IOCompletionCallback,System.Object,System.Object)", "summary", "df-generated"]
+      - ["System.Threading", "PreAllocatedOverlapped", "UnsafeCreate", "(System.Threading.IOCompletionCallback,System.Object,System.Object)", "summary", "df-generated"]
       - ["System.Threading", "ReaderWriterLock", "AcquireReaderLock", "(System.Int32)", "summary", "df-generated"]
       - ["System.Threading", "ReaderWriterLock", "AcquireReaderLock", "(System.TimeSpan)", "summary", "df-generated"]
       - ["System.Threading", "ReaderWriterLock", "AcquireWriterLock", "(System.Int32)", "summary", "df-generated"]
       - ["System.Threading", "ReaderWriterLock", "AcquireWriterLock", "(System.TimeSpan)", "summary", "df-generated"]
       - ["System.Threading", "ReaderWriterLock", "AnyWritersSince", "(System.Int32)", "summary", "df-generated"]
-      - ["System.Threading", "ReaderWriterLock", "DowngradeFromWriterLock", "(System.Threading.LockCookie)", "summary", "df-generated"]
       - ["System.Threading", "ReaderWriterLock", "ReleaseLock", "()", "summary", "df-generated"]
       - ["System.Threading", "ReaderWriterLock", "ReleaseReaderLock", "()", "summary", "df-generated"]
       - ["System.Threading", "ReaderWriterLock", "ReleaseWriterLock", "()", "summary", "df-generated"]
-      - ["System.Threading", "ReaderWriterLock", "RestoreLock", "(System.Threading.LockCookie)", "summary", "df-generated"]
       - ["System.Threading", "ReaderWriterLock", "UpgradeToWriterLock", "(System.Int32)", "summary", "df-generated"]
       - ["System.Threading", "ReaderWriterLock", "UpgradeToWriterLock", "(System.TimeSpan)", "summary", "df-generated"]
       - ["System.Threading", "ReaderWriterLock", "get_IsReaderLockHeld", "()", "summary", "df-generated"]
@@ -338,11 +371,15 @@ extensions:
       - ["System.Threading", "SpinWait", "Reset", "()", "summary", "df-generated"]
       - ["System.Threading", "SpinWait", "SpinOnce", "()", "summary", "df-generated"]
       - ["System.Threading", "SpinWait", "SpinOnce", "(System.Int32)", "summary", "df-generated"]
+      - ["System.Threading", "SpinWait", "SpinUntil", "(System.Func<System.Boolean>)", "summary", "df-generated"]
+      - ["System.Threading", "SpinWait", "SpinUntil", "(System.Func<System.Boolean>,System.Int32)", "summary", "df-generated"]
+      - ["System.Threading", "SpinWait", "SpinUntil", "(System.Func<System.Boolean>,System.TimeSpan)", "summary", "df-generated"]
       - ["System.Threading", "SpinWait", "get_NextSpinWillYield", "()", "summary", "df-generated"]
       - ["System.Threading", "SynchronizationContext", "CreateCopy", "()", "summary", "df-generated"]
       - ["System.Threading", "SynchronizationContext", "IsWaitNotificationRequired", "()", "summary", "df-generated"]
       - ["System.Threading", "SynchronizationContext", "OperationCompleted", "()", "summary", "df-generated"]
       - ["System.Threading", "SynchronizationContext", "OperationStarted", "()", "summary", "df-generated"]
+      - ["System.Threading", "SynchronizationContext", "Post", "(System.Threading.SendOrPostCallback,System.Object)", "summary", "df-generated"]
       - ["System.Threading", "SynchronizationContext", "SetSynchronizationContext", "(System.Threading.SynchronizationContext)", "summary", "df-generated"]
       - ["System.Threading", "SynchronizationContext", "SetWaitNotificationRequired", "()", "summary", "df-generated"]
       - ["System.Threading", "SynchronizationContext", "Wait", "(System.IntPtr[],System.Boolean,System.Int32)", "summary", "df-generated"]
@@ -383,6 +420,10 @@ extensions:
       - ["System.Threading", "Thread", "Start", "()", "summary", "df-generated"]
       - ["System.Threading", "Thread", "Start", "(System.Object)", "summary", "df-generated"]
       - ["System.Threading", "Thread", "Suspend", "()", "summary", "df-generated"]
+      - ["System.Threading", "Thread", "Thread", "(System.Threading.ParameterizedThreadStart)", "summary", "df-generated"]
+      - ["System.Threading", "Thread", "Thread", "(System.Threading.ParameterizedThreadStart,System.Int32)", "summary", "df-generated"]
+      - ["System.Threading", "Thread", "Thread", "(System.Threading.ThreadStart)", "summary", "df-generated"]
+      - ["System.Threading", "Thread", "Thread", "(System.Threading.ThreadStart,System.Int32)", "summary", "df-generated"]
       - ["System.Threading", "Thread", "TrySetApartmentState", "(System.Threading.ApartmentState)", "summary", "df-generated"]
       - ["System.Threading", "Thread", "UnsafeStart", "()", "summary", "df-generated"]
       - ["System.Threading", "Thread", "UnsafeStart", "(System.Object)", "summary", "df-generated"]
@@ -391,27 +432,21 @@ extensions:
       - ["System.Threading", "Thread", "VolatileRead", "(System.Int16)", "summary", "df-generated"]
       - ["System.Threading", "Thread", "VolatileRead", "(System.Int32)", "summary", "df-generated"]
       - ["System.Threading", "Thread", "VolatileRead", "(System.Int64)", "summary", "df-generated"]
-      - ["System.Threading", "Thread", "VolatileRead", "(System.IntPtr)", "summary", "df-generated"]
-      - ["System.Threading", "Thread", "VolatileRead", "(System.Object)", "summary", "df-generated"]
       - ["System.Threading", "Thread", "VolatileRead", "(System.SByte)", "summary", "df-generated"]
       - ["System.Threading", "Thread", "VolatileRead", "(System.Single)", "summary", "df-generated"]
       - ["System.Threading", "Thread", "VolatileRead", "(System.UInt16)", "summary", "df-generated"]
       - ["System.Threading", "Thread", "VolatileRead", "(System.UInt32)", "summary", "df-generated"]
       - ["System.Threading", "Thread", "VolatileRead", "(System.UInt64)", "summary", "df-generated"]
-      - ["System.Threading", "Thread", "VolatileRead", "(System.UIntPtr)", "summary", "df-generated"]
       - ["System.Threading", "Thread", "VolatileWrite", "(System.Byte,System.Byte)", "summary", "df-generated"]
       - ["System.Threading", "Thread", "VolatileWrite", "(System.Double,System.Double)", "summary", "df-generated"]
       - ["System.Threading", "Thread", "VolatileWrite", "(System.Int16,System.Int16)", "summary", "df-generated"]
       - ["System.Threading", "Thread", "VolatileWrite", "(System.Int32,System.Int32)", "summary", "df-generated"]
       - ["System.Threading", "Thread", "VolatileWrite", "(System.Int64,System.Int64)", "summary", "df-generated"]
-      - ["System.Threading", "Thread", "VolatileWrite", "(System.IntPtr,System.IntPtr)", "summary", "df-generated"]
-      - ["System.Threading", "Thread", "VolatileWrite", "(System.Object,System.Object)", "summary", "df-generated"]
       - ["System.Threading", "Thread", "VolatileWrite", "(System.SByte,System.SByte)", "summary", "df-generated"]
       - ["System.Threading", "Thread", "VolatileWrite", "(System.Single,System.Single)", "summary", "df-generated"]
       - ["System.Threading", "Thread", "VolatileWrite", "(System.UInt16,System.UInt16)", "summary", "df-generated"]
       - ["System.Threading", "Thread", "VolatileWrite", "(System.UInt32,System.UInt32)", "summary", "df-generated"]
       - ["System.Threading", "Thread", "VolatileWrite", "(System.UInt64,System.UInt64)", "summary", "df-generated"]
-      - ["System.Threading", "Thread", "VolatileWrite", "(System.UIntPtr,System.UIntPtr)", "summary", "df-generated"]
       - ["System.Threading", "Thread", "Yield", "()", "summary", "df-generated"]
       - ["System.Threading", "Thread", "get_CurrentThread", "()", "summary", "df-generated"]
       - ["System.Threading", "Thread", "get_ExecutionContext", "()", "summary", "df-generated"]
@@ -425,6 +460,8 @@ extensions:
       - ["System.Threading", "ThreadLocal<T>", "Dispose", "()", "summary", "df-generated"]
       - ["System.Threading", "ThreadLocal<T>", "Dispose", "(System.Boolean)", "summary", "df-generated"]
       - ["System.Threading", "ThreadLocal<T>", "ThreadLocal", "(System.Boolean)", "summary", "df-generated"]
+      - ["System.Threading", "ThreadLocal<T>", "ThreadLocal", "(System.Func<T>)", "summary", "df-generated"]
+      - ["System.Threading", "ThreadLocal<T>", "ThreadLocal", "(System.Func<T>,System.Boolean)", "summary", "df-generated"]
       - ["System.Threading", "ThreadLocal<T>", "get_IsValueCreated", "()", "summary", "df-generated"]
       - ["System.Threading", "ThreadLocal<T>", "get_Values", "()", "summary", "df-generated"]
       - ["System.Threading", "ThreadPool", "BindHandle", "(System.IntPtr)", "summary", "df-generated"]
@@ -432,17 +469,32 @@ extensions:
       - ["System.Threading", "ThreadPool", "GetAvailableThreads", "(System.Int32,System.Int32)", "summary", "df-generated"]
       - ["System.Threading", "ThreadPool", "GetMaxThreads", "(System.Int32,System.Int32)", "summary", "df-generated"]
       - ["System.Threading", "ThreadPool", "GetMinThreads", "(System.Int32,System.Int32)", "summary", "df-generated"]
+      - ["System.Threading", "ThreadPool", "QueueUserWorkItem", "(System.Threading.WaitCallback)", "summary", "df-generated"]
+      - ["System.Threading", "ThreadPool", "QueueUserWorkItem", "(System.Threading.WaitCallback,System.Object)", "summary", "df-generated"]
+      - ["System.Threading", "ThreadPool", "QueueUserWorkItem<TState>", "(System.Action<TState>,TState,System.Boolean)", "summary", "df-generated"]
+      - ["System.Threading", "ThreadPool", "RegisterWaitForSingleObject", "(System.Threading.WaitHandle,System.Threading.WaitOrTimerCallback,System.Object,System.Int32,System.Boolean)", "summary", "df-generated"]
+      - ["System.Threading", "ThreadPool", "RegisterWaitForSingleObject", "(System.Threading.WaitHandle,System.Threading.WaitOrTimerCallback,System.Object,System.Int64,System.Boolean)", "summary", "df-generated"]
+      - ["System.Threading", "ThreadPool", "RegisterWaitForSingleObject", "(System.Threading.WaitHandle,System.Threading.WaitOrTimerCallback,System.Object,System.TimeSpan,System.Boolean)", "summary", "df-generated"]
+      - ["System.Threading", "ThreadPool", "RegisterWaitForSingleObject", "(System.Threading.WaitHandle,System.Threading.WaitOrTimerCallback,System.Object,System.UInt32,System.Boolean)", "summary", "df-generated"]
       - ["System.Threading", "ThreadPool", "SetMaxThreads", "(System.Int32,System.Int32)", "summary", "df-generated"]
       - ["System.Threading", "ThreadPool", "SetMinThreads", "(System.Int32,System.Int32)", "summary", "df-generated"]
       - ["System.Threading", "ThreadPool", "UnsafeQueueNativeOverlapped", "(System.Threading.NativeOverlapped*)", "summary", "df-generated"]
       - ["System.Threading", "ThreadPool", "UnsafeQueueUserWorkItem", "(System.Threading.IThreadPoolWorkItem,System.Boolean)", "summary", "df-generated"]
+      - ["System.Threading", "ThreadPool", "UnsafeQueueUserWorkItem", "(System.Threading.WaitCallback,System.Object)", "summary", "df-generated"]
+      - ["System.Threading", "ThreadPool", "UnsafeQueueUserWorkItem<TState>", "(System.Action<TState>,TState,System.Boolean)", "summary", "df-generated"]
+      - ["System.Threading", "ThreadPool", "UnsafeRegisterWaitForSingleObject", "(System.Threading.WaitHandle,System.Threading.WaitOrTimerCallback,System.Object,System.Int32,System.Boolean)", "summary", "df-generated"]
+      - ["System.Threading", "ThreadPool", "UnsafeRegisterWaitForSingleObject", "(System.Threading.WaitHandle,System.Threading.WaitOrTimerCallback,System.Object,System.Int64,System.Boolean)", "summary", "df-generated"]
+      - ["System.Threading", "ThreadPool", "UnsafeRegisterWaitForSingleObject", "(System.Threading.WaitHandle,System.Threading.WaitOrTimerCallback,System.Object,System.TimeSpan,System.Boolean)", "summary", "df-generated"]
+      - ["System.Threading", "ThreadPool", "UnsafeRegisterWaitForSingleObject", "(System.Threading.WaitHandle,System.Threading.WaitOrTimerCallback,System.Object,System.UInt32,System.Boolean)", "summary", "df-generated"]
       - ["System.Threading", "ThreadPool", "get_CompletedWorkItemCount", "()", "summary", "df-generated"]
       - ["System.Threading", "ThreadPool", "get_PendingWorkItemCount", "()", "summary", "df-generated"]
       - ["System.Threading", "ThreadPool", "get_ThreadCount", "()", "summary", "df-generated"]
+      - ["System.Threading", "ThreadPoolBoundHandle", "AllocateNativeOverlapped", "(System.Threading.IOCompletionCallback,System.Object,System.Object)", "summary", "df-generated"]
       - ["System.Threading", "ThreadPoolBoundHandle", "BindHandle", "(System.Runtime.InteropServices.SafeHandle)", "summary", "df-generated"]
       - ["System.Threading", "ThreadPoolBoundHandle", "Dispose", "()", "summary", "df-generated"]
       - ["System.Threading", "ThreadPoolBoundHandle", "FreeNativeOverlapped", "(System.Threading.NativeOverlapped*)", "summary", "df-generated"]
       - ["System.Threading", "ThreadPoolBoundHandle", "GetNativeOverlappedState", "(System.Threading.NativeOverlapped*)", "summary", "df-generated"]
+      - ["System.Threading", "ThreadPoolBoundHandle", "UnsafeAllocateNativeOverlapped", "(System.Threading.IOCompletionCallback,System.Object,System.Object)", "summary", "df-generated"]
       - ["System.Threading", "ThreadStateException", "ThreadStateException", "(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)", "summary", "df-generated"]
       - ["System.Threading", "ThreadStateException", "ThreadStateException", "(System.String)", "summary", "df-generated"]
       - ["System.Threading", "ThreadStateException", "ThreadStateException", "(System.String,System.Exception)", "summary", "df-generated"]
@@ -458,6 +510,11 @@ extensions:
       - ["System.Threading", "Timer", "Change", "(System.UInt32,System.UInt32)", "summary", "df-generated"]
       - ["System.Threading", "Timer", "Dispose", "()", "summary", "df-generated"]
       - ["System.Threading", "Timer", "Dispose", "(System.Threading.WaitHandle)", "summary", "df-generated"]
+      - ["System.Threading", "Timer", "Timer", "(System.Threading.TimerCallback)", "summary", "df-generated"]
+      - ["System.Threading", "Timer", "Timer", "(System.Threading.TimerCallback,System.Object,System.Int32,System.Int32)", "summary", "df-generated"]
+      - ["System.Threading", "Timer", "Timer", "(System.Threading.TimerCallback,System.Object,System.Int64,System.Int64)", "summary", "df-generated"]
+      - ["System.Threading", "Timer", "Timer", "(System.Threading.TimerCallback,System.Object,System.TimeSpan,System.TimeSpan)", "summary", "df-generated"]
+      - ["System.Threading", "Timer", "Timer", "(System.Threading.TimerCallback,System.Object,System.UInt32,System.UInt32)", "summary", "df-generated"]
       - ["System.Threading", "Timer", "get_ActiveCount", "()", "summary", "df-generated"]
       - ["System.Threading", "Volatile", "Read", "(System.Boolean)", "summary", "df-generated"]
       - ["System.Threading", "Volatile", "Read", "(System.Byte)", "summary", "df-generated"]
@@ -479,14 +536,11 @@ extensions:
       - ["System.Threading", "Volatile", "Write", "(System.Int16,System.Int16)", "summary", "df-generated"]
       - ["System.Threading", "Volatile", "Write", "(System.Int32,System.Int32)", "summary", "df-generated"]
       - ["System.Threading", "Volatile", "Write", "(System.Int64,System.Int64)", "summary", "df-generated"]
-      - ["System.Threading", "Volatile", "Write", "(System.IntPtr,System.IntPtr)", "summary", "df-generated"]
       - ["System.Threading", "Volatile", "Write", "(System.SByte,System.SByte)", "summary", "df-generated"]
       - ["System.Threading", "Volatile", "Write", "(System.Single,System.Single)", "summary", "df-generated"]
       - ["System.Threading", "Volatile", "Write", "(System.UInt16,System.UInt16)", "summary", "df-generated"]
       - ["System.Threading", "Volatile", "Write", "(System.UInt32,System.UInt32)", "summary", "df-generated"]
       - ["System.Threading", "Volatile", "Write", "(System.UInt64,System.UInt64)", "summary", "df-generated"]
-      - ["System.Threading", "Volatile", "Write", "(System.UIntPtr,System.UIntPtr)", "summary", "df-generated"]
-      - ["System.Threading", "Volatile", "Write<T>", "(T,T)", "summary", "df-generated"]
       - ["System.Threading", "WaitHandle", "Close", "()", "summary", "df-generated"]
       - ["System.Threading", "WaitHandle", "Dispose", "()", "summary", "df-generated"]
       - ["System.Threading", "WaitHandle", "Dispose", "(System.Boolean)", "summary", "df-generated"]
diff --git a/csharp/ql/lib/ext/generated/System.Timers.model.yml b/csharp/ql/lib/ext/generated/System.Timers.model.yml
index f620761c7e2..7a3f9cb077e 100644
--- a/csharp/ql/lib/ext/generated/System.Timers.model.yml
+++ b/csharp/ql/lib/ext/generated/System.Timers.model.yml
@@ -1,5 +1,11 @@
 # THIS FILE IS AN AUTO-GENERATED MODELS AS DATA FILE. DO NOT EDIT.
 extensions:
+  - addsTo:
+      pack: codeql/csharp-all
+      extensible: summaryModel
+    data:
+      - ["System.Timers", "TimersDescriptionAttribute", True, "get_Description", "()", "", "Argument[this].Property[System.ComponentModel.DescriptionAttribute.Description]", "Argument[this].Property[System.ComponentModel.DescriptionAttribute.DescriptionValue]", "taint", "dfc-generated"]
+      - ["System.Timers", "TimersDescriptionAttribute", True, "get_Description", "()", "", "Argument[this].Property[System.ComponentModel.DescriptionAttribute.Description]", "ReturnValue", "value", "dfc-generated"]
   - addsTo:
       pack: codeql/csharp-all
       extensible: neutralModel
@@ -14,4 +20,6 @@ extensions:
       - ["System.Timers", "Timer", "Stop", "()", "summary", "df-generated"]
       - ["System.Timers", "Timer", "Timer", "(System.Double)", "summary", "df-generated"]
       - ["System.Timers", "Timer", "Timer", "(System.TimeSpan)", "summary", "df-generated"]
+      - ["System.Timers", "Timer", "add_Elapsed", "(System.Timers.ElapsedEventHandler)", "summary", "df-generated"]
+      - ["System.Timers", "Timer", "remove_Elapsed", "(System.Timers.ElapsedEventHandler)", "summary", "df-generated"]
       - ["System.Timers", "TimersDescriptionAttribute", "TimersDescriptionAttribute", "(System.String)", "summary", "df-generated"]
diff --git a/csharp/ql/lib/ext/generated/System.Transactions.model.yml b/csharp/ql/lib/ext/generated/System.Transactions.model.yml
index 1dedcb96179..192f7630ae1 100644
--- a/csharp/ql/lib/ext/generated/System.Transactions.model.yml
+++ b/csharp/ql/lib/ext/generated/System.Transactions.model.yml
@@ -4,11 +4,13 @@ extensions:
       pack: codeql/csharp-all
       extensible: summaryModel
     data:
+      - ["System.Transactions", "CommittableTransaction", False, "BeginCommit", "(System.AsyncCallback,System.Object)", "", "Argument[1]", "ReturnValue.SyntheticField[System.Transactions.Transaction._internalTransaction].SyntheticField[System.Transactions.InternalTransaction._asyncState]", "value", "dfc-generated"]
+      - ["System.Transactions", "CommittableTransaction", False, "BeginCommit", "(System.AsyncCallback,System.Object)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Transactions", "CommittableTransaction", False, "get_AsyncState", "()", "", "Argument[this].SyntheticField[System.Transactions.Transaction._internalTransaction].SyntheticField[System.Transactions.InternalTransaction._asyncState]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Transactions", "Transaction", False, "Clone", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Transactions", "Transaction", False, "EnlistDurable", "(System.Guid,System.Transactions.ISinglePhaseNotification,System.Transactions.EnlistmentOptions)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["System.Transactions", "Transaction", False, "EnlistPromotableSinglePhase", "(System.Transactions.IPromotableSinglePhaseNotification)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Transactions", "Transaction", False, "EnlistPromotableSinglePhase", "(System.Transactions.IPromotableSinglePhaseNotification,System.Guid)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Transactions", "Transaction", False, "EnlistPromotableSinglePhase", "(System.Transactions.IPromotableSinglePhaseNotification,System.Guid)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["System.Transactions", "Transaction", False, "EnlistPromotableSinglePhase", "(System.Transactions.IPromotableSinglePhaseNotification,System.Guid)", "", "Argument[1]", "Argument[this].SyntheticField[System.Transactions.Transaction._internalTransaction].SyntheticField[System.Transactions.InternalTransaction._promoterType]", "value", "dfc-generated"]
       - ["System.Transactions", "Transaction", False, "EnlistVolatile", "(System.Transactions.IEnlistmentNotification,System.Transactions.EnlistmentOptions)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["System.Transactions", "Transaction", False, "EnlistVolatile", "(System.Transactions.IEnlistmentNotification,System.Transactions.EnlistmentOptions)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Transactions", "Transaction", False, "EnlistVolatile", "(System.Transactions.ISinglePhaseNotification,System.Transactions.EnlistmentOptions)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
@@ -16,7 +18,7 @@ extensions:
       - ["System.Transactions", "Transaction", False, "PromoteAndEnlistDurable", "(System.Guid,System.Transactions.IPromotableSinglePhaseNotification,System.Transactions.ISinglePhaseNotification,System.Transactions.EnlistmentOptions)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["System.Transactions", "Transaction", False, "Rollback", "(System.Exception)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Transactions", "Transaction", False, "SetDistributedTransactionIdentifier", "(System.Transactions.IPromotableSinglePhaseNotification,System.Guid)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Transactions", "Transaction", False, "get_PromoterType", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Transactions", "Transaction", False, "get_PromoterType", "()", "", "Argument[this].SyntheticField[System.Transactions.Transaction._internalTransaction].SyntheticField[System.Transactions.InternalTransaction._promoterType]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Transactions", "Transaction", False, "get_TransactionInformation", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Transactions", "TransactionEventArgs", False, "get_Transaction", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Transactions", "TransactionInformation", False, "get_DistributedIdentifier", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
@@ -72,9 +74,11 @@ extensions:
       - ["System.Transactions", "Transaction", "GetHashCode", "()", "summary", "df-generated"]
       - ["System.Transactions", "Transaction", "GetPromotedToken", "()", "summary", "df-generated"]
       - ["System.Transactions", "Transaction", "Rollback", "()", "summary", "df-generated"]
+      - ["System.Transactions", "Transaction", "add_TransactionCompleted", "(System.Transactions.TransactionCompletedEventHandler)", "summary", "df-generated"]
       - ["System.Transactions", "Transaction", "get_IsolationLevel", "()", "summary", "df-generated"]
       - ["System.Transactions", "Transaction", "op_Equality", "(System.Transactions.Transaction,System.Transactions.Transaction)", "summary", "df-generated"]
       - ["System.Transactions", "Transaction", "op_Inequality", "(System.Transactions.Transaction,System.Transactions.Transaction)", "summary", "df-generated"]
+      - ["System.Transactions", "Transaction", "remove_TransactionCompleted", "(System.Transactions.TransactionCompletedEventHandler)", "summary", "df-generated"]
       - ["System.Transactions", "TransactionAbortedException", "TransactionAbortedException", "(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)", "summary", "df-generated"]
       - ["System.Transactions", "TransactionAbortedException", "TransactionAbortedException", "(System.String)", "summary", "df-generated"]
       - ["System.Transactions", "TransactionAbortedException", "TransactionAbortedException", "(System.String,System.Exception)", "summary", "df-generated"]
@@ -96,6 +100,8 @@ extensions:
       - ["System.Transactions", "TransactionInterop", "GetWhereabouts", "()", "summary", "df-generated"]
       - ["System.Transactions", "TransactionManager", "RecoveryComplete", "(System.Guid)", "summary", "df-generated"]
       - ["System.Transactions", "TransactionManager", "Reenlist", "(System.Guid,System.Byte[],System.Transactions.IEnlistmentNotification)", "summary", "df-generated"]
+      - ["System.Transactions", "TransactionManager", "add_DistributedTransactionStarted", "(System.Transactions.TransactionStartedEventHandler)", "summary", "df-generated"]
+      - ["System.Transactions", "TransactionManager", "remove_DistributedTransactionStarted", "(System.Transactions.TransactionStartedEventHandler)", "summary", "df-generated"]
       - ["System.Transactions", "TransactionManagerCommunicationException", "TransactionManagerCommunicationException", "(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)", "summary", "df-generated"]
       - ["System.Transactions", "TransactionManagerCommunicationException", "TransactionManagerCommunicationException", "(System.String)", "summary", "df-generated"]
       - ["System.Transactions", "TransactionManagerCommunicationException", "TransactionManagerCommunicationException", "(System.String,System.Exception)", "summary", "df-generated"]
diff --git a/csharp/ql/lib/ext/generated/System.Web.model.yml b/csharp/ql/lib/ext/generated/System.Web.model.yml
index 0462802974c..19ef940f9ea 100644
--- a/csharp/ql/lib/ext/generated/System.Web.model.yml
+++ b/csharp/ql/lib/ext/generated/System.Web.model.yml
@@ -4,13 +4,14 @@ extensions:
       pack: codeql/csharp-all
       extensible: summaryModel
     data:
-      - ["System.Web", "HttpUtility", False, "HtmlDecode", "(System.String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Web", "HttpUtility", False, "HtmlDecode", "(System.String,System.IO.TextWriter)", "", "Argument[0]", "Argument[1]", "taint", "df-generated"]
-      - ["System.Web", "HttpUtility", False, "UrlEncodeToBytes", "(System.Byte[])", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["System.Web", "HttpUtility", False, "UrlEncodeToBytes", "(System.Byte[],System.Int32,System.Int32)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["System.Web", "HttpUtility", False, "UrlEncodeToBytes", "(System.String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Web", "HttpUtility", False, "UrlEncodeToBytes", "(System.String,System.Text.Encoding)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Web", "HttpUtility", False, "UrlPathEncode", "(System.String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Web", "HttpUtility", False, "HtmlDecode", "(System.String)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Web", "HttpUtility", False, "UrlEncodeToBytes", "(System.Byte[])", "", "Argument[0].Element", "ReturnValue.Element", "value", "dfc-generated"]
+      - ["System.Web", "HttpUtility", False, "UrlEncodeToBytes", "(System.Byte[])", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Web", "HttpUtility", False, "UrlEncodeToBytes", "(System.Byte[],System.Int32,System.Int32)", "", "Argument[0].Element", "ReturnValue.Element", "value", "dfc-generated"]
+      - ["System.Web", "HttpUtility", False, "UrlEncodeToBytes", "(System.Byte[],System.Int32,System.Int32)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Web", "HttpUtility", False, "UrlEncodeToBytes", "(System.String)", "", "Argument[0]", "ReturnValue", "taint", "dfc-generated"]
+      - ["System.Web", "HttpUtility", False, "UrlEncodeToBytes", "(System.String,System.Text.Encoding)", "", "Argument[0]", "ReturnValue", "taint", "dfc-generated"]
+      - ["System.Web", "HttpUtility", False, "UrlPathEncode", "(System.String)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
   - addsTo:
       pack: codeql/csharp-all
       extensible: neutralModel
@@ -23,6 +24,7 @@ extensions:
       - ["System.Web", "AspNetHostingPermission", "ToXml", "()", "summary", "df-generated"]
       - ["System.Web", "AspNetHostingPermissionAttribute", "AspNetHostingPermissionAttribute", "(System.Security.Permissions.SecurityAction)", "summary", "df-generated"]
       - ["System.Web", "AspNetHostingPermissionAttribute", "CreatePermission", "()", "summary", "df-generated"]
+      - ["System.Web", "HttpUtility", "HtmlDecode", "(System.String,System.IO.TextWriter)", "summary", "df-generated"]
       - ["System.Web", "HttpUtility", "ParseQueryString", "(System.String)", "summary", "df-generated"]
       - ["System.Web", "HttpUtility", "ParseQueryString", "(System.String,System.Text.Encoding)", "summary", "df-generated"]
       - ["System.Web", "HttpUtility", "UrlDecode", "(System.Byte[],System.Int32,System.Int32,System.Text.Encoding)", "summary", "df-generated"]
diff --git a/csharp/ql/lib/ext/generated/System.Windows.Input.model.yml b/csharp/ql/lib/ext/generated/System.Windows.Input.model.yml
index aab3b663318..3637985078a 100644
--- a/csharp/ql/lib/ext/generated/System.Windows.Input.model.yml
+++ b/csharp/ql/lib/ext/generated/System.Windows.Input.model.yml
@@ -6,3 +6,5 @@ extensions:
     data:
       - ["System.Windows.Input", "ICommand", "CanExecute", "(System.Object)", "summary", "df-generated"]
       - ["System.Windows.Input", "ICommand", "Execute", "(System.Object)", "summary", "df-generated"]
+      - ["System.Windows.Input", "ICommand", "add_CanExecuteChanged", "(System.EventHandler)", "summary", "df-generated"]
+      - ["System.Windows.Input", "ICommand", "remove_CanExecuteChanged", "(System.EventHandler)", "summary", "df-generated"]
diff --git a/csharp/ql/lib/ext/generated/System.Windows.Markup.model.yml b/csharp/ql/lib/ext/generated/System.Windows.Markup.model.yml
index 9b7b81160c6..bfcb7befe53 100644
--- a/csharp/ql/lib/ext/generated/System.Windows.Markup.model.yml
+++ b/csharp/ql/lib/ext/generated/System.Windows.Markup.model.yml
@@ -4,8 +4,8 @@ extensions:
       pack: codeql/csharp-all
       extensible: summaryModel
     data:
-      - ["System.Windows.Markup", "ValueSerializerAttribute", False, "ValueSerializerAttribute", "(System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Windows.Markup", "ValueSerializerAttribute", False, "get_ValueSerializerTypeName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Windows.Markup", "ValueSerializerAttribute", False, "ValueSerializerAttribute", "(System.String)", "", "Argument[0]", "Argument[this].SyntheticField[System.Windows.Markup.ValueSerializerAttribute._valueSerializerTypeName]", "value", "dfc-generated"]
+      - ["System.Windows.Markup", "ValueSerializerAttribute", False, "get_ValueSerializerTypeName", "()", "", "Argument[this].SyntheticField[System.Windows.Markup.ValueSerializerAttribute._valueSerializerTypeName]", "ReturnValue", "value", "dfc-generated"]
   - addsTo:
       pack: codeql/csharp-all
       extensible: neutralModel
diff --git a/csharp/ql/lib/ext/generated/System.Xml.Linq.model.yml b/csharp/ql/lib/ext/generated/System.Xml.Linq.model.yml
index caf0254bb53..df262abbd71 100644
--- a/csharp/ql/lib/ext/generated/System.Xml.Linq.model.yml
+++ b/csharp/ql/lib/ext/generated/System.Xml.Linq.model.yml
@@ -6,25 +6,25 @@ extensions:
     data:
       - ["System.Xml.Linq", "Extensions", False, "Ancestors<T>", "(System.Collections.Generic.IEnumerable<T>)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
       - ["System.Xml.Linq", "Extensions", False, "Ancestors<T>", "(System.Collections.Generic.IEnumerable<T>,System.Xml.Linq.XName)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["System.Xml.Linq", "Extensions", False, "AncestorsAndSelf", "(System.Collections.Generic.IEnumerable<System.Xml.Linq.XElement>)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["System.Xml.Linq", "Extensions", False, "AncestorsAndSelf", "(System.Collections.Generic.IEnumerable<System.Xml.Linq.XElement>,System.Xml.Linq.XName)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
+      - ["System.Xml.Linq", "Extensions", False, "AncestorsAndSelf", "(System.Collections.Generic.IEnumerable<System.Xml.Linq.XElement>)", "", "Argument[0].Element", "ReturnValue.Element", "value", "dfc-generated"]
+      - ["System.Xml.Linq", "Extensions", False, "AncestorsAndSelf", "(System.Collections.Generic.IEnumerable<System.Xml.Linq.XElement>,System.Xml.Linq.XName)", "", "Argument[0].Element", "ReturnValue.Element", "value", "dfc-generated"]
       - ["System.Xml.Linq", "Extensions", False, "Attributes", "(System.Collections.Generic.IEnumerable<System.Xml.Linq.XElement>)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
       - ["System.Xml.Linq", "Extensions", False, "Attributes", "(System.Collections.Generic.IEnumerable<System.Xml.Linq.XElement>,System.Xml.Linq.XName)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["System.Xml.Linq", "Extensions", False, "DescendantNodes<T>", "(System.Collections.Generic.IEnumerable<T>)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["System.Xml.Linq", "Extensions", False, "DescendantNodesAndSelf", "(System.Collections.Generic.IEnumerable<System.Xml.Linq.XElement>)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
+      - ["System.Xml.Linq", "Extensions", False, "DescendantNodes<T>", "(System.Collections.Generic.IEnumerable<T>)", "", "Argument[0].Element.Property[System.Xml.Linq.XContainer.FirstNode]", "ReturnValue.Element", "value", "dfc-generated"]
+      - ["System.Xml.Linq", "Extensions", False, "DescendantNodesAndSelf", "(System.Collections.Generic.IEnumerable<System.Xml.Linq.XElement>)", "", "Argument[0].Element.Property[System.Xml.Linq.XContainer.FirstNode]", "ReturnValue.Element", "value", "dfc-generated"]
+      - ["System.Xml.Linq", "Extensions", False, "DescendantNodesAndSelf", "(System.Collections.Generic.IEnumerable<System.Xml.Linq.XElement>)", "", "Argument[0].Element", "ReturnValue.Element", "value", "dfc-generated"]
       - ["System.Xml.Linq", "Extensions", False, "Descendants<T>", "(System.Collections.Generic.IEnumerable<T>)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
       - ["System.Xml.Linq", "Extensions", False, "Descendants<T>", "(System.Collections.Generic.IEnumerable<T>,System.Xml.Linq.XName)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["System.Xml.Linq", "Extensions", False, "DescendantsAndSelf", "(System.Collections.Generic.IEnumerable<System.Xml.Linq.XElement>)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["System.Xml.Linq", "Extensions", False, "DescendantsAndSelf", "(System.Collections.Generic.IEnumerable<System.Xml.Linq.XElement>,System.Xml.Linq.XName)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
+      - ["System.Xml.Linq", "Extensions", False, "DescendantsAndSelf", "(System.Collections.Generic.IEnumerable<System.Xml.Linq.XElement>)", "", "Argument[0].Element", "ReturnValue.Element", "value", "dfc-generated"]
+      - ["System.Xml.Linq", "Extensions", False, "DescendantsAndSelf", "(System.Collections.Generic.IEnumerable<System.Xml.Linq.XElement>,System.Xml.Linq.XName)", "", "Argument[0].Element", "ReturnValue.Element", "value", "dfc-generated"]
       - ["System.Xml.Linq", "Extensions", False, "Elements<T>", "(System.Collections.Generic.IEnumerable<T>)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
       - ["System.Xml.Linq", "Extensions", False, "Elements<T>", "(System.Collections.Generic.IEnumerable<T>,System.Xml.Linq.XName)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["System.Xml.Linq", "Extensions", False, "InDocumentOrder<T>", "(System.Collections.Generic.IEnumerable<T>)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
+      - ["System.Xml.Linq", "Extensions", False, "InDocumentOrder<T>", "(System.Collections.Generic.IEnumerable<T>)", "", "Argument[0].Element", "ReturnValue.Element", "value", "dfc-generated"]
       - ["System.Xml.Linq", "Extensions", False, "Nodes<T>", "(System.Collections.Generic.IEnumerable<T>)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
       - ["System.Xml.Linq", "XAttribute", False, "SetValue", "(System.Object)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Xml.Linq", "XAttribute", False, "XAttribute", "(System.Xml.Linq.XAttribute)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Xml.Linq", "XAttribute", False, "XAttribute", "(System.Xml.Linq.XName,System.Object)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Xml.Linq", "XAttribute", False, "XAttribute", "(System.Xml.Linq.XName,System.Object)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Xml.Linq", "XAttribute", False, "get_Name", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Xml.Linq", "XAttribute", False, "XAttribute", "(System.Xml.Linq.XAttribute)", "", "Argument[0].SyntheticField[System.Xml.Linq.XAttribute.name]", "Argument[this].SyntheticField[System.Xml.Linq.XAttribute.name]", "value", "dfc-generated"]
+      - ["System.Xml.Linq", "XAttribute", False, "XAttribute", "(System.Xml.Linq.XName,System.Object)", "", "Argument[0]", "Argument[this].SyntheticField[System.Xml.Linq.XAttribute.name]", "value", "dfc-generated"]
+      - ["System.Xml.Linq", "XAttribute", False, "get_Name", "()", "", "Argument[this].SyntheticField[System.Xml.Linq.XAttribute.name]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Xml.Linq", "XAttribute", False, "get_NextAttribute", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Xml.Linq", "XAttribute", False, "get_PreviousAttribute", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Xml.Linq", "XComment", False, "XComment", "(System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
@@ -33,7 +33,6 @@ extensions:
       - ["System.Xml.Linq", "XContainer", False, "Add", "(System.Object)", "", "Argument[this]", "Argument[0]", "taint", "df-generated"]
       - ["System.Xml.Linq", "XContainer", False, "Add", "(System.Object[])", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
       - ["System.Xml.Linq", "XContainer", False, "AddFirst", "(System.Object)", "", "Argument[this]", "Argument[0]", "taint", "df-generated"]
-      - ["System.Xml.Linq", "XContainer", False, "CreateWriter", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Xml.Linq", "XContainer", False, "DescendantNodes", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Xml.Linq", "XContainer", False, "Descendants", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Xml.Linq", "XContainer", False, "Descendants", "(System.Xml.Linq.XName)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
@@ -46,11 +45,15 @@ extensions:
       - ["System.Xml.Linq", "XContainer", False, "ReplaceNodes", "(System.Object[])", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
       - ["System.Xml.Linq", "XContainer", False, "get_FirstNode", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Xml.Linq", "XContainer", False, "get_LastNode", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Xml.Linq", "XDeclaration", False, "ToString", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Xml.Linq", "XDeclaration", False, "XDeclaration", "(System.String,System.String,System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Xml.Linq", "XDeclaration", False, "XDeclaration", "(System.String,System.String,System.String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Xml.Linq", "XDeclaration", False, "XDeclaration", "(System.String,System.String,System.String)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Xml.Linq", "XDeclaration", False, "XDeclaration", "(System.Xml.Linq.XDeclaration)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["System.Xml.Linq", "XDeclaration", False, "ToString", "()", "", "Argument[this].SyntheticField[System.Xml.Linq.XDeclaration._encoding]", "ReturnValue", "taint", "dfc-generated"]
+      - ["System.Xml.Linq", "XDeclaration", False, "ToString", "()", "", "Argument[this].SyntheticField[System.Xml.Linq.XDeclaration._standalone]", "ReturnValue", "taint", "dfc-generated"]
+      - ["System.Xml.Linq", "XDeclaration", False, "ToString", "()", "", "Argument[this].SyntheticField[System.Xml.Linq.XDeclaration._version]", "ReturnValue", "taint", "dfc-generated"]
+      - ["System.Xml.Linq", "XDeclaration", False, "XDeclaration", "(System.String,System.String,System.String)", "", "Argument[0]", "Argument[this].SyntheticField[System.Xml.Linq.XDeclaration._version]", "value", "dfc-generated"]
+      - ["System.Xml.Linq", "XDeclaration", False, "XDeclaration", "(System.String,System.String,System.String)", "", "Argument[1]", "Argument[this].SyntheticField[System.Xml.Linq.XDeclaration._encoding]", "value", "dfc-generated"]
+      - ["System.Xml.Linq", "XDeclaration", False, "XDeclaration", "(System.String,System.String,System.String)", "", "Argument[2]", "Argument[this].SyntheticField[System.Xml.Linq.XDeclaration._standalone]", "value", "dfc-generated"]
+      - ["System.Xml.Linq", "XDeclaration", False, "XDeclaration", "(System.Xml.Linq.XDeclaration)", "", "Argument[0].SyntheticField[System.Xml.Linq.XDeclaration._encoding]", "Argument[this].SyntheticField[System.Xml.Linq.XDeclaration._encoding]", "value", "dfc-generated"]
+      - ["System.Xml.Linq", "XDeclaration", False, "XDeclaration", "(System.Xml.Linq.XDeclaration)", "", "Argument[0].SyntheticField[System.Xml.Linq.XDeclaration._standalone]", "Argument[this].SyntheticField[System.Xml.Linq.XDeclaration._standalone]", "value", "dfc-generated"]
+      - ["System.Xml.Linq", "XDeclaration", False, "XDeclaration", "(System.Xml.Linq.XDeclaration)", "", "Argument[0].SyntheticField[System.Xml.Linq.XDeclaration._version]", "Argument[this].SyntheticField[System.Xml.Linq.XDeclaration._version]", "value", "dfc-generated"]
       - ["System.Xml.Linq", "XDocument", False, "Load", "(System.IO.Stream)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["System.Xml.Linq", "XDocument", False, "Load", "(System.IO.Stream,System.Xml.Linq.LoadOptions)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["System.Xml.Linq", "XDocument", False, "Load", "(System.IO.TextReader)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
@@ -62,20 +65,18 @@ extensions:
       - ["System.Xml.Linq", "XDocument", False, "Parse", "(System.String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["System.Xml.Linq", "XDocument", False, "Parse", "(System.String,System.Xml.Linq.LoadOptions)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["System.Xml.Linq", "XDocument", False, "Save", "(System.Xml.XmlWriter)", "", "Argument[this]", "Argument[0]", "taint", "df-generated"]
-      - ["System.Xml.Linq", "XDocument", False, "SaveAsync", "(System.Xml.XmlWriter,System.Threading.CancellationToken)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
       - ["System.Xml.Linq", "XDocument", False, "SaveAsync", "(System.Xml.XmlWriter,System.Threading.CancellationToken)", "", "Argument[this]", "Argument[0]", "taint", "df-generated"]
       - ["System.Xml.Linq", "XDocument", False, "XDocument", "(System.Object[])", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
       - ["System.Xml.Linq", "XDocument", False, "XDocument", "(System.Xml.Linq.XDeclaration,System.Object[])", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Xml.Linq", "XDocument", False, "XDocument", "(System.Xml.Linq.XDocument)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Xml.Linq", "XDocument", False, "get_DocumentType", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Xml.Linq", "XDocument", False, "get_Root", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Xml.Linq", "XDocumentType", False, "XDocumentType", "(System.String,System.String,System.String,System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Xml.Linq", "XDocumentType", False, "XDocumentType", "(System.String,System.String,System.String,System.String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
       - ["System.Xml.Linq", "XDocumentType", False, "XDocumentType", "(System.String,System.String,System.String,System.String)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
       - ["System.Xml.Linq", "XDocumentType", False, "XDocumentType", "(System.String,System.String,System.String,System.String)", "", "Argument[3]", "Argument[this]", "taint", "df-generated"]
       - ["System.Xml.Linq", "XDocumentType", False, "XDocumentType", "(System.Xml.Linq.XDocumentType)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Xml.Linq", "XElement", False, "AncestorsAndSelf", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Xml.Linq", "XElement", False, "AncestorsAndSelf", "(System.Xml.Linq.XName)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Xml.Linq", "XElement", False, "AncestorsAndSelf", "()", "", "Argument[this]", "ReturnValue.Element", "value", "dfc-generated"]
+      - ["System.Xml.Linq", "XElement", False, "AncestorsAndSelf", "(System.Xml.Linq.XName)", "", "Argument[this]", "ReturnValue.Element", "value", "dfc-generated"]
       - ["System.Xml.Linq", "XElement", False, "Attribute", "(System.Xml.Linq.XName)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Xml.Linq", "XElement", False, "Attributes", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Xml.Linq", "XElement", False, "Attributes", "(System.Xml.Linq.XName)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
@@ -98,7 +99,6 @@ extensions:
       - ["System.Xml.Linq", "XElement", False, "ReplaceAttributes", "(System.Object)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Xml.Linq", "XElement", False, "ReplaceAttributes", "(System.Object)", "", "Argument[this]", "Argument[0]", "taint", "df-generated"]
       - ["System.Xml.Linq", "XElement", False, "ReplaceAttributes", "(System.Object[])", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["System.Xml.Linq", "XElement", False, "SaveAsync", "(System.Xml.XmlWriter,System.Threading.CancellationToken)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
       - ["System.Xml.Linq", "XElement", False, "SetAttributeValue", "(System.Xml.Linq.XName,System.Object)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Xml.Linq", "XElement", False, "SetAttributeValue", "(System.Xml.Linq.XName,System.Object)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
       - ["System.Xml.Linq", "XElement", False, "SetElementValue", "(System.Xml.Linq.XName,System.Object)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
@@ -111,23 +111,19 @@ extensions:
       - ["System.Xml.Linq", "XElement", False, "XElement", "(System.Xml.Linq.XStreamingElement)", "", "Argument[this]", "Argument[0]", "taint", "df-generated"]
       - ["System.Xml.Linq", "XElement", False, "get_FirstAttribute", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Xml.Linq", "XElement", False, "get_LastAttribute", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Xml.Linq", "XName", False, "Get", "(System.String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Xml.Linq", "XName", False, "Get", "(System.String,System.String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Xml.Linq", "XName", False, "ToString", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Xml.Linq", "XName", False, "ToString", "()", "", "Argument[this].SyntheticField[System.Xml.Linq.XName._ns].Property[System.Xml.Linq.XNamespace.NamespaceName]", "ReturnValue", "taint", "dfc-generated"]
       - ["System.Xml.Linq", "XName", False, "get_LocalName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Xml.Linq", "XName", False, "get_Namespace", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Xml.Linq", "XName", False, "get_NamespaceName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Xml.Linq", "XNamespace", False, "GetName", "(System.String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Xml.Linq", "XNamespace", False, "GetName", "(System.String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Xml.Linq", "XName", False, "get_Namespace", "()", "", "Argument[this].SyntheticField[System.Xml.Linq.XName._ns]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Xml.Linq", "XName", False, "get_NamespaceName", "()", "", "Argument[this].SyntheticField[System.Xml.Linq.XName._ns].Property[System.Xml.Linq.XNamespace.NamespaceName]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Xml.Linq", "XNamespace", False, "GetName", "(System.String)", "", "Argument[this]", "ReturnValue.SyntheticField[System.Xml.Linq.XName._ns]", "value", "dfc-generated"]
       - ["System.Xml.Linq", "XNamespace", False, "ToString", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Xml.Linq", "XNamespace", False, "get_NamespaceName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Xml.Linq", "XNamespace", False, "op_Addition", "(System.Xml.Linq.XNamespace,System.String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Xml.Linq", "XNamespace", False, "op_Addition", "(System.Xml.Linq.XNamespace,System.String)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Xml.Linq", "XNamespace", False, "op_Addition", "(System.Xml.Linq.XNamespace,System.String)", "", "Argument[0]", "ReturnValue.SyntheticField[System.Xml.Linq.XName._ns]", "value", "dfc-generated"]
       - ["System.Xml.Linq", "XNode", False, "AddAfterSelf", "(System.Object)", "", "Argument[this]", "Argument[0]", "taint", "df-generated"]
       - ["System.Xml.Linq", "XNode", False, "AddBeforeSelf", "(System.Object)", "", "Argument[this]", "Argument[0]", "taint", "df-generated"]
       - ["System.Xml.Linq", "XNode", False, "Ancestors", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Xml.Linq", "XNode", False, "Ancestors", "(System.Xml.Linq.XName)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Xml.Linq", "XNode", False, "CreateReader", "(System.Xml.Linq.ReaderOptions)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Xml.Linq", "XNode", False, "CreateReader", "(System.Xml.Linq.ReaderOptions)", "", "Argument[this]", "ReturnValue.SyntheticField[System.Xml.Linq.XNodeReader._source]", "value", "dfc-generated"]
       - ["System.Xml.Linq", "XNode", False, "ElementsAfterSelf", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Xml.Linq", "XNode", False, "ElementsAfterSelf", "(System.Xml.Linq.XName)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Xml.Linq", "XNode", False, "NodesAfterSelf", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
@@ -136,15 +132,20 @@ extensions:
       - ["System.Xml.Linq", "XNode", False, "ReplaceWith", "(System.Object)", "", "Argument[this]", "Argument[0]", "taint", "df-generated"]
       - ["System.Xml.Linq", "XNode", False, "get_NextNode", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Xml.Linq", "XNode", True, "WriteTo", "(System.Xml.XmlWriter)", "", "Argument[this]", "Argument[0]", "taint", "df-generated"]
-      - ["System.Xml.Linq", "XNode", True, "WriteToAsync", "(System.Xml.XmlWriter,System.Threading.CancellationToken)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
       - ["System.Xml.Linq", "XNode", True, "WriteToAsync", "(System.Xml.XmlWriter,System.Threading.CancellationToken)", "", "Argument[this]", "Argument[0]", "taint", "df-generated"]
-      - ["System.Xml.Linq", "XObject", False, "AddAnnotation", "(System.Object)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Xml.Linq", "XObject", False, "Annotation", "(System.Type)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Xml.Linq", "XObject", False, "Annotation<T>", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Xml.Linq", "XObject", False, "Annotations", "(System.Type)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Xml.Linq", "XObject", False, "Annotations<T>", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Xml.Linq", "XObject", False, "AddAnnotation", "(System.Object)", "", "Argument[0]", "Argument[this].SyntheticField[System.Xml.Linq.XObject.annotations].Element", "value", "dfc-generated"]
+      - ["System.Xml.Linq", "XObject", False, "AddAnnotation", "(System.Object)", "", "Argument[0]", "Argument[this].SyntheticField[System.Xml.Linq.XObject.annotations]", "value", "dfc-generated"]
+      - ["System.Xml.Linq", "XObject", False, "AddAnnotation", "(System.Object)", "", "Argument[this].SyntheticField[System.Xml.Linq.XObject.annotations]", "Argument[this].SyntheticField[System.Xml.Linq.XObject.annotations].Element", "value", "dfc-generated"]
+      - ["System.Xml.Linq", "XObject", False, "Annotation", "(System.Type)", "", "Argument[this].SyntheticField[System.Xml.Linq.XObject.annotations].Element", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Xml.Linq", "XObject", False, "Annotation", "(System.Type)", "", "Argument[this].SyntheticField[System.Xml.Linq.XObject.annotations]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Xml.Linq", "XObject", False, "Annotation<T>", "()", "", "Argument[this].SyntheticField[System.Xml.Linq.XObject.annotations].Element", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Xml.Linq", "XObject", False, "Annotation<T>", "()", "", "Argument[this].SyntheticField[System.Xml.Linq.XObject.annotations]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Xml.Linq", "XObject", False, "Annotations", "(System.Type)", "", "Argument[this].SyntheticField[System.Xml.Linq.XObject.annotations].Element", "ReturnValue.Element", "value", "dfc-generated"]
+      - ["System.Xml.Linq", "XObject", False, "Annotations", "(System.Type)", "", "Argument[this].SyntheticField[System.Xml.Linq.XObject.annotations]", "ReturnValue.Element", "value", "dfc-generated"]
+      - ["System.Xml.Linq", "XObject", False, "Annotations<T>", "()", "", "Argument[this].SyntheticField[System.Xml.Linq.XObject.annotations].Element", "ReturnValue.Element", "value", "dfc-generated"]
+      - ["System.Xml.Linq", "XObject", False, "Annotations<T>", "()", "", "Argument[this].SyntheticField[System.Xml.Linq.XObject.annotations]", "ReturnValue.Element", "value", "dfc-generated"]
       - ["System.Xml.Linq", "XObject", False, "get_BaseUri", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Xml.Linq", "XObject", False, "get_Document", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Xml.Linq", "XObject", False, "get_Document", "()", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Xml.Linq", "XObject", False, "get_Parent", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Xml.Linq", "XProcessingInstruction", False, "XProcessingInstruction", "(System.String,System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Xml.Linq", "XProcessingInstruction", False, "XProcessingInstruction", "(System.String,System.String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
@@ -170,6 +171,7 @@ extensions:
       - ["System.Xml.Linq", "XCData", "get_NodeType", "()", "summary", "df-generated"]
       - ["System.Xml.Linq", "XComment", "get_NodeType", "()", "summary", "df-generated"]
       - ["System.Xml.Linq", "XContainer", "AddFirst", "(System.Object[])", "summary", "df-generated"]
+      - ["System.Xml.Linq", "XContainer", "CreateWriter", "()", "summary", "df-generated"]
       - ["System.Xml.Linq", "XContainer", "RemoveNodes", "()", "summary", "df-generated"]
       - ["System.Xml.Linq", "XDocument", "LoadAsync", "(System.IO.Stream,System.Xml.Linq.LoadOptions,System.Threading.CancellationToken)", "summary", "df-generated"]
       - ["System.Xml.Linq", "XDocument", "LoadAsync", "(System.IO.TextReader,System.Xml.Linq.LoadOptions,System.Threading.CancellationToken)", "summary", "df-generated"]
@@ -202,6 +204,7 @@ extensions:
       - ["System.Xml.Linq", "XElement", "Save", "(System.Xml.XmlWriter)", "summary", "df-generated"]
       - ["System.Xml.Linq", "XElement", "SaveAsync", "(System.IO.Stream,System.Xml.Linq.SaveOptions,System.Threading.CancellationToken)", "summary", "df-generated"]
       - ["System.Xml.Linq", "XElement", "SaveAsync", "(System.IO.TextWriter,System.Xml.Linq.SaveOptions,System.Threading.CancellationToken)", "summary", "df-generated"]
+      - ["System.Xml.Linq", "XElement", "SaveAsync", "(System.Xml.XmlWriter,System.Threading.CancellationToken)", "summary", "df-generated"]
       - ["System.Xml.Linq", "XElement", "XElement", "(System.Xml.Linq.XName,System.Object[])", "summary", "df-generated"]
       - ["System.Xml.Linq", "XElement", "get_EmptySequence", "()", "summary", "df-generated"]
       - ["System.Xml.Linq", "XElement", "get_HasAttributes", "()", "summary", "df-generated"]
@@ -210,6 +213,8 @@ extensions:
       - ["System.Xml.Linq", "XElement", "get_NodeType", "()", "summary", "df-generated"]
       - ["System.Xml.Linq", "XName", "Equals", "(System.Object)", "summary", "df-generated"]
       - ["System.Xml.Linq", "XName", "Equals", "(System.Xml.Linq.XName)", "summary", "df-generated"]
+      - ["System.Xml.Linq", "XName", "Get", "(System.String)", "summary", "df-generated"]
+      - ["System.Xml.Linq", "XName", "Get", "(System.String,System.String)", "summary", "df-generated"]
       - ["System.Xml.Linq", "XName", "GetHashCode", "()", "summary", "df-generated"]
       - ["System.Xml.Linq", "XName", "op_Equality", "(System.Xml.Linq.XName,System.Xml.Linq.XName)", "summary", "df-generated"]
       - ["System.Xml.Linq", "XName", "op_Inequality", "(System.Xml.Linq.XName,System.Xml.Linq.XName)", "summary", "df-generated"]
@@ -238,18 +243,19 @@ extensions:
       - ["System.Xml.Linq", "XNode", "get_DocumentOrderComparer", "()", "summary", "df-generated"]
       - ["System.Xml.Linq", "XNode", "get_EqualityComparer", "()", "summary", "df-generated"]
       - ["System.Xml.Linq", "XNode", "get_PreviousNode", "()", "summary", "df-generated"]
-      - ["System.Xml.Linq", "XNodeDocumentOrderComparer", "Compare", "(System.Object,System.Object)", "summary", "df-generated"]
       - ["System.Xml.Linq", "XNodeDocumentOrderComparer", "Compare", "(System.Xml.Linq.XNode,System.Xml.Linq.XNode)", "summary", "df-generated"]
-      - ["System.Xml.Linq", "XNodeEqualityComparer", "Equals", "(System.Object,System.Object)", "summary", "df-generated"]
       - ["System.Xml.Linq", "XNodeEqualityComparer", "Equals", "(System.Xml.Linq.XNode,System.Xml.Linq.XNode)", "summary", "df-generated"]
-      - ["System.Xml.Linq", "XNodeEqualityComparer", "GetHashCode", "(System.Object)", "summary", "df-generated"]
       - ["System.Xml.Linq", "XNodeEqualityComparer", "GetHashCode", "(System.Xml.Linq.XNode)", "summary", "df-generated"]
       - ["System.Xml.Linq", "XObject", "HasLineInfo", "()", "summary", "df-generated"]
       - ["System.Xml.Linq", "XObject", "RemoveAnnotations", "(System.Type)", "summary", "df-generated"]
       - ["System.Xml.Linq", "XObject", "RemoveAnnotations<T>", "()", "summary", "df-generated"]
+      - ["System.Xml.Linq", "XObject", "add_Changed", "(System.EventHandler<System.Xml.Linq.XObjectChangeEventArgs>)", "summary", "df-generated"]
+      - ["System.Xml.Linq", "XObject", "add_Changing", "(System.EventHandler<System.Xml.Linq.XObjectChangeEventArgs>)", "summary", "df-generated"]
       - ["System.Xml.Linq", "XObject", "get_LineNumber", "()", "summary", "df-generated"]
       - ["System.Xml.Linq", "XObject", "get_LinePosition", "()", "summary", "df-generated"]
       - ["System.Xml.Linq", "XObject", "get_NodeType", "()", "summary", "df-generated"]
+      - ["System.Xml.Linq", "XObject", "remove_Changed", "(System.EventHandler<System.Xml.Linq.XObjectChangeEventArgs>)", "summary", "df-generated"]
+      - ["System.Xml.Linq", "XObject", "remove_Changing", "(System.EventHandler<System.Xml.Linq.XObjectChangeEventArgs>)", "summary", "df-generated"]
       - ["System.Xml.Linq", "XObjectChangeEventArgs", "XObjectChangeEventArgs", "(System.Xml.Linq.XObjectChange)", "summary", "df-generated"]
       - ["System.Xml.Linq", "XObjectChangeEventArgs", "get_ObjectChange", "()", "summary", "df-generated"]
       - ["System.Xml.Linq", "XProcessingInstruction", "get_NodeType", "()", "summary", "df-generated"]
diff --git a/csharp/ql/lib/ext/generated/System.Xml.Resolvers.model.yml b/csharp/ql/lib/ext/generated/System.Xml.Resolvers.model.yml
index df54038a314..cedc13ddbb9 100644
--- a/csharp/ql/lib/ext/generated/System.Xml.Resolvers.model.yml
+++ b/csharp/ql/lib/ext/generated/System.Xml.Resolvers.model.yml
@@ -5,8 +5,9 @@ extensions:
       extensible: summaryModel
     data:
       - ["System.Xml.Resolvers", "XmlPreloadedResolver", False, "XmlPreloadedResolver", "(System.Xml.XmlResolver,System.Xml.Resolvers.XmlKnownDtds,System.Collections.Generic.IEqualityComparer<System.Uri>)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Xml.Resolvers", "XmlPreloadedResolver", False, "XmlPreloadedResolver", "(System.Xml.XmlResolver,System.Xml.Resolvers.XmlKnownDtds,System.Collections.Generic.IEqualityComparer<System.Uri>)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
       - ["System.Xml.Resolvers", "XmlPreloadedResolver", False, "get_PreloadedUris", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Xml.Resolvers", "XmlPreloadedResolver", True, "GetEntity", "(System.Uri,System.String,System.Type)", "", "Argument[0].Property[System.Uri.LocalPath]", "ReturnValue", "taint", "dfc-generated"]
+      - ["System.Xml.Resolvers", "XmlPreloadedResolver", True, "GetEntityAsync", "(System.Uri,System.String,System.Type)", "", "Argument[0].Property[System.Uri.LocalPath]", "ReturnValue.Property[System.Threading.Tasks.Task`1.Result]", "taint", "dfc-generated"]
   - addsTo:
       pack: codeql/csharp-all
       extensible: neutralModel
diff --git a/csharp/ql/lib/ext/generated/System.Xml.Schema.model.yml b/csharp/ql/lib/ext/generated/System.Xml.Schema.model.yml
index ceee92e6a17..270fa553dac 100644
--- a/csharp/ql/lib/ext/generated/System.Xml.Schema.model.yml
+++ b/csharp/ql/lib/ext/generated/System.Xml.Schema.model.yml
@@ -12,7 +12,7 @@ extensions:
       - ["System.Xml.Schema", "IXmlSchemaInfo", True, "get_SchemaType", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Xml.Schema", "ValidationEventArgs", False, "get_Exception", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Xml.Schema", "ValidationEventArgs", False, "get_Message", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Xml.Schema", "XmlAtomicValue", False, "Clone", "()", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["System.Xml.Schema", "XmlAtomicValue", False, "Clone", "()", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Xml.Schema", "XmlAtomicValue", False, "ToString", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Xml.Schema", "XmlSchema", False, "get_Groups", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Xml.Schema", "XmlSchema", False, "get_Includes", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
@@ -27,27 +27,30 @@ extensions:
       - ["System.Xml.Schema", "XmlSchemaAttributeGroup", False, "get_RedefinedAttributeGroup", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Xml.Schema", "XmlSchemaCollection", False, "Add", "(System.String,System.Xml.XmlReader)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
       - ["System.Xml.Schema", "XmlSchemaCollection", False, "Add", "(System.String,System.Xml.XmlReader,System.Xml.XmlResolver)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Xml.Schema", "XmlSchemaCollection", False, "Add", "(System.Xml.Schema.XmlSchema,System.Xml.XmlResolver)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Xml.Schema", "XmlSchemaCollection", False, "XmlSchemaCollection", "(System.Xml.XmlNameTable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["System.Xml.Schema", "XmlSchemaCollection", False, "Add", "(System.Xml.Schema.XmlSchema,System.Xml.XmlResolver)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Xml.Schema", "XmlSchemaCollection", False, "XmlSchemaCollection", "(System.Xml.XmlNameTable)", "", "Argument[0]", "Argument[this].SyntheticField[System.Xml.Schema.XmlSchemaCollection._nameTable]", "value", "dfc-generated"]
       - ["System.Xml.Schema", "XmlSchemaCollection", False, "get_Item", "(System.String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Xml.Schema", "XmlSchemaCollection", False, "get_NameTable", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Xml.Schema", "XmlSchemaCollection", False, "get_NameTable", "()", "", "Argument[this].SyntheticField[System.Xml.Schema.XmlSchemaCollection._nameTable]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Xml.Schema", "XmlSchemaCollectionEnumerator", False, "get_Current", "()", "", "Argument[this].Property[System.Xml.Schema.XmlSchemaCollectionEnumerator.Current]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Xml.Schema", "XmlSchemaComplexContentExtension", False, "get_Attributes", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Xml.Schema", "XmlSchemaComplexContentRestriction", False, "get_Attributes", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Xml.Schema", "XmlSchemaComplexType", False, "get_AttributeWildcard", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Xml.Schema", "XmlSchemaComplexType", False, "get_ContentTypeParticle", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Xml.Schema", "XmlSchemaDatatype", True, "ChangeType", "(System.Object,System.Type)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["System.Xml.Schema", "XmlSchemaDatatype", True, "ChangeType", "(System.Object,System.Type)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Xml.Schema", "XmlSchemaDatatype", True, "ChangeType", "(System.Object,System.Type,System.Xml.IXmlNamespaceResolver)", "", "Argument[0]", "Argument[2]", "taint", "df-generated"]
       - ["System.Xml.Schema", "XmlSchemaDatatype", True, "ChangeType", "(System.Object,System.Type,System.Xml.IXmlNamespaceResolver)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["System.Xml.Schema", "XmlSchemaDatatype", True, "ChangeType", "(System.Object,System.Type,System.Xml.IXmlNamespaceResolver)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
       - ["System.Xml.Schema", "XmlSchemaDatatype", True, "ChangeType", "(System.Object,System.Type,System.Xml.IXmlNamespaceResolver)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Xml.Schema", "XmlSchemaDatatype", True, "ParseValue", "(System.String,System.Xml.XmlNameTable,System.Xml.IXmlNamespaceResolver)", "", "Argument[0]", "Argument[2]", "taint", "df-generated"]
       - ["System.Xml.Schema", "XmlSchemaDatatype", True, "ParseValue", "(System.String,System.Xml.XmlNameTable,System.Xml.IXmlNamespaceResolver)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["System.Xml.Schema", "XmlSchemaDatatype", True, "ParseValue", "(System.String,System.Xml.XmlNameTable,System.Xml.IXmlNamespaceResolver)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Xml.Schema", "XmlSchemaElement", False, "get_ElementSchemaType", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Xml.Schema", "XmlSchemaElement", False, "get_ElementType", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Xml.Schema", "XmlSchemaElement", False, "get_QualifiedName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Xml.Schema", "XmlSchemaException", False, "XmlSchemaException", "(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Xml.Schema", "XmlSchemaException", False, "get_SourceSchemaObject", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Xml.Schema", "XmlSchemaException", False, "get_SourceUri", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Xml.Schema", "XmlSchemaException", True, "get_Message", "()", "", "Argument[this].Property[System.Exception.Message]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Xml.Schema", "XmlSchemaGroup", False, "get_QualifiedName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Xml.Schema", "XmlSchemaGroupBase", True, "get_Items", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Xml.Schema", "XmlSchemaGroupRef", False, "get_Particle", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
@@ -56,14 +59,7 @@ extensions:
       - ["System.Xml.Schema", "XmlSchemaInference", False, "InferSchema", "(System.Xml.XmlReader)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Xml.Schema", "XmlSchemaInference", False, "InferSchema", "(System.Xml.XmlReader)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["System.Xml.Schema", "XmlSchemaInference", False, "InferSchema", "(System.Xml.XmlReader)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Xml.Schema", "XmlSchemaInference", False, "InferSchema", "(System.Xml.XmlReader,System.Xml.Schema.XmlSchemaSet)", "", "Argument[0]", "Argument[1]", "taint", "df-generated"]
-      - ["System.Xml.Schema", "XmlSchemaInference", False, "InferSchema", "(System.Xml.XmlReader,System.Xml.Schema.XmlSchemaSet)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Xml.Schema", "XmlSchemaInference", False, "InferSchema", "(System.Xml.XmlReader,System.Xml.Schema.XmlSchemaSet)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Xml.Schema", "XmlSchemaInference", False, "InferSchema", "(System.Xml.XmlReader,System.Xml.Schema.XmlSchemaSet)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Xml.Schema", "XmlSchemaInference", False, "InferSchema", "(System.Xml.XmlReader,System.Xml.Schema.XmlSchemaSet)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Xml.Schema", "XmlSchemaInference", False, "InferSchema", "(System.Xml.XmlReader,System.Xml.Schema.XmlSchemaSet)", "", "Argument[this]", "Argument[1]", "taint", "df-generated"]
-      - ["System.Xml.Schema", "XmlSchemaInference", False, "InferSchema", "(System.Xml.XmlReader,System.Xml.Schema.XmlSchemaSet)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Xml.Schema", "XmlSchemaObjectCollection", False, "Remove", "(System.Xml.Schema.XmlSchemaObject)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["System.Xml.Schema", "XmlSchemaInference", False, "InferSchema", "(System.Xml.XmlReader,System.Xml.Schema.XmlSchemaSet)", "", "Argument[1]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Xml.Schema", "XmlSchemaObjectCollection", False, "XmlSchemaObjectCollection", "(System.Xml.Schema.XmlSchemaObject)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Xml.Schema", "XmlSchemaObjectEnumerator", False, "get_Current", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Xml.Schema", "XmlSchemaObjectTable", False, "get_Names", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
@@ -86,12 +82,12 @@ extensions:
       - ["System.Xml.Schema", "XmlSchemaSet", False, "Add", "(System.Xml.Schema.XmlSchema)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["System.Xml.Schema", "XmlSchemaSet", False, "Add", "(System.Xml.Schema.XmlSchemaSet)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Xml.Schema", "XmlSchemaSet", False, "CopyTo", "(System.Xml.Schema.XmlSchema[],System.Int32)", "", "Argument[this]", "Argument[0].Element", "taint", "df-generated"]
-      - ["System.Xml.Schema", "XmlSchemaSet", False, "Remove", "(System.Xml.Schema.XmlSchema)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Xml.Schema", "XmlSchemaSet", False, "Remove", "(System.Xml.Schema.XmlSchema)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Xml.Schema", "XmlSchemaSet", False, "Reprocess", "(System.Xml.Schema.XmlSchema)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Xml.Schema", "XmlSchemaSet", False, "Reprocess", "(System.Xml.Schema.XmlSchema)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["System.Xml.Schema", "XmlSchemaSet", False, "Schemas", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Xml.Schema", "XmlSchemaSet", False, "XmlSchemaSet", "(System.Xml.XmlNameTable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Xml.Schema", "XmlSchemaSet", False, "get_NameTable", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Xml.Schema", "XmlSchemaSet", False, "XmlSchemaSet", "(System.Xml.XmlNameTable)", "", "Argument[0]", "Argument[this].SyntheticField[System.Xml.Schema.XmlSchemaSet._nameTable]", "value", "dfc-generated"]
+      - ["System.Xml.Schema", "XmlSchemaSet", False, "get_NameTable", "()", "", "Argument[this].SyntheticField[System.Xml.Schema.XmlSchemaSet._nameTable]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Xml.Schema", "XmlSchemaSet", False, "set_XmlResolver", "(System.Xml.XmlResolver)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Xml.Schema", "XmlSchemaSimpleContentExtension", False, "get_Attributes", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Xml.Schema", "XmlSchemaSimpleContentRestriction", False, "get_Attributes", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
@@ -103,12 +99,12 @@ extensions:
       - ["System.Xml.Schema", "XmlSchemaType", False, "get_BaseXmlSchemaType", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Xml.Schema", "XmlSchemaType", False, "get_Datatype", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Xml.Schema", "XmlSchemaType", False, "get_QualifiedName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Xml.Schema", "XmlSchemaValidationException", False, "SetSourceObject", "(System.Object)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Xml.Schema", "XmlSchemaValidationException", False, "get_SourceObject", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Xml.Schema", "XmlSchemaValidationException", False, "SetSourceObject", "(System.Object)", "", "Argument[0]", "Argument[this].SyntheticField[System.Xml.Schema.XmlSchemaValidationException._sourceNodeObject]", "value", "dfc-generated"]
+      - ["System.Xml.Schema", "XmlSchemaValidationException", False, "get_SourceObject", "()", "", "Argument[this].SyntheticField[System.Xml.Schema.XmlSchemaValidationException._sourceNodeObject]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Xml.Schema", "XmlSchemaValidator", False, "AddSchema", "(System.Xml.Schema.XmlSchema)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Xml.Schema", "XmlSchemaValidator", False, "GetExpectedAttributes", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Xml.Schema", "XmlSchemaValidator", False, "GetExpectedParticles", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Xml.Schema", "XmlSchemaValidator", False, "Initialize", "(System.Xml.Schema.XmlSchemaObject)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["System.Xml.Schema", "XmlSchemaValidator", False, "GetExpectedAttributes", "()", "", "Argument[this].SyntheticField[System.Xml.Schema.XmlSchemaValidator._partialValidationType]", "ReturnValue.Element", "value", "dfc-generated"]
+      - ["System.Xml.Schema", "XmlSchemaValidator", False, "GetExpectedParticles", "()", "", "Argument[this].SyntheticField[System.Xml.Schema.XmlSchemaValidator._partialValidationType]", "ReturnValue.Element", "value", "dfc-generated"]
+      - ["System.Xml.Schema", "XmlSchemaValidator", False, "Initialize", "(System.Xml.Schema.XmlSchemaObject)", "", "Argument[0]", "Argument[this].SyntheticField[System.Xml.Schema.XmlSchemaValidator._partialValidationType]", "value", "dfc-generated"]
       - ["System.Xml.Schema", "XmlSchemaValidator", False, "SkipToEndElement", "(System.Xml.Schema.XmlSchemaInfo)", "", "Argument[this]", "Argument[0]", "taint", "df-generated"]
       - ["System.Xml.Schema", "XmlSchemaValidator", False, "ValidateAttribute", "(System.String,System.String,System.String,System.Xml.Schema.XmlSchemaInfo)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
       - ["System.Xml.Schema", "XmlSchemaValidator", False, "ValidateAttribute", "(System.String,System.String,System.String,System.Xml.Schema.XmlSchemaInfo)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
@@ -122,8 +118,6 @@ extensions:
       - ["System.Xml.Schema", "XmlSchemaValidator", False, "ValidateEndElement", "(System.Xml.Schema.XmlSchemaInfo,System.Object)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
       - ["System.Xml.Schema", "XmlSchemaValidator", False, "ValidateEndElement", "(System.Xml.Schema.XmlSchemaInfo,System.Object)", "", "Argument[this]", "Argument[0]", "taint", "df-generated"]
       - ["System.Xml.Schema", "XmlSchemaValidator", False, "ValidateEndElement", "(System.Xml.Schema.XmlSchemaInfo,System.Object)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Xml.Schema", "XmlSchemaValidator", False, "ValidateText", "(System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Xml.Schema", "XmlSchemaValidator", False, "ValidateWhitespace", "(System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Xml.Schema", "XmlSchemaValidator", False, "XmlSchemaValidator", "(System.Xml.XmlNameTable,System.Xml.Schema.XmlSchemaSet,System.Xml.IXmlNamespaceResolver,System.Xml.Schema.XmlSchemaValidationFlags)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Xml.Schema", "XmlSchemaValidator", False, "XmlSchemaValidator", "(System.Xml.XmlNameTable,System.Xml.Schema.XmlSchemaSet,System.Xml.IXmlNamespaceResolver,System.Xml.Schema.XmlSchemaValidationFlags)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
       - ["System.Xml.Schema", "XmlSchemaValidator", False, "XmlSchemaValidator", "(System.Xml.XmlNameTable,System.Xml.Schema.XmlSchemaSet,System.Xml.IXmlNamespaceResolver,System.Xml.Schema.XmlSchemaValidationFlags)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
@@ -132,6 +126,12 @@ extensions:
       pack: codeql/csharp-all
       extensible: neutralModel
     data:
+      - ["System.Xml.Schema", "Extensions", "Validate", "(System.Xml.Linq.XAttribute,System.Xml.Schema.XmlSchemaObject,System.Xml.Schema.XmlSchemaSet,System.Xml.Schema.ValidationEventHandler)", "summary", "df-generated"]
+      - ["System.Xml.Schema", "Extensions", "Validate", "(System.Xml.Linq.XAttribute,System.Xml.Schema.XmlSchemaObject,System.Xml.Schema.XmlSchemaSet,System.Xml.Schema.ValidationEventHandler,System.Boolean)", "summary", "df-generated"]
+      - ["System.Xml.Schema", "Extensions", "Validate", "(System.Xml.Linq.XDocument,System.Xml.Schema.XmlSchemaSet,System.Xml.Schema.ValidationEventHandler)", "summary", "df-generated"]
+      - ["System.Xml.Schema", "Extensions", "Validate", "(System.Xml.Linq.XDocument,System.Xml.Schema.XmlSchemaSet,System.Xml.Schema.ValidationEventHandler,System.Boolean)", "summary", "df-generated"]
+      - ["System.Xml.Schema", "Extensions", "Validate", "(System.Xml.Linq.XElement,System.Xml.Schema.XmlSchemaObject,System.Xml.Schema.XmlSchemaSet,System.Xml.Schema.ValidationEventHandler)", "summary", "df-generated"]
+      - ["System.Xml.Schema", "Extensions", "Validate", "(System.Xml.Linq.XElement,System.Xml.Schema.XmlSchemaObject,System.Xml.Schema.XmlSchemaSet,System.Xml.Schema.ValidationEventHandler,System.Boolean)", "summary", "df-generated"]
       - ["System.Xml.Schema", "IXmlSchemaInfo", "get_IsDefault", "()", "summary", "df-generated"]
       - ["System.Xml.Schema", "IXmlSchemaInfo", "get_IsNil", "()", "summary", "df-generated"]
       - ["System.Xml.Schema", "IXmlSchemaInfo", "get_Validity", "()", "summary", "df-generated"]
@@ -143,6 +143,11 @@ extensions:
       - ["System.Xml.Schema", "XmlAtomicValue", "get_ValueAsInt", "()", "summary", "df-generated"]
       - ["System.Xml.Schema", "XmlAtomicValue", "get_ValueAsLong", "()", "summary", "df-generated"]
       - ["System.Xml.Schema", "XmlAtomicValue", "get_ValueType", "()", "summary", "df-generated"]
+      - ["System.Xml.Schema", "XmlSchema", "Compile", "(System.Xml.Schema.ValidationEventHandler)", "summary", "df-generated"]
+      - ["System.Xml.Schema", "XmlSchema", "Compile", "(System.Xml.Schema.ValidationEventHandler,System.Xml.XmlResolver)", "summary", "df-generated"]
+      - ["System.Xml.Schema", "XmlSchema", "Read", "(System.IO.Stream,System.Xml.Schema.ValidationEventHandler)", "summary", "df-generated"]
+      - ["System.Xml.Schema", "XmlSchema", "Read", "(System.IO.TextReader,System.Xml.Schema.ValidationEventHandler)", "summary", "df-generated"]
+      - ["System.Xml.Schema", "XmlSchema", "Read", "(System.Xml.XmlReader,System.Xml.Schema.ValidationEventHandler)", "summary", "df-generated"]
       - ["System.Xml.Schema", "XmlSchema", "Write", "(System.IO.Stream)", "summary", "df-generated"]
       - ["System.Xml.Schema", "XmlSchema", "Write", "(System.IO.Stream,System.Xml.XmlNamespaceManager)", "summary", "df-generated"]
       - ["System.Xml.Schema", "XmlSchema", "Write", "(System.IO.TextWriter)", "summary", "df-generated"]
@@ -157,8 +162,10 @@ extensions:
       - ["System.Xml.Schema", "XmlSchemaCollection", "Add", "(System.String,System.String)", "summary", "df-generated"]
       - ["System.Xml.Schema", "XmlSchemaCollection", "Contains", "(System.String)", "summary", "df-generated"]
       - ["System.Xml.Schema", "XmlSchemaCollection", "Contains", "(System.Xml.Schema.XmlSchema)", "summary", "df-generated"]
+      - ["System.Xml.Schema", "XmlSchemaCollection", "add_ValidationEventHandler", "(System.Xml.Schema.ValidationEventHandler)", "summary", "df-generated"]
       - ["System.Xml.Schema", "XmlSchemaCollection", "get_Count", "()", "summary", "df-generated"]
       - ["System.Xml.Schema", "XmlSchemaCollection", "get_IsSynchronized", "()", "summary", "df-generated"]
+      - ["System.Xml.Schema", "XmlSchemaCollection", "remove_ValidationEventHandler", "(System.Xml.Schema.ValidationEventHandler)", "summary", "df-generated"]
       - ["System.Xml.Schema", "XmlSchemaCollectionEnumerator", "MoveNext", "()", "summary", "df-generated"]
       - ["System.Xml.Schema", "XmlSchemaCollectionEnumerator", "Reset", "()", "summary", "df-generated"]
       - ["System.Xml.Schema", "XmlSchemaCollectionEnumerator", "get_Current", "()", "summary", "df-generated"]
@@ -174,6 +181,7 @@ extensions:
       - ["System.Xml.Schema", "XmlSchemaElement", "get_BlockResolved", "()", "summary", "df-generated"]
       - ["System.Xml.Schema", "XmlSchemaElement", "get_Constraints", "()", "summary", "df-generated"]
       - ["System.Xml.Schema", "XmlSchemaElement", "get_FinalResolved", "()", "summary", "df-generated"]
+      - ["System.Xml.Schema", "XmlSchemaException", "XmlSchemaException", "(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)", "summary", "df-generated"]
       - ["System.Xml.Schema", "XmlSchemaException", "XmlSchemaException", "(System.String)", "summary", "df-generated"]
       - ["System.Xml.Schema", "XmlSchemaException", "XmlSchemaException", "(System.String,System.Exception)", "summary", "df-generated"]
       - ["System.Xml.Schema", "XmlSchemaException", "XmlSchemaException", "(System.String,System.Exception,System.Int32,System.Int32)", "summary", "df-generated"]
@@ -187,6 +195,7 @@ extensions:
       - ["System.Xml.Schema", "XmlSchemaObjectCollection", "IndexOf", "(System.Xml.Schema.XmlSchemaObject)", "summary", "df-generated"]
       - ["System.Xml.Schema", "XmlSchemaObjectCollection", "OnClear", "()", "summary", "df-generated"]
       - ["System.Xml.Schema", "XmlSchemaObjectCollection", "OnRemove", "(System.Int32,System.Object)", "summary", "df-generated"]
+      - ["System.Xml.Schema", "XmlSchemaObjectCollection", "Remove", "(System.Xml.Schema.XmlSchemaObject)", "summary", "df-generated"]
       - ["System.Xml.Schema", "XmlSchemaObjectEnumerator", "MoveNext", "()", "summary", "df-generated"]
       - ["System.Xml.Schema", "XmlSchemaObjectEnumerator", "Reset", "()", "summary", "df-generated"]
       - ["System.Xml.Schema", "XmlSchemaObjectTable", "Contains", "(System.Xml.XmlQualifiedName)", "summary", "df-generated"]
@@ -198,11 +207,13 @@ extensions:
       - ["System.Xml.Schema", "XmlSchemaSet", "Contains", "(System.Xml.Schema.XmlSchema)", "summary", "df-generated"]
       - ["System.Xml.Schema", "XmlSchemaSet", "RemoveRecursive", "(System.Xml.Schema.XmlSchema)", "summary", "df-generated"]
       - ["System.Xml.Schema", "XmlSchemaSet", "Schemas", "(System.String)", "summary", "df-generated"]
+      - ["System.Xml.Schema", "XmlSchemaSet", "add_ValidationEventHandler", "(System.Xml.Schema.ValidationEventHandler)", "summary", "df-generated"]
       - ["System.Xml.Schema", "XmlSchemaSet", "get_Count", "()", "summary", "df-generated"]
       - ["System.Xml.Schema", "XmlSchemaSet", "get_GlobalAttributes", "()", "summary", "df-generated"]
       - ["System.Xml.Schema", "XmlSchemaSet", "get_GlobalElements", "()", "summary", "df-generated"]
       - ["System.Xml.Schema", "XmlSchemaSet", "get_GlobalTypes", "()", "summary", "df-generated"]
       - ["System.Xml.Schema", "XmlSchemaSet", "get_IsCompiled", "()", "summary", "df-generated"]
+      - ["System.Xml.Schema", "XmlSchemaSet", "remove_ValidationEventHandler", "(System.Xml.Schema.ValidationEventHandler)", "summary", "df-generated"]
       - ["System.Xml.Schema", "XmlSchemaType", "GetBuiltInComplexType", "(System.Xml.Schema.XmlTypeCode)", "summary", "df-generated"]
       - ["System.Xml.Schema", "XmlSchemaType", "GetBuiltInComplexType", "(System.Xml.XmlQualifiedName)", "summary", "df-generated"]
       - ["System.Xml.Schema", "XmlSchemaType", "GetBuiltInSimpleType", "(System.Xml.Schema.XmlTypeCode)", "summary", "df-generated"]
@@ -218,4 +229,11 @@ extensions:
       - ["System.Xml.Schema", "XmlSchemaValidator", "EndValidation", "()", "summary", "df-generated"]
       - ["System.Xml.Schema", "XmlSchemaValidator", "GetUnspecifiedDefaultAttributes", "(System.Collections.ArrayList)", "summary", "df-generated"]
       - ["System.Xml.Schema", "XmlSchemaValidator", "Initialize", "()", "summary", "df-generated"]
+      - ["System.Xml.Schema", "XmlSchemaValidator", "ValidateAttribute", "(System.String,System.String,System.Xml.Schema.XmlValueGetter,System.Xml.Schema.XmlSchemaInfo)", "summary", "df-generated"]
       - ["System.Xml.Schema", "XmlSchemaValidator", "ValidateEndOfAttributes", "(System.Xml.Schema.XmlSchemaInfo)", "summary", "df-generated"]
+      - ["System.Xml.Schema", "XmlSchemaValidator", "ValidateText", "(System.String)", "summary", "df-generated"]
+      - ["System.Xml.Schema", "XmlSchemaValidator", "ValidateText", "(System.Xml.Schema.XmlValueGetter)", "summary", "df-generated"]
+      - ["System.Xml.Schema", "XmlSchemaValidator", "ValidateWhitespace", "(System.String)", "summary", "df-generated"]
+      - ["System.Xml.Schema", "XmlSchemaValidator", "ValidateWhitespace", "(System.Xml.Schema.XmlValueGetter)", "summary", "df-generated"]
+      - ["System.Xml.Schema", "XmlSchemaValidator", "add_ValidationEventHandler", "(System.Xml.Schema.ValidationEventHandler)", "summary", "df-generated"]
+      - ["System.Xml.Schema", "XmlSchemaValidator", "remove_ValidationEventHandler", "(System.Xml.Schema.ValidationEventHandler)", "summary", "df-generated"]
diff --git a/csharp/ql/lib/ext/generated/System.Xml.Serialization.model.yml b/csharp/ql/lib/ext/generated/System.Xml.Serialization.model.yml
index 21faf62439b..58e5596f6d2 100644
--- a/csharp/ql/lib/ext/generated/System.Xml.Serialization.model.yml
+++ b/csharp/ql/lib/ext/generated/System.Xml.Serialization.model.yml
@@ -4,13 +4,11 @@ extensions:
       pack: codeql/csharp-all
       extensible: summaryModel
     data:
-      - ["System.Xml.Serialization", "CodeIdentifiers", False, "Add", "(System.String,System.Object)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Xml.Serialization", "CodeIdentifiers", False, "Add", "(System.String,System.Object)", "", "Argument[this]", "Argument[1]", "taint", "df-generated"]
-      - ["System.Xml.Serialization", "CodeIdentifiers", False, "AddUnique", "(System.String,System.Object)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Xml.Serialization", "CodeIdentifiers", False, "AddUnique", "(System.String,System.Object)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Xml.Serialization", "CodeIdentifiers", False, "AddUnique", "(System.String,System.Object)", "", "Argument[this]", "Argument[1]", "taint", "df-generated"]
-      - ["System.Xml.Serialization", "CodeIdentifiers", False, "MakeUnique", "(System.String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Xml.Serialization", "CodeIdentifiers", False, "ToArray", "(System.Type)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Xml.Serialization", "CodeIdentifiers", False, "Add", "(System.String,System.Object)", "", "Argument[1]", "Argument[this].SyntheticField[System.Xml.Serialization.CodeIdentifiers._list].Element", "value", "dfc-generated"]
+      - ["System.Xml.Serialization", "CodeIdentifiers", False, "AddUnique", "(System.String,System.Object)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Xml.Serialization", "CodeIdentifiers", False, "AddUnique", "(System.String,System.Object)", "", "Argument[1]", "Argument[this].SyntheticField[System.Xml.Serialization.CodeIdentifiers._list].Element", "value", "dfc-generated"]
+      - ["System.Xml.Serialization", "CodeIdentifiers", False, "MakeUnique", "(System.String)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Xml.Serialization", "CodeIdentifiers", False, "ToArray", "(System.Type)", "", "Argument[this].SyntheticField[System.Xml.Serialization.CodeIdentifiers._list].Element", "ReturnValue.Element", "value", "dfc-generated"]
       - ["System.Xml.Serialization", "IXmlSerializable", True, "ReadXml", "(System.Xml.XmlReader)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Xml.Serialization", "IXmlSerializable", True, "WriteXml", "(System.Xml.XmlWriter)", "", "Argument[this]", "Argument[0]", "taint", "df-generated"]
       - ["System.Xml.Serialization", "ImportContext", False, "ImportContext", "(System.Xml.Serialization.CodeIdentifiers,System.Boolean)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
@@ -18,7 +16,6 @@ extensions:
       - ["System.Xml.Serialization", "SoapAttributeAttribute", False, "SoapAttributeAttribute", "(System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Xml.Serialization", "SoapAttributeOverrides", False, "get_Item", "(System.Type)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Xml.Serialization", "SoapAttributeOverrides", False, "get_Item", "(System.Type,System.String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Xml.Serialization", "SoapAttributes", False, "SoapAttributes", "(System.Reflection.ICustomAttributeProvider)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Xml.Serialization", "SoapElementAttribute", False, "SoapElementAttribute", "(System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Xml.Serialization", "SoapEnumAttribute", False, "SoapEnumAttribute", "(System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Xml.Serialization", "SoapReflectionImporter", False, "ImportTypeMapping", "(System.Type,System.String)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
@@ -27,25 +24,22 @@ extensions:
       - ["System.Xml.Serialization", "SoapTypeAttribute", False, "SoapTypeAttribute", "(System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Xml.Serialization", "SoapTypeAttribute", False, "SoapTypeAttribute", "(System.String,System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Xml.Serialization", "SoapTypeAttribute", False, "SoapTypeAttribute", "(System.String,System.String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Xml.Serialization", "UnreferencedObjectEventArgs", False, "UnreferencedObjectEventArgs", "(System.Object,System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Xml.Serialization", "UnreferencedObjectEventArgs", False, "UnreferencedObjectEventArgs", "(System.Object,System.String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Xml.Serialization", "UnreferencedObjectEventArgs", False, "get_UnreferencedId", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Xml.Serialization", "UnreferencedObjectEventArgs", False, "get_UnreferencedObject", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Xml.Serialization", "UnreferencedObjectEventArgs", False, "UnreferencedObjectEventArgs", "(System.Object,System.String)", "", "Argument[0]", "Argument[this].SyntheticField[System.Xml.Serialization.UnreferencedObjectEventArgs._o]", "value", "dfc-generated"]
+      - ["System.Xml.Serialization", "UnreferencedObjectEventArgs", False, "UnreferencedObjectEventArgs", "(System.Object,System.String)", "", "Argument[1]", "Argument[this].SyntheticField[System.Xml.Serialization.UnreferencedObjectEventArgs._id]", "value", "dfc-generated"]
+      - ["System.Xml.Serialization", "UnreferencedObjectEventArgs", False, "get_UnreferencedId", "()", "", "Argument[this].SyntheticField[System.Xml.Serialization.UnreferencedObjectEventArgs._id]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Xml.Serialization", "UnreferencedObjectEventArgs", False, "get_UnreferencedObject", "()", "", "Argument[this].SyntheticField[System.Xml.Serialization.UnreferencedObjectEventArgs._o]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Xml.Serialization", "XmlAnyElementAttribute", False, "XmlAnyElementAttribute", "(System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Xml.Serialization", "XmlAnyElementAttribute", False, "XmlAnyElementAttribute", "(System.String,System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Xml.Serialization", "XmlAnyElementAttribute", False, "XmlAnyElementAttribute", "(System.String,System.String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Xml.Serialization", "XmlAnyElementAttributes", False, "Remove", "(System.Xml.Serialization.XmlAnyElementAttribute)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Xml.Serialization", "XmlArrayAttribute", False, "XmlArrayAttribute", "(System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Xml.Serialization", "XmlArrayItemAttribute", False, "XmlArrayItemAttribute", "(System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Xml.Serialization", "XmlArrayItemAttribute", False, "XmlArrayItemAttribute", "(System.String,System.Type)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Xml.Serialization", "XmlArrayItemAttributes", False, "Remove", "(System.Xml.Serialization.XmlArrayItemAttribute)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Xml.Serialization", "XmlAttributeAttribute", False, "XmlAttributeAttribute", "(System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Xml.Serialization", "XmlAttributeAttribute", False, "XmlAttributeAttribute", "(System.String,System.Type)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Xml.Serialization", "XmlAttributeEventArgs", False, "get_Attr", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Xml.Serialization", "XmlAttributeEventArgs", False, "get_ExpectedAttributes", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Xml.Serialization", "XmlAttributeEventArgs", False, "get_ObjectBeingDeserialized", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Xml.Serialization", "XmlAttributeOverrides", False, "get_Item", "(System.Type)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Xml.Serialization", "XmlAttributes", False, "XmlAttributes", "(System.Reflection.ICustomAttributeProvider)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Xml.Serialization", "XmlAttributes", False, "get_XmlAnyElements", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Xml.Serialization", "XmlAttributes", False, "get_XmlArrayItems", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Xml.Serialization", "XmlAttributes", False, "get_XmlChoiceIdentifier", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
@@ -53,7 +47,6 @@ extensions:
       - ["System.Xml.Serialization", "XmlChoiceIdentifierAttribute", False, "XmlChoiceIdentifierAttribute", "(System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Xml.Serialization", "XmlElementAttribute", False, "XmlElementAttribute", "(System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Xml.Serialization", "XmlElementAttribute", False, "XmlElementAttribute", "(System.String,System.Type)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Xml.Serialization", "XmlElementAttributes", False, "Remove", "(System.Xml.Serialization.XmlElementAttribute)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Xml.Serialization", "XmlElementEventArgs", False, "get_Element", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Xml.Serialization", "XmlElementEventArgs", False, "get_ExpectedElements", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Xml.Serialization", "XmlElementEventArgs", False, "get_ObjectBeingDeserialized", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
@@ -91,30 +84,31 @@ extensions:
       - ["System.Xml.Serialization", "XmlReflectionImporter", False, "XmlReflectionImporter", "(System.Xml.Serialization.XmlAttributeOverrides,System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Xml.Serialization", "XmlReflectionImporter", False, "XmlReflectionImporter", "(System.Xml.Serialization.XmlAttributeOverrides,System.String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
       - ["System.Xml.Serialization", "XmlRootAttribute", False, "XmlRootAttribute", "(System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Xml.Serialization", "XmlSchemaEnumerator", False, "XmlSchemaEnumerator", "(System.Xml.Serialization.XmlSchemas)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["System.Xml.Serialization", "XmlSchemaEnumerator", False, "get_Current", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Xml.Serialization", "XmlSchemaEnumerator", False, "XmlSchemaEnumerator", "(System.Xml.Serialization.XmlSchemas)", "", "Argument[0]", "Argument[this].SyntheticField[System.Xml.Serialization.XmlSchemaEnumerator._list]", "value", "dfc-generated"]
+      - ["System.Xml.Serialization", "XmlSchemaEnumerator", False, "get_Current", "()", "", "Argument[this].SyntheticField[System.Xml.Serialization.XmlSchemaEnumerator._list].Element", "ReturnValue", "value", "dfc-generated"]
       - ["System.Xml.Serialization", "XmlSchemaExporter", False, "ExportMembersMapping", "(System.Xml.Serialization.XmlMembersMapping)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Xml.Serialization", "XmlSchemaExporter", False, "ExportMembersMapping", "(System.Xml.Serialization.XmlMembersMapping,System.Boolean)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Xml.Serialization", "XmlSchemaExporter", False, "ExportTypeMapping", "(System.Xml.Serialization.XmlMembersMapping)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Xml.Serialization", "XmlSchemaExporter", False, "ExportTypeMapping", "(System.Xml.Serialization.XmlTypeMapping)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Xml.Serialization", "XmlSchemaExporter", False, "XmlSchemaExporter", "(System.Xml.Serialization.XmlSchemas)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["System.Xml.Serialization", "XmlSchemaProviderAttribute", False, "XmlSchemaProviderAttribute", "(System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Xml.Serialization", "XmlSchemaProviderAttribute", False, "get_MethodName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Xml.Serialization", "XmlSchemas", False, "Add", "(System.Xml.Schema.XmlSchema,System.Uri)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Xml.Serialization", "XmlSchemas", False, "Add", "(System.Xml.Schema.XmlSchema,System.Uri)", "", "Argument[1]", "Argument[0]", "taint", "df-generated"]
-      - ["System.Xml.Serialization", "XmlSchemas", False, "Add", "(System.Xml.Schema.XmlSchema,System.Uri)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Xml.Serialization", "XmlSchemas", False, "Remove", "(System.Xml.Schema.XmlSchema)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Xml.Serialization", "XmlSerializationReader+CollectionFixup", False, "get_Callback", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Xml.Serialization", "XmlSerializationReader+CollectionFixup", False, "get_Collection", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Xml.Serialization", "XmlSerializationReader+CollectionFixup", False, "get_CollectionItems", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Xml.Serialization", "XmlSerializationReader+Fixup", False, "get_Callback", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Xml.Serialization", "XmlSerializationReader+Fixup", False, "get_Ids", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Xml.Serialization", "XmlSchemaProviderAttribute", False, "XmlSchemaProviderAttribute", "(System.String)", "", "Argument[0]", "Argument[this].SyntheticField[System.Xml.Serialization.XmlSchemaProviderAttribute._methodName]", "value", "dfc-generated"]
+      - ["System.Xml.Serialization", "XmlSchemaProviderAttribute", False, "get_MethodName", "()", "", "Argument[this].SyntheticField[System.Xml.Serialization.XmlSchemaProviderAttribute._methodName]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Xml.Serialization", "XmlSchemas", False, "Add", "(System.Xml.Schema.XmlSchema,System.Uri)", "", "Argument[0]", "Argument[this].Property[System.Collections.CollectionBase.List].Element", "value", "dfc-generated"]
+      - ["System.Xml.Serialization", "XmlSerializationReader+CollectionFixup", False, "CollectionFixup", "(System.Object,System.Xml.Serialization.XmlSerializationCollectionFixupCallback,System.Object)", "", "Argument[0]", "Argument[this].SyntheticField[System.Xml.Serialization.XmlSerializationReader+CollectionFixup._collection]", "value", "dfc-generated"]
+      - ["System.Xml.Serialization", "XmlSerializationReader+CollectionFixup", False, "CollectionFixup", "(System.Object,System.Xml.Serialization.XmlSerializationCollectionFixupCallback,System.Object)", "", "Argument[1]", "Argument[this].SyntheticField[System.Xml.Serialization.XmlSerializationReader+CollectionFixup._callback]", "value", "dfc-generated"]
+      - ["System.Xml.Serialization", "XmlSerializationReader+CollectionFixup", False, "CollectionFixup", "(System.Object,System.Xml.Serialization.XmlSerializationCollectionFixupCallback,System.Object)", "", "Argument[2]", "Argument[this].SyntheticField[System.Xml.Serialization.XmlSerializationReader+CollectionFixup._collectionItems]", "value", "dfc-generated"]
+      - ["System.Xml.Serialization", "XmlSerializationReader+CollectionFixup", False, "get_Callback", "()", "", "Argument[this].SyntheticField[System.Xml.Serialization.XmlSerializationReader+CollectionFixup._callback]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Xml.Serialization", "XmlSerializationReader+CollectionFixup", False, "get_Collection", "()", "", "Argument[this].SyntheticField[System.Xml.Serialization.XmlSerializationReader+CollectionFixup._collection]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Xml.Serialization", "XmlSerializationReader+CollectionFixup", False, "get_CollectionItems", "()", "", "Argument[this].SyntheticField[System.Xml.Serialization.XmlSerializationReader+CollectionFixup._collectionItems]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Xml.Serialization", "XmlSerializationReader+Fixup", False, "Fixup", "(System.Object,System.Xml.Serialization.XmlSerializationFixupCallback,System.String[])", "", "Argument[1]", "Argument[this].SyntheticField[System.Xml.Serialization.XmlSerializationReader+Fixup._callback]", "value", "dfc-generated"]
+      - ["System.Xml.Serialization", "XmlSerializationReader+Fixup", False, "Fixup", "(System.Object,System.Xml.Serialization.XmlSerializationFixupCallback,System.String[])", "", "Argument[2]", "Argument[this].SyntheticField[System.Xml.Serialization.XmlSerializationReader+Fixup._ids]", "value", "dfc-generated"]
+      - ["System.Xml.Serialization", "XmlSerializationReader+Fixup", False, "get_Callback", "()", "", "Argument[this].SyntheticField[System.Xml.Serialization.XmlSerializationReader+Fixup._callback]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Xml.Serialization", "XmlSerializationReader+Fixup", False, "get_Ids", "()", "", "Argument[this].SyntheticField[System.Xml.Serialization.XmlSerializationReader+Fixup._ids]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Xml.Serialization", "XmlSerializationReader", False, "AddFixup", "(System.Xml.Serialization.XmlSerializationReader+CollectionFixup)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Xml.Serialization", "XmlSerializationReader", False, "AddFixup", "(System.Xml.Serialization.XmlSerializationReader+Fixup)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Xml.Serialization", "XmlSerializationReader", False, "AddTarget", "(System.String,System.Object)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Xml.Serialization", "XmlSerializationReader", False, "AddTarget", "(System.String,System.Object)", "", "Argument[this]", "Argument[1]", "taint", "df-generated"]
-      - ["System.Xml.Serialization", "XmlSerializationReader", False, "CollapseWhitespace", "(System.String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Xml.Serialization", "XmlSerializationReader", False, "EnsureArrayIndex", "(System.Array,System.Int32,System.Type)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
+      - ["System.Xml.Serialization", "XmlSerializationReader", False, "CollapseWhitespace", "(System.String)", "", "Argument[0]", "ReturnValue", "taint", "dfc-generated"]
+      - ["System.Xml.Serialization", "XmlSerializationReader", False, "EnsureArrayIndex", "(System.Array,System.Int32,System.Type)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Xml.Serialization", "XmlSerializationReader", False, "GetTarget", "(System.String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Xml.Serialization", "XmlSerializationReader", False, "ReadNullableString", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Xml.Serialization", "XmlSerializationReader", False, "ReadReference", "(System.String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
@@ -123,33 +117,27 @@ extensions:
       - ["System.Xml.Serialization", "XmlSerializationReader", False, "ReadReferencingElement", "(System.String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Xml.Serialization", "XmlSerializationReader", False, "ReadReferencingElement", "(System.String,System.String,System.Boolean,System.String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Xml.Serialization", "XmlSerializationReader", False, "ReadReferencingElement", "(System.String,System.String,System.String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Xml.Serialization", "XmlSerializationReader", False, "ReadSerializable", "(System.Xml.Serialization.IXmlSerializable)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Xml.Serialization", "XmlSerializationReader", False, "ReadSerializable", "(System.Xml.Serialization.IXmlSerializable)", "", "Argument[this]", "Argument[0]", "taint", "df-generated"]
-      - ["System.Xml.Serialization", "XmlSerializationReader", False, "ReadSerializable", "(System.Xml.Serialization.IXmlSerializable)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Xml.Serialization", "XmlSerializationReader", False, "ReadSerializable", "(System.Xml.Serialization.IXmlSerializable,System.Boolean)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Xml.Serialization", "XmlSerializationReader", False, "ReadSerializable", "(System.Xml.Serialization.IXmlSerializable,System.Boolean)", "", "Argument[this]", "Argument[0]", "taint", "df-generated"]
-      - ["System.Xml.Serialization", "XmlSerializationReader", False, "ReadSerializable", "(System.Xml.Serialization.IXmlSerializable,System.Boolean)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Xml.Serialization", "XmlSerializationReader", False, "ReadString", "(System.String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Xml.Serialization", "XmlSerializationReader", False, "ReadString", "(System.String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Xml.Serialization", "XmlSerializationReader", False, "ReadString", "(System.String,System.Boolean)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Xml.Serialization", "XmlSerializationReader", False, "ReadString", "(System.String,System.Boolean)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Xml.Serialization", "XmlSerializationReader", False, "ReadSerializable", "(System.Xml.Serialization.IXmlSerializable)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Xml.Serialization", "XmlSerializationReader", False, "ReadSerializable", "(System.Xml.Serialization.IXmlSerializable,System.Boolean)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Xml.Serialization", "XmlSerializationReader", False, "ReadString", "(System.String)", "", "Argument[0]", "ReturnValue", "taint", "dfc-generated"]
+      - ["System.Xml.Serialization", "XmlSerializationReader", False, "ReadString", "(System.String,System.Boolean)", "", "Argument[0]", "ReturnValue", "taint", "dfc-generated"]
       - ["System.Xml.Serialization", "XmlSerializationReader", False, "ReadTypedPrimitive", "(System.Xml.XmlQualifiedName)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Xml.Serialization", "XmlSerializationReader", False, "ShrinkArray", "(System.Array,System.Int32,System.Type,System.Boolean)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["System.Xml.Serialization", "XmlSerializationReader", False, "ToByteArrayBase64", "(System.String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Xml.Serialization", "XmlSerializationReader", False, "ToXmlNCName", "(System.String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Xml.Serialization", "XmlSerializationReader", False, "ToXmlName", "(System.String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Xml.Serialization", "XmlSerializationReader", False, "ToXmlNmToken", "(System.String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Xml.Serialization", "XmlSerializationReader", False, "ToXmlNmTokens", "(System.String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Xml.Serialization", "XmlSerializationReader", False, "ShrinkArray", "(System.Array,System.Int32,System.Type,System.Boolean)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Xml.Serialization", "XmlSerializationReader", False, "ToByteArrayBase64", "(System.String)", "", "Argument[0]", "ReturnValue.Element", "taint", "dfc-generated"]
+      - ["System.Xml.Serialization", "XmlSerializationReader", False, "ToXmlNCName", "(System.String)", "", "Argument[0]", "ReturnValue", "taint", "dfc-generated"]
+      - ["System.Xml.Serialization", "XmlSerializationReader", False, "ToXmlName", "(System.String)", "", "Argument[0]", "ReturnValue", "taint", "dfc-generated"]
+      - ["System.Xml.Serialization", "XmlSerializationReader", False, "ToXmlNmToken", "(System.String)", "", "Argument[0]", "ReturnValue", "taint", "dfc-generated"]
+      - ["System.Xml.Serialization", "XmlSerializationReader", False, "ToXmlNmTokens", "(System.String)", "", "Argument[0]", "ReturnValue", "taint", "dfc-generated"]
       - ["System.Xml.Serialization", "XmlSerializationReader", False, "get_Document", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Xml.Serialization", "XmlSerializationReader", False, "get_Reader", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Xml.Serialization", "XmlSerializationWriter", False, "FromByteArrayBase64", "(System.Byte[])", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["System.Xml.Serialization", "XmlSerializationWriter", False, "FromByteArrayHex", "(System.Byte[])", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["System.Xml.Serialization", "XmlSerializationWriter", False, "FromEnum", "(System.Int64,System.String[],System.Int64[])", "", "Argument[1].Element", "ReturnValue", "taint", "df-generated"]
-      - ["System.Xml.Serialization", "XmlSerializationWriter", False, "FromEnum", "(System.Int64,System.String[],System.Int64[],System.String)", "", "Argument[1].Element", "ReturnValue", "taint", "df-generated"]
-      - ["System.Xml.Serialization", "XmlSerializationWriter", False, "FromXmlNCName", "(System.String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Xml.Serialization", "XmlSerializationWriter", False, "FromXmlName", "(System.String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Xml.Serialization", "XmlSerializationWriter", False, "FromXmlNmToken", "(System.String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Xml.Serialization", "XmlSerializationWriter", False, "FromXmlNmTokens", "(System.String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Xml.Serialization", "XmlSerializationWriter", False, "FromByteArrayBase64", "(System.Byte[])", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Xml.Serialization", "XmlSerializationWriter", False, "FromByteArrayHex", "(System.Byte[])", "", "Argument[0].Element", "ReturnValue", "taint", "dfc-generated"]
+      - ["System.Xml.Serialization", "XmlSerializationWriter", False, "FromEnum", "(System.Int64,System.String[],System.Int64[])", "", "Argument[1].Element", "ReturnValue", "taint", "dfc-generated"]
+      - ["System.Xml.Serialization", "XmlSerializationWriter", False, "FromEnum", "(System.Int64,System.String[],System.Int64[],System.String)", "", "Argument[1].Element", "ReturnValue", "taint", "dfc-generated"]
+      - ["System.Xml.Serialization", "XmlSerializationWriter", False, "FromXmlNCName", "(System.String)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Xml.Serialization", "XmlSerializationWriter", False, "FromXmlName", "(System.String)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Xml.Serialization", "XmlSerializationWriter", False, "FromXmlNmToken", "(System.String)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Xml.Serialization", "XmlSerializationWriter", False, "FromXmlNmTokens", "(System.String)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Xml.Serialization", "XmlSerializationWriter", False, "FromXmlQualifiedName", "(System.Xml.XmlQualifiedName)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Xml.Serialization", "XmlSerializationWriter", False, "FromXmlQualifiedName", "(System.Xml.XmlQualifiedName)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["System.Xml.Serialization", "XmlSerializationWriter", False, "FromXmlQualifiedName", "(System.Xml.XmlQualifiedName)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
@@ -164,64 +152,103 @@ extensions:
       - ["System.Xml.Serialization", "XmlSerializationWriter", False, "WriteAttribute", "(System.String,System.String,System.Byte[])", "", "Argument[2].Element", "Argument[this]", "taint", "df-generated"]
       - ["System.Xml.Serialization", "XmlSerializationWriter", False, "WriteAttribute", "(System.String,System.String,System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Xml.Serialization", "XmlSerializationWriter", False, "WriteAttribute", "(System.String,System.String,System.String)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
+      - ["System.Xml.Serialization", "XmlSerializationWriter", False, "WriteAttribute", "(System.String,System.String,System.String,System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Xml.Serialization", "XmlSerializationWriter", False, "WriteAttribute", "(System.String,System.String,System.String,System.String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
       - ["System.Xml.Serialization", "XmlSerializationWriter", False, "WriteAttribute", "(System.String,System.String,System.String,System.String)", "", "Argument[3]", "Argument[this]", "taint", "df-generated"]
       - ["System.Xml.Serialization", "XmlSerializationWriter", False, "WriteElementEncoded", "(System.Xml.XmlNode,System.String,System.String,System.Boolean,System.Boolean)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
+      - ["System.Xml.Serialization", "XmlSerializationWriter", False, "WriteElementEncoded", "(System.Xml.XmlNode,System.String,System.String,System.Boolean,System.Boolean)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
       - ["System.Xml.Serialization", "XmlSerializationWriter", False, "WriteElementLiteral", "(System.Xml.XmlNode,System.String,System.String,System.Boolean,System.Boolean)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
+      - ["System.Xml.Serialization", "XmlSerializationWriter", False, "WriteElementLiteral", "(System.Xml.XmlNode,System.String,System.String,System.Boolean,System.Boolean)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["System.Xml.Serialization", "XmlSerializationWriter", False, "WriteElementQualifiedName", "(System.String,System.String,System.Xml.XmlQualifiedName)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Xml.Serialization", "XmlSerializationWriter", False, "WriteElementQualifiedName", "(System.String,System.String,System.Xml.XmlQualifiedName)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
+      - ["System.Xml.Serialization", "XmlSerializationWriter", False, "WriteElementQualifiedName", "(System.String,System.String,System.Xml.XmlQualifiedName,System.Xml.XmlQualifiedName)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Xml.Serialization", "XmlSerializationWriter", False, "WriteElementQualifiedName", "(System.String,System.String,System.Xml.XmlQualifiedName,System.Xml.XmlQualifiedName)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
       - ["System.Xml.Serialization", "XmlSerializationWriter", False, "WriteElementQualifiedName", "(System.String,System.String,System.Xml.XmlQualifiedName,System.Xml.XmlQualifiedName)", "", "Argument[3]", "Argument[this]", "taint", "df-generated"]
+      - ["System.Xml.Serialization", "XmlSerializationWriter", False, "WriteElementQualifiedName", "(System.String,System.Xml.XmlQualifiedName)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Xml.Serialization", "XmlSerializationWriter", False, "WriteElementQualifiedName", "(System.String,System.Xml.XmlQualifiedName)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["System.Xml.Serialization", "XmlSerializationWriter", False, "WriteElementQualifiedName", "(System.String,System.Xml.XmlQualifiedName,System.Xml.XmlQualifiedName)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Xml.Serialization", "XmlSerializationWriter", False, "WriteElementQualifiedName", "(System.String,System.Xml.XmlQualifiedName,System.Xml.XmlQualifiedName)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
       - ["System.Xml.Serialization", "XmlSerializationWriter", False, "WriteElementQualifiedName", "(System.String,System.Xml.XmlQualifiedName,System.Xml.XmlQualifiedName)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
+      - ["System.Xml.Serialization", "XmlSerializationWriter", False, "WriteElementString", "(System.String,System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Xml.Serialization", "XmlSerializationWriter", False, "WriteElementString", "(System.String,System.String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["System.Xml.Serialization", "XmlSerializationWriter", False, "WriteElementString", "(System.String,System.String,System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Xml.Serialization", "XmlSerializationWriter", False, "WriteElementString", "(System.String,System.String,System.String)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
+      - ["System.Xml.Serialization", "XmlSerializationWriter", False, "WriteElementString", "(System.String,System.String,System.String,System.Xml.XmlQualifiedName)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Xml.Serialization", "XmlSerializationWriter", False, "WriteElementString", "(System.String,System.String,System.String,System.Xml.XmlQualifiedName)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
       - ["System.Xml.Serialization", "XmlSerializationWriter", False, "WriteElementString", "(System.String,System.String,System.String,System.Xml.XmlQualifiedName)", "", "Argument[3]", "Argument[this]", "taint", "df-generated"]
+      - ["System.Xml.Serialization", "XmlSerializationWriter", False, "WriteElementString", "(System.String,System.String,System.Xml.XmlQualifiedName)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Xml.Serialization", "XmlSerializationWriter", False, "WriteElementString", "(System.String,System.String,System.Xml.XmlQualifiedName)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
       - ["System.Xml.Serialization", "XmlSerializationWriter", False, "WriteElementString", "(System.String,System.String,System.Xml.XmlQualifiedName)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
+      - ["System.Xml.Serialization", "XmlSerializationWriter", False, "WriteElementStringRaw", "(System.String,System.Byte[])", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Xml.Serialization", "XmlSerializationWriter", False, "WriteElementStringRaw", "(System.String,System.Byte[])", "", "Argument[1].Element", "Argument[this]", "taint", "df-generated"]
+      - ["System.Xml.Serialization", "XmlSerializationWriter", False, "WriteElementStringRaw", "(System.String,System.Byte[],System.Xml.XmlQualifiedName)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Xml.Serialization", "XmlSerializationWriter", False, "WriteElementStringRaw", "(System.String,System.Byte[],System.Xml.XmlQualifiedName)", "", "Argument[1].Element", "Argument[this]", "taint", "df-generated"]
       - ["System.Xml.Serialization", "XmlSerializationWriter", False, "WriteElementStringRaw", "(System.String,System.Byte[],System.Xml.XmlQualifiedName)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
+      - ["System.Xml.Serialization", "XmlSerializationWriter", False, "WriteElementStringRaw", "(System.String,System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Xml.Serialization", "XmlSerializationWriter", False, "WriteElementStringRaw", "(System.String,System.String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["System.Xml.Serialization", "XmlSerializationWriter", False, "WriteElementStringRaw", "(System.String,System.String,System.Byte[])", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Xml.Serialization", "XmlSerializationWriter", False, "WriteElementStringRaw", "(System.String,System.String,System.Byte[])", "", "Argument[2].Element", "Argument[this]", "taint", "df-generated"]
+      - ["System.Xml.Serialization", "XmlSerializationWriter", False, "WriteElementStringRaw", "(System.String,System.String,System.Byte[],System.Xml.XmlQualifiedName)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Xml.Serialization", "XmlSerializationWriter", False, "WriteElementStringRaw", "(System.String,System.String,System.Byte[],System.Xml.XmlQualifiedName)", "", "Argument[2].Element", "Argument[this]", "taint", "df-generated"]
       - ["System.Xml.Serialization", "XmlSerializationWriter", False, "WriteElementStringRaw", "(System.String,System.String,System.Byte[],System.Xml.XmlQualifiedName)", "", "Argument[3]", "Argument[this]", "taint", "df-generated"]
+      - ["System.Xml.Serialization", "XmlSerializationWriter", False, "WriteElementStringRaw", "(System.String,System.String,System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Xml.Serialization", "XmlSerializationWriter", False, "WriteElementStringRaw", "(System.String,System.String,System.String)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
+      - ["System.Xml.Serialization", "XmlSerializationWriter", False, "WriteElementStringRaw", "(System.String,System.String,System.String,System.Xml.XmlQualifiedName)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Xml.Serialization", "XmlSerializationWriter", False, "WriteElementStringRaw", "(System.String,System.String,System.String,System.Xml.XmlQualifiedName)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
       - ["System.Xml.Serialization", "XmlSerializationWriter", False, "WriteElementStringRaw", "(System.String,System.String,System.String,System.Xml.XmlQualifiedName)", "", "Argument[3]", "Argument[this]", "taint", "df-generated"]
+      - ["System.Xml.Serialization", "XmlSerializationWriter", False, "WriteElementStringRaw", "(System.String,System.String,System.Xml.XmlQualifiedName)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Xml.Serialization", "XmlSerializationWriter", False, "WriteElementStringRaw", "(System.String,System.String,System.Xml.XmlQualifiedName)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
       - ["System.Xml.Serialization", "XmlSerializationWriter", False, "WriteElementStringRaw", "(System.String,System.String,System.Xml.XmlQualifiedName)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
+      - ["System.Xml.Serialization", "XmlSerializationWriter", False, "WriteEmptyTag", "(System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["System.Xml.Serialization", "XmlSerializationWriter", False, "WriteEmptyTag", "(System.String,System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Xml.Serialization", "XmlSerializationWriter", False, "WriteId", "(System.Object)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Xml.Serialization", "XmlSerializationWriter", False, "WriteId", "(System.Object)", "", "Argument[this]", "Argument[0]", "taint", "df-generated"]
       - ["System.Xml.Serialization", "XmlSerializationWriter", False, "WriteNamespaceDeclarations", "(System.Xml.Serialization.XmlSerializerNamespaces)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["System.Xml.Serialization", "XmlSerializationWriter", False, "WriteNullTagEncoded", "(System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["System.Xml.Serialization", "XmlSerializationWriter", False, "WriteNullTagEncoded", "(System.String,System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["System.Xml.Serialization", "XmlSerializationWriter", False, "WriteNullTagLiteral", "(System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["System.Xml.Serialization", "XmlSerializationWriter", False, "WriteNullTagLiteral", "(System.String,System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["System.Xml.Serialization", "XmlSerializationWriter", False, "WriteNullableQualifiedNameEncoded", "(System.String,System.String,System.Xml.XmlQualifiedName,System.Xml.XmlQualifiedName)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Xml.Serialization", "XmlSerializationWriter", False, "WriteNullableQualifiedNameEncoded", "(System.String,System.String,System.Xml.XmlQualifiedName,System.Xml.XmlQualifiedName)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
       - ["System.Xml.Serialization", "XmlSerializationWriter", False, "WriteNullableQualifiedNameEncoded", "(System.String,System.String,System.Xml.XmlQualifiedName,System.Xml.XmlQualifiedName)", "", "Argument[3]", "Argument[this]", "taint", "df-generated"]
+      - ["System.Xml.Serialization", "XmlSerializationWriter", False, "WriteNullableQualifiedNameLiteral", "(System.String,System.String,System.Xml.XmlQualifiedName)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Xml.Serialization", "XmlSerializationWriter", False, "WriteNullableQualifiedNameLiteral", "(System.String,System.String,System.Xml.XmlQualifiedName)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
+      - ["System.Xml.Serialization", "XmlSerializationWriter", False, "WriteNullableStringEncoded", "(System.String,System.String,System.String,System.Xml.XmlQualifiedName)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Xml.Serialization", "XmlSerializationWriter", False, "WriteNullableStringEncoded", "(System.String,System.String,System.String,System.Xml.XmlQualifiedName)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
       - ["System.Xml.Serialization", "XmlSerializationWriter", False, "WriteNullableStringEncoded", "(System.String,System.String,System.String,System.Xml.XmlQualifiedName)", "", "Argument[3]", "Argument[this]", "taint", "df-generated"]
+      - ["System.Xml.Serialization", "XmlSerializationWriter", False, "WriteNullableStringEncodedRaw", "(System.String,System.String,System.Byte[],System.Xml.XmlQualifiedName)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Xml.Serialization", "XmlSerializationWriter", False, "WriteNullableStringEncodedRaw", "(System.String,System.String,System.Byte[],System.Xml.XmlQualifiedName)", "", "Argument[2].Element", "Argument[this]", "taint", "df-generated"]
       - ["System.Xml.Serialization", "XmlSerializationWriter", False, "WriteNullableStringEncodedRaw", "(System.String,System.String,System.Byte[],System.Xml.XmlQualifiedName)", "", "Argument[3]", "Argument[this]", "taint", "df-generated"]
+      - ["System.Xml.Serialization", "XmlSerializationWriter", False, "WriteNullableStringEncodedRaw", "(System.String,System.String,System.String,System.Xml.XmlQualifiedName)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Xml.Serialization", "XmlSerializationWriter", False, "WriteNullableStringEncodedRaw", "(System.String,System.String,System.String,System.Xml.XmlQualifiedName)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
       - ["System.Xml.Serialization", "XmlSerializationWriter", False, "WriteNullableStringEncodedRaw", "(System.String,System.String,System.String,System.Xml.XmlQualifiedName)", "", "Argument[3]", "Argument[this]", "taint", "df-generated"]
+      - ["System.Xml.Serialization", "XmlSerializationWriter", False, "WriteNullableStringLiteral", "(System.String,System.String,System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Xml.Serialization", "XmlSerializationWriter", False, "WriteNullableStringLiteral", "(System.String,System.String,System.String)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
+      - ["System.Xml.Serialization", "XmlSerializationWriter", False, "WriteNullableStringLiteralRaw", "(System.String,System.String,System.Byte[])", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Xml.Serialization", "XmlSerializationWriter", False, "WriteNullableStringLiteralRaw", "(System.String,System.String,System.Byte[])", "", "Argument[2].Element", "Argument[this]", "taint", "df-generated"]
+      - ["System.Xml.Serialization", "XmlSerializationWriter", False, "WriteNullableStringLiteralRaw", "(System.String,System.String,System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Xml.Serialization", "XmlSerializationWriter", False, "WriteNullableStringLiteralRaw", "(System.String,System.String,System.String)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
+      - ["System.Xml.Serialization", "XmlSerializationWriter", False, "WritePotentiallyReferencingElement", "(System.String,System.String,System.Object)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Xml.Serialization", "XmlSerializationWriter", False, "WritePotentiallyReferencingElement", "(System.String,System.String,System.Object)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Xml.Serialization", "XmlSerializationWriter", False, "WritePotentiallyReferencingElement", "(System.String,System.String,System.Object)", "", "Argument[this]", "Argument[2]", "taint", "df-generated"]
+      - ["System.Xml.Serialization", "XmlSerializationWriter", False, "WritePotentiallyReferencingElement", "(System.String,System.String,System.Object,System.Type)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Xml.Serialization", "XmlSerializationWriter", False, "WritePotentiallyReferencingElement", "(System.String,System.String,System.Object,System.Type)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Xml.Serialization", "XmlSerializationWriter", False, "WritePotentiallyReferencingElement", "(System.String,System.String,System.Object,System.Type)", "", "Argument[this]", "Argument[2]", "taint", "df-generated"]
+      - ["System.Xml.Serialization", "XmlSerializationWriter", False, "WritePotentiallyReferencingElement", "(System.String,System.String,System.Object,System.Type,System.Boolean)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Xml.Serialization", "XmlSerializationWriter", False, "WritePotentiallyReferencingElement", "(System.String,System.String,System.Object,System.Type,System.Boolean)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Xml.Serialization", "XmlSerializationWriter", False, "WritePotentiallyReferencingElement", "(System.String,System.String,System.Object,System.Type,System.Boolean)", "", "Argument[this]", "Argument[2]", "taint", "df-generated"]
+      - ["System.Xml.Serialization", "XmlSerializationWriter", False, "WritePotentiallyReferencingElement", "(System.String,System.String,System.Object,System.Type,System.Boolean,System.Boolean)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Xml.Serialization", "XmlSerializationWriter", False, "WritePotentiallyReferencingElement", "(System.String,System.String,System.Object,System.Type,System.Boolean,System.Boolean)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Xml.Serialization", "XmlSerializationWriter", False, "WritePotentiallyReferencingElement", "(System.String,System.String,System.Object,System.Type,System.Boolean,System.Boolean)", "", "Argument[this]", "Argument[2]", "taint", "df-generated"]
+      - ["System.Xml.Serialization", "XmlSerializationWriter", False, "WriteReferencingElement", "(System.String,System.String,System.Object)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Xml.Serialization", "XmlSerializationWriter", False, "WriteReferencingElement", "(System.String,System.String,System.Object)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Xml.Serialization", "XmlSerializationWriter", False, "WriteReferencingElement", "(System.String,System.String,System.Object)", "", "Argument[this]", "Argument[2]", "taint", "df-generated"]
+      - ["System.Xml.Serialization", "XmlSerializationWriter", False, "WriteReferencingElement", "(System.String,System.String,System.Object,System.Boolean)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Xml.Serialization", "XmlSerializationWriter", False, "WriteReferencingElement", "(System.String,System.String,System.Object,System.Boolean)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Xml.Serialization", "XmlSerializationWriter", False, "WriteReferencingElement", "(System.String,System.String,System.Object,System.Boolean)", "", "Argument[this]", "Argument[2]", "taint", "df-generated"]
-      - ["System.Xml.Serialization", "XmlSerializationWriter", False, "WriteSerializable", "(System.Xml.Serialization.IXmlSerializable,System.String,System.String,System.Boolean)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Xml.Serialization", "XmlSerializationWriter", False, "WriteSerializable", "(System.Xml.Serialization.IXmlSerializable,System.String,System.String,System.Boolean,System.Boolean)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["System.Xml.Serialization", "XmlSerializationWriter", False, "WriteSerializable", "(System.Xml.Serialization.IXmlSerializable,System.String,System.String,System.Boolean)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["System.Xml.Serialization", "XmlSerializationWriter", False, "WriteSerializable", "(System.Xml.Serialization.IXmlSerializable,System.String,System.String,System.Boolean,System.Boolean)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["System.Xml.Serialization", "XmlSerializationWriter", False, "WriteStartElement", "(System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["System.Xml.Serialization", "XmlSerializationWriter", False, "WriteStartElement", "(System.String,System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["System.Xml.Serialization", "XmlSerializationWriter", False, "WriteStartElement", "(System.String,System.String,System.Boolean)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["System.Xml.Serialization", "XmlSerializationWriter", False, "WriteStartElement", "(System.String,System.String,System.Object)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["System.Xml.Serialization", "XmlSerializationWriter", False, "WriteStartElement", "(System.String,System.String,System.Object,System.Boolean)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["System.Xml.Serialization", "XmlSerializationWriter", False, "WriteStartElement", "(System.String,System.String,System.Object,System.Boolean,System.Xml.Serialization.XmlSerializerNamespaces)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Xml.Serialization", "XmlSerializationWriter", False, "WriteStartElement", "(System.String,System.String,System.Object,System.Boolean,System.Xml.Serialization.XmlSerializerNamespaces)", "", "Argument[4]", "Argument[this]", "taint", "df-generated"]
+      - ["System.Xml.Serialization", "XmlSerializationWriter", False, "WriteTypedPrimitive", "(System.String,System.String,System.Object,System.Boolean)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Xml.Serialization", "XmlSerializationWriter", False, "WriteTypedPrimitive", "(System.String,System.String,System.Object,System.Boolean)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
       - ["System.Xml.Serialization", "XmlSerializationWriter", False, "WriteValue", "(System.Byte[])", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
       - ["System.Xml.Serialization", "XmlSerializationWriter", False, "WriteValue", "(System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
@@ -273,6 +300,7 @@ extensions:
       - ["System.Xml.Serialization", "ImportContext", "get_TypeIdentifiers", "()", "summary", "df-generated"]
       - ["System.Xml.Serialization", "SoapAttributeOverrides", "Add", "(System.Type,System.String,System.Xml.Serialization.SoapAttributes)", "summary", "df-generated"]
       - ["System.Xml.Serialization", "SoapAttributeOverrides", "Add", "(System.Type,System.Xml.Serialization.SoapAttributes)", "summary", "df-generated"]
+      - ["System.Xml.Serialization", "SoapAttributes", "SoapAttributes", "(System.Reflection.ICustomAttributeProvider)", "summary", "df-generated"]
       - ["System.Xml.Serialization", "SoapIncludeAttribute", "SoapIncludeAttribute", "(System.Type)", "summary", "df-generated"]
       - ["System.Xml.Serialization", "SoapReflectionImporter", "ImportMembersMapping", "(System.String,System.String,System.Xml.Serialization.XmlReflectionMember[])", "summary", "df-generated"]
       - ["System.Xml.Serialization", "SoapReflectionImporter", "ImportMembersMapping", "(System.String,System.String,System.Xml.Serialization.XmlReflectionMember[],System.Boolean,System.Boolean)", "summary", "df-generated"]
@@ -285,18 +313,22 @@ extensions:
       - ["System.Xml.Serialization", "SoapReflectionImporter", "SoapReflectionImporter", "(System.Xml.Serialization.SoapAttributeOverrides)", "summary", "df-generated"]
       - ["System.Xml.Serialization", "XmlAnyElementAttributes", "Contains", "(System.Xml.Serialization.XmlAnyElementAttribute)", "summary", "df-generated"]
       - ["System.Xml.Serialization", "XmlAnyElementAttributes", "IndexOf", "(System.Xml.Serialization.XmlAnyElementAttribute)", "summary", "df-generated"]
+      - ["System.Xml.Serialization", "XmlAnyElementAttributes", "Remove", "(System.Xml.Serialization.XmlAnyElementAttribute)", "summary", "df-generated"]
       - ["System.Xml.Serialization", "XmlArrayItemAttribute", "XmlArrayItemAttribute", "(System.Type)", "summary", "df-generated"]
       - ["System.Xml.Serialization", "XmlArrayItemAttributes", "Contains", "(System.Xml.Serialization.XmlArrayItemAttribute)", "summary", "df-generated"]
       - ["System.Xml.Serialization", "XmlArrayItemAttributes", "IndexOf", "(System.Xml.Serialization.XmlArrayItemAttribute)", "summary", "df-generated"]
+      - ["System.Xml.Serialization", "XmlArrayItemAttributes", "Remove", "(System.Xml.Serialization.XmlArrayItemAttribute)", "summary", "df-generated"]
       - ["System.Xml.Serialization", "XmlAttributeAttribute", "XmlAttributeAttribute", "(System.Type)", "summary", "df-generated"]
       - ["System.Xml.Serialization", "XmlAttributeEventArgs", "get_LineNumber", "()", "summary", "df-generated"]
       - ["System.Xml.Serialization", "XmlAttributeEventArgs", "get_LinePosition", "()", "summary", "df-generated"]
       - ["System.Xml.Serialization", "XmlAttributeOverrides", "Add", "(System.Type,System.String,System.Xml.Serialization.XmlAttributes)", "summary", "df-generated"]
       - ["System.Xml.Serialization", "XmlAttributeOverrides", "Add", "(System.Type,System.Xml.Serialization.XmlAttributes)", "summary", "df-generated"]
       - ["System.Xml.Serialization", "XmlAttributeOverrides", "get_Item", "(System.Type,System.String)", "summary", "df-generated"]
+      - ["System.Xml.Serialization", "XmlAttributes", "XmlAttributes", "(System.Reflection.ICustomAttributeProvider)", "summary", "df-generated"]
       - ["System.Xml.Serialization", "XmlElementAttribute", "XmlElementAttribute", "(System.Type)", "summary", "df-generated"]
       - ["System.Xml.Serialization", "XmlElementAttributes", "Contains", "(System.Xml.Serialization.XmlElementAttribute)", "summary", "df-generated"]
       - ["System.Xml.Serialization", "XmlElementAttributes", "IndexOf", "(System.Xml.Serialization.XmlElementAttribute)", "summary", "df-generated"]
+      - ["System.Xml.Serialization", "XmlElementAttributes", "Remove", "(System.Xml.Serialization.XmlElementAttribute)", "summary", "df-generated"]
       - ["System.Xml.Serialization", "XmlElementEventArgs", "get_LineNumber", "()", "summary", "df-generated"]
       - ["System.Xml.Serialization", "XmlElementEventArgs", "get_LinePosition", "()", "summary", "df-generated"]
       - ["System.Xml.Serialization", "XmlIncludeAttribute", "XmlIncludeAttribute", "(System.Type)", "summary", "df-generated"]
@@ -335,6 +367,7 @@ extensions:
       - ["System.Xml.Serialization", "XmlSchemaImporter", "XmlSchemaImporter", "(System.Xml.Serialization.XmlSchemas)", "summary", "df-generated"]
       - ["System.Xml.Serialization", "XmlSchemaImporter", "XmlSchemaImporter", "(System.Xml.Serialization.XmlSchemas,System.Xml.Serialization.CodeIdentifiers)", "summary", "df-generated"]
       - ["System.Xml.Serialization", "XmlSchemas", "AddReference", "(System.Xml.Schema.XmlSchema)", "summary", "df-generated"]
+      - ["System.Xml.Serialization", "XmlSchemas", "Compile", "(System.Xml.Schema.ValidationEventHandler,System.Boolean)", "summary", "df-generated"]
       - ["System.Xml.Serialization", "XmlSchemas", "Contains", "(System.String)", "summary", "df-generated"]
       - ["System.Xml.Serialization", "XmlSchemas", "Contains", "(System.Xml.Schema.XmlSchema)", "summary", "df-generated"]
       - ["System.Xml.Serialization", "XmlSchemas", "GetSchemas", "(System.String)", "summary", "df-generated"]
@@ -342,7 +375,10 @@ extensions:
       - ["System.Xml.Serialization", "XmlSchemas", "IsDataSet", "(System.Xml.Schema.XmlSchema)", "summary", "df-generated"]
       - ["System.Xml.Serialization", "XmlSchemas", "OnClear", "()", "summary", "df-generated"]
       - ["System.Xml.Serialization", "XmlSchemas", "OnRemove", "(System.Int32,System.Object)", "summary", "df-generated"]
+      - ["System.Xml.Serialization", "XmlSchemas", "Remove", "(System.Xml.Schema.XmlSchema)", "summary", "df-generated"]
       - ["System.Xml.Serialization", "XmlSchemas", "get_IsCompiled", "()", "summary", "df-generated"]
+      - ["System.Xml.Serialization", "XmlSerializationReader+Fixup", "Fixup", "(System.Object,System.Xml.Serialization.XmlSerializationFixupCallback,System.Int32)", "summary", "df-generated"]
+      - ["System.Xml.Serialization", "XmlSerializationReader", "AddReadCallback", "(System.String,System.String,System.Type,System.Xml.Serialization.XmlSerializationReadCallback)", "summary", "df-generated"]
       - ["System.Xml.Serialization", "XmlSerializationReader", "CheckReaderCount", "(System.Int32,System.Int32)", "summary", "df-generated"]
       - ["System.Xml.Serialization", "XmlSerializationReader", "CreateAbstractTypeException", "(System.String,System.String)", "summary", "df-generated"]
       - ["System.Xml.Serialization", "XmlSerializationReader", "CreateBadDerivationException", "(System.String,System.String,System.String,System.String,System.String,System.String)", "summary", "df-generated"]
@@ -390,6 +426,7 @@ extensions:
       - ["System.Xml.Serialization", "XmlSerializationReader", "UnknownNode", "(System.Object,System.String)", "summary", "df-generated"]
       - ["System.Xml.Serialization", "XmlSerializationReader", "UnreferencedObject", "(System.String,System.Object)", "summary", "df-generated"]
       - ["System.Xml.Serialization", "XmlSerializationReader", "get_ReaderCount", "()", "summary", "df-generated"]
+      - ["System.Xml.Serialization", "XmlSerializationWriter", "AddWriteCallback", "(System.Type,System.String,System.String,System.Xml.Serialization.XmlSerializationWriteCallback)", "summary", "df-generated"]
       - ["System.Xml.Serialization", "XmlSerializationWriter", "CreateChoiceIdentifierValueException", "(System.String,System.String,System.String,System.String)", "summary", "df-generated"]
       - ["System.Xml.Serialization", "XmlSerializationWriter", "CreateInvalidAnyTypeException", "(System.Object)", "summary", "df-generated"]
       - ["System.Xml.Serialization", "XmlSerializationWriter", "CreateInvalidAnyTypeException", "(System.Type)", "summary", "df-generated"]
@@ -406,22 +443,11 @@ extensions:
       - ["System.Xml.Serialization", "XmlSerializationWriter", "InitCallbacks", "()", "summary", "df-generated"]
       - ["System.Xml.Serialization", "XmlSerializationWriter", "ResolveDynamicAssembly", "(System.String)", "summary", "df-generated"]
       - ["System.Xml.Serialization", "XmlSerializationWriter", "TopLevelElement", "()", "summary", "df-generated"]
-      - ["System.Xml.Serialization", "XmlSerializationWriter", "WriteEmptyTag", "(System.String)", "summary", "df-generated"]
-      - ["System.Xml.Serialization", "XmlSerializationWriter", "WriteEmptyTag", "(System.String,System.String)", "summary", "df-generated"]
       - ["System.Xml.Serialization", "XmlSerializationWriter", "WriteEndElement", "()", "summary", "df-generated"]
       - ["System.Xml.Serialization", "XmlSerializationWriter", "WriteEndElement", "(System.Object)", "summary", "df-generated"]
-      - ["System.Xml.Serialization", "XmlSerializationWriter", "WriteNullTagEncoded", "(System.String)", "summary", "df-generated"]
-      - ["System.Xml.Serialization", "XmlSerializationWriter", "WriteNullTagEncoded", "(System.String,System.String)", "summary", "df-generated"]
-      - ["System.Xml.Serialization", "XmlSerializationWriter", "WriteNullTagLiteral", "(System.String)", "summary", "df-generated"]
-      - ["System.Xml.Serialization", "XmlSerializationWriter", "WriteNullTagLiteral", "(System.String,System.String)", "summary", "df-generated"]
       - ["System.Xml.Serialization", "XmlSerializationWriter", "WriteReferencedElements", "()", "summary", "df-generated"]
       - ["System.Xml.Serialization", "XmlSerializationWriter", "WriteRpcResult", "(System.String,System.String)", "summary", "df-generated"]
       - ["System.Xml.Serialization", "XmlSerializationWriter", "WriteStartDocument", "()", "summary", "df-generated"]
-      - ["System.Xml.Serialization", "XmlSerializationWriter", "WriteStartElement", "(System.String)", "summary", "df-generated"]
-      - ["System.Xml.Serialization", "XmlSerializationWriter", "WriteStartElement", "(System.String,System.String)", "summary", "df-generated"]
-      - ["System.Xml.Serialization", "XmlSerializationWriter", "WriteStartElement", "(System.String,System.String,System.Boolean)", "summary", "df-generated"]
-      - ["System.Xml.Serialization", "XmlSerializationWriter", "WriteStartElement", "(System.String,System.String,System.Object)", "summary", "df-generated"]
-      - ["System.Xml.Serialization", "XmlSerializationWriter", "WriteStartElement", "(System.String,System.String,System.Object,System.Boolean)", "summary", "df-generated"]
       - ["System.Xml.Serialization", "XmlSerializer", "CanDeserialize", "(System.Xml.XmlReader)", "summary", "df-generated"]
       - ["System.Xml.Serialization", "XmlSerializer", "CreateReader", "()", "summary", "df-generated"]
       - ["System.Xml.Serialization", "XmlSerializer", "CreateWriter", "()", "summary", "df-generated"]
@@ -444,6 +470,14 @@ extensions:
       - ["System.Xml.Serialization", "XmlSerializer", "XmlSerializer", "(System.Type,System.Xml.Serialization.XmlAttributeOverrides)", "summary", "df-generated"]
       - ["System.Xml.Serialization", "XmlSerializer", "XmlSerializer", "(System.Type,System.Xml.Serialization.XmlAttributeOverrides,System.Type[],System.Xml.Serialization.XmlRootAttribute,System.String)", "summary", "df-generated"]
       - ["System.Xml.Serialization", "XmlSerializer", "XmlSerializer", "(System.Type,System.Xml.Serialization.XmlRootAttribute)", "summary", "df-generated"]
+      - ["System.Xml.Serialization", "XmlSerializer", "add_UnknownAttribute", "(System.Xml.Serialization.XmlAttributeEventHandler)", "summary", "df-generated"]
+      - ["System.Xml.Serialization", "XmlSerializer", "add_UnknownElement", "(System.Xml.Serialization.XmlElementEventHandler)", "summary", "df-generated"]
+      - ["System.Xml.Serialization", "XmlSerializer", "add_UnknownNode", "(System.Xml.Serialization.XmlNodeEventHandler)", "summary", "df-generated"]
+      - ["System.Xml.Serialization", "XmlSerializer", "add_UnreferencedObject", "(System.Xml.Serialization.UnreferencedObjectEventHandler)", "summary", "df-generated"]
+      - ["System.Xml.Serialization", "XmlSerializer", "remove_UnknownAttribute", "(System.Xml.Serialization.XmlAttributeEventHandler)", "summary", "df-generated"]
+      - ["System.Xml.Serialization", "XmlSerializer", "remove_UnknownElement", "(System.Xml.Serialization.XmlElementEventHandler)", "summary", "df-generated"]
+      - ["System.Xml.Serialization", "XmlSerializer", "remove_UnknownNode", "(System.Xml.Serialization.XmlNodeEventHandler)", "summary", "df-generated"]
+      - ["System.Xml.Serialization", "XmlSerializer", "remove_UnreferencedObject", "(System.Xml.Serialization.UnreferencedObjectEventHandler)", "summary", "df-generated"]
       - ["System.Xml.Serialization", "XmlSerializerAssemblyAttribute", "XmlSerializerAssemblyAttribute", "(System.String)", "summary", "df-generated"]
       - ["System.Xml.Serialization", "XmlSerializerFactory", "CreateSerializer", "(System.Type)", "summary", "df-generated"]
       - ["System.Xml.Serialization", "XmlSerializerFactory", "CreateSerializer", "(System.Type,System.Type[])", "summary", "df-generated"]
diff --git a/csharp/ql/lib/ext/generated/System.Xml.XPath.model.yml b/csharp/ql/lib/ext/generated/System.Xml.XPath.model.yml
index 09a4da61842..f27d94e88a6 100644
--- a/csharp/ql/lib/ext/generated/System.Xml.XPath.model.yml
+++ b/csharp/ql/lib/ext/generated/System.Xml.XPath.model.yml
@@ -4,23 +4,22 @@ extensions:
       pack: codeql/csharp-all
       extensible: summaryModel
     data:
-      - ["System.Xml.XPath", "Extensions", False, "CreateNavigator", "(System.Xml.Linq.XNode)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Xml.XPath", "Extensions", False, "CreateNavigator", "(System.Xml.Linq.XNode,System.Xml.XmlNameTable)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Xml.XPath", "Extensions", False, "CreateNavigator", "(System.Xml.Linq.XNode,System.Xml.XmlNameTable)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Xml.XPath", "Extensions", False, "CreateNavigator", "(System.Xml.Linq.XNode)", "", "Argument[0]", "ReturnValue.SyntheticField[System.Xml.XPath.XNodeNavigator._source]", "value", "dfc-generated"]
+      - ["System.Xml.XPath", "Extensions", False, "CreateNavigator", "(System.Xml.Linq.XNode,System.Xml.XmlNameTable)", "", "Argument[0]", "ReturnValue.SyntheticField[System.Xml.XPath.XNodeNavigator._source]", "value", "dfc-generated"]
+      - ["System.Xml.XPath", "Extensions", False, "CreateNavigator", "(System.Xml.Linq.XNode,System.Xml.XmlNameTable)", "", "Argument[1]", "ReturnValue.SyntheticField[System.Xml.XPath.XNodeNavigator._nameTable]", "value", "dfc-generated"]
       - ["System.Xml.XPath", "IXPathNavigable", True, "CreateNavigator", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Xml.XPath", "XDocumentExtensions", False, "ToXPathNavigable", "(System.Xml.Linq.XNode)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["System.Xml.XPath", "XPathDocument", False, "XPathDocument", "(System.Xml.XmlReader,System.Xml.XmlSpace)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Xml.XPath", "XPathException", False, "XPathException", "(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["System.Xml.XPath", "XPathException", True, "get_Message", "()", "", "Argument[this].Property[System.Exception.Message]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Xml.XPath", "XPathExpression", False, "Compile", "(System.String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Xml.XPath", "XPathExpression", False, "Compile", "(System.String,System.Xml.IXmlNamespaceResolver)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Xml.XPath", "XPathExpression", False, "Compile", "(System.String,System.Xml.IXmlNamespaceResolver)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Xml.XPath", "XPathExpression", True, "Clone", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Xml.XPath", "XPathExpression", True, "Clone", "()", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["System.Xml.XPath", "XPathExpression", False, "Compile", "(System.String,System.Xml.IXmlNamespaceResolver)", "", "Argument[0]", "ReturnValue.SyntheticField[MS.Internal.Xml.XPath.CompiledXpathExpr._expr]", "value", "dfc-generated"]
+      - ["System.Xml.XPath", "XPathExpression", True, "Clone", "()", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Xml.XPath", "XPathExpression", True, "SetContext", "(System.Xml.IXmlNamespaceResolver)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Xml.XPath", "XPathExpression", True, "SetContext", "(System.Xml.XmlNamespaceManager)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
       - ["System.Xml.XPath", "XPathExpression", True, "get_Expression", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Xml.XPath", "XPathItem", True, "ValueAs", "(System.Type)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Xml.XPath", "XPathItem", True, "ValueAs", "(System.Type,System.Xml.IXmlNamespaceResolver)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Xml.XPath", "XPathItem", True, "ValueAs", "(System.Type,System.Xml.IXmlNamespaceResolver)", "", "Argument[this]", "Argument[1]", "taint", "df-generated"]
       - ["System.Xml.XPath", "XPathItem", True, "ValueAs", "(System.Type,System.Xml.IXmlNamespaceResolver)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Xml.XPath", "XPathItem", True, "ValueAs", "(System.Type,System.Xml.IXmlNamespaceResolver)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
       - ["System.Xml.XPath", "XPathItem", True, "get_TypedValue", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
@@ -28,8 +27,7 @@ extensions:
       - ["System.Xml.XPath", "XPathItem", True, "get_XmlType", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Xml.XPath", "XPathNavigator", False, "ToString", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Xml.XPath", "XPathNavigator", True, "AppendChild", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Xml.XPath", "XPathNavigator", True, "Clone", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Xml.XPath", "XPathNavigator", True, "Clone", "()", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["System.Xml.XPath", "XPathNavigator", True, "Clone", "()", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Xml.XPath", "XPathNavigator", True, "Compile", "(System.String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["System.Xml.XPath", "XPathNavigator", True, "CreateAttributes", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Xml.XPath", "XPathNavigator", True, "Evaluate", "(System.Xml.XPath.XPathExpression)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
@@ -39,6 +37,7 @@ extensions:
       - ["System.Xml.XPath", "XPathNavigator", True, "GetNamespace", "(System.String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Xml.XPath", "XPathNavigator", True, "InsertAfter", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Xml.XPath", "XPathNavigator", True, "InsertBefore", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Xml.XPath", "XPathNavigator", True, "LookupPrefix", "(System.String)", "", "Argument[this].Property[System.Xml.XPath.XPathNavigator.LocalName]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Xml.XPath", "XPathNavigator", True, "MoveTo", "(System.Xml.XPath.XPathNavigator)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Xml.XPath", "XPathNavigator", True, "PrependChild", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Xml.XPath", "XPathNavigator", True, "ReadSubtree", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
@@ -59,9 +58,8 @@ extensions:
       - ["System.Xml.XPath", "XPathNavigator", True, "get_Prefix", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Xml.XPath", "XPathNavigator", True, "get_SchemaInfo", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Xml.XPath", "XPathNavigator", True, "get_UnderlyingObject", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Xml.XPath", "XPathNavigator", True, "get_XmlLang", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Xml.XPath", "XPathNodeIterator", True, "Clone", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Xml.XPath", "XPathNodeIterator", True, "Clone", "()", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["System.Xml.XPath", "XPathNavigator", True, "get_XmlLang", "()", "", "Argument[this].Property[System.Xml.XPath.XPathItem.Value]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Xml.XPath", "XPathNodeIterator", True, "Clone", "()", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Xml.XPath", "XPathNodeIterator", True, "get_Current", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
   - addsTo:
       pack: codeql/csharp-all
@@ -78,6 +76,7 @@ extensions:
       - ["System.Xml.XPath", "XPathDocument", "XPathDocument", "(System.String)", "summary", "df-generated"]
       - ["System.Xml.XPath", "XPathDocument", "XPathDocument", "(System.String,System.Xml.XmlSpace)", "summary", "df-generated"]
       - ["System.Xml.XPath", "XPathDocument", "XPathDocument", "(System.Xml.XmlReader)", "summary", "df-generated"]
+      - ["System.Xml.XPath", "XPathException", "XPathException", "(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)", "summary", "df-generated"]
       - ["System.Xml.XPath", "XPathException", "XPathException", "(System.String)", "summary", "df-generated"]
       - ["System.Xml.XPath", "XPathException", "XPathException", "(System.String,System.Exception)", "summary", "df-generated"]
       - ["System.Xml.XPath", "XPathExpression", "AddSort", "(System.Object,System.Collections.IComparer)", "summary", "df-generated"]
@@ -94,6 +93,7 @@ extensions:
       - ["System.Xml.XPath", "XPathNavigator", "AppendChild", "(System.Xml.XPath.XPathNavigator)", "summary", "df-generated"]
       - ["System.Xml.XPath", "XPathNavigator", "AppendChild", "(System.Xml.XmlReader)", "summary", "df-generated"]
       - ["System.Xml.XPath", "XPathNavigator", "AppendChildElement", "(System.String,System.String,System.String,System.String)", "summary", "df-generated"]
+      - ["System.Xml.XPath", "XPathNavigator", "CheckValidity", "(System.Xml.Schema.XmlSchemaSet,System.Xml.Schema.ValidationEventHandler)", "summary", "df-generated"]
       - ["System.Xml.XPath", "XPathNavigator", "ComparePosition", "(System.Xml.XPath.XPathNavigator)", "summary", "df-generated"]
       - ["System.Xml.XPath", "XPathNavigator", "CreateAttribute", "(System.String,System.String,System.String,System.String)", "summary", "df-generated"]
       - ["System.Xml.XPath", "XPathNavigator", "DeleteRange", "(System.Xml.XPath.XPathNavigator)", "summary", "df-generated"]
diff --git a/csharp/ql/lib/ext/generated/System.Xml.Xsl.Runtime.model.yml b/csharp/ql/lib/ext/generated/System.Xml.Xsl.Runtime.model.yml
index 83c34b5eb8f..d257228897a 100644
--- a/csharp/ql/lib/ext/generated/System.Xml.Xsl.Runtime.model.yml
+++ b/csharp/ql/lib/ext/generated/System.Xml.Xsl.Runtime.model.yml
@@ -23,11 +23,11 @@ extensions:
       - ["System.Xml.Xsl.Runtime", "DescendantMergeIterator", False, "MoveNext", "(System.Xml.XPath.XPathNavigator)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Xml.Xsl.Runtime", "DescendantMergeIterator", False, "get_Current", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Xml.Xsl.Runtime", "DifferenceIterator", False, "Create", "(System.Xml.Xsl.Runtime.XmlQueryRuntime)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Xml.Xsl.Runtime", "DifferenceIterator", False, "MoveNext", "(System.Xml.XPath.XPathNavigator)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Xml.Xsl.Runtime", "DifferenceIterator", False, "get_Current", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Xml.Xsl.Runtime", "DodSequenceMerge", False, "AddSequence", "(System.Collections.Generic.IList<System.Xml.XPath.XPathNavigator>)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
+      - ["System.Xml.Xsl.Runtime", "DifferenceIterator", False, "MoveNext", "(System.Xml.XPath.XPathNavigator)", "", "Argument[0]", "Argument[this].SyntheticField[System.Xml.Xsl.Runtime.DifferenceIterator._navLeft]", "value", "dfc-generated"]
+      - ["System.Xml.Xsl.Runtime", "DifferenceIterator", False, "get_Current", "()", "", "Argument[this].SyntheticField[System.Xml.Xsl.Runtime.DifferenceIterator._navLeft]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Xml.Xsl.Runtime", "DodSequenceMerge", False, "AddSequence", "(System.Collections.Generic.IList<System.Xml.XPath.XPathNavigator>)", "", "Argument[0]", "Argument[this].SyntheticField[System.Xml.Xsl.Runtime.DodSequenceMerge._firstSequence]", "value", "dfc-generated"]
       - ["System.Xml.Xsl.Runtime", "DodSequenceMerge", False, "Create", "(System.Xml.Xsl.Runtime.XmlQueryRuntime)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Xml.Xsl.Runtime", "DodSequenceMerge", False, "MergeSequences", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Xml.Xsl.Runtime", "DodSequenceMerge", False, "MergeSequences", "()", "", "Argument[this].SyntheticField[System.Xml.Xsl.Runtime.DodSequenceMerge._firstSequence]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Xml.Xsl.Runtime", "ElementContentIterator", False, "Create", "(System.Xml.XPath.XPathNavigator,System.String,System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Xml.Xsl.Runtime", "ElementContentIterator", False, "Create", "(System.Xml.XPath.XPathNavigator,System.String,System.String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
       - ["System.Xml.Xsl.Runtime", "ElementContentIterator", False, "Create", "(System.Xml.XPath.XPathNavigator,System.String,System.String)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
@@ -40,8 +40,8 @@ extensions:
       - ["System.Xml.Xsl.Runtime", "IdIterator", False, "Create", "(System.Xml.XPath.XPathNavigator,System.String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
       - ["System.Xml.Xsl.Runtime", "IdIterator", False, "get_Current", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Xml.Xsl.Runtime", "IntersectIterator", False, "Create", "(System.Xml.Xsl.Runtime.XmlQueryRuntime)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Xml.Xsl.Runtime", "IntersectIterator", False, "MoveNext", "(System.Xml.XPath.XPathNavigator)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Xml.Xsl.Runtime", "IntersectIterator", False, "get_Current", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Xml.Xsl.Runtime", "IntersectIterator", False, "MoveNext", "(System.Xml.XPath.XPathNavigator)", "", "Argument[0]", "Argument[this].SyntheticField[System.Xml.Xsl.Runtime.IntersectIterator._navLeft]", "value", "dfc-generated"]
+      - ["System.Xml.Xsl.Runtime", "IntersectIterator", False, "get_Current", "()", "", "Argument[this].SyntheticField[System.Xml.Xsl.Runtime.IntersectIterator._navLeft]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Xml.Xsl.Runtime", "NamespaceIterator", False, "get_Current", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Xml.Xsl.Runtime", "NodeKindContentIterator", False, "Create", "(System.Xml.XPath.XPathNavigator,System.Xml.XPath.XPathNodeType)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Xml.Xsl.Runtime", "NodeKindContentIterator", False, "get_Current", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
@@ -61,8 +61,8 @@ extensions:
       - ["System.Xml.Xsl.Runtime", "PrecedingSiblingIterator", False, "get_Current", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Xml.Xsl.Runtime", "StringConcat", False, "GetResult", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Xml.Xsl.Runtime", "UnionIterator", False, "Create", "(System.Xml.Xsl.Runtime.XmlQueryRuntime)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Xml.Xsl.Runtime", "UnionIterator", False, "MoveNext", "(System.Xml.XPath.XPathNavigator)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Xml.Xsl.Runtime", "UnionIterator", False, "get_Current", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Xml.Xsl.Runtime", "UnionIterator", False, "MoveNext", "(System.Xml.XPath.XPathNavigator)", "", "Argument[0]", "Argument[this].SyntheticField[System.Xml.Xsl.Runtime.UnionIterator._navCurr]", "value", "dfc-generated"]
+      - ["System.Xml.Xsl.Runtime", "UnionIterator", False, "get_Current", "()", "", "Argument[this].SyntheticField[System.Xml.Xsl.Runtime.UnionIterator._navCurr]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Xml.Xsl.Runtime", "XPathFollowingIterator", False, "Create", "(System.Xml.XPath.XPathNavigator,System.Xml.Xsl.Runtime.XmlNavigatorFilter)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Xml.Xsl.Runtime", "XPathFollowingIterator", False, "Create", "(System.Xml.XPath.XPathNavigator,System.Xml.Xsl.Runtime.XmlNavigatorFilter)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
       - ["System.Xml.Xsl.Runtime", "XPathFollowingIterator", False, "get_Current", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
@@ -84,8 +84,8 @@ extensions:
       - ["System.Xml.Xsl.Runtime", "XmlILStorageConverter", False, "DoubleToAtomicValue", "(System.Double,System.Int32,System.Xml.Xsl.Runtime.XmlQueryRuntime)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
       - ["System.Xml.Xsl.Runtime", "XmlILStorageConverter", False, "Int32ToAtomicValue", "(System.Int32,System.Int32,System.Xml.Xsl.Runtime.XmlQueryRuntime)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
       - ["System.Xml.Xsl.Runtime", "XmlILStorageConverter", False, "Int64ToAtomicValue", "(System.Int64,System.Int32,System.Xml.Xsl.Runtime.XmlQueryRuntime)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Xml.Xsl.Runtime", "XmlILStorageConverter", False, "ItemsToNavigators", "(System.Collections.Generic.IList<System.Xml.XPath.XPathItem>)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["System.Xml.Xsl.Runtime", "XmlILStorageConverter", False, "NavigatorsToItems", "(System.Collections.Generic.IList<System.Xml.XPath.XPathNavigator>)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
+      - ["System.Xml.Xsl.Runtime", "XmlILStorageConverter", False, "ItemsToNavigators", "(System.Collections.Generic.IList<System.Xml.XPath.XPathItem>)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Xml.Xsl.Runtime", "XmlILStorageConverter", False, "NavigatorsToItems", "(System.Collections.Generic.IList<System.Xml.XPath.XPathNavigator>)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Xml.Xsl.Runtime", "XmlILStorageConverter", False, "SingleToAtomicValue", "(System.Single,System.Int32,System.Xml.Xsl.Runtime.XmlQueryRuntime)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
       - ["System.Xml.Xsl.Runtime", "XmlILStorageConverter", False, "StringToAtomicValue", "(System.String,System.Int32,System.Xml.Xsl.Runtime.XmlQueryRuntime)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["System.Xml.Xsl.Runtime", "XmlILStorageConverter", False, "StringToAtomicValue", "(System.String,System.Int32,System.Xml.Xsl.Runtime.XmlQueryRuntime)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
@@ -100,16 +100,12 @@ extensions:
       - ["System.Xml.Xsl.Runtime", "XmlQueryContext", False, "get_DefaultNameTable", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Xml.Xsl.Runtime", "XmlQueryContext", False, "get_QueryNameTable", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Xml.Xsl.Runtime", "XmlQueryItemSequence", False, "AddClone", "(System.Xml.XPath.XPathItem)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Xml.Xsl.Runtime", "XmlQueryItemSequence", False, "CreateOrReuse", "(System.Xml.Xsl.Runtime.XmlQueryItemSequence)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["System.Xml.Xsl.Runtime", "XmlQueryItemSequence", False, "CreateOrReuse", "(System.Xml.Xsl.Runtime.XmlQueryItemSequence,System.Xml.XPath.XPathItem)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["System.Xml.Xsl.Runtime", "XmlQueryItemSequence", False, "CreateOrReuse", "(System.Xml.Xsl.Runtime.XmlQueryItemSequence,System.Xml.XPath.XPathItem)", "", "Argument[1]", "Argument[0].Element", "taint", "df-generated"]
-      - ["System.Xml.Xsl.Runtime", "XmlQueryItemSequence", False, "CreateOrReuse", "(System.Xml.Xsl.Runtime.XmlQueryItemSequence,System.Xml.XPath.XPathItem)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Xml.Xsl.Runtime", "XmlQueryItemSequence", False, "CreateOrReuse", "(System.Xml.Xsl.Runtime.XmlQueryItemSequence)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Xml.Xsl.Runtime", "XmlQueryItemSequence", False, "CreateOrReuse", "(System.Xml.Xsl.Runtime.XmlQueryItemSequence,System.Xml.XPath.XPathItem)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Xml.Xsl.Runtime", "XmlQueryItemSequence", False, "XmlQueryItemSequence", "(System.Xml.XPath.XPathItem)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Xml.Xsl.Runtime", "XmlQueryNodeSequence", False, "AddClone", "(System.Xml.XPath.XPathNavigator)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Xml.Xsl.Runtime", "XmlQueryNodeSequence", False, "CreateOrReuse", "(System.Xml.Xsl.Runtime.XmlQueryNodeSequence)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["System.Xml.Xsl.Runtime", "XmlQueryNodeSequence", False, "CreateOrReuse", "(System.Xml.Xsl.Runtime.XmlQueryNodeSequence,System.Xml.XPath.XPathNavigator)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["System.Xml.Xsl.Runtime", "XmlQueryNodeSequence", False, "CreateOrReuse", "(System.Xml.Xsl.Runtime.XmlQueryNodeSequence,System.Xml.XPath.XPathNavigator)", "", "Argument[1]", "Argument[0].Element", "taint", "df-generated"]
-      - ["System.Xml.Xsl.Runtime", "XmlQueryNodeSequence", False, "CreateOrReuse", "(System.Xml.Xsl.Runtime.XmlQueryNodeSequence,System.Xml.XPath.XPathNavigator)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Xml.Xsl.Runtime", "XmlQueryNodeSequence", False, "CreateOrReuse", "(System.Xml.Xsl.Runtime.XmlQueryNodeSequence)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Xml.Xsl.Runtime", "XmlQueryNodeSequence", False, "CreateOrReuse", "(System.Xml.Xsl.Runtime.XmlQueryNodeSequence,System.Xml.XPath.XPathNavigator)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Xml.Xsl.Runtime", "XmlQueryNodeSequence", False, "DocOrderDistinct", "(System.Collections.Generic.IComparer<System.Xml.XPath.XPathNavigator>)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
       - ["System.Xml.Xsl.Runtime", "XmlQueryNodeSequence", False, "XmlQueryNodeSequence", "(System.Collections.Generic.IList<System.Xml.XPath.XPathNavigator>)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
       - ["System.Xml.Xsl.Runtime", "XmlQueryNodeSequence", False, "XmlQueryNodeSequence", "(System.Xml.XPath.XPathNavigator)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
@@ -130,9 +126,9 @@ extensions:
       - ["System.Xml.Xsl.Runtime", "XmlQueryRuntime", False, "ChangeTypeXsltArgument", "(System.Int32,System.Object,System.Type)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
       - ["System.Xml.Xsl.Runtime", "XmlQueryRuntime", False, "ChangeTypeXsltResult", "(System.Int32,System.Object)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
       - ["System.Xml.Xsl.Runtime", "XmlQueryRuntime", False, "DebugGetGlobalNames", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Xml.Xsl.Runtime", "XmlQueryRuntime", False, "DebugGetGlobalValue", "(System.String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Xml.Xsl.Runtime", "XmlQueryRuntime", False, "DebugGetGlobalValue", "(System.String)", "", "Argument[this].SyntheticField[System.Xml.Xsl.Runtime.XmlQueryRuntime._globalValues].Element", "ReturnValue", "value", "dfc-generated"]
       - ["System.Xml.Xsl.Runtime", "XmlQueryRuntime", False, "DebugGetXsltValue", "(System.Collections.IList)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["System.Xml.Xsl.Runtime", "XmlQueryRuntime", False, "DebugSetGlobalValue", "(System.String,System.Object)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["System.Xml.Xsl.Runtime", "XmlQueryRuntime", False, "DebugSetGlobalValue", "(System.String,System.Object)", "", "Argument[1]", "Argument[this].SyntheticField[System.Xml.Xsl.Runtime.XmlQueryRuntime._globalValues].Element", "value", "dfc-generated"]
       - ["System.Xml.Xsl.Runtime", "XmlQueryRuntime", False, "DocOrderDistinct", "(System.Collections.Generic.IList<System.Xml.XPath.XPathNavigator>)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
       - ["System.Xml.Xsl.Runtime", "XmlQueryRuntime", False, "EndRtfConstruction", "(System.Xml.Xsl.Runtime.XmlQueryOutput)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Xml.Xsl.Runtime", "XmlQueryRuntime", False, "EndSequenceConstruction", "(System.Xml.Xsl.Runtime.XmlQueryOutput)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
@@ -140,44 +136,41 @@ extensions:
       - ["System.Xml.Xsl.Runtime", "XmlQueryRuntime", False, "GetAtomizedName", "(System.Int32)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Xml.Xsl.Runtime", "XmlQueryRuntime", False, "GetCollation", "(System.Int32)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Xml.Xsl.Runtime", "XmlQueryRuntime", False, "GetEarlyBoundObject", "(System.Int32)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Xml.Xsl.Runtime", "XmlQueryRuntime", False, "GetGlobalValue", "(System.Int32)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Xml.Xsl.Runtime", "XmlQueryRuntime", False, "GetGlobalValue", "(System.Int32)", "", "Argument[this].SyntheticField[System.Xml.Xsl.Runtime.XmlQueryRuntime._globalValues].Element", "ReturnValue", "value", "dfc-generated"]
       - ["System.Xml.Xsl.Runtime", "XmlQueryRuntime", False, "GetNameFilter", "(System.Int32)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Xml.Xsl.Runtime", "XmlQueryRuntime", False, "StartRtfConstruction", "(System.String,System.Xml.Xsl.Runtime.XmlQueryOutput)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["System.Xml.Xsl.Runtime", "XmlQueryRuntime", False, "StartRtfConstruction", "(System.String,System.Xml.Xsl.Runtime.XmlQueryOutput)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Xml.Xsl.Runtime", "XmlQueryRuntime", False, "StartSequenceConstruction", "(System.Xml.Xsl.Runtime.XmlQueryOutput)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Xml.Xsl.Runtime", "XmlQueryRuntime", False, "TextRtfConstruction", "(System.String,System.String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Xml.Xsl.Runtime", "XmlQueryRuntime", False, "TextRtfConstruction", "(System.String,System.String)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Xml.Xsl.Runtime", "XmlQueryRuntime", False, "TextRtfConstruction", "(System.String,System.String)", "", "Argument[0]", "ReturnValue.SyntheticField[System.Xml.Xsl.Runtime.RtfTextNavigator._text]", "value", "dfc-generated"]
+      - ["System.Xml.Xsl.Runtime", "XmlQueryRuntime", False, "TextRtfConstruction", "(System.String,System.String)", "", "Argument[1]", "ReturnValue.SyntheticField[System.Xml.Xsl.Runtime.RtfTextNavigator._baseUri]", "value", "dfc-generated"]
       - ["System.Xml.Xsl.Runtime", "XmlQueryRuntime", False, "get_ExternalContext", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Xml.Xsl.Runtime", "XmlQueryRuntime", False, "get_NameTable", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Xml.Xsl.Runtime", "XmlQueryRuntime", False, "get_Output", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Xml.Xsl.Runtime", "XmlQuerySequence<T>", False, "Add", "(T)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Xml.Xsl.Runtime", "XmlQuerySequence<T>", False, "CreateOrReuse", "(System.Xml.Xsl.Runtime.XmlQuerySequence<T>)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["System.Xml.Xsl.Runtime", "XmlQuerySequence<T>", False, "CreateOrReuse", "(System.Xml.Xsl.Runtime.XmlQuerySequence<T>,T)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["System.Xml.Xsl.Runtime", "XmlQuerySequence<T>", False, "CreateOrReuse", "(System.Xml.Xsl.Runtime.XmlQuerySequence<T>,T)", "", "Argument[1]", "Argument[0].Element", "taint", "df-generated"]
-      - ["System.Xml.Xsl.Runtime", "XmlQuerySequence<T>", False, "CreateOrReuse", "(System.Xml.Xsl.Runtime.XmlQuerySequence<T>,T)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Xml.Xsl.Runtime", "XmlQuerySequence<T>", False, "CreateOrReuse", "(System.Xml.Xsl.Runtime.XmlQuerySequence<T>)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Xml.Xsl.Runtime", "XmlQuerySequence<T>", False, "CreateOrReuse", "(System.Xml.Xsl.Runtime.XmlQuerySequence<T>,T)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Xml.Xsl.Runtime", "XmlQuerySequence<T>", False, "XmlQuerySequence", "(T)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Xml.Xsl.Runtime", "XmlQuerySequence<T>", False, "XmlQuerySequence", "(T[],System.Int32)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
       - ["System.Xml.Xsl.Runtime", "XmlSortKeyAccumulator", False, "get_Keys", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Xml.Xsl.Runtime", "XsltConvert", False, "EnsureNodeSet", "(System.Collections.Generic.IList<System.Xml.XPath.XPathItem>)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["System.Xml.Xsl.Runtime", "XsltConvert", False, "ToNode", "(System.Collections.Generic.IList<System.Xml.XPath.XPathItem>)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["System.Xml.Xsl.Runtime", "XsltConvert", False, "ToNode", "(System.Xml.XPath.XPathItem)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Xml.Xsl.Runtime", "XsltConvert", False, "ToNodeSet", "(System.Collections.Generic.IList<System.Xml.XPath.XPathItem>)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
+      - ["System.Xml.Xsl.Runtime", "XsltConvert", False, "EnsureNodeSet", "(System.Collections.Generic.IList<System.Xml.XPath.XPathItem>)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Xml.Xsl.Runtime", "XsltConvert", False, "ToNode", "(System.Collections.Generic.IList<System.Xml.XPath.XPathItem>)", "", "Argument[0].Element", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Xml.Xsl.Runtime", "XsltConvert", False, "ToNode", "(System.Xml.XPath.XPathItem)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Xml.Xsl.Runtime", "XsltConvert", False, "ToNodeSet", "(System.Collections.Generic.IList<System.Xml.XPath.XPathItem>)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Xml.Xsl.Runtime", "XsltConvert", False, "ToNodeSet", "(System.Xml.XPath.XPathItem)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["System.Xml.Xsl.Runtime", "XsltConvert", False, "ToString", "(System.Collections.Generic.IList<System.Xml.XPath.XPathItem>)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
       - ["System.Xml.Xsl.Runtime", "XsltConvert", False, "ToString", "(System.Xml.XPath.XPathItem)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["System.Xml.Xsl.Runtime", "XsltFunctions", False, "BaseUri", "(System.Xml.XPath.XPathNavigator)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Xml.Xsl.Runtime", "XsltFunctions", False, "MSLocalName", "(System.String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Xml.Xsl.Runtime", "XsltFunctions", False, "MSLocalName", "(System.String)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Xml.Xsl.Runtime", "XsltFunctions", False, "MSNamespaceUri", "(System.String,System.Xml.XPath.XPathNavigator)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Xml.Xsl.Runtime", "XsltFunctions", False, "NormalizeSpace", "(System.String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Xml.Xsl.Runtime", "XsltFunctions", False, "NormalizeSpace", "(System.String)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Xml.Xsl.Runtime", "XsltFunctions", False, "OuterXml", "(System.Xml.XPath.XPathNavigator)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Xml.Xsl.Runtime", "XsltFunctions", False, "Substring", "(System.String,System.Double)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Xml.Xsl.Runtime", "XsltFunctions", False, "Substring", "(System.String,System.Double,System.Double)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Xml.Xsl.Runtime", "XsltFunctions", False, "SubstringAfter", "(System.String,System.String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Xml.Xsl.Runtime", "XsltFunctions", False, "SubstringBefore", "(System.String,System.String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Xml.Xsl.Runtime", "XsltFunctions", False, "SubstringBefore", "(System.String,System.String)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Xml.Xsl.Runtime", "XsltFunctions", False, "Translate", "(System.String,System.String,System.String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Xml.Xsl.Runtime", "XsltLibrary", False, "FormatMessage", "(System.String,System.Collections.Generic.IList<System.String>)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Xml.Xsl.Runtime", "XsltLibrary", False, "FormatMessage", "(System.String,System.Collections.Generic.IList<System.String>)", "", "Argument[1].Element", "ReturnValue", "taint", "df-generated"]
+      - ["System.Xml.Xsl.Runtime", "XsltFunctions", False, "Substring", "(System.String,System.Double)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Xml.Xsl.Runtime", "XsltFunctions", False, "Substring", "(System.String,System.Double,System.Double)", "", "Argument[0]", "ReturnValue", "taint", "dfc-generated"]
+      - ["System.Xml.Xsl.Runtime", "XsltFunctions", False, "SubstringAfter", "(System.String,System.String)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Xml.Xsl.Runtime", "XsltFunctions", False, "SubstringBefore", "(System.String,System.String)", "", "Argument[0]", "ReturnValue", "taint", "dfc-generated"]
+      - ["System.Xml.Xsl.Runtime", "XsltFunctions", False, "SubstringBefore", "(System.String,System.String)", "", "Argument[1]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Xml.Xsl.Runtime", "XsltFunctions", False, "Translate", "(System.String,System.String,System.String)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Xml.Xsl.Runtime", "XsltLibrary", False, "FormatMessage", "(System.String,System.Collections.Generic.IList<System.String>)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Xml.Xsl.Runtime", "XsltLibrary", False, "NumberFormat", "(System.Collections.Generic.IList<System.Xml.XPath.XPathItem>,System.String,System.Double,System.String,System.String,System.Double)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
   - addsTo:
       pack: codeql/csharp-all
@@ -335,6 +328,7 @@ extensions:
       - ["System.Xml.Xsl.Runtime", "XmlQuerySequence<T>", "IndexOf", "(System.Object)", "summary", "df-generated"]
       - ["System.Xml.Xsl.Runtime", "XmlQuerySequence<T>", "IndexOf", "(T)", "summary", "df-generated"]
       - ["System.Xml.Xsl.Runtime", "XmlQuerySequence<T>", "OnItemsChanged", "()", "summary", "df-generated"]
+      - ["System.Xml.Xsl.Runtime", "XmlQuerySequence<T>", "Remove", "(System.Object)", "summary", "df-generated"]
       - ["System.Xml.Xsl.Runtime", "XmlQuerySequence<T>", "Remove", "(T)", "summary", "df-generated"]
       - ["System.Xml.Xsl.Runtime", "XmlQuerySequence<T>", "RemoveAt", "(System.Int32)", "summary", "df-generated"]
       - ["System.Xml.Xsl.Runtime", "XmlQuerySequence<T>", "SortByKeys", "(System.Array)", "summary", "df-generated"]
diff --git a/csharp/ql/lib/ext/generated/System.Xml.Xsl.model.yml b/csharp/ql/lib/ext/generated/System.Xml.Xsl.model.yml
index b64001863fc..936e6a3579f 100644
--- a/csharp/ql/lib/ext/generated/System.Xml.Xsl.model.yml
+++ b/csharp/ql/lib/ext/generated/System.Xml.Xsl.model.yml
@@ -8,7 +8,6 @@ extensions:
       - ["System.Xml.Xsl", "IXsltContextFunction", True, "Invoke", "(System.Xml.Xsl.XsltContext,System.Object[],System.Xml.XPath.XPathNavigator)", "", "Argument[1].Element", "ReturnValue", "taint", "df-generated"]
       - ["System.Xml.Xsl", "IXsltContextFunction", True, "Invoke", "(System.Xml.Xsl.XsltContext,System.Object[],System.Xml.XPath.XPathNavigator)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
       - ["System.Xml.Xsl", "IXsltContextFunction", True, "get_ArgTypes", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Xml.Xsl", "XslCompiledTransform", False, "Load", "(System.Reflection.MethodInfo,System.Byte[],System.Type[])", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Xml.Xsl", "XslTransform", False, "Transform", "(System.Xml.XPath.IXPathNavigable,System.Xml.Xsl.XsltArgumentList)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
       - ["System.Xml.Xsl", "XslTransform", False, "Transform", "(System.Xml.XPath.IXPathNavigable,System.Xml.Xsl.XsltArgumentList)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Xml.Xsl", "XslTransform", False, "Transform", "(System.Xml.XPath.IXPathNavigable,System.Xml.Xsl.XsltArgumentList,System.Xml.XmlResolver)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
@@ -27,7 +26,7 @@ extensions:
       - ["System.Xml.Xsl", "XsltArgumentList", False, "RemoveExtensionObject", "(System.String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Xml.Xsl", "XsltArgumentList", False, "RemoveParam", "(System.String,System.String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Xml.Xsl", "XsltContext", True, "ResolveFunction", "(System.String,System.String,System.Xml.XPath.XPathResultType[])", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Xml.Xsl", "XsltException", False, "XsltException", "(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["System.Xml.Xsl", "XsltException", True, "get_Message", "()", "", "Argument[this].Property[System.Exception.Message]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Xml.Xsl", "XsltException", True, "get_SourceUri", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Xml.Xsl", "XsltMessageEncounteredEventArgs", True, "get_Message", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
   - addsTo:
@@ -41,6 +40,7 @@ extensions:
       - ["System.Xml.Xsl", "IXsltContextVariable", "get_IsLocal", "()", "summary", "df-generated"]
       - ["System.Xml.Xsl", "IXsltContextVariable", "get_IsParam", "()", "summary", "df-generated"]
       - ["System.Xml.Xsl", "IXsltContextVariable", "get_VariableType", "()", "summary", "df-generated"]
+      - ["System.Xml.Xsl", "XslCompiledTransform", "Load", "(System.Reflection.MethodInfo,System.Byte[],System.Type[])", "summary", "df-generated"]
       - ["System.Xml.Xsl", "XslCompiledTransform", "Load", "(System.String)", "summary", "df-generated"]
       - ["System.Xml.Xsl", "XslCompiledTransform", "Load", "(System.String,System.Xml.Xsl.XsltSettings,System.Xml.XmlResolver)", "summary", "df-generated"]
       - ["System.Xml.Xsl", "XslCompiledTransform", "Load", "(System.Type)", "summary", "df-generated"]
@@ -89,6 +89,8 @@ extensions:
       - ["System.Xml.Xsl", "XsltArgumentList", "AddExtensionObject", "(System.String,System.Object)", "summary", "df-generated"]
       - ["System.Xml.Xsl", "XsltArgumentList", "AddParam", "(System.String,System.String,System.Object)", "summary", "df-generated"]
       - ["System.Xml.Xsl", "XsltArgumentList", "Clear", "()", "summary", "df-generated"]
+      - ["System.Xml.Xsl", "XsltArgumentList", "add_XsltMessageEncountered", "(System.Xml.Xsl.XsltMessageEncounteredEventHandler)", "summary", "df-generated"]
+      - ["System.Xml.Xsl", "XsltArgumentList", "remove_XsltMessageEncountered", "(System.Xml.Xsl.XsltMessageEncounteredEventHandler)", "summary", "df-generated"]
       - ["System.Xml.Xsl", "XsltCompileException", "XsltCompileException", "(System.Exception,System.String,System.Int32,System.Int32)", "summary", "df-generated"]
       - ["System.Xml.Xsl", "XsltCompileException", "XsltCompileException", "(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)", "summary", "df-generated"]
       - ["System.Xml.Xsl", "XsltCompileException", "XsltCompileException", "(System.String)", "summary", "df-generated"]
@@ -98,6 +100,7 @@ extensions:
       - ["System.Xml.Xsl", "XsltContext", "ResolveVariable", "(System.String,System.String)", "summary", "df-generated"]
       - ["System.Xml.Xsl", "XsltContext", "XsltContext", "(System.Xml.NameTable)", "summary", "df-generated"]
       - ["System.Xml.Xsl", "XsltContext", "get_Whitespace", "()", "summary", "df-generated"]
+      - ["System.Xml.Xsl", "XsltException", "XsltException", "(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)", "summary", "df-generated"]
       - ["System.Xml.Xsl", "XsltException", "XsltException", "(System.String)", "summary", "df-generated"]
       - ["System.Xml.Xsl", "XsltException", "XsltException", "(System.String,System.Exception)", "summary", "df-generated"]
       - ["System.Xml.Xsl", "XsltException", "get_LineNumber", "()", "summary", "df-generated"]
diff --git a/csharp/ql/lib/ext/generated/System.Xml.model.yml b/csharp/ql/lib/ext/generated/System.Xml.model.yml
index 38f676536bf..8e5cd33c756 100644
--- a/csharp/ql/lib/ext/generated/System.Xml.model.yml
+++ b/csharp/ql/lib/ext/generated/System.Xml.model.yml
@@ -12,58 +12,50 @@ extensions:
       - ["System.Xml", "IXmlBinaryWriterInitializer", True, "SetOutput", "(System.IO.Stream,System.Xml.IXmlDictionary,System.Xml.XmlBinaryWriterSession,System.Boolean)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
       - ["System.Xml", "IXmlDictionary", True, "TryLookup", "(System.Int32,System.Xml.XmlDictionaryString)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Xml", "IXmlDictionary", True, "TryLookup", "(System.String,System.Xml.XmlDictionaryString)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Xml", "IXmlDictionary", True, "TryLookup", "(System.Xml.XmlDictionaryString,System.Xml.XmlDictionaryString)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Xml", "IXmlDictionary", True, "TryLookup", "(System.Xml.XmlDictionaryString,System.Xml.XmlDictionaryString)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Xml", "IXmlNamespaceResolver", True, "GetNamespacesInScope", "(System.Xml.XmlNamespaceScope)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Xml", "IXmlNamespaceResolver", True, "LookupNamespace", "(System.String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Xml", "IXmlNamespaceResolver", True, "LookupNamespace", "(System.String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Xml", "IXmlNamespaceResolver", True, "LookupNamespace", "(System.String)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Xml", "IXmlNamespaceResolver", True, "LookupPrefix", "(System.String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Xml", "IXmlTextWriterInitializer", True, "SetOutput", "(System.IO.Stream,System.Text.Encoding,System.Boolean)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Xml", "IXmlTextWriterInitializer", True, "SetOutput", "(System.IO.Stream,System.Text.Encoding,System.Boolean)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
       - ["System.Xml", "UniqueId", False, "UniqueId", "(System.Char[],System.Int32,System.Int32)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
       - ["System.Xml", "UniqueId", False, "UniqueId", "(System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Xml", "XmlAttribute", True, "get_OwnerElement", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Xml", "XmlAttributeCollection", False, "Append", "(System.Xml.XmlAttribute)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["System.Xml", "XmlAttributeCollection", False, "Append", "(System.Xml.XmlAttribute)", "", "Argument[this]", "Argument[0].Element", "taint", "df-generated"]
-      - ["System.Xml", "XmlAttributeCollection", False, "Append", "(System.Xml.XmlAttribute)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Xml", "XmlAttributeCollection", False, "InsertAfter", "(System.Xml.XmlAttribute,System.Xml.XmlAttribute)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["System.Xml", "XmlAttributeCollection", False, "InsertAfter", "(System.Xml.XmlAttribute,System.Xml.XmlAttribute)", "", "Argument[this]", "Argument[0].Element", "taint", "df-generated"]
-      - ["System.Xml", "XmlAttributeCollection", False, "InsertAfter", "(System.Xml.XmlAttribute,System.Xml.XmlAttribute)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Xml", "XmlAttributeCollection", False, "InsertBefore", "(System.Xml.XmlAttribute,System.Xml.XmlAttribute)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["System.Xml", "XmlAttributeCollection", False, "InsertBefore", "(System.Xml.XmlAttribute,System.Xml.XmlAttribute)", "", "Argument[this]", "Argument[0].Element", "taint", "df-generated"]
-      - ["System.Xml", "XmlAttributeCollection", False, "InsertBefore", "(System.Xml.XmlAttribute,System.Xml.XmlAttribute)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Xml", "XmlAttributeCollection", False, "Prepend", "(System.Xml.XmlAttribute)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["System.Xml", "XmlAttributeCollection", False, "Prepend", "(System.Xml.XmlAttribute)", "", "Argument[this]", "Argument[0].Element", "taint", "df-generated"]
-      - ["System.Xml", "XmlAttributeCollection", False, "Prepend", "(System.Xml.XmlAttribute)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Xml", "XmlAttributeCollection", False, "Remove", "(System.Xml.XmlAttribute)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
+      - ["System.Xml", "XmlAttributeCollection", False, "Append", "(System.Xml.XmlAttribute)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Xml", "XmlAttributeCollection", False, "InsertAfter", "(System.Xml.XmlAttribute,System.Xml.XmlAttribute)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Xml", "XmlAttributeCollection", False, "InsertBefore", "(System.Xml.XmlAttribute,System.Xml.XmlAttribute)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Xml", "XmlAttributeCollection", False, "Prepend", "(System.Xml.XmlAttribute)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Xml", "XmlAttributeCollection", False, "Remove", "(System.Xml.XmlAttribute)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Xml", "XmlAttributeCollection", False, "RemoveAt", "(System.Int32)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Xml", "XmlAttributeCollection", False, "get_ItemOf", "(System.Int32)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Xml", "XmlAttributeCollection", False, "get_ItemOf", "(System.String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Xml", "XmlAttributeCollection", False, "get_ItemOf", "(System.String,System.String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Xml", "XmlBinaryReaderSession", False, "Add", "(System.Int32,System.String)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Xml", "XmlBinaryReaderSession", False, "Add", "(System.Int32,System.String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Xml", "XmlCharacterData", False, "XmlCharacterData", "(System.String,System.Xml.XmlDocument)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Xml", "XmlCharacterData", True, "AppendData", "(System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Xml", "XmlCharacterData", True, "Substring", "(System.Int32,System.Int32)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Xml", "XmlConvert", False, "DecodeName", "(System.String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Xml", "XmlConvert", False, "EncodeLocalName", "(System.String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Xml", "XmlConvert", False, "EncodeName", "(System.String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Xml", "XmlConvert", False, "EncodeNmToken", "(System.String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Xml", "XmlConvert", False, "VerifyNCName", "(System.String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Xml", "XmlConvert", False, "VerifyNMTOKEN", "(System.String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Xml", "XmlConvert", False, "VerifyName", "(System.String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Xml", "XmlConvert", False, "VerifyPublicId", "(System.String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Xml", "XmlConvert", False, "VerifyTOKEN", "(System.String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Xml", "XmlConvert", False, "VerifyWhitespace", "(System.String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Xml", "XmlConvert", False, "VerifyXmlChars", "(System.String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Xml", "XmlBinaryReaderSession", False, "Add", "(System.Int32,System.String)", "", "Argument[1]", "ReturnValue.SyntheticField[System.Xml.XmlDictionaryString._value]", "value", "dfc-generated"]
+      - ["System.Xml", "XmlBinaryReaderSession", False, "Add", "(System.Int32,System.String)", "", "Argument[this]", "ReturnValue.SyntheticField[System.Xml.XmlDictionaryString._dictionary]", "value", "dfc-generated"]
+      - ["System.Xml", "XmlCharacterData", False, "XmlCharacterData", "(System.String,System.Xml.XmlDocument)", "", "Argument[0]", "Argument[this].SyntheticField[System.Xml.XmlCharacterData._data]", "value", "dfc-generated"]
+      - ["System.Xml", "XmlCharacterData", True, "AppendData", "(System.String)", "", "Argument[0]", "Argument[this].SyntheticField[System.Xml.XmlCharacterData._data]", "taint", "dfc-generated"]
+      - ["System.Xml", "XmlCharacterData", True, "Substring", "(System.Int32,System.Int32)", "", "Argument[this].SyntheticField[System.Xml.XmlCharacterData._data]", "ReturnValue", "taint", "dfc-generated"]
+      - ["System.Xml", "XmlConvert", False, "DecodeName", "(System.String)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Xml", "XmlConvert", False, "EncodeLocalName", "(System.String)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Xml", "XmlConvert", False, "EncodeName", "(System.String)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Xml", "XmlConvert", False, "EncodeNmToken", "(System.String)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Xml", "XmlConvert", False, "VerifyNCName", "(System.String)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Xml", "XmlConvert", False, "VerifyNMTOKEN", "(System.String)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Xml", "XmlConvert", False, "VerifyName", "(System.String)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Xml", "XmlConvert", False, "VerifyPublicId", "(System.String)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Xml", "XmlConvert", False, "VerifyTOKEN", "(System.String)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Xml", "XmlConvert", False, "VerifyWhitespace", "(System.String)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Xml", "XmlConvert", False, "VerifyXmlChars", "(System.String)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Xml", "XmlDataDocument", False, "GetElementFromRow", "(System.Data.DataRow)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["System.Xml", "XmlDataDocument", False, "GetRowFromElement", "(System.Xml.XmlElement)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["System.Xml", "XmlDataDocument", False, "XmlDataDocument", "(System.Data.DataSet)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Xml", "XmlDataDocument", False, "get_DataSet", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Xml", "XmlDataDocument", False, "XmlDataDocument", "(System.Data.DataSet)", "", "Argument[0]", "Argument[this].SyntheticField[System.Xml.XmlDataDocument._dataSet]", "value", "dfc-generated"]
+      - ["System.Xml", "XmlDataDocument", False, "get_DataSet", "()", "", "Argument[this].SyntheticField[System.Xml.XmlDataDocument._dataSet]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Xml", "XmlDataDocument", True, "CreateNavigator", "(System.Xml.XmlNode)", "", "Argument[this]", "ReturnValue.SyntheticField[System.Xml.DataDocumentXPathNavigator._doc]", "value", "dfc-generated"]
       - ["System.Xml", "XmlDeclaration", False, "XmlDeclaration", "(System.String,System.String,System.String,System.Xml.XmlDocument)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Xml", "XmlDeclaration", False, "XmlDeclaration", "(System.String,System.String,System.String,System.Xml.XmlDocument)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
       - ["System.Xml", "XmlDeclaration", False, "XmlDeclaration", "(System.String,System.String,System.String,System.Xml.XmlDocument)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Xml", "XmlDictionary", True, "Add", "(System.String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Xml", "XmlDictionary", True, "Add", "(System.String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Xml", "XmlDictionary", True, "Add", "(System.String)", "", "Argument[0]", "ReturnValue.SyntheticField[System.Xml.XmlDictionaryString._value]", "value", "dfc-generated"]
+      - ["System.Xml", "XmlDictionary", True, "Add", "(System.String)", "", "Argument[this]", "ReturnValue.SyntheticField[System.Xml.XmlDictionaryString._dictionary]", "value", "dfc-generated"]
       - ["System.Xml", "XmlDictionaryReader", False, "CreateBinaryReader", "(System.Byte[],System.Int32,System.Int32,System.Xml.IXmlDictionary,System.Xml.XmlDictionaryReaderQuotas)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
       - ["System.Xml", "XmlDictionaryReader", False, "CreateBinaryReader", "(System.Byte[],System.Int32,System.Int32,System.Xml.IXmlDictionary,System.Xml.XmlDictionaryReaderQuotas)", "", "Argument[3]", "ReturnValue", "taint", "df-generated"]
       - ["System.Xml", "XmlDictionaryReader", False, "CreateBinaryReader", "(System.Byte[],System.Int32,System.Int32,System.Xml.IXmlDictionary,System.Xml.XmlDictionaryReaderQuotas,System.Xml.XmlBinaryReaderSession)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
@@ -77,26 +69,22 @@ extensions:
       - ["System.Xml", "XmlDictionaryReader", False, "CreateBinaryReader", "(System.IO.Stream,System.Xml.IXmlDictionary,System.Xml.XmlDictionaryReaderQuotas,System.Xml.XmlBinaryReaderSession)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
       - ["System.Xml", "XmlDictionaryReader", False, "CreateBinaryReader", "(System.IO.Stream,System.Xml.IXmlDictionary,System.Xml.XmlDictionaryReaderQuotas,System.Xml.XmlBinaryReaderSession)", "", "Argument[3]", "ReturnValue", "taint", "df-generated"]
       - ["System.Xml", "XmlDictionaryReader", False, "CreateBinaryReader", "(System.IO.Stream,System.Xml.XmlDictionaryReaderQuotas)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Xml", "XmlDictionaryReader", False, "CreateDictionaryReader", "(System.Xml.XmlReader)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Xml", "XmlDictionaryReader", False, "CreateTextReader", "(System.Byte[],System.Int32,System.Int32,System.Xml.XmlDictionaryReaderQuotas)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["System.Xml", "XmlDictionaryReader", False, "CreateTextReader", "(System.Byte[],System.Xml.XmlDictionaryReaderQuotas)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
+      - ["System.Xml", "XmlDictionaryReader", False, "CreateDictionaryReader", "(System.Xml.XmlReader)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Xml", "XmlDictionaryReader", False, "ReadContentAsString", "(System.Int32)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Xml", "XmlDictionaryReader", False, "ReadString", "(System.Int32)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Xml", "XmlDictionaryReader", True, "GetAttribute", "(System.Xml.XmlDictionaryString,System.Xml.XmlDictionaryString)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Xml", "XmlDictionaryReader", True, "GetNonAtomizedNames", "(System.String,System.String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Xml", "XmlDictionaryReader", True, "ReadContentAsQualifiedName", "(System.String,System.String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Xml", "XmlDictionaryReader", True, "ReadContentAsString", "(System.String[],System.Int32)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["System.Xml", "XmlDictionaryReader", True, "ReadContentAsString", "(System.String[],System.Int32)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Xml", "XmlDictionaryReader", True, "ReadContentAsString", "(System.Xml.XmlDictionaryString[],System.Int32)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["System.Xml", "XmlDictionaryReader", True, "ReadContentAsString", "(System.Xml.XmlDictionaryString[],System.Int32)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Xml", "XmlDictionaryReader", True, "ReadContentAsString", "(System.String[],System.Int32)", "", "Argument[0].Element", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Xml", "XmlDictionaryReader", True, "ReadContentAsString", "(System.Xml.XmlDictionaryString[],System.Int32)", "", "Argument[0].Element.Property[System.Xml.XmlDictionaryString.Value]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Xml", "XmlDictionaryReader", True, "ReadContentAsUniqueId", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Xml", "XmlDictionaryReader", True, "ReadElementContentAsUniqueId", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Xml", "XmlDictionaryReader", True, "get_Quotas", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Xml", "XmlDictionaryString", False, "ToString", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Xml", "XmlDictionaryString", False, "XmlDictionaryString", "(System.Xml.IXmlDictionary,System.String,System.Int32)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Xml", "XmlDictionaryString", False, "XmlDictionaryString", "(System.Xml.IXmlDictionary,System.String,System.Int32)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Xml", "XmlDictionaryString", False, "get_Dictionary", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Xml", "XmlDictionaryString", False, "get_Value", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Xml", "XmlDictionaryString", False, "ToString", "()", "", "Argument[this].SyntheticField[System.Xml.XmlDictionaryString._value]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Xml", "XmlDictionaryString", False, "XmlDictionaryString", "(System.Xml.IXmlDictionary,System.String,System.Int32)", "", "Argument[0]", "Argument[this].SyntheticField[System.Xml.XmlDictionaryString._dictionary]", "value", "dfc-generated"]
+      - ["System.Xml", "XmlDictionaryString", False, "XmlDictionaryString", "(System.Xml.IXmlDictionary,System.String,System.Int32)", "", "Argument[1]", "Argument[this].SyntheticField[System.Xml.XmlDictionaryString._value]", "value", "dfc-generated"]
+      - ["System.Xml", "XmlDictionaryString", False, "get_Dictionary", "()", "", "Argument[this].SyntheticField[System.Xml.XmlDictionaryString._dictionary]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Xml", "XmlDictionaryString", False, "get_Value", "()", "", "Argument[this].SyntheticField[System.Xml.XmlDictionaryString._value]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Xml", "XmlDictionaryWriter", False, "CreateBinaryWriter", "(System.IO.Stream)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["System.Xml", "XmlDictionaryWriter", False, "CreateBinaryWriter", "(System.IO.Stream,System.Xml.IXmlDictionary)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["System.Xml", "XmlDictionaryWriter", False, "CreateBinaryWriter", "(System.IO.Stream,System.Xml.IXmlDictionary)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
@@ -106,29 +94,69 @@ extensions:
       - ["System.Xml", "XmlDictionaryWriter", False, "CreateBinaryWriter", "(System.IO.Stream,System.Xml.IXmlDictionary,System.Xml.XmlBinaryWriterSession,System.Boolean)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["System.Xml", "XmlDictionaryWriter", False, "CreateBinaryWriter", "(System.IO.Stream,System.Xml.IXmlDictionary,System.Xml.XmlBinaryWriterSession,System.Boolean)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
       - ["System.Xml", "XmlDictionaryWriter", False, "CreateBinaryWriter", "(System.IO.Stream,System.Xml.IXmlDictionary,System.Xml.XmlBinaryWriterSession,System.Boolean)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Xml", "XmlDictionaryWriter", False, "CreateDictionaryWriter", "(System.Xml.XmlWriter)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Xml", "XmlDictionaryWriter", False, "CreateDictionaryWriter", "(System.Xml.XmlWriter)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Xml", "XmlDictionaryWriter", False, "WriteAttributeString", "(System.String,System.Xml.XmlDictionaryString,System.Xml.XmlDictionaryString,System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Xml", "XmlDictionaryWriter", False, "WriteAttributeString", "(System.String,System.Xml.XmlDictionaryString,System.Xml.XmlDictionaryString,System.String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
       - ["System.Xml", "XmlDictionaryWriter", False, "WriteAttributeString", "(System.String,System.Xml.XmlDictionaryString,System.Xml.XmlDictionaryString,System.String)", "", "Argument[3]", "Argument[this]", "taint", "df-generated"]
       - ["System.Xml", "XmlDictionaryWriter", False, "WriteAttributeString", "(System.Xml.XmlDictionaryString,System.Xml.XmlDictionaryString,System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Xml", "XmlDictionaryWriter", False, "WriteAttributeString", "(System.Xml.XmlDictionaryString,System.Xml.XmlDictionaryString,System.String)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
+      - ["System.Xml", "XmlDictionaryWriter", False, "WriteElementString", "(System.String,System.Xml.XmlDictionaryString,System.Xml.XmlDictionaryString,System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["System.Xml", "XmlDictionaryWriter", False, "WriteElementString", "(System.String,System.Xml.XmlDictionaryString,System.Xml.XmlDictionaryString,System.String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
       - ["System.Xml", "XmlDictionaryWriter", False, "WriteElementString", "(System.String,System.Xml.XmlDictionaryString,System.Xml.XmlDictionaryString,System.String)", "", "Argument[3]", "Argument[this]", "taint", "df-generated"]
+      - ["System.Xml", "XmlDictionaryWriter", False, "WriteElementString", "(System.Xml.XmlDictionaryString,System.Xml.XmlDictionaryString,System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Xml", "XmlDictionaryWriter", False, "WriteElementString", "(System.Xml.XmlDictionaryString,System.Xml.XmlDictionaryString,System.String)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
       - ["System.Xml", "XmlDictionaryWriter", False, "WriteStartAttribute", "(System.Xml.XmlDictionaryString,System.Xml.XmlDictionaryString)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["System.Xml", "XmlDictionaryWriter", False, "WriteStartElement", "(System.Xml.XmlDictionaryString,System.Xml.XmlDictionaryString)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["System.Xml", "XmlDictionaryWriter", True, "WriteArray", "(System.String,System.String,System.String,System.Boolean[],System.Int32,System.Int32)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["System.Xml", "XmlDictionaryWriter", True, "WriteArray", "(System.String,System.String,System.String,System.Boolean[],System.Int32,System.Int32)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["System.Xml", "XmlDictionaryWriter", True, "WriteArray", "(System.String,System.String,System.String,System.DateTime[],System.Int32,System.Int32)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["System.Xml", "XmlDictionaryWriter", True, "WriteArray", "(System.String,System.String,System.String,System.DateTime[],System.Int32,System.Int32)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["System.Xml", "XmlDictionaryWriter", True, "WriteArray", "(System.String,System.String,System.String,System.Decimal[],System.Int32,System.Int32)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["System.Xml", "XmlDictionaryWriter", True, "WriteArray", "(System.String,System.String,System.String,System.Decimal[],System.Int32,System.Int32)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["System.Xml", "XmlDictionaryWriter", True, "WriteArray", "(System.String,System.String,System.String,System.Double[],System.Int32,System.Int32)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["System.Xml", "XmlDictionaryWriter", True, "WriteArray", "(System.String,System.String,System.String,System.Double[],System.Int32,System.Int32)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["System.Xml", "XmlDictionaryWriter", True, "WriteArray", "(System.String,System.String,System.String,System.Guid[],System.Int32,System.Int32)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["System.Xml", "XmlDictionaryWriter", True, "WriteArray", "(System.String,System.String,System.String,System.Guid[],System.Int32,System.Int32)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["System.Xml", "XmlDictionaryWriter", True, "WriteArray", "(System.String,System.String,System.String,System.Int16[],System.Int32,System.Int32)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["System.Xml", "XmlDictionaryWriter", True, "WriteArray", "(System.String,System.String,System.String,System.Int16[],System.Int32,System.Int32)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["System.Xml", "XmlDictionaryWriter", True, "WriteArray", "(System.String,System.String,System.String,System.Int32[],System.Int32,System.Int32)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["System.Xml", "XmlDictionaryWriter", True, "WriteArray", "(System.String,System.String,System.String,System.Int32[],System.Int32,System.Int32)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["System.Xml", "XmlDictionaryWriter", True, "WriteArray", "(System.String,System.String,System.String,System.Int64[],System.Int32,System.Int32)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["System.Xml", "XmlDictionaryWriter", True, "WriteArray", "(System.String,System.String,System.String,System.Int64[],System.Int32,System.Int32)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["System.Xml", "XmlDictionaryWriter", True, "WriteArray", "(System.String,System.String,System.String,System.Single[],System.Int32,System.Int32)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["System.Xml", "XmlDictionaryWriter", True, "WriteArray", "(System.String,System.String,System.String,System.Single[],System.Int32,System.Int32)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["System.Xml", "XmlDictionaryWriter", True, "WriteArray", "(System.String,System.String,System.String,System.TimeSpan[],System.Int32,System.Int32)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["System.Xml", "XmlDictionaryWriter", True, "WriteArray", "(System.String,System.String,System.String,System.TimeSpan[],System.Int32,System.Int32)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["System.Xml", "XmlDictionaryWriter", True, "WriteArray", "(System.String,System.Xml.XmlDictionaryString,System.Xml.XmlDictionaryString,System.Boolean[],System.Int32,System.Int32)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["System.Xml", "XmlDictionaryWriter", True, "WriteArray", "(System.String,System.Xml.XmlDictionaryString,System.Xml.XmlDictionaryString,System.Boolean[],System.Int32,System.Int32)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["System.Xml", "XmlDictionaryWriter", True, "WriteArray", "(System.String,System.Xml.XmlDictionaryString,System.Xml.XmlDictionaryString,System.DateTime[],System.Int32,System.Int32)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["System.Xml", "XmlDictionaryWriter", True, "WriteArray", "(System.String,System.Xml.XmlDictionaryString,System.Xml.XmlDictionaryString,System.DateTime[],System.Int32,System.Int32)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["System.Xml", "XmlDictionaryWriter", True, "WriteArray", "(System.String,System.Xml.XmlDictionaryString,System.Xml.XmlDictionaryString,System.Decimal[],System.Int32,System.Int32)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["System.Xml", "XmlDictionaryWriter", True, "WriteArray", "(System.String,System.Xml.XmlDictionaryString,System.Xml.XmlDictionaryString,System.Decimal[],System.Int32,System.Int32)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["System.Xml", "XmlDictionaryWriter", True, "WriteArray", "(System.String,System.Xml.XmlDictionaryString,System.Xml.XmlDictionaryString,System.Double[],System.Int32,System.Int32)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["System.Xml", "XmlDictionaryWriter", True, "WriteArray", "(System.String,System.Xml.XmlDictionaryString,System.Xml.XmlDictionaryString,System.Double[],System.Int32,System.Int32)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["System.Xml", "XmlDictionaryWriter", True, "WriteArray", "(System.String,System.Xml.XmlDictionaryString,System.Xml.XmlDictionaryString,System.Guid[],System.Int32,System.Int32)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["System.Xml", "XmlDictionaryWriter", True, "WriteArray", "(System.String,System.Xml.XmlDictionaryString,System.Xml.XmlDictionaryString,System.Guid[],System.Int32,System.Int32)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["System.Xml", "XmlDictionaryWriter", True, "WriteArray", "(System.String,System.Xml.XmlDictionaryString,System.Xml.XmlDictionaryString,System.Int16[],System.Int32,System.Int32)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["System.Xml", "XmlDictionaryWriter", True, "WriteArray", "(System.String,System.Xml.XmlDictionaryString,System.Xml.XmlDictionaryString,System.Int16[],System.Int32,System.Int32)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["System.Xml", "XmlDictionaryWriter", True, "WriteArray", "(System.String,System.Xml.XmlDictionaryString,System.Xml.XmlDictionaryString,System.Int32[],System.Int32,System.Int32)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["System.Xml", "XmlDictionaryWriter", True, "WriteArray", "(System.String,System.Xml.XmlDictionaryString,System.Xml.XmlDictionaryString,System.Int32[],System.Int32,System.Int32)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["System.Xml", "XmlDictionaryWriter", True, "WriteArray", "(System.String,System.Xml.XmlDictionaryString,System.Xml.XmlDictionaryString,System.Int64[],System.Int32,System.Int32)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["System.Xml", "XmlDictionaryWriter", True, "WriteArray", "(System.String,System.Xml.XmlDictionaryString,System.Xml.XmlDictionaryString,System.Int64[],System.Int32,System.Int32)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["System.Xml", "XmlDictionaryWriter", True, "WriteArray", "(System.String,System.Xml.XmlDictionaryString,System.Xml.XmlDictionaryString,System.Single[],System.Int32,System.Int32)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["System.Xml", "XmlDictionaryWriter", True, "WriteArray", "(System.String,System.Xml.XmlDictionaryString,System.Xml.XmlDictionaryString,System.Single[],System.Int32,System.Int32)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["System.Xml", "XmlDictionaryWriter", True, "WriteArray", "(System.String,System.Xml.XmlDictionaryString,System.Xml.XmlDictionaryString,System.TimeSpan[],System.Int32,System.Int32)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["System.Xml", "XmlDictionaryWriter", True, "WriteArray", "(System.String,System.Xml.XmlDictionaryString,System.Xml.XmlDictionaryString,System.TimeSpan[],System.Int32,System.Int32)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
       - ["System.Xml", "XmlDictionaryWriter", True, "WriteNode", "(System.Xml.XmlDictionaryReader,System.Boolean)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Xml", "XmlDictionaryWriter", True, "WriteQualifiedName", "(System.Xml.XmlDictionaryString,System.Xml.XmlDictionaryString)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Xml", "XmlDictionaryWriter", True, "WriteQualifiedName", "(System.Xml.XmlDictionaryString,System.Xml.XmlDictionaryString)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["System.Xml", "XmlDictionaryWriter", True, "WriteStartAttribute", "(System.String,System.Xml.XmlDictionaryString,System.Xml.XmlDictionaryString)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Xml", "XmlDictionaryWriter", True, "WriteStartAttribute", "(System.String,System.Xml.XmlDictionaryString,System.Xml.XmlDictionaryString)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["System.Xml", "XmlDictionaryWriter", True, "WriteStartElement", "(System.String,System.Xml.XmlDictionaryString,System.Xml.XmlDictionaryString)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["System.Xml", "XmlDictionaryWriter", True, "WriteStartElement", "(System.String,System.Xml.XmlDictionaryString,System.Xml.XmlDictionaryString)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
       - ["System.Xml", "XmlDictionaryWriter", True, "WriteString", "(System.Xml.XmlDictionaryString)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Xml", "XmlDictionaryWriter", True, "WriteTextNode", "(System.Xml.XmlDictionaryReader,System.Boolean)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Xml", "XmlDictionaryWriter", True, "WriteValue", "(System.Xml.XmlDictionaryString)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Xml", "XmlDictionaryWriter", True, "WriteXmlAttribute", "(System.String,System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Xml", "XmlDictionaryWriter", True, "WriteXmlAttribute", "(System.String,System.String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Xml", "XmlDictionaryWriter", True, "WriteXmlAttribute", "(System.Xml.XmlDictionaryString,System.Xml.XmlDictionaryString)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Xml", "XmlDictionaryWriter", True, "WriteXmlAttribute", "(System.Xml.XmlDictionaryString,System.Xml.XmlDictionaryString)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Xml", "XmlDictionaryWriter", True, "WriteXmlnsAttribute", "(System.String,System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Xml", "XmlDictionaryWriter", True, "WriteXmlnsAttribute", "(System.String,System.String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Xml", "XmlDictionaryWriter", True, "WriteXmlnsAttribute", "(System.String,System.Xml.XmlDictionaryString)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Xml", "XmlDictionaryWriter", True, "WriteXmlnsAttribute", "(System.String,System.Xml.XmlDictionaryString)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
       - ["System.Xml", "XmlDocument", False, "CreateAttribute", "(System.String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["System.Xml", "XmlDocument", False, "CreateAttribute", "(System.String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Xml", "XmlDocument", False, "CreateAttribute", "(System.String,System.String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
@@ -149,22 +177,18 @@ extensions:
       - ["System.Xml", "XmlDocument", True, "CreateAttribute", "(System.String,System.String,System.String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Xml", "XmlDocument", True, "CreateCDataSection", "(System.String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Xml", "XmlDocument", True, "CreateComment", "(System.String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Xml", "XmlDocument", True, "CreateDefaultAttribute", "(System.String,System.String,System.String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Xml", "XmlDocument", True, "CreateDefaultAttribute", "(System.String,System.String,System.String)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Xml", "XmlDocument", True, "CreateDefaultAttribute", "(System.String,System.String,System.String)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Xml", "XmlDocument", True, "CreateDefaultAttribute", "(System.String,System.String,System.String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Xml", "XmlDocument", True, "CreateDocumentFragment", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Xml", "XmlDocument", True, "CreateDocumentType", "(System.String,System.String,System.String,System.String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Xml", "XmlDocument", True, "CreateDocumentType", "(System.String,System.String,System.String,System.String)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Xml", "XmlDocument", True, "CreateDocumentType", "(System.String,System.String,System.String,System.String)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Xml", "XmlDocument", True, "CreateDocumentType", "(System.String,System.String,System.String,System.String)", "", "Argument[3]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Xml", "XmlDocument", True, "CreateDocumentType", "(System.String,System.String,System.String,System.String)", "", "Argument[1]", "ReturnValue.SyntheticField[System.Xml.XmlDocumentType._publicId]", "value", "dfc-generated"]
+      - ["System.Xml", "XmlDocument", True, "CreateDocumentType", "(System.String,System.String,System.String,System.String)", "", "Argument[2]", "ReturnValue.SyntheticField[System.Xml.XmlDocumentType._systemId]", "value", "dfc-generated"]
+      - ["System.Xml", "XmlDocument", True, "CreateDocumentType", "(System.String,System.String,System.String,System.String)", "", "Argument[3]", "ReturnValue.SyntheticField[System.Xml.XmlDocumentType._internalSubset]", "value", "dfc-generated"]
       - ["System.Xml", "XmlDocument", True, "CreateElement", "(System.String,System.String,System.String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["System.Xml", "XmlDocument", True, "CreateElement", "(System.String,System.String,System.String)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
       - ["System.Xml", "XmlDocument", True, "CreateElement", "(System.String,System.String,System.String)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
       - ["System.Xml", "XmlDocument", True, "CreateElement", "(System.String,System.String,System.String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Xml", "XmlDocument", True, "CreateEntityReference", "(System.String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Xml", "XmlDocument", True, "CreateNavigator", "(System.Xml.XmlNode)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["System.Xml", "XmlDocument", True, "CreateNavigator", "(System.Xml.XmlNode)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Xml", "XmlDocument", True, "CreateNavigator", "()", "", "Argument[this]", "ReturnValue.SyntheticField[System.Xml.DocumentXPathNavigator._source]", "value", "dfc-generated"]
+      - ["System.Xml", "XmlDocument", True, "CreateNavigator", "(System.Xml.XmlNode)", "", "Argument[0]", "ReturnValue.SyntheticField[System.Xml.DocumentXPathNavigator._source]", "value", "dfc-generated"]
+      - ["System.Xml", "XmlDocument", True, "CreateNavigator", "(System.Xml.XmlNode)", "", "Argument[this]", "ReturnValue.SyntheticField[System.Xml.DocumentXPathNavigator._document]", "value", "dfc-generated"]
       - ["System.Xml", "XmlDocument", True, "CreateNode", "(System.String,System.String,System.String)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
       - ["System.Xml", "XmlDocument", True, "CreateNode", "(System.String,System.String,System.String)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
       - ["System.Xml", "XmlDocument", True, "CreateNode", "(System.String,System.String,System.String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
@@ -175,15 +199,13 @@ extensions:
       - ["System.Xml", "XmlDocument", True, "CreateNode", "(System.Xml.XmlNodeType,System.String,System.String,System.String)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
       - ["System.Xml", "XmlDocument", True, "CreateNode", "(System.Xml.XmlNodeType,System.String,System.String,System.String)", "", "Argument[3]", "ReturnValue", "taint", "df-generated"]
       - ["System.Xml", "XmlDocument", True, "CreateNode", "(System.Xml.XmlNodeType,System.String,System.String,System.String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Xml", "XmlDocument", True, "CreateProcessingInstruction", "(System.String,System.String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Xml", "XmlDocument", True, "CreateProcessingInstruction", "(System.String,System.String)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Xml", "XmlDocument", True, "CreateProcessingInstruction", "(System.String,System.String)", "", "Argument[0]", "ReturnValue.SyntheticField[System.Xml.XmlProcessingInstruction._target]", "value", "dfc-generated"]
       - ["System.Xml", "XmlDocument", True, "CreateSignificantWhitespace", "(System.String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Xml", "XmlDocument", True, "CreateTextNode", "(System.String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Xml", "XmlDocument", True, "CreateWhitespace", "(System.String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Xml", "XmlDocument", True, "CreateXmlDeclaration", "(System.String,System.String,System.String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["System.Xml", "XmlDocument", True, "CreateXmlDeclaration", "(System.String,System.String,System.String)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
       - ["System.Xml", "XmlDocument", True, "CreateXmlDeclaration", "(System.String,System.String,System.String)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Xml", "XmlDocument", True, "GetElementById", "(System.String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Xml", "XmlDocument", True, "GetElementsByTagName", "(System.String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["System.Xml", "XmlDocument", True, "GetElementsByTagName", "(System.String,System.String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["System.Xml", "XmlDocument", True, "GetElementsByTagName", "(System.String,System.String)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
@@ -193,13 +215,12 @@ extensions:
       - ["System.Xml", "XmlDocument", True, "get_DocumentType", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Xml", "XmlDocument", True, "set_XmlResolver", "(System.Xml.XmlResolver)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Xml", "XmlDocumentFragment", False, "XmlDocumentFragment", "(System.Xml.XmlDocument)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["System.Xml", "XmlDocumentType", False, "XmlDocumentType", "(System.String,System.String,System.String,System.String,System.Xml.XmlDocument)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Xml", "XmlDocumentType", False, "XmlDocumentType", "(System.String,System.String,System.String,System.String,System.Xml.XmlDocument)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Xml", "XmlDocumentType", False, "XmlDocumentType", "(System.String,System.String,System.String,System.String,System.Xml.XmlDocument)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Xml", "XmlDocumentType", False, "XmlDocumentType", "(System.String,System.String,System.String,System.String,System.Xml.XmlDocument)", "", "Argument[3]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Xml", "XmlDocumentType", False, "get_InternalSubset", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Xml", "XmlDocumentType", False, "get_PublicId", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Xml", "XmlDocumentType", False, "get_SystemId", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Xml", "XmlDocumentType", False, "XmlDocumentType", "(System.String,System.String,System.String,System.String,System.Xml.XmlDocument)", "", "Argument[1]", "Argument[this].SyntheticField[System.Xml.XmlDocumentType._publicId]", "value", "dfc-generated"]
+      - ["System.Xml", "XmlDocumentType", False, "XmlDocumentType", "(System.String,System.String,System.String,System.String,System.Xml.XmlDocument)", "", "Argument[2]", "Argument[this].SyntheticField[System.Xml.XmlDocumentType._systemId]", "value", "dfc-generated"]
+      - ["System.Xml", "XmlDocumentType", False, "XmlDocumentType", "(System.String,System.String,System.String,System.String,System.Xml.XmlDocument)", "", "Argument[3]", "Argument[this].SyntheticField[System.Xml.XmlDocumentType._internalSubset]", "value", "dfc-generated"]
+      - ["System.Xml", "XmlDocumentType", False, "get_InternalSubset", "()", "", "Argument[this].SyntheticField[System.Xml.XmlDocumentType._internalSubset]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Xml", "XmlDocumentType", False, "get_PublicId", "()", "", "Argument[this].SyntheticField[System.Xml.XmlDocumentType._publicId]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Xml", "XmlDocumentType", False, "get_SystemId", "()", "", "Argument[this].SyntheticField[System.Xml.XmlDocumentType._systemId]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Xml", "XmlElement", True, "GetAttribute", "(System.String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Xml", "XmlElement", True, "GetAttribute", "(System.String,System.String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Xml", "XmlElement", True, "GetAttributeNode", "(System.String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
@@ -209,37 +230,32 @@ extensions:
       - ["System.Xml", "XmlElement", True, "GetElementsByTagName", "(System.String,System.String)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
       - ["System.Xml", "XmlElement", True, "RemoveAttributeAt", "(System.Int32)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Xml", "XmlElement", True, "RemoveAttributeNode", "(System.String,System.String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Xml", "XmlElement", True, "RemoveAttributeNode", "(System.Xml.XmlAttribute)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["System.Xml", "XmlElement", True, "SetAttribute", "(System.String,System.String,System.String)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Xml", "XmlElement", True, "RemoveAttributeNode", "(System.Xml.XmlAttribute)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Xml", "XmlElement", True, "SetAttribute", "(System.String,System.String,System.String)", "", "Argument[2]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Xml", "XmlElement", True, "SetAttributeNode", "(System.String,System.String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["System.Xml", "XmlElement", True, "SetAttributeNode", "(System.String,System.String)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
       - ["System.Xml", "XmlElement", True, "SetAttributeNode", "(System.String,System.String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Xml", "XmlElement", True, "SetAttributeNode", "(System.Xml.XmlAttribute)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["System.Xml", "XmlElement", True, "SetAttributeNode", "(System.Xml.XmlAttribute)", "", "Argument[this]", "Argument[0].Element", "taint", "df-generated"]
-      - ["System.Xml", "XmlElement", True, "SetAttributeNode", "(System.Xml.XmlAttribute)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Xml", "XmlElement", True, "SetAttributeNode", "(System.Xml.XmlAttribute)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Xml", "XmlEntity", False, "get_NotationName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Xml", "XmlEntity", False, "get_PublicId", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Xml", "XmlEntity", False, "get_SystemId", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Xml", "XmlEntityReference", False, "XmlEntityReference", "(System.String,System.Xml.XmlDocument)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Xml", "XmlException", False, "XmlException", "(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Xml", "XmlException", False, "get_SourceUri", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Xml", "XmlException", False, "XmlException", "(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)", "", "Argument[0].Element.Property[System.Runtime.Serialization.SerializationEntry.Value]", "Argument[this].SyntheticField[System.Xml.XmlException._sourceUri]", "value", "dfc-generated"]
+      - ["System.Xml", "XmlException", False, "get_SourceUri", "()", "", "Argument[this].SyntheticField[System.Xml.XmlException._sourceUri]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Xml", "XmlException", True, "get_Message", "()", "", "Argument[this].Property[System.Exception.Message]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Xml", "XmlImplementation", False, "XmlImplementation", "(System.Xml.XmlNameTable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Xml", "XmlImplementation", True, "CreateDocument", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Xml", "XmlNameTable", True, "Add", "(System.Char[],System.Int32,System.Int32)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["System.Xml", "XmlNameTable", True, "Add", "(System.Char[],System.Int32,System.Int32)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Xml", "XmlNameTable", True, "Add", "(System.String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Xml", "XmlNameTable", True, "Add", "(System.String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Xml", "XmlNameTable", True, "Add", "(System.Char[],System.Int32,System.Int32)", "", "Argument[0].Element", "ReturnValue", "taint", "dfc-generated"]
+      - ["System.Xml", "XmlNameTable", True, "Add", "(System.String)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Xml", "XmlNameTable", True, "Get", "(System.Char[],System.Int32,System.Int32)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Xml", "XmlNameTable", True, "Get", "(System.String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Xml", "XmlNamedNodeMap", True, "Item", "(System.Int32)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Xml", "XmlNamedNodeMap", True, "RemoveNamedItem", "(System.String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Xml", "XmlNamedNodeMap", True, "RemoveNamedItem", "(System.String,System.String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Xml", "XmlNamedNodeMap", True, "SetNamedItem", "(System.Xml.XmlNode)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["System.Xml", "XmlNamedNodeMap", True, "SetNamedItem", "(System.Xml.XmlNode)", "", "Argument[this]", "Argument[0].Element", "taint", "df-generated"]
-      - ["System.Xml", "XmlNamedNodeMap", True, "SetNamedItem", "(System.Xml.XmlNode)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Xml", "XmlNamespaceManager", False, "XmlNamespaceManager", "(System.Xml.XmlNameTable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["System.Xml", "XmlNamedNodeMap", True, "SetNamedItem", "(System.Xml.XmlNode)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Xml", "XmlNamespaceManager", False, "XmlNamespaceManager", "(System.Xml.XmlNameTable)", "", "Argument[0]", "Argument[this].SyntheticField[System.Xml.XmlNamespaceManager._nameTable]", "value", "dfc-generated"]
       - ["System.Xml", "XmlNamespaceManager", True, "get_DefaultNamespace", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Xml", "XmlNamespaceManager", True, "get_NameTable", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Xml", "XmlNamespaceManager", True, "get_NameTable", "()", "", "Argument[this].SyntheticField[System.Xml.XmlNamespaceManager._nameTable]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Xml", "XmlNode", True, "AppendChild", "(System.Xml.XmlNode)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
       - ["System.Xml", "XmlNode", True, "AppendChild", "(System.Xml.XmlNode)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
       - ["System.Xml", "XmlNode", True, "AppendChild", "(System.Xml.XmlNode)", "", "Argument[this]", "Argument[0].Element", "taint", "df-generated"]
@@ -268,8 +284,7 @@ extensions:
       - ["System.Xml", "XmlNode", True, "PrependChild", "(System.Xml.XmlNode)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
       - ["System.Xml", "XmlNode", True, "PrependChild", "(System.Xml.XmlNode)", "", "Argument[this]", "Argument[0].Element", "taint", "df-generated"]
       - ["System.Xml", "XmlNode", True, "PrependChild", "(System.Xml.XmlNode)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Xml", "XmlNode", True, "RemoveChild", "(System.Xml.XmlNode)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["System.Xml", "XmlNode", True, "RemoveChild", "(System.Xml.XmlNode)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
+      - ["System.Xml", "XmlNode", True, "RemoveChild", "(System.Xml.XmlNode)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Xml", "XmlNode", True, "ReplaceChild", "(System.Xml.XmlNode,System.Xml.XmlNode)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
       - ["System.Xml", "XmlNode", True, "ReplaceChild", "(System.Xml.XmlNode,System.Xml.XmlNode)", "", "Argument[1].Element", "Argument[0].Element", "taint", "df-generated"]
       - ["System.Xml", "XmlNode", True, "ReplaceChild", "(System.Xml.XmlNode,System.Xml.XmlNode)", "", "Argument[1].Element", "Argument[this]", "taint", "df-generated"]
@@ -279,19 +294,20 @@ extensions:
       - ["System.Xml", "XmlNode", True, "WriteTo", "(System.Xml.XmlWriter)", "", "Argument[this]", "Argument[0]", "taint", "df-generated"]
       - ["System.Xml", "XmlNode", True, "get_Item", "(System.String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Xml", "XmlNode", True, "get_Item", "(System.String,System.String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Xml", "XmlNodeChangedEventArgs", False, "XmlNodeChangedEventArgs", "(System.Xml.XmlNode,System.Xml.XmlNode,System.Xml.XmlNode,System.String,System.String,System.Xml.XmlNodeChangedAction)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["System.Xml", "XmlNodeChangedEventArgs", False, "XmlNodeChangedEventArgs", "(System.Xml.XmlNode,System.Xml.XmlNode,System.Xml.XmlNode,System.String,System.String,System.Xml.XmlNodeChangedAction)", "", "Argument[1].Element", "Argument[this]", "taint", "df-generated"]
-      - ["System.Xml", "XmlNodeChangedEventArgs", False, "XmlNodeChangedEventArgs", "(System.Xml.XmlNode,System.Xml.XmlNode,System.Xml.XmlNode,System.String,System.String,System.Xml.XmlNodeChangedAction)", "", "Argument[2].Element", "Argument[this]", "taint", "df-generated"]
-      - ["System.Xml", "XmlNodeChangedEventArgs", False, "XmlNodeChangedEventArgs", "(System.Xml.XmlNode,System.Xml.XmlNode,System.Xml.XmlNode,System.String,System.String,System.Xml.XmlNodeChangedAction)", "", "Argument[3]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Xml", "XmlNodeChangedEventArgs", False, "XmlNodeChangedEventArgs", "(System.Xml.XmlNode,System.Xml.XmlNode,System.Xml.XmlNode,System.String,System.String,System.Xml.XmlNodeChangedAction)", "", "Argument[4]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Xml", "XmlNodeChangedEventArgs", False, "get_NewParent", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Xml", "XmlNodeChangedEventArgs", False, "get_NewValue", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Xml", "XmlNodeChangedEventArgs", False, "get_Node", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Xml", "XmlNodeChangedEventArgs", False, "get_OldParent", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Xml", "XmlNodeChangedEventArgs", False, "get_OldValue", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Xml", "XmlNodeChangedEventArgs", False, "XmlNodeChangedEventArgs", "(System.Xml.XmlNode,System.Xml.XmlNode,System.Xml.XmlNode,System.String,System.String,System.Xml.XmlNodeChangedAction)", "", "Argument[0]", "Argument[this].SyntheticField[System.Xml.XmlNodeChangedEventArgs._node]", "value", "dfc-generated"]
+      - ["System.Xml", "XmlNodeChangedEventArgs", False, "XmlNodeChangedEventArgs", "(System.Xml.XmlNode,System.Xml.XmlNode,System.Xml.XmlNode,System.String,System.String,System.Xml.XmlNodeChangedAction)", "", "Argument[1]", "Argument[this].SyntheticField[System.Xml.XmlNodeChangedEventArgs._oldParent]", "value", "dfc-generated"]
+      - ["System.Xml", "XmlNodeChangedEventArgs", False, "XmlNodeChangedEventArgs", "(System.Xml.XmlNode,System.Xml.XmlNode,System.Xml.XmlNode,System.String,System.String,System.Xml.XmlNodeChangedAction)", "", "Argument[2]", "Argument[this].SyntheticField[System.Xml.XmlNodeChangedEventArgs._newParent]", "value", "dfc-generated"]
+      - ["System.Xml", "XmlNodeChangedEventArgs", False, "XmlNodeChangedEventArgs", "(System.Xml.XmlNode,System.Xml.XmlNode,System.Xml.XmlNode,System.String,System.String,System.Xml.XmlNodeChangedAction)", "", "Argument[3]", "Argument[this].SyntheticField[System.Xml.XmlNodeChangedEventArgs._oldValue]", "value", "dfc-generated"]
+      - ["System.Xml", "XmlNodeChangedEventArgs", False, "XmlNodeChangedEventArgs", "(System.Xml.XmlNode,System.Xml.XmlNode,System.Xml.XmlNode,System.String,System.String,System.Xml.XmlNodeChangedAction)", "", "Argument[4]", "Argument[this].SyntheticField[System.Xml.XmlNodeChangedEventArgs._newValue]", "value", "dfc-generated"]
+      - ["System.Xml", "XmlNodeChangedEventArgs", False, "get_NewParent", "()", "", "Argument[this].SyntheticField[System.Xml.XmlNodeChangedEventArgs._newParent]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Xml", "XmlNodeChangedEventArgs", False, "get_NewValue", "()", "", "Argument[this].SyntheticField[System.Xml.XmlNodeChangedEventArgs._newValue]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Xml", "XmlNodeChangedEventArgs", False, "get_Node", "()", "", "Argument[this].SyntheticField[System.Xml.XmlNodeChangedEventArgs._node]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Xml", "XmlNodeChangedEventArgs", False, "get_OldParent", "()", "", "Argument[this].SyntheticField[System.Xml.XmlNodeChangedEventArgs._oldParent]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Xml", "XmlNodeChangedEventArgs", False, "get_OldValue", "()", "", "Argument[this].SyntheticField[System.Xml.XmlNodeChangedEventArgs._oldValue]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Xml", "XmlNodeList", True, "Item", "(System.Int32)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Xml", "XmlNodeList", True, "get_ItemOf", "(System.Int32)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Xml", "XmlNodeReader", False, "XmlNodeReader", "(System.Xml.XmlNode)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
+      - ["System.Xml", "XmlNodeReader", True, "ReadString", "()", "", "Argument[this].Property[System.Xml.XmlReader.Value]", "ReturnValue", "taint", "dfc-generated"]
       - ["System.Xml", "XmlNotation", False, "get_PublicId", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Xml", "XmlNotation", False, "get_SystemId", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Xml", "XmlParserContext", False, "XmlParserContext", "(System.Xml.XmlNameTable,System.Xml.XmlNamespaceManager,System.String,System.String,System.String,System.String,System.String,System.String,System.Xml.XmlSpace,System.Text.Encoding)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
@@ -303,19 +319,21 @@ extensions:
       - ["System.Xml", "XmlParserContext", False, "XmlParserContext", "(System.Xml.XmlNameTable,System.Xml.XmlNamespaceManager,System.String,System.String,System.String,System.String,System.String,System.String,System.Xml.XmlSpace,System.Text.Encoding)", "", "Argument[6]", "Argument[this]", "taint", "df-generated"]
       - ["System.Xml", "XmlParserContext", False, "XmlParserContext", "(System.Xml.XmlNameTable,System.Xml.XmlNamespaceManager,System.String,System.String,System.String,System.String,System.String,System.String,System.Xml.XmlSpace,System.Text.Encoding)", "", "Argument[7]", "Argument[this]", "taint", "df-generated"]
       - ["System.Xml", "XmlParserContext", False, "XmlParserContext", "(System.Xml.XmlNameTable,System.Xml.XmlNamespaceManager,System.String,System.String,System.String,System.String,System.String,System.String,System.Xml.XmlSpace,System.Text.Encoding)", "", "Argument[9]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Xml", "XmlProcessingInstruction", False, "XmlProcessingInstruction", "(System.String,System.String,System.Xml.XmlDocument)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Xml", "XmlProcessingInstruction", False, "XmlProcessingInstruction", "(System.String,System.String,System.Xml.XmlDocument)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Xml", "XmlProcessingInstruction", False, "get_Target", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Xml", "XmlQualifiedName", False, "ToString", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Xml", "XmlQualifiedName", False, "ToString", "(System.String,System.String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Xml", "XmlQualifiedName", False, "ToString", "(System.String,System.String)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Xml", "XmlProcessingInstruction", False, "XmlProcessingInstruction", "(System.String,System.String,System.Xml.XmlDocument)", "", "Argument[0]", "Argument[this].SyntheticField[System.Xml.XmlProcessingInstruction._target]", "value", "dfc-generated"]
+      - ["System.Xml", "XmlProcessingInstruction", False, "get_Target", "()", "", "Argument[this].SyntheticField[System.Xml.XmlProcessingInstruction._target]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Xml", "XmlProcessingInstruction", True, "CloneNode", "(System.Boolean)", "", "Argument[this].SyntheticField[System.Xml.XmlProcessingInstruction._target]", "ReturnValue.SyntheticField[System.Xml.XmlProcessingInstruction._target]", "value", "dfc-generated"]
+      - ["System.Xml", "XmlQualifiedName", False, "ToString", "()", "", "Argument[this].Property[System.Xml.XmlQualifiedName.Name]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Xml", "XmlQualifiedName", False, "ToString", "()", "", "Argument[this].Property[System.Xml.XmlQualifiedName.Namespace]", "ReturnValue", "taint", "dfc-generated"]
+      - ["System.Xml", "XmlQualifiedName", False, "ToString", "(System.String,System.String)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Xml", "XmlQualifiedName", False, "ToString", "(System.String,System.String)", "", "Argument[1]", "ReturnValue", "taint", "dfc-generated"]
       - ["System.Xml", "XmlReader", True, "GetAttribute", "(System.Int32)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Xml", "XmlReader", True, "GetAttribute", "(System.String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Xml", "XmlReader", True, "GetAttribute", "(System.String,System.String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Xml", "XmlReader", True, "GetValueAsync", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Xml", "XmlReader", True, "LookupNamespace", "(System.String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Xml", "XmlReader", True, "LookupNamespace", "(System.String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Xml", "XmlReader", True, "LookupNamespace", "(System.String)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Xml", "XmlReader", True, "MoveToAttribute", "(System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Xml", "XmlReader", True, "ReadContentAs", "(System.Type,System.Xml.IXmlNamespaceResolver)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Xml", "XmlReader", True, "ReadContentAs", "(System.Type,System.Xml.IXmlNamespaceResolver)", "", "Argument[this]", "Argument[1]", "taint", "df-generated"]
       - ["System.Xml", "XmlReader", True, "ReadContentAs", "(System.Type,System.Xml.IXmlNamespaceResolver)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Xml", "XmlReader", True, "ReadContentAsAsync", "(System.Type,System.Xml.IXmlNamespaceResolver)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
       - ["System.Xml", "XmlReader", True, "ReadContentAsAsync", "(System.Type,System.Xml.IXmlNamespaceResolver)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
@@ -328,8 +346,10 @@ extensions:
       - ["System.Xml", "XmlReader", True, "ReadContentAsString", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Xml", "XmlReader", True, "ReadContentAsStringAsync", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Xml", "XmlReader", True, "ReadElementContentAs", "(System.Type,System.Xml.IXmlNamespaceResolver)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Xml", "XmlReader", True, "ReadElementContentAs", "(System.Type,System.Xml.IXmlNamespaceResolver)", "", "Argument[this]", "Argument[1]", "taint", "df-generated"]
       - ["System.Xml", "XmlReader", True, "ReadElementContentAs", "(System.Type,System.Xml.IXmlNamespaceResolver)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Xml", "XmlReader", True, "ReadElementContentAs", "(System.Type,System.Xml.IXmlNamespaceResolver,System.String,System.String)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Xml", "XmlReader", True, "ReadElementContentAs", "(System.Type,System.Xml.IXmlNamespaceResolver,System.String,System.String)", "", "Argument[this]", "Argument[1]", "taint", "df-generated"]
       - ["System.Xml", "XmlReader", True, "ReadElementContentAs", "(System.Type,System.Xml.IXmlNamespaceResolver,System.String,System.String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Xml", "XmlReader", True, "ReadElementContentAsAsync", "(System.Type,System.Xml.IXmlNamespaceResolver)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
       - ["System.Xml", "XmlReader", True, "ReadElementContentAsAsync", "(System.Type,System.Xml.IXmlNamespaceResolver)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
@@ -357,31 +377,49 @@ extensions:
       - ["System.Xml", "XmlReader", True, "get_NameTable", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Xml", "XmlReader", True, "get_NamespaceURI", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Xml", "XmlReader", True, "get_Prefix", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Xml", "XmlReader", True, "get_SchemaInfo", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Xml", "XmlReader", True, "get_SchemaInfo", "()", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Xml", "XmlReader", True, "get_Settings", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Xml", "XmlReader", True, "get_Value", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Xml", "XmlReader", True, "get_XmlLang", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Xml", "XmlReaderSettings", False, "set_XmlResolver", "(System.Xml.XmlResolver)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Xml", "XmlResolver", True, "GetEntity", "(System.Uri,System.String,System.Type)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["System.Xml", "XmlResolver", True, "GetEntityAsync", "(System.Uri,System.String,System.Type)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Xml", "XmlResolver", True, "ResolveUri", "(System.Uri,System.String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System.Xml", "XmlResolver", True, "ResolveUri", "(System.Uri,System.String)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Xml", "XmlResolver", True, "ResolveUri", "(System.Uri,System.String)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Xml", "XmlResolver", True, "ResolveUri", "(System.Uri,System.String)", "", "Argument[1]", "ReturnValue", "taint", "dfc-generated"]
       - ["System.Xml", "XmlResolver", True, "set_Credentials", "(System.Net.ICredentials)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["System.Xml", "XmlSecureResolver", True, "GetEntity", "(System.Uri,System.String,System.Type)", "", "Argument[0].Property[System.Uri.LocalPath]", "ReturnValue", "taint", "dfc-generated"]
+      - ["System.Xml", "XmlSecureResolver", True, "GetEntityAsync", "(System.Uri,System.String,System.Type)", "", "Argument[0].Property[System.Uri.LocalPath]", "ReturnValue.Property[System.Threading.Tasks.Task`1.Result]", "taint", "dfc-generated"]
       - ["System.Xml", "XmlText", True, "SplitText", "(System.Int32)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Xml", "XmlTextReader", False, "GetRemainder", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Xml", "XmlTextReader", False, "XmlTextReader", "(System.IO.Stream,System.Xml.XmlNodeType,System.Xml.XmlParserContext)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Xml", "XmlTextReader", False, "XmlTextReader", "(System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Xml", "XmlTextReader", False, "XmlTextReader", "(System.String,System.IO.Stream,System.Xml.XmlNameTable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Xml", "XmlTextReader", False, "XmlTextReader", "(System.String,System.IO.TextReader,System.Xml.XmlNameTable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Xml", "XmlTextReader", False, "XmlTextReader", "(System.String,System.Xml.XmlNameTable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["System.Xml", "XmlTextReader", False, "XmlTextReader", "(System.String)", "", "Argument[0]", "Argument[this].SyntheticField[System.Xml.XmlTextReader._impl].SyntheticField[System.Xml.XmlTextReaderImpl._reportedBaseUri]", "taint", "dfc-generated"]
+      - ["System.Xml", "XmlTextReader", False, "XmlTextReader", "(System.String,System.IO.Stream,System.Xml.XmlNameTable)", "", "Argument[0]", "Argument[this].SyntheticField[System.Xml.XmlTextReader._impl].SyntheticField[System.Xml.XmlTextReaderImpl._reportedBaseUri]", "value", "dfc-generated"]
+      - ["System.Xml", "XmlTextReader", False, "XmlTextReader", "(System.String,System.IO.TextReader,System.Xml.XmlNameTable)", "", "Argument[0]", "Argument[this].SyntheticField[System.Xml.XmlTextReader._impl].SyntheticField[System.Xml.XmlTextReaderImpl._reportedBaseUri]", "value", "dfc-generated"]
+      - ["System.Xml", "XmlTextReader", False, "XmlTextReader", "(System.String,System.Xml.XmlNameTable)", "", "Argument[0]", "Argument[this].SyntheticField[System.Xml.XmlTextReader._impl].SyntheticField[System.Xml.XmlTextReaderImpl._reportedBaseUri]", "taint", "dfc-generated"]
       - ["System.Xml", "XmlTextReader", False, "XmlTextReader", "(System.String,System.Xml.XmlNodeType,System.Xml.XmlParserContext)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Xml", "XmlTextReader", False, "XmlTextReader", "(System.Xml.XmlNameTable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["System.Xml", "XmlTextReader", False, "XmlTextReader", "(System.Xml.XmlNameTable)", "", "Argument[0]", "Argument[this].SyntheticField[System.Xml.XmlTextReader._impl].SyntheticField[System.Xml.XmlTextReaderImpl._nameTable]", "value", "dfc-generated"]
       - ["System.Xml", "XmlTextReader", False, "get_Encoding", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Xml", "XmlTextReader", False, "set_XmlResolver", "(System.Xml.XmlResolver)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["System.Xml", "XmlTextReader", True, "ReadString", "()", "", "Argument[this].Property[System.Xml.XmlReader.Value]", "ReturnValue", "taint", "dfc-generated"]
+      - ["System.Xml", "XmlTextReader", True, "get_BaseURI", "()", "", "Argument[this].SyntheticField[System.Xml.XmlTextReader._impl].SyntheticField[System.Xml.XmlTextReaderImpl._reportedBaseUri]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Xml", "XmlTextReader", True, "get_NameTable", "()", "", "Argument[this].SyntheticField[System.Xml.XmlTextReader._impl].SyntheticField[System.Xml.XmlTextReaderImpl._nameTable]", "ReturnValue", "value", "dfc-generated"]
       - ["System.Xml", "XmlTextWriter", False, "XmlTextWriter", "(System.IO.Stream,System.Text.Encoding)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
       - ["System.Xml", "XmlTextWriter", False, "XmlTextWriter", "(System.IO.TextWriter)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Xml", "XmlTextWriter", False, "get_BaseStream", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Xml", "XmlTextWriter", False, "get_BaseStream", "()", "", "Argument[this].SyntheticField[System.Xml.XmlTextWriter._textWriter].Property[System.IO.StreamWriter.BaseStream]", "ReturnValue", "value", "dfc-generated"]
+      - ["System.Xml", "XmlTextWriter", True, "WriteDocType", "(System.String,System.String,System.String,System.String)", "", "Argument[0]", "Argument[this].SyntheticField[System.Xml.XmlTextWriter._textWriter]", "taint", "dfc-generated"]
+      - ["System.Xml", "XmlTextWriter", True, "WriteDocType", "(System.String,System.String,System.String,System.String)", "", "Argument[1]", "Argument[this].SyntheticField[System.Xml.XmlTextWriter._textWriter]", "taint", "dfc-generated"]
+      - ["System.Xml", "XmlTextWriter", True, "WriteDocType", "(System.String,System.String,System.String,System.String)", "", "Argument[2]", "Argument[this].SyntheticField[System.Xml.XmlTextWriter._textWriter]", "taint", "dfc-generated"]
+      - ["System.Xml", "XmlTextWriter", True, "WriteDocType", "(System.String,System.String,System.String,System.String)", "", "Argument[3]", "Argument[this].SyntheticField[System.Xml.XmlTextWriter._textWriter]", "taint", "dfc-generated"]
+      - ["System.Xml", "XmlTextWriter", True, "WriteName", "(System.String)", "", "Argument[0]", "Argument[this].SyntheticField[System.Xml.XmlTextWriter._textWriter]", "taint", "dfc-generated"]
+      - ["System.Xml", "XmlTextWriter", True, "WriteNmToken", "(System.String)", "", "Argument[0]", "Argument[this].SyntheticField[System.Xml.XmlTextWriter._textWriter]", "taint", "dfc-generated"]
+      - ["System.Xml", "XmlTextWriter", True, "WriteProcessingInstruction", "(System.String,System.String)", "", "Argument[0]", "Argument[this].SyntheticField[System.Xml.XmlTextWriter._textWriter]", "taint", "dfc-generated"]
+      - ["System.Xml", "XmlTextWriter", True, "WriteQualifiedName", "(System.String,System.String)", "", "Argument[0]", "Argument[this].SyntheticField[System.Xml.XmlTextWriter._textWriter]", "taint", "dfc-generated"]
+      - ["System.Xml", "XmlTextWriter", True, "WriteStartAttribute", "(System.String,System.String,System.String)", "", "Argument[0]", "Argument[this].SyntheticField[System.Xml.XmlTextWriter._textWriter]", "taint", "dfc-generated"]
+      - ["System.Xml", "XmlTextWriter", True, "WriteStartAttribute", "(System.String,System.String,System.String)", "", "Argument[1]", "Argument[this].SyntheticField[System.Xml.XmlTextWriter._textWriter]", "taint", "dfc-generated"]
+      - ["System.Xml", "XmlTextWriter", True, "WriteStartElement", "(System.String,System.String,System.String)", "", "Argument[0]", "Argument[this].SyntheticField[System.Xml.XmlTextWriter._textWriter]", "taint", "dfc-generated"]
+      - ["System.Xml", "XmlTextWriter", True, "WriteStartElement", "(System.String,System.String,System.String)", "", "Argument[1]", "Argument[this].SyntheticField[System.Xml.XmlTextWriter._textWriter]", "taint", "dfc-generated"]
       - ["System.Xml", "XmlUrlResolver", False, "set_Proxy", "(System.Net.IWebProxy)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["System.Xml", "XmlUrlResolver", True, "GetEntity", "(System.Uri,System.String,System.Type)", "", "Argument[0].Property[System.Uri.LocalPath]", "ReturnValue", "taint", "dfc-generated"]
       - ["System.Xml", "XmlValidatingReader", False, "ReadTypedValue", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Xml", "XmlValidatingReader", False, "XmlValidatingReader", "(System.IO.Stream,System.Xml.XmlNodeType,System.Xml.XmlParserContext)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
       - ["System.Xml", "XmlValidatingReader", False, "XmlValidatingReader", "(System.String,System.Xml.XmlNodeType,System.Xml.XmlParserContext)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
@@ -390,6 +428,7 @@ extensions:
       - ["System.Xml", "XmlValidatingReader", False, "get_Reader", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Xml", "XmlValidatingReader", False, "get_SchemaType", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System.Xml", "XmlValidatingReader", False, "get_Schemas", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Xml", "XmlValidatingReader", True, "ReadString", "()", "", "Argument[this].Property[System.Xml.XmlReader.Value]", "ReturnValue", "taint", "dfc-generated"]
       - ["System.Xml", "XmlWriter", False, "Create", "(System.IO.Stream)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["System.Xml", "XmlWriter", False, "Create", "(System.IO.Stream,System.Xml.XmlWriterSettings)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["System.Xml", "XmlWriter", False, "Create", "(System.IO.Stream,System.Xml.XmlWriterSettings)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
@@ -399,6 +438,8 @@ extensions:
       - ["System.Xml", "XmlWriter", False, "Create", "(System.String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["System.Xml", "XmlWriter", False, "Create", "(System.String,System.Xml.XmlWriterSettings)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["System.Xml", "XmlWriter", False, "Create", "(System.String,System.Xml.XmlWriterSettings)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Xml", "XmlWriter", False, "Create", "(System.Text.StringBuilder)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["System.Xml", "XmlWriter", False, "Create", "(System.Text.StringBuilder,System.Xml.XmlWriterSettings)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["System.Xml", "XmlWriter", False, "Create", "(System.Text.StringBuilder,System.Xml.XmlWriterSettings)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
       - ["System.Xml", "XmlWriter", False, "Create", "(System.Xml.XmlWriter)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["System.Xml", "XmlWriter", False, "Create", "(System.Xml.XmlWriter,System.Xml.XmlWriterSettings)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
@@ -447,7 +488,6 @@ extensions:
       - ["System.Xml", "XmlWriter", True, "WriteNode", "(System.Xml.XmlReader,System.Boolean)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Xml", "XmlWriter", True, "WriteNodeAsync", "(System.Xml.XmlReader,System.Boolean)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Xml", "XmlWriter", True, "WriteProcessingInstruction", "(System.String,System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System.Xml", "XmlWriter", True, "WriteProcessingInstruction", "(System.String,System.String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
       - ["System.Xml", "XmlWriter", True, "WriteQualifiedName", "(System.String,System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Xml", "XmlWriter", True, "WriteQualifiedNameAsync", "(System.String,System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System.Xml", "XmlWriter", True, "WriteRaw", "(System.Char[],System.Int32,System.Int32)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
@@ -476,9 +516,13 @@ extensions:
       - ["System.Xml", "IFragmentCapableXmlDictionaryWriter", "get_CanFragment", "()", "summary", "df-generated"]
       - ["System.Xml", "IStreamProvider", "GetStream", "()", "summary", "df-generated"]
       - ["System.Xml", "IStreamProvider", "ReleaseStream", "(System.IO.Stream)", "summary", "df-generated"]
+      - ["System.Xml", "IXmlBinaryReaderInitializer", "SetInput", "(System.Byte[],System.Int32,System.Int32,System.Xml.IXmlDictionary,System.Xml.XmlDictionaryReaderQuotas,System.Xml.XmlBinaryReaderSession,System.Xml.OnXmlDictionaryReaderClose)", "summary", "df-generated"]
+      - ["System.Xml", "IXmlBinaryReaderInitializer", "SetInput", "(System.IO.Stream,System.Xml.IXmlDictionary,System.Xml.XmlDictionaryReaderQuotas,System.Xml.XmlBinaryReaderSession,System.Xml.OnXmlDictionaryReaderClose)", "summary", "df-generated"]
       - ["System.Xml", "IXmlLineInfo", "HasLineInfo", "()", "summary", "df-generated"]
       - ["System.Xml", "IXmlLineInfo", "get_LineNumber", "()", "summary", "df-generated"]
       - ["System.Xml", "IXmlLineInfo", "get_LinePosition", "()", "summary", "df-generated"]
+      - ["System.Xml", "IXmlTextReaderInitializer", "SetInput", "(System.Byte[],System.Int32,System.Int32,System.Text.Encoding,System.Xml.XmlDictionaryReaderQuotas,System.Xml.OnXmlDictionaryReaderClose)", "summary", "df-generated"]
+      - ["System.Xml", "IXmlTextReaderInitializer", "SetInput", "(System.IO.Stream,System.Text.Encoding,System.Xml.XmlDictionaryReaderQuotas,System.Xml.OnXmlDictionaryReaderClose)", "summary", "df-generated"]
       - ["System.Xml", "UniqueId", "Equals", "(System.Object)", "summary", "df-generated"]
       - ["System.Xml", "UniqueId", "GetHashCode", "()", "summary", "df-generated"]
       - ["System.Xml", "UniqueId", "ToCharArray", "(System.Char[],System.Int32)", "summary", "df-generated"]
@@ -554,14 +598,23 @@ extensions:
       - ["System.Xml", "XmlConvert", "ToUInt16", "(System.String)", "summary", "df-generated"]
       - ["System.Xml", "XmlConvert", "ToUInt32", "(System.String)", "summary", "df-generated"]
       - ["System.Xml", "XmlConvert", "ToUInt64", "(System.String)", "summary", "df-generated"]
+      - ["System.Xml", "XmlDataDocument", "GetElementById", "(System.String)", "summary", "df-generated"]
       - ["System.Xml", "XmlDictionary", "XmlDictionary", "(System.Int32)", "summary", "df-generated"]
       - ["System.Xml", "XmlDictionary", "get_Empty", "()", "summary", "df-generated"]
+      - ["System.Xml", "XmlDictionaryReader", "CreateBinaryReader", "(System.Byte[],System.Int32,System.Int32,System.Xml.IXmlDictionary,System.Xml.XmlDictionaryReaderQuotas,System.Xml.XmlBinaryReaderSession,System.Xml.OnXmlDictionaryReaderClose)", "summary", "df-generated"]
+      - ["System.Xml", "XmlDictionaryReader", "CreateBinaryReader", "(System.IO.Stream,System.Xml.IXmlDictionary,System.Xml.XmlDictionaryReaderQuotas,System.Xml.XmlBinaryReaderSession,System.Xml.OnXmlDictionaryReaderClose)", "summary", "df-generated"]
       - ["System.Xml", "XmlDictionaryReader", "CreateMtomReader", "(System.Byte[],System.Int32,System.Int32,System.Text.Encoding,System.Xml.XmlDictionaryReaderQuotas)", "summary", "df-generated"]
       - ["System.Xml", "XmlDictionaryReader", "CreateMtomReader", "(System.Byte[],System.Int32,System.Int32,System.Text.Encoding[],System.String,System.Xml.XmlDictionaryReaderQuotas)", "summary", "df-generated"]
+      - ["System.Xml", "XmlDictionaryReader", "CreateMtomReader", "(System.Byte[],System.Int32,System.Int32,System.Text.Encoding[],System.String,System.Xml.XmlDictionaryReaderQuotas,System.Int32,System.Xml.OnXmlDictionaryReaderClose)", "summary", "df-generated"]
       - ["System.Xml", "XmlDictionaryReader", "CreateMtomReader", "(System.Byte[],System.Int32,System.Int32,System.Text.Encoding[],System.Xml.XmlDictionaryReaderQuotas)", "summary", "df-generated"]
       - ["System.Xml", "XmlDictionaryReader", "CreateMtomReader", "(System.IO.Stream,System.Text.Encoding,System.Xml.XmlDictionaryReaderQuotas)", "summary", "df-generated"]
       - ["System.Xml", "XmlDictionaryReader", "CreateMtomReader", "(System.IO.Stream,System.Text.Encoding[],System.String,System.Xml.XmlDictionaryReaderQuotas)", "summary", "df-generated"]
+      - ["System.Xml", "XmlDictionaryReader", "CreateMtomReader", "(System.IO.Stream,System.Text.Encoding[],System.String,System.Xml.XmlDictionaryReaderQuotas,System.Int32,System.Xml.OnXmlDictionaryReaderClose)", "summary", "df-generated"]
       - ["System.Xml", "XmlDictionaryReader", "CreateMtomReader", "(System.IO.Stream,System.Text.Encoding[],System.Xml.XmlDictionaryReaderQuotas)", "summary", "df-generated"]
+      - ["System.Xml", "XmlDictionaryReader", "CreateTextReader", "(System.Byte[],System.Int32,System.Int32,System.Text.Encoding,System.Xml.XmlDictionaryReaderQuotas,System.Xml.OnXmlDictionaryReaderClose)", "summary", "df-generated"]
+      - ["System.Xml", "XmlDictionaryReader", "CreateTextReader", "(System.Byte[],System.Int32,System.Int32,System.Xml.XmlDictionaryReaderQuotas)", "summary", "df-generated"]
+      - ["System.Xml", "XmlDictionaryReader", "CreateTextReader", "(System.Byte[],System.Xml.XmlDictionaryReaderQuotas)", "summary", "df-generated"]
+      - ["System.Xml", "XmlDictionaryReader", "CreateTextReader", "(System.IO.Stream,System.Text.Encoding,System.Xml.XmlDictionaryReaderQuotas,System.Xml.OnXmlDictionaryReaderClose)", "summary", "df-generated"]
       - ["System.Xml", "XmlDictionaryReader", "CreateTextReader", "(System.IO.Stream,System.Xml.XmlDictionaryReaderQuotas)", "summary", "df-generated"]
       - ["System.Xml", "XmlDictionaryReader", "EndCanonicalization", "()", "summary", "df-generated"]
       - ["System.Xml", "XmlDictionaryReader", "IndexOfLocalName", "(System.String[],System.String)", "summary", "df-generated"]
@@ -663,40 +716,38 @@ extensions:
       - ["System.Xml", "XmlDictionaryWriter", "Dispose", "(System.Boolean)", "summary", "df-generated"]
       - ["System.Xml", "XmlDictionaryWriter", "EndCanonicalization", "()", "summary", "df-generated"]
       - ["System.Xml", "XmlDictionaryWriter", "StartCanonicalization", "(System.IO.Stream,System.Boolean,System.String[])", "summary", "df-generated"]
-      - ["System.Xml", "XmlDictionaryWriter", "WriteArray", "(System.String,System.String,System.String,System.Boolean[],System.Int32,System.Int32)", "summary", "df-generated"]
-      - ["System.Xml", "XmlDictionaryWriter", "WriteArray", "(System.String,System.String,System.String,System.DateTime[],System.Int32,System.Int32)", "summary", "df-generated"]
-      - ["System.Xml", "XmlDictionaryWriter", "WriteArray", "(System.String,System.String,System.String,System.Decimal[],System.Int32,System.Int32)", "summary", "df-generated"]
-      - ["System.Xml", "XmlDictionaryWriter", "WriteArray", "(System.String,System.String,System.String,System.Double[],System.Int32,System.Int32)", "summary", "df-generated"]
-      - ["System.Xml", "XmlDictionaryWriter", "WriteArray", "(System.String,System.String,System.String,System.Guid[],System.Int32,System.Int32)", "summary", "df-generated"]
-      - ["System.Xml", "XmlDictionaryWriter", "WriteArray", "(System.String,System.String,System.String,System.Int16[],System.Int32,System.Int32)", "summary", "df-generated"]
-      - ["System.Xml", "XmlDictionaryWriter", "WriteArray", "(System.String,System.String,System.String,System.Int32[],System.Int32,System.Int32)", "summary", "df-generated"]
-      - ["System.Xml", "XmlDictionaryWriter", "WriteArray", "(System.String,System.String,System.String,System.Int64[],System.Int32,System.Int32)", "summary", "df-generated"]
-      - ["System.Xml", "XmlDictionaryWriter", "WriteArray", "(System.String,System.String,System.String,System.Single[],System.Int32,System.Int32)", "summary", "df-generated"]
-      - ["System.Xml", "XmlDictionaryWriter", "WriteArray", "(System.String,System.String,System.String,System.TimeSpan[],System.Int32,System.Int32)", "summary", "df-generated"]
-      - ["System.Xml", "XmlDictionaryWriter", "WriteArray", "(System.String,System.Xml.XmlDictionaryString,System.Xml.XmlDictionaryString,System.Boolean[],System.Int32,System.Int32)", "summary", "df-generated"]
-      - ["System.Xml", "XmlDictionaryWriter", "WriteArray", "(System.String,System.Xml.XmlDictionaryString,System.Xml.XmlDictionaryString,System.DateTime[],System.Int32,System.Int32)", "summary", "df-generated"]
-      - ["System.Xml", "XmlDictionaryWriter", "WriteArray", "(System.String,System.Xml.XmlDictionaryString,System.Xml.XmlDictionaryString,System.Decimal[],System.Int32,System.Int32)", "summary", "df-generated"]
-      - ["System.Xml", "XmlDictionaryWriter", "WriteArray", "(System.String,System.Xml.XmlDictionaryString,System.Xml.XmlDictionaryString,System.Double[],System.Int32,System.Int32)", "summary", "df-generated"]
-      - ["System.Xml", "XmlDictionaryWriter", "WriteArray", "(System.String,System.Xml.XmlDictionaryString,System.Xml.XmlDictionaryString,System.Guid[],System.Int32,System.Int32)", "summary", "df-generated"]
-      - ["System.Xml", "XmlDictionaryWriter", "WriteArray", "(System.String,System.Xml.XmlDictionaryString,System.Xml.XmlDictionaryString,System.Int16[],System.Int32,System.Int32)", "summary", "df-generated"]
-      - ["System.Xml", "XmlDictionaryWriter", "WriteArray", "(System.String,System.Xml.XmlDictionaryString,System.Xml.XmlDictionaryString,System.Int32[],System.Int32,System.Int32)", "summary", "df-generated"]
-      - ["System.Xml", "XmlDictionaryWriter", "WriteArray", "(System.String,System.Xml.XmlDictionaryString,System.Xml.XmlDictionaryString,System.Int64[],System.Int32,System.Int32)", "summary", "df-generated"]
-      - ["System.Xml", "XmlDictionaryWriter", "WriteArray", "(System.String,System.Xml.XmlDictionaryString,System.Xml.XmlDictionaryString,System.Single[],System.Int32,System.Int32)", "summary", "df-generated"]
-      - ["System.Xml", "XmlDictionaryWriter", "WriteArray", "(System.String,System.Xml.XmlDictionaryString,System.Xml.XmlDictionaryString,System.TimeSpan[],System.Int32,System.Int32)", "summary", "df-generated"]
-      - ["System.Xml", "XmlDictionaryWriter", "WriteStartElement", "(System.String,System.Xml.XmlDictionaryString,System.Xml.XmlDictionaryString)", "summary", "df-generated"]
-      - ["System.Xml", "XmlDictionaryWriter", "WriteStartElement", "(System.Xml.XmlDictionaryString,System.Xml.XmlDictionaryString)", "summary", "df-generated"]
       - ["System.Xml", "XmlDictionaryWriter", "WriteValue", "(System.Guid)", "summary", "df-generated"]
       - ["System.Xml", "XmlDictionaryWriter", "WriteValue", "(System.TimeSpan)", "summary", "df-generated"]
       - ["System.Xml", "XmlDictionaryWriter", "WriteValue", "(System.Xml.IStreamProvider)", "summary", "df-generated"]
       - ["System.Xml", "XmlDictionaryWriter", "WriteValue", "(System.Xml.UniqueId)", "summary", "df-generated"]
       - ["System.Xml", "XmlDictionaryWriter", "WriteValueAsync", "(System.Xml.IStreamProvider)", "summary", "df-generated"]
+      - ["System.Xml", "XmlDictionaryWriter", "WriteXmlAttribute", "(System.String,System.String)", "summary", "df-generated"]
+      - ["System.Xml", "XmlDictionaryWriter", "WriteXmlAttribute", "(System.Xml.XmlDictionaryString,System.Xml.XmlDictionaryString)", "summary", "df-generated"]
+      - ["System.Xml", "XmlDictionaryWriter", "WriteXmlnsAttribute", "(System.String,System.String)", "summary", "df-generated"]
+      - ["System.Xml", "XmlDictionaryWriter", "WriteXmlnsAttribute", "(System.String,System.Xml.XmlDictionaryString)", "summary", "df-generated"]
       - ["System.Xml", "XmlDictionaryWriter", "get_CanCanonicalize", "()", "summary", "df-generated"]
+      - ["System.Xml", "XmlDocument", "CreateDefaultAttribute", "(System.String,System.String,System.String)", "summary", "df-generated"]
+      - ["System.Xml", "XmlDocument", "GetElementById", "(System.String)", "summary", "df-generated"]
       - ["System.Xml", "XmlDocument", "LoadXml", "(System.String)", "summary", "df-generated"]
       - ["System.Xml", "XmlDocument", "ReadNode", "(System.Xml.XmlReader)", "summary", "df-generated"]
       - ["System.Xml", "XmlDocument", "Save", "(System.IO.Stream)", "summary", "df-generated"]
       - ["System.Xml", "XmlDocument", "Save", "(System.IO.TextWriter)", "summary", "df-generated"]
       - ["System.Xml", "XmlDocument", "Save", "(System.String)", "summary", "df-generated"]
+      - ["System.Xml", "XmlDocument", "Validate", "(System.Xml.Schema.ValidationEventHandler)", "summary", "df-generated"]
+      - ["System.Xml", "XmlDocument", "Validate", "(System.Xml.Schema.ValidationEventHandler,System.Xml.XmlNode)", "summary", "df-generated"]
       - ["System.Xml", "XmlDocument", "XmlDocument", "(System.Xml.XmlNameTable)", "summary", "df-generated"]
+      - ["System.Xml", "XmlDocument", "add_NodeChanged", "(System.Xml.XmlNodeChangedEventHandler)", "summary", "df-generated"]
+      - ["System.Xml", "XmlDocument", "add_NodeChanging", "(System.Xml.XmlNodeChangedEventHandler)", "summary", "df-generated"]
+      - ["System.Xml", "XmlDocument", "add_NodeInserted", "(System.Xml.XmlNodeChangedEventHandler)", "summary", "df-generated"]
+      - ["System.Xml", "XmlDocument", "add_NodeInserting", "(System.Xml.XmlNodeChangedEventHandler)", "summary", "df-generated"]
+      - ["System.Xml", "XmlDocument", "add_NodeRemoved", "(System.Xml.XmlNodeChangedEventHandler)", "summary", "df-generated"]
+      - ["System.Xml", "XmlDocument", "add_NodeRemoving", "(System.Xml.XmlNodeChangedEventHandler)", "summary", "df-generated"]
+      - ["System.Xml", "XmlDocument", "remove_NodeChanged", "(System.Xml.XmlNodeChangedEventHandler)", "summary", "df-generated"]
+      - ["System.Xml", "XmlDocument", "remove_NodeChanging", "(System.Xml.XmlNodeChangedEventHandler)", "summary", "df-generated"]
+      - ["System.Xml", "XmlDocument", "remove_NodeInserted", "(System.Xml.XmlNodeChangedEventHandler)", "summary", "df-generated"]
+      - ["System.Xml", "XmlDocument", "remove_NodeInserting", "(System.Xml.XmlNodeChangedEventHandler)", "summary", "df-generated"]
+      - ["System.Xml", "XmlDocument", "remove_NodeRemoved", "(System.Xml.XmlNodeChangedEventHandler)", "summary", "df-generated"]
+      - ["System.Xml", "XmlDocument", "remove_NodeRemoving", "(System.Xml.XmlNodeChangedEventHandler)", "summary", "df-generated"]
       - ["System.Xml", "XmlDocumentType", "get_Entities", "()", "summary", "df-generated"]
       - ["System.Xml", "XmlDocumentType", "get_Notations", "()", "summary", "df-generated"]
       - ["System.Xml", "XmlElement", "HasAttribute", "(System.String)", "summary", "df-generated"]
@@ -729,7 +780,6 @@ extensions:
       - ["System.Xml", "XmlNodeList", "get_Count", "()", "summary", "df-generated"]
       - ["System.Xml", "XmlNodeReader", "Close", "()", "summary", "df-generated"]
       - ["System.Xml", "XmlNodeReader", "MoveToAttribute", "(System.Int32)", "summary", "df-generated"]
-      - ["System.Xml", "XmlNodeReader", "MoveToAttribute", "(System.String)", "summary", "df-generated"]
       - ["System.Xml", "XmlNodeReader", "MoveToAttribute", "(System.String,System.String)", "summary", "df-generated"]
       - ["System.Xml", "XmlNodeReader", "MoveToElement", "()", "summary", "df-generated"]
       - ["System.Xml", "XmlNodeReader", "MoveToFirstAttribute", "()", "summary", "df-generated"]
@@ -769,7 +819,6 @@ extensions:
       - ["System.Xml", "XmlReader", "IsStartElement", "(System.String)", "summary", "df-generated"]
       - ["System.Xml", "XmlReader", "IsStartElement", "(System.String,System.String)", "summary", "df-generated"]
       - ["System.Xml", "XmlReader", "MoveToAttribute", "(System.Int32)", "summary", "df-generated"]
-      - ["System.Xml", "XmlReader", "MoveToAttribute", "(System.String)", "summary", "df-generated"]
       - ["System.Xml", "XmlReader", "MoveToAttribute", "(System.String,System.String)", "summary", "df-generated"]
       - ["System.Xml", "XmlReader", "MoveToContent", "()", "summary", "df-generated"]
       - ["System.Xml", "XmlReader", "MoveToContentAsync", "()", "summary", "df-generated"]
@@ -838,6 +887,8 @@ extensions:
       - ["System.Xml", "XmlReader", "get_XmlSpace", "()", "summary", "df-generated"]
       - ["System.Xml", "XmlReaderSettings", "Clone", "()", "summary", "df-generated"]
       - ["System.Xml", "XmlReaderSettings", "Reset", "()", "summary", "df-generated"]
+      - ["System.Xml", "XmlReaderSettings", "add_ValidationEventHandler", "(System.Xml.Schema.ValidationEventHandler)", "summary", "df-generated"]
+      - ["System.Xml", "XmlReaderSettings", "remove_ValidationEventHandler", "(System.Xml.Schema.ValidationEventHandler)", "summary", "df-generated"]
       - ["System.Xml", "XmlResolver", "SupportsType", "(System.Uri,System.Type)", "summary", "df-generated"]
       - ["System.Xml", "XmlResolver", "get_FileSystemResolver", "()", "summary", "df-generated"]
       - ["System.Xml", "XmlResolver", "get_ThrowingResolver", "()", "summary", "df-generated"]
@@ -848,7 +899,6 @@ extensions:
       - ["System.Xml", "XmlTextReader", "GetNamespacesInScope", "(System.Xml.XmlNamespaceScope)", "summary", "df-generated"]
       - ["System.Xml", "XmlTextReader", "HasLineInfo", "()", "summary", "df-generated"]
       - ["System.Xml", "XmlTextReader", "MoveToAttribute", "(System.Int32)", "summary", "df-generated"]
-      - ["System.Xml", "XmlTextReader", "MoveToAttribute", "(System.String)", "summary", "df-generated"]
       - ["System.Xml", "XmlTextReader", "MoveToAttribute", "(System.String,System.String)", "summary", "df-generated"]
       - ["System.Xml", "XmlTextReader", "MoveToElement", "()", "summary", "df-generated"]
       - ["System.Xml", "XmlTextReader", "MoveToFirstAttribute", "()", "summary", "df-generated"]
@@ -899,7 +949,6 @@ extensions:
       - ["System.Xml", "XmlValidatingReader", "Close", "()", "summary", "df-generated"]
       - ["System.Xml", "XmlValidatingReader", "HasLineInfo", "()", "summary", "df-generated"]
       - ["System.Xml", "XmlValidatingReader", "MoveToAttribute", "(System.Int32)", "summary", "df-generated"]
-      - ["System.Xml", "XmlValidatingReader", "MoveToAttribute", "(System.String)", "summary", "df-generated"]
       - ["System.Xml", "XmlValidatingReader", "MoveToAttribute", "(System.String,System.String)", "summary", "df-generated"]
       - ["System.Xml", "XmlValidatingReader", "MoveToElement", "()", "summary", "df-generated"]
       - ["System.Xml", "XmlValidatingReader", "MoveToFirstAttribute", "()", "summary", "df-generated"]
@@ -907,6 +956,7 @@ extensions:
       - ["System.Xml", "XmlValidatingReader", "Read", "()", "summary", "df-generated"]
       - ["System.Xml", "XmlValidatingReader", "ReadAttributeValue", "()", "summary", "df-generated"]
       - ["System.Xml", "XmlValidatingReader", "ResolveEntity", "()", "summary", "df-generated"]
+      - ["System.Xml", "XmlValidatingReader", "add_ValidationEventHandler", "(System.Xml.Schema.ValidationEventHandler)", "summary", "df-generated"]
       - ["System.Xml", "XmlValidatingReader", "get_AttributeCount", "()", "summary", "df-generated"]
       - ["System.Xml", "XmlValidatingReader", "get_CanReadBinaryContent", "()", "summary", "df-generated"]
       - ["System.Xml", "XmlValidatingReader", "get_CanResolveEntity", "()", "summary", "df-generated"]
@@ -921,10 +971,10 @@ extensions:
       - ["System.Xml", "XmlValidatingReader", "get_QuoteChar", "()", "summary", "df-generated"]
       - ["System.Xml", "XmlValidatingReader", "get_ReadState", "()", "summary", "df-generated"]
       - ["System.Xml", "XmlValidatingReader", "get_XmlSpace", "()", "summary", "df-generated"]
+      - ["System.Xml", "XmlValidatingReader", "remove_ValidationEventHandler", "(System.Xml.Schema.ValidationEventHandler)", "summary", "df-generated"]
       - ["System.Xml", "XmlValidatingReader", "set_XmlResolver", "(System.Xml.XmlResolver)", "summary", "df-generated"]
       - ["System.Xml", "XmlWhitespace", "XmlWhitespace", "(System.String,System.Xml.XmlDocument)", "summary", "df-generated"]
       - ["System.Xml", "XmlWriter", "Close", "()", "summary", "df-generated"]
-      - ["System.Xml", "XmlWriter", "Create", "(System.Text.StringBuilder)", "summary", "df-generated"]
       - ["System.Xml", "XmlWriter", "Dispose", "()", "summary", "df-generated"]
       - ["System.Xml", "XmlWriter", "Dispose", "(System.Boolean)", "summary", "df-generated"]
       - ["System.Xml", "XmlWriter", "DisposeAsyncCore", "()", "summary", "df-generated"]
diff --git a/csharp/ql/lib/ext/generated/System.model.yml b/csharp/ql/lib/ext/generated/System.model.yml
index 888c1ba3ca0..aeda575d1e3 100644
--- a/csharp/ql/lib/ext/generated/System.model.yml
+++ b/csharp/ql/lib/ext/generated/System.model.yml
@@ -4,74 +4,86 @@ extensions:
       pack: codeql/csharp-all
       extensible: summaryModel
     data:
-      - ["System", "AggregateException", False, "AggregateException", "(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System", "AggregateException", False, "AggregateException", "(System.String,System.Exception)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["System", "AppDomain", False, "ApplyPolicy", "(System.String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "AppDomain", False, "ToString", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "ApplicationId", False, "ApplicationId", "(System.Byte[],System.String,System.Version,System.String,System.String)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["System", "ApplicationId", False, "Copy", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "ApplicationId", False, "get_PublicKeyToken", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "ArgumentException", False, "ArgumentException", "(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System", "ArgumentException", False, "ArgumentException", "(System.String,System.String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["System", "ArgumentException", False, "ArgumentException", "(System.String,System.String,System.Exception)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["System", "ArgumentException", True, "get_ParamName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "ArgumentOutOfRangeException", False, "ArgumentOutOfRangeException", "(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System", "ArgumentOutOfRangeException", False, "ArgumentOutOfRangeException", "(System.String,System.Object,System.String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["System", "ArgumentOutOfRangeException", True, "get_ActualValue", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "Array", False, "Fill<T>", "(T[],T)", "", "Argument[1]", "Argument[0].Element", "taint", "df-generated"]
-      - ["System", "Array", False, "Fill<T>", "(T[],T,System.Int32,System.Int32)", "", "Argument[1]", "Argument[0].Element", "taint", "df-generated"]
-      - ["System", "ArraySegment<T>+Enumerator", False, "get_Current", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "ArraySegment<T>", False, "ArraySegment", "(T[])", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["System", "ArraySegment<T>", False, "ArraySegment", "(T[],System.Int32,System.Int32)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["System", "ArraySegment<T>", False, "GetEnumerator", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "ArraySegment<T>", False, "Slice", "(System.Int32)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "ArraySegment<T>", False, "Slice", "(System.Int32,System.Int32)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "ArraySegment<T>", False, "get_Array", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "ArraySegment<T>", False, "get_Item", "(System.Int32)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System", "AggregateException", False, "AggregateException", "(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)", "", "Argument[0].SyntheticField[System.Runtime.Serialization.SerializationInfo._values].Element", "Argument[this].SyntheticField[System.AggregateException._innerExceptions]", "value", "dfc-generated"]
+      - ["System", "AggregateException", False, "AggregateException", "(System.String,System.Exception)", "", "Argument[1]", "Argument[this].SyntheticField[System.AggregateException._innerExceptions].Element", "value", "dfc-generated"]
+      - ["System", "AggregateException", False, "Handle", "(System.Func<System.Exception,System.Boolean>)", "", "Argument[this].SyntheticField[System.AggregateException._innerExceptions].Element", "Argument[0].Parameter[0]", "value", "dfc-generated"]
+      - ["System", "AggregateException", True, "get_Message", "()", "", "Argument[this].Property[System.Exception.Message]", "ReturnValue", "value", "dfc-generated"]
+      - ["System", "AppDomain", False, "ApplyPolicy", "(System.String)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System", "AppDomain", False, "ToString", "()", "", "Argument[this].Property[System.AppDomain.FriendlyName]", "ReturnValue", "taint", "dfc-generated"]
+      - ["System", "ApplicationId", False, "ApplicationId", "(System.Byte[],System.String,System.Version,System.String,System.String)", "", "Argument[0].Element", "Argument[this].SyntheticField[System.ApplicationId._publicKeyToken].Element", "value", "dfc-generated"]
+      - ["System", "ApplicationId", False, "Copy", "()", "", "Argument[this].SyntheticField[System.ApplicationId._publicKeyToken].Element", "ReturnValue.SyntheticField[System.ApplicationId._publicKeyToken].Element", "value", "dfc-generated"]
+      - ["System", "ApplicationId", False, "get_PublicKeyToken", "()", "", "Argument[this].SyntheticField[System.ApplicationId._publicKeyToken].Element", "ReturnValue.Element", "value", "dfc-generated"]
+      - ["System", "ArgumentException", False, "ArgumentException", "(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)", "", "Argument[0].SyntheticField[System.Runtime.Serialization.SerializationInfo._values].Element", "Argument[this].SyntheticField[System.ArgumentException._paramName]", "value", "dfc-generated"]
+      - ["System", "ArgumentException", False, "ArgumentException", "(System.String,System.String)", "", "Argument[1]", "Argument[this].SyntheticField[System.ArgumentException._paramName]", "value", "dfc-generated"]
+      - ["System", "ArgumentException", False, "ArgumentException", "(System.String,System.String,System.Exception)", "", "Argument[1]", "Argument[this].SyntheticField[System.ArgumentException._paramName]", "value", "dfc-generated"]
+      - ["System", "ArgumentException", True, "get_Message", "()", "", "Argument[this].Property[System.Exception.Message]", "ReturnValue", "value", "dfc-generated"]
+      - ["System", "ArgumentException", True, "get_Message", "()", "", "Argument[this].SyntheticField[System.ArgumentException._paramName]", "ReturnValue", "taint", "dfc-generated"]
+      - ["System", "ArgumentException", True, "get_ParamName", "()", "", "Argument[this].SyntheticField[System.ArgumentException._paramName]", "ReturnValue", "value", "dfc-generated"]
+      - ["System", "ArgumentOutOfRangeException", False, "ArgumentOutOfRangeException", "(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)", "", "Argument[0].SyntheticField[System.Runtime.Serialization.SerializationInfo._values].Element", "Argument[this].SyntheticField[System.ArgumentOutOfRangeException._actualValue]", "value", "dfc-generated"]
+      - ["System", "ArgumentOutOfRangeException", False, "ArgumentOutOfRangeException", "(System.String,System.Object,System.String)", "", "Argument[1]", "Argument[this].SyntheticField[System.ArgumentOutOfRangeException._actualValue]", "value", "dfc-generated"]
+      - ["System", "ArgumentOutOfRangeException", True, "get_ActualValue", "()", "", "Argument[this].SyntheticField[System.ArgumentOutOfRangeException._actualValue]", "ReturnValue", "value", "dfc-generated"]
+      - ["System", "Array", False, "ConvertAll<TInput,TOutput>", "(TInput[],System.Converter<TInput,TOutput>)", "", "Argument[0].Element", "Argument[1].Parameter[0]", "value", "dfc-generated"]
+      - ["System", "Array", False, "ConvertAll<TInput,TOutput>", "(TInput[],System.Converter<TInput,TOutput>)", "", "Argument[1].ReturnValue", "ReturnValue.Element", "value", "dfc-generated"]
+      - ["System", "Array", False, "Exists<T>", "(T[],System.Predicate<T>)", "", "Argument[0].Element", "Argument[1].Parameter[0]", "value", "dfc-generated"]
+      - ["System", "Array", False, "Fill<T>", "(T[],T)", "", "Argument[1]", "Argument[0].Element", "value", "dfc-generated"]
+      - ["System", "Array", False, "Fill<T>", "(T[],T,System.Int32,System.Int32)", "", "Argument[1]", "Argument[0].Element", "value", "dfc-generated"]
+      - ["System", "Array", False, "FindIndex<T>", "(T[],System.Int32,System.Int32,System.Predicate<T>)", "", "Argument[0].Element", "Argument[3].Parameter[0]", "value", "dfc-generated"]
+      - ["System", "Array", False, "FindIndex<T>", "(T[],System.Int32,System.Predicate<T>)", "", "Argument[0].Element", "Argument[2].Parameter[0]", "value", "dfc-generated"]
+      - ["System", "Array", False, "FindIndex<T>", "(T[],System.Predicate<T>)", "", "Argument[0].Element", "Argument[1].Parameter[0]", "value", "dfc-generated"]
+      - ["System", "Array", False, "FindLastIndex<T>", "(T[],System.Int32,System.Int32,System.Predicate<T>)", "", "Argument[0].Element", "Argument[3].Parameter[0]", "value", "dfc-generated"]
+      - ["System", "Array", False, "FindLastIndex<T>", "(T[],System.Int32,System.Predicate<T>)", "", "Argument[0].Element", "Argument[2].Parameter[0]", "value", "dfc-generated"]
+      - ["System", "Array", False, "FindLastIndex<T>", "(T[],System.Predicate<T>)", "", "Argument[0].Element", "Argument[1].Parameter[0]", "value", "dfc-generated"]
+      - ["System", "Array", False, "ForEach<T>", "(T[],System.Action<T>)", "", "Argument[0].Element", "Argument[1].Parameter[0]", "value", "dfc-generated"]
+      - ["System", "Array", False, "Resize<T>", "(T[],System.Int32)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System", "Array", False, "TrueForAll<T>", "(T[],System.Predicate<T>)", "", "Argument[0].Element", "Argument[1].Parameter[0]", "value", "dfc-generated"]
+      - ["System", "ArraySegment<T>+Enumerator", False, "get_Current", "()", "", "Argument[this].Property[System.ArraySegment`1+Enumerator.Current]", "ReturnValue", "value", "dfc-generated"]
+      - ["System", "ArraySegment<T>+Enumerator", False, "get_Current", "()", "", "Argument[this].SyntheticField[System.ArraySegment`1+Enumerator._array].Element", "ReturnValue", "value", "dfc-generated"]
+      - ["System", "ArraySegment<T>", False, "ArraySegment", "(T[])", "", "Argument[0]", "Argument[this].SyntheticField[System.ArraySegment`1._array]", "value", "dfc-generated"]
+      - ["System", "ArraySegment<T>", False, "ArraySegment", "(T[],System.Int32,System.Int32)", "", "Argument[0]", "Argument[this].SyntheticField[System.ArraySegment`1._array]", "value", "dfc-generated"]
+      - ["System", "ArraySegment<T>", False, "GetEnumerator", "()", "", "Argument[this].Property[System.ArraySegment`1.Array]", "ReturnValue.SyntheticField[System.ArraySegment`1+Enumerator._array]", "value", "dfc-generated"]
+      - ["System", "ArraySegment<T>", False, "GetEnumerator", "()", "", "Argument[this].SyntheticField[System.ArraySegment`1._array]", "ReturnValue.SyntheticField[System.ArraySegment`1+Enumerator._array]", "value", "dfc-generated"]
+      - ["System", "ArraySegment<T>", False, "Slice", "(System.Int32)", "", "Argument[this].SyntheticField[System.ArraySegment`1._array]", "ReturnValue.SyntheticField[System.ArraySegment`1._array]", "value", "dfc-generated"]
+      - ["System", "ArraySegment<T>", False, "Slice", "(System.Int32,System.Int32)", "", "Argument[this].SyntheticField[System.ArraySegment`1._array]", "ReturnValue.SyntheticField[System.ArraySegment`1._array]", "value", "dfc-generated"]
+      - ["System", "ArraySegment<T>", False, "get_Array", "()", "", "Argument[this].SyntheticField[System.ArraySegment`1._array]", "ReturnValue", "value", "dfc-generated"]
+      - ["System", "ArraySegment<T>", False, "get_Item", "(System.Int32)", "", "Argument[this].SyntheticField[System.ArraySegment`1._array].Element", "ReturnValue", "value", "dfc-generated"]
       - ["System", "Attribute", True, "get_TypeId", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "BadImageFormatException", False, "BadImageFormatException", "(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System", "BadImageFormatException", False, "BadImageFormatException", "(System.String,System.String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["System", "BadImageFormatException", False, "BadImageFormatException", "(System.String,System.String,System.Exception)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["System", "BadImageFormatException", False, "get_FileName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "BadImageFormatException", False, "get_FusionLog", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "BinaryData", False, "BinaryData", "(System.ReadOnlyMemory<System.Byte>)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System", "BinaryData", False, "BinaryData", "(System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System", "BinaryData", False, "FromBytes", "(System.ReadOnlyMemory<System.Byte>)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "BinaryData", False, "FromString", "(System.String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "BinaryData", False, "ToArray", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "BinaryData", False, "ToMemory", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System", "BadImageFormatException", False, "BadImageFormatException", "(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)", "", "Argument[0].SyntheticField[System.Runtime.Serialization.SerializationInfo._values].Element", "Argument[this].SyntheticField[System.BadImageFormatException._fileName]", "value", "dfc-generated"]
+      - ["System", "BadImageFormatException", False, "BadImageFormatException", "(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)", "", "Argument[0].SyntheticField[System.Runtime.Serialization.SerializationInfo._values].Element", "Argument[this].SyntheticField[System.BadImageFormatException._fusionLog]", "value", "dfc-generated"]
+      - ["System", "BadImageFormatException", False, "BadImageFormatException", "(System.String,System.String)", "", "Argument[1]", "Argument[this].SyntheticField[System.BadImageFormatException._fileName]", "value", "dfc-generated"]
+      - ["System", "BadImageFormatException", False, "BadImageFormatException", "(System.String,System.String,System.Exception)", "", "Argument[1]", "Argument[this].SyntheticField[System.BadImageFormatException._fileName]", "value", "dfc-generated"]
+      - ["System", "BadImageFormatException", False, "get_FileName", "()", "", "Argument[this].SyntheticField[System.BadImageFormatException._fileName]", "ReturnValue", "value", "dfc-generated"]
+      - ["System", "BadImageFormatException", False, "get_FusionLog", "()", "", "Argument[this].SyntheticField[System.BadImageFormatException._fusionLog]", "ReturnValue", "value", "dfc-generated"]
+      - ["System", "BinaryData", False, "BinaryData", "(System.ReadOnlyMemory<System.Byte>)", "", "Argument[0]", "Argument[this].SyntheticField[System.BinaryData._bytes]", "value", "dfc-generated"]
+      - ["System", "BinaryData", False, "ToMemory", "()", "", "Argument[this].SyntheticField[System.BinaryData._bytes]", "ReturnValue", "value", "dfc-generated"]
+      - ["System", "BinaryData", False, "ToMemory", "()", "", "Argument[this]", "ReturnValue", "taint", "dfc-generated"]
       - ["System", "BinaryData", False, "ToStream", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System", "CultureAwareComparer", False, "GetObjectData", "(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)", "", "Argument[this].SyntheticField[System.CultureAwareComparer._compareInfo]", "Argument[0].SyntheticField[System.Runtime.Serialization.SerializationInfo._values].Element", "value", "dfc-generated"]
       - ["System", "DateTime", False, "ToLocalTime", "()", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["System", "DateTimeOffset", False, "Deconstruct", "(System.DateOnly,System.TimeOnly,System.TimeSpan)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "Delegate", False, "Combine", "(System.Delegate,System.Delegate)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "Delegate", False, "Combine", "(System.Delegate,System.Delegate)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "Delegate", False, "Combine", "(System.Delegate[])", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
+      - ["System", "DateTimeOffset", False, "Deconstruct", "(System.DateOnly,System.TimeOnly,System.TimeSpan)", "", "Argument[this].Property[System.DateTimeOffset.Offset]", "ReturnValue", "value", "dfc-generated"]
+      - ["System", "Delegate", False, "Combine", "(System.Delegate,System.Delegate)", "", "Argument[1]", "ReturnValue", "value", "dfc-generated"]
+      - ["System", "Delegate", False, "Combine", "(System.Delegate[])", "", "Argument[0].Element", "ReturnValue", "value", "dfc-generated"]
       - ["System", "Delegate", False, "CreateDelegate", "(System.Type,System.Reflection.MethodInfo,System.Boolean)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "Delegate", False, "Delegate", "(System.Object,System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System", "Delegate", False, "Delegate", "(System.Object,System.String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["System", "Delegate", False, "Delegate", "(System.Object,System.String)", "", "Argument[0]", "Argument[this].SyntheticField[System.Delegate._target]", "value", "dfc-generated"]
       - ["System", "Delegate", False, "Delegate", "(System.Type,System.String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["System", "Delegate", False, "DynamicInvoke", "(System.Object[])", "", "Argument[this]", "Argument[0].Element", "taint", "df-generated"]
-      - ["System", "Delegate", False, "Remove", "(System.Delegate,System.Delegate)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "Delegate", False, "RemoveAll", "(System.Delegate,System.Delegate)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "Delegate", False, "get_Method", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "Delegate", False, "get_Target", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "Delegate", True, "CombineImpl", "(System.Delegate)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["System", "Delegate", True, "DynamicInvokeImpl", "(System.Object[])", "", "Argument[this]", "Argument[0].Element", "taint", "df-generated"]
-      - ["System", "Delegate", True, "GetInvocationList", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System", "Delegate", False, "DynamicInvoke", "(System.Object[])", "", "Argument[this].SyntheticField[System.Delegate._target]", "Argument[0].Element", "value", "dfc-generated"]
+      - ["System", "Delegate", False, "Remove", "(System.Delegate,System.Delegate)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System", "Delegate", False, "RemoveAll", "(System.Delegate,System.Delegate)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System", "Delegate", False, "get_Target", "()", "", "Argument[this].SyntheticField[System.Delegate._target]", "ReturnValue", "value", "dfc-generated"]
+      - ["System", "Delegate", True, "CombineImpl", "(System.Delegate)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["System", "Delegate", True, "DynamicInvokeImpl", "(System.Object[])", "", "Argument[this].SyntheticField[System.Delegate._target]", "Argument[0].Element", "value", "dfc-generated"]
+      - ["System", "Delegate", True, "GetInvocationList", "()", "", "Argument[this]", "ReturnValue.Element", "value", "dfc-generated"]
       - ["System", "Delegate", True, "GetMethodImpl", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "Delegate", True, "RemoveImpl", "(System.Delegate)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "Delegate", True, "RemoveImpl", "(System.Delegate)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["System", "Environment", False, "ExpandEnvironmentVariables", "(System.String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["System", "Delegate", True, "RemoveImpl", "(System.Delegate)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["System", "Environment", False, "ExpandEnvironmentVariables", "(System.String)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
       - ["System", "Exception", False, "Exception", "(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System", "Exception", False, "Exception", "(System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System", "Exception", False, "Exception", "(System.String,System.Exception)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System", "Exception", False, "Exception", "(System.String,System.Exception)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["System", "Exception", False, "Exception", "(System.String)", "", "Argument[0]", "Argument[this].SyntheticField[System.Exception._message]", "value", "dfc-generated"]
+      - ["System", "Exception", False, "Exception", "(System.String,System.Exception)", "", "Argument[0]", "Argument[this].SyntheticField[System.Exception._message]", "value", "dfc-generated"]
+      - ["System", "Exception", False, "Exception", "(System.String,System.Exception)", "", "Argument[1]", "Argument[this].SyntheticField[System.Exception._innerException]", "value", "dfc-generated"]
       - ["System", "Exception", False, "ToString", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "Exception", False, "get_InnerException", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "Exception", False, "get_TargetSite", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System", "Exception", False, "get_InnerException", "()", "", "Argument[this].SyntheticField[System.Exception._innerException]", "ReturnValue", "value", "dfc-generated"]
       - ["System", "Exception", True, "GetBaseException", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "Exception", True, "get_Message", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "Exception", True, "get_StackTrace", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System", "Exception", True, "get_Message", "()", "", "Argument[this].SyntheticField[System.Exception._message]", "ReturnValue", "value", "dfc-generated"]
+      - ["System", "Exception", True, "get_StackTrace", "()", "", "Argument[this].SyntheticField[System.Exception._remoteStackTraceString]", "ReturnValue", "value", "dfc-generated"]
       - ["System", "FormattableString", False, "CurrentCulture", "(System.FormattableString)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["System", "FormattableString", False, "Invariant", "(System.FormattableString)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["System", "FormattableString", False, "ToString", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
@@ -81,131 +93,131 @@ extensions:
       - ["System", "FormattableString", True, "get_Format", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System", "GCMemoryInfo", False, "get_GenerationInfo", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System", "GCMemoryInfo", False, "get_PauseDurations", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "Half", False, "BitDecrement", "(System.Half)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "Half", False, "BitIncrement", "(System.Half)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "Half", False, "CreateChecked<TOther>", "(TOther)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "Half", False, "CreateSaturating<TOther>", "(TOther)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "Half", False, "CreateTruncating<TOther>", "(TOther)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "Half", False, "MaxMagnitudeNumber", "(System.Half,System.Half)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "Half", False, "MaxMagnitudeNumber", "(System.Half,System.Half)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "Half", False, "MaxNumber", "(System.Half,System.Half)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "Half", False, "MaxNumber", "(System.Half,System.Half)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "Half", False, "MinMagnitudeNumber", "(System.Half,System.Half)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "Half", False, "MinMagnitudeNumber", "(System.Half,System.Half)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "Half", False, "MinNumber", "(System.Half,System.Half)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "Half", False, "MinNumber", "(System.Half,System.Half)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["System", "Half", False, "BitDecrement", "(System.Half)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System", "Half", False, "BitIncrement", "(System.Half)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System", "Half", False, "CreateChecked<TOther>", "(TOther)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System", "Half", False, "CreateSaturating<TOther>", "(TOther)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System", "Half", False, "CreateTruncating<TOther>", "(TOther)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System", "Half", False, "MaxMagnitudeNumber", "(System.Half,System.Half)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System", "Half", False, "MaxMagnitudeNumber", "(System.Half,System.Half)", "", "Argument[1]", "ReturnValue", "value", "dfc-generated"]
+      - ["System", "Half", False, "MaxNumber", "(System.Half,System.Half)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System", "Half", False, "MaxNumber", "(System.Half,System.Half)", "", "Argument[1]", "ReturnValue", "value", "dfc-generated"]
+      - ["System", "Half", False, "MinMagnitudeNumber", "(System.Half,System.Half)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System", "Half", False, "MinMagnitudeNumber", "(System.Half,System.Half)", "", "Argument[1]", "ReturnValue", "value", "dfc-generated"]
+      - ["System", "Half", False, "MinNumber", "(System.Half,System.Half)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System", "Half", False, "MinNumber", "(System.Half,System.Half)", "", "Argument[1]", "ReturnValue", "value", "dfc-generated"]
       - ["System", "Half", False, "ToString", "(System.IFormatProvider)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "Half", False, "op_UnaryPlus", "(System.Half)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["System", "Half", False, "op_UnaryPlus", "(System.Half)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System", "HashCode", False, "Add<T>", "(T,System.Collections.Generic.IEqualityComparer<T>)", "", "Argument[0]", "Argument[1]", "taint", "df-generated"]
       - ["System", "IAsyncDisposable", True, "DisposeAsync", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System", "IAsyncResult", True, "get_AsyncState", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System", "IAsyncResult", True, "get_AsyncWaitHandle", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "ICloneable", True, "Clone", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "ICloneable", True, "Clone", "()", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["System", "ICloneable", True, "Clone", "()", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
       - ["System", "IConvertible", True, "ToDateTime", "(System.IFormatProvider)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
       - ["System", "IConvertible", True, "ToDecimal", "(System.IFormatProvider)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["System", "IConvertible", True, "ToString", "(System.IFormatProvider)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "IConvertible", True, "ToString", "(System.IFormatProvider)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["System", "IConvertible", True, "ToType", "(System.Type,System.IFormatProvider)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "IConvertible", True, "ToType", "(System.Type,System.IFormatProvider)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "IFormatProvider", True, "GetFormat", "(System.Type)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "IFormattable", True, "ToString", "(System.String,System.IFormatProvider)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "IFormattable", True, "ToString", "(System.String,System.IFormatProvider)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "IServiceProvider", True, "GetService", "(System.Type)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "Int128", False, "Abs", "(System.Int128)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "Int128", False, "Clamp", "(System.Int128,System.Int128,System.Int128)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "Int128", False, "Clamp", "(System.Int128,System.Int128,System.Int128)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "Int128", False, "Clamp", "(System.Int128,System.Int128,System.Int128)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "Int128", False, "CopySign", "(System.Int128,System.Int128)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "Int128", False, "CreateChecked<TOther>", "(TOther)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "Int128", False, "CreateSaturating<TOther>", "(TOther)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "Int128", False, "CreateTruncating<TOther>", "(TOther)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "Int128", False, "Max", "(System.Int128,System.Int128)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "Int128", False, "Max", "(System.Int128,System.Int128)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "Int128", False, "MaxMagnitude", "(System.Int128,System.Int128)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "Int128", False, "MaxMagnitude", "(System.Int128,System.Int128)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "Int128", False, "MaxMagnitudeNumber", "(System.Int128,System.Int128)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "Int128", False, "MaxMagnitudeNumber", "(System.Int128,System.Int128)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "Int128", False, "MaxNumber", "(System.Int128,System.Int128)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "Int128", False, "MaxNumber", "(System.Int128,System.Int128)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "Int128", False, "Min", "(System.Int128,System.Int128)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "Int128", False, "Min", "(System.Int128,System.Int128)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "Int128", False, "MinMagnitude", "(System.Int128,System.Int128)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "Int128", False, "MinMagnitude", "(System.Int128,System.Int128)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "Int128", False, "MinMagnitudeNumber", "(System.Int128,System.Int128)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "Int128", False, "MinMagnitudeNumber", "(System.Int128,System.Int128)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "Int128", False, "MinNumber", "(System.Int128,System.Int128)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "Int128", False, "MinNumber", "(System.Int128,System.Int128)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "Int128", False, "op_LeftShift", "(System.Int128,System.Int32)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "Int128", False, "op_RightShift", "(System.Int128,System.Int32)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "Int128", False, "op_UnaryPlus", "(System.Int128)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "Int128", False, "op_UnsignedRightShift", "(System.Int128,System.Int32)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "IntPtr", False, "Abs", "(System.IntPtr)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "IntPtr", False, "Add", "(System.IntPtr,System.Int32)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "IntPtr", False, "Clamp", "(System.IntPtr,System.IntPtr,System.IntPtr)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "IntPtr", False, "Clamp", "(System.IntPtr,System.IntPtr,System.IntPtr)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "IntPtr", False, "Clamp", "(System.IntPtr,System.IntPtr,System.IntPtr)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "IntPtr", False, "CopySign", "(System.IntPtr,System.IntPtr)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "IntPtr", False, "CreateChecked<TOther>", "(TOther)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "IntPtr", False, "CreateSaturating<TOther>", "(TOther)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "IntPtr", False, "CreateTruncating<TOther>", "(TOther)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "IntPtr", False, "Max", "(System.IntPtr,System.IntPtr)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "IntPtr", False, "Max", "(System.IntPtr,System.IntPtr)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "IntPtr", False, "MaxMagnitude", "(System.IntPtr,System.IntPtr)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "IntPtr", False, "MaxMagnitude", "(System.IntPtr,System.IntPtr)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "IntPtr", False, "MaxMagnitudeNumber", "(System.IntPtr,System.IntPtr)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "IntPtr", False, "MaxMagnitudeNumber", "(System.IntPtr,System.IntPtr)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "IntPtr", False, "MaxNumber", "(System.IntPtr,System.IntPtr)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "IntPtr", False, "MaxNumber", "(System.IntPtr,System.IntPtr)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "IntPtr", False, "Min", "(System.IntPtr,System.IntPtr)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "IntPtr", False, "Min", "(System.IntPtr,System.IntPtr)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "IntPtr", False, "MinMagnitude", "(System.IntPtr,System.IntPtr)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "IntPtr", False, "MinMagnitude", "(System.IntPtr,System.IntPtr)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "IntPtr", False, "MinMagnitudeNumber", "(System.IntPtr,System.IntPtr)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "IntPtr", False, "MinMagnitudeNumber", "(System.IntPtr,System.IntPtr)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "IntPtr", False, "MinNumber", "(System.IntPtr,System.IntPtr)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "IntPtr", False, "MinNumber", "(System.IntPtr,System.IntPtr)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "IntPtr", False, "System.Numerics.IAdditionOperators<nint,nint,nint>.op_Addition", "(System.IntPtr,System.IntPtr)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "IntPtr", False, "System.Numerics.IAdditionOperators<nint,nint,nint>.op_Addition", "(System.IntPtr,System.IntPtr)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "IntPtr", False, "System.Numerics.IAdditionOperators<nint,nint,nint>.op_CheckedAddition", "(System.IntPtr,System.IntPtr)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "IntPtr", False, "System.Numerics.IAdditionOperators<nint,nint,nint>.op_CheckedAddition", "(System.IntPtr,System.IntPtr)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "IntPtr", False, "op_Addition", "(System.IntPtr,System.Int32)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "Lazy<T,TMetadata>", False, "Lazy", "(TMetadata)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System", "Lazy<T,TMetadata>", False, "Lazy", "(TMetadata,System.Boolean)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System", "Lazy<T,TMetadata>", False, "Lazy", "(TMetadata,System.Threading.LazyThreadSafetyMode)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System", "Lazy<T,TMetadata>", False, "get_Metadata", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System", "IConvertible", True, "ToString", "(System.IFormatProvider)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["System", "IConvertible", True, "ToType", "(System.Type,System.IFormatProvider)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["System", "IFormatProvider", True, "GetFormat", "(System.Type)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["System", "IFormattable", True, "ToString", "(System.String,System.IFormatProvider)", "", "Argument[this]", "ReturnValue", "taint", "dfc-generated"]
+      - ["System", "IServiceProvider", True, "GetService", "(System.Type)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["System", "Int128", False, "Abs", "(System.Int128)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System", "Int128", False, "Clamp", "(System.Int128,System.Int128,System.Int128)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System", "Int128", False, "Clamp", "(System.Int128,System.Int128,System.Int128)", "", "Argument[1]", "ReturnValue", "value", "dfc-generated"]
+      - ["System", "Int128", False, "Clamp", "(System.Int128,System.Int128,System.Int128)", "", "Argument[2]", "ReturnValue", "value", "dfc-generated"]
+      - ["System", "Int128", False, "CopySign", "(System.Int128,System.Int128)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System", "Int128", False, "CreateChecked<TOther>", "(TOther)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System", "Int128", False, "CreateSaturating<TOther>", "(TOther)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System", "Int128", False, "CreateTruncating<TOther>", "(TOther)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System", "Int128", False, "Max", "(System.Int128,System.Int128)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System", "Int128", False, "Max", "(System.Int128,System.Int128)", "", "Argument[1]", "ReturnValue", "value", "dfc-generated"]
+      - ["System", "Int128", False, "MaxMagnitude", "(System.Int128,System.Int128)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System", "Int128", False, "MaxMagnitude", "(System.Int128,System.Int128)", "", "Argument[1]", "ReturnValue", "value", "dfc-generated"]
+      - ["System", "Int128", False, "MaxMagnitudeNumber", "(System.Int128,System.Int128)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System", "Int128", False, "MaxMagnitudeNumber", "(System.Int128,System.Int128)", "", "Argument[1]", "ReturnValue", "value", "dfc-generated"]
+      - ["System", "Int128", False, "MaxNumber", "(System.Int128,System.Int128)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System", "Int128", False, "MaxNumber", "(System.Int128,System.Int128)", "", "Argument[1]", "ReturnValue", "value", "dfc-generated"]
+      - ["System", "Int128", False, "Min", "(System.Int128,System.Int128)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System", "Int128", False, "Min", "(System.Int128,System.Int128)", "", "Argument[1]", "ReturnValue", "value", "dfc-generated"]
+      - ["System", "Int128", False, "MinMagnitude", "(System.Int128,System.Int128)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System", "Int128", False, "MinMagnitude", "(System.Int128,System.Int128)", "", "Argument[1]", "ReturnValue", "value", "dfc-generated"]
+      - ["System", "Int128", False, "MinMagnitudeNumber", "(System.Int128,System.Int128)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System", "Int128", False, "MinMagnitudeNumber", "(System.Int128,System.Int128)", "", "Argument[1]", "ReturnValue", "value", "dfc-generated"]
+      - ["System", "Int128", False, "MinNumber", "(System.Int128,System.Int128)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System", "Int128", False, "MinNumber", "(System.Int128,System.Int128)", "", "Argument[1]", "ReturnValue", "value", "dfc-generated"]
+      - ["System", "Int128", False, "op_LeftShift", "(System.Int128,System.Int32)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System", "Int128", False, "op_RightShift", "(System.Int128,System.Int32)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System", "Int128", False, "op_UnaryPlus", "(System.Int128)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System", "Int128", False, "op_UnsignedRightShift", "(System.Int128,System.Int32)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System", "IntPtr", False, "Abs", "(System.IntPtr)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System", "IntPtr", False, "Add", "(System.IntPtr,System.Int32)", "", "Argument[0]", "ReturnValue", "taint", "dfc-generated"]
+      - ["System", "IntPtr", False, "Clamp", "(System.IntPtr,System.IntPtr,System.IntPtr)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System", "IntPtr", False, "Clamp", "(System.IntPtr,System.IntPtr,System.IntPtr)", "", "Argument[1]", "ReturnValue", "value", "dfc-generated"]
+      - ["System", "IntPtr", False, "Clamp", "(System.IntPtr,System.IntPtr,System.IntPtr)", "", "Argument[2]", "ReturnValue", "value", "dfc-generated"]
+      - ["System", "IntPtr", False, "CopySign", "(System.IntPtr,System.IntPtr)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System", "IntPtr", False, "CreateChecked<TOther>", "(TOther)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System", "IntPtr", False, "CreateSaturating<TOther>", "(TOther)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System", "IntPtr", False, "CreateTruncating<TOther>", "(TOther)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System", "IntPtr", False, "Max", "(System.IntPtr,System.IntPtr)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System", "IntPtr", False, "Max", "(System.IntPtr,System.IntPtr)", "", "Argument[1]", "ReturnValue", "value", "dfc-generated"]
+      - ["System", "IntPtr", False, "MaxMagnitude", "(System.IntPtr,System.IntPtr)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System", "IntPtr", False, "MaxMagnitude", "(System.IntPtr,System.IntPtr)", "", "Argument[1]", "ReturnValue", "value", "dfc-generated"]
+      - ["System", "IntPtr", False, "MaxMagnitudeNumber", "(System.IntPtr,System.IntPtr)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System", "IntPtr", False, "MaxMagnitudeNumber", "(System.IntPtr,System.IntPtr)", "", "Argument[1]", "ReturnValue", "value", "dfc-generated"]
+      - ["System", "IntPtr", False, "MaxNumber", "(System.IntPtr,System.IntPtr)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System", "IntPtr", False, "MaxNumber", "(System.IntPtr,System.IntPtr)", "", "Argument[1]", "ReturnValue", "value", "dfc-generated"]
+      - ["System", "IntPtr", False, "Min", "(System.IntPtr,System.IntPtr)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System", "IntPtr", False, "Min", "(System.IntPtr,System.IntPtr)", "", "Argument[1]", "ReturnValue", "value", "dfc-generated"]
+      - ["System", "IntPtr", False, "MinMagnitude", "(System.IntPtr,System.IntPtr)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System", "IntPtr", False, "MinMagnitude", "(System.IntPtr,System.IntPtr)", "", "Argument[1]", "ReturnValue", "value", "dfc-generated"]
+      - ["System", "IntPtr", False, "MinMagnitudeNumber", "(System.IntPtr,System.IntPtr)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System", "IntPtr", False, "MinMagnitudeNumber", "(System.IntPtr,System.IntPtr)", "", "Argument[1]", "ReturnValue", "value", "dfc-generated"]
+      - ["System", "IntPtr", False, "MinNumber", "(System.IntPtr,System.IntPtr)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System", "IntPtr", False, "MinNumber", "(System.IntPtr,System.IntPtr)", "", "Argument[1]", "ReturnValue", "value", "dfc-generated"]
+      - ["System", "IntPtr", False, "System.Numerics.IAdditionOperators<nint,nint,nint>.op_Addition", "(System.IntPtr,System.IntPtr)", "", "Argument[0]", "ReturnValue", "taint", "dfc-generated"]
+      - ["System", "IntPtr", False, "System.Numerics.IAdditionOperators<nint,nint,nint>.op_Addition", "(System.IntPtr,System.IntPtr)", "", "Argument[1]", "ReturnValue", "taint", "dfc-generated"]
+      - ["System", "IntPtr", False, "System.Numerics.IAdditionOperators<nint,nint,nint>.op_CheckedAddition", "(System.IntPtr,System.IntPtr)", "", "Argument[0]", "ReturnValue", "taint", "dfc-generated"]
+      - ["System", "IntPtr", False, "System.Numerics.IAdditionOperators<nint,nint,nint>.op_CheckedAddition", "(System.IntPtr,System.IntPtr)", "", "Argument[1]", "ReturnValue", "taint", "dfc-generated"]
+      - ["System", "IntPtr", False, "op_Addition", "(System.IntPtr,System.Int32)", "", "Argument[0]", "ReturnValue", "taint", "dfc-generated"]
+      - ["System", "Lazy<T,TMetadata>", False, "Lazy", "(System.Func<T>,TMetadata)", "", "Argument[1]", "Argument[this].SyntheticField[System.Lazy`2._metadata]", "value", "dfc-generated"]
+      - ["System", "Lazy<T,TMetadata>", False, "Lazy", "(System.Func<T>,TMetadata,System.Boolean)", "", "Argument[1]", "Argument[this].SyntheticField[System.Lazy`2._metadata]", "value", "dfc-generated"]
+      - ["System", "Lazy<T,TMetadata>", False, "Lazy", "(System.Func<T>,TMetadata,System.Threading.LazyThreadSafetyMode)", "", "Argument[1]", "Argument[this].SyntheticField[System.Lazy`2._metadata]", "value", "dfc-generated"]
+      - ["System", "Lazy<T,TMetadata>", False, "Lazy", "(TMetadata)", "", "Argument[0]", "Argument[this].SyntheticField[System.Lazy`2._metadata]", "value", "dfc-generated"]
+      - ["System", "Lazy<T,TMetadata>", False, "Lazy", "(TMetadata,System.Boolean)", "", "Argument[0]", "Argument[this].SyntheticField[System.Lazy`2._metadata]", "value", "dfc-generated"]
+      - ["System", "Lazy<T,TMetadata>", False, "Lazy", "(TMetadata,System.Threading.LazyThreadSafetyMode)", "", "Argument[0]", "Argument[this].SyntheticField[System.Lazy`2._metadata]", "value", "dfc-generated"]
+      - ["System", "Lazy<T,TMetadata>", False, "get_Metadata", "()", "", "Argument[this].SyntheticField[System.Lazy`2._metadata]", "ReturnValue", "value", "dfc-generated"]
       - ["System", "Lazy<T>", False, "Lazy", "(T)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System", "Lazy<T>", False, "ToString", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "Math", False, "Abs", "(System.IntPtr)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "Math", False, "Clamp", "(System.IntPtr,System.IntPtr,System.IntPtr)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "Math", False, "Clamp", "(System.IntPtr,System.IntPtr,System.IntPtr)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "Math", False, "Clamp", "(System.IntPtr,System.IntPtr,System.IntPtr)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "Math", False, "Clamp", "(System.UIntPtr,System.UIntPtr,System.UIntPtr)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "Math", False, "Clamp", "(System.UIntPtr,System.UIntPtr,System.UIntPtr)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "Math", False, "Clamp", "(System.UIntPtr,System.UIntPtr,System.UIntPtr)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "Math", False, "Max", "(System.IntPtr,System.IntPtr)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "Math", False, "Max", "(System.IntPtr,System.IntPtr)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "Math", False, "Max", "(System.UIntPtr,System.UIntPtr)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "Math", False, "Max", "(System.UIntPtr,System.UIntPtr)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "Math", False, "Min", "(System.IntPtr,System.IntPtr)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "Math", False, "Min", "(System.IntPtr,System.IntPtr)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "Math", False, "Min", "(System.UIntPtr,System.UIntPtr)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "Math", False, "Min", "(System.UIntPtr,System.UIntPtr)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "Memory<T>", False, "CopyTo", "(System.Memory<T>)", "", "Argument[this]", "Argument[0]", "taint", "df-generated"]
-      - ["System", "Memory<T>", False, "Memory", "(T[])", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["System", "Memory<T>", False, "Memory", "(T[],System.Int32,System.Int32)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["System", "Memory<T>", False, "Slice", "(System.Int32)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "Memory<T>", False, "Slice", "(System.Int32,System.Int32)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "Memory<T>", False, "ToArray", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "Memory<T>", False, "ToString", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "Memory<T>", False, "TryCopyTo", "(System.Memory<T>)", "", "Argument[this]", "Argument[0]", "taint", "df-generated"]
+      - ["System", "Math", False, "Abs", "(System.IntPtr)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System", "Math", False, "Clamp", "(System.IntPtr,System.IntPtr,System.IntPtr)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System", "Math", False, "Clamp", "(System.IntPtr,System.IntPtr,System.IntPtr)", "", "Argument[1]", "ReturnValue", "value", "dfc-generated"]
+      - ["System", "Math", False, "Clamp", "(System.IntPtr,System.IntPtr,System.IntPtr)", "", "Argument[2]", "ReturnValue", "value", "dfc-generated"]
+      - ["System", "Math", False, "Clamp", "(System.UIntPtr,System.UIntPtr,System.UIntPtr)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System", "Math", False, "Clamp", "(System.UIntPtr,System.UIntPtr,System.UIntPtr)", "", "Argument[1]", "ReturnValue", "value", "dfc-generated"]
+      - ["System", "Math", False, "Clamp", "(System.UIntPtr,System.UIntPtr,System.UIntPtr)", "", "Argument[2]", "ReturnValue", "value", "dfc-generated"]
+      - ["System", "Math", False, "Max", "(System.IntPtr,System.IntPtr)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System", "Math", False, "Max", "(System.IntPtr,System.IntPtr)", "", "Argument[1]", "ReturnValue", "value", "dfc-generated"]
+      - ["System", "Math", False, "Max", "(System.UIntPtr,System.UIntPtr)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System", "Math", False, "Max", "(System.UIntPtr,System.UIntPtr)", "", "Argument[1]", "ReturnValue", "value", "dfc-generated"]
+      - ["System", "Math", False, "Min", "(System.IntPtr,System.IntPtr)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System", "Math", False, "Min", "(System.IntPtr,System.IntPtr)", "", "Argument[1]", "ReturnValue", "value", "dfc-generated"]
+      - ["System", "Math", False, "Min", "(System.UIntPtr,System.UIntPtr)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System", "Math", False, "Min", "(System.UIntPtr,System.UIntPtr)", "", "Argument[1]", "ReturnValue", "value", "dfc-generated"]
+      - ["System", "Memory<T>", False, "CopyTo", "(System.Memory<T>)", "", "Argument[this].Property[System.Memory`1.Span].Element", "Argument[0].Property[System.Memory`1.Span].Element", "value", "dfc-generated"]
+      - ["System", "Memory<T>", False, "Memory", "(T[])", "", "Argument[0]", "Argument[this].SyntheticField[System.Memory`1._object]", "value", "dfc-generated"]
+      - ["System", "Memory<T>", False, "Memory", "(T[],System.Int32,System.Int32)", "", "Argument[0]", "Argument[this].SyntheticField[System.Memory`1._object]", "value", "dfc-generated"]
+      - ["System", "Memory<T>", False, "Slice", "(System.Int32)", "", "Argument[this].SyntheticField[System.Memory`1._object]", "ReturnValue.SyntheticField[System.Memory`1._object]", "value", "dfc-generated"]
+      - ["System", "Memory<T>", False, "Slice", "(System.Int32,System.Int32)", "", "Argument[this].SyntheticField[System.Memory`1._object]", "ReturnValue.SyntheticField[System.Memory`1._object]", "value", "dfc-generated"]
+      - ["System", "Memory<T>", False, "ToArray", "()", "", "Argument[this].Property[System.Memory`1.Span].Element", "ReturnValue.Element", "value", "dfc-generated"]
+      - ["System", "Memory<T>", False, "ToString", "()", "", "Argument[this].SyntheticField[System.Memory`1._object]", "ReturnValue", "value", "dfc-generated"]
+      - ["System", "Memory<T>", False, "TryCopyTo", "(System.Memory<T>)", "", "Argument[this].Property[System.Memory`1.Span].Element", "Argument[0].Property[System.Memory`1.Span].Element", "value", "dfc-generated"]
       - ["System", "MemoryExtensions+TryWriteInterpolatedStringHandler", False, "TryWriteInterpolatedStringHandler", "(System.Int32,System.Int32,System.Span<System.Char>,System.Boolean)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
       - ["System", "MemoryExtensions+TryWriteInterpolatedStringHandler", False, "TryWriteInterpolatedStringHandler", "(System.Int32,System.Int32,System.Span<System.Char>,System.IFormatProvider,System.Boolean)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
       - ["System", "MemoryExtensions+TryWriteInterpolatedStringHandler", False, "TryWriteInterpolatedStringHandler", "(System.Int32,System.Int32,System.Span<System.Char>,System.IFormatProvider,System.Boolean)", "", "Argument[3]", "Argument[this]", "taint", "df-generated"]
-      - ["System", "MemoryExtensions", False, "AsMemory", "(System.String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "MemoryExtensions", False, "AsMemory", "(System.String,System.Index)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "MemoryExtensions", False, "AsMemory", "(System.String,System.Int32)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "MemoryExtensions", False, "AsMemory", "(System.String,System.Int32,System.Int32)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "MemoryExtensions", False, "AsMemory", "(System.String,System.Range)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["System", "MemoryExtensions", False, "AsMemory", "(System.String)", "", "Argument[0]", "ReturnValue.SyntheticField[System.ReadOnlyMemory`1._object]", "value", "dfc-generated"]
+      - ["System", "MemoryExtensions", False, "AsMemory", "(System.String,System.Index)", "", "Argument[0]", "ReturnValue.SyntheticField[System.ReadOnlyMemory`1._object]", "value", "dfc-generated"]
+      - ["System", "MemoryExtensions", False, "AsMemory", "(System.String,System.Int32)", "", "Argument[0]", "ReturnValue.SyntheticField[System.ReadOnlyMemory`1._object]", "value", "dfc-generated"]
+      - ["System", "MemoryExtensions", False, "AsMemory", "(System.String,System.Int32,System.Int32)", "", "Argument[0]", "ReturnValue.SyntheticField[System.ReadOnlyMemory`1._object]", "value", "dfc-generated"]
+      - ["System", "MemoryExtensions", False, "AsMemory", "(System.String,System.Range)", "", "Argument[0]", "ReturnValue.SyntheticField[System.ReadOnlyMemory`1._object]", "value", "dfc-generated"]
       - ["System", "MemoryExtensions", False, "AsMemory<T>", "(System.ArraySegment<T>)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
       - ["System", "MemoryExtensions", False, "AsMemory<T>", "(System.ArraySegment<T>,System.Int32)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
       - ["System", "MemoryExtensions", False, "AsMemory<T>", "(System.ArraySegment<T>,System.Int32,System.Int32)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
@@ -214,154 +226,186 @@ extensions:
       - ["System", "MemoryExtensions", False, "AsMemory<T>", "(T[],System.Int32)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
       - ["System", "MemoryExtensions", False, "AsMemory<T>", "(T[],System.Int32,System.Int32)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
       - ["System", "MemoryExtensions", False, "AsMemory<T>", "(T[],System.Range)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["System", "MemoryExtensions", False, "AsSpan<T>", "(System.ArraySegment<T>)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["System", "MemoryExtensions", False, "AsSpan<T>", "(System.ArraySegment<T>,System.Index)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["System", "MemoryExtensions", False, "AsSpan<T>", "(System.ArraySegment<T>,System.Int32)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["System", "MemoryExtensions", False, "AsSpan<T>", "(System.ArraySegment<T>,System.Int32,System.Int32)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["System", "MemoryExtensions", False, "AsSpan<T>", "(System.ArraySegment<T>,System.Range)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["System", "MemoryExtensions", False, "AsSpan<T>", "(T[])", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["System", "MemoryExtensions", False, "AsSpan<T>", "(T[],System.Int32,System.Int32)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["System", "MemoryExtensions", False, "CopyTo<T>", "(T[],System.Memory<T>)", "", "Argument[0].Element", "Argument[1]", "taint", "df-generated"]
-      - ["System", "MemoryExtensions", False, "CopyTo<T>", "(T[],System.Span<T>)", "", "Argument[0].Element", "Argument[1]", "taint", "df-generated"]
-      - ["System", "MemoryExtensions", False, "EnumerateLines", "(System.ReadOnlySpan<System.Char>)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["System", "MemoryExtensions", False, "AsSpan<T>", "(System.ArraySegment<T>)", "", "Argument[0].Property[System.ArraySegment`1.Array].Element", "ReturnValue.Element", "value", "dfc-generated"]
+      - ["System", "MemoryExtensions", False, "AsSpan<T>", "(System.ArraySegment<T>,System.Index)", "", "Argument[0].Property[System.ArraySegment`1.Array].Element", "ReturnValue.Element", "value", "dfc-generated"]
+      - ["System", "MemoryExtensions", False, "AsSpan<T>", "(System.ArraySegment<T>,System.Int32)", "", "Argument[0].Property[System.ArraySegment`1.Array].Element", "ReturnValue.Element", "value", "dfc-generated"]
+      - ["System", "MemoryExtensions", False, "AsSpan<T>", "(System.ArraySegment<T>,System.Int32,System.Int32)", "", "Argument[0].Property[System.ArraySegment`1.Array].Element", "ReturnValue.Element", "value", "dfc-generated"]
+      - ["System", "MemoryExtensions", False, "AsSpan<T>", "(System.ArraySegment<T>,System.Range)", "", "Argument[0].Property[System.ArraySegment`1.Array].Element", "ReturnValue.Element", "value", "dfc-generated"]
+      - ["System", "MemoryExtensions", False, "AsSpan<T>", "(T[])", "", "Argument[0].Element", "ReturnValue.Element", "value", "dfc-generated"]
+      - ["System", "MemoryExtensions", False, "AsSpan<T>", "(T[],System.Int32,System.Int32)", "", "Argument[0].Element", "ReturnValue.Element", "value", "dfc-generated"]
+      - ["System", "MemoryExtensions", False, "CommonPrefixLength<T>", "(System.ReadOnlySpan<T>,System.ReadOnlySpan<T>,System.Collections.Generic.IEqualityComparer<T>)", "", "Argument[0]", "Argument[2]", "taint", "df-generated"]
+      - ["System", "MemoryExtensions", False, "CommonPrefixLength<T>", "(System.ReadOnlySpan<T>,System.ReadOnlySpan<T>,System.Collections.Generic.IEqualityComparer<T>)", "", "Argument[1]", "Argument[2]", "taint", "df-generated"]
+      - ["System", "MemoryExtensions", False, "CommonPrefixLength<T>", "(System.Span<T>,System.ReadOnlySpan<T>,System.Collections.Generic.IEqualityComparer<T>)", "", "Argument[1]", "Argument[2]", "taint", "df-generated"]
+      - ["System", "MemoryExtensions", False, "CopyTo<T>", "(T[],System.Memory<T>)", "", "Argument[0].Element", "Argument[1].Property[System.Memory`1.Span].Element", "value", "dfc-generated"]
+      - ["System", "MemoryExtensions", False, "CopyTo<T>", "(T[],System.Span<T>)", "", "Argument[0].Element", "Argument[1].Element", "value", "dfc-generated"]
+      - ["System", "MemoryExtensions", False, "EnumerateLines", "(System.ReadOnlySpan<System.Char>)", "", "Argument[0]", "ReturnValue.SyntheticField[System.Text.SpanLineEnumerator._remaining]", "value", "dfc-generated"]
       - ["System", "MemoryExtensions", False, "EnumerateRunes", "(System.ReadOnlySpan<System.Char>)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["System", "MemoryExtensions", False, "SequenceEqual<T>", "(System.ReadOnlySpan<T>,System.ReadOnlySpan<T>,System.Collections.Generic.IEqualityComparer<T>)", "", "Argument[0]", "Argument[2]", "taint", "df-generated"]
+      - ["System", "MemoryExtensions", False, "SequenceEqual<T>", "(System.ReadOnlySpan<T>,System.ReadOnlySpan<T>,System.Collections.Generic.IEqualityComparer<T>)", "", "Argument[1]", "Argument[2]", "taint", "df-generated"]
+      - ["System", "MemoryExtensions", False, "SequenceEqual<T>", "(System.Span<T>,System.ReadOnlySpan<T>,System.Collections.Generic.IEqualityComparer<T>)", "", "Argument[1]", "Argument[2]", "taint", "df-generated"]
+      - ["System", "MemoryExtensions", False, "Sort<T>", "(System.Span<T>,System.Comparison<T>)", "", "Argument[0].Element", "Argument[1].Parameter[0]", "value", "dfc-generated"]
+      - ["System", "MemoryExtensions", False, "Sort<T>", "(System.Span<T>,System.Comparison<T>)", "", "Argument[0].Element", "Argument[1].Parameter[1]", "value", "dfc-generated"]
       - ["System", "MemoryExtensions", False, "Trim", "(System.Memory<System.Char>)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "MemoryExtensions", False, "Trim", "(System.ReadOnlyMemory<System.Char>)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "MemoryExtensions", False, "Trim", "(System.ReadOnlySpan<System.Char>)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "MemoryExtensions", False, "Trim", "(System.ReadOnlySpan<System.Char>,System.Char)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "MemoryExtensions", False, "Trim", "(System.ReadOnlySpan<System.Char>,System.ReadOnlySpan<System.Char>)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "MemoryExtensions", False, "Trim", "(System.Span<System.Char>)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "MemoryExtensions", False, "Trim<T>", "(System.Memory<T>,System.ReadOnlySpan<T>)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["System", "MemoryExtensions", False, "Trim", "(System.ReadOnlyMemory<System.Char>)", "", "Argument[0].SyntheticField[System.ReadOnlyMemory`1._object]", "ReturnValue.SyntheticField[System.ReadOnlyMemory`1._object]", "value", "dfc-generated"]
+      - ["System", "MemoryExtensions", False, "Trim", "(System.ReadOnlySpan<System.Char>)", "", "Argument[0].Element", "ReturnValue.Element", "value", "dfc-generated"]
+      - ["System", "MemoryExtensions", False, "Trim", "(System.ReadOnlySpan<System.Char>)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System", "MemoryExtensions", False, "Trim", "(System.ReadOnlySpan<System.Char>,System.Char)", "", "Argument[0].Element", "ReturnValue.Element", "value", "dfc-generated"]
+      - ["System", "MemoryExtensions", False, "Trim", "(System.ReadOnlySpan<System.Char>,System.ReadOnlySpan<System.Char>)", "", "Argument[0].Element", "ReturnValue.Element", "value", "dfc-generated"]
+      - ["System", "MemoryExtensions", False, "Trim", "(System.Span<System.Char>)", "", "Argument[0].Element", "ReturnValue.Element", "value", "dfc-generated"]
+      - ["System", "MemoryExtensions", False, "Trim", "(System.Span<System.Char>)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System", "MemoryExtensions", False, "Trim<T>", "(System.Memory<T>,System.ReadOnlySpan<T>)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
       - ["System", "MemoryExtensions", False, "Trim<T>", "(System.Memory<T>,T)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "MemoryExtensions", False, "Trim<T>", "(System.ReadOnlyMemory<T>,System.ReadOnlySpan<T>)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["System", "MemoryExtensions", False, "Trim<T>", "(System.ReadOnlyMemory<T>,System.ReadOnlySpan<T>)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
       - ["System", "MemoryExtensions", False, "Trim<T>", "(System.ReadOnlyMemory<T>,T)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "MemoryExtensions", False, "Trim<T>", "(System.ReadOnlySpan<T>,System.ReadOnlySpan<T>)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "MemoryExtensions", False, "Trim<T>", "(System.ReadOnlySpan<T>,T)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "MemoryExtensions", False, "Trim<T>", "(System.Span<T>,System.ReadOnlySpan<T>)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "MemoryExtensions", False, "Trim<T>", "(System.Span<T>,T)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["System", "MemoryExtensions", False, "Trim<T>", "(System.ReadOnlySpan<T>,System.ReadOnlySpan<T>)", "", "Argument[0].Element", "ReturnValue.Element", "value", "dfc-generated"]
+      - ["System", "MemoryExtensions", False, "Trim<T>", "(System.ReadOnlySpan<T>,System.ReadOnlySpan<T>)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System", "MemoryExtensions", False, "Trim<T>", "(System.ReadOnlySpan<T>,T)", "", "Argument[0].Element", "ReturnValue.Element", "value", "dfc-generated"]
+      - ["System", "MemoryExtensions", False, "Trim<T>", "(System.Span<T>,System.ReadOnlySpan<T>)", "", "Argument[0].Element", "ReturnValue.Element", "value", "dfc-generated"]
+      - ["System", "MemoryExtensions", False, "Trim<T>", "(System.Span<T>,System.ReadOnlySpan<T>)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System", "MemoryExtensions", False, "Trim<T>", "(System.Span<T>,T)", "", "Argument[0].Element", "ReturnValue.Element", "value", "dfc-generated"]
       - ["System", "MemoryExtensions", False, "TrimEnd", "(System.Memory<System.Char>)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "MemoryExtensions", False, "TrimEnd", "(System.ReadOnlyMemory<System.Char>)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "MemoryExtensions", False, "TrimEnd", "(System.ReadOnlySpan<System.Char>)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "MemoryExtensions", False, "TrimEnd", "(System.ReadOnlySpan<System.Char>,System.Char)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "MemoryExtensions", False, "TrimEnd", "(System.ReadOnlySpan<System.Char>,System.ReadOnlySpan<System.Char>)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "MemoryExtensions", False, "TrimEnd", "(System.Span<System.Char>)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "MemoryExtensions", False, "TrimEnd<T>", "(System.Memory<T>,System.ReadOnlySpan<T>)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["System", "MemoryExtensions", False, "TrimEnd", "(System.ReadOnlyMemory<System.Char>)", "", "Argument[0].SyntheticField[System.ReadOnlyMemory`1._object]", "ReturnValue.SyntheticField[System.ReadOnlyMemory`1._object]", "value", "dfc-generated"]
+      - ["System", "MemoryExtensions", False, "TrimEnd", "(System.ReadOnlySpan<System.Char>)", "", "Argument[0].Element", "ReturnValue.Element", "value", "dfc-generated"]
+      - ["System", "MemoryExtensions", False, "TrimEnd", "(System.ReadOnlySpan<System.Char>,System.Char)", "", "Argument[0].Element", "ReturnValue.Element", "value", "dfc-generated"]
+      - ["System", "MemoryExtensions", False, "TrimEnd", "(System.ReadOnlySpan<System.Char>,System.ReadOnlySpan<System.Char>)", "", "Argument[0].Element", "ReturnValue.Element", "value", "dfc-generated"]
+      - ["System", "MemoryExtensions", False, "TrimEnd", "(System.Span<System.Char>)", "", "Argument[0].Element", "ReturnValue.Element", "value", "dfc-generated"]
+      - ["System", "MemoryExtensions", False, "TrimEnd<T>", "(System.Memory<T>,System.ReadOnlySpan<T>)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
       - ["System", "MemoryExtensions", False, "TrimEnd<T>", "(System.Memory<T>,T)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "MemoryExtensions", False, "TrimEnd<T>", "(System.ReadOnlyMemory<T>,System.ReadOnlySpan<T>)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["System", "MemoryExtensions", False, "TrimEnd<T>", "(System.ReadOnlyMemory<T>,System.ReadOnlySpan<T>)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
       - ["System", "MemoryExtensions", False, "TrimEnd<T>", "(System.ReadOnlyMemory<T>,T)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "MemoryExtensions", False, "TrimEnd<T>", "(System.ReadOnlySpan<T>,System.ReadOnlySpan<T>)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "MemoryExtensions", False, "TrimEnd<T>", "(System.ReadOnlySpan<T>,T)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "MemoryExtensions", False, "TrimEnd<T>", "(System.Span<T>,System.ReadOnlySpan<T>)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "MemoryExtensions", False, "TrimEnd<T>", "(System.Span<T>,T)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["System", "MemoryExtensions", False, "TrimEnd<T>", "(System.ReadOnlySpan<T>,System.ReadOnlySpan<T>)", "", "Argument[0].Element", "ReturnValue.Element", "value", "dfc-generated"]
+      - ["System", "MemoryExtensions", False, "TrimEnd<T>", "(System.ReadOnlySpan<T>,System.ReadOnlySpan<T>)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System", "MemoryExtensions", False, "TrimEnd<T>", "(System.ReadOnlySpan<T>,T)", "", "Argument[0].Element", "ReturnValue.Element", "value", "dfc-generated"]
+      - ["System", "MemoryExtensions", False, "TrimEnd<T>", "(System.Span<T>,System.ReadOnlySpan<T>)", "", "Argument[0].Element", "ReturnValue.Element", "value", "dfc-generated"]
+      - ["System", "MemoryExtensions", False, "TrimEnd<T>", "(System.Span<T>,System.ReadOnlySpan<T>)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System", "MemoryExtensions", False, "TrimEnd<T>", "(System.Span<T>,T)", "", "Argument[0].Element", "ReturnValue.Element", "value", "dfc-generated"]
       - ["System", "MemoryExtensions", False, "TrimStart", "(System.Memory<System.Char>)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "MemoryExtensions", False, "TrimStart", "(System.ReadOnlyMemory<System.Char>)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "MemoryExtensions", False, "TrimStart", "(System.ReadOnlySpan<System.Char>)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "MemoryExtensions", False, "TrimStart", "(System.ReadOnlySpan<System.Char>,System.Char)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "MemoryExtensions", False, "TrimStart", "(System.ReadOnlySpan<System.Char>,System.ReadOnlySpan<System.Char>)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "MemoryExtensions", False, "TrimStart", "(System.Span<System.Char>)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "MemoryExtensions", False, "TrimStart<T>", "(System.Memory<T>,System.ReadOnlySpan<T>)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["System", "MemoryExtensions", False, "TrimStart", "(System.ReadOnlyMemory<System.Char>)", "", "Argument[0].SyntheticField[System.ReadOnlyMemory`1._object]", "ReturnValue.SyntheticField[System.ReadOnlyMemory`1._object]", "value", "dfc-generated"]
+      - ["System", "MemoryExtensions", False, "TrimStart", "(System.ReadOnlySpan<System.Char>)", "", "Argument[0].Element", "ReturnValue.Element", "value", "dfc-generated"]
+      - ["System", "MemoryExtensions", False, "TrimStart", "(System.ReadOnlySpan<System.Char>,System.Char)", "", "Argument[0].Element", "ReturnValue.Element", "value", "dfc-generated"]
+      - ["System", "MemoryExtensions", False, "TrimStart", "(System.ReadOnlySpan<System.Char>,System.ReadOnlySpan<System.Char>)", "", "Argument[0].Element", "ReturnValue.Element", "value", "dfc-generated"]
+      - ["System", "MemoryExtensions", False, "TrimStart", "(System.Span<System.Char>)", "", "Argument[0].Element", "ReturnValue.Element", "value", "dfc-generated"]
+      - ["System", "MemoryExtensions", False, "TrimStart<T>", "(System.Memory<T>,System.ReadOnlySpan<T>)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
       - ["System", "MemoryExtensions", False, "TrimStart<T>", "(System.Memory<T>,T)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "MemoryExtensions", False, "TrimStart<T>", "(System.ReadOnlyMemory<T>,System.ReadOnlySpan<T>)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["System", "MemoryExtensions", False, "TrimStart<T>", "(System.ReadOnlyMemory<T>,System.ReadOnlySpan<T>)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
       - ["System", "MemoryExtensions", False, "TrimStart<T>", "(System.ReadOnlyMemory<T>,T)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "MemoryExtensions", False, "TrimStart<T>", "(System.ReadOnlySpan<T>,System.ReadOnlySpan<T>)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "MemoryExtensions", False, "TrimStart<T>", "(System.ReadOnlySpan<T>,T)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "MemoryExtensions", False, "TrimStart<T>", "(System.Span<T>,System.ReadOnlySpan<T>)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "MemoryExtensions", False, "TrimStart<T>", "(System.Span<T>,T)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "MissingFieldException", False, "MissingFieldException", "(System.String,System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System", "MissingFieldException", False, "MissingFieldException", "(System.String,System.String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["System", "MissingMemberException", False, "MissingMemberException", "(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System", "MissingMemberException", False, "MissingMemberException", "(System.String,System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System", "MissingMemberException", False, "MissingMemberException", "(System.String,System.String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["System", "MissingMethodException", False, "MissingMethodException", "(System.String,System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System", "MissingMethodException", False, "MissingMethodException", "(System.String,System.String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["System", "MemoryExtensions", False, "TrimStart<T>", "(System.ReadOnlySpan<T>,System.ReadOnlySpan<T>)", "", "Argument[0].Element", "ReturnValue.Element", "value", "dfc-generated"]
+      - ["System", "MemoryExtensions", False, "TrimStart<T>", "(System.ReadOnlySpan<T>,System.ReadOnlySpan<T>)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System", "MemoryExtensions", False, "TrimStart<T>", "(System.ReadOnlySpan<T>,T)", "", "Argument[0].Element", "ReturnValue.Element", "value", "dfc-generated"]
+      - ["System", "MemoryExtensions", False, "TrimStart<T>", "(System.Span<T>,System.ReadOnlySpan<T>)", "", "Argument[0].Element", "ReturnValue.Element", "value", "dfc-generated"]
+      - ["System", "MemoryExtensions", False, "TrimStart<T>", "(System.Span<T>,System.ReadOnlySpan<T>)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System", "MemoryExtensions", False, "TrimStart<T>", "(System.Span<T>,T)", "", "Argument[0].Element", "ReturnValue.Element", "value", "dfc-generated"]
+      - ["System", "MemoryExtensions", False, "TryWrite", "(System.Span<System.Char>,System.IFormatProvider,System.MemoryExtensions+TryWriteInterpolatedStringHandler,System.Int32)", "", "Argument[2]", "ReturnValue", "value", "dfc-generated"]
+      - ["System", "MemoryExtensions", False, "TryWrite", "(System.Span<System.Char>,System.MemoryExtensions+TryWriteInterpolatedStringHandler,System.Int32)", "", "Argument[1]", "ReturnValue", "value", "dfc-generated"]
+      - ["System", "MissingFieldException", False, "MissingFieldException", "(System.String,System.String)", "", "Argument[0]", "Argument[this].Field[System.MissingMemberException.ClassName]", "value", "dfc-generated"]
+      - ["System", "MissingFieldException", False, "MissingFieldException", "(System.String,System.String)", "", "Argument[1]", "Argument[this].Field[System.MissingMemberException.MemberName]", "value", "dfc-generated"]
+      - ["System", "MissingMemberException", False, "MissingMemberException", "(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)", "", "Argument[0].SyntheticField[System.Runtime.Serialization.SerializationInfo._values].Element", "Argument[this].Field[System.MissingMemberException.ClassName]", "value", "dfc-generated"]
+      - ["System", "MissingMemberException", False, "MissingMemberException", "(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)", "", "Argument[0].SyntheticField[System.Runtime.Serialization.SerializationInfo._values].Element", "Argument[this].Field[System.MissingMemberException.MemberName]", "value", "dfc-generated"]
+      - ["System", "MissingMemberException", False, "MissingMemberException", "(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)", "", "Argument[0].SyntheticField[System.Runtime.Serialization.SerializationInfo._values].Element", "Argument[this].Field[System.MissingMemberException.Signature]", "value", "dfc-generated"]
+      - ["System", "MissingMemberException", False, "MissingMemberException", "(System.String,System.String)", "", "Argument[0]", "Argument[this].Field[System.MissingMemberException.ClassName]", "value", "dfc-generated"]
+      - ["System", "MissingMemberException", False, "MissingMemberException", "(System.String,System.String)", "", "Argument[1]", "Argument[this].Field[System.MissingMemberException.MemberName]", "value", "dfc-generated"]
+      - ["System", "MissingMethodException", False, "MissingMethodException", "(System.String,System.String)", "", "Argument[0]", "Argument[this].Field[System.MissingMemberException.ClassName]", "value", "dfc-generated"]
+      - ["System", "MissingMethodException", False, "MissingMethodException", "(System.String,System.String)", "", "Argument[1]", "Argument[this].Field[System.MissingMemberException.MemberName]", "value", "dfc-generated"]
+      - ["System", "MulticastDelegate", False, "CombineImpl", "(System.Delegate)", "", "Argument[0]", "ReturnValue.SyntheticField[System.MulticastDelegate.delegates].Element", "value", "dfc-generated"]
+      - ["System", "MulticastDelegate", False, "CombineImpl", "(System.Delegate)", "", "Argument[this]", "ReturnValue.SyntheticField[System.MulticastDelegate.delegates].Element", "value", "dfc-generated"]
+      - ["System", "MulticastDelegate", False, "GetInvocationList", "()", "", "Argument[this].SyntheticField[System.MulticastDelegate.delegates].Element", "ReturnValue.Element", "value", "dfc-generated"]
+      - ["System", "MulticastDelegate", False, "RemoveImpl", "(System.Delegate)", "", "Argument[this].SyntheticField[System.MulticastDelegate.delegates].Element", "ReturnValue", "value", "dfc-generated"]
       - ["System", "Nullable<T>", False, "ToString", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "ObjectDisposedException", False, "ObjectDisposedException", "(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System", "ObjectDisposedException", False, "ObjectDisposedException", "(System.String,System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System", "ObjectDisposedException", False, "get_ObjectName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "OperatingSystem", False, "ToString", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System", "ObjectDisposedException", False, "ObjectDisposedException", "(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)", "", "Argument[0].SyntheticField[System.Runtime.Serialization.SerializationInfo._values].Element", "Argument[this].SyntheticField[System.ObjectDisposedException._objectName]", "value", "dfc-generated"]
+      - ["System", "ObjectDisposedException", False, "ObjectDisposedException", "(System.String,System.String)", "", "Argument[0]", "Argument[this].SyntheticField[System.ObjectDisposedException._objectName]", "value", "dfc-generated"]
+      - ["System", "ObjectDisposedException", False, "get_ObjectName", "()", "", "Argument[this].SyntheticField[System.ObjectDisposedException._objectName]", "ReturnValue", "value", "dfc-generated"]
+      - ["System", "OperatingSystem", False, "ToString", "()", "", "Argument[this].Property[System.OperatingSystem.VersionString]", "ReturnValue", "value", "dfc-generated"]
       - ["System", "OperatingSystem", False, "get_ServicePack", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System", "OperatingSystem", False, "get_Version", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System", "OperatingSystem", False, "get_VersionString", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System", "OperationCanceledException", False, "OperationCanceledException", "(System.String,System.Exception,System.Threading.CancellationToken)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
       - ["System", "OperationCanceledException", False, "OperationCanceledException", "(System.String,System.Threading.CancellationToken)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
       - ["System", "OperationCanceledException", False, "OperationCanceledException", "(System.Threading.CancellationToken)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System", "ReadOnlyMemory<T>", False, "CopyTo", "(System.Memory<T>)", "", "Argument[this]", "Argument[0]", "taint", "df-generated"]
-      - ["System", "ReadOnlyMemory<T>", False, "ReadOnlyMemory", "(T[])", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["System", "ReadOnlyMemory<T>", False, "ReadOnlyMemory", "(T[],System.Int32,System.Int32)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["System", "ReadOnlyMemory<T>", False, "Slice", "(System.Int32)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "ReadOnlyMemory<T>", False, "Slice", "(System.Int32,System.Int32)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "ReadOnlyMemory<T>", False, "ToArray", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "ReadOnlyMemory<T>", False, "ToString", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "ReadOnlyMemory<T>", False, "TryCopyTo", "(System.Memory<T>)", "", "Argument[this]", "Argument[0]", "taint", "df-generated"]
+      - ["System", "ReadOnlyMemory<T>", False, "CopyTo", "(System.Memory<T>)", "", "Argument[this].Property[System.ReadOnlyMemory`1.Span].Element", "Argument[0].Property[System.Memory`1.Span].Element", "value", "dfc-generated"]
+      - ["System", "ReadOnlyMemory<T>", False, "ReadOnlyMemory", "(T[])", "", "Argument[0]", "Argument[this].SyntheticField[System.ReadOnlyMemory`1._object]", "value", "dfc-generated"]
+      - ["System", "ReadOnlyMemory<T>", False, "ReadOnlyMemory", "(T[],System.Int32,System.Int32)", "", "Argument[0]", "Argument[this].SyntheticField[System.ReadOnlyMemory`1._object]", "value", "dfc-generated"]
+      - ["System", "ReadOnlyMemory<T>", False, "Slice", "(System.Int32)", "", "Argument[this].SyntheticField[System.ReadOnlyMemory`1._object]", "ReturnValue.SyntheticField[System.ReadOnlyMemory`1._object]", "value", "dfc-generated"]
+      - ["System", "ReadOnlyMemory<T>", False, "Slice", "(System.Int32,System.Int32)", "", "Argument[this].SyntheticField[System.ReadOnlyMemory`1._object]", "ReturnValue.SyntheticField[System.ReadOnlyMemory`1._object]", "value", "dfc-generated"]
+      - ["System", "ReadOnlyMemory<T>", False, "ToArray", "()", "", "Argument[this].Property[System.ReadOnlyMemory`1.Span].Element", "ReturnValue.Element", "value", "dfc-generated"]
+      - ["System", "ReadOnlyMemory<T>", False, "ToString", "()", "", "Argument[this].SyntheticField[System.ReadOnlyMemory`1._object]", "ReturnValue", "value", "dfc-generated"]
+      - ["System", "ReadOnlyMemory<T>", False, "TryCopyTo", "(System.Memory<T>)", "", "Argument[this].Property[System.ReadOnlyMemory`1.Span].Element", "Argument[0].Property[System.Memory`1.Span].Element", "value", "dfc-generated"]
       - ["System", "ReadOnlySpan<T>", False, "GetEnumerator", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "RuntimeFieldHandle", False, "FromIntPtr", "(System.IntPtr)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "RuntimeFieldHandle", False, "ToIntPtr", "(System.RuntimeFieldHandle)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "RuntimeFieldHandle", False, "get_Value", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "RuntimeMethodHandle", False, "FromIntPtr", "(System.IntPtr)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "RuntimeMethodHandle", False, "ToIntPtr", "(System.RuntimeMethodHandle)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "RuntimeMethodHandle", False, "get_Value", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "RuntimeTypeHandle", False, "FromIntPtr", "(System.IntPtr)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "RuntimeTypeHandle", False, "ToIntPtr", "(System.RuntimeTypeHandle)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "RuntimeTypeHandle", False, "get_Value", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "SequencePosition", False, "GetObject", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "SequencePosition", False, "SequencePosition", "(System.Object,System.Int32)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["System", "RuntimeFieldHandle", False, "FromIntPtr", "(System.IntPtr)", "", "Argument[0]", "ReturnValue.SyntheticField[System.RuntimeFieldHandle.value]", "value", "dfc-generated"]
+      - ["System", "RuntimeFieldHandle", False, "ToIntPtr", "(System.RuntimeFieldHandle)", "", "Argument[0].Property[System.RuntimeFieldHandle.Value]", "ReturnValue", "value", "dfc-generated"]
+      - ["System", "RuntimeFieldHandle", False, "ToIntPtr", "(System.RuntimeFieldHandle)", "", "Argument[0].SyntheticField[System.RuntimeFieldHandle.value]", "ReturnValue", "value", "dfc-generated"]
+      - ["System", "RuntimeFieldHandle", False, "get_Value", "()", "", "Argument[this].SyntheticField[System.RuntimeFieldHandle.value]", "ReturnValue", "value", "dfc-generated"]
+      - ["System", "RuntimeMethodHandle", False, "FromIntPtr", "(System.IntPtr)", "", "Argument[0]", "ReturnValue.SyntheticField[System.RuntimeMethodHandle.value]", "value", "dfc-generated"]
+      - ["System", "RuntimeMethodHandle", False, "ToIntPtr", "(System.RuntimeMethodHandle)", "", "Argument[0].Property[System.RuntimeMethodHandle.Value]", "ReturnValue", "value", "dfc-generated"]
+      - ["System", "RuntimeMethodHandle", False, "ToIntPtr", "(System.RuntimeMethodHandle)", "", "Argument[0].SyntheticField[System.RuntimeMethodHandle.value]", "ReturnValue", "value", "dfc-generated"]
+      - ["System", "RuntimeMethodHandle", False, "get_Value", "()", "", "Argument[this].SyntheticField[System.RuntimeMethodHandle.value]", "ReturnValue", "value", "dfc-generated"]
+      - ["System", "RuntimeTypeHandle", False, "FromIntPtr", "(System.IntPtr)", "", "Argument[0]", "ReturnValue.SyntheticField[System.RuntimeTypeHandle.value]", "value", "dfc-generated"]
+      - ["System", "RuntimeTypeHandle", False, "ToIntPtr", "(System.RuntimeTypeHandle)", "", "Argument[0].Property[System.RuntimeTypeHandle.Value]", "ReturnValue", "value", "dfc-generated"]
+      - ["System", "RuntimeTypeHandle", False, "ToIntPtr", "(System.RuntimeTypeHandle)", "", "Argument[0].SyntheticField[System.RuntimeTypeHandle.value]", "ReturnValue", "value", "dfc-generated"]
+      - ["System", "RuntimeTypeHandle", False, "get_Value", "()", "", "Argument[this].SyntheticField[System.RuntimeTypeHandle.value]", "ReturnValue", "value", "dfc-generated"]
+      - ["System", "SequencePosition", False, "GetObject", "()", "", "Argument[this].SyntheticField[System.SequencePosition._object]", "ReturnValue", "value", "dfc-generated"]
+      - ["System", "SequencePosition", False, "SequencePosition", "(System.Object,System.Int32)", "", "Argument[0]", "Argument[this].SyntheticField[System.SequencePosition._object]", "value", "dfc-generated"]
       - ["System", "Span<T>", False, "GetEnumerator", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System", "String", False, "Create", "(System.IFormatProvider,System.Runtime.CompilerServices.DefaultInterpolatedStringHandler)", "", "Argument[1]", "ReturnValue", "value", "dfc-generated"]
+      - ["System", "String", False, "Create", "(System.IFormatProvider,System.Span<System.Char>,System.Runtime.CompilerServices.DefaultInterpolatedStringHandler)", "", "Argument[2]", "ReturnValue", "value", "dfc-generated"]
+      - ["System", "String", False, "Create<TState>", "(System.Int32,TState,System.Buffers.SpanAction<System.Char,TState>)", "", "Argument[1]", "Argument[2].Parameter[1]", "value", "dfc-generated"]
       - ["System", "String", False, "EnumerateRunes", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "String", False, "Format", "(System.IFormatProvider,System.Text.CompositeFormat,System.Object[])", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "String", False, "Format", "(System.IFormatProvider,System.Text.CompositeFormat,System.ReadOnlySpan<System.Object>)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "String", False, "Format<TArg0,TArg1,TArg2>", "(System.IFormatProvider,System.Text.CompositeFormat,TArg0,TArg1,TArg2)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "String", False, "Format<TArg0,TArg1>", "(System.IFormatProvider,System.Text.CompositeFormat,TArg0,TArg1)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "String", False, "Format<TArg0>", "(System.IFormatProvider,System.Text.CompositeFormat,TArg0)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "String", False, "Parse", "(System.String,System.IFormatProvider)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "String", False, "Replace", "(System.String,System.String,System.Boolean,System.Globalization.CultureInfo)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "String", False, "Replace", "(System.String,System.String,System.StringComparison)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "String", False, "Replace", "(System.String,System.String,System.StringComparison)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "String", False, "ReplaceLineEndings", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "String", False, "ReplaceLineEndings", "(System.String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "String", False, "TryParse", "(System.String,System.IFormatProvider,System.String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "StringNormalizationExtensions", False, "Normalize", "(System.String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "StringNormalizationExtensions", False, "Normalize", "(System.String,System.Text.NormalizationForm)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "TimeSpan", False, "op_UnaryPlus", "(System.TimeSpan)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["System", "String", False, "Format", "(System.IFormatProvider,System.Text.CompositeFormat,System.Object[])", "", "Argument[1].Property[System.Text.CompositeFormat.Format]", "ReturnValue", "value", "dfc-generated"]
+      - ["System", "String", False, "Format", "(System.IFormatProvider,System.Text.CompositeFormat,System.ReadOnlySpan<System.Object>)", "", "Argument[1].Property[System.Text.CompositeFormat.Format]", "ReturnValue", "value", "dfc-generated"]
+      - ["System", "String", False, "Format<TArg0,TArg1,TArg2>", "(System.IFormatProvider,System.Text.CompositeFormat,TArg0,TArg1,TArg2)", "", "Argument[1].Property[System.Text.CompositeFormat.Format]", "ReturnValue", "value", "dfc-generated"]
+      - ["System", "String", False, "Format<TArg0,TArg1>", "(System.IFormatProvider,System.Text.CompositeFormat,TArg0,TArg1)", "", "Argument[1].Property[System.Text.CompositeFormat.Format]", "ReturnValue", "value", "dfc-generated"]
+      - ["System", "String", False, "Format<TArg0>", "(System.IFormatProvider,System.Text.CompositeFormat,TArg0)", "", "Argument[1].Property[System.Text.CompositeFormat.Format]", "ReturnValue", "value", "dfc-generated"]
+      - ["System", "String", False, "Parse", "(System.String,System.IFormatProvider)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System", "String", False, "Replace", "(System.String,System.String,System.Boolean,System.Globalization.CultureInfo)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["System", "String", False, "Replace", "(System.String,System.String,System.StringComparison)", "", "Argument[1]", "ReturnValue", "taint", "dfc-generated"]
+      - ["System", "String", False, "Replace", "(System.String,System.String,System.StringComparison)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["System", "String", False, "ReplaceLineEndings", "()", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["System", "String", False, "ReplaceLineEndings", "(System.String)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["System", "String", False, "TryParse", "(System.String,System.IFormatProvider,System.String)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System", "StringNormalizationExtensions", False, "Normalize", "(System.String)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System", "StringNormalizationExtensions", False, "Normalize", "(System.String,System.Text.NormalizationForm)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System", "TimeSpan", False, "op_UnaryPlus", "(System.TimeSpan)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
       - ["System", "TimeZone", True, "GetDaylightChanges", "(System.Int32)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System", "TimeZone", True, "get_DaylightName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System", "TimeZone", True, "get_StandardName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "TimeZoneInfo+AdjustmentRule", False, "CreateAdjustmentRule", "(System.DateTime,System.DateTime,System.TimeSpan,System.TimeZoneInfo+TransitionTime,System.TimeZoneInfo+TransitionTime)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "TimeZoneInfo+AdjustmentRule", False, "CreateAdjustmentRule", "(System.DateTime,System.DateTime,System.TimeSpan,System.TimeZoneInfo+TransitionTime,System.TimeZoneInfo+TransitionTime)", "", "Argument[3]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "TimeZoneInfo+AdjustmentRule", False, "CreateAdjustmentRule", "(System.DateTime,System.DateTime,System.TimeSpan,System.TimeZoneInfo+TransitionTime,System.TimeZoneInfo+TransitionTime)", "", "Argument[4]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "TimeZoneInfo+AdjustmentRule", False, "CreateAdjustmentRule", "(System.DateTime,System.DateTime,System.TimeSpan,System.TimeZoneInfo+TransitionTime,System.TimeZoneInfo+TransitionTime,System.TimeSpan)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "TimeZoneInfo+AdjustmentRule", False, "CreateAdjustmentRule", "(System.DateTime,System.DateTime,System.TimeSpan,System.TimeZoneInfo+TransitionTime,System.TimeZoneInfo+TransitionTime,System.TimeSpan)", "", "Argument[3]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "TimeZoneInfo+AdjustmentRule", False, "CreateAdjustmentRule", "(System.DateTime,System.DateTime,System.TimeSpan,System.TimeZoneInfo+TransitionTime,System.TimeZoneInfo+TransitionTime,System.TimeSpan)", "", "Argument[4]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "TimeZoneInfo+AdjustmentRule", False, "CreateAdjustmentRule", "(System.DateTime,System.DateTime,System.TimeSpan,System.TimeZoneInfo+TransitionTime,System.TimeZoneInfo+TransitionTime,System.TimeSpan)", "", "Argument[5]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "TimeZoneInfo+AdjustmentRule", False, "get_BaseUtcOffsetDelta", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "TimeZoneInfo+AdjustmentRule", False, "get_DaylightDelta", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "TimeZoneInfo+AdjustmentRule", False, "get_DaylightTransitionEnd", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "TimeZoneInfo+AdjustmentRule", False, "get_DaylightTransitionStart", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "TimeZoneInfo", False, "CreateCustomTimeZone", "(System.String,System.TimeSpan,System.String,System.String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "TimeZoneInfo", False, "CreateCustomTimeZone", "(System.String,System.TimeSpan,System.String,System.String)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "TimeZoneInfo", False, "CreateCustomTimeZone", "(System.String,System.TimeSpan,System.String,System.String)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "TimeZoneInfo", False, "CreateCustomTimeZone", "(System.String,System.TimeSpan,System.String,System.String)", "", "Argument[3]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "TimeZoneInfo", False, "CreateCustomTimeZone", "(System.String,System.TimeSpan,System.String,System.String,System.String,System.TimeZoneInfo+AdjustmentRule[])", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "TimeZoneInfo", False, "CreateCustomTimeZone", "(System.String,System.TimeSpan,System.String,System.String,System.String,System.TimeZoneInfo+AdjustmentRule[])", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "TimeZoneInfo", False, "CreateCustomTimeZone", "(System.String,System.TimeSpan,System.String,System.String,System.String,System.TimeZoneInfo+AdjustmentRule[])", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "TimeZoneInfo", False, "CreateCustomTimeZone", "(System.String,System.TimeSpan,System.String,System.String,System.String,System.TimeZoneInfo+AdjustmentRule[])", "", "Argument[3]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "TimeZoneInfo", False, "CreateCustomTimeZone", "(System.String,System.TimeSpan,System.String,System.String,System.String,System.TimeZoneInfo+AdjustmentRule[])", "", "Argument[4]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "TimeZoneInfo", False, "CreateCustomTimeZone", "(System.String,System.TimeSpan,System.String,System.String,System.String,System.TimeZoneInfo+AdjustmentRule[])", "", "Argument[5].Element", "ReturnValue", "taint", "df-generated"]
-      - ["System", "TimeZoneInfo", False, "CreateCustomTimeZone", "(System.String,System.TimeSpan,System.String,System.String,System.String,System.TimeZoneInfo+AdjustmentRule[],System.Boolean)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "TimeZoneInfo", False, "CreateCustomTimeZone", "(System.String,System.TimeSpan,System.String,System.String,System.String,System.TimeZoneInfo+AdjustmentRule[],System.Boolean)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "TimeZoneInfo", False, "CreateCustomTimeZone", "(System.String,System.TimeSpan,System.String,System.String,System.String,System.TimeZoneInfo+AdjustmentRule[],System.Boolean)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "TimeZoneInfo", False, "CreateCustomTimeZone", "(System.String,System.TimeSpan,System.String,System.String,System.String,System.TimeZoneInfo+AdjustmentRule[],System.Boolean)", "", "Argument[3]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "TimeZoneInfo", False, "CreateCustomTimeZone", "(System.String,System.TimeSpan,System.String,System.String,System.String,System.TimeZoneInfo+AdjustmentRule[],System.Boolean)", "", "Argument[4]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "TimeZoneInfo", False, "CreateCustomTimeZone", "(System.String,System.TimeSpan,System.String,System.String,System.String,System.TimeZoneInfo+AdjustmentRule[],System.Boolean)", "", "Argument[5].Element", "ReturnValue", "taint", "df-generated"]
-      - ["System", "TimeZoneInfo", False, "FindSystemTimeZoneById", "(System.String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "TimeZoneInfo", False, "GetUtcOffset", "(System.DateTime)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "TimeZoneInfo", False, "GetUtcOffset", "(System.DateTimeOffset)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "TimeZoneInfo", False, "ToString", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "TimeZoneInfo", False, "TryFindSystemTimeZoneById", "(System.String,System.TimeZoneInfo)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "TimeZoneInfo", False, "get_BaseUtcOffset", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "TimeZoneInfo", False, "get_DaylightName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "TimeZoneInfo", False, "get_DisplayName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "TimeZoneInfo", False, "get_Id", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "TimeZoneInfo", False, "get_StandardName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System", "TimeZoneInfo+AdjustmentRule", False, "CreateAdjustmentRule", "(System.DateTime,System.DateTime,System.TimeSpan,System.TimeZoneInfo+TransitionTime,System.TimeZoneInfo+TransitionTime)", "", "Argument[2]", "ReturnValue.SyntheticField[System.TimeZoneInfo+AdjustmentRule._daylightDelta]", "value", "dfc-generated"]
+      - ["System", "TimeZoneInfo+AdjustmentRule", False, "CreateAdjustmentRule", "(System.DateTime,System.DateTime,System.TimeSpan,System.TimeZoneInfo+TransitionTime,System.TimeZoneInfo+TransitionTime)", "", "Argument[3]", "ReturnValue.SyntheticField[System.TimeZoneInfo+AdjustmentRule._daylightTransitionStart]", "value", "dfc-generated"]
+      - ["System", "TimeZoneInfo+AdjustmentRule", False, "CreateAdjustmentRule", "(System.DateTime,System.DateTime,System.TimeSpan,System.TimeZoneInfo+TransitionTime,System.TimeZoneInfo+TransitionTime)", "", "Argument[4]", "ReturnValue.SyntheticField[System.TimeZoneInfo+AdjustmentRule._daylightTransitionEnd]", "value", "dfc-generated"]
+      - ["System", "TimeZoneInfo+AdjustmentRule", False, "CreateAdjustmentRule", "(System.DateTime,System.DateTime,System.TimeSpan,System.TimeZoneInfo+TransitionTime,System.TimeZoneInfo+TransitionTime,System.TimeSpan)", "", "Argument[2]", "ReturnValue.SyntheticField[System.TimeZoneInfo+AdjustmentRule._daylightDelta]", "value", "dfc-generated"]
+      - ["System", "TimeZoneInfo+AdjustmentRule", False, "CreateAdjustmentRule", "(System.DateTime,System.DateTime,System.TimeSpan,System.TimeZoneInfo+TransitionTime,System.TimeZoneInfo+TransitionTime,System.TimeSpan)", "", "Argument[3]", "ReturnValue.SyntheticField[System.TimeZoneInfo+AdjustmentRule._daylightTransitionStart]", "value", "dfc-generated"]
+      - ["System", "TimeZoneInfo+AdjustmentRule", False, "CreateAdjustmentRule", "(System.DateTime,System.DateTime,System.TimeSpan,System.TimeZoneInfo+TransitionTime,System.TimeZoneInfo+TransitionTime,System.TimeSpan)", "", "Argument[4]", "ReturnValue.SyntheticField[System.TimeZoneInfo+AdjustmentRule._daylightTransitionEnd]", "value", "dfc-generated"]
+      - ["System", "TimeZoneInfo+AdjustmentRule", False, "CreateAdjustmentRule", "(System.DateTime,System.DateTime,System.TimeSpan,System.TimeZoneInfo+TransitionTime,System.TimeZoneInfo+TransitionTime,System.TimeSpan)", "", "Argument[5]", "ReturnValue.SyntheticField[System.TimeZoneInfo+AdjustmentRule._baseUtcOffsetDelta]", "value", "dfc-generated"]
+      - ["System", "TimeZoneInfo+AdjustmentRule", False, "get_BaseUtcOffsetDelta", "()", "", "Argument[this].SyntheticField[System.TimeZoneInfo+AdjustmentRule._baseUtcOffsetDelta]", "ReturnValue", "value", "dfc-generated"]
+      - ["System", "TimeZoneInfo+AdjustmentRule", False, "get_DaylightDelta", "()", "", "Argument[this].SyntheticField[System.TimeZoneInfo+AdjustmentRule._daylightDelta]", "ReturnValue", "value", "dfc-generated"]
+      - ["System", "TimeZoneInfo+AdjustmentRule", False, "get_DaylightTransitionEnd", "()", "", "Argument[this].SyntheticField[System.TimeZoneInfo+AdjustmentRule._daylightTransitionEnd]", "ReturnValue", "value", "dfc-generated"]
+      - ["System", "TimeZoneInfo+AdjustmentRule", False, "get_DaylightTransitionStart", "()", "", "Argument[this].SyntheticField[System.TimeZoneInfo+AdjustmentRule._daylightTransitionStart]", "ReturnValue", "value", "dfc-generated"]
+      - ["System", "TimeZoneInfo", False, "CreateCustomTimeZone", "(System.String,System.TimeSpan,System.String,System.String)", "", "Argument[0]", "ReturnValue.SyntheticField[System.TimeZoneInfo._id]", "value", "dfc-generated"]
+      - ["System", "TimeZoneInfo", False, "CreateCustomTimeZone", "(System.String,System.TimeSpan,System.String,System.String)", "", "Argument[1]", "ReturnValue.SyntheticField[System.TimeZoneInfo._baseUtcOffset]", "value", "dfc-generated"]
+      - ["System", "TimeZoneInfo", False, "CreateCustomTimeZone", "(System.String,System.TimeSpan,System.String,System.String)", "", "Argument[2]", "ReturnValue.SyntheticField[System.TimeZoneInfo._displayName]", "value", "dfc-generated"]
+      - ["System", "TimeZoneInfo", False, "CreateCustomTimeZone", "(System.String,System.TimeSpan,System.String,System.String)", "", "Argument[3]", "ReturnValue.SyntheticField[System.TimeZoneInfo._daylightDisplayName]", "value", "dfc-generated"]
+      - ["System", "TimeZoneInfo", False, "CreateCustomTimeZone", "(System.String,System.TimeSpan,System.String,System.String)", "", "Argument[3]", "ReturnValue.SyntheticField[System.TimeZoneInfo._standardDisplayName]", "value", "dfc-generated"]
+      - ["System", "TimeZoneInfo", False, "CreateCustomTimeZone", "(System.String,System.TimeSpan,System.String,System.String,System.String,System.TimeZoneInfo+AdjustmentRule[])", "", "Argument[0]", "ReturnValue.SyntheticField[System.TimeZoneInfo._id]", "value", "dfc-generated"]
+      - ["System", "TimeZoneInfo", False, "CreateCustomTimeZone", "(System.String,System.TimeSpan,System.String,System.String,System.String,System.TimeZoneInfo+AdjustmentRule[])", "", "Argument[1]", "ReturnValue.SyntheticField[System.TimeZoneInfo._baseUtcOffset]", "value", "dfc-generated"]
+      - ["System", "TimeZoneInfo", False, "CreateCustomTimeZone", "(System.String,System.TimeSpan,System.String,System.String,System.String,System.TimeZoneInfo+AdjustmentRule[])", "", "Argument[2]", "ReturnValue.SyntheticField[System.TimeZoneInfo._displayName]", "value", "dfc-generated"]
+      - ["System", "TimeZoneInfo", False, "CreateCustomTimeZone", "(System.String,System.TimeSpan,System.String,System.String,System.String,System.TimeZoneInfo+AdjustmentRule[])", "", "Argument[3]", "ReturnValue.SyntheticField[System.TimeZoneInfo._standardDisplayName]", "value", "dfc-generated"]
+      - ["System", "TimeZoneInfo", False, "CreateCustomTimeZone", "(System.String,System.TimeSpan,System.String,System.String,System.String,System.TimeZoneInfo+AdjustmentRule[])", "", "Argument[4]", "ReturnValue.SyntheticField[System.TimeZoneInfo._daylightDisplayName]", "value", "dfc-generated"]
+      - ["System", "TimeZoneInfo", False, "CreateCustomTimeZone", "(System.String,System.TimeSpan,System.String,System.String,System.String,System.TimeZoneInfo+AdjustmentRule[],System.Boolean)", "", "Argument[0]", "ReturnValue.SyntheticField[System.TimeZoneInfo._id]", "value", "dfc-generated"]
+      - ["System", "TimeZoneInfo", False, "CreateCustomTimeZone", "(System.String,System.TimeSpan,System.String,System.String,System.String,System.TimeZoneInfo+AdjustmentRule[],System.Boolean)", "", "Argument[1]", "ReturnValue.SyntheticField[System.TimeZoneInfo._baseUtcOffset]", "value", "dfc-generated"]
+      - ["System", "TimeZoneInfo", False, "CreateCustomTimeZone", "(System.String,System.TimeSpan,System.String,System.String,System.String,System.TimeZoneInfo+AdjustmentRule[],System.Boolean)", "", "Argument[2]", "ReturnValue.SyntheticField[System.TimeZoneInfo._displayName]", "value", "dfc-generated"]
+      - ["System", "TimeZoneInfo", False, "CreateCustomTimeZone", "(System.String,System.TimeSpan,System.String,System.String,System.String,System.TimeZoneInfo+AdjustmentRule[],System.Boolean)", "", "Argument[3]", "ReturnValue.SyntheticField[System.TimeZoneInfo._standardDisplayName]", "value", "dfc-generated"]
+      - ["System", "TimeZoneInfo", False, "CreateCustomTimeZone", "(System.String,System.TimeSpan,System.String,System.String,System.String,System.TimeZoneInfo+AdjustmentRule[],System.Boolean)", "", "Argument[4]", "ReturnValue.SyntheticField[System.TimeZoneInfo._daylightDisplayName]", "value", "dfc-generated"]
+      - ["System", "TimeZoneInfo", False, "FindSystemTimeZoneById", "(System.String)", "", "Argument[0]", "ReturnValue.SyntheticField[System.TimeZoneInfo._id]", "value", "dfc-generated"]
+      - ["System", "TimeZoneInfo", False, "GetUtcOffset", "(System.DateTime)", "", "Argument[this].Property[System.TimeZoneInfo.BaseUtcOffset]", "ReturnValue", "value", "dfc-generated"]
+      - ["System", "TimeZoneInfo", False, "GetUtcOffset", "(System.DateTime)", "", "Argument[this].SyntheticField[System.TimeZoneInfo._baseUtcOffset]", "ReturnValue", "value", "dfc-generated"]
+      - ["System", "TimeZoneInfo", False, "GetUtcOffset", "(System.DateTimeOffset)", "", "Argument[this].Property[System.TimeZoneInfo.BaseUtcOffset]", "ReturnValue", "value", "dfc-generated"]
+      - ["System", "TimeZoneInfo", False, "GetUtcOffset", "(System.DateTimeOffset)", "", "Argument[this].SyntheticField[System.TimeZoneInfo._baseUtcOffset]", "ReturnValue", "value", "dfc-generated"]
+      - ["System", "TimeZoneInfo", False, "ToString", "()", "", "Argument[this].Property[System.TimeZoneInfo.DisplayName]", "ReturnValue", "value", "dfc-generated"]
+      - ["System", "TimeZoneInfo", False, "ToString", "()", "", "Argument[this].SyntheticField[System.TimeZoneInfo._displayName]", "ReturnValue", "value", "dfc-generated"]
+      - ["System", "TimeZoneInfo", False, "TryFindSystemTimeZoneById", "(System.String,System.TimeZoneInfo)", "", "Argument[0]", "ReturnValue.SyntheticField[System.TimeZoneInfo._id]", "value", "dfc-generated"]
+      - ["System", "TimeZoneInfo", False, "get_BaseUtcOffset", "()", "", "Argument[this].SyntheticField[System.TimeZoneInfo._baseUtcOffset]", "ReturnValue", "value", "dfc-generated"]
+      - ["System", "TimeZoneInfo", False, "get_DaylightName", "()", "", "Argument[this].SyntheticField[System.TimeZoneInfo._daylightDisplayName]", "ReturnValue", "value", "dfc-generated"]
+      - ["System", "TimeZoneInfo", False, "get_DisplayName", "()", "", "Argument[this].SyntheticField[System.TimeZoneInfo._displayName]", "ReturnValue", "value", "dfc-generated"]
+      - ["System", "TimeZoneInfo", False, "get_Id", "()", "", "Argument[this].SyntheticField[System.TimeZoneInfo._id]", "ReturnValue", "value", "dfc-generated"]
+      - ["System", "TimeZoneInfo", False, "get_StandardName", "()", "", "Argument[this].SyntheticField[System.TimeZoneInfo._standardDisplayName]", "ReturnValue", "value", "dfc-generated"]
       - ["System", "Tuple<T1,T2,T3,T4,T5,T6,T7,TRest>", False, "ToString", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System", "Tuple<T1,T2,T3,T4,T5,T6,T7,TRest>", False, "get_Item1", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System", "Tuple<T1,T2,T3,T4,T5,T6,T7,TRest>", False, "get_Item2", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
@@ -426,7 +470,7 @@ extensions:
       - ["System", "TupleExtensions", False, "ToTuple<T1,T2,T3,T4>", "(System.ValueTuple<T1,T2,T3,T4>)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["System", "TupleExtensions", False, "ToTuple<T1,T2,T3>", "(System.ValueTuple<T1,T2,T3>)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["System", "TupleExtensions", False, "ToTuple<T1,T2>", "(System.ValueTuple<T1,T2>)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "TupleExtensions", False, "ToTuple<T1>", "(System.ValueTuple<T1>)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["System", "TupleExtensions", False, "ToTuple<T1>", "(System.ValueTuple<T1>)", "", "Argument[0].Field[System.ValueTuple`1.Item1]", "ReturnValue.Property[System.Tuple`1.Item1]", "value", "dfc-generated"]
       - ["System", "TupleExtensions", False, "ToValueTuple<T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,T18,T19,T20,T21>", "(System.Tuple<T1,T2,T3,T4,T5,T6,T7,System.Tuple<T8,T9,T10,T11,T12,T13,T14,System.Tuple<T15,T16,T17,T18,T19,T20,T21>>>)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["System", "TupleExtensions", False, "ToValueTuple<T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,T18,T19,T20>", "(System.Tuple<T1,T2,T3,T4,T5,T6,T7,System.Tuple<T8,T9,T10,T11,T12,T13,T14,System.Tuple<T15,T16,T17,T18,T19,T20>>>)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["System", "TupleExtensions", False, "ToValueTuple<T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,T18,T19>", "(System.Tuple<T1,T2,T3,T4,T5,T6,T7,System.Tuple<T8,T9,T10,T11,T12,T13,T14,System.Tuple<T15,T16,T17,T18,T19>>>)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
@@ -447,9 +491,11 @@ extensions:
       - ["System", "TupleExtensions", False, "ToValueTuple<T1,T2,T3,T4>", "(System.Tuple<T1,T2,T3,T4>)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["System", "TupleExtensions", False, "ToValueTuple<T1,T2,T3>", "(System.Tuple<T1,T2,T3>)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["System", "TupleExtensions", False, "ToValueTuple<T1,T2>", "(System.Tuple<T1,T2>)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "TupleExtensions", False, "ToValueTuple<T1>", "(System.Tuple<T1>)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "Type", False, "MakeGenericSignatureType", "(System.Type,System.Type[])", "", "Argument[1].Element", "ReturnValue", "taint", "df-generated"]
+      - ["System", "TupleExtensions", False, "ToValueTuple<T1>", "(System.Tuple<T1>)", "", "Argument[0].Property[System.Tuple`1.Item1]", "ReturnValue.Field[System.ValueTuple`1.Item1]", "value", "dfc-generated"]
+      - ["System", "Type", False, "MakeGenericSignatureType", "(System.Type,System.Type[])", "", "Argument[1].Element", "ReturnValue.SyntheticField[System.Reflection.SignatureConstructedGenericType._genericTypeArguments].Element", "value", "dfc-generated"]
       - ["System", "Type", False, "ToString", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System", "Type", True, "FindInterfaces", "(System.Reflection.TypeFilter,System.Object)", "", "Argument[1]", "Argument[0].Parameter[1]", "value", "dfc-generated"]
+      - ["System", "Type", True, "FindMembers", "(System.Reflection.MemberTypes,System.Reflection.BindingFlags,System.Reflection.MemberFilter,System.Object)", "", "Argument[3]", "Argument[2].Parameter[1]", "value", "dfc-generated"]
       - ["System", "Type", True, "GetConstructorImpl", "(System.Reflection.BindingFlags,System.Reflection.Binder,System.Reflection.CallingConventions,System.Type[],System.Reflection.ParameterModifier[])", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System", "Type", True, "GetElementType", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System", "Type", True, "GetEnumUnderlyingType", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
@@ -457,8 +503,7 @@ extensions:
       - ["System", "Type", True, "GetFunctionPointerParameterTypes", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System", "Type", True, "GetFunctionPointerReturnType", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System", "Type", True, "GetGenericArguments", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "Type", True, "GetGenericTypeDefinition", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "Type", True, "GetGenericTypeDefinition", "()", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["System", "Type", True, "GetGenericTypeDefinition", "()", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
       - ["System", "Type", True, "GetInterface", "(System.String,System.Boolean)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System", "Type", True, "GetInterfaces", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System", "Type", True, "GetMethodImpl", "(System.String,System.Int32,System.Reflection.BindingFlags,System.Reflection.Binder,System.Reflection.CallingConventions,System.Type[],System.Reflection.ParameterModifier[])", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
@@ -482,112 +527,110 @@ extensions:
       - ["System", "Type", True, "get_StructLayoutAttribute", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System", "Type", True, "get_TypeHandle", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System", "TypeInitializationException", False, "get_TypeName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "TypeLoadException", False, "TypeLoadException", "(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System", "TypeLoadException", False, "get_TypeName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "UInt128", False, "Abs", "(System.UInt128)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "UInt128", False, "Clamp", "(System.UInt128,System.UInt128,System.UInt128)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "UInt128", False, "Clamp", "(System.UInt128,System.UInt128,System.UInt128)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "UInt128", False, "Clamp", "(System.UInt128,System.UInt128,System.UInt128)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "UInt128", False, "CopySign", "(System.UInt128,System.UInt128)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "UInt128", False, "CreateChecked<TOther>", "(TOther)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "UInt128", False, "CreateSaturating<TOther>", "(TOther)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "UInt128", False, "CreateTruncating<TOther>", "(TOther)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "UInt128", False, "Max", "(System.UInt128,System.UInt128)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "UInt128", False, "Max", "(System.UInt128,System.UInt128)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "UInt128", False, "MaxMagnitude", "(System.UInt128,System.UInt128)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "UInt128", False, "MaxMagnitude", "(System.UInt128,System.UInt128)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "UInt128", False, "MaxMagnitudeNumber", "(System.UInt128,System.UInt128)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "UInt128", False, "MaxMagnitudeNumber", "(System.UInt128,System.UInt128)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "UInt128", False, "MaxNumber", "(System.UInt128,System.UInt128)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "UInt128", False, "MaxNumber", "(System.UInt128,System.UInt128)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "UInt128", False, "Min", "(System.UInt128,System.UInt128)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "UInt128", False, "Min", "(System.UInt128,System.UInt128)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "UInt128", False, "MinMagnitude", "(System.UInt128,System.UInt128)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "UInt128", False, "MinMagnitude", "(System.UInt128,System.UInt128)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "UInt128", False, "MinMagnitudeNumber", "(System.UInt128,System.UInt128)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "UInt128", False, "MinMagnitudeNumber", "(System.UInt128,System.UInt128)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "UInt128", False, "MinNumber", "(System.UInt128,System.UInt128)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "UInt128", False, "MinNumber", "(System.UInt128,System.UInt128)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "UInt128", False, "op_LeftShift", "(System.UInt128,System.Int32)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "UInt128", False, "op_RightShift", "(System.UInt128,System.Int32)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "UInt128", False, "op_UnaryPlus", "(System.UInt128)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "UInt128", False, "op_UnsignedRightShift", "(System.UInt128,System.Int32)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "UIntPtr", False, "Abs", "(System.UIntPtr)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "UIntPtr", False, "Add", "(System.UIntPtr,System.Int32)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "UIntPtr", False, "Clamp", "(System.UIntPtr,System.UIntPtr,System.UIntPtr)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "UIntPtr", False, "Clamp", "(System.UIntPtr,System.UIntPtr,System.UIntPtr)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "UIntPtr", False, "Clamp", "(System.UIntPtr,System.UIntPtr,System.UIntPtr)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "UIntPtr", False, "CopySign", "(System.UIntPtr,System.UIntPtr)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "UIntPtr", False, "CreateChecked<TOther>", "(TOther)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "UIntPtr", False, "CreateSaturating<TOther>", "(TOther)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "UIntPtr", False, "CreateTruncating<TOther>", "(TOther)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "UIntPtr", False, "Max", "(System.UIntPtr,System.UIntPtr)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "UIntPtr", False, "Max", "(System.UIntPtr,System.UIntPtr)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "UIntPtr", False, "MaxMagnitude", "(System.UIntPtr,System.UIntPtr)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "UIntPtr", False, "MaxMagnitude", "(System.UIntPtr,System.UIntPtr)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "UIntPtr", False, "MaxMagnitudeNumber", "(System.UIntPtr,System.UIntPtr)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "UIntPtr", False, "MaxMagnitudeNumber", "(System.UIntPtr,System.UIntPtr)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "UIntPtr", False, "MaxNumber", "(System.UIntPtr,System.UIntPtr)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "UIntPtr", False, "MaxNumber", "(System.UIntPtr,System.UIntPtr)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "UIntPtr", False, "Min", "(System.UIntPtr,System.UIntPtr)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "UIntPtr", False, "Min", "(System.UIntPtr,System.UIntPtr)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "UIntPtr", False, "MinMagnitude", "(System.UIntPtr,System.UIntPtr)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "UIntPtr", False, "MinMagnitude", "(System.UIntPtr,System.UIntPtr)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "UIntPtr", False, "MinMagnitudeNumber", "(System.UIntPtr,System.UIntPtr)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "UIntPtr", False, "MinMagnitudeNumber", "(System.UIntPtr,System.UIntPtr)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "UIntPtr", False, "MinNumber", "(System.UIntPtr,System.UIntPtr)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "UIntPtr", False, "MinNumber", "(System.UIntPtr,System.UIntPtr)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "UIntPtr", False, "System.Numerics.IAdditionOperators<nuint,nuint,nuint>.op_Addition", "(System.UIntPtr,System.UIntPtr)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "UIntPtr", False, "System.Numerics.IAdditionOperators<nuint,nuint,nuint>.op_Addition", "(System.UIntPtr,System.UIntPtr)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "UIntPtr", False, "System.Numerics.IAdditionOperators<nuint,nuint,nuint>.op_CheckedAddition", "(System.UIntPtr,System.UIntPtr)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "UIntPtr", False, "System.Numerics.IAdditionOperators<nuint,nuint,nuint>.op_CheckedAddition", "(System.UIntPtr,System.UIntPtr)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "UIntPtr", False, "op_Addition", "(System.UIntPtr,System.Int32)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "UnhandledExceptionEventArgs", False, "UnhandledExceptionEventArgs", "(System.Object,System.Boolean)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System", "UnhandledExceptionEventArgs", False, "get_ExceptionObject", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System", "TypeLoadException", False, "TypeLoadException", "(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)", "", "Argument[0].SyntheticField[System.Runtime.Serialization.SerializationInfo._values].Element", "Argument[this].SyntheticField[System.TypeLoadException._className]", "value", "dfc-generated"]
+      - ["System", "TypeLoadException", False, "get_TypeName", "()", "", "Argument[this].SyntheticField[System.TypeLoadException._className]", "ReturnValue", "value", "dfc-generated"]
+      - ["System", "UInt128", False, "Abs", "(System.UInt128)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System", "UInt128", False, "Clamp", "(System.UInt128,System.UInt128,System.UInt128)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System", "UInt128", False, "Clamp", "(System.UInt128,System.UInt128,System.UInt128)", "", "Argument[1]", "ReturnValue", "value", "dfc-generated"]
+      - ["System", "UInt128", False, "Clamp", "(System.UInt128,System.UInt128,System.UInt128)", "", "Argument[2]", "ReturnValue", "value", "dfc-generated"]
+      - ["System", "UInt128", False, "CopySign", "(System.UInt128,System.UInt128)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System", "UInt128", False, "CreateChecked<TOther>", "(TOther)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System", "UInt128", False, "CreateSaturating<TOther>", "(TOther)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System", "UInt128", False, "CreateTruncating<TOther>", "(TOther)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System", "UInt128", False, "Max", "(System.UInt128,System.UInt128)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System", "UInt128", False, "Max", "(System.UInt128,System.UInt128)", "", "Argument[1]", "ReturnValue", "value", "dfc-generated"]
+      - ["System", "UInt128", False, "MaxMagnitude", "(System.UInt128,System.UInt128)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System", "UInt128", False, "MaxMagnitude", "(System.UInt128,System.UInt128)", "", "Argument[1]", "ReturnValue", "value", "dfc-generated"]
+      - ["System", "UInt128", False, "MaxMagnitudeNumber", "(System.UInt128,System.UInt128)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System", "UInt128", False, "MaxMagnitudeNumber", "(System.UInt128,System.UInt128)", "", "Argument[1]", "ReturnValue", "value", "dfc-generated"]
+      - ["System", "UInt128", False, "MaxNumber", "(System.UInt128,System.UInt128)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System", "UInt128", False, "MaxNumber", "(System.UInt128,System.UInt128)", "", "Argument[1]", "ReturnValue", "value", "dfc-generated"]
+      - ["System", "UInt128", False, "Min", "(System.UInt128,System.UInt128)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System", "UInt128", False, "Min", "(System.UInt128,System.UInt128)", "", "Argument[1]", "ReturnValue", "value", "dfc-generated"]
+      - ["System", "UInt128", False, "MinMagnitude", "(System.UInt128,System.UInt128)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System", "UInt128", False, "MinMagnitude", "(System.UInt128,System.UInt128)", "", "Argument[1]", "ReturnValue", "value", "dfc-generated"]
+      - ["System", "UInt128", False, "MinMagnitudeNumber", "(System.UInt128,System.UInt128)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System", "UInt128", False, "MinMagnitudeNumber", "(System.UInt128,System.UInt128)", "", "Argument[1]", "ReturnValue", "value", "dfc-generated"]
+      - ["System", "UInt128", False, "MinNumber", "(System.UInt128,System.UInt128)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System", "UInt128", False, "MinNumber", "(System.UInt128,System.UInt128)", "", "Argument[1]", "ReturnValue", "value", "dfc-generated"]
+      - ["System", "UInt128", False, "op_LeftShift", "(System.UInt128,System.Int32)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System", "UInt128", False, "op_RightShift", "(System.UInt128,System.Int32)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System", "UInt128", False, "op_UnaryPlus", "(System.UInt128)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System", "UInt128", False, "op_UnsignedRightShift", "(System.UInt128,System.Int32)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System", "UIntPtr", False, "Abs", "(System.UIntPtr)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System", "UIntPtr", False, "Add", "(System.UIntPtr,System.Int32)", "", "Argument[0]", "ReturnValue", "taint", "dfc-generated"]
+      - ["System", "UIntPtr", False, "Clamp", "(System.UIntPtr,System.UIntPtr,System.UIntPtr)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System", "UIntPtr", False, "Clamp", "(System.UIntPtr,System.UIntPtr,System.UIntPtr)", "", "Argument[1]", "ReturnValue", "value", "dfc-generated"]
+      - ["System", "UIntPtr", False, "Clamp", "(System.UIntPtr,System.UIntPtr,System.UIntPtr)", "", "Argument[2]", "ReturnValue", "value", "dfc-generated"]
+      - ["System", "UIntPtr", False, "CopySign", "(System.UIntPtr,System.UIntPtr)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System", "UIntPtr", False, "CreateChecked<TOther>", "(TOther)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System", "UIntPtr", False, "CreateSaturating<TOther>", "(TOther)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System", "UIntPtr", False, "CreateTruncating<TOther>", "(TOther)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System", "UIntPtr", False, "Max", "(System.UIntPtr,System.UIntPtr)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System", "UIntPtr", False, "Max", "(System.UIntPtr,System.UIntPtr)", "", "Argument[1]", "ReturnValue", "value", "dfc-generated"]
+      - ["System", "UIntPtr", False, "MaxMagnitude", "(System.UIntPtr,System.UIntPtr)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System", "UIntPtr", False, "MaxMagnitude", "(System.UIntPtr,System.UIntPtr)", "", "Argument[1]", "ReturnValue", "value", "dfc-generated"]
+      - ["System", "UIntPtr", False, "MaxMagnitudeNumber", "(System.UIntPtr,System.UIntPtr)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System", "UIntPtr", False, "MaxMagnitudeNumber", "(System.UIntPtr,System.UIntPtr)", "", "Argument[1]", "ReturnValue", "value", "dfc-generated"]
+      - ["System", "UIntPtr", False, "MaxNumber", "(System.UIntPtr,System.UIntPtr)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System", "UIntPtr", False, "MaxNumber", "(System.UIntPtr,System.UIntPtr)", "", "Argument[1]", "ReturnValue", "value", "dfc-generated"]
+      - ["System", "UIntPtr", False, "Min", "(System.UIntPtr,System.UIntPtr)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System", "UIntPtr", False, "Min", "(System.UIntPtr,System.UIntPtr)", "", "Argument[1]", "ReturnValue", "value", "dfc-generated"]
+      - ["System", "UIntPtr", False, "MinMagnitude", "(System.UIntPtr,System.UIntPtr)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System", "UIntPtr", False, "MinMagnitude", "(System.UIntPtr,System.UIntPtr)", "", "Argument[1]", "ReturnValue", "value", "dfc-generated"]
+      - ["System", "UIntPtr", False, "MinMagnitudeNumber", "(System.UIntPtr,System.UIntPtr)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System", "UIntPtr", False, "MinMagnitudeNumber", "(System.UIntPtr,System.UIntPtr)", "", "Argument[1]", "ReturnValue", "value", "dfc-generated"]
+      - ["System", "UIntPtr", False, "MinNumber", "(System.UIntPtr,System.UIntPtr)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System", "UIntPtr", False, "MinNumber", "(System.UIntPtr,System.UIntPtr)", "", "Argument[1]", "ReturnValue", "value", "dfc-generated"]
+      - ["System", "UIntPtr", False, "System.Numerics.IAdditionOperators<nuint,nuint,nuint>.op_Addition", "(System.UIntPtr,System.UIntPtr)", "", "Argument[0]", "ReturnValue", "taint", "dfc-generated"]
+      - ["System", "UIntPtr", False, "System.Numerics.IAdditionOperators<nuint,nuint,nuint>.op_Addition", "(System.UIntPtr,System.UIntPtr)", "", "Argument[1]", "ReturnValue", "taint", "dfc-generated"]
+      - ["System", "UIntPtr", False, "System.Numerics.IAdditionOperators<nuint,nuint,nuint>.op_CheckedAddition", "(System.UIntPtr,System.UIntPtr)", "", "Argument[0]", "ReturnValue", "taint", "dfc-generated"]
+      - ["System", "UIntPtr", False, "System.Numerics.IAdditionOperators<nuint,nuint,nuint>.op_CheckedAddition", "(System.UIntPtr,System.UIntPtr)", "", "Argument[1]", "ReturnValue", "taint", "dfc-generated"]
+      - ["System", "UIntPtr", False, "op_Addition", "(System.UIntPtr,System.Int32)", "", "Argument[0]", "ReturnValue", "taint", "dfc-generated"]
+      - ["System", "UnhandledExceptionEventArgs", False, "UnhandledExceptionEventArgs", "(System.Object,System.Boolean)", "", "Argument[0]", "Argument[this].SyntheticField[System.UnhandledExceptionEventArgs._exception]", "value", "dfc-generated"]
+      - ["System", "UnhandledExceptionEventArgs", False, "get_ExceptionObject", "()", "", "Argument[this].SyntheticField[System.UnhandledExceptionEventArgs._exception]", "ReturnValue", "value", "dfc-generated"]
       - ["System", "UnitySerializationHolder", False, "UnitySerializationHolder", "(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System", "Uri", False, "EscapeDataString", "(System.String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "Uri", False, "EscapeString", "(System.String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "Uri", False, "EscapeUriString", "(System.String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["System", "Uri", False, "EscapeDataString", "(System.String)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System", "Uri", False, "EscapeString", "(System.String)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System", "Uri", False, "EscapeUriString", "(System.String)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
       - ["System", "Uri", False, "GetComponents", "(System.UriComponents,System.UriFormat)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System", "Uri", False, "GetLeftPart", "(System.UriPartial)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "Uri", False, "GetObjectData", "(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)", "", "Argument[this]", "Argument[0]", "taint", "df-generated"]
       - ["System", "Uri", False, "MakeRelative", "(System.Uri)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["System", "Uri", False, "MakeRelativeUri", "(System.Uri)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "Uri", False, "TryCreate", "(System.String,System.UriCreationOptions,System.Uri)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "Uri", False, "TryCreate", "(System.String,System.UriKind,System.Uri)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "Uri", False, "TryCreate", "(System.Uri,System.String,System.Uri)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "Uri", False, "TryCreate", "(System.Uri,System.String,System.Uri)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["System", "Uri", False, "ToString", "(System.String,System.IFormatProvider)", "", "Argument[this].SyntheticField[System.Uri._string]", "ReturnValue", "value", "dfc-generated"]
+      - ["System", "Uri", False, "TryCreate", "(System.String,System.UriCreationOptions,System.Uri)", "", "Argument[0]", "ReturnValue.SyntheticField[System.Uri._string]", "value", "dfc-generated"]
+      - ["System", "Uri", False, "TryCreate", "(System.String,System.UriKind,System.Uri)", "", "Argument[0]", "ReturnValue.SyntheticField[System.Uri._string]", "value", "dfc-generated"]
+      - ["System", "Uri", False, "TryCreate", "(System.Uri,System.String,System.Uri)", "", "Argument[1]", "ReturnValue.SyntheticField[System.Uri._string]", "value", "dfc-generated"]
       - ["System", "Uri", False, "TryCreate", "(System.Uri,System.Uri,System.Uri)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["System", "Uri", False, "TryCreate", "(System.Uri,System.Uri,System.Uri)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "Uri", False, "UnescapeDataString", "(System.String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "Uri", False, "Uri", "(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System", "Uri", False, "Uri", "(System.String,System.UriCreationOptions)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System", "Uri", False, "Uri", "(System.Uri,System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System", "Uri", False, "Uri", "(System.Uri,System.String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["System", "Uri", False, "Uri", "(System.Uri,System.String,System.Boolean)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System", "Uri", False, "Uri", "(System.Uri,System.String,System.Boolean)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["System", "Uri", False, "UnescapeDataString", "(System.String)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["System", "Uri", False, "Uri", "(System.String,System.UriCreationOptions)", "", "Argument[0]", "Argument[this].SyntheticField[System.Uri._string]", "value", "dfc-generated"]
+      - ["System", "Uri", False, "Uri", "(System.Uri,System.String)", "", "Argument[1]", "Argument[this].SyntheticField[System.Uri._string]", "value", "dfc-generated"]
+      - ["System", "Uri", False, "Uri", "(System.Uri,System.String,System.Boolean)", "", "Argument[1]", "Argument[this].SyntheticField[System.Uri._string]", "value", "dfc-generated"]
       - ["System", "Uri", False, "Uri", "(System.Uri,System.Uri)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System", "Uri", False, "Uri", "(System.Uri,System.Uri)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
       - ["System", "Uri", False, "get_AbsolutePath", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System", "Uri", False, "get_Authority", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "Uri", False, "get_DnsSafeHost", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System", "Uri", False, "get_DnsSafeHost", "()", "", "Argument[this].Property[System.Uri.IdnHost]", "ReturnValue", "value", "dfc-generated"]
       - ["System", "Uri", False, "get_Host", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System", "Uri", False, "get_IdnHost", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "Uri", False, "get_LocalPath", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System", "Uri", False, "get_LocalPath", "()", "", "Argument[this].SyntheticField[System.Uri._string]", "ReturnValue", "value", "dfc-generated"]
       - ["System", "Uri", False, "get_Scheme", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System", "Uri", False, "get_UserInfo", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "UriBuilder", False, "UriBuilder", "(System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["System", "UriBuilder", False, "UriBuilder", "(System.String)", "", "Argument[0]", "Argument[this].SyntheticField[System.UriBuilder._uri]", "taint", "dfc-generated"]
       - ["System", "UriBuilder", False, "UriBuilder", "(System.String,System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["System", "UriBuilder", False, "UriBuilder", "(System.String,System.String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
       - ["System", "UriBuilder", False, "UriBuilder", "(System.String,System.String,System.Int32,System.String)", "", "Argument[3]", "Argument[this]", "taint", "df-generated"]
       - ["System", "UriBuilder", False, "UriBuilder", "(System.String,System.String,System.Int32,System.String,System.String)", "", "Argument[4]", "Argument[this]", "taint", "df-generated"]
-      - ["System", "UriBuilder", False, "UriBuilder", "(System.Uri)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["System", "UriBuilder", False, "get_Uri", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System", "UriBuilder", False, "UriBuilder", "(System.Uri)", "", "Argument[0]", "Argument[this].SyntheticField[System.UriBuilder._uri]", "value", "dfc-generated"]
+      - ["System", "UriBuilder", False, "get_Uri", "()", "", "Argument[this].SyntheticField[System.UriBuilder._uri]", "ReturnValue", "value", "dfc-generated"]
       - ["System", "UriParser", False, "Register", "(System.UriParser,System.String,System.Int32)", "", "Argument[1]", "Argument[0]", "taint", "df-generated"]
       - ["System", "UriParser", True, "GetComponents", "(System.Uri,System.UriComponents,System.UriFormat)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["System", "UriParser", True, "OnNewUri", "()", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["System", "UriParser", True, "OnNewUri", "()", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
       - ["System", "UriParser", True, "Resolve", "(System.Uri,System.Uri,System.UriFormatException)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["System", "UriParser", True, "Resolve", "(System.Uri,System.Uri,System.UriFormatException)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["System", "UriTypeConverter", True, "ConvertFrom", "(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object)", "", "Argument[2].Property[System.Uri.OriginalString]", "ReturnValue", "taint", "dfc-generated"]
+      - ["System", "UriTypeConverter", True, "ConvertTo", "(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type)", "", "Argument[2].Property[System.Uri.OriginalString]", "ReturnValue", "value", "dfc-generated"]
       - ["System", "ValueTuple<T1,T2,T3,T4,T5,T6,T7,TRest>", False, "ToString", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System", "ValueTuple<T1,T2,T3,T4,T5,T6,T7>", False, "ToString", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System", "ValueTuple<T1,T2,T3,T4,T5,T6>", False, "ToString", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
@@ -596,6 +639,7 @@ extensions:
       - ["System", "ValueTuple<T1,T2,T3>", False, "ToString", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System", "ValueTuple<T1,T2>", False, "ToString", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["System", "ValueTuple<T1>", False, "ToString", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["System", "WeakReference", True, "GetObjectData", "(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)", "", "Argument[this].Property[System.WeakReference.Target]", "Argument[0].SyntheticField[System.Runtime.Serialization.SerializationInfo._values].Element", "value", "dfc-generated"]
       - ["System", "WeakReference<T>", False, "TryGetTarget", "(T)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
   - addsTo:
       pack: codeql/csharp-all
@@ -677,6 +721,15 @@ extensions:
       - ["System", "AppDomain", "SetShadowCopyPath", "(System.String)", "summary", "df-generated"]
       - ["System", "AppDomain", "SetThreadPrincipal", "(System.Security.Principal.IPrincipal)", "summary", "df-generated"]
       - ["System", "AppDomain", "Unload", "(System.AppDomain)", "summary", "df-generated"]
+      - ["System", "AppDomain", "add_AssemblyLoad", "(System.AssemblyLoadEventHandler)", "summary", "df-generated"]
+      - ["System", "AppDomain", "add_AssemblyResolve", "(System.ResolveEventHandler)", "summary", "df-generated"]
+      - ["System", "AppDomain", "add_DomainUnload", "(System.EventHandler)", "summary", "df-generated"]
+      - ["System", "AppDomain", "add_FirstChanceException", "(System.EventHandler<System.Runtime.ExceptionServices.FirstChanceExceptionEventArgs>)", "summary", "df-generated"]
+      - ["System", "AppDomain", "add_ProcessExit", "(System.EventHandler)", "summary", "df-generated"]
+      - ["System", "AppDomain", "add_ReflectionOnlyAssemblyResolve", "(System.ResolveEventHandler)", "summary", "df-generated"]
+      - ["System", "AppDomain", "add_ResourceResolve", "(System.ResolveEventHandler)", "summary", "df-generated"]
+      - ["System", "AppDomain", "add_TypeResolve", "(System.ResolveEventHandler)", "summary", "df-generated"]
+      - ["System", "AppDomain", "add_UnhandledException", "(System.UnhandledExceptionEventHandler)", "summary", "df-generated"]
       - ["System", "AppDomain", "get_BaseDirectory", "()", "summary", "df-generated"]
       - ["System", "AppDomain", "get_CurrentDomain", "()", "summary", "df-generated"]
       - ["System", "AppDomain", "get_DynamicDirectory", "()", "summary", "df-generated"]
@@ -692,6 +745,15 @@ extensions:
       - ["System", "AppDomain", "get_RelativeSearchPath", "()", "summary", "df-generated"]
       - ["System", "AppDomain", "get_SetupInformation", "()", "summary", "df-generated"]
       - ["System", "AppDomain", "get_ShadowCopyFiles", "()", "summary", "df-generated"]
+      - ["System", "AppDomain", "remove_AssemblyLoad", "(System.AssemblyLoadEventHandler)", "summary", "df-generated"]
+      - ["System", "AppDomain", "remove_AssemblyResolve", "(System.ResolveEventHandler)", "summary", "df-generated"]
+      - ["System", "AppDomain", "remove_DomainUnload", "(System.EventHandler)", "summary", "df-generated"]
+      - ["System", "AppDomain", "remove_FirstChanceException", "(System.EventHandler<System.Runtime.ExceptionServices.FirstChanceExceptionEventArgs>)", "summary", "df-generated"]
+      - ["System", "AppDomain", "remove_ProcessExit", "(System.EventHandler)", "summary", "df-generated"]
+      - ["System", "AppDomain", "remove_ReflectionOnlyAssemblyResolve", "(System.ResolveEventHandler)", "summary", "df-generated"]
+      - ["System", "AppDomain", "remove_ResourceResolve", "(System.ResolveEventHandler)", "summary", "df-generated"]
+      - ["System", "AppDomain", "remove_TypeResolve", "(System.ResolveEventHandler)", "summary", "df-generated"]
+      - ["System", "AppDomain", "remove_UnhandledException", "(System.UnhandledExceptionEventHandler)", "summary", "df-generated"]
       - ["System", "AppDomainUnloadedException", "AppDomainUnloadedException", "(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)", "summary", "df-generated"]
       - ["System", "AppDomainUnloadedException", "AppDomainUnloadedException", "(System.String)", "summary", "df-generated"]
       - ["System", "AppDomainUnloadedException", "AppDomainUnloadedException", "(System.String,System.Exception)", "summary", "df-generated"]
@@ -796,8 +858,8 @@ extensions:
       - ["System", "Array", "LastIndexOf<T>", "(T[],T)", "summary", "df-generated"]
       - ["System", "Array", "LastIndexOf<T>", "(T[],T,System.Int32)", "summary", "df-generated"]
       - ["System", "Array", "LastIndexOf<T>", "(T[],T,System.Int32,System.Int32)", "summary", "df-generated"]
+      - ["System", "Array", "Remove", "(System.Object)", "summary", "df-generated"]
       - ["System", "Array", "RemoveAt", "(System.Int32)", "summary", "df-generated"]
-      - ["System", "Array", "Resize<T>", "(T[],System.Int32)", "summary", "df-generated"]
       - ["System", "Array", "SetValue", "(System.Object,System.Int32)", "summary", "df-generated"]
       - ["System", "Array", "SetValue", "(System.Object,System.Int32,System.Int32)", "summary", "df-generated"]
       - ["System", "Array", "SetValue", "(System.Object,System.Int32,System.Int32,System.Int32)", "summary", "df-generated"]
@@ -816,6 +878,7 @@ extensions:
       - ["System", "Array", "Sort", "(System.Array,System.Int32,System.Int32,System.Collections.IComparer)", "summary", "df-generated"]
       - ["System", "Array", "Sort<T>", "(T[])", "summary", "df-generated"]
       - ["System", "Array", "Sort<T>", "(T[],System.Collections.Generic.IComparer<T>)", "summary", "df-generated"]
+      - ["System", "Array", "Sort<T>", "(T[],System.Comparison<T>)", "summary", "df-generated"]
       - ["System", "Array", "Sort<T>", "(T[],System.Int32,System.Int32)", "summary", "df-generated"]
       - ["System", "Array", "Sort<T>", "(T[],System.Int32,System.Int32,System.Collections.Generic.IComparer<T>)", "summary", "df-generated"]
       - ["System", "Array", "Sort<TKey,TValue>", "(TKey[],TValue[])", "summary", "df-generated"]
@@ -901,10 +964,12 @@ extensions:
       - ["System", "BinaryData", "BinaryData", "(System.Object,System.Text.Json.JsonSerializerOptions,System.Type)", "summary", "df-generated"]
       - ["System", "BinaryData", "BinaryData", "(System.Object,System.Text.Json.Serialization.JsonSerializerContext,System.Type)", "summary", "df-generated"]
       - ["System", "BinaryData", "BinaryData", "(System.ReadOnlyMemory<System.Byte>,System.String)", "summary", "df-generated"]
+      - ["System", "BinaryData", "BinaryData", "(System.String)", "summary", "df-generated"]
       - ["System", "BinaryData", "BinaryData", "(System.String,System.String)", "summary", "df-generated"]
       - ["System", "BinaryData", "Equals", "(System.Object)", "summary", "df-generated"]
       - ["System", "BinaryData", "FromBytes", "(System.Byte[])", "summary", "df-generated"]
       - ["System", "BinaryData", "FromBytes", "(System.Byte[],System.String)", "summary", "df-generated"]
+      - ["System", "BinaryData", "FromBytes", "(System.ReadOnlyMemory<System.Byte>)", "summary", "df-generated"]
       - ["System", "BinaryData", "FromBytes", "(System.ReadOnlyMemory<System.Byte>,System.String)", "summary", "df-generated"]
       - ["System", "BinaryData", "FromObjectAsJson<T>", "(T,System.Text.Json.JsonSerializerOptions)", "summary", "df-generated"]
       - ["System", "BinaryData", "FromObjectAsJson<T>", "(T,System.Text.Json.Serialization.Metadata.JsonTypeInfo<T>)", "summary", "df-generated"]
@@ -912,8 +977,10 @@ extensions:
       - ["System", "BinaryData", "FromStream", "(System.IO.Stream,System.String)", "summary", "df-generated"]
       - ["System", "BinaryData", "FromStreamAsync", "(System.IO.Stream,System.String,System.Threading.CancellationToken)", "summary", "df-generated"]
       - ["System", "BinaryData", "FromStreamAsync", "(System.IO.Stream,System.Threading.CancellationToken)", "summary", "df-generated"]
+      - ["System", "BinaryData", "FromString", "(System.String)", "summary", "df-generated"]
       - ["System", "BinaryData", "FromString", "(System.String,System.String)", "summary", "df-generated"]
       - ["System", "BinaryData", "GetHashCode", "()", "summary", "df-generated"]
+      - ["System", "BinaryData", "ToArray", "()", "summary", "df-generated"]
       - ["System", "BinaryData", "ToObjectFromJson<T>", "(System.Text.Json.JsonSerializerOptions)", "summary", "df-generated"]
       - ["System", "BinaryData", "ToObjectFromJson<T>", "(System.Text.Json.Serialization.Metadata.JsonTypeInfo<T>)", "summary", "df-generated"]
       - ["System", "BinaryData", "ToString", "()", "summary", "df-generated"]
@@ -1377,6 +1444,7 @@ extensions:
       - ["System", "Console", "WriteLine", "(System.String,System.Object[])", "summary", "df-generated"]
       - ["System", "Console", "WriteLine", "(System.UInt32)", "summary", "df-generated"]
       - ["System", "Console", "WriteLine", "(System.UInt64)", "summary", "df-generated"]
+      - ["System", "Console", "add_CancelKeyPress", "(System.ConsoleCancelEventHandler)", "summary", "df-generated"]
       - ["System", "Console", "get_CapsLock", "()", "summary", "df-generated"]
       - ["System", "Console", "get_Error", "()", "summary", "df-generated"]
       - ["System", "Console", "get_In", "()", "summary", "df-generated"]
@@ -1388,6 +1456,7 @@ extensions:
       - ["System", "Console", "get_LargestWindowWidth", "()", "summary", "df-generated"]
       - ["System", "Console", "get_NumberLock", "()", "summary", "df-generated"]
       - ["System", "Console", "get_Out", "()", "summary", "df-generated"]
+      - ["System", "Console", "remove_CancelKeyPress", "(System.ConsoleCancelEventHandler)", "summary", "df-generated"]
       - ["System", "ConsoleCancelEventArgs", "get_SpecialKey", "()", "summary", "df-generated"]
       - ["System", "ConsoleKeyInfo", "ConsoleKeyInfo", "(System.Char,System.ConsoleKey,System.Boolean,System.Boolean,System.Boolean)", "summary", "df-generated"]
       - ["System", "ConsoleKeyInfo", "Equals", "(System.ConsoleKeyInfo)", "summary", "df-generated"]
@@ -1873,6 +1942,7 @@ extensions:
       - ["System", "Delegate", "CreateDelegate", "(System.Type,System.Type,System.String,System.Boolean,System.Boolean)", "summary", "df-generated"]
       - ["System", "Delegate", "Equals", "(System.Object)", "summary", "df-generated"]
       - ["System", "Delegate", "GetHashCode", "()", "summary", "df-generated"]
+      - ["System", "Delegate", "get_Method", "()", "summary", "df-generated"]
       - ["System", "Delegate", "op_Equality", "(System.Delegate,System.Delegate)", "summary", "df-generated"]
       - ["System", "Delegate", "op_Inequality", "(System.Delegate,System.Delegate)", "summary", "df-generated"]
       - ["System", "DivideByZeroException", "DivideByZeroException", "(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)", "summary", "df-generated"]
@@ -2162,7 +2232,10 @@ extensions:
       - ["System", "Environment", "get_Version", "()", "summary", "df-generated"]
       - ["System", "Environment", "get_WorkingSet", "()", "summary", "df-generated"]
       - ["System", "Exception", "GetType", "()", "summary", "df-generated"]
+      - ["System", "Exception", "add_SerializeObjectState", "(System.EventHandler<System.Runtime.Serialization.SafeSerializationEventArgs>)", "summary", "df-generated"]
       - ["System", "Exception", "get_Data", "()", "summary", "df-generated"]
+      - ["System", "Exception", "get_TargetSite", "()", "summary", "df-generated"]
+      - ["System", "Exception", "remove_SerializeObjectState", "(System.EventHandler<System.Runtime.Serialization.SafeSerializationEventArgs>)", "summary", "df-generated"]
       - ["System", "ExecutionEngineException", "ExecutionEngineException", "(System.String)", "summary", "df-generated"]
       - ["System", "ExecutionEngineException", "ExecutionEngineException", "(System.String,System.Exception)", "summary", "df-generated"]
       - ["System", "FieldAccessException", "FieldAccessException", "(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)", "summary", "df-generated"]
@@ -2196,6 +2269,7 @@ extensions:
       - ["System", "GC", "ReRegisterForFinalize", "(System.Object)", "summary", "df-generated"]
       - ["System", "GC", "RefreshMemoryLimit", "()", "summary", "df-generated"]
       - ["System", "GC", "RegisterForFullGCNotification", "(System.Int32,System.Int32)", "summary", "df-generated"]
+      - ["System", "GC", "RegisterNoGCRegionCallback", "(System.Int64,System.Action)", "summary", "df-generated"]
       - ["System", "GC", "RemoveMemoryPressure", "(System.Int64)", "summary", "df-generated"]
       - ["System", "GC", "SuppressFinalize", "(System.Object)", "summary", "df-generated"]
       - ["System", "GC", "TryStartNoGCRegion", "(System.Int64)", "summary", "df-generated"]
@@ -2428,7 +2502,6 @@ extensions:
       - ["System", "Half", "op_Subtraction", "(System.Half,System.Half)", "summary", "df-generated"]
       - ["System", "Half", "op_UnaryNegation", "(System.Half)", "summary", "df-generated"]
       - ["System", "HashCode", "Add<T>", "(T)", "summary", "df-generated"]
-      - ["System", "HashCode", "Add<T>", "(T,System.Collections.Generic.IEqualityComparer<T>)", "summary", "df-generated"]
       - ["System", "HashCode", "AddBytes", "(System.ReadOnlySpan<System.Byte>)", "summary", "df-generated"]
       - ["System", "HashCode", "Combine<T1,T2,T3,T4,T5,T6,T7,T8>", "(T1,T2,T3,T4,T5,T6,T7,T8)", "summary", "df-generated"]
       - ["System", "HashCode", "Combine<T1,T2,T3,T4,T5,T6,T7>", "(T1,T2,T3,T4,T5,T6,T7)", "summary", "df-generated"]
@@ -3287,9 +3360,7 @@ extensions:
       - ["System", "MemoryExtensions", "BinarySearch<T>", "(System.ReadOnlySpan<T>,System.IComparable<T>)", "summary", "df-generated"]
       - ["System", "MemoryExtensions", "BinarySearch<T>", "(System.Span<T>,System.IComparable<T>)", "summary", "df-generated"]
       - ["System", "MemoryExtensions", "CommonPrefixLength<T>", "(System.ReadOnlySpan<T>,System.ReadOnlySpan<T>)", "summary", "df-generated"]
-      - ["System", "MemoryExtensions", "CommonPrefixLength<T>", "(System.ReadOnlySpan<T>,System.ReadOnlySpan<T>,System.Collections.Generic.IEqualityComparer<T>)", "summary", "df-generated"]
       - ["System", "MemoryExtensions", "CommonPrefixLength<T>", "(System.Span<T>,System.ReadOnlySpan<T>)", "summary", "df-generated"]
-      - ["System", "MemoryExtensions", "CommonPrefixLength<T>", "(System.Span<T>,System.ReadOnlySpan<T>,System.Collections.Generic.IEqualityComparer<T>)", "summary", "df-generated"]
       - ["System", "MemoryExtensions", "CompareTo", "(System.ReadOnlySpan<System.Char>,System.ReadOnlySpan<System.Char>,System.StringComparison)", "summary", "df-generated"]
       - ["System", "MemoryExtensions", "Contains", "(System.ReadOnlySpan<System.Char>,System.ReadOnlySpan<System.Char>,System.StringComparison)", "summary", "df-generated"]
       - ["System", "MemoryExtensions", "Contains<T>", "(System.ReadOnlySpan<T>,T)", "summary", "df-generated"]
@@ -3393,13 +3464,12 @@ extensions:
       - ["System", "MemoryExtensions", "SequenceCompareTo<T>", "(System.ReadOnlySpan<T>,System.ReadOnlySpan<T>)", "summary", "df-generated"]
       - ["System", "MemoryExtensions", "SequenceCompareTo<T>", "(System.Span<T>,System.ReadOnlySpan<T>)", "summary", "df-generated"]
       - ["System", "MemoryExtensions", "SequenceEqual<T>", "(System.ReadOnlySpan<T>,System.ReadOnlySpan<T>)", "summary", "df-generated"]
-      - ["System", "MemoryExtensions", "SequenceEqual<T>", "(System.ReadOnlySpan<T>,System.ReadOnlySpan<T>,System.Collections.Generic.IEqualityComparer<T>)", "summary", "df-generated"]
       - ["System", "MemoryExtensions", "SequenceEqual<T>", "(System.Span<T>,System.ReadOnlySpan<T>)", "summary", "df-generated"]
-      - ["System", "MemoryExtensions", "SequenceEqual<T>", "(System.Span<T>,System.ReadOnlySpan<T>,System.Collections.Generic.IEqualityComparer<T>)", "summary", "df-generated"]
       - ["System", "MemoryExtensions", "Sort<T,TComparer>", "(System.Span<T>,TComparer)", "summary", "df-generated"]
       - ["System", "MemoryExtensions", "Sort<T>", "(System.Span<T>)", "summary", "df-generated"]
       - ["System", "MemoryExtensions", "Sort<TKey,TValue,TComparer>", "(System.Span<TKey>,System.Span<TValue>,TComparer)", "summary", "df-generated"]
       - ["System", "MemoryExtensions", "Sort<TKey,TValue>", "(System.Span<TKey>,System.Span<TValue>)", "summary", "df-generated"]
+      - ["System", "MemoryExtensions", "Sort<TKey,TValue>", "(System.Span<TKey>,System.Span<TValue>,System.Comparison<TKey>)", "summary", "df-generated"]
       - ["System", "MemoryExtensions", "Split", "(System.ReadOnlySpan<System.Char>,System.Span<System.Range>,System.Char,System.StringSplitOptions)", "summary", "df-generated"]
       - ["System", "MemoryExtensions", "Split", "(System.ReadOnlySpan<System.Char>,System.Span<System.Range>,System.ReadOnlySpan<System.Char>,System.StringSplitOptions)", "summary", "df-generated"]
       - ["System", "MemoryExtensions", "SplitAny", "(System.ReadOnlySpan<System.Char>,System.Span<System.Range>,System.ReadOnlySpan<System.Char>,System.StringSplitOptions)", "summary", "df-generated"]
@@ -3411,10 +3481,8 @@ extensions:
       - ["System", "MemoryExtensions", "ToLowerInvariant", "(System.ReadOnlySpan<System.Char>,System.Span<System.Char>)", "summary", "df-generated"]
       - ["System", "MemoryExtensions", "ToUpper", "(System.ReadOnlySpan<System.Char>,System.Span<System.Char>,System.Globalization.CultureInfo)", "summary", "df-generated"]
       - ["System", "MemoryExtensions", "ToUpperInvariant", "(System.ReadOnlySpan<System.Char>,System.Span<System.Char>)", "summary", "df-generated"]
-      - ["System", "MemoryExtensions", "TryWrite", "(System.Span<System.Char>,System.IFormatProvider,System.MemoryExtensions+TryWriteInterpolatedStringHandler,System.Int32)", "summary", "df-generated"]
       - ["System", "MemoryExtensions", "TryWrite", "(System.Span<System.Char>,System.IFormatProvider,System.Text.CompositeFormat,System.Int32,System.Object[])", "summary", "df-generated"]
       - ["System", "MemoryExtensions", "TryWrite", "(System.Span<System.Char>,System.IFormatProvider,System.Text.CompositeFormat,System.Int32,System.ReadOnlySpan<System.Object>)", "summary", "df-generated"]
-      - ["System", "MemoryExtensions", "TryWrite", "(System.Span<System.Char>,System.MemoryExtensions+TryWriteInterpolatedStringHandler,System.Int32)", "summary", "df-generated"]
       - ["System", "MemoryExtensions", "TryWrite<TArg0,TArg1,TArg2>", "(System.Span<System.Char>,System.IFormatProvider,System.Text.CompositeFormat,System.Int32,TArg0,TArg1,TArg2)", "summary", "df-generated"]
       - ["System", "MemoryExtensions", "TryWrite<TArg0,TArg1>", "(System.Span<System.Char>,System.IFormatProvider,System.Text.CompositeFormat,System.Int32,TArg0,TArg1)", "summary", "df-generated"]
       - ["System", "MemoryExtensions", "TryWrite<TArg0>", "(System.Span<System.Char>,System.IFormatProvider,System.Text.CompositeFormat,System.Int32,TArg0)", "summary", "df-generated"]
@@ -3523,7 +3591,10 @@ extensions:
       - ["System", "PlatformNotSupportedException", "PlatformNotSupportedException", "(System.String)", "summary", "df-generated"]
       - ["System", "PlatformNotSupportedException", "PlatformNotSupportedException", "(System.String,System.Exception)", "summary", "df-generated"]
       - ["System", "Progress<T>", "OnReport", "(T)", "summary", "df-generated"]
+      - ["System", "Progress<T>", "Progress", "(System.Action<T>)", "summary", "df-generated"]
       - ["System", "Progress<T>", "Report", "(T)", "summary", "df-generated"]
+      - ["System", "Progress<T>", "add_ProgressChanged", "(System.EventHandler<T>)", "summary", "df-generated"]
+      - ["System", "Progress<T>", "remove_ProgressChanged", "(System.EventHandler<T>)", "summary", "df-generated"]
       - ["System", "Random", "GetItems<T>", "(System.ReadOnlySpan<T>,System.Int32)", "summary", "df-generated"]
       - ["System", "Random", "GetItems<T>", "(System.ReadOnlySpan<T>,System.Span<T>)", "summary", "df-generated"]
       - ["System", "Random", "GetItems<T>", "(T[],System.Int32)", "summary", "df-generated"]
@@ -3943,8 +4014,6 @@ extensions:
       - ["System", "String", "Contains", "(System.String,System.StringComparison)", "summary", "df-generated"]
       - ["System", "String", "CopyTo", "(System.Int32,System.Char[],System.Int32,System.Int32)", "summary", "df-generated"]
       - ["System", "String", "CopyTo", "(System.Span<System.Char>)", "summary", "df-generated"]
-      - ["System", "String", "Create", "(System.IFormatProvider,System.Runtime.CompilerServices.DefaultInterpolatedStringHandler)", "summary", "df-generated"]
-      - ["System", "String", "Create", "(System.IFormatProvider,System.Span<System.Char>,System.Runtime.CompilerServices.DefaultInterpolatedStringHandler)", "summary", "df-generated"]
       - ["System", "String", "EndsWith", "(System.Char)", "summary", "df-generated"]
       - ["System", "String", "EndsWith", "(System.String)", "summary", "df-generated"]
       - ["System", "String", "EndsWith", "(System.String,System.Boolean,System.Globalization.CultureInfo)", "summary", "df-generated"]
@@ -4023,7 +4092,6 @@ extensions:
       - ["System", "String", "get_Length", "()", "summary", "df-generated"]
       - ["System", "String", "op_Equality", "(System.String,System.String)", "summary", "df-generated"]
       - ["System", "String", "op_Inequality", "(System.String,System.String)", "summary", "df-generated"]
-      - ["System", "StringComparer", "Compare", "(System.Object,System.Object)", "summary", "df-generated"]
       - ["System", "StringComparer", "Compare", "(System.String,System.String)", "summary", "df-generated"]
       - ["System", "StringComparer", "Create", "(System.Globalization.CultureInfo,System.Boolean)", "summary", "df-generated"]
       - ["System", "StringComparer", "Create", "(System.Globalization.CultureInfo,System.Globalization.CompareOptions)", "summary", "df-generated"]
@@ -4118,6 +4186,7 @@ extensions:
       - ["System", "TimeOnly", "op_LessThan", "(System.TimeOnly,System.TimeOnly)", "summary", "df-generated"]
       - ["System", "TimeOnly", "op_LessThanOrEqual", "(System.TimeOnly,System.TimeOnly)", "summary", "df-generated"]
       - ["System", "TimeOnly", "op_Subtraction", "(System.TimeOnly,System.TimeOnly)", "summary", "df-generated"]
+      - ["System", "TimeProvider", "CreateTimer", "(System.Threading.TimerCallback,System.Object,System.TimeSpan,System.TimeSpan)", "summary", "df-generated"]
       - ["System", "TimeProvider", "GetElapsedTime", "(System.Int64)", "summary", "df-generated"]
       - ["System", "TimeProvider", "GetElapsedTime", "(System.Int64,System.Int64)", "summary", "df-generated"]
       - ["System", "TimeProvider", "GetLocalNow", "()", "summary", "df-generated"]
@@ -4391,6 +4460,9 @@ extensions:
       - ["System", "Type", "GetType", "(System.String)", "summary", "df-generated"]
       - ["System", "Type", "GetType", "(System.String,System.Boolean)", "summary", "df-generated"]
       - ["System", "Type", "GetType", "(System.String,System.Boolean,System.Boolean)", "summary", "df-generated"]
+      - ["System", "Type", "GetType", "(System.String,System.Func<System.Reflection.AssemblyName,System.Reflection.Assembly>,System.Func<System.Reflection.Assembly,System.String,System.Boolean,System.Type>)", "summary", "df-generated"]
+      - ["System", "Type", "GetType", "(System.String,System.Func<System.Reflection.AssemblyName,System.Reflection.Assembly>,System.Func<System.Reflection.Assembly,System.String,System.Boolean,System.Type>,System.Boolean)", "summary", "df-generated"]
+      - ["System", "Type", "GetType", "(System.String,System.Func<System.Reflection.AssemblyName,System.Reflection.Assembly>,System.Func<System.Reflection.Assembly,System.String,System.Boolean,System.Type>,System.Boolean,System.Boolean)", "summary", "df-generated"]
       - ["System", "Type", "GetTypeArray", "(System.Object[])", "summary", "df-generated"]
       - ["System", "Type", "GetTypeCode", "(System.Type)", "summary", "df-generated"]
       - ["System", "Type", "GetTypeCodeImpl", "()", "summary", "df-generated"]
@@ -5099,6 +5171,7 @@ extensions:
       - ["System", "Uri", "Escape", "()", "summary", "df-generated"]
       - ["System", "Uri", "FromHex", "(System.Char)", "summary", "df-generated"]
       - ["System", "Uri", "GetHashCode", "()", "summary", "df-generated"]
+      - ["System", "Uri", "GetObjectData", "(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)", "summary", "df-generated"]
       - ["System", "Uri", "HexEscape", "(System.Char)", "summary", "df-generated"]
       - ["System", "Uri", "HexUnescape", "(System.String,System.Int32)", "summary", "df-generated"]
       - ["System", "Uri", "IsBadFileSystemCharacter", "(System.Char)", "summary", "df-generated"]
@@ -5113,6 +5186,7 @@ extensions:
       - ["System", "Uri", "TryFormat", "(System.Span<System.Char>,System.Int32)", "summary", "df-generated"]
       - ["System", "Uri", "TryFormat", "(System.Span<System.Char>,System.Int32,System.ReadOnlySpan<System.Char>,System.IFormatProvider)", "summary", "df-generated"]
       - ["System", "Uri", "Unescape", "(System.String)", "summary", "df-generated"]
+      - ["System", "Uri", "Uri", "(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)", "summary", "df-generated"]
       - ["System", "Uri", "get_AbsoluteUri", "()", "summary", "df-generated"]
       - ["System", "Uri", "get_Fragment", "()", "summary", "df-generated"]
       - ["System", "Uri", "get_HostNameType", "()", "summary", "df-generated"]
diff --git a/csharp/ql/lib/qlpack.yml b/csharp/ql/lib/qlpack.yml
index 9fdd0511ccd..f750b06e392 100644
--- a/csharp/ql/lib/qlpack.yml
+++ b/csharp/ql/lib/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/csharp-all
-version: 2.0.1-dev
+version: 3.1.1-dev
 groups: csharp
 dbscheme: semmlecode.csharp.dbscheme
 extractor: csharp
diff --git a/csharp/ql/lib/semmle/code/csharp/Comments.qll b/csharp/ql/lib/semmle/code/csharp/Comments.qll
index 101e002fe50..dfce22ebbee 100644
--- a/csharp/ql/lib/semmle/code/csharp/Comments.qll
+++ b/csharp/ql/lib/semmle/code/csharp/Comments.qll
@@ -8,6 +8,13 @@
 import Element
 import Location
 
+private Location unmapLoc(Location l) {
+  result.(SourceLocation).getMappedLocation() = l
+  or
+  not exists(result.(SourceLocation).getMappedLocation()) and
+  result = l
+}
+
 /**
  * A single line of comment.
  *
@@ -19,7 +26,7 @@ class CommentLine extends @commentline {
   string toString() { none() }
 
   /** Gets the location of this comment line. */
-  Location getLocation() { commentline_location(this, result) }
+  Location getLocation() { commentline_location(this, unmapLoc(result)) }
 
   /** Gets the containing comment block. */
   CommentBlock getParent() { result.getAChild() = this }
@@ -159,7 +166,7 @@ class CommentBlock extends @commentblock {
   string toString() { result = this.getChild(0).toString() }
 
   /** Gets the location of this comment block */
-  Location getLocation() { commentblock_location(this, result) }
+  Location getLocation() { commentblock_location(this, unmapLoc(result)) }
 
   /** Gets the number of lines in this comment block. */
   int getNumLines() { result = count(this.getAChild()) }
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 b6efc78e55c..463ed260067 100644
--- a/csharp/ql/lib/semmle/code/csharp/controlflow/internal/ControlFlowGraphImpl.qll
+++ b/csharp/ql/lib/semmle/code/csharp/controlflow/internal/ControlFlowGraphImpl.qll
@@ -15,11 +15,19 @@ class CfgScope extends Element, @top_level_exprorstmt_parent {
   CfgScope() {
     this.getFile().fromSource() and
     (
-      this instanceof Callable
+      this =
+        any(Callable c |
+          c.(Constructor).hasInitializer()
+          or
+          InitializerSplitting::constructorInitializes(c, _)
+          or
+          c.hasBody()
+        )
       or
       // For now, static initializer values have their own scope. Eventually, they
       // should be treated like instance initializers.
-      this.(Assignable).(Modifiable).isStatic()
+      this.(Assignable).(Modifiable).isStatic() and
+      expr_parent_top_level_adjusted2(_, _, this)
     )
   }
 }
@@ -45,7 +53,6 @@ private predicate idOf(AstNode x, int y) = equivalenceRelation(id/2)(x, y)
 private module CfgInput implements CfgShared::InputSig<Location> {
   private import ControlFlowGraphImpl as Impl
   private import Completion as Comp
-  private import Splitting as Splitting
   private import SuccessorType as ST
   private import semmle.code.csharp.Caching
 
@@ -72,10 +79,6 @@ private module CfgInput implements CfgShared::InputSig<Location> {
     Impl::scopeLast(scope, last, c)
   }
 
-  class SplitKindBase = Splitting::TSplitKind;
-
-  class Split = Splitting::Split;
-
   class SuccessorType = ST::SuccessorType;
 
   SuccessorType getAMatchingSuccessorType(Completion c) { result = c.getAMatchingSuccessorType() }
@@ -94,7 +97,21 @@ private module CfgInput implements CfgShared::InputSig<Location> {
   }
 }
 
-import CfgShared::Make<Location, CfgInput>
+private module CfgSplittingInput implements CfgShared::SplittingInputSig<Location, CfgInput> {
+  private import Splitting as S
+
+  class SplitKindBase = S::TSplitKind;
+
+  class Split = S::Split;
+}
+
+private module ConditionalCompletionSplittingInput implements
+  CfgShared::ConditionalCompletionSplittingInputSig<Location, CfgInput, CfgSplittingInput>
+{
+  import Splitting::ConditionalCompletionSplitting::ConditionalCompletionSplittingInput
+}
+
+import CfgShared::MakeWithSplitting<Location, CfgInput, CfgSplittingInput, ConditionalCompletionSplittingInput>
 
 /**
  * A compilation.
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 2fc5ffe4afd..b6efdfcf1ea 100644
--- a/csharp/ql/lib/semmle/code/csharp/controlflow/internal/Splitting.qll
+++ b/csharp/ql/lib/semmle/code/csharp/controlflow/internal/Splitting.qll
@@ -5,7 +5,8 @@
  */
 
 import csharp
-private import Completion
+private import Completion as Comp
+private import Comp
 private import ControlFlowGraphImpl
 private import semmle.code.csharp.controlflow.ControlFlowGraph::ControlFlow as Cfg
 private import semmle.code.csharp.controlflow.internal.PreSsa
@@ -260,10 +261,12 @@ module ConditionalCompletionSplitting {
 
     ConditionalCompletionSplit() { this = TConditionalCompletionSplit(completion) }
 
+    ConditionalCompletion getCompletion() { result = completion }
+
     override string toString() { result = completion.toString() }
   }
 
-  private class ConditionalCompletionSplitKind extends SplitKind, TConditionalCompletionSplitKind {
+  private class ConditionalCompletionSplitKind_ extends SplitKind, TConditionalCompletionSplitKind {
     override int getListOrder() { result = InitializerSplitting::getNextListOrder() }
 
     override predicate isEnabled(AstNode cfe) { this.appliesTo(cfe) }
@@ -271,89 +274,64 @@ module ConditionalCompletionSplitting {
     override string toString() { result = "ConditionalCompletion" }
   }
 
-  int getNextListOrder() { result = InitializerSplitting::getNextListOrder() + 1 }
+  module ConditionalCompletionSplittingInput {
+    private import Completion as Comp
 
-  private class ConditionalCompletionSplitImpl extends SplitImpl instanceof ConditionalCompletionSplit
-  {
-    ConditionalCompletion completion;
+    class ConditionalCompletion = Comp::ConditionalCompletion;
 
-    ConditionalCompletionSplitImpl() { this = TConditionalCompletionSplit(completion) }
+    class ConditionalCompletionSplitKind extends ConditionalCompletionSplitKind_, TSplitKind { }
 
-    override ConditionalCompletionSplitKind getKind() { any() }
+    class ConditionalCompletionSplit = ConditionalCompletionSplitting::ConditionalCompletionSplit;
 
-    override predicate hasEntry(AstNode pred, AstNode succ, Completion c) {
-      succ(pred, succ, c) and
-      last(succ, _, completion) and
+    bindingset[parent, parentCompletion]
+    predicate condPropagateExpr(
+      AstNode parent, ConditionalCompletion parentCompletion, AstNode child,
+      ConditionalCompletion childCompletion
+    ) {
+      child = parent.(LogicalNotExpr).getOperand() and
+      childCompletion.getDual() = parentCompletion
+      or
+      childCompletion = parentCompletion and
       (
-        last(succ.(LogicalNotExpr).getOperand(), pred, c) and
-        completion.(BooleanCompletion).getDual() = c
+        child = parent.(LogicalAndExpr).getAnOperand()
         or
-        last(succ.(LogicalAndExpr).getAnOperand(), pred, c) and
-        completion = c
+        child = parent.(LogicalOrExpr).getAnOperand()
         or
-        last(succ.(LogicalOrExpr).getAnOperand(), pred, c) and
-        completion = c
+        parent = any(ConditionalExpr ce | child = [ce.getThen(), ce.getElse()])
         or
-        succ =
-          any(ConditionalExpr ce |
-            last([ce.getThen(), ce.getElse()], pred, c) and
-            completion = c
-          )
+        child = parent.(SwitchExpr).getACase()
         or
-        succ =
+        child = parent.(SwitchCaseExpr).getBody()
+        or
+        parent =
           any(NullCoalescingExpr nce |
-            exists(Expr operand |
-              last(operand, pred, c) and
-              completion = c
-            |
-              if c instanceof NullnessCompletion
-              then operand = nce.getRightOperand()
-              else operand = nce.getAnOperand()
-            )
+            if childCompletion instanceof NullnessCompletion
+            then child = nce.getRightOperand()
+            else child = nce.getAnOperand()
           )
+      )
+      or
+      child = parent.(NotPatternExpr).getPattern() and
+      childCompletion.getDual() = parentCompletion
+      or
+      child = parent.(IsExpr).getPattern() and
+      parentCompletion.(BooleanCompletion).getValue() =
+        childCompletion.(MatchingCompletion).getValue()
+      or
+      childCompletion = parentCompletion and
+      (
+        child = parent.(AndPatternExpr).getAnOperand()
         or
-        last(succ.(SwitchExpr).getACase(), pred, c) and
-        completion = c
+        child = parent.(OrPatternExpr).getAnOperand()
         or
-        last(succ.(SwitchCaseExpr).getBody(), pred, c) and
-        completion = c
+        child = parent.(RecursivePatternExpr).getAChildExpr()
         or
-        last(succ.(NotPatternExpr).getPattern(), pred, c) and
-        completion.(MatchingCompletion).getDual() = c
-        or
-        last(succ.(IsExpr).getPattern(), pred, c) and
-        completion.(BooleanCompletion).getValue() = c.(MatchingCompletion).getValue()
-        or
-        last(succ.(AndPatternExpr).getAnOperand(), pred, c) and
-        completion = c
-        or
-        last(succ.(OrPatternExpr).getAnOperand(), pred, c) and
-        completion = c
-        or
-        last(succ.(RecursivePatternExpr).getAChildExpr(), pred, c) and
-        completion = c
-        or
-        last(succ.(PropertyPatternExpr).getPattern(_), pred, c) and
-        completion = c
+        child = parent.(PropertyPatternExpr).getPattern(_)
       )
     }
-
-    override predicate hasEntryScope(CfgScope scope, AstNode first) { none() }
-
-    override predicate hasExit(AstNode pred, AstNode succ, Completion c) {
-      this.appliesTo(pred) and
-      succ(pred, succ, c) and
-      if c instanceof ConditionalCompletion then completion = c else any()
-    }
-
-    override predicate hasExitScope(CfgScope scope, AstNode last, Completion c) {
-      this.appliesTo(last) and
-      scopeLast(scope, last, c) and
-      if c instanceof ConditionalCompletion then completion = c else any()
-    }
-
-    override predicate hasSuccessor(AstNode pred, AstNode succ, Completion c) { none() }
   }
+
+  int getNextListOrder() { result = InitializerSplitting::getNextListOrder() + 1 }
 }
 
 module AssertionSplitting {
diff --git a/csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowImpl1.qll b/csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowImpl1.qll
index 359fa71744b..17def0c431d 100644
--- a/csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowImpl1.qll
+++ b/csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowImpl1.qll
@@ -261,13 +261,17 @@ deprecated private module Config implements FullStateConfigSig {
     model = ""
   }
 
-  predicate isAdditionalFlowStep(Node node1, FlowState state1, Node node2, FlowState state2) {
+  predicate isAdditionalFlowStep(
+    Node node1, FlowState state1, Node node2, FlowState state2, string model
+  ) {
     getConfig(state1).isAdditionalFlowStep(node1, getState(state1), node2, getState(state2)) and
-    getConfig(state2) = getConfig(state1)
+    getConfig(state2) = getConfig(state1) and
+    model = ""
     or
     not singleConfiguration() and
     getConfig(state1).isAdditionalFlowStep(node1, node2) and
-    state2 = state1
+    state2 = state1 and
+    model = ""
   }
 
   predicate allowImplicitRead(Node node, ContentSet c) {
@@ -283,6 +287,8 @@ deprecated private module Config implements FullStateConfigSig {
   FlowFeature getAFeature() { result = any(Configuration config).getAFeature() }
 
   predicate includeHiddenNodes() { any(Configuration config).includeHiddenNodes() }
+
+  predicate observeDiffInformedIncrementalMode() { none() }
 }
 
 deprecated private import Impl<Config> as I
diff --git a/csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowImpl2.qll b/csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowImpl2.qll
index 359fa71744b..17def0c431d 100644
--- a/csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowImpl2.qll
+++ b/csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowImpl2.qll
@@ -261,13 +261,17 @@ deprecated private module Config implements FullStateConfigSig {
     model = ""
   }
 
-  predicate isAdditionalFlowStep(Node node1, FlowState state1, Node node2, FlowState state2) {
+  predicate isAdditionalFlowStep(
+    Node node1, FlowState state1, Node node2, FlowState state2, string model
+  ) {
     getConfig(state1).isAdditionalFlowStep(node1, getState(state1), node2, getState(state2)) and
-    getConfig(state2) = getConfig(state1)
+    getConfig(state2) = getConfig(state1) and
+    model = ""
     or
     not singleConfiguration() and
     getConfig(state1).isAdditionalFlowStep(node1, node2) and
-    state2 = state1
+    state2 = state1 and
+    model = ""
   }
 
   predicate allowImplicitRead(Node node, ContentSet c) {
@@ -283,6 +287,8 @@ deprecated private module Config implements FullStateConfigSig {
   FlowFeature getAFeature() { result = any(Configuration config).getAFeature() }
 
   predicate includeHiddenNodes() { any(Configuration config).includeHiddenNodes() }
+
+  predicate observeDiffInformedIncrementalMode() { none() }
 }
 
 deprecated private import Impl<Config> as I
diff --git a/csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowImpl3.qll b/csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowImpl3.qll
index 359fa71744b..17def0c431d 100644
--- a/csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowImpl3.qll
+++ b/csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowImpl3.qll
@@ -261,13 +261,17 @@ deprecated private module Config implements FullStateConfigSig {
     model = ""
   }
 
-  predicate isAdditionalFlowStep(Node node1, FlowState state1, Node node2, FlowState state2) {
+  predicate isAdditionalFlowStep(
+    Node node1, FlowState state1, Node node2, FlowState state2, string model
+  ) {
     getConfig(state1).isAdditionalFlowStep(node1, getState(state1), node2, getState(state2)) and
-    getConfig(state2) = getConfig(state1)
+    getConfig(state2) = getConfig(state1) and
+    model = ""
     or
     not singleConfiguration() and
     getConfig(state1).isAdditionalFlowStep(node1, node2) and
-    state2 = state1
+    state2 = state1 and
+    model = ""
   }
 
   predicate allowImplicitRead(Node node, ContentSet c) {
@@ -283,6 +287,8 @@ deprecated private module Config implements FullStateConfigSig {
   FlowFeature getAFeature() { result = any(Configuration config).getAFeature() }
 
   predicate includeHiddenNodes() { any(Configuration config).includeHiddenNodes() }
+
+  predicate observeDiffInformedIncrementalMode() { none() }
 }
 
 deprecated private import Impl<Config> as I
diff --git a/csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowImpl4.qll b/csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowImpl4.qll
index 359fa71744b..17def0c431d 100644
--- a/csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowImpl4.qll
+++ b/csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowImpl4.qll
@@ -261,13 +261,17 @@ deprecated private module Config implements FullStateConfigSig {
     model = ""
   }
 
-  predicate isAdditionalFlowStep(Node node1, FlowState state1, Node node2, FlowState state2) {
+  predicate isAdditionalFlowStep(
+    Node node1, FlowState state1, Node node2, FlowState state2, string model
+  ) {
     getConfig(state1).isAdditionalFlowStep(node1, getState(state1), node2, getState(state2)) and
-    getConfig(state2) = getConfig(state1)
+    getConfig(state2) = getConfig(state1) and
+    model = ""
     or
     not singleConfiguration() and
     getConfig(state1).isAdditionalFlowStep(node1, node2) and
-    state2 = state1
+    state2 = state1 and
+    model = ""
   }
 
   predicate allowImplicitRead(Node node, ContentSet c) {
@@ -283,6 +287,8 @@ deprecated private module Config implements FullStateConfigSig {
   FlowFeature getAFeature() { result = any(Configuration config).getAFeature() }
 
   predicate includeHiddenNodes() { any(Configuration config).includeHiddenNodes() }
+
+  predicate observeDiffInformedIncrementalMode() { none() }
 }
 
 deprecated private import Impl<Config> as I
diff --git a/csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowImpl5.qll b/csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowImpl5.qll
index 359fa71744b..17def0c431d 100644
--- a/csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowImpl5.qll
+++ b/csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowImpl5.qll
@@ -261,13 +261,17 @@ deprecated private module Config implements FullStateConfigSig {
     model = ""
   }
 
-  predicate isAdditionalFlowStep(Node node1, FlowState state1, Node node2, FlowState state2) {
+  predicate isAdditionalFlowStep(
+    Node node1, FlowState state1, Node node2, FlowState state2, string model
+  ) {
     getConfig(state1).isAdditionalFlowStep(node1, getState(state1), node2, getState(state2)) and
-    getConfig(state2) = getConfig(state1)
+    getConfig(state2) = getConfig(state1) and
+    model = ""
     or
     not singleConfiguration() and
     getConfig(state1).isAdditionalFlowStep(node1, node2) and
-    state2 = state1
+    state2 = state1 and
+    model = ""
   }
 
   predicate allowImplicitRead(Node node, ContentSet c) {
@@ -283,6 +287,8 @@ deprecated private module Config implements FullStateConfigSig {
   FlowFeature getAFeature() { result = any(Configuration config).getAFeature() }
 
   predicate includeHiddenNodes() { any(Configuration config).includeHiddenNodes() }
+
+  predicate observeDiffInformedIncrementalMode() { none() }
 }
 
 deprecated private import Impl<Config> as I
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 52c4c58d977..cab164846e2 100644
--- a/csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowPrivate.qll
+++ b/csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowPrivate.qll
@@ -13,6 +13,7 @@ private import semmle.code.csharp.Unification
 private import semmle.code.csharp.controlflow.Guards
 private import semmle.code.csharp.dispatch.Dispatch
 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
@@ -995,6 +996,52 @@ private class InstanceCallable extends Callable {
   Location getARelevantLocation() { result = l }
 }
 
+/**
+ * A callable which is either itself defined in source or which is the target
+ * of some call in source, and therefore ought to have dataflow nodes created.
+ *
+ * Note that for library methods these are always unbound declarations, since
+ * generic instantiations never have dataflow nodes constructed.
+ */
+private class CallableUsedInSource extends Callable {
+  CallableUsedInSource() {
+    // Should generate nodes even for abstract methods declared in source
+    this.fromSource()
+    or
+    // Should generate nodes even for synthetic methods derived from source
+    this.hasBody()
+    or
+    exists(Callable target |
+      exists(Call c |
+        // Note that getADynamicTarget does not always include getTarget.
+        target = c.getTarget()
+        or
+        // Note that getARuntimeTarget cannot be used here, because the
+        // DelegateLikeCall case depends on lambda-flow, which in turn
+        // uses the dataflow library; hence this would introduce recursion
+        // into the definition of data-flow nodes.
+        exists(DispatchCall dc | c = dc.getCall() | target = dc.getADynamicTarget())
+      )
+      or
+      target = any(CallableAccess ca).getTarget()
+    |
+      this = target.getUnboundDeclaration()
+    )
+  }
+}
+
+/**
+ * A field or property which is either itself defined in source or which is the target
+ * of some access in source, and therefore ought to have dataflow nodes created.
+ */
+private class FieldOrPropertyUsedInSource extends FieldOrProperty {
+  FieldOrPropertyUsedInSource() {
+    this.fromSource()
+    or
+    this.getAnAccess().fromSource()
+  }
+}
+
 /** A collection of cached types and predicates to be evaluated in the same stage. */
 cached
 private module Cached {
@@ -1018,8 +1065,13 @@ private module Cached {
     TAssignableDefinitionNode(AssignableDefinition def, ControlFlow::Node cfn) {
       cfn = def.getExpr().getAControlFlowNode()
     } or
-    TExplicitParameterNode(Parameter p, DataFlowCallable c) { p = c.asCallable(_).getAParameter() } or
-    TInstanceParameterNode(InstanceCallable c, Location l) { l = c.getARelevantLocation() } or
+    TExplicitParameterNode(Parameter p, DataFlowCallable c) {
+      p = c.asCallable(_).(CallableUsedInSource).getAParameter()
+    } or
+    TInstanceParameterNode(InstanceCallable c, Location l) {
+      c instanceof CallableUsedInSource and
+      l = c.getARelevantLocation()
+    } or
     TDelegateSelfReferenceNode(Callable c) { lambdaCreationExpr(_, c) } or
     TLocalFunctionCreationNode(ControlFlow::Nodes::ElementNode cfn, Boolean isPostUpdate) {
       cfn.getAstNode() instanceof LocalFunctionStmt
@@ -1055,11 +1107,13 @@ private module Cached {
       or
       lambdaCallExpr(_, cfn)
     } or
-    TFlowSummaryNode(FlowSummaryImpl::Private::SummaryNode sn) or
+    TFlowSummaryNode(FlowSummaryImpl::Private::SummaryNode sn) {
+      sn.getSummarizedCallable() instanceof CallableUsedInSource
+    } or
     TParamsArgumentNode(ControlFlow::Node callCfn) {
       callCfn = any(Call c | isParamsArg(c, _, _)).getAControlFlowNode()
     } or
-    TFlowInsensitiveFieldNode(FieldOrProperty f) { f.isFieldLike() } or
+    TFlowInsensitiveFieldNode(FieldOrPropertyUsedInSource f) { f.isFieldLike() } or
     TFlowInsensitiveCapturedVariableNode(LocalScopeVariable v) { v.isCaptured() } or
     TInstanceParameterAccessNode(ControlFlow::Node cfn, Boolean isPostUpdate) {
       cfn = getAPrimaryConstructorParameterCfn(_)
@@ -1093,7 +1147,11 @@ private module Cached {
     TPrimaryConstructorParameterContent(Parameter p) {
       p.getCallable() instanceof PrimaryConstructor
     } or
-    TCapturedVariableContent(VariableCapture::CapturedVariable v)
+    TCapturedVariableContent(VariableCapture::CapturedVariable v) or
+    TDelegateCallArgumentContent(int i) {
+      i = [0 .. max(any(DelegateLikeCall dc).getNumberOfArguments()) - 1]
+    } or
+    TDelegateCallReturnContent()
 
   cached
   newtype TContentSet =
@@ -1109,7 +1167,9 @@ private module Cached {
     TPrimaryConstructorParameterApproxContent(string firstChar) {
       firstChar = approximatePrimaryConstructorParameterContent(_)
     } or
-    TCapturedVariableContentApprox(VariableCapture::CapturedVariable v)
+    TCapturedVariableContentApprox(VariableCapture::CapturedVariable v) or
+    TDelegateCallArgumentApproxContent() or
+    TDelegateCallReturnApproxContent()
 
   pragma[nomagic]
   private predicate commonSubTypeGeneral(DataFlowTypeOrUnifiable t1, RelevantGvnType t2) {
@@ -2220,6 +2280,21 @@ private predicate recordProperty(RecordType t, ContentSet c, string name) {
   )
 }
 
+/**
+ * Holds if data can flow from `node1` to `node2` via an assignment to
+ * the content set `c` of a delegate call.
+ *
+ * If there is a delegate call f(x), then we store "x" on "f"
+ * using a delegate argument content set.
+ */
+private predicate storeStepDelegateCall(ExplicitArgumentNode node1, ContentSet c, Node node2) {
+  exists(ExplicitDelegateLikeDataFlowCall call, int i |
+    node1.argumentOf(call, TPositionalArgumentPosition(i)) and
+    lambdaCall(call, _, node2.(PostUpdateNode).getPreUpdateNode()) and
+    c.isDelegateCallArgument(i)
+  )
+}
+
 /**
  * Holds if data can flow from `node1` to `node2` via an assignment to
  * content `c`.
@@ -2252,6 +2327,8 @@ predicate storeStep(Node node1, ContentSet c, Node node2) {
   or
   FlowSummaryImpl::Private::Steps::summaryStoreStep(node1.(FlowSummaryNode).getSummaryNode(), c,
     node2.(FlowSummaryNode).getSummaryNode())
+  or
+  storeStepDelegateCall(node1, c, node2)
 }
 
 private class ReadStepConfiguration extends ControlFlowReachabilityConfiguration {
@@ -2372,6 +2449,21 @@ private predicate readContentStep(Node node1, Content c, Node node2) {
   VariableCapture::readStep(node1, c, node2)
 }
 
+/**
+ * Holds if data can flow from `node1` to `node2` via an assignment to
+ * the content set `c` of a delegate call.
+ *
+ * If there is a delegate call f(x), then we read the return of the delegate
+ * call.
+ */
+private predicate readStepDelegateCall(Node node1, ContentSet c, OutNode node2) {
+  exists(ExplicitDelegateLikeDataFlowCall call |
+    lambdaCall(call, _, node1) and
+    node2.getCall(TNormalReturnKind()) = call and
+    c.isDelegateCallReturn()
+  )
+}
+
 /**
  * Holds if data can flow from `node1` to `node2` via a read of content `c`.
  */
@@ -2390,6 +2482,8 @@ predicate readStep(Node node1, ContentSet c, Node node2) {
   or
   FlowSummaryImpl::Private::Steps::summaryReadStep(node1.(FlowSummaryNode).getSummaryNode(), c,
     node2.(FlowSummaryNode).getSummaryNode())
+  or
+  readStepDelegateCall(node1, c, node2)
 }
 
 private predicate clearsCont(Node n, Content c) {
@@ -2984,6 +3078,12 @@ class ContentApprox extends TContentApprox {
     exists(VariableCapture::CapturedVariable v |
       this = TCapturedVariableContentApprox(v) and result = "captured " + v
     )
+    or
+    this = TDelegateCallArgumentApproxContent() and
+    result = "approximated delegate call argument"
+    or
+    this = TDelegateCallReturnApproxContent() and
+    result = "approximated delegate call return"
   }
 }
 
@@ -3020,6 +3120,12 @@ ContentApprox getContentApprox(Content c) {
     TPrimaryConstructorParameterApproxContent(approximatePrimaryConstructorParameterContent(c))
   or
   result = TCapturedVariableContentApprox(VariableCapture::getCapturedVariableContent(c))
+  or
+  c instanceof DelegateCallArgumentContent and
+  result = TDelegateCallArgumentApproxContent()
+  or
+  c instanceof DelegateCallReturnContent and
+  result = TDelegateCallReturnApproxContent()
 }
 
 /**
diff --git a/csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowPublic.qll b/csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowPublic.qll
index 35c4c673a00..c5460652746 100644
--- a/csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowPublic.qll
+++ b/csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowPublic.qll
@@ -3,6 +3,7 @@ private import DataFlowDispatch
 private import DataFlowPrivate
 private import semmle.code.csharp.controlflow.Guards
 private import semmle.code.csharp.Unification
+private import semmle.code.csharp.frameworks.system.linq.Expressions
 
 /**
  * An element, viewed as a node in a data flow graph. Either an expression
@@ -238,6 +239,30 @@ class PropertyContent extends Content, TPropertyContent {
   override Location getLocation() { result = p.getLocation() }
 }
 
+/**
+ * A reference to the index of an argument of a delegate call.
+ */
+class DelegateCallArgumentContent extends Content, TDelegateCallArgumentContent {
+  private int i;
+
+  DelegateCallArgumentContent() { this = TDelegateCallArgumentContent(i) }
+
+  override string toString() { result = "delegate argument at position " + i }
+
+  override Location getLocation() { result instanceof EmptyLocation }
+}
+
+/**
+ * A reference to the return of a delegate call.
+ */
+class DelegateCallReturnContent extends Content, TDelegateCallReturnContent {
+  DelegateCallReturnContent() { this = TDelegateCallReturnContent() }
+
+  override string toString() { result = "delegate return" }
+
+  override Location getLocation() { result instanceof EmptyLocation }
+}
+
 /**
  * A reference to a synthetic field corresponding to a
  * primary constructor parameter.
@@ -299,9 +324,22 @@ class ContentSet extends TContentSet {
    */
   predicate isProperty(Property p) { this = TPropertyContentSet(p) }
 
-  /** Holds if this content set represent the field `f`. */
+  /**
+   * Holds if this content set represents the `i`th argument of a delegate call.
+   */
+  predicate isDelegateCallArgument(int i) { this.isSingleton(TDelegateCallArgumentContent(i)) }
+
+  /**
+   * Holds if this content set represents the return of a delegate call.
+   */
+  predicate isDelegateCallReturn() { this.isSingleton(TDelegateCallReturnContent()) }
+
+  /** Holds if this content set represents the field `f`. */
   predicate isField(Field f) { this.isSingleton(TFieldContent(f)) }
 
+  /** Holds if this content set represents the synthetic field `s`. */
+  predicate isSyntheticField(string s) { this.isSingleton(TSyntheticFieldContent(s)) }
+
   /** Holds if this content set represents an element in a collection. */
   predicate isElement() { this.isSingleton(TElementContent()) }
 
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 4ac73cae9e9..ccc0a333b9e 100644
--- a/csharp/ql/lib/semmle/code/csharp/dataflow/internal/ExternalFlow.qll
+++ b/csharp/ql/lib/semmle/code/csharp/dataflow/internal/ExternalFlow.qll
@@ -318,7 +318,7 @@ private predicate elementSpec(
   or
   summaryModel(namespace, type, subtypes, name, signature, ext, _, _, _, _, _)
   or
-  neutralModel(namespace, type, name, signature, _, _) and ext = "" and subtypes = false
+  neutralModel(namespace, type, name, signature, _, _) and ext = "" and subtypes = true
 }
 
 private predicate elementSpec(
@@ -602,7 +602,7 @@ private predicate interpretSummary(
 predicate interpretNeutral(UnboundCallable c, string kind, string provenance) {
   exists(string namespace, string type, string name, string signature |
     neutralModel(namespace, type, name, signature, kind, provenance) and
-    c = interpretElement(namespace, type, false, name, signature, "")
+    c = interpretElement(namespace, type, true, name, signature, "")
   )
 }
 
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 25de2681862..1a044a77777 100644
--- a/csharp/ql/lib/semmle/code/csharp/dataflow/internal/TaintTrackingPrivate.qll
+++ b/csharp/ql/lib/semmle/code/csharp/dataflow/internal/TaintTrackingPrivate.qll
@@ -169,3 +169,43 @@ private module Cached {
 }
 
 import Cached
+import SpeculativeTaintFlow
+
+private module SpeculativeTaintFlow {
+  private import semmle.code.csharp.dataflow.internal.ExternalFlow as ExternalFlow
+  private import semmle.code.csharp.dataflow.internal.FlowSummaryImpl as Impl
+
+  private predicate hasTarget(Call call) {
+    exists(Impl::Public::SummarizedCallable sc | sc.getACall() = call)
+    or
+    exists(Impl::Public::NeutralSummaryCallable nc | nc.getACall() = call)
+    or
+    call.getTarget().getUnboundDeclaration() instanceof ExternalFlow::SinkCallable
+    or
+    exists(FlowSummaryImpl::Public::NeutralSinkCallable sc | sc.getACall() = call)
+  }
+
+  /**
+   * Holds if the additional step from `src` to `sink` should be considered in
+   * speculative taint flow exploration.
+   */
+  predicate speculativeTaintStep(DataFlow::Node src, DataFlow::Node sink) {
+    exists(DataFlowCall call, Call srcCall, ArgumentPosition argpos |
+      not exists(viableCallable(call)) and
+      not hasTarget(srcCall) and
+      call.(NonDelegateDataFlowCall).getDispatchCall().getCall() = srcCall and
+      (srcCall instanceof ConstructorInitializer or srcCall instanceof MethodCall) and
+      src.(ArgumentNode).argumentOf(call, argpos) and
+      not src instanceof PostUpdateNodes::ObjectInitializerNode and
+      not src instanceof MallocNode
+    |
+      not argpos.isQualifier() and
+      sink.(PostUpdateNode)
+          .getPreUpdateNode()
+          .(ArgumentNode)
+          .argumentOf(call, any(ArgumentPosition qualpos | qualpos.isQualifier()))
+      or
+      sink.(OutNode).getCall(_) = call
+    )
+  }
+}
diff --git a/csharp/ql/lib/semmle/code/csharp/frameworks/System.qll b/csharp/ql/lib/semmle/code/csharp/frameworks/System.qll
index fcb46d5c911..ac16df76416 100644
--- a/csharp/ql/lib/semmle/code/csharp/frameworks/System.qll
+++ b/csharp/ql/lib/semmle/code/csharp/frameworks/System.qll
@@ -354,6 +354,14 @@ class SystemStringClass extends StringType {
     result.getReturnType() instanceof StringType
   }
 
+  /** Gets the `ReplaceLineEndings(string) method. */
+  Method getReplaceLineEndingsMethod() {
+    result.getDeclaringType() = this and
+    result.hasName("ReplaceLineEndings") and
+    result.getNumberOfParameters() = 1 and
+    result.getReturnType() instanceof StringType
+  }
+
   /** Gets a `Format(...)` method. */
   Method getFormatMethod() {
     result.getDeclaringType() = this and
diff --git a/csharp/ql/lib/semmle/code/csharp/security/auth/InsecureDirectObjectReferenceQuery.qll b/csharp/ql/lib/semmle/code/csharp/security/auth/InsecureDirectObjectReferenceQuery.qll
index 858adcc2268..2ea422855ad 100644
--- a/csharp/ql/lib/semmle/code/csharp/security/auth/InsecureDirectObjectReferenceQuery.qll
+++ b/csharp/ql/lib/semmle/code/csharp/security/auth/InsecureDirectObjectReferenceQuery.qll
@@ -18,7 +18,7 @@ private predicate needsChecks(ActionMethod m) { m.isEdit() and not m.isAdmin() }
  * that may indicate that it's used as the ID for some resource
  */
 private predicate hasIdParameter(ActionMethod m) {
-  exists(ThreatModelFlowSource src | src.getEnclosingCallable() = m |
+  exists(ActiveThreatModelSource src | src.getEnclosingCallable() = m |
     src.asParameter().getName().toLowerCase().matches(["%id", "%idx"])
     or
     // handle cases like `Request.QueryString["Id"]`
diff --git a/csharp/ql/lib/semmle/code/csharp/security/dataflow/CodeInjectionQuery.qll b/csharp/ql/lib/semmle/code/csharp/security/dataflow/CodeInjectionQuery.qll
index 2b55697ebda..8ec9122864f 100644
--- a/csharp/ql/lib/semmle/code/csharp/security/dataflow/CodeInjectionQuery.qll
+++ b/csharp/ql/lib/semmle/code/csharp/security/dataflow/CodeInjectionQuery.qll
@@ -55,7 +55,7 @@ deprecated class RemoteSource extends DataFlow::Node instanceof RemoteFlowSource
 deprecated class LocalSource extends DataFlow::Node instanceof LocalFlowSource { }
 
 /** A source supported by the current threat model. */
-class ThreatModelSource extends Source instanceof ThreatModelFlowSource { }
+class ThreatModelSource extends Source instanceof ActiveThreatModelSource { }
 
 private class SimpleTypeSanitizer extends Sanitizer, SimpleTypeSanitizedExpr { }
 
diff --git a/csharp/ql/lib/semmle/code/csharp/security/dataflow/CommandInjectionQuery.qll b/csharp/ql/lib/semmle/code/csharp/security/dataflow/CommandInjectionQuery.qll
index 24c80c07f89..84352389c41 100644
--- a/csharp/ql/lib/semmle/code/csharp/security/dataflow/CommandInjectionQuery.qll
+++ b/csharp/ql/lib/semmle/code/csharp/security/dataflow/CommandInjectionQuery.qll
@@ -57,7 +57,7 @@ module CommandInjection = TaintTracking::Global<CommandInjectionConfig>;
 deprecated class RemoteSource extends DataFlow::Node instanceof RemoteFlowSource { }
 
 /** A source supported by the current threat model. */
-class ThreatModelSource extends Source instanceof ThreatModelFlowSource { }
+class ThreatModelSource extends Source instanceof ActiveThreatModelSource { }
 
 /** Command Injection sinks defined through Models as Data. */
 private class ExternalCommandInjectionExprSink extends Sink {
diff --git a/csharp/ql/lib/semmle/code/csharp/security/dataflow/ConditionalBypassQuery.qll b/csharp/ql/lib/semmle/code/csharp/security/dataflow/ConditionalBypassQuery.qll
index 2bc10dead22..f92bb0d2f44 100644
--- a/csharp/ql/lib/semmle/code/csharp/security/dataflow/ConditionalBypassQuery.qll
+++ b/csharp/ql/lib/semmle/code/csharp/security/dataflow/ConditionalBypassQuery.qll
@@ -54,7 +54,7 @@ module ConditionalBypass = TaintTracking::Global<ConditionalBypassConfig>;
 deprecated class RemoteSource extends DataFlow::Node instanceof RemoteFlowSource { }
 
 /** A source supported by the current threat model. */
-class ThreatModelSource extends Source instanceof ThreatModelFlowSource { }
+class ThreatModelSource extends Source instanceof ActiveThreatModelSource { }
 
 /** The result of a reverse dns may be user-controlled. */
 class ReverseDnsSource extends Source {
diff --git a/csharp/ql/lib/semmle/code/csharp/security/dataflow/ExternalAPIsQuery.qll b/csharp/ql/lib/semmle/code/csharp/security/dataflow/ExternalAPIsQuery.qll
index 69a1823a455..f1a64f6810b 100644
--- a/csharp/ql/lib/semmle/code/csharp/security/dataflow/ExternalAPIsQuery.qll
+++ b/csharp/ql/lib/semmle/code/csharp/security/dataflow/ExternalAPIsQuery.qll
@@ -73,14 +73,14 @@ class ExternalApiDataNode extends DataFlow::Node {
   }
 }
 
-/** A configuration for tracking flow from `ThreatModelFlowSource`s to `ExternalApiDataNode`s. */
+/** A configuration for tracking flow from `ActiveThreatModelSource`s to `ExternalApiDataNode`s. */
 private module RemoteSourceToExternalApiConfig implements DataFlow::ConfigSig {
-  predicate isSource(DataFlow::Node source) { source instanceof ThreatModelFlowSource }
+  predicate isSource(DataFlow::Node source) { source instanceof ActiveThreatModelSource }
 
   predicate isSink(DataFlow::Node sink) { sink instanceof ExternalApiDataNode }
 }
 
-/** A module for tracking flow from `ThreatModelFlowSource`s to `ExternalApiDataNode`s. */
+/** A module for tracking flow from `ActiveThreatModelSource`s to `ExternalApiDataNode`s. */
 module RemoteSourceToExternalApi = TaintTracking::Global<RemoteSourceToExternalApiConfig>;
 
 /** A node representing untrusted data being passed to an external API. */
diff --git a/csharp/ql/lib/semmle/code/csharp/security/dataflow/LDAPInjectionQuery.qll b/csharp/ql/lib/semmle/code/csharp/security/dataflow/LDAPInjectionQuery.qll
index bdba76bfb5c..e2e96034c41 100644
--- a/csharp/ql/lib/semmle/code/csharp/security/dataflow/LDAPInjectionQuery.qll
+++ b/csharp/ql/lib/semmle/code/csharp/security/dataflow/LDAPInjectionQuery.qll
@@ -60,7 +60,7 @@ module LdapInjection = TaintTracking::Global<LdapInjectionConfig>;
 deprecated class RemoteSource extends DataFlow::Node instanceof RemoteFlowSource { }
 
 /** A source supported by the current threat model. */
-class ThreatModelSource extends Source instanceof ThreatModelFlowSource { }
+class ThreatModelSource extends Source instanceof ActiveThreatModelSource { }
 
 /** LDAP sinks defined through Models as Data. */
 private class ExternalLdapExprSink extends Sink {
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 7c4429bcbf8..422b5dc717a 100644
--- a/csharp/ql/lib/semmle/code/csharp/security/dataflow/LogForgingQuery.qll
+++ b/csharp/ql/lib/semmle/code/csharp/security/dataflow/LogForgingQuery.qll
@@ -42,8 +42,8 @@ private module LogForgingConfig implements DataFlow::ConfigSig {
  */
 module LogForging = TaintTracking::Global<LogForgingConfig>;
 
-/** A source of remote user input. */
-private class ThreatModelSource extends Source instanceof ThreatModelFlowSource { }
+/** A source supported by the current threat model. */
+private class ThreatModelSource extends Source instanceof ActiveThreatModelSource { }
 
 private class HtmlSanitizer extends Sanitizer {
   HtmlSanitizer() { this.asExpr() instanceof HtmlSanitizedExpr }
@@ -70,7 +70,9 @@ private class ExternalLoggingExprSink extends Sink {
 private class StringReplaceSanitizer extends Sanitizer {
   StringReplaceSanitizer() {
     exists(Method m |
-      exists(SystemStringClass s | m = s.getReplaceMethod() or m = s.getRemoveMethod())
+      exists(SystemStringClass s |
+        m = s.getReplaceMethod() or m = s.getRemoveMethod() or m = s.getReplaceLineEndingsMethod()
+      )
       or
       m = any(SystemTextRegularExpressionsRegexClass r).getAReplaceMethod()
     |
diff --git a/csharp/ql/lib/semmle/code/csharp/security/dataflow/MissingXMLValidationQuery.qll b/csharp/ql/lib/semmle/code/csharp/security/dataflow/MissingXMLValidationQuery.qll
index 4e14bed2c33..3401dab7ea2 100644
--- a/csharp/ql/lib/semmle/code/csharp/security/dataflow/MissingXMLValidationQuery.qll
+++ b/csharp/ql/lib/semmle/code/csharp/security/dataflow/MissingXMLValidationQuery.qll
@@ -48,7 +48,7 @@ private module MissingXmlValidationConfig implements DataFlow::ConfigSig {
 module MissingXmlValidation = TaintTracking::Global<MissingXmlValidationConfig>;
 
 /**
- * DEPRECATED: Use `ThreatModelFlowSource` instead.
+ * DEPRECATED: Use `ActiveThreatModelSource` instead.
  *
  * A source of remote user input.
  */
@@ -57,7 +57,7 @@ deprecated class RemoteSource extends DataFlow::Node instanceof RemoteFlowSource
 /**
  * A source supported by the current threat model.
  */
-class ThreatModelSource extends Source instanceof ThreatModelFlowSource { }
+class ThreatModelSource extends Source instanceof ActiveThreatModelSource { }
 
 /**
  * The input argument to a call to `XmlReader.Create` where the input will not be validated against
diff --git a/csharp/ql/lib/semmle/code/csharp/security/dataflow/ReDoSQuery.qll b/csharp/ql/lib/semmle/code/csharp/security/dataflow/ReDoSQuery.qll
index f6225ce36bd..5addc03bd88 100644
--- a/csharp/ql/lib/semmle/code/csharp/security/dataflow/ReDoSQuery.qll
+++ b/csharp/ql/lib/semmle/code/csharp/security/dataflow/ReDoSQuery.qll
@@ -49,7 +49,7 @@ module ReDoS = TaintTracking::Global<ReDoSConfig>;
 deprecated class RemoteSource extends DataFlow::Node instanceof RemoteFlowSource { }
 
 /** A source supported by the current threat model. */
-class ThreatModelSource extends Source instanceof ThreatModelFlowSource { }
+class ThreatModelSource extends Source instanceof ActiveThreatModelSource { }
 
 /**
  * An expression that represents a regular expression with potential exponential behavior.
diff --git a/csharp/ql/lib/semmle/code/csharp/security/dataflow/RegexInjectionQuery.qll b/csharp/ql/lib/semmle/code/csharp/security/dataflow/RegexInjectionQuery.qll
index 8affdb1e9dd..620c07a9ea2 100644
--- a/csharp/ql/lib/semmle/code/csharp/security/dataflow/RegexInjectionQuery.qll
+++ b/csharp/ql/lib/semmle/code/csharp/security/dataflow/RegexInjectionQuery.qll
@@ -48,7 +48,7 @@ module RegexInjection = TaintTracking::Global<RegexInjectionConfig>;
 deprecated class RemoteSource extends DataFlow::Node instanceof RemoteFlowSource { }
 
 /** A source supported by the current threat model. */
-class ThreatModelSource extends Source instanceof ThreatModelFlowSource { }
+class ThreatModelSource extends Source instanceof ActiveThreatModelSource { }
 
 /**
  * A `pattern` argument to a construction of a `Regex`.
diff --git a/csharp/ql/lib/semmle/code/csharp/security/dataflow/ResourceInjectionQuery.qll b/csharp/ql/lib/semmle/code/csharp/security/dataflow/ResourceInjectionQuery.qll
index dd1c088042d..40814729e55 100644
--- a/csharp/ql/lib/semmle/code/csharp/security/dataflow/ResourceInjectionQuery.qll
+++ b/csharp/ql/lib/semmle/code/csharp/security/dataflow/ResourceInjectionQuery.qll
@@ -54,7 +54,7 @@ deprecated class RemoteSource extends DataFlow::Node instanceof RemoteFlowSource
 deprecated class LocalSource extends DataFlow::Node instanceof LocalFlowSource { }
 
 /** A source supported by the current threat model. */
-class ThreatModelSource extends Source instanceof ThreatModelFlowSource { }
+class ThreatModelSource extends Source instanceof ActiveThreatModelSource { }
 
 /** An argument to the `ConnectionString` property on a data connection class. */
 class SqlConnectionStringSink extends Sink {
diff --git a/csharp/ql/lib/semmle/code/csharp/security/dataflow/SqlInjectionQuery.qll b/csharp/ql/lib/semmle/code/csharp/security/dataflow/SqlInjectionQuery.qll
index 5a900461af7..cc7b61c31f2 100644
--- a/csharp/ql/lib/semmle/code/csharp/security/dataflow/SqlInjectionQuery.qll
+++ b/csharp/ql/lib/semmle/code/csharp/security/dataflow/SqlInjectionQuery.qll
@@ -65,7 +65,7 @@ deprecated class RemoteSource extends DataFlow::Node instanceof RemoteFlowSource
 deprecated class LocalSource extends DataFlow::Node instanceof LocalFlowSource { }
 
 /** A source supported by the current threat model. */
-class ThreatModelSource extends Source instanceof ThreatModelFlowSource { }
+class ThreatModelSource extends Source instanceof ActiveThreatModelSource { }
 
 /** An SQL expression passed to an API call that executes SQL. */
 class SqlInjectionExprSink extends Sink {
diff --git a/csharp/ql/lib/semmle/code/csharp/security/dataflow/TaintedPathQuery.qll b/csharp/ql/lib/semmle/code/csharp/security/dataflow/TaintedPathQuery.qll
index 21c3cbdf942..bdc7245aeb2 100644
--- a/csharp/ql/lib/semmle/code/csharp/security/dataflow/TaintedPathQuery.qll
+++ b/csharp/ql/lib/semmle/code/csharp/security/dataflow/TaintedPathQuery.qll
@@ -50,7 +50,7 @@ module TaintedPath = TaintTracking::Global<TaintedPathConfig>;
 deprecated class RemoteSource extends DataFlow::Node instanceof RemoteFlowSource { }
 
 /** A source supported by the current threat model. */
-class ThreatModelSource extends Source instanceof ThreatModelFlowSource { }
+class ThreatModelSource extends Source instanceof ActiveThreatModelSource { }
 
 /**
  * A path argument to a `File` method call.
diff --git a/csharp/ql/lib/semmle/code/csharp/security/dataflow/UnsafeDeserializationQuery.qll b/csharp/ql/lib/semmle/code/csharp/security/dataflow/UnsafeDeserializationQuery.qll
index 51aef35272f..009e1ab73c1 100644
--- a/csharp/ql/lib/semmle/code/csharp/security/dataflow/UnsafeDeserializationQuery.qll
+++ b/csharp/ql/lib/semmle/code/csharp/security/dataflow/UnsafeDeserializationQuery.qll
@@ -49,7 +49,7 @@ abstract private class ConstructorOrStaticMethodSink extends Sink { }
  */
 abstract class Sanitizer extends DataFlow::Node { }
 
-private class ThreatModelSource extends Source instanceof ThreatModelFlowSource { }
+private class ThreatModelSource extends Source instanceof ActiveThreatModelSource { }
 
 /**
  * User input to object method call deserialization flow tracking configuration.
diff --git a/csharp/ql/lib/semmle/code/csharp/security/dataflow/UrlRedirectQuery.qll b/csharp/ql/lib/semmle/code/csharp/security/dataflow/UrlRedirectQuery.qll
index 09f6130985f..0838fe7be4b 100644
--- a/csharp/ql/lib/semmle/code/csharp/security/dataflow/UrlRedirectQuery.qll
+++ b/csharp/ql/lib/semmle/code/csharp/security/dataflow/UrlRedirectQuery.qll
@@ -52,7 +52,7 @@ module UrlRedirect = TaintTracking::Global<UrlRedirectConfig>;
 deprecated class RemoteSource extends DataFlow::Node instanceof RemoteFlowSource { }
 
 /** A source supported by the current threat model. */
-class ThreatModelSource extends Source instanceof ThreatModelFlowSource { }
+class ThreatModelSource extends Source instanceof ActiveThreatModelSource { }
 
 /** URL Redirection sinks defined through Models as Data. */
 private class ExternalUrlRedirectExprSink extends Sink {
diff --git a/csharp/ql/lib/semmle/code/csharp/security/dataflow/XMLEntityInjectionQuery.qll b/csharp/ql/lib/semmle/code/csharp/security/dataflow/XMLEntityInjectionQuery.qll
index 4efeadb3c7e..38801410d85 100644
--- a/csharp/ql/lib/semmle/code/csharp/security/dataflow/XMLEntityInjectionQuery.qll
+++ b/csharp/ql/lib/semmle/code/csharp/security/dataflow/XMLEntityInjectionQuery.qll
@@ -15,7 +15,7 @@ private import semmle.code.csharp.security.Sanitizers
  */
 abstract class Source extends DataFlow::Node { }
 
-private class ThreatModelSource extends Source instanceof ThreatModelFlowSource { }
+private class ThreatModelSource extends Source instanceof ActiveThreatModelSource { }
 
 /**
  * A data flow sink for untrusted user input used in XML processing.
diff --git a/csharp/ql/lib/semmle/code/csharp/security/dataflow/XPathInjectionQuery.qll b/csharp/ql/lib/semmle/code/csharp/security/dataflow/XPathInjectionQuery.qll
index 0e8e41c9773..140870c70fa 100644
--- a/csharp/ql/lib/semmle/code/csharp/security/dataflow/XPathInjectionQuery.qll
+++ b/csharp/ql/lib/semmle/code/csharp/security/dataflow/XPathInjectionQuery.qll
@@ -58,7 +58,7 @@ module XpathInjection = TaintTracking::Global<XpathInjectionConfig>;
 deprecated class RemoteSource extends DataFlow::Node instanceof RemoteFlowSource { }
 
 /** A source supported by the current threat model. */
-class ThreatModelSource extends Source instanceof ThreatModelFlowSource { }
+class ThreatModelSource extends Source instanceof ActiveThreatModelSource { }
 
 /** The `xpath` argument to an `XPathExpression.Compile(..)` call. */
 class XPathExpressionCompileSink extends Sink {
diff --git a/csharp/ql/lib/semmle/code/csharp/security/dataflow/XSSQuery.qll b/csharp/ql/lib/semmle/code/csharp/security/dataflow/XSSQuery.qll
index 4ea9e562bb5..81029cc6572 100644
--- a/csharp/ql/lib/semmle/code/csharp/security/dataflow/XSSQuery.qll
+++ b/csharp/ql/lib/semmle/code/csharp/security/dataflow/XSSQuery.qll
@@ -165,7 +165,7 @@ module XssTrackingConfig implements DataFlow::ConfigSig {
 module XssTracking = TaintTracking::Global<XssTrackingConfig>;
 
 /** A source supported by the current threat model. */
-private class ThreatModelSource extends Source instanceof ThreatModelFlowSource { }
+private class ThreatModelSource extends Source instanceof ActiveThreatModelSource { }
 
 private class SimpleTypeSanitizer extends Sanitizer, SimpleTypeSanitizedExpr { }
 
diff --git a/csharp/ql/lib/semmle/code/csharp/security/dataflow/flowsinks/Html.qll b/csharp/ql/lib/semmle/code/csharp/security/dataflow/flowsinks/Html.qll
index 6889d6c5b89..362a993e532 100644
--- a/csharp/ql/lib/semmle/code/csharp/security/dataflow/flowsinks/Html.qll
+++ b/csharp/ql/lib/semmle/code/csharp/security/dataflow/flowsinks/Html.qll
@@ -56,10 +56,9 @@ class HtmlTextWriterSink extends HtmlSink {
 }
 
 /**
- * An expression that is used as an argument to an HTML sink method on
- * `AttributeCollection`.
+ * DEPRECATED: Attribute collections are no longer considered HTML sinks.
  */
-class AttributeCollectionSink extends HtmlSink {
+deprecated class AttributeCollectionSink extends DataFlow::ExprNode {
   AttributeCollectionSink() {
     exists(SystemWebUIAttributeCollectionClass ac, Parameter p |
       p = ac.getAddMethod().getParameter(1) or
diff --git a/csharp/ql/lib/semmle/code/csharp/security/dataflow/flowsources/FlowSources.qll b/csharp/ql/lib/semmle/code/csharp/security/dataflow/flowsources/FlowSources.qll
index c610b3de4c7..526e337e9da 100644
--- a/csharp/ql/lib/semmle/code/csharp/security/dataflow/flowsources/FlowSources.qll
+++ b/csharp/ql/lib/semmle/code/csharp/security/dataflow/flowsources/FlowSources.qll
@@ -20,11 +20,18 @@ abstract class SourceNode extends DataFlow::Node {
 }
 
 /**
+ * DEPRECATED: Use `ActiveThreatModelSource` instead.
+ *
  * A class of data flow sources that respects the
  * current threat model configuration.
  */
-class ThreatModelFlowSource extends DataFlow::Node {
-  ThreatModelFlowSource() {
+deprecated class ThreatModelFlowSource = ActiveThreatModelSource;
+
+/**
+ * A data flow source that is enabled in the current threat model configuration.
+ */
+class ActiveThreatModelSource extends DataFlow::Node {
+  ActiveThreatModelSource() {
     exists(string kind |
       // Specific threat model.
       currentThreatModel(kind) and
diff --git a/csharp/ql/src/CHANGELOG.md b/csharp/ql/src/CHANGELOG.md
index c1d05cc119e..fe0765a3b18 100644
--- a/csharp/ql/src/CHANGELOG.md
+++ b/csharp/ql/src/CHANGELOG.md
@@ -1,3 +1,19 @@
+## 1.0.11
+
+### Minor Analysis Improvements
+
+* C#: The method `string.ReplaceLineEndings(string)` is now considered a sanitizer for the `cs/log-forging` query. 
+
+## 1.0.10
+
+No user-facing changes.
+
+## 1.0.9
+
+### Minor Analysis Improvements
+
+* C#: The indexer and `Add` method on `System.Web.UI.AttributeCollection` is no longer considered an HTML sink.
+
 ## 1.0.8
 
 No user-facing changes.
diff --git a/csharp/ql/src/Security Features/CWE-091/XMLInjection.ql b/csharp/ql/src/Security Features/CWE-091/XMLInjection.ql
index 042e2aa9f17..16eca675e6a 100644
--- a/csharp/ql/src/Security Features/CWE-091/XMLInjection.ql	
+++ b/csharp/ql/src/Security Features/CWE-091/XMLInjection.ql	
@@ -20,7 +20,7 @@ import XmlInjection::PathGraph
  * A taint-tracking configuration for untrusted user input used in XML.
  */
 module XmlInjectionConfig implements DataFlow::ConfigSig {
-  predicate isSource(DataFlow::Node source) { source instanceof ThreatModelFlowSource }
+  predicate isSource(DataFlow::Node source) { source instanceof ActiveThreatModelSource }
 
   predicate isSink(DataFlow::Node sink) {
     exists(MethodCall mc |
diff --git a/csharp/ql/src/Security Features/CWE-114/AssemblyPathInjection.ql b/csharp/ql/src/Security Features/CWE-114/AssemblyPathInjection.ql
index 9d30366af8f..118591f3f9e 100644
--- a/csharp/ql/src/Security Features/CWE-114/AssemblyPathInjection.ql	
+++ b/csharp/ql/src/Security Features/CWE-114/AssemblyPathInjection.ql	
@@ -21,7 +21,7 @@ import AssemblyPathInjection::PathGraph
  * A taint-tracking configuration for untrusted user input used to load a DLL.
  */
 module AssemblyPathInjectionConfig implements DataFlow::ConfigSig {
-  predicate isSource(DataFlow::Node source) { source instanceof ThreatModelFlowSource }
+  predicate isSource(DataFlow::Node source) { source instanceof ActiveThreatModelSource }
 
   predicate isSink(DataFlow::Node sink) {
     exists(MethodCall mc, string name, int arg |
diff --git a/csharp/ql/src/Security Features/CWE-134/UncontrolledFormatString.ql b/csharp/ql/src/Security Features/CWE-134/UncontrolledFormatString.ql
index 7eec0bb90c6..a027170dc37 100644
--- a/csharp/ql/src/Security Features/CWE-134/UncontrolledFormatString.ql	
+++ b/csharp/ql/src/Security Features/CWE-134/UncontrolledFormatString.ql	
@@ -17,7 +17,7 @@ import semmle.code.csharp.frameworks.Format
 import FormatString::PathGraph
 
 module FormatStringConfig implements DataFlow::ConfigSig {
-  predicate isSource(DataFlow::Node source) { source instanceof ThreatModelFlowSource }
+  predicate isSource(DataFlow::Node source) { source instanceof ActiveThreatModelSource }
 
   predicate isSink(DataFlow::Node sink) {
     sink.asExpr() = any(FormatCall call | call.hasInsertions()).getFormatExpr()
diff --git a/csharp/ql/src/Security Features/CWE-209/ExceptionInformationExposure.ql b/csharp/ql/src/Security Features/CWE-209/ExceptionInformationExposure.ql
index 49774fae491..114bdf7ccea 100644
--- a/csharp/ql/src/Security Features/CWE-209/ExceptionInformationExposure.ql	
+++ b/csharp/ql/src/Security Features/CWE-209/ExceptionInformationExposure.ql	
@@ -23,16 +23,17 @@ import ExceptionInformationExposure::PathGraph
  */
 module ExceptionInformationExposureConfig implements DataFlow::ConfigSig {
   predicate isSource(DataFlow::Node source) {
-    exists(Expr exceptionExpr |
+    exists(Expr expr |
       // Writing an exception directly is bad
-      source.asExpr() = exceptionExpr
+      source.asExpr() = expr
+      or
+      // Writing a property of an exception is bad
+      source.asExpr().(PropertyAccess).getQualifier() = expr
     |
       // Expr has type `System.Exception`.
-      exceptionExpr.getType().(RefType).getABaseType*() instanceof SystemExceptionClass and
+      expr.getType().(RefType).getABaseType*() instanceof SystemExceptionClass and
       // And is not within an exception callable.
-      not exists(Callable enclosingCallable |
-        enclosingCallable = exceptionExpr.getEnclosingCallable()
-      |
+      not exists(Callable enclosingCallable | enclosingCallable = expr.getEnclosingCallable() |
         enclosingCallable.getDeclaringType().getABaseType*() instanceof SystemExceptionClass
       )
     )
diff --git a/csharp/ql/src/change-notes/released/1.0.10.md b/csharp/ql/src/change-notes/released/1.0.10.md
new file mode 100644
index 00000000000..b601d878453
--- /dev/null
+++ b/csharp/ql/src/change-notes/released/1.0.10.md
@@ -0,0 +1,3 @@
+## 1.0.10
+
+No user-facing changes.
diff --git a/csharp/ql/src/change-notes/released/1.0.11.md b/csharp/ql/src/change-notes/released/1.0.11.md
new file mode 100644
index 00000000000..9d2720380a0
--- /dev/null
+++ b/csharp/ql/src/change-notes/released/1.0.11.md
@@ -0,0 +1,5 @@
+## 1.0.11
+
+### Minor Analysis Improvements
+
+* C#: The method `string.ReplaceLineEndings(string)` is now considered a sanitizer for the `cs/log-forging` query. 
diff --git a/csharp/ql/src/change-notes/released/1.0.9.md b/csharp/ql/src/change-notes/released/1.0.9.md
new file mode 100644
index 00000000000..85944dc2a71
--- /dev/null
+++ b/csharp/ql/src/change-notes/released/1.0.9.md
@@ -0,0 +1,5 @@
+## 1.0.9
+
+### Minor Analysis Improvements
+
+* C#: The indexer and `Add` method on `System.Web.UI.AttributeCollection` is no longer considered an HTML sink.
diff --git a/csharp/ql/src/codeql-pack.release.yml b/csharp/ql/src/codeql-pack.release.yml
index 5c55fbd52ed..56a2fb38872 100644
--- a/csharp/ql/src/codeql-pack.release.yml
+++ b/csharp/ql/src/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.0.8
+lastReleaseVersion: 1.0.11
diff --git a/csharp/ql/src/experimental/CWE-099/TaintedWebClientLib.qll b/csharp/ql/src/experimental/CWE-099/TaintedWebClientLib.qll
index eea18ae3b6e..716702ca008 100644
--- a/csharp/ql/src/experimental/CWE-099/TaintedWebClientLib.qll
+++ b/csharp/ql/src/experimental/CWE-099/TaintedWebClientLib.qll
@@ -61,7 +61,7 @@ module TaintedWebClient = TaintTracking::Global<TaintedWebClientConfig>;
 deprecated class RemoteSource extends DataFlow::Node instanceof RemoteFlowSource { }
 
 /** A source supported by the current threat model. */
-class ThreatModelSource extends Source instanceof ThreatModelFlowSource { }
+class ThreatModelSource extends Source instanceof ActiveThreatModelSource { }
 
 /**
  * A path argument to a `WebClient` method call that has an address argument.
diff --git a/csharp/ql/src/experimental/CWE-918/RequestForgery.qll b/csharp/ql/src/experimental/CWE-918/RequestForgery.qll
index dac68adfcc1..6d06ca5fa44 100644
--- a/csharp/ql/src/experimental/CWE-918/RequestForgery.qll
+++ b/csharp/ql/src/experimental/CWE-918/RequestForgery.qll
@@ -60,7 +60,7 @@ module RequestForgery {
   /**
    * A dataflow source for Server Side Request Forgery(SSRF) Vulnerabilities.
    */
-  private class ThreatModelSource extends Source instanceof ThreatModelFlowSource { }
+  private class ThreatModelSource extends Source instanceof ActiveThreatModelSource { }
 
   /**
    * An url argument to a `HttpRequestMessage` constructor call
diff --git a/csharp/ql/src/qlpack.yml b/csharp/ql/src/qlpack.yml
index 363cfe14e3d..b861524e144 100644
--- a/csharp/ql/src/qlpack.yml
+++ b/csharp/ql/src/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/csharp-queries
-version: 1.0.9-dev
+version: 1.0.12-dev
 groups:
   - csharp
   - queries
diff --git a/csharp/ql/src/utils/modelgenerator/CaptureContentSummaryModels.ql b/csharp/ql/src/utils/modelgenerator/CaptureContentSummaryModels.ql
new file mode 100644
index 00000000000..039c96a9a0b
--- /dev/null
+++ b/csharp/ql/src/utils/modelgenerator/CaptureContentSummaryModels.ql
@@ -0,0 +1,13 @@
+/**
+ * @name Capture content based summary models.
+ * @description Finds applicable content based summary models to be used by other queries.
+ * @kind diagnostic
+ * @id cs/utils/modelgenerator/contentbased-summary-models
+ * @tags modelgenerator
+ */
+
+import internal.CaptureModels
+
+from DataFlowSummaryTargetApi api, string flow
+where flow = ContentSensitive::captureFlow(api, _)
+select flow order by flow
diff --git a/csharp/ql/src/utils/modelgenerator/CaptureMixedNeutralModels.ql b/csharp/ql/src/utils/modelgenerator/CaptureMixedNeutralModels.ql
new file mode 100644
index 00000000000..6d7004fcc09
--- /dev/null
+++ b/csharp/ql/src/utils/modelgenerator/CaptureMixedNeutralModels.ql
@@ -0,0 +1,13 @@
+/**
+ * @name Capture mixed neutral models.
+ * @description Finds neutral models to be used by other queries.
+ * @kind diagnostic
+ * @id cs/utils/modelgenerator/mixed-neutral-models
+ * @tags modelgenerator
+ */
+
+import internal.CaptureModels
+
+from DataFlowSummaryTargetApi api, string noflow
+where noflow = captureMixedNeutral(api)
+select noflow order by noflow
diff --git a/csharp/ql/src/utils/modelgenerator/CaptureMixedSummaryModels.ql b/csharp/ql/src/utils/modelgenerator/CaptureMixedSummaryModels.ql
new file mode 100644
index 00000000000..4a0bf7c9e22
--- /dev/null
+++ b/csharp/ql/src/utils/modelgenerator/CaptureMixedSummaryModels.ql
@@ -0,0 +1,13 @@
+/**
+ * @name Capture mixed summary models.
+ * @description Finds applicable summary models to be used by other queries.
+ * @kind diagnostic
+ * @id cs/utils/modelgenerator/mixed-summary-models
+ * @tags modelgenerator
+ */
+
+import internal.CaptureModels
+
+from DataFlowSummaryTargetApi api, string flow
+where flow = captureMixedFlow(api, _)
+select flow order by flow
diff --git a/csharp/ql/src/utils/modelgenerator/CaptureNeutralModels.ql b/csharp/ql/src/utils/modelgenerator/CaptureNeutralModels.ql
index a601c2511e6..7a53125e21c 100644
--- a/csharp/ql/src/utils/modelgenerator/CaptureNeutralModels.ql
+++ b/csharp/ql/src/utils/modelgenerator/CaptureNeutralModels.ql
@@ -6,9 +6,7 @@
  * @tags modelgenerator
  */
 
-import semmle.code.csharp.dataflow.internal.FlowSummaryImpl as FlowSummaryImpl
 import internal.CaptureModels
-import internal.CaptureSummaryFlowQuery
 
 from DataFlowSummaryTargetApi api, string noflow
 where noflow = captureNoFlow(api)
diff --git a/csharp/ql/src/utils/modelgenerator/CaptureSummaryModels.ql b/csharp/ql/src/utils/modelgenerator/CaptureSummaryModels.ql
index da4d03fa9bb..991e593474e 100644
--- a/csharp/ql/src/utils/modelgenerator/CaptureSummaryModels.ql
+++ b/csharp/ql/src/utils/modelgenerator/CaptureSummaryModels.ql
@@ -6,9 +6,7 @@
  * @tags modelgenerator
  */
 
-import semmle.code.csharp.dataflow.internal.FlowSummaryImpl as FlowSummaryImpl
 import internal.CaptureModels
-import internal.CaptureSummaryFlowQuery
 
 from DataFlowSummaryTargetApi api, string flow
 where flow = captureFlow(api)
diff --git a/csharp/ql/src/utils/modelgenerator/internal/CaptureModels.qll b/csharp/ql/src/utils/modelgenerator/internal/CaptureModels.qll
index 0f24bab005e..aa456fe2c79 100644
--- a/csharp/ql/src/utils/modelgenerator/internal/CaptureModels.qll
+++ b/csharp/ql/src/utils/modelgenerator/internal/CaptureModels.qll
@@ -1,404 +1,371 @@
-/**
- * Provides classes and predicates related to capturing summary, source,
- * and sink models of the Standard or a 3rd party library.
- */
+private import csharp as CS
+private import semmle.code.csharp.commons.Util as Util
+private import semmle.code.csharp.commons.Collections as Collections
+private import semmle.code.csharp.commons.QualifiedName as QualifiedName
+private import semmle.code.csharp.dataflow.internal.DataFlowDispatch
+private import semmle.code.csharp.dataflow.internal.FlowSummaryImpl as FlowSummaryImpl
+private import semmle.code.csharp.dataflow.internal.TaintTrackingPrivate as TaintTrackingPrivate
+private import semmle.code.csharp.dataflow.internal.ExternalFlow as ExternalFlow
+private import semmle.code.csharp.dataflow.internal.DataFlowImplCommon as DataFlowImplCommon
+private import semmle.code.csharp.dataflow.internal.DataFlowImplSpecific
+private import semmle.code.csharp.dataflow.internal.DataFlowPrivate as DataFlowPrivate
+private import semmle.code.csharp.dataflow.internal.TaintTrackingImplSpecific
+private import semmle.code.csharp.frameworks.system.linq.Expressions
+private import semmle.code.csharp.frameworks.System
+private import semmle.code.csharp.Location
+private import codeql.mad.modelgenerator.internal.ModelGeneratorImpl
 
-private import CaptureModelsSpecific
-private import CaptureModelsPrinting
+module ModelGeneratorInput implements ModelGeneratorInputSig<Location, CsharpDataFlow> {
+  class Type = CS::Type;
 
-/**
- * A node from which flow can return to the caller. This is either a regular
- * `ReturnNode` or a `PostUpdateNode` corresponding to the value of a parameter.
- */
-private class ReturnNodeExt extends DataFlow::Node {
-  private DataFlowImplCommon::ReturnKindExt kind;
+  class Parameter = CS::Parameter;
 
-  ReturnNodeExt() {
-    kind = DataFlowImplCommon::getValueReturnPosition(this).getKind() or
-    kind = DataFlowImplCommon::getParamReturnPosition(this, _).getKind()
+  class Callable = CS::Callable;
+
+  class NodeExtended extends CS::DataFlow::Node {
+    Callable getAsExprEnclosingCallable() { result = this.asExpr().getEnclosingCallable() }
   }
 
   /**
-   * Gets the kind of the return node.
+   * Holds if any of the parameters of `api` are `System.Func<>`.
    */
-  DataFlowImplCommon::ReturnKindExt getKind() { result = kind }
-}
-
-bindingset[c]
-private signature string printCallableParamSig(Callable c, ParameterPosition p);
-
-private module PrintReturnNodeExt<printCallableParamSig/2 printCallableParam> {
-  string getOutput(ReturnNodeExt node) {
-    node.getKind() instanceof DataFlowImplCommon::ValueReturnKind and
-    result = "ReturnValue"
-    or
-    exists(ParameterPosition pos |
-      pos = node.getKind().(DataFlowImplCommon::ParamUpdateReturnKind).getPosition() and
-      result = printCallableParam(returnNodeEnclosingCallable(node), pos)
+  private predicate isHigherOrder(Callable api) {
+    exists(Type t | t = api.getAParameter().getType().getUnboundDeclaration() |
+      t instanceof SystemLinqExpressions::DelegateExtType
     )
   }
-}
 
-string getOutput(ReturnNodeExt node) {
-  result = PrintReturnNodeExt<paramReturnNodeAsOutput/2>::getOutput(node)
-}
-
-string getContentOutput(ReturnNodeExt node) {
-  result = PrintReturnNodeExt<paramReturnNodeAsContentOutput/2>::getOutput(node)
-}
-
-class DataFlowSummaryTargetApi extends SummaryTargetApi {
-  DataFlowSummaryTargetApi() { not isUninterestingForDataFlowModels(this) }
-}
-
-class DataFlowSourceTargetApi = SourceTargetApi;
-
-class DataFlowSinkTargetApi = SinkTargetApi;
-
-private module ModelPrintingInput implements ModelPrintingSig {
-  class SummaryApi = DataFlowSummaryTargetApi;
-
-  class SourceOrSinkApi = SourceOrSinkTargetApi;
-
-  string getProvenance() { result = "df-generated" }
-}
-
-module Printing = ModelPrinting<ModelPrintingInput>;
-
-/**
- * Holds if `c` is a relevant content kind, where the underlying type is relevant.
- */
-private predicate isRelevantTypeInContent(DataFlow::ContentSet c) {
-  isRelevantType(getUnderlyingContentType(c))
-}
-
-/**
- * Holds if data can flow from `node1` to `node2` either via a read or a write of an intermediate field `f`.
- */
-private predicate isRelevantTaintStep(DataFlow::Node node1, DataFlow::Node node2) {
-  exists(DataFlow::ContentSet f |
-    DataFlowPrivate::readStep(node1, f, node2) and
-    // Partially restrict the content types used for intermediate steps.
-    (not exists(getUnderlyingContentType(f)) or isRelevantTypeInContent(f))
-  )
-  or
-  exists(DataFlow::ContentSet f | DataFlowPrivate::storeStep(node1, f, node2) | containerContent(f))
-}
-
-/**
- * Holds if content `c` is either a field, a synthetic field or language specific
- * content of a relevant type or a container like content.
- */
-pragma[nomagic]
-private predicate isRelevantContent0(DataFlow::ContentSet c) {
-  isRelevantTypeInContent(c) or
-  containerContent(c)
-}
-
-/**
- * Gets the MaD string representation of the parameter node `p`.
- */
-string parameterNodeAsInput(DataFlow::ParameterNode p) {
-  result = parameterAccess(p.asParameter())
-  or
-  result = qualifierString() and p instanceof InstanceParameterNode
-}
-
-/**
- * Gets the MaD string representation of the parameter `p`
- * when used in content flow.
- */
-string parameterNodeAsContentInput(DataFlow::ParameterNode p) {
-  result = parameterContentAccess(p.asParameter())
-  or
-  result = qualifierString() and p instanceof InstanceParameterNode
-}
-
-/**
- * Gets the MaD input string representation of `source`.
- */
-string asInputArgument(DataFlow::Node source) { result = asInputArgumentSpecific(source) }
-
-/**
- * Gets the summary model of `api`, if it follows the `fluent` programming pattern (returns `this`).
- */
-string captureQualifierFlow(DataFlowSummaryTargetApi api) {
-  exists(ReturnNodeExt ret |
-    api = returnNodeEnclosingCallable(ret) and
-    isOwnInstanceAccessNode(ret)
-  ) and
-  result = Printing::asValueModel(api, qualifierString(), "ReturnValue")
-}
-
-private int accessPathLimit0() { result = 2 }
-
-private newtype TTaintState =
-  TTaintRead(int n) { n in [0 .. accessPathLimit0()] } or
-  TTaintStore(int n) { n in [1 .. accessPathLimit0()] }
-
-abstract private class TaintState extends TTaintState {
-  abstract string toString();
-}
-
-/**
- * A FlowState representing a tainted read.
- */
-private class TaintRead extends TaintState, TTaintRead {
-  private int step;
-
-  TaintRead() { this = TTaintRead(step) }
-
-  /**
-   * Gets the flow state step number.
-   */
-  int getStep() { result = step }
-
-  override string toString() { result = "TaintRead(" + step + ")" }
-}
-
-/**
- * A FlowState representing a tainted write.
- */
-private class TaintStore extends TaintState, TTaintStore {
-  private int step;
-
-  TaintStore() { this = TTaintStore(step) }
-
-  /**
-   * Gets the flow state step number.
-   */
-  int getStep() { result = step }
-
-  override string toString() { result = "TaintStore(" + step + ")" }
-}
-
-/**
- * A data-flow configuration for tracking flow through APIs.
- * The sources are the parameters of an API and the sinks are the return values (excluding `this`) and parameters.
- *
- * This can be used to generate Flow summaries for APIs from parameter to return.
- */
-module PropagateFlowConfig implements DataFlow::StateConfigSig {
-  class FlowState = TaintState;
-
-  predicate isSource(DataFlow::Node source, FlowState state) {
-    source instanceof DataFlow::ParameterNode and
-    source.getEnclosingCallable() instanceof DataFlowSummaryTargetApi and
-    state.(TaintRead).getStep() = 0
+  private predicate irrelevantAccessor(CS::Accessor a) {
+    a.getDeclaration().(CS::Property).isReadWrite()
   }
 
-  predicate isSink(DataFlow::Node sink, FlowState state) {
-    sink instanceof ReturnNodeExt and
-    not isOwnInstanceAccessNode(sink) and
-    not exists(captureQualifierFlow(sink.asExpr().getEnclosingCallable())) and
-    (state instanceof TaintRead or state instanceof TaintStore)
+  private predicate isUninterestingForModels(Callable api) {
+    api.getDeclaringType().getNamespace().getFullName() = ""
+    or
+    api instanceof CS::ConversionOperator
+    or
+    api instanceof Util::MainMethod
+    or
+    api instanceof CS::Destructor
+    or
+    api instanceof CS::AnonymousFunctionExpr
+    or
+    api.(CS::Constructor).isParameterless()
+    or
+    exists(Type decl | decl = api.getDeclaringType() |
+      decl instanceof SystemObjectClass or
+      decl instanceof SystemValueTypeClass
+    )
+    or
+    // Disregard properties that have both a get and a set accessor,
+    // which implicitly means auto implemented properties.
+    irrelevantAccessor(api)
   }
 
-  predicate isAdditionalFlowStep(
-    DataFlow::Node node1, FlowState state1, DataFlow::Node node2, FlowState state2
-  ) {
-    exists(DataFlow::ContentSet c |
-      DataFlowImplCommon::store(node1, c.getAStoreContent(), node2, _, _) and
-      isRelevantContent0(c) and
+  private predicate relevant(Callable api) {
+    [api.(CS::Modifiable), api.(CS::Accessor).getDeclaration()].isEffectivelyPublic() and
+    api.fromSource() and
+    api.isUnboundDeclaration() and
+    not isUninterestingForModels(api)
+  }
+
+  private Callable getARelevantOverrideeOrImplementee(Overridable m) {
+    m.overridesOrImplements(result) and relevant(result)
+  }
+
+  /**
+   * Gets the super implementation of `api` if it is relevant.
+   * If such a super implementation does not exist, returns `api` if it is relevant.
+   */
+  private Callable liftedImpl(Callable api) {
+    (
+      result = getARelevantOverrideeOrImplementee(api)
+      or
+      result = api and relevant(api)
+    ) and
+    not exists(getARelevantOverrideeOrImplementee(result))
+  }
+
+  private predicate hasManualSummaryModel(Callable api) {
+    api = any(FlowSummaryImpl::Public::SummarizedCallable sc | sc.applyManualModel()) or
+    api = any(FlowSummaryImpl::Public::NeutralSummaryCallable sc | sc.hasManualModel())
+  }
+
+  private predicate hasManualSourceModel(Callable api) {
+    api = any(ExternalFlow::SourceCallable sc | sc.hasManualModel()) or
+    api = any(FlowSummaryImpl::Public::NeutralSourceCallable sc | sc.hasManualModel())
+  }
+
+  private predicate hasManualSinkModel(Callable api) {
+    api = any(ExternalFlow::SinkCallable sc | sc.hasManualModel()) or
+    api = any(FlowSummaryImpl::Public::NeutralSinkCallable sc | sc.hasManualModel())
+  }
+
+  predicate isUninterestingForDataFlowModels(Callable api) { none() }
+
+  predicate isUninterestingForHeuristicDataFlowModels(Callable api) { isHigherOrder(api) }
+
+  class SourceOrSinkTargetApi extends Callable {
+    SourceOrSinkTargetApi() { relevant(this) }
+  }
+
+  class SinkTargetApi extends SourceOrSinkTargetApi {
+    SinkTargetApi() { not hasManualSinkModel(this) }
+  }
+
+  class SourceTargetApi extends SourceOrSinkTargetApi {
+    SourceTargetApi() {
+      not hasManualSourceModel(this) and
+      // Do not generate source models for overridable callables
+      // as virtual dispatch implies that too many methods
+      // will be considered sources.
+      not this.(Overridable).overridesOrImplements(_)
+    }
+  }
+
+  class SummaryTargetApi extends Callable {
+    private Callable lift;
+
+    SummaryTargetApi() {
+      lift = liftedImpl(this) and
+      not hasManualSummaryModel(lift)
+    }
+
+    Callable lift() { result = lift }
+
+    predicate isRelevant() {
+      relevant(this) and
+      not hasManualSummaryModel(this)
+    }
+  }
+
+  /**
+   * Holds if `t` is a type that is generally used for bulk data in collection types.
+   * Eg. char[] is roughly equivalent to string and thus a highly
+   * relevant type for model generation.
+   */
+  private predicate isPrimitiveTypeUsedForBulkData(CS::Type t) {
+    t instanceof CS::ByteType or
+    t instanceof CS::CharType
+  }
+
+  /**
+   * Holds if the collection type `ct` is irrelevant for model generation.
+   * Collection types where the type of the elements are
+   * (1) unknown - are considered relevant.
+   * (2) known - at least one the child types should be relevant (a non-simple type
+   * or a type used for bulk data)
+   */
+  private predicate irrelevantCollectionType(CS::Type ct) {
+    Collections::isCollectionType(ct) and
+    forex(CS::Type child | child = ct.getAChild() |
+      child instanceof CS::SimpleType and
+      not isPrimitiveTypeUsedForBulkData(child)
+    )
+  }
+
+  predicate isRelevantType(CS::Type t) {
+    not t instanceof CS::SimpleType and
+    not t instanceof CS::Enum and
+    not t instanceof SystemDateTimeStruct and
+    not t instanceof SystemTypeClass and
+    not irrelevantCollectionType(t)
+  }
+
+  /**
+   * Gets the underlying type of the content `c`.
+   */
+  private CS::Type getUnderlyingContType(DataFlow::Content c) {
+    result = c.(DataFlow::FieldContent).getField().getType()
+    or
+    result = c.(DataFlow::SyntheticFieldContent).getField().getType()
+    or
+    // Use System.Object as the type of delegate arguments and returns as the content doesn't
+    // contain any type information.
+    c instanceof DataFlow::DelegateCallArgumentContent and result instanceof ObjectType
+    or
+    c instanceof DataFlow::DelegateCallReturnContent and result instanceof ObjectType
+  }
+
+  Type getUnderlyingContentType(DataFlow::ContentSet c) {
+    exists(DataFlow::Content cont |
+      c.isSingleton(cont) and
+      result = getUnderlyingContType(cont)
+    )
+    or
+    exists(CS::Property p |
+      c.isProperty(p) and
+      result = p.getType()
+    )
+  }
+
+  string qualifierString() { result = "Argument[this]" }
+
+  string parameterAccess(CS::Parameter p) {
+    if Collections::isCollectionType(p.getType())
+    then result = "Argument[" + p.getPosition() + "].Element"
+    else result = "Argument[" + p.getPosition() + "]"
+  }
+
+  string parameterContentAccess(CS::Parameter p) { result = "Argument[" + p.getPosition() + "]" }
+
+  class InstanceParameterNode = DataFlowPrivate::InstanceParameterNode;
+
+  private signature string parameterAccessSig(Parameter p);
+
+  private module ParamReturnNodeAsOutput<parameterAccessSig/1 getParamAccess> {
+    bindingset[c]
+    string paramReturnNodeAsOutput(CS::Callable c, ParameterPosition pos) {
+      result = getParamAccess(c.getParameter(pos.getPosition()))
+      or
+      pos.isThisParameter() and
+      result = qualifierString()
+    }
+  }
+
+  bindingset[c]
+  string paramReturnNodeAsOutput(CS::Callable c, ParameterPosition pos) {
+    result = ParamReturnNodeAsOutput<parameterAccess/1>::paramReturnNodeAsOutput(c, pos)
+  }
+
+  bindingset[c]
+  string paramReturnNodeAsContentOutput(Callable c, ParameterPosition pos) {
+    result = ParamReturnNodeAsOutput<parameterContentAccess/1>::paramReturnNodeAsOutput(c, pos)
+  }
+
+  Callable returnNodeEnclosingCallable(DataFlow::Node ret) {
+    result = DataFlowImplCommon::getNodeEnclosingCallable(ret).asCallable(_)
+  }
+
+  predicate isOwnInstanceAccessNode(DataFlowPrivate::ReturnNode node) {
+    node.asExpr() instanceof CS::ThisAccess
+  }
+
+  private predicate isRelevantMemberAccess(DataFlow::Node node) {
+    exists(CS::MemberAccess access | access = node.asExpr() |
+      access.hasThisQualifier() and
+      access.getTarget().isEffectivelyPublic() and
       (
-        state1 instanceof TaintRead and state2.(TaintStore).getStep() = 1
+        access instanceof CS::FieldAccess
         or
-        state1.(TaintStore).getStep() + 1 = state2.(TaintStore).getStep()
+        access.getTarget().(CS::Property).getSetter().isPublic()
       )
     )
-    or
-    exists(DataFlow::ContentSet c |
-      DataFlowPrivate::readStep(node1, c, node2) and
-      isRelevantContent0(c) and
-      state1.(TaintRead).getStep() + 1 = state2.(TaintRead).getStep()
+  }
+
+  predicate sinkModelSanitizer(DataFlow::Node node) { none() }
+
+  predicate apiSource(DataFlow::Node source) {
+    isRelevantMemberAccess(source) or source instanceof DataFlow::ParameterNode
+  }
+
+  private predicate uniquelyCalls(DataFlowCallable dc1, DataFlowCallable dc2) {
+    exists(DataFlowCall call |
+      dc1 = call.getEnclosingCallable() and
+      dc2 = unique(DataFlowCallable dc0 | dc0 = viableCallable(call) | dc0)
     )
   }
 
-  predicate isBarrier(DataFlow::Node n) {
-    exists(Type t | t = n.getType() and not isRelevantType(t))
-  }
+  bindingset[dc1, dc2]
+  private predicate uniquelyCallsPlus(DataFlowCallable dc1, DataFlowCallable dc2) =
+    fastTC(uniquelyCalls/2)(dc1, dc2)
 
-  DataFlow::FlowFeature getAFeature() {
-    result instanceof DataFlow::FeatureEqualSourceSinkCallContext
-  }
-}
-
-module PropagateFlow = TaintTracking::GlobalWithState<PropagateFlowConfig>;
-
-/**
- * Gets the summary model(s) of `api`, if there is flow from parameters to return value or parameter.
- */
-string captureThroughFlow0(
-  DataFlowSummaryTargetApi api, DataFlow::ParameterNode p, ReturnNodeExt returnNodeExt
-) {
-  exists(string input, string output |
-    p.getEnclosingCallable() = api and
-    returnNodeExt.(DataFlow::Node).getEnclosingCallable() = api and
-    input = parameterNodeAsInput(p) and
-    output = getOutput(returnNodeExt) and
-    input != output and
-    result = Printing::asTaintModel(api, input, output)
-  )
-}
-
-/**
- * Gets the summary model(s) of `api`, if there is flow from parameters to return value or parameter.
- */
-string captureThroughFlow(DataFlowSummaryTargetApi api) {
-  exists(DataFlow::ParameterNode p, ReturnNodeExt returnNodeExt |
-    PropagateFlow::flow(p, returnNodeExt) and
-    result = captureThroughFlow0(api, p, returnNodeExt)
-  )
-}
-
-private module PropagateContentFlowConfig implements ContentDataFlow::ConfigSig {
-  predicate isSource(DataFlow::Node source) {
-    source instanceof DataFlow::ParameterNode and
-    source.getEnclosingCallable() instanceof DataFlowSummaryTargetApi
-  }
-
-  predicate isSink(DataFlow::Node sink) {
-    sink instanceof ReturnNodeExt and
-    sink.getEnclosingCallable() instanceof DataFlowSummaryTargetApi
-  }
-
-  predicate isAdditionalFlowStep = isAdditionalContentFlowStep/2;
-
-  predicate isBarrier(DataFlow::Node n) {
-    exists(Type t | t = n.getType() and not isRelevantType(t))
-  }
-
-  int accessPathLimit() { result = 2 }
-
-  predicate isRelevantContent(DataFlow::ContentSet s) { isRelevantContent0(s) }
-
-  DataFlow::FlowFeature getAFeature() {
-    result instanceof DataFlow::FeatureEqualSourceSinkCallContext
-  }
-}
-
-private module PropagateContentFlow = ContentDataFlow::Global<PropagateContentFlowConfig>;
-
-private string getContent(PropagateContentFlow::AccessPath ap, int i) {
-  exists(ContentSet head, PropagateContentFlow::AccessPath tail |
-    head = ap.getHead() and
-    tail = ap.getTail()
-  |
-    i = 0 and
-    result = "." + printContent(head)
-    or
-    i > 0 and result = getContent(tail, i - 1)
-  )
-}
-
-private string printStoreAccessPath(PropagateContentFlow::AccessPath ap) {
-  result = concat(int i | | getContent(ap, i), "" order by i)
-}
-
-private string printReadAccessPath(PropagateContentFlow::AccessPath ap) {
-  result = concat(int i | | getContent(ap, i), "" order by i desc)
-}
-
-string captureContentFlow(DataFlowSummaryTargetApi api) {
-  exists(
-    DataFlow::ParameterNode p, ReturnNodeExt returnNodeExt, string input, string output,
-    PropagateContentFlow::AccessPath reads, PropagateContentFlow::AccessPath stores,
-    boolean preservesValue
-  |
-    PropagateContentFlow::flow(p, reads, returnNodeExt, stores, preservesValue) and
-    returnNodeExt.getEnclosingCallable() = api and
-    input = parameterNodeAsContentInput(p) + printReadAccessPath(reads) and
-    output = getContentOutput(returnNodeExt) + printStoreAccessPath(stores) and
-    input != output and
-    result = Printing::asModel(api, input, output, preservesValue)
-  )
-}
-
-/**
- * A dataflow configuration used for finding new sources.
- * The sources are the already known existing sources and the sinks are the API return nodes.
- *
- * This can be used to generate Source summaries for an API, if the API expose an already known source
- * via its return (then the API itself becomes a source).
- */
-module PropagateFromSourceConfig implements DataFlow::ConfigSig {
-  predicate isSource(DataFlow::Node source) {
-    exists(string kind |
-      isRelevantSourceKind(kind) and
-      ExternalFlow::sourceNode(source, kind)
+  bindingset[sourceEnclosing, api]
+  predicate irrelevantSourceSinkApi(Callable sourceEnclosing, SourceTargetApi api) {
+    not exists(DataFlowCallable dc1, DataFlowCallable dc2 |
+      uniquelyCallsPlus(dc1, dc2) or dc1 = dc2
+    |
+      dc1.getUnderlyingCallable() = api and
+      dc2.getUnderlyingCallable() = sourceEnclosing
     )
   }
 
-  predicate isSink(DataFlow::Node sink) {
-    sink instanceof ReturnNodeExt and
-    sink.getEnclosingCallable() instanceof DataFlowSourceTargetApi
-  }
-
-  DataFlow::FlowFeature getAFeature() { result instanceof DataFlow::FeatureHasSinkCallContext }
-
-  predicate isBarrier(DataFlow::Node n) {
-    exists(Type t | t = n.getType() and not isRelevantType(t))
-  }
-
-  predicate isAdditionalFlowStep(DataFlow::Node node1, DataFlow::Node node2) {
-    isRelevantTaintStep(node1, node2)
-  }
-}
-
-private module PropagateFromSource = TaintTracking::Global<PropagateFromSourceConfig>;
-
-/**
- * Gets the source model(s) of `api`, if there is flow from an existing known source to the return of `api`.
- */
-string captureSource(DataFlowSourceTargetApi api) {
-  exists(DataFlow::Node source, ReturnNodeExt sink, string kind |
-    PropagateFromSource::flow(source, sink) and
-    ExternalFlow::sourceNode(source, kind) and
-    api = sink.getEnclosingCallable() and
-    not irrelevantSourceSinkApi(source.getEnclosingCallable(), api) and
-    result = Printing::asSourceModel(api, getOutput(sink), kind)
-  )
-}
-
-/**
- * A dataflow configuration used for finding new sinks.
- * The sources are the parameters of the API and the fields of the enclosing type.
- *
- * This can be used to generate Sink summaries for APIs, if the API propagates a parameter (or enclosing type field)
- * into an existing known sink (then the API itself becomes a sink).
- */
-module PropagateToSinkConfig implements DataFlow::ConfigSig {
-  predicate isSource(DataFlow::Node source) {
-    apiSource(source) and source.getEnclosingCallable() instanceof DataFlowSinkTargetApi
-  }
-
-  predicate isSink(DataFlow::Node sink) {
-    exists(string kind | isRelevantSinkKind(kind) and ExternalFlow::sinkNode(sink, kind))
-  }
-
-  predicate isBarrier(DataFlow::Node node) {
-    exists(Type t | t = node.getType() and not isRelevantType(t))
+  string getInputArgument(DataFlow::Node source) {
+    exists(int pos |
+      pos = source.(DataFlow::ParameterNode).getParameter().getPosition() and
+      result = "Argument[" + pos + "]"
+    )
     or
-    sinkModelSanitizer(node)
+    source.asExpr() instanceof DataFlowPrivate::FieldOrPropertyAccess and
+    result = qualifierString()
   }
 
-  DataFlow::FlowFeature getAFeature() { result instanceof DataFlow::FeatureHasSourceCallContext }
+  bindingset[kind]
+  predicate isRelevantSinkKind(string kind) { any() }
 
-  predicate isAdditionalFlowStep(DataFlow::Node node1, DataFlow::Node node2) {
-    isRelevantTaintStep(node1, node2)
+  bindingset[kind]
+  predicate isRelevantSourceKind(string kind) { any() }
+
+  predicate containerContent(DataFlow::ContentSet c) { c.isElement() }
+
+  predicate isAdditionalContentFlowStep(DataFlow::Node nodeFrom, DataFlow::Node nodeTo) {
+    TaintTrackingPrivate::defaultAdditionalTaintStep(nodeFrom, nodeTo, _) and
+    not nodeTo.asExpr() instanceof CS::ElementAccess and
+    not exists(DataFlow::ContentSet c |
+      DataFlowPrivate::readStep(nodeFrom, c, nodeTo) and containerContent(c)
+    )
   }
+
+  bindingset[d]
+  private string getFullyQualifiedName(Declaration d) {
+    exists(string qualifier, string name |
+      d.hasFullyQualifiedName(qualifier, name) and
+      result = QualifiedName::getQualifiedName(qualifier, name)
+    )
+  }
+
+  predicate isField(DataFlow::ContentSet c) {
+    c.isField(_) or c.isSyntheticField(_) or c.isProperty(_)
+  }
+
+  predicate isCallback(DataFlow::ContentSet c) {
+    c.isDelegateCallArgument(_) or c.isDelegateCallReturn()
+  }
+
+  string getSyntheticName(DataFlow::ContentSet c) {
+    exists(CS::Field f |
+      not f.isEffectivelyPublic() and
+      c.isField(f) and
+      result = getFullyQualifiedName(f)
+    )
+    or
+    exists(CS::Property p |
+      not p.isEffectivelyPublic() and
+      c.isProperty(p) and
+      result = getFullyQualifiedName(p)
+    )
+    or
+    c.isSyntheticField(result)
+  }
+
+  string printContent(DataFlow::ContentSet c) {
+    exists(CS::Field f, string name | name = getFullyQualifiedName(f) |
+      c.isField(f) and
+      f.isEffectivelyPublic() and
+      result = "Field[" + name + "]"
+    )
+    or
+    exists(CS::Property p, string name | name = getFullyQualifiedName(p) |
+      c.isProperty(p) and
+      p.isEffectivelyPublic() and
+      result = "Property[" + name + "]"
+    )
+    or
+    result = "SyntheticField[" + getSyntheticName(c) + "]"
+    or
+    c.isElement() and
+    result = "Element"
+    or
+    exists(int i | c.isDelegateCallArgument(i) and result = "Parameter[" + i + "]")
+    or
+    c.isDelegateCallReturn() and result = "ReturnValue"
+  }
+
+  predicate partialModel = ExternalFlow::partialModel/6;
+
+  predicate sourceNode = ExternalFlow::sourceNode/2;
+
+  predicate sinkNode = ExternalFlow::sinkNode/2;
 }
 
-private module PropagateToSink = TaintTracking::Global<PropagateToSinkConfig>;
-
-/**
- * Gets the sink model(s) of `api`, if there is flow from a parameter to an existing known sink.
- */
-string captureSink(DataFlowSinkTargetApi api) {
-  exists(DataFlow::Node src, DataFlow::Node sink, string kind |
-    PropagateToSink::flow(src, sink) and
-    ExternalFlow::sinkNode(sink, kind) and
-    api = src.getEnclosingCallable() and
-    result = Printing::asSinkModel(api, asInputArgument(src), kind)
-  )
-}
+import MakeModelGenerator<Location, CsharpDataFlow, CsharpTaintTracking, ModelGeneratorInput>
diff --git a/csharp/ql/src/utils/modelgenerator/internal/CaptureModelsPrinting.qll b/csharp/ql/src/utils/modelgenerator/internal/CaptureModelsPrinting.qll
index 4c09f4ccba5..90452b1fc91 100644
--- a/csharp/ql/src/utils/modelgenerator/internal/CaptureModelsPrinting.qll
+++ b/csharp/ql/src/utils/modelgenerator/internal/CaptureModelsPrinting.qll
@@ -1,5 +1,5 @@
 private import csharp as CS
-private import codeql.mad.modelgenerator.ModelPrinting
+private import codeql.mad.modelgenerator.internal.ModelPrinting
 private import semmle.code.csharp.dataflow.internal.ExternalFlow as ExternalFlow
 
 private module ModelPrintingLang implements ModelPrintingLangSig {
diff --git a/csharp/ql/src/utils/modelgenerator/internal/CaptureModelsSpecific.qll b/csharp/ql/src/utils/modelgenerator/internal/CaptureModelsSpecific.qll
deleted file mode 100644
index 2f2a1ef2761..00000000000
--- a/csharp/ql/src/utils/modelgenerator/internal/CaptureModelsSpecific.qll
+++ /dev/null
@@ -1,412 +0,0 @@
-/**
- * Provides predicates related to capturing summary models of the Standard or a 3rd party library.
- */
-
-private import csharp as CS
-private import semmle.code.csharp.commons.Util as Util
-private import semmle.code.csharp.commons.Collections as Collections
-private import semmle.code.csharp.commons.QualifiedName as QualifiedName
-private import semmle.code.csharp.dataflow.internal.DataFlowDispatch
-private import semmle.code.csharp.dataflow.internal.FlowSummaryImpl as FlowSummaryImpl
-private import semmle.code.csharp.frameworks.system.linq.Expressions
-private import semmle.code.csharp.frameworks.System
-private import semmle.code.csharp.dataflow.internal.TaintTrackingPrivate as TaintTrackingPrivate
-import semmle.code.csharp.dataflow.internal.ExternalFlow as ExternalFlow
-import semmle.code.csharp.dataflow.internal.ContentDataFlow as ContentDataFlow
-import semmle.code.csharp.dataflow.internal.DataFlowImplCommon as DataFlowImplCommon
-import semmle.code.csharp.dataflow.internal.DataFlowPrivate as DataFlowPrivate
-import semmle.code.csharp.dataflow.internal.DataFlowDispatch as DataFlowDispatch
-
-module DataFlow = CS::DataFlow;
-
-module TaintTracking = CS::TaintTracking;
-
-class Type = CS::Type;
-
-class Callable = CS::Callable;
-
-class ContentSet = DataFlow::ContentSet;
-
-/**
- * Holds if any of the parameters of `api` are `System.Func<>`.
- */
-private predicate isHigherOrder(Callable api) {
-  exists(Type t | t = api.getAParameter().getType().getUnboundDeclaration() |
-    t instanceof SystemLinqExpressions::DelegateExtType
-  )
-}
-
-private predicate irrelevantAccessor(CS::Accessor a) {
-  a.getDeclaration().(CS::Property).isReadWrite()
-}
-
-private predicate isUninterestingForModels(Callable api) {
-  api.getDeclaringType().getNamespace().getFullName() = ""
-  or
-  api instanceof CS::ConversionOperator
-  or
-  api instanceof Util::MainMethod
-  or
-  api instanceof CS::Destructor
-  or
-  api instanceof CS::AnonymousFunctionExpr
-  or
-  api.(CS::Constructor).isParameterless()
-  or
-  exists(Type decl | decl = api.getDeclaringType() |
-    decl instanceof SystemObjectClass or
-    decl instanceof SystemValueTypeClass
-  )
-  or
-  // Disregard properties that have both a get and a set accessor,
-  // which implicitly means auto implemented properties.
-  irrelevantAccessor(api)
-}
-
-private predicate relevant(Callable api) {
-  [api.(CS::Modifiable), api.(CS::Accessor).getDeclaration()].isEffectivelyPublic() and
-  api.fromSource() and
-  api.isUnboundDeclaration() and
-  not isUninterestingForModels(api)
-}
-
-private Callable getARelevantOverrideeOrImplementee(Overridable m) {
-  m.overridesOrImplements(result) and relevant(result)
-}
-
-/**
- * Gets the super implementation of `api` if it is relevant.
- * If such a super implementation does not exist, returns `api` if it is relevant.
- */
-private Callable liftedImpl(Callable api) {
-  (
-    result = getARelevantOverrideeOrImplementee(api)
-    or
-    result = api and relevant(api)
-  ) and
-  not exists(getARelevantOverrideeOrImplementee(result))
-}
-
-private predicate hasManualSummaryModel(Callable api) {
-  api = any(FlowSummaryImpl::Public::SummarizedCallable sc | sc.applyManualModel()) or
-  api = any(FlowSummaryImpl::Public::NeutralSummaryCallable sc | sc.hasManualModel())
-}
-
-private predicate hasManualSourceModel(Callable api) {
-  api = any(ExternalFlow::SourceCallable sc | sc.hasManualModel()) or
-  api = any(FlowSummaryImpl::Public::NeutralSourceCallable sc | sc.hasManualModel())
-}
-
-private predicate hasManualSinkModel(Callable api) {
-  api = any(ExternalFlow::SinkCallable sc | sc.hasManualModel()) or
-  api = any(FlowSummaryImpl::Public::NeutralSinkCallable sc | sc.hasManualModel())
-}
-
-/**
- * Holds if it is irrelevant to generate models for `api` based on data flow analysis.
- *
- * This serves as an extra filter for the `relevant` predicate.
- */
-predicate isUninterestingForDataFlowModels(CS::Callable api) { isHigherOrder(api) }
-
-/**
- * Holds if it is irrelevant to generate models for `api` based on type-based analysis.
- *
- * This serves as an extra filter for the `relevant` predicate.
- */
-predicate isUninterestingForTypeBasedFlowModels(CS::Callable api) { none() }
-
-/**
- * A class of callables that are potentially relevant for generating source or
- * sink models.
- */
-class SourceOrSinkTargetApi extends Callable {
-  SourceOrSinkTargetApi() { relevant(this) }
-}
-
-/**
- * A class of callables that are potentially relevant for generating sink models.
- */
-class SinkTargetApi extends SourceOrSinkTargetApi {
-  SinkTargetApi() { not hasManualSinkModel(this) }
-}
-
-/**
- * A class of callables that are potentially relevant for generating source models.
- */
-class SourceTargetApi extends SourceOrSinkTargetApi {
-  SourceTargetApi() {
-    not hasManualSourceModel(this) and
-    // Do not generate source models for overridable callables
-    // as virtual dispatch implies that too many methods
-    // will be considered sources.
-    not this.(Overridable).overridesOrImplements(_)
-  }
-}
-
-/**
- * A class of callables that are potentially relevant for generating summary or
- * neutral models.
- *
- * In the Standard library and 3rd party libraries it is the callables (or callables that have a
- * super implementation) that can be called from outside the library itself.
- */
-class SummaryTargetApi extends Callable {
-  private Callable lift;
-
-  SummaryTargetApi() {
-    lift = liftedImpl(this) and
-    not hasManualSummaryModel(lift)
-  }
-
-  /**
-   * Gets the callable that a model will be lifted to.
-   *
-   * The lifted callable is relevant in terms of model
-   * generation (this is ensured by `liftedImpl`).
-   */
-  Callable lift() { result = lift }
-
-  /**
-   * Holds if `this` is relevant in terms of model generation.
-   */
-  predicate isRelevant() { relevant(this) }
-}
-
-/**
- * Holds if `t` is a type that is generally used for bulk data in collection types.
- * Eg. char[] is roughly equivalent to string and thus a highly
- * relevant type for model generation.
- */
-private predicate isPrimitiveTypeUsedForBulkData(CS::Type t) {
-  t instanceof CS::ByteType or
-  t instanceof CS::CharType
-}
-
-/**
- * Holds if the collection type `ct` is irrelevant for model generation.
- * Collection types where the type of the elements are
- * (1) unknown - are considered relevant.
- * (2) known - at least one the child types should be relevant (a non-simple type
- * or a type used for bulk data)
- */
-private predicate irrelevantCollectionType(CS::Type ct) {
-  Collections::isCollectionType(ct) and
-  forex(CS::Type child | child = ct.getAChild() |
-    child instanceof CS::SimpleType and
-    not isPrimitiveTypeUsedForBulkData(child)
-  )
-}
-
-/**
- * Holds for type `t` for fields that are relevant as an intermediate
- * read or write step in the data flow analysis.
- * That is, flow through any data-flow node that does not have a relevant type
- * will be excluded.
- */
-predicate isRelevantType(CS::Type t) {
-  not t instanceof CS::SimpleType and
-  not t instanceof CS::Enum and
-  not t instanceof SystemDateTimeStruct and
-  not t instanceof SystemTypeClass and
-  not irrelevantCollectionType(t)
-}
-
-/**
- * Gets the underlying type of the content `c`.
- */
-private CS::Type getUnderlyingContType(DataFlow::Content c) {
-  result = c.(DataFlow::FieldContent).getField().getType() or
-  result = c.(DataFlow::SyntheticFieldContent).getField().getType()
-}
-
-/**
- * Gets the underlying type of the content `c`.
- */
-CS::Type getUnderlyingContentType(DataFlow::ContentSet c) {
-  exists(DataFlow::Content cont |
-    c.isSingleton(cont) and
-    result = getUnderlyingContType(cont)
-  )
-  or
-  exists(CS::Property p |
-    c.isProperty(p) and
-    result = p.getType()
-  )
-}
-
-/**
- * Gets the MaD string representation of the qualifier.
- */
-string qualifierString() { result = "Argument[this]" }
-
-string parameterAccess(CS::Parameter p) {
-  if Collections::isCollectionType(p.getType())
-  then result = "Argument[" + p.getPosition() + "].Element"
-  else result = "Argument[" + p.getPosition() + "]"
-}
-
-/**
- * Gets the MaD string representation of the parameter `p`
- * when used in content flow.
- */
-string parameterContentAccess(CS::Parameter p) { result = "Argument[" + p.getPosition() + "]" }
-
-class InstanceParameterNode = DataFlowPrivate::InstanceParameterNode;
-
-class ParameterPosition = DataFlowDispatch::ParameterPosition;
-
-private signature string parameterAccessSig(Parameter p);
-
-module ParamReturnNodeAsOutput<parameterAccessSig/1 getParamAccess> {
-  bindingset[c]
-  string paramReturnNodeAsOutput(CS::Callable c, ParameterPosition pos) {
-    result = getParamAccess(c.getParameter(pos.getPosition()))
-    or
-    pos.isThisParameter() and
-    result = qualifierString()
-  }
-}
-
-/**
- * Gets the MaD string representation of return through parameter at position
- * `pos` of callable `c`.
- */
-bindingset[c]
-string paramReturnNodeAsOutput(CS::Callable c, ParameterPosition pos) {
-  result = ParamReturnNodeAsOutput<parameterAccess/1>::paramReturnNodeAsOutput(c, pos)
-}
-
-bindingset[c]
-string paramReturnNodeAsContentOutput(Callable c, ParameterPosition pos) {
-  result = ParamReturnNodeAsOutput<parameterContentAccess/1>::paramReturnNodeAsOutput(c, pos)
-}
-
-/**
- * Gets the enclosing callable of `ret`.
- */
-Callable returnNodeEnclosingCallable(DataFlow::Node ret) {
-  result = DataFlowImplCommon::getNodeEnclosingCallable(ret).asCallable(_)
-}
-
-/**
- * Holds if `node` is an own instance access.
- */
-predicate isOwnInstanceAccessNode(DataFlowPrivate::ReturnNode node) {
-  node.asExpr() instanceof CS::ThisAccess
-}
-
-private predicate isRelevantMemberAccess(DataFlow::Node node) {
-  exists(CS::MemberAccess access | access = node.asExpr() |
-    access.hasThisQualifier() and
-    access.getTarget().isEffectivelyPublic() and
-    (
-      access instanceof CS::FieldAccess
-      or
-      access.getTarget().(CS::Property).getSetter().isPublic()
-    )
-  )
-}
-
-predicate sinkModelSanitizer(DataFlow::Node node) { none() }
-
-/**
- * Holds if `source` is an api entrypoint relevant for creating sink models.
- */
-predicate apiSource(DataFlow::Node source) {
-  isRelevantMemberAccess(source) or source instanceof DataFlow::ParameterNode
-}
-
-private predicate uniquelyCalls(DataFlowCallable dc1, DataFlowCallable dc2) {
-  exists(DataFlowCall call |
-    dc1 = call.getEnclosingCallable() and
-    dc2 = unique(DataFlowCallable dc0 | dc0 = viableCallable(call) | dc0)
-  )
-}
-
-bindingset[dc1, dc2]
-private predicate uniquelyCallsPlus(DataFlowCallable dc1, DataFlowCallable dc2) =
-  fastTC(uniquelyCalls/2)(dc1, dc2)
-
-/**
- * Holds if it is not relevant to generate a source model for `api`, even
- * if flow is detected from a node within `source` to a sink within `api`.
- */
-bindingset[sourceEnclosing, api]
-predicate irrelevantSourceSinkApi(Callable sourceEnclosing, SourceTargetApi api) {
-  not exists(DataFlowCallable dc1, DataFlowCallable dc2 | uniquelyCallsPlus(dc1, dc2) or dc1 = dc2 |
-    dc1.getUnderlyingCallable() = api and
-    dc2.getUnderlyingCallable() = sourceEnclosing
-  )
-}
-
-/**
- * Gets the MaD input string representation of `source`.
- */
-string asInputArgumentSpecific(DataFlow::Node source) {
-  exists(int pos |
-    pos = source.(DataFlow::ParameterNode).getParameter().getPosition() and
-    result = "Argument[" + pos + "]"
-  )
-  or
-  source.asExpr() instanceof DataFlowPrivate::FieldOrPropertyAccess and
-  result = qualifierString()
-}
-
-/**
- * Holds if `kind` is a relevant sink kind for creating sink models.
- */
-bindingset[kind]
-predicate isRelevantSinkKind(string kind) { any() }
-
-/**
- * Holds if `kind` is a relevant source kind for creating source models.
- */
-bindingset[kind]
-predicate isRelevantSourceKind(string kind) { any() }
-
-/**
- * Holds if the the content `c` is a container.
- */
-predicate containerContent(DataFlow::ContentSet c) { c.isElement() }
-
-/**
- * Holds if there is a taint step from `node1` to `node2` in content flow.
- */
-predicate isAdditionalContentFlowStep(DataFlow::Node nodeFrom, DataFlow::Node nodeTo) {
-  TaintTrackingPrivate::defaultAdditionalTaintStep(nodeFrom, nodeTo, _) and
-  not nodeTo.asExpr() instanceof CS::ElementAccess and
-  not exists(DataFlow::ContentSet c |
-    DataFlowPrivate::readStep(nodeFrom, c, nodeTo) and containerContent(c)
-  )
-}
-
-bindingset[d]
-private string getFullyQualifiedName(Declaration d) {
-  exists(string qualifier, string name |
-    d.hasFullyQualifiedName(qualifier, name) and
-    result = QualifiedName::getQualifiedName(qualifier, name)
-  )
-}
-
-/**
- * Gets the MaD string representation of the contentset `c`.
- */
-string printContent(DataFlow::ContentSet c) {
-  exists(CS::Field f, string name | name = getFullyQualifiedName(f) |
-    c.isField(f) and
-    if f.isEffectivelyPublic()
-    then result = "Field[" + name + "]"
-    else result = "SyntheticField[" + name + "]"
-  )
-  or
-  exists(CS::Property p, string name | name = getFullyQualifiedName(p) |
-    c.isProperty(p) and
-    if p.isEffectivelyPublic()
-    then result = "Property[" + name + "]"
-    else result = "SyntheticField[" + name + "]"
-  )
-  or
-  c.isElement() and
-  result = "Element"
-}
diff --git a/csharp/ql/src/utils/modelgenerator/internal/CaptureSummaryFlowQuery.qll b/csharp/ql/src/utils/modelgenerator/internal/CaptureSummaryFlowQuery.qll
deleted file mode 100644
index 8bb706bc484..00000000000
--- a/csharp/ql/src/utils/modelgenerator/internal/CaptureSummaryFlowQuery.qll
+++ /dev/null
@@ -1,93 +0,0 @@
-private import CaptureModels
-
-/**
- * Capture fluent APIs that return `this`.
- * Example of a fluent API:
- * ```csharp
- * public class BasicFlow {
- *   public BasicFlow ReturnThis(object input)
- *   {
- *     // some side effect
- *     return this;
- *   }
- * ```
- * Captured Model:
- * ```Summaries;BasicFlow;false;ReturnThis;(System.Object);Argument[this];ReturnValue;value;df-generated```
- * Capture APIs that transfer taint from an input parameter to an output return
- * value or parameter.
- * Allows a sequence of read steps followed by a sequence of store steps.
- *
- * Examples:
- *
- * ```csharp
- * public class BasicFlow {
- *   private string tainted;
- *
- *   public String ReturnField()
- *   {
- *     return tainted;
- *   }
- *
- *   public void AssignFieldToArray(object[] target)
- *   {
- *     target[0] = tainted;
- *   }
- * }
- * ```
- * Captured Models:
- * ```
- * Summaries;BasicFlow;false;ReturnField;();Argument[this];ReturnValue;taint;df-generated |
- * Summaries;BasicFlow;false;AssignFieldToArray;(System.Object[]);Argument[this];Argument[0].Element;taint;df-generated
- * ```
- *
- * ```csharp
- * public class BasicFlow {
- *   private string tainted;
- *
- *   public void SetField(string s)
- *   {
- *     tainted = s;
- *   }
- * }
- * ```
- * Captured Model:
- * ```Summaries;BasicFlow;false;SetField;(System.String);Argument[0];Argument[this];taint;df-generated```
- *
- * ```csharp
- * public class BasicFlow {
- *   public void ReturnSubstring(string s)
- *   {
- *     return s.Substring(0, 1);
- *   }
- * }
- * ```
- * Captured Model:
- * ```Summaries;BasicFlow;false;ReturnSubstring;(System.String);Argument[0];ReturnValue;taint;df-generated```
- *
- * ```csharp
- * public class BasicFlow {
- *    public void AssignToArray(int data, int[] target)
- *    {
- *        target[0] = data;
- *    }
- * }
- * ```
- * Captured Model:
- * ```Summaries;BasicFlow;false;AssignToArray;(System.Int32,System.Int32[]);Argument[0];Argument[1].Element;taint;df-generated```
- */
-string captureFlow(DataFlowSummaryTargetApi api) {
-  result = captureQualifierFlow(api) or
-  result = captureThroughFlow(api)
-}
-
-/**
- * Gets the neutral summary model for `api`, if any.
- * A neutral summary model is generated, if we are not generating
- * a summary model that applies to `api` and if it relevant to generate
- * a model for `api`.
- */
-string captureNoFlow(DataFlowSummaryTargetApi api) {
-  not exists(DataFlowSummaryTargetApi api0 | exists(captureFlow(api0)) and api0.lift() = api.lift()) and
-  api.isRelevant() and
-  result = Printing::asNeutralSummaryModel(api)
-}
diff --git a/csharp/ql/src/utils/modelgenerator/internal/CaptureTypeBasedSummaryModels.qll b/csharp/ql/src/utils/modelgenerator/internal/CaptureTypeBasedSummaryModels.qll
index 8efdc6100cd..f7b0633ddd3 100644
--- a/csharp/ql/src/utils/modelgenerator/internal/CaptureTypeBasedSummaryModels.qll
+++ b/csharp/ql/src/utils/modelgenerator/internal/CaptureTypeBasedSummaryModels.qll
@@ -2,7 +2,7 @@ private import csharp
 private import semmle.code.csharp.frameworks.system.collections.Generic as GenericCollections
 private import semmle.code.csharp.dataflow.internal.DataFlowPrivate
 private import semmle.code.csharp.frameworks.system.linq.Expressions
-private import CaptureModelsSpecific as Specific
+private import CaptureModels::ModelGeneratorInput as ModelGeneratorInput
 private import CaptureModelsPrinting
 
 /**
@@ -38,7 +38,7 @@ private predicate localTypeParameter(Callable callable, TypeParameter tp) {
  */
 private predicate parameter(Callable callable, string input, TypeParameter tp) {
   exists(Parameter p |
-    input = Specific::parameterAccess(p) and
+    input = ModelGeneratorInput::parameterAccess(p) and
     p = callable.getAParameter() and
     (
       // Parameter of type tp
@@ -69,7 +69,7 @@ private string implicit(Callable callable, TypeParameter tp) {
     then access = ".Element"
     else access = getSyntheticField(tp)
   |
-    result = Specific::qualifierString() + access
+    result = ModelGeneratorInput::qualifierString() + access
   )
 }
 
@@ -191,9 +191,7 @@ private module Printing = ModelPrinting<ModelPrintingInput>;
  * A class of callables that are relevant generating summaries for based
  * on the Theorems for Free approach.
  */
-class TypeBasedFlowTargetApi extends Specific::SummaryTargetApi {
-  TypeBasedFlowTargetApi() { not Specific::isUninterestingForTypeBasedFlowModels(this) }
-
+class TypeBasedFlowTargetApi extends ModelGeneratorInput::SummaryTargetApi {
   /**
    * Gets the string representation of all type based summaries for `this`
    * inspired by the Theorems for Free approach.
@@ -223,7 +221,7 @@ class TypeBasedFlowTargetApi extends Specific::SummaryTargetApi {
       output(this, tp, output) and
       input != output
     |
-      result = Printing::asValueModel(this, input, output)
+      result = Printing::asLiftedValueModel(this, input, output)
     )
   }
 }
diff --git a/csharp/ql/test/TestUtilities/InlineExpectationsTest.qll b/csharp/ql/test/TestUtilities/InlineExpectationsTest.qll
index 6faee89923c..75f918c36a1 100644
--- a/csharp/ql/test/TestUtilities/InlineExpectationsTest.qll
+++ b/csharp/ql/test/TestUtilities/InlineExpectationsTest.qll
@@ -1,5 +1,5 @@
 /**
- * Inline expectation tests for CSharp.
+ * Inline expectation tests for C#.
  * See `shared/util/codeql/util/test/InlineExpectationsTest.qll`
  */
 
diff --git a/csharp/ql/test/TestUtilities/InlineExpectationsTestQuery.ql b/csharp/ql/test/TestUtilities/InlineExpectationsTestQuery.ql
new file mode 100644
index 00000000000..35901ee6401
--- /dev/null
+++ b/csharp/ql/test/TestUtilities/InlineExpectationsTestQuery.ql
@@ -0,0 +1,21 @@
+/**
+ * @kind test-postprocess
+ */
+
+private import csharp
+private import codeql.util.test.InlineExpectationsTest as T
+private import internal.InlineExpectationsTestImpl
+import T::TestPostProcessing
+import T::TestPostProcessing::Make<Impl, Input>
+
+private module Input implements T::TestPostProcessing::InputSig<Impl> {
+  string getRelativeUrl(Location location) {
+    exists(File f, int startline, int startcolumn, int endline, int endcolumn |
+      location.hasLocationInfo(_, startline, startcolumn, endline, endcolumn) and
+      f = location.getFile()
+    |
+      result =
+        f.getRelativePath() + ":" + startline + ":" + startcolumn + ":" + endline + ":" + endcolumn
+    )
+  }
+}
diff --git a/csharp/ql/test/TestUtilities/PrettyPrintModels.ql b/csharp/ql/test/TestUtilities/PrettyPrintModels.ql
index 05e6506e666..9d960bc4f05 100644
--- a/csharp/ql/test/TestUtilities/PrettyPrintModels.ql
+++ b/csharp/ql/test/TestUtilities/PrettyPrintModels.ql
@@ -5,7 +5,3 @@
 import semmle.code.csharp.dataflow.internal.ExternalFlow
 import codeql.dataflow.test.ProvenancePathGraph
 import codeql.dataflow.test.ProvenancePathGraph::TestPostProcessing::TranslateProvenanceResults<interpretModelForTest/2>
-
-from string relation, int row, int column, string data
-where results(relation, row, column, data)
-select relation, row, column, data
diff --git a/csharp/ql/test/TestUtilities/inline-tests/InlineTests.cs b/csharp/ql/test/TestUtilities/inline-tests/InlineTests.cs
new file mode 100644
index 00000000000..c30823425ca
--- /dev/null
+++ b/csharp/ql/test/TestUtilities/inline-tests/InlineTests.cs
@@ -0,0 +1,82 @@
+class C
+{
+    void Problems()
+    {
+        // correct expectation comment, but only for `problem-query`
+        var x = "Alert"; // $ Alert
+
+        // irrelevant expectation comment, will be ignored
+        x = "Not an alert"; // $ IrrelevantTag
+
+        // incorrect expectation comment
+        x = "Also not an alert"; // $ Alert
+
+        // missing expectation comment, but only for `problem-query`
+        x = "Alert";
+
+        // correct expectation comment
+        x = "Alert"; // $ Alert[problem-query]
+    }
+
+    void PathProblems()
+    {
+        // correct expectation comments, but only for `path-problem-query`
+        var source = "Source"; // $ Source
+        var sink = "Sink"; // $ Sink
+        var x = "Alert:2:1"; // $ Alert
+
+        // incorrect expectation comments
+        source = "Source"; // $ Source
+        sink = "Sink"; // $ Sink
+        x = "Not an alert:2:1"; // $ Alert
+
+        // missing expectation comments, but only for `path-problem-query`
+        source = "Source";
+        sink = "Sink";
+        x = "Alert:2:1";
+
+        // correct expectation comments
+        source = "Source"; // $ Source[path-problem-query]
+        sink = "Sink"; // $ Sink[path-problem-query]
+        x = "Alert:2:1"; // $ Alert[path-problem-query]
+
+        // correct expectation comments; the alert location coincides with the sink location
+        source = "Source"; // $ Source[path-problem-query]
+        x = "Alert:1:0"; // $ Alert[path-problem-query]
+
+        // correct expectation comments; the alert location coincides with the source location
+        sink = "Sink"; // $ Sink[path-problem-query]
+        x = "Alert:0:1"; // $ Alert[path-problem-query]
+
+        // correct expectation comments, using an identifier tag
+        source = "Source"; // $ Source[path-problem-query]=source1
+        sink = "Sink"; // $ Sink[path-problem-query]=source1
+        x = "Alert:2:1"; // $ Alert[path-problem-query]=source1
+
+        // incorrect expectation comment, using wrong identifier tag at the sink
+        source = "Source"; // $ Source[path-problem-query]=source2
+        sink = "Sink"; // $ Sink[path-problem-query]=source1
+        x = "Alert:2:1"; // $ Alert[path-problem-query]=source2
+
+        // incorrect expectation comment, using wrong identifier tag at the alert
+        source = "Source"; // $ Source[path-problem-query]=source3
+        sink = "Sink"; // $ Sink[path-problem-query]=source3
+        x = "Alert:2:1"; // $ Alert[path-problem-query]=source2
+
+        // correct expectation comments, using an identifier tag; the alert location coincides with the sink location
+        source = "Source"; // $ Source[path-problem-query]=source4
+        x = "Alert:1:0"; // $ Alert[path-problem-query]=source4
+
+        // incorrect expectation comments, using an identifier tag; the alert location coincides with the sink location
+        source = "Source"; // $ Source[path-problem-query]=source5
+        x = "Alert:1:0"; // $ Alert[path-problem-query]=source4
+
+        // correct expectation comments, using an identifier tag; the alert location coincides with the source location
+        sink = "Sink"; // $ Sink[path-problem-query]=sink1
+        x = "Alert:0:1"; // $ Alert[path-problem-query]=sink1
+
+        // incorrect expectation comments, using an identifier tag; the alert location coincides with the source location
+        sink = "Sink"; // $ Sink[path-problem-query]=sink2
+        x = "Alert:0:1"; // $ Alert[path-problem-query]=sink1
+    }
+}
\ No newline at end of file
diff --git a/csharp/ql/test/TestUtilities/inline-tests/PathProblemQuery.expected b/csharp/ql/test/TestUtilities/inline-tests/PathProblemQuery.expected
new file mode 100644
index 00000000000..76674dc1569
--- /dev/null
+++ b/csharp/ql/test/TestUtilities/inline-tests/PathProblemQuery.expected
@@ -0,0 +1,31 @@
+#select
+| InlineTests.cs:26:17:26:27 | "Alert:2:1" | InlineTests.cs:24:22:24:29 | "Source" | InlineTests.cs:25:20:25:25 | "Sink" | This is a problem |
+| InlineTests.cs:36:13:36:23 | "Alert:2:1" | InlineTests.cs:34:18:34:25 | "Source" | InlineTests.cs:35:16:35:21 | "Sink" | This is a problem |
+| InlineTests.cs:41:13:41:23 | "Alert:2:1" | InlineTests.cs:39:18:39:25 | "Source" | InlineTests.cs:40:16:40:21 | "Sink" | This is a problem |
+| InlineTests.cs:45:13:45:23 | "Alert:1:0" | InlineTests.cs:44:18:44:25 | "Source" | InlineTests.cs:45:13:45:23 | "Alert:1:0" | This is a problem |
+| InlineTests.cs:49:13:49:23 | "Alert:0:1" | InlineTests.cs:49:13:49:23 | "Alert:0:1" | InlineTests.cs:48:16:48:21 | "Sink" | This is a problem |
+| InlineTests.cs:54:13:54:23 | "Alert:2:1" | InlineTests.cs:52:18:52:25 | "Source" | InlineTests.cs:53:16:53:21 | "Sink" | This is a problem |
+| InlineTests.cs:59:13:59:23 | "Alert:2:1" | InlineTests.cs:57:18:57:25 | "Source" | InlineTests.cs:58:16:58:21 | "Sink" | This is a problem |
+| InlineTests.cs:64:13:64:23 | "Alert:2:1" | InlineTests.cs:62:18:62:25 | "Source" | InlineTests.cs:63:16:63:21 | "Sink" | This is a problem |
+| InlineTests.cs:68:13:68:23 | "Alert:1:0" | InlineTests.cs:67:18:67:25 | "Source" | InlineTests.cs:68:13:68:23 | "Alert:1:0" | This is a problem |
+| InlineTests.cs:72:13:72:23 | "Alert:1:0" | InlineTests.cs:71:18:71:25 | "Source" | InlineTests.cs:72:13:72:23 | "Alert:1:0" | This is a problem |
+| InlineTests.cs:76:13:76:23 | "Alert:0:1" | InlineTests.cs:76:13:76:23 | "Alert:0:1" | InlineTests.cs:75:16:75:21 | "Sink" | This is a problem |
+| InlineTests.cs:80:13:80:23 | "Alert:0:1" | InlineTests.cs:80:13:80:23 | "Alert:0:1" | InlineTests.cs:79:16:79:21 | "Sink" | This is a problem |
+edges
+testFailures
+| InlineTests.cs:6:26:6:35 | // ... | Missing result: Alert |
+| InlineTests.cs:12:34:12:43 | // ... | Missing result: Alert |
+| InlineTests.cs:29:28:29:38 | // ... | Missing result: Source |
+| InlineTests.cs:30:24:30:32 | // ... | Missing result: Sink |
+| InlineTests.cs:31:33:31:42 | // ... | Missing result: Alert |
+| InlineTests.cs:34:18:34:25 | "Source" | Unexpected result: Source |
+| InlineTests.cs:35:16:35:21 | "Sink" | Unexpected result: Sink |
+| InlineTests.cs:36:13:36:23 | InlineTests.cs:34:18:34:25 | Unexpected result: Alert |
+| InlineTests.cs:58:16:58:21 | "Sink" | Unexpected result: Sink=source2 |
+| InlineTests.cs:58:24:58:60 | // ... | Missing result: Sink[path-problem-query]=source1 |
+| InlineTests.cs:64:13:64:23 | InlineTests.cs:62:18:62:25 | Unexpected result: Alert=source3 |
+| InlineTests.cs:64:26:64:63 | // ... | Missing result: Alert[path-problem-query]=source2 |
+| InlineTests.cs:72:13:72:23 | "Alert:1:0" | Unexpected result: Alert=source5 |
+| InlineTests.cs:72:26:72:63 | // ... | Missing result: Alert[path-problem-query]=source4 |
+| InlineTests.cs:79:16:79:21 | "Sink" | Unexpected result: Sink=sink1 |
+| InlineTests.cs:79:24:79:58 | // ... | Missing result: Sink[path-problem-query]=sink2 |
diff --git a/csharp/ql/test/TestUtilities/inline-tests/PathProblemQuery.qlref b/csharp/ql/test/TestUtilities/inline-tests/PathProblemQuery.qlref
new file mode 100644
index 00000000000..cbc554598f3
--- /dev/null
+++ b/csharp/ql/test/TestUtilities/inline-tests/PathProblemQuery.qlref
@@ -0,0 +1,2 @@
+query: TestUtilities/inline-tests/queries/PathProblemQuery.ql
+postprocess: TestUtilities/InlineExpectationsTestQuery.ql
\ No newline at end of file
diff --git a/csharp/ql/test/TestUtilities/inline-tests/ProblemQuery.expected b/csharp/ql/test/TestUtilities/inline-tests/ProblemQuery.expected
new file mode 100644
index 00000000000..88fe5019fa2
--- /dev/null
+++ b/csharp/ql/test/TestUtilities/inline-tests/ProblemQuery.expected
@@ -0,0 +1,9 @@
+#select
+| InlineTests.cs:6:17:6:23 | "Alert" | This is a problem |
+| InlineTests.cs:15:13:15:19 | "Alert" | This is a problem |
+| InlineTests.cs:18:13:18:19 | "Alert" | This is a problem |
+testFailures
+| InlineTests.cs:12:34:12:43 | // ... | Missing result: Alert |
+| InlineTests.cs:15:13:15:19 | This is a problem | Unexpected result: Alert |
+| InlineTests.cs:26:30:26:39 | // ... | Missing result: Alert |
+| InlineTests.cs:31:33:31:42 | // ... | Missing result: Alert |
diff --git a/csharp/ql/test/TestUtilities/inline-tests/ProblemQuery.qlref b/csharp/ql/test/TestUtilities/inline-tests/ProblemQuery.qlref
new file mode 100644
index 00000000000..d5afc6a690f
--- /dev/null
+++ b/csharp/ql/test/TestUtilities/inline-tests/ProblemQuery.qlref
@@ -0,0 +1,2 @@
+query: TestUtilities/inline-tests/queries/ProblemQuery.ql
+postprocess: TestUtilities/InlineExpectationsTestQuery.ql
\ No newline at end of file
diff --git a/csharp/ql/test/TestUtilities/inline-tests/queries/PathProblemQuery.expected b/csharp/ql/test/TestUtilities/inline-tests/queries/PathProblemQuery.expected
new file mode 100644
index 00000000000..5c153698e9e
--- /dev/null
+++ b/csharp/ql/test/TestUtilities/inline-tests/queries/PathProblemQuery.expected
@@ -0,0 +1,2 @@
+edges
+#select
diff --git a/csharp/ql/test/TestUtilities/inline-tests/queries/PathProblemQuery.ql b/csharp/ql/test/TestUtilities/inline-tests/queries/PathProblemQuery.ql
new file mode 100644
index 00000000000..748fa47c5c2
--- /dev/null
+++ b/csharp/ql/test/TestUtilities/inline-tests/queries/PathProblemQuery.ql
@@ -0,0 +1,18 @@
+/**
+ * @kind path-problem
+ * @id path-problem-query
+ */
+
+import csharp
+
+query predicate edges(StringLiteral sl1, StringLiteral sl2) { none() }
+
+from StringLiteral alert, StringLiteral source, StringLiteral sink
+where
+  exists(string regexp, int sourceOffset, int sinkOffset | regexp = "Alert:([0-9]+):([0-9]+)" |
+    sourceOffset = alert.getValue().regexpCapture(regexp, 1).toInt() and
+    sinkOffset = alert.getValue().regexpCapture(regexp, 2).toInt() and
+    source.getLocation().getStartLine() = alert.getLocation().getStartLine() - sourceOffset and
+    sink.getLocation().getStartLine() = alert.getLocation().getStartLine() - sinkOffset
+  )
+select alert, source, sink, "This is a problem"
diff --git a/csharp/ql/test/TestUtilities/inline-tests/queries/ProblemQuery.expected b/csharp/ql/test/TestUtilities/inline-tests/queries/ProblemQuery.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/csharp/ql/test/TestUtilities/inline-tests/queries/ProblemQuery.ql b/csharp/ql/test/TestUtilities/inline-tests/queries/ProblemQuery.ql
new file mode 100644
index 00000000000..8a1f057f0bc
--- /dev/null
+++ b/csharp/ql/test/TestUtilities/inline-tests/queries/ProblemQuery.ql
@@ -0,0 +1,10 @@
+/**
+ * @kind problem
+ * @id problem-query
+ */
+
+import csharp
+
+from StringLiteral sl
+where sl.getValue() = "Alert"
+select sl, "This is a problem"
diff --git a/csharp/ql/test/library-tests/comments/BindingAfter.expected b/csharp/ql/test/library-tests/comments/BindingAfter.expected
index bda6bd6e5ef..cd3814d7a0f 100644
--- a/csharp/ql/test/library-tests/comments/BindingAfter.expected
+++ b/csharp/ql/test/library-tests/comments/BindingAfter.expected
@@ -1,4 +1,5 @@
 | comments1.cs:1:1:2:46 | // ... | comments1.cs:9:7:9:7 | C | Start of comment1.cs |
+| comments1.cs:1:16:1:46 | // ... | comments1.cs:2:9:2:14 | ... ...; | A mapped single-line comment |
 | comments1.cs:4:1:4:25 | // ... | comments1.cs:9:7:9:7 | C | 1) Basic comment types |
 | comments1.cs:6:1:6:24 | // ... | comments1.cs:9:7:9:7 | C | A single-line comment |
 | comments1.cs:8:1:8:18 | /// ... | comments1.cs:9:7:9:7 | C | An XML comment |
diff --git a/csharp/ql/test/library-tests/comments/BindingBefore.expected b/csharp/ql/test/library-tests/comments/BindingBefore.expected
index 8566ef55206..28e710a28d8 100644
--- a/csharp/ql/test/library-tests/comments/BindingBefore.expected
+++ b/csharp/ql/test/library-tests/comments/BindingBefore.expected
@@ -1,3 +1,4 @@
+| comments1.cs:1:16:1:46 | // ... | comments1.cs:1:9:1:14 | ... ...; | A mapped single-line comment |
 | comments1.cs:11:1:11:25 | /* ... */ | comments1.cs:9:7:9:7 | C | A multiline comment |
 | comments1.cs:13:1:13:20 | // ... | comments1.cs:9:7:9:7 | C | 2) Comment blocks |
 | comments1.cs:15:1:15:38 | // ... | comments1.cs:9:7:9:7 | C | A line on its own is a commentblock |
diff --git a/csharp/ql/test/library-tests/comments/BindingParent.expected b/csharp/ql/test/library-tests/comments/BindingParent.expected
index 203d9f94722..c36d2ba0c1e 100644
--- a/csharp/ql/test/library-tests/comments/BindingParent.expected
+++ b/csharp/ql/test/library-tests/comments/BindingParent.expected
@@ -1,3 +1,4 @@
+| comments1.cs:1:16:1:46 | // ... | trivia.cs:17:5:29:5 | {...} | A mapped single-line comment |
 | comments1.cs:36:5:38:41 | /* ... */ | comments1.cs:34:7:34:9 | Foo |  |
 | comments1.cs:39:13:40:51 | // ... | comments1.cs:34:7:34:9 | Foo | as this line |
 | comments1.cs:42:15:42:36 | // ... | comments1.cs:34:7:34:9 | Foo | These are different |
diff --git a/csharp/ql/test/library-tests/comments/Bindings.expected b/csharp/ql/test/library-tests/comments/Bindings.expected
index 077bbcf9a29..54ff5677648 100644
--- a/csharp/ql/test/library-tests/comments/Bindings.expected
+++ b/csharp/ql/test/library-tests/comments/Bindings.expected
@@ -1,3 +1,4 @@
+| comments1.cs:1:16:1:46 | // ... | comments1.cs:1:9:1:14 | ... ...; | A mapped single-line comment |
 | comments1.cs:8:1:8:18 | /// ... | comments1.cs:9:7:9:7 | C | An XML comment |
 | comments1.cs:36:5:38:41 | /* ... */ | comments1.cs:39:9:39:9 | x |  |
 | comments1.cs:39:13:40:51 | // ... | comments1.cs:39:9:39:9 | x | as this line |
diff --git a/csharp/ql/test/library-tests/comments/Comments.expected b/csharp/ql/test/library-tests/comments/Comments.expected
index 1a7d3db234b..3a574b44ca5 100644
--- a/csharp/ql/test/library-tests/comments/Comments.expected
+++ b/csharp/ql/test/library-tests/comments/Comments.expected
@@ -1,6 +1,7 @@
 singlelineComment
 | comments1.cs:1:1:2:46 | // ... | comments1.cs:1:1:1:23 | // ... | 2 | Start of comment1.cs | // Start of comment1.cs |
 | comments1.cs:1:1:2:46 | // ... | comments1.cs:2:1:2:46 | // ... | 2 | This tests the basic types of comment block | // This tests the basic types of comment block |
+| comments1.cs:1:16:1:46 | // ... | comments1.cs:1:16:1:46 | // ... | 1 | A mapped single-line comment | // A mapped single-line comment |
 | comments1.cs:4:1:4:25 | // ... | comments1.cs:4:1:4:25 | // ... | 1 | 1) Basic comment types | // 1) Basic comment types |
 | comments1.cs:6:1:6:24 | // ... | comments1.cs:6:1:6:24 | // ... | 1 | A single-line comment | // A single-line comment |
 | comments1.cs:13:1:13:20 | // ... | comments1.cs:13:1:13:20 | // ... | 1 | 2) Comment blocks | // 2) Comment blocks |
diff --git a/csharp/ql/test/library-tests/comments/LineDirectives.expected b/csharp/ql/test/library-tests/comments/LineDirectives.expected
index 13c3658fe82..2b5ede4d1f5 100644
--- a/csharp/ql/test/library-tests/comments/LineDirectives.expected
+++ b/csharp/ql/test/library-tests/comments/LineDirectives.expected
@@ -16,6 +16,7 @@ mapped
 | trivia.cs:19:9:19:11 | trivia.cs:19:9:19:11 | comments1.cs:1:9:1:11 | comments1.cs:1:9:1:11 |
 | trivia.cs:19:9:19:14 | trivia.cs:19:9:19:14 | comments1.cs:1:9:1:14 | comments1.cs:1:9:1:14 |
 | trivia.cs:19:13:19:13 | trivia.cs:19:13:19:13 | comments1.cs:1:13:1:13 | comments1.cs:1:13:1:13 |
+| trivia.cs:19:16:19:46 | trivia.cs:19:16:19:46 | comments1.cs:1:16:1:46 | comments1.cs:1:16:1:46 |
 | trivia.cs:20:9:20:11 | trivia.cs:20:9:20:11 | comments1.cs:2:9:2:11 | comments1.cs:2:9:2:11 |
 | trivia.cs:20:9:20:14 | trivia.cs:20:9:20:14 | comments1.cs:2:9:2:14 | comments1.cs:2:9:2:14 |
 | trivia.cs:20:13:20:13 | trivia.cs:20:13:20:13 | comments1.cs:2:13:2:13 | comments1.cs:2:13:2:13 |
diff --git a/csharp/ql/test/library-tests/comments/trivia.cs b/csharp/ql/test/library-tests/comments/trivia.cs
index fe3f217c393..2c72a02f5ab 100644
--- a/csharp/ql/test/library-tests/comments/trivia.cs
+++ b/csharp/ql/test/library-tests/comments/trivia.cs
@@ -16,7 +16,7 @@ class Tr1
     static void M1()
     {
 #line 1 "comments1.cs"
-        int i;
+        int i; // A mapped single-line comment
         int j;
 #line default
         char c;
diff --git a/csharp/ql/test/library-tests/controlflow/graph/NodeGraph.expected b/csharp/ql/test/library-tests/controlflow/graph/NodeGraph.expected
index fd3b8ff38bb..0078ba76213 100644
--- a/csharp/ql/test/library-tests/controlflow/graph/NodeGraph.expected
+++ b/csharp/ql/test/library-tests/controlflow/graph/NodeGraph.expected
@@ -1,14634 +1,4949 @@
-AccessorCalls.cs:
-#    1| call to constructor Object
-#-----|  -> {...}
-
-#    1| enter AccessorCalls
-#-----|  -> call to constructor Object
-
-#    1| exit AccessorCalls
-
-#    1| exit AccessorCalls (normal)
-#-----|  -> exit AccessorCalls
-
-#    1| {...}
-#-----|  -> exit AccessorCalls (normal)
-
-#    5| enter get_Item
-#-----|  -> access to parameter i
-
-#    5| exit get_Item
-
-#    5| exit get_Item (normal)
-#-----|  -> exit get_Item
-
-#    5| access to parameter i
-#-----|  -> exit get_Item (normal)
-
-#    5| enter set_Item
-#-----|  -> {...}
-
-#    5| exit set_Item
-
-#    5| exit set_Item (normal)
-#-----|  -> exit set_Item
-
-#    5| {...}
-#-----|  -> exit set_Item (normal)
-
-#    7| enter add_Event
-#-----|  -> {...}
-
-#    7| exit add_Event
-
-#    7| exit add_Event (normal)
-#-----|  -> exit add_Event
-
-#    7| {...}
-#-----|  -> exit add_Event (normal)
-
-#    7| enter remove_Event
-#-----|  -> {...}
-
-#    7| exit remove_Event
-
-#    7| exit remove_Event (normal)
-#-----|  -> exit remove_Event
-
-#    7| {...}
-#-----|  -> exit remove_Event (normal)
-
-#   10| enter M1
-#-----|  -> {...}
-
-#   10| exit M1
-
-#   10| exit M1 (normal)
-#-----|  -> exit M1
-
-#   11| {...}
-#-----|  -> ...;
-
-#   12| this access
-#-----|  -> this access
-
-#   12| ... = ...
-#-----|  -> ...;
-
-#   12| ...;
-#-----|  -> this access
-
-#   12| this access
-#-----|  -> access to field Field
-
-#   12| access to field Field
-#-----|  -> ... = ...
-
-#   13| this access
-#-----|  -> this access
-
-#   13| access to property Prop
-#-----|  -> ... = ...
-
-#   13| ... = ...
-#-----|  -> ...;
-
-#   13| ...;
-#-----|  -> this access
-
-#   13| this access
-#-----|  -> access to property Prop
-
-#   13| access to property Prop
-#-----|  -> access to property Prop
-
-#   14| this access
-#-----|  -> 0
-
-#   14| access to indexer
-#-----|  -> ... = ...
-
-#   14| ... = ...
-#-----|  -> ...;
-
-#   14| ...;
-#-----|  -> this access
-
-#   14| 0
-#-----|  -> this access
-
-#   14| this access
-#-----|  -> 1
-
-#   14| access to indexer
-#-----|  -> access to indexer
-
-#   14| 1
-#-----|  -> access to indexer
-
-#   15| this access
-#-----|  -> access to parameter e
-
-#   15| access to event Event
-#-----|  -> ... += ...
-
-#   15| ... += ...
-#-----|  -> ...;
-
-#   15| ...;
-#-----|  -> this access
-
-#   15| access to parameter e
-#-----|  -> access to event Event
-
-#   16| this access
-#-----|  -> access to parameter e
-
-#   16| access to event Event
-#-----|  -> ... -= ...
-
-#   16| ... -= ...
-#-----|  -> exit M1 (normal)
-
-#   16| ...;
-#-----|  -> this access
-
-#   16| access to parameter e
-#-----|  -> access to event Event
-
-#   19| enter M2
-#-----|  -> {...}
-
-#   19| exit M2
-
-#   19| exit M2 (normal)
-#-----|  -> exit M2
-
-#   20| {...}
-#-----|  -> ...;
-
-#   21| this access
-#-----|  -> access to field x
-
-#   21| access to field x
-#-----|  -> this access
-
-#   21| ... = ...
-#-----|  -> ...;
-
-#   21| ...;
-#-----|  -> this access
-
-#   21| this access
-#-----|  -> access to field x
-
-#   21| access to field x
-#-----|  -> access to field Field
-
-#   21| access to field Field
-#-----|  -> ... = ...
-
-#   22| this access
-#-----|  -> access to field x
-
-#   22| access to field x
-#-----|  -> this access
-
-#   22| access to property Prop
-#-----|  -> ... = ...
-
-#   22| ... = ...
-#-----|  -> ...;
-
-#   22| ...;
-#-----|  -> this access
-
-#   22| this access
-#-----|  -> access to field x
-
-#   22| access to field x
-#-----|  -> access to property Prop
-
-#   22| access to property Prop
-#-----|  -> access to property Prop
-
-#   23| this access
-#-----|  -> access to field x
-
-#   23| access to field x
-#-----|  -> 0
-
-#   23| access to indexer
-#-----|  -> ... = ...
-
-#   23| ... = ...
-#-----|  -> ...;
-
-#   23| ...;
-#-----|  -> this access
-
-#   23| 0
-#-----|  -> this access
-
-#   23| this access
-#-----|  -> access to field x
-
-#   23| access to field x
-#-----|  -> 1
-
-#   23| access to indexer
-#-----|  -> access to indexer
-
-#   23| 1
-#-----|  -> access to indexer
-
-#   24| this access
-#-----|  -> access to field x
-
-#   24| access to field x
-#-----|  -> access to parameter e
-
-#   24| access to event Event
-#-----|  -> ... += ...
-
-#   24| ... += ...
-#-----|  -> ...;
-
-#   24| ...;
-#-----|  -> this access
-
-#   24| access to parameter e
-#-----|  -> access to event Event
-
-#   25| this access
-#-----|  -> access to field x
-
-#   25| access to field x
-#-----|  -> access to parameter e
-
-#   25| access to event Event
-#-----|  -> ... -= ...
-
-#   25| ... -= ...
-#-----|  -> exit M2 (normal)
-
-#   25| ...;
-#-----|  -> this access
-
-#   25| access to parameter e
-#-----|  -> access to event Event
-
-#   28| enter M3
-#-----|  -> {...}
-
-#   28| exit M3
-
-#   28| exit M3 (normal)
-#-----|  -> exit M3
-
-#   29| {...}
-#-----|  -> ...;
-
-#   30| this access
-#-----|  -> access to field Field
-
-#   30| access to field Field
-#-----|  -> ...++
-
-#   30| ...++
-#-----|  -> ...;
-
-#   30| ...;
-#-----|  -> this access
-
-#   31| this access
-#-----|  -> access to property Prop
-
-#   31| access to property Prop
-#-----|  -> ...++
-
-#   31| ...++
-#-----|  -> ...;
-
-#   31| ...;
-#-----|  -> this access
-
-#   32| this access
-#-----|  -> 0
-
-#   32| access to indexer
-#-----|  -> ...++
-
-#   32| ...++
-#-----|  -> exit M3 (normal)
-
-#   32| ...;
-#-----|  -> this access
-
-#   32| 0
-#-----|  -> access to indexer
-
-#   35| enter M4
-#-----|  -> {...}
-
-#   35| exit M4
-
-#   35| exit M4 (normal)
-#-----|  -> exit M4
-
-#   36| {...}
-#-----|  -> ...;
-
-#   37| this access
-#-----|  -> access to field x
-
-#   37| access to field x
-#-----|  -> access to field Field
-
-#   37| access to field Field
-#-----|  -> ...++
-
-#   37| ...++
-#-----|  -> ...;
-
-#   37| ...;
-#-----|  -> this access
-
-#   38| this access
-#-----|  -> access to field x
-
-#   38| access to field x
-#-----|  -> access to property Prop
-
-#   38| access to property Prop
-#-----|  -> ...++
-
-#   38| ...++
-#-----|  -> ...;
-
-#   38| ...;
-#-----|  -> this access
-
-#   39| this access
-#-----|  -> access to field x
-
-#   39| access to field x
-#-----|  -> 0
-
-#   39| access to indexer
-#-----|  -> ...++
-
-#   39| ...++
-#-----|  -> exit M4 (normal)
-
-#   39| ...;
-#-----|  -> this access
-
-#   39| 0
-#-----|  -> access to indexer
-
-#   42| enter M5
-#-----|  -> {...}
-
-#   42| exit M5
-
-#   42| exit M5 (normal)
-#-----|  -> exit M5
-
-#   43| {...}
-#-----|  -> ...;
-
-#   44| this access
-#-----|  -> this access
-
-#   44| this access
-#-----|  -> access to field Field
-
-#   44| access to field Field
-#-----|  -> this access
-
-#   44| ... + ...
-#-----|  -> ... = ...
-
-#   44| ... = ...
-#-----|  -> ...;
-
-#   44| ...;
-#-----|  -> this access
-
-#   44| this access
-#-----|  -> access to field Field
-
-#   44| access to field Field
-#-----|  -> ... + ...
-
-#   45| this access
-#-----|  -> this access
-
-#   45| this access
-#-----|  -> access to property Prop
-
-#   45| access to property Prop
-#-----|  -> ... = ...
-
-#   45| access to property Prop
-#-----|  -> this access
-
-#   45| ... + ...
-#-----|  -> access to property Prop
-
-#   45| ... = ...
-#-----|  -> ...;
-
-#   45| ...;
-#-----|  -> this access
-
-#   45| this access
-#-----|  -> access to property Prop
-
-#   45| access to property Prop
-#-----|  -> ... + ...
-
-#   46| this access
-#-----|  -> 0
-
-#   46| this access
-#-----|  -> 0
-
-#   46| access to indexer
-#-----|  -> ... = ...
-
-#   46| access to indexer
-#-----|  -> this access
-
-#   46| ... + ...
-#-----|  -> access to indexer
-
-#   46| ... = ...
-#-----|  -> exit M5 (normal)
-
-#   46| ...;
-#-----|  -> this access
-
-#   46| 0
-#-----|  -> this access
-
-#   46| 0
-#-----|  -> access to indexer
-
-#   46| this access
-#-----|  -> 0
-
-#   46| access to indexer
-#-----|  -> ... + ...
-
-#   46| 0
-#-----|  -> access to indexer
-
-#   49| enter M6
-#-----|  -> {...}
-
-#   49| exit M6
-
-#   49| exit M6 (normal)
-#-----|  -> exit M6
-
-#   50| {...}
-#-----|  -> ...;
-
-#   51| this access
-#-----|  -> access to field x
-
-#   51| this access
-#-----|  -> access to field x
-
-#   51| access to field x
-#-----|  -> this access
-
-#   51| access to field x
-#-----|  -> access to field Field
-
-#   51| access to field Field
-#-----|  -> this access
-
-#   51| ... + ...
-#-----|  -> ... = ...
-
-#   51| ... = ...
-#-----|  -> ...;
-
-#   51| ...;
-#-----|  -> this access
-
-#   51| this access
-#-----|  -> access to field x
-
-#   51| access to field x
-#-----|  -> access to field Field
-
-#   51| access to field Field
-#-----|  -> ... + ...
-
-#   52| this access
-#-----|  -> access to field x
-
-#   52| this access
-#-----|  -> access to field x
-
-#   52| access to field x
-#-----|  -> this access
-
-#   52| access to field x
-#-----|  -> access to property Prop
-
-#   52| access to property Prop
-#-----|  -> ... = ...
-
-#   52| access to property Prop
-#-----|  -> this access
-
-#   52| ... + ...
-#-----|  -> access to property Prop
-
-#   52| ... = ...
-#-----|  -> ...;
-
-#   52| ...;
-#-----|  -> this access
-
-#   52| this access
-#-----|  -> access to field x
-
-#   52| access to field x
-#-----|  -> access to property Prop
-
-#   52| access to property Prop
-#-----|  -> ... + ...
-
-#   53| this access
-#-----|  -> access to field x
-
-#   53| this access
-#-----|  -> access to field x
-
-#   53| access to field x
-#-----|  -> 0
-
-#   53| access to field x
-#-----|  -> 0
-
-#   53| access to indexer
-#-----|  -> ... = ...
-
-#   53| access to indexer
-#-----|  -> this access
-
-#   53| ... + ...
-#-----|  -> access to indexer
-
-#   53| ... = ...
-#-----|  -> exit M6 (normal)
-
-#   53| ...;
-#-----|  -> this access
-
-#   53| 0
-#-----|  -> this access
-
-#   53| 0
-#-----|  -> access to indexer
-
-#   53| this access
-#-----|  -> access to field x
-
-#   53| access to field x
-#-----|  -> 0
-
-#   53| access to indexer
-#-----|  -> ... + ...
-
-#   53| 0
-#-----|  -> access to indexer
-
-#   56| enter M7
-#-----|  -> {...}
-
-#   56| exit M7
-
-#   56| exit M7 (normal)
-#-----|  -> exit M7
-
-#   57| {...}
-#-----|  -> ...;
-
-#   58| (..., ...)
-#-----|  -> this access
-
-#   58| ... = ...
-#-----|  -> exit M7 (normal)
-
-#   58| ...;
-#-----|  -> this access
-
-#   58| this access
-#-----|  -> this access
-
-#   58| this access
-#-----|  -> this access
-
-#   58| access to property Prop
-#-----|  -> access to indexer
-
-#   58| (..., ...)
-#-----|  -> (..., ...)
-
-#   58| this access
-#-----|  -> 0
-
-#   58| access to indexer
-#-----|  -> ... = ...
-
-#   58| 0
-#-----|  -> (..., ...)
-
-#   58| (..., ...)
-#-----|  -> access to property Prop
-
-#   58| this access
-#-----|  -> access to field Field
-
-#   58| access to field Field
-#-----|  -> this access
-
-#   58| this access
-#-----|  -> access to property Prop
-
-#   58| access to property Prop
-#-----|  -> 0
-
-#   58| (..., ...)
-#-----|  -> (..., ...)
-
-#   58| 0
-#-----|  -> this access
-
-#   58| this access
-#-----|  -> 1
-
-#   58| access to indexer
-#-----|  -> (..., ...)
-
-#   58| 1
-#-----|  -> access to indexer
-
-#   61| enter M8
-#-----|  -> {...}
-
-#   61| exit M8
-
-#   61| exit M8 (normal)
-#-----|  -> exit M8
-
-#   62| {...}
-#-----|  -> ...;
-
-#   63| (..., ...)
-#-----|  -> this access
-
-#   63| ... = ...
-#-----|  -> exit M8 (normal)
-
-#   63| ...;
-#-----|  -> this access
-
-#   63| this access
-#-----|  -> access to field x
-
-#   63| access to field x
-#-----|  -> this access
-
-#   63| this access
-#-----|  -> access to field x
-
-#   63| access to field x
-#-----|  -> this access
-
-#   63| access to property Prop
-#-----|  -> access to indexer
-
-#   63| (..., ...)
-#-----|  -> (..., ...)
-
-#   63| this access
-#-----|  -> access to field x
-
-#   63| access to field x
-#-----|  -> 0
-
-#   63| access to indexer
-#-----|  -> ... = ...
-
-#   63| 0
-#-----|  -> (..., ...)
-
-#   63| (..., ...)
-#-----|  -> access to property Prop
-
-#   63| this access
-#-----|  -> access to field x
-
-#   63| access to field x
-#-----|  -> access to field Field
-
-#   63| access to field Field
-#-----|  -> this access
-
-#   63| this access
-#-----|  -> access to field x
-
-#   63| access to field x
-#-----|  -> access to property Prop
-
-#   63| access to property Prop
-#-----|  -> 0
-
-#   63| (..., ...)
-#-----|  -> (..., ...)
-
-#   63| 0
-#-----|  -> this access
-
-#   63| this access
-#-----|  -> access to field x
-
-#   63| access to field x
-#-----|  -> 1
-
-#   63| access to indexer
-#-----|  -> (..., ...)
-
-#   63| 1
-#-----|  -> access to indexer
-
-#   66| enter M9
-#-----|  -> {...}
-
-#   66| exit M9
-
-#   66| exit M9 (normal)
-#-----|  -> exit M9
-
-#   67| {...}
-#-----|  -> ... ...;
-
-#   68| ... ...;
-#-----|  -> access to parameter o
-
-#   68| dynamic d = ...
-#-----|  -> ...;
-
-#   68| access to parameter o
-#-----|  -> dynamic d = ...
-
-#   69| access to local variable d
-#-----|  -> access to local variable d
-
-#   69| dynamic access to member MaybeProp1
-#-----|  -> ... = ...
-
-#   69| ... = ...
-#-----|  -> ...;
-
-#   69| ...;
-#-----|  -> access to local variable d
-
-#   69| access to local variable d
-#-----|  -> dynamic access to member MaybeProp2
-
-#   69| dynamic access to member MaybeProp2
-#-----|  -> dynamic access to member MaybeProp1
-
-#   70| access to local variable d
-#-----|  -> dynamic access to member MaybeProp
-
-#   70| dynamic access to member MaybeProp
-#-----|  -> dynamic call to operator ++
-
-#   70| dynamic call to operator ++
-#-----|  -> ...;
-
-#   70| ...;
-#-----|  -> access to local variable d
-
-#   71| access to local variable d
-#-----|  -> access to local variable d
-
-#   71| access to local variable d
-#-----|  -> dynamic access to member MaybeEvent
-
-#   71| dynamic access to member MaybeEvent
-#-----|  -> ... = ...
-
-#   71| dynamic access to member MaybeEvent
-#-----|  -> access to parameter e
-
-#   71| ... = ...
-#-----|  -> ...;
-
-#   71| dynamic call to operator +
-#-----|  -> dynamic access to member MaybeEvent
-
-#   71| ...;
-#-----|  -> access to local variable d
-
-#   71| access to parameter e
-#-----|  -> dynamic call to operator +
-
-#   72| access to local variable d
-#-----|  -> 0
-
-#   72| access to local variable d
-#-----|  -> 0
-
-#   72| dynamic access to element
-#-----|  -> ... = ...
-
-#   72| dynamic access to element
-#-----|  -> access to local variable d
-
-#   72| ... = ...
-#-----|  -> ...;
-
-#   72| dynamic call to operator +
-#-----|  -> dynamic access to element
-
-#   72| ...;
-#-----|  -> access to local variable d
-
-#   72| 0
-#-----|  -> access to local variable d
-
-#   72| 0
-#-----|  -> dynamic access to element
-
-#   72| access to local variable d
-#-----|  -> 1
-
-#   72| dynamic access to element
-#-----|  -> dynamic call to operator +
-
-#   72| 1
-#-----|  -> dynamic access to element
-
-#   73| (..., ...)
-#-----|  -> access to local variable d
-
-#   73| ... = ...
-#-----|  -> exit M9 (normal)
-
-#   73| ...;
-#-----|  -> access to local variable d
-
-#   73| access to local variable d
-#-----|  -> this access
-
-#   73| dynamic access to member MaybeProp1
-#-----|  -> access to property Prop
-
-#   73| this access
-#-----|  -> access to local variable d
-
-#   73| access to property Prop
-#-----|  -> dynamic access to element
-
-#   73| (..., ...)
-#-----|  -> (..., ...)
-
-#   73| access to local variable d
-#-----|  -> 0
-
-#   73| dynamic access to element
-#-----|  -> ... = ...
-
-#   73| 0
-#-----|  -> (..., ...)
-
-#   73| (..., ...)
-#-----|  -> dynamic access to member MaybeProp1
-
-#   73| access to local variable d
-#-----|  -> dynamic access to member MaybeProp1
-
-#   73| dynamic access to member MaybeProp1
-#-----|  -> this access
-
-#   73| this access
-#-----|  -> access to property Prop
-
-#   73| access to property Prop
-#-----|  -> 0
-
-#   73| (..., ...)
-#-----|  -> (..., ...)
-
-#   73| 0
-#-----|  -> access to local variable d
-
-#   73| access to local variable d
-#-----|  -> 1
-
-#   73| dynamic access to element
-#-----|  -> (..., ...)
-
-#   73| 1
-#-----|  -> dynamic access to element
-
-ArrayCreation.cs:
-#    1| call to constructor Object
-#-----|  -> {...}
-
-#    1| enter ArrayCreation
-#-----|  -> call to constructor Object
-
-#    1| exit ArrayCreation
-
-#    1| exit ArrayCreation (normal)
-#-----|  -> exit ArrayCreation
-
-#    1| {...}
-#-----|  -> exit ArrayCreation (normal)
-
-#    3| enter M1
-#-----|  -> 0
-
-#    3| exit M1
-
-#    3| exit M1 (normal)
-#-----|  -> exit M1
-
-#    3| array creation of type Int32[]
-#-----|  -> exit M1 (normal)
-
-#    3| 0
-#-----|  -> array creation of type Int32[]
-
-#    5| enter M2
-#-----|  -> 0
-
-#    5| exit M2
-
-#    5| exit M2 (normal)
-#-----|  -> exit M2
-
-#    5| array creation of type Int32[,]
-#-----|  -> exit M2 (normal)
-
-#    5| 0
-#-----|  -> 1
-
-#    5| 1
-#-----|  -> array creation of type Int32[,]
-
-#    7| enter M3
-#-----|  -> 2
-
-#    7| exit M3
-
-#    7| exit M3 (normal)
-#-----|  -> exit M3
-
-#    7| 2
-#-----|  -> array creation of type Int32[]
-
-#    7| array creation of type Int32[]
-#-----|  -> 0
-
-#    7| { ..., ... }
-#-----|  -> exit M3 (normal)
-
-#    7| 0
-#-----|  -> 1
-
-#    7| 1
-#-----|  -> { ..., ... }
-
-#    9| enter M4
-#-----|  -> 2
-
-#    9| exit M4
-
-#    9| exit M4 (normal)
-#-----|  -> exit M4
-
-#    9| 2
-#-----|  -> 2
-
-#    9| 2
-#-----|  -> array creation of type Int32[,]
-
-#    9| array creation of type Int32[,]
-#-----|  -> 0
-
-#    9| { ..., ... }
-#-----|  -> exit M4 (normal)
-
-#    9| { ..., ... }
-#-----|  -> 2
-
-#    9| 0
-#-----|  -> 1
-
-#    9| 1
-#-----|  -> { ..., ... }
-
-#    9| { ..., ... }
-#-----|  -> { ..., ... }
-
-#    9| 2
-#-----|  -> 3
-
-#    9| 3
-#-----|  -> { ..., ... }
-
-Assert.cs:
-#    5| call to constructor Object
-#-----|  -> {...}
-
-#    5| enter AssertTests
-#-----|  -> call to constructor Object
-
-#    5| exit AssertTests
-
-#    5| exit AssertTests (normal)
-#-----|  -> exit AssertTests
-
-#    5| {...}
-#-----|  -> exit AssertTests (normal)
-
-#    7| enter M1
-#-----|  -> {...}
-
-#    7| exit M1
-
-#    7| exit M1 (abnormal)
-#-----|  -> exit M1
-
-#    7| exit M1 (normal)
-#-----|  -> exit M1
-
-#    8| {...}
-#-----|  -> ... ...;
-
-#    9| ... ...;
-#-----|  -> access to parameter b
-
-#    9| String s = ...
-#-----|  -> ...;
-
-#    9| access to parameter b
-#-----| true -> null
-#-----| false -> ""
-
-#    9| ... ? ... : ...
-#-----|  -> String s = ...
-
-#    9| null
-#-----|  -> ... ? ... : ...
-
-#    9| ""
-#-----|  -> ... ? ... : ...
-
-#   10| [assertion failure] call to method Assert
-#-----| exit -> exit M1 (abnormal)
-
-#   10| [assertion success] call to method Assert
-#-----|  -> ...;
-
-#   10| ...;
-#-----|  -> access to local variable s
-
-#   10| access to local variable s
-#-----|  -> null
-
-#   10| ... != ...
-#-----| false -> [assertion failure] call to method Assert
-#-----| true -> [assertion success] call to method Assert
-
-#   10| null
-#-----|  -> ... != ...
-
-#   11| call to method WriteLine
-#-----|  -> exit M1 (normal)
-
-#   11| ...;
-#-----|  -> access to local variable s
-
-#   11| access to local variable s
-#-----|  -> access to property Length
-
-#   11| access to property Length
-#-----|  -> call to method WriteLine
-
-#   14| enter M2
-#-----|  -> {...}
-
-#   14| exit M2
-
-#   14| exit M2 (abnormal)
-#-----|  -> exit M2
-
-#   14| exit M2 (normal)
-#-----|  -> exit M2
-
-#   15| {...}
-#-----|  -> ... ...;
-
-#   16| ... ...;
-#-----|  -> access to parameter b
-
-#   16| String s = ...
-#-----|  -> ...;
-
-#   16| access to parameter b
-#-----| true -> null
-#-----| false -> ""
-
-#   16| ... ? ... : ...
-#-----|  -> String s = ...
-
-#   16| null
-#-----|  -> ... ? ... : ...
-
-#   16| ""
-#-----|  -> ... ? ... : ...
-
-#   17| [assertion failure] call to method IsNull
-#-----| exception(AssertFailedException) -> exit M2 (abnormal)
-
-#   17| [assertion success] call to method IsNull
-#-----|  -> ...;
-
-#   17| ...;
-#-----|  -> access to local variable s
-
-#   17| access to local variable s
-#-----| non-null -> [assertion failure] call to method IsNull
-#-----| null -> [assertion success] call to method IsNull
-
-#   18| call to method WriteLine
-#-----|  -> exit M2 (normal)
-
-#   18| ...;
-#-----|  -> access to local variable s
-
-#   18| access to local variable s
-#-----|  -> access to property Length
-
-#   18| access to property Length
-#-----|  -> call to method WriteLine
-
-#   21| enter M3
-#-----|  -> {...}
-
-#   21| exit M3
-
-#   21| exit M3 (abnormal)
-#-----|  -> exit M3
-
-#   21| exit M3 (normal)
-#-----|  -> exit M3
-
-#   22| {...}
-#-----|  -> ... ...;
-
-#   23| ... ...;
-#-----|  -> access to parameter b
-
-#   23| String s = ...
-#-----|  -> ...;
-
-#   23| access to parameter b
-#-----| true -> null
-#-----| false -> ""
-
-#   23| ... ? ... : ...
-#-----|  -> String s = ...
-
-#   23| null
-#-----|  -> ... ? ... : ...
-
-#   23| ""
-#-----|  -> ... ? ... : ...
-
-#   24| [assertion failure] call to method IsNotNull
-#-----| exception(AssertFailedException) -> exit M3 (abnormal)
-
-#   24| [assertion success] call to method IsNotNull
-#-----|  -> ...;
-
-#   24| ...;
-#-----|  -> access to local variable s
-
-#   24| access to local variable s
-#-----| non-null -> [assertion success] call to method IsNotNull
-#-----| null -> [assertion failure] call to method IsNotNull
-
-#   25| call to method WriteLine
-#-----|  -> exit M3 (normal)
-
-#   25| ...;
-#-----|  -> access to local variable s
-
-#   25| access to local variable s
-#-----|  -> access to property Length
-
-#   25| access to property Length
-#-----|  -> call to method WriteLine
-
-#   28| enter M4
-#-----|  -> {...}
-
-#   28| exit M4
-
-#   28| exit M4 (abnormal)
-#-----|  -> exit M4
-
-#   28| exit M4 (normal)
-#-----|  -> exit M4
-
-#   29| {...}
-#-----|  -> ... ...;
-
-#   30| ... ...;
-#-----|  -> access to parameter b
-
-#   30| String s = ...
-#-----|  -> ...;
-
-#   30| access to parameter b
-#-----| true -> null
-#-----| false -> ""
-
-#   30| ... ? ... : ...
-#-----|  -> String s = ...
-
-#   30| null
-#-----|  -> ... ? ... : ...
-
-#   30| ""
-#-----|  -> ... ? ... : ...
-
-#   31| [assertion failure] call to method IsTrue
-#-----| exception(AssertFailedException) -> exit M4 (abnormal)
-
-#   31| [assertion success] call to method IsTrue
-#-----|  -> ...;
-
-#   31| ...;
-#-----|  -> access to local variable s
-
-#   31| access to local variable s
-#-----|  -> null
-
-#   31| ... == ...
-#-----| false -> [assertion failure] call to method IsTrue
-#-----| true -> [assertion success] call to method IsTrue
-
-#   31| null
-#-----|  -> ... == ...
-
-#   32| call to method WriteLine
-#-----|  -> exit M4 (normal)
-
-#   32| ...;
-#-----|  -> access to local variable s
-
-#   32| access to local variable s
-#-----|  -> access to property Length
-
-#   32| access to property Length
-#-----|  -> call to method WriteLine
-
-#   35| enter M5
-#-----|  -> {...}
-
-#   35| exit M5
-
-#   35| exit M5 (abnormal)
-#-----|  -> exit M5
-
-#   35| exit M5 (normal)
-#-----|  -> exit M5
-
-#   36| {...}
-#-----|  -> ... ...;
-
-#   37| ... ...;
-#-----|  -> access to parameter b
-
-#   37| String s = ...
-#-----|  -> ...;
-
-#   37| access to parameter b
-#-----| true -> null
-#-----| false -> ""
-
-#   37| ... ? ... : ...
-#-----|  -> String s = ...
-
-#   37| null
-#-----|  -> ... ? ... : ...
-
-#   37| ""
-#-----|  -> ... ? ... : ...
-
-#   38| [assertion failure] call to method IsTrue
-#-----| exception(AssertFailedException) -> exit M5 (abnormal)
-
-#   38| [assertion success] call to method IsTrue
-#-----|  -> ...;
-
-#   38| ...;
-#-----|  -> access to local variable s
-
-#   38| access to local variable s
-#-----|  -> null
-
-#   38| ... != ...
-#-----| false -> [assertion failure] call to method IsTrue
-#-----| true -> [assertion success] call to method IsTrue
-
-#   38| null
-#-----|  -> ... != ...
-
-#   39| call to method WriteLine
-#-----|  -> exit M5 (normal)
-
-#   39| ...;
-#-----|  -> access to local variable s
-
-#   39| access to local variable s
-#-----|  -> access to property Length
-
-#   39| access to property Length
-#-----|  -> call to method WriteLine
-
-#   42| enter M6
-#-----|  -> {...}
-
-#   42| exit M6
-
-#   42| exit M6 (abnormal)
-#-----|  -> exit M6
-
-#   42| exit M6 (normal)
-#-----|  -> exit M6
-
-#   43| {...}
-#-----|  -> ... ...;
-
-#   44| ... ...;
-#-----|  -> access to parameter b
-
-#   44| String s = ...
-#-----|  -> ...;
-
-#   44| access to parameter b
-#-----| true -> null
-#-----| false -> ""
-
-#   44| ... ? ... : ...
-#-----|  -> String s = ...
-
-#   44| null
-#-----|  -> ... ? ... : ...
-
-#   44| ""
-#-----|  -> ... ? ... : ...
-
-#   45| [assertion failure] call to method IsFalse
-#-----| exception(AssertFailedException) -> exit M6 (abnormal)
-
-#   45| [assertion success] call to method IsFalse
-#-----|  -> ...;
-
-#   45| ...;
-#-----|  -> access to local variable s
-
-#   45| access to local variable s
-#-----|  -> null
-
-#   45| ... != ...
-#-----| false -> [assertion success] call to method IsFalse
-#-----| true -> [assertion failure] call to method IsFalse
-
-#   45| null
-#-----|  -> ... != ...
-
-#   46| call to method WriteLine
-#-----|  -> exit M6 (normal)
-
-#   46| ...;
-#-----|  -> access to local variable s
-
-#   46| access to local variable s
-#-----|  -> access to property Length
-
-#   46| access to property Length
-#-----|  -> call to method WriteLine
-
-#   49| enter M7
-#-----|  -> {...}
-
-#   49| exit M7
-
-#   49| exit M7 (abnormal)
-#-----|  -> exit M7
-
-#   49| exit M7 (normal)
-#-----|  -> exit M7
-
-#   50| {...}
-#-----|  -> ... ...;
-
-#   51| ... ...;
-#-----|  -> access to parameter b
-
-#   51| String s = ...
-#-----|  -> ...;
-
-#   51| access to parameter b
-#-----| true -> null
-#-----| false -> ""
-
-#   51| ... ? ... : ...
-#-----|  -> String s = ...
-
-#   51| null
-#-----|  -> ... ? ... : ...
-
-#   51| ""
-#-----|  -> ... ? ... : ...
-
-#   52| [assertion failure] call to method IsFalse
-#-----| exception(AssertFailedException) -> exit M7 (abnormal)
-
-#   52| [assertion success] call to method IsFalse
-#-----|  -> ...;
-
-#   52| ...;
-#-----|  -> access to local variable s
-
-#   52| access to local variable s
-#-----|  -> null
-
-#   52| ... == ...
-#-----| false -> [assertion success] call to method IsFalse
-#-----| true -> [assertion failure] call to method IsFalse
-
-#   52| null
-#-----|  -> ... == ...
-
-#   53| call to method WriteLine
-#-----|  -> exit M7 (normal)
-
-#   53| ...;
-#-----|  -> access to local variable s
-
-#   53| access to local variable s
-#-----|  -> access to property Length
-
-#   53| access to property Length
-#-----|  -> call to method WriteLine
-
-#   56| enter M8
-#-----|  -> {...}
-
-#   56| exit M8
-
-#   56| exit M8 (abnormal)
-#-----|  -> exit M8
-
-#   56| exit M8 (normal)
-#-----|  -> exit M8
-
-#   57| {...}
-#-----|  -> ... ...;
-
-#   58| ... ...;
-#-----|  -> access to parameter b
-
-#   58| [b (line 56): false] String s = ...
-#-----|  -> [b (line 56): false] ...;
-
-#   58| [b (line 56): true] String s = ...
-#-----|  -> [b (line 56): true] ...;
-
-#   58| access to parameter b
-#-----| true -> [b (line 56): true] null
-#-----| false -> [b (line 56): false] ""
-
-#   58| [b (line 56): false] ... ? ... : ...
-#-----|  -> [b (line 56): false] String s = ...
-
-#   58| [b (line 56): true] ... ? ... : ...
-#-----|  -> [b (line 56): true] String s = ...
-
-#   58| [b (line 56): true] null
-#-----|  -> [b (line 56): true] ... ? ... : ...
-
-#   58| [b (line 56): false] ""
-#-----|  -> [b (line 56): false] ... ? ... : ...
-
-#   59| [assertion failure] call to method IsTrue
-#-----| exception(AssertFailedException) -> exit M8 (abnormal)
-
-#   59| [assertion success] call to method IsTrue
-#-----|  -> ...;
-
-#   59| [b (line 56): false] ...;
-#-----|  -> [b (line 56): false] access to local variable s
-
-#   59| [b (line 56): true] ...;
-#-----|  -> [b (line 56): true] access to local variable s
-
-#   59| [b (line 56): false] access to local variable s
-#-----|  -> [b (line 56): false] null
-
-#   59| [b (line 56): true] access to local variable s
-#-----|  -> [b (line 56): true] null
-
-#   59| [b (line 56): false] ... != ...
-#-----| false -> [false] ... && ...
-#-----| true -> [b (line 56): false] access to parameter b
-
-#   59| [b (line 56): true] ... != ...
-#-----| false -> [false] ... && ...
-#-----| true -> [b (line 56): true] access to parameter b
-
-#   59| [false] ... && ...
-#-----| false -> [assertion failure] call to method IsTrue
-
-#   59| [true] ... && ...
-#-----| true -> [assertion success] call to method IsTrue
-
-#   59| [b (line 56): false] null
-#-----|  -> [b (line 56): false] ... != ...
-
-#   59| [b (line 56): true] null
-#-----|  -> [b (line 56): true] ... != ...
-
-#   59| [b (line 56): false] access to parameter b
-#-----| false -> [false] ... && ...
-
-#   59| [b (line 56): true] access to parameter b
-#-----| true -> [true] ... && ...
-
-#   60| call to method WriteLine
-#-----|  -> exit M8 (normal)
-
-#   60| ...;
-#-----|  -> access to local variable s
-
-#   60| access to local variable s
-#-----|  -> access to property Length
-
-#   60| access to property Length
-#-----|  -> call to method WriteLine
-
-#   63| enter M9
-#-----|  -> {...}
-
-#   63| exit M9
-
-#   63| exit M9 (abnormal)
-#-----|  -> exit M9
-
-#   63| exit M9 (normal)
-#-----|  -> exit M9
-
-#   64| {...}
-#-----|  -> ... ...;
-
-#   65| ... ...;
-#-----|  -> access to parameter b
-
-#   65| [b (line 63): false] String s = ...
-#-----|  -> [b (line 63): false] ...;
-
-#   65| [b (line 63): true] String s = ...
-#-----|  -> [b (line 63): true] ...;
-
-#   65| access to parameter b
-#-----| true -> [b (line 63): true] null
-#-----| false -> [b (line 63): false] ""
-
-#   65| [b (line 63): false] ... ? ... : ...
-#-----|  -> [b (line 63): false] String s = ...
-
-#   65| [b (line 63): true] ... ? ... : ...
-#-----|  -> [b (line 63): true] String s = ...
-
-#   65| [b (line 63): true] null
-#-----|  -> [b (line 63): true] ... ? ... : ...
-
-#   65| [b (line 63): false] ""
-#-----|  -> [b (line 63): false] ... ? ... : ...
-
-#   66| [assertion failure] call to method IsFalse
-#-----| exception(AssertFailedException) -> exit M9 (abnormal)
-
-#   66| [assertion success] call to method IsFalse
-#-----|  -> ...;
-
-#   66| [b (line 63): false] ...;
-#-----|  -> [b (line 63): false] access to local variable s
-
-#   66| [b (line 63): true] ...;
-#-----|  -> [b (line 63): true] access to local variable s
-
-#   66| [b (line 63): false] access to local variable s
-#-----|  -> [b (line 63): false] null
-
-#   66| [b (line 63): true] access to local variable s
-#-----|  -> [b (line 63): true] null
-
-#   66| [b (line 63): false] ... == ...
-#-----| true -> [true] ... || ...
-#-----| false -> [b (line 63): false] access to parameter b
-
-#   66| [b (line 63): true] ... == ...
-#-----| true -> [true] ... || ...
-#-----| false -> [b (line 63): true] access to parameter b
-
-#   66| [false] ... || ...
-#-----| false -> [assertion success] call to method IsFalse
-
-#   66| [true] ... || ...
-#-----| true -> [assertion failure] call to method IsFalse
-
-#   66| [b (line 63): false] null
-#-----|  -> [b (line 63): false] ... == ...
-
-#   66| [b (line 63): true] null
-#-----|  -> [b (line 63): true] ... == ...
-
-#   66| [b (line 63): false] access to parameter b
-#-----| false -> [false] ... || ...
-
-#   66| [b (line 63): true] access to parameter b
-#-----| true -> [true] ... || ...
-
-#   67| call to method WriteLine
-#-----|  -> exit M9 (normal)
-
-#   67| ...;
-#-----|  -> access to local variable s
-
-#   67| access to local variable s
-#-----|  -> access to property Length
-
-#   67| access to property Length
-#-----|  -> call to method WriteLine
-
-#   70| enter M10
-#-----|  -> {...}
-
-#   70| exit M10
-
-#   70| exit M10 (abnormal)
-#-----|  -> exit M10
-
-#   70| exit M10 (normal)
-#-----|  -> exit M10
-
-#   71| {...}
-#-----|  -> ... ...;
-
-#   72| ... ...;
-#-----|  -> access to parameter b
-
-#   72| [b (line 70): false] String s = ...
-#-----|  -> [b (line 70): false] ...;
-
-#   72| [b (line 70): true] String s = ...
-#-----|  -> [b (line 70): true] ...;
-
-#   72| access to parameter b
-#-----| true -> [b (line 70): true] null
-#-----| false -> [b (line 70): false] ""
-
-#   72| [b (line 70): false] ... ? ... : ...
-#-----|  -> [b (line 70): false] String s = ...
-
-#   72| [b (line 70): true] ... ? ... : ...
-#-----|  -> [b (line 70): true] String s = ...
-
-#   72| [b (line 70): true] null
-#-----|  -> [b (line 70): true] ... ? ... : ...
-
-#   72| [b (line 70): false] ""
-#-----|  -> [b (line 70): false] ... ? ... : ...
-
-#   73| [assertion failure] call to method IsTrue
-#-----| exception(AssertFailedException) -> exit M10 (abnormal)
-
-#   73| [assertion success] call to method IsTrue
-#-----|  -> ...;
-
-#   73| [b (line 70): false] ...;
-#-----|  -> [b (line 70): false] access to local variable s
-
-#   73| [b (line 70): true] ...;
-#-----|  -> [b (line 70): true] access to local variable s
-
-#   73| [b (line 70): false] access to local variable s
-#-----|  -> [b (line 70): false] null
-
-#   73| [b (line 70): true] access to local variable s
-#-----|  -> [b (line 70): true] null
-
-#   73| [b (line 70): false] ... == ...
-#-----| false -> [false] ... && ...
-#-----| true -> [b (line 70): false] access to parameter b
-
-#   73| [b (line 70): true] ... == ...
-#-----| false -> [false] ... && ...
-#-----| true -> [b (line 70): true] access to parameter b
-
-#   73| [false] ... && ...
-#-----| false -> [assertion failure] call to method IsTrue
-
-#   73| [true] ... && ...
-#-----| true -> [assertion success] call to method IsTrue
-
-#   73| [b (line 70): false] null
-#-----|  -> [b (line 70): false] ... == ...
-
-#   73| [b (line 70): true] null
-#-----|  -> [b (line 70): true] ... == ...
-
-#   73| [b (line 70): false] access to parameter b
-#-----| false -> [false] ... && ...
-
-#   73| [b (line 70): true] access to parameter b
-#-----| true -> [true] ... && ...
-
-#   74| call to method WriteLine
-#-----|  -> exit M10 (normal)
-
-#   74| ...;
-#-----|  -> access to local variable s
-
-#   74| access to local variable s
-#-----|  -> access to property Length
-
-#   74| access to property Length
-#-----|  -> call to method WriteLine
-
-#   77| enter M11
-#-----|  -> {...}
-
-#   77| exit M11
-
-#   77| exit M11 (abnormal)
-#-----|  -> exit M11
-
-#   77| exit M11 (normal)
-#-----|  -> exit M11
-
-#   78| {...}
-#-----|  -> ... ...;
-
-#   79| ... ...;
-#-----|  -> access to parameter b
-
-#   79| [b (line 77): false] String s = ...
-#-----|  -> [b (line 77): false] ...;
-
-#   79| [b (line 77): true] String s = ...
-#-----|  -> [b (line 77): true] ...;
-
-#   79| access to parameter b
-#-----| true -> [b (line 77): true] null
-#-----| false -> [b (line 77): false] ""
-
-#   79| [b (line 77): false] ... ? ... : ...
-#-----|  -> [b (line 77): false] String s = ...
-
-#   79| [b (line 77): true] ... ? ... : ...
-#-----|  -> [b (line 77): true] String s = ...
-
-#   79| [b (line 77): true] null
-#-----|  -> [b (line 77): true] ... ? ... : ...
-
-#   79| [b (line 77): false] ""
-#-----|  -> [b (line 77): false] ... ? ... : ...
-
-#   80| [assertion failure] call to method IsFalse
-#-----| exception(AssertFailedException) -> exit M11 (abnormal)
-
-#   80| [assertion success] call to method IsFalse
-#-----|  -> ...;
-
-#   80| [b (line 77): false] ...;
-#-----|  -> [b (line 77): false] access to local variable s
-
-#   80| [b (line 77): true] ...;
-#-----|  -> [b (line 77): true] access to local variable s
-
-#   80| [b (line 77): false] access to local variable s
-#-----|  -> [b (line 77): false] null
-
-#   80| [b (line 77): true] access to local variable s
-#-----|  -> [b (line 77): true] null
-
-#   80| [b (line 77): false] ... != ...
-#-----| true -> [true] ... || ...
-#-----| false -> [b (line 77): false] access to parameter b
-
-#   80| [b (line 77): true] ... != ...
-#-----| true -> [true] ... || ...
-#-----| false -> [b (line 77): true] access to parameter b
-
-#   80| [false] ... || ...
-#-----| false -> [assertion success] call to method IsFalse
-
-#   80| [true] ... || ...
-#-----| true -> [assertion failure] call to method IsFalse
-
-#   80| [b (line 77): false] null
-#-----|  -> [b (line 77): false] ... != ...
-
-#   80| [b (line 77): true] null
-#-----|  -> [b (line 77): true] ... != ...
-
-#   80| [b (line 77): false] access to parameter b
-#-----| false -> [false] ... || ...
-
-#   80| [b (line 77): true] access to parameter b
-#-----| true -> [true] ... || ...
-
-#   81| call to method WriteLine
-#-----|  -> exit M11 (normal)
-
-#   81| ...;
-#-----|  -> access to local variable s
-
-#   81| access to local variable s
-#-----|  -> access to property Length
-
-#   81| access to property Length
-#-----|  -> call to method WriteLine
-
-#   84| enter M12
-#-----|  -> {...}
-
-#   84| exit M12
-
-#   84| exit M12 (abnormal)
-#-----|  -> exit M12
-
-#   84| exit M12 (normal)
-#-----|  -> exit M12
-
-#   85| {...}
-#-----|  -> ... ...;
-
-#   86| ... ...;
-#-----|  -> access to parameter b
-
-#   86| [b (line 84): false] String s = ...
-#-----|  -> [b (line 84): false] ...;
-
-#   86| [b (line 84): true] String s = ...
-#-----|  -> [b (line 84): true] ...;
-
-#   86| access to parameter b
-#-----| true -> [b (line 84): true] null
-#-----| false -> [b (line 84): false] ""
-
-#   86| [b (line 84): false] ... ? ... : ...
-#-----|  -> [b (line 84): false] String s = ...
-
-#   86| [b (line 84): true] ... ? ... : ...
-#-----|  -> [b (line 84): true] String s = ...
-
-#   86| [b (line 84): true] null
-#-----|  -> [b (line 84): true] ... ? ... : ...
-
-#   86| [b (line 84): false] ""
-#-----|  -> [b (line 84): false] ... ? ... : ...
-
-#   87| [assertion failure, b (line 84): false] call to method Assert
-#-----| exit -> exit M12 (abnormal)
-
-#   87| [assertion failure, b (line 84): true] call to method Assert
-#-----| exit -> exit M12 (abnormal)
-
-#   87| [assertion success, b (line 84): false] call to method Assert
-#-----|  -> [b (line 84): false] ...;
-
-#   87| [assertion success, b (line 84): true] call to method Assert
-#-----|  -> [b (line 84): true] ...;
-
-#   87| [b (line 84): false] ...;
-#-----|  -> [b (line 84): false] access to local variable s
-
-#   87| [b (line 84): true] ...;
-#-----|  -> [b (line 84): true] access to local variable s
-
-#   87| [b (line 84): false] access to local variable s
-#-----|  -> [b (line 84): false] null
-
-#   87| [b (line 84): true] access to local variable s
-#-----|  -> [b (line 84): true] null
-
-#   87| [b (line 84): false] ... != ...
-#-----| false -> [assertion failure, b (line 84): false] call to method Assert
-#-----| true -> [assertion success, b (line 84): false] call to method Assert
-
-#   87| [b (line 84): true] ... != ...
-#-----| false -> [assertion failure, b (line 84): true] call to method Assert
-#-----| true -> [assertion success, b (line 84): true] call to method Assert
-
-#   87| [b (line 84): false] null
-#-----|  -> [b (line 84): false] ... != ...
-
-#   87| [b (line 84): true] null
-#-----|  -> [b (line 84): true] ... != ...
-
-#   88| [b (line 84): false] call to method WriteLine
-#-----|  -> [b (line 84): false] ...;
-
-#   88| [b (line 84): true] call to method WriteLine
-#-----|  -> [b (line 84): true] ...;
-
-#   88| [b (line 84): false] ...;
-#-----|  -> [b (line 84): false] access to local variable s
-
-#   88| [b (line 84): true] ...;
-#-----|  -> [b (line 84): true] access to local variable s
-
-#   88| [b (line 84): false] access to local variable s
-#-----|  -> [b (line 84): false] access to property Length
-
-#   88| [b (line 84): true] access to local variable s
-#-----|  -> [b (line 84): true] access to property Length
-
-#   88| [b (line 84): false] access to property Length
-#-----|  -> [b (line 84): false] call to method WriteLine
-
-#   88| [b (line 84): true] access to property Length
-#-----|  -> [b (line 84): true] call to method WriteLine
-
-#   90| [b (line 84): false] ... = ...
-#-----|  -> [b (line 84): false] ...;
-
-#   90| [b (line 84): true] ... = ...
-#-----|  -> [b (line 84): true] ...;
-
-#   90| [b (line 84): false] ...;
-#-----|  -> [b (line 84): false] access to parameter b
-
-#   90| [b (line 84): true] ...;
-#-----|  -> [b (line 84): true] access to parameter b
-
-#   90| [b (line 84): false] access to parameter b
-#-----| false -> [b (line 84): false] ""
-
-#   90| [b (line 84): true] access to parameter b
-#-----| true -> [b (line 84): true] null
-
-#   90| [b (line 84): false] ... ? ... : ...
-#-----|  -> [b (line 84): false] ... = ...
-
-#   90| [b (line 84): true] ... ? ... : ...
-#-----|  -> [b (line 84): true] ... = ...
-
-#   90| [b (line 84): true] null
-#-----|  -> [b (line 84): true] ... ? ... : ...
-
-#   90| [b (line 84): false] ""
-#-----|  -> [b (line 84): false] ... ? ... : ...
-
-#   91| [assertion failure, b (line 84): false] call to method IsNull
-#-----| exception(AssertFailedException) -> exit M12 (abnormal)
-
-#   91| [assertion failure, b (line 84): true] call to method IsNull
-#-----| exception(AssertFailedException) -> exit M12 (abnormal)
-
-#   91| [assertion success, b (line 84): false] call to method IsNull
-#-----|  -> [b (line 84): false] ...;
-
-#   91| [assertion success, b (line 84): true] call to method IsNull
-#-----|  -> [b (line 84): true] ...;
-
-#   91| [b (line 84): false] ...;
-#-----|  -> [b (line 84): false] access to local variable s
-
-#   91| [b (line 84): true] ...;
-#-----|  -> [b (line 84): true] access to local variable s
-
-#   91| [b (line 84): false] access to local variable s
-#-----| non-null -> [assertion failure, b (line 84): false] call to method IsNull
-#-----| null -> [assertion success, b (line 84): false] call to method IsNull
-
-#   91| [b (line 84): true] access to local variable s
-#-----| non-null -> [assertion failure, b (line 84): true] call to method IsNull
-#-----| null -> [assertion success, b (line 84): true] call to method IsNull
-
-#   92| [b (line 84): false] call to method WriteLine
-#-----|  -> [b (line 84): false] ...;
-
-#   92| [b (line 84): true] call to method WriteLine
-#-----|  -> [b (line 84): true] ...;
-
-#   92| [b (line 84): false] ...;
-#-----|  -> [b (line 84): false] access to local variable s
-
-#   92| [b (line 84): true] ...;
-#-----|  -> [b (line 84): true] access to local variable s
-
-#   92| [b (line 84): false] access to local variable s
-#-----|  -> [b (line 84): false] access to property Length
-
-#   92| [b (line 84): true] access to local variable s
-#-----|  -> [b (line 84): true] access to property Length
-
-#   92| [b (line 84): false] access to property Length
-#-----|  -> [b (line 84): false] call to method WriteLine
-
-#   92| [b (line 84): true] access to property Length
-#-----|  -> [b (line 84): true] call to method WriteLine
-
-#   94| [b (line 84): false] ... = ...
-#-----|  -> [b (line 84): false] ...;
-
-#   94| [b (line 84): true] ... = ...
-#-----|  -> [b (line 84): true] ...;
-
-#   94| [b (line 84): false] ...;
-#-----|  -> [b (line 84): false] access to parameter b
-
-#   94| [b (line 84): true] ...;
-#-----|  -> [b (line 84): true] access to parameter b
-
-#   94| [b (line 84): false] access to parameter b
-#-----| false -> [b (line 84): false] ""
-
-#   94| [b (line 84): true] access to parameter b
-#-----| true -> [b (line 84): true] null
-
-#   94| [b (line 84): false] ... ? ... : ...
-#-----|  -> [b (line 84): false] ... = ...
-
-#   94| [b (line 84): true] ... ? ... : ...
-#-----|  -> [b (line 84): true] ... = ...
-
-#   94| [b (line 84): true] null
-#-----|  -> [b (line 84): true] ... ? ... : ...
-
-#   94| [b (line 84): false] ""
-#-----|  -> [b (line 84): false] ... ? ... : ...
-
-#   95| [assertion failure, b (line 84): false] call to method IsNotNull
-#-----| exception(AssertFailedException) -> exit M12 (abnormal)
-
-#   95| [assertion failure, b (line 84): true] call to method IsNotNull
-#-----| exception(AssertFailedException) -> exit M12 (abnormal)
-
-#   95| [assertion success, b (line 84): false] call to method IsNotNull
-#-----|  -> [b (line 84): false] ...;
-
-#   95| [assertion success, b (line 84): true] call to method IsNotNull
-#-----|  -> [b (line 84): true] ...;
-
-#   95| [b (line 84): false] ...;
-#-----|  -> [b (line 84): false] access to local variable s
-
-#   95| [b (line 84): true] ...;
-#-----|  -> [b (line 84): true] access to local variable s
-
-#   95| [b (line 84): false] access to local variable s
-#-----| non-null -> [assertion success, b (line 84): false] call to method IsNotNull
-#-----| null -> [assertion failure, b (line 84): false] call to method IsNotNull
-
-#   95| [b (line 84): true] access to local variable s
-#-----| non-null -> [assertion success, b (line 84): true] call to method IsNotNull
-#-----| null -> [assertion failure, b (line 84): true] call to method IsNotNull
-
-#   96| [b (line 84): false] call to method WriteLine
-#-----|  -> [b (line 84): false] ...;
-
-#   96| [b (line 84): true] call to method WriteLine
-#-----|  -> [b (line 84): true] ...;
-
-#   96| [b (line 84): false] ...;
-#-----|  -> [b (line 84): false] access to local variable s
-
-#   96| [b (line 84): true] ...;
-#-----|  -> [b (line 84): true] access to local variable s
-
-#   96| [b (line 84): false] access to local variable s
-#-----|  -> [b (line 84): false] access to property Length
-
-#   96| [b (line 84): true] access to local variable s
-#-----|  -> [b (line 84): true] access to property Length
-
-#   96| [b (line 84): false] access to property Length
-#-----|  -> [b (line 84): false] call to method WriteLine
-
-#   96| [b (line 84): true] access to property Length
-#-----|  -> [b (line 84): true] call to method WriteLine
-
-#   98| [b (line 84): false] ... = ...
-#-----|  -> [b (line 84): false] ...;
-
-#   98| [b (line 84): true] ... = ...
-#-----|  -> [b (line 84): true] ...;
-
-#   98| [b (line 84): false] ...;
-#-----|  -> [b (line 84): false] access to parameter b
-
-#   98| [b (line 84): true] ...;
-#-----|  -> [b (line 84): true] access to parameter b
-
-#   98| [b (line 84): false] access to parameter b
-#-----| false -> [b (line 84): false] ""
-
-#   98| [b (line 84): true] access to parameter b
-#-----| true -> [b (line 84): true] null
-
-#   98| [b (line 84): false] ... ? ... : ...
-#-----|  -> [b (line 84): false] ... = ...
-
-#   98| [b (line 84): true] ... ? ... : ...
-#-----|  -> [b (line 84): true] ... = ...
-
-#   98| [b (line 84): true] null
-#-----|  -> [b (line 84): true] ... ? ... : ...
-
-#   98| [b (line 84): false] ""
-#-----|  -> [b (line 84): false] ... ? ... : ...
-
-#   99| [assertion failure, b (line 84): false] call to method IsTrue
-#-----| exception(AssertFailedException) -> exit M12 (abnormal)
-
-#   99| [assertion failure, b (line 84): true] call to method IsTrue
-#-----| exception(AssertFailedException) -> exit M12 (abnormal)
-
-#   99| [assertion success, b (line 84): false] call to method IsTrue
-#-----|  -> [b (line 84): false] ...;
-
-#   99| [assertion success, b (line 84): true] call to method IsTrue
-#-----|  -> [b (line 84): true] ...;
-
-#   99| [b (line 84): false] ...;
-#-----|  -> [b (line 84): false] access to local variable s
-
-#   99| [b (line 84): true] ...;
-#-----|  -> [b (line 84): true] access to local variable s
-
-#   99| [b (line 84): false] access to local variable s
-#-----|  -> [b (line 84): false] null
-
-#   99| [b (line 84): true] access to local variable s
-#-----|  -> [b (line 84): true] null
-
-#   99| [b (line 84): false] ... == ...
-#-----| false -> [assertion failure, b (line 84): false] call to method IsTrue
-#-----| true -> [assertion success, b (line 84): false] call to method IsTrue
-
-#   99| [b (line 84): true] ... == ...
-#-----| false -> [assertion failure, b (line 84): true] call to method IsTrue
-#-----| true -> [assertion success, b (line 84): true] call to method IsTrue
-
-#   99| [b (line 84): false] null
-#-----|  -> [b (line 84): false] ... == ...
-
-#   99| [b (line 84): true] null
-#-----|  -> [b (line 84): true] ... == ...
-
-#  100| [b (line 84): false] call to method WriteLine
-#-----|  -> [b (line 84): false] ...;
-
-#  100| [b (line 84): true] call to method WriteLine
-#-----|  -> [b (line 84): true] ...;
-
-#  100| [b (line 84): false] ...;
-#-----|  -> [b (line 84): false] access to local variable s
-
-#  100| [b (line 84): true] ...;
-#-----|  -> [b (line 84): true] access to local variable s
-
-#  100| [b (line 84): false] access to local variable s
-#-----|  -> [b (line 84): false] access to property Length
-
-#  100| [b (line 84): true] access to local variable s
-#-----|  -> [b (line 84): true] access to property Length
-
-#  100| [b (line 84): false] access to property Length
-#-----|  -> [b (line 84): false] call to method WriteLine
-
-#  100| [b (line 84): true] access to property Length
-#-----|  -> [b (line 84): true] call to method WriteLine
-
-#  102| [b (line 84): false] ... = ...
-#-----|  -> [b (line 84): false] ...;
-
-#  102| [b (line 84): true] ... = ...
-#-----|  -> [b (line 84): true] ...;
-
-#  102| [b (line 84): false] ...;
-#-----|  -> [b (line 84): false] access to parameter b
-
-#  102| [b (line 84): true] ...;
-#-----|  -> [b (line 84): true] access to parameter b
-
-#  102| [b (line 84): false] access to parameter b
-#-----| false -> [b (line 84): false] ""
-
-#  102| [b (line 84): true] access to parameter b
-#-----| true -> [b (line 84): true] null
-
-#  102| [b (line 84): false] ... ? ... : ...
-#-----|  -> [b (line 84): false] ... = ...
-
-#  102| [b (line 84): true] ... ? ... : ...
-#-----|  -> [b (line 84): true] ... = ...
-
-#  102| [b (line 84): true] null
-#-----|  -> [b (line 84): true] ... ? ... : ...
-
-#  102| [b (line 84): false] ""
-#-----|  -> [b (line 84): false] ... ? ... : ...
-
-#  103| [assertion failure, b (line 84): false] call to method IsTrue
-#-----| exception(AssertFailedException) -> exit M12 (abnormal)
-
-#  103| [assertion failure, b (line 84): true] call to method IsTrue
-#-----| exception(AssertFailedException) -> exit M12 (abnormal)
-
-#  103| [assertion success, b (line 84): false] call to method IsTrue
-#-----|  -> [b (line 84): false] ...;
-
-#  103| [assertion success, b (line 84): true] call to method IsTrue
-#-----|  -> [b (line 84): true] ...;
-
-#  103| [b (line 84): false] ...;
-#-----|  -> [b (line 84): false] access to local variable s
-
-#  103| [b (line 84): true] ...;
-#-----|  -> [b (line 84): true] access to local variable s
-
-#  103| [b (line 84): false] access to local variable s
-#-----|  -> [b (line 84): false] null
-
-#  103| [b (line 84): true] access to local variable s
-#-----|  -> [b (line 84): true] null
-
-#  103| [b (line 84): false] ... != ...
-#-----| false -> [assertion failure, b (line 84): false] call to method IsTrue
-#-----| true -> [assertion success, b (line 84): false] call to method IsTrue
-
-#  103| [b (line 84): true] ... != ...
-#-----| false -> [assertion failure, b (line 84): true] call to method IsTrue
-#-----| true -> [assertion success, b (line 84): true] call to method IsTrue
-
-#  103| [b (line 84): false] null
-#-----|  -> [b (line 84): false] ... != ...
-
-#  103| [b (line 84): true] null
-#-----|  -> [b (line 84): true] ... != ...
-
-#  104| [b (line 84): false] call to method WriteLine
-#-----|  -> [b (line 84): false] ...;
-
-#  104| [b (line 84): true] call to method WriteLine
-#-----|  -> [b (line 84): true] ...;
-
-#  104| [b (line 84): false] ...;
-#-----|  -> [b (line 84): false] access to local variable s
-
-#  104| [b (line 84): true] ...;
-#-----|  -> [b (line 84): true] access to local variable s
-
-#  104| [b (line 84): false] access to local variable s
-#-----|  -> [b (line 84): false] access to property Length
-
-#  104| [b (line 84): true] access to local variable s
-#-----|  -> [b (line 84): true] access to property Length
-
-#  104| [b (line 84): false] access to property Length
-#-----|  -> [b (line 84): false] call to method WriteLine
-
-#  104| [b (line 84): true] access to property Length
-#-----|  -> [b (line 84): true] call to method WriteLine
-
-#  106| [b (line 84): false] ... = ...
-#-----|  -> [b (line 84): false] ...;
-
-#  106| [b (line 84): true] ... = ...
-#-----|  -> [b (line 84): true] ...;
-
-#  106| [b (line 84): false] ...;
-#-----|  -> [b (line 84): false] access to parameter b
-
-#  106| [b (line 84): true] ...;
-#-----|  -> [b (line 84): true] access to parameter b
-
-#  106| [b (line 84): false] access to parameter b
-#-----| false -> [b (line 84): false] ""
-
-#  106| [b (line 84): true] access to parameter b
-#-----| true -> [b (line 84): true] null
-
-#  106| [b (line 84): false] ... ? ... : ...
-#-----|  -> [b (line 84): false] ... = ...
-
-#  106| [b (line 84): true] ... ? ... : ...
-#-----|  -> [b (line 84): true] ... = ...
-
-#  106| [b (line 84): true] null
-#-----|  -> [b (line 84): true] ... ? ... : ...
-
-#  106| [b (line 84): false] ""
-#-----|  -> [b (line 84): false] ... ? ... : ...
-
-#  107| [assertion failure, b (line 84): false] call to method IsFalse
-#-----| exception(AssertFailedException) -> exit M12 (abnormal)
-
-#  107| [assertion failure, b (line 84): true] call to method IsFalse
-#-----| exception(AssertFailedException) -> exit M12 (abnormal)
-
-#  107| [assertion success, b (line 84): false] call to method IsFalse
-#-----|  -> [b (line 84): false] ...;
-
-#  107| [assertion success, b (line 84): true] call to method IsFalse
-#-----|  -> [b (line 84): true] ...;
-
-#  107| [b (line 84): false] ...;
-#-----|  -> [b (line 84): false] access to local variable s
-
-#  107| [b (line 84): true] ...;
-#-----|  -> [b (line 84): true] access to local variable s
-
-#  107| [b (line 84): false] access to local variable s
-#-----|  -> [b (line 84): false] null
-
-#  107| [b (line 84): true] access to local variable s
-#-----|  -> [b (line 84): true] null
-
-#  107| [b (line 84): false] ... != ...
-#-----| false -> [assertion success, b (line 84): false] call to method IsFalse
-#-----| true -> [assertion failure, b (line 84): false] call to method IsFalse
-
-#  107| [b (line 84): true] ... != ...
-#-----| false -> [assertion success, b (line 84): true] call to method IsFalse
-#-----| true -> [assertion failure, b (line 84): true] call to method IsFalse
-
-#  107| [b (line 84): false] null
-#-----|  -> [b (line 84): false] ... != ...
-
-#  107| [b (line 84): true] null
-#-----|  -> [b (line 84): true] ... != ...
-
-#  108| [b (line 84): false] call to method WriteLine
-#-----|  -> [b (line 84): false] ...;
-
-#  108| [b (line 84): true] call to method WriteLine
-#-----|  -> [b (line 84): true] ...;
-
-#  108| [b (line 84): false] ...;
-#-----|  -> [b (line 84): false] access to local variable s
-
-#  108| [b (line 84): true] ...;
-#-----|  -> [b (line 84): true] access to local variable s
-
-#  108| [b (line 84): false] access to local variable s
-#-----|  -> [b (line 84): false] access to property Length
-
-#  108| [b (line 84): true] access to local variable s
-#-----|  -> [b (line 84): true] access to property Length
-
-#  108| [b (line 84): false] access to property Length
-#-----|  -> [b (line 84): false] call to method WriteLine
-
-#  108| [b (line 84): true] access to property Length
-#-----|  -> [b (line 84): true] call to method WriteLine
-
-#  110| [b (line 84): false] ... = ...
-#-----|  -> [b (line 84): false] ...;
-
-#  110| [b (line 84): true] ... = ...
-#-----|  -> [b (line 84): true] ...;
-
-#  110| [b (line 84): false] ...;
-#-----|  -> [b (line 84): false] access to parameter b
-
-#  110| [b (line 84): true] ...;
-#-----|  -> [b (line 84): true] access to parameter b
-
-#  110| [b (line 84): false] access to parameter b
-#-----| false -> [b (line 84): false] ""
-
-#  110| [b (line 84): true] access to parameter b
-#-----| true -> [b (line 84): true] null
-
-#  110| [b (line 84): false] ... ? ... : ...
-#-----|  -> [b (line 84): false] ... = ...
-
-#  110| [b (line 84): true] ... ? ... : ...
-#-----|  -> [b (line 84): true] ... = ...
-
-#  110| [b (line 84): true] null
-#-----|  -> [b (line 84): true] ... ? ... : ...
-
-#  110| [b (line 84): false] ""
-#-----|  -> [b (line 84): false] ... ? ... : ...
-
-#  111| [assertion failure, b (line 84): false] call to method IsFalse
-#-----| exception(AssertFailedException) -> exit M12 (abnormal)
-
-#  111| [assertion failure, b (line 84): true] call to method IsFalse
-#-----| exception(AssertFailedException) -> exit M12 (abnormal)
-
-#  111| [assertion success, b (line 84): false] call to method IsFalse
-#-----|  -> [b (line 84): false] ...;
-
-#  111| [assertion success, b (line 84): true] call to method IsFalse
-#-----|  -> [b (line 84): true] ...;
-
-#  111| [b (line 84): false] ...;
-#-----|  -> [b (line 84): false] access to local variable s
-
-#  111| [b (line 84): true] ...;
-#-----|  -> [b (line 84): true] access to local variable s
-
-#  111| [b (line 84): false] access to local variable s
-#-----|  -> [b (line 84): false] null
-
-#  111| [b (line 84): true] access to local variable s
-#-----|  -> [b (line 84): true] null
-
-#  111| [b (line 84): false] ... == ...
-#-----| false -> [assertion success, b (line 84): false] call to method IsFalse
-#-----| true -> [assertion failure, b (line 84): false] call to method IsFalse
-
-#  111| [b (line 84): true] ... == ...
-#-----| false -> [assertion success, b (line 84): true] call to method IsFalse
-#-----| true -> [assertion failure, b (line 84): true] call to method IsFalse
-
-#  111| [b (line 84): false] null
-#-----|  -> [b (line 84): false] ... == ...
-
-#  111| [b (line 84): true] null
-#-----|  -> [b (line 84): true] ... == ...
-
-#  112| [b (line 84): false] call to method WriteLine
-#-----|  -> [b (line 84): false] ...;
-
-#  112| [b (line 84): true] call to method WriteLine
-#-----|  -> [b (line 84): true] ...;
-
-#  112| [b (line 84): false] ...;
-#-----|  -> [b (line 84): false] access to local variable s
-
-#  112| [b (line 84): true] ...;
-#-----|  -> [b (line 84): true] access to local variable s
-
-#  112| [b (line 84): false] access to local variable s
-#-----|  -> [b (line 84): false] access to property Length
-
-#  112| [b (line 84): true] access to local variable s
-#-----|  -> [b (line 84): true] access to property Length
-
-#  112| [b (line 84): false] access to property Length
-#-----|  -> [b (line 84): false] call to method WriteLine
-
-#  112| [b (line 84): true] access to property Length
-#-----|  -> [b (line 84): true] call to method WriteLine
-
-#  114| [b (line 84): false] ... = ...
-#-----|  -> [b (line 84): false] ...;
-
-#  114| [b (line 84): true] ... = ...
-#-----|  -> [b (line 84): true] ...;
-
-#  114| [b (line 84): false] ...;
-#-----|  -> [b (line 84): false] access to parameter b
-
-#  114| [b (line 84): true] ...;
-#-----|  -> [b (line 84): true] access to parameter b
-
-#  114| [b (line 84): false] access to parameter b
-#-----| false -> [b (line 84): false] ""
-
-#  114| [b (line 84): true] access to parameter b
-#-----| true -> [b (line 84): true] null
-
-#  114| [b (line 84): false] ... ? ... : ...
-#-----|  -> [b (line 84): false] ... = ...
-
-#  114| [b (line 84): true] ... ? ... : ...
-#-----|  -> [b (line 84): true] ... = ...
-
-#  114| [b (line 84): true] null
-#-----|  -> [b (line 84): true] ... ? ... : ...
-
-#  114| [b (line 84): false] ""
-#-----|  -> [b (line 84): false] ... ? ... : ...
-
-#  115| [assertion failure, b (line 84): false] call to method IsTrue
-#-----| exception(AssertFailedException) -> exit M12 (abnormal)
-
-#  115| [assertion failure, b (line 84): true] call to method IsTrue
-#-----| exception(AssertFailedException) -> exit M12 (abnormal)
-
-#  115| [assertion success, b (line 84): true] call to method IsTrue
-#-----|  -> [b (line 84): true] ...;
-
-#  115| [b (line 84): false] ...;
-#-----|  -> [b (line 84): false] access to local variable s
-
-#  115| [b (line 84): true] ...;
-#-----|  -> [b (line 84): true] access to local variable s
-
-#  115| [b (line 84): false] access to local variable s
-#-----|  -> [b (line 84): false] null
-
-#  115| [b (line 84): true] access to local variable s
-#-----|  -> [b (line 84): true] null
-
-#  115| [b (line 84): false] ... != ...
-#-----| false -> [false, b (line 84): false] ... && ...
-#-----| true -> [b (line 84): false] access to parameter b
-
-#  115| [b (line 84): true] ... != ...
-#-----| false -> [false, b (line 84): true] ... && ...
-#-----| true -> [b (line 84): true] access to parameter b
-
-#  115| [false, b (line 84): false] ... && ...
-#-----| false -> [assertion failure, b (line 84): false] call to method IsTrue
-
-#  115| [false, b (line 84): true] ... && ...
-#-----| false -> [assertion failure, b (line 84): true] call to method IsTrue
-
-#  115| [true, b (line 84): true] ... && ...
-#-----| true -> [assertion success, b (line 84): true] call to method IsTrue
-
-#  115| [b (line 84): false] null
-#-----|  -> [b (line 84): false] ... != ...
-
-#  115| [b (line 84): true] null
-#-----|  -> [b (line 84): true] ... != ...
-
-#  115| [b (line 84): false] access to parameter b
-#-----| false -> [false, b (line 84): false] ... && ...
-
-#  115| [b (line 84): true] access to parameter b
-#-----| true -> [true, b (line 84): true] ... && ...
-
-#  116| [b (line 84): true] call to method WriteLine
-#-----|  -> [b (line 84): true] ...;
-
-#  116| [b (line 84): true] ...;
-#-----|  -> [b (line 84): true] access to local variable s
-
-#  116| [b (line 84): true] access to local variable s
-#-----|  -> [b (line 84): true] access to property Length
-
-#  116| [b (line 84): true] access to property Length
-#-----|  -> [b (line 84): true] call to method WriteLine
-
-#  118| [b (line 84): true] ... = ...
-#-----|  -> [b (line 84): true] ...;
-
-#  118| [b (line 84): true] ...;
-#-----|  -> [b (line 84): true] access to parameter b
-
-#  118| [b (line 84): true] access to parameter b
-#-----| true -> [b (line 84): true] null
-
-#  118| [b (line 84): true] ... ? ... : ...
-#-----|  -> [b (line 84): true] ... = ...
-
-#  118| [b (line 84): true] null
-#-----|  -> [b (line 84): true] ... ? ... : ...
-
-#  119| [assertion failure, b (line 84): true] call to method IsFalse
-#-----| exception(AssertFailedException) -> exit M12 (abnormal)
-
-#  119| [assertion success, b (line 84): true] call to method IsFalse
-#-----|  -> [b (line 84): true] ...;
-
-#  119| [b (line 84): true] ...;
-#-----|  -> [b (line 84): true] access to local variable s
-
-#  119| [b (line 84): true] access to local variable s
-#-----|  -> [b (line 84): true] null
-
-#  119| [b (line 84): true] ... == ...
-#-----| true -> [true, b (line 84): true] ... || ...
-#-----| false -> [b (line 84): true] access to parameter b
-
-#  119| [false, b (line 84): true] ... || ...
-#-----| false -> [assertion success, b (line 84): true] call to method IsFalse
-
-#  119| [true, b (line 84): true] ... || ...
-#-----| true -> [assertion failure, b (line 84): true] call to method IsFalse
-
-#  119| [b (line 84): true] null
-#-----|  -> [b (line 84): true] ... == ...
-
-#  119| [false, b (line 84): true] !...
-#-----| false -> [false, b (line 84): true] ... || ...
-
-#  119| [b (line 84): true] access to parameter b
-#-----| true -> [false, b (line 84): true] !...
-
-#  120| [b (line 84): true] call to method WriteLine
-#-----|  -> [b (line 84): true] ...;
-
-#  120| [b (line 84): true] ...;
-#-----|  -> [b (line 84): true] access to local variable s
-
-#  120| [b (line 84): true] access to local variable s
-#-----|  -> [b (line 84): true] access to property Length
-
-#  120| [b (line 84): true] access to property Length
-#-----|  -> [b (line 84): true] call to method WriteLine
-
-#  122| [b (line 84): true] ... = ...
-#-----|  -> [b (line 84): true] ...;
-
-#  122| [b (line 84): true] ...;
-#-----|  -> [b (line 84): true] access to parameter b
-
-#  122| [b (line 84): true] access to parameter b
-#-----| true -> [b (line 84): true] null
-
-#  122| [b (line 84): true] ... ? ... : ...
-#-----|  -> [b (line 84): true] ... = ...
-
-#  122| [b (line 84): true] null
-#-----|  -> [b (line 84): true] ... ? ... : ...
-
-#  123| [assertion failure, b (line 84): true] call to method IsTrue
-#-----| exception(AssertFailedException) -> exit M12 (abnormal)
-
-#  123| [assertion success, b (line 84): true] call to method IsTrue
-#-----|  -> [b (line 84): true] ...;
-
-#  123| [b (line 84): true] ...;
-#-----|  -> [b (line 84): true] access to local variable s
-
-#  123| [b (line 84): true] access to local variable s
-#-----|  -> [b (line 84): true] null
-
-#  123| [b (line 84): true] ... == ...
-#-----| false -> [false, b (line 84): true] ... && ...
-#-----| true -> [b (line 84): true] access to parameter b
-
-#  123| [false, b (line 84): true] ... && ...
-#-----| false -> [assertion failure, b (line 84): true] call to method IsTrue
-
-#  123| [true, b (line 84): true] ... && ...
-#-----| true -> [assertion success, b (line 84): true] call to method IsTrue
-
-#  123| [b (line 84): true] null
-#-----|  -> [b (line 84): true] ... == ...
-
-#  123| [b (line 84): true] access to parameter b
-#-----| true -> [true, b (line 84): true] ... && ...
-
-#  124| [b (line 84): true] call to method WriteLine
-#-----|  -> [b (line 84): true] ...;
-
-#  124| [b (line 84): true] ...;
-#-----|  -> [b (line 84): true] access to local variable s
-
-#  124| [b (line 84): true] access to local variable s
-#-----|  -> [b (line 84): true] access to property Length
-
-#  124| [b (line 84): true] access to property Length
-#-----|  -> [b (line 84): true] call to method WriteLine
-
-#  126| [b (line 84): true] ... = ...
-#-----|  -> [b (line 84): true] ...;
-
-#  126| [b (line 84): true] ...;
-#-----|  -> [b (line 84): true] access to parameter b
-
-#  126| [b (line 84): true] access to parameter b
-#-----| true -> [b (line 84): true] null
-
-#  126| [b (line 84): true] ... ? ... : ...
-#-----|  -> [b (line 84): true] ... = ...
-
-#  126| [b (line 84): true] null
-#-----|  -> [b (line 84): true] ... ? ... : ...
-
-#  127| [assertion failure] call to method IsFalse
-#-----| exception(AssertFailedException) -> exit M12 (abnormal)
-
-#  127| [assertion success] call to method IsFalse
-#-----|  -> ...;
-
-#  127| [b (line 84): true] ...;
-#-----|  -> [b (line 84): true] access to local variable s
-
-#  127| [b (line 84): true] access to local variable s
-#-----|  -> [b (line 84): true] null
-
-#  127| [b (line 84): true] ... != ...
-#-----| true -> [true] ... || ...
-#-----| false -> [b (line 84): true] access to parameter b
-
-#  127| [false] ... || ...
-#-----| false -> [assertion success] call to method IsFalse
-
-#  127| [true] ... || ...
-#-----| true -> [assertion failure] call to method IsFalse
-
-#  127| [b (line 84): true] null
-#-----|  -> [b (line 84): true] ... != ...
-
-#  127| [false] !...
-#-----| false -> [false] ... || ...
-
-#  127| [b (line 84): true] access to parameter b
-#-----| true -> [false] !...
-
-#  128| call to method WriteLine
-#-----|  -> exit M12 (normal)
-
-#  128| ...;
-#-----|  -> access to local variable s
-
-#  128| access to local variable s
-#-----|  -> access to property Length
-
-#  128| access to property Length
-#-----|  -> call to method WriteLine
-
-#  131| enter AssertTrueFalse
-#-----|  -> {...}
-
-#  131| exit AssertTrueFalse
-
-#  131| exit AssertTrueFalse (normal)
-#-----|  -> exit AssertTrueFalse
-
-#  135| {...}
-#-----|  -> exit AssertTrueFalse (normal)
-
-#  138| enter M13
-#-----|  -> {...}
-
-#  138| exit M13
-
-#  138| exit M13 (abnormal)
-#-----|  -> exit M13
-
-#  138| exit M13 (normal)
-#-----|  -> exit M13
-
-#  139| {...}
-#-----|  -> ...;
-
-#  140| [assertion failure] call to method AssertTrueFalse
-#-----| exception(Exception) -> exit M13 (abnormal)
-
-#  140| [assertion failure] call to method AssertTrueFalse
-#-----| exception(Exception) -> exit M13 (abnormal)
-
-#  140| [assertion success] call to method AssertTrueFalse
-#-----|  -> return ...;
-
-#  140| this access
-#-----|  -> access to parameter b1
-
-#  140| ...;
-#-----|  -> this access
-
-#  140| access to parameter b1
-#-----| false -> [assertion failure] access to parameter b2
-#-----| true -> access to parameter b2
-
-#  140| [assertion failure] access to parameter b2
-#-----| false, true -> [assertion failure] access to parameter b3
-
-#  140| access to parameter b2
-#-----| false -> [assertion success] access to parameter b3
-#-----| true -> [assertion failure] access to parameter b3
-
-#  140| [assertion failure] access to parameter b3
-#-----|  -> [assertion failure] call to method AssertTrueFalse
-
-#  140| [assertion failure] access to parameter b3
-#-----|  -> [assertion failure] call to method AssertTrueFalse
-
-#  140| [assertion success] access to parameter b3
-#-----|  -> [assertion success] call to method AssertTrueFalse
-
-#  141| return ...;
-#-----| return -> exit M13 (normal)
-
-Assignments.cs:
-#    1| call to constructor Object
-#-----|  -> {...}
-
-#    1| enter Assignments
-#-----|  -> call to constructor Object
-
-#    1| exit Assignments
-
-#    1| exit Assignments (normal)
-#-----|  -> exit Assignments
-
-#    1| {...}
-#-----|  -> exit Assignments (normal)
-
-#    3| enter M
-#-----|  -> {...}
-
-#    3| exit M
-
-#    3| exit M (normal)
-#-----|  -> exit M
-
-#    4| {...}
-#-----|  -> ... ...;
-
-#    5| ... ...;
-#-----|  -> 0
-
-#    5| Int32 x = ...
-#-----|  -> ...;
-
-#    5| 0
-#-----|  -> Int32 x = ...
-
-#    6| access to local variable x
-#-----|  -> 1
-
-#    6| ... + ...
-#-----|  -> ... = ...
-
-#    6| ... = ...
-#-----|  -> ... ...;
-
-#    6| ...;
-#-----|  -> access to local variable x
-
-#    6| 1
-#-----|  -> ... + ...
-
-#    8| ... ...;
-#-----|  -> 0
-
-#    8| dynamic d = ...
-#-----|  -> ...;
-
-#    8| (...) ...
-#-----|  -> dynamic d = ...
-
-#    8| 0
-#-----|  -> (...) ...
-
-#    9| access to local variable d
-#-----|  -> 2
-
-#    9| ... = ...
-#-----|  -> ... ...;
-
-#    9| dynamic call to operator -
-#-----|  -> ... = ...
-
-#    9| ...;
-#-----|  -> access to local variable d
-
-#    9| 2
-#-----|  -> dynamic call to operator -
-
-#   11| ... ...;
-#-----|  -> object creation of type Assignments
-
-#   11| Assignments a = ...
-#-----|  -> ...;
-
-#   11| object creation of type Assignments
-#-----|  -> Assignments a = ...
-
-#   12| access to local variable a
-#-----|  -> this access
-
-#   12| ... = ...
-#-----|  -> ...;
-
-#   12| call to operator +
-#-----|  -> ... = ...
-
-#   12| ...;
-#-----|  -> access to local variable a
-
-#   12| this access
-#-----|  -> call to operator +
-
-#   14| access to event Event
-#-----|  -> ... += ...
-
-#   14| this access
-#-----|  -> (...) => ...
-
-#   14| ... += ...
-#-----|  -> exit M (normal)
-
-#   14| ...;
-#-----|  -> this access
-
-#   14| (...) => ...
-#-----|  -> access to event Event
-
-#   14| enter (...) => ...
-#-----|  -> {...}
-
-#   14| exit (...) => ...
-
-#   14| exit (...) => ... (normal)
-#-----|  -> exit (...) => ...
-
-#   14| {...}
-#-----|  -> exit (...) => ... (normal)
-
-#   17| enter +
-#-----|  -> {...}
-
-#   17| exit +
-
-#   17| exit + (normal)
-#-----|  -> exit +
-
-#   18| {...}
-#-----|  -> access to parameter x
-
-#   19| return ...;
-#-----| return -> exit + (normal)
-
-#   19| access to parameter x
-#-----|  -> return ...;
-
-BreakInTry.cs:
-#    1| call to constructor Object
-#-----|  -> {...}
-
-#    1| enter BreakInTry
-#-----|  -> call to constructor Object
-
-#    1| exit BreakInTry
-
-#    1| exit BreakInTry (normal)
-#-----|  -> exit BreakInTry
-
-#    1| {...}
-#-----|  -> exit BreakInTry (normal)
-
-#    3| enter M1
-#-----|  -> {...}
-
-#    3| exit M1
-
-#    3| exit M1 (normal)
-#-----|  -> exit M1
-
-#    4| {...}
-#-----|  -> try {...} ...
-
-#    5| try {...} ...
-#-----|  -> {...}
-
-#    6| {...}
-#-----|  -> access to parameter args
-
-#    7| foreach (... ... in ...) ...
-#-----| non-empty -> String arg
-#-----| empty -> {...}
-
-#    7| String arg
-#-----|  -> {...}
-
-#    7| access to parameter args
-#-----|  -> foreach (... ... in ...) ...
-
-#    8| {...}
-#-----|  -> if (...) ...
-
-#    9| if (...) ...
-#-----|  -> access to local variable arg
-
-#    9| access to local variable arg
-#-----|  -> null
-
-#    9| ... == ...
-#-----| false -> foreach (... ... in ...) ...
-#-----| true -> break;
-
-#    9| null
-#-----|  -> ... == ...
-
-#   10| break;
-#-----| break -> {...}
-
-#   14| {...}
-#-----|  -> if (...) ...
-
-#   15| if (...) ...
-#-----|  -> access to parameter args
-
-#   15| access to parameter args
-#-----|  -> null
-
-#   15| ... == ...
-#-----| false -> exit M1 (normal)
-#-----| true -> ;
-
-#   15| null
-#-----|  -> ... == ...
-
-#   16| ;
-#-----|  -> exit M1 (normal)
-
-#   20| enter M2
-#-----|  -> {...}
-
-#   20| exit M2
-
-#   20| exit M2 (normal)
-#-----|  -> exit M2
-
-#   21| {...}
-#-----|  -> access to parameter args
-
-#   22| foreach (... ... in ...) ...
-#-----| non-empty -> String arg
-#-----| empty -> ;
-
-#   22| String arg
-#-----|  -> {...}
-
-#   22| access to parameter args
-#-----|  -> foreach (... ... in ...) ...
-
-#   23| {...}
-#-----|  -> try {...} ...
-
-#   24| try {...} ...
-#-----|  -> {...}
-
-#   25| {...}
-#-----|  -> if (...) ...
-
-#   26| if (...) ...
-#-----|  -> access to local variable arg
-
-#   26| access to local variable arg
-#-----|  -> null
-
-#   26| ... == ...
-#-----| true -> break;
-#-----| false -> {...}
-
-#   26| null
-#-----|  -> ... == ...
-
-#   27| break;
-#-----| break -> [finally: break] {...}
-
-#   30| [finally: break] {...}
-#-----|  -> [finally: break] if (...) ...
-
-#   30| {...}
-#-----|  -> if (...) ...
-
-#   31| [finally: break] if (...) ...
-#-----|  -> [finally: break] access to parameter args
-
-#   31| if (...) ...
-#-----|  -> access to parameter args
-
-#   31| [finally: break] access to parameter args
-#-----|  -> [finally: break] null
-
-#   31| access to parameter args
-#-----|  -> null
-
-#   31| ... == ...
-#-----| false -> foreach (... ... in ...) ...
-#-----| true -> ;
-
-#   31| [finally: break] ... == ...
-#-----| true -> [finally: break] ;
-#-----| false -> ;
-
-#   31| [finally: break] null
-#-----|  -> [finally: break] ... == ...
-
-#   31| null
-#-----|  -> ... == ...
-
-#   32| ;
-#-----|  -> foreach (... ... in ...) ...
-
-#   32| [finally: break] ;
-#-----| break -> ;
-
-#   35| ;
-#-----|  -> exit M2 (normal)
-
-#   38| enter M3
-#-----|  -> {...}
-
-#   38| exit M3
-
-#   38| exit M3 (normal)
-#-----|  -> exit M3
-
-#   39| {...}
-#-----|  -> try {...} ...
-
-#   40| try {...} ...
-#-----|  -> {...}
-
-#   41| {...}
-#-----|  -> if (...) ...
-
-#   42| if (...) ...
-#-----|  -> access to parameter args
-
-#   42| access to parameter args
-#-----|  -> null
-
-#   42| ... == ...
-#-----| true -> return ...;
-#-----| false -> {...}
-
-#   42| null
-#-----|  -> ... == ...
-
-#   43| return ...;
-#-----| return -> [finally: return] {...}
-
-#   46| [finally: return] {...}
-#-----|  -> [finally: return] access to parameter args
-
-#   46| {...}
-#-----|  -> access to parameter args
-
-#   47| [finally: return] foreach (... ... in ...) ...
-#-----| return -> exit M3 (normal)
-#-----| non-empty -> [finally: return] String arg
-
-#   47| foreach (... ... in ...) ...
-#-----| non-empty -> String arg
-#-----| empty -> ;
-
-#   47| String arg
-#-----|  -> {...}
-
-#   47| [finally: return] String arg
-#-----|  -> [finally: return] {...}
-
-#   47| [finally: return] access to parameter args
-#-----|  -> [finally: return] foreach (... ... in ...) ...
-
-#   47| access to parameter args
-#-----|  -> foreach (... ... in ...) ...
-
-#   48| [finally: return] {...}
-#-----|  -> [finally: return] if (...) ...
-
-#   48| {...}
-#-----|  -> if (...) ...
-
-#   49| [finally: return] if (...) ...
-#-----|  -> [finally: return] access to local variable arg
-
-#   49| if (...) ...
-#-----|  -> access to local variable arg
-
-#   49| [finally: return] access to local variable arg
-#-----|  -> [finally: return] null
-
-#   49| access to local variable arg
-#-----|  -> null
-
-#   49| ... == ...
-#-----| false -> foreach (... ... in ...) ...
-#-----| true -> break;
-
-#   49| [finally: return] ... == ...
-#-----| false -> [finally: return] foreach (... ... in ...) ...
-#-----| true -> [finally: return] break;
-
-#   49| [finally: return] null
-#-----|  -> [finally: return] ... == ...
-
-#   49| null
-#-----|  -> ... == ...
-
-#   50| [finally: return] break;
-#-----| return -> exit M3 (normal)
-
-#   50| break;
-#-----| break -> ;
-
-#   53| ;
-#-----|  -> exit M3 (normal)
-
-#   56| enter M4
-#-----|  -> {...}
-
-#   56| exit M4
-
-#   56| exit M4 (normal)
-#-----|  -> exit M4
-
-#   57| {...}
-#-----|  -> try {...} ...
-
-#   58| try {...} ...
-#-----|  -> {...}
-
-#   59| {...}
-#-----|  -> if (...) ...
-
-#   60| if (...) ...
-#-----|  -> access to parameter args
-
-#   60| access to parameter args
-#-----|  -> null
-
-#   60| ... == ...
-#-----| true -> return ...;
-#-----| false -> {...}
-
-#   60| null
-#-----|  -> ... == ...
-
-#   61| return ...;
-#-----| return -> [finally: return] {...}
-
-#   64| [finally: return] {...}
-#-----|  -> [finally: return] access to parameter args
-
-#   64| {...}
-#-----|  -> access to parameter args
-
-#   65| [finally: return] foreach (... ... in ...) ...
-#-----| return -> exit M4 (normal)
-#-----| non-empty -> [finally: return] String arg
-
-#   65| foreach (... ... in ...) ...
-#-----| empty -> exit M4 (normal)
-#-----| non-empty -> String arg
-
-#   65| String arg
-#-----|  -> {...}
-
-#   65| [finally: return] String arg
-#-----|  -> [finally: return] {...}
-
-#   65| [finally: return] access to parameter args
-#-----|  -> [finally: return] foreach (... ... in ...) ...
-
-#   65| access to parameter args
-#-----|  -> foreach (... ... in ...) ...
-
-#   66| [finally: return] {...}
-#-----|  -> [finally: return] if (...) ...
-
-#   66| {...}
-#-----|  -> if (...) ...
-
-#   67| [finally: return] if (...) ...
-#-----|  -> [finally: return] access to local variable arg
-
-#   67| if (...) ...
-#-----|  -> access to local variable arg
-
-#   67| [finally: return] access to local variable arg
-#-----|  -> [finally: return] null
-
-#   67| access to local variable arg
-#-----|  -> null
-
-#   67| ... == ...
-#-----| false -> foreach (... ... in ...) ...
-#-----| true -> break;
-
-#   67| [finally: return] ... == ...
-#-----| false -> [finally: return] foreach (... ... in ...) ...
-#-----| true -> [finally: return] break;
-
-#   67| [finally: return] null
-#-----|  -> [finally: return] ... == ...
-
-#   67| null
-#-----|  -> ... == ...
-
-#   68| [finally: return] break;
-#-----| return -> exit M4 (normal)
-
-#   68| break;
-#-----| break -> exit M4 (normal)
-
-CompileTimeOperators.cs:
-#    3| call to constructor Object
-#-----|  -> {...}
-
-#    3| enter CompileTimeOperators
-#-----|  -> call to constructor Object
-
-#    3| exit CompileTimeOperators
-
-#    3| exit CompileTimeOperators (normal)
-#-----|  -> exit CompileTimeOperators
-
-#    3| {...}
-#-----|  -> exit CompileTimeOperators (normal)
-
-#    5| enter Default
-#-----|  -> {...}
-
-#    5| exit Default
-
-#    5| exit Default (normal)
-#-----|  -> exit Default
-
-#    6| {...}
-#-----|  -> default(...)
-
-#    7| return ...;
-#-----| return -> exit Default (normal)
-
-#    7| default(...)
-#-----|  -> return ...;
-
-#   10| enter Sizeof
-#-----|  -> {...}
-
-#   10| exit Sizeof
-
-#   10| exit Sizeof (normal)
-#-----|  -> exit Sizeof
-
-#   11| {...}
-#-----|  -> sizeof(..)
-
-#   12| return ...;
-#-----| return -> exit Sizeof (normal)
-
-#   12| sizeof(..)
-#-----|  -> return ...;
-
-#   15| enter Typeof
-#-----|  -> {...}
-
-#   15| exit Typeof
-
-#   15| exit Typeof (normal)
-#-----|  -> exit Typeof
-
-#   16| {...}
-#-----|  -> typeof(...)
-
-#   17| return ...;
-#-----| return -> exit Typeof (normal)
-
-#   17| typeof(...)
-#-----|  -> return ...;
-
-#   20| enter Nameof
-#-----|  -> {...}
-
-#   20| exit Nameof
-
-#   20| exit Nameof (normal)
-#-----|  -> exit Nameof
-
-#   21| {...}
-#-----|  -> nameof(...)
-
-#   22| return ...;
-#-----| return -> exit Nameof (normal)
-
-#   22| nameof(...)
-#-----|  -> return ...;
-
-#   26| call to constructor Object
-#-----|  -> {...}
-
-#   26| enter GotoInTryFinally
-#-----|  -> call to constructor Object
-
-#   26| exit GotoInTryFinally
-
-#   26| exit GotoInTryFinally (normal)
-#-----|  -> exit GotoInTryFinally
-
-#   26| {...}
-#-----|  -> exit GotoInTryFinally (normal)
-
-#   28| enter M
-#-----|  -> {...}
-
-#   28| exit M
-
-#   28| exit M (normal)
-#-----|  -> exit M
-
-#   29| {...}
-#-----|  -> try {...} ...
-
-#   30| try {...} ...
-#-----|  -> {...}
-
-#   31| {...}
-#-----|  -> goto ...;
-
-#   32| goto ...;
-#-----| goto(End) -> [finally: goto(End)] {...}
-
-#   36| [finally: goto(End)] {...}
-#-----|  -> [finally: goto(End)] ...;
-
-#   37| [finally: goto(End)] call to method WriteLine
-#-----| goto(End) -> End:
-
-#   37| [finally: goto(End)] ...;
-#-----|  -> [finally: goto(End)] "Finally"
-
-#   37| [finally: goto(End)] "Finally"
-#-----|  -> [finally: goto(End)] call to method WriteLine
-
-#   40| End:
-#-----|  -> ...;
-
-#   40| call to method WriteLine
-#-----|  -> exit M (normal)
-
-#   40| ...;
-#-----|  -> "End"
-
-#   40| "End"
-#-----|  -> call to method WriteLine
-
-ConditionalAccess.cs:
-#    1| call to constructor Object
-#-----|  -> {...}
-
-#    1| enter ConditionalAccess
-#-----|  -> call to constructor Object
-
-#    1| exit ConditionalAccess
-
-#    1| exit ConditionalAccess (normal)
-#-----|  -> exit ConditionalAccess
-
-#    1| {...}
-#-----|  -> exit ConditionalAccess (normal)
-
-#    3| enter M1
-#-----|  -> access to parameter i
-
-#    3| exit M1
-
-#    3| exit M1 (normal)
-#-----|  -> exit M1
-
-#    3| access to parameter i
-#-----| null -> exit M1 (normal)
-#-----| non-null -> call to method ToString
-
-#    3| call to method ToString
-#-----| null -> exit M1 (normal)
-#-----| non-null -> call to method ToLower
-
-#    3| call to method ToLower
-#-----|  -> exit M1 (normal)
-
-#    5| enter M2
-#-----|  -> access to parameter s
-
-#    5| exit M2
-
-#    5| exit M2 (normal)
-#-----|  -> exit M2
-
-#    5| access to parameter s
-#-----| null -> exit M2 (normal)
-#-----| non-null -> access to property Length
-
-#    5| access to property Length
-#-----|  -> exit M2 (normal)
-
-#    7| enter M3
-#-----|  -> access to parameter s1
-
-#    7| exit M3
-
-#    7| exit M3 (normal)
-#-----|  -> exit M3
-
-#    7| access to property Length
-#-----|  -> exit M3 (normal)
-
-#    7| access to parameter s1
-#-----| non-null -> ... ?? ...
-#-----| null -> access to parameter s2
-
-#    7| ... ?? ...
-#-----| null -> exit M3 (normal)
-#-----| non-null -> access to property Length
-
-#    7| [non-null] ... ?? ...
-#-----| non-null -> access to property Length
-
-#    7| [null] ... ?? ...
-#-----| null -> exit M3 (normal)
-
-#    7| access to parameter s2
-#-----| non-null -> [non-null] ... ?? ...
-#-----| null -> [null] ... ?? ...
-
-#    9| enter M4
-#-----|  -> access to parameter s
-
-#    9| exit M4
-
-#    9| exit M4 (normal)
-#-----|  -> exit M4
-
-#    9| access to parameter s
-#-----| non-null -> access to property Length
-#-----| null -> 0
-
-#    9| access to property Length
-#-----| non-null -> ... ?? ...
-#-----| null -> 0
-
-#    9| ... ?? ...
-#-----|  -> exit M4 (normal)
-
-#    9| 0
-#-----|  -> ... ?? ...
-
-#   11| enter M5
-#-----|  -> {...}
-
-#   11| exit M5
-
-#   11| exit M5 (normal)
-#-----|  -> exit M5
-
-#   12| {...}
-#-----|  -> if (...) ...
-
-#   13| if (...) ...
-#-----|  -> access to parameter s
-
-#   13| access to parameter s
-#-----| non-null -> access to property Length
-#-----| null -> 0
-
-#   13| access to property Length
-#-----|  -> 0
-
-#   13| ... > ...
-#-----| true -> 0
-#-----| false -> 1
-
-#   13| (...) ...
-#-----|  -> ... > ...
-
-#   13| 0
-#-----|  -> (...) ...
-
-#   14| return ...;
-#-----| return -> exit M5 (normal)
-
-#   14| 0
-#-----|  -> return ...;
-
-#   16| return ...;
-#-----| return -> exit M5 (normal)
-
-#   16| 1
-#-----|  -> return ...;
-
-#   19| enter M6
-#-----|  -> access to parameter s1
-
-#   19| exit M6
-
-#   19| exit M6 (normal)
-#-----|  -> exit M6
-
-#   19| access to parameter s1
-#-----| null -> exit M6 (normal)
-#-----| non-null -> access to parameter s2
-
-#   19| call to method CommaJoinWith
-#-----|  -> exit M6 (normal)
-
-#   19| access to parameter s2
-#-----|  -> call to method CommaJoinWith
-
-#   21| enter M7
-#-----|  -> {...}
-
-#   21| exit M7
-
-#   21| exit M7 (normal)
-#-----|  -> exit M7
-
-#   22| {...}
-#-----|  -> ... ...;
-
-#   23| ... ...;
-#-----|  -> null
-
-#   23| Nullable<Int32> j = ...
-#-----|  -> ... ...;
-
-#   23| (...) ...
-#-----| null -> Nullable<Int32> j = ...
-
-#   23| null
-#-----|  -> (...) ...
-
-#   24| ... ...;
-#-----|  -> access to parameter i
-
-#   24| String s = ...
-#-----|  -> ...;
-
-#   24| call to method ToString
-#-----|  -> String s = ...
-
-#   24| (...) ...
-#-----| non-null -> call to method ToString
-
-#   24| access to parameter i
-#-----|  -> (...) ...
-
-#   25| ... = ...
-#-----|  -> exit M7 (normal)
-
-#   25| ...;
-#-----|  -> ""
-
-#   25| ""
-#-----| non-null -> access to local variable s
-
-#   25| call to method CommaJoinWith
-#-----|  -> ... = ...
-
-#   25| access to local variable s
-#-----|  -> call to method CommaJoinWith
-
-#   30| enter Out
-#-----|  -> 0
-
-#   30| exit Out
-
-#   30| exit Out (normal)
-#-----|  -> exit Out
-
-#   30| ... = ...
-#-----|  -> exit Out (normal)
-
-#   30| 0
-#-----|  -> ... = ...
-
-#   32| enter M8
-#-----|  -> {...}
-
-#   32| exit M8
-
-#   32| exit M8 (normal)
-#-----|  -> exit M8
-
-#   33| {...}
-#-----|  -> ...;
-
-#   34| ... = ...
-#-----|  -> ...;
-
-#   34| ...;
-#-----|  -> 0
-
-#   34| 0
-#-----|  -> ... = ...
-
-#   35| access to property Prop
-#-----| null -> exit M8 (normal)
-#-----| non-null -> call to method Out
-
-#   35| this access
-#-----|  -> access to property Prop
-
-#   35| call to method Out
-#-----|  -> exit M8 (normal)
-
-#   35| ...;
-#-----|  -> this access
-
-#   41| enter CommaJoinWith
-#-----|  -> access to parameter s1
-
-#   41| exit CommaJoinWith
-
-#   41| exit CommaJoinWith (normal)
-#-----|  -> exit CommaJoinWith
-
-#   41| access to parameter s1
-#-----|  -> ", "
-
-#   41| ... + ...
-#-----|  -> access to parameter s2
-
-#   41| ... + ...
-#-----|  -> exit CommaJoinWith (normal)
-
-#   41| ", "
-#-----|  -> ... + ...
-
-#   41| access to parameter s2
-#-----|  -> ... + ...
-
-Conditions.cs:
-#    1| call to constructor Object
-#-----|  -> {...}
-
-#    1| enter Conditions
-#-----|  -> call to constructor Object
-
-#    1| exit Conditions
-
-#    1| exit Conditions (normal)
-#-----|  -> exit Conditions
-
-#    1| {...}
-#-----|  -> exit Conditions (normal)
-
-#    3| enter IncrOrDecr
-#-----|  -> {...}
-
-#    3| exit IncrOrDecr
-
-#    3| exit IncrOrDecr (normal)
-#-----|  -> exit IncrOrDecr
-
-#    4| {...}
-#-----|  -> if (...) ...
-
-#    5| if (...) ...
-#-----|  -> access to parameter inc
-
-#    5| access to parameter inc
-#-----| true -> [inc (line 3): true] ...;
-#-----| false -> [inc (line 3): false] if (...) ...
-
-#    6| [inc (line 3): true] access to parameter x
-#-----|  -> [inc (line 3): true] ...++
-
-#    6| [inc (line 3): true] ...++
-#-----|  -> [inc (line 3): true] if (...) ...
-
-#    6| [inc (line 3): true] ...;
-#-----|  -> [inc (line 3): true] access to parameter x
-
-#    7| [inc (line 3): false] if (...) ...
-#-----|  -> [inc (line 3): false] access to parameter inc
-
-#    7| [inc (line 3): true] if (...) ...
-#-----|  -> [inc (line 3): true] access to parameter inc
-
-#    7| [false] !...
-#-----| false -> exit IncrOrDecr (normal)
-
-#    7| [true] !...
-#-----| true -> ...;
-
-#    7| [inc (line 3): false] access to parameter inc
-#-----| false -> [true] !...
-
-#    7| [inc (line 3): true] access to parameter inc
-#-----| true -> [false] !...
-
-#    8| access to parameter x
-#-----|  -> ...--
-
-#    8| ...--
-#-----|  -> exit IncrOrDecr (normal)
-
-#    8| ...;
-#-----|  -> access to parameter x
-
-#   11| enter M1
-#-----|  -> {...}
-
-#   11| exit M1
-
-#   11| exit M1 (normal)
-#-----|  -> exit M1
-
-#   12| {...}
-#-----|  -> ... ...;
-
-#   13| ... ...;
-#-----|  -> 0
-
-#   13| Int32 x = ...
-#-----|  -> if (...) ...
-
-#   13| 0
-#-----|  -> Int32 x = ...
-
-#   14| if (...) ...
-#-----|  -> access to parameter b
-
-#   14| access to parameter b
-#-----| true -> [b (line 11): true] ...;
-#-----| false -> [b (line 11): false] if (...) ...
-
-#   15| [b (line 11): true] access to local variable x
-#-----|  -> [b (line 11): true] ...++
-
-#   15| [b (line 11): true] ...++
-#-----|  -> [b (line 11): true] if (...) ...
-
-#   15| [b (line 11): true] ...;
-#-----|  -> [b (line 11): true] access to local variable x
-
-#   16| [b (line 11): false] if (...) ...
-#-----|  -> [b (line 11): false] access to local variable x
-
-#   16| [b (line 11): true] if (...) ...
-#-----|  -> [b (line 11): true] access to local variable x
-
-#   16| [b (line 11): false] access to local variable x
-#-----|  -> [b (line 11): false] 0
-
-#   16| [b (line 11): true] access to local variable x
-#-----|  -> [b (line 11): true] 0
-
-#   16| [b (line 11): false] ... > ...
-#-----| true -> [b (line 11): false] if (...) ...
-#-----| false -> access to local variable x
-
-#   16| [b (line 11): true] ... > ...
-#-----| true -> [b (line 11): true] if (...) ...
-#-----| false -> access to local variable x
-
-#   16| [b (line 11): false] 0
-#-----|  -> [b (line 11): false] ... > ...
-
-#   16| [b (line 11): true] 0
-#-----|  -> [b (line 11): true] ... > ...
-
-#   17| [b (line 11): false] if (...) ...
-#-----|  -> [b (line 11): false] access to parameter b
-
-#   17| [b (line 11): true] if (...) ...
-#-----|  -> [b (line 11): true] access to parameter b
-
-#   17| [false] !...
-#-----| false -> access to local variable x
-
-#   17| [true] !...
-#-----| true -> ...;
-
-#   17| [b (line 11): false] access to parameter b
-#-----| false -> [true] !...
-
-#   17| [b (line 11): true] access to parameter b
-#-----| true -> [false] !...
-
-#   18| access to local variable x
-#-----|  -> ...--
-
-#   18| ...--
-#-----|  -> access to local variable x
-
-#   18| ...;
-#-----|  -> access to local variable x
-
-#   19| return ...;
-#-----| return -> exit M1 (normal)
-
-#   19| access to local variable x
-#-----|  -> return ...;
-
-#   22| enter M2
-#-----|  -> {...}
-
-#   22| exit M2
-
-#   22| exit M2 (normal)
-#-----|  -> exit M2
-
-#   23| {...}
-#-----|  -> ... ...;
-
-#   24| ... ...;
-#-----|  -> 0
-
-#   24| Int32 x = ...
-#-----|  -> if (...) ...
-
-#   24| 0
-#-----|  -> Int32 x = ...
-
-#   25| if (...) ...
-#-----|  -> access to parameter b1
-
-#   25| access to parameter b1
-#-----| true -> if (...) ...
-#-----| false -> if (...) ...
-
-#   26| if (...) ...
-#-----|  -> access to parameter b2
-
-#   26| access to parameter b2
-#-----| true -> [b2 (line 22): true] ...;
-#-----| false -> [b2 (line 22): false] if (...) ...
-
-#   27| [b2 (line 22): true] access to local variable x
-#-----|  -> [b2 (line 22): true] ...++
-
-#   27| [b2 (line 22): true] ...++
-#-----|  -> [b2 (line 22): true] if (...) ...
-
-#   27| [b2 (line 22): true] ...;
-#-----|  -> [b2 (line 22): true] access to local variable x
-
-#   28| [b2 (line 22): false] if (...) ...
-#-----|  -> [b2 (line 22): false] access to parameter b2
-
-#   28| [b2 (line 22): true] if (...) ...
-#-----|  -> [b2 (line 22): true] access to parameter b2
-
-#   28| if (...) ...
-#-----|  -> access to parameter b2
-
-#   28| [b2 (line 22): false] access to parameter b2
-#-----| false -> access to local variable x
-
-#   28| [b2 (line 22): true] access to parameter b2
-#-----| true -> ...;
-
-#   28| access to parameter b2
-#-----| true -> ...;
-#-----| false -> access to local variable x
-
-#   29| access to local variable x
-#-----|  -> ...++
-
-#   29| ...++
-#-----|  -> access to local variable x
-
-#   29| ...;
-#-----|  -> access to local variable x
-
-#   30| return ...;
-#-----| return -> exit M2 (normal)
-
-#   30| access to local variable x
-#-----|  -> return ...;
-
-#   33| enter M3
-#-----|  -> {...}
-
-#   33| exit M3
-
-#   33| exit M3 (normal)
-#-----|  -> exit M3
-
-#   34| {...}
-#-----|  -> ... ...;
-
-#   35| ... ...;
-#-----|  -> 0
-
-#   35| Int32 x = ...
-#-----|  -> ... ...;
-
-#   35| 0
-#-----|  -> Int32 x = ...
-
-#   36| ... ...;
-#-----|  -> false
-
-#   36| Boolean b2 = ...
-#-----|  -> if (...) ...
-
-#   36| false
-#-----|  -> Boolean b2 = ...
-
-#   37| if (...) ...
-#-----|  -> access to parameter b1
-
-#   37| access to parameter b1
-#-----| true -> ...;
-#-----| false -> if (...) ...
-
-#   38| ... = ...
-#-----|  -> if (...) ...
-
-#   38| ...;
-#-----|  -> access to parameter b1
-
-#   38| access to parameter b1
-#-----|  -> ... = ...
-
-#   39| if (...) ...
-#-----|  -> access to local variable b2
-
-#   39| access to local variable b2
-#-----| true -> [b2 (line 39): true] ...;
-#-----| false -> [b2 (line 39): false] if (...) ...
-
-#   40| [b2 (line 39): true] access to local variable x
-#-----|  -> [b2 (line 39): true] ...++
-
-#   40| [b2 (line 39): true] ...++
-#-----|  -> [b2 (line 39): true] if (...) ...
-
-#   40| [b2 (line 39): true] ...;
-#-----|  -> [b2 (line 39): true] access to local variable x
-
-#   41| [b2 (line 39): false] if (...) ...
-#-----|  -> [b2 (line 39): false] access to local variable b2
-
-#   41| [b2 (line 39): true] if (...) ...
-#-----|  -> [b2 (line 39): true] access to local variable b2
-
-#   41| [b2 (line 39): false] access to local variable b2
-#-----| false -> access to local variable x
-
-#   41| [b2 (line 39): true] access to local variable b2
-#-----| true -> ...;
-
-#   42| access to local variable x
-#-----|  -> ...++
-
-#   42| ...++
-#-----|  -> access to local variable x
-
-#   42| ...;
-#-----|  -> access to local variable x
-
-#   43| return ...;
-#-----| return -> exit M3 (normal)
-
-#   43| access to local variable x
-#-----|  -> return ...;
-
-#   46| enter M4
-#-----|  -> {...}
-
-#   46| exit M4
-
-#   46| exit M4 (normal)
-#-----|  -> exit M4
-
-#   47| {...}
-#-----|  -> ... ...;
-
-#   48| ... ...;
-#-----|  -> 0
-
-#   48| Int32 y = ...
-#-----|  -> while (...) ...
-
-#   48| 0
-#-----|  -> Int32 y = ...
-
-#   49| while (...) ...
-#-----|  -> access to parameter x
-
-#   49| [b (line 46): false] access to parameter x
-#-----|  -> [b (line 46): false] ...--
-
-#   49| [b (line 46): true] access to parameter x
-#-----|  -> [b (line 46): true] ...--
-
-#   49| access to parameter x
-#-----|  -> ...--
-
-#   49| ...--
-#-----|  -> 0
-
-#   49| [b (line 46): false] ...--
-#-----|  -> [b (line 46): false] 0
-
-#   49| [b (line 46): true] ...--
-#-----|  -> [b (line 46): true] 0
-
-#   49| ... > ...
-#-----| true -> {...}
-#-----| false -> access to local variable y
-
-#   49| [b (line 46): false] ... > ...
-#-----| true -> [b (line 46): false] {...}
-#-----| false -> access to local variable y
-
-#   49| [b (line 46): true] ... > ...
-#-----| true -> [b (line 46): true] {...}
-#-----| false -> access to local variable y
-
-#   49| 0
-#-----|  -> ... > ...
-
-#   49| [b (line 46): false] 0
-#-----|  -> [b (line 46): false] ... > ...
-
-#   49| [b (line 46): true] 0
-#-----|  -> [b (line 46): true] ... > ...
-
-#   50| [b (line 46): false] {...}
-#-----|  -> [b (line 46): false] if (...) ...
-
-#   50| [b (line 46): true] {...}
-#-----|  -> [b (line 46): true] if (...) ...
-
-#   50| {...}
-#-----|  -> if (...) ...
-
-#   51| [b (line 46): false] if (...) ...
-#-----|  -> [b (line 46): false] access to parameter b
-
-#   51| [b (line 46): true] if (...) ...
-#-----|  -> [b (line 46): true] access to parameter b
-
-#   51| if (...) ...
-#-----|  -> access to parameter b
-
-#   51| [b (line 46): false] access to parameter b
-#-----| false -> [b (line 46): false] access to parameter x
-
-#   51| [b (line 46): true] access to parameter b
-#-----| true -> [b (line 46): true] ...;
-
-#   51| access to parameter b
-#-----| false -> [b (line 46): false] access to parameter x
-#-----| true -> [b (line 46): true] ...;
-
-#   52| [b (line 46): true] access to local variable y
-#-----|  -> [b (line 46): true] ...++
-
-#   52| [b (line 46): true] ...++
-#-----|  -> [b (line 46): true] access to parameter x
-
-#   52| [b (line 46): true] ...;
-#-----|  -> [b (line 46): true] access to local variable y
-
-#   54| return ...;
-#-----| return -> exit M4 (normal)
-
-#   54| access to local variable y
-#-----|  -> return ...;
-
-#   57| enter M5
-#-----|  -> {...}
-
-#   57| exit M5
-
-#   57| exit M5 (normal)
-#-----|  -> exit M5
-
-#   58| {...}
-#-----|  -> ... ...;
-
-#   59| ... ...;
-#-----|  -> 0
-
-#   59| Int32 y = ...
-#-----|  -> while (...) ...
-
-#   59| 0
-#-----|  -> Int32 y = ...
-
-#   60| while (...) ...
-#-----|  -> access to parameter x
-
-#   60| [b (line 57): false] access to parameter x
-#-----|  -> [b (line 57): false] ...--
-
-#   60| [b (line 57): true] access to parameter x
-#-----|  -> [b (line 57): true] ...--
-
-#   60| access to parameter x
-#-----|  -> ...--
-
-#   60| ...--
-#-----|  -> 0
-
-#   60| [b (line 57): false] ...--
-#-----|  -> [b (line 57): false] 0
-
-#   60| [b (line 57): true] ...--
-#-----|  -> [b (line 57): true] 0
-
-#   60| ... > ...
-#-----| true -> {...}
-#-----| false -> if (...) ...
-
-#   60| [b (line 57): false] ... > ...
-#-----| true -> [b (line 57): false] {...}
-#-----| false -> [b (line 57): false] if (...) ...
-
-#   60| [b (line 57): true] ... > ...
-#-----| true -> [b (line 57): true] {...}
-#-----| false -> [b (line 57): true] if (...) ...
-
-#   60| 0
-#-----|  -> ... > ...
-
-#   60| [b (line 57): false] 0
-#-----|  -> [b (line 57): false] ... > ...
-
-#   60| [b (line 57): true] 0
-#-----|  -> [b (line 57): true] ... > ...
-
-#   61| [b (line 57): false] {...}
-#-----|  -> [b (line 57): false] if (...) ...
-
-#   61| [b (line 57): true] {...}
-#-----|  -> [b (line 57): true] if (...) ...
-
-#   61| {...}
-#-----|  -> if (...) ...
-
-#   62| [b (line 57): false] if (...) ...
-#-----|  -> [b (line 57): false] access to parameter b
-
-#   62| [b (line 57): true] if (...) ...
-#-----|  -> [b (line 57): true] access to parameter b
-
-#   62| if (...) ...
-#-----|  -> access to parameter b
-
-#   62| [b (line 57): false] access to parameter b
-#-----| false -> [b (line 57): false] access to parameter x
-
-#   62| [b (line 57): true] access to parameter b
-#-----| true -> [b (line 57): true] ...;
-
-#   62| access to parameter b
-#-----| false -> [b (line 57): false] access to parameter x
-#-----| true -> [b (line 57): true] ...;
-
-#   63| [b (line 57): true] access to local variable y
-#-----|  -> [b (line 57): true] ...++
-
-#   63| [b (line 57): true] ...++
-#-----|  -> [b (line 57): true] access to parameter x
-
-#   63| [b (line 57): true] ...;
-#-----|  -> [b (line 57): true] access to local variable y
-
-#   65| [b (line 57): false] if (...) ...
-#-----|  -> [b (line 57): false] access to parameter b
-
-#   65| [b (line 57): true] if (...) ...
-#-----|  -> [b (line 57): true] access to parameter b
-
-#   65| if (...) ...
-#-----|  -> access to parameter b
-
-#   65| [b (line 57): false] access to parameter b
-#-----| false -> access to local variable y
-
-#   65| [b (line 57): true] access to parameter b
-#-----| true -> ...;
-
-#   65| access to parameter b
-#-----| true -> ...;
-#-----| false -> access to local variable y
-
-#   66| access to local variable y
-#-----|  -> ...++
-
-#   66| ...++
-#-----|  -> access to local variable y
-
-#   66| ...;
-#-----|  -> access to local variable y
-
-#   67| return ...;
-#-----| return -> exit M5 (normal)
-
-#   67| access to local variable y
-#-----|  -> return ...;
-
-#   70| enter M6
-#-----|  -> {...}
-
-#   70| exit M6
-
-#   70| exit M6 (normal)
-#-----|  -> exit M6
-
-#   71| {...}
-#-----|  -> ... ...;
-
-#   72| ... ...;
-#-----|  -> access to parameter ss
-
-#   72| Boolean b = ...
-#-----|  -> ... ...;
-
-#   72| access to parameter ss
-#-----|  -> access to property Length
-
-#   72| access to property Length
-#-----|  -> 0
-
-#   72| ... > ...
-#-----|  -> Boolean b = ...
-
-#   72| 0
-#-----|  -> ... > ...
-
-#   73| ... ...;
-#-----|  -> 0
-
-#   73| Int32 x = ...
-#-----|  -> access to parameter ss
-
-#   73| 0
-#-----|  -> Int32 x = ...
-
-#   74| foreach (... ... in ...) ...
-#-----| non-empty -> String _
-#-----| empty -> if (...) ...
-
-#   74| String _
-#-----|  -> {...}
-
-#   74| access to parameter ss
-#-----|  -> foreach (... ... in ...) ...
-
-#   75| {...}
-#-----|  -> if (...) ...
-
-#   76| if (...) ...
-#-----|  -> access to local variable b
-
-#   76| access to local variable b
-#-----| true -> ...;
-#-----| false -> if (...) ...
-
-#   77| access to local variable x
-#-----|  -> ...++
-
-#   77| ...++
-#-----|  -> if (...) ...
-
-#   77| ...;
-#-----|  -> access to local variable x
-
-#   78| if (...) ...
-#-----|  -> access to local variable x
-
-#   78| access to local variable x
-#-----|  -> 0
-
-#   78| ... > ...
-#-----| false -> foreach (... ... in ...) ...
-#-----| true -> ...;
-
-#   78| 0
-#-----|  -> ... > ...
-
-#   79| ... = ...
-#-----|  -> foreach (... ... in ...) ...
-
-#   79| ...;
-#-----|  -> false
-
-#   79| false
-#-----|  -> ... = ...
-
-#   81| if (...) ...
-#-----|  -> access to local variable b
-
-#   81| access to local variable b
-#-----| true -> ...;
-#-----| false -> access to local variable x
-
-#   82| access to local variable x
-#-----|  -> ...++
-
-#   82| ...++
-#-----|  -> access to local variable x
-
-#   82| ...;
-#-----|  -> access to local variable x
-
-#   83| return ...;
-#-----| return -> exit M6 (normal)
-
-#   83| access to local variable x
-#-----|  -> return ...;
-
-#   86| enter M7
-#-----|  -> {...}
-
-#   86| exit M7
-
-#   86| exit M7 (normal)
-#-----|  -> exit M7
-
-#   87| {...}
-#-----|  -> ... ...;
-
-#   88| ... ...;
-#-----|  -> access to parameter ss
-
-#   88| Boolean b = ...
-#-----|  -> ... ...;
-
-#   88| access to parameter ss
-#-----|  -> access to property Length
-
-#   88| access to property Length
-#-----|  -> 0
-
-#   88| ... > ...
-#-----|  -> Boolean b = ...
-
-#   88| 0
-#-----|  -> ... > ...
-
-#   89| ... ...;
-#-----|  -> 0
-
-#   89| Int32 x = ...
-#-----|  -> access to parameter ss
-
-#   89| 0
-#-----|  -> Int32 x = ...
-
-#   90| foreach (... ... in ...) ...
-#-----| non-empty -> String _
-#-----| empty -> access to local variable x
-
-#   90| String _
-#-----|  -> {...}
-
-#   90| access to parameter ss
-#-----|  -> foreach (... ... in ...) ...
-
-#   91| {...}
-#-----|  -> if (...) ...
-
-#   92| if (...) ...
-#-----|  -> access to local variable b
-
-#   92| access to local variable b
-#-----| true -> ...;
-#-----| false -> if (...) ...
-
-#   93| access to local variable x
-#-----|  -> ...++
-
-#   93| ...++
-#-----|  -> if (...) ...
-
-#   93| ...;
-#-----|  -> access to local variable x
-
-#   94| if (...) ...
-#-----|  -> access to local variable x
-
-#   94| access to local variable x
-#-----|  -> 0
-
-#   94| ... > ...
-#-----| true -> ...;
-#-----| false -> if (...) ...
-
-#   94| 0
-#-----|  -> ... > ...
-
-#   95| ... = ...
-#-----|  -> if (...) ...
-
-#   95| ...;
-#-----|  -> false
-
-#   95| false
-#-----|  -> ... = ...
-
-#   96| if (...) ...
-#-----|  -> access to local variable b
-
-#   96| access to local variable b
-#-----| false -> foreach (... ... in ...) ...
-#-----| true -> ...;
-
-#   97| access to local variable x
-#-----|  -> ...++
-
-#   97| ...++
-#-----|  -> foreach (... ... in ...) ...
-
-#   97| ...;
-#-----|  -> access to local variable x
-
-#   99| return ...;
-#-----| return -> exit M7 (normal)
-
-#   99| access to local variable x
-#-----|  -> return ...;
-
-#  102| enter M8
-#-----|  -> {...}
-
-#  102| exit M8
-
-#  102| exit M8 (normal)
-#-----|  -> exit M8
-
-#  103| {...}
-#-----|  -> ... ...;
-
-#  104| ... ...;
-#-----|  -> access to parameter b
-
-#  104| String x = ...
-#-----|  -> if (...) ...
-
-#  104| access to parameter b
-#-----|  -> call to method ToString
-
-#  104| call to method ToString
-#-----|  -> String x = ...
-
-#  105| if (...) ...
-#-----|  -> access to parameter b
-
-#  105| access to parameter b
-#-----| true -> [b (line 102): true] ...;
-#-----| false -> [b (line 102): false] if (...) ...
-
-#  106| [b (line 102): true] access to local variable x
-#-----|  -> [b (line 102): true] ""
-
-#  106| [b (line 102): true] ... + ...
-#-----|  -> [b (line 102): true] ... = ...
-
-#  106| [b (line 102): true] ... = ...
-#-----|  -> [b (line 102): true] if (...) ...
-
-#  106| [b (line 102): true] ...;
-#-----|  -> [b (line 102): true] access to local variable x
-
-#  106| [b (line 102): true] ""
-#-----|  -> [b (line 102): true] ... + ...
-
-#  107| [b (line 102): false] if (...) ...
-#-----|  -> [b (line 102): false] access to local variable x
-
-#  107| [b (line 102): true] if (...) ...
-#-----|  -> [b (line 102): true] access to local variable x
-
-#  107| [b (line 102): false] access to local variable x
-#-----|  -> [b (line 102): false] access to property Length
-
-#  107| [b (line 102): true] access to local variable x
-#-----|  -> [b (line 102): true] access to property Length
-
-#  107| [b (line 102): false] access to property Length
-#-----|  -> [b (line 102): false] 0
-
-#  107| [b (line 102): true] access to property Length
-#-----|  -> [b (line 102): true] 0
-
-#  107| [b (line 102): false] ... > ...
-#-----| true -> [b (line 102): false] if (...) ...
-#-----| false -> access to local variable x
-
-#  107| [b (line 102): true] ... > ...
-#-----| true -> [b (line 102): true] if (...) ...
-#-----| false -> access to local variable x
-
-#  107| [b (line 102): false] 0
-#-----|  -> [b (line 102): false] ... > ...
-
-#  107| [b (line 102): true] 0
-#-----|  -> [b (line 102): true] ... > ...
-
-#  108| [b (line 102): false] if (...) ...
-#-----|  -> [b (line 102): false] access to parameter b
-
-#  108| [b (line 102): true] if (...) ...
-#-----|  -> [b (line 102): true] access to parameter b
-
-#  108| [false] !...
-#-----| false -> access to local variable x
-
-#  108| [true] !...
-#-----| true -> ...;
-
-#  108| [b (line 102): false] access to parameter b
-#-----| false -> [true] !...
-
-#  108| [b (line 102): true] access to parameter b
-#-----| true -> [false] !...
-
-#  109| access to local variable x
-#-----|  -> ""
-
-#  109| ... + ...
-#-----|  -> ... = ...
-
-#  109| ... = ...
-#-----|  -> access to local variable x
-
-#  109| ...;
-#-----|  -> access to local variable x
-
-#  109| ""
-#-----|  -> ... + ...
-
-#  110| return ...;
-#-----| return -> exit M8 (normal)
-
-#  110| access to local variable x
-#-----|  -> return ...;
-
-#  113| enter M9
-#-----|  -> {...}
-
-#  113| exit M9
-
-#  113| exit M9 (normal)
-#-----|  -> exit M9
-
-#  114| {...}
-#-----|  -> ... ...;
-
-#  115| ... ...;
-#-----|  -> null
-
-#  115| String s = ...
-#-----|  -> for (...;...;...) ...
-
-#  115| null
-#-----|  -> String s = ...
-
-#  116| for (...;...;...) ...
-#-----|  -> 0
-
-#  116| Int32 i = ...
-#-----|  -> access to local variable i
-
-#  116| 0
-#-----|  -> Int32 i = ...
-
-#  116| access to local variable i
-#-----|  -> access to parameter args
-
-#  116| ... < ...
-#-----| false -> exit M9 (normal)
-#-----| true -> {...}
-
-#  116| access to parameter args
-#-----|  -> access to property Length
-
-#  116| access to property Length
-#-----|  -> ... < ...
-
-#  116| access to local variable i
-#-----|  -> ...++
-
-#  116| ...++
-#-----|  -> access to local variable i
-
-#  117| {...}
-#-----|  -> ... ...;
-
-#  118| ... ...;
-#-----|  -> access to local variable i
-
-#  118| Boolean last = ...
-#-----|  -> if (...) ...
-
-#  118| access to local variable i
-#-----|  -> access to parameter args
-
-#  118| ... == ...
-#-----|  -> Boolean last = ...
-
-#  118| access to parameter args
-#-----|  -> access to property Length
-
-#  118| access to property Length
-#-----|  -> 1
-
-#  118| ... - ...
-#-----|  -> ... == ...
-
-#  118| 1
-#-----|  -> ... - ...
-
-#  119| if (...) ...
-#-----|  -> access to local variable last
-
-#  119| [false, last (line 118): true] !...
-#-----| false -> [last (line 118): true] if (...) ...
-
-#  119| [true, last (line 118): false] !...
-#-----| true -> [last (line 118): false] ...;
-
-#  119| access to local variable last
-#-----| false -> [true, last (line 118): false] !...
-#-----| true -> [false, last (line 118): true] !...
-
-#  120| [last (line 118): false] ... = ...
-#-----|  -> [last (line 118): false] if (...) ...
-
-#  120| [last (line 118): false] ...;
-#-----|  -> [last (line 118): false] ""
-
-#  120| [last (line 118): false] ""
-#-----|  -> [last (line 118): false] ... = ...
-
-#  121| [last (line 118): false] if (...) ...
-#-----|  -> [last (line 118): false] access to local variable last
-
-#  121| [last (line 118): true] if (...) ...
-#-----|  -> [last (line 118): true] access to local variable last
-
-#  121| [last (line 118): false] access to local variable last
-#-----| false -> access to local variable i
-
-#  121| [last (line 118): true] access to local variable last
-#-----| true -> ...;
-
-#  122| ... = ...
-#-----|  -> access to local variable i
-
-#  122| ...;
-#-----|  -> null
-
-#  122| null
-#-----|  -> ... = ...
-
-#  129| enter M10
-#-----|  -> {...}
-
-#  130| {...}
-#-----|  -> while (...) ...
-
-#  131| while (...) ...
-#-----|  -> true
-
-#  131| [Field1 (line 129): false] true
-#-----| true -> [Field1 (line 129): false] {...}
-
-#  131| [Field1 (line 129): true, Field2 (line 129): false] true
-#-----| true -> [Field1 (line 129): true, Field2 (line 129): false] {...}
-
-#  131| [Field1 (line 129): true, Field2 (line 129): true] true
-#-----| true -> [Field1 (line 129): true, Field2 (line 129): true] {...}
-
-#  131| true
-#-----| true -> {...}
-
-#  132| [Field1 (line 129): false] {...}
-#-----|  -> [Field1 (line 129): false] if (...) ...
-
-#  132| [Field1 (line 129): true, Field2 (line 129): false] {...}
-#-----|  -> [Field1 (line 129): true, Field2 (line 129): false] if (...) ...
-
-#  132| [Field1 (line 129): true, Field2 (line 129): true] {...}
-#-----|  -> [Field1 (line 129): true, Field2 (line 129): true] if (...) ...
-
-#  132| {...}
-#-----|  -> if (...) ...
-
-#  133| [Field1 (line 129): false] if (...) ...
-#-----|  -> [Field1 (line 129): false] this access
-
-#  133| [Field1 (line 129): true, Field2 (line 129): false] if (...) ...
-#-----|  -> [Field1 (line 129): true, Field2 (line 129): false] this access
-
-#  133| [Field1 (line 129): true, Field2 (line 129): true] if (...) ...
-#-----|  -> [Field1 (line 129): true, Field2 (line 129): true] this access
-
-#  133| if (...) ...
-#-----|  -> this access
-
-#  133| [Field1 (line 129): false] access to field Field1
-#-----| false -> [Field1 (line 129): false] true
-
-#  133| [Field1 (line 129): false] this access
-#-----|  -> [Field1 (line 129): false] access to field Field1
-
-#  133| [Field1 (line 129): true, Field2 (line 129): false] access to field Field1
-#-----| true -> [Field1 (line 129): true, Field2 (line 129): false] {...}
-
-#  133| [Field1 (line 129): true, Field2 (line 129): false] this access
-#-----|  -> [Field1 (line 129): true, Field2 (line 129): false] access to field Field1
-
-#  133| [Field1 (line 129): true, Field2 (line 129): true] access to field Field1
-#-----| true -> [Field1 (line 129): true, Field2 (line 129): true] {...}
-
-#  133| [Field1 (line 129): true, Field2 (line 129): true] this access
-#-----|  -> [Field1 (line 129): true, Field2 (line 129): true] access to field Field1
-
-#  133| access to field Field1
-#-----| false -> [Field1 (line 129): false] true
-#-----| true -> [Field1 (line 129): true] {...}
-
-#  133| this access
-#-----|  -> access to field Field1
-
-#  134| [Field1 (line 129): true, Field2 (line 129): false] {...}
-#-----|  -> [Field1 (line 129): true, Field2 (line 129): false] if (...) ...
-
-#  134| [Field1 (line 129): true, Field2 (line 129): true] {...}
-#-----|  -> [Field1 (line 129): true, Field2 (line 129): true] if (...) ...
-
-#  134| [Field1 (line 129): true] {...}
-#-----|  -> [Field1 (line 129): true] if (...) ...
-
-#  135| [Field1 (line 129): true, Field2 (line 129): false] if (...) ...
-#-----|  -> [Field1 (line 129): true, Field2 (line 129): false] this access
-
-#  135| [Field1 (line 129): true, Field2 (line 129): true] if (...) ...
-#-----|  -> [Field1 (line 129): true, Field2 (line 129): true] this access
-
-#  135| [Field1 (line 129): true] if (...) ...
-#-----|  -> [Field1 (line 129): true] this access
-
-#  135| [Field1 (line 129): true, Field2 (line 129): false] access to field Field2
-#-----| false -> [Field1 (line 129): true, Field2 (line 129): false] true
-
-#  135| [Field1 (line 129): true, Field2 (line 129): false] this access
-#-----|  -> [Field1 (line 129): true, Field2 (line 129): false] access to field Field2
-
-#  135| [Field1 (line 129): true, Field2 (line 129): true] access to field Field2
-#-----| true -> [Field1 (line 129): true, Field2 (line 129): true] {...}
-
-#  135| [Field1 (line 129): true, Field2 (line 129): true] this access
-#-----|  -> [Field1 (line 129): true, Field2 (line 129): true] access to field Field2
-
-#  135| [Field1 (line 129): true] access to field Field2
-#-----| false -> [Field1 (line 129): true, Field2 (line 129): false] true
-#-----| true -> [Field1 (line 129): true, Field2 (line 129): true] {...}
-
-#  135| [Field1 (line 129): true] this access
-#-----|  -> [Field1 (line 129): true] access to field Field2
-
-#  136| [Field1 (line 129): true, Field2 (line 129): true] {...}
-#-----|  -> [Field1 (line 129): true, Field2 (line 129): true] ...;
-
-#  137| [Field1 (line 129): true, Field2 (line 129): true] access to field Field1
-#-----|  -> [Field1 (line 129): true, Field2 (line 129): true] call to method ToString
-
-#  137| [Field1 (line 129): true, Field2 (line 129): true] this access
-#-----|  -> [Field1 (line 129): true, Field2 (line 129): true] access to field Field1
-
-#  137| [Field1 (line 129): true, Field2 (line 129): true] call to method ToString
-#-----|  -> [Field1 (line 129): true, Field2 (line 129): true] true
-
-#  137| [Field1 (line 129): true, Field2 (line 129): true] ...;
-#-----|  -> [Field1 (line 129): true, Field2 (line 129): true] this access
-
-#  143| enter M11
-#-----|  -> {...}
-
-#  143| exit M11
-
-#  143| exit M11 (normal)
-#-----|  -> exit M11
-
-#  144| {...}
-#-----|  -> ... ...;
-
-#  145| ... ...;
-#-----|  -> access to parameter b
-
-#  145| [b (line 143): false] String s = ...
-#-----|  -> [b (line 143): false] if (...) ...
-
-#  145| [b (line 143): true] String s = ...
-#-----|  -> [b (line 143): true] if (...) ...
-
-#  145| access to parameter b
-#-----| true -> [b (line 143): true] "a"
-#-----| false -> [b (line 143): false] "b"
-
-#  145| [b (line 143): false] ... ? ... : ...
-#-----|  -> [b (line 143): false] String s = ...
-
-#  145| [b (line 143): true] ... ? ... : ...
-#-----|  -> [b (line 143): true] String s = ...
-
-#  145| [b (line 143): true] "a"
-#-----|  -> [b (line 143): true] ... ? ... : ...
-
-#  145| [b (line 143): false] "b"
-#-----|  -> [b (line 143): false] ... ? ... : ...
-
-#  146| [b (line 143): false] if (...) ...
-#-----|  -> [b (line 143): false] access to parameter b
-
-#  146| [b (line 143): true] if (...) ...
-#-----|  -> [b (line 143): true] access to parameter b
-
-#  146| [b (line 143): false] access to parameter b
-#-----| false -> ...;
-
-#  146| [b (line 143): true] access to parameter b
-#-----| true -> ...;
-
-#  147| call to method WriteLine
-#-----|  -> exit M11 (normal)
-
-#  147| ...;
-#-----|  -> "a = "
-
-#  147| $"..."
-#-----|  -> call to method WriteLine
-
-#  147| "a = "
-#-----|  -> access to local variable s
-
-#  147| access to local variable s
-#-----|  -> $"..."
-
-#  149| call to method WriteLine
-#-----|  -> exit M11 (normal)
-
-#  149| ...;
-#-----|  -> "b = "
-
-#  149| $"..."
-#-----|  -> call to method WriteLine
-
-#  149| "b = "
-#-----|  -> access to local variable s
-
-#  149| access to local variable s
-#-----|  -> $"..."
-
-ExitMethods.cs:
-#    6| call to constructor Object
-#-----|  -> {...}
-
-#    6| enter ExitMethods
-#-----|  -> call to constructor Object
-
-#    6| exit ExitMethods
-
-#    6| exit ExitMethods (normal)
-#-----|  -> exit ExitMethods
-
-#    6| {...}
-#-----|  -> exit ExitMethods (normal)
-
-#    8| enter M1
-#-----|  -> {...}
-
-#    8| exit M1
-
-#    8| exit M1 (normal)
-#-----|  -> exit M1
-
-#    9| {...}
-#-----|  -> ...;
-
-#   10| call to method ErrorMaybe
-#-----|  -> return ...;
-
-#   10| ...;
-#-----|  -> true
-
-#   10| true
-#-----|  -> call to method ErrorMaybe
-
-#   11| return ...;
-#-----| return -> exit M1 (normal)
-
-#   14| enter M2
-#-----|  -> {...}
-
-#   14| exit M2
-
-#   14| exit M2 (normal)
-#-----|  -> exit M2
-
-#   15| {...}
-#-----|  -> ...;
-
-#   16| call to method ErrorMaybe
-#-----|  -> return ...;
-
-#   16| ...;
-#-----|  -> false
-
-#   16| false
-#-----|  -> call to method ErrorMaybe
-
-#   17| return ...;
-#-----| return -> exit M2 (normal)
-
-#   20| enter M3
-#-----|  -> {...}
-
-#   20| exit M3
-
-#   20| exit M3 (abnormal)
-#-----|  -> exit M3
-
-#   21| {...}
-#-----|  -> ...;
-
-#   22| call to method ErrorAlways
-#-----| exception(ArgumentException), exception(Exception) -> exit M3 (abnormal)
-
-#   22| ...;
-#-----|  -> true
-
-#   22| true
-#-----|  -> call to method ErrorAlways
-
-#   26| enter M4
-#-----|  -> {...}
-
-#   26| exit M4
-
-#   26| exit M4 (abnormal)
-#-----|  -> exit M4
-
-#   27| {...}
-#-----|  -> ...;
-
-#   28| call to method Exit
-#-----| exit -> exit M4 (abnormal)
-
-#   28| this access
-#-----|  -> call to method Exit
-
-#   28| ...;
-#-----|  -> this access
-
-#   32| enter M5
-#-----|  -> {...}
-
-#   32| exit M5
-
-#   32| exit M5 (abnormal)
-#-----|  -> exit M5
-
-#   33| {...}
-#-----|  -> ...;
-
-#   34| call to method ApplicationExit
-#-----| exit -> exit M5 (abnormal)
-
-#   34| this access
-#-----|  -> call to method ApplicationExit
-
-#   34| ...;
-#-----|  -> this access
-
-#   38| enter M6
-#-----|  -> {...}
-
-#   38| exit M6
-
-#   38| exit M6 (normal)
-#-----|  -> exit M6
-
-#   39| {...}
-#-----|  -> try {...} ...
-
-#   40| try {...} ...
-#-----|  -> {...}
-
-#   41| {...}
-#-----|  -> ...;
-
-#   42| call to method ErrorAlways
-#-----| exception(ArgumentException) -> [exception: ArgumentException] catch (...) {...}
-#-----| exception(Exception) -> [exception: Exception] catch (...) {...}
-
-#   42| ...;
-#-----|  -> false
-
-#   42| false
-#-----|  -> call to method ErrorAlways
-
-#   44| [exception: ArgumentException] catch (...) {...}
-#-----| match -> {...}
-
-#   44| [exception: Exception] catch (...) {...}
-#-----| match -> {...}
-#-----| no-match -> [exception: Exception] catch (...) {...}
-
-#   45| {...}
-#-----|  -> return ...;
-
-#   46| return ...;
-#-----| return -> exit M6 (normal)
-
-#   48| [exception: Exception] catch (...) {...}
-#-----| match -> {...}
-
-#   49| {...}
-#-----|  -> return ...;
-
-#   50| return ...;
-#-----| return -> exit M6 (normal)
-
-#   54| enter M7
-#-----|  -> {...}
-
-#   54| exit M7
-
-#   54| exit M7 (abnormal)
-#-----|  -> exit M7
-
-#   55| {...}
-#-----|  -> ...;
-
-#   56| call to method ErrorAlways2
-#-----| exception(Exception) -> exit M7 (abnormal)
-
-#   56| ...;
-#-----|  -> call to method ErrorAlways2
-
-#   60| enter M8
-#-----|  -> {...}
-
-#   60| exit M8
-
-#   60| exit M8 (abnormal)
-#-----|  -> exit M8
-
-#   61| {...}
-#-----|  -> ...;
-
-#   62| call to method ErrorAlways3
-#-----| exception(Exception) -> exit M8 (abnormal)
-
-#   62| ...;
-#-----|  -> call to method ErrorAlways3
-
-#   66| enter ErrorMaybe
-#-----|  -> {...}
-
-#   66| exit ErrorMaybe
-
-#   66| exit ErrorMaybe (abnormal)
-#-----|  -> exit ErrorMaybe
-
-#   66| exit ErrorMaybe (normal)
-#-----|  -> exit ErrorMaybe
-
-#   67| {...}
-#-----|  -> if (...) ...
-
-#   68| if (...) ...
-#-----|  -> access to parameter b
-
-#   68| access to parameter b
-#-----| false -> exit ErrorMaybe (normal)
-#-----| true -> object creation of type Exception
-
-#   69| throw ...;
-#-----| exception(Exception) -> exit ErrorMaybe (abnormal)
-
-#   69| object creation of type Exception
-#-----|  -> throw ...;
-
-#   72| enter ErrorAlways
-#-----|  -> {...}
-
-#   72| exit ErrorAlways
-
-#   72| exit ErrorAlways (abnormal)
-#-----|  -> exit ErrorAlways
-
-#   73| {...}
-#-----|  -> if (...) ...
-
-#   74| if (...) ...
-#-----|  -> access to parameter b
-
-#   74| access to parameter b
-#-----| true -> object creation of type Exception
-#-----| false -> "b"
-
-#   75| throw ...;
-#-----| exception(Exception) -> exit ErrorAlways (abnormal)
-
-#   75| object creation of type Exception
-#-----|  -> throw ...;
-
-#   77| throw ...;
-#-----| exception(ArgumentException) -> exit ErrorAlways (abnormal)
-
-#   77| object creation of type ArgumentException
-#-----|  -> throw ...;
-
-#   77| "b"
-#-----|  -> object creation of type ArgumentException
-
-#   80| enter ErrorAlways2
-#-----|  -> {...}
-
-#   80| exit ErrorAlways2
-
-#   80| exit ErrorAlways2 (abnormal)
-#-----|  -> exit ErrorAlways2
-
-#   81| {...}
-#-----|  -> object creation of type Exception
-
-#   82| throw ...;
-#-----| exception(Exception) -> exit ErrorAlways2 (abnormal)
-
-#   82| object creation of type Exception
-#-----|  -> throw ...;
-
-#   85| enter ErrorAlways3
-#-----|  -> object creation of type Exception
-
-#   85| exit ErrorAlways3
-
-#   85| exit ErrorAlways3 (abnormal)
-#-----|  -> exit ErrorAlways3
-
-#   85| throw ...
-#-----| exception(Exception) -> exit ErrorAlways3 (abnormal)
-
-#   85| object creation of type Exception
-#-----|  -> throw ...
-
-#   87| enter Exit
-#-----|  -> {...}
-
-#   87| exit Exit
-
-#   87| exit Exit (abnormal)
-#-----|  -> exit Exit
-
-#   88| {...}
-#-----|  -> ...;
-
-#   89| call to method Exit
-#-----| exit -> exit Exit (abnormal)
-
-#   89| ...;
-#-----|  -> 0
-
-#   89| 0
-#-----|  -> call to method Exit
-
-#   92| enter ExitInTry
-#-----|  -> {...}
-
-#   92| exit ExitInTry
-
-#   92| exit ExitInTry (abnormal)
-#-----|  -> exit ExitInTry
-
-#   93| {...}
-#-----|  -> try {...} ...
-
-#   94| try {...} ...
-#-----|  -> {...}
-
-#   95| {...}
-#-----|  -> ...;
-
-#   96| call to method Exit
-#-----| exit -> exit ExitInTry (abnormal)
-
-#   96| this access
-#-----|  -> call to method Exit
-
-#   96| ...;
-#-----|  -> this access
-
-#  105| enter ApplicationExit
-#-----|  -> {...}
-
-#  105| exit ApplicationExit
-
-#  105| exit ApplicationExit (abnormal)
-#-----|  -> exit ApplicationExit
-
-#  106| {...}
-#-----|  -> ...;
-
-#  107| call to method Exit
-#-----| exit -> exit ApplicationExit (abnormal)
-
-#  107| ...;
-#-----|  -> call to method Exit
-
-#  110| enter ThrowExpr
-#-----|  -> {...}
-
-#  110| exit ThrowExpr
-
-#  110| exit ThrowExpr (abnormal)
-#-----|  -> exit ThrowExpr
-
-#  110| exit ThrowExpr (normal)
-#-----|  -> exit ThrowExpr
-
-#  111| {...}
-#-----|  -> access to parameter input
-
-#  112| return ...;
-#-----| return -> exit ThrowExpr (normal)
-
-#  112| access to parameter input
-#-----|  -> 0
-
-#  112| ... != ...
-#-----| true -> 1
-#-----| false -> "input"
-
-#  112| ... ? ... : ...
-#-----|  -> return ...;
-
-#  112| (...) ...
-#-----|  -> ... != ...
-
-#  112| 0
-#-----|  -> (...) ...
-
-#  112| (...) ...
-#-----|  -> access to parameter input
-
-#  112| 1
-#-----|  -> (...) ...
-
-#  112| ... / ...
-#-----|  -> ... ? ... : ...
-
-#  112| access to parameter input
-#-----|  -> ... / ...
-
-#  112| throw ...
-#-----| exception(ArgumentException) -> exit ThrowExpr (abnormal)
-
-#  112| object creation of type ArgumentException
-#-----|  -> throw ...
-
-#  112| "input"
-#-----|  -> object creation of type ArgumentException
-
-#  115| enter ExtensionMethodCall
-#-----|  -> {...}
-
-#  115| exit ExtensionMethodCall
-
-#  115| exit ExtensionMethodCall (normal)
-#-----|  -> exit ExtensionMethodCall
-
-#  116| {...}
-#-----|  -> access to parameter s
-
-#  117| return ...;
-#-----| return -> exit ExtensionMethodCall (normal)
-
-#  117| access to parameter s
-#-----|  -> -
-
-#  117| call to method Contains
-#-----| true -> 0
-#-----| false -> 1
-
-#  117| ... ? ... : ...
-#-----|  -> return ...;
-
-#  117| -
-#-----|  -> call to method Contains
-
-#  117| 0
-#-----|  -> ... ? ... : ...
-
-#  117| 1
-#-----|  -> ... ? ... : ...
-
-#  120| enter FailingAssertion
-#-----|  -> {...}
-
-#  120| exit FailingAssertion
-
-#  120| exit FailingAssertion (abnormal)
-#-----|  -> exit FailingAssertion
-
-#  121| {...}
-#-----|  -> ...;
-
-#  122| [assertion failure] call to method IsTrue
-#-----| exception(AssertFailedException) -> exit FailingAssertion (abnormal)
-
-#  122| ...;
-#-----|  -> false
-
-#  122| false
-#-----| false -> [assertion failure] call to method IsTrue
-
-#  126| enter FailingAssertion2
-#-----|  -> {...}
-
-#  126| exit FailingAssertion2
-
-#  126| exit FailingAssertion2 (abnormal)
-#-----|  -> exit FailingAssertion2
-
-#  127| {...}
-#-----|  -> ...;
-
-#  128| call to method FailingAssertion
-#-----| exception(AssertFailedException) -> exit FailingAssertion2 (abnormal)
-
-#  128| this access
-#-----|  -> call to method FailingAssertion
-
-#  128| ...;
-#-----|  -> this access
-
-#  132| enter AssertFalse
-#-----|  -> access to parameter b
-
-#  132| exit AssertFalse
-
-#  132| exit AssertFalse (abnormal)
-#-----|  -> exit AssertFalse
-
-#  132| exit AssertFalse (normal)
-#-----|  -> exit AssertFalse
-
-#  132| [assertion failure] call to method IsFalse
-#-----| exception(AssertFailedException) -> exit AssertFalse (abnormal)
-
-#  132| [assertion success] call to method IsFalse
-#-----|  -> exit AssertFalse (normal)
-
-#  132| access to parameter b
-#-----| false -> [assertion success] call to method IsFalse
-#-----| true -> [assertion failure] call to method IsFalse
-
-#  134| enter FailingAssertion3
-#-----|  -> {...}
-
-#  134| exit FailingAssertion3
-
-#  134| exit FailingAssertion3 (abnormal)
-#-----|  -> exit FailingAssertion3
-
-#  135| {...}
-#-----|  -> ...;
-
-#  136| [assertion failure] call to method AssertFalse
-#-----| exception(AssertFailedException) -> exit FailingAssertion3 (abnormal)
-
-#  136| this access
-#-----|  -> true
-
-#  136| ...;
-#-----|  -> this access
-
-#  136| true
-#-----| true -> [assertion failure] call to method AssertFalse
-
-#  140| enter ExceptionDispatchInfoThrow
-#-----|  -> {...}
-
-#  140| exit ExceptionDispatchInfoThrow
-
-#  140| exit ExceptionDispatchInfoThrow (abnormal)
-#-----|  -> exit ExceptionDispatchInfoThrow
-
-#  141| {...}
-#-----|  -> if (...) ...
-
-#  142| if (...) ...
-#-----|  -> access to parameter b
-
-#  142| access to parameter b
-#-----| true -> ...;
-#-----| false -> ...;
-
-#  143| call to method Throw
-#-----| exception(ArgumentException) -> exit ExceptionDispatchInfoThrow (abnormal)
-
-#  143| ...;
-#-----|  -> access to parameter e
-
-#  143| access to parameter e
-#-----|  -> call to method Throw
-
-#  145| call to method Capture
-#-----|  -> call to method Throw
-
-#  145| call to method Throw
-#-----| exception(Exception) -> exit ExceptionDispatchInfoThrow (abnormal)
-
-#  145| ...;
-#-----|  -> access to parameter e
-
-#  145| access to parameter e
-#-----|  -> call to method Capture
-
-Extensions.cs:
-#    5| enter ToInt32
-#-----|  -> {...}
-
-#    5| exit ToInt32
-
-#    5| exit ToInt32 (normal)
-#-----|  -> exit ToInt32
-
-#    6| {...}
-#-----|  -> access to parameter s
-
-#    7| return ...;
-#-----| return -> exit ToInt32 (normal)
-
-#    7| call to method Parse
-#-----|  -> return ...;
-
-#    7| access to parameter s
-#-----|  -> call to method Parse
-
-#   10| enter ToBool
-#-----|  -> {...}
-
-#   10| exit ToBool
-
-#   10| exit ToBool (normal)
-#-----|  -> exit ToBool
-
-#   11| {...}
-#-----|  -> access to parameter f
-
-#   12| return ...;
-#-----| return -> exit ToBool (normal)
-
-#   12| access to parameter f
-#-----|  -> access to parameter s
-
-#   12| delegate call
-#-----|  -> return ...;
-
-#   12| access to parameter s
-#-----|  -> delegate call
-
-#   15| enter CallToInt32
-#-----|  -> "0"
-
-#   15| exit CallToInt32
-
-#   15| exit CallToInt32 (normal)
-#-----|  -> exit CallToInt32
-
-#   15| call to method ToInt32
-#-----|  -> exit CallToInt32 (normal)
-
-#   15| "0"
-#-----|  -> call to method ToInt32
-
-#   20| enter Main
-#-----|  -> {...}
-
-#   20| exit Main
-
-#   20| exit Main (normal)
-#-----|  -> exit Main
-
-#   21| {...}
-#-----|  -> ...;
-
-#   22| access to parameter s
-#-----|  -> call to method ToInt32
-
-#   22| call to method ToInt32
-#-----|  -> ...;
-
-#   22| ...;
-#-----|  -> access to parameter s
-
-#   23| call to method ToInt32
-#-----|  -> ...;
-
-#   23| ...;
-#-----|  -> ""
-
-#   23| ""
-#-----|  -> call to method ToInt32
-
-#   24| call to method ToBool
-#-----|  -> ...;
-
-#   24| ...;
-#-----|  -> "true"
-
-#   24| "true"
-#-----|  -> access to method Parse
-
-#   24| access to method Parse
-#-----|  -> delegate creation of type Func<String,Boolean>
-
-#   24| delegate creation of type Func<String,Boolean>
-#-----|  -> call to method ToBool
-
-#   25| "true"
-#-----|  -> access to method Parse
-
-#   25| call to method ToBool
-#-----|  -> exit Main (normal)
-
-#   25| ...;
-#-----|  -> "true"
-
-#   25| access to method Parse
-#-----|  -> delegate creation of type Func<String,Boolean>
-
-#   25| delegate creation of type Func<String,Boolean>
-#-----|  -> call to method ToBool
-
-Finally.cs:
-#    3| call to constructor Object
-#-----|  -> {...}
-
-#    3| enter Finally
-#-----|  -> call to constructor Object
-
-#    3| exit Finally
-
-#    3| exit Finally (normal)
-#-----|  -> exit Finally
-
-#    3| {...}
-#-----|  -> exit Finally (normal)
-
-#    7| enter M1
-#-----|  -> {...}
-
-#    7| exit M1
-
-#    7| exit M1 (abnormal)
-#-----|  -> exit M1
-
-#    7| exit M1 (normal)
-#-----|  -> exit M1
-
-#    8| {...}
-#-----|  -> try {...} ...
-
-#    9| try {...} ...
-#-----|  -> {...}
-
-#   10| {...}
-#-----|  -> ...;
-
-#   11| call to method WriteLine
-#-----| exception(Exception) -> [finally: exception(Exception)] {...}
-#-----|  -> {...}
-
-#   11| ...;
-#-----|  -> "Try1"
-
-#   11| "Try1"
-#-----|  -> call to method WriteLine
-
-#   14| [finally: exception(Exception)] {...}
-#-----|  -> [finally: exception(Exception)] ...;
-
-#   14| {...}
-#-----|  -> ...;
-
-#   15| [finally: exception(Exception)] call to method WriteLine
-#-----| exception(Exception) -> exit M1 (abnormal)
-
-#   15| call to method WriteLine
-#-----|  -> exit M1 (normal)
-
-#   15| ...;
-#-----|  -> "Finally"
-
-#   15| [finally: exception(Exception)] ...;
-#-----|  -> [finally: exception(Exception)] "Finally"
-
-#   15| "Finally"
-#-----|  -> call to method WriteLine
-
-#   15| [finally: exception(Exception)] "Finally"
-#-----|  -> [finally: exception(Exception)] call to method WriteLine
-
-#   19| enter M2
-#-----|  -> {...}
-
-#   19| exit M2
-
-#   19| exit M2 (abnormal)
-#-----|  -> exit M2
-
-#   19| exit M2 (normal)
-#-----|  -> exit M2
-
-#   20| {...}
-#-----|  -> try {...} ...
-
-#   21| try {...} ...
-#-----|  -> {...}
-
-#   22| {...}
-#-----|  -> ...;
-
-#   23| call to method WriteLine
-#-----|  -> return ...;
-#-----| exception(Exception) -> [exception: Exception] catch (...) {...}
-
-#   23| ...;
-#-----|  -> "Try2"
-
-#   23| "Try2"
-#-----|  -> call to method WriteLine
-
-#   24| return ...;
-#-----| return -> [finally: return] {...}
-
-#   26| [exception: Exception] catch (...) {...}
-#-----| match -> [exception: Exception] IOException ex
-#-----| no-match -> [exception: Exception] catch (...) {...}
-
-#   26| [exception: Exception] IOException ex
-#-----|  -> [exception: Exception] true
-
-#   26| [exception: Exception] true
-#-----| true -> {...}
-
-#   27| {...}
-#-----|  -> throw ...;
-
-#   28| throw ...;
-#-----| exception(IOException) -> [finally: exception(IOException)] {...}
-
-#   30| [exception: Exception] catch (...) {...}
-#-----| match -> [exception: Exception] ArgumentException ex
-#-----| no-match -> [exception: Exception] catch (...) {...}
-
-#   30| [exception: Exception] ArgumentException ex
-#-----|  -> {...}
-
-#   31| {...}
-#-----|  -> try {...} ...
-
-#   32| try {...} ...
-#-----|  -> {...}
-
-#   33| {...}
-#-----|  -> if (...) ...
-
-#   34| if (...) ...
-#-----|  -> true
-
-#   34| true
-#-----| true -> throw ...;
-
-#   34| throw ...;
-#-----| exception(ArgumentException) -> [finally: exception(ArgumentException)] {...}
-
-#   37| [finally: exception(ArgumentException)] {...}
-#-----|  -> [finally: exception(ArgumentException)] "Boo!"
-
-#   38| [finally: exception(ArgumentException)] throw ...;
-#-----| exception(Exception) -> [finally: exception(Exception)] {...}
-
-#   38| [finally: exception(ArgumentException)] object creation of type Exception
-#-----|  -> [finally: exception(ArgumentException)] throw ...;
-
-#   38| [finally: exception(ArgumentException)] "Boo!"
-#-----|  -> [finally: exception(ArgumentException)] object creation of type Exception
-
-#   41| [exception: Exception] catch (...) {...}
-#-----| match -> {...}
-
-#   42| {...}
-#-----|  -> {...}
-
-#   49| [finally: exception(Exception)] {...}
-#-----|  -> [finally: exception(Exception)] ...;
-
-#   49| [finally: exception(IOException)] {...}
-#-----|  -> [finally: exception(IOException)] ...;
-
-#   49| [finally: return] {...}
-#-----|  -> [finally: return] ...;
-
-#   49| {...}
-#-----|  -> ...;
-
-#   50| [finally: exception(Exception)] call to method WriteLine
-#-----| exception(Exception) -> exit M2 (abnormal)
-
-#   50| [finally: exception(IOException)] call to method WriteLine
-#-----| exception(IOException) -> exit M2 (abnormal)
-
-#   50| [finally: return] call to method WriteLine
-#-----| return -> exit M2 (normal)
-
-#   50| call to method WriteLine
-#-----|  -> exit M2 (normal)
-
-#   50| ...;
-#-----|  -> "Finally"
-
-#   50| [finally: exception(Exception)] ...;
-#-----|  -> [finally: exception(Exception)] "Finally"
-
-#   50| [finally: exception(IOException)] ...;
-#-----|  -> [finally: exception(IOException)] "Finally"
-
-#   50| [finally: return] ...;
-#-----|  -> [finally: return] "Finally"
-
-#   50| "Finally"
-#-----|  -> call to method WriteLine
-
-#   50| [finally: exception(Exception)] "Finally"
-#-----|  -> [finally: exception(Exception)] call to method WriteLine
-
-#   50| [finally: exception(IOException)] "Finally"
-#-----|  -> [finally: exception(IOException)] call to method WriteLine
-
-#   50| [finally: return] "Finally"
-#-----|  -> [finally: return] call to method WriteLine
-
-#   54| enter M3
-#-----|  -> {...}
-
-#   54| exit M3
-
-#   54| exit M3 (abnormal)
-#-----|  -> exit M3
-
-#   54| exit M3 (normal)
-#-----|  -> exit M3
-
-#   55| {...}
-#-----|  -> try {...} ...
-
-#   56| try {...} ...
-#-----|  -> {...}
-
-#   57| {...}
-#-----|  -> ...;
-
-#   58| call to method WriteLine
-#-----|  -> return ...;
-#-----| exception(Exception) -> [exception: Exception] catch (...) {...}
-
-#   58| ...;
-#-----|  -> "Try3"
-
-#   58| "Try3"
-#-----|  -> call to method WriteLine
-
-#   59| return ...;
-#-----| return -> [finally: return] {...}
-
-#   61| [exception: Exception] catch (...) {...}
-#-----| match -> [exception: Exception] IOException ex
-#-----| no-match -> [exception: Exception] catch (...) {...}
-
-#   61| [exception: Exception] IOException ex
-#-----|  -> [exception: Exception] true
-
-#   61| [exception: Exception] true
-#-----| true -> {...}
-
-#   62| {...}
-#-----|  -> throw ...;
-
-#   63| throw ...;
-#-----| exception(IOException) -> [finally: exception(IOException)] {...}
-
-#   65| [exception: Exception] catch (...) {...}
-#-----| match -> [exception: Exception] Exception e
-
-#   65| [exception: Exception] Exception e
-#-----|  -> [exception: Exception] access to local variable e
-
-#   65| [exception: Exception] access to local variable e
-#-----|  -> [exception: Exception] access to property Message
-
-#   65| [exception: Exception] access to property Message
-#-----|  -> [exception: Exception] null
-
-#   65| [exception: Exception] ... != ...
-#-----| true -> {...}
-#-----| exception(Exception) -> [finally: exception(Exception)] {...}
-
-#   65| [exception: Exception] null
-#-----|  -> [exception: Exception] ... != ...
-
-#   66| {...}
-#-----|  -> {...}
-
-#   69| [finally: exception(Exception)] {...}
-#-----|  -> [finally: exception(Exception)] ...;
-
-#   69| [finally: exception(IOException)] {...}
-#-----|  -> [finally: exception(IOException)] ...;
-
-#   69| [finally: return] {...}
-#-----|  -> [finally: return] ...;
-
-#   69| {...}
-#-----|  -> ...;
-
-#   70| [finally: exception(Exception)] call to method WriteLine
-#-----| exception(Exception) -> exit M3 (abnormal)
-
-#   70| [finally: exception(IOException)] call to method WriteLine
-#-----| exception(IOException) -> exit M3 (abnormal)
-
-#   70| [finally: return] call to method WriteLine
-#-----| return -> exit M3 (normal)
-
-#   70| call to method WriteLine
-#-----|  -> exit M3 (normal)
-
-#   70| ...;
-#-----|  -> "Finally"
-
-#   70| [finally: exception(Exception)] ...;
-#-----|  -> [finally: exception(Exception)] "Finally"
-
-#   70| [finally: exception(IOException)] ...;
-#-----|  -> [finally: exception(IOException)] "Finally"
-
-#   70| [finally: return] ...;
-#-----|  -> [finally: return] "Finally"
-
-#   70| "Finally"
-#-----|  -> call to method WriteLine
-
-#   70| [finally: exception(Exception)] "Finally"
-#-----|  -> [finally: exception(Exception)] call to method WriteLine
-
-#   70| [finally: exception(IOException)] "Finally"
-#-----|  -> [finally: exception(IOException)] call to method WriteLine
-
-#   70| [finally: return] "Finally"
-#-----|  -> [finally: return] call to method WriteLine
-
-#   74| enter M4
-#-----|  -> {...}
-
-#   74| exit M4
-
-#   74| exit M4 (abnormal)
-#-----|  -> exit M4
-
-#   74| exit M4 (normal)
-#-----|  -> exit M4
-
-#   75| {...}
-#-----|  -> ... ...;
-
-#   76| ... ...;
-#-----|  -> 10
-
-#   76| Int32 i = ...
-#-----|  -> while (...) ...
-
-#   76| 10
-#-----|  -> Int32 i = ...
-
-#   77| while (...) ...
-#-----|  -> access to local variable i
-
-#   77| access to local variable i
-#-----|  -> 0
-
-#   77| ... > ...
-#-----| false -> exit M4 (normal)
-#-----| true -> {...}
-
-#   77| 0
-#-----|  -> ... > ...
-
-#   78| {...}
-#-----|  -> try {...} ...
-
-#   79| try {...} ...
-#-----|  -> {...}
-
-#   80| {...}
-#-----|  -> if (...) ...
-
-#   81| if (...) ...
-#-----|  -> access to local variable i
-
-#   81| access to local variable i
-#-----|  -> 0
-
-#   81| ... == ...
-#-----| true -> return ...;
-#-----| false -> if (...) ...
-
-#   81| 0
-#-----|  -> ... == ...
-
-#   82| return ...;
-#-----| return -> [finally: return] {...}
-
-#   83| if (...) ...
-#-----|  -> access to local variable i
-
-#   83| access to local variable i
-#-----|  -> 1
-
-#   83| ... == ...
-#-----| true -> continue;
-#-----| false -> if (...) ...
-
-#   83| 1
-#-----|  -> ... == ...
-
-#   84| continue;
-#-----| continue -> [finally: continue] {...}
-
-#   85| if (...) ...
-#-----|  -> access to local variable i
-
-#   85| access to local variable i
-#-----|  -> 2
-
-#   85| ... == ...
-#-----| true -> break;
-#-----| false -> {...}
-
-#   85| 2
-#-----|  -> ... == ...
-
-#   86| break;
-#-----| break -> [finally: break] {...}
-
-#   89| [finally: break] {...}
-#-----|  -> [finally: break] try {...} ...
-
-#   89| [finally: continue] {...}
-#-----|  -> [finally: continue] try {...} ...
-
-#   89| [finally: return] {...}
-#-----|  -> [finally: return] try {...} ...
-
-#   89| {...}
-#-----|  -> try {...} ...
-
-#   90| [finally: break] try {...} ...
-#-----|  -> [finally: break] {...}
-
-#   90| [finally: continue] try {...} ...
-#-----|  -> [finally: continue] {...}
-
-#   90| [finally: return] try {...} ...
-#-----|  -> [finally: return] {...}
-
-#   90| try {...} ...
-#-----|  -> {...}
-
-#   91| [finally: break] {...}
-#-----|  -> [finally: break] if (...) ...
-
-#   91| [finally: continue] {...}
-#-----|  -> [finally: continue] if (...) ...
-
-#   91| [finally: return] {...}
-#-----|  -> [finally: return] if (...) ...
-
-#   91| {...}
-#-----|  -> if (...) ...
-
-#   92| [finally: break] if (...) ...
-#-----|  -> [finally: break] access to local variable i
-
-#   92| [finally: continue] if (...) ...
-#-----|  -> [finally: continue] access to local variable i
-
-#   92| [finally: return] if (...) ...
-#-----|  -> [finally: return] access to local variable i
-
-#   92| if (...) ...
-#-----|  -> access to local variable i
-
-#   92| [finally: break] access to local variable i
-#-----|  -> [finally: break] 3
-
-#   92| [finally: continue] access to local variable i
-#-----|  -> [finally: continue] 3
-
-#   92| [finally: return] access to local variable i
-#-----|  -> [finally: return] 3
-
-#   92| access to local variable i
-#-----|  -> 3
-
-#   92| ... == ...
-#-----| true -> object creation of type Exception
-#-----| false -> {...}
-
-#   92| [finally: break] ... == ...
-#-----| true -> [finally: break] object creation of type Exception
-#-----| false -> [finally: break] {...}
-
-#   92| [finally: continue] ... == ...
-#-----| true -> [finally: continue] object creation of type Exception
-#-----| false -> [finally: continue] {...}
-
-#   92| [finally: return] ... == ...
-#-----| true -> [finally: return] object creation of type Exception
-#-----| false -> [finally: return] {...}
-
-#   92| 3
-#-----|  -> ... == ...
-
-#   92| [finally: break] 3
-#-----|  -> [finally: break] ... == ...
-
-#   92| [finally: continue] 3
-#-----|  -> [finally: continue] ... == ...
-
-#   92| [finally: return] 3
-#-----|  -> [finally: return] ... == ...
-
-#   93| [finally: break] throw ...;
-#-----| exception(Exception) -> [finally: break, finally(1): exception(Exception)] {...}
-
-#   93| [finally: continue] throw ...;
-#-----| exception(Exception) -> [finally: continue, finally(1): exception(Exception)] {...}
-
-#   93| [finally: return] throw ...;
-#-----| exception(Exception) -> [finally: return, finally(1): exception(Exception)] {...}
-
-#   93| throw ...;
-#-----| exception(Exception) -> [finally(1): exception(Exception)] {...}
-
-#   93| [finally: break] object creation of type Exception
-#-----|  -> [finally: break] throw ...;
-#-----| exception(Exception) -> [finally: break, finally(1): exception(Exception)] {...}
-
-#   93| [finally: continue] object creation of type Exception
-#-----|  -> [finally: continue] throw ...;
-#-----| exception(Exception) -> [finally: continue, finally(1): exception(Exception)] {...}
-
-#   93| [finally: return] object creation of type Exception
-#-----|  -> [finally: return] throw ...;
-#-----| exception(Exception) -> [finally: return, finally(1): exception(Exception)] {...}
-
-#   93| object creation of type Exception
-#-----|  -> throw ...;
-#-----| exception(Exception) -> [finally(1): exception(Exception)] {...}
-
-#   96| [finally(1): exception(Exception)] {...}
-#-----|  -> [finally(1): exception(Exception)] ...;
-
-#   96| [finally: break, finally(1): exception(Exception)] {...}
-#-----|  -> [finally: break, finally(1): exception(Exception)] ...;
-
-#   96| [finally: break] {...}
-#-----|  -> [finally: break] ...;
-
-#   96| [finally: continue, finally(1): exception(Exception)] {...}
-#-----|  -> [finally: continue, finally(1): exception(Exception)] ...;
-
-#   96| [finally: continue] {...}
-#-----|  -> [finally: continue] ...;
-
-#   96| [finally: return, finally(1): exception(Exception)] {...}
-#-----|  -> [finally: return, finally(1): exception(Exception)] ...;
-
-#   96| [finally: return] {...}
-#-----|  -> [finally: return] ...;
-
-#   96| {...}
-#-----|  -> ...;
-
-#   97| [finally(1): exception(Exception)] access to local variable i
-#-----|  -> [finally(1): exception(Exception)] ...--
-
-#   97| [finally: break, finally(1): exception(Exception)] access to local variable i
-#-----|  -> [finally: break, finally(1): exception(Exception)] ...--
-
-#   97| [finally: break] access to local variable i
-#-----|  -> [finally: break] ...--
-
-#   97| [finally: continue, finally(1): exception(Exception)] access to local variable i
-#-----|  -> [finally: continue, finally(1): exception(Exception)] ...--
-
-#   97| [finally: continue] access to local variable i
-#-----|  -> [finally: continue] ...--
-
-#   97| [finally: return, finally(1): exception(Exception)] access to local variable i
-#-----|  -> [finally: return, finally(1): exception(Exception)] ...--
-
-#   97| [finally: return] access to local variable i
-#-----|  -> [finally: return] ...--
-
-#   97| access to local variable i
-#-----|  -> ...--
-
-#   97| ...--
-#-----|  -> access to local variable i
-
-#   97| [finally(1): exception(Exception)] ...--
-#-----| exception(Exception) -> exit M4 (abnormal)
-
-#   97| [finally: break, finally(1): exception(Exception)] ...--
-#-----| exception(Exception) -> exit M4 (abnormal)
-
-#   97| [finally: break] ...--
-#-----| break -> exit M4 (normal)
-
-#   97| [finally: continue, finally(1): exception(Exception)] ...--
-#-----| exception(Exception) -> exit M4 (abnormal)
-
-#   97| [finally: continue] ...--
-#-----| continue -> access to local variable i
-
-#   97| [finally: return, finally(1): exception(Exception)] ...--
-#-----| exception(Exception) -> exit M4 (abnormal)
-
-#   97| [finally: return] ...--
-#-----| return -> exit M4 (normal)
-
-#   97| ...;
-#-----|  -> access to local variable i
-
-#   97| [finally(1): exception(Exception)] ...;
-#-----|  -> [finally(1): exception(Exception)] access to local variable i
-
-#   97| [finally: break, finally(1): exception(Exception)] ...;
-#-----|  -> [finally: break, finally(1): exception(Exception)] access to local variable i
-
-#   97| [finally: break] ...;
-#-----|  -> [finally: break] access to local variable i
-
-#   97| [finally: continue, finally(1): exception(Exception)] ...;
-#-----|  -> [finally: continue, finally(1): exception(Exception)] access to local variable i
-
-#   97| [finally: continue] ...;
-#-----|  -> [finally: continue] access to local variable i
-
-#   97| [finally: return, finally(1): exception(Exception)] ...;
-#-----|  -> [finally: return, finally(1): exception(Exception)] access to local variable i
-
-#   97| [finally: return] ...;
-#-----|  -> [finally: return] access to local variable i
-
-#  103| enter M5
-#-----|  -> {...}
-
-#  103| exit M5
-
-#  103| exit M5 (abnormal)
-#-----|  -> exit M5
-
-#  103| exit M5 (normal)
-#-----|  -> exit M5
-
-#  104| {...}
-#-----|  -> try {...} ...
-
-#  105| try {...} ...
-#-----|  -> {...}
-
-#  106| {...}
-#-----|  -> if (...) ...
-
-#  107| if (...) ...
-#-----|  -> this access
-
-#  107| access to field Field
-#-----|  -> access to property Length
-#-----| exception(NullReferenceException) -> [finally: exception(NullReferenceException)] {...}
-
-#  107| this access
-#-----|  -> access to field Field
-
-#  107| access to property Length
-#-----|  -> 0
-#-----| exception(Exception) -> [finally: exception(Exception)] {...}
-#-----| exception(NullReferenceException) -> [finally: exception(NullReferenceException)] {...}
-
-#  107| ... == ...
-#-----| true -> return ...;
-#-----| false -> if (...) ...
-
-#  107| 0
-#-----|  -> ... == ...
-
-#  108| return ...;
-#-----| return -> [finally: return] {...}
-
-#  109| if (...) ...
-#-----|  -> this access
-
-#  109| access to field Field
-#-----|  -> access to property Length
-#-----| exception(NullReferenceException) -> [finally: exception(NullReferenceException)] {...}
-
-#  109| this access
-#-----|  -> access to field Field
-
-#  109| access to property Length
-#-----|  -> 1
-#-----| exception(Exception) -> [finally: exception(Exception)] {...}
-#-----| exception(NullReferenceException) -> [finally: exception(NullReferenceException)] {...}
-
-#  109| ... == ...
-#-----| true -> object creation of type OutOfMemoryException
-#-----| false -> {...}
-
-#  109| 1
-#-----|  -> ... == ...
-
-#  110| throw ...;
-#-----| exception(OutOfMemoryException) -> [finally: exception(OutOfMemoryException)] {...}
-
-#  110| object creation of type OutOfMemoryException
-#-----|  -> throw ...;
-#-----| exception(Exception) -> [finally: exception(Exception)] {...}
-
-#  113| [finally: exception(Exception)] {...}
-#-----|  -> [finally: exception(Exception)] if (...) ...
-
-#  113| [finally: exception(NullReferenceException)] {...}
-#-----|  -> [finally: exception(NullReferenceException)] if (...) ...
-
-#  113| [finally: exception(OutOfMemoryException)] {...}
-#-----|  -> [finally: exception(OutOfMemoryException)] if (...) ...
-
-#  113| [finally: return] {...}
-#-----|  -> [finally: return] if (...) ...
-
-#  113| {...}
-#-----|  -> if (...) ...
-
-#  114| [finally: exception(Exception)] if (...) ...
-#-----|  -> [finally: exception(Exception)] this access
-
-#  114| [finally: exception(NullReferenceException)] if (...) ...
-#-----|  -> [finally: exception(NullReferenceException)] this access
-
-#  114| [finally: exception(OutOfMemoryException)] if (...) ...
-#-----|  -> [finally: exception(OutOfMemoryException)] this access
-
-#  114| [finally: return] if (...) ...
-#-----|  -> [finally: return] this access
-
-#  114| if (...) ...
-#-----|  -> this access
-
-#  114| [false, finally: exception(Exception)] !...
-#-----| false -> [finally: exception(Exception)] if (...) ...
-
-#  114| [false, finally: exception(NullReferenceException)] !...
-#-----| false -> [finally: exception(NullReferenceException)] if (...) ...
-
-#  114| [false, finally: exception(OutOfMemoryException)] !...
-#-----| false -> [finally: exception(OutOfMemoryException)] if (...) ...
-
-#  114| [false, finally: return] !...
-#-----| false -> [finally: return] if (...) ...
-
-#  114| [false] !...
-#-----| false -> if (...) ...
-
-#  114| [true, finally: exception(Exception)] !...
-#-----| true -> [finally: exception(Exception)] ...;
-
-#  114| [true, finally: exception(NullReferenceException)] !...
-#-----| true -> [finally: exception(NullReferenceException)] ...;
-
-#  114| [true, finally: exception(OutOfMemoryException)] !...
-#-----| true -> [finally: exception(OutOfMemoryException)] ...;
-
-#  114| [true, finally: return] !...
-#-----| true -> [finally: return] ...;
-
-#  114| [true] !...
-#-----| true -> ...;
-
-#  114| [finally: exception(Exception)] access to field Field
-#-----|  -> [finally: exception(Exception)] access to property Length
-
-#  114| [finally: exception(Exception)] this access
-#-----|  -> [finally: exception(Exception)] access to field Field
-
-#  114| [finally: exception(NullReferenceException)] access to field Field
-#-----|  -> [finally: exception(NullReferenceException)] access to property Length
-
-#  114| [finally: exception(NullReferenceException)] this access
-#-----|  -> [finally: exception(NullReferenceException)] access to field Field
-
-#  114| [finally: exception(OutOfMemoryException)] access to field Field
-#-----|  -> [finally: exception(OutOfMemoryException)] access to property Length
-
-#  114| [finally: exception(OutOfMemoryException)] this access
-#-----|  -> [finally: exception(OutOfMemoryException)] access to field Field
-
-#  114| [finally: return] access to field Field
-#-----|  -> [finally: return] access to property Length
-
-#  114| [finally: return] this access
-#-----|  -> [finally: return] access to field Field
-
-#  114| access to field Field
-#-----|  -> access to property Length
-
-#  114| this access
-#-----|  -> access to field Field
-
-#  114| [finally: exception(Exception)] access to property Length
-#-----|  -> [finally: exception(Exception)] 0
-
-#  114| [finally: exception(NullReferenceException)] access to property Length
-#-----|  -> [finally: exception(NullReferenceException)] 0
-
-#  114| [finally: exception(OutOfMemoryException)] access to property Length
-#-----|  -> [finally: exception(OutOfMemoryException)] 0
-
-#  114| [finally: return] access to property Length
-#-----|  -> [finally: return] 0
-
-#  114| access to property Length
-#-----|  -> 0
-
-#  114| ... == ...
-#-----| false -> [true] !...
-#-----| true -> [false] !...
-
-#  114| [finally: exception(Exception)] ... == ...
-#-----| false -> [true, finally: exception(Exception)] !...
-#-----| true -> [false, finally: exception(Exception)] !...
-
-#  114| [finally: exception(NullReferenceException)] ... == ...
-#-----| false -> [true, finally: exception(NullReferenceException)] !...
-#-----| true -> [false, finally: exception(NullReferenceException)] !...
-
-#  114| [finally: exception(OutOfMemoryException)] ... == ...
-#-----| false -> [true, finally: exception(OutOfMemoryException)] !...
-#-----| true -> [false, finally: exception(OutOfMemoryException)] !...
-
-#  114| [finally: return] ... == ...
-#-----| false -> [true, finally: return] !...
-#-----| true -> [false, finally: return] !...
-
-#  114| 0
-#-----|  -> ... == ...
-
-#  114| [finally: exception(Exception)] 0
-#-----|  -> [finally: exception(Exception)] ... == ...
-
-#  114| [finally: exception(NullReferenceException)] 0
-#-----|  -> [finally: exception(NullReferenceException)] ... == ...
-
-#  114| [finally: exception(OutOfMemoryException)] 0
-#-----|  -> [finally: exception(OutOfMemoryException)] ... == ...
-
-#  114| [finally: return] 0
-#-----|  -> [finally: return] ... == ...
-
-#  115| [finally: exception(Exception)] call to method WriteLine
-#-----|  -> [finally: exception(Exception)] if (...) ...
-
-#  115| [finally: exception(NullReferenceException)] call to method WriteLine
-#-----|  -> [finally: exception(NullReferenceException)] if (...) ...
-
-#  115| [finally: exception(OutOfMemoryException)] call to method WriteLine
-#-----|  -> [finally: exception(OutOfMemoryException)] if (...) ...
-
-#  115| [finally: return] call to method WriteLine
-#-----|  -> [finally: return] if (...) ...
-
-#  115| call to method WriteLine
-#-----|  -> if (...) ...
-
-#  115| ...;
-#-----|  -> this access
-
-#  115| [finally: exception(Exception)] ...;
-#-----|  -> [finally: exception(Exception)] this access
-
-#  115| [finally: exception(NullReferenceException)] ...;
-#-----|  -> [finally: exception(NullReferenceException)] this access
-
-#  115| [finally: exception(OutOfMemoryException)] ...;
-#-----|  -> [finally: exception(OutOfMemoryException)] this access
-
-#  115| [finally: return] ...;
-#-----|  -> [finally: return] this access
-
-#  115| [finally: exception(Exception)] access to field Field
-#-----|  -> [finally: exception(Exception)] call to method WriteLine
-
-#  115| [finally: exception(Exception)] this access
-#-----|  -> [finally: exception(Exception)] access to field Field
-
-#  115| [finally: exception(NullReferenceException)] access to field Field
-#-----|  -> [finally: exception(NullReferenceException)] call to method WriteLine
-
-#  115| [finally: exception(NullReferenceException)] this access
-#-----|  -> [finally: exception(NullReferenceException)] access to field Field
-
-#  115| [finally: exception(OutOfMemoryException)] access to field Field
-#-----|  -> [finally: exception(OutOfMemoryException)] call to method WriteLine
-
-#  115| [finally: exception(OutOfMemoryException)] this access
-#-----|  -> [finally: exception(OutOfMemoryException)] access to field Field
-
-#  115| [finally: return] access to field Field
-#-----|  -> [finally: return] call to method WriteLine
-
-#  115| [finally: return] this access
-#-----|  -> [finally: return] access to field Field
-
-#  115| access to field Field
-#-----|  -> call to method WriteLine
-
-#  115| this access
-#-----|  -> access to field Field
-
-#  116| [finally: exception(Exception)] if (...) ...
-#-----|  -> [finally: exception(Exception)] this access
-
-#  116| [finally: exception(NullReferenceException)] if (...) ...
-#-----|  -> [finally: exception(NullReferenceException)] this access
-
-#  116| [finally: exception(OutOfMemoryException)] if (...) ...
-#-----|  -> [finally: exception(OutOfMemoryException)] this access
-
-#  116| [finally: return] if (...) ...
-#-----|  -> [finally: return] this access
-
-#  116| if (...) ...
-#-----|  -> this access
-
-#  116| [finally: exception(Exception)] access to field Field
-#-----|  -> [finally: exception(Exception)] access to property Length
-
-#  116| [finally: exception(Exception)] this access
-#-----|  -> [finally: exception(Exception)] access to field Field
-
-#  116| [finally: exception(NullReferenceException)] access to field Field
-#-----|  -> [finally: exception(NullReferenceException)] access to property Length
-
-#  116| [finally: exception(NullReferenceException)] this access
-#-----|  -> [finally: exception(NullReferenceException)] access to field Field
-
-#  116| [finally: exception(OutOfMemoryException)] access to field Field
-#-----|  -> [finally: exception(OutOfMemoryException)] access to property Length
-
-#  116| [finally: exception(OutOfMemoryException)] this access
-#-----|  -> [finally: exception(OutOfMemoryException)] access to field Field
-
-#  116| [finally: return] access to field Field
-#-----|  -> [finally: return] access to property Length
-
-#  116| [finally: return] this access
-#-----|  -> [finally: return] access to field Field
-
-#  116| access to field Field
-#-----|  -> access to property Length
-
-#  116| this access
-#-----|  -> access to field Field
-
-#  116| [finally: exception(Exception)] access to property Length
-#-----|  -> [finally: exception(Exception)] 0
-
-#  116| [finally: exception(NullReferenceException)] access to property Length
-#-----|  -> [finally: exception(NullReferenceException)] 0
-
-#  116| [finally: exception(OutOfMemoryException)] access to property Length
-#-----|  -> [finally: exception(OutOfMemoryException)] 0
-
-#  116| [finally: return] access to property Length
-#-----|  -> [finally: return] 0
-
-#  116| access to property Length
-#-----|  -> 0
-
-#  116| ... > ...
-#-----| false -> exit M5 (normal)
-#-----| true -> ...;
-
-#  116| [finally: exception(Exception)] ... > ...
-#-----| exception(Exception) -> exit M5 (abnormal)
-#-----| true -> [finally: exception(Exception)] ...;
-
-#  116| [finally: exception(NullReferenceException)] ... > ...
-#-----| exception(NullReferenceException) -> exit M5 (abnormal)
-#-----| true -> [finally: exception(NullReferenceException)] ...;
-
-#  116| [finally: exception(OutOfMemoryException)] ... > ...
-#-----| exception(OutOfMemoryException) -> exit M5 (abnormal)
-#-----| true -> [finally: exception(OutOfMemoryException)] ...;
-
-#  116| [finally: return] ... > ...
-#-----| return -> exit M5 (normal)
-#-----| true -> [finally: return] ...;
-
-#  116| 0
-#-----|  -> ... > ...
-
-#  116| [finally: exception(Exception)] 0
-#-----|  -> [finally: exception(Exception)] ... > ...
-
-#  116| [finally: exception(NullReferenceException)] 0
-#-----|  -> [finally: exception(NullReferenceException)] ... > ...
-
-#  116| [finally: exception(OutOfMemoryException)] 0
-#-----|  -> [finally: exception(OutOfMemoryException)] ... > ...
-
-#  116| [finally: return] 0
-#-----|  -> [finally: return] ... > ...
-
-#  117| [finally: exception(Exception)] call to method WriteLine
-#-----| exception(Exception) -> exit M5 (abnormal)
-
-#  117| [finally: exception(NullReferenceException)] call to method WriteLine
-#-----| exception(NullReferenceException) -> exit M5 (abnormal)
-
-#  117| [finally: exception(OutOfMemoryException)] call to method WriteLine
-#-----| exception(OutOfMemoryException) -> exit M5 (abnormal)
-
-#  117| [finally: return] call to method WriteLine
-#-----| return -> exit M5 (normal)
-
-#  117| call to method WriteLine
-#-----|  -> exit M5 (normal)
-
-#  117| ...;
-#-----|  -> 1
-
-#  117| [finally: exception(Exception)] ...;
-#-----|  -> [finally: exception(Exception)] 1
-
-#  117| [finally: exception(NullReferenceException)] ...;
-#-----|  -> [finally: exception(NullReferenceException)] 1
-
-#  117| [finally: exception(OutOfMemoryException)] ...;
-#-----|  -> [finally: exception(OutOfMemoryException)] 1
-
-#  117| [finally: return] ...;
-#-----|  -> [finally: return] 1
-
-#  117| 1
-#-----|  -> call to method WriteLine
-
-#  117| [finally: exception(Exception)] 1
-#-----|  -> [finally: exception(Exception)] call to method WriteLine
-
-#  117| [finally: exception(NullReferenceException)] 1
-#-----|  -> [finally: exception(NullReferenceException)] call to method WriteLine
-
-#  117| [finally: exception(OutOfMemoryException)] 1
-#-----|  -> [finally: exception(OutOfMemoryException)] call to method WriteLine
-
-#  117| [finally: return] 1
-#-----|  -> [finally: return] call to method WriteLine
-
-#  121| enter M6
-#-----|  -> {...}
-
-#  121| exit M6
-
-#  121| exit M6 (normal)
-#-----|  -> exit M6
-
-#  122| {...}
-#-----|  -> try {...} ...
-
-#  123| try {...} ...
-#-----|  -> {...}
-
-#  124| {...}
-#-----|  -> ... ...;
-
-#  125| ... ...;
-#-----|  -> 0
-
-#  125| Double temp = ...
-#-----|  -> exit M6 (normal)
-
-#  125| (...) ...
-#-----|  -> access to constant E
-
-#  125| 0
-#-----|  -> (...) ...
-
-#  125| ... / ...
-#-----|  -> Double temp = ...
-
-#  125| access to constant E
-#-----|  -> ... / ...
-
-#  133| enter M7
-#-----|  -> {...}
-
-#  133| exit M7
-
-#  133| exit M7 (abnormal)
-#-----|  -> exit M7
-
-#  134| {...}
-#-----|  -> try {...} ...
-
-#  135| try {...} ...
-#-----|  -> {...}
-
-#  136| {...}
-#-----|  -> ...;
-
-#  137| call to method WriteLine
-#-----| exception(Exception) -> [finally: exception(Exception)] {...}
-#-----|  -> {...}
-
-#  137| ...;
-#-----|  -> "Try"
-
-#  137| "Try"
-#-----|  -> call to method WriteLine
-
-#  140| [finally: exception(Exception)] {...}
-#-----|  -> [finally: exception(Exception)] ""
-
-#  140| {...}
-#-----|  -> ""
-
-#  141| [finally: exception(Exception)] throw ...;
-#-----| exception(ArgumentException) -> exit M7 (abnormal)
-
-#  141| throw ...;
-#-----| exception(ArgumentException) -> exit M7 (abnormal)
-
-#  141| [finally: exception(Exception)] object creation of type ArgumentException
-#-----|  -> [finally: exception(Exception)] throw ...;
-
-#  141| object creation of type ArgumentException
-#-----|  -> throw ...;
-
-#  141| ""
-#-----|  -> object creation of type ArgumentException
-
-#  141| [finally: exception(Exception)] ""
-#-----|  -> [finally: exception(Exception)] object creation of type ArgumentException
-
-#  147| enter M8
-#-----|  -> {...}
-
-#  147| exit M8
-
-#  147| exit M8 (abnormal)
-#-----|  -> exit M8
-
-#  147| exit M8 (normal)
-#-----|  -> exit M8
-
-#  148| {...}
-#-----|  -> try {...} ...
-
-#  149| try {...} ...
-#-----|  -> {...}
-
-#  150| {...}
-#-----|  -> if (...) ...
-
-#  151| if (...) ...
-#-----|  -> access to parameter args
-
-#  151| access to parameter args
-#-----|  -> null
-
-#  151| ... == ...
-#-----| true -> object creation of type ArgumentNullException
-#-----| false -> {...}
-
-#  151| null
-#-----|  -> ... == ...
-
-#  152| throw ...;
-#-----| exception(ArgumentNullException) -> [finally: exception(ArgumentNullException)] {...}
-
-#  152| object creation of type ArgumentNullException
-#-----|  -> throw ...;
-#-----| exception(Exception) -> [finally: exception(Exception)] {...}
-
-#  155| [finally: exception(ArgumentNullException)] {...}
-#-----|  -> [finally: exception(ArgumentNullException)] try {...} ...
-
-#  155| [finally: exception(Exception)] {...}
-#-----|  -> [finally: exception(Exception)] try {...} ...
-
-#  155| {...}
-#-----|  -> try {...} ...
-
-#  156| [finally: exception(ArgumentNullException)] try {...} ...
-#-----|  -> [finally: exception(ArgumentNullException)] {...}
-
-#  156| [finally: exception(Exception)] try {...} ...
-#-----|  -> [finally: exception(Exception)] {...}
-
-#  156| try {...} ...
-#-----|  -> {...}
-
-#  157| [finally: exception(ArgumentNullException)] {...}
-#-----|  -> [finally: exception(ArgumentNullException)] if (...) ...
-
-#  157| [finally: exception(Exception)] {...}
-#-----|  -> [finally: exception(Exception)] if (...) ...
-
-#  157| {...}
-#-----|  -> if (...) ...
-
-#  158| [finally: exception(ArgumentNullException)] if (...) ...
-#-----|  -> [finally: exception(ArgumentNullException)] access to parameter args
-
-#  158| [finally: exception(Exception)] if (...) ...
-#-----|  -> [finally: exception(Exception)] access to parameter args
-
-#  158| if (...) ...
-#-----|  -> access to parameter args
-
-#  158| [finally: exception(ArgumentNullException)] access to parameter args
-#-----|  -> [finally: exception(ArgumentNullException)] access to property Length
-
-#  158| [finally: exception(Exception)] access to parameter args
-#-----|  -> [finally: exception(Exception)] access to property Length
-
-#  158| access to parameter args
-#-----|  -> access to property Length
-
-#  158| [finally: exception(ArgumentNullException)] access to property Length
-#-----|  -> [finally: exception(ArgumentNullException)] 1
-#-----| exception(Exception) -> [finally: exception(ArgumentNullException), exception: Exception] catch (...) {...}
-#-----| exception(NullReferenceException) -> [finally: exception(ArgumentNullException), exception: NullReferenceException] catch (...) {...}
-
-#  158| [finally: exception(Exception)] access to property Length
-#-----|  -> [finally: exception(Exception)] 1
-#-----| exception(Exception) -> [finally: exception(Exception), exception: Exception] catch (...) {...}
-#-----| exception(NullReferenceException) -> [finally: exception(Exception), exception: NullReferenceException] catch (...) {...}
-
-#  158| access to property Length
-#-----|  -> 1
-#-----| exception(Exception) -> [exception: Exception] catch (...) {...}
-#-----| exception(NullReferenceException) -> [exception: NullReferenceException] catch (...) {...}
-
-#  158| ... == ...
-#-----| false -> exit M8 (normal)
-#-----| true -> "1"
-
-#  158| [finally: exception(ArgumentNullException)] ... == ...
-#-----| exception(ArgumentNullException) -> exit M8 (abnormal)
-#-----| true -> [finally: exception(ArgumentNullException)] "1"
-
-#  158| [finally: exception(Exception)] ... == ...
-#-----| exception(Exception) -> exit M8 (abnormal)
-#-----| true -> [finally: exception(Exception)] "1"
-
-#  158| 1
-#-----|  -> ... == ...
-
-#  158| [finally: exception(ArgumentNullException)] 1
-#-----|  -> [finally: exception(ArgumentNullException)] ... == ...
-
-#  158| [finally: exception(Exception)] 1
-#-----|  -> [finally: exception(Exception)] ... == ...
-
-#  159| [finally: exception(ArgumentNullException)] throw ...;
-#-----| exception(Exception) -> [finally: exception(ArgumentNullException), exception: Exception] catch (...) {...}
-
-#  159| [finally: exception(Exception)] throw ...;
-#-----| exception(Exception) -> [finally: exception(Exception), exception: Exception] catch (...) {...}
-
-#  159| throw ...;
-#-----| exception(Exception) -> [exception: Exception] catch (...) {...}
-
-#  159| [finally: exception(ArgumentNullException)] object creation of type Exception
-#-----|  -> [finally: exception(ArgumentNullException)] throw ...;
-#-----| exception(Exception) -> [finally: exception(ArgumentNullException), exception: Exception] catch (...) {...}
-
-#  159| [finally: exception(Exception)] object creation of type Exception
-#-----|  -> [finally: exception(Exception)] throw ...;
-#-----| exception(Exception) -> [finally: exception(Exception), exception: Exception] catch (...) {...}
-
-#  159| object creation of type Exception
-#-----|  -> throw ...;
-#-----| exception(Exception) -> [exception: Exception] catch (...) {...}
-
-#  159| "1"
-#-----|  -> object creation of type Exception
-
-#  159| [finally: exception(ArgumentNullException)] "1"
-#-----|  -> [finally: exception(ArgumentNullException)] object creation of type Exception
-
-#  159| [finally: exception(Exception)] "1"
-#-----|  -> [finally: exception(Exception)] object creation of type Exception
-
-#  161| [exception: Exception] catch (...) {...}
-#-----| match -> [exception: Exception] Exception e
-
-#  161| [exception: NullReferenceException] catch (...) {...}
-#-----| match -> [exception: NullReferenceException] Exception e
-
-#  161| [finally: exception(ArgumentNullException), exception: Exception] catch (...) {...}
-#-----| match -> [finally: exception(ArgumentNullException), exception: Exception] Exception e
-
-#  161| [finally: exception(ArgumentNullException), exception: NullReferenceException] catch (...) {...}
-#-----| match -> [finally: exception(ArgumentNullException), exception: NullReferenceException] Exception e
-
-#  161| [finally: exception(Exception), exception: Exception] catch (...) {...}
-#-----| match -> [finally: exception(Exception), exception: Exception] Exception e
-
-#  161| [finally: exception(Exception), exception: NullReferenceException] catch (...) {...}
-#-----| match -> [finally: exception(Exception), exception: NullReferenceException] Exception e
-
-#  161| [exception: Exception] Exception e
-#-----|  -> [exception: Exception] access to local variable e
-
-#  161| [exception: NullReferenceException] Exception e
-#-----|  -> [exception: NullReferenceException] access to local variable e
-
-#  161| [finally: exception(ArgumentNullException), exception: Exception] Exception e
-#-----|  -> [finally: exception(ArgumentNullException), exception: Exception] access to local variable e
-
-#  161| [finally: exception(ArgumentNullException), exception: NullReferenceException] Exception e
-#-----|  -> [finally: exception(ArgumentNullException), exception: NullReferenceException] access to local variable e
-
-#  161| [finally: exception(Exception), exception: Exception] Exception e
-#-----|  -> [finally: exception(Exception), exception: Exception] access to local variable e
-
-#  161| [finally: exception(Exception), exception: NullReferenceException] Exception e
-#-----|  -> [finally: exception(Exception), exception: NullReferenceException] access to local variable e
-
-#  161| [exception: Exception] access to local variable e
-#-----|  -> [exception: Exception] access to property Message
-
-#  161| [exception: NullReferenceException] access to local variable e
-#-----|  -> [exception: NullReferenceException] access to property Message
-
-#  161| [finally: exception(ArgumentNullException), exception: Exception] access to local variable e
-#-----|  -> [finally: exception(ArgumentNullException), exception: Exception] access to property Message
-
-#  161| [finally: exception(ArgumentNullException), exception: NullReferenceException] access to local variable e
-#-----|  -> [finally: exception(ArgumentNullException), exception: NullReferenceException] access to property Message
-
-#  161| [finally: exception(Exception), exception: Exception] access to local variable e
-#-----|  -> [finally: exception(Exception), exception: Exception] access to property Message
-
-#  161| [finally: exception(Exception), exception: NullReferenceException] access to local variable e
-#-----|  -> [finally: exception(Exception), exception: NullReferenceException] access to property Message
-
-#  161| [exception: Exception] access to property Message
-#-----|  -> [exception: Exception] "1"
-
-#  161| [exception: NullReferenceException] access to property Message
-#-----|  -> [exception: NullReferenceException] "1"
-
-#  161| [finally: exception(ArgumentNullException), exception: Exception] access to property Message
-#-----|  -> [finally: exception(ArgumentNullException), exception: Exception] "1"
-
-#  161| [finally: exception(ArgumentNullException), exception: NullReferenceException] access to property Message
-#-----|  -> [finally: exception(ArgumentNullException), exception: NullReferenceException] "1"
-
-#  161| [finally: exception(Exception), exception: Exception] access to property Message
-#-----|  -> [finally: exception(Exception), exception: Exception] "1"
-
-#  161| [finally: exception(Exception), exception: NullReferenceException] access to property Message
-#-----|  -> [finally: exception(Exception), exception: NullReferenceException] "1"
-
-#  161| [exception: Exception] ... == ...
-#-----| true -> {...}
-#-----| false -> catch {...}
-
-#  161| [exception: NullReferenceException] ... == ...
-#-----| true -> {...}
-#-----| false -> catch {...}
-
-#  161| [finally: exception(ArgumentNullException), exception: Exception] ... == ...
-#-----| true -> [finally: exception(ArgumentNullException)] {...}
-#-----| false -> [finally: exception(ArgumentNullException)] catch {...}
-
-#  161| [finally: exception(ArgumentNullException), exception: NullReferenceException] ... == ...
-#-----| true -> [finally: exception(ArgumentNullException)] {...}
-#-----| false -> [finally: exception(ArgumentNullException)] catch {...}
-
-#  161| [finally: exception(Exception), exception: Exception] ... == ...
-#-----| true -> [finally: exception(Exception)] {...}
-#-----| false -> [finally: exception(Exception)] catch {...}
-
-#  161| [finally: exception(Exception), exception: NullReferenceException] ... == ...
-#-----| true -> [finally: exception(Exception)] {...}
-#-----| false -> [finally: exception(Exception)] catch {...}
-
-#  161| [exception: Exception] "1"
-#-----|  -> [exception: Exception] ... == ...
-
-#  161| [exception: NullReferenceException] "1"
-#-----|  -> [exception: NullReferenceException] ... == ...
-
-#  161| [finally: exception(ArgumentNullException), exception: Exception] "1"
-#-----|  -> [finally: exception(ArgumentNullException), exception: Exception] ... == ...
-
-#  161| [finally: exception(ArgumentNullException), exception: NullReferenceException] "1"
-#-----|  -> [finally: exception(ArgumentNullException), exception: NullReferenceException] ... == ...
-
-#  161| [finally: exception(Exception), exception: Exception] "1"
-#-----|  -> [finally: exception(Exception), exception: Exception] ... == ...
-
-#  161| [finally: exception(Exception), exception: NullReferenceException] "1"
-#-----|  -> [finally: exception(Exception), exception: NullReferenceException] ... == ...
-
-#  162| [finally: exception(ArgumentNullException)] {...}
-#-----|  -> [finally: exception(ArgumentNullException)] ...;
-
-#  162| [finally: exception(Exception)] {...}
-#-----|  -> [finally: exception(Exception)] ...;
-
-#  162| {...}
-#-----|  -> ...;
-
-#  163| [finally: exception(ArgumentNullException)] call to method WriteLine
-#-----| exception(ArgumentNullException) -> exit M8 (abnormal)
-
-#  163| [finally: exception(Exception)] call to method WriteLine
-#-----| exception(Exception) -> exit M8 (abnormal)
-
-#  163| call to method WriteLine
-#-----|  -> exit M8 (normal)
-
-#  163| ...;
-#-----|  -> access to parameter args
-
-#  163| [finally: exception(ArgumentNullException)] ...;
-#-----|  -> [finally: exception(ArgumentNullException)] access to parameter args
-
-#  163| [finally: exception(Exception)] ...;
-#-----|  -> [finally: exception(Exception)] access to parameter args
-
-#  163| [finally: exception(ArgumentNullException)] access to parameter args
-#-----|  -> [finally: exception(ArgumentNullException)] 0
-
-#  163| [finally: exception(Exception)] access to parameter args
-#-----|  -> [finally: exception(Exception)] 0
-
-#  163| access to parameter args
-#-----|  -> 0
-
-#  163| [finally: exception(ArgumentNullException)] access to array element
-#-----|  -> [finally: exception(ArgumentNullException)] call to method WriteLine
-
-#  163| [finally: exception(Exception)] access to array element
-#-----|  -> [finally: exception(Exception)] call to method WriteLine
-
-#  163| access to array element
-#-----|  -> call to method WriteLine
-
-#  163| 0
-#-----|  -> access to array element
-
-#  163| [finally: exception(ArgumentNullException)] 0
-#-----|  -> [finally: exception(ArgumentNullException)] access to array element
-
-#  163| [finally: exception(Exception)] 0
-#-----|  -> [finally: exception(Exception)] access to array element
-
-#  165| [finally: exception(ArgumentNullException)] catch {...}
-#-----|  -> [finally: exception(ArgumentNullException)] {...}
-
-#  165| [finally: exception(Exception)] catch {...}
-#-----|  -> [finally: exception(Exception)] {...}
-
-#  165| catch {...}
-#-----|  -> {...}
-
-#  166| [finally: exception(ArgumentNullException)] {...}
-#-----|  -> [finally: exception(ArgumentNullException)] ...;
-
-#  166| [finally: exception(Exception)] {...}
-#-----|  -> [finally: exception(Exception)] ...;
-
-#  166| {...}
-#-----|  -> ...;
-
-#  167| [finally: exception(ArgumentNullException)] call to method WriteLine
-#-----| exception(ArgumentNullException) -> exit M8 (abnormal)
-
-#  167| [finally: exception(Exception)] call to method WriteLine
-#-----| exception(Exception) -> exit M8 (abnormal)
-
-#  167| call to method WriteLine
-#-----|  -> exit M8 (normal)
-
-#  167| ...;
-#-----|  -> ""
-
-#  167| [finally: exception(ArgumentNullException)] ...;
-#-----|  -> [finally: exception(ArgumentNullException)] ""
-
-#  167| [finally: exception(Exception)] ...;
-#-----|  -> [finally: exception(Exception)] ""
-
-#  167| ""
-#-----|  -> call to method WriteLine
-
-#  167| [finally: exception(ArgumentNullException)] ""
-#-----|  -> [finally: exception(ArgumentNullException)] call to method WriteLine
-
-#  167| [finally: exception(Exception)] ""
-#-----|  -> [finally: exception(Exception)] call to method WriteLine
-
-#  172| call to constructor Exception
-#-----|  -> {...}
-
-#  172| enter ExceptionA
-#-----|  -> call to constructor Exception
-
-#  172| exit ExceptionA
-
-#  172| exit ExceptionA (normal)
-#-----|  -> exit ExceptionA
-
-#  172| {...}
-#-----|  -> exit ExceptionA (normal)
-
-#  173| call to constructor Exception
-#-----|  -> {...}
-
-#  173| enter ExceptionB
-#-----|  -> call to constructor Exception
-
-#  173| exit ExceptionB
-
-#  173| exit ExceptionB (normal)
-#-----|  -> exit ExceptionB
-
-#  173| {...}
-#-----|  -> exit ExceptionB (normal)
-
-#  174| call to constructor Exception
-#-----|  -> {...}
-
-#  174| enter ExceptionC
-#-----|  -> call to constructor Exception
-
-#  174| exit ExceptionC
-
-#  174| exit ExceptionC (normal)
-#-----|  -> exit ExceptionC
-
-#  174| {...}
-#-----|  -> exit ExceptionC (normal)
-
-#  176| enter M9
-#-----|  -> {...}
-
-#  176| exit M9
-
-#  176| exit M9 (abnormal)
-#-----|  -> exit M9
-
-#  176| exit M9 (normal)
-#-----|  -> exit M9
-
-#  177| {...}
-#-----|  -> try {...} ...
-
-#  178| try {...} ...
-#-----|  -> {...}
-
-#  179| {...}
-#-----|  -> if (...) ...
-
-#  180| if (...) ...
-#-----|  -> access to parameter b1
-
-#  180| access to parameter b1
-#-----| true -> [b1 (line 176): true] object creation of type ExceptionA
-#-----| false -> [b1 (line 176): false] {...}
-
-#  180| [b1 (line 176): true] throw ...;
-#-----| exception(ExceptionA) -> [finally: exception(ExceptionA), b1 (line 176): true] {...}
-
-#  180| [b1 (line 176): true] object creation of type ExceptionA
-#-----|  -> [b1 (line 176): true] throw ...;
-#-----| exception(Exception) -> [finally: exception(Exception), b1 (line 176): true] {...}
-
-#  183| [b1 (line 176): false] {...}
-#-----|  -> [b1 (line 176): false] try {...} ...
-
-#  183| [finally: exception(Exception), b1 (line 176): true] {...}
-#-----|  -> [finally: exception(Exception), b1 (line 176): true] try {...} ...
-
-#  183| [finally: exception(ExceptionA), b1 (line 176): true] {...}
-#-----|  -> [finally: exception(ExceptionA), b1 (line 176): true] try {...} ...
-
-#  184| [b1 (line 176): false] try {...} ...
-#-----|  -> [b1 (line 176): false] {...}
-
-#  184| [finally: exception(Exception), b1 (line 176): true] try {...} ...
-#-----|  -> [finally: exception(Exception), b1 (line 176): true] {...}
-
-#  184| [finally: exception(ExceptionA), b1 (line 176): true] try {...} ...
-#-----|  -> [finally: exception(ExceptionA), b1 (line 176): true] {...}
-
-#  185| [b1 (line 176): false] {...}
-#-----|  -> [b1 (line 176): false] if (...) ...
-
-#  185| [finally: exception(Exception), b1 (line 176): true] {...}
-#-----|  -> [finally: exception(Exception), b1 (line 176): true] if (...) ...
-
-#  185| [finally: exception(ExceptionA), b1 (line 176): true] {...}
-#-----|  -> [finally: exception(ExceptionA), b1 (line 176): true] if (...) ...
-
-#  186| [b1 (line 176): false] if (...) ...
-#-----|  -> [b1 (line 176): false] access to parameter b2
-
-#  186| [finally: exception(Exception), b1 (line 176): true] if (...) ...
-#-----|  -> [finally: exception(Exception), b1 (line 176): true] access to parameter b2
-
-#  186| [finally: exception(ExceptionA), b1 (line 176): true] if (...) ...
-#-----|  -> [finally: exception(ExceptionA), b1 (line 176): true] access to parameter b2
-
-#  186| [b1 (line 176): false] access to parameter b2
-#-----| false -> exit M9 (normal)
-#-----| true -> [b1 (line 176): false, b2 (line 176): true] object creation of type ExceptionB
-
-#  186| [finally: exception(Exception), b1 (line 176): true] access to parameter b2
-#-----| exception(Exception) -> exit M9 (abnormal)
-#-----| true -> [finally: exception(Exception), b1 (line 176): true, b2 (line 176): true] object creation of type ExceptionB
-
-#  186| [finally: exception(ExceptionA), b1 (line 176): true] access to parameter b2
-#-----| exception(ExceptionA) -> exit M9 (abnormal)
-#-----| true -> [finally: exception(ExceptionA), b1 (line 176): true, b2 (line 176): true] object creation of type ExceptionB
-
-#  186| [b1 (line 176): false, b2 (line 176): true] throw ...;
-#-----| exception(ExceptionB) -> [exception: ExceptionB, b1 (line 176): false, b2 (line 176): true] catch (...) {...}
-
-#  186| [finally: exception(Exception), b1 (line 176): true, b2 (line 176): true] throw ...;
-#-----| exception(ExceptionB) -> [finally: exception(Exception), exception: ExceptionB, b1 (line 176): true, b2 (line 176): true] catch (...) {...}
-
-#  186| [finally: exception(ExceptionA), b1 (line 176): true, b2 (line 176): true] throw ...;
-#-----| exception(ExceptionB) -> [finally: exception(ExceptionA), exception: ExceptionB, b1 (line 176): true, b2 (line 176): true] catch (...) {...}
-
-#  186| [b1 (line 176): false, b2 (line 176): true] object creation of type ExceptionB
-#-----|  -> [b1 (line 176): false, b2 (line 176): true] throw ...;
-#-----| exception(Exception) -> [exception: Exception, b1 (line 176): false, b2 (line 176): true] catch (...) {...}
-
-#  186| [finally: exception(Exception), b1 (line 176): true, b2 (line 176): true] object creation of type ExceptionB
-#-----|  -> [finally: exception(Exception), b1 (line 176): true, b2 (line 176): true] throw ...;
-#-----| exception(Exception) -> [finally: exception(Exception), exception: Exception, b1 (line 176): true, b2 (line 176): true] catch (...) {...}
-
-#  186| [finally: exception(ExceptionA), b1 (line 176): true, b2 (line 176): true] object creation of type ExceptionB
-#-----|  -> [finally: exception(ExceptionA), b1 (line 176): true, b2 (line 176): true] throw ...;
-#-----| exception(Exception) -> [finally: exception(ExceptionA), exception: Exception, b1 (line 176): true, b2 (line 176): true] catch (...) {...}
-
-#  188| [exception: Exception, b1 (line 176): false, b2 (line 176): true] catch (...) {...}
-#-----| exception(Exception) -> exit M9 (abnormal)
-#-----| match -> [exception: Exception, b1 (line 176): false, b2 (line 176): true] access to parameter b2
-
-#  188| [exception: ExceptionB, b1 (line 176): false, b2 (line 176): true] catch (...) {...}
-#-----| match -> [exception: ExceptionB, b1 (line 176): false, b2 (line 176): true] access to parameter b2
-
-#  188| [finally: exception(Exception), exception: Exception, b1 (line 176): true, b2 (line 176): true] catch (...) {...}
-#-----| exception(Exception) -> exit M9 (abnormal)
-#-----| match -> [finally: exception(Exception), exception: Exception, b1 (line 176): true, b2 (line 176): true] access to parameter b2
-
-#  188| [finally: exception(Exception), exception: ExceptionB, b1 (line 176): true, b2 (line 176): true] catch (...) {...}
-#-----| match -> [finally: exception(Exception), exception: ExceptionB, b1 (line 176): true, b2 (line 176): true] access to parameter b2
-
-#  188| [finally: exception(ExceptionA), exception: Exception, b1 (line 176): true, b2 (line 176): true] catch (...) {...}
-#-----| exception(Exception) -> exit M9 (abnormal)
-#-----| match -> [finally: exception(ExceptionA), exception: Exception, b1 (line 176): true, b2 (line 176): true] access to parameter b2
-
-#  188| [finally: exception(ExceptionA), exception: ExceptionB, b1 (line 176): true, b2 (line 176): true] catch (...) {...}
-#-----| match -> [finally: exception(ExceptionA), exception: ExceptionB, b1 (line 176): true, b2 (line 176): true] access to parameter b2
-
-#  188| [exception: Exception, b1 (line 176): false, b2 (line 176): true] access to parameter b2
-#-----| true -> [b1 (line 176): false] {...}
-
-#  188| [exception: ExceptionB, b1 (line 176): false, b2 (line 176): true] access to parameter b2
-#-----| true -> [b1 (line 176): false] {...}
-
-#  188| [finally: exception(Exception), exception: Exception, b1 (line 176): true, b2 (line 176): true] access to parameter b2
-#-----| true -> [finally: exception(Exception), b1 (line 176): true] {...}
-
-#  188| [finally: exception(Exception), exception: ExceptionB, b1 (line 176): true, b2 (line 176): true] access to parameter b2
-#-----| true -> [finally: exception(Exception), b1 (line 176): true] {...}
-
-#  188| [finally: exception(ExceptionA), exception: Exception, b1 (line 176): true, b2 (line 176): true] access to parameter b2
-#-----| true -> [finally: exception(ExceptionA), b1 (line 176): true] {...}
-
-#  188| [finally: exception(ExceptionA), exception: ExceptionB, b1 (line 176): true, b2 (line 176): true] access to parameter b2
-#-----| true -> [finally: exception(ExceptionA), b1 (line 176): true] {...}
-
-#  189| [b1 (line 176): false] {...}
-#-----|  -> [b1 (line 176): false] if (...) ...
-
-#  189| [finally: exception(Exception), b1 (line 176): true] {...}
-#-----|  -> [finally: exception(Exception), b1 (line 176): true] if (...) ...
-
-#  189| [finally: exception(ExceptionA), b1 (line 176): true] {...}
-#-----|  -> [finally: exception(ExceptionA), b1 (line 176): true] if (...) ...
-
-#  190| [b1 (line 176): false] if (...) ...
-#-----|  -> [b1 (line 176): false] access to parameter b1
-
-#  190| [finally: exception(Exception), b1 (line 176): true] if (...) ...
-#-----|  -> [finally: exception(Exception), b1 (line 176): true] access to parameter b1
-
-#  190| [finally: exception(ExceptionA), b1 (line 176): true] if (...) ...
-#-----|  -> [finally: exception(ExceptionA), b1 (line 176): true] access to parameter b1
-
-#  190| [b1 (line 176): false] access to parameter b1
-#-----| false -> exit M9 (normal)
-
-#  190| [finally: exception(Exception), b1 (line 176): true] access to parameter b1
-#-----| true -> [finally: exception(Exception)] object creation of type ExceptionC
-
-#  190| [finally: exception(ExceptionA), b1 (line 176): true] access to parameter b1
-#-----| true -> [finally: exception(ExceptionA)] object creation of type ExceptionC
-
-#  190| [finally: exception(Exception)] throw ...;
-#-----| exception(ExceptionC) -> exit M9 (abnormal)
-
-#  190| [finally: exception(ExceptionA)] throw ...;
-#-----| exception(ExceptionC) -> exit M9 (abnormal)
-
-#  190| [finally: exception(Exception)] object creation of type ExceptionC
-#-----|  -> [finally: exception(Exception)] throw ...;
-
-#  190| [finally: exception(ExceptionA)] object creation of type ExceptionC
-#-----|  -> [finally: exception(ExceptionA)] throw ...;
-
-#  195| enter M10
-#-----|  -> {...}
-
-#  195| exit M10
-
-#  195| exit M10 (abnormal)
-#-----|  -> exit M10
-
-#  195| exit M10 (normal)
-#-----|  -> exit M10
-
-#  196| {...}
-#-----|  -> try {...} ...
-
-#  197| try {...} ...
-#-----|  -> {...}
-
-#  198| {...}
-#-----|  -> if (...) ...
-
-#  199| if (...) ...
-#-----|  -> access to parameter b1
-
-#  199| access to parameter b1
-#-----| true -> object creation of type ExceptionA
-#-----| false -> {...}
-
-#  199| throw ...;
-#-----| exception(ExceptionA) -> [finally: exception(ExceptionA)] {...}
-
-#  199| object creation of type ExceptionA
-#-----|  -> throw ...;
-#-----| exception(Exception) -> [finally: exception(Exception)] {...}
-
-#  202| [finally: exception(Exception)] {...}
-#-----|  -> [finally: exception(Exception)] try {...} ...
-
-#  202| [finally: exception(ExceptionA)] {...}
-#-----|  -> [finally: exception(ExceptionA)] try {...} ...
-
-#  202| {...}
-#-----|  -> try {...} ...
-
-#  203| [finally: exception(Exception)] try {...} ...
-#-----|  -> [finally: exception(Exception)] {...}
-
-#  203| [finally: exception(ExceptionA)] try {...} ...
-#-----|  -> [finally: exception(ExceptionA)] {...}
-
-#  203| try {...} ...
-#-----|  -> {...}
-
-#  204| [finally: exception(Exception)] {...}
-#-----|  -> [finally: exception(Exception)] if (...) ...
-
-#  204| [finally: exception(ExceptionA)] {...}
-#-----|  -> [finally: exception(ExceptionA)] if (...) ...
-
-#  204| {...}
-#-----|  -> if (...) ...
-
-#  205| [finally: exception(Exception)] if (...) ...
-#-----|  -> [finally: exception(Exception)] access to parameter b2
-
-#  205| [finally: exception(ExceptionA)] if (...) ...
-#-----|  -> [finally: exception(ExceptionA)] access to parameter b2
-
-#  205| if (...) ...
-#-----|  -> access to parameter b2
-
-#  205| [finally: exception(Exception)] access to parameter b2
-#-----| true -> [finally: exception(Exception)] object creation of type ExceptionB
-#-----| false -> [finally: exception(Exception)] {...}
-
-#  205| [finally: exception(ExceptionA)] access to parameter b2
-#-----| true -> [finally: exception(ExceptionA)] object creation of type ExceptionB
-#-----| false -> [finally: exception(ExceptionA)] {...}
-
-#  205| access to parameter b2
-#-----| true -> object creation of type ExceptionB
-#-----| false -> {...}
-
-#  205| [finally: exception(Exception)] throw ...;
-#-----| exception(ExceptionB) -> [finally: exception(Exception), finally(1): exception(ExceptionB)] {...}
-
-#  205| [finally: exception(ExceptionA)] throw ...;
-#-----| exception(ExceptionB) -> [finally: exception(ExceptionA), finally(1): exception(ExceptionB)] {...}
-
-#  205| throw ...;
-#-----| exception(ExceptionB) -> [finally(1): exception(ExceptionB)] {...}
-
-#  205| [finally: exception(Exception)] object creation of type ExceptionB
-#-----|  -> [finally: exception(Exception)] throw ...;
-#-----| exception(Exception) -> [finally: exception(Exception), finally(1): exception(Exception)] {...}
-
-#  205| [finally: exception(ExceptionA)] object creation of type ExceptionB
-#-----|  -> [finally: exception(ExceptionA)] throw ...;
-#-----| exception(Exception) -> [finally: exception(ExceptionA), finally(1): exception(Exception)] {...}
-
-#  205| object creation of type ExceptionB
-#-----|  -> throw ...;
-#-----| exception(Exception) -> [finally(1): exception(Exception)] {...}
-
-#  208| [finally(1): exception(Exception)] {...}
-#-----|  -> [finally(1): exception(Exception)] if (...) ...
-
-#  208| [finally(1): exception(ExceptionB)] {...}
-#-----|  -> [finally(1): exception(ExceptionB)] if (...) ...
-
-#  208| [finally: exception(Exception), finally(1): exception(Exception)] {...}
-#-----|  -> [finally: exception(Exception), finally(1): exception(Exception)] if (...) ...
-
-#  208| [finally: exception(Exception), finally(1): exception(ExceptionB)] {...}
-#-----|  -> [finally: exception(Exception), finally(1): exception(ExceptionB)] if (...) ...
-
-#  208| [finally: exception(Exception)] {...}
-#-----|  -> [finally: exception(Exception)] if (...) ...
-
-#  208| [finally: exception(ExceptionA), finally(1): exception(Exception)] {...}
-#-----|  -> [finally: exception(ExceptionA), finally(1): exception(Exception)] if (...) ...
-
-#  208| [finally: exception(ExceptionA), finally(1): exception(ExceptionB)] {...}
-#-----|  -> [finally: exception(ExceptionA), finally(1): exception(ExceptionB)] if (...) ...
-
-#  208| [finally: exception(ExceptionA)] {...}
-#-----|  -> [finally: exception(ExceptionA)] if (...) ...
-
-#  208| {...}
-#-----|  -> if (...) ...
-
-#  209| [finally(1): exception(Exception)] if (...) ...
-#-----|  -> [finally(1): exception(Exception)] access to parameter b3
-
-#  209| [finally(1): exception(ExceptionB)] if (...) ...
-#-----|  -> [finally(1): exception(ExceptionB)] access to parameter b3
-
-#  209| [finally: exception(Exception), finally(1): exception(Exception)] if (...) ...
-#-----|  -> [finally: exception(Exception), finally(1): exception(Exception)] access to parameter b3
-
-#  209| [finally: exception(Exception), finally(1): exception(ExceptionB)] if (...) ...
-#-----|  -> [finally: exception(Exception), finally(1): exception(ExceptionB)] access to parameter b3
-
-#  209| [finally: exception(Exception)] if (...) ...
-#-----|  -> [finally: exception(Exception)] access to parameter b3
-
-#  209| [finally: exception(ExceptionA), finally(1): exception(Exception)] if (...) ...
-#-----|  -> [finally: exception(ExceptionA), finally(1): exception(Exception)] access to parameter b3
-
-#  209| [finally: exception(ExceptionA), finally(1): exception(ExceptionB)] if (...) ...
-#-----|  -> [finally: exception(ExceptionA), finally(1): exception(ExceptionB)] access to parameter b3
-
-#  209| [finally: exception(ExceptionA)] if (...) ...
-#-----|  -> [finally: exception(ExceptionA)] access to parameter b3
-
-#  209| if (...) ...
-#-----|  -> access to parameter b3
-
-#  209| [finally(1): exception(Exception)] access to parameter b3
-#-----| exception(Exception) -> exit M10 (abnormal)
-#-----| true -> [finally(1): exception(Exception)] object creation of type ExceptionC
-
-#  209| [finally(1): exception(ExceptionB)] access to parameter b3
-#-----| exception(ExceptionB) -> exit M10 (abnormal)
-#-----| true -> [finally(1): exception(ExceptionB)] object creation of type ExceptionC
-
-#  209| [finally: exception(Exception), finally(1): exception(Exception)] access to parameter b3
-#-----| exception(Exception) -> exit M10 (abnormal)
-#-----| true -> [finally: exception(Exception), finally(1): exception(Exception)] object creation of type ExceptionC
-
-#  209| [finally: exception(Exception), finally(1): exception(ExceptionB)] access to parameter b3
-#-----| exception(ExceptionB) -> exit M10 (abnormal)
-#-----| true -> [finally: exception(Exception), finally(1): exception(ExceptionB)] object creation of type ExceptionC
-
-#  209| [finally: exception(Exception)] access to parameter b3
-#-----| true -> [finally: exception(Exception)] object creation of type ExceptionC
-#-----| false -> [finally: exception(Exception)] ...;
-
-#  209| [finally: exception(ExceptionA), finally(1): exception(Exception)] access to parameter b3
-#-----| exception(Exception) -> exit M10 (abnormal)
-#-----| true -> [finally: exception(ExceptionA), finally(1): exception(Exception)] object creation of type ExceptionC
-
-#  209| [finally: exception(ExceptionA), finally(1): exception(ExceptionB)] access to parameter b3
-#-----| exception(ExceptionB) -> exit M10 (abnormal)
-#-----| true -> [finally: exception(ExceptionA), finally(1): exception(ExceptionB)] object creation of type ExceptionC
-
-#  209| [finally: exception(ExceptionA)] access to parameter b3
-#-----| true -> [finally: exception(ExceptionA)] object creation of type ExceptionC
-#-----| false -> [finally: exception(ExceptionA)] ...;
-
-#  209| access to parameter b3
-#-----| true -> object creation of type ExceptionC
-#-----| false -> ...;
-
-#  209| [finally(1): exception(Exception)] throw ...;
-#-----| exception(ExceptionC) -> exit M10 (abnormal)
-
-#  209| [finally(1): exception(ExceptionB)] throw ...;
-#-----| exception(ExceptionC) -> exit M10 (abnormal)
-
-#  209| [finally: exception(Exception), finally(1): exception(Exception)] throw ...;
-#-----| exception(ExceptionC) -> exit M10 (abnormal)
-
-#  209| [finally: exception(Exception), finally(1): exception(ExceptionB)] throw ...;
-#-----| exception(ExceptionC) -> exit M10 (abnormal)
-
-#  209| [finally: exception(Exception)] throw ...;
-#-----| exception(ExceptionC) -> exit M10 (abnormal)
-
-#  209| [finally: exception(ExceptionA), finally(1): exception(Exception)] throw ...;
-#-----| exception(ExceptionC) -> exit M10 (abnormal)
-
-#  209| [finally: exception(ExceptionA), finally(1): exception(ExceptionB)] throw ...;
-#-----| exception(ExceptionC) -> exit M10 (abnormal)
-
-#  209| [finally: exception(ExceptionA)] throw ...;
-#-----| exception(ExceptionC) -> exit M10 (abnormal)
-
-#  209| throw ...;
-#-----| exception(ExceptionC) -> exit M10 (abnormal)
-
-#  209| [finally(1): exception(Exception)] object creation of type ExceptionC
-#-----|  -> [finally(1): exception(Exception)] throw ...;
-
-#  209| [finally(1): exception(ExceptionB)] object creation of type ExceptionC
-#-----|  -> [finally(1): exception(ExceptionB)] throw ...;
-
-#  209| [finally: exception(Exception), finally(1): exception(Exception)] object creation of type ExceptionC
-#-----|  -> [finally: exception(Exception), finally(1): exception(Exception)] throw ...;
-
-#  209| [finally: exception(Exception), finally(1): exception(ExceptionB)] object creation of type ExceptionC
-#-----|  -> [finally: exception(Exception), finally(1): exception(ExceptionB)] throw ...;
-
-#  209| [finally: exception(Exception)] object creation of type ExceptionC
-#-----|  -> [finally: exception(Exception)] throw ...;
-
-#  209| [finally: exception(ExceptionA), finally(1): exception(Exception)] object creation of type ExceptionC
-#-----|  -> [finally: exception(ExceptionA), finally(1): exception(Exception)] throw ...;
-
-#  209| [finally: exception(ExceptionA), finally(1): exception(ExceptionB)] object creation of type ExceptionC
-#-----|  -> [finally: exception(ExceptionA), finally(1): exception(ExceptionB)] throw ...;
-
-#  209| [finally: exception(ExceptionA)] object creation of type ExceptionC
-#-----|  -> [finally: exception(ExceptionA)] throw ...;
-
-#  209| object creation of type ExceptionC
-#-----|  -> throw ...;
-
-#  211| [finally: exception(Exception)] this access
-#-----|  -> [finally: exception(Exception)] "0"
-
-#  211| [finally: exception(ExceptionA)] this access
-#-----|  -> [finally: exception(ExceptionA)] "0"
-
-#  211| this access
-#-----|  -> "0"
-
-#  211| ... = ...
-#-----|  -> ...;
-
-#  211| [finally: exception(Exception)] ... = ...
-#-----| exception(Exception) -> exit M10 (abnormal)
-
-#  211| [finally: exception(ExceptionA)] ... = ...
-#-----| exception(ExceptionA) -> exit M10 (abnormal)
-
-#  211| ...;
-#-----|  -> this access
-
-#  211| [finally: exception(Exception)] ...;
-#-----|  -> [finally: exception(Exception)] this access
-
-#  211| [finally: exception(ExceptionA)] ...;
-#-----|  -> [finally: exception(ExceptionA)] this access
-
-#  211| "0"
-#-----|  -> ... = ...
-
-#  211| [finally: exception(Exception)] "0"
-#-----|  -> [finally: exception(Exception)] ... = ...
-
-#  211| [finally: exception(ExceptionA)] "0"
-#-----|  -> [finally: exception(ExceptionA)] ... = ...
-
-#  213| this access
-#-----|  -> "1"
-
-#  213| ... = ...
-#-----|  -> exit M10 (normal)
-
-#  213| ...;
-#-----|  -> this access
-
-#  213| "1"
-#-----|  -> ... = ...
-
-#  216| enter M11
-#-----|  -> {...}
-
-#  216| exit M11
-
-#  216| exit M11 (normal)
-#-----|  -> exit M11
-
-#  217| {...}
-#-----|  -> try {...} ...
-
-#  218| try {...} ...
-#-----|  -> {...}
-
-#  219| {...}
-#-----|  -> ...;
-
-#  220| call to method WriteLine
-#-----| exception(Exception) -> catch {...}
-#-----|  -> {...}
-
-#  220| ...;
-#-----|  -> "Try"
-
-#  220| "Try"
-#-----|  -> call to method WriteLine
-
-#  222| catch {...}
-#-----|  -> {...}
-
-#  223| {...}
-#-----|  -> ...;
-
-#  224| call to method WriteLine
-#-----|  -> {...}
-
-#  224| ...;
-#-----|  -> "Catch"
-
-#  224| "Catch"
-#-----|  -> call to method WriteLine
-
-#  227| {...}
-#-----|  -> ...;
-
-#  228| call to method WriteLine
-#-----|  -> ...;
-
-#  228| ...;
-#-----|  -> "Finally"
-
-#  228| "Finally"
-#-----|  -> call to method WriteLine
-
-#  230| call to method WriteLine
-#-----|  -> exit M11 (normal)
-
-#  230| ...;
-#-----|  -> "Done"
-
-#  230| "Done"
-#-----|  -> call to method WriteLine
-
-#  233| enter M12
-#-----|  -> {...}
-
-#  233| exit M12
-
-#  233| exit M12 (abnormal)
-#-----|  -> exit M12
-
-#  233| exit M12 (normal)
-#-----|  -> exit M12
-
-#  234| {...}
-#-----|  -> try {...} ...
-
-#  235| try {...} ...
-#-----|  -> {...}
-
-#  236| {...}
-#-----|  -> try {...} ...
-
-#  237| try {...} ...
-#-----|  -> {...}
-
-#  238| {...}
-#-----|  -> if (...) ...
-
-#  239| if (...) ...
-#-----|  -> access to parameter b1
-
-#  239| access to parameter b1
-#-----| true -> object creation of type ExceptionA
-#-----| false -> {...}
-
-#  240| throw ...;
-#-----| exception(ExceptionA) -> [finally: exception(ExceptionA)] {...}
-
-#  240| object creation of type ExceptionA
-#-----|  -> throw ...;
-#-----| exception(Exception) -> [finally: exception(Exception)] {...}
-
-#  243| [finally: exception(Exception)] {...}
-#-----|  -> [finally: exception(Exception)] try {...} ...
-
-#  243| [finally: exception(ExceptionA)] {...}
-#-----|  -> [finally: exception(ExceptionA)] try {...} ...
-
-#  243| {...}
-#-----|  -> try {...} ...
-
-#  244| [finally: exception(Exception)] try {...} ...
-#-----|  -> [finally: exception(Exception)] {...}
-
-#  244| [finally: exception(ExceptionA)] try {...} ...
-#-----|  -> [finally: exception(ExceptionA)] {...}
-
-#  244| try {...} ...
-#-----|  -> {...}
-
-#  245| [finally: exception(Exception)] {...}
-#-----|  -> [finally: exception(Exception)] if (...) ...
-
-#  245| [finally: exception(ExceptionA)] {...}
-#-----|  -> [finally: exception(ExceptionA)] if (...) ...
-
-#  245| {...}
-#-----|  -> if (...) ...
-
-#  246| [finally: exception(Exception)] if (...) ...
-#-----|  -> [finally: exception(Exception)] access to parameter b2
-
-#  246| [finally: exception(ExceptionA)] if (...) ...
-#-----|  -> [finally: exception(ExceptionA)] access to parameter b2
-
-#  246| if (...) ...
-#-----|  -> access to parameter b2
-
-#  246| [finally: exception(Exception)] access to parameter b2
-#-----| true -> [finally: exception(Exception)] object creation of type ExceptionA
-#-----| false -> [finally: exception(Exception)] {...}
-
-#  246| [finally: exception(ExceptionA)] access to parameter b2
-#-----| true -> [finally: exception(ExceptionA)] object creation of type ExceptionA
-#-----| false -> [finally: exception(ExceptionA)] {...}
-
-#  246| access to parameter b2
-#-----| true -> object creation of type ExceptionA
-#-----| false -> {...}
-
-#  247| [finally: exception(Exception)] throw ...;
-#-----| exception(ExceptionA) -> [finally: exception(Exception), finally(1): exception(ExceptionA)] {...}
-
-#  247| [finally: exception(ExceptionA)] throw ...;
-#-----| exception(ExceptionA) -> [finally: exception(ExceptionA), finally(1): exception(ExceptionA)] {...}
-
-#  247| throw ...;
-#-----| exception(ExceptionA) -> [finally(1): exception(ExceptionA)] {...}
-
-#  247| [finally: exception(Exception)] object creation of type ExceptionA
-#-----|  -> [finally: exception(Exception)] throw ...;
-#-----| exception(Exception) -> [finally: exception(Exception), finally(1): exception(Exception)] {...}
-
-#  247| [finally: exception(ExceptionA)] object creation of type ExceptionA
-#-----|  -> [finally: exception(ExceptionA)] throw ...;
-#-----| exception(Exception) -> [finally: exception(ExceptionA), finally(1): exception(Exception)] {...}
-
-#  247| object creation of type ExceptionA
-#-----|  -> throw ...;
-#-----| exception(Exception) -> [finally(1): exception(Exception)] {...}
-
-#  250| [finally(1): exception(Exception)] {...}
-#-----|  -> [finally(1): exception(Exception)] ...;
-
-#  250| [finally(1): exception(ExceptionA)] {...}
-#-----|  -> [finally(1): exception(ExceptionA)] ...;
-
-#  250| [finally: exception(Exception), finally(1): exception(Exception)] {...}
-#-----|  -> [finally: exception(Exception), finally(1): exception(Exception)] ...;
-
-#  250| [finally: exception(Exception), finally(1): exception(ExceptionA)] {...}
-#-----|  -> [finally: exception(Exception), finally(1): exception(ExceptionA)] ...;
-
-#  250| [finally: exception(Exception)] {...}
-#-----|  -> [finally: exception(Exception)] ...;
-
-#  250| [finally: exception(ExceptionA), finally(1): exception(Exception)] {...}
-#-----|  -> [finally: exception(ExceptionA), finally(1): exception(Exception)] ...;
-
-#  250| [finally: exception(ExceptionA), finally(1): exception(ExceptionA)] {...}
-#-----|  -> [finally: exception(ExceptionA), finally(1): exception(ExceptionA)] ...;
-
-#  250| [finally: exception(ExceptionA)] {...}
-#-----|  -> [finally: exception(ExceptionA)] ...;
-
-#  250| {...}
-#-----|  -> ...;
-
-#  251| [finally(1): exception(Exception)] call to method WriteLine
-#-----| exception(Exception) -> [finally: exception(Exception)] {...}
-
-#  251| [finally(1): exception(ExceptionA)] call to method WriteLine
-#-----| exception(ExceptionA) -> [finally: exception(ExceptionA)] {...}
-
-#  251| [finally: exception(Exception), finally(1): exception(Exception)] call to method WriteLine
-#-----| exception(Exception) -> [finally: exception(Exception)] {...}
-
-#  251| [finally: exception(Exception), finally(1): exception(ExceptionA)] call to method WriteLine
-#-----| exception(ExceptionA) -> [finally: exception(ExceptionA)] {...}
-
-#  251| [finally: exception(Exception)] call to method WriteLine
-#-----| exception(Exception) -> [finally: exception(Exception)] {...}
-
-#  251| [finally: exception(ExceptionA), finally(1): exception(Exception)] call to method WriteLine
-#-----| exception(Exception) -> [finally: exception(Exception)] {...}
-
-#  251| [finally: exception(ExceptionA), finally(1): exception(ExceptionA)] call to method WriteLine
-#-----| exception(ExceptionA) -> [finally: exception(ExceptionA)] {...}
-
-#  251| [finally: exception(ExceptionA)] call to method WriteLine
-#-----| exception(ExceptionA) -> [finally: exception(ExceptionA)] {...}
-
-#  251| call to method WriteLine
-#-----|  -> ...;
-
-#  251| ...;
-#-----|  -> "Inner finally"
-
-#  251| [finally(1): exception(Exception)] ...;
-#-----|  -> [finally(1): exception(Exception)] "Inner finally"
-
-#  251| [finally(1): exception(ExceptionA)] ...;
-#-----|  -> [finally(1): exception(ExceptionA)] "Inner finally"
-
-#  251| [finally: exception(Exception), finally(1): exception(Exception)] ...;
-#-----|  -> [finally: exception(Exception), finally(1): exception(Exception)] "Inner finally"
-
-#  251| [finally: exception(Exception), finally(1): exception(ExceptionA)] ...;
-#-----|  -> [finally: exception(Exception), finally(1): exception(ExceptionA)] "Inner finally"
-
-#  251| [finally: exception(Exception)] ...;
-#-----|  -> [finally: exception(Exception)] "Inner finally"
-
-#  251| [finally: exception(ExceptionA), finally(1): exception(Exception)] ...;
-#-----|  -> [finally: exception(ExceptionA), finally(1): exception(Exception)] "Inner finally"
-
-#  251| [finally: exception(ExceptionA), finally(1): exception(ExceptionA)] ...;
-#-----|  -> [finally: exception(ExceptionA), finally(1): exception(ExceptionA)] "Inner finally"
-
-#  251| [finally: exception(ExceptionA)] ...;
-#-----|  -> [finally: exception(ExceptionA)] "Inner finally"
-
-#  251| "Inner finally"
-#-----|  -> call to method WriteLine
-
-#  251| [finally(1): exception(Exception)] "Inner finally"
-#-----|  -> [finally(1): exception(Exception)] call to method WriteLine
-
-#  251| [finally(1): exception(ExceptionA)] "Inner finally"
-#-----|  -> [finally(1): exception(ExceptionA)] call to method WriteLine
-
-#  251| [finally: exception(Exception), finally(1): exception(Exception)] "Inner finally"
-#-----|  -> [finally: exception(Exception), finally(1): exception(Exception)] call to method WriteLine
-
-#  251| [finally: exception(Exception), finally(1): exception(ExceptionA)] "Inner finally"
-#-----|  -> [finally: exception(Exception), finally(1): exception(ExceptionA)] call to method WriteLine
-
-#  251| [finally: exception(Exception)] "Inner finally"
-#-----|  -> [finally: exception(Exception)] call to method WriteLine
-
-#  251| [finally: exception(ExceptionA), finally(1): exception(Exception)] "Inner finally"
-#-----|  -> [finally: exception(ExceptionA), finally(1): exception(Exception)] call to method WriteLine
-
-#  251| [finally: exception(ExceptionA), finally(1): exception(ExceptionA)] "Inner finally"
-#-----|  -> [finally: exception(ExceptionA), finally(1): exception(ExceptionA)] call to method WriteLine
-
-#  251| [finally: exception(ExceptionA)] "Inner finally"
-#-----|  -> [finally: exception(ExceptionA)] call to method WriteLine
-
-#  254| call to method WriteLine
-#-----| exception(Exception) -> [finally: exception(Exception)] {...}
-#-----|  -> {...}
-
-#  254| ...;
-#-----|  -> "Mid finally"
-
-#  254| "Mid finally"
-#-----|  -> call to method WriteLine
-
-#  257| [finally: exception(Exception)] {...}
-#-----|  -> [finally: exception(Exception)] ...;
-
-#  257| [finally: exception(ExceptionA)] {...}
-#-----|  -> [finally: exception(ExceptionA)] ...;
-
-#  257| {...}
-#-----|  -> ...;
-
-#  258| [finally: exception(Exception)] call to method WriteLine
-#-----| exception(Exception) -> exit M12 (abnormal)
-
-#  258| [finally: exception(ExceptionA)] call to method WriteLine
-#-----| exception(ExceptionA) -> exit M12 (abnormal)
-
-#  258| call to method WriteLine
-#-----|  -> ...;
-
-#  258| ...;
-#-----|  -> "Outer finally"
-
-#  258| [finally: exception(Exception)] ...;
-#-----|  -> [finally: exception(Exception)] "Outer finally"
-
-#  258| [finally: exception(ExceptionA)] ...;
-#-----|  -> [finally: exception(ExceptionA)] "Outer finally"
-
-#  258| "Outer finally"
-#-----|  -> call to method WriteLine
-
-#  258| [finally: exception(Exception)] "Outer finally"
-#-----|  -> [finally: exception(Exception)] call to method WriteLine
-
-#  258| [finally: exception(ExceptionA)] "Outer finally"
-#-----|  -> [finally: exception(ExceptionA)] call to method WriteLine
-
-#  260| call to method WriteLine
-#-----|  -> exit M12 (normal)
-
-#  260| ...;
-#-----|  -> "Done"
-
-#  260| "Done"
-#-----|  -> call to method WriteLine
-
-#  263| enter M13
-#-----|  -> {...}
-
-#  263| exit M13
-
-#  263| exit M13 (abnormal)
-#-----|  -> exit M13
-
-#  263| exit M13 (normal)
-#-----|  -> exit M13
-
-#  264| {...}
-#-----|  -> try {...} ...
-
-#  265| try {...} ...
-#-----|  -> {...}
-
-#  266| {...}
-#-----|  -> ...;
-
-#  267| call to method WriteLine
-#-----| exception(Exception) -> [finally: exception(Exception)] {...}
-#-----|  -> {...}
-
-#  267| ...;
-#-----|  -> "1"
-
-#  267| "1"
-#-----|  -> call to method WriteLine
-
-#  270| [finally: exception(Exception)] {...}
-#-----|  -> [finally: exception(Exception)] ...;
-
-#  270| {...}
-#-----|  -> ...;
-
-#  271| [finally: exception(Exception)] call to method WriteLine
-#-----|  -> [finally: exception(Exception)] ...;
-
-#  271| call to method WriteLine
-#-----|  -> ...;
-
-#  271| ...;
-#-----|  -> "3"
-
-#  271| [finally: exception(Exception)] ...;
-#-----|  -> [finally: exception(Exception)] "3"
-
-#  271| "3"
-#-----|  -> call to method WriteLine
-
-#  271| [finally: exception(Exception)] "3"
-#-----|  -> [finally: exception(Exception)] call to method WriteLine
-
-#  272| [finally: exception(Exception)] access to parameter i
-#-----|  -> [finally: exception(Exception)] 3
-
-#  272| access to parameter i
-#-----|  -> 3
-
-#  272| ... + ...
-#-----|  -> ... = ...
-
-#  272| ... = ...
-#-----|  -> exit M13 (normal)
-
-#  272| [finally: exception(Exception)] ... + ...
-#-----|  -> [finally: exception(Exception)] ... = ...
-
-#  272| [finally: exception(Exception)] ... = ...
-#-----| exception(Exception) -> exit M13 (abnormal)
-
-#  272| ...;
-#-----|  -> access to parameter i
-
-#  272| [finally: exception(Exception)] ...;
-#-----|  -> [finally: exception(Exception)] access to parameter i
-
-#  272| 3
-#-----|  -> ... + ...
-
-#  272| [finally: exception(Exception)] 3
-#-----|  -> [finally: exception(Exception)] ... + ...
-
-Foreach.cs:
-#    4| call to constructor Object
-#-----|  -> {...}
-
-#    4| enter Foreach
-#-----|  -> call to constructor Object
-
-#    4| exit Foreach
-
-#    4| exit Foreach (normal)
-#-----|  -> exit Foreach
-
-#    4| {...}
-#-----|  -> exit Foreach (normal)
-
-#    6| enter M1
-#-----|  -> {...}
-
-#    6| exit M1
-
-#    6| exit M1 (normal)
-#-----|  -> exit M1
-
-#    7| {...}
-#-----|  -> access to parameter args
-
-#    8| foreach (... ... in ...) ...
-#-----| empty -> exit M1 (normal)
-#-----| non-empty -> String arg
-
-#    8| String arg
-#-----|  -> ;
-
-#    8| access to parameter args
-#-----|  -> foreach (... ... in ...) ...
-
-#    9| ;
-#-----|  -> foreach (... ... in ...) ...
-
-#   12| enter M2
-#-----|  -> {...}
-
-#   12| exit M2
-
-#   12| exit M2 (normal)
-#-----|  -> exit M2
-
-#   13| {...}
-#-----|  -> access to parameter args
-
-#   14| foreach (... ... in ...) ...
-#-----| empty -> exit M2 (normal)
-#-----| non-empty -> String _
-
-#   14| String _
-#-----|  -> ;
-
-#   14| access to parameter args
-#-----|  -> foreach (... ... in ...) ...
-
-#   15| ;
-#-----|  -> foreach (... ... in ...) ...
-
-#   18| enter M3
-#-----|  -> {...}
-
-#   18| exit M3
-
-#   18| exit M3 (normal)
-#-----|  -> exit M3
-
-#   19| {...}
-#-----|  -> access to parameter e
-
-#   20| foreach (... ... in ...) ...
-#-----| empty -> exit M3 (normal)
-#-----| non-empty -> String x
-
-#   20| String x
-#-----|  -> ;
-
-#   20| access to parameter e
-#-----| non-null -> call to method ToArray<String>
-#-----| null -> call to method Empty<String>
-
-#   20| call to method ToArray<String>
-#-----| non-null -> ... ?? ...
-#-----| null -> call to method Empty<String>
-
-#   20| ... ?? ...
-#-----|  -> foreach (... ... in ...) ...
-
-#   20| call to method Empty<String>
-#-----|  -> ... ?? ...
-
-#   21| ;
-#-----|  -> foreach (... ... in ...) ...
-
-#   24| enter M4
-#-----|  -> {...}
-
-#   24| exit M4
-
-#   24| exit M4 (normal)
-#-----|  -> exit M4
-
-#   25| {...}
-#-----|  -> access to parameter args
-
-#   26| foreach (... ... in ...) ...
-#-----| empty -> exit M4 (normal)
-#-----| non-empty -> String x
-
-#   26| (..., ...)
-#-----|  -> ;
-
-#   26| String x
-#-----|  -> Int32 y
-
-#   26| Int32 y
-#-----|  -> (..., ...)
-
-#   26| access to parameter args
-#-----|  -> foreach (... ... in ...) ...
-
-#   27| ;
-#-----|  -> foreach (... ... in ...) ...
-
-#   30| enter M5
-#-----|  -> {...}
-
-#   30| exit M5
-
-#   30| exit M5 (normal)
-#-----|  -> exit M5
-
-#   31| {...}
-#-----|  -> access to parameter args
-
-#   32| foreach (... ... in ...) ...
-#-----| empty -> exit M5 (normal)
-#-----| non-empty -> String x
-
-#   32| (..., ...)
-#-----|  -> ;
-
-#   32| String x
-#-----|  -> Int32 y
-
-#   32| Int32 y
-#-----|  -> (..., ...)
-
-#   32| access to parameter args
-#-----|  -> foreach (... ... in ...) ...
-
-#   33| ;
-#-----|  -> foreach (... ... in ...) ...
-
-#   36| enter M6
-#-----|  -> {...}
-
-#   36| exit M6
-
-#   36| exit M6 (normal)
-#-----|  -> exit M6
-
-#   37| {...}
-#-----|  -> access to parameter args
-
-#   38| foreach (... ... in ...) ...
-#-----| empty -> exit M6 (normal)
-#-----| non-empty -> String x
-
-#   38| (..., ...)
-#-----|  -> ;
-
-#   38| String x
-#-----|  -> Int32 y
-
-#   38| Int32 y
-#-----|  -> (..., ...)
-
-#   38| access to parameter args
-#-----|  -> foreach (... ... in ...) ...
-
-#   39| ;
-#-----|  -> foreach (... ... in ...) ...
-
-Initializers.cs:
-#    3| enter Initializers
-#-----|  -> {...}
-
-#    3| exit Initializers
-
-#    3| exit Initializers (normal)
-#-----|  -> exit Initializers
-
-#    3| {...}
-#-----|  -> exit Initializers (normal)
-
-#    5| this access
-#-----|  -> access to field H
-
-#    5| this access
-#-----|  -> access to field H
-
-#    5| ... = ...
-#-----|  -> this access
-
-#    5| ... = ...
-#-----|  -> this access
-
-#    5| access to field H
-#-----|  -> 1
-
-#    5| access to field H
-#-----|  -> 1
-
-#    5| ... + ...
-#-----|  -> ... = ...
-
-#    5| ... + ...
-#-----|  -> ... = ...
-
-#    5| 1
-#-----|  -> ... + ...
-
-#    5| 1
-#-----|  -> ... + ...
-
-#    6| access to property G
-#-----|  -> ... = ...
-
-#    6| access to property G
-#-----|  -> ... = ...
-
-#    6| this access
-#-----|  -> access to field H
-
-#    6| this access
-#-----|  -> access to field H
-
-#    6| ... = ...
-#-----|  -> {...}
-
-#    6| ... = ...
-#-----|  -> {...}
-
-#    6| access to field H
-#-----|  -> 2
-
-#    6| access to field H
-#-----|  -> 2
-
-#    6| ... + ...
-#-----|  -> access to property G
-
-#    6| ... + ...
-#-----|  -> access to property G
-
-#    6| 2
-#-----|  -> ... + ...
-
-#    6| 2
-#-----|  -> ... + ...
-
-#    8| call to constructor Object
-#-----|  -> this access
-
-#    8| enter Initializers
-#-----|  -> call to constructor Object
-
-#    8| exit Initializers
-
-#    8| exit Initializers (normal)
-#-----|  -> exit Initializers
-
-#    8| {...}
-#-----|  -> exit Initializers (normal)
-
-#   10| call to constructor Object
-#-----|  -> this access
-
-#   10| enter Initializers
-#-----|  -> call to constructor Object
-
-#   10| exit Initializers
-
-#   10| exit Initializers (normal)
-#-----|  -> exit Initializers
-
-#   10| {...}
-#-----|  -> exit Initializers (normal)
-
-#   12| enter M
-#-----|  -> {...}
-
-#   12| exit M
-
-#   12| exit M (normal)
-#-----|  -> exit M
-
-#   13| {...}
-#-----|  -> ... ...;
-
-#   14| ... ...;
-#-----|  -> ""
-
-#   14| Initializers i = ...
-#-----|  -> ... ...;
-
-#   14| object creation of type Initializers
-#-----|  -> 0
-
-#   14| ""
-#-----|  -> object creation of type Initializers
-
-#   14| { ..., ... }
-#-----|  -> Initializers i = ...
-
-#   14| ... = ...
-#-----|  -> 1
-
-#   14| 0
-#-----|  -> ... = ...
-
-#   14| access to property G
-#-----|  -> ... = ...
-
-#   14| ... = ...
-#-----|  -> { ..., ... }
-
-#   14| 1
-#-----|  -> access to property G
-
-#   15| ... ...;
-#-----|  -> 2
-
-#   15| Initializers[] iz = ...
-#-----|  -> exit M (normal)
-
-#   15| 2
-#-----|  -> array creation of type Initializers[]
-
-#   15| array creation of type Initializers[]
-#-----|  -> access to local variable i
-
-#   15| { ..., ... }
-#-----|  -> Initializers[] iz = ...
-
-#   15| access to local variable i
-#-----|  -> ""
-
-#   15| object creation of type Initializers
-#-----|  -> { ..., ... }
-
-#   15| ""
-#-----|  -> object creation of type Initializers
-
-#   18| enter H
-#-----|  -> 1
-
-#   18| exit H
-
-#   18| exit H (normal)
-#-----|  -> exit H
-
-#   18| ... = ...
-#-----|  -> exit H (normal)
-
-#   18| 1
-#-----|  -> ... = ...
-
-#   20| call to constructor Object
-#-----|  -> this access
-
-#   20| enter NoConstructor
-#-----|  -> call to constructor Object
-
-#   20| exit NoConstructor
-
-#   20| exit NoConstructor (normal)
-#-----|  -> exit NoConstructor
-
-#   20| {...}
-#-----|  -> exit NoConstructor (normal)
-
-#   22| this access
-#-----|  -> 0
-
-#   22| ... = ...
-#-----|  -> this access
-
-#   22| 0
-#-----|  -> ... = ...
-
-#   23| this access
-#-----|  -> 1
-
-#   23| ... = ...
-#-----|  -> {...}
-
-#   23| 1
-#-----|  -> ... = ...
-
-#   28| this access
-#-----|  -> 2
-
-#   28| this access
-#-----|  -> 2
-
-#   28| ... = ...
-#-----|  -> {...}
-
-#   28| ... = ...
-#-----|  -> {...}
-
-#   28| 2
-#-----|  -> ... = ...
-
-#   28| 2
-#-----|  -> ... = ...
-
-#   31| enter Sub
-#-----|  -> call to constructor NoConstructor
-
-#   31| exit Sub
-
-#   31| exit Sub (normal)
-#-----|  -> exit Sub
-
-#   31| call to constructor NoConstructor
-#-----|  -> this access
-
-#   31| {...}
-#-----|  -> ...;
-
-#   31| this access
-#-----|  -> 3
-
-#   31| ... = ...
-#-----|  -> exit Sub (normal)
-
-#   31| ...;
-#-----|  -> this access
-
-#   31| 3
-#-----|  -> ... = ...
-
-#   33| enter Sub
-#-----|  -> call to constructor Sub
-
-#   33| exit Sub
-
-#   33| exit Sub (normal)
-#-----|  -> exit Sub
-
-#   33| call to constructor Sub
-#-----|  -> {...}
-
-#   33| {...}
-#-----|  -> ...;
-
-#   33| this access
-#-----|  -> access to parameter i
-
-#   33| ... = ...
-#-----|  -> exit Sub (normal)
-
-#   33| ...;
-#-----|  -> this access
-
-#   33| access to parameter i
-#-----|  -> ... = ...
-
-#   35| call to constructor NoConstructor
-#-----|  -> this access
-
-#   35| enter Sub
-#-----|  -> call to constructor NoConstructor
-
-#   35| exit Sub
-
-#   35| exit Sub (normal)
-#-----|  -> exit Sub
-
-#   35| {...}
-#-----|  -> ...;
-
-#   35| this access
-#-----|  -> access to parameter i
-
-#   35| ... = ...
-#-----|  -> exit Sub (normal)
-
-#   35| ...;
-#-----|  -> this access
-
-#   35| access to parameter i
-#-----|  -> access to parameter j
-
-#   35| ... + ...
-#-----|  -> ... = ...
-
-#   35| access to parameter j
-#-----|  -> ... + ...
-
-#   39| call to constructor Object
-#-----|  -> {...}
-
-#   39| enter IndexInitializers
-#-----|  -> call to constructor Object
-
-#   39| exit IndexInitializers
-
-#   39| exit IndexInitializers (normal)
-#-----|  -> exit IndexInitializers
-
-#   39| {...}
-#-----|  -> exit IndexInitializers (normal)
-
-#   41| call to constructor Object
-#-----|  -> {...}
-
-#   41| enter Compound
-#-----|  -> call to constructor Object
-
-#   41| exit Compound
-
-#   41| exit Compound (normal)
-#-----|  -> exit Compound
-
-#   41| {...}
-#-----|  -> exit Compound (normal)
-
-#   51| enter Test
-#-----|  -> {...}
-
-#   51| exit Test
-
-#   51| exit Test (normal)
-#-----|  -> exit Test
-
-#   52| {...}
-#-----|  -> ... ...;
-
-#   54| ... ...;
-#-----|  -> object creation of type Dictionary<Int32,String>
-
-#   54| Dictionary<Int32,String> dict = ...
-#-----|  -> ... ...;
-
-#   54| object creation of type Dictionary<Int32,String>
-#-----|  -> 0
-
-#   54| { ..., ... }
-#-----|  -> Dictionary<Int32,String> dict = ...
-
-#   54| access to indexer
-#-----|  -> ... = ...
-
-#   54| ... = ...
-#-----|  -> 1
-
-#   54| 0
-#-----|  -> "Zero"
-
-#   54| "Zero"
-#-----|  -> access to indexer
-
-#   54| access to indexer
-#-----|  -> ... = ...
-
-#   54| ... = ...
-#-----|  -> access to parameter i
-
-#   54| 1
-#-----|  -> "One"
-
-#   54| "One"
-#-----|  -> access to indexer
-
-#   54| access to indexer
-#-----|  -> ... = ...
-
-#   54| ... = ...
-#-----|  -> { ..., ... }
-
-#   54| access to parameter i
-#-----|  -> 2
-
-#   54| ... + ...
-#-----|  -> "Two"
-
-#   54| 2
-#-----|  -> ... + ...
-
-#   54| "Two"
-#-----|  -> access to indexer
-
-#   57| ... ...;
-#-----|  -> object creation of type Compound
-
-#   57| Compound compound = ...
-#-----|  -> exit Test (normal)
-
-#   57| object creation of type Compound
-#-----|  -> 0
-
-#   58| { ..., ... }
-#-----|  -> Compound compound = ...
-
-#   59| ... = ...
-#-----|  -> 3
-
-#   59| { ..., ... }
-#-----|  -> ... = ...
-
-#   59| access to indexer
-#-----|  -> ... = ...
-
-#   59| ... = ...
-#-----|  -> 1
-
-#   59| 0
-#-----|  -> "Zero"
-
-#   59| "Zero"
-#-----|  -> access to indexer
-
-#   59| access to indexer
-#-----|  -> ... = ...
-
-#   59| ... = ...
-#-----|  -> access to parameter i
-
-#   59| 1
-#-----|  -> "One"
-
-#   59| "One"
-#-----|  -> access to indexer
-
-#   59| access to indexer
-#-----|  -> ... = ...
-
-#   59| ... = ...
-#-----|  -> { ..., ... }
-
-#   59| access to parameter i
-#-----|  -> 2
-
-#   59| ... + ...
-#-----|  -> "Two"
-
-#   59| 2
-#-----|  -> ... + ...
-
-#   59| "Two"
-#-----|  -> access to indexer
-
-#   60| access to property DictionaryProperty
-#-----|  -> ... = ...
-
-#   60| ... = ...
-#-----|  -> 0
-
-#   60| { ..., ... }
-#-----|  -> access to property DictionaryProperty
-
-#   60| access to indexer
-#-----|  -> ... = ...
-
-#   60| ... = ...
-#-----|  -> 2
-
-#   60| 3
-#-----|  -> "Three"
-
-#   60| "Three"
-#-----|  -> access to indexer
-
-#   60| access to indexer
-#-----|  -> ... = ...
-
-#   60| ... = ...
-#-----|  -> access to parameter i
-
-#   60| 2
-#-----|  -> "Two"
-
-#   60| "Two"
-#-----|  -> access to indexer
-
-#   60| access to indexer
-#-----|  -> ... = ...
-
-#   60| ... = ...
-#-----|  -> { ..., ... }
-
-#   60| access to parameter i
-#-----|  -> 1
-
-#   60| ... + ...
-#-----|  -> "One"
-
-#   60| 1
-#-----|  -> ... + ...
-
-#   60| "One"
-#-----|  -> access to indexer
-
-#   61| ... = ...
-#-----|  -> 0
-
-#   61| { ..., ... }
-#-----|  -> ... = ...
-
-#   61| ... = ...
-#-----|  -> access to parameter i
-
-#   61| 0
-#-----|  -> "Zero"
-
-#   61| "Zero"
-#-----|  -> ... = ...
-
-#   61| ... = ...
-#-----|  -> { ..., ... }
-
-#   61| access to parameter i
-#-----|  -> 1
-
-#   61| ... + ...
-#-----|  -> "One"
-
-#   61| 1
-#-----|  -> ... + ...
-
-#   61| "One"
-#-----|  -> ... = ...
-
-#   62| ... = ...
-#-----|  -> 1
-
-#   62| { ..., ... }
-#-----|  -> ... = ...
-
-#   62| ... = ...
-#-----|  -> 1
-
-#   62| 0
-#-----|  -> 1
-
-#   62| 1
-#-----|  -> "i"
-
-#   62| "i"
-#-----|  -> ... = ...
-
-#   62| ... = ...
-#-----|  -> { ..., ... }
-
-#   62| 1
-#-----|  -> access to parameter i
-
-#   62| access to parameter i
-#-----|  -> 0
-
-#   62| ... + ...
-#-----|  -> "1"
-
-#   62| 0
-#-----|  -> ... + ...
-
-#   62| "1"
-#-----|  -> ... = ...
-
-#   63| access to property ArrayProperty
-#-----|  -> ... = ...
-
-#   63| ... = ...
-#-----|  -> 0
-
-#   63| { ..., ... }
-#-----|  -> access to property ArrayProperty
-
-#   63| ... = ...
-#-----|  -> access to parameter i
-
-#   63| 1
-#-----|  -> "One"
-
-#   63| "One"
-#-----|  -> ... = ...
-
-#   63| ... = ...
-#-----|  -> { ..., ... }
-
-#   63| access to parameter i
-#-----|  -> 2
-
-#   63| ... + ...
-#-----|  -> "Two"
-
-#   63| 2
-#-----|  -> ... + ...
-
-#   63| "Two"
-#-----|  -> ... = ...
-
-#   64| access to property ArrayProperty2
-#-----|  -> ... = ...
-
-#   64| ... = ...
-#-----|  -> { ..., ... }
-
-#   64| { ..., ... }
-#-----|  -> access to property ArrayProperty2
-
-#   64| ... = ...
-#-----|  -> 1
-
-#   64| 0
-#-----|  -> 1
-
-#   64| 1
-#-----|  -> "i"
-
-#   64| "i"
-#-----|  -> ... = ...
-
-#   64| ... = ...
-#-----|  -> { ..., ... }
-
-#   64| 1
-#-----|  -> access to parameter i
-
-#   64| access to parameter i
-#-----|  -> 0
-
-#   64| ... + ...
-#-----|  -> "1"
-
-#   64| 0
-#-----|  -> ... + ...
-
-#   64| "1"
-#-----|  -> ... = ...
-
-LoopUnrolling.cs:
-#    5| call to constructor Object
-#-----|  -> {...}
-
-#    5| enter LoopUnrolling
-#-----|  -> call to constructor Object
-
-#    5| exit LoopUnrolling
-
-#    5| exit LoopUnrolling (normal)
-#-----|  -> exit LoopUnrolling
-
-#    5| {...}
-#-----|  -> exit LoopUnrolling (normal)
-
-#    7| enter M1
-#-----|  -> {...}
-
-#    7| exit M1
-
-#    7| exit M1 (normal)
-#-----|  -> exit M1
-
-#    8| {...}
-#-----|  -> if (...) ...
-
-#    9| if (...) ...
-#-----|  -> access to parameter args
-
-#    9| access to parameter args
-#-----|  -> access to property Length
-
-#    9| access to property Length
-#-----|  -> 0
-
-#    9| ... == ...
-#-----| true -> return ...;
-#-----| false -> access to parameter args
-
-#    9| 0
-#-----|  -> ... == ...
-
-#   10| return ...;
-#-----| return -> exit M1 (normal)
-
-#   11| [unroll (line 11)] foreach (... ... in ...) ...
-#-----| non-empty -> String arg
-
-#   11| foreach (... ... in ...) ...
-#-----| empty -> exit M1 (normal)
-#-----| non-empty -> String arg
-
-#   11| String arg
-#-----|  -> ...;
-
-#   11| access to parameter args
-#-----|  -> [unroll (line 11)] foreach (... ... in ...) ...
-
-#   12| call to method WriteLine
-#-----|  -> foreach (... ... in ...) ...
-
-#   12| ...;
-#-----|  -> access to local variable arg
-
-#   12| access to local variable arg
-#-----|  -> call to method WriteLine
-
-#   15| enter M2
-#-----|  -> {...}
-
-#   15| exit M2
-
-#   15| exit M2 (normal)
-#-----|  -> exit M2
-
-#   16| {...}
-#-----|  -> ... ...;
-
-#   17| ... ...;
-#-----|  -> 3
-
-#   17| String[] xs = ...
-#-----|  -> access to local variable xs
-
-#   17| 3
-#-----|  -> array creation of type String[]
-
-#   17| array creation of type String[]
-#-----|  -> "a"
-
-#   17| { ..., ... }
-#-----|  -> String[] xs = ...
-
-#   17| "a"
-#-----|  -> "b"
-
-#   17| "b"
-#-----|  -> "c"
-
-#   17| "c"
-#-----|  -> { ..., ... }
-
-#   18| [unroll (line 18)] foreach (... ... in ...) ...
-#-----| non-empty -> String x
-
-#   18| foreach (... ... in ...) ...
-#-----| empty -> exit M2 (normal)
-#-----| non-empty -> String x
-
-#   18| String x
-#-----|  -> ...;
-
-#   18| access to local variable xs
-#-----|  -> [unroll (line 18)] foreach (... ... in ...) ...
-
-#   19| call to method WriteLine
-#-----|  -> foreach (... ... in ...) ...
-
-#   19| ...;
-#-----|  -> access to local variable x
-
-#   19| access to local variable x
-#-----|  -> call to method WriteLine
-
-#   22| enter M3
-#-----|  -> {...}
-
-#   22| exit M3
-
-#   22| exit M3 (normal)
-#-----|  -> exit M3
-
-#   23| {...}
-#-----|  -> access to parameter args
-
-#   24| foreach (... ... in ...) ...
-#-----| empty -> exit M3 (normal)
-#-----| non-empty -> Char arg
-
-#   24| Char arg
-#-----|  -> access to parameter args
-
-#   24| access to parameter args
-#-----|  -> foreach (... ... in ...) ...
-
-#   25| [unroll (line 25)] foreach (... ... in ...) ...
-#-----| non-empty -> Char arg0
-
-#   25| foreach (... ... in ...) ...
-#-----| empty -> foreach (... ... in ...) ...
-#-----| non-empty -> Char arg0
-
-#   25| Char arg0
-#-----|  -> ...;
-
-#   25| access to parameter args
-#-----|  -> [unroll (line 25)] foreach (... ... in ...) ...
-
-#   26| call to method WriteLine
-#-----|  -> foreach (... ... in ...) ...
-
-#   26| ...;
-#-----|  -> access to local variable arg0
-
-#   26| access to local variable arg0
-#-----|  -> call to method WriteLine
-
-#   29| enter M4
-#-----|  -> {...}
-
-#   29| exit M4
-
-#   29| exit M4 (normal)
-#-----|  -> exit M4
-
-#   30| {...}
-#-----|  -> ... ...;
-
-#   31| ... ...;
-#-----|  -> 0
-
-#   31| String[] xs = ...
-#-----|  -> access to local variable xs
-
-#   31| array creation of type String[]
-#-----|  -> String[] xs = ...
-
-#   31| 0
-#-----|  -> array creation of type String[]
-
-#   32| [skip (line 32)] foreach (... ... in ...) ...
-#-----| empty -> exit M4 (normal)
-
-#   32| access to local variable xs
-#-----|  -> [skip (line 32)] foreach (... ... in ...) ...
-
-#   36| enter M5
-#-----|  -> {...}
-
-#   36| exit M5
-
-#   36| exit M5 (normal)
-#-----|  -> exit M5
-
-#   37| {...}
-#-----|  -> ... ...;
-
-#   38| ... ...;
-#-----|  -> 3
-
-#   38| String[] xs = ...
-#-----|  -> ... ...;
-
-#   38| 3
-#-----|  -> array creation of type String[]
-
-#   38| array creation of type String[]
-#-----|  -> "a"
-
-#   38| { ..., ... }
-#-----|  -> String[] xs = ...
-
-#   38| "a"
-#-----|  -> "b"
-
-#   38| "b"
-#-----|  -> "c"
-
-#   38| "c"
-#-----|  -> { ..., ... }
-
-#   39| ... ...;
-#-----|  -> 3
-
-#   39| String[] ys = ...
-#-----|  -> access to local variable xs
-
-#   39| 3
-#-----|  -> array creation of type String[]
-
-#   39| array creation of type String[]
-#-----|  -> "0"
-
-#   39| { ..., ... }
-#-----|  -> String[] ys = ...
-
-#   39| "0"
-#-----|  -> "1"
-
-#   39| "1"
-#-----|  -> "2"
-
-#   39| "2"
-#-----|  -> { ..., ... }
-
-#   40| [unroll (line 40)] foreach (... ... in ...) ...
-#-----| non-empty -> String x
-
-#   40| foreach (... ... in ...) ...
-#-----| empty -> exit M5 (normal)
-#-----| non-empty -> String x
-
-#   40| String x
-#-----|  -> access to local variable ys
-
-#   40| access to local variable xs
-#-----|  -> [unroll (line 40)] foreach (... ... in ...) ...
-
-#   41| [unroll (line 41)] foreach (... ... in ...) ...
-#-----| non-empty -> String y
-
-#   41| foreach (... ... in ...) ...
-#-----| empty -> foreach (... ... in ...) ...
-#-----| non-empty -> String y
-
-#   41| String y
-#-----|  -> ...;
-
-#   41| access to local variable ys
-#-----|  -> [unroll (line 41)] foreach (... ... in ...) ...
-
-#   42| call to method WriteLine
-#-----|  -> foreach (... ... in ...) ...
-
-#   42| ...;
-#-----|  -> access to local variable x
-
-#   42| access to local variable x
-#-----|  -> access to local variable y
-
-#   42| ... + ...
-#-----|  -> call to method WriteLine
-
-#   42| access to local variable y
-#-----|  -> ... + ...
-
-#   45| enter M6
-#-----|  -> {...}
-
-#   46| {...}
-#-----|  -> ... ...;
-
-#   47| ... ...;
-#-----|  -> 3
-
-#   47| String[] xs = ...
-#-----|  -> access to local variable xs
-
-#   47| 3
-#-----|  -> array creation of type String[]
-
-#   47| array creation of type String[]
-#-----|  -> "a"
-
-#   47| { ..., ... }
-#-----|  -> String[] xs = ...
-
-#   47| "a"
-#-----|  -> "b"
-
-#   47| "b"
-#-----|  -> "c"
-
-#   47| "c"
-#-----|  -> { ..., ... }
-
-#   48| [unroll (line 48)] foreach (... ... in ...) ...
-#-----| non-empty -> String x
-
-#   48| String x
-#-----|  -> {...}
-
-#   48| access to local variable xs
-#-----|  -> [unroll (line 48)] foreach (... ... in ...) ...
-
-#   49| {...}
-#-----|  -> Label:
-
-#   50| Label:
-#-----|  -> ...;
-
-#   50| call to method WriteLine
-#-----|  -> goto ...;
-
-#   50| ...;
-#-----|  -> access to local variable x
-
-#   50| access to local variable x
-#-----|  -> call to method WriteLine
-
-#   51| goto ...;
-#-----| goto(Label) -> Label:
-
-#   55| enter M7
-#-----|  -> {...}
-
-#   55| exit M7
-
-#   55| exit M7 (normal)
-#-----|  -> exit M7
-
-#   56| {...}
-#-----|  -> ... ...;
-
-#   57| ... ...;
-#-----|  -> 3
-
-#   57| String[] xs = ...
-#-----|  -> access to local variable xs
-
-#   57| 3
-#-----|  -> array creation of type String[]
-
-#   57| array creation of type String[]
-#-----|  -> "a"
-
-#   57| { ..., ... }
-#-----|  -> String[] xs = ...
-
-#   57| "a"
-#-----|  -> "b"
-
-#   57| "b"
-#-----|  -> "c"
-
-#   57| "c"
-#-----|  -> { ..., ... }
-
-#   58| [b (line 55): false] foreach (... ... in ...) ...
-#-----| empty -> exit M7 (normal)
-#-----| non-empty -> [b (line 55): false] String x
-
-#   58| [b (line 55): true] foreach (... ... in ...) ...
-#-----| empty -> exit M7 (normal)
-#-----| non-empty -> [b (line 55): true] String x
-
-#   58| [unroll (line 58)] foreach (... ... in ...) ...
-#-----| non-empty -> String x
-
-#   58| String x
-#-----|  -> {...}
-
-#   58| [b (line 55): false] String x
-#-----|  -> [b (line 55): false] {...}
-
-#   58| [b (line 55): true] String x
-#-----|  -> [b (line 55): true] {...}
-
-#   58| access to local variable xs
-#-----|  -> [unroll (line 58)] foreach (... ... in ...) ...
-
-#   59| [b (line 55): false] {...}
-#-----|  -> [b (line 55): false] if (...) ...
-
-#   59| [b (line 55): true] {...}
-#-----|  -> [b (line 55): true] if (...) ...
-
-#   59| {...}
-#-----|  -> if (...) ...
-
-#   60| [b (line 55): false] if (...) ...
-#-----|  -> [b (line 55): false] access to parameter b
-
-#   60| [b (line 55): true] if (...) ...
-#-----|  -> [b (line 55): true] access to parameter b
-
-#   60| if (...) ...
-#-----|  -> access to parameter b
-
-#   60| [b (line 55): false] access to parameter b
-#-----| false -> [b (line 55): false] if (...) ...
-
-#   60| [b (line 55): true] access to parameter b
-#-----| true -> [b (line 55): true] ...;
-
-#   60| access to parameter b
-#-----| true -> [b (line 55): true] ...;
-#-----| false -> [b (line 55): false] if (...) ...
-
-#   61| [b (line 55): true] call to method WriteLine
-#-----|  -> [b (line 55): true] if (...) ...
-
-#   61| [b (line 55): true] ...;
-#-----|  -> [b (line 55): true] access to local variable x
-
-#   61| [b (line 55): true] access to local variable x
-#-----|  -> [b (line 55): true] call to method WriteLine
-
-#   62| [b (line 55): false] if (...) ...
-#-----|  -> [b (line 55): false] access to parameter b
-
-#   62| [b (line 55): true] if (...) ...
-#-----|  -> [b (line 55): true] access to parameter b
-
-#   62| [b (line 55): false] access to parameter b
-#-----| false -> [b (line 55): false] foreach (... ... in ...) ...
-
-#   62| [b (line 55): true] access to parameter b
-#-----| true -> [b (line 55): true] ...;
-
-#   63| [b (line 55): true] call to method WriteLine
-#-----|  -> [b (line 55): true] foreach (... ... in ...) ...
-
-#   63| [b (line 55): true] ...;
-#-----|  -> [b (line 55): true] access to local variable x
-
-#   63| [b (line 55): true] access to local variable x
-#-----|  -> [b (line 55): true] call to method WriteLine
-
-#   67| enter M8
-#-----|  -> {...}
-
-#   67| exit M8
-
-#   67| exit M8 (normal)
-#-----|  -> exit M8
-
-#   68| {...}
-#-----|  -> if (...) ...
-
-#   69| if (...) ...
-#-----|  -> access to parameter args
-
-#   69| [false] !...
-#-----| false -> ...;
-
-#   69| [true] !...
-#-----| true -> return ...;
-
-#   69| access to parameter args
-#-----|  -> call to method Any<String>
-
-#   69| call to method Any<String>
-#-----| false -> [true] !...
-#-----| true -> [false] !...
-
-#   70| return ...;
-#-----| return -> exit M8 (normal)
-
-#   71| access to parameter args
-#-----|  -> call to method Clear
-
-#   71| call to method Clear
-#-----|  -> access to parameter args
-
-#   71| ...;
-#-----|  -> access to parameter args
-
-#   72| [skip (line 72)] foreach (... ... in ...) ...
-#-----| empty -> exit M8 (normal)
-
-#   72| access to parameter args
-#-----|  -> [skip (line 72)] foreach (... ... in ...) ...
-
-#   76| enter M9
-#-----|  -> {...}
-
-#   76| exit M9
-
-#   76| exit M9 (normal)
-#-----|  -> exit M9
-
-#   77| {...}
-#-----|  -> ... ...;
-
-#   78| ... ...;
-#-----|  -> 2
-
-#   78| String[,] xs = ...
-#-----|  -> access to local variable xs
-
-#   78| array creation of type String[,]
-#-----|  -> String[,] xs = ...
-
-#   78| 2
-#-----|  -> 0
-
-#   78| 0
-#-----|  -> array creation of type String[,]
-
-#   79| [skip (line 79)] foreach (... ... in ...) ...
-#-----| empty -> exit M9 (normal)
-
-#   79| access to local variable xs
-#-----|  -> [skip (line 79)] foreach (... ... in ...) ...
-
-#   85| enter M10
-#-----|  -> {...}
-
-#   85| exit M10
-
-#   85| exit M10 (normal)
-#-----|  -> exit M10
-
-#   86| {...}
-#-----|  -> ... ...;
-
-#   87| ... ...;
-#-----|  -> 0
-
-#   87| String[,] xs = ...
-#-----|  -> access to local variable xs
-
-#   87| array creation of type String[,]
-#-----|  -> String[,] xs = ...
-
-#   87| 0
-#-----|  -> 2
-
-#   87| 2
-#-----|  -> array creation of type String[,]
-
-#   88| [skip (line 88)] foreach (... ... in ...) ...
-#-----| empty -> exit M10 (normal)
-
-#   88| access to local variable xs
-#-----|  -> [skip (line 88)] foreach (... ... in ...) ...
-
-#   94| enter M11
-#-----|  -> {...}
-
-#   94| exit M11
-
-#   94| exit M11 (normal)
-#-----|  -> exit M11
-
-#   95| {...}
-#-----|  -> ... ...;
-
-#   96| ... ...;
-#-----|  -> 2
-
-#   96| String[,] xs = ...
-#-----|  -> access to local variable xs
-
-#   96| array creation of type String[,]
-#-----|  -> String[,] xs = ...
-
-#   96| 2
-#-----|  -> 2
-
-#   96| 2
-#-----|  -> array creation of type String[,]
-
-#   97| [unroll (line 97)] foreach (... ... in ...) ...
-#-----| non-empty -> String x
-
-#   97| foreach (... ... in ...) ...
-#-----| empty -> exit M11 (normal)
-#-----| non-empty -> String x
-
-#   97| String x
-#-----|  -> {...}
-
-#   97| access to local variable xs
-#-----|  -> [unroll (line 97)] foreach (... ... in ...) ...
-
-#   98| {...}
-#-----|  -> ...;
-
-#   99| call to method WriteLine
-#-----|  -> foreach (... ... in ...) ...
-
-#   99| ...;
-#-----|  -> access to local variable x
-
-#   99| access to local variable x
-#-----|  -> call to method WriteLine
-
-MultiImplementationA.cs:
-#    4| call to constructor Object
-#-----|  -> {...}
-
-#    4| enter C1
-#-----|  -> call to constructor Object
-#-----|  -> call to constructor Object
-
-#    4| exit C1
-
-#    4| exit C1 (normal)
-#-----|  -> exit C1
-
-#    4| {...}
-#-----|  -> exit C1 (normal)
-
-#    6| enter get_P1
-#-----|  -> null
-#-----|  -> 0
-
-#    6| exit get_P1
-
-#    6| exit get_P1 (abnormal)
-#-----|  -> exit get_P1
-
-#    6| exit get_P1 (normal)
-#-----|  -> exit get_P1
-
-#    6| throw ...
-#-----| exception(NullReferenceException) -> exit get_P1 (abnormal)
-
-#    6| null
-#-----|  -> throw ...
-
-#    7| enter get_P2
-#-----|  -> {...}
-#-----|  -> {...}
-
-#    7| exit get_P2
-
-#    7| exit get_P2 (abnormal)
-#-----|  -> exit get_P2
-
-#    7| exit get_P2 (normal)
-#-----|  -> exit get_P2
-
-#    7| {...}
-#-----|  -> null
-
-#    7| throw ...;
-#-----| exception(NullReferenceException) -> exit get_P2 (abnormal)
-
-#    7| null
-#-----|  -> throw ...;
-
-#    7| enter set_P2
-#-----|  -> {...}
-#-----|  -> {...}
-
-#    7| exit set_P2
-
-#    7| exit set_P2 (abnormal)
-#-----|  -> exit set_P2
-
-#    7| exit set_P2 (normal)
-#-----|  -> exit set_P2
-
-#    7| {...}
-#-----|  -> null
-
-#    7| throw ...;
-#-----| exception(NullReferenceException) -> exit set_P2 (abnormal)
-
-#    7| null
-#-----|  -> throw ...;
-
-#    8| enter M
-#-----|  -> null
-#-----|  -> 2
-
-#    8| exit M
-
-#    8| exit M (abnormal)
-#-----|  -> exit M
-
-#    8| exit M (normal)
-#-----|  -> exit M
-
-#    8| throw ...
-#-----| exception(NullReferenceException) -> exit M (abnormal)
-
-#    8| null
-#-----|  -> throw ...
-
-#   13| this access
-#-----|  -> 0
-
-#   13| ... = ...
-#-----|  -> this access
-
-#   13| 0
-#-----|  -> ... = ...
-
-#   14| access to parameter i
-#-----|  -> exit get_Item (normal)
-
-#   14| enter get_Item
-#-----|  -> access to parameter i
-#-----|  -> null
-
-#   14| exit get_Item
-
-#   14| exit get_Item (abnormal)
-#-----|  -> exit get_Item
-
-#   14| exit get_Item (normal)
-#-----|  -> exit get_Item
-
-#   15| enter get_Item
-#-----|  -> {...}
-#-----|  -> {...}
-
-#   15| exit get_Item
-
-#   15| exit get_Item (abnormal)
-#-----|  -> exit get_Item
-
-#   15| exit get_Item (normal)
-#-----|  -> exit get_Item
-
-#   15| {...}
-#-----|  -> access to parameter s
-
-#   15| return ...;
-#-----| return -> exit get_Item (normal)
-
-#   15| access to parameter s
-#-----|  -> return ...;
-
-#   15| enter set_Item
-#-----|  -> {...}
-#-----|  -> {...}
-
-#   15| exit set_Item
-
-#   15| exit set_Item (normal)
-#-----|  -> exit set_Item
-
-#   15| {...}
-#-----|  -> exit set_Item (normal)
-
-#   16| enter M1
-#-----|  -> {...}
-#-----|  -> {...}
-
-#   16| exit M1
-
-#   16| exit M1 (normal)
-#-----|  -> exit M1
-
-#   17| {...}
-#-----|  -> M2(...)
-
-#   18| M2(...)
-#-----|  -> exit M1 (normal)
-
-#   18| enter M2
-#-----|  -> 0
-
-#   18| exit M2
-
-#   18| exit M2 (normal)
-#-----|  -> exit M2
-
-#   18| 0
-#-----|  -> exit M2 (normal)
-
-#   20| call to constructor Object
-#-----|  -> this access
-
-#   20| enter C2
-#-----|  -> call to constructor Object
-#-----|  -> call to constructor Object
-
-#   20| exit C2
-
-#   20| exit C2 (abnormal)
-#-----|  -> exit C2
-
-#   20| exit C2 (normal)
-#-----|  -> exit C2
-
-#   20| {...}
-#-----|  -> ...;
-
-#   20| this access
-#-----|  -> access to parameter i
-
-#   20| ... = ...
-#-----|  -> exit C2 (normal)
-
-#   20| ...;
-#-----|  -> this access
-
-#   20| access to parameter i
-#-----|  -> ... = ...
-
-#   21| enter C2
-#-----|  -> 0
-#-----|  -> 1
-
-#   21| exit C2
-
-#   21| exit C2 (normal)
-#-----|  -> exit C2
-
-#   21| call to constructor C2
-#-----|  -> {...}
-
-#   21| 0
-#-----|  -> call to constructor C2
-
-#   21| {...}
-#-----|  -> exit C2 (normal)
-
-#   22| enter ~C2
-#-----|  -> {...}
-#-----|  -> {...}
-
-#   22| exit ~C2
-
-#   22| exit ~C2 (abnormal)
-#-----|  -> exit ~C2
-
-#   22| exit ~C2 (normal)
-#-----|  -> exit ~C2
-
-#   22| {...}
-#-----|  -> exit ~C2 (normal)
-
-#   23| enter implicit conversion
-#-----|  -> null
-#-----|  -> null
-
-#   23| exit implicit conversion
-
-#   23| exit implicit conversion (abnormal)
-#-----|  -> exit implicit conversion
-
-#   23| exit implicit conversion (normal)
-#-----|  -> exit implicit conversion
-
-#   23| null
-#-----|  -> exit implicit conversion (normal)
-
-#   24| access to property P
-#-----|  -> ... = ...
-
-#   24| this access
-#-----|  -> 0
-
-#   24| ... = ...
-#-----|  -> {...}
-
-#   24| 0
-#-----|  -> access to property P
-
-#   28| call to constructor Object
-#-----|  -> {...}
-
-#   28| enter C3
-#-----|  -> call to constructor Object
-#-----|  -> call to constructor Object
-
-#   28| exit C3
-
-#   28| exit C3 (normal)
-#-----|  -> exit C3
-
-#   28| {...}
-#-----|  -> exit C3 (normal)
-
-#   30| enter get_P3
-#-----|  -> null
-
-#   30| exit get_P3
-
-#   30| exit get_P3 (abnormal)
-#-----|  -> exit get_P3
-
-#   30| throw ...
-#-----| exception(NullReferenceException) -> exit get_P3 (abnormal)
-
-#   30| null
-#-----|  -> throw ...
-
-#   34| call to constructor Object
-#-----|  -> {...}
-
-#   34| enter C4
-#-----|  -> call to constructor Object
-#-----|  -> call to constructor Object
-
-#   34| exit C4
-
-#   34| exit C4 (normal)
-#-----|  -> exit C4
-
-#   34| {...}
-#-----|  -> exit C4 (normal)
-
-#   36| enter M1
-#-----|  -> {...}
-#-----|  -> 0
-
-#   36| exit M1
-
-#   36| exit M1 (abnormal)
-#-----|  -> exit M1
-
-#   36| exit M1 (normal)
-#-----|  -> exit M1
-
-#   36| {...}
-#-----|  -> null
-
-#   36| throw ...;
-#-----| exception(NullReferenceException) -> exit M1 (abnormal)
-
-#   36| null
-#-----|  -> throw ...;
-
-#   37| enter M2
-#-----|  -> {...}
-
-#   37| exit M2
-
-#   37| exit M2 (abnormal)
-#-----|  -> exit M2
-
-#   37| {...}
-#-----|  -> null
-
-#   37| throw ...;
-#-----| exception(NullReferenceException) -> exit M2 (abnormal)
-
-#   37| null
-#-----|  -> throw ...;
-
-MultiImplementationB.cs:
-#    1| call to constructor Object
-#-----|  -> {...}
-
-#    1| {...}
-#-----|  -> exit C1 (normal)
-
-#    3| 0
-#-----|  -> exit get_P1 (normal)
-
-#    4| {...}
-#-----|  -> 1
-
-#    4| return ...;
-#-----| return -> exit get_P2 (normal)
-
-#    4| 1
-#-----|  -> return ...;
-
-#    4| {...}
-#-----|  -> exit set_P2 (normal)
-
-#    5| 2
-#-----|  -> exit M (normal)
-
-#   11| this access
-#-----|  -> 1
-
-#   11| ... = ...
-#-----|  -> this access
-
-#   11| 1
-#-----|  -> ... = ...
-
-#   12| throw ...
-#-----| exception(NullReferenceException) -> exit get_Item (abnormal)
-
-#   12| null
-#-----|  -> throw ...
-
-#   13| {...}
-#-----|  -> null
-
-#   13| throw ...;
-#-----| exception(NullReferenceException) -> exit get_Item (abnormal)
-
-#   13| null
-#-----|  -> throw ...;
-
-#   13| {...}
-#-----|  -> exit set_Item (normal)
-
-#   15| {...}
-#-----|  -> M2(...)
-
-#   16| M2(...)
-#-----|  -> exit M1 (normal)
-
-#   16| enter M2
-#-----|  -> null
-
-#   16| exit M2
-
-#   16| exit M2 (abnormal)
-#-----|  -> exit M2
-
-#   16| throw ...
-#-----| exception(NullReferenceException) -> exit M2 (abnormal)
-
-#   16| null
-#-----|  -> throw ...
-
-#   18| call to constructor Object
-#-----|  -> this access
-
-#   18| {...}
-#-----|  -> null
-
-#   18| throw ...;
-#-----| exception(NullReferenceException) -> exit C2 (abnormal)
-
-#   18| null
-#-----|  -> throw ...;
-
-#   19| call to constructor C2
-#-----|  -> {...}
-
-#   19| 1
-#-----|  -> call to constructor C2
-
-#   19| {...}
-#-----|  -> exit C2 (normal)
-
-#   20| {...}
-#-----|  -> null
-
-#   20| throw ...;
-#-----| exception(NullReferenceException) -> exit ~C2 (abnormal)
-
-#   20| null
-#-----|  -> throw ...;
-
-#   21| throw ...
-#-----| exception(NullReferenceException) -> exit implicit conversion (abnormal)
-
-#   21| null
-#-----|  -> throw ...
-
-#   22| access to property P
-#-----|  -> ... = ...
-
-#   22| this access
-#-----|  -> 1
-
-#   22| ... = ...
-#-----|  -> {...}
-
-#   22| 1
-#-----|  -> access to property P
-
-#   25| call to constructor Object
-#-----|  -> {...}
-
-#   25| {...}
-#-----|  -> exit C3 (normal)
-
-#   30| call to constructor Object
-#-----|  -> {...}
-
-#   30| {...}
-#-----|  -> exit C4 (normal)
-
-#   32| 0
-#-----|  -> exit M1 (normal)
-
-NullCoalescing.cs:
-#    1| call to constructor Object
-#-----|  -> {...}
-
-#    1| enter NullCoalescing
-#-----|  -> call to constructor Object
-
-#    1| exit NullCoalescing
-
-#    1| exit NullCoalescing (normal)
-#-----|  -> exit NullCoalescing
-
-#    1| {...}
-#-----|  -> exit NullCoalescing (normal)
-
-#    3| enter M1
-#-----|  -> access to parameter i
-
-#    3| exit M1
-
-#    3| exit M1 (normal)
-#-----|  -> exit M1
-
-#    3| access to parameter i
-#-----| non-null -> ... ?? ...
-#-----| null -> 0
-
-#    3| ... ?? ...
-#-----|  -> exit M1 (normal)
-
-#    3| 0
-#-----|  -> ... ?? ...
-
-#    5| enter M2
-#-----|  -> access to parameter b
-
-#    5| exit M2
-
-#    5| exit M2 (normal)
-#-----|  -> exit M2
-
-#    5| ... ? ... : ...
-#-----|  -> exit M2 (normal)
-
-#    5| access to parameter b
-#-----| false -> [false] ... ?? ...
-#-----| true -> [true] ... ?? ...
-#-----| null -> false
-
-#    5| [false] ... ?? ...
-#-----| false -> 1
-
-#    5| [true] ... ?? ...
-#-----| true -> 0
-
-#    5| false
-#-----| false -> [false] ... ?? ...
-
-#    5| 0
-#-----|  -> ... ? ... : ...
-
-#    5| 1
-#-----|  -> ... ? ... : ...
-
-#    7| enter M3
-#-----|  -> access to parameter s1
-
-#    7| exit M3
-
-#    7| exit M3 (normal)
-#-----|  -> exit M3
-
-#    7| access to parameter s1
-#-----| non-null -> ... ?? ...
-#-----| null -> access to parameter s2
-
-#    7| ... ?? ...
-#-----|  -> exit M3 (normal)
-
-#    7| access to parameter s2
-#-----| non-null -> ... ?? ...
-#-----| null -> ""
-
-#    7| ... ?? ...
-#-----|  -> ... ?? ...
-
-#    7| ""
-#-----|  -> ... ?? ...
-
-#    9| enter M4
-#-----|  -> access to parameter b
-
-#    9| exit M4
-
-#    9| exit M4 (normal)
-#-----|  -> exit M4
-
-#    9| ... ?? ...
-#-----|  -> exit M4 (normal)
-
-#    9| access to parameter b
-#-----| true -> access to parameter s
-#-----| false -> access to parameter s
-
-#    9| [non-null] ... ? ... : ...
-#-----| non-null -> ... ?? ...
-
-#    9| [null] ... ? ... : ...
-#-----| null -> ""
-
-#    9| access to parameter s
-#-----| non-null -> [non-null] ... ? ... : ...
-#-----| null -> [null] ... ? ... : ...
-
-#    9| access to parameter s
-#-----| non-null -> [non-null] ... ? ... : ...
-#-----| null -> [null] ... ? ... : ...
-
-#    9| ""
-#-----| non-null -> ... ?? ...
-
-#    9| ... ?? ...
-#-----|  -> ... ?? ...
-
-#   11| enter M5
-#-----|  -> access to parameter b1
-
-#   11| exit M5
-
-#   11| exit M5 (normal)
-#-----|  -> exit M5
-
-#   11| ... ? ... : ...
-#-----|  -> exit M5 (normal)
-
-#   11| access to parameter b1
-#-----| false -> [false] ... ?? ...
-#-----| true -> [true] ... ?? ...
-#-----| null -> access to parameter b2
-
-#   11| [false] ... ?? ...
-#-----| false -> 1
-
-#   11| [true] ... ?? ...
-#-----| true -> 0
-
-#   11| access to parameter b2
-#-----| false -> [false] ... && ...
-#-----| true -> access to parameter b3
-
-#   11| [false] ... && ...
-#-----| false -> [false] ... ?? ...
-
-#   11| [true] ... && ...
-#-----| true -> [true] ... ?? ...
-
-#   11| access to parameter b3
-#-----| false -> [false] ... && ...
-#-----| true -> [true] ... && ...
-
-#   11| 0
-#-----|  -> ... ? ... : ...
-
-#   11| 1
-#-----|  -> ... ? ... : ...
-
-#   13| enter M6
-#-----|  -> {...}
-
-#   13| exit M6
-
-#   13| exit M6 (normal)
-#-----|  -> exit M6
-
-#   14| {...}
-#-----|  -> ... ...;
-
-#   15| ... ...;
-#-----|  -> null
-
-#   15| Int32 j = ...
-#-----|  -> ... ...;
-
-#   15| (...) ...
-#-----| null -> 0
-
-#   15| ... ?? ...
-#-----|  -> Int32 j = ...
-
-#   15| null
-#-----|  -> (...) ...
-
-#   15| 0
-#-----|  -> ... ?? ...
-
-#   16| ... ...;
-#-----|  -> ""
-
-#   16| String s = ...
-#-----|  -> ...;
-
-#   16| ""
-#-----| non-null -> ... ?? ...
-
-#   16| ... ?? ...
-#-----|  -> String s = ...
-
-#   17| ... = ...
-#-----|  -> exit M6 (normal)
-
-#   17| ...;
-#-----|  -> access to parameter i
-
-#   17| (...) ...
-#-----| non-null -> ... ?? ...
-
-#   17| ... ?? ...
-#-----|  -> ... = ...
-
-#   17| access to parameter i
-#-----|  -> (...) ...
-
-PartialImplementationA.cs:
-#    3| call to constructor Object
-#-----|  -> this access
-
-#    3| enter Partial
-#-----|  -> call to constructor Object
-
-#    3| exit Partial
-
-#    3| exit Partial (normal)
-#-----|  -> exit Partial
-
-#    3| {...}
-#-----|  -> exit Partial (normal)
-
-PartialImplementationB.cs:
-#    3| this access
-#-----|  -> 0
-
-#    3| this access
-#-----|  -> 0
-
-#    3| ... = ...
-#-----|  -> this access
-
-#    3| ... = ...
-#-----|  -> this access
-
-#    3| 0
-#-----|  -> ... = ...
-
-#    3| 0
-#-----|  -> ... = ...
-
-#    4| call to constructor Object
-#-----|  -> this access
-
-#    4| enter Partial
-#-----|  -> call to constructor Object
-
-#    4| exit Partial
-
-#    4| exit Partial (normal)
-#-----|  -> exit Partial
-
-#    4| {...}
-#-----|  -> exit Partial (normal)
-
-#    5| access to property P
-#-----|  -> ... = ...
-
-#    5| access to property P
-#-----|  -> ... = ...
-
-#    5| this access
-#-----|  -> 0
-
-#    5| this access
-#-----|  -> 0
-
-#    5| ... = ...
-#-----|  -> {...}
-
-#    5| ... = ...
-#-----|  -> {...}
-
-#    5| 0
-#-----|  -> access to property P
-
-#    5| 0
-#-----|  -> access to property P
-
-Patterns.cs:
-#    3| call to constructor Object
-#-----|  -> {...}
-
-#    3| enter Patterns
-#-----|  -> call to constructor Object
-
-#    3| exit Patterns
-
-#    3| exit Patterns (normal)
-#-----|  -> exit Patterns
-
-#    3| {...}
-#-----|  -> exit Patterns (normal)
-
-#    5| enter M1
-#-----|  -> {...}
-
-#    5| exit M1
-
-#    5| exit M1 (normal)
-#-----|  -> exit M1
-
-#    6| {...}
-#-----|  -> ... ...;
-
-#    7| ... ...;
-#-----|  -> null
-
-#    7| Object o = ...
-#-----|  -> if (...) ...
-
-#    7| null
-#-----|  -> Object o = ...
-
-#    8| if (...) ...
-#-----|  -> access to local variable o
-
-#    8| access to local variable o
-#-----|  -> Int32 i1
-
-#    8| [false] ... is ...
-#-----| false -> if (...) ...
-
-#    8| [true] ... is ...
-#-----| true -> {...}
-
-#    8| Int32 i1
-#-----| match -> [true] ... is ...
-#-----| no-match -> [false] ... is ...
-
-#    9| {...}
-#-----|  -> ...;
-
-#   10| call to method WriteLine
-#-----|  -> switch (...) {...}
-
-#   10| ...;
-#-----|  -> "int "
-
-#   10| $"..."
-#-----|  -> call to method WriteLine
-
-#   10| "int "
-#-----|  -> access to local variable i1
-
-#   10| access to local variable i1
-#-----|  -> $"..."
-
-#   12| if (...) ...
-#-----|  -> access to local variable o
-
-#   12| access to local variable o
-#-----|  -> String s1
-
-#   12| [false] ... is ...
-#-----| false -> if (...) ...
-
-#   12| [true] ... is ...
-#-----| true -> {...}
-
-#   12| String s1
-#-----| match -> [true] ... is ...
-#-----| no-match -> [false] ... is ...
-
-#   13| {...}
-#-----|  -> ...;
-
-#   14| call to method WriteLine
-#-----|  -> switch (...) {...}
-
-#   14| ...;
-#-----|  -> "string "
-
-#   14| $"..."
-#-----|  -> call to method WriteLine
-
-#   14| "string "
-#-----|  -> access to local variable s1
-
-#   14| access to local variable s1
-#-----|  -> $"..."
-
-#   16| if (...) ...
-#-----|  -> access to local variable o
-
-#   16| access to local variable o
-#-----|  -> Object v1
-
-#   16| [false] ... is ...
-#-----| false -> switch (...) {...}
-
-#   16| [true] ... is ...
-#-----| true -> {...}
-
-#   16| Object v1
-#-----| match -> [true] ... is ...
-#-----| no-match -> [false] ... is ...
-
-#   17| {...}
-#-----|  -> switch (...) {...}
-
-#   20| switch (...) {...}
-#-----|  -> access to local variable o
-
-#   20| access to local variable o
-#-----|  -> case ...:
-
-#   22| case ...:
-#-----|  -> "xyz"
-
-#   22| "xyz"
-#-----| match -> break;
-#-----| no-match -> case ...:
-
-#   23| break;
-#-----| break -> switch (...) {...}
-
-#   24| case ...:
-#-----|  -> Int32 i2
-
-#   24| Int32 i2
-#-----| match -> access to local variable i2
-#-----| no-match -> case ...:
-
-#   24| access to local variable i2
-#-----|  -> 0
-
-#   24| ... > ...
-#-----| true -> ...;
-#-----| false -> case ...:
-
-#   24| 0
-#-----|  -> ... > ...
-
-#   25| call to method WriteLine
-#-----|  -> break;
-
-#   25| ...;
-#-----|  -> "positive "
-
-#   25| $"..."
-#-----|  -> call to method WriteLine
-
-#   25| "positive "
-#-----|  -> access to local variable i2
-
-#   25| access to local variable i2
-#-----|  -> $"..."
-
-#   26| break;
-#-----| break -> switch (...) {...}
-
-#   27| case ...:
-#-----|  -> Int32 i3
-
-#   27| Int32 i3
-#-----| match -> ...;
-#-----| no-match -> case ...:
-
-#   28| call to method WriteLine
-#-----|  -> break;
-
-#   28| ...;
-#-----|  -> "int "
-
-#   28| $"..."
-#-----|  -> call to method WriteLine
-
-#   28| "int "
-#-----|  -> access to local variable i3
-
-#   28| access to local variable i3
-#-----|  -> $"..."
-
-#   29| break;
-#-----| break -> switch (...) {...}
-
-#   30| case ...:
-#-----|  -> String s2
-
-#   30| String s2
-#-----| match -> ...;
-#-----| no-match -> case ...:
-
-#   31| call to method WriteLine
-#-----|  -> break;
-
-#   31| ...;
-#-----|  -> "string "
-
-#   31| $"..."
-#-----|  -> call to method WriteLine
-
-#   31| "string "
-#-----|  -> access to local variable s2
-
-#   31| access to local variable s2
-#-----|  -> $"..."
-
-#   32| break;
-#-----| break -> switch (...) {...}
-
-#   33| case ...:
-#-----|  -> Object v2
-
-#   33| Object v2
-#-----| match -> break;
-#-----| no-match -> default:
-
-#   34| break;
-#-----| break -> switch (...) {...}
-
-#   35| default:
-#-----|  -> ...;
-
-#   36| call to method WriteLine
-#-----|  -> break;
-
-#   36| ...;
-#-----|  -> "Something else"
-
-#   36| "Something else"
-#-----|  -> call to method WriteLine
-
-#   37| break;
-#-----| break -> switch (...) {...}
-
-#   40| switch (...) {...}
-#-----|  -> access to local variable o
-
-#   40| access to local variable o
-#-----|  -> exit M1 (normal)
-
-#   47| enter M2
-#-----|  -> access to parameter c
-
-#   47| exit M2
-
-#   47| exit M2 (normal)
-#-----|  -> exit M2
-
-#   48| access to parameter c
-#-----|  -> a
-
-#   48| ... is ...
-#-----|  -> exit M2 (normal)
-
-#   48| not ...
-#-----|  -> ... is ...
-
-#   48| a
-#-----|  -> not ...
-
-#   50| enter M3
-#-----|  -> access to parameter c
-
-#   50| exit M3
-
-#   50| exit M3 (normal)
-#-----|  -> exit M3
-
-#   51| access to parameter c
-#-----|  -> null
-
-#   51| [false] ... is ...
-#-----| false -> access to parameter c
-
-#   51| [true] ... is ...
-#-----| true -> access to parameter c
-
-#   51| ... ? ... : ...
-#-----|  -> exit M3 (normal)
-
-#   51| [match] not ...
-#-----| match -> [true] ... is ...
-
-#   51| [no-match] not ...
-#-----| no-match -> [false] ... is ...
-
-#   51| null
-#-----| match -> [no-match] not ...
-#-----| no-match -> [match] not ...
-
-#   51| access to parameter c
-#-----|  -> 1
-
-#   51| ... is ...
-#-----|  -> ... ? ... : ...
-
-#   51| 1
-#-----|  -> ... is ...
-
-#   51| access to parameter c
-#-----|  -> 2
-
-#   51| ... is ...
-#-----|  -> ... ? ... : ...
-
-#   51| 2
-#-----|  -> ... is ...
-
-#   53| enter M4
-#-----|  -> access to parameter c
-
-#   53| exit M4
-
-#   53| exit M4 (normal)
-#-----|  -> exit M4
-
-#   54| access to parameter c
-#-----|  -> Patterns u
-
-#   54| ... is ...
-#-----|  -> exit M4 (normal)
-
-#   54| not ...
-#-----|  -> ... is ...
-
-#   54| Patterns u
-#-----| no-match -> { ... }
-#-----| match -> 1
-
-#   54| { ... }
-#-----|  -> not ...
-
-#   54| [match] { ... }
-#-----| match -> { ... }
-
-#   54| [no-match] { ... }
-#-----| no-match -> { ... }
-
-#   54| 1
-#-----| match -> [match] { ... }
-#-----| no-match -> [no-match] { ... }
-
-#   56| enter M5
-#-----|  -> {...}
-
-#   56| exit M5
-
-#   56| exit M5 (normal)
-#-----|  -> exit M5
-
-#   57| {...}
-#-----|  -> access to parameter i
-
-#   58| return ...;
-#-----| return -> exit M5 (normal)
-
-#   58| access to parameter i
-#-----|  -> 1
-
-#   58| ... switch { ... }
-#-----|  -> return ...;
-
-#   60| [match] not ...
-#-----| match -> "not 1"
-
-#   60| [no-match] not ...
-#-----| no-match -> _
-
-#   60| ... => ...
-#-----|  -> ... switch { ... }
-
-#   60| 1
-#-----| match -> [no-match] not ...
-#-----| no-match -> [match] not ...
-
-#   60| "not 1"
-#-----|  -> ... => ...
-
-#   61| _
-#-----| match -> "other"
-
-#   61| ... => ...
-#-----|  -> ... switch { ... }
-
-#   61| "other"
-#-----|  -> ... => ...
-
-#   65| enter M6
-#-----|  -> {...}
-
-#   65| exit M6
-
-#   65| exit M6 (normal)
-#-----|  -> exit M6
-
-#   66| {...}
-#-----|  -> 2
-
-#   67| return ...;
-#-----| return -> exit M6 (normal)
-
-#   67| 2
-#-----|  -> 2
-
-#   67| ... switch { ... }
-#-----|  -> return ...;
-
-#   69| [no-match] not ...
-#-----| no-match -> 2
-
-#   69| 2
-#-----| match -> [no-match] not ...
-
-#   70| 2
-#-----| match -> "possible"
-
-#   70| ... => ...
-#-----|  -> ... switch { ... }
-
-#   70| "possible"
-#-----|  -> ... => ...
-
-#   74| enter M7
-#-----|  -> {...}
-
-#   74| exit M7
-
-#   74| exit M7 (normal)
-#-----|  -> exit M7
-
-#   75| {...}
-#-----|  -> access to parameter i
-
-#   76| return ...;
-#-----| return -> exit M7 (normal)
-
-#   76| access to parameter i
-#-----|  -> 1
-
-#   76| ... switch { ... }
-#-----|  -> return ...;
-
-#   78| > ...
-#-----| match -> "> 1"
-#-----| no-match -> 0
-
-#   78| ... => ...
-#-----|  -> ... switch { ... }
-
-#   78| 1
-#-----|  -> > ...
-
-#   78| "> 1"
-#-----|  -> ... => ...
-
-#   79| < ...
-#-----| match -> "< 0"
-#-----| no-match -> 1
-
-#   79| ... => ...
-#-----|  -> ... switch { ... }
-
-#   79| 0
-#-----|  -> < ...
-
-#   79| "< 0"
-#-----|  -> ... => ...
-
-#   80| 1
-#-----| match -> "1"
-#-----| no-match -> _
-
-#   80| ... => ...
-#-----|  -> ... switch { ... }
-
-#   80| "1"
-#-----|  -> ... => ...
-
-#   81| _
-#-----| match -> "0"
-
-#   81| ... => ...
-#-----|  -> ... switch { ... }
-
-#   81| "0"
-#-----|  -> ... => ...
-
-#   85| enter M8
-#-----|  -> access to parameter i
-
-#   85| exit M8
-
-#   85| exit M8 (normal)
-#-----|  -> exit M8
-
-#   85| access to parameter i
-#-----|  -> 1
-
-#   85| [false] ... is ...
-#-----| false -> "2"
-
-#   85| [true] ... is ...
-#-----| true -> "not 2"
-
-#   85| ... ? ... : ...
-#-----|  -> exit M8 (normal)
-
-#   85| 1
-#-----| match -> [match] ... or ...
-#-----| no-match -> 2
-
-#   85| [match] ... or ...
-#-----| match -> [true] ... is ...
-
-#   85| [no-match] ... or ...
-#-----| no-match -> [false] ... is ...
-
-#   85| [match] not ...
-#-----| match -> [match] ... or ...
-
-#   85| [no-match] not ...
-#-----| no-match -> [no-match] ... or ...
-
-#   85| 2
-#-----| match -> [no-match] not ...
-#-----| no-match -> [match] not ...
-
-#   85| "not 2"
-#-----|  -> ... ? ... : ...
-
-#   85| "2"
-#-----|  -> ... ? ... : ...
-
-#   87| enter M9
-#-----|  -> access to parameter i
-
-#   87| exit M9
-
-#   87| exit M9 (normal)
-#-----|  -> exit M9
-
-#   87| access to parameter i
-#-----|  -> 1
-
-#   87| [false] ... is ...
-#-----| false -> "not 1"
-
-#   87| [true] ... is ...
-#-----| true -> "1"
-
-#   87| ... ? ... : ...
-#-----|  -> exit M9 (normal)
-
-#   87| 1
-#-----| no-match -> [no-match] ... and ...
-#-----| match -> 2
-
-#   87| [match] ... and ...
-#-----| match -> [true] ... is ...
-
-#   87| [no-match] ... and ...
-#-----| no-match -> [false] ... is ...
-
-#   87| [match] not ...
-#-----| match -> [match] ... and ...
-
-#   87| [no-match] not ...
-#-----| no-match -> [no-match] ... and ...
-
-#   87| 2
-#-----| match -> [no-match] not ...
-#-----| no-match -> [match] not ...
-
-#   87| "1"
-#-----|  -> ... ? ... : ...
-
-#   87| "not 1"
-#-----|  -> ... ? ... : ...
-
-#   93| enter M10
-#-----|  -> {...}
-
-#   93| exit M10
-
-#   93| exit M10 (normal)
-#-----|  -> exit M10
-
-#   94| {...}
-#-----|  -> if (...) ...
-
-#   95| if (...) ...
-#-----|  -> this access
-
-#   95| this access
-#-----|  -> access to constant A
-
-#   95| [false] ... is ...
-#-----| false -> exit M10 (normal)
-
-#   95| [true] ... is ...
-#-----| true -> {...}
-
-#   95| [match] { ... }
-#-----| match -> [true] ... is ...
-
-#   95| [match] { ... }
-#-----| match -> [match] { ... }
-
-#   95| [no-match] { ... }
-#-----| no-match -> [false] ... is ...
-
-#   95| [no-match] { ... }
-#-----| no-match -> [no-match] { ... }
-
-#   95| access to constant A
-#-----| match -> [match] ... or ...
-#-----| no-match -> access to constant B
-
-#   95| [match] ... or ...
-#-----| match -> [match] { ... }
-
-#   95| [no-match] ... or ...
-#-----| no-match -> [no-match] { ... }
-
-#   95| access to constant B
-#-----| match -> [match] ... or ...
-#-----| no-match -> [no-match] ... or ...
-
-#   96| {...}
-#-----|  -> ...;
-
-#   97| call to method WriteLine
-#-----|  -> exit M10 (normal)
-
-#   97| ...;
-#-----|  -> "not C"
-
-#   97| "not C"
-#-----|  -> call to method WriteLine
-
-PostDominance.cs:
-#    3| call to constructor Object
-#-----|  -> {...}
-
-#    3| enter PostDominance
-#-----|  -> call to constructor Object
-
-#    3| exit PostDominance
-
-#    3| exit PostDominance (normal)
-#-----|  -> exit PostDominance
-
-#    3| {...}
-#-----|  -> exit PostDominance (normal)
-
-#    5| enter M1
-#-----|  -> {...}
-
-#    5| exit M1
-
-#    5| exit M1 (normal)
-#-----|  -> exit M1
-
-#    6| {...}
-#-----|  -> ...;
-
-#    7| call to method WriteLine
-#-----|  -> exit M1 (normal)
-
-#    7| ...;
-#-----|  -> access to parameter s
-
-#    7| access to parameter s
-#-----|  -> call to method WriteLine
-
-#   10| enter M2
-#-----|  -> {...}
-
-#   10| exit M2
-
-#   10| exit M2 (normal)
-#-----|  -> exit M2
-
-#   11| {...}
-#-----|  -> if (...) ...
-
-#   12| if (...) ...
-#-----|  -> access to parameter s
-
-#   12| access to parameter s
-#-----|  -> null
-
-#   12| [false] ... is ...
-#-----| false -> ...;
-
-#   12| [true] ... is ...
-#-----| true -> return ...;
-
-#   12| null
-#-----| match -> [true] ... is ...
-#-----| no-match -> [false] ... is ...
-
-#   13| return ...;
-#-----| return -> exit M2 (normal)
-
-#   14| call to method WriteLine
-#-----|  -> exit M2 (normal)
-
-#   14| ...;
-#-----|  -> access to parameter s
-
-#   14| access to parameter s
-#-----|  -> call to method WriteLine
-
-#   17| enter M3
-#-----|  -> {...}
-
-#   17| exit M3
-
-#   17| exit M3 (abnormal)
-#-----|  -> exit M3
-
-#   17| exit M3 (normal)
-#-----|  -> exit M3
-
-#   18| {...}
-#-----|  -> if (...) ...
-
-#   19| if (...) ...
-#-----|  -> access to parameter s
-
-#   19| access to parameter s
-#-----|  -> null
-
-#   19| [false] ... is ...
-#-----| false -> ...;
-
-#   19| [true] ... is ...
-#-----| true -> nameof(...)
-
-#   19| null
-#-----| match -> [true] ... is ...
-#-----| no-match -> [false] ... is ...
-
-#   20| throw ...;
-#-----| exception(ArgumentNullException) -> exit M3 (abnormal)
-
-#   20| object creation of type ArgumentNullException
-#-----|  -> throw ...;
-
-#   20| nameof(...)
-#-----|  -> object creation of type ArgumentNullException
-
-#   21| call to method WriteLine
-#-----|  -> exit M3 (normal)
-
-#   21| ...;
-#-----|  -> access to parameter s
-
-#   21| access to parameter s
-#-----|  -> call to method WriteLine
-
-Qualifiers.cs:
-#    1| call to constructor Object
-#-----|  -> {...}
-
-#    1| enter Qualifiers
-#-----|  -> call to constructor Object
-
-#    1| exit Qualifiers
-
-#    1| exit Qualifiers (normal)
-#-----|  -> exit Qualifiers
-
-#    1| {...}
-#-----|  -> exit Qualifiers (normal)
-
-#    7| enter Method
-#-----|  -> null
-
-#    7| exit Method
-
-#    7| exit Method (normal)
-#-----|  -> exit Method
-
-#    7| null
-#-----|  -> exit Method (normal)
-
-#    8| enter StaticMethod
-#-----|  -> null
-
-#    8| exit StaticMethod
-
-#    8| exit StaticMethod (normal)
-#-----|  -> exit StaticMethod
-
-#    8| null
-#-----|  -> exit StaticMethod (normal)
-
-#   10| enter M
-#-----|  -> {...}
-
-#   10| exit M
-
-#   10| exit M (normal)
-#-----|  -> exit M
-
-#   11| {...}
-#-----|  -> ... ...;
-
-#   12| ... ...;
-#-----|  -> this access
-
-#   12| Qualifiers q = ...
-#-----|  -> ...;
-
-#   12| access to field Field
-#-----|  -> Qualifiers q = ...
-
-#   12| this access
-#-----|  -> access to field Field
-
-#   13| ... = ...
-#-----|  -> ...;
-
-#   13| ...;
-#-----|  -> this access
-
-#   13| access to property Property
-#-----|  -> ... = ...
-
-#   13| this access
-#-----|  -> access to property Property
-
-#   14| ... = ...
-#-----|  -> ...;
-
-#   14| ...;
-#-----|  -> this access
-
-#   14| call to method Method
-#-----|  -> ... = ...
-
-#   14| this access
-#-----|  -> call to method Method
-
-#   16| ... = ...
-#-----|  -> ...;
-
-#   16| ...;
-#-----|  -> this access
-
-#   16| this access
-#-----|  -> access to field Field
-
-#   16| access to field Field
-#-----|  -> ... = ...
-
-#   17| ... = ...
-#-----|  -> ...;
-
-#   17| ...;
-#-----|  -> this access
-
-#   17| this access
-#-----|  -> access to property Property
-
-#   17| access to property Property
-#-----|  -> ... = ...
-
-#   18| ... = ...
-#-----|  -> ...;
-
-#   18| ...;
-#-----|  -> this access
-
-#   18| this access
-#-----|  -> call to method Method
-
-#   18| call to method Method
-#-----|  -> ... = ...
-
-#   20| ... = ...
-#-----|  -> ...;
-
-#   20| ...;
-#-----|  -> access to field StaticField
-
-#   20| access to field StaticField
-#-----|  -> ... = ...
-
-#   21| ... = ...
-#-----|  -> ...;
-
-#   21| ...;
-#-----|  -> access to property StaticProperty
-
-#   21| access to property StaticProperty
-#-----|  -> ... = ...
-
-#   22| ... = ...
-#-----|  -> ...;
-
-#   22| ...;
-#-----|  -> call to method StaticMethod
-
-#   22| call to method StaticMethod
-#-----|  -> ... = ...
-
-#   24| ... = ...
-#-----|  -> ...;
-
-#   24| ...;
-#-----|  -> access to field StaticField
-
-#   24| access to field StaticField
-#-----|  -> ... = ...
-
-#   25| ... = ...
-#-----|  -> ...;
-
-#   25| ...;
-#-----|  -> access to property StaticProperty
-
-#   25| access to property StaticProperty
-#-----|  -> ... = ...
-
-#   26| ... = ...
-#-----|  -> ...;
-
-#   26| ...;
-#-----|  -> call to method StaticMethod
-
-#   26| call to method StaticMethod
-#-----|  -> ... = ...
-
-#   28| ... = ...
-#-----|  -> ...;
-
-#   28| ...;
-#-----|  -> access to field StaticField
-
-#   28| access to field StaticField
-#-----|  -> access to field Field
-
-#   28| access to field Field
-#-----|  -> ... = ...
-
-#   29| ... = ...
-#-----|  -> ...;
-
-#   29| ...;
-#-----|  -> access to property StaticProperty
-
-#   29| access to property StaticProperty
-#-----|  -> access to property Property
-
-#   29| access to property Property
-#-----|  -> ... = ...
-
-#   30| ... = ...
-#-----|  -> exit M (normal)
-
-#   30| ...;
-#-----|  -> call to method StaticMethod
-
-#   30| call to method StaticMethod
-#-----|  -> call to method Method
-
-#   30| call to method Method
-#-----|  -> ... = ...
-
-Switch.cs:
-#    3| call to constructor Object
-#-----|  -> {...}
-
-#    3| enter Switch
-#-----|  -> call to constructor Object
-
-#    3| exit Switch
-
-#    3| exit Switch (normal)
-#-----|  -> exit Switch
-
-#    3| {...}
-#-----|  -> exit Switch (normal)
-
-#    5| enter M1
-#-----|  -> {...}
-
-#    5| exit M1
-
-#    5| exit M1 (normal)
-#-----|  -> exit M1
-
-#    6| {...}
-#-----|  -> switch (...) {...}
-
-#    7| switch (...) {...}
-#-----|  -> access to parameter o
-
-#    7| access to parameter o
-#-----|  -> exit M1 (normal)
-
-#   10| enter M2
-#-----|  -> {...}
-
-#   10| exit M2
-
-#   10| exit M2 (abnormal)
-#-----|  -> exit M2
-
-#   10| exit M2 (normal)
-#-----|  -> exit M2
-
-#   11| {...}
-#-----|  -> switch (...) {...}
-
-#   12| switch (...) {...}
-#-----|  -> access to parameter o
-
-#   12| access to parameter o
-#-----|  -> case ...:
-
-#   14| case ...:
-#-----|  -> "a"
-
-#   14| "a"
-#-----| match -> return ...;
-#-----| no-match -> case ...:
-
-#   15| return ...;
-#-----| return -> exit M2 (normal)
-
-#   16| case ...:
-#-----|  -> 0
-
-#   16| 0
-#-----| match -> object creation of type Exception
-#-----| no-match -> case ...:
-
-#   17| throw ...;
-#-----| exception(Exception) -> exit M2 (abnormal)
-
-#   17| object creation of type Exception
-#-----|  -> throw ...;
-
-#   18| case ...:
-#-----|  -> null
-
-#   18| null
-#-----| match -> goto default;
-#-----| no-match -> case ...:
-
-#   19| goto default;
-#-----| goto(default) -> default:
-
-#   20| case ...:
-#-----|  -> Int32 i
-
-#   20| Int32 i
-#-----| match -> if (...) ...
-#-----| no-match -> case ...:
-
-#   21| if (...) ...
-#-----|  -> access to parameter o
-
-#   21| access to parameter o
-#-----|  -> null
-
-#   21| ... == ...
-#-----| true -> return ...;
-#-----| false -> 0
-
-#   21| null
-#-----|  -> ... == ...
-
-#   22| return ...;
-#-----| return -> exit M2 (normal)
-
-#   23| goto case ...;
-#-----| goto(0) -> case ...:
-
-#   23| 0
-#-----|  -> goto case ...;
-
-#   24| case ...:
-#-----|  -> String s
-
-#   24| String s
-#-----| match -> access to local variable s
-#-----| no-match -> case ...:
-
-#   24| access to local variable s
-#-----|  -> access to property Length
-
-#   24| access to property Length
-#-----|  -> 0
-
-#   24| ... > ...
-#-----| false -> [false] ... && ...
-#-----| true -> access to local variable s
-
-#   24| [false] ... && ...
-#-----| false -> case ...:
-
-#   24| [true] ... && ...
-#-----| true -> ...;
-
-#   24| 0
-#-----|  -> ... > ...
-
-#   24| access to local variable s
-#-----|  -> "a"
-
-#   24| ... != ...
-#-----| false -> [false] ... && ...
-#-----| true -> [true] ... && ...
-
-#   24| "a"
-#-----|  -> ... != ...
-
-#   25| call to method WriteLine
-#-----|  -> return ...;
-
-#   25| ...;
-#-----|  -> access to local variable s
-
-#   25| access to local variable s
-#-----|  -> call to method WriteLine
-
-#   26| return ...;
-#-----| return -> exit M2 (normal)
-
-#   27| case ...:
-#-----|  -> Double d
-
-#   27| Double d
-#-----| match -> call to method Throw
-#-----| no-match -> default:
-
-#   27| call to method Throw
-#-----| exception(Exception) -> exit M2 (abnormal)
-
-#   28| Label:
-#-----|  -> return ...;
-
-#   29| return ...;
-#-----| return -> exit M2 (normal)
-
-#   30| default:
-#-----|  -> goto ...;
-
-#   31| goto ...;
-#-----| goto(Label) -> Label:
-
-#   35| enter M3
-#-----|  -> {...}
-
-#   35| exit M3
-
-#   35| exit M3 (abnormal)
-#-----|  -> exit M3
-
-#   36| {...}
-#-----|  -> switch (...) {...}
-
-#   37| switch (...) {...}
-#-----|  -> call to method Throw
-
-#   37| call to method Throw
-#-----| exception(Exception) -> exit M3 (abnormal)
-
-#   44| enter M4
-#-----|  -> {...}
-
-#   44| exit M4
-
-#   44| exit M4 (normal)
-#-----|  -> exit M4
-
-#   45| {...}
-#-----|  -> switch (...) {...}
-
-#   46| switch (...) {...}
-#-----|  -> access to parameter o
-
-#   46| access to parameter o
-#-----|  -> case ...:
-
-#   48| case ...:
-#-----|  -> access to type Int32
-
-#   48| access to type Int32
-#-----| match -> break;
-#-----| no-match -> case ...:
-
-#   49| break;
-#-----| break -> exit M4 (normal)
-
-#   50| case ...:
-#-----|  -> access to type Boolean
-
-#   50| access to type Boolean
-#-----| no-match -> exit M4 (normal)
-#-----| match -> access to parameter o
-
-#   50| access to parameter o
-#-----|  -> null
-
-#   50| ... != ...
-#-----| false -> exit M4 (normal)
-#-----| true -> break;
-
-#   50| null
-#-----|  -> ... != ...
-
-#   51| break;
-#-----| break -> exit M4 (normal)
-
-#   55| enter M5
-#-----|  -> {...}
-
-#   55| exit M5
-
-#   55| exit M5 (normal)
-#-----|  -> exit M5
-
-#   56| {...}
-#-----|  -> switch (...) {...}
-
-#   57| switch (...) {...}
-#-----|  -> 1
-
-#   57| 1
-#-----|  -> 2
-
-#   57| ... + ...
-#-----|  -> case ...:
-
-#   57| 2
-#-----|  -> ... + ...
-
-#   59| case ...:
-#-----|  -> 2
-
-#   59| 2
-#-----| no-match -> case ...:
-
-#   61| case ...:
-#-----|  -> 3
-
-#   61| 3
-#-----| match -> break;
-
-#   62| break;
-#-----| break -> exit M5 (normal)
-
-#   66| enter M6
-#-----|  -> {...}
-
-#   66| exit M6
-
-#   66| exit M6 (normal)
-#-----|  -> exit M6
-
-#   67| {...}
-#-----|  -> switch (...) {...}
-
-#   68| switch (...) {...}
-#-----|  -> access to parameter s
-
-#   68| (...) ...
-#-----|  -> case ...:
-
-#   68| access to parameter s
-#-----|  -> (...) ...
-
-#   70| case ...:
-#-----|  -> access to type Int32
-
-#   70| access to type Int32
-#-----| no-match -> case ...:
-
-#   72| case ...:
-#-----|  -> ""
-
-#   72| ""
-#-----| no-match -> exit M6 (normal)
-#-----| match -> break;
-
-#   73| break;
-#-----| break -> exit M6 (normal)
-
-#   77| enter M7
-#-----|  -> {...}
-
-#   77| exit M7
-
-#   77| exit M7 (normal)
-#-----|  -> exit M7
-
-#   78| {...}
-#-----|  -> switch (...) {...}
-
-#   79| switch (...) {...}
-#-----|  -> access to parameter i
-
-#   79| access to parameter i
-#-----|  -> case ...:
-
-#   81| case ...:
-#-----|  -> 1
-
-#   81| 1
-#-----| match -> true
-#-----| no-match -> case ...:
-
-#   82| return ...;
-#-----| return -> exit M7 (normal)
-
-#   82| true
-#-----|  -> return ...;
-
-#   83| case ...:
-#-----|  -> 2
-
-#   83| 2
-#-----| match -> if (...) ...
-#-----| no-match -> false
-
-#   84| if (...) ...
-#-----|  -> access to parameter j
-
-#   84| access to parameter j
-#-----|  -> 2
-
-#   84| ... > ...
-#-----| true -> break;
-#-----| false -> true
-
-#   84| 2
-#-----|  -> ... > ...
-
-#   85| break;
-#-----| break -> false
-
-#   86| return ...;
-#-----| return -> exit M7 (normal)
-
-#   86| true
-#-----|  -> return ...;
-
-#   88| return ...;
-#-----| return -> exit M7 (normal)
-
-#   88| false
-#-----|  -> return ...;
-
-#   91| enter M8
-#-----|  -> {...}
-
-#   91| exit M8
-
-#   91| exit M8 (normal)
-#-----|  -> exit M8
-
-#   92| {...}
-#-----|  -> switch (...) {...}
-
-#   93| switch (...) {...}
-#-----|  -> access to parameter o
-
-#   93| access to parameter o
-#-----|  -> case ...:
-
-#   95| case ...:
-#-----|  -> access to type Int32
-
-#   95| access to type Int32
-#-----| match -> true
-#-----| no-match -> false
-
-#   96| return ...;
-#-----| return -> exit M8 (normal)
-
-#   96| true
-#-----|  -> return ...;
-
-#   98| return ...;
-#-----| return -> exit M8 (normal)
-
-#   98| false
-#-----|  -> return ...;
-
-#  101| enter M9
-#-----|  -> {...}
-
-#  101| exit M9
-
-#  101| exit M9 (normal)
-#-----|  -> exit M9
-
-#  102| {...}
-#-----|  -> switch (...) {...}
-
-#  103| switch (...) {...}
-#-----|  -> access to parameter s
-
-#  103| access to parameter s
-#-----| non-null -> access to property Length
-#-----| null -> case ...:
-
-#  103| access to property Length
-#-----|  -> case ...:
-
-#  105| case ...:
-#-----|  -> 0
-
-#  105| 0
-#-----| match -> 0
-#-----| no-match -> case ...:
-
-#  105| return ...;
-#-----| return -> exit M9 (normal)
-
-#  105| 0
-#-----|  -> return ...;
-
-#  106| case ...:
-#-----|  -> 1
-
-#  106| 1
-#-----| match -> 1
-#-----| no-match -> 1
-
-#  106| return ...;
-#-----| return -> exit M9 (normal)
-
-#  106| 1
-#-----|  -> return ...;
-
-#  108| return ...;
-#-----| return -> exit M9 (normal)
-
-#  108| -...
-#-----|  -> return ...;
-
-#  108| 1
-#-----|  -> -...
-
-#  111| enter Throw
-#-----|  -> object creation of type Exception
-
-#  111| exit Throw
-
-#  111| exit Throw (abnormal)
-#-----|  -> exit Throw
-
-#  111| throw ...
-#-----| exception(Exception) -> exit Throw (abnormal)
-
-#  111| object creation of type Exception
-#-----|  -> throw ...
-
-#  113| enter M10
-#-----|  -> {...}
-
-#  113| exit M10
-
-#  113| exit M10 (normal)
-#-----|  -> exit M10
-
-#  114| {...}
-#-----|  -> switch (...) {...}
-
-#  115| switch (...) {...}
-#-----|  -> access to parameter s
-
-#  115| access to parameter s
-#-----|  -> access to property Length
-
-#  115| access to property Length
-#-----|  -> case ...:
-
-#  117| case ...:
-#-----|  -> 3
-
-#  117| 3
-#-----| match -> access to parameter s
-#-----| no-match -> case ...:
-
-#  117| access to parameter s
-#-----|  -> "foo"
-
-#  117| ... == ...
-#-----| true -> 1
-#-----| false -> case ...:
-
-#  117| "foo"
-#-----|  -> ... == ...
-
-#  117| return ...;
-#-----| return -> exit M10 (normal)
-
-#  117| 1
-#-----|  -> return ...;
-
-#  118| case ...:
-#-----|  -> 2
-
-#  118| 2
-#-----| match -> access to parameter s
-#-----| no-match -> 1
-
-#  118| access to parameter s
-#-----|  -> "fu"
-
-#  118| ... == ...
-#-----| true -> 2
-#-----| false -> 1
-
-#  118| "fu"
-#-----|  -> ... == ...
-
-#  118| return ...;
-#-----| return -> exit M10 (normal)
-
-#  118| 2
-#-----|  -> return ...;
-
-#  120| return ...;
-#-----| return -> exit M10 (normal)
-
-#  120| -...
-#-----|  -> return ...;
-
-#  120| 1
-#-----|  -> -...
-
-#  123| enter M11
-#-----|  -> {...}
-
-#  123| exit M11
-
-#  123| exit M11 (normal)
-#-----|  -> exit M11
-
-#  124| {...}
-#-----|  -> if (...) ...
-
-#  125| if (...) ...
-#-----|  -> access to parameter o
-
-#  125| access to parameter o
-#-----|  -> Boolean b
-
-#  125| [false] ... switch { ... }
-#-----| false -> exit M11 (normal)
-
-#  125| [true] ... switch { ... }
-#-----| true -> return ...;
-
-#  125| Boolean b
-#-----| match -> access to local variable b
-#-----| no-match -> _
-
-#  125| [false] ... => ...
-#-----| false -> [false] ... switch { ... }
-
-#  125| [true] ... => ...
-#-----| true -> [true] ... switch { ... }
-
-#  125| access to local variable b
-#-----| false -> [false] ... => ...
-#-----| true -> [true] ... => ...
-
-#  125| _
-#-----| match -> false
-
-#  125| [false] ... => ...
-#-----| false -> [false] ... switch { ... }
-
-#  125| false
-#-----| false -> [false] ... => ...
-
-#  126| return ...;
-#-----| return -> exit M11 (normal)
-
-#  129| enter M12
-#-----|  -> {...}
-
-#  129| exit M12
-
-#  129| exit M12 (normal)
-#-----|  -> exit M12
-
-#  130| {...}
-#-----|  -> access to parameter o
-
-#  131| return ...;
-#-----| return -> exit M12 (normal)
-
-#  131| call to method ToString
-#-----|  -> return ...;
-
-#  131| access to parameter o
-#-----|  -> String s
-
-#  131| [non-null] ... switch { ... }
-#-----| non-null -> call to method ToString
-
-#  131| [null] ... switch { ... }
-#-----| null -> return ...;
-
-#  131| String s
-#-----| match -> access to local variable s
-#-----| no-match -> _
-
-#  131| [non-null] ... => ...
-#-----| non-null -> [non-null] ... switch { ... }
-
-#  131| [null] ... => ...
-#-----| null -> [null] ... switch { ... }
-
-#  131| access to local variable s
-#-----| non-null -> [non-null] ... => ...
-#-----| null -> [null] ... => ...
-
-#  131| _
-#-----| match -> null
-
-#  131| [null] ... => ...
-#-----| null -> [null] ... switch { ... }
-
-#  131| null
-#-----| null -> [null] ... => ...
-
-#  134| enter M13
-#-----|  -> {...}
-
-#  134| exit M13
-
-#  134| exit M13 (normal)
-#-----|  -> exit M13
-
-#  135| {...}
-#-----|  -> switch (...) {...}
-
-#  136| switch (...) {...}
-#-----|  -> access to parameter i
-
-#  136| access to parameter i
-#-----|  -> case ...:
-
-#  138| default:
-#-----|  -> 1
-
-#  138| return ...;
-#-----| return -> exit M13 (normal)
-
-#  138| -...
-#-----|  -> return ...;
-
-#  138| 1
-#-----|  -> -...
-
-#  139| case ...:
-#-----|  -> 1
-
-#  139| 1
-#-----| match -> 1
-#-----| no-match -> case ...:
-
-#  139| return ...;
-#-----| return -> exit M13 (normal)
-
-#  139| 1
-#-----|  -> return ...;
-
-#  140| case ...:
-#-----|  -> 2
-
-#  140| 2
-#-----| no-match -> default:
-#-----| match -> 2
-
-#  140| return ...;
-#-----| return -> exit M13 (normal)
-
-#  140| 2
-#-----|  -> return ...;
-
-#  144| enter M14
-#-----|  -> {...}
-
-#  144| exit M14
-
-#  144| exit M14 (normal)
-#-----|  -> exit M14
-
-#  145| {...}
-#-----|  -> switch (...) {...}
-
-#  146| switch (...) {...}
-#-----|  -> access to parameter i
-
-#  146| access to parameter i
-#-----|  -> case ...:
-
-#  148| case ...:
-#-----|  -> 1
-
-#  148| 1
-#-----| match -> 1
-#-----| no-match -> case ...:
-
-#  148| return ...;
-#-----| return -> exit M14 (normal)
-
-#  148| 1
-#-----|  -> return ...;
-
-#  149| default:
-#-----|  -> 1
-
-#  149| return ...;
-#-----| return -> exit M14 (normal)
-
-#  149| -...
-#-----|  -> return ...;
-
-#  149| 1
-#-----|  -> -...
-
-#  150| case ...:
-#-----|  -> 2
-
-#  150| 2
-#-----| no-match -> default:
-#-----| match -> 2
-
-#  150| return ...;
-#-----| return -> exit M14 (normal)
-
-#  150| 2
-#-----|  -> return ...;
-
-#  154| enter M15
-#-----|  -> {...}
-
-#  154| exit M15
-
-#  154| exit M15 (abnormal)
-#-----|  -> exit M15
-
-#  154| exit M15 (normal)
-#-----|  -> exit M15
-
-#  155| {...}
-#-----|  -> ... ...;
-
-#  156| ... ...;
-#-----|  -> access to parameter b
-
-#  156| String s = ...
-#-----|  -> if (...) ...
-
-#  156| access to parameter b
-#-----|  -> true
-
-#  156| ... switch { ... }
-#-----|  -> String s = ...
-
-#  156| true
-#-----| match -> "a"
-#-----| no-match -> false
-
-#  156| ... => ...
-#-----|  -> ... switch { ... }
-
-#  156| "a"
-#-----|  -> ... => ...
-
-#  156| false
-#-----| exception(InvalidOperationException) -> exit M15 (abnormal)
-#-----| match -> "b"
-
-#  156| ... => ...
-#-----|  -> ... switch { ... }
-
-#  156| "b"
-#-----|  -> ... => ...
-
-#  157| if (...) ...
-#-----|  -> access to parameter b
-
-#  157| access to parameter b
-#-----| true -> ...;
-#-----| false -> ...;
-
-#  158| call to method WriteLine
-#-----|  -> exit M15 (normal)
-
-#  158| ...;
-#-----|  -> "a = "
-
-#  158| $"..."
-#-----|  -> call to method WriteLine
-
-#  158| "a = "
-#-----|  -> access to local variable s
-
-#  158| access to local variable s
-#-----|  -> $"..."
-
-#  160| call to method WriteLine
-#-----|  -> exit M15 (normal)
-
-#  160| ...;
-#-----|  -> "b = "
-
-#  160| $"..."
-#-----|  -> call to method WriteLine
-
-#  160| "b = "
-#-----|  -> access to local variable s
-
-#  160| access to local variable s
-#-----|  -> $"..."
-
-TypeAccesses.cs:
-#    1| call to constructor Object
-#-----|  -> {...}
-
-#    1| enter TypeAccesses
-#-----|  -> call to constructor Object
-
-#    1| exit TypeAccesses
-
-#    1| exit TypeAccesses (normal)
-#-----|  -> exit TypeAccesses
-
-#    1| {...}
-#-----|  -> exit TypeAccesses (normal)
-
-#    3| enter M
-#-----|  -> {...}
-
-#    3| exit M
-
-#    3| exit M (normal)
-#-----|  -> exit M
-
-#    4| {...}
-#-----|  -> ... ...;
-
-#    5| ... ...;
-#-----|  -> access to parameter o
-
-#    5| String s = ...
-#-----|  -> ...;
-
-#    5| (...) ...
-#-----|  -> String s = ...
-
-#    5| access to parameter o
-#-----|  -> (...) ...
-
-#    6| ... = ...
-#-----|  -> if (...) ...
-
-#    6| ...;
-#-----|  -> access to parameter o
-
-#    6| access to parameter o
-#-----|  -> ... as ...
-
-#    6| ... as ...
-#-----|  -> ... = ...
-
-#    7| if (...) ...
-#-----|  -> access to parameter o
-
-#    7| access to parameter o
-#-----|  -> Int32 j
-
-#    7| [false] ... is ...
-#-----| false -> ... ...;
-
-#    7| [true] ... is ...
-#-----| true -> ;
-
-#    7| Int32 j
-#-----| match -> [true] ... is ...
-#-----| no-match -> [false] ... is ...
-
-#    7| ;
-#-----|  -> ... ...;
-
-#    8| ... ...;
-#-----|  -> typeof(...)
-
-#    8| Type t = ...
-#-----|  -> exit M (normal)
-
-#    8| typeof(...)
-#-----|  -> Type t = ...
-
-VarDecls.cs:
-#    3| call to constructor Object
-#-----|  -> {...}
-
-#    3| enter VarDecls
-#-----|  -> call to constructor Object
-
-#    3| exit VarDecls
-
-#    3| exit VarDecls (normal)
-#-----|  -> exit VarDecls
-
-#    3| {...}
-#-----|  -> exit VarDecls (normal)
-
-#    5| enter M1
-#-----|  -> {...}
-
-#    5| exit M1
-
-#    5| exit M1 (normal)
-#-----|  -> exit M1
-
-#    6| {...}
-#-----|  -> fixed(...) { ... }
-
-#    7| fixed(...) { ... }
-#-----|  -> access to parameter strings
-
-#    7| Char* c1 = ...
-#-----|  -> access to parameter strings
-
-#    7| access to parameter strings
-#-----|  -> 0
-
-#    7| (...) ...
-#-----|  -> Char* c1 = ...
-
-#    7| access to array element
-#-----|  -> (...) ...
-
-#    7| 0
-#-----|  -> access to array element
-
-#    7| Char* c2 = ...
-#-----|  -> {...}
-
-#    7| access to parameter strings
-#-----|  -> 1
-
-#    7| (...) ...
-#-----|  -> Char* c2 = ...
-
-#    7| access to array element
-#-----|  -> (...) ...
-
-#    7| 1
-#-----|  -> access to array element
-
-#    8| {...}
-#-----|  -> access to local variable c1
-
-#    9| return ...;
-#-----| return -> exit M1 (normal)
-
-#    9| (...) ...
-#-----|  -> return ...;
-
-#    9| access to local variable c1
-#-----|  -> (...) ...
-
-#   13| enter M2
-#-----|  -> {...}
-
-#   13| exit M2
-
-#   13| exit M2 (normal)
-#-----|  -> exit M2
-
-#   14| {...}
-#-----|  -> ... ...;
-
-#   15| ... ...;
-#-----|  -> access to parameter s
-
-#   15| String s1 = ...
-#-----|  -> access to parameter s
-
-#   15| access to parameter s
-#-----|  -> String s1 = ...
-
-#   15| String s2 = ...
-#-----|  -> access to local variable s1
-
-#   15| access to parameter s
-#-----|  -> String s2 = ...
-
-#   16| return ...;
-#-----| return -> exit M2 (normal)
-
-#   16| access to local variable s1
-#-----|  -> access to local variable s2
-
-#   16| ... + ...
-#-----|  -> return ...;
-
-#   16| access to local variable s2
-#-----|  -> ... + ...
-
-#   19| enter M3
-#-----|  -> {...}
-
-#   19| exit M3
-
-#   19| exit M3 (normal)
-#-----|  -> exit M3
-
-#   20| {...}
-#-----|  -> using (...) {...}
-
-#   21| using (...) {...}
-#-----|  -> object creation of type C
-
-#   21| object creation of type C
-#-----|  -> ;
-
-#   22| ;
-#-----|  -> using (...) {...}
-
-#   24| using (...) {...}
-#-----|  -> object creation of type C
-
-#   24| C x = ...
-#-----|  -> object creation of type C
-
-#   24| object creation of type C
-#-----|  -> C x = ...
-
-#   24| C y = ...
-#-----|  -> access to parameter b
-
-#   24| object creation of type C
-#-----|  -> C y = ...
-
-#   25| return ...;
-#-----| return -> exit M3 (normal)
-
-#   25| access to parameter b
-#-----| true -> access to local variable x
-#-----| false -> access to local variable y
-
-#   25| ... ? ... : ...
-#-----|  -> return ...;
-
-#   25| access to local variable x
-#-----|  -> ... ? ... : ...
-
-#   25| access to local variable y
-#-----|  -> ... ? ... : ...
-
-#   28| call to constructor Object
-#-----|  -> {...}
-
-#   28| enter C
-#-----|  -> call to constructor Object
-
-#   28| exit C
-
-#   28| exit C (normal)
-#-----|  -> exit C
-
-#   28| {...}
-#-----|  -> exit C (normal)
-
-#   28| enter Dispose
-#-----|  -> {...}
-
-#   28| exit Dispose
-
-#   28| exit Dispose (normal)
-#-----|  -> exit Dispose
-
-#   28| {...}
-#-----|  -> exit Dispose (normal)
-
-cflow.cs:
-#    5| enter Main
-#-----|  -> {...}
-
-#    5| exit Main
-
-#    5| exit Main (normal)
-#-----|  -> exit Main
-
-#    6| {...}
-#-----|  -> ... ...;
-
-#    7| ... ...;
-#-----|  -> access to parameter args
-
-#    7| Int32 a = ...
-#-----|  -> ...;
-
-#    7| access to parameter args
-#-----|  -> access to property Length
-
-#    7| access to property Length
-#-----|  -> Int32 a = ...
-
-#    9| ... = ...
-#-----|  -> if (...) ...
-
-#    9| ...;
-#-----|  -> object creation of type ControlFlow
-
-#    9| object creation of type ControlFlow
-#-----|  -> access to local variable a
-
-#    9| call to method Switch
-#-----|  -> ... = ...
-
-#    9| access to local variable a
-#-----|  -> call to method Switch
-
-#   11| if (...) ...
-#-----|  -> access to local variable a
-
-#   11| access to local variable a
-#-----|  -> 3
-
-#   11| ... > ...
-#-----| true -> ...;
-#-----| false -> while (...) ...
-
-#   11| 3
-#-----|  -> ... > ...
-
-#   12| call to method WriteLine
-#-----|  -> while (...) ...
-
-#   12| ...;
-#-----|  -> "more than a few"
-
-#   12| "more than a few"
-#-----|  -> call to method WriteLine
-
-#   14| while (...) ...
-#-----|  -> access to local variable a
-
-#   14| access to local variable a
-#-----|  -> 0
-
-#   14| ... > ...
-#-----| true -> {...}
-#-----| false -> do ... while (...);
-
-#   14| 0
-#-----|  -> ... > ...
-
-#   15| {...}
-#-----|  -> ...;
-
-#   16| call to method WriteLine
-#-----|  -> access to local variable a
-
-#   16| ...;
-#-----|  -> access to local variable a
-
-#   16| access to local variable a
-#-----|  -> ...--
-
-#   16| ...--
-#-----|  -> 100
-
-#   16| ... * ...
-#-----|  -> call to method WriteLine
-
-#   16| 100
-#-----|  -> ... * ...
-
-#   19| do ... while (...);
-#-----|  -> {...}
-
-#   20| {...}
-#-----|  -> ...;
-
-#   21| call to method WriteLine
-#-----|  -> access to local variable a
-
-#   21| ...;
-#-----|  -> access to local variable a
-
-#   21| -...
-#-----|  -> call to method WriteLine
-
-#   21| access to local variable a
-#-----|  -> ...++
-
-#   21| ...++
-#-----|  -> -...
-
-#   22| access to local variable a
-#-----|  -> 10
-
-#   22| ... < ...
-#-----| true -> {...}
-#-----| false -> for (...;...;...) ...
-
-#   22| 10
-#-----|  -> ... < ...
-
-#   24| for (...;...;...) ...
-#-----|  -> 1
-
-#   24| Int32 i = ...
-#-----|  -> access to local variable i
-
-#   24| 1
-#-----|  -> Int32 i = ...
-
-#   24| access to local variable i
-#-----|  -> 20
-
-#   24| ... <= ...
-#-----| false -> exit Main (normal)
-#-----| true -> {...}
-
-#   24| 20
-#-----|  -> ... <= ...
-
-#   24| access to local variable i
-#-----|  -> ...++
-
-#   24| ...++
-#-----|  -> access to local variable i
-
-#   25| {...}
-#-----|  -> if (...) ...
-
-#   26| if (...) ...
-#-----|  -> access to local variable i
-
-#   26| access to local variable i
-#-----|  -> 3
-
-#   26| ... % ...
-#-----|  -> 0
-
-#   26| ... == ...
-#-----| false -> [false] ... && ...
-#-----| true -> access to local variable i
-
-#   26| [false] ... && ...
-#-----| false -> if (...) ...
-
-#   26| [true] ... && ...
-#-----| true -> ...;
-
-#   26| 3
-#-----|  -> ... % ...
-
-#   26| 0
-#-----|  -> ... == ...
-
-#   26| access to local variable i
-#-----|  -> 5
-
-#   26| ... % ...
-#-----|  -> 0
-
-#   26| ... == ...
-#-----| false -> [false] ... && ...
-#-----| true -> [true] ... && ...
-
-#   26| 5
-#-----|  -> ... % ...
-
-#   26| 0
-#-----|  -> ... == ...
-
-#   27| call to method WriteLine
-#-----|  -> access to local variable i
-
-#   27| ...;
-#-----|  -> "FizzBuzz"
-
-#   27| "FizzBuzz"
-#-----|  -> call to method WriteLine
-
-#   28| if (...) ...
-#-----|  -> access to local variable i
-
-#   28| access to local variable i
-#-----|  -> 3
-
-#   28| ... % ...
-#-----|  -> 0
-
-#   28| ... == ...
-#-----| true -> ...;
-#-----| false -> if (...) ...
-
-#   28| 3
-#-----|  -> ... % ...
-
-#   28| 0
-#-----|  -> ... == ...
-
-#   29| call to method WriteLine
-#-----|  -> access to local variable i
-
-#   29| ...;
-#-----|  -> "Fizz"
-
-#   29| "Fizz"
-#-----|  -> call to method WriteLine
-
-#   30| if (...) ...
-#-----|  -> access to local variable i
-
-#   30| access to local variable i
-#-----|  -> 5
-
-#   30| ... % ...
-#-----|  -> 0
-
-#   30| ... == ...
-#-----| true -> ...;
-#-----| false -> ...;
-
-#   30| 5
-#-----|  -> ... % ...
-
-#   30| 0
-#-----|  -> ... == ...
-
-#   31| call to method WriteLine
-#-----|  -> access to local variable i
-
-#   31| ...;
-#-----|  -> "Buzz"
-
-#   31| "Buzz"
-#-----|  -> call to method WriteLine
-
-#   33| call to method WriteLine
-#-----|  -> access to local variable i
-
-#   33| ...;
-#-----|  -> access to local variable i
-
-#   33| access to local variable i
-#-----|  -> call to method WriteLine
-
-#   37| enter Switch
-#-----|  -> {...}
-
-#   37| exit Switch
-
-#   37| exit Switch (abnormal)
-#-----|  -> exit Switch
-
-#   37| exit Switch (normal)
-#-----|  -> exit Switch
-
-#   38| {...}
-#-----|  -> switch (...) {...}
-
-#   39| switch (...) {...}
-#-----|  -> access to parameter a
-
-#   39| access to parameter a
-#-----|  -> case ...:
-
-#   41| case ...:
-#-----|  -> 1
-
-#   41| 1
-#-----| match -> ...;
-#-----| no-match -> case ...:
-
-#   42| call to method WriteLine
-#-----|  -> 2
-
-#   42| ...;
-#-----|  -> "1"
-
-#   42| "1"
-#-----|  -> call to method WriteLine
-
-#   43| goto case ...;
-#-----| goto(2) -> case ...:
-
-#   43| 2
-#-----|  -> goto case ...;
-
-#   44| case ...:
-#-----|  -> 2
-
-#   44| 2
-#-----| match -> ...;
-#-----| no-match -> case ...:
-
-#   45| call to method WriteLine
-#-----|  -> 1
-
-#   45| ...;
-#-----|  -> "2"
-
-#   45| "2"
-#-----|  -> call to method WriteLine
-
-#   46| goto case ...;
-#-----| goto(1) -> case ...:
-
-#   46| 1
-#-----|  -> goto case ...;
-
-#   47| case ...:
-#-----|  -> 3
-
-#   47| 3
-#-----| match -> ...;
-#-----| no-match -> switch (...) {...}
-
-#   48| call to method WriteLine
-#-----|  -> break;
-
-#   48| ...;
-#-----|  -> "3"
-
-#   48| "3"
-#-----|  -> call to method WriteLine
-
-#   49| break;
-#-----| break -> switch (...) {...}
-
-#   51| switch (...) {...}
-#-----|  -> access to parameter a
-
-#   51| access to parameter a
-#-----|  -> case ...:
-
-#   53| case ...:
-#-----|  -> 42
-
-#   53| 42
-#-----| match -> ...;
-#-----| no-match -> default:
-
-#   54| call to method WriteLine
-#-----|  -> break;
-
-#   54| ...;
-#-----|  -> "The answer"
-
-#   54| "The answer"
-#-----|  -> call to method WriteLine
-
-#   55| break;
-#-----| break -> switch (...) {...}
-
-#   56| default:
-#-----|  -> ...;
-
-#   57| call to method WriteLine
-#-----|  -> break;
-
-#   57| ...;
-#-----|  -> "Not the answer"
-
-#   57| "Not the answer"
-#-----|  -> call to method WriteLine
-
-#   58| break;
-#-----| break -> switch (...) {...}
-
-#   60| switch (...) {...}
-#-----|  -> this access
-
-#   60| call to method Parse
-#-----|  -> case ...:
-
-#   60| access to field Field
-#-----|  -> call to method Parse
-
-#   60| this access
-#-----|  -> access to field Field
-
-#   62| case ...:
-#-----|  -> 0
-
-#   62| 0
-#-----| match -> if (...) ...
-#-----| no-match -> access to parameter a
-
-#   63| if (...) ...
-#-----|  -> this access
-
-#   63| [false] !...
-#-----| false -> break;
-
-#   63| [true] !...
-#-----| true -> object creation of type NullReferenceException
-
-#   63| access to field Field
-#-----|  -> ""
-
-#   63| this access
-#-----|  -> access to field Field
-
-#   63| ... == ...
-#-----| false -> [true] !...
-#-----| true -> [false] !...
-
-#   63| ""
-#-----|  -> ... == ...
-
-#   64| throw ...;
-#-----| exception(NullReferenceException) -> exit Switch (abnormal)
-
-#   64| object creation of type NullReferenceException
-#-----|  -> throw ...;
-
-#   65| break;
-#-----| break -> access to parameter a
-
-#   67| return ...;
-#-----| return -> exit Switch (normal)
-
-#   67| access to parameter a
-#-----|  -> return ...;
-
-#   70| enter M
-#-----|  -> {...}
-
-#   70| exit M
-
-#   70| exit M (normal)
-#-----|  -> exit M
-
-#   71| {...}
-#-----|  -> if (...) ...
-
-#   72| if (...) ...
-#-----|  -> access to parameter s
-
-#   72| access to parameter s
-#-----|  -> null
-
-#   72| ... == ...
-#-----| true -> return ...;
-#-----| false -> if (...) ...
-
-#   72| null
-#-----|  -> ... == ...
-
-#   73| return ...;
-#-----| return -> exit M (normal)
-
-#   74| if (...) ...
-#-----|  -> access to parameter s
-
-#   74| access to parameter s
-#-----|  -> access to property Length
-
-#   74| access to property Length
-#-----|  -> 0
-
-#   74| ... > ...
-#-----| true -> {...}
-#-----| false -> {...}
-
-#   74| 0
-#-----|  -> ... > ...
-
-#   75| {...}
-#-----|  -> ...;
-
-#   76| call to method WriteLine
-#-----|  -> exit M (normal)
-
-#   76| ...;
-#-----|  -> access to parameter s
-
-#   76| access to parameter s
-#-----|  -> call to method WriteLine
-
-#   79| {...}
-#-----|  -> ...;
-
-#   80| call to method WriteLine
-#-----|  -> exit M (normal)
-
-#   80| ...;
-#-----|  -> "<empty string>"
-
-#   80| "<empty string>"
-#-----|  -> call to method WriteLine
-
-#   84| enter M2
-#-----|  -> {...}
-
-#   84| exit M2
-
-#   84| exit M2 (normal)
-#-----|  -> exit M2
-
-#   85| {...}
-#-----|  -> if (...) ...
-
-#   86| if (...) ...
-#-----|  -> access to parameter s
-
-#   86| access to parameter s
-#-----|  -> null
-
-#   86| ... != ...
-#-----| false -> [false] ... && ...
-#-----| true -> access to parameter s
-
-#   86| [false] ... && ...
-#-----| false -> exit M2 (normal)
-
-#   86| [true] ... && ...
-#-----| true -> ...;
-
-#   86| null
-#-----|  -> ... != ...
-
-#   86| access to parameter s
-#-----|  -> access to property Length
-
-#   86| access to property Length
-#-----|  -> 0
-
-#   86| ... > ...
-#-----| false -> [false] ... && ...
-#-----| true -> [true] ... && ...
-
-#   86| 0
-#-----|  -> ... > ...
-
-#   87| call to method WriteLine
-#-----|  -> exit M2 (normal)
-
-#   87| ...;
-#-----|  -> access to parameter s
-
-#   87| access to parameter s
-#-----|  -> call to method WriteLine
-
-#   90| enter M3
-#-----|  -> {...}
-
-#   90| exit M3
-
-#   90| exit M3 (abnormal)
-#-----|  -> exit M3
-
-#   90| exit M3 (normal)
-#-----|  -> exit M3
-
-#   91| {...}
-#-----|  -> if (...) ...
-
-#   92| if (...) ...
-#-----|  -> access to parameter s
-
-#   92| call to method Equals
-#-----| true -> "s"
-#-----| false -> ...;
-
-#   92| access to parameter s
-#-----|  -> null
-
-#   92| null
-#-----|  -> call to method Equals
-
-#   93| throw ...;
-#-----| exception(ArgumentNullException) -> exit M3 (abnormal)
-
-#   93| object creation of type ArgumentNullException
-#-----|  -> throw ...;
-
-#   93| "s"
-#-----|  -> object creation of type ArgumentNullException
-
-#   94| call to method WriteLine
-#-----|  -> if (...) ...
-
-#   94| ...;
-#-----|  -> access to parameter s
-
-#   94| access to parameter s
-#-----|  -> call to method WriteLine
-
-#   96| if (...) ...
-#-----|  -> this access
-
-#   96| access to field Field
-#-----|  -> null
-
-#   96| this access
-#-----|  -> access to field Field
-
-#   96| ... != ...
-#-----| true -> ...;
-#-----| false -> if (...) ...
-
-#   96| null
-#-----|  -> ... != ...
-
-#   97| call to method WriteLine
-#-----|  -> if (...) ...
-
-#   97| ...;
-#-----|  -> object creation of type ControlFlow
-
-#   97| object creation of type ControlFlow
-#-----|  -> access to field Field
-
-#   97| access to field Field
-#-----|  -> call to method WriteLine
-
-#   99| if (...) ...
-#-----|  -> this access
-
-#   99| access to field Field
-#-----|  -> null
-
-#   99| this access
-#-----|  -> access to field Field
-
-#   99| ... != ...
-#-----| true -> ...;
-#-----| false -> if (...) ...
-
-#   99| null
-#-----|  -> ... != ...
-
-#  100| call to method WriteLine
-#-----|  -> if (...) ...
-
-#  100| ...;
-#-----|  -> this access
-
-#  100| this access
-#-----|  -> access to field Field
-
-#  100| access to field Field
-#-----|  -> call to method WriteLine
-
-#  102| if (...) ...
-#-----|  -> this access
-
-#  102| this access
-#-----|  -> access to property Prop
-
-#  102| access to property Prop
-#-----|  -> null
-
-#  102| ... != ...
-#-----| false -> exit M3 (normal)
-#-----| true -> ...;
-
-#  102| null
-#-----|  -> ... != ...
-
-#  103| call to method WriteLine
-#-----|  -> exit M3 (normal)
-
-#  103| ...;
-#-----|  -> this access
-
-#  103| access to property Prop
-#-----|  -> call to method WriteLine
-
-#  103| this access
-#-----|  -> access to property Prop
-
-#  106| enter M4
-#-----|  -> {...}
-
-#  106| exit M4
-
-#  106| exit M4 (normal)
-#-----|  -> exit M4
-
-#  107| {...}
-#-----|  -> if (...) ...
-
-#  108| if (...) ...
-#-----|  -> access to parameter s
-
-#  108| access to parameter s
-#-----|  -> null
-
-#  108| ... != ...
-#-----| true -> {...}
-#-----| false -> ...;
-
-#  108| null
-#-----|  -> ... != ...
-
-#  109| {...}
-#-----|  -> while (...) ...
-
-#  110| while (...) ...
-#-----|  -> true
-
-#  110| true
-#-----| true -> {...}
-
-#  111| {...}
-#-----|  -> ...;
-
-#  112| call to method WriteLine
-#-----|  -> true
-
-#  112| ...;
-#-----|  -> access to parameter s
-
-#  112| access to parameter s
-#-----|  -> call to method WriteLine
-
-#  116| call to method WriteLine
-#-----|  -> exit M4 (normal)
-
-#  116| ...;
-#-----|  -> access to parameter s
-
-#  116| access to parameter s
-#-----|  -> call to method WriteLine
-
-#  119| enter M5
-#-----|  -> {...}
-
-#  119| exit M5
-
-#  119| exit M5 (normal)
-#-----|  -> exit M5
-
-#  120| {...}
-#-----|  -> ... ...;
-
-#  121| ... ...;
-#-----|  -> access to parameter s
-
-#  121| String x = ...
-#-----|  -> ...;
-
-#  121| access to parameter s
-#-----|  -> String x = ...
-
-#  122| ... = ...
-#-----|  -> access to local variable x
-
-#  122| ...;
-#-----|  -> access to local variable x
-
-#  122| access to local variable x
-#-----|  -> " "
-
-#  122| ... + ...
-#-----|  -> ... = ...
-
-#  122| " "
-#-----|  -> ... + ...
-
-#  123| return ...;
-#-----| return -> exit M5 (normal)
-
-#  123| access to local variable x
-#-----|  -> return ...;
-
-#  127| enter get_Prop
-#-----|  -> {...}
-
-#  127| exit get_Prop
-
-#  127| exit get_Prop (normal)
-#-----|  -> exit get_Prop
-
-#  127| {...}
-#-----|  -> this access
-
-#  127| return ...;
-#-----| return -> exit get_Prop (normal)
-
-#  127| access to field Field
-#-----|  -> null
-
-#  127| this access
-#-----|  -> access to field Field
-
-#  127| ... == ...
-#-----| true -> ""
-#-----| false -> this access
-
-#  127| ... ? ... : ...
-#-----|  -> return ...;
-
-#  127| null
-#-----|  -> ... == ...
-
-#  127| ""
-#-----|  -> ... ? ... : ...
-
-#  127| access to field Field
-#-----|  -> ... ? ... : ...
-
-#  127| this access
-#-----|  -> access to field Field
-
-#  127| enter set_Prop
-#-----|  -> {...}
-
-#  127| exit set_Prop
-
-#  127| exit set_Prop (normal)
-#-----|  -> exit set_Prop
-
-#  127| {...}
-#-----|  -> ...;
-
-#  127| this access
-#-----|  -> access to parameter value
-
-#  127| ... = ...
-#-----|  -> exit set_Prop (normal)
-
-#  127| ...;
-#-----|  -> this access
-
-#  127| access to parameter value
-#-----|  -> ... = ...
-
-#  129| call to constructor Object
-#-----|  -> {...}
-
-#  129| enter ControlFlow
-#-----|  -> call to constructor Object
-
-#  129| exit ControlFlow
-
-#  129| exit ControlFlow (normal)
-#-----|  -> exit ControlFlow
-
-#  130| {...}
-#-----|  -> ...;
-
-#  131| this access
-#-----|  -> access to parameter s
-
-#  131| ... = ...
-#-----|  -> exit ControlFlow (normal)
-
-#  131| ...;
-#-----|  -> this access
-
-#  131| access to parameter s
-#-----|  -> ... = ...
-
-#  134| enter ControlFlow
-#-----|  -> access to parameter i
-
-#  134| exit ControlFlow
-
-#  134| exit ControlFlow (normal)
-#-----|  -> exit ControlFlow
-
-#  134| call to constructor ControlFlow
-#-----|  -> {...}
-
-#  134| (...) ...
-#-----|  -> ""
-
-#  134| access to parameter i
-#-----|  -> (...) ...
-
-#  134| ... + ...
-#-----|  -> call to constructor ControlFlow
-
-#  134| ""
-#-----|  -> ... + ...
-
-#  134| {...}
-#-----|  -> exit ControlFlow (normal)
-
-#  136| enter ControlFlow
-#-----|  -> 0
-
-#  136| exit ControlFlow
-
-#  136| exit ControlFlow (normal)
-#-----|  -> exit ControlFlow
-
-#  136| call to constructor ControlFlow
-#-----|  -> {...}
-
-#  136| 0
-#-----|  -> 1
-
-#  136| ... + ...
-#-----|  -> call to constructor ControlFlow
-
-#  136| 1
-#-----|  -> ... + ...
-
-#  136| {...}
-#-----|  -> exit ControlFlow (normal)
-
-#  138| enter +
-#-----|  -> {...}
-
-#  138| exit +
-
-#  138| exit + (normal)
-#-----|  -> exit +
-
-#  139| {...}
-#-----|  -> ...;
-
-#  140| call to method WriteLine
-#-----|  -> access to parameter y
-
-#  140| ...;
-#-----|  -> access to parameter x
-
-#  140| access to parameter x
-#-----|  -> call to method WriteLine
-
-#  141| return ...;
-#-----| return -> exit + (normal)
-
-#  141| access to parameter y
-#-----|  -> return ...;
-
-#  144| enter get_Item
-#-----|  -> {...}
-
-#  144| exit get_Item
-
-#  144| exit get_Item (normal)
-#-----|  -> exit get_Item
-
-#  144| {...}
-#-----|  -> access to parameter i
-
-#  144| return ...;
-#-----| return -> exit get_Item (normal)
-
-#  144| (...) ...
-#-----|  -> ""
-
-#  144| access to parameter i
-#-----|  -> (...) ...
-
-#  144| ... + ...
-#-----|  -> return ...;
-
-#  144| ""
-#-----|  -> ... + ...
-
-#  144| enter set_Item
-#-----|  -> {...}
-
-#  144| exit set_Item
-
-#  144| exit set_Item (normal)
-#-----|  -> exit set_Item
-
-#  144| {...}
-#-----|  -> exit set_Item (normal)
-
-#  146| enter For
-#-----|  -> {...}
-
-#  146| exit For
-
-#  146| exit For (normal)
-#-----|  -> exit For
-
-#  147| {...}
-#-----|  -> ... ...;
-
-#  148| ... ...;
-#-----|  -> 0
-
-#  148| Int32 x = ...
-#-----|  -> for (...;...;...) ...
-
-#  148| 0
-#-----|  -> Int32 x = ...
-
-#  149| for (...;...;...) ...
-#-----|  -> access to local variable x
-
-#  149| access to local variable x
-#-----|  -> 10
-
-#  149| ... < ...
-#-----| true -> ...;
-#-----| false -> for (...;...;...) ...
-
-#  149| 10
-#-----|  -> ... < ...
-
-#  149| ++...
-#-----|  -> access to local variable x
-
-#  149| access to local variable x
-#-----|  -> ++...
-
-#  150| call to method WriteLine
-#-----|  -> access to local variable x
-
-#  150| ...;
-#-----|  -> access to local variable x
-
-#  150| access to local variable x
-#-----|  -> call to method WriteLine
-
-#  152| for (...;...;...) ...
-#-----|  -> {...}
-
-#  152| access to local variable x
-#-----|  -> ...++
-
-#  152| ...++
-#-----|  -> {...}
-
-#  153| {...}
-#-----|  -> ...;
-
-#  154| call to method WriteLine
-#-----|  -> if (...) ...
-
-#  154| ...;
-#-----|  -> access to local variable x
-
-#  154| access to local variable x
-#-----|  -> call to method WriteLine
-
-#  155| if (...) ...
-#-----|  -> access to local variable x
-
-#  155| access to local variable x
-#-----|  -> 20
-
-#  155| ... > ...
-#-----| false -> access to local variable x
-#-----| true -> break;
-
-#  155| 20
-#-----|  -> ... > ...
-
-#  156| break;
-#-----| break -> for (...;...;...) ...
-
-#  159| for (...;...;...) ...
-#-----|  -> {...}
-
-#  160| {...}
-#-----|  -> ...;
-
-#  161| call to method WriteLine
-#-----|  -> ...;
-
-#  161| ...;
-#-----|  -> access to local variable x
-
-#  161| access to local variable x
-#-----|  -> call to method WriteLine
-
-#  162| access to local variable x
-#-----|  -> ...++
-
-#  162| ...++
-#-----|  -> if (...) ...
-
-#  162| ...;
-#-----|  -> access to local variable x
-
-#  163| if (...) ...
-#-----|  -> access to local variable x
-
-#  163| access to local variable x
-#-----|  -> 30
-
-#  163| ... > ...
-#-----| false -> {...}
-#-----| true -> break;
-
-#  163| 30
-#-----|  -> ... > ...
-
-#  164| break;
-#-----| break -> for (...;...;...) ...
-
-#  167| for (...;...;...) ...
-#-----|  -> access to local variable x
-
-#  167| access to local variable x
-#-----|  -> 40
-
-#  167| ... < ...
-#-----| true -> {...}
-#-----| false -> for (...;...;...) ...
-
-#  167| 40
-#-----|  -> ... < ...
-
-#  168| {...}
-#-----|  -> ...;
-
-#  169| call to method WriteLine
-#-----|  -> ...;
-
-#  169| ...;
-#-----|  -> access to local variable x
-
-#  169| access to local variable x
-#-----|  -> call to method WriteLine
-
-#  170| access to local variable x
-#-----|  -> ...++
-
-#  170| ...++
-#-----|  -> access to local variable x
-
-#  170| ...;
-#-----|  -> access to local variable x
-
-#  173| for (...;...;...) ...
-#-----|  -> 0
-
-#  173| Int32 i = ...
-#-----|  -> 0
-
-#  173| 0
-#-----|  -> Int32 i = ...
-
-#  173| Int32 j = ...
-#-----|  -> access to local variable i
-
-#  173| 0
-#-----|  -> Int32 j = ...
-
-#  173| access to local variable i
-#-----|  -> access to local variable j
-
-#  173| ... + ...
-#-----|  -> 10
-
-#  173| ... < ...
-#-----| false -> exit For (normal)
-#-----| true -> {...}
-
-#  173| access to local variable j
-#-----|  -> ... + ...
-
-#  173| 10
-#-----|  -> ... < ...
-
-#  173| access to local variable i
-#-----|  -> ...++
-
-#  173| ...++
-#-----|  -> access to local variable j
-
-#  173| access to local variable j
-#-----|  -> ...++
-
-#  173| ...++
-#-----|  -> access to local variable i
-
-#  174| {...}
-#-----|  -> ...;
-
-#  175| call to method WriteLine
-#-----|  -> access to local variable i
-
-#  175| ...;
-#-----|  -> access to local variable i
-
-#  175| access to local variable i
-#-----|  -> access to local variable j
-
-#  175| ... + ...
-#-----|  -> call to method WriteLine
-
-#  175| access to local variable j
-#-----|  -> ... + ...
-
-#  179| enter Lambdas
-#-----|  -> {...}
-
-#  179| exit Lambdas
-
-#  179| exit Lambdas (normal)
-#-----|  -> exit Lambdas
-
-#  180| {...}
-#-----|  -> ... ...;
-
-#  181| ... ...;
-#-----|  -> (...) => ...
-
-#  181| Func<Int32,Int32> y = ...
-#-----|  -> ... ...;
-
-#  181| (...) => ...
-#-----|  -> Func<Int32,Int32> y = ...
-
-#  181| enter (...) => ...
-#-----|  -> access to parameter x
-
-#  181| exit (...) => ...
-
-#  181| exit (...) => ... (normal)
-#-----|  -> exit (...) => ...
-
-#  181| access to parameter x
-#-----|  -> 1
-
-#  181| ... + ...
-#-----|  -> exit (...) => ... (normal)
-
-#  181| 1
-#-----|  -> ... + ...
-
-#  182| ... ...;
-#-----|  -> delegate(...) { ... }
-
-#  182| Func<Int32,Int32> z = ...
-#-----|  -> exit Lambdas (normal)
-
-#  182| delegate(...) { ... }
-#-----|  -> Func<Int32,Int32> z = ...
-
-#  182| enter delegate(...) { ... }
-#-----|  -> {...}
-
-#  182| exit delegate(...) { ... }
-
-#  182| exit delegate(...) { ... } (normal)
-#-----|  -> exit delegate(...) { ... }
-
-#  182| {...}
-#-----|  -> access to parameter x
-
-#  182| return ...;
-#-----| return -> exit delegate(...) { ... } (normal)
-
-#  182| access to parameter x
-#-----|  -> 1
-
-#  182| ... + ...
-#-----|  -> return ...;
-
-#  182| 1
-#-----|  -> ... + ...
-
-#  185| enter LogicalOr
-#-----|  -> {...}
-
-#  185| exit LogicalOr
-
-#  185| exit LogicalOr (normal)
-#-----|  -> exit LogicalOr
-
-#  186| {...}
-#-----|  -> if (...) ...
-
-#  187| if (...) ...
-#-----|  -> 1
-
-#  187| 1
-#-----|  -> 2
-
-#  187| ... == ...
-#-----| false -> 2
-
-#  187| [false] ... || ...
-#-----| false -> 1
-
-#  187| [false] ... || ...
-#-----| false -> ...;
-
-#  187| 2
-#-----|  -> ... == ...
-
-#  187| 2
-#-----|  -> 3
-
-#  187| ... == ...
-#-----| false -> [false] ... || ...
-
-#  187| 3
-#-----|  -> ... == ...
-
-#  187| 1
-#-----|  -> 3
-
-#  187| ... == ...
-#-----| false -> [false] ... && ...
-
-#  187| [false] ... && ...
-#-----| false -> [false] ... || ...
-
-#  187| 3
-#-----|  -> ... == ...
-
-#  190| call to method WriteLine
-#-----|  -> exit LogicalOr (normal)
-
-#  190| ...;
-#-----|  -> "This should happen"
-
-#  190| "This should happen"
-#-----|  -> call to method WriteLine
-
-#  193| enter Booleans
-#-----|  -> {...}
-
-#  193| exit Booleans
-
-#  193| exit Booleans (abnormal)
-#-----|  -> exit Booleans
-
-#  193| exit Booleans (normal)
-#-----|  -> exit Booleans
-
-#  194| {...}
-#-----|  -> ... ...;
-
-#  195| ... ...;
-#-----|  -> this access
-
-#  195| Boolean b = ...
-#-----|  -> if (...) ...
-
-#  195| access to field Field
-#-----|  -> access to property Length
-
-#  195| this access
-#-----|  -> access to field Field
-
-#  195| access to property Length
-#-----|  -> 0
-
-#  195| ... > ...
-#-----| false -> ... && ...
-#-----| true -> this access
-
-#  195| ... && ...
-#-----|  -> Boolean b = ...
-
-#  195| 0
-#-----|  -> ... > ...
-
-#  195| !...
-#-----|  -> ... && ...
-
-#  195| access to field Field
-#-----|  -> access to property Length
-
-#  195| this access
-#-----|  -> access to field Field
-
-#  195| access to property Length
-#-----|  -> 1
-
-#  195| ... == ...
-#-----|  -> !...
-
-#  195| 1
-#-----|  -> ... == ...
-
-#  197| if (...) ...
-#-----|  -> this access
-
-#  197| [false] !...
-#-----| false -> if (...) ...
-
-#  197| [true] !...
-#-----| true -> ...;
-
-#  197| access to field Field
-#-----|  -> access to property Length
-
-#  197| this access
-#-----|  -> access to field Field
-
-#  197| access to property Length
-#-----|  -> 0
-
-#  197| ... == ...
-#-----| true -> false
-#-----| false -> true
-
-#  197| [false] ... ? ... : ...
-#-----| false -> [true] !...
-
-#  197| [true] ... ? ... : ...
-#-----| true -> [false] !...
-
-#  197| 0
-#-----|  -> ... == ...
-
-#  197| false
-#-----| false -> [false] ... ? ... : ...
-
-#  197| true
-#-----| true -> [true] ... ? ... : ...
-
-#  198| ... = ...
-#-----|  -> if (...) ...
-
-#  198| ...;
-#-----|  -> this access
-
-#  198| access to field Field
-#-----|  -> access to property Length
-
-#  198| this access
-#-----|  -> access to field Field
-
-#  198| access to property Length
-#-----|  -> 0
-
-#  198| ... == ...
-#-----| true -> false
-#-----| false -> true
-
-#  198| ... ? ... : ...
-#-----|  -> ... = ...
-
-#  198| 0
-#-----|  -> ... == ...
-
-#  198| false
-#-----|  -> ... ? ... : ...
-
-#  198| true
-#-----|  -> ... ? ... : ...
-
-#  200| if (...) ...
-#-----|  -> this access
-
-#  200| [false] !...
-#-----| false -> this access
-
-#  200| [true] !...
-#-----| true -> [true] ... || ...
-
-#  200| [false] ... || ...
-#-----| false -> exit Booleans (normal)
-
-#  200| [true] ... || ...
-#-----| true -> {...}
-
-#  200| access to field Field
-#-----|  -> access to property Length
-
-#  200| this access
-#-----|  -> access to field Field
-
-#  200| access to property Length
-#-----|  -> 0
-
-#  200| ... == ...
-#-----| false -> [true] !...
-#-----| true -> [false] !...
-
-#  200| 0
-#-----|  -> ... == ...
-
-#  200| [false] !...
-#-----| false -> [false] ... || ...
-
-#  200| [true] !...
-#-----| true -> [true] ... || ...
-
-#  200| [false] !...
-#-----| false -> [true] !...
-
-#  200| [true] !...
-#-----| true -> [false] !...
-
-#  200| access to field Field
-#-----|  -> access to property Length
-
-#  200| this access
-#-----|  -> access to field Field
-
-#  200| access to property Length
-#-----|  -> 1
-
-#  200| ... == ...
-#-----| false -> [false] ... && ...
-#-----| true -> access to local variable b
-
-#  200| [false] ... && ...
-#-----| false -> [true] !...
-
-#  200| [true] ... && ...
-#-----| true -> [false] !...
-
-#  200| 1
-#-----|  -> ... == ...
-
-#  200| access to local variable b
-#-----| false -> [false] ... && ...
-#-----| true -> [true] ... && ...
-
-#  201| {...}
-#-----|  -> {...}
-
-#  202| {...}
-#-----|  -> object creation of type Exception
-
-#  203| throw ...;
-#-----| exception(Exception) -> exit Booleans (abnormal)
-
-#  203| object creation of type Exception
-#-----|  -> throw ...;
-
-#  208| enter Do
-#-----|  -> {...}
-
-#  208| exit Do
-
-#  208| exit Do (normal)
-#-----|  -> exit Do
-
-#  209| {...}
-#-----|  -> do ... while (...);
-
-#  210| do ... while (...);
-#-----|  -> {...}
-
-#  211| {...}
-#-----|  -> ...;
-
-#  212| access to field Field
-#-----|  -> "a"
-
-#  212| this access
-#-----|  -> this access
-
-#  212| this access
-#-----|  -> access to field Field
-
-#  212| ... + ...
-#-----|  -> ... = ...
-
-#  212| ... = ...
-#-----|  -> if (...) ...
-
-#  212| ...;
-#-----|  -> this access
-
-#  212| "a"
-#-----|  -> ... + ...
-
-#  213| if (...) ...
-#-----|  -> this access
-
-#  213| access to field Field
-#-----|  -> access to property Length
-
-#  213| this access
-#-----|  -> access to field Field
-
-#  213| access to property Length
-#-----|  -> 0
-
-#  213| ... > ...
-#-----| true -> {...}
-#-----| false -> if (...) ...
-
-#  213| 0
-#-----|  -> ... > ...
-
-#  214| {...}
-#-----|  -> continue;
-
-#  215| continue;
-#-----| continue -> this access
-
-#  217| if (...) ...
-#-----|  -> this access
-
-#  217| access to field Field
-#-----|  -> access to property Length
-
-#  217| this access
-#-----|  -> access to field Field
-
-#  217| access to property Length
-#-----|  -> 0
-
-#  217| ... < ...
-#-----| true -> {...}
-#-----| false -> this access
-
-#  217| 0
-#-----|  -> ... < ...
-
-#  218| {...}
-#-----|  -> break;
-
-#  219| break;
-#-----| break -> exit Do (normal)
-
-#  221| access to field Field
-#-----|  -> access to property Length
-
-#  221| this access
-#-----|  -> access to field Field
-
-#  221| access to property Length
-#-----|  -> 10
-
-#  221| ... < ...
-#-----| false -> exit Do (normal)
-#-----| true -> {...}
-
-#  221| 10
-#-----|  -> ... < ...
-
-#  224| enter Foreach
-#-----|  -> {...}
-
-#  224| exit Foreach
-
-#  224| exit Foreach (normal)
-#-----|  -> exit Foreach
-
-#  225| {...}
-#-----|  -> "a"
-
-#  226| foreach (... ... in ...) ...
-#-----| empty -> exit Foreach (normal)
-#-----| non-empty -> String x
-
-#  226| String x
-#-----|  -> {...}
-
-#  226| call to method Repeat<String>
-#-----|  -> foreach (... ... in ...) ...
-
-#  226| "a"
-#-----|  -> 10
-
-#  226| 10
-#-----|  -> call to method Repeat<String>
-
-#  227| {...}
-#-----|  -> ...;
-
-#  228| access to field Field
-#-----|  -> access to local variable x
-
-#  228| this access
-#-----|  -> this access
-
-#  228| this access
-#-----|  -> access to field Field
-
-#  228| ... + ...
-#-----|  -> ... = ...
-
-#  228| ... = ...
-#-----|  -> if (...) ...
-
-#  228| ...;
-#-----|  -> this access
-
-#  228| access to local variable x
-#-----|  -> ... + ...
-
-#  229| if (...) ...
-#-----|  -> this access
-
-#  229| access to field Field
-#-----|  -> access to property Length
-
-#  229| this access
-#-----|  -> access to field Field
-
-#  229| access to property Length
-#-----|  -> 0
-
-#  229| ... > ...
-#-----| true -> {...}
-#-----| false -> if (...) ...
-
-#  229| 0
-#-----|  -> ... > ...
-
-#  230| {...}
-#-----|  -> continue;
-
-#  231| continue;
-#-----| continue -> foreach (... ... in ...) ...
-
-#  233| if (...) ...
-#-----|  -> this access
-
-#  233| access to field Field
-#-----|  -> access to property Length
-
-#  233| this access
-#-----|  -> access to field Field
-
-#  233| access to property Length
-#-----|  -> 0
-
-#  233| ... < ...
-#-----| false -> foreach (... ... in ...) ...
-#-----| true -> {...}
-
-#  233| 0
-#-----|  -> ... < ...
-
-#  234| {...}
-#-----|  -> break;
-
-#  235| break;
-#-----| break -> exit Foreach (normal)
-
-#  240| enter Goto
-#-----|  -> {...}
-
-#  240| exit Goto
-
-#  240| exit Goto (normal)
-#-----|  -> exit Goto
-
-#  241| {...}
-#-----|  -> Label:
-
-#  242| Label:
-#-----|  -> if (...) ...
-
-#  242| if (...) ...
-#-----|  -> this access
-
-#  242| [false] !...
-#-----| false -> if (...) ...
-
-#  242| [true] !...
-#-----| true -> {...}
-
-#  242| [false] !...
-#-----| false -> [true] !...
-
-#  242| [true] !...
-#-----| true -> [false] !...
-
-#  242| access to field Field
-#-----|  -> access to property Length
-
-#  242| this access
-#-----|  -> access to field Field
-
-#  242| access to property Length
-#-----|  -> 0
-
-#  242| ... == ...
-#-----| false -> [true] !...
-#-----| true -> [false] !...
-
-#  242| 0
-#-----|  -> ... == ...
-
-#  242| {...}
-#-----|  -> if (...) ...
-
-#  244| if (...) ...
-#-----|  -> this access
-
-#  244| access to field Field
-#-----|  -> access to property Length
-
-#  244| this access
-#-----|  -> access to field Field
-
-#  244| access to property Length
-#-----|  -> 0
-
-#  244| ... > ...
-#-----| true -> goto ...;
-#-----| false -> switch (...) {...}
-
-#  244| 0
-#-----|  -> ... > ...
-
-#  244| goto ...;
-#-----| goto(Label) -> Label:
-
-#  246| switch (...) {...}
-#-----|  -> this access
-
-#  246| access to field Field
-#-----|  -> access to property Length
-
-#  246| this access
-#-----|  -> access to field Field
-
-#  246| access to property Length
-#-----|  -> 3
-
-#  246| ... + ...
-#-----|  -> case ...:
-
-#  246| 3
-#-----|  -> ... + ...
-
-#  248| case ...:
-#-----|  -> 0
-
-#  248| 0
-#-----| match -> goto default;
-#-----| no-match -> case ...:
-
-#  249| goto default;
-#-----| goto(default) -> default:
-
-#  250| case ...:
-#-----|  -> 1
-
-#  250| 1
-#-----| match -> ...;
-#-----| no-match -> case ...:
-
-#  251| call to method WriteLine
-#-----|  -> break;
-
-#  251| ...;
-#-----|  -> 1
-
-#  251| 1
-#-----|  -> call to method WriteLine
-
-#  252| break;
-#-----| break -> exit Goto (normal)
-
-#  253| case ...:
-#-----|  -> 2
-
-#  253| 2
-#-----| match -> goto ...;
-#-----| no-match -> default:
-
-#  254| goto ...;
-#-----| goto(Label) -> Label:
-
-#  255| default:
-#-----|  -> ...;
-
-#  256| call to method WriteLine
-#-----|  -> break;
-
-#  256| ...;
-#-----|  -> 0
-
-#  256| 0
-#-----|  -> call to method WriteLine
-
-#  257| break;
-#-----| break -> exit Goto (normal)
-
-#  261| enter Yield
-#-----|  -> {...}
-
-#  261| exit Yield
-
-#  261| exit Yield (normal)
-#-----|  -> exit Yield
-
-#  262| {...}
-#-----|  -> 0
-
-#  263| yield return ...;
-#-----|  -> for (...;...;...) ...
-
-#  263| 0
-#-----|  -> yield return ...;
-
-#  264| for (...;...;...) ...
-#-----|  -> 1
-
-#  264| Int32 i = ...
-#-----|  -> access to local variable i
-
-#  264| 1
-#-----|  -> Int32 i = ...
-
-#  264| access to local variable i
-#-----|  -> 10
-
-#  264| ... < ...
-#-----| true -> {...}
-#-----| false -> try {...} ...
-
-#  264| 10
-#-----|  -> ... < ...
-
-#  264| access to local variable i
-#-----|  -> ...++
-
-#  264| ...++
-#-----|  -> access to local variable i
-
-#  265| {...}
-#-----|  -> access to local variable i
-
-#  266| yield return ...;
-#-----|  -> access to local variable i
-
-#  266| access to local variable i
-#-----|  -> yield return ...;
-
-#  268| try {...} ...
-#-----|  -> {...}
-
-#  269| {...}
-#-----|  -> yield break;
-
-#  270| yield break;
-#-----| return -> [finally: return] {...}
-
-#  274| [finally: return] {...}
-#-----|  -> [finally: return] ...;
-
-#  275| [finally: return] call to method WriteLine
-#-----| return -> exit Yield (normal)
-
-#  275| [finally: return] ...;
-#-----|  -> [finally: return] "not dead"
-
-#  275| [finally: return] "not dead"
-#-----|  -> [finally: return] call to method WriteLine
-
-#  282| enter ControlFlowSub
-#-----|  -> call to constructor ControlFlow
-
-#  282| exit ControlFlowSub
-
-#  282| exit ControlFlowSub (normal)
-#-----|  -> exit ControlFlowSub
-
-#  282| call to constructor ControlFlow
-#-----|  -> {...}
-
-#  282| {...}
-#-----|  -> exit ControlFlowSub (normal)
-
-#  284| enter ControlFlowSub
-#-----|  -> call to constructor ControlFlowSub
-
-#  284| exit ControlFlowSub
-
-#  284| exit ControlFlowSub (normal)
-#-----|  -> exit ControlFlowSub
-
-#  284| call to constructor ControlFlowSub
-#-----|  -> {...}
-
-#  284| {...}
-#-----|  -> exit ControlFlowSub (normal)
-
-#  286| enter ControlFlowSub
-#-----|  -> access to parameter i
-
-#  286| exit ControlFlowSub
-
-#  286| exit ControlFlowSub (normal)
-#-----|  -> exit ControlFlowSub
-
-#  286| call to constructor ControlFlowSub
-#-----|  -> {...}
-
-#  286| access to parameter i
-#-----|  -> call to method ToString
-
-#  286| call to method ToString
-#-----|  -> call to constructor ControlFlowSub
-
-#  286| {...}
-#-----|  -> exit ControlFlowSub (normal)
-
-#  289| call to constructor Object
-#-----|  -> {...}
-
-#  289| enter DelegateCall
-#-----|  -> call to constructor Object
-
-#  289| exit DelegateCall
-
-#  289| exit DelegateCall (normal)
-#-----|  -> exit DelegateCall
-
-#  289| {...}
-#-----|  -> exit DelegateCall (normal)
-
-#  291| enter M
-#-----|  -> access to parameter f
-
-#  291| exit M
-
-#  291| exit M (normal)
-#-----|  -> exit M
-
-#  291| access to parameter f
-#-----|  -> 0
-
-#  291| delegate call
-#-----|  -> exit M (normal)
-
-#  291| 0
-#-----|  -> delegate call
-
-#  296| call to constructor Object
-#-----|  -> {...}
-
-#  296| enter NegationInConstructor
-#-----|  -> call to constructor Object
-
-#  296| exit NegationInConstructor
-
-#  296| exit NegationInConstructor (normal)
-#-----|  -> exit NegationInConstructor
-
-#  296| {...}
-#-----|  -> exit NegationInConstructor (normal)
-
-#  298| enter M
-#-----|  -> {...}
-
-#  298| exit M
-
-#  298| exit M (normal)
-#-----|  -> exit M
-
-#  299| {...}
-#-----|  -> ...;
-
-#  300| object creation of type NegationInConstructor
-#-----|  -> exit M (normal)
-
-#  300| ...;
-#-----|  -> 0
-
-#  300| 0
-#-----|  -> access to parameter i
-
-#  300| [false] !...
-#-----| false -> ... && ...
-
-#  300| [true] !...
-#-----| true -> access to parameter s
-
-#  300| ... && ...
-#-----|  -> ""
-
-#  300| access to parameter i
-#-----|  -> 0
-
-#  300| ... > ...
-#-----| false -> [true] !...
-#-----| true -> [false] !...
-
-#  300| 0
-#-----|  -> ... > ...
-
-#  300| access to parameter s
-#-----|  -> null
-
-#  300| ... != ...
-#-----|  -> ... && ...
-
-#  300| null
-#-----|  -> ... != ...
-
-#  300| ""
-#-----|  -> object creation of type NegationInConstructor
-
-#  304| call to constructor Object
-#-----|  -> {...}
-
-#  304| enter LambdaGetter
-#-----|  -> call to constructor Object
-
-#  304| exit LambdaGetter
-
-#  304| exit LambdaGetter (normal)
-#-----|  -> exit LambdaGetter
-
-#  304| {...}
-#-----|  -> exit LambdaGetter (normal)
-
-#  306| (...) => ...
-#-----|  -> exit get__getter (normal)
-
-#  306| enter (...) => ...
-#-----|  -> {...}
-
-#  306| enter get__getter
-#-----|  -> (...) => ...
-
-#  306| exit (...) => ...
-
-#  306| exit (...) => ... (normal)
-#-----|  -> exit (...) => ...
-
-#  306| exit get__getter
-
-#  306| exit get__getter (normal)
-#-----|  -> exit get__getter
-
-#  307| {...}
-#-----|  -> ... ...;
-
-#  308| ... ...;
-#-----|  -> access to parameter o
-
-#  308| Object x = ...
-#-----|  -> access to local variable x
-
-#  308| access to parameter o
-#-----|  -> Object x = ...
-
-#  309| return ...;
-#-----| return -> exit (...) => ... (normal)
-
-#  309| access to local variable x
-#-----|  -> return ...;
+| AccessorCalls.cs:1:7:1:19 | call to constructor Object | AccessorCalls.cs:1:7:1:19 | {...} |  |
+| AccessorCalls.cs:1:7:1:19 | enter AccessorCalls | AccessorCalls.cs:1:7:1:19 | call to constructor Object |  |
+| AccessorCalls.cs:1:7:1:19 | exit AccessorCalls (normal) | AccessorCalls.cs:1:7:1:19 | exit AccessorCalls |  |
+| AccessorCalls.cs:1:7:1:19 | {...} | AccessorCalls.cs:1:7:1:19 | exit AccessorCalls (normal) |  |
+| AccessorCalls.cs:5:23:5:25 | enter get_Item | AccessorCalls.cs:5:30:5:30 | access to parameter i |  |
+| AccessorCalls.cs:5:23:5:25 | exit get_Item (normal) | AccessorCalls.cs:5:23:5:25 | exit get_Item |  |
+| AccessorCalls.cs:5:30:5:30 | access to parameter i | AccessorCalls.cs:5:23:5:25 | exit get_Item (normal) |  |
+| AccessorCalls.cs:5:33:5:35 | enter set_Item | AccessorCalls.cs:5:37:5:39 | {...} |  |
+| AccessorCalls.cs:5:33:5:35 | exit set_Item (normal) | AccessorCalls.cs:5:33:5:35 | exit set_Item |  |
+| AccessorCalls.cs:5:37:5:39 | {...} | AccessorCalls.cs:5:33:5:35 | exit set_Item (normal) |  |
+| AccessorCalls.cs:7:32:7:34 | enter add_Event | AccessorCalls.cs:7:36:7:38 | {...} |  |
+| AccessorCalls.cs:7:32:7:34 | exit add_Event (normal) | AccessorCalls.cs:7:32:7:34 | exit add_Event |  |
+| AccessorCalls.cs:7:36:7:38 | {...} | AccessorCalls.cs:7:32:7:34 | exit add_Event (normal) |  |
+| AccessorCalls.cs:7:40:7:45 | enter remove_Event | AccessorCalls.cs:7:47:7:49 | {...} |  |
+| AccessorCalls.cs:7:40:7:45 | exit remove_Event (normal) | AccessorCalls.cs:7:40:7:45 | exit remove_Event |  |
+| AccessorCalls.cs:7:47:7:49 | {...} | AccessorCalls.cs:7:40:7:45 | exit remove_Event (normal) |  |
+| AccessorCalls.cs:10:10:10:11 | enter M1 | AccessorCalls.cs:11:5:17:5 | {...} |  |
+| AccessorCalls.cs:10:10:10:11 | exit M1 (normal) | AccessorCalls.cs:10:10:10:11 | exit M1 |  |
+| AccessorCalls.cs:11:5:17:5 | {...} | AccessorCalls.cs:12:9:12:32 | ...; |  |
+| AccessorCalls.cs:12:9:12:12 | this access | AccessorCalls.cs:12:22:12:25 | this access |  |
+| AccessorCalls.cs:12:9:12:31 | ... = ... | AccessorCalls.cs:13:9:13:30 | ...; |  |
+| AccessorCalls.cs:12:9:12:32 | ...; | AccessorCalls.cs:12:9:12:12 | this access |  |
+| AccessorCalls.cs:12:22:12:25 | this access | AccessorCalls.cs:12:22:12:31 | access to field Field |  |
+| AccessorCalls.cs:12:22:12:31 | access to field Field | AccessorCalls.cs:12:9:12:31 | ... = ... |  |
+| AccessorCalls.cs:13:9:13:12 | this access | AccessorCalls.cs:13:21:13:24 | this access |  |
+| AccessorCalls.cs:13:9:13:17 | access to property Prop | AccessorCalls.cs:13:9:13:29 | ... = ... |  |
+| AccessorCalls.cs:13:9:13:29 | ... = ... | AccessorCalls.cs:14:9:14:26 | ...; |  |
+| AccessorCalls.cs:13:9:13:30 | ...; | AccessorCalls.cs:13:9:13:12 | this access |  |
+| AccessorCalls.cs:13:21:13:24 | this access | AccessorCalls.cs:13:21:13:29 | access to property Prop |  |
+| AccessorCalls.cs:13:21:13:29 | access to property Prop | AccessorCalls.cs:13:9:13:17 | access to property Prop |  |
+| AccessorCalls.cs:14:9:14:12 | this access | AccessorCalls.cs:14:14:14:14 | 0 |  |
+| AccessorCalls.cs:14:9:14:15 | access to indexer | AccessorCalls.cs:14:9:14:25 | ... = ... |  |
+| AccessorCalls.cs:14:9:14:25 | ... = ... | AccessorCalls.cs:15:9:15:24 | ...; |  |
+| AccessorCalls.cs:14:9:14:26 | ...; | AccessorCalls.cs:14:9:14:12 | this access |  |
+| AccessorCalls.cs:14:14:14:14 | 0 | AccessorCalls.cs:14:19:14:22 | this access |  |
+| AccessorCalls.cs:14:19:14:22 | this access | AccessorCalls.cs:14:24:14:24 | 1 |  |
+| AccessorCalls.cs:14:19:14:25 | access to indexer | AccessorCalls.cs:14:9:14:15 | access to indexer |  |
+| AccessorCalls.cs:14:24:14:24 | 1 | AccessorCalls.cs:14:19:14:25 | access to indexer |  |
+| AccessorCalls.cs:15:9:15:12 | this access | AccessorCalls.cs:15:23:15:23 | access to parameter e |  |
+| AccessorCalls.cs:15:9:15:18 | access to event Event | AccessorCalls.cs:15:9:15:23 | ... += ... |  |
+| AccessorCalls.cs:15:9:15:23 | ... += ... | AccessorCalls.cs:16:9:16:24 | ...; |  |
+| AccessorCalls.cs:15:9:15:24 | ...; | AccessorCalls.cs:15:9:15:12 | this access |  |
+| AccessorCalls.cs:15:23:15:23 | access to parameter e | AccessorCalls.cs:15:9:15:18 | access to event Event |  |
+| AccessorCalls.cs:16:9:16:12 | this access | AccessorCalls.cs:16:23:16:23 | access to parameter e |  |
+| AccessorCalls.cs:16:9:16:18 | access to event Event | AccessorCalls.cs:16:9:16:23 | ... -= ... |  |
+| AccessorCalls.cs:16:9:16:23 | ... -= ... | AccessorCalls.cs:10:10:10:11 | exit M1 (normal) |  |
+| AccessorCalls.cs:16:9:16:24 | ...; | AccessorCalls.cs:16:9:16:12 | this access |  |
+| AccessorCalls.cs:16:23:16:23 | access to parameter e | AccessorCalls.cs:16:9:16:18 | access to event Event |  |
+| AccessorCalls.cs:19:10:19:11 | enter M2 | AccessorCalls.cs:20:5:26:5 | {...} |  |
+| AccessorCalls.cs:19:10:19:11 | exit M2 (normal) | AccessorCalls.cs:19:10:19:11 | exit M2 |  |
+| AccessorCalls.cs:20:5:26:5 | {...} | AccessorCalls.cs:21:9:21:36 | ...; |  |
+| AccessorCalls.cs:21:9:21:12 | this access | AccessorCalls.cs:21:9:21:14 | access to field x |  |
+| AccessorCalls.cs:21:9:21:14 | access to field x | AccessorCalls.cs:21:24:21:27 | this access |  |
+| AccessorCalls.cs:21:9:21:35 | ... = ... | AccessorCalls.cs:22:9:22:34 | ...; |  |
+| AccessorCalls.cs:21:9:21:36 | ...; | AccessorCalls.cs:21:9:21:12 | this access |  |
+| AccessorCalls.cs:21:24:21:27 | this access | AccessorCalls.cs:21:24:21:29 | access to field x |  |
+| AccessorCalls.cs:21:24:21:29 | access to field x | AccessorCalls.cs:21:24:21:35 | access to field Field |  |
+| AccessorCalls.cs:21:24:21:35 | access to field Field | AccessorCalls.cs:21:9:21:35 | ... = ... |  |
+| AccessorCalls.cs:22:9:22:12 | this access | AccessorCalls.cs:22:9:22:14 | access to field x |  |
+| AccessorCalls.cs:22:9:22:14 | access to field x | AccessorCalls.cs:22:23:22:26 | this access |  |
+| AccessorCalls.cs:22:9:22:19 | access to property Prop | AccessorCalls.cs:22:9:22:33 | ... = ... |  |
+| AccessorCalls.cs:22:9:22:33 | ... = ... | AccessorCalls.cs:23:9:23:30 | ...; |  |
+| AccessorCalls.cs:22:9:22:34 | ...; | AccessorCalls.cs:22:9:22:12 | this access |  |
+| AccessorCalls.cs:22:23:22:26 | this access | AccessorCalls.cs:22:23:22:28 | access to field x |  |
+| AccessorCalls.cs:22:23:22:28 | access to field x | AccessorCalls.cs:22:23:22:33 | access to property Prop |  |
+| AccessorCalls.cs:22:23:22:33 | access to property Prop | AccessorCalls.cs:22:9:22:19 | access to property Prop |  |
+| AccessorCalls.cs:23:9:23:12 | this access | AccessorCalls.cs:23:9:23:14 | access to field x |  |
+| AccessorCalls.cs:23:9:23:14 | access to field x | AccessorCalls.cs:23:16:23:16 | 0 |  |
+| AccessorCalls.cs:23:9:23:17 | access to indexer | AccessorCalls.cs:23:9:23:29 | ... = ... |  |
+| AccessorCalls.cs:23:9:23:29 | ... = ... | AccessorCalls.cs:24:9:24:26 | ...; |  |
+| AccessorCalls.cs:23:9:23:30 | ...; | AccessorCalls.cs:23:9:23:12 | this access |  |
+| AccessorCalls.cs:23:16:23:16 | 0 | AccessorCalls.cs:23:21:23:24 | this access |  |
+| AccessorCalls.cs:23:21:23:24 | this access | AccessorCalls.cs:23:21:23:26 | access to field x |  |
+| AccessorCalls.cs:23:21:23:26 | access to field x | AccessorCalls.cs:23:28:23:28 | 1 |  |
+| AccessorCalls.cs:23:21:23:29 | access to indexer | AccessorCalls.cs:23:9:23:17 | access to indexer |  |
+| AccessorCalls.cs:23:28:23:28 | 1 | AccessorCalls.cs:23:21:23:29 | access to indexer |  |
+| AccessorCalls.cs:24:9:24:12 | this access | AccessorCalls.cs:24:9:24:14 | access to field x |  |
+| AccessorCalls.cs:24:9:24:14 | access to field x | AccessorCalls.cs:24:25:24:25 | access to parameter e |  |
+| AccessorCalls.cs:24:9:24:20 | access to event Event | AccessorCalls.cs:24:9:24:25 | ... += ... |  |
+| AccessorCalls.cs:24:9:24:25 | ... += ... | AccessorCalls.cs:25:9:25:26 | ...; |  |
+| AccessorCalls.cs:24:9:24:26 | ...; | AccessorCalls.cs:24:9:24:12 | this access |  |
+| AccessorCalls.cs:24:25:24:25 | access to parameter e | AccessorCalls.cs:24:9:24:20 | access to event Event |  |
+| AccessorCalls.cs:25:9:25:12 | this access | AccessorCalls.cs:25:9:25:14 | access to field x |  |
+| AccessorCalls.cs:25:9:25:14 | access to field x | AccessorCalls.cs:25:25:25:25 | access to parameter e |  |
+| AccessorCalls.cs:25:9:25:20 | access to event Event | AccessorCalls.cs:25:9:25:25 | ... -= ... |  |
+| AccessorCalls.cs:25:9:25:25 | ... -= ... | AccessorCalls.cs:19:10:19:11 | exit M2 (normal) |  |
+| AccessorCalls.cs:25:9:25:26 | ...; | AccessorCalls.cs:25:9:25:12 | this access |  |
+| AccessorCalls.cs:25:25:25:25 | access to parameter e | AccessorCalls.cs:25:9:25:20 | access to event Event |  |
+| AccessorCalls.cs:28:10:28:11 | enter M3 | AccessorCalls.cs:29:5:33:5 | {...} |  |
+| AccessorCalls.cs:28:10:28:11 | exit M3 (normal) | AccessorCalls.cs:28:10:28:11 | exit M3 |  |
+| AccessorCalls.cs:29:5:33:5 | {...} | AccessorCalls.cs:30:9:30:21 | ...; |  |
+| AccessorCalls.cs:30:9:30:12 | this access | AccessorCalls.cs:30:9:30:18 | access to field Field |  |
+| AccessorCalls.cs:30:9:30:18 | access to field Field | AccessorCalls.cs:30:9:30:20 | ...++ |  |
+| AccessorCalls.cs:30:9:30:20 | ...++ | AccessorCalls.cs:31:9:31:20 | ...; |  |
+| AccessorCalls.cs:30:9:30:21 | ...; | AccessorCalls.cs:30:9:30:12 | this access |  |
+| AccessorCalls.cs:31:9:31:12 | this access | AccessorCalls.cs:31:9:31:17 | access to property Prop |  |
+| AccessorCalls.cs:31:9:31:17 | access to property Prop | AccessorCalls.cs:31:9:31:19 | ...++ |  |
+| AccessorCalls.cs:31:9:31:19 | ...++ | AccessorCalls.cs:32:9:32:18 | ...; |  |
+| AccessorCalls.cs:31:9:31:20 | ...; | AccessorCalls.cs:31:9:31:12 | this access |  |
+| AccessorCalls.cs:32:9:32:12 | this access | AccessorCalls.cs:32:14:32:14 | 0 |  |
+| AccessorCalls.cs:32:9:32:15 | access to indexer | AccessorCalls.cs:32:9:32:17 | ...++ |  |
+| AccessorCalls.cs:32:9:32:17 | ...++ | AccessorCalls.cs:28:10:28:11 | exit M3 (normal) |  |
+| AccessorCalls.cs:32:9:32:18 | ...; | AccessorCalls.cs:32:9:32:12 | this access |  |
+| AccessorCalls.cs:32:14:32:14 | 0 | AccessorCalls.cs:32:9:32:15 | access to indexer |  |
+| AccessorCalls.cs:35:10:35:11 | enter M4 | AccessorCalls.cs:36:5:40:5 | {...} |  |
+| AccessorCalls.cs:35:10:35:11 | exit M4 (normal) | AccessorCalls.cs:35:10:35:11 | exit M4 |  |
+| AccessorCalls.cs:36:5:40:5 | {...} | AccessorCalls.cs:37:9:37:23 | ...; |  |
+| AccessorCalls.cs:37:9:37:12 | this access | AccessorCalls.cs:37:9:37:14 | access to field x |  |
+| AccessorCalls.cs:37:9:37:14 | access to field x | AccessorCalls.cs:37:9:37:20 | access to field Field |  |
+| AccessorCalls.cs:37:9:37:20 | access to field Field | AccessorCalls.cs:37:9:37:22 | ...++ |  |
+| AccessorCalls.cs:37:9:37:22 | ...++ | AccessorCalls.cs:38:9:38:22 | ...; |  |
+| AccessorCalls.cs:37:9:37:23 | ...; | AccessorCalls.cs:37:9:37:12 | this access |  |
+| AccessorCalls.cs:38:9:38:12 | this access | AccessorCalls.cs:38:9:38:14 | access to field x |  |
+| AccessorCalls.cs:38:9:38:14 | access to field x | AccessorCalls.cs:38:9:38:19 | access to property Prop |  |
+| AccessorCalls.cs:38:9:38:19 | access to property Prop | AccessorCalls.cs:38:9:38:21 | ...++ |  |
+| AccessorCalls.cs:38:9:38:21 | ...++ | AccessorCalls.cs:39:9:39:20 | ...; |  |
+| AccessorCalls.cs:38:9:38:22 | ...; | AccessorCalls.cs:38:9:38:12 | this access |  |
+| AccessorCalls.cs:39:9:39:12 | this access | AccessorCalls.cs:39:9:39:14 | access to field x |  |
+| AccessorCalls.cs:39:9:39:14 | access to field x | AccessorCalls.cs:39:16:39:16 | 0 |  |
+| AccessorCalls.cs:39:9:39:17 | access to indexer | AccessorCalls.cs:39:9:39:19 | ...++ |  |
+| AccessorCalls.cs:39:9:39:19 | ...++ | AccessorCalls.cs:35:10:35:11 | exit M4 (normal) |  |
+| AccessorCalls.cs:39:9:39:20 | ...; | AccessorCalls.cs:39:9:39:12 | this access |  |
+| AccessorCalls.cs:39:16:39:16 | 0 | AccessorCalls.cs:39:9:39:17 | access to indexer |  |
+| 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:23:44:26 | this access |  |
+| AccessorCalls.cs:44:9:44:32 | ... + ... | AccessorCalls.cs:44:9:44:32 | ... = ... |  |
+| 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: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: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: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: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: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:25:51:28 | this access |  |
+| AccessorCalls.cs:51:9:51:36 | ... + ... | AccessorCalls.cs:51:9:51:36 | ... = ... |  |
+| 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: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: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: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: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: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 |  |
+| AccessorCalls.cs:57:5:59:5 | {...} | AccessorCalls.cs:58:9:58:86 | ...; |  |
+| AccessorCalls.cs:58:9:58:45 | (..., ...) | AccessorCalls.cs:58:50:58:53 | this access |  |
+| AccessorCalls.cs:58:9:58:85 | ... = ... | AccessorCalls.cs:56:10:56:11 | exit M7 (normal) |  |
+| AccessorCalls.cs:58:9:58:86 | ...; | AccessorCalls.cs:58:10:58:13 | this access |  |
+| AccessorCalls.cs:58:10:58:13 | this access | AccessorCalls.cs:58:22:58:25 | this access |  |
+| AccessorCalls.cs:58:22:58:25 | this access | AccessorCalls.cs:58:37:58:40 | this access |  |
+| AccessorCalls.cs:58:22:58:30 | access to property Prop | AccessorCalls.cs:58:37:58:43 | access to indexer |  |
+| AccessorCalls.cs:58:33:58:44 | (..., ...) | AccessorCalls.cs:58:9:58:45 | (..., ...) |  |
+| AccessorCalls.cs:58:37:58:40 | this access | AccessorCalls.cs:58:42:58:42 | 0 |  |
+| AccessorCalls.cs:58:37:58:43 | access to indexer | AccessorCalls.cs:58:9:58:85 | ... = ... |  |
+| AccessorCalls.cs:58:42:58:42 | 0 | AccessorCalls.cs:58:33:58:44 | (..., ...) |  |
+| AccessorCalls.cs:58:49:58:85 | (..., ...) | AccessorCalls.cs:58:22:58:30 | access to property Prop |  |
+| AccessorCalls.cs:58:50:58:53 | this access | AccessorCalls.cs:58:50:58:59 | access to field Field |  |
+| AccessorCalls.cs:58:50:58:59 | access to field Field | AccessorCalls.cs:58:62:58:65 | this access |  |
+| AccessorCalls.cs:58:62:58:65 | this access | AccessorCalls.cs:58:62:58:70 | access to property Prop |  |
+| AccessorCalls.cs:58:62:58:70 | access to property Prop | AccessorCalls.cs:58:74:58:74 | 0 |  |
+| AccessorCalls.cs:58:73:58:84 | (..., ...) | AccessorCalls.cs:58:49:58:85 | (..., ...) |  |
+| AccessorCalls.cs:58:74:58:74 | 0 | AccessorCalls.cs:58:77:58:80 | this access |  |
+| AccessorCalls.cs:58:77:58:80 | this access | AccessorCalls.cs:58:82:58:82 | 1 |  |
+| AccessorCalls.cs:58:77:58:83 | access to indexer | AccessorCalls.cs:58:73:58:84 | (..., ...) |  |
+| AccessorCalls.cs:58:82:58:82 | 1 | AccessorCalls.cs:58:77:58:83 | access to indexer |  |
+| AccessorCalls.cs:61:10:61:11 | enter M8 | AccessorCalls.cs:62:5:64:5 | {...} |  |
+| AccessorCalls.cs:61:10:61:11 | exit M8 (normal) | AccessorCalls.cs:61:10:61:11 | exit M8 |  |
+| AccessorCalls.cs:62:5:64:5 | {...} | AccessorCalls.cs:63:9:63:98 | ...; |  |
+| AccessorCalls.cs:63:9:63:51 | (..., ...) | AccessorCalls.cs:63:56:63:59 | this access |  |
+| AccessorCalls.cs:63:9:63:97 | ... = ... | AccessorCalls.cs:61:10:61:11 | exit M8 (normal) |  |
+| AccessorCalls.cs:63:9:63:98 | ...; | AccessorCalls.cs:63:10:63:13 | this access |  |
+| AccessorCalls.cs:63:10:63:13 | this access | AccessorCalls.cs:63:10:63:15 | access to field x |  |
+| AccessorCalls.cs:63:10:63:15 | access to field x | AccessorCalls.cs:63:24:63:27 | this access |  |
+| AccessorCalls.cs:63:24:63:27 | this access | AccessorCalls.cs:63:24:63:29 | access to field x |  |
+| AccessorCalls.cs:63:24:63:29 | access to field x | AccessorCalls.cs:63:41:63:44 | this access |  |
+| AccessorCalls.cs:63:24:63:34 | access to property Prop | AccessorCalls.cs:63:41:63:49 | access to indexer |  |
+| AccessorCalls.cs:63:37:63:50 | (..., ...) | AccessorCalls.cs:63:9:63:51 | (..., ...) |  |
+| AccessorCalls.cs:63:41:63:44 | this access | AccessorCalls.cs:63:41:63:46 | access to field x |  |
+| AccessorCalls.cs:63:41:63:46 | access to field x | AccessorCalls.cs:63:48:63:48 | 0 |  |
+| AccessorCalls.cs:63:41:63:49 | access to indexer | AccessorCalls.cs:63:9:63:97 | ... = ... |  |
+| AccessorCalls.cs:63:48:63:48 | 0 | AccessorCalls.cs:63:37:63:50 | (..., ...) |  |
+| AccessorCalls.cs:63:55:63:97 | (..., ...) | AccessorCalls.cs:63:24:63:34 | access to property Prop |  |
+| AccessorCalls.cs:63:56:63:59 | this access | AccessorCalls.cs:63:56:63:61 | access to field x |  |
+| AccessorCalls.cs:63:56:63:61 | access to field x | AccessorCalls.cs:63:56:63:67 | access to field Field |  |
+| AccessorCalls.cs:63:56:63:67 | access to field Field | AccessorCalls.cs:63:70:63:73 | this access |  |
+| AccessorCalls.cs:63:70:63:73 | this access | AccessorCalls.cs:63:70:63:75 | access to field x |  |
+| AccessorCalls.cs:63:70:63:75 | access to field x | AccessorCalls.cs:63:70:63:80 | access to property Prop |  |
+| AccessorCalls.cs:63:70:63:80 | access to property Prop | AccessorCalls.cs:63:84:63:84 | 0 |  |
+| AccessorCalls.cs:63:83:63:96 | (..., ...) | AccessorCalls.cs:63:55:63:97 | (..., ...) |  |
+| AccessorCalls.cs:63:84:63:84 | 0 | AccessorCalls.cs:63:87:63:90 | this access |  |
+| AccessorCalls.cs:63:87:63:90 | this access | AccessorCalls.cs:63:87:63:92 | access to field x |  |
+| AccessorCalls.cs:63:87:63:92 | access to field x | AccessorCalls.cs:63:94:63:94 | 1 |  |
+| AccessorCalls.cs:63:87:63:95 | access to indexer | AccessorCalls.cs:63:83:63:96 | (..., ...) |  |
+| AccessorCalls.cs:63:94:63:94 | 1 | AccessorCalls.cs:63:87:63:95 | access to indexer |  |
+| AccessorCalls.cs:66:10:66:11 | enter M9 | AccessorCalls.cs:67:5:74:5 | {...} |  |
+| AccessorCalls.cs:66:10:66:11 | exit M9 (normal) | AccessorCalls.cs:66:10:66:11 | exit M9 |  |
+| AccessorCalls.cs:67:5:74:5 | {...} | AccessorCalls.cs:68:9:68:22 | ... ...; |  |
+| AccessorCalls.cs:68:9:68:22 | ... ...; | AccessorCalls.cs:68:21:68:21 | access to parameter o |  |
+| AccessorCalls.cs:68:17:68:21 | dynamic d = ... | AccessorCalls.cs:69:9:69:36 | ...; |  |
+| AccessorCalls.cs:68:21:68:21 | access to parameter o | AccessorCalls.cs:68:17:68:21 | dynamic d = ... |  |
+| AccessorCalls.cs:69:9:69:9 | access to local variable d | AccessorCalls.cs:69:24:69:24 | access to local variable d |  |
+| AccessorCalls.cs:69:9:69:20 | dynamic access to member MaybeProp1 | AccessorCalls.cs:69:9:69:35 | ... = ... |  |
+| AccessorCalls.cs:69:9:69:35 | ... = ... | AccessorCalls.cs:70:9:70:22 | ...; |  |
+| AccessorCalls.cs:69:9:69:36 | ...; | AccessorCalls.cs:69:9:69:9 | access to local variable d |  |
+| AccessorCalls.cs:69:24:69:24 | access to local variable d | AccessorCalls.cs:69:24:69:35 | dynamic access to member MaybeProp2 |  |
+| AccessorCalls.cs:69:24:69:35 | dynamic access to member MaybeProp2 | AccessorCalls.cs:69:9:69:20 | dynamic access to member MaybeProp1 |  |
+| AccessorCalls.cs:70:9:70:9 | access to local variable d | AccessorCalls.cs:70:9:70:19 | dynamic access to member MaybeProp |  |
+| 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: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: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: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: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) |  |
+| AccessorCalls.cs:73:9:73:84 | ...; | AccessorCalls.cs:73:10:73:10 | access to local variable d |  |
+| AccessorCalls.cs:73:10:73:10 | access to local variable d | AccessorCalls.cs:73:24:73:27 | this access |  |
+| AccessorCalls.cs:73:10:73:21 | dynamic access to member MaybeProp1 | AccessorCalls.cs:73:24:73:32 | access to property Prop |  |
+| AccessorCalls.cs:73:24:73:27 | this access | AccessorCalls.cs:73:39:73:39 | access to local variable d |  |
+| AccessorCalls.cs:73:24:73:32 | access to property Prop | AccessorCalls.cs:73:39:73:42 | dynamic access to element |  |
+| AccessorCalls.cs:73:35:73:43 | (..., ...) | AccessorCalls.cs:73:9:73:44 | (..., ...) |  |
+| AccessorCalls.cs:73:39:73:39 | access to local variable d | AccessorCalls.cs:73:41:73:41 | 0 |  |
+| AccessorCalls.cs:73:39:73:42 | dynamic access to element | AccessorCalls.cs:73:9:73:83 | ... = ... |  |
+| AccessorCalls.cs:73:41:73:41 | 0 | AccessorCalls.cs:73:35:73:43 | (..., ...) |  |
+| AccessorCalls.cs:73:48:73:83 | (..., ...) | AccessorCalls.cs:73:10:73:21 | dynamic access to member MaybeProp1 |  |
+| AccessorCalls.cs:73:49:73:49 | access to local variable d | AccessorCalls.cs:73:49:73:60 | dynamic access to member MaybeProp1 |  |
+| AccessorCalls.cs:73:49:73:60 | dynamic access to member MaybeProp1 | AccessorCalls.cs:73:63:73:66 | this access |  |
+| AccessorCalls.cs:73:63:73:66 | this access | AccessorCalls.cs:73:63:73:71 | access to property Prop |  |
+| AccessorCalls.cs:73:63:73:71 | access to property Prop | AccessorCalls.cs:73:75:73:75 | 0 |  |
+| AccessorCalls.cs:73:74:73:82 | (..., ...) | AccessorCalls.cs:73:48:73:83 | (..., ...) |  |
+| AccessorCalls.cs:73:75:73:75 | 0 | AccessorCalls.cs:73:78:73:78 | access to local variable d |  |
+| AccessorCalls.cs:73:78:73:78 | access to local variable d | AccessorCalls.cs:73:80:73:80 | 1 |  |
+| AccessorCalls.cs:73:78:73:81 | dynamic access to element | AccessorCalls.cs:73:74:73:82 | (..., ...) |  |
+| AccessorCalls.cs:73:80:73:80 | 1 | AccessorCalls.cs:73:78:73:81 | dynamic access to element |  |
+| ArrayCreation.cs:1:7:1:19 | call to constructor Object | ArrayCreation.cs:1:7:1:19 | {...} |  |
+| ArrayCreation.cs:1:7:1:19 | enter ArrayCreation | ArrayCreation.cs:1:7:1:19 | call to constructor Object |  |
+| ArrayCreation.cs:1:7:1:19 | exit ArrayCreation (normal) | ArrayCreation.cs:1:7:1:19 | exit ArrayCreation |  |
+| ArrayCreation.cs:1:7:1:19 | {...} | ArrayCreation.cs:1:7:1:19 | exit ArrayCreation (normal) |  |
+| ArrayCreation.cs:3:11:3:12 | enter M1 | ArrayCreation.cs:3:27:3:27 | 0 |  |
+| ArrayCreation.cs:3:11:3:12 | exit M1 (normal) | ArrayCreation.cs:3:11:3:12 | exit M1 |  |
+| ArrayCreation.cs:3:19:3:28 | array creation of type Int32[] | ArrayCreation.cs:3:11:3:12 | exit M1 (normal) |  |
+| ArrayCreation.cs:3:27:3:27 | 0 | ArrayCreation.cs:3:19:3:28 | array creation of type Int32[] |  |
+| ArrayCreation.cs:5:12:5:13 | enter M2 | ArrayCreation.cs:5:28:5:28 | 0 |  |
+| ArrayCreation.cs:5:12:5:13 | exit M2 (normal) | ArrayCreation.cs:5:12:5:13 | exit M2 |  |
+| ArrayCreation.cs:5:20:5:32 | array creation of type Int32[,] | ArrayCreation.cs:5:12:5:13 | exit M2 (normal) |  |
+| ArrayCreation.cs:5:28:5:28 | 0 | ArrayCreation.cs:5:31:5:31 | 1 |  |
+| ArrayCreation.cs:5:31:5:31 | 1 | ArrayCreation.cs:5:20:5:32 | array creation of type Int32[,] |  |
+| ArrayCreation.cs:7:11:7:12 | enter M3 | ArrayCreation.cs:7:19:7:36 | 2 |  |
+| ArrayCreation.cs:7:11:7:12 | exit M3 (normal) | ArrayCreation.cs:7:11:7:12 | exit M3 |  |
+| ArrayCreation.cs:7:19:7:36 | 2 | ArrayCreation.cs:7:19:7:36 | array creation of type Int32[] |  |
+| ArrayCreation.cs:7:19:7:36 | array creation of type Int32[] | ArrayCreation.cs:7:31:7:31 | 0 |  |
+| ArrayCreation.cs:7:29:7:36 | { ..., ... } | ArrayCreation.cs:7:11:7:12 | exit M3 (normal) |  |
+| ArrayCreation.cs:7:31:7:31 | 0 | ArrayCreation.cs:7:34:7:34 | 1 |  |
+| ArrayCreation.cs:7:34:7:34 | 1 | ArrayCreation.cs:7:29:7:36 | { ..., ... } |  |
+| ArrayCreation.cs:9:12:9:13 | enter M4 | ArrayCreation.cs:9:20:9:52 | 2 |  |
+| ArrayCreation.cs:9:12:9:13 | exit M4 (normal) | ArrayCreation.cs:9:12:9:13 | exit M4 |  |
+| ArrayCreation.cs:9:20:9:52 | 2 | ArrayCreation.cs:9:20:9:52 | 2 |  |
+| ArrayCreation.cs:9:20:9:52 | 2 | ArrayCreation.cs:9:20:9:52 | array creation of type Int32[,] |  |
+| ArrayCreation.cs:9:20:9:52 | array creation of type Int32[,] | ArrayCreation.cs:9:35:9:35 | 0 |  |
+| ArrayCreation.cs:9:31:9:52 | { ..., ... } | ArrayCreation.cs:9:12:9:13 | exit M4 (normal) |  |
+| ArrayCreation.cs:9:33:9:40 | { ..., ... } | ArrayCreation.cs:9:45:9:45 | 2 |  |
+| ArrayCreation.cs:9:35:9:35 | 0 | ArrayCreation.cs:9:38:9:38 | 1 |  |
+| ArrayCreation.cs:9:38:9:38 | 1 | ArrayCreation.cs:9:33:9:40 | { ..., ... } |  |
+| ArrayCreation.cs:9:43:9:50 | { ..., ... } | ArrayCreation.cs:9:31:9:52 | { ..., ... } |  |
+| ArrayCreation.cs:9:45:9:45 | 2 | ArrayCreation.cs:9:48:9:48 | 3 |  |
+| ArrayCreation.cs:9:48:9:48 | 3 | ArrayCreation.cs:9:43:9:50 | { ..., ... } |  |
+| Assert.cs:5:7:5:17 | call to constructor Object | Assert.cs:5:7:5:17 | {...} |  |
+| Assert.cs:5:7:5:17 | enter AssertTests | Assert.cs:5:7:5:17 | call to constructor Object |  |
+| Assert.cs:5:7:5:17 | exit AssertTests (normal) | Assert.cs:5:7:5:17 | exit AssertTests |  |
+| Assert.cs:5:7:5:17 | {...} | Assert.cs:5:7:5:17 | exit AssertTests (normal) |  |
+| Assert.cs:7:10:7:11 | enter M1 | Assert.cs:8:5:12:5 | {...} |  |
+| Assert.cs:7:10:7:11 | exit M1 (abnormal) | Assert.cs:7:10:7:11 | exit M1 |  |
+| Assert.cs:7:10:7:11 | exit M1 (normal) | Assert.cs:7:10:7:11 | exit M1 |  |
+| Assert.cs:8:5:12:5 | {...} | Assert.cs:9:9:9:33 | ... ...; |  |
+| Assert.cs:9:9:9:33 | ... ...; | Assert.cs:9:20:9:20 | access to parameter b |  |
+| Assert.cs:9:16:9:32 | String s = ... | Assert.cs:10:9:10:32 | ...; |  |
+| Assert.cs:9:20:9:20 | access to parameter b | Assert.cs:9:24:9:27 | null | true |
+| Assert.cs:9:20:9:20 | access to parameter b | Assert.cs:9:31:9:32 | "" | false |
+| Assert.cs:9:20:9:32 | ... ? ... : ... | Assert.cs:9:16:9:32 | String s = ... |  |
+| Assert.cs:9:24:9:27 | null | Assert.cs:9:20:9:32 | ... ? ... : ... |  |
+| Assert.cs:9:31:9:32 | "" | Assert.cs:9:20:9:32 | ... ? ... : ... |  |
+| Assert.cs:10:9:10:31 | [assertion failure] call to method Assert | Assert.cs:7:10:7:11 | exit M1 (abnormal) | exit |
+| Assert.cs:10:9:10:31 | [assertion success] call to method Assert | Assert.cs:11:9:11:36 | ...; |  |
+| Assert.cs:10:9:10:32 | ...; | Assert.cs:10:22:10:22 | access to local variable s |  |
+| Assert.cs:10:22:10:22 | access to local variable s | Assert.cs:10:27:10:30 | null |  |
+| Assert.cs:10:22:10:30 | ... != ... | Assert.cs:10:9:10:31 | [assertion failure] call to method Assert | false |
+| Assert.cs:10:22:10:30 | ... != ... | Assert.cs:10:9:10:31 | [assertion success] call to method Assert | true |
+| Assert.cs:10:27:10:30 | null | Assert.cs:10:22:10:30 | ... != ... |  |
+| Assert.cs:11:9:11:35 | call to method WriteLine | Assert.cs:7:10:7:11 | exit M1 (normal) |  |
+| Assert.cs:11:9:11:36 | ...; | Assert.cs:11:27:11:27 | access to local variable s |  |
+| Assert.cs:11:27:11:27 | access to local variable s | Assert.cs:11:27:11:34 | access to property Length |  |
+| Assert.cs:11:27:11:34 | access to property Length | Assert.cs:11:9:11:35 | call to method WriteLine |  |
+| Assert.cs:14:10:14:11 | enter M2 | Assert.cs:15:5:19:5 | {...} |  |
+| Assert.cs:14:10:14:11 | exit M2 (abnormal) | Assert.cs:14:10:14:11 | exit M2 |  |
+| Assert.cs:14:10:14:11 | exit M2 (normal) | Assert.cs:14:10:14:11 | exit M2 |  |
+| Assert.cs:15:5:19:5 | {...} | Assert.cs:16:9:16:33 | ... ...; |  |
+| Assert.cs:16:9:16:33 | ... ...; | Assert.cs:16:20:16:20 | access to parameter b |  |
+| Assert.cs:16:16:16:32 | String s = ... | Assert.cs:17:9:17:25 | ...; |  |
+| Assert.cs:16:20:16:20 | access to parameter b | Assert.cs:16:24:16:27 | null | true |
+| Assert.cs:16:20:16:20 | access to parameter b | Assert.cs:16:31:16:32 | "" | false |
+| Assert.cs:16:20:16:32 | ... ? ... : ... | Assert.cs:16:16:16:32 | String s = ... |  |
+| Assert.cs:16:24:16:27 | null | Assert.cs:16:20:16:32 | ... ? ... : ... |  |
+| Assert.cs:16:31:16:32 | "" | Assert.cs:16:20:16:32 | ... ? ... : ... |  |
+| Assert.cs:17:9:17:24 | [assertion failure] call to method IsNull | Assert.cs:14:10:14:11 | exit M2 (abnormal) | exception(AssertFailedException) |
+| Assert.cs:17:9:17:24 | [assertion success] call to method IsNull | Assert.cs:18:9:18:36 | ...; |  |
+| Assert.cs:17:9:17:25 | ...; | Assert.cs:17:23:17:23 | access to local variable s |  |
+| Assert.cs:17:23:17:23 | access to local variable s | Assert.cs:17:9:17:24 | [assertion failure] call to method IsNull | non-null |
+| Assert.cs:17:23:17:23 | access to local variable s | Assert.cs:17:9:17:24 | [assertion success] call to method IsNull | null |
+| Assert.cs:18:9:18:35 | call to method WriteLine | Assert.cs:14:10:14:11 | exit M2 (normal) |  |
+| Assert.cs:18:9:18:36 | ...; | Assert.cs:18:27:18:27 | access to local variable s |  |
+| Assert.cs:18:27:18:27 | access to local variable s | Assert.cs:18:27:18:34 | access to property Length |  |
+| Assert.cs:18:27:18:34 | access to property Length | Assert.cs:18:9:18:35 | call to method WriteLine |  |
+| Assert.cs:21:10:21:11 | enter M3 | Assert.cs:22:5:26:5 | {...} |  |
+| Assert.cs:21:10:21:11 | exit M3 (abnormal) | Assert.cs:21:10:21:11 | exit M3 |  |
+| Assert.cs:21:10:21:11 | exit M3 (normal) | Assert.cs:21:10:21:11 | exit M3 |  |
+| Assert.cs:22:5:26:5 | {...} | Assert.cs:23:9:23:33 | ... ...; |  |
+| Assert.cs:23:9:23:33 | ... ...; | Assert.cs:23:20:23:20 | access to parameter b |  |
+| Assert.cs:23:16:23:32 | String s = ... | Assert.cs:24:9:24:28 | ...; |  |
+| Assert.cs:23:20:23:20 | access to parameter b | Assert.cs:23:24:23:27 | null | true |
+| Assert.cs:23:20:23:20 | access to parameter b | Assert.cs:23:31:23:32 | "" | false |
+| Assert.cs:23:20:23:32 | ... ? ... : ... | Assert.cs:23:16:23:32 | String s = ... |  |
+| Assert.cs:23:24:23:27 | null | Assert.cs:23:20:23:32 | ... ? ... : ... |  |
+| Assert.cs:23:31:23:32 | "" | Assert.cs:23:20:23:32 | ... ? ... : ... |  |
+| Assert.cs:24:9:24:27 | [assertion failure] call to method IsNotNull | Assert.cs:21:10:21:11 | exit M3 (abnormal) | exception(AssertFailedException) |
+| Assert.cs:24:9:24:27 | [assertion success] call to method IsNotNull | Assert.cs:25:9:25:36 | ...; |  |
+| Assert.cs:24:9:24:28 | ...; | Assert.cs:24:26:24:26 | access to local variable s |  |
+| Assert.cs:24:26:24:26 | access to local variable s | Assert.cs:24:9:24:27 | [assertion failure] call to method IsNotNull | null |
+| Assert.cs:24:26:24:26 | access to local variable s | Assert.cs:24:9:24:27 | [assertion success] call to method IsNotNull | non-null |
+| Assert.cs:25:9:25:35 | call to method WriteLine | Assert.cs:21:10:21:11 | exit M3 (normal) |  |
+| Assert.cs:25:9:25:36 | ...; | Assert.cs:25:27:25:27 | access to local variable s |  |
+| Assert.cs:25:27:25:27 | access to local variable s | Assert.cs:25:27:25:34 | access to property Length |  |
+| Assert.cs:25:27:25:34 | access to property Length | Assert.cs:25:9:25:35 | call to method WriteLine |  |
+| Assert.cs:28:10:28:11 | enter M4 | Assert.cs:29:5:33:5 | {...} |  |
+| Assert.cs:28:10:28:11 | exit M4 (abnormal) | Assert.cs:28:10:28:11 | exit M4 |  |
+| Assert.cs:28:10:28:11 | exit M4 (normal) | Assert.cs:28:10:28:11 | exit M4 |  |
+| Assert.cs:29:5:33:5 | {...} | Assert.cs:30:9:30:33 | ... ...; |  |
+| Assert.cs:30:9:30:33 | ... ...; | Assert.cs:30:20:30:20 | access to parameter b |  |
+| Assert.cs:30:16:30:32 | String s = ... | Assert.cs:31:9:31:33 | ...; |  |
+| Assert.cs:30:20:30:20 | access to parameter b | Assert.cs:30:24:30:27 | null | true |
+| Assert.cs:30:20:30:20 | access to parameter b | Assert.cs:30:31:30:32 | "" | false |
+| Assert.cs:30:20:30:32 | ... ? ... : ... | Assert.cs:30:16:30:32 | String s = ... |  |
+| Assert.cs:30:24:30:27 | null | Assert.cs:30:20:30:32 | ... ? ... : ... |  |
+| Assert.cs:30:31:30:32 | "" | Assert.cs:30:20:30:32 | ... ? ... : ... |  |
+| Assert.cs:31:9:31:32 | [assertion failure] call to method IsTrue | Assert.cs:28:10:28:11 | exit M4 (abnormal) | exception(AssertFailedException) |
+| Assert.cs:31:9:31:32 | [assertion success] call to method IsTrue | Assert.cs:32:9:32:36 | ...; |  |
+| Assert.cs:31:9:31:33 | ...; | Assert.cs:31:23:31:23 | access to local variable s |  |
+| Assert.cs:31:23:31:23 | access to local variable s | Assert.cs:31:28:31:31 | null |  |
+| Assert.cs:31:23:31:31 | ... == ... | Assert.cs:31:9:31:32 | [assertion failure] call to method IsTrue | false |
+| Assert.cs:31:23:31:31 | ... == ... | Assert.cs:31:9:31:32 | [assertion success] call to method IsTrue | true |
+| Assert.cs:31:28:31:31 | null | Assert.cs:31:23:31:31 | ... == ... |  |
+| Assert.cs:32:9:32:35 | call to method WriteLine | Assert.cs:28:10:28:11 | exit M4 (normal) |  |
+| Assert.cs:32:9:32:36 | ...; | Assert.cs:32:27:32:27 | access to local variable s |  |
+| Assert.cs:32:27:32:27 | access to local variable s | Assert.cs:32:27:32:34 | access to property Length |  |
+| Assert.cs:32:27:32:34 | access to property Length | Assert.cs:32:9:32:35 | call to method WriteLine |  |
+| Assert.cs:35:10:35:11 | enter M5 | Assert.cs:36:5:40:5 | {...} |  |
+| Assert.cs:35:10:35:11 | exit M5 (abnormal) | Assert.cs:35:10:35:11 | exit M5 |  |
+| Assert.cs:35:10:35:11 | exit M5 (normal) | Assert.cs:35:10:35:11 | exit M5 |  |
+| Assert.cs:36:5:40:5 | {...} | Assert.cs:37:9:37:33 | ... ...; |  |
+| Assert.cs:37:9:37:33 | ... ...; | Assert.cs:37:20:37:20 | access to parameter b |  |
+| Assert.cs:37:16:37:32 | String s = ... | Assert.cs:38:9:38:33 | ...; |  |
+| Assert.cs:37:20:37:20 | access to parameter b | Assert.cs:37:24:37:27 | null | true |
+| Assert.cs:37:20:37:20 | access to parameter b | Assert.cs:37:31:37:32 | "" | false |
+| Assert.cs:37:20:37:32 | ... ? ... : ... | Assert.cs:37:16:37:32 | String s = ... |  |
+| Assert.cs:37:24:37:27 | null | Assert.cs:37:20:37:32 | ... ? ... : ... |  |
+| Assert.cs:37:31:37:32 | "" | Assert.cs:37:20:37:32 | ... ? ... : ... |  |
+| Assert.cs:38:9:38:32 | [assertion failure] call to method IsTrue | Assert.cs:35:10:35:11 | exit M5 (abnormal) | exception(AssertFailedException) |
+| Assert.cs:38:9:38:32 | [assertion success] call to method IsTrue | Assert.cs:39:9:39:36 | ...; |  |
+| Assert.cs:38:9:38:33 | ...; | Assert.cs:38:23:38:23 | access to local variable s |  |
+| Assert.cs:38:23:38:23 | access to local variable s | Assert.cs:38:28:38:31 | null |  |
+| Assert.cs:38:23:38:31 | ... != ... | Assert.cs:38:9:38:32 | [assertion failure] call to method IsTrue | false |
+| Assert.cs:38:23:38:31 | ... != ... | Assert.cs:38:9:38:32 | [assertion success] call to method IsTrue | true |
+| Assert.cs:38:28:38:31 | null | Assert.cs:38:23:38:31 | ... != ... |  |
+| Assert.cs:39:9:39:35 | call to method WriteLine | Assert.cs:35:10:35:11 | exit M5 (normal) |  |
+| Assert.cs:39:9:39:36 | ...; | Assert.cs:39:27:39:27 | access to local variable s |  |
+| Assert.cs:39:27:39:27 | access to local variable s | Assert.cs:39:27:39:34 | access to property Length |  |
+| Assert.cs:39:27:39:34 | access to property Length | Assert.cs:39:9:39:35 | call to method WriteLine |  |
+| Assert.cs:42:10:42:11 | enter M6 | Assert.cs:43:5:47:5 | {...} |  |
+| Assert.cs:42:10:42:11 | exit M6 (abnormal) | Assert.cs:42:10:42:11 | exit M6 |  |
+| Assert.cs:42:10:42:11 | exit M6 (normal) | Assert.cs:42:10:42:11 | exit M6 |  |
+| Assert.cs:43:5:47:5 | {...} | Assert.cs:44:9:44:33 | ... ...; |  |
+| Assert.cs:44:9:44:33 | ... ...; | Assert.cs:44:20:44:20 | access to parameter b |  |
+| Assert.cs:44:16:44:32 | String s = ... | Assert.cs:45:9:45:34 | ...; |  |
+| Assert.cs:44:20:44:20 | access to parameter b | Assert.cs:44:24:44:27 | null | true |
+| Assert.cs:44:20:44:20 | access to parameter b | Assert.cs:44:31:44:32 | "" | false |
+| Assert.cs:44:20:44:32 | ... ? ... : ... | Assert.cs:44:16:44:32 | String s = ... |  |
+| Assert.cs:44:24:44:27 | null | Assert.cs:44:20:44:32 | ... ? ... : ... |  |
+| Assert.cs:44:31:44:32 | "" | Assert.cs:44:20:44:32 | ... ? ... : ... |  |
+| Assert.cs:45:9:45:33 | [assertion failure] call to method IsFalse | Assert.cs:42:10:42:11 | exit M6 (abnormal) | exception(AssertFailedException) |
+| Assert.cs:45:9:45:33 | [assertion success] call to method IsFalse | Assert.cs:46:9:46:36 | ...; |  |
+| Assert.cs:45:9:45:34 | ...; | Assert.cs:45:24:45:24 | access to local variable s |  |
+| Assert.cs:45:24:45:24 | access to local variable s | Assert.cs:45:29:45:32 | null |  |
+| Assert.cs:45:24:45:32 | ... != ... | Assert.cs:45:9:45:33 | [assertion failure] call to method IsFalse | true |
+| Assert.cs:45:24:45:32 | ... != ... | Assert.cs:45:9:45:33 | [assertion success] call to method IsFalse | false |
+| Assert.cs:45:29:45:32 | null | Assert.cs:45:24:45:32 | ... != ... |  |
+| Assert.cs:46:9:46:35 | call to method WriteLine | Assert.cs:42:10:42:11 | exit M6 (normal) |  |
+| Assert.cs:46:9:46:36 | ...; | Assert.cs:46:27:46:27 | access to local variable s |  |
+| Assert.cs:46:27:46:27 | access to local variable s | Assert.cs:46:27:46:34 | access to property Length |  |
+| Assert.cs:46:27:46:34 | access to property Length | Assert.cs:46:9:46:35 | call to method WriteLine |  |
+| Assert.cs:49:10:49:11 | enter M7 | Assert.cs:50:5:54:5 | {...} |  |
+| Assert.cs:49:10:49:11 | exit M7 (abnormal) | Assert.cs:49:10:49:11 | exit M7 |  |
+| Assert.cs:49:10:49:11 | exit M7 (normal) | Assert.cs:49:10:49:11 | exit M7 |  |
+| Assert.cs:50:5:54:5 | {...} | Assert.cs:51:9:51:33 | ... ...; |  |
+| Assert.cs:51:9:51:33 | ... ...; | Assert.cs:51:20:51:20 | access to parameter b |  |
+| Assert.cs:51:16:51:32 | String s = ... | Assert.cs:52:9:52:34 | ...; |  |
+| Assert.cs:51:20:51:20 | access to parameter b | Assert.cs:51:24:51:27 | null | true |
+| Assert.cs:51:20:51:20 | access to parameter b | Assert.cs:51:31:51:32 | "" | false |
+| Assert.cs:51:20:51:32 | ... ? ... : ... | Assert.cs:51:16:51:32 | String s = ... |  |
+| Assert.cs:51:24:51:27 | null | Assert.cs:51:20:51:32 | ... ? ... : ... |  |
+| Assert.cs:51:31:51:32 | "" | Assert.cs:51:20:51:32 | ... ? ... : ... |  |
+| Assert.cs:52:9:52:33 | [assertion failure] call to method IsFalse | Assert.cs:49:10:49:11 | exit M7 (abnormal) | exception(AssertFailedException) |
+| Assert.cs:52:9:52:33 | [assertion success] call to method IsFalse | Assert.cs:53:9:53:36 | ...; |  |
+| Assert.cs:52:9:52:34 | ...; | Assert.cs:52:24:52:24 | access to local variable s |  |
+| Assert.cs:52:24:52:24 | access to local variable s | Assert.cs:52:29:52:32 | null |  |
+| Assert.cs:52:24:52:32 | ... == ... | Assert.cs:52:9:52:33 | [assertion failure] call to method IsFalse | true |
+| Assert.cs:52:24:52:32 | ... == ... | Assert.cs:52:9:52:33 | [assertion success] call to method IsFalse | false |
+| Assert.cs:52:29:52:32 | null | Assert.cs:52:24:52:32 | ... == ... |  |
+| Assert.cs:53:9:53:35 | call to method WriteLine | Assert.cs:49:10:49:11 | exit M7 (normal) |  |
+| Assert.cs:53:9:53:36 | ...; | Assert.cs:53:27:53:27 | access to local variable s |  |
+| Assert.cs:53:27:53:27 | access to local variable s | Assert.cs:53:27:53:34 | access to property Length |  |
+| Assert.cs:53:27:53:34 | access to property Length | Assert.cs:53:9:53:35 | call to method WriteLine |  |
+| Assert.cs:56:10:56:11 | enter M8 | Assert.cs:57:5:61:5 | {...} |  |
+| Assert.cs:56:10:56:11 | exit M8 (abnormal) | Assert.cs:56:10:56:11 | exit M8 |  |
+| Assert.cs:56:10:56:11 | exit M8 (normal) | Assert.cs:56:10:56:11 | exit M8 |  |
+| Assert.cs:57:5:61:5 | {...} | Assert.cs:58:9:58:33 | ... ...; |  |
+| Assert.cs:58:9:58:33 | ... ...; | Assert.cs:58:20:58:20 | access to parameter b |  |
+| Assert.cs:58:16:58:32 | [b (line 56): false] String s = ... | Assert.cs:59:9:59:38 | [b (line 56): false] ...; |  |
+| Assert.cs:58:16:58:32 | [b (line 56): true] String s = ... | Assert.cs:59:9:59:38 | [b (line 56): true] ...; |  |
+| Assert.cs:58:20:58:20 | access to parameter b | Assert.cs:58:24:58:27 | [b (line 56): true] null | true |
+| Assert.cs:58:20:58:20 | access to parameter b | Assert.cs:58:31:58:32 | [b (line 56): false] "" | false |
+| Assert.cs:58:20:58:32 | [b (line 56): false] ... ? ... : ... | Assert.cs:58:16:58:32 | [b (line 56): false] String s = ... |  |
+| Assert.cs:58:20:58:32 | [b (line 56): true] ... ? ... : ... | Assert.cs:58:16:58:32 | [b (line 56): true] String s = ... |  |
+| Assert.cs:58:24:58:27 | [b (line 56): true] null | Assert.cs:58:20:58:32 | [b (line 56): true] ... ? ... : ... |  |
+| Assert.cs:58:31:58:32 | [b (line 56): false] "" | Assert.cs:58:20:58:32 | [b (line 56): false] ... ? ... : ... |  |
+| Assert.cs:59:9:59:37 | [assertion failure] call to method IsTrue | Assert.cs:56:10:56:11 | exit M8 (abnormal) | exception(AssertFailedException) |
+| Assert.cs:59:9:59:37 | [assertion success] call to method IsTrue | Assert.cs:60:9:60:36 | ...; |  |
+| Assert.cs:59:9:59:38 | [b (line 56): false] ...; | Assert.cs:59:23:59:23 | [b (line 56): false] access to local variable s |  |
+| Assert.cs:59:9:59:38 | [b (line 56): true] ...; | Assert.cs:59:23:59:23 | [b (line 56): true] access to local variable s |  |
+| Assert.cs:59:23:59:23 | [b (line 56): false] access to local variable s | Assert.cs:59:28:59:31 | [b (line 56): false] null |  |
+| Assert.cs:59:23:59:23 | [b (line 56): true] access to local variable s | Assert.cs:59:28:59:31 | [b (line 56): true] null |  |
+| Assert.cs:59:23:59:31 | [b (line 56): false] ... != ... | Assert.cs:59:23:59:36 | [false] ... && ... | false |
+| Assert.cs:59:23:59:31 | [b (line 56): false] ... != ... | Assert.cs:59:36:59:36 | [b (line 56): false] access to parameter b | true |
+| Assert.cs:59:23:59:31 | [b (line 56): true] ... != ... | Assert.cs:59:23:59:36 | [false] ... && ... | false |
+| Assert.cs:59:23:59:31 | [b (line 56): true] ... != ... | Assert.cs:59:36:59:36 | [b (line 56): true] access to parameter b | true |
+| Assert.cs:59:23:59:36 | [false] ... && ... | Assert.cs:59:9:59:37 | [assertion failure] call to method IsTrue | false |
+| Assert.cs:59:23:59:36 | [true] ... && ... | Assert.cs:59:9:59:37 | [assertion success] call to method IsTrue | true |
+| Assert.cs:59:28:59:31 | [b (line 56): false] null | Assert.cs:59:23:59:31 | [b (line 56): false] ... != ... |  |
+| Assert.cs:59:28:59:31 | [b (line 56): true] null | Assert.cs:59:23:59:31 | [b (line 56): true] ... != ... |  |
+| Assert.cs:59:36:59:36 | [b (line 56): false] access to parameter b | Assert.cs:59:23:59:36 | [false] ... && ... | false |
+| Assert.cs:59:36:59:36 | [b (line 56): true] access to parameter b | Assert.cs:59:23:59:36 | [true] ... && ... | true |
+| Assert.cs:60:9:60:35 | call to method WriteLine | Assert.cs:56:10:56:11 | exit M8 (normal) |  |
+| Assert.cs:60:9:60:36 | ...; | Assert.cs:60:27:60:27 | access to local variable s |  |
+| Assert.cs:60:27:60:27 | access to local variable s | Assert.cs:60:27:60:34 | access to property Length |  |
+| Assert.cs:60:27:60:34 | access to property Length | Assert.cs:60:9:60:35 | call to method WriteLine |  |
+| Assert.cs:63:10:63:11 | enter M9 | Assert.cs:64:5:68:5 | {...} |  |
+| Assert.cs:63:10:63:11 | exit M9 (abnormal) | Assert.cs:63:10:63:11 | exit M9 |  |
+| Assert.cs:63:10:63:11 | exit M9 (normal) | Assert.cs:63:10:63:11 | exit M9 |  |
+| Assert.cs:64:5:68:5 | {...} | Assert.cs:65:9:65:33 | ... ...; |  |
+| Assert.cs:65:9:65:33 | ... ...; | Assert.cs:65:20:65:20 | access to parameter b |  |
+| Assert.cs:65:16:65:32 | [b (line 63): false] String s = ... | Assert.cs:66:9:66:39 | [b (line 63): false] ...; |  |
+| Assert.cs:65:16:65:32 | [b (line 63): true] String s = ... | Assert.cs:66:9:66:39 | [b (line 63): true] ...; |  |
+| Assert.cs:65:20:65:20 | access to parameter b | Assert.cs:65:24:65:27 | [b (line 63): true] null | true |
+| Assert.cs:65:20:65:20 | access to parameter b | Assert.cs:65:31:65:32 | [b (line 63): false] "" | false |
+| Assert.cs:65:20:65:32 | [b (line 63): false] ... ? ... : ... | Assert.cs:65:16:65:32 | [b (line 63): false] String s = ... |  |
+| Assert.cs:65:20:65:32 | [b (line 63): true] ... ? ... : ... | Assert.cs:65:16:65:32 | [b (line 63): true] String s = ... |  |
+| Assert.cs:65:24:65:27 | [b (line 63): true] null | Assert.cs:65:20:65:32 | [b (line 63): true] ... ? ... : ... |  |
+| Assert.cs:65:31:65:32 | [b (line 63): false] "" | Assert.cs:65:20:65:32 | [b (line 63): false] ... ? ... : ... |  |
+| Assert.cs:66:9:66:38 | [assertion failure] call to method IsFalse | Assert.cs:63:10:63:11 | exit M9 (abnormal) | exception(AssertFailedException) |
+| Assert.cs:66:9:66:38 | [assertion success] call to method IsFalse | Assert.cs:67:9:67:36 | ...; |  |
+| Assert.cs:66:9:66:39 | [b (line 63): false] ...; | Assert.cs:66:24:66:24 | [b (line 63): false] access to local variable s |  |
+| Assert.cs:66:9:66:39 | [b (line 63): true] ...; | Assert.cs:66:24:66:24 | [b (line 63): true] access to local variable s |  |
+| Assert.cs:66:24:66:24 | [b (line 63): false] access to local variable s | Assert.cs:66:29:66:32 | [b (line 63): false] null |  |
+| Assert.cs:66:24:66:24 | [b (line 63): true] access to local variable s | Assert.cs:66:29:66:32 | [b (line 63): true] null |  |
+| Assert.cs:66:24:66:32 | [b (line 63): false] ... == ... | Assert.cs:66:24:66:37 | [true] ... \|\| ... | true |
+| Assert.cs:66:24:66:32 | [b (line 63): false] ... == ... | Assert.cs:66:37:66:37 | [b (line 63): false] access to parameter b | false |
+| Assert.cs:66:24:66:32 | [b (line 63): true] ... == ... | Assert.cs:66:24:66:37 | [true] ... \|\| ... | true |
+| Assert.cs:66:24:66:32 | [b (line 63): true] ... == ... | Assert.cs:66:37:66:37 | [b (line 63): true] access to parameter b | false |
+| Assert.cs:66:24:66:37 | [false] ... \|\| ... | Assert.cs:66:9:66:38 | [assertion success] call to method IsFalse | false |
+| Assert.cs:66:24:66:37 | [true] ... \|\| ... | Assert.cs:66:9:66:38 | [assertion failure] call to method IsFalse | true |
+| Assert.cs:66:29:66:32 | [b (line 63): false] null | Assert.cs:66:24:66:32 | [b (line 63): false] ... == ... |  |
+| Assert.cs:66:29:66:32 | [b (line 63): true] null | Assert.cs:66:24:66:32 | [b (line 63): true] ... == ... |  |
+| Assert.cs:66:37:66:37 | [b (line 63): false] access to parameter b | Assert.cs:66:24:66:37 | [false] ... \|\| ... | false |
+| Assert.cs:66:37:66:37 | [b (line 63): true] access to parameter b | Assert.cs:66:24:66:37 | [true] ... \|\| ... | true |
+| Assert.cs:67:9:67:35 | call to method WriteLine | Assert.cs:63:10:63:11 | exit M9 (normal) |  |
+| Assert.cs:67:9:67:36 | ...; | Assert.cs:67:27:67:27 | access to local variable s |  |
+| Assert.cs:67:27:67:27 | access to local variable s | Assert.cs:67:27:67:34 | access to property Length |  |
+| Assert.cs:67:27:67:34 | access to property Length | Assert.cs:67:9:67:35 | call to method WriteLine |  |
+| Assert.cs:70:10:70:12 | enter M10 | Assert.cs:71:5:75:5 | {...} |  |
+| Assert.cs:70:10:70:12 | exit M10 (abnormal) | Assert.cs:70:10:70:12 | exit M10 |  |
+| Assert.cs:70:10:70:12 | exit M10 (normal) | Assert.cs:70:10:70:12 | exit M10 |  |
+| Assert.cs:71:5:75:5 | {...} | Assert.cs:72:9:72:33 | ... ...; |  |
+| Assert.cs:72:9:72:33 | ... ...; | Assert.cs:72:20:72:20 | access to parameter b |  |
+| Assert.cs:72:16:72:32 | [b (line 70): false] String s = ... | Assert.cs:73:9:73:38 | [b (line 70): false] ...; |  |
+| Assert.cs:72:16:72:32 | [b (line 70): true] String s = ... | Assert.cs:73:9:73:38 | [b (line 70): true] ...; |  |
+| Assert.cs:72:20:72:20 | access to parameter b | Assert.cs:72:24:72:27 | [b (line 70): true] null | true |
+| Assert.cs:72:20:72:20 | access to parameter b | Assert.cs:72:31:72:32 | [b (line 70): false] "" | false |
+| Assert.cs:72:20:72:32 | [b (line 70): false] ... ? ... : ... | Assert.cs:72:16:72:32 | [b (line 70): false] String s = ... |  |
+| Assert.cs:72:20:72:32 | [b (line 70): true] ... ? ... : ... | Assert.cs:72:16:72:32 | [b (line 70): true] String s = ... |  |
+| Assert.cs:72:24:72:27 | [b (line 70): true] null | Assert.cs:72:20:72:32 | [b (line 70): true] ... ? ... : ... |  |
+| Assert.cs:72:31:72:32 | [b (line 70): false] "" | Assert.cs:72:20:72:32 | [b (line 70): false] ... ? ... : ... |  |
+| Assert.cs:73:9:73:37 | [assertion failure] call to method IsTrue | Assert.cs:70:10:70:12 | exit M10 (abnormal) | exception(AssertFailedException) |
+| Assert.cs:73:9:73:37 | [assertion success] call to method IsTrue | Assert.cs:74:9:74:36 | ...; |  |
+| Assert.cs:73:9:73:38 | [b (line 70): false] ...; | Assert.cs:73:23:73:23 | [b (line 70): false] access to local variable s |  |
+| Assert.cs:73:9:73:38 | [b (line 70): true] ...; | Assert.cs:73:23:73:23 | [b (line 70): true] access to local variable s |  |
+| Assert.cs:73:23:73:23 | [b (line 70): false] access to local variable s | Assert.cs:73:28:73:31 | [b (line 70): false] null |  |
+| Assert.cs:73:23:73:23 | [b (line 70): true] access to local variable s | Assert.cs:73:28:73:31 | [b (line 70): true] null |  |
+| Assert.cs:73:23:73:31 | [b (line 70): false] ... == ... | Assert.cs:73:23:73:36 | [false] ... && ... | false |
+| Assert.cs:73:23:73:31 | [b (line 70): false] ... == ... | Assert.cs:73:36:73:36 | [b (line 70): false] access to parameter b | true |
+| Assert.cs:73:23:73:31 | [b (line 70): true] ... == ... | Assert.cs:73:23:73:36 | [false] ... && ... | false |
+| Assert.cs:73:23:73:31 | [b (line 70): true] ... == ... | Assert.cs:73:36:73:36 | [b (line 70): true] access to parameter b | true |
+| Assert.cs:73:23:73:36 | [false] ... && ... | Assert.cs:73:9:73:37 | [assertion failure] call to method IsTrue | false |
+| Assert.cs:73:23:73:36 | [true] ... && ... | Assert.cs:73:9:73:37 | [assertion success] call to method IsTrue | true |
+| Assert.cs:73:28:73:31 | [b (line 70): false] null | Assert.cs:73:23:73:31 | [b (line 70): false] ... == ... |  |
+| Assert.cs:73:28:73:31 | [b (line 70): true] null | Assert.cs:73:23:73:31 | [b (line 70): true] ... == ... |  |
+| Assert.cs:73:36:73:36 | [b (line 70): false] access to parameter b | Assert.cs:73:23:73:36 | [false] ... && ... | false |
+| Assert.cs:73:36:73:36 | [b (line 70): true] access to parameter b | Assert.cs:73:23:73:36 | [true] ... && ... | true |
+| Assert.cs:74:9:74:35 | call to method WriteLine | Assert.cs:70:10:70:12 | exit M10 (normal) |  |
+| Assert.cs:74:9:74:36 | ...; | Assert.cs:74:27:74:27 | access to local variable s |  |
+| Assert.cs:74:27:74:27 | access to local variable s | Assert.cs:74:27:74:34 | access to property Length |  |
+| Assert.cs:74:27:74:34 | access to property Length | Assert.cs:74:9:74:35 | call to method WriteLine |  |
+| Assert.cs:77:10:77:12 | enter M11 | Assert.cs:78:5:82:5 | {...} |  |
+| Assert.cs:77:10:77:12 | exit M11 (abnormal) | Assert.cs:77:10:77:12 | exit M11 |  |
+| Assert.cs:77:10:77:12 | exit M11 (normal) | Assert.cs:77:10:77:12 | exit M11 |  |
+| Assert.cs:78:5:82:5 | {...} | Assert.cs:79:9:79:33 | ... ...; |  |
+| Assert.cs:79:9:79:33 | ... ...; | Assert.cs:79:20:79:20 | access to parameter b |  |
+| Assert.cs:79:16:79:32 | [b (line 77): false] String s = ... | Assert.cs:80:9:80:39 | [b (line 77): false] ...; |  |
+| Assert.cs:79:16:79:32 | [b (line 77): true] String s = ... | Assert.cs:80:9:80:39 | [b (line 77): true] ...; |  |
+| Assert.cs:79:20:79:20 | access to parameter b | Assert.cs:79:24:79:27 | [b (line 77): true] null | true |
+| Assert.cs:79:20:79:20 | access to parameter b | Assert.cs:79:31:79:32 | [b (line 77): false] "" | false |
+| Assert.cs:79:20:79:32 | [b (line 77): false] ... ? ... : ... | Assert.cs:79:16:79:32 | [b (line 77): false] String s = ... |  |
+| Assert.cs:79:20:79:32 | [b (line 77): true] ... ? ... : ... | Assert.cs:79:16:79:32 | [b (line 77): true] String s = ... |  |
+| Assert.cs:79:24:79:27 | [b (line 77): true] null | Assert.cs:79:20:79:32 | [b (line 77): true] ... ? ... : ... |  |
+| Assert.cs:79:31:79:32 | [b (line 77): false] "" | Assert.cs:79:20:79:32 | [b (line 77): false] ... ? ... : ... |  |
+| Assert.cs:80:9:80:38 | [assertion failure] call to method IsFalse | Assert.cs:77:10:77:12 | exit M11 (abnormal) | exception(AssertFailedException) |
+| Assert.cs:80:9:80:38 | [assertion success] call to method IsFalse | Assert.cs:81:9:81:36 | ...; |  |
+| Assert.cs:80:9:80:39 | [b (line 77): false] ...; | Assert.cs:80:24:80:24 | [b (line 77): false] access to local variable s |  |
+| Assert.cs:80:9:80:39 | [b (line 77): true] ...; | Assert.cs:80:24:80:24 | [b (line 77): true] access to local variable s |  |
+| Assert.cs:80:24:80:24 | [b (line 77): false] access to local variable s | Assert.cs:80:29:80:32 | [b (line 77): false] null |  |
+| Assert.cs:80:24:80:24 | [b (line 77): true] access to local variable s | Assert.cs:80:29:80:32 | [b (line 77): true] null |  |
+| Assert.cs:80:24:80:32 | [b (line 77): false] ... != ... | Assert.cs:80:24:80:37 | [true] ... \|\| ... | true |
+| Assert.cs:80:24:80:32 | [b (line 77): false] ... != ... | Assert.cs:80:37:80:37 | [b (line 77): false] access to parameter b | false |
+| Assert.cs:80:24:80:32 | [b (line 77): true] ... != ... | Assert.cs:80:24:80:37 | [true] ... \|\| ... | true |
+| Assert.cs:80:24:80:32 | [b (line 77): true] ... != ... | Assert.cs:80:37:80:37 | [b (line 77): true] access to parameter b | false |
+| Assert.cs:80:24:80:37 | [false] ... \|\| ... | Assert.cs:80:9:80:38 | [assertion success] call to method IsFalse | false |
+| Assert.cs:80:24:80:37 | [true] ... \|\| ... | Assert.cs:80:9:80:38 | [assertion failure] call to method IsFalse | true |
+| Assert.cs:80:29:80:32 | [b (line 77): false] null | Assert.cs:80:24:80:32 | [b (line 77): false] ... != ... |  |
+| Assert.cs:80:29:80:32 | [b (line 77): true] null | Assert.cs:80:24:80:32 | [b (line 77): true] ... != ... |  |
+| Assert.cs:80:37:80:37 | [b (line 77): false] access to parameter b | Assert.cs:80:24:80:37 | [false] ... \|\| ... | false |
+| Assert.cs:80:37:80:37 | [b (line 77): true] access to parameter b | Assert.cs:80:24:80:37 | [true] ... \|\| ... | true |
+| Assert.cs:81:9:81:35 | call to method WriteLine | Assert.cs:77:10:77:12 | exit M11 (normal) |  |
+| Assert.cs:81:9:81:36 | ...; | Assert.cs:81:27:81:27 | access to local variable s |  |
+| Assert.cs:81:27:81:27 | access to local variable s | Assert.cs:81:27:81:34 | access to property Length |  |
+| Assert.cs:81:27:81:34 | access to property Length | Assert.cs:81:9:81:35 | call to method WriteLine |  |
+| Assert.cs:84:10:84:12 | enter M12 | Assert.cs:85:5:129:5 | {...} |  |
+| Assert.cs:84:10:84:12 | exit M12 (abnormal) | Assert.cs:84:10:84:12 | exit M12 |  |
+| Assert.cs:84:10:84:12 | exit M12 (normal) | Assert.cs:84:10:84:12 | exit M12 |  |
+| Assert.cs:85:5:129:5 | {...} | Assert.cs:86:9:86:33 | ... ...; |  |
+| Assert.cs:86:9:86:33 | ... ...; | Assert.cs:86:20:86:20 | access to parameter b |  |
+| Assert.cs:86:16:86:32 | [b (line 84): false] String s = ... | Assert.cs:87:9:87:32 | [b (line 84): false] ...; |  |
+| Assert.cs:86:16:86:32 | [b (line 84): true] String s = ... | Assert.cs:87:9:87:32 | [b (line 84): true] ...; |  |
+| Assert.cs:86:20:86:20 | access to parameter b | Assert.cs:86:24:86:27 | [b (line 84): true] null | true |
+| Assert.cs:86:20:86:20 | access to parameter b | Assert.cs:86:31:86:32 | [b (line 84): false] "" | false |
+| Assert.cs:86:20:86:32 | [b (line 84): false] ... ? ... : ... | Assert.cs:86:16:86:32 | [b (line 84): false] String s = ... |  |
+| Assert.cs:86:20:86:32 | [b (line 84): true] ... ? ... : ... | Assert.cs:86:16:86:32 | [b (line 84): true] String s = ... |  |
+| Assert.cs:86:24:86:27 | [b (line 84): true] null | Assert.cs:86:20:86:32 | [b (line 84): true] ... ? ... : ... |  |
+| Assert.cs:86:31:86:32 | [b (line 84): false] "" | Assert.cs:86:20:86:32 | [b (line 84): false] ... ? ... : ... |  |
+| Assert.cs:87:9:87:31 | [assertion failure, b (line 84): false] call to method Assert | Assert.cs:84:10:84:12 | exit M12 (abnormal) | exit |
+| Assert.cs:87:9:87:31 | [assertion failure, b (line 84): true] call to method Assert | Assert.cs:84:10:84:12 | exit M12 (abnormal) | exit |
+| Assert.cs:87:9:87:31 | [assertion success, b (line 84): false] call to method Assert | Assert.cs:88:9:88:36 | [b (line 84): false] ...; |  |
+| Assert.cs:87:9:87:31 | [assertion success, b (line 84): true] call to method Assert | Assert.cs:88:9:88:36 | [b (line 84): true] ...; |  |
+| Assert.cs:87:9:87:32 | [b (line 84): false] ...; | Assert.cs:87:22:87:22 | [b (line 84): false] access to local variable s |  |
+| Assert.cs:87:9:87:32 | [b (line 84): true] ...; | Assert.cs:87:22:87:22 | [b (line 84): true] access to local variable s |  |
+| Assert.cs:87:22:87:22 | [b (line 84): false] access to local variable s | Assert.cs:87:27:87:30 | [b (line 84): false] null |  |
+| Assert.cs:87:22:87:22 | [b (line 84): true] access to local variable s | Assert.cs:87:27:87:30 | [b (line 84): true] null |  |
+| Assert.cs:87:22:87:30 | [b (line 84): false] ... != ... | Assert.cs:87:9:87:31 | [assertion failure, b (line 84): false] call to method Assert | false |
+| Assert.cs:87:22:87:30 | [b (line 84): false] ... != ... | Assert.cs:87:9:87:31 | [assertion success, b (line 84): false] call to method Assert | true |
+| Assert.cs:87:22:87:30 | [b (line 84): true] ... != ... | Assert.cs:87:9:87:31 | [assertion failure, b (line 84): true] call to method Assert | false |
+| Assert.cs:87:22:87:30 | [b (line 84): true] ... != ... | Assert.cs:87:9:87:31 | [assertion success, b (line 84): true] call to method Assert | true |
+| Assert.cs:87:27:87:30 | [b (line 84): false] null | Assert.cs:87:22:87:30 | [b (line 84): false] ... != ... |  |
+| Assert.cs:87:27:87:30 | [b (line 84): true] null | Assert.cs:87:22:87:30 | [b (line 84): true] ... != ... |  |
+| Assert.cs:88:9:88:35 | [b (line 84): false] call to method WriteLine | Assert.cs:90:9:90:26 | [b (line 84): false] ...; |  |
+| Assert.cs:88:9:88:35 | [b (line 84): true] call to method WriteLine | Assert.cs:90:9:90:26 | [b (line 84): true] ...; |  |
+| Assert.cs:88:9:88:36 | [b (line 84): false] ...; | Assert.cs:88:27:88:27 | [b (line 84): false] access to local variable s |  |
+| Assert.cs:88:9:88:36 | [b (line 84): true] ...; | Assert.cs:88:27:88:27 | [b (line 84): true] access to local variable s |  |
+| Assert.cs:88:27:88:27 | [b (line 84): false] access to local variable s | Assert.cs:88:27:88:34 | [b (line 84): false] access to property Length |  |
+| Assert.cs:88:27:88:27 | [b (line 84): true] access to local variable s | Assert.cs:88:27:88:34 | [b (line 84): true] access to property Length |  |
+| Assert.cs:88:27:88:34 | [b (line 84): false] access to property Length | Assert.cs:88:9:88:35 | [b (line 84): false] call to method WriteLine |  |
+| Assert.cs:88:27:88:34 | [b (line 84): true] access to property Length | Assert.cs:88:9:88:35 | [b (line 84): true] call to method WriteLine |  |
+| Assert.cs:90:9:90:25 | [b (line 84): false] ... = ... | Assert.cs:91:9:91:25 | [b (line 84): false] ...; |  |
+| Assert.cs:90:9:90:25 | [b (line 84): true] ... = ... | Assert.cs:91:9:91:25 | [b (line 84): true] ...; |  |
+| Assert.cs:90:9:90:26 | [b (line 84): false] ...; | Assert.cs:90:13:90:13 | [b (line 84): false] access to parameter b |  |
+| Assert.cs:90:9:90:26 | [b (line 84): true] ...; | Assert.cs:90:13:90:13 | [b (line 84): true] access to parameter b |  |
+| Assert.cs:90:13:90:13 | [b (line 84): false] access to parameter b | Assert.cs:90:24:90:25 | [b (line 84): false] "" | false |
+| Assert.cs:90:13:90:13 | [b (line 84): true] access to parameter b | Assert.cs:90:17:90:20 | [b (line 84): true] null | true |
+| Assert.cs:90:13:90:25 | [b (line 84): false] ... ? ... : ... | Assert.cs:90:9:90:25 | [b (line 84): false] ... = ... |  |
+| Assert.cs:90:13:90:25 | [b (line 84): true] ... ? ... : ... | Assert.cs:90:9:90:25 | [b (line 84): true] ... = ... |  |
+| Assert.cs:90:17:90:20 | [b (line 84): true] null | Assert.cs:90:13:90:25 | [b (line 84): true] ... ? ... : ... |  |
+| Assert.cs:90:24:90:25 | [b (line 84): false] "" | Assert.cs:90:13:90:25 | [b (line 84): false] ... ? ... : ... |  |
+| Assert.cs:91:9:91:24 | [assertion failure, b (line 84): false] call to method IsNull | Assert.cs:84:10:84:12 | exit M12 (abnormal) | exception(AssertFailedException) |
+| Assert.cs:91:9:91:24 | [assertion failure, b (line 84): true] call to method IsNull | Assert.cs:84:10:84:12 | exit M12 (abnormal) | exception(AssertFailedException) |
+| Assert.cs:91:9:91:24 | [assertion success, b (line 84): false] call to method IsNull | Assert.cs:92:9:92:36 | [b (line 84): false] ...; |  |
+| Assert.cs:91:9:91:24 | [assertion success, b (line 84): true] call to method IsNull | Assert.cs:92:9:92:36 | [b (line 84): true] ...; |  |
+| Assert.cs:91:9:91:25 | [b (line 84): false] ...; | Assert.cs:91:23:91:23 | [b (line 84): false] access to local variable s |  |
+| Assert.cs:91:9:91:25 | [b (line 84): true] ...; | Assert.cs:91:23:91:23 | [b (line 84): true] access to local variable s |  |
+| Assert.cs:91:23:91:23 | [b (line 84): false] access to local variable s | Assert.cs:91:9:91:24 | [assertion failure, b (line 84): false] call to method IsNull | non-null |
+| Assert.cs:91:23:91:23 | [b (line 84): false] access to local variable s | Assert.cs:91:9:91:24 | [assertion success, b (line 84): false] call to method IsNull | null |
+| Assert.cs:91:23:91:23 | [b (line 84): true] access to local variable s | Assert.cs:91:9:91:24 | [assertion failure, b (line 84): true] call to method IsNull | non-null |
+| Assert.cs:91:23:91:23 | [b (line 84): true] access to local variable s | Assert.cs:91:9:91:24 | [assertion success, b (line 84): true] call to method IsNull | null |
+| Assert.cs:92:9:92:35 | [b (line 84): false] call to method WriteLine | Assert.cs:94:9:94:26 | [b (line 84): false] ...; |  |
+| Assert.cs:92:9:92:35 | [b (line 84): true] call to method WriteLine | Assert.cs:94:9:94:26 | [b (line 84): true] ...; |  |
+| Assert.cs:92:9:92:36 | [b (line 84): false] ...; | Assert.cs:92:27:92:27 | [b (line 84): false] access to local variable s |  |
+| Assert.cs:92:9:92:36 | [b (line 84): true] ...; | Assert.cs:92:27:92:27 | [b (line 84): true] access to local variable s |  |
+| Assert.cs:92:27:92:27 | [b (line 84): false] access to local variable s | Assert.cs:92:27:92:34 | [b (line 84): false] access to property Length |  |
+| Assert.cs:92:27:92:27 | [b (line 84): true] access to local variable s | Assert.cs:92:27:92:34 | [b (line 84): true] access to property Length |  |
+| Assert.cs:92:27:92:34 | [b (line 84): false] access to property Length | Assert.cs:92:9:92:35 | [b (line 84): false] call to method WriteLine |  |
+| Assert.cs:92:27:92:34 | [b (line 84): true] access to property Length | Assert.cs:92:9:92:35 | [b (line 84): true] call to method WriteLine |  |
+| Assert.cs:94:9:94:25 | [b (line 84): false] ... = ... | Assert.cs:95:9:95:28 | [b (line 84): false] ...; |  |
+| Assert.cs:94:9:94:25 | [b (line 84): true] ... = ... | Assert.cs:95:9:95:28 | [b (line 84): true] ...; |  |
+| Assert.cs:94:9:94:26 | [b (line 84): false] ...; | Assert.cs:94:13:94:13 | [b (line 84): false] access to parameter b |  |
+| Assert.cs:94:9:94:26 | [b (line 84): true] ...; | Assert.cs:94:13:94:13 | [b (line 84): true] access to parameter b |  |
+| Assert.cs:94:13:94:13 | [b (line 84): false] access to parameter b | Assert.cs:94:24:94:25 | [b (line 84): false] "" | false |
+| Assert.cs:94:13:94:13 | [b (line 84): true] access to parameter b | Assert.cs:94:17:94:20 | [b (line 84): true] null | true |
+| Assert.cs:94:13:94:25 | [b (line 84): false] ... ? ... : ... | Assert.cs:94:9:94:25 | [b (line 84): false] ... = ... |  |
+| Assert.cs:94:13:94:25 | [b (line 84): true] ... ? ... : ... | Assert.cs:94:9:94:25 | [b (line 84): true] ... = ... |  |
+| Assert.cs:94:17:94:20 | [b (line 84): true] null | Assert.cs:94:13:94:25 | [b (line 84): true] ... ? ... : ... |  |
+| Assert.cs:94:24:94:25 | [b (line 84): false] "" | Assert.cs:94:13:94:25 | [b (line 84): false] ... ? ... : ... |  |
+| Assert.cs:95:9:95:27 | [assertion failure, b (line 84): false] call to method IsNotNull | Assert.cs:84:10:84:12 | exit M12 (abnormal) | exception(AssertFailedException) |
+| Assert.cs:95:9:95:27 | [assertion failure, b (line 84): true] call to method IsNotNull | Assert.cs:84:10:84:12 | exit M12 (abnormal) | exception(AssertFailedException) |
+| Assert.cs:95:9:95:27 | [assertion success, b (line 84): false] call to method IsNotNull | Assert.cs:96:9:96:36 | [b (line 84): false] ...; |  |
+| Assert.cs:95:9:95:27 | [assertion success, b (line 84): true] call to method IsNotNull | Assert.cs:96:9:96:36 | [b (line 84): true] ...; |  |
+| Assert.cs:95:9:95:28 | [b (line 84): false] ...; | Assert.cs:95:26:95:26 | [b (line 84): false] access to local variable s |  |
+| Assert.cs:95:9:95:28 | [b (line 84): true] ...; | Assert.cs:95:26:95:26 | [b (line 84): true] access to local variable s |  |
+| Assert.cs:95:26:95:26 | [b (line 84): false] access to local variable s | Assert.cs:95:9:95:27 | [assertion failure, b (line 84): false] call to method IsNotNull | null |
+| Assert.cs:95:26:95:26 | [b (line 84): false] access to local variable s | Assert.cs:95:9:95:27 | [assertion success, b (line 84): false] call to method IsNotNull | non-null |
+| Assert.cs:95:26:95:26 | [b (line 84): true] access to local variable s | Assert.cs:95:9:95:27 | [assertion failure, b (line 84): true] call to method IsNotNull | null |
+| Assert.cs:95:26:95:26 | [b (line 84): true] access to local variable s | Assert.cs:95:9:95:27 | [assertion success, b (line 84): true] call to method IsNotNull | non-null |
+| Assert.cs:96:9:96:35 | [b (line 84): false] call to method WriteLine | Assert.cs:98:9:98:26 | [b (line 84): false] ...; |  |
+| Assert.cs:96:9:96:35 | [b (line 84): true] call to method WriteLine | Assert.cs:98:9:98:26 | [b (line 84): true] ...; |  |
+| Assert.cs:96:9:96:36 | [b (line 84): false] ...; | Assert.cs:96:27:96:27 | [b (line 84): false] access to local variable s |  |
+| Assert.cs:96:9:96:36 | [b (line 84): true] ...; | Assert.cs:96:27:96:27 | [b (line 84): true] access to local variable s |  |
+| Assert.cs:96:27:96:27 | [b (line 84): false] access to local variable s | Assert.cs:96:27:96:34 | [b (line 84): false] access to property Length |  |
+| Assert.cs:96:27:96:27 | [b (line 84): true] access to local variable s | Assert.cs:96:27:96:34 | [b (line 84): true] access to property Length |  |
+| Assert.cs:96:27:96:34 | [b (line 84): false] access to property Length | Assert.cs:96:9:96:35 | [b (line 84): false] call to method WriteLine |  |
+| Assert.cs:96:27:96:34 | [b (line 84): true] access to property Length | Assert.cs:96:9:96:35 | [b (line 84): true] call to method WriteLine |  |
+| Assert.cs:98:9:98:25 | [b (line 84): false] ... = ... | Assert.cs:99:9:99:33 | [b (line 84): false] ...; |  |
+| Assert.cs:98:9:98:25 | [b (line 84): true] ... = ... | Assert.cs:99:9:99:33 | [b (line 84): true] ...; |  |
+| Assert.cs:98:9:98:26 | [b (line 84): false] ...; | Assert.cs:98:13:98:13 | [b (line 84): false] access to parameter b |  |
+| Assert.cs:98:9:98:26 | [b (line 84): true] ...; | Assert.cs:98:13:98:13 | [b (line 84): true] access to parameter b |  |
+| Assert.cs:98:13:98:13 | [b (line 84): false] access to parameter b | Assert.cs:98:24:98:25 | [b (line 84): false] "" | false |
+| Assert.cs:98:13:98:13 | [b (line 84): true] access to parameter b | Assert.cs:98:17:98:20 | [b (line 84): true] null | true |
+| Assert.cs:98:13:98:25 | [b (line 84): false] ... ? ... : ... | Assert.cs:98:9:98:25 | [b (line 84): false] ... = ... |  |
+| Assert.cs:98:13:98:25 | [b (line 84): true] ... ? ... : ... | Assert.cs:98:9:98:25 | [b (line 84): true] ... = ... |  |
+| Assert.cs:98:17:98:20 | [b (line 84): true] null | Assert.cs:98:13:98:25 | [b (line 84): true] ... ? ... : ... |  |
+| Assert.cs:98:24:98:25 | [b (line 84): false] "" | Assert.cs:98:13:98:25 | [b (line 84): false] ... ? ... : ... |  |
+| Assert.cs:99:9:99:32 | [assertion failure, b (line 84): false] call to method IsTrue | Assert.cs:84:10:84:12 | exit M12 (abnormal) | exception(AssertFailedException) |
+| Assert.cs:99:9:99:32 | [assertion failure, b (line 84): true] call to method IsTrue | Assert.cs:84:10:84:12 | exit M12 (abnormal) | exception(AssertFailedException) |
+| Assert.cs:99:9:99:32 | [assertion success, b (line 84): false] call to method IsTrue | Assert.cs:100:9:100:36 | [b (line 84): false] ...; |  |
+| Assert.cs:99:9:99:32 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:100:9:100:36 | [b (line 84): true] ...; |  |
+| Assert.cs:99:9:99:33 | [b (line 84): false] ...; | Assert.cs:99:23:99:23 | [b (line 84): false] access to local variable s |  |
+| Assert.cs:99:9:99:33 | [b (line 84): true] ...; | Assert.cs:99:23:99:23 | [b (line 84): true] access to local variable s |  |
+| Assert.cs:99:23:99:23 | [b (line 84): false] access to local variable s | Assert.cs:99:28:99:31 | [b (line 84): false] null |  |
+| Assert.cs:99:23:99:23 | [b (line 84): true] access to local variable s | Assert.cs:99:28:99:31 | [b (line 84): true] null |  |
+| Assert.cs:99:23:99:31 | [b (line 84): false] ... == ... | Assert.cs:99:9:99:32 | [assertion failure, b (line 84): false] call to method IsTrue | false |
+| Assert.cs:99:23:99:31 | [b (line 84): false] ... == ... | Assert.cs:99:9:99:32 | [assertion success, b (line 84): false] call to method IsTrue | true |
+| Assert.cs:99:23:99:31 | [b (line 84): true] ... == ... | Assert.cs:99:9:99:32 | [assertion failure, b (line 84): true] call to method IsTrue | false |
+| Assert.cs:99:23:99:31 | [b (line 84): true] ... == ... | Assert.cs:99:9:99:32 | [assertion success, b (line 84): true] call to method IsTrue | true |
+| Assert.cs:99:28:99:31 | [b (line 84): false] null | Assert.cs:99:23:99:31 | [b (line 84): false] ... == ... |  |
+| Assert.cs:99:28:99:31 | [b (line 84): true] null | Assert.cs:99:23:99:31 | [b (line 84): true] ... == ... |  |
+| Assert.cs:100:9:100:35 | [b (line 84): false] call to method WriteLine | Assert.cs:102:9:102:26 | [b (line 84): false] ...; |  |
+| Assert.cs:100:9:100:35 | [b (line 84): true] call to method WriteLine | Assert.cs:102:9:102:26 | [b (line 84): true] ...; |  |
+| Assert.cs:100:9:100:36 | [b (line 84): false] ...; | Assert.cs:100:27:100:27 | [b (line 84): false] access to local variable s |  |
+| Assert.cs:100:9:100:36 | [b (line 84): true] ...; | Assert.cs:100:27:100:27 | [b (line 84): true] access to local variable s |  |
+| Assert.cs:100:27:100:27 | [b (line 84): false] access to local variable s | Assert.cs:100:27:100:34 | [b (line 84): false] access to property Length |  |
+| Assert.cs:100:27:100:27 | [b (line 84): true] access to local variable s | Assert.cs:100:27:100:34 | [b (line 84): true] access to property Length |  |
+| Assert.cs:100:27:100:34 | [b (line 84): false] access to property Length | Assert.cs:100:9:100:35 | [b (line 84): false] call to method WriteLine |  |
+| Assert.cs:100:27:100:34 | [b (line 84): true] access to property Length | Assert.cs:100:9:100:35 | [b (line 84): true] call to method WriteLine |  |
+| Assert.cs:102:9:102:25 | [b (line 84): false] ... = ... | Assert.cs:103:9:103:33 | [b (line 84): false] ...; |  |
+| Assert.cs:102:9:102:25 | [b (line 84): true] ... = ... | Assert.cs:103:9:103:33 | [b (line 84): true] ...; |  |
+| Assert.cs:102:9:102:26 | [b (line 84): false] ...; | Assert.cs:102:13:102:13 | [b (line 84): false] access to parameter b |  |
+| Assert.cs:102:9:102:26 | [b (line 84): true] ...; | Assert.cs:102:13:102:13 | [b (line 84): true] access to parameter b |  |
+| Assert.cs:102:13:102:13 | [b (line 84): false] access to parameter b | Assert.cs:102:24:102:25 | [b (line 84): false] "" | false |
+| Assert.cs:102:13:102:13 | [b (line 84): true] access to parameter b | Assert.cs:102:17:102:20 | [b (line 84): true] null | true |
+| Assert.cs:102:13:102:25 | [b (line 84): false] ... ? ... : ... | Assert.cs:102:9:102:25 | [b (line 84): false] ... = ... |  |
+| Assert.cs:102:13:102:25 | [b (line 84): true] ... ? ... : ... | Assert.cs:102:9:102:25 | [b (line 84): true] ... = ... |  |
+| Assert.cs:102:17:102:20 | [b (line 84): true] null | Assert.cs:102:13:102:25 | [b (line 84): true] ... ? ... : ... |  |
+| Assert.cs:102:24:102:25 | [b (line 84): false] "" | Assert.cs:102:13:102:25 | [b (line 84): false] ... ? ... : ... |  |
+| Assert.cs:103:9:103:32 | [assertion failure, b (line 84): false] call to method IsTrue | Assert.cs:84:10:84:12 | exit M12 (abnormal) | exception(AssertFailedException) |
+| Assert.cs:103:9:103:32 | [assertion failure, b (line 84): true] call to method IsTrue | Assert.cs:84:10:84:12 | exit M12 (abnormal) | exception(AssertFailedException) |
+| Assert.cs:103:9:103:32 | [assertion success, b (line 84): false] call to method IsTrue | Assert.cs:104:9:104:36 | [b (line 84): false] ...; |  |
+| Assert.cs:103:9:103:32 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:104:9:104:36 | [b (line 84): true] ...; |  |
+| Assert.cs:103:9:103:33 | [b (line 84): false] ...; | Assert.cs:103:23:103:23 | [b (line 84): false] access to local variable s |  |
+| Assert.cs:103:9:103:33 | [b (line 84): true] ...; | Assert.cs:103:23:103:23 | [b (line 84): true] access to local variable s |  |
+| Assert.cs:103:23:103:23 | [b (line 84): false] access to local variable s | Assert.cs:103:28:103:31 | [b (line 84): false] null |  |
+| Assert.cs:103:23:103:23 | [b (line 84): true] access to local variable s | Assert.cs:103:28:103:31 | [b (line 84): true] null |  |
+| Assert.cs:103:23:103:31 | [b (line 84): false] ... != ... | Assert.cs:103:9:103:32 | [assertion failure, b (line 84): false] call to method IsTrue | false |
+| Assert.cs:103:23:103:31 | [b (line 84): false] ... != ... | Assert.cs:103:9:103:32 | [assertion success, b (line 84): false] call to method IsTrue | true |
+| Assert.cs:103:23:103:31 | [b (line 84): true] ... != ... | Assert.cs:103:9:103:32 | [assertion failure, b (line 84): true] call to method IsTrue | false |
+| Assert.cs:103:23:103:31 | [b (line 84): true] ... != ... | Assert.cs:103:9:103:32 | [assertion success, b (line 84): true] call to method IsTrue | true |
+| Assert.cs:103:28:103:31 | [b (line 84): false] null | Assert.cs:103:23:103:31 | [b (line 84): false] ... != ... |  |
+| Assert.cs:103:28:103:31 | [b (line 84): true] null | Assert.cs:103:23:103:31 | [b (line 84): true] ... != ... |  |
+| Assert.cs:104:9:104:35 | [b (line 84): false] call to method WriteLine | Assert.cs:106:9:106:26 | [b (line 84): false] ...; |  |
+| Assert.cs:104:9:104:35 | [b (line 84): true] call to method WriteLine | Assert.cs:106:9:106:26 | [b (line 84): true] ...; |  |
+| Assert.cs:104:9:104:36 | [b (line 84): false] ...; | Assert.cs:104:27:104:27 | [b (line 84): false] access to local variable s |  |
+| Assert.cs:104:9:104:36 | [b (line 84): true] ...; | Assert.cs:104:27:104:27 | [b (line 84): true] access to local variable s |  |
+| Assert.cs:104:27:104:27 | [b (line 84): false] access to local variable s | Assert.cs:104:27:104:34 | [b (line 84): false] access to property Length |  |
+| Assert.cs:104:27:104:27 | [b (line 84): true] access to local variable s | Assert.cs:104:27:104:34 | [b (line 84): true] access to property Length |  |
+| Assert.cs:104:27:104:34 | [b (line 84): false] access to property Length | Assert.cs:104:9:104:35 | [b (line 84): false] call to method WriteLine |  |
+| Assert.cs:104:27:104:34 | [b (line 84): true] access to property Length | Assert.cs:104:9:104:35 | [b (line 84): true] call to method WriteLine |  |
+| Assert.cs:106:9:106:25 | [b (line 84): false] ... = ... | Assert.cs:107:9:107:34 | [b (line 84): false] ...; |  |
+| Assert.cs:106:9:106:25 | [b (line 84): true] ... = ... | Assert.cs:107:9:107:34 | [b (line 84): true] ...; |  |
+| Assert.cs:106:9:106:26 | [b (line 84): false] ...; | Assert.cs:106:13:106:13 | [b (line 84): false] access to parameter b |  |
+| Assert.cs:106:9:106:26 | [b (line 84): true] ...; | Assert.cs:106:13:106:13 | [b (line 84): true] access to parameter b |  |
+| Assert.cs:106:13:106:13 | [b (line 84): false] access to parameter b | Assert.cs:106:24:106:25 | [b (line 84): false] "" | false |
+| Assert.cs:106:13:106:13 | [b (line 84): true] access to parameter b | Assert.cs:106:17:106:20 | [b (line 84): true] null | true |
+| Assert.cs:106:13:106:25 | [b (line 84): false] ... ? ... : ... | Assert.cs:106:9:106:25 | [b (line 84): false] ... = ... |  |
+| Assert.cs:106:13:106:25 | [b (line 84): true] ... ? ... : ... | Assert.cs:106:9:106:25 | [b (line 84): true] ... = ... |  |
+| Assert.cs:106:17:106:20 | [b (line 84): true] null | Assert.cs:106:13:106:25 | [b (line 84): true] ... ? ... : ... |  |
+| Assert.cs:106:24:106:25 | [b (line 84): false] "" | Assert.cs:106:13:106:25 | [b (line 84): false] ... ? ... : ... |  |
+| Assert.cs:107:9:107:33 | [assertion failure, b (line 84): false] call to method IsFalse | Assert.cs:84:10:84:12 | exit M12 (abnormal) | exception(AssertFailedException) |
+| Assert.cs:107:9:107:33 | [assertion failure, b (line 84): true] call to method IsFalse | Assert.cs:84:10:84:12 | exit M12 (abnormal) | exception(AssertFailedException) |
+| Assert.cs:107:9:107:33 | [assertion success, b (line 84): false] call to method IsFalse | Assert.cs:108:9:108:36 | [b (line 84): false] ...; |  |
+| Assert.cs:107:9:107:33 | [assertion success, b (line 84): true] call to method IsFalse | Assert.cs:108:9:108:36 | [b (line 84): true] ...; |  |
+| Assert.cs:107:9:107:34 | [b (line 84): false] ...; | Assert.cs:107:24:107:24 | [b (line 84): false] access to local variable s |  |
+| Assert.cs:107:9:107:34 | [b (line 84): true] ...; | Assert.cs:107:24:107:24 | [b (line 84): true] access to local variable s |  |
+| Assert.cs:107:24:107:24 | [b (line 84): false] access to local variable s | Assert.cs:107:29:107:32 | [b (line 84): false] null |  |
+| Assert.cs:107:24:107:24 | [b (line 84): true] access to local variable s | Assert.cs:107:29:107:32 | [b (line 84): true] null |  |
+| Assert.cs:107:24:107:32 | [b (line 84): false] ... != ... | Assert.cs:107:9:107:33 | [assertion failure, b (line 84): false] call to method IsFalse | true |
+| Assert.cs:107:24:107:32 | [b (line 84): false] ... != ... | Assert.cs:107:9:107:33 | [assertion success, b (line 84): false] call to method IsFalse | false |
+| Assert.cs:107:24:107:32 | [b (line 84): true] ... != ... | Assert.cs:107:9:107:33 | [assertion failure, b (line 84): true] call to method IsFalse | true |
+| Assert.cs:107:24:107:32 | [b (line 84): true] ... != ... | Assert.cs:107:9:107:33 | [assertion success, b (line 84): true] call to method IsFalse | false |
+| Assert.cs:107:29:107:32 | [b (line 84): false] null | Assert.cs:107:24:107:32 | [b (line 84): false] ... != ... |  |
+| Assert.cs:107:29:107:32 | [b (line 84): true] null | Assert.cs:107:24:107:32 | [b (line 84): true] ... != ... |  |
+| Assert.cs:108:9:108:35 | [b (line 84): false] call to method WriteLine | Assert.cs:110:9:110:26 | [b (line 84): false] ...; |  |
+| Assert.cs:108:9:108:35 | [b (line 84): true] call to method WriteLine | Assert.cs:110:9:110:26 | [b (line 84): true] ...; |  |
+| Assert.cs:108:9:108:36 | [b (line 84): false] ...; | Assert.cs:108:27:108:27 | [b (line 84): false] access to local variable s |  |
+| Assert.cs:108:9:108:36 | [b (line 84): true] ...; | Assert.cs:108:27:108:27 | [b (line 84): true] access to local variable s |  |
+| Assert.cs:108:27:108:27 | [b (line 84): false] access to local variable s | Assert.cs:108:27:108:34 | [b (line 84): false] access to property Length |  |
+| Assert.cs:108:27:108:27 | [b (line 84): true] access to local variable s | Assert.cs:108:27:108:34 | [b (line 84): true] access to property Length |  |
+| Assert.cs:108:27:108:34 | [b (line 84): false] access to property Length | Assert.cs:108:9:108:35 | [b (line 84): false] call to method WriteLine |  |
+| Assert.cs:108:27:108:34 | [b (line 84): true] access to property Length | Assert.cs:108:9:108:35 | [b (line 84): true] call to method WriteLine |  |
+| Assert.cs:110:9:110:25 | [b (line 84): false] ... = ... | Assert.cs:111:9:111:34 | [b (line 84): false] ...; |  |
+| Assert.cs:110:9:110:25 | [b (line 84): true] ... = ... | Assert.cs:111:9:111:34 | [b (line 84): true] ...; |  |
+| Assert.cs:110:9:110:26 | [b (line 84): false] ...; | Assert.cs:110:13:110:13 | [b (line 84): false] access to parameter b |  |
+| Assert.cs:110:9:110:26 | [b (line 84): true] ...; | Assert.cs:110:13:110:13 | [b (line 84): true] access to parameter b |  |
+| Assert.cs:110:13:110:13 | [b (line 84): false] access to parameter b | Assert.cs:110:24:110:25 | [b (line 84): false] "" | false |
+| Assert.cs:110:13:110:13 | [b (line 84): true] access to parameter b | Assert.cs:110:17:110:20 | [b (line 84): true] null | true |
+| Assert.cs:110:13:110:25 | [b (line 84): false] ... ? ... : ... | Assert.cs:110:9:110:25 | [b (line 84): false] ... = ... |  |
+| Assert.cs:110:13:110:25 | [b (line 84): true] ... ? ... : ... | Assert.cs:110:9:110:25 | [b (line 84): true] ... = ... |  |
+| Assert.cs:110:17:110:20 | [b (line 84): true] null | Assert.cs:110:13:110:25 | [b (line 84): true] ... ? ... : ... |  |
+| Assert.cs:110:24:110:25 | [b (line 84): false] "" | Assert.cs:110:13:110:25 | [b (line 84): false] ... ? ... : ... |  |
+| Assert.cs:111:9:111:33 | [assertion failure, b (line 84): false] call to method IsFalse | Assert.cs:84:10:84:12 | exit M12 (abnormal) | exception(AssertFailedException) |
+| Assert.cs:111:9:111:33 | [assertion failure, b (line 84): true] call to method IsFalse | Assert.cs:84:10:84:12 | exit M12 (abnormal) | exception(AssertFailedException) |
+| Assert.cs:111:9:111:33 | [assertion success, b (line 84): false] call to method IsFalse | Assert.cs:112:9:112:36 | [b (line 84): false] ...; |  |
+| Assert.cs:111:9:111:33 | [assertion success, b (line 84): true] call to method IsFalse | Assert.cs:112:9:112:36 | [b (line 84): true] ...; |  |
+| Assert.cs:111:9:111:34 | [b (line 84): false] ...; | Assert.cs:111:24:111:24 | [b (line 84): false] access to local variable s |  |
+| Assert.cs:111:9:111:34 | [b (line 84): true] ...; | Assert.cs:111:24:111:24 | [b (line 84): true] access to local variable s |  |
+| Assert.cs:111:24:111:24 | [b (line 84): false] access to local variable s | Assert.cs:111:29:111:32 | [b (line 84): false] null |  |
+| Assert.cs:111:24:111:24 | [b (line 84): true] access to local variable s | Assert.cs:111:29:111:32 | [b (line 84): true] null |  |
+| Assert.cs:111:24:111:32 | [b (line 84): false] ... == ... | Assert.cs:111:9:111:33 | [assertion failure, b (line 84): false] call to method IsFalse | true |
+| Assert.cs:111:24:111:32 | [b (line 84): false] ... == ... | Assert.cs:111:9:111:33 | [assertion success, b (line 84): false] call to method IsFalse | false |
+| Assert.cs:111:24:111:32 | [b (line 84): true] ... == ... | Assert.cs:111:9:111:33 | [assertion failure, b (line 84): true] call to method IsFalse | true |
+| Assert.cs:111:24:111:32 | [b (line 84): true] ... == ... | Assert.cs:111:9:111:33 | [assertion success, b (line 84): true] call to method IsFalse | false |
+| Assert.cs:111:29:111:32 | [b (line 84): false] null | Assert.cs:111:24:111:32 | [b (line 84): false] ... == ... |  |
+| Assert.cs:111:29:111:32 | [b (line 84): true] null | Assert.cs:111:24:111:32 | [b (line 84): true] ... == ... |  |
+| Assert.cs:112:9:112:35 | [b (line 84): false] call to method WriteLine | Assert.cs:114:9:114:26 | [b (line 84): false] ...; |  |
+| Assert.cs:112:9:112:35 | [b (line 84): true] call to method WriteLine | Assert.cs:114:9:114:26 | [b (line 84): true] ...; |  |
+| Assert.cs:112:9:112:36 | [b (line 84): false] ...; | Assert.cs:112:27:112:27 | [b (line 84): false] access to local variable s |  |
+| Assert.cs:112:9:112:36 | [b (line 84): true] ...; | Assert.cs:112:27:112:27 | [b (line 84): true] access to local variable s |  |
+| Assert.cs:112:27:112:27 | [b (line 84): false] access to local variable s | Assert.cs:112:27:112:34 | [b (line 84): false] access to property Length |  |
+| Assert.cs:112:27:112:27 | [b (line 84): true] access to local variable s | Assert.cs:112:27:112:34 | [b (line 84): true] access to property Length |  |
+| Assert.cs:112:27:112:34 | [b (line 84): false] access to property Length | Assert.cs:112:9:112:35 | [b (line 84): false] call to method WriteLine |  |
+| Assert.cs:112:27:112:34 | [b (line 84): true] access to property Length | Assert.cs:112:9:112:35 | [b (line 84): true] call to method WriteLine |  |
+| Assert.cs:114:9:114:25 | [b (line 84): false] ... = ... | Assert.cs:115:9:115:38 | [b (line 84): false] ...; |  |
+| Assert.cs:114:9:114:25 | [b (line 84): true] ... = ... | Assert.cs:115:9:115:38 | [b (line 84): true] ...; |  |
+| Assert.cs:114:9:114:26 | [b (line 84): false] ...; | Assert.cs:114:13:114:13 | [b (line 84): false] access to parameter b |  |
+| Assert.cs:114:9:114:26 | [b (line 84): true] ...; | Assert.cs:114:13:114:13 | [b (line 84): true] access to parameter b |  |
+| Assert.cs:114:13:114:13 | [b (line 84): false] access to parameter b | Assert.cs:114:24:114:25 | [b (line 84): false] "" | false |
+| Assert.cs:114:13:114:13 | [b (line 84): true] access to parameter b | Assert.cs:114:17:114:20 | [b (line 84): true] null | true |
+| Assert.cs:114:13:114:25 | [b (line 84): false] ... ? ... : ... | Assert.cs:114:9:114:25 | [b (line 84): false] ... = ... |  |
+| Assert.cs:114:13:114:25 | [b (line 84): true] ... ? ... : ... | Assert.cs:114:9:114:25 | [b (line 84): true] ... = ... |  |
+| Assert.cs:114:17:114:20 | [b (line 84): true] null | Assert.cs:114:13:114:25 | [b (line 84): true] ... ? ... : ... |  |
+| Assert.cs:114:24:114:25 | [b (line 84): false] "" | Assert.cs:114:13:114:25 | [b (line 84): false] ... ? ... : ... |  |
+| Assert.cs:115:9:115:37 | [assertion failure, b (line 84): false] call to method IsTrue | Assert.cs:84:10:84:12 | exit M12 (abnormal) | exception(AssertFailedException) |
+| Assert.cs:115:9:115:37 | [assertion failure, b (line 84): true] call to method IsTrue | Assert.cs:84:10:84:12 | exit M12 (abnormal) | exception(AssertFailedException) |
+| Assert.cs:115:9:115:37 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:116:9:116:36 | [b (line 84): true] ...; |  |
+| Assert.cs:115:9:115:38 | [b (line 84): false] ...; | Assert.cs:115:23:115:23 | [b (line 84): false] access to local variable s |  |
+| Assert.cs:115:9:115:38 | [b (line 84): true] ...; | Assert.cs:115:23:115:23 | [b (line 84): true] access to local variable s |  |
+| Assert.cs:115:23:115:23 | [b (line 84): false] access to local variable s | Assert.cs:115:28:115:31 | [b (line 84): false] null |  |
+| Assert.cs:115:23:115:23 | [b (line 84): true] access to local variable s | Assert.cs:115:28:115:31 | [b (line 84): true] null |  |
+| Assert.cs:115:23:115:31 | [b (line 84): false] ... != ... | Assert.cs:115:23:115:36 | [false, b (line 84): false] ... && ... | false |
+| Assert.cs:115:23:115:31 | [b (line 84): false] ... != ... | Assert.cs:115:36:115:36 | [b (line 84): false] access to parameter b | true |
+| Assert.cs:115:23:115:31 | [b (line 84): true] ... != ... | Assert.cs:115:23:115:36 | [false, b (line 84): true] ... && ... | false |
+| Assert.cs:115:23:115:31 | [b (line 84): true] ... != ... | Assert.cs:115:36:115:36 | [b (line 84): true] access to parameter b | true |
+| Assert.cs:115:23:115:36 | [false, b (line 84): false] ... && ... | Assert.cs:115:9:115:37 | [assertion failure, b (line 84): false] call to method IsTrue | false |
+| Assert.cs:115:23:115:36 | [false, b (line 84): true] ... && ... | Assert.cs:115:9:115:37 | [assertion failure, b (line 84): true] call to method IsTrue | false |
+| Assert.cs:115:23:115:36 | [true, b (line 84): true] ... && ... | Assert.cs:115:9:115:37 | [assertion success, b (line 84): true] call to method IsTrue | true |
+| Assert.cs:115:28:115:31 | [b (line 84): false] null | Assert.cs:115:23:115:31 | [b (line 84): false] ... != ... |  |
+| Assert.cs:115:28:115:31 | [b (line 84): true] null | Assert.cs:115:23:115:31 | [b (line 84): true] ... != ... |  |
+| Assert.cs:115:36:115:36 | [b (line 84): false] access to parameter b | Assert.cs:115:23:115:36 | [false, b (line 84): false] ... && ... | false |
+| Assert.cs:115:36:115:36 | [b (line 84): true] access to parameter b | Assert.cs:115:23:115:36 | [true, b (line 84): true] ... && ... | true |
+| Assert.cs:116:9:116:35 | [b (line 84): true] call to method WriteLine | Assert.cs:118:9:118:26 | [b (line 84): true] ...; |  |
+| Assert.cs:116:9:116:36 | [b (line 84): true] ...; | Assert.cs:116:27:116:27 | [b (line 84): true] access to local variable s |  |
+| Assert.cs:116:27:116:27 | [b (line 84): true] access to local variable s | Assert.cs:116:27:116:34 | [b (line 84): true] access to property Length |  |
+| Assert.cs:116:27:116:34 | [b (line 84): true] access to property Length | Assert.cs:116:9:116:35 | [b (line 84): true] call to method WriteLine |  |
+| Assert.cs:118:9:118:25 | [b (line 84): true] ... = ... | Assert.cs:119:9:119:40 | [b (line 84): true] ...; |  |
+| Assert.cs:118:9:118:26 | [b (line 84): true] ...; | Assert.cs:118:13:118:13 | [b (line 84): true] access to parameter b |  |
+| Assert.cs:118:13:118:13 | [b (line 84): true] access to parameter b | Assert.cs:118:17:118:20 | [b (line 84): true] null | true |
+| Assert.cs:118:13:118:25 | [b (line 84): true] ... ? ... : ... | Assert.cs:118:9:118:25 | [b (line 84): true] ... = ... |  |
+| Assert.cs:118:17:118:20 | [b (line 84): true] null | Assert.cs:118:13:118:25 | [b (line 84): true] ... ? ... : ... |  |
+| Assert.cs:119:9:119:39 | [assertion failure, b (line 84): true] call to method IsFalse | Assert.cs:84:10:84:12 | exit M12 (abnormal) | exception(AssertFailedException) |
+| Assert.cs:119:9:119:39 | [assertion success, b (line 84): true] call to method IsFalse | Assert.cs:120:9:120:36 | [b (line 84): true] ...; |  |
+| Assert.cs:119:9:119:40 | [b (line 84): true] ...; | Assert.cs:119:24:119:24 | [b (line 84): true] access to local variable s |  |
+| Assert.cs:119:24:119:24 | [b (line 84): true] access to local variable s | Assert.cs:119:29:119:32 | [b (line 84): true] null |  |
+| Assert.cs:119:24:119:32 | [b (line 84): true] ... == ... | Assert.cs:119:24:119:38 | [true, b (line 84): true] ... \|\| ... | true |
+| Assert.cs:119:24:119:32 | [b (line 84): true] ... == ... | Assert.cs:119:38:119:38 | [b (line 84): true] access to parameter b | false |
+| Assert.cs:119:24:119:38 | [false, b (line 84): true] ... \|\| ... | Assert.cs:119:9:119:39 | [assertion success, b (line 84): true] call to method IsFalse | false |
+| Assert.cs:119:24:119:38 | [true, b (line 84): true] ... \|\| ... | Assert.cs:119:9:119:39 | [assertion failure, b (line 84): true] call to method IsFalse | true |
+| Assert.cs:119:29:119:32 | [b (line 84): true] null | Assert.cs:119:24:119:32 | [b (line 84): true] ... == ... |  |
+| Assert.cs:119:37:119:38 | [false, b (line 84): true] !... | Assert.cs:119:24:119:38 | [false, b (line 84): true] ... \|\| ... | false |
+| Assert.cs:119:38:119:38 | [b (line 84): true] access to parameter b | Assert.cs:119:37:119:38 | [false, b (line 84): true] !... | true |
+| Assert.cs:120:9:120:35 | [b (line 84): true] call to method WriteLine | Assert.cs:122:9:122:26 | [b (line 84): true] ...; |  |
+| Assert.cs:120:9:120:36 | [b (line 84): true] ...; | Assert.cs:120:27:120:27 | [b (line 84): true] access to local variable s |  |
+| Assert.cs:120:27:120:27 | [b (line 84): true] access to local variable s | Assert.cs:120:27:120:34 | [b (line 84): true] access to property Length |  |
+| Assert.cs:120:27:120:34 | [b (line 84): true] access to property Length | Assert.cs:120:9:120:35 | [b (line 84): true] call to method WriteLine |  |
+| Assert.cs:122:9:122:25 | [b (line 84): true] ... = ... | Assert.cs:123:9:123:38 | [b (line 84): true] ...; |  |
+| Assert.cs:122:9:122:26 | [b (line 84): true] ...; | Assert.cs:122:13:122:13 | [b (line 84): true] access to parameter b |  |
+| Assert.cs:122:13:122:13 | [b (line 84): true] access to parameter b | Assert.cs:122:17:122:20 | [b (line 84): true] null | true |
+| Assert.cs:122:13:122:25 | [b (line 84): true] ... ? ... : ... | Assert.cs:122:9:122:25 | [b (line 84): true] ... = ... |  |
+| Assert.cs:122:17:122:20 | [b (line 84): true] null | Assert.cs:122:13:122:25 | [b (line 84): true] ... ? ... : ... |  |
+| Assert.cs:123:9:123:37 | [assertion failure, b (line 84): true] call to method IsTrue | Assert.cs:84:10:84:12 | exit M12 (abnormal) | exception(AssertFailedException) |
+| Assert.cs:123:9:123:37 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:124:9:124:36 | [b (line 84): true] ...; |  |
+| Assert.cs:123:9:123:38 | [b (line 84): true] ...; | Assert.cs:123:23:123:23 | [b (line 84): true] access to local variable s |  |
+| Assert.cs:123:23:123:23 | [b (line 84): true] access to local variable s | Assert.cs:123:28:123:31 | [b (line 84): true] null |  |
+| Assert.cs:123:23:123:31 | [b (line 84): true] ... == ... | Assert.cs:123:23:123:36 | [false, b (line 84): true] ... && ... | false |
+| Assert.cs:123:23:123:31 | [b (line 84): true] ... == ... | Assert.cs:123:36:123:36 | [b (line 84): true] access to parameter b | true |
+| Assert.cs:123:23:123:36 | [false, b (line 84): true] ... && ... | Assert.cs:123:9:123:37 | [assertion failure, b (line 84): true] call to method IsTrue | false |
+| Assert.cs:123:23:123:36 | [true, b (line 84): true] ... && ... | Assert.cs:123:9:123:37 | [assertion success, b (line 84): true] call to method IsTrue | true |
+| Assert.cs:123:28:123:31 | [b (line 84): true] null | Assert.cs:123:23:123:31 | [b (line 84): true] ... == ... |  |
+| Assert.cs:123:36:123:36 | [b (line 84): true] access to parameter b | Assert.cs:123:23:123:36 | [true, b (line 84): true] ... && ... | true |
+| Assert.cs:124:9:124:35 | [b (line 84): true] call to method WriteLine | Assert.cs:126:9:126:26 | [b (line 84): true] ...; |  |
+| Assert.cs:124:9:124:36 | [b (line 84): true] ...; | Assert.cs:124:27:124:27 | [b (line 84): true] access to local variable s |  |
+| Assert.cs:124:27:124:27 | [b (line 84): true] access to local variable s | Assert.cs:124:27:124:34 | [b (line 84): true] access to property Length |  |
+| Assert.cs:124:27:124:34 | [b (line 84): true] access to property Length | Assert.cs:124:9:124:35 | [b (line 84): true] call to method WriteLine |  |
+| Assert.cs:126:9:126:25 | [b (line 84): true] ... = ... | Assert.cs:127:9:127:40 | [b (line 84): true] ...; |  |
+| Assert.cs:126:9:126:26 | [b (line 84): true] ...; | Assert.cs:126:13:126:13 | [b (line 84): true] access to parameter b |  |
+| Assert.cs:126:13:126:13 | [b (line 84): true] access to parameter b | Assert.cs:126:17:126:20 | [b (line 84): true] null | true |
+| Assert.cs:126:13:126:25 | [b (line 84): true] ... ? ... : ... | Assert.cs:126:9:126:25 | [b (line 84): true] ... = ... |  |
+| Assert.cs:126:17:126:20 | [b (line 84): true] null | Assert.cs:126:13:126:25 | [b (line 84): true] ... ? ... : ... |  |
+| Assert.cs:127:9:127:39 | [assertion failure] call to method IsFalse | Assert.cs:84:10:84:12 | exit M12 (abnormal) | exception(AssertFailedException) |
+| Assert.cs:127:9:127:39 | [assertion success] call to method IsFalse | Assert.cs:128:9:128:36 | ...; |  |
+| Assert.cs:127:9:127:40 | [b (line 84): true] ...; | Assert.cs:127:24:127:24 | [b (line 84): true] access to local variable s |  |
+| Assert.cs:127:24:127:24 | [b (line 84): true] access to local variable s | Assert.cs:127:29:127:32 | [b (line 84): true] null |  |
+| Assert.cs:127:24:127:32 | [b (line 84): true] ... != ... | Assert.cs:127:24:127:38 | [true] ... \|\| ... | true |
+| Assert.cs:127:24:127:32 | [b (line 84): true] ... != ... | Assert.cs:127:38:127:38 | [b (line 84): true] access to parameter b | false |
+| Assert.cs:127:24:127:38 | [false] ... \|\| ... | Assert.cs:127:9:127:39 | [assertion success] call to method IsFalse | false |
+| Assert.cs:127:24:127:38 | [true] ... \|\| ... | Assert.cs:127:9:127:39 | [assertion failure] call to method IsFalse | true |
+| Assert.cs:127:29:127:32 | [b (line 84): true] null | Assert.cs:127:24:127:32 | [b (line 84): true] ... != ... |  |
+| Assert.cs:127:37:127:38 | [false] !... | Assert.cs:127:24:127:38 | [false] ... \|\| ... | false |
+| Assert.cs:127:38:127:38 | [b (line 84): true] access to parameter b | Assert.cs:127:37:127:38 | [false] !... | true |
+| Assert.cs:128:9:128:35 | call to method WriteLine | Assert.cs:84:10:84:12 | exit M12 (normal) |  |
+| Assert.cs:128:9:128:36 | ...; | Assert.cs:128:27:128:27 | access to local variable s |  |
+| Assert.cs:128:27:128:27 | access to local variable s | Assert.cs:128:27:128:34 | access to property Length |  |
+| Assert.cs:128:27:128:34 | access to property Length | Assert.cs:128:9:128:35 | call to method WriteLine |  |
+| Assert.cs:131:18:131:32 | enter AssertTrueFalse | Assert.cs:135:5:136:5 | {...} |  |
+| Assert.cs:131:18:131:32 | exit AssertTrueFalse (normal) | Assert.cs:131:18:131:32 | exit AssertTrueFalse |  |
+| Assert.cs:135:5:136:5 | {...} | Assert.cs:131:18:131:32 | exit AssertTrueFalse (normal) |  |
+| Assert.cs:138:10:138:12 | enter M13 | Assert.cs:139:5:142:5 | {...} |  |
+| Assert.cs:138:10:138:12 | exit M13 (abnormal) | Assert.cs:138:10:138:12 | exit M13 |  |
+| Assert.cs:138:10:138:12 | exit M13 (normal) | Assert.cs:138:10:138:12 | exit M13 |  |
+| Assert.cs:139:5:142:5 | {...} | Assert.cs:140:9:140:36 | ...; |  |
+| Assert.cs:140:9:140:35 | [assertion failure] call to method AssertTrueFalse | Assert.cs:138:10:138:12 | exit M13 (abnormal) | exception(Exception) |
+| Assert.cs:140:9:140:35 | [assertion failure] call to method AssertTrueFalse | Assert.cs:138:10:138:12 | exit M13 (abnormal) | exception(Exception) |
+| Assert.cs:140:9:140:35 | [assertion success] call to method AssertTrueFalse | Assert.cs:141:9:141:15 | return ...; |  |
+| Assert.cs:140:9:140:35 | this access | Assert.cs:140:25:140:26 | access to parameter b1 |  |
+| Assert.cs:140:9:140:36 | ...; | Assert.cs:140:9:140:35 | this access |  |
+| Assert.cs:140:25:140:26 | access to parameter b1 | Assert.cs:140:29:140:30 | [assertion failure] access to parameter b2 | false |
+| Assert.cs:140:25:140:26 | access to parameter b1 | Assert.cs:140:29:140:30 | access to parameter b2 | true |
+| Assert.cs:140:29:140:30 | [assertion failure] access to parameter b2 | Assert.cs:140:33:140:34 | [assertion failure] access to parameter b3 | false, true |
+| Assert.cs:140:29:140:30 | access to parameter b2 | Assert.cs:140:33:140:34 | [assertion failure] access to parameter b3 | true |
+| Assert.cs:140:29:140:30 | access to parameter b2 | Assert.cs:140:33:140:34 | [assertion success] access to parameter b3 | false |
+| Assert.cs:140:33:140:34 | [assertion failure] access to parameter b3 | Assert.cs:140:9:140:35 | [assertion failure] call to method AssertTrueFalse |  |
+| Assert.cs:140:33:140:34 | [assertion failure] access to parameter b3 | Assert.cs:140:9:140:35 | [assertion failure] call to method AssertTrueFalse |  |
+| Assert.cs:140:33:140:34 | [assertion success] access to parameter b3 | Assert.cs:140:9:140:35 | [assertion success] call to method AssertTrueFalse |  |
+| Assert.cs:141:9:141:15 | return ...; | Assert.cs:138:10:138:12 | exit M13 (normal) | return |
+| Assignments.cs:1:7:1:17 | call to constructor Object | Assignments.cs:1:7:1:17 | {...} |  |
+| Assignments.cs:1:7:1:17 | enter Assignments | Assignments.cs:1:7:1:17 | call to constructor Object |  |
+| Assignments.cs:1:7:1:17 | exit Assignments (normal) | Assignments.cs:1:7:1:17 | exit Assignments |  |
+| Assignments.cs:1:7:1:17 | {...} | Assignments.cs:1:7:1:17 | exit Assignments (normal) |  |
+| Assignments.cs:3:10:3:10 | enter M | Assignments.cs:4:5:15:5 | {...} |  |
+| Assignments.cs:3:10:3:10 | exit M (normal) | Assignments.cs:3:10:3:10 | exit M |  |
+| Assignments.cs:4:5:15:5 | {...} | Assignments.cs:5:9:5:18 | ... ...; |  |
+| Assignments.cs:5:9:5:18 | ... ...; | Assignments.cs:5:17:5:17 | 0 |  |
+| 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: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: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: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: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: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: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) |  |
+| Assignments.cs:14:9:14:36 | ...; | Assignments.cs:14:9:14:13 | this access |  |
+| Assignments.cs:14:18:14:35 | (...) => ... | Assignments.cs:14:9:14:13 | access to event Event |  |
+| Assignments.cs:14:18:14:35 | enter (...) => ... | Assignments.cs:14:33:14:35 | {...} |  |
+| Assignments.cs:14:18:14:35 | exit (...) => ... (normal) | Assignments.cs:14:18:14:35 | exit (...) => ... |  |
+| Assignments.cs:14:33:14:35 | {...} | Assignments.cs:14:18:14:35 | exit (...) => ... (normal) |  |
+| Assignments.cs:17:40:17:40 | enter + | Assignments.cs:18:5:20:5 | {...} |  |
+| Assignments.cs:17:40:17:40 | exit + (normal) | Assignments.cs:17:40:17:40 | exit + |  |
+| Assignments.cs:18:5:20:5 | {...} | Assignments.cs:19:16:19:16 | access to parameter x |  |
+| Assignments.cs:19:9:19:17 | return ...; | Assignments.cs:17:40:17:40 | exit + (normal) | return |
+| Assignments.cs:19:16:19:16 | access to parameter x | Assignments.cs:19:9:19:17 | return ...; |  |
+| BreakInTry.cs:1:7:1:16 | call to constructor Object | BreakInTry.cs:1:7:1:16 | {...} |  |
+| BreakInTry.cs:1:7:1:16 | enter BreakInTry | BreakInTry.cs:1:7:1:16 | call to constructor Object |  |
+| BreakInTry.cs:1:7:1:16 | exit BreakInTry (normal) | BreakInTry.cs:1:7:1:16 | exit BreakInTry |  |
+| BreakInTry.cs:1:7:1:16 | {...} | BreakInTry.cs:1:7:1:16 | exit BreakInTry (normal) |  |
+| BreakInTry.cs:3:10:3:11 | enter M1 | BreakInTry.cs:4:5:18:5 | {...} |  |
+| BreakInTry.cs:3:10:3:11 | exit M1 (normal) | BreakInTry.cs:3:10:3:11 | exit M1 |  |
+| BreakInTry.cs:4:5:18:5 | {...} | BreakInTry.cs:5:9:17:9 | try {...} ... |  |
+| BreakInTry.cs:5:9:17:9 | try {...} ... | BreakInTry.cs:6:9:12:9 | {...} |  |
+| BreakInTry.cs:6:9:12:9 | {...} | BreakInTry.cs:7:33:7:36 | access to parameter args |  |
+| BreakInTry.cs:7:13:11:13 | foreach (... ... in ...) ... | BreakInTry.cs:7:26:7:28 | String arg | non-empty |
+| BreakInTry.cs:7:13:11:13 | foreach (... ... in ...) ... | BreakInTry.cs:14:9:17:9 | {...} | empty |
+| BreakInTry.cs:7:26:7:28 | String arg | BreakInTry.cs:8:13:11:13 | {...} |  |
+| BreakInTry.cs:7:33:7:36 | access to parameter args | BreakInTry.cs:7:13:11:13 | foreach (... ... in ...) ... |  |
+| BreakInTry.cs:8:13:11:13 | {...} | BreakInTry.cs:9:17:10:26 | if (...) ... |  |
+| BreakInTry.cs:9:17:10:26 | if (...) ... | BreakInTry.cs:9:21:9:23 | access to local variable arg |  |
+| BreakInTry.cs:9:21:9:23 | access to local variable arg | BreakInTry.cs:9:28:9:31 | null |  |
+| BreakInTry.cs:9:21:9:31 | ... == ... | BreakInTry.cs:7:13:11:13 | foreach (... ... in ...) ... | false |
+| BreakInTry.cs:9:21:9:31 | ... == ... | BreakInTry.cs:10:21:10:26 | break; | true |
+| BreakInTry.cs:9:28:9:31 | null | BreakInTry.cs:9:21:9:31 | ... == ... |  |
+| BreakInTry.cs:10:21:10:26 | break; | BreakInTry.cs:14:9:17:9 | {...} | break |
+| BreakInTry.cs:14:9:17:9 | {...} | BreakInTry.cs:15:13:16:17 | if (...) ... |  |
+| BreakInTry.cs:15:13:16:17 | if (...) ... | BreakInTry.cs:15:17:15:20 | access to parameter args |  |
+| BreakInTry.cs:15:17:15:20 | access to parameter args | BreakInTry.cs:15:25:15:28 | null |  |
+| BreakInTry.cs:15:17:15:28 | ... == ... | BreakInTry.cs:3:10:3:11 | exit M1 (normal) | false |
+| BreakInTry.cs:15:17:15:28 | ... == ... | BreakInTry.cs:16:17:16:17 | ; | true |
+| BreakInTry.cs:15:25:15:28 | null | BreakInTry.cs:15:17:15:28 | ... == ... |  |
+| BreakInTry.cs:16:17:16:17 | ; | BreakInTry.cs:3:10:3:11 | exit M1 (normal) |  |
+| BreakInTry.cs:20:10:20:11 | enter M2 | BreakInTry.cs:21:5:36:5 | {...} |  |
+| BreakInTry.cs:20:10:20:11 | exit M2 (normal) | BreakInTry.cs:20:10:20:11 | exit M2 |  |
+| BreakInTry.cs:21:5:36:5 | {...} | BreakInTry.cs:22:29:22:32 | access to parameter args |  |
+| BreakInTry.cs:22:9:34:9 | foreach (... ... in ...) ... | BreakInTry.cs:22:22:22:24 | String arg | non-empty |
+| BreakInTry.cs:22:9:34:9 | foreach (... ... in ...) ... | BreakInTry.cs:35:7:35:7 | ; | empty |
+| BreakInTry.cs:22:22:22:24 | String arg | BreakInTry.cs:23:9:34:9 | {...} |  |
+| BreakInTry.cs:22:29:22:32 | access to parameter args | BreakInTry.cs:22:9:34:9 | foreach (... ... in ...) ... |  |
+| BreakInTry.cs:23:9:34:9 | {...} | BreakInTry.cs:24:13:33:13 | try {...} ... |  |
+| BreakInTry.cs:24:13:33:13 | try {...} ... | BreakInTry.cs:25:13:28:13 | {...} |  |
+| BreakInTry.cs:25:13:28:13 | {...} | BreakInTry.cs:26:17:27:26 | if (...) ... |  |
+| BreakInTry.cs:26:17:27:26 | if (...) ... | BreakInTry.cs:26:21:26:23 | access to local variable arg |  |
+| BreakInTry.cs:26:21:26:23 | access to local variable arg | BreakInTry.cs:26:28:26:31 | null |  |
+| BreakInTry.cs:26:21:26:31 | ... == ... | BreakInTry.cs:27:21:27:26 | break; | true |
+| BreakInTry.cs:26:21:26:31 | ... == ... | BreakInTry.cs:30:13:33:13 | {...} | false |
+| BreakInTry.cs:26:28:26:31 | null | BreakInTry.cs:26:21:26:31 | ... == ... |  |
+| BreakInTry.cs:27:21:27:26 | break; | BreakInTry.cs:30:13:33:13 | [finally: break] {...} | break |
+| BreakInTry.cs:30:13:33:13 | [finally: break] {...} | BreakInTry.cs:31:17:32:21 | [finally: break] if (...) ... |  |
+| BreakInTry.cs:30:13:33:13 | {...} | BreakInTry.cs:31:17:32:21 | if (...) ... |  |
+| BreakInTry.cs:31:17:32:21 | [finally: break] if (...) ... | BreakInTry.cs:31:21:31:24 | [finally: break] access to parameter args |  |
+| BreakInTry.cs:31:17:32:21 | if (...) ... | BreakInTry.cs:31:21:31:24 | access to parameter args |  |
+| BreakInTry.cs:31:21:31:24 | [finally: break] access to parameter args | BreakInTry.cs:31:29:31:32 | [finally: break] null |  |
+| BreakInTry.cs:31:21:31:24 | access to parameter args | BreakInTry.cs:31:29:31:32 | null |  |
+| BreakInTry.cs:31:21:31:32 | ... == ... | BreakInTry.cs:22:9:34:9 | foreach (... ... in ...) ... | false |
+| BreakInTry.cs:31:21:31:32 | ... == ... | BreakInTry.cs:32:21:32:21 | ; | true |
+| BreakInTry.cs:31:21:31:32 | [finally: break] ... == ... | BreakInTry.cs:32:21:32:21 | [finally: break] ; | true |
+| BreakInTry.cs:31:21:31:32 | [finally: break] ... == ... | BreakInTry.cs:35:7:35:7 | ; | false |
+| BreakInTry.cs:31:29:31:32 | [finally: break] null | BreakInTry.cs:31:21:31:32 | [finally: break] ... == ... |  |
+| BreakInTry.cs:31:29:31:32 | null | BreakInTry.cs:31:21:31:32 | ... == ... |  |
+| BreakInTry.cs:32:21:32:21 | ; | BreakInTry.cs:22:9:34:9 | foreach (... ... in ...) ... |  |
+| BreakInTry.cs:32:21:32:21 | [finally: break] ; | BreakInTry.cs:35:7:35:7 | ; | break |
+| BreakInTry.cs:35:7:35:7 | ; | BreakInTry.cs:20:10:20:11 | exit M2 (normal) |  |
+| BreakInTry.cs:38:10:38:11 | enter M3 | BreakInTry.cs:39:5:54:5 | {...} |  |
+| BreakInTry.cs:38:10:38:11 | exit M3 (normal) | BreakInTry.cs:38:10:38:11 | exit M3 |  |
+| BreakInTry.cs:39:5:54:5 | {...} | BreakInTry.cs:40:9:52:9 | try {...} ... |  |
+| BreakInTry.cs:40:9:52:9 | try {...} ... | BreakInTry.cs:41:9:44:9 | {...} |  |
+| BreakInTry.cs:41:9:44:9 | {...} | BreakInTry.cs:42:13:43:23 | if (...) ... |  |
+| BreakInTry.cs:42:13:43:23 | if (...) ... | BreakInTry.cs:42:17:42:20 | access to parameter args |  |
+| BreakInTry.cs:42:17:42:20 | access to parameter args | BreakInTry.cs:42:25:42:28 | null |  |
+| BreakInTry.cs:42:17:42:28 | ... == ... | BreakInTry.cs:43:17:43:23 | return ...; | true |
+| BreakInTry.cs:42:17:42:28 | ... == ... | BreakInTry.cs:46:9:52:9 | {...} | false |
+| BreakInTry.cs:42:25:42:28 | null | BreakInTry.cs:42:17:42:28 | ... == ... |  |
+| BreakInTry.cs:43:17:43:23 | return ...; | BreakInTry.cs:46:9:52:9 | [finally: return] {...} | return |
+| BreakInTry.cs:46:9:52:9 | [finally: return] {...} | BreakInTry.cs:47:33:47:36 | [finally: return] access to parameter args |  |
+| BreakInTry.cs:46:9:52:9 | {...} | BreakInTry.cs:47:33:47:36 | access to parameter args |  |
+| BreakInTry.cs:47:13:51:13 | [finally: return] foreach (... ... in ...) ... | BreakInTry.cs:38:10:38:11 | exit M3 (normal) | return |
+| BreakInTry.cs:47:13:51:13 | [finally: return] foreach (... ... in ...) ... | BreakInTry.cs:47:26:47:28 | [finally: return] String arg | non-empty |
+| BreakInTry.cs:47:13:51:13 | foreach (... ... in ...) ... | BreakInTry.cs:47:26:47:28 | String arg | non-empty |
+| BreakInTry.cs:47:13:51:13 | foreach (... ... in ...) ... | BreakInTry.cs:53:7:53:7 | ; | empty |
+| BreakInTry.cs:47:26:47:28 | String arg | BreakInTry.cs:48:13:51:13 | {...} |  |
+| BreakInTry.cs:47:26:47:28 | [finally: return] String arg | BreakInTry.cs:48:13:51:13 | [finally: return] {...} |  |
+| BreakInTry.cs:47:33:47:36 | [finally: return] access to parameter args | BreakInTry.cs:47:13:51:13 | [finally: return] foreach (... ... in ...) ... |  |
+| BreakInTry.cs:47:33:47:36 | access to parameter args | BreakInTry.cs:47:13:51:13 | foreach (... ... in ...) ... |  |
+| BreakInTry.cs:48:13:51:13 | [finally: return] {...} | BreakInTry.cs:49:17:50:26 | [finally: return] if (...) ... |  |
+| BreakInTry.cs:48:13:51:13 | {...} | BreakInTry.cs:49:17:50:26 | if (...) ... |  |
+| BreakInTry.cs:49:17:50:26 | [finally: return] if (...) ... | BreakInTry.cs:49:21:49:23 | [finally: return] access to local variable arg |  |
+| BreakInTry.cs:49:17:50:26 | if (...) ... | BreakInTry.cs:49:21:49:23 | access to local variable arg |  |
+| BreakInTry.cs:49:21:49:23 | [finally: return] access to local variable arg | BreakInTry.cs:49:28:49:31 | [finally: return] null |  |
+| BreakInTry.cs:49:21:49:23 | access to local variable arg | BreakInTry.cs:49:28:49:31 | null |  |
+| BreakInTry.cs:49:21:49:31 | ... == ... | BreakInTry.cs:47:13:51:13 | foreach (... ... in ...) ... | false |
+| BreakInTry.cs:49:21:49:31 | ... == ... | BreakInTry.cs:50:21:50:26 | break; | true |
+| BreakInTry.cs:49:21:49:31 | [finally: return] ... == ... | BreakInTry.cs:47:13:51:13 | [finally: return] foreach (... ... in ...) ... | false |
+| BreakInTry.cs:49:21:49:31 | [finally: return] ... == ... | BreakInTry.cs:50:21:50:26 | [finally: return] break; | true |
+| BreakInTry.cs:49:28:49:31 | [finally: return] null | BreakInTry.cs:49:21:49:31 | [finally: return] ... == ... |  |
+| BreakInTry.cs:49:28:49:31 | null | BreakInTry.cs:49:21:49:31 | ... == ... |  |
+| BreakInTry.cs:50:21:50:26 | [finally: return] break; | BreakInTry.cs:38:10:38:11 | exit M3 (normal) | return |
+| BreakInTry.cs:50:21:50:26 | break; | BreakInTry.cs:53:7:53:7 | ; | break |
+| BreakInTry.cs:53:7:53:7 | ; | BreakInTry.cs:38:10:38:11 | exit M3 (normal) |  |
+| BreakInTry.cs:56:10:56:11 | enter M4 | BreakInTry.cs:57:5:71:5 | {...} |  |
+| BreakInTry.cs:56:10:56:11 | exit M4 (normal) | BreakInTry.cs:56:10:56:11 | exit M4 |  |
+| BreakInTry.cs:57:5:71:5 | {...} | BreakInTry.cs:58:9:70:9 | try {...} ... |  |
+| BreakInTry.cs:58:9:70:9 | try {...} ... | BreakInTry.cs:59:9:62:9 | {...} |  |
+| BreakInTry.cs:59:9:62:9 | {...} | BreakInTry.cs:60:13:61:23 | if (...) ... |  |
+| BreakInTry.cs:60:13:61:23 | if (...) ... | BreakInTry.cs:60:17:60:20 | access to parameter args |  |
+| BreakInTry.cs:60:17:60:20 | access to parameter args | BreakInTry.cs:60:25:60:28 | null |  |
+| BreakInTry.cs:60:17:60:28 | ... == ... | BreakInTry.cs:61:17:61:23 | return ...; | true |
+| BreakInTry.cs:60:17:60:28 | ... == ... | BreakInTry.cs:64:9:70:9 | {...} | false |
+| BreakInTry.cs:60:25:60:28 | null | BreakInTry.cs:60:17:60:28 | ... == ... |  |
+| BreakInTry.cs:61:17:61:23 | return ...; | BreakInTry.cs:64:9:70:9 | [finally: return] {...} | return |
+| BreakInTry.cs:64:9:70:9 | [finally: return] {...} | BreakInTry.cs:65:33:65:36 | [finally: return] access to parameter args |  |
+| BreakInTry.cs:64:9:70:9 | {...} | BreakInTry.cs:65:33:65:36 | access to parameter args |  |
+| BreakInTry.cs:65:13:69:13 | [finally: return] foreach (... ... in ...) ... | BreakInTry.cs:56:10:56:11 | exit M4 (normal) | return |
+| BreakInTry.cs:65:13:69:13 | [finally: return] foreach (... ... in ...) ... | BreakInTry.cs:65:26:65:28 | [finally: return] String arg | non-empty |
+| BreakInTry.cs:65:13:69:13 | foreach (... ... in ...) ... | BreakInTry.cs:56:10:56:11 | exit M4 (normal) | empty |
+| BreakInTry.cs:65:13:69:13 | foreach (... ... in ...) ... | BreakInTry.cs:65:26:65:28 | String arg | non-empty |
+| BreakInTry.cs:65:26:65:28 | String arg | BreakInTry.cs:66:13:69:13 | {...} |  |
+| BreakInTry.cs:65:26:65:28 | [finally: return] String arg | BreakInTry.cs:66:13:69:13 | [finally: return] {...} |  |
+| BreakInTry.cs:65:33:65:36 | [finally: return] access to parameter args | BreakInTry.cs:65:13:69:13 | [finally: return] foreach (... ... in ...) ... |  |
+| BreakInTry.cs:65:33:65:36 | access to parameter args | BreakInTry.cs:65:13:69:13 | foreach (... ... in ...) ... |  |
+| BreakInTry.cs:66:13:69:13 | [finally: return] {...} | BreakInTry.cs:67:17:68:26 | [finally: return] if (...) ... |  |
+| BreakInTry.cs:66:13:69:13 | {...} | BreakInTry.cs:67:17:68:26 | if (...) ... |  |
+| BreakInTry.cs:67:17:68:26 | [finally: return] if (...) ... | BreakInTry.cs:67:21:67:23 | [finally: return] access to local variable arg |  |
+| BreakInTry.cs:67:17:68:26 | if (...) ... | BreakInTry.cs:67:21:67:23 | access to local variable arg |  |
+| BreakInTry.cs:67:21:67:23 | [finally: return] access to local variable arg | BreakInTry.cs:67:28:67:31 | [finally: return] null |  |
+| BreakInTry.cs:67:21:67:23 | access to local variable arg | BreakInTry.cs:67:28:67:31 | null |  |
+| BreakInTry.cs:67:21:67:31 | ... == ... | BreakInTry.cs:65:13:69:13 | foreach (... ... in ...) ... | false |
+| BreakInTry.cs:67:21:67:31 | ... == ... | BreakInTry.cs:68:21:68:26 | break; | true |
+| BreakInTry.cs:67:21:67:31 | [finally: return] ... == ... | BreakInTry.cs:65:13:69:13 | [finally: return] foreach (... ... in ...) ... | false |
+| BreakInTry.cs:67:21:67:31 | [finally: return] ... == ... | BreakInTry.cs:68:21:68:26 | [finally: return] break; | true |
+| BreakInTry.cs:67:28:67:31 | [finally: return] null | BreakInTry.cs:67:21:67:31 | [finally: return] ... == ... |  |
+| BreakInTry.cs:67:28:67:31 | null | BreakInTry.cs:67:21:67:31 | ... == ... |  |
+| BreakInTry.cs:68:21:68:26 | [finally: return] break; | BreakInTry.cs:56:10:56:11 | exit M4 (normal) | return |
+| BreakInTry.cs:68:21:68:26 | break; | BreakInTry.cs:56:10:56:11 | exit M4 (normal) | break |
+| CompileTimeOperators.cs:3:7:3:26 | call to constructor Object | CompileTimeOperators.cs:3:7:3:26 | {...} |  |
+| CompileTimeOperators.cs:3:7:3:26 | enter CompileTimeOperators | CompileTimeOperators.cs:3:7:3:26 | call to constructor Object |  |
+| CompileTimeOperators.cs:3:7:3:26 | exit CompileTimeOperators (normal) | CompileTimeOperators.cs:3:7:3:26 | exit CompileTimeOperators |  |
+| CompileTimeOperators.cs:3:7:3:26 | {...} | CompileTimeOperators.cs:3:7:3:26 | exit CompileTimeOperators (normal) |  |
+| CompileTimeOperators.cs:5:9:5:15 | enter Default | CompileTimeOperators.cs:6:5:8:5 | {...} |  |
+| CompileTimeOperators.cs:5:9:5:15 | exit Default (normal) | CompileTimeOperators.cs:5:9:5:15 | exit Default |  |
+| CompileTimeOperators.cs:6:5:8:5 | {...} | CompileTimeOperators.cs:7:16:7:27 | default(...) |  |
+| CompileTimeOperators.cs:7:9:7:28 | return ...; | CompileTimeOperators.cs:5:9:5:15 | exit Default (normal) | return |
+| CompileTimeOperators.cs:7:16:7:27 | default(...) | CompileTimeOperators.cs:7:9:7:28 | return ...; |  |
+| CompileTimeOperators.cs:10:9:10:14 | enter Sizeof | CompileTimeOperators.cs:11:5:13:5 | {...} |  |
+| CompileTimeOperators.cs:10:9:10:14 | exit Sizeof (normal) | CompileTimeOperators.cs:10:9:10:14 | exit Sizeof |  |
+| CompileTimeOperators.cs:11:5:13:5 | {...} | CompileTimeOperators.cs:12:16:12:26 | sizeof(..) |  |
+| CompileTimeOperators.cs:12:9:12:27 | return ...; | CompileTimeOperators.cs:10:9:10:14 | exit Sizeof (normal) | return |
+| CompileTimeOperators.cs:12:16:12:26 | sizeof(..) | CompileTimeOperators.cs:12:9:12:27 | return ...; |  |
+| CompileTimeOperators.cs:15:10:15:15 | enter Typeof | CompileTimeOperators.cs:16:5:18:5 | {...} |  |
+| CompileTimeOperators.cs:15:10:15:15 | exit Typeof (normal) | CompileTimeOperators.cs:15:10:15:15 | exit Typeof |  |
+| CompileTimeOperators.cs:16:5:18:5 | {...} | CompileTimeOperators.cs:17:16:17:26 | typeof(...) |  |
+| CompileTimeOperators.cs:17:9:17:27 | return ...; | CompileTimeOperators.cs:15:10:15:15 | exit Typeof (normal) | return |
+| CompileTimeOperators.cs:17:16:17:26 | typeof(...) | CompileTimeOperators.cs:17:9:17:27 | return ...; |  |
+| CompileTimeOperators.cs:20:12:20:17 | enter Nameof | CompileTimeOperators.cs:21:5:23:5 | {...} |  |
+| CompileTimeOperators.cs:20:12:20:17 | exit Nameof (normal) | CompileTimeOperators.cs:20:12:20:17 | exit Nameof |  |
+| CompileTimeOperators.cs:21:5:23:5 | {...} | CompileTimeOperators.cs:22:16:22:24 | nameof(...) |  |
+| CompileTimeOperators.cs:22:9:22:25 | return ...; | CompileTimeOperators.cs:20:12:20:17 | exit Nameof (normal) | return |
+| CompileTimeOperators.cs:22:16:22:24 | nameof(...) | CompileTimeOperators.cs:22:9:22:25 | return ...; |  |
+| CompileTimeOperators.cs:26:7:26:22 | call to constructor Object | CompileTimeOperators.cs:26:7:26:22 | {...} |  |
+| CompileTimeOperators.cs:26:7:26:22 | enter GotoInTryFinally | CompileTimeOperators.cs:26:7:26:22 | call to constructor Object |  |
+| CompileTimeOperators.cs:26:7:26:22 | exit GotoInTryFinally (normal) | CompileTimeOperators.cs:26:7:26:22 | exit GotoInTryFinally |  |
+| CompileTimeOperators.cs:26:7:26:22 | {...} | CompileTimeOperators.cs:26:7:26:22 | exit GotoInTryFinally (normal) |  |
+| CompileTimeOperators.cs:28:10:28:10 | enter M | CompileTimeOperators.cs:29:5:41:5 | {...} |  |
+| CompileTimeOperators.cs:28:10:28:10 | exit M (normal) | CompileTimeOperators.cs:28:10:28:10 | exit M |  |
+| CompileTimeOperators.cs:29:5:41:5 | {...} | CompileTimeOperators.cs:30:9:38:9 | try {...} ... |  |
+| CompileTimeOperators.cs:30:9:38:9 | try {...} ... | CompileTimeOperators.cs:31:9:34:9 | {...} |  |
+| CompileTimeOperators.cs:31:9:34:9 | {...} | CompileTimeOperators.cs:32:13:32:21 | goto ...; |  |
+| CompileTimeOperators.cs:32:13:32:21 | goto ...; | CompileTimeOperators.cs:36:9:38:9 | [finally: goto(End)] {...} | goto(End) |
+| CompileTimeOperators.cs:36:9:38:9 | [finally: goto(End)] {...} | CompileTimeOperators.cs:37:13:37:41 | [finally: goto(End)] ...; |  |
+| CompileTimeOperators.cs:37:13:37:40 | [finally: goto(End)] call to method WriteLine | CompileTimeOperators.cs:40:9:40:11 | End: | goto(End) |
+| CompileTimeOperators.cs:37:13:37:41 | [finally: goto(End)] ...; | CompileTimeOperators.cs:37:31:37:39 | [finally: goto(End)] "Finally" |  |
+| CompileTimeOperators.cs:37:31:37:39 | [finally: goto(End)] "Finally" | CompileTimeOperators.cs:37:13:37:40 | [finally: goto(End)] call to method WriteLine |  |
+| CompileTimeOperators.cs:40:9:40:11 | End: | CompileTimeOperators.cs:40:14:40:38 | ...; |  |
+| CompileTimeOperators.cs:40:14:40:37 | call to method WriteLine | CompileTimeOperators.cs:28:10:28:10 | exit M (normal) |  |
+| CompileTimeOperators.cs:40:14:40:38 | ...; | CompileTimeOperators.cs:40:32:40:36 | "End" |  |
+| CompileTimeOperators.cs:40:32:40:36 | "End" | CompileTimeOperators.cs:40:14:40:37 | call to method WriteLine |  |
+| ConditionalAccess.cs:1:7:1:23 | call to constructor Object | ConditionalAccess.cs:1:7:1:23 | {...} |  |
+| ConditionalAccess.cs:1:7:1:23 | enter ConditionalAccess | ConditionalAccess.cs:1:7:1:23 | call to constructor Object |  |
+| ConditionalAccess.cs:1:7:1:23 | exit ConditionalAccess (normal) | ConditionalAccess.cs:1:7:1:23 | exit ConditionalAccess |  |
+| ConditionalAccess.cs:1:7:1:23 | {...} | ConditionalAccess.cs:1:7:1:23 | exit ConditionalAccess (normal) |  |
+| ConditionalAccess.cs:3:12:3:13 | enter M1 | ConditionalAccess.cs:3:26:3:26 | access to parameter i |  |
+| ConditionalAccess.cs:3:12:3:13 | exit M1 (normal) | ConditionalAccess.cs:3:12:3:13 | exit M1 |  |
+| ConditionalAccess.cs:3:26:3:26 | access to parameter i | ConditionalAccess.cs:3:12:3:13 | exit M1 (normal) | null |
+| ConditionalAccess.cs:3:26:3:26 | access to parameter i | ConditionalAccess.cs:3:26:3:38 | call to method ToString | non-null |
+| ConditionalAccess.cs:3:26:3:38 | call to method ToString | ConditionalAccess.cs:3:12:3:13 | exit M1 (normal) | null |
+| ConditionalAccess.cs:3:26:3:38 | call to method ToString | ConditionalAccess.cs:3:26:3:49 | call to method ToLower | non-null |
+| ConditionalAccess.cs:3:26:3:49 | call to method ToLower | ConditionalAccess.cs:3:12:3:13 | exit M1 (normal) |  |
+| ConditionalAccess.cs:5:10:5:11 | enter M2 | ConditionalAccess.cs:5:26:5:26 | access to parameter s |  |
+| ConditionalAccess.cs:5:10:5:11 | exit M2 (normal) | ConditionalAccess.cs:5:10:5:11 | exit M2 |  |
+| ConditionalAccess.cs:5:26:5:26 | access to parameter s | ConditionalAccess.cs:5:10:5:11 | exit M2 (normal) | null |
+| ConditionalAccess.cs:5:26:5:26 | access to parameter s | ConditionalAccess.cs:5:26:5:34 | access to property Length | non-null |
+| ConditionalAccess.cs:5:26:5:34 | access to property Length | ConditionalAccess.cs:5:10:5:11 | exit M2 (normal) |  |
+| ConditionalAccess.cs:7:10:7:11 | enter M3 | ConditionalAccess.cs:7:39:7:40 | access to parameter s1 |  |
+| ConditionalAccess.cs:7:10:7:11 | exit M3 (normal) | ConditionalAccess.cs:7:10:7:11 | exit M3 |  |
+| ConditionalAccess.cs:7:38:7:55 | access to property Length | ConditionalAccess.cs:7:10:7:11 | exit M3 (normal) |  |
+| ConditionalAccess.cs:7:39:7:40 | access to parameter s1 | ConditionalAccess.cs:7:39:7:46 | ... ?? ... | non-null |
+| ConditionalAccess.cs:7:39:7:40 | access to parameter s1 | ConditionalAccess.cs:7:45:7:46 | access to parameter s2 | null |
+| ConditionalAccess.cs:7:39:7:46 | ... ?? ... | ConditionalAccess.cs:7:10:7:11 | exit M3 (normal) | null |
+| ConditionalAccess.cs:7:39:7:46 | ... ?? ... | ConditionalAccess.cs:7:38:7:55 | access to property Length | non-null |
+| ConditionalAccess.cs:7:39:7:46 | [non-null] ... ?? ... | ConditionalAccess.cs:7:38:7:55 | access to property Length | non-null |
+| ConditionalAccess.cs:7:39:7:46 | [null] ... ?? ... | ConditionalAccess.cs:7:10:7:11 | exit M3 (normal) | null |
+| ConditionalAccess.cs:7:45:7:46 | access to parameter s2 | ConditionalAccess.cs:7:39:7:46 | [non-null] ... ?? ... | non-null |
+| ConditionalAccess.cs:7:45:7:46 | access to parameter s2 | ConditionalAccess.cs:7:39:7:46 | [null] ... ?? ... | null |
+| ConditionalAccess.cs:9:9:9:10 | enter M4 | ConditionalAccess.cs:9:25:9:25 | access to parameter s |  |
+| ConditionalAccess.cs:9:9:9:10 | exit M4 (normal) | ConditionalAccess.cs:9:9:9:10 | exit M4 |  |
+| ConditionalAccess.cs:9:25:9:25 | access to parameter s | ConditionalAccess.cs:9:25:9:33 | access to property Length | non-null |
+| ConditionalAccess.cs:9:25:9:25 | access to parameter s | ConditionalAccess.cs:9:38:9:38 | 0 | null |
+| ConditionalAccess.cs:9:25:9:33 | access to property Length | ConditionalAccess.cs:9:25:9:38 | ... ?? ... | non-null |
+| ConditionalAccess.cs:9:25:9:33 | access to property Length | ConditionalAccess.cs:9:38:9:38 | 0 | null |
+| ConditionalAccess.cs:9:25:9:38 | ... ?? ... | ConditionalAccess.cs:9:9:9:10 | exit M4 (normal) |  |
+| ConditionalAccess.cs:9:38:9:38 | 0 | ConditionalAccess.cs:9:25:9:38 | ... ?? ... |  |
+| ConditionalAccess.cs:11:9:11:10 | enter M5 | ConditionalAccess.cs:12:5:17:5 | {...} |  |
+| ConditionalAccess.cs:11:9:11:10 | exit M5 (normal) | ConditionalAccess.cs:11:9:11:10 | exit M5 |  |
+| ConditionalAccess.cs:12:5:17:5 | {...} | ConditionalAccess.cs:13:9:16:21 | if (...) ... |  |
+| ConditionalAccess.cs:13:9:16:21 | if (...) ... | ConditionalAccess.cs:13:13:13:13 | access to parameter s |  |
+| ConditionalAccess.cs:13:13:13:13 | access to parameter s | ConditionalAccess.cs:13:13:13:21 | access to property Length | non-null |
+| ConditionalAccess.cs:13:13:13:13 | access to parameter s | ConditionalAccess.cs:13:25:13:25 | 0 | null |
+| ConditionalAccess.cs:13:13:13:21 | access to property Length | ConditionalAccess.cs:13:25:13:25 | 0 |  |
+| ConditionalAccess.cs:13:13:13:25 | ... > ... | ConditionalAccess.cs:14:20:14:20 | 0 | true |
+| ConditionalAccess.cs:13:13:13:25 | ... > ... | ConditionalAccess.cs:16:20:16:20 | 1 | false |
+| ConditionalAccess.cs:13:25:13:25 | 0 | ConditionalAccess.cs:13:25:13:25 | (...) ... |  |
+| ConditionalAccess.cs:13:25:13:25 | (...) ... | ConditionalAccess.cs:13:13:13:25 | ... > ... |  |
+| ConditionalAccess.cs:14:13:14:21 | return ...; | ConditionalAccess.cs:11:9:11:10 | exit M5 (normal) | return |
+| ConditionalAccess.cs:14:20:14:20 | 0 | ConditionalAccess.cs:14:13:14:21 | return ...; |  |
+| ConditionalAccess.cs:16:13:16:21 | return ...; | ConditionalAccess.cs:11:9:11:10 | exit M5 (normal) | return |
+| ConditionalAccess.cs:16:20:16:20 | 1 | ConditionalAccess.cs:16:13:16:21 | return ...; |  |
+| ConditionalAccess.cs:19:12:19:13 | enter M6 | ConditionalAccess.cs:19:40:19:41 | access to parameter s1 |  |
+| ConditionalAccess.cs:19:12:19:13 | exit M6 (normal) | ConditionalAccess.cs:19:12:19:13 | exit M6 |  |
+| ConditionalAccess.cs:19:40:19:41 | access to parameter s1 | ConditionalAccess.cs:19:12:19:13 | exit M6 (normal) | null |
+| ConditionalAccess.cs:19:40:19:41 | access to parameter s1 | ConditionalAccess.cs:19:58:19:59 | access to parameter s2 | non-null |
+| ConditionalAccess.cs:19:40:19:60 | call to method CommaJoinWith | ConditionalAccess.cs:19:12:19:13 | exit M6 (normal) |  |
+| ConditionalAccess.cs:19:58:19:59 | access to parameter s2 | ConditionalAccess.cs:19:40:19:60 | call to method CommaJoinWith |  |
+| ConditionalAccess.cs:21:10:21:11 | enter M7 | ConditionalAccess.cs:22:5:26:5 | {...} |  |
+| ConditionalAccess.cs:21:10:21:11 | exit M7 (normal) | ConditionalAccess.cs:21:10:21:11 | exit M7 |  |
+| ConditionalAccess.cs:22:5:26:5 | {...} | ConditionalAccess.cs:23:9:23:39 | ... ...; |  |
+| ConditionalAccess.cs:23:9:23:39 | ... ...; | ConditionalAccess.cs:23:26:23:29 | null |  |
+| ConditionalAccess.cs:23:13:23:38 | Nullable<Int32> j = ... | ConditionalAccess.cs:24:9:24:38 | ... ...; |  |
+| ConditionalAccess.cs:23:18:23:29 | (...) ... | ConditionalAccess.cs:23:13:23:38 | Nullable<Int32> j = ... | null |
+| ConditionalAccess.cs:23:26:23:29 | null | ConditionalAccess.cs:23:18:23:29 | (...) ... |  |
+| ConditionalAccess.cs:24:9:24:38 | ... ...; | ConditionalAccess.cs:24:24:24:24 | access to parameter i |  |
+| ConditionalAccess.cs:24:13:24:37 | String s = ... | ConditionalAccess.cs:25:9:25:33 | ...; |  |
+| ConditionalAccess.cs:24:17:24:37 | call to method ToString | ConditionalAccess.cs:24:13:24:37 | String s = ... |  |
+| ConditionalAccess.cs:24:18:24:24 | (...) ... | ConditionalAccess.cs:24:17:24:37 | call to method ToString | non-null |
+| ConditionalAccess.cs:24:24:24:24 | access to parameter i | ConditionalAccess.cs:24:18:24:24 | (...) ... |  |
+| ConditionalAccess.cs:25:9:25:32 | ... = ... | ConditionalAccess.cs:21:10:21:11 | exit M7 (normal) |  |
+| ConditionalAccess.cs:25:9:25:33 | ...; | ConditionalAccess.cs:25:13:25:14 | "" |  |
+| ConditionalAccess.cs:25:13:25:14 | "" | ConditionalAccess.cs:25:31:25:31 | access to local variable s | non-null |
+| ConditionalAccess.cs:25:13:25:32 | call to method CommaJoinWith | ConditionalAccess.cs:25:9:25:32 | ... = ... |  |
+| ConditionalAccess.cs:25:31:25:31 | access to local variable s | ConditionalAccess.cs:25:13:25:32 | call to method CommaJoinWith |  |
+| ConditionalAccess.cs:30:10:30:12 | enter Out | ConditionalAccess.cs:30:32:30:32 | 0 |  |
+| ConditionalAccess.cs:30:10:30:12 | exit Out (normal) | ConditionalAccess.cs:30:10:30:12 | exit Out |  |
+| ConditionalAccess.cs:30:28:30:32 | ... = ... | ConditionalAccess.cs:30:10:30:12 | exit Out (normal) |  |
+| ConditionalAccess.cs:30:32:30:32 | 0 | ConditionalAccess.cs:30:28:30:32 | ... = ... |  |
+| ConditionalAccess.cs:32:10:32:11 | enter M8 | ConditionalAccess.cs:33:5:36:5 | {...} |  |
+| ConditionalAccess.cs:32:10:32:11 | exit M8 (normal) | ConditionalAccess.cs:32:10:32:11 | exit M8 |  |
+| ConditionalAccess.cs:33:5:36:5 | {...} | ConditionalAccess.cs:34:9:34:14 | ...; |  |
+| ConditionalAccess.cs:34:9:34:13 | ... = ... | ConditionalAccess.cs:35:9:35:25 | ...; |  |
+| ConditionalAccess.cs:34:9:34:14 | ...; | ConditionalAccess.cs:34:13:34:13 | 0 |  |
+| ConditionalAccess.cs:34:13:34:13 | 0 | ConditionalAccess.cs:34:9:34:13 | ... = ... |  |
+| ConditionalAccess.cs:35:9:35:12 | access to property Prop | ConditionalAccess.cs:32:10:32:11 | exit M8 (normal) | null |
+| ConditionalAccess.cs:35:9:35:12 | access to property Prop | ConditionalAccess.cs:35:9:35:24 | call to method Out | non-null |
+| ConditionalAccess.cs:35:9:35:12 | this access | ConditionalAccess.cs:35:9:35:12 | access to property Prop |  |
+| ConditionalAccess.cs:35:9:35:24 | call to method Out | ConditionalAccess.cs:32:10:32:11 | exit M8 (normal) |  |
+| ConditionalAccess.cs:35:9:35:25 | ...; | ConditionalAccess.cs:35:9:35:12 | this access |  |
+| ConditionalAccess.cs:41:26:41:38 | enter CommaJoinWith | ConditionalAccess.cs:41:70:41:71 | access to parameter s1 |  |
+| ConditionalAccess.cs:41:26:41:38 | exit CommaJoinWith (normal) | ConditionalAccess.cs:41:26:41:38 | exit CommaJoinWith |  |
+| ConditionalAccess.cs:41:70:41:71 | access to parameter s1 | ConditionalAccess.cs:41:75:41:78 | ", " |  |
+| ConditionalAccess.cs:41:70:41:78 | ... + ... | ConditionalAccess.cs:41:82:41:83 | access to parameter s2 |  |
+| ConditionalAccess.cs:41:70:41:83 | ... + ... | ConditionalAccess.cs:41:26:41:38 | exit CommaJoinWith (normal) |  |
+| ConditionalAccess.cs:41:75:41:78 | ", " | ConditionalAccess.cs:41:70:41:78 | ... + ... |  |
+| ConditionalAccess.cs:41:82:41:83 | access to parameter s2 | ConditionalAccess.cs:41:70:41:83 | ... + ... |  |
+| Conditions.cs:1:7:1:16 | call to constructor Object | Conditions.cs:1:7:1:16 | {...} |  |
+| Conditions.cs:1:7:1:16 | enter Conditions | Conditions.cs:1:7:1:16 | call to constructor Object |  |
+| Conditions.cs:1:7:1:16 | exit Conditions (normal) | Conditions.cs:1:7:1:16 | exit Conditions |  |
+| Conditions.cs:1:7:1:16 | {...} | Conditions.cs:1:7:1:16 | exit Conditions (normal) |  |
+| Conditions.cs:3:10:3:19 | enter IncrOrDecr | Conditions.cs:4:5:9:5 | {...} |  |
+| Conditions.cs:3:10:3:19 | exit IncrOrDecr (normal) | Conditions.cs:3:10:3:19 | exit IncrOrDecr |  |
+| Conditions.cs:4:5:9:5 | {...} | Conditions.cs:5:9:6:16 | if (...) ... |  |
+| Conditions.cs:5:9:6:16 | if (...) ... | Conditions.cs:5:13:5:15 | access to parameter inc |  |
+| Conditions.cs:5:13:5:15 | access to parameter inc | Conditions.cs:6:13:6:16 | [inc (line 3): true] ...; | true |
+| Conditions.cs:5:13:5:15 | access to parameter inc | Conditions.cs:7:9:8:16 | [inc (line 3): false] if (...) ... | false |
+| Conditions.cs:6:13:6:13 | [inc (line 3): true] access to parameter x | Conditions.cs:6:13:6:15 | [inc (line 3): true] ...++ |  |
+| Conditions.cs:6:13:6:15 | [inc (line 3): true] ...++ | Conditions.cs:7:9:8:16 | [inc (line 3): true] if (...) ... |  |
+| Conditions.cs:6:13:6:16 | [inc (line 3): true] ...; | Conditions.cs:6:13:6:13 | [inc (line 3): true] access to parameter x |  |
+| Conditions.cs:7:9:8:16 | [inc (line 3): false] if (...) ... | Conditions.cs:7:14:7:16 | [inc (line 3): false] access to parameter inc |  |
+| Conditions.cs:7:9:8:16 | [inc (line 3): true] if (...) ... | Conditions.cs:7:14:7:16 | [inc (line 3): true] access to parameter inc |  |
+| Conditions.cs:7:13:7:16 | [false] !... | Conditions.cs:3:10:3:19 | exit IncrOrDecr (normal) | false |
+| Conditions.cs:7:13:7:16 | [true] !... | Conditions.cs:8:13:8:16 | ...; | true |
+| Conditions.cs:7:14:7:16 | [inc (line 3): false] access to parameter inc | Conditions.cs:7:13:7:16 | [true] !... | false |
+| Conditions.cs:7:14:7:16 | [inc (line 3): true] access to parameter inc | Conditions.cs:7:13:7:16 | [false] !... | true |
+| Conditions.cs:8:13:8:13 | access to parameter x | Conditions.cs:8:13:8:15 | ...-- |  |
+| Conditions.cs:8:13:8:15 | ...-- | Conditions.cs:3:10:3:19 | exit IncrOrDecr (normal) |  |
+| Conditions.cs:8:13:8:16 | ...; | Conditions.cs:8:13:8:13 | access to parameter x |  |
+| Conditions.cs:11:9:11:10 | enter M1 | Conditions.cs:12:5:20:5 | {...} |  |
+| Conditions.cs:11:9:11:10 | exit M1 (normal) | Conditions.cs:11:9:11:10 | exit M1 |  |
+| Conditions.cs:12:5:20:5 | {...} | Conditions.cs:13:9:13:18 | ... ...; |  |
+| Conditions.cs:13:9:13:18 | ... ...; | Conditions.cs:13:17:13:17 | 0 |  |
+| Conditions.cs:13:13:13:17 | Int32 x = ... | Conditions.cs:14:9:15:16 | if (...) ... |  |
+| Conditions.cs:13:17:13:17 | 0 | Conditions.cs:13:13:13:17 | Int32 x = ... |  |
+| Conditions.cs:14:9:15:16 | if (...) ... | Conditions.cs:14:13:14:13 | access to parameter b |  |
+| Conditions.cs:14:13:14:13 | access to parameter b | Conditions.cs:15:13:15:16 | [b (line 11): true] ...; | true |
+| Conditions.cs:14:13:14:13 | access to parameter b | Conditions.cs:16:9:18:20 | [b (line 11): false] if (...) ... | false |
+| Conditions.cs:15:13:15:13 | [b (line 11): true] access to local variable x | Conditions.cs:15:13:15:15 | [b (line 11): true] ...++ |  |
+| Conditions.cs:15:13:15:15 | [b (line 11): true] ...++ | Conditions.cs:16:9:18:20 | [b (line 11): true] if (...) ... |  |
+| Conditions.cs:15:13:15:16 | [b (line 11): true] ...; | Conditions.cs:15:13:15:13 | [b (line 11): true] access to local variable x |  |
+| Conditions.cs:16:9:18:20 | [b (line 11): false] if (...) ... | Conditions.cs:16:13:16:13 | [b (line 11): false] access to local variable x |  |
+| Conditions.cs:16:9:18:20 | [b (line 11): true] if (...) ... | Conditions.cs:16:13:16:13 | [b (line 11): true] access to local variable x |  |
+| Conditions.cs:16:13:16:13 | [b (line 11): false] access to local variable x | Conditions.cs:16:17:16:17 | [b (line 11): false] 0 |  |
+| Conditions.cs:16:13:16:13 | [b (line 11): true] access to local variable x | Conditions.cs:16:17:16:17 | [b (line 11): true] 0 |  |
+| Conditions.cs:16:13:16:17 | [b (line 11): false] ... > ... | Conditions.cs:17:13:18:20 | [b (line 11): false] if (...) ... | true |
+| Conditions.cs:16:13:16:17 | [b (line 11): false] ... > ... | Conditions.cs:19:16:19:16 | access to local variable x | false |
+| Conditions.cs:16:13:16:17 | [b (line 11): true] ... > ... | Conditions.cs:17:13:18:20 | [b (line 11): true] if (...) ... | true |
+| Conditions.cs:16:13:16:17 | [b (line 11): true] ... > ... | Conditions.cs:19:16:19:16 | access to local variable x | false |
+| Conditions.cs:16:17:16:17 | [b (line 11): false] 0 | Conditions.cs:16:13:16:17 | [b (line 11): false] ... > ... |  |
+| Conditions.cs:16:17:16:17 | [b (line 11): true] 0 | Conditions.cs:16:13:16:17 | [b (line 11): true] ... > ... |  |
+| Conditions.cs:17:13:18:20 | [b (line 11): false] if (...) ... | Conditions.cs:17:18:17:18 | [b (line 11): false] access to parameter b |  |
+| Conditions.cs:17:13:18:20 | [b (line 11): true] if (...) ... | Conditions.cs:17:18:17:18 | [b (line 11): true] access to parameter b |  |
+| Conditions.cs:17:17:17:18 | [false] !... | Conditions.cs:19:16:19:16 | access to local variable x | false |
+| Conditions.cs:17:17:17:18 | [true] !... | Conditions.cs:18:17:18:20 | ...; | true |
+| Conditions.cs:17:18:17:18 | [b (line 11): false] access to parameter b | Conditions.cs:17:17:17:18 | [true] !... | false |
+| Conditions.cs:17:18:17:18 | [b (line 11): true] access to parameter b | Conditions.cs:17:17:17:18 | [false] !... | true |
+| Conditions.cs:18:17:18:17 | access to local variable x | Conditions.cs:18:17:18:19 | ...-- |  |
+| Conditions.cs:18:17:18:19 | ...-- | Conditions.cs:19:16:19:16 | access to local variable x |  |
+| Conditions.cs:18:17:18:20 | ...; | Conditions.cs:18:17:18:17 | access to local variable x |  |
+| Conditions.cs:19:9:19:17 | return ...; | Conditions.cs:11:9:11:10 | exit M1 (normal) | return |
+| Conditions.cs:19:16:19:16 | access to local variable x | Conditions.cs:19:9:19:17 | return ...; |  |
+| Conditions.cs:22:9:22:10 | enter M2 | Conditions.cs:23:5:31:5 | {...} |  |
+| Conditions.cs:22:9:22:10 | exit M2 (normal) | Conditions.cs:22:9:22:10 | exit M2 |  |
+| Conditions.cs:23:5:31:5 | {...} | Conditions.cs:24:9:24:18 | ... ...; |  |
+| Conditions.cs:24:9:24:18 | ... ...; | Conditions.cs:24:17:24:17 | 0 |  |
+| Conditions.cs:24:13:24:17 | Int32 x = ... | Conditions.cs:25:9:27:20 | if (...) ... |  |
+| Conditions.cs:24:17:24:17 | 0 | Conditions.cs:24:13:24:17 | Int32 x = ... |  |
+| Conditions.cs:25:9:27:20 | if (...) ... | Conditions.cs:25:13:25:14 | access to parameter b1 |  |
+| Conditions.cs:25:13:25:14 | access to parameter b1 | Conditions.cs:26:13:27:20 | if (...) ... | true |
+| Conditions.cs:25:13:25:14 | access to parameter b1 | Conditions.cs:28:9:29:16 | if (...) ... | false |
+| Conditions.cs:26:13:27:20 | if (...) ... | Conditions.cs:26:17:26:18 | access to parameter b2 |  |
+| Conditions.cs:26:17:26:18 | access to parameter b2 | Conditions.cs:27:17:27:20 | [b2 (line 22): true] ...; | true |
+| Conditions.cs:26:17:26:18 | access to parameter b2 | Conditions.cs:28:9:29:16 | [b2 (line 22): false] if (...) ... | false |
+| Conditions.cs:27:17:27:17 | [b2 (line 22): true] access to local variable x | Conditions.cs:27:17:27:19 | [b2 (line 22): true] ...++ |  |
+| Conditions.cs:27:17:27:19 | [b2 (line 22): true] ...++ | Conditions.cs:28:9:29:16 | [b2 (line 22): true] if (...) ... |  |
+| Conditions.cs:27:17:27:20 | [b2 (line 22): true] ...; | Conditions.cs:27:17:27:17 | [b2 (line 22): true] access to local variable x |  |
+| Conditions.cs:28:9:29:16 | [b2 (line 22): false] if (...) ... | Conditions.cs:28:13:28:14 | [b2 (line 22): false] access to parameter b2 |  |
+| Conditions.cs:28:9:29:16 | [b2 (line 22): true] if (...) ... | Conditions.cs:28:13:28:14 | [b2 (line 22): true] access to parameter b2 |  |
+| Conditions.cs:28:9:29:16 | if (...) ... | Conditions.cs:28:13:28:14 | access to parameter b2 |  |
+| Conditions.cs:28:13:28:14 | [b2 (line 22): false] access to parameter b2 | Conditions.cs:30:16:30:16 | access to local variable x | false |
+| Conditions.cs:28:13:28:14 | [b2 (line 22): true] access to parameter b2 | Conditions.cs:29:13:29:16 | ...; | true |
+| Conditions.cs:28:13:28:14 | access to parameter b2 | Conditions.cs:29:13:29:16 | ...; | true |
+| Conditions.cs:28:13:28:14 | access to parameter b2 | Conditions.cs:30:16:30:16 | access to local variable x | false |
+| Conditions.cs:29:13:29:13 | access to local variable x | Conditions.cs:29:13:29:15 | ...++ |  |
+| Conditions.cs:29:13:29:15 | ...++ | Conditions.cs:30:16:30:16 | access to local variable x |  |
+| Conditions.cs:29:13:29:16 | ...; | Conditions.cs:29:13:29:13 | access to local variable x |  |
+| Conditions.cs:30:9:30:17 | return ...; | Conditions.cs:22:9:22:10 | exit M2 (normal) | return |
+| Conditions.cs:30:16:30:16 | access to local variable x | Conditions.cs:30:9:30:17 | return ...; |  |
+| Conditions.cs:33:9:33:10 | enter M3 | Conditions.cs:34:5:44:5 | {...} |  |
+| Conditions.cs:33:9:33:10 | exit M3 (normal) | Conditions.cs:33:9:33:10 | exit M3 |  |
+| Conditions.cs:34:5:44:5 | {...} | Conditions.cs:35:9:35:18 | ... ...; |  |
+| Conditions.cs:35:9:35:18 | ... ...; | Conditions.cs:35:17:35:17 | 0 |  |
+| Conditions.cs:35:13:35:17 | Int32 x = ... | Conditions.cs:36:9:36:23 | ... ...; |  |
+| Conditions.cs:35:17:35:17 | 0 | Conditions.cs:35:13:35:17 | Int32 x = ... |  |
+| Conditions.cs:36:9:36:23 | ... ...; | Conditions.cs:36:18:36:22 | false |  |
+| Conditions.cs:36:13:36:22 | Boolean b2 = ... | Conditions.cs:37:9:38:20 | if (...) ... |  |
+| Conditions.cs:36:18:36:22 | false | Conditions.cs:36:13:36:22 | Boolean b2 = ... |  |
+| Conditions.cs:37:9:38:20 | if (...) ... | Conditions.cs:37:13:37:14 | access to parameter b1 |  |
+| Conditions.cs:37:13:37:14 | access to parameter b1 | Conditions.cs:38:13:38:20 | ...; | true |
+| Conditions.cs:37:13:37:14 | access to parameter b1 | Conditions.cs:39:9:40:16 | if (...) ... | false |
+| Conditions.cs:38:13:38:19 | ... = ... | Conditions.cs:39:9:40:16 | if (...) ... |  |
+| Conditions.cs:38:13:38:20 | ...; | Conditions.cs:38:18:38:19 | access to parameter b1 |  |
+| Conditions.cs:38:18:38:19 | access to parameter b1 | Conditions.cs:38:13:38:19 | ... = ... |  |
+| Conditions.cs:39:9:40:16 | if (...) ... | Conditions.cs:39:13:39:14 | access to local variable b2 |  |
+| Conditions.cs:39:13:39:14 | access to local variable b2 | Conditions.cs:40:13:40:16 | [b2 (line 39): true] ...; | true |
+| Conditions.cs:39:13:39:14 | access to local variable b2 | Conditions.cs:41:9:42:16 | [b2 (line 39): false] if (...) ... | false |
+| Conditions.cs:40:13:40:13 | [b2 (line 39): true] access to local variable x | Conditions.cs:40:13:40:15 | [b2 (line 39): true] ...++ |  |
+| Conditions.cs:40:13:40:15 | [b2 (line 39): true] ...++ | Conditions.cs:41:9:42:16 | [b2 (line 39): true] if (...) ... |  |
+| Conditions.cs:40:13:40:16 | [b2 (line 39): true] ...; | Conditions.cs:40:13:40:13 | [b2 (line 39): true] access to local variable x |  |
+| Conditions.cs:41:9:42:16 | [b2 (line 39): false] if (...) ... | Conditions.cs:41:13:41:14 | [b2 (line 39): false] access to local variable b2 |  |
+| Conditions.cs:41:9:42:16 | [b2 (line 39): true] if (...) ... | Conditions.cs:41:13:41:14 | [b2 (line 39): true] access to local variable b2 |  |
+| Conditions.cs:41:13:41:14 | [b2 (line 39): false] access to local variable b2 | Conditions.cs:43:16:43:16 | access to local variable x | false |
+| Conditions.cs:41:13:41:14 | [b2 (line 39): true] access to local variable b2 | Conditions.cs:42:13:42:16 | ...; | true |
+| Conditions.cs:42:13:42:13 | access to local variable x | Conditions.cs:42:13:42:15 | ...++ |  |
+| Conditions.cs:42:13:42:15 | ...++ | Conditions.cs:43:16:43:16 | access to local variable x |  |
+| Conditions.cs:42:13:42:16 | ...; | Conditions.cs:42:13:42:13 | access to local variable x |  |
+| Conditions.cs:43:9:43:17 | return ...; | Conditions.cs:33:9:33:10 | exit M3 (normal) | return |
+| Conditions.cs:43:16:43:16 | access to local variable x | Conditions.cs:43:9:43:17 | return ...; |  |
+| Conditions.cs:46:9:46:10 | enter M4 | Conditions.cs:47:5:55:5 | {...} |  |
+| Conditions.cs:46:9:46:10 | exit M4 (normal) | Conditions.cs:46:9:46:10 | exit M4 |  |
+| Conditions.cs:47:5:55:5 | {...} | Conditions.cs:48:9:48:18 | ... ...; |  |
+| Conditions.cs:48:9:48:18 | ... ...; | Conditions.cs:48:17:48:17 | 0 |  |
+| Conditions.cs:48:13:48:17 | Int32 y = ... | Conditions.cs:49:9:53:9 | while (...) ... |  |
+| Conditions.cs:48:17:48:17 | 0 | Conditions.cs:48:13:48:17 | Int32 y = ... |  |
+| Conditions.cs:49:9:53:9 | while (...) ... | Conditions.cs:49:16:49:16 | access to parameter x |  |
+| Conditions.cs:49:16:49:16 | [b (line 46): false] access to parameter x | Conditions.cs:49:16:49:18 | [b (line 46): false] ...-- |  |
+| Conditions.cs:49:16:49:16 | [b (line 46): true] access to parameter x | Conditions.cs:49:16:49:18 | [b (line 46): true] ...-- |  |
+| Conditions.cs:49:16:49:16 | access to parameter x | Conditions.cs:49:16:49:18 | ...-- |  |
+| Conditions.cs:49:16:49:18 | ...-- | Conditions.cs:49:22:49:22 | 0 |  |
+| Conditions.cs:49:16:49:18 | [b (line 46): false] ...-- | Conditions.cs:49:22:49:22 | [b (line 46): false] 0 |  |
+| Conditions.cs:49:16:49:18 | [b (line 46): true] ...-- | Conditions.cs:49:22:49:22 | [b (line 46): true] 0 |  |
+| Conditions.cs:49:16:49:22 | ... > ... | Conditions.cs:50:9:53:9 | {...} | true |
+| Conditions.cs:49:16:49:22 | ... > ... | Conditions.cs:54:16:54:16 | access to local variable y | false |
+| Conditions.cs:49:16:49:22 | [b (line 46): false] ... > ... | Conditions.cs:50:9:53:9 | [b (line 46): false] {...} | true |
+| Conditions.cs:49:16:49:22 | [b (line 46): false] ... > ... | Conditions.cs:54:16:54:16 | access to local variable y | false |
+| Conditions.cs:49:16:49:22 | [b (line 46): true] ... > ... | Conditions.cs:50:9:53:9 | [b (line 46): true] {...} | true |
+| Conditions.cs:49:16:49:22 | [b (line 46): true] ... > ... | Conditions.cs:54:16:54:16 | access to local variable y | false |
+| Conditions.cs:49:22:49:22 | 0 | Conditions.cs:49:16:49:22 | ... > ... |  |
+| Conditions.cs:49:22:49:22 | [b (line 46): false] 0 | Conditions.cs:49:16:49:22 | [b (line 46): false] ... > ... |  |
+| Conditions.cs:49:22:49:22 | [b (line 46): true] 0 | Conditions.cs:49:16:49:22 | [b (line 46): true] ... > ... |  |
+| Conditions.cs:50:9:53:9 | [b (line 46): false] {...} | Conditions.cs:51:13:52:20 | [b (line 46): false] if (...) ... |  |
+| Conditions.cs:50:9:53:9 | [b (line 46): true] {...} | Conditions.cs:51:13:52:20 | [b (line 46): true] if (...) ... |  |
+| Conditions.cs:50:9:53:9 | {...} | Conditions.cs:51:13:52:20 | if (...) ... |  |
+| Conditions.cs:51:13:52:20 | [b (line 46): false] if (...) ... | Conditions.cs:51:17:51:17 | [b (line 46): false] access to parameter b |  |
+| Conditions.cs:51:13:52:20 | [b (line 46): true] if (...) ... | Conditions.cs:51:17:51:17 | [b (line 46): true] access to parameter b |  |
+| Conditions.cs:51:13:52:20 | if (...) ... | Conditions.cs:51:17:51:17 | access to parameter b |  |
+| Conditions.cs:51:17:51:17 | [b (line 46): false] access to parameter b | Conditions.cs:49:16:49:16 | [b (line 46): false] access to parameter x | false |
+| Conditions.cs:51:17:51:17 | [b (line 46): true] access to parameter b | Conditions.cs:52:17:52:20 | [b (line 46): true] ...; | true |
+| Conditions.cs:51:17:51:17 | access to parameter b | Conditions.cs:49:16:49:16 | [b (line 46): false] access to parameter x | false |
+| Conditions.cs:51:17:51:17 | access to parameter b | Conditions.cs:52:17:52:20 | [b (line 46): true] ...; | true |
+| Conditions.cs:52:17:52:17 | [b (line 46): true] access to local variable y | Conditions.cs:52:17:52:19 | [b (line 46): true] ...++ |  |
+| Conditions.cs:52:17:52:19 | [b (line 46): true] ...++ | Conditions.cs:49:16:49:16 | [b (line 46): true] access to parameter x |  |
+| Conditions.cs:52:17:52:20 | [b (line 46): true] ...; | Conditions.cs:52:17:52:17 | [b (line 46): true] access to local variable y |  |
+| Conditions.cs:54:9:54:17 | return ...; | Conditions.cs:46:9:46:10 | exit M4 (normal) | return |
+| Conditions.cs:54:16:54:16 | access to local variable y | Conditions.cs:54:9:54:17 | return ...; |  |
+| Conditions.cs:57:9:57:10 | enter M5 | Conditions.cs:58:5:68:5 | {...} |  |
+| Conditions.cs:57:9:57:10 | exit M5 (normal) | Conditions.cs:57:9:57:10 | exit M5 |  |
+| Conditions.cs:58:5:68:5 | {...} | Conditions.cs:59:9:59:18 | ... ...; |  |
+| Conditions.cs:59:9:59:18 | ... ...; | Conditions.cs:59:17:59:17 | 0 |  |
+| Conditions.cs:59:13:59:17 | Int32 y = ... | Conditions.cs:60:9:64:9 | while (...) ... |  |
+| Conditions.cs:59:17:59:17 | 0 | Conditions.cs:59:13:59:17 | Int32 y = ... |  |
+| Conditions.cs:60:9:64:9 | while (...) ... | Conditions.cs:60:16:60:16 | access to parameter x |  |
+| Conditions.cs:60:16:60:16 | [b (line 57): false] access to parameter x | Conditions.cs:60:16:60:18 | [b (line 57): false] ...-- |  |
+| Conditions.cs:60:16:60:16 | [b (line 57): true] access to parameter x | Conditions.cs:60:16:60:18 | [b (line 57): true] ...-- |  |
+| Conditions.cs:60:16:60:16 | access to parameter x | Conditions.cs:60:16:60:18 | ...-- |  |
+| Conditions.cs:60:16:60:18 | ...-- | Conditions.cs:60:22:60:22 | 0 |  |
+| Conditions.cs:60:16:60:18 | [b (line 57): false] ...-- | Conditions.cs:60:22:60:22 | [b (line 57): false] 0 |  |
+| Conditions.cs:60:16:60:18 | [b (line 57): true] ...-- | Conditions.cs:60:22:60:22 | [b (line 57): true] 0 |  |
+| Conditions.cs:60:16:60:22 | ... > ... | Conditions.cs:61:9:64:9 | {...} | true |
+| Conditions.cs:60:16:60:22 | ... > ... | Conditions.cs:65:9:66:16 | if (...) ... | false |
+| Conditions.cs:60:16:60:22 | [b (line 57): false] ... > ... | Conditions.cs:61:9:64:9 | [b (line 57): false] {...} | true |
+| Conditions.cs:60:16:60:22 | [b (line 57): false] ... > ... | Conditions.cs:65:9:66:16 | [b (line 57): false] if (...) ... | false |
+| Conditions.cs:60:16:60:22 | [b (line 57): true] ... > ... | Conditions.cs:61:9:64:9 | [b (line 57): true] {...} | true |
+| Conditions.cs:60:16:60:22 | [b (line 57): true] ... > ... | Conditions.cs:65:9:66:16 | [b (line 57): true] if (...) ... | false |
+| Conditions.cs:60:22:60:22 | 0 | Conditions.cs:60:16:60:22 | ... > ... |  |
+| Conditions.cs:60:22:60:22 | [b (line 57): false] 0 | Conditions.cs:60:16:60:22 | [b (line 57): false] ... > ... |  |
+| Conditions.cs:60:22:60:22 | [b (line 57): true] 0 | Conditions.cs:60:16:60:22 | [b (line 57): true] ... > ... |  |
+| Conditions.cs:61:9:64:9 | [b (line 57): false] {...} | Conditions.cs:62:13:63:20 | [b (line 57): false] if (...) ... |  |
+| Conditions.cs:61:9:64:9 | [b (line 57): true] {...} | Conditions.cs:62:13:63:20 | [b (line 57): true] if (...) ... |  |
+| Conditions.cs:61:9:64:9 | {...} | Conditions.cs:62:13:63:20 | if (...) ... |  |
+| Conditions.cs:62:13:63:20 | [b (line 57): false] if (...) ... | Conditions.cs:62:17:62:17 | [b (line 57): false] access to parameter b |  |
+| Conditions.cs:62:13:63:20 | [b (line 57): true] if (...) ... | Conditions.cs:62:17:62:17 | [b (line 57): true] access to parameter b |  |
+| Conditions.cs:62:13:63:20 | if (...) ... | Conditions.cs:62:17:62:17 | access to parameter b |  |
+| Conditions.cs:62:17:62:17 | [b (line 57): false] access to parameter b | Conditions.cs:60:16:60:16 | [b (line 57): false] access to parameter x | false |
+| Conditions.cs:62:17:62:17 | [b (line 57): true] access to parameter b | Conditions.cs:63:17:63:20 | [b (line 57): true] ...; | true |
+| Conditions.cs:62:17:62:17 | access to parameter b | Conditions.cs:60:16:60:16 | [b (line 57): false] access to parameter x | false |
+| Conditions.cs:62:17:62:17 | access to parameter b | Conditions.cs:63:17:63:20 | [b (line 57): true] ...; | true |
+| Conditions.cs:63:17:63:17 | [b (line 57): true] access to local variable y | Conditions.cs:63:17:63:19 | [b (line 57): true] ...++ |  |
+| Conditions.cs:63:17:63:19 | [b (line 57): true] ...++ | Conditions.cs:60:16:60:16 | [b (line 57): true] access to parameter x |  |
+| Conditions.cs:63:17:63:20 | [b (line 57): true] ...; | Conditions.cs:63:17:63:17 | [b (line 57): true] access to local variable y |  |
+| Conditions.cs:65:9:66:16 | [b (line 57): false] if (...) ... | Conditions.cs:65:13:65:13 | [b (line 57): false] access to parameter b |  |
+| Conditions.cs:65:9:66:16 | [b (line 57): true] if (...) ... | Conditions.cs:65:13:65:13 | [b (line 57): true] access to parameter b |  |
+| Conditions.cs:65:9:66:16 | if (...) ... | Conditions.cs:65:13:65:13 | access to parameter b |  |
+| Conditions.cs:65:13:65:13 | [b (line 57): false] access to parameter b | Conditions.cs:67:16:67:16 | access to local variable y | false |
+| Conditions.cs:65:13:65:13 | [b (line 57): true] access to parameter b | Conditions.cs:66:13:66:16 | ...; | true |
+| Conditions.cs:65:13:65:13 | access to parameter b | Conditions.cs:66:13:66:16 | ...; | true |
+| Conditions.cs:65:13:65:13 | access to parameter b | Conditions.cs:67:16:67:16 | access to local variable y | false |
+| Conditions.cs:66:13:66:13 | access to local variable y | Conditions.cs:66:13:66:15 | ...++ |  |
+| Conditions.cs:66:13:66:15 | ...++ | Conditions.cs:67:16:67:16 | access to local variable y |  |
+| Conditions.cs:66:13:66:16 | ...; | Conditions.cs:66:13:66:13 | access to local variable y |  |
+| Conditions.cs:67:9:67:17 | return ...; | Conditions.cs:57:9:57:10 | exit M5 (normal) | return |
+| Conditions.cs:67:16:67:16 | access to local variable y | Conditions.cs:67:9:67:17 | return ...; |  |
+| Conditions.cs:70:9:70:10 | enter M6 | Conditions.cs:71:5:84:5 | {...} |  |
+| Conditions.cs:70:9:70:10 | exit M6 (normal) | Conditions.cs:70:9:70:10 | exit M6 |  |
+| Conditions.cs:71:5:84:5 | {...} | Conditions.cs:72:9:72:30 | ... ...; |  |
+| Conditions.cs:72:9:72:30 | ... ...; | Conditions.cs:72:17:72:18 | access to parameter ss |  |
+| Conditions.cs:72:13:72:29 | Boolean b = ... | Conditions.cs:73:9:73:18 | ... ...; |  |
+| Conditions.cs:72:17:72:18 | access to parameter ss | Conditions.cs:72:17:72:25 | access to property Length |  |
+| Conditions.cs:72:17:72:25 | access to property Length | Conditions.cs:72:29:72:29 | 0 |  |
+| Conditions.cs:72:17:72:29 | ... > ... | Conditions.cs:72:13:72:29 | Boolean b = ... |  |
+| Conditions.cs:72:29:72:29 | 0 | Conditions.cs:72:17:72:29 | ... > ... |  |
+| Conditions.cs:73:9:73:18 | ... ...; | Conditions.cs:73:17:73:17 | 0 |  |
+| Conditions.cs:73:13:73:17 | Int32 x = ... | Conditions.cs:74:27:74:28 | access to parameter ss |  |
+| Conditions.cs:73:17:73:17 | 0 | Conditions.cs:73:13:73:17 | Int32 x = ... |  |
+| Conditions.cs:74:9:80:9 | foreach (... ... in ...) ... | Conditions.cs:74:22:74:22 | String _ | non-empty |
+| Conditions.cs:74:9:80:9 | foreach (... ... in ...) ... | Conditions.cs:81:9:82:16 | if (...) ... | empty |
+| Conditions.cs:74:22:74:22 | String _ | Conditions.cs:75:9:80:9 | {...} |  |
+| Conditions.cs:74:27:74:28 | access to parameter ss | Conditions.cs:74:9:80:9 | foreach (... ... in ...) ... |  |
+| Conditions.cs:75:9:80:9 | {...} | Conditions.cs:76:13:77:20 | if (...) ... |  |
+| Conditions.cs:76:13:77:20 | if (...) ... | Conditions.cs:76:17:76:17 | access to local variable b |  |
+| Conditions.cs:76:17:76:17 | access to local variable b | Conditions.cs:77:17:77:20 | ...; | true |
+| Conditions.cs:76:17:76:17 | access to local variable b | Conditions.cs:78:13:79:26 | if (...) ... | false |
+| Conditions.cs:77:17:77:17 | access to local variable x | Conditions.cs:77:17:77:19 | ...++ |  |
+| Conditions.cs:77:17:77:19 | ...++ | Conditions.cs:78:13:79:26 | if (...) ... |  |
+| Conditions.cs:77:17:77:20 | ...; | Conditions.cs:77:17:77:17 | access to local variable x |  |
+| Conditions.cs:78:13:79:26 | if (...) ... | Conditions.cs:78:17:78:17 | access to local variable x |  |
+| Conditions.cs:78:17:78:17 | access to local variable x | Conditions.cs:78:21:78:21 | 0 |  |
+| Conditions.cs:78:17:78:21 | ... > ... | Conditions.cs:74:9:80:9 | foreach (... ... in ...) ... | false |
+| Conditions.cs:78:17:78:21 | ... > ... | Conditions.cs:79:17:79:26 | ...; | true |
+| Conditions.cs:78:21:78:21 | 0 | Conditions.cs:78:17:78:21 | ... > ... |  |
+| Conditions.cs:79:17:79:25 | ... = ... | Conditions.cs:74:9:80:9 | foreach (... ... in ...) ... |  |
+| Conditions.cs:79:17:79:26 | ...; | Conditions.cs:79:21:79:25 | false |  |
+| Conditions.cs:79:21:79:25 | false | Conditions.cs:79:17:79:25 | ... = ... |  |
+| Conditions.cs:81:9:82:16 | if (...) ... | Conditions.cs:81:13:81:13 | access to local variable b |  |
+| Conditions.cs:81:13:81:13 | access to local variable b | Conditions.cs:82:13:82:16 | ...; | true |
+| Conditions.cs:81:13:81:13 | access to local variable b | Conditions.cs:83:16:83:16 | access to local variable x | false |
+| Conditions.cs:82:13:82:13 | access to local variable x | Conditions.cs:82:13:82:15 | ...++ |  |
+| Conditions.cs:82:13:82:15 | ...++ | Conditions.cs:83:16:83:16 | access to local variable x |  |
+| Conditions.cs:82:13:82:16 | ...; | Conditions.cs:82:13:82:13 | access to local variable x |  |
+| Conditions.cs:83:9:83:17 | return ...; | Conditions.cs:70:9:70:10 | exit M6 (normal) | return |
+| Conditions.cs:83:16:83:16 | access to local variable x | Conditions.cs:83:9:83:17 | return ...; |  |
+| Conditions.cs:86:9:86:10 | enter M7 | Conditions.cs:87:5:100:5 | {...} |  |
+| Conditions.cs:86:9:86:10 | exit M7 (normal) | Conditions.cs:86:9:86:10 | exit M7 |  |
+| Conditions.cs:87:5:100:5 | {...} | Conditions.cs:88:9:88:30 | ... ...; |  |
+| Conditions.cs:88:9:88:30 | ... ...; | Conditions.cs:88:17:88:18 | access to parameter ss |  |
+| Conditions.cs:88:13:88:29 | Boolean b = ... | Conditions.cs:89:9:89:18 | ... ...; |  |
+| Conditions.cs:88:17:88:18 | access to parameter ss | Conditions.cs:88:17:88:25 | access to property Length |  |
+| Conditions.cs:88:17:88:25 | access to property Length | Conditions.cs:88:29:88:29 | 0 |  |
+| Conditions.cs:88:17:88:29 | ... > ... | Conditions.cs:88:13:88:29 | Boolean b = ... |  |
+| Conditions.cs:88:29:88:29 | 0 | Conditions.cs:88:17:88:29 | ... > ... |  |
+| Conditions.cs:89:9:89:18 | ... ...; | Conditions.cs:89:17:89:17 | 0 |  |
+| Conditions.cs:89:13:89:17 | Int32 x = ... | Conditions.cs:90:27:90:28 | access to parameter ss |  |
+| Conditions.cs:89:17:89:17 | 0 | Conditions.cs:89:13:89:17 | Int32 x = ... |  |
+| Conditions.cs:90:9:98:9 | foreach (... ... in ...) ... | Conditions.cs:90:22:90:22 | String _ | non-empty |
+| Conditions.cs:90:9:98:9 | foreach (... ... in ...) ... | Conditions.cs:99:16:99:16 | access to local variable x | empty |
+| Conditions.cs:90:22:90:22 | String _ | Conditions.cs:91:9:98:9 | {...} |  |
+| Conditions.cs:90:27:90:28 | access to parameter ss | Conditions.cs:90:9:98:9 | foreach (... ... in ...) ... |  |
+| Conditions.cs:91:9:98:9 | {...} | Conditions.cs:92:13:93:20 | if (...) ... |  |
+| Conditions.cs:92:13:93:20 | if (...) ... | Conditions.cs:92:17:92:17 | access to local variable b |  |
+| Conditions.cs:92:17:92:17 | access to local variable b | Conditions.cs:93:17:93:20 | ...; | true |
+| Conditions.cs:92:17:92:17 | access to local variable b | Conditions.cs:94:13:95:26 | if (...) ... | false |
+| Conditions.cs:93:17:93:17 | access to local variable x | Conditions.cs:93:17:93:19 | ...++ |  |
+| Conditions.cs:93:17:93:19 | ...++ | Conditions.cs:94:13:95:26 | if (...) ... |  |
+| Conditions.cs:93:17:93:20 | ...; | Conditions.cs:93:17:93:17 | access to local variable x |  |
+| Conditions.cs:94:13:95:26 | if (...) ... | Conditions.cs:94:17:94:17 | access to local variable x |  |
+| Conditions.cs:94:17:94:17 | access to local variable x | Conditions.cs:94:21:94:21 | 0 |  |
+| Conditions.cs:94:17:94:21 | ... > ... | Conditions.cs:95:17:95:26 | ...; | true |
+| Conditions.cs:94:17:94:21 | ... > ... | Conditions.cs:96:13:97:20 | if (...) ... | false |
+| Conditions.cs:94:21:94:21 | 0 | Conditions.cs:94:17:94:21 | ... > ... |  |
+| Conditions.cs:95:17:95:25 | ... = ... | Conditions.cs:96:13:97:20 | if (...) ... |  |
+| Conditions.cs:95:17:95:26 | ...; | Conditions.cs:95:21:95:25 | false |  |
+| Conditions.cs:95:21:95:25 | false | Conditions.cs:95:17:95:25 | ... = ... |  |
+| Conditions.cs:96:13:97:20 | if (...) ... | Conditions.cs:96:17:96:17 | access to local variable b |  |
+| Conditions.cs:96:17:96:17 | access to local variable b | Conditions.cs:90:9:98:9 | foreach (... ... in ...) ... | false |
+| Conditions.cs:96:17:96:17 | access to local variable b | Conditions.cs:97:17:97:20 | ...; | true |
+| Conditions.cs:97:17:97:17 | access to local variable x | Conditions.cs:97:17:97:19 | ...++ |  |
+| Conditions.cs:97:17:97:19 | ...++ | Conditions.cs:90:9:98:9 | foreach (... ... in ...) ... |  |
+| Conditions.cs:97:17:97:20 | ...; | Conditions.cs:97:17:97:17 | access to local variable x |  |
+| Conditions.cs:99:9:99:17 | return ...; | Conditions.cs:86:9:86:10 | exit M7 (normal) | return |
+| Conditions.cs:99:16:99:16 | access to local variable x | Conditions.cs:99:9:99:17 | return ...; |  |
+| Conditions.cs:102:12:102:13 | enter M8 | Conditions.cs:103:5:111:5 | {...} |  |
+| Conditions.cs:102:12:102:13 | exit M8 (normal) | Conditions.cs:102:12:102:13 | exit M8 |  |
+| Conditions.cs:103:5:111:5 | {...} | Conditions.cs:104:9:104:29 | ... ...; |  |
+| Conditions.cs:104:9:104:29 | ... ...; | Conditions.cs:104:17:104:17 | access to parameter b |  |
+| Conditions.cs:104:13:104:28 | String x = ... | Conditions.cs:105:9:106:20 | if (...) ... |  |
+| Conditions.cs:104:17:104:17 | access to parameter b | Conditions.cs:104:17:104:28 | call to method ToString |  |
+| Conditions.cs:104:17:104:28 | call to method ToString | Conditions.cs:104:13:104:28 | String x = ... |  |
+| 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:20 | [b (line 102): true] ...; | true |
+| Conditions.cs:105:13:105:13 | access to parameter b | Conditions.cs:107:9:109:24 | [b (line 102): false] if (...) ... | false |
+| Conditions.cs:106:13:106:13 | [b (line 102): true] access to local variable x | Conditions.cs:106:18:106:19 | [b (line 102): true] "" |  |
+| Conditions.cs:106:13:106:19 | [b (line 102): true] ... + ... | Conditions.cs:106:13:106:19 | [b (line 102): true] ... = ... |  |
+| Conditions.cs:106:13:106:19 | [b (line 102): true] ... = ... | Conditions.cs:107:9:109:24 | [b (line 102): true] if (...) ... |  |
+| Conditions.cs:106:13:106:20 | [b (line 102): true] ...; | Conditions.cs:106:13:106:13 | [b (line 102): true] access to local variable x |  |
+| Conditions.cs:106:18:106:19 | [b (line 102): true] "" | Conditions.cs:106:13:106:19 | [b (line 102): true] ... + ... |  |
+| Conditions.cs:107:9:109:24 | [b (line 102): false] if (...) ... | Conditions.cs:107:13:107:13 | [b (line 102): false] access to local variable x |  |
+| Conditions.cs:107:9:109:24 | [b (line 102): true] if (...) ... | Conditions.cs:107:13:107:13 | [b (line 102): true] access to local variable x |  |
+| Conditions.cs:107:13:107:13 | [b (line 102): false] access to local variable x | Conditions.cs:107:13:107:20 | [b (line 102): false] access to property Length |  |
+| Conditions.cs:107:13:107:13 | [b (line 102): true] access to local variable x | Conditions.cs:107:13:107:20 | [b (line 102): true] access to property Length |  |
+| Conditions.cs:107:13:107:20 | [b (line 102): false] access to property Length | Conditions.cs:107:24:107:24 | [b (line 102): false] 0 |  |
+| Conditions.cs:107:13:107:20 | [b (line 102): true] access to property Length | Conditions.cs:107:24:107:24 | [b (line 102): true] 0 |  |
+| Conditions.cs:107:13:107:24 | [b (line 102): false] ... > ... | Conditions.cs:108:13:109:24 | [b (line 102): false] if (...) ... | true |
+| Conditions.cs:107:13:107:24 | [b (line 102): false] ... > ... | Conditions.cs:110:16:110:16 | access to local variable x | false |
+| Conditions.cs:107:13:107:24 | [b (line 102): true] ... > ... | Conditions.cs:108:13:109:24 | [b (line 102): true] if (...) ... | true |
+| Conditions.cs:107:13:107:24 | [b (line 102): true] ... > ... | Conditions.cs:110:16:110:16 | access to local variable x | false |
+| Conditions.cs:107:24:107:24 | [b (line 102): false] 0 | Conditions.cs:107:13:107:24 | [b (line 102): false] ... > ... |  |
+| Conditions.cs:107:24:107:24 | [b (line 102): true] 0 | Conditions.cs:107:13:107:24 | [b (line 102): true] ... > ... |  |
+| Conditions.cs:108:13:109:24 | [b (line 102): false] if (...) ... | Conditions.cs:108:18:108:18 | [b (line 102): false] access to parameter b |  |
+| Conditions.cs:108:13:109:24 | [b (line 102): true] if (...) ... | Conditions.cs:108:18:108:18 | [b (line 102): true] access to parameter b |  |
+| Conditions.cs:108:17:108:18 | [false] !... | Conditions.cs:110:16:110:16 | access to local variable x | false |
+| Conditions.cs:108:17:108:18 | [true] !... | Conditions.cs:109:17:109:24 | ...; | true |
+| Conditions.cs:108:18:108:18 | [b (line 102): false] access to parameter b | Conditions.cs:108:17:108:18 | [true] !... | false |
+| Conditions.cs:108:18:108:18 | [b (line 102): true] access to parameter b | Conditions.cs:108:17:108:18 | [false] !... | 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: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: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 | {...} |  |
+| Conditions.cs:113:10:113:11 | exit M9 (normal) | Conditions.cs:113:10:113:11 | exit M9 |  |
+| Conditions.cs:114:5:124:5 | {...} | Conditions.cs:115:9:115:24 | ... ...; |  |
+| Conditions.cs:115:9:115:24 | ... ...; | Conditions.cs:115:20:115:23 | null |  |
+| Conditions.cs:115:16:115:23 | String s = ... | Conditions.cs:116:9:123:9 | for (...;...;...) ... |  |
+| Conditions.cs:115:20:115:23 | null | Conditions.cs:115:16:115:23 | String s = ... |  |
+| Conditions.cs:116:9:123:9 | for (...;...;...) ... | Conditions.cs:116:22:116:22 | 0 |  |
+| Conditions.cs:116:18:116:22 | Int32 i = ... | Conditions.cs:116:25:116:25 | access to local variable i |  |
+| Conditions.cs:116:22:116:22 | 0 | Conditions.cs:116:18:116:22 | Int32 i = ... |  |
+| Conditions.cs:116:25:116:25 | access to local variable i | Conditions.cs:116:29:116:32 | access to parameter args |  |
+| Conditions.cs:116:25:116:39 | ... < ... | Conditions.cs:113:10:113:11 | exit M9 (normal) | false |
+| Conditions.cs:116:25:116:39 | ... < ... | Conditions.cs:117:9:123:9 | {...} | true |
+| Conditions.cs:116:29:116:32 | access to parameter args | Conditions.cs:116:29:116:39 | access to property Length |  |
+| Conditions.cs:116:29:116:39 | access to property Length | Conditions.cs:116:25:116:39 | ... < ... |  |
+| Conditions.cs:116:42:116:42 | access to local variable i | Conditions.cs:116:42:116:44 | ...++ |  |
+| Conditions.cs:116:42:116:44 | ...++ | Conditions.cs:116:25:116:25 | access to local variable i |  |
+| Conditions.cs:117:9:123:9 | {...} | Conditions.cs:118:13:118:44 | ... ...; |  |
+| Conditions.cs:118:13:118:44 | ... ...; | Conditions.cs:118:24:118:24 | access to local variable i |  |
+| Conditions.cs:118:17:118:43 | Boolean last = ... | Conditions.cs:119:13:120:23 | if (...) ... |  |
+| Conditions.cs:118:24:118:24 | access to local variable i | Conditions.cs:118:29:118:32 | access to parameter args |  |
+| Conditions.cs:118:24:118:43 | ... == ... | Conditions.cs:118:17:118:43 | Boolean last = ... |  |
+| Conditions.cs:118:29:118:32 | access to parameter args | Conditions.cs:118:29:118:39 | access to property Length |  |
+| Conditions.cs:118:29:118:39 | access to property Length | Conditions.cs:118:43:118:43 | 1 |  |
+| Conditions.cs:118:29:118:43 | ... - ... | Conditions.cs:118:24:118:43 | ... == ... |  |
+| Conditions.cs:118:43:118:43 | 1 | Conditions.cs:118:29:118:43 | ... - ... |  |
+| Conditions.cs:119:13:120:23 | if (...) ... | Conditions.cs:119:18:119:21 | access to local variable last |  |
+| Conditions.cs:119:17:119:21 | [false, last (line 118): true] !... | Conditions.cs:121:13:122:25 | [last (line 118): true] if (...) ... | false |
+| Conditions.cs:119:17:119:21 | [true, last (line 118): false] !... | Conditions.cs:120:17:120:23 | [last (line 118): false] ...; | true |
+| Conditions.cs:119:18:119:21 | access to local variable last | Conditions.cs:119:17:119:21 | [false, last (line 118): true] !... | true |
+| Conditions.cs:119:18:119:21 | access to local variable last | Conditions.cs:119:17:119:21 | [true, last (line 118): false] !... | false |
+| Conditions.cs:120:17:120:22 | [last (line 118): false] ... = ... | Conditions.cs:121:13:122:25 | [last (line 118): false] if (...) ... |  |
+| Conditions.cs:120:17:120:23 | [last (line 118): false] ...; | Conditions.cs:120:21:120:22 | [last (line 118): false] "" |  |
+| Conditions.cs:120:21:120:22 | [last (line 118): false] "" | Conditions.cs:120:17:120:22 | [last (line 118): false] ... = ... |  |
+| Conditions.cs:121:13:122:25 | [last (line 118): false] if (...) ... | Conditions.cs:121:17:121:20 | [last (line 118): false] access to local variable last |  |
+| Conditions.cs:121:13:122:25 | [last (line 118): true] if (...) ... | Conditions.cs:121:17:121:20 | [last (line 118): true] access to local variable last |  |
+| Conditions.cs:121:17:121:20 | [last (line 118): false] access to local variable last | Conditions.cs:116:42:116:42 | access to local variable i | false |
+| Conditions.cs:121:17:121:20 | [last (line 118): true] access to local variable last | Conditions.cs:122:17:122:25 | ...; | true |
+| Conditions.cs:122:17:122:24 | ... = ... | Conditions.cs:116:42:116:42 | access to local variable i |  |
+| Conditions.cs:122:17:122:25 | ...; | Conditions.cs:122:21:122:24 | null |  |
+| Conditions.cs:122:21:122:24 | null | Conditions.cs:122:17:122:24 | ... = ... |  |
+| Conditions.cs:129:10:129:12 | enter M10 | Conditions.cs:130:5:141:5 | {...} |  |
+| Conditions.cs:130:5:141:5 | {...} | Conditions.cs:131:9:140:9 | while (...) ... |  |
+| Conditions.cs:131:9:140:9 | while (...) ... | Conditions.cs:131:16:131:19 | true |  |
+| Conditions.cs:131:16:131:19 | [Field1 (line 129): false] true | Conditions.cs:132:9:140:9 | [Field1 (line 129): false] {...} | true |
+| Conditions.cs:131:16:131:19 | [Field1 (line 129): true, Field2 (line 129): false] true | Conditions.cs:132:9:140:9 | [Field1 (line 129): true, Field2 (line 129): false] {...} | true |
+| Conditions.cs:131:16:131:19 | [Field1 (line 129): true, Field2 (line 129): true] true | Conditions.cs:132:9:140:9 | [Field1 (line 129): true, Field2 (line 129): true] {...} | true |
+| Conditions.cs:131:16:131:19 | true | Conditions.cs:132:9:140:9 | {...} | true |
+| Conditions.cs:132:9:140:9 | [Field1 (line 129): false] {...} | Conditions.cs:133:13:139:13 | [Field1 (line 129): false] if (...) ... |  |
+| Conditions.cs:132:9:140:9 | [Field1 (line 129): true, Field2 (line 129): false] {...} | Conditions.cs:133:13:139:13 | [Field1 (line 129): true, Field2 (line 129): false] if (...) ... |  |
+| Conditions.cs:132:9:140:9 | [Field1 (line 129): true, Field2 (line 129): true] {...} | Conditions.cs:133:13:139:13 | [Field1 (line 129): true, Field2 (line 129): true] if (...) ... |  |
+| Conditions.cs:132:9:140:9 | {...} | Conditions.cs:133:13:139:13 | if (...) ... |  |
+| Conditions.cs:133:13:139:13 | [Field1 (line 129): false] if (...) ... | Conditions.cs:133:17:133:22 | [Field1 (line 129): false] this access |  |
+| Conditions.cs:133:13:139:13 | [Field1 (line 129): true, Field2 (line 129): false] if (...) ... | Conditions.cs:133:17:133:22 | [Field1 (line 129): true, Field2 (line 129): false] this access |  |
+| Conditions.cs:133:13:139:13 | [Field1 (line 129): true, Field2 (line 129): true] if (...) ... | Conditions.cs:133:17:133:22 | [Field1 (line 129): true, Field2 (line 129): true] this access |  |
+| Conditions.cs:133:13:139:13 | if (...) ... | Conditions.cs:133:17:133:22 | this access |  |
+| Conditions.cs:133:17:133:22 | [Field1 (line 129): false] access to field Field1 | Conditions.cs:131:16:131:19 | [Field1 (line 129): false] true | false |
+| Conditions.cs:133:17:133:22 | [Field1 (line 129): false] this access | Conditions.cs:133:17:133:22 | [Field1 (line 129): false] access to field Field1 |  |
+| Conditions.cs:133:17:133:22 | [Field1 (line 129): true, Field2 (line 129): false] access to field Field1 | Conditions.cs:134:13:139:13 | [Field1 (line 129): true, Field2 (line 129): false] {...} | true |
+| Conditions.cs:133:17:133:22 | [Field1 (line 129): true, Field2 (line 129): false] this access | Conditions.cs:133:17:133:22 | [Field1 (line 129): true, Field2 (line 129): false] access to field Field1 |  |
+| Conditions.cs:133:17:133:22 | [Field1 (line 129): true, Field2 (line 129): true] access to field Field1 | Conditions.cs:134:13:139:13 | [Field1 (line 129): true, Field2 (line 129): true] {...} | true |
+| Conditions.cs:133:17:133:22 | [Field1 (line 129): true, Field2 (line 129): true] this access | Conditions.cs:133:17:133:22 | [Field1 (line 129): true, Field2 (line 129): true] access to field Field1 |  |
+| Conditions.cs:133:17:133:22 | access to field Field1 | Conditions.cs:131:16:131:19 | [Field1 (line 129): false] true | false |
+| Conditions.cs:133:17:133:22 | access to field Field1 | Conditions.cs:134:13:139:13 | [Field1 (line 129): true] {...} | true |
+| Conditions.cs:133:17:133:22 | this access | Conditions.cs:133:17:133:22 | access to field Field1 |  |
+| Conditions.cs:134:13:139:13 | [Field1 (line 129): true, Field2 (line 129): false] {...} | Conditions.cs:135:17:138:17 | [Field1 (line 129): true, Field2 (line 129): false] if (...) ... |  |
+| Conditions.cs:134:13:139:13 | [Field1 (line 129): true, Field2 (line 129): true] {...} | Conditions.cs:135:17:138:17 | [Field1 (line 129): true, Field2 (line 129): true] if (...) ... |  |
+| Conditions.cs:134:13:139:13 | [Field1 (line 129): true] {...} | Conditions.cs:135:17:138:17 | [Field1 (line 129): true] if (...) ... |  |
+| Conditions.cs:135:17:138:17 | [Field1 (line 129): true, Field2 (line 129): false] if (...) ... | Conditions.cs:135:21:135:26 | [Field1 (line 129): true, Field2 (line 129): false] this access |  |
+| Conditions.cs:135:17:138:17 | [Field1 (line 129): true, Field2 (line 129): true] if (...) ... | Conditions.cs:135:21:135:26 | [Field1 (line 129): true, Field2 (line 129): true] this access |  |
+| Conditions.cs:135:17:138:17 | [Field1 (line 129): true] if (...) ... | Conditions.cs:135:21:135:26 | [Field1 (line 129): true] this access |  |
+| Conditions.cs:135:21:135:26 | [Field1 (line 129): true, Field2 (line 129): false] access to field Field2 | Conditions.cs:131:16:131:19 | [Field1 (line 129): true, Field2 (line 129): false] true | false |
+| Conditions.cs:135:21:135:26 | [Field1 (line 129): true, Field2 (line 129): false] this access | Conditions.cs:135:21:135:26 | [Field1 (line 129): true, Field2 (line 129): false] access to field Field2 |  |
+| Conditions.cs:135:21:135:26 | [Field1 (line 129): true, Field2 (line 129): true] access to field Field2 | Conditions.cs:136:17:138:17 | [Field1 (line 129): true, Field2 (line 129): true] {...} | true |
+| Conditions.cs:135:21:135:26 | [Field1 (line 129): true, Field2 (line 129): true] this access | Conditions.cs:135:21:135:26 | [Field1 (line 129): true, Field2 (line 129): true] access to field Field2 |  |
+| Conditions.cs:135:21:135:26 | [Field1 (line 129): true] access to field Field2 | Conditions.cs:131:16:131:19 | [Field1 (line 129): true, Field2 (line 129): false] true | false |
+| Conditions.cs:135:21:135:26 | [Field1 (line 129): true] access to field Field2 | Conditions.cs:136:17:138:17 | [Field1 (line 129): true, Field2 (line 129): true] {...} | true |
+| Conditions.cs:135:21:135:26 | [Field1 (line 129): true] this access | Conditions.cs:135:21:135:26 | [Field1 (line 129): true] access to field Field2 |  |
+| Conditions.cs:136:17:138:17 | [Field1 (line 129): true, Field2 (line 129): true] {...} | Conditions.cs:137:21:137:38 | [Field1 (line 129): true, Field2 (line 129): true] ...; |  |
+| Conditions.cs:137:21:137:26 | [Field1 (line 129): true, Field2 (line 129): true] access to field Field1 | Conditions.cs:137:21:137:37 | [Field1 (line 129): true, Field2 (line 129): true] call to method ToString |  |
+| Conditions.cs:137:21:137:26 | [Field1 (line 129): true, Field2 (line 129): true] this access | Conditions.cs:137:21:137:26 | [Field1 (line 129): true, Field2 (line 129): true] access to field Field1 |  |
+| Conditions.cs:137:21:137:37 | [Field1 (line 129): true, Field2 (line 129): true] call to method ToString | Conditions.cs:131:16:131:19 | [Field1 (line 129): true, Field2 (line 129): true] true |  |
+| Conditions.cs:137:21:137:38 | [Field1 (line 129): true, Field2 (line 129): true] ...; | Conditions.cs:137:21:137:26 | [Field1 (line 129): true, Field2 (line 129): true] this access |  |
+| Conditions.cs:143:10:143:12 | enter M11 | Conditions.cs:144:5:150:5 | {...} |  |
+| Conditions.cs:143:10:143:12 | exit M11 (normal) | Conditions.cs:143:10:143:12 | exit M11 |  |
+| Conditions.cs:144:5:150:5 | {...} | Conditions.cs:145:9:145:30 | ... ...; |  |
+| Conditions.cs:145:9:145:30 | ... ...; | Conditions.cs:145:17:145:17 | access to parameter b |  |
+| Conditions.cs:145:13:145:29 | [b (line 143): false] String s = ... | Conditions.cs:146:9:149:49 | [b (line 143): false] if (...) ... |  |
+| Conditions.cs:145:13:145:29 | [b (line 143): true] String s = ... | Conditions.cs:146:9:149:49 | [b (line 143): true] if (...) ... |  |
+| Conditions.cs:145:17:145:17 | access to parameter b | Conditions.cs:145:21:145:23 | [b (line 143): true] "a" | true |
+| Conditions.cs:145:17:145:17 | access to parameter b | Conditions.cs:145:27:145:29 | [b (line 143): false] "b" | false |
+| Conditions.cs:145:17:145:29 | [b (line 143): false] ... ? ... : ... | Conditions.cs:145:13:145:29 | [b (line 143): false] String s = ... |  |
+| Conditions.cs:145:17:145:29 | [b (line 143): true] ... ? ... : ... | Conditions.cs:145:13:145:29 | [b (line 143): true] String s = ... |  |
+| Conditions.cs:145:21:145:23 | [b (line 143): true] "a" | Conditions.cs:145:17:145:29 | [b (line 143): true] ... ? ... : ... |  |
+| Conditions.cs:145:27:145:29 | [b (line 143): false] "b" | Conditions.cs:145:17:145:29 | [b (line 143): false] ... ? ... : ... |  |
+| Conditions.cs:146:9:149:49 | [b (line 143): false] if (...) ... | Conditions.cs:146:13:146:13 | [b (line 143): false] access to parameter b |  |
+| Conditions.cs:146:9:149:49 | [b (line 143): true] if (...) ... | Conditions.cs:146:13:146:13 | [b (line 143): true] access to parameter b |  |
+| Conditions.cs:146:13:146:13 | [b (line 143): false] access to parameter b | Conditions.cs:149:13:149:49 | ...; | false |
+| Conditions.cs:146:13:146:13 | [b (line 143): true] access to parameter b | Conditions.cs:147:13:147:49 | ...; | true |
+| Conditions.cs:147:13:147:48 | call to method WriteLine | Conditions.cs:143:10:143:12 | exit M11 (normal) |  |
+| Conditions.cs:147:13:147:49 | ...; | Conditions.cs:147:40:147:43 | "a = " |  |
+| Conditions.cs:147:38:147:47 | $"..." | Conditions.cs:147:13:147:48 | call to method WriteLine |  |
+| Conditions.cs:147:40:147:43 | "a = " | Conditions.cs:147:45:147:45 | access to local variable s |  |
+| Conditions.cs:147:45:147:45 | access to local variable s | Conditions.cs:147:38:147:47 | $"..." |  |
+| Conditions.cs:149:13:149:48 | call to method WriteLine | Conditions.cs:143:10:143:12 | exit M11 (normal) |  |
+| Conditions.cs:149:13:149:49 | ...; | Conditions.cs:149:40:149:43 | "b = " |  |
+| Conditions.cs:149:38:149:47 | $"..." | Conditions.cs:149:13:149:48 | call to method WriteLine |  |
+| Conditions.cs:149:40:149:43 | "b = " | Conditions.cs:149:45:149:45 | access to local variable s |  |
+| Conditions.cs:149:45:149:45 | access to local variable s | Conditions.cs:149:38:149:47 | $"..." |  |
+| ExitMethods.cs:6:7:6:17 | call to constructor Object | ExitMethods.cs:6:7:6:17 | {...} |  |
+| ExitMethods.cs:6:7:6:17 | enter ExitMethods | ExitMethods.cs:6:7:6:17 | call to constructor Object |  |
+| ExitMethods.cs:6:7:6:17 | exit ExitMethods (normal) | ExitMethods.cs:6:7:6:17 | exit ExitMethods |  |
+| ExitMethods.cs:6:7:6:17 | {...} | ExitMethods.cs:6:7:6:17 | exit ExitMethods (normal) |  |
+| ExitMethods.cs:8:10:8:11 | enter M1 | ExitMethods.cs:9:5:12:5 | {...} |  |
+| ExitMethods.cs:8:10:8:11 | exit M1 (normal) | ExitMethods.cs:8:10:8:11 | exit M1 |  |
+| ExitMethods.cs:9:5:12:5 | {...} | ExitMethods.cs:10:9:10:25 | ...; |  |
+| ExitMethods.cs:10:9:10:24 | call to method ErrorMaybe | ExitMethods.cs:11:9:11:15 | return ...; |  |
+| ExitMethods.cs:10:9:10:25 | ...; | ExitMethods.cs:10:20:10:23 | true |  |
+| ExitMethods.cs:10:20:10:23 | true | ExitMethods.cs:10:9:10:24 | call to method ErrorMaybe |  |
+| ExitMethods.cs:11:9:11:15 | return ...; | ExitMethods.cs:8:10:8:11 | exit M1 (normal) | return |
+| ExitMethods.cs:14:10:14:11 | enter M2 | ExitMethods.cs:15:5:18:5 | {...} |  |
+| ExitMethods.cs:14:10:14:11 | exit M2 (normal) | ExitMethods.cs:14:10:14:11 | exit M2 |  |
+| ExitMethods.cs:15:5:18:5 | {...} | ExitMethods.cs:16:9:16:26 | ...; |  |
+| ExitMethods.cs:16:9:16:25 | call to method ErrorMaybe | ExitMethods.cs:17:9:17:15 | return ...; |  |
+| ExitMethods.cs:16:9:16:26 | ...; | ExitMethods.cs:16:20:16:24 | false |  |
+| ExitMethods.cs:16:20:16:24 | false | ExitMethods.cs:16:9:16:25 | call to method ErrorMaybe |  |
+| ExitMethods.cs:17:9:17:15 | return ...; | ExitMethods.cs:14:10:14:11 | exit M2 (normal) | return |
+| ExitMethods.cs:20:10:20:11 | enter M3 | ExitMethods.cs:21:5:24:5 | {...} |  |
+| ExitMethods.cs:20:10:20:11 | exit M3 (abnormal) | ExitMethods.cs:20:10:20:11 | exit M3 |  |
+| ExitMethods.cs:21:5:24:5 | {...} | ExitMethods.cs:22:9:22:26 | ...; |  |
+| ExitMethods.cs:22:9:22:25 | call to method ErrorAlways | ExitMethods.cs:20:10:20:11 | exit M3 (abnormal) | exception(ArgumentException), exception(Exception) |
+| ExitMethods.cs:22:9:22:26 | ...; | ExitMethods.cs:22:21:22:24 | true |  |
+| ExitMethods.cs:22:21:22:24 | true | ExitMethods.cs:22:9:22:25 | call to method ErrorAlways |  |
+| ExitMethods.cs:26:10:26:11 | enter M4 | ExitMethods.cs:27:5:30:5 | {...} |  |
+| ExitMethods.cs:26:10:26:11 | exit M4 (abnormal) | ExitMethods.cs:26:10:26:11 | exit M4 |  |
+| ExitMethods.cs:27:5:30:5 | {...} | ExitMethods.cs:28:9:28:15 | ...; |  |
+| ExitMethods.cs:28:9:28:14 | call to method Exit | ExitMethods.cs:26:10:26:11 | exit M4 (abnormal) | exit |
+| ExitMethods.cs:28:9:28:14 | this access | ExitMethods.cs:28:9:28:14 | call to method Exit |  |
+| ExitMethods.cs:28:9:28:15 | ...; | ExitMethods.cs:28:9:28:14 | this access |  |
+| ExitMethods.cs:32:10:32:11 | enter M5 | ExitMethods.cs:33:5:36:5 | {...} |  |
+| ExitMethods.cs:32:10:32:11 | exit M5 (abnormal) | ExitMethods.cs:32:10:32:11 | exit M5 |  |
+| ExitMethods.cs:33:5:36:5 | {...} | ExitMethods.cs:34:9:34:26 | ...; |  |
+| ExitMethods.cs:34:9:34:25 | call to method ApplicationExit | ExitMethods.cs:32:10:32:11 | exit M5 (abnormal) | exit |
+| ExitMethods.cs:34:9:34:25 | this access | ExitMethods.cs:34:9:34:25 | call to method ApplicationExit |  |
+| ExitMethods.cs:34:9:34:26 | ...; | ExitMethods.cs:34:9:34:25 | this access |  |
+| ExitMethods.cs:38:10:38:11 | enter M6 | ExitMethods.cs:39:5:52:5 | {...} |  |
+| ExitMethods.cs:38:10:38:11 | exit M6 (normal) | ExitMethods.cs:38:10:38:11 | exit M6 |  |
+| ExitMethods.cs:39:5:52:5 | {...} | ExitMethods.cs:40:9:51:9 | try {...} ... |  |
+| ExitMethods.cs:40:9:51:9 | try {...} ... | ExitMethods.cs:41:9:43:9 | {...} |  |
+| ExitMethods.cs:41:9:43:9 | {...} | ExitMethods.cs:42:13:42:31 | ...; |  |
+| ExitMethods.cs:42:13:42:30 | call to method ErrorAlways | ExitMethods.cs:44:9:47:9 | [exception: ArgumentException] catch (...) {...} | exception(ArgumentException) |
+| ExitMethods.cs:42:13:42:30 | call to method ErrorAlways | ExitMethods.cs:44:9:47:9 | [exception: Exception] catch (...) {...} | exception(Exception) |
+| ExitMethods.cs:42:13:42:31 | ...; | ExitMethods.cs:42:25:42:29 | false |  |
+| ExitMethods.cs:42:25:42:29 | false | ExitMethods.cs:42:13:42:30 | call to method ErrorAlways |  |
+| ExitMethods.cs:44:9:47:9 | [exception: ArgumentException] catch (...) {...} | ExitMethods.cs:45:9:47:9 | {...} | match |
+| ExitMethods.cs:44:9:47:9 | [exception: Exception] catch (...) {...} | ExitMethods.cs:45:9:47:9 | {...} | match |
+| ExitMethods.cs:44:9:47:9 | [exception: Exception] catch (...) {...} | ExitMethods.cs:48:9:51:9 | [exception: Exception] catch (...) {...} | no-match |
+| ExitMethods.cs:45:9:47:9 | {...} | ExitMethods.cs:46:13:46:19 | return ...; |  |
+| ExitMethods.cs:46:13:46:19 | return ...; | ExitMethods.cs:38:10:38:11 | exit M6 (normal) | return |
+| ExitMethods.cs:48:9:51:9 | [exception: Exception] catch (...) {...} | ExitMethods.cs:49:9:51:9 | {...} | match |
+| ExitMethods.cs:49:9:51:9 | {...} | ExitMethods.cs:50:13:50:19 | return ...; |  |
+| ExitMethods.cs:50:13:50:19 | return ...; | ExitMethods.cs:38:10:38:11 | exit M6 (normal) | return |
+| ExitMethods.cs:54:10:54:11 | enter M7 | ExitMethods.cs:55:5:58:5 | {...} |  |
+| ExitMethods.cs:54:10:54:11 | exit M7 (abnormal) | ExitMethods.cs:54:10:54:11 | exit M7 |  |
+| ExitMethods.cs:55:5:58:5 | {...} | ExitMethods.cs:56:9:56:23 | ...; |  |
+| ExitMethods.cs:56:9:56:22 | call to method ErrorAlways2 | ExitMethods.cs:54:10:54:11 | exit M7 (abnormal) | exception(Exception) |
+| ExitMethods.cs:56:9:56:23 | ...; | ExitMethods.cs:56:9:56:22 | call to method ErrorAlways2 |  |
+| ExitMethods.cs:60:10:60:11 | enter M8 | ExitMethods.cs:61:5:64:5 | {...} |  |
+| ExitMethods.cs:60:10:60:11 | exit M8 (abnormal) | ExitMethods.cs:60:10:60:11 | exit M8 |  |
+| ExitMethods.cs:61:5:64:5 | {...} | ExitMethods.cs:62:9:62:23 | ...; |  |
+| ExitMethods.cs:62:9:62:22 | call to method ErrorAlways3 | ExitMethods.cs:60:10:60:11 | exit M8 (abnormal) | exception(Exception) |
+| ExitMethods.cs:62:9:62:23 | ...; | ExitMethods.cs:62:9:62:22 | call to method ErrorAlways3 |  |
+| ExitMethods.cs:66:17:66:26 | enter ErrorMaybe | ExitMethods.cs:67:5:70:5 | {...} |  |
+| ExitMethods.cs:66:17:66:26 | exit ErrorMaybe (abnormal) | ExitMethods.cs:66:17:66:26 | exit ErrorMaybe |  |
+| ExitMethods.cs:66:17:66:26 | exit ErrorMaybe (normal) | ExitMethods.cs:66:17:66:26 | exit ErrorMaybe |  |
+| ExitMethods.cs:67:5:70:5 | {...} | ExitMethods.cs:68:9:69:34 | if (...) ... |  |
+| ExitMethods.cs:68:9:69:34 | if (...) ... | ExitMethods.cs:68:13:68:13 | access to parameter b |  |
+| ExitMethods.cs:68:13:68:13 | access to parameter b | ExitMethods.cs:66:17:66:26 | exit ErrorMaybe (normal) | false |
+| ExitMethods.cs:68:13:68:13 | access to parameter b | ExitMethods.cs:69:19:69:33 | object creation of type Exception | true |
+| ExitMethods.cs:69:13:69:34 | throw ...; | ExitMethods.cs:66:17:66:26 | exit ErrorMaybe (abnormal) | exception(Exception) |
+| ExitMethods.cs:69:19:69:33 | object creation of type Exception | ExitMethods.cs:69:13:69:34 | throw ...; |  |
+| ExitMethods.cs:72:17:72:27 | enter ErrorAlways | ExitMethods.cs:73:5:78:5 | {...} |  |
+| ExitMethods.cs:72:17:72:27 | exit ErrorAlways (abnormal) | ExitMethods.cs:72:17:72:27 | exit ErrorAlways |  |
+| ExitMethods.cs:73:5:78:5 | {...} | ExitMethods.cs:74:9:77:45 | if (...) ... |  |
+| ExitMethods.cs:74:9:77:45 | if (...) ... | ExitMethods.cs:74:13:74:13 | access to parameter b |  |
+| ExitMethods.cs:74:13:74:13 | access to parameter b | ExitMethods.cs:75:19:75:33 | object creation of type Exception | true |
+| ExitMethods.cs:74:13:74:13 | access to parameter b | ExitMethods.cs:77:41:77:43 | "b" | false |
+| ExitMethods.cs:75:13:75:34 | throw ...; | ExitMethods.cs:72:17:72:27 | exit ErrorAlways (abnormal) | exception(Exception) |
+| ExitMethods.cs:75:19:75:33 | object creation of type Exception | ExitMethods.cs:75:13:75:34 | throw ...; |  |
+| ExitMethods.cs:77:13:77:45 | throw ...; | ExitMethods.cs:72:17:72:27 | exit ErrorAlways (abnormal) | exception(ArgumentException) |
+| ExitMethods.cs:77:19:77:44 | object creation of type ArgumentException | ExitMethods.cs:77:13:77:45 | throw ...; |  |
+| ExitMethods.cs:77:41:77:43 | "b" | ExitMethods.cs:77:19:77:44 | object creation of type ArgumentException |  |
+| ExitMethods.cs:80:17:80:28 | enter ErrorAlways2 | ExitMethods.cs:81:5:83:5 | {...} |  |
+| ExitMethods.cs:80:17:80:28 | exit ErrorAlways2 (abnormal) | ExitMethods.cs:80:17:80:28 | exit ErrorAlways2 |  |
+| ExitMethods.cs:81:5:83:5 | {...} | ExitMethods.cs:82:15:82:29 | object creation of type Exception |  |
+| ExitMethods.cs:82:9:82:30 | throw ...; | ExitMethods.cs:80:17:80:28 | exit ErrorAlways2 (abnormal) | exception(Exception) |
+| ExitMethods.cs:82:15:82:29 | object creation of type Exception | ExitMethods.cs:82:9:82:30 | throw ...; |  |
+| ExitMethods.cs:85:17:85:28 | enter ErrorAlways3 | ExitMethods.cs:85:41:85:55 | object creation of type Exception |  |
+| ExitMethods.cs:85:17:85:28 | exit ErrorAlways3 (abnormal) | ExitMethods.cs:85:17:85:28 | exit ErrorAlways3 |  |
+| ExitMethods.cs:85:35:85:55 | throw ... | ExitMethods.cs:85:17:85:28 | exit ErrorAlways3 (abnormal) | exception(Exception) |
+| ExitMethods.cs:85:41:85:55 | object creation of type Exception | ExitMethods.cs:85:35:85:55 | throw ... |  |
+| ExitMethods.cs:87:10:87:13 | enter Exit | ExitMethods.cs:88:5:90:5 | {...} |  |
+| ExitMethods.cs:87:10:87:13 | exit Exit (abnormal) | ExitMethods.cs:87:10:87:13 | exit Exit |  |
+| ExitMethods.cs:88:5:90:5 | {...} | ExitMethods.cs:89:9:89:28 | ...; |  |
+| ExitMethods.cs:89:9:89:27 | call to method Exit | ExitMethods.cs:87:10:87:13 | exit Exit (abnormal) | exit |
+| ExitMethods.cs:89:9:89:28 | ...; | ExitMethods.cs:89:26:89:26 | 0 |  |
+| ExitMethods.cs:89:26:89:26 | 0 | ExitMethods.cs:89:9:89:27 | call to method Exit |  |
+| ExitMethods.cs:92:10:92:18 | enter ExitInTry | ExitMethods.cs:93:5:103:5 | {...} |  |
+| ExitMethods.cs:92:10:92:18 | exit ExitInTry (abnormal) | ExitMethods.cs:92:10:92:18 | exit ExitInTry |  |
+| ExitMethods.cs:93:5:103:5 | {...} | ExitMethods.cs:94:9:102:9 | try {...} ... |  |
+| ExitMethods.cs:94:9:102:9 | try {...} ... | ExitMethods.cs:95:9:97:9 | {...} |  |
+| ExitMethods.cs:95:9:97:9 | {...} | ExitMethods.cs:96:13:96:19 | ...; |  |
+| ExitMethods.cs:96:13:96:18 | call to method Exit | ExitMethods.cs:92:10:92:18 | exit ExitInTry (abnormal) | exit |
+| ExitMethods.cs:96:13:96:18 | this access | ExitMethods.cs:96:13:96:18 | call to method Exit |  |
+| ExitMethods.cs:96:13:96:19 | ...; | ExitMethods.cs:96:13:96:18 | this access |  |
+| ExitMethods.cs:105:10:105:24 | enter ApplicationExit | ExitMethods.cs:106:5:108:5 | {...} |  |
+| ExitMethods.cs:105:10:105:24 | exit ApplicationExit (abnormal) | ExitMethods.cs:105:10:105:24 | exit ApplicationExit |  |
+| ExitMethods.cs:106:5:108:5 | {...} | ExitMethods.cs:107:9:107:48 | ...; |  |
+| ExitMethods.cs:107:9:107:47 | call to method Exit | ExitMethods.cs:105:10:105:24 | exit ApplicationExit (abnormal) | exit |
+| ExitMethods.cs:107:9:107:48 | ...; | ExitMethods.cs:107:9:107:47 | call to method Exit |  |
+| ExitMethods.cs:110:13:110:21 | enter ThrowExpr | ExitMethods.cs:111:5:113:5 | {...} |  |
+| ExitMethods.cs:110:13:110:21 | exit ThrowExpr (abnormal) | ExitMethods.cs:110:13:110:21 | exit ThrowExpr |  |
+| ExitMethods.cs:110:13:110:21 | exit ThrowExpr (normal) | ExitMethods.cs:110:13:110:21 | exit ThrowExpr |  |
+| ExitMethods.cs:111:5:113:5 | {...} | ExitMethods.cs:112:16:112:20 | access to parameter input |  |
+| ExitMethods.cs:112:9:112:77 | return ...; | ExitMethods.cs:110:13:110:21 | exit ThrowExpr (normal) | return |
+| ExitMethods.cs:112:16:112:20 | access to parameter input | ExitMethods.cs:112:25:112:25 | 0 |  |
+| ExitMethods.cs:112:16:112:25 | ... != ... | ExitMethods.cs:112:29:112:29 | 1 | true |
+| ExitMethods.cs:112:16:112:25 | ... != ... | ExitMethods.cs:112:69:112:75 | "input" | false |
+| ExitMethods.cs:112:16:112:76 | ... ? ... : ... | ExitMethods.cs:112:9:112:77 | return ...; |  |
+| ExitMethods.cs:112:25:112:25 | 0 | ExitMethods.cs:112:25:112:25 | (...) ... |  |
+| ExitMethods.cs:112:25:112:25 | (...) ... | ExitMethods.cs:112:16:112:25 | ... != ... |  |
+| ExitMethods.cs:112:29:112:29 | 1 | ExitMethods.cs:112:29:112:29 | (...) ... |  |
+| ExitMethods.cs:112:29:112:29 | (...) ... | ExitMethods.cs:112:33:112:37 | access to parameter input |  |
+| ExitMethods.cs:112:29:112:37 | ... / ... | ExitMethods.cs:112:16:112:76 | ... ? ... : ... |  |
+| ExitMethods.cs:112:33:112:37 | access to parameter input | ExitMethods.cs:112:29:112:37 | ... / ... |  |
+| ExitMethods.cs:112:41:112:76 | throw ... | ExitMethods.cs:110:13:110:21 | exit ThrowExpr (abnormal) | exception(ArgumentException) |
+| ExitMethods.cs:112:47:112:76 | object creation of type ArgumentException | ExitMethods.cs:112:41:112:76 | throw ... |  |
+| ExitMethods.cs:112:69:112:75 | "input" | ExitMethods.cs:112:47:112:76 | object creation of type ArgumentException |  |
+| ExitMethods.cs:115:16:115:34 | enter ExtensionMethodCall | ExitMethods.cs:116:5:118:5 | {...} |  |
+| ExitMethods.cs:115:16:115:34 | exit ExtensionMethodCall (normal) | ExitMethods.cs:115:16:115:34 | exit ExtensionMethodCall |  |
+| ExitMethods.cs:116:5:118:5 | {...} | ExitMethods.cs:117:16:117:16 | access to parameter s |  |
+| ExitMethods.cs:117:9:117:39 | return ...; | ExitMethods.cs:115:16:115:34 | exit ExtensionMethodCall (normal) | return |
+| ExitMethods.cs:117:16:117:16 | access to parameter s | ExitMethods.cs:117:27:117:29 | - |  |
+| ExitMethods.cs:117:16:117:30 | call to method Contains | ExitMethods.cs:117:34:117:34 | 0 | true |
+| ExitMethods.cs:117:16:117:30 | call to method Contains | ExitMethods.cs:117:38:117:38 | 1 | false |
+| ExitMethods.cs:117:16:117:38 | ... ? ... : ... | ExitMethods.cs:117:9:117:39 | return ...; |  |
+| ExitMethods.cs:117:27:117:29 | - | ExitMethods.cs:117:16:117:30 | call to method Contains |  |
+| ExitMethods.cs:117:34:117:34 | 0 | ExitMethods.cs:117:16:117:38 | ... ? ... : ... |  |
+| ExitMethods.cs:117:38:117:38 | 1 | ExitMethods.cs:117:16:117:38 | ... ? ... : ... |  |
+| ExitMethods.cs:120:17:120:32 | enter FailingAssertion | ExitMethods.cs:121:5:124:5 | {...} |  |
+| ExitMethods.cs:120:17:120:32 | exit FailingAssertion (abnormal) | ExitMethods.cs:120:17:120:32 | exit FailingAssertion |  |
+| ExitMethods.cs:121:5:124:5 | {...} | ExitMethods.cs:122:9:122:29 | ...; |  |
+| ExitMethods.cs:122:9:122:28 | [assertion failure] call to method IsTrue | ExitMethods.cs:120:17:120:32 | exit FailingAssertion (abnormal) | exception(AssertFailedException) |
+| ExitMethods.cs:122:9:122:29 | ...; | ExitMethods.cs:122:23:122:27 | false |  |
+| ExitMethods.cs:122:23:122:27 | false | ExitMethods.cs:122:9:122:28 | [assertion failure] call to method IsTrue | false |
+| ExitMethods.cs:126:17:126:33 | enter FailingAssertion2 | ExitMethods.cs:127:5:130:5 | {...} |  |
+| ExitMethods.cs:126:17:126:33 | exit FailingAssertion2 (abnormal) | ExitMethods.cs:126:17:126:33 | exit FailingAssertion2 |  |
+| ExitMethods.cs:127:5:130:5 | {...} | ExitMethods.cs:128:9:128:27 | ...; |  |
+| ExitMethods.cs:128:9:128:26 | call to method FailingAssertion | ExitMethods.cs:126:17:126:33 | exit FailingAssertion2 (abnormal) | exception(AssertFailedException) |
+| ExitMethods.cs:128:9:128:26 | this access | ExitMethods.cs:128:9:128:26 | call to method FailingAssertion |  |
+| ExitMethods.cs:128:9:128:27 | ...; | ExitMethods.cs:128:9:128:26 | this access |  |
+| ExitMethods.cs:132:10:132:20 | enter AssertFalse | ExitMethods.cs:132:48:132:48 | access to parameter b |  |
+| ExitMethods.cs:132:10:132:20 | exit AssertFalse (abnormal) | ExitMethods.cs:132:10:132:20 | exit AssertFalse |  |
+| ExitMethods.cs:132:10:132:20 | exit AssertFalse (normal) | ExitMethods.cs:132:10:132:20 | exit AssertFalse |  |
+| ExitMethods.cs:132:33:132:49 | [assertion failure] call to method IsFalse | ExitMethods.cs:132:10:132:20 | exit AssertFalse (abnormal) | exception(AssertFailedException) |
+| ExitMethods.cs:132:33:132:49 | [assertion success] call to method IsFalse | ExitMethods.cs:132:10:132:20 | exit AssertFalse (normal) |  |
+| ExitMethods.cs:132:48:132:48 | access to parameter b | ExitMethods.cs:132:33:132:49 | [assertion failure] call to method IsFalse | true |
+| ExitMethods.cs:132:48:132:48 | access to parameter b | ExitMethods.cs:132:33:132:49 | [assertion success] call to method IsFalse | false |
+| ExitMethods.cs:134:17:134:33 | enter FailingAssertion3 | ExitMethods.cs:135:5:138:5 | {...} |  |
+| ExitMethods.cs:134:17:134:33 | exit FailingAssertion3 (abnormal) | ExitMethods.cs:134:17:134:33 | exit FailingAssertion3 |  |
+| ExitMethods.cs:135:5:138:5 | {...} | ExitMethods.cs:136:9:136:26 | ...; |  |
+| ExitMethods.cs:136:9:136:25 | [assertion failure] call to method AssertFalse | ExitMethods.cs:134:17:134:33 | exit FailingAssertion3 (abnormal) | exception(AssertFailedException) |
+| ExitMethods.cs:136:9:136:25 | this access | ExitMethods.cs:136:21:136:24 | true |  |
+| ExitMethods.cs:136:9:136:26 | ...; | ExitMethods.cs:136:9:136:25 | this access |  |
+| ExitMethods.cs:136:21:136:24 | true | ExitMethods.cs:136:9:136:25 | [assertion failure] call to method AssertFalse | true |
+| ExitMethods.cs:140:17:140:42 | enter ExceptionDispatchInfoThrow | ExitMethods.cs:141:5:147:5 | {...} |  |
+| ExitMethods.cs:140:17:140:42 | exit ExceptionDispatchInfoThrow (abnormal) | ExitMethods.cs:140:17:140:42 | exit ExceptionDispatchInfoThrow |  |
+| ExitMethods.cs:141:5:147:5 | {...} | ExitMethods.cs:142:9:145:53 | if (...) ... |  |
+| ExitMethods.cs:142:9:145:53 | if (...) ... | ExitMethods.cs:142:13:142:13 | access to parameter b |  |
+| ExitMethods.cs:142:13:142:13 | access to parameter b | ExitMethods.cs:143:13:143:43 | ...; | true |
+| ExitMethods.cs:142:13:142:13 | access to parameter b | ExitMethods.cs:145:13:145:53 | ...; | false |
+| ExitMethods.cs:143:13:143:42 | call to method Throw | ExitMethods.cs:140:17:140:42 | exit ExceptionDispatchInfoThrow (abnormal) | exception(ArgumentException) |
+| ExitMethods.cs:143:13:143:43 | ...; | ExitMethods.cs:143:41:143:41 | access to parameter e |  |
+| ExitMethods.cs:143:41:143:41 | access to parameter e | ExitMethods.cs:143:13:143:42 | call to method Throw |  |
+| ExitMethods.cs:145:13:145:44 | call to method Capture | ExitMethods.cs:145:13:145:52 | call to method Throw |  |
+| ExitMethods.cs:145:13:145:52 | call to method Throw | ExitMethods.cs:140:17:140:42 | exit ExceptionDispatchInfoThrow (abnormal) | exception(Exception) |
+| ExitMethods.cs:145:13:145:53 | ...; | ExitMethods.cs:145:43:145:43 | access to parameter e |  |
+| ExitMethods.cs:145:43:145:43 | access to parameter e | ExitMethods.cs:145:13:145:44 | call to method Capture |  |
+| Extensions.cs:5:23:5:29 | enter ToInt32 | Extensions.cs:6:5:8:5 | {...} |  |
+| Extensions.cs:5:23:5:29 | exit ToInt32 (normal) | Extensions.cs:5:23:5:29 | exit ToInt32 |  |
+| Extensions.cs:6:5:8:5 | {...} | Extensions.cs:7:28:7:28 | access to parameter s |  |
+| Extensions.cs:7:9:7:30 | return ...; | Extensions.cs:5:23:5:29 | exit ToInt32 (normal) | return |
+| Extensions.cs:7:16:7:29 | call to method Parse | Extensions.cs:7:9:7:30 | return ...; |  |
+| Extensions.cs:7:28:7:28 | access to parameter s | Extensions.cs:7:16:7:29 | call to method Parse |  |
+| Extensions.cs:10:24:10:29 | enter ToBool | Extensions.cs:11:5:13:5 | {...} |  |
+| Extensions.cs:10:24:10:29 | exit ToBool (normal) | Extensions.cs:10:24:10:29 | exit ToBool |  |
+| Extensions.cs:11:5:13:5 | {...} | Extensions.cs:12:16:12:16 | access to parameter f |  |
+| Extensions.cs:12:9:12:20 | return ...; | Extensions.cs:10:24:10:29 | exit ToBool (normal) | return |
+| Extensions.cs:12:16:12:16 | access to parameter f | Extensions.cs:12:18:12:18 | access to parameter s |  |
+| Extensions.cs:12:16:12:19 | delegate call | Extensions.cs:12:9:12:20 | return ...; |  |
+| Extensions.cs:12:18:12:18 | access to parameter s | Extensions.cs:12:16:12:19 | delegate call |  |
+| Extensions.cs:15:23:15:33 | enter CallToInt32 | Extensions.cs:15:48:15:50 | "0" |  |
+| Extensions.cs:15:23:15:33 | exit CallToInt32 (normal) | Extensions.cs:15:23:15:33 | exit CallToInt32 |  |
+| Extensions.cs:15:40:15:51 | call to method ToInt32 | Extensions.cs:15:23:15:33 | exit CallToInt32 (normal) |  |
+| Extensions.cs:15:48:15:50 | "0" | Extensions.cs:15:40:15:51 | call to method ToInt32 |  |
+| Extensions.cs:20:17:20:20 | enter Main | Extensions.cs:21:5:26:5 | {...} |  |
+| Extensions.cs:20:17:20:20 | exit Main (normal) | Extensions.cs:20:17:20:20 | exit Main |  |
+| Extensions.cs:21:5:26:5 | {...} | Extensions.cs:22:9:22:20 | ...; |  |
+| Extensions.cs:22:9:22:9 | access to parameter s | Extensions.cs:22:9:22:19 | call to method ToInt32 |  |
+| Extensions.cs:22:9:22:19 | call to method ToInt32 | Extensions.cs:23:9:23:31 | ...; |  |
+| Extensions.cs:22:9:22:20 | ...; | Extensions.cs:22:9:22:9 | access to parameter s |  |
+| Extensions.cs:23:9:23:30 | call to method ToInt32 | Extensions.cs:24:9:24:46 | ...; |  |
+| Extensions.cs:23:9:23:31 | ...; | Extensions.cs:23:28:23:29 | "" |  |
+| Extensions.cs:23:28:23:29 | "" | Extensions.cs:23:9:23:30 | call to method ToInt32 |  |
+| Extensions.cs:24:9:24:45 | call to method ToBool | Extensions.cs:25:9:25:34 | ...; |  |
+| Extensions.cs:24:9:24:46 | ...; | Extensions.cs:24:27:24:32 | "true" |  |
+| Extensions.cs:24:27:24:32 | "true" | Extensions.cs:24:35:24:44 | access to method Parse |  |
+| Extensions.cs:24:35:24:44 | access to method Parse | Extensions.cs:24:35:24:44 | delegate creation of type Func<String,Boolean> |  |
+| Extensions.cs:24:35:24:44 | delegate creation of type Func<String,Boolean> | Extensions.cs:24:9:24:45 | call to method ToBool |  |
+| Extensions.cs:25:9:25:14 | "true" | Extensions.cs:25:23:25:32 | access to method Parse |  |
+| Extensions.cs:25:9:25:33 | call to method ToBool | Extensions.cs:20:17:20:20 | exit Main (normal) |  |
+| Extensions.cs:25:9:25:34 | ...; | Extensions.cs:25:9:25:14 | "true" |  |
+| Extensions.cs:25:23:25:32 | access to method Parse | Extensions.cs:25:23:25:32 | delegate creation of type Func<String,Boolean> |  |
+| Extensions.cs:25:23:25:32 | delegate creation of type Func<String,Boolean> | Extensions.cs:25:9:25:33 | call to method ToBool |  |
+| Finally.cs:3:14:3:20 | call to constructor Object | Finally.cs:3:14:3:20 | {...} |  |
+| Finally.cs:3:14:3:20 | enter Finally | Finally.cs:3:14:3:20 | call to constructor Object |  |
+| Finally.cs:3:14:3:20 | exit Finally (normal) | Finally.cs:3:14:3:20 | exit Finally |  |
+| Finally.cs:3:14:3:20 | {...} | Finally.cs:3:14:3:20 | exit Finally (normal) |  |
+| Finally.cs:7:10:7:11 | enter M1 | Finally.cs:8:5:17:5 | {...} |  |
+| Finally.cs:7:10:7:11 | exit M1 (abnormal) | Finally.cs:7:10:7:11 | exit M1 |  |
+| Finally.cs:7:10:7:11 | exit M1 (normal) | Finally.cs:7:10:7:11 | exit M1 |  |
+| Finally.cs:8:5:17:5 | {...} | Finally.cs:9:9:16:9 | try {...} ... |  |
+| Finally.cs:9:9:16:9 | try {...} ... | Finally.cs:10:9:12:9 | {...} |  |
+| Finally.cs:10:9:12:9 | {...} | Finally.cs:11:13:11:38 | ...; |  |
+| Finally.cs:11:13:11:37 | call to method WriteLine | Finally.cs:14:9:16:9 | [finally: exception(Exception)] {...} | exception(Exception) |
+| Finally.cs:11:13:11:37 | call to method WriteLine | Finally.cs:14:9:16:9 | {...} |  |
+| Finally.cs:11:13:11:38 | ...; | Finally.cs:11:31:11:36 | "Try1" |  |
+| Finally.cs:11:31:11:36 | "Try1" | Finally.cs:11:13:11:37 | call to method WriteLine |  |
+| Finally.cs:14:9:16:9 | [finally: exception(Exception)] {...} | Finally.cs:15:13:15:41 | [finally: exception(Exception)] ...; |  |
+| Finally.cs:14:9:16:9 | {...} | Finally.cs:15:13:15:41 | ...; |  |
+| Finally.cs:15:13:15:40 | [finally: exception(Exception)] call to method WriteLine | Finally.cs:7:10:7:11 | exit M1 (abnormal) | exception(Exception) |
+| Finally.cs:15:13:15:40 | call to method WriteLine | Finally.cs:7:10:7:11 | exit M1 (normal) |  |
+| Finally.cs:15:13:15:41 | ...; | Finally.cs:15:31:15:39 | "Finally" |  |
+| Finally.cs:15:13:15:41 | [finally: exception(Exception)] ...; | Finally.cs:15:31:15:39 | [finally: exception(Exception)] "Finally" |  |
+| Finally.cs:15:31:15:39 | "Finally" | Finally.cs:15:13:15:40 | call to method WriteLine |  |
+| Finally.cs:15:31:15:39 | [finally: exception(Exception)] "Finally" | Finally.cs:15:13:15:40 | [finally: exception(Exception)] call to method WriteLine |  |
+| Finally.cs:19:10:19:11 | enter M2 | Finally.cs:20:5:52:5 | {...} |  |
+| Finally.cs:19:10:19:11 | exit M2 (abnormal) | Finally.cs:19:10:19:11 | exit M2 |  |
+| Finally.cs:19:10:19:11 | exit M2 (normal) | Finally.cs:19:10:19:11 | exit M2 |  |
+| Finally.cs:20:5:52:5 | {...} | Finally.cs:21:9:51:9 | try {...} ... |  |
+| Finally.cs:21:9:51:9 | try {...} ... | Finally.cs:22:9:25:9 | {...} |  |
+| Finally.cs:22:9:25:9 | {...} | Finally.cs:23:13:23:38 | ...; |  |
+| Finally.cs:23:13:23:37 | call to method WriteLine | Finally.cs:24:13:24:19 | return ...; |  |
+| Finally.cs:23:13:23:37 | call to method WriteLine | Finally.cs:26:9:29:9 | [exception: Exception] catch (...) {...} | exception(Exception) |
+| Finally.cs:23:13:23:38 | ...; | Finally.cs:23:31:23:36 | "Try2" |  |
+| Finally.cs:23:31:23:36 | "Try2" | Finally.cs:23:13:23:37 | call to method WriteLine |  |
+| Finally.cs:24:13:24:19 | return ...; | Finally.cs:49:9:51:9 | [finally: return] {...} | return |
+| Finally.cs:26:9:29:9 | [exception: Exception] catch (...) {...} | Finally.cs:26:38:26:39 | [exception: Exception] IOException ex | match |
+| Finally.cs:26:9:29:9 | [exception: Exception] catch (...) {...} | Finally.cs:30:9:40:9 | [exception: Exception] catch (...) {...} | no-match |
+| Finally.cs:26:38:26:39 | [exception: Exception] IOException ex | Finally.cs:26:48:26:51 | [exception: Exception] true |  |
+| Finally.cs:26:48:26:51 | [exception: Exception] true | Finally.cs:27:9:29:9 | {...} | true |
+| Finally.cs:27:9:29:9 | {...} | Finally.cs:28:13:28:18 | throw ...; |  |
+| Finally.cs:28:13:28:18 | throw ...; | Finally.cs:49:9:51:9 | [finally: exception(IOException)] {...} | exception(IOException) |
+| Finally.cs:30:9:40:9 | [exception: Exception] catch (...) {...} | Finally.cs:30:41:30:42 | [exception: Exception] ArgumentException ex | match |
+| Finally.cs:30:9:40:9 | [exception: Exception] catch (...) {...} | Finally.cs:41:9:43:9 | [exception: Exception] catch (...) {...} | no-match |
+| Finally.cs:30:41:30:42 | [exception: Exception] ArgumentException ex | Finally.cs:31:9:40:9 | {...} |  |
+| Finally.cs:31:9:40:9 | {...} | Finally.cs:32:13:39:13 | try {...} ... |  |
+| Finally.cs:32:13:39:13 | try {...} ... | Finally.cs:33:13:35:13 | {...} |  |
+| Finally.cs:33:13:35:13 | {...} | Finally.cs:34:17:34:32 | if (...) ... |  |
+| Finally.cs:34:17:34:32 | if (...) ... | Finally.cs:34:21:34:24 | true |  |
+| Finally.cs:34:21:34:24 | true | Finally.cs:34:27:34:32 | throw ...; | true |
+| Finally.cs:34:27:34:32 | throw ...; | Finally.cs:37:13:39:13 | [finally: exception(ArgumentException)] {...} | exception(ArgumentException) |
+| Finally.cs:37:13:39:13 | [finally: exception(ArgumentException)] {...} | Finally.cs:38:37:38:42 | [finally: exception(ArgumentException)] "Boo!" |  |
+| Finally.cs:38:17:38:44 | [finally: exception(ArgumentException)] throw ...; | Finally.cs:49:9:51:9 | [finally: exception(Exception)] {...} | exception(Exception) |
+| Finally.cs:38:23:38:43 | [finally: exception(ArgumentException)] object creation of type Exception | Finally.cs:38:17:38:44 | [finally: exception(ArgumentException)] throw ...; |  |
+| Finally.cs:38:37:38:42 | [finally: exception(ArgumentException)] "Boo!" | Finally.cs:38:23:38:43 | [finally: exception(ArgumentException)] object creation of type Exception |  |
+| Finally.cs:41:9:43:9 | [exception: Exception] catch (...) {...} | Finally.cs:42:9:43:9 | {...} | match |
+| Finally.cs:42:9:43:9 | {...} | Finally.cs:49:9:51:9 | {...} |  |
+| Finally.cs:49:9:51:9 | [finally: exception(Exception)] {...} | Finally.cs:50:13:50:41 | [finally: exception(Exception)] ...; |  |
+| Finally.cs:49:9:51:9 | [finally: exception(IOException)] {...} | Finally.cs:50:13:50:41 | [finally: exception(IOException)] ...; |  |
+| Finally.cs:49:9:51:9 | [finally: return] {...} | Finally.cs:50:13:50:41 | [finally: return] ...; |  |
+| Finally.cs:49:9:51:9 | {...} | Finally.cs:50:13:50:41 | ...; |  |
+| Finally.cs:50:13:50:40 | [finally: exception(Exception)] call to method WriteLine | Finally.cs:19:10:19:11 | exit M2 (abnormal) | exception(Exception) |
+| Finally.cs:50:13:50:40 | [finally: exception(IOException)] call to method WriteLine | Finally.cs:19:10:19:11 | exit M2 (abnormal) | exception(IOException) |
+| Finally.cs:50:13:50:40 | [finally: return] call to method WriteLine | Finally.cs:19:10:19:11 | exit M2 (normal) | return |
+| Finally.cs:50:13:50:40 | call to method WriteLine | Finally.cs:19:10:19:11 | exit M2 (normal) |  |
+| Finally.cs:50:13:50:41 | ...; | Finally.cs:50:31:50:39 | "Finally" |  |
+| Finally.cs:50:13:50:41 | [finally: exception(Exception)] ...; | Finally.cs:50:31:50:39 | [finally: exception(Exception)] "Finally" |  |
+| Finally.cs:50:13:50:41 | [finally: exception(IOException)] ...; | Finally.cs:50:31:50:39 | [finally: exception(IOException)] "Finally" |  |
+| Finally.cs:50:13:50:41 | [finally: return] ...; | Finally.cs:50:31:50:39 | [finally: return] "Finally" |  |
+| Finally.cs:50:31:50:39 | "Finally" | Finally.cs:50:13:50:40 | call to method WriteLine |  |
+| Finally.cs:50:31:50:39 | [finally: exception(Exception)] "Finally" | Finally.cs:50:13:50:40 | [finally: exception(Exception)] call to method WriteLine |  |
+| Finally.cs:50:31:50:39 | [finally: exception(IOException)] "Finally" | Finally.cs:50:13:50:40 | [finally: exception(IOException)] call to method WriteLine |  |
+| Finally.cs:50:31:50:39 | [finally: return] "Finally" | Finally.cs:50:13:50:40 | [finally: return] call to method WriteLine |  |
+| Finally.cs:54:10:54:11 | enter M3 | Finally.cs:55:5:72:5 | {...} |  |
+| Finally.cs:54:10:54:11 | exit M3 (abnormal) | Finally.cs:54:10:54:11 | exit M3 |  |
+| Finally.cs:54:10:54:11 | exit M3 (normal) | Finally.cs:54:10:54:11 | exit M3 |  |
+| Finally.cs:55:5:72:5 | {...} | Finally.cs:56:9:71:9 | try {...} ... |  |
+| Finally.cs:56:9:71:9 | try {...} ... | Finally.cs:57:9:60:9 | {...} |  |
+| Finally.cs:57:9:60:9 | {...} | Finally.cs:58:13:58:38 | ...; |  |
+| Finally.cs:58:13:58:37 | call to method WriteLine | Finally.cs:59:13:59:19 | return ...; |  |
+| Finally.cs:58:13:58:37 | call to method WriteLine | Finally.cs:61:9:64:9 | [exception: Exception] catch (...) {...} | exception(Exception) |
+| Finally.cs:58:13:58:38 | ...; | Finally.cs:58:31:58:36 | "Try3" |  |
+| Finally.cs:58:31:58:36 | "Try3" | Finally.cs:58:13:58:37 | call to method WriteLine |  |
+| Finally.cs:59:13:59:19 | return ...; | Finally.cs:69:9:71:9 | [finally: return] {...} | return |
+| Finally.cs:61:9:64:9 | [exception: Exception] catch (...) {...} | Finally.cs:61:38:61:39 | [exception: Exception] IOException ex | match |
+| Finally.cs:61:9:64:9 | [exception: Exception] catch (...) {...} | Finally.cs:65:9:67:9 | [exception: Exception] catch (...) {...} | no-match |
+| Finally.cs:61:38:61:39 | [exception: Exception] IOException ex | Finally.cs:61:48:61:51 | [exception: Exception] true |  |
+| Finally.cs:61:48:61:51 | [exception: Exception] true | Finally.cs:62:9:64:9 | {...} | true |
+| Finally.cs:62:9:64:9 | {...} | Finally.cs:63:13:63:18 | throw ...; |  |
+| Finally.cs:63:13:63:18 | throw ...; | Finally.cs:69:9:71:9 | [finally: exception(IOException)] {...} | exception(IOException) |
+| Finally.cs:65:9:67:9 | [exception: Exception] catch (...) {...} | Finally.cs:65:26:65:26 | [exception: Exception] Exception e | match |
+| Finally.cs:65:26:65:26 | [exception: Exception] Exception e | Finally.cs:65:35:65:35 | [exception: Exception] access to local variable e |  |
+| Finally.cs:65:35:65:35 | [exception: Exception] access to local variable e | Finally.cs:65:35:65:43 | [exception: Exception] access to property Message |  |
+| Finally.cs:65:35:65:43 | [exception: Exception] access to property Message | Finally.cs:65:48:65:51 | [exception: Exception] null |  |
+| Finally.cs:65:35:65:51 | [exception: Exception] ... != ... | Finally.cs:66:9:67:9 | {...} | true |
+| Finally.cs:65:35:65:51 | [exception: Exception] ... != ... | Finally.cs:69:9:71:9 | [finally: exception(Exception)] {...} | exception(Exception) |
+| Finally.cs:65:48:65:51 | [exception: Exception] null | Finally.cs:65:35:65:51 | [exception: Exception] ... != ... |  |
+| Finally.cs:66:9:67:9 | {...} | Finally.cs:69:9:71:9 | {...} |  |
+| Finally.cs:69:9:71:9 | [finally: exception(Exception)] {...} | Finally.cs:70:13:70:41 | [finally: exception(Exception)] ...; |  |
+| Finally.cs:69:9:71:9 | [finally: exception(IOException)] {...} | Finally.cs:70:13:70:41 | [finally: exception(IOException)] ...; |  |
+| Finally.cs:69:9:71:9 | [finally: return] {...} | Finally.cs:70:13:70:41 | [finally: return] ...; |  |
+| Finally.cs:69:9:71:9 | {...} | Finally.cs:70:13:70:41 | ...; |  |
+| Finally.cs:70:13:70:40 | [finally: exception(Exception)] call to method WriteLine | Finally.cs:54:10:54:11 | exit M3 (abnormal) | exception(Exception) |
+| Finally.cs:70:13:70:40 | [finally: exception(IOException)] call to method WriteLine | Finally.cs:54:10:54:11 | exit M3 (abnormal) | exception(IOException) |
+| Finally.cs:70:13:70:40 | [finally: return] call to method WriteLine | Finally.cs:54:10:54:11 | exit M3 (normal) | return |
+| Finally.cs:70:13:70:40 | call to method WriteLine | Finally.cs:54:10:54:11 | exit M3 (normal) |  |
+| Finally.cs:70:13:70:41 | ...; | Finally.cs:70:31:70:39 | "Finally" |  |
+| Finally.cs:70:13:70:41 | [finally: exception(Exception)] ...; | Finally.cs:70:31:70:39 | [finally: exception(Exception)] "Finally" |  |
+| Finally.cs:70:13:70:41 | [finally: exception(IOException)] ...; | Finally.cs:70:31:70:39 | [finally: exception(IOException)] "Finally" |  |
+| Finally.cs:70:13:70:41 | [finally: return] ...; | Finally.cs:70:31:70:39 | [finally: return] "Finally" |  |
+| Finally.cs:70:31:70:39 | "Finally" | Finally.cs:70:13:70:40 | call to method WriteLine |  |
+| Finally.cs:70:31:70:39 | [finally: exception(Exception)] "Finally" | Finally.cs:70:13:70:40 | [finally: exception(Exception)] call to method WriteLine |  |
+| Finally.cs:70:31:70:39 | [finally: exception(IOException)] "Finally" | Finally.cs:70:13:70:40 | [finally: exception(IOException)] call to method WriteLine |  |
+| Finally.cs:70:31:70:39 | [finally: return] "Finally" | Finally.cs:70:13:70:40 | [finally: return] call to method WriteLine |  |
+| Finally.cs:74:10:74:11 | enter M4 | Finally.cs:75:5:101:5 | {...} |  |
+| Finally.cs:74:10:74:11 | exit M4 (abnormal) | Finally.cs:74:10:74:11 | exit M4 |  |
+| Finally.cs:74:10:74:11 | exit M4 (normal) | Finally.cs:74:10:74:11 | exit M4 |  |
+| Finally.cs:75:5:101:5 | {...} | Finally.cs:76:9:76:19 | ... ...; |  |
+| Finally.cs:76:9:76:19 | ... ...; | Finally.cs:76:17:76:18 | 10 |  |
+| Finally.cs:76:13:76:18 | Int32 i = ... | Finally.cs:77:9:100:9 | while (...) ... |  |
+| Finally.cs:76:17:76:18 | 10 | Finally.cs:76:13:76:18 | Int32 i = ... |  |
+| Finally.cs:77:9:100:9 | while (...) ... | Finally.cs:77:16:77:16 | access to local variable i |  |
+| Finally.cs:77:16:77:16 | access to local variable i | Finally.cs:77:20:77:20 | 0 |  |
+| Finally.cs:77:16:77:20 | ... > ... | Finally.cs:74:10:74:11 | exit M4 (normal) | false |
+| Finally.cs:77:16:77:20 | ... > ... | Finally.cs:78:9:100:9 | {...} | true |
+| Finally.cs:77:20:77:20 | 0 | Finally.cs:77:16:77:20 | ... > ... |  |
+| Finally.cs:78:9:100:9 | {...} | Finally.cs:79:13:99:13 | try {...} ... |  |
+| Finally.cs:79:13:99:13 | try {...} ... | Finally.cs:80:13:87:13 | {...} |  |
+| Finally.cs:80:13:87:13 | {...} | Finally.cs:81:17:82:27 | if (...) ... |  |
+| Finally.cs:81:17:82:27 | if (...) ... | Finally.cs:81:21:81:21 | access to local variable i |  |
+| Finally.cs:81:21:81:21 | access to local variable i | Finally.cs:81:26:81:26 | 0 |  |
+| Finally.cs:81:21:81:26 | ... == ... | Finally.cs:82:21:82:27 | return ...; | true |
+| Finally.cs:81:21:81:26 | ... == ... | Finally.cs:83:17:84:29 | if (...) ... | false |
+| Finally.cs:81:26:81:26 | 0 | Finally.cs:81:21:81:26 | ... == ... |  |
+| Finally.cs:82:21:82:27 | return ...; | Finally.cs:89:13:99:13 | [finally: return] {...} | return |
+| Finally.cs:83:17:84:29 | if (...) ... | Finally.cs:83:21:83:21 | access to local variable i |  |
+| Finally.cs:83:21:83:21 | access to local variable i | Finally.cs:83:26:83:26 | 1 |  |
+| Finally.cs:83:21:83:26 | ... == ... | Finally.cs:84:21:84:29 | continue; | true |
+| Finally.cs:83:21:83:26 | ... == ... | Finally.cs:85:17:86:26 | if (...) ... | false |
+| Finally.cs:83:26:83:26 | 1 | Finally.cs:83:21:83:26 | ... == ... |  |
+| Finally.cs:84:21:84:29 | continue; | Finally.cs:89:13:99:13 | [finally: continue] {...} | continue |
+| Finally.cs:85:17:86:26 | if (...) ... | Finally.cs:85:21:85:21 | access to local variable i |  |
+| Finally.cs:85:21:85:21 | access to local variable i | Finally.cs:85:26:85:26 | 2 |  |
+| Finally.cs:85:21:85:26 | ... == ... | Finally.cs:86:21:86:26 | break; | true |
+| Finally.cs:85:21:85:26 | ... == ... | Finally.cs:89:13:99:13 | {...} | false |
+| Finally.cs:85:26:85:26 | 2 | Finally.cs:85:21:85:26 | ... == ... |  |
+| Finally.cs:86:21:86:26 | break; | Finally.cs:89:13:99:13 | [finally: break] {...} | break |
+| Finally.cs:89:13:99:13 | [finally: break] {...} | Finally.cs:90:17:98:17 | [finally: break] try {...} ... |  |
+| Finally.cs:89:13:99:13 | [finally: continue] {...} | Finally.cs:90:17:98:17 | [finally: continue] try {...} ... |  |
+| Finally.cs:89:13:99:13 | [finally: return] {...} | Finally.cs:90:17:98:17 | [finally: return] try {...} ... |  |
+| Finally.cs:89:13:99:13 | {...} | Finally.cs:90:17:98:17 | try {...} ... |  |
+| Finally.cs:90:17:98:17 | [finally: break] try {...} ... | Finally.cs:91:17:94:17 | [finally: break] {...} |  |
+| Finally.cs:90:17:98:17 | [finally: continue] try {...} ... | Finally.cs:91:17:94:17 | [finally: continue] {...} |  |
+| Finally.cs:90:17:98:17 | [finally: return] try {...} ... | Finally.cs:91:17:94:17 | [finally: return] {...} |  |
+| Finally.cs:90:17:98:17 | try {...} ... | Finally.cs:91:17:94:17 | {...} |  |
+| Finally.cs:91:17:94:17 | [finally: break] {...} | Finally.cs:92:21:93:46 | [finally: break] if (...) ... |  |
+| Finally.cs:91:17:94:17 | [finally: continue] {...} | Finally.cs:92:21:93:46 | [finally: continue] if (...) ... |  |
+| Finally.cs:91:17:94:17 | [finally: return] {...} | Finally.cs:92:21:93:46 | [finally: return] if (...) ... |  |
+| Finally.cs:91:17:94:17 | {...} | Finally.cs:92:21:93:46 | if (...) ... |  |
+| Finally.cs:92:21:93:46 | [finally: break] if (...) ... | Finally.cs:92:25:92:25 | [finally: break] access to local variable i |  |
+| Finally.cs:92:21:93:46 | [finally: continue] if (...) ... | Finally.cs:92:25:92:25 | [finally: continue] access to local variable i |  |
+| Finally.cs:92:21:93:46 | [finally: return] if (...) ... | Finally.cs:92:25:92:25 | [finally: return] access to local variable i |  |
+| Finally.cs:92:21:93:46 | if (...) ... | Finally.cs:92:25:92:25 | access to local variable i |  |
+| Finally.cs:92:25:92:25 | [finally: break] access to local variable i | Finally.cs:92:30:92:30 | [finally: break] 3 |  |
+| Finally.cs:92:25:92:25 | [finally: continue] access to local variable i | Finally.cs:92:30:92:30 | [finally: continue] 3 |  |
+| Finally.cs:92:25:92:25 | [finally: return] access to local variable i | Finally.cs:92:30:92:30 | [finally: return] 3 |  |
+| Finally.cs:92:25:92:25 | access to local variable i | Finally.cs:92:30:92:30 | 3 |  |
+| Finally.cs:92:25:92:30 | ... == ... | Finally.cs:93:31:93:45 | object creation of type Exception | true |
+| Finally.cs:92:25:92:30 | ... == ... | Finally.cs:96:17:98:17 | {...} | false |
+| Finally.cs:92:25:92:30 | [finally: break] ... == ... | Finally.cs:93:31:93:45 | [finally: break] object creation of type Exception | true |
+| Finally.cs:92:25:92:30 | [finally: break] ... == ... | Finally.cs:96:17:98:17 | [finally: break] {...} | false |
+| Finally.cs:92:25:92:30 | [finally: continue] ... == ... | Finally.cs:93:31:93:45 | [finally: continue] object creation of type Exception | true |
+| Finally.cs:92:25:92:30 | [finally: continue] ... == ... | Finally.cs:96:17:98:17 | [finally: continue] {...} | false |
+| Finally.cs:92:25:92:30 | [finally: return] ... == ... | Finally.cs:93:31:93:45 | [finally: return] object creation of type Exception | true |
+| Finally.cs:92:25:92:30 | [finally: return] ... == ... | Finally.cs:96:17:98:17 | [finally: return] {...} | false |
+| Finally.cs:92:30:92:30 | 3 | Finally.cs:92:25:92:30 | ... == ... |  |
+| Finally.cs:92:30:92:30 | [finally: break] 3 | Finally.cs:92:25:92:30 | [finally: break] ... == ... |  |
+| Finally.cs:92:30:92:30 | [finally: continue] 3 | Finally.cs:92:25:92:30 | [finally: continue] ... == ... |  |
+| Finally.cs:92:30:92:30 | [finally: return] 3 | Finally.cs:92:25:92:30 | [finally: return] ... == ... |  |
+| Finally.cs:93:25:93:46 | [finally: break] throw ...; | Finally.cs:96:17:98:17 | [finally: break, finally(1): exception(Exception)] {...} | exception(Exception) |
+| Finally.cs:93:25:93:46 | [finally: continue] throw ...; | Finally.cs:96:17:98:17 | [finally: continue, finally(1): exception(Exception)] {...} | exception(Exception) |
+| Finally.cs:93:25:93:46 | [finally: return] throw ...; | Finally.cs:96:17:98:17 | [finally: return, finally(1): exception(Exception)] {...} | exception(Exception) |
+| Finally.cs:93:25:93:46 | throw ...; | Finally.cs:96:17:98:17 | [finally(1): exception(Exception)] {...} | exception(Exception) |
+| Finally.cs:93:31:93:45 | [finally: break] object creation of type Exception | Finally.cs:93:25:93:46 | [finally: break] throw ...; |  |
+| Finally.cs:93:31:93:45 | [finally: break] object creation of type Exception | Finally.cs:96:17:98:17 | [finally: break, finally(1): exception(Exception)] {...} | exception(Exception) |
+| Finally.cs:93:31:93:45 | [finally: continue] object creation of type Exception | Finally.cs:93:25:93:46 | [finally: continue] throw ...; |  |
+| Finally.cs:93:31:93:45 | [finally: continue] object creation of type Exception | Finally.cs:96:17:98:17 | [finally: continue, finally(1): exception(Exception)] {...} | exception(Exception) |
+| Finally.cs:93:31:93:45 | [finally: return] object creation of type Exception | Finally.cs:93:25:93:46 | [finally: return] throw ...; |  |
+| Finally.cs:93:31:93:45 | [finally: return] object creation of type Exception | Finally.cs:96:17:98:17 | [finally: return, finally(1): exception(Exception)] {...} | exception(Exception) |
+| Finally.cs:93:31:93:45 | object creation of type Exception | Finally.cs:93:25:93:46 | throw ...; |  |
+| Finally.cs:93:31:93:45 | object creation of type Exception | Finally.cs:96:17:98:17 | [finally(1): exception(Exception)] {...} | exception(Exception) |
+| Finally.cs:96:17:98:17 | [finally(1): exception(Exception)] {...} | Finally.cs:97:21:97:24 | [finally(1): exception(Exception)] ...; |  |
+| Finally.cs:96:17:98:17 | [finally: break, finally(1): exception(Exception)] {...} | Finally.cs:97:21:97:24 | [finally: break, finally(1): exception(Exception)] ...; |  |
+| Finally.cs:96:17:98:17 | [finally: break] {...} | Finally.cs:97:21:97:24 | [finally: break] ...; |  |
+| Finally.cs:96:17:98:17 | [finally: continue, finally(1): exception(Exception)] {...} | Finally.cs:97:21:97:24 | [finally: continue, finally(1): exception(Exception)] ...; |  |
+| Finally.cs:96:17:98:17 | [finally: continue] {...} | Finally.cs:97:21:97:24 | [finally: continue] ...; |  |
+| Finally.cs:96:17:98:17 | [finally: return, finally(1): exception(Exception)] {...} | Finally.cs:97:21:97:24 | [finally: return, finally(1): exception(Exception)] ...; |  |
+| Finally.cs:96:17:98:17 | [finally: return] {...} | Finally.cs:97:21:97:24 | [finally: return] ...; |  |
+| Finally.cs:96:17:98:17 | {...} | Finally.cs:97:21:97:24 | ...; |  |
+| Finally.cs:97:21:97:21 | [finally(1): exception(Exception)] access to local variable i | Finally.cs:97:21:97:23 | [finally(1): exception(Exception)] ...-- |  |
+| Finally.cs:97:21:97:21 | [finally: break, finally(1): exception(Exception)] access to local variable i | Finally.cs:97:21:97:23 | [finally: break, finally(1): exception(Exception)] ...-- |  |
+| Finally.cs:97:21:97:21 | [finally: break] access to local variable i | Finally.cs:97:21:97:23 | [finally: break] ...-- |  |
+| Finally.cs:97:21:97:21 | [finally: continue, finally(1): exception(Exception)] access to local variable i | Finally.cs:97:21:97:23 | [finally: continue, finally(1): exception(Exception)] ...-- |  |
+| Finally.cs:97:21:97:21 | [finally: continue] access to local variable i | Finally.cs:97:21:97:23 | [finally: continue] ...-- |  |
+| Finally.cs:97:21:97:21 | [finally: return, finally(1): exception(Exception)] access to local variable i | Finally.cs:97:21:97:23 | [finally: return, finally(1): exception(Exception)] ...-- |  |
+| Finally.cs:97:21:97:21 | [finally: return] access to local variable i | Finally.cs:97:21:97:23 | [finally: return] ...-- |  |
+| Finally.cs:97:21:97:21 | access to local variable i | Finally.cs:97:21:97:23 | ...-- |  |
+| Finally.cs:97:21:97:23 | ...-- | Finally.cs:77:16:77:16 | access to local variable i |  |
+| Finally.cs:97:21:97:23 | [finally(1): exception(Exception)] ...-- | Finally.cs:74:10:74:11 | exit M4 (abnormal) | exception(Exception) |
+| Finally.cs:97:21:97:23 | [finally: break, finally(1): exception(Exception)] ...-- | Finally.cs:74:10:74:11 | exit M4 (abnormal) | exception(Exception) |
+| Finally.cs:97:21:97:23 | [finally: break] ...-- | Finally.cs:74:10:74:11 | exit M4 (normal) | break |
+| Finally.cs:97:21:97:23 | [finally: continue, finally(1): exception(Exception)] ...-- | Finally.cs:74:10:74:11 | exit M4 (abnormal) | exception(Exception) |
+| Finally.cs:97:21:97:23 | [finally: continue] ...-- | Finally.cs:77:16:77:16 | access to local variable i | continue |
+| Finally.cs:97:21:97:23 | [finally: return, finally(1): exception(Exception)] ...-- | Finally.cs:74:10:74:11 | exit M4 (abnormal) | exception(Exception) |
+| Finally.cs:97:21:97:23 | [finally: return] ...-- | Finally.cs:74:10:74:11 | exit M4 (normal) | return |
+| Finally.cs:97:21:97:24 | ...; | Finally.cs:97:21:97:21 | access to local variable i |  |
+| Finally.cs:97:21:97:24 | [finally(1): exception(Exception)] ...; | Finally.cs:97:21:97:21 | [finally(1): exception(Exception)] access to local variable i |  |
+| Finally.cs:97:21:97:24 | [finally: break, finally(1): exception(Exception)] ...; | Finally.cs:97:21:97:21 | [finally: break, finally(1): exception(Exception)] access to local variable i |  |
+| Finally.cs:97:21:97:24 | [finally: break] ...; | Finally.cs:97:21:97:21 | [finally: break] access to local variable i |  |
+| Finally.cs:97:21:97:24 | [finally: continue, finally(1): exception(Exception)] ...; | Finally.cs:97:21:97:21 | [finally: continue, finally(1): exception(Exception)] access to local variable i |  |
+| Finally.cs:97:21:97:24 | [finally: continue] ...; | Finally.cs:97:21:97:21 | [finally: continue] access to local variable i |  |
+| Finally.cs:97:21:97:24 | [finally: return, finally(1): exception(Exception)] ...; | Finally.cs:97:21:97:21 | [finally: return, finally(1): exception(Exception)] access to local variable i |  |
+| Finally.cs:97:21:97:24 | [finally: return] ...; | Finally.cs:97:21:97:21 | [finally: return] access to local variable i |  |
+| Finally.cs:103:10:103:11 | enter M5 | Finally.cs:104:5:119:5 | {...} |  |
+| Finally.cs:103:10:103:11 | exit M5 (abnormal) | Finally.cs:103:10:103:11 | exit M5 |  |
+| Finally.cs:103:10:103:11 | exit M5 (normal) | Finally.cs:103:10:103:11 | exit M5 |  |
+| Finally.cs:104:5:119:5 | {...} | Finally.cs:105:9:118:9 | try {...} ... |  |
+| Finally.cs:105:9:118:9 | try {...} ... | Finally.cs:106:9:111:9 | {...} |  |
+| Finally.cs:106:9:111:9 | {...} | Finally.cs:107:13:108:23 | if (...) ... |  |
+| Finally.cs:107:13:108:23 | if (...) ... | Finally.cs:107:17:107:21 | this access |  |
+| Finally.cs:107:17:107:21 | access to field Field | Finally.cs:107:17:107:28 | access to property Length |  |
+| Finally.cs:107:17:107:21 | access to field Field | Finally.cs:113:9:118:9 | [finally: exception(NullReferenceException)] {...} | exception(NullReferenceException) |
+| Finally.cs:107:17:107:21 | this access | Finally.cs:107:17:107:21 | access to field Field |  |
+| Finally.cs:107:17:107:28 | access to property Length | Finally.cs:107:33:107:33 | 0 |  |
+| Finally.cs:107:17:107:28 | access to property Length | Finally.cs:113:9:118:9 | [finally: exception(Exception)] {...} | exception(Exception) |
+| Finally.cs:107:17:107:28 | access to property Length | Finally.cs:113:9:118:9 | [finally: exception(NullReferenceException)] {...} | exception(NullReferenceException) |
+| Finally.cs:107:17:107:33 | ... == ... | Finally.cs:108:17:108:23 | return ...; | true |
+| Finally.cs:107:17:107:33 | ... == ... | Finally.cs:109:13:110:49 | if (...) ... | false |
+| Finally.cs:107:33:107:33 | 0 | Finally.cs:107:17:107:33 | ... == ... |  |
+| Finally.cs:108:17:108:23 | return ...; | Finally.cs:113:9:118:9 | [finally: return] {...} | return |
+| Finally.cs:109:13:110:49 | if (...) ... | Finally.cs:109:17:109:21 | this access |  |
+| Finally.cs:109:17:109:21 | access to field Field | Finally.cs:109:17:109:28 | access to property Length |  |
+| Finally.cs:109:17:109:21 | access to field Field | Finally.cs:113:9:118:9 | [finally: exception(NullReferenceException)] {...} | exception(NullReferenceException) |
+| Finally.cs:109:17:109:21 | this access | Finally.cs:109:17:109:21 | access to field Field |  |
+| Finally.cs:109:17:109:28 | access to property Length | Finally.cs:109:33:109:33 | 1 |  |
+| Finally.cs:109:17:109:28 | access to property Length | Finally.cs:113:9:118:9 | [finally: exception(Exception)] {...} | exception(Exception) |
+| Finally.cs:109:17:109:28 | access to property Length | Finally.cs:113:9:118:9 | [finally: exception(NullReferenceException)] {...} | exception(NullReferenceException) |
+| Finally.cs:109:17:109:33 | ... == ... | Finally.cs:110:23:110:48 | object creation of type OutOfMemoryException | true |
+| Finally.cs:109:17:109:33 | ... == ... | Finally.cs:113:9:118:9 | {...} | false |
+| Finally.cs:109:33:109:33 | 1 | Finally.cs:109:17:109:33 | ... == ... |  |
+| Finally.cs:110:17:110:49 | throw ...; | Finally.cs:113:9:118:9 | [finally: exception(OutOfMemoryException)] {...} | exception(OutOfMemoryException) |
+| Finally.cs:110:23:110:48 | object creation of type OutOfMemoryException | Finally.cs:110:17:110:49 | throw ...; |  |
+| Finally.cs:110:23:110:48 | object creation of type OutOfMemoryException | Finally.cs:113:9:118:9 | [finally: exception(Exception)] {...} | exception(Exception) |
+| Finally.cs:113:9:118:9 | [finally: exception(Exception)] {...} | Finally.cs:114:13:115:41 | [finally: exception(Exception)] if (...) ... |  |
+| Finally.cs:113:9:118:9 | [finally: exception(NullReferenceException)] {...} | Finally.cs:114:13:115:41 | [finally: exception(NullReferenceException)] if (...) ... |  |
+| Finally.cs:113:9:118:9 | [finally: exception(OutOfMemoryException)] {...} | Finally.cs:114:13:115:41 | [finally: exception(OutOfMemoryException)] if (...) ... |  |
+| Finally.cs:113:9:118:9 | [finally: return] {...} | Finally.cs:114:13:115:41 | [finally: return] if (...) ... |  |
+| Finally.cs:113:9:118:9 | {...} | Finally.cs:114:13:115:41 | if (...) ... |  |
+| Finally.cs:114:13:115:41 | [finally: exception(Exception)] if (...) ... | Finally.cs:114:19:114:23 | [finally: exception(Exception)] this access |  |
+| Finally.cs:114:13:115:41 | [finally: exception(NullReferenceException)] if (...) ... | Finally.cs:114:19:114:23 | [finally: exception(NullReferenceException)] this access |  |
+| Finally.cs:114:13:115:41 | [finally: exception(OutOfMemoryException)] if (...) ... | Finally.cs:114:19:114:23 | [finally: exception(OutOfMemoryException)] this access |  |
+| Finally.cs:114:13:115:41 | [finally: return] if (...) ... | Finally.cs:114:19:114:23 | [finally: return] this access |  |
+| Finally.cs:114:13:115:41 | if (...) ... | Finally.cs:114:19:114:23 | this access |  |
+| Finally.cs:114:17:114:36 | [false, finally: exception(Exception)] !... | Finally.cs:116:13:117:37 | [finally: exception(Exception)] if (...) ... | false |
+| Finally.cs:114:17:114:36 | [false, finally: exception(NullReferenceException)] !... | Finally.cs:116:13:117:37 | [finally: exception(NullReferenceException)] if (...) ... | false |
+| Finally.cs:114:17:114:36 | [false, finally: exception(OutOfMemoryException)] !... | Finally.cs:116:13:117:37 | [finally: exception(OutOfMemoryException)] if (...) ... | false |
+| Finally.cs:114:17:114:36 | [false, finally: return] !... | Finally.cs:116:13:117:37 | [finally: return] if (...) ... | false |
+| Finally.cs:114:17:114:36 | [false] !... | Finally.cs:116:13:117:37 | if (...) ... | false |
+| Finally.cs:114:17:114:36 | [true, finally: exception(Exception)] !... | Finally.cs:115:17:115:41 | [finally: exception(Exception)] ...; | true |
+| Finally.cs:114:17:114:36 | [true, finally: exception(NullReferenceException)] !... | Finally.cs:115:17:115:41 | [finally: exception(NullReferenceException)] ...; | true |
+| Finally.cs:114:17:114:36 | [true, finally: exception(OutOfMemoryException)] !... | Finally.cs:115:17:115:41 | [finally: exception(OutOfMemoryException)] ...; | true |
+| Finally.cs:114:17:114:36 | [true, finally: return] !... | Finally.cs:115:17:115:41 | [finally: return] ...; | true |
+| Finally.cs:114:17:114:36 | [true] !... | Finally.cs:115:17:115:41 | ...; | true |
+| Finally.cs:114:19:114:23 | [finally: exception(Exception)] access to field Field | Finally.cs:114:19:114:30 | [finally: exception(Exception)] access to property Length |  |
+| Finally.cs:114:19:114:23 | [finally: exception(Exception)] this access | Finally.cs:114:19:114:23 | [finally: exception(Exception)] access to field Field |  |
+| Finally.cs:114:19:114:23 | [finally: exception(NullReferenceException)] access to field Field | Finally.cs:114:19:114:30 | [finally: exception(NullReferenceException)] access to property Length |  |
+| Finally.cs:114:19:114:23 | [finally: exception(NullReferenceException)] this access | Finally.cs:114:19:114:23 | [finally: exception(NullReferenceException)] access to field Field |  |
+| Finally.cs:114:19:114:23 | [finally: exception(OutOfMemoryException)] access to field Field | Finally.cs:114:19:114:30 | [finally: exception(OutOfMemoryException)] access to property Length |  |
+| Finally.cs:114:19:114:23 | [finally: exception(OutOfMemoryException)] this access | Finally.cs:114:19:114:23 | [finally: exception(OutOfMemoryException)] access to field Field |  |
+| Finally.cs:114:19:114:23 | [finally: return] access to field Field | Finally.cs:114:19:114:30 | [finally: return] access to property Length |  |
+| Finally.cs:114:19:114:23 | [finally: return] this access | Finally.cs:114:19:114:23 | [finally: return] access to field Field |  |
+| Finally.cs:114:19:114:23 | access to field Field | Finally.cs:114:19:114:30 | access to property Length |  |
+| Finally.cs:114:19:114:23 | this access | Finally.cs:114:19:114:23 | access to field Field |  |
+| Finally.cs:114:19:114:30 | [finally: exception(Exception)] access to property Length | Finally.cs:114:35:114:35 | [finally: exception(Exception)] 0 |  |
+| Finally.cs:114:19:114:30 | [finally: exception(NullReferenceException)] access to property Length | Finally.cs:114:35:114:35 | [finally: exception(NullReferenceException)] 0 |  |
+| Finally.cs:114:19:114:30 | [finally: exception(OutOfMemoryException)] access to property Length | Finally.cs:114:35:114:35 | [finally: exception(OutOfMemoryException)] 0 |  |
+| Finally.cs:114:19:114:30 | [finally: return] access to property Length | Finally.cs:114:35:114:35 | [finally: return] 0 |  |
+| Finally.cs:114:19:114:30 | access to property Length | Finally.cs:114:35:114:35 | 0 |  |
+| Finally.cs:114:19:114:35 | ... == ... | Finally.cs:114:17:114:36 | [false] !... | true |
+| Finally.cs:114:19:114:35 | ... == ... | Finally.cs:114:17:114:36 | [true] !... | false |
+| Finally.cs:114:19:114:35 | [finally: exception(Exception)] ... == ... | Finally.cs:114:17:114:36 | [false, finally: exception(Exception)] !... | true |
+| Finally.cs:114:19:114:35 | [finally: exception(Exception)] ... == ... | Finally.cs:114:17:114:36 | [true, finally: exception(Exception)] !... | false |
+| Finally.cs:114:19:114:35 | [finally: exception(NullReferenceException)] ... == ... | Finally.cs:114:17:114:36 | [false, finally: exception(NullReferenceException)] !... | true |
+| Finally.cs:114:19:114:35 | [finally: exception(NullReferenceException)] ... == ... | Finally.cs:114:17:114:36 | [true, finally: exception(NullReferenceException)] !... | false |
+| Finally.cs:114:19:114:35 | [finally: exception(OutOfMemoryException)] ... == ... | Finally.cs:114:17:114:36 | [false, finally: exception(OutOfMemoryException)] !... | true |
+| Finally.cs:114:19:114:35 | [finally: exception(OutOfMemoryException)] ... == ... | Finally.cs:114:17:114:36 | [true, finally: exception(OutOfMemoryException)] !... | false |
+| Finally.cs:114:19:114:35 | [finally: return] ... == ... | Finally.cs:114:17:114:36 | [false, finally: return] !... | true |
+| Finally.cs:114:19:114:35 | [finally: return] ... == ... | Finally.cs:114:17:114:36 | [true, finally: return] !... | false |
+| Finally.cs:114:35:114:35 | 0 | Finally.cs:114:19:114:35 | ... == ... |  |
+| Finally.cs:114:35:114:35 | [finally: exception(Exception)] 0 | Finally.cs:114:19:114:35 | [finally: exception(Exception)] ... == ... |  |
+| Finally.cs:114:35:114:35 | [finally: exception(NullReferenceException)] 0 | Finally.cs:114:19:114:35 | [finally: exception(NullReferenceException)] ... == ... |  |
+| Finally.cs:114:35:114:35 | [finally: exception(OutOfMemoryException)] 0 | Finally.cs:114:19:114:35 | [finally: exception(OutOfMemoryException)] ... == ... |  |
+| Finally.cs:114:35:114:35 | [finally: return] 0 | Finally.cs:114:19:114:35 | [finally: return] ... == ... |  |
+| Finally.cs:115:17:115:40 | [finally: exception(Exception)] call to method WriteLine | Finally.cs:116:13:117:37 | [finally: exception(Exception)] if (...) ... |  |
+| Finally.cs:115:17:115:40 | [finally: exception(NullReferenceException)] call to method WriteLine | Finally.cs:116:13:117:37 | [finally: exception(NullReferenceException)] if (...) ... |  |
+| Finally.cs:115:17:115:40 | [finally: exception(OutOfMemoryException)] call to method WriteLine | Finally.cs:116:13:117:37 | [finally: exception(OutOfMemoryException)] if (...) ... |  |
+| Finally.cs:115:17:115:40 | [finally: return] call to method WriteLine | Finally.cs:116:13:117:37 | [finally: return] if (...) ... |  |
+| Finally.cs:115:17:115:40 | call to method WriteLine | Finally.cs:116:13:117:37 | if (...) ... |  |
+| Finally.cs:115:17:115:41 | ...; | Finally.cs:115:35:115:39 | this access |  |
+| Finally.cs:115:17:115:41 | [finally: exception(Exception)] ...; | Finally.cs:115:35:115:39 | [finally: exception(Exception)] this access |  |
+| Finally.cs:115:17:115:41 | [finally: exception(NullReferenceException)] ...; | Finally.cs:115:35:115:39 | [finally: exception(NullReferenceException)] this access |  |
+| Finally.cs:115:17:115:41 | [finally: exception(OutOfMemoryException)] ...; | Finally.cs:115:35:115:39 | [finally: exception(OutOfMemoryException)] this access |  |
+| Finally.cs:115:17:115:41 | [finally: return] ...; | Finally.cs:115:35:115:39 | [finally: return] this access |  |
+| Finally.cs:115:35:115:39 | [finally: exception(Exception)] access to field Field | Finally.cs:115:17:115:40 | [finally: exception(Exception)] call to method WriteLine |  |
+| Finally.cs:115:35:115:39 | [finally: exception(Exception)] this access | Finally.cs:115:35:115:39 | [finally: exception(Exception)] access to field Field |  |
+| Finally.cs:115:35:115:39 | [finally: exception(NullReferenceException)] access to field Field | Finally.cs:115:17:115:40 | [finally: exception(NullReferenceException)] call to method WriteLine |  |
+| Finally.cs:115:35:115:39 | [finally: exception(NullReferenceException)] this access | Finally.cs:115:35:115:39 | [finally: exception(NullReferenceException)] access to field Field |  |
+| Finally.cs:115:35:115:39 | [finally: exception(OutOfMemoryException)] access to field Field | Finally.cs:115:17:115:40 | [finally: exception(OutOfMemoryException)] call to method WriteLine |  |
+| Finally.cs:115:35:115:39 | [finally: exception(OutOfMemoryException)] this access | Finally.cs:115:35:115:39 | [finally: exception(OutOfMemoryException)] access to field Field |  |
+| Finally.cs:115:35:115:39 | [finally: return] access to field Field | Finally.cs:115:17:115:40 | [finally: return] call to method WriteLine |  |
+| Finally.cs:115:35:115:39 | [finally: return] this access | Finally.cs:115:35:115:39 | [finally: return] access to field Field |  |
+| Finally.cs:115:35:115:39 | access to field Field | Finally.cs:115:17:115:40 | call to method WriteLine |  |
+| Finally.cs:115:35:115:39 | this access | Finally.cs:115:35:115:39 | access to field Field |  |
+| Finally.cs:116:13:117:37 | [finally: exception(Exception)] if (...) ... | Finally.cs:116:17:116:21 | [finally: exception(Exception)] this access |  |
+| Finally.cs:116:13:117:37 | [finally: exception(NullReferenceException)] if (...) ... | Finally.cs:116:17:116:21 | [finally: exception(NullReferenceException)] this access |  |
+| Finally.cs:116:13:117:37 | [finally: exception(OutOfMemoryException)] if (...) ... | Finally.cs:116:17:116:21 | [finally: exception(OutOfMemoryException)] this access |  |
+| Finally.cs:116:13:117:37 | [finally: return] if (...) ... | Finally.cs:116:17:116:21 | [finally: return] this access |  |
+| Finally.cs:116:13:117:37 | if (...) ... | Finally.cs:116:17:116:21 | this access |  |
+| Finally.cs:116:17:116:21 | [finally: exception(Exception)] access to field Field | Finally.cs:116:17:116:28 | [finally: exception(Exception)] access to property Length |  |
+| Finally.cs:116:17:116:21 | [finally: exception(Exception)] this access | Finally.cs:116:17:116:21 | [finally: exception(Exception)] access to field Field |  |
+| Finally.cs:116:17:116:21 | [finally: exception(NullReferenceException)] access to field Field | Finally.cs:116:17:116:28 | [finally: exception(NullReferenceException)] access to property Length |  |
+| Finally.cs:116:17:116:21 | [finally: exception(NullReferenceException)] this access | Finally.cs:116:17:116:21 | [finally: exception(NullReferenceException)] access to field Field |  |
+| Finally.cs:116:17:116:21 | [finally: exception(OutOfMemoryException)] access to field Field | Finally.cs:116:17:116:28 | [finally: exception(OutOfMemoryException)] access to property Length |  |
+| Finally.cs:116:17:116:21 | [finally: exception(OutOfMemoryException)] this access | Finally.cs:116:17:116:21 | [finally: exception(OutOfMemoryException)] access to field Field |  |
+| Finally.cs:116:17:116:21 | [finally: return] access to field Field | Finally.cs:116:17:116:28 | [finally: return] access to property Length |  |
+| Finally.cs:116:17:116:21 | [finally: return] this access | Finally.cs:116:17:116:21 | [finally: return] access to field Field |  |
+| Finally.cs:116:17:116:21 | access to field Field | Finally.cs:116:17:116:28 | access to property Length |  |
+| Finally.cs:116:17:116:21 | this access | Finally.cs:116:17:116:21 | access to field Field |  |
+| Finally.cs:116:17:116:28 | [finally: exception(Exception)] access to property Length | Finally.cs:116:32:116:32 | [finally: exception(Exception)] 0 |  |
+| Finally.cs:116:17:116:28 | [finally: exception(NullReferenceException)] access to property Length | Finally.cs:116:32:116:32 | [finally: exception(NullReferenceException)] 0 |  |
+| Finally.cs:116:17:116:28 | [finally: exception(OutOfMemoryException)] access to property Length | Finally.cs:116:32:116:32 | [finally: exception(OutOfMemoryException)] 0 |  |
+| Finally.cs:116:17:116:28 | [finally: return] access to property Length | Finally.cs:116:32:116:32 | [finally: return] 0 |  |
+| Finally.cs:116:17:116:28 | access to property Length | Finally.cs:116:32:116:32 | 0 |  |
+| Finally.cs:116:17:116:32 | ... > ... | Finally.cs:103:10:103:11 | exit M5 (normal) | false |
+| Finally.cs:116:17:116:32 | ... > ... | Finally.cs:117:17:117:37 | ...; | true |
+| Finally.cs:116:17:116:32 | [finally: exception(Exception)] ... > ... | Finally.cs:103:10:103:11 | exit M5 (abnormal) | exception(Exception) |
+| Finally.cs:116:17:116:32 | [finally: exception(Exception)] ... > ... | Finally.cs:117:17:117:37 | [finally: exception(Exception)] ...; | true |
+| Finally.cs:116:17:116:32 | [finally: exception(NullReferenceException)] ... > ... | Finally.cs:103:10:103:11 | exit M5 (abnormal) | exception(NullReferenceException) |
+| Finally.cs:116:17:116:32 | [finally: exception(NullReferenceException)] ... > ... | Finally.cs:117:17:117:37 | [finally: exception(NullReferenceException)] ...; | true |
+| Finally.cs:116:17:116:32 | [finally: exception(OutOfMemoryException)] ... > ... | Finally.cs:103:10:103:11 | exit M5 (abnormal) | exception(OutOfMemoryException) |
+| Finally.cs:116:17:116:32 | [finally: exception(OutOfMemoryException)] ... > ... | Finally.cs:117:17:117:37 | [finally: exception(OutOfMemoryException)] ...; | true |
+| Finally.cs:116:17:116:32 | [finally: return] ... > ... | Finally.cs:103:10:103:11 | exit M5 (normal) | return |
+| Finally.cs:116:17:116:32 | [finally: return] ... > ... | Finally.cs:117:17:117:37 | [finally: return] ...; | true |
+| Finally.cs:116:32:116:32 | 0 | Finally.cs:116:17:116:32 | ... > ... |  |
+| Finally.cs:116:32:116:32 | [finally: exception(Exception)] 0 | Finally.cs:116:17:116:32 | [finally: exception(Exception)] ... > ... |  |
+| Finally.cs:116:32:116:32 | [finally: exception(NullReferenceException)] 0 | Finally.cs:116:17:116:32 | [finally: exception(NullReferenceException)] ... > ... |  |
+| Finally.cs:116:32:116:32 | [finally: exception(OutOfMemoryException)] 0 | Finally.cs:116:17:116:32 | [finally: exception(OutOfMemoryException)] ... > ... |  |
+| Finally.cs:116:32:116:32 | [finally: return] 0 | Finally.cs:116:17:116:32 | [finally: return] ... > ... |  |
+| Finally.cs:117:17:117:36 | [finally: exception(Exception)] call to method WriteLine | Finally.cs:103:10:103:11 | exit M5 (abnormal) | exception(Exception) |
+| Finally.cs:117:17:117:36 | [finally: exception(NullReferenceException)] call to method WriteLine | Finally.cs:103:10:103:11 | exit M5 (abnormal) | exception(NullReferenceException) |
+| Finally.cs:117:17:117:36 | [finally: exception(OutOfMemoryException)] call to method WriteLine | Finally.cs:103:10:103:11 | exit M5 (abnormal) | exception(OutOfMemoryException) |
+| Finally.cs:117:17:117:36 | [finally: return] call to method WriteLine | Finally.cs:103:10:103:11 | exit M5 (normal) | return |
+| Finally.cs:117:17:117:36 | call to method WriteLine | Finally.cs:103:10:103:11 | exit M5 (normal) |  |
+| Finally.cs:117:17:117:37 | ...; | Finally.cs:117:35:117:35 | 1 |  |
+| Finally.cs:117:17:117:37 | [finally: exception(Exception)] ...; | Finally.cs:117:35:117:35 | [finally: exception(Exception)] 1 |  |
+| Finally.cs:117:17:117:37 | [finally: exception(NullReferenceException)] ...; | Finally.cs:117:35:117:35 | [finally: exception(NullReferenceException)] 1 |  |
+| Finally.cs:117:17:117:37 | [finally: exception(OutOfMemoryException)] ...; | Finally.cs:117:35:117:35 | [finally: exception(OutOfMemoryException)] 1 |  |
+| Finally.cs:117:17:117:37 | [finally: return] ...; | Finally.cs:117:35:117:35 | [finally: return] 1 |  |
+| Finally.cs:117:35:117:35 | 1 | Finally.cs:117:17:117:36 | call to method WriteLine |  |
+| Finally.cs:117:35:117:35 | [finally: exception(Exception)] 1 | Finally.cs:117:17:117:36 | [finally: exception(Exception)] call to method WriteLine |  |
+| Finally.cs:117:35:117:35 | [finally: exception(NullReferenceException)] 1 | Finally.cs:117:17:117:36 | [finally: exception(NullReferenceException)] call to method WriteLine |  |
+| Finally.cs:117:35:117:35 | [finally: exception(OutOfMemoryException)] 1 | Finally.cs:117:17:117:36 | [finally: exception(OutOfMemoryException)] call to method WriteLine |  |
+| Finally.cs:117:35:117:35 | [finally: return] 1 | Finally.cs:117:17:117:36 | [finally: return] call to method WriteLine |  |
+| Finally.cs:121:10:121:11 | enter M6 | Finally.cs:122:5:131:5 | {...} |  |
+| Finally.cs:121:10:121:11 | exit M6 (normal) | Finally.cs:121:10:121:11 | exit M6 |  |
+| Finally.cs:122:5:131:5 | {...} | Finally.cs:123:9:130:9 | try {...} ... |  |
+| Finally.cs:123:9:130:9 | try {...} ... | Finally.cs:124:9:126:9 | {...} |  |
+| Finally.cs:124:9:126:9 | {...} | Finally.cs:125:13:125:41 | ... ...; |  |
+| Finally.cs:125:13:125:41 | ... ...; | Finally.cs:125:24:125:24 | 0 |  |
+| Finally.cs:125:17:125:40 | Double temp = ... | Finally.cs:121:10:121:11 | exit M6 (normal) |  |
+| Finally.cs:125:24:125:24 | 0 | Finally.cs:125:24:125:24 | (...) ... |  |
+| Finally.cs:125:24:125:24 | (...) ... | Finally.cs:125:28:125:40 | access to constant E |  |
+| Finally.cs:125:24:125:40 | ... / ... | Finally.cs:125:17:125:40 | Double temp = ... |  |
+| Finally.cs:125:28:125:40 | access to constant E | Finally.cs:125:24:125:40 | ... / ... |  |
+| Finally.cs:133:10:133:11 | enter M7 | Finally.cs:134:5:145:5 | {...} |  |
+| Finally.cs:133:10:133:11 | exit M7 (abnormal) | Finally.cs:133:10:133:11 | exit M7 |  |
+| Finally.cs:134:5:145:5 | {...} | Finally.cs:135:9:143:9 | try {...} ... |  |
+| Finally.cs:135:9:143:9 | try {...} ... | Finally.cs:136:9:138:9 | {...} |  |
+| Finally.cs:136:9:138:9 | {...} | Finally.cs:137:13:137:37 | ...; |  |
+| Finally.cs:137:13:137:36 | call to method WriteLine | Finally.cs:140:9:143:9 | [finally: exception(Exception)] {...} | exception(Exception) |
+| Finally.cs:137:13:137:36 | call to method WriteLine | Finally.cs:140:9:143:9 | {...} |  |
+| Finally.cs:137:13:137:37 | ...; | Finally.cs:137:31:137:35 | "Try" |  |
+| Finally.cs:137:31:137:35 | "Try" | Finally.cs:137:13:137:36 | call to method WriteLine |  |
+| Finally.cs:140:9:143:9 | [finally: exception(Exception)] {...} | Finally.cs:141:41:141:42 | [finally: exception(Exception)] "" |  |
+| Finally.cs:140:9:143:9 | {...} | Finally.cs:141:41:141:42 | "" |  |
+| Finally.cs:141:13:141:44 | [finally: exception(Exception)] throw ...; | Finally.cs:133:10:133:11 | exit M7 (abnormal) | exception(ArgumentException) |
+| Finally.cs:141:13:141:44 | throw ...; | Finally.cs:133:10:133:11 | exit M7 (abnormal) | exception(ArgumentException) |
+| Finally.cs:141:19:141:43 | [finally: exception(Exception)] object creation of type ArgumentException | Finally.cs:141:13:141:44 | [finally: exception(Exception)] throw ...; |  |
+| Finally.cs:141:19:141:43 | object creation of type ArgumentException | Finally.cs:141:13:141:44 | throw ...; |  |
+| Finally.cs:141:41:141:42 | "" | Finally.cs:141:19:141:43 | object creation of type ArgumentException |  |
+| Finally.cs:141:41:141:42 | [finally: exception(Exception)] "" | Finally.cs:141:19:141:43 | [finally: exception(Exception)] object creation of type ArgumentException |  |
+| Finally.cs:147:10:147:11 | enter M8 | Finally.cs:148:5:170:5 | {...} |  |
+| Finally.cs:147:10:147:11 | exit M8 (abnormal) | Finally.cs:147:10:147:11 | exit M8 |  |
+| Finally.cs:147:10:147:11 | exit M8 (normal) | Finally.cs:147:10:147:11 | exit M8 |  |
+| Finally.cs:148:5:170:5 | {...} | Finally.cs:149:9:169:9 | try {...} ... |  |
+| Finally.cs:149:9:169:9 | try {...} ... | Finally.cs:150:9:153:9 | {...} |  |
+| Finally.cs:150:9:153:9 | {...} | Finally.cs:151:13:152:50 | if (...) ... |  |
+| Finally.cs:151:13:152:50 | if (...) ... | Finally.cs:151:17:151:20 | access to parameter args |  |
+| Finally.cs:151:17:151:20 | access to parameter args | Finally.cs:151:25:151:28 | null |  |
+| Finally.cs:151:17:151:28 | ... == ... | Finally.cs:152:23:152:49 | object creation of type ArgumentNullException | true |
+| Finally.cs:151:17:151:28 | ... == ... | Finally.cs:155:9:169:9 | {...} | false |
+| Finally.cs:151:25:151:28 | null | Finally.cs:151:17:151:28 | ... == ... |  |
+| Finally.cs:152:17:152:50 | throw ...; | Finally.cs:155:9:169:9 | [finally: exception(ArgumentNullException)] {...} | exception(ArgumentNullException) |
+| Finally.cs:152:23:152:49 | object creation of type ArgumentNullException | Finally.cs:152:17:152:50 | throw ...; |  |
+| Finally.cs:152:23:152:49 | object creation of type ArgumentNullException | Finally.cs:155:9:169:9 | [finally: exception(Exception)] {...} | exception(Exception) |
+| Finally.cs:155:9:169:9 | [finally: exception(ArgumentNullException)] {...} | Finally.cs:156:13:168:13 | [finally: exception(ArgumentNullException)] try {...} ... |  |
+| Finally.cs:155:9:169:9 | [finally: exception(Exception)] {...} | Finally.cs:156:13:168:13 | [finally: exception(Exception)] try {...} ... |  |
+| Finally.cs:155:9:169:9 | {...} | Finally.cs:156:13:168:13 | try {...} ... |  |
+| Finally.cs:156:13:168:13 | [finally: exception(ArgumentNullException)] try {...} ... | Finally.cs:157:13:160:13 | [finally: exception(ArgumentNullException)] {...} |  |
+| Finally.cs:156:13:168:13 | [finally: exception(Exception)] try {...} ... | Finally.cs:157:13:160:13 | [finally: exception(Exception)] {...} |  |
+| Finally.cs:156:13:168:13 | try {...} ... | Finally.cs:157:13:160:13 | {...} |  |
+| Finally.cs:157:13:160:13 | [finally: exception(ArgumentNullException)] {...} | Finally.cs:158:17:159:45 | [finally: exception(ArgumentNullException)] if (...) ... |  |
+| Finally.cs:157:13:160:13 | [finally: exception(Exception)] {...} | Finally.cs:158:17:159:45 | [finally: exception(Exception)] if (...) ... |  |
+| Finally.cs:157:13:160:13 | {...} | Finally.cs:158:17:159:45 | if (...) ... |  |
+| Finally.cs:158:17:159:45 | [finally: exception(ArgumentNullException)] if (...) ... | Finally.cs:158:21:158:24 | [finally: exception(ArgumentNullException)] access to parameter args |  |
+| Finally.cs:158:17:159:45 | [finally: exception(Exception)] if (...) ... | Finally.cs:158:21:158:24 | [finally: exception(Exception)] access to parameter args |  |
+| Finally.cs:158:17:159:45 | if (...) ... | Finally.cs:158:21:158:24 | access to parameter args |  |
+| Finally.cs:158:21:158:24 | [finally: exception(ArgumentNullException)] access to parameter args | Finally.cs:158:21:158:31 | [finally: exception(ArgumentNullException)] access to property Length |  |
+| Finally.cs:158:21:158:24 | [finally: exception(Exception)] access to parameter args | Finally.cs:158:21:158:31 | [finally: exception(Exception)] access to property Length |  |
+| Finally.cs:158:21:158:24 | access to parameter args | Finally.cs:158:21:158:31 | access to property Length |  |
+| Finally.cs:158:21:158:31 | [finally: exception(ArgumentNullException)] access to property Length | Finally.cs:158:36:158:36 | [finally: exception(ArgumentNullException)] 1 |  |
+| Finally.cs:158:21:158:31 | [finally: exception(ArgumentNullException)] access to property Length | Finally.cs:161:13:164:13 | [finally: exception(ArgumentNullException), exception: Exception] catch (...) {...} | exception(Exception) |
+| Finally.cs:158:21:158:31 | [finally: exception(ArgumentNullException)] access to property Length | Finally.cs:161:13:164:13 | [finally: exception(ArgumentNullException), exception: NullReferenceException] catch (...) {...} | exception(NullReferenceException) |
+| Finally.cs:158:21:158:31 | [finally: exception(Exception)] access to property Length | Finally.cs:158:36:158:36 | [finally: exception(Exception)] 1 |  |
+| Finally.cs:158:21:158:31 | [finally: exception(Exception)] access to property Length | Finally.cs:161:13:164:13 | [finally: exception(Exception), exception: Exception] catch (...) {...} | exception(Exception) |
+| Finally.cs:158:21:158:31 | [finally: exception(Exception)] access to property Length | Finally.cs:161:13:164:13 | [finally: exception(Exception), exception: NullReferenceException] catch (...) {...} | exception(NullReferenceException) |
+| Finally.cs:158:21:158:31 | access to property Length | Finally.cs:158:36:158:36 | 1 |  |
+| Finally.cs:158:21:158:31 | access to property Length | Finally.cs:161:13:164:13 | [exception: Exception] catch (...) {...} | exception(Exception) |
+| Finally.cs:158:21:158:31 | access to property Length | Finally.cs:161:13:164:13 | [exception: NullReferenceException] catch (...) {...} | exception(NullReferenceException) |
+| Finally.cs:158:21:158:36 | ... == ... | Finally.cs:147:10:147:11 | exit M8 (normal) | false |
+| Finally.cs:158:21:158:36 | ... == ... | Finally.cs:159:41:159:43 | "1" | true |
+| Finally.cs:158:21:158:36 | [finally: exception(ArgumentNullException)] ... == ... | Finally.cs:147:10:147:11 | exit M8 (abnormal) | exception(ArgumentNullException) |
+| Finally.cs:158:21:158:36 | [finally: exception(ArgumentNullException)] ... == ... | Finally.cs:159:41:159:43 | [finally: exception(ArgumentNullException)] "1" | true |
+| Finally.cs:158:21:158:36 | [finally: exception(Exception)] ... == ... | Finally.cs:147:10:147:11 | exit M8 (abnormal) | exception(Exception) |
+| Finally.cs:158:21:158:36 | [finally: exception(Exception)] ... == ... | Finally.cs:159:41:159:43 | [finally: exception(Exception)] "1" | true |
+| Finally.cs:158:36:158:36 | 1 | Finally.cs:158:21:158:36 | ... == ... |  |
+| Finally.cs:158:36:158:36 | [finally: exception(ArgumentNullException)] 1 | Finally.cs:158:21:158:36 | [finally: exception(ArgumentNullException)] ... == ... |  |
+| Finally.cs:158:36:158:36 | [finally: exception(Exception)] 1 | Finally.cs:158:21:158:36 | [finally: exception(Exception)] ... == ... |  |
+| Finally.cs:159:21:159:45 | [finally: exception(ArgumentNullException)] throw ...; | Finally.cs:161:13:164:13 | [finally: exception(ArgumentNullException), exception: Exception] catch (...) {...} | exception(Exception) |
+| Finally.cs:159:21:159:45 | [finally: exception(Exception)] throw ...; | Finally.cs:161:13:164:13 | [finally: exception(Exception), exception: Exception] catch (...) {...} | exception(Exception) |
+| Finally.cs:159:21:159:45 | throw ...; | Finally.cs:161:13:164:13 | [exception: Exception] catch (...) {...} | exception(Exception) |
+| Finally.cs:159:27:159:44 | [finally: exception(ArgumentNullException)] object creation of type Exception | Finally.cs:159:21:159:45 | [finally: exception(ArgumentNullException)] throw ...; |  |
+| Finally.cs:159:27:159:44 | [finally: exception(ArgumentNullException)] object creation of type Exception | Finally.cs:161:13:164:13 | [finally: exception(ArgumentNullException), exception: Exception] catch (...) {...} | exception(Exception) |
+| Finally.cs:159:27:159:44 | [finally: exception(Exception)] object creation of type Exception | Finally.cs:159:21:159:45 | [finally: exception(Exception)] throw ...; |  |
+| Finally.cs:159:27:159:44 | [finally: exception(Exception)] object creation of type Exception | Finally.cs:161:13:164:13 | [finally: exception(Exception), exception: Exception] catch (...) {...} | exception(Exception) |
+| Finally.cs:159:27:159:44 | object creation of type Exception | Finally.cs:159:21:159:45 | throw ...; |  |
+| Finally.cs:159:27:159:44 | object creation of type Exception | Finally.cs:161:13:164:13 | [exception: Exception] catch (...) {...} | exception(Exception) |
+| Finally.cs:159:41:159:43 | "1" | Finally.cs:159:27:159:44 | object creation of type Exception |  |
+| Finally.cs:159:41:159:43 | [finally: exception(ArgumentNullException)] "1" | Finally.cs:159:27:159:44 | [finally: exception(ArgumentNullException)] object creation of type Exception |  |
+| Finally.cs:159:41:159:43 | [finally: exception(Exception)] "1" | Finally.cs:159:27:159:44 | [finally: exception(Exception)] object creation of type Exception |  |
+| Finally.cs:161:13:164:13 | [exception: Exception] catch (...) {...} | Finally.cs:161:30:161:30 | [exception: Exception] Exception e | match |
+| Finally.cs:161:13:164:13 | [exception: NullReferenceException] catch (...) {...} | Finally.cs:161:30:161:30 | [exception: NullReferenceException] Exception e | match |
+| Finally.cs:161:13:164:13 | [finally: exception(ArgumentNullException), exception: Exception] catch (...) {...} | Finally.cs:161:30:161:30 | [finally: exception(ArgumentNullException), exception: Exception] Exception e | match |
+| Finally.cs:161:13:164:13 | [finally: exception(ArgumentNullException), exception: NullReferenceException] catch (...) {...} | Finally.cs:161:30:161:30 | [finally: exception(ArgumentNullException), exception: NullReferenceException] Exception e | match |
+| Finally.cs:161:13:164:13 | [finally: exception(Exception), exception: Exception] catch (...) {...} | Finally.cs:161:30:161:30 | [finally: exception(Exception), exception: Exception] Exception e | match |
+| Finally.cs:161:13:164:13 | [finally: exception(Exception), exception: NullReferenceException] catch (...) {...} | Finally.cs:161:30:161:30 | [finally: exception(Exception), exception: NullReferenceException] Exception e | match |
+| Finally.cs:161:30:161:30 | [exception: Exception] Exception e | Finally.cs:161:39:161:39 | [exception: Exception] access to local variable e |  |
+| Finally.cs:161:30:161:30 | [exception: NullReferenceException] Exception e | Finally.cs:161:39:161:39 | [exception: NullReferenceException] access to local variable e |  |
+| Finally.cs:161:30:161:30 | [finally: exception(ArgumentNullException), exception: Exception] Exception e | Finally.cs:161:39:161:39 | [finally: exception(ArgumentNullException), exception: Exception] access to local variable e |  |
+| Finally.cs:161:30:161:30 | [finally: exception(ArgumentNullException), exception: NullReferenceException] Exception e | Finally.cs:161:39:161:39 | [finally: exception(ArgumentNullException), exception: NullReferenceException] access to local variable e |  |
+| Finally.cs:161:30:161:30 | [finally: exception(Exception), exception: Exception] Exception e | Finally.cs:161:39:161:39 | [finally: exception(Exception), exception: Exception] access to local variable e |  |
+| Finally.cs:161:30:161:30 | [finally: exception(Exception), exception: NullReferenceException] Exception e | Finally.cs:161:39:161:39 | [finally: exception(Exception), exception: NullReferenceException] access to local variable e |  |
+| Finally.cs:161:39:161:39 | [exception: Exception] access to local variable e | Finally.cs:161:39:161:47 | [exception: Exception] access to property Message |  |
+| Finally.cs:161:39:161:39 | [exception: NullReferenceException] access to local variable e | Finally.cs:161:39:161:47 | [exception: NullReferenceException] access to property Message |  |
+| Finally.cs:161:39:161:39 | [finally: exception(ArgumentNullException), exception: Exception] access to local variable e | Finally.cs:161:39:161:47 | [finally: exception(ArgumentNullException), exception: Exception] access to property Message |  |
+| Finally.cs:161:39:161:39 | [finally: exception(ArgumentNullException), exception: NullReferenceException] access to local variable e | Finally.cs:161:39:161:47 | [finally: exception(ArgumentNullException), exception: NullReferenceException] access to property Message |  |
+| Finally.cs:161:39:161:39 | [finally: exception(Exception), exception: Exception] access to local variable e | Finally.cs:161:39:161:47 | [finally: exception(Exception), exception: Exception] access to property Message |  |
+| Finally.cs:161:39:161:39 | [finally: exception(Exception), exception: NullReferenceException] access to local variable e | Finally.cs:161:39:161:47 | [finally: exception(Exception), exception: NullReferenceException] access to property Message |  |
+| Finally.cs:161:39:161:47 | [exception: Exception] access to property Message | Finally.cs:161:52:161:54 | [exception: Exception] "1" |  |
+| Finally.cs:161:39:161:47 | [exception: NullReferenceException] access to property Message | Finally.cs:161:52:161:54 | [exception: NullReferenceException] "1" |  |
+| Finally.cs:161:39:161:47 | [finally: exception(ArgumentNullException), exception: Exception] access to property Message | Finally.cs:161:52:161:54 | [finally: exception(ArgumentNullException), exception: Exception] "1" |  |
+| Finally.cs:161:39:161:47 | [finally: exception(ArgumentNullException), exception: NullReferenceException] access to property Message | Finally.cs:161:52:161:54 | [finally: exception(ArgumentNullException), exception: NullReferenceException] "1" |  |
+| Finally.cs:161:39:161:47 | [finally: exception(Exception), exception: Exception] access to property Message | Finally.cs:161:52:161:54 | [finally: exception(Exception), exception: Exception] "1" |  |
+| Finally.cs:161:39:161:47 | [finally: exception(Exception), exception: NullReferenceException] access to property Message | Finally.cs:161:52:161:54 | [finally: exception(Exception), exception: NullReferenceException] "1" |  |
+| Finally.cs:161:39:161:54 | [exception: Exception] ... == ... | Finally.cs:162:13:164:13 | {...} | true |
+| Finally.cs:161:39:161:54 | [exception: Exception] ... == ... | Finally.cs:165:13:168:13 | catch {...} | false |
+| Finally.cs:161:39:161:54 | [exception: NullReferenceException] ... == ... | Finally.cs:162:13:164:13 | {...} | true |
+| Finally.cs:161:39:161:54 | [exception: NullReferenceException] ... == ... | Finally.cs:165:13:168:13 | catch {...} | false |
+| Finally.cs:161:39:161:54 | [finally: exception(ArgumentNullException), exception: Exception] ... == ... | Finally.cs:162:13:164:13 | [finally: exception(ArgumentNullException)] {...} | true |
+| Finally.cs:161:39:161:54 | [finally: exception(ArgumentNullException), exception: Exception] ... == ... | Finally.cs:165:13:168:13 | [finally: exception(ArgumentNullException)] catch {...} | false |
+| Finally.cs:161:39:161:54 | [finally: exception(ArgumentNullException), exception: NullReferenceException] ... == ... | Finally.cs:162:13:164:13 | [finally: exception(ArgumentNullException)] {...} | true |
+| Finally.cs:161:39:161:54 | [finally: exception(ArgumentNullException), exception: NullReferenceException] ... == ... | Finally.cs:165:13:168:13 | [finally: exception(ArgumentNullException)] catch {...} | false |
+| Finally.cs:161:39:161:54 | [finally: exception(Exception), exception: Exception] ... == ... | Finally.cs:162:13:164:13 | [finally: exception(Exception)] {...} | true |
+| Finally.cs:161:39:161:54 | [finally: exception(Exception), exception: Exception] ... == ... | Finally.cs:165:13:168:13 | [finally: exception(Exception)] catch {...} | false |
+| Finally.cs:161:39:161:54 | [finally: exception(Exception), exception: NullReferenceException] ... == ... | Finally.cs:162:13:164:13 | [finally: exception(Exception)] {...} | true |
+| Finally.cs:161:39:161:54 | [finally: exception(Exception), exception: NullReferenceException] ... == ... | Finally.cs:165:13:168:13 | [finally: exception(Exception)] catch {...} | false |
+| Finally.cs:161:52:161:54 | [exception: Exception] "1" | Finally.cs:161:39:161:54 | [exception: Exception] ... == ... |  |
+| Finally.cs:161:52:161:54 | [exception: NullReferenceException] "1" | Finally.cs:161:39:161:54 | [exception: NullReferenceException] ... == ... |  |
+| Finally.cs:161:52:161:54 | [finally: exception(ArgumentNullException), exception: Exception] "1" | Finally.cs:161:39:161:54 | [finally: exception(ArgumentNullException), exception: Exception] ... == ... |  |
+| Finally.cs:161:52:161:54 | [finally: exception(ArgumentNullException), exception: NullReferenceException] "1" | Finally.cs:161:39:161:54 | [finally: exception(ArgumentNullException), exception: NullReferenceException] ... == ... |  |
+| Finally.cs:161:52:161:54 | [finally: exception(Exception), exception: Exception] "1" | Finally.cs:161:39:161:54 | [finally: exception(Exception), exception: Exception] ... == ... |  |
+| Finally.cs:161:52:161:54 | [finally: exception(Exception), exception: NullReferenceException] "1" | Finally.cs:161:39:161:54 | [finally: exception(Exception), exception: NullReferenceException] ... == ... |  |
+| Finally.cs:162:13:164:13 | [finally: exception(ArgumentNullException)] {...} | Finally.cs:163:17:163:43 | [finally: exception(ArgumentNullException)] ...; |  |
+| Finally.cs:162:13:164:13 | [finally: exception(Exception)] {...} | Finally.cs:163:17:163:43 | [finally: exception(Exception)] ...; |  |
+| Finally.cs:162:13:164:13 | {...} | Finally.cs:163:17:163:43 | ...; |  |
+| Finally.cs:163:17:163:42 | [finally: exception(ArgumentNullException)] call to method WriteLine | Finally.cs:147:10:147:11 | exit M8 (abnormal) | exception(ArgumentNullException) |
+| Finally.cs:163:17:163:42 | [finally: exception(Exception)] call to method WriteLine | Finally.cs:147:10:147:11 | exit M8 (abnormal) | exception(Exception) |
+| Finally.cs:163:17:163:42 | call to method WriteLine | Finally.cs:147:10:147:11 | exit M8 (normal) |  |
+| Finally.cs:163:17:163:43 | ...; | Finally.cs:163:35:163:38 | access to parameter args |  |
+| Finally.cs:163:17:163:43 | [finally: exception(ArgumentNullException)] ...; | Finally.cs:163:35:163:38 | [finally: exception(ArgumentNullException)] access to parameter args |  |
+| Finally.cs:163:17:163:43 | [finally: exception(Exception)] ...; | Finally.cs:163:35:163:38 | [finally: exception(Exception)] access to parameter args |  |
+| Finally.cs:163:35:163:38 | [finally: exception(ArgumentNullException)] access to parameter args | Finally.cs:163:40:163:40 | [finally: exception(ArgumentNullException)] 0 |  |
+| Finally.cs:163:35:163:38 | [finally: exception(Exception)] access to parameter args | Finally.cs:163:40:163:40 | [finally: exception(Exception)] 0 |  |
+| Finally.cs:163:35:163:38 | access to parameter args | Finally.cs:163:40:163:40 | 0 |  |
+| Finally.cs:163:35:163:41 | [finally: exception(ArgumentNullException)] access to array element | Finally.cs:163:17:163:42 | [finally: exception(ArgumentNullException)] call to method WriteLine |  |
+| Finally.cs:163:35:163:41 | [finally: exception(Exception)] access to array element | Finally.cs:163:17:163:42 | [finally: exception(Exception)] call to method WriteLine |  |
+| Finally.cs:163:35:163:41 | access to array element | Finally.cs:163:17:163:42 | call to method WriteLine |  |
+| Finally.cs:163:40:163:40 | 0 | Finally.cs:163:35:163:41 | access to array element |  |
+| Finally.cs:163:40:163:40 | [finally: exception(ArgumentNullException)] 0 | Finally.cs:163:35:163:41 | [finally: exception(ArgumentNullException)] access to array element |  |
+| Finally.cs:163:40:163:40 | [finally: exception(Exception)] 0 | Finally.cs:163:35:163:41 | [finally: exception(Exception)] access to array element |  |
+| Finally.cs:165:13:168:13 | [finally: exception(ArgumentNullException)] catch {...} | Finally.cs:166:13:168:13 | [finally: exception(ArgumentNullException)] {...} |  |
+| Finally.cs:165:13:168:13 | [finally: exception(Exception)] catch {...} | Finally.cs:166:13:168:13 | [finally: exception(Exception)] {...} |  |
+| Finally.cs:165:13:168:13 | catch {...} | Finally.cs:166:13:168:13 | {...} |  |
+| Finally.cs:166:13:168:13 | [finally: exception(ArgumentNullException)] {...} | Finally.cs:167:17:167:38 | [finally: exception(ArgumentNullException)] ...; |  |
+| Finally.cs:166:13:168:13 | [finally: exception(Exception)] {...} | Finally.cs:167:17:167:38 | [finally: exception(Exception)] ...; |  |
+| Finally.cs:166:13:168:13 | {...} | Finally.cs:167:17:167:38 | ...; |  |
+| Finally.cs:167:17:167:37 | [finally: exception(ArgumentNullException)] call to method WriteLine | Finally.cs:147:10:147:11 | exit M8 (abnormal) | exception(ArgumentNullException) |
+| Finally.cs:167:17:167:37 | [finally: exception(Exception)] call to method WriteLine | Finally.cs:147:10:147:11 | exit M8 (abnormal) | exception(Exception) |
+| Finally.cs:167:17:167:37 | call to method WriteLine | Finally.cs:147:10:147:11 | exit M8 (normal) |  |
+| Finally.cs:167:17:167:38 | ...; | Finally.cs:167:35:167:36 | "" |  |
+| Finally.cs:167:17:167:38 | [finally: exception(ArgumentNullException)] ...; | Finally.cs:167:35:167:36 | [finally: exception(ArgumentNullException)] "" |  |
+| Finally.cs:167:17:167:38 | [finally: exception(Exception)] ...; | Finally.cs:167:35:167:36 | [finally: exception(Exception)] "" |  |
+| Finally.cs:167:35:167:36 | "" | Finally.cs:167:17:167:37 | call to method WriteLine |  |
+| Finally.cs:167:35:167:36 | [finally: exception(ArgumentNullException)] "" | Finally.cs:167:17:167:37 | [finally: exception(ArgumentNullException)] call to method WriteLine |  |
+| Finally.cs:167:35:167:36 | [finally: exception(Exception)] "" | Finally.cs:167:17:167:37 | [finally: exception(Exception)] call to method WriteLine |  |
+| Finally.cs:172:11:172:20 | call to constructor Exception | Finally.cs:172:11:172:20 | {...} |  |
+| Finally.cs:172:11:172:20 | enter ExceptionA | Finally.cs:172:11:172:20 | call to constructor Exception |  |
+| Finally.cs:172:11:172:20 | exit ExceptionA (normal) | Finally.cs:172:11:172:20 | exit ExceptionA |  |
+| Finally.cs:172:11:172:20 | {...} | Finally.cs:172:11:172:20 | exit ExceptionA (normal) |  |
+| Finally.cs:173:11:173:20 | call to constructor Exception | Finally.cs:173:11:173:20 | {...} |  |
+| Finally.cs:173:11:173:20 | enter ExceptionB | Finally.cs:173:11:173:20 | call to constructor Exception |  |
+| Finally.cs:173:11:173:20 | exit ExceptionB (normal) | Finally.cs:173:11:173:20 | exit ExceptionB |  |
+| Finally.cs:173:11:173:20 | {...} | Finally.cs:173:11:173:20 | exit ExceptionB (normal) |  |
+| Finally.cs:174:11:174:20 | call to constructor Exception | Finally.cs:174:11:174:20 | {...} |  |
+| Finally.cs:174:11:174:20 | enter ExceptionC | Finally.cs:174:11:174:20 | call to constructor Exception |  |
+| Finally.cs:174:11:174:20 | exit ExceptionC (normal) | Finally.cs:174:11:174:20 | exit ExceptionC |  |
+| Finally.cs:174:11:174:20 | {...} | Finally.cs:174:11:174:20 | exit ExceptionC (normal) |  |
+| Finally.cs:176:10:176:11 | enter M9 | Finally.cs:177:5:193:5 | {...} |  |
+| Finally.cs:176:10:176:11 | exit M9 (abnormal) | Finally.cs:176:10:176:11 | exit M9 |  |
+| Finally.cs:176:10:176:11 | exit M9 (normal) | Finally.cs:176:10:176:11 | exit M9 |  |
+| Finally.cs:177:5:193:5 | {...} | Finally.cs:178:9:192:9 | try {...} ... |  |
+| Finally.cs:178:9:192:9 | try {...} ... | Finally.cs:179:9:181:9 | {...} |  |
+| Finally.cs:179:9:181:9 | {...} | Finally.cs:180:13:180:43 | if (...) ... |  |
+| Finally.cs:180:13:180:43 | if (...) ... | Finally.cs:180:17:180:18 | access to parameter b1 |  |
+| Finally.cs:180:17:180:18 | access to parameter b1 | Finally.cs:180:27:180:42 | [b1 (line 176): true] object creation of type ExceptionA | true |
+| Finally.cs:180:17:180:18 | access to parameter b1 | Finally.cs:183:9:192:9 | [b1 (line 176): false] {...} | false |
+| Finally.cs:180:21:180:43 | [b1 (line 176): true] throw ...; | Finally.cs:183:9:192:9 | [finally: exception(ExceptionA), b1 (line 176): true] {...} | exception(ExceptionA) |
+| Finally.cs:180:27:180:42 | [b1 (line 176): true] object creation of type ExceptionA | Finally.cs:180:21:180:43 | [b1 (line 176): true] throw ...; |  |
+| Finally.cs:180:27:180:42 | [b1 (line 176): true] object creation of type ExceptionA | Finally.cs:183:9:192:9 | [finally: exception(Exception), b1 (line 176): true] {...} | exception(Exception) |
+| Finally.cs:183:9:192:9 | [b1 (line 176): false] {...} | Finally.cs:184:13:191:13 | [b1 (line 176): false] try {...} ... |  |
+| Finally.cs:183:9:192:9 | [finally: exception(Exception), b1 (line 176): true] {...} | Finally.cs:184:13:191:13 | [finally: exception(Exception), b1 (line 176): true] try {...} ... |  |
+| Finally.cs:183:9:192:9 | [finally: exception(ExceptionA), b1 (line 176): true] {...} | Finally.cs:184:13:191:13 | [finally: exception(ExceptionA), b1 (line 176): true] try {...} ... |  |
+| Finally.cs:184:13:191:13 | [b1 (line 176): false] try {...} ... | Finally.cs:185:13:187:13 | [b1 (line 176): false] {...} |  |
+| Finally.cs:184:13:191:13 | [finally: exception(Exception), b1 (line 176): true] try {...} ... | Finally.cs:185:13:187:13 | [finally: exception(Exception), b1 (line 176): true] {...} |  |
+| Finally.cs:184:13:191:13 | [finally: exception(ExceptionA), b1 (line 176): true] try {...} ... | Finally.cs:185:13:187:13 | [finally: exception(ExceptionA), b1 (line 176): true] {...} |  |
+| Finally.cs:185:13:187:13 | [b1 (line 176): false] {...} | Finally.cs:186:17:186:47 | [b1 (line 176): false] if (...) ... |  |
+| Finally.cs:185:13:187:13 | [finally: exception(Exception), b1 (line 176): true] {...} | Finally.cs:186:17:186:47 | [finally: exception(Exception), b1 (line 176): true] if (...) ... |  |
+| Finally.cs:185:13:187:13 | [finally: exception(ExceptionA), b1 (line 176): true] {...} | Finally.cs:186:17:186:47 | [finally: exception(ExceptionA), b1 (line 176): true] if (...) ... |  |
+| Finally.cs:186:17:186:47 | [b1 (line 176): false] if (...) ... | Finally.cs:186:21:186:22 | [b1 (line 176): false] access to parameter b2 |  |
+| Finally.cs:186:17:186:47 | [finally: exception(Exception), b1 (line 176): true] if (...) ... | Finally.cs:186:21:186:22 | [finally: exception(Exception), b1 (line 176): true] access to parameter b2 |  |
+| Finally.cs:186:17:186:47 | [finally: exception(ExceptionA), b1 (line 176): true] if (...) ... | Finally.cs:186:21:186:22 | [finally: exception(ExceptionA), b1 (line 176): true] access to parameter b2 |  |
+| Finally.cs:186:21:186:22 | [b1 (line 176): false] access to parameter b2 | Finally.cs:176:10:176:11 | exit M9 (normal) | false |
+| Finally.cs:186:21:186:22 | [b1 (line 176): false] access to parameter b2 | Finally.cs:186:31:186:46 | [b1 (line 176): false, b2 (line 176): true] object creation of type ExceptionB | true |
+| Finally.cs:186:21:186:22 | [finally: exception(Exception), b1 (line 176): true] access to parameter b2 | Finally.cs:176:10:176:11 | exit M9 (abnormal) | exception(Exception) |
+| Finally.cs:186:21:186:22 | [finally: exception(Exception), b1 (line 176): true] access to parameter b2 | Finally.cs:186:31:186:46 | [finally: exception(Exception), b1 (line 176): true, b2 (line 176): true] object creation of type ExceptionB | true |
+| Finally.cs:186:21:186:22 | [finally: exception(ExceptionA), b1 (line 176): true] access to parameter b2 | Finally.cs:176:10:176:11 | exit M9 (abnormal) | exception(ExceptionA) |
+| Finally.cs:186:21:186:22 | [finally: exception(ExceptionA), b1 (line 176): true] access to parameter b2 | Finally.cs:186:31:186:46 | [finally: exception(ExceptionA), b1 (line 176): true, b2 (line 176): true] object creation of type ExceptionB | true |
+| Finally.cs:186:25:186:47 | [b1 (line 176): false, b2 (line 176): true] throw ...; | Finally.cs:188:13:191:13 | [exception: ExceptionB, b1 (line 176): false, b2 (line 176): true] catch (...) {...} | exception(ExceptionB) |
+| Finally.cs:186:25:186:47 | [finally: exception(Exception), b1 (line 176): true, b2 (line 176): true] throw ...; | Finally.cs:188:13:191:13 | [finally: exception(Exception), exception: ExceptionB, b1 (line 176): true, b2 (line 176): true] catch (...) {...} | exception(ExceptionB) |
+| Finally.cs:186:25:186:47 | [finally: exception(ExceptionA), b1 (line 176): true, b2 (line 176): true] throw ...; | Finally.cs:188:13:191:13 | [finally: exception(ExceptionA), exception: ExceptionB, b1 (line 176): true, b2 (line 176): true] catch (...) {...} | exception(ExceptionB) |
+| Finally.cs:186:31:186:46 | [b1 (line 176): false, b2 (line 176): true] object creation of type ExceptionB | Finally.cs:186:25:186:47 | [b1 (line 176): false, b2 (line 176): true] throw ...; |  |
+| Finally.cs:186:31:186:46 | [b1 (line 176): false, b2 (line 176): true] object creation of type ExceptionB | Finally.cs:188:13:191:13 | [exception: Exception, b1 (line 176): false, b2 (line 176): true] catch (...) {...} | exception(Exception) |
+| Finally.cs:186:31:186:46 | [finally: exception(Exception), b1 (line 176): true, b2 (line 176): true] object creation of type ExceptionB | Finally.cs:186:25:186:47 | [finally: exception(Exception), b1 (line 176): true, b2 (line 176): true] throw ...; |  |
+| Finally.cs:186:31:186:46 | [finally: exception(Exception), b1 (line 176): true, b2 (line 176): true] object creation of type ExceptionB | Finally.cs:188:13:191:13 | [finally: exception(Exception), exception: Exception, b1 (line 176): true, b2 (line 176): true] catch (...) {...} | exception(Exception) |
+| Finally.cs:186:31:186:46 | [finally: exception(ExceptionA), b1 (line 176): true, b2 (line 176): true] object creation of type ExceptionB | Finally.cs:186:25:186:47 | [finally: exception(ExceptionA), b1 (line 176): true, b2 (line 176): true] throw ...; |  |
+| Finally.cs:186:31:186:46 | [finally: exception(ExceptionA), b1 (line 176): true, b2 (line 176): true] object creation of type ExceptionB | Finally.cs:188:13:191:13 | [finally: exception(ExceptionA), exception: Exception, b1 (line 176): true, b2 (line 176): true] catch (...) {...} | exception(Exception) |
+| Finally.cs:188:13:191:13 | [exception: Exception, b1 (line 176): false, b2 (line 176): true] catch (...) {...} | Finally.cs:176:10:176:11 | exit M9 (abnormal) | exception(Exception) |
+| Finally.cs:188:13:191:13 | [exception: Exception, b1 (line 176): false, b2 (line 176): true] catch (...) {...} | Finally.cs:188:38:188:39 | [exception: Exception, b1 (line 176): false, b2 (line 176): true] access to parameter b2 | match |
+| Finally.cs:188:13:191:13 | [exception: ExceptionB, b1 (line 176): false, b2 (line 176): true] catch (...) {...} | Finally.cs:188:38:188:39 | [exception: ExceptionB, b1 (line 176): false, b2 (line 176): true] access to parameter b2 | match |
+| Finally.cs:188:13:191:13 | [finally: exception(Exception), exception: Exception, b1 (line 176): true, b2 (line 176): true] catch (...) {...} | Finally.cs:176:10:176:11 | exit M9 (abnormal) | exception(Exception) |
+| Finally.cs:188:13:191:13 | [finally: exception(Exception), exception: Exception, b1 (line 176): true, b2 (line 176): true] catch (...) {...} | Finally.cs:188:38:188:39 | [finally: exception(Exception), exception: Exception, b1 (line 176): true, b2 (line 176): true] access to parameter b2 | match |
+| Finally.cs:188:13:191:13 | [finally: exception(Exception), exception: ExceptionB, b1 (line 176): true, b2 (line 176): true] catch (...) {...} | Finally.cs:188:38:188:39 | [finally: exception(Exception), exception: ExceptionB, b1 (line 176): true, b2 (line 176): true] access to parameter b2 | match |
+| Finally.cs:188:13:191:13 | [finally: exception(ExceptionA), exception: Exception, b1 (line 176): true, b2 (line 176): true] catch (...) {...} | Finally.cs:176:10:176:11 | exit M9 (abnormal) | exception(Exception) |
+| Finally.cs:188:13:191:13 | [finally: exception(ExceptionA), exception: Exception, b1 (line 176): true, b2 (line 176): true] catch (...) {...} | Finally.cs:188:38:188:39 | [finally: exception(ExceptionA), exception: Exception, b1 (line 176): true, b2 (line 176): true] access to parameter b2 | match |
+| Finally.cs:188:13:191:13 | [finally: exception(ExceptionA), exception: ExceptionB, b1 (line 176): true, b2 (line 176): true] catch (...) {...} | Finally.cs:188:38:188:39 | [finally: exception(ExceptionA), exception: ExceptionB, b1 (line 176): true, b2 (line 176): true] access to parameter b2 | match |
+| Finally.cs:188:38:188:39 | [exception: Exception, b1 (line 176): false, b2 (line 176): true] access to parameter b2 | Finally.cs:189:13:191:13 | [b1 (line 176): false] {...} | true |
+| Finally.cs:188:38:188:39 | [exception: ExceptionB, b1 (line 176): false, b2 (line 176): true] access to parameter b2 | Finally.cs:189:13:191:13 | [b1 (line 176): false] {...} | true |
+| Finally.cs:188:38:188:39 | [finally: exception(Exception), exception: Exception, b1 (line 176): true, b2 (line 176): true] access to parameter b2 | Finally.cs:189:13:191:13 | [finally: exception(Exception), b1 (line 176): true] {...} | true |
+| Finally.cs:188:38:188:39 | [finally: exception(Exception), exception: ExceptionB, b1 (line 176): true, b2 (line 176): true] access to parameter b2 | Finally.cs:189:13:191:13 | [finally: exception(Exception), b1 (line 176): true] {...} | true |
+| Finally.cs:188:38:188:39 | [finally: exception(ExceptionA), exception: Exception, b1 (line 176): true, b2 (line 176): true] access to parameter b2 | Finally.cs:189:13:191:13 | [finally: exception(ExceptionA), b1 (line 176): true] {...} | true |
+| Finally.cs:188:38:188:39 | [finally: exception(ExceptionA), exception: ExceptionB, b1 (line 176): true, b2 (line 176): true] access to parameter b2 | Finally.cs:189:13:191:13 | [finally: exception(ExceptionA), b1 (line 176): true] {...} | true |
+| Finally.cs:189:13:191:13 | [b1 (line 176): false] {...} | Finally.cs:190:17:190:47 | [b1 (line 176): false] if (...) ... |  |
+| Finally.cs:189:13:191:13 | [finally: exception(Exception), b1 (line 176): true] {...} | Finally.cs:190:17:190:47 | [finally: exception(Exception), b1 (line 176): true] if (...) ... |  |
+| Finally.cs:189:13:191:13 | [finally: exception(ExceptionA), b1 (line 176): true] {...} | Finally.cs:190:17:190:47 | [finally: exception(ExceptionA), b1 (line 176): true] if (...) ... |  |
+| Finally.cs:190:17:190:47 | [b1 (line 176): false] if (...) ... | Finally.cs:190:21:190:22 | [b1 (line 176): false] access to parameter b1 |  |
+| Finally.cs:190:17:190:47 | [finally: exception(Exception), b1 (line 176): true] if (...) ... | Finally.cs:190:21:190:22 | [finally: exception(Exception), b1 (line 176): true] access to parameter b1 |  |
+| Finally.cs:190:17:190:47 | [finally: exception(ExceptionA), b1 (line 176): true] if (...) ... | Finally.cs:190:21:190:22 | [finally: exception(ExceptionA), b1 (line 176): true] access to parameter b1 |  |
+| Finally.cs:190:21:190:22 | [b1 (line 176): false] access to parameter b1 | Finally.cs:176:10:176:11 | exit M9 (normal) | false |
+| Finally.cs:190:21:190:22 | [finally: exception(Exception), b1 (line 176): true] access to parameter b1 | Finally.cs:190:31:190:46 | [finally: exception(Exception)] object creation of type ExceptionC | true |
+| Finally.cs:190:21:190:22 | [finally: exception(ExceptionA), b1 (line 176): true] access to parameter b1 | Finally.cs:190:31:190:46 | [finally: exception(ExceptionA)] object creation of type ExceptionC | true |
+| Finally.cs:190:25:190:47 | [finally: exception(Exception)] throw ...; | Finally.cs:176:10:176:11 | exit M9 (abnormal) | exception(ExceptionC) |
+| Finally.cs:190:25:190:47 | [finally: exception(ExceptionA)] throw ...; | Finally.cs:176:10:176:11 | exit M9 (abnormal) | exception(ExceptionC) |
+| Finally.cs:190:31:190:46 | [finally: exception(Exception)] object creation of type ExceptionC | Finally.cs:190:25:190:47 | [finally: exception(Exception)] throw ...; |  |
+| Finally.cs:190:31:190:46 | [finally: exception(ExceptionA)] object creation of type ExceptionC | Finally.cs:190:25:190:47 | [finally: exception(ExceptionA)] throw ...; |  |
+| Finally.cs:195:10:195:12 | enter M10 | Finally.cs:196:5:214:5 | {...} |  |
+| Finally.cs:195:10:195:12 | exit M10 (abnormal) | Finally.cs:195:10:195:12 | exit M10 |  |
+| Finally.cs:195:10:195:12 | exit M10 (normal) | Finally.cs:195:10:195:12 | exit M10 |  |
+| Finally.cs:196:5:214:5 | {...} | Finally.cs:197:9:212:9 | try {...} ... |  |
+| Finally.cs:197:9:212:9 | try {...} ... | Finally.cs:198:9:200:9 | {...} |  |
+| Finally.cs:198:9:200:9 | {...} | Finally.cs:199:13:199:43 | if (...) ... |  |
+| Finally.cs:199:13:199:43 | if (...) ... | Finally.cs:199:17:199:18 | access to parameter b1 |  |
+| Finally.cs:199:17:199:18 | access to parameter b1 | Finally.cs:199:27:199:42 | object creation of type ExceptionA | true |
+| Finally.cs:199:17:199:18 | access to parameter b1 | Finally.cs:202:9:212:9 | {...} | false |
+| Finally.cs:199:21:199:43 | throw ...; | Finally.cs:202:9:212:9 | [finally: exception(ExceptionA)] {...} | exception(ExceptionA) |
+| Finally.cs:199:27:199:42 | object creation of type ExceptionA | Finally.cs:199:21:199:43 | throw ...; |  |
+| Finally.cs:199:27:199:42 | object creation of type ExceptionA | Finally.cs:202:9:212:9 | [finally: exception(Exception)] {...} | exception(Exception) |
+| Finally.cs:202:9:212:9 | [finally: exception(Exception)] {...} | Finally.cs:203:13:210:13 | [finally: exception(Exception)] try {...} ... |  |
+| Finally.cs:202:9:212:9 | [finally: exception(ExceptionA)] {...} | Finally.cs:203:13:210:13 | [finally: exception(ExceptionA)] try {...} ... |  |
+| Finally.cs:202:9:212:9 | {...} | Finally.cs:203:13:210:13 | try {...} ... |  |
+| Finally.cs:203:13:210:13 | [finally: exception(Exception)] try {...} ... | Finally.cs:204:13:206:13 | [finally: exception(Exception)] {...} |  |
+| Finally.cs:203:13:210:13 | [finally: exception(ExceptionA)] try {...} ... | Finally.cs:204:13:206:13 | [finally: exception(ExceptionA)] {...} |  |
+| Finally.cs:203:13:210:13 | try {...} ... | Finally.cs:204:13:206:13 | {...} |  |
+| Finally.cs:204:13:206:13 | [finally: exception(Exception)] {...} | Finally.cs:205:17:205:47 | [finally: exception(Exception)] if (...) ... |  |
+| Finally.cs:204:13:206:13 | [finally: exception(ExceptionA)] {...} | Finally.cs:205:17:205:47 | [finally: exception(ExceptionA)] if (...) ... |  |
+| Finally.cs:204:13:206:13 | {...} | Finally.cs:205:17:205:47 | if (...) ... |  |
+| Finally.cs:205:17:205:47 | [finally: exception(Exception)] if (...) ... | Finally.cs:205:21:205:22 | [finally: exception(Exception)] access to parameter b2 |  |
+| Finally.cs:205:17:205:47 | [finally: exception(ExceptionA)] if (...) ... | Finally.cs:205:21:205:22 | [finally: exception(ExceptionA)] access to parameter b2 |  |
+| Finally.cs:205:17:205:47 | if (...) ... | Finally.cs:205:21:205:22 | access to parameter b2 |  |
+| Finally.cs:205:21:205:22 | [finally: exception(Exception)] access to parameter b2 | Finally.cs:205:31:205:46 | [finally: exception(Exception)] object creation of type ExceptionB | true |
+| Finally.cs:205:21:205:22 | [finally: exception(Exception)] access to parameter b2 | Finally.cs:208:13:210:13 | [finally: exception(Exception)] {...} | false |
+| Finally.cs:205:21:205:22 | [finally: exception(ExceptionA)] access to parameter b2 | Finally.cs:205:31:205:46 | [finally: exception(ExceptionA)] object creation of type ExceptionB | true |
+| Finally.cs:205:21:205:22 | [finally: exception(ExceptionA)] access to parameter b2 | Finally.cs:208:13:210:13 | [finally: exception(ExceptionA)] {...} | false |
+| Finally.cs:205:21:205:22 | access to parameter b2 | Finally.cs:205:31:205:46 | object creation of type ExceptionB | true |
+| Finally.cs:205:21:205:22 | access to parameter b2 | Finally.cs:208:13:210:13 | {...} | false |
+| Finally.cs:205:25:205:47 | [finally: exception(Exception)] throw ...; | Finally.cs:208:13:210:13 | [finally: exception(Exception), finally(1): exception(ExceptionB)] {...} | exception(ExceptionB) |
+| Finally.cs:205:25:205:47 | [finally: exception(ExceptionA)] throw ...; | Finally.cs:208:13:210:13 | [finally: exception(ExceptionA), finally(1): exception(ExceptionB)] {...} | exception(ExceptionB) |
+| Finally.cs:205:25:205:47 | throw ...; | Finally.cs:208:13:210:13 | [finally(1): exception(ExceptionB)] {...} | exception(ExceptionB) |
+| Finally.cs:205:31:205:46 | [finally: exception(Exception)] object creation of type ExceptionB | Finally.cs:205:25:205:47 | [finally: exception(Exception)] throw ...; |  |
+| Finally.cs:205:31:205:46 | [finally: exception(Exception)] object creation of type ExceptionB | Finally.cs:208:13:210:13 | [finally: exception(Exception), finally(1): exception(Exception)] {...} | exception(Exception) |
+| Finally.cs:205:31:205:46 | [finally: exception(ExceptionA)] object creation of type ExceptionB | Finally.cs:205:25:205:47 | [finally: exception(ExceptionA)] throw ...; |  |
+| Finally.cs:205:31:205:46 | [finally: exception(ExceptionA)] object creation of type ExceptionB | Finally.cs:208:13:210:13 | [finally: exception(ExceptionA), finally(1): exception(Exception)] {...} | exception(Exception) |
+| Finally.cs:205:31:205:46 | object creation of type ExceptionB | Finally.cs:205:25:205:47 | throw ...; |  |
+| Finally.cs:205:31:205:46 | object creation of type ExceptionB | Finally.cs:208:13:210:13 | [finally(1): exception(Exception)] {...} | exception(Exception) |
+| Finally.cs:208:13:210:13 | [finally(1): exception(Exception)] {...} | Finally.cs:209:17:209:47 | [finally(1): exception(Exception)] if (...) ... |  |
+| Finally.cs:208:13:210:13 | [finally(1): exception(ExceptionB)] {...} | Finally.cs:209:17:209:47 | [finally(1): exception(ExceptionB)] if (...) ... |  |
+| Finally.cs:208:13:210:13 | [finally: exception(Exception), finally(1): exception(Exception)] {...} | Finally.cs:209:17:209:47 | [finally: exception(Exception), finally(1): exception(Exception)] if (...) ... |  |
+| Finally.cs:208:13:210:13 | [finally: exception(Exception), finally(1): exception(ExceptionB)] {...} | Finally.cs:209:17:209:47 | [finally: exception(Exception), finally(1): exception(ExceptionB)] if (...) ... |  |
+| Finally.cs:208:13:210:13 | [finally: exception(Exception)] {...} | Finally.cs:209:17:209:47 | [finally: exception(Exception)] if (...) ... |  |
+| Finally.cs:208:13:210:13 | [finally: exception(ExceptionA), finally(1): exception(Exception)] {...} | Finally.cs:209:17:209:47 | [finally: exception(ExceptionA), finally(1): exception(Exception)] if (...) ... |  |
+| Finally.cs:208:13:210:13 | [finally: exception(ExceptionA), finally(1): exception(ExceptionB)] {...} | Finally.cs:209:17:209:47 | [finally: exception(ExceptionA), finally(1): exception(ExceptionB)] if (...) ... |  |
+| Finally.cs:208:13:210:13 | [finally: exception(ExceptionA)] {...} | Finally.cs:209:17:209:47 | [finally: exception(ExceptionA)] if (...) ... |  |
+| Finally.cs:208:13:210:13 | {...} | Finally.cs:209:17:209:47 | if (...) ... |  |
+| Finally.cs:209:17:209:47 | [finally(1): exception(Exception)] if (...) ... | Finally.cs:209:21:209:22 | [finally(1): exception(Exception)] access to parameter b3 |  |
+| Finally.cs:209:17:209:47 | [finally(1): exception(ExceptionB)] if (...) ... | Finally.cs:209:21:209:22 | [finally(1): exception(ExceptionB)] access to parameter b3 |  |
+| Finally.cs:209:17:209:47 | [finally: exception(Exception), finally(1): exception(Exception)] if (...) ... | Finally.cs:209:21:209:22 | [finally: exception(Exception), finally(1): exception(Exception)] access to parameter b3 |  |
+| Finally.cs:209:17:209:47 | [finally: exception(Exception), finally(1): exception(ExceptionB)] if (...) ... | Finally.cs:209:21:209:22 | [finally: exception(Exception), finally(1): exception(ExceptionB)] access to parameter b3 |  |
+| Finally.cs:209:17:209:47 | [finally: exception(Exception)] if (...) ... | Finally.cs:209:21:209:22 | [finally: exception(Exception)] access to parameter b3 |  |
+| Finally.cs:209:17:209:47 | [finally: exception(ExceptionA), finally(1): exception(Exception)] if (...) ... | Finally.cs:209:21:209:22 | [finally: exception(ExceptionA), finally(1): exception(Exception)] access to parameter b3 |  |
+| Finally.cs:209:17:209:47 | [finally: exception(ExceptionA), finally(1): exception(ExceptionB)] if (...) ... | Finally.cs:209:21:209:22 | [finally: exception(ExceptionA), finally(1): exception(ExceptionB)] access to parameter b3 |  |
+| Finally.cs:209:17:209:47 | [finally: exception(ExceptionA)] if (...) ... | Finally.cs:209:21:209:22 | [finally: exception(ExceptionA)] access to parameter b3 |  |
+| Finally.cs:209:17:209:47 | if (...) ... | Finally.cs:209:21:209:22 | access to parameter b3 |  |
+| Finally.cs:209:21:209:22 | [finally(1): exception(Exception)] access to parameter b3 | Finally.cs:195:10:195:12 | exit M10 (abnormal) | exception(Exception) |
+| Finally.cs:209:21:209:22 | [finally(1): exception(Exception)] access to parameter b3 | Finally.cs:209:31:209:46 | [finally(1): exception(Exception)] object creation of type ExceptionC | true |
+| Finally.cs:209:21:209:22 | [finally(1): exception(ExceptionB)] access to parameter b3 | Finally.cs:195:10:195:12 | exit M10 (abnormal) | exception(ExceptionB) |
+| Finally.cs:209:21:209:22 | [finally(1): exception(ExceptionB)] access to parameter b3 | Finally.cs:209:31:209:46 | [finally(1): exception(ExceptionB)] object creation of type ExceptionC | true |
+| Finally.cs:209:21:209:22 | [finally: exception(Exception), finally(1): exception(Exception)] access to parameter b3 | Finally.cs:195:10:195:12 | exit M10 (abnormal) | exception(Exception) |
+| Finally.cs:209:21:209:22 | [finally: exception(Exception), finally(1): exception(Exception)] access to parameter b3 | Finally.cs:209:31:209:46 | [finally: exception(Exception), finally(1): exception(Exception)] object creation of type ExceptionC | true |
+| Finally.cs:209:21:209:22 | [finally: exception(Exception), finally(1): exception(ExceptionB)] access to parameter b3 | Finally.cs:195:10:195:12 | exit M10 (abnormal) | exception(ExceptionB) |
+| Finally.cs:209:21:209:22 | [finally: exception(Exception), finally(1): exception(ExceptionB)] access to parameter b3 | Finally.cs:209:31:209:46 | [finally: exception(Exception), finally(1): exception(ExceptionB)] object creation of type ExceptionC | true |
+| Finally.cs:209:21:209:22 | [finally: exception(Exception)] access to parameter b3 | Finally.cs:209:31:209:46 | [finally: exception(Exception)] object creation of type ExceptionC | true |
+| Finally.cs:209:21:209:22 | [finally: exception(Exception)] access to parameter b3 | Finally.cs:211:13:211:29 | [finally: exception(Exception)] ...; | false |
+| Finally.cs:209:21:209:22 | [finally: exception(ExceptionA), finally(1): exception(Exception)] access to parameter b3 | Finally.cs:195:10:195:12 | exit M10 (abnormal) | exception(Exception) |
+| Finally.cs:209:21:209:22 | [finally: exception(ExceptionA), finally(1): exception(Exception)] access to parameter b3 | Finally.cs:209:31:209:46 | [finally: exception(ExceptionA), finally(1): exception(Exception)] object creation of type ExceptionC | true |
+| Finally.cs:209:21:209:22 | [finally: exception(ExceptionA), finally(1): exception(ExceptionB)] access to parameter b3 | Finally.cs:195:10:195:12 | exit M10 (abnormal) | exception(ExceptionB) |
+| Finally.cs:209:21:209:22 | [finally: exception(ExceptionA), finally(1): exception(ExceptionB)] access to parameter b3 | Finally.cs:209:31:209:46 | [finally: exception(ExceptionA), finally(1): exception(ExceptionB)] object creation of type ExceptionC | true |
+| Finally.cs:209:21:209:22 | [finally: exception(ExceptionA)] access to parameter b3 | Finally.cs:209:31:209:46 | [finally: exception(ExceptionA)] object creation of type ExceptionC | true |
+| Finally.cs:209:21:209:22 | [finally: exception(ExceptionA)] access to parameter b3 | Finally.cs:211:13:211:29 | [finally: exception(ExceptionA)] ...; | false |
+| Finally.cs:209:21:209:22 | access to parameter b3 | Finally.cs:209:31:209:46 | object creation of type ExceptionC | true |
+| Finally.cs:209:21:209:22 | access to parameter b3 | Finally.cs:211:13:211:29 | ...; | false |
+| Finally.cs:209:25:209:47 | [finally(1): exception(Exception)] throw ...; | Finally.cs:195:10:195:12 | exit M10 (abnormal) | exception(ExceptionC) |
+| Finally.cs:209:25:209:47 | [finally(1): exception(ExceptionB)] throw ...; | Finally.cs:195:10:195:12 | exit M10 (abnormal) | exception(ExceptionC) |
+| Finally.cs:209:25:209:47 | [finally: exception(Exception), finally(1): exception(Exception)] throw ...; | Finally.cs:195:10:195:12 | exit M10 (abnormal) | exception(ExceptionC) |
+| Finally.cs:209:25:209:47 | [finally: exception(Exception), finally(1): exception(ExceptionB)] throw ...; | Finally.cs:195:10:195:12 | exit M10 (abnormal) | exception(ExceptionC) |
+| Finally.cs:209:25:209:47 | [finally: exception(Exception)] throw ...; | Finally.cs:195:10:195:12 | exit M10 (abnormal) | exception(ExceptionC) |
+| Finally.cs:209:25:209:47 | [finally: exception(ExceptionA), finally(1): exception(Exception)] throw ...; | Finally.cs:195:10:195:12 | exit M10 (abnormal) | exception(ExceptionC) |
+| Finally.cs:209:25:209:47 | [finally: exception(ExceptionA), finally(1): exception(ExceptionB)] throw ...; | Finally.cs:195:10:195:12 | exit M10 (abnormal) | exception(ExceptionC) |
+| Finally.cs:209:25:209:47 | [finally: exception(ExceptionA)] throw ...; | Finally.cs:195:10:195:12 | exit M10 (abnormal) | exception(ExceptionC) |
+| Finally.cs:209:25:209:47 | throw ...; | Finally.cs:195:10:195:12 | exit M10 (abnormal) | exception(ExceptionC) |
+| Finally.cs:209:31:209:46 | [finally(1): exception(Exception)] object creation of type ExceptionC | Finally.cs:209:25:209:47 | [finally(1): exception(Exception)] throw ...; |  |
+| Finally.cs:209:31:209:46 | [finally(1): exception(ExceptionB)] object creation of type ExceptionC | Finally.cs:209:25:209:47 | [finally(1): exception(ExceptionB)] throw ...; |  |
+| Finally.cs:209:31:209:46 | [finally: exception(Exception), finally(1): exception(Exception)] object creation of type ExceptionC | Finally.cs:209:25:209:47 | [finally: exception(Exception), finally(1): exception(Exception)] throw ...; |  |
+| Finally.cs:209:31:209:46 | [finally: exception(Exception), finally(1): exception(ExceptionB)] object creation of type ExceptionC | Finally.cs:209:25:209:47 | [finally: exception(Exception), finally(1): exception(ExceptionB)] throw ...; |  |
+| Finally.cs:209:31:209:46 | [finally: exception(Exception)] object creation of type ExceptionC | Finally.cs:209:25:209:47 | [finally: exception(Exception)] throw ...; |  |
+| Finally.cs:209:31:209:46 | [finally: exception(ExceptionA), finally(1): exception(Exception)] object creation of type ExceptionC | Finally.cs:209:25:209:47 | [finally: exception(ExceptionA), finally(1): exception(Exception)] throw ...; |  |
+| Finally.cs:209:31:209:46 | [finally: exception(ExceptionA), finally(1): exception(ExceptionB)] object creation of type ExceptionC | Finally.cs:209:25:209:47 | [finally: exception(ExceptionA), finally(1): exception(ExceptionB)] throw ...; |  |
+| Finally.cs:209:31:209:46 | [finally: exception(ExceptionA)] object creation of type ExceptionC | Finally.cs:209:25:209:47 | [finally: exception(ExceptionA)] throw ...; |  |
+| Finally.cs:209:31:209:46 | object creation of type ExceptionC | Finally.cs:209:25:209:47 | throw ...; |  |
+| Finally.cs:211:13:211:16 | [finally: exception(Exception)] this access | Finally.cs:211:26:211:28 | [finally: exception(Exception)] "0" |  |
+| Finally.cs:211:13:211:16 | [finally: exception(ExceptionA)] this access | Finally.cs:211:26:211:28 | [finally: exception(ExceptionA)] "0" |  |
+| Finally.cs:211:13:211:16 | this access | Finally.cs:211:26:211:28 | "0" |  |
+| Finally.cs:211:13:211:28 | ... = ... | Finally.cs:213:9:213:25 | ...; |  |
+| Finally.cs:211:13:211:28 | [finally: exception(Exception)] ... = ... | Finally.cs:195:10:195:12 | exit M10 (abnormal) | exception(Exception) |
+| Finally.cs:211:13:211:28 | [finally: exception(ExceptionA)] ... = ... | Finally.cs:195:10:195:12 | exit M10 (abnormal) | exception(ExceptionA) |
+| Finally.cs:211:13:211:29 | ...; | Finally.cs:211:13:211:16 | this access |  |
+| Finally.cs:211:13:211:29 | [finally: exception(Exception)] ...; | Finally.cs:211:13:211:16 | [finally: exception(Exception)] this access |  |
+| Finally.cs:211:13:211:29 | [finally: exception(ExceptionA)] ...; | Finally.cs:211:13:211:16 | [finally: exception(ExceptionA)] this access |  |
+| Finally.cs:211:26:211:28 | "0" | Finally.cs:211:13:211:28 | ... = ... |  |
+| Finally.cs:211:26:211:28 | [finally: exception(Exception)] "0" | Finally.cs:211:13:211:28 | [finally: exception(Exception)] ... = ... |  |
+| Finally.cs:211:26:211:28 | [finally: exception(ExceptionA)] "0" | Finally.cs:211:13:211:28 | [finally: exception(ExceptionA)] ... = ... |  |
+| Finally.cs:213:9:213:12 | this access | Finally.cs:213:22:213:24 | "1" |  |
+| Finally.cs:213:9:213:24 | ... = ... | Finally.cs:195:10:195:12 | exit M10 (normal) |  |
+| Finally.cs:213:9:213:25 | ...; | Finally.cs:213:9:213:12 | this access |  |
+| Finally.cs:213:22:213:24 | "1" | Finally.cs:213:9:213:24 | ... = ... |  |
+| Finally.cs:216:10:216:12 | enter M11 | Finally.cs:217:5:231:5 | {...} |  |
+| Finally.cs:216:10:216:12 | exit M11 (normal) | Finally.cs:216:10:216:12 | exit M11 |  |
+| Finally.cs:217:5:231:5 | {...} | Finally.cs:218:9:229:9 | try {...} ... |  |
+| Finally.cs:218:9:229:9 | try {...} ... | Finally.cs:219:9:221:9 | {...} |  |
+| Finally.cs:219:9:221:9 | {...} | Finally.cs:220:13:220:37 | ...; |  |
+| Finally.cs:220:13:220:36 | call to method WriteLine | Finally.cs:222:9:225:9 | catch {...} | exception(Exception) |
+| Finally.cs:220:13:220:36 | call to method WriteLine | Finally.cs:227:9:229:9 | {...} |  |
+| Finally.cs:220:13:220:37 | ...; | Finally.cs:220:31:220:35 | "Try" |  |
+| Finally.cs:220:31:220:35 | "Try" | Finally.cs:220:13:220:36 | call to method WriteLine |  |
+| Finally.cs:222:9:225:9 | catch {...} | Finally.cs:223:9:225:9 | {...} |  |
+| Finally.cs:223:9:225:9 | {...} | Finally.cs:224:13:224:39 | ...; |  |
+| Finally.cs:224:13:224:38 | call to method WriteLine | Finally.cs:227:9:229:9 | {...} |  |
+| Finally.cs:224:13:224:39 | ...; | Finally.cs:224:31:224:37 | "Catch" |  |
+| Finally.cs:224:31:224:37 | "Catch" | Finally.cs:224:13:224:38 | call to method WriteLine |  |
+| Finally.cs:227:9:229:9 | {...} | Finally.cs:228:13:228:41 | ...; |  |
+| Finally.cs:228:13:228:40 | call to method WriteLine | Finally.cs:230:9:230:34 | ...; |  |
+| Finally.cs:228:13:228:41 | ...; | Finally.cs:228:31:228:39 | "Finally" |  |
+| Finally.cs:228:31:228:39 | "Finally" | Finally.cs:228:13:228:40 | call to method WriteLine |  |
+| Finally.cs:230:9:230:33 | call to method WriteLine | Finally.cs:216:10:216:12 | exit M11 (normal) |  |
+| Finally.cs:230:9:230:34 | ...; | Finally.cs:230:27:230:32 | "Done" |  |
+| Finally.cs:230:27:230:32 | "Done" | Finally.cs:230:9:230:33 | call to method WriteLine |  |
+| Finally.cs:233:10:233:12 | enter M12 | Finally.cs:234:5:261:5 | {...} |  |
+| Finally.cs:233:10:233:12 | exit M12 (abnormal) | Finally.cs:233:10:233:12 | exit M12 |  |
+| Finally.cs:233:10:233:12 | exit M12 (normal) | Finally.cs:233:10:233:12 | exit M12 |  |
+| Finally.cs:234:5:261:5 | {...} | Finally.cs:235:9:259:9 | try {...} ... |  |
+| Finally.cs:235:9:259:9 | try {...} ... | Finally.cs:236:9:255:9 | {...} |  |
+| Finally.cs:236:9:255:9 | {...} | Finally.cs:237:13:253:13 | try {...} ... |  |
+| Finally.cs:237:13:253:13 | try {...} ... | Finally.cs:238:13:241:13 | {...} |  |
+| Finally.cs:238:13:241:13 | {...} | Finally.cs:239:17:240:43 | if (...) ... |  |
+| Finally.cs:239:17:240:43 | if (...) ... | Finally.cs:239:21:239:22 | access to parameter b1 |  |
+| Finally.cs:239:21:239:22 | access to parameter b1 | Finally.cs:240:27:240:42 | object creation of type ExceptionA | true |
+| Finally.cs:239:21:239:22 | access to parameter b1 | Finally.cs:243:13:253:13 | {...} | false |
+| Finally.cs:240:21:240:43 | throw ...; | Finally.cs:243:13:253:13 | [finally: exception(ExceptionA)] {...} | exception(ExceptionA) |
+| Finally.cs:240:27:240:42 | object creation of type ExceptionA | Finally.cs:240:21:240:43 | throw ...; |  |
+| Finally.cs:240:27:240:42 | object creation of type ExceptionA | Finally.cs:243:13:253:13 | [finally: exception(Exception)] {...} | exception(Exception) |
+| Finally.cs:243:13:253:13 | [finally: exception(Exception)] {...} | Finally.cs:244:17:252:17 | [finally: exception(Exception)] try {...} ... |  |
+| Finally.cs:243:13:253:13 | [finally: exception(ExceptionA)] {...} | Finally.cs:244:17:252:17 | [finally: exception(ExceptionA)] try {...} ... |  |
+| Finally.cs:243:13:253:13 | {...} | Finally.cs:244:17:252:17 | try {...} ... |  |
+| Finally.cs:244:17:252:17 | [finally: exception(Exception)] try {...} ... | Finally.cs:245:17:248:17 | [finally: exception(Exception)] {...} |  |
+| Finally.cs:244:17:252:17 | [finally: exception(ExceptionA)] try {...} ... | Finally.cs:245:17:248:17 | [finally: exception(ExceptionA)] {...} |  |
+| Finally.cs:244:17:252:17 | try {...} ... | Finally.cs:245:17:248:17 | {...} |  |
+| Finally.cs:245:17:248:17 | [finally: exception(Exception)] {...} | Finally.cs:246:21:247:47 | [finally: exception(Exception)] if (...) ... |  |
+| Finally.cs:245:17:248:17 | [finally: exception(ExceptionA)] {...} | Finally.cs:246:21:247:47 | [finally: exception(ExceptionA)] if (...) ... |  |
+| Finally.cs:245:17:248:17 | {...} | Finally.cs:246:21:247:47 | if (...) ... |  |
+| Finally.cs:246:21:247:47 | [finally: exception(Exception)] if (...) ... | Finally.cs:246:25:246:26 | [finally: exception(Exception)] access to parameter b2 |  |
+| Finally.cs:246:21:247:47 | [finally: exception(ExceptionA)] if (...) ... | Finally.cs:246:25:246:26 | [finally: exception(ExceptionA)] access to parameter b2 |  |
+| Finally.cs:246:21:247:47 | if (...) ... | Finally.cs:246:25:246:26 | access to parameter b2 |  |
+| Finally.cs:246:25:246:26 | [finally: exception(Exception)] access to parameter b2 | Finally.cs:247:31:247:46 | [finally: exception(Exception)] object creation of type ExceptionA | true |
+| Finally.cs:246:25:246:26 | [finally: exception(Exception)] access to parameter b2 | Finally.cs:250:17:252:17 | [finally: exception(Exception)] {...} | false |
+| Finally.cs:246:25:246:26 | [finally: exception(ExceptionA)] access to parameter b2 | Finally.cs:247:31:247:46 | [finally: exception(ExceptionA)] object creation of type ExceptionA | true |
+| Finally.cs:246:25:246:26 | [finally: exception(ExceptionA)] access to parameter b2 | Finally.cs:250:17:252:17 | [finally: exception(ExceptionA)] {...} | false |
+| Finally.cs:246:25:246:26 | access to parameter b2 | Finally.cs:247:31:247:46 | object creation of type ExceptionA | true |
+| Finally.cs:246:25:246:26 | access to parameter b2 | Finally.cs:250:17:252:17 | {...} | false |
+| Finally.cs:247:25:247:47 | [finally: exception(Exception)] throw ...; | Finally.cs:250:17:252:17 | [finally: exception(Exception), finally(1): exception(ExceptionA)] {...} | exception(ExceptionA) |
+| Finally.cs:247:25:247:47 | [finally: exception(ExceptionA)] throw ...; | Finally.cs:250:17:252:17 | [finally: exception(ExceptionA), finally(1): exception(ExceptionA)] {...} | exception(ExceptionA) |
+| Finally.cs:247:25:247:47 | throw ...; | Finally.cs:250:17:252:17 | [finally(1): exception(ExceptionA)] {...} | exception(ExceptionA) |
+| Finally.cs:247:31:247:46 | [finally: exception(Exception)] object creation of type ExceptionA | Finally.cs:247:25:247:47 | [finally: exception(Exception)] throw ...; |  |
+| Finally.cs:247:31:247:46 | [finally: exception(Exception)] object creation of type ExceptionA | Finally.cs:250:17:252:17 | [finally: exception(Exception), finally(1): exception(Exception)] {...} | exception(Exception) |
+| Finally.cs:247:31:247:46 | [finally: exception(ExceptionA)] object creation of type ExceptionA | Finally.cs:247:25:247:47 | [finally: exception(ExceptionA)] throw ...; |  |
+| Finally.cs:247:31:247:46 | [finally: exception(ExceptionA)] object creation of type ExceptionA | Finally.cs:250:17:252:17 | [finally: exception(ExceptionA), finally(1): exception(Exception)] {...} | exception(Exception) |
+| Finally.cs:247:31:247:46 | object creation of type ExceptionA | Finally.cs:247:25:247:47 | throw ...; |  |
+| Finally.cs:247:31:247:46 | object creation of type ExceptionA | Finally.cs:250:17:252:17 | [finally(1): exception(Exception)] {...} | exception(Exception) |
+| Finally.cs:250:17:252:17 | [finally(1): exception(Exception)] {...} | Finally.cs:251:21:251:55 | [finally(1): exception(Exception)] ...; |  |
+| Finally.cs:250:17:252:17 | [finally(1): exception(ExceptionA)] {...} | Finally.cs:251:21:251:55 | [finally(1): exception(ExceptionA)] ...; |  |
+| Finally.cs:250:17:252:17 | [finally: exception(Exception), finally(1): exception(Exception)] {...} | Finally.cs:251:21:251:55 | [finally: exception(Exception), finally(1): exception(Exception)] ...; |  |
+| Finally.cs:250:17:252:17 | [finally: exception(Exception), finally(1): exception(ExceptionA)] {...} | Finally.cs:251:21:251:55 | [finally: exception(Exception), finally(1): exception(ExceptionA)] ...; |  |
+| Finally.cs:250:17:252:17 | [finally: exception(Exception)] {...} | Finally.cs:251:21:251:55 | [finally: exception(Exception)] ...; |  |
+| Finally.cs:250:17:252:17 | [finally: exception(ExceptionA), finally(1): exception(Exception)] {...} | Finally.cs:251:21:251:55 | [finally: exception(ExceptionA), finally(1): exception(Exception)] ...; |  |
+| Finally.cs:250:17:252:17 | [finally: exception(ExceptionA), finally(1): exception(ExceptionA)] {...} | Finally.cs:251:21:251:55 | [finally: exception(ExceptionA), finally(1): exception(ExceptionA)] ...; |  |
+| Finally.cs:250:17:252:17 | [finally: exception(ExceptionA)] {...} | Finally.cs:251:21:251:55 | [finally: exception(ExceptionA)] ...; |  |
+| Finally.cs:250:17:252:17 | {...} | Finally.cs:251:21:251:55 | ...; |  |
+| Finally.cs:251:21:251:54 | [finally(1): exception(Exception)] call to method WriteLine | Finally.cs:257:9:259:9 | [finally: exception(Exception)] {...} | exception(Exception) |
+| Finally.cs:251:21:251:54 | [finally(1): exception(ExceptionA)] call to method WriteLine | Finally.cs:257:9:259:9 | [finally: exception(ExceptionA)] {...} | exception(ExceptionA) |
+| Finally.cs:251:21:251:54 | [finally: exception(Exception), finally(1): exception(Exception)] call to method WriteLine | Finally.cs:257:9:259:9 | [finally: exception(Exception)] {...} | exception(Exception) |
+| Finally.cs:251:21:251:54 | [finally: exception(Exception), finally(1): exception(ExceptionA)] call to method WriteLine | Finally.cs:257:9:259:9 | [finally: exception(ExceptionA)] {...} | exception(ExceptionA) |
+| Finally.cs:251:21:251:54 | [finally: exception(Exception)] call to method WriteLine | Finally.cs:257:9:259:9 | [finally: exception(Exception)] {...} | exception(Exception) |
+| Finally.cs:251:21:251:54 | [finally: exception(ExceptionA), finally(1): exception(Exception)] call to method WriteLine | Finally.cs:257:9:259:9 | [finally: exception(Exception)] {...} | exception(Exception) |
+| Finally.cs:251:21:251:54 | [finally: exception(ExceptionA), finally(1): exception(ExceptionA)] call to method WriteLine | Finally.cs:257:9:259:9 | [finally: exception(ExceptionA)] {...} | exception(ExceptionA) |
+| Finally.cs:251:21:251:54 | [finally: exception(ExceptionA)] call to method WriteLine | Finally.cs:257:9:259:9 | [finally: exception(ExceptionA)] {...} | exception(ExceptionA) |
+| Finally.cs:251:21:251:54 | call to method WriteLine | Finally.cs:254:13:254:45 | ...; |  |
+| Finally.cs:251:21:251:55 | ...; | Finally.cs:251:39:251:53 | "Inner finally" |  |
+| Finally.cs:251:21:251:55 | [finally(1): exception(Exception)] ...; | Finally.cs:251:39:251:53 | [finally(1): exception(Exception)] "Inner finally" |  |
+| Finally.cs:251:21:251:55 | [finally(1): exception(ExceptionA)] ...; | Finally.cs:251:39:251:53 | [finally(1): exception(ExceptionA)] "Inner finally" |  |
+| Finally.cs:251:21:251:55 | [finally: exception(Exception), finally(1): exception(Exception)] ...; | Finally.cs:251:39:251:53 | [finally: exception(Exception), finally(1): exception(Exception)] "Inner finally" |  |
+| Finally.cs:251:21:251:55 | [finally: exception(Exception), finally(1): exception(ExceptionA)] ...; | Finally.cs:251:39:251:53 | [finally: exception(Exception), finally(1): exception(ExceptionA)] "Inner finally" |  |
+| Finally.cs:251:21:251:55 | [finally: exception(Exception)] ...; | Finally.cs:251:39:251:53 | [finally: exception(Exception)] "Inner finally" |  |
+| Finally.cs:251:21:251:55 | [finally: exception(ExceptionA), finally(1): exception(Exception)] ...; | Finally.cs:251:39:251:53 | [finally: exception(ExceptionA), finally(1): exception(Exception)] "Inner finally" |  |
+| Finally.cs:251:21:251:55 | [finally: exception(ExceptionA), finally(1): exception(ExceptionA)] ...; | Finally.cs:251:39:251:53 | [finally: exception(ExceptionA), finally(1): exception(ExceptionA)] "Inner finally" |  |
+| Finally.cs:251:21:251:55 | [finally: exception(ExceptionA)] ...; | Finally.cs:251:39:251:53 | [finally: exception(ExceptionA)] "Inner finally" |  |
+| Finally.cs:251:39:251:53 | "Inner finally" | Finally.cs:251:21:251:54 | call to method WriteLine |  |
+| Finally.cs:251:39:251:53 | [finally(1): exception(Exception)] "Inner finally" | Finally.cs:251:21:251:54 | [finally(1): exception(Exception)] call to method WriteLine |  |
+| Finally.cs:251:39:251:53 | [finally(1): exception(ExceptionA)] "Inner finally" | Finally.cs:251:21:251:54 | [finally(1): exception(ExceptionA)] call to method WriteLine |  |
+| Finally.cs:251:39:251:53 | [finally: exception(Exception), finally(1): exception(Exception)] "Inner finally" | Finally.cs:251:21:251:54 | [finally: exception(Exception), finally(1): exception(Exception)] call to method WriteLine |  |
+| Finally.cs:251:39:251:53 | [finally: exception(Exception), finally(1): exception(ExceptionA)] "Inner finally" | Finally.cs:251:21:251:54 | [finally: exception(Exception), finally(1): exception(ExceptionA)] call to method WriteLine |  |
+| Finally.cs:251:39:251:53 | [finally: exception(Exception)] "Inner finally" | Finally.cs:251:21:251:54 | [finally: exception(Exception)] call to method WriteLine |  |
+| Finally.cs:251:39:251:53 | [finally: exception(ExceptionA), finally(1): exception(Exception)] "Inner finally" | Finally.cs:251:21:251:54 | [finally: exception(ExceptionA), finally(1): exception(Exception)] call to method WriteLine |  |
+| Finally.cs:251:39:251:53 | [finally: exception(ExceptionA), finally(1): exception(ExceptionA)] "Inner finally" | Finally.cs:251:21:251:54 | [finally: exception(ExceptionA), finally(1): exception(ExceptionA)] call to method WriteLine |  |
+| Finally.cs:251:39:251:53 | [finally: exception(ExceptionA)] "Inner finally" | Finally.cs:251:21:251:54 | [finally: exception(ExceptionA)] call to method WriteLine |  |
+| Finally.cs:254:13:254:44 | call to method WriteLine | Finally.cs:257:9:259:9 | [finally: exception(Exception)] {...} | exception(Exception) |
+| Finally.cs:254:13:254:44 | call to method WriteLine | Finally.cs:257:9:259:9 | {...} |  |
+| Finally.cs:254:13:254:45 | ...; | Finally.cs:254:31:254:43 | "Mid finally" |  |
+| Finally.cs:254:31:254:43 | "Mid finally" | Finally.cs:254:13:254:44 | call to method WriteLine |  |
+| Finally.cs:257:9:259:9 | [finally: exception(Exception)] {...} | Finally.cs:258:13:258:47 | [finally: exception(Exception)] ...; |  |
+| Finally.cs:257:9:259:9 | [finally: exception(ExceptionA)] {...} | Finally.cs:258:13:258:47 | [finally: exception(ExceptionA)] ...; |  |
+| Finally.cs:257:9:259:9 | {...} | Finally.cs:258:13:258:47 | ...; |  |
+| Finally.cs:258:13:258:46 | [finally: exception(Exception)] call to method WriteLine | Finally.cs:233:10:233:12 | exit M12 (abnormal) | exception(Exception) |
+| Finally.cs:258:13:258:46 | [finally: exception(ExceptionA)] call to method WriteLine | Finally.cs:233:10:233:12 | exit M12 (abnormal) | exception(ExceptionA) |
+| Finally.cs:258:13:258:46 | call to method WriteLine | Finally.cs:260:9:260:34 | ...; |  |
+| Finally.cs:258:13:258:47 | ...; | Finally.cs:258:31:258:45 | "Outer finally" |  |
+| Finally.cs:258:13:258:47 | [finally: exception(Exception)] ...; | Finally.cs:258:31:258:45 | [finally: exception(Exception)] "Outer finally" |  |
+| Finally.cs:258:13:258:47 | [finally: exception(ExceptionA)] ...; | Finally.cs:258:31:258:45 | [finally: exception(ExceptionA)] "Outer finally" |  |
+| Finally.cs:258:31:258:45 | "Outer finally" | Finally.cs:258:13:258:46 | call to method WriteLine |  |
+| Finally.cs:258:31:258:45 | [finally: exception(Exception)] "Outer finally" | Finally.cs:258:13:258:46 | [finally: exception(Exception)] call to method WriteLine |  |
+| Finally.cs:258:31:258:45 | [finally: exception(ExceptionA)] "Outer finally" | Finally.cs:258:13:258:46 | [finally: exception(ExceptionA)] call to method WriteLine |  |
+| Finally.cs:260:9:260:33 | call to method WriteLine | Finally.cs:233:10:233:12 | exit M12 (normal) |  |
+| Finally.cs:260:9:260:34 | ...; | Finally.cs:260:27:260:32 | "Done" |  |
+| Finally.cs:260:27:260:32 | "Done" | Finally.cs:260:9:260:33 | call to method WriteLine |  |
+| Finally.cs:263:10:263:12 | enter M13 | Finally.cs:264:5:274:5 | {...} |  |
+| Finally.cs:263:10:263:12 | exit M13 (abnormal) | Finally.cs:263:10:263:12 | exit M13 |  |
+| Finally.cs:263:10:263:12 | exit M13 (normal) | Finally.cs:263:10:263:12 | exit M13 |  |
+| Finally.cs:264:5:274:5 | {...} | Finally.cs:265:9:273:9 | try {...} ... |  |
+| Finally.cs:265:9:273:9 | try {...} ... | Finally.cs:266:9:268:9 | {...} |  |
+| Finally.cs:266:9:268:9 | {...} | Finally.cs:267:13:267:35 | ...; |  |
+| Finally.cs:267:13:267:34 | call to method WriteLine | Finally.cs:270:9:273:9 | [finally: exception(Exception)] {...} | exception(Exception) |
+| Finally.cs:267:13:267:34 | call to method WriteLine | Finally.cs:270:9:273:9 | {...} |  |
+| Finally.cs:267:13:267:35 | ...; | Finally.cs:267:31:267:33 | "1" |  |
+| Finally.cs:267:31:267:33 | "1" | Finally.cs:267:13:267:34 | call to method WriteLine |  |
+| Finally.cs:270:9:273:9 | [finally: exception(Exception)] {...} | Finally.cs:271:13:271:35 | [finally: exception(Exception)] ...; |  |
+| Finally.cs:270:9:273:9 | {...} | Finally.cs:271:13:271:35 | ...; |  |
+| Finally.cs:271:13:271:34 | [finally: exception(Exception)] call to method WriteLine | Finally.cs:272:13:272:19 | [finally: exception(Exception)] ...; |  |
+| Finally.cs:271:13:271:34 | call to method WriteLine | Finally.cs:272:13:272:19 | ...; |  |
+| Finally.cs:271:13:271:35 | ...; | Finally.cs:271:31:271:33 | "3" |  |
+| Finally.cs:271:13:271:35 | [finally: exception(Exception)] ...; | Finally.cs:271:31:271:33 | [finally: exception(Exception)] "3" |  |
+| Finally.cs:271:31:271:33 | "3" | Finally.cs:271:13:271:34 | call to method WriteLine |  |
+| Finally.cs:271:31:271:33 | [finally: exception(Exception)] "3" | Finally.cs:271:13:271:34 | [finally: exception(Exception)] call to method WriteLine |  |
+| Finally.cs:272:13:272:13 | [finally: exception(Exception)] access to parameter i | Finally.cs:272:18:272:18 | [finally: exception(Exception)] 3 |  |
+| 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 (normal) |  |
+| Finally.cs:272:13:272:18 | [finally: exception(Exception)] ... + ... | Finally.cs:272:13:272:18 | [finally: exception(Exception)] ... = ... |  |
+| Finally.cs:272:13:272:18 | [finally: exception(Exception)] ... = ... | Finally.cs:263:10:263:12 | exit M13 (abnormal) | exception(Exception) |
+| Finally.cs:272:13:272:19 | ...; | Finally.cs:272:13:272:13 | access to parameter i |  |
+| Finally.cs:272:13:272:19 | [finally: exception(Exception)] ...; | Finally.cs:272:13:272:13 | [finally: exception(Exception)] access to parameter i |  |
+| Finally.cs:272:18:272:18 | 3 | Finally.cs:272:13:272:18 | ... + ... |  |
+| Finally.cs:272:18:272:18 | [finally: exception(Exception)] 3 | Finally.cs:272:13:272:18 | [finally: exception(Exception)] ... + ... |  |
+| Foreach.cs:4:7:4:13 | call to constructor Object | Foreach.cs:4:7:4:13 | {...} |  |
+| Foreach.cs:4:7:4:13 | enter Foreach | Foreach.cs:4:7:4:13 | call to constructor Object |  |
+| Foreach.cs:4:7:4:13 | exit Foreach (normal) | Foreach.cs:4:7:4:13 | exit Foreach |  |
+| Foreach.cs:4:7:4:13 | {...} | Foreach.cs:4:7:4:13 | exit Foreach (normal) |  |
+| Foreach.cs:6:10:6:11 | enter M1 | Foreach.cs:7:5:10:5 | {...} |  |
+| Foreach.cs:6:10:6:11 | exit M1 (normal) | Foreach.cs:6:10:6:11 | exit M1 |  |
+| Foreach.cs:7:5:10:5 | {...} | Foreach.cs:8:29:8:32 | access to parameter args |  |
+| Foreach.cs:8:9:9:13 | foreach (... ... in ...) ... | Foreach.cs:6:10:6:11 | exit M1 (normal) | empty |
+| Foreach.cs:8:9:9:13 | foreach (... ... in ...) ... | Foreach.cs:8:22:8:24 | String arg | non-empty |
+| Foreach.cs:8:22:8:24 | String arg | Foreach.cs:9:13:9:13 | ; |  |
+| Foreach.cs:8:29:8:32 | access to parameter args | Foreach.cs:8:9:9:13 | foreach (... ... in ...) ... |  |
+| Foreach.cs:9:13:9:13 | ; | Foreach.cs:8:9:9:13 | foreach (... ... in ...) ... |  |
+| Foreach.cs:12:10:12:11 | enter M2 | Foreach.cs:13:5:16:5 | {...} |  |
+| Foreach.cs:12:10:12:11 | exit M2 (normal) | Foreach.cs:12:10:12:11 | exit M2 |  |
+| Foreach.cs:13:5:16:5 | {...} | Foreach.cs:14:27:14:30 | access to parameter args |  |
+| Foreach.cs:14:9:15:13 | foreach (... ... in ...) ... | Foreach.cs:12:10:12:11 | exit M2 (normal) | empty |
+| Foreach.cs:14:9:15:13 | foreach (... ... in ...) ... | Foreach.cs:14:22:14:22 | String _ | non-empty |
+| Foreach.cs:14:22:14:22 | String _ | Foreach.cs:15:13:15:13 | ; |  |
+| Foreach.cs:14:27:14:30 | access to parameter args | Foreach.cs:14:9:15:13 | foreach (... ... in ...) ... |  |
+| Foreach.cs:15:13:15:13 | ; | Foreach.cs:14:9:15:13 | foreach (... ... in ...) ... |  |
+| Foreach.cs:18:10:18:11 | enter M3 | Foreach.cs:19:5:22:5 | {...} |  |
+| Foreach.cs:18:10:18:11 | exit M3 (normal) | Foreach.cs:18:10:18:11 | exit M3 |  |
+| Foreach.cs:19:5:22:5 | {...} | Foreach.cs:20:27:20:27 | access to parameter e |  |
+| Foreach.cs:20:9:21:11 | foreach (... ... in ...) ... | Foreach.cs:18:10:18:11 | exit M3 (normal) | empty |
+| Foreach.cs:20:9:21:11 | foreach (... ... in ...) ... | Foreach.cs:20:22:20:22 | String x | non-empty |
+| Foreach.cs:20:22:20:22 | String x | Foreach.cs:21:11:21:11 | ; |  |
+| Foreach.cs:20:27:20:27 | access to parameter e | Foreach.cs:20:27:20:38 | call to method ToArray<String> | non-null |
+| Foreach.cs:20:27:20:27 | access to parameter e | Foreach.cs:20:43:20:68 | call to method Empty<String> | null |
+| Foreach.cs:20:27:20:38 | call to method ToArray<String> | Foreach.cs:20:27:20:68 | ... ?? ... | non-null |
+| Foreach.cs:20:27:20:38 | call to method ToArray<String> | Foreach.cs:20:43:20:68 | call to method Empty<String> | null |
+| Foreach.cs:20:27:20:68 | ... ?? ... | Foreach.cs:20:9:21:11 | foreach (... ... in ...) ... |  |
+| Foreach.cs:20:43:20:68 | call to method Empty<String> | Foreach.cs:20:27:20:68 | ... ?? ... |  |
+| Foreach.cs:21:11:21:11 | ; | Foreach.cs:20:9:21:11 | foreach (... ... in ...) ... |  |
+| Foreach.cs:24:10:24:11 | enter M4 | Foreach.cs:25:5:28:5 | {...} |  |
+| Foreach.cs:24:10:24:11 | exit M4 (normal) | Foreach.cs:24:10:24:11 | exit M4 |  |
+| Foreach.cs:25:5:28:5 | {...} | Foreach.cs:26:36:26:39 | access to parameter args |  |
+| Foreach.cs:26:9:27:11 | foreach (... ... in ...) ... | Foreach.cs:24:10:24:11 | exit M4 (normal) | empty |
+| Foreach.cs:26:9:27:11 | foreach (... ... in ...) ... | Foreach.cs:26:23:26:23 | String x | non-empty |
+| Foreach.cs:26:18:26:31 | (..., ...) | Foreach.cs:27:11:27:11 | ; |  |
+| Foreach.cs:26:23:26:23 | String x | Foreach.cs:26:30:26:30 | Int32 y |  |
+| Foreach.cs:26:30:26:30 | Int32 y | Foreach.cs:26:18:26:31 | (..., ...) |  |
+| Foreach.cs:26:36:26:39 | access to parameter args | Foreach.cs:26:9:27:11 | foreach (... ... in ...) ... |  |
+| Foreach.cs:27:11:27:11 | ; | Foreach.cs:26:9:27:11 | foreach (... ... in ...) ... |  |
+| Foreach.cs:30:10:30:11 | enter M5 | Foreach.cs:31:5:34:5 | {...} |  |
+| Foreach.cs:30:10:30:11 | exit M5 (normal) | Foreach.cs:30:10:30:11 | exit M5 |  |
+| Foreach.cs:31:5:34:5 | {...} | Foreach.cs:32:32:32:35 | access to parameter args |  |
+| Foreach.cs:32:9:33:11 | foreach (... ... in ...) ... | Foreach.cs:30:10:30:11 | exit M5 (normal) | empty |
+| Foreach.cs:32:9:33:11 | foreach (... ... in ...) ... | Foreach.cs:32:23:32:23 | String x | non-empty |
+| Foreach.cs:32:18:32:27 | (..., ...) | Foreach.cs:33:11:33:11 | ; |  |
+| Foreach.cs:32:23:32:23 | String x | Foreach.cs:32:26:32:26 | Int32 y |  |
+| Foreach.cs:32:26:32:26 | Int32 y | Foreach.cs:32:18:32:27 | (..., ...) |  |
+| Foreach.cs:32:32:32:35 | access to parameter args | Foreach.cs:32:9:33:11 | foreach (... ... in ...) ... |  |
+| Foreach.cs:33:11:33:11 | ; | Foreach.cs:32:9:33:11 | foreach (... ... in ...) ... |  |
+| Foreach.cs:36:10:36:11 | enter M6 | Foreach.cs:37:5:40:5 | {...} |  |
+| Foreach.cs:36:10:36:11 | exit M6 (normal) | Foreach.cs:36:10:36:11 | exit M6 |  |
+| Foreach.cs:37:5:40:5 | {...} | Foreach.cs:38:39:38:42 | access to parameter args |  |
+| Foreach.cs:38:9:39:11 | foreach (... ... in ...) ... | Foreach.cs:36:10:36:11 | exit M6 (normal) | empty |
+| Foreach.cs:38:9:39:11 | foreach (... ... in ...) ... | Foreach.cs:38:26:38:26 | String x | non-empty |
+| Foreach.cs:38:18:38:34 | (..., ...) | Foreach.cs:39:11:39:11 | ; |  |
+| Foreach.cs:38:26:38:26 | String x | Foreach.cs:38:33:38:33 | Int32 y |  |
+| Foreach.cs:38:33:38:33 | Int32 y | Foreach.cs:38:18:38:34 | (..., ...) |  |
+| Foreach.cs:38:39:38:42 | access to parameter args | Foreach.cs:38:9:39:11 | foreach (... ... in ...) ... |  |
+| Foreach.cs:39:11:39:11 | ; | Foreach.cs:38:9:39:11 | foreach (... ... in ...) ... |  |
+| Initializers.cs:3:7:3:18 | enter Initializers | Initializers.cs:3:7:3:18 | {...} |  |
+| Initializers.cs:3:7:3:18 | exit Initializers (normal) | Initializers.cs:3:7:3:18 | exit Initializers |  |
+| Initializers.cs:3:7:3:18 | {...} | Initializers.cs:3:7:3:18 | exit Initializers (normal) |  |
+| Initializers.cs:5:9:5:9 | this access | Initializers.cs:5:13:5:13 | access to field H |  |
+| Initializers.cs:5:9:5:9 | this access | Initializers.cs:5:13:5:13 | access to field H |  |
+| Initializers.cs:5:9:5:17 | ... = ... | Initializers.cs:6:9:6:9 | this access |  |
+| Initializers.cs:5:9:5:17 | ... = ... | Initializers.cs:6:9:6:9 | this access |  |
+| Initializers.cs:5:13:5:13 | access to field H | Initializers.cs:5:17:5:17 | 1 |  |
+| Initializers.cs:5:13:5:13 | access to field H | Initializers.cs:5:17:5:17 | 1 |  |
+| Initializers.cs:5:13:5:17 | ... + ... | Initializers.cs:5:9:5:17 | ... = ... |  |
+| Initializers.cs:5:13:5:17 | ... + ... | Initializers.cs:5:9:5:17 | ... = ... |  |
+| Initializers.cs:5:17:5:17 | 1 | Initializers.cs:5:13:5:17 | ... + ... |  |
+| Initializers.cs:5:17:5:17 | 1 | Initializers.cs:5:13:5:17 | ... + ... |  |
+| Initializers.cs:6:9:6:9 | access to property G | Initializers.cs:6:25:6:31 | ... = ... |  |
+| Initializers.cs:6:9:6:9 | access to property G | Initializers.cs:6:25:6:31 | ... = ... |  |
+| Initializers.cs:6:9:6:9 | this access | Initializers.cs:6:27:6:27 | access to field H |  |
+| Initializers.cs:6:9:6:9 | this access | Initializers.cs:6:27:6:27 | access to field H |  |
+| Initializers.cs:6:25:6:31 | ... = ... | Initializers.cs:8:20:8:22 | {...} |  |
+| Initializers.cs:6:25:6:31 | ... = ... | Initializers.cs:10:28:10:30 | {...} |  |
+| Initializers.cs:6:27:6:27 | access to field H | Initializers.cs:6:31:6:31 | 2 |  |
+| Initializers.cs:6:27:6:27 | access to field H | Initializers.cs:6:31:6:31 | 2 |  |
+| Initializers.cs:6:27:6:31 | ... + ... | Initializers.cs:6:9:6:9 | access to property G |  |
+| Initializers.cs:6:27:6:31 | ... + ... | Initializers.cs:6:9:6:9 | access to property G |  |
+| Initializers.cs:6:31:6:31 | 2 | Initializers.cs:6:27:6:31 | ... + ... |  |
+| Initializers.cs:6:31:6:31 | 2 | Initializers.cs:6:27:6:31 | ... + ... |  |
+| Initializers.cs:8:5:8:16 | call to constructor Object | Initializers.cs:5:9:5:9 | this access |  |
+| Initializers.cs:8:5:8:16 | enter Initializers | Initializers.cs:8:5:8:16 | call to constructor Object |  |
+| Initializers.cs:8:5:8:16 | exit Initializers (normal) | Initializers.cs:8:5:8:16 | exit Initializers |  |
+| Initializers.cs:8:20:8:22 | {...} | Initializers.cs:8:5:8:16 | exit Initializers (normal) |  |
+| Initializers.cs:10:5:10:16 | call to constructor Object | Initializers.cs:5:9:5:9 | this access |  |
+| Initializers.cs:10:5:10:16 | enter Initializers | Initializers.cs:10:5:10:16 | call to constructor Object |  |
+| Initializers.cs:10:5:10:16 | exit Initializers (normal) | Initializers.cs:10:5:10:16 | exit Initializers |  |
+| Initializers.cs:10:28:10:30 | {...} | Initializers.cs:10:5:10:16 | exit Initializers (normal) |  |
+| Initializers.cs:12:10:12:10 | enter M | Initializers.cs:13:5:16:5 | {...} |  |
+| Initializers.cs:12:10:12:10 | exit M (normal) | Initializers.cs:12:10:12:10 | exit M |  |
+| Initializers.cs:13:5:16:5 | {...} | Initializers.cs:14:9:14:54 | ... ...; |  |
+| Initializers.cs:14:9:14:54 | ... ...; | Initializers.cs:14:34:14:35 | "" |  |
+| Initializers.cs:14:13:14:53 | Initializers i = ... | Initializers.cs:15:9:15:64 | ... ...; |  |
+| Initializers.cs:14:17:14:53 | object creation of type Initializers | Initializers.cs:14:44:14:44 | 0 |  |
+| Initializers.cs:14:34:14:35 | "" | Initializers.cs:14:17:14:53 | object creation of type Initializers |  |
+| Initializers.cs:14:38:14:53 | { ..., ... } | Initializers.cs:14:13:14:53 | Initializers i = ... |  |
+| Initializers.cs:14:40:14:44 | ... = ... | Initializers.cs:14:51:14:51 | 1 |  |
+| Initializers.cs:14:44:14:44 | 0 | Initializers.cs:14:40:14:44 | ... = ... |  |
+| Initializers.cs:14:47:14:47 | access to property G | Initializers.cs:14:47:14:51 | ... = ... |  |
+| Initializers.cs:14:47:14:51 | ... = ... | Initializers.cs:14:38:14:53 | { ..., ... } |  |
+| Initializers.cs:14:51:14:51 | 1 | Initializers.cs:14:47:14:47 | access to property G |  |
+| Initializers.cs:15:9:15:64 | ... ...; | Initializers.cs:15:18:15:63 | 2 |  |
+| Initializers.cs:15:13:15:63 | Initializers[] iz = ... | Initializers.cs:12:10:12:10 | exit M (normal) |  |
+| Initializers.cs:15:18:15:63 | 2 | Initializers.cs:15:18:15:63 | array creation of type Initializers[] |  |
+| Initializers.cs:15:18:15:63 | array creation of type Initializers[] | Initializers.cs:15:39:15:39 | access to local variable i |  |
+| Initializers.cs:15:37:15:63 | { ..., ... } | Initializers.cs:15:13:15:63 | Initializers[] iz = ... |  |
+| Initializers.cs:15:39:15:39 | access to local variable i | Initializers.cs:15:59:15:60 | "" |  |
+| Initializers.cs:15:42:15:61 | object creation of type Initializers | Initializers.cs:15:37:15:63 | { ..., ... } |  |
+| Initializers.cs:15:59:15:60 | "" | Initializers.cs:15:42:15:61 | object creation of type Initializers |  |
+| Initializers.cs:18:16:18:16 | enter H | Initializers.cs:18:20:18:20 | 1 |  |
+| Initializers.cs:18:16:18:16 | exit H (normal) | Initializers.cs:18:16:18:16 | exit H |  |
+| Initializers.cs:18:16:18:20 | ... = ... | Initializers.cs:18:16:18:16 | exit H (normal) |  |
+| Initializers.cs:18:20:18:20 | 1 | Initializers.cs:18:16:18:20 | ... = ... |  |
+| Initializers.cs:20:11:20:23 | call to constructor Object | Initializers.cs:22:23:22:23 | this access |  |
+| Initializers.cs:20:11:20:23 | enter NoConstructor | Initializers.cs:20:11:20:23 | call to constructor Object |  |
+| Initializers.cs:20:11:20:23 | exit NoConstructor (normal) | Initializers.cs:20:11:20:23 | exit NoConstructor |  |
+| Initializers.cs:20:11:20:23 | {...} | Initializers.cs:20:11:20:23 | exit NoConstructor (normal) |  |
+| Initializers.cs:22:23:22:23 | this access | Initializers.cs:22:27:22:27 | 0 |  |
+| Initializers.cs:22:23:22:27 | ... = ... | Initializers.cs:23:23:23:23 | this access |  |
+| Initializers.cs:22:27:22:27 | 0 | Initializers.cs:22:23:22:27 | ... = ... |  |
+| Initializers.cs:23:23:23:23 | this access | Initializers.cs:23:27:23:27 | 1 |  |
+| Initializers.cs:23:23:23:27 | ... = ... | Initializers.cs:20:11:20:23 | {...} |  |
+| Initializers.cs:23:27:23:27 | 1 | Initializers.cs:23:23:23:27 | ... = ... |  |
+| Initializers.cs:28:13:28:13 | this access | Initializers.cs:28:17:28:17 | 2 |  |
+| Initializers.cs:28:13:28:13 | this access | Initializers.cs:28:17:28:17 | 2 |  |
+| Initializers.cs:28:13:28:17 | ... = ... | Initializers.cs:31:24:31:33 | {...} |  |
+| Initializers.cs:28:13:28:17 | ... = ... | Initializers.cs:35:27:35:40 | {...} |  |
+| Initializers.cs:28:17:28:17 | 2 | Initializers.cs:28:13:28:17 | ... = ... |  |
+| Initializers.cs:28:17:28:17 | 2 | Initializers.cs:28:13:28:17 | ... = ... |  |
+| Initializers.cs:31:9:31:11 | enter Sub | Initializers.cs:31:17:31:20 | call to constructor NoConstructor |  |
+| Initializers.cs:31:9:31:11 | exit Sub (normal) | Initializers.cs:31:9:31:11 | exit Sub |  |
+| Initializers.cs:31:17:31:20 | call to constructor NoConstructor | Initializers.cs:28:13:28:13 | this access |  |
+| Initializers.cs:31:24:31:33 | {...} | Initializers.cs:31:26:31:31 | ...; |  |
+| Initializers.cs:31:26:31:26 | this access | Initializers.cs:31:30:31:30 | 3 |  |
+| Initializers.cs:31:26:31:30 | ... = ... | Initializers.cs:31:9:31:11 | exit Sub (normal) |  |
+| Initializers.cs:31:26:31:31 | ...; | Initializers.cs:31:26:31:26 | this access |  |
+| Initializers.cs:31:30:31:30 | 3 | Initializers.cs:31:26:31:30 | ... = ... |  |
+| Initializers.cs:33:9:33:11 | enter Sub | Initializers.cs:33:22:33:25 | call to constructor Sub |  |
+| Initializers.cs:33:9:33:11 | exit Sub (normal) | Initializers.cs:33:9:33:11 | exit Sub |  |
+| Initializers.cs:33:22:33:25 | call to constructor Sub | Initializers.cs:33:29:33:38 | {...} |  |
+| Initializers.cs:33:29:33:38 | {...} | Initializers.cs:33:31:33:36 | ...; |  |
+| Initializers.cs:33:31:33:31 | this access | Initializers.cs:33:35:33:35 | access to parameter i |  |
+| Initializers.cs:33:31:33:35 | ... = ... | Initializers.cs:33:9:33:11 | exit Sub (normal) |  |
+| Initializers.cs:33:31:33:36 | ...; | Initializers.cs:33:31:33:31 | this access |  |
+| Initializers.cs:33:35:33:35 | access to parameter i | Initializers.cs:33:31:33:35 | ... = ... |  |
+| Initializers.cs:35:9:35:11 | call to constructor NoConstructor | Initializers.cs:28:13:28:13 | this access |  |
+| Initializers.cs:35:9:35:11 | enter Sub | Initializers.cs:35:9:35:11 | call to constructor NoConstructor |  |
+| Initializers.cs:35:9:35:11 | exit Sub (normal) | Initializers.cs:35:9:35:11 | exit Sub |  |
+| Initializers.cs:35:27:35:40 | {...} | Initializers.cs:35:29:35:38 | ...; |  |
+| Initializers.cs:35:29:35:29 | this access | Initializers.cs:35:33:35:33 | access to parameter i |  |
+| Initializers.cs:35:29:35:37 | ... = ... | Initializers.cs:35:9:35:11 | exit Sub (normal) |  |
+| Initializers.cs:35:29:35:38 | ...; | Initializers.cs:35:29:35:29 | this access |  |
+| Initializers.cs:35:33:35:33 | access to parameter i | Initializers.cs:35:37:35:37 | access to parameter j |  |
+| Initializers.cs:35:33:35:37 | ... + ... | Initializers.cs:35:29:35:37 | ... = ... |  |
+| Initializers.cs:35:37:35:37 | access to parameter j | Initializers.cs:35:33:35:37 | ... + ... |  |
+| Initializers.cs:39:7:39:23 | call to constructor Object | Initializers.cs:39:7:39:23 | {...} |  |
+| Initializers.cs:39:7:39:23 | enter IndexInitializers | Initializers.cs:39:7:39:23 | call to constructor Object |  |
+| Initializers.cs:39:7:39:23 | exit IndexInitializers (normal) | Initializers.cs:39:7:39:23 | exit IndexInitializers |  |
+| Initializers.cs:39:7:39:23 | {...} | Initializers.cs:39:7:39:23 | exit IndexInitializers (normal) |  |
+| Initializers.cs:41:11:41:18 | call to constructor Object | Initializers.cs:41:11:41:18 | {...} |  |
+| Initializers.cs:41:11:41:18 | enter Compound | Initializers.cs:41:11:41:18 | call to constructor Object |  |
+| Initializers.cs:41:11:41:18 | exit Compound (normal) | Initializers.cs:41:11:41:18 | exit Compound |  |
+| Initializers.cs:41:11:41:18 | {...} | Initializers.cs:41:11:41:18 | exit Compound (normal) |  |
+| Initializers.cs:51:10:51:13 | enter Test | Initializers.cs:52:5:66:5 | {...} |  |
+| Initializers.cs:51:10:51:13 | exit Test (normal) | Initializers.cs:51:10:51:13 | exit Test |  |
+| Initializers.cs:52:5:66:5 | {...} | Initializers.cs:54:9:54:96 | ... ...; |  |
+| Initializers.cs:54:9:54:96 | ... ...; | Initializers.cs:54:20:54:95 | object creation of type Dictionary<Int32,String> |  |
+| Initializers.cs:54:13:54:95 | Dictionary<Int32,String> dict = ... | Initializers.cs:57:9:65:10 | ... ...; |  |
+| Initializers.cs:54:20:54:95 | object creation of type Dictionary<Int32,String> | Initializers.cs:54:53:54:53 | 0 |  |
+| Initializers.cs:54:50:54:95 | { ..., ... } | Initializers.cs:54:13:54:95 | Dictionary<Int32,String> dict = ... |  |
+| Initializers.cs:54:52:54:54 | access to indexer | Initializers.cs:54:52:54:63 | ... = ... |  |
+| Initializers.cs:54:52:54:63 | ... = ... | Initializers.cs:54:67:54:67 | 1 |  |
+| Initializers.cs:54:53:54:53 | 0 | Initializers.cs:54:58:54:63 | "Zero" |  |
+| Initializers.cs:54:58:54:63 | "Zero" | Initializers.cs:54:52:54:54 | access to indexer |  |
+| Initializers.cs:54:66:54:68 | access to indexer | Initializers.cs:54:66:54:76 | ... = ... |  |
+| Initializers.cs:54:66:54:76 | ... = ... | Initializers.cs:54:80:54:80 | access to parameter i |  |
+| Initializers.cs:54:67:54:67 | 1 | Initializers.cs:54:72:54:76 | "One" |  |
+| Initializers.cs:54:72:54:76 | "One" | Initializers.cs:54:66:54:68 | access to indexer |  |
+| Initializers.cs:54:79:54:85 | access to indexer | Initializers.cs:54:79:54:93 | ... = ... |  |
+| Initializers.cs:54:79:54:93 | ... = ... | Initializers.cs:54:50:54:95 | { ..., ... } |  |
+| Initializers.cs:54:80:54:80 | access to parameter i | Initializers.cs:54:84:54:84 | 2 |  |
+| Initializers.cs:54:80:54:84 | ... + ... | Initializers.cs:54:89:54:93 | "Two" |  |
+| Initializers.cs:54:84:54:84 | 2 | Initializers.cs:54:80:54:84 | ... + ... |  |
+| Initializers.cs:54:89:54:93 | "Two" | Initializers.cs:54:79:54:85 | access to indexer |  |
+| Initializers.cs:57:9:65:10 | ... ...; | Initializers.cs:57:24:65:9 | object creation of type Compound |  |
+| Initializers.cs:57:13:65:9 | Compound compound = ... | Initializers.cs:51:10:51:13 | exit Test (normal) |  |
+| Initializers.cs:57:24:65:9 | object creation of type Compound | Initializers.cs:59:34:59:34 | 0 |  |
+| Initializers.cs:58:9:65:9 | { ..., ... } | Initializers.cs:57:13:65:9 | Compound compound = ... |  |
+| Initializers.cs:59:13:59:76 | ... = ... | Initializers.cs:60:37:60:37 | 3 |  |
+| Initializers.cs:59:31:59:76 | { ..., ... } | Initializers.cs:59:13:59:76 | ... = ... |  |
+| Initializers.cs:59:33:59:35 | access to indexer | Initializers.cs:59:33:59:44 | ... = ... |  |
+| Initializers.cs:59:33:59:44 | ... = ... | Initializers.cs:59:48:59:48 | 1 |  |
+| Initializers.cs:59:34:59:34 | 0 | Initializers.cs:59:39:59:44 | "Zero" |  |
+| Initializers.cs:59:39:59:44 | "Zero" | Initializers.cs:59:33:59:35 | access to indexer |  |
+| Initializers.cs:59:47:59:49 | access to indexer | Initializers.cs:59:47:59:57 | ... = ... |  |
+| Initializers.cs:59:47:59:57 | ... = ... | Initializers.cs:59:61:59:61 | access to parameter i |  |
+| Initializers.cs:59:48:59:48 | 1 | Initializers.cs:59:53:59:57 | "One" |  |
+| Initializers.cs:59:53:59:57 | "One" | Initializers.cs:59:47:59:49 | access to indexer |  |
+| Initializers.cs:59:60:59:66 | access to indexer | Initializers.cs:59:60:59:74 | ... = ... |  |
+| Initializers.cs:59:60:59:74 | ... = ... | Initializers.cs:59:31:59:76 | { ..., ... } |  |
+| Initializers.cs:59:61:59:61 | access to parameter i | Initializers.cs:59:65:59:65 | 2 |  |
+| Initializers.cs:59:61:59:65 | ... + ... | Initializers.cs:59:70:59:74 | "Two" |  |
+| Initializers.cs:59:65:59:65 | 2 | Initializers.cs:59:61:59:65 | ... + ... |  |
+| Initializers.cs:59:70:59:74 | "Two" | Initializers.cs:59:60:59:66 | access to indexer |  |
+| Initializers.cs:60:13:60:30 | access to property DictionaryProperty | Initializers.cs:60:13:60:80 | ... = ... |  |
+| Initializers.cs:60:13:60:80 | ... = ... | Initializers.cs:61:29:61:29 | 0 |  |
+| Initializers.cs:60:34:60:80 | { ..., ... } | Initializers.cs:60:13:60:30 | access to property DictionaryProperty |  |
+| Initializers.cs:60:36:60:38 | access to indexer | Initializers.cs:60:36:60:48 | ... = ... |  |
+| Initializers.cs:60:36:60:48 | ... = ... | Initializers.cs:60:52:60:52 | 2 |  |
+| Initializers.cs:60:37:60:37 | 3 | Initializers.cs:60:42:60:48 | "Three" |  |
+| Initializers.cs:60:42:60:48 | "Three" | Initializers.cs:60:36:60:38 | access to indexer |  |
+| Initializers.cs:60:51:60:53 | access to indexer | Initializers.cs:60:51:60:61 | ... = ... |  |
+| Initializers.cs:60:51:60:61 | ... = ... | Initializers.cs:60:65:60:65 | access to parameter i |  |
+| Initializers.cs:60:52:60:52 | 2 | Initializers.cs:60:57:60:61 | "Two" |  |
+| Initializers.cs:60:57:60:61 | "Two" | Initializers.cs:60:51:60:53 | access to indexer |  |
+| Initializers.cs:60:64:60:70 | access to indexer | Initializers.cs:60:64:60:78 | ... = ... |  |
+| Initializers.cs:60:64:60:78 | ... = ... | Initializers.cs:60:34:60:80 | { ..., ... } |  |
+| Initializers.cs:60:65:60:65 | access to parameter i | Initializers.cs:60:69:60:69 | 1 |  |
+| Initializers.cs:60:65:60:69 | ... + ... | Initializers.cs:60:74:60:78 | "One" |  |
+| Initializers.cs:60:69:60:69 | 1 | Initializers.cs:60:65:60:69 | ... + ... |  |
+| Initializers.cs:60:74:60:78 | "One" | Initializers.cs:60:64:60:70 | access to indexer |  |
+| Initializers.cs:61:13:61:58 | ... = ... | Initializers.cs:62:30:62:30 | 0 |  |
+| Initializers.cs:61:26:61:58 | { ..., ... } | Initializers.cs:61:13:61:58 | ... = ... |  |
+| Initializers.cs:61:28:61:39 | ... = ... | Initializers.cs:61:43:61:43 | access to parameter i |  |
+| Initializers.cs:61:29:61:29 | 0 | Initializers.cs:61:34:61:39 | "Zero" |  |
+| Initializers.cs:61:34:61:39 | "Zero" | Initializers.cs:61:28:61:39 | ... = ... |  |
+| Initializers.cs:61:42:61:56 | ... = ... | Initializers.cs:61:26:61:58 | { ..., ... } |  |
+| Initializers.cs:61:43:61:43 | access to parameter i | Initializers.cs:61:47:61:47 | 1 |  |
+| Initializers.cs:61:43:61:47 | ... + ... | Initializers.cs:61:52:61:56 | "One" |  |
+| Initializers.cs:61:47:61:47 | 1 | Initializers.cs:61:43:61:47 | ... + ... |  |
+| Initializers.cs:61:52:61:56 | "One" | Initializers.cs:61:42:61:56 | ... = ... |  |
+| Initializers.cs:62:13:62:60 | ... = ... | Initializers.cs:63:32:63:32 | 1 |  |
+| Initializers.cs:62:27:62:60 | { ..., ... } | Initializers.cs:62:13:62:60 | ... = ... |  |
+| Initializers.cs:62:29:62:40 | ... = ... | Initializers.cs:62:44:62:44 | 1 |  |
+| Initializers.cs:62:30:62:30 | 0 | Initializers.cs:62:33:62:33 | 1 |  |
+| Initializers.cs:62:33:62:33 | 1 | Initializers.cs:62:38:62:40 | "i" |  |
+| Initializers.cs:62:38:62:40 | "i" | Initializers.cs:62:29:62:40 | ... = ... |  |
+| Initializers.cs:62:43:62:58 | ... = ... | Initializers.cs:62:27:62:60 | { ..., ... } |  |
+| Initializers.cs:62:44:62:44 | 1 | Initializers.cs:62:47:62:47 | access to parameter i |  |
+| Initializers.cs:62:47:62:47 | access to parameter i | Initializers.cs:62:51:62:51 | 0 |  |
+| Initializers.cs:62:47:62:51 | ... + ... | Initializers.cs:62:56:62:58 | "1" |  |
+| Initializers.cs:62:51:62:51 | 0 | Initializers.cs:62:47:62:51 | ... + ... |  |
+| Initializers.cs:62:56:62:58 | "1" | Initializers.cs:62:43:62:58 | ... = ... |  |
+| Initializers.cs:63:13:63:25 | access to property ArrayProperty | Initializers.cs:63:13:63:60 | ... = ... |  |
+| Initializers.cs:63:13:63:60 | ... = ... | Initializers.cs:64:33:64:33 | 0 |  |
+| Initializers.cs:63:29:63:60 | { ..., ... } | Initializers.cs:63:13:63:25 | access to property ArrayProperty |  |
+| Initializers.cs:63:31:63:41 | ... = ... | Initializers.cs:63:45:63:45 | access to parameter i |  |
+| Initializers.cs:63:32:63:32 | 1 | Initializers.cs:63:37:63:41 | "One" |  |
+| Initializers.cs:63:37:63:41 | "One" | Initializers.cs:63:31:63:41 | ... = ... |  |
+| Initializers.cs:63:44:63:58 | ... = ... | Initializers.cs:63:29:63:60 | { ..., ... } |  |
+| Initializers.cs:63:45:63:45 | access to parameter i | Initializers.cs:63:49:63:49 | 2 |  |
+| Initializers.cs:63:45:63:49 | ... + ... | Initializers.cs:63:54:63:58 | "Two" |  |
+| Initializers.cs:63:49:63:49 | 2 | Initializers.cs:63:45:63:49 | ... + ... |  |
+| Initializers.cs:63:54:63:58 | "Two" | Initializers.cs:63:44:63:58 | ... = ... |  |
+| Initializers.cs:64:13:64:26 | access to property ArrayProperty2 | Initializers.cs:64:13:64:63 | ... = ... |  |
+| Initializers.cs:64:13:64:63 | ... = ... | Initializers.cs:58:9:65:9 | { ..., ... } |  |
+| Initializers.cs:64:30:64:63 | { ..., ... } | Initializers.cs:64:13:64:26 | access to property ArrayProperty2 |  |
+| Initializers.cs:64:32:64:43 | ... = ... | Initializers.cs:64:47:64:47 | 1 |  |
+| Initializers.cs:64:33:64:33 | 0 | Initializers.cs:64:36:64:36 | 1 |  |
+| Initializers.cs:64:36:64:36 | 1 | Initializers.cs:64:41:64:43 | "i" |  |
+| Initializers.cs:64:41:64:43 | "i" | Initializers.cs:64:32:64:43 | ... = ... |  |
+| Initializers.cs:64:46:64:61 | ... = ... | Initializers.cs:64:30:64:63 | { ..., ... } |  |
+| Initializers.cs:64:47:64:47 | 1 | Initializers.cs:64:50:64:50 | access to parameter i |  |
+| Initializers.cs:64:50:64:50 | access to parameter i | Initializers.cs:64:54:64:54 | 0 |  |
+| Initializers.cs:64:50:64:54 | ... + ... | Initializers.cs:64:59:64:61 | "1" |  |
+| Initializers.cs:64:54:64:54 | 0 | Initializers.cs:64:50:64:54 | ... + ... |  |
+| Initializers.cs:64:59:64:61 | "1" | Initializers.cs:64:46:64:61 | ... = ... |  |
+| LoopUnrolling.cs:5:7:5:19 | call to constructor Object | LoopUnrolling.cs:5:7:5:19 | {...} |  |
+| LoopUnrolling.cs:5:7:5:19 | enter LoopUnrolling | LoopUnrolling.cs:5:7:5:19 | call to constructor Object |  |
+| LoopUnrolling.cs:5:7:5:19 | exit LoopUnrolling (normal) | LoopUnrolling.cs:5:7:5:19 | exit LoopUnrolling |  |
+| LoopUnrolling.cs:5:7:5:19 | {...} | LoopUnrolling.cs:5:7:5:19 | exit LoopUnrolling (normal) |  |
+| LoopUnrolling.cs:7:10:7:11 | enter M1 | LoopUnrolling.cs:8:5:13:5 | {...} |  |
+| LoopUnrolling.cs:7:10:7:11 | exit M1 (normal) | LoopUnrolling.cs:7:10:7:11 | exit M1 |  |
+| LoopUnrolling.cs:8:5:13:5 | {...} | LoopUnrolling.cs:9:9:10:19 | if (...) ... |  |
+| LoopUnrolling.cs:9:9:10:19 | if (...) ... | LoopUnrolling.cs:9:13:9:16 | access to parameter args |  |
+| LoopUnrolling.cs:9:13:9:16 | access to parameter args | LoopUnrolling.cs:9:13:9:23 | access to property Length |  |
+| LoopUnrolling.cs:9:13:9:23 | access to property Length | LoopUnrolling.cs:9:28:9:28 | 0 |  |
+| LoopUnrolling.cs:9:13:9:28 | ... == ... | LoopUnrolling.cs:10:13:10:19 | return ...; | true |
+| LoopUnrolling.cs:9:13:9:28 | ... == ... | LoopUnrolling.cs:11:29:11:32 | access to parameter args | false |
+| LoopUnrolling.cs:9:28:9:28 | 0 | LoopUnrolling.cs:9:13:9:28 | ... == ... |  |
+| LoopUnrolling.cs:10:13:10:19 | return ...; | LoopUnrolling.cs:7:10:7:11 | exit M1 (normal) | return |
+| LoopUnrolling.cs:11:9:12:35 | [unroll (line 11)] foreach (... ... in ...) ... | LoopUnrolling.cs:11:22:11:24 | String arg | non-empty |
+| LoopUnrolling.cs:11:9:12:35 | foreach (... ... in ...) ... | LoopUnrolling.cs:7:10:7:11 | exit M1 (normal) | empty |
+| LoopUnrolling.cs:11:9:12:35 | foreach (... ... in ...) ... | LoopUnrolling.cs:11:22:11:24 | String arg | non-empty |
+| LoopUnrolling.cs:11:22:11:24 | String arg | LoopUnrolling.cs:12:13:12:35 | ...; |  |
+| LoopUnrolling.cs:11:29:11:32 | access to parameter args | LoopUnrolling.cs:11:9:12:35 | [unroll (line 11)] foreach (... ... in ...) ... |  |
+| LoopUnrolling.cs:12:13:12:34 | call to method WriteLine | LoopUnrolling.cs:11:9:12:35 | foreach (... ... in ...) ... |  |
+| LoopUnrolling.cs:12:13:12:35 | ...; | LoopUnrolling.cs:12:31:12:33 | access to local variable arg |  |
+| LoopUnrolling.cs:12:31:12:33 | access to local variable arg | LoopUnrolling.cs:12:13:12:34 | call to method WriteLine |  |
+| LoopUnrolling.cs:15:10:15:11 | enter M2 | LoopUnrolling.cs:16:5:20:5 | {...} |  |
+| LoopUnrolling.cs:15:10:15:11 | exit M2 (normal) | LoopUnrolling.cs:15:10:15:11 | exit M2 |  |
+| LoopUnrolling.cs:16:5:20:5 | {...} | LoopUnrolling.cs:17:9:17:48 | ... ...; |  |
+| LoopUnrolling.cs:17:9:17:48 | ... ...; | LoopUnrolling.cs:17:18:17:47 | 3 |  |
+| LoopUnrolling.cs:17:13:17:47 | String[] xs = ... | LoopUnrolling.cs:18:27:18:28 | access to local variable xs |  |
+| LoopUnrolling.cs:17:18:17:47 | 3 | LoopUnrolling.cs:17:18:17:47 | array creation of type String[] |  |
+| LoopUnrolling.cs:17:18:17:47 | array creation of type String[] | LoopUnrolling.cs:17:33:17:35 | "a" |  |
+| LoopUnrolling.cs:17:31:17:47 | { ..., ... } | LoopUnrolling.cs:17:13:17:47 | String[] xs = ... |  |
+| LoopUnrolling.cs:17:33:17:35 | "a" | LoopUnrolling.cs:17:38:17:40 | "b" |  |
+| LoopUnrolling.cs:17:38:17:40 | "b" | LoopUnrolling.cs:17:43:17:45 | "c" |  |
+| LoopUnrolling.cs:17:43:17:45 | "c" | LoopUnrolling.cs:17:31:17:47 | { ..., ... } |  |
+| LoopUnrolling.cs:18:9:19:33 | [unroll (line 18)] foreach (... ... in ...) ... | LoopUnrolling.cs:18:22:18:22 | String x | non-empty |
+| LoopUnrolling.cs:18:9:19:33 | foreach (... ... in ...) ... | LoopUnrolling.cs:15:10:15:11 | exit M2 (normal) | empty |
+| LoopUnrolling.cs:18:9:19:33 | foreach (... ... in ...) ... | LoopUnrolling.cs:18:22:18:22 | String x | non-empty |
+| LoopUnrolling.cs:18:22:18:22 | String x | LoopUnrolling.cs:19:13:19:33 | ...; |  |
+| LoopUnrolling.cs:18:27:18:28 | access to local variable xs | LoopUnrolling.cs:18:9:19:33 | [unroll (line 18)] foreach (... ... in ...) ... |  |
+| LoopUnrolling.cs:19:13:19:32 | call to method WriteLine | LoopUnrolling.cs:18:9:19:33 | foreach (... ... in ...) ... |  |
+| LoopUnrolling.cs:19:13:19:33 | ...; | LoopUnrolling.cs:19:31:19:31 | access to local variable x |  |
+| LoopUnrolling.cs:19:31:19:31 | access to local variable x | LoopUnrolling.cs:19:13:19:32 | call to method WriteLine |  |
+| LoopUnrolling.cs:22:10:22:11 | enter M3 | LoopUnrolling.cs:23:5:27:5 | {...} |  |
+| LoopUnrolling.cs:22:10:22:11 | exit M3 (normal) | LoopUnrolling.cs:22:10:22:11 | exit M3 |  |
+| LoopUnrolling.cs:23:5:27:5 | {...} | LoopUnrolling.cs:24:29:24:32 | access to parameter args |  |
+| LoopUnrolling.cs:24:9:26:40 | foreach (... ... in ...) ... | LoopUnrolling.cs:22:10:22:11 | exit M3 (normal) | empty |
+| LoopUnrolling.cs:24:9:26:40 | foreach (... ... in ...) ... | LoopUnrolling.cs:24:22:24:24 | Char arg | non-empty |
+| LoopUnrolling.cs:24:22:24:24 | Char arg | LoopUnrolling.cs:25:34:25:37 | access to parameter args |  |
+| LoopUnrolling.cs:24:29:24:32 | access to parameter args | LoopUnrolling.cs:24:9:26:40 | foreach (... ... in ...) ... |  |
+| LoopUnrolling.cs:25:13:26:40 | [unroll (line 25)] foreach (... ... in ...) ... | LoopUnrolling.cs:25:26:25:29 | Char arg0 | non-empty |
+| LoopUnrolling.cs:25:13:26:40 | foreach (... ... in ...) ... | LoopUnrolling.cs:24:9:26:40 | foreach (... ... in ...) ... | empty |
+| LoopUnrolling.cs:25:13:26:40 | foreach (... ... in ...) ... | LoopUnrolling.cs:25:26:25:29 | Char arg0 | non-empty |
+| LoopUnrolling.cs:25:26:25:29 | Char arg0 | LoopUnrolling.cs:26:17:26:40 | ...; |  |
+| LoopUnrolling.cs:25:34:25:37 | access to parameter args | LoopUnrolling.cs:25:13:26:40 | [unroll (line 25)] foreach (... ... in ...) ... |  |
+| LoopUnrolling.cs:26:17:26:39 | call to method WriteLine | LoopUnrolling.cs:25:13:26:40 | foreach (... ... in ...) ... |  |
+| LoopUnrolling.cs:26:17:26:40 | ...; | LoopUnrolling.cs:26:35:26:38 | access to local variable arg0 |  |
+| LoopUnrolling.cs:26:35:26:38 | access to local variable arg0 | LoopUnrolling.cs:26:17:26:39 | call to method WriteLine |  |
+| LoopUnrolling.cs:29:10:29:11 | enter M4 | LoopUnrolling.cs:30:5:34:5 | {...} |  |
+| LoopUnrolling.cs:29:10:29:11 | exit M4 (normal) | LoopUnrolling.cs:29:10:29:11 | exit M4 |  |
+| LoopUnrolling.cs:30:5:34:5 | {...} | LoopUnrolling.cs:31:9:31:31 | ... ...; |  |
+| LoopUnrolling.cs:31:9:31:31 | ... ...; | LoopUnrolling.cs:31:29:31:29 | 0 |  |
+| LoopUnrolling.cs:31:13:31:30 | String[] xs = ... | LoopUnrolling.cs:32:27:32:28 | access to local variable xs |  |
+| LoopUnrolling.cs:31:18:31:30 | array creation of type String[] | LoopUnrolling.cs:31:13:31:30 | String[] xs = ... |  |
+| LoopUnrolling.cs:31:29:31:29 | 0 | LoopUnrolling.cs:31:18:31:30 | array creation of type String[] |  |
+| LoopUnrolling.cs:32:9:33:33 | [skip (line 32)] foreach (... ... in ...) ... | LoopUnrolling.cs:29:10:29:11 | exit M4 (normal) | empty |
+| LoopUnrolling.cs:32:27:32:28 | access to local variable xs | LoopUnrolling.cs:32:9:33:33 | [skip (line 32)] foreach (... ... in ...) ... |  |
+| LoopUnrolling.cs:36:10:36:11 | enter M5 | LoopUnrolling.cs:37:5:43:5 | {...} |  |
+| LoopUnrolling.cs:36:10:36:11 | exit M5 (normal) | LoopUnrolling.cs:36:10:36:11 | exit M5 |  |
+| LoopUnrolling.cs:37:5:43:5 | {...} | LoopUnrolling.cs:38:9:38:48 | ... ...; |  |
+| LoopUnrolling.cs:38:9:38:48 | ... ...; | LoopUnrolling.cs:38:18:38:47 | 3 |  |
+| LoopUnrolling.cs:38:13:38:47 | String[] xs = ... | LoopUnrolling.cs:39:9:39:48 | ... ...; |  |
+| LoopUnrolling.cs:38:18:38:47 | 3 | LoopUnrolling.cs:38:18:38:47 | array creation of type String[] |  |
+| LoopUnrolling.cs:38:18:38:47 | array creation of type String[] | LoopUnrolling.cs:38:33:38:35 | "a" |  |
+| LoopUnrolling.cs:38:31:38:47 | { ..., ... } | LoopUnrolling.cs:38:13:38:47 | String[] xs = ... |  |
+| LoopUnrolling.cs:38:33:38:35 | "a" | LoopUnrolling.cs:38:38:38:40 | "b" |  |
+| LoopUnrolling.cs:38:38:38:40 | "b" | LoopUnrolling.cs:38:43:38:45 | "c" |  |
+| LoopUnrolling.cs:38:43:38:45 | "c" | LoopUnrolling.cs:38:31:38:47 | { ..., ... } |  |
+| LoopUnrolling.cs:39:9:39:48 | ... ...; | LoopUnrolling.cs:39:18:39:47 | 3 |  |
+| LoopUnrolling.cs:39:13:39:47 | String[] ys = ... | LoopUnrolling.cs:40:27:40:28 | access to local variable xs |  |
+| LoopUnrolling.cs:39:18:39:47 | 3 | LoopUnrolling.cs:39:18:39:47 | array creation of type String[] |  |
+| LoopUnrolling.cs:39:18:39:47 | array creation of type String[] | LoopUnrolling.cs:39:33:39:35 | "0" |  |
+| LoopUnrolling.cs:39:31:39:47 | { ..., ... } | LoopUnrolling.cs:39:13:39:47 | String[] ys = ... |  |
+| LoopUnrolling.cs:39:33:39:35 | "0" | LoopUnrolling.cs:39:38:39:40 | "1" |  |
+| LoopUnrolling.cs:39:38:39:40 | "1" | LoopUnrolling.cs:39:43:39:45 | "2" |  |
+| LoopUnrolling.cs:39:43:39:45 | "2" | LoopUnrolling.cs:39:31:39:47 | { ..., ... } |  |
+| LoopUnrolling.cs:40:9:42:41 | [unroll (line 40)] foreach (... ... in ...) ... | LoopUnrolling.cs:40:22:40:22 | String x | non-empty |
+| LoopUnrolling.cs:40:9:42:41 | foreach (... ... in ...) ... | LoopUnrolling.cs:36:10:36:11 | exit M5 (normal) | empty |
+| LoopUnrolling.cs:40:9:42:41 | foreach (... ... in ...) ... | LoopUnrolling.cs:40:22:40:22 | String x | non-empty |
+| LoopUnrolling.cs:40:22:40:22 | String x | LoopUnrolling.cs:41:31:41:32 | access to local variable ys |  |
+| LoopUnrolling.cs:40:27:40:28 | access to local variable xs | LoopUnrolling.cs:40:9:42:41 | [unroll (line 40)] foreach (... ... in ...) ... |  |
+| LoopUnrolling.cs:41:13:42:41 | [unroll (line 41)] foreach (... ... in ...) ... | LoopUnrolling.cs:41:26:41:26 | String y | non-empty |
+| LoopUnrolling.cs:41:13:42:41 | foreach (... ... in ...) ... | LoopUnrolling.cs:40:9:42:41 | foreach (... ... in ...) ... | empty |
+| LoopUnrolling.cs:41:13:42:41 | foreach (... ... in ...) ... | LoopUnrolling.cs:41:26:41:26 | String y | non-empty |
+| LoopUnrolling.cs:41:26:41:26 | String y | LoopUnrolling.cs:42:17:42:41 | ...; |  |
+| LoopUnrolling.cs:41:31:41:32 | access to local variable ys | LoopUnrolling.cs:41:13:42:41 | [unroll (line 41)] foreach (... ... in ...) ... |  |
+| LoopUnrolling.cs:42:17:42:40 | call to method WriteLine | LoopUnrolling.cs:41:13:42:41 | foreach (... ... in ...) ... |  |
+| LoopUnrolling.cs:42:17:42:41 | ...; | LoopUnrolling.cs:42:35:42:35 | access to local variable x |  |
+| LoopUnrolling.cs:42:35:42:35 | access to local variable x | LoopUnrolling.cs:42:39:42:39 | access to local variable y |  |
+| LoopUnrolling.cs:42:35:42:39 | ... + ... | LoopUnrolling.cs:42:17:42:40 | call to method WriteLine |  |
+| LoopUnrolling.cs:42:39:42:39 | access to local variable y | LoopUnrolling.cs:42:35:42:39 | ... + ... |  |
+| LoopUnrolling.cs:45:10:45:11 | enter M6 | LoopUnrolling.cs:46:5:53:5 | {...} |  |
+| LoopUnrolling.cs:46:5:53:5 | {...} | LoopUnrolling.cs:47:9:47:48 | ... ...; |  |
+| LoopUnrolling.cs:47:9:47:48 | ... ...; | LoopUnrolling.cs:47:18:47:47 | 3 |  |
+| LoopUnrolling.cs:47:13:47:47 | String[] xs = ... | LoopUnrolling.cs:48:27:48:28 | access to local variable xs |  |
+| LoopUnrolling.cs:47:18:47:47 | 3 | LoopUnrolling.cs:47:18:47:47 | array creation of type String[] |  |
+| LoopUnrolling.cs:47:18:47:47 | array creation of type String[] | LoopUnrolling.cs:47:33:47:35 | "a" |  |
+| LoopUnrolling.cs:47:31:47:47 | { ..., ... } | LoopUnrolling.cs:47:13:47:47 | String[] xs = ... |  |
+| LoopUnrolling.cs:47:33:47:35 | "a" | LoopUnrolling.cs:47:38:47:40 | "b" |  |
+| LoopUnrolling.cs:47:38:47:40 | "b" | LoopUnrolling.cs:47:43:47:45 | "c" |  |
+| LoopUnrolling.cs:47:43:47:45 | "c" | LoopUnrolling.cs:47:31:47:47 | { ..., ... } |  |
+| LoopUnrolling.cs:48:9:52:9 | [unroll (line 48)] foreach (... ... in ...) ... | LoopUnrolling.cs:48:22:48:22 | String x | non-empty |
+| LoopUnrolling.cs:48:22:48:22 | String x | LoopUnrolling.cs:49:9:52:9 | {...} |  |
+| LoopUnrolling.cs:48:27:48:28 | access to local variable xs | LoopUnrolling.cs:48:9:52:9 | [unroll (line 48)] foreach (... ... in ...) ... |  |
+| LoopUnrolling.cs:49:9:52:9 | {...} | LoopUnrolling.cs:50:9:50:13 | Label: |  |
+| LoopUnrolling.cs:50:9:50:13 | Label: | LoopUnrolling.cs:50:16:50:36 | ...; |  |
+| LoopUnrolling.cs:50:16:50:35 | call to method WriteLine | LoopUnrolling.cs:51:13:51:23 | goto ...; |  |
+| LoopUnrolling.cs:50:16:50:36 | ...; | LoopUnrolling.cs:50:34:50:34 | access to local variable x |  |
+| LoopUnrolling.cs:50:34:50:34 | access to local variable x | LoopUnrolling.cs:50:16:50:35 | call to method WriteLine |  |
+| LoopUnrolling.cs:51:13:51:23 | goto ...; | LoopUnrolling.cs:50:9:50:13 | Label: | goto(Label) |
+| LoopUnrolling.cs:55:10:55:11 | enter M7 | LoopUnrolling.cs:56:5:65:5 | {...} |  |
+| LoopUnrolling.cs:55:10:55:11 | exit M7 (normal) | LoopUnrolling.cs:55:10:55:11 | exit M7 |  |
+| LoopUnrolling.cs:56:5:65:5 | {...} | LoopUnrolling.cs:57:9:57:48 | ... ...; |  |
+| LoopUnrolling.cs:57:9:57:48 | ... ...; | LoopUnrolling.cs:57:18:57:47 | 3 |  |
+| LoopUnrolling.cs:57:13:57:47 | String[] xs = ... | LoopUnrolling.cs:58:27:58:28 | access to local variable xs |  |
+| LoopUnrolling.cs:57:18:57:47 | 3 | LoopUnrolling.cs:57:18:57:47 | array creation of type String[] |  |
+| LoopUnrolling.cs:57:18:57:47 | array creation of type String[] | LoopUnrolling.cs:57:33:57:35 | "a" |  |
+| LoopUnrolling.cs:57:31:57:47 | { ..., ... } | LoopUnrolling.cs:57:13:57:47 | String[] xs = ... |  |
+| LoopUnrolling.cs:57:33:57:35 | "a" | LoopUnrolling.cs:57:38:57:40 | "b" |  |
+| LoopUnrolling.cs:57:38:57:40 | "b" | LoopUnrolling.cs:57:43:57:45 | "c" |  |
+| LoopUnrolling.cs:57:43:57:45 | "c" | LoopUnrolling.cs:57:31:57:47 | { ..., ... } |  |
+| LoopUnrolling.cs:58:9:64:9 | [b (line 55): false] foreach (... ... in ...) ... | LoopUnrolling.cs:55:10:55:11 | exit M7 (normal) | empty |
+| LoopUnrolling.cs:58:9:64:9 | [b (line 55): false] foreach (... ... in ...) ... | LoopUnrolling.cs:58:22:58:22 | [b (line 55): false] String x | non-empty |
+| LoopUnrolling.cs:58:9:64:9 | [b (line 55): true] foreach (... ... in ...) ... | LoopUnrolling.cs:55:10:55:11 | exit M7 (normal) | empty |
+| LoopUnrolling.cs:58:9:64:9 | [b (line 55): true] foreach (... ... in ...) ... | LoopUnrolling.cs:58:22:58:22 | [b (line 55): true] String x | non-empty |
+| LoopUnrolling.cs:58:9:64:9 | [unroll (line 58)] foreach (... ... in ...) ... | LoopUnrolling.cs:58:22:58:22 | String x | non-empty |
+| LoopUnrolling.cs:58:22:58:22 | String x | LoopUnrolling.cs:59:9:64:9 | {...} |  |
+| LoopUnrolling.cs:58:22:58:22 | [b (line 55): false] String x | LoopUnrolling.cs:59:9:64:9 | [b (line 55): false] {...} |  |
+| LoopUnrolling.cs:58:22:58:22 | [b (line 55): true] String x | LoopUnrolling.cs:59:9:64:9 | [b (line 55): true] {...} |  |
+| LoopUnrolling.cs:58:27:58:28 | access to local variable xs | LoopUnrolling.cs:58:9:64:9 | [unroll (line 58)] foreach (... ... in ...) ... |  |
+| LoopUnrolling.cs:59:9:64:9 | [b (line 55): false] {...} | LoopUnrolling.cs:60:13:61:37 | [b (line 55): false] if (...) ... |  |
+| LoopUnrolling.cs:59:9:64:9 | [b (line 55): true] {...} | LoopUnrolling.cs:60:13:61:37 | [b (line 55): true] if (...) ... |  |
+| LoopUnrolling.cs:59:9:64:9 | {...} | LoopUnrolling.cs:60:13:61:37 | if (...) ... |  |
+| LoopUnrolling.cs:60:13:61:37 | [b (line 55): false] if (...) ... | LoopUnrolling.cs:60:17:60:17 | [b (line 55): false] access to parameter b |  |
+| LoopUnrolling.cs:60:13:61:37 | [b (line 55): true] if (...) ... | LoopUnrolling.cs:60:17:60:17 | [b (line 55): true] access to parameter b |  |
+| LoopUnrolling.cs:60:13:61:37 | if (...) ... | LoopUnrolling.cs:60:17:60:17 | access to parameter b |  |
+| LoopUnrolling.cs:60:17:60:17 | [b (line 55): false] access to parameter b | LoopUnrolling.cs:62:13:63:37 | [b (line 55): false] if (...) ... | false |
+| LoopUnrolling.cs:60:17:60:17 | [b (line 55): true] access to parameter b | LoopUnrolling.cs:61:17:61:37 | [b (line 55): true] ...; | true |
+| LoopUnrolling.cs:60:17:60:17 | access to parameter b | LoopUnrolling.cs:61:17:61:37 | [b (line 55): true] ...; | true |
+| LoopUnrolling.cs:60:17:60:17 | access to parameter b | LoopUnrolling.cs:62:13:63:37 | [b (line 55): false] if (...) ... | false |
+| LoopUnrolling.cs:61:17:61:36 | [b (line 55): true] call to method WriteLine | LoopUnrolling.cs:62:13:63:37 | [b (line 55): true] if (...) ... |  |
+| LoopUnrolling.cs:61:17:61:37 | [b (line 55): true] ...; | LoopUnrolling.cs:61:35:61:35 | [b (line 55): true] access to local variable x |  |
+| LoopUnrolling.cs:61:35:61:35 | [b (line 55): true] access to local variable x | LoopUnrolling.cs:61:17:61:36 | [b (line 55): true] call to method WriteLine |  |
+| LoopUnrolling.cs:62:13:63:37 | [b (line 55): false] if (...) ... | LoopUnrolling.cs:62:17:62:17 | [b (line 55): false] access to parameter b |  |
+| LoopUnrolling.cs:62:13:63:37 | [b (line 55): true] if (...) ... | LoopUnrolling.cs:62:17:62:17 | [b (line 55): true] access to parameter b |  |
+| LoopUnrolling.cs:62:17:62:17 | [b (line 55): false] access to parameter b | LoopUnrolling.cs:58:9:64:9 | [b (line 55): false] foreach (... ... in ...) ... | false |
+| LoopUnrolling.cs:62:17:62:17 | [b (line 55): true] access to parameter b | LoopUnrolling.cs:63:17:63:37 | [b (line 55): true] ...; | true |
+| LoopUnrolling.cs:63:17:63:36 | [b (line 55): true] call to method WriteLine | LoopUnrolling.cs:58:9:64:9 | [b (line 55): true] foreach (... ... in ...) ... |  |
+| LoopUnrolling.cs:63:17:63:37 | [b (line 55): true] ...; | LoopUnrolling.cs:63:35:63:35 | [b (line 55): true] access to local variable x |  |
+| LoopUnrolling.cs:63:35:63:35 | [b (line 55): true] access to local variable x | LoopUnrolling.cs:63:17:63:36 | [b (line 55): true] call to method WriteLine |  |
+| LoopUnrolling.cs:67:10:67:11 | enter M8 | LoopUnrolling.cs:68:5:74:5 | {...} |  |
+| LoopUnrolling.cs:67:10:67:11 | exit M8 (normal) | LoopUnrolling.cs:67:10:67:11 | exit M8 |  |
+| LoopUnrolling.cs:68:5:74:5 | {...} | LoopUnrolling.cs:69:9:70:19 | if (...) ... |  |
+| LoopUnrolling.cs:69:9:70:19 | if (...) ... | LoopUnrolling.cs:69:14:69:17 | access to parameter args |  |
+| LoopUnrolling.cs:69:13:69:23 | [false] !... | LoopUnrolling.cs:71:9:71:21 | ...; | false |
+| LoopUnrolling.cs:69:13:69:23 | [true] !... | LoopUnrolling.cs:70:13:70:19 | return ...; | true |
+| LoopUnrolling.cs:69:14:69:17 | access to parameter args | LoopUnrolling.cs:69:14:69:23 | call to method Any<String> |  |
+| LoopUnrolling.cs:69:14:69:23 | call to method Any<String> | LoopUnrolling.cs:69:13:69:23 | [false] !... | true |
+| LoopUnrolling.cs:69:14:69:23 | call to method Any<String> | LoopUnrolling.cs:69:13:69:23 | [true] !... | false |
+| LoopUnrolling.cs:70:13:70:19 | return ...; | LoopUnrolling.cs:67:10:67:11 | exit M8 (normal) | return |
+| LoopUnrolling.cs:71:9:71:12 | access to parameter args | LoopUnrolling.cs:71:9:71:20 | call to method Clear |  |
+| LoopUnrolling.cs:71:9:71:20 | call to method Clear | LoopUnrolling.cs:72:29:72:32 | access to parameter args |  |
+| LoopUnrolling.cs:71:9:71:21 | ...; | LoopUnrolling.cs:71:9:71:12 | access to parameter args |  |
+| LoopUnrolling.cs:72:9:73:35 | [skip (line 72)] foreach (... ... in ...) ... | LoopUnrolling.cs:67:10:67:11 | exit M8 (normal) | empty |
+| LoopUnrolling.cs:72:29:72:32 | access to parameter args | LoopUnrolling.cs:72:9:73:35 | [skip (line 72)] foreach (... ... in ...) ... |  |
+| LoopUnrolling.cs:76:10:76:11 | enter M9 | LoopUnrolling.cs:77:5:83:5 | {...} |  |
+| LoopUnrolling.cs:76:10:76:11 | exit M9 (normal) | LoopUnrolling.cs:76:10:76:11 | exit M9 |  |
+| LoopUnrolling.cs:77:5:83:5 | {...} | LoopUnrolling.cs:78:9:78:34 | ... ...; |  |
+| LoopUnrolling.cs:78:9:78:34 | ... ...; | LoopUnrolling.cs:78:29:78:29 | 2 |  |
+| LoopUnrolling.cs:78:13:78:33 | String[,] xs = ... | LoopUnrolling.cs:79:27:79:28 | access to local variable xs |  |
+| LoopUnrolling.cs:78:18:78:33 | array creation of type String[,] | LoopUnrolling.cs:78:13:78:33 | String[,] xs = ... |  |
+| LoopUnrolling.cs:78:29:78:29 | 2 | LoopUnrolling.cs:78:32:78:32 | 0 |  |
+| LoopUnrolling.cs:78:32:78:32 | 0 | LoopUnrolling.cs:78:18:78:33 | array creation of type String[,] |  |
+| LoopUnrolling.cs:79:9:82:9 | [skip (line 79)] foreach (... ... in ...) ... | LoopUnrolling.cs:76:10:76:11 | exit M9 (normal) | empty |
+| LoopUnrolling.cs:79:27:79:28 | access to local variable xs | LoopUnrolling.cs:79:9:82:9 | [skip (line 79)] foreach (... ... in ...) ... |  |
+| LoopUnrolling.cs:85:10:85:12 | enter M10 | LoopUnrolling.cs:86:5:92:5 | {...} |  |
+| LoopUnrolling.cs:85:10:85:12 | exit M10 (normal) | LoopUnrolling.cs:85:10:85:12 | exit M10 |  |
+| LoopUnrolling.cs:86:5:92:5 | {...} | LoopUnrolling.cs:87:9:87:34 | ... ...; |  |
+| LoopUnrolling.cs:87:9:87:34 | ... ...; | LoopUnrolling.cs:87:29:87:29 | 0 |  |
+| LoopUnrolling.cs:87:13:87:33 | String[,] xs = ... | LoopUnrolling.cs:88:27:88:28 | access to local variable xs |  |
+| LoopUnrolling.cs:87:18:87:33 | array creation of type String[,] | LoopUnrolling.cs:87:13:87:33 | String[,] xs = ... |  |
+| LoopUnrolling.cs:87:29:87:29 | 0 | LoopUnrolling.cs:87:32:87:32 | 2 |  |
+| LoopUnrolling.cs:87:32:87:32 | 2 | LoopUnrolling.cs:87:18:87:33 | array creation of type String[,] |  |
+| LoopUnrolling.cs:88:9:91:9 | [skip (line 88)] foreach (... ... in ...) ... | LoopUnrolling.cs:85:10:85:12 | exit M10 (normal) | empty |
+| LoopUnrolling.cs:88:27:88:28 | access to local variable xs | LoopUnrolling.cs:88:9:91:9 | [skip (line 88)] foreach (... ... in ...) ... |  |
+| LoopUnrolling.cs:94:10:94:12 | enter M11 | LoopUnrolling.cs:95:5:101:5 | {...} |  |
+| LoopUnrolling.cs:94:10:94:12 | exit M11 (normal) | LoopUnrolling.cs:94:10:94:12 | exit M11 |  |
+| LoopUnrolling.cs:95:5:101:5 | {...} | LoopUnrolling.cs:96:9:96:34 | ... ...; |  |
+| LoopUnrolling.cs:96:9:96:34 | ... ...; | LoopUnrolling.cs:96:29:96:29 | 2 |  |
+| LoopUnrolling.cs:96:13:96:33 | String[,] xs = ... | LoopUnrolling.cs:97:27:97:28 | access to local variable xs |  |
+| LoopUnrolling.cs:96:18:96:33 | array creation of type String[,] | LoopUnrolling.cs:96:13:96:33 | String[,] xs = ... |  |
+| LoopUnrolling.cs:96:29:96:29 | 2 | LoopUnrolling.cs:96:32:96:32 | 2 |  |
+| LoopUnrolling.cs:96:32:96:32 | 2 | LoopUnrolling.cs:96:18:96:33 | array creation of type String[,] |  |
+| LoopUnrolling.cs:97:9:100:9 | [unroll (line 97)] foreach (... ... in ...) ... | LoopUnrolling.cs:97:22:97:22 | String x | non-empty |
+| LoopUnrolling.cs:97:9:100:9 | foreach (... ... in ...) ... | LoopUnrolling.cs:94:10:94:12 | exit M11 (normal) | empty |
+| LoopUnrolling.cs:97:9:100:9 | foreach (... ... in ...) ... | LoopUnrolling.cs:97:22:97:22 | String x | non-empty |
+| LoopUnrolling.cs:97:22:97:22 | String x | LoopUnrolling.cs:98:9:100:9 | {...} |  |
+| LoopUnrolling.cs:97:27:97:28 | access to local variable xs | LoopUnrolling.cs:97:9:100:9 | [unroll (line 97)] foreach (... ... in ...) ... |  |
+| LoopUnrolling.cs:98:9:100:9 | {...} | LoopUnrolling.cs:99:13:99:33 | ...; |  |
+| LoopUnrolling.cs:99:13:99:32 | call to method WriteLine | LoopUnrolling.cs:97:9:100:9 | foreach (... ... in ...) ... |  |
+| LoopUnrolling.cs:99:13:99:33 | ...; | LoopUnrolling.cs:99:31:99:31 | access to local variable x |  |
+| LoopUnrolling.cs:99:31:99:31 | access to local variable x | LoopUnrolling.cs:99:13:99:32 | call to method WriteLine |  |
+| MultiImplementationA.cs:4:7:4:8 | call to constructor Object | MultiImplementationA.cs:4:7:4:8 | {...} |  |
+| MultiImplementationA.cs:4:7:4:8 | enter C1 | MultiImplementationA.cs:4:7:4:8 | call to constructor Object |  |
+| MultiImplementationA.cs:4:7:4:8 | enter C1 | MultiImplementationB.cs:1:7:1:8 | call to constructor Object |  |
+| MultiImplementationA.cs:4:7:4:8 | exit C1 (normal) | MultiImplementationA.cs:4:7:4:8 | exit C1 |  |
+| MultiImplementationA.cs:4:7:4:8 | {...} | MultiImplementationA.cs:4:7:4:8 | exit C1 (normal) |  |
+| MultiImplementationA.cs:6:22:6:31 | enter get_P1 | MultiImplementationA.cs:6:28:6:31 | null |  |
+| MultiImplementationA.cs:6:22:6:31 | enter get_P1 | MultiImplementationB.cs:3:22:3:22 | 0 |  |
+| MultiImplementationA.cs:6:22:6:31 | exit get_P1 (abnormal) | MultiImplementationA.cs:6:22:6:31 | exit get_P1 |  |
+| MultiImplementationA.cs:6:22:6:31 | exit get_P1 (normal) | MultiImplementationA.cs:6:22:6:31 | exit get_P1 |  |
+| MultiImplementationA.cs:6:22:6:31 | throw ... | MultiImplementationA.cs:6:22:6:31 | exit get_P1 (abnormal) | exception(NullReferenceException) |
+| MultiImplementationA.cs:6:28:6:31 | null | MultiImplementationA.cs:6:22:6:31 | throw ... |  |
+| MultiImplementationA.cs:7:21:7:23 | enter get_P2 | MultiImplementationA.cs:7:25:7:39 | {...} |  |
+| MultiImplementationA.cs:7:21:7:23 | enter get_P2 | MultiImplementationB.cs:4:25:4:37 | {...} |  |
+| MultiImplementationA.cs:7:21:7:23 | exit get_P2 (abnormal) | MultiImplementationA.cs:7:21:7:23 | exit get_P2 |  |
+| MultiImplementationA.cs:7:21:7:23 | exit get_P2 (normal) | MultiImplementationA.cs:7:21:7:23 | exit get_P2 |  |
+| MultiImplementationA.cs:7:25:7:39 | {...} | MultiImplementationA.cs:7:33:7:36 | null |  |
+| MultiImplementationA.cs:7:27:7:37 | throw ...; | MultiImplementationA.cs:7:21:7:23 | exit get_P2 (abnormal) | exception(NullReferenceException) |
+| MultiImplementationA.cs:7:33:7:36 | null | MultiImplementationA.cs:7:27:7:37 | throw ...; |  |
+| MultiImplementationA.cs:7:41:7:43 | enter set_P2 | MultiImplementationA.cs:7:45:7:59 | {...} |  |
+| MultiImplementationA.cs:7:41:7:43 | enter set_P2 | MultiImplementationB.cs:4:43:4:45 | {...} |  |
+| MultiImplementationA.cs:7:41:7:43 | exit set_P2 (abnormal) | MultiImplementationA.cs:7:41:7:43 | exit set_P2 |  |
+| MultiImplementationA.cs:7:41:7:43 | exit set_P2 (normal) | MultiImplementationA.cs:7:41:7:43 | exit set_P2 |  |
+| MultiImplementationA.cs:7:45:7:59 | {...} | MultiImplementationA.cs:7:53:7:56 | null |  |
+| MultiImplementationA.cs:7:47:7:57 | throw ...; | MultiImplementationA.cs:7:41:7:43 | exit set_P2 (abnormal) | exception(NullReferenceException) |
+| MultiImplementationA.cs:7:53:7:56 | null | MultiImplementationA.cs:7:47:7:57 | throw ...; |  |
+| MultiImplementationA.cs:8:16:8:16 | enter M | MultiImplementationA.cs:8:29:8:32 | null |  |
+| MultiImplementationA.cs:8:16:8:16 | enter M | MultiImplementationB.cs:5:23:5:23 | 2 |  |
+| MultiImplementationA.cs:8:16:8:16 | exit M (abnormal) | MultiImplementationA.cs:8:16:8:16 | exit M |  |
+| MultiImplementationA.cs:8:16:8:16 | exit M (normal) | MultiImplementationA.cs:8:16:8:16 | exit M |  |
+| MultiImplementationA.cs:8:23:8:32 | throw ... | MultiImplementationA.cs:8:16:8:16 | exit M (abnormal) | exception(NullReferenceException) |
+| MultiImplementationA.cs:8:29:8:32 | null | MultiImplementationA.cs:8:23:8:32 | throw ... |  |
+| MultiImplementationA.cs:13:16:13:16 | this access | MultiImplementationA.cs:13:20:13:20 | 0 |  |
+| MultiImplementationA.cs:13:16:13:20 | ... = ... | MultiImplementationA.cs:24:16:24:16 | this access |  |
+| MultiImplementationA.cs:13:20:13:20 | 0 | MultiImplementationA.cs:13:16:13:20 | ... = ... |  |
+| MultiImplementationA.cs:14:31:14:31 | access to parameter i | MultiImplementationA.cs:14:31:14:31 | exit get_Item (normal) |  |
+| MultiImplementationA.cs:14:31:14:31 | enter get_Item | MultiImplementationA.cs:14:31:14:31 | access to parameter i |  |
+| MultiImplementationA.cs:14:31:14:31 | enter get_Item | MultiImplementationB.cs:12:37:12:40 | null |  |
+| MultiImplementationA.cs:14:31:14:31 | exit get_Item (abnormal) | MultiImplementationA.cs:14:31:14:31 | exit get_Item |  |
+| MultiImplementationA.cs:14:31:14:31 | exit get_Item (normal) | MultiImplementationA.cs:14:31:14:31 | exit get_Item |  |
+| MultiImplementationA.cs:15:36:15:38 | enter get_Item | MultiImplementationA.cs:15:40:15:52 | {...} |  |
+| MultiImplementationA.cs:15:36:15:38 | enter get_Item | MultiImplementationB.cs:13:40:13:54 | {...} |  |
+| MultiImplementationA.cs:15:36:15:38 | exit get_Item (abnormal) | MultiImplementationA.cs:15:36:15:38 | exit get_Item |  |
+| MultiImplementationA.cs:15:36:15:38 | exit get_Item (normal) | MultiImplementationA.cs:15:36:15:38 | exit get_Item |  |
+| MultiImplementationA.cs:15:40:15:52 | {...} | MultiImplementationA.cs:15:49:15:49 | access to parameter s |  |
+| MultiImplementationA.cs:15:42:15:50 | return ...; | MultiImplementationA.cs:15:36:15:38 | exit get_Item (normal) | return |
+| MultiImplementationA.cs:15:49:15:49 | access to parameter s | MultiImplementationA.cs:15:42:15:50 | return ...; |  |
+| MultiImplementationA.cs:15:54:15:56 | enter set_Item | MultiImplementationA.cs:15:58:15:60 | {...} |  |
+| MultiImplementationA.cs:15:54:15:56 | enter set_Item | MultiImplementationB.cs:13:60:13:62 | {...} |  |
+| MultiImplementationA.cs:15:54:15:56 | exit set_Item (normal) | MultiImplementationA.cs:15:54:15:56 | exit set_Item |  |
+| MultiImplementationA.cs:15:58:15:60 | {...} | MultiImplementationA.cs:15:54:15:56 | exit set_Item (normal) |  |
+| MultiImplementationA.cs:16:17:16:18 | enter M1 | MultiImplementationA.cs:17:5:19:5 | {...} |  |
+| MultiImplementationA.cs:16:17:16:18 | enter M1 | MultiImplementationB.cs:15:5:17:5 | {...} |  |
+| MultiImplementationA.cs:16:17:16:18 | exit M1 (normal) | MultiImplementationA.cs:16:17:16:18 | exit M1 |  |
+| MultiImplementationA.cs:17:5:19:5 | {...} | MultiImplementationA.cs:18:9:18:22 | M2(...) |  |
+| MultiImplementationA.cs:18:9:18:22 | M2(...) | MultiImplementationA.cs:16:17:16:18 | exit M1 (normal) |  |
+| MultiImplementationA.cs:18:9:18:22 | enter M2 | MultiImplementationA.cs:18:21:18:21 | 0 |  |
+| MultiImplementationA.cs:18:9:18:22 | exit M2 (normal) | MultiImplementationA.cs:18:9:18:22 | exit M2 |  |
+| MultiImplementationA.cs:18:21:18:21 | 0 | MultiImplementationA.cs:18:9:18:22 | exit M2 (normal) |  |
+| MultiImplementationA.cs:20:12:20:13 | call to constructor Object | MultiImplementationA.cs:13:16:13:16 | this access |  |
+| MultiImplementationA.cs:20:12:20:13 | enter C2 | MultiImplementationA.cs:20:12:20:13 | call to constructor Object |  |
+| MultiImplementationA.cs:20:12:20:13 | enter C2 | MultiImplementationB.cs:18:12:18:13 | call to constructor Object |  |
+| MultiImplementationA.cs:20:12:20:13 | exit C2 (abnormal) | MultiImplementationA.cs:20:12:20:13 | exit C2 |  |
+| MultiImplementationA.cs:20:12:20:13 | exit C2 (normal) | MultiImplementationA.cs:20:12:20:13 | exit C2 |  |
+| MultiImplementationA.cs:20:22:20:31 | {...} | MultiImplementationA.cs:20:24:20:29 | ...; |  |
+| MultiImplementationA.cs:20:24:20:24 | this access | MultiImplementationA.cs:20:28:20:28 | access to parameter i |  |
+| MultiImplementationA.cs:20:24:20:28 | ... = ... | MultiImplementationA.cs:20:12:20:13 | exit C2 (normal) |  |
+| MultiImplementationA.cs:20:24:20:29 | ...; | MultiImplementationA.cs:20:24:20:24 | this access |  |
+| MultiImplementationA.cs:20:28:20:28 | access to parameter i | MultiImplementationA.cs:20:24:20:28 | ... = ... |  |
+| MultiImplementationA.cs:21:12:21:13 | enter C2 | MultiImplementationA.cs:21:24:21:24 | 0 |  |
+| MultiImplementationA.cs:21:12:21:13 | enter C2 | MultiImplementationB.cs:19:24:19:24 | 1 |  |
+| MultiImplementationA.cs:21:12:21:13 | exit C2 (normal) | MultiImplementationA.cs:21:12:21:13 | exit C2 |  |
+| MultiImplementationA.cs:21:19:21:22 | call to constructor C2 | MultiImplementationA.cs:21:27:21:29 | {...} |  |
+| MultiImplementationA.cs:21:24:21:24 | 0 | MultiImplementationA.cs:21:19:21:22 | call to constructor C2 |  |
+| MultiImplementationA.cs:21:27:21:29 | {...} | MultiImplementationA.cs:21:12:21:13 | exit C2 (normal) |  |
+| MultiImplementationA.cs:22:6:22:7 | enter ~C2 | MultiImplementationA.cs:22:11:22:13 | {...} |  |
+| MultiImplementationA.cs:22:6:22:7 | enter ~C2 | MultiImplementationB.cs:20:11:20:25 | {...} |  |
+| MultiImplementationA.cs:22:6:22:7 | exit ~C2 (abnormal) | MultiImplementationA.cs:22:6:22:7 | exit ~C2 |  |
+| MultiImplementationA.cs:22:6:22:7 | exit ~C2 (normal) | MultiImplementationA.cs:22:6:22:7 | exit ~C2 |  |
+| MultiImplementationA.cs:22:11:22:13 | {...} | MultiImplementationA.cs:22:6:22:7 | exit ~C2 (normal) |  |
+| MultiImplementationA.cs:23:28:23:35 | enter implicit conversion | MultiImplementationA.cs:23:50:23:53 | null |  |
+| MultiImplementationA.cs:23:28:23:35 | enter implicit conversion | MultiImplementationB.cs:21:56:21:59 | null |  |
+| MultiImplementationA.cs:23:28:23:35 | exit implicit conversion (abnormal) | MultiImplementationA.cs:23:28:23:35 | exit implicit conversion |  |
+| MultiImplementationA.cs:23:28:23:35 | exit implicit conversion (normal) | MultiImplementationA.cs:23:28:23:35 | exit implicit conversion |  |
+| MultiImplementationA.cs:23:50:23:53 | null | MultiImplementationA.cs:23:28:23:35 | exit implicit conversion (normal) |  |
+| MultiImplementationA.cs:24:16:24:16 | access to property P | MultiImplementationA.cs:24:32:24:34 | ... = ... |  |
+| MultiImplementationA.cs:24:16:24:16 | this access | MultiImplementationA.cs:24:34:24:34 | 0 |  |
+| MultiImplementationA.cs:24:32:24:34 | ... = ... | MultiImplementationA.cs:20:22:20:31 | {...} |  |
+| MultiImplementationA.cs:24:34:24:34 | 0 | MultiImplementationA.cs:24:16:24:16 | access to property P |  |
+| MultiImplementationA.cs:28:7:28:8 | call to constructor Object | MultiImplementationA.cs:28:7:28:8 | {...} |  |
+| MultiImplementationA.cs:28:7:28:8 | enter C3 | MultiImplementationA.cs:28:7:28:8 | call to constructor Object |  |
+| MultiImplementationA.cs:28:7:28:8 | enter C3 | MultiImplementationB.cs:25:7:25:8 | call to constructor Object |  |
+| MultiImplementationA.cs:28:7:28:8 | exit C3 (normal) | MultiImplementationA.cs:28:7:28:8 | exit C3 |  |
+| MultiImplementationA.cs:28:7:28:8 | {...} | MultiImplementationA.cs:28:7:28:8 | exit C3 (normal) |  |
+| MultiImplementationA.cs:30:21:30:23 | enter get_P3 | MultiImplementationA.cs:30:34:30:37 | null |  |
+| MultiImplementationA.cs:30:21:30:23 | exit get_P3 (abnormal) | MultiImplementationA.cs:30:21:30:23 | exit get_P3 |  |
+| MultiImplementationA.cs:30:28:30:37 | throw ... | MultiImplementationA.cs:30:21:30:23 | exit get_P3 (abnormal) | exception(NullReferenceException) |
+| MultiImplementationA.cs:30:34:30:37 | null | MultiImplementationA.cs:30:28:30:37 | throw ... |  |
+| MultiImplementationA.cs:34:15:34:16 | call to constructor Object | MultiImplementationA.cs:34:15:34:16 | {...} |  |
+| MultiImplementationA.cs:34:15:34:16 | enter C4 | MultiImplementationA.cs:34:15:34:16 | call to constructor Object |  |
+| MultiImplementationA.cs:34:15:34:16 | enter C4 | MultiImplementationB.cs:30:15:30:16 | call to constructor Object |  |
+| MultiImplementationA.cs:34:15:34:16 | exit C4 (normal) | MultiImplementationA.cs:34:15:34:16 | exit C4 |  |
+| MultiImplementationA.cs:34:15:34:16 | {...} | MultiImplementationA.cs:34:15:34:16 | exit C4 (normal) |  |
+| MultiImplementationA.cs:36:9:36:10 | enter M1 | MultiImplementationA.cs:36:14:36:28 | {...} |  |
+| MultiImplementationA.cs:36:9:36:10 | enter M1 | MultiImplementationB.cs:32:17:32:17 | 0 |  |
+| MultiImplementationA.cs:36:9:36:10 | exit M1 (abnormal) | MultiImplementationA.cs:36:9:36:10 | exit M1 |  |
+| MultiImplementationA.cs:36:9:36:10 | exit M1 (normal) | MultiImplementationA.cs:36:9:36:10 | exit M1 |  |
+| MultiImplementationA.cs:36:14:36:28 | {...} | MultiImplementationA.cs:36:22:36:25 | null |  |
+| MultiImplementationA.cs:36:16:36:26 | throw ...; | MultiImplementationA.cs:36:9:36:10 | exit M1 (abnormal) | exception(NullReferenceException) |
+| MultiImplementationA.cs:36:22:36:25 | null | MultiImplementationA.cs:36:16:36:26 | throw ...; |  |
+| MultiImplementationA.cs:37:9:37:10 | enter M2 | MultiImplementationA.cs:37:14:37:28 | {...} |  |
+| MultiImplementationA.cs:37:9:37:10 | exit M2 (abnormal) | MultiImplementationA.cs:37:9:37:10 | exit M2 |  |
+| MultiImplementationA.cs:37:14:37:28 | {...} | MultiImplementationA.cs:37:22:37:25 | null |  |
+| MultiImplementationA.cs:37:16:37:26 | throw ...; | MultiImplementationA.cs:37:9:37:10 | exit M2 (abnormal) | exception(NullReferenceException) |
+| MultiImplementationA.cs:37:22:37:25 | null | MultiImplementationA.cs:37:16:37:26 | throw ...; |  |
+| MultiImplementationB.cs:1:7:1:8 | call to constructor Object | MultiImplementationB.cs:1:7:1:8 | {...} |  |
+| MultiImplementationB.cs:1:7:1:8 | {...} | MultiImplementationA.cs:4:7:4:8 | exit C1 (normal) |  |
+| MultiImplementationB.cs:3:22:3:22 | 0 | MultiImplementationA.cs:6:22:6:31 | exit get_P1 (normal) |  |
+| MultiImplementationB.cs:4:25:4:37 | {...} | MultiImplementationB.cs:4:34:4:34 | 1 |  |
+| MultiImplementationB.cs:4:27:4:35 | return ...; | MultiImplementationA.cs:7:21:7:23 | exit get_P2 (normal) | return |
+| MultiImplementationB.cs:4:34:4:34 | 1 | MultiImplementationB.cs:4:27:4:35 | return ...; |  |
+| MultiImplementationB.cs:4:43:4:45 | {...} | MultiImplementationA.cs:7:41:7:43 | exit set_P2 (normal) |  |
+| MultiImplementationB.cs:5:23:5:23 | 2 | MultiImplementationA.cs:8:16:8:16 | exit M (normal) |  |
+| MultiImplementationB.cs:11:16:11:16 | this access | MultiImplementationB.cs:11:20:11:20 | 1 |  |
+| MultiImplementationB.cs:11:16:11:20 | ... = ... | MultiImplementationB.cs:22:16:22:16 | this access |  |
+| MultiImplementationB.cs:11:20:11:20 | 1 | MultiImplementationB.cs:11:16:11:20 | ... = ... |  |
+| MultiImplementationB.cs:12:31:12:40 | throw ... | MultiImplementationA.cs:14:31:14:31 | exit get_Item (abnormal) | exception(NullReferenceException) |
+| MultiImplementationB.cs:12:37:12:40 | null | MultiImplementationB.cs:12:31:12:40 | throw ... |  |
+| MultiImplementationB.cs:13:40:13:54 | {...} | MultiImplementationB.cs:13:48:13:51 | null |  |
+| MultiImplementationB.cs:13:42:13:52 | throw ...; | MultiImplementationA.cs:15:36:15:38 | exit get_Item (abnormal) | exception(NullReferenceException) |
+| MultiImplementationB.cs:13:48:13:51 | null | MultiImplementationB.cs:13:42:13:52 | throw ...; |  |
+| MultiImplementationB.cs:13:60:13:62 | {...} | MultiImplementationA.cs:15:54:15:56 | exit set_Item (normal) |  |
+| MultiImplementationB.cs:15:5:17:5 | {...} | MultiImplementationB.cs:16:9:16:31 | M2(...) |  |
+| MultiImplementationB.cs:16:9:16:31 | M2(...) | MultiImplementationA.cs:16:17:16:18 | exit M1 (normal) |  |
+| MultiImplementationB.cs:16:9:16:31 | enter M2 | MultiImplementationB.cs:16:27:16:30 | null |  |
+| MultiImplementationB.cs:16:9:16:31 | exit M2 (abnormal) | MultiImplementationB.cs:16:9:16:31 | exit M2 |  |
+| MultiImplementationB.cs:16:21:16:30 | throw ... | MultiImplementationB.cs:16:9:16:31 | exit M2 (abnormal) | exception(NullReferenceException) |
+| MultiImplementationB.cs:16:27:16:30 | null | MultiImplementationB.cs:16:21:16:30 | throw ... |  |
+| MultiImplementationB.cs:18:12:18:13 | call to constructor Object | MultiImplementationB.cs:11:16:11:16 | this access |  |
+| MultiImplementationB.cs:18:22:18:36 | {...} | MultiImplementationB.cs:18:30:18:33 | null |  |
+| MultiImplementationB.cs:18:24:18:34 | throw ...; | MultiImplementationA.cs:20:12:20:13 | exit C2 (abnormal) | exception(NullReferenceException) |
+| MultiImplementationB.cs:18:30:18:33 | null | MultiImplementationB.cs:18:24:18:34 | throw ...; |  |
+| MultiImplementationB.cs:19:19:19:22 | call to constructor C2 | MultiImplementationB.cs:19:27:19:29 | {...} |  |
+| MultiImplementationB.cs:19:24:19:24 | 1 | MultiImplementationB.cs:19:19:19:22 | call to constructor C2 |  |
+| MultiImplementationB.cs:19:27:19:29 | {...} | MultiImplementationA.cs:21:12:21:13 | exit C2 (normal) |  |
+| MultiImplementationB.cs:20:11:20:25 | {...} | MultiImplementationB.cs:20:19:20:22 | null |  |
+| MultiImplementationB.cs:20:13:20:23 | throw ...; | MultiImplementationA.cs:22:6:22:7 | exit ~C2 (abnormal) | exception(NullReferenceException) |
+| MultiImplementationB.cs:20:19:20:22 | null | MultiImplementationB.cs:20:13:20:23 | throw ...; |  |
+| MultiImplementationB.cs:21:50:21:59 | throw ... | MultiImplementationA.cs:23:28:23:35 | exit implicit conversion (abnormal) | exception(NullReferenceException) |
+| MultiImplementationB.cs:21:56:21:59 | null | MultiImplementationB.cs:21:50:21:59 | throw ... |  |
+| MultiImplementationB.cs:22:16:22:16 | access to property P | MultiImplementationB.cs:22:32:22:34 | ... = ... |  |
+| MultiImplementationB.cs:22:16:22:16 | this access | MultiImplementationB.cs:22:34:22:34 | 1 |  |
+| MultiImplementationB.cs:22:32:22:34 | ... = ... | MultiImplementationB.cs:18:22:18:36 | {...} |  |
+| MultiImplementationB.cs:22:34:22:34 | 1 | MultiImplementationB.cs:22:16:22:16 | access to property P |  |
+| MultiImplementationB.cs:25:7:25:8 | call to constructor Object | MultiImplementationB.cs:25:7:25:8 | {...} |  |
+| MultiImplementationB.cs:25:7:25:8 | {...} | MultiImplementationA.cs:28:7:28:8 | exit C3 (normal) |  |
+| MultiImplementationB.cs:30:15:30:16 | call to constructor Object | MultiImplementationB.cs:30:15:30:16 | {...} |  |
+| MultiImplementationB.cs:30:15:30:16 | {...} | MultiImplementationA.cs:34:15:34:16 | exit C4 (normal) |  |
+| MultiImplementationB.cs:32:17:32:17 | 0 | MultiImplementationA.cs:36:9:36:10 | exit M1 (normal) |  |
+| NullCoalescing.cs:1:7:1:20 | call to constructor Object | NullCoalescing.cs:1:7:1:20 | {...} |  |
+| NullCoalescing.cs:1:7:1:20 | enter NullCoalescing | NullCoalescing.cs:1:7:1:20 | call to constructor Object |  |
+| NullCoalescing.cs:1:7:1:20 | exit NullCoalescing (normal) | NullCoalescing.cs:1:7:1:20 | exit NullCoalescing |  |
+| NullCoalescing.cs:1:7:1:20 | {...} | NullCoalescing.cs:1:7:1:20 | exit NullCoalescing (normal) |  |
+| NullCoalescing.cs:3:9:3:10 | enter M1 | NullCoalescing.cs:3:23:3:23 | access to parameter i |  |
+| NullCoalescing.cs:3:9:3:10 | exit M1 (normal) | NullCoalescing.cs:3:9:3:10 | exit M1 |  |
+| NullCoalescing.cs:3:23:3:23 | access to parameter i | NullCoalescing.cs:3:23:3:28 | ... ?? ... | non-null |
+| NullCoalescing.cs:3:23:3:23 | access to parameter i | NullCoalescing.cs:3:28:3:28 | 0 | null |
+| NullCoalescing.cs:3:23:3:28 | ... ?? ... | NullCoalescing.cs:3:9:3:10 | exit M1 (normal) |  |
+| NullCoalescing.cs:3:28:3:28 | 0 | NullCoalescing.cs:3:23:3:28 | ... ?? ... |  |
+| NullCoalescing.cs:5:9:5:10 | enter M2 | NullCoalescing.cs:5:25:5:25 | access to parameter b |  |
+| NullCoalescing.cs:5:9:5:10 | exit M2 (normal) | NullCoalescing.cs:5:9:5:10 | exit M2 |  |
+| NullCoalescing.cs:5:24:5:43 | ... ? ... : ... | NullCoalescing.cs:5:9:5:10 | exit M2 (normal) |  |
+| NullCoalescing.cs:5:25:5:25 | access to parameter b | NullCoalescing.cs:5:25:5:34 | [false] ... ?? ... | false |
+| NullCoalescing.cs:5:25:5:25 | access to parameter b | NullCoalescing.cs:5:25:5:34 | [true] ... ?? ... | true |
+| NullCoalescing.cs:5:25:5:25 | access to parameter b | NullCoalescing.cs:5:30:5:34 | false | null |
+| NullCoalescing.cs:5:25:5:34 | [false] ... ?? ... | NullCoalescing.cs:5:43:5:43 | 1 | false |
+| NullCoalescing.cs:5:25:5:34 | [true] ... ?? ... | NullCoalescing.cs:5:39:5:39 | 0 | true |
+| NullCoalescing.cs:5:30:5:34 | false | NullCoalescing.cs:5:25:5:34 | [false] ... ?? ... | false |
+| NullCoalescing.cs:5:39:5:39 | 0 | NullCoalescing.cs:5:24:5:43 | ... ? ... : ... |  |
+| NullCoalescing.cs:5:43:5:43 | 1 | NullCoalescing.cs:5:24:5:43 | ... ? ... : ... |  |
+| NullCoalescing.cs:7:12:7:13 | enter M3 | NullCoalescing.cs:7:40:7:41 | access to parameter s1 |  |
+| NullCoalescing.cs:7:12:7:13 | exit M3 (normal) | NullCoalescing.cs:7:12:7:13 | exit M3 |  |
+| NullCoalescing.cs:7:40:7:41 | access to parameter s1 | NullCoalescing.cs:7:40:7:53 | ... ?? ... | non-null |
+| NullCoalescing.cs:7:40:7:41 | access to parameter s1 | NullCoalescing.cs:7:46:7:47 | access to parameter s2 | null |
+| NullCoalescing.cs:7:40:7:53 | ... ?? ... | NullCoalescing.cs:7:12:7:13 | exit M3 (normal) |  |
+| NullCoalescing.cs:7:46:7:47 | access to parameter s2 | NullCoalescing.cs:7:46:7:53 | ... ?? ... | non-null |
+| NullCoalescing.cs:7:46:7:47 | access to parameter s2 | NullCoalescing.cs:7:52:7:53 | "" | null |
+| NullCoalescing.cs:7:46:7:53 | ... ?? ... | NullCoalescing.cs:7:40:7:53 | ... ?? ... |  |
+| NullCoalescing.cs:7:52:7:53 | "" | NullCoalescing.cs:7:46:7:53 | ... ?? ... |  |
+| NullCoalescing.cs:9:12:9:13 | enter M4 | NullCoalescing.cs:9:37:9:37 | access to parameter b |  |
+| NullCoalescing.cs:9:12:9:13 | exit M4 (normal) | NullCoalescing.cs:9:12:9:13 | exit M4 |  |
+| NullCoalescing.cs:9:36:9:58 | ... ?? ... | NullCoalescing.cs:9:12:9:13 | exit M4 (normal) |  |
+| NullCoalescing.cs:9:37:9:37 | access to parameter b | NullCoalescing.cs:9:41:9:41 | access to parameter s | true |
+| NullCoalescing.cs:9:37:9:37 | access to parameter b | NullCoalescing.cs:9:45:9:45 | access to parameter s | false |
+| NullCoalescing.cs:9:37:9:45 | [non-null] ... ? ... : ... | NullCoalescing.cs:9:36:9:58 | ... ?? ... | non-null |
+| NullCoalescing.cs:9:37:9:45 | [null] ... ? ... : ... | NullCoalescing.cs:9:51:9:52 | "" | null |
+| NullCoalescing.cs:9:41:9:41 | access to parameter s | NullCoalescing.cs:9:37:9:45 | [non-null] ... ? ... : ... | non-null |
+| NullCoalescing.cs:9:41:9:41 | access to parameter s | NullCoalescing.cs:9:37:9:45 | [null] ... ? ... : ... | null |
+| NullCoalescing.cs:9:45:9:45 | access to parameter s | NullCoalescing.cs:9:37:9:45 | [non-null] ... ? ... : ... | non-null |
+| NullCoalescing.cs:9:45:9:45 | access to parameter s | NullCoalescing.cs:9:37:9:45 | [null] ... ? ... : ... | null |
+| NullCoalescing.cs:9:51:9:52 | "" | NullCoalescing.cs:9:51:9:58 | ... ?? ... | non-null |
+| NullCoalescing.cs:9:51:9:58 | ... ?? ... | NullCoalescing.cs:9:36:9:58 | ... ?? ... |  |
+| NullCoalescing.cs:11:9:11:10 | enter M5 | NullCoalescing.cs:11:44:11:45 | access to parameter b1 |  |
+| NullCoalescing.cs:11:9:11:10 | exit M5 (normal) | NullCoalescing.cs:11:9:11:10 | exit M5 |  |
+| NullCoalescing.cs:11:43:11:68 | ... ? ... : ... | NullCoalescing.cs:11:9:11:10 | exit M5 (normal) |  |
+| NullCoalescing.cs:11:44:11:45 | access to parameter b1 | NullCoalescing.cs:11:44:11:59 | [false] ... ?? ... | false |
+| NullCoalescing.cs:11:44:11:45 | access to parameter b1 | NullCoalescing.cs:11:44:11:59 | [true] ... ?? ... | true |
+| NullCoalescing.cs:11:44:11:45 | access to parameter b1 | NullCoalescing.cs:11:51:11:52 | access to parameter b2 | null |
+| NullCoalescing.cs:11:44:11:59 | [false] ... ?? ... | NullCoalescing.cs:11:68:11:68 | 1 | false |
+| NullCoalescing.cs:11:44:11:59 | [true] ... ?? ... | NullCoalescing.cs:11:64:11:64 | 0 | true |
+| NullCoalescing.cs:11:51:11:52 | access to parameter b2 | NullCoalescing.cs:11:51:11:58 | [false] ... && ... | false |
+| NullCoalescing.cs:11:51:11:52 | access to parameter b2 | NullCoalescing.cs:11:57:11:58 | access to parameter b3 | true |
+| NullCoalescing.cs:11:51:11:58 | [false] ... && ... | NullCoalescing.cs:11:44:11:59 | [false] ... ?? ... | false |
+| NullCoalescing.cs:11:51:11:58 | [true] ... && ... | NullCoalescing.cs:11:44:11:59 | [true] ... ?? ... | true |
+| NullCoalescing.cs:11:57:11:58 | access to parameter b3 | NullCoalescing.cs:11:51:11:58 | [false] ... && ... | false |
+| NullCoalescing.cs:11:57:11:58 | access to parameter b3 | NullCoalescing.cs:11:51:11:58 | [true] ... && ... | true |
+| NullCoalescing.cs:11:64:11:64 | 0 | NullCoalescing.cs:11:43:11:68 | ... ? ... : ... |  |
+| NullCoalescing.cs:11:68:11:68 | 1 | NullCoalescing.cs:11:43:11:68 | ... ? ... : ... |  |
+| NullCoalescing.cs:13:10:13:11 | enter M6 | NullCoalescing.cs:14:5:18:5 | {...} |  |
+| NullCoalescing.cs:13:10:13:11 | exit M6 (normal) | NullCoalescing.cs:13:10:13:11 | exit M6 |  |
+| NullCoalescing.cs:14:5:18:5 | {...} | NullCoalescing.cs:15:9:15:32 | ... ...; |  |
+| NullCoalescing.cs:15:9:15:32 | ... ...; | NullCoalescing.cs:15:23:15:26 | null |  |
+| NullCoalescing.cs:15:13:15:31 | Int32 j = ... | NullCoalescing.cs:16:9:16:26 | ... ...; |  |
+| NullCoalescing.cs:15:17:15:26 | (...) ... | NullCoalescing.cs:15:31:15:31 | 0 | null |
+| NullCoalescing.cs:15:17:15:31 | ... ?? ... | NullCoalescing.cs:15:13:15:31 | Int32 j = ... |  |
+| NullCoalescing.cs:15:23:15:26 | null | NullCoalescing.cs:15:17:15:26 | (...) ... |  |
+| NullCoalescing.cs:15:31:15:31 | 0 | NullCoalescing.cs:15:17:15:31 | ... ?? ... |  |
+| NullCoalescing.cs:16:9:16:26 | ... ...; | NullCoalescing.cs:16:17:16:18 | "" |  |
+| NullCoalescing.cs:16:13:16:25 | String s = ... | NullCoalescing.cs:17:9:17:25 | ...; |  |
+| NullCoalescing.cs:16:17:16:18 | "" | NullCoalescing.cs:16:17:16:25 | ... ?? ... | non-null |
+| NullCoalescing.cs:16:17:16:25 | ... ?? ... | NullCoalescing.cs:16:13:16:25 | String s = ... |  |
+| NullCoalescing.cs:17:9:17:24 | ... = ... | NullCoalescing.cs:13:10:13:11 | exit M6 (normal) |  |
+| NullCoalescing.cs:17:9:17:25 | ...; | NullCoalescing.cs:17:19:17:19 | access to parameter i |  |
+| NullCoalescing.cs:17:13:17:19 | (...) ... | NullCoalescing.cs:17:13:17:24 | ... ?? ... | non-null |
+| NullCoalescing.cs:17:13:17:24 | ... ?? ... | NullCoalescing.cs:17:9:17:24 | ... = ... |  |
+| NullCoalescing.cs:17:19:17:19 | access to parameter i | NullCoalescing.cs:17:13:17:19 | (...) ... |  |
+| PartialImplementationA.cs:3:12:3:18 | call to constructor Object | PartialImplementationB.cs:3:16:3:16 | this access |  |
+| PartialImplementationA.cs:3:12:3:18 | enter Partial | PartialImplementationA.cs:3:12:3:18 | call to constructor Object |  |
+| PartialImplementationA.cs:3:12:3:18 | exit Partial (normal) | PartialImplementationA.cs:3:12:3:18 | exit Partial |  |
+| PartialImplementationA.cs:3:27:3:29 | {...} | PartialImplementationA.cs:3:12:3:18 | exit Partial (normal) |  |
+| PartialImplementationB.cs:3:16:3:16 | this access | PartialImplementationB.cs:3:20:3:20 | 0 |  |
+| PartialImplementationB.cs:3:16:3:16 | this access | PartialImplementationB.cs:3:20:3:20 | 0 |  |
+| PartialImplementationB.cs:3:16:3:20 | ... = ... | PartialImplementationB.cs:5:16:5:16 | this access |  |
+| PartialImplementationB.cs:3:16:3:20 | ... = ... | PartialImplementationB.cs:5:16:5:16 | this access |  |
+| PartialImplementationB.cs:3:20:3:20 | 0 | PartialImplementationB.cs:3:16:3:20 | ... = ... |  |
+| PartialImplementationB.cs:3:20:3:20 | 0 | PartialImplementationB.cs:3:16:3:20 | ... = ... |  |
+| PartialImplementationB.cs:4:12:4:18 | call to constructor Object | PartialImplementationB.cs:3:16:3:16 | this access |  |
+| PartialImplementationB.cs:4:12:4:18 | enter Partial | PartialImplementationB.cs:4:12:4:18 | call to constructor Object |  |
+| PartialImplementationB.cs:4:12:4:18 | exit Partial (normal) | PartialImplementationB.cs:4:12:4:18 | exit Partial |  |
+| PartialImplementationB.cs:4:22:4:24 | {...} | PartialImplementationB.cs:4:12:4:18 | exit Partial (normal) |  |
+| PartialImplementationB.cs:5:16:5:16 | access to property P | PartialImplementationB.cs:5:32:5:34 | ... = ... |  |
+| PartialImplementationB.cs:5:16:5:16 | access to property P | PartialImplementationB.cs:5:32:5:34 | ... = ... |  |
+| PartialImplementationB.cs:5:16:5:16 | this access | PartialImplementationB.cs:5:34:5:34 | 0 |  |
+| PartialImplementationB.cs:5:16:5:16 | this access | PartialImplementationB.cs:5:34:5:34 | 0 |  |
+| PartialImplementationB.cs:5:32:5:34 | ... = ... | PartialImplementationA.cs:3:27:3:29 | {...} |  |
+| PartialImplementationB.cs:5:32:5:34 | ... = ... | PartialImplementationB.cs:4:22:4:24 | {...} |  |
+| PartialImplementationB.cs:5:34:5:34 | 0 | PartialImplementationB.cs:5:16:5:16 | access to property P |  |
+| PartialImplementationB.cs:5:34:5:34 | 0 | PartialImplementationB.cs:5:16:5:16 | access to property P |  |
+| Patterns.cs:3:7:3:14 | call to constructor Object | Patterns.cs:3:7:3:14 | {...} |  |
+| Patterns.cs:3:7:3:14 | enter Patterns | Patterns.cs:3:7:3:14 | call to constructor Object |  |
+| Patterns.cs:3:7:3:14 | exit Patterns (normal) | Patterns.cs:3:7:3:14 | exit Patterns |  |
+| Patterns.cs:3:7:3:14 | {...} | Patterns.cs:3:7:3:14 | exit Patterns (normal) |  |
+| Patterns.cs:5:10:5:11 | enter M1 | Patterns.cs:6:5:43:5 | {...} |  |
+| Patterns.cs:5:10:5:11 | exit M1 (normal) | Patterns.cs:5:10:5:11 | exit M1 |  |
+| Patterns.cs:6:5:43:5 | {...} | Patterns.cs:7:9:7:24 | ... ...; |  |
+| Patterns.cs:7:9:7:24 | ... ...; | Patterns.cs:7:20:7:23 | null |  |
+| Patterns.cs:7:16:7:23 | Object o = ... | Patterns.cs:8:9:18:9 | if (...) ... |  |
+| Patterns.cs:7:20:7:23 | null | Patterns.cs:7:16:7:23 | Object o = ... |  |
+| Patterns.cs:8:9:18:9 | if (...) ... | Patterns.cs:8:13:8:13 | access to local variable o |  |
+| Patterns.cs:8:13:8:13 | access to local variable o | Patterns.cs:8:18:8:23 | Int32 i1 |  |
+| Patterns.cs:8:13:8:23 | [false] ... is ... | Patterns.cs:12:14:18:9 | if (...) ... | false |
+| Patterns.cs:8:13:8:23 | [true] ... is ... | Patterns.cs:9:9:11:9 | {...} | true |
+| Patterns.cs:8:18:8:23 | Int32 i1 | Patterns.cs:8:13:8:23 | [false] ... is ... | no-match |
+| Patterns.cs:8:18:8:23 | Int32 i1 | Patterns.cs:8:13:8:23 | [true] ... is ... | match |
+| Patterns.cs:9:9:11:9 | {...} | Patterns.cs:10:13:10:43 | ...; |  |
+| Patterns.cs:10:13:10:42 | call to method WriteLine | Patterns.cs:20:9:38:9 | switch (...) {...} |  |
+| Patterns.cs:10:13:10:43 | ...; | Patterns.cs:10:33:10:36 | "int " |  |
+| Patterns.cs:10:31:10:41 | $"..." | Patterns.cs:10:13:10:42 | call to method WriteLine |  |
+| Patterns.cs:10:33:10:36 | "int " | Patterns.cs:10:38:10:39 | access to local variable i1 |  |
+| Patterns.cs:10:38:10:39 | access to local variable i1 | Patterns.cs:10:31:10:41 | $"..." |  |
+| Patterns.cs:12:14:18:9 | if (...) ... | Patterns.cs:12:18:12:18 | access to local variable o |  |
+| Patterns.cs:12:18:12:18 | access to local variable o | Patterns.cs:12:23:12:31 | String s1 |  |
+| Patterns.cs:12:18:12:31 | [false] ... is ... | Patterns.cs:16:14:18:9 | if (...) ... | false |
+| Patterns.cs:12:18:12:31 | [true] ... is ... | Patterns.cs:13:9:15:9 | {...} | true |
+| Patterns.cs:12:23:12:31 | String s1 | Patterns.cs:12:18:12:31 | [false] ... is ... | no-match |
+| Patterns.cs:12:23:12:31 | String s1 | Patterns.cs:12:18:12:31 | [true] ... is ... | match |
+| Patterns.cs:13:9:15:9 | {...} | Patterns.cs:14:13:14:46 | ...; |  |
+| Patterns.cs:14:13:14:45 | call to method WriteLine | Patterns.cs:20:9:38:9 | switch (...) {...} |  |
+| Patterns.cs:14:13:14:46 | ...; | Patterns.cs:14:33:14:39 | "string " |  |
+| Patterns.cs:14:31:14:44 | $"..." | Patterns.cs:14:13:14:45 | call to method WriteLine |  |
+| Patterns.cs:14:33:14:39 | "string " | Patterns.cs:14:41:14:42 | access to local variable s1 |  |
+| Patterns.cs:14:41:14:42 | access to local variable s1 | Patterns.cs:14:31:14:44 | $"..." |  |
+| Patterns.cs:16:14:18:9 | if (...) ... | Patterns.cs:16:18:16:18 | access to local variable o |  |
+| Patterns.cs:16:18:16:18 | access to local variable o | Patterns.cs:16:23:16:28 | Object v1 |  |
+| Patterns.cs:16:18:16:28 | [false] ... is ... | Patterns.cs:20:9:38:9 | switch (...) {...} | false |
+| Patterns.cs:16:18:16:28 | [true] ... is ... | Patterns.cs:17:9:18:9 | {...} | true |
+| Patterns.cs:16:23:16:28 | Object v1 | Patterns.cs:16:18:16:28 | [false] ... is ... | no-match |
+| Patterns.cs:16:23:16:28 | Object v1 | Patterns.cs:16:18:16:28 | [true] ... is ... | match |
+| Patterns.cs:17:9:18:9 | {...} | Patterns.cs:20:9:38:9 | switch (...) {...} |  |
+| Patterns.cs:20:9:38:9 | switch (...) {...} | Patterns.cs:20:17:20:17 | access to local variable o |  |
+| Patterns.cs:20:17:20:17 | access to local variable o | Patterns.cs:22:13:22:23 | case ...: |  |
+| Patterns.cs:22:13:22:23 | case ...: | Patterns.cs:22:18:22:22 | "xyz" |  |
+| Patterns.cs:22:18:22:22 | "xyz" | Patterns.cs:23:17:23:22 | break; | match |
+| Patterns.cs:22:18:22:22 | "xyz" | Patterns.cs:24:13:24:36 | case ...: | no-match |
+| Patterns.cs:23:17:23:22 | break; | Patterns.cs:40:9:42:9 | switch (...) {...} | break |
+| Patterns.cs:24:13:24:36 | case ...: | Patterns.cs:24:18:24:23 | Int32 i2 |  |
+| Patterns.cs:24:18:24:23 | Int32 i2 | Patterns.cs:24:30:24:31 | access to local variable i2 | match |
+| Patterns.cs:24:18:24:23 | Int32 i2 | Patterns.cs:27:13:27:24 | case ...: | no-match |
+| Patterns.cs:24:30:24:31 | access to local variable i2 | Patterns.cs:24:35:24:35 | 0 |  |
+| Patterns.cs:24:30:24:35 | ... > ... | Patterns.cs:25:17:25:52 | ...; | true |
+| Patterns.cs:24:30:24:35 | ... > ... | Patterns.cs:27:13:27:24 | case ...: | false |
+| Patterns.cs:24:35:24:35 | 0 | Patterns.cs:24:30:24:35 | ... > ... |  |
+| Patterns.cs:25:17:25:51 | call to method WriteLine | Patterns.cs:26:17:26:22 | break; |  |
+| Patterns.cs:25:17:25:52 | ...; | Patterns.cs:25:37:25:45 | "positive " |  |
+| Patterns.cs:25:35:25:50 | $"..." | Patterns.cs:25:17:25:51 | call to method WriteLine |  |
+| Patterns.cs:25:37:25:45 | "positive " | Patterns.cs:25:47:25:48 | access to local variable i2 |  |
+| Patterns.cs:25:47:25:48 | access to local variable i2 | Patterns.cs:25:35:25:50 | $"..." |  |
+| Patterns.cs:26:17:26:22 | break; | Patterns.cs:40:9:42:9 | switch (...) {...} | break |
+| Patterns.cs:27:13:27:24 | case ...: | Patterns.cs:27:18:27:23 | Int32 i3 |  |
+| Patterns.cs:27:18:27:23 | Int32 i3 | Patterns.cs:28:17:28:47 | ...; | match |
+| Patterns.cs:27:18:27:23 | Int32 i3 | Patterns.cs:30:13:30:27 | case ...: | no-match |
+| Patterns.cs:28:17:28:46 | call to method WriteLine | Patterns.cs:29:17:29:22 | break; |  |
+| Patterns.cs:28:17:28:47 | ...; | Patterns.cs:28:37:28:40 | "int " |  |
+| Patterns.cs:28:35:28:45 | $"..." | Patterns.cs:28:17:28:46 | call to method WriteLine |  |
+| Patterns.cs:28:37:28:40 | "int " | Patterns.cs:28:42:28:43 | access to local variable i3 |  |
+| Patterns.cs:28:42:28:43 | access to local variable i3 | Patterns.cs:28:35:28:45 | $"..." |  |
+| Patterns.cs:29:17:29:22 | break; | Patterns.cs:40:9:42:9 | switch (...) {...} | break |
+| Patterns.cs:30:13:30:27 | case ...: | Patterns.cs:30:18:30:26 | String s2 |  |
+| Patterns.cs:30:18:30:26 | String s2 | Patterns.cs:31:17:31:50 | ...; | match |
+| Patterns.cs:30:18:30:26 | String s2 | Patterns.cs:33:13:33:24 | case ...: | no-match |
+| Patterns.cs:31:17:31:49 | call to method WriteLine | Patterns.cs:32:17:32:22 | break; |  |
+| Patterns.cs:31:17:31:50 | ...; | Patterns.cs:31:37:31:43 | "string " |  |
+| Patterns.cs:31:35:31:48 | $"..." | Patterns.cs:31:17:31:49 | call to method WriteLine |  |
+| Patterns.cs:31:37:31:43 | "string " | Patterns.cs:31:45:31:46 | access to local variable s2 |  |
+| Patterns.cs:31:45:31:46 | access to local variable s2 | Patterns.cs:31:35:31:48 | $"..." |  |
+| Patterns.cs:32:17:32:22 | break; | Patterns.cs:40:9:42:9 | switch (...) {...} | break |
+| Patterns.cs:33:13:33:24 | case ...: | Patterns.cs:33:18:33:23 | Object v2 |  |
+| Patterns.cs:33:18:33:23 | Object v2 | Patterns.cs:34:17:34:22 | break; | match |
+| Patterns.cs:33:18:33:23 | Object v2 | Patterns.cs:35:13:35:20 | default: | no-match |
+| Patterns.cs:34:17:34:22 | break; | Patterns.cs:40:9:42:9 | switch (...) {...} | break |
+| Patterns.cs:35:13:35:20 | default: | Patterns.cs:36:17:36:52 | ...; |  |
+| Patterns.cs:36:17:36:51 | call to method WriteLine | Patterns.cs:37:17:37:22 | break; |  |
+| Patterns.cs:36:17:36:52 | ...; | Patterns.cs:36:35:36:50 | "Something else" |  |
+| Patterns.cs:36:35:36:50 | "Something else" | Patterns.cs:36:17:36:51 | call to method WriteLine |  |
+| Patterns.cs:37:17:37:22 | break; | Patterns.cs:40:9:42:9 | switch (...) {...} | break |
+| Patterns.cs:40:9:42:9 | switch (...) {...} | Patterns.cs:40:17:40:17 | access to local variable o |  |
+| Patterns.cs:40:17:40:17 | access to local variable o | Patterns.cs:5:10:5:11 | exit M1 (normal) |  |
+| Patterns.cs:47:24:47:25 | enter M2 | Patterns.cs:48:9:48:9 | access to parameter c |  |
+| Patterns.cs:47:24:47:25 | exit M2 (normal) | Patterns.cs:47:24:47:25 | exit M2 |  |
+| Patterns.cs:48:9:48:9 | access to parameter c | Patterns.cs:48:18:48:20 | a |  |
+| Patterns.cs:48:9:48:20 | ... is ... | Patterns.cs:47:24:47:25 | exit M2 (normal) |  |
+| Patterns.cs:48:14:48:20 | not ... | Patterns.cs:48:9:48:20 | ... is ... |  |
+| Patterns.cs:48:18:48:20 | a | Patterns.cs:48:14:48:20 | not ... |  |
+| Patterns.cs:50:24:50:25 | enter M3 | Patterns.cs:51:9:51:9 | access to parameter c |  |
+| Patterns.cs:50:24:50:25 | exit M3 (normal) | Patterns.cs:50:24:50:25 | exit M3 |  |
+| Patterns.cs:51:9:51:9 | access to parameter c | Patterns.cs:51:18:51:21 | null |  |
+| Patterns.cs:51:9:51:21 | [false] ... is ... | Patterns.cs:51:34:51:34 | access to parameter c | false |
+| Patterns.cs:51:9:51:21 | [true] ... is ... | Patterns.cs:51:25:51:25 | access to parameter c | true |
+| Patterns.cs:51:9:51:39 | ... ? ... : ... | Patterns.cs:50:24:50:25 | exit M3 (normal) |  |
+| Patterns.cs:51:14:51:21 | [match] not ... | Patterns.cs:51:9:51:21 | [true] ... is ... | match |
+| Patterns.cs:51:14:51:21 | [no-match] not ... | Patterns.cs:51:9:51:21 | [false] ... is ... | no-match |
+| Patterns.cs:51:18:51:21 | null | Patterns.cs:51:14:51:21 | [match] not ... | no-match |
+| Patterns.cs:51:18:51:21 | null | Patterns.cs:51:14:51:21 | [no-match] not ... | match |
+| Patterns.cs:51:25:51:25 | access to parameter c | Patterns.cs:51:30:51:30 | 1 |  |
+| Patterns.cs:51:25:51:30 | ... is ... | Patterns.cs:51:9:51:39 | ... ? ... : ... |  |
+| Patterns.cs:51:30:51:30 | 1 | Patterns.cs:51:25:51:30 | ... is ... |  |
+| Patterns.cs:51:34:51:34 | access to parameter c | Patterns.cs:51:39:51:39 | 2 |  |
+| Patterns.cs:51:34:51:39 | ... is ... | Patterns.cs:51:9:51:39 | ... ? ... : ... |  |
+| Patterns.cs:51:39:51:39 | 2 | Patterns.cs:51:34:51:39 | ... is ... |  |
+| Patterns.cs:53:24:53:25 | enter M4 | Patterns.cs:54:9:54:9 | access to parameter c |  |
+| Patterns.cs:53:24:53:25 | exit M4 (normal) | Patterns.cs:53:24:53:25 | exit M4 |  |
+| Patterns.cs:54:9:54:9 | access to parameter c | Patterns.cs:54:18:54:37 | Patterns u |  |
+| Patterns.cs:54:9:54:37 | ... is ... | Patterns.cs:53:24:53:25 | exit M4 (normal) |  |
+| Patterns.cs:54:14:54:37 | not ... | Patterns.cs:54:9:54:37 | ... is ... |  |
+| Patterns.cs:54:18:54:37 | Patterns u | Patterns.cs:54:18:54:37 | { ... } | no-match |
+| Patterns.cs:54:18:54:37 | Patterns u | Patterns.cs:54:33:54:33 | 1 | match |
+| Patterns.cs:54:18:54:37 | { ... } | Patterns.cs:54:14:54:37 | not ... |  |
+| Patterns.cs:54:27:54:35 | [match] { ... } | Patterns.cs:54:18:54:37 | { ... } | match |
+| Patterns.cs:54:27:54:35 | [no-match] { ... } | Patterns.cs:54:18:54:37 | { ... } | no-match |
+| Patterns.cs:54:33:54:33 | 1 | Patterns.cs:54:27:54:35 | [match] { ... } | match |
+| Patterns.cs:54:33:54:33 | 1 | Patterns.cs:54:27:54:35 | [no-match] { ... } | no-match |
+| Patterns.cs:56:26:56:27 | enter M5 | Patterns.cs:57:5:63:5 | {...} |  |
+| Patterns.cs:56:26:56:27 | exit M5 (normal) | Patterns.cs:56:26:56:27 | exit M5 |  |
+| Patterns.cs:57:5:63:5 | {...} | Patterns.cs:58:16:58:16 | access to parameter i |  |
+| Patterns.cs:58:9:62:10 | return ...; | Patterns.cs:56:26:56:27 | exit M5 (normal) | return |
+| Patterns.cs:58:16:58:16 | access to parameter i | Patterns.cs:60:17:60:17 | 1 |  |
+| Patterns.cs:58:16:62:9 | ... switch { ... } | Patterns.cs:58:9:62:10 | return ...; |  |
+| Patterns.cs:60:13:60:17 | [match] not ... | Patterns.cs:60:22:60:28 | "not 1" | match |
+| Patterns.cs:60:13:60:17 | [no-match] not ... | Patterns.cs:61:13:61:13 | _ | no-match |
+| Patterns.cs:60:13:60:28 | ... => ... | Patterns.cs:58:16:62:9 | ... switch { ... } |  |
+| Patterns.cs:60:17:60:17 | 1 | Patterns.cs:60:13:60:17 | [match] not ... | no-match |
+| Patterns.cs:60:17:60:17 | 1 | Patterns.cs:60:13:60:17 | [no-match] not ... | match |
+| Patterns.cs:60:22:60:28 | "not 1" | Patterns.cs:60:13:60:28 | ... => ... |  |
+| Patterns.cs:61:13:61:13 | _ | Patterns.cs:61:18:61:24 | "other" | match |
+| Patterns.cs:61:13:61:24 | ... => ... | Patterns.cs:58:16:62:9 | ... switch { ... } |  |
+| Patterns.cs:61:18:61:24 | "other" | Patterns.cs:61:13:61:24 | ... => ... |  |
+| Patterns.cs:65:26:65:27 | enter M6 | Patterns.cs:66:5:72:5 | {...} |  |
+| Patterns.cs:65:26:65:27 | exit M6 (normal) | Patterns.cs:65:26:65:27 | exit M6 |  |
+| Patterns.cs:66:5:72:5 | {...} | Patterns.cs:67:16:67:16 | 2 |  |
+| Patterns.cs:67:9:71:10 | return ...; | Patterns.cs:65:26:65:27 | exit M6 (normal) | return |
+| Patterns.cs:67:16:67:16 | 2 | Patterns.cs:69:17:69:17 | 2 |  |
+| Patterns.cs:67:16:71:9 | ... switch { ... } | Patterns.cs:67:9:71:10 | return ...; |  |
+| Patterns.cs:69:13:69:17 | [no-match] not ... | Patterns.cs:70:13:70:13 | 2 | no-match |
+| Patterns.cs:69:17:69:17 | 2 | Patterns.cs:69:13:69:17 | [no-match] not ... | match |
+| Patterns.cs:70:13:70:13 | 2 | Patterns.cs:70:18:70:27 | "possible" | match |
+| Patterns.cs:70:13:70:27 | ... => ... | Patterns.cs:67:16:71:9 | ... switch { ... } |  |
+| Patterns.cs:70:18:70:27 | "possible" | Patterns.cs:70:13:70:27 | ... => ... |  |
+| Patterns.cs:74:26:74:27 | enter M7 | Patterns.cs:75:5:83:5 | {...} |  |
+| Patterns.cs:74:26:74:27 | exit M7 (normal) | Patterns.cs:74:26:74:27 | exit M7 |  |
+| Patterns.cs:75:5:83:5 | {...} | Patterns.cs:76:16:76:16 | access to parameter i |  |
+| Patterns.cs:76:9:82:10 | return ...; | Patterns.cs:74:26:74:27 | exit M7 (normal) | return |
+| Patterns.cs:76:16:76:16 | access to parameter i | Patterns.cs:78:15:78:15 | 1 |  |
+| Patterns.cs:76:16:82:9 | ... switch { ... } | Patterns.cs:76:9:82:10 | return ...; |  |
+| Patterns.cs:78:13:78:15 | > ... | Patterns.cs:78:20:78:24 | "> 1" | match |
+| Patterns.cs:78:13:78:15 | > ... | Patterns.cs:79:15:79:15 | 0 | no-match |
+| Patterns.cs:78:13:78:24 | ... => ... | Patterns.cs:76:16:82:9 | ... switch { ... } |  |
+| Patterns.cs:78:15:78:15 | 1 | Patterns.cs:78:13:78:15 | > ... |  |
+| Patterns.cs:78:20:78:24 | "> 1" | Patterns.cs:78:13:78:24 | ... => ... |  |
+| Patterns.cs:79:13:79:15 | < ... | Patterns.cs:79:20:79:24 | "< 0" | match |
+| Patterns.cs:79:13:79:15 | < ... | Patterns.cs:80:13:80:13 | 1 | no-match |
+| Patterns.cs:79:13:79:24 | ... => ... | Patterns.cs:76:16:82:9 | ... switch { ... } |  |
+| Patterns.cs:79:15:79:15 | 0 | Patterns.cs:79:13:79:15 | < ... |  |
+| Patterns.cs:79:20:79:24 | "< 0" | Patterns.cs:79:13:79:24 | ... => ... |  |
+| Patterns.cs:80:13:80:13 | 1 | Patterns.cs:80:18:80:20 | "1" | match |
+| Patterns.cs:80:13:80:13 | 1 | Patterns.cs:81:13:81:13 | _ | no-match |
+| Patterns.cs:80:13:80:20 | ... => ... | Patterns.cs:76:16:82:9 | ... switch { ... } |  |
+| Patterns.cs:80:18:80:20 | "1" | Patterns.cs:80:13:80:20 | ... => ... |  |
+| Patterns.cs:81:13:81:13 | _ | Patterns.cs:81:18:81:20 | "0" | match |
+| Patterns.cs:81:13:81:20 | ... => ... | Patterns.cs:76:16:82:9 | ... switch { ... } |  |
+| Patterns.cs:81:18:81:20 | "0" | Patterns.cs:81:13:81:20 | ... => ... |  |
+| Patterns.cs:85:26:85:27 | enter M8 | Patterns.cs:85:39:85:39 | access to parameter i |  |
+| Patterns.cs:85:26:85:27 | exit M8 (normal) | Patterns.cs:85:26:85:27 | exit M8 |  |
+| Patterns.cs:85:39:85:39 | access to parameter i | Patterns.cs:85:44:85:44 | 1 |  |
+| Patterns.cs:85:39:85:53 | [false] ... is ... | Patterns.cs:85:67:85:69 | "2" | false |
+| Patterns.cs:85:39:85:53 | [true] ... is ... | Patterns.cs:85:57:85:63 | "not 2" | true |
+| Patterns.cs:85:39:85:69 | ... ? ... : ... | Patterns.cs:85:26:85:27 | exit M8 (normal) |  |
+| Patterns.cs:85:44:85:44 | 1 | Patterns.cs:85:44:85:53 | [match] ... or ... | match |
+| Patterns.cs:85:44:85:44 | 1 | Patterns.cs:85:53:85:53 | 2 | no-match |
+| Patterns.cs:85:44:85:53 | [match] ... or ... | Patterns.cs:85:39:85:53 | [true] ... is ... | match |
+| Patterns.cs:85:44:85:53 | [no-match] ... or ... | Patterns.cs:85:39:85:53 | [false] ... is ... | no-match |
+| Patterns.cs:85:49:85:53 | [match] not ... | Patterns.cs:85:44:85:53 | [match] ... or ... | match |
+| Patterns.cs:85:49:85:53 | [no-match] not ... | Patterns.cs:85:44:85:53 | [no-match] ... or ... | no-match |
+| Patterns.cs:85:53:85:53 | 2 | Patterns.cs:85:49:85:53 | [match] not ... | no-match |
+| Patterns.cs:85:53:85:53 | 2 | Patterns.cs:85:49:85:53 | [no-match] not ... | match |
+| Patterns.cs:85:57:85:63 | "not 2" | Patterns.cs:85:39:85:69 | ... ? ... : ... |  |
+| Patterns.cs:85:67:85:69 | "2" | Patterns.cs:85:39:85:69 | ... ? ... : ... |  |
+| Patterns.cs:87:26:87:27 | enter M9 | Patterns.cs:87:39:87:39 | access to parameter i |  |
+| Patterns.cs:87:26:87:27 | exit M9 (normal) | Patterns.cs:87:26:87:27 | exit M9 |  |
+| Patterns.cs:87:39:87:39 | access to parameter i | Patterns.cs:87:44:87:44 | 1 |  |
+| Patterns.cs:87:39:87:54 | [false] ... is ... | Patterns.cs:87:64:87:70 | "not 1" | false |
+| Patterns.cs:87:39:87:54 | [true] ... is ... | Patterns.cs:87:58:87:60 | "1" | true |
+| Patterns.cs:87:39:87:70 | ... ? ... : ... | Patterns.cs:87:26:87:27 | exit M9 (normal) |  |
+| Patterns.cs:87:44:87:44 | 1 | Patterns.cs:87:44:87:54 | [no-match] ... and ... | no-match |
+| Patterns.cs:87:44:87:44 | 1 | Patterns.cs:87:54:87:54 | 2 | match |
+| Patterns.cs:87:44:87:54 | [match] ... and ... | Patterns.cs:87:39:87:54 | [true] ... is ... | match |
+| Patterns.cs:87:44:87:54 | [no-match] ... and ... | Patterns.cs:87:39:87:54 | [false] ... is ... | no-match |
+| Patterns.cs:87:50:87:54 | [match] not ... | Patterns.cs:87:44:87:54 | [match] ... and ... | match |
+| Patterns.cs:87:50:87:54 | [no-match] not ... | Patterns.cs:87:44:87:54 | [no-match] ... and ... | no-match |
+| Patterns.cs:87:54:87:54 | 2 | Patterns.cs:87:50:87:54 | [match] not ... | no-match |
+| Patterns.cs:87:54:87:54 | 2 | Patterns.cs:87:50:87:54 | [no-match] not ... | match |
+| Patterns.cs:87:58:87:60 | "1" | Patterns.cs:87:39:87:70 | ... ? ... : ... |  |
+| Patterns.cs:87:64:87:70 | "not 1" | Patterns.cs:87:39:87:70 | ... ? ... : ... |  |
+| Patterns.cs:93:17:93:19 | enter M10 | Patterns.cs:94:5:99:5 | {...} |  |
+| Patterns.cs:93:17:93:19 | exit M10 (normal) | Patterns.cs:93:17:93:19 | exit M10 |  |
+| Patterns.cs:94:5:99:5 | {...} | Patterns.cs:95:9:98:9 | if (...) ... |  |
+| Patterns.cs:95:9:98:9 | if (...) ... | Patterns.cs:95:13:95:16 | this access |  |
+| Patterns.cs:95:13:95:16 | this access | Patterns.cs:95:29:95:31 | access to constant A |  |
+| Patterns.cs:95:13:95:40 | [false] ... is ... | Patterns.cs:93:17:93:19 | exit M10 (normal) | false |
+| Patterns.cs:95:13:95:40 | [true] ... is ... | Patterns.cs:96:9:98:9 | {...} | true |
+| Patterns.cs:95:21:95:40 | [match] { ... } | Patterns.cs:95:13:95:40 | [true] ... is ... | match |
+| Patterns.cs:95:21:95:40 | [match] { ... } | Patterns.cs:95:21:95:40 | [match] { ... } | match |
+| Patterns.cs:95:21:95:40 | [no-match] { ... } | Patterns.cs:95:13:95:40 | [false] ... is ... | no-match |
+| Patterns.cs:95:21:95:40 | [no-match] { ... } | Patterns.cs:95:21:95:40 | [no-match] { ... } | no-match |
+| Patterns.cs:95:29:95:31 | access to constant A | Patterns.cs:95:29:95:38 | [match] ... or ... | match |
+| Patterns.cs:95:29:95:31 | access to constant A | Patterns.cs:95:36:95:38 | access to constant B | no-match |
+| Patterns.cs:95:29:95:38 | [match] ... or ... | Patterns.cs:95:21:95:40 | [match] { ... } | match |
+| Patterns.cs:95:29:95:38 | [no-match] ... or ... | Patterns.cs:95:21:95:40 | [no-match] { ... } | no-match |
+| Patterns.cs:95:36:95:38 | access to constant B | Patterns.cs:95:29:95:38 | [match] ... or ... | match |
+| Patterns.cs:95:36:95:38 | access to constant B | Patterns.cs:95:29:95:38 | [no-match] ... or ... | no-match |
+| Patterns.cs:96:9:98:9 | {...} | Patterns.cs:97:13:97:39 | ...; |  |
+| Patterns.cs:97:13:97:38 | call to method WriteLine | Patterns.cs:93:17:93:19 | exit M10 (normal) |  |
+| Patterns.cs:97:13:97:39 | ...; | Patterns.cs:97:31:97:37 | "not C" |  |
+| Patterns.cs:97:31:97:37 | "not C" | Patterns.cs:97:13:97:38 | call to method WriteLine |  |
+| PostDominance.cs:3:7:3:19 | call to constructor Object | PostDominance.cs:3:7:3:19 | {...} |  |
+| PostDominance.cs:3:7:3:19 | enter PostDominance | PostDominance.cs:3:7:3:19 | call to constructor Object |  |
+| PostDominance.cs:3:7:3:19 | exit PostDominance (normal) | PostDominance.cs:3:7:3:19 | exit PostDominance |  |
+| PostDominance.cs:3:7:3:19 | {...} | PostDominance.cs:3:7:3:19 | exit PostDominance (normal) |  |
+| PostDominance.cs:5:10:5:11 | enter M1 | PostDominance.cs:6:5:8:5 | {...} |  |
+| PostDominance.cs:5:10:5:11 | exit M1 (normal) | PostDominance.cs:5:10:5:11 | exit M1 |  |
+| PostDominance.cs:6:5:8:5 | {...} | PostDominance.cs:7:9:7:29 | ...; |  |
+| PostDominance.cs:7:9:7:28 | call to method WriteLine | PostDominance.cs:5:10:5:11 | exit M1 (normal) |  |
+| PostDominance.cs:7:9:7:29 | ...; | PostDominance.cs:7:27:7:27 | access to parameter s |  |
+| PostDominance.cs:7:27:7:27 | access to parameter s | PostDominance.cs:7:9:7:28 | call to method WriteLine |  |
+| PostDominance.cs:10:10:10:11 | enter M2 | PostDominance.cs:11:5:15:5 | {...} |  |
+| PostDominance.cs:10:10:10:11 | exit M2 (normal) | PostDominance.cs:10:10:10:11 | exit M2 |  |
+| PostDominance.cs:11:5:15:5 | {...} | PostDominance.cs:12:9:13:19 | if (...) ... |  |
+| PostDominance.cs:12:9:13:19 | if (...) ... | PostDominance.cs:12:13:12:13 | access to parameter s |  |
+| PostDominance.cs:12:13:12:13 | access to parameter s | PostDominance.cs:12:18:12:21 | null |  |
+| PostDominance.cs:12:13:12:21 | [false] ... is ... | PostDominance.cs:14:9:14:29 | ...; | false |
+| PostDominance.cs:12:13:12:21 | [true] ... is ... | PostDominance.cs:13:13:13:19 | return ...; | true |
+| PostDominance.cs:12:18:12:21 | null | PostDominance.cs:12:13:12:21 | [false] ... is ... | no-match |
+| PostDominance.cs:12:18:12:21 | null | PostDominance.cs:12:13:12:21 | [true] ... is ... | match |
+| PostDominance.cs:13:13:13:19 | return ...; | PostDominance.cs:10:10:10:11 | exit M2 (normal) | return |
+| PostDominance.cs:14:9:14:28 | call to method WriteLine | PostDominance.cs:10:10:10:11 | exit M2 (normal) |  |
+| PostDominance.cs:14:9:14:29 | ...; | PostDominance.cs:14:27:14:27 | access to parameter s |  |
+| PostDominance.cs:14:27:14:27 | access to parameter s | PostDominance.cs:14:9:14:28 | call to method WriteLine |  |
+| PostDominance.cs:17:10:17:11 | enter M3 | PostDominance.cs:18:5:22:5 | {...} |  |
+| PostDominance.cs:17:10:17:11 | exit M3 (abnormal) | PostDominance.cs:17:10:17:11 | exit M3 |  |
+| PostDominance.cs:17:10:17:11 | exit M3 (normal) | PostDominance.cs:17:10:17:11 | exit M3 |  |
+| PostDominance.cs:18:5:22:5 | {...} | PostDominance.cs:19:9:20:55 | if (...) ... |  |
+| PostDominance.cs:19:9:20:55 | if (...) ... | PostDominance.cs:19:13:19:13 | access to parameter s |  |
+| PostDominance.cs:19:13:19:13 | access to parameter s | PostDominance.cs:19:18:19:21 | null |  |
+| PostDominance.cs:19:13:19:21 | [false] ... is ... | PostDominance.cs:21:9:21:29 | ...; | false |
+| PostDominance.cs:19:13:19:21 | [true] ... is ... | PostDominance.cs:20:45:20:53 | nameof(...) | true |
+| PostDominance.cs:19:18:19:21 | null | PostDominance.cs:19:13:19:21 | [false] ... is ... | no-match |
+| PostDominance.cs:19:18:19:21 | null | PostDominance.cs:19:13:19:21 | [true] ... is ... | match |
+| PostDominance.cs:20:13:20:55 | throw ...; | PostDominance.cs:17:10:17:11 | exit M3 (abnormal) | exception(ArgumentNullException) |
+| PostDominance.cs:20:19:20:54 | object creation of type ArgumentNullException | PostDominance.cs:20:13:20:55 | throw ...; |  |
+| PostDominance.cs:20:45:20:53 | nameof(...) | PostDominance.cs:20:19:20:54 | object creation of type ArgumentNullException |  |
+| PostDominance.cs:21:9:21:28 | call to method WriteLine | PostDominance.cs:17:10:17:11 | exit M3 (normal) |  |
+| PostDominance.cs:21:9:21:29 | ...; | PostDominance.cs:21:27:21:27 | access to parameter s |  |
+| PostDominance.cs:21:27:21:27 | access to parameter s | PostDominance.cs:21:9:21:28 | call to method WriteLine |  |
+| Qualifiers.cs:1:7:1:16 | call to constructor Object | Qualifiers.cs:1:7:1:16 | {...} |  |
+| Qualifiers.cs:1:7:1:16 | enter Qualifiers | Qualifiers.cs:1:7:1:16 | call to constructor Object |  |
+| Qualifiers.cs:1:7:1:16 | exit Qualifiers (normal) | Qualifiers.cs:1:7:1:16 | exit Qualifiers |  |
+| Qualifiers.cs:1:7:1:16 | {...} | Qualifiers.cs:1:7:1:16 | exit Qualifiers (normal) |  |
+| Qualifiers.cs:7:16:7:21 | enter Method | Qualifiers.cs:7:28:7:31 | null |  |
+| Qualifiers.cs:7:16:7:21 | exit Method (normal) | Qualifiers.cs:7:16:7:21 | exit Method |  |
+| Qualifiers.cs:7:28:7:31 | null | Qualifiers.cs:7:16:7:21 | exit Method (normal) |  |
+| Qualifiers.cs:8:23:8:34 | enter StaticMethod | Qualifiers.cs:8:41:8:44 | null |  |
+| Qualifiers.cs:8:23:8:34 | exit StaticMethod (normal) | Qualifiers.cs:8:23:8:34 | exit StaticMethod |  |
+| Qualifiers.cs:8:41:8:44 | null | Qualifiers.cs:8:23:8:34 | exit StaticMethod (normal) |  |
+| Qualifiers.cs:10:10:10:10 | enter M | Qualifiers.cs:11:5:31:5 | {...} |  |
+| Qualifiers.cs:10:10:10:10 | exit M (normal) | Qualifiers.cs:10:10:10:10 | exit M |  |
+| Qualifiers.cs:11:5:31:5 | {...} | Qualifiers.cs:12:9:12:22 | ... ...; |  |
+| Qualifiers.cs:12:9:12:22 | ... ...; | Qualifiers.cs:12:17:12:21 | this access |  |
+| Qualifiers.cs:12:13:12:21 | Qualifiers q = ... | Qualifiers.cs:13:9:13:21 | ...; |  |
+| Qualifiers.cs:12:17:12:21 | access to field Field | Qualifiers.cs:12:13:12:21 | Qualifiers q = ... |  |
+| Qualifiers.cs:12:17:12:21 | this access | Qualifiers.cs:12:17:12:21 | access to field Field |  |
+| Qualifiers.cs:13:9:13:20 | ... = ... | Qualifiers.cs:14:9:14:21 | ...; |  |
+| Qualifiers.cs:13:9:13:21 | ...; | Qualifiers.cs:13:13:13:20 | this access |  |
+| Qualifiers.cs:13:13:13:20 | access to property Property | Qualifiers.cs:13:9:13:20 | ... = ... |  |
+| Qualifiers.cs:13:13:13:20 | this access | Qualifiers.cs:13:13:13:20 | access to property Property |  |
+| Qualifiers.cs:14:9:14:20 | ... = ... | Qualifiers.cs:16:9:16:23 | ...; |  |
+| Qualifiers.cs:14:9:14:21 | ...; | Qualifiers.cs:14:13:14:20 | this access |  |
+| Qualifiers.cs:14:13:14:20 | call to method Method | Qualifiers.cs:14:9:14:20 | ... = ... |  |
+| Qualifiers.cs:14:13:14:20 | this access | Qualifiers.cs:14:13:14:20 | call to method Method |  |
+| Qualifiers.cs:16:9:16:22 | ... = ... | Qualifiers.cs:17:9:17:26 | ...; |  |
+| Qualifiers.cs:16:9:16:23 | ...; | Qualifiers.cs:16:13:16:16 | this access |  |
+| Qualifiers.cs:16:13:16:16 | this access | Qualifiers.cs:16:13:16:22 | access to field Field |  |
+| Qualifiers.cs:16:13:16:22 | access to field Field | Qualifiers.cs:16:9:16:22 | ... = ... |  |
+| Qualifiers.cs:17:9:17:25 | ... = ... | Qualifiers.cs:18:9:18:26 | ...; |  |
+| Qualifiers.cs:17:9:17:26 | ...; | Qualifiers.cs:17:13:17:16 | this access |  |
+| Qualifiers.cs:17:13:17:16 | this access | Qualifiers.cs:17:13:17:25 | access to property Property |  |
+| Qualifiers.cs:17:13:17:25 | access to property Property | Qualifiers.cs:17:9:17:25 | ... = ... |  |
+| Qualifiers.cs:18:9:18:25 | ... = ... | Qualifiers.cs:20:9:20:24 | ...; |  |
+| Qualifiers.cs:18:9:18:26 | ...; | Qualifiers.cs:18:13:18:16 | this access |  |
+| Qualifiers.cs:18:13:18:16 | this access | Qualifiers.cs:18:13:18:25 | call to method Method |  |
+| Qualifiers.cs:18:13:18:25 | call to method Method | Qualifiers.cs:18:9:18:25 | ... = ... |  |
+| Qualifiers.cs:20:9:20:23 | ... = ... | Qualifiers.cs:21:9:21:27 | ...; |  |
+| Qualifiers.cs:20:9:20:24 | ...; | Qualifiers.cs:20:13:20:23 | access to field StaticField |  |
+| Qualifiers.cs:20:13:20:23 | access to field StaticField | Qualifiers.cs:20:9:20:23 | ... = ... |  |
+| Qualifiers.cs:21:9:21:26 | ... = ... | Qualifiers.cs:22:9:22:27 | ...; |  |
+| Qualifiers.cs:21:9:21:27 | ...; | Qualifiers.cs:21:13:21:26 | access to property StaticProperty |  |
+| Qualifiers.cs:21:13:21:26 | access to property StaticProperty | Qualifiers.cs:21:9:21:26 | ... = ... |  |
+| Qualifiers.cs:22:9:22:26 | ... = ... | Qualifiers.cs:24:9:24:35 | ...; |  |
+| Qualifiers.cs:22:9:22:27 | ...; | Qualifiers.cs:22:13:22:26 | call to method StaticMethod |  |
+| Qualifiers.cs:22:13:22:26 | call to method StaticMethod | Qualifiers.cs:22:9:22:26 | ... = ... |  |
+| Qualifiers.cs:24:9:24:34 | ... = ... | Qualifiers.cs:25:9:25:38 | ...; |  |
+| Qualifiers.cs:24:9:24:35 | ...; | Qualifiers.cs:24:13:24:34 | access to field StaticField |  |
+| Qualifiers.cs:24:13:24:34 | access to field StaticField | Qualifiers.cs:24:9:24:34 | ... = ... |  |
+| Qualifiers.cs:25:9:25:37 | ... = ... | Qualifiers.cs:26:9:26:38 | ...; |  |
+| Qualifiers.cs:25:9:25:38 | ...; | Qualifiers.cs:25:13:25:37 | access to property StaticProperty |  |
+| Qualifiers.cs:25:13:25:37 | access to property StaticProperty | Qualifiers.cs:25:9:25:37 | ... = ... |  |
+| Qualifiers.cs:26:9:26:37 | ... = ... | Qualifiers.cs:28:9:28:41 | ...; |  |
+| Qualifiers.cs:26:9:26:38 | ...; | Qualifiers.cs:26:13:26:37 | call to method StaticMethod |  |
+| Qualifiers.cs:26:13:26:37 | call to method StaticMethod | Qualifiers.cs:26:9:26:37 | ... = ... |  |
+| Qualifiers.cs:28:9:28:40 | ... = ... | Qualifiers.cs:29:9:29:47 | ...; |  |
+| Qualifiers.cs:28:9:28:41 | ...; | Qualifiers.cs:28:13:28:34 | access to field StaticField |  |
+| Qualifiers.cs:28:13:28:34 | access to field StaticField | Qualifiers.cs:28:13:28:40 | access to field Field |  |
+| Qualifiers.cs:28:13:28:40 | access to field Field | Qualifiers.cs:28:9:28:40 | ... = ... |  |
+| Qualifiers.cs:29:9:29:46 | ... = ... | Qualifiers.cs:30:9:30:47 | ...; |  |
+| Qualifiers.cs:29:9:29:47 | ...; | Qualifiers.cs:29:13:29:37 | access to property StaticProperty |  |
+| Qualifiers.cs:29:13:29:37 | access to property StaticProperty | Qualifiers.cs:29:13:29:46 | access to property Property |  |
+| Qualifiers.cs:29:13:29:46 | access to property Property | Qualifiers.cs:29:9:29:46 | ... = ... |  |
+| Qualifiers.cs:30:9:30:46 | ... = ... | Qualifiers.cs:10:10:10:10 | exit M (normal) |  |
+| Qualifiers.cs:30:9:30:47 | ...; | Qualifiers.cs:30:13:30:37 | call to method StaticMethod |  |
+| Qualifiers.cs:30:13:30:37 | call to method StaticMethod | Qualifiers.cs:30:13:30:46 | call to method Method |  |
+| Qualifiers.cs:30:13:30:46 | call to method Method | Qualifiers.cs:30:9:30:46 | ... = ... |  |
+| Switch.cs:3:7:3:12 | call to constructor Object | Switch.cs:3:7:3:12 | {...} |  |
+| Switch.cs:3:7:3:12 | enter Switch | Switch.cs:3:7:3:12 | call to constructor Object |  |
+| Switch.cs:3:7:3:12 | exit Switch (normal) | Switch.cs:3:7:3:12 | exit Switch |  |
+| Switch.cs:3:7:3:12 | {...} | Switch.cs:3:7:3:12 | exit Switch (normal) |  |
+| Switch.cs:5:10:5:11 | enter M1 | Switch.cs:6:5:8:5 | {...} |  |
+| Switch.cs:5:10:5:11 | exit M1 (normal) | Switch.cs:5:10:5:11 | exit M1 |  |
+| Switch.cs:6:5:8:5 | {...} | Switch.cs:7:9:7:22 | switch (...) {...} |  |
+| Switch.cs:7:9:7:22 | switch (...) {...} | Switch.cs:7:17:7:17 | access to parameter o |  |
+| Switch.cs:7:17:7:17 | access to parameter o | Switch.cs:5:10:5:11 | exit M1 (normal) |  |
+| Switch.cs:10:10:10:11 | enter M2 | Switch.cs:11:5:33:5 | {...} |  |
+| Switch.cs:10:10:10:11 | exit M2 (abnormal) | Switch.cs:10:10:10:11 | exit M2 |  |
+| Switch.cs:10:10:10:11 | exit M2 (normal) | Switch.cs:10:10:10:11 | exit M2 |  |
+| Switch.cs:11:5:33:5 | {...} | Switch.cs:12:9:32:9 | switch (...) {...} |  |
+| Switch.cs:12:9:32:9 | switch (...) {...} | Switch.cs:12:17:12:17 | access to parameter o |  |
+| Switch.cs:12:17:12:17 | access to parameter o | Switch.cs:14:13:14:21 | case ...: |  |
+| Switch.cs:14:13:14:21 | case ...: | Switch.cs:14:18:14:20 | "a" |  |
+| Switch.cs:14:18:14:20 | "a" | Switch.cs:15:17:15:23 | return ...; | match |
+| Switch.cs:14:18:14:20 | "a" | Switch.cs:16:13:16:19 | case ...: | no-match |
+| Switch.cs:15:17:15:23 | return ...; | Switch.cs:10:10:10:11 | exit M2 (normal) | return |
+| Switch.cs:16:13:16:19 | case ...: | Switch.cs:16:18:16:18 | 0 |  |
+| Switch.cs:16:18:16:18 | 0 | Switch.cs:17:23:17:37 | object creation of type Exception | match |
+| Switch.cs:16:18:16:18 | 0 | Switch.cs:18:13:18:22 | case ...: | no-match |
+| Switch.cs:17:17:17:38 | throw ...; | Switch.cs:10:10:10:11 | exit M2 (abnormal) | exception(Exception) |
+| Switch.cs:17:23:17:37 | object creation of type Exception | Switch.cs:17:17:17:38 | throw ...; |  |
+| Switch.cs:18:13:18:22 | case ...: | Switch.cs:18:18:18:21 | null |  |
+| Switch.cs:18:18:18:21 | null | Switch.cs:19:17:19:29 | goto default; | match |
+| Switch.cs:18:18:18:21 | null | Switch.cs:20:13:20:23 | case ...: | no-match |
+| Switch.cs:19:17:19:29 | goto default; | Switch.cs:30:13:30:20 | default: | goto(default) |
+| Switch.cs:20:13:20:23 | case ...: | Switch.cs:20:18:20:22 | Int32 i |  |
+| Switch.cs:20:18:20:22 | Int32 i | Switch.cs:21:17:22:27 | if (...) ... | match |
+| Switch.cs:20:18:20:22 | Int32 i | Switch.cs:24:13:24:56 | case ...: | no-match |
+| Switch.cs:21:17:22:27 | if (...) ... | Switch.cs:21:21:21:21 | access to parameter o |  |
+| Switch.cs:21:21:21:21 | access to parameter o | Switch.cs:21:26:21:29 | null |  |
+| Switch.cs:21:21:21:29 | ... == ... | Switch.cs:22:21:22:27 | return ...; | true |
+| Switch.cs:21:21:21:29 | ... == ... | Switch.cs:23:27:23:27 | 0 | false |
+| Switch.cs:21:26:21:29 | null | Switch.cs:21:21:21:29 | ... == ... |  |
+| Switch.cs:22:21:22:27 | return ...; | Switch.cs:10:10:10:11 | exit M2 (normal) | return |
+| Switch.cs:23:17:23:28 | goto case ...; | Switch.cs:16:13:16:19 | case ...: | goto(0) |
+| Switch.cs:23:27:23:27 | 0 | Switch.cs:23:17:23:28 | goto case ...; |  |
+| Switch.cs:24:13:24:56 | case ...: | Switch.cs:24:18:24:25 | String s |  |
+| Switch.cs:24:18:24:25 | String s | Switch.cs:24:32:24:32 | access to local variable s | match |
+| Switch.cs:24:18:24:25 | String s | Switch.cs:27:13:27:39 | case ...: | no-match |
+| Switch.cs:24:32:24:32 | access to local variable s | Switch.cs:24:32:24:39 | access to property Length |  |
+| Switch.cs:24:32:24:39 | access to property Length | Switch.cs:24:43:24:43 | 0 |  |
+| Switch.cs:24:32:24:43 | ... > ... | Switch.cs:24:32:24:55 | [false] ... && ... | false |
+| Switch.cs:24:32:24:43 | ... > ... | Switch.cs:24:48:24:48 | access to local variable s | true |
+| Switch.cs:24:32:24:55 | [false] ... && ... | Switch.cs:27:13:27:39 | case ...: | false |
+| Switch.cs:24:32:24:55 | [true] ... && ... | Switch.cs:25:17:25:37 | ...; | true |
+| Switch.cs:24:43:24:43 | 0 | Switch.cs:24:32:24:43 | ... > ... |  |
+| Switch.cs:24:48:24:48 | access to local variable s | Switch.cs:24:53:24:55 | "a" |  |
+| Switch.cs:24:48:24:55 | ... != ... | Switch.cs:24:32:24:55 | [false] ... && ... | false |
+| Switch.cs:24:48:24:55 | ... != ... | Switch.cs:24:32:24:55 | [true] ... && ... | true |
+| Switch.cs:24:53:24:55 | "a" | Switch.cs:24:48:24:55 | ... != ... |  |
+| Switch.cs:25:17:25:36 | call to method WriteLine | Switch.cs:26:17:26:23 | return ...; |  |
+| Switch.cs:25:17:25:37 | ...; | Switch.cs:25:35:25:35 | access to local variable s |  |
+| Switch.cs:25:35:25:35 | access to local variable s | Switch.cs:25:17:25:36 | call to method WriteLine |  |
+| Switch.cs:26:17:26:23 | return ...; | Switch.cs:10:10:10:11 | exit M2 (normal) | return |
+| Switch.cs:27:13:27:39 | case ...: | Switch.cs:27:18:27:25 | Double d |  |
+| Switch.cs:27:18:27:25 | Double d | Switch.cs:27:32:27:38 | call to method Throw | match |
+| Switch.cs:27:18:27:25 | Double d | Switch.cs:30:13:30:20 | default: | no-match |
+| Switch.cs:27:32:27:38 | call to method Throw | Switch.cs:10:10:10:11 | exit M2 (abnormal) | exception(Exception) |
+| Switch.cs:28:13:28:17 | Label: | Switch.cs:29:17:29:23 | return ...; |  |
+| Switch.cs:29:17:29:23 | return ...; | Switch.cs:10:10:10:11 | exit M2 (normal) | return |
+| Switch.cs:30:13:30:20 | default: | Switch.cs:31:17:31:27 | goto ...; |  |
+| Switch.cs:31:17:31:27 | goto ...; | Switch.cs:28:13:28:17 | Label: | goto(Label) |
+| Switch.cs:35:10:35:11 | enter M3 | Switch.cs:36:5:42:5 | {...} |  |
+| Switch.cs:35:10:35:11 | exit M3 (abnormal) | Switch.cs:35:10:35:11 | exit M3 |  |
+| Switch.cs:36:5:42:5 | {...} | Switch.cs:37:9:41:9 | switch (...) {...} |  |
+| Switch.cs:37:9:41:9 | switch (...) {...} | Switch.cs:37:17:37:23 | call to method Throw |  |
+| Switch.cs:37:17:37:23 | call to method Throw | Switch.cs:35:10:35:11 | exit M3 (abnormal) | exception(Exception) |
+| Switch.cs:44:10:44:11 | enter M4 | Switch.cs:45:5:53:5 | {...} |  |
+| Switch.cs:44:10:44:11 | exit M4 (normal) | Switch.cs:44:10:44:11 | exit M4 |  |
+| Switch.cs:45:5:53:5 | {...} | Switch.cs:46:9:52:9 | switch (...) {...} |  |
+| Switch.cs:46:9:52:9 | switch (...) {...} | Switch.cs:46:17:46:17 | access to parameter o |  |
+| Switch.cs:46:17:46:17 | access to parameter o | Switch.cs:48:13:48:23 | case ...: |  |
+| Switch.cs:48:13:48:23 | case ...: | Switch.cs:48:18:48:20 | access to type Int32 |  |
+| Switch.cs:48:18:48:20 | access to type Int32 | Switch.cs:49:17:49:22 | break; | match |
+| Switch.cs:48:18:48:20 | access to type Int32 | Switch.cs:50:13:50:39 | case ...: | no-match |
+| Switch.cs:49:17:49:22 | break; | Switch.cs:44:10:44:11 | exit M4 (normal) | break |
+| Switch.cs:50:13:50:39 | case ...: | Switch.cs:50:18:50:21 | access to type Boolean |  |
+| Switch.cs:50:18:50:21 | access to type Boolean | Switch.cs:44:10:44:11 | exit M4 (normal) | no-match |
+| Switch.cs:50:18:50:21 | access to type Boolean | Switch.cs:50:30:50:30 | access to parameter o | match |
+| Switch.cs:50:30:50:30 | access to parameter o | Switch.cs:50:35:50:38 | null |  |
+| Switch.cs:50:30:50:38 | ... != ... | Switch.cs:44:10:44:11 | exit M4 (normal) | false |
+| Switch.cs:50:30:50:38 | ... != ... | Switch.cs:51:17:51:22 | break; | true |
+| Switch.cs:50:35:50:38 | null | Switch.cs:50:30:50:38 | ... != ... |  |
+| Switch.cs:51:17:51:22 | break; | Switch.cs:44:10:44:11 | exit M4 (normal) | break |
+| Switch.cs:55:10:55:11 | enter M5 | Switch.cs:56:5:64:5 | {...} |  |
+| Switch.cs:55:10:55:11 | exit M5 (normal) | Switch.cs:55:10:55:11 | exit M5 |  |
+| Switch.cs:56:5:64:5 | {...} | Switch.cs:57:9:63:9 | switch (...) {...} |  |
+| Switch.cs:57:9:63:9 | switch (...) {...} | Switch.cs:57:17:57:17 | 1 |  |
+| Switch.cs:57:17:57:17 | 1 | Switch.cs:57:21:57:21 | 2 |  |
+| Switch.cs:57:17:57:21 | ... + ... | Switch.cs:59:13:59:19 | case ...: |  |
+| Switch.cs:57:21:57:21 | 2 | Switch.cs:57:17:57:21 | ... + ... |  |
+| Switch.cs:59:13:59:19 | case ...: | Switch.cs:59:18:59:18 | 2 |  |
+| Switch.cs:59:18:59:18 | 2 | Switch.cs:61:13:61:19 | case ...: | no-match |
+| Switch.cs:61:13:61:19 | case ...: | Switch.cs:61:18:61:18 | 3 |  |
+| Switch.cs:61:18:61:18 | 3 | Switch.cs:62:17:62:22 | break; | match |
+| Switch.cs:62:17:62:22 | break; | Switch.cs:55:10:55:11 | exit M5 (normal) | break |
+| Switch.cs:66:10:66:11 | enter M6 | Switch.cs:67:5:75:5 | {...} |  |
+| Switch.cs:66:10:66:11 | exit M6 (normal) | Switch.cs:66:10:66:11 | exit M6 |  |
+| Switch.cs:67:5:75:5 | {...} | Switch.cs:68:9:74:9 | switch (...) {...} |  |
+| Switch.cs:68:9:74:9 | switch (...) {...} | Switch.cs:68:25:68:25 | access to parameter s |  |
+| Switch.cs:68:17:68:25 | (...) ... | Switch.cs:70:13:70:23 | case ...: |  |
+| Switch.cs:68:25:68:25 | access to parameter s | Switch.cs:68:17:68:25 | (...) ... |  |
+| Switch.cs:70:13:70:23 | case ...: | Switch.cs:70:18:70:20 | access to type Int32 |  |
+| Switch.cs:70:18:70:20 | access to type Int32 | Switch.cs:72:13:72:20 | case ...: | no-match |
+| Switch.cs:72:13:72:20 | case ...: | Switch.cs:72:18:72:19 | "" |  |
+| Switch.cs:72:18:72:19 | "" | Switch.cs:66:10:66:11 | exit M6 (normal) | no-match |
+| Switch.cs:72:18:72:19 | "" | Switch.cs:73:17:73:22 | break; | match |
+| Switch.cs:73:17:73:22 | break; | Switch.cs:66:10:66:11 | exit M6 (normal) | break |
+| Switch.cs:77:10:77:11 | enter M7 | Switch.cs:78:5:89:5 | {...} |  |
+| Switch.cs:77:10:77:11 | exit M7 (normal) | Switch.cs:77:10:77:11 | exit M7 |  |
+| Switch.cs:78:5:89:5 | {...} | Switch.cs:79:9:87:9 | switch (...) {...} |  |
+| Switch.cs:79:9:87:9 | switch (...) {...} | Switch.cs:79:17:79:17 | access to parameter i |  |
+| Switch.cs:79:17:79:17 | access to parameter i | Switch.cs:81:13:81:19 | case ...: |  |
+| Switch.cs:81:13:81:19 | case ...: | Switch.cs:81:18:81:18 | 1 |  |
+| Switch.cs:81:18:81:18 | 1 | Switch.cs:82:24:82:27 | true | match |
+| Switch.cs:81:18:81:18 | 1 | Switch.cs:83:13:83:19 | case ...: | no-match |
+| Switch.cs:82:17:82:28 | return ...; | Switch.cs:77:10:77:11 | exit M7 (normal) | return |
+| Switch.cs:82:24:82:27 | true | Switch.cs:82:17:82:28 | return ...; |  |
+| Switch.cs:83:13:83:19 | case ...: | Switch.cs:83:18:83:18 | 2 |  |
+| Switch.cs:83:18:83:18 | 2 | Switch.cs:84:17:85:26 | if (...) ... | match |
+| Switch.cs:83:18:83:18 | 2 | Switch.cs:88:16:88:20 | false | no-match |
+| Switch.cs:84:17:85:26 | if (...) ... | Switch.cs:84:21:84:21 | access to parameter j |  |
+| Switch.cs:84:21:84:21 | access to parameter j | Switch.cs:84:25:84:25 | 2 |  |
+| Switch.cs:84:21:84:25 | ... > ... | Switch.cs:85:21:85:26 | break; | true |
+| Switch.cs:84:21:84:25 | ... > ... | Switch.cs:86:24:86:27 | true | false |
+| Switch.cs:84:25:84:25 | 2 | Switch.cs:84:21:84:25 | ... > ... |  |
+| Switch.cs:85:21:85:26 | break; | Switch.cs:88:16:88:20 | false | break |
+| Switch.cs:86:17:86:28 | return ...; | Switch.cs:77:10:77:11 | exit M7 (normal) | return |
+| Switch.cs:86:24:86:27 | true | Switch.cs:86:17:86:28 | return ...; |  |
+| Switch.cs:88:9:88:21 | return ...; | Switch.cs:77:10:77:11 | exit M7 (normal) | return |
+| Switch.cs:88:16:88:20 | false | Switch.cs:88:9:88:21 | return ...; |  |
+| Switch.cs:91:10:91:11 | enter M8 | Switch.cs:92:5:99:5 | {...} |  |
+| Switch.cs:91:10:91:11 | exit M8 (normal) | Switch.cs:91:10:91:11 | exit M8 |  |
+| Switch.cs:92:5:99:5 | {...} | Switch.cs:93:9:97:9 | switch (...) {...} |  |
+| Switch.cs:93:9:97:9 | switch (...) {...} | Switch.cs:93:17:93:17 | access to parameter o |  |
+| Switch.cs:93:17:93:17 | access to parameter o | Switch.cs:95:13:95:23 | case ...: |  |
+| Switch.cs:95:13:95:23 | case ...: | Switch.cs:95:18:95:20 | access to type Int32 |  |
+| Switch.cs:95:18:95:20 | access to type Int32 | Switch.cs:96:24:96:27 | true | match |
+| Switch.cs:95:18:95:20 | access to type Int32 | Switch.cs:98:16:98:20 | false | no-match |
+| Switch.cs:96:17:96:28 | return ...; | Switch.cs:91:10:91:11 | exit M8 (normal) | return |
+| Switch.cs:96:24:96:27 | true | Switch.cs:96:17:96:28 | return ...; |  |
+| Switch.cs:98:9:98:21 | return ...; | Switch.cs:91:10:91:11 | exit M8 (normal) | return |
+| Switch.cs:98:16:98:20 | false | Switch.cs:98:9:98:21 | return ...; |  |
+| Switch.cs:101:9:101:10 | enter M9 | Switch.cs:102:5:109:5 | {...} |  |
+| Switch.cs:101:9:101:10 | exit M9 (normal) | Switch.cs:101:9:101:10 | exit M9 |  |
+| Switch.cs:102:5:109:5 | {...} | Switch.cs:103:9:107:9 | switch (...) {...} |  |
+| Switch.cs:103:9:107:9 | switch (...) {...} | Switch.cs:103:17:103:17 | access to parameter s |  |
+| Switch.cs:103:17:103:17 | access to parameter s | Switch.cs:103:17:103:25 | access to property Length | non-null |
+| Switch.cs:103:17:103:17 | access to parameter s | Switch.cs:105:13:105:19 | case ...: | null |
+| Switch.cs:103:17:103:25 | access to property Length | Switch.cs:105:13:105:19 | case ...: |  |
+| Switch.cs:105:13:105:19 | case ...: | Switch.cs:105:18:105:18 | 0 |  |
+| Switch.cs:105:18:105:18 | 0 | Switch.cs:105:28:105:28 | 0 | match |
+| Switch.cs:105:18:105:18 | 0 | Switch.cs:106:13:106:19 | case ...: | no-match |
+| Switch.cs:105:21:105:29 | return ...; | Switch.cs:101:9:101:10 | exit M9 (normal) | return |
+| Switch.cs:105:28:105:28 | 0 | Switch.cs:105:21:105:29 | return ...; |  |
+| Switch.cs:106:13:106:19 | case ...: | Switch.cs:106:18:106:18 | 1 |  |
+| Switch.cs:106:18:106:18 | 1 | Switch.cs:106:28:106:28 | 1 | match |
+| Switch.cs:106:18:106:18 | 1 | Switch.cs:108:17:108:17 | 1 | no-match |
+| Switch.cs:106:21:106:29 | return ...; | Switch.cs:101:9:101:10 | exit M9 (normal) | return |
+| Switch.cs:106:28:106:28 | 1 | Switch.cs:106:21:106:29 | return ...; |  |
+| Switch.cs:108:9:108:18 | return ...; | Switch.cs:101:9:101:10 | exit M9 (normal) | return |
+| Switch.cs:108:16:108:17 | -... | Switch.cs:108:9:108:18 | return ...; |  |
+| Switch.cs:108:17:108:17 | 1 | Switch.cs:108:16:108:17 | -... |  |
+| Switch.cs:111:17:111:21 | enter Throw | Switch.cs:111:34:111:48 | object creation of type Exception |  |
+| Switch.cs:111:17:111:21 | exit Throw (abnormal) | Switch.cs:111:17:111:21 | exit Throw |  |
+| Switch.cs:111:28:111:48 | throw ... | Switch.cs:111:17:111:21 | exit Throw (abnormal) | exception(Exception) |
+| Switch.cs:111:34:111:48 | object creation of type Exception | Switch.cs:111:28:111:48 | throw ... |  |
+| Switch.cs:113:9:113:11 | enter M10 | Switch.cs:114:5:121:5 | {...} |  |
+| Switch.cs:113:9:113:11 | exit M10 (normal) | Switch.cs:113:9:113:11 | exit M10 |  |
+| Switch.cs:114:5:121:5 | {...} | Switch.cs:115:9:119:9 | switch (...) {...} |  |
+| Switch.cs:115:9:119:9 | switch (...) {...} | Switch.cs:115:17:115:17 | access to parameter s |  |
+| Switch.cs:115:17:115:17 | access to parameter s | Switch.cs:115:17:115:24 | access to property Length |  |
+| Switch.cs:115:17:115:24 | access to property Length | Switch.cs:117:13:117:35 | case ...: |  |
+| Switch.cs:117:13:117:35 | case ...: | Switch.cs:117:18:117:18 | 3 |  |
+| Switch.cs:117:18:117:18 | 3 | Switch.cs:117:25:117:25 | access to parameter s | match |
+| Switch.cs:117:18:117:18 | 3 | Switch.cs:118:13:118:34 | case ...: | no-match |
+| Switch.cs:117:25:117:25 | access to parameter s | Switch.cs:117:30:117:34 | "foo" |  |
+| Switch.cs:117:25:117:34 | ... == ... | Switch.cs:117:44:117:44 | 1 | true |
+| Switch.cs:117:25:117:34 | ... == ... | Switch.cs:118:13:118:34 | case ...: | false |
+| Switch.cs:117:30:117:34 | "foo" | Switch.cs:117:25:117:34 | ... == ... |  |
+| Switch.cs:117:37:117:45 | return ...; | Switch.cs:113:9:113:11 | exit M10 (normal) | return |
+| Switch.cs:117:44:117:44 | 1 | Switch.cs:117:37:117:45 | return ...; |  |
+| Switch.cs:118:13:118:34 | case ...: | Switch.cs:118:18:118:18 | 2 |  |
+| Switch.cs:118:18:118:18 | 2 | Switch.cs:118:25:118:25 | access to parameter s | match |
+| Switch.cs:118:18:118:18 | 2 | Switch.cs:120:17:120:17 | 1 | no-match |
+| Switch.cs:118:25:118:25 | access to parameter s | Switch.cs:118:30:118:33 | "fu" |  |
+| Switch.cs:118:25:118:33 | ... == ... | Switch.cs:118:43:118:43 | 2 | true |
+| Switch.cs:118:25:118:33 | ... == ... | Switch.cs:120:17:120:17 | 1 | false |
+| Switch.cs:118:30:118:33 | "fu" | Switch.cs:118:25:118:33 | ... == ... |  |
+| Switch.cs:118:36:118:44 | return ...; | Switch.cs:113:9:113:11 | exit M10 (normal) | return |
+| Switch.cs:118:43:118:43 | 2 | Switch.cs:118:36:118:44 | return ...; |  |
+| Switch.cs:120:9:120:18 | return ...; | Switch.cs:113:9:113:11 | exit M10 (normal) | return |
+| Switch.cs:120:16:120:17 | -... | Switch.cs:120:9:120:18 | return ...; |  |
+| Switch.cs:120:17:120:17 | 1 | Switch.cs:120:16:120:17 | -... |  |
+| Switch.cs:123:10:123:12 | enter M11 | Switch.cs:124:5:127:5 | {...} |  |
+| Switch.cs:123:10:123:12 | exit M11 (normal) | Switch.cs:123:10:123:12 | exit M11 |  |
+| Switch.cs:124:5:127:5 | {...} | Switch.cs:125:9:126:19 | if (...) ... |  |
+| Switch.cs:125:9:126:19 | if (...) ... | Switch.cs:125:13:125:13 | access to parameter o |  |
+| Switch.cs:125:13:125:13 | access to parameter o | Switch.cs:125:24:125:29 | Boolean b |  |
+| Switch.cs:125:13:125:48 | [false] ... switch { ... } | Switch.cs:123:10:123:12 | exit M11 (normal) | false |
+| Switch.cs:125:13:125:48 | [true] ... switch { ... } | Switch.cs:126:13:126:19 | return ...; | true |
+| Switch.cs:125:24:125:29 | Boolean b | Switch.cs:125:34:125:34 | access to local variable b | match |
+| Switch.cs:125:24:125:29 | Boolean b | Switch.cs:125:37:125:37 | _ | no-match |
+| Switch.cs:125:24:125:34 | [false] ... => ... | Switch.cs:125:13:125:48 | [false] ... switch { ... } | false |
+| Switch.cs:125:24:125:34 | [true] ... => ... | Switch.cs:125:13:125:48 | [true] ... switch { ... } | true |
+| Switch.cs:125:34:125:34 | access to local variable b | Switch.cs:125:24:125:34 | [false] ... => ... | false |
+| Switch.cs:125:34:125:34 | access to local variable b | Switch.cs:125:24:125:34 | [true] ... => ... | true |
+| Switch.cs:125:37:125:37 | _ | Switch.cs:125:42:125:46 | false | match |
+| Switch.cs:125:37:125:46 | [false] ... => ... | Switch.cs:125:13:125:48 | [false] ... switch { ... } | false |
+| Switch.cs:125:42:125:46 | false | Switch.cs:125:37:125:46 | [false] ... => ... | false |
+| Switch.cs:126:13:126:19 | return ...; | Switch.cs:123:10:123:12 | exit M11 (normal) | return |
+| Switch.cs:129:12:129:14 | enter M12 | Switch.cs:130:5:132:5 | {...} |  |
+| Switch.cs:129:12:129:14 | exit M12 (normal) | Switch.cs:129:12:129:14 | exit M12 |  |
+| Switch.cs:130:5:132:5 | {...} | Switch.cs:131:17:131:17 | access to parameter o |  |
+| Switch.cs:131:9:131:67 | return ...; | Switch.cs:129:12:129:14 | exit M12 (normal) | return |
+| Switch.cs:131:16:131:66 | call to method ToString | Switch.cs:131:9:131:67 | return ...; |  |
+| Switch.cs:131:17:131:17 | access to parameter o | Switch.cs:131:28:131:35 | String s |  |
+| Switch.cs:131:17:131:53 | [non-null] ... switch { ... } | Switch.cs:131:16:131:66 | call to method ToString | non-null |
+| Switch.cs:131:17:131:53 | [null] ... switch { ... } | Switch.cs:131:9:131:67 | return ...; | null |
+| Switch.cs:131:28:131:35 | String s | Switch.cs:131:40:131:40 | access to local variable s | match |
+| Switch.cs:131:28:131:35 | String s | Switch.cs:131:43:131:43 | _ | no-match |
+| Switch.cs:131:28:131:40 | [non-null] ... => ... | Switch.cs:131:17:131:53 | [non-null] ... switch { ... } | non-null |
+| Switch.cs:131:28:131:40 | [null] ... => ... | Switch.cs:131:17:131:53 | [null] ... switch { ... } | null |
+| Switch.cs:131:40:131:40 | access to local variable s | Switch.cs:131:28:131:40 | [non-null] ... => ... | non-null |
+| Switch.cs:131:40:131:40 | access to local variable s | Switch.cs:131:28:131:40 | [null] ... => ... | null |
+| Switch.cs:131:43:131:43 | _ | Switch.cs:131:48:131:51 | null | match |
+| Switch.cs:131:43:131:51 | [null] ... => ... | Switch.cs:131:17:131:53 | [null] ... switch { ... } | null |
+| Switch.cs:131:48:131:51 | null | Switch.cs:131:43:131:51 | [null] ... => ... | null |
+| Switch.cs:134:9:134:11 | enter M13 | Switch.cs:135:5:142:5 | {...} |  |
+| Switch.cs:134:9:134:11 | exit M13 (normal) | Switch.cs:134:9:134:11 | exit M13 |  |
+| Switch.cs:135:5:142:5 | {...} | Switch.cs:136:9:141:9 | switch (...) {...} |  |
+| Switch.cs:136:9:141:9 | switch (...) {...} | Switch.cs:136:17:136:17 | access to parameter i |  |
+| Switch.cs:136:17:136:17 | access to parameter i | Switch.cs:139:13:139:19 | case ...: |  |
+| Switch.cs:138:13:138:20 | default: | Switch.cs:138:30:138:30 | 1 |  |
+| Switch.cs:138:22:138:31 | return ...; | Switch.cs:134:9:134:11 | exit M13 (normal) | return |
+| Switch.cs:138:29:138:30 | -... | Switch.cs:138:22:138:31 | return ...; |  |
+| Switch.cs:138:30:138:30 | 1 | Switch.cs:138:29:138:30 | -... |  |
+| Switch.cs:139:13:139:19 | case ...: | Switch.cs:139:18:139:18 | 1 |  |
+| Switch.cs:139:18:139:18 | 1 | Switch.cs:139:28:139:28 | 1 | match |
+| Switch.cs:139:18:139:18 | 1 | Switch.cs:140:13:140:19 | case ...: | no-match |
+| Switch.cs:139:21:139:29 | return ...; | Switch.cs:134:9:134:11 | exit M13 (normal) | return |
+| Switch.cs:139:28:139:28 | 1 | Switch.cs:139:21:139:29 | return ...; |  |
+| Switch.cs:140:13:140:19 | case ...: | Switch.cs:140:18:140:18 | 2 |  |
+| Switch.cs:140:18:140:18 | 2 | Switch.cs:138:13:138:20 | default: | no-match |
+| Switch.cs:140:18:140:18 | 2 | Switch.cs:140:28:140:28 | 2 | match |
+| Switch.cs:140:21:140:29 | return ...; | Switch.cs:134:9:134:11 | exit M13 (normal) | return |
+| Switch.cs:140:28:140:28 | 2 | Switch.cs:140:21:140:29 | return ...; |  |
+| Switch.cs:144:9:144:11 | enter M14 | Switch.cs:145:5:152:5 | {...} |  |
+| Switch.cs:144:9:144:11 | exit M14 (normal) | Switch.cs:144:9:144:11 | exit M14 |  |
+| Switch.cs:145:5:152:5 | {...} | Switch.cs:146:9:151:9 | switch (...) {...} |  |
+| Switch.cs:146:9:151:9 | switch (...) {...} | Switch.cs:146:17:146:17 | access to parameter i |  |
+| Switch.cs:146:17:146:17 | access to parameter i | Switch.cs:148:13:148:19 | case ...: |  |
+| Switch.cs:148:13:148:19 | case ...: | Switch.cs:148:18:148:18 | 1 |  |
+| Switch.cs:148:18:148:18 | 1 | Switch.cs:148:28:148:28 | 1 | match |
+| Switch.cs:148:18:148:18 | 1 | Switch.cs:150:13:150:19 | case ...: | no-match |
+| Switch.cs:148:21:148:29 | return ...; | Switch.cs:144:9:144:11 | exit M14 (normal) | return |
+| Switch.cs:148:28:148:28 | 1 | Switch.cs:148:21:148:29 | return ...; |  |
+| Switch.cs:149:13:149:20 | default: | Switch.cs:149:30:149:30 | 1 |  |
+| Switch.cs:149:22:149:31 | return ...; | Switch.cs:144:9:144:11 | exit M14 (normal) | return |
+| Switch.cs:149:29:149:30 | -... | Switch.cs:149:22:149:31 | return ...; |  |
+| Switch.cs:149:30:149:30 | 1 | Switch.cs:149:29:149:30 | -... |  |
+| Switch.cs:150:13:150:19 | case ...: | Switch.cs:150:18:150:18 | 2 |  |
+| Switch.cs:150:18:150:18 | 2 | Switch.cs:149:13:149:20 | default: | no-match |
+| Switch.cs:150:18:150:18 | 2 | Switch.cs:150:28:150:28 | 2 | match |
+| Switch.cs:150:21:150:29 | return ...; | Switch.cs:144:9:144:11 | exit M14 (normal) | return |
+| Switch.cs:150:28:150:28 | 2 | Switch.cs:150:21:150:29 | return ...; |  |
+| Switch.cs:154:10:154:12 | enter M15 | Switch.cs:155:5:161:5 | {...} |  |
+| Switch.cs:154:10:154:12 | exit M15 (abnormal) | Switch.cs:154:10:154:12 | exit M15 |  |
+| Switch.cs:154:10:154:12 | exit M15 (normal) | Switch.cs:154:10:154:12 | exit M15 |  |
+| Switch.cs:155:5:161:5 | {...} | Switch.cs:156:9:156:55 | ... ...; |  |
+| Switch.cs:156:9:156:55 | ... ...; | Switch.cs:156:17:156:17 | access to parameter b |  |
+| Switch.cs:156:13:156:54 | String s = ... | Switch.cs:157:9:160:49 | if (...) ... |  |
+| Switch.cs:156:17:156:17 | access to parameter b | Switch.cs:156:28:156:31 | true |  |
+| Switch.cs:156:17:156:54 | ... switch { ... } | Switch.cs:156:13:156:54 | String s = ... |  |
+| Switch.cs:156:28:156:31 | true | Switch.cs:156:36:156:38 | "a" | match |
+| Switch.cs:156:28:156:31 | true | Switch.cs:156:41:156:45 | false | no-match |
+| Switch.cs:156:28:156:38 | ... => ... | Switch.cs:156:17:156:54 | ... switch { ... } |  |
+| Switch.cs:156:36:156:38 | "a" | Switch.cs:156:28:156:38 | ... => ... |  |
+| Switch.cs:156:41:156:45 | false | Switch.cs:154:10:154:12 | exit M15 (abnormal) | exception(InvalidOperationException) |
+| Switch.cs:156:41:156:45 | false | Switch.cs:156:50:156:52 | "b" | match |
+| Switch.cs:156:41:156:52 | ... => ... | Switch.cs:156:17:156:54 | ... switch { ... } |  |
+| Switch.cs:156:50:156:52 | "b" | Switch.cs:156:41:156:52 | ... => ... |  |
+| Switch.cs:157:9:160:49 | if (...) ... | Switch.cs:157:13:157:13 | access to parameter b |  |
+| Switch.cs:157:13:157:13 | access to parameter b | Switch.cs:158:13:158:49 | ...; | true |
+| Switch.cs:157:13:157:13 | access to parameter b | Switch.cs:160:13:160:49 | ...; | false |
+| Switch.cs:158:13:158:48 | call to method WriteLine | Switch.cs:154:10:154:12 | exit M15 (normal) |  |
+| Switch.cs:158:13:158:49 | ...; | Switch.cs:158:40:158:43 | "a = " |  |
+| Switch.cs:158:38:158:47 | $"..." | Switch.cs:158:13:158:48 | call to method WriteLine |  |
+| Switch.cs:158:40:158:43 | "a = " | Switch.cs:158:45:158:45 | access to local variable s |  |
+| Switch.cs:158:45:158:45 | access to local variable s | Switch.cs:158:38:158:47 | $"..." |  |
+| Switch.cs:160:13:160:48 | call to method WriteLine | Switch.cs:154:10:154:12 | exit M15 (normal) |  |
+| Switch.cs:160:13:160:49 | ...; | Switch.cs:160:40:160:43 | "b = " |  |
+| Switch.cs:160:38:160:47 | $"..." | Switch.cs:160:13:160:48 | call to method WriteLine |  |
+| Switch.cs:160:40:160:43 | "b = " | Switch.cs:160:45:160:45 | access to local variable s |  |
+| Switch.cs:160:45:160:45 | access to local variable s | Switch.cs:160:38:160:47 | $"..." |  |
+| TypeAccesses.cs:1:7:1:18 | call to constructor Object | TypeAccesses.cs:1:7:1:18 | {...} |  |
+| TypeAccesses.cs:1:7:1:18 | enter TypeAccesses | TypeAccesses.cs:1:7:1:18 | call to constructor Object |  |
+| TypeAccesses.cs:1:7:1:18 | exit TypeAccesses (normal) | TypeAccesses.cs:1:7:1:18 | exit TypeAccesses |  |
+| TypeAccesses.cs:1:7:1:18 | {...} | TypeAccesses.cs:1:7:1:18 | exit TypeAccesses (normal) |  |
+| TypeAccesses.cs:3:10:3:10 | enter M | TypeAccesses.cs:4:5:9:5 | {...} |  |
+| TypeAccesses.cs:3:10:3:10 | exit M (normal) | TypeAccesses.cs:3:10:3:10 | exit M |  |
+| TypeAccesses.cs:4:5:9:5 | {...} | TypeAccesses.cs:5:9:5:26 | ... ...; |  |
+| TypeAccesses.cs:5:9:5:26 | ... ...; | TypeAccesses.cs:5:25:5:25 | access to parameter o |  |
+| TypeAccesses.cs:5:13:5:25 | String s = ... | TypeAccesses.cs:6:9:6:24 | ...; |  |
+| TypeAccesses.cs:5:17:5:25 | (...) ... | TypeAccesses.cs:5:13:5:25 | String s = ... |  |
+| TypeAccesses.cs:5:25:5:25 | access to parameter o | TypeAccesses.cs:5:17:5:25 | (...) ... |  |
+| TypeAccesses.cs:6:9:6:23 | ... = ... | TypeAccesses.cs:7:9:7:25 | if (...) ... |  |
+| TypeAccesses.cs:6:9:6:24 | ...; | TypeAccesses.cs:6:13:6:13 | access to parameter o |  |
+| TypeAccesses.cs:6:13:6:13 | access to parameter o | TypeAccesses.cs:6:13:6:23 | ... as ... |  |
+| TypeAccesses.cs:6:13:6:23 | ... as ... | TypeAccesses.cs:6:9:6:23 | ... = ... |  |
+| TypeAccesses.cs:7:9:7:25 | if (...) ... | TypeAccesses.cs:7:13:7:13 | access to parameter o |  |
+| TypeAccesses.cs:7:13:7:13 | access to parameter o | TypeAccesses.cs:7:18:7:22 | Int32 j |  |
+| TypeAccesses.cs:7:13:7:22 | [false] ... is ... | TypeAccesses.cs:8:9:8:28 | ... ...; | false |
+| TypeAccesses.cs:7:13:7:22 | [true] ... is ... | TypeAccesses.cs:7:25:7:25 | ; | true |
+| TypeAccesses.cs:7:18:7:22 | Int32 j | TypeAccesses.cs:7:13:7:22 | [false] ... is ... | no-match |
+| TypeAccesses.cs:7:18:7:22 | Int32 j | TypeAccesses.cs:7:13:7:22 | [true] ... is ... | match |
+| TypeAccesses.cs:7:25:7:25 | ; | TypeAccesses.cs:8:9:8:28 | ... ...; |  |
+| TypeAccesses.cs:8:9:8:28 | ... ...; | TypeAccesses.cs:8:17:8:27 | typeof(...) |  |
+| TypeAccesses.cs:8:13:8:27 | Type t = ... | TypeAccesses.cs:3:10:3:10 | exit M (normal) |  |
+| TypeAccesses.cs:8:17:8:27 | typeof(...) | TypeAccesses.cs:8:13:8:27 | Type t = ... |  |
+| VarDecls.cs:3:7:3:14 | call to constructor Object | VarDecls.cs:3:7:3:14 | {...} |  |
+| VarDecls.cs:3:7:3:14 | enter VarDecls | VarDecls.cs:3:7:3:14 | call to constructor Object |  |
+| VarDecls.cs:3:7:3:14 | exit VarDecls (normal) | VarDecls.cs:3:7:3:14 | exit VarDecls |  |
+| VarDecls.cs:3:7:3:14 | {...} | VarDecls.cs:3:7:3:14 | exit VarDecls (normal) |  |
+| VarDecls.cs:5:18:5:19 | enter M1 | VarDecls.cs:6:5:11:5 | {...} |  |
+| VarDecls.cs:5:18:5:19 | exit M1 (normal) | VarDecls.cs:5:18:5:19 | exit M1 |  |
+| VarDecls.cs:6:5:11:5 | {...} | VarDecls.cs:7:9:10:9 | fixed(...) { ... } |  |
+| VarDecls.cs:7:9:10:9 | fixed(...) { ... } | VarDecls.cs:7:27:7:33 | access to parameter strings |  |
+| VarDecls.cs:7:22:7:36 | Char* c1 = ... | VarDecls.cs:7:44:7:50 | access to parameter strings |  |
+| VarDecls.cs:7:27:7:33 | access to parameter strings | VarDecls.cs:7:35:7:35 | 0 |  |
+| VarDecls.cs:7:27:7:36 | (...) ... | VarDecls.cs:7:22:7:36 | Char* c1 = ... |  |
+| VarDecls.cs:7:27:7:36 | access to array element | VarDecls.cs:7:27:7:36 | (...) ... |  |
+| VarDecls.cs:7:35:7:35 | 0 | VarDecls.cs:7:27:7:36 | access to array element |  |
+| VarDecls.cs:7:39:7:53 | Char* c2 = ... | VarDecls.cs:8:9:10:9 | {...} |  |
+| VarDecls.cs:7:44:7:50 | access to parameter strings | VarDecls.cs:7:52:7:52 | 1 |  |
+| VarDecls.cs:7:44:7:53 | (...) ... | VarDecls.cs:7:39:7:53 | Char* c2 = ... |  |
+| VarDecls.cs:7:44:7:53 | access to array element | VarDecls.cs:7:44:7:53 | (...) ... |  |
+| VarDecls.cs:7:52:7:52 | 1 | VarDecls.cs:7:44:7:53 | access to array element |  |
+| VarDecls.cs:8:9:10:9 | {...} | VarDecls.cs:9:27:9:28 | access to local variable c1 |  |
+| VarDecls.cs:9:13:9:29 | return ...; | VarDecls.cs:5:18:5:19 | exit M1 (normal) | return |
+| VarDecls.cs:9:20:9:28 | (...) ... | VarDecls.cs:9:13:9:29 | return ...; |  |
+| VarDecls.cs:9:27:9:28 | access to local variable c1 | VarDecls.cs:9:20:9:28 | (...) ... |  |
+| VarDecls.cs:13:12:13:13 | enter M2 | VarDecls.cs:14:5:17:5 | {...} |  |
+| VarDecls.cs:13:12:13:13 | exit M2 (normal) | VarDecls.cs:13:12:13:13 | exit M2 |  |
+| VarDecls.cs:14:5:17:5 | {...} | VarDecls.cs:15:9:15:30 | ... ...; |  |
+| VarDecls.cs:15:9:15:30 | ... ...; | VarDecls.cs:15:21:15:21 | access to parameter s |  |
+| VarDecls.cs:15:16:15:21 | String s1 = ... | VarDecls.cs:15:29:15:29 | access to parameter s |  |
+| VarDecls.cs:15:21:15:21 | access to parameter s | VarDecls.cs:15:16:15:21 | String s1 = ... |  |
+| VarDecls.cs:15:24:15:29 | String s2 = ... | VarDecls.cs:16:16:16:17 | access to local variable s1 |  |
+| VarDecls.cs:15:29:15:29 | access to parameter s | VarDecls.cs:15:24:15:29 | String s2 = ... |  |
+| VarDecls.cs:16:9:16:23 | return ...; | VarDecls.cs:13:12:13:13 | exit M2 (normal) | return |
+| VarDecls.cs:16:16:16:17 | access to local variable s1 | VarDecls.cs:16:21:16:22 | access to local variable s2 |  |
+| VarDecls.cs:16:16:16:22 | ... + ... | VarDecls.cs:16:9:16:23 | return ...; |  |
+| VarDecls.cs:16:21:16:22 | access to local variable s2 | VarDecls.cs:16:16:16:22 | ... + ... |  |
+| VarDecls.cs:19:7:19:8 | enter M3 | VarDecls.cs:20:5:26:5 | {...} |  |
+| VarDecls.cs:19:7:19:8 | exit M3 (normal) | VarDecls.cs:19:7:19:8 | exit M3 |  |
+| VarDecls.cs:20:5:26:5 | {...} | VarDecls.cs:21:9:22:13 | using (...) {...} |  |
+| VarDecls.cs:21:9:22:13 | using (...) {...} | VarDecls.cs:21:16:21:22 | object creation of type C |  |
+| VarDecls.cs:21:16:21:22 | object creation of type C | VarDecls.cs:22:13:22:13 | ; |  |
+| VarDecls.cs:22:13:22:13 | ; | VarDecls.cs:24:9:25:29 | using (...) {...} |  |
+| VarDecls.cs:24:9:25:29 | using (...) {...} | VarDecls.cs:24:22:24:28 | object creation of type C |  |
+| VarDecls.cs:24:18:24:28 | C x = ... | VarDecls.cs:24:35:24:41 | object creation of type C |  |
+| VarDecls.cs:24:22:24:28 | object creation of type C | VarDecls.cs:24:18:24:28 | C x = ... |  |
+| VarDecls.cs:24:31:24:41 | C y = ... | VarDecls.cs:25:20:25:20 | access to parameter b |  |
+| VarDecls.cs:24:35:24:41 | object creation of type C | VarDecls.cs:24:31:24:41 | C y = ... |  |
+| VarDecls.cs:25:13:25:29 | return ...; | VarDecls.cs:19:7:19:8 | exit M3 (normal) | return |
+| VarDecls.cs:25:20:25:20 | access to parameter b | VarDecls.cs:25:24:25:24 | access to local variable x | true |
+| VarDecls.cs:25:20:25:20 | access to parameter b | VarDecls.cs:25:28:25:28 | access to local variable y | false |
+| VarDecls.cs:25:20:25:28 | ... ? ... : ... | VarDecls.cs:25:13:25:29 | return ...; |  |
+| VarDecls.cs:25:24:25:24 | access to local variable x | VarDecls.cs:25:20:25:28 | ... ? ... : ... |  |
+| VarDecls.cs:25:28:25:28 | access to local variable y | VarDecls.cs:25:20:25:28 | ... ? ... : ... |  |
+| VarDecls.cs:28:11:28:11 | call to constructor Object | VarDecls.cs:28:11:28:11 | {...} |  |
+| VarDecls.cs:28:11:28:11 | enter C | VarDecls.cs:28:11:28:11 | call to constructor Object |  |
+| VarDecls.cs:28:11:28:11 | exit C (normal) | VarDecls.cs:28:11:28:11 | exit C |  |
+| VarDecls.cs:28:11:28:11 | {...} | VarDecls.cs:28:11:28:11 | exit C (normal) |  |
+| VarDecls.cs:28:41:28:47 | enter Dispose | VarDecls.cs:28:51:28:53 | {...} |  |
+| VarDecls.cs:28:41:28:47 | exit Dispose (normal) | VarDecls.cs:28:41:28:47 | exit Dispose |  |
+| VarDecls.cs:28:51:28:53 | {...} | VarDecls.cs:28:41:28:47 | exit Dispose (normal) |  |
+| cflow.cs:5:17:5:20 | enter Main | cflow.cs:6:5:35:5 | {...} |  |
+| cflow.cs:5:17:5:20 | exit Main (normal) | cflow.cs:5:17:5:20 | exit Main |  |
+| cflow.cs:6:5:35:5 | {...} | cflow.cs:7:9:7:28 | ... ...; |  |
+| cflow.cs:7:9:7:28 | ... ...; | cflow.cs:7:17:7:20 | access to parameter args |  |
+| cflow.cs:7:13:7:27 | Int32 a = ... | cflow.cs:9:9:9:40 | ...; |  |
+| cflow.cs:7:17:7:20 | access to parameter args | cflow.cs:7:17:7:27 | access to property Length |  |
+| cflow.cs:7:17:7:27 | access to property Length | cflow.cs:7:13:7:27 | Int32 a = ... |  |
+| cflow.cs:9:9:9:39 | ... = ... | cflow.cs:11:9:12:49 | if (...) ... |  |
+| cflow.cs:9:9:9:40 | ...; | cflow.cs:9:13:9:29 | object creation of type ControlFlow |  |
+| cflow.cs:9:13:9:29 | object creation of type ControlFlow | cflow.cs:9:38:9:38 | access to local variable a |  |
+| cflow.cs:9:13:9:39 | call to method Switch | cflow.cs:9:9:9:39 | ... = ... |  |
+| cflow.cs:9:38:9:38 | access to local variable a | cflow.cs:9:13:9:39 | call to method Switch |  |
+| cflow.cs:11:9:12:49 | if (...) ... | cflow.cs:11:13:11:13 | access to local variable a |  |
+| cflow.cs:11:13:11:13 | access to local variable a | cflow.cs:11:17:11:17 | 3 |  |
+| cflow.cs:11:13:11:17 | ... > ... | cflow.cs:12:13:12:49 | ...; | true |
+| cflow.cs:11:13:11:17 | ... > ... | cflow.cs:14:9:17:9 | while (...) ... | false |
+| cflow.cs:11:17:11:17 | 3 | cflow.cs:11:13:11:17 | ... > ... |  |
+| cflow.cs:12:13:12:48 | call to method WriteLine | cflow.cs:14:9:17:9 | while (...) ... |  |
+| cflow.cs:12:13:12:49 | ...; | cflow.cs:12:31:12:47 | "more than a few" |  |
+| cflow.cs:12:31:12:47 | "more than a few" | cflow.cs:12:13:12:48 | call to method WriteLine |  |
+| cflow.cs:14:9:17:9 | while (...) ... | cflow.cs:14:16:14:16 | access to local variable a |  |
+| cflow.cs:14:16:14:16 | access to local variable a | cflow.cs:14:20:14:20 | 0 |  |
+| cflow.cs:14:16:14:20 | ... > ... | cflow.cs:15:9:17:9 | {...} | true |
+| cflow.cs:14:16:14:20 | ... > ... | cflow.cs:19:9:22:25 | do ... while (...); | false |
+| cflow.cs:14:20:14:20 | 0 | cflow.cs:14:16:14:20 | ... > ... |  |
+| cflow.cs:15:9:17:9 | {...} | cflow.cs:16:13:16:41 | ...; |  |
+| cflow.cs:16:13:16:40 | call to method WriteLine | cflow.cs:14:16:14:16 | access to local variable a |  |
+| cflow.cs:16:13:16:41 | ...; | cflow.cs:16:31:16:31 | access to local variable a |  |
+| cflow.cs:16:31:16:31 | access to local variable a | cflow.cs:16:31:16:33 | ...-- |  |
+| cflow.cs:16:31:16:33 | ...-- | cflow.cs:16:37:16:39 | 100 |  |
+| cflow.cs:16:31:16:39 | ... * ... | cflow.cs:16:13:16:40 | call to method WriteLine |  |
+| cflow.cs:16:37:16:39 | 100 | cflow.cs:16:31:16:39 | ... * ... |  |
+| cflow.cs:19:9:22:25 | do ... while (...); | cflow.cs:20:9:22:9 | {...} |  |
+| cflow.cs:20:9:22:9 | {...} | cflow.cs:21:13:21:36 | ...; |  |
+| cflow.cs:21:13:21:35 | call to method WriteLine | cflow.cs:22:18:22:18 | access to local variable a |  |
+| cflow.cs:21:13:21:36 | ...; | cflow.cs:21:32:21:32 | access to local variable a |  |
+| cflow.cs:21:31:21:34 | -... | cflow.cs:21:13:21:35 | call to method WriteLine |  |
+| cflow.cs:21:32:21:32 | access to local variable a | cflow.cs:21:32:21:34 | ...++ |  |
+| cflow.cs:21:32:21:34 | ...++ | cflow.cs:21:31:21:34 | -... |  |
+| cflow.cs:22:18:22:18 | access to local variable a | cflow.cs:22:22:22:23 | 10 |  |
+| cflow.cs:22:18:22:23 | ... < ... | cflow.cs:20:9:22:9 | {...} | true |
+| cflow.cs:22:18:22:23 | ... < ... | cflow.cs:24:9:34:9 | for (...;...;...) ... | false |
+| cflow.cs:22:22:22:23 | 10 | cflow.cs:22:18:22:23 | ... < ... |  |
+| cflow.cs:24:9:34:9 | for (...;...;...) ... | cflow.cs:24:22:24:22 | 1 |  |
+| cflow.cs:24:18:24:22 | Int32 i = ... | cflow.cs:24:25:24:25 | access to local variable i |  |
+| cflow.cs:24:22:24:22 | 1 | cflow.cs:24:18:24:22 | Int32 i = ... |  |
+| cflow.cs:24:25:24:25 | access to local variable i | cflow.cs:24:30:24:31 | 20 |  |
+| cflow.cs:24:25:24:31 | ... <= ... | cflow.cs:5:17:5:20 | exit Main (normal) | false |
+| cflow.cs:24:25:24:31 | ... <= ... | cflow.cs:25:9:34:9 | {...} | true |
+| cflow.cs:24:30:24:31 | 20 | cflow.cs:24:25:24:31 | ... <= ... |  |
+| cflow.cs:24:34:24:34 | access to local variable i | cflow.cs:24:34:24:36 | ...++ |  |
+| cflow.cs:24:34:24:36 | ...++ | cflow.cs:24:25:24:25 | access to local variable i |  |
+| cflow.cs:25:9:34:9 | {...} | cflow.cs:26:13:33:37 | if (...) ... |  |
+| cflow.cs:26:13:33:37 | if (...) ... | cflow.cs:26:17:26:17 | access to local variable i |  |
+| cflow.cs:26:17:26:17 | access to local variable i | cflow.cs:26:21:26:21 | 3 |  |
+| cflow.cs:26:17:26:21 | ... % ... | cflow.cs:26:26:26:26 | 0 |  |
+| cflow.cs:26:17:26:26 | ... == ... | cflow.cs:26:17:26:40 | [false] ... && ... | false |
+| cflow.cs:26:17:26:26 | ... == ... | cflow.cs:26:31:26:31 | access to local variable i | true |
+| cflow.cs:26:17:26:40 | [false] ... && ... | cflow.cs:28:18:33:37 | if (...) ... | false |
+| cflow.cs:26:17:26:40 | [true] ... && ... | cflow.cs:27:17:27:46 | ...; | true |
+| cflow.cs:26:21:26:21 | 3 | cflow.cs:26:17:26:21 | ... % ... |  |
+| cflow.cs:26:26:26:26 | 0 | cflow.cs:26:17:26:26 | ... == ... |  |
+| cflow.cs:26:31:26:31 | access to local variable i | cflow.cs:26:35:26:35 | 5 |  |
+| cflow.cs:26:31:26:35 | ... % ... | cflow.cs:26:40:26:40 | 0 |  |
+| cflow.cs:26:31:26:40 | ... == ... | cflow.cs:26:17:26:40 | [false] ... && ... | false |
+| cflow.cs:26:31:26:40 | ... == ... | cflow.cs:26:17:26:40 | [true] ... && ... | true |
+| cflow.cs:26:35:26:35 | 5 | cflow.cs:26:31:26:35 | ... % ... |  |
+| cflow.cs:26:40:26:40 | 0 | cflow.cs:26:31:26:40 | ... == ... |  |
+| cflow.cs:27:17:27:45 | call to method WriteLine | cflow.cs:24:34:24:34 | access to local variable i |  |
+| cflow.cs:27:17:27:46 | ...; | cflow.cs:27:35:27:44 | "FizzBuzz" |  |
+| cflow.cs:27:35:27:44 | "FizzBuzz" | cflow.cs:27:17:27:45 | call to method WriteLine |  |
+| cflow.cs:28:18:33:37 | if (...) ... | cflow.cs:28:22:28:22 | access to local variable i |  |
+| cflow.cs:28:22:28:22 | access to local variable i | cflow.cs:28:26:28:26 | 3 |  |
+| cflow.cs:28:22:28:26 | ... % ... | cflow.cs:28:31:28:31 | 0 |  |
+| cflow.cs:28:22:28:31 | ... == ... | cflow.cs:29:17:29:42 | ...; | true |
+| cflow.cs:28:22:28:31 | ... == ... | cflow.cs:30:18:33:37 | if (...) ... | false |
+| cflow.cs:28:26:28:26 | 3 | cflow.cs:28:22:28:26 | ... % ... |  |
+| cflow.cs:28:31:28:31 | 0 | cflow.cs:28:22:28:31 | ... == ... |  |
+| cflow.cs:29:17:29:41 | call to method WriteLine | cflow.cs:24:34:24:34 | access to local variable i |  |
+| cflow.cs:29:17:29:42 | ...; | cflow.cs:29:35:29:40 | "Fizz" |  |
+| cflow.cs:29:35:29:40 | "Fizz" | cflow.cs:29:17:29:41 | call to method WriteLine |  |
+| cflow.cs:30:18:33:37 | if (...) ... | cflow.cs:30:22:30:22 | access to local variable i |  |
+| cflow.cs:30:22:30:22 | access to local variable i | cflow.cs:30:26:30:26 | 5 |  |
+| cflow.cs:30:22:30:26 | ... % ... | cflow.cs:30:31:30:31 | 0 |  |
+| cflow.cs:30:22:30:31 | ... == ... | cflow.cs:31:17:31:42 | ...; | true |
+| cflow.cs:30:22:30:31 | ... == ... | cflow.cs:33:17:33:37 | ...; | false |
+| cflow.cs:30:26:30:26 | 5 | cflow.cs:30:22:30:26 | ... % ... |  |
+| cflow.cs:30:31:30:31 | 0 | cflow.cs:30:22:30:31 | ... == ... |  |
+| cflow.cs:31:17:31:41 | call to method WriteLine | cflow.cs:24:34:24:34 | access to local variable i |  |
+| cflow.cs:31:17:31:42 | ...; | cflow.cs:31:35:31:40 | "Buzz" |  |
+| cflow.cs:31:35:31:40 | "Buzz" | cflow.cs:31:17:31:41 | call to method WriteLine |  |
+| cflow.cs:33:17:33:36 | call to method WriteLine | cflow.cs:24:34:24:34 | access to local variable i |  |
+| cflow.cs:33:17:33:37 | ...; | cflow.cs:33:35:33:35 | access to local variable i |  |
+| cflow.cs:33:35:33:35 | access to local variable i | cflow.cs:33:17:33:36 | call to method WriteLine |  |
+| cflow.cs:37:17:37:22 | enter Switch | cflow.cs:38:5:68:5 | {...} |  |
+| cflow.cs:37:17:37:22 | exit Switch (abnormal) | cflow.cs:37:17:37:22 | exit Switch |  |
+| cflow.cs:37:17:37:22 | exit Switch (normal) | cflow.cs:37:17:37:22 | exit Switch |  |
+| cflow.cs:38:5:68:5 | {...} | cflow.cs:39:9:50:9 | switch (...) {...} |  |
+| cflow.cs:39:9:50:9 | switch (...) {...} | cflow.cs:39:17:39:17 | access to parameter a |  |
+| cflow.cs:39:17:39:17 | access to parameter a | cflow.cs:41:13:41:19 | case ...: |  |
+| cflow.cs:41:13:41:19 | case ...: | cflow.cs:41:18:41:18 | 1 |  |
+| cflow.cs:41:18:41:18 | 1 | cflow.cs:42:17:42:39 | ...; | match |
+| cflow.cs:41:18:41:18 | 1 | cflow.cs:44:13:44:19 | case ...: | no-match |
+| cflow.cs:42:17:42:38 | call to method WriteLine | cflow.cs:43:27:43:27 | 2 |  |
+| cflow.cs:42:17:42:39 | ...; | cflow.cs:42:35:42:37 | "1" |  |
+| cflow.cs:42:35:42:37 | "1" | cflow.cs:42:17:42:38 | call to method WriteLine |  |
+| cflow.cs:43:17:43:28 | goto case ...; | cflow.cs:44:13:44:19 | case ...: | goto(2) |
+| cflow.cs:43:27:43:27 | 2 | cflow.cs:43:17:43:28 | goto case ...; |  |
+| cflow.cs:44:13:44:19 | case ...: | cflow.cs:44:18:44:18 | 2 |  |
+| cflow.cs:44:18:44:18 | 2 | cflow.cs:45:17:45:39 | ...; | match |
+| cflow.cs:44:18:44:18 | 2 | cflow.cs:47:13:47:19 | case ...: | no-match |
+| cflow.cs:45:17:45:38 | call to method WriteLine | cflow.cs:46:27:46:27 | 1 |  |
+| cflow.cs:45:17:45:39 | ...; | cflow.cs:45:35:45:37 | "2" |  |
+| cflow.cs:45:35:45:37 | "2" | cflow.cs:45:17:45:38 | call to method WriteLine |  |
+| cflow.cs:46:17:46:28 | goto case ...; | cflow.cs:41:13:41:19 | case ...: | goto(1) |
+| cflow.cs:46:27:46:27 | 1 | cflow.cs:46:17:46:28 | goto case ...; |  |
+| cflow.cs:47:13:47:19 | case ...: | cflow.cs:47:18:47:18 | 3 |  |
+| cflow.cs:47:18:47:18 | 3 | cflow.cs:48:17:48:39 | ...; | match |
+| cflow.cs:47:18:47:18 | 3 | cflow.cs:51:9:59:9 | switch (...) {...} | no-match |
+| cflow.cs:48:17:48:38 | call to method WriteLine | cflow.cs:49:17:49:22 | break; |  |
+| cflow.cs:48:17:48:39 | ...; | cflow.cs:48:35:48:37 | "3" |  |
+| cflow.cs:48:35:48:37 | "3" | cflow.cs:48:17:48:38 | call to method WriteLine |  |
+| cflow.cs:49:17:49:22 | break; | cflow.cs:51:9:59:9 | switch (...) {...} | break |
+| cflow.cs:51:9:59:9 | switch (...) {...} | cflow.cs:51:17:51:17 | access to parameter a |  |
+| cflow.cs:51:17:51:17 | access to parameter a | cflow.cs:53:13:53:20 | case ...: |  |
+| cflow.cs:53:13:53:20 | case ...: | cflow.cs:53:18:53:19 | 42 |  |
+| cflow.cs:53:18:53:19 | 42 | cflow.cs:54:17:54:48 | ...; | match |
+| cflow.cs:53:18:53:19 | 42 | cflow.cs:56:13:56:20 | default: | no-match |
+| cflow.cs:54:17:54:47 | call to method WriteLine | cflow.cs:55:17:55:22 | break; |  |
+| cflow.cs:54:17:54:48 | ...; | cflow.cs:54:35:54:46 | "The answer" |  |
+| cflow.cs:54:35:54:46 | "The answer" | cflow.cs:54:17:54:47 | call to method WriteLine |  |
+| cflow.cs:55:17:55:22 | break; | cflow.cs:60:9:66:9 | switch (...) {...} | break |
+| cflow.cs:56:13:56:20 | default: | cflow.cs:57:17:57:52 | ...; |  |
+| cflow.cs:57:17:57:51 | call to method WriteLine | cflow.cs:58:17:58:22 | break; |  |
+| cflow.cs:57:17:57:52 | ...; | cflow.cs:57:35:57:50 | "Not the answer" |  |
+| cflow.cs:57:35:57:50 | "Not the answer" | cflow.cs:57:17:57:51 | call to method WriteLine |  |
+| cflow.cs:58:17:58:22 | break; | cflow.cs:60:9:66:9 | switch (...) {...} | break |
+| cflow.cs:60:9:66:9 | switch (...) {...} | cflow.cs:60:27:60:31 | this access |  |
+| cflow.cs:60:17:60:32 | call to method Parse | cflow.cs:62:13:62:19 | case ...: |  |
+| cflow.cs:60:27:60:31 | access to field Field | cflow.cs:60:17:60:32 | call to method Parse |  |
+| cflow.cs:60:27:60:31 | this access | cflow.cs:60:27:60:31 | access to field Field |  |
+| cflow.cs:62:13:62:19 | case ...: | cflow.cs:62:18:62:18 | 0 |  |
+| cflow.cs:62:18:62:18 | 0 | cflow.cs:63:17:64:55 | if (...) ... | match |
+| cflow.cs:62:18:62:18 | 0 | cflow.cs:67:16:67:16 | access to parameter a | no-match |
+| cflow.cs:63:17:64:55 | if (...) ... | cflow.cs:63:23:63:27 | this access |  |
+| cflow.cs:63:21:63:34 | [false] !... | cflow.cs:65:17:65:22 | break; | false |
+| cflow.cs:63:21:63:34 | [true] !... | cflow.cs:64:27:64:54 | object creation of type NullReferenceException | true |
+| cflow.cs:63:23:63:27 | access to field Field | cflow.cs:63:32:63:33 | "" |  |
+| cflow.cs:63:23:63:27 | this access | cflow.cs:63:23:63:27 | access to field Field |  |
+| cflow.cs:63:23:63:33 | ... == ... | cflow.cs:63:21:63:34 | [false] !... | true |
+| cflow.cs:63:23:63:33 | ... == ... | cflow.cs:63:21:63:34 | [true] !... | false |
+| cflow.cs:63:32:63:33 | "" | cflow.cs:63:23:63:33 | ... == ... |  |
+| cflow.cs:64:21:64:55 | throw ...; | cflow.cs:37:17:37:22 | exit Switch (abnormal) | exception(NullReferenceException) |
+| cflow.cs:64:27:64:54 | object creation of type NullReferenceException | cflow.cs:64:21:64:55 | throw ...; |  |
+| cflow.cs:65:17:65:22 | break; | cflow.cs:67:16:67:16 | access to parameter a | break |
+| cflow.cs:67:9:67:17 | return ...; | cflow.cs:37:17:37:22 | exit Switch (normal) | return |
+| cflow.cs:67:16:67:16 | access to parameter a | cflow.cs:67:9:67:17 | return ...; |  |
+| cflow.cs:70:18:70:18 | enter M | cflow.cs:71:5:82:5 | {...} |  |
+| cflow.cs:70:18:70:18 | exit M (normal) | cflow.cs:70:18:70:18 | exit M |  |
+| cflow.cs:71:5:82:5 | {...} | cflow.cs:72:9:73:19 | if (...) ... |  |
+| cflow.cs:72:9:73:19 | if (...) ... | cflow.cs:72:13:72:13 | access to parameter s |  |
+| cflow.cs:72:13:72:13 | access to parameter s | cflow.cs:72:18:72:21 | null |  |
+| cflow.cs:72:13:72:21 | ... == ... | cflow.cs:73:13:73:19 | return ...; | true |
+| cflow.cs:72:13:72:21 | ... == ... | cflow.cs:74:9:81:9 | if (...) ... | false |
+| cflow.cs:72:18:72:21 | null | cflow.cs:72:13:72:21 | ... == ... |  |
+| cflow.cs:73:13:73:19 | return ...; | cflow.cs:70:18:70:18 | exit M (normal) | return |
+| cflow.cs:74:9:81:9 | if (...) ... | cflow.cs:74:13:74:13 | access to parameter s |  |
+| cflow.cs:74:13:74:13 | access to parameter s | cflow.cs:74:13:74:20 | access to property Length |  |
+| cflow.cs:74:13:74:20 | access to property Length | cflow.cs:74:24:74:24 | 0 |  |
+| cflow.cs:74:13:74:24 | ... > ... | cflow.cs:75:9:77:9 | {...} | true |
+| cflow.cs:74:13:74:24 | ... > ... | cflow.cs:79:9:81:9 | {...} | false |
+| cflow.cs:74:24:74:24 | 0 | cflow.cs:74:13:74:24 | ... > ... |  |
+| cflow.cs:75:9:77:9 | {...} | cflow.cs:76:13:76:33 | ...; |  |
+| cflow.cs:76:13:76:32 | call to method WriteLine | cflow.cs:70:18:70:18 | exit M (normal) |  |
+| cflow.cs:76:13:76:33 | ...; | cflow.cs:76:31:76:31 | access to parameter s |  |
+| cflow.cs:76:31:76:31 | access to parameter s | cflow.cs:76:13:76:32 | call to method WriteLine |  |
+| cflow.cs:79:9:81:9 | {...} | cflow.cs:80:13:80:48 | ...; |  |
+| cflow.cs:80:13:80:47 | call to method WriteLine | cflow.cs:70:18:70:18 | exit M (normal) |  |
+| cflow.cs:80:13:80:48 | ...; | cflow.cs:80:31:80:46 | "<empty string>" |  |
+| cflow.cs:80:31:80:46 | "<empty string>" | cflow.cs:80:13:80:47 | call to method WriteLine |  |
+| cflow.cs:84:18:84:19 | enter M2 | cflow.cs:85:5:88:5 | {...} |  |
+| cflow.cs:84:18:84:19 | exit M2 (normal) | cflow.cs:84:18:84:19 | exit M2 |  |
+| cflow.cs:85:5:88:5 | {...} | cflow.cs:86:9:87:33 | if (...) ... |  |
+| cflow.cs:86:9:87:33 | if (...) ... | cflow.cs:86:13:86:13 | access to parameter s |  |
+| cflow.cs:86:13:86:13 | access to parameter s | cflow.cs:86:18:86:21 | null |  |
+| cflow.cs:86:13:86:21 | ... != ... | cflow.cs:86:13:86:37 | [false] ... && ... | false |
+| cflow.cs:86:13:86:21 | ... != ... | cflow.cs:86:26:86:26 | access to parameter s | true |
+| cflow.cs:86:13:86:37 | [false] ... && ... | cflow.cs:84:18:84:19 | exit M2 (normal) | false |
+| cflow.cs:86:13:86:37 | [true] ... && ... | cflow.cs:87:13:87:33 | ...; | true |
+| cflow.cs:86:18:86:21 | null | cflow.cs:86:13:86:21 | ... != ... |  |
+| cflow.cs:86:26:86:26 | access to parameter s | cflow.cs:86:26:86:33 | access to property Length |  |
+| cflow.cs:86:26:86:33 | access to property Length | cflow.cs:86:37:86:37 | 0 |  |
+| cflow.cs:86:26:86:37 | ... > ... | cflow.cs:86:13:86:37 | [false] ... && ... | false |
+| cflow.cs:86:26:86:37 | ... > ... | cflow.cs:86:13:86:37 | [true] ... && ... | true |
+| cflow.cs:86:37:86:37 | 0 | cflow.cs:86:26:86:37 | ... > ... |  |
+| cflow.cs:87:13:87:32 | call to method WriteLine | cflow.cs:84:18:84:19 | exit M2 (normal) |  |
+| cflow.cs:87:13:87:33 | ...; | cflow.cs:87:31:87:31 | access to parameter s |  |
+| cflow.cs:87:31:87:31 | access to parameter s | cflow.cs:87:13:87:32 | call to method WriteLine |  |
+| cflow.cs:90:18:90:19 | enter M3 | cflow.cs:91:5:104:5 | {...} |  |
+| cflow.cs:90:18:90:19 | exit M3 (abnormal) | cflow.cs:90:18:90:19 | exit M3 |  |
+| cflow.cs:90:18:90:19 | exit M3 (normal) | cflow.cs:90:18:90:19 | exit M3 |  |
+| cflow.cs:91:5:104:5 | {...} | cflow.cs:92:9:93:49 | if (...) ... |  |
+| cflow.cs:92:9:93:49 | if (...) ... | cflow.cs:92:20:92:20 | access to parameter s |  |
+| cflow.cs:92:13:92:27 | call to method Equals | cflow.cs:93:45:93:47 | "s" | true |
+| cflow.cs:92:13:92:27 | call to method Equals | cflow.cs:94:9:94:29 | ...; | false |
+| cflow.cs:92:20:92:20 | access to parameter s | cflow.cs:92:23:92:26 | null |  |
+| cflow.cs:92:23:92:26 | null | cflow.cs:92:13:92:27 | call to method Equals |  |
+| cflow.cs:93:13:93:49 | throw ...; | cflow.cs:90:18:90:19 | exit M3 (abnormal) | exception(ArgumentNullException) |
+| cflow.cs:93:19:93:48 | object creation of type ArgumentNullException | cflow.cs:93:13:93:49 | throw ...; |  |
+| cflow.cs:93:45:93:47 | "s" | cflow.cs:93:19:93:48 | object creation of type ArgumentNullException |  |
+| cflow.cs:94:9:94:28 | call to method WriteLine | cflow.cs:96:9:97:55 | if (...) ... |  |
+| cflow.cs:94:9:94:29 | ...; | cflow.cs:94:27:94:27 | access to parameter s |  |
+| cflow.cs:94:27:94:27 | access to parameter s | cflow.cs:94:9:94:28 | call to method WriteLine |  |
+| cflow.cs:96:9:97:55 | if (...) ... | cflow.cs:96:13:96:17 | this access |  |
+| cflow.cs:96:13:96:17 | access to field Field | cflow.cs:96:22:96:25 | null |  |
+| cflow.cs:96:13:96:17 | this access | cflow.cs:96:13:96:17 | access to field Field |  |
+| cflow.cs:96:13:96:25 | ... != ... | cflow.cs:97:13:97:55 | ...; | true |
+| cflow.cs:96:13:96:25 | ... != ... | cflow.cs:99:9:100:42 | if (...) ... | false |
+| cflow.cs:96:22:96:25 | null | cflow.cs:96:13:96:25 | ... != ... |  |
+| cflow.cs:97:13:97:54 | call to method WriteLine | cflow.cs:99:9:100:42 | if (...) ... |  |
+| cflow.cs:97:13:97:55 | ...; | cflow.cs:97:31:97:47 | object creation of type ControlFlow |  |
+| cflow.cs:97:31:97:47 | object creation of type ControlFlow | cflow.cs:97:31:97:53 | access to field Field |  |
+| cflow.cs:97:31:97:53 | access to field Field | cflow.cs:97:13:97:54 | call to method WriteLine |  |
+| cflow.cs:99:9:100:42 | if (...) ... | cflow.cs:99:13:99:17 | this access |  |
+| cflow.cs:99:13:99:17 | access to field Field | cflow.cs:99:22:99:25 | null |  |
+| cflow.cs:99:13:99:17 | this access | cflow.cs:99:13:99:17 | access to field Field |  |
+| cflow.cs:99:13:99:25 | ... != ... | cflow.cs:100:13:100:42 | ...; | true |
+| cflow.cs:99:13:99:25 | ... != ... | cflow.cs:102:9:103:36 | if (...) ... | false |
+| cflow.cs:99:22:99:25 | null | cflow.cs:99:13:99:25 | ... != ... |  |
+| cflow.cs:100:13:100:41 | call to method WriteLine | cflow.cs:102:9:103:36 | if (...) ... |  |
+| cflow.cs:100:13:100:42 | ...; | cflow.cs:100:31:100:34 | this access |  |
+| cflow.cs:100:31:100:34 | this access | cflow.cs:100:31:100:40 | access to field Field |  |
+| cflow.cs:100:31:100:40 | access to field Field | cflow.cs:100:13:100:41 | call to method WriteLine |  |
+| cflow.cs:102:9:103:36 | if (...) ... | cflow.cs:102:13:102:16 | this access |  |
+| cflow.cs:102:13:102:16 | this access | cflow.cs:102:13:102:21 | access to property Prop |  |
+| cflow.cs:102:13:102:21 | access to property Prop | cflow.cs:102:26:102:29 | null |  |
+| cflow.cs:102:13:102:29 | ... != ... | cflow.cs:90:18:90:19 | exit M3 (normal) | false |
+| cflow.cs:102:13:102:29 | ... != ... | cflow.cs:103:13:103:36 | ...; | true |
+| cflow.cs:102:26:102:29 | null | cflow.cs:102:13:102:29 | ... != ... |  |
+| cflow.cs:103:13:103:35 | call to method WriteLine | cflow.cs:90:18:90:19 | exit M3 (normal) |  |
+| cflow.cs:103:13:103:36 | ...; | cflow.cs:103:31:103:34 | this access |  |
+| cflow.cs:103:31:103:34 | access to property Prop | cflow.cs:103:13:103:35 | call to method WriteLine |  |
+| cflow.cs:103:31:103:34 | this access | cflow.cs:103:31:103:34 | access to property Prop |  |
+| cflow.cs:106:18:106:19 | enter M4 | cflow.cs:107:5:117:5 | {...} |  |
+| cflow.cs:106:18:106:19 | exit M4 (normal) | cflow.cs:106:18:106:19 | exit M4 |  |
+| cflow.cs:107:5:117:5 | {...} | cflow.cs:108:9:115:9 | if (...) ... |  |
+| cflow.cs:108:9:115:9 | if (...) ... | cflow.cs:108:13:108:13 | access to parameter s |  |
+| cflow.cs:108:13:108:13 | access to parameter s | cflow.cs:108:18:108:21 | null |  |
+| cflow.cs:108:13:108:21 | ... != ... | cflow.cs:109:9:115:9 | {...} | true |
+| cflow.cs:108:13:108:21 | ... != ... | cflow.cs:116:9:116:29 | ...; | false |
+| cflow.cs:108:18:108:21 | null | cflow.cs:108:13:108:21 | ... != ... |  |
+| cflow.cs:109:9:115:9 | {...} | cflow.cs:110:13:113:13 | while (...) ... |  |
+| cflow.cs:110:13:113:13 | while (...) ... | cflow.cs:110:20:110:23 | true |  |
+| cflow.cs:110:20:110:23 | true | cflow.cs:111:13:113:13 | {...} | true |
+| cflow.cs:111:13:113:13 | {...} | cflow.cs:112:17:112:37 | ...; |  |
+| cflow.cs:112:17:112:36 | call to method WriteLine | cflow.cs:110:20:110:23 | true |  |
+| cflow.cs:112:17:112:37 | ...; | cflow.cs:112:35:112:35 | access to parameter s |  |
+| cflow.cs:112:35:112:35 | access to parameter s | cflow.cs:112:17:112:36 | call to method WriteLine |  |
+| cflow.cs:116:9:116:28 | call to method WriteLine | cflow.cs:106:18:106:19 | exit M4 (normal) |  |
+| cflow.cs:116:9:116:29 | ...; | cflow.cs:116:27:116:27 | access to parameter s |  |
+| cflow.cs:116:27:116:27 | access to parameter s | cflow.cs:116:9:116:28 | call to method WriteLine |  |
+| cflow.cs:119:20:119:21 | enter M5 | cflow.cs:120:5:124:5 | {...} |  |
+| cflow.cs:119:20:119:21 | exit M5 (normal) | cflow.cs:119:20:119:21 | exit M5 |  |
+| cflow.cs:120:5:124:5 | {...} | cflow.cs:121:9:121:18 | ... ...; |  |
+| cflow.cs:121:9:121:18 | ... ...; | cflow.cs:121:17:121:17 | access to parameter s |  |
+| cflow.cs:121:13:121:17 | String x = ... | cflow.cs:122:9:122:20 | ...; |  |
+| cflow.cs:121:17:121:17 | access to parameter s | cflow.cs:121:13:121:17 | String x = ... |  |
+| cflow.cs:122:9:122:19 | ... = ... | cflow.cs:123:16:123:16 | access to local variable x |  |
+| cflow.cs:122:9:122:20 | ...; | cflow.cs:122:13:122:13 | access to local variable x |  |
+| cflow.cs:122:13:122:13 | access to local variable x | cflow.cs:122:17:122:19 | " " |  |
+| cflow.cs:122:13:122:19 | ... + ... | cflow.cs:122:9:122:19 | ... = ... |  |
+| cflow.cs:122:17:122:19 | " " | cflow.cs:122:13:122:19 | ... + ... |  |
+| cflow.cs:123:9:123:17 | return ...; | cflow.cs:119:20:119:21 | exit M5 (normal) | return |
+| cflow.cs:123:16:123:16 | access to local variable x | cflow.cs:123:9:123:17 | return ...; |  |
+| cflow.cs:127:19:127:21 | enter get_Prop | cflow.cs:127:23:127:60 | {...} |  |
+| cflow.cs:127:19:127:21 | exit get_Prop (normal) | cflow.cs:127:19:127:21 | exit get_Prop |  |
+| cflow.cs:127:23:127:60 | {...} | cflow.cs:127:32:127:36 | this access |  |
+| cflow.cs:127:25:127:58 | return ...; | cflow.cs:127:19:127:21 | exit get_Prop (normal) | return |
+| cflow.cs:127:32:127:36 | access to field Field | cflow.cs:127:41:127:44 | null |  |
+| cflow.cs:127:32:127:36 | this access | cflow.cs:127:32:127:36 | access to field Field |  |
+| cflow.cs:127:32:127:44 | ... == ... | cflow.cs:127:48:127:49 | "" | true |
+| cflow.cs:127:32:127:44 | ... == ... | cflow.cs:127:53:127:57 | this access | false |
+| cflow.cs:127:32:127:57 | ... ? ... : ... | cflow.cs:127:25:127:58 | return ...; |  |
+| cflow.cs:127:41:127:44 | null | cflow.cs:127:32:127:44 | ... == ... |  |
+| cflow.cs:127:48:127:49 | "" | cflow.cs:127:32:127:57 | ... ? ... : ... |  |
+| cflow.cs:127:53:127:57 | access to field Field | cflow.cs:127:32:127:57 | ... ? ... : ... |  |
+| cflow.cs:127:53:127:57 | this access | cflow.cs:127:53:127:57 | access to field Field |  |
+| cflow.cs:127:62:127:64 | enter set_Prop | cflow.cs:127:66:127:83 | {...} |  |
+| cflow.cs:127:62:127:64 | exit set_Prop (normal) | cflow.cs:127:62:127:64 | exit set_Prop |  |
+| cflow.cs:127:66:127:83 | {...} | cflow.cs:127:68:127:81 | ...; |  |
+| cflow.cs:127:68:127:72 | this access | cflow.cs:127:76:127:80 | access to parameter value |  |
+| cflow.cs:127:68:127:80 | ... = ... | cflow.cs:127:62:127:64 | exit set_Prop (normal) |  |
+| cflow.cs:127:68:127:81 | ...; | cflow.cs:127:68:127:72 | this access |  |
+| cflow.cs:127:76:127:80 | access to parameter value | cflow.cs:127:68:127:80 | ... = ... |  |
+| cflow.cs:129:5:129:15 | call to constructor Object | cflow.cs:130:5:132:5 | {...} |  |
+| cflow.cs:129:5:129:15 | enter ControlFlow | cflow.cs:129:5:129:15 | call to constructor Object |  |
+| cflow.cs:129:5:129:15 | exit ControlFlow (normal) | cflow.cs:129:5:129:15 | exit ControlFlow |  |
+| cflow.cs:130:5:132:5 | {...} | cflow.cs:131:9:131:18 | ...; |  |
+| cflow.cs:131:9:131:13 | this access | cflow.cs:131:17:131:17 | access to parameter s |  |
+| cflow.cs:131:9:131:17 | ... = ... | cflow.cs:129:5:129:15 | exit ControlFlow (normal) |  |
+| cflow.cs:131:9:131:18 | ...; | cflow.cs:131:9:131:13 | this access |  |
+| cflow.cs:131:17:131:17 | access to parameter s | cflow.cs:131:9:131:17 | ... = ... |  |
+| cflow.cs:134:5:134:15 | enter ControlFlow | cflow.cs:134:31:134:31 | access to parameter i |  |
+| cflow.cs:134:5:134:15 | exit ControlFlow (normal) | cflow.cs:134:5:134:15 | exit ControlFlow |  |
+| cflow.cs:134:26:134:29 | call to constructor ControlFlow | cflow.cs:134:39:134:41 | {...} |  |
+| cflow.cs:134:31:134:31 | (...) ... | cflow.cs:134:35:134:36 | "" |  |
+| cflow.cs:134:31:134:31 | access to parameter i | cflow.cs:134:31:134:31 | (...) ... |  |
+| cflow.cs:134:31:134:36 | ... + ... | cflow.cs:134:26:134:29 | call to constructor ControlFlow |  |
+| cflow.cs:134:35:134:36 | "" | cflow.cs:134:31:134:36 | ... + ... |  |
+| cflow.cs:134:39:134:41 | {...} | cflow.cs:134:5:134:15 | exit ControlFlow (normal) |  |
+| cflow.cs:136:12:136:22 | enter ControlFlow | cflow.cs:136:33:136:33 | 0 |  |
+| cflow.cs:136:12:136:22 | exit ControlFlow (normal) | cflow.cs:136:12:136:22 | exit ControlFlow |  |
+| cflow.cs:136:28:136:31 | call to constructor ControlFlow | cflow.cs:136:40:136:42 | {...} |  |
+| cflow.cs:136:33:136:33 | 0 | cflow.cs:136:37:136:37 | 1 |  |
+| cflow.cs:136:33:136:37 | ... + ... | cflow.cs:136:28:136:31 | call to constructor ControlFlow |  |
+| cflow.cs:136:37:136:37 | 1 | cflow.cs:136:33:136:37 | ... + ... |  |
+| cflow.cs:136:40:136:42 | {...} | cflow.cs:136:12:136:22 | exit ControlFlow (normal) |  |
+| cflow.cs:138:40:138:40 | enter + | cflow.cs:139:5:142:5 | {...} |  |
+| cflow.cs:138:40:138:40 | exit + (normal) | cflow.cs:138:40:138:40 | exit + |  |
+| cflow.cs:139:5:142:5 | {...} | cflow.cs:140:9:140:29 | ...; |  |
+| cflow.cs:140:9:140:28 | call to method WriteLine | cflow.cs:141:16:141:16 | access to parameter y |  |
+| cflow.cs:140:9:140:29 | ...; | cflow.cs:140:27:140:27 | access to parameter x |  |
+| cflow.cs:140:27:140:27 | access to parameter x | cflow.cs:140:9:140:28 | call to method WriteLine |  |
+| cflow.cs:141:9:141:17 | return ...; | cflow.cs:138:40:138:40 | exit + (normal) | return |
+| cflow.cs:141:16:141:16 | access to parameter y | cflow.cs:141:9:141:17 | return ...; |  |
+| cflow.cs:144:33:144:35 | enter get_Item | cflow.cs:144:37:144:54 | {...} |  |
+| cflow.cs:144:33:144:35 | exit get_Item (normal) | cflow.cs:144:33:144:35 | exit get_Item |  |
+| cflow.cs:144:37:144:54 | {...} | cflow.cs:144:46:144:46 | access to parameter i |  |
+| cflow.cs:144:39:144:52 | return ...; | cflow.cs:144:33:144:35 | exit get_Item (normal) | return |
+| cflow.cs:144:46:144:46 | (...) ... | cflow.cs:144:50:144:51 | "" |  |
+| cflow.cs:144:46:144:46 | access to parameter i | cflow.cs:144:46:144:46 | (...) ... |  |
+| cflow.cs:144:46:144:51 | ... + ... | cflow.cs:144:39:144:52 | return ...; |  |
+| cflow.cs:144:50:144:51 | "" | cflow.cs:144:46:144:51 | ... + ... |  |
+| cflow.cs:144:56:144:58 | enter set_Item | cflow.cs:144:60:144:62 | {...} |  |
+| cflow.cs:144:56:144:58 | exit set_Item (normal) | cflow.cs:144:56:144:58 | exit set_Item |  |
+| cflow.cs:144:60:144:62 | {...} | cflow.cs:144:56:144:58 | exit set_Item (normal) |  |
+| cflow.cs:146:10:146:12 | enter For | cflow.cs:147:5:177:5 | {...} |  |
+| cflow.cs:146:10:146:12 | exit For (normal) | cflow.cs:146:10:146:12 | exit For |  |
+| cflow.cs:147:5:177:5 | {...} | cflow.cs:148:9:148:18 | ... ...; |  |
+| cflow.cs:148:9:148:18 | ... ...; | cflow.cs:148:17:148:17 | 0 |  |
+| cflow.cs:148:13:148:17 | Int32 x = ... | cflow.cs:149:9:150:33 | for (...;...;...) ... |  |
+| cflow.cs:148:17:148:17 | 0 | cflow.cs:148:13:148:17 | Int32 x = ... |  |
+| cflow.cs:149:9:150:33 | for (...;...;...) ... | cflow.cs:149:16:149:16 | access to local variable x |  |
+| cflow.cs:149:16:149:16 | access to local variable x | cflow.cs:149:20:149:21 | 10 |  |
+| cflow.cs:149:16:149:21 | ... < ... | cflow.cs:150:13:150:33 | ...; | true |
+| cflow.cs:149:16:149:21 | ... < ... | cflow.cs:152:9:157:9 | for (...;...;...) ... | false |
+| cflow.cs:149:20:149:21 | 10 | cflow.cs:149:16:149:21 | ... < ... |  |
+| cflow.cs:149:24:149:26 | ++... | cflow.cs:149:16:149:16 | access to local variable x |  |
+| cflow.cs:149:26:149:26 | access to local variable x | cflow.cs:149:24:149:26 | ++... |  |
+| cflow.cs:150:13:150:32 | call to method WriteLine | cflow.cs:149:26:149:26 | access to local variable x |  |
+| cflow.cs:150:13:150:33 | ...; | cflow.cs:150:31:150:31 | access to local variable x |  |
+| cflow.cs:150:31:150:31 | access to local variable x | cflow.cs:150:13:150:32 | call to method WriteLine |  |
+| cflow.cs:152:9:157:9 | for (...;...;...) ... | cflow.cs:153:9:157:9 | {...} |  |
+| cflow.cs:152:18:152:18 | access to local variable x | cflow.cs:152:18:152:20 | ...++ |  |
+| cflow.cs:152:18:152:20 | ...++ | cflow.cs:153:9:157:9 | {...} |  |
+| cflow.cs:153:9:157:9 | {...} | cflow.cs:154:13:154:33 | ...; |  |
+| cflow.cs:154:13:154:32 | call to method WriteLine | cflow.cs:155:13:156:22 | if (...) ... |  |
+| cflow.cs:154:13:154:33 | ...; | cflow.cs:154:31:154:31 | access to local variable x |  |
+| cflow.cs:154:31:154:31 | access to local variable x | cflow.cs:154:13:154:32 | call to method WriteLine |  |
+| cflow.cs:155:13:156:22 | if (...) ... | cflow.cs:155:17:155:17 | access to local variable x |  |
+| cflow.cs:155:17:155:17 | access to local variable x | cflow.cs:155:21:155:22 | 20 |  |
+| cflow.cs:155:17:155:22 | ... > ... | cflow.cs:152:18:152:18 | access to local variable x | false |
+| cflow.cs:155:17:155:22 | ... > ... | cflow.cs:156:17:156:22 | break; | true |
+| cflow.cs:155:21:155:22 | 20 | cflow.cs:155:17:155:22 | ... > ... |  |
+| cflow.cs:156:17:156:22 | break; | cflow.cs:159:9:165:9 | for (...;...;...) ... | break |
+| cflow.cs:159:9:165:9 | for (...;...;...) ... | cflow.cs:160:9:165:9 | {...} |  |
+| cflow.cs:160:9:165:9 | {...} | cflow.cs:161:13:161:33 | ...; |  |
+| cflow.cs:161:13:161:32 | call to method WriteLine | cflow.cs:162:13:162:16 | ...; |  |
+| cflow.cs:161:13:161:33 | ...; | cflow.cs:161:31:161:31 | access to local variable x |  |
+| cflow.cs:161:31:161:31 | access to local variable x | cflow.cs:161:13:161:32 | call to method WriteLine |  |
+| cflow.cs:162:13:162:13 | access to local variable x | cflow.cs:162:13:162:15 | ...++ |  |
+| cflow.cs:162:13:162:15 | ...++ | cflow.cs:163:13:164:22 | if (...) ... |  |
+| cflow.cs:162:13:162:16 | ...; | cflow.cs:162:13:162:13 | access to local variable x |  |
+| cflow.cs:163:13:164:22 | if (...) ... | cflow.cs:163:17:163:17 | access to local variable x |  |
+| cflow.cs:163:17:163:17 | access to local variable x | cflow.cs:163:21:163:22 | 30 |  |
+| cflow.cs:163:17:163:22 | ... > ... | cflow.cs:160:9:165:9 | {...} | false |
+| cflow.cs:163:17:163:22 | ... > ... | cflow.cs:164:17:164:22 | break; | true |
+| cflow.cs:163:21:163:22 | 30 | cflow.cs:163:17:163:22 | ... > ... |  |
+| cflow.cs:164:17:164:22 | break; | cflow.cs:167:9:171:9 | for (...;...;...) ... | break |
+| cflow.cs:167:9:171:9 | for (...;...;...) ... | cflow.cs:167:16:167:16 | access to local variable x |  |
+| cflow.cs:167:16:167:16 | access to local variable x | cflow.cs:167:20:167:21 | 40 |  |
+| cflow.cs:167:16:167:21 | ... < ... | cflow.cs:168:9:171:9 | {...} | true |
+| cflow.cs:167:16:167:21 | ... < ... | cflow.cs:173:9:176:9 | for (...;...;...) ... | false |
+| cflow.cs:167:20:167:21 | 40 | cflow.cs:167:16:167:21 | ... < ... |  |
+| cflow.cs:168:9:171:9 | {...} | cflow.cs:169:13:169:33 | ...; |  |
+| cflow.cs:169:13:169:32 | call to method WriteLine | cflow.cs:170:13:170:16 | ...; |  |
+| cflow.cs:169:13:169:33 | ...; | cflow.cs:169:31:169:31 | access to local variable x |  |
+| cflow.cs:169:31:169:31 | access to local variable x | cflow.cs:169:13:169:32 | call to method WriteLine |  |
+| cflow.cs:170:13:170:13 | access to local variable x | cflow.cs:170:13:170:15 | ...++ |  |
+| cflow.cs:170:13:170:15 | ...++ | cflow.cs:167:16:167:16 | access to local variable x |  |
+| cflow.cs:170:13:170:16 | ...; | cflow.cs:170:13:170:13 | access to local variable x |  |
+| cflow.cs:173:9:176:9 | for (...;...;...) ... | cflow.cs:173:22:173:22 | 0 |  |
+| cflow.cs:173:18:173:22 | Int32 i = ... | cflow.cs:173:29:173:29 | 0 |  |
+| cflow.cs:173:22:173:22 | 0 | cflow.cs:173:18:173:22 | Int32 i = ... |  |
+| cflow.cs:173:25:173:29 | Int32 j = ... | cflow.cs:173:32:173:32 | access to local variable i |  |
+| cflow.cs:173:29:173:29 | 0 | cflow.cs:173:25:173:29 | Int32 j = ... |  |
+| cflow.cs:173:32:173:32 | access to local variable i | cflow.cs:173:36:173:36 | access to local variable j |  |
+| cflow.cs:173:32:173:36 | ... + ... | cflow.cs:173:40:173:41 | 10 |  |
+| cflow.cs:173:32:173:41 | ... < ... | cflow.cs:146:10:146:12 | exit For (normal) | false |
+| cflow.cs:173:32:173:41 | ... < ... | cflow.cs:174:9:176:9 | {...} | true |
+| cflow.cs:173:36:173:36 | access to local variable j | cflow.cs:173:32:173:36 | ... + ... |  |
+| cflow.cs:173:40:173:41 | 10 | cflow.cs:173:32:173:41 | ... < ... |  |
+| cflow.cs:173:44:173:44 | access to local variable i | cflow.cs:173:44:173:46 | ...++ |  |
+| cflow.cs:173:44:173:46 | ...++ | cflow.cs:173:49:173:49 | access to local variable j |  |
+| cflow.cs:173:49:173:49 | access to local variable j | cflow.cs:173:49:173:51 | ...++ |  |
+| cflow.cs:173:49:173:51 | ...++ | cflow.cs:173:32:173:32 | access to local variable i |  |
+| cflow.cs:174:9:176:9 | {...} | cflow.cs:175:13:175:37 | ...; |  |
+| cflow.cs:175:13:175:36 | call to method WriteLine | cflow.cs:173:44:173:44 | access to local variable i |  |
+| cflow.cs:175:13:175:37 | ...; | cflow.cs:175:31:175:31 | access to local variable i |  |
+| cflow.cs:175:31:175:31 | access to local variable i | cflow.cs:175:35:175:35 | access to local variable j |  |
+| cflow.cs:175:31:175:35 | ... + ... | cflow.cs:175:13:175:36 | call to method WriteLine |  |
+| cflow.cs:175:35:175:35 | access to local variable j | cflow.cs:175:31:175:35 | ... + ... |  |
+| cflow.cs:179:10:179:16 | enter Lambdas | cflow.cs:180:5:183:5 | {...} |  |
+| cflow.cs:179:10:179:16 | exit Lambdas (normal) | cflow.cs:179:10:179:16 | exit Lambdas |  |
+| cflow.cs:180:5:183:5 | {...} | cflow.cs:181:9:181:38 | ... ...; |  |
+| cflow.cs:181:9:181:38 | ... ...; | cflow.cs:181:28:181:37 | (...) => ... |  |
+| cflow.cs:181:24:181:37 | Func<Int32,Int32> y = ... | cflow.cs:182:9:182:62 | ... ...; |  |
+| cflow.cs:181:28:181:37 | (...) => ... | cflow.cs:181:24:181:37 | Func<Int32,Int32> y = ... |  |
+| cflow.cs:181:28:181:37 | enter (...) => ... | cflow.cs:181:33:181:33 | access to parameter x |  |
+| cflow.cs:181:28:181:37 | exit (...) => ... (normal) | cflow.cs:181:28:181:37 | exit (...) => ... |  |
+| cflow.cs:181:33:181:33 | access to parameter x | cflow.cs:181:37:181:37 | 1 |  |
+| cflow.cs:181:33:181:37 | ... + ... | cflow.cs:181:28:181:37 | exit (...) => ... (normal) |  |
+| cflow.cs:181:37:181:37 | 1 | cflow.cs:181:33:181:37 | ... + ... |  |
+| cflow.cs:182:9:182:62 | ... ...; | cflow.cs:182:28:182:61 | delegate(...) { ... } |  |
+| cflow.cs:182:24:182:61 | Func<Int32,Int32> z = ... | cflow.cs:179:10:179:16 | exit Lambdas (normal) |  |
+| cflow.cs:182:28:182:61 | delegate(...) { ... } | cflow.cs:182:24:182:61 | Func<Int32,Int32> z = ... |  |
+| cflow.cs:182:28:182:61 | enter delegate(...) { ... } | cflow.cs:182:45:182:61 | {...} |  |
+| cflow.cs:182:28:182:61 | exit delegate(...) { ... } (normal) | cflow.cs:182:28:182:61 | exit delegate(...) { ... } |  |
+| cflow.cs:182:45:182:61 | {...} | cflow.cs:182:54:182:54 | access to parameter x |  |
+| cflow.cs:182:47:182:59 | return ...; | cflow.cs:182:28:182:61 | exit delegate(...) { ... } (normal) | return |
+| cflow.cs:182:54:182:54 | access to parameter x | cflow.cs:182:58:182:58 | 1 |  |
+| cflow.cs:182:54:182:58 | ... + ... | cflow.cs:182:47:182:59 | return ...; |  |
+| cflow.cs:182:58:182:58 | 1 | cflow.cs:182:54:182:58 | ... + ... |  |
+| cflow.cs:185:10:185:18 | enter LogicalOr | cflow.cs:186:5:191:5 | {...} |  |
+| cflow.cs:185:10:185:18 | exit LogicalOr (normal) | cflow.cs:185:10:185:18 | exit LogicalOr |  |
+| cflow.cs:186:5:191:5 | {...} | cflow.cs:187:9:190:52 | if (...) ... |  |
+| cflow.cs:187:9:190:52 | if (...) ... | cflow.cs:187:13:187:13 | 1 |  |
+| cflow.cs:187:13:187:13 | 1 | cflow.cs:187:18:187:18 | 2 |  |
+| cflow.cs:187:13:187:18 | ... == ... | cflow.cs:187:23:187:23 | 2 | false |
+| cflow.cs:187:13:187:28 | [false] ... \|\| ... | cflow.cs:187:34:187:34 | 1 | false |
+| cflow.cs:187:13:187:50 | [false] ... \|\| ... | cflow.cs:190:13:190:52 | ...; | false |
+| cflow.cs:187:18:187:18 | 2 | cflow.cs:187:13:187:18 | ... == ... |  |
+| cflow.cs:187:23:187:23 | 2 | cflow.cs:187:28:187:28 | 3 |  |
+| cflow.cs:187:23:187:28 | ... == ... | cflow.cs:187:13:187:28 | [false] ... \|\| ... | false |
+| cflow.cs:187:28:187:28 | 3 | cflow.cs:187:23:187:28 | ... == ... |  |
+| cflow.cs:187:34:187:34 | 1 | cflow.cs:187:39:187:39 | 3 |  |
+| cflow.cs:187:34:187:39 | ... == ... | cflow.cs:187:34:187:49 | [false] ... && ... | false |
+| cflow.cs:187:34:187:49 | [false] ... && ... | cflow.cs:187:13:187:50 | [false] ... \|\| ... | false |
+| cflow.cs:187:39:187:39 | 3 | cflow.cs:187:34:187:39 | ... == ... |  |
+| cflow.cs:190:13:190:51 | call to method WriteLine | cflow.cs:185:10:185:18 | exit LogicalOr (normal) |  |
+| cflow.cs:190:13:190:52 | ...; | cflow.cs:190:31:190:50 | "This should happen" |  |
+| cflow.cs:190:31:190:50 | "This should happen" | cflow.cs:190:13:190:51 | call to method WriteLine |  |
+| cflow.cs:193:10:193:17 | enter Booleans | cflow.cs:194:5:206:5 | {...} |  |
+| cflow.cs:193:10:193:17 | exit Booleans (abnormal) | cflow.cs:193:10:193:17 | exit Booleans |  |
+| cflow.cs:193:10:193:17 | exit Booleans (normal) | cflow.cs:193:10:193:17 | exit Booleans |  |
+| cflow.cs:194:5:206:5 | {...} | cflow.cs:195:9:195:57 | ... ...; |  |
+| cflow.cs:195:9:195:57 | ... ...; | cflow.cs:195:17:195:21 | this access |  |
+| cflow.cs:195:13:195:56 | Boolean b = ... | cflow.cs:197:9:198:49 | if (...) ... |  |
+| cflow.cs:195:17:195:21 | access to field Field | cflow.cs:195:17:195:28 | access to property Length |  |
+| cflow.cs:195:17:195:21 | this access | cflow.cs:195:17:195:21 | access to field Field |  |
+| cflow.cs:195:17:195:28 | access to property Length | cflow.cs:195:32:195:32 | 0 |  |
+| cflow.cs:195:17:195:32 | ... > ... | cflow.cs:195:17:195:56 | ... && ... | false |
+| cflow.cs:195:17:195:32 | ... > ... | cflow.cs:195:39:195:43 | this access | true |
+| cflow.cs:195:17:195:56 | ... && ... | cflow.cs:195:13:195:56 | Boolean b = ... |  |
+| cflow.cs:195:32:195:32 | 0 | cflow.cs:195:17:195:32 | ... > ... |  |
+| cflow.cs:195:37:195:56 | !... | cflow.cs:195:17:195:56 | ... && ... |  |
+| cflow.cs:195:39:195:43 | access to field Field | cflow.cs:195:39:195:50 | access to property Length |  |
+| cflow.cs:195:39:195:43 | this access | cflow.cs:195:39:195:43 | access to field Field |  |
+| cflow.cs:195:39:195:50 | access to property Length | cflow.cs:195:55:195:55 | 1 |  |
+| cflow.cs:195:39:195:55 | ... == ... | cflow.cs:195:37:195:56 | !... |  |
+| cflow.cs:195:55:195:55 | 1 | cflow.cs:195:39:195:55 | ... == ... |  |
+| cflow.cs:197:9:198:49 | if (...) ... | cflow.cs:197:15:197:19 | this access |  |
+| cflow.cs:197:13:197:47 | [false] !... | cflow.cs:200:9:205:9 | if (...) ... | false |
+| cflow.cs:197:13:197:47 | [true] !... | cflow.cs:198:13:198:49 | ...; | true |
+| cflow.cs:197:15:197:19 | access to field Field | cflow.cs:197:15:197:26 | access to property Length |  |
+| cflow.cs:197:15:197:19 | this access | cflow.cs:197:15:197:19 | access to field Field |  |
+| cflow.cs:197:15:197:26 | access to property Length | cflow.cs:197:31:197:31 | 0 |  |
+| cflow.cs:197:15:197:31 | ... == ... | cflow.cs:197:35:197:39 | false | true |
+| cflow.cs:197:15:197:31 | ... == ... | cflow.cs:197:43:197:46 | true | false |
+| cflow.cs:197:15:197:46 | [false] ... ? ... : ... | cflow.cs:197:13:197:47 | [true] !... | false |
+| cflow.cs:197:15:197:46 | [true] ... ? ... : ... | cflow.cs:197:13:197:47 | [false] !... | true |
+| cflow.cs:197:31:197:31 | 0 | cflow.cs:197:15:197:31 | ... == ... |  |
+| cflow.cs:197:35:197:39 | false | cflow.cs:197:15:197:46 | [false] ... ? ... : ... | false |
+| cflow.cs:197:43:197:46 | true | cflow.cs:197:15:197:46 | [true] ... ? ... : ... | true |
+| cflow.cs:198:13:198:48 | ... = ... | cflow.cs:200:9:205:9 | if (...) ... |  |
+| cflow.cs:198:13:198:49 | ...; | cflow.cs:198:17:198:21 | this access |  |
+| cflow.cs:198:17:198:21 | access to field Field | cflow.cs:198:17:198:28 | access to property Length |  |
+| cflow.cs:198:17:198:21 | this access | cflow.cs:198:17:198:21 | access to field Field |  |
+| cflow.cs:198:17:198:28 | access to property Length | cflow.cs:198:33:198:33 | 0 |  |
+| cflow.cs:198:17:198:33 | ... == ... | cflow.cs:198:37:198:41 | false | true |
+| cflow.cs:198:17:198:33 | ... == ... | cflow.cs:198:45:198:48 | true | false |
+| cflow.cs:198:17:198:48 | ... ? ... : ... | cflow.cs:198:13:198:48 | ... = ... |  |
+| cflow.cs:198:33:198:33 | 0 | cflow.cs:198:17:198:33 | ... == ... |  |
+| cflow.cs:198:37:198:41 | false | cflow.cs:198:17:198:48 | ... ? ... : ... |  |
+| cflow.cs:198:45:198:48 | true | cflow.cs:198:17:198:48 | ... ? ... : ... |  |
+| cflow.cs:200:9:205:9 | if (...) ... | cflow.cs:200:15:200:19 | this access |  |
+| cflow.cs:200:13:200:32 | [false] !... | cflow.cs:200:40:200:44 | this access | false |
+| cflow.cs:200:13:200:32 | [true] !... | cflow.cs:200:13:200:62 | [true] ... \|\| ... | true |
+| cflow.cs:200:13:200:62 | [false] ... \|\| ... | cflow.cs:193:10:193:17 | exit Booleans (normal) | false |
+| cflow.cs:200:13:200:62 | [true] ... \|\| ... | cflow.cs:201:9:205:9 | {...} | true |
+| cflow.cs:200:15:200:19 | access to field Field | cflow.cs:200:15:200:26 | access to property Length |  |
+| cflow.cs:200:15:200:19 | this access | cflow.cs:200:15:200:19 | access to field Field |  |
+| cflow.cs:200:15:200:26 | access to property Length | cflow.cs:200:31:200:31 | 0 |  |
+| cflow.cs:200:15:200:31 | ... == ... | cflow.cs:200:13:200:32 | [false] !... | true |
+| cflow.cs:200:15:200:31 | ... == ... | cflow.cs:200:13:200:32 | [true] !... | false |
+| cflow.cs:200:31:200:31 | 0 | cflow.cs:200:15:200:31 | ... == ... |  |
+| cflow.cs:200:37:200:62 | [false] !... | cflow.cs:200:13:200:62 | [false] ... \|\| ... | false |
+| cflow.cs:200:37:200:62 | [true] !... | cflow.cs:200:13:200:62 | [true] ... \|\| ... | true |
+| cflow.cs:200:38:200:62 | [false] !... | cflow.cs:200:37:200:62 | [true] !... | false |
+| cflow.cs:200:38:200:62 | [true] !... | cflow.cs:200:37:200:62 | [false] !... | true |
+| cflow.cs:200:40:200:44 | access to field Field | cflow.cs:200:40:200:51 | access to property Length |  |
+| cflow.cs:200:40:200:44 | this access | cflow.cs:200:40:200:44 | access to field Field |  |
+| cflow.cs:200:40:200:51 | access to property Length | cflow.cs:200:56:200:56 | 1 |  |
+| cflow.cs:200:40:200:56 | ... == ... | cflow.cs:200:40:200:61 | [false] ... && ... | false |
+| cflow.cs:200:40:200:56 | ... == ... | cflow.cs:200:61:200:61 | access to local variable b | true |
+| cflow.cs:200:40:200:61 | [false] ... && ... | cflow.cs:200:38:200:62 | [true] !... | false |
+| cflow.cs:200:40:200:61 | [true] ... && ... | cflow.cs:200:38:200:62 | [false] !... | true |
+| cflow.cs:200:56:200:56 | 1 | cflow.cs:200:40:200:56 | ... == ... |  |
+| cflow.cs:200:61:200:61 | access to local variable b | cflow.cs:200:40:200:61 | [false] ... && ... | false |
+| cflow.cs:200:61:200:61 | access to local variable b | cflow.cs:200:40:200:61 | [true] ... && ... | true |
+| cflow.cs:201:9:205:9 | {...} | cflow.cs:202:13:204:13 | {...} |  |
+| cflow.cs:202:13:204:13 | {...} | cflow.cs:203:23:203:37 | object creation of type Exception |  |
+| cflow.cs:203:17:203:38 | throw ...; | cflow.cs:193:10:193:17 | exit Booleans (abnormal) | exception(Exception) |
+| cflow.cs:203:23:203:37 | object creation of type Exception | cflow.cs:203:17:203:38 | throw ...; |  |
+| cflow.cs:208:10:208:11 | enter Do | cflow.cs:209:5:222:5 | {...} |  |
+| cflow.cs:208:10:208:11 | exit Do (normal) | cflow.cs:208:10:208:11 | exit Do |  |
+| 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: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:24 | ... = ... |  |
+| 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: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 |  |
+| cflow.cs:213:17:213:28 | access to property Length | cflow.cs:213:32:213:32 | 0 |  |
+| cflow.cs:213:17:213:32 | ... > ... | cflow.cs:214:13:216:13 | {...} | true |
+| cflow.cs:213:17:213:32 | ... > ... | cflow.cs:217:13:220:13 | if (...) ... | false |
+| cflow.cs:213:32:213:32 | 0 | cflow.cs:213:17:213:32 | ... > ... |  |
+| cflow.cs:214:13:216:13 | {...} | cflow.cs:215:17:215:25 | continue; |  |
+| cflow.cs:215:17:215:25 | continue; | cflow.cs:221:18:221:22 | this access | continue |
+| cflow.cs:217:13:220:13 | if (...) ... | cflow.cs:217:17:217:21 | this access |  |
+| cflow.cs:217:17:217:21 | access to field Field | cflow.cs:217:17:217:28 | access to property Length |  |
+| cflow.cs:217:17:217:21 | this access | cflow.cs:217:17:217:21 | access to field Field |  |
+| cflow.cs:217:17:217:28 | access to property Length | cflow.cs:217:32:217:32 | 0 |  |
+| cflow.cs:217:17:217:32 | ... < ... | cflow.cs:218:13:220:13 | {...} | true |
+| cflow.cs:217:17:217:32 | ... < ... | cflow.cs:221:18:221:22 | this access | false |
+| cflow.cs:217:32:217:32 | 0 | cflow.cs:217:17:217:32 | ... < ... |  |
+| cflow.cs:218:13:220:13 | {...} | cflow.cs:219:17:219:22 | break; |  |
+| cflow.cs:219:17:219:22 | break; | cflow.cs:208:10:208:11 | exit Do (normal) | break |
+| cflow.cs:221:18:221:22 | access to field Field | cflow.cs:221:18:221:29 | access to property Length |  |
+| cflow.cs:221:18:221:22 | this access | cflow.cs:221:18:221:22 | access to field Field |  |
+| cflow.cs:221:18:221:29 | access to property Length | cflow.cs:221:33:221:34 | 10 |  |
+| cflow.cs:221:18:221:34 | ... < ... | cflow.cs:208:10:208:11 | exit Do (normal) | false |
+| cflow.cs:221:18:221:34 | ... < ... | cflow.cs:211:9:221:9 | {...} | true |
+| cflow.cs:221:33:221:34 | 10 | cflow.cs:221:18:221:34 | ... < ... |  |
+| cflow.cs:224:10:224:16 | enter Foreach | cflow.cs:225:5:238:5 | {...} |  |
+| cflow.cs:224:10:224:16 | exit Foreach (normal) | cflow.cs:224:10:224:16 | exit Foreach |  |
+| cflow.cs:225:5:238:5 | {...} | cflow.cs:226:57:226:59 | "a" |  |
+| cflow.cs:226:9:237:9 | foreach (... ... in ...) ... | cflow.cs:224:10:224:16 | exit Foreach (normal) | empty |
+| cflow.cs:226:9:237:9 | foreach (... ... in ...) ... | cflow.cs:226:22:226:22 | String x | non-empty |
+| cflow.cs:226:22:226:22 | String x | cflow.cs:227:9:237:9 | {...} |  |
+| cflow.cs:226:27:226:64 | call to method Repeat<String> | cflow.cs:226:9:237:9 | foreach (... ... in ...) ... |  |
+| 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: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:22 | ... = ... |  |
+| 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: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 |  |
+| cflow.cs:229:17:229:28 | access to property Length | cflow.cs:229:32:229:32 | 0 |  |
+| cflow.cs:229:17:229:32 | ... > ... | cflow.cs:230:13:232:13 | {...} | true |
+| cflow.cs:229:17:229:32 | ... > ... | cflow.cs:233:13:236:13 | if (...) ... | false |
+| cflow.cs:229:32:229:32 | 0 | cflow.cs:229:17:229:32 | ... > ... |  |
+| cflow.cs:230:13:232:13 | {...} | cflow.cs:231:17:231:25 | continue; |  |
+| cflow.cs:231:17:231:25 | continue; | cflow.cs:226:9:237:9 | foreach (... ... in ...) ... | continue |
+| cflow.cs:233:13:236:13 | if (...) ... | cflow.cs:233:17:233:21 | this access |  |
+| cflow.cs:233:17:233:21 | access to field Field | cflow.cs:233:17:233:28 | access to property Length |  |
+| cflow.cs:233:17:233:21 | this access | cflow.cs:233:17:233:21 | access to field Field |  |
+| cflow.cs:233:17:233:28 | access to property Length | cflow.cs:233:32:233:32 | 0 |  |
+| cflow.cs:233:17:233:32 | ... < ... | cflow.cs:226:9:237:9 | foreach (... ... in ...) ... | false |
+| cflow.cs:233:17:233:32 | ... < ... | cflow.cs:234:13:236:13 | {...} | true |
+| cflow.cs:233:32:233:32 | 0 | cflow.cs:233:17:233:32 | ... < ... |  |
+| cflow.cs:234:13:236:13 | {...} | cflow.cs:235:17:235:22 | break; |  |
+| cflow.cs:235:17:235:22 | break; | cflow.cs:224:10:224:16 | exit Foreach (normal) | break |
+| cflow.cs:240:10:240:13 | enter Goto | cflow.cs:241:5:259:5 | {...} |  |
+| cflow.cs:240:10:240:13 | exit Goto (normal) | cflow.cs:240:10:240:13 | exit Goto |  |
+| cflow.cs:241:5:259:5 | {...} | cflow.cs:242:5:242:9 | Label: |  |
+| cflow.cs:242:5:242:9 | Label: | cflow.cs:242:12:242:41 | if (...) ... |  |
+| cflow.cs:242:12:242:41 | if (...) ... | cflow.cs:242:19:242:23 | this access |  |
+| cflow.cs:242:16:242:36 | [false] !... | cflow.cs:244:9:244:41 | if (...) ... | false |
+| cflow.cs:242:16:242:36 | [true] !... | cflow.cs:242:39:242:41 | {...} | true |
+| cflow.cs:242:17:242:36 | [false] !... | cflow.cs:242:16:242:36 | [true] !... | false |
+| cflow.cs:242:17:242:36 | [true] !... | cflow.cs:242:16:242:36 | [false] !... | true |
+| cflow.cs:242:19:242:23 | access to field Field | cflow.cs:242:19:242:30 | access to property Length |  |
+| cflow.cs:242:19:242:23 | this access | cflow.cs:242:19:242:23 | access to field Field |  |
+| cflow.cs:242:19:242:30 | access to property Length | cflow.cs:242:35:242:35 | 0 |  |
+| cflow.cs:242:19:242:35 | ... == ... | cflow.cs:242:17:242:36 | [false] !... | true |
+| cflow.cs:242:19:242:35 | ... == ... | cflow.cs:242:17:242:36 | [true] !... | false |
+| cflow.cs:242:35:242:35 | 0 | cflow.cs:242:19:242:35 | ... == ... |  |
+| cflow.cs:242:39:242:41 | {...} | cflow.cs:244:9:244:41 | if (...) ... |  |
+| cflow.cs:244:9:244:41 | if (...) ... | cflow.cs:244:13:244:17 | this access |  |
+| cflow.cs:244:13:244:17 | access to field Field | cflow.cs:244:13:244:24 | access to property Length |  |
+| cflow.cs:244:13:244:17 | this access | cflow.cs:244:13:244:17 | access to field Field |  |
+| cflow.cs:244:13:244:24 | access to property Length | cflow.cs:244:28:244:28 | 0 |  |
+| cflow.cs:244:13:244:28 | ... > ... | cflow.cs:244:31:244:41 | goto ...; | true |
+| cflow.cs:244:13:244:28 | ... > ... | cflow.cs:246:9:258:9 | switch (...) {...} | false |
+| cflow.cs:244:28:244:28 | 0 | cflow.cs:244:13:244:28 | ... > ... |  |
+| cflow.cs:244:31:244:41 | goto ...; | cflow.cs:242:5:242:9 | Label: | goto(Label) |
+| cflow.cs:246:9:258:9 | switch (...) {...} | cflow.cs:246:17:246:21 | this access |  |
+| cflow.cs:246:17:246:21 | access to field Field | cflow.cs:246:17:246:28 | access to property Length |  |
+| cflow.cs:246:17:246:21 | this access | cflow.cs:246:17:246:21 | access to field Field |  |
+| cflow.cs:246:17:246:28 | access to property Length | cflow.cs:246:32:246:32 | 3 |  |
+| cflow.cs:246:17:246:32 | ... + ... | cflow.cs:248:13:248:19 | case ...: |  |
+| cflow.cs:246:32:246:32 | 3 | cflow.cs:246:17:246:32 | ... + ... |  |
+| cflow.cs:248:13:248:19 | case ...: | cflow.cs:248:18:248:18 | 0 |  |
+| cflow.cs:248:18:248:18 | 0 | cflow.cs:249:17:249:29 | goto default; | match |
+| cflow.cs:248:18:248:18 | 0 | cflow.cs:250:13:250:19 | case ...: | no-match |
+| cflow.cs:249:17:249:29 | goto default; | cflow.cs:255:13:255:20 | default: | goto(default) |
+| cflow.cs:250:13:250:19 | case ...: | cflow.cs:250:18:250:18 | 1 |  |
+| cflow.cs:250:18:250:18 | 1 | cflow.cs:251:17:251:37 | ...; | match |
+| cflow.cs:250:18:250:18 | 1 | cflow.cs:253:13:253:19 | case ...: | no-match |
+| cflow.cs:251:17:251:36 | call to method WriteLine | cflow.cs:252:17:252:22 | break; |  |
+| cflow.cs:251:17:251:37 | ...; | cflow.cs:251:35:251:35 | 1 |  |
+| cflow.cs:251:35:251:35 | 1 | cflow.cs:251:17:251:36 | call to method WriteLine |  |
+| cflow.cs:252:17:252:22 | break; | cflow.cs:240:10:240:13 | exit Goto (normal) | break |
+| cflow.cs:253:13:253:19 | case ...: | cflow.cs:253:18:253:18 | 2 |  |
+| cflow.cs:253:18:253:18 | 2 | cflow.cs:254:17:254:27 | goto ...; | match |
+| cflow.cs:253:18:253:18 | 2 | cflow.cs:255:13:255:20 | default: | no-match |
+| cflow.cs:254:17:254:27 | goto ...; | cflow.cs:242:5:242:9 | Label: | goto(Label) |
+| cflow.cs:255:13:255:20 | default: | cflow.cs:256:17:256:37 | ...; |  |
+| cflow.cs:256:17:256:36 | call to method WriteLine | cflow.cs:257:17:257:22 | break; |  |
+| cflow.cs:256:17:256:37 | ...; | cflow.cs:256:35:256:35 | 0 |  |
+| cflow.cs:256:35:256:35 | 0 | cflow.cs:256:17:256:36 | call to method WriteLine |  |
+| cflow.cs:257:17:257:22 | break; | cflow.cs:240:10:240:13 | exit Goto (normal) | break |
+| cflow.cs:261:49:261:53 | enter Yield | cflow.cs:262:5:277:5 | {...} |  |
+| cflow.cs:261:49:261:53 | exit Yield (normal) | cflow.cs:261:49:261:53 | exit Yield |  |
+| cflow.cs:262:5:277:5 | {...} | cflow.cs:263:22:263:22 | 0 |  |
+| cflow.cs:263:9:263:23 | yield return ...; | cflow.cs:264:9:267:9 | for (...;...;...) ... |  |
+| cflow.cs:263:22:263:22 | 0 | cflow.cs:263:9:263:23 | yield return ...; |  |
+| cflow.cs:264:9:267:9 | for (...;...;...) ... | cflow.cs:264:22:264:22 | 1 |  |
+| cflow.cs:264:18:264:22 | Int32 i = ... | cflow.cs:264:25:264:25 | access to local variable i |  |
+| cflow.cs:264:22:264:22 | 1 | cflow.cs:264:18:264:22 | Int32 i = ... |  |
+| cflow.cs:264:25:264:25 | access to local variable i | cflow.cs:264:29:264:30 | 10 |  |
+| cflow.cs:264:25:264:30 | ... < ... | cflow.cs:265:9:267:9 | {...} | true |
+| cflow.cs:264:25:264:30 | ... < ... | cflow.cs:268:9:276:9 | try {...} ... | false |
+| cflow.cs:264:29:264:30 | 10 | cflow.cs:264:25:264:30 | ... < ... |  |
+| cflow.cs:264:33:264:33 | access to local variable i | cflow.cs:264:33:264:35 | ...++ |  |
+| cflow.cs:264:33:264:35 | ...++ | cflow.cs:264:25:264:25 | access to local variable i |  |
+| cflow.cs:265:9:267:9 | {...} | cflow.cs:266:26:266:26 | access to local variable i |  |
+| cflow.cs:266:13:266:27 | yield return ...; | cflow.cs:264:33:264:33 | access to local variable i |  |
+| cflow.cs:266:26:266:26 | access to local variable i | cflow.cs:266:13:266:27 | yield return ...; |  |
+| cflow.cs:268:9:276:9 | try {...} ... | cflow.cs:269:9:272:9 | {...} |  |
+| cflow.cs:269:9:272:9 | {...} | cflow.cs:270:13:270:24 | yield break; |  |
+| cflow.cs:270:13:270:24 | yield break; | cflow.cs:274:9:276:9 | [finally: return] {...} | return |
+| cflow.cs:274:9:276:9 | [finally: return] {...} | cflow.cs:275:13:275:42 | [finally: return] ...; |  |
+| cflow.cs:275:13:275:41 | [finally: return] call to method WriteLine | cflow.cs:261:49:261:53 | exit Yield (normal) | return |
+| cflow.cs:275:13:275:42 | [finally: return] ...; | cflow.cs:275:31:275:40 | [finally: return] "not dead" |  |
+| cflow.cs:275:31:275:40 | [finally: return] "not dead" | cflow.cs:275:13:275:41 | [finally: return] call to method WriteLine |  |
+| cflow.cs:282:5:282:18 | enter ControlFlowSub | cflow.cs:282:24:282:27 | call to constructor ControlFlow |  |
+| cflow.cs:282:5:282:18 | exit ControlFlowSub (normal) | cflow.cs:282:5:282:18 | exit ControlFlowSub |  |
+| cflow.cs:282:24:282:27 | call to constructor ControlFlow | cflow.cs:282:31:282:33 | {...} |  |
+| cflow.cs:282:31:282:33 | {...} | cflow.cs:282:5:282:18 | exit ControlFlowSub (normal) |  |
+| cflow.cs:284:5:284:18 | enter ControlFlowSub | cflow.cs:284:32:284:35 | call to constructor ControlFlowSub |  |
+| cflow.cs:284:5:284:18 | exit ControlFlowSub (normal) | cflow.cs:284:5:284:18 | exit ControlFlowSub |  |
+| cflow.cs:284:32:284:35 | call to constructor ControlFlowSub | cflow.cs:284:39:284:41 | {...} |  |
+| cflow.cs:284:39:284:41 | {...} | cflow.cs:284:5:284:18 | exit ControlFlowSub (normal) |  |
+| cflow.cs:286:5:286:18 | enter ControlFlowSub | cflow.cs:286:34:286:34 | access to parameter i |  |
+| cflow.cs:286:5:286:18 | exit ControlFlowSub (normal) | cflow.cs:286:5:286:18 | exit ControlFlowSub |  |
+| cflow.cs:286:29:286:32 | call to constructor ControlFlowSub | cflow.cs:286:48:286:50 | {...} |  |
+| cflow.cs:286:34:286:34 | access to parameter i | cflow.cs:286:34:286:45 | call to method ToString |  |
+| cflow.cs:286:34:286:45 | call to method ToString | cflow.cs:286:29:286:32 | call to constructor ControlFlowSub |  |
+| cflow.cs:286:48:286:50 | {...} | cflow.cs:286:5:286:18 | exit ControlFlowSub (normal) |  |
+| cflow.cs:289:7:289:18 | call to constructor Object | cflow.cs:289:7:289:18 | {...} |  |
+| cflow.cs:289:7:289:18 | enter DelegateCall | cflow.cs:289:7:289:18 | call to constructor Object |  |
+| cflow.cs:289:7:289:18 | exit DelegateCall (normal) | cflow.cs:289:7:289:18 | exit DelegateCall |  |
+| cflow.cs:289:7:289:18 | {...} | cflow.cs:289:7:289:18 | exit DelegateCall (normal) |  |
+| cflow.cs:291:12:291:12 | enter M | cflow.cs:291:38:291:38 | access to parameter f |  |
+| cflow.cs:291:12:291:12 | exit M (normal) | cflow.cs:291:12:291:12 | exit M |  |
+| cflow.cs:291:38:291:38 | access to parameter f | cflow.cs:291:40:291:40 | 0 |  |
+| cflow.cs:291:38:291:41 | delegate call | cflow.cs:291:12:291:12 | exit M (normal) |  |
+| cflow.cs:291:40:291:40 | 0 | cflow.cs:291:38:291:41 | delegate call |  |
+| cflow.cs:296:5:296:25 | call to constructor Object | cflow.cs:296:52:296:54 | {...} |  |
+| cflow.cs:296:5:296:25 | enter NegationInConstructor | cflow.cs:296:5:296:25 | call to constructor Object |  |
+| cflow.cs:296:5:296:25 | exit NegationInConstructor (normal) | cflow.cs:296:5:296:25 | exit NegationInConstructor |  |
+| cflow.cs:296:52:296:54 | {...} | cflow.cs:296:5:296:25 | exit NegationInConstructor (normal) |  |
+| cflow.cs:298:10:298:10 | enter M | cflow.cs:299:5:301:5 | {...} |  |
+| cflow.cs:298:10:298:10 | exit M (normal) | cflow.cs:298:10:298:10 | exit M |  |
+| cflow.cs:299:5:301:5 | {...} | cflow.cs:300:9:300:73 | ...; |  |
+| cflow.cs:300:9:300:72 | object creation of type NegationInConstructor | cflow.cs:298:10:298:10 | exit M (normal) |  |
+| cflow.cs:300:9:300:73 | ...; | cflow.cs:300:38:300:38 | 0 |  |
+| cflow.cs:300:38:300:38 | 0 | cflow.cs:300:46:300:46 | access to parameter i |  |
+| cflow.cs:300:44:300:51 | [false] !... | cflow.cs:300:44:300:64 | ... && ... | false |
+| cflow.cs:300:44:300:51 | [true] !... | cflow.cs:300:56:300:56 | access to parameter s | true |
+| cflow.cs:300:44:300:64 | ... && ... | cflow.cs:300:70:300:71 | "" |  |
+| cflow.cs:300:46:300:46 | access to parameter i | cflow.cs:300:50:300:50 | 0 |  |
+| cflow.cs:300:46:300:50 | ... > ... | cflow.cs:300:44:300:51 | [false] !... | true |
+| cflow.cs:300:46:300:50 | ... > ... | cflow.cs:300:44:300:51 | [true] !... | false |
+| cflow.cs:300:50:300:50 | 0 | cflow.cs:300:46:300:50 | ... > ... |  |
+| cflow.cs:300:56:300:56 | access to parameter s | cflow.cs:300:61:300:64 | null |  |
+| cflow.cs:300:56:300:64 | ... != ... | cflow.cs:300:44:300:64 | ... && ... |  |
+| cflow.cs:300:61:300:64 | null | cflow.cs:300:56:300:64 | ... != ... |  |
+| cflow.cs:300:70:300:71 | "" | cflow.cs:300:9:300:72 | object creation of type NegationInConstructor |  |
+| cflow.cs:304:7:304:18 | call to constructor Object | cflow.cs:304:7:304:18 | {...} |  |
+| cflow.cs:304:7:304:18 | enter LambdaGetter | cflow.cs:304:7:304:18 | call to constructor Object |  |
+| cflow.cs:304:7:304:18 | exit LambdaGetter (normal) | cflow.cs:304:7:304:18 | exit LambdaGetter |  |
+| cflow.cs:304:7:304:18 | {...} | cflow.cs:304:7:304:18 | exit LambdaGetter (normal) |  |
+| cflow.cs:306:60:310:5 | (...) => ... | cflow.cs:306:60:310:5 | exit get__getter (normal) |  |
+| cflow.cs:306:60:310:5 | enter (...) => ... | cflow.cs:307:5:310:5 | {...} |  |
+| cflow.cs:306:60:310:5 | enter get__getter | cflow.cs:306:60:310:5 | (...) => ... |  |
+| cflow.cs:306:60:310:5 | exit (...) => ... (normal) | cflow.cs:306:60:310:5 | exit (...) => ... |  |
+| cflow.cs:306:60:310:5 | exit get__getter (normal) | cflow.cs:306:60:310:5 | exit get__getter |  |
+| cflow.cs:307:5:310:5 | {...} | cflow.cs:308:9:308:21 | ... ...; |  |
+| cflow.cs:308:9:308:21 | ... ...; | cflow.cs:308:20:308:20 | access to parameter o |  |
+| cflow.cs:308:16:308:20 | Object x = ... | cflow.cs:309:16:309:16 | access to local variable x |  |
+| cflow.cs:308:20:308:20 | access to parameter o | cflow.cs:308:16:308:20 | Object x = ... |  |
+| cflow.cs:309:9:309:17 | return ...; | cflow.cs:306:60:310:5 | exit (...) => ... (normal) | return |
+| cflow.cs:309:16:309:16 | access to local variable x | cflow.cs:309:9:309:17 | return ...; |  |
diff --git a/csharp/ql/test/library-tests/controlflow/graph/NodeGraph.ql b/csharp/ql/test/library-tests/controlflow/graph/NodeGraph.ql
index 62805d6e6c9..6915c2a546c 100644
--- a/csharp/ql/test/library-tests/controlflow/graph/NodeGraph.ql
+++ b/csharp/ql/test/library-tests/controlflow/graph/NodeGraph.ql
@@ -1,12 +1,3 @@
-/**
- * @kind graph
- */
-
 import csharp
 import Common
-
-private class MyRelevantNode extends SourceControlFlowNode {
-  string getOrderDisambiguation() { result = "" }
-}
-
-import semmle.code.csharp.controlflow.internal.ControlFlowGraphImpl::TestOutput<MyRelevantNode>
+import semmle.code.csharp.controlflow.internal.ControlFlowGraphImpl::TestOutput<SourceControlFlowNode>
diff --git a/csharp/ql/test/library-tests/dataflow/collections/CollectionFlow.expected b/csharp/ql/test/library-tests/dataflow/collections/CollectionFlow.expected
index dfc46ac8071..18155300ff0 100644
--- a/csharp/ql/test/library-tests/dataflow/collections/CollectionFlow.expected
+++ b/csharp/ql/test/library-tests/dataflow/collections/CollectionFlow.expected
@@ -12,18 +12,19 @@ models
 | 11 | Summary: System.Collections.Generic; IList<T>; true; get_Item; (System.Int32); ; Argument[this].Element; ReturnValue; value; manual |
 | 12 | Summary: System.Collections.Generic; IList<T>; true; set_Item; (System.Int32,T); ; Argument[1]; Argument[this].Element; value; manual |
 | 13 | Summary: System.Collections.Generic; KeyValuePair<TKey,TValue>; false; KeyValuePair; (TKey,TValue); ; Argument[0]; Argument[this].Property[System.Collections.Generic.KeyValuePair`2.Key]; value; manual |
-| 14 | Summary: System.Collections.Generic; List<T>; false; GetEnumerator; (); ; Argument[this].Element; ReturnValue.Property[System.Collections.Generic.List`1+Enumerator.Current]; value; manual |
-| 15 | Summary: System.Collections; IEnumerable; true; GetEnumerator; (); ; Argument[this].Element; ReturnValue.Property[System.Collections.IEnumerator.Current]; value; manual |
-| 16 | Summary: System.Linq; Enumerable; false; First<TSource>; (System.Collections.Generic.IEnumerable<TSource>); ; Argument[0].Element; ReturnValue; value; manual |
-| 17 | Summary: System.Linq; Enumerable; false; Select<TSource,TResult>; (System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,TResult>); ; Argument[0].Element; Argument[1].Parameter[0]; value; manual |
-| 18 | Summary: System; ReadOnlySpan<T>; false; get_Item; (System.Int32); ; Argument[this].Element; ReturnValue; value; manual |
+| 14 | Summary: System.Collections.Generic; List<T>+Enumerator; false; get_Current; (); ; Argument[this].Property[System.Collections.Generic.List`1+Enumerator.Current]; ReturnValue; value; dfc-generated |
+| 15 | Summary: System.Collections.Generic; List<T>; false; GetEnumerator; (); ; Argument[this].Element; ReturnValue.Property[System.Collections.Generic.List`1+Enumerator.Current]; value; manual |
+| 16 | Summary: System.Collections; IEnumerable; true; GetEnumerator; (); ; Argument[this].Element; ReturnValue.Property[System.Collections.IEnumerator.Current]; value; manual |
+| 17 | Summary: System.Linq; Enumerable; false; First<TSource>; (System.Collections.Generic.IEnumerable<TSource>); ; Argument[0].Element; ReturnValue; value; manual |
+| 18 | Summary: System.Linq; Enumerable; false; Select<TSource,TResult>; (System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,TResult>); ; Argument[0].Element; Argument[1].Parameter[0]; value; manual |
 | 19 | Summary: System; ReadOnlySpan<T>; false; ReadOnlySpan; (T[]); ; Argument[0].Element; Argument[this].Element; value; manual |
-| 20 | Summary: System; Span<T>; false; CopyTo; (System.Span<T>); ; Argument[this].Element; Argument[0].Element; value; manual |
-| 21 | Summary: System; Span<T>; false; Fill; (T); ; Argument[0]; Argument[this].Element; value; manual |
-| 22 | Summary: System; Span<T>; false; get_Item; (System.Int32); ; Argument[this].Element; ReturnValue; value; manual |
+| 20 | Summary: System; ReadOnlySpan<T>; false; get_Item; (System.Int32); ; Argument[this].Element; ReturnValue; value; manual |
+| 21 | Summary: System; Span<T>; false; CopyTo; (System.Span<T>); ; Argument[this].Element; Argument[0].Element; value; manual |
+| 22 | Summary: System; Span<T>; false; Fill; (T); ; Argument[0]; Argument[this].Element; value; manual |
 | 23 | Summary: System; Span<T>; false; Span; (T); ; Argument[0]; Argument[this].Element; value; manual |
 | 24 | Summary: System; Span<T>; false; Span; (T[]); ; Argument[0].Element; Argument[this].Element; value; manual |
 | 25 | Summary: System; Span<T>; false; ToArray; (); ; Argument[this].Element; ReturnValue.Element; value; manual |
+| 26 | Summary: System; Span<T>; false; get_Item; (System.Int32); ; Argument[this].Element; ReturnValue; value; manual |
 edges
 | CollectionFlow.cs:14:40:14:41 | ts : A[] [element] : A | CollectionFlow.cs:14:52:14:53 | access to parameter ts : A[] [element] : A | provenance |  |
 | CollectionFlow.cs:14:40:14:41 | ts : null [element] : A | CollectionFlow.cs:14:52:14:53 | access to parameter ts : null [element] : A | provenance |  |
@@ -36,7 +37,7 @@ edges
 | CollectionFlow.cs:20:59:20:62 | dict : Dictionary<T,T> [element, property Key] : A | CollectionFlow.cs:20:73:20:76 | access to parameter dict : Dictionary<T,T> [element, property Key] : A | provenance |  |
 | CollectionFlow.cs:20:73:20:76 | access to parameter dict : Dictionary<T,T> [element, property Key] : A | CollectionFlow.cs:20:73:20:81 | access to property Keys : ICollection<T> [element] : A | provenance | MaD:1 |
 | CollectionFlow.cs:20:73:20:76 | access to parameter dict : Dictionary<T,T> [element, property Key] : A | CollectionFlow.cs:20:73:20:81 | access to property Keys : ICollection<T> [element] : A | provenance | MaD:7 |
-| CollectionFlow.cs:20:73:20:81 | access to property Keys : ICollection<T> [element] : A | CollectionFlow.cs:20:73:20:89 | call to method First<T> | provenance | MaD:16 |
+| CollectionFlow.cs:20:73:20:81 | access to property Keys : ICollection<T> [element] : A | CollectionFlow.cs:20:73:20:89 | call to method First<T> | provenance | MaD:17 |
 | CollectionFlow.cs:22:34:22:35 | ts : A[] [element] : A | CollectionFlow.cs:22:41:22:42 | access to parameter ts : A[] [element] : A | provenance |  |
 | CollectionFlow.cs:22:34:22:35 | ts : null [element] : A | CollectionFlow.cs:22:41:22:42 | access to parameter ts : null [element] : A | provenance |  |
 | CollectionFlow.cs:22:41:22:42 | access to parameter ts : A[] [element] : A | CollectionFlow.cs:22:41:22:45 | access to array element : A | provenance |  |
@@ -46,18 +47,18 @@ edges
 | CollectionFlow.cs:26:58:26:61 | dict : Dictionary<T,T> [element, property Value] : A | CollectionFlow.cs:26:67:26:70 | access to parameter dict : Dictionary<T,T> [element, property Value] : A | provenance |  |
 | CollectionFlow.cs:26:67:26:70 | access to parameter dict : Dictionary<T,T> [element, property Value] : A | CollectionFlow.cs:26:67:26:73 | access to indexer : A | provenance | MaD:6 |
 | CollectionFlow.cs:28:59:28:62 | dict : Dictionary<T,T> [element, property Value] : A | CollectionFlow.cs:28:68:28:71 | access to parameter dict : Dictionary<T,T> [element, property Value] : A | provenance |  |
-| CollectionFlow.cs:28:68:28:71 | access to parameter dict : Dictionary<T,T> [element, property Value] : A | CollectionFlow.cs:28:68:28:79 | call to method First<KeyValuePair<Int32,T>> : KeyValuePair<Int32,T> [property Value] : A | provenance | MaD:16 |
+| CollectionFlow.cs:28:68:28:71 | access to parameter dict : Dictionary<T,T> [element, property Value] : A | CollectionFlow.cs:28:68:28:79 | call to method First<KeyValuePair<Int32,T>> : KeyValuePair<Int32,T> [property Value] : A | provenance | MaD:17 |
 | CollectionFlow.cs:28:68:28:79 | call to method First<KeyValuePair<Int32,T>> : KeyValuePair<Int32,T> [property Value] : A | CollectionFlow.cs:28:68:28:85 | access to property Value : A | provenance |  |
 | CollectionFlow.cs:30:60:30:63 | dict : Dictionary<T,T> [element, property Value] : A | CollectionFlow.cs:30:69:30:72 | access to parameter dict : Dictionary<T,T> [element, property Value] : A | provenance |  |
 | CollectionFlow.cs:30:69:30:72 | access to parameter dict : Dictionary<T,T> [element, property Value] : A | CollectionFlow.cs:30:69:30:79 | access to property Values : ICollection<T> [element] : A | provenance | MaD:2 |
 | CollectionFlow.cs:30:69:30:72 | access to parameter dict : Dictionary<T,T> [element, property Value] : A | CollectionFlow.cs:30:69:30:79 | access to property Values : ICollection<T> [element] : A | provenance | MaD:8 |
-| CollectionFlow.cs:30:69:30:79 | access to property Values : ICollection<T> [element] : A | CollectionFlow.cs:30:69:30:87 | call to method First<T> : A | provenance | MaD:16 |
+| CollectionFlow.cs:30:69:30:79 | access to property Values : ICollection<T> [element] : A | CollectionFlow.cs:30:69:30:87 | call to method First<T> : A | provenance | MaD:17 |
 | CollectionFlow.cs:32:58:32:61 | dict : Dictionary<T,T> [element, property Key] : A | CollectionFlow.cs:32:67:32:70 | access to parameter dict : Dictionary<T,T> [element, property Key] : A | provenance |  |
 | CollectionFlow.cs:32:67:32:70 | access to parameter dict : Dictionary<T,T> [element, property Key] : A | CollectionFlow.cs:32:67:32:75 | access to property Keys : ICollection<T> [element] : A | provenance | MaD:1 |
 | CollectionFlow.cs:32:67:32:70 | access to parameter dict : Dictionary<T,T> [element, property Key] : A | CollectionFlow.cs:32:67:32:75 | access to property Keys : ICollection<T> [element] : A | provenance | MaD:7 |
-| CollectionFlow.cs:32:67:32:75 | access to property Keys : ICollection<T> [element] : A | CollectionFlow.cs:32:67:32:83 | call to method First<T> : A | provenance | MaD:16 |
+| CollectionFlow.cs:32:67:32:75 | access to property Keys : ICollection<T> [element] : A | CollectionFlow.cs:32:67:32:83 | call to method First<T> : A | provenance | MaD:17 |
 | CollectionFlow.cs:34:57:34:60 | dict : Dictionary<T,T> [element, property Key] : A | CollectionFlow.cs:34:66:34:69 | access to parameter dict : Dictionary<T,T> [element, property Key] : A | provenance |  |
-| CollectionFlow.cs:34:66:34:69 | access to parameter dict : Dictionary<T,T> [element, property Key] : A | CollectionFlow.cs:34:66:34:77 | call to method First<KeyValuePair<T,Int32>> : KeyValuePair<T,Int32> [property Key] : A | provenance | MaD:16 |
+| CollectionFlow.cs:34:66:34:69 | access to parameter dict : Dictionary<T,T> [element, property Key] : A | CollectionFlow.cs:34:66:34:77 | call to method First<KeyValuePair<T,Int32>> : KeyValuePair<T,Int32> [property Key] : A | provenance | MaD:17 |
 | CollectionFlow.cs:34:66:34:77 | call to method First<KeyValuePair<T,Int32>> : KeyValuePair<T,Int32> [property Key] : A | CollectionFlow.cs:34:66:34:81 | access to property Key : A | provenance |  |
 | CollectionFlow.cs:36:49:36:52 | args : A[] [element] : A | CollectionFlow.cs:36:63:36:66 | access to parameter args : A[] [element] : A | provenance |  |
 | CollectionFlow.cs:36:49:36:52 | args : null [element] : A | CollectionFlow.cs:36:63:36:66 | access to parameter args : null [element] : A | provenance |  |
@@ -143,7 +144,7 @@ edges
 | CollectionFlow.cs:156:28:156:31 | access to local variable dict : Dictionary<T,T> [element, property Value] : A | CollectionFlow.cs:26:58:26:61 | dict : Dictionary<T,T> [element, property Value] : A | provenance |  |
 | CollectionFlow.cs:156:28:156:31 | access to local variable dict : Dictionary<T,T> [element, property Value] : A | CollectionFlow.cs:156:14:156:32 | call to method DictIndexZero<A> | provenance | MaD:6 |
 | CollectionFlow.cs:157:29:157:32 | access to local variable dict : Dictionary<T,T> [element, property Value] : A | CollectionFlow.cs:28:59:28:62 | dict : Dictionary<T,T> [element, property Value] : A | provenance |  |
-| CollectionFlow.cs:157:29:157:32 | access to local variable dict : Dictionary<T,T> [element, property Value] : A | CollectionFlow.cs:157:14:157:33 | call to method DictFirstValue<A> | provenance | MaD:16 |
+| CollectionFlow.cs:157:29:157:32 | access to local variable dict : Dictionary<T,T> [element, property Value] : A | CollectionFlow.cs:157:14:157:33 | call to method DictFirstValue<A> | provenance | MaD:17 |
 | CollectionFlow.cs:158:30:158:33 | access to local variable dict : Dictionary<T,T> [element, property Value] : A | CollectionFlow.cs:30:60:30:63 | dict : Dictionary<T,T> [element, property Value] : A | provenance |  |
 | CollectionFlow.cs:158:30:158:33 | access to local variable dict : Dictionary<T,T> [element, property Value] : A | CollectionFlow.cs:158:14:158:34 | call to method DictValuesFirst<A> | provenance | MaD:2 |
 | CollectionFlow.cs:158:30:158:33 | access to local variable dict : Dictionary<T,T> [element, property Value] : A | CollectionFlow.cs:158:14:158:34 | call to method DictValuesFirst<A> | provenance | MaD:8 |
@@ -161,7 +162,7 @@ edges
 | CollectionFlow.cs:178:28:178:31 | access to local variable dict : Dictionary<T,T> [element, property Value] : A | CollectionFlow.cs:26:58:26:61 | dict : Dictionary<T,T> [element, property Value] : A | provenance |  |
 | CollectionFlow.cs:178:28:178:31 | access to local variable dict : Dictionary<T,T> [element, property Value] : A | CollectionFlow.cs:178:14:178:32 | call to method DictIndexZero<A> | provenance | MaD:6 |
 | CollectionFlow.cs:179:29:179:32 | access to local variable dict : Dictionary<T,T> [element, property Value] : A | CollectionFlow.cs:28:59:28:62 | dict : Dictionary<T,T> [element, property Value] : A | provenance |  |
-| CollectionFlow.cs:179:29:179:32 | access to local variable dict : Dictionary<T,T> [element, property Value] : A | CollectionFlow.cs:179:14:179:33 | call to method DictFirstValue<A> | provenance | MaD:16 |
+| CollectionFlow.cs:179:29:179:32 | access to local variable dict : Dictionary<T,T> [element, property Value] : A | CollectionFlow.cs:179:14:179:33 | call to method DictFirstValue<A> | provenance | MaD:17 |
 | CollectionFlow.cs:180:30:180:33 | access to local variable dict : Dictionary<T,T> [element, property Value] : A | CollectionFlow.cs:30:60:30:63 | dict : Dictionary<T,T> [element, property Value] : A | provenance |  |
 | CollectionFlow.cs:180:30:180:33 | access to local variable dict : Dictionary<T,T> [element, property Value] : A | CollectionFlow.cs:180:14:180:34 | call to method DictValuesFirst<A> | provenance | MaD:2 |
 | CollectionFlow.cs:180:30:180:33 | access to local variable dict : Dictionary<T,T> [element, property Value] : A | CollectionFlow.cs:180:14:180:34 | call to method DictValuesFirst<A> | provenance | MaD:8 |
@@ -179,7 +180,7 @@ edges
 | CollectionFlow.cs:199:28:199:31 | access to local variable dict : Dictionary<T,T> [element, property Value] : A | CollectionFlow.cs:26:58:26:61 | dict : Dictionary<T,T> [element, property Value] : A | provenance |  |
 | CollectionFlow.cs:199:28:199:31 | access to local variable dict : Dictionary<T,T> [element, property Value] : A | CollectionFlow.cs:199:14:199:32 | call to method DictIndexZero<A> | provenance | MaD:6 |
 | CollectionFlow.cs:200:29:200:32 | access to local variable dict : Dictionary<T,T> [element, property Value] : A | CollectionFlow.cs:28:59:28:62 | dict : Dictionary<T,T> [element, property Value] : A | provenance |  |
-| CollectionFlow.cs:200:29:200:32 | access to local variable dict : Dictionary<T,T> [element, property Value] : A | CollectionFlow.cs:200:14:200:33 | call to method DictFirstValue<A> | provenance | MaD:16 |
+| CollectionFlow.cs:200:29:200:32 | access to local variable dict : Dictionary<T,T> [element, property Value] : A | CollectionFlow.cs:200:14:200:33 | call to method DictFirstValue<A> | provenance | MaD:17 |
 | CollectionFlow.cs:201:30:201:33 | access to local variable dict : Dictionary<T,T> [element, property Value] : A | CollectionFlow.cs:30:60:30:63 | dict : Dictionary<T,T> [element, property Value] : A | provenance |  |
 | CollectionFlow.cs:201:30:201:33 | access to local variable dict : Dictionary<T,T> [element, property Value] : A | CollectionFlow.cs:201:14:201:34 | call to method DictValuesFirst<A> | provenance | MaD:2 |
 | CollectionFlow.cs:201:30:201:33 | access to local variable dict : Dictionary<T,T> [element, property Value] : A | CollectionFlow.cs:201:14:201:34 | call to method DictValuesFirst<A> | provenance | MaD:8 |
@@ -192,13 +193,13 @@ edges
 | CollectionFlow.cs:218:20:218:56 | object creation of type Dictionary<A,Int32> : Dictionary<T,T> [element, property Key] : A | CollectionFlow.cs:218:13:218:16 | access to local variable dict : Dictionary<T,T> [element, property Key] : A | provenance |  |
 | CollectionFlow.cs:218:49:218:49 | access to local variable a : A | CollectionFlow.cs:218:20:218:56 | object creation of type Dictionary<A,Int32> : Dictionary<T,T> [element, property Key] : A | provenance | MaD:4 |
 | CollectionFlow.cs:219:14:219:17 | access to local variable dict : Dictionary<T,T> [element, property Key] : A | CollectionFlow.cs:219:14:219:22 | access to property Keys : Dictionary<T,T>.KeyCollection [element] : A | provenance | MaD:1 |
-| CollectionFlow.cs:219:14:219:22 | access to property Keys : Dictionary<T,T>.KeyCollection [element] : A | CollectionFlow.cs:219:14:219:30 | call to method First<A> | provenance | MaD:16 |
+| CollectionFlow.cs:219:14:219:22 | access to property Keys : Dictionary<T,T>.KeyCollection [element] : A | CollectionFlow.cs:219:14:219:30 | call to method First<A> | provenance | MaD:17 |
 | CollectionFlow.cs:220:21:220:24 | access to local variable dict : Dictionary<T,T> [element, property Key] : A | CollectionFlow.cs:20:59:20:62 | dict : Dictionary<T,T> [element, property Key] : A | provenance |  |
 | CollectionFlow.cs:221:28:221:31 | access to local variable dict : Dictionary<T,T> [element, property Key] : A | CollectionFlow.cs:32:58:32:61 | dict : Dictionary<T,T> [element, property Key] : A | provenance |  |
 | CollectionFlow.cs:221:28:221:31 | access to local variable dict : Dictionary<T,T> [element, property Key] : A | CollectionFlow.cs:221:14:221:32 | call to method DictKeysFirst<A> | provenance | MaD:1 |
 | CollectionFlow.cs:221:28:221:31 | access to local variable dict : Dictionary<T,T> [element, property Key] : A | CollectionFlow.cs:221:14:221:32 | call to method DictKeysFirst<A> | provenance | MaD:7 |
 | CollectionFlow.cs:222:27:222:30 | access to local variable dict : Dictionary<T,T> [element, property Key] : A | CollectionFlow.cs:34:57:34:60 | dict : Dictionary<T,T> [element, property Key] : A | provenance |  |
-| CollectionFlow.cs:222:27:222:30 | access to local variable dict : Dictionary<T,T> [element, property Key] : A | CollectionFlow.cs:222:14:222:31 | call to method DictFirstKey<A> | provenance | MaD:16 |
+| CollectionFlow.cs:222:27:222:30 | access to local variable dict : Dictionary<T,T> [element, property Key] : A | CollectionFlow.cs:222:14:222:31 | call to method DictFirstKey<A> | provenance | MaD:17 |
 | CollectionFlow.cs:236:13:236:13 | access to local variable a : A | CollectionFlow.cs:237:48:237:48 | access to local variable a : A | provenance |  |
 | CollectionFlow.cs:236:17:236:23 | object creation of type A : A | CollectionFlow.cs:236:13:236:13 | access to local variable a : A | provenance |  |
 | CollectionFlow.cs:237:13:237:16 | access to local variable dict : Dictionary<T,T> [element, property Key] : A | CollectionFlow.cs:238:14:238:17 | access to local variable dict : Dictionary<T,T> [element, property Key] : A | provenance |  |
@@ -208,13 +209,13 @@ edges
 | CollectionFlow.cs:237:20:237:55 | object creation of type Dictionary<A,Int32> : Dictionary<T,T> [element, property Key] : A | CollectionFlow.cs:237:13:237:16 | access to local variable dict : Dictionary<T,T> [element, property Key] : A | provenance |  |
 | CollectionFlow.cs:237:48:237:48 | access to local variable a : A | CollectionFlow.cs:237:20:237:55 | object creation of type Dictionary<A,Int32> : Dictionary<T,T> [element, property Key] : A | provenance | MaD:9 |
 | CollectionFlow.cs:238:14:238:17 | access to local variable dict : Dictionary<T,T> [element, property Key] : A | CollectionFlow.cs:238:14:238:22 | access to property Keys : Dictionary<T,T>.KeyCollection [element] : A | provenance | MaD:1 |
-| CollectionFlow.cs:238:14:238:22 | access to property Keys : Dictionary<T,T>.KeyCollection [element] : A | CollectionFlow.cs:238:14:238:30 | call to method First<A> | provenance | MaD:16 |
+| CollectionFlow.cs:238:14:238:22 | access to property Keys : Dictionary<T,T>.KeyCollection [element] : A | CollectionFlow.cs:238:14:238:30 | call to method First<A> | provenance | MaD:17 |
 | CollectionFlow.cs:239:21:239:24 | access to local variable dict : Dictionary<T,T> [element, property Key] : A | CollectionFlow.cs:20:59:20:62 | dict : Dictionary<T,T> [element, property Key] : A | provenance |  |
 | CollectionFlow.cs:240:28:240:31 | access to local variable dict : Dictionary<T,T> [element, property Key] : A | CollectionFlow.cs:32:58:32:61 | dict : Dictionary<T,T> [element, property Key] : A | provenance |  |
 | CollectionFlow.cs:240:28:240:31 | access to local variable dict : Dictionary<T,T> [element, property Key] : A | CollectionFlow.cs:240:14:240:32 | call to method DictKeysFirst<A> | provenance | MaD:1 |
 | CollectionFlow.cs:240:28:240:31 | access to local variable dict : Dictionary<T,T> [element, property Key] : A | CollectionFlow.cs:240:14:240:32 | call to method DictKeysFirst<A> | provenance | MaD:7 |
 | CollectionFlow.cs:241:27:241:30 | access to local variable dict : Dictionary<T,T> [element, property Key] : A | CollectionFlow.cs:34:57:34:60 | dict : Dictionary<T,T> [element, property Key] : A | provenance |  |
-| CollectionFlow.cs:241:27:241:30 | access to local variable dict : Dictionary<T,T> [element, property Key] : A | CollectionFlow.cs:241:14:241:31 | call to method DictFirstKey<A> | provenance | MaD:16 |
+| CollectionFlow.cs:241:27:241:30 | access to local variable dict : Dictionary<T,T> [element, property Key] : A | CollectionFlow.cs:241:14:241:31 | call to method DictFirstKey<A> | provenance | MaD:17 |
 | CollectionFlow.cs:255:13:255:13 | access to local variable a : A | CollectionFlow.cs:256:27:256:27 | access to local variable a : A | provenance |  |
 | CollectionFlow.cs:255:17:255:23 | object creation of type A : A | CollectionFlow.cs:255:13:255:13 | access to local variable a : A | provenance |  |
 | CollectionFlow.cs:256:13:256:15 | access to local variable as : null [element] : A | CollectionFlow.cs:257:27:257:29 | access to local variable as : null [element] : A | provenance |  |
@@ -227,7 +228,7 @@ edges
 | CollectionFlow.cs:271:25:271:29 | { ..., ... } : null [element] : A | CollectionFlow.cs:271:13:271:15 | access to local variable as : null [element] : A | provenance |  |
 | CollectionFlow.cs:271:27:271:27 | access to local variable a : A | CollectionFlow.cs:271:25:271:29 | { ..., ... } : null [element] : A | provenance |  |
 | CollectionFlow.cs:272:13:272:22 | access to local variable enumerator : IEnumerator [property Current] : A | CollectionFlow.cs:274:18:274:27 | access to local variable enumerator : IEnumerator [property Current] : A | provenance |  |
-| CollectionFlow.cs:272:26:272:28 | access to local variable as : null [element] : A | CollectionFlow.cs:272:26:272:44 | call to method GetEnumerator : IEnumerator [property Current] : A | provenance | MaD:15 |
+| CollectionFlow.cs:272:26:272:28 | access to local variable as : null [element] : A | CollectionFlow.cs:272:26:272:44 | call to method GetEnumerator : IEnumerator [property Current] : A | provenance | MaD:16 |
 | CollectionFlow.cs:272:26:272:44 | call to method GetEnumerator : IEnumerator [property Current] : A | CollectionFlow.cs:272:13:272:22 | access to local variable enumerator : IEnumerator [property Current] : A | provenance |  |
 | CollectionFlow.cs:274:18:274:27 | access to local variable enumerator : IEnumerator [property Current] : A | CollectionFlow.cs:274:18:274:35 | access to property Current | provenance |  |
 | CollectionFlow.cs:287:13:287:13 | access to local variable a : A | CollectionFlow.cs:289:18:289:18 | access to local variable a : A | provenance |  |
@@ -235,15 +236,20 @@ edges
 | CollectionFlow.cs:289:9:289:12 | [post] access to local variable list : List<T> [element] : A | CollectionFlow.cs:290:26:290:29 | access to local variable list : List<T> [element] : A | provenance |  |
 | CollectionFlow.cs:289:18:289:18 | access to local variable a : A | CollectionFlow.cs:289:9:289:12 | [post] access to local variable list : List<T> [element] : A | provenance | MaD:3 |
 | CollectionFlow.cs:290:13:290:22 | access to local variable enumerator : List<T>.Enumerator [property Current] : A | CollectionFlow.cs:292:18:292:27 | access to local variable enumerator : List<T>.Enumerator [property Current] : A | provenance |  |
-| CollectionFlow.cs:290:26:290:29 | access to local variable list : List<T> [element] : A | CollectionFlow.cs:290:26:290:45 | call to method GetEnumerator : List<T>.Enumerator [property Current] : A | provenance | MaD:14 |
+| CollectionFlow.cs:290:13:290:22 | access to local variable enumerator : List<T>.Enumerator [property Current] : A | CollectionFlow.cs:292:18:292:27 | access to local variable enumerator : List<T>.Enumerator [property Current] : A | provenance |  |
+| CollectionFlow.cs:290:26:290:29 | access to local variable list : List<T> [element] : A | CollectionFlow.cs:290:26:290:45 | call to method GetEnumerator : List<T>.Enumerator [property Current] : A | provenance | MaD:15 |
+| CollectionFlow.cs:290:26:290:29 | access to local variable list : List<T> [element] : A | CollectionFlow.cs:290:26:290:45 | call to method GetEnumerator : List<T>.Enumerator [property Current] : A | provenance | MaD:15 |
+| CollectionFlow.cs:290:26:290:45 | call to method GetEnumerator : List<T>.Enumerator [property Current] : A | CollectionFlow.cs:290:13:290:22 | access to local variable enumerator : List<T>.Enumerator [property Current] : A | provenance |  |
 | CollectionFlow.cs:290:26:290:45 | call to method GetEnumerator : List<T>.Enumerator [property Current] : A | CollectionFlow.cs:290:13:290:22 | access to local variable enumerator : List<T>.Enumerator [property Current] : A | provenance |  |
 | CollectionFlow.cs:292:18:292:27 | access to local variable enumerator : List<T>.Enumerator [property Current] : A | CollectionFlow.cs:292:18:292:35 | access to property Current | provenance |  |
+| CollectionFlow.cs:292:18:292:27 | access to local variable enumerator : List<T>.Enumerator [property Current] : A | CollectionFlow.cs:292:18:292:35 | access to property Current | provenance | MaD:14 |
+| CollectionFlow.cs:292:18:292:27 | access to local variable enumerator : List<T>.Enumerator [property Current] : A | CollectionFlow.cs:292:18:292:35 | access to property Current | provenance | MaD:14 |
 | CollectionFlow.cs:306:13:306:13 | access to local variable a : A | CollectionFlow.cs:308:43:308:43 | access to local variable a : A | provenance |  |
 | CollectionFlow.cs:306:17:306:23 | object creation of type A : A | CollectionFlow.cs:306:13:306:13 | access to local variable a : A | provenance |  |
 | CollectionFlow.cs:308:9:308:12 | [post] access to local variable list : List<T> [element, property Key] : A | CollectionFlow.cs:309:9:309:12 | access to local variable list : List<T> [element, property Key] : A | provenance |  |
 | CollectionFlow.cs:308:18:308:47 | object creation of type KeyValuePair<A,Int32> : KeyValuePair<T,T> [property Key] : A | CollectionFlow.cs:308:9:308:12 | [post] access to local variable list : List<T> [element, property Key] : A | provenance | MaD:3 |
 | CollectionFlow.cs:308:43:308:43 | access to local variable a : A | CollectionFlow.cs:308:18:308:47 | object creation of type KeyValuePair<A,Int32> : KeyValuePair<T,T> [property Key] : A | provenance | MaD:13 |
-| CollectionFlow.cs:309:9:309:12 | access to local variable list : List<T> [element, property Key] : A | CollectionFlow.cs:309:21:309:23 | kvp : KeyValuePair<T,T> [property Key] : A | provenance | MaD:17 |
+| CollectionFlow.cs:309:9:309:12 | access to local variable list : List<T> [element, property Key] : A | CollectionFlow.cs:309:21:309:23 | kvp : KeyValuePair<T,T> [property Key] : A | provenance | MaD:18 |
 | CollectionFlow.cs:309:21:309:23 | kvp : KeyValuePair<T,T> [property Key] : A | CollectionFlow.cs:311:18:311:20 | access to parameter kvp : KeyValuePair<T,T> [property Key] : A | provenance |  |
 | CollectionFlow.cs:311:18:311:20 | access to parameter kvp : KeyValuePair<T,T> [property Key] : A | CollectionFlow.cs:311:18:311:24 | access to property Key | provenance |  |
 | CollectionFlow.cs:328:32:328:38 | element : A | CollectionFlow.cs:328:55:328:61 | access to parameter element : A | provenance |  |
@@ -310,7 +316,7 @@ edges
 | CollectionFlow.cs:488:17:488:20 | access to local variable span : Span<T> [element] : A | CollectionFlow.cs:489:14:489:17 | access to local variable span : Span<T> [element] : A | provenance |  |
 | CollectionFlow.cs:488:24:488:41 | object creation of type Span<A> : Span<T> [element] : A | CollectionFlow.cs:488:17:488:20 | access to local variable span : Span<T> [element] : A | provenance |  |
 | CollectionFlow.cs:488:40:488:40 | access to local variable a : A | CollectionFlow.cs:488:24:488:41 | object creation of type Span<A> : Span<T> [element] : A | provenance | MaD:23 |
-| CollectionFlow.cs:489:14:489:17 | access to local variable span : Span<T> [element] : A | CollectionFlow.cs:489:14:489:20 | access to indexer | provenance | MaD:22 |
+| CollectionFlow.cs:489:14:489:17 | access to local variable span : Span<T> [element] : A | CollectionFlow.cs:489:14:489:20 | access to indexer | provenance | MaD:26 |
 | CollectionFlow.cs:494:13:494:13 | access to local variable a : A | CollectionFlow.cs:495:40:495:40 | access to local variable a : A | provenance |  |
 | CollectionFlow.cs:494:17:494:23 | object creation of type A : A | CollectionFlow.cs:494:13:494:13 | access to local variable a : A | provenance |  |
 | CollectionFlow.cs:495:17:495:20 | access to local variable span : Span<T> [element] : A | CollectionFlow.cs:496:19:496:22 | access to local variable span : Span<T> [element] : A | provenance |  |
@@ -323,16 +329,16 @@ edges
 | CollectionFlow.cs:502:13:502:13 | access to local variable a : A | CollectionFlow.cs:503:21:503:21 | access to local variable a : A | provenance |  |
 | CollectionFlow.cs:502:17:502:23 | object creation of type A : A | CollectionFlow.cs:502:13:502:13 | access to local variable a : A | provenance |  |
 | CollectionFlow.cs:503:9:503:14 | [post] access to parameter target : Span<T> [element] : A | CollectionFlow.cs:504:14:504:19 | access to parameter target : Span<T> [element] : A | provenance |  |
-| CollectionFlow.cs:503:21:503:21 | access to local variable a : A | CollectionFlow.cs:503:9:503:14 | [post] access to parameter target : Span<T> [element] : A | provenance | MaD:21 |
-| CollectionFlow.cs:504:14:504:19 | access to parameter target : Span<T> [element] : A | CollectionFlow.cs:504:14:504:22 | access to indexer | provenance | MaD:22 |
+| CollectionFlow.cs:503:21:503:21 | access to local variable a : A | CollectionFlow.cs:503:9:503:14 | [post] access to parameter target : Span<T> [element] : A | provenance | MaD:22 |
+| CollectionFlow.cs:504:14:504:19 | access to parameter target : Span<T> [element] : A | CollectionFlow.cs:504:14:504:22 | access to indexer | provenance | MaD:26 |
 | CollectionFlow.cs:509:13:509:18 | access to local variable source : Span<T> [element] : A | CollectionFlow.cs:510:9:510:14 | access to local variable source : Span<T> [element] : A | provenance |  |
 | CollectionFlow.cs:509:22:509:51 | object creation of type Span<A> : Span<T> [element] : A | CollectionFlow.cs:509:13:509:18 | access to local variable source : Span<T> [element] : A | provenance |  |
 | CollectionFlow.cs:509:34:509:50 | array creation of type A[] : null [element] : A | CollectionFlow.cs:509:22:509:51 | object creation of type Span<A> : Span<T> [element] : A | provenance | MaD:24 |
 | CollectionFlow.cs:509:40:509:50 | { ..., ... } : null [element] : A | CollectionFlow.cs:509:34:509:50 | array creation of type A[] : null [element] : A | provenance |  |
 | CollectionFlow.cs:509:42:509:48 | object creation of type A : A | CollectionFlow.cs:509:40:509:50 | { ..., ... } : null [element] : A | provenance |  |
-| CollectionFlow.cs:510:9:510:14 | access to local variable source : Span<T> [element] : A | CollectionFlow.cs:510:23:510:28 | [post] access to parameter target : Span<T> [element] : A | provenance | MaD:20 |
+| CollectionFlow.cs:510:9:510:14 | access to local variable source : Span<T> [element] : A | CollectionFlow.cs:510:23:510:28 | [post] access to parameter target : Span<T> [element] : A | provenance | MaD:21 |
 | CollectionFlow.cs:510:23:510:28 | [post] access to parameter target : Span<T> [element] : A | CollectionFlow.cs:511:14:511:19 | access to parameter target : Span<T> [element] : A | provenance |  |
-| CollectionFlow.cs:511:14:511:19 | access to parameter target : Span<T> [element] : A | CollectionFlow.cs:511:14:511:22 | access to indexer | provenance | MaD:22 |
+| CollectionFlow.cs:511:14:511:19 | access to parameter target : Span<T> [element] : A | CollectionFlow.cs:511:14:511:22 | access to indexer | provenance | MaD:26 |
 | CollectionFlow.cs:516:13:516:13 | access to local variable a : A | CollectionFlow.cs:517:60:517:60 | access to local variable a : A | provenance |  |
 | CollectionFlow.cs:516:17:516:23 | object creation of type A : A | CollectionFlow.cs:516:13:516:13 | access to local variable a : A | provenance |  |
 | CollectionFlow.cs:517:25:517:28 | access to local variable span : ReadOnlySpan<T> [element] : A | CollectionFlow.cs:518:14:518:17 | access to local variable span : ReadOnlySpan<T> [element] : A | provenance |  |
@@ -340,7 +346,7 @@ edges
 | CollectionFlow.cs:517:52:517:62 | array creation of type A[] : null [element] : A | CollectionFlow.cs:517:32:517:63 | object creation of type ReadOnlySpan<A> : ReadOnlySpan<T> [element] : A | provenance | MaD:19 |
 | CollectionFlow.cs:517:58:517:62 | { ..., ... } : null [element] : A | CollectionFlow.cs:517:52:517:62 | array creation of type A[] : null [element] : A | provenance |  |
 | CollectionFlow.cs:517:60:517:60 | access to local variable a : A | CollectionFlow.cs:517:58:517:62 | { ..., ... } : null [element] : A | provenance |  |
-| CollectionFlow.cs:518:14:518:17 | access to local variable span : ReadOnlySpan<T> [element] : A | CollectionFlow.cs:518:14:518:20 | access to indexer | provenance | MaD:18 |
+| CollectionFlow.cs:518:14:518:17 | access to local variable span : ReadOnlySpan<T> [element] : A | CollectionFlow.cs:518:14:518:20 | access to indexer | provenance | MaD:20 |
 nodes
 | CollectionFlow.cs:14:40:14:41 | ts : A[] [element] : A | semmle.label | ts : A[] [element] : A |
 | CollectionFlow.cs:14:40:14:41 | ts : null [element] : A | semmle.label | ts : null [element] : A |
@@ -540,8 +546,11 @@ nodes
 | CollectionFlow.cs:289:9:289:12 | [post] access to local variable list : List<T> [element] : A | semmle.label | [post] access to local variable list : List<T> [element] : A |
 | CollectionFlow.cs:289:18:289:18 | access to local variable a : A | semmle.label | access to local variable a : A |
 | CollectionFlow.cs:290:13:290:22 | access to local variable enumerator : List<T>.Enumerator [property Current] : A | semmle.label | access to local variable enumerator : List<T>.Enumerator [property Current] : A |
+| CollectionFlow.cs:290:13:290:22 | access to local variable enumerator : List<T>.Enumerator [property Current] : A | semmle.label | access to local variable enumerator : List<T>.Enumerator [property Current] : A |
 | CollectionFlow.cs:290:26:290:29 | access to local variable list : List<T> [element] : A | semmle.label | access to local variable list : List<T> [element] : A |
 | CollectionFlow.cs:290:26:290:45 | call to method GetEnumerator : List<T>.Enumerator [property Current] : A | semmle.label | call to method GetEnumerator : List<T>.Enumerator [property Current] : A |
+| CollectionFlow.cs:290:26:290:45 | call to method GetEnumerator : List<T>.Enumerator [property Current] : A | semmle.label | call to method GetEnumerator : List<T>.Enumerator [property Current] : A |
+| CollectionFlow.cs:292:18:292:27 | access to local variable enumerator : List<T>.Enumerator [property Current] : A | semmle.label | access to local variable enumerator : List<T>.Enumerator [property Current] : A |
 | CollectionFlow.cs:292:18:292:27 | access to local variable enumerator : List<T>.Enumerator [property Current] : A | semmle.label | access to local variable enumerator : List<T>.Enumerator [property Current] : A |
 | CollectionFlow.cs:292:18:292:35 | access to property Current | semmle.label | access to property Current |
 | CollectionFlow.cs:306:13:306:13 | access to local variable a : A | semmle.label | access to local variable a : A |
diff --git a/csharp/ql/test/library-tests/dataflow/external-models/ExternalFlow.cs b/csharp/ql/test/library-tests/dataflow/external-models/ExternalFlow.cs
index aa26a5d4305..705efd35e38 100644
--- a/csharp/ql/test/library-tests/dataflow/external-models/ExternalFlow.cs
+++ b/csharp/ql/test/library-tests/dataflow/external-models/ExternalFlow.cs
@@ -293,7 +293,8 @@ namespace My.Qltest
     }
 
     // Test synthetic fields
-    public class K {
+    public class K
+    {
 
         public object MyField;
 
@@ -309,19 +310,22 @@ namespace My.Qltest
 
         public object GetMyFieldOnSyntheticField() => throw null;
 
-        public void M1() {
+        public void M1()
+        {
             var o = new object();
             SetMySyntheticField(o);
             Sink(GetMySyntheticField());
         }
 
-        public void M2() {
+        public void M2()
+        {
             var o = new object();
             SetMyNestedSyntheticField(o);
             Sink(GetMyNestedSyntheticField());
         }
 
-        public void M3() {
+        public void M3()
+        {
             var o = new object();
             SetMyFieldOnSyntheticField(o);
             Sink(GetMyFieldOnSyntheticField());
@@ -329,4 +333,19 @@ namespace My.Qltest
 
         static void Sink(object o) { }
     }
+
+    // Test content data flow provenance.
+    public class L
+    {
+        public void M1()
+        {
+            var l = new Library();
+            var o = new object();
+            l.SetValue(o);
+            Sink(l.GetValue());
+        }
+
+        static void Sink(object o) { }
+    }
+
 }
diff --git a/csharp/ql/test/library-tests/dataflow/external-models/ExternalFlow.cs_ b/csharp/ql/test/library-tests/dataflow/external-models/ExternalFlow.cs_
index a6f0d8c9991..0f74a41d881 100644
--- a/csharp/ql/test/library-tests/dataflow/external-models/ExternalFlow.cs_
+++ b/csharp/ql/test/library-tests/dataflow/external-models/ExternalFlow.cs_
@@ -13,5 +13,9 @@ namespace My.Qltest
         public static object StepArgReturnGenerated(object x) => throw null;
 
         public static object StepArgReturnGeneratedIgnored(object x) => throw null;
+
+        public void SetValue(object o) => throw null;
+
+        public object GetValue() => throw null;
     }
 }
diff --git a/csharp/ql/test/library-tests/dataflow/external-models/ExternalFlow.dll b/csharp/ql/test/library-tests/dataflow/external-models/ExternalFlow.dll
index ec85f11a1be..4455e0b042e 100644
Binary files a/csharp/ql/test/library-tests/dataflow/external-models/ExternalFlow.dll and b/csharp/ql/test/library-tests/dataflow/external-models/ExternalFlow.dll differ
diff --git a/csharp/ql/test/library-tests/dataflow/external-models/ExternalFlow.expected b/csharp/ql/test/library-tests/dataflow/external-models/ExternalFlow.expected
index 0b80a70fbad..7254208be18 100644
--- a/csharp/ql/test/library-tests/dataflow/external-models/ExternalFlow.expected
+++ b/csharp/ql/test/library-tests/dataflow/external-models/ExternalFlow.expected
@@ -1,100 +1,102 @@
 models
-| 1 | Summary: My.Qltest; D; false; StepArgRes; (System.Object); ; Argument[0]; ReturnValue; taint; manual |
-| 2 | Summary: My.Qltest; D; false; StepArgArg; (System.Object,System.Object); ; Argument[0]; Argument[1]; taint; manual |
-| 3 | Summary: My.Qltest; D; false; StepArgQual; (System.Object); ; Argument[0]; Argument[this]; taint; manual |
-| 4 | Summary: My.Qltest; D; false; StepFieldGetter; (); ; Argument[this].Field[My.Qltest.D.Field]; ReturnValue; value; manual |
-| 5 | Summary: My.Qltest; D; false; StepFieldSetter; (System.Object); ; Argument[0]; Argument[this].Field[My.Qltest.D.Field]; value; manual |
-| 6 | Summary: My.Qltest; D; false; StepFieldSetter; (System.Object); ; Argument[this]; ReturnValue.Field[My.Qltest.D.Field2]; value; manual |
-| 7 | Summary: My.Qltest; D; false; StepPropertyGetter; (); ; Argument[this].Property[My.Qltest.D.Property]; ReturnValue; value; manual |
-| 8 | Summary: My.Qltest; D; false; StepPropertySetter; (System.Object); ; Argument[0]; Argument[this].Property[My.Qltest.D.Property]; value; manual |
-| 9 | Summary: My.Qltest; D; false; StepElementGetter; (); ; Argument[this].Element; ReturnValue; value; manual |
-| 10 | Summary: My.Qltest; D; false; StepElementSetter; (System.Object); ; Argument[0]; Argument[this].Element; value; manual |
-| 11 | Summary: My.Qltest; D; false; Apply<S,T>; (System.Func<S,T>,S); ; Argument[1]; Argument[0].Parameter[0]; value; manual |
-| 12 | Summary: My.Qltest; D; false; Apply<S,T>; (System.Func<S,T>,S); ; Argument[0].ReturnValue; ReturnValue; value; manual |
-| 13 | Summary: My.Qltest; D; false; Apply2; (System.Action<System.Object>,My.Qltest.D,My.Qltest.D); ; Argument[1].Field[My.Qltest.D.Field]; Argument[0].Parameter[0]; value; manual |
-| 14 | Summary: My.Qltest; D; false; Map<S,T>; (S[],System.Func<S,T>); ; Argument[0].Element; Argument[1].Parameter[0]; value; manual |
-| 15 | Summary: My.Qltest; D; false; Map<S,T>; (S[],System.Func<S,T>); ; Argument[1].ReturnValue; ReturnValue.Element; value; manual |
-| 16 | Summary: My.Qltest; D; false; Parse; (System.String,System.Int32); ; Argument[0]; Argument[1]; taint; manual |
-| 17 | Summary: My.Qltest; D; false; Reverse; (System.Object[]); ; Argument[0].WithElement; ReturnValue; value; manual |
+| 1 | Summary: My.Qltest; D; false; Apply2; (System.Action<System.Object>,My.Qltest.D,My.Qltest.D); ; Argument[1].Field[My.Qltest.D.Field]; Argument[0].Parameter[0]; value; manual |
+| 2 | Summary: My.Qltest; D; false; Apply<S,T>; (System.Func<S,T>,S); ; Argument[0].ReturnValue; ReturnValue; value; manual |
+| 3 | Summary: My.Qltest; D; false; Apply<S,T>; (System.Func<S,T>,S); ; Argument[1]; Argument[0].Parameter[0]; value; manual |
+| 4 | Summary: My.Qltest; D; false; Map<S,T>; (S[],System.Func<S,T>); ; Argument[0].Element; Argument[1].Parameter[0]; value; manual |
+| 5 | Summary: My.Qltest; D; false; Map<S,T>; (S[],System.Func<S,T>); ; Argument[1].ReturnValue; ReturnValue.Element; value; manual |
+| 6 | Summary: My.Qltest; D; false; Parse; (System.String,System.Int32); ; Argument[0]; Argument[1]; taint; manual |
+| 7 | Summary: My.Qltest; D; false; Reverse; (System.Object[]); ; Argument[0].WithElement; ReturnValue; value; manual |
+| 8 | Summary: My.Qltest; D; false; StepArgArg; (System.Object,System.Object); ; Argument[0]; Argument[1]; taint; manual |
+| 9 | Summary: My.Qltest; D; false; StepArgQual; (System.Object); ; Argument[0]; Argument[this]; taint; manual |
+| 10 | Summary: My.Qltest; D; false; StepArgRes; (System.Object); ; Argument[0]; ReturnValue; taint; manual |
+| 11 | Summary: My.Qltest; D; false; StepElementGetter; (); ; Argument[this].Element; ReturnValue; value; manual |
+| 12 | Summary: My.Qltest; D; false; StepElementSetter; (System.Object); ; Argument[0]; Argument[this].Element; value; manual |
+| 13 | Summary: My.Qltest; D; false; StepFieldGetter; (); ; Argument[this].Field[My.Qltest.D.Field]; ReturnValue; value; manual |
+| 14 | Summary: My.Qltest; D; false; StepFieldSetter; (System.Object); ; Argument[0]; Argument[this].Field[My.Qltest.D.Field]; value; manual |
+| 15 | Summary: My.Qltest; D; false; StepFieldSetter; (System.Object); ; Argument[this]; ReturnValue.Field[My.Qltest.D.Field2]; value; manual |
+| 16 | Summary: My.Qltest; D; false; StepPropertyGetter; (); ; Argument[this].Property[My.Qltest.D.Property]; ReturnValue; value; manual |
+| 17 | Summary: My.Qltest; D; false; StepPropertySetter; (System.Object); ; Argument[0]; Argument[this].Property[My.Qltest.D.Property]; value; manual |
 | 18 | Summary: My.Qltest; E; true; get_MyProp; (); ; Argument[this].Field[My.Qltest.E.MyField]; ReturnValue; value; manual |
 | 19 | Summary: My.Qltest; E; true; set_MyProp; (System.Object); ; Argument[0]; Argument[this].Field[My.Qltest.E.MyField]; value; manual |
-| 20 | Summary: My.Qltest; Library; false; MixedFlowArgs; (System.Object,System.Object); ; Argument[1]; ReturnValue; value; manual |
-| 21 | Summary: My.Qltest; Library; false; GeneratedFlowWithGeneratedNeutral; (System.Object); ; Argument[0]; ReturnValue; value; df-generated |
-| 22 | Summary: My.Qltest; HE; false; ExtensionMethod; (My.Qltest.HI); ; Argument[0]; ReturnValue; value; manual |
-| 23 | Summary: My.Qltest; I; false; GetFirst; (My.Qltest.MyInlineArray); ; Argument[0].Element; ReturnValue; value; manual |
-| 24 | Summary: My.Qltest; J; false; get_Prop1; (); ; Argument[this]; ReturnValue; value; manual |
-| 25 | Summary: My.Qltest; J; false; SetProp1; (System.Object); ; Argument[0]; Argument[this]; value; manual |
-| 26 | Summary: My.Qltest; K; false; SetMySyntheticField; (System.Object); ; Argument[0]; Argument[this].SyntheticField[My.Qltest.K.MySyntheticField]; value; manual |
-| 27 | Summary: My.Qltest; K; false; GetMySyntheticField; (); ; Argument[this].SyntheticField[My.Qltest.K.MySyntheticField]; ReturnValue; value; manual |
+| 20 | Summary: My.Qltest; HE; false; ExtensionMethod; (My.Qltest.HI); ; Argument[0]; ReturnValue; value; manual |
+| 21 | Summary: My.Qltest; I; false; GetFirst; (My.Qltest.MyInlineArray); ; Argument[0].Element; ReturnValue; value; manual |
+| 22 | Summary: My.Qltest; J; false; SetProp1; (System.Object); ; Argument[0]; Argument[this]; value; manual |
+| 23 | Summary: My.Qltest; J; false; get_Prop1; (); ; Argument[this]; ReturnValue; value; manual |
+| 24 | Summary: My.Qltest; K; false; GetMyFieldOnSyntheticField; (); ; Argument[this].SyntheticField[My.Qltest.K.MySyntheticField2].Field[My.Qltest.K.MyField]; ReturnValue; value; manual |
+| 25 | Summary: My.Qltest; K; false; GetMyNestedSyntheticField; (); ; Argument[this].SyntheticField[My.Qltest.K.MySyntheticField1].SyntheticField[MySyntheticField1.MyNestedSyntheticField]; ReturnValue; value; manual |
+| 26 | Summary: My.Qltest; K; false; GetMySyntheticField; (); ; Argument[this].SyntheticField[My.Qltest.K.MySyntheticField]; ReturnValue; value; manual |
+| 27 | Summary: My.Qltest; K; false; SetMyFieldOnSyntheticField; (System.Object); ; Argument[0]; Argument[this].SyntheticField[My.Qltest.K.MySyntheticField2].Field[My.Qltest.K.MyField]; value; manual |
 | 28 | Summary: My.Qltest; K; false; SetMyNestedSyntheticField; (System.Object); ; Argument[0]; Argument[this].SyntheticField[My.Qltest.K.MySyntheticField1].SyntheticField[MySyntheticField1.MyNestedSyntheticField]; value; manual |
-| 29 | Summary: My.Qltest; K; false; GetMyNestedSyntheticField; (); ; Argument[this].SyntheticField[My.Qltest.K.MySyntheticField1].SyntheticField[MySyntheticField1.MyNestedSyntheticField]; ReturnValue; value; manual |
-| 30 | Summary: My.Qltest; K; false; SetMyFieldOnSyntheticField; (System.Object); ; Argument[0]; Argument[this].SyntheticField[My.Qltest.K.MySyntheticField2].Field[My.Qltest.K.MyField]; value; manual |
-| 31 | Summary: My.Qltest; K; false; GetMyFieldOnSyntheticField; (); ; Argument[this].SyntheticField[My.Qltest.K.MySyntheticField2].Field[My.Qltest.K.MyField]; ReturnValue; value; manual |
+| 29 | Summary: My.Qltest; K; false; SetMySyntheticField; (System.Object); ; Argument[0]; Argument[this].SyntheticField[My.Qltest.K.MySyntheticField]; value; manual |
+| 30 | Summary: My.Qltest; Library; false; GeneratedFlowWithGeneratedNeutral; (System.Object); ; Argument[0]; ReturnValue; value; df-generated |
+| 31 | Summary: My.Qltest; Library; false; GetValue; (); ; Argument[this].SyntheticField[X]; ReturnValue; value; dfc-generated |
+| 32 | Summary: My.Qltest; Library; false; MixedFlowArgs; (System.Object,System.Object); ; Argument[1]; ReturnValue; value; manual |
+| 33 | Summary: My.Qltest; Library; false; SetValue; (System.Object); ; Argument[0]; Argument[this].SyntheticField[X]; value; dfc-generated |
 edges
 | ExternalFlow.cs:9:20:9:23 | access to local variable arg1 : Object | ExternalFlow.cs:10:29:10:32 | access to local variable arg1 : Object | provenance |  |
 | ExternalFlow.cs:9:27:9:38 | object creation of type Object : Object | ExternalFlow.cs:9:20:9:23 | access to local variable arg1 : Object | provenance |  |
-| ExternalFlow.cs:10:29:10:32 | access to local variable arg1 : Object | ExternalFlow.cs:10:18:10:33 | call to method StepArgRes | provenance | MaD:1 |
+| ExternalFlow.cs:10:29:10:32 | access to local variable arg1 : Object | ExternalFlow.cs:10:18:10:33 | call to method StepArgRes | provenance | MaD:10 |
 | ExternalFlow.cs:15:20:15:25 | access to local variable argIn1 : Object | ExternalFlow.cs:17:24:17:29 | access to local variable argIn1 : Object | provenance |  |
 | ExternalFlow.cs:15:29:15:40 | object creation of type Object : Object | ExternalFlow.cs:15:20:15:25 | access to local variable argIn1 : Object | provenance |  |
 | ExternalFlow.cs:16:20:16:26 | access to local variable argOut1 : Object | ExternalFlow.cs:18:18:18:24 | access to local variable argOut1 | provenance |  |
 | ExternalFlow.cs:16:30:16:41 | object creation of type Object : Object | ExternalFlow.cs:16:20:16:26 | access to local variable argOut1 : Object | provenance |  |
-| ExternalFlow.cs:17:24:17:29 | access to local variable argIn1 : Object | ExternalFlow.cs:17:32:17:38 | [post] access to local variable argOut1 : Object | provenance | MaD:2 |
+| ExternalFlow.cs:17:24:17:29 | access to local variable argIn1 : Object | ExternalFlow.cs:17:32:17:38 | [post] access to local variable argOut1 : Object | provenance | MaD:8 |
 | ExternalFlow.cs:17:32:17:38 | [post] access to local variable argOut1 : Object | ExternalFlow.cs:18:18:18:24 | access to local variable argOut1 | provenance |  |
 | ExternalFlow.cs:23:20:23:23 | access to local variable arg2 : Object | ExternalFlow.cs:24:25:24:28 | access to local variable arg2 : Object | provenance |  |
 | ExternalFlow.cs:23:27:23:38 | object creation of type Object : Object | ExternalFlow.cs:23:20:23:23 | access to local variable arg2 : Object | provenance |  |
 | ExternalFlow.cs:24:13:24:29 | [post] this access : D | ExternalFlow.cs:25:18:25:21 | this access | provenance |  |
-| ExternalFlow.cs:24:25:24:28 | access to local variable arg2 : Object | ExternalFlow.cs:24:13:24:29 | [post] this access : D | provenance | MaD:3 |
+| ExternalFlow.cs:24:25:24:28 | access to local variable arg2 : Object | ExternalFlow.cs:24:13:24:29 | [post] this access : D | provenance | MaD:9 |
 | ExternalFlow.cs:30:13:30:16 | [post] this access : D [field Field] : Object | ExternalFlow.cs:31:18:31:21 | this access : D [field Field] : Object | provenance |  |
 | ExternalFlow.cs:30:26:30:37 | object creation of type Object : Object | ExternalFlow.cs:30:13:30:16 | [post] this access : D [field Field] : Object | provenance |  |
-| ExternalFlow.cs:31:18:31:21 | this access : D [field Field] : Object | ExternalFlow.cs:31:18:31:39 | call to method StepFieldGetter | provenance | MaD:4 |
+| ExternalFlow.cs:31:18:31:21 | this access : D [field Field] : Object | ExternalFlow.cs:31:18:31:39 | call to method StepFieldGetter | provenance | MaD:13 |
 | ExternalFlow.cs:36:19:36:62 | (...) ... : D [field Field] : Object | ExternalFlow.cs:36:18:36:69 | access to field Field | provenance |  |
 | ExternalFlow.cs:36:22:36:25 | [post] this access : D [field Field] : Object | ExternalFlow.cs:37:18:37:21 | this access : D [field Field] : Object | provenance |  |
 | ExternalFlow.cs:36:22:36:55 | call to method StepFieldSetter : D [field Field2, field Field] : Object | ExternalFlow.cs:36:22:36:62 | access to field Field2 : Object [field Field] : Object | provenance |  |
 | ExternalFlow.cs:36:22:36:62 | access to field Field2 : Object [field Field] : Object | ExternalFlow.cs:36:19:36:62 | (...) ... : D [field Field] : Object | provenance |  |
-| ExternalFlow.cs:36:43:36:54 | object creation of type Object : Object | ExternalFlow.cs:36:22:36:25 | [post] this access : D [field Field] : Object | provenance | MaD:5 |
-| ExternalFlow.cs:36:43:36:54 | object creation of type Object : Object | ExternalFlow.cs:36:22:36:55 | call to method StepFieldSetter : D [field Field2, field Field] : Object | provenance | MaD:5+MaD:6 |
+| ExternalFlow.cs:36:43:36:54 | object creation of type Object : Object | ExternalFlow.cs:36:22:36:25 | [post] this access : D [field Field] : Object | provenance | MaD:14 |
+| ExternalFlow.cs:36:43:36:54 | object creation of type Object : Object | ExternalFlow.cs:36:22:36:55 | call to method StepFieldSetter : D [field Field2, field Field] : Object | provenance | MaD:14+MaD:15 |
 | ExternalFlow.cs:37:18:37:21 | this access : D [field Field] : Object | ExternalFlow.cs:37:18:37:27 | access to field Field | provenance |  |
 | ExternalFlow.cs:42:13:42:16 | [post] this access : D [property Property] : Object | ExternalFlow.cs:43:18:43:21 | this access : D [property Property] : Object | provenance |  |
 | ExternalFlow.cs:42:29:42:40 | object creation of type Object : Object | ExternalFlow.cs:42:13:42:16 | [post] this access : D [property Property] : Object | provenance |  |
-| ExternalFlow.cs:43:18:43:21 | this access : D [property Property] : Object | ExternalFlow.cs:43:18:43:42 | call to method StepPropertyGetter | provenance | MaD:7 |
+| ExternalFlow.cs:43:18:43:21 | this access : D [property Property] : Object | ExternalFlow.cs:43:18:43:42 | call to method StepPropertyGetter | provenance | MaD:16 |
 | ExternalFlow.cs:48:13:48:16 | [post] this access : D [property Property] : Object | ExternalFlow.cs:49:18:49:21 | this access : D [property Property] : Object | provenance |  |
-| ExternalFlow.cs:48:37:48:48 | object creation of type Object : Object | ExternalFlow.cs:48:13:48:16 | [post] this access : D [property Property] : Object | provenance | MaD:8 |
+| ExternalFlow.cs:48:37:48:48 | object creation of type Object : Object | ExternalFlow.cs:48:13:48:16 | [post] this access : D [property Property] : Object | provenance | MaD:17 |
 | ExternalFlow.cs:49:18:49:21 | this access : D [property Property] : Object | ExternalFlow.cs:49:18:49:30 | access to property Property | provenance |  |
 | ExternalFlow.cs:54:13:54:16 | [post] this access : D [element] : Object | ExternalFlow.cs:55:18:55:21 | this access : D [element] : Object | provenance |  |
-| ExternalFlow.cs:54:36:54:47 | object creation of type Object : Object | ExternalFlow.cs:54:13:54:16 | [post] this access : D [element] : Object | provenance | MaD:10 |
-| ExternalFlow.cs:55:18:55:21 | this access : D [element] : Object | ExternalFlow.cs:55:18:55:41 | call to method StepElementGetter | provenance | MaD:9 |
+| ExternalFlow.cs:54:36:54:47 | object creation of type Object : Object | ExternalFlow.cs:54:13:54:16 | [post] this access : D [element] : Object | provenance | MaD:12 |
+| ExternalFlow.cs:55:18:55:21 | this access : D [element] : Object | ExternalFlow.cs:55:18:55:41 | call to method StepElementGetter | provenance | MaD:11 |
 | ExternalFlow.cs:60:35:60:35 | o : Object | ExternalFlow.cs:60:47:60:47 | access to parameter o | provenance |  |
-| ExternalFlow.cs:60:64:60:75 | object creation of type Object : Object | ExternalFlow.cs:60:35:60:35 | o : Object | provenance | MaD:11 |
+| ExternalFlow.cs:60:64:60:75 | object creation of type Object : Object | ExternalFlow.cs:60:35:60:35 | o : Object | provenance | MaD:3 |
 | ExternalFlow.cs:65:17:65:17 | access to local variable o : Object | ExternalFlow.cs:66:18:66:18 | access to local variable o | provenance |  |
 | ExternalFlow.cs:65:21:65:60 | call to method Apply<Int32,Object> : Object | ExternalFlow.cs:65:17:65:17 | access to local variable o : Object | provenance |  |
-| ExternalFlow.cs:65:45:65:56 | object creation of type Object : Object | ExternalFlow.cs:65:21:65:60 | call to method Apply<Int32,Object> : Object | provenance | MaD:12 |
+| ExternalFlow.cs:65:45:65:56 | object creation of type Object : Object | ExternalFlow.cs:65:21:65:60 | call to method Apply<Int32,Object> : Object | provenance | MaD:2 |
 | ExternalFlow.cs:71:17:71:20 | access to local variable objs : null [element] : Object | ExternalFlow.cs:72:17:72:20 | access to local variable objs : null [element] : Object | provenance |  |
 | ExternalFlow.cs:71:30:71:45 | { ..., ... } : null [element] : Object | ExternalFlow.cs:71:17:71:20 | access to local variable objs : null [element] : Object | provenance |  |
 | ExternalFlow.cs:71:32:71:43 | object creation of type Object : Object | ExternalFlow.cs:71:30:71:45 | { ..., ... } : null [element] : Object | provenance |  |
-| ExternalFlow.cs:72:17:72:20 | access to local variable objs : null [element] : Object | ExternalFlow.cs:72:23:72:23 | o : Object | provenance | MaD:14 |
+| ExternalFlow.cs:72:17:72:20 | access to local variable objs : null [element] : Object | ExternalFlow.cs:72:23:72:23 | o : Object | provenance | MaD:4 |
 | ExternalFlow.cs:72:23:72:23 | o : Object | ExternalFlow.cs:72:35:72:35 | access to parameter o | provenance |  |
 | ExternalFlow.cs:77:17:77:20 | access to local variable objs : T[] [element] : Object | ExternalFlow.cs:78:18:78:21 | access to local variable objs : T[] [element] : Object | provenance |  |
 | ExternalFlow.cs:77:24:77:58 | call to method Map<Int32,Object> : T[] [element] : Object | ExternalFlow.cs:77:17:77:20 | access to local variable objs : T[] [element] : Object | provenance |  |
-| ExternalFlow.cs:77:46:77:57 | object creation of type Object : Object | ExternalFlow.cs:77:24:77:58 | call to method Map<Int32,Object> : T[] [element] : Object | provenance | MaD:15 |
+| ExternalFlow.cs:77:46:77:57 | object creation of type Object : Object | ExternalFlow.cs:77:24:77:58 | call to method Map<Int32,Object> : T[] [element] : Object | provenance | MaD:5 |
 | ExternalFlow.cs:78:18:78:21 | access to local variable objs : T[] [element] : Object | ExternalFlow.cs:78:18:78:24 | access to array element | provenance |  |
 | ExternalFlow.cs:83:17:83:20 | access to local variable objs : null [element] : Object | ExternalFlow.cs:84:29:84:32 | access to local variable objs : null [element] : Object | provenance |  |
 | ExternalFlow.cs:83:30:83:45 | { ..., ... } : null [element] : Object | ExternalFlow.cs:83:17:83:20 | access to local variable objs : null [element] : Object | provenance |  |
 | ExternalFlow.cs:83:32:83:43 | object creation of type Object : Object | ExternalFlow.cs:83:30:83:45 | { ..., ... } : null [element] : Object | provenance |  |
 | ExternalFlow.cs:84:17:84:21 | access to local variable objs2 : T[] [element] : Object | ExternalFlow.cs:85:18:85:22 | access to local variable objs2 : T[] [element] : Object | provenance |  |
 | ExternalFlow.cs:84:25:84:41 | call to method Map<Object,Object> : T[] [element] : Object | ExternalFlow.cs:84:17:84:21 | access to local variable objs2 : T[] [element] : Object | provenance |  |
-| ExternalFlow.cs:84:29:84:32 | access to local variable objs : null [element] : Object | ExternalFlow.cs:84:25:84:41 | call to method Map<Object,Object> : T[] [element] : Object | provenance | MaD:14 |
-| ExternalFlow.cs:84:29:84:32 | access to local variable objs : null [element] : Object | ExternalFlow.cs:84:35:84:35 | o : Object | provenance | MaD:14 |
+| ExternalFlow.cs:84:29:84:32 | access to local variable objs : null [element] : Object | ExternalFlow.cs:84:25:84:41 | call to method Map<Object,Object> : T[] [element] : Object | provenance | MaD:4 |
+| ExternalFlow.cs:84:29:84:32 | access to local variable objs : null [element] : Object | ExternalFlow.cs:84:35:84:35 | o : Object | provenance | MaD:4 |
 | ExternalFlow.cs:84:35:84:35 | o : Object | ExternalFlow.cs:84:40:84:40 | access to parameter o : Object | provenance |  |
 | ExternalFlow.cs:85:18:85:22 | access to local variable objs2 : T[] [element] : Object | ExternalFlow.cs:85:18:85:25 | access to array element | provenance |  |
 | ExternalFlow.cs:90:17:90:17 | access to local variable s : String | ExternalFlow.cs:91:19:91:19 | access to local variable s : String | provenance |  |
 | ExternalFlow.cs:90:21:90:34 | object creation of type String : String | ExternalFlow.cs:90:17:90:17 | access to local variable s : String | provenance |  |
-| ExternalFlow.cs:91:19:91:19 | access to local variable s : String | ExternalFlow.cs:91:30:91:30 | Int32 i : Int32 | provenance | MaD:16 |
+| ExternalFlow.cs:91:19:91:19 | access to local variable s : String | ExternalFlow.cs:91:30:91:30 | Int32 i : Int32 | provenance | MaD:6 |
 | ExternalFlow.cs:91:30:91:30 | Int32 i : Int32 | ExternalFlow.cs:92:18:92:18 | (...) ... | provenance |  |
 | ExternalFlow.cs:98:13:98:14 | [post] access to local variable d1 : D [field Field] : Object | ExternalFlow.cs:103:16:103:17 | access to local variable d1 : D [field Field] : Object | provenance |  |
 | ExternalFlow.cs:98:13:98:14 | [post] access to local variable d1 : D [field Field] : Object | ExternalFlow.cs:104:18:104:19 | access to local variable d1 : D [field Field] : Object | provenance |  |
 | ExternalFlow.cs:98:24:98:35 | object creation of type Object : Object | ExternalFlow.cs:98:13:98:14 | [post] access to local variable d1 : D [field Field] : Object | provenance |  |
 | ExternalFlow.cs:100:20:100:20 | d : Object | ExternalFlow.cs:102:22:102:22 | access to parameter d | provenance |  |
-| ExternalFlow.cs:103:16:103:17 | access to local variable d1 : D [field Field] : Object | ExternalFlow.cs:100:20:100:20 | d : Object | provenance | MaD:13 |
+| ExternalFlow.cs:103:16:103:17 | access to local variable d1 : D [field Field] : Object | ExternalFlow.cs:100:20:100:20 | d : Object | provenance | MaD:1 |
 | ExternalFlow.cs:104:18:104:19 | access to local variable d1 : D [field Field] : Object | ExternalFlow.cs:104:18:104:25 | access to field Field | provenance |  |
 | ExternalFlow.cs:111:13:111:13 | [post] access to local variable f : F [field MyField] : Object | ExternalFlow.cs:112:18:112:18 | access to local variable f : F [field MyField] : Object | provenance |  |
 | ExternalFlow.cs:111:24:111:35 | object creation of type Object : Object | ExternalFlow.cs:111:13:111:13 | [post] access to local variable f : F [field MyField] : Object | provenance | MaD:19 |
@@ -104,44 +106,49 @@ edges
 | ExternalFlow.cs:117:36:117:47 | object creation of type Object : Object | ExternalFlow.cs:117:34:117:49 | { ..., ... } : null [element] : Object | provenance |  |
 | ExternalFlow.cs:118:17:118:17 | access to local variable b : null [element] : Object | ExternalFlow.cs:120:18:120:18 | access to local variable b : null [element] : Object | provenance |  |
 | ExternalFlow.cs:118:21:118:30 | call to method Reverse : null [element] : Object | ExternalFlow.cs:118:17:118:17 | access to local variable b : null [element] : Object | provenance |  |
-| ExternalFlow.cs:118:29:118:29 | access to local variable a : null [element] : Object | ExternalFlow.cs:118:21:118:30 | call to method Reverse : null [element] : Object | provenance | MaD:17 |
+| ExternalFlow.cs:118:29:118:29 | access to local variable a : null [element] : Object | ExternalFlow.cs:118:21:118:30 | call to method Reverse : null [element] : Object | provenance | MaD:7 |
 | ExternalFlow.cs:120:18:120:18 | access to local variable b : null [element] : Object | ExternalFlow.cs:120:18:120:21 | access to array element | provenance |  |
 | ExternalFlow.cs:205:17:205:18 | access to local variable o2 : Object | ExternalFlow.cs:206:46:206:47 | access to local variable o2 : Object | provenance |  |
 | ExternalFlow.cs:205:22:205:33 | object creation of type Object : Object | ExternalFlow.cs:205:17:205:18 | access to local variable o2 : Object | provenance |  |
-| ExternalFlow.cs:206:46:206:47 | access to local variable o2 : Object | ExternalFlow.cs:206:18:206:48 | call to method MixedFlowArgs | provenance | MaD:20 |
+| ExternalFlow.cs:206:46:206:47 | access to local variable o2 : Object | ExternalFlow.cs:206:18:206:48 | call to method MixedFlowArgs | provenance | MaD:32 |
 | ExternalFlow.cs:211:17:211:18 | access to local variable o1 : Object | ExternalFlow.cs:212:60:212:61 | access to local variable o1 : Object | provenance |  |
 | ExternalFlow.cs:211:22:211:33 | object creation of type Object : Object | ExternalFlow.cs:211:17:211:18 | access to local variable o1 : Object | provenance |  |
-| ExternalFlow.cs:212:60:212:61 | access to local variable o1 : Object | ExternalFlow.cs:212:18:212:62 | call to method GeneratedFlowWithGeneratedNeutral | provenance | MaD:21 |
+| ExternalFlow.cs:212:60:212:61 | access to local variable o1 : Object | ExternalFlow.cs:212:18:212:62 | call to method GeneratedFlowWithGeneratedNeutral | provenance | MaD:30 |
 | ExternalFlow.cs:238:17:238:17 | access to local variable h : HC | ExternalFlow.cs:239:21:239:21 | access to local variable h : HC | provenance |  |
 | ExternalFlow.cs:238:21:238:28 | object creation of type HC : HC | ExternalFlow.cs:238:17:238:17 | access to local variable h : HC | provenance |  |
 | ExternalFlow.cs:239:17:239:17 | access to local variable o : HC | ExternalFlow.cs:240:18:240:18 | access to local variable o | provenance |  |
-| ExternalFlow.cs:239:21:239:21 | access to local variable h : HC | ExternalFlow.cs:239:21:239:39 | call to method ExtensionMethod : HC | provenance | MaD:22 |
+| ExternalFlow.cs:239:21:239:21 | access to local variable h : HC | ExternalFlow.cs:239:21:239:39 | call to method ExtensionMethod : HC | provenance | MaD:20 |
 | ExternalFlow.cs:239:21:239:39 | call to method ExtensionMethod : HC | ExternalFlow.cs:239:17:239:17 | access to local variable o : HC | provenance |  |
 | ExternalFlow.cs:256:13:256:13 | [post] access to parameter a : MyInlineArray [element] : Object | ExternalFlow.cs:257:30:257:30 | access to parameter a : MyInlineArray [element] : Object | provenance |  |
 | ExternalFlow.cs:256:20:256:31 | object creation of type Object : Object | ExternalFlow.cs:256:13:256:13 | [post] access to parameter a : MyInlineArray [element] : Object | provenance |  |
 | ExternalFlow.cs:257:17:257:17 | access to local variable b : Object | ExternalFlow.cs:258:18:258:18 | access to local variable b | provenance |  |
 | ExternalFlow.cs:257:21:257:31 | call to method GetFirst : Object | ExternalFlow.cs:257:17:257:17 | access to local variable b : Object | provenance |  |
-| ExternalFlow.cs:257:30:257:30 | access to parameter a : MyInlineArray [element] : Object | ExternalFlow.cs:257:21:257:31 | call to method GetFirst : Object | provenance | MaD:23 |
+| ExternalFlow.cs:257:30:257:30 | access to parameter a : MyInlineArray [element] : Object | ExternalFlow.cs:257:21:257:31 | call to method GetFirst : Object | provenance | MaD:21 |
 | ExternalFlow.cs:278:17:278:17 | access to local variable j : Object | ExternalFlow.cs:279:22:279:22 | access to local variable j : Object | provenance |  |
 | ExternalFlow.cs:278:21:278:32 | object creation of type Object : Object | ExternalFlow.cs:278:17:278:17 | access to local variable j : Object | provenance |  |
 | ExternalFlow.cs:279:13:279:23 | [post] this access : J | ExternalFlow.cs:281:18:281:21 | this access : J | provenance |  |
-| ExternalFlow.cs:279:22:279:22 | access to local variable j : Object | ExternalFlow.cs:279:13:279:23 | [post] this access : J | provenance | MaD:25 |
-| ExternalFlow.cs:281:18:281:21 | this access : J | ExternalFlow.cs:281:18:281:27 | access to property Prop1 | provenance | MaD:24 |
-| ExternalFlow.cs:313:17:313:17 | access to local variable o : Object | ExternalFlow.cs:314:33:314:33 | access to local variable o : Object | provenance |  |
-| ExternalFlow.cs:313:21:313:32 | object creation of type Object : Object | ExternalFlow.cs:313:17:313:17 | access to local variable o : Object | provenance |  |
-| ExternalFlow.cs:314:13:314:34 | [post] this access : K [synthetic My.Qltest.K.MySyntheticField] : Object | ExternalFlow.cs:315:18:315:38 | this access : K [synthetic My.Qltest.K.MySyntheticField] : Object | provenance |  |
-| ExternalFlow.cs:314:33:314:33 | access to local variable o : Object | ExternalFlow.cs:314:13:314:34 | [post] this access : K [synthetic My.Qltest.K.MySyntheticField] : Object | provenance | MaD:26 |
-| ExternalFlow.cs:315:18:315:38 | this access : K [synthetic My.Qltest.K.MySyntheticField] : Object | ExternalFlow.cs:315:18:315:38 | call to method GetMySyntheticField | provenance | MaD:27 |
-| ExternalFlow.cs:319:17:319:17 | access to local variable o : Object | ExternalFlow.cs:320:39:320:39 | access to local variable o : Object | provenance |  |
-| ExternalFlow.cs:319:21:319:32 | object creation of type Object : Object | ExternalFlow.cs:319:17:319:17 | access to local variable o : Object | provenance |  |
-| ExternalFlow.cs:320:13:320:40 | [post] this access : K [synthetic My.Qltest.K.MySyntheticField1, synthetic MySyntheticField1.MyNestedSyntheticField] : Object | ExternalFlow.cs:321:18:321:44 | this access : K [synthetic My.Qltest.K.MySyntheticField1, synthetic MySyntheticField1.MyNestedSyntheticField] : Object | provenance |  |
-| ExternalFlow.cs:320:39:320:39 | access to local variable o : Object | ExternalFlow.cs:320:13:320:40 | [post] this access : K [synthetic My.Qltest.K.MySyntheticField1, synthetic MySyntheticField1.MyNestedSyntheticField] : Object | provenance | MaD:28 |
-| ExternalFlow.cs:321:18:321:44 | this access : K [synthetic My.Qltest.K.MySyntheticField1, synthetic MySyntheticField1.MyNestedSyntheticField] : Object | ExternalFlow.cs:321:18:321:44 | call to method GetMyNestedSyntheticField | provenance | MaD:29 |
-| ExternalFlow.cs:325:17:325:17 | access to local variable o : Object | ExternalFlow.cs:326:40:326:40 | access to local variable o : Object | provenance |  |
-| ExternalFlow.cs:325:21:325:32 | object creation of type Object : Object | ExternalFlow.cs:325:17:325:17 | access to local variable o : Object | provenance |  |
-| ExternalFlow.cs:326:13:326:41 | [post] this access : K [synthetic My.Qltest.K.MySyntheticField2, field MyField] : Object | ExternalFlow.cs:327:18:327:45 | this access : K [synthetic My.Qltest.K.MySyntheticField2, field MyField] : Object | provenance |  |
-| ExternalFlow.cs:326:40:326:40 | access to local variable o : Object | ExternalFlow.cs:326:13:326:41 | [post] this access : K [synthetic My.Qltest.K.MySyntheticField2, field MyField] : Object | provenance | MaD:30 |
-| ExternalFlow.cs:327:18:327:45 | this access : K [synthetic My.Qltest.K.MySyntheticField2, field MyField] : Object | ExternalFlow.cs:327:18:327:45 | call to method GetMyFieldOnSyntheticField | provenance | MaD:31 |
+| ExternalFlow.cs:279:22:279:22 | access to local variable j : Object | ExternalFlow.cs:279:13:279:23 | [post] this access : J | provenance | MaD:22 |
+| ExternalFlow.cs:281:18:281:21 | this access : J | ExternalFlow.cs:281:18:281:27 | access to property Prop1 | provenance | MaD:23 |
+| ExternalFlow.cs:315:17:315:17 | access to local variable o : Object | ExternalFlow.cs:316:33:316:33 | access to local variable o : Object | provenance |  |
+| ExternalFlow.cs:315:21:315:32 | object creation of type Object : Object | ExternalFlow.cs:315:17:315:17 | access to local variable o : Object | provenance |  |
+| ExternalFlow.cs:316:13:316:34 | [post] this access : K [synthetic My.Qltest.K.MySyntheticField] : Object | ExternalFlow.cs:317:18:317:38 | this access : K [synthetic My.Qltest.K.MySyntheticField] : Object | provenance |  |
+| ExternalFlow.cs:316:33:316:33 | access to local variable o : Object | ExternalFlow.cs:316:13:316:34 | [post] this access : K [synthetic My.Qltest.K.MySyntheticField] : Object | provenance | MaD:29 |
+| ExternalFlow.cs:317:18:317:38 | this access : K [synthetic My.Qltest.K.MySyntheticField] : Object | ExternalFlow.cs:317:18:317:38 | call to method GetMySyntheticField | provenance | MaD:26 |
+| ExternalFlow.cs:322:17:322:17 | access to local variable o : Object | ExternalFlow.cs:323:39:323:39 | access to local variable o : Object | provenance |  |
+| ExternalFlow.cs:322:21:322:32 | object creation of type Object : Object | ExternalFlow.cs:322:17:322:17 | access to local variable o : Object | provenance |  |
+| ExternalFlow.cs:323:13:323:40 | [post] this access : K [synthetic My.Qltest.K.MySyntheticField1, synthetic MySyntheticField1.MyNestedSyntheticField] : Object | ExternalFlow.cs:324:18:324:44 | this access : K [synthetic My.Qltest.K.MySyntheticField1, synthetic MySyntheticField1.MyNestedSyntheticField] : Object | provenance |  |
+| ExternalFlow.cs:323:39:323:39 | access to local variable o : Object | ExternalFlow.cs:323:13:323:40 | [post] this access : K [synthetic My.Qltest.K.MySyntheticField1, synthetic MySyntheticField1.MyNestedSyntheticField] : Object | provenance | MaD:28 |
+| ExternalFlow.cs:324:18:324:44 | this access : K [synthetic My.Qltest.K.MySyntheticField1, synthetic MySyntheticField1.MyNestedSyntheticField] : Object | ExternalFlow.cs:324:18:324:44 | call to method GetMyNestedSyntheticField | provenance | MaD:25 |
+| ExternalFlow.cs:329:17:329:17 | access to local variable o : Object | ExternalFlow.cs:330:40:330:40 | access to local variable o : Object | provenance |  |
+| ExternalFlow.cs:329:21:329:32 | object creation of type Object : Object | ExternalFlow.cs:329:17:329:17 | access to local variable o : Object | provenance |  |
+| ExternalFlow.cs:330:13:330:41 | [post] this access : K [synthetic My.Qltest.K.MySyntheticField2, field MyField] : Object | ExternalFlow.cs:331:18:331:45 | this access : K [synthetic My.Qltest.K.MySyntheticField2, field MyField] : Object | provenance |  |
+| ExternalFlow.cs:330:40:330:40 | access to local variable o : Object | ExternalFlow.cs:330:13:330:41 | [post] this access : K [synthetic My.Qltest.K.MySyntheticField2, field MyField] : Object | provenance | MaD:27 |
+| ExternalFlow.cs:331:18:331:45 | this access : K [synthetic My.Qltest.K.MySyntheticField2, field MyField] : Object | ExternalFlow.cs:331:18:331:45 | call to method GetMyFieldOnSyntheticField | provenance | MaD:24 |
+| ExternalFlow.cs:343:17:343:17 | access to local variable o : Object | ExternalFlow.cs:344:24:344:24 | access to local variable o : Object | provenance |  |
+| ExternalFlow.cs:343:21:343:32 | object creation of type Object : Object | ExternalFlow.cs:343:17:343:17 | access to local variable o : Object | provenance |  |
+| ExternalFlow.cs:344:13:344:13 | [post] access to local variable l : Library [synthetic X] : Object | ExternalFlow.cs:345:18:345:18 | access to local variable l : Library [synthetic X] : Object | provenance |  |
+| ExternalFlow.cs:344:24:344:24 | access to local variable o : Object | ExternalFlow.cs:344:13:344:13 | [post] access to local variable l : Library [synthetic X] : Object | provenance | MaD:33 |
+| ExternalFlow.cs:345:18:345:18 | access to local variable l : Library [synthetic X] : Object | ExternalFlow.cs:345:18:345:29 | call to method GetValue | provenance | MaD:31 |
 nodes
 | ExternalFlow.cs:9:20:9:23 | access to local variable arg1 : Object | semmle.label | access to local variable arg1 : Object |
 | ExternalFlow.cs:9:27:9:38 | object creation of type Object : Object | semmle.label | object creation of type Object : Object |
@@ -261,24 +268,30 @@ nodes
 | ExternalFlow.cs:279:22:279:22 | access to local variable j : Object | semmle.label | access to local variable j : Object |
 | ExternalFlow.cs:281:18:281:21 | this access : J | semmle.label | this access : J |
 | ExternalFlow.cs:281:18:281:27 | access to property Prop1 | semmle.label | access to property Prop1 |
-| ExternalFlow.cs:313:17:313:17 | access to local variable o : Object | semmle.label | access to local variable o : Object |
-| ExternalFlow.cs:313:21:313:32 | object creation of type Object : Object | semmle.label | object creation of type Object : Object |
-| ExternalFlow.cs:314:13:314:34 | [post] this access : K [synthetic My.Qltest.K.MySyntheticField] : Object | semmle.label | [post] this access : K [synthetic My.Qltest.K.MySyntheticField] : Object |
-| ExternalFlow.cs:314:33:314:33 | access to local variable o : Object | semmle.label | access to local variable o : Object |
-| ExternalFlow.cs:315:18:315:38 | call to method GetMySyntheticField | semmle.label | call to method GetMySyntheticField |
-| ExternalFlow.cs:315:18:315:38 | this access : K [synthetic My.Qltest.K.MySyntheticField] : Object | semmle.label | this access : K [synthetic My.Qltest.K.MySyntheticField] : Object |
-| ExternalFlow.cs:319:17:319:17 | access to local variable o : Object | semmle.label | access to local variable o : Object |
-| ExternalFlow.cs:319:21:319:32 | object creation of type Object : Object | semmle.label | object creation of type Object : Object |
-| ExternalFlow.cs:320:13:320:40 | [post] this access : K [synthetic My.Qltest.K.MySyntheticField1, synthetic MySyntheticField1.MyNestedSyntheticField] : Object | semmle.label | [post] this access : K [synthetic My.Qltest.K.MySyntheticField1, synthetic MySyntheticField1.MyNestedSyntheticField] : Object |
-| ExternalFlow.cs:320:39:320:39 | access to local variable o : Object | semmle.label | access to local variable o : Object |
-| ExternalFlow.cs:321:18:321:44 | call to method GetMyNestedSyntheticField | semmle.label | call to method GetMyNestedSyntheticField |
-| ExternalFlow.cs:321:18:321:44 | this access : K [synthetic My.Qltest.K.MySyntheticField1, synthetic MySyntheticField1.MyNestedSyntheticField] : Object | semmle.label | this access : K [synthetic My.Qltest.K.MySyntheticField1, synthetic MySyntheticField1.MyNestedSyntheticField] : Object |
-| ExternalFlow.cs:325:17:325:17 | access to local variable o : Object | semmle.label | access to local variable o : Object |
-| ExternalFlow.cs:325:21:325:32 | object creation of type Object : Object | semmle.label | object creation of type Object : Object |
-| ExternalFlow.cs:326:13:326:41 | [post] this access : K [synthetic My.Qltest.K.MySyntheticField2, field MyField] : Object | semmle.label | [post] this access : K [synthetic My.Qltest.K.MySyntheticField2, field MyField] : Object |
-| ExternalFlow.cs:326:40:326:40 | access to local variable o : Object | semmle.label | access to local variable o : Object |
-| ExternalFlow.cs:327:18:327:45 | call to method GetMyFieldOnSyntheticField | semmle.label | call to method GetMyFieldOnSyntheticField |
-| ExternalFlow.cs:327:18:327:45 | this access : K [synthetic My.Qltest.K.MySyntheticField2, field MyField] : Object | semmle.label | this access : K [synthetic My.Qltest.K.MySyntheticField2, field MyField] : Object |
+| ExternalFlow.cs:315:17:315:17 | access to local variable o : Object | semmle.label | access to local variable o : Object |
+| ExternalFlow.cs:315:21:315:32 | object creation of type Object : Object | semmle.label | object creation of type Object : Object |
+| ExternalFlow.cs:316:13:316:34 | [post] this access : K [synthetic My.Qltest.K.MySyntheticField] : Object | semmle.label | [post] this access : K [synthetic My.Qltest.K.MySyntheticField] : Object |
+| ExternalFlow.cs:316:33:316:33 | access to local variable o : Object | semmle.label | access to local variable o : Object |
+| ExternalFlow.cs:317:18:317:38 | call to method GetMySyntheticField | semmle.label | call to method GetMySyntheticField |
+| ExternalFlow.cs:317:18:317:38 | this access : K [synthetic My.Qltest.K.MySyntheticField] : Object | semmle.label | this access : K [synthetic My.Qltest.K.MySyntheticField] : Object |
+| ExternalFlow.cs:322:17:322:17 | access to local variable o : Object | semmle.label | access to local variable o : Object |
+| ExternalFlow.cs:322:21:322:32 | object creation of type Object : Object | semmle.label | object creation of type Object : Object |
+| ExternalFlow.cs:323:13:323:40 | [post] this access : K [synthetic My.Qltest.K.MySyntheticField1, synthetic MySyntheticField1.MyNestedSyntheticField] : Object | semmle.label | [post] this access : K [synthetic My.Qltest.K.MySyntheticField1, synthetic MySyntheticField1.MyNestedSyntheticField] : Object |
+| ExternalFlow.cs:323:39:323:39 | access to local variable o : Object | semmle.label | access to local variable o : Object |
+| ExternalFlow.cs:324:18:324:44 | call to method GetMyNestedSyntheticField | semmle.label | call to method GetMyNestedSyntheticField |
+| ExternalFlow.cs:324:18:324:44 | this access : K [synthetic My.Qltest.K.MySyntheticField1, synthetic MySyntheticField1.MyNestedSyntheticField] : Object | semmle.label | this access : K [synthetic My.Qltest.K.MySyntheticField1, synthetic MySyntheticField1.MyNestedSyntheticField] : Object |
+| ExternalFlow.cs:329:17:329:17 | access to local variable o : Object | semmle.label | access to local variable o : Object |
+| ExternalFlow.cs:329:21:329:32 | object creation of type Object : Object | semmle.label | object creation of type Object : Object |
+| ExternalFlow.cs:330:13:330:41 | [post] this access : K [synthetic My.Qltest.K.MySyntheticField2, field MyField] : Object | semmle.label | [post] this access : K [synthetic My.Qltest.K.MySyntheticField2, field MyField] : Object |
+| ExternalFlow.cs:330:40:330:40 | access to local variable o : Object | semmle.label | access to local variable o : Object |
+| ExternalFlow.cs:331:18:331:45 | call to method GetMyFieldOnSyntheticField | semmle.label | call to method GetMyFieldOnSyntheticField |
+| ExternalFlow.cs:331:18:331:45 | this access : K [synthetic My.Qltest.K.MySyntheticField2, field MyField] : Object | semmle.label | this access : K [synthetic My.Qltest.K.MySyntheticField2, field MyField] : Object |
+| ExternalFlow.cs:343:17:343:17 | access to local variable o : Object | semmle.label | access to local variable o : Object |
+| ExternalFlow.cs:343:21:343:32 | object creation of type Object : Object | semmle.label | object creation of type Object : Object |
+| ExternalFlow.cs:344:13:344:13 | [post] access to local variable l : Library [synthetic X] : Object | semmle.label | [post] access to local variable l : Library [synthetic X] : Object |
+| ExternalFlow.cs:344:24:344:24 | access to local variable o : Object | semmle.label | access to local variable o : Object |
+| ExternalFlow.cs:345:18:345:18 | access to local variable l : Library [synthetic X] : Object | semmle.label | access to local variable l : Library [synthetic X] : Object |
+| ExternalFlow.cs:345:18:345:29 | call to method GetValue | semmle.label | call to method GetValue |
 subpaths
 | ExternalFlow.cs:84:29:84:32 | access to local variable objs : null [element] : Object | ExternalFlow.cs:84:35:84:35 | o : Object | ExternalFlow.cs:84:40:84:40 | access to parameter o : Object | ExternalFlow.cs:84:25:84:41 | call to method Map<Object,Object> : T[] [element] : Object |
 invalidModelRow
@@ -308,6 +321,7 @@ invalidModelRow
 | ExternalFlow.cs:240:18:240:18 | access to local variable o | ExternalFlow.cs:238:21:238:28 | object creation of type HC : HC | ExternalFlow.cs:240:18:240:18 | access to local variable o | $@ | ExternalFlow.cs:238:21:238:28 | object creation of type HC : HC | object creation of type HC : HC |
 | ExternalFlow.cs:258:18:258:18 | access to local variable b | ExternalFlow.cs:256:20:256:31 | object creation of type Object : Object | ExternalFlow.cs:258:18:258:18 | access to local variable b | $@ | ExternalFlow.cs:256:20:256:31 | object creation of type Object : Object | object creation of type Object : Object |
 | ExternalFlow.cs:281:18:281:27 | access to property Prop1 | ExternalFlow.cs:278:21:278:32 | object creation of type Object : Object | ExternalFlow.cs:281:18:281:27 | access to property Prop1 | $@ | ExternalFlow.cs:278:21:278:32 | object creation of type Object : Object | object creation of type Object : Object |
-| ExternalFlow.cs:315:18:315:38 | call to method GetMySyntheticField | ExternalFlow.cs:313:21:313:32 | object creation of type Object : Object | ExternalFlow.cs:315:18:315:38 | call to method GetMySyntheticField | $@ | ExternalFlow.cs:313:21:313:32 | object creation of type Object : Object | object creation of type Object : Object |
-| ExternalFlow.cs:321:18:321:44 | call to method GetMyNestedSyntheticField | ExternalFlow.cs:319:21:319:32 | object creation of type Object : Object | ExternalFlow.cs:321:18:321:44 | call to method GetMyNestedSyntheticField | $@ | ExternalFlow.cs:319:21:319:32 | object creation of type Object : Object | object creation of type Object : Object |
-| ExternalFlow.cs:327:18:327:45 | call to method GetMyFieldOnSyntheticField | ExternalFlow.cs:325:21:325:32 | object creation of type Object : Object | ExternalFlow.cs:327:18:327:45 | call to method GetMyFieldOnSyntheticField | $@ | ExternalFlow.cs:325:21:325:32 | object creation of type Object : Object | object creation of type Object : Object |
+| ExternalFlow.cs:317:18:317:38 | call to method GetMySyntheticField | ExternalFlow.cs:315:21:315:32 | object creation of type Object : Object | ExternalFlow.cs:317:18:317:38 | call to method GetMySyntheticField | $@ | ExternalFlow.cs:315:21:315:32 | object creation of type Object : Object | object creation of type Object : Object |
+| ExternalFlow.cs:324:18:324:44 | call to method GetMyNestedSyntheticField | ExternalFlow.cs:322:21:322:32 | object creation of type Object : Object | ExternalFlow.cs:324:18:324:44 | call to method GetMyNestedSyntheticField | $@ | ExternalFlow.cs:322:21:322:32 | object creation of type Object : Object | object creation of type Object : Object |
+| ExternalFlow.cs:331:18:331:45 | call to method GetMyFieldOnSyntheticField | ExternalFlow.cs:329:21:329:32 | object creation of type Object : Object | ExternalFlow.cs:331:18:331:45 | call to method GetMyFieldOnSyntheticField | $@ | ExternalFlow.cs:329:21:329:32 | object creation of type Object : Object | object creation of type Object : Object |
+| ExternalFlow.cs:345:18:345:29 | call to method GetValue | ExternalFlow.cs:343:21:343:32 | object creation of type Object : Object | ExternalFlow.cs:345:18:345:29 | call to method GetValue | $@ | ExternalFlow.cs:343:21:343:32 | object creation of type Object : Object | object creation of type Object : Object |
diff --git a/csharp/ql/test/library-tests/dataflow/external-models/ExternalFlow.ext.yml b/csharp/ql/test/library-tests/dataflow/external-models/ExternalFlow.ext.yml
index f2cf9972a73..a582a581cf1 100644
--- a/csharp/ql/test/library-tests/dataflow/external-models/ExternalFlow.ext.yml
+++ b/csharp/ql/test/library-tests/dataflow/external-models/ExternalFlow.ext.yml
@@ -43,6 +43,8 @@ extensions:
       - ["My.Qltest", "K", false, "GetMyNestedSyntheticField", "()", "", "Argument[this].SyntheticField[My.Qltest.K.MySyntheticField1].SyntheticField[MySyntheticField1.MyNestedSyntheticField]", "ReturnValue", "value", "manual"]
       - ["My.Qltest", "K", false, "SetMyFieldOnSyntheticField", "(System.Object)", "", "Argument[0]", "Argument[this].SyntheticField[My.Qltest.K.MySyntheticField2].Field[My.Qltest.K.MyField]", "value", "manual"]
       - ["My.Qltest", "K", false, "GetMyFieldOnSyntheticField", "()", "", "Argument[this].SyntheticField[My.Qltest.K.MySyntheticField2].Field[My.Qltest.K.MyField]", "ReturnValue", "value", "manual"]
+      - ["My.Qltest", "Library", false, "SetValue", "(System.Object)", "", "Argument[0]", "Argument[this].SyntheticField[X]", "value", "dfc-generated"]
+      - ["My.Qltest", "Library", false, "GetValue", "()", "", "Argument[this].SyntheticField[X]", "ReturnValue", "value", "dfc-generated"]
 
   - addsTo:
       pack: codeql/csharp-all
diff --git a/csharp/ql/test/library-tests/dataflow/flowsources/local/commandargs/CommandArgs.ql b/csharp/ql/test/library-tests/dataflow/flowsources/local/commandargs/CommandArgs.ql
index aa89a4c3455..017c4370dfd 100644
--- a/csharp/ql/test/library-tests/dataflow/flowsources/local/commandargs/CommandArgs.ql
+++ b/csharp/ql/test/library-tests/dataflow/flowsources/local/commandargs/CommandArgs.ql
@@ -2,5 +2,5 @@ import csharp
 import semmle.code.csharp.security.dataflow.flowsources.FlowSources
 
 from DataFlow::Node source
-where source instanceof ThreatModelFlowSource
+where source instanceof ActiveThreatModelSource
 select source
diff --git a/csharp/ql/test/library-tests/dataflow/flowsources/local/commandargs/CommandLineFlow.ql b/csharp/ql/test/library-tests/dataflow/flowsources/local/commandargs/CommandLineFlow.ql
index 731043cf470..579514c496f 100644
--- a/csharp/ql/test/library-tests/dataflow/flowsources/local/commandargs/CommandLineFlow.ql
+++ b/csharp/ql/test/library-tests/dataflow/flowsources/local/commandargs/CommandLineFlow.ql
@@ -2,7 +2,7 @@ import csharp
 import semmle.code.csharp.security.dataflow.flowsources.FlowSources
 
 module CommandLineFlowConfig implements DataFlow::ConfigSig {
-  predicate isSource(DataFlow::Node source) { source instanceof ThreatModelFlowSource }
+  predicate isSource(DataFlow::Node source) { source instanceof ActiveThreatModelSource }
 
   predicate isSink(DataFlow::Node sink) {
     exists(MethodCall mc | mc.getTarget().hasName("Sink") | sink.asExpr() = mc.getArgument(0))
diff --git a/csharp/ql/test/library-tests/dataflow/flowsources/local/registry/Registry.ql b/csharp/ql/test/library-tests/dataflow/flowsources/local/registry/Registry.ql
index 9e2934e9e19..8462205d61a 100644
--- a/csharp/ql/test/library-tests/dataflow/flowsources/local/registry/Registry.ql
+++ b/csharp/ql/test/library-tests/dataflow/flowsources/local/registry/Registry.ql
@@ -2,5 +2,5 @@ import csharp
 import semmle.code.csharp.security.dataflow.flowsources.FlowSources
 
 from DataFlow::Node source
-where source instanceof ThreatModelFlowSource
+where source instanceof ActiveThreatModelSource
 select source, source.(SourceNode).getThreatModel()
diff --git a/csharp/ql/test/library-tests/dataflow/flowsources/stored/database/dapper/DatabaseSources.ql b/csharp/ql/test/library-tests/dataflow/flowsources/stored/database/dapper/DatabaseSources.ql
index aa9372d73d2..aff922884ff 100644
--- a/csharp/ql/test/library-tests/dataflow/flowsources/stored/database/dapper/DatabaseSources.ql
+++ b/csharp/ql/test/library-tests/dataflow/flowsources/stored/database/dapper/DatabaseSources.ql
@@ -4,7 +4,7 @@ import TestUtilities.InlineFlowTest
 import TaintFlowTest<DatabaseConfig>
 
 module DatabaseConfig implements DataFlow::ConfigSig {
-  predicate isSource(DataFlow::Node source) { source instanceof ThreatModelFlowSource }
+  predicate isSource(DataFlow::Node source) { source instanceof ActiveThreatModelSource }
 
   predicate isSink(DataFlow::Node sink) {
     exists(MethodCall mc | mc.getTarget().hasName("Sink") | sink.asExpr() = mc.getArgument(0))
diff --git a/csharp/ql/test/library-tests/dataflow/flowsources/stored/file/Files.ql b/csharp/ql/test/library-tests/dataflow/flowsources/stored/file/Files.ql
index 1060ea756a2..ad8a40fa074 100644
--- a/csharp/ql/test/library-tests/dataflow/flowsources/stored/file/Files.ql
+++ b/csharp/ql/test/library-tests/dataflow/flowsources/stored/file/Files.ql
@@ -4,7 +4,7 @@ import TestUtilities.InlineFlowTest
 import TaintFlowTest<FilesConfig>
 
 module FilesConfig implements DataFlow::ConfigSig {
-  predicate isSource(DataFlow::Node source) { source instanceof ThreatModelFlowSource }
+  predicate isSource(DataFlow::Node source) { source instanceof ActiveThreatModelSource }
 
   predicate isSink(DataFlow::Node sink) {
     exists(MethodCall mc | mc.getTarget().hasName("Sink") | sink.asExpr() = mc.getArgument(0))
diff --git a/csharp/ql/test/library-tests/dataflow/global/DataFlowPath.expected b/csharp/ql/test/library-tests/dataflow/global/DataFlowPath.expected
index a40ebb08f1c..74c1c62de1f 100644
--- a/csharp/ql/test/library-tests/dataflow/global/DataFlowPath.expected
+++ b/csharp/ql/test/library-tests/dataflow/global/DataFlowPath.expected
@@ -8,8 +8,8 @@ models
 | 7 | Summary: System.Linq; Queryable; false; AsQueryable<TElement>; (System.Collections.Generic.IEnumerable<TElement>); ; Argument[0].Element; ReturnValue.Element; value; manual |
 | 8 | Summary: System.Linq; Queryable; false; First<TSource>; (System.Linq.IQueryable<TSource>); ; Argument[0].Element; ReturnValue; value; manual |
 | 9 | Summary: System.Linq; Queryable; false; Select<TSource,TResult>; (System.Linq.IQueryable<TSource>,System.Linq.Expressions.Expression<System.Func<TSource,TResult>>); ; Argument[0].Element; Argument[1].Parameter[0]; value; manual |
-| 10 | Summary: System.Runtime.CompilerServices; ConfiguredTaskAwaitable<TResult>; false; GetAwaiter; (); ; Argument[this].SyntheticField[m_configuredTaskAwaiter]; ReturnValue; value; manual |
-| 11 | Summary: System.Runtime.CompilerServices; ConfiguredTaskAwaitable<TResult>+ConfiguredTaskAwaiter; false; GetResult; (); ; Argument[this].SyntheticField[m_task_configured_task_awaitable].Property[System.Threading.Tasks.Task`1.Result]; ReturnValue; value; manual |
+| 10 | Summary: System.Runtime.CompilerServices; ConfiguredTaskAwaitable<TResult>+ConfiguredTaskAwaiter; false; GetResult; (); ; Argument[this].SyntheticField[m_task_configured_task_awaitable].Property[System.Threading.Tasks.Task`1.Result]; ReturnValue; value; manual |
+| 11 | Summary: System.Runtime.CompilerServices; ConfiguredTaskAwaitable<TResult>; false; GetAwaiter; (); ; Argument[this].SyntheticField[m_configuredTaskAwaiter]; ReturnValue; value; manual |
 | 12 | Summary: System.Threading.Tasks; Task; false; Run<TResult>; (System.Func<TResult>); ; Argument[0].ReturnValue; ReturnValue.Property[System.Threading.Tasks.Task`1.Result]; value; manual |
 | 13 | Summary: System.Threading.Tasks; Task<TResult>; false; ConfigureAwait; (System.Boolean); ; Argument[this]; ReturnValue.SyntheticField[m_configuredTaskAwaiter].SyntheticField[m_task_configured_task_awaitable]; value; manual |
 | 14 | Summary: System; Lazy<T>; false; Lazy; (System.Func<T>); ; Argument[0].ReturnValue; Argument[this].Property[System.Lazy`1.Value]; value; manual |
@@ -412,10 +412,10 @@ edges
 | GlobalDataFlow.cs:458:25:458:28 | access to local variable task : Task<T> [property Result] : String | GlobalDataFlow.cs:458:25:458:50 | call to method ConfigureAwait : ConfiguredTaskAwaitable<T> [synthetic m_configuredTaskAwaiter, synthetic m_task_configured_task_awaitable, property Result] : String | provenance | MaD:13 |
 | GlobalDataFlow.cs:458:25:458:50 | call to method ConfigureAwait : ConfiguredTaskAwaitable<T> [synthetic m_configuredTaskAwaiter, synthetic m_task_configured_task_awaitable, property Result] : String | GlobalDataFlow.cs:458:13:458:21 | access to local variable awaitable : ConfiguredTaskAwaitable<T> [synthetic m_configuredTaskAwaiter, synthetic m_task_configured_task_awaitable, property Result] : String | provenance |  |
 | GlobalDataFlow.cs:459:13:459:19 | access to local variable awaiter : ConfiguredTaskAwaitable<T>.ConfiguredTaskAwaiter [synthetic m_task_configured_task_awaitable, property Result] : String | GlobalDataFlow.cs:460:22:460:28 | access to local variable awaiter : ConfiguredTaskAwaitable<T>.ConfiguredTaskAwaiter [synthetic m_task_configured_task_awaitable, property Result] : String | provenance |  |
-| GlobalDataFlow.cs:459:23:459:31 | access to local variable awaitable : ConfiguredTaskAwaitable<T> [synthetic m_configuredTaskAwaiter, synthetic m_task_configured_task_awaitable, property Result] : String | GlobalDataFlow.cs:459:23:459:44 | call to method GetAwaiter : ConfiguredTaskAwaitable<T>.ConfiguredTaskAwaiter [synthetic m_task_configured_task_awaitable, property Result] : String | provenance | MaD:10 |
+| GlobalDataFlow.cs:459:23:459:31 | access to local variable awaitable : ConfiguredTaskAwaitable<T> [synthetic m_configuredTaskAwaiter, synthetic m_task_configured_task_awaitable, property Result] : String | GlobalDataFlow.cs:459:23:459:44 | call to method GetAwaiter : ConfiguredTaskAwaitable<T>.ConfiguredTaskAwaiter [synthetic m_task_configured_task_awaitable, property Result] : String | provenance | MaD:11 |
 | GlobalDataFlow.cs:459:23:459:44 | call to method GetAwaiter : ConfiguredTaskAwaitable<T>.ConfiguredTaskAwaiter [synthetic m_task_configured_task_awaitable, property Result] : String | GlobalDataFlow.cs:459:13:459:19 | access to local variable awaiter : ConfiguredTaskAwaitable<T>.ConfiguredTaskAwaiter [synthetic m_task_configured_task_awaitable, property Result] : String | provenance |  |
 | GlobalDataFlow.cs:460:13:460:18 | access to local variable sink45 : String | GlobalDataFlow.cs:461:15:461:20 | access to local variable sink45 | provenance |  |
-| GlobalDataFlow.cs:460:22:460:28 | access to local variable awaiter : ConfiguredTaskAwaitable<T>.ConfiguredTaskAwaiter [synthetic m_task_configured_task_awaitable, property Result] : String | GlobalDataFlow.cs:460:22:460:40 | call to method GetResult : String | provenance | MaD:11 |
+| GlobalDataFlow.cs:460:22:460:28 | access to local variable awaiter : ConfiguredTaskAwaitable<T>.ConfiguredTaskAwaiter [synthetic m_task_configured_task_awaitable, property Result] : String | GlobalDataFlow.cs:460:22:460:40 | call to method GetResult : String | provenance | MaD:10 |
 | GlobalDataFlow.cs:460:22:460:40 | call to method GetResult : String | GlobalDataFlow.cs:460:13:460:18 | access to local variable sink45 : String | provenance |  |
 | GlobalDataFlow.cs:466:53:466:55 | arg : String | GlobalDataFlow.cs:470:15:470:17 | access to parameter arg : String | provenance |  |
 | GlobalDataFlow.cs:469:21:469:21 | s : String | GlobalDataFlow.cs:469:32:469:32 | access to parameter s | provenance |  |
diff --git a/csharp/ql/test/library-tests/dataflow/global/TaintTrackingPath.expected b/csharp/ql/test/library-tests/dataflow/global/TaintTrackingPath.expected
index 4bf73387c5d..1d05b0ae55e 100644
--- a/csharp/ql/test/library-tests/dataflow/global/TaintTrackingPath.expected
+++ b/csharp/ql/test/library-tests/dataflow/global/TaintTrackingPath.expected
@@ -10,8 +10,8 @@ models
 | 9 | Summary: System.Linq; Queryable; false; AsQueryable<TElement>; (System.Collections.Generic.IEnumerable<TElement>); ; Argument[0].Element; ReturnValue.Element; value; manual |
 | 10 | Summary: System.Linq; Queryable; false; First<TSource>; (System.Linq.IQueryable<TSource>); ; Argument[0].Element; ReturnValue; value; manual |
 | 11 | Summary: System.Linq; Queryable; false; Select<TSource,TResult>; (System.Linq.IQueryable<TSource>,System.Linq.Expressions.Expression<System.Func<TSource,TResult>>); ; Argument[0].Element; Argument[1].Parameter[0]; value; manual |
-| 12 | Summary: System.Runtime.CompilerServices; ConfiguredTaskAwaitable<TResult>; false; GetAwaiter; (); ; Argument[this].SyntheticField[m_configuredTaskAwaiter]; ReturnValue; value; manual |
-| 13 | Summary: System.Runtime.CompilerServices; ConfiguredTaskAwaitable<TResult>+ConfiguredTaskAwaiter; false; GetResult; (); ; Argument[this].SyntheticField[m_task_configured_task_awaitable].Property[System.Threading.Tasks.Task`1.Result]; ReturnValue; value; manual |
+| 12 | Summary: System.Runtime.CompilerServices; ConfiguredTaskAwaitable<TResult>+ConfiguredTaskAwaiter; false; GetResult; (); ; Argument[this].SyntheticField[m_task_configured_task_awaitable].Property[System.Threading.Tasks.Task`1.Result]; ReturnValue; value; manual |
+| 13 | Summary: System.Runtime.CompilerServices; ConfiguredTaskAwaitable<TResult>; false; GetAwaiter; (); ; Argument[this].SyntheticField[m_configuredTaskAwaiter]; ReturnValue; value; manual |
 | 14 | Summary: System.Text; StringBuilder; false; Append; (System.String); ; Argument[0]; Argument[this]; taint; manual |
 | 15 | Summary: System.Text; StringBuilder; false; Append; (System.Text.StringBuilder); ; Argument[0]; Argument[this]; taint; manual |
 | 16 | Summary: System.Text; StringBuilder; false; Append; (System.Text.StringBuilder+AppendInterpolatedStringHandler); ; Argument[0]; Argument[this]; taint; manual |
@@ -452,10 +452,10 @@ edges
 | GlobalDataFlow.cs:458:25:458:28 | access to local variable task : Task<T> [property Result] : String | GlobalDataFlow.cs:458:25:458:50 | call to method ConfigureAwait : ConfiguredTaskAwaitable<T> [synthetic m_configuredTaskAwaiter, synthetic m_task_configured_task_awaitable, property Result] : String | provenance | MaD:19 |
 | GlobalDataFlow.cs:458:25:458:50 | call to method ConfigureAwait : ConfiguredTaskAwaitable<T> [synthetic m_configuredTaskAwaiter, synthetic m_task_configured_task_awaitable, property Result] : String | GlobalDataFlow.cs:458:13:458:21 | access to local variable awaitable : ConfiguredTaskAwaitable<T> [synthetic m_configuredTaskAwaiter, synthetic m_task_configured_task_awaitable, property Result] : String | provenance |  |
 | GlobalDataFlow.cs:459:13:459:19 | access to local variable awaiter : ConfiguredTaskAwaitable<T>.ConfiguredTaskAwaiter [synthetic m_task_configured_task_awaitable, property Result] : String | GlobalDataFlow.cs:460:22:460:28 | access to local variable awaiter : ConfiguredTaskAwaitable<T>.ConfiguredTaskAwaiter [synthetic m_task_configured_task_awaitable, property Result] : String | provenance |  |
-| GlobalDataFlow.cs:459:23:459:31 | access to local variable awaitable : ConfiguredTaskAwaitable<T> [synthetic m_configuredTaskAwaiter, synthetic m_task_configured_task_awaitable, property Result] : String | GlobalDataFlow.cs:459:23:459:44 | call to method GetAwaiter : ConfiguredTaskAwaitable<T>.ConfiguredTaskAwaiter [synthetic m_task_configured_task_awaitable, property Result] : String | provenance | MaD:12 |
+| GlobalDataFlow.cs:459:23:459:31 | access to local variable awaitable : ConfiguredTaskAwaitable<T> [synthetic m_configuredTaskAwaiter, synthetic m_task_configured_task_awaitable, property Result] : String | GlobalDataFlow.cs:459:23:459:44 | call to method GetAwaiter : ConfiguredTaskAwaitable<T>.ConfiguredTaskAwaiter [synthetic m_task_configured_task_awaitable, property Result] : String | provenance | MaD:13 |
 | GlobalDataFlow.cs:459:23:459:44 | call to method GetAwaiter : ConfiguredTaskAwaitable<T>.ConfiguredTaskAwaiter [synthetic m_task_configured_task_awaitable, property Result] : String | GlobalDataFlow.cs:459:13:459:19 | access to local variable awaiter : ConfiguredTaskAwaitable<T>.ConfiguredTaskAwaiter [synthetic m_task_configured_task_awaitable, property Result] : String | provenance |  |
 | GlobalDataFlow.cs:460:13:460:18 | access to local variable sink45 : String | GlobalDataFlow.cs:461:15:461:20 | access to local variable sink45 | provenance |  |
-| GlobalDataFlow.cs:460:22:460:28 | access to local variable awaiter : ConfiguredTaskAwaitable<T>.ConfiguredTaskAwaiter [synthetic m_task_configured_task_awaitable, property Result] : String | GlobalDataFlow.cs:460:22:460:40 | call to method GetResult : String | provenance | MaD:13 |
+| GlobalDataFlow.cs:460:22:460:28 | access to local variable awaiter : ConfiguredTaskAwaitable<T>.ConfiguredTaskAwaiter [synthetic m_task_configured_task_awaitable, property Result] : String | GlobalDataFlow.cs:460:22:460:40 | call to method GetResult : String | provenance | MaD:12 |
 | GlobalDataFlow.cs:460:22:460:40 | call to method GetResult : String | GlobalDataFlow.cs:460:13:460:18 | access to local variable sink45 : String | provenance |  |
 | GlobalDataFlow.cs:466:53:466:55 | arg : String | GlobalDataFlow.cs:470:15:470:17 | access to parameter arg : String | provenance |  |
 | GlobalDataFlow.cs:469:21:469:21 | s : String | GlobalDataFlow.cs:469:32:469:32 | access to parameter s | provenance |  |
diff --git a/csharp/ql/test/library-tests/dataflow/library/FlowSummaries.expected b/csharp/ql/test/library-tests/dataflow/library/FlowSummaries.expected
index 1e30cae7031..7b6e623288f 100644
--- a/csharp/ql/test/library-tests/dataflow/library/FlowSummaries.expected
+++ b/csharp/ql/test/library-tests/dataflow/library/FlowSummaries.expected
@@ -755,7 +755,7 @@ summary
 | Dapper;SqlMapper;remove_QueryCachePurged;(System.EventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | Funq;Container;AddSingleton;(System.Type,System.Func<System.Object>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
 | Funq;Container;AddTransient;(System.Type,System.Func<System.Object>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
-| Funq;Container;GetService;(System.Type);Argument[this];ReturnValue;taint;df-generated |
+| Funq;Container;GetService;(System.Type);Argument[this];ReturnValue;value;dfc-generated |
 | Funq;Container;Register<TService,TArg1,TArg2,TArg3,TArg4,TArg5,TArg6>;(Funq.Func<Funq.Container,TArg1,TArg2,TArg3,TArg4,TArg5,TArg6,TService>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | Funq;Container;Register<TService,TArg1,TArg2,TArg3,TArg4,TArg5,TArg6>;(System.String,Funq.Func<Funq.Container,TArg1,TArg2,TArg3,TArg4,TArg5,TArg6,TService>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
 | Funq;Container;Register<TService,TArg1,TArg2,TArg3,TArg4,TArg5>;(Funq.Func<Funq.Container,TArg1,TArg2,TArg3,TArg4,TArg5,TService>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
@@ -829,15 +829,29 @@ summary
 | Microsoft.AspNetCore.Builder;ComponentEndpointConventionBuilder;Finally;(System.Action<Microsoft.AspNetCore.Builder.EndpointBuilder>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | Microsoft.AspNetCore.Builder;ComponentEndpointRouteBuilderExtensions;MapBlazorHub;(Microsoft.AspNetCore.Routing.IEndpointRouteBuilder,System.Action<Microsoft.AspNetCore.Http.Connections.HttpConnectionDispatcherOptions>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
 | Microsoft.AspNetCore.Builder;ComponentEndpointRouteBuilderExtensions;MapBlazorHub;(Microsoft.AspNetCore.Routing.IEndpointRouteBuilder,System.String,System.Action<Microsoft.AspNetCore.Http.Connections.HttpConnectionDispatcherOptions>);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
+| Microsoft.AspNetCore.Builder;ConfigureHostBuilder;ConfigureAppConfiguration;(System.Action<Microsoft.Extensions.Hosting.HostBuilderContext,Microsoft.Extensions.Configuration.IConfigurationBuilder>);Argument[0];Argument[0].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.AspNetCore.Builder;ConfigureHostBuilder;ConfigureAppConfiguration;(System.Action<Microsoft.Extensions.Hosting.HostBuilderContext,Microsoft.Extensions.Configuration.IConfigurationBuilder>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
+| Microsoft.AspNetCore.Builder;ConfigureHostBuilder;ConfigureAppConfiguration;(System.Action<Microsoft.Extensions.Hosting.HostBuilderContext,Microsoft.Extensions.Configuration.IConfigurationBuilder>);Argument[this];ReturnValue;value;dfc-generated |
+| Microsoft.AspNetCore.Builder;ConfigureHostBuilder;ConfigureAppConfiguration;(System.Action<Microsoft.Extensions.Hosting.HostBuilderContext,Microsoft.Extensions.Configuration.IConfigurationBuilder>);Argument[this];ReturnValue;value;hq-generated |
+| Microsoft.AspNetCore.Builder;ConfigureHostBuilder;ConfigureContainer<TContainerBuilder>;(System.Action<Microsoft.Extensions.Hosting.HostBuilderContext,TContainerBuilder>);Argument[0];Argument[0].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.AspNetCore.Builder;ConfigureHostBuilder;ConfigureContainer<TContainerBuilder>;(System.Action<Microsoft.Extensions.Hosting.HostBuilderContext,TContainerBuilder>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
+| Microsoft.AspNetCore.Builder;ConfigureHostBuilder;ConfigureContainer<TContainerBuilder>;(System.Action<Microsoft.Extensions.Hosting.HostBuilderContext,TContainerBuilder>);Argument[this];ReturnValue;value;dfc-generated |
+| Microsoft.AspNetCore.Builder;ConfigureHostBuilder;ConfigureContainer<TContainerBuilder>;(System.Action<Microsoft.Extensions.Hosting.HostBuilderContext,TContainerBuilder>);Argument[this];ReturnValue;value;hq-generated |
+| Microsoft.AspNetCore.Builder;ConfigureHostBuilder;ConfigureHostConfiguration;(System.Action<Microsoft.Extensions.Configuration.IConfigurationBuilder>);Argument[0];Argument[0].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.AspNetCore.Builder;ConfigureHostBuilder;ConfigureHostConfiguration;(System.Action<Microsoft.Extensions.Configuration.IConfigurationBuilder>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
+| Microsoft.AspNetCore.Builder;ConfigureHostBuilder;ConfigureHostConfiguration;(System.Action<Microsoft.Extensions.Configuration.IConfigurationBuilder>);Argument[this];ReturnValue;value;dfc-generated |
+| Microsoft.AspNetCore.Builder;ConfigureHostBuilder;ConfigureHostConfiguration;(System.Action<Microsoft.Extensions.Configuration.IConfigurationBuilder>);Argument[this];ReturnValue;value;hq-generated |
+| Microsoft.AspNetCore.Builder;ConfigureHostBuilder;ConfigureServices;(System.Action<Microsoft.Extensions.Hosting.HostBuilderContext,Microsoft.Extensions.DependencyInjection.IServiceCollection>);Argument[0];Argument[0].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.AspNetCore.Builder;ConfigureHostBuilder;ConfigureServices;(System.Action<Microsoft.Extensions.Hosting.HostBuilderContext,Microsoft.Extensions.DependencyInjection.IServiceCollection>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
+| Microsoft.AspNetCore.Builder;ConfigureHostBuilder;ConfigureServices;(System.Action<Microsoft.Extensions.Hosting.HostBuilderContext,Microsoft.Extensions.DependencyInjection.IServiceCollection>);Argument[this];ReturnValue;value;dfc-generated |
+| Microsoft.AspNetCore.Builder;ConfigureHostBuilder;ConfigureServices;(System.Action<Microsoft.Extensions.Hosting.HostBuilderContext,Microsoft.Extensions.DependencyInjection.IServiceCollection>);Argument[this];ReturnValue;value;hq-generated |
 | Microsoft.AspNetCore.Builder;ConfigureHostBuilder;ConfigureWebHost;(System.Action<Microsoft.AspNetCore.Hosting.IWebHostBuilder>,System.Action<Microsoft.Extensions.Hosting.WebHostBuilderOptions>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | Microsoft.AspNetCore.Builder;ConfigureHostBuilder;ConfigureWebHost;(System.Action<Microsoft.AspNetCore.Hosting.IWebHostBuilder>,System.Action<Microsoft.Extensions.Hosting.WebHostBuilderOptions>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
-| Microsoft.AspNetCore.Builder;ConfigureHostBuilder;UseServiceProviderFactory<TContainerBuilder>;(Microsoft.Extensions.DependencyInjection.IServiceProviderFactory<TContainerBuilder>);Argument[0];Argument[this];taint;df-generated |
-| Microsoft.AspNetCore.Builder;ConfigureHostBuilder;UseServiceProviderFactory<TContainerBuilder>;(Microsoft.Extensions.DependencyInjection.IServiceProviderFactory<TContainerBuilder>);Argument[this];ReturnValue;value;df-generated |
+| Microsoft.AspNetCore.Builder;ConfigureHostBuilder;UseServiceProviderFactory<TContainerBuilder>;(Microsoft.Extensions.DependencyInjection.IServiceProviderFactory<TContainerBuilder>);Argument[this];ReturnValue;value;dfc-generated |
+| Microsoft.AspNetCore.Builder;ConfigureHostBuilder;UseServiceProviderFactory<TContainerBuilder>;(System.Func<Microsoft.Extensions.Hosting.HostBuilderContext,Microsoft.Extensions.DependencyInjection.IServiceProviderFactory<TContainerBuilder>>);Argument[0];Argument[0].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.AspNetCore.Builder;ConfigureHostBuilder;UseServiceProviderFactory<TContainerBuilder>;(System.Func<Microsoft.Extensions.Hosting.HostBuilderContext,Microsoft.Extensions.DependencyInjection.IServiceProviderFactory<TContainerBuilder>>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
+| Microsoft.AspNetCore.Builder;ConfigureHostBuilder;UseServiceProviderFactory<TContainerBuilder>;(System.Func<Microsoft.Extensions.Hosting.HostBuilderContext,Microsoft.Extensions.DependencyInjection.IServiceProviderFactory<TContainerBuilder>>);Argument[this];ReturnValue;value;dfc-generated |
+| Microsoft.AspNetCore.Builder;ConfigureHostBuilder;UseServiceProviderFactory<TContainerBuilder>;(System.Func<Microsoft.Extensions.Hosting.HostBuilderContext,Microsoft.Extensions.DependencyInjection.IServiceProviderFactory<TContainerBuilder>>);Argument[this];ReturnValue;value;hq-generated |
 | Microsoft.AspNetCore.Builder;ConfigureWebHostBuilder;Configure;(System.Action<Microsoft.AspNetCore.Builder.IApplicationBuilder>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | Microsoft.AspNetCore.Builder;ConfigureWebHostBuilder;Configure;(System.Action<Microsoft.AspNetCore.Hosting.WebHostBuilderContext,Microsoft.AspNetCore.Builder.IApplicationBuilder>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | Microsoft.AspNetCore.Builder;ConfigureWebHostBuilder;ConfigureAppConfiguration;(System.Action<Microsoft.AspNetCore.Hosting.WebHostBuilderContext,Microsoft.Extensions.Configuration.IConfigurationBuilder>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
@@ -909,7 +923,6 @@ summary
 | Microsoft.AspNetCore.Builder;WebApplication;DisposeAsync;();Argument[this];ReturnValue;taint;df-generated |
 | Microsoft.AspNetCore.Builder;WebApplication;Use;(System.Func<Microsoft.AspNetCore.Http.RequestDelegate,Microsoft.AspNetCore.Http.RequestDelegate>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | Microsoft.AspNetCore.Builder;WebApplicationBuilder;ConfigureContainer<TContainerBuilder>;(Microsoft.Extensions.DependencyInjection.IServiceProviderFactory<TContainerBuilder>,System.Action<TContainerBuilder>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
-| Microsoft.AspNetCore.Builder;WebApplicationBuilder;get_Configuration;();Argument[this];ReturnValue;taint;df-generated |
 | Microsoft.AspNetCore.Builder;WebApplicationBuilder;get_Environment;();Argument[this];ReturnValue;taint;df-generated |
 | Microsoft.AspNetCore.Builder;WebApplicationBuilder;get_Logging;();Argument[this];ReturnValue;taint;df-generated |
 | Microsoft.AspNetCore.Builder;WebApplicationBuilder;get_Metrics;();Argument[this];ReturnValue;taint;df-generated |
@@ -1326,10 +1339,8 @@ summary
 | Microsoft.AspNetCore.Mvc.ModelBinding.Validation;ValidationStateDictionary;set_Item;(System.Object,Microsoft.AspNetCore.Mvc.ModelBinding.Validation.ValidationStateEntry);Argument[0];Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Key];value;manual |
 | Microsoft.AspNetCore.Mvc.ModelBinding.Validation;ValidationStateDictionary;set_Item;(System.Object,Microsoft.AspNetCore.Mvc.ModelBinding.Validation.ValidationStateEntry);Argument[1];Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Value];value;manual |
 | Microsoft.AspNetCore.Mvc.ModelBinding;BindingInfo;set_RequestPredicate;(System.Func<Microsoft.AspNetCore.Mvc.ActionContext,System.Boolean>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
-| Microsoft.AspNetCore.Mvc.ModelBinding;CompositeValueProvider;InsertItem;(System.Int32,Microsoft.AspNetCore.Mvc.ModelBinding.IValueProvider);Argument[1];Argument[this];taint;df-generated |
-| Microsoft.AspNetCore.Mvc.ModelBinding;CompositeValueProvider;InsertItem;(System.Int32,Microsoft.AspNetCore.Mvc.ModelBinding.IValueProvider);Argument[this];Argument[1];taint;df-generated |
+| Microsoft.AspNetCore.Mvc.ModelBinding;CompositeValueProvider;InsertItem;(System.Int32,Microsoft.AspNetCore.Mvc.ModelBinding.IValueProvider);Argument[1];Argument[this].SyntheticField[System.Collections.ObjectModel.Collection`1.items].Element;value;dfc-generated |
 | Microsoft.AspNetCore.Mvc.ModelBinding;CompositeValueProvider;SetItem;(System.Int32,Microsoft.AspNetCore.Mvc.ModelBinding.IValueProvider);Argument[1];Argument[this];taint;df-generated |
-| Microsoft.AspNetCore.Mvc.ModelBinding;CompositeValueProvider;SetItem;(System.Int32,Microsoft.AspNetCore.Mvc.ModelBinding.IValueProvider);Argument[this];Argument[1];taint;df-generated |
 | Microsoft.AspNetCore.Mvc.ModelBinding;DefaultModelBindingContext;set_PropertyFilter;(System.Func<Microsoft.AspNetCore.Mvc.ModelBinding.ModelMetadata,System.Boolean>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | Microsoft.AspNetCore.Mvc.ModelBinding;EnumGroupAndName;EnumGroupAndName;(System.String,System.Func<System.String>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
 | Microsoft.AspNetCore.Mvc.ModelBinding;ModelBindingContext;set_PropertyFilter;(System.Func<Microsoft.AspNetCore.Mvc.ModelBinding.ModelMetadata,System.Boolean>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
@@ -1496,8 +1507,8 @@ summary
 | Microsoft.AspNetCore.Mvc;MvcOptions;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.IEnumerator.Current];value;manual |
 | Microsoft.AspNetCore.Mvc;MvcViewOptions;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.Generic.IEnumerator`1.Current];value;manual |
 | Microsoft.AspNetCore.Mvc;MvcViewOptions;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.IEnumerator.Current];value;manual |
-| Microsoft.AspNetCore.Mvc;RemoteAttributeBase;FormatErrorMessage;(System.String);Argument[0];ReturnValue;taint;df-generated |
-| Microsoft.AspNetCore.Mvc;RemoteAttributeBase;FormatErrorMessage;(System.String);Argument[this];ReturnValue;taint;df-generated |
+| Microsoft.AspNetCore.Mvc;RemoteAttributeBase;FormatErrorMessage;(System.String);Argument[0];ReturnValue;taint;dfc-generated |
+| Microsoft.AspNetCore.Mvc;RemoteAttributeBase;FormatErrorMessage;(System.String);Argument[this].Property[System.ComponentModel.DataAnnotations.ValidationAttribute.ErrorMessageString];ReturnValue;taint;dfc-generated |
 | Microsoft.AspNetCore.OutputCaching;OutputCacheOptions;AddBasePolicy;(System.Action<Microsoft.AspNetCore.OutputCaching.OutputCachePolicyBuilder>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | Microsoft.AspNetCore.OutputCaching;OutputCacheOptions;AddBasePolicy;(System.Action<Microsoft.AspNetCore.OutputCaching.OutputCachePolicyBuilder>,System.Boolean);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | Microsoft.AspNetCore.OutputCaching;OutputCacheOptions;AddPolicy;(System.String,System.Action<Microsoft.AspNetCore.OutputCaching.OutputCachePolicyBuilder>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
@@ -1523,7 +1534,7 @@ summary
 | Microsoft.AspNetCore.Razor.Runtime.TagHelpers;TagHelperScopeManager;TagHelperScopeManager;(System.Action<System.Text.Encodings.Web.HtmlEncoder>,System.Func<Microsoft.AspNetCore.Razor.TagHelpers.TagHelperContent>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
 | Microsoft.AspNetCore.Razor.TagHelpers;NullHtmlEncoder;Encode;(System.IO.TextWriter,System.Char[],System.Int32,System.Int32);Argument[1].Element;Argument[0];taint;df-generated |
 | Microsoft.AspNetCore.Razor.TagHelpers;NullHtmlEncoder;Encode;(System.IO.TextWriter,System.String,System.Int32,System.Int32);Argument[1];Argument[0];taint;df-generated |
-| Microsoft.AspNetCore.Razor.TagHelpers;NullHtmlEncoder;Encode;(System.String);Argument[0];ReturnValue;taint;df-generated |
+| Microsoft.AspNetCore.Razor.TagHelpers;NullHtmlEncoder;Encode;(System.String);Argument[0];ReturnValue;value;dfc-generated |
 | Microsoft.AspNetCore.Razor.TagHelpers;TagHelperAttributeList;Add;(Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute);Argument[0];Argument[this].Element;value;manual |
 | Microsoft.AspNetCore.Razor.TagHelpers;TagHelperAttributeList;Clear;();Argument[this].WithoutElement;Argument[this];value;manual |
 | Microsoft.AspNetCore.Razor.TagHelpers;TagHelperAttributeList;Insert;(System.Int32,Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute);Argument[1];Argument[this].Element;value;manual |
@@ -1620,8 +1631,7 @@ summary
 | Microsoft.AspNetCore.StaticFiles;StaticFileMiddleware;StaticFileMiddleware;(Microsoft.AspNetCore.Http.RequestDelegate,Microsoft.AspNetCore.Hosting.IWebHostEnvironment,Microsoft.Extensions.Options.IOptions<Microsoft.AspNetCore.Builder.StaticFileOptions>,Microsoft.Extensions.Logging.ILoggerFactory);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | Microsoft.AspNetCore.WebSockets;WebSocketMiddleware;WebSocketMiddleware;(Microsoft.AspNetCore.Http.RequestDelegate,Microsoft.Extensions.Options.IOptions<Microsoft.AspNetCore.Builder.WebSocketOptions>,Microsoft.Extensions.Logging.ILoggerFactory);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | Microsoft.AspNetCore.WebSockets;WebSocketsDependencyInjectionExtensions;AddWebSockets;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Action<Microsoft.AspNetCore.Builder.WebSocketOptions>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
-| Microsoft.AspNetCore.WebUtilities;BufferedReadStream;FlushAsync;(System.Threading.CancellationToken);Argument[0];ReturnValue;taint;df-generated |
-| Microsoft.AspNetCore.WebUtilities;BufferedReadStream;FlushAsync;(System.Threading.CancellationToken);Argument[this];ReturnValue;taint;df-generated |
+| Microsoft.AspNetCore.WebUtilities;BufferedReadStream;FlushAsync;(System.Threading.CancellationToken);Argument[this];ReturnValue.SyntheticField[System.Threading.Tasks.Task.m_stateObject];value;dfc-generated |
 | Microsoft.AspNetCore.WebUtilities;BufferedReadStream;Read;(System.Byte[],System.Int32,System.Int32);Argument[this];Argument[0].Element;taint;manual |
 | Microsoft.AspNetCore.WebUtilities;BufferedReadStream;ReadAsync;(System.Byte[],System.Int32,System.Int32,System.Threading.CancellationToken);Argument[this];Argument[0].Element;taint;manual |
 | Microsoft.AspNetCore.WebUtilities;BufferedReadStream;ReadAsync;(System.Memory<System.Byte>,System.Threading.CancellationToken);Argument[this];Argument[0].Element;taint;manual |
@@ -1645,8 +1655,7 @@ summary
 | Microsoft.AspNetCore.WebUtilities;FileBufferingReadStream;WriteAsync;(System.ReadOnlyMemory<System.Byte>,System.Threading.CancellationToken);Argument[this];ReturnValue;taint;df-generated |
 | Microsoft.AspNetCore.WebUtilities;FileBufferingWriteStream;DisposeAsync;();Argument[this];ReturnValue;taint;df-generated |
 | Microsoft.AspNetCore.WebUtilities;FileBufferingWriteStream;FileBufferingWriteStream;(System.Int32,System.Nullable<System.Int64>,System.Func<System.String>);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
-| Microsoft.AspNetCore.WebUtilities;FileBufferingWriteStream;FlushAsync;(System.Threading.CancellationToken);Argument[0];ReturnValue;taint;df-generated |
-| Microsoft.AspNetCore.WebUtilities;FileBufferingWriteStream;FlushAsync;(System.Threading.CancellationToken);Argument[this];ReturnValue;taint;df-generated |
+| Microsoft.AspNetCore.WebUtilities;FileBufferingWriteStream;FlushAsync;(System.Threading.CancellationToken);Argument[this];ReturnValue.SyntheticField[System.Threading.Tasks.Task.m_stateObject];value;dfc-generated |
 | Microsoft.AspNetCore.WebUtilities;FileBufferingWriteStream;Read;(System.Byte[],System.Int32,System.Int32);Argument[this];Argument[0].Element;taint;manual |
 | Microsoft.AspNetCore.WebUtilities;FileBufferingWriteStream;ReadAsync;(System.Byte[],System.Int32,System.Int32,System.Threading.CancellationToken);Argument[this];Argument[0].Element;taint;manual |
 | Microsoft.AspNetCore.WebUtilities;FileBufferingWriteStream;ReadAsync;(System.Memory<System.Byte>,System.Threading.CancellationToken);Argument[this];Argument[0].Element;taint;manual |
@@ -1664,19 +1673,15 @@ summary
 | Microsoft.AspNetCore.WebUtilities;HttpRequestStreamReader;ReadLineAsync;();Argument[this];ReturnValue;taint;manual |
 | Microsoft.AspNetCore.WebUtilities;HttpRequestStreamReader;ReadToEndAsync;();Argument[this];ReturnValue;taint;manual |
 | Microsoft.AspNetCore.WebUtilities;HttpResponseStreamWriter;DisposeAsync;();Argument[this];ReturnValue;taint;df-generated |
-| Microsoft.AspNetCore.WebUtilities;HttpResponseStreamWriter;FlushAsync;();Argument[this];ReturnValue;taint;df-generated |
+| Microsoft.AspNetCore.WebUtilities;HttpResponseStreamWriter;FlushAsync;();Argument[this];ReturnValue.SyntheticField[System.Threading.Tasks.Task.m_stateObject];value;dfc-generated |
 | Microsoft.AspNetCore.WebUtilities;HttpResponseStreamWriter;Write;(System.Char[],System.Int32,System.Int32);Argument[0].Element;Argument[this];taint;df-generated |
 | Microsoft.AspNetCore.WebUtilities;HttpResponseStreamWriter;Write;(System.String);Argument[0];Argument[this];taint;df-generated |
 | Microsoft.AspNetCore.WebUtilities;HttpResponseStreamWriter;WriteAsync;(System.Char);Argument[this];ReturnValue;taint;df-generated |
-| Microsoft.AspNetCore.WebUtilities;HttpResponseStreamWriter;WriteAsync;(System.Char[],System.Int32,System.Int32);Argument[0].Element;Argument[this];taint;df-generated |
-| Microsoft.AspNetCore.WebUtilities;HttpResponseStreamWriter;WriteAsync;(System.Char[],System.Int32,System.Int32);Argument[0].Element;ReturnValue;taint;df-generated |
-| Microsoft.AspNetCore.WebUtilities;HttpResponseStreamWriter;WriteAsync;(System.Char[],System.Int32,System.Int32);Argument[this];ReturnValue;taint;df-generated |
+| Microsoft.AspNetCore.WebUtilities;HttpResponseStreamWriter;WriteAsync;(System.Char[],System.Int32,System.Int32);Argument[0].Element;Argument[this];taint;dfc-generated |
 | Microsoft.AspNetCore.WebUtilities;HttpResponseStreamWriter;WriteAsync;(System.ReadOnlyMemory<System.Char>,System.Threading.CancellationToken);Argument[0];ReturnValue;taint;df-generated |
 | Microsoft.AspNetCore.WebUtilities;HttpResponseStreamWriter;WriteAsync;(System.ReadOnlyMemory<System.Char>,System.Threading.CancellationToken);Argument[1];ReturnValue;taint;df-generated |
 | Microsoft.AspNetCore.WebUtilities;HttpResponseStreamWriter;WriteAsync;(System.ReadOnlyMemory<System.Char>,System.Threading.CancellationToken);Argument[this];ReturnValue;taint;df-generated |
-| Microsoft.AspNetCore.WebUtilities;HttpResponseStreamWriter;WriteAsync;(System.String);Argument[0];Argument[this];taint;df-generated |
-| Microsoft.AspNetCore.WebUtilities;HttpResponseStreamWriter;WriteAsync;(System.String);Argument[0];ReturnValue;taint;df-generated |
-| Microsoft.AspNetCore.WebUtilities;HttpResponseStreamWriter;WriteAsync;(System.String);Argument[this];ReturnValue;taint;df-generated |
+| Microsoft.AspNetCore.WebUtilities;HttpResponseStreamWriter;WriteAsync;(System.String);Argument[0];Argument[this];taint;dfc-generated |
 | Microsoft.AspNetCore.WebUtilities;HttpResponseStreamWriter;WriteLineAsync;(System.Char);Argument[this];ReturnValue;taint;df-generated |
 | Microsoft.AspNetCore.WebUtilities;HttpResponseStreamWriter;WriteLineAsync;(System.Char[],System.Int32,System.Int32);Argument[0].Element;Argument[this];taint;df-generated |
 | Microsoft.AspNetCore.WebUtilities;HttpResponseStreamWriter;WriteLineAsync;(System.Char[],System.Int32,System.Int32);Argument[0].Element;ReturnValue;taint;df-generated |
@@ -1694,17 +1699,6 @@ summary
 | Microsoft.AspNetCore;WebHost;Start;(System.String,System.Action<Microsoft.AspNetCore.Routing.IRouteBuilder>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
 | Microsoft.AspNetCore;WebHost;StartWith;(System.Action<Microsoft.AspNetCore.Builder.IApplicationBuilder>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | Microsoft.AspNetCore;WebHost;StartWith;(System.String,System.Action<Microsoft.AspNetCore.Builder.IApplicationBuilder>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
-| Microsoft.CSharp.RuntimeBinder;Binder;BinaryOperation;(Microsoft.CSharp.RuntimeBinder.CSharpBinderFlags,System.Linq.Expressions.ExpressionType,System.Type,System.Collections.Generic.IEnumerable<Microsoft.CSharp.RuntimeBinder.CSharpArgumentInfo>);Argument[3].Element;ReturnValue;taint;df-generated |
-| Microsoft.CSharp.RuntimeBinder;Binder;GetIndex;(Microsoft.CSharp.RuntimeBinder.CSharpBinderFlags,System.Type,System.Collections.Generic.IEnumerable<Microsoft.CSharp.RuntimeBinder.CSharpArgumentInfo>);Argument[2].Element;ReturnValue;taint;df-generated |
-| Microsoft.CSharp.RuntimeBinder;Binder;GetMember;(Microsoft.CSharp.RuntimeBinder.CSharpBinderFlags,System.String,System.Type,System.Collections.Generic.IEnumerable<Microsoft.CSharp.RuntimeBinder.CSharpArgumentInfo>);Argument[3].Element;ReturnValue;taint;df-generated |
-| Microsoft.CSharp.RuntimeBinder;Binder;Invoke;(Microsoft.CSharp.RuntimeBinder.CSharpBinderFlags,System.Type,System.Collections.Generic.IEnumerable<Microsoft.CSharp.RuntimeBinder.CSharpArgumentInfo>);Argument[2].Element;ReturnValue;taint;df-generated |
-| Microsoft.CSharp.RuntimeBinder;Binder;InvokeConstructor;(Microsoft.CSharp.RuntimeBinder.CSharpBinderFlags,System.Type,System.Collections.Generic.IEnumerable<Microsoft.CSharp.RuntimeBinder.CSharpArgumentInfo>);Argument[2].Element;ReturnValue;taint;df-generated |
-| Microsoft.CSharp.RuntimeBinder;Binder;InvokeMember;(Microsoft.CSharp.RuntimeBinder.CSharpBinderFlags,System.String,System.Collections.Generic.IEnumerable<System.Type>,System.Type,System.Collections.Generic.IEnumerable<Microsoft.CSharp.RuntimeBinder.CSharpArgumentInfo>);Argument[2].Element;ReturnValue;taint;df-generated |
-| Microsoft.CSharp.RuntimeBinder;Binder;InvokeMember;(Microsoft.CSharp.RuntimeBinder.CSharpBinderFlags,System.String,System.Collections.Generic.IEnumerable<System.Type>,System.Type,System.Collections.Generic.IEnumerable<Microsoft.CSharp.RuntimeBinder.CSharpArgumentInfo>);Argument[4].Element;ReturnValue;taint;df-generated |
-| Microsoft.CSharp.RuntimeBinder;Binder;IsEvent;(Microsoft.CSharp.RuntimeBinder.CSharpBinderFlags,System.String,System.Type);Argument[1];ReturnValue;taint;df-generated |
-| Microsoft.CSharp.RuntimeBinder;Binder;SetIndex;(Microsoft.CSharp.RuntimeBinder.CSharpBinderFlags,System.Type,System.Collections.Generic.IEnumerable<Microsoft.CSharp.RuntimeBinder.CSharpArgumentInfo>);Argument[2].Element;ReturnValue;taint;df-generated |
-| Microsoft.CSharp.RuntimeBinder;Binder;SetMember;(Microsoft.CSharp.RuntimeBinder.CSharpBinderFlags,System.String,System.Type,System.Collections.Generic.IEnumerable<Microsoft.CSharp.RuntimeBinder.CSharpArgumentInfo>);Argument[3].Element;ReturnValue;taint;df-generated |
-| Microsoft.CSharp.RuntimeBinder;Binder;UnaryOperation;(Microsoft.CSharp.RuntimeBinder.CSharpBinderFlags,System.Linq.Expressions.ExpressionType,System.Type,System.Collections.Generic.IEnumerable<Microsoft.CSharp.RuntimeBinder.CSharpArgumentInfo>);Argument[3].Element;ReturnValue;taint;df-generated |
 | Microsoft.CSharp.RuntimeBinder;CSharpArgumentInfo;Create;(Microsoft.CSharp.RuntimeBinder.CSharpArgumentInfoFlags,System.String);Argument[1];ReturnValue;taint;df-generated |
 | Microsoft.CSharp;CSharpCodeProvider;CSharpCodeProvider;(System.Collections.Generic.IDictionary<System.String,System.String>);Argument[0].Element;Argument[this];taint;df-generated |
 | Microsoft.CSharp;CSharpCodeProvider;CreateCompiler;();Argument[this];ReturnValue;taint;df-generated |
@@ -1725,39 +1719,39 @@ summary
 | Microsoft.EntityFrameworkCore;DbSet<TEntity>;Update;(TEntity);Argument[0];Argument[this].Element;value;manual |
 | Microsoft.EntityFrameworkCore;DbSet<TEntity>;UpdateRange;(System.Collections.Generic.IEnumerable<TEntity>);Argument[0].WithElement;Argument[this];value;manual |
 | Microsoft.EntityFrameworkCore;DbSet<TEntity>;UpdateRange;(TEntity[]);Argument[0].WithElement;Argument[this];value;manual |
-| Microsoft.Extensions.Caching.Distributed;DistributedCacheEntryExtensions;SetAbsoluteExpiration;(Microsoft.Extensions.Caching.Distributed.DistributedCacheEntryOptions,System.DateTimeOffset);Argument[0];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Caching.Distributed;DistributedCacheEntryExtensions;SetAbsoluteExpiration;(Microsoft.Extensions.Caching.Distributed.DistributedCacheEntryOptions,System.DateTimeOffset);Argument[1];Argument[0];taint;df-generated |
-| Microsoft.Extensions.Caching.Distributed;DistributedCacheEntryExtensions;SetAbsoluteExpiration;(Microsoft.Extensions.Caching.Distributed.DistributedCacheEntryOptions,System.DateTimeOffset);Argument[1];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Caching.Distributed;DistributedCacheEntryExtensions;SetAbsoluteExpiration;(Microsoft.Extensions.Caching.Distributed.DistributedCacheEntryOptions,System.TimeSpan);Argument[0];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Caching.Distributed;DistributedCacheEntryExtensions;SetAbsoluteExpiration;(Microsoft.Extensions.Caching.Distributed.DistributedCacheEntryOptions,System.TimeSpan);Argument[1];Argument[0];taint;df-generated |
-| Microsoft.Extensions.Caching.Distributed;DistributedCacheEntryExtensions;SetAbsoluteExpiration;(Microsoft.Extensions.Caching.Distributed.DistributedCacheEntryOptions,System.TimeSpan);Argument[1];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Caching.Distributed;DistributedCacheEntryExtensions;SetSlidingExpiration;(Microsoft.Extensions.Caching.Distributed.DistributedCacheEntryOptions,System.TimeSpan);Argument[0];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Caching.Distributed;DistributedCacheEntryExtensions;SetSlidingExpiration;(Microsoft.Extensions.Caching.Distributed.DistributedCacheEntryOptions,System.TimeSpan);Argument[1];Argument[0];taint;df-generated |
-| Microsoft.Extensions.Caching.Distributed;DistributedCacheEntryExtensions;SetSlidingExpiration;(Microsoft.Extensions.Caching.Distributed.DistributedCacheEntryOptions,System.TimeSpan);Argument[1];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Caching.Distributed;MemoryDistributedCache;MemoryDistributedCache;(Microsoft.Extensions.Options.IOptions<Microsoft.Extensions.Caching.Memory.MemoryDistributedCacheOptions>,Microsoft.Extensions.Logging.ILoggerFactory);Argument[0];Argument[this];taint;df-generated |
-| Microsoft.Extensions.Caching.Memory;CacheEntryExtensions;AddExpirationToken;(Microsoft.Extensions.Caching.Memory.ICacheEntry,Microsoft.Extensions.Primitives.IChangeToken);Argument[0];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Caching.Memory;CacheEntryExtensions;AddExpirationToken;(Microsoft.Extensions.Caching.Memory.ICacheEntry,Microsoft.Extensions.Primitives.IChangeToken);Argument[1];Argument[0];taint;df-generated |
-| Microsoft.Extensions.Caching.Memory;CacheEntryExtensions;AddExpirationToken;(Microsoft.Extensions.Caching.Memory.ICacheEntry,Microsoft.Extensions.Primitives.IChangeToken);Argument[1];ReturnValue;taint;df-generated |
+| Microsoft.Extensions.Caching.Distributed;DistributedCacheEntryExtensions;SetAbsoluteExpiration;(Microsoft.Extensions.Caching.Distributed.DistributedCacheEntryOptions,System.DateTimeOffset);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Caching.Distributed;DistributedCacheEntryExtensions;SetAbsoluteExpiration;(Microsoft.Extensions.Caching.Distributed.DistributedCacheEntryOptions,System.TimeSpan);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Caching.Distributed;DistributedCacheEntryExtensions;SetSlidingExpiration;(Microsoft.Extensions.Caching.Distributed.DistributedCacheEntryOptions,System.TimeSpan);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Caching.Memory;CacheEntryExtensions;AddExpirationToken;(Microsoft.Extensions.Caching.Memory.ICacheEntry,Microsoft.Extensions.Primitives.IChangeToken);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Caching.Memory;CacheEntryExtensions;AddExpirationToken;(Microsoft.Extensions.Caching.Memory.ICacheEntry,Microsoft.Extensions.Primitives.IChangeToken);Argument[1];Argument[0].Property[Microsoft.Extensions.Caching.Memory.ICacheEntry.ExpirationTokens].Element;value;dfc-generated |
+| Microsoft.Extensions.Caching.Memory;CacheEntryExtensions;AddExpirationToken;(Microsoft.Extensions.Caching.Memory.ICacheEntry,Microsoft.Extensions.Primitives.IChangeToken);Argument[1];ReturnValue.Property[Microsoft.Extensions.Caching.Memory.ICacheEntry.ExpirationTokens].Element;value;dfc-generated |
+| Microsoft.Extensions.Caching.Memory;CacheEntryExtensions;RegisterPostEvictionCallback;(Microsoft.Extensions.Caching.Memory.ICacheEntry,Microsoft.Extensions.Caching.Memory.PostEvictionDelegate);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Caching.Memory;CacheEntryExtensions;RegisterPostEvictionCallback;(Microsoft.Extensions.Caching.Memory.ICacheEntry,Microsoft.Extensions.Caching.Memory.PostEvictionDelegate);Argument[0];ReturnValue;value;hq-generated |
+| Microsoft.Extensions.Caching.Memory;CacheEntryExtensions;RegisterPostEvictionCallback;(Microsoft.Extensions.Caching.Memory.ICacheEntry,Microsoft.Extensions.Caching.Memory.PostEvictionDelegate);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.Caching.Memory;CacheEntryExtensions;RegisterPostEvictionCallback;(Microsoft.Extensions.Caching.Memory.ICacheEntry,Microsoft.Extensions.Caching.Memory.PostEvictionDelegate);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
+| Microsoft.Extensions.Caching.Memory;CacheEntryExtensions;RegisterPostEvictionCallback;(Microsoft.Extensions.Caching.Memory.ICacheEntry,Microsoft.Extensions.Caching.Memory.PostEvictionDelegate,System.Object);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Caching.Memory;CacheEntryExtensions;RegisterPostEvictionCallback;(Microsoft.Extensions.Caching.Memory.ICacheEntry,Microsoft.Extensions.Caching.Memory.PostEvictionDelegate,System.Object);Argument[0];ReturnValue;value;hq-generated |
+| Microsoft.Extensions.Caching.Memory;CacheEntryExtensions;RegisterPostEvictionCallback;(Microsoft.Extensions.Caching.Memory.ICacheEntry,Microsoft.Extensions.Caching.Memory.PostEvictionDelegate,System.Object);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.Caching.Memory;CacheEntryExtensions;RegisterPostEvictionCallback;(Microsoft.Extensions.Caching.Memory.ICacheEntry,Microsoft.Extensions.Caching.Memory.PostEvictionDelegate,System.Object);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
-| Microsoft.Extensions.Caching.Memory;CacheEntryExtensions;SetAbsoluteExpiration;(Microsoft.Extensions.Caching.Memory.ICacheEntry,System.DateTimeOffset);Argument[0];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Caching.Memory;CacheEntryExtensions;SetAbsoluteExpiration;(Microsoft.Extensions.Caching.Memory.ICacheEntry,System.TimeSpan);Argument[0];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Caching.Memory;CacheEntryExtensions;SetOptions;(Microsoft.Extensions.Caching.Memory.ICacheEntry,Microsoft.Extensions.Caching.Memory.MemoryCacheEntryOptions);Argument[0];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Caching.Memory;CacheEntryExtensions;SetOptions;(Microsoft.Extensions.Caching.Memory.ICacheEntry,Microsoft.Extensions.Caching.Memory.MemoryCacheEntryOptions);Argument[1];Argument[0];taint;df-generated |
-| Microsoft.Extensions.Caching.Memory;CacheEntryExtensions;SetOptions;(Microsoft.Extensions.Caching.Memory.ICacheEntry,Microsoft.Extensions.Caching.Memory.MemoryCacheEntryOptions);Argument[1];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Caching.Memory;CacheEntryExtensions;SetPriority;(Microsoft.Extensions.Caching.Memory.ICacheEntry,Microsoft.Extensions.Caching.Memory.CacheItemPriority);Argument[0];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Caching.Memory;CacheEntryExtensions;SetSize;(Microsoft.Extensions.Caching.Memory.ICacheEntry,System.Int64);Argument[0];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Caching.Memory;CacheEntryExtensions;SetSlidingExpiration;(Microsoft.Extensions.Caching.Memory.ICacheEntry,System.TimeSpan);Argument[0];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Caching.Memory;CacheEntryExtensions;SetValue;(Microsoft.Extensions.Caching.Memory.ICacheEntry,System.Object);Argument[0];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Caching.Memory;CacheEntryExtensions;SetValue;(Microsoft.Extensions.Caching.Memory.ICacheEntry,System.Object);Argument[1];Argument[0];taint;df-generated |
-| Microsoft.Extensions.Caching.Memory;CacheEntryExtensions;SetValue;(Microsoft.Extensions.Caching.Memory.ICacheEntry,System.Object);Argument[1];ReturnValue;taint;df-generated |
+| Microsoft.Extensions.Caching.Memory;CacheEntryExtensions;SetAbsoluteExpiration;(Microsoft.Extensions.Caching.Memory.ICacheEntry,System.DateTimeOffset);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Caching.Memory;CacheEntryExtensions;SetAbsoluteExpiration;(Microsoft.Extensions.Caching.Memory.ICacheEntry,System.TimeSpan);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Caching.Memory;CacheEntryExtensions;SetOptions;(Microsoft.Extensions.Caching.Memory.ICacheEntry,Microsoft.Extensions.Caching.Memory.MemoryCacheEntryOptions);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Caching.Memory;CacheEntryExtensions;SetOptions;(Microsoft.Extensions.Caching.Memory.ICacheEntry,Microsoft.Extensions.Caching.Memory.MemoryCacheEntryOptions);Argument[1].Property[Microsoft.Extensions.Caching.Memory.MemoryCacheEntryOptions.ExpirationTokens].Element;Argument[0].Property[Microsoft.Extensions.Caching.Memory.ICacheEntry.ExpirationTokens].Element;value;dfc-generated |
+| Microsoft.Extensions.Caching.Memory;CacheEntryExtensions;SetOptions;(Microsoft.Extensions.Caching.Memory.ICacheEntry,Microsoft.Extensions.Caching.Memory.MemoryCacheEntryOptions);Argument[1].Property[Microsoft.Extensions.Caching.Memory.MemoryCacheEntryOptions.ExpirationTokens].Element;ReturnValue.Property[Microsoft.Extensions.Caching.Memory.ICacheEntry.ExpirationTokens].Element;value;dfc-generated |
+| Microsoft.Extensions.Caching.Memory;CacheEntryExtensions;SetPriority;(Microsoft.Extensions.Caching.Memory.ICacheEntry,Microsoft.Extensions.Caching.Memory.CacheItemPriority);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Caching.Memory;CacheEntryExtensions;SetSize;(Microsoft.Extensions.Caching.Memory.ICacheEntry,System.Int64);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Caching.Memory;CacheEntryExtensions;SetSlidingExpiration;(Microsoft.Extensions.Caching.Memory.ICacheEntry,System.TimeSpan);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Caching.Memory;CacheEntryExtensions;SetValue;(Microsoft.Extensions.Caching.Memory.ICacheEntry,System.Object);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Caching.Memory;CacheExtensions;GetOrCreate<TItem>;(Microsoft.Extensions.Caching.Memory.IMemoryCache,System.Object,System.Func<Microsoft.Extensions.Caching.Memory.ICacheEntry,TItem>);Argument[2].ReturnValue;ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Caching.Memory;CacheExtensions;GetOrCreate<TItem>;(Microsoft.Extensions.Caching.Memory.IMemoryCache,System.Object,System.Func<Microsoft.Extensions.Caching.Memory.ICacheEntry,TItem>);Argument[2].ReturnValue;ReturnValue;value;hq-generated |
+| Microsoft.Extensions.Caching.Memory;CacheExtensions;GetOrCreate<TItem>;(Microsoft.Extensions.Caching.Memory.IMemoryCache,System.Object,System.Func<Microsoft.Extensions.Caching.Memory.ICacheEntry,TItem>);Argument[2];Argument[2].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.Caching.Memory;CacheExtensions;GetOrCreate<TItem>;(Microsoft.Extensions.Caching.Memory.IMemoryCache,System.Object,System.Func<Microsoft.Extensions.Caching.Memory.ICacheEntry,TItem>);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
 | Microsoft.Extensions.Caching.Memory;CacheExtensions;GetOrCreateAsync<TItem>;(Microsoft.Extensions.Caching.Memory.IMemoryCache,System.Object,System.Func<Microsoft.Extensions.Caching.Memory.ICacheEntry,System.Threading.Tasks.Task<TItem>>);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
-| Microsoft.Extensions.Caching.Memory;CacheExtensions;Set<TItem>;(Microsoft.Extensions.Caching.Memory.IMemoryCache,System.Object,TItem);Argument[2];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Caching.Memory;CacheExtensions;Set<TItem>;(Microsoft.Extensions.Caching.Memory.IMemoryCache,System.Object,TItem,Microsoft.Extensions.Caching.Memory.MemoryCacheEntryOptions);Argument[2];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Caching.Memory;CacheExtensions;Set<TItem>;(Microsoft.Extensions.Caching.Memory.IMemoryCache,System.Object,TItem,Microsoft.Extensions.Primitives.IChangeToken);Argument[2];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Caching.Memory;CacheExtensions;Set<TItem>;(Microsoft.Extensions.Caching.Memory.IMemoryCache,System.Object,TItem,System.DateTimeOffset);Argument[2];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Caching.Memory;CacheExtensions;Set<TItem>;(Microsoft.Extensions.Caching.Memory.IMemoryCache,System.Object,TItem,System.TimeSpan);Argument[2];ReturnValue;taint;df-generated |
+| Microsoft.Extensions.Caching.Memory;CacheExtensions;Set<TItem>;(Microsoft.Extensions.Caching.Memory.IMemoryCache,System.Object,TItem);Argument[2];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Caching.Memory;CacheExtensions;Set<TItem>;(Microsoft.Extensions.Caching.Memory.IMemoryCache,System.Object,TItem,Microsoft.Extensions.Caching.Memory.MemoryCacheEntryOptions);Argument[2];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Caching.Memory;CacheExtensions;Set<TItem>;(Microsoft.Extensions.Caching.Memory.IMemoryCache,System.Object,TItem,Microsoft.Extensions.Primitives.IChangeToken);Argument[2];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Caching.Memory;CacheExtensions;Set<TItem>;(Microsoft.Extensions.Caching.Memory.IMemoryCache,System.Object,TItem,System.DateTimeOffset);Argument[2];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Caching.Memory;CacheExtensions;Set<TItem>;(Microsoft.Extensions.Caching.Memory.IMemoryCache,System.Object,TItem,System.TimeSpan);Argument[2];ReturnValue;value;dfc-generated |
 | Microsoft.Extensions.Caching.Memory;ICacheEntry;get_ExpirationTokens;();Argument[this];ReturnValue;taint;df-generated |
 | Microsoft.Extensions.Caching.Memory;ICacheEntry;get_PostEvictionCallbacks;();Argument[this];ReturnValue;taint;df-generated |
 | Microsoft.Extensions.Caching.Memory;IMemoryCache;CreateEntry;(System.Object);Argument[0];ReturnValue;taint;df-generated |
@@ -1765,51 +1759,42 @@ summary
 | Microsoft.Extensions.Caching.Memory;MemoryCache;CreateEntry;(System.Object);Argument[0];ReturnValue;taint;df-generated |
 | Microsoft.Extensions.Caching.Memory;MemoryCache;CreateEntry;(System.Object);Argument[this];ReturnValue;taint;df-generated |
 | Microsoft.Extensions.Caching.Memory;MemoryCache;MemoryCache;(Microsoft.Extensions.Options.IOptions<Microsoft.Extensions.Caching.Memory.MemoryCacheOptions>,Microsoft.Extensions.Logging.ILoggerFactory);Argument[0];Argument[this];taint;df-generated |
-| Microsoft.Extensions.Caching.Memory;MemoryCacheEntryExtensions;AddExpirationToken;(Microsoft.Extensions.Caching.Memory.MemoryCacheEntryOptions,Microsoft.Extensions.Primitives.IChangeToken);Argument[0];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Caching.Memory;MemoryCacheEntryExtensions;AddExpirationToken;(Microsoft.Extensions.Caching.Memory.MemoryCacheEntryOptions,Microsoft.Extensions.Primitives.IChangeToken);Argument[1];Argument[0];taint;df-generated |
-| Microsoft.Extensions.Caching.Memory;MemoryCacheEntryExtensions;AddExpirationToken;(Microsoft.Extensions.Caching.Memory.MemoryCacheEntryOptions,Microsoft.Extensions.Primitives.IChangeToken);Argument[1];ReturnValue;taint;df-generated |
+| Microsoft.Extensions.Caching.Memory;MemoryCacheEntryExtensions;AddExpirationToken;(Microsoft.Extensions.Caching.Memory.MemoryCacheEntryOptions,Microsoft.Extensions.Primitives.IChangeToken);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Caching.Memory;MemoryCacheEntryExtensions;AddExpirationToken;(Microsoft.Extensions.Caching.Memory.MemoryCacheEntryOptions,Microsoft.Extensions.Primitives.IChangeToken);Argument[1];Argument[0].Property[Microsoft.Extensions.Caching.Memory.MemoryCacheEntryOptions.ExpirationTokens].Element;value;dfc-generated |
+| Microsoft.Extensions.Caching.Memory;MemoryCacheEntryExtensions;AddExpirationToken;(Microsoft.Extensions.Caching.Memory.MemoryCacheEntryOptions,Microsoft.Extensions.Primitives.IChangeToken);Argument[1];ReturnValue.Property[Microsoft.Extensions.Caching.Memory.MemoryCacheEntryOptions.ExpirationTokens].Element;value;dfc-generated |
+| Microsoft.Extensions.Caching.Memory;MemoryCacheEntryExtensions;RegisterPostEvictionCallback;(Microsoft.Extensions.Caching.Memory.MemoryCacheEntryOptions,Microsoft.Extensions.Caching.Memory.PostEvictionDelegate);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Caching.Memory;MemoryCacheEntryExtensions;RegisterPostEvictionCallback;(Microsoft.Extensions.Caching.Memory.MemoryCacheEntryOptions,Microsoft.Extensions.Caching.Memory.PostEvictionDelegate);Argument[0];ReturnValue;value;hq-generated |
+| Microsoft.Extensions.Caching.Memory;MemoryCacheEntryExtensions;RegisterPostEvictionCallback;(Microsoft.Extensions.Caching.Memory.MemoryCacheEntryOptions,Microsoft.Extensions.Caching.Memory.PostEvictionDelegate);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.Caching.Memory;MemoryCacheEntryExtensions;RegisterPostEvictionCallback;(Microsoft.Extensions.Caching.Memory.MemoryCacheEntryOptions,Microsoft.Extensions.Caching.Memory.PostEvictionDelegate);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
+| Microsoft.Extensions.Caching.Memory;MemoryCacheEntryExtensions;RegisterPostEvictionCallback;(Microsoft.Extensions.Caching.Memory.MemoryCacheEntryOptions,Microsoft.Extensions.Caching.Memory.PostEvictionDelegate,System.Object);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Caching.Memory;MemoryCacheEntryExtensions;RegisterPostEvictionCallback;(Microsoft.Extensions.Caching.Memory.MemoryCacheEntryOptions,Microsoft.Extensions.Caching.Memory.PostEvictionDelegate,System.Object);Argument[0];ReturnValue;value;hq-generated |
+| Microsoft.Extensions.Caching.Memory;MemoryCacheEntryExtensions;RegisterPostEvictionCallback;(Microsoft.Extensions.Caching.Memory.MemoryCacheEntryOptions,Microsoft.Extensions.Caching.Memory.PostEvictionDelegate,System.Object);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.Caching.Memory;MemoryCacheEntryExtensions;RegisterPostEvictionCallback;(Microsoft.Extensions.Caching.Memory.MemoryCacheEntryOptions,Microsoft.Extensions.Caching.Memory.PostEvictionDelegate,System.Object);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
-| Microsoft.Extensions.Caching.Memory;MemoryCacheEntryExtensions;SetAbsoluteExpiration;(Microsoft.Extensions.Caching.Memory.MemoryCacheEntryOptions,System.DateTimeOffset);Argument[0];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Caching.Memory;MemoryCacheEntryExtensions;SetAbsoluteExpiration;(Microsoft.Extensions.Caching.Memory.MemoryCacheEntryOptions,System.DateTimeOffset);Argument[1];Argument[0];taint;df-generated |
-| Microsoft.Extensions.Caching.Memory;MemoryCacheEntryExtensions;SetAbsoluteExpiration;(Microsoft.Extensions.Caching.Memory.MemoryCacheEntryOptions,System.DateTimeOffset);Argument[1];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Caching.Memory;MemoryCacheEntryExtensions;SetAbsoluteExpiration;(Microsoft.Extensions.Caching.Memory.MemoryCacheEntryOptions,System.TimeSpan);Argument[0];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Caching.Memory;MemoryCacheEntryExtensions;SetAbsoluteExpiration;(Microsoft.Extensions.Caching.Memory.MemoryCacheEntryOptions,System.TimeSpan);Argument[1];Argument[0];taint;df-generated |
-| Microsoft.Extensions.Caching.Memory;MemoryCacheEntryExtensions;SetAbsoluteExpiration;(Microsoft.Extensions.Caching.Memory.MemoryCacheEntryOptions,System.TimeSpan);Argument[1];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Caching.Memory;MemoryCacheEntryExtensions;SetPriority;(Microsoft.Extensions.Caching.Memory.MemoryCacheEntryOptions,Microsoft.Extensions.Caching.Memory.CacheItemPriority);Argument[0];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Caching.Memory;MemoryCacheEntryExtensions;SetSize;(Microsoft.Extensions.Caching.Memory.MemoryCacheEntryOptions,System.Int64);Argument[0];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Caching.Memory;MemoryCacheEntryExtensions;SetSlidingExpiration;(Microsoft.Extensions.Caching.Memory.MemoryCacheEntryOptions,System.TimeSpan);Argument[0];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Caching.Memory;MemoryCacheEntryExtensions;SetSlidingExpiration;(Microsoft.Extensions.Caching.Memory.MemoryCacheEntryOptions,System.TimeSpan);Argument[1];Argument[0];taint;df-generated |
-| Microsoft.Extensions.Caching.Memory;MemoryCacheEntryExtensions;SetSlidingExpiration;(Microsoft.Extensions.Caching.Memory.MemoryCacheEntryOptions,System.TimeSpan);Argument[1];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Caching.Memory;MemoryCacheOptions;get_Value;();Argument[this];ReturnValue;value;df-generated |
+| Microsoft.Extensions.Caching.Memory;MemoryCacheEntryExtensions;SetAbsoluteExpiration;(Microsoft.Extensions.Caching.Memory.MemoryCacheEntryOptions,System.DateTimeOffset);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Caching.Memory;MemoryCacheEntryExtensions;SetAbsoluteExpiration;(Microsoft.Extensions.Caching.Memory.MemoryCacheEntryOptions,System.TimeSpan);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Caching.Memory;MemoryCacheEntryExtensions;SetPriority;(Microsoft.Extensions.Caching.Memory.MemoryCacheEntryOptions,Microsoft.Extensions.Caching.Memory.CacheItemPriority);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Caching.Memory;MemoryCacheEntryExtensions;SetSize;(Microsoft.Extensions.Caching.Memory.MemoryCacheEntryOptions,System.Int64);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Caching.Memory;MemoryCacheEntryExtensions;SetSlidingExpiration;(Microsoft.Extensions.Caching.Memory.MemoryCacheEntryOptions,System.TimeSpan);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Caching.Memory;MemoryCacheOptions;get_Value;();Argument[this];ReturnValue;value;dfc-generated |
 | Microsoft.Extensions.Caching.Memory;PostEvictionCallbackRegistration;set_EvictionCallback;(Microsoft.Extensions.Caching.Memory.PostEvictionDelegate);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | Microsoft.Extensions.Caching.Memory;PostEvictionDelegate;BeginInvoke;(System.Object,System.Object,Microsoft.Extensions.Caching.Memory.EvictionReason,System.Object,System.AsyncCallback,System.Object);Argument[4];Argument[4].Parameter[delegate-self];value;hq-generated |
-| Microsoft.Extensions.Configuration.CommandLine;CommandLineConfigurationSource;Build;(Microsoft.Extensions.Configuration.IConfigurationBuilder);Argument[this];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Configuration.EnvironmentVariables;EnvironmentVariablesConfigurationProvider;EnvironmentVariablesConfigurationProvider;(System.String);Argument[0];Argument[this];taint;df-generated |
-| Microsoft.Extensions.Configuration.EnvironmentVariables;EnvironmentVariablesConfigurationSource;Build;(Microsoft.Extensions.Configuration.IConfigurationBuilder);Argument[this];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Configuration.Ini;IniConfigurationSource;Build;(Microsoft.Extensions.Configuration.IConfigurationBuilder);Argument[this];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Configuration.Ini;IniStreamConfigurationSource;Build;(Microsoft.Extensions.Configuration.IConfigurationBuilder);Argument[this];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Configuration.Json;JsonConfigurationSource;Build;(Microsoft.Extensions.Configuration.IConfigurationBuilder);Argument[this];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Configuration.Json;JsonStreamConfigurationSource;Build;(Microsoft.Extensions.Configuration.IConfigurationBuilder);Argument[this];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Configuration.KeyPerFile;KeyPerFileConfigurationSource;Build;(Microsoft.Extensions.Configuration.IConfigurationBuilder);Argument[this];ReturnValue;taint;df-generated |
+| Microsoft.Extensions.Configuration.EnvironmentVariables;EnvironmentVariablesConfigurationProvider;EnvironmentVariablesConfigurationProvider;(System.String);Argument[0];Argument[this].SyntheticField[Microsoft.Extensions.Configuration.EnvironmentVariables.EnvironmentVariablesConfigurationProvider._prefix];value;dfc-generated |
+| Microsoft.Extensions.Configuration.EnvironmentVariables;EnvironmentVariablesConfigurationProvider;ToString;();Argument[this].SyntheticField[Microsoft.Extensions.Configuration.EnvironmentVariables.EnvironmentVariablesConfigurationProvider._prefix];ReturnValue;taint;dfc-generated |
 | Microsoft.Extensions.Configuration.KeyPerFile;KeyPerFileConfigurationSource;set_IgnoreCondition;(System.Func<System.String,System.Boolean>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | Microsoft.Extensions.Configuration.Memory;MemoryConfigurationProvider;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.Generic.IEnumerator`1.Current];value;manual |
 | Microsoft.Extensions.Configuration.Memory;MemoryConfigurationProvider;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.IEnumerator.Current];value;manual |
 | Microsoft.Extensions.Configuration.Memory;MemoryConfigurationProvider;MemoryConfigurationProvider;(Microsoft.Extensions.Configuration.Memory.MemoryConfigurationSource);Argument[0];Argument[this];taint;df-generated |
-| Microsoft.Extensions.Configuration.Memory;MemoryConfigurationSource;Build;(Microsoft.Extensions.Configuration.IConfigurationBuilder);Argument[this];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Configuration.UserSecrets;PathHelper;GetSecretsPathFromSecretsId;(System.String);Argument[0];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Configuration.Xml;XmlConfigurationSource;Build;(Microsoft.Extensions.Configuration.IConfigurationBuilder);Argument[this];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Configuration.Xml;XmlDocumentDecryptor;CreateDecryptingXmlReader;(System.IO.Stream,System.Xml.XmlReaderSettings);Argument[0];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Configuration.Xml;XmlStreamConfigurationSource;Build;(Microsoft.Extensions.Configuration.IConfigurationBuilder);Argument[this];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Configuration;ChainedBuilderExtensions;AddConfiguration;(Microsoft.Extensions.Configuration.IConfigurationBuilder,Microsoft.Extensions.Configuration.IConfiguration);Argument[0];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Configuration;ChainedBuilderExtensions;AddConfiguration;(Microsoft.Extensions.Configuration.IConfigurationBuilder,Microsoft.Extensions.Configuration.IConfiguration,System.Boolean);Argument[0];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Configuration;ChainedConfigurationProvider;ChainedConfigurationProvider;(Microsoft.Extensions.Configuration.ChainedConfigurationSource);Argument[0];Argument[this];taint;df-generated |
-| Microsoft.Extensions.Configuration;ChainedConfigurationProvider;GetChildKeys;(System.Collections.Generic.IEnumerable<System.String>,System.String);Argument[0].Element;ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Configuration;ChainedConfigurationProvider;GetChildKeys;(System.Collections.Generic.IEnumerable<System.String>,System.String);Argument[this];ReturnValue;taint;df-generated |
+| Microsoft.Extensions.Configuration.UserSecrets;PathHelper;GetSecretsPathFromSecretsId;(System.String);Argument[0];ReturnValue;taint;dfc-generated |
+| Microsoft.Extensions.Configuration.Xml;XmlDocumentDecryptor;CreateDecryptingXmlReader;(System.IO.Stream,System.Xml.XmlReaderSettings);Argument[0];ReturnValue;taint;dfc-generated |
+| Microsoft.Extensions.Configuration.Xml;XmlDocumentDecryptor;DecryptDocumentAndCreateXmlReader;(System.Xml.XmlDocument);Argument[0].Element;Argument[this];taint;df-generated |
+| Microsoft.Extensions.Configuration.Xml;XmlStreamConfigurationProvider;Read;(System.IO.Stream,Microsoft.Extensions.Configuration.Xml.XmlDocumentDecryptor);Argument[0];Argument[1];taint;df-generated |
+| Microsoft.Extensions.Configuration;ChainedBuilderExtensions;AddConfiguration;(Microsoft.Extensions.Configuration.IConfigurationBuilder,Microsoft.Extensions.Configuration.IConfiguration);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Configuration;ChainedBuilderExtensions;AddConfiguration;(Microsoft.Extensions.Configuration.IConfigurationBuilder,Microsoft.Extensions.Configuration.IConfiguration,System.Boolean);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Configuration;ChainedConfigurationProvider;ChainedConfigurationProvider;(Microsoft.Extensions.Configuration.ChainedConfigurationSource);Argument[0].Property[Microsoft.Extensions.Configuration.ChainedConfigurationSource.Configuration];Argument[this].SyntheticField[Microsoft.Extensions.Configuration.ChainedConfigurationProvider._config];value;dfc-generated |
+| Microsoft.Extensions.Configuration;ChainedConfigurationProvider;GetChildKeys;(System.Collections.Generic.IEnumerable<System.String>,System.String);Argument[0].Element;ReturnValue.Element;value;dfc-generated |
 | Microsoft.Extensions.Configuration;ChainedConfigurationProvider;GetReloadToken;();Argument[this];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Configuration;ChainedConfigurationProvider;TryGet;(System.String,System.String);Argument[this];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Configuration;ChainedConfigurationProvider;get_Configuration;();Argument[this];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Configuration;ChainedConfigurationSource;Build;(Microsoft.Extensions.Configuration.IConfigurationBuilder);Argument[this];ReturnValue;taint;df-generated |
+| Microsoft.Extensions.Configuration;ChainedConfigurationProvider;TryGet;(System.String,System.String);Argument[this].SyntheticField[Microsoft.Extensions.Configuration.ChainedConfigurationProvider._config];ReturnValue;taint;dfc-generated |
+| Microsoft.Extensions.Configuration;ChainedConfigurationProvider;get_Configuration;();Argument[this].SyntheticField[Microsoft.Extensions.Configuration.ChainedConfigurationProvider._config];ReturnValue;value;dfc-generated |
 | Microsoft.Extensions.Configuration;CommandLineConfigurationExtensions;AddCommandLine;(Microsoft.Extensions.Configuration.IConfigurationBuilder,System.Action<Microsoft.Extensions.Configuration.CommandLine.CommandLineConfigurationSource>);Argument[1];Argument[0];taint;manual |
 | Microsoft.Extensions.Configuration;CommandLineConfigurationExtensions;AddCommandLine;(Microsoft.Extensions.Configuration.IConfigurationBuilder,System.Action<Microsoft.Extensions.Configuration.CommandLine.CommandLineConfigurationSource>);Argument[1];Argument[1].Parameter[delegate-self];value;manual |
 | Microsoft.Extensions.Configuration;CommandLineConfigurationExtensions;AddCommandLine;(Microsoft.Extensions.Configuration.IConfigurationBuilder,System.Action<Microsoft.Extensions.Configuration.CommandLine.CommandLineConfigurationSource>);Argument[1];ReturnValue;taint;manual |
@@ -1824,131 +1809,134 @@ summary
 | Microsoft.Extensions.Configuration;ConfigurationBinder;Get;(Microsoft.Extensions.Configuration.IConfiguration,System.Type,System.Action<Microsoft.Extensions.Configuration.BinderOptions>);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
 | Microsoft.Extensions.Configuration;ConfigurationBinder;Get<T>;(Microsoft.Extensions.Configuration.IConfiguration);Argument[0];ReturnValue;taint;df-generated |
 | Microsoft.Extensions.Configuration;ConfigurationBinder;Get<T>;(Microsoft.Extensions.Configuration.IConfiguration,System.Action<Microsoft.Extensions.Configuration.BinderOptions>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
-| Microsoft.Extensions.Configuration;ConfigurationBinder;GetValue;(Microsoft.Extensions.Configuration.IConfiguration,System.Type,System.String);Argument[0];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Configuration;ConfigurationBinder;GetValue;(Microsoft.Extensions.Configuration.IConfiguration,System.Type,System.String,System.Object);Argument[0];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Configuration;ConfigurationBinder;GetValue;(Microsoft.Extensions.Configuration.IConfiguration,System.Type,System.String,System.Object);Argument[3];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Configuration;ConfigurationBinder;GetValue<T>;(Microsoft.Extensions.Configuration.IConfiguration,System.String);Argument[0];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Configuration;ConfigurationBinder;GetValue<T>;(Microsoft.Extensions.Configuration.IConfiguration,System.String,T);Argument[0];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Configuration;ConfigurationBinder;GetValue<T>;(Microsoft.Extensions.Configuration.IConfiguration,System.String,T);Argument[2];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Configuration;ConfigurationBuilder;Add;(Microsoft.Extensions.Configuration.IConfigurationSource);Argument[0];Argument[this];taint;df-generated |
-| Microsoft.Extensions.Configuration;ConfigurationBuilder;Add;(Microsoft.Extensions.Configuration.IConfigurationSource);Argument[this];ReturnValue;value;df-generated |
+| Microsoft.Extensions.Configuration;ConfigurationBinder;GetValue;(Microsoft.Extensions.Configuration.IConfiguration,System.Type,System.String,System.Object);Argument[3];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Configuration;ConfigurationBinder;GetValue<T>;(Microsoft.Extensions.Configuration.IConfiguration,System.String,T);Argument[2];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Configuration;ConfigurationBuilder;Add;(Microsoft.Extensions.Configuration.IConfigurationSource);Argument[0];Argument[this].SyntheticField[Microsoft.Extensions.Configuration.ConfigurationBuilder._sources].Element;value;dfc-generated |
+| Microsoft.Extensions.Configuration;ConfigurationBuilder;Add;(Microsoft.Extensions.Configuration.IConfigurationSource);Argument[0];ReturnValue.SyntheticField[Microsoft.Extensions.Configuration.ConfigurationBuilder._sources].Element;value;dfc-generated |
+| Microsoft.Extensions.Configuration;ConfigurationBuilder;Add;(Microsoft.Extensions.Configuration.IConfigurationSource);Argument[this];ReturnValue;value;dfc-generated |
 | Microsoft.Extensions.Configuration;ConfigurationBuilder;Build;();Argument[this];ReturnValue;taint;manual |
 | Microsoft.Extensions.Configuration;ConfigurationBuilder;get_Properties;();Argument[this];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Configuration;ConfigurationBuilder;get_Sources;();Argument[this];ReturnValue;taint;df-generated |
+| Microsoft.Extensions.Configuration;ConfigurationBuilder;get_Sources;();Argument[this].SyntheticField[Microsoft.Extensions.Configuration.ConfigurationBuilder._sources];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Configuration;ConfigurationExtensions;Add<TSource>;(Microsoft.Extensions.Configuration.IConfigurationBuilder,System.Action<TSource>);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Configuration;ConfigurationExtensions;Add<TSource>;(Microsoft.Extensions.Configuration.IConfigurationBuilder,System.Action<TSource>);Argument[0];ReturnValue;value;hq-generated |
+| Microsoft.Extensions.Configuration;ConfigurationExtensions;Add<TSource>;(Microsoft.Extensions.Configuration.IConfigurationBuilder,System.Action<TSource>);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.Configuration;ConfigurationExtensions;Add<TSource>;(Microsoft.Extensions.Configuration.IConfigurationBuilder,System.Action<TSource>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
-| Microsoft.Extensions.Configuration;ConfigurationExtensions;AsEnumerable;(Microsoft.Extensions.Configuration.IConfiguration);Argument[0];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Configuration;ConfigurationExtensions;AsEnumerable;(Microsoft.Extensions.Configuration.IConfiguration,System.Boolean);Argument[0];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Configuration;ConfigurationExtensions;GetConnectionString;(Microsoft.Extensions.Configuration.IConfiguration,System.String);Argument[0];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Configuration;ConfigurationExtensions;GetRequiredSection;(Microsoft.Extensions.Configuration.IConfiguration,System.String);Argument[0];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Configuration;ConfigurationExtensions;GetRequiredSection;(Microsoft.Extensions.Configuration.IConfiguration,System.String);Argument[1];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Configuration;ConfigurationManager;Add;(Microsoft.Extensions.Configuration.IConfigurationSource);Argument[0];Argument[this];taint;df-generated |
-| Microsoft.Extensions.Configuration;ConfigurationManager;Add;(Microsoft.Extensions.Configuration.IConfigurationSource);Argument[this];ReturnValue;value;df-generated |
+| Microsoft.Extensions.Configuration;ConfigurationManager;Add;(Microsoft.Extensions.Configuration.IConfigurationSource);Argument[0];Argument[this].SyntheticField[Microsoft.Extensions.Configuration.ConfigurationManager._sources].Element;value;dfc-generated |
+| Microsoft.Extensions.Configuration;ConfigurationManager;Add;(Microsoft.Extensions.Configuration.IConfigurationSource);Argument[0];ReturnValue.SyntheticField[Microsoft.Extensions.Configuration.ConfigurationManager._sources].Element;value;dfc-generated |
+| Microsoft.Extensions.Configuration;ConfigurationManager;Add;(Microsoft.Extensions.Configuration.IConfigurationSource);Argument[this];ReturnValue;value;dfc-generated |
 | Microsoft.Extensions.Configuration;ConfigurationManager;Build;();Argument[this];ReturnValue;taint;manual |
 | Microsoft.Extensions.Configuration;ConfigurationManager;GetReloadToken;();Argument[this];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Configuration;ConfigurationManager;GetSection;(System.String);Argument[0];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Configuration;ConfigurationManager;GetSection;(System.String);Argument[this];ReturnValue;taint;df-generated |
 | Microsoft.Extensions.Configuration;ConfigurationManager;get_Item;(System.String);Argument[this];ReturnValue;taint;manual |
 | Microsoft.Extensions.Configuration;ConfigurationManager;get_Properties;();Argument[this];ReturnValue;taint;df-generated |
 | Microsoft.Extensions.Configuration;ConfigurationManager;get_Providers;();Argument[this];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Configuration;ConfigurationManager;get_Sources;();Argument[this];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Configuration;ConfigurationPath;Combine;(System.Collections.Generic.IEnumerable<System.String>);Argument[0].Element;ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Configuration;ConfigurationPath;Combine;(System.String[]);Argument[0].Element;ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Configuration;ConfigurationPath;GetParentPath;(System.String);Argument[0];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Configuration;ConfigurationPath;GetSectionKey;(System.String);Argument[0];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Configuration;ConfigurationProvider;GetChildKeys;(System.Collections.Generic.IEnumerable<System.String>,System.String);Argument[0].Element;ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Configuration;ConfigurationProvider;GetChildKeys;(System.Collections.Generic.IEnumerable<System.String>,System.String);Argument[this];ReturnValue;taint;df-generated |
+| Microsoft.Extensions.Configuration;ConfigurationManager;get_Sources;();Argument[this].SyntheticField[Microsoft.Extensions.Configuration.ConfigurationManager._sources];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Configuration;ConfigurationPath;Combine;(System.Collections.Generic.IEnumerable<System.String>);Argument[0].Element;ReturnValue;taint;dfc-generated |
+| Microsoft.Extensions.Configuration;ConfigurationPath;Combine;(System.String[]);Argument[0].Element;ReturnValue;taint;dfc-generated |
+| Microsoft.Extensions.Configuration;ConfigurationPath;GetParentPath;(System.String);Argument[0];ReturnValue;taint;dfc-generated |
+| Microsoft.Extensions.Configuration;ConfigurationPath;GetSectionKey;(System.String);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Configuration;ConfigurationProvider;GetChildKeys;(System.Collections.Generic.IEnumerable<System.String>,System.String);Argument[0].Element;ReturnValue.Element;value;dfc-generated |
 | Microsoft.Extensions.Configuration;ConfigurationProvider;GetReloadToken;();Argument[this];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Configuration;ConfigurationProvider;ToString;();Argument[this];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Configuration;ConfigurationProvider;TryGet;(System.String,System.String);Argument[this];ReturnValue;taint;df-generated |
+| Microsoft.Extensions.Configuration;ConfigurationReloadToken;RegisterChangeCallback;(System.Action<System.Object>,System.Object);Argument[0];Argument[0].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.Configuration;ConfigurationReloadToken;RegisterChangeCallback;(System.Action<System.Object>,System.Object);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
-| Microsoft.Extensions.Configuration;ConfigurationRoot;ConfigurationRoot;(System.Collections.Generic.IList<Microsoft.Extensions.Configuration.IConfigurationProvider>);Argument[0].Element;Argument[this];taint;df-generated |
+| Microsoft.Extensions.Configuration;ConfigurationReloadToken;RegisterChangeCallback;(System.Action<System.Object>,System.Object);Argument[this];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Configuration;ConfigurationReloadToken;RegisterChangeCallback;(System.Action<System.Object>,System.Object);Argument[this];ReturnValue;value;hq-generated |
+| Microsoft.Extensions.Configuration;ConfigurationRoot;ConfigurationRoot;(System.Collections.Generic.IList<Microsoft.Extensions.Configuration.IConfigurationProvider>);Argument[0];Argument[this].SyntheticField[Microsoft.Extensions.Configuration.ConfigurationRoot._providers];value;dfc-generated |
 | Microsoft.Extensions.Configuration;ConfigurationRoot;GetReloadToken;();Argument[this];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Configuration;ConfigurationRoot;GetSection;(System.String);Argument[0];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Configuration;ConfigurationRoot;GetSection;(System.String);Argument[this];ReturnValue;taint;df-generated |
 | Microsoft.Extensions.Configuration;ConfigurationRoot;get_Item;(System.String);Argument[this];ReturnValue;taint;manual |
+| Microsoft.Extensions.Configuration;ConfigurationRoot;get_Providers;();Argument[this].SyntheticField[Microsoft.Extensions.Configuration.ConfigurationRoot._providers];ReturnValue;value;df-generated |
+| Microsoft.Extensions.Configuration;ConfigurationRoot;get_Providers;();Argument[this].SyntheticField[Microsoft.Extensions.Configuration.ConfigurationRoot._providers];ReturnValue;value;dfc-generated |
 | Microsoft.Extensions.Configuration;ConfigurationRoot;get_Providers;();Argument[this];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Configuration;ConfigurationRootExtensions;GetDebugView;(Microsoft.Extensions.Configuration.IConfigurationRoot);Argument[0];ReturnValue;taint;df-generated |
+| Microsoft.Extensions.Configuration;ConfigurationRoot;get_Providers;();Argument[this];ReturnValue;taint;dfc-generated |
+| Microsoft.Extensions.Configuration;ConfigurationRootExtensions;GetDebugView;(Microsoft.Extensions.Configuration.IConfigurationRoot);Argument[0].Property[Microsoft.Extensions.Configuration.IConfigurationRoot.Providers].Element;ReturnValue;taint;dfc-generated |
+| Microsoft.Extensions.Configuration;ConfigurationRootExtensions;GetDebugView;(Microsoft.Extensions.Configuration.IConfigurationRoot,System.Func<Microsoft.Extensions.Configuration.ConfigurationDebugViewContext,System.String>);Argument[0].Property[Microsoft.Extensions.Configuration.IConfigurationRoot.Providers].Element;ReturnValue;taint;dfc-generated |
+| Microsoft.Extensions.Configuration;ConfigurationRootExtensions;GetDebugView;(Microsoft.Extensions.Configuration.IConfigurationRoot,System.Func<Microsoft.Extensions.Configuration.ConfigurationDebugViewContext,System.String>);Argument[0].Property[Microsoft.Extensions.Configuration.IConfigurationRoot.Providers].Element;ReturnValue;taint;hq-generated |
+| Microsoft.Extensions.Configuration;ConfigurationRootExtensions;GetDebugView;(Microsoft.Extensions.Configuration.IConfigurationRoot,System.Func<Microsoft.Extensions.Configuration.ConfigurationDebugViewContext,System.String>);Argument[1].ReturnValue;ReturnValue;taint;dfc-generated |
+| Microsoft.Extensions.Configuration;ConfigurationRootExtensions;GetDebugView;(Microsoft.Extensions.Configuration.IConfigurationRoot,System.Func<Microsoft.Extensions.Configuration.ConfigurationDebugViewContext,System.String>);Argument[1].ReturnValue;ReturnValue;taint;hq-generated |
+| Microsoft.Extensions.Configuration;ConfigurationRootExtensions;GetDebugView;(Microsoft.Extensions.Configuration.IConfigurationRoot,System.Func<Microsoft.Extensions.Configuration.ConfigurationDebugViewContext,System.String>);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.Configuration;ConfigurationRootExtensions;GetDebugView;(Microsoft.Extensions.Configuration.IConfigurationRoot,System.Func<Microsoft.Extensions.Configuration.ConfigurationDebugViewContext,System.String>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
-| Microsoft.Extensions.Configuration;ConfigurationSection;ConfigurationSection;(Microsoft.Extensions.Configuration.IConfigurationRoot,System.String);Argument[0];Argument[this];taint;df-generated |
-| Microsoft.Extensions.Configuration;ConfigurationSection;ConfigurationSection;(Microsoft.Extensions.Configuration.IConfigurationRoot,System.String);Argument[1];Argument[this];taint;df-generated |
+| Microsoft.Extensions.Configuration;ConfigurationSection;ConfigurationSection;(Microsoft.Extensions.Configuration.IConfigurationRoot,System.String);Argument[1];Argument[this].SyntheticField[Microsoft.Extensions.Configuration.ConfigurationSection._path];value;dfc-generated |
 | Microsoft.Extensions.Configuration;ConfigurationSection;GetReloadToken;();Argument[this];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Configuration;ConfigurationSection;GetSection;(System.String);Argument[0];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Configuration;ConfigurationSection;GetSection;(System.String);Argument[this];ReturnValue;taint;df-generated |
 | Microsoft.Extensions.Configuration;ConfigurationSection;get_Item;(System.String);Argument[this];ReturnValue;taint;manual |
-| Microsoft.Extensions.Configuration;ConfigurationSection;get_Path;();Argument[this];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Configuration;EnvironmentVariablesExtensions;AddEnvironmentVariables;(Microsoft.Extensions.Configuration.IConfigurationBuilder);Argument[0];ReturnValue;taint;df-generated |
+| Microsoft.Extensions.Configuration;ConfigurationSection;get_Path;();Argument[this].SyntheticField[Microsoft.Extensions.Configuration.ConfigurationSection._path];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Configuration;EnvironmentVariablesExtensions;AddEnvironmentVariables;(Microsoft.Extensions.Configuration.IConfigurationBuilder);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Configuration;EnvironmentVariablesExtensions;AddEnvironmentVariables;(Microsoft.Extensions.Configuration.IConfigurationBuilder,System.Action<Microsoft.Extensions.Configuration.EnvironmentVariables.EnvironmentVariablesConfigurationSource>);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Configuration;EnvironmentVariablesExtensions;AddEnvironmentVariables;(Microsoft.Extensions.Configuration.IConfigurationBuilder,System.Action<Microsoft.Extensions.Configuration.EnvironmentVariables.EnvironmentVariablesConfigurationSource>);Argument[0];ReturnValue;value;hq-generated |
+| Microsoft.Extensions.Configuration;EnvironmentVariablesExtensions;AddEnvironmentVariables;(Microsoft.Extensions.Configuration.IConfigurationBuilder,System.Action<Microsoft.Extensions.Configuration.EnvironmentVariables.EnvironmentVariablesConfigurationSource>);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.Configuration;EnvironmentVariablesExtensions;AddEnvironmentVariables;(Microsoft.Extensions.Configuration.IConfigurationBuilder,System.Action<Microsoft.Extensions.Configuration.EnvironmentVariables.EnvironmentVariablesConfigurationSource>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
-| Microsoft.Extensions.Configuration;EnvironmentVariablesExtensions;AddEnvironmentVariables;(Microsoft.Extensions.Configuration.IConfigurationBuilder,System.String);Argument[0];ReturnValue;taint;df-generated |
+| Microsoft.Extensions.Configuration;EnvironmentVariablesExtensions;AddEnvironmentVariables;(Microsoft.Extensions.Configuration.IConfigurationBuilder,System.String);Argument[0];ReturnValue;value;dfc-generated |
 | Microsoft.Extensions.Configuration;FileConfigurationExtensions;GetFileLoadExceptionHandler;(Microsoft.Extensions.Configuration.IConfigurationBuilder);Argument[0];ReturnValue;taint;df-generated |
 | Microsoft.Extensions.Configuration;FileConfigurationExtensions;GetFileProvider;(Microsoft.Extensions.Configuration.IConfigurationBuilder);Argument[0];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Configuration;FileConfigurationExtensions;SetBasePath;(Microsoft.Extensions.Configuration.IConfigurationBuilder,System.String);Argument[0];ReturnValue;taint;df-generated |
+| Microsoft.Extensions.Configuration;FileConfigurationExtensions;SetBasePath;(Microsoft.Extensions.Configuration.IConfigurationBuilder,System.String);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Configuration;FileConfigurationExtensions;SetFileLoadExceptionHandler;(Microsoft.Extensions.Configuration.IConfigurationBuilder,System.Action<Microsoft.Extensions.Configuration.FileLoadExceptionContext>);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Configuration;FileConfigurationExtensions;SetFileLoadExceptionHandler;(Microsoft.Extensions.Configuration.IConfigurationBuilder,System.Action<Microsoft.Extensions.Configuration.FileLoadExceptionContext>);Argument[0];ReturnValue;value;hq-generated |
+| Microsoft.Extensions.Configuration;FileConfigurationExtensions;SetFileLoadExceptionHandler;(Microsoft.Extensions.Configuration.IConfigurationBuilder,System.Action<Microsoft.Extensions.Configuration.FileLoadExceptionContext>);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.Configuration;FileConfigurationExtensions;SetFileLoadExceptionHandler;(Microsoft.Extensions.Configuration.IConfigurationBuilder,System.Action<Microsoft.Extensions.Configuration.FileLoadExceptionContext>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
-| Microsoft.Extensions.Configuration;FileConfigurationExtensions;SetFileProvider;(Microsoft.Extensions.Configuration.IConfigurationBuilder,Microsoft.Extensions.FileProviders.IFileProvider);Argument[0];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Configuration;FileConfigurationSource;Build;(Microsoft.Extensions.Configuration.IConfigurationBuilder);Argument[this];ReturnValue;taint;df-generated |
+| Microsoft.Extensions.Configuration;FileConfigurationExtensions;SetFileProvider;(Microsoft.Extensions.Configuration.IConfigurationBuilder,Microsoft.Extensions.FileProviders.IFileProvider);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Configuration;FileConfigurationProvider;ToString;();Argument[this].Property[Microsoft.Extensions.Configuration.FileConfigurationProvider.Source].Property[Microsoft.Extensions.Configuration.FileConfigurationSource.Path];ReturnValue;taint;dfc-generated |
 | Microsoft.Extensions.Configuration;FileConfigurationSource;set_OnLoadException;(System.Action<Microsoft.Extensions.Configuration.FileLoadExceptionContext>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | Microsoft.Extensions.Configuration;IConfiguration;GetReloadToken;();Argument[this];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Configuration;IConfiguration;GetSection;(System.String);Argument[0];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Configuration;IConfiguration;GetSection;(System.String);Argument[this];ReturnValue;taint;df-generated |
 | Microsoft.Extensions.Configuration;IConfiguration;get_Item;(System.String);Argument[this];ReturnValue;taint;manual |
-| Microsoft.Extensions.Configuration;IConfigurationBuilder;Add;(Microsoft.Extensions.Configuration.IConfigurationSource);Argument[0];Argument[this];taint;df-generated |
-| Microsoft.Extensions.Configuration;IConfigurationBuilder;Add;(Microsoft.Extensions.Configuration.IConfigurationSource);Argument[this];ReturnValue;value;df-generated |
+| Microsoft.Extensions.Configuration;IConfigurationBuilder;Add;(Microsoft.Extensions.Configuration.IConfigurationSource);Argument[this];ReturnValue;value;dfc-generated |
 | Microsoft.Extensions.Configuration;IConfigurationBuilder;Build;();Argument[this];ReturnValue;taint;manual |
 | Microsoft.Extensions.Configuration;IConfigurationBuilder;get_Properties;();Argument[this];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Configuration;IConfigurationBuilder;get_Sources;();Argument[this];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Configuration;IConfigurationProvider;GetChildKeys;(System.Collections.Generic.IEnumerable<System.String>,System.String);Argument[0].Element;ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Configuration;IConfigurationProvider;GetChildKeys;(System.Collections.Generic.IEnumerable<System.String>,System.String);Argument[this];ReturnValue;taint;df-generated |
+| Microsoft.Extensions.Configuration;IConfigurationProvider;GetChildKeys;(System.Collections.Generic.IEnumerable<System.String>,System.String);Argument[0].Element;ReturnValue.Element;value;dfc-generated |
 | Microsoft.Extensions.Configuration;IConfigurationProvider;GetReloadToken;();Argument[this];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Configuration;IConfigurationProvider;TryGet;(System.String,System.String);Argument[this];ReturnValue;taint;df-generated |
 | Microsoft.Extensions.Configuration;IConfigurationRoot;get_Providers;();Argument[this];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Configuration;IConfigurationSection;get_Path;();Argument[this];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Configuration;IConfigurationSource;Build;(Microsoft.Extensions.Configuration.IConfigurationBuilder);Argument[this];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Configuration;IniConfigurationExtensions;AddIniFile;(Microsoft.Extensions.Configuration.IConfigurationBuilder,Microsoft.Extensions.FileProviders.IFileProvider,System.String,System.Boolean,System.Boolean);Argument[0];ReturnValue;taint;df-generated |
+| Microsoft.Extensions.Configuration;IniConfigurationExtensions;AddIniFile;(Microsoft.Extensions.Configuration.IConfigurationBuilder,Microsoft.Extensions.FileProviders.IFileProvider,System.String,System.Boolean,System.Boolean);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Configuration;IniConfigurationExtensions;AddIniFile;(Microsoft.Extensions.Configuration.IConfigurationBuilder,System.Action<Microsoft.Extensions.Configuration.Ini.IniConfigurationSource>);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Configuration;IniConfigurationExtensions;AddIniFile;(Microsoft.Extensions.Configuration.IConfigurationBuilder,System.Action<Microsoft.Extensions.Configuration.Ini.IniConfigurationSource>);Argument[0];ReturnValue;value;hq-generated |
+| Microsoft.Extensions.Configuration;IniConfigurationExtensions;AddIniFile;(Microsoft.Extensions.Configuration.IConfigurationBuilder,System.Action<Microsoft.Extensions.Configuration.Ini.IniConfigurationSource>);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.Configuration;IniConfigurationExtensions;AddIniFile;(Microsoft.Extensions.Configuration.IConfigurationBuilder,System.Action<Microsoft.Extensions.Configuration.Ini.IniConfigurationSource>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
-| Microsoft.Extensions.Configuration;IniConfigurationExtensions;AddIniFile;(Microsoft.Extensions.Configuration.IConfigurationBuilder,System.String);Argument[0];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Configuration;IniConfigurationExtensions;AddIniFile;(Microsoft.Extensions.Configuration.IConfigurationBuilder,System.String,System.Boolean);Argument[0];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Configuration;IniConfigurationExtensions;AddIniFile;(Microsoft.Extensions.Configuration.IConfigurationBuilder,System.String,System.Boolean,System.Boolean);Argument[0];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Configuration;IniConfigurationExtensions;AddIniStream;(Microsoft.Extensions.Configuration.IConfigurationBuilder,System.IO.Stream);Argument[0];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Configuration;JsonConfigurationExtensions;AddJsonFile;(Microsoft.Extensions.Configuration.IConfigurationBuilder,Microsoft.Extensions.FileProviders.IFileProvider,System.String,System.Boolean,System.Boolean);Argument[0];ReturnValue;taint;df-generated |
+| Microsoft.Extensions.Configuration;IniConfigurationExtensions;AddIniFile;(Microsoft.Extensions.Configuration.IConfigurationBuilder,System.String);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Configuration;IniConfigurationExtensions;AddIniFile;(Microsoft.Extensions.Configuration.IConfigurationBuilder,System.String,System.Boolean);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Configuration;IniConfigurationExtensions;AddIniFile;(Microsoft.Extensions.Configuration.IConfigurationBuilder,System.String,System.Boolean,System.Boolean);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Configuration;IniConfigurationExtensions;AddIniStream;(Microsoft.Extensions.Configuration.IConfigurationBuilder,System.IO.Stream);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Configuration;JsonConfigurationExtensions;AddJsonFile;(Microsoft.Extensions.Configuration.IConfigurationBuilder,Microsoft.Extensions.FileProviders.IFileProvider,System.String,System.Boolean,System.Boolean);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Configuration;JsonConfigurationExtensions;AddJsonFile;(Microsoft.Extensions.Configuration.IConfigurationBuilder,System.Action<Microsoft.Extensions.Configuration.Json.JsonConfigurationSource>);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Configuration;JsonConfigurationExtensions;AddJsonFile;(Microsoft.Extensions.Configuration.IConfigurationBuilder,System.Action<Microsoft.Extensions.Configuration.Json.JsonConfigurationSource>);Argument[0];ReturnValue;value;hq-generated |
+| Microsoft.Extensions.Configuration;JsonConfigurationExtensions;AddJsonFile;(Microsoft.Extensions.Configuration.IConfigurationBuilder,System.Action<Microsoft.Extensions.Configuration.Json.JsonConfigurationSource>);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.Configuration;JsonConfigurationExtensions;AddJsonFile;(Microsoft.Extensions.Configuration.IConfigurationBuilder,System.Action<Microsoft.Extensions.Configuration.Json.JsonConfigurationSource>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
-| Microsoft.Extensions.Configuration;JsonConfigurationExtensions;AddJsonFile;(Microsoft.Extensions.Configuration.IConfigurationBuilder,System.String);Argument[0];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Configuration;JsonConfigurationExtensions;AddJsonFile;(Microsoft.Extensions.Configuration.IConfigurationBuilder,System.String,System.Boolean);Argument[0];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Configuration;JsonConfigurationExtensions;AddJsonFile;(Microsoft.Extensions.Configuration.IConfigurationBuilder,System.String,System.Boolean,System.Boolean);Argument[0];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Configuration;JsonConfigurationExtensions;AddJsonStream;(Microsoft.Extensions.Configuration.IConfigurationBuilder,System.IO.Stream);Argument[0];ReturnValue;taint;df-generated |
+| Microsoft.Extensions.Configuration;JsonConfigurationExtensions;AddJsonFile;(Microsoft.Extensions.Configuration.IConfigurationBuilder,System.String);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Configuration;JsonConfigurationExtensions;AddJsonFile;(Microsoft.Extensions.Configuration.IConfigurationBuilder,System.String,System.Boolean);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Configuration;JsonConfigurationExtensions;AddJsonFile;(Microsoft.Extensions.Configuration.IConfigurationBuilder,System.String,System.Boolean,System.Boolean);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Configuration;JsonConfigurationExtensions;AddJsonStream;(Microsoft.Extensions.Configuration.IConfigurationBuilder,System.IO.Stream);Argument[0];ReturnValue;value;dfc-generated |
 | Microsoft.Extensions.Configuration;KeyPerFileConfigurationBuilderExtensions;AddKeyPerFile;(Microsoft.Extensions.Configuration.IConfigurationBuilder,System.Action<Microsoft.Extensions.Configuration.KeyPerFile.KeyPerFileConfigurationSource>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
-| Microsoft.Extensions.Configuration;MemoryConfigurationBuilderExtensions;AddInMemoryCollection;(Microsoft.Extensions.Configuration.IConfigurationBuilder);Argument[0];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Configuration;MemoryConfigurationBuilderExtensions;AddInMemoryCollection;(Microsoft.Extensions.Configuration.IConfigurationBuilder,System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<System.String,System.String>>);Argument[0];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Configuration;StreamConfigurationSource;Build;(Microsoft.Extensions.Configuration.IConfigurationBuilder);Argument[this];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Configuration;UserSecretsConfigurationExtensions;AddUserSecrets;(Microsoft.Extensions.Configuration.IConfigurationBuilder,System.Reflection.Assembly);Argument[0];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Configuration;UserSecretsConfigurationExtensions;AddUserSecrets;(Microsoft.Extensions.Configuration.IConfigurationBuilder,System.Reflection.Assembly,System.Boolean);Argument[0];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Configuration;UserSecretsConfigurationExtensions;AddUserSecrets;(Microsoft.Extensions.Configuration.IConfigurationBuilder,System.Reflection.Assembly,System.Boolean,System.Boolean);Argument[0];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Configuration;UserSecretsConfigurationExtensions;AddUserSecrets;(Microsoft.Extensions.Configuration.IConfigurationBuilder,System.String);Argument[0];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Configuration;UserSecretsConfigurationExtensions;AddUserSecrets;(Microsoft.Extensions.Configuration.IConfigurationBuilder,System.String,System.Boolean);Argument[0];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Configuration;UserSecretsConfigurationExtensions;AddUserSecrets<T>;(Microsoft.Extensions.Configuration.IConfigurationBuilder);Argument[0];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Configuration;UserSecretsConfigurationExtensions;AddUserSecrets<T>;(Microsoft.Extensions.Configuration.IConfigurationBuilder,System.Boolean);Argument[0];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Configuration;UserSecretsConfigurationExtensions;AddUserSecrets<T>;(Microsoft.Extensions.Configuration.IConfigurationBuilder,System.Boolean,System.Boolean);Argument[0];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Configuration;XmlConfigurationExtensions;AddXmlFile;(Microsoft.Extensions.Configuration.IConfigurationBuilder,Microsoft.Extensions.FileProviders.IFileProvider,System.String,System.Boolean,System.Boolean);Argument[0];ReturnValue;taint;df-generated |
+| Microsoft.Extensions.Configuration;MemoryConfigurationBuilderExtensions;AddInMemoryCollection;(Microsoft.Extensions.Configuration.IConfigurationBuilder);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Configuration;MemoryConfigurationBuilderExtensions;AddInMemoryCollection;(Microsoft.Extensions.Configuration.IConfigurationBuilder,System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<System.String,System.String>>);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Configuration;UserSecretsConfigurationExtensions;AddUserSecrets;(Microsoft.Extensions.Configuration.IConfigurationBuilder,System.Reflection.Assembly);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Configuration;UserSecretsConfigurationExtensions;AddUserSecrets;(Microsoft.Extensions.Configuration.IConfigurationBuilder,System.Reflection.Assembly,System.Boolean);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Configuration;UserSecretsConfigurationExtensions;AddUserSecrets;(Microsoft.Extensions.Configuration.IConfigurationBuilder,System.Reflection.Assembly,System.Boolean,System.Boolean);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Configuration;UserSecretsConfigurationExtensions;AddUserSecrets;(Microsoft.Extensions.Configuration.IConfigurationBuilder,System.String);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Configuration;UserSecretsConfigurationExtensions;AddUserSecrets;(Microsoft.Extensions.Configuration.IConfigurationBuilder,System.String,System.Boolean);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Configuration;UserSecretsConfigurationExtensions;AddUserSecrets<T>;(Microsoft.Extensions.Configuration.IConfigurationBuilder);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Configuration;UserSecretsConfigurationExtensions;AddUserSecrets<T>;(Microsoft.Extensions.Configuration.IConfigurationBuilder,System.Boolean);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Configuration;UserSecretsConfigurationExtensions;AddUserSecrets<T>;(Microsoft.Extensions.Configuration.IConfigurationBuilder,System.Boolean,System.Boolean);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Configuration;XmlConfigurationExtensions;AddXmlFile;(Microsoft.Extensions.Configuration.IConfigurationBuilder,Microsoft.Extensions.FileProviders.IFileProvider,System.String,System.Boolean,System.Boolean);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Configuration;XmlConfigurationExtensions;AddXmlFile;(Microsoft.Extensions.Configuration.IConfigurationBuilder,System.Action<Microsoft.Extensions.Configuration.Xml.XmlConfigurationSource>);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Configuration;XmlConfigurationExtensions;AddXmlFile;(Microsoft.Extensions.Configuration.IConfigurationBuilder,System.Action<Microsoft.Extensions.Configuration.Xml.XmlConfigurationSource>);Argument[0];ReturnValue;value;hq-generated |
+| Microsoft.Extensions.Configuration;XmlConfigurationExtensions;AddXmlFile;(Microsoft.Extensions.Configuration.IConfigurationBuilder,System.Action<Microsoft.Extensions.Configuration.Xml.XmlConfigurationSource>);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.Configuration;XmlConfigurationExtensions;AddXmlFile;(Microsoft.Extensions.Configuration.IConfigurationBuilder,System.Action<Microsoft.Extensions.Configuration.Xml.XmlConfigurationSource>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
-| Microsoft.Extensions.Configuration;XmlConfigurationExtensions;AddXmlFile;(Microsoft.Extensions.Configuration.IConfigurationBuilder,System.String);Argument[0];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Configuration;XmlConfigurationExtensions;AddXmlFile;(Microsoft.Extensions.Configuration.IConfigurationBuilder,System.String,System.Boolean);Argument[0];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Configuration;XmlConfigurationExtensions;AddXmlFile;(Microsoft.Extensions.Configuration.IConfigurationBuilder,System.String,System.Boolean,System.Boolean);Argument[0];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Configuration;XmlConfigurationExtensions;AddXmlStream;(Microsoft.Extensions.Configuration.IConfigurationBuilder,System.IO.Stream);Argument[0];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.DependencyInjection.Extensions;ServiceCollectionDescriptorExtensions;Add;(Microsoft.Extensions.DependencyInjection.IServiceCollection,Microsoft.Extensions.DependencyInjection.ServiceDescriptor);Argument[0].Element;ReturnValue;taint;df-generated |
-| Microsoft.Extensions.DependencyInjection.Extensions;ServiceCollectionDescriptorExtensions;Add;(Microsoft.Extensions.DependencyInjection.IServiceCollection,Microsoft.Extensions.DependencyInjection.ServiceDescriptor);Argument[1];Argument[0].Element;taint;df-generated |
-| Microsoft.Extensions.DependencyInjection.Extensions;ServiceCollectionDescriptorExtensions;Add;(Microsoft.Extensions.DependencyInjection.IServiceCollection,Microsoft.Extensions.DependencyInjection.ServiceDescriptor);Argument[1];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.DependencyInjection.Extensions;ServiceCollectionDescriptorExtensions;Add;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Collections.Generic.IEnumerable<Microsoft.Extensions.DependencyInjection.ServiceDescriptor>);Argument[0].Element;ReturnValue;taint;df-generated |
-| Microsoft.Extensions.DependencyInjection.Extensions;ServiceCollectionDescriptorExtensions;Add;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Collections.Generic.IEnumerable<Microsoft.Extensions.DependencyInjection.ServiceDescriptor>);Argument[1].Element;Argument[0].Element;taint;df-generated |
-| Microsoft.Extensions.DependencyInjection.Extensions;ServiceCollectionDescriptorExtensions;Add;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Collections.Generic.IEnumerable<Microsoft.Extensions.DependencyInjection.ServiceDescriptor>);Argument[1].Element;ReturnValue;taint;df-generated |
-| Microsoft.Extensions.DependencyInjection.Extensions;ServiceCollectionDescriptorExtensions;RemoveAll;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Type);Argument[0].Element;ReturnValue;taint;df-generated |
-| Microsoft.Extensions.DependencyInjection.Extensions;ServiceCollectionDescriptorExtensions;RemoveAll<T>;(Microsoft.Extensions.DependencyInjection.IServiceCollection);Argument[0].Element;ReturnValue;taint;df-generated |
-| Microsoft.Extensions.DependencyInjection.Extensions;ServiceCollectionDescriptorExtensions;RemoveAllKeyed;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Type,System.Object);Argument[0].Element;ReturnValue;taint;df-generated |
-| Microsoft.Extensions.DependencyInjection.Extensions;ServiceCollectionDescriptorExtensions;RemoveAllKeyed<T>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Object);Argument[0].Element;ReturnValue;taint;df-generated |
-| Microsoft.Extensions.DependencyInjection.Extensions;ServiceCollectionDescriptorExtensions;Replace;(Microsoft.Extensions.DependencyInjection.IServiceCollection,Microsoft.Extensions.DependencyInjection.ServiceDescriptor);Argument[0].Element;ReturnValue;taint;df-generated |
-| Microsoft.Extensions.DependencyInjection.Extensions;ServiceCollectionDescriptorExtensions;Replace;(Microsoft.Extensions.DependencyInjection.IServiceCollection,Microsoft.Extensions.DependencyInjection.ServiceDescriptor);Argument[1];Argument[0].Element;taint;df-generated |
-| Microsoft.Extensions.DependencyInjection.Extensions;ServiceCollectionDescriptorExtensions;Replace;(Microsoft.Extensions.DependencyInjection.IServiceCollection,Microsoft.Extensions.DependencyInjection.ServiceDescriptor);Argument[1];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.DependencyInjection.Extensions;ServiceCollectionDescriptorExtensions;TryAdd;(Microsoft.Extensions.DependencyInjection.IServiceCollection,Microsoft.Extensions.DependencyInjection.ServiceDescriptor);Argument[1];Argument[0].Element;taint;df-generated |
-| Microsoft.Extensions.DependencyInjection.Extensions;ServiceCollectionDescriptorExtensions;TryAdd;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Collections.Generic.IEnumerable<Microsoft.Extensions.DependencyInjection.ServiceDescriptor>);Argument[1].Element;Argument[0].Element;taint;df-generated |
-| Microsoft.Extensions.DependencyInjection.Extensions;ServiceCollectionDescriptorExtensions;TryAddEnumerable;(Microsoft.Extensions.DependencyInjection.IServiceCollection,Microsoft.Extensions.DependencyInjection.ServiceDescriptor);Argument[1];Argument[0].Element;taint;df-generated |
-| Microsoft.Extensions.DependencyInjection.Extensions;ServiceCollectionDescriptorExtensions;TryAddEnumerable;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Collections.Generic.IEnumerable<Microsoft.Extensions.DependencyInjection.ServiceDescriptor>);Argument[1].Element;Argument[0].Element;taint;df-generated |
+| Microsoft.Extensions.Configuration;XmlConfigurationExtensions;AddXmlFile;(Microsoft.Extensions.Configuration.IConfigurationBuilder,System.String);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Configuration;XmlConfigurationExtensions;AddXmlFile;(Microsoft.Extensions.Configuration.IConfigurationBuilder,System.String,System.Boolean);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Configuration;XmlConfigurationExtensions;AddXmlFile;(Microsoft.Extensions.Configuration.IConfigurationBuilder,System.String,System.Boolean,System.Boolean);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Configuration;XmlConfigurationExtensions;AddXmlStream;(Microsoft.Extensions.Configuration.IConfigurationBuilder,System.IO.Stream);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection.Extensions;ServiceCollectionDescriptorExtensions;Add;(Microsoft.Extensions.DependencyInjection.IServiceCollection,Microsoft.Extensions.DependencyInjection.ServiceDescriptor);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection.Extensions;ServiceCollectionDescriptorExtensions;Add;(Microsoft.Extensions.DependencyInjection.IServiceCollection,Microsoft.Extensions.DependencyInjection.ServiceDescriptor);Argument[1];Argument[0].Element;value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection.Extensions;ServiceCollectionDescriptorExtensions;Add;(Microsoft.Extensions.DependencyInjection.IServiceCollection,Microsoft.Extensions.DependencyInjection.ServiceDescriptor);Argument[1];ReturnValue.Element;value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection.Extensions;ServiceCollectionDescriptorExtensions;Add;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Collections.Generic.IEnumerable<Microsoft.Extensions.DependencyInjection.ServiceDescriptor>);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection.Extensions;ServiceCollectionDescriptorExtensions;Add;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Collections.Generic.IEnumerable<Microsoft.Extensions.DependencyInjection.ServiceDescriptor>);Argument[1].Element;Argument[0].Element;value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection.Extensions;ServiceCollectionDescriptorExtensions;Add;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Collections.Generic.IEnumerable<Microsoft.Extensions.DependencyInjection.ServiceDescriptor>);Argument[1].Element;ReturnValue.Element;value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection.Extensions;ServiceCollectionDescriptorExtensions;RemoveAll;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Type);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection.Extensions;ServiceCollectionDescriptorExtensions;RemoveAll<T>;(Microsoft.Extensions.DependencyInjection.IServiceCollection);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection.Extensions;ServiceCollectionDescriptorExtensions;RemoveAllKeyed;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Type,System.Object);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection.Extensions;ServiceCollectionDescriptorExtensions;RemoveAllKeyed<T>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Object);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection.Extensions;ServiceCollectionDescriptorExtensions;Replace;(Microsoft.Extensions.DependencyInjection.IServiceCollection,Microsoft.Extensions.DependencyInjection.ServiceDescriptor);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection.Extensions;ServiceCollectionDescriptorExtensions;Replace;(Microsoft.Extensions.DependencyInjection.IServiceCollection,Microsoft.Extensions.DependencyInjection.ServiceDescriptor);Argument[1];Argument[0].Element;value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection.Extensions;ServiceCollectionDescriptorExtensions;Replace;(Microsoft.Extensions.DependencyInjection.IServiceCollection,Microsoft.Extensions.DependencyInjection.ServiceDescriptor);Argument[1];ReturnValue.Element;value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection.Extensions;ServiceCollectionDescriptorExtensions;TryAdd;(Microsoft.Extensions.DependencyInjection.IServiceCollection,Microsoft.Extensions.DependencyInjection.ServiceDescriptor);Argument[1];Argument[0].Element;value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection.Extensions;ServiceCollectionDescriptorExtensions;TryAdd;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Collections.Generic.IEnumerable<Microsoft.Extensions.DependencyInjection.ServiceDescriptor>);Argument[1].Element;Argument[0].Element;value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection.Extensions;ServiceCollectionDescriptorExtensions;TryAddEnumerable;(Microsoft.Extensions.DependencyInjection.IServiceCollection,Microsoft.Extensions.DependencyInjection.ServiceDescriptor);Argument[1];Argument[0].Element;value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection.Extensions;ServiceCollectionDescriptorExtensions;TryAddEnumerable;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Collections.Generic.IEnumerable<Microsoft.Extensions.DependencyInjection.ServiceDescriptor>);Argument[1].Element;Argument[0].Element;value;dfc-generated |
 | Microsoft.Extensions.DependencyInjection.Extensions;ServiceCollectionDescriptorExtensions;TryAddKeyedScoped;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Type,System.Object,System.Func<System.IServiceProvider,System.Object,System.Object>);Argument[3];Argument[3].Parameter[delegate-self];value;hq-generated |
 | Microsoft.Extensions.DependencyInjection.Extensions;ServiceCollectionDescriptorExtensions;TryAddKeyedScoped<TService>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Object,System.Func<System.IServiceProvider,System.Object,TService>);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
 | Microsoft.Extensions.DependencyInjection.Extensions;ServiceCollectionDescriptorExtensions;TryAddKeyedSingleton;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Type,System.Object,System.Func<System.IServiceProvider,System.Object,System.Object>);Argument[3];Argument[3].Parameter[delegate-self];value;hq-generated |
@@ -1962,13 +1950,14 @@ summary
 | Microsoft.Extensions.DependencyInjection.Extensions;ServiceCollectionDescriptorExtensions;TryAddSingleton<TService>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Func<System.IServiceProvider,TService>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
 | Microsoft.Extensions.DependencyInjection.Extensions;ServiceCollectionDescriptorExtensions;TryAddTransient;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Type,System.Func<System.IServiceProvider,System.Object>);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
 | Microsoft.Extensions.DependencyInjection.Extensions;ServiceCollectionDescriptorExtensions;TryAddTransient<TService>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Func<System.IServiceProvider,TService>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
-| Microsoft.Extensions.DependencyInjection;ActivatorUtilities;GetServiceOrCreateInstance;(System.IServiceProvider,System.Type);Argument[0];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.DependencyInjection;ActivatorUtilities;GetServiceOrCreateInstance<T>;(System.IServiceProvider);Argument[0];ReturnValue;taint;df-generated |
+| Microsoft.Extensions.DependencyInjection;ActivatorUtilities;GetServiceOrCreateInstance;(System.IServiceProvider,System.Type);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;ActivatorUtilities;GetServiceOrCreateInstance<T>;(System.IServiceProvider);Argument[0];ReturnValue;value;dfc-generated |
 | Microsoft.Extensions.DependencyInjection;AntiforgeryServiceCollectionExtensions;AddAntiforgery;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Action<Microsoft.AspNetCore.Antiforgery.AntiforgeryOptions>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
-| Microsoft.Extensions.DependencyInjection;AsyncServiceScope;AsyncServiceScope;(Microsoft.Extensions.DependencyInjection.IServiceScope);Argument[0];Argument[this];taint;df-generated |
+| Microsoft.Extensions.DependencyInjection;AsyncServiceScope;AsyncServiceScope;(Microsoft.Extensions.DependencyInjection.IServiceScope);Argument[0];Argument[this].SyntheticField[Microsoft.Extensions.DependencyInjection.AsyncServiceScope._serviceScope];value;dfc-generated |
 | Microsoft.Extensions.DependencyInjection;AsyncServiceScope;DisposeAsync;();Argument[this];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.DependencyInjection;AsyncServiceScope;get_ServiceProvider;();Argument[this];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.DependencyInjection;AsyncServiceScope;get_ServiceProvider;();Argument[this];ReturnValue;value;df-generated |
+| Microsoft.Extensions.DependencyInjection;AsyncServiceScope;get_ServiceProvider;();Argument[this].SyntheticField[Microsoft.Extensions.DependencyInjection.AsyncServiceScope._serviceScope].Property[Microsoft.Extensions.DependencyInjection.IServiceScope.ServiceProvider];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;AsyncServiceScope;get_ServiceProvider;();Argument[this].SyntheticField[Microsoft.Extensions.DependencyInjection.AsyncServiceScope._serviceScope];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;AsyncServiceScope;get_ServiceProvider;();Argument[this];ReturnValue;value;dfc-generated |
 | Microsoft.Extensions.DependencyInjection;AuthenticationCoreServiceCollectionExtensions;AddAuthenticationCore;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Action<Microsoft.AspNetCore.Authentication.AuthenticationOptions>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
 | Microsoft.Extensions.DependencyInjection;AuthenticationServiceCollectionExtensions;AddAuthentication;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Action<Microsoft.AspNetCore.Authentication.AuthenticationOptions>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
 | Microsoft.Extensions.DependencyInjection;AuthorizationServiceCollectionExtensions;AddAuthorizationCore;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Action<Microsoft.AspNetCore.Authorization.AuthorizationOptions>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
@@ -1990,7 +1979,7 @@ summary
 | Microsoft.Extensions.DependencyInjection;CookiePolicyServiceCollectionExtensions;AddCookiePolicy<TService>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Action<Microsoft.AspNetCore.Builder.CookiePolicyOptions,TService>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
 | Microsoft.Extensions.DependencyInjection;CorsServiceCollectionExtensions;AddCors;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Action<Microsoft.AspNetCore.Cors.Infrastructure.CorsOptions>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
 | Microsoft.Extensions.DependencyInjection;DataProtectionServiceCollectionExtensions;AddDataProtection;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Action<Microsoft.AspNetCore.DataProtection.DataProtectionOptions>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
-| Microsoft.Extensions.DependencyInjection;DefaultServiceProviderFactory;CreateBuilder;(Microsoft.Extensions.DependencyInjection.IServiceCollection);Argument[0].Element;ReturnValue;taint;df-generated |
+| Microsoft.Extensions.DependencyInjection;DefaultServiceProviderFactory;CreateBuilder;(Microsoft.Extensions.DependencyInjection.IServiceCollection);Argument[0];ReturnValue;value;dfc-generated |
 | Microsoft.Extensions.DependencyInjection;DefaultServiceProviderFactory;DefaultServiceProviderFactory;(Microsoft.Extensions.DependencyInjection.ServiceProviderOptions);Argument[0];Argument[this];taint;df-generated |
 | Microsoft.Extensions.DependencyInjection;EncoderServiceCollectionExtensions;AddWebEncoders;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Action<Microsoft.Extensions.WebEncoders.WebEncoderOptions>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
 | Microsoft.Extensions.DependencyInjection;ExceptionHandlerServiceCollectionExtensions;AddExceptionHandler;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Action<Microsoft.AspNetCore.Builder.ExceptionHandlerOptions>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
@@ -2003,31 +1992,76 @@ summary
 | Microsoft.Extensions.DependencyInjection;HealthChecksBuilderDelegateExtensions;AddCheck;(Microsoft.Extensions.DependencyInjection.IHealthChecksBuilder,System.String,System.Func<Microsoft.Extensions.Diagnostics.HealthChecks.HealthCheckResult>,System.Collections.Generic.IEnumerable<System.String>,System.Nullable<System.TimeSpan>);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
 | Microsoft.Extensions.DependencyInjection;HealthChecksBuilderDelegateExtensions;AddCheck;(Microsoft.Extensions.DependencyInjection.IHealthChecksBuilder,System.String,System.Func<System.Threading.CancellationToken,Microsoft.Extensions.Diagnostics.HealthChecks.HealthCheckResult>,System.Collections.Generic.IEnumerable<System.String>);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
 | Microsoft.Extensions.DependencyInjection;HealthChecksBuilderDelegateExtensions;AddCheck;(Microsoft.Extensions.DependencyInjection.IHealthChecksBuilder,System.String,System.Func<System.Threading.CancellationToken,Microsoft.Extensions.Diagnostics.HealthChecks.HealthCheckResult>,System.Collections.Generic.IEnumerable<System.String>,System.Nullable<System.TimeSpan>);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
-| Microsoft.Extensions.DependencyInjection;HttpClientBuilderExtensions;AddDefaultLogger;(Microsoft.Extensions.DependencyInjection.IHttpClientBuilder);Argument[0];ReturnValue;taint;df-generated |
+| Microsoft.Extensions.DependencyInjection;HttpClientBuilderExtensions;AddDefaultLogger;(Microsoft.Extensions.DependencyInjection.IHttpClientBuilder);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;HttpClientBuilderExtensions;AddHttpMessageHandler;(Microsoft.Extensions.DependencyInjection.IHttpClientBuilder,System.Func<System.IServiceProvider,System.Net.Http.DelegatingHandler>);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;HttpClientBuilderExtensions;AddHttpMessageHandler;(Microsoft.Extensions.DependencyInjection.IHttpClientBuilder,System.Func<System.IServiceProvider,System.Net.Http.DelegatingHandler>);Argument[0];ReturnValue;value;hq-generated |
+| Microsoft.Extensions.DependencyInjection;HttpClientBuilderExtensions;AddHttpMessageHandler;(Microsoft.Extensions.DependencyInjection.IHttpClientBuilder,System.Func<System.IServiceProvider,System.Net.Http.DelegatingHandler>);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.DependencyInjection;HttpClientBuilderExtensions;AddHttpMessageHandler;(Microsoft.Extensions.DependencyInjection.IHttpClientBuilder,System.Func<System.IServiceProvider,System.Net.Http.DelegatingHandler>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
+| Microsoft.Extensions.DependencyInjection;HttpClientBuilderExtensions;AddHttpMessageHandler;(Microsoft.Extensions.DependencyInjection.IHttpClientBuilder,System.Func<System.Net.Http.DelegatingHandler>);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;HttpClientBuilderExtensions;AddHttpMessageHandler;(Microsoft.Extensions.DependencyInjection.IHttpClientBuilder,System.Func<System.Net.Http.DelegatingHandler>);Argument[0];ReturnValue;value;hq-generated |
+| Microsoft.Extensions.DependencyInjection;HttpClientBuilderExtensions;AddHttpMessageHandler;(Microsoft.Extensions.DependencyInjection.IHttpClientBuilder,System.Func<System.Net.Http.DelegatingHandler>);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.DependencyInjection;HttpClientBuilderExtensions;AddHttpMessageHandler;(Microsoft.Extensions.DependencyInjection.IHttpClientBuilder,System.Func<System.Net.Http.DelegatingHandler>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
-| Microsoft.Extensions.DependencyInjection;HttpClientBuilderExtensions;AddHttpMessageHandler<THandler>;(Microsoft.Extensions.DependencyInjection.IHttpClientBuilder);Argument[0];ReturnValue;taint;df-generated |
+| Microsoft.Extensions.DependencyInjection;HttpClientBuilderExtensions;AddHttpMessageHandler<THandler>;(Microsoft.Extensions.DependencyInjection.IHttpClientBuilder);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;HttpClientBuilderExtensions;AddLogger;(Microsoft.Extensions.DependencyInjection.IHttpClientBuilder,System.Func<System.IServiceProvider,Microsoft.Extensions.Http.Logging.IHttpClientLogger>,System.Boolean);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;HttpClientBuilderExtensions;AddLogger;(Microsoft.Extensions.DependencyInjection.IHttpClientBuilder,System.Func<System.IServiceProvider,Microsoft.Extensions.Http.Logging.IHttpClientLogger>,System.Boolean);Argument[0];ReturnValue;value;hq-generated |
+| Microsoft.Extensions.DependencyInjection;HttpClientBuilderExtensions;AddLogger;(Microsoft.Extensions.DependencyInjection.IHttpClientBuilder,System.Func<System.IServiceProvider,Microsoft.Extensions.Http.Logging.IHttpClientLogger>,System.Boolean);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.DependencyInjection;HttpClientBuilderExtensions;AddLogger;(Microsoft.Extensions.DependencyInjection.IHttpClientBuilder,System.Func<System.IServiceProvider,Microsoft.Extensions.Http.Logging.IHttpClientLogger>,System.Boolean);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
-| Microsoft.Extensions.DependencyInjection;HttpClientBuilderExtensions;AddLogger<TLogger>;(Microsoft.Extensions.DependencyInjection.IHttpClientBuilder,System.Boolean);Argument[0];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.DependencyInjection;HttpClientBuilderExtensions;AddTypedClient<TClient,TImplementation>;(Microsoft.Extensions.DependencyInjection.IHttpClientBuilder);Argument[0];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.DependencyInjection;HttpClientBuilderExtensions;AddTypedClient<TClient>;(Microsoft.Extensions.DependencyInjection.IHttpClientBuilder);Argument[0];ReturnValue;taint;df-generated |
+| Microsoft.Extensions.DependencyInjection;HttpClientBuilderExtensions;AddLogger<TLogger>;(Microsoft.Extensions.DependencyInjection.IHttpClientBuilder,System.Boolean);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;HttpClientBuilderExtensions;AddTypedClient<TClient,TImplementation>;(Microsoft.Extensions.DependencyInjection.IHttpClientBuilder);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;HttpClientBuilderExtensions;AddTypedClient<TClient>;(Microsoft.Extensions.DependencyInjection.IHttpClientBuilder);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;HttpClientBuilderExtensions;AddTypedClient<TClient>;(Microsoft.Extensions.DependencyInjection.IHttpClientBuilder,System.Func<System.Net.Http.HttpClient,System.IServiceProvider,TClient>);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;HttpClientBuilderExtensions;AddTypedClient<TClient>;(Microsoft.Extensions.DependencyInjection.IHttpClientBuilder,System.Func<System.Net.Http.HttpClient,System.IServiceProvider,TClient>);Argument[0];ReturnValue;value;hq-generated |
+| Microsoft.Extensions.DependencyInjection;HttpClientBuilderExtensions;AddTypedClient<TClient>;(Microsoft.Extensions.DependencyInjection.IHttpClientBuilder,System.Func<System.Net.Http.HttpClient,System.IServiceProvider,TClient>);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.DependencyInjection;HttpClientBuilderExtensions;AddTypedClient<TClient>;(Microsoft.Extensions.DependencyInjection.IHttpClientBuilder,System.Func<System.Net.Http.HttpClient,System.IServiceProvider,TClient>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
+| Microsoft.Extensions.DependencyInjection;HttpClientBuilderExtensions;AddTypedClient<TClient>;(Microsoft.Extensions.DependencyInjection.IHttpClientBuilder,System.Func<System.Net.Http.HttpClient,TClient>);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;HttpClientBuilderExtensions;AddTypedClient<TClient>;(Microsoft.Extensions.DependencyInjection.IHttpClientBuilder,System.Func<System.Net.Http.HttpClient,TClient>);Argument[0];ReturnValue;value;hq-generated |
+| Microsoft.Extensions.DependencyInjection;HttpClientBuilderExtensions;AddTypedClient<TClient>;(Microsoft.Extensions.DependencyInjection.IHttpClientBuilder,System.Func<System.Net.Http.HttpClient,TClient>);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.DependencyInjection;HttpClientBuilderExtensions;AddTypedClient<TClient>;(Microsoft.Extensions.DependencyInjection.IHttpClientBuilder,System.Func<System.Net.Http.HttpClient,TClient>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
+| Microsoft.Extensions.DependencyInjection;HttpClientBuilderExtensions;ConfigureAdditionalHttpMessageHandlers;(Microsoft.Extensions.DependencyInjection.IHttpClientBuilder,System.Action<System.Collections.Generic.IList<System.Net.Http.DelegatingHandler>,System.IServiceProvider>);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;HttpClientBuilderExtensions;ConfigureAdditionalHttpMessageHandlers;(Microsoft.Extensions.DependencyInjection.IHttpClientBuilder,System.Action<System.Collections.Generic.IList<System.Net.Http.DelegatingHandler>,System.IServiceProvider>);Argument[0];ReturnValue;value;hq-generated |
+| Microsoft.Extensions.DependencyInjection;HttpClientBuilderExtensions;ConfigureAdditionalHttpMessageHandlers;(Microsoft.Extensions.DependencyInjection.IHttpClientBuilder,System.Action<System.Collections.Generic.IList<System.Net.Http.DelegatingHandler>,System.IServiceProvider>);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.DependencyInjection;HttpClientBuilderExtensions;ConfigureAdditionalHttpMessageHandlers;(Microsoft.Extensions.DependencyInjection.IHttpClientBuilder,System.Action<System.Collections.Generic.IList<System.Net.Http.DelegatingHandler>,System.IServiceProvider>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
+| Microsoft.Extensions.DependencyInjection;HttpClientBuilderExtensions;ConfigureHttpClient;(Microsoft.Extensions.DependencyInjection.IHttpClientBuilder,System.Action<System.IServiceProvider,System.Net.Http.HttpClient>);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;HttpClientBuilderExtensions;ConfigureHttpClient;(Microsoft.Extensions.DependencyInjection.IHttpClientBuilder,System.Action<System.IServiceProvider,System.Net.Http.HttpClient>);Argument[0];ReturnValue;value;hq-generated |
+| Microsoft.Extensions.DependencyInjection;HttpClientBuilderExtensions;ConfigureHttpClient;(Microsoft.Extensions.DependencyInjection.IHttpClientBuilder,System.Action<System.IServiceProvider,System.Net.Http.HttpClient>);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.DependencyInjection;HttpClientBuilderExtensions;ConfigureHttpClient;(Microsoft.Extensions.DependencyInjection.IHttpClientBuilder,System.Action<System.IServiceProvider,System.Net.Http.HttpClient>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
+| Microsoft.Extensions.DependencyInjection;HttpClientBuilderExtensions;ConfigureHttpClient;(Microsoft.Extensions.DependencyInjection.IHttpClientBuilder,System.Action<System.Net.Http.HttpClient>);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;HttpClientBuilderExtensions;ConfigureHttpClient;(Microsoft.Extensions.DependencyInjection.IHttpClientBuilder,System.Action<System.Net.Http.HttpClient>);Argument[0];ReturnValue;value;hq-generated |
+| Microsoft.Extensions.DependencyInjection;HttpClientBuilderExtensions;ConfigureHttpClient;(Microsoft.Extensions.DependencyInjection.IHttpClientBuilder,System.Action<System.Net.Http.HttpClient>);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.DependencyInjection;HttpClientBuilderExtensions;ConfigureHttpClient;(Microsoft.Extensions.DependencyInjection.IHttpClientBuilder,System.Action<System.Net.Http.HttpClient>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
+| Microsoft.Extensions.DependencyInjection;HttpClientBuilderExtensions;ConfigureHttpMessageHandlerBuilder;(Microsoft.Extensions.DependencyInjection.IHttpClientBuilder,System.Action<Microsoft.Extensions.Http.HttpMessageHandlerBuilder>);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;HttpClientBuilderExtensions;ConfigureHttpMessageHandlerBuilder;(Microsoft.Extensions.DependencyInjection.IHttpClientBuilder,System.Action<Microsoft.Extensions.Http.HttpMessageHandlerBuilder>);Argument[0];ReturnValue;value;hq-generated |
+| Microsoft.Extensions.DependencyInjection;HttpClientBuilderExtensions;ConfigureHttpMessageHandlerBuilder;(Microsoft.Extensions.DependencyInjection.IHttpClientBuilder,System.Action<Microsoft.Extensions.Http.HttpMessageHandlerBuilder>);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.DependencyInjection;HttpClientBuilderExtensions;ConfigureHttpMessageHandlerBuilder;(Microsoft.Extensions.DependencyInjection.IHttpClientBuilder,System.Action<Microsoft.Extensions.Http.HttpMessageHandlerBuilder>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
+| Microsoft.Extensions.DependencyInjection;HttpClientBuilderExtensions;ConfigurePrimaryHttpMessageHandler;(Microsoft.Extensions.DependencyInjection.IHttpClientBuilder,System.Action<System.Net.Http.HttpMessageHandler,System.IServiceProvider>);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;HttpClientBuilderExtensions;ConfigurePrimaryHttpMessageHandler;(Microsoft.Extensions.DependencyInjection.IHttpClientBuilder,System.Action<System.Net.Http.HttpMessageHandler,System.IServiceProvider>);Argument[0];ReturnValue;value;hq-generated |
+| Microsoft.Extensions.DependencyInjection;HttpClientBuilderExtensions;ConfigurePrimaryHttpMessageHandler;(Microsoft.Extensions.DependencyInjection.IHttpClientBuilder,System.Action<System.Net.Http.HttpMessageHandler,System.IServiceProvider>);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.DependencyInjection;HttpClientBuilderExtensions;ConfigurePrimaryHttpMessageHandler;(Microsoft.Extensions.DependencyInjection.IHttpClientBuilder,System.Action<System.Net.Http.HttpMessageHandler,System.IServiceProvider>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
+| Microsoft.Extensions.DependencyInjection;HttpClientBuilderExtensions;ConfigurePrimaryHttpMessageHandler;(Microsoft.Extensions.DependencyInjection.IHttpClientBuilder,System.Func<System.IServiceProvider,System.Net.Http.HttpMessageHandler>);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;HttpClientBuilderExtensions;ConfigurePrimaryHttpMessageHandler;(Microsoft.Extensions.DependencyInjection.IHttpClientBuilder,System.Func<System.IServiceProvider,System.Net.Http.HttpMessageHandler>);Argument[0];ReturnValue;value;hq-generated |
+| Microsoft.Extensions.DependencyInjection;HttpClientBuilderExtensions;ConfigurePrimaryHttpMessageHandler;(Microsoft.Extensions.DependencyInjection.IHttpClientBuilder,System.Func<System.IServiceProvider,System.Net.Http.HttpMessageHandler>);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.DependencyInjection;HttpClientBuilderExtensions;ConfigurePrimaryHttpMessageHandler;(Microsoft.Extensions.DependencyInjection.IHttpClientBuilder,System.Func<System.IServiceProvider,System.Net.Http.HttpMessageHandler>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
+| Microsoft.Extensions.DependencyInjection;HttpClientBuilderExtensions;ConfigurePrimaryHttpMessageHandler;(Microsoft.Extensions.DependencyInjection.IHttpClientBuilder,System.Func<System.Net.Http.HttpMessageHandler>);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;HttpClientBuilderExtensions;ConfigurePrimaryHttpMessageHandler;(Microsoft.Extensions.DependencyInjection.IHttpClientBuilder,System.Func<System.Net.Http.HttpMessageHandler>);Argument[0];ReturnValue;value;hq-generated |
+| Microsoft.Extensions.DependencyInjection;HttpClientBuilderExtensions;ConfigurePrimaryHttpMessageHandler;(Microsoft.Extensions.DependencyInjection.IHttpClientBuilder,System.Func<System.Net.Http.HttpMessageHandler>);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.DependencyInjection;HttpClientBuilderExtensions;ConfigurePrimaryHttpMessageHandler;(Microsoft.Extensions.DependencyInjection.IHttpClientBuilder,System.Func<System.Net.Http.HttpMessageHandler>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
-| Microsoft.Extensions.DependencyInjection;HttpClientBuilderExtensions;ConfigurePrimaryHttpMessageHandler<THandler>;(Microsoft.Extensions.DependencyInjection.IHttpClientBuilder);Argument[0];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.DependencyInjection;HttpClientBuilderExtensions;RedactLoggedHeaders;(Microsoft.Extensions.DependencyInjection.IHttpClientBuilder,System.Collections.Generic.IEnumerable<System.String>);Argument[0];ReturnValue;taint;df-generated |
+| Microsoft.Extensions.DependencyInjection;HttpClientBuilderExtensions;ConfigurePrimaryHttpMessageHandler<THandler>;(Microsoft.Extensions.DependencyInjection.IHttpClientBuilder);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;HttpClientBuilderExtensions;RedactLoggedHeaders;(Microsoft.Extensions.DependencyInjection.IHttpClientBuilder,System.Collections.Generic.IEnumerable<System.String>);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;HttpClientBuilderExtensions;RedactLoggedHeaders;(Microsoft.Extensions.DependencyInjection.IHttpClientBuilder,System.Func<System.String,System.Boolean>);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;HttpClientBuilderExtensions;RedactLoggedHeaders;(Microsoft.Extensions.DependencyInjection.IHttpClientBuilder,System.Func<System.String,System.Boolean>);Argument[0];ReturnValue;value;hq-generated |
+| Microsoft.Extensions.DependencyInjection;HttpClientBuilderExtensions;RedactLoggedHeaders;(Microsoft.Extensions.DependencyInjection.IHttpClientBuilder,System.Func<System.String,System.Boolean>);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.DependencyInjection;HttpClientBuilderExtensions;RedactLoggedHeaders;(Microsoft.Extensions.DependencyInjection.IHttpClientBuilder,System.Func<System.String,System.Boolean>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
-| Microsoft.Extensions.DependencyInjection;HttpClientBuilderExtensions;RemoveAllLoggers;(Microsoft.Extensions.DependencyInjection.IHttpClientBuilder);Argument[0];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.DependencyInjection;HttpClientBuilderExtensions;SetHandlerLifetime;(Microsoft.Extensions.DependencyInjection.IHttpClientBuilder,System.TimeSpan);Argument[0];ReturnValue;taint;df-generated |
+| Microsoft.Extensions.DependencyInjection;HttpClientBuilderExtensions;RemoveAllLoggers;(Microsoft.Extensions.DependencyInjection.IHttpClientBuilder);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;HttpClientBuilderExtensions;SetHandlerLifetime;(Microsoft.Extensions.DependencyInjection.IHttpClientBuilder,System.TimeSpan);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;HttpClientBuilderExtensions;UseSocketsHttpHandler;(Microsoft.Extensions.DependencyInjection.IHttpClientBuilder,System.Action<Microsoft.Extensions.DependencyInjection.ISocketsHttpHandlerBuilder>);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;HttpClientBuilderExtensions;UseSocketsHttpHandler;(Microsoft.Extensions.DependencyInjection.IHttpClientBuilder,System.Action<Microsoft.Extensions.DependencyInjection.ISocketsHttpHandlerBuilder>);Argument[0];ReturnValue;value;hq-generated |
+| Microsoft.Extensions.DependencyInjection;HttpClientBuilderExtensions;UseSocketsHttpHandler;(Microsoft.Extensions.DependencyInjection.IHttpClientBuilder,System.Action<Microsoft.Extensions.DependencyInjection.ISocketsHttpHandlerBuilder>);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.DependencyInjection;HttpClientBuilderExtensions;UseSocketsHttpHandler;(Microsoft.Extensions.DependencyInjection.IHttpClientBuilder,System.Action<Microsoft.Extensions.DependencyInjection.ISocketsHttpHandlerBuilder>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
+| Microsoft.Extensions.DependencyInjection;HttpClientBuilderExtensions;UseSocketsHttpHandler;(Microsoft.Extensions.DependencyInjection.IHttpClientBuilder,System.Action<System.Net.Http.SocketsHttpHandler,System.IServiceProvider>);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;HttpClientBuilderExtensions;UseSocketsHttpHandler;(Microsoft.Extensions.DependencyInjection.IHttpClientBuilder,System.Action<System.Net.Http.SocketsHttpHandler,System.IServiceProvider>);Argument[0];ReturnValue;value;hq-generated |
+| Microsoft.Extensions.DependencyInjection;HttpClientBuilderExtensions;UseSocketsHttpHandler;(Microsoft.Extensions.DependencyInjection.IHttpClientBuilder,System.Action<System.Net.Http.SocketsHttpHandler,System.IServiceProvider>);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.DependencyInjection;HttpClientBuilderExtensions;UseSocketsHttpHandler;(Microsoft.Extensions.DependencyInjection.IHttpClientBuilder,System.Action<System.Net.Http.SocketsHttpHandler,System.IServiceProvider>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
-| Microsoft.Extensions.DependencyInjection;HttpClientFactoryServiceCollectionExtensions;AddHttpClient;(Microsoft.Extensions.DependencyInjection.IServiceCollection);Argument[0].Element;ReturnValue;taint;df-generated |
+| Microsoft.Extensions.DependencyInjection;HttpClientFactoryServiceCollectionExtensions;AddHttpClient;(Microsoft.Extensions.DependencyInjection.IServiceCollection);Argument[0];ReturnValue;value;dfc-generated |
 | Microsoft.Extensions.DependencyInjection;HttpClientFactoryServiceCollectionExtensions;AddHttpClient;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.String);Argument[0].Element;ReturnValue;taint;df-generated |
 | Microsoft.Extensions.DependencyInjection;HttpClientFactoryServiceCollectionExtensions;AddHttpClient;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.String);Argument[1];ReturnValue;taint;df-generated |
 | Microsoft.Extensions.DependencyInjection;HttpClientFactoryServiceCollectionExtensions;AddHttpClient;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.String,System.Action<System.IServiceProvider,System.Net.Http.HttpClient>);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
@@ -2050,12 +2084,14 @@ summary
 | Microsoft.Extensions.DependencyInjection;HttpClientFactoryServiceCollectionExtensions;AddHttpClient<TClient>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.String);Argument[1];ReturnValue;taint;df-generated |
 | Microsoft.Extensions.DependencyInjection;HttpClientFactoryServiceCollectionExtensions;AddHttpClient<TClient>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.String,System.Action<System.IServiceProvider,System.Net.Http.HttpClient>);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
 | Microsoft.Extensions.DependencyInjection;HttpClientFactoryServiceCollectionExtensions;AddHttpClient<TClient>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.String,System.Action<System.Net.Http.HttpClient>);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
+| Microsoft.Extensions.DependencyInjection;HttpClientFactoryServiceCollectionExtensions;ConfigureHttpClientDefaults;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Action<Microsoft.Extensions.DependencyInjection.IHttpClientBuilder>);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;HttpClientFactoryServiceCollectionExtensions;ConfigureHttpClientDefaults;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Action<Microsoft.Extensions.DependencyInjection.IHttpClientBuilder>);Argument[0];ReturnValue;value;hq-generated |
+| Microsoft.Extensions.DependencyInjection;HttpClientFactoryServiceCollectionExtensions;ConfigureHttpClientDefaults;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Action<Microsoft.Extensions.DependencyInjection.IHttpClientBuilder>);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.DependencyInjection;HttpClientFactoryServiceCollectionExtensions;ConfigureHttpClientDefaults;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Action<Microsoft.Extensions.DependencyInjection.IHttpClientBuilder>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
 | Microsoft.Extensions.DependencyInjection;HttpJsonServiceExtensions;ConfigureHttpJsonOptions;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Action<Microsoft.AspNetCore.Http.Json.JsonOptions>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
 | Microsoft.Extensions.DependencyInjection;HttpLoggingServicesExtensions;AddHttpLogging;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Action<Microsoft.AspNetCore.HttpLogging.HttpLoggingOptions>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
 | Microsoft.Extensions.DependencyInjection;HttpLoggingServicesExtensions;AddW3CLogging;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Action<Microsoft.AspNetCore.HttpLogging.W3CLoggerOptions>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
-| Microsoft.Extensions.DependencyInjection;IServiceScope;get_ServiceProvider;();Argument[this];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.DependencyInjection;IServiceScope;get_ServiceProvider;();Argument[this];ReturnValue;value;df-generated |
+| Microsoft.Extensions.DependencyInjection;IServiceScope;get_ServiceProvider;();Argument[this];ReturnValue;value;dfc-generated |
 | Microsoft.Extensions.DependencyInjection;IServiceScopeFactory;CreateScope;();Argument[this];ReturnValue;taint;df-generated |
 | Microsoft.Extensions.DependencyInjection;IdentityServiceCollectionExtensions;AddIdentity<TUser,TRole>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Action<Microsoft.AspNetCore.Identity.IdentityOptions>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
 | Microsoft.Extensions.DependencyInjection;IdentityServiceCollectionExtensions;AddIdentityApiEndpoints<TUser>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Action<Microsoft.AspNetCore.Identity.IdentityOptions>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
@@ -2064,13 +2100,25 @@ summary
 | Microsoft.Extensions.DependencyInjection;IdentityServiceCollectionExtensions;ConfigureExternalCookie;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Action<Microsoft.AspNetCore.Authentication.Cookies.CookieAuthenticationOptions>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
 | Microsoft.Extensions.DependencyInjection;JsonProtocolDependencyInjectionExtensions;AddJsonProtocol<TBuilder>;(TBuilder,System.Action<Microsoft.AspNetCore.SignalR.JsonHubProtocolOptions>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
 | Microsoft.Extensions.DependencyInjection;LocalizationServiceCollectionExtensions;AddLocalization;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Action<Microsoft.Extensions.Localization.LocalizationOptions>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
-| Microsoft.Extensions.DependencyInjection;LoggingServiceCollectionExtensions;AddLogging;(Microsoft.Extensions.DependencyInjection.IServiceCollection);Argument[0].Element;ReturnValue;taint;df-generated |
+| Microsoft.Extensions.DependencyInjection;LoggingServiceCollectionExtensions;AddLogging;(Microsoft.Extensions.DependencyInjection.IServiceCollection);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;LoggingServiceCollectionExtensions;AddLogging;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Action<Microsoft.Extensions.Logging.ILoggingBuilder>);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;LoggingServiceCollectionExtensions;AddLogging;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Action<Microsoft.Extensions.Logging.ILoggingBuilder>);Argument[0];ReturnValue;value;hq-generated |
+| Microsoft.Extensions.DependencyInjection;LoggingServiceCollectionExtensions;AddLogging;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Action<Microsoft.Extensions.Logging.ILoggingBuilder>);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.DependencyInjection;LoggingServiceCollectionExtensions;AddLogging;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Action<Microsoft.Extensions.Logging.ILoggingBuilder>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
-| Microsoft.Extensions.DependencyInjection;MemoryCacheServiceCollectionExtensions;AddDistributedMemoryCache;(Microsoft.Extensions.DependencyInjection.IServiceCollection);Argument[0].Element;ReturnValue;taint;df-generated |
+| Microsoft.Extensions.DependencyInjection;MemoryCacheServiceCollectionExtensions;AddDistributedMemoryCache;(Microsoft.Extensions.DependencyInjection.IServiceCollection);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;MemoryCacheServiceCollectionExtensions;AddDistributedMemoryCache;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Action<Microsoft.Extensions.Caching.Memory.MemoryDistributedCacheOptions>);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;MemoryCacheServiceCollectionExtensions;AddDistributedMemoryCache;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Action<Microsoft.Extensions.Caching.Memory.MemoryDistributedCacheOptions>);Argument[0];ReturnValue;value;hq-generated |
+| Microsoft.Extensions.DependencyInjection;MemoryCacheServiceCollectionExtensions;AddDistributedMemoryCache;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Action<Microsoft.Extensions.Caching.Memory.MemoryDistributedCacheOptions>);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.DependencyInjection;MemoryCacheServiceCollectionExtensions;AddDistributedMemoryCache;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Action<Microsoft.Extensions.Caching.Memory.MemoryDistributedCacheOptions>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
-| Microsoft.Extensions.DependencyInjection;MemoryCacheServiceCollectionExtensions;AddMemoryCache;(Microsoft.Extensions.DependencyInjection.IServiceCollection);Argument[0].Element;ReturnValue;taint;df-generated |
+| Microsoft.Extensions.DependencyInjection;MemoryCacheServiceCollectionExtensions;AddMemoryCache;(Microsoft.Extensions.DependencyInjection.IServiceCollection);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;MemoryCacheServiceCollectionExtensions;AddMemoryCache;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Action<Microsoft.Extensions.Caching.Memory.MemoryCacheOptions>);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;MemoryCacheServiceCollectionExtensions;AddMemoryCache;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Action<Microsoft.Extensions.Caching.Memory.MemoryCacheOptions>);Argument[0];ReturnValue;value;hq-generated |
+| Microsoft.Extensions.DependencyInjection;MemoryCacheServiceCollectionExtensions;AddMemoryCache;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Action<Microsoft.Extensions.Caching.Memory.MemoryCacheOptions>);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.DependencyInjection;MemoryCacheServiceCollectionExtensions;AddMemoryCache;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Action<Microsoft.Extensions.Caching.Memory.MemoryCacheOptions>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
-| Microsoft.Extensions.DependencyInjection;MetricsServiceExtensions;AddMetrics;(Microsoft.Extensions.DependencyInjection.IServiceCollection);Argument[0].Element;ReturnValue;taint;df-generated |
+| Microsoft.Extensions.DependencyInjection;MetricsServiceExtensions;AddMetrics;(Microsoft.Extensions.DependencyInjection.IServiceCollection);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;MetricsServiceExtensions;AddMetrics;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Action<Microsoft.Extensions.Diagnostics.Metrics.IMetricsBuilder>);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;MetricsServiceExtensions;AddMetrics;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Action<Microsoft.Extensions.Diagnostics.Metrics.IMetricsBuilder>);Argument[0];ReturnValue;value;hq-generated |
+| Microsoft.Extensions.DependencyInjection;MetricsServiceExtensions;AddMetrics;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Action<Microsoft.Extensions.Diagnostics.Metrics.IMetricsBuilder>);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.DependencyInjection;MetricsServiceExtensions;AddMetrics;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Action<Microsoft.Extensions.Diagnostics.Metrics.IMetricsBuilder>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
 | Microsoft.Extensions.DependencyInjection;MvcCoreMvcBuilderExtensions;AddFormatterMappings;(Microsoft.Extensions.DependencyInjection.IMvcBuilder,System.Action<Microsoft.AspNetCore.Mvc.Formatters.FormatterMappings>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
 | Microsoft.Extensions.DependencyInjection;MvcCoreMvcBuilderExtensions;AddJsonOptions;(Microsoft.Extensions.DependencyInjection.IMvcBuilder,System.Action<Microsoft.AspNetCore.Mvc.JsonOptions>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
@@ -2135,24 +2183,54 @@ summary
 | Microsoft.Extensions.DependencyInjection;OAuthExtensions;AddOAuth<TOptions,THandler>;(Microsoft.AspNetCore.Authentication.AuthenticationBuilder,System.String,System.String,System.Action<TOptions>);Argument[3];Argument[3].Parameter[delegate-self];value;hq-generated |
 | Microsoft.Extensions.DependencyInjection;ObjectFactory;BeginInvoke;(System.IServiceProvider,System.Object[],System.AsyncCallback,System.Object);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
 | Microsoft.Extensions.DependencyInjection;ObjectFactory<T>;BeginInvoke;(System.IServiceProvider,System.Object[],System.AsyncCallback,System.Object);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
-| Microsoft.Extensions.DependencyInjection;OptionsBuilderConfigurationExtensions;Bind<TOptions>;(Microsoft.Extensions.Options.OptionsBuilder<TOptions>,Microsoft.Extensions.Configuration.IConfiguration);Argument[0];ReturnValue;taint;df-generated |
+| Microsoft.Extensions.DependencyInjection;OptionsBuilderConfigurationExtensions;Bind<TOptions>;(Microsoft.Extensions.Options.OptionsBuilder<TOptions>,Microsoft.Extensions.Configuration.IConfiguration);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;OptionsBuilderConfigurationExtensions;Bind<TOptions>;(Microsoft.Extensions.Options.OptionsBuilder<TOptions>,Microsoft.Extensions.Configuration.IConfiguration,System.Action<Microsoft.Extensions.Configuration.BinderOptions>);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;OptionsBuilderConfigurationExtensions;Bind<TOptions>;(Microsoft.Extensions.Options.OptionsBuilder<TOptions>,Microsoft.Extensions.Configuration.IConfiguration,System.Action<Microsoft.Extensions.Configuration.BinderOptions>);Argument[0];ReturnValue;value;hq-generated |
+| Microsoft.Extensions.DependencyInjection;OptionsBuilderConfigurationExtensions;Bind<TOptions>;(Microsoft.Extensions.Options.OptionsBuilder<TOptions>,Microsoft.Extensions.Configuration.IConfiguration,System.Action<Microsoft.Extensions.Configuration.BinderOptions>);Argument[2];Argument[2].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.DependencyInjection;OptionsBuilderConfigurationExtensions;Bind<TOptions>;(Microsoft.Extensions.Options.OptionsBuilder<TOptions>,Microsoft.Extensions.Configuration.IConfiguration,System.Action<Microsoft.Extensions.Configuration.BinderOptions>);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
+| Microsoft.Extensions.DependencyInjection;OptionsBuilderConfigurationExtensions;BindConfiguration<TOptions>;(Microsoft.Extensions.Options.OptionsBuilder<TOptions>,System.String,System.Action<Microsoft.Extensions.Configuration.BinderOptions>);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;OptionsBuilderConfigurationExtensions;BindConfiguration<TOptions>;(Microsoft.Extensions.Options.OptionsBuilder<TOptions>,System.String,System.Action<Microsoft.Extensions.Configuration.BinderOptions>);Argument[0];ReturnValue;value;hq-generated |
+| Microsoft.Extensions.DependencyInjection;OptionsBuilderConfigurationExtensions;BindConfiguration<TOptions>;(Microsoft.Extensions.Options.OptionsBuilder<TOptions>,System.String,System.Action<Microsoft.Extensions.Configuration.BinderOptions>);Argument[2];Argument[2].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.DependencyInjection;OptionsBuilderConfigurationExtensions;BindConfiguration<TOptions>;(Microsoft.Extensions.Options.OptionsBuilder<TOptions>,System.String,System.Action<Microsoft.Extensions.Configuration.BinderOptions>);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
-| Microsoft.Extensions.DependencyInjection;OptionsBuilderDataAnnotationsExtensions;ValidateDataAnnotations<TOptions>;(Microsoft.Extensions.Options.OptionsBuilder<TOptions>);Argument[0];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.DependencyInjection;OptionsBuilderExtensions;ValidateOnStart<TOptions>;(Microsoft.Extensions.Options.OptionsBuilder<TOptions>);Argument[0];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.DependencyInjection;OptionsConfigurationServiceCollectionExtensions;Configure<TOptions>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,Microsoft.Extensions.Configuration.IConfiguration);Argument[0].Element;ReturnValue;taint;df-generated |
+| Microsoft.Extensions.DependencyInjection;OptionsBuilderDataAnnotationsExtensions;ValidateDataAnnotations<TOptions>;(Microsoft.Extensions.Options.OptionsBuilder<TOptions>);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;OptionsBuilderExtensions;ValidateOnStart<TOptions>;(Microsoft.Extensions.Options.OptionsBuilder<TOptions>);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;OptionsConfigurationServiceCollectionExtensions;Configure<TOptions>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,Microsoft.Extensions.Configuration.IConfiguration);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;OptionsConfigurationServiceCollectionExtensions;Configure<TOptions>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,Microsoft.Extensions.Configuration.IConfiguration,System.Action<Microsoft.Extensions.Configuration.BinderOptions>);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;OptionsConfigurationServiceCollectionExtensions;Configure<TOptions>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,Microsoft.Extensions.Configuration.IConfiguration,System.Action<Microsoft.Extensions.Configuration.BinderOptions>);Argument[0];ReturnValue;value;hq-generated |
+| Microsoft.Extensions.DependencyInjection;OptionsConfigurationServiceCollectionExtensions;Configure<TOptions>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,Microsoft.Extensions.Configuration.IConfiguration,System.Action<Microsoft.Extensions.Configuration.BinderOptions>);Argument[2];Argument[2].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.DependencyInjection;OptionsConfigurationServiceCollectionExtensions;Configure<TOptions>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,Microsoft.Extensions.Configuration.IConfiguration,System.Action<Microsoft.Extensions.Configuration.BinderOptions>);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
-| Microsoft.Extensions.DependencyInjection;OptionsConfigurationServiceCollectionExtensions;Configure<TOptions>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.String,Microsoft.Extensions.Configuration.IConfiguration);Argument[0].Element;ReturnValue;taint;df-generated |
+| Microsoft.Extensions.DependencyInjection;OptionsConfigurationServiceCollectionExtensions;Configure<TOptions>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.String,Microsoft.Extensions.Configuration.IConfiguration);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;OptionsConfigurationServiceCollectionExtensions;Configure<TOptions>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.String,Microsoft.Extensions.Configuration.IConfiguration,System.Action<Microsoft.Extensions.Configuration.BinderOptions>);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;OptionsConfigurationServiceCollectionExtensions;Configure<TOptions>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.String,Microsoft.Extensions.Configuration.IConfiguration,System.Action<Microsoft.Extensions.Configuration.BinderOptions>);Argument[0];ReturnValue;value;hq-generated |
+| Microsoft.Extensions.DependencyInjection;OptionsConfigurationServiceCollectionExtensions;Configure<TOptions>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.String,Microsoft.Extensions.Configuration.IConfiguration,System.Action<Microsoft.Extensions.Configuration.BinderOptions>);Argument[3];Argument[3].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.DependencyInjection;OptionsConfigurationServiceCollectionExtensions;Configure<TOptions>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.String,Microsoft.Extensions.Configuration.IConfiguration,System.Action<Microsoft.Extensions.Configuration.BinderOptions>);Argument[3];Argument[3].Parameter[delegate-self];value;hq-generated |
-| Microsoft.Extensions.DependencyInjection;OptionsServiceCollectionExtensions;AddOptions;(Microsoft.Extensions.DependencyInjection.IServiceCollection);Argument[0].Element;ReturnValue;taint;df-generated |
+| Microsoft.Extensions.DependencyInjection;OptionsServiceCollectionExtensions;AddOptions;(Microsoft.Extensions.DependencyInjection.IServiceCollection);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;OptionsServiceCollectionExtensions;Configure<TOptions>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Action<TOptions>);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;OptionsServiceCollectionExtensions;Configure<TOptions>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Action<TOptions>);Argument[0];ReturnValue;value;hq-generated |
+| Microsoft.Extensions.DependencyInjection;OptionsServiceCollectionExtensions;Configure<TOptions>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Action<TOptions>);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.DependencyInjection;OptionsServiceCollectionExtensions;Configure<TOptions>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Action<TOptions>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
+| Microsoft.Extensions.DependencyInjection;OptionsServiceCollectionExtensions;Configure<TOptions>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.String,System.Action<TOptions>);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;OptionsServiceCollectionExtensions;Configure<TOptions>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.String,System.Action<TOptions>);Argument[0];ReturnValue;value;hq-generated |
+| Microsoft.Extensions.DependencyInjection;OptionsServiceCollectionExtensions;Configure<TOptions>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.String,System.Action<TOptions>);Argument[2];Argument[2].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.DependencyInjection;OptionsServiceCollectionExtensions;Configure<TOptions>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.String,System.Action<TOptions>);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
+| Microsoft.Extensions.DependencyInjection;OptionsServiceCollectionExtensions;ConfigureAll<TOptions>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Action<TOptions>);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;OptionsServiceCollectionExtensions;ConfigureAll<TOptions>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Action<TOptions>);Argument[0];ReturnValue;value;hq-generated |
+| Microsoft.Extensions.DependencyInjection;OptionsServiceCollectionExtensions;ConfigureAll<TOptions>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Action<TOptions>);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.DependencyInjection;OptionsServiceCollectionExtensions;ConfigureAll<TOptions>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Action<TOptions>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
-| Microsoft.Extensions.DependencyInjection;OptionsServiceCollectionExtensions;ConfigureOptions;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Object);Argument[0].Element;ReturnValue;taint;df-generated |
-| Microsoft.Extensions.DependencyInjection;OptionsServiceCollectionExtensions;ConfigureOptions;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Type);Argument[0].Element;ReturnValue;taint;df-generated |
-| Microsoft.Extensions.DependencyInjection;OptionsServiceCollectionExtensions;ConfigureOptions<TConfigureOptions>;(Microsoft.Extensions.DependencyInjection.IServiceCollection);Argument[0].Element;ReturnValue;taint;df-generated |
+| Microsoft.Extensions.DependencyInjection;OptionsServiceCollectionExtensions;ConfigureOptions;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Object);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;OptionsServiceCollectionExtensions;ConfigureOptions;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Type);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;OptionsServiceCollectionExtensions;ConfigureOptions<TConfigureOptions>;(Microsoft.Extensions.DependencyInjection.IServiceCollection);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;OptionsServiceCollectionExtensions;PostConfigure<TOptions>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Action<TOptions>);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;OptionsServiceCollectionExtensions;PostConfigure<TOptions>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Action<TOptions>);Argument[0];ReturnValue;value;hq-generated |
+| Microsoft.Extensions.DependencyInjection;OptionsServiceCollectionExtensions;PostConfigure<TOptions>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Action<TOptions>);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.DependencyInjection;OptionsServiceCollectionExtensions;PostConfigure<TOptions>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Action<TOptions>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
+| Microsoft.Extensions.DependencyInjection;OptionsServiceCollectionExtensions;PostConfigure<TOptions>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.String,System.Action<TOptions>);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;OptionsServiceCollectionExtensions;PostConfigure<TOptions>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.String,System.Action<TOptions>);Argument[0];ReturnValue;value;hq-generated |
+| Microsoft.Extensions.DependencyInjection;OptionsServiceCollectionExtensions;PostConfigure<TOptions>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.String,System.Action<TOptions>);Argument[2];Argument[2].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.DependencyInjection;OptionsServiceCollectionExtensions;PostConfigure<TOptions>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.String,System.Action<TOptions>);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
+| Microsoft.Extensions.DependencyInjection;OptionsServiceCollectionExtensions;PostConfigureAll<TOptions>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Action<TOptions>);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;OptionsServiceCollectionExtensions;PostConfigureAll<TOptions>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Action<TOptions>);Argument[0];ReturnValue;value;hq-generated |
+| Microsoft.Extensions.DependencyInjection;OptionsServiceCollectionExtensions;PostConfigureAll<TOptions>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Action<TOptions>);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.DependencyInjection;OptionsServiceCollectionExtensions;PostConfigureAll<TOptions>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Action<TOptions>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
 | Microsoft.Extensions.DependencyInjection;OutputCacheConventionBuilderExtensions;CacheOutput<TBuilder>;(TBuilder,System.Action<Microsoft.AspNetCore.OutputCaching.OutputCachePolicyBuilder>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
 | Microsoft.Extensions.DependencyInjection;OutputCacheConventionBuilderExtensions;CacheOutput<TBuilder>;(TBuilder,System.Action<Microsoft.AspNetCore.OutputCaching.OutputCachePolicyBuilder>,System.Boolean);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
@@ -2178,98 +2256,219 @@ summary
 | Microsoft.Extensions.DependencyInjection;ServiceCollection;Insert;(System.Int32,Microsoft.Extensions.DependencyInjection.ServiceDescriptor);Argument[1];Argument[this].Element;value;manual |
 | Microsoft.Extensions.DependencyInjection;ServiceCollection;get_Item;(System.Int32);Argument[this].Element;ReturnValue;value;manual |
 | Microsoft.Extensions.DependencyInjection;ServiceCollection;set_Item;(System.Int32,Microsoft.Extensions.DependencyInjection.ServiceDescriptor);Argument[1];Argument[this].Element;value;manual |
-| Microsoft.Extensions.DependencyInjection;ServiceCollectionHostedServiceExtensions;AddHostedService<THostedService>;(Microsoft.Extensions.DependencyInjection.IServiceCollection);Argument[0].Element;ReturnValue;taint;df-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceCollectionHostedServiceExtensions;AddHostedService<THostedService>;(Microsoft.Extensions.DependencyInjection.IServiceCollection);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceCollectionHostedServiceExtensions;AddHostedService<THostedService>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Func<System.IServiceProvider,THostedService>);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceCollectionHostedServiceExtensions;AddHostedService<THostedService>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Func<System.IServiceProvider,THostedService>);Argument[0];ReturnValue;value;hq-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceCollectionHostedServiceExtensions;AddHostedService<THostedService>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Func<System.IServiceProvider,THostedService>);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.DependencyInjection;ServiceCollectionHostedServiceExtensions;AddHostedService<THostedService>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Func<System.IServiceProvider,THostedService>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
-| Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddKeyedScoped;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Type,System.Object);Argument[0].Element;ReturnValue;taint;df-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddKeyedScoped;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Type,System.Object);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddKeyedScoped;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Type,System.Object,System.Func<System.IServiceProvider,System.Object,System.Object>);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddKeyedScoped;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Type,System.Object,System.Func<System.IServiceProvider,System.Object,System.Object>);Argument[0];ReturnValue;value;hq-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddKeyedScoped;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Type,System.Object,System.Func<System.IServiceProvider,System.Object,System.Object>);Argument[3];Argument[3].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddKeyedScoped;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Type,System.Object,System.Func<System.IServiceProvider,System.Object,System.Object>);Argument[3];Argument[3].Parameter[delegate-self];value;hq-generated |
-| Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddKeyedScoped;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Type,System.Object,System.Type);Argument[0].Element;ReturnValue;taint;df-generated |
-| Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddKeyedScoped<TService,TImplementation>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Object);Argument[0].Element;ReturnValue;taint;df-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddKeyedScoped;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Type,System.Object,System.Type);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddKeyedScoped<TService,TImplementation>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Object);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddKeyedScoped<TService,TImplementation>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Object,System.Func<System.IServiceProvider,System.Object,TImplementation>);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddKeyedScoped<TService,TImplementation>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Object,System.Func<System.IServiceProvider,System.Object,TImplementation>);Argument[0];ReturnValue;value;hq-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddKeyedScoped<TService,TImplementation>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Object,System.Func<System.IServiceProvider,System.Object,TImplementation>);Argument[2];Argument[2].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddKeyedScoped<TService,TImplementation>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Object,System.Func<System.IServiceProvider,System.Object,TImplementation>);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
-| Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddKeyedScoped<TService>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Object);Argument[0].Element;ReturnValue;taint;df-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddKeyedScoped<TService>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Object);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddKeyedScoped<TService>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Object,System.Func<System.IServiceProvider,System.Object,TService>);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddKeyedScoped<TService>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Object,System.Func<System.IServiceProvider,System.Object,TService>);Argument[0];ReturnValue;value;hq-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddKeyedScoped<TService>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Object,System.Func<System.IServiceProvider,System.Object,TService>);Argument[2];Argument[2].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddKeyedScoped<TService>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Object,System.Func<System.IServiceProvider,System.Object,TService>);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
-| Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddKeyedSingleton;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Type,System.Object);Argument[0].Element;ReturnValue;taint;df-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddKeyedSingleton;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Type,System.Object);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddKeyedSingleton;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Type,System.Object,System.Func<System.IServiceProvider,System.Object,System.Object>);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddKeyedSingleton;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Type,System.Object,System.Func<System.IServiceProvider,System.Object,System.Object>);Argument[0];ReturnValue;value;hq-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddKeyedSingleton;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Type,System.Object,System.Func<System.IServiceProvider,System.Object,System.Object>);Argument[3];Argument[3].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddKeyedSingleton;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Type,System.Object,System.Func<System.IServiceProvider,System.Object,System.Object>);Argument[3];Argument[3].Parameter[delegate-self];value;hq-generated |
-| Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddKeyedSingleton;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Type,System.Object,System.Object);Argument[0].Element;ReturnValue;taint;df-generated |
-| Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddKeyedSingleton;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Type,System.Object,System.Object);Argument[3];Argument[0].Element;taint;df-generated |
-| Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddKeyedSingleton;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Type,System.Object,System.Object);Argument[3];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddKeyedSingleton;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Type,System.Object,System.Type);Argument[0].Element;ReturnValue;taint;df-generated |
-| Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddKeyedSingleton<TService,TImplementation>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Object);Argument[0].Element;ReturnValue;taint;df-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddKeyedSingleton;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Type,System.Object,System.Object);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddKeyedSingleton;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Type,System.Object,System.Type);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddKeyedSingleton<TService,TImplementation>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Object);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddKeyedSingleton<TService,TImplementation>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Object,System.Func<System.IServiceProvider,System.Object,TImplementation>);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddKeyedSingleton<TService,TImplementation>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Object,System.Func<System.IServiceProvider,System.Object,TImplementation>);Argument[0];ReturnValue;value;hq-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddKeyedSingleton<TService,TImplementation>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Object,System.Func<System.IServiceProvider,System.Object,TImplementation>);Argument[2];Argument[2].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddKeyedSingleton<TService,TImplementation>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Object,System.Func<System.IServiceProvider,System.Object,TImplementation>);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
-| Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddKeyedSingleton<TService>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Object);Argument[0].Element;ReturnValue;taint;df-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddKeyedSingleton<TService>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Object);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddKeyedSingleton<TService>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Object,System.Func<System.IServiceProvider,System.Object,TService>);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddKeyedSingleton<TService>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Object,System.Func<System.IServiceProvider,System.Object,TService>);Argument[0];ReturnValue;value;hq-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddKeyedSingleton<TService>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Object,System.Func<System.IServiceProvider,System.Object,TService>);Argument[2];Argument[2].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddKeyedSingleton<TService>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Object,System.Func<System.IServiceProvider,System.Object,TService>);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
-| Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddKeyedSingleton<TService>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Object,TService);Argument[0].Element;ReturnValue;taint;df-generated |
-| Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddKeyedSingleton<TService>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Object,TService);Argument[2];Argument[0].Element;taint;df-generated |
-| Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddKeyedSingleton<TService>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Object,TService);Argument[2];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddKeyedTransient;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Type,System.Object);Argument[0].Element;ReturnValue;taint;df-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddKeyedSingleton<TService>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Object,TService);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddKeyedTransient;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Type,System.Object);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddKeyedTransient;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Type,System.Object,System.Func<System.IServiceProvider,System.Object,System.Object>);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddKeyedTransient;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Type,System.Object,System.Func<System.IServiceProvider,System.Object,System.Object>);Argument[0];ReturnValue;value;hq-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddKeyedTransient;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Type,System.Object,System.Func<System.IServiceProvider,System.Object,System.Object>);Argument[3];Argument[3].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddKeyedTransient;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Type,System.Object,System.Func<System.IServiceProvider,System.Object,System.Object>);Argument[3];Argument[3].Parameter[delegate-self];value;hq-generated |
-| Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddKeyedTransient;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Type,System.Object,System.Type);Argument[0].Element;ReturnValue;taint;df-generated |
-| Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddKeyedTransient<TService,TImplementation>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Object);Argument[0].Element;ReturnValue;taint;df-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddKeyedTransient;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Type,System.Object,System.Type);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddKeyedTransient<TService,TImplementation>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Object);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddKeyedTransient<TService,TImplementation>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Object,System.Func<System.IServiceProvider,System.Object,TImplementation>);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddKeyedTransient<TService,TImplementation>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Object,System.Func<System.IServiceProvider,System.Object,TImplementation>);Argument[0];ReturnValue;value;hq-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddKeyedTransient<TService,TImplementation>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Object,System.Func<System.IServiceProvider,System.Object,TImplementation>);Argument[2];Argument[2].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddKeyedTransient<TService,TImplementation>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Object,System.Func<System.IServiceProvider,System.Object,TImplementation>);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
-| Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddKeyedTransient<TService>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Object);Argument[0].Element;ReturnValue;taint;df-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddKeyedTransient<TService>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Object);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddKeyedTransient<TService>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Object,System.Func<System.IServiceProvider,System.Object,TService>);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddKeyedTransient<TService>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Object,System.Func<System.IServiceProvider,System.Object,TService>);Argument[0];ReturnValue;value;hq-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddKeyedTransient<TService>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Object,System.Func<System.IServiceProvider,System.Object,TService>);Argument[2];Argument[2].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddKeyedTransient<TService>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Object,System.Func<System.IServiceProvider,System.Object,TService>);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
-| Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddScoped;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Type);Argument[0].Element;ReturnValue;taint;df-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddScoped;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Type);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddScoped;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Type,System.Func<System.IServiceProvider,System.Object>);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddScoped;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Type,System.Func<System.IServiceProvider,System.Object>);Argument[0];ReturnValue;value;hq-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddScoped;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Type,System.Func<System.IServiceProvider,System.Object>);Argument[2];Argument[2].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddScoped;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Type,System.Func<System.IServiceProvider,System.Object>);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
-| Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddScoped;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Type,System.Type);Argument[0].Element;ReturnValue;taint;df-generated |
-| Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddScoped<TService,TImplementation>;(Microsoft.Extensions.DependencyInjection.IServiceCollection);Argument[0].Element;ReturnValue;taint;df-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddScoped;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Type,System.Type);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddScoped<TService,TImplementation>;(Microsoft.Extensions.DependencyInjection.IServiceCollection);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddScoped<TService,TImplementation>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Func<System.IServiceProvider,TImplementation>);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddScoped<TService,TImplementation>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Func<System.IServiceProvider,TImplementation>);Argument[0];ReturnValue;value;hq-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddScoped<TService,TImplementation>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Func<System.IServiceProvider,TImplementation>);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddScoped<TService,TImplementation>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Func<System.IServiceProvider,TImplementation>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
-| Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddScoped<TService>;(Microsoft.Extensions.DependencyInjection.IServiceCollection);Argument[0].Element;ReturnValue;taint;df-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddScoped<TService>;(Microsoft.Extensions.DependencyInjection.IServiceCollection);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddScoped<TService>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Func<System.IServiceProvider,TService>);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddScoped<TService>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Func<System.IServiceProvider,TService>);Argument[0];ReturnValue;value;hq-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddScoped<TService>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Func<System.IServiceProvider,TService>);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddScoped<TService>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Func<System.IServiceProvider,TService>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
-| Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddSingleton;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Type);Argument[0].Element;ReturnValue;taint;df-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddSingleton;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Type);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddSingleton;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Type,System.Func<System.IServiceProvider,System.Object>);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddSingleton;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Type,System.Func<System.IServiceProvider,System.Object>);Argument[0];ReturnValue;value;hq-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddSingleton;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Type,System.Func<System.IServiceProvider,System.Object>);Argument[2];Argument[2].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddSingleton;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Type,System.Func<System.IServiceProvider,System.Object>);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
-| Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddSingleton;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Type,System.Object);Argument[0].Element;ReturnValue;taint;df-generated |
-| Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddSingleton;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Type,System.Type);Argument[0].Element;ReturnValue;taint;df-generated |
-| Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddSingleton<TService,TImplementation>;(Microsoft.Extensions.DependencyInjection.IServiceCollection);Argument[0].Element;ReturnValue;taint;df-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddSingleton;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Type,System.Object);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddSingleton;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Type,System.Type);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddSingleton<TService,TImplementation>;(Microsoft.Extensions.DependencyInjection.IServiceCollection);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddSingleton<TService,TImplementation>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Func<System.IServiceProvider,TImplementation>);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddSingleton<TService,TImplementation>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Func<System.IServiceProvider,TImplementation>);Argument[0];ReturnValue;value;hq-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddSingleton<TService,TImplementation>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Func<System.IServiceProvider,TImplementation>);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddSingleton<TService,TImplementation>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Func<System.IServiceProvider,TImplementation>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
-| Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddSingleton<TService>;(Microsoft.Extensions.DependencyInjection.IServiceCollection);Argument[0].Element;ReturnValue;taint;df-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddSingleton<TService>;(Microsoft.Extensions.DependencyInjection.IServiceCollection);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddSingleton<TService>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Func<System.IServiceProvider,TService>);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddSingleton<TService>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Func<System.IServiceProvider,TService>);Argument[0];ReturnValue;value;hq-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddSingleton<TService>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Func<System.IServiceProvider,TService>);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddSingleton<TService>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Func<System.IServiceProvider,TService>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
-| Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddSingleton<TService>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,TService);Argument[0].Element;ReturnValue;taint;df-generated |
-| Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddTransient;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Type);Argument[0].Element;ReturnValue;taint;df-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddSingleton<TService>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,TService);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddTransient;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Type);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddTransient;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Type,System.Func<System.IServiceProvider,System.Object>);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddTransient;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Type,System.Func<System.IServiceProvider,System.Object>);Argument[0];ReturnValue;value;hq-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddTransient;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Type,System.Func<System.IServiceProvider,System.Object>);Argument[2];Argument[2].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddTransient;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Type,System.Func<System.IServiceProvider,System.Object>);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
-| Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddTransient;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Type,System.Type);Argument[0].Element;ReturnValue;taint;df-generated |
-| Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddTransient<TService,TImplementation>;(Microsoft.Extensions.DependencyInjection.IServiceCollection);Argument[0].Element;ReturnValue;taint;df-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddTransient;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Type,System.Type);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddTransient<TService,TImplementation>;(Microsoft.Extensions.DependencyInjection.IServiceCollection);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddTransient<TService,TImplementation>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Func<System.IServiceProvider,TImplementation>);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddTransient<TService,TImplementation>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Func<System.IServiceProvider,TImplementation>);Argument[0];ReturnValue;value;hq-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddTransient<TService,TImplementation>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Func<System.IServiceProvider,TImplementation>);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddTransient<TService,TImplementation>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Func<System.IServiceProvider,TImplementation>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
-| Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddTransient<TService>;(Microsoft.Extensions.DependencyInjection.IServiceCollection);Argument[0].Element;ReturnValue;taint;df-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddTransient<TService>;(Microsoft.Extensions.DependencyInjection.IServiceCollection);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddTransient<TService>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Func<System.IServiceProvider,TService>);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddTransient<TService>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Func<System.IServiceProvider,TService>);Argument[0];ReturnValue;value;hq-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddTransient<TService>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Func<System.IServiceProvider,TService>);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddTransient<TService>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Func<System.IServiceProvider,TService>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceDescriptor;Describe;(System.Type,System.Func<System.IServiceProvider,System.Object>,Microsoft.Extensions.DependencyInjection.ServiceLifetime);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.DependencyInjection;ServiceDescriptor;Describe;(System.Type,System.Func<System.IServiceProvider,System.Object>,Microsoft.Extensions.DependencyInjection.ServiceLifetime);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceDescriptor;Describe;(System.Type,System.Func<System.IServiceProvider,System.Object>,Microsoft.Extensions.DependencyInjection.ServiceLifetime);Argument[1];ReturnValue.SyntheticField[Microsoft.Extensions.DependencyInjection.ServiceDescriptor._implementationFactory];value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceDescriptor;Describe;(System.Type,System.Func<System.IServiceProvider,System.Object>,Microsoft.Extensions.DependencyInjection.ServiceLifetime);Argument[1];ReturnValue.SyntheticField[Microsoft.Extensions.DependencyInjection.ServiceDescriptor._implementationFactory];value;hq-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceDescriptor;DescribeKeyed;(System.Type,System.Object,System.Func<System.IServiceProvider,System.Object,System.Object>,Microsoft.Extensions.DependencyInjection.ServiceLifetime);Argument[2];Argument[2].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.DependencyInjection;ServiceDescriptor;DescribeKeyed;(System.Type,System.Object,System.Func<System.IServiceProvider,System.Object,System.Object>,Microsoft.Extensions.DependencyInjection.ServiceLifetime);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceDescriptor;DescribeKeyed;(System.Type,System.Object,System.Func<System.IServiceProvider,System.Object,System.Object>,Microsoft.Extensions.DependencyInjection.ServiceLifetime);Argument[2];ReturnValue.SyntheticField[Microsoft.Extensions.DependencyInjection.ServiceDescriptor._implementationFactory];value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceDescriptor;DescribeKeyed;(System.Type,System.Object,System.Func<System.IServiceProvider,System.Object,System.Object>,Microsoft.Extensions.DependencyInjection.ServiceLifetime);Argument[2];ReturnValue.SyntheticField[Microsoft.Extensions.DependencyInjection.ServiceDescriptor._implementationFactory];value;hq-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceDescriptor;KeyedScoped;(System.Type,System.Object,System.Func<System.IServiceProvider,System.Object,System.Object>);Argument[2];Argument[2].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.DependencyInjection;ServiceDescriptor;KeyedScoped;(System.Type,System.Object,System.Func<System.IServiceProvider,System.Object,System.Object>);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceDescriptor;KeyedScoped;(System.Type,System.Object,System.Func<System.IServiceProvider,System.Object,System.Object>);Argument[2];ReturnValue.SyntheticField[Microsoft.Extensions.DependencyInjection.ServiceDescriptor._implementationFactory];value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceDescriptor;KeyedScoped;(System.Type,System.Object,System.Func<System.IServiceProvider,System.Object,System.Object>);Argument[2];ReturnValue.SyntheticField[Microsoft.Extensions.DependencyInjection.ServiceDescriptor._implementationFactory];value;hq-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceDescriptor;KeyedScoped<TService,TImplementation>;(System.Object,System.Func<System.IServiceProvider,System.Object,TImplementation>);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.DependencyInjection;ServiceDescriptor;KeyedScoped<TService,TImplementation>;(System.Object,System.Func<System.IServiceProvider,System.Object,TImplementation>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceDescriptor;KeyedScoped<TService,TImplementation>;(System.Object,System.Func<System.IServiceProvider,System.Object,TImplementation>);Argument[1];ReturnValue.SyntheticField[Microsoft.Extensions.DependencyInjection.ServiceDescriptor._implementationFactory];value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceDescriptor;KeyedScoped<TService,TImplementation>;(System.Object,System.Func<System.IServiceProvider,System.Object,TImplementation>);Argument[1];ReturnValue.SyntheticField[Microsoft.Extensions.DependencyInjection.ServiceDescriptor._implementationFactory];value;hq-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceDescriptor;KeyedScoped<TService>;(System.Object,System.Func<System.IServiceProvider,System.Object,TService>);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.DependencyInjection;ServiceDescriptor;KeyedScoped<TService>;(System.Object,System.Func<System.IServiceProvider,System.Object,TService>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceDescriptor;KeyedScoped<TService>;(System.Object,System.Func<System.IServiceProvider,System.Object,TService>);Argument[1];ReturnValue.SyntheticField[Microsoft.Extensions.DependencyInjection.ServiceDescriptor._implementationFactory];value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceDescriptor;KeyedScoped<TService>;(System.Object,System.Func<System.IServiceProvider,System.Object,TService>);Argument[1];ReturnValue.SyntheticField[Microsoft.Extensions.DependencyInjection.ServiceDescriptor._implementationFactory];value;hq-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceDescriptor;KeyedSingleton;(System.Type,System.Object,System.Func<System.IServiceProvider,System.Object,System.Object>);Argument[2];Argument[2].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.DependencyInjection;ServiceDescriptor;KeyedSingleton;(System.Type,System.Object,System.Func<System.IServiceProvider,System.Object,System.Object>);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
-| Microsoft.Extensions.DependencyInjection;ServiceDescriptor;KeyedSingleton;(System.Type,System.Object,System.Object);Argument[2];ReturnValue;taint;df-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceDescriptor;KeyedSingleton;(System.Type,System.Object,System.Func<System.IServiceProvider,System.Object,System.Object>);Argument[2];ReturnValue.SyntheticField[Microsoft.Extensions.DependencyInjection.ServiceDescriptor._implementationFactory];value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceDescriptor;KeyedSingleton;(System.Type,System.Object,System.Func<System.IServiceProvider,System.Object,System.Object>);Argument[2];ReturnValue.SyntheticField[Microsoft.Extensions.DependencyInjection.ServiceDescriptor._implementationFactory];value;hq-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceDescriptor;KeyedSingleton;(System.Type,System.Object,System.Object);Argument[2];ReturnValue.SyntheticField[Microsoft.Extensions.DependencyInjection.ServiceDescriptor._implementationInstance];value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceDescriptor;KeyedSingleton<TService,TImplementation>;(System.Object,System.Func<System.IServiceProvider,System.Object,TImplementation>);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.DependencyInjection;ServiceDescriptor;KeyedSingleton<TService,TImplementation>;(System.Object,System.Func<System.IServiceProvider,System.Object,TImplementation>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceDescriptor;KeyedSingleton<TService,TImplementation>;(System.Object,System.Func<System.IServiceProvider,System.Object,TImplementation>);Argument[1];ReturnValue.SyntheticField[Microsoft.Extensions.DependencyInjection.ServiceDescriptor._implementationFactory];value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceDescriptor;KeyedSingleton<TService,TImplementation>;(System.Object,System.Func<System.IServiceProvider,System.Object,TImplementation>);Argument[1];ReturnValue.SyntheticField[Microsoft.Extensions.DependencyInjection.ServiceDescriptor._implementationFactory];value;hq-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceDescriptor;KeyedSingleton<TService>;(System.Object,System.Func<System.IServiceProvider,System.Object,TService>);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.DependencyInjection;ServiceDescriptor;KeyedSingleton<TService>;(System.Object,System.Func<System.IServiceProvider,System.Object,TService>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
-| Microsoft.Extensions.DependencyInjection;ServiceDescriptor;KeyedSingleton<TService>;(System.Object,TService);Argument[1];ReturnValue;taint;df-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceDescriptor;KeyedSingleton<TService>;(System.Object,System.Func<System.IServiceProvider,System.Object,TService>);Argument[1];ReturnValue.SyntheticField[Microsoft.Extensions.DependencyInjection.ServiceDescriptor._implementationFactory];value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceDescriptor;KeyedSingleton<TService>;(System.Object,System.Func<System.IServiceProvider,System.Object,TService>);Argument[1];ReturnValue.SyntheticField[Microsoft.Extensions.DependencyInjection.ServiceDescriptor._implementationFactory];value;hq-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceDescriptor;KeyedSingleton<TService>;(System.Object,TService);Argument[1];ReturnValue.SyntheticField[Microsoft.Extensions.DependencyInjection.ServiceDescriptor._implementationInstance];value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceDescriptor;KeyedTransient;(System.Type,System.Object,System.Func<System.IServiceProvider,System.Object,System.Object>);Argument[2];Argument[2].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.DependencyInjection;ServiceDescriptor;KeyedTransient;(System.Type,System.Object,System.Func<System.IServiceProvider,System.Object,System.Object>);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceDescriptor;KeyedTransient;(System.Type,System.Object,System.Func<System.IServiceProvider,System.Object,System.Object>);Argument[2];ReturnValue.SyntheticField[Microsoft.Extensions.DependencyInjection.ServiceDescriptor._implementationFactory];value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceDescriptor;KeyedTransient;(System.Type,System.Object,System.Func<System.IServiceProvider,System.Object,System.Object>);Argument[2];ReturnValue.SyntheticField[Microsoft.Extensions.DependencyInjection.ServiceDescriptor._implementationFactory];value;hq-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceDescriptor;KeyedTransient<TService,TImplementation>;(System.Object,System.Func<System.IServiceProvider,System.Object,TImplementation>);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.DependencyInjection;ServiceDescriptor;KeyedTransient<TService,TImplementation>;(System.Object,System.Func<System.IServiceProvider,System.Object,TImplementation>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceDescriptor;KeyedTransient<TService,TImplementation>;(System.Object,System.Func<System.IServiceProvider,System.Object,TImplementation>);Argument[1];ReturnValue.SyntheticField[Microsoft.Extensions.DependencyInjection.ServiceDescriptor._implementationFactory];value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceDescriptor;KeyedTransient<TService,TImplementation>;(System.Object,System.Func<System.IServiceProvider,System.Object,TImplementation>);Argument[1];ReturnValue.SyntheticField[Microsoft.Extensions.DependencyInjection.ServiceDescriptor._implementationFactory];value;hq-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceDescriptor;KeyedTransient<TService>;(System.Object,System.Func<System.IServiceProvider,System.Object,TService>);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.DependencyInjection;ServiceDescriptor;KeyedTransient<TService>;(System.Object,System.Func<System.IServiceProvider,System.Object,TService>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceDescriptor;KeyedTransient<TService>;(System.Object,System.Func<System.IServiceProvider,System.Object,TService>);Argument[1];ReturnValue.SyntheticField[Microsoft.Extensions.DependencyInjection.ServiceDescriptor._implementationFactory];value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceDescriptor;KeyedTransient<TService>;(System.Object,System.Func<System.IServiceProvider,System.Object,TService>);Argument[1];ReturnValue.SyntheticField[Microsoft.Extensions.DependencyInjection.ServiceDescriptor._implementationFactory];value;hq-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceDescriptor;Scoped;(System.Type,System.Func<System.IServiceProvider,System.Object>);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.DependencyInjection;ServiceDescriptor;Scoped;(System.Type,System.Func<System.IServiceProvider,System.Object>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceDescriptor;Scoped;(System.Type,System.Func<System.IServiceProvider,System.Object>);Argument[1];ReturnValue.SyntheticField[Microsoft.Extensions.DependencyInjection.ServiceDescriptor._implementationFactory];value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceDescriptor;Scoped;(System.Type,System.Func<System.IServiceProvider,System.Object>);Argument[1];ReturnValue.SyntheticField[Microsoft.Extensions.DependencyInjection.ServiceDescriptor._implementationFactory];value;hq-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceDescriptor;Scoped<TService,TImplementation>;(System.Func<System.IServiceProvider,TImplementation>);Argument[0];Argument[0].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.DependencyInjection;ServiceDescriptor;Scoped<TService,TImplementation>;(System.Func<System.IServiceProvider,TImplementation>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceDescriptor;Scoped<TService,TImplementation>;(System.Func<System.IServiceProvider,TImplementation>);Argument[0];ReturnValue.SyntheticField[Microsoft.Extensions.DependencyInjection.ServiceDescriptor._implementationFactory];value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceDescriptor;Scoped<TService,TImplementation>;(System.Func<System.IServiceProvider,TImplementation>);Argument[0];ReturnValue.SyntheticField[Microsoft.Extensions.DependencyInjection.ServiceDescriptor._implementationFactory];value;hq-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceDescriptor;Scoped<TService>;(System.Func<System.IServiceProvider,TService>);Argument[0];Argument[0].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.DependencyInjection;ServiceDescriptor;Scoped<TService>;(System.Func<System.IServiceProvider,TService>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceDescriptor;Scoped<TService>;(System.Func<System.IServiceProvider,TService>);Argument[0];ReturnValue.SyntheticField[Microsoft.Extensions.DependencyInjection.ServiceDescriptor._implementationFactory];value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceDescriptor;Scoped<TService>;(System.Func<System.IServiceProvider,TService>);Argument[0];ReturnValue.SyntheticField[Microsoft.Extensions.DependencyInjection.ServiceDescriptor._implementationFactory];value;hq-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceDescriptor;ServiceDescriptor;(System.Type,System.Func<System.IServiceProvider,System.Object>,Microsoft.Extensions.DependencyInjection.ServiceLifetime);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.DependencyInjection;ServiceDescriptor;ServiceDescriptor;(System.Type,System.Func<System.IServiceProvider,System.Object>,Microsoft.Extensions.DependencyInjection.ServiceLifetime);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceDescriptor;ServiceDescriptor;(System.Type,System.Func<System.IServiceProvider,System.Object>,Microsoft.Extensions.DependencyInjection.ServiceLifetime);Argument[1];Argument[this].SyntheticField[Microsoft.Extensions.DependencyInjection.ServiceDescriptor._implementationFactory];value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceDescriptor;ServiceDescriptor;(System.Type,System.Func<System.IServiceProvider,System.Object>,Microsoft.Extensions.DependencyInjection.ServiceLifetime);Argument[1];Argument[this].SyntheticField[Microsoft.Extensions.DependencyInjection.ServiceDescriptor._implementationFactory];value;hq-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceDescriptor;ServiceDescriptor;(System.Type,System.Object,System.Func<System.IServiceProvider,System.Object,System.Object>,Microsoft.Extensions.DependencyInjection.ServiceLifetime);Argument[2];Argument[2].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.DependencyInjection;ServiceDescriptor;ServiceDescriptor;(System.Type,System.Object,System.Func<System.IServiceProvider,System.Object,System.Object>,Microsoft.Extensions.DependencyInjection.ServiceLifetime);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
-| Microsoft.Extensions.DependencyInjection;ServiceDescriptor;ServiceDescriptor;(System.Type,System.Object,System.Object);Argument[2];Argument[this];taint;df-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceDescriptor;ServiceDescriptor;(System.Type,System.Object,System.Func<System.IServiceProvider,System.Object,System.Object>,Microsoft.Extensions.DependencyInjection.ServiceLifetime);Argument[2];Argument[this].SyntheticField[Microsoft.Extensions.DependencyInjection.ServiceDescriptor._implementationFactory];value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceDescriptor;ServiceDescriptor;(System.Type,System.Object,System.Func<System.IServiceProvider,System.Object,System.Object>,Microsoft.Extensions.DependencyInjection.ServiceLifetime);Argument[2];Argument[this].SyntheticField[Microsoft.Extensions.DependencyInjection.ServiceDescriptor._implementationFactory];value;hq-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceDescriptor;ServiceDescriptor;(System.Type,System.Object,System.Object);Argument[2];Argument[this].SyntheticField[Microsoft.Extensions.DependencyInjection.ServiceDescriptor._implementationInstance];value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceDescriptor;Singleton;(System.Type,System.Func<System.IServiceProvider,System.Object>);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.DependencyInjection;ServiceDescriptor;Singleton;(System.Type,System.Func<System.IServiceProvider,System.Object>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceDescriptor;Singleton;(System.Type,System.Func<System.IServiceProvider,System.Object>);Argument[1];ReturnValue.SyntheticField[Microsoft.Extensions.DependencyInjection.ServiceDescriptor._implementationFactory];value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceDescriptor;Singleton;(System.Type,System.Func<System.IServiceProvider,System.Object>);Argument[1];ReturnValue.SyntheticField[Microsoft.Extensions.DependencyInjection.ServiceDescriptor._implementationFactory];value;hq-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceDescriptor;Singleton<TService,TImplementation>;(System.Func<System.IServiceProvider,TImplementation>);Argument[0];Argument[0].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.DependencyInjection;ServiceDescriptor;Singleton<TService,TImplementation>;(System.Func<System.IServiceProvider,TImplementation>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceDescriptor;Singleton<TService,TImplementation>;(System.Func<System.IServiceProvider,TImplementation>);Argument[0];ReturnValue.SyntheticField[Microsoft.Extensions.DependencyInjection.ServiceDescriptor._implementationFactory];value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceDescriptor;Singleton<TService,TImplementation>;(System.Func<System.IServiceProvider,TImplementation>);Argument[0];ReturnValue.SyntheticField[Microsoft.Extensions.DependencyInjection.ServiceDescriptor._implementationFactory];value;hq-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceDescriptor;Singleton<TService>;(System.Func<System.IServiceProvider,TService>);Argument[0];Argument[0].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.DependencyInjection;ServiceDescriptor;Singleton<TService>;(System.Func<System.IServiceProvider,TService>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceDescriptor;Singleton<TService>;(System.Func<System.IServiceProvider,TService>);Argument[0];ReturnValue.SyntheticField[Microsoft.Extensions.DependencyInjection.ServiceDescriptor._implementationFactory];value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceDescriptor;Singleton<TService>;(System.Func<System.IServiceProvider,TService>);Argument[0];ReturnValue.SyntheticField[Microsoft.Extensions.DependencyInjection.ServiceDescriptor._implementationFactory];value;hq-generated |
 | Microsoft.Extensions.DependencyInjection;ServiceDescriptor;ToString;();Argument[this];ReturnValue;taint;df-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceDescriptor;Transient;(System.Type,System.Func<System.IServiceProvider,System.Object>);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.DependencyInjection;ServiceDescriptor;Transient;(System.Type,System.Func<System.IServiceProvider,System.Object>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceDescriptor;Transient;(System.Type,System.Func<System.IServiceProvider,System.Object>);Argument[1];ReturnValue.SyntheticField[Microsoft.Extensions.DependencyInjection.ServiceDescriptor._implementationFactory];value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceDescriptor;Transient;(System.Type,System.Func<System.IServiceProvider,System.Object>);Argument[1];ReturnValue.SyntheticField[Microsoft.Extensions.DependencyInjection.ServiceDescriptor._implementationFactory];value;hq-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceDescriptor;Transient<TService,TImplementation>;(System.Func<System.IServiceProvider,TImplementation>);Argument[0];Argument[0].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.DependencyInjection;ServiceDescriptor;Transient<TService,TImplementation>;(System.Func<System.IServiceProvider,TImplementation>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceDescriptor;Transient<TService,TImplementation>;(System.Func<System.IServiceProvider,TImplementation>);Argument[0];ReturnValue.SyntheticField[Microsoft.Extensions.DependencyInjection.ServiceDescriptor._implementationFactory];value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceDescriptor;Transient<TService,TImplementation>;(System.Func<System.IServiceProvider,TImplementation>);Argument[0];ReturnValue.SyntheticField[Microsoft.Extensions.DependencyInjection.ServiceDescriptor._implementationFactory];value;hq-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceDescriptor;Transient<TService>;(System.Func<System.IServiceProvider,TService>);Argument[0];Argument[0].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.DependencyInjection;ServiceDescriptor;Transient<TService>;(System.Func<System.IServiceProvider,TService>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
-| Microsoft.Extensions.DependencyInjection;ServiceDescriptor;get_ImplementationFactory;();Argument[this];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.DependencyInjection;ServiceDescriptor;get_ImplementationInstance;();Argument[this];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.DependencyInjection;ServiceDescriptor;get_KeyedImplementationFactory;();Argument[this];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.DependencyInjection;ServiceDescriptor;get_KeyedImplementationInstance;();Argument[this];ReturnValue;taint;df-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceDescriptor;Transient<TService>;(System.Func<System.IServiceProvider,TService>);Argument[0];ReturnValue.SyntheticField[Microsoft.Extensions.DependencyInjection.ServiceDescriptor._implementationFactory];value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceDescriptor;Transient<TService>;(System.Func<System.IServiceProvider,TService>);Argument[0];ReturnValue.SyntheticField[Microsoft.Extensions.DependencyInjection.ServiceDescriptor._implementationFactory];value;hq-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceDescriptor;get_ImplementationFactory;();Argument[this].SyntheticField[Microsoft.Extensions.DependencyInjection.ServiceDescriptor._implementationFactory];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceDescriptor;get_ImplementationInstance;();Argument[this].SyntheticField[Microsoft.Extensions.DependencyInjection.ServiceDescriptor._implementationInstance];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceDescriptor;get_KeyedImplementationFactory;();Argument[this].SyntheticField[Microsoft.Extensions.DependencyInjection.ServiceDescriptor._implementationFactory];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceDescriptor;get_KeyedImplementationInstance;();Argument[this].SyntheticField[Microsoft.Extensions.DependencyInjection.ServiceDescriptor._implementationInstance];ReturnValue;value;dfc-generated |
 | Microsoft.Extensions.DependencyInjection;ServiceProvider;DisposeAsync;();Argument[this];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.DependencyInjection;ServiceProvider;GetService;(System.Type);Argument[this];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.DependencyInjection;ServiceProviderServiceExtensions;CreateAsyncScope;(Microsoft.Extensions.DependencyInjection.IServiceScopeFactory);Argument[0];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.DependencyInjection;ServiceProviderServiceExtensions;GetRequiredService;(System.IServiceProvider,System.Type);Argument[0];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.DependencyInjection;ServiceProviderServiceExtensions;GetRequiredService<T>;(System.IServiceProvider);Argument[0];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.DependencyInjection;ServiceProviderServiceExtensions;GetService<T>;(System.IServiceProvider);Argument[0];ReturnValue;taint;df-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceProvider;GetService;(System.Type);Argument[this];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceProviderServiceExtensions;GetRequiredService;(System.IServiceProvider,System.Type);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceProviderServiceExtensions;GetRequiredService<T>;(System.IServiceProvider);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceProviderServiceExtensions;GetService<T>;(System.IServiceProvider);Argument[0];ReturnValue;value;dfc-generated |
 | Microsoft.Extensions.DependencyInjection;SessionServiceCollectionExtensions;AddSession;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Action<Microsoft.AspNetCore.Builder.SessionOptions>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
 | Microsoft.Extensions.DependencyInjection;SignalRDependencyInjectionExtensions;AddHubOptions<THub>;(Microsoft.AspNetCore.SignalR.ISignalRServerBuilder,System.Action<Microsoft.AspNetCore.SignalR.HubOptions<THub>>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
 | Microsoft.Extensions.DependencyInjection;SignalRDependencyInjectionExtensions;AddSignalR;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Action<Microsoft.AspNetCore.SignalR.HubOptions>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
-| Microsoft.Extensions.DependencyInjection;SocketsHttpHandlerBuilderExtensions;Configure;(Microsoft.Extensions.DependencyInjection.ISocketsHttpHandlerBuilder,Microsoft.Extensions.Configuration.IConfiguration);Argument[0];ReturnValue;taint;df-generated |
+| Microsoft.Extensions.DependencyInjection;SocketsHttpHandlerBuilderExtensions;Configure;(Microsoft.Extensions.DependencyInjection.ISocketsHttpHandlerBuilder,Microsoft.Extensions.Configuration.IConfiguration);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;SocketsHttpHandlerBuilderExtensions;Configure;(Microsoft.Extensions.DependencyInjection.ISocketsHttpHandlerBuilder,System.Action<System.Net.Http.SocketsHttpHandler,System.IServiceProvider>);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;SocketsHttpHandlerBuilderExtensions;Configure;(Microsoft.Extensions.DependencyInjection.ISocketsHttpHandlerBuilder,System.Action<System.Net.Http.SocketsHttpHandler,System.IServiceProvider>);Argument[0];ReturnValue;value;hq-generated |
+| Microsoft.Extensions.DependencyInjection;SocketsHttpHandlerBuilderExtensions;Configure;(Microsoft.Extensions.DependencyInjection.ISocketsHttpHandlerBuilder,System.Action<System.Net.Http.SocketsHttpHandler,System.IServiceProvider>);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.DependencyInjection;SocketsHttpHandlerBuilderExtensions;Configure;(Microsoft.Extensions.DependencyInjection.ISocketsHttpHandlerBuilder,System.Action<System.Net.Http.SocketsHttpHandler,System.IServiceProvider>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
 | Microsoft.Extensions.DependencyInjection;TagHelperServicesExtensions;AddCacheTagHelperLimits;(Microsoft.Extensions.DependencyInjection.IMvcBuilder,System.Action<Microsoft.AspNetCore.Mvc.TagHelpers.CacheTagHelperOptions>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
 | Microsoft.Extensions.DependencyInjection;TagHelperServicesExtensions;AddCacheTagHelperLimits;(Microsoft.Extensions.DependencyInjection.IMvcCoreBuilder,System.Action<Microsoft.AspNetCore.Mvc.TagHelpers.CacheTagHelperOptions>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
@@ -2279,7 +2478,7 @@ summary
 | Microsoft.Extensions.Diagnostics.HealthChecks;HealthCheckRegistration;set_Factory;(System.Func<System.IServiceProvider,Microsoft.Extensions.Diagnostics.HealthChecks.IHealthCheck>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | Microsoft.Extensions.Diagnostics.HealthChecks;HealthCheckService;CheckHealthAsync;(System.Func<Microsoft.Extensions.Diagnostics.HealthChecks.HealthCheckRegistration,System.Boolean>,System.Threading.CancellationToken);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | Microsoft.Extensions.Diagnostics.Metrics;IMetricsListener;Initialize;(Microsoft.Extensions.Diagnostics.Metrics.IObservableInstrumentsSource);Argument[0];Argument[this];taint;df-generated |
-| Microsoft.Extensions.Diagnostics.Metrics;IMetricsListener;InstrumentPublished;(System.Diagnostics.Metrics.Instrument,System.Object);Argument[this];ReturnValue;taint;df-generated |
+| Microsoft.Extensions.Diagnostics.Metrics;IMetricsListener;InstrumentPublished;(System.Diagnostics.Metrics.Instrument,System.Object);Argument[this];ReturnValue;value;dfc-generated |
 | Microsoft.Extensions.Diagnostics.Metrics;MeasurementHandlers;set_ByteHandler;(System.Diagnostics.Metrics.MeasurementCallback<System.Byte>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | Microsoft.Extensions.Diagnostics.Metrics;MeasurementHandlers;set_DecimalHandler;(System.Diagnostics.Metrics.MeasurementCallback<System.Decimal>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | Microsoft.Extensions.Diagnostics.Metrics;MeasurementHandlers;set_DoubleHandler;(System.Diagnostics.Metrics.MeasurementCallback<System.Double>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
@@ -2287,104 +2486,95 @@ summary
 | Microsoft.Extensions.Diagnostics.Metrics;MeasurementHandlers;set_IntHandler;(System.Diagnostics.Metrics.MeasurementCallback<System.Int32>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | Microsoft.Extensions.Diagnostics.Metrics;MeasurementHandlers;set_LongHandler;(System.Diagnostics.Metrics.MeasurementCallback<System.Int64>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | Microsoft.Extensions.Diagnostics.Metrics;MeasurementHandlers;set_ShortHandler;(System.Diagnostics.Metrics.MeasurementCallback<System.Int16>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
-| Microsoft.Extensions.Diagnostics.Metrics;MetricsBuilderConfigurationExtensions;AddConfiguration;(Microsoft.Extensions.Diagnostics.Metrics.IMetricsBuilder,Microsoft.Extensions.Configuration.IConfiguration);Argument[0];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Diagnostics.Metrics;MetricsBuilderConsoleExtensions;AddDebugConsole;(Microsoft.Extensions.Diagnostics.Metrics.IMetricsBuilder);Argument[0];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Diagnostics.Metrics;MetricsBuilderExtensions;AddListener;(Microsoft.Extensions.Diagnostics.Metrics.IMetricsBuilder,Microsoft.Extensions.Diagnostics.Metrics.IMetricsListener);Argument[0];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Diagnostics.Metrics;MetricsBuilderExtensions;AddListener<T>;(Microsoft.Extensions.Diagnostics.Metrics.IMetricsBuilder);Argument[0];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Diagnostics.Metrics;MetricsBuilderExtensions;ClearListeners;(Microsoft.Extensions.Diagnostics.Metrics.IMetricsBuilder);Argument[0];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Diagnostics.Metrics;MetricsBuilderExtensions;DisableMetrics;(Microsoft.Extensions.Diagnostics.Metrics.IMetricsBuilder,System.String);Argument[0];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Diagnostics.Metrics;MetricsBuilderExtensions;DisableMetrics;(Microsoft.Extensions.Diagnostics.Metrics.IMetricsBuilder,System.String,System.String,System.String,Microsoft.Extensions.Diagnostics.Metrics.MeterScope);Argument[0];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Diagnostics.Metrics;MetricsBuilderExtensions;DisableMetrics;(Microsoft.Extensions.Diagnostics.Metrics.MetricsOptions,System.String);Argument[0];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Diagnostics.Metrics;MetricsBuilderExtensions;DisableMetrics;(Microsoft.Extensions.Diagnostics.Metrics.MetricsOptions,System.String,System.String,System.String,Microsoft.Extensions.Diagnostics.Metrics.MeterScope);Argument[0];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Diagnostics.Metrics;MetricsBuilderExtensions;EnableMetrics;(Microsoft.Extensions.Diagnostics.Metrics.IMetricsBuilder,System.String);Argument[0];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Diagnostics.Metrics;MetricsBuilderExtensions;EnableMetrics;(Microsoft.Extensions.Diagnostics.Metrics.IMetricsBuilder,System.String,System.String,System.String,Microsoft.Extensions.Diagnostics.Metrics.MeterScope);Argument[0];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Diagnostics.Metrics;MetricsBuilderExtensions;EnableMetrics;(Microsoft.Extensions.Diagnostics.Metrics.MetricsOptions,System.String);Argument[0];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Diagnostics.Metrics;MetricsBuilderExtensions;EnableMetrics;(Microsoft.Extensions.Diagnostics.Metrics.MetricsOptions,System.String,System.String,System.String,Microsoft.Extensions.Diagnostics.Metrics.MeterScope);Argument[0];ReturnValue;taint;df-generated |
+| Microsoft.Extensions.Diagnostics.Metrics;MetricsBuilderConfigurationExtensions;AddConfiguration;(Microsoft.Extensions.Diagnostics.Metrics.IMetricsBuilder,Microsoft.Extensions.Configuration.IConfiguration);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Diagnostics.Metrics;MetricsBuilderExtensions;AddListener;(Microsoft.Extensions.Diagnostics.Metrics.IMetricsBuilder,Microsoft.Extensions.Diagnostics.Metrics.IMetricsListener);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Diagnostics.Metrics;MetricsBuilderExtensions;AddListener<T>;(Microsoft.Extensions.Diagnostics.Metrics.IMetricsBuilder);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Diagnostics.Metrics;MetricsBuilderExtensions;ClearListeners;(Microsoft.Extensions.Diagnostics.Metrics.IMetricsBuilder);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Diagnostics.Metrics;MetricsBuilderExtensions;DisableMetrics;(Microsoft.Extensions.Diagnostics.Metrics.IMetricsBuilder,System.String);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Diagnostics.Metrics;MetricsBuilderExtensions;DisableMetrics;(Microsoft.Extensions.Diagnostics.Metrics.IMetricsBuilder,System.String,System.String,System.String,Microsoft.Extensions.Diagnostics.Metrics.MeterScope);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Diagnostics.Metrics;MetricsBuilderExtensions;DisableMetrics;(Microsoft.Extensions.Diagnostics.Metrics.MetricsOptions,System.String);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Diagnostics.Metrics;MetricsBuilderExtensions;DisableMetrics;(Microsoft.Extensions.Diagnostics.Metrics.MetricsOptions,System.String,System.String,System.String,Microsoft.Extensions.Diagnostics.Metrics.MeterScope);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Diagnostics.Metrics;MetricsBuilderExtensions;EnableMetrics;(Microsoft.Extensions.Diagnostics.Metrics.IMetricsBuilder,System.String);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Diagnostics.Metrics;MetricsBuilderExtensions;EnableMetrics;(Microsoft.Extensions.Diagnostics.Metrics.IMetricsBuilder,System.String,System.String,System.String,Microsoft.Extensions.Diagnostics.Metrics.MeterScope);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Diagnostics.Metrics;MetricsBuilderExtensions;EnableMetrics;(Microsoft.Extensions.Diagnostics.Metrics.MetricsOptions,System.String);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Diagnostics.Metrics;MetricsBuilderExtensions;EnableMetrics;(Microsoft.Extensions.Diagnostics.Metrics.MetricsOptions,System.String,System.String,System.String,Microsoft.Extensions.Diagnostics.Metrics.MeterScope);Argument[0];ReturnValue;value;dfc-generated |
 | Microsoft.Extensions.FileProviders.Composite;CompositeDirectoryContents;CompositeDirectoryContents;(System.Collections.Generic.IList<Microsoft.Extensions.FileProviders.IFileProvider>,System.String);Argument[0].Element;Argument[this];taint;df-generated |
 | Microsoft.Extensions.FileProviders.Composite;CompositeDirectoryContents;CompositeDirectoryContents;(System.Collections.Generic.IList<Microsoft.Extensions.FileProviders.IFileProvider>,System.String);Argument[1];Argument[this];taint;df-generated |
 | Microsoft.Extensions.FileProviders.Composite;CompositeDirectoryContents;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.Generic.IEnumerator`1.Current];value;manual |
 | Microsoft.Extensions.FileProviders.Composite;CompositeDirectoryContents;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.IEnumerator.Current];value;manual |
-| Microsoft.Extensions.FileProviders.Embedded;EmbeddedResourceFileInfo;CreateReadStream;();Argument[this];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.FileProviders.Embedded;EmbeddedResourceFileInfo;get_Name;();Argument[this];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.FileProviders.Embedded;EmbeddedResourceFileInfo;get_PhysicalPath;();Argument[this];ReturnValue;taint;df-generated |
 | Microsoft.Extensions.FileProviders.Internal;PhysicalDirectoryContents;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.Generic.IEnumerator`1.Current];value;manual |
 | Microsoft.Extensions.FileProviders.Internal;PhysicalDirectoryContents;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.IEnumerator.Current];value;manual |
-| Microsoft.Extensions.FileProviders.Physical;PhysicalDirectoryInfo;CreateReadStream;();Argument[this];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.FileProviders.Physical;PhysicalDirectoryInfo;PhysicalDirectoryInfo;(System.IO.DirectoryInfo);Argument[0];Argument[this];taint;df-generated |
-| Microsoft.Extensions.FileProviders.Physical;PhysicalDirectoryInfo;get_Name;();Argument[this];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.FileProviders.Physical;PhysicalDirectoryInfo;get_PhysicalPath;();Argument[this];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.FileProviders.Physical;PhysicalFileInfo;CreateReadStream;();Argument[this];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.FileProviders.Physical;PhysicalFileInfo;PhysicalFileInfo;(System.IO.FileInfo);Argument[0];Argument[this];taint;df-generated |
-| Microsoft.Extensions.FileProviders.Physical;PhysicalFileInfo;get_Name;();Argument[this];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.FileProviders.Physical;PhysicalFileInfo;get_PhysicalPath;();Argument[this];ReturnValue;taint;df-generated |
+| Microsoft.Extensions.FileProviders.Physical;PhysicalDirectoryInfo;PhysicalDirectoryInfo;(System.IO.DirectoryInfo);Argument[0];Argument[this].SyntheticField[Microsoft.Extensions.FileProviders.Physical.PhysicalDirectoryInfo._info];value;dfc-generated |
+| Microsoft.Extensions.FileProviders.Physical;PhysicalDirectoryInfo;get_Name;();Argument[this].SyntheticField[Microsoft.Extensions.FileProviders.Physical.PhysicalDirectoryInfo._info].Property[System.IO.DirectoryInfo.Name];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.FileProviders.Physical;PhysicalDirectoryInfo;get_PhysicalPath;();Argument[this].SyntheticField[Microsoft.Extensions.FileProviders.Physical.PhysicalDirectoryInfo._info].Field[System.IO.FileSystemInfo.FullPath];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.FileProviders.Physical;PhysicalDirectoryInfo;get_PhysicalPath;();Argument[this].SyntheticField[Microsoft.Extensions.FileProviders.Physical.PhysicalDirectoryInfo._info].Property[System.IO.FileSystemInfo.FullName];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.FileProviders.Physical;PhysicalFileInfo;CreateReadStream;();Argument[this].Property[Microsoft.Extensions.FileProviders.Physical.PhysicalFileInfo.PhysicalPath];ReturnValue;taint;dfc-generated |
+| Microsoft.Extensions.FileProviders.Physical;PhysicalFileInfo;CreateReadStream;();Argument[this].SyntheticField[Microsoft.Extensions.FileProviders.Physical.PhysicalFileInfo._info].Property[System.IO.FileSystemInfo.FullName];ReturnValue;taint;dfc-generated |
+| Microsoft.Extensions.FileProviders.Physical;PhysicalFileInfo;PhysicalFileInfo;(System.IO.FileInfo);Argument[0];Argument[this].SyntheticField[Microsoft.Extensions.FileProviders.Physical.PhysicalFileInfo._info];value;dfc-generated |
+| Microsoft.Extensions.FileProviders.Physical;PhysicalFileInfo;get_Name;();Argument[this].SyntheticField[Microsoft.Extensions.FileProviders.Physical.PhysicalFileInfo._info].Property[System.IO.FileInfo.Name];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.FileProviders.Physical;PhysicalFileInfo;get_PhysicalPath;();Argument[this].SyntheticField[Microsoft.Extensions.FileProviders.Physical.PhysicalFileInfo._info].Property[System.IO.FileSystemInfo.FullName];ReturnValue;value;dfc-generated |
 | Microsoft.Extensions.FileProviders.Physical;PhysicalFilesWatcher;PhysicalFilesWatcher;(System.String,System.IO.FileSystemWatcher,System.Boolean,Microsoft.Extensions.FileProviders.Physical.ExclusionFilters);Argument[0];Argument[this];taint;df-generated |
 | Microsoft.Extensions.FileProviders.Physical;PhysicalFilesWatcher;PhysicalFilesWatcher;(System.String,System.IO.FileSystemWatcher,System.Boolean,Microsoft.Extensions.FileProviders.Physical.ExclusionFilters);Argument[1];Argument[this];taint;df-generated |
 | Microsoft.Extensions.FileProviders.Physical;PollingFileChangeToken;PollingFileChangeToken;(System.IO.FileInfo);Argument[0];Argument[this];taint;df-generated |
+| Microsoft.Extensions.FileProviders.Physical;PollingFileChangeToken;RegisterChangeCallback;(System.Action<System.Object>,System.Object);Argument[0];Argument[0].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.FileProviders.Physical;PollingFileChangeToken;RegisterChangeCallback;(System.Action<System.Object>,System.Object);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
+| Microsoft.Extensions.FileProviders.Physical;PollingFileChangeToken;RegisterChangeCallback;(System.Action<System.Object>,System.Object);Argument[this];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.FileProviders.Physical;PollingFileChangeToken;RegisterChangeCallback;(System.Action<System.Object>,System.Object);Argument[this];ReturnValue;value;hq-generated |
+| Microsoft.Extensions.FileProviders.Physical;PollingWildCardChangeToken;RegisterChangeCallback;(System.Action<System.Object>,System.Object);Argument[0];Argument[0].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.FileProviders.Physical;PollingWildCardChangeToken;RegisterChangeCallback;(System.Action<System.Object>,System.Object);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
-| Microsoft.Extensions.FileProviders;CompositeFileProvider;CompositeFileProvider;(Microsoft.Extensions.FileProviders.IFileProvider[]);Argument[0].Element;Argument[this];taint;df-generated |
-| Microsoft.Extensions.FileProviders;CompositeFileProvider;CompositeFileProvider;(System.Collections.Generic.IEnumerable<Microsoft.Extensions.FileProviders.IFileProvider>);Argument[0].Element;Argument[this];taint;df-generated |
-| Microsoft.Extensions.FileProviders;CompositeFileProvider;GetDirectoryContents;(System.String);Argument[0];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.FileProviders;CompositeFileProvider;GetDirectoryContents;(System.String);Argument[this];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.FileProviders;CompositeFileProvider;get_FileProviders;();Argument[this];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.FileProviders;EmbeddedFileProvider;GetDirectoryContents;(System.String);Argument[0];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.FileProviders;EmbeddedFileProvider;GetDirectoryContents;(System.String);Argument[this];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.FileProviders;IFileInfo;CreateReadStream;();Argument[this];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.FileProviders;IFileInfo;get_Name;();Argument[this];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.FileProviders;IFileInfo;get_PhysicalPath;();Argument[this];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.FileProviders;IFileProvider;GetDirectoryContents;(System.String);Argument[0];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.FileProviders;IFileProvider;GetDirectoryContents;(System.String);Argument[this];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.FileProviders;ManifestEmbeddedFileProvider;GetDirectoryContents;(System.String);Argument[0];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.FileProviders;ManifestEmbeddedFileProvider;GetDirectoryContents;(System.String);Argument[this];ReturnValue;taint;df-generated |
+| Microsoft.Extensions.FileProviders.Physical;PollingWildCardChangeToken;RegisterChangeCallback;(System.Action<System.Object>,System.Object);Argument[this];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.FileProviders.Physical;PollingWildCardChangeToken;RegisterChangeCallback;(System.Action<System.Object>,System.Object);Argument[this];ReturnValue;value;hq-generated |
+| Microsoft.Extensions.FileProviders;CompositeFileProvider;CompositeFileProvider;(Microsoft.Extensions.FileProviders.IFileProvider[]);Argument[0];Argument[this].SyntheticField[Microsoft.Extensions.FileProviders.CompositeFileProvider._fileProviders];value;dfc-generated |
+| Microsoft.Extensions.FileProviders;CompositeFileProvider;CompositeFileProvider;(System.Collections.Generic.IEnumerable<Microsoft.Extensions.FileProviders.IFileProvider>);Argument[0].Element;Argument[this].SyntheticField[Microsoft.Extensions.FileProviders.CompositeFileProvider._fileProviders].Element;value;dfc-generated |
+| Microsoft.Extensions.FileProviders;CompositeFileProvider;get_FileProviders;();Argument[this].SyntheticField[Microsoft.Extensions.FileProviders.CompositeFileProvider._fileProviders];ReturnValue;value;dfc-generated |
 | Microsoft.Extensions.FileProviders;NotFoundDirectoryContents;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.Generic.IEnumerator`1.Current];value;manual |
 | Microsoft.Extensions.FileProviders;NotFoundDirectoryContents;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.IEnumerator.Current];value;manual |
-| Microsoft.Extensions.FileProviders;NotFoundFileInfo;CreateReadStream;();Argument[this];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.FileProviders;NotFoundFileInfo;get_Name;();Argument[this];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.FileProviders;NotFoundFileInfo;get_PhysicalPath;();Argument[this];ReturnValue;taint;df-generated |
+| Microsoft.Extensions.FileProviders;NullChangeToken;RegisterChangeCallback;(System.Action<System.Object>,System.Object);Argument[0];Argument[0].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.FileProviders;NullChangeToken;RegisterChangeCallback;(System.Action<System.Object>,System.Object);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
-| Microsoft.Extensions.FileProviders;NullFileProvider;GetDirectoryContents;(System.String);Argument[0];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.FileProviders;NullFileProvider;GetDirectoryContents;(System.String);Argument[this];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.FileProviders;PhysicalFileProvider;GetDirectoryContents;(System.String);Argument[0];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.FileProviders;PhysicalFileProvider;GetDirectoryContents;(System.String);Argument[this];ReturnValue;taint;df-generated |
+| Microsoft.Extensions.FileProviders;NullChangeToken;RegisterChangeCallback;(System.Action<System.Object>,System.Object);Argument[this];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.FileProviders;NullChangeToken;RegisterChangeCallback;(System.Action<System.Object>,System.Object);Argument[this];ReturnValue;value;hq-generated |
 | Microsoft.Extensions.FileSystemGlobbing.Abstractions;DirectoryInfoBase;EnumerateFileSystemInfos;();Argument[this];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.FileSystemGlobbing.Abstractions;DirectoryInfoBase;GetDirectory;(System.String);Argument[0];ReturnValue;taint;df-generated |
 | Microsoft.Extensions.FileSystemGlobbing.Abstractions;DirectoryInfoBase;GetDirectory;(System.String);Argument[this];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.FileSystemGlobbing.Abstractions;DirectoryInfoBase;GetFile;(System.String);Argument[this];ReturnValue;taint;df-generated |
 | Microsoft.Extensions.FileSystemGlobbing.Abstractions;DirectoryInfoWrapper;EnumerateFileSystemInfos;();Argument[this];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.FileSystemGlobbing.Abstractions;DirectoryInfoWrapper;GetDirectory;(System.String);Argument[0];ReturnValue;taint;df-generated |
 | Microsoft.Extensions.FileSystemGlobbing.Abstractions;DirectoryInfoWrapper;GetDirectory;(System.String);Argument[this];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.FileSystemGlobbing.Abstractions;DirectoryInfoWrapper;GetFile;(System.String);Argument[this];ReturnValue;taint;df-generated |
 | Microsoft.Extensions.FileSystemGlobbing.Abstractions;DirectoryInfoWrapper;get_FullName;();Argument[this];ReturnValue;taint;df-generated |
 | Microsoft.Extensions.FileSystemGlobbing.Abstractions;DirectoryInfoWrapper;get_Name;();Argument[this];ReturnValue;taint;df-generated |
 | Microsoft.Extensions.FileSystemGlobbing.Abstractions;DirectoryInfoWrapper;get_ParentDirectory;();Argument[this];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.FileSystemGlobbing.Abstractions;FileInfoWrapper;FileInfoWrapper;(System.IO.FileInfo);Argument[0];Argument[this];taint;df-generated |
+| Microsoft.Extensions.FileSystemGlobbing.Abstractions;FileInfoWrapper;FileInfoWrapper;(System.IO.FileInfo);Argument[0];Argument[this].SyntheticField[Microsoft.Extensions.FileSystemGlobbing.Abstractions.FileInfoWrapper._fileInfo];value;dfc-generated |
+| Microsoft.Extensions.FileSystemGlobbing.Abstractions;FileInfoWrapper;get_FullName;();Argument[this].SyntheticField[Microsoft.Extensions.FileSystemGlobbing.Abstractions.FileInfoWrapper._fileInfo].Property[System.IO.FileSystemInfo.FullName];ReturnValue;value;df-generated |
+| Microsoft.Extensions.FileSystemGlobbing.Abstractions;FileInfoWrapper;get_FullName;();Argument[this].SyntheticField[Microsoft.Extensions.FileSystemGlobbing.Abstractions.FileInfoWrapper._fileInfo].Property[System.IO.FileSystemInfo.FullName];ReturnValue;value;dfc-generated |
 | Microsoft.Extensions.FileSystemGlobbing.Abstractions;FileInfoWrapper;get_FullName;();Argument[this];ReturnValue;taint;df-generated |
+| Microsoft.Extensions.FileSystemGlobbing.Abstractions;FileInfoWrapper;get_FullName;();Argument[this];ReturnValue;taint;dfc-generated |
+| Microsoft.Extensions.FileSystemGlobbing.Abstractions;FileInfoWrapper;get_Name;();Argument[this].SyntheticField[Microsoft.Extensions.FileSystemGlobbing.Abstractions.FileInfoWrapper._fileInfo].Property[System.IO.FileInfo.Name];ReturnValue;value;df-generated |
+| Microsoft.Extensions.FileSystemGlobbing.Abstractions;FileInfoWrapper;get_Name;();Argument[this].SyntheticField[Microsoft.Extensions.FileSystemGlobbing.Abstractions.FileInfoWrapper._fileInfo].Property[System.IO.FileInfo.Name];ReturnValue;value;dfc-generated |
 | Microsoft.Extensions.FileSystemGlobbing.Abstractions;FileInfoWrapper;get_Name;();Argument[this];ReturnValue;taint;df-generated |
+| Microsoft.Extensions.FileSystemGlobbing.Abstractions;FileInfoWrapper;get_Name;();Argument[this];ReturnValue;taint;dfc-generated |
 | Microsoft.Extensions.FileSystemGlobbing.Abstractions;FileInfoWrapper;get_ParentDirectory;();Argument[this];ReturnValue;taint;df-generated |
 | Microsoft.Extensions.FileSystemGlobbing.Abstractions;FileSystemInfoBase;get_FullName;();Argument[this];ReturnValue;taint;df-generated |
 | Microsoft.Extensions.FileSystemGlobbing.Abstractions;FileSystemInfoBase;get_Name;();Argument[this];ReturnValue;taint;df-generated |
 | Microsoft.Extensions.FileSystemGlobbing.Abstractions;FileSystemInfoBase;get_ParentDirectory;();Argument[this];ReturnValue;taint;df-generated |
 | Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts;PatternContext<TFrame>;Declare;(System.Action<Microsoft.Extensions.FileSystemGlobbing.Internal.IPathSegment,System.Boolean>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
-| Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts;PatternContext<TFrame>;PushDataFrame;(TFrame);Argument[0];Argument[this];taint;df-generated |
+| Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts;PatternContext<TFrame>;PushDataFrame;(TFrame);Argument[0];Argument[this].Field[Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts.PatternContext`1.Frame];value;dfc-generated |
 | Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts;PatternContextLinear+FrameData;get_Stem;();Argument[this];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts;PatternContextLinear;CalculateStem;(Microsoft.Extensions.FileSystemGlobbing.Abstractions.FileInfoBase);Argument[0];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts;PatternContextLinear;CalculateStem;(Microsoft.Extensions.FileSystemGlobbing.Abstractions.FileInfoBase);Argument[this];ReturnValue;taint;df-generated |
+| Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts;PatternContextLinear;CalculateStem;(Microsoft.Extensions.FileSystemGlobbing.Abstractions.FileInfoBase);Argument[0].Property[Microsoft.Extensions.FileSystemGlobbing.Abstractions.FileSystemInfoBase.Name];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts;PatternContextLinear;CalculateStem;(Microsoft.Extensions.FileSystemGlobbing.Abstractions.FileInfoBase);Argument[this].Field[Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts.PatternContext`1.Frame].Property[Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts.PatternContextLinear+FrameData.Stem];ReturnValue;taint;dfc-generated |
 | Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts;PatternContextLinearInclude;Declare;(System.Action<Microsoft.Extensions.FileSystemGlobbing.Internal.IPathSegment,System.Boolean>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts;PatternContextRagged+FrameData;get_Stem;();Argument[this];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts;PatternContextRagged;CalculateStem;(Microsoft.Extensions.FileSystemGlobbing.Abstractions.FileInfoBase);Argument[0];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts;PatternContextRagged;CalculateStem;(Microsoft.Extensions.FileSystemGlobbing.Abstractions.FileInfoBase);Argument[this];ReturnValue;taint;df-generated |
+| Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts;PatternContextRagged;CalculateStem;(Microsoft.Extensions.FileSystemGlobbing.Abstractions.FileInfoBase);Argument[0].Property[Microsoft.Extensions.FileSystemGlobbing.Abstractions.FileSystemInfoBase.Name];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts;PatternContextRagged;CalculateStem;(Microsoft.Extensions.FileSystemGlobbing.Abstractions.FileInfoBase);Argument[this].Field[Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts.PatternContext`1.Frame].Property[Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts.PatternContextRagged+FrameData.Stem];ReturnValue;taint;dfc-generated |
+| Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts;PatternContextRagged;PushDirectory;(Microsoft.Extensions.FileSystemGlobbing.Abstractions.DirectoryInfoBase);Argument[this].Property[Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts.PatternContextRagged.Pattern].Property[Microsoft.Extensions.FileSystemGlobbing.Internal.IRaggedPattern.EndsWith];Argument[this].Field[Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts.PatternContext`1.Frame].Field[Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts.PatternContextRagged+FrameData.SegmentGroup];value;dfc-generated |
+| Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts;PatternContextRagged;PushDirectory;(Microsoft.Extensions.FileSystemGlobbing.Abstractions.DirectoryInfoBase);Argument[this].Property[Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts.PatternContextRagged.Pattern].Property[Microsoft.Extensions.FileSystemGlobbing.Internal.IRaggedPattern.StartsWith];Argument[this].Field[Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts.PatternContext`1.Frame].Field[Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts.PatternContextRagged+FrameData.SegmentGroup];value;dfc-generated |
 | Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts;PatternContextRaggedInclude;Declare;(System.Action<Microsoft.Extensions.FileSystemGlobbing.Internal.IPathSegment,System.Boolean>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | Microsoft.Extensions.FileSystemGlobbing.Internal;IPatternContext;Declare;(System.Action<Microsoft.Extensions.FileSystemGlobbing.Internal.IPathSegment,System.Boolean>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | Microsoft.Extensions.FileSystemGlobbing.Internal;MatcherContext;MatcherContext;(System.Collections.Generic.IEnumerable<Microsoft.Extensions.FileSystemGlobbing.Internal.IPattern>,System.Collections.Generic.IEnumerable<Microsoft.Extensions.FileSystemGlobbing.Internal.IPattern>,Microsoft.Extensions.FileSystemGlobbing.Abstractions.DirectoryInfoBase,System.StringComparison);Argument[2];Argument[this];taint;df-generated |
 | Microsoft.Extensions.FileSystemGlobbing;InMemoryDirectoryInfo;EnumerateFileSystemInfos;();Argument[this];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.FileSystemGlobbing;InMemoryDirectoryInfo;GetDirectory;(System.String);Argument[0];ReturnValue;taint;df-generated |
 | Microsoft.Extensions.FileSystemGlobbing;InMemoryDirectoryInfo;GetDirectory;(System.String);Argument[this];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.FileSystemGlobbing;InMemoryDirectoryInfo;GetFile;(System.String);Argument[this];ReturnValue;taint;df-generated |
+| Microsoft.Extensions.FileSystemGlobbing;InMemoryDirectoryInfo;GetFile;(System.String);Argument[this];ReturnValue.SyntheticField[Microsoft.Extensions.FileSystemGlobbing.Internal.InMemoryFileInfo._parent];value;dfc-generated |
 | Microsoft.Extensions.FileSystemGlobbing;InMemoryDirectoryInfo;get_FullName;();Argument[this];ReturnValue;taint;df-generated |
 | Microsoft.Extensions.FileSystemGlobbing;InMemoryDirectoryInfo;get_Name;();Argument[this];ReturnValue;taint;df-generated |
 | Microsoft.Extensions.FileSystemGlobbing;InMemoryDirectoryInfo;get_ParentDirectory;();Argument[this];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.FileSystemGlobbing;Matcher;AddExclude;(System.String);Argument[this];ReturnValue;value;df-generated |
-| Microsoft.Extensions.FileSystemGlobbing;Matcher;AddInclude;(System.String);Argument[this];ReturnValue;value;df-generated |
+| Microsoft.Extensions.FileSystemGlobbing;Matcher;AddExclude;(System.String);Argument[this];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.FileSystemGlobbing;Matcher;AddInclude;(System.String);Argument[this];ReturnValue;value;dfc-generated |
 | Microsoft.Extensions.Hosting.Internal;ApplicationLifetime;ApplicationLifetime;(Microsoft.Extensions.Logging.ILogger<Microsoft.Extensions.Hosting.Internal.ApplicationLifetime>);Argument[0];Argument[this];taint;df-generated |
 | Microsoft.Extensions.Hosting.Internal;ApplicationLifetime;get_ApplicationStarted;();Argument[this];ReturnValue;taint;df-generated |
 | Microsoft.Extensions.Hosting.Internal;ApplicationLifetime;get_ApplicationStopped;();Argument[this];ReturnValue;taint;df-generated |
@@ -2404,45 +2594,93 @@ summary
 | Microsoft.Extensions.Hosting;GenericHostWebHostBuilderExtensions;ConfigureWebHost;(Microsoft.Extensions.Hosting.IHostBuilder,System.Action<Microsoft.AspNetCore.Hosting.IWebHostBuilder>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
 | Microsoft.Extensions.Hosting;GenericHostWebHostBuilderExtensions;ConfigureWebHost;(Microsoft.Extensions.Hosting.IHostBuilder,System.Action<Microsoft.AspNetCore.Hosting.IWebHostBuilder>,System.Action<Microsoft.Extensions.Hosting.WebHostBuilderOptions>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
 | Microsoft.Extensions.Hosting;GenericHostWebHostBuilderExtensions;ConfigureWebHost;(Microsoft.Extensions.Hosting.IHostBuilder,System.Action<Microsoft.AspNetCore.Hosting.IWebHostBuilder>,System.Action<Microsoft.Extensions.Hosting.WebHostBuilderOptions>);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
-| Microsoft.Extensions.Hosting;Host;CreateApplicationBuilder;(Microsoft.Extensions.Hosting.HostApplicationBuilderSettings);Argument[0];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Hosting;Host;CreateEmptyApplicationBuilder;(Microsoft.Extensions.Hosting.HostApplicationBuilderSettings);Argument[0];ReturnValue;taint;df-generated |
+| Microsoft.Extensions.Hosting;Host;CreateEmptyApplicationBuilder;(Microsoft.Extensions.Hosting.HostApplicationBuilderSettings);Argument[0].Property[Microsoft.Extensions.Hosting.HostApplicationBuilderSettings.Args];ReturnValue.Property[Microsoft.Extensions.Hosting.HostApplicationBuilder.Configuration];taint;dfc-generated |
 | Microsoft.Extensions.Hosting;HostApplicationBuilder;ConfigureContainer<TContainerBuilder>;(Microsoft.Extensions.DependencyInjection.IServiceProviderFactory<TContainerBuilder>,System.Action<TContainerBuilder>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
-| Microsoft.Extensions.Hosting;HostApplicationBuilder;HostApplicationBuilder;(Microsoft.Extensions.Hosting.HostApplicationBuilderSettings);Argument[0];Argument[this];taint;df-generated |
-| Microsoft.Extensions.Hosting;HostApplicationBuilder;get_Configuration;();Argument[this];ReturnValue;taint;df-generated |
+| Microsoft.Extensions.Hosting;HostApplicationBuilder;HostApplicationBuilder;(Microsoft.Extensions.Hosting.HostApplicationBuilderSettings);Argument[0].Property[Microsoft.Extensions.Hosting.HostApplicationBuilderSettings.Args];Argument[this].Property[Microsoft.Extensions.Hosting.HostApplicationBuilder.Configuration];taint;dfc-generated |
+| Microsoft.Extensions.Hosting;HostApplicationBuilder;get_Configuration;();Argument[this].Property[Microsoft.Extensions.Hosting.HostApplicationBuilder.Configuration];ReturnValue;value;dfc-generated |
 | Microsoft.Extensions.Hosting;HostApplicationBuilder;get_Environment;();Argument[this];ReturnValue;taint;df-generated |
 | Microsoft.Extensions.Hosting;HostApplicationBuilder;get_Logging;();Argument[this];ReturnValue;taint;df-generated |
 | Microsoft.Extensions.Hosting;HostApplicationBuilder;get_Metrics;();Argument[this];ReturnValue;taint;df-generated |
 | Microsoft.Extensions.Hosting;HostApplicationBuilder;get_Properties;();Argument[this];ReturnValue;taint;df-generated |
 | Microsoft.Extensions.Hosting;HostApplicationBuilder;get_Services;();Argument[this];ReturnValue;taint;df-generated |
+| Microsoft.Extensions.Hosting;HostBuilder;ConfigureAppConfiguration;(System.Action<Microsoft.Extensions.Hosting.HostBuilderContext,Microsoft.Extensions.Configuration.IConfigurationBuilder>);Argument[0];Argument[0].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.Hosting;HostBuilder;ConfigureAppConfiguration;(System.Action<Microsoft.Extensions.Hosting.HostBuilderContext,Microsoft.Extensions.Configuration.IConfigurationBuilder>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
+| Microsoft.Extensions.Hosting;HostBuilder;ConfigureAppConfiguration;(System.Action<Microsoft.Extensions.Hosting.HostBuilderContext,Microsoft.Extensions.Configuration.IConfigurationBuilder>);Argument[this];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Hosting;HostBuilder;ConfigureAppConfiguration;(System.Action<Microsoft.Extensions.Hosting.HostBuilderContext,Microsoft.Extensions.Configuration.IConfigurationBuilder>);Argument[this];ReturnValue;value;hq-generated |
+| Microsoft.Extensions.Hosting;HostBuilder;ConfigureContainer<TContainerBuilder>;(System.Action<Microsoft.Extensions.Hosting.HostBuilderContext,TContainerBuilder>);Argument[0];Argument[0].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.Hosting;HostBuilder;ConfigureContainer<TContainerBuilder>;(System.Action<Microsoft.Extensions.Hosting.HostBuilderContext,TContainerBuilder>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
+| Microsoft.Extensions.Hosting;HostBuilder;ConfigureContainer<TContainerBuilder>;(System.Action<Microsoft.Extensions.Hosting.HostBuilderContext,TContainerBuilder>);Argument[this];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Hosting;HostBuilder;ConfigureContainer<TContainerBuilder>;(System.Action<Microsoft.Extensions.Hosting.HostBuilderContext,TContainerBuilder>);Argument[this];ReturnValue;value;hq-generated |
+| Microsoft.Extensions.Hosting;HostBuilder;ConfigureHostConfiguration;(System.Action<Microsoft.Extensions.Configuration.IConfigurationBuilder>);Argument[0];Argument[0].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.Hosting;HostBuilder;ConfigureHostConfiguration;(System.Action<Microsoft.Extensions.Configuration.IConfigurationBuilder>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
+| Microsoft.Extensions.Hosting;HostBuilder;ConfigureHostConfiguration;(System.Action<Microsoft.Extensions.Configuration.IConfigurationBuilder>);Argument[this];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Hosting;HostBuilder;ConfigureHostConfiguration;(System.Action<Microsoft.Extensions.Configuration.IConfigurationBuilder>);Argument[this];ReturnValue;value;hq-generated |
+| Microsoft.Extensions.Hosting;HostBuilder;ConfigureServices;(System.Action<Microsoft.Extensions.Hosting.HostBuilderContext,Microsoft.Extensions.DependencyInjection.IServiceCollection>);Argument[0];Argument[0].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.Hosting;HostBuilder;ConfigureServices;(System.Action<Microsoft.Extensions.Hosting.HostBuilderContext,Microsoft.Extensions.DependencyInjection.IServiceCollection>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
-| Microsoft.Extensions.Hosting;HostBuilder;UseServiceProviderFactory<TContainerBuilder>;(Microsoft.Extensions.DependencyInjection.IServiceProviderFactory<TContainerBuilder>);Argument[0];Argument[this];taint;df-generated |
-| Microsoft.Extensions.Hosting;HostBuilder;UseServiceProviderFactory<TContainerBuilder>;(Microsoft.Extensions.DependencyInjection.IServiceProviderFactory<TContainerBuilder>);Argument[this];ReturnValue;value;df-generated |
+| Microsoft.Extensions.Hosting;HostBuilder;ConfigureServices;(System.Action<Microsoft.Extensions.Hosting.HostBuilderContext,Microsoft.Extensions.DependencyInjection.IServiceCollection>);Argument[this];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Hosting;HostBuilder;ConfigureServices;(System.Action<Microsoft.Extensions.Hosting.HostBuilderContext,Microsoft.Extensions.DependencyInjection.IServiceCollection>);Argument[this];ReturnValue;value;hq-generated |
+| Microsoft.Extensions.Hosting;HostBuilder;UseServiceProviderFactory<TContainerBuilder>;(Microsoft.Extensions.DependencyInjection.IServiceProviderFactory<TContainerBuilder>);Argument[this];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Hosting;HostBuilder;UseServiceProviderFactory<TContainerBuilder>;(System.Func<Microsoft.Extensions.Hosting.HostBuilderContext,Microsoft.Extensions.DependencyInjection.IServiceProviderFactory<TContainerBuilder>>);Argument[0];Argument[0].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.Hosting;HostBuilder;UseServiceProviderFactory<TContainerBuilder>;(System.Func<Microsoft.Extensions.Hosting.HostBuilderContext,Microsoft.Extensions.DependencyInjection.IServiceProviderFactory<TContainerBuilder>>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
+| Microsoft.Extensions.Hosting;HostBuilder;UseServiceProviderFactory<TContainerBuilder>;(System.Func<Microsoft.Extensions.Hosting.HostBuilderContext,Microsoft.Extensions.DependencyInjection.IServiceProviderFactory<TContainerBuilder>>);Argument[this];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Hosting;HostBuilder;UseServiceProviderFactory<TContainerBuilder>;(System.Func<Microsoft.Extensions.Hosting.HostBuilderContext,Microsoft.Extensions.DependencyInjection.IServiceProviderFactory<TContainerBuilder>>);Argument[this];ReturnValue;value;hq-generated |
+| Microsoft.Extensions.Hosting;HostingHostBuilderExtensions;ConfigureAppConfiguration;(Microsoft.Extensions.Hosting.IHostBuilder,System.Action<Microsoft.Extensions.Configuration.IConfigurationBuilder>);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Hosting;HostingHostBuilderExtensions;ConfigureAppConfiguration;(Microsoft.Extensions.Hosting.IHostBuilder,System.Action<Microsoft.Extensions.Configuration.IConfigurationBuilder>);Argument[0];ReturnValue;value;hq-generated |
+| Microsoft.Extensions.Hosting;HostingHostBuilderExtensions;ConfigureAppConfiguration;(Microsoft.Extensions.Hosting.IHostBuilder,System.Action<Microsoft.Extensions.Configuration.IConfigurationBuilder>);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.Hosting;HostingHostBuilderExtensions;ConfigureAppConfiguration;(Microsoft.Extensions.Hosting.IHostBuilder,System.Action<Microsoft.Extensions.Configuration.IConfigurationBuilder>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
+| Microsoft.Extensions.Hosting;HostingHostBuilderExtensions;ConfigureContainer<TContainerBuilder>;(Microsoft.Extensions.Hosting.IHostBuilder,System.Action<TContainerBuilder>);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Hosting;HostingHostBuilderExtensions;ConfigureContainer<TContainerBuilder>;(Microsoft.Extensions.Hosting.IHostBuilder,System.Action<TContainerBuilder>);Argument[0];ReturnValue;value;hq-generated |
+| Microsoft.Extensions.Hosting;HostingHostBuilderExtensions;ConfigureContainer<TContainerBuilder>;(Microsoft.Extensions.Hosting.IHostBuilder,System.Action<TContainerBuilder>);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.Hosting;HostingHostBuilderExtensions;ConfigureContainer<TContainerBuilder>;(Microsoft.Extensions.Hosting.IHostBuilder,System.Action<TContainerBuilder>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
-| Microsoft.Extensions.Hosting;HostingHostBuilderExtensions;ConfigureDefaults;(Microsoft.Extensions.Hosting.IHostBuilder,System.String[]);Argument[0];ReturnValue;taint;df-generated |
+| Microsoft.Extensions.Hosting;HostingHostBuilderExtensions;ConfigureDefaults;(Microsoft.Extensions.Hosting.IHostBuilder,System.String[]);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Hosting;HostingHostBuilderExtensions;ConfigureHostOptions;(Microsoft.Extensions.Hosting.IHostBuilder,System.Action<Microsoft.Extensions.Hosting.HostBuilderContext,Microsoft.Extensions.Hosting.HostOptions>);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Hosting;HostingHostBuilderExtensions;ConfigureHostOptions;(Microsoft.Extensions.Hosting.IHostBuilder,System.Action<Microsoft.Extensions.Hosting.HostBuilderContext,Microsoft.Extensions.Hosting.HostOptions>);Argument[0];ReturnValue;value;hq-generated |
+| Microsoft.Extensions.Hosting;HostingHostBuilderExtensions;ConfigureHostOptions;(Microsoft.Extensions.Hosting.IHostBuilder,System.Action<Microsoft.Extensions.Hosting.HostBuilderContext,Microsoft.Extensions.Hosting.HostOptions>);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.Hosting;HostingHostBuilderExtensions;ConfigureHostOptions;(Microsoft.Extensions.Hosting.IHostBuilder,System.Action<Microsoft.Extensions.Hosting.HostBuilderContext,Microsoft.Extensions.Hosting.HostOptions>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
+| Microsoft.Extensions.Hosting;HostingHostBuilderExtensions;ConfigureHostOptions;(Microsoft.Extensions.Hosting.IHostBuilder,System.Action<Microsoft.Extensions.Hosting.HostOptions>);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Hosting;HostingHostBuilderExtensions;ConfigureHostOptions;(Microsoft.Extensions.Hosting.IHostBuilder,System.Action<Microsoft.Extensions.Hosting.HostOptions>);Argument[0];ReturnValue;value;hq-generated |
+| Microsoft.Extensions.Hosting;HostingHostBuilderExtensions;ConfigureHostOptions;(Microsoft.Extensions.Hosting.IHostBuilder,System.Action<Microsoft.Extensions.Hosting.HostOptions>);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.Hosting;HostingHostBuilderExtensions;ConfigureHostOptions;(Microsoft.Extensions.Hosting.IHostBuilder,System.Action<Microsoft.Extensions.Hosting.HostOptions>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
+| Microsoft.Extensions.Hosting;HostingHostBuilderExtensions;ConfigureLogging;(Microsoft.Extensions.Hosting.IHostBuilder,System.Action<Microsoft.Extensions.Hosting.HostBuilderContext,Microsoft.Extensions.Logging.ILoggingBuilder>);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Hosting;HostingHostBuilderExtensions;ConfigureLogging;(Microsoft.Extensions.Hosting.IHostBuilder,System.Action<Microsoft.Extensions.Hosting.HostBuilderContext,Microsoft.Extensions.Logging.ILoggingBuilder>);Argument[0];ReturnValue;value;hq-generated |
+| Microsoft.Extensions.Hosting;HostingHostBuilderExtensions;ConfigureLogging;(Microsoft.Extensions.Hosting.IHostBuilder,System.Action<Microsoft.Extensions.Hosting.HostBuilderContext,Microsoft.Extensions.Logging.ILoggingBuilder>);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.Hosting;HostingHostBuilderExtensions;ConfigureLogging;(Microsoft.Extensions.Hosting.IHostBuilder,System.Action<Microsoft.Extensions.Hosting.HostBuilderContext,Microsoft.Extensions.Logging.ILoggingBuilder>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
+| Microsoft.Extensions.Hosting;HostingHostBuilderExtensions;ConfigureLogging;(Microsoft.Extensions.Hosting.IHostBuilder,System.Action<Microsoft.Extensions.Logging.ILoggingBuilder>);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Hosting;HostingHostBuilderExtensions;ConfigureLogging;(Microsoft.Extensions.Hosting.IHostBuilder,System.Action<Microsoft.Extensions.Logging.ILoggingBuilder>);Argument[0];ReturnValue;value;hq-generated |
+| Microsoft.Extensions.Hosting;HostingHostBuilderExtensions;ConfigureLogging;(Microsoft.Extensions.Hosting.IHostBuilder,System.Action<Microsoft.Extensions.Logging.ILoggingBuilder>);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.Hosting;HostingHostBuilderExtensions;ConfigureLogging;(Microsoft.Extensions.Hosting.IHostBuilder,System.Action<Microsoft.Extensions.Logging.ILoggingBuilder>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
+| Microsoft.Extensions.Hosting;HostingHostBuilderExtensions;ConfigureMetrics;(Microsoft.Extensions.Hosting.IHostBuilder,System.Action<Microsoft.Extensions.Diagnostics.Metrics.IMetricsBuilder>);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Hosting;HostingHostBuilderExtensions;ConfigureMetrics;(Microsoft.Extensions.Hosting.IHostBuilder,System.Action<Microsoft.Extensions.Diagnostics.Metrics.IMetricsBuilder>);Argument[0];ReturnValue;value;hq-generated |
+| Microsoft.Extensions.Hosting;HostingHostBuilderExtensions;ConfigureMetrics;(Microsoft.Extensions.Hosting.IHostBuilder,System.Action<Microsoft.Extensions.Diagnostics.Metrics.IMetricsBuilder>);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.Hosting;HostingHostBuilderExtensions;ConfigureMetrics;(Microsoft.Extensions.Hosting.IHostBuilder,System.Action<Microsoft.Extensions.Diagnostics.Metrics.IMetricsBuilder>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
+| Microsoft.Extensions.Hosting;HostingHostBuilderExtensions;ConfigureMetrics;(Microsoft.Extensions.Hosting.IHostBuilder,System.Action<Microsoft.Extensions.Hosting.HostBuilderContext,Microsoft.Extensions.Diagnostics.Metrics.IMetricsBuilder>);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Hosting;HostingHostBuilderExtensions;ConfigureMetrics;(Microsoft.Extensions.Hosting.IHostBuilder,System.Action<Microsoft.Extensions.Hosting.HostBuilderContext,Microsoft.Extensions.Diagnostics.Metrics.IMetricsBuilder>);Argument[0];ReturnValue;value;hq-generated |
+| Microsoft.Extensions.Hosting;HostingHostBuilderExtensions;ConfigureMetrics;(Microsoft.Extensions.Hosting.IHostBuilder,System.Action<Microsoft.Extensions.Hosting.HostBuilderContext,Microsoft.Extensions.Diagnostics.Metrics.IMetricsBuilder>);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.Hosting;HostingHostBuilderExtensions;ConfigureMetrics;(Microsoft.Extensions.Hosting.IHostBuilder,System.Action<Microsoft.Extensions.Hosting.HostBuilderContext,Microsoft.Extensions.Diagnostics.Metrics.IMetricsBuilder>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
+| Microsoft.Extensions.Hosting;HostingHostBuilderExtensions;ConfigureServices;(Microsoft.Extensions.Hosting.IHostBuilder,System.Action<Microsoft.Extensions.DependencyInjection.IServiceCollection>);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Hosting;HostingHostBuilderExtensions;ConfigureServices;(Microsoft.Extensions.Hosting.IHostBuilder,System.Action<Microsoft.Extensions.DependencyInjection.IServiceCollection>);Argument[0];ReturnValue;value;hq-generated |
+| Microsoft.Extensions.Hosting;HostingHostBuilderExtensions;ConfigureServices;(Microsoft.Extensions.Hosting.IHostBuilder,System.Action<Microsoft.Extensions.DependencyInjection.IServiceCollection>);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.Hosting;HostingHostBuilderExtensions;ConfigureServices;(Microsoft.Extensions.Hosting.IHostBuilder,System.Action<Microsoft.Extensions.DependencyInjection.IServiceCollection>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
 | Microsoft.Extensions.Hosting;HostingHostBuilderExtensions;RunConsoleAsync;(Microsoft.Extensions.Hosting.IHostBuilder,System.Action<Microsoft.Extensions.Hosting.ConsoleLifetimeOptions>,System.Threading.CancellationToken);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
-| Microsoft.Extensions.Hosting;HostingHostBuilderExtensions;UseConsoleLifetime;(Microsoft.Extensions.Hosting.IHostBuilder);Argument[0];ReturnValue;taint;df-generated |
+| Microsoft.Extensions.Hosting;HostingHostBuilderExtensions;UseConsoleLifetime;(Microsoft.Extensions.Hosting.IHostBuilder);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Hosting;HostingHostBuilderExtensions;UseConsoleLifetime;(Microsoft.Extensions.Hosting.IHostBuilder,System.Action<Microsoft.Extensions.Hosting.ConsoleLifetimeOptions>);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Hosting;HostingHostBuilderExtensions;UseConsoleLifetime;(Microsoft.Extensions.Hosting.IHostBuilder,System.Action<Microsoft.Extensions.Hosting.ConsoleLifetimeOptions>);Argument[0];ReturnValue;value;hq-generated |
+| Microsoft.Extensions.Hosting;HostingHostBuilderExtensions;UseConsoleLifetime;(Microsoft.Extensions.Hosting.IHostBuilder,System.Action<Microsoft.Extensions.Hosting.ConsoleLifetimeOptions>);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.Hosting;HostingHostBuilderExtensions;UseConsoleLifetime;(Microsoft.Extensions.Hosting.IHostBuilder,System.Action<Microsoft.Extensions.Hosting.ConsoleLifetimeOptions>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
-| Microsoft.Extensions.Hosting;HostingHostBuilderExtensions;UseContentRoot;(Microsoft.Extensions.Hosting.IHostBuilder,System.String);Argument[0];ReturnValue;taint;df-generated |
+| Microsoft.Extensions.Hosting;HostingHostBuilderExtensions;UseContentRoot;(Microsoft.Extensions.Hosting.IHostBuilder,System.String);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Hosting;HostingHostBuilderExtensions;UseDefaultServiceProvider;(Microsoft.Extensions.Hosting.IHostBuilder,System.Action<Microsoft.Extensions.DependencyInjection.ServiceProviderOptions>);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Hosting;HostingHostBuilderExtensions;UseDefaultServiceProvider;(Microsoft.Extensions.Hosting.IHostBuilder,System.Action<Microsoft.Extensions.DependencyInjection.ServiceProviderOptions>);Argument[0];ReturnValue;value;hq-generated |
+| Microsoft.Extensions.Hosting;HostingHostBuilderExtensions;UseDefaultServiceProvider;(Microsoft.Extensions.Hosting.IHostBuilder,System.Action<Microsoft.Extensions.DependencyInjection.ServiceProviderOptions>);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.Hosting;HostingHostBuilderExtensions;UseDefaultServiceProvider;(Microsoft.Extensions.Hosting.IHostBuilder,System.Action<Microsoft.Extensions.DependencyInjection.ServiceProviderOptions>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
+| Microsoft.Extensions.Hosting;HostingHostBuilderExtensions;UseDefaultServiceProvider;(Microsoft.Extensions.Hosting.IHostBuilder,System.Action<Microsoft.Extensions.Hosting.HostBuilderContext,Microsoft.Extensions.DependencyInjection.ServiceProviderOptions>);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Hosting;HostingHostBuilderExtensions;UseDefaultServiceProvider;(Microsoft.Extensions.Hosting.IHostBuilder,System.Action<Microsoft.Extensions.Hosting.HostBuilderContext,Microsoft.Extensions.DependencyInjection.ServiceProviderOptions>);Argument[0];ReturnValue;value;hq-generated |
+| Microsoft.Extensions.Hosting;HostingHostBuilderExtensions;UseDefaultServiceProvider;(Microsoft.Extensions.Hosting.IHostBuilder,System.Action<Microsoft.Extensions.Hosting.HostBuilderContext,Microsoft.Extensions.DependencyInjection.ServiceProviderOptions>);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.Hosting;HostingHostBuilderExtensions;UseDefaultServiceProvider;(Microsoft.Extensions.Hosting.IHostBuilder,System.Action<Microsoft.Extensions.Hosting.HostBuilderContext,Microsoft.Extensions.DependencyInjection.ServiceProviderOptions>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
-| Microsoft.Extensions.Hosting;HostingHostBuilderExtensions;UseEnvironment;(Microsoft.Extensions.Hosting.IHostBuilder,System.String);Argument[0];ReturnValue;taint;df-generated |
+| Microsoft.Extensions.Hosting;HostingHostBuilderExtensions;UseEnvironment;(Microsoft.Extensions.Hosting.IHostBuilder,System.String);Argument[0];ReturnValue;value;dfc-generated |
 | Microsoft.Extensions.Hosting;IApplicationLifetime;get_ApplicationStarted;();Argument[this];ReturnValue;taint;df-generated |
 | Microsoft.Extensions.Hosting;IApplicationLifetime;get_ApplicationStopped;();Argument[this];ReturnValue;taint;df-generated |
 | Microsoft.Extensions.Hosting;IApplicationLifetime;get_ApplicationStopping;();Argument[this];ReturnValue;taint;df-generated |
 | Microsoft.Extensions.Hosting;IHostApplicationBuilder;ConfigureContainer<TContainerBuilder>;(Microsoft.Extensions.DependencyInjection.IServiceProviderFactory<TContainerBuilder>,System.Action<TContainerBuilder>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
-| Microsoft.Extensions.Hosting;IHostApplicationBuilder;get_Configuration;();Argument[this];ReturnValue;taint;df-generated |
 | Microsoft.Extensions.Hosting;IHostApplicationBuilder;get_Environment;();Argument[this];ReturnValue;taint;df-generated |
 | Microsoft.Extensions.Hosting;IHostApplicationBuilder;get_Logging;();Argument[this];ReturnValue;taint;df-generated |
 | Microsoft.Extensions.Hosting;IHostApplicationBuilder;get_Metrics;();Argument[this];ReturnValue;taint;df-generated |
@@ -2451,36 +2689,58 @@ summary
 | Microsoft.Extensions.Hosting;IHostApplicationLifetime;get_ApplicationStarted;();Argument[this];ReturnValue;taint;df-generated |
 | Microsoft.Extensions.Hosting;IHostApplicationLifetime;get_ApplicationStopped;();Argument[this];ReturnValue;taint;df-generated |
 | Microsoft.Extensions.Hosting;IHostApplicationLifetime;get_ApplicationStopping;();Argument[this];ReturnValue;taint;df-generated |
+| Microsoft.Extensions.Hosting;IHostBuilder;ConfigureAppConfiguration;(System.Action<Microsoft.Extensions.Hosting.HostBuilderContext,Microsoft.Extensions.Configuration.IConfigurationBuilder>);Argument[0];Argument[0].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.Hosting;IHostBuilder;ConfigureAppConfiguration;(System.Action<Microsoft.Extensions.Hosting.HostBuilderContext,Microsoft.Extensions.Configuration.IConfigurationBuilder>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
+| Microsoft.Extensions.Hosting;IHostBuilder;ConfigureAppConfiguration;(System.Action<Microsoft.Extensions.Hosting.HostBuilderContext,Microsoft.Extensions.Configuration.IConfigurationBuilder>);Argument[this];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Hosting;IHostBuilder;ConfigureAppConfiguration;(System.Action<Microsoft.Extensions.Hosting.HostBuilderContext,Microsoft.Extensions.Configuration.IConfigurationBuilder>);Argument[this];ReturnValue;value;hq-generated |
+| Microsoft.Extensions.Hosting;IHostBuilder;ConfigureContainer<TContainerBuilder>;(System.Action<Microsoft.Extensions.Hosting.HostBuilderContext,TContainerBuilder>);Argument[0];Argument[0].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.Hosting;IHostBuilder;ConfigureContainer<TContainerBuilder>;(System.Action<Microsoft.Extensions.Hosting.HostBuilderContext,TContainerBuilder>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
+| Microsoft.Extensions.Hosting;IHostBuilder;ConfigureContainer<TContainerBuilder>;(System.Action<Microsoft.Extensions.Hosting.HostBuilderContext,TContainerBuilder>);Argument[this];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Hosting;IHostBuilder;ConfigureContainer<TContainerBuilder>;(System.Action<Microsoft.Extensions.Hosting.HostBuilderContext,TContainerBuilder>);Argument[this];ReturnValue;value;hq-generated |
+| Microsoft.Extensions.Hosting;IHostBuilder;ConfigureHostConfiguration;(System.Action<Microsoft.Extensions.Configuration.IConfigurationBuilder>);Argument[0];Argument[0].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.Hosting;IHostBuilder;ConfigureHostConfiguration;(System.Action<Microsoft.Extensions.Configuration.IConfigurationBuilder>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
+| Microsoft.Extensions.Hosting;IHostBuilder;ConfigureHostConfiguration;(System.Action<Microsoft.Extensions.Configuration.IConfigurationBuilder>);Argument[this];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Hosting;IHostBuilder;ConfigureHostConfiguration;(System.Action<Microsoft.Extensions.Configuration.IConfigurationBuilder>);Argument[this];ReturnValue;value;hq-generated |
+| Microsoft.Extensions.Hosting;IHostBuilder;ConfigureServices;(System.Action<Microsoft.Extensions.Hosting.HostBuilderContext,Microsoft.Extensions.DependencyInjection.IServiceCollection>);Argument[0];Argument[0].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.Hosting;IHostBuilder;ConfigureServices;(System.Action<Microsoft.Extensions.Hosting.HostBuilderContext,Microsoft.Extensions.DependencyInjection.IServiceCollection>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
-| Microsoft.Extensions.Hosting;IHostBuilder;UseServiceProviderFactory<TContainerBuilder>;(Microsoft.Extensions.DependencyInjection.IServiceProviderFactory<TContainerBuilder>);Argument[0];Argument[this];taint;df-generated |
-| Microsoft.Extensions.Hosting;IHostBuilder;UseServiceProviderFactory<TContainerBuilder>;(Microsoft.Extensions.DependencyInjection.IServiceProviderFactory<TContainerBuilder>);Argument[this];ReturnValue;value;df-generated |
+| Microsoft.Extensions.Hosting;IHostBuilder;ConfigureServices;(System.Action<Microsoft.Extensions.Hosting.HostBuilderContext,Microsoft.Extensions.DependencyInjection.IServiceCollection>);Argument[this];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Hosting;IHostBuilder;ConfigureServices;(System.Action<Microsoft.Extensions.Hosting.HostBuilderContext,Microsoft.Extensions.DependencyInjection.IServiceCollection>);Argument[this];ReturnValue;value;hq-generated |
+| Microsoft.Extensions.Hosting;IHostBuilder;UseServiceProviderFactory<TContainerBuilder>;(Microsoft.Extensions.DependencyInjection.IServiceProviderFactory<TContainerBuilder>);Argument[this];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Hosting;IHostBuilder;UseServiceProviderFactory<TContainerBuilder>;(System.Func<Microsoft.Extensions.Hosting.HostBuilderContext,Microsoft.Extensions.DependencyInjection.IServiceProviderFactory<TContainerBuilder>>);Argument[0];Argument[0].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.Hosting;IHostBuilder;UseServiceProviderFactory<TContainerBuilder>;(System.Func<Microsoft.Extensions.Hosting.HostBuilderContext,Microsoft.Extensions.DependencyInjection.IServiceProviderFactory<TContainerBuilder>>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
+| Microsoft.Extensions.Hosting;IHostBuilder;UseServiceProviderFactory<TContainerBuilder>;(System.Func<Microsoft.Extensions.Hosting.HostBuilderContext,Microsoft.Extensions.DependencyInjection.IServiceProviderFactory<TContainerBuilder>>);Argument[this];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Hosting;IHostBuilder;UseServiceProviderFactory<TContainerBuilder>;(System.Func<Microsoft.Extensions.Hosting.HostBuilderContext,Microsoft.Extensions.DependencyInjection.IServiceProviderFactory<TContainerBuilder>>);Argument[this];ReturnValue;value;hq-generated |
 | Microsoft.Extensions.Hosting;IHostLifetime;WaitForStartAsync;(System.Threading.CancellationToken);Argument[this];ReturnValue;taint;df-generated |
 | Microsoft.Extensions.Hosting;IHostedService;StartAsync;(System.Threading.CancellationToken);Argument[this];ReturnValue;taint;df-generated |
 | Microsoft.Extensions.Http.Logging;LoggingHttpMessageHandler;LoggingHttpMessageHandler;(Microsoft.Extensions.Logging.ILogger);Argument[0];Argument[this];taint;df-generated |
 | Microsoft.Extensions.Http.Logging;LoggingHttpMessageHandler;LoggingHttpMessageHandler;(Microsoft.Extensions.Logging.ILogger,Microsoft.Extensions.Http.HttpClientFactoryOptions);Argument[0];Argument[this];taint;df-generated |
 | Microsoft.Extensions.Http.Logging;LoggingHttpMessageHandler;LoggingHttpMessageHandler;(Microsoft.Extensions.Logging.ILogger,Microsoft.Extensions.Http.HttpClientFactoryOptions);Argument[1];Argument[this];taint;df-generated |
-| Microsoft.Extensions.Http.Logging;LoggingHttpMessageHandler;SendAsync;(System.Net.Http.HttpRequestMessage,System.Threading.CancellationToken);Argument[1];ReturnValue;taint;df-generated |
 | Microsoft.Extensions.Http.Logging;LoggingScopeHttpMessageHandler;LoggingScopeHttpMessageHandler;(Microsoft.Extensions.Logging.ILogger);Argument[0];Argument[this];taint;df-generated |
 | Microsoft.Extensions.Http.Logging;LoggingScopeHttpMessageHandler;LoggingScopeHttpMessageHandler;(Microsoft.Extensions.Logging.ILogger,Microsoft.Extensions.Http.HttpClientFactoryOptions);Argument[0];Argument[this];taint;df-generated |
 | Microsoft.Extensions.Http.Logging;LoggingScopeHttpMessageHandler;LoggingScopeHttpMessageHandler;(Microsoft.Extensions.Logging.ILogger,Microsoft.Extensions.Http.HttpClientFactoryOptions);Argument[1];Argument[this];taint;df-generated |
-| Microsoft.Extensions.Http.Logging;LoggingScopeHttpMessageHandler;SendAsync;(System.Net.Http.HttpRequestMessage,System.Threading.CancellationToken);Argument[1];ReturnValue;taint;df-generated |
 | Microsoft.Extensions.Http;HttpClientFactoryOptions;set_ShouldRedactHeaderValue;(System.Func<System.String,System.Boolean>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | Microsoft.Extensions.Http;HttpMessageHandlerBuilder;Build;();Argument[this];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Http;HttpMessageHandlerBuilder;CreateHandlerPipeline;(System.Net.Http.HttpMessageHandler,System.Collections.Generic.IEnumerable<System.Net.Http.DelegatingHandler>);Argument[0];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Http;HttpMessageHandlerBuilder;CreateHandlerPipeline;(System.Net.Http.HttpMessageHandler,System.Collections.Generic.IEnumerable<System.Net.Http.DelegatingHandler>);Argument[1].Element;ReturnValue;taint;df-generated |
+| Microsoft.Extensions.Http;HttpMessageHandlerBuilder;CreateHandlerPipeline;(System.Net.Http.HttpMessageHandler,System.Collections.Generic.IEnumerable<System.Net.Http.DelegatingHandler>);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Http;HttpMessageHandlerBuilder;CreateHandlerPipeline;(System.Net.Http.HttpMessageHandler,System.Collections.Generic.IEnumerable<System.Net.Http.DelegatingHandler>);Argument[1].Element;ReturnValue;value;dfc-generated |
 | Microsoft.Extensions.Http;IHttpMessageHandlerBuilderFilter;Configure;(System.Action<Microsoft.Extensions.Http.HttpMessageHandlerBuilder>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | Microsoft.Extensions.Localization;IResourceNamesCache;GetOrAdd;(System.String,System.Func<System.String,System.Collections.Generic.IList<System.String>>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
 | Microsoft.Extensions.Localization;ResourceNamesCache;GetOrAdd;(System.String,System.Func<System.String,System.Collections.Generic.IList<System.String>>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
 | Microsoft.Extensions.Logging.Abstractions;LogEntry<TState>;LogEntry;(Microsoft.Extensions.Logging.LogLevel,System.String,Microsoft.Extensions.Logging.EventId,TState,System.Exception,System.Func<TState,System.Exception,System.String>);Argument[5];Argument[5].Parameter[delegate-self];value;hq-generated |
 | Microsoft.Extensions.Logging.Abstractions;NullLogger;BeginScope<TState>;(TState);Argument[0];ReturnValue;taint;df-generated |
 | Microsoft.Extensions.Logging.Abstractions;NullLogger;BeginScope<TState>;(TState);Argument[this];ReturnValue;taint;df-generated |
+| Microsoft.Extensions.Logging.Abstractions;NullLogger;Log<TState>;(Microsoft.Extensions.Logging.LogLevel,Microsoft.Extensions.Logging.EventId,TState,System.Exception,System.Func<TState,System.Exception,System.String>);Argument[2];Argument[4].Parameter[0];value;dfc-generated |
+| Microsoft.Extensions.Logging.Abstractions;NullLogger;Log<TState>;(Microsoft.Extensions.Logging.LogLevel,Microsoft.Extensions.Logging.EventId,TState,System.Exception,System.Func<TState,System.Exception,System.String>);Argument[2];Argument[4].Parameter[0];value;hq-generated |
+| Microsoft.Extensions.Logging.Abstractions;NullLogger;Log<TState>;(Microsoft.Extensions.Logging.LogLevel,Microsoft.Extensions.Logging.EventId,TState,System.Exception,System.Func<TState,System.Exception,System.String>);Argument[3];Argument[4].Parameter[1];value;dfc-generated |
+| Microsoft.Extensions.Logging.Abstractions;NullLogger;Log<TState>;(Microsoft.Extensions.Logging.LogLevel,Microsoft.Extensions.Logging.EventId,TState,System.Exception,System.Func<TState,System.Exception,System.String>);Argument[3];Argument[4].Parameter[1];value;hq-generated |
+| Microsoft.Extensions.Logging.Abstractions;NullLogger;Log<TState>;(Microsoft.Extensions.Logging.LogLevel,Microsoft.Extensions.Logging.EventId,TState,System.Exception,System.Func<TState,System.Exception,System.String>);Argument[4];Argument[4].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.Logging.Abstractions;NullLogger;Log<TState>;(Microsoft.Extensions.Logging.LogLevel,Microsoft.Extensions.Logging.EventId,TState,System.Exception,System.Func<TState,System.Exception,System.String>);Argument[4];Argument[4].Parameter[delegate-self];value;hq-generated |
 | Microsoft.Extensions.Logging.Abstractions;NullLogger<T>;BeginScope<TState>;(TState);Argument[0];ReturnValue;taint;df-generated |
 | Microsoft.Extensions.Logging.Abstractions;NullLogger<T>;BeginScope<TState>;(TState);Argument[this];ReturnValue;taint;df-generated |
+| Microsoft.Extensions.Logging.Abstractions;NullLogger<T>;Log<TState>;(Microsoft.Extensions.Logging.LogLevel,Microsoft.Extensions.Logging.EventId,TState,System.Exception,System.Func<TState,System.Exception,System.String>);Argument[2];Argument[4].Parameter[0];value;dfc-generated |
+| Microsoft.Extensions.Logging.Abstractions;NullLogger<T>;Log<TState>;(Microsoft.Extensions.Logging.LogLevel,Microsoft.Extensions.Logging.EventId,TState,System.Exception,System.Func<TState,System.Exception,System.String>);Argument[2];Argument[4].Parameter[0];value;hq-generated |
+| Microsoft.Extensions.Logging.Abstractions;NullLogger<T>;Log<TState>;(Microsoft.Extensions.Logging.LogLevel,Microsoft.Extensions.Logging.EventId,TState,System.Exception,System.Func<TState,System.Exception,System.String>);Argument[3];Argument[4].Parameter[1];value;dfc-generated |
+| Microsoft.Extensions.Logging.Abstractions;NullLogger<T>;Log<TState>;(Microsoft.Extensions.Logging.LogLevel,Microsoft.Extensions.Logging.EventId,TState,System.Exception,System.Func<TState,System.Exception,System.String>);Argument[3];Argument[4].Parameter[1];value;hq-generated |
+| Microsoft.Extensions.Logging.Abstractions;NullLogger<T>;Log<TState>;(Microsoft.Extensions.Logging.LogLevel,Microsoft.Extensions.Logging.EventId,TState,System.Exception,System.Func<TState,System.Exception,System.String>);Argument[4];Argument[4].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.Logging.Abstractions;NullLogger<T>;Log<TState>;(Microsoft.Extensions.Logging.LogLevel,Microsoft.Extensions.Logging.EventId,TState,System.Exception,System.Func<TState,System.Exception,System.String>);Argument[4];Argument[4].Parameter[delegate-self];value;hq-generated |
 | Microsoft.Extensions.Logging.Abstractions;NullLoggerFactory;AddProvider;(Microsoft.Extensions.Logging.ILoggerProvider);Argument[this];Argument[0];taint;df-generated |
 | Microsoft.Extensions.Logging.Abstractions;NullLoggerFactory;CreateLogger;(System.String);Argument[0];ReturnValue;taint;df-generated |
@@ -2488,18 +2748,15 @@ summary
 | Microsoft.Extensions.Logging.Abstractions;NullLoggerProvider;CreateLogger;(System.String);Argument[0];ReturnValue;taint;df-generated |
 | Microsoft.Extensions.Logging.Abstractions;NullLoggerProvider;CreateLogger;(System.String);Argument[this];ReturnValue;taint;df-generated |
 | Microsoft.Extensions.Logging.Console;ConfigurationConsoleLoggerSettings;ConfigurationConsoleLoggerSettings;(Microsoft.Extensions.Configuration.IConfiguration);Argument[0];Argument[this];taint;df-generated |
-| Microsoft.Extensions.Logging.Console;ConfigurationConsoleLoggerSettings;Reload;();Argument[this];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Logging.Console;ConfigurationConsoleLoggerSettings;Reload;();Argument[this];ReturnValue;value;df-generated |
+| Microsoft.Extensions.Logging.Console;ConfigurationConsoleLoggerSettings;Reload;();Argument[this];ReturnValue;value;dfc-generated |
 | Microsoft.Extensions.Logging.Console;ConsoleFormatter;Write<TState>;(Microsoft.Extensions.Logging.Abstractions.LogEntry<TState>,Microsoft.Extensions.Logging.IExternalScopeProvider,System.IO.TextWriter);Argument[0];Argument[2];taint;df-generated |
 | Microsoft.Extensions.Logging.Console;ConsoleLoggerProvider;ConsoleLoggerProvider;(Microsoft.Extensions.Options.IOptionsMonitor<Microsoft.Extensions.Logging.Console.ConsoleLoggerOptions>,System.Collections.Generic.IEnumerable<Microsoft.Extensions.Logging.Console.ConsoleFormatter>);Argument[0];Argument[this];taint;df-generated |
 | Microsoft.Extensions.Logging.Console;ConsoleLoggerProvider;CreateLogger;(System.String);Argument[0];Argument[this];taint;df-generated |
 | Microsoft.Extensions.Logging.Console;ConsoleLoggerProvider;CreateLogger;(System.String);Argument[0];ReturnValue;taint;df-generated |
 | Microsoft.Extensions.Logging.Console;ConsoleLoggerProvider;CreateLogger;(System.String);Argument[this];ReturnValue;taint;df-generated |
 | Microsoft.Extensions.Logging.Console;ConsoleLoggerProvider;SetScopeProvider;(Microsoft.Extensions.Logging.IExternalScopeProvider);Argument[0];Argument[this];taint;df-generated |
-| Microsoft.Extensions.Logging.Console;ConsoleLoggerSettings;Reload;();Argument[this];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Logging.Console;ConsoleLoggerSettings;Reload;();Argument[this];ReturnValue;value;df-generated |
-| Microsoft.Extensions.Logging.Console;IConsoleLoggerSettings;Reload;();Argument[this];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Logging.Console;IConsoleLoggerSettings;Reload;();Argument[this];ReturnValue;value;df-generated |
+| Microsoft.Extensions.Logging.Console;ConsoleLoggerSettings;Reload;();Argument[this];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Logging.Console;IConsoleLoggerSettings;Reload;();Argument[this];ReturnValue;value;dfc-generated |
 | Microsoft.Extensions.Logging.Debug;DebugLoggerProvider;CreateLogger;(System.String);Argument[0];Argument[this];taint;df-generated |
 | Microsoft.Extensions.Logging.Debug;DebugLoggerProvider;CreateLogger;(System.String);Argument[0];ReturnValue;taint;df-generated |
 | Microsoft.Extensions.Logging.Debug;DebugLoggerProvider;CreateLogger;(System.String);Argument[this];ReturnValue;taint;df-generated |
@@ -2518,60 +2775,137 @@ summary
 | Microsoft.Extensions.Logging.TraceSource;TraceSourceLoggerProvider;CreateLogger;(System.String);Argument[this];ReturnValue;taint;df-generated |
 | Microsoft.Extensions.Logging.TraceSource;TraceSourceLoggerProvider;TraceSourceLoggerProvider;(System.Diagnostics.SourceSwitch,System.Diagnostics.TraceListener);Argument[0];Argument[this];taint;df-generated |
 | Microsoft.Extensions.Logging.TraceSource;TraceSourceLoggerProvider;TraceSourceLoggerProvider;(System.Diagnostics.SourceSwitch,System.Diagnostics.TraceListener);Argument[1];Argument[this];taint;df-generated |
-| Microsoft.Extensions.Logging;ConsoleLoggerExtensions;AddConsole;(Microsoft.Extensions.Logging.ILoggerFactory);Argument[0];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Logging;ConsoleLoggerExtensions;AddConsole;(Microsoft.Extensions.Logging.ILoggerFactory,Microsoft.Extensions.Configuration.IConfiguration);Argument[0];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Logging;ConsoleLoggerExtensions;AddConsole;(Microsoft.Extensions.Logging.ILoggerFactory,Microsoft.Extensions.Logging.Console.IConsoleLoggerSettings);Argument[0];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Logging;ConsoleLoggerExtensions;AddConsole;(Microsoft.Extensions.Logging.ILoggerFactory,Microsoft.Extensions.Logging.LogLevel);Argument[0];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Logging;ConsoleLoggerExtensions;AddConsole;(Microsoft.Extensions.Logging.ILoggerFactory,Microsoft.Extensions.Logging.LogLevel,System.Boolean);Argument[0];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Logging;ConsoleLoggerExtensions;AddConsole;(Microsoft.Extensions.Logging.ILoggerFactory,System.Boolean);Argument[0];ReturnValue;taint;df-generated |
+| Microsoft.Extensions.Logging;ConsoleLoggerExtensions;AddConsole;(Microsoft.Extensions.Logging.ILoggerFactory);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Logging;ConsoleLoggerExtensions;AddConsole;(Microsoft.Extensions.Logging.ILoggerFactory,Microsoft.Extensions.Configuration.IConfiguration);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Logging;ConsoleLoggerExtensions;AddConsole;(Microsoft.Extensions.Logging.ILoggerFactory,Microsoft.Extensions.Logging.Console.IConsoleLoggerSettings);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Logging;ConsoleLoggerExtensions;AddConsole;(Microsoft.Extensions.Logging.ILoggerFactory,Microsoft.Extensions.Logging.LogLevel);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Logging;ConsoleLoggerExtensions;AddConsole;(Microsoft.Extensions.Logging.ILoggerFactory,Microsoft.Extensions.Logging.LogLevel,System.Boolean);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Logging;ConsoleLoggerExtensions;AddConsole;(Microsoft.Extensions.Logging.ILoggerFactory,System.Boolean);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Logging;ConsoleLoggerExtensions;AddConsole;(Microsoft.Extensions.Logging.ILoggerFactory,System.Func<System.String,Microsoft.Extensions.Logging.LogLevel,System.Boolean>);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Logging;ConsoleLoggerExtensions;AddConsole;(Microsoft.Extensions.Logging.ILoggerFactory,System.Func<System.String,Microsoft.Extensions.Logging.LogLevel,System.Boolean>);Argument[0];ReturnValue;value;hq-generated |
+| Microsoft.Extensions.Logging;ConsoleLoggerExtensions;AddConsole;(Microsoft.Extensions.Logging.ILoggerFactory,System.Func<System.String,Microsoft.Extensions.Logging.LogLevel,System.Boolean>);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.Logging;ConsoleLoggerExtensions;AddConsole;(Microsoft.Extensions.Logging.ILoggerFactory,System.Func<System.String,Microsoft.Extensions.Logging.LogLevel,System.Boolean>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
+| Microsoft.Extensions.Logging;ConsoleLoggerExtensions;AddConsole;(Microsoft.Extensions.Logging.ILoggerFactory,System.Func<System.String,Microsoft.Extensions.Logging.LogLevel,System.Boolean>,System.Boolean);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Logging;ConsoleLoggerExtensions;AddConsole;(Microsoft.Extensions.Logging.ILoggerFactory,System.Func<System.String,Microsoft.Extensions.Logging.LogLevel,System.Boolean>,System.Boolean);Argument[0];ReturnValue;value;hq-generated |
+| Microsoft.Extensions.Logging;ConsoleLoggerExtensions;AddConsole;(Microsoft.Extensions.Logging.ILoggerFactory,System.Func<System.String,Microsoft.Extensions.Logging.LogLevel,System.Boolean>,System.Boolean);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.Logging;ConsoleLoggerExtensions;AddConsole;(Microsoft.Extensions.Logging.ILoggerFactory,System.Func<System.String,Microsoft.Extensions.Logging.LogLevel,System.Boolean>,System.Boolean);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
-| Microsoft.Extensions.Logging;ConsoleLoggerExtensions;AddConsole;(Microsoft.Extensions.Logging.ILoggingBuilder);Argument[0];ReturnValue;taint;df-generated |
+| Microsoft.Extensions.Logging;ConsoleLoggerExtensions;AddConsole;(Microsoft.Extensions.Logging.ILoggingBuilder);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Logging;ConsoleLoggerExtensions;AddConsole;(Microsoft.Extensions.Logging.ILoggingBuilder,System.Action<Microsoft.Extensions.Logging.Console.ConsoleLoggerOptions>);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Logging;ConsoleLoggerExtensions;AddConsole;(Microsoft.Extensions.Logging.ILoggingBuilder,System.Action<Microsoft.Extensions.Logging.Console.ConsoleLoggerOptions>);Argument[0];ReturnValue;value;hq-generated |
+| Microsoft.Extensions.Logging;ConsoleLoggerExtensions;AddConsole;(Microsoft.Extensions.Logging.ILoggingBuilder,System.Action<Microsoft.Extensions.Logging.Console.ConsoleLoggerOptions>);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.Logging;ConsoleLoggerExtensions;AddConsole;(Microsoft.Extensions.Logging.ILoggingBuilder,System.Action<Microsoft.Extensions.Logging.Console.ConsoleLoggerOptions>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
-| Microsoft.Extensions.Logging;ConsoleLoggerExtensions;AddConsoleFormatter<TFormatter,TOptions>;(Microsoft.Extensions.Logging.ILoggingBuilder);Argument[0];ReturnValue;taint;df-generated |
+| Microsoft.Extensions.Logging;ConsoleLoggerExtensions;AddConsoleFormatter<TFormatter,TOptions>;(Microsoft.Extensions.Logging.ILoggingBuilder);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Logging;ConsoleLoggerExtensions;AddConsoleFormatter<TFormatter,TOptions>;(Microsoft.Extensions.Logging.ILoggingBuilder,System.Action<TOptions>);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Logging;ConsoleLoggerExtensions;AddConsoleFormatter<TFormatter,TOptions>;(Microsoft.Extensions.Logging.ILoggingBuilder,System.Action<TOptions>);Argument[0];ReturnValue;value;hq-generated |
+| Microsoft.Extensions.Logging;ConsoleLoggerExtensions;AddConsoleFormatter<TFormatter,TOptions>;(Microsoft.Extensions.Logging.ILoggingBuilder,System.Action<TOptions>);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.Logging;ConsoleLoggerExtensions;AddConsoleFormatter<TFormatter,TOptions>;(Microsoft.Extensions.Logging.ILoggingBuilder,System.Action<TOptions>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
-| Microsoft.Extensions.Logging;ConsoleLoggerExtensions;AddJsonConsole;(Microsoft.Extensions.Logging.ILoggingBuilder);Argument[0];ReturnValue;taint;df-generated |
+| Microsoft.Extensions.Logging;ConsoleLoggerExtensions;AddJsonConsole;(Microsoft.Extensions.Logging.ILoggingBuilder);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Logging;ConsoleLoggerExtensions;AddJsonConsole;(Microsoft.Extensions.Logging.ILoggingBuilder,System.Action<Microsoft.Extensions.Logging.Console.JsonConsoleFormatterOptions>);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Logging;ConsoleLoggerExtensions;AddJsonConsole;(Microsoft.Extensions.Logging.ILoggingBuilder,System.Action<Microsoft.Extensions.Logging.Console.JsonConsoleFormatterOptions>);Argument[0];ReturnValue;value;hq-generated |
+| Microsoft.Extensions.Logging;ConsoleLoggerExtensions;AddJsonConsole;(Microsoft.Extensions.Logging.ILoggingBuilder,System.Action<Microsoft.Extensions.Logging.Console.JsonConsoleFormatterOptions>);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.Logging;ConsoleLoggerExtensions;AddJsonConsole;(Microsoft.Extensions.Logging.ILoggingBuilder,System.Action<Microsoft.Extensions.Logging.Console.JsonConsoleFormatterOptions>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
-| Microsoft.Extensions.Logging;ConsoleLoggerExtensions;AddSimpleConsole;(Microsoft.Extensions.Logging.ILoggingBuilder);Argument[0];ReturnValue;taint;df-generated |
+| Microsoft.Extensions.Logging;ConsoleLoggerExtensions;AddSimpleConsole;(Microsoft.Extensions.Logging.ILoggingBuilder);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Logging;ConsoleLoggerExtensions;AddSimpleConsole;(Microsoft.Extensions.Logging.ILoggingBuilder,System.Action<Microsoft.Extensions.Logging.Console.SimpleConsoleFormatterOptions>);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Logging;ConsoleLoggerExtensions;AddSimpleConsole;(Microsoft.Extensions.Logging.ILoggingBuilder,System.Action<Microsoft.Extensions.Logging.Console.SimpleConsoleFormatterOptions>);Argument[0];ReturnValue;value;hq-generated |
+| Microsoft.Extensions.Logging;ConsoleLoggerExtensions;AddSimpleConsole;(Microsoft.Extensions.Logging.ILoggingBuilder,System.Action<Microsoft.Extensions.Logging.Console.SimpleConsoleFormatterOptions>);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.Logging;ConsoleLoggerExtensions;AddSimpleConsole;(Microsoft.Extensions.Logging.ILoggingBuilder,System.Action<Microsoft.Extensions.Logging.Console.SimpleConsoleFormatterOptions>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
-| Microsoft.Extensions.Logging;ConsoleLoggerExtensions;AddSystemdConsole;(Microsoft.Extensions.Logging.ILoggingBuilder);Argument[0];ReturnValue;taint;df-generated |
+| Microsoft.Extensions.Logging;ConsoleLoggerExtensions;AddSystemdConsole;(Microsoft.Extensions.Logging.ILoggingBuilder);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Logging;ConsoleLoggerExtensions;AddSystemdConsole;(Microsoft.Extensions.Logging.ILoggingBuilder,System.Action<Microsoft.Extensions.Logging.Console.ConsoleFormatterOptions>);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Logging;ConsoleLoggerExtensions;AddSystemdConsole;(Microsoft.Extensions.Logging.ILoggingBuilder,System.Action<Microsoft.Extensions.Logging.Console.ConsoleFormatterOptions>);Argument[0];ReturnValue;value;hq-generated |
+| Microsoft.Extensions.Logging;ConsoleLoggerExtensions;AddSystemdConsole;(Microsoft.Extensions.Logging.ILoggingBuilder,System.Action<Microsoft.Extensions.Logging.Console.ConsoleFormatterOptions>);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.Logging;ConsoleLoggerExtensions;AddSystemdConsole;(Microsoft.Extensions.Logging.ILoggingBuilder,System.Action<Microsoft.Extensions.Logging.Console.ConsoleFormatterOptions>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
-| Microsoft.Extensions.Logging;DebugLoggerFactoryExtensions;AddDebug;(Microsoft.Extensions.Logging.ILoggerFactory);Argument[0];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Logging;DebugLoggerFactoryExtensions;AddDebug;(Microsoft.Extensions.Logging.ILoggerFactory,Microsoft.Extensions.Logging.LogLevel);Argument[0];ReturnValue;taint;df-generated |
+| Microsoft.Extensions.Logging;DebugLoggerFactoryExtensions;AddDebug;(Microsoft.Extensions.Logging.ILoggerFactory);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Logging;DebugLoggerFactoryExtensions;AddDebug;(Microsoft.Extensions.Logging.ILoggerFactory,Microsoft.Extensions.Logging.LogLevel);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Logging;DebugLoggerFactoryExtensions;AddDebug;(Microsoft.Extensions.Logging.ILoggerFactory,System.Func<System.String,Microsoft.Extensions.Logging.LogLevel,System.Boolean>);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Logging;DebugLoggerFactoryExtensions;AddDebug;(Microsoft.Extensions.Logging.ILoggerFactory,System.Func<System.String,Microsoft.Extensions.Logging.LogLevel,System.Boolean>);Argument[0];ReturnValue;value;hq-generated |
+| Microsoft.Extensions.Logging;DebugLoggerFactoryExtensions;AddDebug;(Microsoft.Extensions.Logging.ILoggerFactory,System.Func<System.String,Microsoft.Extensions.Logging.LogLevel,System.Boolean>);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.Logging;DebugLoggerFactoryExtensions;AddDebug;(Microsoft.Extensions.Logging.ILoggerFactory,System.Func<System.String,Microsoft.Extensions.Logging.LogLevel,System.Boolean>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
-| Microsoft.Extensions.Logging;DebugLoggerFactoryExtensions;AddDebug;(Microsoft.Extensions.Logging.ILoggingBuilder);Argument[0];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Logging;EventId;ToString;();Argument[this];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Logging;EventLoggerFactoryExtensions;AddEventLog;(Microsoft.Extensions.Logging.ILoggerFactory);Argument[0];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Logging;EventLoggerFactoryExtensions;AddEventLog;(Microsoft.Extensions.Logging.ILoggerFactory,Microsoft.Extensions.Logging.EventLog.EventLogSettings);Argument[0];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Logging;EventLoggerFactoryExtensions;AddEventLog;(Microsoft.Extensions.Logging.ILoggerFactory,Microsoft.Extensions.Logging.LogLevel);Argument[0];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Logging;EventLoggerFactoryExtensions;AddEventLog;(Microsoft.Extensions.Logging.ILoggingBuilder);Argument[0];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Logging;EventLoggerFactoryExtensions;AddEventLog;(Microsoft.Extensions.Logging.ILoggingBuilder,Microsoft.Extensions.Logging.EventLog.EventLogSettings);Argument[0];ReturnValue;taint;df-generated |
+| Microsoft.Extensions.Logging;DebugLoggerFactoryExtensions;AddDebug;(Microsoft.Extensions.Logging.ILoggingBuilder);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Logging;EventId;ToString;();Argument[this].Property[Microsoft.Extensions.Logging.EventId.Name];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Logging;EventLoggerFactoryExtensions;AddEventLog;(Microsoft.Extensions.Logging.ILoggerFactory);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Logging;EventLoggerFactoryExtensions;AddEventLog;(Microsoft.Extensions.Logging.ILoggerFactory,Microsoft.Extensions.Logging.EventLog.EventLogSettings);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Logging;EventLoggerFactoryExtensions;AddEventLog;(Microsoft.Extensions.Logging.ILoggerFactory,Microsoft.Extensions.Logging.LogLevel);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Logging;EventLoggerFactoryExtensions;AddEventLog;(Microsoft.Extensions.Logging.ILoggingBuilder);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Logging;EventLoggerFactoryExtensions;AddEventLog;(Microsoft.Extensions.Logging.ILoggingBuilder,Microsoft.Extensions.Logging.EventLog.EventLogSettings);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Logging;EventLoggerFactoryExtensions;AddEventLog;(Microsoft.Extensions.Logging.ILoggingBuilder,System.Action<Microsoft.Extensions.Logging.EventLog.EventLogSettings>);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Logging;EventLoggerFactoryExtensions;AddEventLog;(Microsoft.Extensions.Logging.ILoggingBuilder,System.Action<Microsoft.Extensions.Logging.EventLog.EventLogSettings>);Argument[0];ReturnValue;value;hq-generated |
+| Microsoft.Extensions.Logging;EventLoggerFactoryExtensions;AddEventLog;(Microsoft.Extensions.Logging.ILoggingBuilder,System.Action<Microsoft.Extensions.Logging.EventLog.EventLogSettings>);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.Logging;EventLoggerFactoryExtensions;AddEventLog;(Microsoft.Extensions.Logging.ILoggingBuilder,System.Action<Microsoft.Extensions.Logging.EventLog.EventLogSettings>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
-| Microsoft.Extensions.Logging;EventSourceLoggerFactoryExtensions;AddEventSourceLogger;(Microsoft.Extensions.Logging.ILoggerFactory);Argument[0];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Logging;EventSourceLoggerFactoryExtensions;AddEventSourceLogger;(Microsoft.Extensions.Logging.ILoggingBuilder);Argument[0];ReturnValue;taint;df-generated |
+| Microsoft.Extensions.Logging;EventSourceLoggerFactoryExtensions;AddEventSourceLogger;(Microsoft.Extensions.Logging.ILoggerFactory);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Logging;EventSourceLoggerFactoryExtensions;AddEventSourceLogger;(Microsoft.Extensions.Logging.ILoggingBuilder);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Logging;FilterLoggingBuilderExtensions;AddFilter;(Microsoft.Extensions.Logging.ILoggingBuilder,System.Func<Microsoft.Extensions.Logging.LogLevel,System.Boolean>);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Logging;FilterLoggingBuilderExtensions;AddFilter;(Microsoft.Extensions.Logging.ILoggingBuilder,System.Func<Microsoft.Extensions.Logging.LogLevel,System.Boolean>);Argument[0];ReturnValue;value;hq-generated |
+| Microsoft.Extensions.Logging;FilterLoggingBuilderExtensions;AddFilter;(Microsoft.Extensions.Logging.ILoggingBuilder,System.Func<Microsoft.Extensions.Logging.LogLevel,System.Boolean>);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.Logging;FilterLoggingBuilderExtensions;AddFilter;(Microsoft.Extensions.Logging.ILoggingBuilder,System.Func<Microsoft.Extensions.Logging.LogLevel,System.Boolean>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
+| Microsoft.Extensions.Logging;FilterLoggingBuilderExtensions;AddFilter;(Microsoft.Extensions.Logging.ILoggingBuilder,System.Func<System.String,Microsoft.Extensions.Logging.LogLevel,System.Boolean>);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Logging;FilterLoggingBuilderExtensions;AddFilter;(Microsoft.Extensions.Logging.ILoggingBuilder,System.Func<System.String,Microsoft.Extensions.Logging.LogLevel,System.Boolean>);Argument[0];ReturnValue;value;hq-generated |
+| Microsoft.Extensions.Logging;FilterLoggingBuilderExtensions;AddFilter;(Microsoft.Extensions.Logging.ILoggingBuilder,System.Func<System.String,Microsoft.Extensions.Logging.LogLevel,System.Boolean>);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.Logging;FilterLoggingBuilderExtensions;AddFilter;(Microsoft.Extensions.Logging.ILoggingBuilder,System.Func<System.String,Microsoft.Extensions.Logging.LogLevel,System.Boolean>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
+| Microsoft.Extensions.Logging;FilterLoggingBuilderExtensions;AddFilter;(Microsoft.Extensions.Logging.ILoggingBuilder,System.Func<System.String,System.String,Microsoft.Extensions.Logging.LogLevel,System.Boolean>);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Logging;FilterLoggingBuilderExtensions;AddFilter;(Microsoft.Extensions.Logging.ILoggingBuilder,System.Func<System.String,System.String,Microsoft.Extensions.Logging.LogLevel,System.Boolean>);Argument[0];ReturnValue;value;hq-generated |
+| Microsoft.Extensions.Logging;FilterLoggingBuilderExtensions;AddFilter;(Microsoft.Extensions.Logging.ILoggingBuilder,System.Func<System.String,System.String,Microsoft.Extensions.Logging.LogLevel,System.Boolean>);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.Logging;FilterLoggingBuilderExtensions;AddFilter;(Microsoft.Extensions.Logging.ILoggingBuilder,System.Func<System.String,System.String,Microsoft.Extensions.Logging.LogLevel,System.Boolean>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
-| Microsoft.Extensions.Logging;FilterLoggingBuilderExtensions;AddFilter;(Microsoft.Extensions.Logging.ILoggingBuilder,System.String,Microsoft.Extensions.Logging.LogLevel);Argument[0];ReturnValue;taint;df-generated |
+| Microsoft.Extensions.Logging;FilterLoggingBuilderExtensions;AddFilter;(Microsoft.Extensions.Logging.ILoggingBuilder,System.String,Microsoft.Extensions.Logging.LogLevel);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Logging;FilterLoggingBuilderExtensions;AddFilter;(Microsoft.Extensions.Logging.ILoggingBuilder,System.String,System.Func<Microsoft.Extensions.Logging.LogLevel,System.Boolean>);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Logging;FilterLoggingBuilderExtensions;AddFilter;(Microsoft.Extensions.Logging.ILoggingBuilder,System.String,System.Func<Microsoft.Extensions.Logging.LogLevel,System.Boolean>);Argument[0];ReturnValue;value;hq-generated |
+| Microsoft.Extensions.Logging;FilterLoggingBuilderExtensions;AddFilter;(Microsoft.Extensions.Logging.ILoggingBuilder,System.String,System.Func<Microsoft.Extensions.Logging.LogLevel,System.Boolean>);Argument[2];Argument[2].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.Logging;FilterLoggingBuilderExtensions;AddFilter;(Microsoft.Extensions.Logging.ILoggingBuilder,System.String,System.Func<Microsoft.Extensions.Logging.LogLevel,System.Boolean>);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
+| Microsoft.Extensions.Logging;FilterLoggingBuilderExtensions;AddFilter;(Microsoft.Extensions.Logging.LoggerFilterOptions,System.Func<Microsoft.Extensions.Logging.LogLevel,System.Boolean>);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Logging;FilterLoggingBuilderExtensions;AddFilter;(Microsoft.Extensions.Logging.LoggerFilterOptions,System.Func<Microsoft.Extensions.Logging.LogLevel,System.Boolean>);Argument[0];ReturnValue;value;hq-generated |
+| Microsoft.Extensions.Logging;FilterLoggingBuilderExtensions;AddFilter;(Microsoft.Extensions.Logging.LoggerFilterOptions,System.Func<Microsoft.Extensions.Logging.LogLevel,System.Boolean>);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.Logging;FilterLoggingBuilderExtensions;AddFilter;(Microsoft.Extensions.Logging.LoggerFilterOptions,System.Func<Microsoft.Extensions.Logging.LogLevel,System.Boolean>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
+| Microsoft.Extensions.Logging;FilterLoggingBuilderExtensions;AddFilter;(Microsoft.Extensions.Logging.LoggerFilterOptions,System.Func<System.String,Microsoft.Extensions.Logging.LogLevel,System.Boolean>);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Logging;FilterLoggingBuilderExtensions;AddFilter;(Microsoft.Extensions.Logging.LoggerFilterOptions,System.Func<System.String,Microsoft.Extensions.Logging.LogLevel,System.Boolean>);Argument[0];ReturnValue;value;hq-generated |
+| Microsoft.Extensions.Logging;FilterLoggingBuilderExtensions;AddFilter;(Microsoft.Extensions.Logging.LoggerFilterOptions,System.Func<System.String,Microsoft.Extensions.Logging.LogLevel,System.Boolean>);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.Logging;FilterLoggingBuilderExtensions;AddFilter;(Microsoft.Extensions.Logging.LoggerFilterOptions,System.Func<System.String,Microsoft.Extensions.Logging.LogLevel,System.Boolean>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
+| Microsoft.Extensions.Logging;FilterLoggingBuilderExtensions;AddFilter;(Microsoft.Extensions.Logging.LoggerFilterOptions,System.Func<System.String,System.String,Microsoft.Extensions.Logging.LogLevel,System.Boolean>);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Logging;FilterLoggingBuilderExtensions;AddFilter;(Microsoft.Extensions.Logging.LoggerFilterOptions,System.Func<System.String,System.String,Microsoft.Extensions.Logging.LogLevel,System.Boolean>);Argument[0];ReturnValue;value;hq-generated |
+| Microsoft.Extensions.Logging;FilterLoggingBuilderExtensions;AddFilter;(Microsoft.Extensions.Logging.LoggerFilterOptions,System.Func<System.String,System.String,Microsoft.Extensions.Logging.LogLevel,System.Boolean>);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.Logging;FilterLoggingBuilderExtensions;AddFilter;(Microsoft.Extensions.Logging.LoggerFilterOptions,System.Func<System.String,System.String,Microsoft.Extensions.Logging.LogLevel,System.Boolean>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
-| Microsoft.Extensions.Logging;FilterLoggingBuilderExtensions;AddFilter;(Microsoft.Extensions.Logging.LoggerFilterOptions,System.String,Microsoft.Extensions.Logging.LogLevel);Argument[0];ReturnValue;taint;df-generated |
+| Microsoft.Extensions.Logging;FilterLoggingBuilderExtensions;AddFilter;(Microsoft.Extensions.Logging.LoggerFilterOptions,System.String,Microsoft.Extensions.Logging.LogLevel);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Logging;FilterLoggingBuilderExtensions;AddFilter;(Microsoft.Extensions.Logging.LoggerFilterOptions,System.String,System.Func<Microsoft.Extensions.Logging.LogLevel,System.Boolean>);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Logging;FilterLoggingBuilderExtensions;AddFilter;(Microsoft.Extensions.Logging.LoggerFilterOptions,System.String,System.Func<Microsoft.Extensions.Logging.LogLevel,System.Boolean>);Argument[0];ReturnValue;value;hq-generated |
+| Microsoft.Extensions.Logging;FilterLoggingBuilderExtensions;AddFilter;(Microsoft.Extensions.Logging.LoggerFilterOptions,System.String,System.Func<Microsoft.Extensions.Logging.LogLevel,System.Boolean>);Argument[2];Argument[2].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.Logging;FilterLoggingBuilderExtensions;AddFilter;(Microsoft.Extensions.Logging.LoggerFilterOptions,System.String,System.Func<Microsoft.Extensions.Logging.LogLevel,System.Boolean>);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
+| Microsoft.Extensions.Logging;FilterLoggingBuilderExtensions;AddFilter<T>;(Microsoft.Extensions.Logging.ILoggingBuilder,System.Func<Microsoft.Extensions.Logging.LogLevel,System.Boolean>);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Logging;FilterLoggingBuilderExtensions;AddFilter<T>;(Microsoft.Extensions.Logging.ILoggingBuilder,System.Func<Microsoft.Extensions.Logging.LogLevel,System.Boolean>);Argument[0];ReturnValue;value;hq-generated |
+| Microsoft.Extensions.Logging;FilterLoggingBuilderExtensions;AddFilter<T>;(Microsoft.Extensions.Logging.ILoggingBuilder,System.Func<Microsoft.Extensions.Logging.LogLevel,System.Boolean>);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.Logging;FilterLoggingBuilderExtensions;AddFilter<T>;(Microsoft.Extensions.Logging.ILoggingBuilder,System.Func<Microsoft.Extensions.Logging.LogLevel,System.Boolean>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
+| Microsoft.Extensions.Logging;FilterLoggingBuilderExtensions;AddFilter<T>;(Microsoft.Extensions.Logging.ILoggingBuilder,System.Func<System.String,Microsoft.Extensions.Logging.LogLevel,System.Boolean>);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Logging;FilterLoggingBuilderExtensions;AddFilter<T>;(Microsoft.Extensions.Logging.ILoggingBuilder,System.Func<System.String,Microsoft.Extensions.Logging.LogLevel,System.Boolean>);Argument[0];ReturnValue;value;hq-generated |
+| Microsoft.Extensions.Logging;FilterLoggingBuilderExtensions;AddFilter<T>;(Microsoft.Extensions.Logging.ILoggingBuilder,System.Func<System.String,Microsoft.Extensions.Logging.LogLevel,System.Boolean>);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.Logging;FilterLoggingBuilderExtensions;AddFilter<T>;(Microsoft.Extensions.Logging.ILoggingBuilder,System.Func<System.String,Microsoft.Extensions.Logging.LogLevel,System.Boolean>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
-| Microsoft.Extensions.Logging;FilterLoggingBuilderExtensions;AddFilter<T>;(Microsoft.Extensions.Logging.ILoggingBuilder,System.String,Microsoft.Extensions.Logging.LogLevel);Argument[0];ReturnValue;taint;df-generated |
+| Microsoft.Extensions.Logging;FilterLoggingBuilderExtensions;AddFilter<T>;(Microsoft.Extensions.Logging.ILoggingBuilder,System.String,Microsoft.Extensions.Logging.LogLevel);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Logging;FilterLoggingBuilderExtensions;AddFilter<T>;(Microsoft.Extensions.Logging.ILoggingBuilder,System.String,System.Func<Microsoft.Extensions.Logging.LogLevel,System.Boolean>);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Logging;FilterLoggingBuilderExtensions;AddFilter<T>;(Microsoft.Extensions.Logging.ILoggingBuilder,System.String,System.Func<Microsoft.Extensions.Logging.LogLevel,System.Boolean>);Argument[0];ReturnValue;value;hq-generated |
+| Microsoft.Extensions.Logging;FilterLoggingBuilderExtensions;AddFilter<T>;(Microsoft.Extensions.Logging.ILoggingBuilder,System.String,System.Func<Microsoft.Extensions.Logging.LogLevel,System.Boolean>);Argument[2];Argument[2].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.Logging;FilterLoggingBuilderExtensions;AddFilter<T>;(Microsoft.Extensions.Logging.ILoggingBuilder,System.String,System.Func<Microsoft.Extensions.Logging.LogLevel,System.Boolean>);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
+| Microsoft.Extensions.Logging;FilterLoggingBuilderExtensions;AddFilter<T>;(Microsoft.Extensions.Logging.LoggerFilterOptions,System.Func<Microsoft.Extensions.Logging.LogLevel,System.Boolean>);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Logging;FilterLoggingBuilderExtensions;AddFilter<T>;(Microsoft.Extensions.Logging.LoggerFilterOptions,System.Func<Microsoft.Extensions.Logging.LogLevel,System.Boolean>);Argument[0];ReturnValue;value;hq-generated |
+| Microsoft.Extensions.Logging;FilterLoggingBuilderExtensions;AddFilter<T>;(Microsoft.Extensions.Logging.LoggerFilterOptions,System.Func<Microsoft.Extensions.Logging.LogLevel,System.Boolean>);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.Logging;FilterLoggingBuilderExtensions;AddFilter<T>;(Microsoft.Extensions.Logging.LoggerFilterOptions,System.Func<Microsoft.Extensions.Logging.LogLevel,System.Boolean>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
+| Microsoft.Extensions.Logging;FilterLoggingBuilderExtensions;AddFilter<T>;(Microsoft.Extensions.Logging.LoggerFilterOptions,System.Func<System.String,Microsoft.Extensions.Logging.LogLevel,System.Boolean>);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Logging;FilterLoggingBuilderExtensions;AddFilter<T>;(Microsoft.Extensions.Logging.LoggerFilterOptions,System.Func<System.String,Microsoft.Extensions.Logging.LogLevel,System.Boolean>);Argument[0];ReturnValue;value;hq-generated |
+| Microsoft.Extensions.Logging;FilterLoggingBuilderExtensions;AddFilter<T>;(Microsoft.Extensions.Logging.LoggerFilterOptions,System.Func<System.String,Microsoft.Extensions.Logging.LogLevel,System.Boolean>);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.Logging;FilterLoggingBuilderExtensions;AddFilter<T>;(Microsoft.Extensions.Logging.LoggerFilterOptions,System.Func<System.String,Microsoft.Extensions.Logging.LogLevel,System.Boolean>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
-| Microsoft.Extensions.Logging;FilterLoggingBuilderExtensions;AddFilter<T>;(Microsoft.Extensions.Logging.LoggerFilterOptions,System.String,Microsoft.Extensions.Logging.LogLevel);Argument[0];ReturnValue;taint;df-generated |
+| Microsoft.Extensions.Logging;FilterLoggingBuilderExtensions;AddFilter<T>;(Microsoft.Extensions.Logging.LoggerFilterOptions,System.String,Microsoft.Extensions.Logging.LogLevel);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Logging;FilterLoggingBuilderExtensions;AddFilter<T>;(Microsoft.Extensions.Logging.LoggerFilterOptions,System.String,System.Func<Microsoft.Extensions.Logging.LogLevel,System.Boolean>);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Logging;FilterLoggingBuilderExtensions;AddFilter<T>;(Microsoft.Extensions.Logging.LoggerFilterOptions,System.String,System.Func<Microsoft.Extensions.Logging.LogLevel,System.Boolean>);Argument[0];ReturnValue;value;hq-generated |
+| Microsoft.Extensions.Logging;FilterLoggingBuilderExtensions;AddFilter<T>;(Microsoft.Extensions.Logging.LoggerFilterOptions,System.String,System.Func<Microsoft.Extensions.Logging.LogLevel,System.Boolean>);Argument[2];Argument[2].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.Logging;FilterLoggingBuilderExtensions;AddFilter<T>;(Microsoft.Extensions.Logging.LoggerFilterOptions,System.String,System.Func<Microsoft.Extensions.Logging.LogLevel,System.Boolean>);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
+| Microsoft.Extensions.Logging;IExternalScopeProvider;ForEachScope<TState>;(System.Action<System.Object,TState>,TState);Argument[0];Argument[0].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.Logging;IExternalScopeProvider;ForEachScope<TState>;(System.Action<System.Object,TState>,TState);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
+| Microsoft.Extensions.Logging;IExternalScopeProvider;ForEachScope<TState>;(System.Action<System.Object,TState>,TState);Argument[1];Argument[0].Parameter[1];value;dfc-generated |
+| Microsoft.Extensions.Logging;IExternalScopeProvider;ForEachScope<TState>;(System.Action<System.Object,TState>,TState);Argument[1];Argument[0].Parameter[1];value;hq-generated |
 | Microsoft.Extensions.Logging;IExternalScopeProvider;Push;(System.Object);Argument[0];ReturnValue;taint;df-generated |
 | Microsoft.Extensions.Logging;IExternalScopeProvider;Push;(System.Object);Argument[this];ReturnValue;taint;df-generated |
 | Microsoft.Extensions.Logging;ILogger;BeginScope<TState>;(TState);Argument[0];ReturnValue;taint;df-generated |
 | Microsoft.Extensions.Logging;ILogger;BeginScope<TState>;(TState);Argument[this];ReturnValue;taint;df-generated |
+| Microsoft.Extensions.Logging;ILogger;Log<TState>;(Microsoft.Extensions.Logging.LogLevel,Microsoft.Extensions.Logging.EventId,TState,System.Exception,System.Func<TState,System.Exception,System.String>);Argument[2];Argument[4].Parameter[0];value;dfc-generated |
+| Microsoft.Extensions.Logging;ILogger;Log<TState>;(Microsoft.Extensions.Logging.LogLevel,Microsoft.Extensions.Logging.EventId,TState,System.Exception,System.Func<TState,System.Exception,System.String>);Argument[2];Argument[4].Parameter[0];value;hq-generated |
+| Microsoft.Extensions.Logging;ILogger;Log<TState>;(Microsoft.Extensions.Logging.LogLevel,Microsoft.Extensions.Logging.EventId,TState,System.Exception,System.Func<TState,System.Exception,System.String>);Argument[3];Argument[4].Parameter[1];value;dfc-generated |
+| Microsoft.Extensions.Logging;ILogger;Log<TState>;(Microsoft.Extensions.Logging.LogLevel,Microsoft.Extensions.Logging.EventId,TState,System.Exception,System.Func<TState,System.Exception,System.String>);Argument[3];Argument[4].Parameter[1];value;hq-generated |
+| Microsoft.Extensions.Logging;ILogger;Log<TState>;(Microsoft.Extensions.Logging.LogLevel,Microsoft.Extensions.Logging.EventId,TState,System.Exception,System.Func<TState,System.Exception,System.String>);Argument[4];Argument[4].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.Logging;ILogger;Log<TState>;(Microsoft.Extensions.Logging.LogLevel,Microsoft.Extensions.Logging.EventId,TState,System.Exception,System.Func<TState,System.Exception,System.String>);Argument[4];Argument[4].Parameter[delegate-self];value;hq-generated |
 | Microsoft.Extensions.Logging;ILoggerFactory;AddProvider;(Microsoft.Extensions.Logging.ILoggerProvider);Argument[this];Argument[0];taint;df-generated |
 | Microsoft.Extensions.Logging;ILoggerFactory;CreateLogger;(System.String);Argument[0];ReturnValue;taint;df-generated |
@@ -2581,11 +2915,19 @@ summary
 | Microsoft.Extensions.Logging;ISupportExternalScope;SetScopeProvider;(Microsoft.Extensions.Logging.IExternalScopeProvider);Argument[0];Argument[this];taint;df-generated |
 | Microsoft.Extensions.Logging;Logger<T>;BeginScope<TState>;(TState);Argument[0];ReturnValue;taint;df-generated |
 | Microsoft.Extensions.Logging;Logger<T>;BeginScope<TState>;(TState);Argument[this];ReturnValue;taint;df-generated |
+| Microsoft.Extensions.Logging;Logger<T>;Log<TState>;(Microsoft.Extensions.Logging.LogLevel,Microsoft.Extensions.Logging.EventId,TState,System.Exception,System.Func<TState,System.Exception,System.String>);Argument[2];Argument[4].Parameter[0];value;dfc-generated |
+| Microsoft.Extensions.Logging;Logger<T>;Log<TState>;(Microsoft.Extensions.Logging.LogLevel,Microsoft.Extensions.Logging.EventId,TState,System.Exception,System.Func<TState,System.Exception,System.String>);Argument[2];Argument[4].Parameter[0];value;hq-generated |
+| Microsoft.Extensions.Logging;Logger<T>;Log<TState>;(Microsoft.Extensions.Logging.LogLevel,Microsoft.Extensions.Logging.EventId,TState,System.Exception,System.Func<TState,System.Exception,System.String>);Argument[3];Argument[4].Parameter[1];value;dfc-generated |
+| Microsoft.Extensions.Logging;Logger<T>;Log<TState>;(Microsoft.Extensions.Logging.LogLevel,Microsoft.Extensions.Logging.EventId,TState,System.Exception,System.Func<TState,System.Exception,System.String>);Argument[3];Argument[4].Parameter[1];value;hq-generated |
+| Microsoft.Extensions.Logging;Logger<T>;Log<TState>;(Microsoft.Extensions.Logging.LogLevel,Microsoft.Extensions.Logging.EventId,TState,System.Exception,System.Func<TState,System.Exception,System.String>);Argument[4];Argument[4].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.Logging;Logger<T>;Log<TState>;(Microsoft.Extensions.Logging.LogLevel,Microsoft.Extensions.Logging.EventId,TState,System.Exception,System.Func<TState,System.Exception,System.String>);Argument[4];Argument[4].Parameter[delegate-self];value;hq-generated |
 | Microsoft.Extensions.Logging;LoggerExtensions;BeginScope;(Microsoft.Extensions.Logging.ILogger,System.String,System.Object[]);Argument[0];ReturnValue;taint;df-generated |
 | Microsoft.Extensions.Logging;LoggerExtensions;BeginScope;(Microsoft.Extensions.Logging.ILogger,System.String,System.Object[]);Argument[1];ReturnValue;taint;df-generated |
 | Microsoft.Extensions.Logging;LoggerExtensions;BeginScope;(Microsoft.Extensions.Logging.ILogger,System.String,System.Object[]);Argument[2].Element;ReturnValue;taint;df-generated |
+| Microsoft.Extensions.Logging;LoggerExternalScopeProvider;ForEachScope<TState>;(System.Action<System.Object,TState>,TState);Argument[0];Argument[0].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.Logging;LoggerExternalScopeProvider;ForEachScope<TState>;(System.Action<System.Object,TState>,TState);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
+| Microsoft.Extensions.Logging;LoggerExternalScopeProvider;ForEachScope<TState>;(System.Action<System.Object,TState>,TState);Argument[1];Argument[0].Parameter[1];value;dfc-generated |
+| Microsoft.Extensions.Logging;LoggerExternalScopeProvider;ForEachScope<TState>;(System.Action<System.Object,TState>,TState);Argument[1];Argument[0].Parameter[1];value;hq-generated |
 | Microsoft.Extensions.Logging;LoggerExternalScopeProvider;Push;(System.Object);Argument[0];ReturnValue;taint;df-generated |
 | Microsoft.Extensions.Logging;LoggerExternalScopeProvider;Push;(System.Object);Argument[this];ReturnValue;taint;df-generated |
 | Microsoft.Extensions.Logging;LoggerFactory;AddProvider;(Microsoft.Extensions.Logging.ILoggerProvider);Argument[this];Argument[0];taint;df-generated |
@@ -2597,55 +2939,143 @@ summary
 | Microsoft.Extensions.Logging;LoggerFilterOptions;get_Rules;();Argument[this];ReturnValue;taint;df-generated |
 | Microsoft.Extensions.Logging;LoggerFilterRule;LoggerFilterRule;(System.String,System.String,System.Nullable<Microsoft.Extensions.Logging.LogLevel>,System.Func<System.String,System.String,Microsoft.Extensions.Logging.LogLevel,System.Boolean>);Argument[3];Argument[3].Parameter[delegate-self];value;hq-generated |
 | Microsoft.Extensions.Logging;LoggerFilterRule;ToString;();Argument[this];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Logging;LoggingBuilderExtensions;AddConfiguration;(Microsoft.Extensions.Logging.ILoggingBuilder,Microsoft.Extensions.Configuration.IConfiguration);Argument[0];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Logging;LoggingBuilderExtensions;AddProvider;(Microsoft.Extensions.Logging.ILoggingBuilder,Microsoft.Extensions.Logging.ILoggerProvider);Argument[0];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Logging;LoggingBuilderExtensions;ClearProviders;(Microsoft.Extensions.Logging.ILoggingBuilder);Argument[0];ReturnValue;taint;df-generated |
+| Microsoft.Extensions.Logging;LoggingBuilderExtensions;AddConfiguration;(Microsoft.Extensions.Logging.ILoggingBuilder,Microsoft.Extensions.Configuration.IConfiguration);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Logging;LoggingBuilderExtensions;AddProvider;(Microsoft.Extensions.Logging.ILoggingBuilder,Microsoft.Extensions.Logging.ILoggerProvider);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Logging;LoggingBuilderExtensions;ClearProviders;(Microsoft.Extensions.Logging.ILoggingBuilder);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Logging;LoggingBuilderExtensions;Configure;(Microsoft.Extensions.Logging.ILoggingBuilder,System.Action<Microsoft.Extensions.Logging.LoggerFactoryOptions>);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Logging;LoggingBuilderExtensions;Configure;(Microsoft.Extensions.Logging.ILoggingBuilder,System.Action<Microsoft.Extensions.Logging.LoggerFactoryOptions>);Argument[0];ReturnValue;value;hq-generated |
+| Microsoft.Extensions.Logging;LoggingBuilderExtensions;Configure;(Microsoft.Extensions.Logging.ILoggingBuilder,System.Action<Microsoft.Extensions.Logging.LoggerFactoryOptions>);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.Logging;LoggingBuilderExtensions;Configure;(Microsoft.Extensions.Logging.ILoggingBuilder,System.Action<Microsoft.Extensions.Logging.LoggerFactoryOptions>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
-| Microsoft.Extensions.Logging;LoggingBuilderExtensions;SetMinimumLevel;(Microsoft.Extensions.Logging.ILoggingBuilder,Microsoft.Extensions.Logging.LogLevel);Argument[0];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Logging;TraceSourceFactoryExtensions;AddTraceSource;(Microsoft.Extensions.Logging.ILoggerFactory,System.Diagnostics.SourceSwitch);Argument[0];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Logging;TraceSourceFactoryExtensions;AddTraceSource;(Microsoft.Extensions.Logging.ILoggerFactory,System.Diagnostics.SourceSwitch,System.Diagnostics.TraceListener);Argument[0];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Logging;TraceSourceFactoryExtensions;AddTraceSource;(Microsoft.Extensions.Logging.ILoggerFactory,System.String);Argument[0];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Logging;TraceSourceFactoryExtensions;AddTraceSource;(Microsoft.Extensions.Logging.ILoggerFactory,System.String,System.Diagnostics.TraceListener);Argument[0];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Logging;TraceSourceFactoryExtensions;AddTraceSource;(Microsoft.Extensions.Logging.ILoggingBuilder,System.Diagnostics.SourceSwitch);Argument[0];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Logging;TraceSourceFactoryExtensions;AddTraceSource;(Microsoft.Extensions.Logging.ILoggingBuilder,System.Diagnostics.SourceSwitch,System.Diagnostics.TraceListener);Argument[0];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Logging;TraceSourceFactoryExtensions;AddTraceSource;(Microsoft.Extensions.Logging.ILoggingBuilder,System.String);Argument[0];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Logging;TraceSourceFactoryExtensions;AddTraceSource;(Microsoft.Extensions.Logging.ILoggingBuilder,System.String,System.Diagnostics.TraceListener);Argument[0];ReturnValue;taint;df-generated |
+| Microsoft.Extensions.Logging;LoggingBuilderExtensions;SetMinimumLevel;(Microsoft.Extensions.Logging.ILoggingBuilder,Microsoft.Extensions.Logging.LogLevel);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Logging;TraceSourceFactoryExtensions;AddTraceSource;(Microsoft.Extensions.Logging.ILoggerFactory,System.Diagnostics.SourceSwitch);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Logging;TraceSourceFactoryExtensions;AddTraceSource;(Microsoft.Extensions.Logging.ILoggerFactory,System.Diagnostics.SourceSwitch,System.Diagnostics.TraceListener);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Logging;TraceSourceFactoryExtensions;AddTraceSource;(Microsoft.Extensions.Logging.ILoggerFactory,System.String);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Logging;TraceSourceFactoryExtensions;AddTraceSource;(Microsoft.Extensions.Logging.ILoggerFactory,System.String,System.Diagnostics.TraceListener);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Logging;TraceSourceFactoryExtensions;AddTraceSource;(Microsoft.Extensions.Logging.ILoggingBuilder,System.Diagnostics.SourceSwitch);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Logging;TraceSourceFactoryExtensions;AddTraceSource;(Microsoft.Extensions.Logging.ILoggingBuilder,System.Diagnostics.SourceSwitch,System.Diagnostics.TraceListener);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Logging;TraceSourceFactoryExtensions;AddTraceSource;(Microsoft.Extensions.Logging.ILoggingBuilder,System.String);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Logging;TraceSourceFactoryExtensions;AddTraceSource;(Microsoft.Extensions.Logging.ILoggingBuilder,System.String,System.Diagnostics.TraceListener);Argument[0];ReturnValue;value;dfc-generated |
 | Microsoft.Extensions.Options;ConfigurationChangeTokenSource<TOptions>;ConfigurationChangeTokenSource;(System.String,Microsoft.Extensions.Configuration.IConfiguration);Argument[1];Argument[this];taint;df-generated |
 | Microsoft.Extensions.Options;ConfigurationChangeTokenSource<TOptions>;GetChangeToken;();Argument[this];ReturnValue;taint;df-generated |
+| Microsoft.Extensions.Options;ConfigureNamedOptions<TOptions,TDep1,TDep2,TDep3,TDep4,TDep5>;Configure;(System.String,TOptions);Argument[1];Argument[this];taint;df-generated |
+| Microsoft.Extensions.Options;ConfigureNamedOptions<TOptions,TDep1,TDep2,TDep3,TDep4,TDep5>;Configure;(TOptions);Argument[0];Argument[this];taint;df-generated |
 | Microsoft.Extensions.Options;ConfigureNamedOptions<TOptions,TDep1,TDep2,TDep3,TDep4,TDep5>;ConfigureNamedOptions;(System.String,TDep1,TDep2,TDep3,TDep4,TDep5,System.Action<TOptions,TDep1,TDep2,TDep3,TDep4,TDep5>);Argument[6];Argument[6].Parameter[delegate-self];value;hq-generated |
+| Microsoft.Extensions.Options;ConfigureNamedOptions<TOptions,TDep1,TDep2,TDep3,TDep4>;Configure;(System.String,TOptions);Argument[1];Argument[this];taint;df-generated |
+| Microsoft.Extensions.Options;ConfigureNamedOptions<TOptions,TDep1,TDep2,TDep3,TDep4>;Configure;(TOptions);Argument[0];Argument[this];taint;df-generated |
 | Microsoft.Extensions.Options;ConfigureNamedOptions<TOptions,TDep1,TDep2,TDep3,TDep4>;ConfigureNamedOptions;(System.String,TDep1,TDep2,TDep3,TDep4,System.Action<TOptions,TDep1,TDep2,TDep3,TDep4>);Argument[5];Argument[5].Parameter[delegate-self];value;hq-generated |
+| Microsoft.Extensions.Options;ConfigureNamedOptions<TOptions,TDep1,TDep2,TDep3>;Configure;(System.String,TOptions);Argument[1];Argument[this];taint;df-generated |
+| Microsoft.Extensions.Options;ConfigureNamedOptions<TOptions,TDep1,TDep2,TDep3>;Configure;(TOptions);Argument[0];Argument[this];taint;df-generated |
 | Microsoft.Extensions.Options;ConfigureNamedOptions<TOptions,TDep1,TDep2,TDep3>;ConfigureNamedOptions;(System.String,TDep1,TDep2,TDep3,System.Action<TOptions,TDep1,TDep2,TDep3>);Argument[4];Argument[4].Parameter[delegate-self];value;hq-generated |
+| Microsoft.Extensions.Options;ConfigureNamedOptions<TOptions,TDep1,TDep2>;Configure;(System.String,TOptions);Argument[1];Argument[this];taint;df-generated |
+| Microsoft.Extensions.Options;ConfigureNamedOptions<TOptions,TDep1,TDep2>;Configure;(TOptions);Argument[0];Argument[this];taint;df-generated |
 | Microsoft.Extensions.Options;ConfigureNamedOptions<TOptions,TDep1,TDep2>;ConfigureNamedOptions;(System.String,TDep1,TDep2,System.Action<TOptions,TDep1,TDep2>);Argument[3];Argument[3].Parameter[delegate-self];value;hq-generated |
+| Microsoft.Extensions.Options;ConfigureNamedOptions<TOptions,TDep>;Configure;(System.String,TOptions);Argument[1];Argument[this];taint;df-generated |
+| Microsoft.Extensions.Options;ConfigureNamedOptions<TOptions,TDep>;Configure;(TOptions);Argument[0];Argument[this];taint;df-generated |
 | Microsoft.Extensions.Options;ConfigureNamedOptions<TOptions,TDep>;ConfigureNamedOptions;(System.String,TDep,System.Action<TOptions,TDep>);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
+| Microsoft.Extensions.Options;ConfigureNamedOptions<TOptions>;Configure;(System.String,TOptions);Argument[1];Argument[this];taint;df-generated |
+| Microsoft.Extensions.Options;ConfigureNamedOptions<TOptions>;Configure;(TOptions);Argument[0];Argument[this];taint;df-generated |
 | Microsoft.Extensions.Options;ConfigureNamedOptions<TOptions>;ConfigureNamedOptions;(System.String,System.Action<TOptions>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
+| Microsoft.Extensions.Options;ConfigureOptions<TOptions>;Configure;(TOptions);Argument[0];Argument[this];taint;df-generated |
 | Microsoft.Extensions.Options;ConfigureOptions<TOptions>;ConfigureOptions;(System.Action<TOptions>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | Microsoft.Extensions.Options;IOptionsMonitor<TOptions>;OnChange;(System.Action<TOptions,System.String>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | Microsoft.Extensions.Options;IOptionsMonitorCache<TOptions>;GetOrAdd;(System.String,System.Func<TOptions>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
 | Microsoft.Extensions.Options;NamedConfigureFromConfigurationOptions<TOptions>;NamedConfigureFromConfigurationOptions;(System.String,Microsoft.Extensions.Configuration.IConfiguration,System.Action<Microsoft.Extensions.Configuration.BinderOptions>);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
+| Microsoft.Extensions.Options;OptionsBuilder<TOptions>;Configure;(System.Action<TOptions>);Argument[0];Argument[0].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.Options;OptionsBuilder<TOptions>;Configure;(System.Action<TOptions>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
+| Microsoft.Extensions.Options;OptionsBuilder<TOptions>;Configure;(System.Action<TOptions>);Argument[this];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Options;OptionsBuilder<TOptions>;Configure;(System.Action<TOptions>);Argument[this];ReturnValue;value;hq-generated |
+| Microsoft.Extensions.Options;OptionsBuilder<TOptions>;Configure<TDep1,TDep2,TDep3,TDep4,TDep5>;(System.Action<TOptions,TDep1,TDep2,TDep3,TDep4,TDep5>);Argument[0];Argument[0].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.Options;OptionsBuilder<TOptions>;Configure<TDep1,TDep2,TDep3,TDep4,TDep5>;(System.Action<TOptions,TDep1,TDep2,TDep3,TDep4,TDep5>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
+| Microsoft.Extensions.Options;OptionsBuilder<TOptions>;Configure<TDep1,TDep2,TDep3,TDep4,TDep5>;(System.Action<TOptions,TDep1,TDep2,TDep3,TDep4,TDep5>);Argument[this];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Options;OptionsBuilder<TOptions>;Configure<TDep1,TDep2,TDep3,TDep4,TDep5>;(System.Action<TOptions,TDep1,TDep2,TDep3,TDep4,TDep5>);Argument[this];ReturnValue;value;hq-generated |
+| Microsoft.Extensions.Options;OptionsBuilder<TOptions>;Configure<TDep1,TDep2,TDep3,TDep4>;(System.Action<TOptions,TDep1,TDep2,TDep3,TDep4>);Argument[0];Argument[0].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.Options;OptionsBuilder<TOptions>;Configure<TDep1,TDep2,TDep3,TDep4>;(System.Action<TOptions,TDep1,TDep2,TDep3,TDep4>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
+| Microsoft.Extensions.Options;OptionsBuilder<TOptions>;Configure<TDep1,TDep2,TDep3,TDep4>;(System.Action<TOptions,TDep1,TDep2,TDep3,TDep4>);Argument[this];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Options;OptionsBuilder<TOptions>;Configure<TDep1,TDep2,TDep3,TDep4>;(System.Action<TOptions,TDep1,TDep2,TDep3,TDep4>);Argument[this];ReturnValue;value;hq-generated |
+| Microsoft.Extensions.Options;OptionsBuilder<TOptions>;Configure<TDep1,TDep2,TDep3>;(System.Action<TOptions,TDep1,TDep2,TDep3>);Argument[0];Argument[0].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.Options;OptionsBuilder<TOptions>;Configure<TDep1,TDep2,TDep3>;(System.Action<TOptions,TDep1,TDep2,TDep3>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
+| Microsoft.Extensions.Options;OptionsBuilder<TOptions>;Configure<TDep1,TDep2,TDep3>;(System.Action<TOptions,TDep1,TDep2,TDep3>);Argument[this];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Options;OptionsBuilder<TOptions>;Configure<TDep1,TDep2,TDep3>;(System.Action<TOptions,TDep1,TDep2,TDep3>);Argument[this];ReturnValue;value;hq-generated |
+| Microsoft.Extensions.Options;OptionsBuilder<TOptions>;Configure<TDep1,TDep2>;(System.Action<TOptions,TDep1,TDep2>);Argument[0];Argument[0].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.Options;OptionsBuilder<TOptions>;Configure<TDep1,TDep2>;(System.Action<TOptions,TDep1,TDep2>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
+| Microsoft.Extensions.Options;OptionsBuilder<TOptions>;Configure<TDep1,TDep2>;(System.Action<TOptions,TDep1,TDep2>);Argument[this];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Options;OptionsBuilder<TOptions>;Configure<TDep1,TDep2>;(System.Action<TOptions,TDep1,TDep2>);Argument[this];ReturnValue;value;hq-generated |
+| Microsoft.Extensions.Options;OptionsBuilder<TOptions>;Configure<TDep>;(System.Action<TOptions,TDep>);Argument[0];Argument[0].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.Options;OptionsBuilder<TOptions>;Configure<TDep>;(System.Action<TOptions,TDep>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
+| Microsoft.Extensions.Options;OptionsBuilder<TOptions>;Configure<TDep>;(System.Action<TOptions,TDep>);Argument[this];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Options;OptionsBuilder<TOptions>;Configure<TDep>;(System.Action<TOptions,TDep>);Argument[this];ReturnValue;value;hq-generated |
+| Microsoft.Extensions.Options;OptionsBuilder<TOptions>;PostConfigure;(System.Action<TOptions>);Argument[0];Argument[0].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.Options;OptionsBuilder<TOptions>;PostConfigure;(System.Action<TOptions>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
+| Microsoft.Extensions.Options;OptionsBuilder<TOptions>;PostConfigure;(System.Action<TOptions>);Argument[this];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Options;OptionsBuilder<TOptions>;PostConfigure;(System.Action<TOptions>);Argument[this];ReturnValue;value;hq-generated |
+| Microsoft.Extensions.Options;OptionsBuilder<TOptions>;PostConfigure<TDep1,TDep2,TDep3,TDep4,TDep5>;(System.Action<TOptions,TDep1,TDep2,TDep3,TDep4,TDep5>);Argument[0];Argument[0].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.Options;OptionsBuilder<TOptions>;PostConfigure<TDep1,TDep2,TDep3,TDep4,TDep5>;(System.Action<TOptions,TDep1,TDep2,TDep3,TDep4,TDep5>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
+| Microsoft.Extensions.Options;OptionsBuilder<TOptions>;PostConfigure<TDep1,TDep2,TDep3,TDep4,TDep5>;(System.Action<TOptions,TDep1,TDep2,TDep3,TDep4,TDep5>);Argument[this];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Options;OptionsBuilder<TOptions>;PostConfigure<TDep1,TDep2,TDep3,TDep4,TDep5>;(System.Action<TOptions,TDep1,TDep2,TDep3,TDep4,TDep5>);Argument[this];ReturnValue;value;hq-generated |
+| Microsoft.Extensions.Options;OptionsBuilder<TOptions>;PostConfigure<TDep1,TDep2,TDep3,TDep4>;(System.Action<TOptions,TDep1,TDep2,TDep3,TDep4>);Argument[0];Argument[0].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.Options;OptionsBuilder<TOptions>;PostConfigure<TDep1,TDep2,TDep3,TDep4>;(System.Action<TOptions,TDep1,TDep2,TDep3,TDep4>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
+| Microsoft.Extensions.Options;OptionsBuilder<TOptions>;PostConfigure<TDep1,TDep2,TDep3,TDep4>;(System.Action<TOptions,TDep1,TDep2,TDep3,TDep4>);Argument[this];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Options;OptionsBuilder<TOptions>;PostConfigure<TDep1,TDep2,TDep3,TDep4>;(System.Action<TOptions,TDep1,TDep2,TDep3,TDep4>);Argument[this];ReturnValue;value;hq-generated |
+| Microsoft.Extensions.Options;OptionsBuilder<TOptions>;PostConfigure<TDep1,TDep2,TDep3>;(System.Action<TOptions,TDep1,TDep2,TDep3>);Argument[0];Argument[0].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.Options;OptionsBuilder<TOptions>;PostConfigure<TDep1,TDep2,TDep3>;(System.Action<TOptions,TDep1,TDep2,TDep3>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
+| Microsoft.Extensions.Options;OptionsBuilder<TOptions>;PostConfigure<TDep1,TDep2,TDep3>;(System.Action<TOptions,TDep1,TDep2,TDep3>);Argument[this];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Options;OptionsBuilder<TOptions>;PostConfigure<TDep1,TDep2,TDep3>;(System.Action<TOptions,TDep1,TDep2,TDep3>);Argument[this];ReturnValue;value;hq-generated |
+| Microsoft.Extensions.Options;OptionsBuilder<TOptions>;PostConfigure<TDep1,TDep2>;(System.Action<TOptions,TDep1,TDep2>);Argument[0];Argument[0].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.Options;OptionsBuilder<TOptions>;PostConfigure<TDep1,TDep2>;(System.Action<TOptions,TDep1,TDep2>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
+| Microsoft.Extensions.Options;OptionsBuilder<TOptions>;PostConfigure<TDep1,TDep2>;(System.Action<TOptions,TDep1,TDep2>);Argument[this];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Options;OptionsBuilder<TOptions>;PostConfigure<TDep1,TDep2>;(System.Action<TOptions,TDep1,TDep2>);Argument[this];ReturnValue;value;hq-generated |
+| Microsoft.Extensions.Options;OptionsBuilder<TOptions>;PostConfigure<TDep>;(System.Action<TOptions,TDep>);Argument[0];Argument[0].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.Options;OptionsBuilder<TOptions>;PostConfigure<TDep>;(System.Action<TOptions,TDep>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
+| Microsoft.Extensions.Options;OptionsBuilder<TOptions>;PostConfigure<TDep>;(System.Action<TOptions,TDep>);Argument[this];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Options;OptionsBuilder<TOptions>;PostConfigure<TDep>;(System.Action<TOptions,TDep>);Argument[this];ReturnValue;value;hq-generated |
+| Microsoft.Extensions.Options;OptionsBuilder<TOptions>;Validate;(System.Func<TOptions,System.Boolean>);Argument[0];Argument[0].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.Options;OptionsBuilder<TOptions>;Validate;(System.Func<TOptions,System.Boolean>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
+| Microsoft.Extensions.Options;OptionsBuilder<TOptions>;Validate;(System.Func<TOptions,System.Boolean>);Argument[this];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Options;OptionsBuilder<TOptions>;Validate;(System.Func<TOptions,System.Boolean>);Argument[this];ReturnValue;value;hq-generated |
+| Microsoft.Extensions.Options;OptionsBuilder<TOptions>;Validate;(System.Func<TOptions,System.Boolean>,System.String);Argument[0];Argument[0].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.Options;OptionsBuilder<TOptions>;Validate;(System.Func<TOptions,System.Boolean>,System.String);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
+| Microsoft.Extensions.Options;OptionsBuilder<TOptions>;Validate;(System.Func<TOptions,System.Boolean>,System.String);Argument[this];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Options;OptionsBuilder<TOptions>;Validate;(System.Func<TOptions,System.Boolean>,System.String);Argument[this];ReturnValue;value;hq-generated |
+| Microsoft.Extensions.Options;OptionsBuilder<TOptions>;Validate<TDep1,TDep2,TDep3,TDep4,TDep5>;(System.Func<TOptions,TDep1,TDep2,TDep3,TDep4,TDep5,System.Boolean>);Argument[0];Argument[0].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.Options;OptionsBuilder<TOptions>;Validate<TDep1,TDep2,TDep3,TDep4,TDep5>;(System.Func<TOptions,TDep1,TDep2,TDep3,TDep4,TDep5,System.Boolean>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
+| Microsoft.Extensions.Options;OptionsBuilder<TOptions>;Validate<TDep1,TDep2,TDep3,TDep4,TDep5>;(System.Func<TOptions,TDep1,TDep2,TDep3,TDep4,TDep5,System.Boolean>);Argument[this];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Options;OptionsBuilder<TOptions>;Validate<TDep1,TDep2,TDep3,TDep4,TDep5>;(System.Func<TOptions,TDep1,TDep2,TDep3,TDep4,TDep5,System.Boolean>);Argument[this];ReturnValue;value;hq-generated |
+| Microsoft.Extensions.Options;OptionsBuilder<TOptions>;Validate<TDep1,TDep2,TDep3,TDep4,TDep5>;(System.Func<TOptions,TDep1,TDep2,TDep3,TDep4,TDep5,System.Boolean>,System.String);Argument[0];Argument[0].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.Options;OptionsBuilder<TOptions>;Validate<TDep1,TDep2,TDep3,TDep4,TDep5>;(System.Func<TOptions,TDep1,TDep2,TDep3,TDep4,TDep5,System.Boolean>,System.String);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
+| Microsoft.Extensions.Options;OptionsBuilder<TOptions>;Validate<TDep1,TDep2,TDep3,TDep4,TDep5>;(System.Func<TOptions,TDep1,TDep2,TDep3,TDep4,TDep5,System.Boolean>,System.String);Argument[this];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Options;OptionsBuilder<TOptions>;Validate<TDep1,TDep2,TDep3,TDep4,TDep5>;(System.Func<TOptions,TDep1,TDep2,TDep3,TDep4,TDep5,System.Boolean>,System.String);Argument[this];ReturnValue;value;hq-generated |
+| Microsoft.Extensions.Options;OptionsBuilder<TOptions>;Validate<TDep1,TDep2,TDep3,TDep4>;(System.Func<TOptions,TDep1,TDep2,TDep3,TDep4,System.Boolean>);Argument[0];Argument[0].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.Options;OptionsBuilder<TOptions>;Validate<TDep1,TDep2,TDep3,TDep4>;(System.Func<TOptions,TDep1,TDep2,TDep3,TDep4,System.Boolean>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
+| Microsoft.Extensions.Options;OptionsBuilder<TOptions>;Validate<TDep1,TDep2,TDep3,TDep4>;(System.Func<TOptions,TDep1,TDep2,TDep3,TDep4,System.Boolean>);Argument[this];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Options;OptionsBuilder<TOptions>;Validate<TDep1,TDep2,TDep3,TDep4>;(System.Func<TOptions,TDep1,TDep2,TDep3,TDep4,System.Boolean>);Argument[this];ReturnValue;value;hq-generated |
+| Microsoft.Extensions.Options;OptionsBuilder<TOptions>;Validate<TDep1,TDep2,TDep3,TDep4>;(System.Func<TOptions,TDep1,TDep2,TDep3,TDep4,System.Boolean>,System.String);Argument[0];Argument[0].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.Options;OptionsBuilder<TOptions>;Validate<TDep1,TDep2,TDep3,TDep4>;(System.Func<TOptions,TDep1,TDep2,TDep3,TDep4,System.Boolean>,System.String);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
+| Microsoft.Extensions.Options;OptionsBuilder<TOptions>;Validate<TDep1,TDep2,TDep3,TDep4>;(System.Func<TOptions,TDep1,TDep2,TDep3,TDep4,System.Boolean>,System.String);Argument[this];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Options;OptionsBuilder<TOptions>;Validate<TDep1,TDep2,TDep3,TDep4>;(System.Func<TOptions,TDep1,TDep2,TDep3,TDep4,System.Boolean>,System.String);Argument[this];ReturnValue;value;hq-generated |
+| Microsoft.Extensions.Options;OptionsBuilder<TOptions>;Validate<TDep1,TDep2,TDep3>;(System.Func<TOptions,TDep1,TDep2,TDep3,System.Boolean>);Argument[0];Argument[0].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.Options;OptionsBuilder<TOptions>;Validate<TDep1,TDep2,TDep3>;(System.Func<TOptions,TDep1,TDep2,TDep3,System.Boolean>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
+| Microsoft.Extensions.Options;OptionsBuilder<TOptions>;Validate<TDep1,TDep2,TDep3>;(System.Func<TOptions,TDep1,TDep2,TDep3,System.Boolean>);Argument[this];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Options;OptionsBuilder<TOptions>;Validate<TDep1,TDep2,TDep3>;(System.Func<TOptions,TDep1,TDep2,TDep3,System.Boolean>);Argument[this];ReturnValue;value;hq-generated |
+| Microsoft.Extensions.Options;OptionsBuilder<TOptions>;Validate<TDep1,TDep2,TDep3>;(System.Func<TOptions,TDep1,TDep2,TDep3,System.Boolean>,System.String);Argument[0];Argument[0].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.Options;OptionsBuilder<TOptions>;Validate<TDep1,TDep2,TDep3>;(System.Func<TOptions,TDep1,TDep2,TDep3,System.Boolean>,System.String);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
+| Microsoft.Extensions.Options;OptionsBuilder<TOptions>;Validate<TDep1,TDep2,TDep3>;(System.Func<TOptions,TDep1,TDep2,TDep3,System.Boolean>,System.String);Argument[this];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Options;OptionsBuilder<TOptions>;Validate<TDep1,TDep2,TDep3>;(System.Func<TOptions,TDep1,TDep2,TDep3,System.Boolean>,System.String);Argument[this];ReturnValue;value;hq-generated |
+| Microsoft.Extensions.Options;OptionsBuilder<TOptions>;Validate<TDep1,TDep2>;(System.Func<TOptions,TDep1,TDep2,System.Boolean>);Argument[0];Argument[0].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.Options;OptionsBuilder<TOptions>;Validate<TDep1,TDep2>;(System.Func<TOptions,TDep1,TDep2,System.Boolean>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
+| Microsoft.Extensions.Options;OptionsBuilder<TOptions>;Validate<TDep1,TDep2>;(System.Func<TOptions,TDep1,TDep2,System.Boolean>);Argument[this];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Options;OptionsBuilder<TOptions>;Validate<TDep1,TDep2>;(System.Func<TOptions,TDep1,TDep2,System.Boolean>);Argument[this];ReturnValue;value;hq-generated |
+| Microsoft.Extensions.Options;OptionsBuilder<TOptions>;Validate<TDep1,TDep2>;(System.Func<TOptions,TDep1,TDep2,System.Boolean>,System.String);Argument[0];Argument[0].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.Options;OptionsBuilder<TOptions>;Validate<TDep1,TDep2>;(System.Func<TOptions,TDep1,TDep2,System.Boolean>,System.String);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
+| Microsoft.Extensions.Options;OptionsBuilder<TOptions>;Validate<TDep1,TDep2>;(System.Func<TOptions,TDep1,TDep2,System.Boolean>,System.String);Argument[this];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Options;OptionsBuilder<TOptions>;Validate<TDep1,TDep2>;(System.Func<TOptions,TDep1,TDep2,System.Boolean>,System.String);Argument[this];ReturnValue;value;hq-generated |
+| Microsoft.Extensions.Options;OptionsBuilder<TOptions>;Validate<TDep>;(System.Func<TOptions,TDep,System.Boolean>);Argument[0];Argument[0].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.Options;OptionsBuilder<TOptions>;Validate<TDep>;(System.Func<TOptions,TDep,System.Boolean>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
+| Microsoft.Extensions.Options;OptionsBuilder<TOptions>;Validate<TDep>;(System.Func<TOptions,TDep,System.Boolean>);Argument[this];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Options;OptionsBuilder<TOptions>;Validate<TDep>;(System.Func<TOptions,TDep,System.Boolean>);Argument[this];ReturnValue;value;hq-generated |
+| Microsoft.Extensions.Options;OptionsBuilder<TOptions>;Validate<TDep>;(System.Func<TOptions,TDep,System.Boolean>,System.String);Argument[0];Argument[0].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.Options;OptionsBuilder<TOptions>;Validate<TDep>;(System.Func<TOptions,TDep,System.Boolean>,System.String);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
+| Microsoft.Extensions.Options;OptionsBuilder<TOptions>;Validate<TDep>;(System.Func<TOptions,TDep,System.Boolean>,System.String);Argument[this];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Options;OptionsBuilder<TOptions>;Validate<TDep>;(System.Func<TOptions,TDep,System.Boolean>,System.String);Argument[this];ReturnValue;value;hq-generated |
 | Microsoft.Extensions.Options;OptionsCache<TOptions>;GetOrAdd;(System.String,System.Func<TOptions>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
 | Microsoft.Extensions.Options;OptionsFactory<TOptions>;OptionsFactory;(System.Collections.Generic.IEnumerable<Microsoft.Extensions.Options.IConfigureOptions<TOptions>>,System.Collections.Generic.IEnumerable<Microsoft.Extensions.Options.IPostConfigureOptions<TOptions>>,System.Collections.Generic.IEnumerable<Microsoft.Extensions.Options.IValidateOptions<TOptions>>);Argument[0].Element;Argument[this];taint;df-generated |
 | Microsoft.Extensions.Options;OptionsFactory<TOptions>;OptionsFactory;(System.Collections.Generic.IEnumerable<Microsoft.Extensions.Options.IConfigureOptions<TOptions>>,System.Collections.Generic.IEnumerable<Microsoft.Extensions.Options.IPostConfigureOptions<TOptions>>,System.Collections.Generic.IEnumerable<Microsoft.Extensions.Options.IValidateOptions<TOptions>>);Argument[1].Element;Argument[this];taint;df-generated |
@@ -2655,18 +3085,36 @@ summary
 | Microsoft.Extensions.Options;OptionsMonitor<TOptions>;OptionsMonitor;(Microsoft.Extensions.Options.IOptionsFactory<TOptions>,System.Collections.Generic.IEnumerable<Microsoft.Extensions.Options.IOptionsChangeTokenSource<TOptions>>,Microsoft.Extensions.Options.IOptionsMonitorCache<TOptions>);Argument[0];Argument[this];taint;df-generated |
 | Microsoft.Extensions.Options;OptionsMonitor<TOptions>;OptionsMonitor;(Microsoft.Extensions.Options.IOptionsFactory<TOptions>,System.Collections.Generic.IEnumerable<Microsoft.Extensions.Options.IOptionsChangeTokenSource<TOptions>>,Microsoft.Extensions.Options.IOptionsMonitorCache<TOptions>);Argument[2];Argument[this];taint;df-generated |
 | Microsoft.Extensions.Options;OptionsMonitorExtensions;OnChange<TOptions>;(Microsoft.Extensions.Options.IOptionsMonitor<TOptions>,System.Action<TOptions>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
-| Microsoft.Extensions.Options;OptionsValidationException;get_Message;();Argument[this];ReturnValue;taint;df-generated |
+| Microsoft.Extensions.Options;OptionsValidationException;get_Message;();Argument[this].Property[Microsoft.Extensions.Options.OptionsValidationException.Failures].Element;ReturnValue;taint;dfc-generated |
+| Microsoft.Extensions.Options;OptionsValidationException;get_Message;();Argument[this].SyntheticField[System.Exception._message];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Options;PostConfigureOptions<TOptions,TDep1,TDep2,TDep3,TDep4,TDep5>;PostConfigure;(System.String,TOptions);Argument[1];Argument[this];taint;df-generated |
+| Microsoft.Extensions.Options;PostConfigureOptions<TOptions,TDep1,TDep2,TDep3,TDep4,TDep5>;PostConfigure;(TOptions);Argument[0];Argument[this];taint;df-generated |
 | Microsoft.Extensions.Options;PostConfigureOptions<TOptions,TDep1,TDep2,TDep3,TDep4,TDep5>;PostConfigureOptions;(System.String,TDep1,TDep2,TDep3,TDep4,TDep5,System.Action<TOptions,TDep1,TDep2,TDep3,TDep4,TDep5>);Argument[6];Argument[6].Parameter[delegate-self];value;hq-generated |
+| Microsoft.Extensions.Options;PostConfigureOptions<TOptions,TDep1,TDep2,TDep3,TDep4>;PostConfigure;(System.String,TOptions);Argument[1];Argument[this];taint;df-generated |
+| Microsoft.Extensions.Options;PostConfigureOptions<TOptions,TDep1,TDep2,TDep3,TDep4>;PostConfigure;(TOptions);Argument[0];Argument[this];taint;df-generated |
 | Microsoft.Extensions.Options;PostConfigureOptions<TOptions,TDep1,TDep2,TDep3,TDep4>;PostConfigureOptions;(System.String,TDep1,TDep2,TDep3,TDep4,System.Action<TOptions,TDep1,TDep2,TDep3,TDep4>);Argument[5];Argument[5].Parameter[delegate-self];value;hq-generated |
+| Microsoft.Extensions.Options;PostConfigureOptions<TOptions,TDep1,TDep2,TDep3>;PostConfigure;(System.String,TOptions);Argument[1];Argument[this];taint;df-generated |
+| Microsoft.Extensions.Options;PostConfigureOptions<TOptions,TDep1,TDep2,TDep3>;PostConfigure;(TOptions);Argument[0];Argument[this];taint;df-generated |
 | Microsoft.Extensions.Options;PostConfigureOptions<TOptions,TDep1,TDep2,TDep3>;PostConfigureOptions;(System.String,TDep1,TDep2,TDep3,System.Action<TOptions,TDep1,TDep2,TDep3>);Argument[4];Argument[4].Parameter[delegate-self];value;hq-generated |
+| Microsoft.Extensions.Options;PostConfigureOptions<TOptions,TDep1,TDep2>;PostConfigure;(System.String,TOptions);Argument[1];Argument[this];taint;df-generated |
+| Microsoft.Extensions.Options;PostConfigureOptions<TOptions,TDep1,TDep2>;PostConfigure;(TOptions);Argument[0];Argument[this];taint;df-generated |
 | Microsoft.Extensions.Options;PostConfigureOptions<TOptions,TDep1,TDep2>;PostConfigureOptions;(System.String,TDep1,TDep2,System.Action<TOptions,TDep1,TDep2>);Argument[3];Argument[3].Parameter[delegate-self];value;hq-generated |
+| Microsoft.Extensions.Options;PostConfigureOptions<TOptions,TDep>;PostConfigure;(System.String,TOptions);Argument[1];Argument[this];taint;df-generated |
+| Microsoft.Extensions.Options;PostConfigureOptions<TOptions,TDep>;PostConfigure;(TOptions);Argument[0];Argument[this];taint;df-generated |
 | Microsoft.Extensions.Options;PostConfigureOptions<TOptions,TDep>;PostConfigureOptions;(System.String,TDep,System.Action<TOptions,TDep>);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
+| Microsoft.Extensions.Options;PostConfigureOptions<TOptions>;PostConfigure;(System.String,TOptions);Argument[1];Argument[this];taint;df-generated |
 | Microsoft.Extensions.Options;PostConfigureOptions<TOptions>;PostConfigureOptions;(System.String,System.Action<TOptions>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
+| Microsoft.Extensions.Options;ValidateOptions<TOptions,TDep1,TDep2,TDep3,TDep4,TDep5>;Validate;(System.String,TOptions);Argument[1];Argument[this];taint;df-generated |
 | Microsoft.Extensions.Options;ValidateOptions<TOptions,TDep1,TDep2,TDep3,TDep4,TDep5>;ValidateOptions;(System.String,TDep1,TDep2,TDep3,TDep4,TDep5,System.Func<TOptions,TDep1,TDep2,TDep3,TDep4,TDep5,System.Boolean>,System.String);Argument[6];Argument[6].Parameter[delegate-self];value;hq-generated |
+| Microsoft.Extensions.Options;ValidateOptions<TOptions,TDep1,TDep2,TDep3,TDep4>;Validate;(System.String,TOptions);Argument[1];Argument[this];taint;df-generated |
 | Microsoft.Extensions.Options;ValidateOptions<TOptions,TDep1,TDep2,TDep3,TDep4>;ValidateOptions;(System.String,TDep1,TDep2,TDep3,TDep4,System.Func<TOptions,TDep1,TDep2,TDep3,TDep4,System.Boolean>,System.String);Argument[5];Argument[5].Parameter[delegate-self];value;hq-generated |
+| Microsoft.Extensions.Options;ValidateOptions<TOptions,TDep1,TDep2,TDep3>;Validate;(System.String,TOptions);Argument[1];Argument[this];taint;df-generated |
 | Microsoft.Extensions.Options;ValidateOptions<TOptions,TDep1,TDep2,TDep3>;ValidateOptions;(System.String,TDep1,TDep2,TDep3,System.Func<TOptions,TDep1,TDep2,TDep3,System.Boolean>,System.String);Argument[4];Argument[4].Parameter[delegate-self];value;hq-generated |
+| Microsoft.Extensions.Options;ValidateOptions<TOptions,TDep1,TDep2>;Validate;(System.String,TOptions);Argument[1];Argument[this];taint;df-generated |
 | Microsoft.Extensions.Options;ValidateOptions<TOptions,TDep1,TDep2>;ValidateOptions;(System.String,TDep1,TDep2,System.Func<TOptions,TDep1,TDep2,System.Boolean>,System.String);Argument[3];Argument[3].Parameter[delegate-self];value;hq-generated |
+| Microsoft.Extensions.Options;ValidateOptions<TOptions,TDep>;Validate;(System.String,TOptions);Argument[1];Argument[this];taint;df-generated |
 | Microsoft.Extensions.Options;ValidateOptions<TOptions,TDep>;ValidateOptions;(System.String,TDep,System.Func<TOptions,TDep,System.Boolean>,System.String);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
+| Microsoft.Extensions.Options;ValidateOptions<TOptions>;Validate;(System.String,TOptions);Argument[1];Argument[this];taint;df-generated |
 | Microsoft.Extensions.Options;ValidateOptions<TOptions>;ValidateOptions;(System.String,System.Func<TOptions,System.Boolean>,System.String);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
 | Microsoft.Extensions.Options;ValidateOptionsResultBuilder;AddError;(System.String,System.String);Argument[0];Argument[this];taint;df-generated |
 | Microsoft.Extensions.Options;ValidateOptionsResultBuilder;AddError;(System.String,System.String);Argument[1];Argument[this];taint;df-generated |
@@ -2674,32 +3122,43 @@ summary
 | Microsoft.Extensions.Options;ValidateOptionsResultBuilder;AddResult;(System.ComponentModel.DataAnnotations.ValidationResult);Argument[0];Argument[this];taint;df-generated |
 | Microsoft.Extensions.Options;ValidateOptionsResultBuilder;AddResults;(System.Collections.Generic.IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult>);Argument[0].Element;Argument[this];taint;df-generated |
 | Microsoft.Extensions.Primitives;CancellationChangeToken;CancellationChangeToken;(System.Threading.CancellationToken);Argument[0];Argument[this];taint;df-generated |
+| Microsoft.Extensions.Primitives;CancellationChangeToken;RegisterChangeCallback;(System.Action<System.Object>,System.Object);Argument[0];Argument[0].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.Primitives;CancellationChangeToken;RegisterChangeCallback;(System.Action<System.Object>,System.Object);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
+| Microsoft.Extensions.Primitives;CancellationChangeToken;RegisterChangeCallback;(System.Action<System.Object>,System.Object);Argument[this];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Primitives;CancellationChangeToken;RegisterChangeCallback;(System.Action<System.Object>,System.Object);Argument[this];ReturnValue;value;hq-generated |
 | Microsoft.Extensions.Primitives;ChangeToken;OnChange;(System.Func<Microsoft.Extensions.Primitives.IChangeToken>,System.Action);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | Microsoft.Extensions.Primitives;ChangeToken;OnChange;(System.Func<Microsoft.Extensions.Primitives.IChangeToken>,System.Action);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
 | Microsoft.Extensions.Primitives;ChangeToken;OnChange<TState>;(System.Func<Microsoft.Extensions.Primitives.IChangeToken>,System.Action<TState>,TState);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | Microsoft.Extensions.Primitives;ChangeToken;OnChange<TState>;(System.Func<Microsoft.Extensions.Primitives.IChangeToken>,System.Action<TState>,TState);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
+| Microsoft.Extensions.Primitives;CompositeChangeToken;RegisterChangeCallback;(System.Action<System.Object>,System.Object);Argument[0];Argument[0].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.Primitives;CompositeChangeToken;RegisterChangeCallback;(System.Action<System.Object>,System.Object);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
-| Microsoft.Extensions.Primitives;Extensions;Append;(System.Text.StringBuilder,Microsoft.Extensions.Primitives.StringSegment);Argument[0];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Primitives;Extensions;Append;(System.Text.StringBuilder,Microsoft.Extensions.Primitives.StringSegment);Argument[1];Argument[0];taint;df-generated |
-| Microsoft.Extensions.Primitives;Extensions;Append;(System.Text.StringBuilder,Microsoft.Extensions.Primitives.StringSegment);Argument[1];ReturnValue;taint;df-generated |
+| Microsoft.Extensions.Primitives;CompositeChangeToken;RegisterChangeCallback;(System.Action<System.Object>,System.Object);Argument[this];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Primitives;CompositeChangeToken;RegisterChangeCallback;(System.Action<System.Object>,System.Object);Argument[this];ReturnValue;value;hq-generated |
+| Microsoft.Extensions.Primitives;Extensions;Append;(System.Text.StringBuilder,Microsoft.Extensions.Primitives.StringSegment);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Primitives;Extensions;Append;(System.Text.StringBuilder,Microsoft.Extensions.Primitives.StringSegment);Argument[1].Property[Microsoft.Extensions.Primitives.StringSegment.Buffer];Argument[0];taint;dfc-generated |
+| Microsoft.Extensions.Primitives;Extensions;Append;(System.Text.StringBuilder,Microsoft.Extensions.Primitives.StringSegment);Argument[1].Property[Microsoft.Extensions.Primitives.StringSegment.Buffer];ReturnValue;taint;dfc-generated |
+| Microsoft.Extensions.Primitives;IChangeToken;RegisterChangeCallback;(System.Action<System.Object>,System.Object);Argument[0];Argument[0].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.Primitives;IChangeToken;RegisterChangeCallback;(System.Action<System.Object>,System.Object);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
+| Microsoft.Extensions.Primitives;IChangeToken;RegisterChangeCallback;(System.Action<System.Object>,System.Object);Argument[this];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Primitives;IChangeToken;RegisterChangeCallback;(System.Action<System.Object>,System.Object);Argument[this];ReturnValue;value;hq-generated |
 | Microsoft.Extensions.Primitives;InplaceStringBuilder;ToString;();Argument[this];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Primitives;StringSegment;AsMemory;();Argument[this];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Primitives;StringSegment;Split;(System.Char[]);Argument[0].Element;ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Primitives;StringSegment;Split;(System.Char[]);Argument[this];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Primitives;StringSegment;Substring;(System.Int32);Argument[this];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Primitives;StringSegment;Substring;(System.Int32,System.Int32);Argument[this];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Primitives;StringSegment;ToString;();Argument[this];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Primitives;StringSegment;get_Value;();Argument[this];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Primitives;StringTokenizer+Enumerator;Enumerator;(Microsoft.Extensions.Primitives.StringTokenizer);Argument[0].Element;Argument[this];taint;df-generated |
+| Microsoft.Extensions.Primitives;StringSegment;Substring;(System.Int32);Argument[this].Property[Microsoft.Extensions.Primitives.StringSegment.Buffer];ReturnValue;taint;dfc-generated |
+| Microsoft.Extensions.Primitives;StringSegment;Substring;(System.Int32,System.Int32);Argument[this].Property[Microsoft.Extensions.Primitives.StringSegment.Buffer];ReturnValue;taint;dfc-generated |
+| Microsoft.Extensions.Primitives;StringSegment;ToString;();Argument[this].Property[Microsoft.Extensions.Primitives.StringSegment.Buffer];ReturnValue;taint;dfc-generated |
+| Microsoft.Extensions.Primitives;StringSegment;ToString;();Argument[this].Property[Microsoft.Extensions.Primitives.StringSegment.Value];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Primitives;StringSegment;get_Value;();Argument[this].Property[Microsoft.Extensions.Primitives.StringSegment.Buffer];ReturnValue;taint;dfc-generated |
+| Microsoft.Extensions.Primitives;StringTokenizer+Enumerator;Enumerator;(Microsoft.Extensions.Primitives.StringTokenizer);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Primitives;StringTokenizer+Enumerator;get_Current;();Argument[this].Property[Microsoft.Extensions.Primitives.StringTokenizer+Enumerator.Current];ReturnValue;value;df-generated |
+| Microsoft.Extensions.Primitives;StringTokenizer+Enumerator;get_Current;();Argument[this].Property[Microsoft.Extensions.Primitives.StringTokenizer+Enumerator.Current];ReturnValue;value;dfc-generated |
 | Microsoft.Extensions.Primitives;StringTokenizer+Enumerator;get_Current;();Argument[this];ReturnValue;taint;df-generated |
+| Microsoft.Extensions.Primitives;StringTokenizer+Enumerator;get_Current;();Argument[this];ReturnValue;taint;dfc-generated |
 | Microsoft.Extensions.Primitives;StringTokenizer;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.Generic.IEnumerator`1.Current];value;manual |
 | Microsoft.Extensions.Primitives;StringTokenizer;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.IEnumerator.Current];value;manual |
 | Microsoft.Extensions.Primitives;StringTokenizer;GetEnumerator;();Argument[this];ReturnValue;taint;df-generated |
 | Microsoft.Extensions.Primitives;StringTokenizer;StringTokenizer;(Microsoft.Extensions.Primitives.StringSegment,System.Char[]);Argument[0];Argument[this];taint;df-generated |
 | Microsoft.Extensions.Primitives;StringTokenizer;StringTokenizer;(Microsoft.Extensions.Primitives.StringSegment,System.Char[]);Argument[1].Element;Argument[this];taint;df-generated |
 | Microsoft.Extensions.Primitives;StringTokenizer;StringTokenizer;(System.String,System.Char[]);Argument[1].Element;Argument[this];taint;df-generated |
+| Microsoft.Extensions.Primitives;StringValues+Enumerator;Enumerator;(Microsoft.Extensions.Primitives.StringValues);Argument[0];ReturnValue;value;dfc-generated |
 | Microsoft.Extensions.Primitives;StringValues+Enumerator;get_Current;();Argument[this];ReturnValue;taint;df-generated |
 | Microsoft.Extensions.Primitives;StringValues;Add;(System.String);Argument[0];Argument[this].Element;value;manual |
 | Microsoft.Extensions.Primitives;StringValues;Add;(System.String);Argument[0];ReturnValue;taint;manual |
@@ -2765,42 +3224,44 @@ summary
 | Microsoft.Extensions.Primitives;StringValues;set_Item;(System.Int32,System.String);Argument[this];ReturnValue;taint;manual |
 | Microsoft.Extensions.WebEncoders.Testing;HtmlTestEncoder;Encode;(System.IO.TextWriter,System.Char[],System.Int32,System.Int32);Argument[1].Element;Argument[0];taint;df-generated |
 | Microsoft.Extensions.WebEncoders.Testing;HtmlTestEncoder;Encode;(System.IO.TextWriter,System.String,System.Int32,System.Int32);Argument[1];Argument[0];taint;df-generated |
-| Microsoft.Extensions.WebEncoders.Testing;HtmlTestEncoder;Encode;(System.String);Argument[0];ReturnValue;taint;df-generated |
+| Microsoft.Extensions.WebEncoders.Testing;HtmlTestEncoder;Encode;(System.String);Argument[0];ReturnValue;value;dfc-generated |
 | Microsoft.Extensions.WebEncoders.Testing;JavaScriptTestEncoder;Encode;(System.IO.TextWriter,System.Char[],System.Int32,System.Int32);Argument[1].Element;Argument[0];taint;df-generated |
 | Microsoft.Extensions.WebEncoders.Testing;JavaScriptTestEncoder;Encode;(System.IO.TextWriter,System.String,System.Int32,System.Int32);Argument[1];Argument[0];taint;df-generated |
-| Microsoft.Extensions.WebEncoders.Testing;JavaScriptTestEncoder;Encode;(System.String);Argument[0];ReturnValue;taint;df-generated |
+| Microsoft.Extensions.WebEncoders.Testing;JavaScriptTestEncoder;Encode;(System.String);Argument[0];ReturnValue;value;dfc-generated |
 | Microsoft.Extensions.WebEncoders.Testing;UrlTestEncoder;Encode;(System.IO.TextWriter,System.Char[],System.Int32,System.Int32);Argument[1].Element;Argument[0];taint;df-generated |
 | Microsoft.Extensions.WebEncoders.Testing;UrlTestEncoder;Encode;(System.IO.TextWriter,System.String,System.Int32,System.Int32);Argument[1];Argument[0];taint;df-generated |
-| Microsoft.Extensions.WebEncoders.Testing;UrlTestEncoder;Encode;(System.String);Argument[0];ReturnValue;taint;df-generated |
+| Microsoft.Extensions.WebEncoders.Testing;UrlTestEncoder;Encode;(System.String);Argument[0];ReturnValue;value;dfc-generated |
 | Microsoft.JSInterop.Implementation;JSObjectReference;DisposeAsync;();Argument[this];ReturnValue;taint;df-generated |
 | Microsoft.SqlServer.Server;SqlDataRecord;GetString;(System.Int32);Argument[this];ReturnValue;taint;manual |
 | Microsoft.SqlServer.Server;SqlDataRecord;GetValue;(System.Int32);Argument[this];ReturnValue;taint;manual |
 | Microsoft.SqlServer.Server;SqlDataRecord;GetValues;(System.Object[]);Argument[this];Argument[0].Element;taint;manual |
 | Microsoft.SqlServer.Server;SqlDataRecord;get_Item;(System.Int32);Argument[this];ReturnValue;taint;manual |
 | Microsoft.SqlServer.Server;SqlDataRecord;get_Item;(System.String);Argument[this];ReturnValue;taint;manual |
+| Microsoft.VisualBasic.CompilerServices;StringType;MidStmtStr;(System.String,System.Int32,System.Int32,System.String);Argument[0];ReturnValue;value;dfc-generated |
 | Microsoft.VisualBasic.FileIO;MalformedLineException;GetObjectData;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);Argument[this];Argument[0];taint;df-generated |
 | Microsoft.VisualBasic;Collection;Add;(System.Object);Argument[0];Argument[this].Element;value;manual |
 | Microsoft.VisualBasic;Collection;Clear;();Argument[this].WithoutElement;Argument[this];value;manual |
 | Microsoft.VisualBasic;Collection;CopyTo;(System.Array,System.Int32);Argument[this].Element;Argument[0].Element;value;manual |
 | Microsoft.VisualBasic;Collection;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.IEnumerator.Current];value;manual |
 | Microsoft.VisualBasic;Collection;Insert;(System.Int32,System.Object);Argument[1];Argument[this].Element;value;manual |
-| Microsoft.VisualBasic;Collection;Remove;(System.Object);Argument[0];Argument[this];taint;df-generated |
-| Microsoft.VisualBasic;Collection;Remove;(System.Object);Argument[this];Argument[0];taint;df-generated |
 | Microsoft.VisualBasic;Collection;get_Item;(System.Int32);Argument[this].Element;ReturnValue;value;manual |
 | Microsoft.VisualBasic;Collection;get_Item;(System.Object);Argument[this].Element;ReturnValue;value;manual |
 | Microsoft.VisualBasic;Collection;get_Item;(System.String);Argument[this].Element;ReturnValue;value;manual |
-| Microsoft.VisualBasic;Collection;get_SyncRoot;();Argument[this];ReturnValue;taint;df-generated |
-| Microsoft.VisualBasic;Collection;get_SyncRoot;();Argument[this];ReturnValue;value;df-generated |
+| Microsoft.VisualBasic;Collection;get_SyncRoot;();Argument[this];ReturnValue;value;dfc-generated |
 | Microsoft.VisualBasic;Collection;set_Item;(System.Int32,System.Object);Argument[1];Argument[this].Element;value;manual |
+| Microsoft.VisualBasic;FileSystem;FileGet;(System.Int32,System.Array,System.Int64,System.Boolean,System.Boolean);Argument[1];ReturnValue;value;dfc-generated |
+| Microsoft.VisualBasic;FileSystem;FileGet;(System.Int32,System.String,System.Int64,System.Boolean);Argument[1];ReturnValue;value;dfc-generated |
+| Microsoft.VisualBasic;FileSystem;FileGet;(System.Int32,System.ValueType,System.Int64);Argument[1];ReturnValue;value;dfc-generated |
+| Microsoft.VisualBasic;FileSystem;FileGetObject;(System.Int32,System.Object,System.Int64);Argument[1];ReturnValue;value;dfc-generated |
+| Microsoft.VisualBasic;FileSystem;Input;(System.Int32,System.Object);Argument[1];ReturnValue;value;dfc-generated |
+| Microsoft.VisualBasic;FileSystem;Input;(System.Int32,System.String);Argument[1];ReturnValue;value;dfc-generated |
 | Microsoft.VisualBasic;VBCodeProvider;CreateCompiler;();Argument[this];ReturnValue;taint;df-generated |
 | Microsoft.VisualBasic;VBCodeProvider;CreateGenerator;();Argument[this];ReturnValue;taint;df-generated |
 | Microsoft.VisualBasic;VBCodeProvider;GenerateCodeFromMember;(System.CodeDom.CodeTypeMember,System.IO.TextWriter,System.CodeDom.Compiler.CodeGeneratorOptions);Argument[0];Argument[this];taint;df-generated |
 | Microsoft.VisualBasic;VBCodeProvider;GenerateCodeFromMember;(System.CodeDom.CodeTypeMember,System.IO.TextWriter,System.CodeDom.Compiler.CodeGeneratorOptions);Argument[2];Argument[this];taint;df-generated |
 | Microsoft.VisualBasic;VBCodeProvider;VBCodeProvider;(System.Collections.Generic.IDictionary<System.String,System.String>);Argument[0].Element;Argument[this];taint;df-generated |
-| Microsoft.Win32.SafeHandles;SafeFileHandle;SafeFileHandle;(System.IntPtr,System.Boolean);Argument[0];Argument[this];taint;df-generated |
-| Microsoft.Win32.SafeHandles;SafePipeHandle;SafePipeHandle;(System.IntPtr,System.Boolean);Argument[0];Argument[this];taint;df-generated |
-| Microsoft.Win32.SafeHandles;SafeProcessHandle;SafeProcessHandle;(System.IntPtr,System.Boolean);Argument[0];Argument[this];taint;df-generated |
-| Microsoft.Win32.SafeHandles;SafeWaitHandle;SafeWaitHandle;(System.IntPtr,System.Boolean);Argument[0];Argument[this];taint;df-generated |
+| Microsoft.Win32.SafeHandles;SafeFileHandle;SafeFileHandle;(System.IntPtr,System.Boolean);Argument[0];Argument[this].Field[System.Runtime.InteropServices.SafeHandle.handle];value;dfc-generated |
+| Microsoft.Win32.SafeHandles;SafeWaitHandle;SafeWaitHandle;(System.IntPtr,System.Boolean);Argument[0];Argument[this].Field[System.Runtime.InteropServices.SafeHandle.handle];value;dfc-generated |
 | Microsoft.Win32;PowerModeChangedEventHandler;BeginInvoke;(System.Object,Microsoft.Win32.PowerModeChangedEventArgs,System.AsyncCallback,System.Object);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
 | Microsoft.Win32;SessionEndedEventHandler;BeginInvoke;(System.Object,Microsoft.Win32.SessionEndedEventArgs,System.AsyncCallback,System.Object);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
 | Microsoft.Win32;SessionEndingEventHandler;BeginInvoke;(System.Object,Microsoft.Win32.SessionEndingEventArgs,System.AsyncCallback,System.Object);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
@@ -2849,7 +3310,6 @@ summary
 | Newtonsoft.Json.Linq;JConstructor;set_Item;(System.Object,Newtonsoft.Json.Linq.JToken);Argument[1];Argument[this].Element;value;manual |
 | Newtonsoft.Json.Linq;JContainer;Add;(Newtonsoft.Json.Linq.JToken);Argument[0];Argument[this].Element;value;manual |
 | Newtonsoft.Json.Linq;JContainer;Add;(System.Object);Argument[0];Argument[this].Element;value;manual |
-| Newtonsoft.Json.Linq;JContainer;AddNew;();Argument[this];ReturnValue;taint;df-generated |
 | Newtonsoft.Json.Linq;JContainer;ApplySort;(System.ComponentModel.PropertyDescriptor,System.ComponentModel.ListSortDirection);Argument[0];Argument[this];taint;df-generated |
 | Newtonsoft.Json.Linq;JContainer;Clear;();Argument[this].WithoutElement;Argument[this];value;manual |
 | Newtonsoft.Json.Linq;JContainer;CopyTo;(Newtonsoft.Json.Linq.JToken[],System.Int32);Argument[this].Element;Argument[0].Element;value;manual |
@@ -2861,15 +3321,11 @@ summary
 | Newtonsoft.Json.Linq;JContainer;GetListName;(System.ComponentModel.PropertyDescriptor[]);Argument[this];ReturnValue;taint;df-generated |
 | Newtonsoft.Json.Linq;JContainer;Insert;(System.Int32,Newtonsoft.Json.Linq.JToken);Argument[1];Argument[this].Element;value;manual |
 | Newtonsoft.Json.Linq;JContainer;Insert;(System.Int32,System.Object);Argument[1];Argument[this].Element;value;manual |
-| Newtonsoft.Json.Linq;JContainer;Remove;(System.Object);Argument[0];Argument[this];taint;df-generated |
-| Newtonsoft.Json.Linq;JContainer;Remove;(System.Object);Argument[this];Argument[0];taint;df-generated |
 | Newtonsoft.Json.Linq;JContainer;add_AddingNew;(System.ComponentModel.AddingNewEventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | Newtonsoft.Json.Linq;JContainer;add_CollectionChanged;(System.Collections.Specialized.NotifyCollectionChangedEventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | Newtonsoft.Json.Linq;JContainer;add_ListChanged;(System.ComponentModel.ListChangedEventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | Newtonsoft.Json.Linq;JContainer;get_Item;(System.Int32);Argument[this].Element;ReturnValue;value;manual |
-| Newtonsoft.Json.Linq;JContainer;get_SortProperty;();Argument[this];ReturnValue;taint;df-generated |
-| Newtonsoft.Json.Linq;JContainer;get_SyncRoot;();Argument[this];ReturnValue;taint;df-generated |
-| Newtonsoft.Json.Linq;JContainer;get_SyncRoot;();Argument[this];ReturnValue;value;df-generated |
+| Newtonsoft.Json.Linq;JContainer;get_SyncRoot;();Argument[this];ReturnValue;value;dfc-generated |
 | Newtonsoft.Json.Linq;JContainer;remove_AddingNew;(System.ComponentModel.AddingNewEventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | Newtonsoft.Json.Linq;JContainer;remove_CollectionChanged;(System.Collections.Specialized.NotifyCollectionChangedEventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | Newtonsoft.Json.Linq;JContainer;remove_ListChanged;(System.ComponentModel.ListChangedEventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
@@ -2884,12 +3340,10 @@ summary
 | Newtonsoft.Json.Linq;JObject;Add;(System.String,Newtonsoft.Json.Linq.JToken);Argument[1];Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Value];value;manual |
 | Newtonsoft.Json.Linq;JObject;Clear;();Argument[this].WithoutElement;Argument[this];value;manual |
 | Newtonsoft.Json.Linq;JObject;CopyTo;(System.Collections.Generic.KeyValuePair<System.String,Newtonsoft.Json.Linq.JToken>[],System.Int32);Argument[this].Element;Argument[0].Element;value;manual |
-| Newtonsoft.Json.Linq;JObject;GetAttributes;();Argument[this];ReturnValue;taint;df-generated |
 | Newtonsoft.Json.Linq;JObject;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.Generic.IEnumerator`1.Current];value;manual |
 | Newtonsoft.Json.Linq;JObject;GetProperties;();Argument[this];ReturnValue;taint;df-generated |
 | Newtonsoft.Json.Linq;JObject;GetProperties;(System.Attribute[]);Argument[this];ReturnValue;taint;df-generated |
-| Newtonsoft.Json.Linq;JObject;GetPropertyOwner;(System.ComponentModel.PropertyDescriptor);Argument[this];ReturnValue;taint;df-generated |
-| Newtonsoft.Json.Linq;JObject;GetPropertyOwner;(System.ComponentModel.PropertyDescriptor);Argument[this];ReturnValue;value;df-generated |
+| Newtonsoft.Json.Linq;JObject;GetPropertyOwner;(System.ComponentModel.PropertyDescriptor);Argument[this];ReturnValue;value;dfc-generated |
 | Newtonsoft.Json.Linq;JObject;JObject;(Newtonsoft.Json.Linq.JObject);Argument[0].Element.Property[System.Collections.Generic.KeyValuePair`2.Key];Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Key];value;manual |
 | Newtonsoft.Json.Linq;JObject;JObject;(Newtonsoft.Json.Linq.JObject);Argument[0].Element.Property[System.Collections.Generic.KeyValuePair`2.Value];Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Value];value;manual |
 | Newtonsoft.Json.Linq;JObject;JObject;(System.Object[]);Argument[0].Element.Property[System.Collections.Generic.KeyValuePair`2.Key];Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Key];value;manual |
@@ -2912,16 +3366,12 @@ summary
 | Newtonsoft.Json.Linq;JObject;set_Item;(System.String,Newtonsoft.Json.Linq.JToken);Argument[0];Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Key];value;manual |
 | Newtonsoft.Json.Linq;JObject;set_Item;(System.String,Newtonsoft.Json.Linq.JToken);Argument[1];Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Value];value;manual |
 | Newtonsoft.Json.Linq;JObject;set_Item;(System.String,Newtonsoft.Json.Linq.JToken);Argument[1];Argument[this].Element;value;manual |
-| Newtonsoft.Json.Linq;JPropertyDescriptor;GetValue;(System.Object);Argument[0];Argument[this];taint;df-generated |
-| Newtonsoft.Json.Linq;JPropertyDescriptor;GetValue;(System.Object);Argument[0];ReturnValue;taint;df-generated |
-| Newtonsoft.Json.Linq;JPropertyDescriptor;GetValue;(System.Object);Argument[this];ReturnValue;taint;df-generated |
+| Newtonsoft.Json.Linq;JPropertyDescriptor;GetValue;(System.Object);Argument[0];ReturnValue;taint;dfc-generated |
 | Newtonsoft.Json.Linq;JPropertyDescriptor;ResetValue;(System.Object);Argument[this];Argument[0];taint;df-generated |
 | Newtonsoft.Json.Linq;JPropertyDescriptor;SetValue;(System.Object,System.Object);Argument[0];Argument[this];taint;df-generated |
 | Newtonsoft.Json.Linq;JPropertyDescriptor;SetValue;(System.Object,System.Object);Argument[1];Argument[0];taint;df-generated |
-| Newtonsoft.Json.Linq;JPropertyDescriptor;SetValue;(System.Object,System.Object);Argument[1];Argument[this];taint;df-generated |
 | Newtonsoft.Json.Linq;JPropertyDescriptor;SetValue;(System.Object,System.Object);Argument[this];Argument[0];taint;df-generated |
-| Newtonsoft.Json.Linq;JToken;Clone;();Argument[this];ReturnValue;taint;df-generated |
-| Newtonsoft.Json.Linq;JToken;Clone;();Argument[this];ReturnValue;value;df-generated |
+| Newtonsoft.Json.Linq;JToken;Clone;();Argument[this];ReturnValue;value;dfc-generated |
 | Newtonsoft.Json.Linq;JToken;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.Generic.IEnumerator`1.Current];value;manual |
 | Newtonsoft.Json.Linq;JToken;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.IEnumerator.Current];value;manual |
 | Newtonsoft.Json.Linq;JToken;SelectToken;(System.String);Argument[this];ReturnValue;taint;manual |
@@ -2931,12 +3381,9 @@ summary
 | Newtonsoft.Json.Linq;JToken;ToString;(Newtonsoft.Json.Formatting,Newtonsoft.Json.JsonConverter[]);Argument[this];ReturnValue;taint;manual |
 | Newtonsoft.Json.Linq;JValue;ToDateTime;(System.IFormatProvider);Argument[this];ReturnValue;value;df-generated |
 | Newtonsoft.Json.Linq;JValue;ToDecimal;(System.IFormatProvider);Argument[this];ReturnValue;value;df-generated |
-| Newtonsoft.Json.Linq;JValue;ToString;(System.IFormatProvider);Argument[0];ReturnValue;taint;df-generated |
-| Newtonsoft.Json.Linq;JValue;ToString;(System.IFormatProvider);Argument[this];ReturnValue;value;df-generated |
-| Newtonsoft.Json.Linq;JValue;ToString;(System.String,System.IFormatProvider);Argument[1];ReturnValue;taint;df-generated |
-| Newtonsoft.Json.Linq;JValue;ToString;(System.String,System.IFormatProvider);Argument[this];ReturnValue;taint;df-generated |
-| Newtonsoft.Json.Linq;JValue;ToType;(System.Type,System.IFormatProvider);Argument[1];ReturnValue;taint;df-generated |
-| Newtonsoft.Json.Linq;JValue;ToType;(System.Type,System.IFormatProvider);Argument[this];ReturnValue;taint;df-generated |
+| Newtonsoft.Json.Linq;JValue;ToString;(System.IFormatProvider);Argument[this];ReturnValue;value;dfc-generated |
+| Newtonsoft.Json.Linq;JValue;ToString;(System.String,System.IFormatProvider);Argument[this];ReturnValue;taint;dfc-generated |
+| Newtonsoft.Json.Linq;JValue;ToType;(System.Type,System.IFormatProvider);Argument[this];ReturnValue;value;dfc-generated |
 | Newtonsoft.Json.Schema;Extensions;Validate;(Newtonsoft.Json.Linq.JToken,Newtonsoft.Json.Schema.JsonSchema,Newtonsoft.Json.Schema.ValidationEventHandler);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
 | Newtonsoft.Json.Schema;ValidationEventHandler;BeginInvoke;(System.Object,Newtonsoft.Json.Schema.ValidationEventArgs,System.AsyncCallback,System.Object);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
 | Newtonsoft.Json.Serialization;ExtensionDataGetter;BeginInvoke;(System.Object,System.AsyncCallback,System.Object);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
@@ -3318,10 +3765,10 @@ summary
 | ServiceStack.Host.Handlers;HttpAsyncTaskHandler;Middleware;(Microsoft.AspNetCore.Http.HttpContext,System.Func<System.Threading.Tasks.Task>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
 | ServiceStack.Host.Handlers;StaticFileHandler;set_Filter;(System.Action<ServiceStack.Web.IRequest,ServiceStack.Web.IResponse,ServiceStack.IO.IVirtualFile>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | ServiceStack.Host.Handlers;StaticFileHandler;set_ResponseFilter;(System.Action<ServiceStack.Web.IRequest,ServiceStack.Web.IResponse,ServiceStack.IO.IVirtualFile>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
-| ServiceStack.Host.NetCore;NetCoreRequest;GetService;(System.Type);Argument[this];ReturnValue;taint;df-generated |
+| ServiceStack.Host.NetCore;NetCoreRequest;GetService;(System.Type);Argument[this];ReturnValue;value;dfc-generated |
 | ServiceStack.Host;ActionContext;set_ServiceAction;(ServiceStack.Host.ActionInvokerFn);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | ServiceStack.Host;ActionInvokerFn;BeginInvoke;(System.Object,System.Object,System.AsyncCallback,System.Object);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
-| ServiceStack.Host;BasicRequest;GetService;(System.Type);Argument[this];ReturnValue;taint;df-generated |
+| ServiceStack.Host;BasicRequest;GetService;(System.Type);Argument[this];ReturnValue;value;dfc-generated |
 | ServiceStack.Host;ContentTypes;Register;(System.String,ServiceStack.Web.StreamSerializerDelegate,ServiceStack.Web.StreamDeserializerDelegate);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
 | ServiceStack.Host;ContentTypes;Register;(System.String,ServiceStack.Web.StreamSerializerDelegate,ServiceStack.Web.StreamDeserializerDelegate);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
 | ServiceStack.Host;ContentTypes;RegisterAsync;(System.String,ServiceStack.Web.StreamSerializerDelegateAsync,ServiceStack.Web.StreamDeserializerDelegateAsync);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
@@ -3331,8 +3778,7 @@ summary
 | ServiceStack.Host;ContentTypes;set_UnknownContentTypeDeserializer;(ServiceStack.Web.StreamDeserializerDelegateAsync);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | ServiceStack.Host;ContentTypes;set_UnknownContentTypeSerializer;(ServiceStack.Web.StreamSerializerDelegateAsync);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | ServiceStack.Host;FallbackRestPathDelegate;BeginInvoke;(ServiceStack.Web.IHttpRequest,System.AsyncCallback,System.Object);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
-| ServiceStack.Host;GatewayRequest;Clone;();Argument[this];ReturnValue;taint;df-generated |
-| ServiceStack.Host;GatewayRequest;Clone;();Argument[this];ReturnValue;value;df-generated |
+| ServiceStack.Host;GatewayRequest;Clone;();Argument[this];ReturnValue;value;dfc-generated |
 | ServiceStack.Host;HandleGatewayExceptionAsyncDelegate;BeginInvoke;(ServiceStack.Web.IRequest,System.Object,System.Exception,System.AsyncCallback,System.Object);Argument[3];Argument[3].Parameter[delegate-self];value;hq-generated |
 | ServiceStack.Host;HandleGatewayExceptionDelegate;BeginInvoke;(ServiceStack.Web.IRequest,System.Object,System.Exception,System.AsyncCallback,System.Object);Argument[3];Argument[3].Parameter[delegate-self];value;hq-generated |
 | ServiceStack.Host;HandleServiceExceptionAsyncDelegate;BeginInvoke;(ServiceStack.Web.IRequest,System.Object,System.Exception,System.AsyncCallback,System.Object);Argument[3];Argument[3].Parameter[delegate-self];value;hq-generated |
@@ -3349,8 +3795,7 @@ summary
 | ServiceStack.Host;InMemoryRollingRequestLogger;set_SkipLogging;(System.Func<ServiceStack.Web.IRequest,System.Boolean>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | ServiceStack.Host;InstanceExecFn;BeginInvoke;(ServiceStack.Web.IRequest,System.Object,System.Object,System.AsyncCallback,System.Object);Argument[3];Argument[3].Parameter[delegate-self];value;hq-generated |
 | ServiceStack.Host;MetadataTypeExtensions;ToMetadataServiceRoutes;(System.Collections.Generic.Dictionary<System.Type,System.String[]>,System.Action<System.Collections.Generic.Dictionary<System.String,System.String[]>>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
-| ServiceStack.Host;Operation;Clone;();Argument[this];ReturnValue;taint;df-generated |
-| ServiceStack.Host;Operation;Clone;();Argument[this];ReturnValue;value;df-generated |
+| ServiceStack.Host;Operation;Clone;();Argument[this];ReturnValue;value;dfc-generated |
 | ServiceStack.Host;RestPath;set_CalculateMatchScore;(System.Func<ServiceStack.Host.RestPath,System.String,System.String[],System.Int32>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | ServiceStack.Host;RouteNamingConventionDelegate;BeginInvoke;(ServiceStack.Web.IServiceRoutes,System.Type,System.String,System.AsyncCallback,System.Object);Argument[3];Argument[3].Parameter[delegate-self];value;hq-generated |
 | ServiceStack.Host;ServiceController;ServiceController;(ServiceStack.ServiceStackHost,System.Func<System.Collections.Generic.IEnumerable<System.Type>>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
@@ -3442,7 +3887,6 @@ summary
 | ServiceStack.MiniProfiler.Data;ProfiledCommand;ExecuteScalar;();Argument[this];ReturnValue;taint;df-generated |
 | ServiceStack.MiniProfiler.Data;ProfiledCommand;get_DbParameterCollection;();Argument[this];ReturnValue;taint;df-generated |
 | ServiceStack.MiniProfiler.Data;ProfiledConnection;BeginDbTransaction;(System.Data.IsolationLevel);Argument[this];ReturnValue;taint;df-generated |
-| ServiceStack.MiniProfiler.Data;ProfiledConnection;CreateDbCommand;();Argument[this];ReturnValue;taint;df-generated |
 | ServiceStack.MiniProfiler.Data;ProfiledConnection;get_ServerVersion;();Argument[this];ReturnValue;taint;df-generated |
 | ServiceStack.MiniProfiler.Data;ProfiledDbDataReader;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.IEnumerator.Current];value;manual |
 | ServiceStack.MiniProfiler.Data;ProfiledDbDataReader;GetString;(System.Int32);Argument[this];ReturnValue;taint;manual |
@@ -3450,7 +3894,6 @@ summary
 | ServiceStack.MiniProfiler.Data;ProfiledDbDataReader;GetValues;(System.Object[]);Argument[this];Argument[0].Element;taint;manual |
 | ServiceStack.MiniProfiler.Data;ProfiledDbDataReader;get_Item;(System.Int32);Argument[this];ReturnValue;taint;manual |
 | ServiceStack.MiniProfiler.Data;ProfiledDbDataReader;get_Item;(System.String);Argument[this];ReturnValue;taint;manual |
-| ServiceStack.MiniProfiler.Data;ProfiledDbTransaction;get_DbConnection;();Argument[this];ReturnValue;taint;df-generated |
 | ServiceStack.NativeTypes.CSharp;CSharpGenerator;set_AddCodeFilter;(ServiceStack.NativeTypes.AddCodeDelegate);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | ServiceStack.NativeTypes.CSharp;CSharpGenerator;set_InnerTypeFilter;(System.Action<ServiceStack.NativeTypes.StringBuilderWrapper,ServiceStack.MetadataType>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | ServiceStack.NativeTypes.CSharp;CSharpGenerator;set_InsertCodeFilter;(ServiceStack.NativeTypes.AddCodeDelegate);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
@@ -3702,7 +4145,6 @@ summary
 | ServiceStack.OrmLite;ModelDefinition;GetOrderedFieldDefinitions;(System.Collections.Generic.ICollection<System.String>,System.Func<System.String,System.String>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
 | ServiceStack.OrmLite;OrmLiteCommand;ExecuteReader;();Argument[this];ReturnValue;taint;manual |
 | ServiceStack.OrmLite;OrmLiteCommand;ExecuteScalar;();Argument[this];ReturnValue;taint;df-generated |
-| ServiceStack.OrmLite;OrmLiteCommand;get_Parameters;();Argument[this];ReturnValue;taint;df-generated |
 | ServiceStack.OrmLite;OrmLiteConfig;set_AfterExecFilter;(System.Action<System.Data.IDbCommand>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | ServiceStack.OrmLite;OrmLiteConfig;set_BeforeExecFilter;(System.Action<System.Data.IDbCommand>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | ServiceStack.OrmLite;OrmLiteConfig;set_ExceptionFilter;(System.Action<System.Data.IDbCommand,System.Exception>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
@@ -3716,9 +4158,6 @@ summary
 | ServiceStack.OrmLite;OrmLiteConfig;set_SqlExpressionSelectFilter;(System.Action<ServiceStack.OrmLite.IUntypedSqlExpression>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | ServiceStack.OrmLite;OrmLiteConfig;set_StringFilter;(System.Func<System.String,System.String>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | ServiceStack.OrmLite;OrmLiteConfig;set_UpdateFilter;(System.Action<System.Data.IDbCommand,System.Object>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
-| ServiceStack.OrmLite;OrmLiteConnection;BeginTransaction;();Argument[this];ReturnValue;taint;df-generated |
-| ServiceStack.OrmLite;OrmLiteConnection;BeginTransaction;(System.Data.IsolationLevel);Argument[this];ReturnValue;taint;df-generated |
-| ServiceStack.OrmLite;OrmLiteConnection;CreateCommand;();Argument[this];ReturnValue;taint;df-generated |
 | ServiceStack.OrmLite;OrmLiteConnectionFactory;set_ConnectionFilter;(System.Func<System.Data.IDbConnection,System.Data.IDbConnection>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | ServiceStack.OrmLite;OrmLiteConnectionFactory;set_OnDispose;(System.Action<ServiceStack.OrmLite.OrmLiteConnection>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | ServiceStack.OrmLite;OrmLiteContext;GetOrCreate<T>;(System.Func<T>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
@@ -3803,7 +4242,6 @@ summary
 | ServiceStack.OrmLite;OrmLiteSchemaModifyApi;CreateIndex<T>;(System.Data.IDbConnection,System.Linq.Expressions.Expression<System.Func<T,System.Object>>,System.String,System.Boolean);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
 | ServiceStack.OrmLite;OrmLiteSchemaModifyApi;DropColumn<T>;(System.Data.IDbConnection,System.Linq.Expressions.Expression<System.Func<T,System.Object>>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
 | ServiceStack.OrmLite;OrmLiteSchemaModifyApi;RenameColumn<T>;(System.Data.IDbConnection,System.Linq.Expressions.Expression<System.Func<T,System.Object>>,System.String);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
-| ServiceStack.OrmLite;OrmLiteTransaction;get_Connection;();Argument[this];ReturnValue;taint;df-generated |
 | ServiceStack.OrmLite;OrmLiteUtils;EvalFactoryFn<T>;(System.Linq.Expressions.Expression<System.Func<T>>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | ServiceStack.OrmLite;OrmLiteUtils;set_SqlVerifyFragmentFn;(System.Func<System.String,System.String>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | ServiceStack.OrmLite;OrmLiteWriteApi;Delete<T>;(System.Data.IDbConnection,System.Object,System.Action<System.Data.IDbCommand>);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
@@ -4382,6 +4820,8 @@ summary
 | ServiceStack.Script;ScriptContext;set_OnUnhandledExpression;(System.Func<ServiceStack.Script.PageVariableFragment,System.ReadOnlyMemory<System.Byte>>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | ServiceStack.Script;ScriptMethodInfo;GetScriptMethods;(System.Type,System.Func<System.Reflection.MethodInfo,System.Boolean>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
 | ServiceStack.Script;SharpPages;OneTimePage;(System.String,System.String,System.Action<ServiceStack.Script.SharpPage>);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
+| ServiceStack.Serialization;XmlSerializerWrapper;ReadObject;(System.Xml.XmlDictionaryReader);Argument[this];ReturnValue;taint;df-generated |
+| ServiceStack.Serialization;XmlSerializerWrapper;ReadObject;(System.Xml.XmlDictionaryReader,System.Boolean);Argument[this];ReturnValue;taint;df-generated |
 | ServiceStack.Support;ActionExecHandler;ActionExecHandler;(System.Action,System.Threading.AutoResetEvent);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | ServiceStack.Support;AdapterBase;Execute;(System.Action);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | ServiceStack.Support;AdapterBase;Execute<T>;(System.Func<T>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
@@ -4393,7 +4833,7 @@ summary
 | ServiceStack.Testing;BasicAppHost;set_ConfigureAppHost;(System.Action<ServiceStack.Testing.BasicAppHost>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | ServiceStack.Testing;BasicAppHost;set_ConfigureContainer;(System.Action<Funq.Container>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | ServiceStack.Testing;BasicAppHost;set_UseServiceController;(System.Func<ServiceStack.Testing.BasicAppHost,ServiceStack.Host.ServiceController>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
-| ServiceStack.Testing;MockHttpRequest;GetService;(System.Type);Argument[this];ReturnValue;taint;df-generated |
+| ServiceStack.Testing;MockHttpRequest;GetService;(System.Type);Argument[this];ReturnValue;value;dfc-generated |
 | ServiceStack.Testing;MockRestGateway;set_ResultsFilter;(ServiceStack.Testing.RestGatewayDelegate);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | ServiceStack.Testing;RestGatewayDelegate;BeginInvoke;(System.String,System.Type,System.Object,System.AsyncCallback,System.Object);Argument[3];Argument[3].Parameter[delegate-self];value;hq-generated |
 | ServiceStack.Text.Common;ConvertInstanceDelegate;BeginInvoke;(System.Object,System.Type,System.AsyncCallback,System.Object);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
@@ -4508,7 +4948,9 @@ summary
 | ServiceStack.Text;TextConfig;set_CreateSha;(System.Func<System.Security.Cryptography.SHA1>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | ServiceStack.Text;TypeConfig<T>;set_OnDeserializing;(System.Func<System.Object,System.String,System.Object,System.Object>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | ServiceStack.Text;TypeSerializer;set_OnSerialize;(System.Action<System.Object>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
-| ServiceStack.Validation;ValidationError;get_Message;();Argument[this];ReturnValue;taint;df-generated |
+| ServiceStack.Validation;ValidationError;get_Message;();Argument[this].Property[System.Exception.Message];ReturnValue;value;dfc-generated |
+| ServiceStack.Validation;ValidationError;get_Message;();Argument[this].SyntheticField[System.ArgumentException._paramName];ReturnValue;taint;dfc-generated |
+| ServiceStack.Validation;ValidationError;get_Message;();Argument[this].SyntheticField[System.Exception._message];ReturnValue;value;dfc-generated |
 | ServiceStack.Validation;ValidationFeature;set_ErrorResponseFilter;(System.Func<ServiceStack.Web.IRequest,ServiceStack.FluentValidation.Results.ValidationResult,System.Object,System.Object>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | ServiceStack.VirtualPath;AbstractVirtualDirectoryBase;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.Generic.IEnumerator`1.Current];value;manual |
 | ServiceStack.VirtualPath;AbstractVirtualDirectoryBase;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.IEnumerator.Current];value;manual |
@@ -4624,7 +5066,6 @@ summary
 | ServiceStack;ContainerNetCoreExtensions;AddSingleton<TService>;(Funq.Container,System.Func<Funq.Container,TService>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
 | ServiceStack;ContainerNetCoreExtensions;AddTransient<TService,TImplementation>;(Funq.Container,System.Func<Funq.Container,TImplementation>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
 | ServiceStack;ContainerNetCoreExtensions;AddTransient<TService>;(Funq.Container,System.Func<Funq.Container,TService>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
-| ServiceStack;CookieHandler;SendAsync;(System.Net.Http.HttpRequestMessage,System.Threading.CancellationToken);Argument[1];ReturnValue;taint;df-generated |
 | ServiceStack;CookieHandler;set_Filter;(System.Func<System.Net.Http.DelegatingHandler,System.Net.Http.HttpRequestMessage,System.Threading.CancellationToken,System.Threading.Tasks.Task>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | ServiceStack;CsvRequestLogger;set_OnReadLastEntryError;(System.Action<System.String,System.Exception>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | ServiceStack;CsvRequestLogger;set_OnWriteLogsError;(System.Action<System.Collections.Generic.List<ServiceStack.RequestLogEntry>,System.Exception>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
@@ -5140,73 +5581,64 @@ summary
 | ServiceStack;UploadLocation;set_ValidateUpload;(System.Action<ServiceStack.Web.IRequest,ServiceStack.Web.IHttpFile>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | ServiceStack;UrlExtensions;ToUrl;(System.Object,System.String,System.Func<System.Type,System.String>);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
 | ServiceStack;UrlResolverDelegate;BeginInvoke;(ServiceStack.IServiceClientMeta,System.String,System.String,System.AsyncCallback,System.Object);Argument[3];Argument[3].Parameter[delegate-self];value;hq-generated |
-| ServiceStack;WebServiceException;get_Message;();Argument[this];ReturnValue;taint;df-generated |
+| ServiceStack;WebServiceException;get_Message;();Argument[this].SyntheticField[System.Exception._message];ReturnValue;value;dfc-generated |
 | ServiceStack;WriteComplexTypeDelegate;BeginInvoke;(System.IO.TextWriter,System.String,System.Object,System.AsyncCallback,System.Object);Argument[3];Argument[3].Parameter[delegate-self];value;hq-generated |
 | ServiceStack;X;Apply<T>;(T,System.Action<T>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
 | ServiceStack;X;Map<From,To>;(From,System.Func<From,To>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
 | ServiceStack;XLinqExtensions;GetAttributeValueOrDefault<T>;(System.Xml.Linq.XAttribute,System.String,System.Func<System.Xml.Linq.XAttribute,T>);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
 | ServiceStack;XLinqExtensions;GetElementValueOrDefault<T>;(System.Xml.Linq.XElement,System.String,System.Func<System.Xml.Linq.XElement,T>);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
-| System.Buffers;ArrayBufferWriter<T>;GetMemory;(System.Int32);Argument[this];ReturnValue;taint;df-generated |
-| System.Buffers;ArrayBufferWriter<T>;get_WrittenMemory;();Argument[this];ReturnValue;taint;df-generated |
-| System.Buffers;ArrayBufferWriter<T>;get_WrittenSpan;();Argument[this];ReturnValue;taint;df-generated |
 | System.Buffers;BuffersExtensions;CopyTo<T>;(System.Buffers.ReadOnlySequence<T>,System.Span<T>);Argument[0];Argument[1];taint;df-generated |
-| System.Buffers;BuffersExtensions;PositionOf<T>;(System.Buffers.ReadOnlySequence<T>,T);Argument[0];ReturnValue;taint;df-generated |
-| System.Buffers;MemoryHandle;MemoryHandle;(System.Void*,System.Runtime.InteropServices.GCHandle,System.Buffers.IPinnable);Argument[0];Argument[this];taint;df-generated |
-| System.Buffers;MemoryHandle;MemoryHandle;(System.Void*,System.Runtime.InteropServices.GCHandle,System.Buffers.IPinnable);Argument[1];Argument[this];taint;df-generated |
-| System.Buffers;MemoryHandle;MemoryHandle;(System.Void*,System.Runtime.InteropServices.GCHandle,System.Buffers.IPinnable);Argument[2];Argument[this];taint;df-generated |
-| System.Buffers;MemoryHandle;get_Pointer;();Argument[this];ReturnValue;taint;df-generated |
+| System.Buffers;MemoryHandle;MemoryHandle;(System.Void*,System.Runtime.InteropServices.GCHandle,System.Buffers.IPinnable);Argument[0];Argument[this].SyntheticField[System.Buffers.MemoryHandle._pointer];value;dfc-generated |
+| System.Buffers;MemoryHandle;get_Pointer;();Argument[this].SyntheticField[System.Buffers.MemoryHandle._pointer];ReturnValue;value;dfc-generated |
 | System.Buffers;MemoryManager<T>;CreateMemory;(System.Int32);Argument[this];ReturnValue;taint;df-generated |
 | System.Buffers;MemoryManager<T>;CreateMemory;(System.Int32,System.Int32);Argument[this];ReturnValue;taint;df-generated |
 | System.Buffers;MemoryManager<T>;get_Memory;();Argument[this];ReturnValue;taint;df-generated |
 | System.Buffers;ReadOnlySequence<T>+Enumerator;Enumerator;(System.Buffers.ReadOnlySequence<T>);Argument[0];Argument[this];taint;df-generated |
 | System.Buffers;ReadOnlySequence<T>+Enumerator;get_Current;();Argument[this];ReturnValue;taint;df-generated |
-| System.Buffers;ReadOnlySequence<T>;GetEnumerator;();Argument[this];ReturnValue;taint;df-generated |
-| System.Buffers;ReadOnlySequence<T>;GetPosition;(System.Int64);Argument[this];ReturnValue;taint;df-generated |
-| System.Buffers;ReadOnlySequence<T>;GetPosition;(System.Int64,System.SequencePosition);Argument[1];ReturnValue;taint;df-generated |
 | System.Buffers;ReadOnlySequence<T>;ReadOnlySequence;(System.Buffers.ReadOnlySequenceSegment<T>,System.Int32,System.Buffers.ReadOnlySequenceSegment<T>,System.Int32);Argument[0];Argument[this];taint;df-generated |
 | System.Buffers;ReadOnlySequence<T>;ReadOnlySequence;(System.Buffers.ReadOnlySequenceSegment<T>,System.Int32,System.Buffers.ReadOnlySequenceSegment<T>,System.Int32);Argument[2];Argument[this];taint;df-generated |
-| System.Buffers;ReadOnlySequence<T>;ReadOnlySequence;(System.ReadOnlyMemory<T>);Argument[0];Argument[this];taint;df-generated |
 | System.Buffers;ReadOnlySequence<T>;ReadOnlySequence;(T[]);Argument[0].Element;Argument[this];taint;df-generated |
 | System.Buffers;ReadOnlySequence<T>;ReadOnlySequence;(T[],System.Int32,System.Int32);Argument[0].Element;Argument[this];taint;df-generated |
-| System.Buffers;ReadOnlySequence<T>;Slice;(System.Int32,System.Int32);Argument[this];ReturnValue;taint;df-generated |
 | System.Buffers;ReadOnlySequence<T>;Slice;(System.Int32,System.SequencePosition);Argument[1];ReturnValue;taint;df-generated |
-| System.Buffers;ReadOnlySequence<T>;Slice;(System.Int32,System.SequencePosition);Argument[this];ReturnValue;taint;df-generated |
-| System.Buffers;ReadOnlySequence<T>;Slice;(System.Int64);Argument[this];ReturnValue;value;df-generated |
-| System.Buffers;ReadOnlySequence<T>;Slice;(System.Int64,System.Int64);Argument[this];ReturnValue;taint;df-generated |
+| System.Buffers;ReadOnlySequence<T>;Slice;(System.Int64);Argument[this];ReturnValue;value;dfc-generated |
 | System.Buffers;ReadOnlySequence<T>;Slice;(System.Int64,System.SequencePosition);Argument[1];ReturnValue;taint;df-generated |
-| System.Buffers;ReadOnlySequence<T>;Slice;(System.Int64,System.SequencePosition);Argument[this];ReturnValue;taint;df-generated |
 | System.Buffers;ReadOnlySequence<T>;Slice;(System.SequencePosition);Argument[0];ReturnValue;taint;df-generated |
 | System.Buffers;ReadOnlySequence<T>;Slice;(System.SequencePosition);Argument[this];ReturnValue;taint;df-generated |
 | System.Buffers;ReadOnlySequence<T>;Slice;(System.SequencePosition,System.Int32);Argument[0];ReturnValue;taint;df-generated |
-| System.Buffers;ReadOnlySequence<T>;Slice;(System.SequencePosition,System.Int32);Argument[this];ReturnValue;taint;df-generated |
 | System.Buffers;ReadOnlySequence<T>;Slice;(System.SequencePosition,System.Int64);Argument[0];ReturnValue;taint;df-generated |
-| System.Buffers;ReadOnlySequence<T>;Slice;(System.SequencePosition,System.Int64);Argument[this];ReturnValue;taint;df-generated |
 | System.Buffers;ReadOnlySequence<T>;Slice;(System.SequencePosition,System.SequencePosition);Argument[0];ReturnValue;taint;df-generated |
 | System.Buffers;ReadOnlySequence<T>;Slice;(System.SequencePosition,System.SequencePosition);Argument[1];ReturnValue;taint;df-generated |
-| System.Buffers;ReadOnlySequence<T>;TryGet;(System.SequencePosition,System.ReadOnlyMemory<T>,System.Boolean);Argument[0];ReturnValue;taint;df-generated |
-| System.Buffers;ReadOnlySequence<T>;get_End;();Argument[this];ReturnValue;taint;df-generated |
-| System.Buffers;ReadOnlySequence<T>;get_First;();Argument[this];ReturnValue;taint;df-generated |
+| System.Buffers;ReadOnlySequence<T>;TryGet;(System.SequencePosition,System.ReadOnlyMemory<T>,System.Boolean);Argument[0];ReturnValue;value;dfc-generated |
 | System.Buffers;ReadOnlySequence<T>;get_FirstSpan;();Argument[this];ReturnValue;taint;df-generated |
-| System.Buffers;ReadOnlySequence<T>;get_Start;();Argument[this];ReturnValue;taint;df-generated |
 | System.Buffers;ReadOnlySpanAction<T,TArg>;BeginInvoke;(System.ReadOnlySpan<T>,TArg,System.AsyncCallback,System.Object);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
 | System.Buffers;SearchValues;Create;(System.ReadOnlySpan<System.Byte>);Argument[0];ReturnValue;taint;df-generated |
 | System.Buffers;SequenceReader<T>;SequenceReader;(System.Buffers.ReadOnlySequence<T>);Argument[0];Argument[this];taint;df-generated |
-| System.Buffers;SequenceReader<T>;TryCopyTo;(System.Span<T>);Argument[this];Argument[0];taint;df-generated |
-| System.Buffers;SequenceReader<T>;TryPeek;(System.Int64,T);Argument[this];ReturnValue;taint;df-generated |
-| System.Buffers;SequenceReader<T>;TryPeek;(T);Argument[this];ReturnValue;taint;df-generated |
-| System.Buffers;SequenceReader<T>;TryRead;(T);Argument[this];ReturnValue;taint;df-generated |
+| System.Buffers;SequenceReader<T>;TryCopyTo;(System.Span<T>);Argument[this].Property[System.Buffers.SequenceReader`1.CurrentSpan].Element;Argument[0].Element;value;dfc-generated |
+| System.Buffers;SequenceReader<T>;TryCopyTo;(System.Span<T>);Argument[this].Property[System.Buffers.SequenceReader`1.UnreadSpan].Element;Argument[0].Element;value;dfc-generated |
+| System.Buffers;SequenceReader<T>;TryPeek;(System.Int64,T);Argument[this].Property[System.Buffers.SequenceReader`1.CurrentSpan].Element;ReturnValue;value;dfc-generated |
+| System.Buffers;SequenceReader<T>;TryPeek;(T);Argument[this].Property[System.Buffers.SequenceReader`1.CurrentSpan].Element;ReturnValue;value;dfc-generated |
+| System.Buffers;SequenceReader<T>;TryRead;(T);Argument[this].Property[System.Buffers.SequenceReader`1.CurrentSpan].Element;ReturnValue;value;dfc-generated |
 | System.Buffers;SequenceReader<T>;TryReadExact;(System.Int32,System.Buffers.ReadOnlySequence<T>);Argument[this];ReturnValue;taint;df-generated |
 | System.Buffers;SequenceReader<T>;TryReadTo;(System.Buffers.ReadOnlySequence<T>,System.ReadOnlySpan<T>,System.Boolean);Argument[this];ReturnValue;taint;df-generated |
 | System.Buffers;SequenceReader<T>;TryReadTo;(System.Buffers.ReadOnlySequence<T>,T,System.Boolean);Argument[this];ReturnValue;taint;df-generated |
 | System.Buffers;SequenceReader<T>;TryReadTo;(System.Buffers.ReadOnlySequence<T>,T,T,System.Boolean);Argument[this];ReturnValue;taint;df-generated |
-| System.Buffers;SequenceReader<T>;TryReadTo;(System.ReadOnlySpan<T>,System.ReadOnlySpan<T>,System.Boolean);Argument[this];ReturnValue;taint;df-generated |
-| System.Buffers;SequenceReader<T>;TryReadTo;(System.ReadOnlySpan<T>,T,System.Boolean);Argument[this];ReturnValue;taint;df-generated |
-| System.Buffers;SequenceReader<T>;TryReadTo;(System.ReadOnlySpan<T>,T,T,System.Boolean);Argument[this];ReturnValue;taint;df-generated |
+| System.Buffers;SequenceReader<T>;TryReadTo;(System.ReadOnlySpan<T>,System.ReadOnlySpan<T>,System.Boolean);Argument[this].Property[System.Buffers.SequenceReader`1.CurrentSpan].Element;ReturnValue.Element;value;dfc-generated |
+| System.Buffers;SequenceReader<T>;TryReadTo;(System.ReadOnlySpan<T>,System.ReadOnlySpan<T>,System.Boolean);Argument[this].Property[System.Buffers.SequenceReader`1.UnreadSpan].Element;ReturnValue.Element;value;dfc-generated |
+| System.Buffers;SequenceReader<T>;TryReadTo;(System.ReadOnlySpan<T>,T,System.Boolean);Argument[this].Property[System.Buffers.SequenceReader`1.CurrentSpan].Element;ReturnValue.Element;value;dfc-generated |
+| System.Buffers;SequenceReader<T>;TryReadTo;(System.ReadOnlySpan<T>,T,System.Boolean);Argument[this].Property[System.Buffers.SequenceReader`1.UnreadSpan].Element;ReturnValue.Element;value;dfc-generated |
+| System.Buffers;SequenceReader<T>;TryReadTo;(System.ReadOnlySpan<T>,T,T,System.Boolean);Argument[this].Property[System.Buffers.SequenceReader`1.CurrentSpan].Element;ReturnValue.Element;value;dfc-generated |
+| System.Buffers;SequenceReader<T>;TryReadTo;(System.ReadOnlySpan<T>,T,T,System.Boolean);Argument[this].Property[System.Buffers.SequenceReader`1.UnreadSpan].Element;ReturnValue.Element;value;dfc-generated |
 | System.Buffers;SequenceReader<T>;TryReadToAny;(System.Buffers.ReadOnlySequence<T>,System.ReadOnlySpan<T>,System.Boolean);Argument[this];ReturnValue;taint;df-generated |
-| System.Buffers;SequenceReader<T>;TryReadToAny;(System.ReadOnlySpan<T>,System.ReadOnlySpan<T>,System.Boolean);Argument[this];ReturnValue;taint;df-generated |
-| System.Buffers;SequenceReader<T>;get_Position;();Argument[this];ReturnValue;taint;df-generated |
+| System.Buffers;SequenceReader<T>;TryReadToAny;(System.ReadOnlySpan<T>,System.ReadOnlySpan<T>,System.Boolean);Argument[this].Property[System.Buffers.SequenceReader`1.CurrentSpan].Element;ReturnValue.Element;value;dfc-generated |
+| System.Buffers;SequenceReader<T>;TryReadToAny;(System.ReadOnlySpan<T>,System.ReadOnlySpan<T>,System.Boolean);Argument[this].Property[System.Buffers.SequenceReader`1.UnreadSpan].Element;ReturnValue.Element;value;dfc-generated |
 | System.Buffers;SequenceReader<T>;get_UnreadSequence;();Argument[this];ReturnValue;taint;df-generated |
-| System.Buffers;SequenceReader<T>;get_UnreadSpan;();Argument[this];ReturnValue;taint;df-generated |
+| System.Buffers;SequenceReader<T>;get_UnreadSpan;();Argument[this].Property[System.Buffers.SequenceReader`1.CurrentSpan].Element;ReturnValue.Element;value;dfc-generated |
+| System.Buffers;SequenceReaderExtensions;TryReadBigEndian;(System.Buffers.SequenceReader<System.Byte>,System.Int16);Argument[0];ReturnValue;value;dfc-generated |
+| System.Buffers;SequenceReaderExtensions;TryReadBigEndian;(System.Buffers.SequenceReader<System.Byte>,System.Int32);Argument[0];ReturnValue;value;dfc-generated |
+| System.Buffers;SequenceReaderExtensions;TryReadBigEndian;(System.Buffers.SequenceReader<System.Byte>,System.Int64);Argument[0];ReturnValue;value;dfc-generated |
+| System.Buffers;SequenceReaderExtensions;TryReadLittleEndian;(System.Buffers.SequenceReader<System.Byte>,System.Int16);Argument[0];ReturnValue;value;dfc-generated |
+| System.Buffers;SequenceReaderExtensions;TryReadLittleEndian;(System.Buffers.SequenceReader<System.Byte>,System.Int32);Argument[0];ReturnValue;value;dfc-generated |
+| System.Buffers;SequenceReaderExtensions;TryReadLittleEndian;(System.Buffers.SequenceReader<System.Byte>,System.Int64);Argument[0];ReturnValue;value;dfc-generated |
 | System.Buffers;SpanAction<T,TArg>;BeginInvoke;(System.Span<T>,TArg,System.AsyncCallback,System.Object);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
 | System.CodeDom.Compiler;CodeCompiler;CompileAssemblyFromDom;(System.CodeDom.Compiler.CompilerParameters,System.CodeDom.CodeCompileUnit);Argument[1];Argument[0];taint;df-generated |
 | System.CodeDom.Compiler;CodeCompiler;CompileAssemblyFromDom;(System.CodeDom.Compiler.CompilerParameters,System.CodeDom.CodeCompileUnit);Argument[1];Argument[this];taint;df-generated |
@@ -5216,76 +5648,83 @@ summary
 | System.CodeDom.Compiler;CodeCompiler;FromDom;(System.CodeDom.Compiler.CompilerParameters,System.CodeDom.CodeCompileUnit);Argument[1];Argument[this];taint;df-generated |
 | System.CodeDom.Compiler;CodeCompiler;FromDomBatch;(System.CodeDom.Compiler.CompilerParameters,System.CodeDom.CodeCompileUnit[]);Argument[1].Element;Argument[0];taint;df-generated |
 | System.CodeDom.Compiler;CodeCompiler;FromDomBatch;(System.CodeDom.Compiler.CompilerParameters,System.CodeDom.CodeCompileUnit[]);Argument[1].Element;Argument[this];taint;df-generated |
-| System.CodeDom.Compiler;CodeCompiler;GetResponseFileCmdArgs;(System.CodeDom.Compiler.CompilerParameters,System.String);Argument[0];ReturnValue;taint;df-generated |
-| System.CodeDom.Compiler;CodeCompiler;JoinStringArray;(System.String[],System.String);Argument[0].Element;ReturnValue;taint;df-generated |
-| System.CodeDom.Compiler;CodeCompiler;JoinStringArray;(System.String[],System.String);Argument[1];ReturnValue;taint;df-generated |
+| System.CodeDom.Compiler;CodeCompiler;JoinStringArray;(System.String[],System.String);Argument[0].Element;ReturnValue;taint;dfc-generated |
+| System.CodeDom.Compiler;CodeCompiler;JoinStringArray;(System.String[],System.String);Argument[1];ReturnValue;taint;dfc-generated |
 | System.CodeDom.Compiler;CodeDomProvider;CompileAssemblyFromDom;(System.CodeDom.Compiler.CompilerParameters,System.CodeDom.CodeCompileUnit[]);Argument[1].Element;Argument[0];taint;df-generated |
 | System.CodeDom.Compiler;CodeDomProvider;CompileAssemblyFromDom;(System.CodeDom.Compiler.CompilerParameters,System.CodeDom.CodeCompileUnit[]);Argument[1].Element;Argument[this];taint;df-generated |
 | System.CodeDom.Compiler;CodeDomProvider;CreateCompiler;();Argument[this];ReturnValue;taint;df-generated |
-| System.CodeDom.Compiler;CodeDomProvider;CreateEscapedIdentifier;(System.String);Argument[0];ReturnValue;taint;df-generated |
+| System.CodeDom.Compiler;CodeDomProvider;CreateEscapedIdentifier;(System.String);Argument[0];ReturnValue;value;dfc-generated |
 | System.CodeDom.Compiler;CodeDomProvider;CreateGenerator;();Argument[this];ReturnValue;taint;df-generated |
 | System.CodeDom.Compiler;CodeDomProvider;CreateGenerator;(System.IO.TextWriter);Argument[this];ReturnValue;taint;df-generated |
 | System.CodeDom.Compiler;CodeDomProvider;CreateGenerator;(System.String);Argument[this];ReturnValue;taint;df-generated |
-| System.CodeDom.Compiler;CodeDomProvider;CreateValidIdentifier;(System.String);Argument[0];ReturnValue;taint;df-generated |
+| System.CodeDom.Compiler;CodeDomProvider;CreateValidIdentifier;(System.String);Argument[0];ReturnValue;value;dfc-generated |
 | System.CodeDom.Compiler;CodeDomProvider;GenerateCodeFromCompileUnit;(System.CodeDom.CodeCompileUnit,System.IO.TextWriter,System.CodeDom.Compiler.CodeGeneratorOptions);Argument[0];Argument[this];taint;df-generated |
 | System.CodeDom.Compiler;CodeDomProvider;GenerateCodeFromCompileUnit;(System.CodeDom.CodeCompileUnit,System.IO.TextWriter,System.CodeDom.Compiler.CodeGeneratorOptions);Argument[2];Argument[this];taint;df-generated |
+| System.CodeDom.Compiler;CodeDomProvider;GenerateCodeFromExpression;(System.CodeDom.CodeExpression,System.IO.TextWriter,System.CodeDom.Compiler.CodeGeneratorOptions);Argument[0];Argument[this];taint;df-generated |
 | System.CodeDom.Compiler;CodeDomProvider;GenerateCodeFromExpression;(System.CodeDom.CodeExpression,System.IO.TextWriter,System.CodeDom.Compiler.CodeGeneratorOptions);Argument[2];Argument[this];taint;df-generated |
 | System.CodeDom.Compiler;CodeDomProvider;GenerateCodeFromMember;(System.CodeDom.CodeTypeMember,System.IO.TextWriter,System.CodeDom.Compiler.CodeGeneratorOptions);Argument[0];Argument[this];taint;df-generated |
 | System.CodeDom.Compiler;CodeDomProvider;GenerateCodeFromMember;(System.CodeDom.CodeTypeMember,System.IO.TextWriter,System.CodeDom.Compiler.CodeGeneratorOptions);Argument[2];Argument[this];taint;df-generated |
 | System.CodeDom.Compiler;CodeDomProvider;GenerateCodeFromNamespace;(System.CodeDom.CodeNamespace,System.IO.TextWriter,System.CodeDom.Compiler.CodeGeneratorOptions);Argument[0];Argument[this];taint;df-generated |
 | System.CodeDom.Compiler;CodeDomProvider;GenerateCodeFromNamespace;(System.CodeDom.CodeNamespace,System.IO.TextWriter,System.CodeDom.Compiler.CodeGeneratorOptions);Argument[2];Argument[this];taint;df-generated |
+| System.CodeDom.Compiler;CodeDomProvider;GenerateCodeFromStatement;(System.CodeDom.CodeStatement,System.IO.TextWriter,System.CodeDom.Compiler.CodeGeneratorOptions);Argument[0];Argument[this];taint;df-generated |
 | System.CodeDom.Compiler;CodeDomProvider;GenerateCodeFromStatement;(System.CodeDom.CodeStatement,System.IO.TextWriter,System.CodeDom.Compiler.CodeGeneratorOptions);Argument[2];Argument[this];taint;df-generated |
 | System.CodeDom.Compiler;CodeDomProvider;GenerateCodeFromType;(System.CodeDom.CodeTypeDeclaration,System.IO.TextWriter,System.CodeDom.Compiler.CodeGeneratorOptions);Argument[0];Argument[this];taint;df-generated |
 | System.CodeDom.Compiler;CodeDomProvider;GenerateCodeFromType;(System.CodeDom.CodeTypeDeclaration,System.IO.TextWriter,System.CodeDom.Compiler.CodeGeneratorOptions);Argument[2];Argument[this];taint;df-generated |
-| System.CodeDom.Compiler;CodeDomProvider;GetTypeOutput;(System.CodeDom.CodeTypeReference);Argument[0];ReturnValue;taint;df-generated |
+| System.CodeDom.Compiler;CodeDomProvider;GetTypeOutput;(System.CodeDom.CodeTypeReference);Argument[0].Property[System.CodeDom.CodeTypeReference.ArrayElementType].Property[System.CodeDom.CodeTypeReference.BaseType];ReturnValue;taint;dfc-generated |
+| System.CodeDom.Compiler;CodeDomProvider;GetTypeOutput;(System.CodeDom.CodeTypeReference);Argument[0].Property[System.CodeDom.CodeTypeReference.BaseType];ReturnValue;taint;dfc-generated |
 | System.CodeDom.Compiler;CodeGenerator;ContinueOnNewLine;(System.String);Argument[0];Argument[this];taint;df-generated |
-| System.CodeDom.Compiler;CodeGenerator;CreateEscapedIdentifier;(System.String);Argument[0];ReturnValue;taint;df-generated |
-| System.CodeDom.Compiler;CodeGenerator;CreateValidIdentifier;(System.String);Argument[0];ReturnValue;taint;df-generated |
+| System.CodeDom.Compiler;CodeGenerator;CreateEscapedIdentifier;(System.String);Argument[0];ReturnValue;value;dfc-generated |
+| System.CodeDom.Compiler;CodeGenerator;CreateValidIdentifier;(System.String);Argument[0];ReturnValue;value;dfc-generated |
 | System.CodeDom.Compiler;CodeGenerator;GenerateArgumentReferenceExpression;(System.CodeDom.CodeArgumentReferenceExpression);Argument[0];Argument[this];taint;df-generated |
 | System.CodeDom.Compiler;CodeGenerator;GenerateArrayCreateExpression;(System.CodeDom.CodeArrayCreateExpression);Argument[0];Argument[this];taint;df-generated |
-| System.CodeDom.Compiler;CodeGenerator;GenerateArrayIndexerExpression;(System.CodeDom.CodeArrayIndexerExpression);Argument[0];Argument[this];taint;df-generated |
-| System.CodeDom.Compiler;CodeGenerator;GenerateAssignStatement;(System.CodeDom.CodeAssignStatement);Argument[0];Argument[this];taint;df-generated |
 | System.CodeDom.Compiler;CodeGenerator;GenerateAttachEventStatement;(System.CodeDom.CodeAttachEventStatement);Argument[0];Argument[this];taint;df-generated |
 | System.CodeDom.Compiler;CodeGenerator;GenerateBinaryOperatorExpression;(System.CodeDom.CodeBinaryOperatorExpression);Argument[0];Argument[this];taint;df-generated |
 | System.CodeDom.Compiler;CodeGenerator;GenerateCastExpression;(System.CodeDom.CodeCastExpression);Argument[0];Argument[this];taint;df-generated |
 | System.CodeDom.Compiler;CodeGenerator;GenerateCodeFromCompileUnit;(System.CodeDom.CodeCompileUnit,System.IO.TextWriter,System.CodeDom.Compiler.CodeGeneratorOptions);Argument[0];Argument[this];taint;df-generated |
+| System.CodeDom.Compiler;CodeGenerator;GenerateCodeFromCompileUnit;(System.CodeDom.CodeCompileUnit,System.IO.TextWriter,System.CodeDom.Compiler.CodeGeneratorOptions);Argument[0];Argument[this];taint;dfc-generated |
+| System.CodeDom.Compiler;CodeGenerator;GenerateCodeFromCompileUnit;(System.CodeDom.CodeCompileUnit,System.IO.TextWriter,System.CodeDom.Compiler.CodeGeneratorOptions);Argument[2];Argument[this].SyntheticField[System.CodeDom.Compiler.CodeGenerator._options];value;df-generated |
+| System.CodeDom.Compiler;CodeGenerator;GenerateCodeFromCompileUnit;(System.CodeDom.CodeCompileUnit,System.IO.TextWriter,System.CodeDom.Compiler.CodeGeneratorOptions);Argument[2];Argument[this].SyntheticField[System.CodeDom.Compiler.CodeGenerator._options];value;dfc-generated |
 | System.CodeDom.Compiler;CodeGenerator;GenerateCodeFromCompileUnit;(System.CodeDom.CodeCompileUnit,System.IO.TextWriter,System.CodeDom.Compiler.CodeGeneratorOptions);Argument[2];Argument[this];taint;df-generated |
-| System.CodeDom.Compiler;CodeGenerator;GenerateCodeFromExpression;(System.CodeDom.CodeExpression,System.IO.TextWriter,System.CodeDom.Compiler.CodeGeneratorOptions);Argument[0];Argument[this];taint;df-generated |
+| System.CodeDom.Compiler;CodeGenerator;GenerateCodeFromCompileUnit;(System.CodeDom.CodeCompileUnit,System.IO.TextWriter,System.CodeDom.Compiler.CodeGeneratorOptions);Argument[2];Argument[this];taint;dfc-generated |
+| System.CodeDom.Compiler;CodeGenerator;GenerateCodeFromExpression;(System.CodeDom.CodeExpression,System.IO.TextWriter,System.CodeDom.Compiler.CodeGeneratorOptions);Argument[2];Argument[this].SyntheticField[System.CodeDom.Compiler.CodeGenerator._options];value;df-generated |
+| System.CodeDom.Compiler;CodeGenerator;GenerateCodeFromExpression;(System.CodeDom.CodeExpression,System.IO.TextWriter,System.CodeDom.Compiler.CodeGeneratorOptions);Argument[2];Argument[this].SyntheticField[System.CodeDom.Compiler.CodeGenerator._options];value;dfc-generated |
 | System.CodeDom.Compiler;CodeGenerator;GenerateCodeFromExpression;(System.CodeDom.CodeExpression,System.IO.TextWriter,System.CodeDom.Compiler.CodeGeneratorOptions);Argument[2];Argument[this];taint;df-generated |
-| System.CodeDom.Compiler;CodeGenerator;GenerateCodeFromMember;(System.CodeDom.CodeTypeMember,System.IO.TextWriter,System.CodeDom.Compiler.CodeGeneratorOptions);Argument[0];Argument[this];taint;df-generated |
-| System.CodeDom.Compiler;CodeGenerator;GenerateCodeFromMember;(System.CodeDom.CodeTypeMember,System.IO.TextWriter,System.CodeDom.Compiler.CodeGeneratorOptions);Argument[2];Argument[this];taint;df-generated |
+| System.CodeDom.Compiler;CodeGenerator;GenerateCodeFromExpression;(System.CodeDom.CodeExpression,System.IO.TextWriter,System.CodeDom.Compiler.CodeGeneratorOptions);Argument[2];Argument[this];taint;dfc-generated |
+| System.CodeDom.Compiler;CodeGenerator;GenerateCodeFromMember;(System.CodeDom.CodeTypeMember,System.IO.TextWriter,System.CodeDom.Compiler.CodeGeneratorOptions);Argument[2];Argument[this].SyntheticField[System.CodeDom.Compiler.CodeGenerator._options];value;dfc-generated |
 | System.CodeDom.Compiler;CodeGenerator;GenerateCodeFromNamespace;(System.CodeDom.CodeNamespace,System.IO.TextWriter,System.CodeDom.Compiler.CodeGeneratorOptions);Argument[0];Argument[this];taint;df-generated |
+| System.CodeDom.Compiler;CodeGenerator;GenerateCodeFromNamespace;(System.CodeDom.CodeNamespace,System.IO.TextWriter,System.CodeDom.Compiler.CodeGeneratorOptions);Argument[0];Argument[this];taint;dfc-generated |
+| System.CodeDom.Compiler;CodeGenerator;GenerateCodeFromNamespace;(System.CodeDom.CodeNamespace,System.IO.TextWriter,System.CodeDom.Compiler.CodeGeneratorOptions);Argument[2];Argument[this].SyntheticField[System.CodeDom.Compiler.CodeGenerator._options];value;df-generated |
+| System.CodeDom.Compiler;CodeGenerator;GenerateCodeFromNamespace;(System.CodeDom.CodeNamespace,System.IO.TextWriter,System.CodeDom.Compiler.CodeGeneratorOptions);Argument[2];Argument[this].SyntheticField[System.CodeDom.Compiler.CodeGenerator._options];value;dfc-generated |
 | System.CodeDom.Compiler;CodeGenerator;GenerateCodeFromNamespace;(System.CodeDom.CodeNamespace,System.IO.TextWriter,System.CodeDom.Compiler.CodeGeneratorOptions);Argument[2];Argument[this];taint;df-generated |
-| System.CodeDom.Compiler;CodeGenerator;GenerateCodeFromStatement;(System.CodeDom.CodeStatement,System.IO.TextWriter,System.CodeDom.Compiler.CodeGeneratorOptions);Argument[0];Argument[this];taint;df-generated |
+| System.CodeDom.Compiler;CodeGenerator;GenerateCodeFromNamespace;(System.CodeDom.CodeNamespace,System.IO.TextWriter,System.CodeDom.Compiler.CodeGeneratorOptions);Argument[2];Argument[this];taint;dfc-generated |
+| System.CodeDom.Compiler;CodeGenerator;GenerateCodeFromStatement;(System.CodeDom.CodeStatement,System.IO.TextWriter,System.CodeDom.Compiler.CodeGeneratorOptions);Argument[2];Argument[this].SyntheticField[System.CodeDom.Compiler.CodeGenerator._options];value;df-generated |
+| System.CodeDom.Compiler;CodeGenerator;GenerateCodeFromStatement;(System.CodeDom.CodeStatement,System.IO.TextWriter,System.CodeDom.Compiler.CodeGeneratorOptions);Argument[2];Argument[this].SyntheticField[System.CodeDom.Compiler.CodeGenerator._options];value;dfc-generated |
 | System.CodeDom.Compiler;CodeGenerator;GenerateCodeFromStatement;(System.CodeDom.CodeStatement,System.IO.TextWriter,System.CodeDom.Compiler.CodeGeneratorOptions);Argument[2];Argument[this];taint;df-generated |
+| System.CodeDom.Compiler;CodeGenerator;GenerateCodeFromStatement;(System.CodeDom.CodeStatement,System.IO.TextWriter,System.CodeDom.Compiler.CodeGeneratorOptions);Argument[2];Argument[this];taint;dfc-generated |
 | System.CodeDom.Compiler;CodeGenerator;GenerateCodeFromType;(System.CodeDom.CodeTypeDeclaration,System.IO.TextWriter,System.CodeDom.Compiler.CodeGeneratorOptions);Argument[0];Argument[this];taint;df-generated |
+| System.CodeDom.Compiler;CodeGenerator;GenerateCodeFromType;(System.CodeDom.CodeTypeDeclaration,System.IO.TextWriter,System.CodeDom.Compiler.CodeGeneratorOptions);Argument[0];Argument[this];taint;dfc-generated |
+| System.CodeDom.Compiler;CodeGenerator;GenerateCodeFromType;(System.CodeDom.CodeTypeDeclaration,System.IO.TextWriter,System.CodeDom.Compiler.CodeGeneratorOptions);Argument[2];Argument[this].SyntheticField[System.CodeDom.Compiler.CodeGenerator._options];value;df-generated |
+| System.CodeDom.Compiler;CodeGenerator;GenerateCodeFromType;(System.CodeDom.CodeTypeDeclaration,System.IO.TextWriter,System.CodeDom.Compiler.CodeGeneratorOptions);Argument[2];Argument[this].SyntheticField[System.CodeDom.Compiler.CodeGenerator._options];value;dfc-generated |
 | System.CodeDom.Compiler;CodeGenerator;GenerateCodeFromType;(System.CodeDom.CodeTypeDeclaration,System.IO.TextWriter,System.CodeDom.Compiler.CodeGeneratorOptions);Argument[2];Argument[this];taint;df-generated |
+| System.CodeDom.Compiler;CodeGenerator;GenerateCodeFromType;(System.CodeDom.CodeTypeDeclaration,System.IO.TextWriter,System.CodeDom.Compiler.CodeGeneratorOptions);Argument[2];Argument[this];taint;dfc-generated |
 | System.CodeDom.Compiler;CodeGenerator;GenerateCompileUnit;(System.CodeDom.CodeCompileUnit);Argument[0];Argument[this];taint;df-generated |
 | System.CodeDom.Compiler;CodeGenerator;GenerateCompileUnitEnd;(System.CodeDom.CodeCompileUnit);Argument[0];Argument[this];taint;df-generated |
 | System.CodeDom.Compiler;CodeGenerator;GenerateCompileUnitStart;(System.CodeDom.CodeCompileUnit);Argument[0];Argument[this];taint;df-generated |
-| System.CodeDom.Compiler;CodeGenerator;GenerateConditionStatement;(System.CodeDom.CodeConditionStatement);Argument[0];Argument[this];taint;df-generated |
-| System.CodeDom.Compiler;CodeGenerator;GenerateConstructor;(System.CodeDom.CodeConstructor,System.CodeDom.CodeTypeDeclaration);Argument[0];Argument[this];taint;df-generated |
 | System.CodeDom.Compiler;CodeGenerator;GenerateDefaultValueExpression;(System.CodeDom.CodeDefaultValueExpression);Argument[0];Argument[this];taint;df-generated |
 | System.CodeDom.Compiler;CodeGenerator;GenerateDelegateCreateExpression;(System.CodeDom.CodeDelegateCreateExpression);Argument[0];Argument[this];taint;df-generated |
 | System.CodeDom.Compiler;CodeGenerator;GenerateDelegateInvokeExpression;(System.CodeDom.CodeDelegateInvokeExpression);Argument[0];Argument[this];taint;df-generated |
 | System.CodeDom.Compiler;CodeGenerator;GenerateDirectionExpression;(System.CodeDom.CodeDirectionExpression);Argument[0];Argument[this];taint;df-generated |
 | System.CodeDom.Compiler;CodeGenerator;GenerateDirectives;(System.CodeDom.CodeDirectiveCollection);Argument[0].Element;Argument[this];taint;df-generated |
-| System.CodeDom.Compiler;CodeGenerator;GenerateEntryPointMethod;(System.CodeDom.CodeEntryPointMethod,System.CodeDom.CodeTypeDeclaration);Argument[0];Argument[this];taint;df-generated |
 | System.CodeDom.Compiler;CodeGenerator;GenerateEvent;(System.CodeDom.CodeMemberEvent,System.CodeDom.CodeTypeDeclaration);Argument[0];Argument[this];taint;df-generated |
 | System.CodeDom.Compiler;CodeGenerator;GenerateEventReferenceExpression;(System.CodeDom.CodeEventReferenceExpression);Argument[0];Argument[this];taint;df-generated |
 | System.CodeDom.Compiler;CodeGenerator;GenerateExpression;(System.CodeDom.CodeExpression);Argument[0];Argument[this];taint;df-generated |
-| System.CodeDom.Compiler;CodeGenerator;GenerateExpressionStatement;(System.CodeDom.CodeExpressionStatement);Argument[0];Argument[this];taint;df-generated |
 | System.CodeDom.Compiler;CodeGenerator;GenerateField;(System.CodeDom.CodeMemberField);Argument[0];Argument[this];taint;df-generated |
 | System.CodeDom.Compiler;CodeGenerator;GenerateFieldReferenceExpression;(System.CodeDom.CodeFieldReferenceExpression);Argument[0];Argument[this];taint;df-generated |
-| System.CodeDom.Compiler;CodeGenerator;GenerateGotoStatement;(System.CodeDom.CodeGotoStatement);Argument[0];Argument[this];taint;df-generated |
-| System.CodeDom.Compiler;CodeGenerator;GenerateIndexerExpression;(System.CodeDom.CodeIndexerExpression);Argument[0];Argument[this];taint;df-generated |
-| System.CodeDom.Compiler;CodeGenerator;GenerateIterationStatement;(System.CodeDom.CodeIterationStatement);Argument[0];Argument[this];taint;df-generated |
 | System.CodeDom.Compiler;CodeGenerator;GenerateLabeledStatement;(System.CodeDom.CodeLabeledStatement);Argument[0];Argument[this];taint;df-generated |
 | System.CodeDom.Compiler;CodeGenerator;GenerateLinePragmaStart;(System.CodeDom.CodeLinePragma);Argument[0];Argument[this];taint;df-generated |
 | System.CodeDom.Compiler;CodeGenerator;GenerateMethod;(System.CodeDom.CodeMemberMethod,System.CodeDom.CodeTypeDeclaration);Argument[0];Argument[this];taint;df-generated |
 | System.CodeDom.Compiler;CodeGenerator;GenerateMethodInvokeExpression;(System.CodeDom.CodeMethodInvokeExpression);Argument[0];Argument[this];taint;df-generated |
 | System.CodeDom.Compiler;CodeGenerator;GenerateMethodReferenceExpression;(System.CodeDom.CodeMethodReferenceExpression);Argument[0];Argument[this];taint;df-generated |
-| System.CodeDom.Compiler;CodeGenerator;GenerateMethodReturnStatement;(System.CodeDom.CodeMethodReturnStatement);Argument[0];Argument[this];taint;df-generated |
 | System.CodeDom.Compiler;CodeGenerator;GenerateNamespace;(System.CodeDom.CodeNamespace);Argument[0];Argument[this];taint;df-generated |
 | System.CodeDom.Compiler;CodeGenerator;GenerateNamespaceImport;(System.CodeDom.CodeNamespaceImport);Argument[0];Argument[this];taint;df-generated |
 | System.CodeDom.Compiler;CodeGenerator;GenerateNamespaceImports;(System.CodeDom.CodeNamespace);Argument[0];Argument[this];taint;df-generated |
@@ -5300,19 +5739,21 @@ summary
 | System.CodeDom.Compiler;CodeGenerator;GenerateSnippetCompileUnit;(System.CodeDom.CodeSnippetCompileUnit);Argument[0];Argument[this];taint;df-generated |
 | System.CodeDom.Compiler;CodeGenerator;GenerateSnippetExpression;(System.CodeDom.CodeSnippetExpression);Argument[0];Argument[this];taint;df-generated |
 | System.CodeDom.Compiler;CodeGenerator;GenerateSnippetMember;(System.CodeDom.CodeSnippetTypeMember);Argument[0];Argument[this];taint;df-generated |
-| System.CodeDom.Compiler;CodeGenerator;GenerateSnippetStatement;(System.CodeDom.CodeSnippetStatement);Argument[0];Argument[this];taint;df-generated |
 | System.CodeDom.Compiler;CodeGenerator;GenerateStatement;(System.CodeDom.CodeStatement);Argument[0];Argument[this];taint;df-generated |
 | System.CodeDom.Compiler;CodeGenerator;GenerateStatements;(System.CodeDom.CodeStatementCollection);Argument[0].Element;Argument[this];taint;df-generated |
-| System.CodeDom.Compiler;CodeGenerator;GenerateThrowExceptionStatement;(System.CodeDom.CodeThrowExceptionStatement);Argument[0];Argument[this];taint;df-generated |
 | System.CodeDom.Compiler;CodeGenerator;GenerateTryCatchFinallyStatement;(System.CodeDom.CodeTryCatchFinallyStatement);Argument[0];Argument[this];taint;df-generated |
-| System.CodeDom.Compiler;CodeGenerator;GenerateTypeConstructor;(System.CodeDom.CodeTypeConstructor);Argument[0];Argument[this];taint;df-generated |
-| System.CodeDom.Compiler;CodeGenerator;GenerateTypeOfExpression;(System.CodeDom.CodeTypeOfExpression);Argument[0];Argument[this];taint;df-generated |
-| System.CodeDom.Compiler;CodeGenerator;GenerateTypeReferenceExpression;(System.CodeDom.CodeTypeReferenceExpression);Argument[0];Argument[this];taint;df-generated |
+| System.CodeDom.Compiler;CodeGenerator;GenerateTypeOfExpression;(System.CodeDom.CodeTypeOfExpression);Argument[0].Property[System.CodeDom.CodeTypeOfExpression.Type].Property[System.CodeDom.CodeTypeReference.BaseType];Argument[this].Property[System.CodeDom.Compiler.CodeGenerator.Output];taint;dfc-generated |
+| System.CodeDom.Compiler;CodeGenerator;GenerateTypeReferenceExpression;(System.CodeDom.CodeTypeReferenceExpression);Argument[0].Property[System.CodeDom.CodeTypeReferenceExpression.Type].Property[System.CodeDom.CodeTypeReference.BaseType];Argument[this].Property[System.CodeDom.Compiler.CodeGenerator.Output];taint;dfc-generated |
 | System.CodeDom.Compiler;CodeGenerator;GenerateTypeStart;(System.CodeDom.CodeTypeDeclaration);Argument[0];Argument[this];taint;df-generated |
-| System.CodeDom.Compiler;CodeGenerator;GenerateTypes;(System.CodeDom.CodeNamespace);Argument[0];Argument[this];taint;df-generated |
+| System.CodeDom.Compiler;CodeGenerator;GenerateTypes;(System.CodeDom.CodeNamespace);Argument[0].Property[System.CodeDom.CodeNamespace.Types].Element;Argument[this].SyntheticField[System.CodeDom.Compiler.CodeGenerator._currentClass];value;dfc-generated |
 | System.CodeDom.Compiler;CodeGenerator;GenerateVariableDeclarationStatement;(System.CodeDom.CodeVariableDeclarationStatement);Argument[0];Argument[this];taint;df-generated |
 | System.CodeDom.Compiler;CodeGenerator;GenerateVariableReferenceExpression;(System.CodeDom.CodeVariableReferenceExpression);Argument[0];Argument[this];taint;df-generated |
+| System.CodeDom.Compiler;CodeGenerator;GetTypeOutput;(System.CodeDom.CodeTypeReference);Argument[0].Property[System.CodeDom.CodeTypeReference.ArrayElementType].Property[System.CodeDom.CodeTypeReference.BaseType];ReturnValue;taint;df-generated |
+| System.CodeDom.Compiler;CodeGenerator;GetTypeOutput;(System.CodeDom.CodeTypeReference);Argument[0].Property[System.CodeDom.CodeTypeReference.ArrayElementType].Property[System.CodeDom.CodeTypeReference.BaseType];ReturnValue;taint;dfc-generated |
+| System.CodeDom.Compiler;CodeGenerator;GetTypeOutput;(System.CodeDom.CodeTypeReference);Argument[0].Property[System.CodeDom.CodeTypeReference.BaseType];ReturnValue;taint;df-generated |
+| System.CodeDom.Compiler;CodeGenerator;GetTypeOutput;(System.CodeDom.CodeTypeReference);Argument[0].Property[System.CodeDom.CodeTypeReference.BaseType];ReturnValue;taint;dfc-generated |
 | System.CodeDom.Compiler;CodeGenerator;GetTypeOutput;(System.CodeDom.CodeTypeReference);Argument[0];ReturnValue;taint;df-generated |
+| System.CodeDom.Compiler;CodeGenerator;GetTypeOutput;(System.CodeDom.CodeTypeReference);Argument[0];ReturnValue;taint;dfc-generated |
 | System.CodeDom.Compiler;CodeGenerator;OutputAttributeArgument;(System.CodeDom.CodeAttributeArgument);Argument[0];Argument[this];taint;df-generated |
 | System.CodeDom.Compiler;CodeGenerator;OutputAttributeDeclarations;(System.CodeDom.CodeAttributeDeclarationCollection);Argument[0].Element;Argument[this];taint;df-generated |
 | System.CodeDom.Compiler;CodeGenerator;OutputExpressionList;(System.CodeDom.CodeExpressionCollection);Argument[0].Element;Argument[this];taint;df-generated |
@@ -5323,241 +5764,280 @@ summary
 | System.CodeDom.Compiler;CodeGenerator;OutputTypeNamePair;(System.CodeDom.CodeTypeReference,System.String);Argument[0];Argument[this];taint;df-generated |
 | System.CodeDom.Compiler;CodeGenerator;OutputTypeNamePair;(System.CodeDom.CodeTypeReference,System.String);Argument[1];Argument[this];taint;df-generated |
 | System.CodeDom.Compiler;CodeGenerator;QuoteSnippetString;(System.String);Argument[this];ReturnValue;taint;df-generated |
-| System.CodeDom.Compiler;CodeGenerator;get_CurrentClass;();Argument[this];ReturnValue;taint;df-generated |
+| System.CodeDom.Compiler;CodeGenerator;get_CurrentClass;();Argument[this].SyntheticField[System.CodeDom.Compiler.CodeGenerator._currentClass];ReturnValue;value;dfc-generated |
 | System.CodeDom.Compiler;CodeGenerator;get_CurrentMember;();Argument[this];ReturnValue;taint;df-generated |
 | System.CodeDom.Compiler;CodeGenerator;get_CurrentMemberName;();Argument[this];ReturnValue;taint;df-generated |
-| System.CodeDom.Compiler;CodeGenerator;get_CurrentTypeName;();Argument[this];ReturnValue;taint;df-generated |
-| System.CodeDom.Compiler;CodeGenerator;get_Options;();Argument[this];ReturnValue;taint;df-generated |
+| System.CodeDom.Compiler;CodeGenerator;get_CurrentTypeName;();Argument[this].SyntheticField[System.CodeDom.Compiler.CodeGenerator._currentClass].Property[System.CodeDom.CodeTypeMember.Name];ReturnValue;value;dfc-generated |
+| System.CodeDom.Compiler;CodeGenerator;get_Options;();Argument[this].SyntheticField[System.CodeDom.Compiler.CodeGenerator._options];ReturnValue;value;dfc-generated |
 | System.CodeDom.Compiler;CodeGenerator;get_Output;();Argument[this];ReturnValue;taint;df-generated |
 | System.CodeDom.Compiler;CodeGeneratorOptions;get_Item;(System.String);Argument[this];ReturnValue;taint;df-generated |
 | System.CodeDom.Compiler;CompilerError;ToString;();Argument[this];ReturnValue;taint;df-generated |
-| System.CodeDom.Compiler;CompilerErrorCollection;Add;(System.CodeDom.Compiler.CompilerError);Argument[0];Argument[this];taint;df-generated |
-| System.CodeDom.Compiler;CompilerErrorCollection;AddRange;(System.CodeDom.Compiler.CompilerErrorCollection);Argument[0].Element;Argument[this];taint;df-generated |
-| System.CodeDom.Compiler;CompilerErrorCollection;AddRange;(System.CodeDom.Compiler.CompilerError[]);Argument[0].Element;Argument[this];taint;df-generated |
-| System.CodeDom.Compiler;CompilerErrorCollection;CompilerErrorCollection;(System.CodeDom.Compiler.CompilerErrorCollection);Argument[0].Element;Argument[this];taint;df-generated |
-| System.CodeDom.Compiler;CompilerErrorCollection;CompilerErrorCollection;(System.CodeDom.Compiler.CompilerError[]);Argument[0].Element;Argument[this];taint;df-generated |
-| System.CodeDom.Compiler;CompilerErrorCollection;CopyTo;(System.CodeDom.Compiler.CompilerError[],System.Int32);Argument[this];Argument[0].Element;taint;df-generated |
-| System.CodeDom.Compiler;CompilerErrorCollection;Insert;(System.Int32,System.CodeDom.Compiler.CompilerError);Argument[1];Argument[this];taint;df-generated |
-| System.CodeDom.Compiler;CompilerErrorCollection;Remove;(System.CodeDom.Compiler.CompilerError);Argument[0];Argument[this];taint;df-generated |
-| System.CodeDom.Compiler;CompilerErrorCollection;get_Item;(System.Int32);Argument[this];ReturnValue;taint;df-generated |
-| System.CodeDom.Compiler;CompilerErrorCollection;set_Item;(System.Int32,System.CodeDom.Compiler.CompilerError);Argument[1];Argument[this];taint;df-generated |
+| System.CodeDom.Compiler;CompilerErrorCollection;Add;(System.CodeDom.Compiler.CompilerError);Argument[0];Argument[this].Property[System.Collections.CollectionBase.List].Element;value;dfc-generated |
+| System.CodeDom.Compiler;CompilerErrorCollection;AddRange;(System.CodeDom.Compiler.CompilerErrorCollection);Argument[0].Property[System.Collections.CollectionBase.List].Element;Argument[this].Property[System.Collections.CollectionBase.List].Element;value;dfc-generated |
+| System.CodeDom.Compiler;CompilerErrorCollection;AddRange;(System.CodeDom.Compiler.CompilerError[]);Argument[0].Element;Argument[this].Property[System.Collections.CollectionBase.List].Element;value;dfc-generated |
+| System.CodeDom.Compiler;CompilerErrorCollection;CompilerErrorCollection;(System.CodeDom.Compiler.CompilerErrorCollection);Argument[0].Property[System.Collections.CollectionBase.List].Element;Argument[this].Property[System.Collections.CollectionBase.List].Element;value;dfc-generated |
+| System.CodeDom.Compiler;CompilerErrorCollection;CompilerErrorCollection;(System.CodeDom.Compiler.CompilerError[]);Argument[0].Element;Argument[this].Property[System.Collections.CollectionBase.List].Element;value;dfc-generated |
+| System.CodeDom.Compiler;CompilerErrorCollection;CopyTo;(System.CodeDom.Compiler.CompilerError[],System.Int32);Argument[this].Property[System.Collections.CollectionBase.List].Element;Argument[0].Element;value;dfc-generated |
+| System.CodeDom.Compiler;CompilerErrorCollection;Insert;(System.Int32,System.CodeDom.Compiler.CompilerError);Argument[1];Argument[this].Property[System.Collections.CollectionBase.List].Element;value;dfc-generated |
+| System.CodeDom.Compiler;CompilerErrorCollection;get_Item;(System.Int32);Argument[this].Property[System.Collections.CollectionBase.List].Element;ReturnValue;value;dfc-generated |
+| System.CodeDom.Compiler;CompilerErrorCollection;set_Item;(System.Int32,System.CodeDom.Compiler.CompilerError);Argument[1];Argument[this].Property[System.Collections.CollectionBase.List].Element;value;dfc-generated |
 | System.CodeDom.Compiler;CompilerInfo;GetExtensions;();Argument[this];ReturnValue;taint;df-generated |
 | System.CodeDom.Compiler;CompilerInfo;GetLanguages;();Argument[this];ReturnValue;taint;df-generated |
-| System.CodeDom.Compiler;CompilerParameters;CompilerParameters;(System.String[],System.String,System.Boolean);Argument[0].Element;Argument[this];taint;df-generated |
-| System.CodeDom.Compiler;Executor;ExecWaitWithCapture;(System.IntPtr,System.String,System.CodeDom.Compiler.TempFileCollection,System.String,System.String);Argument[2].Element;ReturnValue;taint;df-generated |
-| System.CodeDom.Compiler;Executor;ExecWaitWithCapture;(System.IntPtr,System.String,System.CodeDom.Compiler.TempFileCollection,System.String,System.String);Argument[3];ReturnValue;taint;df-generated |
-| System.CodeDom.Compiler;Executor;ExecWaitWithCapture;(System.IntPtr,System.String,System.CodeDom.Compiler.TempFileCollection,System.String,System.String);Argument[4];ReturnValue;taint;df-generated |
-| System.CodeDom.Compiler;Executor;ExecWaitWithCapture;(System.IntPtr,System.String,System.String,System.CodeDom.Compiler.TempFileCollection,System.String,System.String);Argument[3].Element;ReturnValue;taint;df-generated |
-| System.CodeDom.Compiler;Executor;ExecWaitWithCapture;(System.String,System.CodeDom.Compiler.TempFileCollection,System.String,System.String);Argument[1].Element;ReturnValue;taint;df-generated |
-| System.CodeDom.Compiler;Executor;ExecWaitWithCapture;(System.String,System.CodeDom.Compiler.TempFileCollection,System.String,System.String);Argument[2];ReturnValue;taint;df-generated |
-| System.CodeDom.Compiler;Executor;ExecWaitWithCapture;(System.String,System.CodeDom.Compiler.TempFileCollection,System.String,System.String);Argument[3];ReturnValue;taint;df-generated |
-| System.CodeDom.Compiler;Executor;ExecWaitWithCapture;(System.String,System.String,System.CodeDom.Compiler.TempFileCollection,System.String,System.String);Argument[2].Element;ReturnValue;taint;df-generated |
-| System.CodeDom.Compiler;Executor;ExecWaitWithCapture;(System.String,System.String,System.CodeDom.Compiler.TempFileCollection,System.String,System.String);Argument[3];ReturnValue;taint;df-generated |
-| System.CodeDom.Compiler;Executor;ExecWaitWithCapture;(System.String,System.String,System.CodeDom.Compiler.TempFileCollection,System.String,System.String);Argument[4];ReturnValue;taint;df-generated |
-| System.CodeDom.Compiler;GeneratedCodeAttribute;GeneratedCodeAttribute;(System.String,System.String);Argument[0];Argument[this];taint;df-generated |
-| System.CodeDom.Compiler;GeneratedCodeAttribute;GeneratedCodeAttribute;(System.String,System.String);Argument[1];Argument[this];taint;df-generated |
-| System.CodeDom.Compiler;GeneratedCodeAttribute;get_Tool;();Argument[this];ReturnValue;taint;df-generated |
-| System.CodeDom.Compiler;GeneratedCodeAttribute;get_Version;();Argument[this];ReturnValue;taint;df-generated |
+| System.CodeDom.Compiler;CompilerParameters;CompilerParameters;(System.String[],System.String,System.Boolean);Argument[0].Element;Argument[this].Property[System.CodeDom.Compiler.CompilerParameters.ReferencedAssemblies].Element;value;dfc-generated |
+| System.CodeDom.Compiler;Executor;ExecWaitWithCapture;(System.IntPtr,System.String,System.CodeDom.Compiler.TempFileCollection,System.String,System.String);Argument[3];ReturnValue;value;dfc-generated |
+| System.CodeDom.Compiler;Executor;ExecWaitWithCapture;(System.IntPtr,System.String,System.CodeDom.Compiler.TempFileCollection,System.String,System.String);Argument[4];ReturnValue;value;dfc-generated |
+| System.CodeDom.Compiler;Executor;ExecWaitWithCapture;(System.IntPtr,System.String,System.String,System.CodeDom.Compiler.TempFileCollection,System.String,System.String);Argument[4];ReturnValue;value;dfc-generated |
+| System.CodeDom.Compiler;Executor;ExecWaitWithCapture;(System.IntPtr,System.String,System.String,System.CodeDom.Compiler.TempFileCollection,System.String,System.String);Argument[5];ReturnValue;value;dfc-generated |
+| System.CodeDom.Compiler;Executor;ExecWaitWithCapture;(System.String,System.CodeDom.Compiler.TempFileCollection,System.String,System.String);Argument[2];ReturnValue;value;dfc-generated |
+| System.CodeDom.Compiler;Executor;ExecWaitWithCapture;(System.String,System.CodeDom.Compiler.TempFileCollection,System.String,System.String);Argument[3];ReturnValue;value;dfc-generated |
+| System.CodeDom.Compiler;Executor;ExecWaitWithCapture;(System.String,System.String,System.CodeDom.Compiler.TempFileCollection,System.String,System.String);Argument[3];ReturnValue;value;dfc-generated |
+| System.CodeDom.Compiler;Executor;ExecWaitWithCapture;(System.String,System.String,System.CodeDom.Compiler.TempFileCollection,System.String,System.String);Argument[4];ReturnValue;value;dfc-generated |
+| System.CodeDom.Compiler;GeneratedCodeAttribute;GeneratedCodeAttribute;(System.String,System.String);Argument[0];Argument[this].SyntheticField[System.CodeDom.Compiler.GeneratedCodeAttribute._tool];value;dfc-generated |
+| System.CodeDom.Compiler;GeneratedCodeAttribute;GeneratedCodeAttribute;(System.String,System.String);Argument[1];Argument[this].SyntheticField[System.CodeDom.Compiler.GeneratedCodeAttribute._version];value;dfc-generated |
+| System.CodeDom.Compiler;GeneratedCodeAttribute;get_Tool;();Argument[this].SyntheticField[System.CodeDom.Compiler.GeneratedCodeAttribute._tool];ReturnValue;value;dfc-generated |
+| System.CodeDom.Compiler;GeneratedCodeAttribute;get_Version;();Argument[this].SyntheticField[System.CodeDom.Compiler.GeneratedCodeAttribute._version];ReturnValue;value;dfc-generated |
 | System.CodeDom.Compiler;ICodeCompiler;CompileAssemblyFromDom;(System.CodeDom.Compiler.CompilerParameters,System.CodeDom.CodeCompileUnit);Argument[1];Argument[0];taint;df-generated |
 | System.CodeDom.Compiler;ICodeCompiler;CompileAssemblyFromDom;(System.CodeDom.Compiler.CompilerParameters,System.CodeDom.CodeCompileUnit);Argument[1];Argument[this];taint;df-generated |
 | System.CodeDom.Compiler;ICodeCompiler;CompileAssemblyFromDomBatch;(System.CodeDom.Compiler.CompilerParameters,System.CodeDom.CodeCompileUnit[]);Argument[1].Element;Argument[0];taint;df-generated |
 | System.CodeDom.Compiler;ICodeCompiler;CompileAssemblyFromDomBatch;(System.CodeDom.Compiler.CompilerParameters,System.CodeDom.CodeCompileUnit[]);Argument[1].Element;Argument[this];taint;df-generated |
-| System.CodeDom.Compiler;ICodeGenerator;CreateEscapedIdentifier;(System.String);Argument[0];ReturnValue;taint;df-generated |
-| System.CodeDom.Compiler;ICodeGenerator;CreateValidIdentifier;(System.String);Argument[0];ReturnValue;taint;df-generated |
+| System.CodeDom.Compiler;ICodeGenerator;CreateEscapedIdentifier;(System.String);Argument[0];ReturnValue;value;dfc-generated |
+| System.CodeDom.Compiler;ICodeGenerator;CreateValidIdentifier;(System.String);Argument[0];ReturnValue;value;dfc-generated |
 | System.CodeDom.Compiler;ICodeGenerator;GenerateCodeFromCompileUnit;(System.CodeDom.CodeCompileUnit,System.IO.TextWriter,System.CodeDom.Compiler.CodeGeneratorOptions);Argument[0];Argument[this];taint;df-generated |
 | System.CodeDom.Compiler;ICodeGenerator;GenerateCodeFromCompileUnit;(System.CodeDom.CodeCompileUnit,System.IO.TextWriter,System.CodeDom.Compiler.CodeGeneratorOptions);Argument[2];Argument[this];taint;df-generated |
-| System.CodeDom.Compiler;ICodeGenerator;GenerateCodeFromExpression;(System.CodeDom.CodeExpression,System.IO.TextWriter,System.CodeDom.Compiler.CodeGeneratorOptions);Argument[0];Argument[this];taint;df-generated |
 | System.CodeDom.Compiler;ICodeGenerator;GenerateCodeFromExpression;(System.CodeDom.CodeExpression,System.IO.TextWriter,System.CodeDom.Compiler.CodeGeneratorOptions);Argument[2];Argument[this];taint;df-generated |
 | System.CodeDom.Compiler;ICodeGenerator;GenerateCodeFromNamespace;(System.CodeDom.CodeNamespace,System.IO.TextWriter,System.CodeDom.Compiler.CodeGeneratorOptions);Argument[0];Argument[this];taint;df-generated |
 | System.CodeDom.Compiler;ICodeGenerator;GenerateCodeFromNamespace;(System.CodeDom.CodeNamespace,System.IO.TextWriter,System.CodeDom.Compiler.CodeGeneratorOptions);Argument[2];Argument[this];taint;df-generated |
-| System.CodeDom.Compiler;ICodeGenerator;GenerateCodeFromStatement;(System.CodeDom.CodeStatement,System.IO.TextWriter,System.CodeDom.Compiler.CodeGeneratorOptions);Argument[0];Argument[this];taint;df-generated |
 | System.CodeDom.Compiler;ICodeGenerator;GenerateCodeFromStatement;(System.CodeDom.CodeStatement,System.IO.TextWriter,System.CodeDom.Compiler.CodeGeneratorOptions);Argument[2];Argument[this];taint;df-generated |
 | System.CodeDom.Compiler;ICodeGenerator;GenerateCodeFromType;(System.CodeDom.CodeTypeDeclaration,System.IO.TextWriter,System.CodeDom.Compiler.CodeGeneratorOptions);Argument[0];Argument[this];taint;df-generated |
 | System.CodeDom.Compiler;ICodeGenerator;GenerateCodeFromType;(System.CodeDom.CodeTypeDeclaration,System.IO.TextWriter,System.CodeDom.Compiler.CodeGeneratorOptions);Argument[2];Argument[this];taint;df-generated |
 | System.CodeDom.Compiler;ICodeGenerator;GetTypeOutput;(System.CodeDom.CodeTypeReference);Argument[0];ReturnValue;taint;df-generated |
 | System.CodeDom.Compiler;IndentedTextWriter;DisposeAsync;();Argument[this];ReturnValue;taint;df-generated |
-| System.CodeDom.Compiler;IndentedTextWriter;FlushAsync;();Argument[this];ReturnValue;taint;df-generated |
-| System.CodeDom.Compiler;IndentedTextWriter;FlushAsync;(System.Threading.CancellationToken);Argument[0];ReturnValue;taint;df-generated |
-| System.CodeDom.Compiler;IndentedTextWriter;FlushAsync;(System.Threading.CancellationToken);Argument[this];ReturnValue;taint;df-generated |
-| System.CodeDom.Compiler;IndentedTextWriter;IndentedTextWriter;(System.IO.TextWriter,System.String);Argument[0];Argument[this];taint;df-generated |
-| System.CodeDom.Compiler;IndentedTextWriter;IndentedTextWriter;(System.IO.TextWriter,System.String);Argument[1];Argument[this];taint;df-generated |
+| System.CodeDom.Compiler;IndentedTextWriter;FlushAsync;();Argument[this].SyntheticField[System.CodeDom.Compiler.IndentedTextWriter._writer].SyntheticField[System.CodeDom.Compiler.IndentedTextWriter._writer];ReturnValue.SyntheticField[System.Threading.Tasks.Task.m_stateObject];value;dfc-generated |
+| System.CodeDom.Compiler;IndentedTextWriter;FlushAsync;();Argument[this].SyntheticField[System.CodeDom.Compiler.IndentedTextWriter._writer];ReturnValue.SyntheticField[System.Threading.Tasks.Task.m_stateObject];value;dfc-generated |
+| System.CodeDom.Compiler;IndentedTextWriter;FlushAsync;();Argument[this];ReturnValue.SyntheticField[System.Threading.Tasks.Task.m_stateObject];value;dfc-generated |
+| System.CodeDom.Compiler;IndentedTextWriter;FlushAsync;(System.Threading.CancellationToken);Argument[this].SyntheticField[System.CodeDom.Compiler.IndentedTextWriter._writer].SyntheticField[System.CodeDom.Compiler.IndentedTextWriter._writer];ReturnValue.SyntheticField[System.Threading.Tasks.Task.m_stateObject];value;dfc-generated |
+| System.CodeDom.Compiler;IndentedTextWriter;FlushAsync;(System.Threading.CancellationToken);Argument[this].SyntheticField[System.CodeDom.Compiler.IndentedTextWriter._writer];ReturnValue.SyntheticField[System.Threading.Tasks.Task.m_stateObject];value;dfc-generated |
+| System.CodeDom.Compiler;IndentedTextWriter;FlushAsync;(System.Threading.CancellationToken);Argument[this];ReturnValue.SyntheticField[System.Threading.Tasks.Task.m_stateObject];value;dfc-generated |
+| System.CodeDom.Compiler;IndentedTextWriter;IndentedTextWriter;(System.IO.TextWriter,System.String);Argument[0];Argument[this].SyntheticField[System.CodeDom.Compiler.IndentedTextWriter._writer];value;dfc-generated |
+| System.CodeDom.Compiler;IndentedTextWriter;Write;(System.Char[]);Argument[0].Element;Argument[this].SyntheticField[System.CodeDom.Compiler.IndentedTextWriter._writer].SyntheticField[System.CodeDom.Compiler.IndentedTextWriter._writer];taint;df-generated |
+| System.CodeDom.Compiler;IndentedTextWriter;Write;(System.Char[]);Argument[0].Element;Argument[this].SyntheticField[System.CodeDom.Compiler.IndentedTextWriter._writer].SyntheticField[System.CodeDom.Compiler.IndentedTextWriter._writer];taint;dfc-generated |
 | System.CodeDom.Compiler;IndentedTextWriter;Write;(System.Char[]);Argument[0].Element;Argument[this];taint;df-generated |
+| System.CodeDom.Compiler;IndentedTextWriter;Write;(System.Char[]);Argument[0].Element;Argument[this];taint;dfc-generated |
 | System.CodeDom.Compiler;IndentedTextWriter;Write;(System.Char[],System.Int32,System.Int32);Argument[0].Element;Argument[this];taint;df-generated |
 | System.CodeDom.Compiler;IndentedTextWriter;Write;(System.Object);Argument[0];Argument[this];taint;df-generated |
 | System.CodeDom.Compiler;IndentedTextWriter;Write;(System.String);Argument[0];Argument[this];taint;df-generated |
+| System.CodeDom.Compiler;IndentedTextWriter;Write;(System.String,System.Object);Argument[0];Argument[this].SyntheticField[System.CodeDom.Compiler.IndentedTextWriter._writer].SyntheticField[System.CodeDom.Compiler.IndentedTextWriter._writer];taint;df-generated |
+| System.CodeDom.Compiler;IndentedTextWriter;Write;(System.String,System.Object);Argument[0];Argument[this].SyntheticField[System.CodeDom.Compiler.IndentedTextWriter._writer].SyntheticField[System.CodeDom.Compiler.IndentedTextWriter._writer];taint;dfc-generated |
 | System.CodeDom.Compiler;IndentedTextWriter;Write;(System.String,System.Object);Argument[0];Argument[this];taint;df-generated |
+| System.CodeDom.Compiler;IndentedTextWriter;Write;(System.String,System.Object);Argument[0];Argument[this];taint;dfc-generated |
+| System.CodeDom.Compiler;IndentedTextWriter;Write;(System.String,System.Object);Argument[1];Argument[this].SyntheticField[System.CodeDom.Compiler.IndentedTextWriter._writer].SyntheticField[System.CodeDom.Compiler.IndentedTextWriter._writer];taint;df-generated |
+| System.CodeDom.Compiler;IndentedTextWriter;Write;(System.String,System.Object);Argument[1];Argument[this].SyntheticField[System.CodeDom.Compiler.IndentedTextWriter._writer].SyntheticField[System.CodeDom.Compiler.IndentedTextWriter._writer];taint;dfc-generated |
 | System.CodeDom.Compiler;IndentedTextWriter;Write;(System.String,System.Object);Argument[1];Argument[this];taint;df-generated |
+| System.CodeDom.Compiler;IndentedTextWriter;Write;(System.String,System.Object);Argument[1];Argument[this];taint;dfc-generated |
+| System.CodeDom.Compiler;IndentedTextWriter;Write;(System.String,System.Object,System.Object);Argument[0];Argument[this].SyntheticField[System.CodeDom.Compiler.IndentedTextWriter._writer].SyntheticField[System.CodeDom.Compiler.IndentedTextWriter._writer];taint;df-generated |
+| System.CodeDom.Compiler;IndentedTextWriter;Write;(System.String,System.Object,System.Object);Argument[0];Argument[this].SyntheticField[System.CodeDom.Compiler.IndentedTextWriter._writer].SyntheticField[System.CodeDom.Compiler.IndentedTextWriter._writer];taint;dfc-generated |
 | System.CodeDom.Compiler;IndentedTextWriter;Write;(System.String,System.Object,System.Object);Argument[0];Argument[this];taint;df-generated |
+| System.CodeDom.Compiler;IndentedTextWriter;Write;(System.String,System.Object,System.Object);Argument[0];Argument[this];taint;dfc-generated |
+| System.CodeDom.Compiler;IndentedTextWriter;Write;(System.String,System.Object,System.Object);Argument[1];Argument[this].SyntheticField[System.CodeDom.Compiler.IndentedTextWriter._writer].SyntheticField[System.CodeDom.Compiler.IndentedTextWriter._writer];taint;df-generated |
+| System.CodeDom.Compiler;IndentedTextWriter;Write;(System.String,System.Object,System.Object);Argument[1];Argument[this].SyntheticField[System.CodeDom.Compiler.IndentedTextWriter._writer].SyntheticField[System.CodeDom.Compiler.IndentedTextWriter._writer];taint;dfc-generated |
 | System.CodeDom.Compiler;IndentedTextWriter;Write;(System.String,System.Object,System.Object);Argument[1];Argument[this];taint;df-generated |
+| System.CodeDom.Compiler;IndentedTextWriter;Write;(System.String,System.Object,System.Object);Argument[1];Argument[this];taint;dfc-generated |
+| System.CodeDom.Compiler;IndentedTextWriter;Write;(System.String,System.Object,System.Object);Argument[2];Argument[this].SyntheticField[System.CodeDom.Compiler.IndentedTextWriter._writer].SyntheticField[System.CodeDom.Compiler.IndentedTextWriter._writer];taint;df-generated |
+| System.CodeDom.Compiler;IndentedTextWriter;Write;(System.String,System.Object,System.Object);Argument[2];Argument[this].SyntheticField[System.CodeDom.Compiler.IndentedTextWriter._writer].SyntheticField[System.CodeDom.Compiler.IndentedTextWriter._writer];taint;dfc-generated |
 | System.CodeDom.Compiler;IndentedTextWriter;Write;(System.String,System.Object,System.Object);Argument[2];Argument[this];taint;df-generated |
+| System.CodeDom.Compiler;IndentedTextWriter;Write;(System.String,System.Object,System.Object);Argument[2];Argument[this];taint;dfc-generated |
+| System.CodeDom.Compiler;IndentedTextWriter;Write;(System.String,System.Object[]);Argument[0];Argument[this].SyntheticField[System.CodeDom.Compiler.IndentedTextWriter._writer].SyntheticField[System.CodeDom.Compiler.IndentedTextWriter._writer];taint;df-generated |
+| System.CodeDom.Compiler;IndentedTextWriter;Write;(System.String,System.Object[]);Argument[0];Argument[this].SyntheticField[System.CodeDom.Compiler.IndentedTextWriter._writer].SyntheticField[System.CodeDom.Compiler.IndentedTextWriter._writer];taint;dfc-generated |
 | System.CodeDom.Compiler;IndentedTextWriter;Write;(System.String,System.Object[]);Argument[0];Argument[this];taint;df-generated |
+| System.CodeDom.Compiler;IndentedTextWriter;Write;(System.String,System.Object[]);Argument[0];Argument[this];taint;dfc-generated |
+| System.CodeDom.Compiler;IndentedTextWriter;Write;(System.String,System.Object[]);Argument[1].Element;Argument[this].SyntheticField[System.CodeDom.Compiler.IndentedTextWriter._writer].SyntheticField[System.CodeDom.Compiler.IndentedTextWriter._writer];taint;df-generated |
+| System.CodeDom.Compiler;IndentedTextWriter;Write;(System.String,System.Object[]);Argument[1].Element;Argument[this].SyntheticField[System.CodeDom.Compiler.IndentedTextWriter._writer].SyntheticField[System.CodeDom.Compiler.IndentedTextWriter._writer];taint;dfc-generated |
 | System.CodeDom.Compiler;IndentedTextWriter;Write;(System.String,System.Object[]);Argument[1].Element;Argument[this];taint;df-generated |
+| System.CodeDom.Compiler;IndentedTextWriter;Write;(System.String,System.Object[]);Argument[1].Element;Argument[this];taint;dfc-generated |
 | System.CodeDom.Compiler;IndentedTextWriter;WriteAsync;(System.Char);Argument[this];ReturnValue;taint;df-generated |
-| System.CodeDom.Compiler;IndentedTextWriter;WriteAsync;(System.Char[],System.Int32,System.Int32);Argument[0].Element;Argument[this];taint;df-generated |
-| System.CodeDom.Compiler;IndentedTextWriter;WriteAsync;(System.Char[],System.Int32,System.Int32);Argument[0].Element;ReturnValue;taint;df-generated |
-| System.CodeDom.Compiler;IndentedTextWriter;WriteAsync;(System.Char[],System.Int32,System.Int32);Argument[this];ReturnValue;taint;df-generated |
+| System.CodeDom.Compiler;IndentedTextWriter;WriteAsync;(System.Char[],System.Int32,System.Int32);Argument[0].Element;Argument[this];taint;dfc-generated |
 | System.CodeDom.Compiler;IndentedTextWriter;WriteAsync;(System.ReadOnlyMemory<System.Char>,System.Threading.CancellationToken);Argument[0];ReturnValue;taint;df-generated |
 | System.CodeDom.Compiler;IndentedTextWriter;WriteAsync;(System.ReadOnlyMemory<System.Char>,System.Threading.CancellationToken);Argument[1];ReturnValue;taint;df-generated |
 | System.CodeDom.Compiler;IndentedTextWriter;WriteAsync;(System.ReadOnlyMemory<System.Char>,System.Threading.CancellationToken);Argument[this];ReturnValue;taint;df-generated |
-| System.CodeDom.Compiler;IndentedTextWriter;WriteAsync;(System.String);Argument[0];Argument[this];taint;df-generated |
-| System.CodeDom.Compiler;IndentedTextWriter;WriteAsync;(System.String);Argument[0];ReturnValue;taint;df-generated |
-| System.CodeDom.Compiler;IndentedTextWriter;WriteAsync;(System.String);Argument[this];ReturnValue;taint;df-generated |
+| System.CodeDom.Compiler;IndentedTextWriter;WriteAsync;(System.String);Argument[0];Argument[this];taint;dfc-generated |
 | System.CodeDom.Compiler;IndentedTextWriter;WriteAsync;(System.Text.StringBuilder,System.Threading.CancellationToken);Argument[0];Argument[this];taint;df-generated |
 | System.CodeDom.Compiler;IndentedTextWriter;WriteAsync;(System.Text.StringBuilder,System.Threading.CancellationToken);Argument[1];ReturnValue;taint;df-generated |
+| System.CodeDom.Compiler;IndentedTextWriter;WriteLine;(System.Char[]);Argument[0].Element;Argument[this].SyntheticField[System.CodeDom.Compiler.IndentedTextWriter._writer].SyntheticField[System.CodeDom.Compiler.IndentedTextWriter._writer];taint;df-generated |
+| System.CodeDom.Compiler;IndentedTextWriter;WriteLine;(System.Char[]);Argument[0].Element;Argument[this].SyntheticField[System.CodeDom.Compiler.IndentedTextWriter._writer].SyntheticField[System.CodeDom.Compiler.IndentedTextWriter._writer];taint;dfc-generated |
 | System.CodeDom.Compiler;IndentedTextWriter;WriteLine;(System.Char[]);Argument[0].Element;Argument[this];taint;df-generated |
+| System.CodeDom.Compiler;IndentedTextWriter;WriteLine;(System.Char[]);Argument[0].Element;Argument[this];taint;dfc-generated |
+| System.CodeDom.Compiler;IndentedTextWriter;WriteLine;(System.Char[],System.Int32,System.Int32);Argument[0].Element;Argument[this].SyntheticField[System.CodeDom.Compiler.IndentedTextWriter._writer].SyntheticField[System.CodeDom.Compiler.IndentedTextWriter._writer];taint;df-generated |
+| System.CodeDom.Compiler;IndentedTextWriter;WriteLine;(System.Char[],System.Int32,System.Int32);Argument[0].Element;Argument[this].SyntheticField[System.CodeDom.Compiler.IndentedTextWriter._writer].SyntheticField[System.CodeDom.Compiler.IndentedTextWriter._writer];taint;dfc-generated |
 | System.CodeDom.Compiler;IndentedTextWriter;WriteLine;(System.Char[],System.Int32,System.Int32);Argument[0].Element;Argument[this];taint;df-generated |
+| System.CodeDom.Compiler;IndentedTextWriter;WriteLine;(System.Char[],System.Int32,System.Int32);Argument[0].Element;Argument[this];taint;dfc-generated |
 | System.CodeDom.Compiler;IndentedTextWriter;WriteLine;(System.Object);Argument[0];Argument[this];taint;df-generated |
+| System.CodeDom.Compiler;IndentedTextWriter;WriteLine;(System.String);Argument[0];Argument[this].SyntheticField[System.CodeDom.Compiler.IndentedTextWriter._writer].SyntheticField[System.CodeDom.Compiler.IndentedTextWriter._writer];taint;df-generated |
+| System.CodeDom.Compiler;IndentedTextWriter;WriteLine;(System.String);Argument[0];Argument[this].SyntheticField[System.CodeDom.Compiler.IndentedTextWriter._writer].SyntheticField[System.CodeDom.Compiler.IndentedTextWriter._writer];taint;dfc-generated |
 | System.CodeDom.Compiler;IndentedTextWriter;WriteLine;(System.String);Argument[0];Argument[this];taint;df-generated |
+| System.CodeDom.Compiler;IndentedTextWriter;WriteLine;(System.String);Argument[0];Argument[this];taint;dfc-generated |
+| System.CodeDom.Compiler;IndentedTextWriter;WriteLine;(System.String,System.Object);Argument[0];Argument[this].SyntheticField[System.CodeDom.Compiler.IndentedTextWriter._writer].SyntheticField[System.CodeDom.Compiler.IndentedTextWriter._writer];taint;df-generated |
+| System.CodeDom.Compiler;IndentedTextWriter;WriteLine;(System.String,System.Object);Argument[0];Argument[this].SyntheticField[System.CodeDom.Compiler.IndentedTextWriter._writer].SyntheticField[System.CodeDom.Compiler.IndentedTextWriter._writer];taint;dfc-generated |
 | System.CodeDom.Compiler;IndentedTextWriter;WriteLine;(System.String,System.Object);Argument[0];Argument[this];taint;df-generated |
+| System.CodeDom.Compiler;IndentedTextWriter;WriteLine;(System.String,System.Object);Argument[0];Argument[this];taint;dfc-generated |
+| System.CodeDom.Compiler;IndentedTextWriter;WriteLine;(System.String,System.Object);Argument[1];Argument[this].SyntheticField[System.CodeDom.Compiler.IndentedTextWriter._writer].SyntheticField[System.CodeDom.Compiler.IndentedTextWriter._writer];taint;df-generated |
+| System.CodeDom.Compiler;IndentedTextWriter;WriteLine;(System.String,System.Object);Argument[1];Argument[this].SyntheticField[System.CodeDom.Compiler.IndentedTextWriter._writer].SyntheticField[System.CodeDom.Compiler.IndentedTextWriter._writer];taint;dfc-generated |
 | System.CodeDom.Compiler;IndentedTextWriter;WriteLine;(System.String,System.Object);Argument[1];Argument[this];taint;df-generated |
+| System.CodeDom.Compiler;IndentedTextWriter;WriteLine;(System.String,System.Object);Argument[1];Argument[this];taint;dfc-generated |
+| System.CodeDom.Compiler;IndentedTextWriter;WriteLine;(System.String,System.Object,System.Object);Argument[0];Argument[this].SyntheticField[System.CodeDom.Compiler.IndentedTextWriter._writer].SyntheticField[System.CodeDom.Compiler.IndentedTextWriter._writer];taint;df-generated |
+| System.CodeDom.Compiler;IndentedTextWriter;WriteLine;(System.String,System.Object,System.Object);Argument[0];Argument[this].SyntheticField[System.CodeDom.Compiler.IndentedTextWriter._writer].SyntheticField[System.CodeDom.Compiler.IndentedTextWriter._writer];taint;dfc-generated |
 | System.CodeDom.Compiler;IndentedTextWriter;WriteLine;(System.String,System.Object,System.Object);Argument[0];Argument[this];taint;df-generated |
+| System.CodeDom.Compiler;IndentedTextWriter;WriteLine;(System.String,System.Object,System.Object);Argument[0];Argument[this];taint;dfc-generated |
+| System.CodeDom.Compiler;IndentedTextWriter;WriteLine;(System.String,System.Object,System.Object);Argument[1];Argument[this].SyntheticField[System.CodeDom.Compiler.IndentedTextWriter._writer].SyntheticField[System.CodeDom.Compiler.IndentedTextWriter._writer];taint;df-generated |
+| System.CodeDom.Compiler;IndentedTextWriter;WriteLine;(System.String,System.Object,System.Object);Argument[1];Argument[this].SyntheticField[System.CodeDom.Compiler.IndentedTextWriter._writer].SyntheticField[System.CodeDom.Compiler.IndentedTextWriter._writer];taint;dfc-generated |
 | System.CodeDom.Compiler;IndentedTextWriter;WriteLine;(System.String,System.Object,System.Object);Argument[1];Argument[this];taint;df-generated |
+| System.CodeDom.Compiler;IndentedTextWriter;WriteLine;(System.String,System.Object,System.Object);Argument[1];Argument[this];taint;dfc-generated |
+| System.CodeDom.Compiler;IndentedTextWriter;WriteLine;(System.String,System.Object,System.Object);Argument[2];Argument[this].SyntheticField[System.CodeDom.Compiler.IndentedTextWriter._writer].SyntheticField[System.CodeDom.Compiler.IndentedTextWriter._writer];taint;df-generated |
+| System.CodeDom.Compiler;IndentedTextWriter;WriteLine;(System.String,System.Object,System.Object);Argument[2];Argument[this].SyntheticField[System.CodeDom.Compiler.IndentedTextWriter._writer].SyntheticField[System.CodeDom.Compiler.IndentedTextWriter._writer];taint;dfc-generated |
 | System.CodeDom.Compiler;IndentedTextWriter;WriteLine;(System.String,System.Object,System.Object);Argument[2];Argument[this];taint;df-generated |
+| System.CodeDom.Compiler;IndentedTextWriter;WriteLine;(System.String,System.Object,System.Object);Argument[2];Argument[this];taint;dfc-generated |
+| System.CodeDom.Compiler;IndentedTextWriter;WriteLine;(System.String,System.Object[]);Argument[0];Argument[this].SyntheticField[System.CodeDom.Compiler.IndentedTextWriter._writer].SyntheticField[System.CodeDom.Compiler.IndentedTextWriter._writer];taint;df-generated |
+| System.CodeDom.Compiler;IndentedTextWriter;WriteLine;(System.String,System.Object[]);Argument[0];Argument[this].SyntheticField[System.CodeDom.Compiler.IndentedTextWriter._writer].SyntheticField[System.CodeDom.Compiler.IndentedTextWriter._writer];taint;dfc-generated |
 | System.CodeDom.Compiler;IndentedTextWriter;WriteLine;(System.String,System.Object[]);Argument[0];Argument[this];taint;df-generated |
+| System.CodeDom.Compiler;IndentedTextWriter;WriteLine;(System.String,System.Object[]);Argument[0];Argument[this];taint;dfc-generated |
+| System.CodeDom.Compiler;IndentedTextWriter;WriteLine;(System.String,System.Object[]);Argument[1].Element;Argument[this].SyntheticField[System.CodeDom.Compiler.IndentedTextWriter._writer].SyntheticField[System.CodeDom.Compiler.IndentedTextWriter._writer];taint;df-generated |
+| System.CodeDom.Compiler;IndentedTextWriter;WriteLine;(System.String,System.Object[]);Argument[1].Element;Argument[this].SyntheticField[System.CodeDom.Compiler.IndentedTextWriter._writer].SyntheticField[System.CodeDom.Compiler.IndentedTextWriter._writer];taint;dfc-generated |
 | System.CodeDom.Compiler;IndentedTextWriter;WriteLine;(System.String,System.Object[]);Argument[1].Element;Argument[this];taint;df-generated |
+| System.CodeDom.Compiler;IndentedTextWriter;WriteLine;(System.String,System.Object[]);Argument[1].Element;Argument[this];taint;dfc-generated |
 | System.CodeDom.Compiler;IndentedTextWriter;WriteLineAsync;();Argument[this];ReturnValue;taint;df-generated |
 | System.CodeDom.Compiler;IndentedTextWriter;WriteLineAsync;(System.Char);Argument[this];ReturnValue;taint;df-generated |
+| System.CodeDom.Compiler;IndentedTextWriter;WriteLineAsync;(System.Char[],System.Int32,System.Int32);Argument[0].Element;Argument[this].SyntheticField[System.CodeDom.Compiler.IndentedTextWriter._writer].SyntheticField[System.CodeDom.Compiler.IndentedTextWriter._writer];taint;df-generated |
+| System.CodeDom.Compiler;IndentedTextWriter;WriteLineAsync;(System.Char[],System.Int32,System.Int32);Argument[0].Element;Argument[this].SyntheticField[System.CodeDom.Compiler.IndentedTextWriter._writer].SyntheticField[System.CodeDom.Compiler.IndentedTextWriter._writer];taint;dfc-generated |
+| System.CodeDom.Compiler;IndentedTextWriter;WriteLineAsync;(System.Char[],System.Int32,System.Int32);Argument[0].Element;Argument[this].SyntheticField[System.CodeDom.Compiler.IndentedTextWriter._writer];taint;df-generated |
+| System.CodeDom.Compiler;IndentedTextWriter;WriteLineAsync;(System.Char[],System.Int32,System.Int32);Argument[0].Element;Argument[this].SyntheticField[System.CodeDom.Compiler.IndentedTextWriter._writer];taint;dfc-generated |
 | System.CodeDom.Compiler;IndentedTextWriter;WriteLineAsync;(System.Char[],System.Int32,System.Int32);Argument[0].Element;Argument[this];taint;df-generated |
+| System.CodeDom.Compiler;IndentedTextWriter;WriteLineAsync;(System.Char[],System.Int32,System.Int32);Argument[0].Element;Argument[this];taint;dfc-generated |
 | System.CodeDom.Compiler;IndentedTextWriter;WriteLineAsync;(System.Char[],System.Int32,System.Int32);Argument[0].Element;ReturnValue;taint;df-generated |
+| System.CodeDom.Compiler;IndentedTextWriter;WriteLineAsync;(System.Char[],System.Int32,System.Int32);Argument[0].Element;ReturnValue;taint;dfc-generated |
 | System.CodeDom.Compiler;IndentedTextWriter;WriteLineAsync;(System.Char[],System.Int32,System.Int32);Argument[this];ReturnValue;taint;df-generated |
+| System.CodeDom.Compiler;IndentedTextWriter;WriteLineAsync;(System.Char[],System.Int32,System.Int32);Argument[this];ReturnValue;taint;dfc-generated |
 | System.CodeDom.Compiler;IndentedTextWriter;WriteLineAsync;(System.ReadOnlyMemory<System.Char>,System.Threading.CancellationToken);Argument[0];ReturnValue;taint;df-generated |
 | System.CodeDom.Compiler;IndentedTextWriter;WriteLineAsync;(System.ReadOnlyMemory<System.Char>,System.Threading.CancellationToken);Argument[1];ReturnValue;taint;df-generated |
 | System.CodeDom.Compiler;IndentedTextWriter;WriteLineAsync;(System.ReadOnlyMemory<System.Char>,System.Threading.CancellationToken);Argument[this];ReturnValue;taint;df-generated |
+| System.CodeDom.Compiler;IndentedTextWriter;WriteLineAsync;(System.String);Argument[0];Argument[this].SyntheticField[System.CodeDom.Compiler.IndentedTextWriter._writer].SyntheticField[System.CodeDom.Compiler.IndentedTextWriter._writer];taint;df-generated |
+| System.CodeDom.Compiler;IndentedTextWriter;WriteLineAsync;(System.String);Argument[0];Argument[this].SyntheticField[System.CodeDom.Compiler.IndentedTextWriter._writer].SyntheticField[System.CodeDom.Compiler.IndentedTextWriter._writer];taint;dfc-generated |
+| System.CodeDom.Compiler;IndentedTextWriter;WriteLineAsync;(System.String);Argument[0];Argument[this].SyntheticField[System.CodeDom.Compiler.IndentedTextWriter._writer];taint;df-generated |
+| System.CodeDom.Compiler;IndentedTextWriter;WriteLineAsync;(System.String);Argument[0];Argument[this].SyntheticField[System.CodeDom.Compiler.IndentedTextWriter._writer];taint;dfc-generated |
 | System.CodeDom.Compiler;IndentedTextWriter;WriteLineAsync;(System.String);Argument[0];Argument[this];taint;df-generated |
+| System.CodeDom.Compiler;IndentedTextWriter;WriteLineAsync;(System.String);Argument[0];Argument[this];taint;dfc-generated |
 | System.CodeDom.Compiler;IndentedTextWriter;WriteLineAsync;(System.String);Argument[0];ReturnValue;taint;df-generated |
+| System.CodeDom.Compiler;IndentedTextWriter;WriteLineAsync;(System.String);Argument[0];ReturnValue;taint;dfc-generated |
 | System.CodeDom.Compiler;IndentedTextWriter;WriteLineAsync;(System.String);Argument[this];ReturnValue;taint;df-generated |
+| System.CodeDom.Compiler;IndentedTextWriter;WriteLineAsync;(System.String);Argument[this];ReturnValue;taint;dfc-generated |
 | System.CodeDom.Compiler;IndentedTextWriter;WriteLineAsync;(System.Text.StringBuilder,System.Threading.CancellationToken);Argument[0];Argument[this];taint;df-generated |
 | System.CodeDom.Compiler;IndentedTextWriter;WriteLineAsync;(System.Text.StringBuilder,System.Threading.CancellationToken);Argument[1];ReturnValue;taint;df-generated |
 | System.CodeDom.Compiler;IndentedTextWriter;WriteLineAsync;(System.Text.StringBuilder,System.Threading.CancellationToken);Argument[this];ReturnValue;taint;df-generated |
-| System.CodeDom.Compiler;IndentedTextWriter;WriteLineNoTabs;(System.String);Argument[0];Argument[this];taint;df-generated |
+| System.CodeDom.Compiler;IndentedTextWriter;WriteLineNoTabs;(System.String);Argument[0];Argument[this].SyntheticField[System.CodeDom.Compiler.IndentedTextWriter._writer].SyntheticField[System.CodeDom.Compiler.IndentedTextWriter._writer];taint;dfc-generated |
 | System.CodeDom.Compiler;IndentedTextWriter;WriteLineNoTabsAsync;(System.String);Argument[0];Argument[this];taint;df-generated |
 | System.CodeDom.Compiler;IndentedTextWriter;WriteLineNoTabsAsync;(System.String);Argument[0];ReturnValue;taint;df-generated |
 | System.CodeDom.Compiler;IndentedTextWriter;WriteLineNoTabsAsync;(System.String);Argument[this];ReturnValue;taint;df-generated |
+| System.CodeDom.Compiler;IndentedTextWriter;get_Encoding;();Argument[this].SyntheticField[System.CodeDom.Compiler.IndentedTextWriter._writer].Property[System.IO.TextWriter.Encoding];ReturnValue;value;df-generated |
+| System.CodeDom.Compiler;IndentedTextWriter;get_Encoding;();Argument[this].SyntheticField[System.CodeDom.Compiler.IndentedTextWriter._writer].Property[System.IO.TextWriter.Encoding];ReturnValue;value;dfc-generated |
 | System.CodeDom.Compiler;IndentedTextWriter;get_Encoding;();Argument[this];ReturnValue;taint;df-generated |
-| System.CodeDom.Compiler;IndentedTextWriter;get_InnerWriter;();Argument[this];ReturnValue;taint;df-generated |
-| System.CodeDom.Compiler;TempFileCollection;AddExtension;(System.String);Argument[0];ReturnValue;taint;df-generated |
-| System.CodeDom.Compiler;TempFileCollection;AddExtension;(System.String);Argument[this];ReturnValue;taint;df-generated |
-| System.CodeDom.Compiler;TempFileCollection;AddExtension;(System.String,System.Boolean);Argument[0];ReturnValue;taint;df-generated |
-| System.CodeDom.Compiler;TempFileCollection;AddExtension;(System.String,System.Boolean);Argument[this];ReturnValue;taint;df-generated |
+| System.CodeDom.Compiler;IndentedTextWriter;get_Encoding;();Argument[this];ReturnValue;taint;dfc-generated |
+| System.CodeDom.Compiler;IndentedTextWriter;get_InnerWriter;();Argument[this].SyntheticField[System.CodeDom.Compiler.IndentedTextWriter._writer];ReturnValue;value;dfc-generated |
+| System.CodeDom.Compiler;TempFileCollection;AddExtension;(System.String);Argument[0];ReturnValue;taint;dfc-generated |
+| System.CodeDom.Compiler;TempFileCollection;AddExtension;(System.String);Argument[this].Property[System.CodeDom.Compiler.TempFileCollection.BasePath];ReturnValue;taint;dfc-generated |
+| System.CodeDom.Compiler;TempFileCollection;AddExtension;(System.String,System.Boolean);Argument[0];ReturnValue;taint;dfc-generated |
+| System.CodeDom.Compiler;TempFileCollection;AddExtension;(System.String,System.Boolean);Argument[this].Property[System.CodeDom.Compiler.TempFileCollection.BasePath];ReturnValue;taint;dfc-generated |
 | System.CodeDom.Compiler;TempFileCollection;CopyTo;(System.Array,System.Int32);Argument[this].Element;Argument[0].Element;value;manual |
 | System.CodeDom.Compiler;TempFileCollection;CopyTo;(System.String[],System.Int32);Argument[this];Argument[0].Element;taint;df-generated |
 | System.CodeDom.Compiler;TempFileCollection;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.IEnumerator.Current];value;manual |
 | System.CodeDom.Compiler;TempFileCollection;GetEnumerator;();Argument[this];ReturnValue;taint;df-generated |
-| System.CodeDom.Compiler;TempFileCollection;TempFileCollection;(System.String,System.Boolean);Argument[0];Argument[this];taint;df-generated |
+| System.CodeDom.Compiler;TempFileCollection;TempFileCollection;(System.String,System.Boolean);Argument[0];Argument[this].SyntheticField[System.CodeDom.Compiler.TempFileCollection._tempDir];value;dfc-generated |
 | System.CodeDom.Compiler;TempFileCollection;get_BasePath;();Argument[this];ReturnValue;taint;df-generated |
-| System.CodeDom.Compiler;TempFileCollection;get_SyncRoot;();Argument[this];ReturnValue;taint;df-generated |
-| System.CodeDom.Compiler;TempFileCollection;get_SyncRoot;();Argument[this];ReturnValue;value;df-generated |
-| System.CodeDom.Compiler;TempFileCollection;get_TempDir;();Argument[this];ReturnValue;taint;df-generated |
+| System.CodeDom.Compiler;TempFileCollection;get_SyncRoot;();Argument[this];ReturnValue;value;dfc-generated |
+| System.CodeDom.Compiler;TempFileCollection;get_TempDir;();Argument[this].SyntheticField[System.CodeDom.Compiler.TempFileCollection._tempDir];ReturnValue;value;dfc-generated |
 | System.CodeDom;CodeArgumentReferenceExpression;CodeArgumentReferenceExpression;(System.String);Argument[0];Argument[this];taint;df-generated |
 | System.CodeDom;CodeArrayCreateExpression;CodeArrayCreateExpression;(System.CodeDom.CodeTypeReference,System.CodeDom.CodeExpression);Argument[0];Argument[this];taint;df-generated |
 | System.CodeDom;CodeArrayCreateExpression;CodeArrayCreateExpression;(System.CodeDom.CodeTypeReference,System.CodeDom.CodeExpression[]);Argument[0];Argument[this];taint;df-generated |
-| System.CodeDom;CodeArrayCreateExpression;CodeArrayCreateExpression;(System.CodeDom.CodeTypeReference,System.CodeDom.CodeExpression[]);Argument[1].Element;Argument[this];taint;df-generated |
 | System.CodeDom;CodeArrayCreateExpression;CodeArrayCreateExpression;(System.CodeDom.CodeTypeReference,System.Int32);Argument[0];Argument[this];taint;df-generated |
-| System.CodeDom;CodeArrayCreateExpression;CodeArrayCreateExpression;(System.String,System.CodeDom.CodeExpression);Argument[0];Argument[this];taint;df-generated |
-| System.CodeDom;CodeArrayCreateExpression;CodeArrayCreateExpression;(System.String,System.CodeDom.CodeExpression[]);Argument[0];Argument[this];taint;df-generated |
-| System.CodeDom;CodeArrayCreateExpression;CodeArrayCreateExpression;(System.String,System.CodeDom.CodeExpression[]);Argument[1].Element;Argument[this];taint;df-generated |
-| System.CodeDom;CodeArrayCreateExpression;CodeArrayCreateExpression;(System.String,System.Int32);Argument[0];Argument[this];taint;df-generated |
-| System.CodeDom;CodeArrayCreateExpression;CodeArrayCreateExpression;(System.Type,System.CodeDom.CodeExpression[]);Argument[1].Element;Argument[this];taint;df-generated |
 | System.CodeDom;CodeArrayCreateExpression;get_Initializers;();Argument[this];ReturnValue;taint;df-generated |
-| System.CodeDom;CodeArrayIndexerExpression;CodeArrayIndexerExpression;(System.CodeDom.CodeExpression,System.CodeDom.CodeExpression[]);Argument[1].Element;Argument[this];taint;df-generated |
 | System.CodeDom;CodeAttachEventStatement;CodeAttachEventStatement;(System.CodeDom.CodeEventReferenceExpression,System.CodeDom.CodeExpression);Argument[0];Argument[this];taint;df-generated |
 | System.CodeDom;CodeAttributeArgument;CodeAttributeArgument;(System.String,System.CodeDom.CodeExpression);Argument[0];Argument[this];taint;df-generated |
-| System.CodeDom;CodeAttributeArgumentCollection;Add;(System.CodeDom.CodeAttributeArgument);Argument[0];Argument[this];taint;df-generated |
-| System.CodeDom;CodeAttributeArgumentCollection;AddRange;(System.CodeDom.CodeAttributeArgumentCollection);Argument[0].Element;Argument[this];taint;df-generated |
-| System.CodeDom;CodeAttributeArgumentCollection;AddRange;(System.CodeDom.CodeAttributeArgument[]);Argument[0].Element;Argument[this];taint;df-generated |
-| System.CodeDom;CodeAttributeArgumentCollection;CodeAttributeArgumentCollection;(System.CodeDom.CodeAttributeArgumentCollection);Argument[0].Element;Argument[this];taint;df-generated |
-| System.CodeDom;CodeAttributeArgumentCollection;CodeAttributeArgumentCollection;(System.CodeDom.CodeAttributeArgument[]);Argument[0].Element;Argument[this];taint;df-generated |
-| System.CodeDom;CodeAttributeArgumentCollection;CopyTo;(System.CodeDom.CodeAttributeArgument[],System.Int32);Argument[this];Argument[0].Element;taint;df-generated |
-| System.CodeDom;CodeAttributeArgumentCollection;Insert;(System.Int32,System.CodeDom.CodeAttributeArgument);Argument[1];Argument[this];taint;df-generated |
-| System.CodeDom;CodeAttributeArgumentCollection;Remove;(System.CodeDom.CodeAttributeArgument);Argument[0];Argument[this];taint;df-generated |
-| System.CodeDom;CodeAttributeArgumentCollection;get_Item;(System.Int32);Argument[this];ReturnValue;taint;df-generated |
-| System.CodeDom;CodeAttributeArgumentCollection;set_Item;(System.Int32,System.CodeDom.CodeAttributeArgument);Argument[1];Argument[this];taint;df-generated |
-| System.CodeDom;CodeAttributeDeclaration;CodeAttributeDeclaration;(System.CodeDom.CodeTypeReference,System.CodeDom.CodeAttributeArgument[]);Argument[0];Argument[this];taint;df-generated |
-| System.CodeDom;CodeAttributeDeclaration;CodeAttributeDeclaration;(System.CodeDom.CodeTypeReference,System.CodeDom.CodeAttributeArgument[]);Argument[1].Element;Argument[this];taint;df-generated |
+| System.CodeDom;CodeAttributeArgumentCollection;Add;(System.CodeDom.CodeAttributeArgument);Argument[0];Argument[this].Property[System.Collections.CollectionBase.List].Element;value;dfc-generated |
+| System.CodeDom;CodeAttributeArgumentCollection;AddRange;(System.CodeDom.CodeAttributeArgumentCollection);Argument[0].Property[System.Collections.CollectionBase.List].Element;Argument[this].Property[System.Collections.CollectionBase.List].Element;value;dfc-generated |
+| System.CodeDom;CodeAttributeArgumentCollection;AddRange;(System.CodeDom.CodeAttributeArgument[]);Argument[0].Element;Argument[this].Property[System.Collections.CollectionBase.List].Element;value;dfc-generated |
+| System.CodeDom;CodeAttributeArgumentCollection;CodeAttributeArgumentCollection;(System.CodeDom.CodeAttributeArgumentCollection);Argument[0].Property[System.Collections.CollectionBase.List].Element;Argument[this].Property[System.Collections.CollectionBase.List].Element;value;dfc-generated |
+| System.CodeDom;CodeAttributeArgumentCollection;CodeAttributeArgumentCollection;(System.CodeDom.CodeAttributeArgument[]);Argument[0].Element;Argument[this].Property[System.Collections.CollectionBase.List].Element;value;dfc-generated |
+| System.CodeDom;CodeAttributeArgumentCollection;CopyTo;(System.CodeDom.CodeAttributeArgument[],System.Int32);Argument[this].Property[System.Collections.CollectionBase.List].Element;Argument[0].Element;value;dfc-generated |
+| System.CodeDom;CodeAttributeArgumentCollection;Insert;(System.Int32,System.CodeDom.CodeAttributeArgument);Argument[1];Argument[this].Property[System.Collections.CollectionBase.List].Element;value;dfc-generated |
+| System.CodeDom;CodeAttributeArgumentCollection;get_Item;(System.Int32);Argument[this].Property[System.Collections.CollectionBase.List].Element;ReturnValue;value;dfc-generated |
+| System.CodeDom;CodeAttributeArgumentCollection;set_Item;(System.Int32,System.CodeDom.CodeAttributeArgument);Argument[1];Argument[this].Property[System.Collections.CollectionBase.List].Element;value;dfc-generated |
+| System.CodeDom;CodeAttributeDeclaration;CodeAttributeDeclaration;(System.CodeDom.CodeTypeReference,System.CodeDom.CodeAttributeArgument[]);Argument[0];Argument[this].SyntheticField[System.CodeDom.CodeAttributeDeclaration._attributeType];value;dfc-generated |
 | System.CodeDom;CodeAttributeDeclaration;CodeAttributeDeclaration;(System.String);Argument[0];Argument[this];taint;df-generated |
 | System.CodeDom;CodeAttributeDeclaration;CodeAttributeDeclaration;(System.String,System.CodeDom.CodeAttributeArgument[]);Argument[0];Argument[this];taint;df-generated |
-| System.CodeDom;CodeAttributeDeclaration;CodeAttributeDeclaration;(System.String,System.CodeDom.CodeAttributeArgument[]);Argument[1].Element;Argument[this];taint;df-generated |
 | System.CodeDom;CodeAttributeDeclaration;get_Arguments;();Argument[this];ReturnValue;taint;df-generated |
-| System.CodeDom;CodeAttributeDeclaration;get_AttributeType;();Argument[this];ReturnValue;taint;df-generated |
-| System.CodeDom;CodeAttributeDeclarationCollection;Add;(System.CodeDom.CodeAttributeDeclaration);Argument[0];Argument[this];taint;df-generated |
-| System.CodeDom;CodeAttributeDeclarationCollection;AddRange;(System.CodeDom.CodeAttributeDeclarationCollection);Argument[0].Element;Argument[this];taint;df-generated |
-| System.CodeDom;CodeAttributeDeclarationCollection;AddRange;(System.CodeDom.CodeAttributeDeclaration[]);Argument[0].Element;Argument[this];taint;df-generated |
-| System.CodeDom;CodeAttributeDeclarationCollection;CodeAttributeDeclarationCollection;(System.CodeDom.CodeAttributeDeclarationCollection);Argument[0].Element;Argument[this];taint;df-generated |
-| System.CodeDom;CodeAttributeDeclarationCollection;CodeAttributeDeclarationCollection;(System.CodeDom.CodeAttributeDeclaration[]);Argument[0].Element;Argument[this];taint;df-generated |
-| System.CodeDom;CodeAttributeDeclarationCollection;CopyTo;(System.CodeDom.CodeAttributeDeclaration[],System.Int32);Argument[this];Argument[0].Element;taint;df-generated |
-| System.CodeDom;CodeAttributeDeclarationCollection;Insert;(System.Int32,System.CodeDom.CodeAttributeDeclaration);Argument[1];Argument[this];taint;df-generated |
-| System.CodeDom;CodeAttributeDeclarationCollection;Remove;(System.CodeDom.CodeAttributeDeclaration);Argument[0];Argument[this];taint;df-generated |
-| System.CodeDom;CodeAttributeDeclarationCollection;get_Item;(System.Int32);Argument[this];ReturnValue;taint;df-generated |
-| System.CodeDom;CodeAttributeDeclarationCollection;set_Item;(System.Int32,System.CodeDom.CodeAttributeDeclaration);Argument[1];Argument[this];taint;df-generated |
+| System.CodeDom;CodeAttributeDeclaration;get_AttributeType;();Argument[this].SyntheticField[System.CodeDom.CodeAttributeDeclaration._attributeType];ReturnValue;value;dfc-generated |
+| System.CodeDom;CodeAttributeDeclarationCollection;Add;(System.CodeDom.CodeAttributeDeclaration);Argument[0];Argument[this].Property[System.Collections.CollectionBase.List].Element;value;dfc-generated |
+| System.CodeDom;CodeAttributeDeclarationCollection;AddRange;(System.CodeDom.CodeAttributeDeclarationCollection);Argument[0].Property[System.Collections.CollectionBase.List].Element;Argument[this].Property[System.Collections.CollectionBase.List].Element;value;dfc-generated |
+| System.CodeDom;CodeAttributeDeclarationCollection;AddRange;(System.CodeDom.CodeAttributeDeclaration[]);Argument[0].Element;Argument[this].Property[System.Collections.CollectionBase.List].Element;value;dfc-generated |
+| System.CodeDom;CodeAttributeDeclarationCollection;CodeAttributeDeclarationCollection;(System.CodeDom.CodeAttributeDeclarationCollection);Argument[0].Property[System.Collections.CollectionBase.List].Element;Argument[this].Property[System.Collections.CollectionBase.List].Element;value;dfc-generated |
+| System.CodeDom;CodeAttributeDeclarationCollection;CodeAttributeDeclarationCollection;(System.CodeDom.CodeAttributeDeclaration[]);Argument[0].Element;Argument[this].Property[System.Collections.CollectionBase.List].Element;value;dfc-generated |
+| System.CodeDom;CodeAttributeDeclarationCollection;CopyTo;(System.CodeDom.CodeAttributeDeclaration[],System.Int32);Argument[this].Property[System.Collections.CollectionBase.List].Element;Argument[0].Element;value;dfc-generated |
+| System.CodeDom;CodeAttributeDeclarationCollection;Insert;(System.Int32,System.CodeDom.CodeAttributeDeclaration);Argument[1];Argument[this].Property[System.Collections.CollectionBase.List].Element;value;dfc-generated |
+| System.CodeDom;CodeAttributeDeclarationCollection;get_Item;(System.Int32);Argument[this].Property[System.Collections.CollectionBase.List].Element;ReturnValue;value;dfc-generated |
+| System.CodeDom;CodeAttributeDeclarationCollection;set_Item;(System.Int32,System.CodeDom.CodeAttributeDeclaration);Argument[1];Argument[this].Property[System.Collections.CollectionBase.List].Element;value;dfc-generated |
 | System.CodeDom;CodeCastExpression;CodeCastExpression;(System.CodeDom.CodeTypeReference,System.CodeDom.CodeExpression);Argument[0];Argument[this];taint;df-generated |
-| System.CodeDom;CodeCastExpression;CodeCastExpression;(System.String,System.CodeDom.CodeExpression);Argument[0];Argument[this];taint;df-generated |
 | System.CodeDom;CodeCatchClause;CodeCatchClause;(System.String);Argument[0];Argument[this];taint;df-generated |
 | System.CodeDom;CodeCatchClause;CodeCatchClause;(System.String,System.CodeDom.CodeTypeReference);Argument[0];Argument[this];taint;df-generated |
 | System.CodeDom;CodeCatchClause;CodeCatchClause;(System.String,System.CodeDom.CodeTypeReference);Argument[1];Argument[this];taint;df-generated |
 | System.CodeDom;CodeCatchClause;CodeCatchClause;(System.String,System.CodeDom.CodeTypeReference,System.CodeDom.CodeStatement[]);Argument[0];Argument[this];taint;df-generated |
 | System.CodeDom;CodeCatchClause;CodeCatchClause;(System.String,System.CodeDom.CodeTypeReference,System.CodeDom.CodeStatement[]);Argument[1];Argument[this];taint;df-generated |
-| System.CodeDom;CodeCatchClause;CodeCatchClause;(System.String,System.CodeDom.CodeTypeReference,System.CodeDom.CodeStatement[]);Argument[2].Element;Argument[this];taint;df-generated |
-| System.CodeDom;CodeCatchClauseCollection;Add;(System.CodeDom.CodeCatchClause);Argument[0];Argument[this];taint;df-generated |
-| System.CodeDom;CodeCatchClauseCollection;AddRange;(System.CodeDom.CodeCatchClauseCollection);Argument[0].Element;Argument[this];taint;df-generated |
-| System.CodeDom;CodeCatchClauseCollection;AddRange;(System.CodeDom.CodeCatchClause[]);Argument[0].Element;Argument[this];taint;df-generated |
-| System.CodeDom;CodeCatchClauseCollection;CodeCatchClauseCollection;(System.CodeDom.CodeCatchClauseCollection);Argument[0].Element;Argument[this];taint;df-generated |
-| System.CodeDom;CodeCatchClauseCollection;CodeCatchClauseCollection;(System.CodeDom.CodeCatchClause[]);Argument[0].Element;Argument[this];taint;df-generated |
-| System.CodeDom;CodeCatchClauseCollection;CopyTo;(System.CodeDom.CodeCatchClause[],System.Int32);Argument[this];Argument[0].Element;taint;df-generated |
-| System.CodeDom;CodeCatchClauseCollection;Insert;(System.Int32,System.CodeDom.CodeCatchClause);Argument[1];Argument[this];taint;df-generated |
-| System.CodeDom;CodeCatchClauseCollection;Remove;(System.CodeDom.CodeCatchClause);Argument[0];Argument[this];taint;df-generated |
-| System.CodeDom;CodeCatchClauseCollection;get_Item;(System.Int32);Argument[this];ReturnValue;taint;df-generated |
-| System.CodeDom;CodeCatchClauseCollection;set_Item;(System.Int32,System.CodeDom.CodeCatchClause);Argument[1];Argument[this];taint;df-generated |
+| System.CodeDom;CodeCatchClauseCollection;Add;(System.CodeDom.CodeCatchClause);Argument[0];Argument[this].Property[System.Collections.CollectionBase.List].Element;value;dfc-generated |
+| System.CodeDom;CodeCatchClauseCollection;AddRange;(System.CodeDom.CodeCatchClauseCollection);Argument[0].Property[System.Collections.CollectionBase.List].Element;Argument[this].Property[System.Collections.CollectionBase.List].Element;value;dfc-generated |
+| System.CodeDom;CodeCatchClauseCollection;AddRange;(System.CodeDom.CodeCatchClause[]);Argument[0].Element;Argument[this].Property[System.Collections.CollectionBase.List].Element;value;dfc-generated |
+| System.CodeDom;CodeCatchClauseCollection;CodeCatchClauseCollection;(System.CodeDom.CodeCatchClauseCollection);Argument[0].Property[System.Collections.CollectionBase.List].Element;Argument[this].Property[System.Collections.CollectionBase.List].Element;value;dfc-generated |
+| System.CodeDom;CodeCatchClauseCollection;CodeCatchClauseCollection;(System.CodeDom.CodeCatchClause[]);Argument[0].Element;Argument[this].Property[System.Collections.CollectionBase.List].Element;value;dfc-generated |
+| System.CodeDom;CodeCatchClauseCollection;CopyTo;(System.CodeDom.CodeCatchClause[],System.Int32);Argument[this].Property[System.Collections.CollectionBase.List].Element;Argument[0].Element;value;dfc-generated |
+| System.CodeDom;CodeCatchClauseCollection;Insert;(System.Int32,System.CodeDom.CodeCatchClause);Argument[1];Argument[this].Property[System.Collections.CollectionBase.List].Element;value;dfc-generated |
+| System.CodeDom;CodeCatchClauseCollection;get_Item;(System.Int32);Argument[this].Property[System.Collections.CollectionBase.List].Element;ReturnValue;value;dfc-generated |
+| System.CodeDom;CodeCatchClauseCollection;set_Item;(System.Int32,System.CodeDom.CodeCatchClause);Argument[1];Argument[this].Property[System.Collections.CollectionBase.List].Element;value;dfc-generated |
 | System.CodeDom;CodeChecksumPragma;CodeChecksumPragma;(System.String,System.Guid,System.Byte[]);Argument[0];Argument[this];taint;df-generated |
 | System.CodeDom;CodeComment;CodeComment;(System.String);Argument[0];Argument[this];taint;df-generated |
 | System.CodeDom;CodeComment;CodeComment;(System.String,System.Boolean);Argument[0];Argument[this];taint;df-generated |
-| System.CodeDom;CodeCommentStatementCollection;Add;(System.CodeDom.CodeCommentStatement);Argument[0];Argument[this];taint;df-generated |
-| System.CodeDom;CodeCommentStatementCollection;AddRange;(System.CodeDom.CodeCommentStatementCollection);Argument[0].Element;Argument[this];taint;df-generated |
-| System.CodeDom;CodeCommentStatementCollection;AddRange;(System.CodeDom.CodeCommentStatement[]);Argument[0].Element;Argument[this];taint;df-generated |
-| System.CodeDom;CodeCommentStatementCollection;CodeCommentStatementCollection;(System.CodeDom.CodeCommentStatementCollection);Argument[0].Element;Argument[this];taint;df-generated |
-| System.CodeDom;CodeCommentStatementCollection;CodeCommentStatementCollection;(System.CodeDom.CodeCommentStatement[]);Argument[0].Element;Argument[this];taint;df-generated |
-| System.CodeDom;CodeCommentStatementCollection;CopyTo;(System.CodeDom.CodeCommentStatement[],System.Int32);Argument[this];Argument[0].Element;taint;df-generated |
-| System.CodeDom;CodeCommentStatementCollection;Insert;(System.Int32,System.CodeDom.CodeCommentStatement);Argument[1];Argument[this];taint;df-generated |
-| System.CodeDom;CodeCommentStatementCollection;Remove;(System.CodeDom.CodeCommentStatement);Argument[0];Argument[this];taint;df-generated |
-| System.CodeDom;CodeCommentStatementCollection;get_Item;(System.Int32);Argument[this];ReturnValue;taint;df-generated |
-| System.CodeDom;CodeCommentStatementCollection;set_Item;(System.Int32,System.CodeDom.CodeCommentStatement);Argument[1];Argument[this];taint;df-generated |
-| System.CodeDom;CodeConditionStatement;CodeConditionStatement;(System.CodeDom.CodeExpression,System.CodeDom.CodeStatement[]);Argument[1].Element;Argument[this];taint;df-generated |
-| System.CodeDom;CodeConditionStatement;CodeConditionStatement;(System.CodeDom.CodeExpression,System.CodeDom.CodeStatement[],System.CodeDom.CodeStatement[]);Argument[1].Element;Argument[this];taint;df-generated |
-| System.CodeDom;CodeConditionStatement;CodeConditionStatement;(System.CodeDom.CodeExpression,System.CodeDom.CodeStatement[],System.CodeDom.CodeStatement[]);Argument[2].Element;Argument[this];taint;df-generated |
+| System.CodeDom;CodeCommentStatementCollection;Add;(System.CodeDom.CodeCommentStatement);Argument[0];Argument[this].Property[System.Collections.CollectionBase.List].Element;value;dfc-generated |
+| System.CodeDom;CodeCommentStatementCollection;AddRange;(System.CodeDom.CodeCommentStatementCollection);Argument[0].Property[System.Collections.CollectionBase.List].Element;Argument[this].Property[System.Collections.CollectionBase.List].Element;value;dfc-generated |
+| System.CodeDom;CodeCommentStatementCollection;AddRange;(System.CodeDom.CodeCommentStatement[]);Argument[0].Element;Argument[this].Property[System.Collections.CollectionBase.List].Element;value;dfc-generated |
+| System.CodeDom;CodeCommentStatementCollection;CodeCommentStatementCollection;(System.CodeDom.CodeCommentStatementCollection);Argument[0].Property[System.Collections.CollectionBase.List].Element;Argument[this].Property[System.Collections.CollectionBase.List].Element;value;dfc-generated |
+| System.CodeDom;CodeCommentStatementCollection;CodeCommentStatementCollection;(System.CodeDom.CodeCommentStatement[]);Argument[0].Element;Argument[this].Property[System.Collections.CollectionBase.List].Element;value;dfc-generated |
+| System.CodeDom;CodeCommentStatementCollection;CopyTo;(System.CodeDom.CodeCommentStatement[],System.Int32);Argument[this].Property[System.Collections.CollectionBase.List].Element;Argument[0].Element;value;dfc-generated |
+| System.CodeDom;CodeCommentStatementCollection;Insert;(System.Int32,System.CodeDom.CodeCommentStatement);Argument[1];Argument[this].Property[System.Collections.CollectionBase.List].Element;value;dfc-generated |
+| System.CodeDom;CodeCommentStatementCollection;get_Item;(System.Int32);Argument[this].Property[System.Collections.CollectionBase.List].Element;ReturnValue;value;dfc-generated |
+| System.CodeDom;CodeCommentStatementCollection;set_Item;(System.Int32,System.CodeDom.CodeCommentStatement);Argument[1];Argument[this].Property[System.Collections.CollectionBase.List].Element;value;dfc-generated |
 | System.CodeDom;CodeDefaultValueExpression;CodeDefaultValueExpression;(System.CodeDom.CodeTypeReference);Argument[0];Argument[this];taint;df-generated |
 | System.CodeDom;CodeDelegateCreateExpression;CodeDelegateCreateExpression;(System.CodeDom.CodeTypeReference,System.CodeDom.CodeExpression,System.String);Argument[0];Argument[this];taint;df-generated |
 | System.CodeDom;CodeDelegateCreateExpression;CodeDelegateCreateExpression;(System.CodeDom.CodeTypeReference,System.CodeDom.CodeExpression,System.String);Argument[2];Argument[this];taint;df-generated |
-| System.CodeDom;CodeDelegateInvokeExpression;CodeDelegateInvokeExpression;(System.CodeDom.CodeExpression,System.CodeDom.CodeExpression[]);Argument[1].Element;Argument[this];taint;df-generated |
-| System.CodeDom;CodeDirectiveCollection;Add;(System.CodeDom.CodeDirective);Argument[0];Argument[this];taint;df-generated |
-| System.CodeDom;CodeDirectiveCollection;AddRange;(System.CodeDom.CodeDirectiveCollection);Argument[0].Element;Argument[this];taint;df-generated |
-| System.CodeDom;CodeDirectiveCollection;AddRange;(System.CodeDom.CodeDirective[]);Argument[0].Element;Argument[this];taint;df-generated |
-| System.CodeDom;CodeDirectiveCollection;CodeDirectiveCollection;(System.CodeDom.CodeDirectiveCollection);Argument[0].Element;Argument[this];taint;df-generated |
-| System.CodeDom;CodeDirectiveCollection;CodeDirectiveCollection;(System.CodeDom.CodeDirective[]);Argument[0].Element;Argument[this];taint;df-generated |
-| System.CodeDom;CodeDirectiveCollection;CopyTo;(System.CodeDom.CodeDirective[],System.Int32);Argument[this];Argument[0].Element;taint;df-generated |
-| System.CodeDom;CodeDirectiveCollection;Insert;(System.Int32,System.CodeDom.CodeDirective);Argument[1];Argument[this];taint;df-generated |
-| System.CodeDom;CodeDirectiveCollection;Remove;(System.CodeDom.CodeDirective);Argument[0];Argument[this];taint;df-generated |
-| System.CodeDom;CodeDirectiveCollection;get_Item;(System.Int32);Argument[this];ReturnValue;taint;df-generated |
-| System.CodeDom;CodeDirectiveCollection;set_Item;(System.Int32,System.CodeDom.CodeDirective);Argument[1];Argument[this];taint;df-generated |
+| System.CodeDom;CodeDirectiveCollection;Add;(System.CodeDom.CodeDirective);Argument[0];Argument[this].Property[System.Collections.CollectionBase.List].Element;value;dfc-generated |
+| System.CodeDom;CodeDirectiveCollection;AddRange;(System.CodeDom.CodeDirectiveCollection);Argument[0].Property[System.Collections.CollectionBase.List].Element;Argument[this].Property[System.Collections.CollectionBase.List].Element;value;dfc-generated |
+| System.CodeDom;CodeDirectiveCollection;AddRange;(System.CodeDom.CodeDirective[]);Argument[0].Element;Argument[this].Property[System.Collections.CollectionBase.List].Element;value;dfc-generated |
+| System.CodeDom;CodeDirectiveCollection;CodeDirectiveCollection;(System.CodeDom.CodeDirectiveCollection);Argument[0].Property[System.Collections.CollectionBase.List].Element;Argument[this].Property[System.Collections.CollectionBase.List].Element;value;dfc-generated |
+| System.CodeDom;CodeDirectiveCollection;CodeDirectiveCollection;(System.CodeDom.CodeDirective[]);Argument[0].Element;Argument[this].Property[System.Collections.CollectionBase.List].Element;value;dfc-generated |
+| System.CodeDom;CodeDirectiveCollection;CopyTo;(System.CodeDom.CodeDirective[],System.Int32);Argument[this].Property[System.Collections.CollectionBase.List].Element;Argument[0].Element;value;dfc-generated |
+| System.CodeDom;CodeDirectiveCollection;Insert;(System.Int32,System.CodeDom.CodeDirective);Argument[1];Argument[this].Property[System.Collections.CollectionBase.List].Element;value;dfc-generated |
+| System.CodeDom;CodeDirectiveCollection;get_Item;(System.Int32);Argument[this].Property[System.Collections.CollectionBase.List].Element;ReturnValue;value;dfc-generated |
+| System.CodeDom;CodeDirectiveCollection;set_Item;(System.Int32,System.CodeDom.CodeDirective);Argument[1];Argument[this].Property[System.Collections.CollectionBase.List].Element;value;dfc-generated |
 | System.CodeDom;CodeEventReferenceExpression;CodeEventReferenceExpression;(System.CodeDom.CodeExpression,System.String);Argument[1];Argument[this];taint;df-generated |
-| System.CodeDom;CodeExpressionCollection;Add;(System.CodeDom.CodeExpression);Argument[0];Argument[this];taint;df-generated |
-| System.CodeDom;CodeExpressionCollection;AddRange;(System.CodeDom.CodeExpressionCollection);Argument[0].Element;Argument[this];taint;df-generated |
-| System.CodeDom;CodeExpressionCollection;AddRange;(System.CodeDom.CodeExpression[]);Argument[0].Element;Argument[this];taint;df-generated |
-| System.CodeDom;CodeExpressionCollection;CodeExpressionCollection;(System.CodeDom.CodeExpressionCollection);Argument[0].Element;Argument[this];taint;df-generated |
-| System.CodeDom;CodeExpressionCollection;CodeExpressionCollection;(System.CodeDom.CodeExpression[]);Argument[0].Element;Argument[this];taint;df-generated |
-| System.CodeDom;CodeExpressionCollection;CopyTo;(System.CodeDom.CodeExpression[],System.Int32);Argument[this];Argument[0].Element;taint;df-generated |
-| System.CodeDom;CodeExpressionCollection;Insert;(System.Int32,System.CodeDom.CodeExpression);Argument[1];Argument[this];taint;df-generated |
-| System.CodeDom;CodeExpressionCollection;Remove;(System.CodeDom.CodeExpression);Argument[0];Argument[this];taint;df-generated |
-| System.CodeDom;CodeExpressionCollection;get_Item;(System.Int32);Argument[this];ReturnValue;taint;df-generated |
-| System.CodeDom;CodeExpressionCollection;set_Item;(System.Int32,System.CodeDom.CodeExpression);Argument[1];Argument[this];taint;df-generated |
+| System.CodeDom;CodeExpressionCollection;Add;(System.CodeDom.CodeExpression);Argument[0];Argument[this].Property[System.Collections.CollectionBase.List].Element;value;dfc-generated |
+| System.CodeDom;CodeExpressionCollection;AddRange;(System.CodeDom.CodeExpressionCollection);Argument[0].Property[System.Collections.CollectionBase.List].Element;Argument[this].Property[System.Collections.CollectionBase.List].Element;value;dfc-generated |
+| System.CodeDom;CodeExpressionCollection;AddRange;(System.CodeDom.CodeExpression[]);Argument[0].Element;Argument[this].Property[System.Collections.CollectionBase.List].Element;value;dfc-generated |
+| System.CodeDom;CodeExpressionCollection;CodeExpressionCollection;(System.CodeDom.CodeExpressionCollection);Argument[0].Property[System.Collections.CollectionBase.List].Element;Argument[this].Property[System.Collections.CollectionBase.List].Element;value;dfc-generated |
+| System.CodeDom;CodeExpressionCollection;CodeExpressionCollection;(System.CodeDom.CodeExpression[]);Argument[0].Element;Argument[this].Property[System.Collections.CollectionBase.List].Element;value;dfc-generated |
+| System.CodeDom;CodeExpressionCollection;CopyTo;(System.CodeDom.CodeExpression[],System.Int32);Argument[this].Property[System.Collections.CollectionBase.List].Element;Argument[0].Element;value;dfc-generated |
+| System.CodeDom;CodeExpressionCollection;Insert;(System.Int32,System.CodeDom.CodeExpression);Argument[1];Argument[this].Property[System.Collections.CollectionBase.List].Element;value;dfc-generated |
+| System.CodeDom;CodeExpressionCollection;get_Item;(System.Int32);Argument[this].Property[System.Collections.CollectionBase.List].Element;ReturnValue;value;dfc-generated |
+| System.CodeDom;CodeExpressionCollection;set_Item;(System.Int32,System.CodeDom.CodeExpression);Argument[1];Argument[this].Property[System.Collections.CollectionBase.List].Element;value;dfc-generated |
 | System.CodeDom;CodeFieldReferenceExpression;CodeFieldReferenceExpression;(System.CodeDom.CodeExpression,System.String);Argument[1];Argument[this];taint;df-generated |
 | System.CodeDom;CodeGotoStatement;CodeGotoStatement;(System.String);Argument[0];Argument[this];taint;df-generated |
-| System.CodeDom;CodeIndexerExpression;CodeIndexerExpression;(System.CodeDom.CodeExpression,System.CodeDom.CodeExpression[]);Argument[1].Element;Argument[this];taint;df-generated |
-| System.CodeDom;CodeIterationStatement;CodeIterationStatement;(System.CodeDom.CodeStatement,System.CodeDom.CodeExpression,System.CodeDom.CodeStatement,System.CodeDom.CodeStatement[]);Argument[3].Element;Argument[this];taint;df-generated |
 | System.CodeDom;CodeLabeledStatement;CodeLabeledStatement;(System.String);Argument[0];Argument[this];taint;df-generated |
 | System.CodeDom;CodeLabeledStatement;CodeLabeledStatement;(System.String,System.CodeDom.CodeStatement);Argument[0];Argument[this];taint;df-generated |
 | System.CodeDom;CodeLinePragma;CodeLinePragma;(System.String,System.Int32);Argument[0];Argument[this];taint;df-generated |
 | System.CodeDom;CodeMemberField;CodeMemberField;(System.CodeDom.CodeTypeReference,System.String);Argument[0];Argument[this];taint;df-generated |
 | System.CodeDom;CodeMemberField;CodeMemberField;(System.CodeDom.CodeTypeReference,System.String);Argument[1];Argument[this];taint;df-generated |
-| System.CodeDom;CodeMemberField;CodeMemberField;(System.String,System.String);Argument[0];Argument[this];taint;df-generated |
 | System.CodeDom;CodeMemberField;CodeMemberField;(System.String,System.String);Argument[1];Argument[this];taint;df-generated |
 | System.CodeDom;CodeMemberField;CodeMemberField;(System.Type,System.String);Argument[1];Argument[this];taint;df-generated |
 | System.CodeDom;CodeMemberMethod;add_PopulateImplementationTypes;(System.EventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
@@ -5569,13 +6049,9 @@ summary
 | System.CodeDom;CodeMemberMethod;remove_PopulateImplementationTypes;(System.EventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.CodeDom;CodeMemberMethod;remove_PopulateParameters;(System.EventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.CodeDom;CodeMemberMethod;remove_PopulateStatements;(System.EventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
-| System.CodeDom;CodeMethodInvokeExpression;CodeMethodInvokeExpression;(System.CodeDom.CodeExpression,System.String,System.CodeDom.CodeExpression[]);Argument[1];Argument[this];taint;df-generated |
-| System.CodeDom;CodeMethodInvokeExpression;CodeMethodInvokeExpression;(System.CodeDom.CodeExpression,System.String,System.CodeDom.CodeExpression[]);Argument[2].Element;Argument[this];taint;df-generated |
 | System.CodeDom;CodeMethodInvokeExpression;CodeMethodInvokeExpression;(System.CodeDom.CodeMethodReferenceExpression,System.CodeDom.CodeExpression[]);Argument[0];Argument[this];taint;df-generated |
-| System.CodeDom;CodeMethodInvokeExpression;CodeMethodInvokeExpression;(System.CodeDom.CodeMethodReferenceExpression,System.CodeDom.CodeExpression[]);Argument[1].Element;Argument[this];taint;df-generated |
 | System.CodeDom;CodeMethodReferenceExpression;CodeMethodReferenceExpression;(System.CodeDom.CodeExpression,System.String);Argument[1];Argument[this];taint;df-generated |
 | System.CodeDom;CodeMethodReferenceExpression;CodeMethodReferenceExpression;(System.CodeDom.CodeExpression,System.String,System.CodeDom.CodeTypeReference[]);Argument[1];Argument[this];taint;df-generated |
-| System.CodeDom;CodeMethodReferenceExpression;CodeMethodReferenceExpression;(System.CodeDom.CodeExpression,System.String,System.CodeDom.CodeTypeReference[]);Argument[2].Element;Argument[this];taint;df-generated |
 | System.CodeDom;CodeNamespace;CodeNamespace;(System.String);Argument[0];Argument[this];taint;df-generated |
 | System.CodeDom;CodeNamespace;add_PopulateComments;(System.EventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.CodeDom;CodeNamespace;add_PopulateImports;(System.EventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
@@ -5586,76 +6062,59 @@ summary
 | System.CodeDom;CodeNamespace;remove_PopulateComments;(System.EventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.CodeDom;CodeNamespace;remove_PopulateImports;(System.EventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.CodeDom;CodeNamespace;remove_PopulateTypes;(System.EventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
-| System.CodeDom;CodeNamespaceCollection;Add;(System.CodeDom.CodeNamespace);Argument[0];Argument[this];taint;df-generated |
-| System.CodeDom;CodeNamespaceCollection;AddRange;(System.CodeDom.CodeNamespaceCollection);Argument[0].Element;Argument[this];taint;df-generated |
-| System.CodeDom;CodeNamespaceCollection;AddRange;(System.CodeDom.CodeNamespace[]);Argument[0].Element;Argument[this];taint;df-generated |
-| System.CodeDom;CodeNamespaceCollection;CodeNamespaceCollection;(System.CodeDom.CodeNamespaceCollection);Argument[0].Element;Argument[this];taint;df-generated |
-| System.CodeDom;CodeNamespaceCollection;CodeNamespaceCollection;(System.CodeDom.CodeNamespace[]);Argument[0].Element;Argument[this];taint;df-generated |
-| System.CodeDom;CodeNamespaceCollection;CopyTo;(System.CodeDom.CodeNamespace[],System.Int32);Argument[this];Argument[0].Element;taint;df-generated |
-| System.CodeDom;CodeNamespaceCollection;Insert;(System.Int32,System.CodeDom.CodeNamespace);Argument[1];Argument[this];taint;df-generated |
-| System.CodeDom;CodeNamespaceCollection;Remove;(System.CodeDom.CodeNamespace);Argument[0];Argument[this];taint;df-generated |
-| System.CodeDom;CodeNamespaceCollection;get_Item;(System.Int32);Argument[this];ReturnValue;taint;df-generated |
-| System.CodeDom;CodeNamespaceCollection;set_Item;(System.Int32,System.CodeDom.CodeNamespace);Argument[1];Argument[this];taint;df-generated |
+| System.CodeDom;CodeNamespaceCollection;Add;(System.CodeDom.CodeNamespace);Argument[0];Argument[this].Property[System.Collections.CollectionBase.List].Element;value;dfc-generated |
+| System.CodeDom;CodeNamespaceCollection;AddRange;(System.CodeDom.CodeNamespaceCollection);Argument[0].Property[System.Collections.CollectionBase.List].Element;Argument[this].Property[System.Collections.CollectionBase.List].Element;value;dfc-generated |
+| System.CodeDom;CodeNamespaceCollection;AddRange;(System.CodeDom.CodeNamespace[]);Argument[0].Element;Argument[this].Property[System.Collections.CollectionBase.List].Element;value;dfc-generated |
+| System.CodeDom;CodeNamespaceCollection;CodeNamespaceCollection;(System.CodeDom.CodeNamespaceCollection);Argument[0].Property[System.Collections.CollectionBase.List].Element;Argument[this].Property[System.Collections.CollectionBase.List].Element;value;dfc-generated |
+| System.CodeDom;CodeNamespaceCollection;CodeNamespaceCollection;(System.CodeDom.CodeNamespace[]);Argument[0].Element;Argument[this].Property[System.Collections.CollectionBase.List].Element;value;dfc-generated |
+| System.CodeDom;CodeNamespaceCollection;CopyTo;(System.CodeDom.CodeNamespace[],System.Int32);Argument[this].Property[System.Collections.CollectionBase.List].Element;Argument[0].Element;value;dfc-generated |
+| System.CodeDom;CodeNamespaceCollection;Insert;(System.Int32,System.CodeDom.CodeNamespace);Argument[1];Argument[this].Property[System.Collections.CollectionBase.List].Element;value;dfc-generated |
+| System.CodeDom;CodeNamespaceCollection;get_Item;(System.Int32);Argument[this].Property[System.Collections.CollectionBase.List].Element;ReturnValue;value;dfc-generated |
+| System.CodeDom;CodeNamespaceCollection;set_Item;(System.Int32,System.CodeDom.CodeNamespace);Argument[1];Argument[this].Property[System.Collections.CollectionBase.List].Element;value;dfc-generated |
 | System.CodeDom;CodeNamespaceImport;CodeNamespaceImport;(System.String);Argument[0];Argument[this];taint;df-generated |
-| System.CodeDom;CodeNamespaceImportCollection;Add;(System.CodeDom.CodeNamespaceImport);Argument[0];Argument[this];taint;df-generated |
+| System.CodeDom;CodeNamespaceImportCollection;Add;(System.CodeDom.CodeNamespaceImport);Argument[0];Argument[this].SyntheticField[System.CodeDom.CodeNamespaceImportCollection._data].Element;value;dfc-generated |
 | System.CodeDom;CodeNamespaceImportCollection;Add;(System.Object);Argument[0];Argument[this].Element;value;manual |
-| System.CodeDom;CodeNamespaceImportCollection;AddRange;(System.CodeDom.CodeNamespaceImport[]);Argument[0].Element;Argument[this];taint;df-generated |
+| System.CodeDom;CodeNamespaceImportCollection;AddRange;(System.CodeDom.CodeNamespaceImport[]);Argument[0].Element;Argument[this].SyntheticField[System.CodeDom.CodeNamespaceImportCollection._data].Element;value;dfc-generated |
 | System.CodeDom;CodeNamespaceImportCollection;Clear;();Argument[this].WithoutElement;Argument[this];value;manual |
 | System.CodeDom;CodeNamespaceImportCollection;CopyTo;(System.Array,System.Int32);Argument[this].Element;Argument[0].Element;value;manual |
 | System.CodeDom;CodeNamespaceImportCollection;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.IEnumerator.Current];value;manual |
-| System.CodeDom;CodeNamespaceImportCollection;GetEnumerator;();Argument[this];ReturnValue;taint;df-generated |
+| System.CodeDom;CodeNamespaceImportCollection;GetEnumerator;();Argument[this].SyntheticField[System.CodeDom.CodeNamespaceImportCollection._data].Element;ReturnValue.Property[System.Collections.IEnumerator.Current];value;dfc-generated |
 | System.CodeDom;CodeNamespaceImportCollection;Insert;(System.Int32,System.Object);Argument[1];Argument[this].Element;value;manual |
-| System.CodeDom;CodeNamespaceImportCollection;Remove;(System.Object);Argument[0];Argument[this];taint;df-generated |
-| System.CodeDom;CodeNamespaceImportCollection;Remove;(System.Object);Argument[this];Argument[0];taint;df-generated |
 | System.CodeDom;CodeNamespaceImportCollection;get_Item;(System.Int32);Argument[this].Element;ReturnValue;value;manual |
-| System.CodeDom;CodeNamespaceImportCollection;get_Item;(System.Int32);Argument[this];ReturnValue;taint;df-generated |
-| System.CodeDom;CodeNamespaceImportCollection;get_SyncRoot;();Argument[this];ReturnValue;taint;df-generated |
-| System.CodeDom;CodeNamespaceImportCollection;get_SyncRoot;();Argument[this];ReturnValue;value;df-generated |
-| System.CodeDom;CodeNamespaceImportCollection;set_Item;(System.Int32,System.CodeDom.CodeNamespaceImport);Argument[1];Argument[this];taint;df-generated |
+| System.CodeDom;CodeNamespaceImportCollection;get_Item;(System.Int32);Argument[this].SyntheticField[System.CodeDom.CodeNamespaceImportCollection._data].Element;ReturnValue;value;dfc-generated |
+| System.CodeDom;CodeNamespaceImportCollection;get_SyncRoot;();Argument[this];ReturnValue;value;dfc-generated |
+| System.CodeDom;CodeNamespaceImportCollection;set_Item;(System.Int32,System.CodeDom.CodeNamespaceImport);Argument[1];Argument[this].SyntheticField[System.CodeDom.CodeNamespaceImportCollection._data].Element;value;dfc-generated |
 | System.CodeDom;CodeNamespaceImportCollection;set_Item;(System.Int32,System.Object);Argument[1];Argument[this].Element;value;manual |
 | System.CodeDom;CodeObjectCreateExpression;CodeObjectCreateExpression;(System.CodeDom.CodeTypeReference,System.CodeDom.CodeExpression[]);Argument[0];Argument[this];taint;df-generated |
-| System.CodeDom;CodeObjectCreateExpression;CodeObjectCreateExpression;(System.CodeDom.CodeTypeReference,System.CodeDom.CodeExpression[]);Argument[1].Element;Argument[this];taint;df-generated |
-| System.CodeDom;CodeObjectCreateExpression;CodeObjectCreateExpression;(System.String,System.CodeDom.CodeExpression[]);Argument[0];Argument[this];taint;df-generated |
-| System.CodeDom;CodeObjectCreateExpression;CodeObjectCreateExpression;(System.String,System.CodeDom.CodeExpression[]);Argument[1].Element;Argument[this];taint;df-generated |
-| System.CodeDom;CodeObjectCreateExpression;CodeObjectCreateExpression;(System.Type,System.CodeDom.CodeExpression[]);Argument[1].Element;Argument[this];taint;df-generated |
 | System.CodeDom;CodeParameterDeclarationExpression;CodeParameterDeclarationExpression;(System.CodeDom.CodeTypeReference,System.String);Argument[0];Argument[this];taint;df-generated |
 | System.CodeDom;CodeParameterDeclarationExpression;CodeParameterDeclarationExpression;(System.CodeDom.CodeTypeReference,System.String);Argument[1];Argument[this];taint;df-generated |
-| System.CodeDom;CodeParameterDeclarationExpression;CodeParameterDeclarationExpression;(System.String,System.String);Argument[0];Argument[this];taint;df-generated |
 | System.CodeDom;CodeParameterDeclarationExpression;CodeParameterDeclarationExpression;(System.String,System.String);Argument[1];Argument[this];taint;df-generated |
 | System.CodeDom;CodeParameterDeclarationExpression;CodeParameterDeclarationExpression;(System.Type,System.String);Argument[1];Argument[this];taint;df-generated |
-| System.CodeDom;CodeParameterDeclarationExpressionCollection;Add;(System.CodeDom.CodeParameterDeclarationExpression);Argument[0];Argument[this];taint;df-generated |
-| System.CodeDom;CodeParameterDeclarationExpressionCollection;AddRange;(System.CodeDom.CodeParameterDeclarationExpressionCollection);Argument[0].Element;Argument[this];taint;df-generated |
-| System.CodeDom;CodeParameterDeclarationExpressionCollection;AddRange;(System.CodeDom.CodeParameterDeclarationExpression[]);Argument[0].Element;Argument[this];taint;df-generated |
-| System.CodeDom;CodeParameterDeclarationExpressionCollection;CodeParameterDeclarationExpressionCollection;(System.CodeDom.CodeParameterDeclarationExpressionCollection);Argument[0].Element;Argument[this];taint;df-generated |
-| System.CodeDom;CodeParameterDeclarationExpressionCollection;CodeParameterDeclarationExpressionCollection;(System.CodeDom.CodeParameterDeclarationExpression[]);Argument[0].Element;Argument[this];taint;df-generated |
-| System.CodeDom;CodeParameterDeclarationExpressionCollection;CopyTo;(System.CodeDom.CodeParameterDeclarationExpression[],System.Int32);Argument[this];Argument[0].Element;taint;df-generated |
-| System.CodeDom;CodeParameterDeclarationExpressionCollection;Insert;(System.Int32,System.CodeDom.CodeParameterDeclarationExpression);Argument[1];Argument[this];taint;df-generated |
-| System.CodeDom;CodeParameterDeclarationExpressionCollection;Remove;(System.CodeDom.CodeParameterDeclarationExpression);Argument[0];Argument[this];taint;df-generated |
-| System.CodeDom;CodeParameterDeclarationExpressionCollection;get_Item;(System.Int32);Argument[this];ReturnValue;taint;df-generated |
-| System.CodeDom;CodeParameterDeclarationExpressionCollection;set_Item;(System.Int32,System.CodeDom.CodeParameterDeclarationExpression);Argument[1];Argument[this];taint;df-generated |
+| System.CodeDom;CodeParameterDeclarationExpressionCollection;Add;(System.CodeDom.CodeParameterDeclarationExpression);Argument[0];Argument[this].Property[System.Collections.CollectionBase.List].Element;value;dfc-generated |
+| System.CodeDom;CodeParameterDeclarationExpressionCollection;AddRange;(System.CodeDom.CodeParameterDeclarationExpressionCollection);Argument[0].Property[System.Collections.CollectionBase.List].Element;Argument[this].Property[System.Collections.CollectionBase.List].Element;value;dfc-generated |
+| System.CodeDom;CodeParameterDeclarationExpressionCollection;AddRange;(System.CodeDom.CodeParameterDeclarationExpression[]);Argument[0].Element;Argument[this].Property[System.Collections.CollectionBase.List].Element;value;dfc-generated |
+| System.CodeDom;CodeParameterDeclarationExpressionCollection;CodeParameterDeclarationExpressionCollection;(System.CodeDom.CodeParameterDeclarationExpressionCollection);Argument[0].Property[System.Collections.CollectionBase.List].Element;Argument[this].Property[System.Collections.CollectionBase.List].Element;value;dfc-generated |
+| System.CodeDom;CodeParameterDeclarationExpressionCollection;CodeParameterDeclarationExpressionCollection;(System.CodeDom.CodeParameterDeclarationExpression[]);Argument[0].Element;Argument[this].Property[System.Collections.CollectionBase.List].Element;value;dfc-generated |
+| System.CodeDom;CodeParameterDeclarationExpressionCollection;CopyTo;(System.CodeDom.CodeParameterDeclarationExpression[],System.Int32);Argument[this].Property[System.Collections.CollectionBase.List].Element;Argument[0].Element;value;dfc-generated |
+| System.CodeDom;CodeParameterDeclarationExpressionCollection;Insert;(System.Int32,System.CodeDom.CodeParameterDeclarationExpression);Argument[1];Argument[this].Property[System.Collections.CollectionBase.List].Element;value;dfc-generated |
+| System.CodeDom;CodeParameterDeclarationExpressionCollection;get_Item;(System.Int32);Argument[this].Property[System.Collections.CollectionBase.List].Element;ReturnValue;value;dfc-generated |
+| System.CodeDom;CodeParameterDeclarationExpressionCollection;set_Item;(System.Int32,System.CodeDom.CodeParameterDeclarationExpression);Argument[1];Argument[this].Property[System.Collections.CollectionBase.List].Element;value;dfc-generated |
 | System.CodeDom;CodePropertyReferenceExpression;CodePropertyReferenceExpression;(System.CodeDom.CodeExpression,System.String);Argument[1];Argument[this];taint;df-generated |
 | System.CodeDom;CodeRegionDirective;CodeRegionDirective;(System.CodeDom.CodeRegionMode,System.String);Argument[1];Argument[this];taint;df-generated |
 | System.CodeDom;CodeRemoveEventStatement;CodeRemoveEventStatement;(System.CodeDom.CodeEventReferenceExpression,System.CodeDom.CodeExpression);Argument[0];Argument[this];taint;df-generated |
-| System.CodeDom;CodeRemoveEventStatement;CodeRemoveEventStatement;(System.CodeDom.CodeExpression,System.String,System.CodeDom.CodeExpression);Argument[1];Argument[this];taint;df-generated |
 | System.CodeDom;CodeSnippetCompileUnit;CodeSnippetCompileUnit;(System.String);Argument[0];Argument[this];taint;df-generated |
 | System.CodeDom;CodeSnippetExpression;CodeSnippetExpression;(System.String);Argument[0];Argument[this];taint;df-generated |
 | System.CodeDom;CodeSnippetStatement;CodeSnippetStatement;(System.String);Argument[0];Argument[this];taint;df-generated |
 | System.CodeDom;CodeSnippetTypeMember;CodeSnippetTypeMember;(System.String);Argument[0];Argument[this];taint;df-generated |
-| System.CodeDom;CodeStatementCollection;Add;(System.CodeDom.CodeStatement);Argument[0];Argument[this];taint;df-generated |
-| System.CodeDom;CodeStatementCollection;AddRange;(System.CodeDom.CodeStatementCollection);Argument[0].Element;Argument[this];taint;df-generated |
-| System.CodeDom;CodeStatementCollection;AddRange;(System.CodeDom.CodeStatement[]);Argument[0].Element;Argument[this];taint;df-generated |
-| System.CodeDom;CodeStatementCollection;CodeStatementCollection;(System.CodeDom.CodeStatementCollection);Argument[0].Element;Argument[this];taint;df-generated |
-| System.CodeDom;CodeStatementCollection;CodeStatementCollection;(System.CodeDom.CodeStatement[]);Argument[0].Element;Argument[this];taint;df-generated |
-| System.CodeDom;CodeStatementCollection;CopyTo;(System.CodeDom.CodeStatement[],System.Int32);Argument[this];Argument[0].Element;taint;df-generated |
-| System.CodeDom;CodeStatementCollection;Insert;(System.Int32,System.CodeDom.CodeStatement);Argument[1];Argument[this];taint;df-generated |
-| System.CodeDom;CodeStatementCollection;Remove;(System.CodeDom.CodeStatement);Argument[0];Argument[this];taint;df-generated |
-| System.CodeDom;CodeStatementCollection;get_Item;(System.Int32);Argument[this];ReturnValue;taint;df-generated |
-| System.CodeDom;CodeStatementCollection;set_Item;(System.Int32,System.CodeDom.CodeStatement);Argument[1];Argument[this];taint;df-generated |
-| System.CodeDom;CodeTryCatchFinallyStatement;CodeTryCatchFinallyStatement;(System.CodeDom.CodeStatement[],System.CodeDom.CodeCatchClause[]);Argument[0].Element;Argument[this];taint;df-generated |
-| System.CodeDom;CodeTryCatchFinallyStatement;CodeTryCatchFinallyStatement;(System.CodeDom.CodeStatement[],System.CodeDom.CodeCatchClause[]);Argument[1].Element;Argument[this];taint;df-generated |
-| System.CodeDom;CodeTryCatchFinallyStatement;CodeTryCatchFinallyStatement;(System.CodeDom.CodeStatement[],System.CodeDom.CodeCatchClause[],System.CodeDom.CodeStatement[]);Argument[0].Element;Argument[this];taint;df-generated |
-| System.CodeDom;CodeTryCatchFinallyStatement;CodeTryCatchFinallyStatement;(System.CodeDom.CodeStatement[],System.CodeDom.CodeCatchClause[],System.CodeDom.CodeStatement[]);Argument[1].Element;Argument[this];taint;df-generated |
-| System.CodeDom;CodeTryCatchFinallyStatement;CodeTryCatchFinallyStatement;(System.CodeDom.CodeStatement[],System.CodeDom.CodeCatchClause[],System.CodeDom.CodeStatement[]);Argument[2].Element;Argument[this];taint;df-generated |
+| System.CodeDom;CodeStatementCollection;Add;(System.CodeDom.CodeStatement);Argument[0];Argument[this].Property[System.Collections.CollectionBase.List].Element;value;dfc-generated |
+| System.CodeDom;CodeStatementCollection;AddRange;(System.CodeDom.CodeStatementCollection);Argument[0].Property[System.Collections.CollectionBase.List].Element;Argument[this].Property[System.Collections.CollectionBase.List].Element;value;dfc-generated |
+| System.CodeDom;CodeStatementCollection;AddRange;(System.CodeDom.CodeStatement[]);Argument[0].Element;Argument[this].Property[System.Collections.CollectionBase.List].Element;value;dfc-generated |
+| System.CodeDom;CodeStatementCollection;CodeStatementCollection;(System.CodeDom.CodeStatementCollection);Argument[0].Property[System.Collections.CollectionBase.List].Element;Argument[this].Property[System.Collections.CollectionBase.List].Element;value;dfc-generated |
+| System.CodeDom;CodeStatementCollection;CodeStatementCollection;(System.CodeDom.CodeStatement[]);Argument[0].Element;Argument[this].Property[System.Collections.CollectionBase.List].Element;value;dfc-generated |
+| System.CodeDom;CodeStatementCollection;CopyTo;(System.CodeDom.CodeStatement[],System.Int32);Argument[this].Property[System.Collections.CollectionBase.List].Element;Argument[0].Element;value;dfc-generated |
+| System.CodeDom;CodeStatementCollection;Insert;(System.Int32,System.CodeDom.CodeStatement);Argument[1];Argument[this].Property[System.Collections.CollectionBase.List].Element;value;dfc-generated |
+| System.CodeDom;CodeStatementCollection;get_Item;(System.Int32);Argument[this].Property[System.Collections.CollectionBase.List].Element;ReturnValue;value;dfc-generated |
+| System.CodeDom;CodeStatementCollection;set_Item;(System.Int32,System.CodeDom.CodeStatement);Argument[1];Argument[this].Property[System.Collections.CollectionBase.List].Element;value;dfc-generated |
 | System.CodeDom;CodeTypeDeclaration;CodeTypeDeclaration;(System.String);Argument[0];Argument[this];taint;df-generated |
 | System.CodeDom;CodeTypeDeclaration;add_PopulateBaseTypes;(System.EventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.CodeDom;CodeTypeDeclaration;add_PopulateMembers;(System.EventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
@@ -5663,65 +6122,54 @@ summary
 | System.CodeDom;CodeTypeDeclaration;get_Members;();Argument[this];ReturnValue;taint;df-generated |
 | System.CodeDom;CodeTypeDeclaration;remove_PopulateBaseTypes;(System.EventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.CodeDom;CodeTypeDeclaration;remove_PopulateMembers;(System.EventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
-| System.CodeDom;CodeTypeDeclarationCollection;Add;(System.CodeDom.CodeTypeDeclaration);Argument[0];Argument[this];taint;df-generated |
-| System.CodeDom;CodeTypeDeclarationCollection;AddRange;(System.CodeDom.CodeTypeDeclarationCollection);Argument[0].Element;Argument[this];taint;df-generated |
-| System.CodeDom;CodeTypeDeclarationCollection;AddRange;(System.CodeDom.CodeTypeDeclaration[]);Argument[0].Element;Argument[this];taint;df-generated |
-| System.CodeDom;CodeTypeDeclarationCollection;CodeTypeDeclarationCollection;(System.CodeDom.CodeTypeDeclarationCollection);Argument[0].Element;Argument[this];taint;df-generated |
-| System.CodeDom;CodeTypeDeclarationCollection;CodeTypeDeclarationCollection;(System.CodeDom.CodeTypeDeclaration[]);Argument[0].Element;Argument[this];taint;df-generated |
-| System.CodeDom;CodeTypeDeclarationCollection;CopyTo;(System.CodeDom.CodeTypeDeclaration[],System.Int32);Argument[this];Argument[0].Element;taint;df-generated |
-| System.CodeDom;CodeTypeDeclarationCollection;Insert;(System.Int32,System.CodeDom.CodeTypeDeclaration);Argument[1];Argument[this];taint;df-generated |
-| System.CodeDom;CodeTypeDeclarationCollection;Remove;(System.CodeDom.CodeTypeDeclaration);Argument[0];Argument[this];taint;df-generated |
-| System.CodeDom;CodeTypeDeclarationCollection;get_Item;(System.Int32);Argument[this];ReturnValue;taint;df-generated |
-| System.CodeDom;CodeTypeDeclarationCollection;set_Item;(System.Int32,System.CodeDom.CodeTypeDeclaration);Argument[1];Argument[this];taint;df-generated |
+| System.CodeDom;CodeTypeDeclarationCollection;Add;(System.CodeDom.CodeTypeDeclaration);Argument[0];Argument[this].Property[System.Collections.CollectionBase.List].Element;value;dfc-generated |
+| System.CodeDom;CodeTypeDeclarationCollection;AddRange;(System.CodeDom.CodeTypeDeclarationCollection);Argument[0].Property[System.Collections.CollectionBase.List].Element;Argument[this].Property[System.Collections.CollectionBase.List].Element;value;dfc-generated |
+| System.CodeDom;CodeTypeDeclarationCollection;AddRange;(System.CodeDom.CodeTypeDeclaration[]);Argument[0].Element;Argument[this].Property[System.Collections.CollectionBase.List].Element;value;dfc-generated |
+| System.CodeDom;CodeTypeDeclarationCollection;CodeTypeDeclarationCollection;(System.CodeDom.CodeTypeDeclarationCollection);Argument[0].Property[System.Collections.CollectionBase.List].Element;Argument[this].Property[System.Collections.CollectionBase.List].Element;value;dfc-generated |
+| System.CodeDom;CodeTypeDeclarationCollection;CodeTypeDeclarationCollection;(System.CodeDom.CodeTypeDeclaration[]);Argument[0].Element;Argument[this].Property[System.Collections.CollectionBase.List].Element;value;dfc-generated |
+| System.CodeDom;CodeTypeDeclarationCollection;CopyTo;(System.CodeDom.CodeTypeDeclaration[],System.Int32);Argument[this].Property[System.Collections.CollectionBase.List].Element;Argument[0].Element;value;dfc-generated |
+| System.CodeDom;CodeTypeDeclarationCollection;Insert;(System.Int32,System.CodeDom.CodeTypeDeclaration);Argument[1];Argument[this].Property[System.Collections.CollectionBase.List].Element;value;dfc-generated |
+| System.CodeDom;CodeTypeDeclarationCollection;get_Item;(System.Int32);Argument[this].Property[System.Collections.CollectionBase.List].Element;ReturnValue;value;dfc-generated |
+| System.CodeDom;CodeTypeDeclarationCollection;set_Item;(System.Int32,System.CodeDom.CodeTypeDeclaration);Argument[1];Argument[this].Property[System.Collections.CollectionBase.List].Element;value;dfc-generated |
 | System.CodeDom;CodeTypeDelegate;CodeTypeDelegate;(System.String);Argument[0];Argument[this];taint;df-generated |
-| System.CodeDom;CodeTypeMemberCollection;Add;(System.CodeDom.CodeTypeMember);Argument[0];Argument[this];taint;df-generated |
-| System.CodeDom;CodeTypeMemberCollection;AddRange;(System.CodeDom.CodeTypeMemberCollection);Argument[0].Element;Argument[this];taint;df-generated |
-| System.CodeDom;CodeTypeMemberCollection;AddRange;(System.CodeDom.CodeTypeMember[]);Argument[0].Element;Argument[this];taint;df-generated |
-| System.CodeDom;CodeTypeMemberCollection;CodeTypeMemberCollection;(System.CodeDom.CodeTypeMemberCollection);Argument[0].Element;Argument[this];taint;df-generated |
-| System.CodeDom;CodeTypeMemberCollection;CodeTypeMemberCollection;(System.CodeDom.CodeTypeMember[]);Argument[0].Element;Argument[this];taint;df-generated |
-| System.CodeDom;CodeTypeMemberCollection;CopyTo;(System.CodeDom.CodeTypeMember[],System.Int32);Argument[this];Argument[0].Element;taint;df-generated |
-| System.CodeDom;CodeTypeMemberCollection;Insert;(System.Int32,System.CodeDom.CodeTypeMember);Argument[1];Argument[this];taint;df-generated |
-| System.CodeDom;CodeTypeMemberCollection;Remove;(System.CodeDom.CodeTypeMember);Argument[0];Argument[this];taint;df-generated |
-| System.CodeDom;CodeTypeMemberCollection;get_Item;(System.Int32);Argument[this];ReturnValue;taint;df-generated |
-| System.CodeDom;CodeTypeMemberCollection;set_Item;(System.Int32,System.CodeDom.CodeTypeMember);Argument[1];Argument[this];taint;df-generated |
+| System.CodeDom;CodeTypeMemberCollection;Add;(System.CodeDom.CodeTypeMember);Argument[0];Argument[this].Property[System.Collections.CollectionBase.List].Element;value;dfc-generated |
+| System.CodeDom;CodeTypeMemberCollection;AddRange;(System.CodeDom.CodeTypeMemberCollection);Argument[0].Property[System.Collections.CollectionBase.List].Element;Argument[this].Property[System.Collections.CollectionBase.List].Element;value;dfc-generated |
+| System.CodeDom;CodeTypeMemberCollection;AddRange;(System.CodeDom.CodeTypeMember[]);Argument[0].Element;Argument[this].Property[System.Collections.CollectionBase.List].Element;value;dfc-generated |
+| System.CodeDom;CodeTypeMemberCollection;CodeTypeMemberCollection;(System.CodeDom.CodeTypeMemberCollection);Argument[0].Property[System.Collections.CollectionBase.List].Element;Argument[this].Property[System.Collections.CollectionBase.List].Element;value;dfc-generated |
+| System.CodeDom;CodeTypeMemberCollection;CodeTypeMemberCollection;(System.CodeDom.CodeTypeMember[]);Argument[0].Element;Argument[this].Property[System.Collections.CollectionBase.List].Element;value;dfc-generated |
+| System.CodeDom;CodeTypeMemberCollection;CopyTo;(System.CodeDom.CodeTypeMember[],System.Int32);Argument[this].Property[System.Collections.CollectionBase.List].Element;Argument[0].Element;value;dfc-generated |
+| System.CodeDom;CodeTypeMemberCollection;Insert;(System.Int32,System.CodeDom.CodeTypeMember);Argument[1];Argument[this].Property[System.Collections.CollectionBase.List].Element;value;dfc-generated |
+| System.CodeDom;CodeTypeMemberCollection;get_Item;(System.Int32);Argument[this].Property[System.Collections.CollectionBase.List].Element;ReturnValue;value;dfc-generated |
+| System.CodeDom;CodeTypeMemberCollection;set_Item;(System.Int32,System.CodeDom.CodeTypeMember);Argument[1];Argument[this].Property[System.Collections.CollectionBase.List].Element;value;dfc-generated |
 | System.CodeDom;CodeTypeOfExpression;CodeTypeOfExpression;(System.CodeDom.CodeTypeReference);Argument[0];Argument[this];taint;df-generated |
-| System.CodeDom;CodeTypeOfExpression;CodeTypeOfExpression;(System.String);Argument[0];Argument[this];taint;df-generated |
 | System.CodeDom;CodeTypeParameter;CodeTypeParameter;(System.String);Argument[0];Argument[this];taint;df-generated |
-| System.CodeDom;CodeTypeParameterCollection;Add;(System.CodeDom.CodeTypeParameter);Argument[0];Argument[this];taint;df-generated |
-| System.CodeDom;CodeTypeParameterCollection;Add;(System.String);Argument[0];Argument[this];taint;df-generated |
-| System.CodeDom;CodeTypeParameterCollection;AddRange;(System.CodeDom.CodeTypeParameterCollection);Argument[0].Element;Argument[this];taint;df-generated |
-| System.CodeDom;CodeTypeParameterCollection;AddRange;(System.CodeDom.CodeTypeParameter[]);Argument[0].Element;Argument[this];taint;df-generated |
-| System.CodeDom;CodeTypeParameterCollection;CodeTypeParameterCollection;(System.CodeDom.CodeTypeParameterCollection);Argument[0].Element;Argument[this];taint;df-generated |
-| System.CodeDom;CodeTypeParameterCollection;CodeTypeParameterCollection;(System.CodeDom.CodeTypeParameter[]);Argument[0].Element;Argument[this];taint;df-generated |
-| System.CodeDom;CodeTypeParameterCollection;CopyTo;(System.CodeDom.CodeTypeParameter[],System.Int32);Argument[this];Argument[0].Element;taint;df-generated |
-| System.CodeDom;CodeTypeParameterCollection;Insert;(System.Int32,System.CodeDom.CodeTypeParameter);Argument[1];Argument[this];taint;df-generated |
-| System.CodeDom;CodeTypeParameterCollection;Remove;(System.CodeDom.CodeTypeParameter);Argument[0];Argument[this];taint;df-generated |
-| System.CodeDom;CodeTypeParameterCollection;get_Item;(System.Int32);Argument[this];ReturnValue;taint;df-generated |
-| System.CodeDom;CodeTypeParameterCollection;set_Item;(System.Int32,System.CodeDom.CodeTypeParameter);Argument[1];Argument[this];taint;df-generated |
+| System.CodeDom;CodeTypeParameterCollection;Add;(System.CodeDom.CodeTypeParameter);Argument[0];Argument[this].Property[System.Collections.CollectionBase.List].Element;value;dfc-generated |
+| System.CodeDom;CodeTypeParameterCollection;AddRange;(System.CodeDom.CodeTypeParameterCollection);Argument[0].Property[System.Collections.CollectionBase.List].Element;Argument[this].Property[System.Collections.CollectionBase.List].Element;value;dfc-generated |
+| System.CodeDom;CodeTypeParameterCollection;AddRange;(System.CodeDom.CodeTypeParameter[]);Argument[0].Element;Argument[this].Property[System.Collections.CollectionBase.List].Element;value;dfc-generated |
+| System.CodeDom;CodeTypeParameterCollection;CodeTypeParameterCollection;(System.CodeDom.CodeTypeParameterCollection);Argument[0].Property[System.Collections.CollectionBase.List].Element;Argument[this].Property[System.Collections.CollectionBase.List].Element;value;dfc-generated |
+| System.CodeDom;CodeTypeParameterCollection;CodeTypeParameterCollection;(System.CodeDom.CodeTypeParameter[]);Argument[0].Element;Argument[this].Property[System.Collections.CollectionBase.List].Element;value;dfc-generated |
+| System.CodeDom;CodeTypeParameterCollection;CopyTo;(System.CodeDom.CodeTypeParameter[],System.Int32);Argument[this].Property[System.Collections.CollectionBase.List].Element;Argument[0].Element;value;dfc-generated |
+| System.CodeDom;CodeTypeParameterCollection;Insert;(System.Int32,System.CodeDom.CodeTypeParameter);Argument[1];Argument[this].Property[System.Collections.CollectionBase.List].Element;value;dfc-generated |
+| System.CodeDom;CodeTypeParameterCollection;get_Item;(System.Int32);Argument[this].Property[System.Collections.CollectionBase.List].Element;ReturnValue;value;dfc-generated |
+| System.CodeDom;CodeTypeParameterCollection;set_Item;(System.Int32,System.CodeDom.CodeTypeParameter);Argument[1];Argument[this].Property[System.Collections.CollectionBase.List].Element;value;dfc-generated |
 | System.CodeDom;CodeTypeReference;CodeTypeReference;(System.String);Argument[0];Argument[this];taint;df-generated |
 | System.CodeDom;CodeTypeReference;CodeTypeReference;(System.String,System.CodeDom.CodeTypeReferenceOptions);Argument[0];Argument[this];taint;df-generated |
-| System.CodeDom;CodeTypeReference;CodeTypeReference;(System.String,System.CodeDom.CodeTypeReference[]);Argument[1].Element;Argument[this];taint;df-generated |
-| System.CodeDom;CodeTypeReference;get_TypeArguments;();Argument[this];ReturnValue;taint;df-generated |
-| System.CodeDom;CodeTypeReferenceCollection;Add;(System.CodeDom.CodeTypeReference);Argument[0];Argument[this];taint;df-generated |
-| System.CodeDom;CodeTypeReferenceCollection;Add;(System.String);Argument[0];Argument[this];taint;df-generated |
-| System.CodeDom;CodeTypeReferenceCollection;AddRange;(System.CodeDom.CodeTypeReferenceCollection);Argument[0].Element;Argument[this];taint;df-generated |
-| System.CodeDom;CodeTypeReferenceCollection;AddRange;(System.CodeDom.CodeTypeReference[]);Argument[0].Element;Argument[this];taint;df-generated |
-| System.CodeDom;CodeTypeReferenceCollection;CodeTypeReferenceCollection;(System.CodeDom.CodeTypeReferenceCollection);Argument[0].Element;Argument[this];taint;df-generated |
-| System.CodeDom;CodeTypeReferenceCollection;CodeTypeReferenceCollection;(System.CodeDom.CodeTypeReference[]);Argument[0].Element;Argument[this];taint;df-generated |
-| System.CodeDom;CodeTypeReferenceCollection;CopyTo;(System.CodeDom.CodeTypeReference[],System.Int32);Argument[this];Argument[0].Element;taint;df-generated |
-| System.CodeDom;CodeTypeReferenceCollection;Insert;(System.Int32,System.CodeDom.CodeTypeReference);Argument[1];Argument[this];taint;df-generated |
-| System.CodeDom;CodeTypeReferenceCollection;Remove;(System.CodeDom.CodeTypeReference);Argument[0];Argument[this];taint;df-generated |
-| System.CodeDom;CodeTypeReferenceCollection;get_Item;(System.Int32);Argument[this];ReturnValue;taint;df-generated |
-| System.CodeDom;CodeTypeReferenceCollection;set_Item;(System.Int32,System.CodeDom.CodeTypeReference);Argument[1];Argument[this];taint;df-generated |
+| System.CodeDom;CodeTypeReference;get_TypeArguments;();Argument[this].Property[System.CodeDom.CodeTypeReference.ArrayElementType].Property[System.CodeDom.CodeTypeReference.TypeArguments];ReturnValue;value;dfc-generated |
+| System.CodeDom;CodeTypeReferenceCollection;Add;(System.CodeDom.CodeTypeReference);Argument[0];Argument[this].Property[System.Collections.CollectionBase.List].Element;value;dfc-generated |
+| System.CodeDom;CodeTypeReferenceCollection;AddRange;(System.CodeDom.CodeTypeReferenceCollection);Argument[0].Property[System.Collections.CollectionBase.List].Element;Argument[this].Property[System.Collections.CollectionBase.List].Element;value;dfc-generated |
+| System.CodeDom;CodeTypeReferenceCollection;AddRange;(System.CodeDom.CodeTypeReference[]);Argument[0].Element;Argument[this].Property[System.Collections.CollectionBase.List].Element;value;dfc-generated |
+| System.CodeDom;CodeTypeReferenceCollection;CodeTypeReferenceCollection;(System.CodeDom.CodeTypeReferenceCollection);Argument[0].Property[System.Collections.CollectionBase.List].Element;Argument[this].Property[System.Collections.CollectionBase.List].Element;value;dfc-generated |
+| System.CodeDom;CodeTypeReferenceCollection;CodeTypeReferenceCollection;(System.CodeDom.CodeTypeReference[]);Argument[0].Element;Argument[this].Property[System.Collections.CollectionBase.List].Element;value;dfc-generated |
+| System.CodeDom;CodeTypeReferenceCollection;CopyTo;(System.CodeDom.CodeTypeReference[],System.Int32);Argument[this].Property[System.Collections.CollectionBase.List].Element;Argument[0].Element;value;dfc-generated |
+| System.CodeDom;CodeTypeReferenceCollection;Insert;(System.Int32,System.CodeDom.CodeTypeReference);Argument[1];Argument[this].Property[System.Collections.CollectionBase.List].Element;value;dfc-generated |
+| System.CodeDom;CodeTypeReferenceCollection;get_Item;(System.Int32);Argument[this].Property[System.Collections.CollectionBase.List].Element;ReturnValue;value;dfc-generated |
+| System.CodeDom;CodeTypeReferenceCollection;set_Item;(System.Int32,System.CodeDom.CodeTypeReference);Argument[1];Argument[this].Property[System.Collections.CollectionBase.List].Element;value;dfc-generated |
 | System.CodeDom;CodeTypeReferenceExpression;CodeTypeReferenceExpression;(System.CodeDom.CodeTypeReference);Argument[0];Argument[this];taint;df-generated |
-| System.CodeDom;CodeTypeReferenceExpression;CodeTypeReferenceExpression;(System.String);Argument[0];Argument[this];taint;df-generated |
 | System.CodeDom;CodeVariableDeclarationStatement;CodeVariableDeclarationStatement;(System.CodeDom.CodeTypeReference,System.String);Argument[0];Argument[this];taint;df-generated |
 | System.CodeDom;CodeVariableDeclarationStatement;CodeVariableDeclarationStatement;(System.CodeDom.CodeTypeReference,System.String);Argument[1];Argument[this];taint;df-generated |
 | System.CodeDom;CodeVariableDeclarationStatement;CodeVariableDeclarationStatement;(System.CodeDom.CodeTypeReference,System.String,System.CodeDom.CodeExpression);Argument[0];Argument[this];taint;df-generated |
 | System.CodeDom;CodeVariableDeclarationStatement;CodeVariableDeclarationStatement;(System.CodeDom.CodeTypeReference,System.String,System.CodeDom.CodeExpression);Argument[1];Argument[this];taint;df-generated |
-| System.CodeDom;CodeVariableDeclarationStatement;CodeVariableDeclarationStatement;(System.String,System.String);Argument[0];Argument[this];taint;df-generated |
 | System.CodeDom;CodeVariableDeclarationStatement;CodeVariableDeclarationStatement;(System.String,System.String);Argument[1];Argument[this];taint;df-generated |
-| System.CodeDom;CodeVariableDeclarationStatement;CodeVariableDeclarationStatement;(System.String,System.String,System.CodeDom.CodeExpression);Argument[0];Argument[this];taint;df-generated |
 | System.CodeDom;CodeVariableDeclarationStatement;CodeVariableDeclarationStatement;(System.String,System.String,System.CodeDom.CodeExpression);Argument[1];Argument[this];taint;df-generated |
 | System.CodeDom;CodeVariableDeclarationStatement;CodeVariableDeclarationStatement;(System.Type,System.String);Argument[1];Argument[this];taint;df-generated |
 | System.CodeDom;CodeVariableDeclarationStatement;CodeVariableDeclarationStatement;(System.Type,System.String,System.CodeDom.CodeExpression);Argument[1];Argument[this];taint;df-generated |
@@ -5738,8 +6186,7 @@ summary
 | System.Collections.Concurrent;BlockingCollection<T>;TryAdd;(T,System.Int32);Argument[0];Argument[this];taint;df-generated |
 | System.Collections.Concurrent;BlockingCollection<T>;TryAdd;(T,System.Int32,System.Threading.CancellationToken);Argument[0];Argument[this];taint;df-generated |
 | System.Collections.Concurrent;BlockingCollection<T>;TryAdd;(T,System.TimeSpan);Argument[0];Argument[this];taint;df-generated |
-| System.Collections.Concurrent;BlockingCollection<T>;get_SyncRoot;();Argument[this];ReturnValue;taint;df-generated |
-| System.Collections.Concurrent;BlockingCollection<T>;get_SyncRoot;();Argument[this];ReturnValue;value;df-generated |
+| System.Collections.Concurrent;BlockingCollection<T>;get_SyncRoot;();Argument[this];ReturnValue;value;dfc-generated |
 | System.Collections.Concurrent;ConcurrentBag<T>;Add;(T);Argument[0];Argument[this].Element;value;manual |
 | System.Collections.Concurrent;ConcurrentBag<T>;Clear;();Argument[this].WithoutElement;Argument[this];value;manual |
 | System.Collections.Concurrent;ConcurrentBag<T>;CopyTo;(System.Array,System.Int32);Argument[this].Element;Argument[0].Element;value;manual |
@@ -5747,11 +6194,10 @@ summary
 | System.Collections.Concurrent;ConcurrentBag<T>;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.Generic.IEnumerator`1.Current];value;manual |
 | System.Collections.Concurrent;ConcurrentBag<T>;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.IEnumerator.Current];value;manual |
 | System.Collections.Concurrent;ConcurrentBag<T>;ToArray;();Argument[this];ReturnValue;taint;df-generated |
-| System.Collections.Concurrent;ConcurrentBag<T>;TryAdd;(T);Argument[0];Argument[this];taint;df-generated |
+| System.Collections.Concurrent;ConcurrentBag<T>;TryAdd;(T);Argument[0];Argument[this].Element;value;dfc-generated |
 | System.Collections.Concurrent;ConcurrentBag<T>;TryPeek;(T);Argument[this];ReturnValue;taint;df-generated |
 | System.Collections.Concurrent;ConcurrentBag<T>;TryTake;(T);Argument[this];ReturnValue;taint;df-generated |
-| System.Collections.Concurrent;ConcurrentBag<T>;get_SyncRoot;();Argument[this];ReturnValue;taint;df-generated |
-| System.Collections.Concurrent;ConcurrentBag<T>;get_SyncRoot;();Argument[this];ReturnValue;value;df-generated |
+| System.Collections.Concurrent;ConcurrentBag<T>;get_SyncRoot;();Argument[this];ReturnValue;value;dfc-generated |
 | System.Collections.Concurrent;ConcurrentDictionary<TKey,TValue>;Add;(System.Collections.Generic.KeyValuePair<TKey,TValue>);Argument[0].Property[System.Collections.Generic.KeyValuePair`2.Key];Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Key];value;manual |
 | System.Collections.Concurrent;ConcurrentDictionary<TKey,TValue>;Add;(System.Collections.Generic.KeyValuePair<TKey,TValue>);Argument[0].Property[System.Collections.Generic.KeyValuePair`2.Value];Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Value];value;manual |
 | System.Collections.Concurrent;ConcurrentDictionary<TKey,TValue>;Add;(System.Collections.Generic.KeyValuePair<TKey,TValue>);Argument[0];Argument[this].Element;value;manual |
@@ -5759,11 +6205,42 @@ summary
 | System.Collections.Concurrent;ConcurrentDictionary<TKey,TValue>;Add;(System.Object,System.Object);Argument[1];Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Value];value;manual |
 | System.Collections.Concurrent;ConcurrentDictionary<TKey,TValue>;Add;(TKey,TValue);Argument[0];Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Key];value;manual |
 | System.Collections.Concurrent;ConcurrentDictionary<TKey,TValue>;Add;(TKey,TValue);Argument[1];Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Value];value;manual |
+| System.Collections.Concurrent;ConcurrentDictionary<TKey,TValue>;AddOrUpdate;(TKey,System.Func<TKey,TValue>,System.Func<TKey,TValue,TValue>);Argument[0];Argument[1].Parameter[0];value;dfc-generated |
+| System.Collections.Concurrent;ConcurrentDictionary<TKey,TValue>;AddOrUpdate;(TKey,System.Func<TKey,TValue>,System.Func<TKey,TValue,TValue>);Argument[0];Argument[1].Parameter[0];value;hq-generated |
+| System.Collections.Concurrent;ConcurrentDictionary<TKey,TValue>;AddOrUpdate;(TKey,System.Func<TKey,TValue>,System.Func<TKey,TValue,TValue>);Argument[0];Argument[2].Parameter[0];value;dfc-generated |
+| System.Collections.Concurrent;ConcurrentDictionary<TKey,TValue>;AddOrUpdate;(TKey,System.Func<TKey,TValue>,System.Func<TKey,TValue,TValue>);Argument[0];Argument[2].Parameter[0];value;hq-generated |
+| System.Collections.Concurrent;ConcurrentDictionary<TKey,TValue>;AddOrUpdate;(TKey,System.Func<TKey,TValue>,System.Func<TKey,TValue,TValue>);Argument[1].ReturnValue;ReturnValue;value;dfc-generated |
+| System.Collections.Concurrent;ConcurrentDictionary<TKey,TValue>;AddOrUpdate;(TKey,System.Func<TKey,TValue>,System.Func<TKey,TValue,TValue>);Argument[1].ReturnValue;ReturnValue;value;hq-generated |
+| System.Collections.Concurrent;ConcurrentDictionary<TKey,TValue>;AddOrUpdate;(TKey,System.Func<TKey,TValue>,System.Func<TKey,TValue,TValue>);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | System.Collections.Concurrent;ConcurrentDictionary<TKey,TValue>;AddOrUpdate;(TKey,System.Func<TKey,TValue>,System.Func<TKey,TValue,TValue>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
+| System.Collections.Concurrent;ConcurrentDictionary<TKey,TValue>;AddOrUpdate;(TKey,System.Func<TKey,TValue>,System.Func<TKey,TValue,TValue>);Argument[2].ReturnValue;ReturnValue;value;dfc-generated |
+| System.Collections.Concurrent;ConcurrentDictionary<TKey,TValue>;AddOrUpdate;(TKey,System.Func<TKey,TValue>,System.Func<TKey,TValue,TValue>);Argument[2].ReturnValue;ReturnValue;value;hq-generated |
+| System.Collections.Concurrent;ConcurrentDictionary<TKey,TValue>;AddOrUpdate;(TKey,System.Func<TKey,TValue>,System.Func<TKey,TValue,TValue>);Argument[2];Argument[2].Parameter[delegate-self];value;dfc-generated |
 | System.Collections.Concurrent;ConcurrentDictionary<TKey,TValue>;AddOrUpdate;(TKey,System.Func<TKey,TValue>,System.Func<TKey,TValue,TValue>);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
+| System.Collections.Concurrent;ConcurrentDictionary<TKey,TValue>;AddOrUpdate;(TKey,TValue,System.Func<TKey,TValue,TValue>);Argument[0];Argument[2].Parameter[0];value;dfc-generated |
+| System.Collections.Concurrent;ConcurrentDictionary<TKey,TValue>;AddOrUpdate;(TKey,TValue,System.Func<TKey,TValue,TValue>);Argument[0];Argument[2].Parameter[0];value;hq-generated |
+| System.Collections.Concurrent;ConcurrentDictionary<TKey,TValue>;AddOrUpdate;(TKey,TValue,System.Func<TKey,TValue,TValue>);Argument[1];ReturnValue;value;dfc-generated |
+| System.Collections.Concurrent;ConcurrentDictionary<TKey,TValue>;AddOrUpdate;(TKey,TValue,System.Func<TKey,TValue,TValue>);Argument[1];ReturnValue;value;hq-generated |
+| System.Collections.Concurrent;ConcurrentDictionary<TKey,TValue>;AddOrUpdate;(TKey,TValue,System.Func<TKey,TValue,TValue>);Argument[2].ReturnValue;ReturnValue;value;dfc-generated |
+| System.Collections.Concurrent;ConcurrentDictionary<TKey,TValue>;AddOrUpdate;(TKey,TValue,System.Func<TKey,TValue,TValue>);Argument[2].ReturnValue;ReturnValue;value;hq-generated |
+| System.Collections.Concurrent;ConcurrentDictionary<TKey,TValue>;AddOrUpdate;(TKey,TValue,System.Func<TKey,TValue,TValue>);Argument[2];Argument[2].Parameter[delegate-self];value;dfc-generated |
 | System.Collections.Concurrent;ConcurrentDictionary<TKey,TValue>;AddOrUpdate;(TKey,TValue,System.Func<TKey,TValue,TValue>);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
+| System.Collections.Concurrent;ConcurrentDictionary<TKey,TValue>;AddOrUpdate<TArg>;(TKey,System.Func<TKey,TArg,TValue>,System.Func<TKey,TValue,TArg,TValue>,TArg);Argument[0];Argument[1].Parameter[0];value;dfc-generated |
+| System.Collections.Concurrent;ConcurrentDictionary<TKey,TValue>;AddOrUpdate<TArg>;(TKey,System.Func<TKey,TArg,TValue>,System.Func<TKey,TValue,TArg,TValue>,TArg);Argument[0];Argument[1].Parameter[0];value;hq-generated |
+| System.Collections.Concurrent;ConcurrentDictionary<TKey,TValue>;AddOrUpdate<TArg>;(TKey,System.Func<TKey,TArg,TValue>,System.Func<TKey,TValue,TArg,TValue>,TArg);Argument[0];Argument[2].Parameter[0];value;dfc-generated |
+| System.Collections.Concurrent;ConcurrentDictionary<TKey,TValue>;AddOrUpdate<TArg>;(TKey,System.Func<TKey,TArg,TValue>,System.Func<TKey,TValue,TArg,TValue>,TArg);Argument[0];Argument[2].Parameter[0];value;hq-generated |
+| System.Collections.Concurrent;ConcurrentDictionary<TKey,TValue>;AddOrUpdate<TArg>;(TKey,System.Func<TKey,TArg,TValue>,System.Func<TKey,TValue,TArg,TValue>,TArg);Argument[1].ReturnValue;ReturnValue;value;dfc-generated |
+| System.Collections.Concurrent;ConcurrentDictionary<TKey,TValue>;AddOrUpdate<TArg>;(TKey,System.Func<TKey,TArg,TValue>,System.Func<TKey,TValue,TArg,TValue>,TArg);Argument[1].ReturnValue;ReturnValue;value;hq-generated |
+| System.Collections.Concurrent;ConcurrentDictionary<TKey,TValue>;AddOrUpdate<TArg>;(TKey,System.Func<TKey,TArg,TValue>,System.Func<TKey,TValue,TArg,TValue>,TArg);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | System.Collections.Concurrent;ConcurrentDictionary<TKey,TValue>;AddOrUpdate<TArg>;(TKey,System.Func<TKey,TArg,TValue>,System.Func<TKey,TValue,TArg,TValue>,TArg);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
+| System.Collections.Concurrent;ConcurrentDictionary<TKey,TValue>;AddOrUpdate<TArg>;(TKey,System.Func<TKey,TArg,TValue>,System.Func<TKey,TValue,TArg,TValue>,TArg);Argument[2].ReturnValue;ReturnValue;value;dfc-generated |
+| System.Collections.Concurrent;ConcurrentDictionary<TKey,TValue>;AddOrUpdate<TArg>;(TKey,System.Func<TKey,TArg,TValue>,System.Func<TKey,TValue,TArg,TValue>,TArg);Argument[2].ReturnValue;ReturnValue;value;hq-generated |
+| System.Collections.Concurrent;ConcurrentDictionary<TKey,TValue>;AddOrUpdate<TArg>;(TKey,System.Func<TKey,TArg,TValue>,System.Func<TKey,TValue,TArg,TValue>,TArg);Argument[2];Argument[2].Parameter[delegate-self];value;dfc-generated |
 | System.Collections.Concurrent;ConcurrentDictionary<TKey,TValue>;AddOrUpdate<TArg>;(TKey,System.Func<TKey,TArg,TValue>,System.Func<TKey,TValue,TArg,TValue>,TArg);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
+| System.Collections.Concurrent;ConcurrentDictionary<TKey,TValue>;AddOrUpdate<TArg>;(TKey,System.Func<TKey,TArg,TValue>,System.Func<TKey,TValue,TArg,TValue>,TArg);Argument[3];Argument[1].Parameter[1];value;dfc-generated |
+| System.Collections.Concurrent;ConcurrentDictionary<TKey,TValue>;AddOrUpdate<TArg>;(TKey,System.Func<TKey,TArg,TValue>,System.Func<TKey,TValue,TArg,TValue>,TArg);Argument[3];Argument[1].Parameter[1];value;hq-generated |
+| System.Collections.Concurrent;ConcurrentDictionary<TKey,TValue>;AddOrUpdate<TArg>;(TKey,System.Func<TKey,TArg,TValue>,System.Func<TKey,TValue,TArg,TValue>,TArg);Argument[3];Argument[2].Parameter[2];value;dfc-generated |
+| System.Collections.Concurrent;ConcurrentDictionary<TKey,TValue>;AddOrUpdate<TArg>;(TKey,System.Func<TKey,TArg,TValue>,System.Func<TKey,TValue,TArg,TValue>,TArg);Argument[3];Argument[2].Parameter[2];value;hq-generated |
 | System.Collections.Concurrent;ConcurrentDictionary<TKey,TValue>;Clear;();Argument[this].WithoutElement;Argument[this];value;manual |
 | System.Collections.Concurrent;ConcurrentDictionary<TKey,TValue>;ConcurrentDictionary;(System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<TKey,TValue>>);Argument[0].Element.Property[System.Collections.Generic.KeyValuePair`2.Key];Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Key];value;manual |
 | System.Collections.Concurrent;ConcurrentDictionary<TKey,TValue>;ConcurrentDictionary;(System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<TKey,TValue>>);Argument[0].Element.Property[System.Collections.Generic.KeyValuePair`2.Value];Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Value];value;manual |
@@ -5776,15 +6253,26 @@ summary
 | System.Collections.Concurrent;ConcurrentDictionary<TKey,TValue>;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.Generic.IEnumerator`1.Current];value;manual |
 | System.Collections.Concurrent;ConcurrentDictionary<TKey,TValue>;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.IEnumerator.Current];value;manual |
 | System.Collections.Concurrent;ConcurrentDictionary<TKey,TValue>;GetEnumerator;();Argument[this];ReturnValue;taint;df-generated |
+| System.Collections.Concurrent;ConcurrentDictionary<TKey,TValue>;GetOrAdd;(TKey,System.Func<TKey,TValue>);Argument[0];Argument[1].Parameter[0];value;dfc-generated |
+| System.Collections.Concurrent;ConcurrentDictionary<TKey,TValue>;GetOrAdd;(TKey,System.Func<TKey,TValue>);Argument[0];Argument[1].Parameter[0];value;hq-generated |
+| System.Collections.Concurrent;ConcurrentDictionary<TKey,TValue>;GetOrAdd;(TKey,System.Func<TKey,TValue>);Argument[1].ReturnValue;ReturnValue;value;dfc-generated |
+| System.Collections.Concurrent;ConcurrentDictionary<TKey,TValue>;GetOrAdd;(TKey,System.Func<TKey,TValue>);Argument[1].ReturnValue;ReturnValue;value;hq-generated |
+| System.Collections.Concurrent;ConcurrentDictionary<TKey,TValue>;GetOrAdd;(TKey,System.Func<TKey,TValue>);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | System.Collections.Concurrent;ConcurrentDictionary<TKey,TValue>;GetOrAdd;(TKey,System.Func<TKey,TValue>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
-| System.Collections.Concurrent;ConcurrentDictionary<TKey,TValue>;GetOrAdd;(TKey,TValue);Argument[1];ReturnValue;taint;df-generated |
+| System.Collections.Concurrent;ConcurrentDictionary<TKey,TValue>;GetOrAdd;(TKey,TValue);Argument[1];ReturnValue;value;dfc-generated |
+| System.Collections.Concurrent;ConcurrentDictionary<TKey,TValue>;GetOrAdd<TArg>;(TKey,System.Func<TKey,TArg,TValue>,TArg);Argument[0];Argument[1].Parameter[0];value;dfc-generated |
+| System.Collections.Concurrent;ConcurrentDictionary<TKey,TValue>;GetOrAdd<TArg>;(TKey,System.Func<TKey,TArg,TValue>,TArg);Argument[0];Argument[1].Parameter[0];value;hq-generated |
+| System.Collections.Concurrent;ConcurrentDictionary<TKey,TValue>;GetOrAdd<TArg>;(TKey,System.Func<TKey,TArg,TValue>,TArg);Argument[1].ReturnValue;ReturnValue;value;dfc-generated |
+| System.Collections.Concurrent;ConcurrentDictionary<TKey,TValue>;GetOrAdd<TArg>;(TKey,System.Func<TKey,TArg,TValue>,TArg);Argument[1].ReturnValue;ReturnValue;value;hq-generated |
+| System.Collections.Concurrent;ConcurrentDictionary<TKey,TValue>;GetOrAdd<TArg>;(TKey,System.Func<TKey,TArg,TValue>,TArg);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | System.Collections.Concurrent;ConcurrentDictionary<TKey,TValue>;GetOrAdd<TArg>;(TKey,System.Func<TKey,TArg,TValue>,TArg);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
+| System.Collections.Concurrent;ConcurrentDictionary<TKey,TValue>;GetOrAdd<TArg>;(TKey,System.Func<TKey,TArg,TValue>,TArg);Argument[2];Argument[1].Parameter[1];value;dfc-generated |
+| System.Collections.Concurrent;ConcurrentDictionary<TKey,TValue>;GetOrAdd<TArg>;(TKey,System.Func<TKey,TArg,TValue>,TArg);Argument[2];Argument[1].Parameter[1];value;hq-generated |
 | System.Collections.Concurrent;ConcurrentDictionary<TKey,TValue>;get_Comparer;();Argument[this];ReturnValue;taint;df-generated |
 | System.Collections.Concurrent;ConcurrentDictionary<TKey,TValue>;get_Item;(System.Object);Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Value];ReturnValue;value;manual |
 | System.Collections.Concurrent;ConcurrentDictionary<TKey,TValue>;get_Item;(TKey);Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Value];ReturnValue;value;manual |
 | System.Collections.Concurrent;ConcurrentDictionary<TKey,TValue>;get_Keys;();Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Key];ReturnValue.Element;value;manual |
-| System.Collections.Concurrent;ConcurrentDictionary<TKey,TValue>;get_SyncRoot;();Argument[this];ReturnValue;taint;df-generated |
-| System.Collections.Concurrent;ConcurrentDictionary<TKey,TValue>;get_SyncRoot;();Argument[this];ReturnValue;value;df-generated |
+| System.Collections.Concurrent;ConcurrentDictionary<TKey,TValue>;get_SyncRoot;();Argument[this];ReturnValue;value;dfc-generated |
 | System.Collections.Concurrent;ConcurrentDictionary<TKey,TValue>;get_Values;();Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Value];ReturnValue.Element;value;manual |
 | System.Collections.Concurrent;ConcurrentDictionary<TKey,TValue>;set_Item;(System.Object,System.Object);Argument[0];Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Key];value;manual |
 | System.Collections.Concurrent;ConcurrentDictionary<TKey,TValue>;set_Item;(System.Object,System.Object);Argument[1];Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Value];value;manual |
@@ -5795,22 +6283,21 @@ summary
 | System.Collections.Concurrent;ConcurrentQueue<T>;CopyTo;(T[],System.Int32);Argument[this].Element;Argument[0].Element;value;manual |
 | System.Collections.Concurrent;ConcurrentQueue<T>;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.Generic.IEnumerator`1.Current];value;manual |
 | System.Collections.Concurrent;ConcurrentQueue<T>;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.IEnumerator.Current];value;manual |
-| System.Collections.Concurrent;ConcurrentQueue<T>;get_SyncRoot;();Argument[this];ReturnValue;taint;df-generated |
-| System.Collections.Concurrent;ConcurrentQueue<T>;get_SyncRoot;();Argument[this];ReturnValue;value;df-generated |
+| System.Collections.Concurrent;ConcurrentQueue<T>;get_SyncRoot;();Argument[this];ReturnValue;value;dfc-generated |
 | System.Collections.Concurrent;ConcurrentStack<T>;Clear;();Argument[this].WithoutElement;Argument[this];value;manual |
-| System.Collections.Concurrent;ConcurrentStack<T>;ConcurrentStack;(System.Collections.Generic.IEnumerable<T>);Argument[0].Element;Argument[this];taint;df-generated |
+| System.Collections.Concurrent;ConcurrentStack<T>;ConcurrentStack;(System.Collections.Generic.IEnumerable<T>);Argument[0].Element;Argument[this].SyntheticField[System.Collections.Concurrent.ConcurrentStack`1._head].SyntheticField[System.Collections.Concurrent.ConcurrentStack`1+Node._value];value;dfc-generated |
 | System.Collections.Concurrent;ConcurrentStack<T>;CopyTo;(System.Array,System.Int32);Argument[this].Element;Argument[0].Element;value;manual |
 | System.Collections.Concurrent;ConcurrentStack<T>;CopyTo;(T[],System.Int32);Argument[this].Element;Argument[0].Element;value;manual |
 | System.Collections.Concurrent;ConcurrentStack<T>;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.Generic.IEnumerator`1.Current];value;manual |
 | System.Collections.Concurrent;ConcurrentStack<T>;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.IEnumerator.Current];value;manual |
-| System.Collections.Concurrent;ConcurrentStack<T>;TryPeek;(T);Argument[this];ReturnValue;taint;df-generated |
-| System.Collections.Concurrent;ConcurrentStack<T>;TryPop;(T);Argument[this];ReturnValue;taint;df-generated |
-| System.Collections.Concurrent;ConcurrentStack<T>;TryPopRange;(T[]);Argument[this];Argument[0].Element;taint;df-generated |
-| System.Collections.Concurrent;ConcurrentStack<T>;TryPopRange;(T[],System.Int32,System.Int32);Argument[this];Argument[0].Element;taint;df-generated |
-| System.Collections.Concurrent;ConcurrentStack<T>;TryTake;(T);Argument[this];ReturnValue;taint;df-generated |
-| System.Collections.Concurrent;ConcurrentStack<T>;get_SyncRoot;();Argument[this];ReturnValue;taint;df-generated |
-| System.Collections.Concurrent;ConcurrentStack<T>;get_SyncRoot;();Argument[this];ReturnValue;value;df-generated |
+| System.Collections.Concurrent;ConcurrentStack<T>;TryPeek;(T);Argument[this].SyntheticField[System.Collections.Concurrent.ConcurrentStack`1._head].SyntheticField[System.Collections.Concurrent.ConcurrentStack`1+Node._value];ReturnValue;value;dfc-generated |
+| System.Collections.Concurrent;ConcurrentStack<T>;TryPop;(T);Argument[this].SyntheticField[System.Collections.Concurrent.ConcurrentStack`1._head].SyntheticField[System.Collections.Concurrent.ConcurrentStack`1+Node._value];ReturnValue;value;dfc-generated |
+| System.Collections.Concurrent;ConcurrentStack<T>;TryPopRange;(T[]);Argument[this].SyntheticField[System.Collections.Concurrent.ConcurrentStack`1._head].SyntheticField[System.Collections.Concurrent.ConcurrentStack`1+Node._value];Argument[0].Element;value;dfc-generated |
+| System.Collections.Concurrent;ConcurrentStack<T>;TryPopRange;(T[],System.Int32,System.Int32);Argument[this].SyntheticField[System.Collections.Concurrent.ConcurrentStack`1._head].SyntheticField[System.Collections.Concurrent.ConcurrentStack`1+Node._value];Argument[0].Element;value;dfc-generated |
+| System.Collections.Concurrent;ConcurrentStack<T>;TryTake;(T);Argument[this].SyntheticField[System.Collections.Concurrent.ConcurrentStack`1._head].SyntheticField[System.Collections.Concurrent.ConcurrentStack`1+Node._value];ReturnValue;value;dfc-generated |
+| System.Collections.Concurrent;ConcurrentStack<T>;get_SyncRoot;();Argument[this];ReturnValue;value;dfc-generated |
 | System.Collections.Concurrent;IProducerConsumerCollection<T>;CopyTo;(T[],System.Int32);Argument[this].Element;Argument[0].Element;value;manual |
+| System.Collections.Concurrent;OrderablePartitioner<TSource>;GetDynamicPartitions;();Argument[this];ReturnValue;taint;df-generated |
 | System.Collections.Concurrent;Partitioner;Create<TSource>;(System.Collections.Generic.IEnumerable<TSource>);Argument[0].Element;ReturnValue;taint;df-generated |
 | System.Collections.Concurrent;Partitioner;Create<TSource>;(System.Collections.Generic.IEnumerable<TSource>,System.Collections.Concurrent.EnumerablePartitionerOptions);Argument[0].Element;ReturnValue;taint;df-generated |
 | System.Collections.Concurrent;Partitioner;Create<TSource>;(System.Collections.Generic.IList<TSource>,System.Boolean);Argument[0].Element;ReturnValue;taint;df-generated |
@@ -5819,7 +6306,10 @@ summary
 | System.Collections.Frozen;FrozenDictionary;ToFrozenDictionary<TSource,TKey,TElement>;(System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,TKey>,System.Func<TSource,TElement>,System.Collections.Generic.IEqualityComparer<TKey>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
 | System.Collections.Frozen;FrozenDictionary;ToFrozenDictionary<TSource,TKey,TElement>;(System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,TKey>,System.Func<TSource,TElement>,System.Collections.Generic.IEqualityComparer<TKey>);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
 | System.Collections.Frozen;FrozenDictionary;ToFrozenDictionary<TSource,TKey>;(System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,TKey>,System.Collections.Generic.IEqualityComparer<TKey>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
+| System.Collections.Frozen;FrozenDictionary<TKey,TValue>+Enumerator;get_Current;();Argument[this].Property[System.Collections.Frozen.FrozenDictionary`2+Enumerator.Current];ReturnValue;value;df-generated |
+| System.Collections.Frozen;FrozenDictionary<TKey,TValue>+Enumerator;get_Current;();Argument[this].Property[System.Collections.Frozen.FrozenDictionary`2+Enumerator.Current];ReturnValue;value;dfc-generated |
 | System.Collections.Frozen;FrozenDictionary<TKey,TValue>+Enumerator;get_Current;();Argument[this];ReturnValue;taint;df-generated |
+| System.Collections.Frozen;FrozenDictionary<TKey,TValue>+Enumerator;get_Current;();Argument[this];ReturnValue;taint;dfc-generated |
 | System.Collections.Frozen;FrozenDictionary<TKey,TValue>;Add;(System.Collections.Generic.KeyValuePair<TKey,TValue>);Argument[0];Argument[this].Element;value;manual |
 | System.Collections.Frozen;FrozenDictionary<TKey,TValue>;Add;(System.Object,System.Object);Argument[0];Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Key];value;manual |
 | System.Collections.Frozen;FrozenDictionary<TKey,TValue>;Add;(System.Object,System.Object);Argument[1];Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Value];value;manual |
@@ -5835,8 +6325,7 @@ summary
 | System.Collections.Frozen;FrozenDictionary<TKey,TValue>;get_Item;(TKey);Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Value];ReturnValue;value;manual |
 | System.Collections.Frozen;FrozenDictionary<TKey,TValue>;get_Keys;();Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Key];ReturnValue.Element;value;manual |
 | System.Collections.Frozen;FrozenDictionary<TKey,TValue>;get_Keys;();Argument[this];ReturnValue;taint;df-generated |
-| System.Collections.Frozen;FrozenDictionary<TKey,TValue>;get_SyncRoot;();Argument[this];ReturnValue;taint;df-generated |
-| System.Collections.Frozen;FrozenDictionary<TKey,TValue>;get_SyncRoot;();Argument[this];ReturnValue;value;df-generated |
+| System.Collections.Frozen;FrozenDictionary<TKey,TValue>;get_SyncRoot;();Argument[this];ReturnValue;value;dfc-generated |
 | System.Collections.Frozen;FrozenDictionary<TKey,TValue>;get_Values;();Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Value];ReturnValue.Element;value;manual |
 | System.Collections.Frozen;FrozenDictionary<TKey,TValue>;get_Values;();Argument[this];ReturnValue;taint;df-generated |
 | System.Collections.Frozen;FrozenDictionary<TKey,TValue>;set_Item;(System.Object,System.Object);Argument[0];Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Key];value;manual |
@@ -5844,30 +6333,30 @@ summary
 | System.Collections.Frozen;FrozenDictionary<TKey,TValue>;set_Item;(TKey,TValue);Argument[0];Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Key];value;manual |
 | System.Collections.Frozen;FrozenDictionary<TKey,TValue>;set_Item;(TKey,TValue);Argument[1];Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Value];value;manual |
 | System.Collections.Frozen;FrozenSet;ToFrozenSet<T>;(System.Collections.Generic.IEnumerable<T>,System.Collections.Generic.IEqualityComparer<T>);Argument[0].Element;ReturnValue;taint;df-generated |
+| System.Collections.Frozen;FrozenSet<T>+Enumerator;get_Current;();Argument[this].Property[System.Collections.Frozen.FrozenSet`1+Enumerator.Current];ReturnValue;value;df-generated |
+| System.Collections.Frozen;FrozenSet<T>+Enumerator;get_Current;();Argument[this].Property[System.Collections.Frozen.FrozenSet`1+Enumerator.Current];ReturnValue;value;dfc-generated |
 | System.Collections.Frozen;FrozenSet<T>+Enumerator;get_Current;();Argument[this];ReturnValue;taint;df-generated |
+| System.Collections.Frozen;FrozenSet<T>+Enumerator;get_Current;();Argument[this];ReturnValue;taint;dfc-generated |
 | System.Collections.Frozen;FrozenSet<T>;Add;(T);Argument[0];Argument[this].Element;value;manual |
 | System.Collections.Frozen;FrozenSet<T>;Clear;();Argument[this].WithoutElement;Argument[this];value;manual |
 | System.Collections.Frozen;FrozenSet<T>;CopyTo;(System.Array,System.Int32);Argument[this].Element;Argument[0].Element;value;manual |
-| System.Collections.Frozen;FrozenSet<T>;CopyTo;(System.Span<T>);Argument[this];Argument[0];taint;df-generated |
+| System.Collections.Frozen;FrozenSet<T>;CopyTo;(System.Span<T>);Argument[this].Property[System.Collections.Frozen.FrozenSet`1.Items].Element;Argument[0].Element;value;dfc-generated |
 | System.Collections.Frozen;FrozenSet<T>;CopyTo;(T[],System.Int32);Argument[this].Element;Argument[0].Element;value;manual |
 | System.Collections.Frozen;FrozenSet<T>;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.Generic.IEnumerator`1.Current];value;manual |
 | System.Collections.Frozen;FrozenSet<T>;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.IEnumerator.Current];value;manual |
-| System.Collections.Frozen;FrozenSet<T>;TryGetValue;(T,T);Argument[this];ReturnValue;taint;df-generated |
+| System.Collections.Frozen;FrozenSet<T>;TryGetValue;(T,T);Argument[this].Property[System.Collections.Frozen.FrozenSet`1.Items].Element;ReturnValue;value;dfc-generated |
 | System.Collections.Frozen;FrozenSet<T>;get_Items;();Argument[this];ReturnValue;taint;df-generated |
-| System.Collections.Frozen;FrozenSet<T>;get_SyncRoot;();Argument[this];ReturnValue;taint;df-generated |
-| System.Collections.Frozen;FrozenSet<T>;get_SyncRoot;();Argument[this];ReturnValue;value;df-generated |
+| System.Collections.Frozen;FrozenSet<T>;get_SyncRoot;();Argument[this];ReturnValue;value;dfc-generated |
 | System.Collections.Generic;CollectionExtensions;AsReadOnly<T>;(System.Collections.Generic.IList<T>);Argument[0].Element;ReturnValue;taint;df-generated |
-| System.Collections.Generic;CollectionExtensions;AsReadOnly<TKey,TValue>;(System.Collections.Generic.IDictionary<TKey,TValue>);Argument[0].Element;ReturnValue;taint;df-generated |
+| System.Collections.Generic;CollectionExtensions;AsReadOnly<TKey,TValue>;(System.Collections.Generic.IDictionary<TKey,TValue>);Argument[0].Element.Property[System.Collections.Generic.KeyValuePair`2.Key];ReturnValue.Element.Property[System.Collections.Generic.KeyValuePair`2.Key];value;dfc-generated |
+| System.Collections.Generic;CollectionExtensions;AsReadOnly<TKey,TValue>;(System.Collections.Generic.IDictionary<TKey,TValue>);Argument[0].Element.Property[System.Collections.Generic.KeyValuePair`2.Value];ReturnValue.Element.Property[System.Collections.Generic.KeyValuePair`2.Value];value;dfc-generated |
 | System.Collections.Generic;CollectionExtensions;CopyTo<T>;(System.Collections.Generic.List<T>,System.Span<T>);Argument[0].Element;Argument[1];taint;df-generated |
-| System.Collections.Generic;CollectionExtensions;GetValueOrDefault<TKey,TValue>;(System.Collections.Generic.IReadOnlyDictionary<TKey,TValue>,TKey);Argument[0].Element;ReturnValue;taint;df-generated |
-| System.Collections.Generic;CollectionExtensions;GetValueOrDefault<TKey,TValue>;(System.Collections.Generic.IReadOnlyDictionary<TKey,TValue>,TKey);Argument[1];ReturnValue;taint;df-generated |
-| System.Collections.Generic;CollectionExtensions;GetValueOrDefault<TKey,TValue>;(System.Collections.Generic.IReadOnlyDictionary<TKey,TValue>,TKey,TValue);Argument[0].Element;ReturnValue;taint;df-generated |
-| System.Collections.Generic;CollectionExtensions;GetValueOrDefault<TKey,TValue>;(System.Collections.Generic.IReadOnlyDictionary<TKey,TValue>,TKey,TValue);Argument[1];ReturnValue;taint;df-generated |
-| System.Collections.Generic;CollectionExtensions;GetValueOrDefault<TKey,TValue>;(System.Collections.Generic.IReadOnlyDictionary<TKey,TValue>,TKey,TValue);Argument[2];ReturnValue;taint;df-generated |
+| System.Collections.Generic;CollectionExtensions;GetValueOrDefault<TKey,TValue>;(System.Collections.Generic.IReadOnlyDictionary<TKey,TValue>,TKey,TValue);Argument[2];ReturnValue;value;dfc-generated |
 | System.Collections.Generic;CollectionExtensions;Remove<TKey,TValue>;(System.Collections.Generic.IDictionary<TKey,TValue>,TKey,TValue);Argument[0].Element;ReturnValue;taint;df-generated |
-| System.Collections.Generic;CollectionExtensions;TryAdd<TKey,TValue>;(System.Collections.Generic.IDictionary<TKey,TValue>,TKey,TValue);Argument[0].Element;Argument[2];taint;df-generated |
-| System.Collections.Generic;CollectionExtensions;TryAdd<TKey,TValue>;(System.Collections.Generic.IDictionary<TKey,TValue>,TKey,TValue);Argument[1];Argument[0].Element;taint;df-generated |
-| System.Collections.Generic;CollectionExtensions;TryAdd<TKey,TValue>;(System.Collections.Generic.IDictionary<TKey,TValue>,TKey,TValue);Argument[2];Argument[0].Element;taint;df-generated |
+| System.Collections.Generic;CollectionExtensions;TryAdd<TKey,TValue>;(System.Collections.Generic.IDictionary<TKey,TValue>,TKey,TValue);Argument[1];Argument[0].Element.Property[System.Collections.Generic.KeyValuePair`2.Key];value;dfc-generated |
+| System.Collections.Generic;CollectionExtensions;TryAdd<TKey,TValue>;(System.Collections.Generic.IDictionary<TKey,TValue>,TKey,TValue);Argument[2];Argument[0].Element.Property[System.Collections.Generic.KeyValuePair`2.Value];value;dfc-generated |
+| System.Collections.Generic;Comparer<T>;Compare;(System.Object,System.Object);Argument[0];Argument[this];taint;df-generated |
+| System.Collections.Generic;Comparer<T>;Compare;(System.Object,System.Object);Argument[1];Argument[this];taint;df-generated |
 | System.Collections.Generic;Comparer<T>;Create;(System.Comparison<T>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Collections.Generic;Dictionary<TKey,TValue>+Enumerator;get_Current;();Argument[this];ReturnValue;taint;df-generated |
 | System.Collections.Generic;Dictionary<TKey,TValue>+Enumerator;get_Entry;();Argument[this];ReturnValue;taint;df-generated |
@@ -5881,9 +6370,10 @@ summary
 | System.Collections.Generic;Dictionary<TKey,TValue>+KeyCollection;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.Generic.Dictionary`2+KeyCollection+Enumerator.Current];value;manual |
 | System.Collections.Generic;Dictionary<TKey,TValue>+KeyCollection;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.Generic.IEnumerator`1.Current];value;manual |
 | System.Collections.Generic;Dictionary<TKey,TValue>+KeyCollection;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.IEnumerator.Current];value;manual |
-| System.Collections.Generic;Dictionary<TKey,TValue>+KeyCollection;KeyCollection;(System.Collections.Generic.Dictionary<TKey,TValue>);Argument[0].Element;Argument[this];taint;df-generated |
-| System.Collections.Generic;Dictionary<TKey,TValue>+KeyCollection;get_SyncRoot;();Argument[this];ReturnValue;taint;df-generated |
-| System.Collections.Generic;Dictionary<TKey,TValue>+KeyCollection;get_SyncRoot;();Argument[this];ReturnValue;value;df-generated |
+| System.Collections.Generic;Dictionary<TKey,TValue>+KeyCollection;KeyCollection;(System.Collections.Generic.Dictionary<TKey,TValue>);Argument[0];Argument[this].SyntheticField[System.Collections.Generic.Dictionary`2+KeyCollection._dictionary];value;dfc-generated |
+| System.Collections.Generic;Dictionary<TKey,TValue>+KeyCollection;get_SyncRoot;();Argument[this].SyntheticField[System.Collections.Generic.Dictionary`2+KeyCollection._dictionary].Property[System.Collections.ICollection.SyncRoot];ReturnValue;value;dfc-generated |
+| System.Collections.Generic;Dictionary<TKey,TValue>+KeyCollection;get_SyncRoot;();Argument[this].SyntheticField[System.Collections.Generic.Dictionary`2+KeyCollection._dictionary];ReturnValue;value;dfc-generated |
+| System.Collections.Generic;Dictionary<TKey,TValue>+KeyCollection;get_SyncRoot;();Argument[this];ReturnValue;value;dfc-generated |
 | System.Collections.Generic;Dictionary<TKey,TValue>+ValueCollection+Enumerator;get_Current;();Argument[this];ReturnValue;taint;df-generated |
 | System.Collections.Generic;Dictionary<TKey,TValue>+ValueCollection;Add;(TValue);Argument[0];Argument[this].Element;value;manual |
 | System.Collections.Generic;Dictionary<TKey,TValue>+ValueCollection;Clear;();Argument[this].WithoutElement;Argument[this];value;manual |
@@ -5892,9 +6382,10 @@ summary
 | System.Collections.Generic;Dictionary<TKey,TValue>+ValueCollection;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.Generic.Dictionary`2+ValueCollection+Enumerator.Current];value;manual |
 | System.Collections.Generic;Dictionary<TKey,TValue>+ValueCollection;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.Generic.IEnumerator`1.Current];value;manual |
 | System.Collections.Generic;Dictionary<TKey,TValue>+ValueCollection;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.IEnumerator.Current];value;manual |
-| System.Collections.Generic;Dictionary<TKey,TValue>+ValueCollection;ValueCollection;(System.Collections.Generic.Dictionary<TKey,TValue>);Argument[0].Element;Argument[this];taint;df-generated |
-| System.Collections.Generic;Dictionary<TKey,TValue>+ValueCollection;get_SyncRoot;();Argument[this];ReturnValue;taint;df-generated |
-| System.Collections.Generic;Dictionary<TKey,TValue>+ValueCollection;get_SyncRoot;();Argument[this];ReturnValue;value;df-generated |
+| System.Collections.Generic;Dictionary<TKey,TValue>+ValueCollection;ValueCollection;(System.Collections.Generic.Dictionary<TKey,TValue>);Argument[0];Argument[this].SyntheticField[System.Collections.Generic.Dictionary`2+ValueCollection._dictionary];value;dfc-generated |
+| System.Collections.Generic;Dictionary<TKey,TValue>+ValueCollection;get_SyncRoot;();Argument[this].SyntheticField[System.Collections.Generic.Dictionary`2+ValueCollection._dictionary].Property[System.Collections.ICollection.SyncRoot];ReturnValue;value;dfc-generated |
+| System.Collections.Generic;Dictionary<TKey,TValue>+ValueCollection;get_SyncRoot;();Argument[this].SyntheticField[System.Collections.Generic.Dictionary`2+ValueCollection._dictionary];ReturnValue;value;dfc-generated |
+| System.Collections.Generic;Dictionary<TKey,TValue>+ValueCollection;get_SyncRoot;();Argument[this];ReturnValue;value;dfc-generated |
 | System.Collections.Generic;Dictionary<TKey,TValue>;Add;(System.Collections.Generic.KeyValuePair<TKey,TValue>);Argument[0].Property[System.Collections.Generic.KeyValuePair`2.Key];Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Key];value;manual |
 | System.Collections.Generic;Dictionary<TKey,TValue>;Add;(System.Collections.Generic.KeyValuePair<TKey,TValue>);Argument[0].Property[System.Collections.Generic.KeyValuePair`2.Value];Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Value];value;manual |
 | System.Collections.Generic;Dictionary<TKey,TValue>;Add;(System.Collections.Generic.KeyValuePair<TKey,TValue>);Argument[0];Argument[this].Element;value;manual |
@@ -5913,17 +6404,21 @@ summary
 | System.Collections.Generic;Dictionary<TKey,TValue>;Dictionary;(System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<TKey,TValue>>);Argument[0].Element.Property[System.Collections.Generic.KeyValuePair`2.Value];Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Value];value;manual |
 | System.Collections.Generic;Dictionary<TKey,TValue>;Dictionary;(System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<TKey,TValue>>,System.Collections.Generic.IEqualityComparer<TKey>);Argument[0].Element.Property[System.Collections.Generic.KeyValuePair`2.Key];Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Key];value;manual |
 | System.Collections.Generic;Dictionary<TKey,TValue>;Dictionary;(System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<TKey,TValue>>,System.Collections.Generic.IEqualityComparer<TKey>);Argument[0].Element.Property[System.Collections.Generic.KeyValuePair`2.Value];Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Value];value;manual |
-| System.Collections.Generic;Dictionary<TKey,TValue>;Dictionary;(System.Int32,System.Collections.Generic.IEqualityComparer<TKey>);Argument[1];Argument[this];taint;df-generated |
+| System.Collections.Generic;Dictionary<TKey,TValue>;Dictionary;(System.Int32,System.Collections.Generic.IEqualityComparer<TKey>);Argument[1];Argument[this].SyntheticField[System.Collections.Generic.Dictionary`2._comparer];value;dfc-generated |
 | System.Collections.Generic;Dictionary<TKey,TValue>;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.Generic.Dictionary`2+Enumerator.Current];value;manual |
 | System.Collections.Generic;Dictionary<TKey,TValue>;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.Generic.IEnumerator`1.Current];value;manual |
 | System.Collections.Generic;Dictionary<TKey,TValue>;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.IEnumerator.Current];value;manual |
+| System.Collections.Generic;Dictionary<TKey,TValue>;GetObjectData;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);Argument[this].Property[System.Collections.Generic.Dictionary`2.Comparer];Argument[0].SyntheticField[System.Runtime.Serialization.SerializationInfo._values].Element;value;df-generated |
+| System.Collections.Generic;Dictionary<TKey,TValue>;GetObjectData;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);Argument[this].Property[System.Collections.Generic.Dictionary`2.Comparer];Argument[0].SyntheticField[System.Runtime.Serialization.SerializationInfo._values].Element;value;dfc-generated |
+| System.Collections.Generic;Dictionary<TKey,TValue>;GetObjectData;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);Argument[this].SyntheticField[System.Collections.Generic.Dictionary`2._comparer];Argument[0].SyntheticField[System.Runtime.Serialization.SerializationInfo._values].Element;value;df-generated |
+| System.Collections.Generic;Dictionary<TKey,TValue>;GetObjectData;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);Argument[this].SyntheticField[System.Collections.Generic.Dictionary`2._comparer];Argument[0].SyntheticField[System.Runtime.Serialization.SerializationInfo._values].Element;value;dfc-generated |
 | System.Collections.Generic;Dictionary<TKey,TValue>;GetObjectData;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);Argument[this];Argument[0];taint;df-generated |
-| System.Collections.Generic;Dictionary<TKey,TValue>;get_Comparer;();Argument[this];ReturnValue;taint;df-generated |
+| System.Collections.Generic;Dictionary<TKey,TValue>;GetObjectData;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);Argument[this];Argument[0];taint;dfc-generated |
+| System.Collections.Generic;Dictionary<TKey,TValue>;get_Comparer;();Argument[this].SyntheticField[System.Collections.Generic.Dictionary`2._comparer];ReturnValue;value;dfc-generated |
 | System.Collections.Generic;Dictionary<TKey,TValue>;get_Item;(System.Object);Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Value];ReturnValue;value;manual |
 | System.Collections.Generic;Dictionary<TKey,TValue>;get_Item;(TKey);Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Value];ReturnValue;value;manual |
 | System.Collections.Generic;Dictionary<TKey,TValue>;get_Keys;();Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Key];ReturnValue.Element;value;manual |
-| System.Collections.Generic;Dictionary<TKey,TValue>;get_SyncRoot;();Argument[this];ReturnValue;taint;df-generated |
-| System.Collections.Generic;Dictionary<TKey,TValue>;get_SyncRoot;();Argument[this];ReturnValue;value;df-generated |
+| System.Collections.Generic;Dictionary<TKey,TValue>;get_SyncRoot;();Argument[this];ReturnValue;value;dfc-generated |
 | System.Collections.Generic;Dictionary<TKey,TValue>;get_Values;();Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Value];ReturnValue.Element;value;manual |
 | System.Collections.Generic;Dictionary<TKey,TValue>;set_Item;(System.Object,System.Object);Argument[0];Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Key];value;manual |
 | System.Collections.Generic;Dictionary<TKey,TValue>;set_Item;(System.Object,System.Object);Argument[1];Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Value];value;manual |
@@ -5931,6 +6426,9 @@ summary
 | System.Collections.Generic;Dictionary<TKey,TValue>;set_Item;(TKey,TValue);Argument[1];Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Value];value;manual |
 | System.Collections.Generic;EqualityComparer<T>;Create;(System.Func<T,T,System.Boolean>,System.Func<T,System.Int32>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Collections.Generic;EqualityComparer<T>;Create;(System.Func<T,T,System.Boolean>,System.Func<T,System.Int32>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
+| System.Collections.Generic;EqualityComparer<T>;Equals;(System.Object,System.Object);Argument[0];Argument[this];taint;df-generated |
+| System.Collections.Generic;EqualityComparer<T>;Equals;(System.Object,System.Object);Argument[1];Argument[this];taint;df-generated |
+| System.Collections.Generic;EqualityComparer<T>;GetHashCode;(System.Object);Argument[0];Argument[this];taint;df-generated |
 | System.Collections.Generic;HashSet<T>+Enumerator;get_Current;();Argument[this];ReturnValue;taint;df-generated |
 | System.Collections.Generic;HashSet<T>;Add;(T);Argument[0];Argument[this].Element;value;manual |
 | System.Collections.Generic;HashSet<T>;Clear;();Argument[this].WithoutElement;Argument[this];value;manual |
@@ -5938,12 +6436,17 @@ summary
 | System.Collections.Generic;HashSet<T>;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.Generic.HashSet`1+Enumerator.Current];value;manual |
 | System.Collections.Generic;HashSet<T>;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.Generic.IEnumerator`1.Current];value;manual |
 | System.Collections.Generic;HashSet<T>;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.IEnumerator.Current];value;manual |
+| System.Collections.Generic;HashSet<T>;GetObjectData;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);Argument[this].Property[System.Collections.Generic.HashSet`1.Comparer];Argument[0].SyntheticField[System.Runtime.Serialization.SerializationInfo._values].Element;value;df-generated |
+| System.Collections.Generic;HashSet<T>;GetObjectData;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);Argument[this].Property[System.Collections.Generic.HashSet`1.Comparer];Argument[0].SyntheticField[System.Runtime.Serialization.SerializationInfo._values].Element;value;dfc-generated |
+| System.Collections.Generic;HashSet<T>;GetObjectData;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);Argument[this].SyntheticField[System.Collections.Generic.HashSet`1._comparer];Argument[0].SyntheticField[System.Runtime.Serialization.SerializationInfo._values].Element;value;df-generated |
+| System.Collections.Generic;HashSet<T>;GetObjectData;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);Argument[this].SyntheticField[System.Collections.Generic.HashSet`1._comparer];Argument[0].SyntheticField[System.Runtime.Serialization.SerializationInfo._values].Element;value;dfc-generated |
 | System.Collections.Generic;HashSet<T>;GetObjectData;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);Argument[this];Argument[0];taint;df-generated |
+| System.Collections.Generic;HashSet<T>;GetObjectData;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);Argument[this];Argument[0];taint;dfc-generated |
 | System.Collections.Generic;HashSet<T>;HashSet;(System.Collections.Generic.IEnumerable<T>,System.Collections.Generic.IEqualityComparer<T>);Argument[0].Element;Argument[this];taint;df-generated |
-| System.Collections.Generic;HashSet<T>;HashSet;(System.Collections.Generic.IEqualityComparer<T>);Argument[0];Argument[this];taint;df-generated |
+| System.Collections.Generic;HashSet<T>;HashSet;(System.Collections.Generic.IEqualityComparer<T>);Argument[0];Argument[this].SyntheticField[System.Collections.Generic.HashSet`1._comparer];value;dfc-generated |
 | System.Collections.Generic;HashSet<T>;RemoveWhere;(System.Predicate<T>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Collections.Generic;HashSet<T>;TryGetValue;(T,T);Argument[this];ReturnValue;taint;df-generated |
-| System.Collections.Generic;HashSet<T>;get_Comparer;();Argument[this];ReturnValue;taint;df-generated |
+| System.Collections.Generic;HashSet<T>;get_Comparer;();Argument[this].SyntheticField[System.Collections.Generic.HashSet`1._comparer];ReturnValue;value;dfc-generated |
 | System.Collections.Generic;ICollection<T>;Add;(T);Argument[0];Argument[this].Element;value;manual |
 | System.Collections.Generic;ICollection<T>;Clear;();Argument[this].WithoutElement;Argument[this];value;manual |
 | System.Collections.Generic;ICollection<T>;CopyTo;(T[],System.Int32);Argument[this].Element;Argument[0].Element;value;manual |
@@ -5959,26 +6462,22 @@ summary
 | System.Collections.Generic;IList<T>;get_Item;(System.Int32);Argument[this].Element;ReturnValue;value;manual |
 | System.Collections.Generic;IList<T>;set_Item;(System.Int32,T);Argument[1];Argument[this].Element;value;manual |
 | System.Collections.Generic;ISet<T>;Add;(T);Argument[0];Argument[this].Element;value;manual |
-| System.Collections.Generic;KeyValuePair;Create<TKey,TValue>;(TKey,TValue);Argument[0];ReturnValue;taint;df-generated |
-| System.Collections.Generic;KeyValuePair;Create<TKey,TValue>;(TKey,TValue);Argument[1];ReturnValue;taint;df-generated |
+| System.Collections.Generic;KeyValuePair;Create<TKey,TValue>;(TKey,TValue);Argument[0];ReturnValue.Property[System.Collections.Generic.KeyValuePair`2.Key];value;dfc-generated |
+| System.Collections.Generic;KeyValuePair;Create<TKey,TValue>;(TKey,TValue);Argument[1];ReturnValue.Property[System.Collections.Generic.KeyValuePair`2.Value];value;dfc-generated |
 | System.Collections.Generic;KeyValuePair<TKey,TValue>;Deconstruct;(TKey,TValue);Argument[this];ReturnValue;taint;df-generated |
 | System.Collections.Generic;KeyValuePair<TKey,TValue>;KeyValuePair;(TKey,TValue);Argument[0];Argument[this].Property[System.Collections.Generic.KeyValuePair`2.Key];value;manual |
 | System.Collections.Generic;KeyValuePair<TKey,TValue>;KeyValuePair;(TKey,TValue);Argument[1];Argument[this].Property[System.Collections.Generic.KeyValuePair`2.Value];value;manual |
 | System.Collections.Generic;KeyValuePair<TKey,TValue>;get_Key;();Argument[this];ReturnValue;taint;df-generated |
 | System.Collections.Generic;KeyValuePair<TKey,TValue>;get_Value;();Argument[this];ReturnValue;taint;df-generated |
 | System.Collections.Generic;LinkedList<T>+Enumerator;GetObjectData;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);Argument[this];Argument[0];taint;df-generated |
+| System.Collections.Generic;LinkedList<T>+Enumerator;get_Current;();Argument[this].Property[System.Collections.Generic.LinkedList`1+Enumerator.Current];ReturnValue;value;df-generated |
+| System.Collections.Generic;LinkedList<T>+Enumerator;get_Current;();Argument[this].Property[System.Collections.Generic.LinkedList`1+Enumerator.Current];ReturnValue;value;dfc-generated |
 | System.Collections.Generic;LinkedList<T>+Enumerator;get_Current;();Argument[this];ReturnValue;taint;df-generated |
+| System.Collections.Generic;LinkedList<T>+Enumerator;get_Current;();Argument[this];ReturnValue;taint;dfc-generated |
 | System.Collections.Generic;LinkedList<T>;Add;(T);Argument[0];Argument[this].Element;value;manual |
-| System.Collections.Generic;LinkedList<T>;AddAfter;(System.Collections.Generic.LinkedListNode<T>,System.Collections.Generic.LinkedListNode<T>);Argument[0];Argument[1];taint;df-generated |
-| System.Collections.Generic;LinkedList<T>;AddAfter;(System.Collections.Generic.LinkedListNode<T>,System.Collections.Generic.LinkedListNode<T>);Argument[1];Argument[0];taint;df-generated |
-| System.Collections.Generic;LinkedList<T>;AddAfter;(System.Collections.Generic.LinkedListNode<T>,System.Collections.Generic.LinkedListNode<T>);Argument[this];Argument[1];taint;df-generated |
-| System.Collections.Generic;LinkedList<T>;AddAfter;(System.Collections.Generic.LinkedListNode<T>,T);Argument[0];ReturnValue;taint;df-generated |
-| System.Collections.Generic;LinkedList<T>;AddAfter;(System.Collections.Generic.LinkedListNode<T>,T);Argument[1];ReturnValue;taint;df-generated |
-| System.Collections.Generic;LinkedList<T>;AddBefore;(System.Collections.Generic.LinkedListNode<T>,System.Collections.Generic.LinkedListNode<T>);Argument[0];Argument[1];taint;df-generated |
-| System.Collections.Generic;LinkedList<T>;AddBefore;(System.Collections.Generic.LinkedListNode<T>,System.Collections.Generic.LinkedListNode<T>);Argument[0];Argument[this];taint;df-generated |
-| System.Collections.Generic;LinkedList<T>;AddBefore;(System.Collections.Generic.LinkedListNode<T>,System.Collections.Generic.LinkedListNode<T>);Argument[1];Argument[0];taint;df-generated |
-| System.Collections.Generic;LinkedList<T>;AddBefore;(System.Collections.Generic.LinkedListNode<T>,System.Collections.Generic.LinkedListNode<T>);Argument[1];Argument[this];taint;df-generated |
-| System.Collections.Generic;LinkedList<T>;AddBefore;(System.Collections.Generic.LinkedListNode<T>,System.Collections.Generic.LinkedListNode<T>);Argument[this];Argument[1];taint;df-generated |
+| System.Collections.Generic;LinkedList<T>;AddAfter;(System.Collections.Generic.LinkedListNode<T>,System.Collections.Generic.LinkedListNode<T>);Argument[0].SyntheticField[System.Collections.Generic.LinkedListNode`1.next];Argument[1].SyntheticField[System.Collections.Generic.LinkedListNode`1.next];value;dfc-generated |
+| System.Collections.Generic;LinkedList<T>;AddAfter;(System.Collections.Generic.LinkedListNode<T>,T);Argument[0].SyntheticField[System.Collections.Generic.LinkedListNode`1.next];ReturnValue.SyntheticField[System.Collections.Generic.LinkedListNode`1.next];value;dfc-generated |
+| System.Collections.Generic;LinkedList<T>;AddBefore;(System.Collections.Generic.LinkedListNode<T>,System.Collections.Generic.LinkedListNode<T>);Argument[1];Argument[this].SyntheticField[System.Collections.Generic.LinkedList`1.head];value;dfc-generated |
 | System.Collections.Generic;LinkedList<T>;AddBefore;(System.Collections.Generic.LinkedListNode<T>,T);Argument[0];Argument[this];taint;df-generated |
 | System.Collections.Generic;LinkedList<T>;AddBefore;(System.Collections.Generic.LinkedListNode<T>,T);Argument[0];ReturnValue;taint;df-generated |
 | System.Collections.Generic;LinkedList<T>;AddBefore;(System.Collections.Generic.LinkedListNode<T>,T);Argument[1];Argument[0];taint;df-generated |
@@ -5989,8 +6488,7 @@ summary
 | System.Collections.Generic;LinkedList<T>;AddFirst;(T);Argument[0];Argument[this];taint;df-generated |
 | System.Collections.Generic;LinkedList<T>;AddFirst;(T);Argument[0];ReturnValue;taint;df-generated |
 | System.Collections.Generic;LinkedList<T>;AddFirst;(T);Argument[this];ReturnValue;taint;df-generated |
-| System.Collections.Generic;LinkedList<T>;AddLast;(System.Collections.Generic.LinkedListNode<T>);Argument[0];Argument[this];taint;df-generated |
-| System.Collections.Generic;LinkedList<T>;AddLast;(System.Collections.Generic.LinkedListNode<T>);Argument[this];Argument[0];taint;df-generated |
+| System.Collections.Generic;LinkedList<T>;AddLast;(System.Collections.Generic.LinkedListNode<T>);Argument[this].SyntheticField[System.Collections.Generic.LinkedList`1.head];Argument[0].SyntheticField[System.Collections.Generic.LinkedListNode`1.next];value;dfc-generated |
 | System.Collections.Generic;LinkedList<T>;AddLast;(T);Argument[0];Argument[this];taint;df-generated |
 | System.Collections.Generic;LinkedList<T>;AddLast;(T);Argument[0];ReturnValue;taint;df-generated |
 | System.Collections.Generic;LinkedList<T>;AddLast;(T);Argument[this];ReturnValue;taint;df-generated |
@@ -6005,16 +6503,18 @@ summary
 | System.Collections.Generic;LinkedList<T>;GetObjectData;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);Argument[this];Argument[0];taint;df-generated |
 | System.Collections.Generic;LinkedList<T>;LinkedList;(System.Collections.Generic.IEnumerable<T>);Argument[0].Element;Argument[this];taint;df-generated |
 | System.Collections.Generic;LinkedList<T>;LinkedList;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);Argument[0];Argument[this];taint;df-generated |
-| System.Collections.Generic;LinkedList<T>;Remove;(System.Collections.Generic.LinkedListNode<T>);Argument[0];Argument[this];taint;df-generated |
-| System.Collections.Generic;LinkedList<T>;get_First;();Argument[this];ReturnValue;taint;df-generated |
+| System.Collections.Generic;LinkedList<T>;Remove;(System.Collections.Generic.LinkedListNode<T>);Argument[0].SyntheticField[System.Collections.Generic.LinkedListNode`1.next];Argument[this].SyntheticField[System.Collections.Generic.LinkedList`1.head];value;dfc-generated |
+| System.Collections.Generic;LinkedList<T>;get_First;();Argument[this].SyntheticField[System.Collections.Generic.LinkedList`1.head];ReturnValue;value;dfc-generated |
 | System.Collections.Generic;LinkedList<T>;get_Last;();Argument[this];ReturnValue;taint;df-generated |
-| System.Collections.Generic;LinkedList<T>;get_SyncRoot;();Argument[this];ReturnValue;taint;df-generated |
-| System.Collections.Generic;LinkedList<T>;get_SyncRoot;();Argument[this];ReturnValue;value;df-generated |
+| System.Collections.Generic;LinkedList<T>;get_SyncRoot;();Argument[this];ReturnValue;value;dfc-generated |
 | System.Collections.Generic;LinkedListNode<T>;LinkedListNode;(T);Argument[0];Argument[this];taint;df-generated |
 | System.Collections.Generic;LinkedListNode<T>;get_List;();Argument[this];ReturnValue;taint;df-generated |
 | System.Collections.Generic;LinkedListNode<T>;get_Next;();Argument[this];ReturnValue;taint;df-generated |
 | System.Collections.Generic;LinkedListNode<T>;get_Previous;();Argument[this];ReturnValue;taint;df-generated |
+| System.Collections.Generic;List<T>+Enumerator;get_Current;();Argument[this].Property[System.Collections.Generic.List`1+Enumerator.Current];ReturnValue;value;df-generated |
+| System.Collections.Generic;List<T>+Enumerator;get_Current;();Argument[this].Property[System.Collections.Generic.List`1+Enumerator.Current];ReturnValue;value;dfc-generated |
 | System.Collections.Generic;List<T>+Enumerator;get_Current;();Argument[this];ReturnValue;taint;df-generated |
+| System.Collections.Generic;List<T>+Enumerator;get_Current;();Argument[this];ReturnValue;taint;dfc-generated |
 | System.Collections.Generic;List<T>;Add;(System.Object);Argument[0];Argument[this].Element;value;manual |
 | System.Collections.Generic;List<T>;Add;(T);Argument[0];Argument[this].Element;value;manual |
 | System.Collections.Generic;List<T>;AddRange;(System.Collections.Generic.IEnumerable<T>);Argument[0].Element;Argument[this].Element;value;manual |
@@ -6022,7 +6522,7 @@ summary
 | System.Collections.Generic;List<T>;Clear;();Argument[this].WithoutElement;Argument[this];value;manual |
 | System.Collections.Generic;List<T>;ConvertAll<TOutput>;(System.Converter<T,TOutput>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Collections.Generic;List<T>;CopyTo;(System.Array,System.Int32);Argument[this].Element;Argument[0].Element;value;manual |
-| System.Collections.Generic;List<T>;CopyTo;(T[]);Argument[this];Argument[0].Element;taint;df-generated |
+| System.Collections.Generic;List<T>;CopyTo;(T[]);Argument[this].Element;Argument[0].Element;value;dfc-generated |
 | System.Collections.Generic;List<T>;CopyTo;(T[],System.Int32);Argument[this].Element;Argument[0].Element;value;manual |
 | System.Collections.Generic;List<T>;Exists;(System.Predicate<T>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Collections.Generic;List<T>;Find;(System.Predicate<T>);Argument[0];Argument[0].Parameter[delegate-self];value;manual |
@@ -6050,15 +6550,12 @@ summary
 | System.Collections.Generic;List<T>;Insert;(System.Int32,T);Argument[1];Argument[this].Element;value;manual |
 | System.Collections.Generic;List<T>;InsertRange;(System.Int32,System.Collections.Generic.IEnumerable<T>);Argument[1].Element;Argument[this].Element;value;manual |
 | System.Collections.Generic;List<T>;List;(System.Collections.Generic.IEnumerable<T>);Argument[0].Element;Argument[this];taint;df-generated |
-| System.Collections.Generic;List<T>;Remove;(System.Object);Argument[0];Argument[this];taint;df-generated |
-| System.Collections.Generic;List<T>;Remove;(System.Object);Argument[this];Argument[0];taint;df-generated |
 | System.Collections.Generic;List<T>;RemoveAll;(System.Predicate<T>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
-| System.Collections.Generic;List<T>;Slice;(System.Int32,System.Int32);Argument[this];ReturnValue;taint;df-generated |
+| System.Collections.Generic;List<T>;Slice;(System.Int32,System.Int32);Argument[this].Element;ReturnValue.Element;value;dfc-generated |
 | System.Collections.Generic;List<T>;Sort;(System.Comparison<T>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Collections.Generic;List<T>;TrueForAll;(System.Predicate<T>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Collections.Generic;List<T>;get_Item;(System.Int32);Argument[this].Element;ReturnValue;value;manual |
-| System.Collections.Generic;List<T>;get_SyncRoot;();Argument[this];ReturnValue;taint;df-generated |
-| System.Collections.Generic;List<T>;get_SyncRoot;();Argument[this];ReturnValue;value;df-generated |
+| System.Collections.Generic;List<T>;get_SyncRoot;();Argument[this];ReturnValue;value;dfc-generated |
 | System.Collections.Generic;List<T>;set_Item;(System.Int32,System.Object);Argument[1];Argument[this].Element;value;manual |
 | System.Collections.Generic;List<T>;set_Item;(System.Int32,T);Argument[1];Argument[this].Element;value;manual |
 | System.Collections.Generic;PriorityQueue<TElement,TPriority>+UnorderedItemsCollection+Enumerator;get_Current;();Argument[this];ReturnValue;taint;df-generated |
@@ -6066,41 +6563,57 @@ summary
 | System.Collections.Generic;PriorityQueue<TElement,TPriority>+UnorderedItemsCollection;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.Generic.IEnumerator`1.Current];value;manual |
 | System.Collections.Generic;PriorityQueue<TElement,TPriority>+UnorderedItemsCollection;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.IEnumerator.Current];value;manual |
 | System.Collections.Generic;PriorityQueue<TElement,TPriority>+UnorderedItemsCollection;GetEnumerator;();Argument[this];ReturnValue;taint;df-generated |
-| System.Collections.Generic;PriorityQueue<TElement,TPriority>+UnorderedItemsCollection;get_SyncRoot;();Argument[this];ReturnValue;taint;df-generated |
-| System.Collections.Generic;PriorityQueue<TElement,TPriority>+UnorderedItemsCollection;get_SyncRoot;();Argument[this];ReturnValue;value;df-generated |
+| System.Collections.Generic;PriorityQueue<TElement,TPriority>+UnorderedItemsCollection;get_SyncRoot;();Argument[this];ReturnValue;value;dfc-generated |
 | System.Collections.Generic;PriorityQueue<TElement,TPriority>;Dequeue;();Argument[this];ReturnValue;taint;df-generated |
 | System.Collections.Generic;PriorityQueue<TElement,TPriority>;DequeueEnqueue;(TElement,TPriority);Argument[this];ReturnValue;taint;df-generated |
-| System.Collections.Generic;PriorityQueue<TElement,TPriority>;EnqueueDequeue;(TElement,TPriority);Argument[0];ReturnValue;taint;df-generated |
-| System.Collections.Generic;PriorityQueue<TElement,TPriority>;EnqueueDequeue;(TElement,TPriority);Argument[this];ReturnValue;taint;df-generated |
+| System.Collections.Generic;PriorityQueue<TElement,TPriority>;EnqueueDequeue;(TElement,TPriority);Argument[0];ReturnValue;value;dfc-generated |
 | System.Collections.Generic;PriorityQueue<TElement,TPriority>;EnqueueRange;(System.Collections.Generic.IEnumerable<System.ValueTuple<TElement,TPriority>>);Argument[0].Element;Argument[this];taint;df-generated |
 | System.Collections.Generic;PriorityQueue<TElement,TPriority>;Peek;();Argument[this];ReturnValue;taint;df-generated |
-| System.Collections.Generic;PriorityQueue<TElement,TPriority>;PriorityQueue;(System.Collections.Generic.IComparer<TPriority>);Argument[0];Argument[this];taint;df-generated |
-| System.Collections.Generic;PriorityQueue<TElement,TPriority>;PriorityQueue;(System.Collections.Generic.IEnumerable<System.ValueTuple<TElement,TPriority>>,System.Collections.Generic.IComparer<TPriority>);Argument[0].Element;Argument[this];taint;df-generated |
-| System.Collections.Generic;PriorityQueue<TElement,TPriority>;PriorityQueue;(System.Collections.Generic.IEnumerable<System.ValueTuple<TElement,TPriority>>,System.Collections.Generic.IComparer<TPriority>);Argument[1];Argument[this];taint;df-generated |
-| System.Collections.Generic;PriorityQueue<TElement,TPriority>;PriorityQueue;(System.Int32,System.Collections.Generic.IComparer<TPriority>);Argument[1];Argument[this];taint;df-generated |
+| System.Collections.Generic;PriorityQueue<TElement,TPriority>;PriorityQueue;(System.Collections.Generic.IComparer<TPriority>);Argument[0];Argument[this].SyntheticField[System.Collections.Generic.PriorityQueue`2._comparer];value;dfc-generated |
+| System.Collections.Generic;PriorityQueue<TElement,TPriority>;PriorityQueue;(System.Collections.Generic.IEnumerable<System.ValueTuple<TElement,TPriority>>,System.Collections.Generic.IComparer<TPriority>);Argument[1];Argument[this].SyntheticField[System.Collections.Generic.PriorityQueue`2._comparer];value;dfc-generated |
+| System.Collections.Generic;PriorityQueue<TElement,TPriority>;PriorityQueue;(System.Int32,System.Collections.Generic.IComparer<TPriority>);Argument[1];Argument[this].SyntheticField[System.Collections.Generic.PriorityQueue`2._comparer];value;dfc-generated |
 | System.Collections.Generic;PriorityQueue<TElement,TPriority>;TryDequeue;(TElement,TPriority);Argument[this];ReturnValue;taint;df-generated |
 | System.Collections.Generic;PriorityQueue<TElement,TPriority>;TryPeek;(TElement,TPriority);Argument[this];ReturnValue;taint;df-generated |
-| System.Collections.Generic;PriorityQueue<TElement,TPriority>;get_Comparer;();Argument[this];ReturnValue;taint;df-generated |
+| System.Collections.Generic;PriorityQueue<TElement,TPriority>;get_Comparer;();Argument[this].SyntheticField[System.Collections.Generic.PriorityQueue`2._comparer];ReturnValue;value;dfc-generated |
+| System.Collections.Generic;Queue<T>+Enumerator;get_Current;();Argument[this].Property[System.Collections.Generic.Queue`1+Enumerator.Current];ReturnValue;value;df-generated |
+| System.Collections.Generic;Queue<T>+Enumerator;get_Current;();Argument[this].Property[System.Collections.Generic.Queue`1+Enumerator.Current];ReturnValue;value;dfc-generated |
 | System.Collections.Generic;Queue<T>+Enumerator;get_Current;();Argument[this];ReturnValue;taint;df-generated |
+| System.Collections.Generic;Queue<T>+Enumerator;get_Current;();Argument[this];ReturnValue;taint;dfc-generated |
 | System.Collections.Generic;Queue<T>;Clear;();Argument[this].WithoutElement;Argument[this];value;manual |
 | System.Collections.Generic;Queue<T>;CopyTo;(System.Array,System.Int32);Argument[this].Element;Argument[0].Element;value;manual |
 | System.Collections.Generic;Queue<T>;CopyTo;(T[],System.Int32);Argument[this].Element;Argument[0].Element;value;manual |
-| System.Collections.Generic;Queue<T>;Dequeue;();Argument[this];ReturnValue;taint;df-generated |
-| System.Collections.Generic;Queue<T>;Enqueue;(T);Argument[0];Argument[this];taint;df-generated |
+| System.Collections.Generic;Queue<T>;Dequeue;();Argument[this].SyntheticField[System.Collections.Generic.Queue`1._array].Element;ReturnValue;value;dfc-generated |
+| System.Collections.Generic;Queue<T>;Enqueue;(T);Argument[0];Argument[this].SyntheticField[System.Collections.Generic.Queue`1._array].Element;value;dfc-generated |
 | System.Collections.Generic;Queue<T>;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.Generic.IEnumerator`1.Current];value;manual |
 | System.Collections.Generic;Queue<T>;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.Generic.Queue`1+Enumerator.Current];value;manual |
 | System.Collections.Generic;Queue<T>;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.IEnumerator.Current];value;manual |
 | System.Collections.Generic;Queue<T>;Peek;();Argument[this].Element;ReturnValue;value;manual |
-| System.Collections.Generic;Queue<T>;Queue;(System.Collections.Generic.IEnumerable<T>);Argument[0].Element;Argument[this];taint;df-generated |
-| System.Collections.Generic;Queue<T>;TryDequeue;(T);Argument[this];ReturnValue;taint;df-generated |
-| System.Collections.Generic;Queue<T>;TryPeek;(T);Argument[this];ReturnValue;taint;df-generated |
-| System.Collections.Generic;Queue<T>;get_SyncRoot;();Argument[this];ReturnValue;taint;df-generated |
-| System.Collections.Generic;Queue<T>;get_SyncRoot;();Argument[this];ReturnValue;value;df-generated |
+| System.Collections.Generic;Queue<T>;Queue;(System.Collections.Generic.IEnumerable<T>);Argument[0].Element;Argument[this].SyntheticField[System.Collections.Generic.Queue`1._array].Element;value;dfc-generated |
+| System.Collections.Generic;Queue<T>;TryDequeue;(T);Argument[this].SyntheticField[System.Collections.Generic.Queue`1._array].Element;ReturnValue;value;dfc-generated |
+| System.Collections.Generic;Queue<T>;TryPeek;(T);Argument[this].SyntheticField[System.Collections.Generic.Queue`1._array].Element;ReturnValue;value;dfc-generated |
+| System.Collections.Generic;Queue<T>;get_SyncRoot;();Argument[this];ReturnValue;value;dfc-generated |
+| System.Collections.Generic;ReferenceEqualityComparer;Equals;(System.Object,System.Object);Argument[0];Argument[this];taint;df-generated |
+| System.Collections.Generic;ReferenceEqualityComparer;Equals;(System.Object,System.Object);Argument[1];Argument[this];taint;df-generated |
+| System.Collections.Generic;ReferenceEqualityComparer;GetHashCode;(System.Object);Argument[0];Argument[this];taint;df-generated |
+| System.Collections.Generic;SortedDictionary<TKey,TValue>+Enumerator;get_Current;();Argument[this].Property[System.Collections.Generic.SortedDictionary`2+Enumerator.Current].Property[System.Collections.Generic.KeyValuePair`2.Key];ReturnValue.Property[System.Collections.Generic.KeyValuePair`2.Key];value;df-generated |
+| System.Collections.Generic;SortedDictionary<TKey,TValue>+Enumerator;get_Current;();Argument[this].Property[System.Collections.Generic.SortedDictionary`2+Enumerator.Current].Property[System.Collections.Generic.KeyValuePair`2.Key];ReturnValue.Property[System.Collections.Generic.KeyValuePair`2.Key];value;dfc-generated |
+| System.Collections.Generic;SortedDictionary<TKey,TValue>+Enumerator;get_Current;();Argument[this].Property[System.Collections.Generic.SortedDictionary`2+Enumerator.Current].Property[System.Collections.Generic.KeyValuePair`2.Value];ReturnValue.Property[System.Collections.Generic.KeyValuePair`2.Value];value;df-generated |
+| System.Collections.Generic;SortedDictionary<TKey,TValue>+Enumerator;get_Current;();Argument[this].Property[System.Collections.Generic.SortedDictionary`2+Enumerator.Current].Property[System.Collections.Generic.KeyValuePair`2.Value];ReturnValue.Property[System.Collections.Generic.KeyValuePair`2.Value];value;dfc-generated |
 | System.Collections.Generic;SortedDictionary<TKey,TValue>+Enumerator;get_Current;();Argument[this];ReturnValue;taint;df-generated |
+| System.Collections.Generic;SortedDictionary<TKey,TValue>+Enumerator;get_Current;();Argument[this];ReturnValue;taint;dfc-generated |
 | System.Collections.Generic;SortedDictionary<TKey,TValue>+Enumerator;get_Entry;();Argument[this];ReturnValue;taint;df-generated |
+| System.Collections.Generic;SortedDictionary<TKey,TValue>+Enumerator;get_Key;();Argument[this].Property[System.Collections.Generic.SortedDictionary`2+Enumerator.Current].Property[System.Collections.Generic.KeyValuePair`2.Key];ReturnValue;value;df-generated |
+| System.Collections.Generic;SortedDictionary<TKey,TValue>+Enumerator;get_Key;();Argument[this].Property[System.Collections.Generic.SortedDictionary`2+Enumerator.Current].Property[System.Collections.Generic.KeyValuePair`2.Key];ReturnValue;value;dfc-generated |
 | System.Collections.Generic;SortedDictionary<TKey,TValue>+Enumerator;get_Key;();Argument[this];ReturnValue;taint;df-generated |
+| System.Collections.Generic;SortedDictionary<TKey,TValue>+Enumerator;get_Key;();Argument[this];ReturnValue;taint;dfc-generated |
+| System.Collections.Generic;SortedDictionary<TKey,TValue>+Enumerator;get_Value;();Argument[this].Property[System.Collections.Generic.SortedDictionary`2+Enumerator.Current].Property[System.Collections.Generic.KeyValuePair`2.Value];ReturnValue;value;df-generated |
+| System.Collections.Generic;SortedDictionary<TKey,TValue>+Enumerator;get_Value;();Argument[this].Property[System.Collections.Generic.SortedDictionary`2+Enumerator.Current].Property[System.Collections.Generic.KeyValuePair`2.Value];ReturnValue;value;dfc-generated |
 | System.Collections.Generic;SortedDictionary<TKey,TValue>+Enumerator;get_Value;();Argument[this];ReturnValue;taint;df-generated |
+| System.Collections.Generic;SortedDictionary<TKey,TValue>+Enumerator;get_Value;();Argument[this];ReturnValue;taint;dfc-generated |
+| System.Collections.Generic;SortedDictionary<TKey,TValue>+KeyCollection+Enumerator;get_Current;();Argument[this].Property[System.Collections.Generic.SortedDictionary`2+KeyCollection+Enumerator.Current];ReturnValue;value;df-generated |
+| System.Collections.Generic;SortedDictionary<TKey,TValue>+KeyCollection+Enumerator;get_Current;();Argument[this].Property[System.Collections.Generic.SortedDictionary`2+KeyCollection+Enumerator.Current];ReturnValue;value;dfc-generated |
 | System.Collections.Generic;SortedDictionary<TKey,TValue>+KeyCollection+Enumerator;get_Current;();Argument[this];ReturnValue;taint;df-generated |
+| System.Collections.Generic;SortedDictionary<TKey,TValue>+KeyCollection+Enumerator;get_Current;();Argument[this];ReturnValue;taint;dfc-generated |
 | System.Collections.Generic;SortedDictionary<TKey,TValue>+KeyCollection;Add;(TKey);Argument[0];Argument[this].Element;value;manual |
 | System.Collections.Generic;SortedDictionary<TKey,TValue>+KeyCollection;Clear;();Argument[this].WithoutElement;Argument[this];value;manual |
 | System.Collections.Generic;SortedDictionary<TKey,TValue>+KeyCollection;CopyTo;(System.Array,System.Int32);Argument[this].Element;Argument[0].Element;value;manual |
@@ -6108,10 +6621,13 @@ summary
 | System.Collections.Generic;SortedDictionary<TKey,TValue>+KeyCollection;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.Generic.IEnumerator`1.Current];value;manual |
 | System.Collections.Generic;SortedDictionary<TKey,TValue>+KeyCollection;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.Generic.SortedDictionary`2+KeyCollection+Enumerator.Current];value;manual |
 | System.Collections.Generic;SortedDictionary<TKey,TValue>+KeyCollection;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.IEnumerator.Current];value;manual |
-| System.Collections.Generic;SortedDictionary<TKey,TValue>+KeyCollection;KeyCollection;(System.Collections.Generic.SortedDictionary<TKey,TValue>);Argument[0].Element;Argument[this];taint;df-generated |
-| System.Collections.Generic;SortedDictionary<TKey,TValue>+KeyCollection;get_SyncRoot;();Argument[this];ReturnValue;taint;df-generated |
-| System.Collections.Generic;SortedDictionary<TKey,TValue>+KeyCollection;get_SyncRoot;();Argument[this];ReturnValue;value;df-generated |
+| System.Collections.Generic;SortedDictionary<TKey,TValue>+KeyCollection;KeyCollection;(System.Collections.Generic.SortedDictionary<TKey,TValue>);Argument[0];Argument[this].SyntheticField[System.Collections.Generic.SortedDictionary`2+KeyCollection._dictionary];value;dfc-generated |
+| System.Collections.Generic;SortedDictionary<TKey,TValue>+KeyCollection;get_SyncRoot;();Argument[this].SyntheticField[System.Collections.Generic.SortedDictionary`2+KeyCollection._dictionary].Property[System.Collections.ICollection.SyncRoot];ReturnValue;value;dfc-generated |
+| System.Collections.Generic;SortedDictionary<TKey,TValue>+KeyCollection;get_SyncRoot;();Argument[this];ReturnValue;value;dfc-generated |
+| System.Collections.Generic;SortedDictionary<TKey,TValue>+ValueCollection+Enumerator;get_Current;();Argument[this].Property[System.Collections.Generic.SortedDictionary`2+ValueCollection+Enumerator.Current];ReturnValue;value;df-generated |
+| System.Collections.Generic;SortedDictionary<TKey,TValue>+ValueCollection+Enumerator;get_Current;();Argument[this].Property[System.Collections.Generic.SortedDictionary`2+ValueCollection+Enumerator.Current];ReturnValue;value;dfc-generated |
 | System.Collections.Generic;SortedDictionary<TKey,TValue>+ValueCollection+Enumerator;get_Current;();Argument[this];ReturnValue;taint;df-generated |
+| System.Collections.Generic;SortedDictionary<TKey,TValue>+ValueCollection+Enumerator;get_Current;();Argument[this];ReturnValue;taint;dfc-generated |
 | System.Collections.Generic;SortedDictionary<TKey,TValue>+ValueCollection;Add;(TValue);Argument[0];Argument[this].Element;value;manual |
 | System.Collections.Generic;SortedDictionary<TKey,TValue>+ValueCollection;Clear;();Argument[this].WithoutElement;Argument[this];value;manual |
 | System.Collections.Generic;SortedDictionary<TKey,TValue>+ValueCollection;CopyTo;(System.Array,System.Int32);Argument[this].Element;Argument[0].Element;value;manual |
@@ -6119,9 +6635,9 @@ summary
 | System.Collections.Generic;SortedDictionary<TKey,TValue>+ValueCollection;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.Generic.IEnumerator`1.Current];value;manual |
 | System.Collections.Generic;SortedDictionary<TKey,TValue>+ValueCollection;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.Generic.SortedDictionary`2+ValueCollection+Enumerator.Current];value;manual |
 | System.Collections.Generic;SortedDictionary<TKey,TValue>+ValueCollection;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.IEnumerator.Current];value;manual |
-| System.Collections.Generic;SortedDictionary<TKey,TValue>+ValueCollection;ValueCollection;(System.Collections.Generic.SortedDictionary<TKey,TValue>);Argument[0].Element;Argument[this];taint;df-generated |
-| System.Collections.Generic;SortedDictionary<TKey,TValue>+ValueCollection;get_SyncRoot;();Argument[this];ReturnValue;taint;df-generated |
-| System.Collections.Generic;SortedDictionary<TKey,TValue>+ValueCollection;get_SyncRoot;();Argument[this];ReturnValue;value;df-generated |
+| System.Collections.Generic;SortedDictionary<TKey,TValue>+ValueCollection;ValueCollection;(System.Collections.Generic.SortedDictionary<TKey,TValue>);Argument[0];Argument[this].SyntheticField[System.Collections.Generic.SortedDictionary`2+ValueCollection._dictionary];value;dfc-generated |
+| System.Collections.Generic;SortedDictionary<TKey,TValue>+ValueCollection;get_SyncRoot;();Argument[this].SyntheticField[System.Collections.Generic.SortedDictionary`2+ValueCollection._dictionary].Property[System.Collections.ICollection.SyncRoot];ReturnValue;value;dfc-generated |
+| System.Collections.Generic;SortedDictionary<TKey,TValue>+ValueCollection;get_SyncRoot;();Argument[this];ReturnValue;value;dfc-generated |
 | System.Collections.Generic;SortedDictionary<TKey,TValue>;Add;(System.Collections.Generic.KeyValuePair<TKey,TValue>);Argument[0].Property[System.Collections.Generic.KeyValuePair`2.Key];Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Key];value;manual |
 | System.Collections.Generic;SortedDictionary<TKey,TValue>;Add;(System.Collections.Generic.KeyValuePair<TKey,TValue>);Argument[0].Property[System.Collections.Generic.KeyValuePair`2.Value];Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Value];value;manual |
 | System.Collections.Generic;SortedDictionary<TKey,TValue>;Add;(System.Collections.Generic.KeyValuePair<TKey,TValue>);Argument[0];Argument[this].Element;value;manual |
@@ -6142,8 +6658,7 @@ summary
 | System.Collections.Generic;SortedDictionary<TKey,TValue>;get_Item;(System.Object);Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Value];ReturnValue;value;manual |
 | System.Collections.Generic;SortedDictionary<TKey,TValue>;get_Item;(TKey);Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Value];ReturnValue;value;manual |
 | System.Collections.Generic;SortedDictionary<TKey,TValue>;get_Keys;();Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Key];ReturnValue.Element;value;manual |
-| System.Collections.Generic;SortedDictionary<TKey,TValue>;get_SyncRoot;();Argument[this];ReturnValue;taint;df-generated |
-| System.Collections.Generic;SortedDictionary<TKey,TValue>;get_SyncRoot;();Argument[this];ReturnValue;value;df-generated |
+| System.Collections.Generic;SortedDictionary<TKey,TValue>;get_SyncRoot;();Argument[this];ReturnValue;value;dfc-generated |
 | System.Collections.Generic;SortedDictionary<TKey,TValue>;get_Values;();Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Value];ReturnValue.Element;value;manual |
 | System.Collections.Generic;SortedDictionary<TKey,TValue>;set_Item;(System.Object,System.Object);Argument[0];Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Key];value;manual |
 | System.Collections.Generic;SortedDictionary<TKey,TValue>;set_Item;(System.Object,System.Object);Argument[1];Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Value];value;manual |
@@ -6162,20 +6677,19 @@ summary
 | System.Collections.Generic;SortedList<TKey,TValue>;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.Generic.IEnumerator`1.Current];value;manual |
 | System.Collections.Generic;SortedList<TKey,TValue>;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.IEnumerator.Current];value;manual |
 | System.Collections.Generic;SortedList<TKey,TValue>;GetKeyAtIndex;(System.Int32);Argument[this];ReturnValue;taint;df-generated |
-| System.Collections.Generic;SortedList<TKey,TValue>;GetValueAtIndex;(System.Int32);Argument[this];ReturnValue;taint;df-generated |
-| System.Collections.Generic;SortedList<TKey,TValue>;SetValueAtIndex;(System.Int32,TValue);Argument[1];Argument[this];taint;df-generated |
-| System.Collections.Generic;SortedList<TKey,TValue>;SortedList;(System.Collections.Generic.IComparer<TKey>);Argument[0];Argument[this];taint;df-generated |
+| System.Collections.Generic;SortedList<TKey,TValue>;GetValueAtIndex;(System.Int32);Argument[this].SyntheticField[System.Collections.Generic.SortedList`2.values].Element;ReturnValue;value;dfc-generated |
+| System.Collections.Generic;SortedList<TKey,TValue>;SetValueAtIndex;(System.Int32,TValue);Argument[1];Argument[this].SyntheticField[System.Collections.Generic.SortedList`2.values].Element;value;dfc-generated |
+| System.Collections.Generic;SortedList<TKey,TValue>;SortedList;(System.Collections.Generic.IComparer<TKey>);Argument[0];Argument[this].SyntheticField[System.Collections.Generic.SortedList`2.comparer];value;dfc-generated |
 | System.Collections.Generic;SortedList<TKey,TValue>;SortedList;(System.Collections.Generic.IDictionary<TKey,TValue>);Argument[0].Element.Property[System.Collections.Generic.KeyValuePair`2.Key];Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Key];value;manual |
 | System.Collections.Generic;SortedList<TKey,TValue>;SortedList;(System.Collections.Generic.IDictionary<TKey,TValue>);Argument[0].Element.Property[System.Collections.Generic.KeyValuePair`2.Value];Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Value];value;manual |
 | System.Collections.Generic;SortedList<TKey,TValue>;SortedList;(System.Collections.Generic.IDictionary<TKey,TValue>,System.Collections.Generic.IComparer<TKey>);Argument[0].Element.Property[System.Collections.Generic.KeyValuePair`2.Key];Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Key];value;manual |
 | System.Collections.Generic;SortedList<TKey,TValue>;SortedList;(System.Collections.Generic.IDictionary<TKey,TValue>,System.Collections.Generic.IComparer<TKey>);Argument[0].Element.Property[System.Collections.Generic.KeyValuePair`2.Value];Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Value];value;manual |
-| System.Collections.Generic;SortedList<TKey,TValue>;TryGetValue;(TKey,TValue);Argument[this];ReturnValue;taint;df-generated |
-| System.Collections.Generic;SortedList<TKey,TValue>;get_Comparer;();Argument[this];ReturnValue;taint;df-generated |
+| System.Collections.Generic;SortedList<TKey,TValue>;TryGetValue;(TKey,TValue);Argument[this].SyntheticField[System.Collections.Generic.SortedList`2.values].Element;ReturnValue;value;dfc-generated |
+| System.Collections.Generic;SortedList<TKey,TValue>;get_Comparer;();Argument[this].SyntheticField[System.Collections.Generic.SortedList`2.comparer];ReturnValue;value;dfc-generated |
 | System.Collections.Generic;SortedList<TKey,TValue>;get_Item;(System.Object);Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Value];ReturnValue;value;manual |
 | System.Collections.Generic;SortedList<TKey,TValue>;get_Item;(TKey);Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Value];ReturnValue;value;manual |
 | System.Collections.Generic;SortedList<TKey,TValue>;get_Keys;();Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Key];ReturnValue.Element;value;manual |
-| System.Collections.Generic;SortedList<TKey,TValue>;get_SyncRoot;();Argument[this];ReturnValue;taint;df-generated |
-| System.Collections.Generic;SortedList<TKey,TValue>;get_SyncRoot;();Argument[this];ReturnValue;value;df-generated |
+| System.Collections.Generic;SortedList<TKey,TValue>;get_SyncRoot;();Argument[this];ReturnValue;value;dfc-generated |
 | System.Collections.Generic;SortedList<TKey,TValue>;get_Values;();Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Value];ReturnValue.Element;value;manual |
 | System.Collections.Generic;SortedList<TKey,TValue>;set_Item;(System.Object,System.Object);Argument[0];Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Key];value;manual |
 | System.Collections.Generic;SortedList<TKey,TValue>;set_Item;(System.Object,System.Object);Argument[1];Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Value];value;manual |
@@ -6186,9 +6700,9 @@ summary
 | System.Collections.Generic;SortedSet<T>;Add;(T);Argument[0];Argument[this].Element;value;manual |
 | System.Collections.Generic;SortedSet<T>;Clear;();Argument[this].WithoutElement;Argument[this];value;manual |
 | System.Collections.Generic;SortedSet<T>;CopyTo;(System.Array,System.Int32);Argument[this].Element;Argument[0].Element;value;manual |
-| System.Collections.Generic;SortedSet<T>;CopyTo;(T[]);Argument[this];Argument[0].Element;taint;df-generated |
+| System.Collections.Generic;SortedSet<T>;CopyTo;(T[]);Argument[this].SyntheticField[System.Collections.Generic.SortedSet`1.root].SyntheticField[System.Collections.Generic.SortedSet`1+Node.Item];Argument[0].Element;value;dfc-generated |
 | System.Collections.Generic;SortedSet<T>;CopyTo;(T[],System.Int32);Argument[this].Element;Argument[0].Element;value;manual |
-| System.Collections.Generic;SortedSet<T>;CopyTo;(T[],System.Int32,System.Int32);Argument[this];Argument[0].Element;taint;df-generated |
+| System.Collections.Generic;SortedSet<T>;CopyTo;(T[],System.Int32,System.Int32);Argument[this].SyntheticField[System.Collections.Generic.SortedSet`1.root].SyntheticField[System.Collections.Generic.SortedSet`1+Node.Item];Argument[0].Element;value;dfc-generated |
 | System.Collections.Generic;SortedSet<T>;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.Generic.IEnumerator`1.Current];value;manual |
 | System.Collections.Generic;SortedSet<T>;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.Generic.SortedSet`1+Enumerator.Current];value;manual |
 | System.Collections.Generic;SortedSet<T>;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.IEnumerator.Current];value;manual |
@@ -6196,21 +6710,27 @@ summary
 | System.Collections.Generic;SortedSet<T>;GetViewBetween;(T,T);Argument[0];ReturnValue;taint;df-generated |
 | System.Collections.Generic;SortedSet<T>;GetViewBetween;(T,T);Argument[1];ReturnValue;taint;df-generated |
 | System.Collections.Generic;SortedSet<T>;GetViewBetween;(T,T);Argument[this];ReturnValue;taint;df-generated |
-| System.Collections.Generic;SortedSet<T>;IntersectWith;(System.Collections.Generic.IEnumerable<T>);Argument[0].Element;Argument[this];taint;df-generated |
+| System.Collections.Generic;SortedSet<T>;IntersectWith;(System.Collections.Generic.IEnumerable<T>);Argument[0].Element;Argument[this].Element;value;dfc-generated |
+| System.Collections.Generic;SortedSet<T>;IntersectWith;(System.Collections.Generic.IEnumerable<T>);Argument[0].Element;Argument[this].SyntheticField[System.Collections.Generic.SortedSet`1.root].SyntheticField[System.Collections.Generic.SortedSet`1+Node.Item];value;dfc-generated |
 | System.Collections.Generic;SortedSet<T>;RemoveWhere;(System.Predicate<T>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Collections.Generic;SortedSet<T>;Reverse;();Argument[this].Element;ReturnValue.Element;value;manual |
-| System.Collections.Generic;SortedSet<T>;SortedSet;(System.Collections.Generic.IComparer<T>);Argument[0];Argument[this];taint;df-generated |
-| System.Collections.Generic;SortedSet<T>;SortedSet;(System.Collections.Generic.IEnumerable<T>,System.Collections.Generic.IComparer<T>);Argument[0].Element;Argument[this];taint;df-generated |
+| System.Collections.Generic;SortedSet<T>;SortedSet;(System.Collections.Generic.IComparer<T>);Argument[0];Argument[this].SyntheticField[System.Collections.Generic.SortedSet`1.comparer];value;dfc-generated |
+| System.Collections.Generic;SortedSet<T>;SortedSet;(System.Collections.Generic.IEnumerable<T>,System.Collections.Generic.IComparer<T>);Argument[0].Element;Argument[this].SyntheticField[System.Collections.Generic.SortedSet`1.root].SyntheticField[System.Collections.Generic.SortedSet`1+Node.Item];value;dfc-generated |
 | System.Collections.Generic;SortedSet<T>;SortedSet;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);Argument[0];Argument[this];taint;df-generated |
-| System.Collections.Generic;SortedSet<T>;SymmetricExceptWith;(System.Collections.Generic.IEnumerable<T>);Argument[0].Element;Argument[this];taint;df-generated |
-| System.Collections.Generic;SortedSet<T>;TryGetValue;(T,T);Argument[this];ReturnValue;taint;df-generated |
-| System.Collections.Generic;SortedSet<T>;UnionWith;(System.Collections.Generic.IEnumerable<T>);Argument[0].Element;Argument[this];taint;df-generated |
-| System.Collections.Generic;SortedSet<T>;get_Comparer;();Argument[this];ReturnValue;taint;df-generated |
-| System.Collections.Generic;SortedSet<T>;get_Max;();Argument[this];ReturnValue;taint;df-generated |
-| System.Collections.Generic;SortedSet<T>;get_Min;();Argument[this];ReturnValue;taint;df-generated |
-| System.Collections.Generic;SortedSet<T>;get_SyncRoot;();Argument[this];ReturnValue;taint;df-generated |
-| System.Collections.Generic;SortedSet<T>;get_SyncRoot;();Argument[this];ReturnValue;value;df-generated |
+| System.Collections.Generic;SortedSet<T>;SymmetricExceptWith;(System.Collections.Generic.IEnumerable<T>);Argument[0].Element;Argument[this].Element;value;dfc-generated |
+| System.Collections.Generic;SortedSet<T>;SymmetricExceptWith;(System.Collections.Generic.IEnumerable<T>);Argument[0].Element;Argument[this].SyntheticField[System.Collections.Generic.SortedSet`1.root].SyntheticField[System.Collections.Generic.SortedSet`1+Node.Item];value;dfc-generated |
+| System.Collections.Generic;SortedSet<T>;TryGetValue;(T,T);Argument[this].SyntheticField[System.Collections.Generic.SortedSet`1.root].SyntheticField[System.Collections.Generic.SortedSet`1+Node.Item];ReturnValue;value;dfc-generated |
+| System.Collections.Generic;SortedSet<T>;UnionWith;(System.Collections.Generic.IEnumerable<T>);Argument[0].Element;Argument[this].Element;value;dfc-generated |
+| System.Collections.Generic;SortedSet<T>;UnionWith;(System.Collections.Generic.IEnumerable<T>);Argument[0].Element;Argument[this].SyntheticField[System.Collections.Generic.SortedSet`1.root].SyntheticField[System.Collections.Generic.SortedSet`1+Node.Item];value;dfc-generated |
+| System.Collections.Generic;SortedSet<T>;UnionWith;(System.Collections.Generic.IEnumerable<T>);Argument[this].Element;Argument[this].SyntheticField[System.Collections.Generic.SortedSet`1.root].SyntheticField[System.Collections.Generic.SortedSet`1+Node.Item];value;dfc-generated |
+| System.Collections.Generic;SortedSet<T>;get_Comparer;();Argument[this].SyntheticField[System.Collections.Generic.SortedSet`1.comparer];ReturnValue;value;dfc-generated |
+| System.Collections.Generic;SortedSet<T>;get_Max;();Argument[this].SyntheticField[System.Collections.Generic.SortedSet`1.root].SyntheticField[System.Collections.Generic.SortedSet`1+Node.Item];ReturnValue;value;dfc-generated |
+| System.Collections.Generic;SortedSet<T>;get_Min;();Argument[this].SyntheticField[System.Collections.Generic.SortedSet`1.root].SyntheticField[System.Collections.Generic.SortedSet`1+Node.Item];ReturnValue;value;dfc-generated |
+| System.Collections.Generic;SortedSet<T>;get_SyncRoot;();Argument[this];ReturnValue;value;dfc-generated |
+| System.Collections.Generic;Stack<T>+Enumerator;get_Current;();Argument[this].Property[System.Collections.Generic.Stack`1+Enumerator.Current];ReturnValue;value;df-generated |
+| System.Collections.Generic;Stack<T>+Enumerator;get_Current;();Argument[this].Property[System.Collections.Generic.Stack`1+Enumerator.Current];ReturnValue;value;dfc-generated |
 | System.Collections.Generic;Stack<T>+Enumerator;get_Current;();Argument[this];ReturnValue;taint;df-generated |
+| System.Collections.Generic;Stack<T>+Enumerator;get_Current;();Argument[this];ReturnValue;taint;dfc-generated |
 | System.Collections.Generic;Stack<T>;Clear;();Argument[this].WithoutElement;Argument[this];value;manual |
 | System.Collections.Generic;Stack<T>;CopyTo;(System.Array,System.Int32);Argument[this].Element;Argument[0].Element;value;manual |
 | System.Collections.Generic;Stack<T>;CopyTo;(T[],System.Int32);Argument[this].Element;Argument[0].Element;value;manual |
@@ -6219,13 +6739,12 @@ summary
 | System.Collections.Generic;Stack<T>;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.IEnumerator.Current];value;manual |
 | System.Collections.Generic;Stack<T>;Peek;();Argument[this].Element;ReturnValue;value;manual |
 | System.Collections.Generic;Stack<T>;Pop;();Argument[this].Element;ReturnValue;value;manual |
-| System.Collections.Generic;Stack<T>;Push;(T);Argument[0];Argument[this];taint;df-generated |
-| System.Collections.Generic;Stack<T>;Stack;(System.Collections.Generic.IEnumerable<T>);Argument[0].Element;Argument[this];taint;df-generated |
-| System.Collections.Generic;Stack<T>;ToArray;();Argument[this];ReturnValue;taint;df-generated |
-| System.Collections.Generic;Stack<T>;TryPeek;(T);Argument[this];ReturnValue;taint;df-generated |
-| System.Collections.Generic;Stack<T>;TryPop;(T);Argument[this];ReturnValue;taint;df-generated |
-| System.Collections.Generic;Stack<T>;get_SyncRoot;();Argument[this];ReturnValue;taint;df-generated |
-| System.Collections.Generic;Stack<T>;get_SyncRoot;();Argument[this];ReturnValue;value;df-generated |
+| System.Collections.Generic;Stack<T>;Push;(T);Argument[0];Argument[this].SyntheticField[System.Collections.Generic.Stack`1._array].Element;value;dfc-generated |
+| System.Collections.Generic;Stack<T>;Stack;(System.Collections.Generic.IEnumerable<T>);Argument[0].Element;Argument[this].SyntheticField[System.Collections.Generic.Stack`1._array].Element;value;dfc-generated |
+| System.Collections.Generic;Stack<T>;ToArray;();Argument[this].SyntheticField[System.Collections.Generic.Stack`1._array].Element;ReturnValue.Element;value;dfc-generated |
+| System.Collections.Generic;Stack<T>;TryPeek;(T);Argument[this].SyntheticField[System.Collections.Generic.Stack`1._array].Element;ReturnValue;value;dfc-generated |
+| System.Collections.Generic;Stack<T>;TryPop;(T);Argument[this].SyntheticField[System.Collections.Generic.Stack`1._array].Element;ReturnValue;value;dfc-generated |
+| System.Collections.Generic;Stack<T>;get_SyncRoot;();Argument[this];ReturnValue;value;dfc-generated |
 | System.Collections.Immutable;IImmutableDictionary<TKey,TValue>;AddRange;(System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<TKey,TValue>>);Argument[0].Element;Argument[this].Element;value;manual |
 | System.Collections.Immutable;IImmutableDictionary<TKey,TValue>;Clear;();Argument[this].WithoutElement;ReturnValue;value;manual |
 | System.Collections.Immutable;IImmutableList<T>;Add;(T);Argument[0];Argument[this].Element;value;manual |
@@ -6236,7 +6755,7 @@ summary
 | System.Collections.Immutable;IImmutableSet<T>;Add;(T);Argument[0];Argument[this].Element;value;manual |
 | System.Collections.Immutable;IImmutableSet<T>;Clear;();Argument[this].WithoutElement;ReturnValue;value;manual |
 | System.Collections.Immutable;IImmutableStack<T>;Clear;();Argument[this].WithoutElement;ReturnValue;value;manual |
-| System.Collections.Immutable;ImmutableArray;Create<T>;(System.Collections.Immutable.ImmutableArray<T>,System.Int32,System.Int32);Argument[0].Element;ReturnValue;taint;df-generated |
+| System.Collections.Immutable;ImmutableArray;Create<T>;(System.Collections.Immutable.ImmutableArray<T>,System.Int32,System.Int32);Argument[0];ReturnValue;value;dfc-generated |
 | System.Collections.Immutable;ImmutableArray;Create<T>;(System.ReadOnlySpan<T>);Argument[0];ReturnValue;taint;df-generated |
 | System.Collections.Immutable;ImmutableArray;Create<T>;(System.Span<T>);Argument[0];ReturnValue;taint;df-generated |
 | System.Collections.Immutable;ImmutableArray;Create<T>;(T);Argument[0];ReturnValue;taint;df-generated |
@@ -6251,13 +6770,19 @@ summary
 | System.Collections.Immutable;ImmutableArray;Create<T>;(T,T,T,T);Argument[3];ReturnValue;taint;df-generated |
 | System.Collections.Immutable;ImmutableArray;Create<T>;(T[],System.Int32,System.Int32);Argument[0].Element;ReturnValue;taint;df-generated |
 | System.Collections.Immutable;ImmutableArray;CreateRange<T>;(System.Collections.Generic.IEnumerable<T>);Argument[0].Element;ReturnValue;taint;df-generated |
+| System.Collections.Immutable;ImmutableArray;CreateRange<TSource,TArg,TResult>;(System.Collections.Immutable.ImmutableArray<TSource>,System.Func<TSource,TArg,TResult>,TArg);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | System.Collections.Immutable;ImmutableArray;CreateRange<TSource,TArg,TResult>;(System.Collections.Immutable.ImmutableArray<TSource>,System.Func<TSource,TArg,TResult>,TArg);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
+| System.Collections.Immutable;ImmutableArray;CreateRange<TSource,TArg,TResult>;(System.Collections.Immutable.ImmutableArray<TSource>,System.Func<TSource,TArg,TResult>,TArg);Argument[2];Argument[1].Parameter[1];value;dfc-generated |
+| System.Collections.Immutable;ImmutableArray;CreateRange<TSource,TArg,TResult>;(System.Collections.Immutable.ImmutableArray<TSource>,System.Func<TSource,TArg,TResult>,TArg);Argument[2];Argument[1].Parameter[1];value;hq-generated |
+| System.Collections.Immutable;ImmutableArray;CreateRange<TSource,TArg,TResult>;(System.Collections.Immutable.ImmutableArray<TSource>,System.Int32,System.Int32,System.Func<TSource,TArg,TResult>,TArg);Argument[3];Argument[3].Parameter[delegate-self];value;dfc-generated |
 | System.Collections.Immutable;ImmutableArray;CreateRange<TSource,TArg,TResult>;(System.Collections.Immutable.ImmutableArray<TSource>,System.Int32,System.Int32,System.Func<TSource,TArg,TResult>,TArg);Argument[3];Argument[3].Parameter[delegate-self];value;hq-generated |
+| System.Collections.Immutable;ImmutableArray;CreateRange<TSource,TArg,TResult>;(System.Collections.Immutable.ImmutableArray<TSource>,System.Int32,System.Int32,System.Func<TSource,TArg,TResult>,TArg);Argument[4];Argument[3].Parameter[1];value;dfc-generated |
+| System.Collections.Immutable;ImmutableArray;CreateRange<TSource,TArg,TResult>;(System.Collections.Immutable.ImmutableArray<TSource>,System.Int32,System.Int32,System.Func<TSource,TArg,TResult>,TArg);Argument[4];Argument[3].Parameter[1];value;hq-generated |
 | System.Collections.Immutable;ImmutableArray;CreateRange<TSource,TResult>;(System.Collections.Immutable.ImmutableArray<TSource>,System.Func<TSource,TResult>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
 | System.Collections.Immutable;ImmutableArray;CreateRange<TSource,TResult>;(System.Collections.Immutable.ImmutableArray<TSource>,System.Int32,System.Int32,System.Func<TSource,TResult>);Argument[3];Argument[3].Parameter[delegate-self];value;hq-generated |
 | System.Collections.Immutable;ImmutableArray;ToImmutableArray<T>;(System.ReadOnlySpan<T>);Argument[0].Element;ReturnValue.Element;value;manual |
 | System.Collections.Immutable;ImmutableArray;ToImmutableArray<T>;(System.Span<T>);Argument[0].Element;ReturnValue.Element;value;manual |
-| System.Collections.Immutable;ImmutableArray;ToImmutableArray<TSource>;(System.Collections.Generic.IEnumerable<TSource>);Argument[0].Element;ReturnValue;taint;df-generated |
+| System.Collections.Immutable;ImmutableArray;ToImmutableArray<TSource>;(System.Collections.Generic.IEnumerable<TSource>);Argument[0];ReturnValue;value;dfc-generated |
 | System.Collections.Immutable;ImmutableArray<T>+Builder;Add;(T);Argument[0];Argument[this].Element;value;manual |
 | System.Collections.Immutable;ImmutableArray<T>+Builder;AddRange;(System.Collections.Generic.IEnumerable<T>);Argument[0].Element;Argument[this].Element;value;manual |
 | System.Collections.Immutable;ImmutableArray<T>+Builder;AddRange;(System.Collections.Immutable.ImmutableArray<T>);Argument[0].Element;Argument[this].Element;value;manual |
@@ -6267,94 +6792,134 @@ summary
 | System.Collections.Immutable;ImmutableArray<T>+Builder;AddRange<TDerived>;(System.Collections.Immutable.ImmutableArray<TDerived>+Builder);Argument[0].Element;Argument[this].Element;value;manual |
 | System.Collections.Immutable;ImmutableArray<T>+Builder;AddRange<TDerived>;(TDerived[]);Argument[0].Element;Argument[this].Element;value;manual |
 | System.Collections.Immutable;ImmutableArray<T>+Builder;Clear;();Argument[this].WithoutElement;Argument[this];value;manual |
-| System.Collections.Immutable;ImmutableArray<T>+Builder;CopyTo;(System.Span<T>);Argument[this];Argument[0];taint;df-generated |
+| System.Collections.Immutable;ImmutableArray<T>+Builder;CopyTo;(System.Span<T>);Argument[this].SyntheticField[System.Collections.Immutable.ImmutableArray`1+Builder._elements].Element;Argument[0].Element;value;dfc-generated |
 | System.Collections.Immutable;ImmutableArray<T>+Builder;CopyTo;(T[],System.Int32);Argument[this].Element;Argument[0].Element;value;manual |
-| System.Collections.Immutable;ImmutableArray<T>+Builder;DrainToImmutable;();Argument[this];ReturnValue;taint;df-generated |
+| System.Collections.Immutable;ImmutableArray<T>+Builder;DrainToImmutable;();Argument[this].SyntheticField[System.Collections.Immutable.ImmutableArray`1+Builder._elements];ReturnValue.SyntheticField[System.Collections.Immutable.ImmutableArray`1.array];value;dfc-generated |
 | System.Collections.Immutable;ImmutableArray<T>+Builder;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.Generic.IEnumerator`1.Current];value;manual |
 | System.Collections.Immutable;ImmutableArray<T>+Builder;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.IEnumerator.Current];value;manual |
+| System.Collections.Immutable;ImmutableArray<T>+Builder;IndexOf;(T,System.Int32,System.Collections.Generic.IEqualityComparer<T>);Argument[0];Argument[2];taint;df-generated |
+| System.Collections.Immutable;ImmutableArray<T>+Builder;IndexOf;(T,System.Int32,System.Collections.Generic.IEqualityComparer<T>);Argument[this];Argument[2];taint;df-generated |
+| System.Collections.Immutable;ImmutableArray<T>+Builder;IndexOf;(T,System.Int32,System.Int32,System.Collections.Generic.IEqualityComparer<T>);Argument[0];Argument[3];taint;df-generated |
+| System.Collections.Immutable;ImmutableArray<T>+Builder;IndexOf;(T,System.Int32,System.Int32,System.Collections.Generic.IEqualityComparer<T>);Argument[this];Argument[3];taint;df-generated |
 | System.Collections.Immutable;ImmutableArray<T>+Builder;Insert;(System.Int32,T);Argument[1];Argument[this].Element;value;manual |
-| System.Collections.Immutable;ImmutableArray<T>+Builder;InsertRange;(System.Int32,System.Collections.Generic.IEnumerable<T>);Argument[1].Element;Argument[this];taint;df-generated |
-| System.Collections.Immutable;ImmutableArray<T>+Builder;MoveToImmutable;();Argument[this];ReturnValue;taint;df-generated |
+| System.Collections.Immutable;ImmutableArray<T>+Builder;InsertRange;(System.Int32,System.Collections.Generic.IEnumerable<T>);Argument[1].Element;Argument[this].SyntheticField[System.Collections.Immutable.ImmutableArray`1+Builder._elements].Element;value;dfc-generated |
+| System.Collections.Immutable;ImmutableArray<T>+Builder;LastIndexOf;(T,System.Int32,System.Int32,System.Collections.Generic.IEqualityComparer<T>);Argument[0];Argument[3];taint;df-generated |
+| System.Collections.Immutable;ImmutableArray<T>+Builder;LastIndexOf;(T,System.Int32,System.Int32,System.Collections.Generic.IEqualityComparer<T>);Argument[this];Argument[3];taint;df-generated |
+| System.Collections.Immutable;ImmutableArray<T>+Builder;MoveToImmutable;();Argument[this].SyntheticField[System.Collections.Immutable.ImmutableArray`1+Builder._elements];ReturnValue.SyntheticField[System.Collections.Immutable.ImmutableArray`1.array];value;dfc-generated |
+| System.Collections.Immutable;ImmutableArray<T>+Builder;Remove;(T,System.Collections.Generic.IEqualityComparer<T>);Argument[0];Argument[1];taint;df-generated |
+| System.Collections.Immutable;ImmutableArray<T>+Builder;Remove;(T,System.Collections.Generic.IEqualityComparer<T>);Argument[this];Argument[1];taint;df-generated |
+| System.Collections.Immutable;ImmutableArray<T>+Builder;RemoveAll;(System.Predicate<T>);Argument[0];Argument[0].Parameter[delegate-self];value;dfc-generated |
 | System.Collections.Immutable;ImmutableArray<T>+Builder;RemoveAll;(System.Predicate<T>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
-| System.Collections.Immutable;ImmutableArray<T>+Builder;Replace;(T,T);Argument[1];Argument[this];taint;df-generated |
-| System.Collections.Immutable;ImmutableArray<T>+Builder;Replace;(T,T,System.Collections.Generic.IEqualityComparer<T>);Argument[1];Argument[this];taint;df-generated |
+| System.Collections.Immutable;ImmutableArray<T>+Builder;RemoveAll;(System.Predicate<T>);Argument[this].SyntheticField[System.Collections.Immutable.ImmutableArray`1+Builder._elements].Element;Argument[0].Parameter[0];value;dfc-generated |
+| System.Collections.Immutable;ImmutableArray<T>+Builder;RemoveAll;(System.Predicate<T>);Argument[this].SyntheticField[System.Collections.Immutable.ImmutableArray`1+Builder._elements].Element;Argument[0].Parameter[0];value;hq-generated |
+| System.Collections.Immutable;ImmutableArray<T>+Builder;RemoveRange;(System.Collections.Generic.IEnumerable<T>,System.Collections.Generic.IEqualityComparer<T>);Argument[0].Element;Argument[1];taint;df-generated |
+| System.Collections.Immutable;ImmutableArray<T>+Builder;RemoveRange;(System.Collections.Generic.IEnumerable<T>,System.Collections.Generic.IEqualityComparer<T>);Argument[this];Argument[1];taint;df-generated |
+| System.Collections.Immutable;ImmutableArray<T>+Builder;Replace;(T,T);Argument[1];Argument[this].SyntheticField[System.Collections.Immutable.ImmutableArray`1+Builder._elements].Element;value;dfc-generated |
+| System.Collections.Immutable;ImmutableArray<T>+Builder;Replace;(T,T,System.Collections.Generic.IEqualityComparer<T>);Argument[1];Argument[this].SyntheticField[System.Collections.Immutable.ImmutableArray`1+Builder._elements].Element;value;dfc-generated |
 | System.Collections.Immutable;ImmutableArray<T>+Builder;Sort;(System.Comparison<T>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Collections.Immutable;ImmutableArray<T>+Builder;get_Item;(System.Int32);Argument[this].Element;ReturnValue;value;manual |
 | System.Collections.Immutable;ImmutableArray<T>+Builder;set_Item;(System.Int32,T);Argument[1];Argument[this].Element;value;manual |
-| System.Collections.Immutable;ImmutableArray<T>+Enumerator;get_Current;();Argument[this];ReturnValue;taint;df-generated |
+| System.Collections.Immutable;ImmutableArray<T>+Enumerator;get_Current;();Argument[this].SyntheticField[System.Collections.Immutable.ImmutableArray`1+Enumerator._array].Element;ReturnValue;value;dfc-generated |
 | System.Collections.Immutable;ImmutableArray<T>;Add;(System.Object);Argument[0];Argument[this].Element;value;manual |
 | System.Collections.Immutable;ImmutableArray<T>;Add;(T);Argument[0];Argument[this].Element;value;manual |
-| System.Collections.Immutable;ImmutableArray<T>;Add;(T);Argument[0];ReturnValue;taint;df-generated |
+| System.Collections.Immutable;ImmutableArray<T>;Add;(T);Argument[0];ReturnValue.SyntheticField[System.Collections.Immutable.ImmutableArray`1.array].Element;value;dfc-generated |
 | System.Collections.Immutable;ImmutableArray<T>;AddRange;(System.Collections.Generic.IEnumerable<T>);Argument[0].Element;Argument[this].Element;value;manual |
-| System.Collections.Immutable;ImmutableArray<T>;AddRange;(System.Collections.Generic.IEnumerable<T>);Argument[0].Element;ReturnValue;taint;df-generated |
-| System.Collections.Immutable;ImmutableArray<T>;AddRange;(System.Collections.Generic.IEnumerable<T>);Argument[this];ReturnValue;taint;df-generated |
-| System.Collections.Immutable;ImmutableArray<T>;AddRange;(System.Collections.Immutable.ImmutableArray<T>);Argument[0].Element;ReturnValue;taint;df-generated |
-| System.Collections.Immutable;ImmutableArray<T>;AddRange;(System.Collections.Immutable.ImmutableArray<T>);Argument[this];ReturnValue;taint;df-generated |
-| System.Collections.Immutable;ImmutableArray<T>;AddRange;(System.Collections.Immutable.ImmutableArray<T>,System.Int32);Argument[0].Element;ReturnValue;taint;df-generated |
-| System.Collections.Immutable;ImmutableArray<T>;AddRange;(System.Collections.Immutable.ImmutableArray<T>,System.Int32);Argument[this];ReturnValue;taint;df-generated |
-| System.Collections.Immutable;ImmutableArray<T>;AddRange;(System.ReadOnlySpan<T>);Argument[0];ReturnValue;taint;df-generated |
-| System.Collections.Immutable;ImmutableArray<T>;AddRange;(System.ReadOnlySpan<T>);Argument[this];ReturnValue;taint;df-generated |
-| System.Collections.Immutable;ImmutableArray<T>;AddRange;(T[]);Argument[0].Element;ReturnValue;taint;df-generated |
-| System.Collections.Immutable;ImmutableArray<T>;AddRange;(T[]);Argument[this];ReturnValue;taint;df-generated |
-| System.Collections.Immutable;ImmutableArray<T>;AddRange;(T[],System.Int32);Argument[0].Element;ReturnValue;taint;df-generated |
-| System.Collections.Immutable;ImmutableArray<T>;AddRange;(T[],System.Int32);Argument[this];ReturnValue;taint;df-generated |
-| System.Collections.Immutable;ImmutableArray<T>;AddRange<TDerived>;(System.Collections.Immutable.ImmutableArray<TDerived>);Argument[this];ReturnValue;taint;df-generated |
-| System.Collections.Immutable;ImmutableArray<T>;AddRange<TDerived>;(TDerived[]);Argument[this];ReturnValue;taint;df-generated |
+| System.Collections.Immutable;ImmutableArray<T>;AddRange;(System.Collections.Generic.IEnumerable<T>);Argument[0].Element;ReturnValue.SyntheticField[System.Collections.Immutable.ImmutableArray`1.array].Element;value;dfc-generated |
+| System.Collections.Immutable;ImmutableArray<T>;AddRange;(System.Collections.Generic.IEnumerable<T>);Argument[this];ReturnValue;value;dfc-generated |
+| System.Collections.Immutable;ImmutableArray<T>;AddRange;(System.Collections.Immutable.ImmutableArray<T>);Argument[0];ReturnValue;value;dfc-generated |
+| System.Collections.Immutable;ImmutableArray<T>;AddRange;(System.Collections.Immutable.ImmutableArray<T>);Argument[this];ReturnValue;value;dfc-generated |
+| System.Collections.Immutable;ImmutableArray<T>;AddRange;(System.Collections.Immutable.ImmutableArray<T>,System.Int32);Argument[0].SyntheticField[System.Collections.Immutable.ImmutableArray`1.array].Element;ReturnValue.SyntheticField[System.Collections.Immutable.ImmutableArray`1.array].Element;value;dfc-generated |
+| System.Collections.Immutable;ImmutableArray<T>;AddRange;(System.Collections.Immutable.ImmutableArray<T>,System.Int32);Argument[this];ReturnValue;value;dfc-generated |
+| System.Collections.Immutable;ImmutableArray<T>;AddRange;(System.ReadOnlySpan<T>);Argument[0].Element;ReturnValue.Element;value;dfc-generated |
+| System.Collections.Immutable;ImmutableArray<T>;AddRange;(System.ReadOnlySpan<T>);Argument[0].Element;ReturnValue.SyntheticField[System.Collections.Immutable.ImmutableArray`1.array].Element;value;dfc-generated |
+| System.Collections.Immutable;ImmutableArray<T>;AddRange;(System.ReadOnlySpan<T>);Argument[this];ReturnValue;value;dfc-generated |
+| System.Collections.Immutable;ImmutableArray<T>;AddRange;(T[]);Argument[0];ReturnValue.SyntheticField[System.Collections.Immutable.ImmutableArray`1.array];value;dfc-generated |
+| System.Collections.Immutable;ImmutableArray<T>;AddRange;(T[]);Argument[this];ReturnValue;value;dfc-generated |
+| System.Collections.Immutable;ImmutableArray<T>;AddRange;(T[],System.Int32);Argument[0].Element;ReturnValue.SyntheticField[System.Collections.Immutable.ImmutableArray`1.array].Element;value;dfc-generated |
+| System.Collections.Immutable;ImmutableArray<T>;AddRange;(T[],System.Int32);Argument[this];ReturnValue;value;dfc-generated |
+| System.Collections.Immutable;ImmutableArray<T>;AddRange<TDerived>;(System.Collections.Immutable.ImmutableArray<TDerived>);Argument[this];ReturnValue;value;dfc-generated |
+| System.Collections.Immutable;ImmutableArray<T>;AddRange<TDerived>;(TDerived[]);Argument[this];ReturnValue;value;dfc-generated |
 | System.Collections.Immutable;ImmutableArray<T>;As<TOther>;();Argument[this];ReturnValue;taint;df-generated |
-| System.Collections.Immutable;ImmutableArray<T>;AsMemory;();Argument[this];ReturnValue;taint;df-generated |
-| System.Collections.Immutable;ImmutableArray<T>;AsSpan;();Argument[this];ReturnValue;taint;df-generated |
-| System.Collections.Immutable;ImmutableArray<T>;AsSpan;(System.Int32,System.Int32);Argument[this];ReturnValue;taint;df-generated |
-| System.Collections.Immutable;ImmutableArray<T>;AsSpan;(System.Range);Argument[this];ReturnValue;taint;df-generated |
+| System.Collections.Immutable;ImmutableArray<T>;AsSpan;();Argument[this].SyntheticField[System.Collections.Immutable.ImmutableArray`1.array].Element;ReturnValue.Element;value;dfc-generated |
+| System.Collections.Immutable;ImmutableArray<T>;AsSpan;(System.Int32,System.Int32);Argument[this].SyntheticField[System.Collections.Immutable.ImmutableArray`1.array].Element;ReturnValue.Element;value;dfc-generated |
+| System.Collections.Immutable;ImmutableArray<T>;AsSpan;(System.Range);Argument[this].SyntheticField[System.Collections.Immutable.ImmutableArray`1.array].Element;ReturnValue.Element;value;dfc-generated |
 | System.Collections.Immutable;ImmutableArray<T>;CastArray<TOther>;();Argument[this];ReturnValue;taint;df-generated |
 | System.Collections.Immutable;ImmutableArray<T>;CastUp<TDerived>;(System.Collections.Immutable.ImmutableArray<TDerived>);Argument[0].Element;ReturnValue;taint;df-generated |
 | System.Collections.Immutable;ImmutableArray<T>;Clear;();Argument[this].WithoutElement;Argument[this];value;manual |
 | System.Collections.Immutable;ImmutableArray<T>;Clear;();Argument[this].WithoutElement;ReturnValue;value;manual |
+| System.Collections.Immutable;ImmutableArray<T>;Contains;(T,System.Collections.Generic.IEqualityComparer<T>);Argument[0];Argument[1];taint;df-generated |
+| System.Collections.Immutable;ImmutableArray<T>;Contains;(T,System.Collections.Generic.IEqualityComparer<T>);Argument[this];Argument[1];taint;df-generated |
 | System.Collections.Immutable;ImmutableArray<T>;CopyTo;(System.Array,System.Int32);Argument[this].Element;Argument[0].Element;value;manual |
-| System.Collections.Immutable;ImmutableArray<T>;CopyTo;(System.Span<T>);Argument[this];Argument[0];taint;df-generated |
+| System.Collections.Immutable;ImmutableArray<T>;CopyTo;(System.Span<T>);Argument[this].SyntheticField[System.Collections.Immutable.ImmutableArray`1.array].Element;Argument[0].Element;value;dfc-generated |
 | System.Collections.Immutable;ImmutableArray<T>;CopyTo;(T[],System.Int32);Argument[this].Element;Argument[0].Element;value;manual |
 | System.Collections.Immutable;ImmutableArray<T>;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.Generic.IEnumerator`1.Current];value;manual |
 | System.Collections.Immutable;ImmutableArray<T>;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.IEnumerator.Current];value;manual |
-| System.Collections.Immutable;ImmutableArray<T>;GetEnumerator;();Argument[this];ReturnValue;taint;df-generated |
+| System.Collections.Immutable;ImmutableArray<T>;GetEnumerator;();Argument[this].SyntheticField[System.Collections.Immutable.ImmutableArray`1.array];ReturnValue.SyntheticField[System.Collections.Immutable.ImmutableArray`1+Enumerator._array];value;dfc-generated |
+| System.Collections.Immutable;ImmutableArray<T>;IndexOf;(T,System.Int32,System.Collections.Generic.IEqualityComparer<T>);Argument[0];Argument[2];taint;df-generated |
+| System.Collections.Immutable;ImmutableArray<T>;IndexOf;(T,System.Int32,System.Collections.Generic.IEqualityComparer<T>);Argument[this];Argument[2];taint;df-generated |
+| System.Collections.Immutable;ImmutableArray<T>;IndexOf;(T,System.Int32,System.Int32,System.Collections.Generic.IEqualityComparer<T>);Argument[0];Argument[3];taint;df-generated |
+| System.Collections.Immutable;ImmutableArray<T>;IndexOf;(T,System.Int32,System.Int32,System.Collections.Generic.IEqualityComparer<T>);Argument[this];Argument[3];taint;df-generated |
 | System.Collections.Immutable;ImmutableArray<T>;Insert;(System.Int32,System.Object);Argument[1];Argument[this].Element;value;manual |
 | System.Collections.Immutable;ImmutableArray<T>;Insert;(System.Int32,T);Argument[1];Argument[this].Element;value;manual |
+| System.Collections.Immutable;ImmutableArray<T>;Insert;(System.Int32,T);Argument[1];ReturnValue.SyntheticField[System.Collections.Immutable.ImmutableArray`1.array].Element;value;df-generated |
+| System.Collections.Immutable;ImmutableArray<T>;Insert;(System.Int32,T);Argument[1];ReturnValue.SyntheticField[System.Collections.Immutable.ImmutableArray`1.array].Element;value;dfc-generated |
 | System.Collections.Immutable;ImmutableArray<T>;Insert;(System.Int32,T);Argument[1];ReturnValue;taint;df-generated |
-| System.Collections.Immutable;ImmutableArray<T>;InsertRange;(System.Int32,System.Collections.Generic.IEnumerable<T>);Argument[1].Element;ReturnValue;taint;df-generated |
-| System.Collections.Immutable;ImmutableArray<T>;InsertRange;(System.Int32,System.Collections.Generic.IEnumerable<T>);Argument[this];ReturnValue;taint;df-generated |
-| System.Collections.Immutable;ImmutableArray<T>;InsertRange;(System.Int32,System.Collections.Immutable.ImmutableArray<T>);Argument[1].Element;ReturnValue;taint;df-generated |
-| System.Collections.Immutable;ImmutableArray<T>;InsertRange;(System.Int32,System.Collections.Immutable.ImmutableArray<T>);Argument[this];ReturnValue;taint;df-generated |
-| System.Collections.Immutable;ImmutableArray<T>;InsertRange;(System.Int32,System.ReadOnlySpan<T>);Argument[1];ReturnValue;taint;df-generated |
-| System.Collections.Immutable;ImmutableArray<T>;InsertRange;(System.Int32,System.ReadOnlySpan<T>);Argument[this];ReturnValue;taint;df-generated |
-| System.Collections.Immutable;ImmutableArray<T>;InsertRange;(System.Int32,T[]);Argument[1].Element;ReturnValue;taint;df-generated |
-| System.Collections.Immutable;ImmutableArray<T>;InsertRange;(System.Int32,T[]);Argument[this];ReturnValue;taint;df-generated |
-| System.Collections.Immutable;ImmutableArray<T>;OfType<TResult>;();Argument[this];ReturnValue;taint;df-generated |
-| System.Collections.Immutable;ImmutableArray<T>;Remove;(System.Object);Argument[0];Argument[this];taint;df-generated |
-| System.Collections.Immutable;ImmutableArray<T>;Remove;(System.Object);Argument[this];Argument[0];taint;df-generated |
-| System.Collections.Immutable;ImmutableArray<T>;Remove;(T);Argument[this];ReturnValue;taint;df-generated |
-| System.Collections.Immutable;ImmutableArray<T>;Remove;(T,System.Collections.Generic.IEqualityComparer<T>);Argument[this];ReturnValue;taint;df-generated |
+| System.Collections.Immutable;ImmutableArray<T>;Insert;(System.Int32,T);Argument[1];ReturnValue;taint;dfc-generated |
+| System.Collections.Immutable;ImmutableArray<T>;InsertRange;(System.Int32,System.Collections.Generic.IEnumerable<T>);Argument[1].Element;ReturnValue.SyntheticField[System.Collections.Immutable.ImmutableArray`1.array].Element;value;dfc-generated |
+| System.Collections.Immutable;ImmutableArray<T>;InsertRange;(System.Int32,System.Collections.Generic.IEnumerable<T>);Argument[this];ReturnValue;value;dfc-generated |
+| System.Collections.Immutable;ImmutableArray<T>;InsertRange;(System.Int32,System.Collections.Immutable.ImmutableArray<T>);Argument[1];ReturnValue;value;dfc-generated |
+| System.Collections.Immutable;ImmutableArray<T>;InsertRange;(System.Int32,System.Collections.Immutable.ImmutableArray<T>);Argument[this];ReturnValue;value;dfc-generated |
+| System.Collections.Immutable;ImmutableArray<T>;InsertRange;(System.Int32,System.ReadOnlySpan<T>);Argument[1].Element;ReturnValue.Element;value;dfc-generated |
+| System.Collections.Immutable;ImmutableArray<T>;InsertRange;(System.Int32,System.ReadOnlySpan<T>);Argument[1].Element;ReturnValue.SyntheticField[System.Collections.Immutable.ImmutableArray`1.array].Element;value;dfc-generated |
+| System.Collections.Immutable;ImmutableArray<T>;InsertRange;(System.Int32,System.ReadOnlySpan<T>);Argument[this];ReturnValue;value;dfc-generated |
+| System.Collections.Immutable;ImmutableArray<T>;InsertRange;(System.Int32,T[]);Argument[1];ReturnValue.SyntheticField[System.Collections.Immutable.ImmutableArray`1.array];value;dfc-generated |
+| System.Collections.Immutable;ImmutableArray<T>;InsertRange;(System.Int32,T[]);Argument[this];ReturnValue;value;dfc-generated |
+| System.Collections.Immutable;ImmutableArray<T>;LastIndexOf;(T,System.Int32,System.Int32,System.Collections.Generic.IEqualityComparer<T>);Argument[0];Argument[3];taint;df-generated |
+| System.Collections.Immutable;ImmutableArray<T>;LastIndexOf;(T,System.Int32,System.Int32,System.Collections.Generic.IEqualityComparer<T>);Argument[this];Argument[3];taint;df-generated |
+| System.Collections.Immutable;ImmutableArray<T>;OfType<TResult>;();Argument[this].SyntheticField[System.Collections.Immutable.ImmutableArray`1.array].Element;ReturnValue.Element;value;dfc-generated |
+| System.Collections.Immutable;ImmutableArray<T>;Remove;(T);Argument[this];ReturnValue;value;dfc-generated |
+| System.Collections.Immutable;ImmutableArray<T>;Remove;(T,System.Collections.Generic.IEqualityComparer<T>);Argument[this];ReturnValue;value;dfc-generated |
+| System.Collections.Immutable;ImmutableArray<T>;RemoveAll;(System.Predicate<T>);Argument[0];Argument[0].Parameter[delegate-self];value;dfc-generated |
 | System.Collections.Immutable;ImmutableArray<T>;RemoveAll;(System.Predicate<T>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
-| System.Collections.Immutable;ImmutableArray<T>;RemoveAt;(System.Int32);Argument[this];ReturnValue;taint;df-generated |
-| System.Collections.Immutable;ImmutableArray<T>;RemoveRange;(System.Collections.Generic.IEnumerable<T>);Argument[this];ReturnValue;taint;df-generated |
-| System.Collections.Immutable;ImmutableArray<T>;RemoveRange;(System.Collections.Generic.IEnumerable<T>,System.Collections.Generic.IEqualityComparer<T>);Argument[this];ReturnValue;taint;df-generated |
-| System.Collections.Immutable;ImmutableArray<T>;RemoveRange;(System.Collections.Immutable.ImmutableArray<T>);Argument[this];ReturnValue;taint;df-generated |
-| System.Collections.Immutable;ImmutableArray<T>;RemoveRange;(System.Collections.Immutable.ImmutableArray<T>,System.Collections.Generic.IEqualityComparer<T>);Argument[this];ReturnValue;taint;df-generated |
-| System.Collections.Immutable;ImmutableArray<T>;RemoveRange;(System.Int32,System.Int32);Argument[this];ReturnValue;taint;df-generated |
-| System.Collections.Immutable;ImmutableArray<T>;RemoveRange;(System.ReadOnlySpan<T>,System.Collections.Generic.IEqualityComparer<T>);Argument[this];ReturnValue;taint;df-generated |
-| System.Collections.Immutable;ImmutableArray<T>;RemoveRange;(T[],System.Collections.Generic.IEqualityComparer<T>);Argument[this];ReturnValue;taint;df-generated |
-| System.Collections.Immutable;ImmutableArray<T>;Replace;(T,T);Argument[1];ReturnValue;taint;df-generated |
+| System.Collections.Immutable;ImmutableArray<T>;RemoveAll;(System.Predicate<T>);Argument[this].SyntheticField[System.Collections.Immutable.ImmutableArray`1.array].Element;Argument[0].Parameter[0];value;dfc-generated |
+| System.Collections.Immutable;ImmutableArray<T>;RemoveAll;(System.Predicate<T>);Argument[this].SyntheticField[System.Collections.Immutable.ImmutableArray`1.array].Element;Argument[0].Parameter[0];value;hq-generated |
+| System.Collections.Immutable;ImmutableArray<T>;RemoveAll;(System.Predicate<T>);Argument[this];ReturnValue;value;dfc-generated |
+| System.Collections.Immutable;ImmutableArray<T>;RemoveAll;(System.Predicate<T>);Argument[this];ReturnValue;value;hq-generated |
+| System.Collections.Immutable;ImmutableArray<T>;RemoveAt;(System.Int32);Argument[this];ReturnValue;value;dfc-generated |
+| System.Collections.Immutable;ImmutableArray<T>;RemoveRange;(System.Collections.Generic.IEnumerable<T>);Argument[this];ReturnValue;value;dfc-generated |
+| System.Collections.Immutable;ImmutableArray<T>;RemoveRange;(System.Collections.Generic.IEnumerable<T>,System.Collections.Generic.IEqualityComparer<T>);Argument[this];ReturnValue;value;dfc-generated |
+| System.Collections.Immutable;ImmutableArray<T>;RemoveRange;(System.Collections.Immutable.ImmutableArray<T>);Argument[this];ReturnValue;value;dfc-generated |
+| System.Collections.Immutable;ImmutableArray<T>;RemoveRange;(System.Collections.Immutable.ImmutableArray<T>,System.Collections.Generic.IEqualityComparer<T>);Argument[this];ReturnValue;value;dfc-generated |
+| System.Collections.Immutable;ImmutableArray<T>;RemoveRange;(System.Int32,System.Int32);Argument[this];ReturnValue;value;dfc-generated |
+| System.Collections.Immutable;ImmutableArray<T>;RemoveRange;(System.ReadOnlySpan<T>,System.Collections.Generic.IEqualityComparer<T>);Argument[this];ReturnValue;value;dfc-generated |
+| System.Collections.Immutable;ImmutableArray<T>;RemoveRange;(T[],System.Collections.Generic.IEqualityComparer<T>);Argument[this];ReturnValue;value;dfc-generated |
+| System.Collections.Immutable;ImmutableArray<T>;Replace;(T,T);Argument[1];ReturnValue.SyntheticField[System.Collections.Immutable.ImmutableArray`1.array].Element;value;dfc-generated |
+| System.Collections.Immutable;ImmutableArray<T>;Replace;(T,T,System.Collections.Generic.IEqualityComparer<T>);Argument[0];Argument[2];taint;df-generated |
+| System.Collections.Immutable;ImmutableArray<T>;Replace;(T,T,System.Collections.Generic.IEqualityComparer<T>);Argument[0];Argument[2];taint;dfc-generated |
+| System.Collections.Immutable;ImmutableArray<T>;Replace;(T,T,System.Collections.Generic.IEqualityComparer<T>);Argument[1];ReturnValue.SyntheticField[System.Collections.Immutable.ImmutableArray`1.array].Element;value;df-generated |
+| System.Collections.Immutable;ImmutableArray<T>;Replace;(T,T,System.Collections.Generic.IEqualityComparer<T>);Argument[1];ReturnValue.SyntheticField[System.Collections.Immutable.ImmutableArray`1.array].Element;value;dfc-generated |
 | System.Collections.Immutable;ImmutableArray<T>;Replace;(T,T,System.Collections.Generic.IEqualityComparer<T>);Argument[1];ReturnValue;taint;df-generated |
+| System.Collections.Immutable;ImmutableArray<T>;Replace;(T,T,System.Collections.Generic.IEqualityComparer<T>);Argument[1];ReturnValue;taint;dfc-generated |
+| System.Collections.Immutable;ImmutableArray<T>;Replace;(T,T,System.Collections.Generic.IEqualityComparer<T>);Argument[this];Argument[2];taint;df-generated |
+| System.Collections.Immutable;ImmutableArray<T>;Replace;(T,T,System.Collections.Generic.IEqualityComparer<T>);Argument[this];Argument[2];taint;dfc-generated |
+| System.Collections.Immutable;ImmutableArray<T>;SetItem;(System.Int32,T);Argument[1];ReturnValue.SyntheticField[System.Collections.Immutable.ImmutableArray`1.array].Element;value;df-generated |
+| System.Collections.Immutable;ImmutableArray<T>;SetItem;(System.Int32,T);Argument[1];ReturnValue.SyntheticField[System.Collections.Immutable.ImmutableArray`1.array].Element;value;dfc-generated |
 | System.Collections.Immutable;ImmutableArray<T>;SetItem;(System.Int32,T);Argument[1];ReturnValue;taint;df-generated |
-| System.Collections.Immutable;ImmutableArray<T>;Slice;(System.Int32,System.Int32);Argument[this];ReturnValue;taint;df-generated |
-| System.Collections.Immutable;ImmutableArray<T>;Sort;();Argument[this];ReturnValue;taint;df-generated |
+| System.Collections.Immutable;ImmutableArray<T>;SetItem;(System.Int32,T);Argument[1];ReturnValue;taint;dfc-generated |
+| System.Collections.Immutable;ImmutableArray<T>;Slice;(System.Int32,System.Int32);Argument[this];ReturnValue;value;dfc-generated |
+| System.Collections.Immutable;ImmutableArray<T>;Sort;();Argument[this];ReturnValue;value;dfc-generated |
 | System.Collections.Immutable;ImmutableArray<T>;Sort;(System.Collections.Generic.IComparer<T>);Argument[this];Argument[0];taint;df-generated |
 | System.Collections.Immutable;ImmutableArray<T>;Sort;(System.Collections.Generic.IComparer<T>);Argument[this];ReturnValue;taint;df-generated |
+| System.Collections.Immutable;ImmutableArray<T>;Sort;(System.Comparison<T>);Argument[0];Argument[0].Parameter[delegate-self];value;dfc-generated |
 | System.Collections.Immutable;ImmutableArray<T>;Sort;(System.Comparison<T>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
+| System.Collections.Immutable;ImmutableArray<T>;Sort;(System.Comparison<T>);Argument[this];ReturnValue;value;dfc-generated |
+| System.Collections.Immutable;ImmutableArray<T>;Sort;(System.Comparison<T>);Argument[this];ReturnValue;value;hq-generated |
 | System.Collections.Immutable;ImmutableArray<T>;Sort;(System.Int32,System.Int32,System.Collections.Generic.IComparer<T>);Argument[this];Argument[2];taint;df-generated |
 | System.Collections.Immutable;ImmutableArray<T>;Sort;(System.Int32,System.Int32,System.Collections.Generic.IComparer<T>);Argument[this];ReturnValue;taint;df-generated |
-| System.Collections.Immutable;ImmutableArray<T>;ToBuilder;();Argument[this];ReturnValue;taint;df-generated |
+| System.Collections.Immutable;ImmutableArray<T>;ToBuilder;();Argument[this].Element;ReturnValue.Element;value;dfc-generated |
 | System.Collections.Immutable;ImmutableArray<T>;get_Item;(System.Int32);Argument[this].Element;ReturnValue;value;manual |
-| System.Collections.Immutable;ImmutableArray<T>;get_Item;(System.Int32);Argument[this];ReturnValue;taint;df-generated |
-| System.Collections.Immutable;ImmutableArray<T>;get_SyncRoot;();Argument[this];ReturnValue;taint;df-generated |
-| System.Collections.Immutable;ImmutableArray<T>;get_SyncRoot;();Argument[this];ReturnValue;value;df-generated |
+| System.Collections.Immutable;ImmutableArray<T>;get_Item;(System.Int32);Argument[this].SyntheticField[System.Collections.Immutable.ImmutableArray`1.array].Element;ReturnValue;value;dfc-generated |
+| System.Collections.Immutable;ImmutableArray<T>;get_SyncRoot;();Argument[this];ReturnValue;value;dfc-generated |
 | System.Collections.Immutable;ImmutableArray<T>;set_Item;(System.Int32,System.Object);Argument[1];Argument[this].Element;value;manual |
 | System.Collections.Immutable;ImmutableArray<T>;set_Item;(System.Int32,T);Argument[1];Argument[this].Element;value;manual |
 | System.Collections.Immutable;ImmutableDictionary;Create<TKey,TValue>;(System.Collections.Generic.IEqualityComparer<TKey>);Argument[0];ReturnValue;taint;df-generated |
@@ -6363,19 +6928,13 @@ summary
 | System.Collections.Immutable;ImmutableDictionary;CreateBuilder<TKey,TValue>;(System.Collections.Generic.IEqualityComparer<TKey>);Argument[0];ReturnValue;taint;df-generated |
 | System.Collections.Immutable;ImmutableDictionary;CreateBuilder<TKey,TValue>;(System.Collections.Generic.IEqualityComparer<TKey>,System.Collections.Generic.IEqualityComparer<TValue>);Argument[0];ReturnValue;taint;df-generated |
 | System.Collections.Immutable;ImmutableDictionary;CreateBuilder<TKey,TValue>;(System.Collections.Generic.IEqualityComparer<TKey>,System.Collections.Generic.IEqualityComparer<TValue>);Argument[1];ReturnValue;taint;df-generated |
-| System.Collections.Immutable;ImmutableDictionary;CreateRange<TKey,TValue>;(System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<TKey,TValue>>);Argument[0].Element;ReturnValue;taint;df-generated |
-| System.Collections.Immutable;ImmutableDictionary;CreateRange<TKey,TValue>;(System.Collections.Generic.IEqualityComparer<TKey>,System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<TKey,TValue>>);Argument[0];ReturnValue;taint;df-generated |
-| System.Collections.Immutable;ImmutableDictionary;CreateRange<TKey,TValue>;(System.Collections.Generic.IEqualityComparer<TKey>,System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<TKey,TValue>>);Argument[1].Element;ReturnValue;taint;df-generated |
-| System.Collections.Immutable;ImmutableDictionary;CreateRange<TKey,TValue>;(System.Collections.Generic.IEqualityComparer<TKey>,System.Collections.Generic.IEqualityComparer<TValue>,System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<TKey,TValue>>);Argument[0];ReturnValue;taint;df-generated |
-| System.Collections.Immutable;ImmutableDictionary;CreateRange<TKey,TValue>;(System.Collections.Generic.IEqualityComparer<TKey>,System.Collections.Generic.IEqualityComparer<TValue>,System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<TKey,TValue>>);Argument[1];ReturnValue;taint;df-generated |
-| System.Collections.Immutable;ImmutableDictionary;CreateRange<TKey,TValue>;(System.Collections.Generic.IEqualityComparer<TKey>,System.Collections.Generic.IEqualityComparer<TValue>,System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<TKey,TValue>>);Argument[2].Element;ReturnValue;taint;df-generated |
-| System.Collections.Immutable;ImmutableDictionary;GetValueOrDefault<TKey,TValue>;(System.Collections.Immutable.IImmutableDictionary<TKey,TValue>,TKey,TValue);Argument[2];ReturnValue;taint;df-generated |
-| System.Collections.Immutable;ImmutableDictionary;ToImmutableDictionary<TKey,TValue>;(System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<TKey,TValue>>);Argument[0].Element;ReturnValue;taint;df-generated |
-| System.Collections.Immutable;ImmutableDictionary;ToImmutableDictionary<TKey,TValue>;(System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<TKey,TValue>>,System.Collections.Generic.IEqualityComparer<TKey>);Argument[0].Element;ReturnValue;taint;df-generated |
-| System.Collections.Immutable;ImmutableDictionary;ToImmutableDictionary<TKey,TValue>;(System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<TKey,TValue>>,System.Collections.Generic.IEqualityComparer<TKey>);Argument[1];ReturnValue;taint;df-generated |
-| System.Collections.Immutable;ImmutableDictionary;ToImmutableDictionary<TKey,TValue>;(System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<TKey,TValue>>,System.Collections.Generic.IEqualityComparer<TKey>,System.Collections.Generic.IEqualityComparer<TValue>);Argument[0].Element;ReturnValue;taint;df-generated |
-| System.Collections.Immutable;ImmutableDictionary;ToImmutableDictionary<TKey,TValue>;(System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<TKey,TValue>>,System.Collections.Generic.IEqualityComparer<TKey>,System.Collections.Generic.IEqualityComparer<TValue>);Argument[1];ReturnValue;taint;df-generated |
-| System.Collections.Immutable;ImmutableDictionary;ToImmutableDictionary<TKey,TValue>;(System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<TKey,TValue>>,System.Collections.Generic.IEqualityComparer<TKey>,System.Collections.Generic.IEqualityComparer<TValue>);Argument[2];ReturnValue;taint;df-generated |
+| System.Collections.Immutable;ImmutableDictionary;CreateRange<TKey,TValue>;(System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<TKey,TValue>>);Argument[0];ReturnValue;value;dfc-generated |
+| System.Collections.Immutable;ImmutableDictionary;CreateRange<TKey,TValue>;(System.Collections.Generic.IEqualityComparer<TKey>,System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<TKey,TValue>>);Argument[1];ReturnValue;value;dfc-generated |
+| System.Collections.Immutable;ImmutableDictionary;CreateRange<TKey,TValue>;(System.Collections.Generic.IEqualityComparer<TKey>,System.Collections.Generic.IEqualityComparer<TValue>,System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<TKey,TValue>>);Argument[2];ReturnValue;value;dfc-generated |
+| System.Collections.Immutable;ImmutableDictionary;GetValueOrDefault<TKey,TValue>;(System.Collections.Immutable.IImmutableDictionary<TKey,TValue>,TKey,TValue);Argument[2];ReturnValue;value;dfc-generated |
+| System.Collections.Immutable;ImmutableDictionary;ToImmutableDictionary<TKey,TValue>;(System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<TKey,TValue>>);Argument[0];ReturnValue;value;dfc-generated |
+| System.Collections.Immutable;ImmutableDictionary;ToImmutableDictionary<TKey,TValue>;(System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<TKey,TValue>>,System.Collections.Generic.IEqualityComparer<TKey>);Argument[0];ReturnValue;value;dfc-generated |
+| System.Collections.Immutable;ImmutableDictionary;ToImmutableDictionary<TKey,TValue>;(System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<TKey,TValue>>,System.Collections.Generic.IEqualityComparer<TKey>,System.Collections.Generic.IEqualityComparer<TValue>);Argument[0];ReturnValue;value;dfc-generated |
 | System.Collections.Immutable;ImmutableDictionary;ToImmutableDictionary<TSource,TKey,TValue>;(System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,TKey>,System.Func<TSource,TValue>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
 | System.Collections.Immutable;ImmutableDictionary;ToImmutableDictionary<TSource,TKey,TValue>;(System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,TKey>,System.Func<TSource,TValue>);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
 | System.Collections.Immutable;ImmutableDictionary;ToImmutableDictionary<TSource,TKey,TValue>;(System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,TKey>,System.Func<TSource,TValue>,System.Collections.Generic.IEqualityComparer<TKey>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
@@ -6398,19 +6957,22 @@ summary
 | System.Collections.Immutable;ImmutableDictionary<TKey,TValue>+Builder;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.Generic.IEnumerator`1.Current];value;manual |
 | System.Collections.Immutable;ImmutableDictionary<TKey,TValue>+Builder;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.IEnumerator.Current];value;manual |
 | System.Collections.Immutable;ImmutableDictionary<TKey,TValue>+Builder;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.Immutable.ImmutableDictionary`2+Enumerator.Current];value;manual |
-| System.Collections.Immutable;ImmutableDictionary<TKey,TValue>+Builder;GetValueOrDefault;(TKey,TValue);Argument[1];ReturnValue;taint;df-generated |
-| System.Collections.Immutable;ImmutableDictionary<TKey,TValue>+Builder;TryGetKey;(TKey,TKey);Argument[0];ReturnValue;taint;df-generated |
+| System.Collections.Immutable;ImmutableDictionary<TKey,TValue>+Builder;GetValueOrDefault;(TKey,TValue);Argument[1];ReturnValue;value;dfc-generated |
+| System.Collections.Immutable;ImmutableDictionary<TKey,TValue>+Builder;TryGetKey;(TKey,TKey);Argument[0];ReturnValue;value;dfc-generated |
+| System.Collections.Immutable;ImmutableDictionary<TKey,TValue>+Builder;TryGetValue;(TKey,TValue);Argument[1];ReturnValue;value;dfc-generated |
 | System.Collections.Immutable;ImmutableDictionary<TKey,TValue>+Builder;get_Item;(System.Object);Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Value];ReturnValue;value;manual |
 | System.Collections.Immutable;ImmutableDictionary<TKey,TValue>+Builder;get_Item;(TKey);Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Value];ReturnValue;value;manual |
 | System.Collections.Immutable;ImmutableDictionary<TKey,TValue>+Builder;get_Keys;();Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Key];ReturnValue.Element;value;manual |
-| System.Collections.Immutable;ImmutableDictionary<TKey,TValue>+Builder;get_SyncRoot;();Argument[this];ReturnValue;taint;df-generated |
-| System.Collections.Immutable;ImmutableDictionary<TKey,TValue>+Builder;get_SyncRoot;();Argument[this];ReturnValue;value;df-generated |
+| System.Collections.Immutable;ImmutableDictionary<TKey,TValue>+Builder;get_SyncRoot;();Argument[this];ReturnValue;value;dfc-generated |
 | System.Collections.Immutable;ImmutableDictionary<TKey,TValue>+Builder;get_Values;();Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Value];ReturnValue.Element;value;manual |
 | System.Collections.Immutable;ImmutableDictionary<TKey,TValue>+Builder;set_Item;(System.Object,System.Object);Argument[0];Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Key];value;manual |
 | System.Collections.Immutable;ImmutableDictionary<TKey,TValue>+Builder;set_Item;(System.Object,System.Object);Argument[1];Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Value];value;manual |
 | System.Collections.Immutable;ImmutableDictionary<TKey,TValue>+Builder;set_Item;(TKey,TValue);Argument[0];Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Key];value;manual |
 | System.Collections.Immutable;ImmutableDictionary<TKey,TValue>+Builder;set_Item;(TKey,TValue);Argument[1];Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Value];value;manual |
+| System.Collections.Immutable;ImmutableDictionary<TKey,TValue>+Enumerator;get_Current;();Argument[this].Property[System.Collections.Immutable.ImmutableDictionary`2+Enumerator.Current];ReturnValue;value;df-generated |
+| System.Collections.Immutable;ImmutableDictionary<TKey,TValue>+Enumerator;get_Current;();Argument[this].Property[System.Collections.Immutable.ImmutableDictionary`2+Enumerator.Current];ReturnValue;value;dfc-generated |
 | System.Collections.Immutable;ImmutableDictionary<TKey,TValue>+Enumerator;get_Current;();Argument[this];ReturnValue;taint;df-generated |
+| System.Collections.Immutable;ImmutableDictionary<TKey,TValue>+Enumerator;get_Current;();Argument[this];ReturnValue;taint;dfc-generated |
 | System.Collections.Immutable;ImmutableDictionary<TKey,TValue>;Add;(System.Collections.Generic.KeyValuePair<TKey,TValue>);Argument[0].Property[System.Collections.Generic.KeyValuePair`2.Key];Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Key];value;manual |
 | System.Collections.Immutable;ImmutableDictionary<TKey,TValue>;Add;(System.Collections.Generic.KeyValuePair<TKey,TValue>);Argument[0].Property[System.Collections.Generic.KeyValuePair`2.Value];Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Value];value;manual |
 | System.Collections.Immutable;ImmutableDictionary<TKey,TValue>;Add;(System.Collections.Generic.KeyValuePair<TKey,TValue>);Argument[0];Argument[this].Element;value;manual |
@@ -6421,7 +6983,7 @@ summary
 | System.Collections.Immutable;ImmutableDictionary<TKey,TValue>;AddRange;(System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<TKey,TValue>>);Argument[0].Element;Argument[this].Element;value;manual |
 | System.Collections.Immutable;ImmutableDictionary<TKey,TValue>;Clear;();Argument[this].WithoutElement;Argument[this];value;manual |
 | System.Collections.Immutable;ImmutableDictionary<TKey,TValue>;Clear;();Argument[this].WithoutElement;ReturnValue;value;manual |
-| System.Collections.Immutable;ImmutableDictionary<TKey,TValue>;Clear;();Argument[this];ReturnValue;taint;df-generated |
+| System.Collections.Immutable;ImmutableDictionary<TKey,TValue>;Clear;();Argument[this];ReturnValue;value;dfc-generated |
 | System.Collections.Immutable;ImmutableDictionary<TKey,TValue>;CopyTo;(System.Array,System.Int32);Argument[this].Element;Argument[0].Element;value;manual |
 | System.Collections.Immutable;ImmutableDictionary<TKey,TValue>;CopyTo;(System.Collections.Generic.KeyValuePair<TKey,TValue>[],System.Int32);Argument[this].Element;Argument[0].Element;value;manual |
 | System.Collections.Immutable;ImmutableDictionary<TKey,TValue>;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.Generic.IEnumerator`1.Current];value;manual |
@@ -6435,17 +6997,18 @@ summary
 | System.Collections.Immutable;ImmutableDictionary<TKey,TValue>;SetItems;(System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<TKey,TValue>>);Argument[0].Element;ReturnValue;taint;df-generated |
 | System.Collections.Immutable;ImmutableDictionary<TKey,TValue>;SetItems;(System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<TKey,TValue>>);Argument[this];ReturnValue;taint;df-generated |
 | System.Collections.Immutable;ImmutableDictionary<TKey,TValue>;ToBuilder;();Argument[this];ReturnValue;taint;df-generated |
-| System.Collections.Immutable;ImmutableDictionary<TKey,TValue>;TryGetKey;(TKey,TKey);Argument[0];ReturnValue;taint;df-generated |
-| System.Collections.Immutable;ImmutableDictionary<TKey,TValue>;WithComparers;(System.Collections.Generic.IEqualityComparer<TKey>);Argument[0];ReturnValue;taint;df-generated |
-| System.Collections.Immutable;ImmutableDictionary<TKey,TValue>;WithComparers;(System.Collections.Generic.IEqualityComparer<TKey>);Argument[this];ReturnValue;taint;df-generated |
-| System.Collections.Immutable;ImmutableDictionary<TKey,TValue>;WithComparers;(System.Collections.Generic.IEqualityComparer<TKey>,System.Collections.Generic.IEqualityComparer<TValue>);Argument[this];ReturnValue;value;df-generated |
+| System.Collections.Immutable;ImmutableDictionary<TKey,TValue>;TryGetKey;(TKey,TKey);Argument[0];ReturnValue;value;dfc-generated |
+| System.Collections.Immutable;ImmutableDictionary<TKey,TValue>;TryGetValue;(TKey,TValue);Argument[1];ReturnValue;value;dfc-generated |
+| System.Collections.Immutable;ImmutableDictionary<TKey,TValue>;WithComparers;(System.Collections.Generic.IEqualityComparer<TKey>);Argument[0];ReturnValue.SyntheticField[System.Collections.Immutable.ImmutableDictionary`2._comparers].SyntheticField[System.Collections.Immutable.ImmutableDictionary`2+Comparers._keyComparer];value;dfc-generated |
+| System.Collections.Immutable;ImmutableDictionary<TKey,TValue>;WithComparers;(System.Collections.Generic.IEqualityComparer<TKey>,System.Collections.Generic.IEqualityComparer<TValue>);Argument[0];ReturnValue.SyntheticField[System.Collections.Immutable.ImmutableDictionary`2._comparers].SyntheticField[System.Collections.Immutable.ImmutableDictionary`2+Comparers._keyComparer];value;dfc-generated |
+| System.Collections.Immutable;ImmutableDictionary<TKey,TValue>;WithComparers;(System.Collections.Generic.IEqualityComparer<TKey>,System.Collections.Generic.IEqualityComparer<TValue>);Argument[1];ReturnValue.SyntheticField[System.Collections.Immutable.ImmutableDictionary`2._comparers].SyntheticField[System.Collections.Immutable.ImmutableDictionary`2+Comparers._valueComparer];value;dfc-generated |
+| System.Collections.Immutable;ImmutableDictionary<TKey,TValue>;WithComparers;(System.Collections.Generic.IEqualityComparer<TKey>,System.Collections.Generic.IEqualityComparer<TValue>);Argument[this];ReturnValue;value;dfc-generated |
 | System.Collections.Immutable;ImmutableDictionary<TKey,TValue>;get_Item;(System.Object);Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Value];ReturnValue;value;manual |
 | System.Collections.Immutable;ImmutableDictionary<TKey,TValue>;get_Item;(TKey);Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Value];ReturnValue;value;manual |
-| System.Collections.Immutable;ImmutableDictionary<TKey,TValue>;get_KeyComparer;();Argument[this];ReturnValue;taint;df-generated |
+| System.Collections.Immutable;ImmutableDictionary<TKey,TValue>;get_KeyComparer;();Argument[this].SyntheticField[System.Collections.Immutable.ImmutableDictionary`2._comparers].SyntheticField[System.Collections.Immutable.ImmutableDictionary`2+Comparers._keyComparer];ReturnValue;value;dfc-generated |
 | System.Collections.Immutable;ImmutableDictionary<TKey,TValue>;get_Keys;();Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Key];ReturnValue.Element;value;manual |
-| System.Collections.Immutable;ImmutableDictionary<TKey,TValue>;get_SyncRoot;();Argument[this];ReturnValue;taint;df-generated |
-| System.Collections.Immutable;ImmutableDictionary<TKey,TValue>;get_SyncRoot;();Argument[this];ReturnValue;value;df-generated |
-| System.Collections.Immutable;ImmutableDictionary<TKey,TValue>;get_ValueComparer;();Argument[this];ReturnValue;taint;df-generated |
+| System.Collections.Immutable;ImmutableDictionary<TKey,TValue>;get_SyncRoot;();Argument[this];ReturnValue;value;dfc-generated |
+| System.Collections.Immutable;ImmutableDictionary<TKey,TValue>;get_ValueComparer;();Argument[this].SyntheticField[System.Collections.Immutable.ImmutableDictionary`2._comparers].SyntheticField[System.Collections.Immutable.ImmutableDictionary`2+Comparers._valueComparer];ReturnValue;value;dfc-generated |
 | System.Collections.Immutable;ImmutableDictionary<TKey,TValue>;get_Values;();Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Value];ReturnValue.Element;value;manual |
 | System.Collections.Immutable;ImmutableDictionary<TKey,TValue>;set_Item;(System.Object,System.Object);Argument[0];Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Key];value;manual |
 | System.Collections.Immutable;ImmutableDictionary<TKey,TValue>;set_Item;(System.Object,System.Object);Argument[1];Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Value];value;manual |
@@ -6457,10 +7020,10 @@ summary
 | System.Collections.Immutable;ImmutableHashSet;Create<T>;(System.ReadOnlySpan<T>);Argument[0];ReturnValue;taint;df-generated |
 | System.Collections.Immutable;ImmutableHashSet;Create<T>;(T);Argument[0];ReturnValue;taint;df-generated |
 | System.Collections.Immutable;ImmutableHashSet;Create<T>;(T[]);Argument[0].Element;ReturnValue;taint;df-generated |
-| System.Collections.Immutable;ImmutableHashSet;CreateRange<T>;(System.Collections.Generic.IEnumerable<T>);Argument[0].Element;ReturnValue;taint;df-generated |
-| System.Collections.Immutable;ImmutableHashSet;CreateRange<T>;(System.Collections.Generic.IEqualityComparer<T>,System.Collections.Generic.IEnumerable<T>);Argument[1].Element;ReturnValue;taint;df-generated |
-| System.Collections.Immutable;ImmutableHashSet;ToImmutableHashSet<TSource>;(System.Collections.Generic.IEnumerable<TSource>);Argument[0].Element;ReturnValue;taint;df-generated |
-| System.Collections.Immutable;ImmutableHashSet;ToImmutableHashSet<TSource>;(System.Collections.Generic.IEnumerable<TSource>,System.Collections.Generic.IEqualityComparer<TSource>);Argument[0].Element;ReturnValue;taint;df-generated |
+| System.Collections.Immutable;ImmutableHashSet;CreateRange<T>;(System.Collections.Generic.IEnumerable<T>);Argument[0];ReturnValue;value;dfc-generated |
+| System.Collections.Immutable;ImmutableHashSet;CreateRange<T>;(System.Collections.Generic.IEqualityComparer<T>,System.Collections.Generic.IEnumerable<T>);Argument[1];ReturnValue;value;dfc-generated |
+| System.Collections.Immutable;ImmutableHashSet;ToImmutableHashSet<TSource>;(System.Collections.Generic.IEnumerable<TSource>);Argument[0];ReturnValue;value;dfc-generated |
+| System.Collections.Immutable;ImmutableHashSet;ToImmutableHashSet<TSource>;(System.Collections.Generic.IEnumerable<TSource>,System.Collections.Generic.IEqualityComparer<TSource>);Argument[0];ReturnValue;value;dfc-generated |
 | System.Collections.Immutable;ImmutableHashSet<T>+Builder;Add;(T);Argument[0];Argument[this].Element;value;manual |
 | System.Collections.Immutable;ImmutableHashSet<T>+Builder;Clear;();Argument[this].WithoutElement;Argument[this];value;manual |
 | System.Collections.Immutable;ImmutableHashSet<T>+Builder;CopyTo;(T[],System.Int32);Argument[this].Element;Argument[0].Element;value;manual |
@@ -6468,8 +7031,11 @@ summary
 | System.Collections.Immutable;ImmutableHashSet<T>+Builder;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.IEnumerator.Current];value;manual |
 | System.Collections.Immutable;ImmutableHashSet<T>+Builder;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.Immutable.ImmutableHashSet`1+Enumerator.Current];value;manual |
 | System.Collections.Immutable;ImmutableHashSet<T>+Builder;SymmetricExceptWith;(System.Collections.Generic.IEnumerable<T>);Argument[0].Element;Argument[this];taint;df-generated |
-| System.Collections.Immutable;ImmutableHashSet<T>+Builder;TryGetValue;(T,T);Argument[0];ReturnValue;taint;df-generated |
+| System.Collections.Immutable;ImmutableHashSet<T>+Builder;TryGetValue;(T,T);Argument[0];ReturnValue;value;dfc-generated |
+| System.Collections.Immutable;ImmutableHashSet<T>+Enumerator;get_Current;();Argument[this].Property[System.Collections.Immutable.ImmutableHashSet`1+Enumerator.Current];ReturnValue;value;df-generated |
+| System.Collections.Immutable;ImmutableHashSet<T>+Enumerator;get_Current;();Argument[this].Property[System.Collections.Immutable.ImmutableHashSet`1+Enumerator.Current];ReturnValue;value;dfc-generated |
 | System.Collections.Immutable;ImmutableHashSet<T>+Enumerator;get_Current;();Argument[this];ReturnValue;taint;df-generated |
+| System.Collections.Immutable;ImmutableHashSet<T>+Enumerator;get_Current;();Argument[this];ReturnValue;taint;dfc-generated |
 | System.Collections.Immutable;ImmutableHashSet<T>;Add;(T);Argument[0];Argument[this].Element;value;manual |
 | System.Collections.Immutable;ImmutableHashSet<T>;Clear;();Argument[this].WithoutElement;Argument[this];value;manual |
 | System.Collections.Immutable;ImmutableHashSet<T>;Clear;();Argument[this].WithoutElement;ReturnValue;value;manual |
@@ -6479,32 +7045,98 @@ summary
 | System.Collections.Immutable;ImmutableHashSet<T>;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.Generic.IEnumerator`1.Current];value;manual |
 | System.Collections.Immutable;ImmutableHashSet<T>;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.IEnumerator.Current];value;manual |
 | System.Collections.Immutable;ImmutableHashSet<T>;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.Immutable.ImmutableHashSet`1+Enumerator.Current];value;manual |
-| System.Collections.Immutable;ImmutableHashSet<T>;Intersect;(System.Collections.Generic.IEnumerable<T>);Argument[this];ReturnValue;taint;df-generated |
+| System.Collections.Immutable;ImmutableHashSet<T>;Intersect;(System.Collections.Generic.IEnumerable<T>);Argument[this];ReturnValue;value;dfc-generated |
 | System.Collections.Immutable;ImmutableHashSet<T>;Remove;(T);Argument[this];ReturnValue;taint;df-generated |
-| System.Collections.Immutable;ImmutableHashSet<T>;SymmetricExcept;(System.Collections.Generic.IEnumerable<T>);Argument[0].Element;ReturnValue;taint;df-generated |
-| System.Collections.Immutable;ImmutableHashSet<T>;SymmetricExcept;(System.Collections.Generic.IEnumerable<T>);Argument[this];ReturnValue;taint;df-generated |
+| System.Collections.Immutable;ImmutableHashSet<T>;SymmetricExcept;(System.Collections.Generic.IEnumerable<T>);Argument[this];ReturnValue;value;dfc-generated |
 | System.Collections.Immutable;ImmutableHashSet<T>;ToBuilder;();Argument[this];ReturnValue;taint;df-generated |
-| System.Collections.Immutable;ImmutableHashSet<T>;TryGetValue;(T,T);Argument[0];ReturnValue;taint;df-generated |
-| System.Collections.Immutable;ImmutableHashSet<T>;Union;(System.Collections.Generic.IEnumerable<T>);Argument[0].Element;ReturnValue;taint;df-generated |
-| System.Collections.Immutable;ImmutableHashSet<T>;Union;(System.Collections.Generic.IEnumerable<T>);Argument[this];ReturnValue;taint;df-generated |
-| System.Collections.Immutable;ImmutableHashSet<T>;WithComparer;(System.Collections.Generic.IEqualityComparer<T>);Argument[this];ReturnValue;value;df-generated |
+| System.Collections.Immutable;ImmutableHashSet<T>;TryGetValue;(T,T);Argument[0];ReturnValue;value;dfc-generated |
+| System.Collections.Immutable;ImmutableHashSet<T>;Union;(System.Collections.Generic.IEnumerable<T>);Argument[0];ReturnValue;value;dfc-generated |
+| System.Collections.Immutable;ImmutableHashSet<T>;WithComparer;(System.Collections.Generic.IEqualityComparer<T>);Argument[this];ReturnValue;value;dfc-generated |
 | System.Collections.Immutable;ImmutableHashSet<T>;get_KeyComparer;();Argument[this];ReturnValue;taint;df-generated |
-| System.Collections.Immutable;ImmutableHashSet<T>;get_SyncRoot;();Argument[this];ReturnValue;taint;df-generated |
-| System.Collections.Immutable;ImmutableHashSet<T>;get_SyncRoot;();Argument[this];ReturnValue;value;df-generated |
+| System.Collections.Immutable;ImmutableHashSet<T>;get_SyncRoot;();Argument[this];ReturnValue;value;dfc-generated |
+| System.Collections.Immutable;ImmutableInterlocked;AddOrUpdate<TKey,TValue>;(System.Collections.Immutable.ImmutableDictionary<TKey,TValue>,TKey,System.Func<TKey,TValue>,System.Func<TKey,TValue,TValue>);Argument[0];ReturnValue;value;dfc-generated |
+| System.Collections.Immutable;ImmutableInterlocked;AddOrUpdate<TKey,TValue>;(System.Collections.Immutable.ImmutableDictionary<TKey,TValue>,TKey,System.Func<TKey,TValue>,System.Func<TKey,TValue,TValue>);Argument[0];ReturnValue;value;hq-generated |
+| System.Collections.Immutable;ImmutableInterlocked;AddOrUpdate<TKey,TValue>;(System.Collections.Immutable.ImmutableDictionary<TKey,TValue>,TKey,System.Func<TKey,TValue>,System.Func<TKey,TValue,TValue>);Argument[1];Argument[2].Parameter[0];value;dfc-generated |
+| System.Collections.Immutable;ImmutableInterlocked;AddOrUpdate<TKey,TValue>;(System.Collections.Immutable.ImmutableDictionary<TKey,TValue>,TKey,System.Func<TKey,TValue>,System.Func<TKey,TValue,TValue>);Argument[1];Argument[2].Parameter[0];value;hq-generated |
+| System.Collections.Immutable;ImmutableInterlocked;AddOrUpdate<TKey,TValue>;(System.Collections.Immutable.ImmutableDictionary<TKey,TValue>,TKey,System.Func<TKey,TValue>,System.Func<TKey,TValue,TValue>);Argument[1];Argument[3].Parameter[0];value;dfc-generated |
+| System.Collections.Immutable;ImmutableInterlocked;AddOrUpdate<TKey,TValue>;(System.Collections.Immutable.ImmutableDictionary<TKey,TValue>,TKey,System.Func<TKey,TValue>,System.Func<TKey,TValue,TValue>);Argument[1];Argument[3].Parameter[0];value;hq-generated |
+| System.Collections.Immutable;ImmutableInterlocked;AddOrUpdate<TKey,TValue>;(System.Collections.Immutable.ImmutableDictionary<TKey,TValue>,TKey,System.Func<TKey,TValue>,System.Func<TKey,TValue,TValue>);Argument[2].ReturnValue;ReturnValue;value;dfc-generated |
+| System.Collections.Immutable;ImmutableInterlocked;AddOrUpdate<TKey,TValue>;(System.Collections.Immutable.ImmutableDictionary<TKey,TValue>,TKey,System.Func<TKey,TValue>,System.Func<TKey,TValue,TValue>);Argument[2].ReturnValue;ReturnValue;value;hq-generated |
+| System.Collections.Immutable;ImmutableInterlocked;AddOrUpdate<TKey,TValue>;(System.Collections.Immutable.ImmutableDictionary<TKey,TValue>,TKey,System.Func<TKey,TValue>,System.Func<TKey,TValue,TValue>);Argument[2];Argument[2].Parameter[delegate-self];value;dfc-generated |
 | System.Collections.Immutable;ImmutableInterlocked;AddOrUpdate<TKey,TValue>;(System.Collections.Immutable.ImmutableDictionary<TKey,TValue>,TKey,System.Func<TKey,TValue>,System.Func<TKey,TValue,TValue>);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
+| System.Collections.Immutable;ImmutableInterlocked;AddOrUpdate<TKey,TValue>;(System.Collections.Immutable.ImmutableDictionary<TKey,TValue>,TKey,System.Func<TKey,TValue>,System.Func<TKey,TValue,TValue>);Argument[3].ReturnValue;ReturnValue;value;dfc-generated |
+| System.Collections.Immutable;ImmutableInterlocked;AddOrUpdate<TKey,TValue>;(System.Collections.Immutable.ImmutableDictionary<TKey,TValue>,TKey,System.Func<TKey,TValue>,System.Func<TKey,TValue,TValue>);Argument[3].ReturnValue;ReturnValue;value;hq-generated |
+| System.Collections.Immutable;ImmutableInterlocked;AddOrUpdate<TKey,TValue>;(System.Collections.Immutable.ImmutableDictionary<TKey,TValue>,TKey,System.Func<TKey,TValue>,System.Func<TKey,TValue,TValue>);Argument[3];Argument[3].Parameter[delegate-self];value;dfc-generated |
 | System.Collections.Immutable;ImmutableInterlocked;AddOrUpdate<TKey,TValue>;(System.Collections.Immutable.ImmutableDictionary<TKey,TValue>,TKey,System.Func<TKey,TValue>,System.Func<TKey,TValue,TValue>);Argument[3];Argument[3].Parameter[delegate-self];value;hq-generated |
+| System.Collections.Immutable;ImmutableInterlocked;AddOrUpdate<TKey,TValue>;(System.Collections.Immutable.ImmutableDictionary<TKey,TValue>,TKey,TValue,System.Func<TKey,TValue,TValue>);Argument[0];ReturnValue;value;dfc-generated |
+| System.Collections.Immutable;ImmutableInterlocked;AddOrUpdate<TKey,TValue>;(System.Collections.Immutable.ImmutableDictionary<TKey,TValue>,TKey,TValue,System.Func<TKey,TValue,TValue>);Argument[0];ReturnValue;value;hq-generated |
+| System.Collections.Immutable;ImmutableInterlocked;AddOrUpdate<TKey,TValue>;(System.Collections.Immutable.ImmutableDictionary<TKey,TValue>,TKey,TValue,System.Func<TKey,TValue,TValue>);Argument[1];Argument[3].Parameter[0];value;dfc-generated |
+| System.Collections.Immutable;ImmutableInterlocked;AddOrUpdate<TKey,TValue>;(System.Collections.Immutable.ImmutableDictionary<TKey,TValue>,TKey,TValue,System.Func<TKey,TValue,TValue>);Argument[1];Argument[3].Parameter[0];value;hq-generated |
+| System.Collections.Immutable;ImmutableInterlocked;AddOrUpdate<TKey,TValue>;(System.Collections.Immutable.ImmutableDictionary<TKey,TValue>,TKey,TValue,System.Func<TKey,TValue,TValue>);Argument[2];ReturnValue;value;dfc-generated |
+| System.Collections.Immutable;ImmutableInterlocked;AddOrUpdate<TKey,TValue>;(System.Collections.Immutable.ImmutableDictionary<TKey,TValue>,TKey,TValue,System.Func<TKey,TValue,TValue>);Argument[2];ReturnValue;value;hq-generated |
+| System.Collections.Immutable;ImmutableInterlocked;AddOrUpdate<TKey,TValue>;(System.Collections.Immutable.ImmutableDictionary<TKey,TValue>,TKey,TValue,System.Func<TKey,TValue,TValue>);Argument[3].ReturnValue;ReturnValue;value;dfc-generated |
+| System.Collections.Immutable;ImmutableInterlocked;AddOrUpdate<TKey,TValue>;(System.Collections.Immutable.ImmutableDictionary<TKey,TValue>,TKey,TValue,System.Func<TKey,TValue,TValue>);Argument[3].ReturnValue;ReturnValue;value;hq-generated |
+| System.Collections.Immutable;ImmutableInterlocked;AddOrUpdate<TKey,TValue>;(System.Collections.Immutable.ImmutableDictionary<TKey,TValue>,TKey,TValue,System.Func<TKey,TValue,TValue>);Argument[3];Argument[3].Parameter[delegate-self];value;dfc-generated |
 | System.Collections.Immutable;ImmutableInterlocked;AddOrUpdate<TKey,TValue>;(System.Collections.Immutable.ImmutableDictionary<TKey,TValue>,TKey,TValue,System.Func<TKey,TValue,TValue>);Argument[3];Argument[3].Parameter[delegate-self];value;hq-generated |
+| System.Collections.Immutable;ImmutableInterlocked;Enqueue<T>;(System.Collections.Immutable.ImmutableQueue<T>,T);Argument[0];ReturnValue;value;dfc-generated |
+| System.Collections.Immutable;ImmutableInterlocked;GetOrAdd<TKey,TValue,TArg>;(System.Collections.Immutable.ImmutableDictionary<TKey,TValue>,TKey,System.Func<TKey,TArg,TValue>,TArg);Argument[0];ReturnValue;value;dfc-generated |
+| System.Collections.Immutable;ImmutableInterlocked;GetOrAdd<TKey,TValue,TArg>;(System.Collections.Immutable.ImmutableDictionary<TKey,TValue>,TKey,System.Func<TKey,TArg,TValue>,TArg);Argument[0];ReturnValue;value;hq-generated |
+| System.Collections.Immutable;ImmutableInterlocked;GetOrAdd<TKey,TValue,TArg>;(System.Collections.Immutable.ImmutableDictionary<TKey,TValue>,TKey,System.Func<TKey,TArg,TValue>,TArg);Argument[1];Argument[2].Parameter[0];value;dfc-generated |
+| System.Collections.Immutable;ImmutableInterlocked;GetOrAdd<TKey,TValue,TArg>;(System.Collections.Immutable.ImmutableDictionary<TKey,TValue>,TKey,System.Func<TKey,TArg,TValue>,TArg);Argument[1];Argument[2].Parameter[0];value;hq-generated |
+| System.Collections.Immutable;ImmutableInterlocked;GetOrAdd<TKey,TValue,TArg>;(System.Collections.Immutable.ImmutableDictionary<TKey,TValue>,TKey,System.Func<TKey,TArg,TValue>,TArg);Argument[2].ReturnValue;ReturnValue;value;dfc-generated |
+| System.Collections.Immutable;ImmutableInterlocked;GetOrAdd<TKey,TValue,TArg>;(System.Collections.Immutable.ImmutableDictionary<TKey,TValue>,TKey,System.Func<TKey,TArg,TValue>,TArg);Argument[2].ReturnValue;ReturnValue;value;hq-generated |
+| System.Collections.Immutable;ImmutableInterlocked;GetOrAdd<TKey,TValue,TArg>;(System.Collections.Immutable.ImmutableDictionary<TKey,TValue>,TKey,System.Func<TKey,TArg,TValue>,TArg);Argument[2];Argument[2].Parameter[delegate-self];value;dfc-generated |
 | System.Collections.Immutable;ImmutableInterlocked;GetOrAdd<TKey,TValue,TArg>;(System.Collections.Immutable.ImmutableDictionary<TKey,TValue>,TKey,System.Func<TKey,TArg,TValue>,TArg);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
+| System.Collections.Immutable;ImmutableInterlocked;GetOrAdd<TKey,TValue,TArg>;(System.Collections.Immutable.ImmutableDictionary<TKey,TValue>,TKey,System.Func<TKey,TArg,TValue>,TArg);Argument[3];Argument[2].Parameter[1];value;dfc-generated |
+| System.Collections.Immutable;ImmutableInterlocked;GetOrAdd<TKey,TValue,TArg>;(System.Collections.Immutable.ImmutableDictionary<TKey,TValue>,TKey,System.Func<TKey,TArg,TValue>,TArg);Argument[3];Argument[2].Parameter[1];value;hq-generated |
+| System.Collections.Immutable;ImmutableInterlocked;GetOrAdd<TKey,TValue>;(System.Collections.Immutable.ImmutableDictionary<TKey,TValue>,TKey,System.Func<TKey,TValue>);Argument[0];ReturnValue;value;dfc-generated |
+| System.Collections.Immutable;ImmutableInterlocked;GetOrAdd<TKey,TValue>;(System.Collections.Immutable.ImmutableDictionary<TKey,TValue>,TKey,System.Func<TKey,TValue>);Argument[0];ReturnValue;value;hq-generated |
+| System.Collections.Immutable;ImmutableInterlocked;GetOrAdd<TKey,TValue>;(System.Collections.Immutable.ImmutableDictionary<TKey,TValue>,TKey,System.Func<TKey,TValue>);Argument[1];Argument[2].Parameter[0];value;dfc-generated |
+| System.Collections.Immutable;ImmutableInterlocked;GetOrAdd<TKey,TValue>;(System.Collections.Immutable.ImmutableDictionary<TKey,TValue>,TKey,System.Func<TKey,TValue>);Argument[1];Argument[2].Parameter[0];value;hq-generated |
+| System.Collections.Immutable;ImmutableInterlocked;GetOrAdd<TKey,TValue>;(System.Collections.Immutable.ImmutableDictionary<TKey,TValue>,TKey,System.Func<TKey,TValue>);Argument[2].ReturnValue;ReturnValue;value;dfc-generated |
+| System.Collections.Immutable;ImmutableInterlocked;GetOrAdd<TKey,TValue>;(System.Collections.Immutable.ImmutableDictionary<TKey,TValue>,TKey,System.Func<TKey,TValue>);Argument[2].ReturnValue;ReturnValue;value;hq-generated |
+| System.Collections.Immutable;ImmutableInterlocked;GetOrAdd<TKey,TValue>;(System.Collections.Immutable.ImmutableDictionary<TKey,TValue>,TKey,System.Func<TKey,TValue>);Argument[2];Argument[2].Parameter[delegate-self];value;dfc-generated |
 | System.Collections.Immutable;ImmutableInterlocked;GetOrAdd<TKey,TValue>;(System.Collections.Immutable.ImmutableDictionary<TKey,TValue>,TKey,System.Func<TKey,TValue>);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
-| System.Collections.Immutable;ImmutableInterlocked;GetOrAdd<TKey,TValue>;(System.Collections.Immutable.ImmutableDictionary<TKey,TValue>,TKey,TValue);Argument[2];ReturnValue;taint;df-generated |
+| System.Collections.Immutable;ImmutableInterlocked;GetOrAdd<TKey,TValue>;(System.Collections.Immutable.ImmutableDictionary<TKey,TValue>,TKey,TValue);Argument[0];ReturnValue;value;dfc-generated |
+| System.Collections.Immutable;ImmutableInterlocked;GetOrAdd<TKey,TValue>;(System.Collections.Immutable.ImmutableDictionary<TKey,TValue>,TKey,TValue);Argument[2];ReturnValue;value;dfc-generated |
+| System.Collections.Immutable;ImmutableInterlocked;InterlockedCompareExchange<T>;(System.Collections.Immutable.ImmutableArray<T>,System.Collections.Immutable.ImmutableArray<T>,System.Collections.Immutable.ImmutableArray<T>);Argument[0];ReturnValue;value;dfc-generated |
+| System.Collections.Immutable;ImmutableInterlocked;InterlockedExchange<T>;(System.Collections.Immutable.ImmutableArray<T>,System.Collections.Immutable.ImmutableArray<T>);Argument[0];ReturnValue;value;dfc-generated |
+| System.Collections.Immutable;ImmutableInterlocked;InterlockedInitialize<T>;(System.Collections.Immutable.ImmutableArray<T>,System.Collections.Immutable.ImmutableArray<T>);Argument[0];ReturnValue;value;dfc-generated |
+| System.Collections.Immutable;ImmutableInterlocked;Push<T>;(System.Collections.Immutable.ImmutableStack<T>,T);Argument[0];ReturnValue;value;dfc-generated |
+| System.Collections.Immutable;ImmutableInterlocked;TryAdd<TKey,TValue>;(System.Collections.Immutable.ImmutableDictionary<TKey,TValue>,TKey,TValue);Argument[0];ReturnValue;value;dfc-generated |
+| System.Collections.Immutable;ImmutableInterlocked;TryDequeue<T>;(System.Collections.Immutable.ImmutableQueue<T>,T);Argument[0];ReturnValue;value;dfc-generated |
+| System.Collections.Immutable;ImmutableInterlocked;TryPop<T>;(System.Collections.Immutable.ImmutableStack<T>,T);Argument[0];ReturnValue;value;dfc-generated |
+| System.Collections.Immutable;ImmutableInterlocked;TryRemove<TKey,TValue>;(System.Collections.Immutable.ImmutableDictionary<TKey,TValue>,TKey,TValue);Argument[0];ReturnValue;value;dfc-generated |
+| System.Collections.Immutable;ImmutableInterlocked;TryRemove<TKey,TValue>;(System.Collections.Immutable.ImmutableDictionary<TKey,TValue>,TKey,TValue);Argument[2];ReturnValue;value;dfc-generated |
+| System.Collections.Immutable;ImmutableInterlocked;TryUpdate<TKey,TValue>;(System.Collections.Immutable.ImmutableDictionary<TKey,TValue>,TKey,TValue,TValue);Argument[0];ReturnValue;value;dfc-generated |
+| System.Collections.Immutable;ImmutableInterlocked;Update<T,TArg>;(System.Collections.Immutable.ImmutableArray<T>,System.Func<System.Collections.Immutable.ImmutableArray<T>,TArg,System.Collections.Immutable.ImmutableArray<T>>,TArg);Argument[0];ReturnValue;value;dfc-generated |
+| System.Collections.Immutable;ImmutableInterlocked;Update<T,TArg>;(System.Collections.Immutable.ImmutableArray<T>,System.Func<System.Collections.Immutable.ImmutableArray<T>,TArg,System.Collections.Immutable.ImmutableArray<T>>,TArg);Argument[0];ReturnValue;value;hq-generated |
+| System.Collections.Immutable;ImmutableInterlocked;Update<T,TArg>;(System.Collections.Immutable.ImmutableArray<T>,System.Func<System.Collections.Immutable.ImmutableArray<T>,TArg,System.Collections.Immutable.ImmutableArray<T>>,TArg);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | System.Collections.Immutable;ImmutableInterlocked;Update<T,TArg>;(System.Collections.Immutable.ImmutableArray<T>,System.Func<System.Collections.Immutable.ImmutableArray<T>,TArg,System.Collections.Immutable.ImmutableArray<T>>,TArg);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
+| System.Collections.Immutable;ImmutableInterlocked;Update<T,TArg>;(System.Collections.Immutable.ImmutableArray<T>,System.Func<System.Collections.Immutable.ImmutableArray<T>,TArg,System.Collections.Immutable.ImmutableArray<T>>,TArg);Argument[2];Argument[1].Parameter[1];value;dfc-generated |
+| System.Collections.Immutable;ImmutableInterlocked;Update<T,TArg>;(System.Collections.Immutable.ImmutableArray<T>,System.Func<System.Collections.Immutable.ImmutableArray<T>,TArg,System.Collections.Immutable.ImmutableArray<T>>,TArg);Argument[2];Argument[1].Parameter[1];value;hq-generated |
+| System.Collections.Immutable;ImmutableInterlocked;Update<T,TArg>;(T,System.Func<T,TArg,T>,TArg);Argument[0];ReturnValue;value;dfc-generated |
+| System.Collections.Immutable;ImmutableInterlocked;Update<T,TArg>;(T,System.Func<T,TArg,T>,TArg);Argument[0];ReturnValue;value;hq-generated |
+| System.Collections.Immutable;ImmutableInterlocked;Update<T,TArg>;(T,System.Func<T,TArg,T>,TArg);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | System.Collections.Immutable;ImmutableInterlocked;Update<T,TArg>;(T,System.Func<T,TArg,T>,TArg);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
+| System.Collections.Immutable;ImmutableInterlocked;Update<T,TArg>;(T,System.Func<T,TArg,T>,TArg);Argument[2];Argument[1].Parameter[1];value;dfc-generated |
+| System.Collections.Immutable;ImmutableInterlocked;Update<T,TArg>;(T,System.Func<T,TArg,T>,TArg);Argument[2];Argument[1].Parameter[1];value;hq-generated |
+| System.Collections.Immutable;ImmutableInterlocked;Update<T>;(System.Collections.Immutable.ImmutableArray<T>,System.Func<System.Collections.Immutable.ImmutableArray<T>,System.Collections.Immutable.ImmutableArray<T>>);Argument[0];ReturnValue;value;dfc-generated |
+| System.Collections.Immutable;ImmutableInterlocked;Update<T>;(System.Collections.Immutable.ImmutableArray<T>,System.Func<System.Collections.Immutable.ImmutableArray<T>,System.Collections.Immutable.ImmutableArray<T>>);Argument[0];ReturnValue;value;hq-generated |
+| System.Collections.Immutable;ImmutableInterlocked;Update<T>;(System.Collections.Immutable.ImmutableArray<T>,System.Func<System.Collections.Immutable.ImmutableArray<T>,System.Collections.Immutable.ImmutableArray<T>>);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | System.Collections.Immutable;ImmutableInterlocked;Update<T>;(System.Collections.Immutable.ImmutableArray<T>,System.Func<System.Collections.Immutable.ImmutableArray<T>,System.Collections.Immutable.ImmutableArray<T>>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
+| System.Collections.Immutable;ImmutableInterlocked;Update<T>;(T,System.Func<T,T>);Argument[0];ReturnValue;value;dfc-generated |
+| System.Collections.Immutable;ImmutableInterlocked;Update<T>;(T,System.Func<T,T>);Argument[0];ReturnValue;value;hq-generated |
+| System.Collections.Immutable;ImmutableInterlocked;Update<T>;(T,System.Func<T,T>);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | System.Collections.Immutable;ImmutableInterlocked;Update<T>;(T,System.Func<T,T>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
 | System.Collections.Immutable;ImmutableList;Create<T>;(System.ReadOnlySpan<T>);Argument[0];ReturnValue;taint;df-generated |
 | System.Collections.Immutable;ImmutableList;Create<T>;(T);Argument[0];ReturnValue;taint;df-generated |
 | System.Collections.Immutable;ImmutableList;Create<T>;(T[]);Argument[0].Element;ReturnValue;taint;df-generated |
 | System.Collections.Immutable;ImmutableList;CreateRange<T>;(System.Collections.Generic.IEnumerable<T>);Argument[0].Element;ReturnValue;taint;df-generated |
+| System.Collections.Immutable;ImmutableList;IndexOf<T>;(System.Collections.Immutable.IImmutableList<T>,T,System.Collections.Generic.IEqualityComparer<T>);Argument[0].Element;Argument[2];taint;df-generated |
+| System.Collections.Immutable;ImmutableList;IndexOf<T>;(System.Collections.Immutable.IImmutableList<T>,T,System.Collections.Generic.IEqualityComparer<T>);Argument[1];Argument[2];taint;df-generated |
+| System.Collections.Immutable;ImmutableList;LastIndexOf<T>;(System.Collections.Immutable.IImmutableList<T>,T,System.Collections.Generic.IEqualityComparer<T>);Argument[0].Element;Argument[2];taint;df-generated |
+| System.Collections.Immutable;ImmutableList;LastIndexOf<T>;(System.Collections.Immutable.IImmutableList<T>,T,System.Collections.Generic.IEqualityComparer<T>);Argument[1];Argument[2];taint;df-generated |
 | System.Collections.Immutable;ImmutableList;Remove<T>;(System.Collections.Immutable.IImmutableList<T>,T);Argument[0].Element;ReturnValue;taint;df-generated |
 | System.Collections.Immutable;ImmutableList;RemoveRange<T>;(System.Collections.Immutable.IImmutableList<T>,System.Collections.Generic.IEnumerable<T>);Argument[0].Element;ReturnValue;taint;df-generated |
 | System.Collections.Immutable;ImmutableList;Replace<T>;(System.Collections.Immutable.IImmutableList<T>,T,T);Argument[0].Element;ReturnValue;taint;df-generated |
@@ -6539,27 +7171,34 @@ summary
 | System.Collections.Immutable;ImmutableList<T>+Builder;FindLastIndex;(System.Int32,System.Int32,System.Predicate<T>);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
 | System.Collections.Immutable;ImmutableList<T>+Builder;FindLastIndex;(System.Int32,System.Predicate<T>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
 | System.Collections.Immutable;ImmutableList<T>+Builder;FindLastIndex;(System.Predicate<T>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
+| System.Collections.Immutable;ImmutableList<T>+Builder;ForEach;(System.Action<T>);Argument[0];Argument[0].Parameter[delegate-self];value;dfc-generated |
 | System.Collections.Immutable;ImmutableList<T>+Builder;ForEach;(System.Action<T>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
+| System.Collections.Immutable;ImmutableList<T>+Builder;ForEach;(System.Action<T>);Argument[this].Element;Argument[0].Parameter[0];value;dfc-generated |
+| System.Collections.Immutable;ImmutableList<T>+Builder;ForEach;(System.Action<T>);Argument[this].Element;Argument[0].Parameter[0];value;hq-generated |
 | System.Collections.Immutable;ImmutableList<T>+Builder;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.Generic.IEnumerator`1.Current];value;manual |
 | System.Collections.Immutable;ImmutableList<T>+Builder;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.IEnumerator.Current];value;manual |
 | System.Collections.Immutable;ImmutableList<T>+Builder;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.Immutable.ImmutableList`1+Enumerator.Current];value;manual |
 | System.Collections.Immutable;ImmutableList<T>+Builder;GetRange;(System.Int32,System.Int32);Argument[this].Element;ReturnValue.Element;value;manual |
+| System.Collections.Immutable;ImmutableList<T>+Builder;IndexOf;(T,System.Int32,System.Int32,System.Collections.Generic.IEqualityComparer<T>);Argument[0];Argument[3];taint;df-generated |
 | System.Collections.Immutable;ImmutableList<T>+Builder;Insert;(System.Int32,System.Object);Argument[1];Argument[this].Element;value;manual |
 | System.Collections.Immutable;ImmutableList<T>+Builder;Insert;(System.Int32,T);Argument[1];Argument[this].Element;value;manual |
 | System.Collections.Immutable;ImmutableList<T>+Builder;InsertRange;(System.Int32,System.Collections.Generic.IEnumerable<T>);Argument[1].Element;Argument[this].Element;value;manual |
-| System.Collections.Immutable;ImmutableList<T>+Builder;Remove;(System.Object);Argument[0];Argument[this];taint;df-generated |
-| System.Collections.Immutable;ImmutableList<T>+Builder;Remove;(System.Object);Argument[this];Argument[0];taint;df-generated |
+| System.Collections.Immutable;ImmutableList<T>+Builder;LastIndexOf;(T,System.Int32,System.Int32,System.Collections.Generic.IEqualityComparer<T>);Argument[0];Argument[3];taint;df-generated |
+| System.Collections.Immutable;ImmutableList<T>+Builder;Remove;(T,System.Collections.Generic.IEqualityComparer<T>);Argument[0];Argument[1];taint;df-generated |
 | System.Collections.Immutable;ImmutableList<T>+Builder;RemoveAll;(System.Predicate<T>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Collections.Immutable;ImmutableList<T>+Builder;Replace;(T,T);Argument[1];Argument[this];taint;df-generated |
+| System.Collections.Immutable;ImmutableList<T>+Builder;Replace;(T,T,System.Collections.Generic.IEqualityComparer<T>);Argument[0];Argument[2];taint;df-generated |
 | System.Collections.Immutable;ImmutableList<T>+Builder;Replace;(T,T,System.Collections.Generic.IEqualityComparer<T>);Argument[1];Argument[this];taint;df-generated |
 | System.Collections.Immutable;ImmutableList<T>+Builder;Sort;(System.Comparison<T>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Collections.Immutable;ImmutableList<T>+Builder;TrueForAll;(System.Predicate<T>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Collections.Immutable;ImmutableList<T>+Builder;get_Item;(System.Int32);Argument[this].Element;ReturnValue;value;manual |
-| System.Collections.Immutable;ImmutableList<T>+Builder;get_SyncRoot;();Argument[this];ReturnValue;taint;df-generated |
-| System.Collections.Immutable;ImmutableList<T>+Builder;get_SyncRoot;();Argument[this];ReturnValue;value;df-generated |
+| System.Collections.Immutable;ImmutableList<T>+Builder;get_SyncRoot;();Argument[this];ReturnValue;value;dfc-generated |
 | System.Collections.Immutable;ImmutableList<T>+Builder;set_Item;(System.Int32,System.Object);Argument[1];Argument[this].Element;value;manual |
 | System.Collections.Immutable;ImmutableList<T>+Builder;set_Item;(System.Int32,T);Argument[1];Argument[this].Element;value;manual |
+| System.Collections.Immutable;ImmutableList<T>+Enumerator;get_Current;();Argument[this].Property[System.Collections.Immutable.ImmutableList`1+Enumerator.Current];ReturnValue;value;df-generated |
+| System.Collections.Immutable;ImmutableList<T>+Enumerator;get_Current;();Argument[this].Property[System.Collections.Immutable.ImmutableList`1+Enumerator.Current];ReturnValue;value;dfc-generated |
 | System.Collections.Immutable;ImmutableList<T>+Enumerator;get_Current;();Argument[this];ReturnValue;taint;df-generated |
+| System.Collections.Immutable;ImmutableList<T>+Enumerator;get_Current;();Argument[this];ReturnValue;taint;dfc-generated |
 | System.Collections.Immutable;ImmutableList<T>;Add;(System.Object);Argument[0];Argument[this].Element;value;manual |
 | System.Collections.Immutable;ImmutableList<T>;Add;(T);Argument[0];Argument[this].Element;value;manual |
 | System.Collections.Immutable;ImmutableList<T>;AddRange;(System.Collections.Generic.IEnumerable<T>);Argument[0].Element;Argument[this].Element;value;manual |
@@ -6589,17 +7228,21 @@ summary
 | System.Collections.Immutable;ImmutableList<T>;FindLastIndex;(System.Int32,System.Int32,System.Predicate<T>);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
 | System.Collections.Immutable;ImmutableList<T>;FindLastIndex;(System.Int32,System.Predicate<T>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
 | System.Collections.Immutable;ImmutableList<T>;FindLastIndex;(System.Predicate<T>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
+| System.Collections.Immutable;ImmutableList<T>;ForEach;(System.Action<T>);Argument[0];Argument[0].Parameter[delegate-self];value;dfc-generated |
 | System.Collections.Immutable;ImmutableList<T>;ForEach;(System.Action<T>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
+| System.Collections.Immutable;ImmutableList<T>;ForEach;(System.Action<T>);Argument[this].Element;Argument[0].Parameter[0];value;dfc-generated |
+| System.Collections.Immutable;ImmutableList<T>;ForEach;(System.Action<T>);Argument[this].Element;Argument[0].Parameter[0];value;hq-generated |
 | System.Collections.Immutable;ImmutableList<T>;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.Generic.IEnumerator`1.Current];value;manual |
 | System.Collections.Immutable;ImmutableList<T>;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.IEnumerator.Current];value;manual |
 | System.Collections.Immutable;ImmutableList<T>;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.Immutable.ImmutableList`1+Enumerator.Current];value;manual |
 | System.Collections.Immutable;ImmutableList<T>;GetRange;(System.Int32,System.Int32);Argument[this].Element;ReturnValue.Element;value;manual |
+| System.Collections.Immutable;ImmutableList<T>;IndexOf;(T,System.Int32,System.Int32,System.Collections.Generic.IEqualityComparer<T>);Argument[0];Argument[3];taint;df-generated |
 | System.Collections.Immutable;ImmutableList<T>;Insert;(System.Int32,System.Object);Argument[1];Argument[this].Element;value;manual |
 | System.Collections.Immutable;ImmutableList<T>;Insert;(System.Int32,T);Argument[1];Argument[this].Element;value;manual |
 | System.Collections.Immutable;ImmutableList<T>;InsertRange;(System.Int32,System.Collections.Generic.IEnumerable<T>);Argument[1].Element;Argument[this].Element;value;manual |
-| System.Collections.Immutable;ImmutableList<T>;Remove;(System.Object);Argument[0];Argument[this];taint;df-generated |
-| System.Collections.Immutable;ImmutableList<T>;Remove;(System.Object);Argument[this];Argument[0];taint;df-generated |
+| System.Collections.Immutable;ImmutableList<T>;LastIndexOf;(T,System.Int32,System.Int32,System.Collections.Generic.IEqualityComparer<T>);Argument[0];Argument[3];taint;df-generated |
 | System.Collections.Immutable;ImmutableList<T>;Remove;(T);Argument[this];ReturnValue;taint;df-generated |
+| System.Collections.Immutable;ImmutableList<T>;Remove;(T,System.Collections.Generic.IEqualityComparer<T>);Argument[0];Argument[1];taint;df-generated |
 | System.Collections.Immutable;ImmutableList<T>;Remove;(T,System.Collections.Generic.IEqualityComparer<T>);Argument[this];ReturnValue;taint;df-generated |
 | System.Collections.Immutable;ImmutableList<T>;RemoveAll;(System.Predicate<T>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Collections.Immutable;ImmutableList<T>;RemoveAt;(System.Int32);Argument[this];ReturnValue;taint;df-generated |
@@ -6610,6 +7253,7 @@ summary
 | System.Collections.Immutable;ImmutableList<T>;Replace;(T,T);Argument[1];Argument[this];taint;df-generated |
 | System.Collections.Immutable;ImmutableList<T>;Replace;(T,T);Argument[1];ReturnValue;taint;df-generated |
 | System.Collections.Immutable;ImmutableList<T>;Replace;(T,T);Argument[this];ReturnValue;taint;df-generated |
+| System.Collections.Immutable;ImmutableList<T>;Replace;(T,T,System.Collections.Generic.IEqualityComparer<T>);Argument[0];Argument[2];taint;df-generated |
 | System.Collections.Immutable;ImmutableList<T>;Replace;(T,T,System.Collections.Generic.IEqualityComparer<T>);Argument[1];Argument[this];taint;df-generated |
 | System.Collections.Immutable;ImmutableList<T>;Replace;(T,T,System.Collections.Generic.IEqualityComparer<T>);Argument[1];ReturnValue;taint;df-generated |
 | System.Collections.Immutable;ImmutableList<T>;Replace;(T,T,System.Collections.Generic.IEqualityComparer<T>);Argument[this];ReturnValue;taint;df-generated |
@@ -6618,15 +7262,17 @@ summary
 | System.Collections.Immutable;ImmutableList<T>;SetItem;(System.Int32,T);Argument[1];Argument[this];taint;df-generated |
 | System.Collections.Immutable;ImmutableList<T>;SetItem;(System.Int32,T);Argument[1];ReturnValue;taint;df-generated |
 | System.Collections.Immutable;ImmutableList<T>;SetItem;(System.Int32,T);Argument[this];ReturnValue;taint;df-generated |
-| System.Collections.Immutable;ImmutableList<T>;Sort;();Argument[this];ReturnValue;taint;df-generated |
-| System.Collections.Immutable;ImmutableList<T>;Sort;(System.Collections.Generic.IComparer<T>);Argument[this];ReturnValue;taint;df-generated |
+| System.Collections.Immutable;ImmutableList<T>;Sort;();Argument[this];ReturnValue;value;dfc-generated |
+| System.Collections.Immutable;ImmutableList<T>;Sort;(System.Collections.Generic.IComparer<T>);Argument[this];ReturnValue;value;dfc-generated |
+| System.Collections.Immutable;ImmutableList<T>;Sort;(System.Comparison<T>);Argument[0];Argument[0].Parameter[delegate-self];value;dfc-generated |
 | System.Collections.Immutable;ImmutableList<T>;Sort;(System.Comparison<T>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
-| System.Collections.Immutable;ImmutableList<T>;Sort;(System.Int32,System.Int32,System.Collections.Generic.IComparer<T>);Argument[this];ReturnValue;taint;df-generated |
+| System.Collections.Immutable;ImmutableList<T>;Sort;(System.Comparison<T>);Argument[this];ReturnValue;value;dfc-generated |
+| System.Collections.Immutable;ImmutableList<T>;Sort;(System.Comparison<T>);Argument[this];ReturnValue;value;hq-generated |
+| System.Collections.Immutable;ImmutableList<T>;Sort;(System.Int32,System.Int32,System.Collections.Generic.IComparer<T>);Argument[this];ReturnValue;value;dfc-generated |
 | System.Collections.Immutable;ImmutableList<T>;ToBuilder;();Argument[this];ReturnValue;taint;df-generated |
 | System.Collections.Immutable;ImmutableList<T>;TrueForAll;(System.Predicate<T>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Collections.Immutable;ImmutableList<T>;get_Item;(System.Int32);Argument[this].Element;ReturnValue;value;manual |
-| System.Collections.Immutable;ImmutableList<T>;get_SyncRoot;();Argument[this];ReturnValue;taint;df-generated |
-| System.Collections.Immutable;ImmutableList<T>;get_SyncRoot;();Argument[this];ReturnValue;value;df-generated |
+| System.Collections.Immutable;ImmutableList<T>;get_SyncRoot;();Argument[this];ReturnValue;value;dfc-generated |
 | System.Collections.Immutable;ImmutableList<T>;set_Item;(System.Int32,System.Object);Argument[1];Argument[this].Element;value;manual |
 | System.Collections.Immutable;ImmutableList<T>;set_Item;(System.Int32,T);Argument[1];Argument[this].Element;value;manual |
 | System.Collections.Immutable;ImmutableQueue;Create<T>;(System.ReadOnlySpan<T>);Argument[0];ReturnValue;taint;df-generated |
@@ -6638,12 +7284,11 @@ summary
 | System.Collections.Immutable;ImmutableQueue<T>;Clear;();Argument[this].WithoutElement;ReturnValue;value;manual |
 | System.Collections.Immutable;ImmutableQueue<T>;Dequeue;();Argument[this];ReturnValue;taint;df-generated |
 | System.Collections.Immutable;ImmutableQueue<T>;Dequeue;(T);Argument[this];ReturnValue;taint;df-generated |
-| System.Collections.Immutable;ImmutableQueue<T>;Enqueue;(T);Argument[0];ReturnValue;taint;df-generated |
-| System.Collections.Immutable;ImmutableQueue<T>;Enqueue;(T);Argument[this];ReturnValue;taint;df-generated |
+| System.Collections.Immutable;ImmutableQueue<T>;Enqueue;(T);Argument[0];ReturnValue.SyntheticField[System.Collections.Immutable.ImmutableQueue`1._forwards].SyntheticField[System.Collections.Immutable.ImmutableStack`1._head];value;dfc-generated |
 | System.Collections.Immutable;ImmutableQueue<T>;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.Generic.IEnumerator`1.Current];value;manual |
 | System.Collections.Immutable;ImmutableQueue<T>;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.IEnumerator.Current];value;manual |
 | System.Collections.Immutable;ImmutableQueue<T>;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.Immutable.ImmutableQueue`1+Enumerator.Current];value;manual |
-| System.Collections.Immutable;ImmutableQueue<T>;Peek;();Argument[this];ReturnValue;taint;df-generated |
+| System.Collections.Immutable;ImmutableQueue<T>;Peek;();Argument[this].SyntheticField[System.Collections.Immutable.ImmutableQueue`1._forwards].SyntheticField[System.Collections.Immutable.ImmutableStack`1._head];ReturnValue;value;dfc-generated |
 | System.Collections.Immutable;ImmutableSortedDictionary;Create<TKey,TValue>;(System.Collections.Generic.IComparer<TKey>);Argument[0];ReturnValue;taint;df-generated |
 | System.Collections.Immutable;ImmutableSortedDictionary;Create<TKey,TValue>;(System.Collections.Generic.IComparer<TKey>,System.Collections.Generic.IEqualityComparer<TValue>);Argument[0];ReturnValue;taint;df-generated |
 | System.Collections.Immutable;ImmutableSortedDictionary;Create<TKey,TValue>;(System.Collections.Generic.IComparer<TKey>,System.Collections.Generic.IEqualityComparer<TValue>);Argument[1];ReturnValue;taint;df-generated |
@@ -6682,14 +7327,13 @@ summary
 | System.Collections.Immutable;ImmutableSortedDictionary<TKey,TValue>+Builder;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.Generic.IEnumerator`1.Current];value;manual |
 | System.Collections.Immutable;ImmutableSortedDictionary<TKey,TValue>+Builder;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.IEnumerator.Current];value;manual |
 | System.Collections.Immutable;ImmutableSortedDictionary<TKey,TValue>+Builder;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.Immutable.ImmutableSortedDictionary`2+Enumerator.Current];value;manual |
-| System.Collections.Immutable;ImmutableSortedDictionary<TKey,TValue>+Builder;GetValueOrDefault;(TKey,TValue);Argument[1];ReturnValue;taint;df-generated |
-| System.Collections.Immutable;ImmutableSortedDictionary<TKey,TValue>+Builder;TryGetKey;(TKey,TKey);Argument[0];ReturnValue;taint;df-generated |
-| System.Collections.Immutable;ImmutableSortedDictionary<TKey,TValue>+Builder;TryGetKey;(TKey,TKey);Argument[this];ReturnValue;taint;df-generated |
+| System.Collections.Immutable;ImmutableSortedDictionary<TKey,TValue>+Builder;GetValueOrDefault;(TKey,TValue);Argument[1];ReturnValue;value;dfc-generated |
+| System.Collections.Immutable;ImmutableSortedDictionary<TKey,TValue>+Builder;TryGetKey;(TKey,TKey);Argument[0];ReturnValue;value;dfc-generated |
+| System.Collections.Immutable;ImmutableSortedDictionary<TKey,TValue>+Builder;TryGetValue;(TKey,TValue);Argument[1];ReturnValue;value;dfc-generated |
 | System.Collections.Immutable;ImmutableSortedDictionary<TKey,TValue>+Builder;get_Item;(System.Object);Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Value];ReturnValue;value;manual |
 | System.Collections.Immutable;ImmutableSortedDictionary<TKey,TValue>+Builder;get_Item;(TKey);Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Value];ReturnValue;value;manual |
 | System.Collections.Immutable;ImmutableSortedDictionary<TKey,TValue>+Builder;get_Keys;();Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Key];ReturnValue.Element;value;manual |
-| System.Collections.Immutable;ImmutableSortedDictionary<TKey,TValue>+Builder;get_SyncRoot;();Argument[this];ReturnValue;taint;df-generated |
-| System.Collections.Immutable;ImmutableSortedDictionary<TKey,TValue>+Builder;get_SyncRoot;();Argument[this];ReturnValue;value;df-generated |
+| System.Collections.Immutable;ImmutableSortedDictionary<TKey,TValue>+Builder;get_SyncRoot;();Argument[this];ReturnValue;value;dfc-generated |
 | System.Collections.Immutable;ImmutableSortedDictionary<TKey,TValue>+Builder;get_Values;();Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Value];ReturnValue.Element;value;manual |
 | System.Collections.Immutable;ImmutableSortedDictionary<TKey,TValue>+Builder;set_Item;(System.Object,System.Object);Argument[0];Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Key];value;manual |
 | System.Collections.Immutable;ImmutableSortedDictionary<TKey,TValue>+Builder;set_Item;(System.Object,System.Object);Argument[1];Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Value];value;manual |
@@ -6704,9 +7348,11 @@ summary
 | System.Collections.Immutable;ImmutableSortedDictionary<TKey,TValue>;Add;(TKey,TValue);Argument[0];Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Key];value;manual |
 | System.Collections.Immutable;ImmutableSortedDictionary<TKey,TValue>;Add;(TKey,TValue);Argument[1];Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Value];value;manual |
 | System.Collections.Immutable;ImmutableSortedDictionary<TKey,TValue>;AddRange;(System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<TKey,TValue>>);Argument[0].Element;Argument[this].Element;value;manual |
+| System.Collections.Immutable;ImmutableSortedDictionary<TKey,TValue>;Clear;();Argument[this].SyntheticField[System.Collections.Immutable.ImmutableSortedDictionary`2._keyComparer];ReturnValue.SyntheticField[System.Collections.Immutable.ImmutableSortedDictionary`2._keyComparer];value;dfc-generated |
+| System.Collections.Immutable;ImmutableSortedDictionary<TKey,TValue>;Clear;();Argument[this].SyntheticField[System.Collections.Immutable.ImmutableSortedDictionary`2._valueComparer];ReturnValue.SyntheticField[System.Collections.Immutable.ImmutableSortedDictionary`2._valueComparer];value;dfc-generated |
 | System.Collections.Immutable;ImmutableSortedDictionary<TKey,TValue>;Clear;();Argument[this].WithoutElement;Argument[this];value;manual |
 | System.Collections.Immutable;ImmutableSortedDictionary<TKey,TValue>;Clear;();Argument[this].WithoutElement;ReturnValue;value;manual |
-| System.Collections.Immutable;ImmutableSortedDictionary<TKey,TValue>;Clear;();Argument[this];ReturnValue;taint;df-generated |
+| System.Collections.Immutable;ImmutableSortedDictionary<TKey,TValue>;Clear;();Argument[this];ReturnValue;value;dfc-generated |
 | System.Collections.Immutable;ImmutableSortedDictionary<TKey,TValue>;CopyTo;(System.Array,System.Int32);Argument[this].Element;Argument[0].Element;value;manual |
 | System.Collections.Immutable;ImmutableSortedDictionary<TKey,TValue>;CopyTo;(System.Collections.Generic.KeyValuePair<TKey,TValue>[],System.Int32);Argument[this].Element;Argument[0].Element;value;manual |
 | System.Collections.Immutable;ImmutableSortedDictionary<TKey,TValue>;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.Generic.IEnumerator`1.Current];value;manual |
@@ -6714,26 +7360,22 @@ summary
 | System.Collections.Immutable;ImmutableSortedDictionary<TKey,TValue>;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.Immutable.ImmutableSortedDictionary`2+Enumerator.Current];value;manual |
 | System.Collections.Immutable;ImmutableSortedDictionary<TKey,TValue>;Remove;(TKey);Argument[this];ReturnValue;taint;df-generated |
 | System.Collections.Immutable;ImmutableSortedDictionary<TKey,TValue>;RemoveRange;(System.Collections.Generic.IEnumerable<TKey>);Argument[this];ReturnValue;taint;df-generated |
-| System.Collections.Immutable;ImmutableSortedDictionary<TKey,TValue>;SetItem;(TKey,TValue);Argument[0];Argument[this];taint;df-generated |
-| System.Collections.Immutable;ImmutableSortedDictionary<TKey,TValue>;SetItem;(TKey,TValue);Argument[0];ReturnValue;taint;df-generated |
-| System.Collections.Immutable;ImmutableSortedDictionary<TKey,TValue>;SetItem;(TKey,TValue);Argument[1];Argument[this];taint;df-generated |
-| System.Collections.Immutable;ImmutableSortedDictionary<TKey,TValue>;SetItem;(TKey,TValue);Argument[1];ReturnValue;taint;df-generated |
-| System.Collections.Immutable;ImmutableSortedDictionary<TKey,TValue>;SetItem;(TKey,TValue);Argument[this];ReturnValue;taint;df-generated |
+| System.Collections.Immutable;ImmutableSortedDictionary<TKey,TValue>;SetItem;(TKey,TValue);Argument[0];ReturnValue.SyntheticField[System.Collections.Immutable.ImmutableSortedDictionary`2._root].SyntheticField[System.Collections.Immutable.ImmutableSortedDictionary`2+Node._key];value;dfc-generated |
 | System.Collections.Immutable;ImmutableSortedDictionary<TKey,TValue>;SetItems;(System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<TKey,TValue>>);Argument[0].Element;ReturnValue;taint;df-generated |
 | System.Collections.Immutable;ImmutableSortedDictionary<TKey,TValue>;SetItems;(System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<TKey,TValue>>);Argument[this];ReturnValue;taint;df-generated |
 | System.Collections.Immutable;ImmutableSortedDictionary<TKey,TValue>;ToBuilder;();Argument[this];ReturnValue;taint;df-generated |
-| System.Collections.Immutable;ImmutableSortedDictionary<TKey,TValue>;TryGetKey;(TKey,TKey);Argument[0];ReturnValue;taint;df-generated |
-| System.Collections.Immutable;ImmutableSortedDictionary<TKey,TValue>;TryGetKey;(TKey,TKey);Argument[this];ReturnValue;taint;df-generated |
-| System.Collections.Immutable;ImmutableSortedDictionary<TKey,TValue>;WithComparers;(System.Collections.Generic.IComparer<TKey>);Argument[0];ReturnValue;taint;df-generated |
-| System.Collections.Immutable;ImmutableSortedDictionary<TKey,TValue>;WithComparers;(System.Collections.Generic.IComparer<TKey>);Argument[this];ReturnValue;taint;df-generated |
-| System.Collections.Immutable;ImmutableSortedDictionary<TKey,TValue>;WithComparers;(System.Collections.Generic.IComparer<TKey>,System.Collections.Generic.IEqualityComparer<TValue>);Argument[this];ReturnValue;value;df-generated |
+| System.Collections.Immutable;ImmutableSortedDictionary<TKey,TValue>;TryGetKey;(TKey,TKey);Argument[0];ReturnValue;value;dfc-generated |
+| System.Collections.Immutable;ImmutableSortedDictionary<TKey,TValue>;TryGetKey;(TKey,TKey);Argument[this].SyntheticField[System.Collections.Immutable.ImmutableSortedDictionary`2._root].SyntheticField[System.Collections.Immutable.ImmutableSortedDictionary`2+Node._key];ReturnValue;value;dfc-generated |
+| System.Collections.Immutable;ImmutableSortedDictionary<TKey,TValue>;TryGetValue;(TKey,TValue);Argument[1];ReturnValue;value;dfc-generated |
+| System.Collections.Immutable;ImmutableSortedDictionary<TKey,TValue>;WithComparers;(System.Collections.Generic.IComparer<TKey>);Argument[0];ReturnValue.SyntheticField[System.Collections.Immutable.ImmutableSortedDictionary`2._keyComparer];value;dfc-generated |
+| System.Collections.Immutable;ImmutableSortedDictionary<TKey,TValue>;WithComparers;(System.Collections.Generic.IComparer<TKey>,System.Collections.Generic.IEqualityComparer<TValue>);Argument[0];ReturnValue.SyntheticField[System.Collections.Immutable.ImmutableSortedDictionary`2._keyComparer];value;dfc-generated |
+| System.Collections.Immutable;ImmutableSortedDictionary<TKey,TValue>;WithComparers;(System.Collections.Generic.IComparer<TKey>,System.Collections.Generic.IEqualityComparer<TValue>);Argument[1];ReturnValue.SyntheticField[System.Collections.Immutable.ImmutableSortedDictionary`2._valueComparer];value;dfc-generated |
 | System.Collections.Immutable;ImmutableSortedDictionary<TKey,TValue>;get_Item;(System.Object);Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Value];ReturnValue;value;manual |
 | System.Collections.Immutable;ImmutableSortedDictionary<TKey,TValue>;get_Item;(TKey);Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Value];ReturnValue;value;manual |
-| System.Collections.Immutable;ImmutableSortedDictionary<TKey,TValue>;get_KeyComparer;();Argument[this];ReturnValue;taint;df-generated |
+| System.Collections.Immutable;ImmutableSortedDictionary<TKey,TValue>;get_KeyComparer;();Argument[this].SyntheticField[System.Collections.Immutable.ImmutableSortedDictionary`2._keyComparer];ReturnValue;value;dfc-generated |
 | System.Collections.Immutable;ImmutableSortedDictionary<TKey,TValue>;get_Keys;();Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Key];ReturnValue.Element;value;manual |
-| System.Collections.Immutable;ImmutableSortedDictionary<TKey,TValue>;get_SyncRoot;();Argument[this];ReturnValue;taint;df-generated |
-| System.Collections.Immutable;ImmutableSortedDictionary<TKey,TValue>;get_SyncRoot;();Argument[this];ReturnValue;value;df-generated |
-| System.Collections.Immutable;ImmutableSortedDictionary<TKey,TValue>;get_ValueComparer;();Argument[this];ReturnValue;taint;df-generated |
+| System.Collections.Immutable;ImmutableSortedDictionary<TKey,TValue>;get_SyncRoot;();Argument[this];ReturnValue;value;dfc-generated |
+| System.Collections.Immutable;ImmutableSortedDictionary<TKey,TValue>;get_ValueComparer;();Argument[this].SyntheticField[System.Collections.Immutable.ImmutableSortedDictionary`2._valueComparer];ReturnValue;value;dfc-generated |
 | System.Collections.Immutable;ImmutableSortedDictionary<TKey,TValue>;get_Values;();Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Value];ReturnValue.Element;value;manual |
 | System.Collections.Immutable;ImmutableSortedDictionary<TKey,TValue>;set_Item;(System.Object,System.Object);Argument[0];Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Key];value;manual |
 | System.Collections.Immutable;ImmutableSortedDictionary<TKey,TValue>;set_Item;(System.Object,System.Object);Argument[1];Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Value];value;manual |
@@ -6763,22 +7405,25 @@ summary
 | System.Collections.Immutable;ImmutableSortedSet<T>+Builder;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.Generic.IEnumerator`1.Current];value;manual |
 | System.Collections.Immutable;ImmutableSortedSet<T>+Builder;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.IEnumerator.Current];value;manual |
 | System.Collections.Immutable;ImmutableSortedSet<T>+Builder;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.Immutable.ImmutableSortedSet`1+Enumerator.Current];value;manual |
-| System.Collections.Immutable;ImmutableSortedSet<T>+Builder;IntersectWith;(System.Collections.Generic.IEnumerable<T>);Argument[0].Element;Argument[this];taint;df-generated |
+| System.Collections.Immutable;ImmutableSortedSet<T>+Builder;IntersectWith;(System.Collections.Generic.IEnumerable<T>);Argument[0].Element;Argument[this].SyntheticField[System.Collections.Immutable.ImmutableSortedSet`1+Builder._root].SyntheticField[System.Collections.Immutable.ImmutableSortedSet`1+Node._key];value;dfc-generated |
 | System.Collections.Immutable;ImmutableSortedSet<T>+Builder;Reverse;();Argument[this].Element;ReturnValue.Element;value;manual |
-| System.Collections.Immutable;ImmutableSortedSet<T>+Builder;SymmetricExceptWith;(System.Collections.Generic.IEnumerable<T>);Argument[0].Element;Argument[this];taint;df-generated |
-| System.Collections.Immutable;ImmutableSortedSet<T>+Builder;TryGetValue;(T,T);Argument[0];ReturnValue;taint;df-generated |
-| System.Collections.Immutable;ImmutableSortedSet<T>+Builder;TryGetValue;(T,T);Argument[this];ReturnValue;taint;df-generated |
-| System.Collections.Immutable;ImmutableSortedSet<T>+Builder;UnionWith;(System.Collections.Generic.IEnumerable<T>);Argument[0].Element;Argument[this];taint;df-generated |
-| System.Collections.Immutable;ImmutableSortedSet<T>+Builder;get_Max;();Argument[this];ReturnValue;taint;df-generated |
-| System.Collections.Immutable;ImmutableSortedSet<T>+Builder;get_Min;();Argument[this];ReturnValue;taint;df-generated |
-| System.Collections.Immutable;ImmutableSortedSet<T>+Builder;get_SyncRoot;();Argument[this];ReturnValue;taint;df-generated |
-| System.Collections.Immutable;ImmutableSortedSet<T>+Builder;get_SyncRoot;();Argument[this];ReturnValue;value;df-generated |
+| System.Collections.Immutable;ImmutableSortedSet<T>+Builder;SymmetricExceptWith;(System.Collections.Generic.IEnumerable<T>);Argument[0].Element;Argument[this].SyntheticField[System.Collections.Immutable.ImmutableSortedSet`1+Builder._root].SyntheticField[System.Collections.Immutable.ImmutableSortedSet`1+Node._key];value;dfc-generated |
+| System.Collections.Immutable;ImmutableSortedSet<T>+Builder;TryGetValue;(T,T);Argument[0];ReturnValue;value;dfc-generated |
+| System.Collections.Immutable;ImmutableSortedSet<T>+Builder;TryGetValue;(T,T);Argument[this].SyntheticField[System.Collections.Immutable.ImmutableSortedSet`1+Builder._root].SyntheticField[System.Collections.Immutable.ImmutableSortedSet`1+Node._key];ReturnValue;value;dfc-generated |
+| System.Collections.Immutable;ImmutableSortedSet<T>+Builder;UnionWith;(System.Collections.Generic.IEnumerable<T>);Argument[0].Element;Argument[this].SyntheticField[System.Collections.Immutable.ImmutableSortedSet`1+Builder._root].SyntheticField[System.Collections.Immutable.ImmutableSortedSet`1+Node._key];value;dfc-generated |
+| System.Collections.Immutable;ImmutableSortedSet<T>+Builder;get_Max;();Argument[this].SyntheticField[System.Collections.Immutable.ImmutableSortedSet`1+Builder._root].SyntheticField[System.Collections.Immutable.ImmutableSortedSet`1+Node._key];ReturnValue;value;dfc-generated |
+| System.Collections.Immutable;ImmutableSortedSet<T>+Builder;get_Min;();Argument[this].SyntheticField[System.Collections.Immutable.ImmutableSortedSet`1+Builder._root].SyntheticField[System.Collections.Immutable.ImmutableSortedSet`1+Node._key];ReturnValue;value;dfc-generated |
+| System.Collections.Immutable;ImmutableSortedSet<T>+Builder;get_SyncRoot;();Argument[this];ReturnValue;value;dfc-generated |
+| System.Collections.Immutable;ImmutableSortedSet<T>+Enumerator;get_Current;();Argument[this].Property[System.Collections.Immutable.ImmutableSortedSet`1+Enumerator.Current];ReturnValue;value;df-generated |
+| System.Collections.Immutable;ImmutableSortedSet<T>+Enumerator;get_Current;();Argument[this].Property[System.Collections.Immutable.ImmutableSortedSet`1+Enumerator.Current];ReturnValue;value;dfc-generated |
 | System.Collections.Immutable;ImmutableSortedSet<T>+Enumerator;get_Current;();Argument[this];ReturnValue;taint;df-generated |
+| System.Collections.Immutable;ImmutableSortedSet<T>+Enumerator;get_Current;();Argument[this];ReturnValue;taint;dfc-generated |
 | System.Collections.Immutable;ImmutableSortedSet<T>;Add;(System.Object);Argument[0];Argument[this].Element;value;manual |
 | System.Collections.Immutable;ImmutableSortedSet<T>;Add;(T);Argument[0];Argument[this].Element;value;manual |
+| System.Collections.Immutable;ImmutableSortedSet<T>;Clear;();Argument[this].SyntheticField[System.Collections.Immutable.ImmutableSortedSet`1._comparer];ReturnValue.SyntheticField[System.Collections.Immutable.ImmutableSortedSet`1._comparer];value;dfc-generated |
 | System.Collections.Immutable;ImmutableSortedSet<T>;Clear;();Argument[this].WithoutElement;Argument[this];value;manual |
 | System.Collections.Immutable;ImmutableSortedSet<T>;Clear;();Argument[this].WithoutElement;ReturnValue;value;manual |
-| System.Collections.Immutable;ImmutableSortedSet<T>;Clear;();Argument[this];ReturnValue;taint;df-generated |
+| System.Collections.Immutable;ImmutableSortedSet<T>;Clear;();Argument[this];ReturnValue;value;dfc-generated |
 | System.Collections.Immutable;ImmutableSortedSet<T>;CopyTo;(System.Array,System.Int32);Argument[this].Element;Argument[0].Element;value;manual |
 | System.Collections.Immutable;ImmutableSortedSet<T>;CopyTo;(T[],System.Int32);Argument[this].Element;Argument[0].Element;value;manual |
 | System.Collections.Immutable;ImmutableSortedSet<T>;Except;(System.Collections.Generic.IEnumerable<T>);Argument[this];ReturnValue;taint;df-generated |
@@ -6788,26 +7433,22 @@ summary
 | System.Collections.Immutable;ImmutableSortedSet<T>;Insert;(System.Int32,System.Object);Argument[1];Argument[this].Element;value;manual |
 | System.Collections.Immutable;ImmutableSortedSet<T>;Insert;(System.Int32,T);Argument[1];Argument[this].Element;value;manual |
 | System.Collections.Immutable;ImmutableSortedSet<T>;Intersect;(System.Collections.Generic.IEnumerable<T>);Argument[this];ReturnValue;taint;df-generated |
-| System.Collections.Immutable;ImmutableSortedSet<T>;Remove;(System.Object);Argument[0];Argument[this];taint;df-generated |
-| System.Collections.Immutable;ImmutableSortedSet<T>;Remove;(System.Object);Argument[this];Argument[0];taint;df-generated |
 | System.Collections.Immutable;ImmutableSortedSet<T>;Remove;(T);Argument[this];ReturnValue;taint;df-generated |
 | System.Collections.Immutable;ImmutableSortedSet<T>;Reverse;();Argument[this].Element;ReturnValue.Element;value;manual |
-| System.Collections.Immutable;ImmutableSortedSet<T>;SymmetricExcept;(System.Collections.Generic.IEnumerable<T>);Argument[0].Element;Argument[this];taint;df-generated |
-| System.Collections.Immutable;ImmutableSortedSet<T>;SymmetricExcept;(System.Collections.Generic.IEnumerable<T>);Argument[0].Element;ReturnValue;taint;df-generated |
-| System.Collections.Immutable;ImmutableSortedSet<T>;SymmetricExcept;(System.Collections.Generic.IEnumerable<T>);Argument[this];ReturnValue;taint;df-generated |
+| System.Collections.Immutable;ImmutableSortedSet<T>;SymmetricExcept;(System.Collections.Generic.IEnumerable<T>);Argument[0].Element;Argument[this].Element;value;dfc-generated |
+| System.Collections.Immutable;ImmutableSortedSet<T>;SymmetricExcept;(System.Collections.Generic.IEnumerable<T>);Argument[0].Element;ReturnValue.SyntheticField[System.Collections.Immutable.ImmutableSortedSet`1._root].SyntheticField[System.Collections.Immutable.ImmutableSortedSet`1+Node._key];value;dfc-generated |
 | System.Collections.Immutable;ImmutableSortedSet<T>;ToBuilder;();Argument[this];ReturnValue;taint;df-generated |
-| System.Collections.Immutable;ImmutableSortedSet<T>;TryGetValue;(T,T);Argument[0];ReturnValue;taint;df-generated |
-| System.Collections.Immutable;ImmutableSortedSet<T>;TryGetValue;(T,T);Argument[this];ReturnValue;taint;df-generated |
+| System.Collections.Immutable;ImmutableSortedSet<T>;TryGetValue;(T,T);Argument[0];ReturnValue;value;dfc-generated |
+| System.Collections.Immutable;ImmutableSortedSet<T>;TryGetValue;(T,T);Argument[this].SyntheticField[System.Collections.Immutable.ImmutableSortedSet`1._root].SyntheticField[System.Collections.Immutable.ImmutableSortedSet`1+Node._key];ReturnValue;value;dfc-generated |
 | System.Collections.Immutable;ImmutableSortedSet<T>;Union;(System.Collections.Generic.IEnumerable<T>);Argument[0].Element;ReturnValue;taint;df-generated |
 | System.Collections.Immutable;ImmutableSortedSet<T>;Union;(System.Collections.Generic.IEnumerable<T>);Argument[this];ReturnValue;taint;df-generated |
 | System.Collections.Immutable;ImmutableSortedSet<T>;Union;(System.Collections.Generic.IEnumerable<T>);Argument[this];ReturnValue;value;df-generated |
-| System.Collections.Immutable;ImmutableSortedSet<T>;WithComparer;(System.Collections.Generic.IComparer<T>);Argument[this];ReturnValue;value;df-generated |
+| System.Collections.Immutable;ImmutableSortedSet<T>;WithComparer;(System.Collections.Generic.IComparer<T>);Argument[0];ReturnValue.SyntheticField[System.Collections.Immutable.ImmutableSortedSet`1._comparer];value;dfc-generated |
 | System.Collections.Immutable;ImmutableSortedSet<T>;get_Item;(System.Int32);Argument[this].Element;ReturnValue;value;manual |
-| System.Collections.Immutable;ImmutableSortedSet<T>;get_KeyComparer;();Argument[this];ReturnValue;taint;df-generated |
-| System.Collections.Immutable;ImmutableSortedSet<T>;get_Max;();Argument[this];ReturnValue;taint;df-generated |
-| System.Collections.Immutable;ImmutableSortedSet<T>;get_Min;();Argument[this];ReturnValue;taint;df-generated |
-| System.Collections.Immutable;ImmutableSortedSet<T>;get_SyncRoot;();Argument[this];ReturnValue;taint;df-generated |
-| System.Collections.Immutable;ImmutableSortedSet<T>;get_SyncRoot;();Argument[this];ReturnValue;value;df-generated |
+| System.Collections.Immutable;ImmutableSortedSet<T>;get_KeyComparer;();Argument[this].SyntheticField[System.Collections.Immutable.ImmutableSortedSet`1._comparer];ReturnValue;value;dfc-generated |
+| System.Collections.Immutable;ImmutableSortedSet<T>;get_Max;();Argument[this].SyntheticField[System.Collections.Immutable.ImmutableSortedSet`1._root].SyntheticField[System.Collections.Immutable.ImmutableSortedSet`1+Node._key];ReturnValue;value;dfc-generated |
+| System.Collections.Immutable;ImmutableSortedSet<T>;get_Min;();Argument[this].SyntheticField[System.Collections.Immutable.ImmutableSortedSet`1._root].SyntheticField[System.Collections.Immutable.ImmutableSortedSet`1+Node._key];ReturnValue;value;dfc-generated |
+| System.Collections.Immutable;ImmutableSortedSet<T>;get_SyncRoot;();Argument[this];ReturnValue;value;dfc-generated |
 | System.Collections.Immutable;ImmutableSortedSet<T>;set_Item;(System.Int32,System.Object);Argument[1];Argument[this].Element;value;manual |
 | System.Collections.Immutable;ImmutableSortedSet<T>;set_Item;(System.Int32,T);Argument[1];Argument[this].Element;value;manual |
 | System.Collections.Immutable;ImmutableStack;Create<T>;(System.ReadOnlySpan<T>);Argument[0];ReturnValue;taint;df-generated |
@@ -6820,46 +7461,41 @@ summary
 | System.Collections.Immutable;ImmutableStack<T>;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.Generic.IEnumerator`1.Current];value;manual |
 | System.Collections.Immutable;ImmutableStack<T>;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.IEnumerator.Current];value;manual |
 | System.Collections.Immutable;ImmutableStack<T>;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.Immutable.ImmutableStack`1+Enumerator.Current];value;manual |
-| System.Collections.Immutable;ImmutableStack<T>;Peek;();Argument[this];ReturnValue;taint;df-generated |
-| System.Collections.Immutable;ImmutableStack<T>;Pop;();Argument[this];ReturnValue;taint;df-generated |
-| System.Collections.Immutable;ImmutableStack<T>;Pop;(T);Argument[this];ReturnValue;taint;df-generated |
-| System.Collections.Immutable;ImmutableStack<T>;Push;(T);Argument[0];ReturnValue;taint;df-generated |
-| System.Collections.Immutable;ImmutableStack<T>;Push;(T);Argument[this];ReturnValue;taint;df-generated |
+| System.Collections.Immutable;ImmutableStack<T>;Peek;();Argument[this].SyntheticField[System.Collections.Immutable.ImmutableStack`1._head];ReturnValue;value;dfc-generated |
+| System.Collections.Immutable;ImmutableStack<T>;Pop;();Argument[this].SyntheticField[System.Collections.Immutable.ImmutableStack`1._tail];ReturnValue;value;dfc-generated |
+| System.Collections.Immutable;ImmutableStack<T>;Pop;(T);Argument[this].SyntheticField[System.Collections.Immutable.ImmutableStack`1._head];ReturnValue;value;dfc-generated |
+| System.Collections.Immutable;ImmutableStack<T>;Pop;(T);Argument[this].SyntheticField[System.Collections.Immutable.ImmutableStack`1._tail];ReturnValue;value;dfc-generated |
+| System.Collections.Immutable;ImmutableStack<T>;Push;(T);Argument[0];ReturnValue.SyntheticField[System.Collections.Immutable.ImmutableStack`1._head];value;dfc-generated |
+| System.Collections.Immutable;ImmutableStack<T>;Push;(T);Argument[this];ReturnValue.SyntheticField[System.Collections.Immutable.ImmutableStack`1._tail];value;dfc-generated |
 | System.Collections.ObjectModel;Collection<T>;Add;(System.Object);Argument[0];Argument[this].Element;value;manual |
 | System.Collections.ObjectModel;Collection<T>;Add;(T);Argument[0];Argument[this].Element;value;manual |
 | System.Collections.ObjectModel;Collection<T>;Clear;();Argument[this].WithoutElement;Argument[this];value;manual |
-| System.Collections.ObjectModel;Collection<T>;Collection;(System.Collections.Generic.IList<T>);Argument[0].Element;Argument[this];taint;df-generated |
+| System.Collections.ObjectModel;Collection<T>;Collection;(System.Collections.Generic.IList<T>);Argument[0];Argument[this].SyntheticField[System.Collections.ObjectModel.Collection`1.items];value;dfc-generated |
 | System.Collections.ObjectModel;Collection<T>;CopyTo;(System.Array,System.Int32);Argument[this].Element;Argument[0].Element;value;manual |
 | System.Collections.ObjectModel;Collection<T>;CopyTo;(T[],System.Int32);Argument[this].Element;Argument[0].Element;value;manual |
 | System.Collections.ObjectModel;Collection<T>;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.Generic.IEnumerator`1.Current];value;manual |
 | System.Collections.ObjectModel;Collection<T>;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.IEnumerator.Current];value;manual |
 | System.Collections.ObjectModel;Collection<T>;Insert;(System.Int32,System.Object);Argument[1];Argument[this].Element;value;manual |
 | System.Collections.ObjectModel;Collection<T>;Insert;(System.Int32,T);Argument[1];Argument[this].Element;value;manual |
-| System.Collections.ObjectModel;Collection<T>;InsertItem;(System.Int32,T);Argument[1];Argument[this];taint;df-generated |
-| System.Collections.ObjectModel;Collection<T>;InsertItem;(System.Int32,T);Argument[this];Argument[1];taint;df-generated |
-| System.Collections.ObjectModel;Collection<T>;Remove;(System.Object);Argument[0];Argument[this];taint;df-generated |
-| System.Collections.ObjectModel;Collection<T>;Remove;(System.Object);Argument[this];Argument[0];taint;df-generated |
+| System.Collections.ObjectModel;Collection<T>;InsertItem;(System.Int32,T);Argument[1];Argument[this].SyntheticField[System.Collections.ObjectModel.Collection`1.items].Element;value;dfc-generated |
 | System.Collections.ObjectModel;Collection<T>;SetItem;(System.Int32,T);Argument[1];Argument[this];taint;df-generated |
-| System.Collections.ObjectModel;Collection<T>;SetItem;(System.Int32,T);Argument[this];Argument[1];taint;df-generated |
 | System.Collections.ObjectModel;Collection<T>;get_Item;(System.Int32);Argument[this].Element;ReturnValue;value;manual |
-| System.Collections.ObjectModel;Collection<T>;get_Items;();Argument[this];ReturnValue;taint;df-generated |
-| System.Collections.ObjectModel;Collection<T>;get_SyncRoot;();Argument[this];ReturnValue;taint;df-generated |
-| System.Collections.ObjectModel;Collection<T>;get_SyncRoot;();Argument[this];ReturnValue;value;df-generated |
+| System.Collections.ObjectModel;Collection<T>;get_Items;();Argument[this].SyntheticField[System.Collections.ObjectModel.Collection`1.items];ReturnValue;value;dfc-generated |
+| System.Collections.ObjectModel;Collection<T>;get_SyncRoot;();Argument[this].SyntheticField[System.Collections.ObjectModel.Collection`1.items].Property[System.Collections.ICollection.SyncRoot];ReturnValue;value;dfc-generated |
+| System.Collections.ObjectModel;Collection<T>;get_SyncRoot;();Argument[this].SyntheticField[System.Collections.ObjectModel.Collection`1.items];ReturnValue;value;dfc-generated |
+| System.Collections.ObjectModel;Collection<T>;get_SyncRoot;();Argument[this];ReturnValue;value;dfc-generated |
 | System.Collections.ObjectModel;Collection<T>;set_Item;(System.Int32,System.Object);Argument[1];Argument[this].Element;value;manual |
 | System.Collections.ObjectModel;Collection<T>;set_Item;(System.Int32,T);Argument[1];Argument[this].Element;value;manual |
-| System.Collections.ObjectModel;KeyedCollection<TKey,TItem>;InsertItem;(System.Int32,TItem);Argument[1];Argument[this];taint;df-generated |
-| System.Collections.ObjectModel;KeyedCollection<TKey,TItem>;InsertItem;(System.Int32,TItem);Argument[this];Argument[1];taint;df-generated |
-| System.Collections.ObjectModel;KeyedCollection<TKey,TItem>;KeyedCollection;(System.Collections.Generic.IEqualityComparer<TKey>,System.Int32);Argument[0];Argument[this];taint;df-generated |
+| System.Collections.ObjectModel;KeyedCollection<TKey,TItem>;InsertItem;(System.Int32,TItem);Argument[1];Argument[this].SyntheticField[System.Collections.ObjectModel.Collection`1.items].Element;value;dfc-generated |
+| System.Collections.ObjectModel;KeyedCollection<TKey,TItem>;KeyedCollection;(System.Collections.Generic.IEqualityComparer<TKey>,System.Int32);Argument[0];Argument[this].SyntheticField[System.Collections.ObjectModel.KeyedCollection`2.comparer];value;dfc-generated |
 | System.Collections.ObjectModel;KeyedCollection<TKey,TItem>;SetItem;(System.Int32,TItem);Argument[1];Argument[this];taint;df-generated |
-| System.Collections.ObjectModel;KeyedCollection<TKey,TItem>;SetItem;(System.Int32,TItem);Argument[this];Argument[1];taint;df-generated |
-| System.Collections.ObjectModel;KeyedCollection<TKey,TItem>;TryGetValue;(TKey,TItem);Argument[this];ReturnValue;taint;df-generated |
-| System.Collections.ObjectModel;KeyedCollection<TKey,TItem>;get_Comparer;();Argument[this];ReturnValue;taint;df-generated |
+| System.Collections.ObjectModel;KeyedCollection<TKey,TItem>;TryGetValue;(TKey,TItem);Argument[1];ReturnValue;value;dfc-generated |
+| System.Collections.ObjectModel;KeyedCollection<TKey,TItem>;TryGetValue;(TKey,TItem);Argument[this].Property[System.Collections.ObjectModel.Collection`1.Items].Element;ReturnValue;value;dfc-generated |
+| System.Collections.ObjectModel;KeyedCollection<TKey,TItem>;get_Comparer;();Argument[this].SyntheticField[System.Collections.ObjectModel.KeyedCollection`2.comparer];ReturnValue;value;dfc-generated |
 | System.Collections.ObjectModel;KeyedCollection<TKey,TItem>;get_Dictionary;();Argument[this];ReturnValue;taint;df-generated |
 | System.Collections.ObjectModel;KeyedCollection<TKey,TItem>;get_Item;(TKey);Argument[this].Element;ReturnValue;value;manual |
-| System.Collections.ObjectModel;ObservableCollection<T>;InsertItem;(System.Int32,T);Argument[1];Argument[this];taint;df-generated |
-| System.Collections.ObjectModel;ObservableCollection<T>;InsertItem;(System.Int32,T);Argument[this];Argument[1];taint;df-generated |
+| System.Collections.ObjectModel;ObservableCollection<T>;InsertItem;(System.Int32,T);Argument[1];Argument[this].SyntheticField[System.Collections.ObjectModel.Collection`1.items].Element;value;dfc-generated |
 | System.Collections.ObjectModel;ObservableCollection<T>;SetItem;(System.Int32,T);Argument[1];Argument[this];taint;df-generated |
-| System.Collections.ObjectModel;ObservableCollection<T>;SetItem;(System.Int32,T);Argument[this];Argument[1];taint;df-generated |
 | System.Collections.ObjectModel;ObservableCollection<T>;add_CollectionChanged;(System.Collections.Specialized.NotifyCollectionChangedEventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Collections.ObjectModel;ObservableCollection<T>;add_PropertyChanged;(System.ComponentModel.PropertyChangedEventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Collections.ObjectModel;ObservableCollection<T>;remove_CollectionChanged;(System.Collections.Specialized.NotifyCollectionChangedEventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
@@ -6873,13 +7509,11 @@ summary
 | System.Collections.ObjectModel;ReadOnlyCollection<T>;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.IEnumerator.Current];value;manual |
 | System.Collections.ObjectModel;ReadOnlyCollection<T>;Insert;(System.Int32,System.Object);Argument[1];Argument[this].Element;value;manual |
 | System.Collections.ObjectModel;ReadOnlyCollection<T>;Insert;(System.Int32,T);Argument[1];Argument[this].Element;value;manual |
-| System.Collections.ObjectModel;ReadOnlyCollection<T>;ReadOnlyCollection;(System.Collections.Generic.IList<T>);Argument[0].Element;Argument[this];taint;df-generated |
-| System.Collections.ObjectModel;ReadOnlyCollection<T>;Remove;(System.Object);Argument[0];Argument[this];taint;df-generated |
-| System.Collections.ObjectModel;ReadOnlyCollection<T>;Remove;(System.Object);Argument[this];Argument[0];taint;df-generated |
+| System.Collections.ObjectModel;ReadOnlyCollection<T>;ReadOnlyCollection;(System.Collections.Generic.IList<T>);Argument[0];Argument[this].SyntheticField[System.Collections.ObjectModel.ReadOnlyCollection`1.list];value;dfc-generated |
 | System.Collections.ObjectModel;ReadOnlyCollection<T>;get_Item;(System.Int32);Argument[this].Element;ReturnValue;value;manual |
-| System.Collections.ObjectModel;ReadOnlyCollection<T>;get_Items;();Argument[this];ReturnValue;taint;df-generated |
-| System.Collections.ObjectModel;ReadOnlyCollection<T>;get_SyncRoot;();Argument[this];ReturnValue;taint;df-generated |
-| System.Collections.ObjectModel;ReadOnlyCollection<T>;get_SyncRoot;();Argument[this];ReturnValue;value;df-generated |
+| System.Collections.ObjectModel;ReadOnlyCollection<T>;get_Items;();Argument[this].SyntheticField[System.Collections.ObjectModel.ReadOnlyCollection`1.list];ReturnValue;value;dfc-generated |
+| System.Collections.ObjectModel;ReadOnlyCollection<T>;get_SyncRoot;();Argument[this].SyntheticField[System.Collections.ObjectModel.ReadOnlyCollection`1.list].Property[System.Collections.ICollection.SyncRoot];ReturnValue;value;dfc-generated |
+| System.Collections.ObjectModel;ReadOnlyCollection<T>;get_SyncRoot;();Argument[this];ReturnValue;value;dfc-generated |
 | System.Collections.ObjectModel;ReadOnlyCollection<T>;set_Item;(System.Int32,System.Object);Argument[1];Argument[this].Element;value;manual |
 | System.Collections.ObjectModel;ReadOnlyCollection<T>;set_Item;(System.Int32,T);Argument[1];Argument[this].Element;value;manual |
 | System.Collections.ObjectModel;ReadOnlyDictionary<TKey,TValue>+KeyCollection;Add;(TKey);Argument[0];Argument[this].Element;value;manual |
@@ -6888,16 +7522,14 @@ summary
 | System.Collections.ObjectModel;ReadOnlyDictionary<TKey,TValue>+KeyCollection;CopyTo;(TKey[],System.Int32);Argument[this].Element;Argument[0].Element;value;manual |
 | System.Collections.ObjectModel;ReadOnlyDictionary<TKey,TValue>+KeyCollection;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.Generic.IEnumerator`1.Current];value;manual |
 | System.Collections.ObjectModel;ReadOnlyDictionary<TKey,TValue>+KeyCollection;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.IEnumerator.Current];value;manual |
-| System.Collections.ObjectModel;ReadOnlyDictionary<TKey,TValue>+KeyCollection;get_SyncRoot;();Argument[this];ReturnValue;taint;df-generated |
-| System.Collections.ObjectModel;ReadOnlyDictionary<TKey,TValue>+KeyCollection;get_SyncRoot;();Argument[this];ReturnValue;value;df-generated |
+| System.Collections.ObjectModel;ReadOnlyDictionary<TKey,TValue>+KeyCollection;get_SyncRoot;();Argument[this];ReturnValue;value;dfc-generated |
 | System.Collections.ObjectModel;ReadOnlyDictionary<TKey,TValue>+ValueCollection;Add;(TValue);Argument[0];Argument[this].Element;value;manual |
 | System.Collections.ObjectModel;ReadOnlyDictionary<TKey,TValue>+ValueCollection;Clear;();Argument[this].WithoutElement;Argument[this];value;manual |
 | System.Collections.ObjectModel;ReadOnlyDictionary<TKey,TValue>+ValueCollection;CopyTo;(System.Array,System.Int32);Argument[this].Element;Argument[0].Element;value;manual |
 | System.Collections.ObjectModel;ReadOnlyDictionary<TKey,TValue>+ValueCollection;CopyTo;(TValue[],System.Int32);Argument[this].Element;Argument[0].Element;value;manual |
 | System.Collections.ObjectModel;ReadOnlyDictionary<TKey,TValue>+ValueCollection;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.Generic.IEnumerator`1.Current];value;manual |
 | System.Collections.ObjectModel;ReadOnlyDictionary<TKey,TValue>+ValueCollection;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.IEnumerator.Current];value;manual |
-| System.Collections.ObjectModel;ReadOnlyDictionary<TKey,TValue>+ValueCollection;get_SyncRoot;();Argument[this];ReturnValue;taint;df-generated |
-| System.Collections.ObjectModel;ReadOnlyDictionary<TKey,TValue>+ValueCollection;get_SyncRoot;();Argument[this];ReturnValue;value;df-generated |
+| System.Collections.ObjectModel;ReadOnlyDictionary<TKey,TValue>+ValueCollection;get_SyncRoot;();Argument[this];ReturnValue;value;dfc-generated |
 | System.Collections.ObjectModel;ReadOnlyDictionary<TKey,TValue>;Add;(System.Collections.Generic.KeyValuePair<TKey,TValue>);Argument[0].Property[System.Collections.Generic.KeyValuePair`2.Key];Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Key];value;manual |
 | System.Collections.ObjectModel;ReadOnlyDictionary<TKey,TValue>;Add;(System.Collections.Generic.KeyValuePair<TKey,TValue>);Argument[0].Property[System.Collections.Generic.KeyValuePair`2.Value];Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Value];value;manual |
 | System.Collections.ObjectModel;ReadOnlyDictionary<TKey,TValue>;Add;(System.Collections.Generic.KeyValuePair<TKey,TValue>);Argument[0];Argument[this].Element;value;manual |
@@ -6913,12 +7545,12 @@ summary
 | System.Collections.ObjectModel;ReadOnlyDictionary<TKey,TValue>;GetEnumerator;();Argument[this];ReturnValue;taint;df-generated |
 | System.Collections.ObjectModel;ReadOnlyDictionary<TKey,TValue>;ReadOnlyDictionary;(System.Collections.Generic.IDictionary<TKey,TValue>);Argument[0].Element.Property[System.Collections.Generic.KeyValuePair`2.Key];Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Key];value;manual |
 | System.Collections.ObjectModel;ReadOnlyDictionary<TKey,TValue>;ReadOnlyDictionary;(System.Collections.Generic.IDictionary<TKey,TValue>);Argument[0].Element.Property[System.Collections.Generic.KeyValuePair`2.Value];Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Value];value;manual |
+| System.Collections.ObjectModel;ReadOnlyDictionary<TKey,TValue>;TryGetValue;(TKey,TValue);Argument[1];ReturnValue;value;dfc-generated |
 | System.Collections.ObjectModel;ReadOnlyDictionary<TKey,TValue>;get_Dictionary;();Argument[this];ReturnValue;taint;df-generated |
 | System.Collections.ObjectModel;ReadOnlyDictionary<TKey,TValue>;get_Item;(System.Object);Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Value];ReturnValue;value;manual |
 | System.Collections.ObjectModel;ReadOnlyDictionary<TKey,TValue>;get_Item;(TKey);Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Value];ReturnValue;value;manual |
 | System.Collections.ObjectModel;ReadOnlyDictionary<TKey,TValue>;get_Keys;();Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Key];ReturnValue.Element;value;manual |
-| System.Collections.ObjectModel;ReadOnlyDictionary<TKey,TValue>;get_SyncRoot;();Argument[this];ReturnValue;taint;df-generated |
-| System.Collections.ObjectModel;ReadOnlyDictionary<TKey,TValue>;get_SyncRoot;();Argument[this];ReturnValue;value;df-generated |
+| System.Collections.ObjectModel;ReadOnlyDictionary<TKey,TValue>;get_SyncRoot;();Argument[this];ReturnValue;value;dfc-generated |
 | System.Collections.ObjectModel;ReadOnlyDictionary<TKey,TValue>;get_Values;();Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Value];ReturnValue.Element;value;manual |
 | System.Collections.ObjectModel;ReadOnlyDictionary<TKey,TValue>;set_Item;(System.Object,System.Object);Argument[0];Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Key];value;manual |
 | System.Collections.ObjectModel;ReadOnlyDictionary<TKey,TValue>;set_Item;(System.Object,System.Object);Argument[1];Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Value];value;manual |
@@ -6928,7 +7560,8 @@ summary
 | System.Collections.ObjectModel;ReadOnlyObservableCollection<T>;add_PropertyChanged;(System.ComponentModel.PropertyChangedEventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Collections.ObjectModel;ReadOnlyObservableCollection<T>;remove_CollectionChanged;(System.Collections.Specialized.NotifyCollectionChangedEventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Collections.ObjectModel;ReadOnlyObservableCollection<T>;remove_PropertyChanged;(System.ComponentModel.PropertyChangedEventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
-| System.Collections.Specialized;CollectionsUtil;CreateCaseInsensitiveHashtable;(System.Collections.IDictionary);Argument[0].Element;ReturnValue;taint;df-generated |
+| System.Collections.Specialized;CollectionsUtil;CreateCaseInsensitiveHashtable;(System.Collections.IDictionary);Argument[0].Element.Property[System.Collections.Generic.KeyValuePair`2.Key];ReturnValue.Element.Property[System.Collections.Generic.KeyValuePair`2.Key];value;dfc-generated |
+| System.Collections.Specialized;CollectionsUtil;CreateCaseInsensitiveHashtable;(System.Collections.IDictionary);Argument[0].Element.Property[System.Collections.Generic.KeyValuePair`2.Value];ReturnValue.Element.Property[System.Collections.Generic.KeyValuePair`2.Value];value;dfc-generated |
 | System.Collections.Specialized;HybridDictionary;Add;(System.Object,System.Object);Argument[0];Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Key];value;manual |
 | System.Collections.Specialized;HybridDictionary;Add;(System.Object,System.Object);Argument[1];Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Value];value;manual |
 | System.Collections.Specialized;HybridDictionary;Clear;();Argument[this].WithoutElement;Argument[this];value;manual |
@@ -6937,8 +7570,7 @@ summary
 | System.Collections.Specialized;HybridDictionary;GetEnumerator;();Argument[this];ReturnValue;taint;df-generated |
 | System.Collections.Specialized;HybridDictionary;get_Item;(System.Object);Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Value];ReturnValue;value;manual |
 | System.Collections.Specialized;HybridDictionary;get_Keys;();Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Key];ReturnValue.Element;value;manual |
-| System.Collections.Specialized;HybridDictionary;get_SyncRoot;();Argument[this];ReturnValue;taint;df-generated |
-| System.Collections.Specialized;HybridDictionary;get_SyncRoot;();Argument[this];ReturnValue;value;df-generated |
+| System.Collections.Specialized;HybridDictionary;get_SyncRoot;();Argument[this];ReturnValue;value;dfc-generated |
 | System.Collections.Specialized;HybridDictionary;get_Values;();Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Value];ReturnValue.Element;value;manual |
 | System.Collections.Specialized;HybridDictionary;set_Item;(System.Object,System.Object);Argument[0];Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Key];value;manual |
 | System.Collections.Specialized;HybridDictionary;set_Item;(System.Object,System.Object);Argument[1];Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Value];value;manual |
@@ -6956,25 +7588,21 @@ summary
 | System.Collections.Specialized;ListDictionary;ListDictionary;(System.Collections.IComparer);Argument[0];Argument[this];taint;df-generated |
 | System.Collections.Specialized;ListDictionary;get_Item;(System.Object);Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Value];ReturnValue;value;manual |
 | System.Collections.Specialized;ListDictionary;get_Keys;();Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Key];ReturnValue.Element;value;manual |
-| System.Collections.Specialized;ListDictionary;get_SyncRoot;();Argument[this];ReturnValue;taint;df-generated |
-| System.Collections.Specialized;ListDictionary;get_SyncRoot;();Argument[this];ReturnValue;value;df-generated |
+| System.Collections.Specialized;ListDictionary;get_SyncRoot;();Argument[this];ReturnValue;value;dfc-generated |
 | System.Collections.Specialized;ListDictionary;get_Values;();Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Value];ReturnValue.Element;value;manual |
 | System.Collections.Specialized;ListDictionary;set_Item;(System.Object,System.Object);Argument[0];Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Key];value;manual |
 | System.Collections.Specialized;ListDictionary;set_Item;(System.Object,System.Object);Argument[1];Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Value];value;manual |
 | System.Collections.Specialized;NameObjectCollectionBase+KeysCollection;CopyTo;(System.Array,System.Int32);Argument[this].Element;Argument[0].Element;value;manual |
 | System.Collections.Specialized;NameObjectCollectionBase+KeysCollection;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.IEnumerator.Current];value;manual |
-| System.Collections.Specialized;NameObjectCollectionBase+KeysCollection;get_SyncRoot;();Argument[this];ReturnValue;taint;df-generated |
-| System.Collections.Specialized;NameObjectCollectionBase+KeysCollection;get_SyncRoot;();Argument[this];ReturnValue;value;df-generated |
-| System.Collections.Specialized;NameObjectCollectionBase;BaseAdd;(System.String,System.Object);Argument[0];Argument[this];taint;df-generated |
-| System.Collections.Specialized;NameObjectCollectionBase;BaseAdd;(System.String,System.Object);Argument[1];Argument[this];taint;df-generated |
+| System.Collections.Specialized;NameObjectCollectionBase+KeysCollection;get_SyncRoot;();Argument[this];ReturnValue;value;dfc-generated |
+| System.Collections.Specialized;NameObjectCollectionBase;BaseAdd;(System.String,System.Object);Argument[1];Argument[this].SyntheticField[System.Collections.Specialized.NameObjectCollectionBase._nullKeyEntry].SyntheticField[System.Collections.Specialized.NameObjectCollectionBase+NameObjectEntry.Value];value;dfc-generated |
 | System.Collections.Specialized;NameObjectCollectionBase;BaseGet;(System.Int32);Argument[this];ReturnValue;taint;df-generated |
-| System.Collections.Specialized;NameObjectCollectionBase;BaseGet;(System.String);Argument[this];ReturnValue;taint;df-generated |
+| System.Collections.Specialized;NameObjectCollectionBase;BaseGet;(System.String);Argument[this].SyntheticField[System.Collections.Specialized.NameObjectCollectionBase._nullKeyEntry].SyntheticField[System.Collections.Specialized.NameObjectCollectionBase+NameObjectEntry.Value];ReturnValue;value;dfc-generated |
 | System.Collections.Specialized;NameObjectCollectionBase;BaseGetAllKeys;();Argument[this];ReturnValue;taint;df-generated |
 | System.Collections.Specialized;NameObjectCollectionBase;BaseGetAllValues;();Argument[this];ReturnValue;taint;df-generated |
 | System.Collections.Specialized;NameObjectCollectionBase;BaseGetAllValues;(System.Type);Argument[this];ReturnValue;taint;df-generated |
 | System.Collections.Specialized;NameObjectCollectionBase;BaseGetKey;(System.Int32);Argument[this];ReturnValue;taint;df-generated |
-| System.Collections.Specialized;NameObjectCollectionBase;BaseSet;(System.String,System.Object);Argument[0];Argument[this];taint;df-generated |
-| System.Collections.Specialized;NameObjectCollectionBase;BaseSet;(System.String,System.Object);Argument[1];Argument[this];taint;df-generated |
+| System.Collections.Specialized;NameObjectCollectionBase;BaseSet;(System.String,System.Object);Argument[1];Argument[this].SyntheticField[System.Collections.Specialized.NameObjectCollectionBase._nullKeyEntry].SyntheticField[System.Collections.Specialized.NameObjectCollectionBase+NameObjectEntry.Value];value;dfc-generated |
 | System.Collections.Specialized;NameObjectCollectionBase;CopyTo;(System.Array,System.Int32);Argument[this].Element;Argument[0].Element;value;manual |
 | System.Collections.Specialized;NameObjectCollectionBase;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.IEnumerator.Current];value;manual |
 | System.Collections.Specialized;NameObjectCollectionBase;GetObjectData;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);Argument[this];Argument[0];taint;df-generated |
@@ -6984,8 +7612,7 @@ summary
 | System.Collections.Specialized;NameObjectCollectionBase;NameObjectCollectionBase;(System.Int32,System.Collections.IHashCodeProvider,System.Collections.IComparer);Argument[1];Argument[this];taint;df-generated |
 | System.Collections.Specialized;NameObjectCollectionBase;NameObjectCollectionBase;(System.Int32,System.Collections.IHashCodeProvider,System.Collections.IComparer);Argument[2];Argument[this];taint;df-generated |
 | System.Collections.Specialized;NameObjectCollectionBase;get_Keys;();Argument[this];ReturnValue;taint;df-generated |
-| System.Collections.Specialized;NameObjectCollectionBase;get_SyncRoot;();Argument[this];ReturnValue;taint;df-generated |
-| System.Collections.Specialized;NameObjectCollectionBase;get_SyncRoot;();Argument[this];ReturnValue;value;df-generated |
+| System.Collections.Specialized;NameObjectCollectionBase;get_SyncRoot;();Argument[this];ReturnValue;value;dfc-generated |
 | System.Collections.Specialized;NameValueCollection;Add;(System.Collections.Specialized.NameValueCollection);Argument[0];Argument[this].Element;value;manual |
 | System.Collections.Specialized;NameValueCollection;Add;(System.String,System.String);Argument[0];Argument[this];taint;df-generated |
 | System.Collections.Specialized;NameValueCollection;Clear;();Argument[this].WithoutElement;Argument[this];value;manual |
@@ -6993,8 +7620,8 @@ summary
 | System.Collections.Specialized;NameValueCollection;Get;(System.Int32);Argument[this];ReturnValue;taint;df-generated |
 | System.Collections.Specialized;NameValueCollection;Get;(System.String);Argument[this];ReturnValue;taint;df-generated |
 | System.Collections.Specialized;NameValueCollection;GetKey;(System.Int32);Argument[this];ReturnValue;taint;df-generated |
-| System.Collections.Specialized;NameValueCollection;NameValueCollection;(System.Collections.Specialized.NameValueCollection);Argument[0].Element;Argument[this];taint;df-generated |
-| System.Collections.Specialized;NameValueCollection;NameValueCollection;(System.Int32,System.Collections.Specialized.NameValueCollection);Argument[1].Element;Argument[this];taint;df-generated |
+| System.Collections.Specialized;NameValueCollection;NameValueCollection;(System.Collections.Specialized.NameValueCollection);Argument[0];Argument[this].Element;value;dfc-generated |
+| System.Collections.Specialized;NameValueCollection;NameValueCollection;(System.Int32,System.Collections.Specialized.NameValueCollection);Argument[1];Argument[this].Element;value;dfc-generated |
 | System.Collections.Specialized;NameValueCollection;Set;(System.String,System.String);Argument[0];Argument[this];taint;df-generated |
 | System.Collections.Specialized;NameValueCollection;get_AllKeys;();Argument[this];ReturnValue;taint;df-generated |
 | System.Collections.Specialized;NameValueCollection;get_Item;(System.Int32);Argument[this];ReturnValue;taint;df-generated |
@@ -7024,8 +7651,7 @@ summary
 | System.Collections.Specialized;OrderedDictionary;get_Item;(System.Int32);Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Value];ReturnValue;value;manual |
 | System.Collections.Specialized;OrderedDictionary;get_Item;(System.Object);Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Value];ReturnValue;value;manual |
 | System.Collections.Specialized;OrderedDictionary;get_Keys;();Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Key];ReturnValue.Element;value;manual |
-| System.Collections.Specialized;OrderedDictionary;get_SyncRoot;();Argument[this];ReturnValue;taint;df-generated |
-| System.Collections.Specialized;OrderedDictionary;get_SyncRoot;();Argument[this];ReturnValue;value;df-generated |
+| System.Collections.Specialized;OrderedDictionary;get_SyncRoot;();Argument[this];ReturnValue;value;dfc-generated |
 | System.Collections.Specialized;OrderedDictionary;get_Values;();Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Value];ReturnValue.Element;value;manual |
 | System.Collections.Specialized;OrderedDictionary;set_Item;(System.Int32,System.Object);Argument[0];Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Key];value;manual |
 | System.Collections.Specialized;OrderedDictionary;set_Item;(System.Int32,System.Object);Argument[1];Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Value];value;manual |
@@ -7041,11 +7667,8 @@ summary
 | System.Collections.Specialized;StringCollection;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.Specialized.StringEnumerator.Current];value;manual |
 | System.Collections.Specialized;StringCollection;Insert;(System.Int32,System.Object);Argument[1];Argument[this].Element;value;manual |
 | System.Collections.Specialized;StringCollection;Insert;(System.Int32,System.String);Argument[1];Argument[this].Element;value;manual |
-| System.Collections.Specialized;StringCollection;Remove;(System.Object);Argument[0];Argument[this];taint;df-generated |
-| System.Collections.Specialized;StringCollection;Remove;(System.Object);Argument[this];Argument[0];taint;df-generated |
 | System.Collections.Specialized;StringCollection;get_Item;(System.Int32);Argument[this].Element;ReturnValue;value;manual |
-| System.Collections.Specialized;StringCollection;get_SyncRoot;();Argument[this];ReturnValue;taint;df-generated |
-| System.Collections.Specialized;StringCollection;get_SyncRoot;();Argument[this];ReturnValue;value;df-generated |
+| System.Collections.Specialized;StringCollection;get_SyncRoot;();Argument[this];ReturnValue;value;dfc-generated |
 | System.Collections.Specialized;StringCollection;set_Item;(System.Int32,System.Object);Argument[1];Argument[this].Element;value;manual |
 | System.Collections.Specialized;StringCollection;set_Item;(System.Int32,System.String);Argument[1];Argument[this].Element;value;manual |
 | System.Collections.Specialized;StringDictionary;Clear;();Argument[this].WithoutElement;Argument[this];value;manual |
@@ -7056,7 +7679,7 @@ summary
 | System.Collections.Specialized;StringDictionary;get_SyncRoot;();Argument[this];ReturnValue;taint;df-generated |
 | System.Collections.Specialized;StringDictionary;get_Values;();Argument[this];ReturnValue;taint;df-generated |
 | System.Collections.Specialized;StringEnumerator;get_Current;();Argument[this];ReturnValue;taint;df-generated |
-| System.Collections;ArrayList;Adapter;(System.Collections.IList);Argument[0].Element;ReturnValue;taint;df-generated |
+| System.Collections;ArrayList;Adapter;(System.Collections.IList);Argument[0];ReturnValue.SyntheticField[System.Collections.ArrayList+IListWrapper._list];value;dfc-generated |
 | System.Collections;ArrayList;Add;(System.Object);Argument[0];Argument[this].Element;value;manual |
 | System.Collections;ArrayList;AddRange;(System.Collections.ICollection);Argument[0].Element;Argument[this].Element;value;manual |
 | System.Collections;ArrayList;Clear;();Argument[this].WithoutElement;Argument[this];value;manual |
@@ -7071,31 +7694,29 @@ summary
 | System.Collections;ArrayList;Insert;(System.Int32,System.Object);Argument[1];Argument[this].Element;value;manual |
 | System.Collections;ArrayList;InsertRange;(System.Int32,System.Collections.ICollection);Argument[1].Element;Argument[this].Element;value;manual |
 | System.Collections;ArrayList;ReadOnly;(System.Collections.ArrayList);Argument[0].Element;ReturnValue;taint;df-generated |
-| System.Collections;ArrayList;ReadOnly;(System.Collections.IList);Argument[0].Element;ReturnValue;taint;df-generated |
-| System.Collections;ArrayList;Remove;(System.Object);Argument[0];Argument[this];taint;df-generated |
-| System.Collections;ArrayList;Remove;(System.Object);Argument[this];Argument[0];taint;df-generated |
+| System.Collections;ArrayList;ReadOnly;(System.Collections.IList);Argument[0];ReturnValue.SyntheticField[System.Collections.ArrayList+ReadOnlyList._list];value;dfc-generated |
 | System.Collections;ArrayList;Repeat;(System.Object,System.Int32);Argument[0];ReturnValue.Element;value;manual |
 | System.Collections;ArrayList;SetRange;(System.Int32,System.Collections.ICollection);Argument[1].Element;Argument[this];taint;df-generated |
 | System.Collections;ArrayList;Synchronized;(System.Collections.ArrayList);Argument[0].Element;ReturnValue;taint;df-generated |
-| System.Collections;ArrayList;Synchronized;(System.Collections.IList);Argument[0].Element;ReturnValue;taint;df-generated |
+| System.Collections;ArrayList;Synchronized;(System.Collections.IList);Argument[0].Property[System.Collections.ICollection.SyncRoot];ReturnValue.SyntheticField[System.Collections.ArrayList+SyncIList._root];value;dfc-generated |
 | System.Collections;ArrayList;ToArray;();Argument[this];ReturnValue;taint;df-generated |
 | System.Collections;ArrayList;ToArray;(System.Type);Argument[this];ReturnValue;taint;df-generated |
 | System.Collections;ArrayList;get_Item;(System.Int32);Argument[this].Element;ReturnValue;value;manual |
-| System.Collections;ArrayList;get_SyncRoot;();Argument[this];ReturnValue;taint;df-generated |
-| System.Collections;ArrayList;get_SyncRoot;();Argument[this];ReturnValue;value;df-generated |
+| System.Collections;ArrayList;get_SyncRoot;();Argument[this];ReturnValue;value;dfc-generated |
 | System.Collections;ArrayList;set_Item;(System.Int32,System.Object);Argument[1];Argument[this].Element;value;manual |
-| System.Collections;BitArray;And;(System.Collections.BitArray);Argument[this];ReturnValue;value;df-generated |
+| System.Collections;BitArray;And;(System.Collections.BitArray);Argument[this];ReturnValue;value;dfc-generated |
 | System.Collections;BitArray;Clone;();Argument[this].Element;ReturnValue.Element;value;manual |
 | System.Collections;BitArray;CopyTo;(System.Array,System.Int32);Argument[this].Element;Argument[0].Element;value;manual |
 | System.Collections;BitArray;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.IEnumerator.Current];value;manual |
-| System.Collections;BitArray;LeftShift;(System.Int32);Argument[this];ReturnValue;value;df-generated |
-| System.Collections;BitArray;Not;();Argument[this];ReturnValue;value;df-generated |
-| System.Collections;BitArray;Or;(System.Collections.BitArray);Argument[this];ReturnValue;value;df-generated |
-| System.Collections;BitArray;RightShift;(System.Int32);Argument[this];ReturnValue;value;df-generated |
-| System.Collections;BitArray;Xor;(System.Collections.BitArray);Argument[this];ReturnValue;value;df-generated |
-| System.Collections;BitArray;get_SyncRoot;();Argument[this];ReturnValue;taint;df-generated |
-| System.Collections;BitArray;get_SyncRoot;();Argument[this];ReturnValue;value;df-generated |
+| System.Collections;BitArray;LeftShift;(System.Int32);Argument[this];ReturnValue;value;dfc-generated |
+| System.Collections;BitArray;Not;();Argument[this];ReturnValue;value;dfc-generated |
+| System.Collections;BitArray;Or;(System.Collections.BitArray);Argument[this];ReturnValue;value;dfc-generated |
+| System.Collections;BitArray;RightShift;(System.Int32);Argument[this];ReturnValue;value;dfc-generated |
+| System.Collections;BitArray;Xor;(System.Collections.BitArray);Argument[this];ReturnValue;value;dfc-generated |
+| System.Collections;BitArray;get_SyncRoot;();Argument[this];ReturnValue;value;dfc-generated |
 | System.Collections;CaseInsensitiveComparer;CaseInsensitiveComparer;(System.Globalization.CultureInfo);Argument[0];Argument[this];taint;df-generated |
+| System.Collections;CaseInsensitiveComparer;Compare;(System.Object,System.Object);Argument[0];Argument[this];taint;df-generated |
+| System.Collections;CaseInsensitiveComparer;Compare;(System.Object,System.Object);Argument[1];Argument[this];taint;df-generated |
 | System.Collections;CaseInsensitiveHashCodeProvider;CaseInsensitiveHashCodeProvider;(System.Globalization.CultureInfo);Argument[0];Argument[this];taint;df-generated |
 | System.Collections;CollectionBase;Add;(System.Object);Argument[0];Argument[this].Element;value;manual |
 | System.Collections;CollectionBase;Clear;();Argument[this].WithoutElement;Argument[this];value;manual |
@@ -7104,28 +7725,32 @@ summary
 | System.Collections;CollectionBase;Insert;(System.Int32,System.Object);Argument[1];Argument[this].Element;value;manual |
 | System.Collections;CollectionBase;OnInsert;(System.Int32,System.Object);Argument[1];Argument[this];taint;df-generated |
 | System.Collections;CollectionBase;OnSet;(System.Int32,System.Object,System.Object);Argument[2];Argument[this];taint;df-generated |
-| System.Collections;CollectionBase;Remove;(System.Object);Argument[0];Argument[this];taint;df-generated |
-| System.Collections;CollectionBase;Remove;(System.Object);Argument[this];Argument[0];taint;df-generated |
-| System.Collections;CollectionBase;get_InnerList;();Argument[this];ReturnValue;taint;df-generated |
+| System.Collections;CollectionBase;Remove;(System.Object);Argument[0];Argument[this].Property[System.Collections.CollectionBase.InnerList].Element;value;dfc-generated |
+| System.Collections;CollectionBase;Remove;(System.Object);Argument[0];Argument[this].SyntheticField[System.Collections.CollectionBase._list].Element;value;dfc-generated |
+| System.Collections;CollectionBase;get_InnerList;();Argument[this].SyntheticField[System.Collections.CollectionBase._list];ReturnValue;value;dfc-generated |
 | System.Collections;CollectionBase;get_Item;(System.Int32);Argument[this].Element;ReturnValue;value;manual |
-| System.Collections;CollectionBase;get_List;();Argument[this];ReturnValue;taint;df-generated |
-| System.Collections;CollectionBase;get_SyncRoot;();Argument[this];ReturnValue;taint;df-generated |
-| System.Collections;CollectionBase;get_SyncRoot;();Argument[this];ReturnValue;value;df-generated |
+| System.Collections;CollectionBase;get_List;();Argument[this];ReturnValue;value;dfc-generated |
+| System.Collections;CollectionBase;get_SyncRoot;();Argument[this];ReturnValue;value;dfc-generated |
 | System.Collections;CollectionBase;set_Item;(System.Int32,System.Object);Argument[1];Argument[this].Element;value;manual |
-| System.Collections;Comparer;Comparer;(System.Globalization.CultureInfo);Argument[0];Argument[this];taint;df-generated |
+| System.Collections;Comparer;Compare;(System.Object,System.Object);Argument[0];Argument[this];taint;df-generated |
+| System.Collections;Comparer;Compare;(System.Object,System.Object);Argument[1];Argument[this];taint;df-generated |
+| System.Collections;Comparer;Comparer;(System.Globalization.CultureInfo);Argument[0].Property[System.Globalization.CultureInfo.CompareInfo];Argument[this].SyntheticField[System.Collections.Comparer._compareInfo];value;dfc-generated |
+| System.Collections;Comparer;GetObjectData;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);Argument[this].SyntheticField[System.Collections.Comparer._compareInfo];Argument[0].SyntheticField[System.Runtime.Serialization.SerializationInfo._values].Element;value;df-generated |
+| System.Collections;Comparer;GetObjectData;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);Argument[this].SyntheticField[System.Collections.Comparer._compareInfo];Argument[0].SyntheticField[System.Runtime.Serialization.SerializationInfo._values].Element;value;dfc-generated |
 | System.Collections;Comparer;GetObjectData;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);Argument[this];Argument[0];taint;df-generated |
+| System.Collections;Comparer;GetObjectData;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);Argument[this];Argument[0];taint;dfc-generated |
 | System.Collections;DictionaryBase;Add;(System.Object,System.Object);Argument[0];Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Key];value;manual |
 | System.Collections;DictionaryBase;Add;(System.Object,System.Object);Argument[1];Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Value];value;manual |
 | System.Collections;DictionaryBase;Clear;();Argument[this].WithoutElement;Argument[this];value;manual |
 | System.Collections;DictionaryBase;CopyTo;(System.Array,System.Int32);Argument[this].Element;Argument[0].Element;value;manual |
 | System.Collections;DictionaryBase;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.IEnumerator.Current];value;manual |
 | System.Collections;DictionaryBase;GetEnumerator;();Argument[this];ReturnValue;taint;df-generated |
-| System.Collections;DictionaryBase;OnGet;(System.Object,System.Object);Argument[1];ReturnValue;taint;df-generated |
-| System.Collections;DictionaryBase;get_Dictionary;();Argument[this];ReturnValue;taint;df-generated |
+| System.Collections;DictionaryBase;OnGet;(System.Object,System.Object);Argument[1];ReturnValue;value;dfc-generated |
+| System.Collections;DictionaryBase;get_Dictionary;();Argument[this];ReturnValue;value;dfc-generated |
 | System.Collections;DictionaryBase;get_Item;(System.Object);Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Value];ReturnValue;value;manual |
 | System.Collections;DictionaryBase;get_Keys;();Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Key];ReturnValue.Element;value;manual |
-| System.Collections;DictionaryBase;get_SyncRoot;();Argument[this];ReturnValue;taint;df-generated |
-| System.Collections;DictionaryBase;get_SyncRoot;();Argument[this];ReturnValue;value;df-generated |
+| System.Collections;DictionaryBase;get_SyncRoot;();Argument[this].Property[System.Collections.DictionaryBase.InnerHashtable].Property[System.Collections.Hashtable.SyncRoot];ReturnValue;value;dfc-generated |
+| System.Collections;DictionaryBase;get_SyncRoot;();Argument[this];ReturnValue;value;dfc-generated |
 | System.Collections;DictionaryBase;get_Values;();Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Value];ReturnValue.Element;value;manual |
 | System.Collections;DictionaryBase;set_Item;(System.Object,System.Object);Argument[0];Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Key];value;manual |
 | System.Collections;DictionaryBase;set_Item;(System.Object,System.Object);Argument[1];Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Value];value;manual |
@@ -7152,21 +7777,21 @@ summary
 | System.Collections;Hashtable;Hashtable;(System.Collections.IDictionary,System.Single,System.Collections.IEqualityComparer);Argument[0].Element.Property[System.Collections.Generic.KeyValuePair`2.Value];Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Value];value;manual |
 | System.Collections;Hashtable;Hashtable;(System.Collections.IDictionary,System.Single,System.Collections.IHashCodeProvider,System.Collections.IComparer);Argument[0].Element.Property[System.Collections.Generic.KeyValuePair`2.Key];Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Key];value;manual |
 | System.Collections;Hashtable;Hashtable;(System.Collections.IDictionary,System.Single,System.Collections.IHashCodeProvider,System.Collections.IComparer);Argument[0].Element.Property[System.Collections.Generic.KeyValuePair`2.Value];Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Value];value;manual |
-| System.Collections;Hashtable;Hashtable;(System.Int32,System.Single,System.Collections.IEqualityComparer);Argument[2];Argument[this];taint;df-generated |
+| System.Collections;Hashtable;Hashtable;(System.Int32,System.Single,System.Collections.IEqualityComparer);Argument[2];Argument[this].SyntheticField[System.Collections.Hashtable._keycomparer];value;dfc-generated |
 | System.Collections;Hashtable;Hashtable;(System.Int32,System.Single,System.Collections.IHashCodeProvider,System.Collections.IComparer);Argument[2];Argument[this];taint;df-generated |
 | System.Collections;Hashtable;Hashtable;(System.Int32,System.Single,System.Collections.IHashCodeProvider,System.Collections.IComparer);Argument[3];Argument[this];taint;df-generated |
-| System.Collections;Hashtable;Synchronized;(System.Collections.Hashtable);Argument[0].Element;ReturnValue;taint;df-generated |
-| System.Collections;Hashtable;get_EqualityComparer;();Argument[this];ReturnValue;taint;df-generated |
+| System.Collections;Hashtable;Synchronized;(System.Collections.Hashtable);Argument[0];ReturnValue.SyntheticField[System.Collections.Hashtable+SyncHashtable._table];value;dfc-generated |
+| System.Collections;Hashtable;get_EqualityComparer;();Argument[this].SyntheticField[System.Collections.Hashtable._keycomparer];ReturnValue;value;dfc-generated |
 | System.Collections;Hashtable;get_Item;(System.Object);Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Value];ReturnValue;value;manual |
 | System.Collections;Hashtable;get_Keys;();Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Key];ReturnValue.Element;value;manual |
-| System.Collections;Hashtable;get_SyncRoot;();Argument[this];ReturnValue;taint;df-generated |
-| System.Collections;Hashtable;get_SyncRoot;();Argument[this];ReturnValue;value;df-generated |
+| System.Collections;Hashtable;get_SyncRoot;();Argument[this];ReturnValue;value;dfc-generated |
 | System.Collections;Hashtable;get_Values;();Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Value];ReturnValue.Element;value;manual |
 | System.Collections;Hashtable;set_Item;(System.Object,System.Object);Argument[0];Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Key];value;manual |
 | System.Collections;Hashtable;set_Item;(System.Object,System.Object);Argument[1];Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Value];value;manual |
 | System.Collections;ICollection;CopyTo;(System.Array,System.Int32);Argument[this].Element;Argument[0].Element;value;manual |
-| System.Collections;ICollection;get_SyncRoot;();Argument[this];ReturnValue;taint;df-generated |
-| System.Collections;ICollection;get_SyncRoot;();Argument[this];ReturnValue;value;df-generated |
+| System.Collections;ICollection;get_SyncRoot;();Argument[this];ReturnValue;value;dfc-generated |
+| System.Collections;IComparer;Compare;(System.Object,System.Object);Argument[0];Argument[this];taint;df-generated |
+| System.Collections;IComparer;Compare;(System.Object,System.Object);Argument[1];Argument[this];taint;df-generated |
 | System.Collections;IDictionary;Add;(System.Object,System.Object);Argument[0];Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Key];value;manual |
 | System.Collections;IDictionary;Add;(System.Object,System.Object);Argument[1];Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Value];value;manual |
 | System.Collections;IDictionary;Clear;();Argument[this].WithoutElement;Argument[this];value;manual |
@@ -7181,28 +7806,27 @@ summary
 | System.Collections;IDictionaryEnumerator;get_Value;();Argument[this];ReturnValue;taint;df-generated |
 | System.Collections;IEnumerable;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.IEnumerator.Current];value;manual |
 | System.Collections;IEnumerator;get_Current;();Argument[this];ReturnValue;taint;df-generated |
+| System.Collections;IEqualityComparer;Equals;(System.Object,System.Object);Argument[0];Argument[this];taint;df-generated |
+| System.Collections;IEqualityComparer;Equals;(System.Object,System.Object);Argument[1];Argument[this];taint;df-generated |
+| System.Collections;IEqualityComparer;GetHashCode;(System.Object);Argument[0];Argument[this];taint;df-generated |
 | System.Collections;IList;Add;(System.Object);Argument[0];Argument[this].Element;value;manual |
 | System.Collections;IList;Clear;();Argument[this].WithoutElement;Argument[this];value;manual |
 | System.Collections;IList;Insert;(System.Int32,System.Object);Argument[1];Argument[this].Element;value;manual |
-| System.Collections;IList;Remove;(System.Object);Argument[0];Argument[this];taint;df-generated |
-| System.Collections;IList;Remove;(System.Object);Argument[this];Argument[0];taint;df-generated |
 | System.Collections;IList;get_Item;(System.Int32);Argument[this].Element;ReturnValue;value;manual |
 | System.Collections;IList;set_Item;(System.Int32,System.Object);Argument[1];Argument[this].Element;value;manual |
 | System.Collections;Queue;Clear;();Argument[this].WithoutElement;Argument[this];value;manual |
 | System.Collections;Queue;Clone;();Argument[this].Element;ReturnValue.Element;value;manual |
 | System.Collections;Queue;CopyTo;(System.Array,System.Int32);Argument[this].Element;Argument[0].Element;value;manual |
-| System.Collections;Queue;Dequeue;();Argument[this];ReturnValue;taint;df-generated |
-| System.Collections;Queue;Enqueue;(System.Object);Argument[0];Argument[this];taint;df-generated |
+| System.Collections;Queue;Dequeue;();Argument[this].SyntheticField[System.Collections.Queue._array].Element;ReturnValue;value;dfc-generated |
+| System.Collections;Queue;Enqueue;(System.Object);Argument[0];Argument[this].SyntheticField[System.Collections.Queue._array].Element;value;dfc-generated |
 | System.Collections;Queue;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.IEnumerator.Current];value;manual |
 | System.Collections;Queue;Peek;();Argument[this].Element;ReturnValue;value;manual |
-| System.Collections;Queue;Queue;(System.Collections.ICollection);Argument[0].Element;Argument[this];taint;df-generated |
+| System.Collections;Queue;Queue;(System.Collections.ICollection);Argument[0].Element;Argument[this].SyntheticField[System.Collections.Queue._array].Element;value;dfc-generated |
 | System.Collections;Queue;Synchronized;(System.Collections.Queue);Argument[0].Element;ReturnValue;taint;df-generated |
-| System.Collections;Queue;get_SyncRoot;();Argument[this];ReturnValue;taint;df-generated |
-| System.Collections;Queue;get_SyncRoot;();Argument[this];ReturnValue;value;df-generated |
+| System.Collections;Queue;get_SyncRoot;();Argument[this];ReturnValue;value;dfc-generated |
 | System.Collections;ReadOnlyCollectionBase;CopyTo;(System.Array,System.Int32);Argument[this].Element;Argument[0].Element;value;manual |
 | System.Collections;ReadOnlyCollectionBase;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.IEnumerator.Current];value;manual |
-| System.Collections;ReadOnlyCollectionBase;get_SyncRoot;();Argument[this];ReturnValue;taint;df-generated |
-| System.Collections;ReadOnlyCollectionBase;get_SyncRoot;();Argument[this];ReturnValue;value;df-generated |
+| System.Collections;ReadOnlyCollectionBase;get_SyncRoot;();Argument[this];ReturnValue;value;dfc-generated |
 | System.Collections;SortedList;Add;(System.Object,System.Object);Argument[0];Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Key];value;manual |
 | System.Collections;SortedList;Add;(System.Object,System.Object);Argument[1];Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Value];value;manual |
 | System.Collections;SortedList;Clear;();Argument[this].WithoutElement;Argument[this];value;manual |
@@ -7222,8 +7846,7 @@ summary
 | System.Collections;SortedList;Synchronized;(System.Collections.SortedList);Argument[0].Element;ReturnValue;taint;df-generated |
 | System.Collections;SortedList;get_Item;(System.Object);Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Value];ReturnValue;value;manual |
 | System.Collections;SortedList;get_Keys;();Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Key];ReturnValue.Element;value;manual |
-| System.Collections;SortedList;get_SyncRoot;();Argument[this];ReturnValue;taint;df-generated |
-| System.Collections;SortedList;get_SyncRoot;();Argument[this];ReturnValue;value;df-generated |
+| System.Collections;SortedList;get_SyncRoot;();Argument[this];ReturnValue;value;dfc-generated |
 | System.Collections;SortedList;get_Values;();Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Value];ReturnValue.Element;value;manual |
 | System.Collections;SortedList;set_Item;(System.Object,System.Object);Argument[0];Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Key];value;manual |
 | System.Collections;SortedList;set_Item;(System.Object,System.Object);Argument[1];Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Value];value;manual |
@@ -7233,22 +7856,21 @@ summary
 | System.Collections;Stack;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.IEnumerator.Current];value;manual |
 | System.Collections;Stack;Peek;();Argument[this].Element;ReturnValue;value;manual |
 | System.Collections;Stack;Pop;();Argument[this].Element;ReturnValue;value;manual |
-| System.Collections;Stack;Push;(System.Object);Argument[0];Argument[this];taint;df-generated |
-| System.Collections;Stack;Stack;(System.Collections.ICollection);Argument[0].Element;Argument[this];taint;df-generated |
+| System.Collections;Stack;Push;(System.Object);Argument[0];Argument[this].SyntheticField[System.Collections.Stack._array].Element;value;dfc-generated |
+| System.Collections;Stack;Stack;(System.Collections.ICollection);Argument[0].Element;Argument[this].SyntheticField[System.Collections.Stack._array].Element;value;dfc-generated |
 | System.Collections;Stack;Synchronized;(System.Collections.Stack);Argument[0].Element;ReturnValue;taint;df-generated |
-| System.Collections;Stack;ToArray;();Argument[this];ReturnValue;taint;df-generated |
-| System.Collections;Stack;get_SyncRoot;();Argument[this];ReturnValue;taint;df-generated |
-| System.Collections;Stack;get_SyncRoot;();Argument[this];ReturnValue;value;df-generated |
+| System.Collections;Stack;ToArray;();Argument[this].SyntheticField[System.Collections.Stack._array].Element;ReturnValue.Element;value;dfc-generated |
+| System.Collections;Stack;get_SyncRoot;();Argument[this];ReturnValue;value;dfc-generated |
 | System.ComponentModel.DataAnnotations.Schema;IndexAttribute;get_TypeId;();Argument[this];ReturnValue;taint;df-generated |
 | System.ComponentModel.DataAnnotations;AssociatedMetadataTypeTypeDescriptionProvider;GetTypeDescriptor;(System.Type,System.Object);Argument[1];ReturnValue;taint;df-generated |
 | System.ComponentModel.DataAnnotations;AssociatedMetadataTypeTypeDescriptionProvider;GetTypeDescriptor;(System.Type,System.Object);Argument[this];ReturnValue;taint;df-generated |
-| System.ComponentModel.DataAnnotations;AssociationAttribute;get_OtherKeyMembers;();Argument[this];ReturnValue;taint;df-generated |
-| System.ComponentModel.DataAnnotations;AssociationAttribute;get_ThisKeyMembers;();Argument[this];ReturnValue;taint;df-generated |
-| System.ComponentModel.DataAnnotations;CompareAttribute;FormatErrorMessage;(System.String);Argument[0];ReturnValue;taint;df-generated |
-| System.ComponentModel.DataAnnotations;CompareAttribute;FormatErrorMessage;(System.String);Argument[this];ReturnValue;taint;df-generated |
-| System.ComponentModel.DataAnnotations;CustomValidationAttribute;FormatErrorMessage;(System.String);Argument[0];ReturnValue;taint;df-generated |
-| System.ComponentModel.DataAnnotations;CustomValidationAttribute;FormatErrorMessage;(System.String);Argument[this];ReturnValue;taint;df-generated |
-| System.ComponentModel.DataAnnotations;DataTypeAttribute;GetDataTypeName;();Argument[this];ReturnValue;taint;df-generated |
+| System.ComponentModel.DataAnnotations;AssociationAttribute;get_OtherKeyMembers;();Argument[this].Property[System.ComponentModel.DataAnnotations.AssociationAttribute.OtherKey];ReturnValue.Element;taint;dfc-generated |
+| System.ComponentModel.DataAnnotations;AssociationAttribute;get_ThisKeyMembers;();Argument[this].Property[System.ComponentModel.DataAnnotations.AssociationAttribute.ThisKey];ReturnValue.Element;taint;dfc-generated |
+| System.ComponentModel.DataAnnotations;CompareAttribute;FormatErrorMessage;(System.String);Argument[0];ReturnValue;taint;dfc-generated |
+| System.ComponentModel.DataAnnotations;CompareAttribute;FormatErrorMessage;(System.String);Argument[this].Property[System.ComponentModel.DataAnnotations.ValidationAttribute.ErrorMessageString];ReturnValue;taint;dfc-generated |
+| System.ComponentModel.DataAnnotations;CustomValidationAttribute;FormatErrorMessage;(System.String);Argument[0];ReturnValue;taint;dfc-generated |
+| System.ComponentModel.DataAnnotations;CustomValidationAttribute;FormatErrorMessage;(System.String);Argument[this].Property[System.ComponentModel.DataAnnotations.ValidationAttribute.ErrorMessageString];ReturnValue;taint;dfc-generated |
+| System.ComponentModel.DataAnnotations;DataTypeAttribute;GetDataTypeName;();Argument[this].Property[System.ComponentModel.DataAnnotations.DataTypeAttribute.CustomDataType];ReturnValue;value;dfc-generated |
 | System.ComponentModel.DataAnnotations;DisplayAttribute;GetAutoGenerateField;();Argument[this];ReturnValue;taint;df-generated |
 | System.ComponentModel.DataAnnotations;DisplayAttribute;GetAutoGenerateFilter;();Argument[this];ReturnValue;taint;df-generated |
 | System.ComponentModel.DataAnnotations;DisplayAttribute;GetDescription;();Argument[this];ReturnValue;taint;df-generated |
@@ -7258,45 +7880,60 @@ summary
 | System.ComponentModel.DataAnnotations;DisplayAttribute;GetPrompt;();Argument[this];ReturnValue;taint;df-generated |
 | System.ComponentModel.DataAnnotations;DisplayAttribute;GetShortName;();Argument[this];ReturnValue;taint;df-generated |
 | System.ComponentModel.DataAnnotations;DisplayFormatAttribute;GetNullDisplayText;();Argument[this];ReturnValue;taint;df-generated |
-| System.ComponentModel.DataAnnotations;FileExtensionsAttribute;FormatErrorMessage;(System.String);Argument[0];ReturnValue;taint;df-generated |
-| System.ComponentModel.DataAnnotations;FileExtensionsAttribute;FormatErrorMessage;(System.String);Argument[this];ReturnValue;taint;df-generated |
-| System.ComponentModel.DataAnnotations;FilterUIHintAttribute;FilterUIHintAttribute;(System.String,System.String,System.Object[]);Argument[0];Argument[this];taint;df-generated |
-| System.ComponentModel.DataAnnotations;FilterUIHintAttribute;FilterUIHintAttribute;(System.String,System.String,System.Object[]);Argument[1];Argument[this];taint;df-generated |
+| System.ComponentModel.DataAnnotations;FileExtensionsAttribute;FormatErrorMessage;(System.String);Argument[0];ReturnValue;taint;dfc-generated |
+| System.ComponentModel.DataAnnotations;FileExtensionsAttribute;FormatErrorMessage;(System.String);Argument[this].Property[System.ComponentModel.DataAnnotations.ValidationAttribute.ErrorMessageString];ReturnValue;taint;dfc-generated |
+| System.ComponentModel.DataAnnotations;FilterUIHintAttribute;FilterUIHintAttribute;(System.String,System.String,System.Object[]);Argument[0];Argument[this].SyntheticField[System.ComponentModel.DataAnnotations.FilterUIHintAttribute._implementation].SyntheticField[System.ComponentModel.DataAnnotations.UIHintAttribute+UIHintImplementation.UIHint];value;dfc-generated |
+| System.ComponentModel.DataAnnotations;FilterUIHintAttribute;FilterUIHintAttribute;(System.String,System.String,System.Object[]);Argument[1];Argument[this].SyntheticField[System.ComponentModel.DataAnnotations.FilterUIHintAttribute._implementation].SyntheticField[System.ComponentModel.DataAnnotations.UIHintAttribute+UIHintImplementation.PresentationLayer];value;dfc-generated |
 | System.ComponentModel.DataAnnotations;FilterUIHintAttribute;get_ControlParameters;();Argument[this];ReturnValue;taint;df-generated |
-| System.ComponentModel.DataAnnotations;FilterUIHintAttribute;get_FilterUIHint;();Argument[this];ReturnValue;taint;df-generated |
-| System.ComponentModel.DataAnnotations;FilterUIHintAttribute;get_PresentationLayer;();Argument[this];ReturnValue;taint;df-generated |
-| System.ComponentModel.DataAnnotations;LengthAttribute;FormatErrorMessage;(System.String);Argument[0];ReturnValue;taint;df-generated |
-| System.ComponentModel.DataAnnotations;LengthAttribute;FormatErrorMessage;(System.String);Argument[this];ReturnValue;taint;df-generated |
-| System.ComponentModel.DataAnnotations;MaxLengthAttribute;FormatErrorMessage;(System.String);Argument[0];ReturnValue;taint;df-generated |
-| System.ComponentModel.DataAnnotations;MaxLengthAttribute;FormatErrorMessage;(System.String);Argument[this];ReturnValue;taint;df-generated |
-| System.ComponentModel.DataAnnotations;MinLengthAttribute;FormatErrorMessage;(System.String);Argument[0];ReturnValue;taint;df-generated |
-| System.ComponentModel.DataAnnotations;MinLengthAttribute;FormatErrorMessage;(System.String);Argument[this];ReturnValue;taint;df-generated |
-| System.ComponentModel.DataAnnotations;RangeAttribute;FormatErrorMessage;(System.String);Argument[0];ReturnValue;taint;df-generated |
-| System.ComponentModel.DataAnnotations;RangeAttribute;FormatErrorMessage;(System.String);Argument[this];ReturnValue;taint;df-generated |
-| System.ComponentModel.DataAnnotations;RegularExpressionAttribute;FormatErrorMessage;(System.String);Argument[0];ReturnValue;taint;df-generated |
-| System.ComponentModel.DataAnnotations;RegularExpressionAttribute;FormatErrorMessage;(System.String);Argument[this];ReturnValue;taint;df-generated |
-| System.ComponentModel.DataAnnotations;StringLengthAttribute;FormatErrorMessage;(System.String);Argument[0];ReturnValue;taint;df-generated |
-| System.ComponentModel.DataAnnotations;StringLengthAttribute;FormatErrorMessage;(System.String);Argument[this];ReturnValue;taint;df-generated |
-| System.ComponentModel.DataAnnotations;UIHintAttribute;UIHintAttribute;(System.String,System.String,System.Object[]);Argument[0];Argument[this];taint;df-generated |
-| System.ComponentModel.DataAnnotations;UIHintAttribute;UIHintAttribute;(System.String,System.String,System.Object[]);Argument[1];Argument[this];taint;df-generated |
+| System.ComponentModel.DataAnnotations;FilterUIHintAttribute;get_FilterUIHint;();Argument[this].SyntheticField[System.ComponentModel.DataAnnotations.FilterUIHintAttribute._implementation].SyntheticField[System.ComponentModel.DataAnnotations.UIHintAttribute+UIHintImplementation.UIHint];ReturnValue;value;dfc-generated |
+| System.ComponentModel.DataAnnotations;FilterUIHintAttribute;get_PresentationLayer;();Argument[this].SyntheticField[System.ComponentModel.DataAnnotations.FilterUIHintAttribute._implementation].SyntheticField[System.ComponentModel.DataAnnotations.UIHintAttribute+UIHintImplementation.PresentationLayer];ReturnValue;value;dfc-generated |
+| System.ComponentModel.DataAnnotations;LengthAttribute;FormatErrorMessage;(System.String);Argument[0];ReturnValue;taint;dfc-generated |
+| System.ComponentModel.DataAnnotations;LengthAttribute;FormatErrorMessage;(System.String);Argument[this].Property[System.ComponentModel.DataAnnotations.ValidationAttribute.ErrorMessageString];ReturnValue;taint;dfc-generated |
+| System.ComponentModel.DataAnnotations;MaxLengthAttribute;FormatErrorMessage;(System.String);Argument[0];ReturnValue;taint;dfc-generated |
+| System.ComponentModel.DataAnnotations;MaxLengthAttribute;FormatErrorMessage;(System.String);Argument[this].Property[System.ComponentModel.DataAnnotations.ValidationAttribute.ErrorMessageString];ReturnValue;taint;dfc-generated |
+| System.ComponentModel.DataAnnotations;MinLengthAttribute;FormatErrorMessage;(System.String);Argument[0];ReturnValue;taint;dfc-generated |
+| System.ComponentModel.DataAnnotations;MinLengthAttribute;FormatErrorMessage;(System.String);Argument[this].Property[System.ComponentModel.DataAnnotations.ValidationAttribute.ErrorMessageString];ReturnValue;taint;dfc-generated |
+| System.ComponentModel.DataAnnotations;RangeAttribute;FormatErrorMessage;(System.String);Argument[0];ReturnValue;taint;dfc-generated |
+| System.ComponentModel.DataAnnotations;RangeAttribute;FormatErrorMessage;(System.String);Argument[this].Property[System.ComponentModel.DataAnnotations.ValidationAttribute.ErrorMessageString];ReturnValue;taint;dfc-generated |
+| System.ComponentModel.DataAnnotations;RegularExpressionAttribute;FormatErrorMessage;(System.String);Argument[0];ReturnValue;taint;dfc-generated |
+| System.ComponentModel.DataAnnotations;RegularExpressionAttribute;FormatErrorMessage;(System.String);Argument[this].Property[System.ComponentModel.DataAnnotations.RegularExpressionAttribute.Pattern];ReturnValue;taint;dfc-generated |
+| System.ComponentModel.DataAnnotations;RegularExpressionAttribute;FormatErrorMessage;(System.String);Argument[this].Property[System.ComponentModel.DataAnnotations.ValidationAttribute.ErrorMessageString];ReturnValue;taint;dfc-generated |
+| System.ComponentModel.DataAnnotations;StringLengthAttribute;FormatErrorMessage;(System.String);Argument[0];ReturnValue;taint;dfc-generated |
+| System.ComponentModel.DataAnnotations;StringLengthAttribute;FormatErrorMessage;(System.String);Argument[this].Property[System.ComponentModel.DataAnnotations.ValidationAttribute.ErrorMessageString];ReturnValue;taint;dfc-generated |
+| System.ComponentModel.DataAnnotations;UIHintAttribute;UIHintAttribute;(System.String,System.String,System.Object[]);Argument[0];Argument[this].SyntheticField[System.ComponentModel.DataAnnotations.UIHintAttribute._implementation].SyntheticField[System.ComponentModel.DataAnnotations.UIHintAttribute+UIHintImplementation.UIHint];value;dfc-generated |
+| System.ComponentModel.DataAnnotations;UIHintAttribute;UIHintAttribute;(System.String,System.String,System.Object[]);Argument[1];Argument[this].SyntheticField[System.ComponentModel.DataAnnotations.UIHintAttribute._implementation].SyntheticField[System.ComponentModel.DataAnnotations.UIHintAttribute+UIHintImplementation.PresentationLayer];value;dfc-generated |
 | System.ComponentModel.DataAnnotations;UIHintAttribute;get_ControlParameters;();Argument[this];ReturnValue;taint;df-generated |
-| System.ComponentModel.DataAnnotations;UIHintAttribute;get_PresentationLayer;();Argument[this];ReturnValue;taint;df-generated |
-| System.ComponentModel.DataAnnotations;UIHintAttribute;get_UIHint;();Argument[this];ReturnValue;taint;df-generated |
-| System.ComponentModel.DataAnnotations;ValidationAttribute;FormatErrorMessage;(System.String);Argument[0];ReturnValue;taint;df-generated |
-| System.ComponentModel.DataAnnotations;ValidationAttribute;FormatErrorMessage;(System.String);Argument[this];ReturnValue;taint;df-generated |
+| System.ComponentModel.DataAnnotations;UIHintAttribute;get_PresentationLayer;();Argument[this].SyntheticField[System.ComponentModel.DataAnnotations.UIHintAttribute._implementation].SyntheticField[System.ComponentModel.DataAnnotations.UIHintAttribute+UIHintImplementation.PresentationLayer];ReturnValue;value;dfc-generated |
+| System.ComponentModel.DataAnnotations;UIHintAttribute;get_UIHint;();Argument[this].SyntheticField[System.ComponentModel.DataAnnotations.UIHintAttribute._implementation].SyntheticField[System.ComponentModel.DataAnnotations.UIHintAttribute+UIHintImplementation.UIHint];ReturnValue;value;dfc-generated |
+| System.ComponentModel.DataAnnotations;ValidationAttribute;FormatErrorMessage;(System.String);Argument[0];ReturnValue;taint;dfc-generated |
+| System.ComponentModel.DataAnnotations;ValidationAttribute;FormatErrorMessage;(System.String);Argument[this].Property[System.ComponentModel.DataAnnotations.ValidationAttribute.ErrorMessageString];ReturnValue;taint;dfc-generated |
+| System.ComponentModel.DataAnnotations;ValidationAttribute;ValidationAttribute;(System.Func<System.String>);Argument[0];Argument[0].Parameter[delegate-self];value;dfc-generated |
 | System.ComponentModel.DataAnnotations;ValidationAttribute;ValidationAttribute;(System.Func<System.String>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
-| System.ComponentModel.DataAnnotations;ValidationContext;GetService;(System.Type);Argument[this];ReturnValue;taint;df-generated |
+| System.ComponentModel.DataAnnotations;ValidationAttribute;ValidationAttribute;(System.Func<System.String>);Argument[0];Argument[this].SyntheticField[System.ComponentModel.DataAnnotations.ValidationAttribute._errorMessageResourceAccessor];value;dfc-generated |
+| System.ComponentModel.DataAnnotations;ValidationAttribute;ValidationAttribute;(System.Func<System.String>);Argument[0];Argument[this].SyntheticField[System.ComponentModel.DataAnnotations.ValidationAttribute._errorMessageResourceAccessor];value;hq-generated |
+| System.ComponentModel.DataAnnotations;ValidationAttribute;get_ErrorMessageString;();Argument[this];ReturnValue;taint;df-generated |
+| System.ComponentModel.DataAnnotations;ValidationContext;GetService;(System.Type);Argument[this];ReturnValue;value;dfc-generated |
+| System.ComponentModel.DataAnnotations;ValidationContext;InitializeServiceProvider;(System.Func<System.Type,System.Object>);Argument[0];Argument[0].Parameter[delegate-self];value;dfc-generated |
 | System.ComponentModel.DataAnnotations;ValidationContext;InitializeServiceProvider;(System.Func<System.Type,System.Object>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
+| System.ComponentModel.DataAnnotations;ValidationContext;InitializeServiceProvider;(System.Func<System.Type,System.Object>);Argument[0];Argument[this].SyntheticField[System.ComponentModel.DataAnnotations.ValidationContext._serviceProvider];value;dfc-generated |
+| System.ComponentModel.DataAnnotations;ValidationContext;InitializeServiceProvider;(System.Func<System.Type,System.Object>);Argument[0];Argument[this].SyntheticField[System.ComponentModel.DataAnnotations.ValidationContext._serviceProvider];value;hq-generated |
 | System.ComponentModel.DataAnnotations;ValidationContext;get_Items;();Argument[this];ReturnValue;taint;df-generated |
 | System.ComponentModel.DataAnnotations;ValidationException;ValidationException;(System.ComponentModel.DataAnnotations.ValidationResult,System.ComponentModel.DataAnnotations.ValidationAttribute,System.Object);Argument[0];Argument[this];taint;df-generated |
-| System.ComponentModel.DataAnnotations;ValidationResult;ToString;();Argument[this];ReturnValue;taint;df-generated |
-| System.ComponentModel.Design.Serialization;ContextStack;Append;(System.Object);Argument[0];Argument[this];taint;df-generated |
-| System.ComponentModel.Design.Serialization;ContextStack;Pop;();Argument[this];ReturnValue;taint;df-generated |
-| System.ComponentModel.Design.Serialization;ContextStack;Push;(System.Object);Argument[0];Argument[this];taint;df-generated |
-| System.ComponentModel.Design.Serialization;ContextStack;get_Current;();Argument[this];ReturnValue;taint;df-generated |
-| System.ComponentModel.Design.Serialization;ContextStack;get_Item;(System.Int32);Argument[this];ReturnValue;taint;df-generated |
-| System.ComponentModel.Design.Serialization;ContextStack;get_Item;(System.Type);Argument[this];ReturnValue;taint;df-generated |
+| System.ComponentModel.DataAnnotations;ValidationResult;ToString;();Argument[this].Property[System.ComponentModel.DataAnnotations.ValidationResult.ErrorMessage];ReturnValue;value;dfc-generated |
+| System.ComponentModel.Design.Serialization;ContextStack;Append;(System.Object);Argument[0];Argument[this].SyntheticField[System.ComponentModel.Design.Serialization.ContextStack._contextStack].Element;value;dfc-generated |
+| System.ComponentModel.Design.Serialization;ContextStack;Pop;();Argument[this].SyntheticField[System.ComponentModel.Design.Serialization.ContextStack._contextStack].Element;ReturnValue;value;dfc-generated |
+| System.ComponentModel.Design.Serialization;ContextStack;Push;(System.Object);Argument[0];Argument[this].SyntheticField[System.ComponentModel.Design.Serialization.ContextStack._contextStack].Element;value;dfc-generated |
+| System.ComponentModel.Design.Serialization;ContextStack;get_Current;();Argument[this].SyntheticField[System.ComponentModel.Design.Serialization.ContextStack._contextStack].Element;ReturnValue;value;dfc-generated |
+| System.ComponentModel.Design.Serialization;ContextStack;get_Item;(System.Int32);Argument[this].SyntheticField[System.ComponentModel.Design.Serialization.ContextStack._contextStack].Element;ReturnValue;value;dfc-generated |
+| System.ComponentModel.Design.Serialization;ContextStack;get_Item;(System.Type);Argument[this].SyntheticField[System.ComponentModel.Design.Serialization.ContextStack._contextStack].Element;ReturnValue;value;dfc-generated |
+| System.ComponentModel.Design.Serialization;DesignerSerializerAttribute;get_TypeId;();Argument[this].Property[System.ComponentModel.Design.Serialization.DesignerSerializerAttribute.SerializerBaseTypeName];Argument[this].SyntheticField[System.ComponentModel.Design.Serialization.DesignerSerializerAttribute._typeId];taint;df-generated |
+| System.ComponentModel.Design.Serialization;DesignerSerializerAttribute;get_TypeId;();Argument[this].Property[System.ComponentModel.Design.Serialization.DesignerSerializerAttribute.SerializerBaseTypeName];Argument[this].SyntheticField[System.ComponentModel.Design.Serialization.DesignerSerializerAttribute._typeId];taint;dfc-generated |
+| System.ComponentModel.Design.Serialization;DesignerSerializerAttribute;get_TypeId;();Argument[this].Property[System.ComponentModel.Design.Serialization.DesignerSerializerAttribute.SerializerBaseTypeName];ReturnValue;taint;df-generated |
+| System.ComponentModel.Design.Serialization;DesignerSerializerAttribute;get_TypeId;();Argument[this].Property[System.ComponentModel.Design.Serialization.DesignerSerializerAttribute.SerializerBaseTypeName];ReturnValue;taint;dfc-generated |
+| System.ComponentModel.Design.Serialization;DesignerSerializerAttribute;get_TypeId;();Argument[this].SyntheticField[System.ComponentModel.Design.Serialization.DesignerSerializerAttribute._typeId];ReturnValue;value;df-generated |
+| System.ComponentModel.Design.Serialization;DesignerSerializerAttribute;get_TypeId;();Argument[this].SyntheticField[System.ComponentModel.Design.Serialization.DesignerSerializerAttribute._typeId];ReturnValue;value;dfc-generated |
 | System.ComponentModel.Design.Serialization;DesignerSerializerAttribute;get_TypeId;();Argument[this];ReturnValue;taint;df-generated |
+| System.ComponentModel.Design.Serialization;DesignerSerializerAttribute;get_TypeId;();Argument[this];ReturnValue;taint;dfc-generated |
 | System.ComponentModel.Design.Serialization;IDesignerSerializationManager;add_ResolveName;(System.ComponentModel.Design.Serialization.ResolveNameEventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.ComponentModel.Design.Serialization;IDesignerSerializationManager;add_SerializationComplete;(System.EventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.ComponentModel.Design.Serialization;IDesignerSerializationManager;remove_ResolveName;(System.ComponentModel.Design.Serialization.ResolveNameEventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
@@ -7304,44 +7941,43 @@ summary
 | System.ComponentModel.Design.Serialization;ResolveNameEventHandler;BeginInvoke;(System.Object,System.ComponentModel.Design.Serialization.ResolveNameEventArgs,System.AsyncCallback,System.Object);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
 | System.ComponentModel.Design.Serialization;RootDesignerSerializerAttribute;get_TypeId;();Argument[this];ReturnValue;taint;df-generated |
 | System.ComponentModel.Design;ActiveDesignerEventHandler;BeginInvoke;(System.Object,System.ComponentModel.Design.ActiveDesignerEventArgs,System.AsyncCallback,System.Object);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
-| System.ComponentModel.Design;CommandID;ToString;();Argument[this];ReturnValue;taint;df-generated |
+| System.ComponentModel.Design;CommandID;ToString;();Argument[this].Property[System.ComponentModel.Design.CommandID.Guid];ReturnValue;taint;dfc-generated |
 | System.ComponentModel.Design;ComponentChangedEventHandler;BeginInvoke;(System.Object,System.ComponentModel.Design.ComponentChangedEventArgs,System.AsyncCallback,System.Object);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
 | System.ComponentModel.Design;ComponentChangingEventHandler;BeginInvoke;(System.Object,System.ComponentModel.Design.ComponentChangingEventArgs,System.AsyncCallback,System.Object);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
 | System.ComponentModel.Design;ComponentEventHandler;BeginInvoke;(System.Object,System.ComponentModel.Design.ComponentEventArgs,System.AsyncCallback,System.Object);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
 | System.ComponentModel.Design;ComponentRenameEventHandler;BeginInvoke;(System.Object,System.ComponentModel.Design.ComponentRenameEventArgs,System.AsyncCallback,System.Object);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
 | System.ComponentModel.Design;DesignerCollection;CopyTo;(System.Array,System.Int32);Argument[this].Element;Argument[0].Element;value;manual |
-| System.ComponentModel.Design;DesignerCollection;DesignerCollection;(System.Collections.IList);Argument[0].Element;Argument[this];taint;df-generated |
+| System.ComponentModel.Design;DesignerCollection;DesignerCollection;(System.Collections.IList);Argument[0];Argument[this].SyntheticField[System.ComponentModel.Design.DesignerCollection._designers];value;dfc-generated |
 | System.ComponentModel.Design;DesignerCollection;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.IEnumerator.Current];value;manual |
-| System.ComponentModel.Design;DesignerCollection;get_Item;(System.Int32);Argument[this];ReturnValue;taint;df-generated |
-| System.ComponentModel.Design;DesignerCollection;get_SyncRoot;();Argument[this];ReturnValue;taint;df-generated |
-| System.ComponentModel.Design;DesignerCollection;get_SyncRoot;();Argument[this];ReturnValue;value;df-generated |
+| System.ComponentModel.Design;DesignerCollection;get_Item;(System.Int32);Argument[this].SyntheticField[System.ComponentModel.Design.DesignerCollection._designers].Element;ReturnValue;value;dfc-generated |
+| System.ComponentModel.Design;DesignerCollection;get_SyncRoot;();Argument[this];ReturnValue;value;dfc-generated |
 | System.ComponentModel.Design;DesignerEventHandler;BeginInvoke;(System.Object,System.ComponentModel.Design.DesignerEventArgs,System.AsyncCallback,System.Object);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
 | System.ComponentModel.Design;DesignerOptionService+DesignerOptionCollection;Add;(System.Object);Argument[0];Argument[this].Element;value;manual |
 | System.ComponentModel.Design;DesignerOptionService+DesignerOptionCollection;Clear;();Argument[this].WithoutElement;Argument[this];value;manual |
 | System.ComponentModel.Design;DesignerOptionService+DesignerOptionCollection;CopyTo;(System.Array,System.Int32);Argument[this].Element;Argument[0].Element;value;manual |
 | System.ComponentModel.Design;DesignerOptionService+DesignerOptionCollection;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.IEnumerator.Current];value;manual |
 | System.ComponentModel.Design;DesignerOptionService+DesignerOptionCollection;Insert;(System.Int32,System.Object);Argument[1];Argument[this].Element;value;manual |
-| System.ComponentModel.Design;DesignerOptionService+DesignerOptionCollection;Remove;(System.Object);Argument[0];Argument[this];taint;df-generated |
-| System.ComponentModel.Design;DesignerOptionService+DesignerOptionCollection;Remove;(System.Object);Argument[this];Argument[0];taint;df-generated |
 | System.ComponentModel.Design;DesignerOptionService+DesignerOptionCollection;get_Item;(System.Int32);Argument[this].Element;ReturnValue;value;manual |
 | System.ComponentModel.Design;DesignerOptionService+DesignerOptionCollection;get_Item;(System.String);Argument[this].Element;ReturnValue;value;manual |
 | System.ComponentModel.Design;DesignerOptionService+DesignerOptionCollection;get_Properties;();Argument[this];ReturnValue;taint;df-generated |
-| System.ComponentModel.Design;DesignerOptionService+DesignerOptionCollection;get_SyncRoot;();Argument[this];ReturnValue;taint;df-generated |
-| System.ComponentModel.Design;DesignerOptionService+DesignerOptionCollection;get_SyncRoot;();Argument[this];ReturnValue;value;df-generated |
+| System.ComponentModel.Design;DesignerOptionService+DesignerOptionCollection;get_SyncRoot;();Argument[this];ReturnValue;value;dfc-generated |
 | System.ComponentModel.Design;DesignerOptionService+DesignerOptionCollection;set_Item;(System.Int32,System.Object);Argument[1];Argument[this].Element;value;manual |
 | System.ComponentModel.Design;DesignerOptionService;CreateOptionCollection;(System.ComponentModel.Design.DesignerOptionService+DesignerOptionCollection,System.String,System.Object);Argument[2];ReturnValue;taint;df-generated |
 | System.ComponentModel.Design;DesignerOptionService;CreateOptionCollection;(System.ComponentModel.Design.DesignerOptionService+DesignerOptionCollection,System.String,System.Object);Argument[this];ReturnValue;taint;df-generated |
 | System.ComponentModel.Design;DesignerTransactionCloseEventHandler;BeginInvoke;(System.Object,System.ComponentModel.Design.DesignerTransactionCloseEventArgs,System.AsyncCallback,System.Object);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
 | System.ComponentModel.Design;DesignerVerb;DesignerVerb;(System.String,System.EventHandler);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
 | System.ComponentModel.Design;DesignerVerb;DesignerVerb;(System.String,System.EventHandler,System.ComponentModel.Design.CommandID);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
-| System.ComponentModel.Design;DesignerVerb;get_Text;();Argument[this];ReturnValue;taint;df-generated |
+| System.ComponentModel.Design;DesignerVerb;ToString;();Argument[this].Property[System.ComponentModel.Design.DesignerVerb.Text];ReturnValue;taint;dfc-generated |
+| System.ComponentModel.Design;DesignerVerb;ToString;();Argument[this].Property[System.ComponentModel.Design.MenuCommand.CommandID].Property[System.ComponentModel.Design.CommandID.Guid];ReturnValue;taint;dfc-generated |
+| System.ComponentModel.Design;DesignerVerb;ToString;();Argument[this].Property[System.ComponentModel.Design.MenuCommand.Properties].Element;ReturnValue;taint;dfc-generated |
+| System.ComponentModel.Design;DesignerVerb;get_Text;();Argument[this].Property[System.ComponentModel.Design.MenuCommand.Properties].Element;ReturnValue;value;dfc-generated |
 | System.ComponentModel.Design;DesignerVerbCollection;Add;(System.ComponentModel.Design.DesignerVerb);Argument[0];Argument[this].Element;value;manual |
 | System.ComponentModel.Design;DesignerVerbCollection;AddRange;(System.ComponentModel.Design.DesignerVerbCollection);Argument[0].Element;Argument[this].Element;value;manual |
 | System.ComponentModel.Design;DesignerVerbCollection;AddRange;(System.ComponentModel.Design.DesignerVerb[]);Argument[0].Element;Argument[this].Element;value;manual |
 | System.ComponentModel.Design;DesignerVerbCollection;CopyTo;(System.ComponentModel.Design.DesignerVerb[],System.Int32);Argument[this].Element;Argument[0].Element;value;manual |
-| System.ComponentModel.Design;DesignerVerbCollection;DesignerVerbCollection;(System.ComponentModel.Design.DesignerVerb[]);Argument[0].Element;Argument[this];taint;df-generated |
+| System.ComponentModel.Design;DesignerVerbCollection;DesignerVerbCollection;(System.ComponentModel.Design.DesignerVerb[]);Argument[0].Element;Argument[this].Element;value;dfc-generated |
+| System.ComponentModel.Design;DesignerVerbCollection;DesignerVerbCollection;(System.ComponentModel.Design.DesignerVerb[]);Argument[0].Element;Argument[this].Property[System.Collections.CollectionBase.List].Element;value;dfc-generated |
 | System.ComponentModel.Design;DesignerVerbCollection;Insert;(System.Int32,System.ComponentModel.Design.DesignerVerb);Argument[1];Argument[this].Element;value;manual |
-| System.ComponentModel.Design;DesignerVerbCollection;Remove;(System.ComponentModel.Design.DesignerVerb);Argument[0];Argument[this];taint;df-generated |
 | System.ComponentModel.Design;DesignerVerbCollection;get_Item;(System.Int32);Argument[this].Element;ReturnValue;value;manual |
 | System.ComponentModel.Design;DesignerVerbCollection;set_Item;(System.Int32,System.ComponentModel.Design.DesignerVerb);Argument[1];Argument[this].Element;value;manual |
 | System.ComponentModel.Design;DesigntimeLicenseContext;GetSavedLicenseKey;(System.Type,System.Reflection.Assembly);Argument[this];ReturnValue;taint;df-generated |
@@ -7389,151 +8025,151 @@ summary
 | System.ComponentModel.Design;IServiceContainer;AddService;(System.Type,System.ComponentModel.Design.ServiceCreatorCallback);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
 | System.ComponentModel.Design;IServiceContainer;AddService;(System.Type,System.ComponentModel.Design.ServiceCreatorCallback,System.Boolean);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
 | System.ComponentModel.Design;MenuCommand;MenuCommand;(System.EventHandler,System.ComponentModel.Design.CommandID);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
-| System.ComponentModel.Design;MenuCommand;ToString;();Argument[this];ReturnValue;taint;df-generated |
+| System.ComponentModel.Design;MenuCommand;ToString;();Argument[this].Property[System.ComponentModel.Design.MenuCommand.CommandID].Property[System.ComponentModel.Design.CommandID.Guid];ReturnValue;taint;dfc-generated |
 | System.ComponentModel.Design;MenuCommand;add_CommandChanged;(System.EventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.ComponentModel.Design;MenuCommand;remove_CommandChanged;(System.EventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.ComponentModel.Design;ServiceContainer;AddService;(System.Type,System.ComponentModel.Design.ServiceCreatorCallback);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
 | System.ComponentModel.Design;ServiceContainer;AddService;(System.Type,System.ComponentModel.Design.ServiceCreatorCallback,System.Boolean);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
-| System.ComponentModel.Design;ServiceContainer;GetService;(System.Type);Argument[this];ReturnValue;taint;df-generated |
+| System.ComponentModel.Design;ServiceContainer;GetService;(System.Type);Argument[this];ReturnValue;value;dfc-generated |
 | System.ComponentModel.Design;ServiceContainer;ServiceContainer;(System.IServiceProvider);Argument[0];Argument[this];taint;df-generated |
 | System.ComponentModel.Design;ServiceCreatorCallback;BeginInvoke;(System.ComponentModel.Design.IServiceContainer,System.Type,System.AsyncCallback,System.Object);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
 | System.ComponentModel;AddingNewEventHandler;BeginInvoke;(System.Object,System.ComponentModel.AddingNewEventArgs,System.AsyncCallback,System.Object);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
-| System.ComponentModel;ArrayConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[1];ReturnValue;taint;df-generated |
-| System.ComponentModel;ArrayConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[2];ReturnValue;taint;df-generated |
-| System.ComponentModel;ArrayConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[this];ReturnValue;taint;df-generated |
+| System.ComponentModel;ArrayConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[2].Element;ReturnValue;taint;dfc-generated |
+| System.ComponentModel;ArrayConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[2];ReturnValue;taint;dfc-generated |
 | System.ComponentModel;ArrayConverter;GetProperties;(System.ComponentModel.ITypeDescriptorContext,System.Object,System.Attribute[]);Argument[1];ReturnValue;taint;df-generated |
 | System.ComponentModel;AsyncCompletedEventHandler;BeginInvoke;(System.Object,System.ComponentModel.AsyncCompletedEventArgs,System.AsyncCallback,System.Object);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
 | System.ComponentModel;AsyncOperation;Post;(System.Threading.SendOrPostCallback,System.Object);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.ComponentModel;AsyncOperation;PostOperationCompleted;(System.Threading.SendOrPostCallback,System.Object);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.ComponentModel;AsyncOperation;get_SynchronizationContext;();Argument[this];ReturnValue;taint;df-generated |
-| System.ComponentModel;AttributeCollection;AttributeCollection;(System.Attribute[]);Argument[0].Element;Argument[this];taint;df-generated |
+| System.ComponentModel;AttributeCollection;AttributeCollection;(System.Attribute[]);Argument[0];Argument[this].SyntheticField[System.ComponentModel.AttributeCollection._attributes];value;dfc-generated |
 | System.ComponentModel;AttributeCollection;CopyTo;(System.Array,System.Int32);Argument[this].Element;Argument[0].Element;value;manual |
-| System.ComponentModel;AttributeCollection;FromExisting;(System.ComponentModel.AttributeCollection,System.Attribute[]);Argument[0].Element;ReturnValue;taint;df-generated |
-| System.ComponentModel;AttributeCollection;FromExisting;(System.ComponentModel.AttributeCollection,System.Attribute[]);Argument[1].Element;ReturnValue;taint;df-generated |
 | System.ComponentModel;AttributeCollection;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.IEnumerator.Current];value;manual |
-| System.ComponentModel;AttributeCollection;get_Attributes;();Argument[this];ReturnValue;taint;df-generated |
-| System.ComponentModel;AttributeCollection;get_Item;(System.Int32);Argument[this];ReturnValue;taint;df-generated |
-| System.ComponentModel;AttributeCollection;get_Item;(System.Type);Argument[this];ReturnValue;taint;df-generated |
-| System.ComponentModel;AttributeCollection;get_SyncRoot;();Argument[this];ReturnValue;taint;df-generated |
-| System.ComponentModel;AttributeCollection;get_SyncRoot;();Argument[this];ReturnValue;value;df-generated |
+| System.ComponentModel;AttributeCollection;get_Attributes;();Argument[this].SyntheticField[System.ComponentModel.AttributeCollection._attributes];ReturnValue;value;dfc-generated |
+| System.ComponentModel;AttributeCollection;get_Item;(System.Int32);Argument[this].Property[System.ComponentModel.AttributeCollection.Attributes].Element;ReturnValue;value;dfc-generated |
+| System.ComponentModel;AttributeCollection;get_Item;(System.Int32);Argument[this].SyntheticField[System.ComponentModel.AttributeCollection._attributes].Element;ReturnValue;value;dfc-generated |
+| System.ComponentModel;AttributeCollection;get_Item;(System.Type);Argument[this].Property[System.ComponentModel.AttributeCollection.Attributes].Element;ReturnValue;value;dfc-generated |
+| System.ComponentModel;AttributeCollection;get_Item;(System.Type);Argument[this].SyntheticField[System.ComponentModel.AttributeCollection._attributes].Element;ReturnValue;value;dfc-generated |
+| System.ComponentModel;AttributeCollection;get_SyncRoot;();Argument[this];ReturnValue;value;dfc-generated |
 | System.ComponentModel;BackgroundWorker;add_DoWork;(System.ComponentModel.DoWorkEventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.ComponentModel;BackgroundWorker;add_ProgressChanged;(System.ComponentModel.ProgressChangedEventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.ComponentModel;BackgroundWorker;add_RunWorkerCompleted;(System.ComponentModel.RunWorkerCompletedEventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.ComponentModel;BackgroundWorker;remove_DoWork;(System.ComponentModel.DoWorkEventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.ComponentModel;BackgroundWorker;remove_ProgressChanged;(System.ComponentModel.ProgressChangedEventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.ComponentModel;BackgroundWorker;remove_RunWorkerCompleted;(System.ComponentModel.RunWorkerCompletedEventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
-| System.ComponentModel;BaseNumberConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[0];ReturnValue;taint;df-generated |
-| System.ComponentModel;BaseNumberConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue;taint;df-generated |
-| System.ComponentModel;BaseNumberConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[this];ReturnValue;taint;df-generated |
-| System.ComponentModel;BaseNumberConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[1];ReturnValue;taint;df-generated |
-| System.ComponentModel;BaseNumberConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[2];ReturnValue;taint;df-generated |
-| System.ComponentModel;BaseNumberConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[this];ReturnValue;taint;df-generated |
-| System.ComponentModel;BindingList<T>;AddNew;();Argument[this];ReturnValue;taint;df-generated |
-| System.ComponentModel;BindingList<T>;AddNewCore;();Argument[this];ReturnValue;taint;df-generated |
+| System.ComponentModel;BaseNumberConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue.Element;taint;dfc-generated |
+| System.ComponentModel;BaseNumberConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue;taint;dfc-generated |
+| System.ComponentModel;BaseNumberConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue;value;dfc-generated |
+| System.ComponentModel;BaseNumberConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[2].Element;ReturnValue;taint;dfc-generated |
+| System.ComponentModel;BaseNumberConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[2];ReturnValue;taint;dfc-generated |
 | System.ComponentModel;BindingList<T>;ApplySort;(System.ComponentModel.PropertyDescriptor,System.ComponentModel.ListSortDirection);Argument[0];Argument[this];taint;df-generated |
 | System.ComponentModel;BindingList<T>;Find;(System.ComponentModel.PropertyDescriptor,System.Object);Argument[this].Element;ReturnValue;value;manual |
-| System.ComponentModel;BindingList<T>;InsertItem;(System.Int32,T);Argument[1];Argument[this];taint;df-generated |
-| System.ComponentModel;BindingList<T>;InsertItem;(System.Int32,T);Argument[this];Argument[1];taint;df-generated |
+| System.ComponentModel;BindingList<T>;InsertItem;(System.Int32,T);Argument[1];Argument[this].SyntheticField[System.Collections.ObjectModel.Collection`1.items].Element;value;dfc-generated |
+| System.ComponentModel;BindingList<T>;OnAddingNew;(System.ComponentModel.AddingNewEventArgs);Argument[0];Argument[this];taint;df-generated |
+| System.ComponentModel;BindingList<T>;OnListChanged;(System.ComponentModel.ListChangedEventArgs);Argument[0];Argument[this];taint;df-generated |
 | System.ComponentModel;BindingList<T>;SetItem;(System.Int32,T);Argument[1];Argument[this];taint;df-generated |
-| System.ComponentModel;BindingList<T>;SetItem;(System.Int32,T);Argument[this];Argument[1];taint;df-generated |
 | System.ComponentModel;BindingList<T>;add_AddingNew;(System.ComponentModel.AddingNewEventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.ComponentModel;BindingList<T>;add_ListChanged;(System.ComponentModel.ListChangedEventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
-| System.ComponentModel;BindingList<T>;get_SortProperty;();Argument[this];ReturnValue;taint;df-generated |
+| System.ComponentModel;BindingList<T>;get_SortProperty;();Argument[this].Property[System.ComponentModel.BindingList`1.SortPropertyCore];ReturnValue;value;dfc-generated |
 | System.ComponentModel;BindingList<T>;remove_AddingNew;(System.ComponentModel.AddingNewEventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.ComponentModel;BindingList<T>;remove_ListChanged;(System.ComponentModel.ListChangedEventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
-| System.ComponentModel;BooleanConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[0];ReturnValue;taint;df-generated |
-| System.ComponentModel;BooleanConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue;taint;df-generated |
-| System.ComponentModel;BooleanConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[this];ReturnValue;taint;df-generated |
-| System.ComponentModel;BooleanConverter;GetStandardValues;(System.ComponentModel.ITypeDescriptorContext);Argument[0];ReturnValue;taint;df-generated |
+| System.ComponentModel;BooleanConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue.Element;taint;dfc-generated |
+| System.ComponentModel;BooleanConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue;taint;dfc-generated |
+| System.ComponentModel;BooleanConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue;value;dfc-generated |
 | System.ComponentModel;BooleanConverter;GetStandardValues;(System.ComponentModel.ITypeDescriptorContext);Argument[this];ReturnValue;taint;df-generated |
 | System.ComponentModel;CancelEventHandler;BeginInvoke;(System.Object,System.ComponentModel.CancelEventArgs,System.AsyncCallback,System.Object);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
-| System.ComponentModel;CategoryAttribute;CategoryAttribute;(System.String);Argument[0];Argument[this];taint;df-generated |
-| System.ComponentModel;CategoryAttribute;get_Category;();Argument[this];ReturnValue;taint;df-generated |
-| System.ComponentModel;CharConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[0];ReturnValue;taint;df-generated |
-| System.ComponentModel;CharConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue;taint;df-generated |
-| System.ComponentModel;CharConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[this];ReturnValue;taint;df-generated |
-| System.ComponentModel;CharConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[1];ReturnValue;taint;df-generated |
-| System.ComponentModel;CharConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[2];ReturnValue;taint;df-generated |
-| System.ComponentModel;CharConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[this];ReturnValue;taint;df-generated |
+| System.ComponentModel;CategoryAttribute;CategoryAttribute;(System.String);Argument[0];Argument[this].SyntheticField[System.ComponentModel.CategoryAttribute._categoryValue];value;dfc-generated |
+| System.ComponentModel;CategoryAttribute;get_Category;();Argument[this].SyntheticField[System.ComponentModel.CategoryAttribute._categoryValue];ReturnValue;value;dfc-generated |
+| System.ComponentModel;CharConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue.Element;taint;dfc-generated |
+| System.ComponentModel;CharConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue;taint;dfc-generated |
+| System.ComponentModel;CharConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue;value;dfc-generated |
+| System.ComponentModel;CharConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[2].Element;ReturnValue;taint;dfc-generated |
+| System.ComponentModel;CharConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[2];ReturnValue;taint;dfc-generated |
 | System.ComponentModel;CollectionChangeEventHandler;BeginInvoke;(System.Object,System.ComponentModel.CollectionChangeEventArgs,System.AsyncCallback,System.Object);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
-| System.ComponentModel;CollectionConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[1];ReturnValue;taint;df-generated |
-| System.ComponentModel;CollectionConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[2];ReturnValue;taint;df-generated |
-| System.ComponentModel;CollectionConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[this];ReturnValue;taint;df-generated |
+| System.ComponentModel;CollectionConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[2].Element;ReturnValue;taint;dfc-generated |
+| System.ComponentModel;CollectionConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[2];ReturnValue;taint;dfc-generated |
 | System.ComponentModel;CollectionConverter;GetProperties;(System.ComponentModel.ITypeDescriptorContext,System.Object,System.Attribute[]);Argument[1];ReturnValue;taint;df-generated |
 | System.ComponentModel;Component;ToString;();Argument[this];ReturnValue;taint;df-generated |
 | System.ComponentModel;Component;add_Disposed;(System.EventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.ComponentModel;Component;get_Container;();Argument[this];ReturnValue;taint;df-generated |
 | System.ComponentModel;Component;remove_Disposed;(System.EventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
-| System.ComponentModel;ComponentCollection;ComponentCollection;(System.ComponentModel.IComponent[]);Argument[0].Element;Argument[this];taint;df-generated |
+| System.ComponentModel;ComponentCollection;ComponentCollection;(System.ComponentModel.IComponent[]);Argument[0].Element;Argument[this].Property[System.Collections.ReadOnlyCollectionBase.InnerList].Element;value;dfc-generated |
 | System.ComponentModel;ComponentCollection;CopyTo;(System.ComponentModel.IComponent[],System.Int32);Argument[this].Element;Argument[0].Element;value;manual |
-| System.ComponentModel;ComponentCollection;get_Item;(System.Int32);Argument[this];ReturnValue;taint;df-generated |
-| System.ComponentModel;ComponentCollection;get_Item;(System.String);Argument[this];ReturnValue;taint;df-generated |
+| System.ComponentModel;ComponentCollection;get_Item;(System.Int32);Argument[this].Property[System.Collections.ReadOnlyCollectionBase.InnerList].Element;ReturnValue;value;dfc-generated |
+| System.ComponentModel;ComponentCollection;get_Item;(System.String);Argument[this].Property[System.Collections.ReadOnlyCollectionBase.InnerList].Element;ReturnValue;value;dfc-generated |
 | System.ComponentModel;ComponentConverter;GetProperties;(System.ComponentModel.ITypeDescriptorContext,System.Object,System.Attribute[]);Argument[1];ReturnValue;taint;df-generated |
 | System.ComponentModel;Container;Add;(System.ComponentModel.IComponent);Argument[this];Argument[0];taint;df-generated |
 | System.ComponentModel;Container;Add;(System.ComponentModel.IComponent,System.String);Argument[1];Argument[0];taint;df-generated |
 | System.ComponentModel;Container;Add;(System.ComponentModel.IComponent,System.String);Argument[this];Argument[0];taint;df-generated |
-| System.ComponentModel;Container;CreateSite;(System.ComponentModel.IComponent,System.String);Argument[0];ReturnValue;taint;df-generated |
-| System.ComponentModel;Container;CreateSite;(System.ComponentModel.IComponent,System.String);Argument[1];ReturnValue;taint;df-generated |
-| System.ComponentModel;Container;CreateSite;(System.ComponentModel.IComponent,System.String);Argument[this];ReturnValue;taint;df-generated |
-| System.ComponentModel;Container;GetService;(System.Type);Argument[this];ReturnValue;taint;df-generated |
-| System.ComponentModel;Container;GetService;(System.Type);Argument[this];ReturnValue;value;df-generated |
+| System.ComponentModel;Container;CreateSite;(System.ComponentModel.IComponent,System.String);Argument[this];ReturnValue.SyntheticField[System.ComponentModel.Container+Site.Container];value;dfc-generated |
+| System.ComponentModel;Container;GetService;(System.Type);Argument[this];ReturnValue;value;dfc-generated |
 | System.ComponentModel;Container;get_Components;();Argument[this];ReturnValue;taint;df-generated |
-| System.ComponentModel;ContainerFilterService;FilterComponents;(System.ComponentModel.ComponentCollection);Argument[0].Element;ReturnValue;taint;df-generated |
-| System.ComponentModel;CultureInfoConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[0];ReturnValue;taint;df-generated |
-| System.ComponentModel;CultureInfoConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue;taint;df-generated |
-| System.ComponentModel;CultureInfoConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[this];ReturnValue;taint;df-generated |
-| System.ComponentModel;CultureInfoConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[1];ReturnValue;taint;df-generated |
-| System.ComponentModel;CultureInfoConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[2];ReturnValue;taint;df-generated |
-| System.ComponentModel;CultureInfoConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[this];ReturnValue;taint;df-generated |
-| System.ComponentModel;CultureInfoConverter;GetCultureName;(System.Globalization.CultureInfo);Argument[0];ReturnValue;taint;df-generated |
-| System.ComponentModel;CultureInfoConverter;GetStandardValues;(System.ComponentModel.ITypeDescriptorContext);Argument[0];ReturnValue;taint;df-generated |
+| System.ComponentModel;ContainerFilterService;FilterComponents;(System.ComponentModel.ComponentCollection);Argument[0];ReturnValue;value;dfc-generated |
+| System.ComponentModel;CultureInfoConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue.Element;taint;dfc-generated |
+| System.ComponentModel;CultureInfoConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue;taint;dfc-generated |
+| System.ComponentModel;CultureInfoConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue;value;dfc-generated |
+| System.ComponentModel;CultureInfoConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[2].Element;ReturnValue;taint;dfc-generated |
+| System.ComponentModel;CultureInfoConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[2];ReturnValue;taint;dfc-generated |
+| System.ComponentModel;CultureInfoConverter;GetCultureName;(System.Globalization.CultureInfo);Argument[0].Property[System.Globalization.CultureInfo.Name];ReturnValue;value;dfc-generated |
 | System.ComponentModel;CultureInfoConverter;GetStandardValues;(System.ComponentModel.ITypeDescriptorContext);Argument[this];ReturnValue;taint;df-generated |
 | System.ComponentModel;CustomTypeDescriptor;CustomTypeDescriptor;(System.ComponentModel.ICustomTypeDescriptor);Argument[0];Argument[this];taint;df-generated |
-| System.ComponentModel;CustomTypeDescriptor;GetAttributes;();Argument[this];ReturnValue;taint;df-generated |
 | System.ComponentModel;CustomTypeDescriptor;GetProperties;();Argument[this];ReturnValue;taint;df-generated |
 | System.ComponentModel;CustomTypeDescriptor;GetProperties;(System.Attribute[]);Argument[this];ReturnValue;taint;df-generated |
-| System.ComponentModel;CustomTypeDescriptor;GetPropertyOwner;(System.ComponentModel.PropertyDescriptor);Argument[this];ReturnValue;taint;df-generated |
-| System.ComponentModel;CustomTypeDescriptor;GetPropertyOwner;(System.ComponentModel.PropertyDescriptor);Argument[this];ReturnValue;value;df-generated |
-| System.ComponentModel;DateOnlyConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[0];ReturnValue;taint;df-generated |
-| System.ComponentModel;DateOnlyConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue;taint;df-generated |
-| System.ComponentModel;DateOnlyConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[this];ReturnValue;taint;df-generated |
-| System.ComponentModel;DateOnlyConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[1];ReturnValue;taint;df-generated |
-| System.ComponentModel;DateOnlyConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[2];ReturnValue;taint;df-generated |
-| System.ComponentModel;DateOnlyConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[this];ReturnValue;taint;df-generated |
-| System.ComponentModel;DateTimeConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[0];ReturnValue;taint;df-generated |
-| System.ComponentModel;DateTimeConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue;taint;df-generated |
-| System.ComponentModel;DateTimeConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[this];ReturnValue;taint;df-generated |
-| System.ComponentModel;DateTimeConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[1];ReturnValue;taint;df-generated |
-| System.ComponentModel;DateTimeConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[2];ReturnValue;taint;df-generated |
-| System.ComponentModel;DateTimeConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[this];ReturnValue;taint;df-generated |
-| System.ComponentModel;DateTimeOffsetConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[0];ReturnValue;taint;df-generated |
-| System.ComponentModel;DateTimeOffsetConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue;taint;df-generated |
-| System.ComponentModel;DateTimeOffsetConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[this];ReturnValue;taint;df-generated |
-| System.ComponentModel;DateTimeOffsetConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[1];ReturnValue;taint;df-generated |
-| System.ComponentModel;DateTimeOffsetConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[2];ReturnValue;taint;df-generated |
-| System.ComponentModel;DateTimeOffsetConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[this];ReturnValue;taint;df-generated |
-| System.ComponentModel;DecimalConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[1];ReturnValue;taint;df-generated |
-| System.ComponentModel;DecimalConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[2];ReturnValue;taint;df-generated |
-| System.ComponentModel;DecimalConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[this];ReturnValue;taint;df-generated |
-| System.ComponentModel;DefaultValueAttribute;DefaultValueAttribute;(System.Object);Argument[0];Argument[this];taint;df-generated |
-| System.ComponentModel;DefaultValueAttribute;DefaultValueAttribute;(System.String);Argument[0];Argument[this];taint;df-generated |
-| System.ComponentModel;DefaultValueAttribute;DefaultValueAttribute;(System.Type,System.String);Argument[1];Argument[this];taint;df-generated |
-| System.ComponentModel;DefaultValueAttribute;SetValue;(System.Object);Argument[0];Argument[this];taint;df-generated |
-| System.ComponentModel;DefaultValueAttribute;get_Value;();Argument[this];ReturnValue;taint;df-generated |
-| System.ComponentModel;DescriptionAttribute;get_Description;();Argument[this];ReturnValue;taint;df-generated |
+| System.ComponentModel;CustomTypeDescriptor;GetPropertyOwner;(System.ComponentModel.PropertyDescriptor);Argument[this];ReturnValue;value;dfc-generated |
+| System.ComponentModel;DateOnlyConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue.Element;taint;dfc-generated |
+| System.ComponentModel;DateOnlyConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue;taint;dfc-generated |
+| System.ComponentModel;DateOnlyConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue;value;dfc-generated |
+| System.ComponentModel;DateOnlyConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[2].Element;ReturnValue;taint;dfc-generated |
+| System.ComponentModel;DateOnlyConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[2];ReturnValue;taint;dfc-generated |
+| System.ComponentModel;DateTimeConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue.Element;taint;dfc-generated |
+| System.ComponentModel;DateTimeConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue;taint;dfc-generated |
+| System.ComponentModel;DateTimeConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue;value;dfc-generated |
+| System.ComponentModel;DateTimeConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[2].Element;ReturnValue;taint;dfc-generated |
+| System.ComponentModel;DateTimeConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[2];ReturnValue;taint;dfc-generated |
+| System.ComponentModel;DateTimeOffsetConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue.Element;taint;dfc-generated |
+| System.ComponentModel;DateTimeOffsetConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue;taint;dfc-generated |
+| System.ComponentModel;DateTimeOffsetConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue;value;dfc-generated |
+| System.ComponentModel;DateTimeOffsetConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[2].Element;ReturnValue;taint;dfc-generated |
+| System.ComponentModel;DateTimeOffsetConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[2];ReturnValue;taint;dfc-generated |
+| System.ComponentModel;DecimalConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[2].Element;ReturnValue;taint;dfc-generated |
+| System.ComponentModel;DecimalConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[2];ReturnValue;taint;dfc-generated |
+| System.ComponentModel;DefaultValueAttribute;DefaultValueAttribute;(System.Object);Argument[0];Argument[this].SyntheticField[System.ComponentModel.DefaultValueAttribute._value];value;dfc-generated |
+| System.ComponentModel;DefaultValueAttribute;DefaultValueAttribute;(System.String);Argument[0];Argument[this].SyntheticField[System.ComponentModel.DefaultValueAttribute._value];value;dfc-generated |
+| System.ComponentModel;DefaultValueAttribute;DefaultValueAttribute;(System.Type,System.String);Argument[1];Argument[this].SyntheticField[System.ComponentModel.DefaultValueAttribute._value];value;dfc-generated |
+| System.ComponentModel;DefaultValueAttribute;SetValue;(System.Object);Argument[0];Argument[this].SyntheticField[System.ComponentModel.DefaultValueAttribute._value];value;dfc-generated |
+| System.ComponentModel;DefaultValueAttribute;get_Value;();Argument[this].SyntheticField[System.ComponentModel.DefaultValueAttribute._value];ReturnValue;value;dfc-generated |
+| System.ComponentModel;DescriptionAttribute;DescriptionAttribute;(System.String);Argument[0];Argument[this].Property[System.ComponentModel.DescriptionAttribute.DescriptionValue];value;dfc-generated |
+| System.ComponentModel;DescriptionAttribute;get_Description;();Argument[this].Property[System.ComponentModel.DescriptionAttribute.DescriptionValue];ReturnValue;value;dfc-generated |
+| System.ComponentModel;DesignerAttribute;get_TypeId;();Argument[this].Property[System.ComponentModel.DesignerAttribute.DesignerBaseTypeName];Argument[this].SyntheticField[System.ComponentModel.DesignerAttribute._typeId];taint;df-generated |
+| System.ComponentModel;DesignerAttribute;get_TypeId;();Argument[this].Property[System.ComponentModel.DesignerAttribute.DesignerBaseTypeName];Argument[this].SyntheticField[System.ComponentModel.DesignerAttribute._typeId];taint;dfc-generated |
+| System.ComponentModel;DesignerAttribute;get_TypeId;();Argument[this].Property[System.ComponentModel.DesignerAttribute.DesignerBaseTypeName];ReturnValue;taint;df-generated |
+| System.ComponentModel;DesignerAttribute;get_TypeId;();Argument[this].Property[System.ComponentModel.DesignerAttribute.DesignerBaseTypeName];ReturnValue;taint;dfc-generated |
+| System.ComponentModel;DesignerAttribute;get_TypeId;();Argument[this].SyntheticField[System.ComponentModel.DesignerAttribute._typeId];ReturnValue;value;df-generated |
+| System.ComponentModel;DesignerAttribute;get_TypeId;();Argument[this].SyntheticField[System.ComponentModel.DesignerAttribute._typeId];ReturnValue;value;dfc-generated |
 | System.ComponentModel;DesignerAttribute;get_TypeId;();Argument[this];ReturnValue;taint;df-generated |
+| System.ComponentModel;DesignerAttribute;get_TypeId;();Argument[this];ReturnValue;taint;dfc-generated |
+| System.ComponentModel;DesignerCategoryAttribute;get_TypeId;();Argument[this].Property[System.ComponentModel.DesignerCategoryAttribute.Category];ReturnValue;taint;df-generated |
+| System.ComponentModel;DesignerCategoryAttribute;get_TypeId;();Argument[this].Property[System.ComponentModel.DesignerCategoryAttribute.Category];ReturnValue;taint;dfc-generated |
 | System.ComponentModel;DesignerCategoryAttribute;get_TypeId;();Argument[this];ReturnValue;taint;df-generated |
-| System.ComponentModel;DisplayNameAttribute;get_DisplayName;();Argument[this];ReturnValue;taint;df-generated |
+| System.ComponentModel;DesignerCategoryAttribute;get_TypeId;();Argument[this];ReturnValue;taint;dfc-generated |
+| System.ComponentModel;DisplayNameAttribute;get_DisplayName;();Argument[this].Property[System.ComponentModel.DisplayNameAttribute.DisplayNameValue];ReturnValue;value;dfc-generated |
 | System.ComponentModel;DoWorkEventHandler;BeginInvoke;(System.Object,System.ComponentModel.DoWorkEventArgs,System.AsyncCallback,System.Object);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
+| System.ComponentModel;EditorAttribute;get_TypeId;();Argument[this].Property[System.ComponentModel.EditorAttribute.EditorBaseTypeName];Argument[this].SyntheticField[System.ComponentModel.EditorAttribute._typeId];taint;df-generated |
+| System.ComponentModel;EditorAttribute;get_TypeId;();Argument[this].Property[System.ComponentModel.EditorAttribute.EditorBaseTypeName];Argument[this].SyntheticField[System.ComponentModel.EditorAttribute._typeId];taint;dfc-generated |
+| System.ComponentModel;EditorAttribute;get_TypeId;();Argument[this].Property[System.ComponentModel.EditorAttribute.EditorBaseTypeName];ReturnValue;taint;df-generated |
+| System.ComponentModel;EditorAttribute;get_TypeId;();Argument[this].Property[System.ComponentModel.EditorAttribute.EditorBaseTypeName];ReturnValue;taint;dfc-generated |
+| System.ComponentModel;EditorAttribute;get_TypeId;();Argument[this].SyntheticField[System.ComponentModel.EditorAttribute._typeId];ReturnValue;value;df-generated |
+| System.ComponentModel;EditorAttribute;get_TypeId;();Argument[this].SyntheticField[System.ComponentModel.EditorAttribute._typeId];ReturnValue;value;dfc-generated |
 | System.ComponentModel;EditorAttribute;get_TypeId;();Argument[this];ReturnValue;taint;df-generated |
-| System.ComponentModel;EnumConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[0];ReturnValue;taint;df-generated |
-| System.ComponentModel;EnumConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue;taint;df-generated |
-| System.ComponentModel;EnumConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[this];ReturnValue;taint;df-generated |
-| System.ComponentModel;EnumConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[1];ReturnValue;taint;df-generated |
-| System.ComponentModel;EnumConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[2];ReturnValue;taint;df-generated |
-| System.ComponentModel;EnumConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[this];ReturnValue;taint;df-generated |
-| System.ComponentModel;EnumConverter;GetStandardValues;(System.ComponentModel.ITypeDescriptorContext);Argument[0];ReturnValue;taint;df-generated |
+| System.ComponentModel;EditorAttribute;get_TypeId;();Argument[this];ReturnValue;taint;dfc-generated |
+| System.ComponentModel;EnumConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue.Element;taint;dfc-generated |
+| System.ComponentModel;EnumConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue;taint;dfc-generated |
+| System.ComponentModel;EnumConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue;value;dfc-generated |
+| System.ComponentModel;EnumConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[2].Element;ReturnValue;taint;dfc-generated |
+| System.ComponentModel;EnumConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[2];ReturnValue;taint;dfc-generated |
+| System.ComponentModel;EnumConverter;GetStandardValues;(System.ComponentModel.ITypeDescriptorContext);Argument[this].Property[System.ComponentModel.EnumConverter.Values];ReturnValue;value;df-generated |
+| System.ComponentModel;EnumConverter;GetStandardValues;(System.ComponentModel.ITypeDescriptorContext);Argument[this].Property[System.ComponentModel.EnumConverter.Values];ReturnValue;value;dfc-generated |
 | System.ComponentModel;EnumConverter;GetStandardValues;(System.ComponentModel.ITypeDescriptorContext);Argument[this];ReturnValue;taint;df-generated |
+| System.ComponentModel;EnumConverter;GetStandardValues;(System.ComponentModel.ITypeDescriptorContext);Argument[this];ReturnValue;taint;dfc-generated |
 | System.ComponentModel;EventDescriptorCollection;Add;(System.ComponentModel.EventDescriptor);Argument[0];Argument[this].Element;value;manual |
 | System.ComponentModel;EventDescriptorCollection;Add;(System.Object);Argument[0];Argument[this].Element;value;manual |
 | System.ComponentModel;EventDescriptorCollection;Clear;();Argument[this].WithoutElement;Argument[this];value;manual |
@@ -7543,8 +8179,6 @@ summary
 | System.ComponentModel;EventDescriptorCollection;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.IEnumerator.Current];value;manual |
 | System.ComponentModel;EventDescriptorCollection;Insert;(System.Int32,System.ComponentModel.EventDescriptor);Argument[1];Argument[this].Element;value;manual |
 | System.ComponentModel;EventDescriptorCollection;Insert;(System.Int32,System.Object);Argument[1];Argument[this].Element;value;manual |
-| System.ComponentModel;EventDescriptorCollection;Remove;(System.Object);Argument[0];Argument[this];taint;df-generated |
-| System.ComponentModel;EventDescriptorCollection;Remove;(System.Object);Argument[this];Argument[0];taint;df-generated |
 | System.ComponentModel;EventDescriptorCollection;Sort;();Argument[this];ReturnValue;taint;df-generated |
 | System.ComponentModel;EventDescriptorCollection;Sort;(System.Collections.IComparer);Argument[0];ReturnValue;taint;df-generated |
 | System.ComponentModel;EventDescriptorCollection;Sort;(System.Collections.IComparer);Argument[this];ReturnValue;taint;df-generated |
@@ -7555,28 +8189,22 @@ summary
 | System.ComponentModel;EventDescriptorCollection;Sort;(System.String[],System.Collections.IComparer);Argument[this];ReturnValue;taint;df-generated |
 | System.ComponentModel;EventDescriptorCollection;get_Item;(System.Int32);Argument[this].Element;ReturnValue;value;manual |
 | System.ComponentModel;EventDescriptorCollection;get_Item;(System.String);Argument[this].Element;ReturnValue;value;manual |
-| System.ComponentModel;EventDescriptorCollection;get_SyncRoot;();Argument[this];ReturnValue;taint;df-generated |
-| System.ComponentModel;EventDescriptorCollection;get_SyncRoot;();Argument[this];ReturnValue;value;df-generated |
+| System.ComponentModel;EventDescriptorCollection;get_SyncRoot;();Argument[this];ReturnValue;value;dfc-generated |
 | System.ComponentModel;EventDescriptorCollection;set_Item;(System.Int32,System.Object);Argument[1];Argument[this].Element;value;manual |
-| System.ComponentModel;EventHandlerList;AddHandler;(System.Object,System.Delegate);Argument[0];Argument[this];taint;df-generated |
-| System.ComponentModel;EventHandlerList;AddHandler;(System.Object,System.Delegate);Argument[1];Argument[this];taint;df-generated |
-| System.ComponentModel;EventHandlerList;AddHandlers;(System.ComponentModel.EventHandlerList);Argument[0];Argument[this];taint;df-generated |
-| System.ComponentModel;EventHandlerList;get_Item;(System.Object);Argument[this];ReturnValue;taint;df-generated |
-| System.ComponentModel;EventHandlerList;set_Item;(System.Object,System.Delegate);Argument[0];Argument[this];taint;df-generated |
-| System.ComponentModel;EventHandlerList;set_Item;(System.Object,System.Delegate);Argument[1];Argument[this];taint;df-generated |
+| System.ComponentModel;EventHandlerList;AddHandler;(System.Object,System.Delegate);Argument[1];Argument[this].SyntheticField[System.ComponentModel.EventHandlerList._head].SyntheticField[System.ComponentModel.EventHandlerList+ListEntry._handler];value;dfc-generated |
+| System.ComponentModel;EventHandlerList;AddHandlers;(System.ComponentModel.EventHandlerList);Argument[0].SyntheticField[System.ComponentModel.EventHandlerList._head].SyntheticField[System.ComponentModel.EventHandlerList+ListEntry._handler];Argument[this].SyntheticField[System.ComponentModel.EventHandlerList._head].SyntheticField[System.ComponentModel.EventHandlerList+ListEntry._handler];value;dfc-generated |
+| System.ComponentModel;EventHandlerList;get_Item;(System.Object);Argument[this].SyntheticField[System.ComponentModel.EventHandlerList._head].SyntheticField[System.ComponentModel.EventHandlerList+ListEntry._handler];ReturnValue;value;dfc-generated |
+| System.ComponentModel;EventHandlerList;set_Item;(System.Object,System.Delegate);Argument[1];Argument[this].SyntheticField[System.ComponentModel.EventHandlerList._head].SyntheticField[System.ComponentModel.EventHandlerList+ListEntry._handler];value;dfc-generated |
 | System.ComponentModel;ExpandableObjectConverter;GetProperties;(System.ComponentModel.ITypeDescriptorContext,System.Object,System.Attribute[]);Argument[1];ReturnValue;taint;df-generated |
-| System.ComponentModel;GuidConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[0];ReturnValue;taint;df-generated |
-| System.ComponentModel;GuidConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue;taint;df-generated |
-| System.ComponentModel;GuidConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[this];ReturnValue;taint;df-generated |
-| System.ComponentModel;GuidConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[1];ReturnValue;taint;df-generated |
-| System.ComponentModel;GuidConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[2];ReturnValue;taint;df-generated |
-| System.ComponentModel;GuidConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[this];ReturnValue;taint;df-generated |
+| System.ComponentModel;GuidConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue.Element;taint;dfc-generated |
+| System.ComponentModel;GuidConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue;taint;dfc-generated |
+| System.ComponentModel;GuidConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue;value;dfc-generated |
+| System.ComponentModel;GuidConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[2].Element;ReturnValue;taint;dfc-generated |
+| System.ComponentModel;GuidConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[2];ReturnValue;taint;dfc-generated |
 | System.ComponentModel;HandledEventHandler;BeginInvoke;(System.Object,System.ComponentModel.HandledEventArgs,System.AsyncCallback,System.Object);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
-| System.ComponentModel;IBindingList;AddNew;();Argument[this];ReturnValue;taint;df-generated |
 | System.ComponentModel;IBindingList;ApplySort;(System.ComponentModel.PropertyDescriptor,System.ComponentModel.ListSortDirection);Argument[0];Argument[this];taint;df-generated |
 | System.ComponentModel;IBindingList;Find;(System.ComponentModel.PropertyDescriptor,System.Object);Argument[this].Element;ReturnValue;value;manual |
 | System.ComponentModel;IBindingList;add_ListChanged;(System.ComponentModel.ListChangedEventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
-| System.ComponentModel;IBindingList;get_SortProperty;();Argument[this];ReturnValue;taint;df-generated |
 | System.ComponentModel;IBindingList;remove_ListChanged;(System.ComponentModel.ListChangedEventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.ComponentModel;IBindingListView;ApplySort;(System.ComponentModel.ListSortDescriptionCollection);Argument[0].Element;Argument[this];taint;df-generated |
 | System.ComponentModel;IComponent;add_Disposed;(System.EventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
@@ -7585,12 +8213,9 @@ summary
 | System.ComponentModel;IContainer;Add;(System.ComponentModel.IComponent,System.String);Argument[1];Argument[0];taint;df-generated |
 | System.ComponentModel;IContainer;Add;(System.ComponentModel.IComponent,System.String);Argument[this];Argument[0];taint;df-generated |
 | System.ComponentModel;IContainer;get_Components;();Argument[this];ReturnValue;taint;df-generated |
-| System.ComponentModel;ICustomTypeDescriptor;GetAttributes;();Argument[this];ReturnValue;taint;df-generated |
 | System.ComponentModel;ICustomTypeDescriptor;GetProperties;();Argument[this];ReturnValue;taint;df-generated |
 | System.ComponentModel;ICustomTypeDescriptor;GetProperties;(System.Attribute[]);Argument[this];ReturnValue;taint;df-generated |
-| System.ComponentModel;ICustomTypeDescriptor;GetPropertyOwner;(System.ComponentModel.PropertyDescriptor);Argument[this];ReturnValue;taint;df-generated |
-| System.ComponentModel;ICustomTypeDescriptor;GetPropertyOwner;(System.ComponentModel.PropertyDescriptor);Argument[this];ReturnValue;value;df-generated |
-| System.ComponentModel;IDataErrorInfo;get_Error;();Argument[this];ReturnValue;taint;df-generated |
+| System.ComponentModel;ICustomTypeDescriptor;GetPropertyOwner;(System.ComponentModel.PropertyDescriptor);Argument[this];ReturnValue;value;dfc-generated |
 | System.ComponentModel;IListSource;GetList;();Argument[this];ReturnValue;taint;df-generated |
 | System.ComponentModel;INestedSite;get_FullName;();Argument[this];ReturnValue;taint;df-generated |
 | System.ComponentModel;INotifyDataErrorInfo;add_ErrorsChanged;(System.EventHandler<System.ComponentModel.DataErrorsChangedEventArgs>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
@@ -7609,15 +8234,18 @@ summary
 | System.ComponentModel;LicFileLicenseProvider;GetLicense;(System.ComponentModel.LicenseContext,System.Type,System.Object,System.Boolean);Argument[0];ReturnValue;taint;df-generated |
 | System.ComponentModel;LicFileLicenseProvider;GetLicense;(System.ComponentModel.LicenseContext,System.Type,System.Object,System.Boolean);Argument[this];ReturnValue;taint;df-generated |
 | System.ComponentModel;LicenseContext;GetSavedLicenseKey;(System.Type,System.Reflection.Assembly);Argument[this];ReturnValue;taint;df-generated |
-| System.ComponentModel;LicenseContext;GetService;(System.Type);Argument[this];ReturnValue;taint;df-generated |
+| System.ComponentModel;LicenseContext;GetService;(System.Type);Argument[this];ReturnValue;value;dfc-generated |
 | System.ComponentModel;LicenseContext;SetSavedLicenseKey;(System.Type,System.String);Argument[1];Argument[this];taint;df-generated |
 | System.ComponentModel;LicenseException;GetObjectData;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);Argument[this];Argument[0];taint;df-generated |
 | System.ComponentModel;LicenseException;LicenseException;(System.Type,System.Object,System.String);Argument[1];Argument[this];taint;df-generated |
 | System.ComponentModel;LicenseException;LicenseException;(System.Type,System.Object,System.String,System.Exception);Argument[1];Argument[this];taint;df-generated |
 | System.ComponentModel;LicenseProvider;GetLicense;(System.ComponentModel.LicenseContext,System.Type,System.Object,System.Boolean);Argument[0];ReturnValue;taint;df-generated |
 | System.ComponentModel;LicenseProvider;GetLicense;(System.ComponentModel.LicenseContext,System.Type,System.Object,System.Boolean);Argument[this];ReturnValue;taint;df-generated |
-| System.ComponentModel;LicenseProviderAttribute;LicenseProviderAttribute;(System.String);Argument[0];Argument[this];taint;df-generated |
+| System.ComponentModel;LicenseProviderAttribute;LicenseProviderAttribute;(System.String);Argument[0];Argument[this].SyntheticField[System.ComponentModel.LicenseProviderAttribute._licenseProviderName];value;dfc-generated |
+| System.ComponentModel;LicenseProviderAttribute;get_TypeId;();Argument[this].SyntheticField[System.ComponentModel.LicenseProviderAttribute._licenseProviderName];ReturnValue;taint;df-generated |
+| System.ComponentModel;LicenseProviderAttribute;get_TypeId;();Argument[this].SyntheticField[System.ComponentModel.LicenseProviderAttribute._licenseProviderName];ReturnValue;taint;dfc-generated |
 | System.ComponentModel;LicenseProviderAttribute;get_TypeId;();Argument[this];ReturnValue;taint;df-generated |
+| System.ComponentModel;LicenseProviderAttribute;get_TypeId;();Argument[this];ReturnValue;taint;dfc-generated |
 | System.ComponentModel;ListChangedEventHandler;BeginInvoke;(System.Object,System.ComponentModel.ListChangedEventArgs,System.AsyncCallback,System.Object);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
 | System.ComponentModel;ListSortDescriptionCollection;Add;(System.Object);Argument[0];Argument[this].Element;value;manual |
 | System.ComponentModel;ListSortDescriptionCollection;Clear;();Argument[this].WithoutElement;Argument[this];value;manual |
@@ -7625,20 +8253,16 @@ summary
 | System.ComponentModel;ListSortDescriptionCollection;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.IEnumerator.Current];value;manual |
 | System.ComponentModel;ListSortDescriptionCollection;Insert;(System.Int32,System.Object);Argument[1];Argument[this].Element;value;manual |
 | System.ComponentModel;ListSortDescriptionCollection;ListSortDescriptionCollection;(System.ComponentModel.ListSortDescription[]);Argument[0].Element;Argument[this];taint;df-generated |
-| System.ComponentModel;ListSortDescriptionCollection;Remove;(System.Object);Argument[0];Argument[this];taint;df-generated |
-| System.ComponentModel;ListSortDescriptionCollection;Remove;(System.Object);Argument[this];Argument[0];taint;df-generated |
 | System.ComponentModel;ListSortDescriptionCollection;get_Item;(System.Int32);Argument[this].Element;ReturnValue;value;manual |
-| System.ComponentModel;ListSortDescriptionCollection;get_SyncRoot;();Argument[this];ReturnValue;taint;df-generated |
-| System.ComponentModel;ListSortDescriptionCollection;get_SyncRoot;();Argument[this];ReturnValue;value;df-generated |
+| System.ComponentModel;ListSortDescriptionCollection;get_SyncRoot;();Argument[this];ReturnValue;value;dfc-generated |
 | System.ComponentModel;ListSortDescriptionCollection;set_Item;(System.Int32,System.ComponentModel.ListSortDescription);Argument[1];Argument[this].Element;value;manual |
 | System.ComponentModel;ListSortDescriptionCollection;set_Item;(System.Int32,System.Object);Argument[1];Argument[this].Element;value;manual |
-| System.ComponentModel;MarshalByValueComponent;GetService;(System.Type);Argument[this];ReturnValue;taint;df-generated |
+| System.ComponentModel;MarshalByValueComponent;GetService;(System.Type);Argument[this];ReturnValue;value;dfc-generated |
 | System.ComponentModel;MarshalByValueComponent;ToString;();Argument[this];ReturnValue;taint;df-generated |
 | System.ComponentModel;MarshalByValueComponent;add_Disposed;(System.EventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.ComponentModel;MarshalByValueComponent;get_Container;();Argument[this];ReturnValue;taint;df-generated |
 | System.ComponentModel;MarshalByValueComponent;remove_Disposed;(System.EventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
-| System.ComponentModel;MaskedTextProvider;Clone;();Argument[this];ReturnValue;taint;df-generated |
-| System.ComponentModel;MaskedTextProvider;Clone;();Argument[this];ReturnValue;value;df-generated |
+| System.ComponentModel;MaskedTextProvider;Clone;();Argument[this];ReturnValue;value;dfc-generated |
 | System.ComponentModel;MaskedTextProvider;ToDisplayString;();Argument[this];ReturnValue;taint;df-generated |
 | System.ComponentModel;MaskedTextProvider;ToString;();Argument[this];ReturnValue;taint;df-generated |
 | System.ComponentModel;MaskedTextProvider;ToString;(System.Boolean);Argument[this];ReturnValue;taint;df-generated |
@@ -7647,54 +8271,49 @@ summary
 | System.ComponentModel;MaskedTextProvider;ToString;(System.Boolean,System.Boolean,System.Int32,System.Int32);Argument[this];ReturnValue;taint;df-generated |
 | System.ComponentModel;MaskedTextProvider;ToString;(System.Boolean,System.Int32,System.Int32);Argument[this];ReturnValue;taint;df-generated |
 | System.ComponentModel;MaskedTextProvider;ToString;(System.Int32,System.Int32);Argument[this];ReturnValue;taint;df-generated |
-| System.ComponentModel;MemberDescriptor;CreateAttributeCollection;();Argument[this];ReturnValue;taint;df-generated |
 | System.ComponentModel;MemberDescriptor;FillAttributes;(System.Collections.IList);Argument[this];Argument[0].Element;taint;df-generated |
-| System.ComponentModel;MemberDescriptor;GetInvocationTarget;(System.Type,System.Object);Argument[1];ReturnValue;taint;df-generated |
-| System.ComponentModel;MemberDescriptor;GetInvokee;(System.Type,System.Object);Argument[1];ReturnValue;taint;df-generated |
-| System.ComponentModel;MemberDescriptor;GetSite;(System.Object);Argument[0];ReturnValue;taint;df-generated |
-| System.ComponentModel;MemberDescriptor;MemberDescriptor;(System.ComponentModel.MemberDescriptor);Argument[0];Argument[this];taint;df-generated |
+| System.ComponentModel;MemberDescriptor;GetInvocationTarget;(System.Type,System.Object);Argument[1];ReturnValue;value;dfc-generated |
+| System.ComponentModel;MemberDescriptor;GetInvokee;(System.Type,System.Object);Argument[1];ReturnValue;value;dfc-generated |
+| System.ComponentModel;MemberDescriptor;GetSite;(System.Object);Argument[0].Property[System.ComponentModel.Component.Site];ReturnValue;value;dfc-generated |
+| System.ComponentModel;MemberDescriptor;GetSite;(System.Object);Argument[0].Property[System.ComponentModel.IComponent.Site];ReturnValue;value;dfc-generated |
+| System.ComponentModel;MemberDescriptor;MemberDescriptor;(System.ComponentModel.MemberDescriptor);Argument[this].SyntheticField[System.ComponentModel.MemberDescriptor._name];Argument[this].SyntheticField[System.ComponentModel.MemberDescriptor._displayName];value;dfc-generated |
 | System.ComponentModel;MemberDescriptor;MemberDescriptor;(System.ComponentModel.MemberDescriptor,System.Attribute[]);Argument[0];Argument[this];taint;df-generated |
 | System.ComponentModel;MemberDescriptor;MemberDescriptor;(System.ComponentModel.MemberDescriptor,System.Attribute[]);Argument[1].Element;Argument[this];taint;df-generated |
-| System.ComponentModel;MemberDescriptor;MemberDescriptor;(System.String,System.Attribute[]);Argument[0];Argument[this];taint;df-generated |
-| System.ComponentModel;MemberDescriptor;MemberDescriptor;(System.String,System.Attribute[]);Argument[1].Element;Argument[this];taint;df-generated |
+| System.ComponentModel;MemberDescriptor;MemberDescriptor;(System.String,System.Attribute[]);Argument[0];Argument[this].SyntheticField[System.ComponentModel.MemberDescriptor._displayName];value;dfc-generated |
+| System.ComponentModel;MemberDescriptor;MemberDescriptor;(System.String,System.Attribute[]);Argument[0];Argument[this].SyntheticField[System.ComponentModel.MemberDescriptor._name];value;dfc-generated |
 | System.ComponentModel;MemberDescriptor;get_Attributes;();Argument[this];ReturnValue;taint;df-generated |
-| System.ComponentModel;MemberDescriptor;get_DisplayName;();Argument[this];ReturnValue;taint;df-generated |
-| System.ComponentModel;MemberDescriptor;get_Name;();Argument[this];ReturnValue;taint;df-generated |
-| System.ComponentModel;MultilineStringConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[1];ReturnValue;taint;df-generated |
-| System.ComponentModel;MultilineStringConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[2];ReturnValue;taint;df-generated |
-| System.ComponentModel;MultilineStringConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[this];ReturnValue;taint;df-generated |
+| System.ComponentModel;MemberDescriptor;get_DisplayName;();Argument[this].SyntheticField[System.ComponentModel.MemberDescriptor._displayName];ReturnValue;value;dfc-generated |
+| System.ComponentModel;MemberDescriptor;get_Name;();Argument[this].SyntheticField[System.ComponentModel.MemberDescriptor._name];ReturnValue;value;dfc-generated |
+| System.ComponentModel;MultilineStringConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[2].Element;ReturnValue;taint;dfc-generated |
+| System.ComponentModel;MultilineStringConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[2];ReturnValue;taint;dfc-generated |
 | System.ComponentModel;MultilineStringConverter;GetProperties;(System.ComponentModel.ITypeDescriptorContext,System.Object,System.Attribute[]);Argument[1];ReturnValue;taint;df-generated |
-| System.ComponentModel;NestedContainer;CreateSite;(System.ComponentModel.IComponent,System.String);Argument[0];ReturnValue;taint;df-generated |
-| System.ComponentModel;NestedContainer;CreateSite;(System.ComponentModel.IComponent,System.String);Argument[1];ReturnValue;taint;df-generated |
-| System.ComponentModel;NestedContainer;CreateSite;(System.ComponentModel.IComponent,System.String);Argument[this];ReturnValue;taint;df-generated |
-| System.ComponentModel;NestedContainer;GetService;(System.Type);Argument[this];ReturnValue;taint;df-generated |
-| System.ComponentModel;NestedContainer;GetService;(System.Type);Argument[this];ReturnValue;value;df-generated |
-| System.ComponentModel;NullableConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[0];ReturnValue;taint;df-generated |
-| System.ComponentModel;NullableConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue;taint;df-generated |
-| System.ComponentModel;NullableConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[this];ReturnValue;taint;df-generated |
-| System.ComponentModel;NullableConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[1];ReturnValue;taint;df-generated |
-| System.ComponentModel;NullableConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[2];ReturnValue;taint;df-generated |
-| System.ComponentModel;NullableConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[this];ReturnValue;taint;df-generated |
+| System.ComponentModel;NestedContainer;CreateSite;(System.ComponentModel.IComponent,System.String);Argument[1];ReturnValue.SyntheticField[System.ComponentModel.NestedContainer+Site._name];value;dfc-generated |
+| System.ComponentModel;NestedContainer;CreateSite;(System.ComponentModel.IComponent,System.String);Argument[this];ReturnValue.SyntheticField[System.ComponentModel.Container+Site.Container];value;dfc-generated |
+| System.ComponentModel;NestedContainer;CreateSite;(System.ComponentModel.IComponent,System.String);Argument[this];ReturnValue.SyntheticField[System.ComponentModel.NestedContainer+Site.Container];value;dfc-generated |
+| System.ComponentModel;NestedContainer;GetService;(System.Type);Argument[this];ReturnValue;value;dfc-generated |
+| System.ComponentModel;NullableConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2].Property[System.Uri.OriginalString];ReturnValue;taint;dfc-generated |
+| System.ComponentModel;NullableConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue.Element;taint;dfc-generated |
+| System.ComponentModel;NullableConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue;taint;dfc-generated |
+| System.ComponentModel;NullableConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue;value;dfc-generated |
+| System.ComponentModel;NullableConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[1].Property[System.Globalization.CultureInfo.TextInfo].Property[System.Globalization.TextInfo.ListSeparator];ReturnValue;taint;dfc-generated |
+| System.ComponentModel;NullableConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[2].Element;ReturnValue;taint;dfc-generated |
+| System.ComponentModel;NullableConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[2];ReturnValue;taint;dfc-generated |
 | System.ComponentModel;NullableConverter;GetProperties;(System.ComponentModel.ITypeDescriptorContext,System.Object,System.Attribute[]);Argument[1];ReturnValue;taint;df-generated |
-| System.ComponentModel;NullableConverter;GetStandardValues;(System.ComponentModel.ITypeDescriptorContext);Argument[0];ReturnValue;taint;df-generated |
 | System.ComponentModel;NullableConverter;GetStandardValues;(System.ComponentModel.ITypeDescriptorContext);Argument[this];ReturnValue;taint;df-generated |
-| System.ComponentModel;ProgressChangedEventArgs;ProgressChangedEventArgs;(System.Int32,System.Object);Argument[1];Argument[this];taint;df-generated |
-| System.ComponentModel;ProgressChangedEventArgs;get_UserState;();Argument[this];ReturnValue;taint;df-generated |
+| System.ComponentModel;ProgressChangedEventArgs;ProgressChangedEventArgs;(System.Int32,System.Object);Argument[1];Argument[this].SyntheticField[System.ComponentModel.ProgressChangedEventArgs._userState];value;dfc-generated |
+| System.ComponentModel;ProgressChangedEventArgs;get_UserState;();Argument[this].SyntheticField[System.ComponentModel.ProgressChangedEventArgs._userState];ReturnValue;value;dfc-generated |
 | System.ComponentModel;ProgressChangedEventHandler;BeginInvoke;(System.Object,System.ComponentModel.ProgressChangedEventArgs,System.AsyncCallback,System.Object);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
 | System.ComponentModel;PropertyChangedEventHandler;BeginInvoke;(System.Object,System.ComponentModel.PropertyChangedEventArgs,System.AsyncCallback,System.Object);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
 | System.ComponentModel;PropertyChangingEventHandler;BeginInvoke;(System.Object,System.ComponentModel.PropertyChangingEventArgs,System.AsyncCallback,System.Object);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
 | System.ComponentModel;PropertyDescriptor;AddValueChanged;(System.Object,System.EventHandler);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
 | System.ComponentModel;PropertyDescriptor;FillAttributes;(System.Collections.IList);Argument[this];Argument[0].Element;taint;df-generated |
 | System.ComponentModel;PropertyDescriptor;GetEditor;(System.Type);Argument[this];ReturnValue;taint;df-generated |
-| System.ComponentModel;PropertyDescriptor;GetInvocationTarget;(System.Type,System.Object);Argument[1];ReturnValue;taint;df-generated |
-| System.ComponentModel;PropertyDescriptor;GetValue;(System.Object);Argument[0];Argument[this];taint;df-generated |
-| System.ComponentModel;PropertyDescriptor;GetValue;(System.Object);Argument[0];ReturnValue;taint;df-generated |
-| System.ComponentModel;PropertyDescriptor;GetValue;(System.Object);Argument[this];ReturnValue;taint;df-generated |
+| System.ComponentModel;PropertyDescriptor;GetInvocationTarget;(System.Type,System.Object);Argument[1];ReturnValue;value;dfc-generated |
+| System.ComponentModel;PropertyDescriptor;GetValue;(System.Object);Argument[0];ReturnValue;taint;dfc-generated |
 | System.ComponentModel;PropertyDescriptor;RemoveValueChanged;(System.Object,System.EventHandler);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
 | System.ComponentModel;PropertyDescriptor;ResetValue;(System.Object);Argument[this];Argument[0];taint;df-generated |
 | System.ComponentModel;PropertyDescriptor;SetValue;(System.Object,System.Object);Argument[0];Argument[this];taint;df-generated |
 | System.ComponentModel;PropertyDescriptor;SetValue;(System.Object,System.Object);Argument[1];Argument[0];taint;df-generated |
-| System.ComponentModel;PropertyDescriptor;SetValue;(System.Object,System.Object);Argument[1];Argument[this];taint;df-generated |
 | System.ComponentModel;PropertyDescriptor;SetValue;(System.Object,System.Object);Argument[this];Argument[0];taint;df-generated |
 | System.ComponentModel;PropertyDescriptor;get_Converter;();Argument[this];ReturnValue;taint;df-generated |
 | System.ComponentModel;PropertyDescriptorCollection;Add;(System.ComponentModel.PropertyDescriptor);Argument[0].Property[System.Collections.Generic.KeyValuePair`2.Key];Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Key];value;manual |
@@ -7715,8 +8334,6 @@ summary
 | System.ComponentModel;PropertyDescriptorCollection;PropertyDescriptorCollection;(System.ComponentModel.PropertyDescriptor[]);Argument[0].Element.Property[System.Collections.Generic.KeyValuePair`2.Value];Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Value];value;manual |
 | System.ComponentModel;PropertyDescriptorCollection;PropertyDescriptorCollection;(System.ComponentModel.PropertyDescriptor[],System.Boolean);Argument[0].Element.Property[System.Collections.Generic.KeyValuePair`2.Key];Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Key];value;manual |
 | System.ComponentModel;PropertyDescriptorCollection;PropertyDescriptorCollection;(System.ComponentModel.PropertyDescriptor[],System.Boolean);Argument[0].Element.Property[System.Collections.Generic.KeyValuePair`2.Value];Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Value];value;manual |
-| System.ComponentModel;PropertyDescriptorCollection;Remove;(System.Object);Argument[0];Argument[this];taint;df-generated |
-| System.ComponentModel;PropertyDescriptorCollection;Remove;(System.Object);Argument[this];Argument[0];taint;df-generated |
 | System.ComponentModel;PropertyDescriptorCollection;Sort;();Argument[this];ReturnValue;taint;df-generated |
 | System.ComponentModel;PropertyDescriptorCollection;Sort;(System.Collections.IComparer);Argument[0];ReturnValue;taint;df-generated |
 | System.ComponentModel;PropertyDescriptorCollection;Sort;(System.Collections.IComparer);Argument[this];ReturnValue;taint;df-generated |
@@ -7732,8 +8349,7 @@ summary
 | System.ComponentModel;PropertyDescriptorCollection;get_Item;(System.String);Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Value];ReturnValue;value;manual |
 | System.ComponentModel;PropertyDescriptorCollection;get_Item;(System.String);Argument[this].Element;ReturnValue;value;manual |
 | System.ComponentModel;PropertyDescriptorCollection;get_Keys;();Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Key];ReturnValue.Element;value;manual |
-| System.ComponentModel;PropertyDescriptorCollection;get_SyncRoot;();Argument[this];ReturnValue;taint;df-generated |
-| System.ComponentModel;PropertyDescriptorCollection;get_SyncRoot;();Argument[this];ReturnValue;value;df-generated |
+| System.ComponentModel;PropertyDescriptorCollection;get_SyncRoot;();Argument[this];ReturnValue;value;dfc-generated |
 | System.ComponentModel;PropertyDescriptorCollection;get_Values;();Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Value];ReturnValue.Element;value;manual |
 | System.ComponentModel;PropertyDescriptorCollection;set_Item;(System.Int32,System.Object);Argument[0];Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Key];value;manual |
 | System.ComponentModel;PropertyDescriptorCollection;set_Item;(System.Int32,System.Object);Argument[1];Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Value];value;manual |
@@ -7741,81 +8357,68 @@ summary
 | System.ComponentModel;PropertyDescriptorCollection;set_Item;(System.Object,System.Object);Argument[0];Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Key];value;manual |
 | System.ComponentModel;PropertyDescriptorCollection;set_Item;(System.Object,System.Object);Argument[1];Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Value];value;manual |
 | System.ComponentModel;PropertyDescriptorCollection;set_Item;(System.Object,System.Object);Argument[1];Argument[this].Element;value;manual |
-| System.ComponentModel;PropertyTabAttribute;InitializeArrays;(System.String[],System.ComponentModel.PropertyTabScope[]);Argument[0].Element;Argument[this];taint;df-generated |
-| System.ComponentModel;PropertyTabAttribute;InitializeArrays;(System.Type[],System.ComponentModel.PropertyTabScope[]);Argument[0].Element;Argument[this];taint;df-generated |
-| System.ComponentModel;PropertyTabAttribute;PropertyTabAttribute;(System.String,System.ComponentModel.PropertyTabScope);Argument[0];Argument[this];taint;df-generated |
-| System.ComponentModel;PropertyTabAttribute;get_TabClassNames;();Argument[this];ReturnValue;taint;df-generated |
-| System.ComponentModel;PropertyTabAttribute;get_TabClasses;();Argument[this];ReturnValue;taint;df-generated |
+| System.ComponentModel;PropertyTabAttribute;InitializeArrays;(System.String[],System.ComponentModel.PropertyTabScope[]);Argument[0].Element;Argument[this].SyntheticField[System.ComponentModel.PropertyTabAttribute._tabClassNames].Element;value;dfc-generated |
+| System.ComponentModel;PropertyTabAttribute;InitializeArrays;(System.Type[],System.ComponentModel.PropertyTabScope[]);Argument[0].Element;Argument[this].SyntheticField[System.ComponentModel.PropertyTabAttribute._tabClasses].Element;value;dfc-generated |
+| System.ComponentModel;PropertyTabAttribute;PropertyTabAttribute;(System.String,System.ComponentModel.PropertyTabScope);Argument[0];Argument[this].SyntheticField[System.ComponentModel.PropertyTabAttribute._tabClassNames].Element;value;dfc-generated |
+| System.ComponentModel;PropertyTabAttribute;get_TabClassNames;();Argument[this].SyntheticField[System.ComponentModel.PropertyTabAttribute._tabClassNames].Element;ReturnValue.Element;value;dfc-generated |
+| System.ComponentModel;PropertyTabAttribute;get_TabClasses;();Argument[this].SyntheticField[System.ComponentModel.PropertyTabAttribute._tabClasses];ReturnValue;value;dfc-generated |
+| System.ComponentModel;ProvidePropertyAttribute;get_TypeId;();Argument[this].Property[System.ComponentModel.ProvidePropertyAttribute.PropertyName];ReturnValue;taint;df-generated |
+| System.ComponentModel;ProvidePropertyAttribute;get_TypeId;();Argument[this].Property[System.ComponentModel.ProvidePropertyAttribute.PropertyName];ReturnValue;taint;dfc-generated |
 | System.ComponentModel;ProvidePropertyAttribute;get_TypeId;();Argument[this];ReturnValue;taint;df-generated |
-| System.ComponentModel;ReferenceConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[0];ReturnValue;taint;df-generated |
-| System.ComponentModel;ReferenceConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue;taint;df-generated |
-| System.ComponentModel;ReferenceConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[this];ReturnValue;taint;df-generated |
-| System.ComponentModel;ReferenceConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[1];ReturnValue;taint;df-generated |
-| System.ComponentModel;ReferenceConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[2];ReturnValue;taint;df-generated |
-| System.ComponentModel;ReferenceConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[this];ReturnValue;taint;df-generated |
-| System.ComponentModel;ReferenceConverter;GetStandardValues;(System.ComponentModel.ITypeDescriptorContext);Argument[0];ReturnValue;taint;df-generated |
+| System.ComponentModel;ProvidePropertyAttribute;get_TypeId;();Argument[this];ReturnValue;taint;dfc-generated |
+| System.ComponentModel;ReferenceConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue.Element;taint;dfc-generated |
+| System.ComponentModel;ReferenceConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue;taint;dfc-generated |
+| System.ComponentModel;ReferenceConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue;value;dfc-generated |
+| System.ComponentModel;ReferenceConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[2].Element;ReturnValue;taint;dfc-generated |
+| System.ComponentModel;ReferenceConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[2];ReturnValue;taint;dfc-generated |
 | System.ComponentModel;ReferenceConverter;GetStandardValues;(System.ComponentModel.ITypeDescriptorContext);Argument[this];ReturnValue;taint;df-generated |
 | System.ComponentModel;RefreshEventHandler;BeginInvoke;(System.ComponentModel.RefreshEventArgs,System.AsyncCallback,System.Object);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
-| System.ComponentModel;RunWorkerCompletedEventArgs;RunWorkerCompletedEventArgs;(System.Object,System.Exception,System.Boolean);Argument[0];Argument[this];taint;df-generated |
-| System.ComponentModel;RunWorkerCompletedEventArgs;get_Result;();Argument[this];ReturnValue;taint;df-generated |
-| System.ComponentModel;RunWorkerCompletedEventArgs;get_UserState;();Argument[this];ReturnValue;taint;df-generated |
+| System.ComponentModel;RunWorkerCompletedEventArgs;RunWorkerCompletedEventArgs;(System.Object,System.Exception,System.Boolean);Argument[0];Argument[this].SyntheticField[System.ComponentModel.RunWorkerCompletedEventArgs._result];value;dfc-generated |
+| System.ComponentModel;RunWorkerCompletedEventArgs;get_Result;();Argument[this].SyntheticField[System.ComponentModel.RunWorkerCompletedEventArgs._result];ReturnValue;value;dfc-generated |
+| System.ComponentModel;RunWorkerCompletedEventArgs;get_UserState;();Argument[this].Property[System.ComponentModel.AsyncCompletedEventArgs.UserState];ReturnValue;value;dfc-generated |
 | System.ComponentModel;RunWorkerCompletedEventHandler;BeginInvoke;(System.Object,System.ComponentModel.RunWorkerCompletedEventArgs,System.AsyncCallback,System.Object);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
-| System.ComponentModel;StringConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[0];ReturnValue;taint;df-generated |
-| System.ComponentModel;StringConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue;taint;df-generated |
-| System.ComponentModel;StringConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[this];ReturnValue;taint;df-generated |
-| System.ComponentModel;TimeOnlyConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[0];ReturnValue;taint;df-generated |
-| System.ComponentModel;TimeOnlyConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue;taint;df-generated |
-| System.ComponentModel;TimeOnlyConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[this];ReturnValue;taint;df-generated |
-| System.ComponentModel;TimeOnlyConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[1];ReturnValue;taint;df-generated |
-| System.ComponentModel;TimeOnlyConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[2];ReturnValue;taint;df-generated |
-| System.ComponentModel;TimeOnlyConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[this];ReturnValue;taint;df-generated |
-| System.ComponentModel;TimeSpanConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[0];ReturnValue;taint;df-generated |
-| System.ComponentModel;TimeSpanConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue;taint;df-generated |
-| System.ComponentModel;TimeSpanConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[this];ReturnValue;taint;df-generated |
-| System.ComponentModel;TimeSpanConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[1];ReturnValue;taint;df-generated |
-| System.ComponentModel;TimeSpanConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[2];ReturnValue;taint;df-generated |
-| System.ComponentModel;TimeSpanConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[this];ReturnValue;taint;df-generated |
-| System.ComponentModel;ToolboxItemAttribute;ToolboxItemAttribute;(System.String);Argument[0];Argument[this];taint;df-generated |
-| System.ComponentModel;ToolboxItemAttribute;get_ToolboxItemTypeName;();Argument[this];ReturnValue;taint;df-generated |
-| System.ComponentModel;ToolboxItemFilterAttribute;ToString;();Argument[this];ReturnValue;taint;df-generated |
+| System.ComponentModel;StringConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue.Element;taint;dfc-generated |
+| System.ComponentModel;StringConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue;taint;dfc-generated |
+| System.ComponentModel;StringConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue;value;dfc-generated |
+| System.ComponentModel;TimeOnlyConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue.Element;taint;dfc-generated |
+| System.ComponentModel;TimeOnlyConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue;taint;dfc-generated |
+| System.ComponentModel;TimeOnlyConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue;value;dfc-generated |
+| System.ComponentModel;TimeOnlyConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[2].Element;ReturnValue;taint;dfc-generated |
+| System.ComponentModel;TimeOnlyConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[2];ReturnValue;taint;dfc-generated |
+| System.ComponentModel;TimeSpanConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue.Element;taint;dfc-generated |
+| System.ComponentModel;TimeSpanConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue;taint;dfc-generated |
+| System.ComponentModel;TimeSpanConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue;value;dfc-generated |
+| System.ComponentModel;TimeSpanConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[2].Element;ReturnValue;taint;dfc-generated |
+| System.ComponentModel;TimeSpanConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[2];ReturnValue;taint;dfc-generated |
+| System.ComponentModel;ToolboxItemAttribute;ToolboxItemAttribute;(System.String);Argument[0];Argument[this].SyntheticField[System.ComponentModel.ToolboxItemAttribute._toolboxItemTypeName];value;dfc-generated |
+| System.ComponentModel;ToolboxItemAttribute;get_ToolboxItemTypeName;();Argument[this].SyntheticField[System.ComponentModel.ToolboxItemAttribute._toolboxItemTypeName];ReturnValue;value;dfc-generated |
+| System.ComponentModel;ToolboxItemFilterAttribute;ToString;();Argument[this].Property[System.ComponentModel.ToolboxItemFilterAttribute.FilterString];ReturnValue;taint;dfc-generated |
 | System.ComponentModel;ToolboxItemFilterAttribute;get_TypeId;();Argument[this];ReturnValue;taint;df-generated |
 | System.ComponentModel;TypeConverter+SimplePropertyDescriptor;ResetValue;(System.Object);Argument[this];Argument[0];taint;df-generated |
 | System.ComponentModel;TypeConverter+StandardValuesCollection;CopyTo;(System.Array,System.Int32);Argument[this].Element;Argument[0].Element;value;manual |
 | System.ComponentModel;TypeConverter+StandardValuesCollection;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.IEnumerator.Current];value;manual |
-| System.ComponentModel;TypeConverter+StandardValuesCollection;StandardValuesCollection;(System.Collections.ICollection);Argument[0].Element;Argument[this];taint;df-generated |
-| System.ComponentModel;TypeConverter+StandardValuesCollection;get_Item;(System.Int32);Argument[this];ReturnValue;taint;df-generated |
-| System.ComponentModel;TypeConverter+StandardValuesCollection;get_SyncRoot;();Argument[this];ReturnValue;taint;df-generated |
-| System.ComponentModel;TypeConverter+StandardValuesCollection;get_SyncRoot;();Argument[this];ReturnValue;value;df-generated |
-| System.ComponentModel;TypeConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[0];ReturnValue;taint;df-generated |
-| System.ComponentModel;TypeConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue;taint;df-generated |
-| System.ComponentModel;TypeConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[this];ReturnValue;taint;df-generated |
-| System.ComponentModel;TypeConverter;ConvertFrom;(System.Object);Argument[0];ReturnValue;taint;df-generated |
-| System.ComponentModel;TypeConverter;ConvertFrom;(System.Object);Argument[this];ReturnValue;taint;df-generated |
-| System.ComponentModel;TypeConverter;ConvertFromInvariantString;(System.ComponentModel.ITypeDescriptorContext,System.String);Argument[0];ReturnValue;taint;df-generated |
-| System.ComponentModel;TypeConverter;ConvertFromInvariantString;(System.ComponentModel.ITypeDescriptorContext,System.String);Argument[1];ReturnValue;taint;df-generated |
-| System.ComponentModel;TypeConverter;ConvertFromInvariantString;(System.ComponentModel.ITypeDescriptorContext,System.String);Argument[this];ReturnValue;taint;df-generated |
-| System.ComponentModel;TypeConverter;ConvertFromInvariantString;(System.String);Argument[0];ReturnValue;taint;df-generated |
-| System.ComponentModel;TypeConverter;ConvertFromInvariantString;(System.String);Argument[this];ReturnValue;taint;df-generated |
-| System.ComponentModel;TypeConverter;ConvertFromString;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.String);Argument[0];ReturnValue;taint;df-generated |
-| System.ComponentModel;TypeConverter;ConvertFromString;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.String);Argument[2];ReturnValue;taint;df-generated |
-| System.ComponentModel;TypeConverter;ConvertFromString;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.String);Argument[this];ReturnValue;taint;df-generated |
-| System.ComponentModel;TypeConverter;ConvertFromString;(System.ComponentModel.ITypeDescriptorContext,System.String);Argument[0];ReturnValue;taint;df-generated |
-| System.ComponentModel;TypeConverter;ConvertFromString;(System.ComponentModel.ITypeDescriptorContext,System.String);Argument[1];ReturnValue;taint;df-generated |
-| System.ComponentModel;TypeConverter;ConvertFromString;(System.ComponentModel.ITypeDescriptorContext,System.String);Argument[this];ReturnValue;taint;df-generated |
-| System.ComponentModel;TypeConverter;ConvertFromString;(System.String);Argument[0];ReturnValue;taint;df-generated |
-| System.ComponentModel;TypeConverter;ConvertFromString;(System.String);Argument[this];ReturnValue;taint;df-generated |
-| System.ComponentModel;TypeConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[1];ReturnValue;taint;df-generated |
-| System.ComponentModel;TypeConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[2];ReturnValue;taint;df-generated |
-| System.ComponentModel;TypeConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[this];ReturnValue;taint;df-generated |
+| System.ComponentModel;TypeConverter+StandardValuesCollection;StandardValuesCollection;(System.Collections.ICollection);Argument[0];Argument[this].SyntheticField[System.ComponentModel.TypeConverter+StandardValuesCollection._values];value;dfc-generated |
+| System.ComponentModel;TypeConverter+StandardValuesCollection;get_Item;(System.Int32);Argument[this].SyntheticField[System.ComponentModel.TypeConverter+StandardValuesCollection._values].Element;ReturnValue;value;dfc-generated |
+| System.ComponentModel;TypeConverter+StandardValuesCollection;get_SyncRoot;();Argument[this];ReturnValue;value;dfc-generated |
+| System.ComponentModel;TypeConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue.Element;taint;dfc-generated |
+| System.ComponentModel;TypeConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue;taint;dfc-generated |
+| System.ComponentModel;TypeConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue;value;dfc-generated |
+| System.ComponentModel;TypeConverter;ConvertFrom;(System.Object);Argument[0].Property[System.Uri.OriginalString];ReturnValue;taint;dfc-generated |
+| System.ComponentModel;TypeConverter;ConvertFrom;(System.Object);Argument[0];ReturnValue;value;dfc-generated |
+| System.ComponentModel;TypeConverter;ConvertFromInvariantString;(System.ComponentModel.ITypeDescriptorContext,System.String);Argument[1];ReturnValue;value;dfc-generated |
+| System.ComponentModel;TypeConverter;ConvertFromInvariantString;(System.String);Argument[0];ReturnValue;value;dfc-generated |
+| System.ComponentModel;TypeConverter;ConvertFromString;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.String);Argument[2];ReturnValue;value;dfc-generated |
+| System.ComponentModel;TypeConverter;ConvertFromString;(System.ComponentModel.ITypeDescriptorContext,System.String);Argument[1];ReturnValue;value;dfc-generated |
+| System.ComponentModel;TypeConverter;ConvertFromString;(System.String);Argument[0];ReturnValue;value;dfc-generated |
+| System.ComponentModel;TypeConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[2].Element;ReturnValue;taint;dfc-generated |
+| System.ComponentModel;TypeConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[2];ReturnValue;taint;dfc-generated |
 | System.ComponentModel;TypeConverter;ConvertTo;(System.Object,System.Type);Argument[0];ReturnValue;taint;df-generated |
 | System.ComponentModel;TypeConverter;ConvertTo;(System.Object,System.Type);Argument[this];ReturnValue;taint;df-generated |
 | System.ComponentModel;TypeConverter;ConvertToInvariantString;(System.ComponentModel.ITypeDescriptorContext,System.Object);Argument[1];ReturnValue;taint;df-generated |
 | System.ComponentModel;TypeConverter;ConvertToInvariantString;(System.ComponentModel.ITypeDescriptorContext,System.Object);Argument[this];ReturnValue;taint;df-generated |
 | System.ComponentModel;TypeConverter;ConvertToInvariantString;(System.Object);Argument[0];ReturnValue;taint;df-generated |
 | System.ComponentModel;TypeConverter;ConvertToInvariantString;(System.Object);Argument[this];ReturnValue;taint;df-generated |
-| System.ComponentModel;TypeConverter;ConvertToString;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[1];ReturnValue;taint;df-generated |
-| System.ComponentModel;TypeConverter;ConvertToString;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue;taint;df-generated |
-| System.ComponentModel;TypeConverter;ConvertToString;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[this];ReturnValue;taint;df-generated |
+| System.ComponentModel;TypeConverter;ConvertToString;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[1].Property[System.Globalization.CultureInfo.TextInfo].Property[System.Globalization.TextInfo.ListSeparator];ReturnValue;taint;dfc-generated |
 | System.ComponentModel;TypeConverter;ConvertToString;(System.ComponentModel.ITypeDescriptorContext,System.Object);Argument[1];ReturnValue;taint;df-generated |
 | System.ComponentModel;TypeConverter;ConvertToString;(System.ComponentModel.ITypeDescriptorContext,System.Object);Argument[this];ReturnValue;taint;df-generated |
 | System.ComponentModel;TypeConverter;ConvertToString;(System.Object);Argument[0];ReturnValue;taint;df-generated |
@@ -7824,9 +8427,8 @@ summary
 | System.ComponentModel;TypeConverter;GetProperties;(System.ComponentModel.ITypeDescriptorContext,System.Object,System.Attribute[]);Argument[1];ReturnValue;taint;df-generated |
 | System.ComponentModel;TypeConverter;GetProperties;(System.Object);Argument[0];ReturnValue;taint;df-generated |
 | System.ComponentModel;TypeConverter;GetStandardValues;();Argument[this];ReturnValue;taint;df-generated |
-| System.ComponentModel;TypeConverter;GetStandardValues;(System.ComponentModel.ITypeDescriptorContext);Argument[0];ReturnValue;taint;df-generated |
 | System.ComponentModel;TypeConverter;GetStandardValues;(System.ComponentModel.ITypeDescriptorContext);Argument[this];ReturnValue;taint;df-generated |
-| System.ComponentModel;TypeConverter;SortProperties;(System.ComponentModel.PropertyDescriptorCollection,System.String[]);Argument[0].Element;ReturnValue;taint;df-generated |
+| System.ComponentModel;TypeConverter;SortProperties;(System.ComponentModel.PropertyDescriptorCollection,System.String[]);Argument[0];ReturnValue;value;dfc-generated |
 | System.ComponentModel;TypeDescriptionProvider;GetExtendedTypeDescriptor;(System.Object);Argument[0];ReturnValue;taint;df-generated |
 | System.ComponentModel;TypeDescriptionProvider;GetExtendedTypeDescriptor;(System.Object);Argument[this];ReturnValue;taint;df-generated |
 | System.ComponentModel;TypeDescriptionProvider;GetFullComponentName;(System.Object);Argument[0];ReturnValue;taint;df-generated |
@@ -7841,40 +8443,34 @@ summary
 | System.ComponentModel;TypeDescriptor;CreateEvent;(System.Type,System.ComponentModel.EventDescriptor,System.Attribute[]);Argument[1];ReturnValue;taint;df-generated |
 | System.ComponentModel;TypeDescriptor;CreateProperty;(System.Type,System.ComponentModel.PropertyDescriptor,System.Attribute[]);Argument[1];ReturnValue;taint;df-generated |
 | System.ComponentModel;TypeDescriptor;CreateProperty;(System.Type,System.ComponentModel.PropertyDescriptor,System.Attribute[]);Argument[2].Element;ReturnValue;taint;df-generated |
-| System.ComponentModel;TypeDescriptor;GetAssociation;(System.Type,System.Object);Argument[1];ReturnValue;taint;df-generated |
+| System.ComponentModel;TypeDescriptor;GetAssociation;(System.Type,System.Object);Argument[1];ReturnValue;value;dfc-generated |
 | System.ComponentModel;TypeDescriptor;GetFullComponentName;(System.Object);Argument[0];ReturnValue;taint;df-generated |
 | System.ComponentModel;TypeDescriptor;add_Refreshed;(System.ComponentModel.RefreshEventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.ComponentModel;TypeDescriptor;remove_Refreshed;(System.ComponentModel.RefreshEventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
-| System.ComponentModel;TypeListConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[0];ReturnValue;taint;df-generated |
-| System.ComponentModel;TypeListConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue;taint;df-generated |
-| System.ComponentModel;TypeListConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[this];ReturnValue;taint;df-generated |
-| System.ComponentModel;TypeListConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[1];ReturnValue;taint;df-generated |
-| System.ComponentModel;TypeListConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[2];ReturnValue;taint;df-generated |
-| System.ComponentModel;TypeListConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[this];ReturnValue;taint;df-generated |
-| System.ComponentModel;TypeListConverter;GetStandardValues;(System.ComponentModel.ITypeDescriptorContext);Argument[0];ReturnValue;taint;df-generated |
+| System.ComponentModel;TypeListConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue.Element;taint;dfc-generated |
+| System.ComponentModel;TypeListConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue;taint;dfc-generated |
+| System.ComponentModel;TypeListConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue;value;dfc-generated |
+| System.ComponentModel;TypeListConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[2].Element;ReturnValue;taint;dfc-generated |
+| System.ComponentModel;TypeListConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[2];ReturnValue;taint;dfc-generated |
 | System.ComponentModel;TypeListConverter;GetStandardValues;(System.ComponentModel.ITypeDescriptorContext);Argument[this];ReturnValue;taint;df-generated |
 | System.ComponentModel;TypeListConverter;TypeListConverter;(System.Type[]);Argument[0].Element;Argument[this];taint;df-generated |
-| System.ComponentModel;VersionConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[0];ReturnValue;taint;df-generated |
-| System.ComponentModel;VersionConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue;taint;df-generated |
-| System.ComponentModel;VersionConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[this];ReturnValue;taint;df-generated |
-| System.ComponentModel;VersionConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[1];ReturnValue;taint;df-generated |
-| System.ComponentModel;VersionConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[2];ReturnValue;taint;df-generated |
-| System.ComponentModel;VersionConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[this];ReturnValue;taint;df-generated |
+| System.ComponentModel;VersionConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue.Element;taint;dfc-generated |
+| System.ComponentModel;VersionConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue;taint;dfc-generated |
+| System.ComponentModel;VersionConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue;value;dfc-generated |
+| System.ComponentModel;VersionConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[2].Element;ReturnValue;taint;dfc-generated |
+| System.ComponentModel;VersionConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[2];ReturnValue;taint;dfc-generated |
 | System.ComponentModel;WarningException;GetObjectData;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);Argument[this];Argument[0];taint;df-generated |
 | System.ComponentModel;Win32Exception;GetObjectData;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);Argument[this];Argument[0];taint;df-generated |
 | System.Configuration.Internal;DelegatingConfigHost;GetStreamName;(System.String);Argument[this];ReturnValue;taint;df-generated |
-| System.Configuration.Internal;DelegatingConfigHost;GetStreamNameForConfigSource;(System.String,System.String);Argument[0];ReturnValue;taint;df-generated |
-| System.Configuration.Internal;DelegatingConfigHost;GetStreamNameForConfigSource;(System.String,System.String);Argument[1];ReturnValue;taint;df-generated |
+| System.Configuration.Internal;DelegatingConfigHost;GetStreamNameForConfigSource;(System.String,System.String);Argument[0];ReturnValue;taint;dfc-generated |
+| System.Configuration.Internal;DelegatingConfigHost;GetStreamNameForConfigSource;(System.String,System.String);Argument[1];ReturnValue;taint;dfc-generated |
 | System.Configuration.Internal;DelegatingConfigHost;Init;(System.Configuration.Internal.IInternalConfigRoot,System.Object[]);Argument[1].Element;Argument[this];taint;df-generated |
-| System.Configuration.Internal;DelegatingConfigHost;InitForConfiguration;(System.String,System.String,System.String,System.Configuration.Internal.IInternalConfigRoot,System.Object[]);Argument[4].Element;Argument[this];taint;df-generated |
-| System.Configuration.Internal;DelegatingConfigHost;InitForConfiguration;(System.String,System.String,System.String,System.Configuration.Internal.IInternalConfigRoot,System.Object[]);Argument[4].Element;ReturnValue;taint;df-generated |
-| System.Configuration.Internal;DelegatingConfigHost;OpenStreamForRead;(System.String);Argument[0];ReturnValue;taint;df-generated |
-| System.Configuration.Internal;DelegatingConfigHost;OpenStreamForRead;(System.String);Argument[this];ReturnValue;taint;df-generated |
-| System.Configuration.Internal;DelegatingConfigHost;OpenStreamForRead;(System.String,System.Boolean);Argument[0];ReturnValue;taint;df-generated |
-| System.Configuration.Internal;DelegatingConfigHost;OpenStreamForWrite;(System.String,System.String,System.Object);Argument[1];ReturnValue;taint;df-generated |
-| System.Configuration.Internal;DelegatingConfigHost;OpenStreamForWrite;(System.String,System.String,System.Object);Argument[2];ReturnValue;taint;df-generated |
-| System.Configuration.Internal;DelegatingConfigHost;OpenStreamForWrite;(System.String,System.String,System.Object,System.Boolean);Argument[1];ReturnValue;taint;df-generated |
-| System.Configuration.Internal;DelegatingConfigHost;OpenStreamForWrite;(System.String,System.String,System.Object,System.Boolean);Argument[2];ReturnValue;taint;df-generated |
+| System.Configuration.Internal;DelegatingConfigHost;InitForConfiguration;(System.String,System.String,System.String,System.Configuration.Internal.IInternalConfigRoot,System.Object[]);Argument[0];ReturnValue;value;dfc-generated |
+| System.Configuration.Internal;DelegatingConfigHost;InitForConfiguration;(System.String,System.String,System.String,System.Configuration.Internal.IInternalConfigRoot,System.Object[]);Argument[4].Element;ReturnValue;value;dfc-generated |
+| System.Configuration.Internal;DelegatingConfigHost;OpenStreamForRead;(System.String);Argument[0];ReturnValue;taint;dfc-generated |
+| System.Configuration.Internal;DelegatingConfigHost;OpenStreamForRead;(System.String,System.Boolean);Argument[0];ReturnValue;taint;dfc-generated |
+| System.Configuration.Internal;DelegatingConfigHost;OpenStreamForWrite;(System.String,System.String,System.Object);Argument[2];ReturnValue;value;dfc-generated |
+| System.Configuration.Internal;DelegatingConfigHost;OpenStreamForWrite;(System.String,System.String,System.Object,System.Boolean);Argument[2];ReturnValue;value;dfc-generated |
 | System.Configuration.Internal;DelegatingConfigHost;StartMonitoringStreamForChanges;(System.String,System.Configuration.Internal.StreamChangeCallback);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
 | System.Configuration.Internal;DelegatingConfigHost;StopMonitoringStreamForChanges;(System.String,System.Configuration.Internal.StreamChangeCallback);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
 | System.Configuration.Internal;IConfigErrorInfo;get_Filename;();Argument[this];ReturnValue;taint;df-generated |
@@ -7882,20 +8478,17 @@ summary
 | System.Configuration.Internal;IConfigSystem;get_Host;();Argument[this];ReturnValue;taint;df-generated |
 | System.Configuration.Internal;IConfigSystem;get_Root;();Argument[this];ReturnValue;taint;df-generated |
 | System.Configuration.Internal;IInternalConfigConfigurationFactory;Create;(System.Type,System.Object[]);Argument[1].Element;ReturnValue;taint;df-generated |
-| System.Configuration.Internal;IInternalConfigConfigurationFactory;NormalizeLocationSubPath;(System.String,System.Configuration.Internal.IConfigErrorInfo);Argument[0];ReturnValue;taint;df-generated |
+| System.Configuration.Internal;IInternalConfigConfigurationFactory;NormalizeLocationSubPath;(System.String,System.Configuration.Internal.IConfigErrorInfo);Argument[0];ReturnValue;value;dfc-generated |
 | System.Configuration.Internal;IInternalConfigHost;GetStreamName;(System.String);Argument[this];ReturnValue;taint;df-generated |
-| System.Configuration.Internal;IInternalConfigHost;GetStreamNameForConfigSource;(System.String,System.String);Argument[0];ReturnValue;taint;df-generated |
-| System.Configuration.Internal;IInternalConfigHost;GetStreamNameForConfigSource;(System.String,System.String);Argument[1];ReturnValue;taint;df-generated |
+| System.Configuration.Internal;IInternalConfigHost;GetStreamNameForConfigSource;(System.String,System.String);Argument[0];ReturnValue;taint;dfc-generated |
+| System.Configuration.Internal;IInternalConfigHost;GetStreamNameForConfigSource;(System.String,System.String);Argument[1];ReturnValue;taint;dfc-generated |
 | System.Configuration.Internal;IInternalConfigHost;Init;(System.Configuration.Internal.IInternalConfigRoot,System.Object[]);Argument[1].Element;Argument[this];taint;df-generated |
-| System.Configuration.Internal;IInternalConfigHost;InitForConfiguration;(System.String,System.String,System.String,System.Configuration.Internal.IInternalConfigRoot,System.Object[]);Argument[4].Element;Argument[this];taint;df-generated |
-| System.Configuration.Internal;IInternalConfigHost;InitForConfiguration;(System.String,System.String,System.String,System.Configuration.Internal.IInternalConfigRoot,System.Object[]);Argument[4].Element;ReturnValue;taint;df-generated |
-| System.Configuration.Internal;IInternalConfigHost;OpenStreamForRead;(System.String);Argument[0];ReturnValue;taint;df-generated |
-| System.Configuration.Internal;IInternalConfigHost;OpenStreamForRead;(System.String);Argument[this];ReturnValue;taint;df-generated |
-| System.Configuration.Internal;IInternalConfigHost;OpenStreamForRead;(System.String,System.Boolean);Argument[0];ReturnValue;taint;df-generated |
-| System.Configuration.Internal;IInternalConfigHost;OpenStreamForWrite;(System.String,System.String,System.Object);Argument[1];ReturnValue;taint;df-generated |
-| System.Configuration.Internal;IInternalConfigHost;OpenStreamForWrite;(System.String,System.String,System.Object);Argument[2];ReturnValue;taint;df-generated |
-| System.Configuration.Internal;IInternalConfigHost;OpenStreamForWrite;(System.String,System.String,System.Object,System.Boolean);Argument[1];ReturnValue;taint;df-generated |
-| System.Configuration.Internal;IInternalConfigHost;OpenStreamForWrite;(System.String,System.String,System.Object,System.Boolean);Argument[2];ReturnValue;taint;df-generated |
+| System.Configuration.Internal;IInternalConfigHost;InitForConfiguration;(System.String,System.String,System.String,System.Configuration.Internal.IInternalConfigRoot,System.Object[]);Argument[0];ReturnValue;value;dfc-generated |
+| System.Configuration.Internal;IInternalConfigHost;InitForConfiguration;(System.String,System.String,System.String,System.Configuration.Internal.IInternalConfigRoot,System.Object[]);Argument[4].Element;ReturnValue;value;dfc-generated |
+| System.Configuration.Internal;IInternalConfigHost;OpenStreamForRead;(System.String);Argument[0];ReturnValue;taint;dfc-generated |
+| System.Configuration.Internal;IInternalConfigHost;OpenStreamForRead;(System.String,System.Boolean);Argument[0];ReturnValue;taint;dfc-generated |
+| System.Configuration.Internal;IInternalConfigHost;OpenStreamForWrite;(System.String,System.String,System.Object);Argument[2];ReturnValue;value;dfc-generated |
+| System.Configuration.Internal;IInternalConfigHost;OpenStreamForWrite;(System.String,System.String,System.Object,System.Boolean);Argument[2];ReturnValue;value;dfc-generated |
 | System.Configuration.Internal;IInternalConfigHost;StartMonitoringStreamForChanges;(System.String,System.Configuration.Internal.StreamChangeCallback);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
 | System.Configuration.Internal;IInternalConfigHost;StopMonitoringStreamForChanges;(System.String,System.Configuration.Internal.StreamChangeCallback);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
 | System.Configuration.Internal;IInternalConfigRecord;GetLkgSection;(System.String);Argument[this];ReturnValue;taint;df-generated |
@@ -7918,73 +8511,107 @@ summary
 | System.Configuration.Internal;IInternalConfigSystem;GetSection;(System.String);Argument[this];ReturnValue;taint;df-generated |
 | System.Configuration.Internal;InternalConfigEventHandler;BeginInvoke;(System.Object,System.Configuration.Internal.InternalConfigEventArgs,System.AsyncCallback,System.Object);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
 | System.Configuration.Internal;StreamChangeCallback;BeginInvoke;(System.String,System.AsyncCallback,System.Object);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
-| System.Configuration.Provider;ProviderBase;Initialize;(System.String,System.Collections.Specialized.NameValueCollection);Argument[0];Argument[this];taint;df-generated |
-| System.Configuration.Provider;ProviderBase;Initialize;(System.String,System.Collections.Specialized.NameValueCollection);Argument[1].Element;Argument[this];taint;df-generated |
-| System.Configuration.Provider;ProviderBase;get_Description;();Argument[this];ReturnValue;taint;df-generated |
-| System.Configuration.Provider;ProviderBase;get_Name;();Argument[this];ReturnValue;taint;df-generated |
+| System.Configuration.Provider;ProviderBase;Initialize;(System.String,System.Collections.Specialized.NameValueCollection);Argument[0];Argument[this].SyntheticField[System.Configuration.Provider.ProviderBase._name];value;dfc-generated |
+| System.Configuration.Provider;ProviderBase;get_Description;();Argument[this].Property[System.Configuration.Provider.ProviderBase.Name];ReturnValue;value;dfc-generated |
+| System.Configuration.Provider;ProviderBase;get_Description;();Argument[this].SyntheticField[System.Configuration.Provider.ProviderBase._name];ReturnValue;value;dfc-generated |
+| System.Configuration.Provider;ProviderBase;get_Name;();Argument[this].SyntheticField[System.Configuration.Provider.ProviderBase._name];ReturnValue;value;dfc-generated |
 | System.Configuration.Provider;ProviderCollection;Clear;();Argument[this].WithoutElement;Argument[this];value;manual |
 | System.Configuration.Provider;ProviderCollection;CopyTo;(System.Array,System.Int32);Argument[this].Element;Argument[0].Element;value;manual |
-| System.Configuration.Provider;ProviderCollection;CopyTo;(System.Configuration.Provider.ProviderBase[],System.Int32);Argument[this];Argument[0].Element;taint;df-generated |
+| System.Configuration.Provider;ProviderCollection;CopyTo;(System.Configuration.Provider.ProviderBase[],System.Int32);Argument[this].Element;Argument[0].Element;value;dfc-generated |
 | System.Configuration.Provider;ProviderCollection;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.IEnumerator.Current];value;manual |
 | System.Configuration.Provider;ProviderCollection;get_Item;(System.String);Argument[this];ReturnValue;taint;df-generated |
-| System.Configuration.Provider;ProviderCollection;get_SyncRoot;();Argument[this];ReturnValue;taint;df-generated |
-| System.Configuration.Provider;ProviderCollection;get_SyncRoot;();Argument[this];ReturnValue;value;df-generated |
+| System.Configuration.Provider;ProviderCollection;get_SyncRoot;();Argument[this];ReturnValue;value;dfc-generated |
 | System.Configuration;AppSettingsReader;GetValue;(System.String,System.Type);Argument[this];ReturnValue;taint;df-generated |
 | System.Configuration;AppSettingsSection;DeserializeElement;(System.Xml.XmlReader,System.Boolean);Argument[0];Argument[this];taint;df-generated |
-| System.Configuration;AppSettingsSection;DeserializeElement;(System.Xml.XmlReader,System.Boolean);Argument[this];Argument[0];taint;df-generated |
-| System.Configuration;AppSettingsSection;GetRuntimeObject;();Argument[this];ReturnValue;taint;df-generated |
-| System.Configuration;AppSettingsSection;GetRuntimeObject;();Argument[this];ReturnValue;value;df-generated |
+| System.Configuration;AppSettingsSection;GetRuntimeObject;();Argument[this];ReturnValue;value;dfc-generated |
 | System.Configuration;AppSettingsSection;Reset;(System.Configuration.ConfigurationElement);Argument[0];Argument[this];taint;df-generated |
 | System.Configuration;AppSettingsSection;get_Properties;();Argument[this];ReturnValue;taint;df-generated |
 | System.Configuration;AppSettingsSection;get_Settings;();Argument[this];ReturnValue;taint;df-generated |
 | System.Configuration;ApplicationSettingsBase;ApplicationSettingsBase;(System.ComponentModel.IComponent,System.String);Argument[0];Argument[this];taint;df-generated |
 | System.Configuration;ApplicationSettingsBase;ApplicationSettingsBase;(System.String);Argument[0];Argument[this];taint;df-generated |
+| System.Configuration;ApplicationSettingsBase;OnPropertyChanged;(System.Object,System.ComponentModel.PropertyChangedEventArgs);Argument[1];Argument[this];taint;df-generated |
+| System.Configuration;ApplicationSettingsBase;OnSettingChanging;(System.Object,System.Configuration.SettingChangingEventArgs);Argument[1];Argument[this];taint;df-generated |
+| System.Configuration;ApplicationSettingsBase;OnSettingsLoaded;(System.Object,System.Configuration.SettingsLoadedEventArgs);Argument[1];Argument[this];taint;df-generated |
+| System.Configuration;ApplicationSettingsBase;OnSettingsSaving;(System.Object,System.ComponentModel.CancelEventArgs);Argument[1];Argument[this];taint;df-generated |
 | System.Configuration;ApplicationSettingsBase;add_PropertyChanged;(System.ComponentModel.PropertyChangedEventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Configuration;ApplicationSettingsBase;add_SettingChanging;(System.Configuration.SettingChangingEventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Configuration;ApplicationSettingsBase;add_SettingsLoaded;(System.Configuration.SettingsLoadedEventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Configuration;ApplicationSettingsBase;add_SettingsSaving;(System.Configuration.SettingsSavingEventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
-| System.Configuration;ApplicationSettingsBase;get_Context;();Argument[this];ReturnValue;taint;df-generated |
+| System.Configuration;ApplicationSettingsBase;get_Context;();Argument[this].SyntheticField[System.Configuration.SettingsBase._context];ReturnValue;value;dfc-generated |
 | System.Configuration;ApplicationSettingsBase;get_Item;(System.String);Argument[this];ReturnValue;taint;df-generated |
-| System.Configuration;ApplicationSettingsBase;get_Properties;();Argument[this];ReturnValue;taint;df-generated |
+| System.Configuration;ApplicationSettingsBase;get_Properties;();Argument[this].SyntheticField[System.Configuration.SettingsBase._properties];ReturnValue;value;dfc-generated |
+| System.Configuration;ApplicationSettingsBase;get_PropertyValues;();Argument[this].Property[System.Configuration.SettingsBase.PropertyValues];ReturnValue;value;df-generated |
+| System.Configuration;ApplicationSettingsBase;get_PropertyValues;();Argument[this].Property[System.Configuration.SettingsBase.PropertyValues];ReturnValue;value;dfc-generated |
 | System.Configuration;ApplicationSettingsBase;get_PropertyValues;();Argument[this];ReturnValue;taint;df-generated |
-| System.Configuration;ApplicationSettingsBase;get_Providers;();Argument[this];ReturnValue;taint;df-generated |
+| System.Configuration;ApplicationSettingsBase;get_PropertyValues;();Argument[this];ReturnValue;taint;dfc-generated |
+| System.Configuration;ApplicationSettingsBase;get_Providers;();Argument[this].SyntheticField[System.Configuration.SettingsBase._providers];ReturnValue;value;dfc-generated |
 | System.Configuration;ApplicationSettingsBase;remove_PropertyChanged;(System.ComponentModel.PropertyChangedEventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Configuration;ApplicationSettingsBase;remove_SettingChanging;(System.Configuration.SettingChangingEventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Configuration;ApplicationSettingsBase;remove_SettingsLoaded;(System.Configuration.SettingsLoadedEventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Configuration;ApplicationSettingsBase;remove_SettingsSaving;(System.Configuration.SettingsSavingEventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Configuration;CallbackValidator;CallbackValidator;(System.Type,System.Configuration.ValidatorCallback);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
+| System.Configuration;CallbackValidator;Validate;(System.Object);Argument[0];Argument[this];taint;df-generated |
 | System.Configuration;CallbackValidatorAttribute;get_ValidatorInstance;();Argument[this];ReturnValue;taint;df-generated |
 | System.Configuration;ClientSettingsSection;get_Properties;();Argument[this];ReturnValue;taint;df-generated |
 | System.Configuration;ClientSettingsSection;get_Settings;();Argument[this];ReturnValue;taint;df-generated |
-| System.Configuration;CommaDelimitedStringCollection;Add;(System.String);Argument[0];Argument[this];taint;df-generated |
-| System.Configuration;CommaDelimitedStringCollection;AddRange;(System.String[]);Argument[0].Element;Argument[this];taint;df-generated |
+| System.Configuration;CommaDelimitedStringCollection;Add;(System.String);Argument[0];Argument[this].Element;taint;dfc-generated |
+| System.Configuration;CommaDelimitedStringCollection;AddRange;(System.String[]);Argument[0].Element;Argument[this].Element;taint;dfc-generated |
 | System.Configuration;CommaDelimitedStringCollection;Clear;();Argument[this].WithoutElement;Argument[this];value;manual |
-| System.Configuration;CommaDelimitedStringCollection;Clone;();Argument[this];ReturnValue;taint;df-generated |
-| System.Configuration;CommaDelimitedStringCollection;Insert;(System.Int32,System.String);Argument[1];Argument[this];taint;df-generated |
-| System.Configuration;CommaDelimitedStringCollection;ToString;();Argument[this];ReturnValue;taint;df-generated |
-| System.Configuration;CommaDelimitedStringCollection;get_Item;(System.Int32);Argument[this];ReturnValue;taint;df-generated |
-| System.Configuration;CommaDelimitedStringCollection;set_Item;(System.Int32,System.String);Argument[1];Argument[this];taint;df-generated |
-| System.Configuration;CommaDelimitedStringCollectionConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[0];ReturnValue;taint;df-generated |
-| System.Configuration;CommaDelimitedStringCollectionConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue;taint;df-generated |
-| System.Configuration;CommaDelimitedStringCollectionConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[this];ReturnValue;taint;df-generated |
-| System.Configuration;CommaDelimitedStringCollectionConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[1];ReturnValue;taint;df-generated |
-| System.Configuration;CommaDelimitedStringCollectionConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[2];ReturnValue;taint;df-generated |
-| System.Configuration;CommaDelimitedStringCollectionConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[this];ReturnValue;taint;df-generated |
+| System.Configuration;CommaDelimitedStringCollection;Clone;();Argument[this].Element;ReturnValue.Element;taint;dfc-generated |
+| System.Configuration;CommaDelimitedStringCollection;Insert;(System.Int32,System.String);Argument[1];Argument[this].Element;taint;dfc-generated |
+| System.Configuration;CommaDelimitedStringCollection;ToString;();Argument[this].Element;ReturnValue;taint;dfc-generated |
+| System.Configuration;CommaDelimitedStringCollection;get_Item;(System.Int32);Argument[this].Element;ReturnValue;value;dfc-generated |
+| System.Configuration;CommaDelimitedStringCollection;set_Item;(System.Int32,System.String);Argument[1];Argument[this].Element;taint;dfc-generated |
+| System.Configuration;CommaDelimitedStringCollectionConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue.Element;taint;dfc-generated |
+| System.Configuration;CommaDelimitedStringCollectionConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue;taint;dfc-generated |
+| System.Configuration;CommaDelimitedStringCollectionConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue;value;dfc-generated |
+| System.Configuration;CommaDelimitedStringCollectionConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[2].Element;ReturnValue;taint;dfc-generated |
+| System.Configuration;CommaDelimitedStringCollectionConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[2];ReturnValue;taint;dfc-generated |
 | System.Configuration;ConfigXmlDocument;CreateAttribute;(System.String,System.String,System.String);Argument[0];ReturnValue;taint;df-generated |
+| System.Configuration;ConfigXmlDocument;CreateAttribute;(System.String,System.String,System.String);Argument[0];ReturnValue;taint;dfc-generated |
 | System.Configuration;ConfigXmlDocument;CreateAttribute;(System.String,System.String,System.String);Argument[1];ReturnValue;taint;df-generated |
+| System.Configuration;ConfigXmlDocument;CreateAttribute;(System.String,System.String,System.String);Argument[1];ReturnValue;taint;dfc-generated |
 | System.Configuration;ConfigXmlDocument;CreateAttribute;(System.String,System.String,System.String);Argument[2];ReturnValue;taint;df-generated |
+| System.Configuration;ConfigXmlDocument;CreateAttribute;(System.String,System.String,System.String);Argument[2];ReturnValue;taint;dfc-generated |
+| System.Configuration;ConfigXmlDocument;CreateAttribute;(System.String,System.String,System.String);Argument[this].SyntheticField[System.Configuration.ConfigXmlDocument._filename];ReturnValue.SyntheticField[System.Configuration.ConfigXmlAttribute._filename];value;df-generated |
+| System.Configuration;ConfigXmlDocument;CreateAttribute;(System.String,System.String,System.String);Argument[this].SyntheticField[System.Configuration.ConfigXmlDocument._filename];ReturnValue.SyntheticField[System.Configuration.ConfigXmlAttribute._filename];value;dfc-generated |
 | System.Configuration;ConfigXmlDocument;CreateAttribute;(System.String,System.String,System.String);Argument[this];ReturnValue;taint;df-generated |
+| System.Configuration;ConfigXmlDocument;CreateAttribute;(System.String,System.String,System.String);Argument[this];ReturnValue;taint;dfc-generated |
+| System.Configuration;ConfigXmlDocument;CreateCDataSection;(System.String);Argument[this].SyntheticField[System.Configuration.ConfigXmlDocument._filename];ReturnValue.SyntheticField[System.Configuration.ConfigXmlCDataSection._filename];value;df-generated |
+| System.Configuration;ConfigXmlDocument;CreateCDataSection;(System.String);Argument[this].SyntheticField[System.Configuration.ConfigXmlDocument._filename];ReturnValue.SyntheticField[System.Configuration.ConfigXmlCDataSection._filename];value;dfc-generated |
 | System.Configuration;ConfigXmlDocument;CreateCDataSection;(System.String);Argument[this];ReturnValue;taint;df-generated |
+| System.Configuration;ConfigXmlDocument;CreateCDataSection;(System.String);Argument[this];ReturnValue;taint;dfc-generated |
+| System.Configuration;ConfigXmlDocument;CreateComment;(System.String);Argument[this].SyntheticField[System.Configuration.ConfigXmlDocument._filename];ReturnValue.SyntheticField[System.Configuration.ConfigXmlComment._filename];value;df-generated |
+| System.Configuration;ConfigXmlDocument;CreateComment;(System.String);Argument[this].SyntheticField[System.Configuration.ConfigXmlDocument._filename];ReturnValue.SyntheticField[System.Configuration.ConfigXmlComment._filename];value;dfc-generated |
 | System.Configuration;ConfigXmlDocument;CreateComment;(System.String);Argument[this];ReturnValue;taint;df-generated |
+| System.Configuration;ConfigXmlDocument;CreateComment;(System.String);Argument[this];ReturnValue;taint;dfc-generated |
 | System.Configuration;ConfigXmlDocument;CreateElement;(System.String,System.String,System.String);Argument[0];ReturnValue;taint;df-generated |
+| System.Configuration;ConfigXmlDocument;CreateElement;(System.String,System.String,System.String);Argument[0];ReturnValue;taint;dfc-generated |
 | System.Configuration;ConfigXmlDocument;CreateElement;(System.String,System.String,System.String);Argument[1];ReturnValue;taint;df-generated |
+| System.Configuration;ConfigXmlDocument;CreateElement;(System.String,System.String,System.String);Argument[1];ReturnValue;taint;dfc-generated |
 | System.Configuration;ConfigXmlDocument;CreateElement;(System.String,System.String,System.String);Argument[2];ReturnValue;taint;df-generated |
+| System.Configuration;ConfigXmlDocument;CreateElement;(System.String,System.String,System.String);Argument[2];ReturnValue;taint;dfc-generated |
+| System.Configuration;ConfigXmlDocument;CreateElement;(System.String,System.String,System.String);Argument[this].SyntheticField[System.Configuration.ConfigXmlDocument._filename];ReturnValue.SyntheticField[System.Configuration.ConfigXmlElement._filename];value;df-generated |
+| System.Configuration;ConfigXmlDocument;CreateElement;(System.String,System.String,System.String);Argument[this].SyntheticField[System.Configuration.ConfigXmlDocument._filename];ReturnValue.SyntheticField[System.Configuration.ConfigXmlElement._filename];value;dfc-generated |
 | System.Configuration;ConfigXmlDocument;CreateElement;(System.String,System.String,System.String);Argument[this];ReturnValue;taint;df-generated |
+| System.Configuration;ConfigXmlDocument;CreateElement;(System.String,System.String,System.String);Argument[this];ReturnValue;taint;dfc-generated |
+| System.Configuration;ConfigXmlDocument;CreateSignificantWhitespace;(System.String);Argument[this].SyntheticField[System.Configuration.ConfigXmlDocument._filename];ReturnValue.SyntheticField[System.Configuration.ConfigXmlSignificantWhitespace._filename];value;df-generated |
+| System.Configuration;ConfigXmlDocument;CreateSignificantWhitespace;(System.String);Argument[this].SyntheticField[System.Configuration.ConfigXmlDocument._filename];ReturnValue.SyntheticField[System.Configuration.ConfigXmlSignificantWhitespace._filename];value;dfc-generated |
 | System.Configuration;ConfigXmlDocument;CreateSignificantWhitespace;(System.String);Argument[this];ReturnValue;taint;df-generated |
+| System.Configuration;ConfigXmlDocument;CreateSignificantWhitespace;(System.String);Argument[this];ReturnValue;taint;dfc-generated |
+| System.Configuration;ConfigXmlDocument;CreateTextNode;(System.String);Argument[this].SyntheticField[System.Configuration.ConfigXmlDocument._filename];ReturnValue.SyntheticField[System.Configuration.ConfigXmlText._filename];value;df-generated |
+| System.Configuration;ConfigXmlDocument;CreateTextNode;(System.String);Argument[this].SyntheticField[System.Configuration.ConfigXmlDocument._filename];ReturnValue.SyntheticField[System.Configuration.ConfigXmlText._filename];value;dfc-generated |
 | System.Configuration;ConfigXmlDocument;CreateTextNode;(System.String);Argument[this];ReturnValue;taint;df-generated |
+| System.Configuration;ConfigXmlDocument;CreateTextNode;(System.String);Argument[this];ReturnValue;taint;dfc-generated |
+| System.Configuration;ConfigXmlDocument;CreateWhitespace;(System.String);Argument[this].SyntheticField[System.Configuration.ConfigXmlDocument._filename];ReturnValue.SyntheticField[System.Configuration.ConfigXmlWhitespace._filename];value;df-generated |
+| System.Configuration;ConfigXmlDocument;CreateWhitespace;(System.String);Argument[this].SyntheticField[System.Configuration.ConfigXmlDocument._filename];ReturnValue.SyntheticField[System.Configuration.ConfigXmlWhitespace._filename];value;dfc-generated |
 | System.Configuration;ConfigXmlDocument;CreateWhitespace;(System.String);Argument[this];ReturnValue;taint;df-generated |
-| System.Configuration;ConfigXmlDocument;LoadSingleElement;(System.String,System.Xml.XmlTextReader);Argument[0];Argument[this];taint;df-generated |
+| System.Configuration;ConfigXmlDocument;CreateWhitespace;(System.String);Argument[this];ReturnValue;taint;dfc-generated |
+| System.Configuration;ConfigXmlDocument;LoadSingleElement;(System.String,System.Xml.XmlTextReader);Argument[0];Argument[this].SyntheticField[System.Configuration.ConfigXmlDocument._filename];value;dfc-generated |
+| System.Configuration;ConfigXmlDocument;get_Filename;();Argument[this].SyntheticField[System.Configuration.ConfigXmlDocument._filename];ReturnValue;value;df-generated |
+| System.Configuration;ConfigXmlDocument;get_Filename;();Argument[this].SyntheticField[System.Configuration.ConfigXmlDocument._filename];ReturnValue;value;dfc-generated |
 | System.Configuration;ConfigXmlDocument;get_Filename;();Argument[this];ReturnValue;taint;df-generated |
+| System.Configuration;ConfigXmlDocument;get_Filename;();Argument[this];ReturnValue;taint;dfc-generated |
 | System.Configuration;Configuration;GetSection;(System.String);Argument[this];ReturnValue;taint;df-generated |
 | System.Configuration;Configuration;GetSectionGroup;(System.String);Argument[this];ReturnValue;taint;df-generated |
 | System.Configuration;Configuration;get_AppSettings;();Argument[this];ReturnValue;taint;df-generated |
@@ -7996,20 +8623,17 @@ summary
 | System.Configuration;Configuration;set_AssemblyStringTransformer;(System.Func<System.String,System.String>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Configuration;Configuration;set_TypeStringTransformer;(System.Func<System.String,System.String>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Configuration;ConfigurationElement;DeserializeElement;(System.Xml.XmlReader,System.Boolean);Argument[0];Argument[this];taint;df-generated |
-| System.Configuration;ConfigurationElement;DeserializeElement;(System.Xml.XmlReader,System.Boolean);Argument[this];Argument[0];taint;df-generated |
-| System.Configuration;ConfigurationElement;GetTransformedAssemblyString;(System.String);Argument[0];ReturnValue;taint;df-generated |
-| System.Configuration;ConfigurationElement;GetTransformedTypeString;(System.String);Argument[0];ReturnValue;taint;df-generated |
+| System.Configuration;ConfigurationElement;GetTransformedAssemblyString;(System.String);Argument[0];ReturnValue;value;dfc-generated |
+| System.Configuration;ConfigurationElement;GetTransformedTypeString;(System.String);Argument[0];ReturnValue;value;dfc-generated |
 | System.Configuration;ConfigurationElement;Reset;(System.Configuration.ConfigurationElement);Argument[0];Argument[this];taint;df-generated |
 | System.Configuration;ConfigurationElement;SerializeElement;(System.Xml.XmlWriter,System.Boolean);Argument[this];Argument[0];taint;df-generated |
-| System.Configuration;ConfigurationElement;SerializeToXmlElement;(System.Xml.XmlWriter,System.String);Argument[1];Argument[0];taint;df-generated |
 | System.Configuration;ConfigurationElement;SerializeToXmlElement;(System.Xml.XmlWriter,System.String);Argument[this];Argument[0];taint;df-generated |
 | System.Configuration;ConfigurationElement;SetPropertyValue;(System.Configuration.ConfigurationProperty,System.Object,System.Boolean);Argument[this];Argument[1];taint;df-generated |
 | System.Configuration;ConfigurationElement;Unmerge;(System.Configuration.ConfigurationElement,System.Configuration.ConfigurationElement,System.Configuration.ConfigurationSaveMode);Argument[0];Argument[this];taint;df-generated |
 | System.Configuration;ConfigurationElement;get_CurrentConfiguration;();Argument[this];ReturnValue;taint;df-generated |
 | System.Configuration;ConfigurationElement;get_ElementProperty;();Argument[this];ReturnValue;taint;df-generated |
 | System.Configuration;ConfigurationElement;get_EvaluationContext;();Argument[this];ReturnValue;taint;df-generated |
-| System.Configuration;ConfigurationElement;get_Item;(System.Configuration.ConfigurationProperty);Argument[0];ReturnValue;taint;df-generated |
-| System.Configuration;ConfigurationElement;get_Item;(System.Configuration.ConfigurationProperty);Argument[this];ReturnValue;taint;df-generated |
+| System.Configuration;ConfigurationElement;get_Item;(System.Configuration.ConfigurationProperty);Argument[0].Property[System.Configuration.ConfigurationProperty.DefaultValue];ReturnValue;value;dfc-generated |
 | System.Configuration;ConfigurationElement;get_Item;(System.String);Argument[this];ReturnValue;taint;df-generated |
 | System.Configuration;ConfigurationElement;get_Properties;();Argument[this];ReturnValue;taint;df-generated |
 | System.Configuration;ConfigurationElement;set_Item;(System.Configuration.ConfigurationProperty,System.Object);Argument[this];Argument[1];taint;df-generated |
@@ -8023,154 +8647,147 @@ summary
 | System.Configuration;ConfigurationElementCollection;BaseGetKey;(System.Int32);Argument[this];ReturnValue;taint;df-generated |
 | System.Configuration;ConfigurationElementCollection;ConfigurationElementCollection;(System.Collections.IComparer);Argument[0];Argument[this];taint;df-generated |
 | System.Configuration;ConfigurationElementCollection;CopyTo;(System.Array,System.Int32);Argument[this].Element;Argument[0].Element;value;manual |
-| System.Configuration;ConfigurationElementCollection;CopyTo;(System.Configuration.ConfigurationElement[],System.Int32);Argument[this];Argument[0].Element;taint;df-generated |
+| System.Configuration;ConfigurationElementCollection;CopyTo;(System.Configuration.ConfigurationElement[],System.Int32);Argument[this].Element;Argument[0].Element;value;dfc-generated |
 | System.Configuration;ConfigurationElementCollection;GetElementKey;(System.Configuration.ConfigurationElement);Argument[0];ReturnValue;taint;df-generated |
 | System.Configuration;ConfigurationElementCollection;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.IEnumerator.Current];value;manual |
 | System.Configuration;ConfigurationElementCollection;Reset;(System.Configuration.ConfigurationElement);Argument[0];Argument[this];taint;df-generated |
 | System.Configuration;ConfigurationElementCollection;SerializeElement;(System.Xml.XmlWriter,System.Boolean);Argument[this];Argument[0];taint;df-generated |
 | System.Configuration;ConfigurationElementCollection;Unmerge;(System.Configuration.ConfigurationElement,System.Configuration.ConfigurationElement,System.Configuration.ConfigurationSaveMode);Argument[0];Argument[this];taint;df-generated |
-| System.Configuration;ConfigurationElementCollection;get_SyncRoot;();Argument[this];ReturnValue;taint;df-generated |
-| System.Configuration;ConfigurationElementCollection;get_SyncRoot;();Argument[this];ReturnValue;value;df-generated |
-| System.Configuration;ConfigurationErrorsException;ConfigurationErrorsException;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);Argument[0];Argument[this];taint;df-generated |
-| System.Configuration;ConfigurationErrorsException;ConfigurationErrorsException;(System.String,System.Exception,System.String,System.Int32);Argument[2];Argument[this];taint;df-generated |
+| System.Configuration;ConfigurationElementCollection;get_SyncRoot;();Argument[this];ReturnValue;value;dfc-generated |
+| System.Configuration;ConfigurationErrorsException;ConfigurationErrorsException;(System.String,System.Exception,System.String,System.Int32);Argument[2];Argument[this].SyntheticField[System.Configuration.ConfigurationErrorsException._firstFilename];value;dfc-generated |
 | System.Configuration;ConfigurationErrorsException;GetFilename;(System.Xml.XmlNode);Argument[0].Element;ReturnValue;taint;df-generated |
-| System.Configuration;ConfigurationErrorsException;GetFilename;(System.Xml.XmlReader);Argument[0];ReturnValue;taint;df-generated |
+| System.Configuration;ConfigurationErrorsException;GetFilename;(System.Xml.XmlReader);Argument[0].Property[System.Configuration.Internal.IConfigErrorInfo.Filename];ReturnValue;value;dfc-generated |
 | System.Configuration;ConfigurationErrorsException;GetObjectData;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);Argument[this];Argument[0];taint;df-generated |
 | System.Configuration;ConfigurationErrorsException;get_Errors;();Argument[this];ReturnValue;taint;df-generated |
-| System.Configuration;ConfigurationErrorsException;get_Filename;();Argument[this];ReturnValue;taint;df-generated |
-| System.Configuration;ConfigurationErrorsException;get_Message;();Argument[this];ReturnValue;taint;df-generated |
-| System.Configuration;ConfigurationException;ConfigurationException;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);Argument[0];Argument[this];taint;df-generated |
-| System.Configuration;ConfigurationException;ConfigurationException;(System.String,System.Exception,System.String,System.Int32);Argument[2];Argument[this];taint;df-generated |
+| System.Configuration;ConfigurationErrorsException;get_Filename;();Argument[this].SyntheticField[System.Configuration.ConfigurationErrorsException._firstFilename];ReturnValue;value;dfc-generated |
+| System.Configuration;ConfigurationErrorsException;get_Filename;();Argument[this].SyntheticField[System.Configuration.ConfigurationException._filename];ReturnValue;value;dfc-generated |
+| System.Configuration;ConfigurationErrorsException;get_Message;();Argument[this].Property[System.Configuration.ConfigurationErrorsException.Filename];ReturnValue;taint;dfc-generated |
+| System.Configuration;ConfigurationErrorsException;get_Message;();Argument[this].Property[System.Configuration.ConfigurationException.BareMessage];ReturnValue;value;dfc-generated |
+| System.Configuration;ConfigurationErrorsException;get_Message;();Argument[this].Property[System.Configuration.ConfigurationException.Filename];ReturnValue;taint;dfc-generated |
+| System.Configuration;ConfigurationErrorsException;get_Message;();Argument[this].SyntheticField[System.Configuration.ConfigurationErrorsException._firstFilename];ReturnValue;taint;dfc-generated |
+| System.Configuration;ConfigurationErrorsException;get_Message;();Argument[this].SyntheticField[System.Exception._message];ReturnValue;value;dfc-generated |
+| System.Configuration;ConfigurationException;ConfigurationException;(System.String,System.Exception,System.String,System.Int32);Argument[2];Argument[this].SyntheticField[System.Configuration.ConfigurationException._filename];value;dfc-generated |
 | System.Configuration;ConfigurationException;GetObjectData;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);Argument[this];Argument[0];taint;df-generated |
 | System.Configuration;ConfigurationException;GetXmlNodeFilename;(System.Xml.XmlNode);Argument[0].Element;ReturnValue;taint;df-generated |
-| System.Configuration;ConfigurationException;get_BareMessage;();Argument[this];ReturnValue;taint;df-generated |
-| System.Configuration;ConfigurationException;get_Filename;();Argument[this];ReturnValue;taint;df-generated |
-| System.Configuration;ConfigurationException;get_Message;();Argument[this];ReturnValue;taint;df-generated |
-| System.Configuration;ConfigurationFileMap;Clone;();Argument[this];ReturnValue;taint;df-generated |
-| System.Configuration;ConfigurationFileMap;Clone;();Argument[this];ReturnValue;value;df-generated |
+| System.Configuration;ConfigurationException;get_BareMessage;();Argument[this].Property[System.Exception.Message];ReturnValue;value;dfc-generated |
+| System.Configuration;ConfigurationException;get_Filename;();Argument[this].SyntheticField[System.Configuration.ConfigurationException._filename];ReturnValue;value;dfc-generated |
+| System.Configuration;ConfigurationException;get_Message;();Argument[this].Property[System.Configuration.ConfigurationException.BareMessage];ReturnValue;value;dfc-generated |
+| System.Configuration;ConfigurationException;get_Message;();Argument[this].Property[System.Configuration.ConfigurationException.Filename];ReturnValue;taint;dfc-generated |
+| System.Configuration;ConfigurationException;get_Message;();Argument[this].SyntheticField[System.Exception._message];ReturnValue;value;dfc-generated |
+| System.Configuration;ConfigurationFileMap;Clone;();Argument[this];ReturnValue;value;dfc-generated |
 | System.Configuration;ConfigurationLocation;OpenConfiguration;();Argument[this];ReturnValue;taint;df-generated |
-| System.Configuration;ConfigurationLocationCollection;get_Item;(System.Int32);Argument[this];ReturnValue;taint;df-generated |
-| System.Configuration;ConfigurationLockCollection;Add;(System.String);Argument[0];Argument[this];taint;df-generated |
+| System.Configuration;ConfigurationLocationCollection;get_Item;(System.Int32);Argument[this].Property[System.Collections.ReadOnlyCollectionBase.InnerList].Element;ReturnValue;value;dfc-generated |
+| System.Configuration;ConfigurationLockCollection;Add;(System.String);Argument[0];Argument[this].SyntheticField[System.Configuration.ConfigurationLockCollection._internalArraylist].Element;value;dfc-generated |
 | System.Configuration;ConfigurationLockCollection;Clear;();Argument[this].WithoutElement;Argument[this];value;manual |
 | System.Configuration;ConfigurationLockCollection;CopyTo;(System.Array,System.Int32);Argument[this].Element;Argument[0].Element;value;manual |
-| System.Configuration;ConfigurationLockCollection;CopyTo;(System.String[],System.Int32);Argument[this];Argument[0].Element;taint;df-generated |
+| System.Configuration;ConfigurationLockCollection;CopyTo;(System.String[],System.Int32);Argument[this].Element;Argument[0].Element;value;dfc-generated |
+| System.Configuration;ConfigurationLockCollection;CopyTo;(System.String[],System.Int32);Argument[this].SyntheticField[System.Configuration.ConfigurationLockCollection._internalArraylist].Element;Argument[0].Element;value;dfc-generated |
 | System.Configuration;ConfigurationLockCollection;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.IEnumerator.Current];value;manual |
-| System.Configuration;ConfigurationLockCollection;SetFromList;(System.String);Argument[0];Argument[this];taint;df-generated |
+| System.Configuration;ConfigurationLockCollection;SetFromList;(System.String);Argument[0];Argument[this].SyntheticField[System.Configuration.ConfigurationLockCollection._internalArraylist].Element;taint;dfc-generated |
 | System.Configuration;ConfigurationLockCollection;get_AttributeList;();Argument[this];ReturnValue;taint;df-generated |
-| System.Configuration;ConfigurationLockCollection;get_SyncRoot;();Argument[this];ReturnValue;taint;df-generated |
-| System.Configuration;ConfigurationLockCollection;get_SyncRoot;();Argument[this];ReturnValue;value;df-generated |
+| System.Configuration;ConfigurationLockCollection;get_SyncRoot;();Argument[this];ReturnValue;value;dfc-generated |
 | System.Configuration;ConfigurationManager;OpenExeConfiguration;(System.String);Argument[0];ReturnValue;taint;df-generated |
 | System.Configuration;ConfigurationManager;OpenMappedExeConfiguration;(System.Configuration.ExeConfigurationFileMap,System.Configuration.ConfigurationUserLevel);Argument[0];ReturnValue;taint;df-generated |
 | System.Configuration;ConfigurationManager;OpenMappedExeConfiguration;(System.Configuration.ExeConfigurationFileMap,System.Configuration.ConfigurationUserLevel,System.Boolean);Argument[0];ReturnValue;taint;df-generated |
 | System.Configuration;ConfigurationManager;OpenMappedMachineConfiguration;(System.Configuration.ConfigurationFileMap);Argument[0];ReturnValue;taint;df-generated |
-| System.Configuration;ConfigurationPermission;Copy;();Argument[this];ReturnValue;taint;df-generated |
-| System.Configuration;ConfigurationPermission;Copy;();Argument[this];ReturnValue;value;df-generated |
-| System.Configuration;ConfigurationPermission;Intersect;(System.Security.IPermission);Argument[0];ReturnValue;taint;df-generated |
-| System.Configuration;ConfigurationPermission;Intersect;(System.Security.IPermission);Argument[this];ReturnValue;taint;df-generated |
+| System.Configuration;ConfigurationPermission;Copy;();Argument[this];ReturnValue;value;dfc-generated |
+| System.Configuration;ConfigurationPermission;Intersect;(System.Security.IPermission);Argument[0];ReturnValue;value;dfc-generated |
 | System.Configuration;ConfigurationPermission;Union;(System.Security.IPermission);Argument[this];ReturnValue;taint;df-generated |
 | System.Configuration;ConfigurationProperty;ConfigurationProperty;(System.String,System.Type);Argument[0];Argument[this];taint;df-generated |
-| System.Configuration;ConfigurationProperty;ConfigurationProperty;(System.String,System.Type,System.Object,System.ComponentModel.TypeConverter,System.Configuration.ConfigurationValidatorBase,System.Configuration.ConfigurationPropertyOptions,System.String);Argument[0];Argument[this];taint;df-generated |
-| System.Configuration;ConfigurationProperty;ConfigurationProperty;(System.String,System.Type,System.Object,System.ComponentModel.TypeConverter,System.Configuration.ConfigurationValidatorBase,System.Configuration.ConfigurationPropertyOptions,System.String);Argument[3];Argument[this];taint;df-generated |
-| System.Configuration;ConfigurationProperty;get_Converter;();Argument[this];ReturnValue;taint;df-generated |
-| System.Configuration;ConfigurationPropertyCollection;Add;(System.Configuration.ConfigurationProperty);Argument[0];Argument[this];taint;df-generated |
+| System.Configuration;ConfigurationProperty;ConfigurationProperty;(System.String,System.Type,System.Object,System.ComponentModel.TypeConverter,System.Configuration.ConfigurationValidatorBase,System.Configuration.ConfigurationPropertyOptions,System.String);Argument[3];Argument[this].SyntheticField[System.Configuration.ConfigurationProperty._converter];value;dfc-generated |
+| System.Configuration;ConfigurationProperty;get_Converter;();Argument[this].SyntheticField[System.Configuration.ConfigurationProperty._converter];ReturnValue;value;dfc-generated |
+| System.Configuration;ConfigurationPropertyCollection;Add;(System.Configuration.ConfigurationProperty);Argument[0];Argument[this].SyntheticField[System.Configuration.ConfigurationPropertyCollection._items].Element;value;dfc-generated |
 | System.Configuration;ConfigurationPropertyCollection;Clear;();Argument[this].WithoutElement;Argument[this];value;manual |
 | System.Configuration;ConfigurationPropertyCollection;CopyTo;(System.Array,System.Int32);Argument[this].Element;Argument[0].Element;value;manual |
-| System.Configuration;ConfigurationPropertyCollection;CopyTo;(System.Configuration.ConfigurationProperty[],System.Int32);Argument[this];Argument[0].Element;taint;df-generated |
+| System.Configuration;ConfigurationPropertyCollection;CopyTo;(System.Configuration.ConfigurationProperty[],System.Int32);Argument[this].Element;Argument[0].Element;value;dfc-generated |
+| System.Configuration;ConfigurationPropertyCollection;CopyTo;(System.Configuration.ConfigurationProperty[],System.Int32);Argument[this].SyntheticField[System.Configuration.ConfigurationPropertyCollection._items].Element;Argument[0].Element;value;dfc-generated |
 | System.Configuration;ConfigurationPropertyCollection;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.IEnumerator.Current];value;manual |
-| System.Configuration;ConfigurationPropertyCollection;get_Item;(System.String);Argument[this];ReturnValue;taint;df-generated |
-| System.Configuration;ConfigurationPropertyCollection;get_SyncRoot;();Argument[this];ReturnValue;taint;df-generated |
-| System.Configuration;ConfigurationPropertyCollection;get_SyncRoot;();Argument[this];ReturnValue;value;df-generated |
+| System.Configuration;ConfigurationPropertyCollection;get_Item;(System.String);Argument[this].SyntheticField[System.Configuration.ConfigurationPropertyCollection._items].Element;ReturnValue;value;dfc-generated |
+| System.Configuration;ConfigurationPropertyCollection;get_SyncRoot;();Argument[this].SyntheticField[System.Configuration.ConfigurationPropertyCollection._items];ReturnValue;value;dfc-generated |
+| System.Configuration;ConfigurationPropertyCollection;get_SyncRoot;();Argument[this];ReturnValue;value;dfc-generated |
 | System.Configuration;ConfigurationSection;DeserializeSection;(System.Xml.XmlReader);Argument[0];Argument[this];taint;df-generated |
-| System.Configuration;ConfigurationSection;DeserializeSection;(System.Xml.XmlReader);Argument[this];Argument[0];taint;df-generated |
-| System.Configuration;ConfigurationSection;GetRuntimeObject;();Argument[this];ReturnValue;taint;df-generated |
-| System.Configuration;ConfigurationSection;GetRuntimeObject;();Argument[this];ReturnValue;value;df-generated |
+| System.Configuration;ConfigurationSection;GetRuntimeObject;();Argument[this];ReturnValue;value;dfc-generated |
 | System.Configuration;ConfigurationSection;SerializeSection;(System.Configuration.ConfigurationElement,System.String,System.Configuration.ConfigurationSaveMode);Argument[this];ReturnValue;taint;df-generated |
 | System.Configuration;ConfigurationSectionCollection;Add;(System.String,System.Configuration.ConfigurationSection);Argument[0];Argument[1];taint;df-generated |
-| System.Configuration;ConfigurationSectionCollection;Add;(System.String,System.Configuration.ConfigurationSection);Argument[0];Argument[this];taint;df-generated |
 | System.Configuration;ConfigurationSectionCollection;Add;(System.String,System.Configuration.ConfigurationSection);Argument[this];Argument[1];taint;df-generated |
 | System.Configuration;ConfigurationSectionCollection;Clear;();Argument[this].WithoutElement;Argument[this];value;manual |
 | System.Configuration;ConfigurationSectionCollection;Get;(System.Int32);Argument[this];ReturnValue;taint;df-generated |
 | System.Configuration;ConfigurationSectionCollection;Get;(System.String);Argument[this];ReturnValue;taint;df-generated |
 | System.Configuration;ConfigurationSectionCollection;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.IEnumerator.Current];value;manual |
-| System.Configuration;ConfigurationSectionCollection;GetKey;(System.Int32);Argument[this];ReturnValue;taint;df-generated |
 | System.Configuration;ConfigurationSectionCollection;get_Item;(System.Int32);Argument[this];ReturnValue;taint;df-generated |
 | System.Configuration;ConfigurationSectionCollection;get_Item;(System.String);Argument[this];ReturnValue;taint;df-generated |
 | System.Configuration;ConfigurationSectionGroup;get_SectionGroups;();Argument[this];ReturnValue;taint;df-generated |
 | System.Configuration;ConfigurationSectionGroup;get_Sections;();Argument[this];ReturnValue;taint;df-generated |
-| System.Configuration;ConfigurationSectionGroupCollection;Add;(System.String,System.Configuration.ConfigurationSectionGroup);Argument[0];Argument[this];taint;df-generated |
 | System.Configuration;ConfigurationSectionGroupCollection;Add;(System.String,System.Configuration.ConfigurationSectionGroup);Argument[this];Argument[1];taint;df-generated |
 | System.Configuration;ConfigurationSectionGroupCollection;Clear;();Argument[this].WithoutElement;Argument[this];value;manual |
 | System.Configuration;ConfigurationSectionGroupCollection;CopyTo;(System.Configuration.ConfigurationSectionGroup[],System.Int32);Argument[this];Argument[0].Element;taint;df-generated |
 | System.Configuration;ConfigurationSectionGroupCollection;Get;(System.Int32);Argument[this];ReturnValue;taint;df-generated |
 | System.Configuration;ConfigurationSectionGroupCollection;Get;(System.String);Argument[this];ReturnValue;taint;df-generated |
 | System.Configuration;ConfigurationSectionGroupCollection;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.IEnumerator.Current];value;manual |
-| System.Configuration;ConfigurationSectionGroupCollection;GetKey;(System.Int32);Argument[this];ReturnValue;taint;df-generated |
 | System.Configuration;ConfigurationSectionGroupCollection;get_Item;(System.Int32);Argument[this];ReturnValue;taint;df-generated |
 | System.Configuration;ConfigurationSectionGroupCollection;get_Item;(System.String);Argument[this];ReturnValue;taint;df-generated |
 | System.Configuration;ConfigurationValidatorAttribute;get_ValidatorInstance;();Argument[this];ReturnValue;taint;df-generated |
-| System.Configuration;ConnectionStringSettings;ToString;();Argument[this];ReturnValue;taint;df-generated |
+| System.Configuration;ConfigurationValidatorBase;Validate;(System.Object);Argument[0];Argument[this];taint;df-generated |
+| System.Configuration;ConnectionStringSettings;ToString;();Argument[this].Property[System.Configuration.ConnectionStringSettings.ConnectionString];ReturnValue;value;dfc-generated |
 | System.Configuration;ConnectionStringSettings;get_Properties;();Argument[this];ReturnValue;taint;df-generated |
 | System.Configuration;ConnectionStringSettingsCollection;Add;(System.Configuration.ConnectionStringSettings);Argument[this];Argument[0];taint;df-generated |
 | System.Configuration;ConnectionStringSettingsCollection;BaseAdd;(System.Int32,System.Configuration.ConfigurationElement);Argument[this];Argument[1];taint;df-generated |
 | System.Configuration;ConnectionStringSettingsCollection;Clear;();Argument[this].WithoutElement;Argument[this];value;manual |
+| System.Configuration;ConnectionStringSettingsCollection;GetElementKey;(System.Configuration.ConfigurationElement);Argument[0].Property[System.Configuration.ConnectionStringSettings.Name];ReturnValue;value;df-generated |
+| System.Configuration;ConnectionStringSettingsCollection;GetElementKey;(System.Configuration.ConfigurationElement);Argument[0].Property[System.Configuration.ConnectionStringSettings.Name];ReturnValue;value;dfc-generated |
 | System.Configuration;ConnectionStringSettingsCollection;GetElementKey;(System.Configuration.ConfigurationElement);Argument[0];ReturnValue;taint;df-generated |
+| System.Configuration;ConnectionStringSettingsCollection;GetElementKey;(System.Configuration.ConfigurationElement);Argument[0];ReturnValue;taint;dfc-generated |
 | System.Configuration;ConnectionStringSettingsCollection;get_Item;(System.Int32);Argument[this];ReturnValue;taint;df-generated |
 | System.Configuration;ConnectionStringSettingsCollection;get_Item;(System.String);Argument[this];ReturnValue;taint;df-generated |
 | System.Configuration;ConnectionStringSettingsCollection;get_Properties;();Argument[this];ReturnValue;taint;df-generated |
 | System.Configuration;ConnectionStringSettingsCollection;set_Item;(System.Int32,System.Configuration.ConnectionStringSettings);Argument[this];Argument[1];taint;df-generated |
-| System.Configuration;ConnectionStringsSection;GetRuntimeObject;();Argument[this];ReturnValue;taint;df-generated |
-| System.Configuration;ConnectionStringsSection;GetRuntimeObject;();Argument[this];ReturnValue;value;df-generated |
+| System.Configuration;ConnectionStringsSection;GetRuntimeObject;();Argument[this];ReturnValue;value;dfc-generated |
 | System.Configuration;ConnectionStringsSection;get_ConnectionStrings;();Argument[this];ReturnValue;taint;df-generated |
 | System.Configuration;ConnectionStringsSection;get_Properties;();Argument[this];ReturnValue;taint;df-generated |
 | System.Configuration;ContextInformation;GetSection;(System.String);Argument[this];ReturnValue;taint;df-generated |
 | System.Configuration;ContextInformation;get_HostingContext;();Argument[this];ReturnValue;taint;df-generated |
 | System.Configuration;DefaultSection;DeserializeSection;(System.Xml.XmlReader);Argument[0];Argument[this];taint;df-generated |
-| System.Configuration;DefaultSection;DeserializeSection;(System.Xml.XmlReader);Argument[this];Argument[0];taint;df-generated |
 | System.Configuration;DefaultSection;Reset;(System.Configuration.ConfigurationElement);Argument[0];Argument[this];taint;df-generated |
 | System.Configuration;DefaultSection;SerializeSection;(System.Configuration.ConfigurationElement,System.String,System.Configuration.ConfigurationSaveMode);Argument[this];ReturnValue;taint;df-generated |
 | System.Configuration;DefaultSection;get_Properties;();Argument[this];ReturnValue;taint;df-generated |
-| System.Configuration;DefaultSettingValueAttribute;DefaultSettingValueAttribute;(System.String);Argument[0];Argument[this];taint;df-generated |
-| System.Configuration;DefaultSettingValueAttribute;get_Value;();Argument[this];ReturnValue;taint;df-generated |
-| System.Configuration;DictionarySectionHandler;Create;(System.Object,System.Object,System.Xml.XmlNode);Argument[0];ReturnValue;taint;df-generated |
-| System.Configuration;DictionarySectionHandler;Create;(System.Object,System.Object,System.Xml.XmlNode);Argument[2].Element;ReturnValue;taint;df-generated |
-| System.Configuration;DpapiProtectedConfigurationProvider;Initialize;(System.String,System.Collections.Specialized.NameValueCollection);Argument[0];Argument[this];taint;df-generated |
-| System.Configuration;DpapiProtectedConfigurationProvider;Initialize;(System.String,System.Collections.Specialized.NameValueCollection);Argument[1].Element;Argument[this];taint;df-generated |
-| System.Configuration;ExeConfigurationFileMap;Clone;();Argument[this];ReturnValue;taint;df-generated |
-| System.Configuration;ExeConfigurationFileMap;Clone;();Argument[this];ReturnValue;value;df-generated |
-| System.Configuration;GenericEnumConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[0];ReturnValue;taint;df-generated |
-| System.Configuration;GenericEnumConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue;taint;df-generated |
-| System.Configuration;GenericEnumConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[this];ReturnValue;taint;df-generated |
-| System.Configuration;GenericEnumConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[1];ReturnValue;taint;df-generated |
-| System.Configuration;GenericEnumConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[2];ReturnValue;taint;df-generated |
-| System.Configuration;GenericEnumConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[this];ReturnValue;taint;df-generated |
+| System.Configuration;DefaultSettingValueAttribute;DefaultSettingValueAttribute;(System.String);Argument[0];Argument[this].SyntheticField[System.Configuration.DefaultSettingValueAttribute._value];value;dfc-generated |
+| System.Configuration;DefaultSettingValueAttribute;get_Value;();Argument[this].SyntheticField[System.Configuration.DefaultSettingValueAttribute._value];ReturnValue;value;dfc-generated |
+| System.Configuration;DefaultValidator;Validate;(System.Object);Argument[0];Argument[this];taint;df-generated |
+| System.Configuration;DictionarySectionHandler;Create;(System.Object,System.Object,System.Xml.XmlNode);Argument[0].Element;ReturnValue.Element;value;dfc-generated |
+| System.Configuration;DpapiProtectedConfigurationProvider;Initialize;(System.String,System.Collections.Specialized.NameValueCollection);Argument[0];Argument[this].SyntheticField[System.Configuration.Provider.ProviderBase._name];value;dfc-generated |
+| System.Configuration;ExeConfigurationFileMap;Clone;();Argument[this];ReturnValue;value;dfc-generated |
+| System.Configuration;GenericEnumConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue.Element;taint;dfc-generated |
+| System.Configuration;GenericEnumConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue;taint;dfc-generated |
+| System.Configuration;GenericEnumConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue;value;dfc-generated |
+| System.Configuration;GenericEnumConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[2].Element;ReturnValue;taint;dfc-generated |
+| System.Configuration;GenericEnumConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[2];ReturnValue;taint;dfc-generated |
 | System.Configuration;IApplicationSettingsProvider;GetPreviousVersion;(System.Configuration.SettingsContext,System.Configuration.SettingsProperty);Argument[this];ReturnValue;taint;df-generated |
-| System.Configuration;IConfigurationSectionHandler;Create;(System.Object,System.Object,System.Xml.XmlNode);Argument[0];ReturnValue;taint;df-generated |
-| System.Configuration;IConfigurationSectionHandler;Create;(System.Object,System.Object,System.Xml.XmlNode);Argument[2].Element;ReturnValue;taint;df-generated |
+| System.Configuration;IConfigurationSectionHandler;Create;(System.Object,System.Object,System.Xml.XmlNode);Argument[0].Element;ReturnValue.Element;value;dfc-generated |
 | System.Configuration;IdnElement;get_Properties;();Argument[this];ReturnValue;taint;df-generated |
 | System.Configuration;IgnoreSection;DeserializeSection;(System.Xml.XmlReader);Argument[0];Argument[this];taint;df-generated |
-| System.Configuration;IgnoreSection;DeserializeSection;(System.Xml.XmlReader);Argument[this];Argument[0];taint;df-generated |
 | System.Configuration;IgnoreSection;Reset;(System.Configuration.ConfigurationElement);Argument[0];Argument[this];taint;df-generated |
 | System.Configuration;IgnoreSection;SerializeSection;(System.Configuration.ConfigurationElement,System.String,System.Configuration.ConfigurationSaveMode);Argument[this];ReturnValue;taint;df-generated |
 | System.Configuration;IgnoreSection;get_Properties;();Argument[this];ReturnValue;taint;df-generated |
-| System.Configuration;IgnoreSectionHandler;Create;(System.Object,System.Object,System.Xml.XmlNode);Argument[0];ReturnValue;taint;df-generated |
-| System.Configuration;IgnoreSectionHandler;Create;(System.Object,System.Object,System.Xml.XmlNode);Argument[2].Element;ReturnValue;taint;df-generated |
-| System.Configuration;InfiniteIntConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[0];ReturnValue;taint;df-generated |
-| System.Configuration;InfiniteIntConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue;taint;df-generated |
-| System.Configuration;InfiniteIntConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[this];ReturnValue;taint;df-generated |
-| System.Configuration;InfiniteIntConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[1];ReturnValue;taint;df-generated |
-| System.Configuration;InfiniteIntConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[2];ReturnValue;taint;df-generated |
-| System.Configuration;InfiniteIntConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[this];ReturnValue;taint;df-generated |
-| System.Configuration;InfiniteTimeSpanConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[0];ReturnValue;taint;df-generated |
-| System.Configuration;InfiniteTimeSpanConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue;taint;df-generated |
-| System.Configuration;InfiniteTimeSpanConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[this];ReturnValue;taint;df-generated |
-| System.Configuration;InfiniteTimeSpanConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[1];ReturnValue;taint;df-generated |
-| System.Configuration;InfiniteTimeSpanConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[2];ReturnValue;taint;df-generated |
-| System.Configuration;InfiniteTimeSpanConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[this];ReturnValue;taint;df-generated |
+| System.Configuration;IgnoreSectionHandler;Create;(System.Object,System.Object,System.Xml.XmlNode);Argument[0].Element;ReturnValue.Element;value;dfc-generated |
+| System.Configuration;InfiniteIntConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue.Element;taint;dfc-generated |
+| System.Configuration;InfiniteIntConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue;taint;dfc-generated |
+| System.Configuration;InfiniteIntConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue;value;dfc-generated |
+| System.Configuration;InfiniteIntConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[2].Element;ReturnValue;taint;dfc-generated |
+| System.Configuration;InfiniteIntConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[2];ReturnValue;taint;dfc-generated |
+| System.Configuration;InfiniteTimeSpanConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue.Element;taint;dfc-generated |
+| System.Configuration;InfiniteTimeSpanConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue;taint;dfc-generated |
+| System.Configuration;InfiniteTimeSpanConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue;value;dfc-generated |
+| System.Configuration;InfiniteTimeSpanConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[2].Element;ReturnValue;taint;dfc-generated |
+| System.Configuration;InfiniteTimeSpanConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[2];ReturnValue;taint;dfc-generated |
+| System.Configuration;IntegerValidator;Validate;(System.Object);Argument[0];Argument[this];taint;df-generated |
 | System.Configuration;IntegerValidatorAttribute;get_ValidatorInstance;();Argument[this];ReturnValue;taint;df-generated |
 | System.Configuration;IriParsingElement;get_Properties;();Argument[this];ReturnValue;taint;df-generated |
 | System.Configuration;KeyValueConfigurationCollection;Add;(System.Configuration.KeyValueConfigurationElement);Argument[this];Argument[0];taint;df-generated |
 | System.Configuration;KeyValueConfigurationCollection;Clear;();Argument[this].WithoutElement;Argument[this];value;manual |
+| System.Configuration;KeyValueConfigurationCollection;GetElementKey;(System.Configuration.ConfigurationElement);Argument[0].Property[System.Configuration.KeyValueConfigurationElement.Key];ReturnValue;value;df-generated |
+| System.Configuration;KeyValueConfigurationCollection;GetElementKey;(System.Configuration.ConfigurationElement);Argument[0].Property[System.Configuration.KeyValueConfigurationElement.Key];ReturnValue;value;dfc-generated |
 | System.Configuration;KeyValueConfigurationCollection;GetElementKey;(System.Configuration.ConfigurationElement);Argument[0];ReturnValue;taint;df-generated |
+| System.Configuration;KeyValueConfigurationCollection;GetElementKey;(System.Configuration.ConfigurationElement);Argument[0];ReturnValue;taint;dfc-generated |
 | System.Configuration;KeyValueConfigurationCollection;get_AllKeys;();Argument[this];ReturnValue;taint;df-generated |
 | System.Configuration;KeyValueConfigurationCollection;get_Item;(System.String);Argument[this];ReturnValue;taint;df-generated |
 | System.Configuration;KeyValueConfigurationCollection;get_Properties;();Argument[this];ReturnValue;taint;df-generated |
@@ -8179,30 +8796,31 @@ summary
 | System.Configuration;KeyValueConfigurationElement;get_Key;();Argument[this];ReturnValue;taint;df-generated |
 | System.Configuration;KeyValueConfigurationElement;get_Properties;();Argument[this];ReturnValue;taint;df-generated |
 | System.Configuration;LocalFileSettingsProvider;GetPreviousVersion;(System.Configuration.SettingsContext,System.Configuration.SettingsProperty);Argument[this];ReturnValue;taint;df-generated |
-| System.Configuration;LocalFileSettingsProvider;Initialize;(System.String,System.Collections.Specialized.NameValueCollection);Argument[0];Argument[this];taint;df-generated |
-| System.Configuration;LocalFileSettingsProvider;Initialize;(System.String,System.Collections.Specialized.NameValueCollection);Argument[1].Element;Argument[this];taint;df-generated |
+| System.Configuration;LocalFileSettingsProvider;Initialize;(System.String,System.Collections.Specialized.NameValueCollection);Argument[0];Argument[this].SyntheticField[System.Configuration.Provider.ProviderBase._name];value;dfc-generated |
+| System.Configuration;LongValidator;Validate;(System.Object);Argument[0];Argument[this];taint;df-generated |
 | System.Configuration;LongValidatorAttribute;get_ValidatorInstance;();Argument[this];ReturnValue;taint;df-generated |
 | System.Configuration;NameValueConfigurationCollection;Add;(System.Configuration.NameValueConfigurationElement);Argument[this];Argument[0];taint;df-generated |
 | System.Configuration;NameValueConfigurationCollection;Clear;();Argument[this].WithoutElement;Argument[this];value;manual |
+| System.Configuration;NameValueConfigurationCollection;GetElementKey;(System.Configuration.ConfigurationElement);Argument[0].Property[System.Configuration.NameValueConfigurationElement.Name];ReturnValue;value;df-generated |
+| System.Configuration;NameValueConfigurationCollection;GetElementKey;(System.Configuration.ConfigurationElement);Argument[0].Property[System.Configuration.NameValueConfigurationElement.Name];ReturnValue;value;dfc-generated |
 | System.Configuration;NameValueConfigurationCollection;GetElementKey;(System.Configuration.ConfigurationElement);Argument[0];ReturnValue;taint;df-generated |
+| System.Configuration;NameValueConfigurationCollection;GetElementKey;(System.Configuration.ConfigurationElement);Argument[0];ReturnValue;taint;dfc-generated |
 | System.Configuration;NameValueConfigurationCollection;get_AllKeys;();Argument[this];ReturnValue;taint;df-generated |
 | System.Configuration;NameValueConfigurationCollection;get_Item;(System.String);Argument[this];ReturnValue;taint;df-generated |
 | System.Configuration;NameValueConfigurationCollection;get_Properties;();Argument[this];ReturnValue;taint;df-generated |
 | System.Configuration;NameValueConfigurationCollection;set_Item;(System.String,System.Configuration.NameValueConfigurationElement);Argument[this];Argument[1];taint;df-generated |
 | System.Configuration;NameValueConfigurationElement;get_Name;();Argument[this];ReturnValue;taint;df-generated |
 | System.Configuration;NameValueConfigurationElement;get_Properties;();Argument[this];ReturnValue;taint;df-generated |
-| System.Configuration;NameValueFileSectionHandler;Create;(System.Object,System.Object,System.Xml.XmlNode);Argument[0];ReturnValue;taint;df-generated |
-| System.Configuration;NameValueFileSectionHandler;Create;(System.Object,System.Object,System.Xml.XmlNode);Argument[2].Element;ReturnValue;taint;df-generated |
-| System.Configuration;NameValueSectionHandler;Create;(System.Object,System.Object,System.Xml.XmlNode);Argument[0];ReturnValue;taint;df-generated |
-| System.Configuration;NameValueSectionHandler;Create;(System.Object,System.Object,System.Xml.XmlNode);Argument[2].Element;ReturnValue;taint;df-generated |
+| System.Configuration;NameValueFileSectionHandler;Create;(System.Object,System.Object,System.Xml.XmlNode);Argument[0].Element;ReturnValue.Element;value;dfc-generated |
+| System.Configuration;NameValueSectionHandler;Create;(System.Object,System.Object,System.Xml.XmlNode);Argument[0].Element;ReturnValue.Element;value;dfc-generated |
+| System.Configuration;PositiveTimeSpanValidator;Validate;(System.Object);Argument[0];Argument[this];taint;df-generated |
 | System.Configuration;PositiveTimeSpanValidatorAttribute;get_ValidatorInstance;();Argument[this];ReturnValue;taint;df-generated |
 | System.Configuration;PropertyInformation;get_Converter;();Argument[this];ReturnValue;taint;df-generated |
 | System.Configuration;PropertyInformation;get_DefaultValue;();Argument[this];ReturnValue;taint;df-generated |
 | System.Configuration;PropertyInformation;get_Description;();Argument[this];ReturnValue;taint;df-generated |
 | System.Configuration;PropertyInformation;get_Validator;();Argument[this];ReturnValue;taint;df-generated |
-| System.Configuration;PropertyInformationCollection;CopyTo;(System.Configuration.PropertyInformation[],System.Int32);Argument[this];Argument[0].Element;taint;df-generated |
+| System.Configuration;PropertyInformationCollection;CopyTo;(System.Configuration.PropertyInformation[],System.Int32);Argument[this].Element;Argument[0].Element;value;dfc-generated |
 | System.Configuration;PropertyInformationCollection;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.IEnumerator.Current];value;manual |
-| System.Configuration;PropertyInformationCollection;get_Item;(System.String);Argument[this];ReturnValue;taint;df-generated |
 | System.Configuration;ProtectedConfigurationProviderCollection;get_Item;(System.String);Argument[this];ReturnValue;taint;df-generated |
 | System.Configuration;ProtectedConfigurationSection;get_Properties;();Argument[this];ReturnValue;taint;df-generated |
 | System.Configuration;ProtectedConfigurationSection;get_Providers;();Argument[this];ReturnValue;taint;df-generated |
@@ -8214,155 +8832,156 @@ summary
 | System.Configuration;ProviderSettings;get_Properties;();Argument[this];ReturnValue;taint;df-generated |
 | System.Configuration;ProviderSettingsCollection;Add;(System.Configuration.ProviderSettings);Argument[this];Argument[0];taint;df-generated |
 | System.Configuration;ProviderSettingsCollection;Clear;();Argument[this].WithoutElement;Argument[this];value;manual |
+| System.Configuration;ProviderSettingsCollection;GetElementKey;(System.Configuration.ConfigurationElement);Argument[0].Property[System.Configuration.ProviderSettings.Name];ReturnValue;value;df-generated |
+| System.Configuration;ProviderSettingsCollection;GetElementKey;(System.Configuration.ConfigurationElement);Argument[0].Property[System.Configuration.ProviderSettings.Name];ReturnValue;value;dfc-generated |
 | System.Configuration;ProviderSettingsCollection;GetElementKey;(System.Configuration.ConfigurationElement);Argument[0];ReturnValue;taint;df-generated |
+| System.Configuration;ProviderSettingsCollection;GetElementKey;(System.Configuration.ConfigurationElement);Argument[0];ReturnValue;taint;dfc-generated |
 | System.Configuration;ProviderSettingsCollection;get_Item;(System.Int32);Argument[this];ReturnValue;taint;df-generated |
 | System.Configuration;ProviderSettingsCollection;get_Item;(System.String);Argument[this];ReturnValue;taint;df-generated |
 | System.Configuration;ProviderSettingsCollection;get_Properties;();Argument[this];ReturnValue;taint;df-generated |
 | System.Configuration;ProviderSettingsCollection;set_Item;(System.Int32,System.Configuration.ProviderSettings);Argument[this];Argument[1];taint;df-generated |
 | System.Configuration;RegexStringValidator;RegexStringValidator;(System.String);Argument[0];Argument[this];taint;df-generated |
+| System.Configuration;RegexStringValidator;Validate;(System.Object);Argument[0];Argument[this];taint;df-generated |
 | System.Configuration;RegexStringValidatorAttribute;get_ValidatorInstance;();Argument[this];ReturnValue;taint;df-generated |
 | System.Configuration;SchemeSettingElement;get_Name;();Argument[this];ReturnValue;taint;df-generated |
 | System.Configuration;SchemeSettingElement;get_Properties;();Argument[this];ReturnValue;taint;df-generated |
+| System.Configuration;SchemeSettingElementCollection;GetElementKey;(System.Configuration.ConfigurationElement);Argument[0].Property[System.Configuration.SchemeSettingElement.Name];ReturnValue;value;df-generated |
+| System.Configuration;SchemeSettingElementCollection;GetElementKey;(System.Configuration.ConfigurationElement);Argument[0].Property[System.Configuration.SchemeSettingElement.Name];ReturnValue;value;dfc-generated |
 | System.Configuration;SchemeSettingElementCollection;GetElementKey;(System.Configuration.ConfigurationElement);Argument[0];ReturnValue;taint;df-generated |
+| System.Configuration;SchemeSettingElementCollection;GetElementKey;(System.Configuration.ConfigurationElement);Argument[0];ReturnValue;taint;dfc-generated |
 | System.Configuration;SchemeSettingElementCollection;get_Item;(System.Int32);Argument[this];ReturnValue;taint;df-generated |
 | System.Configuration;SchemeSettingElementCollection;get_Item;(System.String);Argument[this];ReturnValue;taint;df-generated |
 | System.Configuration;SectionInformation;GetParentSection;();Argument[this];ReturnValue;taint;df-generated |
-| System.Configuration;SectionInformation;GetRawXml;();Argument[this];ReturnValue;taint;df-generated |
+| System.Configuration;SectionInformation;GetRawXml;();Argument[this].SyntheticField[System.Configuration.SectionInformation.RawXml];ReturnValue;value;dfc-generated |
 | System.Configuration;SectionInformation;ProtectSection;(System.String);Argument[0];Argument[this];taint;df-generated |
-| System.Configuration;SectionInformation;SetRawXml;(System.String);Argument[0];Argument[this];taint;df-generated |
+| System.Configuration;SectionInformation;SetRawXml;(System.String);Argument[0];Argument[this].SyntheticField[System.Configuration.SectionInformation.RawXml];value;dfc-generated |
 | System.Configuration;SectionInformation;get_ProtectionProvider;();Argument[this];ReturnValue;taint;df-generated |
 | System.Configuration;SectionInformation;get_SectionName;();Argument[this];ReturnValue;taint;df-generated |
-| System.Configuration;SettingChangingEventArgs;SettingChangingEventArgs;(System.String,System.String,System.String,System.Object,System.Boolean);Argument[0];Argument[this];taint;df-generated |
-| System.Configuration;SettingChangingEventArgs;SettingChangingEventArgs;(System.String,System.String,System.String,System.Object,System.Boolean);Argument[1];Argument[this];taint;df-generated |
-| System.Configuration;SettingChangingEventArgs;SettingChangingEventArgs;(System.String,System.String,System.String,System.Object,System.Boolean);Argument[2];Argument[this];taint;df-generated |
-| System.Configuration;SettingChangingEventArgs;SettingChangingEventArgs;(System.String,System.String,System.String,System.Object,System.Boolean);Argument[3];Argument[this];taint;df-generated |
-| System.Configuration;SettingChangingEventArgs;get_NewValue;();Argument[this];ReturnValue;taint;df-generated |
-| System.Configuration;SettingChangingEventArgs;get_SettingClass;();Argument[this];ReturnValue;taint;df-generated |
-| System.Configuration;SettingChangingEventArgs;get_SettingKey;();Argument[this];ReturnValue;taint;df-generated |
-| System.Configuration;SettingChangingEventArgs;get_SettingName;();Argument[this];ReturnValue;taint;df-generated |
+| System.Configuration;SettingChangingEventArgs;SettingChangingEventArgs;(System.String,System.String,System.String,System.Object,System.Boolean);Argument[0];Argument[this].SyntheticField[System.Configuration.SettingChangingEventArgs._settingName];value;dfc-generated |
+| System.Configuration;SettingChangingEventArgs;SettingChangingEventArgs;(System.String,System.String,System.String,System.Object,System.Boolean);Argument[1];Argument[this].SyntheticField[System.Configuration.SettingChangingEventArgs._settingClass];value;dfc-generated |
+| System.Configuration;SettingChangingEventArgs;SettingChangingEventArgs;(System.String,System.String,System.String,System.Object,System.Boolean);Argument[2];Argument[this].SyntheticField[System.Configuration.SettingChangingEventArgs._settingKey];value;dfc-generated |
+| System.Configuration;SettingChangingEventArgs;SettingChangingEventArgs;(System.String,System.String,System.String,System.Object,System.Boolean);Argument[3];Argument[this].SyntheticField[System.Configuration.SettingChangingEventArgs._newValue];value;dfc-generated |
+| System.Configuration;SettingChangingEventArgs;get_NewValue;();Argument[this].SyntheticField[System.Configuration.SettingChangingEventArgs._newValue];ReturnValue;value;dfc-generated |
+| System.Configuration;SettingChangingEventArgs;get_SettingClass;();Argument[this].SyntheticField[System.Configuration.SettingChangingEventArgs._settingClass];ReturnValue;value;dfc-generated |
+| System.Configuration;SettingChangingEventArgs;get_SettingKey;();Argument[this].SyntheticField[System.Configuration.SettingChangingEventArgs._settingKey];ReturnValue;value;dfc-generated |
+| System.Configuration;SettingChangingEventArgs;get_SettingName;();Argument[this].SyntheticField[System.Configuration.SettingChangingEventArgs._settingName];ReturnValue;value;dfc-generated |
 | System.Configuration;SettingChangingEventHandler;BeginInvoke;(System.Object,System.Configuration.SettingChangingEventArgs,System.AsyncCallback,System.Object);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
 | System.Configuration;SettingElement;get_Properties;();Argument[this];ReturnValue;taint;df-generated |
 | System.Configuration;SettingElementCollection;Add;(System.Configuration.SettingElement);Argument[this];Argument[0];taint;df-generated |
 | System.Configuration;SettingElementCollection;Clear;();Argument[this].WithoutElement;Argument[this];value;manual |
 | System.Configuration;SettingElementCollection;Get;(System.String);Argument[this];ReturnValue;taint;df-generated |
+| System.Configuration;SettingElementCollection;GetElementKey;(System.Configuration.ConfigurationElement);Argument[0].Property[System.Configuration.SettingElement.Name];ReturnValue;value;df-generated |
+| System.Configuration;SettingElementCollection;GetElementKey;(System.Configuration.ConfigurationElement);Argument[0].Property[System.Configuration.SettingElement.Name];ReturnValue;value;dfc-generated |
 | System.Configuration;SettingElementCollection;GetElementKey;(System.Configuration.ConfigurationElement);Argument[0];ReturnValue;taint;df-generated |
+| System.Configuration;SettingElementCollection;GetElementKey;(System.Configuration.ConfigurationElement);Argument[0];ReturnValue;taint;dfc-generated |
 | System.Configuration;SettingValueElement;DeserializeElement;(System.Xml.XmlReader,System.Boolean);Argument[0];Argument[this];taint;df-generated |
-| System.Configuration;SettingValueElement;DeserializeElement;(System.Xml.XmlReader,System.Boolean);Argument[this];Argument[0];taint;df-generated |
 | System.Configuration;SettingValueElement;Reset;(System.Configuration.ConfigurationElement);Argument[0];Argument[this];taint;df-generated |
-| System.Configuration;SettingValueElement;SerializeToXmlElement;(System.Xml.XmlWriter,System.String);Argument[1];Argument[0];taint;df-generated |
 | System.Configuration;SettingValueElement;SerializeToXmlElement;(System.Xml.XmlWriter,System.String);Argument[this];Argument[0];taint;df-generated |
 | System.Configuration;SettingValueElement;Unmerge;(System.Configuration.ConfigurationElement,System.Configuration.ConfigurationElement,System.Configuration.ConfigurationSaveMode);Argument[0];Argument[this];taint;df-generated |
 | System.Configuration;SettingValueElement;get_Properties;();Argument[this];ReturnValue;taint;df-generated |
-| System.Configuration;SettingsBase;Initialize;(System.Configuration.SettingsContext,System.Configuration.SettingsPropertyCollection,System.Configuration.SettingsProviderCollection);Argument[0].Element;Argument[this];taint;df-generated |
-| System.Configuration;SettingsBase;Initialize;(System.Configuration.SettingsContext,System.Configuration.SettingsPropertyCollection,System.Configuration.SettingsProviderCollection);Argument[1].Element;Argument[this];taint;df-generated |
-| System.Configuration;SettingsBase;Initialize;(System.Configuration.SettingsContext,System.Configuration.SettingsPropertyCollection,System.Configuration.SettingsProviderCollection);Argument[2].Element;Argument[this];taint;df-generated |
-| System.Configuration;SettingsBase;Synchronized;(System.Configuration.SettingsBase);Argument[0];ReturnValue;taint;df-generated |
-| System.Configuration;SettingsBase;get_Context;();Argument[this];ReturnValue;taint;df-generated |
+| System.Configuration;SettingsBase;Initialize;(System.Configuration.SettingsContext,System.Configuration.SettingsPropertyCollection,System.Configuration.SettingsProviderCollection);Argument[0];Argument[this].SyntheticField[System.Configuration.SettingsBase._context];value;dfc-generated |
+| System.Configuration;SettingsBase;Initialize;(System.Configuration.SettingsContext,System.Configuration.SettingsPropertyCollection,System.Configuration.SettingsProviderCollection);Argument[1];Argument[this].SyntheticField[System.Configuration.SettingsBase._properties];value;dfc-generated |
+| System.Configuration;SettingsBase;Initialize;(System.Configuration.SettingsContext,System.Configuration.SettingsPropertyCollection,System.Configuration.SettingsProviderCollection);Argument[2];Argument[this].SyntheticField[System.Configuration.SettingsBase._providers];value;dfc-generated |
+| System.Configuration;SettingsBase;Synchronized;(System.Configuration.SettingsBase);Argument[0];ReturnValue;value;dfc-generated |
+| System.Configuration;SettingsBase;get_Context;();Argument[this].SyntheticField[System.Configuration.SettingsBase._context];ReturnValue;value;dfc-generated |
 | System.Configuration;SettingsBase;get_Item;(System.String);Argument[this];ReturnValue;taint;df-generated |
-| System.Configuration;SettingsBase;get_Properties;();Argument[this];ReturnValue;taint;df-generated |
+| System.Configuration;SettingsBase;get_Properties;();Argument[this].SyntheticField[System.Configuration.SettingsBase._properties];ReturnValue;value;dfc-generated |
 | System.Configuration;SettingsBase;get_PropertyValues;();Argument[this];ReturnValue;taint;df-generated |
-| System.Configuration;SettingsBase;get_Providers;();Argument[this];ReturnValue;taint;df-generated |
-| System.Configuration;SettingsDescriptionAttribute;SettingsDescriptionAttribute;(System.String);Argument[0];Argument[this];taint;df-generated |
-| System.Configuration;SettingsDescriptionAttribute;get_Description;();Argument[this];ReturnValue;taint;df-generated |
-| System.Configuration;SettingsGroupDescriptionAttribute;SettingsGroupDescriptionAttribute;(System.String);Argument[0];Argument[this];taint;df-generated |
-| System.Configuration;SettingsGroupDescriptionAttribute;get_Description;();Argument[this];ReturnValue;taint;df-generated |
-| System.Configuration;SettingsGroupNameAttribute;SettingsGroupNameAttribute;(System.String);Argument[0];Argument[this];taint;df-generated |
-| System.Configuration;SettingsGroupNameAttribute;get_GroupName;();Argument[this];ReturnValue;taint;df-generated |
-| System.Configuration;SettingsLoadedEventArgs;SettingsLoadedEventArgs;(System.Configuration.SettingsProvider);Argument[0];Argument[this];taint;df-generated |
-| System.Configuration;SettingsLoadedEventArgs;get_Provider;();Argument[this];ReturnValue;taint;df-generated |
+| System.Configuration;SettingsBase;get_Providers;();Argument[this].SyntheticField[System.Configuration.SettingsBase._providers];ReturnValue;value;dfc-generated |
+| System.Configuration;SettingsDescriptionAttribute;SettingsDescriptionAttribute;(System.String);Argument[0];Argument[this].SyntheticField[System.Configuration.SettingsDescriptionAttribute._description];value;dfc-generated |
+| System.Configuration;SettingsDescriptionAttribute;get_Description;();Argument[this].SyntheticField[System.Configuration.SettingsDescriptionAttribute._description];ReturnValue;value;dfc-generated |
+| System.Configuration;SettingsGroupDescriptionAttribute;SettingsGroupDescriptionAttribute;(System.String);Argument[0];Argument[this].SyntheticField[System.Configuration.SettingsGroupDescriptionAttribute._description];value;dfc-generated |
+| System.Configuration;SettingsGroupDescriptionAttribute;get_Description;();Argument[this].SyntheticField[System.Configuration.SettingsGroupDescriptionAttribute._description];ReturnValue;value;dfc-generated |
+| System.Configuration;SettingsGroupNameAttribute;SettingsGroupNameAttribute;(System.String);Argument[0];Argument[this].SyntheticField[System.Configuration.SettingsGroupNameAttribute._groupName];value;dfc-generated |
+| System.Configuration;SettingsGroupNameAttribute;get_GroupName;();Argument[this].SyntheticField[System.Configuration.SettingsGroupNameAttribute._groupName];ReturnValue;value;dfc-generated |
+| System.Configuration;SettingsLoadedEventArgs;SettingsLoadedEventArgs;(System.Configuration.SettingsProvider);Argument[0];Argument[this].SyntheticField[System.Configuration.SettingsLoadedEventArgs._provider];value;dfc-generated |
+| System.Configuration;SettingsLoadedEventArgs;get_Provider;();Argument[this].SyntheticField[System.Configuration.SettingsLoadedEventArgs._provider];ReturnValue;value;dfc-generated |
 | System.Configuration;SettingsLoadedEventHandler;BeginInvoke;(System.Object,System.Configuration.SettingsLoadedEventArgs,System.AsyncCallback,System.Object);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
 | System.Configuration;SettingsPropertyCollection;Clear;();Argument[this].WithoutElement;Argument[this];value;manual |
-| System.Configuration;SettingsPropertyCollection;Clone;();Argument[this];ReturnValue;taint;df-generated |
-| System.Configuration;SettingsPropertyCollection;Clone;();Argument[this];ReturnValue;value;df-generated |
+| System.Configuration;SettingsPropertyCollection;Clone;();Argument[this];ReturnValue;value;dfc-generated |
 | System.Configuration;SettingsPropertyCollection;CopyTo;(System.Array,System.Int32);Argument[this].Element;Argument[0].Element;value;manual |
 | System.Configuration;SettingsPropertyCollection;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.IEnumerator.Current];value;manual |
 | System.Configuration;SettingsPropertyCollection;get_Item;(System.String);Argument[this];ReturnValue;taint;df-generated |
-| System.Configuration;SettingsPropertyCollection;get_SyncRoot;();Argument[this];ReturnValue;taint;df-generated |
-| System.Configuration;SettingsPropertyCollection;get_SyncRoot;();Argument[this];ReturnValue;value;df-generated |
-| System.Configuration;SettingsPropertyValue;get_Name;();Argument[this];ReturnValue;taint;df-generated |
-| System.Configuration;SettingsPropertyValueCollection;Add;(System.Configuration.SettingsPropertyValue);Argument[0];Argument[this];taint;df-generated |
+| System.Configuration;SettingsPropertyCollection;get_SyncRoot;();Argument[this];ReturnValue;value;dfc-generated |
+| System.Configuration;SettingsPropertyValue;get_Name;();Argument[this].Property[System.Configuration.SettingsPropertyValue.Property].Property[System.Configuration.SettingsProperty.Name];ReturnValue;value;dfc-generated |
+| System.Configuration;SettingsPropertyValueCollection;Add;(System.Configuration.SettingsPropertyValue);Argument[0];Argument[this].SyntheticField[System.Configuration.SettingsPropertyValueCollection._values].Element;value;dfc-generated |
 | System.Configuration;SettingsPropertyValueCollection;Clear;();Argument[this].WithoutElement;Argument[this];value;manual |
-| System.Configuration;SettingsPropertyValueCollection;Clone;();Argument[this];ReturnValue;taint;df-generated |
-| System.Configuration;SettingsPropertyValueCollection;Clone;();Argument[this];ReturnValue;value;df-generated |
+| System.Configuration;SettingsPropertyValueCollection;Clone;();Argument[this];ReturnValue;value;dfc-generated |
 | System.Configuration;SettingsPropertyValueCollection;CopyTo;(System.Array,System.Int32);Argument[this].Element;Argument[0].Element;value;manual |
 | System.Configuration;SettingsPropertyValueCollection;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.IEnumerator.Current];value;manual |
-| System.Configuration;SettingsPropertyValueCollection;get_Item;(System.String);Argument[this];ReturnValue;taint;df-generated |
-| System.Configuration;SettingsPropertyValueCollection;get_SyncRoot;();Argument[this];ReturnValue;taint;df-generated |
-| System.Configuration;SettingsPropertyValueCollection;get_SyncRoot;();Argument[this];ReturnValue;value;df-generated |
-| System.Configuration;SettingsProviderAttribute;SettingsProviderAttribute;(System.String);Argument[0];Argument[this];taint;df-generated |
-| System.Configuration;SettingsProviderAttribute;get_ProviderTypeName;();Argument[this];ReturnValue;taint;df-generated |
+| System.Configuration;SettingsPropertyValueCollection;get_Item;(System.String);Argument[this].SyntheticField[System.Configuration.SettingsPropertyValueCollection._values].Element;ReturnValue;value;dfc-generated |
+| System.Configuration;SettingsPropertyValueCollection;get_SyncRoot;();Argument[this];ReturnValue;value;dfc-generated |
+| System.Configuration;SettingsProviderAttribute;SettingsProviderAttribute;(System.String);Argument[0];Argument[this].SyntheticField[System.Configuration.SettingsProviderAttribute._providerTypeName];value;dfc-generated |
+| System.Configuration;SettingsProviderAttribute;get_ProviderTypeName;();Argument[this].SyntheticField[System.Configuration.SettingsProviderAttribute._providerTypeName];ReturnValue;value;dfc-generated |
 | System.Configuration;SettingsProviderCollection;get_Item;(System.String);Argument[this];ReturnValue;taint;df-generated |
 | System.Configuration;SettingsSavingEventHandler;BeginInvoke;(System.Object,System.ComponentModel.CancelEventArgs,System.AsyncCallback,System.Object);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
-| System.Configuration;SingleTagSectionHandler;Create;(System.Object,System.Object,System.Xml.XmlNode);Argument[0];ReturnValue;taint;df-generated |
-| System.Configuration;SingleTagSectionHandler;Create;(System.Object,System.Object,System.Xml.XmlNode);Argument[2].Element;ReturnValue;taint;df-generated |
+| System.Configuration;SingleTagSectionHandler;Create;(System.Object,System.Object,System.Xml.XmlNode);Argument[0].Element.Property[System.Collections.Generic.KeyValuePair`2.Key];ReturnValue.Element.Property[System.Collections.Generic.KeyValuePair`2.Key];value;dfc-generated |
+| System.Configuration;SingleTagSectionHandler;Create;(System.Object,System.Object,System.Xml.XmlNode);Argument[0].Element.Property[System.Collections.Generic.KeyValuePair`2.Value];ReturnValue.Element.Property[System.Collections.Generic.KeyValuePair`2.Value];value;dfc-generated |
+| System.Configuration;SingleTagSectionHandler;Create;(System.Object,System.Object,System.Xml.XmlNode);Argument[0].Element;ReturnValue.Element;value;dfc-generated |
 | System.Configuration;StringValidator;StringValidator;(System.Int32,System.Int32,System.String);Argument[2];Argument[this];taint;df-generated |
+| System.Configuration;StringValidator;Validate;(System.Object);Argument[0];Argument[this];taint;df-generated |
 | System.Configuration;StringValidatorAttribute;get_ValidatorInstance;();Argument[this];ReturnValue;taint;df-generated |
+| System.Configuration;SubclassTypeValidator;Validate;(System.Object);Argument[0];Argument[this];taint;df-generated |
 | System.Configuration;SubclassTypeValidatorAttribute;get_ValidatorInstance;();Argument[this];ReturnValue;taint;df-generated |
-| System.Configuration;TimeSpanMinutesConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[0];ReturnValue;taint;df-generated |
-| System.Configuration;TimeSpanMinutesConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue;taint;df-generated |
-| System.Configuration;TimeSpanMinutesConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[this];ReturnValue;taint;df-generated |
-| System.Configuration;TimeSpanMinutesConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[1];ReturnValue;taint;df-generated |
-| System.Configuration;TimeSpanMinutesConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[2];ReturnValue;taint;df-generated |
-| System.Configuration;TimeSpanMinutesConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[this];ReturnValue;taint;df-generated |
-| System.Configuration;TimeSpanMinutesOrInfiniteConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[0];ReturnValue;taint;df-generated |
-| System.Configuration;TimeSpanMinutesOrInfiniteConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue;taint;df-generated |
-| System.Configuration;TimeSpanMinutesOrInfiniteConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[this];ReturnValue;taint;df-generated |
-| System.Configuration;TimeSpanMinutesOrInfiniteConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[1];ReturnValue;taint;df-generated |
-| System.Configuration;TimeSpanMinutesOrInfiniteConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[2];ReturnValue;taint;df-generated |
-| System.Configuration;TimeSpanMinutesOrInfiniteConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[this];ReturnValue;taint;df-generated |
-| System.Configuration;TimeSpanSecondsConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[0];ReturnValue;taint;df-generated |
-| System.Configuration;TimeSpanSecondsConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue;taint;df-generated |
-| System.Configuration;TimeSpanSecondsConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[this];ReturnValue;taint;df-generated |
-| System.Configuration;TimeSpanSecondsConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[1];ReturnValue;taint;df-generated |
-| System.Configuration;TimeSpanSecondsConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[2];ReturnValue;taint;df-generated |
-| System.Configuration;TimeSpanSecondsConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[this];ReturnValue;taint;df-generated |
-| System.Configuration;TimeSpanSecondsOrInfiniteConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[0];ReturnValue;taint;df-generated |
-| System.Configuration;TimeSpanSecondsOrInfiniteConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue;taint;df-generated |
-| System.Configuration;TimeSpanSecondsOrInfiniteConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[this];ReturnValue;taint;df-generated |
-| System.Configuration;TimeSpanSecondsOrInfiniteConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[1];ReturnValue;taint;df-generated |
-| System.Configuration;TimeSpanSecondsOrInfiniteConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[2];ReturnValue;taint;df-generated |
-| System.Configuration;TimeSpanSecondsOrInfiniteConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[this];ReturnValue;taint;df-generated |
+| System.Configuration;TimeSpanMinutesConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue.Element;taint;dfc-generated |
+| System.Configuration;TimeSpanMinutesConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue;taint;dfc-generated |
+| System.Configuration;TimeSpanMinutesConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue;value;dfc-generated |
+| System.Configuration;TimeSpanMinutesConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[2].Element;ReturnValue;taint;dfc-generated |
+| System.Configuration;TimeSpanMinutesConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[2];ReturnValue;taint;dfc-generated |
+| System.Configuration;TimeSpanMinutesOrInfiniteConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue.Element;taint;dfc-generated |
+| System.Configuration;TimeSpanMinutesOrInfiniteConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue;taint;dfc-generated |
+| System.Configuration;TimeSpanMinutesOrInfiniteConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue;value;dfc-generated |
+| System.Configuration;TimeSpanMinutesOrInfiniteConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[2].Element;ReturnValue;taint;dfc-generated |
+| System.Configuration;TimeSpanMinutesOrInfiniteConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[2];ReturnValue;taint;dfc-generated |
+| System.Configuration;TimeSpanSecondsConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue.Element;taint;dfc-generated |
+| System.Configuration;TimeSpanSecondsConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue;taint;dfc-generated |
+| System.Configuration;TimeSpanSecondsConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue;value;dfc-generated |
+| System.Configuration;TimeSpanSecondsConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[2].Element;ReturnValue;taint;dfc-generated |
+| System.Configuration;TimeSpanSecondsConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[2];ReturnValue;taint;dfc-generated |
+| System.Configuration;TimeSpanSecondsOrInfiniteConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue.Element;taint;dfc-generated |
+| System.Configuration;TimeSpanSecondsOrInfiniteConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue;taint;dfc-generated |
+| System.Configuration;TimeSpanSecondsOrInfiniteConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue;value;dfc-generated |
+| System.Configuration;TimeSpanSecondsOrInfiniteConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[2].Element;ReturnValue;taint;dfc-generated |
+| System.Configuration;TimeSpanSecondsOrInfiniteConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[2];ReturnValue;taint;dfc-generated |
 | System.Configuration;TimeSpanValidator;TimeSpanValidator;(System.TimeSpan,System.TimeSpan,System.Boolean,System.Int64);Argument[0];Argument[this];taint;df-generated |
 | System.Configuration;TimeSpanValidator;TimeSpanValidator;(System.TimeSpan,System.TimeSpan,System.Boolean,System.Int64);Argument[1];Argument[this];taint;df-generated |
+| System.Configuration;TimeSpanValidator;Validate;(System.Object);Argument[0];Argument[this];taint;df-generated |
 | System.Configuration;TimeSpanValidatorAttribute;get_ValidatorInstance;();Argument[this];ReturnValue;taint;df-generated |
-| System.Configuration;TypeNameConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[0];ReturnValue;taint;df-generated |
-| System.Configuration;TypeNameConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue;taint;df-generated |
-| System.Configuration;TypeNameConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[this];ReturnValue;taint;df-generated |
-| System.Configuration;TypeNameConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[1];ReturnValue;taint;df-generated |
-| System.Configuration;TypeNameConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[2];ReturnValue;taint;df-generated |
-| System.Configuration;TypeNameConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[this];ReturnValue;taint;df-generated |
+| System.Configuration;TypeNameConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue.Element;taint;dfc-generated |
+| System.Configuration;TypeNameConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue;taint;dfc-generated |
+| System.Configuration;TypeNameConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue;value;dfc-generated |
+| System.Configuration;TypeNameConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[2].Element;ReturnValue;taint;dfc-generated |
+| System.Configuration;TypeNameConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[2];ReturnValue;taint;dfc-generated |
 | System.Configuration;UriSection;get_Idn;();Argument[this];ReturnValue;taint;df-generated |
 | System.Configuration;UriSection;get_IriParsing;();Argument[this];ReturnValue;taint;df-generated |
 | System.Configuration;UriSection;get_Properties;();Argument[this];ReturnValue;taint;df-generated |
 | System.Configuration;UriSection;get_SchemeSettings;();Argument[this];ReturnValue;taint;df-generated |
 | System.Configuration;ValidatorCallback;BeginInvoke;(System.Object,System.AsyncCallback,System.Object);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
-| System.Configuration;WhiteSpaceTrimStringConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[0];ReturnValue;taint;df-generated |
-| System.Configuration;WhiteSpaceTrimStringConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue;taint;df-generated |
-| System.Configuration;WhiteSpaceTrimStringConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[this];ReturnValue;taint;df-generated |
-| System.Configuration;WhiteSpaceTrimStringConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[1];ReturnValue;taint;df-generated |
-| System.Configuration;WhiteSpaceTrimStringConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[2];ReturnValue;taint;df-generated |
-| System.Configuration;WhiteSpaceTrimStringConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[this];ReturnValue;taint;df-generated |
-| System.Data.Common;DBDataPermission;Copy;();Argument[this];ReturnValue;taint;df-generated |
-| System.Data.Common;DBDataPermission;Copy;();Argument[this];ReturnValue;value;df-generated |
-| System.Data.Common;DBDataPermission;Intersect;(System.Security.IPermission);Argument[0];ReturnValue;taint;df-generated |
-| System.Data.Common;DBDataPermission;Intersect;(System.Security.IPermission);Argument[this];ReturnValue;taint;df-generated |
+| System.Configuration;WhiteSpaceTrimStringConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue.Element;taint;dfc-generated |
+| System.Configuration;WhiteSpaceTrimStringConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue;taint;dfc-generated |
+| System.Configuration;WhiteSpaceTrimStringConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue;value;dfc-generated |
+| System.Configuration;WhiteSpaceTrimStringConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[2].Element;ReturnValue;taint;dfc-generated |
+| System.Configuration;WhiteSpaceTrimStringConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[2];ReturnValue;taint;dfc-generated |
+| System.Data.Common;DBDataPermission;Copy;();Argument[this];ReturnValue;value;dfc-generated |
+| System.Data.Common;DBDataPermission;Intersect;(System.Security.IPermission);Argument[0];ReturnValue;value;dfc-generated |
 | System.Data.Common;DBDataPermission;Union;(System.Security.IPermission);Argument[this];ReturnValue;taint;df-generated |
-| System.Data.Common;DataAdapter;FillSchema;(System.Data.DataTable,System.Data.SchemaType,System.Data.IDataReader);Argument[0];ReturnValue;taint;df-generated |
-| System.Data.Common;DataAdapter;FillSchema;(System.Data.DataTable,System.Data.SchemaType,System.Data.IDataReader);Argument[this];ReturnValue;taint;df-generated |
+| System.Data.Common;DataAdapter;FillSchema;(System.Data.DataTable,System.Data.SchemaType,System.Data.IDataReader);Argument[0];ReturnValue.Element;value;dfc-generated |
+| System.Data.Common;DataAdapter;FillSchema;(System.Data.DataTable,System.Data.SchemaType,System.Data.IDataReader);Argument[0];ReturnValue;value;dfc-generated |
 | System.Data.Common;DataAdapter;GetFillParameters;();Argument[this];ReturnValue;taint;df-generated |
 | System.Data.Common;DataAdapter;add_FillError;(System.Data.FillErrorEventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
+| System.Data.Common;DataAdapter;get_TableMappings;();Argument[this].Property[System.Data.Common.DataAdapter.TableMappings];ReturnValue;value;df-generated |
+| System.Data.Common;DataAdapter;get_TableMappings;();Argument[this].Property[System.Data.Common.DataAdapter.TableMappings];ReturnValue;value;dfc-generated |
 | System.Data.Common;DataAdapter;get_TableMappings;();Argument[this];ReturnValue;taint;df-generated |
+| System.Data.Common;DataAdapter;get_TableMappings;();Argument[this];ReturnValue;taint;dfc-generated |
 | System.Data.Common;DataAdapter;remove_FillError;(System.Data.FillErrorEventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
-| System.Data.Common;DataColumnMapping;Clone;();Argument[this];ReturnValue;taint;df-generated |
-| System.Data.Common;DataColumnMapping;Clone;();Argument[this];ReturnValue;value;df-generated |
-| System.Data.Common;DataColumnMapping;DataColumnMapping;(System.String,System.String);Argument[0];Argument[this];taint;df-generated |
-| System.Data.Common;DataColumnMapping;DataColumnMapping;(System.String,System.String);Argument[1];Argument[this];taint;df-generated |
+| System.Data.Common;DataColumnMapping;Clone;();Argument[this].SyntheticField[System.Data.Common.DataColumnMapping._sourceColumnName];ReturnValue.SyntheticField[System.Data.Common.DataColumnMapping._sourceColumnName];value;dfc-generated |
+| System.Data.Common;DataColumnMapping;Clone;();Argument[this];ReturnValue;value;dfc-generated |
+| System.Data.Common;DataColumnMapping;DataColumnMapping;(System.String,System.String);Argument[0];Argument[this].SyntheticField[System.Data.Common.DataColumnMapping._sourceColumnName];value;dfc-generated |
 | System.Data.Common;DataColumnMapping;GetDataColumnBySchemaAction;(System.Data.DataTable,System.Type,System.Data.MissingSchemaAction);Argument[0];ReturnValue;taint;df-generated |
 | System.Data.Common;DataColumnMapping;GetDataColumnBySchemaAction;(System.String,System.String,System.Data.DataTable,System.Type,System.Data.MissingSchemaAction);Argument[2];ReturnValue;taint;df-generated |
-| System.Data.Common;DataColumnMapping;ToString;();Argument[this];ReturnValue;taint;df-generated |
+| System.Data.Common;DataColumnMapping;ToString;();Argument[this].Property[System.Data.Common.DataColumnMapping.SourceColumn];ReturnValue;value;dfc-generated |
+| System.Data.Common;DataColumnMapping;ToString;();Argument[this].SyntheticField[System.Data.Common.DataColumnMapping._sourceColumnName];ReturnValue;value;dfc-generated |
 | System.Data.Common;DataColumnMappingCollection;Add;(System.Object);Argument[0];Argument[this].Element;value;manual |
-| System.Data.Common;DataColumnMappingCollection;Add;(System.String,System.String);Argument[0];ReturnValue;taint;df-generated |
-| System.Data.Common;DataColumnMappingCollection;Add;(System.String,System.String);Argument[1];ReturnValue;taint;df-generated |
 | System.Data.Common;DataColumnMappingCollection;Add;(System.String,System.String);Argument[this];ReturnValue;taint;df-generated |
 | System.Data.Common;DataColumnMappingCollection;AddRange;(System.Array);Argument[0].Element;Argument[this].Element;value;manual |
 | System.Data.Common;DataColumnMappingCollection;AddRange;(System.Data.Common.DataColumnMapping[]);Argument[0].Element;Argument[this].Element;value;manual |
@@ -8371,38 +8990,32 @@ summary
 | System.Data.Common;DataColumnMappingCollection;CopyTo;(System.Data.Common.DataColumnMapping[],System.Int32);Argument[this].Element;Argument[0].Element;value;manual |
 | System.Data.Common;DataColumnMappingCollection;GetByDataSetColumn;(System.String);Argument[this];ReturnValue;taint;df-generated |
 | System.Data.Common;DataColumnMappingCollection;GetColumnMappingBySchemaAction;(System.Data.Common.DataColumnMappingCollection,System.String,System.Data.MissingMappingAction);Argument[0].Element;ReturnValue;taint;df-generated |
-| System.Data.Common;DataColumnMappingCollection;GetColumnMappingBySchemaAction;(System.Data.Common.DataColumnMappingCollection,System.String,System.Data.MissingMappingAction);Argument[1];ReturnValue;taint;df-generated |
 | System.Data.Common;DataColumnMappingCollection;GetDataColumn;(System.Data.Common.DataColumnMappingCollection,System.String,System.Type,System.Data.DataTable,System.Data.MissingMappingAction,System.Data.MissingSchemaAction);Argument[3];ReturnValue;taint;df-generated |
 | System.Data.Common;DataColumnMappingCollection;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.IEnumerator.Current];value;manual |
 | System.Data.Common;DataColumnMappingCollection;Insert;(System.Int32,System.Data.Common.DataColumnMapping);Argument[1];Argument[this].Element;value;manual |
 | System.Data.Common;DataColumnMappingCollection;Insert;(System.Int32,System.Object);Argument[1];Argument[this].Element;value;manual |
-| System.Data.Common;DataColumnMappingCollection;Remove;(System.Object);Argument[0];Argument[this];taint;df-generated |
-| System.Data.Common;DataColumnMappingCollection;Remove;(System.Object);Argument[this];Argument[0];taint;df-generated |
 | System.Data.Common;DataColumnMappingCollection;get_Item;(System.Int32);Argument[this].Element;ReturnValue;value;manual |
 | System.Data.Common;DataColumnMappingCollection;get_Item;(System.String);Argument[this].Element;ReturnValue;value;manual |
-| System.Data.Common;DataColumnMappingCollection;get_SyncRoot;();Argument[this];ReturnValue;taint;df-generated |
-| System.Data.Common;DataColumnMappingCollection;get_SyncRoot;();Argument[this];ReturnValue;value;df-generated |
+| System.Data.Common;DataColumnMappingCollection;get_SyncRoot;();Argument[this];ReturnValue;value;dfc-generated |
 | System.Data.Common;DataColumnMappingCollection;set_Item;(System.Int32,System.Data.Common.DataColumnMapping);Argument[1];Argument[this].Element;value;manual |
 | System.Data.Common;DataColumnMappingCollection;set_Item;(System.Int32,System.Object);Argument[1];Argument[this].Element;value;manual |
 | System.Data.Common;DataColumnMappingCollection;set_Item;(System.String,System.Data.Common.DataColumnMapping);Argument[1];Argument[this].Element;value;manual |
 | System.Data.Common;DataColumnMappingCollection;set_Item;(System.String,System.Object);Argument[1];Argument[this].Element;value;manual |
-| System.Data.Common;DataTableMapping;Clone;();Argument[this];ReturnValue;taint;df-generated |
-| System.Data.Common;DataTableMapping;Clone;();Argument[this];ReturnValue;value;df-generated |
-| System.Data.Common;DataTableMapping;DataTableMapping;(System.String,System.String);Argument[0];Argument[this];taint;df-generated |
-| System.Data.Common;DataTableMapping;DataTableMapping;(System.String,System.String);Argument[1];Argument[this];taint;df-generated |
-| System.Data.Common;DataTableMapping;DataTableMapping;(System.String,System.String,System.Data.Common.DataColumnMapping[]);Argument[0];Argument[this];taint;df-generated |
-| System.Data.Common;DataTableMapping;DataTableMapping;(System.String,System.String,System.Data.Common.DataColumnMapping[]);Argument[1];Argument[this];taint;df-generated |
-| System.Data.Common;DataTableMapping;DataTableMapping;(System.String,System.String,System.Data.Common.DataColumnMapping[]);Argument[2].Element;Argument[this];taint;df-generated |
-| System.Data.Common;DataTableMapping;GetColumnMappingBySchemaAction;(System.String,System.Data.MissingMappingAction);Argument[0];ReturnValue;taint;df-generated |
+| System.Data.Common;DataTableMapping;Clone;();Argument[this].SyntheticField[System.Data.Common.DataTableMapping._sourceTableName];ReturnValue.SyntheticField[System.Data.Common.DataTableMapping._sourceTableName];value;dfc-generated |
+| System.Data.Common;DataTableMapping;Clone;();Argument[this];ReturnValue;value;dfc-generated |
+| System.Data.Common;DataTableMapping;DataTableMapping;(System.String,System.String);Argument[0];Argument[this].SyntheticField[System.Data.Common.DataTableMapping._sourceTableName];value;dfc-generated |
+| System.Data.Common;DataTableMapping;DataTableMapping;(System.String,System.String,System.Data.Common.DataColumnMapping[]);Argument[0];Argument[this].SyntheticField[System.Data.Common.DataTableMapping._sourceTableName];value;dfc-generated |
+| System.Data.Common;DataTableMapping;DataTableMapping;(System.String,System.String,System.Data.Common.DataColumnMapping[]);Argument[2].Element;Argument[this].Property[System.Data.Common.DataTableMapping.ColumnMappings].Element;value;dfc-generated |
+| System.Data.Common;DataTableMapping;DataTableMapping;(System.String,System.String,System.Data.Common.DataColumnMapping[]);Argument[2].Element;Argument[this].SyntheticField[System.Data.Common.DataTableMapping._columnMappings].Element;value;dfc-generated |
 | System.Data.Common;DataTableMapping;GetColumnMappingBySchemaAction;(System.String,System.Data.MissingMappingAction);Argument[this];ReturnValue;taint;df-generated |
 | System.Data.Common;DataTableMapping;GetDataColumn;(System.String,System.Type,System.Data.DataTable,System.Data.MissingMappingAction,System.Data.MissingSchemaAction);Argument[2];ReturnValue;taint;df-generated |
 | System.Data.Common;DataTableMapping;GetDataTableBySchemaAction;(System.Data.DataSet,System.Data.MissingSchemaAction);Argument[0];ReturnValue;taint;df-generated |
 | System.Data.Common;DataTableMapping;GetDataTableBySchemaAction;(System.Data.DataSet,System.Data.MissingSchemaAction);Argument[this];ReturnValue;taint;df-generated |
-| System.Data.Common;DataTableMapping;ToString;();Argument[this];ReturnValue;taint;df-generated |
-| System.Data.Common;DataTableMapping;get_ColumnMappings;();Argument[this];ReturnValue;taint;df-generated |
+| System.Data.Common;DataTableMapping;ToString;();Argument[this].Property[System.Data.Common.DataTableMapping.SourceTable];ReturnValue;value;dfc-generated |
+| System.Data.Common;DataTableMapping;ToString;();Argument[this].SyntheticField[System.Data.Common.DataTableMapping._sourceTableName];ReturnValue;value;dfc-generated |
+| System.Data.Common;DataTableMapping;get_ColumnMappings;();Argument[this].Property[System.Data.Common.DataTableMapping.ColumnMappings];ReturnValue;value;dfc-generated |
+| System.Data.Common;DataTableMapping;get_ColumnMappings;();Argument[this].SyntheticField[System.Data.Common.DataTableMapping._columnMappings];ReturnValue;value;dfc-generated |
 | System.Data.Common;DataTableMappingCollection;Add;(System.Object);Argument[0];Argument[this].Element;value;manual |
-| System.Data.Common;DataTableMappingCollection;Add;(System.String,System.String);Argument[0];ReturnValue;taint;df-generated |
-| System.Data.Common;DataTableMappingCollection;Add;(System.String,System.String);Argument[1];ReturnValue;taint;df-generated |
 | System.Data.Common;DataTableMappingCollection;Add;(System.String,System.String);Argument[this];ReturnValue;taint;df-generated |
 | System.Data.Common;DataTableMappingCollection;AddRange;(System.Array);Argument[0].Element;Argument[this].Element;value;manual |
 | System.Data.Common;DataTableMappingCollection;AddRange;(System.Data.Common.DataTableMapping[]);Argument[0].Element;Argument[this].Element;value;manual |
@@ -8412,24 +9025,19 @@ summary
 | System.Data.Common;DataTableMappingCollection;GetByDataSetTable;(System.String);Argument[this];ReturnValue;taint;df-generated |
 | System.Data.Common;DataTableMappingCollection;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.IEnumerator.Current];value;manual |
 | System.Data.Common;DataTableMappingCollection;GetTableMappingBySchemaAction;(System.Data.Common.DataTableMappingCollection,System.String,System.String,System.Data.MissingMappingAction);Argument[0].Element;ReturnValue;taint;df-generated |
-| System.Data.Common;DataTableMappingCollection;GetTableMappingBySchemaAction;(System.Data.Common.DataTableMappingCollection,System.String,System.String,System.Data.MissingMappingAction);Argument[1];ReturnValue;taint;df-generated |
-| System.Data.Common;DataTableMappingCollection;GetTableMappingBySchemaAction;(System.Data.Common.DataTableMappingCollection,System.String,System.String,System.Data.MissingMappingAction);Argument[2];ReturnValue;taint;df-generated |
 | System.Data.Common;DataTableMappingCollection;Insert;(System.Int32,System.Data.Common.DataTableMapping);Argument[1];Argument[this].Element;value;manual |
 | System.Data.Common;DataTableMappingCollection;Insert;(System.Int32,System.Object);Argument[1];Argument[this].Element;value;manual |
-| System.Data.Common;DataTableMappingCollection;Remove;(System.Object);Argument[0];Argument[this];taint;df-generated |
-| System.Data.Common;DataTableMappingCollection;Remove;(System.Object);Argument[this];Argument[0];taint;df-generated |
 | System.Data.Common;DataTableMappingCollection;get_Item;(System.Int32);Argument[this].Element;ReturnValue;value;manual |
 | System.Data.Common;DataTableMappingCollection;get_Item;(System.String);Argument[this].Element;ReturnValue;value;manual |
-| System.Data.Common;DataTableMappingCollection;get_SyncRoot;();Argument[this];ReturnValue;taint;df-generated |
-| System.Data.Common;DataTableMappingCollection;get_SyncRoot;();Argument[this];ReturnValue;value;df-generated |
+| System.Data.Common;DataTableMappingCollection;get_SyncRoot;();Argument[this];ReturnValue;value;dfc-generated |
 | System.Data.Common;DataTableMappingCollection;set_Item;(System.Int32,System.Data.Common.DataTableMapping);Argument[1];Argument[this].Element;value;manual |
 | System.Data.Common;DataTableMappingCollection;set_Item;(System.Int32,System.Object);Argument[1];Argument[this].Element;value;manual |
 | System.Data.Common;DataTableMappingCollection;set_Item;(System.String,System.Data.Common.DataTableMapping);Argument[1];Argument[this].Element;value;manual |
 | System.Data.Common;DataTableMappingCollection;set_Item;(System.String,System.Object);Argument[1];Argument[this].Element;value;manual |
 | System.Data.Common;DbBatch;DisposeAsync;();Argument[this];ReturnValue;taint;df-generated |
-| System.Data.Common;DbBatch;get_BatchCommands;();Argument[this];ReturnValue;taint;df-generated |
+| System.Data.Common;DbBatch;get_BatchCommands;();Argument[this].Property[System.Data.Common.DbBatch.DbBatchCommands];ReturnValue;value;dfc-generated |
 | System.Data.Common;DbBatch;get_DbBatchCommands;();Argument[this];ReturnValue;taint;df-generated |
-| System.Data.Common;DbBatchCommand;get_Parameters;();Argument[this];ReturnValue;taint;df-generated |
+| System.Data.Common;DbBatchCommand;get_Parameters;();Argument[this].Property[System.Data.Common.DbBatchCommand.DbParameterCollection];ReturnValue;value;dfc-generated |
 | System.Data.Common;DbBatchCommandCollection;Add;(System.Data.Common.DbBatchCommand);Argument[0];Argument[this].Element;value;manual |
 | System.Data.Common;DbBatchCommandCollection;Clear;();Argument[this].WithoutElement;Argument[this];value;manual |
 | System.Data.Common;DbBatchCommandCollection;CopyTo;(System.Data.Common.DbBatchCommand[],System.Int32);Argument[this].Element;Argument[0].Element;value;manual |
@@ -8441,44 +9049,23 @@ summary
 | System.Data.Common;DbColumn;get_Item;(System.String);Argument[this];ReturnValue;taint;df-generated |
 | System.Data.Common;DbCommand;DisposeAsync;();Argument[this];ReturnValue;taint;df-generated |
 | System.Data.Common;DbCommand;ExecuteDbDataReader;(System.Data.CommandBehavior);Argument[this];ReturnValue;taint;df-generated |
-| System.Data.Common;DbCommand;ExecuteDbDataReaderAsync;(System.Data.CommandBehavior,System.Threading.CancellationToken);Argument[this];ReturnValue;taint;df-generated |
-| System.Data.Common;DbCommand;ExecuteReader;();Argument[this];ReturnValue;taint;df-generated |
 | System.Data.Common;DbCommand;ExecuteReader;();Argument[this];ReturnValue;taint;manual |
-| System.Data.Common;DbCommand;ExecuteReader;(System.Data.CommandBehavior);Argument[this];ReturnValue;taint;df-generated |
-| System.Data.Common;DbCommand;ExecuteReaderAsync;();Argument[this];ReturnValue;taint;df-generated |
-| System.Data.Common;DbCommand;ExecuteReaderAsync;(System.Data.CommandBehavior);Argument[this];ReturnValue;taint;df-generated |
-| System.Data.Common;DbCommand;ExecuteReaderAsync;(System.Data.CommandBehavior,System.Threading.CancellationToken);Argument[this];ReturnValue;taint;df-generated |
-| System.Data.Common;DbCommand;ExecuteReaderAsync;(System.Threading.CancellationToken);Argument[this];ReturnValue;taint;df-generated |
 | System.Data.Common;DbCommand;ExecuteScalar;();Argument[this];ReturnValue;taint;df-generated |
-| System.Data.Common;DbCommand;ExecuteScalarAsync;();Argument[this];ReturnValue;taint;df-generated |
-| System.Data.Common;DbCommand;ExecuteScalarAsync;(System.Threading.CancellationToken);Argument[this];ReturnValue;taint;df-generated |
-| System.Data.Common;DbCommand;PrepareAsync;(System.Threading.CancellationToken);Argument[0];ReturnValue;taint;df-generated |
 | System.Data.Common;DbCommand;get_DbParameterCollection;();Argument[this];ReturnValue;taint;df-generated |
-| System.Data.Common;DbCommand;get_Parameters;();Argument[this];ReturnValue;taint;df-generated |
+| System.Data.Common;DbCommand;get_Parameters;();Argument[this].Property[System.Data.Common.DbCommand.DbParameterCollection];ReturnValue;value;dfc-generated |
 | System.Data.Common;DbCommandBuilder;GetDeleteCommand;();Argument[this];ReturnValue;taint;df-generated |
 | System.Data.Common;DbCommandBuilder;GetDeleteCommand;(System.Boolean);Argument[this];ReturnValue;taint;df-generated |
 | System.Data.Common;DbCommandBuilder;GetInsertCommand;();Argument[this];ReturnValue;taint;df-generated |
 | System.Data.Common;DbCommandBuilder;GetInsertCommand;(System.Boolean);Argument[this];ReturnValue;taint;df-generated |
-| System.Data.Common;DbCommandBuilder;GetParameterName;(System.String);Argument[0];ReturnValue;taint;df-generated |
+| System.Data.Common;DbCommandBuilder;GetParameterName;(System.String);Argument[0];ReturnValue;value;dfc-generated |
 | System.Data.Common;DbCommandBuilder;GetUpdateCommand;();Argument[this];ReturnValue;taint;df-generated |
 | System.Data.Common;DbCommandBuilder;GetUpdateCommand;(System.Boolean);Argument[this];ReturnValue;taint;df-generated |
-| System.Data.Common;DbCommandBuilder;InitializeCommand;(System.Data.Common.DbCommand);Argument[0];ReturnValue;taint;df-generated |
-| System.Data.Common;DbCommandBuilder;QuoteIdentifier;(System.String);Argument[0];ReturnValue;taint;df-generated |
-| System.Data.Common;DbCommandBuilder;QuoteIdentifier;(System.String);Argument[this];ReturnValue;taint;df-generated |
+| System.Data.Common;DbCommandBuilder;InitializeCommand;(System.Data.Common.DbCommand);Argument[0];ReturnValue;value;dfc-generated |
+| System.Data.Common;DbCommandBuilder;QuoteIdentifier;(System.String);Argument[0];ReturnValue;value;dfc-generated |
 | System.Data.Common;DbCommandBuilder;RowUpdatingHandler;(System.Data.Common.RowUpdatingEventArgs);Argument[this];Argument[0];taint;df-generated |
-| System.Data.Common;DbCommandBuilder;UnquoteIdentifier;(System.String);Argument[0];ReturnValue;taint;df-generated |
-| System.Data.Common;DbCommandBuilder;UnquoteIdentifier;(System.String);Argument[this];ReturnValue;taint;df-generated |
+| System.Data.Common;DbCommandBuilder;UnquoteIdentifier;(System.String);Argument[0];ReturnValue;value;dfc-generated |
 | System.Data.Common;DbConnection;BeginDbTransaction;(System.Data.IsolationLevel);Argument[this];ReturnValue;taint;df-generated |
-| System.Data.Common;DbConnection;BeginDbTransactionAsync;(System.Data.IsolationLevel,System.Threading.CancellationToken);Argument[this];ReturnValue;taint;df-generated |
-| System.Data.Common;DbConnection;BeginTransaction;();Argument[this];ReturnValue;taint;df-generated |
-| System.Data.Common;DbConnection;BeginTransaction;(System.Data.IsolationLevel);Argument[this];ReturnValue;taint;df-generated |
-| System.Data.Common;DbConnection;BeginTransactionAsync;(System.Data.IsolationLevel,System.Threading.CancellationToken);Argument[this];ReturnValue;taint;df-generated |
-| System.Data.Common;DbConnection;BeginTransactionAsync;(System.Threading.CancellationToken);Argument[this];ReturnValue;taint;df-generated |
-| System.Data.Common;DbConnection;ChangeDatabaseAsync;(System.String,System.Threading.CancellationToken);Argument[1];ReturnValue;taint;df-generated |
-| System.Data.Common;DbConnection;CreateCommand;();Argument[this];ReturnValue;taint;df-generated |
-| System.Data.Common;DbConnection;CreateDbCommand;();Argument[this];ReturnValue;taint;df-generated |
 | System.Data.Common;DbConnection;DisposeAsync;();Argument[this];ReturnValue;taint;df-generated |
-| System.Data.Common;DbConnection;OpenAsync;(System.Threading.CancellationToken);Argument[0];ReturnValue;taint;df-generated |
 | System.Data.Common;DbConnection;add_StateChange;(System.Data.StateChangeEventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Data.Common;DbConnection;get_ServerVersion;();Argument[this];ReturnValue;taint;df-generated |
 | System.Data.Common;DbConnection;remove_StateChange;(System.Data.StateChangeEventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
@@ -8486,123 +9073,97 @@ summary
 | System.Data.Common;DbConnectionStringBuilder;Add;(System.Object,System.Object);Argument[1];Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Value];value;manual |
 | System.Data.Common;DbConnectionStringBuilder;Add;(System.String,System.Object);Argument[0];Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Key];value;manual |
 | System.Data.Common;DbConnectionStringBuilder;Add;(System.String,System.Object);Argument[1];Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Value];value;manual |
-| System.Data.Common;DbConnectionStringBuilder;AppendKeyValuePair;(System.Text.StringBuilder,System.String,System.String);Argument[1];Argument[0];taint;df-generated |
-| System.Data.Common;DbConnectionStringBuilder;AppendKeyValuePair;(System.Text.StringBuilder,System.String,System.String);Argument[2];Argument[0];taint;df-generated |
-| System.Data.Common;DbConnectionStringBuilder;AppendKeyValuePair;(System.Text.StringBuilder,System.String,System.String,System.Boolean);Argument[1];Argument[0];taint;df-generated |
-| System.Data.Common;DbConnectionStringBuilder;AppendKeyValuePair;(System.Text.StringBuilder,System.String,System.String,System.Boolean);Argument[2];Argument[0];taint;df-generated |
+| System.Data.Common;DbConnectionStringBuilder;AppendKeyValuePair;(System.Text.StringBuilder,System.String,System.String);Argument[1];Argument[0];taint;dfc-generated |
+| System.Data.Common;DbConnectionStringBuilder;AppendKeyValuePair;(System.Text.StringBuilder,System.String,System.String);Argument[2];Argument[0];taint;dfc-generated |
+| System.Data.Common;DbConnectionStringBuilder;AppendKeyValuePair;(System.Text.StringBuilder,System.String,System.String,System.Boolean);Argument[1];Argument[0];taint;dfc-generated |
+| System.Data.Common;DbConnectionStringBuilder;AppendKeyValuePair;(System.Text.StringBuilder,System.String,System.String,System.Boolean);Argument[2];Argument[0];taint;dfc-generated |
 | System.Data.Common;DbConnectionStringBuilder;Clear;();Argument[this].WithoutElement;Argument[this];value;manual |
 | System.Data.Common;DbConnectionStringBuilder;CopyTo;(System.Array,System.Int32);Argument[this].Element;Argument[0].Element;value;manual |
-| System.Data.Common;DbConnectionStringBuilder;GetAttributes;();Argument[this];ReturnValue;taint;df-generated |
 | System.Data.Common;DbConnectionStringBuilder;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.IEnumerator.Current];value;manual |
 | System.Data.Common;DbConnectionStringBuilder;GetEnumerator;();Argument[this];ReturnValue;taint;df-generated |
 | System.Data.Common;DbConnectionStringBuilder;GetProperties;();Argument[this];ReturnValue;taint;df-generated |
 | System.Data.Common;DbConnectionStringBuilder;GetProperties;(System.Attribute[]);Argument[this];ReturnValue;taint;df-generated |
-| System.Data.Common;DbConnectionStringBuilder;GetProperties;(System.Collections.Hashtable);Argument[this];Argument[0].Element;taint;df-generated |
-| System.Data.Common;DbConnectionStringBuilder;GetPropertyOwner;(System.ComponentModel.PropertyDescriptor);Argument[this];ReturnValue;taint;df-generated |
-| System.Data.Common;DbConnectionStringBuilder;GetPropertyOwner;(System.ComponentModel.PropertyDescriptor);Argument[this];ReturnValue;value;df-generated |
-| System.Data.Common;DbConnectionStringBuilder;ToString;();Argument[this];ReturnValue;taint;df-generated |
+| System.Data.Common;DbConnectionStringBuilder;GetProperties;(System.Collections.Hashtable);Argument[this].Property[System.Data.Common.DbConnectionStringBuilder.Keys].Element;Argument[0].Element.Property[System.Collections.Generic.KeyValuePair`2.Key];value;dfc-generated |
+| System.Data.Common;DbConnectionStringBuilder;GetPropertyOwner;(System.ComponentModel.PropertyDescriptor);Argument[this];ReturnValue;value;dfc-generated |
+| System.Data.Common;DbConnectionStringBuilder;ToString;();Argument[this].Property[System.Data.Common.DbConnectionStringBuilder.ConnectionString];ReturnValue;value;dfc-generated |
+| System.Data.Common;DbConnectionStringBuilder;ToString;();Argument[this].Property[System.Data.Common.DbConnectionStringBuilder.Keys].Element;ReturnValue;taint;dfc-generated |
 | System.Data.Common;DbConnectionStringBuilder;TryGetValue;(System.String,System.Object);Argument[this];ReturnValue;taint;df-generated |
 | System.Data.Common;DbConnectionStringBuilder;get_Item;(System.Object);Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Value];ReturnValue;value;manual |
 | System.Data.Common;DbConnectionStringBuilder;get_Item;(System.String);Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Value];ReturnValue;value;manual |
 | System.Data.Common;DbConnectionStringBuilder;get_Keys;();Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Key];ReturnValue.Element;value;manual |
-| System.Data.Common;DbConnectionStringBuilder;get_SyncRoot;();Argument[this];ReturnValue;taint;df-generated |
-| System.Data.Common;DbConnectionStringBuilder;get_SyncRoot;();Argument[this];ReturnValue;value;df-generated |
+| System.Data.Common;DbConnectionStringBuilder;get_SyncRoot;();Argument[this];ReturnValue;value;dfc-generated |
 | System.Data.Common;DbConnectionStringBuilder;get_Values;();Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Value];ReturnValue.Element;value;manual |
 | System.Data.Common;DbConnectionStringBuilder;set_Item;(System.Object,System.Object);Argument[0];Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Key];value;manual |
 | System.Data.Common;DbConnectionStringBuilder;set_Item;(System.Object,System.Object);Argument[1];Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Value];value;manual |
 | System.Data.Common;DbConnectionStringBuilder;set_Item;(System.String,System.Object);Argument[0];Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Key];value;manual |
 | System.Data.Common;DbConnectionStringBuilder;set_Item;(System.String,System.Object);Argument[1];Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Value];value;manual |
-| System.Data.Common;DbDataAdapter;Clone;();Argument[this];ReturnValue;taint;df-generated |
-| System.Data.Common;DbDataAdapter;Clone;();Argument[this];ReturnValue;value;df-generated |
-| System.Data.Common;DbDataAdapter;CreateRowUpdatedEvent;(System.Data.DataRow,System.Data.IDbCommand,System.Data.StatementType,System.Data.Common.DataTableMapping);Argument[0];ReturnValue;taint;df-generated |
-| System.Data.Common;DbDataAdapter;CreateRowUpdatedEvent;(System.Data.DataRow,System.Data.IDbCommand,System.Data.StatementType,System.Data.Common.DataTableMapping);Argument[1];ReturnValue;taint;df-generated |
-| System.Data.Common;DbDataAdapter;CreateRowUpdatedEvent;(System.Data.DataRow,System.Data.IDbCommand,System.Data.StatementType,System.Data.Common.DataTableMapping);Argument[3];ReturnValue;taint;df-generated |
-| System.Data.Common;DbDataAdapter;CreateRowUpdatingEvent;(System.Data.DataRow,System.Data.IDbCommand,System.Data.StatementType,System.Data.Common.DataTableMapping);Argument[0];ReturnValue;taint;df-generated |
-| System.Data.Common;DbDataAdapter;CreateRowUpdatingEvent;(System.Data.DataRow,System.Data.IDbCommand,System.Data.StatementType,System.Data.Common.DataTableMapping);Argument[1];ReturnValue;taint;df-generated |
-| System.Data.Common;DbDataAdapter;CreateRowUpdatingEvent;(System.Data.DataRow,System.Data.IDbCommand,System.Data.StatementType,System.Data.Common.DataTableMapping);Argument[3];ReturnValue;taint;df-generated |
-| System.Data.Common;DbDataAdapter;DbDataAdapter;(System.Data.Common.DbDataAdapter);Argument[0];Argument[this];taint;df-generated |
-| System.Data.Common;DbDataAdapter;FillSchema;(System.Data.DataTable,System.Data.SchemaType);Argument[0];ReturnValue;taint;df-generated |
-| System.Data.Common;DbDataAdapter;FillSchema;(System.Data.DataTable,System.Data.SchemaType);Argument[this];ReturnValue;taint;df-generated |
-| System.Data.Common;DbDataAdapter;FillSchema;(System.Data.DataTable,System.Data.SchemaType,System.Data.IDbCommand,System.Data.CommandBehavior);Argument[0];ReturnValue;taint;df-generated |
-| System.Data.Common;DbDataAdapter;FillSchema;(System.Data.DataTable,System.Data.SchemaType,System.Data.IDbCommand,System.Data.CommandBehavior);Argument[this];ReturnValue;taint;df-generated |
+| System.Data.Common;DbDataAdapter;Clone;();Argument[this];ReturnValue;value;dfc-generated |
+| System.Data.Common;DbDataAdapter;FillSchema;(System.Data.DataTable,System.Data.SchemaType);Argument[0];ReturnValue.Element;value;dfc-generated |
+| System.Data.Common;DbDataAdapter;FillSchema;(System.Data.DataTable,System.Data.SchemaType);Argument[0];ReturnValue;value;dfc-generated |
+| System.Data.Common;DbDataAdapter;FillSchema;(System.Data.DataTable,System.Data.SchemaType,System.Data.IDbCommand,System.Data.CommandBehavior);Argument[0];ReturnValue.Element;value;dfc-generated |
+| System.Data.Common;DbDataAdapter;FillSchema;(System.Data.DataTable,System.Data.SchemaType,System.Data.IDbCommand,System.Data.CommandBehavior);Argument[0];ReturnValue;value;dfc-generated |
 | System.Data.Common;DbDataAdapter;GetFillParameters;();Argument[this];ReturnValue;taint;df-generated |
 | System.Data.Common;DbDataReader;DisposeAsync;();Argument[this];ReturnValue;taint;df-generated |
 | System.Data.Common;DbDataReader;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.IEnumerator.Current];value;manual |
-| System.Data.Common;DbDataReader;GetFieldValue<T>;(System.Int32);Argument[this];ReturnValue;taint;df-generated |
-| System.Data.Common;DbDataReader;GetFieldValueAsync<T>;(System.Int32);Argument[this];ReturnValue;taint;df-generated |
-| System.Data.Common;DbDataReader;GetFieldValueAsync<T>;(System.Int32,System.Threading.CancellationToken);Argument[this];ReturnValue;taint;df-generated |
-| System.Data.Common;DbDataReader;GetProviderSpecificValue;(System.Int32);Argument[this];ReturnValue;taint;df-generated |
-| System.Data.Common;DbDataReader;GetProviderSpecificValues;(System.Object[]);Argument[this];Argument[0].Element;taint;df-generated |
+| System.Data.Common;DbDataReader;GetFieldValue<T>;(System.Int32);Argument[this];ReturnValue;taint;dfc-generated |
+| System.Data.Common;DbDataReader;GetFieldValueAsync<T>;(System.Int32);Argument[this];ReturnValue.Property[System.Threading.Tasks.Task`1.Result];taint;dfc-generated |
+| System.Data.Common;DbDataReader;GetFieldValueAsync<T>;(System.Int32,System.Threading.CancellationToken);Argument[this];ReturnValue.Property[System.Threading.Tasks.Task`1.Result];taint;dfc-generated |
+| System.Data.Common;DbDataReader;GetProviderSpecificValue;(System.Int32);Argument[this];ReturnValue;taint;dfc-generated |
+| System.Data.Common;DbDataReader;GetProviderSpecificValues;(System.Object[]);Argument[this];Argument[0].Element;taint;dfc-generated |
 | System.Data.Common;DbDataReader;GetSchemaTable;();Argument[this];ReturnValue;taint;df-generated |
-| System.Data.Common;DbDataReader;GetSchemaTableAsync;(System.Threading.CancellationToken);Argument[this];ReturnValue;taint;df-generated |
 | System.Data.Common;DbDataReader;GetString;(System.Int32);Argument[this];ReturnValue;taint;manual |
-| System.Data.Common;DbDataReader;GetTextReader;(System.Int32);Argument[this];ReturnValue;taint;df-generated |
+| System.Data.Common;DbDataReader;GetTextReader;(System.Int32);Argument[this];ReturnValue;taint;dfc-generated |
 | System.Data.Common;DbDataReader;GetValue;(System.Int32);Argument[this];ReturnValue;taint;manual |
 | System.Data.Common;DbDataReader;GetValues;(System.Object[]);Argument[this];Argument[0].Element;taint;manual |
 | System.Data.Common;DbDataReader;get_Item;(System.Int32);Argument[this];ReturnValue;taint;manual |
 | System.Data.Common;DbDataReader;get_Item;(System.String);Argument[this];ReturnValue;taint;manual |
-| System.Data.Common;DbDataRecord;GetAttributes;();Argument[this];ReturnValue;taint;df-generated |
 | System.Data.Common;DbDataRecord;GetProperties;();Argument[this];ReturnValue;taint;df-generated |
 | System.Data.Common;DbDataRecord;GetProperties;(System.Attribute[]);Argument[this];ReturnValue;taint;df-generated |
-| System.Data.Common;DbDataRecord;GetPropertyOwner;(System.ComponentModel.PropertyDescriptor);Argument[this];ReturnValue;taint;df-generated |
-| System.Data.Common;DbDataRecord;GetPropertyOwner;(System.ComponentModel.PropertyDescriptor);Argument[this];ReturnValue;value;df-generated |
+| System.Data.Common;DbDataRecord;GetPropertyOwner;(System.ComponentModel.PropertyDescriptor);Argument[this];ReturnValue;value;dfc-generated |
 | System.Data.Common;DbDataRecord;GetString;(System.Int32);Argument[this];ReturnValue;taint;manual |
 | System.Data.Common;DbDataRecord;GetValue;(System.Int32);Argument[this];ReturnValue;taint;manual |
 | System.Data.Common;DbDataRecord;GetValues;(System.Object[]);Argument[this];Argument[0].Element;taint;manual |
 | System.Data.Common;DbDataRecord;get_Item;(System.Int32);Argument[this];ReturnValue;taint;manual |
 | System.Data.Common;DbDataRecord;get_Item;(System.String);Argument[this];ReturnValue;taint;manual |
-| System.Data.Common;DbDataSource;CreateCommand;(System.String);Argument[0];ReturnValue;taint;df-generated |
-| System.Data.Common;DbDataSource;CreateDbCommand;(System.String);Argument[0];ReturnValue;taint;df-generated |
 | System.Data.Common;DbDataSource;DisposeAsync;();Argument[this];ReturnValue;taint;df-generated |
 | System.Data.Common;DbDataSource;get_ConnectionString;();Argument[this];ReturnValue;taint;df-generated |
 | System.Data.Common;DbEnumerator;DbEnumerator;(System.Data.IDataReader);Argument[0];Argument[this];taint;df-generated |
 | System.Data.Common;DbEnumerator;DbEnumerator;(System.Data.IDataReader,System.Boolean);Argument[0];Argument[this];taint;df-generated |
 | System.Data.Common;DbEnumerator;get_Current;();Argument[this];ReturnValue;taint;df-generated |
-| System.Data.Common;DbException;get_BatchCommand;();Argument[this];ReturnValue;taint;df-generated |
+| System.Data.Common;DbException;get_BatchCommand;();Argument[this].Property[System.Data.Common.DbException.DbBatchCommand];ReturnValue;value;dfc-generated |
 | System.Data.Common;DbParameterCollection;Add;(System.Object);Argument[0];Argument[this].Element;value;manual |
 | System.Data.Common;DbParameterCollection;AddRange;(System.Array);Argument[0].Element;Argument[this].Element;value;manual |
 | System.Data.Common;DbParameterCollection;Clear;();Argument[this].WithoutElement;Argument[this];value;manual |
 | System.Data.Common;DbParameterCollection;CopyTo;(System.Array,System.Int32);Argument[this].Element;Argument[0].Element;value;manual |
 | System.Data.Common;DbParameterCollection;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.IEnumerator.Current];value;manual |
-| System.Data.Common;DbParameterCollection;GetParameter;(System.Int32);Argument[this];ReturnValue;taint;df-generated |
-| System.Data.Common;DbParameterCollection;GetParameter;(System.String);Argument[this];ReturnValue;taint;df-generated |
 | System.Data.Common;DbParameterCollection;Insert;(System.Int32,System.Object);Argument[1];Argument[this].Element;value;manual |
-| System.Data.Common;DbParameterCollection;Remove;(System.Object);Argument[0];Argument[this];taint;df-generated |
-| System.Data.Common;DbParameterCollection;Remove;(System.Object);Argument[this];Argument[0];taint;df-generated |
 | System.Data.Common;DbParameterCollection;SetParameter;(System.Int32,System.Data.Common.DbParameter);Argument[this];Argument[1];taint;df-generated |
 | System.Data.Common;DbParameterCollection;SetParameter;(System.String,System.Data.Common.DbParameter);Argument[this];Argument[1];taint;df-generated |
 | System.Data.Common;DbParameterCollection;get_Item;(System.Int32);Argument[this].Element;ReturnValue;value;manual |
 | System.Data.Common;DbParameterCollection;get_Item;(System.String);Argument[this].Element;ReturnValue;value;manual |
-| System.Data.Common;DbParameterCollection;get_SyncRoot;();Argument[this];ReturnValue;taint;df-generated |
-| System.Data.Common;DbParameterCollection;get_SyncRoot;();Argument[this];ReturnValue;value;df-generated |
+| System.Data.Common;DbParameterCollection;get_SyncRoot;();Argument[this];ReturnValue;value;dfc-generated |
 | System.Data.Common;DbParameterCollection;set_Item;(System.Int32,System.Data.Common.DbParameter);Argument[1];Argument[this].Element;value;manual |
 | System.Data.Common;DbParameterCollection;set_Item;(System.Int32,System.Object);Argument[1];Argument[this].Element;value;manual |
 | System.Data.Common;DbParameterCollection;set_Item;(System.String,System.Data.Common.DbParameter);Argument[1];Argument[this].Element;value;manual |
 | System.Data.Common;DbParameterCollection;set_Item;(System.String,System.Object);Argument[1];Argument[this].Element;value;manual |
-| System.Data.Common;DbProviderFactories;GetFactory;(System.Data.Common.DbConnection);Argument[0];ReturnValue;taint;df-generated |
-| System.Data.Common;DbProviderFactory;CreateDataSource;(System.String);Argument[0];ReturnValue;taint;df-generated |
-| System.Data.Common;DbProviderFactory;CreateDataSource;(System.String);Argument[this];ReturnValue;taint;df-generated |
-| System.Data.Common;DbTransaction;CommitAsync;(System.Threading.CancellationToken);Argument[0];ReturnValue;taint;df-generated |
+| System.Data.Common;DbProviderFactories;GetFactory;(System.Data.Common.DbConnection);Argument[0].Property[System.Data.Common.DbConnection.DbProviderFactory];ReturnValue;value;dfc-generated |
+| System.Data.Common;DbProviderFactory;CreateDataSource;(System.String);Argument[0];ReturnValue.SyntheticField[System.Data.Common.DefaultDataSource._connectionString];value;dfc-generated |
 | System.Data.Common;DbTransaction;DisposeAsync;();Argument[this];ReturnValue;taint;df-generated |
-| System.Data.Common;DbTransaction;ReleaseAsync;(System.String,System.Threading.CancellationToken);Argument[1];ReturnValue;taint;df-generated |
-| System.Data.Common;DbTransaction;RollbackAsync;(System.String,System.Threading.CancellationToken);Argument[1];ReturnValue;taint;df-generated |
-| System.Data.Common;DbTransaction;RollbackAsync;(System.Threading.CancellationToken);Argument[0];ReturnValue;taint;df-generated |
-| System.Data.Common;DbTransaction;SaveAsync;(System.String,System.Threading.CancellationToken);Argument[1];ReturnValue;taint;df-generated |
-| System.Data.Common;DbTransaction;get_Connection;();Argument[this];ReturnValue;taint;df-generated |
-| System.Data.Common;DbTransaction;get_DbConnection;();Argument[this];ReturnValue;taint;df-generated |
-| System.Data.Common;RowUpdatedEventArgs;CopyToRows;(System.Data.DataRow[]);Argument[this];Argument[0].Element;taint;df-generated |
-| System.Data.Common;RowUpdatedEventArgs;CopyToRows;(System.Data.DataRow[],System.Int32);Argument[this];Argument[0].Element;taint;df-generated |
-| System.Data.Common;RowUpdatedEventArgs;RowUpdatedEventArgs;(System.Data.DataRow,System.Data.IDbCommand,System.Data.StatementType,System.Data.Common.DataTableMapping);Argument[0];Argument[this];taint;df-generated |
-| System.Data.Common;RowUpdatedEventArgs;RowUpdatedEventArgs;(System.Data.DataRow,System.Data.IDbCommand,System.Data.StatementType,System.Data.Common.DataTableMapping);Argument[1];Argument[this];taint;df-generated |
-| System.Data.Common;RowUpdatedEventArgs;RowUpdatedEventArgs;(System.Data.DataRow,System.Data.IDbCommand,System.Data.StatementType,System.Data.Common.DataTableMapping);Argument[3];Argument[this];taint;df-generated |
-| System.Data.Common;RowUpdatedEventArgs;get_Command;();Argument[this];ReturnValue;taint;df-generated |
-| System.Data.Common;RowUpdatedEventArgs;get_Row;();Argument[this];ReturnValue;taint;df-generated |
-| System.Data.Common;RowUpdatedEventArgs;get_TableMapping;();Argument[this];ReturnValue;taint;df-generated |
-| System.Data.Common;RowUpdatingEventArgs;RowUpdatingEventArgs;(System.Data.DataRow,System.Data.IDbCommand,System.Data.StatementType,System.Data.Common.DataTableMapping);Argument[0];Argument[this];taint;df-generated |
-| System.Data.Common;RowUpdatingEventArgs;RowUpdatingEventArgs;(System.Data.DataRow,System.Data.IDbCommand,System.Data.StatementType,System.Data.Common.DataTableMapping);Argument[1];Argument[this];taint;df-generated |
-| System.Data.Common;RowUpdatingEventArgs;RowUpdatingEventArgs;(System.Data.DataRow,System.Data.IDbCommand,System.Data.StatementType,System.Data.Common.DataTableMapping);Argument[3];Argument[this];taint;df-generated |
-| System.Data.Common;RowUpdatingEventArgs;get_Row;();Argument[this];ReturnValue;taint;df-generated |
-| System.Data.Common;RowUpdatingEventArgs;get_TableMapping;();Argument[this];ReturnValue;taint;df-generated |
+| System.Data.Common;DbTransaction;get_Connection;();Argument[this].Property[System.Data.Common.DbTransaction.DbConnection];ReturnValue;value;dfc-generated |
+| System.Data.Common;RowUpdatedEventArgs;CopyToRows;(System.Data.DataRow[]);Argument[this].Property[System.Data.Common.RowUpdatedEventArgs.Row];Argument[0].Element;value;dfc-generated |
+| System.Data.Common;RowUpdatedEventArgs;CopyToRows;(System.Data.DataRow[]);Argument[this].SyntheticField[System.Data.Common.RowUpdatedEventArgs._dataRow];Argument[0].Element;value;dfc-generated |
+| System.Data.Common;RowUpdatedEventArgs;CopyToRows;(System.Data.DataRow[],System.Int32);Argument[this].Property[System.Data.Common.RowUpdatedEventArgs.Row];Argument[0].Element;value;dfc-generated |
+| System.Data.Common;RowUpdatedEventArgs;CopyToRows;(System.Data.DataRow[],System.Int32);Argument[this].SyntheticField[System.Data.Common.RowUpdatedEventArgs._dataRow];Argument[0].Element;value;dfc-generated |
+| System.Data.Common;RowUpdatedEventArgs;RowUpdatedEventArgs;(System.Data.DataRow,System.Data.IDbCommand,System.Data.StatementType,System.Data.Common.DataTableMapping);Argument[0];Argument[this].SyntheticField[System.Data.Common.RowUpdatedEventArgs._dataRow];value;dfc-generated |
+| System.Data.Common;RowUpdatedEventArgs;RowUpdatedEventArgs;(System.Data.DataRow,System.Data.IDbCommand,System.Data.StatementType,System.Data.Common.DataTableMapping);Argument[1];Argument[this].SyntheticField[System.Data.Common.RowUpdatedEventArgs._command];value;dfc-generated |
+| System.Data.Common;RowUpdatedEventArgs;RowUpdatedEventArgs;(System.Data.DataRow,System.Data.IDbCommand,System.Data.StatementType,System.Data.Common.DataTableMapping);Argument[3];Argument[this].SyntheticField[System.Data.Common.RowUpdatedEventArgs._tableMapping];value;dfc-generated |
+| System.Data.Common;RowUpdatedEventArgs;get_Command;();Argument[this].SyntheticField[System.Data.Common.RowUpdatedEventArgs._command];ReturnValue;value;dfc-generated |
+| System.Data.Common;RowUpdatedEventArgs;get_Row;();Argument[this].SyntheticField[System.Data.Common.RowUpdatedEventArgs._dataRow];ReturnValue;value;dfc-generated |
+| System.Data.Common;RowUpdatedEventArgs;get_TableMapping;();Argument[this].SyntheticField[System.Data.Common.RowUpdatedEventArgs._tableMapping];ReturnValue;value;dfc-generated |
+| System.Data.Common;RowUpdatingEventArgs;RowUpdatingEventArgs;(System.Data.DataRow,System.Data.IDbCommand,System.Data.StatementType,System.Data.Common.DataTableMapping);Argument[0];Argument[this].SyntheticField[System.Data.Common.RowUpdatingEventArgs._dataRow];value;dfc-generated |
+| System.Data.Common;RowUpdatingEventArgs;RowUpdatingEventArgs;(System.Data.DataRow,System.Data.IDbCommand,System.Data.StatementType,System.Data.Common.DataTableMapping);Argument[3];Argument[this].SyntheticField[System.Data.Common.RowUpdatingEventArgs._tableMapping];value;dfc-generated |
+| System.Data.Common;RowUpdatingEventArgs;get_Row;();Argument[this].SyntheticField[System.Data.Common.RowUpdatingEventArgs._dataRow];ReturnValue;value;dfc-generated |
+| System.Data.Common;RowUpdatingEventArgs;get_TableMapping;();Argument[this].SyntheticField[System.Data.Common.RowUpdatingEventArgs._tableMapping];ReturnValue;value;dfc-generated |
 | System.Data.Entity.Core.Common.CommandTrees.ExpressionBuilder;DbExpressionBuilder;All;(System.Data.Entity.Core.Common.CommandTrees.DbExpression,System.Func<System.Data.Entity.Core.Common.CommandTrees.DbExpression,System.Data.Entity.Core.Common.CommandTrees.DbExpression>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
 | System.Data.Entity.Core.Common.CommandTrees.ExpressionBuilder;DbExpressionBuilder;Any;(System.Data.Entity.Core.Common.CommandTrees.DbExpression,System.Func<System.Data.Entity.Core.Common.CommandTrees.DbExpression,System.Data.Entity.Core.Common.CommandTrees.DbExpression>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
 | System.Data.Entity.Core.Common.CommandTrees.ExpressionBuilder;DbExpressionBuilder;CrossApply;(System.Data.Entity.Core.Common.CommandTrees.DbExpression,System.Func<System.Data.Entity.Core.Common.CommandTrees.DbExpression,System.Collections.Generic.KeyValuePair<System.String,System.Data.Entity.Core.Common.CommandTrees.DbExpression>>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
@@ -8647,19 +9208,16 @@ summary
 | System.Data.Entity.Core.Common;DbCommandDefinition;DbCommandDefinition;(System.Data.Common.DbCommand,System.Func<System.Data.Common.DbCommand,System.Data.Common.DbCommand>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
 | System.Data.Entity.Core.Common;DbProviderServices;RegisterInfoMessageHandler;(System.Data.Common.DbConnection,System.Action<System.String>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
 | System.Data.Entity.Core.EntityClient;EntityCommand;ExecuteDbDataReader;(System.Data.CommandBehavior);Argument[this];ReturnValue;taint;df-generated |
-| System.Data.Entity.Core.EntityClient;EntityCommand;ExecuteDbDataReaderAsync;(System.Data.CommandBehavior,System.Threading.CancellationToken);Argument[this];ReturnValue;taint;df-generated |
 | System.Data.Entity.Core.EntityClient;EntityCommand;ExecuteScalar;();Argument[this];ReturnValue;taint;df-generated |
 | System.Data.Entity.Core.EntityClient;EntityCommand;get_DbParameterCollection;();Argument[this];ReturnValue;taint;df-generated |
 | System.Data.Entity.Core.EntityClient;EntityConnection;BeginDbTransaction;(System.Data.IsolationLevel);Argument[this];ReturnValue;taint;df-generated |
-| System.Data.Entity.Core.EntityClient;EntityConnection;CreateDbCommand;();Argument[this];ReturnValue;taint;df-generated |
-| System.Data.Entity.Core.EntityClient;EntityConnection;OpenAsync;(System.Threading.CancellationToken);Argument[0];ReturnValue;taint;df-generated |
 | System.Data.Entity.Core.EntityClient;EntityConnection;get_ServerVersion;();Argument[this];ReturnValue;taint;df-generated |
 | System.Data.Entity.Core.EntityClient;EntityConnectionStringBuilder;Clear;();Argument[this].WithoutElement;Argument[this];value;manual |
 | System.Data.Entity.Core.EntityClient;EntityConnectionStringBuilder;TryGetValue;(System.String,System.Object);Argument[this];ReturnValue;taint;df-generated |
 | System.Data.Entity.Core.EntityClient;EntityConnectionStringBuilder;get_Keys;();Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Key];ReturnValue.Element;value;manual |
 | System.Data.Entity.Core.EntityClient;EntityDataReader;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.IEnumerator.Current];value;manual |
-| System.Data.Entity.Core.EntityClient;EntityDataReader;GetProviderSpecificValue;(System.Int32);Argument[this];ReturnValue;taint;df-generated |
-| System.Data.Entity.Core.EntityClient;EntityDataReader;GetProviderSpecificValues;(System.Object[]);Argument[this];Argument[0].Element;taint;df-generated |
+| System.Data.Entity.Core.EntityClient;EntityDataReader;GetProviderSpecificValue;(System.Int32);Argument[this];ReturnValue;taint;dfc-generated |
+| System.Data.Entity.Core.EntityClient;EntityDataReader;GetProviderSpecificValues;(System.Object[]);Argument[this];Argument[0].Element;taint;dfc-generated |
 | System.Data.Entity.Core.EntityClient;EntityDataReader;GetSchemaTable;();Argument[this];ReturnValue;taint;df-generated |
 | System.Data.Entity.Core.EntityClient;EntityDataReader;GetString;(System.Int32);Argument[this];ReturnValue;taint;manual |
 | System.Data.Entity.Core.EntityClient;EntityDataReader;GetValue;(System.Int32);Argument[this];ReturnValue;taint;manual |
@@ -8671,15 +9229,11 @@ summary
 | System.Data.Entity.Core.EntityClient;EntityParameterCollection;Clear;();Argument[this].WithoutElement;Argument[this];value;manual |
 | System.Data.Entity.Core.EntityClient;EntityParameterCollection;CopyTo;(System.Array,System.Int32);Argument[this].Element;Argument[0].Element;value;manual |
 | System.Data.Entity.Core.EntityClient;EntityParameterCollection;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.IEnumerator.Current];value;manual |
-| System.Data.Entity.Core.EntityClient;EntityParameterCollection;GetParameter;(System.Int32);Argument[this];ReturnValue;taint;df-generated |
-| System.Data.Entity.Core.EntityClient;EntityParameterCollection;GetParameter;(System.String);Argument[this];ReturnValue;taint;df-generated |
 | System.Data.Entity.Core.EntityClient;EntityParameterCollection;Insert;(System.Int32,System.Object);Argument[1];Argument[this].Element;value;manual |
 | System.Data.Entity.Core.EntityClient;EntityParameterCollection;SetParameter;(System.Int32,System.Data.Common.DbParameter);Argument[this];Argument[1];taint;df-generated |
 | System.Data.Entity.Core.EntityClient;EntityParameterCollection;SetParameter;(System.String,System.Data.Common.DbParameter);Argument[this];Argument[1];taint;df-generated |
-| System.Data.Entity.Core.EntityClient;EntityParameterCollection;get_SyncRoot;();Argument[this];ReturnValue;taint;df-generated |
-| System.Data.Entity.Core.EntityClient;EntityParameterCollection;get_SyncRoot;();Argument[this];ReturnValue;value;df-generated |
-| System.Data.Entity.Core.EntityClient;EntityProviderFactory;GetService;(System.Type);Argument[this];ReturnValue;taint;df-generated |
-| System.Data.Entity.Core.EntityClient;EntityTransaction;get_DbConnection;();Argument[this];ReturnValue;taint;df-generated |
+| System.Data.Entity.Core.EntityClient;EntityParameterCollection;get_SyncRoot;();Argument[this];ReturnValue;value;dfc-generated |
+| System.Data.Entity.Core.EntityClient;EntityProviderFactory;GetService;(System.Type);Argument[this];ReturnValue;value;dfc-generated |
 | System.Data.Entity.Core.Metadata.Edm;CsdlSerializer;add_OnError;(System.EventHandler<System.Data.Entity.Core.Metadata.Edm.DataModelErrorEventArgs>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Data.Entity.Core.Metadata.Edm;CsdlSerializer;remove_OnError;(System.EventHandler<System.Data.Entity.Core.Metadata.Edm.DataModelErrorEventArgs>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Data.Entity.Core.Metadata.Edm;MetadataWorkspace;LoadFromAssembly;(System.Reflection.Assembly,System.Action<System.String>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
@@ -8742,8 +9296,7 @@ summary
 | System.Data.Entity.Core.Objects;ObjectParameterCollection;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.IEnumerator.Current];value;manual |
 | System.Data.Entity.Core.Objects;ObjectQuery;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.IEnumerator.Current];value;manual |
 | System.Data.Entity.Core.Objects;ObjectQuery;GetList;();Argument[this];ReturnValue;taint;df-generated |
-| System.Data.Entity.Core.Objects;ObjectQuery;get_Expression;();Argument[this];ReturnValue;taint;df-generated |
-| System.Data.Entity.Core.Objects;ObjectQuery;get_Provider;();Argument[this];ReturnValue;value;df-generated |
+| System.Data.Entity.Core.Objects;ObjectQuery;get_Provider;();Argument[this];ReturnValue;value;dfc-generated |
 | System.Data.Entity.Core.Objects;ObjectQuery<T>;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.Generic.IEnumerator`1.Current];value;manual |
 | System.Data.Entity.Core.Objects;ObjectResult;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.IEnumerator.Current];value;manual |
 | System.Data.Entity.Core.Objects;ObjectResult;GetList;();Argument[this];ReturnValue;taint;df-generated |
@@ -8781,13 +9334,11 @@ summary
 | System.Data.Entity.Infrastructure;DbExecutionStrategy;UnwrapAndHandleException<T>;(System.Exception,System.Func<System.Exception,T>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
 | System.Data.Entity.Infrastructure;DbQuery;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.IEnumerator.Current];value;manual |
 | System.Data.Entity.Infrastructure;DbQuery;GetList;();Argument[this];ReturnValue;taint;df-generated |
-| System.Data.Entity.Infrastructure;DbQuery;get_Expression;();Argument[this];ReturnValue;taint;df-generated |
-| System.Data.Entity.Infrastructure;DbQuery;get_Provider;();Argument[this];ReturnValue;value;df-generated |
+| System.Data.Entity.Infrastructure;DbQuery;get_Provider;();Argument[this];ReturnValue;value;dfc-generated |
 | System.Data.Entity.Infrastructure;DbQuery<TResult>;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.Generic.IEnumerator`1.Current];value;manual |
 | System.Data.Entity.Infrastructure;DbQuery<TResult>;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.IEnumerator.Current];value;manual |
 | System.Data.Entity.Infrastructure;DbQuery<TResult>;GetList;();Argument[this];ReturnValue;taint;df-generated |
-| System.Data.Entity.Infrastructure;DbQuery<TResult>;get_Expression;();Argument[this];ReturnValue;taint;df-generated |
-| System.Data.Entity.Infrastructure;DbQuery<TResult>;get_Provider;();Argument[this];ReturnValue;value;df-generated |
+| System.Data.Entity.Infrastructure;DbQuery<TResult>;get_Provider;();Argument[this];ReturnValue;value;dfc-generated |
 | System.Data.Entity.Infrastructure;DbRawSqlQuery;ForEachAsync;(System.Action<System.Object>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Data.Entity.Infrastructure;DbRawSqlQuery;ForEachAsync;(System.Action<System.Object>,System.Threading.CancellationToken);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Data.Entity.Infrastructure;DbRawSqlQuery;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.IEnumerator.Current];value;manual |
@@ -9122,47 +9673,34 @@ summary
 | System.Data.Entity;QueryableExtensions;ToDictionaryAsync<TSource,TKey>;(System.Linq.IQueryable<TSource>,System.Func<TSource,TKey>,System.Collections.Generic.IEqualityComparer<TKey>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
 | System.Data.Entity;QueryableExtensions;ToDictionaryAsync<TSource,TKey>;(System.Linq.IQueryable<TSource>,System.Func<TSource,TKey>,System.Collections.Generic.IEqualityComparer<TKey>,System.Threading.CancellationToken);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
 | System.Data.Entity;QueryableExtensions;ToDictionaryAsync<TSource,TKey>;(System.Linq.IQueryable<TSource>,System.Func<TSource,TKey>,System.Threading.CancellationToken);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
-| System.Data.Odbc;OdbcPermission;Copy;();Argument[this];ReturnValue;taint;df-generated |
-| System.Data.Odbc;OdbcPermission;Copy;();Argument[this];ReturnValue;value;df-generated |
-| System.Data.OleDb;OleDbPermission;Copy;();Argument[this];ReturnValue;taint;df-generated |
-| System.Data.OleDb;OleDbPermission;Copy;();Argument[this];ReturnValue;value;df-generated |
-| System.Data.OracleClient;OraclePermission;Copy;();Argument[this];ReturnValue;taint;df-generated |
-| System.Data.OracleClient;OraclePermission;Copy;();Argument[this];ReturnValue;value;df-generated |
-| System.Data.OracleClient;OraclePermission;Intersect;(System.Security.IPermission);Argument[0];ReturnValue;taint;df-generated |
-| System.Data.OracleClient;OraclePermission;Intersect;(System.Security.IPermission);Argument[this];ReturnValue;taint;df-generated |
+| System.Data.Odbc;OdbcPermission;Copy;();Argument[this];ReturnValue;value;dfc-generated |
+| System.Data.OleDb;OleDbPermission;Copy;();Argument[this];ReturnValue;value;dfc-generated |
+| System.Data.OracleClient;OraclePermission;Copy;();Argument[this];ReturnValue;value;dfc-generated |
+| System.Data.OracleClient;OraclePermission;Intersect;(System.Security.IPermission);Argument[0];ReturnValue;value;dfc-generated |
 | System.Data.OracleClient;OraclePermission;Union;(System.Security.IPermission);Argument[this];ReturnValue;taint;df-generated |
 | System.Data.SqlClient;OnChangeEventHandler;BeginInvoke;(System.Object,System.Data.SqlClient.SqlNotificationEventArgs,System.AsyncCallback,System.Object);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
 | System.Data.SqlClient;SqlBulkCopy;add_SqlRowsCopied;(System.Data.SqlClient.SqlRowsCopiedEventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Data.SqlClient;SqlBulkCopy;remove_SqlRowsCopied;(System.Data.SqlClient.SqlRowsCopiedEventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
-| System.Data.SqlClient;SqlClientPermission;Copy;();Argument[this];ReturnValue;taint;df-generated |
-| System.Data.SqlClient;SqlClientPermission;Copy;();Argument[this];ReturnValue;value;df-generated |
+| System.Data.SqlClient;SqlClientPermission;Copy;();Argument[this];ReturnValue;value;dfc-generated |
 | System.Data.SqlClient;SqlCommand;BeginExecuteNonQuery;(System.AsyncCallback,System.Object);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Data.SqlClient;SqlCommand;BeginExecuteReader;(System.AsyncCallback,System.Object);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Data.SqlClient;SqlCommand;BeginExecuteReader;(System.AsyncCallback,System.Object,System.Data.CommandBehavior);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Data.SqlClient;SqlCommand;BeginExecuteXmlReader;(System.AsyncCallback,System.Object);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
-| System.Data.SqlClient;SqlCommand;Clone;();Argument[this];ReturnValue;taint;df-generated |
-| System.Data.SqlClient;SqlCommand;Clone;();Argument[this];ReturnValue;value;df-generated |
+| System.Data.SqlClient;SqlCommand;Clone;();Argument[this];ReturnValue;value;dfc-generated |
 | System.Data.SqlClient;SqlCommand;ExecuteDbDataReader;(System.Data.CommandBehavior);Argument[this];ReturnValue;taint;df-generated |
-| System.Data.SqlClient;SqlCommand;ExecuteDbDataReaderAsync;(System.Data.CommandBehavior,System.Threading.CancellationToken);Argument[this];ReturnValue;taint;df-generated |
 | System.Data.SqlClient;SqlCommand;ExecuteScalar;();Argument[this];ReturnValue;taint;df-generated |
-| System.Data.SqlClient;SqlCommand;ExecuteScalarAsync;(System.Threading.CancellationToken);Argument[this];ReturnValue;taint;df-generated |
 | System.Data.SqlClient;SqlCommand;SqlCommand;(System.String);Argument[0];Argument[this];taint;manual |
 | System.Data.SqlClient;SqlCommand;SqlCommand;(System.String,System.Data.SqlClient.SqlConnection);Argument[0];Argument[this];taint;manual |
 | System.Data.SqlClient;SqlCommand;SqlCommand;(System.String,System.Data.SqlClient.SqlConnection,System.Data.SqlClient.SqlTransaction);Argument[0];Argument[this];taint;manual |
 | System.Data.SqlClient;SqlCommand;add_StatementCompleted;(System.Data.StatementCompletedEventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Data.SqlClient;SqlCommand;get_DbParameterCollection;();Argument[this];ReturnValue;taint;df-generated |
 | System.Data.SqlClient;SqlCommand;remove_StatementCompleted;(System.Data.StatementCompletedEventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
-| System.Data.SqlClient;SqlCommandBuilder;GetParameterName;(System.String);Argument[0];ReturnValue;taint;df-generated |
-| System.Data.SqlClient;SqlCommandBuilder;InitializeCommand;(System.Data.Common.DbCommand);Argument[0];ReturnValue;taint;df-generated |
-| System.Data.SqlClient;SqlCommandBuilder;QuoteIdentifier;(System.String);Argument[0];ReturnValue;taint;df-generated |
-| System.Data.SqlClient;SqlCommandBuilder;QuoteIdentifier;(System.String);Argument[this];ReturnValue;taint;df-generated |
-| System.Data.SqlClient;SqlCommandBuilder;UnquoteIdentifier;(System.String);Argument[0];ReturnValue;taint;df-generated |
-| System.Data.SqlClient;SqlCommandBuilder;UnquoteIdentifier;(System.String);Argument[this];ReturnValue;taint;df-generated |
+| System.Data.SqlClient;SqlCommandBuilder;GetParameterName;(System.String);Argument[0];ReturnValue;value;dfc-generated |
+| System.Data.SqlClient;SqlCommandBuilder;InitializeCommand;(System.Data.Common.DbCommand);Argument[0];ReturnValue;value;dfc-generated |
+| System.Data.SqlClient;SqlCommandBuilder;QuoteIdentifier;(System.String);Argument[0];ReturnValue;value;dfc-generated |
+| System.Data.SqlClient;SqlCommandBuilder;UnquoteIdentifier;(System.String);Argument[0];ReturnValue;value;dfc-generated |
 | System.Data.SqlClient;SqlConnection;BeginDbTransaction;(System.Data.IsolationLevel);Argument[this];ReturnValue;taint;df-generated |
-| System.Data.SqlClient;SqlConnection;Clone;();Argument[this];ReturnValue;taint;df-generated |
-| System.Data.SqlClient;SqlConnection;Clone;();Argument[this];ReturnValue;value;df-generated |
-| System.Data.SqlClient;SqlConnection;CreateDbCommand;();Argument[this];ReturnValue;taint;df-generated |
-| System.Data.SqlClient;SqlConnection;OpenAsync;(System.Threading.CancellationToken);Argument[0];ReturnValue;taint;df-generated |
+| System.Data.SqlClient;SqlConnection;Clone;();Argument[this];ReturnValue;value;dfc-generated |
 | System.Data.SqlClient;SqlConnection;add_InfoMessage;(System.Data.SqlClient.SqlInfoMessageEventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Data.SqlClient;SqlConnection;get_ServerVersion;();Argument[this];ReturnValue;taint;df-generated |
 | System.Data.SqlClient;SqlConnection;remove_InfoMessage;(System.Data.SqlClient.SqlInfoMessageEventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
@@ -9170,20 +9708,19 @@ summary
 | System.Data.SqlClient;SqlConnectionStringBuilder;TryGetValue;(System.String,System.Object);Argument[this];ReturnValue;taint;df-generated |
 | System.Data.SqlClient;SqlConnectionStringBuilder;get_Keys;();Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Key];ReturnValue.Element;value;manual |
 | System.Data.SqlClient;SqlConnectionStringBuilder;get_Values;();Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Value];ReturnValue.Element;value;manual |
-| System.Data.SqlClient;SqlDataAdapter;Clone;();Argument[this];ReturnValue;taint;df-generated |
-| System.Data.SqlClient;SqlDataAdapter;Clone;();Argument[this];ReturnValue;value;df-generated |
+| System.Data.SqlClient;SqlDataAdapter;Clone;();Argument[this];ReturnValue;value;dfc-generated |
 | System.Data.SqlClient;SqlDataAdapter;add_RowUpdated;(System.Data.SqlClient.SqlRowUpdatedEventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Data.SqlClient;SqlDataAdapter;add_RowUpdating;(System.Data.SqlClient.SqlRowUpdatingEventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Data.SqlClient;SqlDataAdapter;remove_RowUpdated;(System.Data.SqlClient.SqlRowUpdatedEventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Data.SqlClient;SqlDataAdapter;remove_RowUpdating;(System.Data.SqlClient.SqlRowUpdatingEventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Data.SqlClient;SqlDataReader;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.IEnumerator.Current];value;manual |
-| System.Data.SqlClient;SqlDataReader;GetFieldValue<T>;(System.Int32);Argument[this];ReturnValue;taint;df-generated |
-| System.Data.SqlClient;SqlDataReader;GetFieldValueAsync<T>;(System.Int32,System.Threading.CancellationToken);Argument[this];ReturnValue;taint;df-generated |
-| System.Data.SqlClient;SqlDataReader;GetProviderSpecificValue;(System.Int32);Argument[this];ReturnValue;taint;df-generated |
-| System.Data.SqlClient;SqlDataReader;GetProviderSpecificValues;(System.Object[]);Argument[this];Argument[0].Element;taint;df-generated |
+| System.Data.SqlClient;SqlDataReader;GetFieldValue<T>;(System.Int32);Argument[this];ReturnValue;taint;dfc-generated |
+| System.Data.SqlClient;SqlDataReader;GetFieldValueAsync<T>;(System.Int32,System.Threading.CancellationToken);Argument[this];ReturnValue.Property[System.Threading.Tasks.Task`1.Result];taint;dfc-generated |
+| System.Data.SqlClient;SqlDataReader;GetProviderSpecificValue;(System.Int32);Argument[this];ReturnValue;taint;dfc-generated |
+| System.Data.SqlClient;SqlDataReader;GetProviderSpecificValues;(System.Object[]);Argument[this];Argument[0].Element;taint;dfc-generated |
 | System.Data.SqlClient;SqlDataReader;GetSchemaTable;();Argument[this];ReturnValue;taint;df-generated |
 | System.Data.SqlClient;SqlDataReader;GetString;(System.Int32);Argument[this];ReturnValue;taint;manual |
-| System.Data.SqlClient;SqlDataReader;GetTextReader;(System.Int32);Argument[this];ReturnValue;taint;df-generated |
+| System.Data.SqlClient;SqlDataReader;GetTextReader;(System.Int32);Argument[this];ReturnValue;taint;dfc-generated |
 | System.Data.SqlClient;SqlDataReader;GetValue;(System.Int32);Argument[this];ReturnValue;taint;manual |
 | System.Data.SqlClient;SqlDataReader;GetValues;(System.Object[]);Argument[this];Argument[0].Element;taint;manual |
 | System.Data.SqlClient;SqlDataReader;get_Item;(System.Int32);Argument[this];ReturnValue;taint;manual |
@@ -9192,39 +9729,27 @@ summary
 | System.Data.SqlClient;SqlDependency;remove_OnChange;(System.Data.SqlClient.OnChangeEventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Data.SqlClient;SqlErrorCollection;CopyTo;(System.Array,System.Int32);Argument[this].Element;Argument[0].Element;value;manual |
 | System.Data.SqlClient;SqlErrorCollection;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.IEnumerator.Current];value;manual |
-| System.Data.SqlClient;SqlErrorCollection;get_SyncRoot;();Argument[this];ReturnValue;taint;df-generated |
-| System.Data.SqlClient;SqlErrorCollection;get_SyncRoot;();Argument[this];ReturnValue;value;df-generated |
+| System.Data.SqlClient;SqlErrorCollection;get_SyncRoot;();Argument[this];ReturnValue;value;dfc-generated |
 | System.Data.SqlClient;SqlException;GetObjectData;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);Argument[this];Argument[0];taint;df-generated |
 | System.Data.SqlClient;SqlInfoMessageEventHandler;BeginInvoke;(System.Object,System.Data.SqlClient.SqlInfoMessageEventArgs,System.AsyncCallback,System.Object);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
-| System.Data.SqlClient;SqlParameter;Clone;();Argument[this];ReturnValue;taint;df-generated |
-| System.Data.SqlClient;SqlParameter;Clone;();Argument[this];ReturnValue;value;df-generated |
+| System.Data.SqlClient;SqlParameter;Clone;();Argument[this];ReturnValue;value;dfc-generated |
 | System.Data.SqlClient;SqlParameterCollection;Add;(System.Object);Argument[0];Argument[this].Element;value;manual |
 | System.Data.SqlClient;SqlParameterCollection;AddRange;(System.Array);Argument[0].Element;Argument[this].Element;value;manual |
 | System.Data.SqlClient;SqlParameterCollection;Clear;();Argument[this].WithoutElement;Argument[this];value;manual |
 | System.Data.SqlClient;SqlParameterCollection;CopyTo;(System.Array,System.Int32);Argument[this].Element;Argument[0].Element;value;manual |
 | System.Data.SqlClient;SqlParameterCollection;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.IEnumerator.Current];value;manual |
-| System.Data.SqlClient;SqlParameterCollection;GetParameter;(System.Int32);Argument[this];ReturnValue;taint;df-generated |
-| System.Data.SqlClient;SqlParameterCollection;GetParameter;(System.String);Argument[this];ReturnValue;taint;df-generated |
 | System.Data.SqlClient;SqlParameterCollection;Insert;(System.Int32,System.Object);Argument[1];Argument[this].Element;value;manual |
 | System.Data.SqlClient;SqlParameterCollection;SetParameter;(System.Int32,System.Data.Common.DbParameter);Argument[this];Argument[1];taint;df-generated |
 | System.Data.SqlClient;SqlParameterCollection;SetParameter;(System.String,System.Data.Common.DbParameter);Argument[this];Argument[1];taint;df-generated |
-| System.Data.SqlClient;SqlParameterCollection;get_SyncRoot;();Argument[this];ReturnValue;taint;df-generated |
-| System.Data.SqlClient;SqlParameterCollection;get_SyncRoot;();Argument[this];ReturnValue;value;df-generated |
+| System.Data.SqlClient;SqlParameterCollection;get_SyncRoot;();Argument[this];ReturnValue;value;dfc-generated |
 | System.Data.SqlClient;SqlRowUpdatedEventHandler;BeginInvoke;(System.Object,System.Data.SqlClient.SqlRowUpdatedEventArgs,System.AsyncCallback,System.Object);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
 | System.Data.SqlClient;SqlRowUpdatingEventHandler;BeginInvoke;(System.Object,System.Data.SqlClient.SqlRowUpdatingEventArgs,System.AsyncCallback,System.Object);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
 | System.Data.SqlClient;SqlRowsCopiedEventHandler;BeginInvoke;(System.Object,System.Data.SqlClient.SqlRowsCopiedEventArgs,System.AsyncCallback,System.Object);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
-| System.Data.SqlClient;SqlTransaction;get_DbConnection;();Argument[this];ReturnValue;taint;df-generated |
-| System.Data.SqlTypes;SqlBinary;Add;(System.Data.SqlTypes.SqlBinary,System.Data.SqlTypes.SqlBinary);Argument[0];ReturnValue;taint;df-generated |
-| System.Data.SqlTypes;SqlBinary;Add;(System.Data.SqlTypes.SqlBinary,System.Data.SqlTypes.SqlBinary);Argument[1];ReturnValue;taint;df-generated |
-| System.Data.SqlTypes;SqlBinary;Concat;(System.Data.SqlTypes.SqlBinary,System.Data.SqlTypes.SqlBinary);Argument[0];ReturnValue;taint;df-generated |
-| System.Data.SqlTypes;SqlBinary;Concat;(System.Data.SqlTypes.SqlBinary,System.Data.SqlTypes.SqlBinary);Argument[1];ReturnValue;taint;df-generated |
 | System.Data.SqlTypes;SqlBinary;ReadXml;(System.Xml.XmlReader);Argument[0];Argument[this];taint;df-generated |
-| System.Data.SqlTypes;SqlBinary;SqlBinary;(System.Byte[]);Argument[0].Element;Argument[this];taint;df-generated |
-| System.Data.SqlTypes;SqlBinary;WrapBytes;(System.Byte[]);Argument[0].Element;ReturnValue;taint;df-generated |
+| System.Data.SqlTypes;SqlBinary;SqlBinary;(System.Byte[]);Argument[0].Element;Argument[this].SyntheticField[System.Data.SqlTypes.SqlBinary._value].Element;value;dfc-generated |
+| System.Data.SqlTypes;SqlBinary;WrapBytes;(System.Byte[]);Argument[0];ReturnValue.SyntheticField[System.Data.SqlTypes.SqlBinary._value];value;dfc-generated |
 | System.Data.SqlTypes;SqlBinary;WriteXml;(System.Xml.XmlWriter);Argument[this];Argument[0];taint;df-generated |
-| System.Data.SqlTypes;SqlBinary;get_Value;();Argument[this];ReturnValue;taint;df-generated |
-| System.Data.SqlTypes;SqlBinary;op_Addition;(System.Data.SqlTypes.SqlBinary,System.Data.SqlTypes.SqlBinary);Argument[0];ReturnValue;taint;df-generated |
-| System.Data.SqlTypes;SqlBinary;op_Addition;(System.Data.SqlTypes.SqlBinary,System.Data.SqlTypes.SqlBinary);Argument[1];ReturnValue;taint;df-generated |
+| System.Data.SqlTypes;SqlBinary;get_Value;();Argument[this].SyntheticField[System.Data.SqlTypes.SqlBinary._value].Element;ReturnValue.Element;value;dfc-generated |
 | System.Data.SqlTypes;SqlBoolean;ReadXml;(System.Xml.XmlReader);Argument[0];Argument[this];taint;df-generated |
 | System.Data.SqlTypes;SqlBoolean;WriteXml;(System.Xml.XmlWriter);Argument[this];Argument[0];taint;df-generated |
 | System.Data.SqlTypes;SqlByte;ReadXml;(System.Xml.XmlReader);Argument[0];Argument[this];taint;df-generated |
@@ -9232,39 +9757,38 @@ summary
 | System.Data.SqlTypes;SqlBytes;GetObjectData;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);Argument[this];Argument[0];taint;df-generated |
 | System.Data.SqlTypes;SqlBytes;Read;(System.Int64,System.Byte[],System.Int32,System.Int32);Argument[this];Argument[1].Element;taint;df-generated |
 | System.Data.SqlTypes;SqlBytes;ReadXml;(System.Xml.XmlReader);Argument[0];Argument[this];taint;df-generated |
-| System.Data.SqlTypes;SqlBytes;SqlBytes;(System.Byte[]);Argument[0].Element;Argument[this];taint;df-generated |
-| System.Data.SqlTypes;SqlBytes;SqlBytes;(System.IO.Stream);Argument[0];Argument[this];taint;df-generated |
-| System.Data.SqlTypes;SqlBytes;ToSqlBinary;();Argument[this];ReturnValue;taint;df-generated |
+| System.Data.SqlTypes;SqlBytes;SqlBytes;(System.Byte[]);Argument[0];Argument[this].SyntheticField[System.Data.SqlTypes.SqlBytes._rgbBuf];value;dfc-generated |
+| System.Data.SqlTypes;SqlBytes;SqlBytes;(System.IO.Stream);Argument[0];Argument[this].SyntheticField[System.Data.SqlTypes.SqlBytes._stream];value;dfc-generated |
 | System.Data.SqlTypes;SqlBytes;Write;(System.Int64,System.Byte[],System.Int32,System.Int32);Argument[1].Element;Argument[this];taint;df-generated |
 | System.Data.SqlTypes;SqlBytes;WriteXml;(System.Xml.XmlWriter);Argument[this];Argument[0];taint;df-generated |
-| System.Data.SqlTypes;SqlBytes;get_Buffer;();Argument[this];ReturnValue;taint;df-generated |
-| System.Data.SqlTypes;SqlBytes;get_Value;();Argument[this];ReturnValue;taint;df-generated |
+| System.Data.SqlTypes;SqlBytes;get_Buffer;();Argument[this].SyntheticField[System.Data.SqlTypes.SqlBytes._rgbBuf];ReturnValue;value;dfc-generated |
+| System.Data.SqlTypes;SqlBytes;get_Value;();Argument[this].SyntheticField[System.Data.SqlTypes.SqlBytes._stream];ReturnValue.Element;taint;dfc-generated |
 | System.Data.SqlTypes;SqlChars;GetObjectData;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);Argument[this];Argument[0];taint;df-generated |
 | System.Data.SqlTypes;SqlChars;ReadXml;(System.Xml.XmlReader);Argument[0];Argument[this];taint;df-generated |
-| System.Data.SqlTypes;SqlChars;SqlChars;(System.Char[]);Argument[0].Element;Argument[this];taint;df-generated |
+| System.Data.SqlTypes;SqlChars;SqlChars;(System.Char[]);Argument[0];Argument[this].SyntheticField[System.Data.SqlTypes.SqlChars._rgchBuf];value;dfc-generated |
 | System.Data.SqlTypes;SqlChars;WriteXml;(System.Xml.XmlWriter);Argument[this];Argument[0];taint;df-generated |
-| System.Data.SqlTypes;SqlChars;get_Buffer;();Argument[this];ReturnValue;taint;df-generated |
+| System.Data.SqlTypes;SqlChars;get_Buffer;();Argument[this].SyntheticField[System.Data.SqlTypes.SqlChars._rgchBuf];ReturnValue;value;dfc-generated |
 | System.Data.SqlTypes;SqlDateTime;ReadXml;(System.Xml.XmlReader);Argument[0];Argument[this];taint;df-generated |
 | System.Data.SqlTypes;SqlDateTime;WriteXml;(System.Xml.XmlWriter);Argument[this];Argument[0];taint;df-generated |
-| System.Data.SqlTypes;SqlDecimal;Abs;(System.Data.SqlTypes.SqlDecimal);Argument[0];ReturnValue;taint;df-generated |
-| System.Data.SqlTypes;SqlDecimal;AdjustScale;(System.Data.SqlTypes.SqlDecimal,System.Int32,System.Boolean);Argument[0];ReturnValue;taint;df-generated |
-| System.Data.SqlTypes;SqlDecimal;Ceiling;(System.Data.SqlTypes.SqlDecimal);Argument[0];ReturnValue;taint;df-generated |
-| System.Data.SqlTypes;SqlDecimal;ConvertToPrecScale;(System.Data.SqlTypes.SqlDecimal,System.Int32,System.Int32);Argument[0];ReturnValue;taint;df-generated |
-| System.Data.SqlTypes;SqlDecimal;Floor;(System.Data.SqlTypes.SqlDecimal);Argument[0];ReturnValue;taint;df-generated |
+| System.Data.SqlTypes;SqlDecimal;Abs;(System.Data.SqlTypes.SqlDecimal);Argument[0];ReturnValue;value;dfc-generated |
+| System.Data.SqlTypes;SqlDecimal;AdjustScale;(System.Data.SqlTypes.SqlDecimal,System.Int32,System.Boolean);Argument[0];ReturnValue;value;dfc-generated |
+| System.Data.SqlTypes;SqlDecimal;Ceiling;(System.Data.SqlTypes.SqlDecimal);Argument[0];ReturnValue;value;dfc-generated |
+| System.Data.SqlTypes;SqlDecimal;ConvertToPrecScale;(System.Data.SqlTypes.SqlDecimal,System.Int32,System.Int32);Argument[0];ReturnValue;value;dfc-generated |
+| System.Data.SqlTypes;SqlDecimal;Floor;(System.Data.SqlTypes.SqlDecimal);Argument[0];ReturnValue;value;dfc-generated |
 | System.Data.SqlTypes;SqlDecimal;ReadXml;(System.Xml.XmlReader);Argument[0];Argument[this];taint;df-generated |
-| System.Data.SqlTypes;SqlDecimal;Round;(System.Data.SqlTypes.SqlDecimal,System.Int32);Argument[0];ReturnValue;taint;df-generated |
-| System.Data.SqlTypes;SqlDecimal;Truncate;(System.Data.SqlTypes.SqlDecimal,System.Int32);Argument[0];ReturnValue;taint;df-generated |
+| System.Data.SqlTypes;SqlDecimal;Round;(System.Data.SqlTypes.SqlDecimal,System.Int32);Argument[0];ReturnValue;value;dfc-generated |
+| System.Data.SqlTypes;SqlDecimal;Truncate;(System.Data.SqlTypes.SqlDecimal,System.Int32);Argument[0];ReturnValue;value;dfc-generated |
 | System.Data.SqlTypes;SqlDecimal;WriteXml;(System.Xml.XmlWriter);Argument[this];Argument[0];taint;df-generated |
-| System.Data.SqlTypes;SqlDecimal;op_UnaryNegation;(System.Data.SqlTypes.SqlDecimal);Argument[0];ReturnValue;taint;df-generated |
+| System.Data.SqlTypes;SqlDecimal;op_UnaryNegation;(System.Data.SqlTypes.SqlDecimal);Argument[0];ReturnValue;value;dfc-generated |
 | System.Data.SqlTypes;SqlDouble;ReadXml;(System.Xml.XmlReader);Argument[0];Argument[this];taint;df-generated |
 | System.Data.SqlTypes;SqlDouble;WriteXml;(System.Xml.XmlWriter);Argument[this];Argument[0];taint;df-generated |
 | System.Data.SqlTypes;SqlFileStream;Read;(System.Byte[],System.Int32,System.Int32);Argument[this];Argument[0].Element;taint;manual |
 | System.Data.SqlTypes;SqlFileStream;Write;(System.Byte[],System.Int32,System.Int32);Argument[0].Element;Argument[this];taint;manual |
 | System.Data.SqlTypes;SqlGuid;GetObjectData;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);Argument[this];Argument[0];taint;df-generated |
 | System.Data.SqlTypes;SqlGuid;ReadXml;(System.Xml.XmlReader);Argument[0];Argument[this];taint;df-generated |
-| System.Data.SqlTypes;SqlGuid;SqlGuid;(System.Guid);Argument[0];Argument[this];taint;df-generated |
+| System.Data.SqlTypes;SqlGuid;SqlGuid;(System.Guid);Argument[0];Argument[this].SyntheticField[System.Data.SqlTypes.SqlGuid._value];value;dfc-generated |
 | System.Data.SqlTypes;SqlGuid;WriteXml;(System.Xml.XmlWriter);Argument[this];Argument[0];taint;df-generated |
-| System.Data.SqlTypes;SqlGuid;get_Value;();Argument[this];ReturnValue;taint;df-generated |
+| System.Data.SqlTypes;SqlGuid;get_Value;();Argument[this].SyntheticField[System.Data.SqlTypes.SqlGuid._value];ReturnValue;value;dfc-generated |
 | System.Data.SqlTypes;SqlInt16;ReadXml;(System.Xml.XmlReader);Argument[0];Argument[this];taint;df-generated |
 | System.Data.SqlTypes;SqlInt16;WriteXml;(System.Xml.XmlWriter);Argument[this];Argument[0];taint;df-generated |
 | System.Data.SqlTypes;SqlInt32;ReadXml;(System.Xml.XmlReader);Argument[0];Argument[this];taint;df-generated |
@@ -9275,56 +9799,47 @@ summary
 | System.Data.SqlTypes;SqlMoney;WriteXml;(System.Xml.XmlWriter);Argument[this];Argument[0];taint;df-generated |
 | System.Data.SqlTypes;SqlSingle;ReadXml;(System.Xml.XmlReader);Argument[0];Argument[this];taint;df-generated |
 | System.Data.SqlTypes;SqlSingle;WriteXml;(System.Xml.XmlWriter);Argument[this];Argument[0];taint;df-generated |
-| System.Data.SqlTypes;SqlString;Add;(System.Data.SqlTypes.SqlString,System.Data.SqlTypes.SqlString);Argument[0];ReturnValue;taint;df-generated |
-| System.Data.SqlTypes;SqlString;Add;(System.Data.SqlTypes.SqlString,System.Data.SqlTypes.SqlString);Argument[1];ReturnValue;taint;df-generated |
-| System.Data.SqlTypes;SqlString;Clone;();Argument[this];ReturnValue;taint;df-generated |
-| System.Data.SqlTypes;SqlString;Concat;(System.Data.SqlTypes.SqlString,System.Data.SqlTypes.SqlString);Argument[0];ReturnValue;taint;df-generated |
-| System.Data.SqlTypes;SqlString;Concat;(System.Data.SqlTypes.SqlString,System.Data.SqlTypes.SqlString);Argument[1];ReturnValue;taint;df-generated |
-| System.Data.SqlTypes;SqlString;GetNonUnicodeBytes;();Argument[this];ReturnValue;taint;df-generated |
-| System.Data.SqlTypes;SqlString;GetUnicodeBytes;();Argument[this];ReturnValue;taint;df-generated |
+| System.Data.SqlTypes;SqlString;Add;(System.Data.SqlTypes.SqlString,System.Data.SqlTypes.SqlString);Argument[0].SyntheticField[System.Data.SqlTypes.SqlString.m_value];ReturnValue.SyntheticField[System.Data.SqlTypes.SqlString.m_value];taint;dfc-generated |
+| System.Data.SqlTypes;SqlString;Add;(System.Data.SqlTypes.SqlString,System.Data.SqlTypes.SqlString);Argument[1].SyntheticField[System.Data.SqlTypes.SqlString.m_value];ReturnValue.SyntheticField[System.Data.SqlTypes.SqlString.m_value];taint;dfc-generated |
+| System.Data.SqlTypes;SqlString;Concat;(System.Data.SqlTypes.SqlString,System.Data.SqlTypes.SqlString);Argument[0].SyntheticField[System.Data.SqlTypes.SqlString.m_value];ReturnValue.SyntheticField[System.Data.SqlTypes.SqlString.m_value];taint;dfc-generated |
+| System.Data.SqlTypes;SqlString;Concat;(System.Data.SqlTypes.SqlString,System.Data.SqlTypes.SqlString);Argument[1].SyntheticField[System.Data.SqlTypes.SqlString.m_value];ReturnValue.SyntheticField[System.Data.SqlTypes.SqlString.m_value];taint;dfc-generated |
+| System.Data.SqlTypes;SqlString;GetNonUnicodeBytes;();Argument[this].SyntheticField[System.Data.SqlTypes.SqlString.m_value];ReturnValue;taint;dfc-generated |
+| System.Data.SqlTypes;SqlString;GetUnicodeBytes;();Argument[this].SyntheticField[System.Data.SqlTypes.SqlString.m_value];ReturnValue;taint;dfc-generated |
 | System.Data.SqlTypes;SqlString;ReadXml;(System.Xml.XmlReader);Argument[0];Argument[this];taint;df-generated |
-| System.Data.SqlTypes;SqlString;SqlString;(System.Int32,System.Data.SqlTypes.SqlCompareOptions,System.Byte[],System.Int32,System.Int32,System.Boolean);Argument[2].Element;Argument[this];taint;df-generated |
-| System.Data.SqlTypes;SqlString;SqlString;(System.String,System.Int32,System.Data.SqlTypes.SqlCompareOptions);Argument[0];Argument[this];taint;df-generated |
-| System.Data.SqlTypes;SqlString;ToString;();Argument[this];ReturnValue;taint;df-generated |
+| System.Data.SqlTypes;SqlString;SqlString;(System.Int32,System.Data.SqlTypes.SqlCompareOptions,System.Byte[],System.Int32,System.Int32,System.Boolean);Argument[2].Element;Argument[this].SyntheticField[System.Data.SqlTypes.SqlString.m_value];taint;dfc-generated |
+| System.Data.SqlTypes;SqlString;SqlString;(System.String,System.Int32,System.Data.SqlTypes.SqlCompareOptions);Argument[0];Argument[this].SyntheticField[System.Data.SqlTypes.SqlString.m_value];value;dfc-generated |
+| System.Data.SqlTypes;SqlString;ToString;();Argument[this].SyntheticField[System.Data.SqlTypes.SqlString.m_value];ReturnValue;value;dfc-generated |
 | System.Data.SqlTypes;SqlString;WriteXml;(System.Xml.XmlWriter);Argument[this];Argument[0];taint;df-generated |
 | System.Data.SqlTypes;SqlString;get_CompareInfo;();Argument[this];ReturnValue;taint;df-generated |
-| System.Data.SqlTypes;SqlString;get_Value;();Argument[this];ReturnValue;taint;df-generated |
-| System.Data.SqlTypes;SqlString;op_Addition;(System.Data.SqlTypes.SqlString,System.Data.SqlTypes.SqlString);Argument[0];ReturnValue;taint;df-generated |
-| System.Data.SqlTypes;SqlString;op_Addition;(System.Data.SqlTypes.SqlString,System.Data.SqlTypes.SqlString);Argument[1];ReturnValue;taint;df-generated |
+| System.Data.SqlTypes;SqlString;get_Value;();Argument[this].SyntheticField[System.Data.SqlTypes.SqlString.m_value];ReturnValue;value;dfc-generated |
+| System.Data.SqlTypes;SqlString;op_Addition;(System.Data.SqlTypes.SqlString,System.Data.SqlTypes.SqlString);Argument[0].SyntheticField[System.Data.SqlTypes.SqlString.m_value];ReturnValue.SyntheticField[System.Data.SqlTypes.SqlString.m_value];taint;dfc-generated |
+| System.Data.SqlTypes;SqlString;op_Addition;(System.Data.SqlTypes.SqlString,System.Data.SqlTypes.SqlString);Argument[1].SyntheticField[System.Data.SqlTypes.SqlString.m_value];ReturnValue.SyntheticField[System.Data.SqlTypes.SqlString.m_value];taint;dfc-generated |
 | System.Data.SqlTypes;SqlXml;ReadXml;(System.Xml.XmlReader);Argument[0];Argument[this];taint;df-generated |
 | System.Data.SqlTypes;SqlXml;SqlXml;(System.IO.Stream);Argument[0];Argument[this];taint;df-generated |
 | System.Data.SqlTypes;SqlXml;WriteXml;(System.Xml.XmlWriter);Argument[this];Argument[0];taint;df-generated |
-| System.Data;Constraint;SetDataSet;(System.Data.DataSet);Argument[0];Argument[this];taint;df-generated |
-| System.Data;Constraint;ToString;();Argument[this];ReturnValue;taint;df-generated |
+| System.Data;Constraint;SetDataSet;(System.Data.DataSet);Argument[0];Argument[this].SyntheticField[System.Data.Constraint._dataSet];value;dfc-generated |
+| System.Data;Constraint;ToString;();Argument[this].Property[System.Data.Constraint.ConstraintName];ReturnValue;value;dfc-generated |
 | System.Data;Constraint;get_Table;();Argument[this];ReturnValue;taint;df-generated |
-| System.Data;Constraint;get__DataSet;();Argument[this];ReturnValue;taint;df-generated |
+| System.Data;Constraint;get__DataSet;();Argument[this].SyntheticField[System.Data.Constraint._dataSet];ReturnValue;value;dfc-generated |
 | System.Data;ConstraintCollection;Add;(System.Data.Constraint);Argument[0];Argument[this].Element;value;manual |
-| System.Data;ConstraintCollection;Add;(System.String,System.Data.DataColumn,System.Boolean);Argument[0];Argument[this];taint;df-generated |
-| System.Data;ConstraintCollection;Add;(System.String,System.Data.DataColumn,System.Boolean);Argument[0];ReturnValue;taint;df-generated |
-| System.Data;ConstraintCollection;Add;(System.String,System.Data.DataColumn,System.Data.DataColumn);Argument[0];Argument[this];taint;df-generated |
-| System.Data;ConstraintCollection;Add;(System.String,System.Data.DataColumn,System.Data.DataColumn);Argument[0];ReturnValue;taint;df-generated |
-| System.Data;ConstraintCollection;Add;(System.String,System.Data.DataColumn[],System.Boolean);Argument[0];Argument[this];taint;df-generated |
-| System.Data;ConstraintCollection;Add;(System.String,System.Data.DataColumn[],System.Boolean);Argument[0];ReturnValue;taint;df-generated |
 | System.Data;ConstraintCollection;Add;(System.String,System.Data.DataColumn[],System.Boolean);Argument[1].Element;Argument[this];taint;df-generated |
-| System.Data;ConstraintCollection;Add;(System.String,System.Data.DataColumn[],System.Data.DataColumn[]);Argument[0];Argument[this];taint;df-generated |
-| System.Data;ConstraintCollection;Add;(System.String,System.Data.DataColumn[],System.Data.DataColumn[]);Argument[0];ReturnValue;taint;df-generated |
 | System.Data;ConstraintCollection;AddRange;(System.Data.Constraint[]);Argument[0].Element;Argument[this].Element;value;manual |
 | System.Data;ConstraintCollection;Clear;();Argument[this].WithoutElement;Argument[this];value;manual |
 | System.Data;ConstraintCollection;CopyTo;(System.Data.Constraint[],System.Int32);Argument[this].Element;Argument[0].Element;value;manual |
 | System.Data;ConstraintCollection;add_CollectionChanged;(System.ComponentModel.CollectionChangeEventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
-| System.Data;ConstraintCollection;get_Item;(System.Int32);Argument[this];ReturnValue;taint;df-generated |
-| System.Data;ConstraintCollection;get_Item;(System.String);Argument[this];ReturnValue;taint;df-generated |
+| System.Data;ConstraintCollection;get_Item;(System.Int32);Argument[this].Property[System.Data.ConstraintCollection.List].Element;ReturnValue;value;dfc-generated |
+| System.Data;ConstraintCollection;get_Item;(System.String);Argument[this].Property[System.Data.ConstraintCollection.List].Element;ReturnValue;value;dfc-generated |
 | System.Data;ConstraintCollection;get_List;();Argument[this];ReturnValue;taint;df-generated |
 | System.Data;ConstraintCollection;remove_CollectionChanged;(System.ComponentModel.CollectionChangeEventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
-| System.Data;DBConcurrencyException;CopyToRows;(System.Data.DataRow[]);Argument[this];Argument[0].Element;taint;df-generated |
-| System.Data;DBConcurrencyException;CopyToRows;(System.Data.DataRow[],System.Int32);Argument[this];Argument[0].Element;taint;df-generated |
-| System.Data;DBConcurrencyException;DBConcurrencyException;(System.String,System.Exception,System.Data.DataRow[]);Argument[2].Element;Argument[this];taint;df-generated |
+| System.Data;DBConcurrencyException;CopyToRows;(System.Data.DataRow[]);Argument[this].SyntheticField[System.Data.DBConcurrencyException._dataRows].Element;Argument[0].Element;value;dfc-generated |
+| System.Data;DBConcurrencyException;CopyToRows;(System.Data.DataRow[],System.Int32);Argument[this].SyntheticField[System.Data.DBConcurrencyException._dataRows].Element;Argument[0].Element;value;dfc-generated |
+| System.Data;DBConcurrencyException;DBConcurrencyException;(System.String,System.Exception,System.Data.DataRow[]);Argument[2];Argument[this].SyntheticField[System.Data.DBConcurrencyException._dataRows];value;dfc-generated |
 | System.Data;DBConcurrencyException;GetObjectData;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);Argument[this];Argument[0];taint;df-generated |
 | System.Data;DataColumn;DataColumn;(System.String,System.Type,System.String,System.Data.MappingType);Argument[0];Argument[this];taint;df-generated |
 | System.Data;DataColumn;DataColumn;(System.String,System.Type,System.String,System.Data.MappingType);Argument[2];Argument[this];taint;df-generated |
 | System.Data;DataColumn;get_Table;();Argument[this];ReturnValue;taint;df-generated |
-| System.Data;DataColumnChangeEventArgs;DataColumnChangeEventArgs;(System.Data.DataRow,System.Data.DataColumn,System.Object);Argument[1];Argument[this];taint;df-generated |
-| System.Data;DataColumnChangeEventArgs;get_Column;();Argument[this];ReturnValue;taint;df-generated |
+| System.Data;DataColumnChangeEventArgs;DataColumnChangeEventArgs;(System.Data.DataRow,System.Data.DataColumn,System.Object);Argument[1];Argument[this].SyntheticField[System.Data.DataColumnChangeEventArgs._column];value;dfc-generated |
+| System.Data;DataColumnChangeEventArgs;get_Column;();Argument[this].SyntheticField[System.Data.DataColumnChangeEventArgs._column];ReturnValue;value;dfc-generated |
 | System.Data;DataColumnChangeEventHandler;BeginInvoke;(System.Object,System.Data.DataColumnChangeEventArgs,System.AsyncCallback,System.Object);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
 | System.Data;DataColumnCollection;Add;();Argument[this];ReturnValue;taint;df-generated |
 | System.Data;DataColumnCollection;Add;(System.Data.DataColumn);Argument[0];Argument[this].Element;value;manual |
@@ -9339,28 +9854,19 @@ summary
 | System.Data;DataColumnCollection;get_Item;(System.String);Argument[this];ReturnValue;taint;df-generated |
 | System.Data;DataColumnCollection;get_List;();Argument[this];ReturnValue;taint;df-generated |
 | System.Data;DataColumnCollection;remove_CollectionChanged;(System.ComponentModel.CollectionChangeEventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
-| System.Data;DataReaderExtensions;GetFieldValue<T>;(System.Data.Common.DbDataReader,System.String);Argument[0].Element;ReturnValue;taint;df-generated |
-| System.Data;DataReaderExtensions;GetFieldValueAsync<T>;(System.Data.Common.DbDataReader,System.String,System.Threading.CancellationToken);Argument[0].Element;ReturnValue;taint;df-generated |
+| System.Data;DataReaderExtensions;GetFieldValue<T>;(System.Data.Common.DbDataReader,System.String);Argument[0];ReturnValue;taint;dfc-generated |
+| System.Data;DataReaderExtensions;GetFieldValueAsync<T>;(System.Data.Common.DbDataReader,System.String,System.Threading.CancellationToken);Argument[0];ReturnValue.Property[System.Threading.Tasks.Task`1.Result];taint;dfc-generated |
 | System.Data;DataReaderExtensions;GetGuid;(System.Data.Common.DbDataReader,System.String);Argument[0].Element;ReturnValue;taint;df-generated |
-| System.Data;DataReaderExtensions;GetProviderSpecificValue;(System.Data.Common.DbDataReader,System.String);Argument[0].Element;ReturnValue;taint;df-generated |
-| System.Data;DataReaderExtensions;GetString;(System.Data.Common.DbDataReader,System.String);Argument[0].Element;ReturnValue;taint;df-generated |
-| System.Data;DataReaderExtensions;GetTextReader;(System.Data.Common.DbDataReader,System.String);Argument[0].Element;ReturnValue;taint;df-generated |
-| System.Data;DataReaderExtensions;GetValue;(System.Data.Common.DbDataReader,System.String);Argument[0].Element;ReturnValue;taint;df-generated |
-| System.Data;DataRelation;DataRelation;(System.String,System.Data.DataColumn,System.Data.DataColumn,System.Boolean);Argument[0];Argument[this];taint;df-generated |
-| System.Data;DataRelation;DataRelation;(System.String,System.Data.DataColumn[],System.Data.DataColumn[],System.Boolean);Argument[0];Argument[this];taint;df-generated |
-| System.Data;DataRelation;DataRelation;(System.String,System.String,System.String,System.String,System.String,System.String[],System.String[],System.Boolean);Argument[0];Argument[this];taint;df-generated |
-| System.Data;DataRelation;DataRelation;(System.String,System.String,System.String,System.String,System.String,System.String[],System.String[],System.Boolean);Argument[1];Argument[this];taint;df-generated |
-| System.Data;DataRelation;DataRelation;(System.String,System.String,System.String,System.String,System.String,System.String[],System.String[],System.Boolean);Argument[2];Argument[this];taint;df-generated |
-| System.Data;DataRelation;DataRelation;(System.String,System.String,System.String,System.String,System.String,System.String[],System.String[],System.Boolean);Argument[3];Argument[this];taint;df-generated |
-| System.Data;DataRelation;DataRelation;(System.String,System.String,System.String,System.String,System.String,System.String[],System.String[],System.Boolean);Argument[4];Argument[this];taint;df-generated |
-| System.Data;DataRelation;DataRelation;(System.String,System.String,System.String,System.String,System.String,System.String[],System.String[],System.Boolean);Argument[5].Element;Argument[this];taint;df-generated |
-| System.Data;DataRelation;DataRelation;(System.String,System.String,System.String,System.String,System.String,System.String[],System.String[],System.Boolean);Argument[6].Element;Argument[this];taint;df-generated |
-| System.Data;DataRelation;DataRelation;(System.String,System.String,System.String,System.String[],System.String[],System.Boolean);Argument[0];Argument[this];taint;df-generated |
-| System.Data;DataRelation;DataRelation;(System.String,System.String,System.String,System.String[],System.String[],System.Boolean);Argument[1];Argument[this];taint;df-generated |
-| System.Data;DataRelation;DataRelation;(System.String,System.String,System.String,System.String[],System.String[],System.Boolean);Argument[2];Argument[this];taint;df-generated |
-| System.Data;DataRelation;DataRelation;(System.String,System.String,System.String,System.String[],System.String[],System.Boolean);Argument[3].Element;Argument[this];taint;df-generated |
-| System.Data;DataRelation;DataRelation;(System.String,System.String,System.String,System.String[],System.String[],System.Boolean);Argument[4].Element;Argument[this];taint;df-generated |
-| System.Data;DataRelation;ToString;();Argument[this];ReturnValue;taint;df-generated |
+| System.Data;DataReaderExtensions;GetProviderSpecificValue;(System.Data.Common.DbDataReader,System.String);Argument[0];ReturnValue;taint;dfc-generated |
+| System.Data;DataReaderExtensions;GetString;(System.Data.Common.DbDataReader,System.String);Argument[0];ReturnValue;taint;dfc-generated |
+| System.Data;DataReaderExtensions;GetTextReader;(System.Data.Common.DbDataReader,System.String);Argument[0];ReturnValue;taint;dfc-generated |
+| System.Data;DataReaderExtensions;GetValue;(System.Data.Common.DbDataReader,System.String);Argument[0];ReturnValue;taint;dfc-generated |
+| System.Data;DataRelation;DataRelation;(System.String,System.Data.DataColumn,System.Data.DataColumn,System.Boolean);Argument[0];Argument[this].SyntheticField[System.Data.DataRelation._relationName];value;dfc-generated |
+| System.Data;DataRelation;DataRelation;(System.String,System.Data.DataColumn[],System.Data.DataColumn[],System.Boolean);Argument[0];Argument[this].SyntheticField[System.Data.DataRelation._relationName];value;dfc-generated |
+| System.Data;DataRelation;DataRelation;(System.String,System.String,System.String,System.String,System.String,System.String[],System.String[],System.Boolean);Argument[0];Argument[this].SyntheticField[System.Data.DataRelation._relationName];value;dfc-generated |
+| System.Data;DataRelation;DataRelation;(System.String,System.String,System.String,System.String[],System.String[],System.Boolean);Argument[0];Argument[this].SyntheticField[System.Data.DataRelation._relationName];value;dfc-generated |
+| System.Data;DataRelation;ToString;();Argument[this].Property[System.Data.DataRelation.RelationName];ReturnValue;value;dfc-generated |
+| System.Data;DataRelation;ToString;();Argument[this].SyntheticField[System.Data.DataRelation._relationName];ReturnValue;value;dfc-generated |
 | System.Data;DataRelation;get_ChildColumns;();Argument[this];ReturnValue;taint;df-generated |
 | System.Data;DataRelation;get_ChildKeyConstraint;();Argument[this];ReturnValue;taint;df-generated |
 | System.Data;DataRelation;get_ChildTable;();Argument[this];ReturnValue;taint;df-generated |
@@ -9372,12 +9878,8 @@ summary
 | System.Data;DataRelationCollection;Add;(System.Data.DataColumn[],System.Data.DataColumn[]);Argument[this];ReturnValue;taint;df-generated |
 | System.Data;DataRelationCollection;Add;(System.Data.DataRelation);Argument[0];Argument[this].Element;value;manual |
 | System.Data;DataRelationCollection;Add;(System.String,System.Data.DataColumn,System.Data.DataColumn);Argument[this];ReturnValue;taint;df-generated |
-| System.Data;DataRelationCollection;Add;(System.String,System.Data.DataColumn,System.Data.DataColumn,System.Boolean);Argument[0];Argument[this];taint;df-generated |
-| System.Data;DataRelationCollection;Add;(System.String,System.Data.DataColumn,System.Data.DataColumn,System.Boolean);Argument[0];ReturnValue;taint;df-generated |
 | System.Data;DataRelationCollection;Add;(System.String,System.Data.DataColumn,System.Data.DataColumn,System.Boolean);Argument[this];ReturnValue;taint;df-generated |
 | System.Data;DataRelationCollection;Add;(System.String,System.Data.DataColumn[],System.Data.DataColumn[]);Argument[this];ReturnValue;taint;df-generated |
-| System.Data;DataRelationCollection;Add;(System.String,System.Data.DataColumn[],System.Data.DataColumn[],System.Boolean);Argument[0];Argument[this];taint;df-generated |
-| System.Data;DataRelationCollection;Add;(System.String,System.Data.DataColumn[],System.Data.DataColumn[],System.Boolean);Argument[0];ReturnValue;taint;df-generated |
 | System.Data;DataRelationCollection;Add;(System.String,System.Data.DataColumn[],System.Data.DataColumn[],System.Boolean);Argument[this];ReturnValue;taint;df-generated |
 | System.Data;DataRelationCollection;AddCore;(System.Data.DataRelation);Argument[0];Argument[this];taint;df-generated |
 | System.Data;DataRelationCollection;AddCore;(System.Data.DataRelation);Argument[this];Argument[0];taint;df-generated |
@@ -9385,6 +9887,8 @@ summary
 | System.Data;DataRelationCollection;Clear;();Argument[this].WithoutElement;Argument[this];value;manual |
 | System.Data;DataRelationCollection;CopyTo;(System.Data.DataRelation[],System.Int32);Argument[this].Element;Argument[0].Element;value;manual |
 | System.Data;DataRelationCollection;GetDataSet;();Argument[this];ReturnValue;taint;df-generated |
+| System.Data;DataRelationCollection;OnCollectionChanged;(System.ComponentModel.CollectionChangeEventArgs);Argument[0];Argument[this];taint;df-generated |
+| System.Data;DataRelationCollection;OnCollectionChanging;(System.ComponentModel.CollectionChangeEventArgs);Argument[0];Argument[this];taint;df-generated |
 | System.Data;DataRelationCollection;Remove;(System.Data.DataRelation);Argument[0];Argument[this];taint;df-generated |
 | System.Data;DataRelationCollection;add_CollectionChanged;(System.ComponentModel.CollectionChangeEventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Data;DataRelationCollection;get_Item;(System.Int32);Argument[this];ReturnValue;taint;df-generated |
@@ -9426,23 +9930,18 @@ summary
 | System.Data;DataRowView;CreateChildView;(System.Data.DataRelation,System.Boolean);Argument[this];ReturnValue;taint;df-generated |
 | System.Data;DataRowView;CreateChildView;(System.String);Argument[this];ReturnValue;taint;df-generated |
 | System.Data;DataRowView;CreateChildView;(System.String,System.Boolean);Argument[this];ReturnValue;taint;df-generated |
-| System.Data;DataRowView;GetAttributes;();Argument[this];ReturnValue;taint;df-generated |
 | System.Data;DataRowView;GetProperties;();Argument[this];ReturnValue;taint;df-generated |
 | System.Data;DataRowView;GetProperties;(System.Attribute[]);Argument[this];ReturnValue;taint;df-generated |
-| System.Data;DataRowView;GetPropertyOwner;(System.ComponentModel.PropertyDescriptor);Argument[this];ReturnValue;taint;df-generated |
-| System.Data;DataRowView;GetPropertyOwner;(System.ComponentModel.PropertyDescriptor);Argument[this];ReturnValue;value;df-generated |
+| System.Data;DataRowView;GetPropertyOwner;(System.ComponentModel.PropertyDescriptor);Argument[this];ReturnValue;value;dfc-generated |
 | System.Data;DataRowView;add_PropertyChanged;(System.ComponentModel.PropertyChangedEventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
-| System.Data;DataRowView;get_DataView;();Argument[this];ReturnValue;taint;df-generated |
-| System.Data;DataRowView;get_Error;();Argument[this];ReturnValue;taint;df-generated |
+| System.Data;DataRowView;get_DataView;();Argument[this].SyntheticField[System.Data.DataRowView._dataView];ReturnValue;value;dfc-generated |
+| System.Data;DataRowView;get_Error;();Argument[this].Property[System.Data.DataRowView.Row].Property[System.Data.DataRow.RowError];ReturnValue;value;dfc-generated |
 | System.Data;DataRowView;get_Item;(System.Int32);Argument[this];ReturnValue;taint;df-generated |
 | System.Data;DataRowView;get_Item;(System.String);Argument[this];ReturnValue;taint;df-generated |
 | System.Data;DataRowView;get_Row;();Argument[this];ReturnValue;taint;df-generated |
 | System.Data;DataRowView;remove_PropertyChanged;(System.ComponentModel.PropertyChangedEventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Data;DataSet;Clone;();Argument[this];ReturnValue;taint;df-generated |
 | System.Data;DataSet;Copy;();Argument[this];ReturnValue;taint;df-generated |
-| System.Data;DataSet;CreateDataReader;();Argument[this];ReturnValue;taint;df-generated |
-| System.Data;DataSet;CreateDataReader;(System.Data.DataTable[]);Argument[0].Element;ReturnValue;taint;df-generated |
-| System.Data;DataSet;DataSet;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext,System.Boolean);Argument[0];Argument[this];taint;df-generated |
 | System.Data;DataSet;DataSet;(System.String);Argument[0];Argument[this];taint;df-generated |
 | System.Data;DataSet;GetChanges;();Argument[this];ReturnValue;taint;df-generated |
 | System.Data;DataSet;GetChanges;(System.Data.DataRowState);Argument[this];ReturnValue;taint;df-generated |
@@ -9462,25 +9961,36 @@ summary
 | System.Data;DataSet;get_Tables;();Argument[this];ReturnValue;taint;df-generated |
 | System.Data;DataSet;remove_Initialized;(System.EventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Data;DataSet;remove_MergeFailed;(System.Data.MergeFailedEventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
-| System.Data;DataSysDescriptionAttribute;get_Description;();Argument[this];ReturnValue;taint;df-generated |
+| System.Data;DataSysDescriptionAttribute;get_Description;();Argument[this].Property[System.ComponentModel.DescriptionAttribute.DescriptionValue];ReturnValue;value;dfc-generated |
+| System.Data;DataSysDescriptionAttribute;get_Description;();Argument[this].Property[System.ComponentModel.DescriptionAttribute.Description];Argument[this].Property[System.ComponentModel.DescriptionAttribute.DescriptionValue];value;dfc-generated |
+| System.Data;DataSysDescriptionAttribute;get_Description;();Argument[this].Property[System.ComponentModel.DescriptionAttribute.Description];ReturnValue;value;dfc-generated |
 | System.Data;DataTable;Clone;();Argument[this];ReturnValue;taint;df-generated |
 | System.Data;DataTable;Copy;();Argument[this];ReturnValue;taint;df-generated |
-| System.Data;DataTable;CreateDataReader;();Argument[this];ReturnValue;taint;df-generated |
-| System.Data;DataTable;DataTable;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);Argument[0];Argument[this];taint;df-generated |
 | System.Data;DataTable;DataTable;(System.String);Argument[0];Argument[this];taint;df-generated |
 | System.Data;DataTable;DataTable;(System.String,System.String);Argument[1];Argument[this];taint;df-generated |
 | System.Data;DataTable;GetChanges;();Argument[this];ReturnValue;taint;df-generated |
 | System.Data;DataTable;GetChanges;(System.Data.DataRowState);Argument[this];ReturnValue;taint;df-generated |
 | System.Data;DataTable;GetErrors;();Argument[this];ReturnValue;taint;df-generated |
+| System.Data;DataTable;GetList;();Argument[this].Property[System.Data.DataTable.DefaultView];ReturnValue;value;df-generated |
+| System.Data;DataTable;GetList;();Argument[this].Property[System.Data.DataTable.DefaultView];ReturnValue;value;dfc-generated |
 | System.Data;DataTable;GetList;();Argument[this];ReturnValue;taint;df-generated |
+| System.Data;DataTable;GetList;();Argument[this];ReturnValue;taint;dfc-generated |
 | System.Data;DataTable;GetObjectData;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);Argument[this];Argument[0];taint;df-generated |
 | System.Data;DataTable;Load;(System.Data.IDataReader,System.Data.LoadOption,System.Data.FillErrorEventHandler);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
-| System.Data;DataTable;LoadDataRow;(System.Object[],System.Boolean);Argument[0].Element;Argument[this];taint;df-generated |
-| System.Data;DataTable;LoadDataRow;(System.Object[],System.Boolean);Argument[this];ReturnValue;taint;df-generated |
+| System.Data;DataTable;LoadDataRow;(System.Object[],System.Boolean);Argument[0];Argument[this].Property[System.Data.DataTable.Rows].Element;value;dfc-generated |
+| System.Data;DataTable;LoadDataRow;(System.Object[],System.Boolean);Argument[0];Argument[this].SyntheticField[System.Data.DataTable._rowCollection].Element;value;dfc-generated |
 | System.Data;DataTable;LoadDataRow;(System.Object[],System.Data.LoadOption);Argument[this];ReturnValue;taint;df-generated |
-| System.Data;DataTable;NewRow;();Argument[this];ReturnValue;taint;df-generated |
 | System.Data;DataTable;NewRowArray;(System.Int32);Argument[this];ReturnValue;taint;df-generated |
-| System.Data;DataTable;NewRowFromBuilder;(System.Data.DataRowBuilder);Argument[0];ReturnValue;taint;df-generated |
+| System.Data;DataTable;OnColumnChanged;(System.Data.DataColumnChangeEventArgs);Argument[0];Argument[this];taint;df-generated |
+| System.Data;DataTable;OnColumnChanging;(System.Data.DataColumnChangeEventArgs);Argument[0];Argument[this];taint;df-generated |
+| System.Data;DataTable;OnPropertyChanging;(System.ComponentModel.PropertyChangedEventArgs);Argument[0];Argument[this];taint;df-generated |
+| System.Data;DataTable;OnRowChanged;(System.Data.DataRowChangeEventArgs);Argument[0];Argument[this];taint;df-generated |
+| System.Data;DataTable;OnRowChanging;(System.Data.DataRowChangeEventArgs);Argument[0];Argument[this];taint;df-generated |
+| System.Data;DataTable;OnRowDeleted;(System.Data.DataRowChangeEventArgs);Argument[0];Argument[this];taint;df-generated |
+| System.Data;DataTable;OnRowDeleting;(System.Data.DataRowChangeEventArgs);Argument[0];Argument[this];taint;df-generated |
+| System.Data;DataTable;OnTableCleared;(System.Data.DataTableClearEventArgs);Argument[0];Argument[this];taint;df-generated |
+| System.Data;DataTable;OnTableClearing;(System.Data.DataTableClearEventArgs);Argument[0];Argument[this];taint;df-generated |
+| System.Data;DataTable;OnTableNewRow;(System.Data.DataTableNewRowEventArgs);Argument[0];Argument[this];taint;df-generated |
 | System.Data;DataTable;ReadXml;(System.Xml.XmlReader);Argument[0];Argument[this];taint;df-generated |
 | System.Data;DataTable;Select;();Argument[this];ReturnValue;taint;df-generated |
 | System.Data;DataTable;Select;(System.String);Argument[this];ReturnValue;taint;df-generated |
@@ -9501,7 +10011,7 @@ summary
 | System.Data;DataTable;get_Constraints;();Argument[this];ReturnValue;taint;df-generated |
 | System.Data;DataTable;get_DataSet;();Argument[this];ReturnValue;taint;df-generated |
 | System.Data;DataTable;get_DefaultView;();Argument[this];ReturnValue;taint;df-generated |
-| System.Data;DataTable;get_Rows;();Argument[this];ReturnValue;taint;df-generated |
+| System.Data;DataTable;get_Rows;();Argument[this].SyntheticField[System.Data.DataTable._rowCollection];ReturnValue;value;dfc-generated |
 | System.Data;DataTable;remove_ColumnChanged;(System.Data.DataColumnChangeEventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Data;DataTable;remove_ColumnChanging;(System.Data.DataColumnChangeEventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Data;DataTable;remove_Initialized;(System.EventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
@@ -9512,8 +10022,8 @@ summary
 | System.Data;DataTable;remove_TableCleared;(System.Data.DataTableClearEventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Data;DataTable;remove_TableClearing;(System.Data.DataTableClearEventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Data;DataTable;remove_TableNewRow;(System.Data.DataTableNewRowEventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
-| System.Data;DataTableClearEventArgs;get_TableName;();Argument[this];ReturnValue;taint;df-generated |
-| System.Data;DataTableClearEventArgs;get_TableNamespace;();Argument[this];ReturnValue;taint;df-generated |
+| System.Data;DataTableClearEventArgs;get_TableName;();Argument[this].Property[System.Data.DataTableClearEventArgs.Table].Property[System.Data.DataTable.TableName];ReturnValue;value;dfc-generated |
+| System.Data;DataTableClearEventArgs;get_TableNamespace;();Argument[this].Property[System.Data.DataTableClearEventArgs.Table].Property[System.Data.DataTable.Namespace];ReturnValue;value;dfc-generated |
 | System.Data;DataTableClearEventHandler;BeginInvoke;(System.Object,System.Data.DataTableClearEventArgs,System.AsyncCallback,System.Object);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
 | System.Data;DataTableCollection;Add;();Argument[this];ReturnValue;taint;df-generated |
 | System.Data;DataTableCollection;Add;(System.Data.DataTable);Argument[0];Argument[this].Element;value;manual |
@@ -9533,15 +10043,22 @@ summary
 | System.Data;DataTableCollection;remove_CollectionChanged;(System.ComponentModel.CollectionChangeEventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Data;DataTableCollection;remove_CollectionChanging;(System.ComponentModel.CollectionChangeEventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Data;DataTableExtensions;AsEnumerable;(System.Data.DataTable);Argument[0];ReturnValue;taint;df-generated |
-| System.Data;DataTableExtensions;CopyToDataTable<T>;(System.Collections.Generic.IEnumerable<T>);Argument[0].Element;ReturnValue;taint;df-generated |
-| System.Data;DataTableExtensions;CopyToDataTable<T>;(System.Collections.Generic.IEnumerable<T>,System.Data.DataTable,System.Data.LoadOption);Argument[0].Element;Argument[1];taint;df-generated |
+| System.Data;DataTableExtensions;CopyToDataTable<T>;(System.Collections.Generic.IEnumerable<T>);Argument[0].Element.Property[System.Data.DataRow.ItemArray];ReturnValue.Property[System.Data.DataTable.Rows].Element;value;dfc-generated |
+| System.Data;DataTableExtensions;CopyToDataTable<T>;(System.Collections.Generic.IEnumerable<T>);Argument[0].Element.Property[System.Data.DataRow.ItemArray];ReturnValue.SyntheticField[System.Data.DataTable._rowCollection].Element;value;dfc-generated |
+| System.Data;DataTableExtensions;CopyToDataTable<T>;(System.Collections.Generic.IEnumerable<T>,System.Data.DataTable,System.Data.LoadOption);Argument[0].Element.Property[System.Data.DataRow.ItemArray];Argument[1].Property[System.Data.DataTable.Rows].Element;value;dfc-generated |
+| System.Data;DataTableExtensions;CopyToDataTable<T>;(System.Collections.Generic.IEnumerable<T>,System.Data.DataTable,System.Data.LoadOption);Argument[0].Element.Property[System.Data.DataRow.ItemArray];Argument[1].SyntheticField[System.Data.DataTable._rowCollection].Element;value;dfc-generated |
+| System.Data;DataTableExtensions;CopyToDataTable<T>;(System.Collections.Generic.IEnumerable<T>,System.Data.DataTable,System.Data.LoadOption,System.Data.FillErrorEventHandler);Argument[0].Element.Property[System.Data.DataRow.ItemArray];Argument[1].Property[System.Data.DataTable.Rows].Element;value;dfc-generated |
+| System.Data;DataTableExtensions;CopyToDataTable<T>;(System.Collections.Generic.IEnumerable<T>,System.Data.DataTable,System.Data.LoadOption,System.Data.FillErrorEventHandler);Argument[0].Element.Property[System.Data.DataRow.ItemArray];Argument[1].Property[System.Data.DataTable.Rows].Element;value;hq-generated |
+| System.Data;DataTableExtensions;CopyToDataTable<T>;(System.Collections.Generic.IEnumerable<T>,System.Data.DataTable,System.Data.LoadOption,System.Data.FillErrorEventHandler);Argument[0].Element.Property[System.Data.DataRow.ItemArray];Argument[1].SyntheticField[System.Data.DataTable._rowCollection].Element;value;dfc-generated |
+| System.Data;DataTableExtensions;CopyToDataTable<T>;(System.Collections.Generic.IEnumerable<T>,System.Data.DataTable,System.Data.LoadOption,System.Data.FillErrorEventHandler);Argument[0].Element.Property[System.Data.DataRow.ItemArray];Argument[1].SyntheticField[System.Data.DataTable._rowCollection].Element;value;hq-generated |
+| System.Data;DataTableExtensions;CopyToDataTable<T>;(System.Collections.Generic.IEnumerable<T>,System.Data.DataTable,System.Data.LoadOption,System.Data.FillErrorEventHandler);Argument[3];Argument[3].Parameter[delegate-self];value;dfc-generated |
 | System.Data;DataTableExtensions;CopyToDataTable<T>;(System.Collections.Generic.IEnumerable<T>,System.Data.DataTable,System.Data.LoadOption,System.Data.FillErrorEventHandler);Argument[3];Argument[3].Parameter[delegate-self];value;hq-generated |
 | System.Data;DataTableNewRowEventHandler;BeginInvoke;(System.Object,System.Data.DataTableNewRowEventArgs,System.AsyncCallback,System.Object);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
 | System.Data;DataTableReader;DataTableReader;(System.Data.DataTable);Argument[0];Argument[this];taint;df-generated |
 | System.Data;DataTableReader;DataTableReader;(System.Data.DataTable[]);Argument[0].Element;Argument[this];taint;df-generated |
 | System.Data;DataTableReader;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.IEnumerator.Current];value;manual |
-| System.Data;DataTableReader;GetProviderSpecificValue;(System.Int32);Argument[this];ReturnValue;taint;df-generated |
-| System.Data;DataTableReader;GetProviderSpecificValues;(System.Object[]);Argument[this];Argument[0].Element;taint;df-generated |
+| System.Data;DataTableReader;GetProviderSpecificValue;(System.Int32);Argument[this];ReturnValue;taint;dfc-generated |
+| System.Data;DataTableReader;GetProviderSpecificValues;(System.Object[]);Argument[this];Argument[0].Element;taint;dfc-generated |
 | System.Data;DataTableReader;GetSchemaTable;();Argument[this];ReturnValue;taint;df-generated |
 | System.Data;DataTableReader;GetString;(System.Int32);Argument[this];ReturnValue;taint;manual |
 | System.Data;DataTableReader;GetValue;(System.Int32);Argument[this];ReturnValue;taint;manual |
@@ -9549,48 +10066,46 @@ summary
 | System.Data;DataTableReader;get_Item;(System.Int32);Argument[this];ReturnValue;taint;manual |
 | System.Data;DataTableReader;get_Item;(System.String);Argument[this];ReturnValue;taint;manual |
 | System.Data;DataView;Add;(System.Object);Argument[0];Argument[this].Element;value;manual |
-| System.Data;DataView;AddNew;();Argument[this];ReturnValue;taint;df-generated |
+| System.Data;DataView;AddNew;();Argument[this];ReturnValue.SyntheticField[System.Data.DataRowView._dataView];value;dfc-generated |
 | System.Data;DataView;ApplySort;(System.ComponentModel.ListSortDescriptionCollection);Argument[0].Element;Argument[this];taint;df-generated |
 | System.Data;DataView;ApplySort;(System.ComponentModel.PropertyDescriptor,System.ComponentModel.ListSortDirection);Argument[0];Argument[this];taint;df-generated |
 | System.Data;DataView;Clear;();Argument[this].WithoutElement;Argument[this];value;manual |
 | System.Data;DataView;CopyTo;(System.Array,System.Int32);Argument[this].Element;Argument[0].Element;value;manual |
-| System.Data;DataView;DataView;(System.Data.DataTable,System.String,System.String,System.Data.DataViewRowState);Argument[0];Argument[this];taint;df-generated |
-| System.Data;DataView;DataView;(System.Data.DataTable,System.String,System.String,System.Data.DataViewRowState);Argument[2];Argument[this];taint;df-generated |
+| System.Data;DataView;DataView;(System.Data.DataTable,System.String,System.String,System.Data.DataViewRowState);Argument[0];Argument[this].SyntheticField[System.Data.DataView._table];value;dfc-generated |
 | System.Data;DataView;Find;(System.ComponentModel.PropertyDescriptor,System.Object);Argument[this].Element;ReturnValue;value;manual |
 | System.Data;DataView;Find;(System.Object);Argument[this].Element;ReturnValue;value;manual |
 | System.Data;DataView;Find;(System.Object[]);Argument[this].Element;ReturnValue;value;manual |
-| System.Data;DataView;FindRows;(System.Object);Argument[this];ReturnValue;taint;df-generated |
-| System.Data;DataView;FindRows;(System.Object[]);Argument[this];ReturnValue;taint;df-generated |
+| System.Data;DataView;FindRows;(System.Object);Argument[this].Element;ReturnValue.Element;value;dfc-generated |
+| System.Data;DataView;FindRows;(System.Object[]);Argument[this].Element;ReturnValue.Element;value;dfc-generated |
 | System.Data;DataView;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.IEnumerator.Current];value;manual |
 | System.Data;DataView;GetItemProperties;(System.ComponentModel.PropertyDescriptor[]);Argument[0].Element;ReturnValue;taint;df-generated |
 | System.Data;DataView;GetItemProperties;(System.ComponentModel.PropertyDescriptor[]);Argument[this];ReturnValue;taint;df-generated |
 | System.Data;DataView;GetListName;(System.ComponentModel.PropertyDescriptor[]);Argument[0].Element;ReturnValue;taint;df-generated |
+| System.Data;DataView;GetListName;(System.ComponentModel.PropertyDescriptor[]);Argument[0].Element;ReturnValue;taint;dfc-generated |
+| System.Data;DataView;GetListName;(System.ComponentModel.PropertyDescriptor[]);Argument[this].SyntheticField[System.Data.DataView._table].Property[System.Data.DataTable.TableName];ReturnValue;value;df-generated |
+| System.Data;DataView;GetListName;(System.ComponentModel.PropertyDescriptor[]);Argument[this].SyntheticField[System.Data.DataView._table].Property[System.Data.DataTable.TableName];ReturnValue;value;dfc-generated |
 | System.Data;DataView;GetListName;(System.ComponentModel.PropertyDescriptor[]);Argument[this];ReturnValue;taint;df-generated |
+| System.Data;DataView;GetListName;(System.ComponentModel.PropertyDescriptor[]);Argument[this];ReturnValue;taint;dfc-generated |
+| System.Data;DataView;IndexListChanged;(System.Object,System.ComponentModel.ListChangedEventArgs);Argument[1];Argument[this];taint;df-generated |
 | System.Data;DataView;Insert;(System.Int32,System.Object);Argument[1];Argument[this].Element;value;manual |
-| System.Data;DataView;Remove;(System.Object);Argument[0];Argument[this];taint;df-generated |
-| System.Data;DataView;Remove;(System.Object);Argument[this];Argument[0];taint;df-generated |
+| System.Data;DataView;OnListChanged;(System.ComponentModel.ListChangedEventArgs);Argument[0];Argument[this];taint;df-generated |
 | System.Data;DataView;ToTable;();Argument[this];ReturnValue;taint;df-generated |
 | System.Data;DataView;ToTable;(System.Boolean,System.String[]);Argument[this];ReturnValue;taint;df-generated |
-| System.Data;DataView;ToTable;(System.String);Argument[0];ReturnValue;taint;df-generated |
-| System.Data;DataView;ToTable;(System.String);Argument[this];ReturnValue;taint;df-generated |
-| System.Data;DataView;ToTable;(System.String,System.Boolean,System.String[]);Argument[0];ReturnValue;taint;df-generated |
-| System.Data;DataView;ToTable;(System.String,System.Boolean,System.String[]);Argument[this];ReturnValue;taint;df-generated |
+| System.Data;DataView;ToTable;(System.String);Argument[0];ReturnValue.Property[System.Data.DataTable.TableName];value;dfc-generated |
+| System.Data;DataView;ToTable;(System.String,System.Boolean,System.String[]);Argument[0];ReturnValue.Property[System.Data.DataTable.TableName];value;dfc-generated |
 | System.Data;DataView;add_Initialized;(System.EventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Data;DataView;add_ListChanged;(System.ComponentModel.ListChangedEventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
-| System.Data;DataView;get_DataViewManager;();Argument[this];ReturnValue;taint;df-generated |
+| System.Data;DataView;get_DataViewManager;();Argument[this].SyntheticField[System.Data.DataView._dataViewManager];ReturnValue;value;dfc-generated |
 | System.Data;DataView;get_Item;(System.Int32);Argument[this].Element;ReturnValue;value;manual |
-| System.Data;DataView;get_SortProperty;();Argument[this];ReturnValue;taint;df-generated |
-| System.Data;DataView;get_SyncRoot;();Argument[this];ReturnValue;taint;df-generated |
-| System.Data;DataView;get_SyncRoot;();Argument[this];ReturnValue;value;df-generated |
+| System.Data;DataView;get_SyncRoot;();Argument[this];ReturnValue;value;dfc-generated |
 | System.Data;DataView;remove_Initialized;(System.EventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Data;DataView;remove_ListChanged;(System.ComponentModel.ListChangedEventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Data;DataView;set_Item;(System.Int32,System.Object);Argument[1];Argument[this].Element;value;manual |
 | System.Data;DataViewManager;Add;(System.Object);Argument[0];Argument[this].Element;value;manual |
-| System.Data;DataViewManager;AddNew;();Argument[this];ReturnValue;taint;df-generated |
 | System.Data;DataViewManager;ApplySort;(System.ComponentModel.PropertyDescriptor,System.ComponentModel.ListSortDirection);Argument[0];Argument[this];taint;df-generated |
 | System.Data;DataViewManager;Clear;();Argument[this].WithoutElement;Argument[this];value;manual |
 | System.Data;DataViewManager;CopyTo;(System.Array,System.Int32);Argument[this].Element;Argument[0].Element;value;manual |
-| System.Data;DataViewManager;CreateDataView;(System.Data.DataTable);Argument[this];ReturnValue;taint;df-generated |
+| System.Data;DataViewManager;CreateDataView;(System.Data.DataTable);Argument[this];ReturnValue.SyntheticField[System.Data.DataView._dataViewManager];value;dfc-generated |
 | System.Data;DataViewManager;Find;(System.ComponentModel.PropertyDescriptor,System.Object);Argument[this].Element;ReturnValue;value;manual |
 | System.Data;DataViewManager;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.IEnumerator.Current];value;manual |
 | System.Data;DataViewManager;GetItemProperties;(System.ComponentModel.PropertyDescriptor[]);Argument[0].Element;ReturnValue;taint;df-generated |
@@ -9598,29 +10113,22 @@ summary
 | System.Data;DataViewManager;GetListName;(System.ComponentModel.PropertyDescriptor[]);Argument[0].Element;ReturnValue;taint;df-generated |
 | System.Data;DataViewManager;GetListName;(System.ComponentModel.PropertyDescriptor[]);Argument[this];ReturnValue;taint;df-generated |
 | System.Data;DataViewManager;Insert;(System.Int32,System.Object);Argument[1];Argument[this].Element;value;manual |
-| System.Data;DataViewManager;Remove;(System.Object);Argument[0];Argument[this];taint;df-generated |
-| System.Data;DataViewManager;Remove;(System.Object);Argument[this];Argument[0];taint;df-generated |
 | System.Data;DataViewManager;add_ListChanged;(System.ComponentModel.ListChangedEventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Data;DataViewManager;get_DataViewSettings;();Argument[this];ReturnValue;taint;df-generated |
 | System.Data;DataViewManager;get_Item;(System.Int32);Argument[this].Element;ReturnValue;value;manual |
-| System.Data;DataViewManager;get_SortProperty;();Argument[this];ReturnValue;taint;df-generated |
-| System.Data;DataViewManager;get_SyncRoot;();Argument[this];ReturnValue;taint;df-generated |
-| System.Data;DataViewManager;get_SyncRoot;();Argument[this];ReturnValue;value;df-generated |
+| System.Data;DataViewManager;get_SyncRoot;();Argument[this];ReturnValue;value;dfc-generated |
 | System.Data;DataViewManager;remove_ListChanged;(System.ComponentModel.ListChangedEventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Data;DataViewManager;set_Item;(System.Int32,System.Object);Argument[1];Argument[this].Element;value;manual |
 | System.Data;DataViewSetting;get_DataViewManager;();Argument[this];ReturnValue;taint;df-generated |
-| System.Data;DataViewSetting;get_Table;();Argument[this];ReturnValue;taint;df-generated |
+| System.Data;DataViewSetting;get_Table;();Argument[this].SyntheticField[System.Data.DataViewSetting._table];ReturnValue;value;dfc-generated |
 | System.Data;DataViewSettingCollection;CopyTo;(System.Array,System.Int32);Argument[this].Element;Argument[0].Element;value;manual |
 | System.Data;DataViewSettingCollection;CopyTo;(System.Data.DataViewSetting[],System.Int32);Argument[this].Element;Argument[0].Element;value;manual |
 | System.Data;DataViewSettingCollection;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.IEnumerator.Current];value;manual |
-| System.Data;DataViewSettingCollection;get_Item;(System.Data.DataTable);Argument[0];ReturnValue;taint;df-generated |
-| System.Data;DataViewSettingCollection;get_Item;(System.Data.DataTable);Argument[this];ReturnValue;taint;df-generated |
+| System.Data;DataViewSettingCollection;get_Item;(System.Data.DataTable);Argument[0];ReturnValue.SyntheticField[System.Data.DataViewSetting._table];value;dfc-generated |
 | System.Data;DataViewSettingCollection;get_Item;(System.Int32);Argument[this];ReturnValue;taint;df-generated |
 | System.Data;DataViewSettingCollection;get_Item;(System.String);Argument[this];ReturnValue;taint;df-generated |
-| System.Data;DataViewSettingCollection;get_SyncRoot;();Argument[this];ReturnValue;taint;df-generated |
-| System.Data;DataViewSettingCollection;get_SyncRoot;();Argument[this];ReturnValue;value;df-generated |
-| System.Data;DataViewSettingCollection;set_Item;(System.Data.DataTable,System.Data.DataViewSetting);Argument[0];Argument[1];taint;df-generated |
-| System.Data;DataViewSettingCollection;set_Item;(System.Data.DataTable,System.Data.DataViewSetting);Argument[this];Argument[1];taint;df-generated |
+| System.Data;DataViewSettingCollection;get_SyncRoot;();Argument[this];ReturnValue;value;dfc-generated |
+| System.Data;DataViewSettingCollection;set_Item;(System.Data.DataTable,System.Data.DataViewSetting);Argument[0];Argument[1].SyntheticField[System.Data.DataViewSetting._table];value;dfc-generated |
 | System.Data;DataViewSettingCollection;set_Item;(System.Int32,System.Data.DataViewSetting);Argument[this];Argument[1];taint;df-generated |
 | System.Data;EnumerableRowCollection;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.IEnumerator.Current];value;manual |
 | System.Data;EnumerableRowCollection<TRow>;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.Generic.IEnumerator`1.Current];value;manual |
@@ -9656,10 +10164,10 @@ summary
 | System.Data;EnumerableRowCollectionExtensions;Where<TRow>;(System.Data.EnumerableRowCollection<TRow>,System.Func<TRow,System.Boolean>);Argument[0].Element;Argument[1].Parameter[0];value;manual |
 | System.Data;EnumerableRowCollectionExtensions;Where<TRow>;(System.Data.EnumerableRowCollection<TRow>,System.Func<TRow,System.Boolean>);Argument[0].Element;ReturnValue.Element;value;manual |
 | System.Data;EnumerableRowCollectionExtensions;Where<TRow>;(System.Data.EnumerableRowCollection<TRow>,System.Func<TRow,System.Boolean>);Argument[1];Argument[1].Parameter[delegate-self];value;manual |
-| System.Data;FillErrorEventArgs;FillErrorEventArgs;(System.Data.DataTable,System.Object[]);Argument[0];Argument[this];taint;df-generated |
-| System.Data;FillErrorEventArgs;FillErrorEventArgs;(System.Data.DataTable,System.Object[]);Argument[1].Element;Argument[this];taint;df-generated |
-| System.Data;FillErrorEventArgs;get_DataTable;();Argument[this];ReturnValue;taint;df-generated |
-| System.Data;FillErrorEventArgs;get_Values;();Argument[this];ReturnValue;taint;df-generated |
+| System.Data;FillErrorEventArgs;FillErrorEventArgs;(System.Data.DataTable,System.Object[]);Argument[0];Argument[this].SyntheticField[System.Data.FillErrorEventArgs._dataTable];value;dfc-generated |
+| System.Data;FillErrorEventArgs;FillErrorEventArgs;(System.Data.DataTable,System.Object[]);Argument[1];Argument[this].SyntheticField[System.Data.FillErrorEventArgs._values];value;dfc-generated |
+| System.Data;FillErrorEventArgs;get_DataTable;();Argument[this].SyntheticField[System.Data.FillErrorEventArgs._dataTable];ReturnValue;value;dfc-generated |
+| System.Data;FillErrorEventArgs;get_Values;();Argument[this].SyntheticField[System.Data.FillErrorEventArgs._values].Element;ReturnValue.Element;value;dfc-generated |
 | System.Data;FillErrorEventHandler;BeginInvoke;(System.Object,System.Data.FillErrorEventArgs,System.AsyncCallback,System.Object);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
 | System.Data;ForeignKeyConstraint;ForeignKeyConstraint;(System.String,System.Data.DataColumn,System.Data.DataColumn);Argument[0];Argument[this];taint;df-generated |
 | System.Data;ForeignKeyConstraint;ForeignKeyConstraint;(System.String,System.Data.DataColumn[],System.Data.DataColumn[]);Argument[0];Argument[this];taint;df-generated |
@@ -9676,14 +10184,11 @@ summary
 | System.Data;ForeignKeyConstraint;get_RelatedColumns;();Argument[this];ReturnValue;taint;df-generated |
 | System.Data;ForeignKeyConstraint;get_RelatedTable;();Argument[this];ReturnValue;taint;df-generated |
 | System.Data;ForeignKeyConstraint;get_Table;();Argument[this];ReturnValue;taint;df-generated |
-| System.Data;IColumnMappingCollection;Add;(System.String,System.String);Argument[0];ReturnValue;taint;df-generated |
-| System.Data;IColumnMappingCollection;Add;(System.String,System.String);Argument[1];ReturnValue;taint;df-generated |
 | System.Data;IColumnMappingCollection;Add;(System.String,System.String);Argument[this];ReturnValue;taint;df-generated |
 | System.Data;IColumnMappingCollection;GetByDataSetColumn;(System.String);Argument[this];ReturnValue;taint;df-generated |
 | System.Data;IColumnMappingCollection;get_Item;(System.String);Argument[this].Element;ReturnValue;value;manual |
 | System.Data;IColumnMappingCollection;set_Item;(System.String,System.Object);Argument[1];Argument[this].Element;value;manual |
 | System.Data;IDataAdapter;GetFillParameters;();Argument[this];ReturnValue;taint;df-generated |
-| System.Data;IDataAdapter;get_TableMappings;();Argument[this];ReturnValue;taint;df-generated |
 | System.Data;IDataParameterCollection;get_Item;(System.String);Argument[this].Element;ReturnValue;value;manual |
 | System.Data;IDataParameterCollection;set_Item;(System.String,System.Object);Argument[1];Argument[this].Element;value;manual |
 | System.Data;IDataReader;GetSchemaTable;();Argument[this];ReturnValue;taint;df-generated |
@@ -9694,14 +10199,6 @@ summary
 | System.Data;IDataRecord;get_Item;(System.String);Argument[this];ReturnValue;taint;manual |
 | System.Data;IDbCommand;ExecuteReader;();Argument[this];ReturnValue;taint;manual |
 | System.Data;IDbCommand;ExecuteScalar;();Argument[this];ReturnValue;taint;df-generated |
-| System.Data;IDbCommand;get_Parameters;();Argument[this];ReturnValue;taint;df-generated |
-| System.Data;IDbConnection;BeginTransaction;();Argument[this];ReturnValue;taint;df-generated |
-| System.Data;IDbConnection;BeginTransaction;(System.Data.IsolationLevel);Argument[this];ReturnValue;taint;df-generated |
-| System.Data;IDbConnection;CreateCommand;();Argument[this];ReturnValue;taint;df-generated |
-| System.Data;IDbTransaction;get_Connection;();Argument[this];ReturnValue;taint;df-generated |
-| System.Data;ITableMapping;get_ColumnMappings;();Argument[this];ReturnValue;taint;df-generated |
-| System.Data;ITableMappingCollection;Add;(System.String,System.String);Argument[0];ReturnValue;taint;df-generated |
-| System.Data;ITableMappingCollection;Add;(System.String,System.String);Argument[1];ReturnValue;taint;df-generated |
 | System.Data;ITableMappingCollection;Add;(System.String,System.String);Argument[this];ReturnValue;taint;df-generated |
 | System.Data;ITableMappingCollection;GetByDataSetTable;(System.String);Argument[this];ReturnValue;taint;df-generated |
 | System.Data;ITableMappingCollection;get_Item;(System.String);Argument[this].Element;ReturnValue;value;manual |
@@ -9709,8 +10206,7 @@ summary
 | System.Data;InternalDataCollectionBase;CopyTo;(System.Array,System.Int32);Argument[this].Element;Argument[0].Element;value;manual |
 | System.Data;InternalDataCollectionBase;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.IEnumerator.Current];value;manual |
 | System.Data;InternalDataCollectionBase;get_List;();Argument[this];ReturnValue;taint;df-generated |
-| System.Data;InternalDataCollectionBase;get_SyncRoot;();Argument[this];ReturnValue;taint;df-generated |
-| System.Data;InternalDataCollectionBase;get_SyncRoot;();Argument[this];ReturnValue;value;df-generated |
+| System.Data;InternalDataCollectionBase;get_SyncRoot;();Argument[this];ReturnValue;value;dfc-generated |
 | System.Data;MergeFailedEventHandler;BeginInvoke;(System.Object,System.Data.MergeFailedEventArgs,System.AsyncCallback,System.Object);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
 | System.Data;PropertyCollection;Clone;();Argument[this].Element;ReturnValue.Element;value;manual |
 | System.Data;StateChangeEventHandler;BeginInvoke;(System.Object,System.Data.StateChangeEventArgs,System.AsyncCallback,System.Object);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
@@ -9747,35 +10243,39 @@ summary
 | System.Data;UniqueConstraint;get_Columns;();Argument[this];ReturnValue;taint;df-generated |
 | System.Data;UniqueConstraint;get_Table;();Argument[this];ReturnValue;taint;df-generated |
 | System.Diagnostics.Contracts;Contract;Exists;(System.Int32,System.Int32,System.Predicate<System.Int32>);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
+| System.Diagnostics.Contracts;Contract;Exists<T>;(System.Collections.Generic.IEnumerable<T>,System.Predicate<T>);Argument[0].Element;Argument[1].Parameter[0];value;dfc-generated |
+| System.Diagnostics.Contracts;Contract;Exists<T>;(System.Collections.Generic.IEnumerable<T>,System.Predicate<T>);Argument[0].Element;Argument[1].Parameter[0];value;hq-generated |
+| System.Diagnostics.Contracts;Contract;Exists<T>;(System.Collections.Generic.IEnumerable<T>,System.Predicate<T>);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | System.Diagnostics.Contracts;Contract;Exists<T>;(System.Collections.Generic.IEnumerable<T>,System.Predicate<T>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
 | System.Diagnostics.Contracts;Contract;ForAll;(System.Int32,System.Int32,System.Predicate<System.Int32>);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
+| System.Diagnostics.Contracts;Contract;ForAll<T>;(System.Collections.Generic.IEnumerable<T>,System.Predicate<T>);Argument[0].Element;Argument[1].Parameter[0];value;dfc-generated |
+| System.Diagnostics.Contracts;Contract;ForAll<T>;(System.Collections.Generic.IEnumerable<T>,System.Predicate<T>);Argument[0].Element;Argument[1].Parameter[0];value;hq-generated |
+| System.Diagnostics.Contracts;Contract;ForAll<T>;(System.Collections.Generic.IEnumerable<T>,System.Predicate<T>);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | System.Diagnostics.Contracts;Contract;ForAll<T>;(System.Collections.Generic.IEnumerable<T>,System.Predicate<T>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
 | System.Diagnostics.Contracts;Contract;add_ContractFailed;(System.EventHandler<System.Diagnostics.Contracts.ContractFailedEventArgs>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Diagnostics.Contracts;Contract;remove_ContractFailed;(System.EventHandler<System.Diagnostics.Contracts.ContractFailedEventArgs>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
-| System.Diagnostics.Contracts;ContractFailedEventArgs;ContractFailedEventArgs;(System.Diagnostics.Contracts.ContractFailureKind,System.String,System.String,System.Exception);Argument[1];Argument[this];taint;df-generated |
-| System.Diagnostics.Contracts;ContractFailedEventArgs;ContractFailedEventArgs;(System.Diagnostics.Contracts.ContractFailureKind,System.String,System.String,System.Exception);Argument[2];Argument[this];taint;df-generated |
-| System.Diagnostics.Contracts;ContractFailedEventArgs;ContractFailedEventArgs;(System.Diagnostics.Contracts.ContractFailureKind,System.String,System.String,System.Exception);Argument[3];Argument[this];taint;df-generated |
-| System.Diagnostics.Contracts;ContractFailedEventArgs;get_Condition;();Argument[this];ReturnValue;taint;df-generated |
-| System.Diagnostics.Contracts;ContractFailedEventArgs;get_Message;();Argument[this];ReturnValue;taint;df-generated |
-| System.Diagnostics.Contracts;ContractFailedEventArgs;get_OriginalException;();Argument[this];ReturnValue;taint;df-generated |
-| System.Diagnostics.Contracts;ContractOptionAttribute;ContractOptionAttribute;(System.String,System.String,System.Boolean);Argument[0];Argument[this];taint;df-generated |
-| System.Diagnostics.Contracts;ContractOptionAttribute;ContractOptionAttribute;(System.String,System.String,System.Boolean);Argument[1];Argument[this];taint;df-generated |
-| System.Diagnostics.Contracts;ContractOptionAttribute;ContractOptionAttribute;(System.String,System.String,System.String);Argument[0];Argument[this];taint;df-generated |
-| System.Diagnostics.Contracts;ContractOptionAttribute;ContractOptionAttribute;(System.String,System.String,System.String);Argument[1];Argument[this];taint;df-generated |
-| System.Diagnostics.Contracts;ContractOptionAttribute;ContractOptionAttribute;(System.String,System.String,System.String);Argument[2];Argument[this];taint;df-generated |
-| System.Diagnostics.Contracts;ContractOptionAttribute;get_Category;();Argument[this];ReturnValue;taint;df-generated |
-| System.Diagnostics.Contracts;ContractOptionAttribute;get_Setting;();Argument[this];ReturnValue;taint;df-generated |
-| System.Diagnostics.Contracts;ContractOptionAttribute;get_Value;();Argument[this];ReturnValue;taint;df-generated |
-| System.Diagnostics.Contracts;ContractPublicPropertyNameAttribute;ContractPublicPropertyNameAttribute;(System.String);Argument[0];Argument[this];taint;df-generated |
-| System.Diagnostics.Contracts;ContractPublicPropertyNameAttribute;get_Name;();Argument[this];ReturnValue;taint;df-generated |
+| System.Diagnostics.Contracts;ContractFailedEventArgs;ContractFailedEventArgs;(System.Diagnostics.Contracts.ContractFailureKind,System.String,System.String,System.Exception);Argument[1];Argument[this].SyntheticField[System.Diagnostics.Contracts.ContractFailedEventArgs._message];value;dfc-generated |
+| System.Diagnostics.Contracts;ContractFailedEventArgs;ContractFailedEventArgs;(System.Diagnostics.Contracts.ContractFailureKind,System.String,System.String,System.Exception);Argument[2];Argument[this].SyntheticField[System.Diagnostics.Contracts.ContractFailedEventArgs._condition];value;dfc-generated |
+| System.Diagnostics.Contracts;ContractFailedEventArgs;ContractFailedEventArgs;(System.Diagnostics.Contracts.ContractFailureKind,System.String,System.String,System.Exception);Argument[3];Argument[this].SyntheticField[System.Diagnostics.Contracts.ContractFailedEventArgs._originalException];value;dfc-generated |
+| System.Diagnostics.Contracts;ContractFailedEventArgs;get_Condition;();Argument[this].SyntheticField[System.Diagnostics.Contracts.ContractFailedEventArgs._condition];ReturnValue;value;dfc-generated |
+| System.Diagnostics.Contracts;ContractFailedEventArgs;get_Message;();Argument[this].SyntheticField[System.Diagnostics.Contracts.ContractFailedEventArgs._message];ReturnValue;value;dfc-generated |
+| System.Diagnostics.Contracts;ContractFailedEventArgs;get_OriginalException;();Argument[this].SyntheticField[System.Diagnostics.Contracts.ContractFailedEventArgs._originalException];ReturnValue;value;dfc-generated |
+| System.Diagnostics.Contracts;ContractOptionAttribute;ContractOptionAttribute;(System.String,System.String,System.Boolean);Argument[0];Argument[this].SyntheticField[System.Diagnostics.Contracts.ContractOptionAttribute._category];value;dfc-generated |
+| System.Diagnostics.Contracts;ContractOptionAttribute;ContractOptionAttribute;(System.String,System.String,System.Boolean);Argument[1];Argument[this].SyntheticField[System.Diagnostics.Contracts.ContractOptionAttribute._setting];value;dfc-generated |
+| System.Diagnostics.Contracts;ContractOptionAttribute;ContractOptionAttribute;(System.String,System.String,System.String);Argument[0];Argument[this].SyntheticField[System.Diagnostics.Contracts.ContractOptionAttribute._category];value;dfc-generated |
+| System.Diagnostics.Contracts;ContractOptionAttribute;ContractOptionAttribute;(System.String,System.String,System.String);Argument[1];Argument[this].SyntheticField[System.Diagnostics.Contracts.ContractOptionAttribute._setting];value;dfc-generated |
+| System.Diagnostics.Contracts;ContractOptionAttribute;ContractOptionAttribute;(System.String,System.String,System.String);Argument[2];Argument[this].SyntheticField[System.Diagnostics.Contracts.ContractOptionAttribute._value];value;dfc-generated |
+| System.Diagnostics.Contracts;ContractOptionAttribute;get_Category;();Argument[this].SyntheticField[System.Diagnostics.Contracts.ContractOptionAttribute._category];ReturnValue;value;dfc-generated |
+| System.Diagnostics.Contracts;ContractOptionAttribute;get_Setting;();Argument[this].SyntheticField[System.Diagnostics.Contracts.ContractOptionAttribute._setting];ReturnValue;value;dfc-generated |
+| System.Diagnostics.Contracts;ContractOptionAttribute;get_Value;();Argument[this].SyntheticField[System.Diagnostics.Contracts.ContractOptionAttribute._value];ReturnValue;value;dfc-generated |
+| System.Diagnostics.Contracts;ContractPublicPropertyNameAttribute;ContractPublicPropertyNameAttribute;(System.String);Argument[0];Argument[this].SyntheticField[System.Diagnostics.Contracts.ContractPublicPropertyNameAttribute._publicName];value;dfc-generated |
+| System.Diagnostics.Contracts;ContractPublicPropertyNameAttribute;get_Name;();Argument[this].SyntheticField[System.Diagnostics.Contracts.ContractPublicPropertyNameAttribute._publicName];ReturnValue;value;dfc-generated |
 | System.Diagnostics.Eventing.Reader;EventLogException;GetObjectData;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);Argument[this];Argument[0];taint;df-generated |
-| System.Diagnostics.Eventing.Reader;EventLogException;get_Message;();Argument[this];ReturnValue;taint;df-generated |
+| System.Diagnostics.Eventing.Reader;EventLogException;get_Message;();Argument[this].SyntheticField[System.Exception._message];ReturnValue;value;dfc-generated |
 | System.Diagnostics.Eventing.Reader;EventLogWatcher;add_EventRecordWritten;(System.EventHandler<System.Diagnostics.Eventing.Reader.EventRecordWrittenEventArgs>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Diagnostics.Eventing.Reader;EventLogWatcher;remove_EventRecordWritten;(System.EventHandler<System.Diagnostics.Eventing.Reader.EventRecordWrittenEventArgs>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
-| System.Diagnostics.Metrics;Instrument;Instrument;(System.Diagnostics.Metrics.Meter,System.String,System.String,System.String,System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<System.String,System.Object>>);Argument[4].Element;Argument[this];taint;df-generated |
 | System.Diagnostics.Metrics;Measurement<T>;Measurement;(T,System.Collections.Generic.KeyValuePair<System.String,System.Object>[]);Argument[1].Element;Argument[this];taint;df-generated |
 | System.Diagnostics.Metrics;Measurement<T>;Measurement;(T,System.ReadOnlySpan<System.Collections.Generic.KeyValuePair<System.String,System.Object>>);Argument[1];Argument[this];taint;df-generated |
-| System.Diagnostics.Metrics;Measurement<T>;get_Tags;();Argument[this];ReturnValue;taint;df-generated |
 | System.Diagnostics.Metrics;MeasurementCallback<T>;BeginInvoke;(System.Diagnostics.Metrics.Instrument,T,System.ReadOnlySpan<System.Collections.Generic.KeyValuePair<System.String,System.Object>>,System.Object,System.AsyncCallback,System.Object);Argument[4];Argument[4].Parameter[delegate-self];value;hq-generated |
 | System.Diagnostics.Metrics;Meter;CreateObservableCounter<T>;(System.String,System.Func<System.Collections.Generic.IEnumerable<System.Diagnostics.Metrics.Measurement<T>>>,System.String,System.String);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
 | System.Diagnostics.Metrics;Meter;CreateObservableCounter<T>;(System.String,System.Func<System.Collections.Generic.IEnumerable<System.Diagnostics.Metrics.Measurement<T>>>,System.String,System.String,System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<System.String,System.Object>>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
@@ -9795,66 +10295,84 @@ summary
 | System.Diagnostics.Metrics;Meter;CreateObservableUpDownCounter<T>;(System.String,System.Func<System.Diagnostics.Metrics.Measurement<T>>,System.String,System.String,System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<System.String,System.Object>>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
 | System.Diagnostics.Metrics;Meter;CreateObservableUpDownCounter<T>;(System.String,System.Func<T>,System.String,System.String);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
 | System.Diagnostics.Metrics;Meter;CreateObservableUpDownCounter<T>;(System.String,System.Func<T>,System.String,System.String,System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<System.String,System.Object>>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
+| System.Diagnostics.Metrics;MeterListener;DisableMeasurementEvents;(System.Diagnostics.Metrics.Instrument);Argument[0];Argument[this];taint;df-generated |
+| System.Diagnostics.Metrics;MeterListener;EnableMeasurementEvents;(System.Diagnostics.Metrics.Instrument,System.Object);Argument[0];Argument[this];taint;df-generated |
+| System.Diagnostics.Metrics;MeterListener;EnableMeasurementEvents;(System.Diagnostics.Metrics.Instrument,System.Object);Argument[1];Argument[this];taint;df-generated |
 | System.Diagnostics.Metrics;MeterListener;SetMeasurementEventCallback<T>;(System.Diagnostics.Metrics.MeasurementCallback<T>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Diagnostics.Metrics;MeterListener;set_InstrumentPublished;(System.Action<System.Diagnostics.Metrics.Instrument,System.Diagnostics.Metrics.MeterListener>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Diagnostics.Metrics;MeterListener;set_MeasurementsCompleted;(System.Action<System.Diagnostics.Metrics.Instrument,System.Object>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Diagnostics.Metrics;MeterOptions;MeterOptions;(System.String);Argument[0];Argument[this];taint;df-generated |
-| System.Diagnostics.Tracing;EventCounter;ToString;();Argument[this];ReturnValue;taint;df-generated |
+| System.Diagnostics.Metrics;ObservableCounter<T>;Observe;();Argument[this];ReturnValue;taint;df-generated |
+| System.Diagnostics.Metrics;ObservableGauge<T>;Observe;();Argument[this];ReturnValue;taint;df-generated |
+| System.Diagnostics.Metrics;ObservableUpDownCounter<T>;Observe;();Argument[this];ReturnValue;taint;df-generated |
+| System.Diagnostics.Tracing;EventCounter;ToString;();Argument[this].Property[System.Diagnostics.Tracing.DiagnosticCounter.Name];ReturnValue;taint;dfc-generated |
 | System.Diagnostics.Tracing;EventListener;DisableEvents;(System.Diagnostics.Tracing.EventSource);Argument[this];Argument[0];taint;df-generated |
 | System.Diagnostics.Tracing;EventListener;EnableEvents;(System.Diagnostics.Tracing.EventSource,System.Diagnostics.Tracing.EventLevel);Argument[this];Argument[0];taint;df-generated |
 | System.Diagnostics.Tracing;EventListener;EnableEvents;(System.Diagnostics.Tracing.EventSource,System.Diagnostics.Tracing.EventLevel,System.Diagnostics.Tracing.EventKeywords);Argument[this];Argument[0];taint;df-generated |
 | System.Diagnostics.Tracing;EventListener;EnableEvents;(System.Diagnostics.Tracing.EventSource,System.Diagnostics.Tracing.EventLevel,System.Diagnostics.Tracing.EventKeywords,System.Collections.Generic.IDictionary<System.String,System.String>);Argument[this];Argument[0];taint;df-generated |
+| System.Diagnostics.Tracing;EventListener;add_EventSourceCreated;(System.EventHandler<System.Diagnostics.Tracing.EventSourceCreatedEventArgs>);Argument[0];Argument[0].Parameter[delegate-self];value;dfc-generated |
 | System.Diagnostics.Tracing;EventListener;add_EventSourceCreated;(System.EventHandler<System.Diagnostics.Tracing.EventSourceCreatedEventArgs>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
+| System.Diagnostics.Tracing;EventListener;add_EventSourceCreated;(System.EventHandler<System.Diagnostics.Tracing.EventSourceCreatedEventArgs>);Argument[this];Argument[0].Parameter[0];value;dfc-generated |
+| System.Diagnostics.Tracing;EventListener;add_EventSourceCreated;(System.EventHandler<System.Diagnostics.Tracing.EventSourceCreatedEventArgs>);Argument[this];Argument[0].Parameter[0];value;hq-generated |
 | System.Diagnostics.Tracing;EventListener;add_EventWritten;(System.EventHandler<System.Diagnostics.Tracing.EventWrittenEventArgs>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Diagnostics.Tracing;EventListener;remove_EventSourceCreated;(System.EventHandler<System.Diagnostics.Tracing.EventSourceCreatedEventArgs>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Diagnostics.Tracing;EventListener;remove_EventWritten;(System.EventHandler<System.Diagnostics.Tracing.EventWrittenEventArgs>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
-| System.Diagnostics.Tracing;EventSource;EventSource;(System.Diagnostics.Tracing.EventSourceSettings,System.String[]);Argument[1].Element;Argument[this];taint;df-generated |
+| System.Diagnostics.Tracing;EventSource;EventSource;(System.Diagnostics.Tracing.EventSourceSettings,System.String[]);Argument[1];Argument[this].SyntheticField[System.Diagnostics.Tracing.EventSource.m_traits];value;dfc-generated |
 | System.Diagnostics.Tracing;EventSource;GenerateManifest;(System.Type,System.String);Argument[1];ReturnValue;taint;df-generated |
 | System.Diagnostics.Tracing;EventSource;GenerateManifest;(System.Type,System.String,System.Diagnostics.Tracing.EventManifestOptions);Argument[1];ReturnValue;taint;df-generated |
-| System.Diagnostics.Tracing;EventSource;GetTrait;(System.String);Argument[this];ReturnValue;taint;df-generated |
+| System.Diagnostics.Tracing;EventSource;GetTrait;(System.String);Argument[this].SyntheticField[System.Diagnostics.Tracing.EventSource.m_traits].Element;ReturnValue;value;dfc-generated |
 | System.Diagnostics.Tracing;EventSource;ToString;();Argument[this];ReturnValue;taint;df-generated |
+| System.Diagnostics.Tracing;EventSource;Write<T>;(System.String,System.Diagnostics.Tracing.EventSourceOptions,System.Guid,System.Guid,T);Argument[1];ReturnValue;value;dfc-generated |
+| System.Diagnostics.Tracing;EventSource;Write<T>;(System.String,System.Diagnostics.Tracing.EventSourceOptions,System.Guid,System.Guid,T);Argument[2];ReturnValue;value;dfc-generated |
+| System.Diagnostics.Tracing;EventSource;Write<T>;(System.String,System.Diagnostics.Tracing.EventSourceOptions,System.Guid,System.Guid,T);Argument[3];ReturnValue;value;dfc-generated |
+| System.Diagnostics.Tracing;EventSource;Write<T>;(System.String,System.Diagnostics.Tracing.EventSourceOptions,System.Guid,System.Guid,T);Argument[4];ReturnValue;value;dfc-generated |
+| System.Diagnostics.Tracing;EventSource;Write<T>;(System.String,System.Diagnostics.Tracing.EventSourceOptions,T);Argument[1];ReturnValue;value;dfc-generated |
+| System.Diagnostics.Tracing;EventSource;Write<T>;(System.String,System.Diagnostics.Tracing.EventSourceOptions,T);Argument[2];ReturnValue;value;dfc-generated |
+| System.Diagnostics.Tracing;EventSource;add_EventCommandExecuted;(System.EventHandler<System.Diagnostics.Tracing.EventCommandEventArgs>);Argument[0];Argument[0].Parameter[delegate-self];value;dfc-generated |
 | System.Diagnostics.Tracing;EventSource;add_EventCommandExecuted;(System.EventHandler<System.Diagnostics.Tracing.EventCommandEventArgs>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
+| System.Diagnostics.Tracing;EventSource;add_EventCommandExecuted;(System.EventHandler<System.Diagnostics.Tracing.EventCommandEventArgs>);Argument[this];Argument[0].Parameter[0];value;dfc-generated |
+| System.Diagnostics.Tracing;EventSource;add_EventCommandExecuted;(System.EventHandler<System.Diagnostics.Tracing.EventCommandEventArgs>);Argument[this];Argument[0].Parameter[0];value;hq-generated |
 | System.Diagnostics.Tracing;EventSource;get_ConstructionException;();Argument[this];ReturnValue;taint;df-generated |
 | System.Diagnostics.Tracing;EventSource;get_Guid;();Argument[this];ReturnValue;taint;df-generated |
 | System.Diagnostics.Tracing;EventSource;get_Name;();Argument[this];ReturnValue;taint;df-generated |
 | System.Diagnostics.Tracing;EventSource;remove_EventCommandExecuted;(System.EventHandler<System.Diagnostics.Tracing.EventCommandEventArgs>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Diagnostics.Tracing;EventWrittenEventArgs;get_ActivityId;();Argument[this];ReturnValue;taint;df-generated |
-| System.Diagnostics.Tracing;IncrementingEventCounter;ToString;();Argument[this];ReturnValue;taint;df-generated |
+| System.Diagnostics.Tracing;IncrementingEventCounter;ToString;();Argument[this].Property[System.Diagnostics.Tracing.DiagnosticCounter.Name];ReturnValue;taint;dfc-generated |
 | System.Diagnostics.Tracing;IncrementingPollingCounter;IncrementingPollingCounter;(System.String,System.Diagnostics.Tracing.EventSource,System.Func<System.Double>);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
-| System.Diagnostics.Tracing;IncrementingPollingCounter;ToString;();Argument[this];ReturnValue;taint;df-generated |
+| System.Diagnostics.Tracing;IncrementingPollingCounter;ToString;();Argument[this].Property[System.Diagnostics.Tracing.DiagnosticCounter.Name];ReturnValue;taint;dfc-generated |
 | System.Diagnostics.Tracing;PollingCounter;PollingCounter;(System.String,System.Diagnostics.Tracing.EventSource,System.Func<System.Double>);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
-| System.Diagnostics.Tracing;PollingCounter;ToString;();Argument[this];ReturnValue;taint;df-generated |
-| System.Diagnostics;Activity+Enumerator<T>;GetEnumerator;();Argument[this];ReturnValue;value;df-generated |
-| System.Diagnostics;Activity;AddBaggage;(System.String,System.String);Argument[this];ReturnValue;value;df-generated |
-| System.Diagnostics;Activity;AddEvent;(System.Diagnostics.ActivityEvent);Argument[this];ReturnValue;value;df-generated |
-| System.Diagnostics;Activity;AddTag;(System.String,System.Object);Argument[this];ReturnValue;value;df-generated |
-| System.Diagnostics;Activity;AddTag;(System.String,System.String);Argument[this];ReturnValue;taint;df-generated |
+| System.Diagnostics.Tracing;PollingCounter;ToString;();Argument[this].Property[System.Diagnostics.Tracing.DiagnosticCounter.Name];ReturnValue;taint;dfc-generated |
+| System.Diagnostics;Activity+Enumerator<T>;GetEnumerator;();Argument[this];ReturnValue;value;dfc-generated |
+| System.Diagnostics;Activity;AddBaggage;(System.String,System.String);Argument[this];ReturnValue;value;dfc-generated |
+| System.Diagnostics;Activity;AddEvent;(System.Diagnostics.ActivityEvent);Argument[this];ReturnValue;value;dfc-generated |
+| System.Diagnostics;Activity;AddTag;(System.String,System.Object);Argument[this];ReturnValue;value;dfc-generated |
+| System.Diagnostics;Activity;AddTag;(System.String,System.String);Argument[this];ReturnValue;value;dfc-generated |
 | System.Diagnostics;Activity;EnumerateEvents;();Argument[this];ReturnValue;taint;df-generated |
 | System.Diagnostics;Activity;EnumerateLinks;();Argument[this];ReturnValue;taint;df-generated |
 | System.Diagnostics;Activity;EnumerateTagObjects;();Argument[this];ReturnValue;taint;df-generated |
 | System.Diagnostics;Activity;GetBaggageItem;(System.String);Argument[this];ReturnValue;taint;df-generated |
-| System.Diagnostics;Activity;SetBaggage;(System.String,System.String);Argument[this];ReturnValue;value;df-generated |
-| System.Diagnostics;Activity;SetEndTime;(System.DateTime);Argument[this];ReturnValue;value;df-generated |
-| System.Diagnostics;Activity;SetIdFormat;(System.Diagnostics.ActivityIdFormat);Argument[this];ReturnValue;value;df-generated |
-| System.Diagnostics;Activity;SetParentId;(System.Diagnostics.ActivityTraceId,System.Diagnostics.ActivitySpanId,System.Diagnostics.ActivityTraceFlags);Argument[0];Argument[this];taint;df-generated |
-| System.Diagnostics;Activity;SetParentId;(System.Diagnostics.ActivityTraceId,System.Diagnostics.ActivitySpanId,System.Diagnostics.ActivityTraceFlags);Argument[1];Argument[this];taint;df-generated |
-| System.Diagnostics;Activity;SetParentId;(System.Diagnostics.ActivityTraceId,System.Diagnostics.ActivitySpanId,System.Diagnostics.ActivityTraceFlags);Argument[this];ReturnValue;value;df-generated |
-| System.Diagnostics;Activity;SetParentId;(System.String);Argument[0];Argument[this];taint;df-generated |
-| System.Diagnostics;Activity;SetParentId;(System.String);Argument[this];ReturnValue;value;df-generated |
-| System.Diagnostics;Activity;SetStartTime;(System.DateTime);Argument[this];ReturnValue;value;df-generated |
-| System.Diagnostics;Activity;SetStatus;(System.Diagnostics.ActivityStatusCode,System.String);Argument[1];Argument[this];taint;df-generated |
-| System.Diagnostics;Activity;SetStatus;(System.Diagnostics.ActivityStatusCode,System.String);Argument[this];ReturnValue;value;df-generated |
-| System.Diagnostics;Activity;SetTag;(System.String,System.Object);Argument[this];ReturnValue;value;df-generated |
+| System.Diagnostics;Activity;SetBaggage;(System.String,System.String);Argument[this];ReturnValue;value;dfc-generated |
+| System.Diagnostics;Activity;SetEndTime;(System.DateTime);Argument[this];ReturnValue;value;dfc-generated |
+| System.Diagnostics;Activity;SetIdFormat;(System.Diagnostics.ActivityIdFormat);Argument[this];ReturnValue;value;dfc-generated |
+| System.Diagnostics;Activity;SetParentId;(System.Diagnostics.ActivityTraceId,System.Diagnostics.ActivitySpanId,System.Diagnostics.ActivityTraceFlags);Argument[this];ReturnValue;value;dfc-generated |
+| System.Diagnostics;Activity;SetParentId;(System.String);Argument[0];Argument[this].SyntheticField[System.Diagnostics.Activity._parentId];value;dfc-generated |
+| System.Diagnostics;Activity;SetParentId;(System.String);Argument[0];ReturnValue.SyntheticField[System.Diagnostics.Activity._parentId];value;dfc-generated |
+| System.Diagnostics;Activity;SetParentId;(System.String);Argument[this];ReturnValue;value;dfc-generated |
+| System.Diagnostics;Activity;SetStartTime;(System.DateTime);Argument[this];ReturnValue;value;dfc-generated |
+| System.Diagnostics;Activity;SetStatus;(System.Diagnostics.ActivityStatusCode,System.String);Argument[1];Argument[this].SyntheticField[System.Diagnostics.Activity._statusDescription];value;dfc-generated |
+| System.Diagnostics;Activity;SetStatus;(System.Diagnostics.ActivityStatusCode,System.String);Argument[1];ReturnValue.SyntheticField[System.Diagnostics.Activity._statusDescription];value;dfc-generated |
+| System.Diagnostics;Activity;SetStatus;(System.Diagnostics.ActivityStatusCode,System.String);Argument[this];ReturnValue;value;dfc-generated |
+| System.Diagnostics;Activity;SetTag;(System.String,System.Object);Argument[this];ReturnValue;value;dfc-generated |
 | System.Diagnostics;Activity;Start;();Argument[this];ReturnValue;value;df-generated |
 | System.Diagnostics;Activity;add_CurrentChanged;(System.EventHandler<System.Diagnostics.ActivityChangedEventArgs>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Diagnostics;Activity;get_Events;();Argument[this];ReturnValue;taint;df-generated |
 | System.Diagnostics;Activity;get_Id;();Argument[this];ReturnValue;taint;df-generated |
 | System.Diagnostics;Activity;get_Links;();Argument[this];ReturnValue;taint;df-generated |
-| System.Diagnostics;Activity;get_ParentId;();Argument[this];ReturnValue;taint;df-generated |
+| System.Diagnostics;Activity;get_ParentId;();Argument[this].SyntheticField[System.Diagnostics.Activity._parentId];ReturnValue;value;dfc-generated |
 | System.Diagnostics;Activity;get_ParentSpanId;();Argument[this];ReturnValue;taint;df-generated |
 | System.Diagnostics;Activity;get_RootId;();Argument[this];ReturnValue;taint;df-generated |
 | System.Diagnostics;Activity;get_SpanId;();Argument[this];ReturnValue;taint;df-generated |
-| System.Diagnostics;Activity;get_StatusDescription;();Argument[this];ReturnValue;taint;df-generated |
+| System.Diagnostics;Activity;get_StatusDescription;();Argument[this].SyntheticField[System.Diagnostics.Activity._statusDescription];ReturnValue;value;dfc-generated |
 | System.Diagnostics;Activity;get_TagObjects;();Argument[this];ReturnValue;taint;df-generated |
 | System.Diagnostics;Activity;get_TraceId;();Argument[this];ReturnValue;taint;df-generated |
 | System.Diagnostics;Activity;remove_CurrentChanged;(System.EventHandler<System.Diagnostics.ActivityChangedEventArgs>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
@@ -9871,10 +10389,10 @@ summary
 | System.Diagnostics;ActivityListener;set_SampleUsingParentId;(System.Diagnostics.SampleActivity<System.String>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Diagnostics;ActivityListener;set_ShouldListenTo;(System.Func<System.Diagnostics.ActivitySource,System.Boolean>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Diagnostics;ActivitySource;CreateActivity;(System.String,System.Diagnostics.ActivityKind,System.Diagnostics.ActivityContext,System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<System.String,System.Object>>,System.Collections.Generic.IEnumerable<System.Diagnostics.ActivityLink>,System.Diagnostics.ActivityIdFormat);Argument[2];ReturnValue;taint;df-generated |
-| System.Diagnostics;ActivitySource;CreateActivity;(System.String,System.Diagnostics.ActivityKind,System.String,System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<System.String,System.Object>>,System.Collections.Generic.IEnumerable<System.Diagnostics.ActivityLink>,System.Diagnostics.ActivityIdFormat);Argument[2];ReturnValue;taint;df-generated |
+| System.Diagnostics;ActivitySource;CreateActivity;(System.String,System.Diagnostics.ActivityKind,System.String,System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<System.String,System.Object>>,System.Collections.Generic.IEnumerable<System.Diagnostics.ActivityLink>,System.Diagnostics.ActivityIdFormat);Argument[2];ReturnValue.SyntheticField[System.Diagnostics.Activity._parentId];value;dfc-generated |
 | System.Diagnostics;ActivitySource;StartActivity;(System.Diagnostics.ActivityKind,System.Diagnostics.ActivityContext,System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<System.String,System.Object>>,System.Collections.Generic.IEnumerable<System.Diagnostics.ActivityLink>,System.DateTimeOffset,System.String);Argument[1];ReturnValue;taint;df-generated |
 | System.Diagnostics;ActivitySource;StartActivity;(System.String,System.Diagnostics.ActivityKind,System.Diagnostics.ActivityContext,System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<System.String,System.Object>>,System.Collections.Generic.IEnumerable<System.Diagnostics.ActivityLink>,System.DateTimeOffset);Argument[2];ReturnValue;taint;df-generated |
-| System.Diagnostics;ActivitySource;StartActivity;(System.String,System.Diagnostics.ActivityKind,System.String,System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<System.String,System.Object>>,System.Collections.Generic.IEnumerable<System.Diagnostics.ActivityLink>,System.DateTimeOffset);Argument[2];ReturnValue;taint;df-generated |
+| System.Diagnostics;ActivitySource;StartActivity;(System.String,System.Diagnostics.ActivityKind,System.String,System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<System.String,System.Object>>,System.Collections.Generic.IEnumerable<System.Diagnostics.ActivityLink>,System.DateTimeOffset);Argument[2];ReturnValue.SyntheticField[System.Diagnostics.Activity._parentId];value;dfc-generated |
 | System.Diagnostics;ActivitySpanId;ToHexString;();Argument[this];ReturnValue;taint;df-generated |
 | System.Diagnostics;ActivitySpanId;ToString;();Argument[this];ReturnValue;taint;df-generated |
 | System.Diagnostics;ActivityTagsCollection+Enumerator;get_Current;();Argument[this];ReturnValue;taint;df-generated |
@@ -9901,11 +10419,14 @@ summary
 | System.Diagnostics;CorrelationManager;get_LogicalOperationStack;();Argument[this];ReturnValue;taint;df-generated |
 | System.Diagnostics;DataReceivedEventArgs;get_Data;();Argument[this];ReturnValue;taint;df-generated |
 | System.Diagnostics;DataReceivedEventHandler;BeginInvoke;(System.Object,System.Diagnostics.DataReceivedEventArgs,System.AsyncCallback,System.Object);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
-| System.Diagnostics;DefaultTraceListener;Fail;(System.String);Argument[0];Argument[this];taint;df-generated |
-| System.Diagnostics;DefaultTraceListener;Fail;(System.String,System.String);Argument[0];Argument[this];taint;df-generated |
-| System.Diagnostics;DefaultTraceListener;Fail;(System.String,System.String);Argument[1];Argument[this];taint;df-generated |
+| System.Diagnostics;Debug;Assert;(System.Boolean,System.Diagnostics.Debug+AssertInterpolatedStringHandler);Argument[1];ReturnValue;value;dfc-generated |
+| System.Diagnostics;Debug;Assert;(System.Boolean,System.Diagnostics.Debug+AssertInterpolatedStringHandler,System.Diagnostics.Debug+AssertInterpolatedStringHandler);Argument[1];ReturnValue;value;dfc-generated |
+| System.Diagnostics;Debug;Assert;(System.Boolean,System.Diagnostics.Debug+AssertInterpolatedStringHandler,System.Diagnostics.Debug+AssertInterpolatedStringHandler);Argument[2];ReturnValue;value;dfc-generated |
+| System.Diagnostics;Debug;WriteIf;(System.Boolean,System.Diagnostics.Debug+WriteIfInterpolatedStringHandler);Argument[1];ReturnValue;value;dfc-generated |
+| System.Diagnostics;Debug;WriteIf;(System.Boolean,System.Diagnostics.Debug+WriteIfInterpolatedStringHandler,System.String);Argument[1];ReturnValue;value;dfc-generated |
+| System.Diagnostics;Debug;WriteLineIf;(System.Boolean,System.Diagnostics.Debug+WriteIfInterpolatedStringHandler);Argument[1];ReturnValue;value;dfc-generated |
+| System.Diagnostics;Debug;WriteLineIf;(System.Boolean,System.Diagnostics.Debug+WriteIfInterpolatedStringHandler,System.String);Argument[1];ReturnValue;value;dfc-generated |
 | System.Diagnostics;DefaultTraceListener;Write;(System.String);Argument[0];Argument[this];taint;df-generated |
-| System.Diagnostics;DefaultTraceListener;WriteLine;(System.String);Argument[0];Argument[this];taint;df-generated |
 | System.Diagnostics;DelimitedListTraceListener;TraceData;(System.Diagnostics.TraceEventCache,System.String,System.Diagnostics.TraceEventType,System.Int32,System.Object);Argument[0];Argument[this];taint;df-generated |
 | System.Diagnostics;DelimitedListTraceListener;TraceData;(System.Diagnostics.TraceEventCache,System.String,System.Diagnostics.TraceEventType,System.Int32,System.Object);Argument[1];Argument[this];taint;df-generated |
 | System.Diagnostics;DelimitedListTraceListener;TraceData;(System.Diagnostics.TraceEventCache,System.String,System.Diagnostics.TraceEventType,System.Int32,System.Object);Argument[4];Argument[this];taint;df-generated |
@@ -9926,13 +10447,22 @@ summary
 | System.Diagnostics;DiagnosticListener;Subscribe;(System.IObserver<System.Collections.Generic.KeyValuePair<System.String,System.Object>>,System.Func<System.String,System.Object,System.Object,System.Boolean>,System.Action<System.Diagnostics.Activity,System.Object>,System.Action<System.Diagnostics.Activity,System.Object>);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
 | System.Diagnostics;DiagnosticListener;Subscribe;(System.IObserver<System.Collections.Generic.KeyValuePair<System.String,System.Object>>,System.Func<System.String,System.Object,System.Object,System.Boolean>,System.Action<System.Diagnostics.Activity,System.Object>,System.Action<System.Diagnostics.Activity,System.Object>);Argument[3];Argument[3].Parameter[delegate-self];value;hq-generated |
 | System.Diagnostics;DiagnosticListener;Subscribe;(System.IObserver<System.Collections.Generic.KeyValuePair<System.String,System.Object>>,System.Predicate<System.String>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
-| System.Diagnostics;DiagnosticListener;ToString;();Argument[this];ReturnValue;taint;df-generated |
-| System.Diagnostics;DiagnosticSource;StartActivity;(System.Diagnostics.Activity,System.Object);Argument[0];ReturnValue;taint;df-generated |
-| System.Diagnostics;DiagnosticSource;StartActivity<T>;(System.Diagnostics.Activity,T);Argument[0];ReturnValue;taint;df-generated |
+| System.Diagnostics;DiagnosticListener;ToString;();Argument[this].Property[System.Diagnostics.DiagnosticListener.Name];ReturnValue;value;dfc-generated |
+| System.Diagnostics;DiagnosticSource;StartActivity;(System.Diagnostics.Activity,System.Object);Argument[0];ReturnValue;value;dfc-generated |
+| System.Diagnostics;DiagnosticSource;StartActivity<T>;(System.Diagnostics.Activity,T);Argument[0];ReturnValue;value;dfc-generated |
 | System.Diagnostics;DistributedContextPropagator+PropagatorGetterCallback;BeginInvoke;(System.Object,System.String,System.String,System.Collections.Generic.IEnumerable<System.String>,System.AsyncCallback,System.Object);Argument[4];Argument[4].Parameter[delegate-self];value;hq-generated |
 | System.Diagnostics;DistributedContextPropagator+PropagatorSetterCallback;BeginInvoke;(System.Object,System.String,System.String,System.AsyncCallback,System.Object);Argument[3];Argument[3].Parameter[delegate-self];value;hq-generated |
+| System.Diagnostics;DistributedContextPropagator;ExtractBaggage;(System.Object,System.Diagnostics.DistributedContextPropagator+PropagatorGetterCallback);Argument[0];Argument[1].Parameter[0];value;dfc-generated |
+| System.Diagnostics;DistributedContextPropagator;ExtractBaggage;(System.Object,System.Diagnostics.DistributedContextPropagator+PropagatorGetterCallback);Argument[0];Argument[1].Parameter[0];value;hq-generated |
+| System.Diagnostics;DistributedContextPropagator;ExtractBaggage;(System.Object,System.Diagnostics.DistributedContextPropagator+PropagatorGetterCallback);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | System.Diagnostics;DistributedContextPropagator;ExtractBaggage;(System.Object,System.Diagnostics.DistributedContextPropagator+PropagatorGetterCallback);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
+| System.Diagnostics;DistributedContextPropagator;ExtractTraceIdAndState;(System.Object,System.Diagnostics.DistributedContextPropagator+PropagatorGetterCallback,System.String,System.String);Argument[0];Argument[1].Parameter[0];value;dfc-generated |
+| System.Diagnostics;DistributedContextPropagator;ExtractTraceIdAndState;(System.Object,System.Diagnostics.DistributedContextPropagator+PropagatorGetterCallback,System.String,System.String);Argument[0];Argument[1].Parameter[0];value;hq-generated |
+| System.Diagnostics;DistributedContextPropagator;ExtractTraceIdAndState;(System.Object,System.Diagnostics.DistributedContextPropagator+PropagatorGetterCallback,System.String,System.String);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | System.Diagnostics;DistributedContextPropagator;ExtractTraceIdAndState;(System.Object,System.Diagnostics.DistributedContextPropagator+PropagatorGetterCallback,System.String,System.String);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
+| System.Diagnostics;DistributedContextPropagator;Inject;(System.Diagnostics.Activity,System.Object,System.Diagnostics.DistributedContextPropagator+PropagatorSetterCallback);Argument[1];Argument[2].Parameter[0];value;dfc-generated |
+| System.Diagnostics;DistributedContextPropagator;Inject;(System.Diagnostics.Activity,System.Object,System.Diagnostics.DistributedContextPropagator+PropagatorSetterCallback);Argument[1];Argument[2].Parameter[0];value;hq-generated |
+| System.Diagnostics;DistributedContextPropagator;Inject;(System.Diagnostics.Activity,System.Object,System.Diagnostics.DistributedContextPropagator+PropagatorSetterCallback);Argument[2];Argument[2].Parameter[delegate-self];value;dfc-generated |
 | System.Diagnostics;DistributedContextPropagator;Inject;(System.Diagnostics.Activity,System.Object,System.Diagnostics.DistributedContextPropagator+PropagatorSetterCallback);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
 | System.Diagnostics;EntryWrittenEventHandler;BeginInvoke;(System.Object,System.Diagnostics.EntryWrittenEventArgs,System.AsyncCallback,System.Object);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
 | System.Diagnostics;EventLog;add_EntryWritten;(System.Diagnostics.EntryWrittenEventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
@@ -9940,8 +10470,7 @@ summary
 | System.Diagnostics;EventLogEntry;GetObjectData;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);Argument[this];Argument[0];taint;df-generated |
 | System.Diagnostics;EventLogEntryCollection;CopyTo;(System.Array,System.Int32);Argument[this].Element;Argument[0].Element;value;manual |
 | System.Diagnostics;EventLogEntryCollection;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.IEnumerator.Current];value;manual |
-| System.Diagnostics;EventLogEntryCollection;get_SyncRoot;();Argument[this];ReturnValue;taint;df-generated |
-| System.Diagnostics;EventLogEntryCollection;get_SyncRoot;();Argument[this];ReturnValue;value;df-generated |
+| System.Diagnostics;EventLogEntryCollection;get_SyncRoot;();Argument[this];ReturnValue;value;dfc-generated |
 | System.Diagnostics;EventLogPermissionEntryCollection;OnInsert;(System.Int32,System.Object);Argument[1];Argument[this];taint;df-generated |
 | System.Diagnostics;EventLogPermissionEntryCollection;OnSet;(System.Int32,System.Object,System.Object);Argument[2];Argument[this];taint;df-generated |
 | System.Diagnostics;EventLogTraceListener;TraceData;(System.Diagnostics.TraceEventCache,System.String,System.Diagnostics.TraceEventType,System.Int32,System.Object);Argument[0];Argument[this];taint;df-generated |
@@ -9958,13 +10487,12 @@ summary
 | System.Diagnostics;EventLogTraceListener;TraceEvent;(System.Diagnostics.TraceEventCache,System.String,System.Diagnostics.TraceEventType,System.Int32,System.String,System.Object[]);Argument[4];Argument[this];taint;df-generated |
 | System.Diagnostics;EventLogTraceListener;TraceEvent;(System.Diagnostics.TraceEventCache,System.String,System.Diagnostics.TraceEventType,System.Int32,System.String,System.Object[]);Argument[5].Element;Argument[this];taint;df-generated |
 | System.Diagnostics;EventLogTraceListener;Write;(System.String);Argument[0];Argument[this];taint;df-generated |
-| System.Diagnostics;EventLogTraceListener;WriteLine;(System.String);Argument[0];Argument[this];taint;df-generated |
-| System.Diagnostics;FileVersionInfo;GetVersionInfo;(System.String);Argument[0];ReturnValue;taint;df-generated |
+| System.Diagnostics;FileVersionInfo;GetVersionInfo;(System.String);Argument[0];ReturnValue.SyntheticField[System.Diagnostics.FileVersionInfo._fileName];value;dfc-generated |
 | System.Diagnostics;FileVersionInfo;ToString;();Argument[this];ReturnValue;taint;df-generated |
 | System.Diagnostics;FileVersionInfo;get_Comments;();Argument[this];ReturnValue;taint;df-generated |
 | System.Diagnostics;FileVersionInfo;get_CompanyName;();Argument[this];ReturnValue;taint;df-generated |
 | System.Diagnostics;FileVersionInfo;get_FileDescription;();Argument[this];ReturnValue;taint;df-generated |
-| System.Diagnostics;FileVersionInfo;get_FileName;();Argument[this];ReturnValue;taint;df-generated |
+| System.Diagnostics;FileVersionInfo;get_FileName;();Argument[this].SyntheticField[System.Diagnostics.FileVersionInfo._fileName];ReturnValue;value;dfc-generated |
 | System.Diagnostics;FileVersionInfo;get_FileVersion;();Argument[this];ReturnValue;taint;df-generated |
 | System.Diagnostics;FileVersionInfo;get_InternalName;();Argument[this];ReturnValue;taint;df-generated |
 | System.Diagnostics;FileVersionInfo;get_Language;();Argument[this];ReturnValue;taint;df-generated |
@@ -9975,17 +10503,18 @@ summary
 | System.Diagnostics;FileVersionInfo;get_ProductName;();Argument[this];ReturnValue;taint;df-generated |
 | System.Diagnostics;FileVersionInfo;get_ProductVersion;();Argument[this];ReturnValue;taint;df-generated |
 | System.Diagnostics;FileVersionInfo;get_SpecialBuild;();Argument[this];ReturnValue;taint;df-generated |
-| System.Diagnostics;MonitoringDescriptionAttribute;get_Description;();Argument[this];ReturnValue;taint;df-generated |
+| System.Diagnostics;MonitoringDescriptionAttribute;get_Description;();Argument[this].Property[System.ComponentModel.DescriptionAttribute.DescriptionValue];ReturnValue;value;dfc-generated |
+| System.Diagnostics;MonitoringDescriptionAttribute;get_Description;();Argument[this].Property[System.ComponentModel.DescriptionAttribute.Description];Argument[this].Property[System.ComponentModel.DescriptionAttribute.DescriptionValue];value;dfc-generated |
+| System.Diagnostics;MonitoringDescriptionAttribute;get_Description;();Argument[this].Property[System.ComponentModel.DescriptionAttribute.Description];ReturnValue;value;dfc-generated |
 | System.Diagnostics;PerformanceCounterPermissionEntryCollection;OnInsert;(System.Int32,System.Object);Argument[1];Argument[this];taint;df-generated |
 | System.Diagnostics;PerformanceCounterPermissionEntryCollection;OnSet;(System.Int32,System.Object,System.Object);Argument[2];Argument[this];taint;df-generated |
-| System.Diagnostics;Process;GetProcessById;(System.Int32,System.String);Argument[1];ReturnValue;taint;df-generated |
+| System.Diagnostics;Process;GetProcessById;(System.Int32,System.String);Argument[1];ReturnValue.SyntheticField[System.Diagnostics.Process._machineName];value;dfc-generated |
 | System.Diagnostics;Process;GetProcesses;(System.String);Argument[0];ReturnValue;taint;df-generated |
 | System.Diagnostics;Process;Start;(System.Diagnostics.ProcessStartInfo);Argument[0];ReturnValue;taint;df-generated |
 | System.Diagnostics;Process;add_ErrorDataReceived;(System.Diagnostics.DataReceivedEventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Diagnostics;Process;add_Exited;(System.EventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Diagnostics;Process;add_OutputDataReceived;(System.Diagnostics.DataReceivedEventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
-| System.Diagnostics;Process;get_Handle;();Argument[this];ReturnValue;taint;df-generated |
-| System.Diagnostics;Process;get_MachineName;();Argument[this];ReturnValue;taint;df-generated |
+| System.Diagnostics;Process;get_MachineName;();Argument[this].SyntheticField[System.Diagnostics.Process._machineName];ReturnValue;value;dfc-generated |
 | System.Diagnostics;Process;get_MainModule;();Argument[this];ReturnValue;taint;df-generated |
 | System.Diagnostics;Process;get_Modules;();Argument[this];ReturnValue;taint;df-generated |
 | System.Diagnostics;Process;get_ProcessName;();Argument[this];ReturnValue;taint;df-generated |
@@ -9997,46 +10526,46 @@ summary
 | System.Diagnostics;Process;remove_ErrorDataReceived;(System.Diagnostics.DataReceivedEventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Diagnostics;Process;remove_Exited;(System.EventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Diagnostics;Process;remove_OutputDataReceived;(System.Diagnostics.DataReceivedEventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
+| System.Diagnostics;ProcessModule;ToString;();Argument[this].Property[System.Diagnostics.ProcessModule.ModuleName];ReturnValue;taint;dfc-generated |
 | System.Diagnostics;ProcessModule;get_FileName;();Argument[this];ReturnValue;taint;df-generated |
 | System.Diagnostics;ProcessModule;get_ModuleName;();Argument[this];ReturnValue;taint;df-generated |
 | System.Diagnostics;ProcessModuleCollection;CopyTo;(System.Diagnostics.ProcessModule[],System.Int32);Argument[this].Element;Argument[0].Element;value;manual |
-| System.Diagnostics;ProcessModuleCollection;ProcessModuleCollection;(System.Diagnostics.ProcessModule[]);Argument[0].Element;Argument[this];taint;df-generated |
-| System.Diagnostics;ProcessModuleCollection;get_Item;(System.Int32);Argument[this];ReturnValue;taint;df-generated |
+| System.Diagnostics;ProcessModuleCollection;ProcessModuleCollection;(System.Diagnostics.ProcessModule[]);Argument[0].Element;Argument[this].Property[System.Collections.ReadOnlyCollectionBase.InnerList].Element;value;dfc-generated |
+| System.Diagnostics;ProcessModuleCollection;get_Item;(System.Int32);Argument[this].Property[System.Collections.ReadOnlyCollectionBase.InnerList].Element;ReturnValue;value;dfc-generated |
 | System.Diagnostics;ProcessStartInfo;ProcessStartInfo;(System.String);Argument[0];Argument[this].Property[System.Diagnostics.ProcessStartInfo.FileName];value;manual |
 | System.Diagnostics;ProcessStartInfo;ProcessStartInfo;(System.String,System.Collections.Generic.IEnumerable<System.String>);Argument[0];Argument[this];taint;df-generated |
 | System.Diagnostics;ProcessStartInfo;ProcessStartInfo;(System.String,System.String);Argument[0];Argument[this].Property[System.Diagnostics.ProcessStartInfo.FileName];value;manual |
 | System.Diagnostics;ProcessStartInfo;ProcessStartInfo;(System.String,System.String);Argument[1];Argument[this].Property[System.Diagnostics.ProcessStartInfo.Arguments];value;manual |
 | System.Diagnostics;ProcessStartInfo;get_Environment;();Argument[this];ReturnValue;taint;df-generated |
-| System.Diagnostics;ProcessStartInfo;get_EnvironmentVariables;();Argument[this];ReturnValue;taint;df-generated |
+| System.Diagnostics;ProcessStartInfo;get_EnvironmentVariables;();Argument[this].Property[System.Diagnostics.ProcessStartInfo.Environment];ReturnValue.SyntheticField[System.Collections.Specialized.StringDictionaryWrapper._contents];value;dfc-generated |
 | System.Diagnostics;ProcessThreadCollection;Add;(System.Diagnostics.ProcessThread);Argument[0];Argument[this].Element;value;manual |
 | System.Diagnostics;ProcessThreadCollection;CopyTo;(System.Diagnostics.ProcessThread[],System.Int32);Argument[this].Element;Argument[0].Element;value;manual |
-| System.Diagnostics;ProcessThreadCollection;Insert;(System.Int32,System.Diagnostics.ProcessThread);Argument[1];Argument[this];taint;df-generated |
-| System.Diagnostics;ProcessThreadCollection;ProcessThreadCollection;(System.Diagnostics.ProcessThread[]);Argument[0].Element;Argument[this];taint;df-generated |
-| System.Diagnostics;ProcessThreadCollection;get_Item;(System.Int32);Argument[this];ReturnValue;taint;df-generated |
+| System.Diagnostics;ProcessThreadCollection;Insert;(System.Int32,System.Diagnostics.ProcessThread);Argument[1];Argument[this].Property[System.Collections.ReadOnlyCollectionBase.InnerList].Element;value;dfc-generated |
+| System.Diagnostics;ProcessThreadCollection;ProcessThreadCollection;(System.Diagnostics.ProcessThread[]);Argument[0].Element;Argument[this].Property[System.Collections.ReadOnlyCollectionBase.InnerList].Element;value;dfc-generated |
+| System.Diagnostics;ProcessThreadCollection;get_Item;(System.Int32);Argument[this].Property[System.Collections.ReadOnlyCollectionBase.InnerList].Element;ReturnValue;value;dfc-generated |
 | System.Diagnostics;SampleActivity<T>;BeginInvoke;(System.Diagnostics.ActivityCreationOptions<T>,System.AsyncCallback,System.Object);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
 | System.Diagnostics;SourceFilter;SourceFilter;(System.String);Argument[0];Argument[this];taint;df-generated |
-| System.Diagnostics;StackFrame;GetFileName;();Argument[this];ReturnValue;taint;df-generated |
+| System.Diagnostics;StackFrame;GetFileName;();Argument[this].SyntheticField[System.Diagnostics.StackFrame._fileName];ReturnValue;value;dfc-generated |
 | System.Diagnostics;StackFrame;GetMethod;();Argument[this];ReturnValue;taint;df-generated |
-| System.Diagnostics;StackFrame;StackFrame;(System.String,System.Int32);Argument[0];Argument[this];taint;df-generated |
-| System.Diagnostics;StackFrame;StackFrame;(System.String,System.Int32,System.Int32);Argument[0];Argument[this];taint;df-generated |
+| System.Diagnostics;StackFrame;StackFrame;(System.String,System.Int32);Argument[0];Argument[this].SyntheticField[System.Diagnostics.StackFrame._fileName];value;dfc-generated |
+| System.Diagnostics;StackFrame;StackFrame;(System.String,System.Int32,System.Int32);Argument[0];Argument[this].SyntheticField[System.Diagnostics.StackFrame._fileName];value;dfc-generated |
 | System.Diagnostics;StackFrame;ToString;();Argument[this];ReturnValue;taint;df-generated |
-| System.Diagnostics;StackTrace;GetFrame;(System.Int32);Argument[this];ReturnValue;taint;df-generated |
-| System.Diagnostics;StackTrace;StackTrace;(System.Diagnostics.StackFrame);Argument[0];Argument[this];taint;df-generated |
+| System.Diagnostics;StackTrace;GetFrame;(System.Int32);Argument[this].SyntheticField[System.Diagnostics.StackTrace._stackFrames].Element;ReturnValue;value;dfc-generated |
+| System.Diagnostics;StackTrace;StackTrace;(System.Diagnostics.StackFrame);Argument[0];Argument[this].SyntheticField[System.Diagnostics.StackTrace._stackFrames].Element;value;dfc-generated |
 | System.Diagnostics;StackTrace;ToString;();Argument[this];ReturnValue;taint;df-generated |
-| System.Diagnostics;Switch;Switch;(System.String,System.String,System.String);Argument[0];Argument[this];taint;df-generated |
-| System.Diagnostics;Switch;Switch;(System.String,System.String,System.String);Argument[1];Argument[this];taint;df-generated |
-| System.Diagnostics;Switch;Switch;(System.String,System.String,System.String);Argument[2];Argument[this];taint;df-generated |
+| System.Diagnostics;Switch;Switch;(System.String,System.String,System.String);Argument[0];Argument[this].SyntheticField[System.Diagnostics.Switch._displayName];value;dfc-generated |
+| System.Diagnostics;Switch;Switch;(System.String,System.String,System.String);Argument[1];Argument[this].SyntheticField[System.Diagnostics.Switch._description];value;dfc-generated |
+| System.Diagnostics;Switch;Switch;(System.String,System.String,System.String);Argument[2];Argument[this].SyntheticField[System.Diagnostics.Switch._defaultValue];value;dfc-generated |
 | System.Diagnostics;Switch;add_Initializing;(System.EventHandler<System.Diagnostics.InitializingSwitchEventArgs>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
-| System.Diagnostics;Switch;get_DefaultValue;();Argument[this];ReturnValue;taint;df-generated |
-| System.Diagnostics;Switch;get_Description;();Argument[this];ReturnValue;taint;df-generated |
-| System.Diagnostics;Switch;get_DisplayName;();Argument[this];ReturnValue;taint;df-generated |
+| System.Diagnostics;Switch;get_DefaultValue;();Argument[this].SyntheticField[System.Diagnostics.Switch._defaultValue];ReturnValue;value;dfc-generated |
+| System.Diagnostics;Switch;get_Description;();Argument[this].SyntheticField[System.Diagnostics.Switch._description];ReturnValue;value;dfc-generated |
+| System.Diagnostics;Switch;get_DisplayName;();Argument[this].SyntheticField[System.Diagnostics.Switch._displayName];ReturnValue;value;dfc-generated |
 | System.Diagnostics;Switch;remove_Initializing;(System.EventHandler<System.Diagnostics.InitializingSwitchEventArgs>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Diagnostics;SwitchAttribute;SwitchAttribute;(System.String,System.Type);Argument[0];Argument[this];taint;df-generated |
 | System.Diagnostics;TagList+Enumerator;get_Current;();Argument[this];ReturnValue;taint;df-generated |
 | System.Diagnostics;TagList;Add;(System.Collections.Generic.KeyValuePair<System.String,System.Object>);Argument[0];Argument[this].Element;value;manual |
 | System.Diagnostics;TagList;Clear;();Argument[this].WithoutElement;Argument[this];value;manual |
 | System.Diagnostics;TagList;CopyTo;(System.Collections.Generic.KeyValuePair<System.String,System.Object>[],System.Int32);Argument[this].Element;Argument[0].Element;value;manual |
-| System.Diagnostics;TagList;CopyTo;(System.Span<System.Collections.Generic.KeyValuePair<System.String,System.Object>>);Argument[this];Argument[0];taint;df-generated |
 | System.Diagnostics;TagList;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.Generic.IEnumerator`1.Current];value;manual |
 | System.Diagnostics;TagList;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.IEnumerator.Current];value;manual |
 | System.Diagnostics;TagList;Insert;(System.Int32,System.Collections.Generic.KeyValuePair<System.String,System.Object>);Argument[1];Argument[this].Element;value;manual |
@@ -10047,20 +10576,14 @@ summary
 | System.Diagnostics;TextWriterTraceListener;TextWriterTraceListener;(System.String);Argument[0];Argument[this];taint;df-generated |
 | System.Diagnostics;TextWriterTraceListener;TextWriterTraceListener;(System.String,System.String);Argument[0];Argument[this];taint;df-generated |
 | System.Diagnostics;TextWriterTraceListener;Write;(System.String);Argument[0];Argument[this];taint;df-generated |
-| System.Diagnostics;TextWriterTraceListener;WriteLine;(System.String);Argument[0];Argument[this];taint;df-generated |
 | System.Diagnostics;Trace;add_Refreshing;(System.EventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Diagnostics;Trace;remove_Refreshing;(System.EventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
-| System.Diagnostics;TraceListener;Fail;(System.String);Argument[0];Argument[this];taint;df-generated |
-| System.Diagnostics;TraceListener;Fail;(System.String,System.String);Argument[0];Argument[this];taint;df-generated |
-| System.Diagnostics;TraceListener;Fail;(System.String,System.String);Argument[1];Argument[this];taint;df-generated |
 | System.Diagnostics;TraceListener;TraceData;(System.Diagnostics.TraceEventCache,System.String,System.Diagnostics.TraceEventType,System.Int32,System.Object);Argument[0];Argument[this];taint;df-generated |
 | System.Diagnostics;TraceListener;TraceData;(System.Diagnostics.TraceEventCache,System.String,System.Diagnostics.TraceEventType,System.Int32,System.Object);Argument[1];Argument[this];taint;df-generated |
 | System.Diagnostics;TraceListener;TraceData;(System.Diagnostics.TraceEventCache,System.String,System.Diagnostics.TraceEventType,System.Int32,System.Object);Argument[4];Argument[this];taint;df-generated |
 | System.Diagnostics;TraceListener;TraceData;(System.Diagnostics.TraceEventCache,System.String,System.Diagnostics.TraceEventType,System.Int32,System.Object[]);Argument[0];Argument[this];taint;df-generated |
 | System.Diagnostics;TraceListener;TraceData;(System.Diagnostics.TraceEventCache,System.String,System.Diagnostics.TraceEventType,System.Int32,System.Object[]);Argument[1];Argument[this];taint;df-generated |
 | System.Diagnostics;TraceListener;TraceData;(System.Diagnostics.TraceEventCache,System.String,System.Diagnostics.TraceEventType,System.Int32,System.Object[]);Argument[4].Element;Argument[this];taint;df-generated |
-| System.Diagnostics;TraceListener;TraceEvent;(System.Diagnostics.TraceEventCache,System.String,System.Diagnostics.TraceEventType,System.Int32);Argument[0];Argument[this];taint;df-generated |
-| System.Diagnostics;TraceListener;TraceEvent;(System.Diagnostics.TraceEventCache,System.String,System.Diagnostics.TraceEventType,System.Int32);Argument[1];Argument[this];taint;df-generated |
 | System.Diagnostics;TraceListener;TraceEvent;(System.Diagnostics.TraceEventCache,System.String,System.Diagnostics.TraceEventType,System.Int32,System.String);Argument[0];Argument[this];taint;df-generated |
 | System.Diagnostics;TraceListener;TraceEvent;(System.Diagnostics.TraceEventCache,System.String,System.Diagnostics.TraceEventType,System.Int32,System.String);Argument[1];Argument[this];taint;df-generated |
 | System.Diagnostics;TraceListener;TraceEvent;(System.Diagnostics.TraceEventCache,System.String,System.Diagnostics.TraceEventType,System.Int32,System.String);Argument[4];Argument[this];taint;df-generated |
@@ -10069,20 +10592,7 @@ summary
 | System.Diagnostics;TraceListener;TraceEvent;(System.Diagnostics.TraceEventCache,System.String,System.Diagnostics.TraceEventType,System.Int32,System.String,System.Object[]);Argument[4];Argument[this];taint;df-generated |
 | System.Diagnostics;TraceListener;TraceEvent;(System.Diagnostics.TraceEventCache,System.String,System.Diagnostics.TraceEventType,System.Int32,System.String,System.Object[]);Argument[5].Element;Argument[this];taint;df-generated |
 | System.Diagnostics;TraceListener;TraceListener;(System.String);Argument[0];Argument[this];taint;df-generated |
-| System.Diagnostics;TraceListener;TraceTransfer;(System.Diagnostics.TraceEventCache,System.String,System.Int32,System.String,System.Guid);Argument[0];Argument[this];taint;df-generated |
-| System.Diagnostics;TraceListener;TraceTransfer;(System.Diagnostics.TraceEventCache,System.String,System.Int32,System.String,System.Guid);Argument[1];Argument[this];taint;df-generated |
-| System.Diagnostics;TraceListener;Write;(System.Object);Argument[0];Argument[this];taint;df-generated |
-| System.Diagnostics;TraceListener;Write;(System.Object,System.String);Argument[0];Argument[this];taint;df-generated |
-| System.Diagnostics;TraceListener;Write;(System.Object,System.String);Argument[1];Argument[this];taint;df-generated |
 | System.Diagnostics;TraceListener;Write;(System.String);Argument[0];Argument[this];taint;df-generated |
-| System.Diagnostics;TraceListener;Write;(System.String,System.String);Argument[0];Argument[this];taint;df-generated |
-| System.Diagnostics;TraceListener;Write;(System.String,System.String);Argument[1];Argument[this];taint;df-generated |
-| System.Diagnostics;TraceListener;WriteLine;(System.Object);Argument[0];Argument[this];taint;df-generated |
-| System.Diagnostics;TraceListener;WriteLine;(System.Object,System.String);Argument[0];Argument[this];taint;df-generated |
-| System.Diagnostics;TraceListener;WriteLine;(System.Object,System.String);Argument[1];Argument[this];taint;df-generated |
-| System.Diagnostics;TraceListener;WriteLine;(System.String);Argument[0];Argument[this];taint;df-generated |
-| System.Diagnostics;TraceListener;WriteLine;(System.String,System.String);Argument[0];Argument[this];taint;df-generated |
-| System.Diagnostics;TraceListener;WriteLine;(System.String,System.String);Argument[1];Argument[this];taint;df-generated |
 | System.Diagnostics;TraceListenerCollection;Add;(System.Diagnostics.TraceListener);Argument[0];Argument[this].Element;value;manual |
 | System.Diagnostics;TraceListenerCollection;Add;(System.Object);Argument[0];Argument[this].Element;value;manual |
 | System.Diagnostics;TraceListenerCollection;AddRange;(System.Diagnostics.TraceListenerCollection);Argument[0].Element;Argument[this].Element;value;manual |
@@ -10093,21 +10603,16 @@ summary
 | System.Diagnostics;TraceListenerCollection;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.IEnumerator.Current];value;manual |
 | System.Diagnostics;TraceListenerCollection;Insert;(System.Int32,System.Diagnostics.TraceListener);Argument[1];Argument[this].Element;value;manual |
 | System.Diagnostics;TraceListenerCollection;Insert;(System.Int32,System.Object);Argument[1];Argument[this].Element;value;manual |
-| System.Diagnostics;TraceListenerCollection;Remove;(System.Object);Argument[0];Argument[this];taint;df-generated |
-| System.Diagnostics;TraceListenerCollection;Remove;(System.Object);Argument[this];Argument[0];taint;df-generated |
 | System.Diagnostics;TraceListenerCollection;get_Item;(System.Int32);Argument[this].Element;ReturnValue;value;manual |
 | System.Diagnostics;TraceListenerCollection;get_Item;(System.String);Argument[this].Element;ReturnValue;value;manual |
-| System.Diagnostics;TraceListenerCollection;get_SyncRoot;();Argument[this];ReturnValue;taint;df-generated |
-| System.Diagnostics;TraceListenerCollection;get_SyncRoot;();Argument[this];ReturnValue;value;df-generated |
+| System.Diagnostics;TraceListenerCollection;get_SyncRoot;();Argument[this];ReturnValue;value;dfc-generated |
 | System.Diagnostics;TraceListenerCollection;set_Item;(System.Int32,System.Diagnostics.TraceListener);Argument[1];Argument[this].Element;value;manual |
 | System.Diagnostics;TraceListenerCollection;set_Item;(System.Int32,System.Object);Argument[1];Argument[this].Element;value;manual |
-| System.Diagnostics;TraceSource;TraceSource;(System.String,System.Diagnostics.SourceLevels);Argument[0];Argument[this];taint;df-generated |
+| System.Diagnostics;TraceSource;TraceSource;(System.String,System.Diagnostics.SourceLevels);Argument[0];Argument[this].SyntheticField[System.Diagnostics.TraceSource._sourceName];value;dfc-generated |
 | System.Diagnostics;TraceSource;add_Initializing;(System.EventHandler<System.Diagnostics.InitializingTraceSourceEventArgs>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Diagnostics;TraceSource;get_Listeners;();Argument[this];ReturnValue;taint;df-generated |
-| System.Diagnostics;TraceSource;get_Name;();Argument[this];ReturnValue;taint;df-generated |
+| System.Diagnostics;TraceSource;get_Name;();Argument[this].SyntheticField[System.Diagnostics.TraceSource._sourceName];ReturnValue;value;dfc-generated |
 | System.Diagnostics;TraceSource;remove_Initializing;(System.EventHandler<System.Diagnostics.InitializingTraceSourceEventArgs>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
-| System.Diagnostics;XmlWriterTraceListener;Fail;(System.String,System.String);Argument[0];Argument[this];taint;df-generated |
-| System.Diagnostics;XmlWriterTraceListener;Fail;(System.String,System.String);Argument[1];Argument[this];taint;df-generated |
 | System.Diagnostics;XmlWriterTraceListener;TraceData;(System.Diagnostics.TraceEventCache,System.String,System.Diagnostics.TraceEventType,System.Int32,System.Object);Argument[0];Argument[this];taint;df-generated |
 | System.Diagnostics;XmlWriterTraceListener;TraceData;(System.Diagnostics.TraceEventCache,System.String,System.Diagnostics.TraceEventType,System.Int32,System.Object);Argument[1];Argument[this];taint;df-generated |
 | System.Diagnostics;XmlWriterTraceListener;TraceData;(System.Diagnostics.TraceEventCache,System.String,System.Diagnostics.TraceEventType,System.Int32,System.Object);Argument[4];Argument[this];taint;df-generated |
@@ -10121,35 +10626,23 @@ summary
 | System.Diagnostics;XmlWriterTraceListener;TraceEvent;(System.Diagnostics.TraceEventCache,System.String,System.Diagnostics.TraceEventType,System.Int32,System.String,System.Object[]);Argument[1];Argument[this];taint;df-generated |
 | System.Diagnostics;XmlWriterTraceListener;TraceEvent;(System.Diagnostics.TraceEventCache,System.String,System.Diagnostics.TraceEventType,System.Int32,System.String,System.Object[]);Argument[4];Argument[this];taint;df-generated |
 | System.Diagnostics;XmlWriterTraceListener;TraceEvent;(System.Diagnostics.TraceEventCache,System.String,System.Diagnostics.TraceEventType,System.Int32,System.String,System.Object[]);Argument[5].Element;Argument[this];taint;df-generated |
-| System.Diagnostics;XmlWriterTraceListener;TraceTransfer;(System.Diagnostics.TraceEventCache,System.String,System.Int32,System.String,System.Guid);Argument[0];Argument[this];taint;df-generated |
-| System.Diagnostics;XmlWriterTraceListener;TraceTransfer;(System.Diagnostics.TraceEventCache,System.String,System.Int32,System.String,System.Guid);Argument[1];Argument[this];taint;df-generated |
 | System.Diagnostics;XmlWriterTraceListener;Write;(System.String);Argument[0];Argument[this];taint;df-generated |
-| System.Diagnostics;XmlWriterTraceListener;WriteLine;(System.String);Argument[0];Argument[this];taint;df-generated |
 | System.Drawing.Configuration;SystemDrawingSection;get_Properties;();Argument[this];ReturnValue;taint;df-generated |
-| System.Drawing.Drawing2D;CustomLineCap;Clone;();Argument[this];ReturnValue;taint;df-generated |
-| System.Drawing.Drawing2D;CustomLineCap;Clone;();Argument[this];ReturnValue;value;df-generated |
-| System.Drawing.Drawing2D;GraphicsPath;Clone;();Argument[this];ReturnValue;taint;df-generated |
-| System.Drawing.Drawing2D;GraphicsPath;Clone;();Argument[this];ReturnValue;value;df-generated |
-| System.Drawing.Drawing2D;HatchBrush;Clone;();Argument[this];ReturnValue;taint;df-generated |
-| System.Drawing.Drawing2D;HatchBrush;Clone;();Argument[this];ReturnValue;value;df-generated |
-| System.Drawing.Drawing2D;LinearGradientBrush;Clone;();Argument[this];ReturnValue;taint;df-generated |
-| System.Drawing.Drawing2D;LinearGradientBrush;Clone;();Argument[this];ReturnValue;value;df-generated |
-| System.Drawing.Drawing2D;PathGradientBrush;Clone;();Argument[this];ReturnValue;taint;df-generated |
-| System.Drawing.Drawing2D;PathGradientBrush;Clone;();Argument[this];ReturnValue;value;df-generated |
-| System.Drawing.Imaging;ImageAttributes;Clone;();Argument[this];ReturnValue;taint;df-generated |
-| System.Drawing.Imaging;ImageAttributes;Clone;();Argument[this];ReturnValue;value;df-generated |
+| System.Drawing.Drawing2D;CustomLineCap;Clone;();Argument[this];ReturnValue;value;dfc-generated |
+| System.Drawing.Drawing2D;GraphicsPath;Clone;();Argument[this];ReturnValue;value;dfc-generated |
+| System.Drawing.Drawing2D;HatchBrush;Clone;();Argument[this];ReturnValue;value;dfc-generated |
+| System.Drawing.Drawing2D;LinearGradientBrush;Clone;();Argument[this];ReturnValue;value;dfc-generated |
+| System.Drawing.Drawing2D;PathGradientBrush;Clone;();Argument[this];ReturnValue;value;dfc-generated |
+| System.Drawing.Imaging;ImageAttributes;Clone;();Argument[this];ReturnValue;value;dfc-generated |
 | System.Drawing.Imaging;PlayRecordCallback;BeginInvoke;(System.Drawing.Imaging.EmfPlusRecordType,System.Int32,System.Int32,System.IntPtr,System.AsyncCallback,System.Object);Argument[4];Argument[4].Parameter[delegate-self];value;hq-generated |
 | System.Drawing.Printing;InvalidPrinterException;GetObjectData;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);Argument[this];Argument[0];taint;df-generated |
-| System.Drawing.Printing;Margins;Clone;();Argument[this];ReturnValue;taint;df-generated |
-| System.Drawing.Printing;Margins;Clone;();Argument[this];ReturnValue;value;df-generated |
-| System.Drawing.Printing;MarginsConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[0];ReturnValue;taint;df-generated |
-| System.Drawing.Printing;MarginsConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue;taint;df-generated |
-| System.Drawing.Printing;MarginsConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[this];ReturnValue;taint;df-generated |
-| System.Drawing.Printing;MarginsConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[1];ReturnValue;taint;df-generated |
-| System.Drawing.Printing;MarginsConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[2];ReturnValue;taint;df-generated |
-| System.Drawing.Printing;MarginsConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[this];ReturnValue;taint;df-generated |
-| System.Drawing.Printing;PageSettings;Clone;();Argument[this];ReturnValue;taint;df-generated |
-| System.Drawing.Printing;PageSettings;Clone;();Argument[this];ReturnValue;value;df-generated |
+| System.Drawing.Printing;Margins;Clone;();Argument[this];ReturnValue;value;dfc-generated |
+| System.Drawing.Printing;MarginsConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue.Element;taint;dfc-generated |
+| System.Drawing.Printing;MarginsConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue;taint;dfc-generated |
+| System.Drawing.Printing;MarginsConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue;value;dfc-generated |
+| System.Drawing.Printing;MarginsConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[2].Element;ReturnValue;taint;dfc-generated |
+| System.Drawing.Printing;MarginsConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[2];ReturnValue;taint;dfc-generated |
+| System.Drawing.Printing;PageSettings;Clone;();Argument[this];ReturnValue;value;dfc-generated |
 | System.Drawing.Printing;PrintDocument;add_BeginPrint;(System.Drawing.Printing.PrintEventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Drawing.Printing;PrintDocument;add_EndPrint;(System.Drawing.Printing.PrintEventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Drawing.Printing;PrintDocument;add_PrintPage;(System.Drawing.Printing.PrintPageEventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
@@ -10162,59 +10655,50 @@ summary
 | System.Drawing.Printing;PrintPageEventHandler;BeginInvoke;(System.Object,System.Drawing.Printing.PrintPageEventArgs,System.AsyncCallback,System.Object);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
 | System.Drawing.Printing;PrinterSettings+PaperSizeCollection;CopyTo;(System.Array,System.Int32);Argument[this].Element;Argument[0].Element;value;manual |
 | System.Drawing.Printing;PrinterSettings+PaperSizeCollection;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.IEnumerator.Current];value;manual |
-| System.Drawing.Printing;PrinterSettings+PaperSizeCollection;get_SyncRoot;();Argument[this];ReturnValue;taint;df-generated |
-| System.Drawing.Printing;PrinterSettings+PaperSizeCollection;get_SyncRoot;();Argument[this];ReturnValue;value;df-generated |
+| System.Drawing.Printing;PrinterSettings+PaperSizeCollection;get_SyncRoot;();Argument[this];ReturnValue;value;dfc-generated |
 | System.Drawing.Printing;PrinterSettings+PaperSourceCollection;CopyTo;(System.Array,System.Int32);Argument[this].Element;Argument[0].Element;value;manual |
 | System.Drawing.Printing;PrinterSettings+PaperSourceCollection;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.IEnumerator.Current];value;manual |
-| System.Drawing.Printing;PrinterSettings+PaperSourceCollection;get_SyncRoot;();Argument[this];ReturnValue;taint;df-generated |
-| System.Drawing.Printing;PrinterSettings+PaperSourceCollection;get_SyncRoot;();Argument[this];ReturnValue;value;df-generated |
+| System.Drawing.Printing;PrinterSettings+PaperSourceCollection;get_SyncRoot;();Argument[this];ReturnValue;value;dfc-generated |
 | System.Drawing.Printing;PrinterSettings+PrinterResolutionCollection;CopyTo;(System.Array,System.Int32);Argument[this].Element;Argument[0].Element;value;manual |
 | System.Drawing.Printing;PrinterSettings+PrinterResolutionCollection;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.IEnumerator.Current];value;manual |
-| System.Drawing.Printing;PrinterSettings+PrinterResolutionCollection;get_SyncRoot;();Argument[this];ReturnValue;taint;df-generated |
-| System.Drawing.Printing;PrinterSettings+PrinterResolutionCollection;get_SyncRoot;();Argument[this];ReturnValue;value;df-generated |
+| System.Drawing.Printing;PrinterSettings+PrinterResolutionCollection;get_SyncRoot;();Argument[this];ReturnValue;value;dfc-generated |
 | System.Drawing.Printing;PrinterSettings+StringCollection;CopyTo;(System.Array,System.Int32);Argument[this].Element;Argument[0].Element;value;manual |
 | System.Drawing.Printing;PrinterSettings+StringCollection;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.IEnumerator.Current];value;manual |
-| System.Drawing.Printing;PrinterSettings+StringCollection;get_SyncRoot;();Argument[this];ReturnValue;taint;df-generated |
-| System.Drawing.Printing;PrinterSettings+StringCollection;get_SyncRoot;();Argument[this];ReturnValue;value;df-generated |
-| System.Drawing.Printing;PrinterSettings;Clone;();Argument[this];ReturnValue;taint;df-generated |
-| System.Drawing.Printing;PrinterSettings;Clone;();Argument[this];ReturnValue;value;df-generated |
-| System.Drawing.Printing;PrintingPermission;Copy;();Argument[this];ReturnValue;taint;df-generated |
-| System.Drawing.Printing;PrintingPermission;Copy;();Argument[this];ReturnValue;value;df-generated |
-| System.Drawing.Printing;PrintingPermission;Intersect;(System.Security.IPermission);Argument[0];ReturnValue;taint;df-generated |
-| System.Drawing.Printing;PrintingPermission;Intersect;(System.Security.IPermission);Argument[this];ReturnValue;taint;df-generated |
+| System.Drawing.Printing;PrinterSettings+StringCollection;get_SyncRoot;();Argument[this];ReturnValue;value;dfc-generated |
+| System.Drawing.Printing;PrinterSettings;Clone;();Argument[this];ReturnValue;value;dfc-generated |
+| System.Drawing.Printing;PrintingPermission;Copy;();Argument[this];ReturnValue;value;dfc-generated |
+| System.Drawing.Printing;PrintingPermission;Intersect;(System.Security.IPermission);Argument[0];ReturnValue;value;dfc-generated |
 | System.Drawing.Printing;PrintingPermission;Union;(System.Security.IPermission);Argument[this];ReturnValue;taint;df-generated |
 | System.Drawing.Printing;QueryPageSettingsEventHandler;BeginInvoke;(System.Object,System.Drawing.Printing.QueryPageSettingsEventArgs,System.AsyncCallback,System.Object);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
-| System.Drawing;Brush;Clone;();Argument[this];ReturnValue;taint;df-generated |
-| System.Drawing;Brush;Clone;();Argument[this];ReturnValue;value;df-generated |
-| System.Drawing;Color;FromName;(System.String);Argument[0];ReturnValue;taint;df-generated |
-| System.Drawing;Color;ToString;();Argument[this];ReturnValue;taint;df-generated |
-| System.Drawing;Color;get_Name;();Argument[this];ReturnValue;taint;df-generated |
-| System.Drawing;ColorConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[0];ReturnValue;taint;df-generated |
-| System.Drawing;ColorConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue;taint;df-generated |
-| System.Drawing;ColorConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[this];ReturnValue;taint;df-generated |
-| System.Drawing;ColorConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[1];ReturnValue;taint;df-generated |
-| System.Drawing;ColorConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[2];ReturnValue;taint;df-generated |
-| System.Drawing;ColorConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[this];ReturnValue;taint;df-generated |
-| System.Drawing;ColorConverter;GetStandardValues;(System.ComponentModel.ITypeDescriptorContext);Argument[0];ReturnValue;taint;df-generated |
+| System.Drawing;Brush;Clone;();Argument[this];ReturnValue;value;dfc-generated |
+| System.Drawing;Color;FromName;(System.String);Argument[0];ReturnValue.SyntheticField[System.Drawing.Color.name];value;dfc-generated |
+| System.Drawing;Color;ToString;();Argument[this].Property[System.Drawing.Color.Name];ReturnValue;taint;dfc-generated |
+| System.Drawing;Color;ToString;();Argument[this].SyntheticField[System.Drawing.Color.name];ReturnValue;taint;dfc-generated |
+| System.Drawing;Color;get_Name;();Argument[this].SyntheticField[System.Drawing.Color.name];ReturnValue;value;dfc-generated |
+| System.Drawing;ColorConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue.Element;taint;dfc-generated |
+| System.Drawing;ColorConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue;taint;dfc-generated |
+| System.Drawing;ColorConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue;value;dfc-generated |
+| System.Drawing;ColorConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[1].Property[System.Globalization.CultureInfo.TextInfo].Property[System.Globalization.TextInfo.ListSeparator];ReturnValue;taint;dfc-generated |
+| System.Drawing;ColorConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[2].Element;ReturnValue;taint;dfc-generated |
+| System.Drawing;ColorConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[2];ReturnValue;taint;dfc-generated |
 | System.Drawing;ColorConverter;GetStandardValues;(System.ComponentModel.ITypeDescriptorContext);Argument[this];ReturnValue;taint;df-generated |
-| System.Drawing;ColorTranslator;FromHtml;(System.String);Argument[0];ReturnValue;taint;df-generated |
-| System.Drawing;ColorTranslator;ToHtml;(System.Drawing.Color);Argument[0];ReturnValue;taint;df-generated |
-| System.Drawing;Font;Clone;();Argument[this];ReturnValue;taint;df-generated |
-| System.Drawing;Font;Clone;();Argument[this];ReturnValue;value;df-generated |
+| System.Drawing;ColorTranslator;ToHtml;(System.Drawing.Color);Argument[0].Property[System.Drawing.Color.Name];ReturnValue;value;dfc-generated |
+| System.Drawing;ColorTranslator;ToHtml;(System.Drawing.Color);Argument[0].SyntheticField[System.Drawing.Color.name];ReturnValue;value;dfc-generated |
+| System.Drawing;Font;Clone;();Argument[this];ReturnValue;value;dfc-generated |
 | System.Drawing;Font;GetObjectData;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);Argument[this];Argument[0];taint;df-generated |
-| System.Drawing;FontConverter+FontNameConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[0];ReturnValue;taint;df-generated |
-| System.Drawing;FontConverter+FontNameConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue;taint;df-generated |
-| System.Drawing;FontConverter+FontNameConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[this];ReturnValue;taint;df-generated |
-| System.Drawing;FontConverter+FontNameConverter;GetStandardValues;(System.ComponentModel.ITypeDescriptorContext);Argument[0];ReturnValue;taint;df-generated |
+| System.Drawing;FontConverter+FontNameConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue.Element;taint;dfc-generated |
+| System.Drawing;FontConverter+FontNameConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue;taint;dfc-generated |
+| System.Drawing;FontConverter+FontNameConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue;value;dfc-generated |
 | System.Drawing;FontConverter+FontNameConverter;GetStandardValues;(System.ComponentModel.ITypeDescriptorContext);Argument[this];ReturnValue;taint;df-generated |
-| System.Drawing;FontConverter+FontUnitConverter;GetStandardValues;(System.ComponentModel.ITypeDescriptorContext);Argument[0];ReturnValue;taint;df-generated |
+| System.Drawing;FontConverter+FontUnitConverter;GetStandardValues;(System.ComponentModel.ITypeDescriptorContext);Argument[this].Property[System.ComponentModel.EnumConverter.Values];ReturnValue;value;df-generated |
+| System.Drawing;FontConverter+FontUnitConverter;GetStandardValues;(System.ComponentModel.ITypeDescriptorContext);Argument[this].Property[System.ComponentModel.EnumConverter.Values];ReturnValue;value;dfc-generated |
 | System.Drawing;FontConverter+FontUnitConverter;GetStandardValues;(System.ComponentModel.ITypeDescriptorContext);Argument[this];ReturnValue;taint;df-generated |
-| System.Drawing;FontConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[0];ReturnValue;taint;df-generated |
-| System.Drawing;FontConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue;taint;df-generated |
-| System.Drawing;FontConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[this];ReturnValue;taint;df-generated |
-| System.Drawing;FontConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[1];ReturnValue;taint;df-generated |
-| System.Drawing;FontConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[2];ReturnValue;taint;df-generated |
-| System.Drawing;FontConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[this];ReturnValue;taint;df-generated |
+| System.Drawing;FontConverter+FontUnitConverter;GetStandardValues;(System.ComponentModel.ITypeDescriptorContext);Argument[this];ReturnValue;taint;dfc-generated |
+| System.Drawing;FontConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue.Element;taint;dfc-generated |
+| System.Drawing;FontConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue;taint;dfc-generated |
+| System.Drawing;FontConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue;value;dfc-generated |
+| System.Drawing;FontConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[2].Element;ReturnValue;taint;dfc-generated |
+| System.Drawing;FontConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[2];ReturnValue;taint;dfc-generated |
 | System.Drawing;FontConverter;GetProperties;(System.ComponentModel.ITypeDescriptorContext,System.Object,System.Attribute[]);Argument[1];ReturnValue;taint;df-generated |
 | System.Drawing;Graphics+DrawImageAbort;BeginInvoke;(System.IntPtr,System.AsyncCallback,System.Object);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
 | System.Drawing;Graphics+EnumerateMetafileProc;BeginInvoke;(System.Drawing.Imaging.EmfPlusRecordType,System.Int32,System.Int32,System.IntPtr,System.Drawing.Imaging.PlayRecordCallback,System.AsyncCallback,System.Object);Argument[4];Argument[4].Parameter[delegate-self];value;hq-generated |
@@ -10264,87 +10748,78 @@ summary
 | System.Drawing;Graphics;EnumerateMetafile;(System.Drawing.Imaging.Metafile,System.Drawing.RectangleF,System.Drawing.RectangleF,System.Drawing.GraphicsUnit,System.Drawing.Graphics+EnumerateMetafileProc);Argument[4];Argument[4].Parameter[delegate-self];value;hq-generated |
 | System.Drawing;Graphics;EnumerateMetafile;(System.Drawing.Imaging.Metafile,System.Drawing.RectangleF,System.Drawing.RectangleF,System.Drawing.GraphicsUnit,System.Drawing.Graphics+EnumerateMetafileProc,System.IntPtr);Argument[4];Argument[4].Parameter[delegate-self];value;hq-generated |
 | System.Drawing;Graphics;EnumerateMetafile;(System.Drawing.Imaging.Metafile,System.Drawing.RectangleF,System.Drawing.RectangleF,System.Drawing.GraphicsUnit,System.Drawing.Graphics+EnumerateMetafileProc,System.IntPtr,System.Drawing.Imaging.ImageAttributes);Argument[4];Argument[4].Parameter[delegate-self];value;hq-generated |
-| System.Drawing;Icon;Clone;();Argument[this];ReturnValue;taint;df-generated |
-| System.Drawing;Icon;Clone;();Argument[this];ReturnValue;value;df-generated |
+| System.Drawing;Icon;Clone;();Argument[this];ReturnValue;value;dfc-generated |
 | System.Drawing;Icon;GetObjectData;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);Argument[this];Argument[0];taint;df-generated |
-| System.Drawing;IconConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[0];ReturnValue;taint;df-generated |
-| System.Drawing;IconConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue;taint;df-generated |
-| System.Drawing;IconConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[this];ReturnValue;taint;df-generated |
-| System.Drawing;IconConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[1];ReturnValue;taint;df-generated |
-| System.Drawing;IconConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[2];ReturnValue;taint;df-generated |
-| System.Drawing;IconConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[this];ReturnValue;taint;df-generated |
+| System.Drawing;IconConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue.Element;taint;dfc-generated |
+| System.Drawing;IconConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue;taint;dfc-generated |
+| System.Drawing;IconConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue;value;dfc-generated |
+| System.Drawing;IconConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[2].Element;ReturnValue;taint;dfc-generated |
+| System.Drawing;IconConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[2];ReturnValue;taint;dfc-generated |
 | System.Drawing;Image+GetThumbnailImageAbort;BeginInvoke;(System.AsyncCallback,System.Object);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
-| System.Drawing;Image;Clone;();Argument[this];ReturnValue;taint;df-generated |
-| System.Drawing;Image;Clone;();Argument[this];ReturnValue;value;df-generated |
+| System.Drawing;Image;Clone;();Argument[this];ReturnValue;value;dfc-generated |
 | System.Drawing;Image;GetObjectData;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);Argument[this];Argument[0];taint;df-generated |
 | System.Drawing;Image;GetThumbnailImage;(System.Int32,System.Int32,System.Drawing.Image+GetThumbnailImageAbort,System.IntPtr);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
 | System.Drawing;ImageAnimator;Animate;(System.Drawing.Image,System.EventHandler);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
 | System.Drawing;ImageAnimator;StopAnimate;(System.Drawing.Image,System.EventHandler);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
-| System.Drawing;ImageConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[0];ReturnValue;taint;df-generated |
-| System.Drawing;ImageConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue;taint;df-generated |
-| System.Drawing;ImageConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[this];ReturnValue;taint;df-generated |
-| System.Drawing;ImageConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[1];ReturnValue;taint;df-generated |
-| System.Drawing;ImageConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[2];ReturnValue;taint;df-generated |
-| System.Drawing;ImageConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[this];ReturnValue;taint;df-generated |
+| System.Drawing;ImageConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue.Element;taint;dfc-generated |
+| System.Drawing;ImageConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue;taint;dfc-generated |
+| System.Drawing;ImageConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue;value;dfc-generated |
+| System.Drawing;ImageConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[2].Element;ReturnValue;taint;dfc-generated |
+| System.Drawing;ImageConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[2];ReturnValue;taint;dfc-generated |
 | System.Drawing;ImageConverter;GetProperties;(System.ComponentModel.ITypeDescriptorContext,System.Object,System.Attribute[]);Argument[1];ReturnValue;taint;df-generated |
-| System.Drawing;ImageFormatConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[0];ReturnValue;taint;df-generated |
-| System.Drawing;ImageFormatConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue;taint;df-generated |
-| System.Drawing;ImageFormatConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[this];ReturnValue;taint;df-generated |
-| System.Drawing;ImageFormatConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[1];ReturnValue;taint;df-generated |
-| System.Drawing;ImageFormatConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[2];ReturnValue;taint;df-generated |
-| System.Drawing;ImageFormatConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[this];ReturnValue;taint;df-generated |
-| System.Drawing;ImageFormatConverter;GetStandardValues;(System.ComponentModel.ITypeDescriptorContext);Argument[0];ReturnValue;taint;df-generated |
+| System.Drawing;ImageFormatConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue.Element;taint;dfc-generated |
+| System.Drawing;ImageFormatConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue;taint;dfc-generated |
+| System.Drawing;ImageFormatConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue;value;dfc-generated |
+| System.Drawing;ImageFormatConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[2].Element;ReturnValue;taint;dfc-generated |
+| System.Drawing;ImageFormatConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[2];ReturnValue;taint;dfc-generated |
 | System.Drawing;ImageFormatConverter;GetStandardValues;(System.ComponentModel.ITypeDescriptorContext);Argument[this];ReturnValue;taint;df-generated |
-| System.Drawing;Pen;Clone;();Argument[this];ReturnValue;taint;df-generated |
-| System.Drawing;Pen;Clone;();Argument[this];ReturnValue;value;df-generated |
-| System.Drawing;PointConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[0];ReturnValue;taint;df-generated |
-| System.Drawing;PointConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue;taint;df-generated |
-| System.Drawing;PointConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[this];ReturnValue;taint;df-generated |
-| System.Drawing;PointConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[1];ReturnValue;taint;df-generated |
-| System.Drawing;PointConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[2];ReturnValue;taint;df-generated |
-| System.Drawing;PointConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[this];ReturnValue;taint;df-generated |
+| System.Drawing;Pen;Clone;();Argument[this];ReturnValue;value;dfc-generated |
+| System.Drawing;PointConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue.Element;taint;dfc-generated |
+| System.Drawing;PointConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue;taint;dfc-generated |
+| System.Drawing;PointConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue;value;dfc-generated |
+| System.Drawing;PointConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[1].Property[System.Globalization.CultureInfo.TextInfo].Property[System.Globalization.TextInfo.ListSeparator];ReturnValue;taint;dfc-generated |
+| System.Drawing;PointConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[2].Element;ReturnValue;taint;dfc-generated |
+| System.Drawing;PointConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[2];ReturnValue;taint;dfc-generated |
 | System.Drawing;PointConverter;GetProperties;(System.ComponentModel.ITypeDescriptorContext,System.Object,System.Attribute[]);Argument[1];ReturnValue;taint;df-generated |
-| System.Drawing;Rectangle;Inflate;(System.Drawing.Rectangle,System.Int32,System.Int32);Argument[0];ReturnValue;taint;df-generated |
-| System.Drawing;RectangleConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[0];ReturnValue;taint;df-generated |
-| System.Drawing;RectangleConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue;taint;df-generated |
-| System.Drawing;RectangleConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[this];ReturnValue;taint;df-generated |
-| System.Drawing;RectangleConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[1];ReturnValue;taint;df-generated |
-| System.Drawing;RectangleConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[2];ReturnValue;taint;df-generated |
-| System.Drawing;RectangleConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[this];ReturnValue;taint;df-generated |
+| System.Drawing;Rectangle;Inflate;(System.Drawing.Rectangle,System.Int32,System.Int32);Argument[0];ReturnValue;value;dfc-generated |
+| System.Drawing;RectangleConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue.Element;taint;dfc-generated |
+| System.Drawing;RectangleConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue;taint;dfc-generated |
+| System.Drawing;RectangleConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue;value;dfc-generated |
+| System.Drawing;RectangleConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[1].Property[System.Globalization.CultureInfo.TextInfo].Property[System.Globalization.TextInfo.ListSeparator];ReturnValue;taint;dfc-generated |
+| System.Drawing;RectangleConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[2].Element;ReturnValue;taint;dfc-generated |
+| System.Drawing;RectangleConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[2];ReturnValue;taint;dfc-generated |
 | System.Drawing;RectangleConverter;GetProperties;(System.ComponentModel.ITypeDescriptorContext,System.Object,System.Attribute[]);Argument[1];ReturnValue;taint;df-generated |
-| System.Drawing;RectangleF;Inflate;(System.Drawing.RectangleF,System.Single,System.Single);Argument[0];ReturnValue;taint;df-generated |
-| System.Drawing;SizeConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[0];ReturnValue;taint;df-generated |
-| System.Drawing;SizeConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue;taint;df-generated |
-| System.Drawing;SizeConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[this];ReturnValue;taint;df-generated |
-| System.Drawing;SizeConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[1];ReturnValue;taint;df-generated |
-| System.Drawing;SizeConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[2];ReturnValue;taint;df-generated |
-| System.Drawing;SizeConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[this];ReturnValue;taint;df-generated |
+| System.Drawing;RectangleF;Inflate;(System.Drawing.RectangleF,System.Single,System.Single);Argument[0];ReturnValue;value;dfc-generated |
+| System.Drawing;SizeConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue.Element;taint;dfc-generated |
+| System.Drawing;SizeConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue;taint;dfc-generated |
+| System.Drawing;SizeConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue;value;dfc-generated |
+| System.Drawing;SizeConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[1].Property[System.Globalization.CultureInfo.TextInfo].Property[System.Globalization.TextInfo.ListSeparator];ReturnValue;taint;dfc-generated |
+| System.Drawing;SizeConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[2].Element;ReturnValue;taint;dfc-generated |
+| System.Drawing;SizeConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[2];ReturnValue;taint;dfc-generated |
 | System.Drawing;SizeConverter;GetProperties;(System.ComponentModel.ITypeDescriptorContext,System.Object,System.Attribute[]);Argument[1];ReturnValue;taint;df-generated |
-| System.Drawing;SizeFConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[0];ReturnValue;taint;df-generated |
-| System.Drawing;SizeFConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue;taint;df-generated |
-| System.Drawing;SizeFConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[this];ReturnValue;taint;df-generated |
-| System.Drawing;SizeFConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[1];ReturnValue;taint;df-generated |
-| System.Drawing;SizeFConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[2];ReturnValue;taint;df-generated |
-| System.Drawing;SizeFConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[this];ReturnValue;taint;df-generated |
+| System.Drawing;SizeFConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue.Element;taint;dfc-generated |
+| System.Drawing;SizeFConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue;taint;dfc-generated |
+| System.Drawing;SizeFConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue;value;dfc-generated |
+| System.Drawing;SizeFConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[1].Property[System.Globalization.CultureInfo.TextInfo].Property[System.Globalization.TextInfo.ListSeparator];ReturnValue;taint;dfc-generated |
+| System.Drawing;SizeFConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[2].Element;ReturnValue;taint;dfc-generated |
+| System.Drawing;SizeFConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[2];ReturnValue;taint;dfc-generated |
 | System.Drawing;SizeFConverter;GetProperties;(System.ComponentModel.ITypeDescriptorContext,System.Object,System.Attribute[]);Argument[1];ReturnValue;taint;df-generated |
-| System.Drawing;SolidBrush;Clone;();Argument[this];ReturnValue;taint;df-generated |
-| System.Drawing;SolidBrush;Clone;();Argument[this];ReturnValue;value;df-generated |
-| System.Drawing;StringFormat;Clone;();Argument[this];ReturnValue;taint;df-generated |
-| System.Drawing;StringFormat;Clone;();Argument[this];ReturnValue;value;df-generated |
-| System.Drawing;TextureBrush;Clone;();Argument[this];ReturnValue;taint;df-generated |
-| System.Drawing;TextureBrush;Clone;();Argument[this];ReturnValue;value;df-generated |
-| System.Dynamic;BinaryOperationBinder;FallbackBinaryOperation;(System.Dynamic.DynamicMetaObject,System.Dynamic.DynamicMetaObject,System.Dynamic.DynamicMetaObject);Argument[2];ReturnValue;taint;df-generated |
+| System.Drawing;SolidBrush;Clone;();Argument[this];ReturnValue;value;dfc-generated |
+| System.Drawing;StringFormat;Clone;();Argument[this];ReturnValue;value;dfc-generated |
+| System.Drawing;TextureBrush;Clone;();Argument[this];ReturnValue;value;dfc-generated |
+| System.Dynamic;BinaryOperationBinder;FallbackBinaryOperation;(System.Dynamic.DynamicMetaObject,System.Dynamic.DynamicMetaObject,System.Dynamic.DynamicMetaObject);Argument[2];ReturnValue;value;dfc-generated |
 | System.Dynamic;BindingRestrictions;Combine;(System.Collections.Generic.IList<System.Dynamic.DynamicMetaObject>);Argument[0].Element;ReturnValue;taint;df-generated |
 | System.Dynamic;BindingRestrictions;GetExpressionRestriction;(System.Linq.Expressions.Expression);Argument[0];ReturnValue;taint;df-generated |
 | System.Dynamic;BindingRestrictions;GetInstanceRestriction;(System.Linq.Expressions.Expression,System.Object);Argument[0];ReturnValue;taint;df-generated |
 | System.Dynamic;BindingRestrictions;GetInstanceRestriction;(System.Linq.Expressions.Expression,System.Object);Argument[1];ReturnValue;taint;df-generated |
 | System.Dynamic;BindingRestrictions;GetTypeRestriction;(System.Linq.Expressions.Expression,System.Type);Argument[0];ReturnValue;taint;df-generated |
-| System.Dynamic;BindingRestrictions;Merge;(System.Dynamic.BindingRestrictions);Argument[this];ReturnValue;value;df-generated |
+| System.Dynamic;BindingRestrictions;Merge;(System.Dynamic.BindingRestrictions);Argument[0];ReturnValue;value;dfc-generated |
+| System.Dynamic;BindingRestrictions;Merge;(System.Dynamic.BindingRestrictions);Argument[this];ReturnValue;value;dfc-generated |
 | System.Dynamic;BindingRestrictions;ToExpression;();Argument[this];ReturnValue;taint;df-generated |
-| System.Dynamic;ConvertBinder;FallbackConvert;(System.Dynamic.DynamicMetaObject,System.Dynamic.DynamicMetaObject);Argument[1];ReturnValue;taint;df-generated |
-| System.Dynamic;DynamicMetaObject;Create;(System.Object,System.Linq.Expressions.Expression);Argument[0];ReturnValue;taint;df-generated |
-| System.Dynamic;DynamicMetaObject;DynamicMetaObject;(System.Linq.Expressions.Expression,System.Dynamic.BindingRestrictions,System.Object);Argument[2];Argument[this];taint;df-generated |
-| System.Dynamic;DynamicMetaObject;get_Value;();Argument[this];ReturnValue;taint;df-generated |
+| System.Dynamic;ConvertBinder;FallbackConvert;(System.Dynamic.DynamicMetaObject,System.Dynamic.DynamicMetaObject);Argument[1];ReturnValue;value;dfc-generated |
+| System.Dynamic;DynamicMetaObject;Create;(System.Object,System.Linq.Expressions.Expression);Argument[0];ReturnValue.SyntheticField[System.Dynamic.DynamicMetaObject._value];value;dfc-generated |
+| System.Dynamic;DynamicMetaObject;DynamicMetaObject;(System.Linq.Expressions.Expression,System.Dynamic.BindingRestrictions,System.Object);Argument[2];Argument[this].SyntheticField[System.Dynamic.DynamicMetaObject._value];value;dfc-generated |
+| System.Dynamic;DynamicMetaObject;get_Value;();Argument[this].SyntheticField[System.Dynamic.DynamicMetaObject._value];ReturnValue;value;dfc-generated |
 | System.Dynamic;ExpandoObject;Add;(System.Collections.Generic.KeyValuePair<System.String,System.Object>);Argument[0].Property[System.Collections.Generic.KeyValuePair`2.Key];Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Key];value;manual |
 | System.Dynamic;ExpandoObject;Add;(System.Collections.Generic.KeyValuePair<System.String,System.Object>);Argument[0].Property[System.Collections.Generic.KeyValuePair`2.Value];Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Value];value;manual |
 | System.Dynamic;ExpandoObject;Add;(System.Collections.Generic.KeyValuePair<System.String,System.Object>);Argument[0];Argument[this].Element;value;manual |
@@ -10362,56 +10837,36 @@ summary
 | System.Dynamic;ExpandoObject;remove_PropertyChanged;(System.ComponentModel.PropertyChangedEventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Dynamic;ExpandoObject;set_Item;(System.String,System.Object);Argument[0];Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Key];value;manual |
 | System.Dynamic;ExpandoObject;set_Item;(System.String,System.Object);Argument[1];Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Value];value;manual |
-| System.Dynamic;GetIndexBinder;FallbackGetIndex;(System.Dynamic.DynamicMetaObject,System.Dynamic.DynamicMetaObject[],System.Dynamic.DynamicMetaObject);Argument[2];ReturnValue;taint;df-generated |
-| System.Dynamic;GetMemberBinder;FallbackGetMember;(System.Dynamic.DynamicMetaObject,System.Dynamic.DynamicMetaObject);Argument[1];ReturnValue;taint;df-generated |
-| System.Dynamic;InvokeBinder;FallbackInvoke;(System.Dynamic.DynamicMetaObject,System.Dynamic.DynamicMetaObject[],System.Dynamic.DynamicMetaObject);Argument[2];ReturnValue;taint;df-generated |
-| System.Dynamic;InvokeMemberBinder;FallbackInvokeMember;(System.Dynamic.DynamicMetaObject,System.Dynamic.DynamicMetaObject[],System.Dynamic.DynamicMetaObject);Argument[2];ReturnValue;taint;df-generated |
-| System.Dynamic;SetIndexBinder;FallbackSetIndex;(System.Dynamic.DynamicMetaObject,System.Dynamic.DynamicMetaObject[],System.Dynamic.DynamicMetaObject,System.Dynamic.DynamicMetaObject);Argument[3];ReturnValue;taint;df-generated |
-| System.Dynamic;SetMemberBinder;FallbackSetMember;(System.Dynamic.DynamicMetaObject,System.Dynamic.DynamicMetaObject,System.Dynamic.DynamicMetaObject);Argument[2];ReturnValue;taint;df-generated |
-| System.Dynamic;UnaryOperationBinder;FallbackUnaryOperation;(System.Dynamic.DynamicMetaObject,System.Dynamic.DynamicMetaObject);Argument[1];ReturnValue;taint;df-generated |
-| System.Formats.Asn1;AsnDecoder;ReadBitString;(System.ReadOnlySpan<System.Byte>,System.Formats.Asn1.AsnEncodingRules,System.Int32,System.Int32,System.Nullable<System.Formats.Asn1.Asn1Tag>);Argument[0];ReturnValue;taint;df-generated |
-| System.Formats.Asn1;AsnDecoder;ReadEnumeratedBytes;(System.ReadOnlySpan<System.Byte>,System.Formats.Asn1.AsnEncodingRules,System.Int32,System.Nullable<System.Formats.Asn1.Asn1Tag>);Argument[0];ReturnValue;taint;df-generated |
-| System.Formats.Asn1;AsnDecoder;ReadIntegerBytes;(System.ReadOnlySpan<System.Byte>,System.Formats.Asn1.AsnEncodingRules,System.Int32,System.Nullable<System.Formats.Asn1.Asn1Tag>);Argument[0];ReturnValue;taint;df-generated |
-| System.Formats.Asn1;AsnDecoder;ReadOctetString;(System.ReadOnlySpan<System.Byte>,System.Formats.Asn1.AsnEncodingRules,System.Int32,System.Nullable<System.Formats.Asn1.Asn1Tag>);Argument[0];ReturnValue;taint;df-generated |
-| System.Formats.Asn1;AsnDecoder;TryReadBitString;(System.ReadOnlySpan<System.Byte>,System.Span<System.Byte>,System.Formats.Asn1.AsnEncodingRules,System.Int32,System.Int32,System.Int32,System.Nullable<System.Formats.Asn1.Asn1Tag>);Argument[0];Argument[1];taint;df-generated |
-| System.Formats.Asn1;AsnDecoder;TryReadCharacterStringBytes;(System.ReadOnlySpan<System.Byte>,System.Span<System.Byte>,System.Formats.Asn1.AsnEncodingRules,System.Formats.Asn1.Asn1Tag,System.Int32,System.Int32);Argument[0];Argument[1];taint;df-generated |
-| System.Formats.Asn1;AsnDecoder;TryReadOctetString;(System.ReadOnlySpan<System.Byte>,System.Span<System.Byte>,System.Formats.Asn1.AsnEncodingRules,System.Int32,System.Int32,System.Nullable<System.Formats.Asn1.Asn1Tag>);Argument[0];Argument[1];taint;df-generated |
-| System.Formats.Asn1;AsnDecoder;TryReadPrimitiveBitString;(System.ReadOnlySpan<System.Byte>,System.Formats.Asn1.AsnEncodingRules,System.Int32,System.ReadOnlySpan<System.Byte>,System.Int32,System.Nullable<System.Formats.Asn1.Asn1Tag>);Argument[0];ReturnValue;taint;df-generated |
-| System.Formats.Asn1;AsnDecoder;TryReadPrimitiveCharacterStringBytes;(System.ReadOnlySpan<System.Byte>,System.Formats.Asn1.AsnEncodingRules,System.Formats.Asn1.Asn1Tag,System.ReadOnlySpan<System.Byte>,System.Int32);Argument[0];ReturnValue;taint;df-generated |
-| System.Formats.Asn1;AsnDecoder;TryReadPrimitiveOctetString;(System.ReadOnlySpan<System.Byte>,System.Formats.Asn1.AsnEncodingRules,System.ReadOnlySpan<System.Byte>,System.Int32,System.Nullable<System.Formats.Asn1.Asn1Tag>);Argument[0];ReturnValue;taint;df-generated |
+| System.Dynamic;GetIndexBinder;FallbackGetIndex;(System.Dynamic.DynamicMetaObject,System.Dynamic.DynamicMetaObject[],System.Dynamic.DynamicMetaObject);Argument[2];ReturnValue;value;dfc-generated |
+| System.Dynamic;GetMemberBinder;FallbackGetMember;(System.Dynamic.DynamicMetaObject,System.Dynamic.DynamicMetaObject);Argument[1];ReturnValue;value;dfc-generated |
+| System.Dynamic;InvokeBinder;FallbackInvoke;(System.Dynamic.DynamicMetaObject,System.Dynamic.DynamicMetaObject[],System.Dynamic.DynamicMetaObject);Argument[2];ReturnValue;value;dfc-generated |
+| System.Dynamic;InvokeMemberBinder;FallbackInvokeMember;(System.Dynamic.DynamicMetaObject,System.Dynamic.DynamicMetaObject[],System.Dynamic.DynamicMetaObject);Argument[2];ReturnValue;value;dfc-generated |
+| System.Dynamic;SetIndexBinder;FallbackSetIndex;(System.Dynamic.DynamicMetaObject,System.Dynamic.DynamicMetaObject[],System.Dynamic.DynamicMetaObject,System.Dynamic.DynamicMetaObject);Argument[3];ReturnValue;value;dfc-generated |
+| System.Dynamic;SetMemberBinder;FallbackSetMember;(System.Dynamic.DynamicMetaObject,System.Dynamic.DynamicMetaObject,System.Dynamic.DynamicMetaObject);Argument[2];ReturnValue;value;dfc-generated |
+| System.Dynamic;UnaryOperationBinder;FallbackUnaryOperation;(System.Dynamic.DynamicMetaObject,System.Dynamic.DynamicMetaObject);Argument[1];ReturnValue;value;dfc-generated |
+| System.Formats.Asn1;AsnDecoder;ReadBitString;(System.ReadOnlySpan<System.Byte>,System.Formats.Asn1.AsnEncodingRules,System.Int32,System.Int32,System.Nullable<System.Formats.Asn1.Asn1Tag>);Argument[0].Element;ReturnValue.Element;value;dfc-generated |
+| System.Formats.Asn1;AsnDecoder;ReadEnumeratedBytes;(System.ReadOnlySpan<System.Byte>,System.Formats.Asn1.AsnEncodingRules,System.Int32,System.Nullable<System.Formats.Asn1.Asn1Tag>);Argument[0].Element;ReturnValue.Element;value;dfc-generated |
+| System.Formats.Asn1;AsnDecoder;ReadIntegerBytes;(System.ReadOnlySpan<System.Byte>,System.Formats.Asn1.AsnEncodingRules,System.Int32,System.Nullable<System.Formats.Asn1.Asn1Tag>);Argument[0].Element;ReturnValue.Element;value;dfc-generated |
+| System.Formats.Asn1;AsnDecoder;ReadOctetString;(System.ReadOnlySpan<System.Byte>,System.Formats.Asn1.AsnEncodingRules,System.Int32,System.Nullable<System.Formats.Asn1.Asn1Tag>);Argument[0].Element;ReturnValue.Element;value;dfc-generated |
+| System.Formats.Asn1;AsnDecoder;TryReadBitString;(System.ReadOnlySpan<System.Byte>,System.Span<System.Byte>,System.Formats.Asn1.AsnEncodingRules,System.Int32,System.Int32,System.Int32,System.Nullable<System.Formats.Asn1.Asn1Tag>);Argument[0].Element;Argument[1].Element;value;dfc-generated |
+| System.Formats.Asn1;AsnDecoder;TryReadCharacterStringBytes;(System.ReadOnlySpan<System.Byte>,System.Span<System.Byte>,System.Formats.Asn1.AsnEncodingRules,System.Formats.Asn1.Asn1Tag,System.Int32,System.Int32);Argument[0].Element;Argument[1].Element;value;dfc-generated |
+| System.Formats.Asn1;AsnDecoder;TryReadOctetString;(System.ReadOnlySpan<System.Byte>,System.Span<System.Byte>,System.Formats.Asn1.AsnEncodingRules,System.Int32,System.Int32,System.Nullable<System.Formats.Asn1.Asn1Tag>);Argument[0].Element;Argument[1].Element;value;dfc-generated |
+| System.Formats.Asn1;AsnDecoder;TryReadPrimitiveBitString;(System.ReadOnlySpan<System.Byte>,System.Formats.Asn1.AsnEncodingRules,System.Int32,System.ReadOnlySpan<System.Byte>,System.Int32,System.Nullable<System.Formats.Asn1.Asn1Tag>);Argument[0].Element;ReturnValue.Element;value;dfc-generated |
+| System.Formats.Asn1;AsnDecoder;TryReadPrimitiveCharacterStringBytes;(System.ReadOnlySpan<System.Byte>,System.Formats.Asn1.AsnEncodingRules,System.Formats.Asn1.Asn1Tag,System.ReadOnlySpan<System.Byte>,System.Int32);Argument[0].Element;ReturnValue.Element;value;dfc-generated |
+| System.Formats.Asn1;AsnDecoder;TryReadPrimitiveOctetString;(System.ReadOnlySpan<System.Byte>,System.Formats.Asn1.AsnEncodingRules,System.ReadOnlySpan<System.Byte>,System.Int32,System.Nullable<System.Formats.Asn1.Asn1Tag>);Argument[0].Element;ReturnValue.Element;value;dfc-generated |
 | System.Formats.Asn1;AsnReader;AsnReader;(System.ReadOnlyMemory<System.Byte>,System.Formats.Asn1.AsnEncodingRules,System.Formats.Asn1.AsnReaderOptions);Argument[0];Argument[this];taint;df-generated |
 | System.Formats.Asn1;AsnReader;AsnReader;(System.ReadOnlyMemory<System.Byte>,System.Formats.Asn1.AsnEncodingRules,System.Formats.Asn1.AsnReaderOptions);Argument[2];Argument[this];taint;df-generated |
-| System.Formats.Asn1;AsnReader;Clone;();Argument[this];ReturnValue;taint;df-generated |
-| System.Formats.Asn1;AsnReader;PeekContentBytes;();Argument[this];ReturnValue;taint;df-generated |
-| System.Formats.Asn1;AsnReader;PeekEncodedValue;();Argument[this];ReturnValue;taint;df-generated |
 | System.Formats.Asn1;AsnReader;ReadBitString;(System.Int32,System.Nullable<System.Formats.Asn1.Asn1Tag>);Argument[this];ReturnValue;taint;df-generated |
-| System.Formats.Asn1;AsnReader;ReadEncodedValue;();Argument[this];ReturnValue;taint;df-generated |
-| System.Formats.Asn1;AsnReader;ReadEnumeratedBytes;(System.Nullable<System.Formats.Asn1.Asn1Tag>);Argument[this];ReturnValue;taint;df-generated |
-| System.Formats.Asn1;AsnReader;ReadIntegerBytes;(System.Nullable<System.Formats.Asn1.Asn1Tag>);Argument[this];ReturnValue;taint;df-generated |
 | System.Formats.Asn1;AsnReader;ReadOctetString;(System.Nullable<System.Formats.Asn1.Asn1Tag>);Argument[this];ReturnValue;taint;df-generated |
-| System.Formats.Asn1;AsnReader;ReadSequence;(System.Nullable<System.Formats.Asn1.Asn1Tag>);Argument[this];ReturnValue;taint;df-generated |
-| System.Formats.Asn1;AsnReader;ReadSetOf;(System.Boolean,System.Nullable<System.Formats.Asn1.Asn1Tag>);Argument[this];ReturnValue;taint;df-generated |
-| System.Formats.Asn1;AsnReader;ReadSetOf;(System.Nullable<System.Formats.Asn1.Asn1Tag>);Argument[this];ReturnValue;taint;df-generated |
 | System.Formats.Asn1;AsnReader;TryReadBitString;(System.Span<System.Byte>,System.Int32,System.Int32,System.Nullable<System.Formats.Asn1.Asn1Tag>);Argument[this];Argument[0];taint;df-generated |
 | System.Formats.Asn1;AsnReader;TryReadCharacterStringBytes;(System.Span<System.Byte>,System.Formats.Asn1.Asn1Tag,System.Int32);Argument[this];Argument[0];taint;df-generated |
 | System.Formats.Asn1;AsnReader;TryReadOctetString;(System.Span<System.Byte>,System.Int32,System.Nullable<System.Formats.Asn1.Asn1Tag>);Argument[this];Argument[0];taint;df-generated |
-| System.Formats.Asn1;AsnReader;TryReadPrimitiveBitString;(System.Int32,System.ReadOnlyMemory<System.Byte>,System.Nullable<System.Formats.Asn1.Asn1Tag>);Argument[this];ReturnValue;taint;df-generated |
-| System.Formats.Asn1;AsnReader;TryReadPrimitiveCharacterStringBytes;(System.Formats.Asn1.Asn1Tag,System.ReadOnlyMemory<System.Byte>);Argument[this];ReturnValue;taint;df-generated |
-| System.Formats.Asn1;AsnReader;TryReadPrimitiveOctetString;(System.ReadOnlyMemory<System.Byte>,System.Nullable<System.Formats.Asn1.Asn1Tag>);Argument[this];ReturnValue;taint;df-generated |
-| System.Formats.Asn1;AsnWriter;Encode;();Argument[this];ReturnValue;taint;df-generated |
-| System.Formats.Asn1;AsnWriter;Encode;(System.Span<System.Byte>);Argument[this];Argument[0];taint;df-generated |
 | System.Formats.Asn1;AsnWriter;PushOctetString;(System.Nullable<System.Formats.Asn1.Asn1Tag>);Argument[this];ReturnValue;taint;df-generated |
 | System.Formats.Asn1;AsnWriter;PushSequence;(System.Nullable<System.Formats.Asn1.Asn1Tag>);Argument[this];ReturnValue;taint;df-generated |
 | System.Formats.Asn1;AsnWriter;PushSetOf;(System.Nullable<System.Formats.Asn1.Asn1Tag>);Argument[this];ReturnValue;taint;df-generated |
-| System.Formats.Asn1;AsnWriter;TryEncode;(System.Span<System.Byte>,System.Int32);Argument[this];Argument[0];taint;df-generated |
 | System.Formats.Tar;GnuTarEntry;GnuTarEntry;(System.Formats.Tar.TarEntry);Argument[0];Argument[this];taint;df-generated |
 | System.Formats.Tar;PaxTarEntry;PaxTarEntry;(System.Formats.Tar.TarEntry);Argument[0];Argument[this];taint;df-generated |
-| System.Formats.Tar;TarEntry;ExtractToFileAsync;(System.String,System.Boolean,System.Threading.CancellationToken);Argument[2];ReturnValue;taint;df-generated |
-| System.Formats.Tar;TarEntry;ToString;();Argument[this];ReturnValue;taint;df-generated |
-| System.Formats.Tar;TarFile;CreateFromDirectoryAsync;(System.String,System.IO.Stream,System.Boolean,System.Threading.CancellationToken);Argument[3];ReturnValue;taint;df-generated |
-| System.Formats.Tar;TarFile;CreateFromDirectoryAsync;(System.String,System.String,System.Boolean,System.Threading.CancellationToken);Argument[3];ReturnValue;taint;df-generated |
-| System.Formats.Tar;TarFile;ExtractToDirectoryAsync;(System.IO.Stream,System.String,System.Boolean,System.Threading.CancellationToken);Argument[3];ReturnValue;taint;df-generated |
-| System.Formats.Tar;TarFile;ExtractToDirectoryAsync;(System.String,System.String,System.Boolean,System.Threading.CancellationToken);Argument[3];ReturnValue;taint;df-generated |
+| System.Formats.Tar;TarEntry;ToString;();Argument[this].Property[System.Formats.Tar.TarEntry.Name];ReturnValue;value;dfc-generated |
 | System.Formats.Tar;TarReader;DisposeAsync;();Argument[this];ReturnValue;taint;df-generated |
 | System.Formats.Tar;TarReader;TarReader;(System.IO.Stream,System.Boolean);Argument[0];Argument[this];taint;df-generated |
 | System.Formats.Tar;TarWriter;DisposeAsync;();Argument[this];ReturnValue;taint;df-generated |
@@ -10419,22 +10874,16 @@ summary
 | System.Formats.Tar;TarWriter;WriteEntry;(System.Formats.Tar.TarEntry);Argument[0];Argument[this];taint;df-generated |
 | System.Formats.Tar;TarWriter;WriteEntry;(System.String,System.String);Argument[0];Argument[this];taint;df-generated |
 | System.Formats.Tar;TarWriter;WriteEntryAsync;(System.Formats.Tar.TarEntry,System.Threading.CancellationToken);Argument[0];Argument[this];taint;df-generated |
-| System.Formats.Tar;TarWriter;WriteEntryAsync;(System.Formats.Tar.TarEntry,System.Threading.CancellationToken);Argument[1];ReturnValue;taint;df-generated |
 | System.Formats.Tar;TarWriter;WriteEntryAsync;(System.String,System.String,System.Threading.CancellationToken);Argument[0];Argument[this];taint;df-generated |
-| System.Formats.Tar;TarWriter;WriteEntryAsync;(System.String,System.String,System.Threading.CancellationToken);Argument[2];ReturnValue;taint;df-generated |
 | System.Formats.Tar;UstarTarEntry;UstarTarEntry;(System.Formats.Tar.TarEntry);Argument[0];Argument[this];taint;df-generated |
-| System.Globalization;Calendar;Clone;();Argument[this];ReturnValue;taint;df-generated |
-| System.Globalization;Calendar;Clone;();Argument[this];ReturnValue;value;df-generated |
-| System.Globalization;Calendar;ReadOnly;(System.Globalization.Calendar);Argument[0];ReturnValue;taint;df-generated |
-| System.Globalization;CompareInfo;GetSortKey;(System.String);Argument[0];ReturnValue;taint;df-generated |
-| System.Globalization;CompareInfo;GetSortKey;(System.String);Argument[this];ReturnValue;taint;df-generated |
-| System.Globalization;CompareInfo;GetSortKey;(System.String,System.Globalization.CompareOptions);Argument[0];ReturnValue;taint;df-generated |
-| System.Globalization;CompareInfo;GetSortKey;(System.String,System.Globalization.CompareOptions);Argument[this];ReturnValue;taint;df-generated |
-| System.Globalization;CompareInfo;ToString;();Argument[this];ReturnValue;taint;df-generated |
+| System.Globalization;Calendar;Clone;();Argument[this];ReturnValue;value;dfc-generated |
+| System.Globalization;Calendar;ReadOnly;(System.Globalization.Calendar);Argument[0];ReturnValue;value;dfc-generated |
+| System.Globalization;CompareInfo;GetSortKey;(System.String);Argument[0];ReturnValue.SyntheticField[System.Globalization.SortKey._string];value;dfc-generated |
+| System.Globalization;CompareInfo;GetSortKey;(System.String,System.Globalization.CompareOptions);Argument[0];ReturnValue.SyntheticField[System.Globalization.SortKey._string];value;dfc-generated |
+| System.Globalization;CompareInfo;ToString;();Argument[this].Property[System.Globalization.CompareInfo.Name];ReturnValue;taint;dfc-generated |
 | System.Globalization;CompareInfo;get_Name;();Argument[this];ReturnValue;taint;df-generated |
 | System.Globalization;CompareInfo;get_Version;();Argument[this];ReturnValue;taint;df-generated |
-| System.Globalization;CultureInfo;Clone;();Argument[this];ReturnValue;taint;df-generated |
-| System.Globalization;CultureInfo;Clone;();Argument[this];ReturnValue;value;df-generated |
+| System.Globalization;CultureInfo;Clone;();Argument[this];ReturnValue;value;dfc-generated |
 | System.Globalization;CultureInfo;CultureInfo;(System.String,System.Boolean);Argument[0];Argument[this];taint;df-generated |
 | System.Globalization;CultureInfo;GetConsoleFallbackUICulture;();Argument[this];ReturnValue;taint;df-generated |
 | System.Globalization;CultureInfo;GetCultureInfo;(System.String);Argument[0];ReturnValue;taint;df-generated |
@@ -10442,56 +10891,59 @@ summary
 | System.Globalization;CultureInfo;GetCultureInfo;(System.String,System.String);Argument[0];ReturnValue;taint;df-generated |
 | System.Globalization;CultureInfo;GetCultureInfo;(System.String,System.String);Argument[1];ReturnValue;taint;df-generated |
 | System.Globalization;CultureInfo;GetCultureInfoByIetfLanguageTag;(System.String);Argument[0];ReturnValue;taint;df-generated |
-| System.Globalization;CultureInfo;GetFormat;(System.Type);Argument[this];ReturnValue;taint;df-generated |
+| System.Globalization;CultureInfo;GetFormat;(System.Type);Argument[this];ReturnValue;value;dfc-generated |
 | System.Globalization;CultureInfo;ReadOnly;(System.Globalization.CultureInfo);Argument[0];ReturnValue;taint;df-generated |
 | System.Globalization;CultureInfo;ToString;();Argument[this];ReturnValue;taint;df-generated |
 | System.Globalization;CultureInfo;get_Calendar;();Argument[this];ReturnValue;taint;df-generated |
 | System.Globalization;CultureInfo;get_DisplayName;();Argument[this];ReturnValue;taint;df-generated |
 | System.Globalization;CultureInfo;get_EnglishName;();Argument[this];ReturnValue;taint;df-generated |
-| System.Globalization;CultureInfo;get_IetfLanguageTag;();Argument[this];ReturnValue;taint;df-generated |
+| System.Globalization;CultureInfo;get_IetfLanguageTag;();Argument[this].Property[System.Globalization.CultureInfo.Name];ReturnValue;value;dfc-generated |
 | System.Globalization;CultureInfo;get_NativeName;();Argument[this];ReturnValue;taint;df-generated |
 | System.Globalization;CultureInfo;get_Parent;();Argument[this];ReturnValue;taint;df-generated |
 | System.Globalization;CultureInfo;get_TextInfo;();Argument[this];ReturnValue;taint;df-generated |
 | System.Globalization;CultureInfo;get_ThreeLetterISOLanguageName;();Argument[this];ReturnValue;taint;df-generated |
 | System.Globalization;CultureInfo;get_ThreeLetterWindowsLanguageName;();Argument[this];ReturnValue;taint;df-generated |
 | System.Globalization;CultureInfo;get_TwoLetterISOLanguageName;();Argument[this];ReturnValue;taint;df-generated |
-| System.Globalization;CultureNotFoundException;CultureNotFoundException;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);Argument[0];Argument[this];taint;df-generated |
-| System.Globalization;CultureNotFoundException;CultureNotFoundException;(System.String,System.String,System.Exception);Argument[1];Argument[this];taint;df-generated |
-| System.Globalization;CultureNotFoundException;CultureNotFoundException;(System.String,System.String,System.String);Argument[1];Argument[this];taint;df-generated |
+| System.Globalization;CultureNotFoundException;CultureNotFoundException;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);Argument[0].SyntheticField[System.Runtime.Serialization.SerializationInfo._values].Element;Argument[this].SyntheticField[System.Globalization.CultureNotFoundException._invalidCultureId];value;dfc-generated |
+| System.Globalization;CultureNotFoundException;CultureNotFoundException;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);Argument[0].SyntheticField[System.Runtime.Serialization.SerializationInfo._values].Element;Argument[this].SyntheticField[System.Globalization.CultureNotFoundException._invalidCultureName];value;dfc-generated |
+| System.Globalization;CultureNotFoundException;CultureNotFoundException;(System.String,System.String,System.Exception);Argument[1];Argument[this].SyntheticField[System.Globalization.CultureNotFoundException._invalidCultureName];value;dfc-generated |
+| System.Globalization;CultureNotFoundException;CultureNotFoundException;(System.String,System.String,System.String);Argument[1];Argument[this].SyntheticField[System.Globalization.CultureNotFoundException._invalidCultureName];value;dfc-generated |
 | System.Globalization;CultureNotFoundException;GetObjectData;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);Argument[this];Argument[0];taint;df-generated |
-| System.Globalization;CultureNotFoundException;get_InvalidCultureId;();Argument[this];ReturnValue;taint;df-generated |
-| System.Globalization;CultureNotFoundException;get_InvalidCultureName;();Argument[this];ReturnValue;taint;df-generated |
-| System.Globalization;CultureNotFoundException;get_Message;();Argument[this];ReturnValue;taint;df-generated |
-| System.Globalization;DateTimeFormatInfo;Clone;();Argument[this];ReturnValue;taint;df-generated |
-| System.Globalization;DateTimeFormatInfo;Clone;();Argument[this];ReturnValue;value;df-generated |
+| System.Globalization;CultureNotFoundException;get_InvalidCultureId;();Argument[this].SyntheticField[System.Globalization.CultureNotFoundException._invalidCultureId];ReturnValue;value;dfc-generated |
+| System.Globalization;CultureNotFoundException;get_InvalidCultureName;();Argument[this].SyntheticField[System.Globalization.CultureNotFoundException._invalidCultureName];ReturnValue;value;dfc-generated |
+| System.Globalization;CultureNotFoundException;get_Message;();Argument[this].Property[System.Exception.Message];ReturnValue;value;dfc-generated |
+| System.Globalization;CultureNotFoundException;get_Message;();Argument[this].SyntheticField[System.ArgumentException._paramName];ReturnValue;taint;dfc-generated |
+| System.Globalization;CultureNotFoundException;get_Message;();Argument[this].SyntheticField[System.Exception._message];ReturnValue;value;dfc-generated |
+| System.Globalization;DateTimeFormatInfo;Clone;();Argument[this];ReturnValue;value;dfc-generated |
 | System.Globalization;DateTimeFormatInfo;GetAbbreviatedDayName;(System.DayOfWeek);Argument[this];ReturnValue;taint;df-generated |
 | System.Globalization;DateTimeFormatInfo;GetAbbreviatedEraName;(System.Int32);Argument[this];ReturnValue;taint;df-generated |
 | System.Globalization;DateTimeFormatInfo;GetAbbreviatedMonthName;(System.Int32);Argument[this];ReturnValue;taint;df-generated |
 | System.Globalization;DateTimeFormatInfo;GetAllDateTimePatterns;(System.Char);Argument[this];ReturnValue;taint;df-generated |
 | System.Globalization;DateTimeFormatInfo;GetDayName;(System.DayOfWeek);Argument[this];ReturnValue;taint;df-generated |
 | System.Globalization;DateTimeFormatInfo;GetEraName;(System.Int32);Argument[this];ReturnValue;taint;df-generated |
-| System.Globalization;DateTimeFormatInfo;GetFormat;(System.Type);Argument[this];ReturnValue;taint;df-generated |
-| System.Globalization;DateTimeFormatInfo;GetInstance;(System.IFormatProvider);Argument[0];ReturnValue;taint;df-generated |
+| System.Globalization;DateTimeFormatInfo;GetFormat;(System.Type);Argument[this];ReturnValue;value;dfc-generated |
+| System.Globalization;DateTimeFormatInfo;GetInstance;(System.IFormatProvider);Argument[0].Property[System.Globalization.CultureInfo.DateTimeFormat];ReturnValue;value;dfc-generated |
+| System.Globalization;DateTimeFormatInfo;GetInstance;(System.IFormatProvider);Argument[0];ReturnValue;value;dfc-generated |
 | System.Globalization;DateTimeFormatInfo;GetMonthName;(System.Int32);Argument[this];ReturnValue;taint;df-generated |
 | System.Globalization;DateTimeFormatInfo;GetShortestDayName;(System.DayOfWeek);Argument[this];ReturnValue;taint;df-generated |
-| System.Globalization;DateTimeFormatInfo;ReadOnly;(System.Globalization.DateTimeFormatInfo);Argument[0];ReturnValue;taint;df-generated |
+| System.Globalization;DateTimeFormatInfo;ReadOnly;(System.Globalization.DateTimeFormatInfo);Argument[0];ReturnValue;value;dfc-generated |
 | System.Globalization;DateTimeFormatInfo;SetAllDateTimePatterns;(System.String[],System.Char);Argument[0].Element;Argument[this];taint;df-generated |
-| System.Globalization;DaylightTime;DaylightTime;(System.DateTime,System.DateTime,System.TimeSpan);Argument[2];Argument[this];taint;df-generated |
-| System.Globalization;DaylightTime;get_Delta;();Argument[this];ReturnValue;taint;df-generated |
-| System.Globalization;GlobalizationExtensions;GetStringComparer;(System.Globalization.CompareInfo,System.Globalization.CompareOptions);Argument[0];ReturnValue;taint;df-generated |
-| System.Globalization;IdnMapping;GetAscii;(System.String);Argument[0];ReturnValue;taint;df-generated |
-| System.Globalization;IdnMapping;GetAscii;(System.String,System.Int32);Argument[0];ReturnValue;taint;df-generated |
-| System.Globalization;IdnMapping;GetAscii;(System.String,System.Int32,System.Int32);Argument[0];ReturnValue;taint;df-generated |
-| System.Globalization;IdnMapping;GetUnicode;(System.String);Argument[0];ReturnValue;taint;df-generated |
-| System.Globalization;IdnMapping;GetUnicode;(System.String,System.Int32);Argument[0];ReturnValue;taint;df-generated |
-| System.Globalization;IdnMapping;GetUnicode;(System.String,System.Int32,System.Int32);Argument[0];ReturnValue;taint;df-generated |
-| System.Globalization;NumberFormatInfo;Clone;();Argument[this];ReturnValue;taint;df-generated |
-| System.Globalization;NumberFormatInfo;Clone;();Argument[this];ReturnValue;value;df-generated |
-| System.Globalization;NumberFormatInfo;GetFormat;(System.Type);Argument[this];ReturnValue;taint;df-generated |
-| System.Globalization;NumberFormatInfo;GetInstance;(System.IFormatProvider);Argument[0];ReturnValue;taint;df-generated |
-| System.Globalization;NumberFormatInfo;ReadOnly;(System.Globalization.NumberFormatInfo);Argument[0];ReturnValue;taint;df-generated |
+| System.Globalization;DaylightTime;DaylightTime;(System.DateTime,System.DateTime,System.TimeSpan);Argument[2];Argument[this].SyntheticField[System.Globalization.DaylightTime._delta];value;dfc-generated |
+| System.Globalization;DaylightTime;get_Delta;();Argument[this].SyntheticField[System.Globalization.DaylightTime._delta];ReturnValue;value;dfc-generated |
+| System.Globalization;GlobalizationExtensions;GetStringComparer;(System.Globalization.CompareInfo,System.Globalization.CompareOptions);Argument[0];ReturnValue.SyntheticField[System.CultureAwareComparer._compareInfo];value;dfc-generated |
+| System.Globalization;IdnMapping;GetAscii;(System.String);Argument[0];ReturnValue;value;dfc-generated |
+| System.Globalization;IdnMapping;GetAscii;(System.String,System.Int32);Argument[0];ReturnValue;value;dfc-generated |
+| System.Globalization;IdnMapping;GetAscii;(System.String,System.Int32,System.Int32);Argument[0];ReturnValue;value;dfc-generated |
+| System.Globalization;IdnMapping;GetUnicode;(System.String);Argument[0];ReturnValue;value;dfc-generated |
+| System.Globalization;IdnMapping;GetUnicode;(System.String,System.Int32);Argument[0];ReturnValue;value;dfc-generated |
+| System.Globalization;IdnMapping;GetUnicode;(System.String,System.Int32,System.Int32);Argument[0];ReturnValue;value;dfc-generated |
+| System.Globalization;NumberFormatInfo;Clone;();Argument[this];ReturnValue;value;dfc-generated |
+| System.Globalization;NumberFormatInfo;GetFormat;(System.Type);Argument[this];ReturnValue;value;dfc-generated |
+| System.Globalization;NumberFormatInfo;GetInstance;(System.IFormatProvider);Argument[0].Property[System.Globalization.CultureInfo.NumberFormat];ReturnValue;value;dfc-generated |
+| System.Globalization;NumberFormatInfo;GetInstance;(System.IFormatProvider);Argument[0];ReturnValue;value;dfc-generated |
+| System.Globalization;NumberFormatInfo;ReadOnly;(System.Globalization.NumberFormatInfo);Argument[0];ReturnValue;value;dfc-generated |
 | System.Globalization;RegionInfo;RegionInfo;(System.String);Argument[0];Argument[this];taint;df-generated |
-| System.Globalization;RegionInfo;ToString;();Argument[this];ReturnValue;taint;df-generated |
+| System.Globalization;RegionInfo;ToString;();Argument[this].Property[System.Globalization.RegionInfo.Name];ReturnValue;value;dfc-generated |
 | System.Globalization;RegionInfo;get_CurrencyEnglishName;();Argument[this];ReturnValue;taint;df-generated |
 | System.Globalization;RegionInfo;get_CurrencyNativeName;();Argument[this];ReturnValue;taint;df-generated |
 | System.Globalization;RegionInfo;get_CurrencySymbol;();Argument[this];ReturnValue;taint;df-generated |
@@ -10501,38 +10953,43 @@ summary
 | System.Globalization;RegionInfo;get_Name;();Argument[this];ReturnValue;taint;df-generated |
 | System.Globalization;RegionInfo;get_NativeName;();Argument[this];ReturnValue;taint;df-generated |
 | System.Globalization;RegionInfo;get_ThreeLetterISORegionName;();Argument[this];ReturnValue;taint;df-generated |
-| System.Globalization;RegionInfo;get_ThreeLetterWindowsRegionName;();Argument[this];ReturnValue;taint;df-generated |
+| System.Globalization;RegionInfo;get_ThreeLetterWindowsRegionName;();Argument[this].Property[System.Globalization.RegionInfo.ThreeLetterISORegionName];ReturnValue;value;dfc-generated |
 | System.Globalization;RegionInfo;get_TwoLetterISORegionName;();Argument[this];ReturnValue;taint;df-generated |
 | System.Globalization;SortKey;ToString;();Argument[this];ReturnValue;taint;df-generated |
 | System.Globalization;SortKey;get_KeyData;();Argument[this];ReturnValue;taint;df-generated |
-| System.Globalization;SortKey;get_OriginalString;();Argument[this];ReturnValue;taint;df-generated |
-| System.Globalization;SortVersion;SortVersion;(System.Int32,System.Guid);Argument[1];Argument[this];taint;df-generated |
-| System.Globalization;SortVersion;get_SortId;();Argument[this];ReturnValue;taint;df-generated |
-| System.Globalization;StringInfo;GetNextTextElement;(System.String);Argument[0];ReturnValue;taint;df-generated |
-| System.Globalization;StringInfo;GetNextTextElement;(System.String,System.Int32);Argument[0];ReturnValue;taint;df-generated |
-| System.Globalization;StringInfo;GetTextElementEnumerator;(System.String);Argument[0];ReturnValue;taint;df-generated |
-| System.Globalization;StringInfo;GetTextElementEnumerator;(System.String,System.Int32);Argument[0];ReturnValue;taint;df-generated |
+| System.Globalization;SortKey;get_OriginalString;();Argument[this].SyntheticField[System.Globalization.SortKey._string];ReturnValue;value;dfc-generated |
+| System.Globalization;SortVersion;SortVersion;(System.Int32,System.Guid);Argument[1];Argument[this].SyntheticField[System.Globalization.SortVersion.m_SortId];value;dfc-generated |
+| System.Globalization;SortVersion;get_SortId;();Argument[this].SyntheticField[System.Globalization.SortVersion.m_SortId];ReturnValue;value;dfc-generated |
+| System.Globalization;StringInfo;GetNextTextElement;(System.String);Argument[0];ReturnValue;value;dfc-generated |
+| System.Globalization;StringInfo;GetNextTextElement;(System.String,System.Int32);Argument[0];ReturnValue;value;dfc-generated |
+| System.Globalization;StringInfo;GetTextElementEnumerator;(System.String);Argument[0];ReturnValue.SyntheticField[System.Globalization.TextElementEnumerator._str];value;dfc-generated |
+| System.Globalization;StringInfo;GetTextElementEnumerator;(System.String,System.Int32);Argument[0];ReturnValue.SyntheticField[System.Globalization.TextElementEnumerator._str];value;dfc-generated |
 | System.Globalization;StringInfo;StringInfo;(System.String);Argument[0];Argument[this];taint;df-generated |
 | System.Globalization;StringInfo;SubstringByTextElements;(System.Int32);Argument[this];ReturnValue;taint;df-generated |
 | System.Globalization;StringInfo;SubstringByTextElements;(System.Int32,System.Int32);Argument[this];ReturnValue;taint;df-generated |
-| System.Globalization;TextElementEnumerator;GetTextElement;();Argument[this];ReturnValue;taint;df-generated |
+| System.Globalization;TextElementEnumerator;GetTextElement;();Argument[this].SyntheticField[System.Globalization.TextElementEnumerator._currentTextElementSubstr];ReturnValue;value;dfc-generated |
+| System.Globalization;TextElementEnumerator;GetTextElement;();Argument[this].SyntheticField[System.Globalization.TextElementEnumerator._str];Argument[this].SyntheticField[System.Globalization.TextElementEnumerator._currentTextElementSubstr];value;dfc-generated |
+| System.Globalization;TextElementEnumerator;GetTextElement;();Argument[this].SyntheticField[System.Globalization.TextElementEnumerator._str];ReturnValue;value;dfc-generated |
+| System.Globalization;TextElementEnumerator;get_Current;();Argument[this].SyntheticField[System.Globalization.TextElementEnumerator._currentTextElementSubstr];ReturnValue;value;df-generated |
+| System.Globalization;TextElementEnumerator;get_Current;();Argument[this].SyntheticField[System.Globalization.TextElementEnumerator._currentTextElementSubstr];ReturnValue;value;dfc-generated |
+| System.Globalization;TextElementEnumerator;get_Current;();Argument[this].SyntheticField[System.Globalization.TextElementEnumerator._str];ReturnValue;value;df-generated |
+| System.Globalization;TextElementEnumerator;get_Current;();Argument[this].SyntheticField[System.Globalization.TextElementEnumerator._str];ReturnValue;value;dfc-generated |
 | System.Globalization;TextElementEnumerator;get_Current;();Argument[this];ReturnValue;taint;df-generated |
-| System.Globalization;TextInfo;Clone;();Argument[this];ReturnValue;taint;df-generated |
-| System.Globalization;TextInfo;Clone;();Argument[this];ReturnValue;value;df-generated |
-| System.Globalization;TextInfo;ReadOnly;(System.Globalization.TextInfo);Argument[0];ReturnValue;taint;df-generated |
-| System.Globalization;TextInfo;ToLower;(System.String);Argument[0];ReturnValue;taint;df-generated |
+| System.Globalization;TextElementEnumerator;get_Current;();Argument[this];ReturnValue;taint;dfc-generated |
+| System.Globalization;TextInfo;Clone;();Argument[this];ReturnValue;value;dfc-generated |
+| System.Globalization;TextInfo;ReadOnly;(System.Globalization.TextInfo);Argument[0];ReturnValue;value;dfc-generated |
+| System.Globalization;TextInfo;ToLower;(System.String);Argument[0];ReturnValue;value;dfc-generated |
 | System.Globalization;TextInfo;ToString;();Argument[this];ReturnValue;taint;df-generated |
-| System.Globalization;TextInfo;ToTitleCase;(System.String);Argument[0];ReturnValue;taint;df-generated |
-| System.Globalization;TextInfo;ToUpper;(System.String);Argument[0];ReturnValue;taint;df-generated |
+| System.Globalization;TextInfo;ToTitleCase;(System.String);Argument[0];ReturnValue;value;dfc-generated |
+| System.Globalization;TextInfo;ToUpper;(System.String);Argument[0];ReturnValue;value;dfc-generated |
 | System.Globalization;TextInfo;get_CultureName;();Argument[this];ReturnValue;taint;df-generated |
 | System.IO.Compression;BrotliStream;BeginRead;(System.Byte[],System.Int32,System.Int32,System.AsyncCallback,System.Object);Argument[3];Argument[3].Parameter[delegate-self];value;manual |
 | System.IO.Compression;BrotliStream;BeginRead;(System.Byte[],System.Int32,System.Int32,System.AsyncCallback,System.Object);Argument[this];Argument[0].Element;taint;manual |
 | System.IO.Compression;BrotliStream;BeginWrite;(System.Byte[],System.Int32,System.Int32,System.AsyncCallback,System.Object);Argument[0].Element;Argument[this];taint;manual |
 | System.IO.Compression;BrotliStream;BeginWrite;(System.Byte[],System.Int32,System.Int32,System.AsyncCallback,System.Object);Argument[3];Argument[3].Parameter[delegate-self];value;manual |
-| System.IO.Compression;BrotliStream;BrotliStream;(System.IO.Stream,System.IO.Compression.CompressionMode,System.Boolean);Argument[0];Argument[this];taint;df-generated |
+| System.IO.Compression;BrotliStream;BrotliStream;(System.IO.Stream,System.IO.Compression.CompressionMode,System.Boolean);Argument[0];Argument[this].SyntheticField[System.IO.Compression.BrotliStream._stream];value;dfc-generated |
 | System.IO.Compression;BrotliStream;DisposeAsync;();Argument[this];ReturnValue;taint;df-generated |
-| System.IO.Compression;BrotliStream;FlushAsync;(System.Threading.CancellationToken);Argument[0];ReturnValue;taint;df-generated |
-| System.IO.Compression;BrotliStream;FlushAsync;(System.Threading.CancellationToken);Argument[this];ReturnValue;taint;df-generated |
+| System.IO.Compression;BrotliStream;FlushAsync;(System.Threading.CancellationToken);Argument[this];ReturnValue.SyntheticField[System.Threading.Tasks.Task.m_stateObject];value;dfc-generated |
 | System.IO.Compression;BrotliStream;Read;(System.Byte[],System.Int32,System.Int32);Argument[this];Argument[0].Element;taint;manual |
 | System.IO.Compression;BrotliStream;Read;(System.Span<System.Byte>);Argument[this];Argument[0].Element;taint;manual |
 | System.IO.Compression;BrotliStream;ReadAsync;(System.Byte[],System.Int32,System.Int32,System.Threading.CancellationToken);Argument[this];Argument[0].Element;taint;manual |
@@ -10542,7 +10999,7 @@ summary
 | System.IO.Compression;BrotliStream;WriteAsync;(System.ReadOnlyMemory<System.Byte>,System.Threading.CancellationToken);Argument[0];ReturnValue;taint;df-generated |
 | System.IO.Compression;BrotliStream;WriteAsync;(System.ReadOnlyMemory<System.Byte>,System.Threading.CancellationToken);Argument[1];ReturnValue;taint;df-generated |
 | System.IO.Compression;BrotliStream;WriteAsync;(System.ReadOnlyMemory<System.Byte>,System.Threading.CancellationToken);Argument[this];ReturnValue;taint;df-generated |
-| System.IO.Compression;BrotliStream;get_BaseStream;();Argument[this];ReturnValue;taint;df-generated |
+| System.IO.Compression;BrotliStream;get_BaseStream;();Argument[this].SyntheticField[System.IO.Compression.BrotliStream._stream];ReturnValue;value;dfc-generated |
 | System.IO.Compression;DeflateStream;BeginRead;(System.Byte[],System.Int32,System.Int32,System.AsyncCallback,System.Object);Argument[3];Argument[3].Parameter[delegate-self];value;manual |
 | System.IO.Compression;DeflateStream;BeginRead;(System.Byte[],System.Int32,System.Int32,System.AsyncCallback,System.Object);Argument[this];Argument[0].Element;taint;manual |
 | System.IO.Compression;DeflateStream;BeginWrite;(System.Byte[],System.Int32,System.Int32,System.AsyncCallback,System.Object);Argument[0].Element;Argument[this];taint;manual |
@@ -10554,8 +11011,7 @@ summary
 | System.IO.Compression;DeflateStream;DeflateStream;(System.IO.Stream,System.IO.Compression.CompressionMode);Argument[0];Argument[this];taint;manual |
 | System.IO.Compression;DeflateStream;DeflateStream;(System.IO.Stream,System.IO.Compression.CompressionMode,System.Boolean);Argument[0];Argument[this];taint;manual |
 | System.IO.Compression;DeflateStream;DisposeAsync;();Argument[this];ReturnValue;taint;df-generated |
-| System.IO.Compression;DeflateStream;FlushAsync;(System.Threading.CancellationToken);Argument[0];ReturnValue;taint;df-generated |
-| System.IO.Compression;DeflateStream;FlushAsync;(System.Threading.CancellationToken);Argument[this];ReturnValue;taint;df-generated |
+| System.IO.Compression;DeflateStream;FlushAsync;(System.Threading.CancellationToken);Argument[this];ReturnValue.SyntheticField[System.Threading.Tasks.Task.m_stateObject];value;dfc-generated |
 | System.IO.Compression;DeflateStream;Read;(System.Byte[],System.Int32,System.Int32);Argument[this];Argument[0].Element;taint;manual |
 | System.IO.Compression;DeflateStream;Read;(System.Span<System.Byte>);Argument[this];Argument[0].Element;taint;manual |
 | System.IO.Compression;DeflateStream;ReadAsync;(System.Byte[],System.Int32,System.Int32,System.Threading.CancellationToken);Argument[this];Argument[0].Element;taint;manual |
@@ -10573,10 +11029,9 @@ summary
 | System.IO.Compression;GZipStream;CopyTo;(System.IO.Stream,System.Int32);Argument[this];Argument[0];taint;manual |
 | System.IO.Compression;GZipStream;CopyToAsync;(System.IO.Stream,System.Int32,System.Threading.CancellationToken);Argument[this];Argument[0];taint;manual |
 | System.IO.Compression;GZipStream;DisposeAsync;();Argument[this];ReturnValue;taint;df-generated |
-| System.IO.Compression;GZipStream;FlushAsync;(System.Threading.CancellationToken);Argument[0];ReturnValue;taint;df-generated |
-| System.IO.Compression;GZipStream;FlushAsync;(System.Threading.CancellationToken);Argument[this];ReturnValue;taint;df-generated |
-| System.IO.Compression;GZipStream;GZipStream;(System.IO.Stream,System.IO.Compression.CompressionLevel,System.Boolean);Argument[0];Argument[this];taint;df-generated |
-| System.IO.Compression;GZipStream;GZipStream;(System.IO.Stream,System.IO.Compression.CompressionMode,System.Boolean);Argument[0];Argument[this];taint;df-generated |
+| System.IO.Compression;GZipStream;FlushAsync;(System.Threading.CancellationToken);Argument[this];ReturnValue.SyntheticField[System.Threading.Tasks.Task.m_stateObject];value;dfc-generated |
+| System.IO.Compression;GZipStream;GZipStream;(System.IO.Stream,System.IO.Compression.CompressionLevel,System.Boolean);Argument[0];Argument[this].SyntheticField[System.IO.Compression.GZipStream._deflateStream].SyntheticField[System.IO.Compression.DeflateStream._stream];value;dfc-generated |
+| System.IO.Compression;GZipStream;GZipStream;(System.IO.Stream,System.IO.Compression.CompressionMode,System.Boolean);Argument[0];Argument[this].SyntheticField[System.IO.Compression.GZipStream._deflateStream].SyntheticField[System.IO.Compression.DeflateStream._stream];value;dfc-generated |
 | System.IO.Compression;GZipStream;Read;(System.Byte[],System.Int32,System.Int32);Argument[this];Argument[0].Element;taint;manual |
 | System.IO.Compression;GZipStream;Read;(System.Span<System.Byte>);Argument[this];Argument[0].Element;taint;manual |
 | System.IO.Compression;GZipStream;ReadAsync;(System.Byte[],System.Int32,System.Int32,System.Threading.CancellationToken);Argument[this];Argument[0].Element;taint;manual |
@@ -10586,7 +11041,7 @@ summary
 | System.IO.Compression;GZipStream;WriteAsync;(System.ReadOnlyMemory<System.Byte>,System.Threading.CancellationToken);Argument[0];ReturnValue;taint;df-generated |
 | System.IO.Compression;GZipStream;WriteAsync;(System.ReadOnlyMemory<System.Byte>,System.Threading.CancellationToken);Argument[1];ReturnValue;taint;df-generated |
 | System.IO.Compression;GZipStream;WriteAsync;(System.ReadOnlyMemory<System.Byte>,System.Threading.CancellationToken);Argument[this];ReturnValue;taint;df-generated |
-| System.IO.Compression;GZipStream;get_BaseStream;();Argument[this];ReturnValue;taint;df-generated |
+| System.IO.Compression;GZipStream;get_BaseStream;();Argument[this].SyntheticField[System.IO.Compression.GZipStream._deflateStream].SyntheticField[System.IO.Compression.DeflateStream._stream];ReturnValue;value;dfc-generated |
 | System.IO.Compression;ZLibStream;BeginRead;(System.Byte[],System.Int32,System.Int32,System.AsyncCallback,System.Object);Argument[3];Argument[3].Parameter[delegate-self];value;manual |
 | System.IO.Compression;ZLibStream;BeginRead;(System.Byte[],System.Int32,System.Int32,System.AsyncCallback,System.Object);Argument[this];Argument[0].Element;taint;manual |
 | System.IO.Compression;ZLibStream;BeginWrite;(System.Byte[],System.Int32,System.Int32,System.AsyncCallback,System.Object);Argument[0].Element;Argument[this];taint;manual |
@@ -10594,8 +11049,7 @@ summary
 | System.IO.Compression;ZLibStream;CopyTo;(System.IO.Stream,System.Int32);Argument[this];Argument[0];taint;manual |
 | System.IO.Compression;ZLibStream;CopyToAsync;(System.IO.Stream,System.Int32,System.Threading.CancellationToken);Argument[this];Argument[0];taint;manual |
 | System.IO.Compression;ZLibStream;DisposeAsync;();Argument[this];ReturnValue;taint;df-generated |
-| System.IO.Compression;ZLibStream;FlushAsync;(System.Threading.CancellationToken);Argument[0];ReturnValue;taint;df-generated |
-| System.IO.Compression;ZLibStream;FlushAsync;(System.Threading.CancellationToken);Argument[this];ReturnValue;taint;df-generated |
+| System.IO.Compression;ZLibStream;FlushAsync;(System.Threading.CancellationToken);Argument[this];ReturnValue.SyntheticField[System.Threading.Tasks.Task.m_stateObject];value;dfc-generated |
 | System.IO.Compression;ZLibStream;Read;(System.Byte[],System.Int32,System.Int32);Argument[this];Argument[0].Element;taint;manual |
 | System.IO.Compression;ZLibStream;Read;(System.Span<System.Byte>);Argument[this];Argument[0].Element;taint;manual |
 | System.IO.Compression;ZLibStream;ReadAsync;(System.Byte[],System.Int32,System.Int32,System.Threading.CancellationToken);Argument[this];Argument[0].Element;taint;manual |
@@ -10605,28 +11059,22 @@ summary
 | System.IO.Compression;ZLibStream;WriteAsync;(System.ReadOnlyMemory<System.Byte>,System.Threading.CancellationToken);Argument[0];ReturnValue;taint;df-generated |
 | System.IO.Compression;ZLibStream;WriteAsync;(System.ReadOnlyMemory<System.Byte>,System.Threading.CancellationToken);Argument[1];ReturnValue;taint;df-generated |
 | System.IO.Compression;ZLibStream;WriteAsync;(System.ReadOnlyMemory<System.Byte>,System.Threading.CancellationToken);Argument[this];ReturnValue;taint;df-generated |
-| System.IO.Compression;ZLibStream;ZLibStream;(System.IO.Stream,System.IO.Compression.CompressionLevel,System.Boolean);Argument[0];Argument[this];taint;df-generated |
-| System.IO.Compression;ZLibStream;ZLibStream;(System.IO.Stream,System.IO.Compression.CompressionMode,System.Boolean);Argument[0];Argument[this];taint;df-generated |
-| System.IO.Compression;ZLibStream;get_BaseStream;();Argument[this];ReturnValue;taint;df-generated |
-| System.IO.Compression;ZipArchive;CreateEntry;(System.String);Argument[0];ReturnValue;taint;df-generated |
-| System.IO.Compression;ZipArchive;CreateEntry;(System.String);Argument[this];ReturnValue;taint;df-generated |
-| System.IO.Compression;ZipArchive;CreateEntry;(System.String,System.IO.Compression.CompressionLevel);Argument[0];ReturnValue;taint;df-generated |
-| System.IO.Compression;ZipArchive;CreateEntry;(System.String,System.IO.Compression.CompressionLevel);Argument[this];ReturnValue;taint;df-generated |
+| System.IO.Compression;ZLibStream;ZLibStream;(System.IO.Stream,System.IO.Compression.CompressionLevel,System.Boolean);Argument[0];Argument[this].SyntheticField[System.IO.Compression.ZLibStream._deflateStream].SyntheticField[System.IO.Compression.DeflateStream._stream];value;dfc-generated |
+| System.IO.Compression;ZLibStream;ZLibStream;(System.IO.Stream,System.IO.Compression.CompressionMode,System.Boolean);Argument[0];Argument[this].SyntheticField[System.IO.Compression.ZLibStream._deflateStream].SyntheticField[System.IO.Compression.DeflateStream._stream];value;dfc-generated |
+| System.IO.Compression;ZLibStream;get_BaseStream;();Argument[this].SyntheticField[System.IO.Compression.ZLibStream._deflateStream].SyntheticField[System.IO.Compression.DeflateStream._stream];ReturnValue;value;dfc-generated |
+| System.IO.Compression;ZipArchive;CreateEntry;(System.String);Argument[0];ReturnValue.SyntheticField[System.IO.Compression.ZipArchiveEntry._storedEntryName];value;dfc-generated |
+| System.IO.Compression;ZipArchive;CreateEntry;(System.String);Argument[this];ReturnValue.SyntheticField[System.IO.Compression.ZipArchiveEntry._archive];value;dfc-generated |
+| System.IO.Compression;ZipArchive;CreateEntry;(System.String,System.IO.Compression.CompressionLevel);Argument[0];ReturnValue.SyntheticField[System.IO.Compression.ZipArchiveEntry._storedEntryName];value;dfc-generated |
+| System.IO.Compression;ZipArchive;CreateEntry;(System.String,System.IO.Compression.CompressionLevel);Argument[this];ReturnValue.SyntheticField[System.IO.Compression.ZipArchiveEntry._archive];value;dfc-generated |
 | System.IO.Compression;ZipArchive;ZipArchive;(System.IO.Stream,System.IO.Compression.ZipArchiveMode,System.Boolean,System.Text.Encoding);Argument[0];Argument[this];taint;df-generated |
 | System.IO.Compression;ZipArchive;ZipArchive;(System.IO.Stream,System.IO.Compression.ZipArchiveMode,System.Boolean,System.Text.Encoding);Argument[3];Argument[this];taint;df-generated |
 | System.IO.Compression;ZipArchive;get_Entries;();Argument[this];ReturnValue;taint;df-generated |
 | System.IO.Compression;ZipArchiveEntry;Open;();Argument[this];ReturnValue;taint;df-generated |
-| System.IO.Compression;ZipArchiveEntry;ToString;();Argument[this];ReturnValue;taint;df-generated |
-| System.IO.Compression;ZipArchiveEntry;get_Archive;();Argument[this];ReturnValue;taint;df-generated |
-| System.IO.Compression;ZipArchiveEntry;get_Name;();Argument[this];ReturnValue;taint;df-generated |
-| System.IO.Compression;ZipFile;Open;(System.String,System.IO.Compression.ZipArchiveMode);Argument[0];ReturnValue;taint;df-generated |
-| System.IO.Compression;ZipFile;Open;(System.String,System.IO.Compression.ZipArchiveMode,System.Text.Encoding);Argument[0];ReturnValue;taint;df-generated |
-| System.IO.Compression;ZipFile;Open;(System.String,System.IO.Compression.ZipArchiveMode,System.Text.Encoding);Argument[2];ReturnValue;taint;df-generated |
-| System.IO.Compression;ZipFile;OpenRead;(System.String);Argument[0];ReturnValue;taint;df-generated |
-| System.IO.Compression;ZipFileExtensions;CreateEntryFromFile;(System.IO.Compression.ZipArchive,System.String,System.String);Argument[0];ReturnValue;taint;df-generated |
-| System.IO.Compression;ZipFileExtensions;CreateEntryFromFile;(System.IO.Compression.ZipArchive,System.String,System.String);Argument[2];ReturnValue;taint;df-generated |
-| System.IO.Compression;ZipFileExtensions;CreateEntryFromFile;(System.IO.Compression.ZipArchive,System.String,System.String,System.IO.Compression.CompressionLevel);Argument[0];ReturnValue;taint;df-generated |
-| System.IO.Compression;ZipFileExtensions;CreateEntryFromFile;(System.IO.Compression.ZipArchive,System.String,System.String,System.IO.Compression.CompressionLevel);Argument[2];ReturnValue;taint;df-generated |
+| System.IO.Compression;ZipArchiveEntry;ToString;();Argument[this].Property[System.IO.Compression.ZipArchiveEntry.FullName];ReturnValue;value;dfc-generated |
+| System.IO.Compression;ZipArchiveEntry;ToString;();Argument[this].SyntheticField[System.IO.Compression.ZipArchiveEntry._storedEntryName];ReturnValue;value;dfc-generated |
+| System.IO.Compression;ZipArchiveEntry;get_Archive;();Argument[this].SyntheticField[System.IO.Compression.ZipArchiveEntry._archive];ReturnValue;value;dfc-generated |
+| System.IO.Compression;ZipArchiveEntry;get_Name;();Argument[this].Property[System.IO.Compression.ZipArchiveEntry.FullName];ReturnValue;value;dfc-generated |
+| System.IO.Compression;ZipArchiveEntry;get_Name;();Argument[this].SyntheticField[System.IO.Compression.ZipArchiveEntry._storedEntryName];ReturnValue;value;dfc-generated |
 | System.IO.Enumeration;FileSystemEntry;ToFileSystemInfo;();Argument[this];ReturnValue;taint;df-generated |
 | System.IO.Enumeration;FileSystemEntry;ToSpecifiedFullPath;();Argument[this];ReturnValue;taint;df-generated |
 | System.IO.Enumeration;FileSystemEntry;get_FileName;();Argument[this];ReturnValue;taint;df-generated |
@@ -10637,8 +11085,13 @@ summary
 | System.IO.Enumeration;FileSystemEnumerable<TResult>;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.IEnumerator.Current];value;manual |
 | System.IO.Enumeration;FileSystemEnumerable<TResult>;set_ShouldIncludePredicate;(System.IO.Enumeration.FileSystemEnumerable<TResult>+FindPredicate);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.IO.Enumeration;FileSystemEnumerable<TResult>;set_ShouldRecursePredicate;(System.IO.Enumeration.FileSystemEnumerable<TResult>+FindPredicate);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
+| System.IO.Enumeration;FileSystemEnumerator<TResult>;ShouldIncludeEntry;(System.IO.Enumeration.FileSystemEntry);Argument[0];ReturnValue;value;dfc-generated |
+| System.IO.Enumeration;FileSystemEnumerator<TResult>;ShouldRecurseIntoEntry;(System.IO.Enumeration.FileSystemEntry);Argument[0];ReturnValue;value;dfc-generated |
+| System.IO.Enumeration;FileSystemEnumerator<TResult>;get_Current;();Argument[this].Property[System.IO.Enumeration.FileSystemEnumerator`1.Current];ReturnValue;value;df-generated |
+| System.IO.Enumeration;FileSystemEnumerator<TResult>;get_Current;();Argument[this].Property[System.IO.Enumeration.FileSystemEnumerator`1.Current];ReturnValue;value;dfc-generated |
 | System.IO.Enumeration;FileSystemEnumerator<TResult>;get_Current;();Argument[this];ReturnValue;taint;df-generated |
-| System.IO.Enumeration;FileSystemName;TranslateWin32Expression;(System.String);Argument[0];ReturnValue;taint;df-generated |
+| System.IO.Enumeration;FileSystemEnumerator<TResult>;get_Current;();Argument[this];ReturnValue;taint;dfc-generated |
+| System.IO.Enumeration;FileSystemName;TranslateWin32Expression;(System.String);Argument[0];ReturnValue;value;dfc-generated |
 | System.IO.IsolatedStorage;IsolatedStorage;get_ApplicationIdentity;();Argument[this];ReturnValue;taint;df-generated |
 | System.IO.IsolatedStorage;IsolatedStorage;get_AssemblyIdentity;();Argument[this];ReturnValue;taint;df-generated |
 | System.IO.IsolatedStorage;IsolatedStorage;get_DomainIdentity;();Argument[this];ReturnValue;taint;df-generated |
@@ -10647,8 +11100,8 @@ summary
 | System.IO.IsolatedStorage;IsolatedStorageFileStream;BeginWrite;(System.Byte[],System.Int32,System.Int32,System.AsyncCallback,System.Object);Argument[0].Element;Argument[this];taint;manual |
 | System.IO.IsolatedStorage;IsolatedStorageFileStream;BeginWrite;(System.Byte[],System.Int32,System.Int32,System.AsyncCallback,System.Object);Argument[3];Argument[3].Parameter[delegate-self];value;manual |
 | System.IO.IsolatedStorage;IsolatedStorageFileStream;DisposeAsync;();Argument[this];ReturnValue;taint;df-generated |
-| System.IO.IsolatedStorage;IsolatedStorageFileStream;FlushAsync;(System.Threading.CancellationToken);Argument[0];ReturnValue;taint;df-generated |
-| System.IO.IsolatedStorage;IsolatedStorageFileStream;FlushAsync;(System.Threading.CancellationToken);Argument[this];ReturnValue;taint;df-generated |
+| System.IO.IsolatedStorage;IsolatedStorageFileStream;FlushAsync;(System.Threading.CancellationToken);Argument[this].SyntheticField[System.IO.FileStream._strategy].SyntheticField[System.IO.Strategies.DerivedFileStreamStrategy._fileStream];ReturnValue.SyntheticField[System.Threading.Tasks.Task.m_stateObject];value;dfc-generated |
+| System.IO.IsolatedStorage;IsolatedStorageFileStream;FlushAsync;(System.Threading.CancellationToken);Argument[this];ReturnValue.SyntheticField[System.Threading.Tasks.Task.m_stateObject];value;dfc-generated |
 | System.IO.IsolatedStorage;IsolatedStorageFileStream;Read;(System.Byte[],System.Int32,System.Int32);Argument[this];Argument[0].Element;taint;manual |
 | System.IO.IsolatedStorage;IsolatedStorageFileStream;Read;(System.Span<System.Byte>);Argument[this];Argument[0].Element;taint;manual |
 | System.IO.IsolatedStorage;IsolatedStorageFileStream;ReadAsync;(System.Byte[],System.Int32,System.Int32,System.Threading.CancellationToken);Argument[this];Argument[0].Element;taint;manual |
@@ -10662,69 +11115,44 @@ summary
 | System.IO.IsolatedStorage;IsolatedStorageFileStream;get_SafeFileHandle;();Argument[this];ReturnValue;taint;df-generated |
 | System.IO.MemoryMappedFiles;MemoryMappedFile;CreateFromFile;(Microsoft.Win32.SafeHandles.SafeFileHandle,System.String,System.Int64,System.IO.MemoryMappedFiles.MemoryMappedFileAccess,System.IO.HandleInheritability,System.Boolean);Argument[0];ReturnValue;taint;df-generated |
 | System.IO.MemoryMappedFiles;MemoryMappedFile;CreateFromFile;(System.IO.FileStream,System.String,System.Int64,System.IO.MemoryMappedFiles.MemoryMappedFileAccess,System.IO.HandleInheritability,System.Boolean);Argument[0];ReturnValue;taint;df-generated |
-| System.IO.MemoryMappedFiles;MemoryMappedFile;CreateFromFile;(System.String);Argument[0];ReturnValue;taint;df-generated |
-| System.IO.MemoryMappedFiles;MemoryMappedFile;CreateFromFile;(System.String,System.IO.FileMode);Argument[0];ReturnValue;taint;df-generated |
-| System.IO.MemoryMappedFiles;MemoryMappedFile;CreateFromFile;(System.String,System.IO.FileMode,System.String);Argument[0];ReturnValue;taint;df-generated |
-| System.IO.MemoryMappedFiles;MemoryMappedFile;CreateFromFile;(System.String,System.IO.FileMode,System.String,System.Int64);Argument[0];ReturnValue;taint;df-generated |
-| System.IO.MemoryMappedFiles;MemoryMappedFile;CreateFromFile;(System.String,System.IO.FileMode,System.String,System.Int64,System.IO.MemoryMappedFiles.MemoryMappedFileAccess);Argument[0];ReturnValue;taint;df-generated |
 | System.IO.MemoryMappedFiles;MemoryMappedFile;get_SafeMemoryMappedFileHandle;();Argument[this];ReturnValue;taint;df-generated |
 | System.IO.MemoryMappedFiles;MemoryMappedViewAccessor;get_SafeMemoryMappedViewHandle;();Argument[this];ReturnValue;taint;df-generated |
 | System.IO.MemoryMappedFiles;MemoryMappedViewStream;get_SafeMemoryMappedViewHandle;();Argument[this];ReturnValue;taint;df-generated |
 | System.IO.Pipelines;Pipe;Pipe;(System.IO.Pipelines.PipeOptions);Argument[0];Argument[this];taint;df-generated |
 | System.IO.Pipelines;Pipe;get_Reader;();Argument[this];ReturnValue;taint;df-generated |
 | System.IO.Pipelines;Pipe;get_Writer;();Argument[this];ReturnValue;taint;df-generated |
-| System.IO.Pipelines;PipeReader;AdvanceTo;(System.SequencePosition);Argument[0];Argument[this];taint;df-generated |
-| System.IO.Pipelines;PipeReader;AdvanceTo;(System.SequencePosition,System.SequencePosition);Argument[0];Argument[this];taint;df-generated |
 | System.IO.Pipelines;PipeReader;AsStream;(System.Boolean);Argument[this];ReturnValue;taint;df-generated |
-| System.IO.Pipelines;PipeReader;CompleteAsync;(System.Exception);Argument[this];ReturnValue;taint;df-generated |
-| System.IO.Pipelines;PipeReader;CopyToAsync;(System.IO.Pipelines.PipeWriter,System.Threading.CancellationToken);Argument[1];ReturnValue;taint;df-generated |
-| System.IO.Pipelines;PipeReader;CopyToAsync;(System.IO.Stream,System.Threading.CancellationToken);Argument[1];ReturnValue;taint;df-generated |
 | System.IO.Pipelines;PipeReader;CopyToAsync;(System.IO.Stream,System.Threading.CancellationToken);Argument[this];Argument[0];taint;df-generated |
 | System.IO.Pipelines;PipeReader;Create;(System.Buffers.ReadOnlySequence<System.Byte>);Argument[0];ReturnValue;taint;df-generated |
 | System.IO.Pipelines;PipeReader;Create;(System.IO.Stream,System.IO.Pipelines.StreamPipeReaderOptions);Argument[0];ReturnValue;taint;df-generated |
 | System.IO.Pipelines;PipeReader;Create;(System.IO.Stream,System.IO.Pipelines.StreamPipeReaderOptions);Argument[1];ReturnValue;taint;df-generated |
 | System.IO.Pipelines;PipeReader;OnWriterCompleted;(System.Action<System.Exception,System.Object>,System.Object);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
-| System.IO.Pipelines;PipeReader;ReadAsync;(System.Threading.CancellationToken);Argument[this];ReturnValue;taint;df-generated |
-| System.IO.Pipelines;PipeReader;ReadAtLeastAsync;(System.Int32,System.Threading.CancellationToken);Argument[this];ReturnValue;taint;df-generated |
-| System.IO.Pipelines;PipeReader;ReadAtLeastAsyncCore;(System.Int32,System.Threading.CancellationToken);Argument[this];ReturnValue;taint;df-generated |
-| System.IO.Pipelines;PipeReader;TryRead;(System.IO.Pipelines.ReadResult);Argument[this];ReturnValue;taint;df-generated |
+| System.IO.Pipelines;PipeScheduler;Schedule;(System.Action<System.Object>,System.Object);Argument[0];Argument[0].Parameter[delegate-self];value;dfc-generated |
 | System.IO.Pipelines;PipeScheduler;Schedule;(System.Action<System.Object>,System.Object);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
+| System.IO.Pipelines;PipeScheduler;Schedule;(System.Action<System.Object>,System.Object);Argument[1];Argument[0].Parameter[0];value;dfc-generated |
+| System.IO.Pipelines;PipeScheduler;Schedule;(System.Action<System.Object>,System.Object);Argument[1];Argument[0].Parameter[0];value;hq-generated |
 | System.IO.Pipelines;PipeWriter;AsStream;(System.Boolean);Argument[this];ReturnValue;taint;df-generated |
 | System.IO.Pipelines;PipeWriter;Create;(System.IO.Stream,System.IO.Pipelines.StreamPipeWriterOptions);Argument[0];ReturnValue;taint;df-generated |
 | System.IO.Pipelines;PipeWriter;Create;(System.IO.Stream,System.IO.Pipelines.StreamPipeWriterOptions);Argument[1];ReturnValue;taint;df-generated |
-| System.IO.Pipelines;PipeWriter;FlushAsync;(System.Threading.CancellationToken);Argument[this];ReturnValue;taint;df-generated |
 | System.IO.Pipelines;PipeWriter;GetMemory;(System.Int32);Argument[this];ReturnValue;taint;df-generated |
 | System.IO.Pipelines;PipeWriter;GetSpan;(System.Int32);Argument[this];ReturnValue;taint;df-generated |
 | System.IO.Pipelines;PipeWriter;OnReaderCompleted;(System.Action<System.Exception,System.Object>,System.Object);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
-| System.IO.Pipelines;PipeWriter;WriteAsync;(System.ReadOnlyMemory<System.Byte>,System.Threading.CancellationToken);Argument[this];ReturnValue;taint;df-generated |
-| System.IO.Pipelines;ReadResult;ReadResult;(System.Buffers.ReadOnlySequence<System.Byte>,System.Boolean,System.Boolean);Argument[0];Argument[this];taint;df-generated |
-| System.IO.Pipelines;ReadResult;get_Buffer;();Argument[this];ReturnValue;taint;df-generated |
-| System.IO.Pipelines;StreamPipeExtensions;CopyToAsync;(System.IO.Stream,System.IO.Pipelines.PipeWriter,System.Threading.CancellationToken);Argument[2];ReturnValue;taint;df-generated |
+| System.IO.Pipelines;ReadResult;ReadResult;(System.Buffers.ReadOnlySequence<System.Byte>,System.Boolean,System.Boolean);Argument[0];Argument[this].SyntheticField[System.IO.Pipelines.ReadResult._resultBuffer];value;dfc-generated |
+| System.IO.Pipelines;ReadResult;get_Buffer;();Argument[this].SyntheticField[System.IO.Pipelines.ReadResult._resultBuffer];ReturnValue;value;dfc-generated |
 | System.IO.Pipes;AnonymousPipeClientStream;AnonymousPipeClientStream;(System.IO.Pipes.PipeDirection,Microsoft.Win32.SafeHandles.SafePipeHandle);Argument[1];Argument[this];taint;df-generated |
-| System.IO.Pipes;AnonymousPipeServerStream;AnonymousPipeServerStream;(System.IO.Pipes.PipeDirection,Microsoft.Win32.SafeHandles.SafePipeHandle,Microsoft.Win32.SafeHandles.SafePipeHandle);Argument[1];Argument[this];taint;df-generated |
-| System.IO.Pipes;AnonymousPipeServerStream;AnonymousPipeServerStream;(System.IO.Pipes.PipeDirection,Microsoft.Win32.SafeHandles.SafePipeHandle,Microsoft.Win32.SafeHandles.SafePipeHandle);Argument[2];Argument[this];taint;df-generated |
-| System.IO.Pipes;AnonymousPipeServerStream;get_ClientSafePipeHandle;();Argument[this];ReturnValue;taint;df-generated |
-| System.IO.Pipes;NamedPipeClientStream;ConnectAsync;();Argument[this];ReturnValue;taint;df-generated |
-| System.IO.Pipes;NamedPipeClientStream;ConnectAsync;(System.Int32);Argument[this];ReturnValue;taint;df-generated |
-| System.IO.Pipes;NamedPipeClientStream;ConnectAsync;(System.Int32,System.Threading.CancellationToken);Argument[1];ReturnValue;taint;df-generated |
-| System.IO.Pipes;NamedPipeClientStream;ConnectAsync;(System.Int32,System.Threading.CancellationToken);Argument[this];ReturnValue;taint;df-generated |
-| System.IO.Pipes;NamedPipeClientStream;ConnectAsync;(System.Threading.CancellationToken);Argument[0];ReturnValue;taint;df-generated |
-| System.IO.Pipes;NamedPipeClientStream;ConnectAsync;(System.Threading.CancellationToken);Argument[this];ReturnValue;taint;df-generated |
-| System.IO.Pipes;NamedPipeClientStream;ConnectAsync;(System.TimeSpan,System.Threading.CancellationToken);Argument[1];ReturnValue;taint;df-generated |
-| System.IO.Pipes;NamedPipeClientStream;ConnectAsync;(System.TimeSpan,System.Threading.CancellationToken);Argument[this];ReturnValue;taint;df-generated |
+| System.IO.Pipes;AnonymousPipeServerStream;AnonymousPipeServerStream;(System.IO.Pipes.PipeDirection,Microsoft.Win32.SafeHandles.SafePipeHandle,Microsoft.Win32.SafeHandles.SafePipeHandle);Argument[2];Argument[this].SyntheticField[System.IO.Pipes.AnonymousPipeServerStream._clientHandle];value;dfc-generated |
+| System.IO.Pipes;AnonymousPipeServerStream;get_ClientSafePipeHandle;();Argument[this].SyntheticField[System.IO.Pipes.AnonymousPipeServerStream._clientHandle];ReturnValue;value;dfc-generated |
 | System.IO.Pipes;NamedPipeClientStream;NamedPipeClientStream;(System.IO.Pipes.PipeDirection,System.Boolean,System.Boolean,Microsoft.Win32.SafeHandles.SafePipeHandle);Argument[3];Argument[this];taint;df-generated |
 | System.IO.Pipes;NamedPipeClientStream;NamedPipeClientStream;(System.String,System.String,System.IO.Pipes.PipeDirection,System.IO.Pipes.PipeOptions,System.Security.Principal.TokenImpersonationLevel,System.IO.HandleInheritability);Argument[1];Argument[this];taint;df-generated |
 | System.IO.Pipes;NamedPipeServerStream;BeginWaitForConnection;(System.AsyncCallback,System.Object);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.IO.Pipes;NamedPipeServerStream;NamedPipeServerStream;(System.IO.Pipes.PipeDirection,System.Boolean,System.Boolean,Microsoft.Win32.SafeHandles.SafePipeHandle);Argument[3];Argument[this];taint;df-generated |
 | System.IO.Pipes;NamedPipeServerStream;RunAsClient;(System.IO.Pipes.PipeStreamImpersonationWorker);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
-| System.IO.Pipes;NamedPipeServerStream;WaitForConnectionAsync;(System.Threading.CancellationToken);Argument[0];ReturnValue;taint;df-generated |
 | System.IO.Pipes;PipeStream;BeginRead;(System.Byte[],System.Int32,System.Int32,System.AsyncCallback,System.Object);Argument[3];Argument[3].Parameter[delegate-self];value;manual |
 | System.IO.Pipes;PipeStream;BeginRead;(System.Byte[],System.Int32,System.Int32,System.AsyncCallback,System.Object);Argument[this];Argument[0].Element;taint;manual |
 | System.IO.Pipes;PipeStream;BeginWrite;(System.Byte[],System.Int32,System.Int32,System.AsyncCallback,System.Object);Argument[0].Element;Argument[this];taint;manual |
 | System.IO.Pipes;PipeStream;BeginWrite;(System.Byte[],System.Int32,System.Int32,System.AsyncCallback,System.Object);Argument[3];Argument[3].Parameter[delegate-self];value;manual |
-| System.IO.Pipes;PipeStream;FlushAsync;(System.Threading.CancellationToken);Argument[0];ReturnValue;taint;df-generated |
-| System.IO.Pipes;PipeStream;FlushAsync;(System.Threading.CancellationToken);Argument[this];ReturnValue;taint;df-generated |
-| System.IO.Pipes;PipeStream;InitializeHandle;(Microsoft.Win32.SafeHandles.SafePipeHandle,System.Boolean,System.Boolean);Argument[0];Argument[this];taint;df-generated |
+| System.IO.Pipes;PipeStream;FlushAsync;(System.Threading.CancellationToken);Argument[this];ReturnValue.SyntheticField[System.Threading.Tasks.Task.m_stateObject];value;dfc-generated |
+| System.IO.Pipes;PipeStream;InitializeHandle;(Microsoft.Win32.SafeHandles.SafePipeHandle,System.Boolean,System.Boolean);Argument[0];Argument[this].SyntheticField[System.IO.Pipes.PipeStream._handle];value;dfc-generated |
 | System.IO.Pipes;PipeStream;Read;(System.Byte[],System.Int32,System.Int32);Argument[this];Argument[0].Element;taint;manual |
 | System.IO.Pipes;PipeStream;Read;(System.Span<System.Byte>);Argument[this];Argument[0].Element;taint;manual |
 | System.IO.Pipes;PipeStream;ReadAsync;(System.Byte[],System.Int32,System.Int32,System.Threading.CancellationToken);Argument[this];Argument[0].Element;taint;manual |
@@ -10734,20 +11162,18 @@ summary
 | System.IO.Pipes;PipeStream;WriteAsync;(System.ReadOnlyMemory<System.Byte>,System.Threading.CancellationToken);Argument[0];ReturnValue;taint;df-generated |
 | System.IO.Pipes;PipeStream;WriteAsync;(System.ReadOnlyMemory<System.Byte>,System.Threading.CancellationToken);Argument[1];ReturnValue;taint;df-generated |
 | System.IO.Pipes;PipeStream;WriteAsync;(System.ReadOnlyMemory<System.Byte>,System.Threading.CancellationToken);Argument[this];ReturnValue;taint;df-generated |
-| System.IO.Pipes;PipeStream;get_SafePipeHandle;();Argument[this];ReturnValue;taint;df-generated |
+| System.IO.Pipes;PipeStream;get_SafePipeHandle;();Argument[this].SyntheticField[System.IO.Pipes.PipeStream._handle];ReturnValue;value;dfc-generated |
 | System.IO.Pipes;PipeStreamImpersonationWorker;BeginInvoke;(System.AsyncCallback,System.Object);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
-| System.IO;BinaryReader;BinaryReader;(System.IO.Stream,System.Text.Encoding,System.Boolean);Argument[0];Argument[this];taint;df-generated |
-| System.IO;BinaryReader;BinaryReader;(System.IO.Stream,System.Text.Encoding,System.Boolean);Argument[1];Argument[this];taint;df-generated |
+| System.IO;BinaryReader;BinaryReader;(System.IO.Stream,System.Text.Encoding,System.Boolean);Argument[0];Argument[this].SyntheticField[System.IO.BinaryReader._stream];value;dfc-generated |
 | System.IO;BinaryReader;Read;(System.Byte[],System.Int32,System.Int32);Argument[this];Argument[0].Element;taint;df-generated |
 | System.IO;BinaryReader;Read;(System.Span<System.Byte>);Argument[this];Argument[0];taint;df-generated |
 | System.IO;BinaryReader;ReadString;();Argument[this];ReturnValue;taint;df-generated |
-| System.IO;BinaryReader;get_BaseStream;();Argument[this];ReturnValue;taint;df-generated |
-| System.IO;BinaryWriter;BinaryWriter;(System.IO.Stream,System.Text.Encoding,System.Boolean);Argument[0];Argument[this];taint;df-generated |
-| System.IO;BinaryWriter;BinaryWriter;(System.IO.Stream,System.Text.Encoding,System.Boolean);Argument[1];Argument[this];taint;df-generated |
+| System.IO;BinaryReader;get_BaseStream;();Argument[this].SyntheticField[System.IO.BinaryReader._stream];ReturnValue;value;dfc-generated |
+| System.IO;BinaryWriter;BinaryWriter;(System.IO.Stream,System.Text.Encoding,System.Boolean);Argument[0];Argument[this].Field[System.IO.BinaryWriter.OutStream];value;dfc-generated |
 | System.IO;BinaryWriter;DisposeAsync;();Argument[this];ReturnValue;taint;df-generated |
 | System.IO;BinaryWriter;Write;(System.Byte[]);Argument[0].Element;Argument[this];taint;df-generated |
 | System.IO;BinaryWriter;Write;(System.Byte[],System.Int32,System.Int32);Argument[0].Element;Argument[this];taint;df-generated |
-| System.IO;BinaryWriter;get_BaseStream;();Argument[this];ReturnValue;taint;df-generated |
+| System.IO;BinaryWriter;get_BaseStream;();Argument[this].Field[System.IO.BinaryWriter.OutStream];ReturnValue;value;dfc-generated |
 | System.IO;BufferedStream;BeginRead;(System.Byte[],System.Int32,System.Int32,System.AsyncCallback,System.Object);Argument[3];Argument[3].Parameter[delegate-self];value;manual |
 | System.IO;BufferedStream;BeginRead;(System.Byte[],System.Int32,System.Int32,System.AsyncCallback,System.Object);Argument[this];Argument[0].Element;taint;manual |
 | System.IO;BufferedStream;BeginWrite;(System.Byte[],System.Int32,System.Int32,System.AsyncCallback,System.Object);Argument[0].Element;Argument[this];taint;manual |
@@ -10757,8 +11183,7 @@ summary
 | System.IO;BufferedStream;CopyTo;(System.IO.Stream,System.Int32);Argument[this];Argument[0];taint;manual |
 | System.IO;BufferedStream;CopyToAsync;(System.IO.Stream,System.Int32,System.Threading.CancellationToken);Argument[this];Argument[0];taint;manual |
 | System.IO;BufferedStream;DisposeAsync;();Argument[this];ReturnValue;taint;df-generated |
-| System.IO;BufferedStream;FlushAsync;(System.Threading.CancellationToken);Argument[0];ReturnValue;taint;df-generated |
-| System.IO;BufferedStream;FlushAsync;(System.Threading.CancellationToken);Argument[this];ReturnValue;taint;df-generated |
+| System.IO;BufferedStream;FlushAsync;(System.Threading.CancellationToken);Argument[this];ReturnValue.SyntheticField[System.Threading.Tasks.Task.m_stateObject];value;dfc-generated |
 | System.IO;BufferedStream;Read;(System.Byte[],System.Int32,System.Int32);Argument[this];Argument[0].Element;taint;manual |
 | System.IO;BufferedStream;Read;(System.Span<System.Byte>);Argument[this];Argument[0].Element;taint;manual |
 | System.IO;BufferedStream;ReadAsync;(System.Byte[],System.Int32,System.Int32,System.Threading.CancellationToken);Argument[this];Argument[0].Element;taint;manual |
@@ -10769,13 +11194,20 @@ summary
 | System.IO;BufferedStream;WriteAsync;(System.ReadOnlyMemory<System.Byte>,System.Threading.CancellationToken);Argument[1];ReturnValue;taint;df-generated |
 | System.IO;BufferedStream;WriteAsync;(System.ReadOnlyMemory<System.Byte>,System.Threading.CancellationToken);Argument[this];ReturnValue;taint;df-generated |
 | System.IO;BufferedStream;get_UnderlyingStream;();Argument[this];ReturnValue;taint;df-generated |
-| System.IO;Directory;CreateDirectory;(System.String);Argument[0];ReturnValue;taint;df-generated |
-| System.IO;Directory;CreateDirectory;(System.String,System.IO.UnixFileMode);Argument[0];ReturnValue;taint;df-generated |
-| System.IO;Directory;CreateSymbolicLink;(System.String,System.String);Argument[0];ReturnValue;taint;df-generated |
-| System.IO;Directory;GetParent;(System.String);Argument[0];ReturnValue;taint;df-generated |
-| System.IO;DirectoryInfo;CreateSubdirectory;(System.String);Argument[0];ReturnValue;taint;df-generated |
-| System.IO;DirectoryInfo;CreateSubdirectory;(System.String);Argument[this];ReturnValue;taint;df-generated |
-| System.IO;DirectoryInfo;DirectoryInfo;(System.String);Argument[0];Argument[this];taint;df-generated |
+| System.IO;Directory;CreateDirectory;(System.String);Argument[0];ReturnValue.Field[System.IO.FileSystemInfo.FullPath];value;dfc-generated |
+| System.IO;Directory;CreateDirectory;(System.String);Argument[0];ReturnValue.Field[System.IO.FileSystemInfo.OriginalPath];value;dfc-generated |
+| System.IO;Directory;CreateDirectory;(System.String,System.IO.UnixFileMode);Argument[0];ReturnValue.Field[System.IO.FileSystemInfo.FullPath];value;dfc-generated |
+| System.IO;Directory;CreateDirectory;(System.String,System.IO.UnixFileMode);Argument[0];ReturnValue.Field[System.IO.FileSystemInfo.OriginalPath];value;dfc-generated |
+| System.IO;Directory;CreateSymbolicLink;(System.String,System.String);Argument[0];ReturnValue.Field[System.IO.FileSystemInfo.FullPath];value;dfc-generated |
+| System.IO;Directory;CreateSymbolicLink;(System.String,System.String);Argument[0];ReturnValue.Field[System.IO.FileSystemInfo.OriginalPath];value;dfc-generated |
+| System.IO;Directory;GetParent;(System.String);Argument[0];ReturnValue.Field[System.IO.FileSystemInfo.FullPath];value;dfc-generated |
+| System.IO;Directory;GetParent;(System.String);Argument[0];ReturnValue.Field[System.IO.FileSystemInfo.OriginalPath];value;dfc-generated |
+| System.IO;DirectoryInfo;CreateSubdirectory;(System.String);Argument[0];ReturnValue.Field[System.IO.FileSystemInfo.FullPath];value;dfc-generated |
+| System.IO;DirectoryInfo;CreateSubdirectory;(System.String);Argument[0];ReturnValue.Field[System.IO.FileSystemInfo.OriginalPath];value;dfc-generated |
+| System.IO;DirectoryInfo;CreateSubdirectory;(System.String);Argument[this].Field[System.IO.FileSystemInfo.FullPath];ReturnValue.Field[System.IO.FileSystemInfo.FullPath];value;dfc-generated |
+| System.IO;DirectoryInfo;CreateSubdirectory;(System.String);Argument[this].Field[System.IO.FileSystemInfo.FullPath];ReturnValue.Field[System.IO.FileSystemInfo.OriginalPath];value;dfc-generated |
+| System.IO;DirectoryInfo;DirectoryInfo;(System.String);Argument[0];Argument[this].Field[System.IO.FileSystemInfo.FullPath];value;dfc-generated |
+| System.IO;DirectoryInfo;DirectoryInfo;(System.String);Argument[0];Argument[this].Field[System.IO.FileSystemInfo.OriginalPath];value;dfc-generated |
 | System.IO;DirectoryInfo;EnumerateDirectories;();Argument[this];ReturnValue;taint;df-generated |
 | System.IO;DirectoryInfo;EnumerateDirectories;(System.String);Argument[this];ReturnValue;taint;df-generated |
 | System.IO;DirectoryInfo;EnumerateDirectories;(System.String,System.IO.EnumerationOptions);Argument[1];ReturnValue;taint;df-generated |
@@ -10791,34 +11223,37 @@ summary
 | System.IO;DirectoryInfo;EnumerateFiles;(System.String,System.IO.EnumerationOptions);Argument[1];ReturnValue;taint;df-generated |
 | System.IO;DirectoryInfo;EnumerateFiles;(System.String,System.IO.EnumerationOptions);Argument[this];ReturnValue;taint;df-generated |
 | System.IO;DirectoryInfo;EnumerateFiles;(System.String,System.IO.SearchOption);Argument[this];ReturnValue;taint;df-generated |
-| System.IO;DirectoryInfo;MoveTo;(System.String);Argument[0];Argument[this];taint;df-generated |
+| System.IO;DirectoryInfo;MoveTo;(System.String);Argument[0];Argument[this].Field[System.IO.FileSystemInfo.FullPath];value;dfc-generated |
+| System.IO;DirectoryInfo;MoveTo;(System.String);Argument[0];Argument[this].Field[System.IO.FileSystemInfo.OriginalPath];value;dfc-generated |
 | System.IO;DirectoryInfo;get_Name;();Argument[this];ReturnValue;taint;df-generated |
-| System.IO;DirectoryInfo;get_Parent;();Argument[this];ReturnValue;taint;df-generated |
-| System.IO;DriveInfo;DriveInfo;(System.String);Argument[0];Argument[this];taint;df-generated |
+| System.IO;DirectoryInfo;get_Parent;();Argument[this].Field[System.IO.FileSystemInfo.FullPath];ReturnValue.Field[System.IO.FileSystemInfo.FullPath];value;dfc-generated |
+| System.IO;DirectoryInfo;get_Parent;();Argument[this].Field[System.IO.FileSystemInfo.FullPath];ReturnValue.Field[System.IO.FileSystemInfo.OriginalPath];value;dfc-generated |
+| System.IO;DriveInfo;DriveInfo;(System.String);Argument[0];Argument[this].SyntheticField[System.IO.DriveInfo._name];value;dfc-generated |
 | System.IO;DriveInfo;GetObjectData;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);Argument[this];Argument[0];taint;df-generated |
-| System.IO;DriveInfo;ToString;();Argument[this];ReturnValue;taint;df-generated |
-| System.IO;DriveInfo;get_Name;();Argument[this];ReturnValue;taint;df-generated |
-| System.IO;DriveInfo;get_RootDirectory;();Argument[this];ReturnValue;taint;df-generated |
-| System.IO;ErrorEventArgs;ErrorEventArgs;(System.Exception);Argument[0];Argument[this];taint;df-generated |
-| System.IO;ErrorEventArgs;GetException;();Argument[this];ReturnValue;taint;df-generated |
+| System.IO;DriveInfo;ToString;();Argument[this].Property[System.IO.DriveInfo.Name];ReturnValue;value;dfc-generated |
+| System.IO;DriveInfo;ToString;();Argument[this].SyntheticField[System.IO.DriveInfo._name];ReturnValue;value;dfc-generated |
+| System.IO;DriveInfo;get_Name;();Argument[this].SyntheticField[System.IO.DriveInfo._name];ReturnValue;value;dfc-generated |
+| System.IO;ErrorEventArgs;ErrorEventArgs;(System.Exception);Argument[0];Argument[this].SyntheticField[System.IO.ErrorEventArgs._exception];value;dfc-generated |
+| System.IO;ErrorEventArgs;GetException;();Argument[this].SyntheticField[System.IO.ErrorEventArgs._exception];ReturnValue;value;dfc-generated |
 | System.IO;ErrorEventHandler;BeginInvoke;(System.Object,System.IO.ErrorEventArgs,System.AsyncCallback,System.Object);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
 | System.IO;File;AppendAllLinesAsync;(System.String,System.Collections.Generic.IEnumerable<System.String>,System.Text.Encoding,System.Threading.CancellationToken);Argument[3];ReturnValue;taint;df-generated |
 | System.IO;File;AppendAllLinesAsync;(System.String,System.Collections.Generic.IEnumerable<System.String>,System.Threading.CancellationToken);Argument[2];ReturnValue;taint;df-generated |
 | System.IO;File;AppendAllTextAsync;(System.String,System.String,System.Text.Encoding,System.Threading.CancellationToken);Argument[3];ReturnValue;taint;df-generated |
 | System.IO;File;AppendAllTextAsync;(System.String,System.String,System.Threading.CancellationToken);Argument[2];ReturnValue;taint;df-generated |
-| System.IO;File;Create;(System.String);Argument[0];ReturnValue;taint;df-generated |
-| System.IO;File;Create;(System.String,System.Int32);Argument[0];ReturnValue;taint;df-generated |
-| System.IO;File;Create;(System.String,System.Int32,System.IO.FileOptions);Argument[0];ReturnValue;taint;df-generated |
-| System.IO;File;CreateSymbolicLink;(System.String,System.String);Argument[0];ReturnValue;taint;df-generated |
-| System.IO;File;Open;(System.String,System.IO.FileMode);Argument[0];ReturnValue;taint;df-generated |
-| System.IO;File;Open;(System.String,System.IO.FileMode,System.IO.FileAccess);Argument[0];ReturnValue;taint;df-generated |
-| System.IO;File;Open;(System.String,System.IO.FileMode,System.IO.FileAccess,System.IO.FileShare);Argument[0];ReturnValue;taint;df-generated |
+| System.IO;File;Create;(System.String);Argument[0];ReturnValue;taint;dfc-generated |
+| System.IO;File;Create;(System.String,System.Int32);Argument[0];ReturnValue;taint;dfc-generated |
+| System.IO;File;Create;(System.String,System.Int32,System.IO.FileOptions);Argument[0];ReturnValue;taint;dfc-generated |
+| System.IO;File;CreateSymbolicLink;(System.String,System.String);Argument[0];ReturnValue.Field[System.IO.FileSystemInfo.FullPath];value;dfc-generated |
+| System.IO;File;CreateSymbolicLink;(System.String,System.String);Argument[0];ReturnValue.Field[System.IO.FileSystemInfo.OriginalPath];value;dfc-generated |
+| System.IO;File;Open;(System.String,System.IO.FileMode);Argument[0];ReturnValue;taint;dfc-generated |
+| System.IO;File;Open;(System.String,System.IO.FileMode,System.IO.FileAccess);Argument[0];ReturnValue;taint;dfc-generated |
+| System.IO;File;Open;(System.String,System.IO.FileMode,System.IO.FileAccess,System.IO.FileShare);Argument[0];ReturnValue;taint;dfc-generated |
 | System.IO;File;OpenHandle;(System.String,System.IO.FileMode,System.IO.FileAccess,System.IO.FileShare,System.IO.FileOptions,System.Int64);Argument[0];ReturnValue;taint;df-generated |
-| System.IO;File;OpenRead;(System.String);Argument[0];ReturnValue;taint;df-generated |
-| System.IO;File;OpenText;(System.String);Argument[0];ReturnValue;taint;df-generated |
-| System.IO;File;OpenWrite;(System.String);Argument[0];ReturnValue;taint;df-generated |
-| System.IO;File;ReadAllText;(System.String);Argument[0];ReturnValue;taint;df-generated |
-| System.IO;File;ReadAllText;(System.String,System.Text.Encoding);Argument[0];ReturnValue;taint;df-generated |
+| System.IO;File;OpenRead;(System.String);Argument[0];ReturnValue;taint;dfc-generated |
+| System.IO;File;OpenText;(System.String);Argument[0];ReturnValue;taint;dfc-generated |
+| System.IO;File;OpenWrite;(System.String);Argument[0];ReturnValue;taint;dfc-generated |
+| System.IO;File;ReadAllText;(System.String);Argument[0];ReturnValue;taint;dfc-generated |
+| System.IO;File;ReadAllText;(System.String,System.Text.Encoding);Argument[0];ReturnValue;taint;dfc-generated |
 | System.IO;File;ReadLines;(System.String);Argument[0];ReturnValue;taint;df-generated |
 | System.IO;File;ReadLines;(System.String,System.Text.Encoding);Argument[0];ReturnValue;taint;df-generated |
 | System.IO;File;ReadLines;(System.String,System.Text.Encoding);Argument[1];ReturnValue;taint;df-generated |
@@ -10827,38 +11262,46 @@ summary
 | System.IO;File;WriteAllLinesAsync;(System.String,System.Collections.Generic.IEnumerable<System.String>,System.Threading.CancellationToken);Argument[2];ReturnValue;taint;df-generated |
 | System.IO;File;WriteAllTextAsync;(System.String,System.String,System.Text.Encoding,System.Threading.CancellationToken);Argument[3];ReturnValue;taint;df-generated |
 | System.IO;File;WriteAllTextAsync;(System.String,System.String,System.Threading.CancellationToken);Argument[2];ReturnValue;taint;df-generated |
-| System.IO;FileInfo;CopyTo;(System.String);Argument[0];ReturnValue;taint;df-generated |
-| System.IO;FileInfo;CopyTo;(System.String,System.Boolean);Argument[0];ReturnValue;taint;df-generated |
-| System.IO;FileInfo;Create;();Argument[this];ReturnValue;taint;df-generated |
-| System.IO;FileInfo;MoveTo;(System.String);Argument[0];Argument[this];taint;df-generated |
-| System.IO;FileInfo;MoveTo;(System.String,System.Boolean);Argument[0];Argument[this];taint;df-generated |
-| System.IO;FileInfo;Open;(System.IO.FileMode);Argument[this];ReturnValue;taint;df-generated |
-| System.IO;FileInfo;Open;(System.IO.FileMode,System.IO.FileAccess);Argument[this];ReturnValue;taint;df-generated |
-| System.IO;FileInfo;Open;(System.IO.FileMode,System.IO.FileAccess,System.IO.FileShare);Argument[this];ReturnValue;taint;df-generated |
-| System.IO;FileInfo;OpenRead;();Argument[this];ReturnValue;taint;df-generated |
-| System.IO;FileInfo;OpenText;();Argument[this];ReturnValue;taint;df-generated |
-| System.IO;FileInfo;OpenWrite;();Argument[this];ReturnValue;taint;df-generated |
+| System.IO;FileInfo;CopyTo;(System.String);Argument[0];ReturnValue.Field[System.IO.FileSystemInfo.FullPath];value;dfc-generated |
+| System.IO;FileInfo;CopyTo;(System.String);Argument[0];ReturnValue.Field[System.IO.FileSystemInfo.OriginalPath];value;dfc-generated |
+| System.IO;FileInfo;CopyTo;(System.String,System.Boolean);Argument[0];ReturnValue.Field[System.IO.FileSystemInfo.FullPath];value;dfc-generated |
+| System.IO;FileInfo;CopyTo;(System.String,System.Boolean);Argument[0];ReturnValue.Field[System.IO.FileSystemInfo.OriginalPath];value;dfc-generated |
+| System.IO;FileInfo;Create;();Argument[this].Field[System.IO.FileSystemInfo.FullPath];ReturnValue;taint;dfc-generated |
+| System.IO;FileInfo;MoveTo;(System.String);Argument[0];Argument[this].Field[System.IO.FileSystemInfo.FullPath];value;dfc-generated |
+| System.IO;FileInfo;MoveTo;(System.String);Argument[0];Argument[this].Field[System.IO.FileSystemInfo.OriginalPath];value;dfc-generated |
+| System.IO;FileInfo;MoveTo;(System.String,System.Boolean);Argument[0];Argument[this].Field[System.IO.FileSystemInfo.FullPath];value;dfc-generated |
+| System.IO;FileInfo;MoveTo;(System.String,System.Boolean);Argument[0];Argument[this].Field[System.IO.FileSystemInfo.OriginalPath];value;dfc-generated |
+| System.IO;FileInfo;Open;(System.IO.FileMode);Argument[this].Field[System.IO.FileSystemInfo.FullPath];ReturnValue;taint;dfc-generated |
+| System.IO;FileInfo;Open;(System.IO.FileMode,System.IO.FileAccess);Argument[this].Field[System.IO.FileSystemInfo.FullPath];ReturnValue;taint;dfc-generated |
+| System.IO;FileInfo;Open;(System.IO.FileMode,System.IO.FileAccess,System.IO.FileShare);Argument[this].Field[System.IO.FileSystemInfo.FullPath];ReturnValue;taint;dfc-generated |
+| System.IO;FileInfo;OpenRead;();Argument[this].Field[System.IO.FileSystemInfo.FullPath];ReturnValue;taint;dfc-generated |
+| System.IO;FileInfo;OpenText;();Argument[this].Field[System.IO.FileSystemInfo.FullPath];ReturnValue;taint;dfc-generated |
+| System.IO;FileInfo;OpenWrite;();Argument[this].Field[System.IO.FileSystemInfo.FullPath];ReturnValue;taint;dfc-generated |
 | System.IO;FileInfo;get_Directory;();Argument[this];ReturnValue;taint;df-generated |
-| System.IO;FileInfo;get_DirectoryName;();Argument[this];ReturnValue;taint;df-generated |
+| System.IO;FileInfo;get_DirectoryName;();Argument[this].Field[System.IO.FileSystemInfo.FullPath];ReturnValue;value;dfc-generated |
 | System.IO;FileInfo;get_Name;();Argument[this];ReturnValue;taint;df-generated |
 | System.IO;FileLoadException;GetObjectData;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);Argument[this];Argument[0];taint;df-generated |
-| System.IO;FileLoadException;get_Message;();Argument[this];ReturnValue;taint;df-generated |
+| System.IO;FileLoadException;get_Message;();Argument[this].SyntheticField[System.Exception._message];ReturnValue;value;dfc-generated |
 | System.IO;FileNotFoundException;GetObjectData;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);Argument[this];Argument[0];taint;df-generated |
-| System.IO;FileNotFoundException;get_Message;();Argument[this];ReturnValue;taint;df-generated |
+| System.IO;FileNotFoundException;get_Message;();Argument[this].SyntheticField[System.Exception._message];ReturnValue;value;dfc-generated |
 | System.IO;FileStream;BeginRead;(System.Byte[],System.Int32,System.Int32,System.AsyncCallback,System.Object);Argument[3];Argument[3].Parameter[delegate-self];value;manual |
 | System.IO;FileStream;BeginRead;(System.Byte[],System.Int32,System.Int32,System.AsyncCallback,System.Object);Argument[this];Argument[0].Element;taint;manual |
 | System.IO;FileStream;BeginWrite;(System.Byte[],System.Int32,System.Int32,System.AsyncCallback,System.Object);Argument[0].Element;Argument[this];taint;manual |
 | System.IO;FileStream;BeginWrite;(System.Byte[],System.Int32,System.Int32,System.AsyncCallback,System.Object);Argument[3];Argument[3].Parameter[delegate-self];value;manual |
 | System.IO;FileStream;CopyToAsync;(System.IO.Stream,System.Int32,System.Threading.CancellationToken);Argument[this];Argument[0];taint;manual |
 | System.IO;FileStream;DisposeAsync;();Argument[this];ReturnValue;taint;df-generated |
+| System.IO;FileStream;FileStream;(Microsoft.Win32.SafeHandles.SafeFileHandle,System.IO.FileAccess,System.Int32);Argument[this];Argument[this].SyntheticField[System.IO.FileStream._strategy].SyntheticField[System.IO.Strategies.DerivedFileStreamStrategy._fileStream];value;dfc-generated |
+| System.IO;FileStream;FileStream;(Microsoft.Win32.SafeHandles.SafeFileHandle,System.IO.FileAccess,System.Int32,System.Boolean);Argument[this];Argument[this].SyntheticField[System.IO.FileStream._strategy].SyntheticField[System.IO.Strategies.DerivedFileStreamStrategy._fileStream];value;dfc-generated |
+| System.IO;FileStream;FileStream;(System.IntPtr,System.IO.FileAccess,System.Boolean,System.Int32,System.Boolean);Argument[this];Argument[this].SyntheticField[System.IO.FileStream._strategy].SyntheticField[System.IO.Strategies.DerivedFileStreamStrategy._fileStream];value;dfc-generated |
 | System.IO;FileStream;FileStream;(System.String,System.IO.FileMode);Argument[0];Argument[this];taint;manual |
 | System.IO;FileStream;FileStream;(System.String,System.IO.FileMode,System.IO.FileAccess);Argument[0];Argument[this];taint;manual |
 | System.IO;FileStream;FileStream;(System.String,System.IO.FileMode,System.IO.FileAccess,System.IO.FileShare);Argument[0];Argument[this];taint;manual |
 | System.IO;FileStream;FileStream;(System.String,System.IO.FileMode,System.IO.FileAccess,System.IO.FileShare,System.Int32);Argument[0];Argument[this];taint;manual |
 | System.IO;FileStream;FileStream;(System.String,System.IO.FileMode,System.IO.FileAccess,System.IO.FileShare,System.Int32,System.Boolean);Argument[0];Argument[this];taint;manual |
 | System.IO;FileStream;FileStream;(System.String,System.IO.FileMode,System.IO.FileAccess,System.IO.FileShare,System.Int32,System.IO.FileOptions);Argument[0];Argument[this];taint;manual |
-| System.IO;FileStream;FlushAsync;(System.Threading.CancellationToken);Argument[0];ReturnValue;taint;df-generated |
-| System.IO;FileStream;FlushAsync;(System.Threading.CancellationToken);Argument[this];ReturnValue;taint;df-generated |
+| System.IO;FileStream;FileStream;(System.String,System.IO.FileStreamOptions);Argument[this];Argument[this].SyntheticField[System.IO.FileStream._strategy].SyntheticField[System.IO.Strategies.DerivedFileStreamStrategy._fileStream];value;dfc-generated |
+| System.IO;FileStream;FlushAsync;(System.Threading.CancellationToken);Argument[this].SyntheticField[System.IO.FileStream._strategy].SyntheticField[System.IO.Strategies.DerivedFileStreamStrategy._fileStream];ReturnValue.SyntheticField[System.Threading.Tasks.Task.m_stateObject];value;dfc-generated |
+| System.IO;FileStream;FlushAsync;(System.Threading.CancellationToken);Argument[this];ReturnValue.SyntheticField[System.Threading.Tasks.Task.m_stateObject];value;dfc-generated |
 | System.IO;FileStream;Read;(System.Byte[],System.Int32,System.Int32);Argument[this];Argument[0].Element;taint;manual |
 | System.IO;FileStream;Read;(System.Span<System.Byte>);Argument[this];Argument[0].Element;taint;manual |
 | System.IO;FileStream;ReadAsync;(System.Byte[],System.Int32,System.Int32,System.Threading.CancellationToken);Argument[this];Argument[0].Element;taint;manual |
@@ -10871,26 +11314,30 @@ summary
 | System.IO;FileStream;get_Handle;();Argument[this];ReturnValue;taint;df-generated |
 | System.IO;FileStream;get_Name;();Argument[this];ReturnValue;taint;df-generated |
 | System.IO;FileStream;get_SafeFileHandle;();Argument[this];ReturnValue;taint;df-generated |
-| System.IO;FileSystemEventArgs;FileSystemEventArgs;(System.IO.WatcherChangeTypes,System.String,System.String);Argument[1];Argument[this];taint;df-generated |
-| System.IO;FileSystemEventArgs;FileSystemEventArgs;(System.IO.WatcherChangeTypes,System.String,System.String);Argument[2];Argument[this];taint;df-generated |
-| System.IO;FileSystemEventArgs;get_FullPath;();Argument[this];ReturnValue;taint;df-generated |
-| System.IO;FileSystemEventArgs;get_Name;();Argument[this];ReturnValue;taint;df-generated |
+| System.IO;FileSystemEventArgs;FileSystemEventArgs;(System.IO.WatcherChangeTypes,System.String,System.String);Argument[1];Argument[this].SyntheticField[System.IO.FileSystemEventArgs._fullPath];taint;dfc-generated |
+| System.IO;FileSystemEventArgs;FileSystemEventArgs;(System.IO.WatcherChangeTypes,System.String,System.String);Argument[2];Argument[this].SyntheticField[System.IO.FileSystemEventArgs._fullPath];taint;dfc-generated |
+| System.IO;FileSystemEventArgs;FileSystemEventArgs;(System.IO.WatcherChangeTypes,System.String,System.String);Argument[2];Argument[this].SyntheticField[System.IO.FileSystemEventArgs._name];value;dfc-generated |
+| System.IO;FileSystemEventArgs;get_FullPath;();Argument[this].SyntheticField[System.IO.FileSystemEventArgs._fullPath];ReturnValue;value;dfc-generated |
+| System.IO;FileSystemEventArgs;get_Name;();Argument[this].SyntheticField[System.IO.FileSystemEventArgs._name];ReturnValue;value;dfc-generated |
 | System.IO;FileSystemEventHandler;BeginInvoke;(System.Object,System.IO.FileSystemEventArgs,System.AsyncCallback,System.Object);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
 | System.IO;FileSystemInfo;GetObjectData;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);Argument[this];Argument[0];taint;df-generated |
-| System.IO;FileSystemInfo;ToString;();Argument[this];ReturnValue;taint;df-generated |
-| System.IO;FileSystemInfo;get_Extension;();Argument[this];ReturnValue;taint;df-generated |
-| System.IO;FileSystemInfo;get_FullName;();Argument[this];ReturnValue;taint;df-generated |
+| System.IO;FileSystemInfo;ToString;();Argument[this].Field[System.IO.FileSystemInfo.OriginalPath];ReturnValue;value;dfc-generated |
+| System.IO;FileSystemInfo;get_Extension;();Argument[this].Field[System.IO.FileSystemInfo.FullPath];ReturnValue;value;dfc-generated |
+| System.IO;FileSystemInfo;get_FullName;();Argument[this].Field[System.IO.FileSystemInfo.FullPath];ReturnValue;value;dfc-generated |
 | System.IO;FileSystemInfo;get_LinkTarget;();Argument[this];ReturnValue;taint;df-generated |
 | System.IO;FileSystemInfo;get_Name;();Argument[this];ReturnValue;taint;df-generated |
 | System.IO;FileSystemWatcher;FileSystemWatcher;(System.String);Argument[0];Argument[this];taint;df-generated |
-| System.IO;FileSystemWatcher;FileSystemWatcher;(System.String,System.String);Argument[0];Argument[this];taint;df-generated |
-| System.IO;FileSystemWatcher;FileSystemWatcher;(System.String,System.String);Argument[1];Argument[this];taint;df-generated |
+| System.IO;FileSystemWatcher;FileSystemWatcher;(System.String,System.String);Argument[1];Argument[this].Property[System.IO.FileSystemWatcher.Filters].Element;value;dfc-generated |
+| System.IO;FileSystemWatcher;FileSystemWatcher;(System.String,System.String);Argument[1];Argument[this].SyntheticField[System.IO.FileSystemWatcher._filters].Element;value;dfc-generated |
+| System.IO;FileSystemWatcher;OnChanged;(System.IO.FileSystemEventArgs);Argument[0];Argument[this];taint;df-generated |
+| System.IO;FileSystemWatcher;OnCreated;(System.IO.FileSystemEventArgs);Argument[0];Argument[this];taint;df-generated |
+| System.IO;FileSystemWatcher;OnDeleted;(System.IO.FileSystemEventArgs);Argument[0];Argument[this];taint;df-generated |
 | System.IO;FileSystemWatcher;add_Changed;(System.IO.FileSystemEventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.IO;FileSystemWatcher;add_Created;(System.IO.FileSystemEventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.IO;FileSystemWatcher;add_Deleted;(System.IO.FileSystemEventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.IO;FileSystemWatcher;add_Error;(System.IO.ErrorEventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.IO;FileSystemWatcher;add_Renamed;(System.IO.RenamedEventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
-| System.IO;FileSystemWatcher;get_Filters;();Argument[this];ReturnValue;taint;df-generated |
+| System.IO;FileSystemWatcher;get_Filters;();Argument[this].SyntheticField[System.IO.FileSystemWatcher._filters];ReturnValue;value;dfc-generated |
 | System.IO;FileSystemWatcher;remove_Changed;(System.IO.FileSystemEventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.IO;FileSystemWatcher;remove_Created;(System.IO.FileSystemEventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.IO;FileSystemWatcher;remove_Deleted;(System.IO.FileSystemEventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
@@ -10902,8 +11349,7 @@ summary
 | System.IO;MemoryStream;BeginWrite;(System.Byte[],System.Int32,System.Int32,System.AsyncCallback,System.Object);Argument[3];Argument[3].Parameter[delegate-self];value;manual |
 | System.IO;MemoryStream;CopyTo;(System.IO.Stream,System.Int32);Argument[this];Argument[0];taint;manual |
 | System.IO;MemoryStream;CopyToAsync;(System.IO.Stream,System.Int32,System.Threading.CancellationToken);Argument[this];Argument[0];taint;manual |
-| System.IO;MemoryStream;FlushAsync;(System.Threading.CancellationToken);Argument[0];ReturnValue;taint;df-generated |
-| System.IO;MemoryStream;FlushAsync;(System.Threading.CancellationToken);Argument[this];ReturnValue;taint;df-generated |
+| System.IO;MemoryStream;FlushAsync;(System.Threading.CancellationToken);Argument[this];ReturnValue.SyntheticField[System.Threading.Tasks.Task.m_stateObject];value;dfc-generated |
 | System.IO;MemoryStream;GetBuffer;();Argument[this];ReturnValue;taint;df-generated |
 | System.IO;MemoryStream;MemoryStream;(System.Byte[]);Argument[0];Argument[this];taint;manual |
 | System.IO;MemoryStream;MemoryStream;(System.Byte[],System.Boolean);Argument[0].Element;Argument[this];taint;manual |
@@ -10922,7 +11368,7 @@ summary
 | System.IO;MemoryStream;WriteAsync;(System.ReadOnlyMemory<System.Byte>,System.Threading.CancellationToken);Argument[1];ReturnValue;taint;df-generated |
 | System.IO;MemoryStream;WriteAsync;(System.ReadOnlyMemory<System.Byte>,System.Threading.CancellationToken);Argument[this];ReturnValue;taint;df-generated |
 | System.IO;MemoryStream;WriteTo;(System.IO.Stream);Argument[this];Argument[0];taint;df-generated |
-| System.IO;Path;ChangeExtension;(System.String,System.String);Argument[0];ReturnValue;taint;df-generated |
+| System.IO;Path;ChangeExtension;(System.String,System.String);Argument[0];ReturnValue;value;dfc-generated |
 | System.IO;Path;Combine;(System.String,System.String);Argument[0];ReturnValue;taint;manual |
 | System.IO;Path;Combine;(System.String,System.String);Argument[1];ReturnValue;taint;manual |
 | System.IO;Path;Combine;(System.String,System.String,System.String);Argument[0];ReturnValue;taint;manual |
@@ -10946,29 +11392,30 @@ summary
 | System.IO;Path;GetPathRoot;(System.ReadOnlySpan<System.Char>);Argument[0].Element;ReturnValue;taint;manual |
 | System.IO;Path;GetPathRoot;(System.String);Argument[0];ReturnValue;taint;manual |
 | System.IO;Path;GetRelativePath;(System.String,System.String);Argument[1];ReturnValue;taint;manual |
-| System.IO;Path;Join;(System.ReadOnlySpan<System.Char>,System.ReadOnlySpan<System.Char>);Argument[0];ReturnValue;taint;df-generated |
-| System.IO;Path;Join;(System.ReadOnlySpan<System.Char>,System.ReadOnlySpan<System.Char>);Argument[1];ReturnValue;taint;df-generated |
-| System.IO;Path;Join;(System.ReadOnlySpan<System.Char>,System.ReadOnlySpan<System.Char>,System.ReadOnlySpan<System.Char>);Argument[0];ReturnValue;taint;df-generated |
-| System.IO;Path;Join;(System.ReadOnlySpan<System.Char>,System.ReadOnlySpan<System.Char>,System.ReadOnlySpan<System.Char>);Argument[1];ReturnValue;taint;df-generated |
-| System.IO;Path;Join;(System.ReadOnlySpan<System.Char>,System.ReadOnlySpan<System.Char>,System.ReadOnlySpan<System.Char>);Argument[2];ReturnValue;taint;df-generated |
-| System.IO;Path;Join;(System.ReadOnlySpan<System.Char>,System.ReadOnlySpan<System.Char>,System.ReadOnlySpan<System.Char>,System.ReadOnlySpan<System.Char>);Argument[0];ReturnValue;taint;df-generated |
-| System.IO;Path;Join;(System.ReadOnlySpan<System.Char>,System.ReadOnlySpan<System.Char>,System.ReadOnlySpan<System.Char>,System.ReadOnlySpan<System.Char>);Argument[1];ReturnValue;taint;df-generated |
-| System.IO;Path;Join;(System.ReadOnlySpan<System.Char>,System.ReadOnlySpan<System.Char>,System.ReadOnlySpan<System.Char>,System.ReadOnlySpan<System.Char>);Argument[2];ReturnValue;taint;df-generated |
-| System.IO;Path;Join;(System.ReadOnlySpan<System.Char>,System.ReadOnlySpan<System.Char>,System.ReadOnlySpan<System.Char>,System.ReadOnlySpan<System.Char>);Argument[3];ReturnValue;taint;df-generated |
-| System.IO;Path;Join;(System.String,System.String);Argument[0];ReturnValue;taint;df-generated |
-| System.IO;Path;Join;(System.String,System.String);Argument[1];ReturnValue;taint;df-generated |
-| System.IO;Path;Join;(System.String,System.String,System.String);Argument[0];ReturnValue;taint;df-generated |
-| System.IO;Path;Join;(System.String,System.String,System.String);Argument[1];ReturnValue;taint;df-generated |
-| System.IO;Path;Join;(System.String,System.String,System.String);Argument[2];ReturnValue;taint;df-generated |
-| System.IO;Path;Join;(System.String,System.String,System.String,System.String);Argument[0];ReturnValue;taint;df-generated |
-| System.IO;Path;Join;(System.String,System.String,System.String,System.String);Argument[1];ReturnValue;taint;df-generated |
-| System.IO;Path;Join;(System.String,System.String,System.String,System.String);Argument[2];ReturnValue;taint;df-generated |
-| System.IO;Path;Join;(System.String,System.String,System.String,System.String);Argument[3];ReturnValue;taint;df-generated |
-| System.IO;Path;TrimEndingDirectorySeparator;(System.ReadOnlySpan<System.Char>);Argument[0];ReturnValue;taint;df-generated |
-| System.IO;Path;TrimEndingDirectorySeparator;(System.String);Argument[0];ReturnValue;taint;df-generated |
-| System.IO;Path;TryJoin;(System.ReadOnlySpan<System.Char>,System.ReadOnlySpan<System.Char>,System.ReadOnlySpan<System.Char>,System.Span<System.Char>,System.Int32);Argument[0];Argument[3];taint;df-generated |
-| System.IO;Path;TryJoin;(System.ReadOnlySpan<System.Char>,System.ReadOnlySpan<System.Char>,System.ReadOnlySpan<System.Char>,System.Span<System.Char>,System.Int32);Argument[1];Argument[3];taint;df-generated |
-| System.IO;Path;TryJoin;(System.ReadOnlySpan<System.Char>,System.ReadOnlySpan<System.Char>,System.Span<System.Char>,System.Int32);Argument[0];Argument[2];taint;df-generated |
+| System.IO;Path;Join;(System.ReadOnlySpan<System.Char>,System.ReadOnlySpan<System.Char>);Argument[0].Element;ReturnValue;taint;dfc-generated |
+| System.IO;Path;Join;(System.ReadOnlySpan<System.Char>,System.ReadOnlySpan<System.Char>);Argument[1].Element;ReturnValue;taint;dfc-generated |
+| System.IO;Path;Join;(System.ReadOnlySpan<System.Char>,System.ReadOnlySpan<System.Char>,System.ReadOnlySpan<System.Char>);Argument[0].Element;ReturnValue;taint;dfc-generated |
+| System.IO;Path;Join;(System.ReadOnlySpan<System.Char>,System.ReadOnlySpan<System.Char>,System.ReadOnlySpan<System.Char>);Argument[1].Element;ReturnValue;taint;dfc-generated |
+| System.IO;Path;Join;(System.ReadOnlySpan<System.Char>,System.ReadOnlySpan<System.Char>,System.ReadOnlySpan<System.Char>);Argument[2].Element;ReturnValue;taint;dfc-generated |
+| System.IO;Path;Join;(System.ReadOnlySpan<System.Char>,System.ReadOnlySpan<System.Char>,System.ReadOnlySpan<System.Char>,System.ReadOnlySpan<System.Char>);Argument[0].Element;ReturnValue;taint;dfc-generated |
+| System.IO;Path;Join;(System.ReadOnlySpan<System.Char>,System.ReadOnlySpan<System.Char>,System.ReadOnlySpan<System.Char>,System.ReadOnlySpan<System.Char>);Argument[1].Element;ReturnValue;taint;dfc-generated |
+| System.IO;Path;Join;(System.ReadOnlySpan<System.Char>,System.ReadOnlySpan<System.Char>,System.ReadOnlySpan<System.Char>,System.ReadOnlySpan<System.Char>);Argument[2].Element;ReturnValue;taint;dfc-generated |
+| System.IO;Path;Join;(System.ReadOnlySpan<System.Char>,System.ReadOnlySpan<System.Char>,System.ReadOnlySpan<System.Char>,System.ReadOnlySpan<System.Char>);Argument[3].Element;ReturnValue;taint;dfc-generated |
+| System.IO;Path;Join;(System.String,System.String);Argument[0];ReturnValue;value;dfc-generated |
+| System.IO;Path;Join;(System.String,System.String);Argument[1];ReturnValue;value;dfc-generated |
+| System.IO;Path;Join;(System.String,System.String,System.String);Argument[0];ReturnValue;value;dfc-generated |
+| System.IO;Path;Join;(System.String,System.String,System.String);Argument[1];ReturnValue;value;dfc-generated |
+| System.IO;Path;Join;(System.String,System.String,System.String);Argument[2];ReturnValue;value;dfc-generated |
+| System.IO;Path;Join;(System.String,System.String,System.String,System.String);Argument[0];ReturnValue;value;dfc-generated |
+| System.IO;Path;Join;(System.String,System.String,System.String,System.String);Argument[1];ReturnValue;value;dfc-generated |
+| System.IO;Path;Join;(System.String,System.String,System.String,System.String);Argument[2];ReturnValue;value;dfc-generated |
+| System.IO;Path;Join;(System.String,System.String,System.String,System.String);Argument[3];ReturnValue;value;dfc-generated |
+| System.IO;Path;TrimEndingDirectorySeparator;(System.ReadOnlySpan<System.Char>);Argument[0].Element;ReturnValue.Element;value;dfc-generated |
+| System.IO;Path;TrimEndingDirectorySeparator;(System.ReadOnlySpan<System.Char>);Argument[0];ReturnValue;value;dfc-generated |
+| System.IO;Path;TrimEndingDirectorySeparator;(System.String);Argument[0];ReturnValue;value;dfc-generated |
+| System.IO;Path;TryJoin;(System.ReadOnlySpan<System.Char>,System.ReadOnlySpan<System.Char>,System.ReadOnlySpan<System.Char>,System.Span<System.Char>,System.Int32);Argument[0].Element;Argument[3].Element;value;dfc-generated |
+| System.IO;Path;TryJoin;(System.ReadOnlySpan<System.Char>,System.ReadOnlySpan<System.Char>,System.ReadOnlySpan<System.Char>,System.Span<System.Char>,System.Int32);Argument[1].Element;Argument[3].Element;value;dfc-generated |
+| System.IO;Path;TryJoin;(System.ReadOnlySpan<System.Char>,System.ReadOnlySpan<System.Char>,System.Span<System.Char>,System.Int32);Argument[0].Element;Argument[2].Element;value;dfc-generated |
 | System.IO;RandomAccess;ReadAsync;(Microsoft.Win32.SafeHandles.SafeFileHandle,System.Collections.Generic.IReadOnlyList<System.Memory<System.Byte>>,System.Int64,System.Threading.CancellationToken);Argument[0];ReturnValue;taint;df-generated |
 | System.IO;RandomAccess;ReadAsync;(Microsoft.Win32.SafeHandles.SafeFileHandle,System.Collections.Generic.IReadOnlyList<System.Memory<System.Byte>>,System.Int64,System.Threading.CancellationToken);Argument[1].Element;ReturnValue;taint;df-generated |
 | System.IO;RandomAccess;ReadAsync;(Microsoft.Win32.SafeHandles.SafeFileHandle,System.Collections.Generic.IReadOnlyList<System.Memory<System.Byte>>,System.Int64,System.Threading.CancellationToken);Argument[3];ReturnValue;taint;df-generated |
@@ -10980,10 +11427,11 @@ summary
 | System.IO;RandomAccess;WriteAsync;(Microsoft.Win32.SafeHandles.SafeFileHandle,System.ReadOnlyMemory<System.Byte>,System.Int64,System.Threading.CancellationToken);Argument[0];ReturnValue;taint;df-generated |
 | System.IO;RandomAccess;WriteAsync;(Microsoft.Win32.SafeHandles.SafeFileHandle,System.ReadOnlyMemory<System.Byte>,System.Int64,System.Threading.CancellationToken);Argument[1];ReturnValue;taint;df-generated |
 | System.IO;RandomAccess;WriteAsync;(Microsoft.Win32.SafeHandles.SafeFileHandle,System.ReadOnlyMemory<System.Byte>,System.Int64,System.Threading.CancellationToken);Argument[3];ReturnValue;taint;df-generated |
-| System.IO;RenamedEventArgs;RenamedEventArgs;(System.IO.WatcherChangeTypes,System.String,System.String,System.String);Argument[1];Argument[this];taint;df-generated |
-| System.IO;RenamedEventArgs;RenamedEventArgs;(System.IO.WatcherChangeTypes,System.String,System.String,System.String);Argument[3];Argument[this];taint;df-generated |
-| System.IO;RenamedEventArgs;get_OldFullPath;();Argument[this];ReturnValue;taint;df-generated |
-| System.IO;RenamedEventArgs;get_OldName;();Argument[this];ReturnValue;taint;df-generated |
+| System.IO;RenamedEventArgs;RenamedEventArgs;(System.IO.WatcherChangeTypes,System.String,System.String,System.String);Argument[1];Argument[this].SyntheticField[System.IO.RenamedEventArgs._oldFullPath];taint;dfc-generated |
+| System.IO;RenamedEventArgs;RenamedEventArgs;(System.IO.WatcherChangeTypes,System.String,System.String,System.String);Argument[3];Argument[this].SyntheticField[System.IO.RenamedEventArgs._oldFullPath];taint;dfc-generated |
+| System.IO;RenamedEventArgs;RenamedEventArgs;(System.IO.WatcherChangeTypes,System.String,System.String,System.String);Argument[3];Argument[this].SyntheticField[System.IO.RenamedEventArgs._oldName];value;dfc-generated |
+| System.IO;RenamedEventArgs;get_OldFullPath;();Argument[this].SyntheticField[System.IO.RenamedEventArgs._oldFullPath];ReturnValue;value;dfc-generated |
+| System.IO;RenamedEventArgs;get_OldName;();Argument[this].SyntheticField[System.IO.RenamedEventArgs._oldName];ReturnValue;value;dfc-generated |
 | System.IO;RenamedEventHandler;BeginInvoke;(System.Object,System.IO.RenamedEventArgs,System.AsyncCallback,System.Object);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
 | System.IO;Stream;BeginRead;(System.Byte[],System.Int32,System.Int32,System.AsyncCallback,System.Object);Argument[3];Argument[3].Parameter[delegate-self];value;manual |
 | System.IO;Stream;BeginRead;(System.Byte[],System.Int32,System.Int32,System.AsyncCallback,System.Object);Argument[this];Argument[0].Element;taint;manual |
@@ -10997,8 +11445,7 @@ summary
 | System.IO;Stream;CopyToAsync;(System.IO.Stream,System.Threading.CancellationToken);Argument[this];Argument[0];taint;manual |
 | System.IO;Stream;DisposeAsync;();Argument[this];ReturnValue;taint;df-generated |
 | System.IO;Stream;FlushAsync;();Argument[this];ReturnValue;taint;df-generated |
-| System.IO;Stream;FlushAsync;(System.Threading.CancellationToken);Argument[0];ReturnValue;taint;df-generated |
-| System.IO;Stream;FlushAsync;(System.Threading.CancellationToken);Argument[this];ReturnValue;taint;df-generated |
+| System.IO;Stream;FlushAsync;(System.Threading.CancellationToken);Argument[this];ReturnValue.SyntheticField[System.Threading.Tasks.Task.m_stateObject];value;dfc-generated |
 | System.IO;Stream;Read;(System.Byte[],System.Int32,System.Int32);Argument[this];Argument[0].Element;taint;manual |
 | System.IO;Stream;Read;(System.Span<System.Byte>);Argument[this];Argument[0].Element;taint;manual |
 | System.IO;Stream;ReadAsync;(System.Byte[],System.Int32,System.Int32);Argument[this];Argument[0].Element;taint;manual |
@@ -11008,7 +11455,7 @@ summary
 | System.IO;Stream;ReadAtLeastAsync;(System.Memory<System.Byte>,System.Int32,System.Boolean,System.Threading.CancellationToken);Argument[this];Argument[0];taint;manual |
 | System.IO;Stream;ReadExactly;(System.Byte[],System.Int32,System.Int32);Argument[this];Argument[0].Element;taint;manual |
 | System.IO;Stream;ReadExactly;(System.Span<System.Byte>);Argument[this];Argument[0].Element;taint;manual |
-| System.IO;Stream;Synchronized;(System.IO.Stream);Argument[0];ReturnValue;taint;df-generated |
+| System.IO;Stream;Synchronized;(System.IO.Stream);Argument[0];ReturnValue;value;dfc-generated |
 | System.IO;Stream;Write;(System.Byte[],System.Int32,System.Int32);Argument[0].Element;Argument[this];taint;manual |
 | System.IO;Stream;WriteAsync;(System.Byte[],System.Int32,System.Int32);Argument[0].Element;Argument[this];taint;manual |
 | System.IO;Stream;WriteAsync;(System.Byte[],System.Int32,System.Int32,System.Threading.CancellationToken);Argument[0].Element;Argument[this];taint;manual |
@@ -11046,11 +11493,9 @@ summary
 | System.IO;StreamReader;get_BaseStream;();Argument[this];ReturnValue;taint;df-generated |
 | System.IO;StreamReader;get_CurrentEncoding;();Argument[this];ReturnValue;taint;df-generated |
 | System.IO;StreamWriter;DisposeAsync;();Argument[this];ReturnValue;taint;df-generated |
-| System.IO;StreamWriter;FlushAsync;();Argument[this];ReturnValue;taint;df-generated |
-| System.IO;StreamWriter;FlushAsync;(System.Threading.CancellationToken);Argument[0];ReturnValue;taint;df-generated |
-| System.IO;StreamWriter;FlushAsync;(System.Threading.CancellationToken);Argument[this];ReturnValue;taint;df-generated |
-| System.IO;StreamWriter;StreamWriter;(System.IO.Stream,System.Text.Encoding,System.Int32,System.Boolean);Argument[0];Argument[this];taint;df-generated |
-| System.IO;StreamWriter;StreamWriter;(System.IO.Stream,System.Text.Encoding,System.Int32,System.Boolean);Argument[1];Argument[this];taint;df-generated |
+| System.IO;StreamWriter;FlushAsync;();Argument[this];ReturnValue.SyntheticField[System.Threading.Tasks.Task.m_stateObject];value;dfc-generated |
+| System.IO;StreamWriter;FlushAsync;(System.Threading.CancellationToken);Argument[this];ReturnValue.SyntheticField[System.Threading.Tasks.Task.m_stateObject];value;dfc-generated |
+| System.IO;StreamWriter;StreamWriter;(System.IO.Stream,System.Text.Encoding,System.Int32,System.Boolean);Argument[0];Argument[this].SyntheticField[System.IO.StreamWriter._stream];value;dfc-generated |
 | System.IO;StreamWriter;Write;(System.Char[]);Argument[0].Element;Argument[this];taint;df-generated |
 | System.IO;StreamWriter;Write;(System.Char[],System.Int32,System.Int32);Argument[0].Element;Argument[this];taint;df-generated |
 | System.IO;StreamWriter;Write;(System.String);Argument[0];Argument[this];taint;df-generated |
@@ -11066,15 +11511,11 @@ summary
 | System.IO;StreamWriter;Write;(System.String,System.Object[]);Argument[0];Argument[this];taint;df-generated |
 | System.IO;StreamWriter;Write;(System.String,System.Object[]);Argument[1].Element;Argument[this];taint;df-generated |
 | System.IO;StreamWriter;WriteAsync;(System.Char);Argument[this];ReturnValue;taint;df-generated |
-| System.IO;StreamWriter;WriteAsync;(System.Char[],System.Int32,System.Int32);Argument[0].Element;Argument[this];taint;df-generated |
-| System.IO;StreamWriter;WriteAsync;(System.Char[],System.Int32,System.Int32);Argument[0].Element;ReturnValue;taint;df-generated |
-| System.IO;StreamWriter;WriteAsync;(System.Char[],System.Int32,System.Int32);Argument[this];ReturnValue;taint;df-generated |
+| System.IO;StreamWriter;WriteAsync;(System.Char[],System.Int32,System.Int32);Argument[0].Element;Argument[this];taint;dfc-generated |
 | System.IO;StreamWriter;WriteAsync;(System.ReadOnlyMemory<System.Char>,System.Threading.CancellationToken);Argument[0];ReturnValue;taint;df-generated |
 | System.IO;StreamWriter;WriteAsync;(System.ReadOnlyMemory<System.Char>,System.Threading.CancellationToken);Argument[1];ReturnValue;taint;df-generated |
 | System.IO;StreamWriter;WriteAsync;(System.ReadOnlyMemory<System.Char>,System.Threading.CancellationToken);Argument[this];ReturnValue;taint;df-generated |
-| System.IO;StreamWriter;WriteAsync;(System.String);Argument[0];Argument[this];taint;df-generated |
-| System.IO;StreamWriter;WriteAsync;(System.String);Argument[0];ReturnValue;taint;df-generated |
-| System.IO;StreamWriter;WriteAsync;(System.String);Argument[this];ReturnValue;taint;df-generated |
+| System.IO;StreamWriter;WriteAsync;(System.String);Argument[0];Argument[this];taint;dfc-generated |
 | System.IO;StreamWriter;WriteLine;(System.String);Argument[0];Argument[this];taint;df-generated |
 | System.IO;StreamWriter;WriteLine;(System.String,System.Object);Argument[0];Argument[this];taint;df-generated |
 | System.IO;StreamWriter;WriteLine;(System.String,System.Object);Argument[1];Argument[this];taint;df-generated |
@@ -11098,7 +11539,7 @@ summary
 | System.IO;StreamWriter;WriteLineAsync;(System.String);Argument[0];Argument[this];taint;df-generated |
 | System.IO;StreamWriter;WriteLineAsync;(System.String);Argument[0];ReturnValue;taint;df-generated |
 | System.IO;StreamWriter;WriteLineAsync;(System.String);Argument[this];ReturnValue;taint;df-generated |
-| System.IO;StreamWriter;get_BaseStream;();Argument[this];ReturnValue;taint;df-generated |
+| System.IO;StreamWriter;get_BaseStream;();Argument[this].SyntheticField[System.IO.StreamWriter._stream];ReturnValue;value;dfc-generated |
 | System.IO;StreamWriter;get_Encoding;();Argument[this];ReturnValue;taint;df-generated |
 | System.IO;StringReader;Read;();Argument[this];ReturnValue;taint;manual |
 | System.IO;StringReader;Read;(System.Char[],System.Int32,System.Int32);Argument[this];Argument[0].Element;taint;manual |
@@ -11115,39 +11556,28 @@ summary
 | System.IO;StringReader;ReadToEndAsync;();Argument[this];ReturnValue;taint;manual |
 | System.IO;StringReader;ReadToEndAsync;(System.Threading.CancellationToken);Argument[this];ReturnValue;taint;df-generated |
 | System.IO;StringReader;StringReader;(System.String);Argument[0];Argument[this];taint;manual |
-| System.IO;StringWriter;FlushAsync;();Argument[this];ReturnValue;taint;df-generated |
-| System.IO;StringWriter;GetStringBuilder;();Argument[this];ReturnValue;taint;df-generated |
-| System.IO;StringWriter;StringWriter;(System.Text.StringBuilder,System.IFormatProvider);Argument[0];Argument[this];taint;df-generated |
-| System.IO;StringWriter;ToString;();Argument[this];ReturnValue;taint;df-generated |
-| System.IO;StringWriter;Write;(System.Char[],System.Int32,System.Int32);Argument[0].Element;Argument[this];taint;df-generated |
-| System.IO;StringWriter;Write;(System.String);Argument[0];Argument[this];taint;df-generated |
-| System.IO;StringWriter;Write;(System.Text.StringBuilder);Argument[0];Argument[this];taint;df-generated |
+| System.IO;StringWriter;FlushAsync;();Argument[this];ReturnValue.SyntheticField[System.Threading.Tasks.Task.m_stateObject];value;dfc-generated |
+| System.IO;StringWriter;GetStringBuilder;();Argument[this];ReturnValue;taint;manual |
+| System.IO;StringWriter;StringWriter;(System.Text.StringBuilder,System.IFormatProvider);Argument[0];Argument[this];taint;manual |
+| System.IO;StringWriter;ToString;();Argument[this];ReturnValue;taint;manual |
+| System.IO;StringWriter;Write;(System.Char[],System.Int32,System.Int32);Argument[0].Element;Argument[this];taint;manual |
+| System.IO;StringWriter;Write;(System.String);Argument[0];Argument[this];taint;manual |
+| System.IO;StringWriter;Write;(System.Text.StringBuilder);Argument[0];Argument[this];taint;manual |
 | System.IO;StringWriter;WriteAsync;(System.Char);Argument[this];ReturnValue;taint;df-generated |
-| System.IO;StringWriter;WriteAsync;(System.Char[],System.Int32,System.Int32);Argument[0].Element;Argument[this];taint;df-generated |
-| System.IO;StringWriter;WriteAsync;(System.Char[],System.Int32,System.Int32);Argument[0].Element;ReturnValue;taint;df-generated |
-| System.IO;StringWriter;WriteAsync;(System.Char[],System.Int32,System.Int32);Argument[this];ReturnValue;taint;df-generated |
+| System.IO;StringWriter;WriteAsync;(System.Char[],System.Int32,System.Int32);Argument[0].Element;Argument[this];taint;manual |
 | System.IO;StringWriter;WriteAsync;(System.ReadOnlyMemory<System.Char>,System.Threading.CancellationToken);Argument[0];ReturnValue;taint;df-generated |
 | System.IO;StringWriter;WriteAsync;(System.ReadOnlyMemory<System.Char>,System.Threading.CancellationToken);Argument[1];ReturnValue;taint;df-generated |
 | System.IO;StringWriter;WriteAsync;(System.ReadOnlyMemory<System.Char>,System.Threading.CancellationToken);Argument[this];ReturnValue;taint;df-generated |
-| System.IO;StringWriter;WriteAsync;(System.String);Argument[0];Argument[this];taint;df-generated |
-| System.IO;StringWriter;WriteAsync;(System.String);Argument[0];ReturnValue;taint;df-generated |
-| System.IO;StringWriter;WriteAsync;(System.String);Argument[this];ReturnValue;taint;df-generated |
-| System.IO;StringWriter;WriteAsync;(System.Text.StringBuilder,System.Threading.CancellationToken);Argument[0];Argument[this];taint;df-generated |
-| System.IO;StringWriter;WriteAsync;(System.Text.StringBuilder,System.Threading.CancellationToken);Argument[1];ReturnValue;taint;df-generated |
-| System.IO;StringWriter;WriteLine;(System.Text.StringBuilder);Argument[0];Argument[this];taint;df-generated |
+| System.IO;StringWriter;WriteAsync;(System.String);Argument[0];Argument[this];taint;manual |
+| System.IO;StringWriter;WriteAsync;(System.Text.StringBuilder,System.Threading.CancellationToken);Argument[0];Argument[this];taint;manual |
+| System.IO;StringWriter;WriteLine;(System.Text.StringBuilder);Argument[0];Argument[this];taint;manual |
 | System.IO;StringWriter;WriteLineAsync;(System.Char);Argument[this];ReturnValue;taint;df-generated |
-| System.IO;StringWriter;WriteLineAsync;(System.Char[],System.Int32,System.Int32);Argument[0].Element;Argument[this];taint;df-generated |
-| System.IO;StringWriter;WriteLineAsync;(System.Char[],System.Int32,System.Int32);Argument[0].Element;ReturnValue;taint;df-generated |
-| System.IO;StringWriter;WriteLineAsync;(System.Char[],System.Int32,System.Int32);Argument[this];ReturnValue;taint;df-generated |
+| System.IO;StringWriter;WriteLineAsync;(System.Char[],System.Int32,System.Int32);Argument[0].Element;Argument[this];taint;manual |
 | System.IO;StringWriter;WriteLineAsync;(System.ReadOnlyMemory<System.Char>,System.Threading.CancellationToken);Argument[0];ReturnValue;taint;df-generated |
 | System.IO;StringWriter;WriteLineAsync;(System.ReadOnlyMemory<System.Char>,System.Threading.CancellationToken);Argument[1];ReturnValue;taint;df-generated |
 | System.IO;StringWriter;WriteLineAsync;(System.ReadOnlyMemory<System.Char>,System.Threading.CancellationToken);Argument[this];ReturnValue;taint;df-generated |
-| System.IO;StringWriter;WriteLineAsync;(System.String);Argument[0];Argument[this];taint;df-generated |
-| System.IO;StringWriter;WriteLineAsync;(System.String);Argument[0];ReturnValue;taint;df-generated |
-| System.IO;StringWriter;WriteLineAsync;(System.String);Argument[this];ReturnValue;taint;df-generated |
-| System.IO;StringWriter;WriteLineAsync;(System.Text.StringBuilder,System.Threading.CancellationToken);Argument[0];Argument[this];taint;df-generated |
-| System.IO;StringWriter;WriteLineAsync;(System.Text.StringBuilder,System.Threading.CancellationToken);Argument[1];ReturnValue;taint;df-generated |
-| System.IO;StringWriter;WriteLineAsync;(System.Text.StringBuilder,System.Threading.CancellationToken);Argument[this];ReturnValue;taint;df-generated |
+| System.IO;StringWriter;WriteLineAsync;(System.String);Argument[0];Argument[this];taint;manual |
+| System.IO;StringWriter;WriteLineAsync;(System.Text.StringBuilder,System.Threading.CancellationToken);Argument[0];Argument[this];taint;manual |
 | System.IO;StringWriter;get_Encoding;();Argument[this];ReturnValue;taint;df-generated |
 | System.IO;TextReader;Read;();Argument[this];ReturnValue;taint;manual |
 | System.IO;TextReader;Read;(System.Char[],System.Int32,System.Int32);Argument[this];Argument[0].Element;taint;manual |
@@ -11164,13 +11594,12 @@ summary
 | System.IO;TextReader;ReadToEnd;();Argument[this];ReturnValue;taint;manual |
 | System.IO;TextReader;ReadToEndAsync;();Argument[this];ReturnValue;taint;manual |
 | System.IO;TextReader;ReadToEndAsync;(System.Threading.CancellationToken);Argument[this];ReturnValue;taint;df-generated |
-| System.IO;TextReader;Synchronized;(System.IO.TextReader);Argument[0];ReturnValue;taint;df-generated |
+| System.IO;TextReader;Synchronized;(System.IO.TextReader);Argument[0];ReturnValue;value;dfc-generated |
 | System.IO;TextWriter;DisposeAsync;();Argument[this];ReturnValue;taint;df-generated |
-| System.IO;TextWriter;FlushAsync;();Argument[this];ReturnValue;taint;df-generated |
-| System.IO;TextWriter;FlushAsync;(System.Threading.CancellationToken);Argument[0];ReturnValue;taint;df-generated |
-| System.IO;TextWriter;FlushAsync;(System.Threading.CancellationToken);Argument[this];ReturnValue;taint;df-generated |
-| System.IO;TextWriter;Synchronized;(System.IO.TextWriter);Argument[0];ReturnValue;taint;df-generated |
-| System.IO;TextWriter;TextWriter;(System.IFormatProvider);Argument[0];Argument[this];taint;df-generated |
+| System.IO;TextWriter;FlushAsync;();Argument[this];ReturnValue.SyntheticField[System.Threading.Tasks.Task.m_stateObject];value;dfc-generated |
+| System.IO;TextWriter;FlushAsync;(System.Threading.CancellationToken);Argument[this];ReturnValue.SyntheticField[System.Threading.Tasks.Task.m_stateObject];value;dfc-generated |
+| System.IO;TextWriter;Synchronized;(System.IO.TextWriter);Argument[0];ReturnValue;value;dfc-generated |
+| System.IO;TextWriter;TextWriter;(System.IFormatProvider);Argument[0];Argument[this].SyntheticField[System.IO.TextWriter._internalFormatProvider];value;dfc-generated |
 | System.IO;TextWriter;Write;(System.Char[]);Argument[0].Element;Argument[this];taint;df-generated |
 | System.IO;TextWriter;Write;(System.Char[],System.Int32,System.Int32);Argument[0].Element;Argument[this];taint;df-generated |
 | System.IO;TextWriter;Write;(System.Object);Argument[0];Argument[this];taint;df-generated |
@@ -11191,15 +11620,11 @@ summary
 | System.IO;TextWriter;WriteAsync;(System.Char[]);Argument[0].Element;Argument[this];taint;df-generated |
 | System.IO;TextWriter;WriteAsync;(System.Char[]);Argument[0].Element;ReturnValue;taint;df-generated |
 | System.IO;TextWriter;WriteAsync;(System.Char[]);Argument[this];ReturnValue;taint;df-generated |
-| System.IO;TextWriter;WriteAsync;(System.Char[],System.Int32,System.Int32);Argument[0].Element;Argument[this];taint;df-generated |
-| System.IO;TextWriter;WriteAsync;(System.Char[],System.Int32,System.Int32);Argument[0].Element;ReturnValue;taint;df-generated |
-| System.IO;TextWriter;WriteAsync;(System.Char[],System.Int32,System.Int32);Argument[this];ReturnValue;taint;df-generated |
+| System.IO;TextWriter;WriteAsync;(System.Char[],System.Int32,System.Int32);Argument[0].Element;Argument[this];taint;dfc-generated |
 | System.IO;TextWriter;WriteAsync;(System.ReadOnlyMemory<System.Char>,System.Threading.CancellationToken);Argument[0];ReturnValue;taint;df-generated |
 | System.IO;TextWriter;WriteAsync;(System.ReadOnlyMemory<System.Char>,System.Threading.CancellationToken);Argument[1];ReturnValue;taint;df-generated |
 | System.IO;TextWriter;WriteAsync;(System.ReadOnlyMemory<System.Char>,System.Threading.CancellationToken);Argument[this];ReturnValue;taint;df-generated |
-| System.IO;TextWriter;WriteAsync;(System.String);Argument[0];Argument[this];taint;df-generated |
-| System.IO;TextWriter;WriteAsync;(System.String);Argument[0];ReturnValue;taint;df-generated |
-| System.IO;TextWriter;WriteAsync;(System.String);Argument[this];ReturnValue;taint;df-generated |
+| System.IO;TextWriter;WriteAsync;(System.String);Argument[0];Argument[this];taint;dfc-generated |
 | System.IO;TextWriter;WriteAsync;(System.Text.StringBuilder,System.Threading.CancellationToken);Argument[0];Argument[this];taint;df-generated |
 | System.IO;TextWriter;WriteAsync;(System.Text.StringBuilder,System.Threading.CancellationToken);Argument[1];ReturnValue;taint;df-generated |
 | System.IO;TextWriter;WriteLine;(System.Char[]);Argument[0].Element;Argument[this];taint;df-generated |
@@ -11236,12 +11661,12 @@ summary
 | System.IO;TextWriter;WriteLineAsync;(System.Text.StringBuilder,System.Threading.CancellationToken);Argument[1];ReturnValue;taint;df-generated |
 | System.IO;TextWriter;WriteLineAsync;(System.Text.StringBuilder,System.Threading.CancellationToken);Argument[this];ReturnValue;taint;df-generated |
 | System.IO;TextWriter;get_Encoding;();Argument[this];ReturnValue;taint;df-generated |
-| System.IO;TextWriter;get_FormatProvider;();Argument[this];ReturnValue;taint;df-generated |
+| System.IO;TextWriter;get_FormatProvider;();Argument[this].SyntheticField[System.IO.TextWriter._internalFormatProvider];ReturnValue;value;dfc-generated |
 | System.IO;UnmanagedMemoryAccessor;Initialize;(System.Runtime.InteropServices.SafeBuffer,System.Int64,System.Int64,System.IO.FileAccess);Argument[0];Argument[this];taint;df-generated |
 | System.IO;UnmanagedMemoryAccessor;UnmanagedMemoryAccessor;(System.Runtime.InteropServices.SafeBuffer,System.Int64,System.Int64);Argument[0];Argument[this];taint;df-generated |
 | System.IO;UnmanagedMemoryAccessor;UnmanagedMemoryAccessor;(System.Runtime.InteropServices.SafeBuffer,System.Int64,System.Int64,System.IO.FileAccess);Argument[0];Argument[this];taint;df-generated |
-| System.IO;UnmanagedMemoryStream;FlushAsync;(System.Threading.CancellationToken);Argument[0];ReturnValue;taint;df-generated |
-| System.IO;UnmanagedMemoryStream;FlushAsync;(System.Threading.CancellationToken);Argument[this];ReturnValue;taint;df-generated |
+| System.IO;UnmanagedMemoryAccessor;Write<T>;(System.Int64,T);Argument[1];ReturnValue;value;dfc-generated |
+| System.IO;UnmanagedMemoryStream;FlushAsync;(System.Threading.CancellationToken);Argument[this];ReturnValue.SyntheticField[System.Threading.Tasks.Task.m_stateObject];value;dfc-generated |
 | System.IO;UnmanagedMemoryStream;Initialize;(System.Byte*,System.Int64,System.Int64,System.IO.FileAccess);Argument[0];Argument[this];taint;df-generated |
 | System.IO;UnmanagedMemoryStream;Initialize;(System.Runtime.InteropServices.SafeBuffer,System.Int64,System.Int64,System.IO.FileAccess);Argument[0];Argument[this];taint;df-generated |
 | System.IO;UnmanagedMemoryStream;Read;(System.Byte[],System.Int32,System.Int32);Argument[this];Argument[0].Element;taint;manual |
@@ -11257,32 +11682,31 @@ summary
 | System.IO;UnmanagedMemoryStream;WriteAsync;(System.ReadOnlyMemory<System.Byte>,System.Threading.CancellationToken);Argument[0];ReturnValue;taint;df-generated |
 | System.IO;UnmanagedMemoryStream;WriteAsync;(System.ReadOnlyMemory<System.Byte>,System.Threading.CancellationToken);Argument[1];ReturnValue;taint;df-generated |
 | System.IO;UnmanagedMemoryStream;WriteAsync;(System.ReadOnlyMemory<System.Byte>,System.Threading.CancellationToken);Argument[this];ReturnValue;taint;df-generated |
-| System.Linq.Expressions;BinaryExpression;Accept;(System.Linq.Expressions.ExpressionVisitor);Argument[this];Argument[0];taint;df-generated |
-| System.Linq.Expressions;BinaryExpression;Accept;(System.Linq.Expressions.ExpressionVisitor);Argument[this];ReturnValue;taint;df-generated |
-| System.Linq.Expressions;BinaryExpression;Reduce;();Argument[this];ReturnValue;value;df-generated |
-| System.Linq.Expressions;BinaryExpression;Update;(System.Linq.Expressions.Expression,System.Linq.Expressions.LambdaExpression,System.Linq.Expressions.Expression);Argument[this];ReturnValue;value;df-generated |
-| System.Linq.Expressions;BinaryExpression;get_Conversion;();Argument[this];ReturnValue;taint;df-generated |
-| System.Linq.Expressions;BinaryExpression;get_Method;();Argument[this];ReturnValue;taint;df-generated |
-| System.Linq.Expressions;BlockExpression;Accept;(System.Linq.Expressions.ExpressionVisitor);Argument[this];Argument[0];taint;df-generated |
-| System.Linq.Expressions;BlockExpression;Accept;(System.Linq.Expressions.ExpressionVisitor);Argument[this];ReturnValue;taint;df-generated |
-| System.Linq.Expressions;BlockExpression;Update;(System.Collections.Generic.IEnumerable<System.Linq.Expressions.ParameterExpression>,System.Collections.Generic.IEnumerable<System.Linq.Expressions.Expression>);Argument[this];ReturnValue;value;df-generated |
+| System.Linq.Expressions;BinaryExpression;Accept;(System.Linq.Expressions.ExpressionVisitor);Argument[this];ReturnValue;value;dfc-generated |
+| System.Linq.Expressions;BinaryExpression;Reduce;();Argument[this];ReturnValue;value;dfc-generated |
+| System.Linq.Expressions;BinaryExpression;Update;(System.Linq.Expressions.Expression,System.Linq.Expressions.LambdaExpression,System.Linq.Expressions.Expression);Argument[1];ReturnValue.SyntheticField[System.Linq.Expressions.CoalesceConversionBinaryExpression._conversion];value;dfc-generated |
+| System.Linq.Expressions;BinaryExpression;Update;(System.Linq.Expressions.Expression,System.Linq.Expressions.LambdaExpression,System.Linq.Expressions.Expression);Argument[1];ReturnValue.SyntheticField[System.Linq.Expressions.OpAssignMethodConversionBinaryExpression._conversion];value;dfc-generated |
+| System.Linq.Expressions;BinaryExpression;Update;(System.Linq.Expressions.Expression,System.Linq.Expressions.LambdaExpression,System.Linq.Expressions.Expression);Argument[this].Property[System.Linq.Expressions.BinaryExpression.Method];ReturnValue.SyntheticField[System.Linq.Expressions.MethodBinaryExpression._method];value;dfc-generated |
+| System.Linq.Expressions;BinaryExpression;Update;(System.Linq.Expressions.Expression,System.Linq.Expressions.LambdaExpression,System.Linq.Expressions.Expression);Argument[this].SyntheticField[System.Linq.Expressions.MethodBinaryExpression._method];ReturnValue.SyntheticField[System.Linq.Expressions.MethodBinaryExpression._method];value;dfc-generated |
+| System.Linq.Expressions;BinaryExpression;Update;(System.Linq.Expressions.Expression,System.Linq.Expressions.LambdaExpression,System.Linq.Expressions.Expression);Argument[this];ReturnValue;value;dfc-generated |
+| System.Linq.Expressions;BinaryExpression;get_Conversion;();Argument[this].SyntheticField[System.Linq.Expressions.CoalesceConversionBinaryExpression._conversion];ReturnValue;value;dfc-generated |
+| System.Linq.Expressions;BinaryExpression;get_Conversion;();Argument[this].SyntheticField[System.Linq.Expressions.OpAssignMethodConversionBinaryExpression._conversion];ReturnValue;value;dfc-generated |
+| System.Linq.Expressions;BinaryExpression;get_Method;();Argument[this].SyntheticField[System.Linq.Expressions.MethodBinaryExpression._method];ReturnValue;value;dfc-generated |
+| System.Linq.Expressions;BlockExpression;Accept;(System.Linq.Expressions.ExpressionVisitor);Argument[this];ReturnValue;value;dfc-generated |
+| System.Linq.Expressions;BlockExpression;Update;(System.Collections.Generic.IEnumerable<System.Linq.Expressions.ParameterExpression>,System.Collections.Generic.IEnumerable<System.Linq.Expressions.Expression>);Argument[this];ReturnValue;value;dfc-generated |
 | System.Linq.Expressions;BlockExpression;get_Expressions;();Argument[this];ReturnValue;taint;df-generated |
 | System.Linq.Expressions;BlockExpression;get_Result;();Argument[this];ReturnValue;taint;df-generated |
 | System.Linq.Expressions;BlockExpression;get_Variables;();Argument[this];ReturnValue;taint;df-generated |
-| System.Linq.Expressions;CatchBlock;ToString;();Argument[this];ReturnValue;taint;df-generated |
-| System.Linq.Expressions;CatchBlock;Update;(System.Linq.Expressions.ParameterExpression,System.Linq.Expressions.Expression,System.Linq.Expressions.Expression);Argument[this];ReturnValue;value;df-generated |
-| System.Linq.Expressions;ConditionalExpression;Accept;(System.Linq.Expressions.ExpressionVisitor);Argument[this];Argument[0];taint;df-generated |
-| System.Linq.Expressions;ConditionalExpression;Accept;(System.Linq.Expressions.ExpressionVisitor);Argument[this];ReturnValue;taint;df-generated |
-| System.Linq.Expressions;ConditionalExpression;Update;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Linq.Expressions.Expression);Argument[this];ReturnValue;value;df-generated |
-| System.Linq.Expressions;ConditionalExpression;get_IfFalse;();Argument[this];ReturnValue;taint;df-generated |
-| System.Linq.Expressions;ConstantExpression;Accept;(System.Linq.Expressions.ExpressionVisitor);Argument[this];Argument[0];taint;df-generated |
-| System.Linq.Expressions;ConstantExpression;Accept;(System.Linq.Expressions.ExpressionVisitor);Argument[this];ReturnValue;taint;df-generated |
-| System.Linq.Expressions;DebugInfoExpression;Accept;(System.Linq.Expressions.ExpressionVisitor);Argument[this];Argument[0];taint;df-generated |
-| System.Linq.Expressions;DebugInfoExpression;Accept;(System.Linq.Expressions.ExpressionVisitor);Argument[this];ReturnValue;taint;df-generated |
-| System.Linq.Expressions;DefaultExpression;Accept;(System.Linq.Expressions.ExpressionVisitor);Argument[this];Argument[0];taint;df-generated |
-| System.Linq.Expressions;DefaultExpression;Accept;(System.Linq.Expressions.ExpressionVisitor);Argument[this];ReturnValue;taint;df-generated |
-| System.Linq.Expressions;DynamicExpression;Accept;(System.Linq.Expressions.ExpressionVisitor);Argument[this];Argument[0];taint;df-generated |
-| System.Linq.Expressions;DynamicExpression;Accept;(System.Linq.Expressions.ExpressionVisitor);Argument[this];ReturnValue;taint;df-generated |
+| System.Linq.Expressions;CatchBlock;ToString;();Argument[this].Property[System.Linq.Expressions.CatchBlock.Variable].Property[System.Linq.Expressions.ParameterExpression.Name];ReturnValue;taint;dfc-generated |
+| System.Linq.Expressions;CatchBlock;Update;(System.Linq.Expressions.ParameterExpression,System.Linq.Expressions.Expression,System.Linq.Expressions.Expression);Argument[this];ReturnValue;value;dfc-generated |
+| System.Linq.Expressions;ConditionalExpression;Accept;(System.Linq.Expressions.ExpressionVisitor);Argument[this];ReturnValue;value;dfc-generated |
+| System.Linq.Expressions;ConditionalExpression;Update;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Linq.Expressions.Expression);Argument[2];ReturnValue.SyntheticField[System.Linq.Expressions.FullConditionalExpression._false];value;dfc-generated |
+| System.Linq.Expressions;ConditionalExpression;Update;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Linq.Expressions.Expression);Argument[this];ReturnValue;value;dfc-generated |
+| System.Linq.Expressions;ConditionalExpression;get_IfFalse;();Argument[this].SyntheticField[System.Linq.Expressions.FullConditionalExpression._false];ReturnValue;value;dfc-generated |
+| System.Linq.Expressions;ConstantExpression;Accept;(System.Linq.Expressions.ExpressionVisitor);Argument[this];ReturnValue;value;dfc-generated |
+| System.Linq.Expressions;DebugInfoExpression;Accept;(System.Linq.Expressions.ExpressionVisitor);Argument[this];ReturnValue;value;dfc-generated |
+| System.Linq.Expressions;DefaultExpression;Accept;(System.Linq.Expressions.ExpressionVisitor);Argument[this];ReturnValue;value;dfc-generated |
+| System.Linq.Expressions;DynamicExpression;Accept;(System.Linq.Expressions.ExpressionVisitor);Argument[this];ReturnValue;value;dfc-generated |
 | System.Linq.Expressions;DynamicExpression;Dynamic;(System.Runtime.CompilerServices.CallSiteBinder,System.Type,System.Collections.Generic.IEnumerable<System.Linq.Expressions.Expression>);Argument[2].Element;ReturnValue;taint;df-generated |
 | System.Linq.Expressions;DynamicExpression;Dynamic;(System.Runtime.CompilerServices.CallSiteBinder,System.Type,System.Linq.Expressions.Expression);Argument[2];ReturnValue;taint;df-generated |
 | System.Linq.Expressions;DynamicExpression;Dynamic;(System.Runtime.CompilerServices.CallSiteBinder,System.Type,System.Linq.Expressions.Expression,System.Linq.Expressions.Expression);Argument[2];ReturnValue;taint;df-generated |
@@ -11306,31 +11730,33 @@ summary
 | System.Linq.Expressions;DynamicExpression;MakeDynamic;(System.Type,System.Runtime.CompilerServices.CallSiteBinder,System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Linq.Expressions.Expression);Argument[3];ReturnValue;taint;df-generated |
 | System.Linq.Expressions;DynamicExpression;MakeDynamic;(System.Type,System.Runtime.CompilerServices.CallSiteBinder,System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Linq.Expressions.Expression);Argument[4];ReturnValue;taint;df-generated |
 | System.Linq.Expressions;DynamicExpression;MakeDynamic;(System.Type,System.Runtime.CompilerServices.CallSiteBinder,System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Linq.Expressions.Expression);Argument[5];ReturnValue;taint;df-generated |
-| System.Linq.Expressions;DynamicExpression;Update;(System.Collections.Generic.IEnumerable<System.Linq.Expressions.Expression>);Argument[this];ReturnValue;value;df-generated |
+| System.Linq.Expressions;DynamicExpression;Update;(System.Collections.Generic.IEnumerable<System.Linq.Expressions.Expression>);Argument[this];ReturnValue;value;dfc-generated |
 | System.Linq.Expressions;DynamicExpression;get_Arguments;();Argument[this];ReturnValue;taint;df-generated |
-| System.Linq.Expressions;DynamicExpressionVisitor;VisitDynamic;(System.Linq.Expressions.DynamicExpression);Argument[0];ReturnValue;taint;df-generated |
+| System.Linq.Expressions;DynamicExpressionVisitor;VisitDynamic;(System.Linq.Expressions.DynamicExpression);Argument[0];ReturnValue;value;dfc-generated |
+| System.Linq.Expressions;ElementInit;GetArgument;(System.Int32);Argument[this].Property[System.Linq.Expressions.ElementInit.Arguments].Element;ReturnValue;value;df-generated |
+| System.Linq.Expressions;ElementInit;GetArgument;(System.Int32);Argument[this].Property[System.Linq.Expressions.ElementInit.Arguments].Element;ReturnValue;value;dfc-generated |
 | System.Linq.Expressions;ElementInit;GetArgument;(System.Int32);Argument[this];ReturnValue;taint;df-generated |
+| System.Linq.Expressions;ElementInit;GetArgument;(System.Int32);Argument[this];ReturnValue;taint;dfc-generated |
 | System.Linq.Expressions;ElementInit;ToString;();Argument[this];ReturnValue;taint;df-generated |
-| System.Linq.Expressions;ElementInit;Update;(System.Collections.Generic.IEnumerable<System.Linq.Expressions.Expression>);Argument[this];ReturnValue;value;df-generated |
-| System.Linq.Expressions;Expression;Accept;(System.Linq.Expressions.ExpressionVisitor);Argument[this];Argument[0];taint;df-generated |
-| System.Linq.Expressions;Expression;Accept;(System.Linq.Expressions.ExpressionVisitor);Argument[this];ReturnValue;taint;df-generated |
-| System.Linq.Expressions;Expression;Add;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo);Argument[2];ReturnValue;taint;df-generated |
-| System.Linq.Expressions;Expression;AddAssign;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo);Argument[2];ReturnValue;taint;df-generated |
-| System.Linq.Expressions;Expression;AddAssign;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo,System.Linq.Expressions.LambdaExpression);Argument[2];ReturnValue;taint;df-generated |
-| System.Linq.Expressions;Expression;AddAssign;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo,System.Linq.Expressions.LambdaExpression);Argument[3];ReturnValue;taint;df-generated |
-| System.Linq.Expressions;Expression;AddAssignChecked;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo);Argument[2];ReturnValue;taint;df-generated |
-| System.Linq.Expressions;Expression;AddAssignChecked;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo,System.Linq.Expressions.LambdaExpression);Argument[2];ReturnValue;taint;df-generated |
-| System.Linq.Expressions;Expression;AddAssignChecked;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo,System.Linq.Expressions.LambdaExpression);Argument[3];ReturnValue;taint;df-generated |
-| System.Linq.Expressions;Expression;AddChecked;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo);Argument[2];ReturnValue;taint;df-generated |
-| System.Linq.Expressions;Expression;And;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo);Argument[2];ReturnValue;taint;df-generated |
+| System.Linq.Expressions;ElementInit;Update;(System.Collections.Generic.IEnumerable<System.Linq.Expressions.Expression>);Argument[this];ReturnValue;value;dfc-generated |
+| System.Linq.Expressions;Expression;Accept;(System.Linq.Expressions.ExpressionVisitor);Argument[this];ReturnValue;value;dfc-generated |
+| System.Linq.Expressions;Expression;Add;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo);Argument[2];ReturnValue.SyntheticField[System.Linq.Expressions.MethodBinaryExpression._method];value;dfc-generated |
+| System.Linq.Expressions;Expression;AddAssign;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo);Argument[2];ReturnValue.SyntheticField[System.Linq.Expressions.MethodBinaryExpression._method];value;dfc-generated |
+| System.Linq.Expressions;Expression;AddAssign;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo,System.Linq.Expressions.LambdaExpression);Argument[2];ReturnValue.SyntheticField[System.Linq.Expressions.MethodBinaryExpression._method];value;dfc-generated |
+| System.Linq.Expressions;Expression;AddAssign;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo,System.Linq.Expressions.LambdaExpression);Argument[3];ReturnValue.SyntheticField[System.Linq.Expressions.OpAssignMethodConversionBinaryExpression._conversion];value;dfc-generated |
+| System.Linq.Expressions;Expression;AddAssignChecked;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo);Argument[2];ReturnValue.SyntheticField[System.Linq.Expressions.MethodBinaryExpression._method];value;dfc-generated |
+| System.Linq.Expressions;Expression;AddAssignChecked;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo,System.Linq.Expressions.LambdaExpression);Argument[2];ReturnValue.SyntheticField[System.Linq.Expressions.MethodBinaryExpression._method];value;dfc-generated |
+| System.Linq.Expressions;Expression;AddAssignChecked;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo,System.Linq.Expressions.LambdaExpression);Argument[3];ReturnValue.SyntheticField[System.Linq.Expressions.OpAssignMethodConversionBinaryExpression._conversion];value;dfc-generated |
+| System.Linq.Expressions;Expression;AddChecked;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo);Argument[2];ReturnValue.SyntheticField[System.Linq.Expressions.MethodBinaryExpression._method];value;dfc-generated |
+| System.Linq.Expressions;Expression;And;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo);Argument[2];ReturnValue.SyntheticField[System.Linq.Expressions.MethodBinaryExpression._method];value;dfc-generated |
 | System.Linq.Expressions;Expression;AndAlso;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo);Argument[2];ReturnValue;taint;df-generated |
-| System.Linq.Expressions;Expression;AndAssign;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo);Argument[2];ReturnValue;taint;df-generated |
-| System.Linq.Expressions;Expression;AndAssign;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo,System.Linq.Expressions.LambdaExpression);Argument[2];ReturnValue;taint;df-generated |
-| System.Linq.Expressions;Expression;AndAssign;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo,System.Linq.Expressions.LambdaExpression);Argument[3];ReturnValue;taint;df-generated |
-| System.Linq.Expressions;Expression;ArrayAccess;(System.Linq.Expressions.Expression,System.Collections.Generic.IEnumerable<System.Linq.Expressions.Expression>);Argument[1].Element;ReturnValue;taint;df-generated |
+| System.Linq.Expressions;Expression;AndAssign;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo);Argument[2];ReturnValue.SyntheticField[System.Linq.Expressions.MethodBinaryExpression._method];value;dfc-generated |
+| System.Linq.Expressions;Expression;AndAssign;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo,System.Linq.Expressions.LambdaExpression);Argument[2];ReturnValue.SyntheticField[System.Linq.Expressions.MethodBinaryExpression._method];value;dfc-generated |
+| System.Linq.Expressions;Expression;AndAssign;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo,System.Linq.Expressions.LambdaExpression);Argument[3];ReturnValue.SyntheticField[System.Linq.Expressions.OpAssignMethodConversionBinaryExpression._conversion];value;dfc-generated |
+| System.Linq.Expressions;Expression;ArrayAccess;(System.Linq.Expressions.Expression,System.Collections.Generic.IEnumerable<System.Linq.Expressions.Expression>);Argument[1];ReturnValue.SyntheticField[System.Linq.Expressions.IndexExpression._arguments];value;dfc-generated |
 | System.Linq.Expressions;Expression;ArrayIndex;(System.Linq.Expressions.Expression,System.Collections.Generic.IEnumerable<System.Linq.Expressions.Expression>);Argument[1].Element;ReturnValue;taint;df-generated |
-| System.Linq.Expressions;Expression;Bind;(System.Reflection.MemberInfo,System.Linq.Expressions.Expression);Argument[1];ReturnValue;taint;df-generated |
-| System.Linq.Expressions;Expression;Bind;(System.Reflection.MethodInfo,System.Linq.Expressions.Expression);Argument[1];ReturnValue;taint;df-generated |
+| System.Linq.Expressions;Expression;Bind;(System.Reflection.MemberInfo,System.Linq.Expressions.Expression);Argument[1];ReturnValue.SyntheticField[System.Linq.Expressions.MemberAssignment._expression];value;dfc-generated |
+| System.Linq.Expressions;Expression;Bind;(System.Reflection.MethodInfo,System.Linq.Expressions.Expression);Argument[1];ReturnValue.SyntheticField[System.Linq.Expressions.MemberAssignment._expression];value;dfc-generated |
 | System.Linq.Expressions;Expression;Block;(System.Collections.Generic.IEnumerable<System.Linq.Expressions.Expression>);Argument[0].Element;ReturnValue;taint;df-generated |
 | System.Linq.Expressions;Expression;Block;(System.Collections.Generic.IEnumerable<System.Linq.Expressions.ParameterExpression>,System.Collections.Generic.IEnumerable<System.Linq.Expressions.Expression>);Argument[1].Element;ReturnValue;taint;df-generated |
 | System.Linq.Expressions;Expression;Block;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression);Argument[0];ReturnValue;taint;df-generated |
@@ -11350,15 +11776,17 @@ summary
 | System.Linq.Expressions;Expression;Block;(System.Type,System.Collections.Generic.IEnumerable<System.Linq.Expressions.Expression>);Argument[1].Element;ReturnValue;taint;df-generated |
 | System.Linq.Expressions;Expression;Block;(System.Type,System.Collections.Generic.IEnumerable<System.Linq.Expressions.ParameterExpression>,System.Collections.Generic.IEnumerable<System.Linq.Expressions.Expression>);Argument[2].Element;ReturnValue;taint;df-generated |
 | System.Linq.Expressions;Expression;Call;(System.Linq.Expressions.Expression,System.Reflection.MethodInfo,System.Collections.Generic.IEnumerable<System.Linq.Expressions.Expression>);Argument[2].Element;ReturnValue;taint;df-generated |
-| System.Linq.Expressions;Expression;Call;(System.Linq.Expressions.Expression,System.Reflection.MethodInfo,System.Linq.Expressions.Expression,System.Linq.Expressions.Expression);Argument[2];ReturnValue;taint;df-generated |
-| System.Linq.Expressions;Expression;Call;(System.Linq.Expressions.Expression,System.Reflection.MethodInfo,System.Linq.Expressions.Expression,System.Linq.Expressions.Expression);Argument[3];ReturnValue;taint;df-generated |
+| System.Linq.Expressions;Expression;Call;(System.Linq.Expressions.Expression,System.Reflection.MethodInfo,System.Linq.Expressions.Expression,System.Linq.Expressions.Expression);Argument[2];ReturnValue.SyntheticField[System.Linq.Expressions.InstanceMethodCallExpression2._arg0];value;dfc-generated |
+| System.Linq.Expressions;Expression;Call;(System.Linq.Expressions.Expression,System.Reflection.MethodInfo,System.Linq.Expressions.Expression,System.Linq.Expressions.Expression);Argument[2];ReturnValue.SyntheticField[System.Linq.Expressions.MethodCallExpression2._arg0];value;dfc-generated |
+| System.Linq.Expressions;Expression;Call;(System.Linq.Expressions.Expression,System.Reflection.MethodInfo,System.Linq.Expressions.Expression,System.Linq.Expressions.Expression);Argument[3];ReturnValue.SyntheticField[System.Linq.Expressions.InstanceMethodCallExpression2._arg1];value;dfc-generated |
+| System.Linq.Expressions;Expression;Call;(System.Linq.Expressions.Expression,System.Reflection.MethodInfo,System.Linq.Expressions.Expression,System.Linq.Expressions.Expression);Argument[3];ReturnValue.SyntheticField[System.Linq.Expressions.MethodCallExpression2._arg1];value;dfc-generated |
 | System.Linq.Expressions;Expression;Call;(System.Linq.Expressions.Expression,System.Reflection.MethodInfo,System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Linq.Expressions.Expression);Argument[2];ReturnValue;taint;df-generated |
 | System.Linq.Expressions;Expression;Call;(System.Linq.Expressions.Expression,System.Reflection.MethodInfo,System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Linq.Expressions.Expression);Argument[3];ReturnValue;taint;df-generated |
 | System.Linq.Expressions;Expression;Call;(System.Linq.Expressions.Expression,System.Reflection.MethodInfo,System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Linq.Expressions.Expression);Argument[4];ReturnValue;taint;df-generated |
 | System.Linq.Expressions;Expression;Call;(System.Reflection.MethodInfo,System.Collections.Generic.IEnumerable<System.Linq.Expressions.Expression>);Argument[1].Element;ReturnValue;taint;df-generated |
-| System.Linq.Expressions;Expression;Call;(System.Reflection.MethodInfo,System.Linq.Expressions.Expression);Argument[1];ReturnValue;taint;df-generated |
-| System.Linq.Expressions;Expression;Call;(System.Reflection.MethodInfo,System.Linq.Expressions.Expression,System.Linq.Expressions.Expression);Argument[1];ReturnValue;taint;df-generated |
-| System.Linq.Expressions;Expression;Call;(System.Reflection.MethodInfo,System.Linq.Expressions.Expression,System.Linq.Expressions.Expression);Argument[2];ReturnValue;taint;df-generated |
+| System.Linq.Expressions;Expression;Call;(System.Reflection.MethodInfo,System.Linq.Expressions.Expression);Argument[1];ReturnValue.SyntheticField[System.Linq.Expressions.MethodCallExpression1._arg0];value;dfc-generated |
+| System.Linq.Expressions;Expression;Call;(System.Reflection.MethodInfo,System.Linq.Expressions.Expression,System.Linq.Expressions.Expression);Argument[1];ReturnValue.SyntheticField[System.Linq.Expressions.MethodCallExpression2._arg0];value;dfc-generated |
+| System.Linq.Expressions;Expression;Call;(System.Reflection.MethodInfo,System.Linq.Expressions.Expression,System.Linq.Expressions.Expression);Argument[2];ReturnValue.SyntheticField[System.Linq.Expressions.MethodCallExpression2._arg1];value;dfc-generated |
 | System.Linq.Expressions;Expression;Call;(System.Reflection.MethodInfo,System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Linq.Expressions.Expression);Argument[1];ReturnValue;taint;df-generated |
 | System.Linq.Expressions;Expression;Call;(System.Reflection.MethodInfo,System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Linq.Expressions.Expression);Argument[2];ReturnValue;taint;df-generated |
 | System.Linq.Expressions;Expression;Call;(System.Reflection.MethodInfo,System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Linq.Expressions.Expression);Argument[3];ReturnValue;taint;df-generated |
@@ -11372,12 +11800,12 @@ summary
 | System.Linq.Expressions;Expression;Call;(System.Reflection.MethodInfo,System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Linq.Expressions.Expression);Argument[4];ReturnValue;taint;df-generated |
 | System.Linq.Expressions;Expression;Call;(System.Reflection.MethodInfo,System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Linq.Expressions.Expression);Argument[5];ReturnValue;taint;df-generated |
 | System.Linq.Expressions;Expression;Coalesce;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Linq.Expressions.LambdaExpression);Argument[2];ReturnValue;taint;df-generated |
-| System.Linq.Expressions;Expression;Condition;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Linq.Expressions.Expression);Argument[2];ReturnValue;taint;df-generated |
-| System.Linq.Expressions;Expression;Condition;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Type);Argument[2];ReturnValue;taint;df-generated |
-| System.Linq.Expressions;Expression;Divide;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo);Argument[2];ReturnValue;taint;df-generated |
-| System.Linq.Expressions;Expression;DivideAssign;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo);Argument[2];ReturnValue;taint;df-generated |
-| System.Linq.Expressions;Expression;DivideAssign;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo,System.Linq.Expressions.LambdaExpression);Argument[2];ReturnValue;taint;df-generated |
-| System.Linq.Expressions;Expression;DivideAssign;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo,System.Linq.Expressions.LambdaExpression);Argument[3];ReturnValue;taint;df-generated |
+| System.Linq.Expressions;Expression;Condition;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Linq.Expressions.Expression);Argument[2];ReturnValue.SyntheticField[System.Linq.Expressions.FullConditionalExpression._false];value;dfc-generated |
+| System.Linq.Expressions;Expression;Condition;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Type);Argument[2];ReturnValue.SyntheticField[System.Linq.Expressions.FullConditionalExpression._false];value;dfc-generated |
+| System.Linq.Expressions;Expression;Divide;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo);Argument[2];ReturnValue.SyntheticField[System.Linq.Expressions.MethodBinaryExpression._method];value;dfc-generated |
+| System.Linq.Expressions;Expression;DivideAssign;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo);Argument[2];ReturnValue.SyntheticField[System.Linq.Expressions.MethodBinaryExpression._method];value;dfc-generated |
+| System.Linq.Expressions;Expression;DivideAssign;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo,System.Linq.Expressions.LambdaExpression);Argument[2];ReturnValue.SyntheticField[System.Linq.Expressions.MethodBinaryExpression._method];value;dfc-generated |
+| System.Linq.Expressions;Expression;DivideAssign;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo,System.Linq.Expressions.LambdaExpression);Argument[3];ReturnValue.SyntheticField[System.Linq.Expressions.OpAssignMethodConversionBinaryExpression._conversion];value;dfc-generated |
 | System.Linq.Expressions;Expression;Dynamic;(System.Runtime.CompilerServices.CallSiteBinder,System.Type,System.Collections.Generic.IEnumerable<System.Linq.Expressions.Expression>);Argument[2].Element;ReturnValue;taint;df-generated |
 | System.Linq.Expressions;Expression;Dynamic;(System.Runtime.CompilerServices.CallSiteBinder,System.Type,System.Linq.Expressions.Expression);Argument[2];ReturnValue;taint;df-generated |
 | System.Linq.Expressions;Expression;Dynamic;(System.Runtime.CompilerServices.CallSiteBinder,System.Type,System.Linq.Expressions.Expression,System.Linq.Expressions.Expression);Argument[2];ReturnValue;taint;df-generated |
@@ -11389,15 +11817,15 @@ summary
 | System.Linq.Expressions;Expression;Dynamic;(System.Runtime.CompilerServices.CallSiteBinder,System.Type,System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Linq.Expressions.Expression);Argument[3];ReturnValue;taint;df-generated |
 | System.Linq.Expressions;Expression;Dynamic;(System.Runtime.CompilerServices.CallSiteBinder,System.Type,System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Linq.Expressions.Expression);Argument[4];ReturnValue;taint;df-generated |
 | System.Linq.Expressions;Expression;Dynamic;(System.Runtime.CompilerServices.CallSiteBinder,System.Type,System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Linq.Expressions.Expression);Argument[5];ReturnValue;taint;df-generated |
-| System.Linq.Expressions;Expression;Equal;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Boolean,System.Reflection.MethodInfo);Argument[3];ReturnValue;taint;df-generated |
-| System.Linq.Expressions;Expression;ExclusiveOr;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo);Argument[2];ReturnValue;taint;df-generated |
-| System.Linq.Expressions;Expression;ExclusiveOrAssign;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo);Argument[2];ReturnValue;taint;df-generated |
-| System.Linq.Expressions;Expression;ExclusiveOrAssign;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo,System.Linq.Expressions.LambdaExpression);Argument[2];ReturnValue;taint;df-generated |
-| System.Linq.Expressions;Expression;ExclusiveOrAssign;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo,System.Linq.Expressions.LambdaExpression);Argument[3];ReturnValue;taint;df-generated |
+| System.Linq.Expressions;Expression;Equal;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Boolean,System.Reflection.MethodInfo);Argument[3];ReturnValue.SyntheticField[System.Linq.Expressions.MethodBinaryExpression._method];value;dfc-generated |
+| System.Linq.Expressions;Expression;ExclusiveOr;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo);Argument[2];ReturnValue.SyntheticField[System.Linq.Expressions.MethodBinaryExpression._method];value;dfc-generated |
+| System.Linq.Expressions;Expression;ExclusiveOrAssign;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo);Argument[2];ReturnValue.SyntheticField[System.Linq.Expressions.MethodBinaryExpression._method];value;dfc-generated |
+| System.Linq.Expressions;Expression;ExclusiveOrAssign;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo,System.Linq.Expressions.LambdaExpression);Argument[2];ReturnValue.SyntheticField[System.Linq.Expressions.MethodBinaryExpression._method];value;dfc-generated |
+| System.Linq.Expressions;Expression;ExclusiveOrAssign;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo,System.Linq.Expressions.LambdaExpression);Argument[3];ReturnValue.SyntheticField[System.Linq.Expressions.OpAssignMethodConversionBinaryExpression._conversion];value;dfc-generated |
 | System.Linq.Expressions;Expression;Field;(System.Linq.Expressions.Expression,System.Reflection.FieldInfo);Argument[1];ReturnValue;taint;df-generated |
-| System.Linq.Expressions;Expression;GreaterThan;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Boolean,System.Reflection.MethodInfo);Argument[3];ReturnValue;taint;df-generated |
-| System.Linq.Expressions;Expression;GreaterThanOrEqual;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Boolean,System.Reflection.MethodInfo);Argument[3];ReturnValue;taint;df-generated |
-| System.Linq.Expressions;Expression;IfThenElse;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Linq.Expressions.Expression);Argument[2];ReturnValue;taint;df-generated |
+| System.Linq.Expressions;Expression;GreaterThan;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Boolean,System.Reflection.MethodInfo);Argument[3];ReturnValue.SyntheticField[System.Linq.Expressions.MethodBinaryExpression._method];value;dfc-generated |
+| System.Linq.Expressions;Expression;GreaterThanOrEqual;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Boolean,System.Reflection.MethodInfo);Argument[3];ReturnValue.SyntheticField[System.Linq.Expressions.MethodBinaryExpression._method];value;dfc-generated |
+| System.Linq.Expressions;Expression;IfThenElse;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Linq.Expressions.Expression);Argument[2];ReturnValue.SyntheticField[System.Linq.Expressions.FullConditionalExpression._false];value;dfc-generated |
 | System.Linq.Expressions;Expression;Invoke;(System.Linq.Expressions.Expression,System.Collections.Generic.IEnumerable<System.Linq.Expressions.Expression>);Argument[1].Element;ReturnValue;taint;df-generated |
 | System.Linq.Expressions;Expression;Lambda<TDelegate>;(System.Linq.Expressions.Expression,System.Boolean,System.Collections.Generic.IEnumerable<System.Linq.Expressions.ParameterExpression>);Argument[2].Element;ReturnValue;taint;df-generated |
 | System.Linq.Expressions;Expression;Lambda<TDelegate>;(System.Linq.Expressions.Expression,System.Collections.Generic.IEnumerable<System.Linq.Expressions.ParameterExpression>);Argument[1].Element;ReturnValue;taint;df-generated |
@@ -11405,15 +11833,16 @@ summary
 | System.Linq.Expressions;Expression;Lambda<TDelegate>;(System.Linq.Expressions.Expression,System.String,System.Boolean,System.Collections.Generic.IEnumerable<System.Linq.Expressions.ParameterExpression>);Argument[3].Element;ReturnValue;taint;df-generated |
 | System.Linq.Expressions;Expression;Lambda<TDelegate>;(System.Linq.Expressions.Expression,System.String,System.Collections.Generic.IEnumerable<System.Linq.Expressions.ParameterExpression>);Argument[1];ReturnValue;taint;df-generated |
 | System.Linq.Expressions;Expression;Lambda<TDelegate>;(System.Linq.Expressions.Expression,System.String,System.Collections.Generic.IEnumerable<System.Linq.Expressions.ParameterExpression>);Argument[2].Element;ReturnValue;taint;df-generated |
-| System.Linq.Expressions;Expression;LeftShift;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo);Argument[2];ReturnValue;taint;df-generated |
-| System.Linq.Expressions;Expression;LeftShiftAssign;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo);Argument[2];ReturnValue;taint;df-generated |
-| System.Linq.Expressions;Expression;LeftShiftAssign;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo,System.Linq.Expressions.LambdaExpression);Argument[2];ReturnValue;taint;df-generated |
-| System.Linq.Expressions;Expression;LeftShiftAssign;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo,System.Linq.Expressions.LambdaExpression);Argument[3];ReturnValue;taint;df-generated |
-| System.Linq.Expressions;Expression;LessThan;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Boolean,System.Reflection.MethodInfo);Argument[3];ReturnValue;taint;df-generated |
-| System.Linq.Expressions;Expression;LessThanOrEqual;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Boolean,System.Reflection.MethodInfo);Argument[3];ReturnValue;taint;df-generated |
-| System.Linq.Expressions;Expression;MakeBinary;(System.Linq.Expressions.ExpressionType,System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Boolean,System.Reflection.MethodInfo);Argument[4];ReturnValue;taint;df-generated |
-| System.Linq.Expressions;Expression;MakeBinary;(System.Linq.Expressions.ExpressionType,System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Boolean,System.Reflection.MethodInfo,System.Linq.Expressions.LambdaExpression);Argument[4];ReturnValue;taint;df-generated |
-| System.Linq.Expressions;Expression;MakeBinary;(System.Linq.Expressions.ExpressionType,System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Boolean,System.Reflection.MethodInfo,System.Linq.Expressions.LambdaExpression);Argument[5];ReturnValue;taint;df-generated |
+| System.Linq.Expressions;Expression;LeftShift;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo);Argument[2];ReturnValue.SyntheticField[System.Linq.Expressions.MethodBinaryExpression._method];value;dfc-generated |
+| System.Linq.Expressions;Expression;LeftShiftAssign;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo);Argument[2];ReturnValue.SyntheticField[System.Linq.Expressions.MethodBinaryExpression._method];value;dfc-generated |
+| System.Linq.Expressions;Expression;LeftShiftAssign;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo,System.Linq.Expressions.LambdaExpression);Argument[2];ReturnValue.SyntheticField[System.Linq.Expressions.MethodBinaryExpression._method];value;dfc-generated |
+| System.Linq.Expressions;Expression;LeftShiftAssign;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo,System.Linq.Expressions.LambdaExpression);Argument[3];ReturnValue.SyntheticField[System.Linq.Expressions.OpAssignMethodConversionBinaryExpression._conversion];value;dfc-generated |
+| System.Linq.Expressions;Expression;LessThan;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Boolean,System.Reflection.MethodInfo);Argument[3];ReturnValue.SyntheticField[System.Linq.Expressions.MethodBinaryExpression._method];value;dfc-generated |
+| System.Linq.Expressions;Expression;LessThanOrEqual;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Boolean,System.Reflection.MethodInfo);Argument[3];ReturnValue.SyntheticField[System.Linq.Expressions.MethodBinaryExpression._method];value;dfc-generated |
+| System.Linq.Expressions;Expression;MakeBinary;(System.Linq.Expressions.ExpressionType,System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Boolean,System.Reflection.MethodInfo);Argument[4];ReturnValue.SyntheticField[System.Linq.Expressions.MethodBinaryExpression._method];value;dfc-generated |
+| System.Linq.Expressions;Expression;MakeBinary;(System.Linq.Expressions.ExpressionType,System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Boolean,System.Reflection.MethodInfo,System.Linq.Expressions.LambdaExpression);Argument[4];ReturnValue.SyntheticField[System.Linq.Expressions.MethodBinaryExpression._method];value;dfc-generated |
+| System.Linq.Expressions;Expression;MakeBinary;(System.Linq.Expressions.ExpressionType,System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Boolean,System.Reflection.MethodInfo,System.Linq.Expressions.LambdaExpression);Argument[5];ReturnValue.SyntheticField[System.Linq.Expressions.CoalesceConversionBinaryExpression._conversion];value;dfc-generated |
+| System.Linq.Expressions;Expression;MakeBinary;(System.Linq.Expressions.ExpressionType,System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Boolean,System.Reflection.MethodInfo,System.Linq.Expressions.LambdaExpression);Argument[5];ReturnValue.SyntheticField[System.Linq.Expressions.OpAssignMethodConversionBinaryExpression._conversion];value;dfc-generated |
 | System.Linq.Expressions;Expression;MakeDynamic;(System.Type,System.Runtime.CompilerServices.CallSiteBinder,System.Collections.Generic.IEnumerable<System.Linq.Expressions.Expression>);Argument[2].Element;ReturnValue;taint;df-generated |
 | System.Linq.Expressions;Expression;MakeDynamic;(System.Type,System.Runtime.CompilerServices.CallSiteBinder,System.Linq.Expressions.Expression);Argument[2];ReturnValue;taint;df-generated |
 | System.Linq.Expressions;Expression;MakeDynamic;(System.Type,System.Runtime.CompilerServices.CallSiteBinder,System.Linq.Expressions.Expression,System.Linq.Expressions.Expression);Argument[2];ReturnValue;taint;df-generated |
@@ -11425,50 +11854,51 @@ summary
 | System.Linq.Expressions;Expression;MakeDynamic;(System.Type,System.Runtime.CompilerServices.CallSiteBinder,System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Linq.Expressions.Expression);Argument[3];ReturnValue;taint;df-generated |
 | System.Linq.Expressions;Expression;MakeDynamic;(System.Type,System.Runtime.CompilerServices.CallSiteBinder,System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Linq.Expressions.Expression);Argument[4];ReturnValue;taint;df-generated |
 | System.Linq.Expressions;Expression;MakeDynamic;(System.Type,System.Runtime.CompilerServices.CallSiteBinder,System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Linq.Expressions.Expression);Argument[5];ReturnValue;taint;df-generated |
-| System.Linq.Expressions;Expression;MakeIndex;(System.Linq.Expressions.Expression,System.Reflection.PropertyInfo,System.Collections.Generic.IEnumerable<System.Linq.Expressions.Expression>);Argument[2].Element;ReturnValue;taint;df-generated |
-| System.Linq.Expressions;Expression;MakeMemberAccess;(System.Linq.Expressions.Expression,System.Reflection.MemberInfo);Argument[1];ReturnValue;taint;df-generated |
-| System.Linq.Expressions;Expression;Modulo;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo);Argument[2];ReturnValue;taint;df-generated |
-| System.Linq.Expressions;Expression;ModuloAssign;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo);Argument[2];ReturnValue;taint;df-generated |
-| System.Linq.Expressions;Expression;ModuloAssign;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo,System.Linq.Expressions.LambdaExpression);Argument[2];ReturnValue;taint;df-generated |
-| System.Linq.Expressions;Expression;ModuloAssign;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo,System.Linq.Expressions.LambdaExpression);Argument[3];ReturnValue;taint;df-generated |
-| System.Linq.Expressions;Expression;Multiply;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo);Argument[2];ReturnValue;taint;df-generated |
-| System.Linq.Expressions;Expression;MultiplyAssign;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo);Argument[2];ReturnValue;taint;df-generated |
-| System.Linq.Expressions;Expression;MultiplyAssign;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo,System.Linq.Expressions.LambdaExpression);Argument[2];ReturnValue;taint;df-generated |
-| System.Linq.Expressions;Expression;MultiplyAssign;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo,System.Linq.Expressions.LambdaExpression);Argument[3];ReturnValue;taint;df-generated |
-| System.Linq.Expressions;Expression;MultiplyAssignChecked;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo);Argument[2];ReturnValue;taint;df-generated |
-| System.Linq.Expressions;Expression;MultiplyAssignChecked;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo,System.Linq.Expressions.LambdaExpression);Argument[2];ReturnValue;taint;df-generated |
-| System.Linq.Expressions;Expression;MultiplyAssignChecked;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo,System.Linq.Expressions.LambdaExpression);Argument[3];ReturnValue;taint;df-generated |
-| System.Linq.Expressions;Expression;MultiplyChecked;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo);Argument[2];ReturnValue;taint;df-generated |
-| System.Linq.Expressions;Expression;New;(System.Reflection.ConstructorInfo,System.Collections.Generic.IEnumerable<System.Linq.Expressions.Expression>);Argument[1].Element;ReturnValue;taint;df-generated |
-| System.Linq.Expressions;Expression;New;(System.Reflection.ConstructorInfo,System.Collections.Generic.IEnumerable<System.Linq.Expressions.Expression>,System.Collections.Generic.IEnumerable<System.Reflection.MemberInfo>);Argument[1].Element;ReturnValue;taint;df-generated |
-| System.Linq.Expressions;Expression;New;(System.Reflection.ConstructorInfo,System.Collections.Generic.IEnumerable<System.Linq.Expressions.Expression>,System.Reflection.MemberInfo[]);Argument[1].Element;ReturnValue;taint;df-generated |
-| System.Linq.Expressions;Expression;NotEqual;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Boolean,System.Reflection.MethodInfo);Argument[3];ReturnValue;taint;df-generated |
-| System.Linq.Expressions;Expression;Or;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo);Argument[2];ReturnValue;taint;df-generated |
-| System.Linq.Expressions;Expression;OrAssign;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo);Argument[2];ReturnValue;taint;df-generated |
-| System.Linq.Expressions;Expression;OrAssign;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo,System.Linq.Expressions.LambdaExpression);Argument[2];ReturnValue;taint;df-generated |
-| System.Linq.Expressions;Expression;OrAssign;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo,System.Linq.Expressions.LambdaExpression);Argument[3];ReturnValue;taint;df-generated |
+| System.Linq.Expressions;Expression;MakeIndex;(System.Linq.Expressions.Expression,System.Reflection.PropertyInfo,System.Collections.Generic.IEnumerable<System.Linq.Expressions.Expression>);Argument[2];ReturnValue.SyntheticField[System.Linq.Expressions.IndexExpression._arguments];value;dfc-generated |
+| System.Linq.Expressions;Expression;MakeMemberAccess;(System.Linq.Expressions.Expression,System.Reflection.MemberInfo);Argument[1];ReturnValue.SyntheticField[System.Linq.Expressions.FieldExpression._field];value;dfc-generated |
+| System.Linq.Expressions;Expression;MakeMemberAccess;(System.Linq.Expressions.Expression,System.Reflection.MemberInfo);Argument[1];ReturnValue.SyntheticField[System.Linq.Expressions.PropertyExpression._property];value;dfc-generated |
+| System.Linq.Expressions;Expression;Modulo;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo);Argument[2];ReturnValue.SyntheticField[System.Linq.Expressions.MethodBinaryExpression._method];value;dfc-generated |
+| System.Linq.Expressions;Expression;ModuloAssign;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo);Argument[2];ReturnValue.SyntheticField[System.Linq.Expressions.MethodBinaryExpression._method];value;dfc-generated |
+| System.Linq.Expressions;Expression;ModuloAssign;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo,System.Linq.Expressions.LambdaExpression);Argument[2];ReturnValue.SyntheticField[System.Linq.Expressions.MethodBinaryExpression._method];value;dfc-generated |
+| System.Linq.Expressions;Expression;ModuloAssign;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo,System.Linq.Expressions.LambdaExpression);Argument[3];ReturnValue.SyntheticField[System.Linq.Expressions.OpAssignMethodConversionBinaryExpression._conversion];value;dfc-generated |
+| System.Linq.Expressions;Expression;Multiply;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo);Argument[2];ReturnValue.SyntheticField[System.Linq.Expressions.MethodBinaryExpression._method];value;dfc-generated |
+| System.Linq.Expressions;Expression;MultiplyAssign;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo);Argument[2];ReturnValue.SyntheticField[System.Linq.Expressions.MethodBinaryExpression._method];value;dfc-generated |
+| System.Linq.Expressions;Expression;MultiplyAssign;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo,System.Linq.Expressions.LambdaExpression);Argument[2];ReturnValue.SyntheticField[System.Linq.Expressions.MethodBinaryExpression._method];value;dfc-generated |
+| System.Linq.Expressions;Expression;MultiplyAssign;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo,System.Linq.Expressions.LambdaExpression);Argument[3];ReturnValue.SyntheticField[System.Linq.Expressions.OpAssignMethodConversionBinaryExpression._conversion];value;dfc-generated |
+| System.Linq.Expressions;Expression;MultiplyAssignChecked;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo);Argument[2];ReturnValue.SyntheticField[System.Linq.Expressions.MethodBinaryExpression._method];value;dfc-generated |
+| System.Linq.Expressions;Expression;MultiplyAssignChecked;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo,System.Linq.Expressions.LambdaExpression);Argument[2];ReturnValue.SyntheticField[System.Linq.Expressions.MethodBinaryExpression._method];value;dfc-generated |
+| System.Linq.Expressions;Expression;MultiplyAssignChecked;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo,System.Linq.Expressions.LambdaExpression);Argument[3];ReturnValue.SyntheticField[System.Linq.Expressions.OpAssignMethodConversionBinaryExpression._conversion];value;dfc-generated |
+| System.Linq.Expressions;Expression;MultiplyChecked;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo);Argument[2];ReturnValue.SyntheticField[System.Linq.Expressions.MethodBinaryExpression._method];value;dfc-generated |
+| System.Linq.Expressions;Expression;New;(System.Reflection.ConstructorInfo,System.Collections.Generic.IEnumerable<System.Linq.Expressions.Expression>);Argument[1];ReturnValue.SyntheticField[System.Linq.Expressions.NewExpression._arguments];value;dfc-generated |
+| System.Linq.Expressions;Expression;New;(System.Reflection.ConstructorInfo,System.Collections.Generic.IEnumerable<System.Linq.Expressions.Expression>,System.Collections.Generic.IEnumerable<System.Reflection.MemberInfo>);Argument[1];ReturnValue.SyntheticField[System.Linq.Expressions.NewExpression._arguments];value;dfc-generated |
+| System.Linq.Expressions;Expression;New;(System.Reflection.ConstructorInfo,System.Collections.Generic.IEnumerable<System.Linq.Expressions.Expression>,System.Reflection.MemberInfo[]);Argument[1];ReturnValue.SyntheticField[System.Linq.Expressions.NewExpression._arguments];value;dfc-generated |
+| System.Linq.Expressions;Expression;NotEqual;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Boolean,System.Reflection.MethodInfo);Argument[3];ReturnValue.SyntheticField[System.Linq.Expressions.MethodBinaryExpression._method];value;dfc-generated |
+| System.Linq.Expressions;Expression;Or;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo);Argument[2];ReturnValue.SyntheticField[System.Linq.Expressions.MethodBinaryExpression._method];value;dfc-generated |
+| System.Linq.Expressions;Expression;OrAssign;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo);Argument[2];ReturnValue.SyntheticField[System.Linq.Expressions.MethodBinaryExpression._method];value;dfc-generated |
+| System.Linq.Expressions;Expression;OrAssign;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo,System.Linq.Expressions.LambdaExpression);Argument[2];ReturnValue.SyntheticField[System.Linq.Expressions.MethodBinaryExpression._method];value;dfc-generated |
+| System.Linq.Expressions;Expression;OrAssign;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo,System.Linq.Expressions.LambdaExpression);Argument[3];ReturnValue.SyntheticField[System.Linq.Expressions.OpAssignMethodConversionBinaryExpression._conversion];value;dfc-generated |
 | System.Linq.Expressions;Expression;OrElse;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo);Argument[2];ReturnValue;taint;df-generated |
-| System.Linq.Expressions;Expression;Power;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo);Argument[2];ReturnValue;taint;df-generated |
-| System.Linq.Expressions;Expression;PowerAssign;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo);Argument[2];ReturnValue;taint;df-generated |
-| System.Linq.Expressions;Expression;PowerAssign;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo,System.Linq.Expressions.LambdaExpression);Argument[2];ReturnValue;taint;df-generated |
-| System.Linq.Expressions;Expression;PowerAssign;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo,System.Linq.Expressions.LambdaExpression);Argument[3];ReturnValue;taint;df-generated |
+| System.Linq.Expressions;Expression;Power;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo);Argument[2];ReturnValue.SyntheticField[System.Linq.Expressions.MethodBinaryExpression._method];value;dfc-generated |
+| System.Linq.Expressions;Expression;PowerAssign;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo);Argument[2];ReturnValue.SyntheticField[System.Linq.Expressions.MethodBinaryExpression._method];value;dfc-generated |
+| System.Linq.Expressions;Expression;PowerAssign;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo,System.Linq.Expressions.LambdaExpression);Argument[2];ReturnValue.SyntheticField[System.Linq.Expressions.MethodBinaryExpression._method];value;dfc-generated |
+| System.Linq.Expressions;Expression;PowerAssign;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo,System.Linq.Expressions.LambdaExpression);Argument[3];ReturnValue.SyntheticField[System.Linq.Expressions.OpAssignMethodConversionBinaryExpression._conversion];value;dfc-generated |
 | System.Linq.Expressions;Expression;Property;(System.Linq.Expressions.Expression,System.Reflection.PropertyInfo);Argument[1];ReturnValue;taint;df-generated |
-| System.Linq.Expressions;Expression;Property;(System.Linq.Expressions.Expression,System.Reflection.PropertyInfo,System.Collections.Generic.IEnumerable<System.Linq.Expressions.Expression>);Argument[2].Element;ReturnValue;taint;df-generated |
-| System.Linq.Expressions;Expression;Reduce;();Argument[this];ReturnValue;value;df-generated |
-| System.Linq.Expressions;Expression;ReduceAndCheck;();Argument[this];ReturnValue;taint;df-generated |
-| System.Linq.Expressions;Expression;ReduceExtensions;();Argument[this];ReturnValue;taint;df-generated |
-| System.Linq.Expressions;Expression;RightShift;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo);Argument[2];ReturnValue;taint;df-generated |
-| System.Linq.Expressions;Expression;RightShiftAssign;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo);Argument[2];ReturnValue;taint;df-generated |
-| System.Linq.Expressions;Expression;RightShiftAssign;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo,System.Linq.Expressions.LambdaExpression);Argument[2];ReturnValue;taint;df-generated |
-| System.Linq.Expressions;Expression;RightShiftAssign;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo,System.Linq.Expressions.LambdaExpression);Argument[3];ReturnValue;taint;df-generated |
-| System.Linq.Expressions;Expression;Subtract;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo);Argument[2];ReturnValue;taint;df-generated |
-| System.Linq.Expressions;Expression;SubtractAssign;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo);Argument[2];ReturnValue;taint;df-generated |
-| System.Linq.Expressions;Expression;SubtractAssign;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo,System.Linq.Expressions.LambdaExpression);Argument[2];ReturnValue;taint;df-generated |
-| System.Linq.Expressions;Expression;SubtractAssign;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo,System.Linq.Expressions.LambdaExpression);Argument[3];ReturnValue;taint;df-generated |
-| System.Linq.Expressions;Expression;SubtractAssignChecked;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo);Argument[2];ReturnValue;taint;df-generated |
-| System.Linq.Expressions;Expression;SubtractAssignChecked;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo,System.Linq.Expressions.LambdaExpression);Argument[2];ReturnValue;taint;df-generated |
-| System.Linq.Expressions;Expression;SubtractAssignChecked;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo,System.Linq.Expressions.LambdaExpression);Argument[3];ReturnValue;taint;df-generated |
-| System.Linq.Expressions;Expression;SubtractChecked;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo);Argument[2];ReturnValue;taint;df-generated |
+| System.Linq.Expressions;Expression;Property;(System.Linq.Expressions.Expression,System.Reflection.PropertyInfo,System.Collections.Generic.IEnumerable<System.Linq.Expressions.Expression>);Argument[2];ReturnValue.SyntheticField[System.Linq.Expressions.IndexExpression._arguments];value;dfc-generated |
+| System.Linq.Expressions;Expression;Reduce;();Argument[this];ReturnValue;value;dfc-generated |
+| System.Linq.Expressions;Expression;ReduceAndCheck;();Argument[this];ReturnValue;value;dfc-generated |
+| System.Linq.Expressions;Expression;ReduceExtensions;();Argument[this];ReturnValue;value;dfc-generated |
+| System.Linq.Expressions;Expression;RightShift;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo);Argument[2];ReturnValue.SyntheticField[System.Linq.Expressions.MethodBinaryExpression._method];value;dfc-generated |
+| System.Linq.Expressions;Expression;RightShiftAssign;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo);Argument[2];ReturnValue.SyntheticField[System.Linq.Expressions.MethodBinaryExpression._method];value;dfc-generated |
+| System.Linq.Expressions;Expression;RightShiftAssign;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo,System.Linq.Expressions.LambdaExpression);Argument[2];ReturnValue.SyntheticField[System.Linq.Expressions.MethodBinaryExpression._method];value;dfc-generated |
+| System.Linq.Expressions;Expression;RightShiftAssign;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo,System.Linq.Expressions.LambdaExpression);Argument[3];ReturnValue.SyntheticField[System.Linq.Expressions.OpAssignMethodConversionBinaryExpression._conversion];value;dfc-generated |
+| System.Linq.Expressions;Expression;Subtract;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo);Argument[2];ReturnValue.SyntheticField[System.Linq.Expressions.MethodBinaryExpression._method];value;dfc-generated |
+| System.Linq.Expressions;Expression;SubtractAssign;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo);Argument[2];ReturnValue.SyntheticField[System.Linq.Expressions.MethodBinaryExpression._method];value;dfc-generated |
+| System.Linq.Expressions;Expression;SubtractAssign;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo,System.Linq.Expressions.LambdaExpression);Argument[2];ReturnValue.SyntheticField[System.Linq.Expressions.MethodBinaryExpression._method];value;dfc-generated |
+| System.Linq.Expressions;Expression;SubtractAssign;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo,System.Linq.Expressions.LambdaExpression);Argument[3];ReturnValue.SyntheticField[System.Linq.Expressions.OpAssignMethodConversionBinaryExpression._conversion];value;dfc-generated |
+| System.Linq.Expressions;Expression;SubtractAssignChecked;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo);Argument[2];ReturnValue.SyntheticField[System.Linq.Expressions.MethodBinaryExpression._method];value;dfc-generated |
+| System.Linq.Expressions;Expression;SubtractAssignChecked;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo,System.Linq.Expressions.LambdaExpression);Argument[2];ReturnValue.SyntheticField[System.Linq.Expressions.MethodBinaryExpression._method];value;dfc-generated |
+| System.Linq.Expressions;Expression;SubtractAssignChecked;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo,System.Linq.Expressions.LambdaExpression);Argument[3];ReturnValue.SyntheticField[System.Linq.Expressions.OpAssignMethodConversionBinaryExpression._conversion];value;dfc-generated |
+| System.Linq.Expressions;Expression;SubtractChecked;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo);Argument[2];ReturnValue.SyntheticField[System.Linq.Expressions.MethodBinaryExpression._method];value;dfc-generated |
 | System.Linq.Expressions;Expression;SymbolDocument;(System.String,System.Guid);Argument[1];ReturnValue;taint;df-generated |
 | System.Linq.Expressions;Expression;SymbolDocument;(System.String,System.Guid,System.Guid);Argument[1];ReturnValue;taint;df-generated |
 | System.Linq.Expressions;Expression;SymbolDocument;(System.String,System.Guid,System.Guid);Argument[2];ReturnValue;taint;df-generated |
@@ -11477,14 +11907,17 @@ summary
 | System.Linq.Expressions;Expression;SymbolDocument;(System.String,System.Guid,System.Guid,System.Guid);Argument[3];ReturnValue;taint;df-generated |
 | System.Linq.Expressions;Expression;VisitChildren;(System.Linq.Expressions.ExpressionVisitor);Argument[this];Argument[0];taint;df-generated |
 | System.Linq.Expressions;Expression;VisitChildren;(System.Linq.Expressions.ExpressionVisitor);Argument[this];ReturnValue;taint;df-generated |
-| System.Linq.Expressions;Expression<TDelegate>;Accept;(System.Linq.Expressions.ExpressionVisitor);Argument[this];Argument[0];taint;df-generated |
-| System.Linq.Expressions;Expression<TDelegate>;Accept;(System.Linq.Expressions.ExpressionVisitor);Argument[this];ReturnValue;taint;df-generated |
+| System.Linq.Expressions;Expression<TDelegate>;Accept;(System.Linq.Expressions.ExpressionVisitor);Argument[this];ReturnValue;value;dfc-generated |
 | System.Linq.Expressions;Expression<TDelegate>;Update;(System.Linq.Expressions.Expression,System.Collections.Generic.IEnumerable<System.Linq.Expressions.ParameterExpression>);Argument[1].Element;ReturnValue;taint;df-generated |
 | System.Linq.Expressions;Expression<TDelegate>;Update;(System.Linq.Expressions.Expression,System.Collections.Generic.IEnumerable<System.Linq.Expressions.ParameterExpression>);Argument[this];ReturnValue;taint;df-generated |
 | System.Linq.Expressions;ExpressionVisitor;Visit;(System.Collections.ObjectModel.ReadOnlyCollection<System.Linq.Expressions.Expression>);Argument[0].Element;Argument[this];taint;df-generated |
 | System.Linq.Expressions;ExpressionVisitor;Visit;(System.Collections.ObjectModel.ReadOnlyCollection<System.Linq.Expressions.Expression>);Argument[0].Element;ReturnValue;taint;df-generated |
-| System.Linq.Expressions;ExpressionVisitor;Visit;(System.Linq.Expressions.Expression);Argument[0];Argument[this];taint;df-generated |
-| System.Linq.Expressions;ExpressionVisitor;Visit;(System.Linq.Expressions.Expression);Argument[0];ReturnValue;taint;df-generated |
+| System.Linq.Expressions;ExpressionVisitor;Visit;(System.Linq.Expressions.Expression);Argument[0];ReturnValue;value;dfc-generated |
+| System.Linq.Expressions;ExpressionVisitor;Visit<T>;(System.Collections.ObjectModel.ReadOnlyCollection<T>,System.Func<T,T>);Argument[0].Element;Argument[1].Parameter[0];value;dfc-generated |
+| System.Linq.Expressions;ExpressionVisitor;Visit<T>;(System.Collections.ObjectModel.ReadOnlyCollection<T>,System.Func<T,T>);Argument[0].Element;Argument[1].Parameter[0];value;hq-generated |
+| System.Linq.Expressions;ExpressionVisitor;Visit<T>;(System.Collections.ObjectModel.ReadOnlyCollection<T>,System.Func<T,T>);Argument[0];ReturnValue;value;dfc-generated |
+| System.Linq.Expressions;ExpressionVisitor;Visit<T>;(System.Collections.ObjectModel.ReadOnlyCollection<T>,System.Func<T,T>);Argument[0];ReturnValue;value;hq-generated |
+| System.Linq.Expressions;ExpressionVisitor;Visit<T>;(System.Collections.ObjectModel.ReadOnlyCollection<T>,System.Func<T,T>);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | System.Linq.Expressions;ExpressionVisitor;Visit<T>;(System.Collections.ObjectModel.ReadOnlyCollection<T>,System.Func<T,T>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
 | System.Linq.Expressions;ExpressionVisitor;VisitAndConvert<T>;(System.Collections.ObjectModel.ReadOnlyCollection<T>,System.String);Argument[0].Element;Argument[this];taint;df-generated |
 | System.Linq.Expressions;ExpressionVisitor;VisitAndConvert<T>;(System.Collections.ObjectModel.ReadOnlyCollection<T>,System.String);Argument[0].Element;ReturnValue;taint;df-generated |
@@ -11492,139 +11925,112 @@ summary
 | System.Linq.Expressions;ExpressionVisitor;VisitAndConvert<T>;(T,System.String);Argument[0];ReturnValue;taint;df-generated |
 | System.Linq.Expressions;ExpressionVisitor;VisitBinary;(System.Linq.Expressions.BinaryExpression);Argument[0];Argument[this];taint;df-generated |
 | System.Linq.Expressions;ExpressionVisitor;VisitBinary;(System.Linq.Expressions.BinaryExpression);Argument[0];ReturnValue;taint;df-generated |
-| System.Linq.Expressions;ExpressionVisitor;VisitBlock;(System.Linq.Expressions.BlockExpression);Argument[0];Argument[this];taint;df-generated |
-| System.Linq.Expressions;ExpressionVisitor;VisitBlock;(System.Linq.Expressions.BlockExpression);Argument[0];ReturnValue;taint;df-generated |
-| System.Linq.Expressions;ExpressionVisitor;VisitCatchBlock;(System.Linq.Expressions.CatchBlock);Argument[0];Argument[this];taint;df-generated |
-| System.Linq.Expressions;ExpressionVisitor;VisitCatchBlock;(System.Linq.Expressions.CatchBlock);Argument[0];ReturnValue;taint;df-generated |
+| System.Linq.Expressions;ExpressionVisitor;VisitBlock;(System.Linq.Expressions.BlockExpression);Argument[0];ReturnValue;value;dfc-generated |
+| System.Linq.Expressions;ExpressionVisitor;VisitCatchBlock;(System.Linq.Expressions.CatchBlock);Argument[0];ReturnValue;value;dfc-generated |
 | System.Linq.Expressions;ExpressionVisitor;VisitConditional;(System.Linq.Expressions.ConditionalExpression);Argument[0];Argument[this];taint;df-generated |
 | System.Linq.Expressions;ExpressionVisitor;VisitConditional;(System.Linq.Expressions.ConditionalExpression);Argument[0];ReturnValue;taint;df-generated |
-| System.Linq.Expressions;ExpressionVisitor;VisitConstant;(System.Linq.Expressions.ConstantExpression);Argument[0];Argument[this];taint;df-generated |
-| System.Linq.Expressions;ExpressionVisitor;VisitConstant;(System.Linq.Expressions.ConstantExpression);Argument[0];ReturnValue;taint;df-generated |
-| System.Linq.Expressions;ExpressionVisitor;VisitDebugInfo;(System.Linq.Expressions.DebugInfoExpression);Argument[0];Argument[this];taint;df-generated |
-| System.Linq.Expressions;ExpressionVisitor;VisitDebugInfo;(System.Linq.Expressions.DebugInfoExpression);Argument[0];ReturnValue;taint;df-generated |
-| System.Linq.Expressions;ExpressionVisitor;VisitDefault;(System.Linq.Expressions.DefaultExpression);Argument[0];ReturnValue;taint;df-generated |
-| System.Linq.Expressions;ExpressionVisitor;VisitDynamic;(System.Linq.Expressions.DynamicExpression);Argument[0];ReturnValue;taint;df-generated |
-| System.Linq.Expressions;ExpressionVisitor;VisitElementInit;(System.Linq.Expressions.ElementInit);Argument[0];Argument[this];taint;df-generated |
-| System.Linq.Expressions;ExpressionVisitor;VisitElementInit;(System.Linq.Expressions.ElementInit);Argument[0];ReturnValue;taint;df-generated |
-| System.Linq.Expressions;ExpressionVisitor;VisitExtension;(System.Linq.Expressions.Expression);Argument[0];Argument[this];taint;df-generated |
-| System.Linq.Expressions;ExpressionVisitor;VisitExtension;(System.Linq.Expressions.Expression);Argument[0];ReturnValue;taint;df-generated |
+| System.Linq.Expressions;ExpressionVisitor;VisitConstant;(System.Linq.Expressions.ConstantExpression);Argument[0];ReturnValue;value;dfc-generated |
+| System.Linq.Expressions;ExpressionVisitor;VisitDebugInfo;(System.Linq.Expressions.DebugInfoExpression);Argument[0];ReturnValue;value;dfc-generated |
+| System.Linq.Expressions;ExpressionVisitor;VisitDefault;(System.Linq.Expressions.DefaultExpression);Argument[0];ReturnValue;value;dfc-generated |
+| System.Linq.Expressions;ExpressionVisitor;VisitDynamic;(System.Linq.Expressions.DynamicExpression);Argument[0];ReturnValue;value;dfc-generated |
+| System.Linq.Expressions;ExpressionVisitor;VisitElementInit;(System.Linq.Expressions.ElementInit);Argument[0];ReturnValue;value;dfc-generated |
+| System.Linq.Expressions;ExpressionVisitor;VisitExtension;(System.Linq.Expressions.Expression);Argument[0];ReturnValue;value;dfc-generated |
 | System.Linq.Expressions;ExpressionVisitor;VisitGoto;(System.Linq.Expressions.GotoExpression);Argument[0];Argument[this];taint;df-generated |
 | System.Linq.Expressions;ExpressionVisitor;VisitGoto;(System.Linq.Expressions.GotoExpression);Argument[0];ReturnValue;taint;df-generated |
 | System.Linq.Expressions;ExpressionVisitor;VisitIndex;(System.Linq.Expressions.IndexExpression);Argument[0];Argument[this];taint;df-generated |
 | System.Linq.Expressions;ExpressionVisitor;VisitIndex;(System.Linq.Expressions.IndexExpression);Argument[0];ReturnValue;taint;df-generated |
 | System.Linq.Expressions;ExpressionVisitor;VisitInvocation;(System.Linq.Expressions.InvocationExpression);Argument[0];Argument[this];taint;df-generated |
 | System.Linq.Expressions;ExpressionVisitor;VisitInvocation;(System.Linq.Expressions.InvocationExpression);Argument[0];ReturnValue;taint;df-generated |
-| System.Linq.Expressions;ExpressionVisitor;VisitLabel;(System.Linq.Expressions.LabelExpression);Argument[0];Argument[this];taint;df-generated |
-| System.Linq.Expressions;ExpressionVisitor;VisitLabel;(System.Linq.Expressions.LabelExpression);Argument[0];ReturnValue;taint;df-generated |
-| System.Linq.Expressions;ExpressionVisitor;VisitLabelTarget;(System.Linq.Expressions.LabelTarget);Argument[0];ReturnValue;taint;df-generated |
-| System.Linq.Expressions;ExpressionVisitor;VisitLambda<T>;(System.Linq.Expressions.Expression<T>);Argument[0];Argument[this];taint;df-generated |
-| System.Linq.Expressions;ExpressionVisitor;VisitLambda<T>;(System.Linq.Expressions.Expression<T>);Argument[0];ReturnValue;taint;df-generated |
-| System.Linq.Expressions;ExpressionVisitor;VisitListInit;(System.Linq.Expressions.ListInitExpression);Argument[0];ReturnValue;taint;df-generated |
-| System.Linq.Expressions;ExpressionVisitor;VisitLoop;(System.Linq.Expressions.LoopExpression);Argument[0];Argument[this];taint;df-generated |
-| System.Linq.Expressions;ExpressionVisitor;VisitLoop;(System.Linq.Expressions.LoopExpression);Argument[0];ReturnValue;taint;df-generated |
+| System.Linq.Expressions;ExpressionVisitor;VisitLabel;(System.Linq.Expressions.LabelExpression);Argument[0];ReturnValue;value;dfc-generated |
+| System.Linq.Expressions;ExpressionVisitor;VisitLabelTarget;(System.Linq.Expressions.LabelTarget);Argument[0];ReturnValue;value;dfc-generated |
+| System.Linq.Expressions;ExpressionVisitor;VisitLambda<T>;(System.Linq.Expressions.Expression<T>);Argument[0];ReturnValue;value;dfc-generated |
+| System.Linq.Expressions;ExpressionVisitor;VisitListInit;(System.Linq.Expressions.ListInitExpression);Argument[0];ReturnValue;value;dfc-generated |
+| System.Linq.Expressions;ExpressionVisitor;VisitLoop;(System.Linq.Expressions.LoopExpression);Argument[0];ReturnValue;value;dfc-generated |
 | System.Linq.Expressions;ExpressionVisitor;VisitMember;(System.Linq.Expressions.MemberExpression);Argument[0];Argument[this];taint;df-generated |
 | System.Linq.Expressions;ExpressionVisitor;VisitMember;(System.Linq.Expressions.MemberExpression);Argument[0];ReturnValue;taint;df-generated |
 | System.Linq.Expressions;ExpressionVisitor;VisitMemberAssignment;(System.Linq.Expressions.MemberAssignment);Argument[0];Argument[this];taint;df-generated |
 | System.Linq.Expressions;ExpressionVisitor;VisitMemberAssignment;(System.Linq.Expressions.MemberAssignment);Argument[0];ReturnValue;taint;df-generated |
 | System.Linq.Expressions;ExpressionVisitor;VisitMemberBinding;(System.Linq.Expressions.MemberBinding);Argument[0];Argument[this];taint;df-generated |
 | System.Linq.Expressions;ExpressionVisitor;VisitMemberBinding;(System.Linq.Expressions.MemberBinding);Argument[0];ReturnValue;taint;df-generated |
-| System.Linq.Expressions;ExpressionVisitor;VisitMemberInit;(System.Linq.Expressions.MemberInitExpression);Argument[0];ReturnValue;taint;df-generated |
-| System.Linq.Expressions;ExpressionVisitor;VisitMemberListBinding;(System.Linq.Expressions.MemberListBinding);Argument[0];Argument[this];taint;df-generated |
-| System.Linq.Expressions;ExpressionVisitor;VisitMemberListBinding;(System.Linq.Expressions.MemberListBinding);Argument[0];ReturnValue;taint;df-generated |
-| System.Linq.Expressions;ExpressionVisitor;VisitMemberMemberBinding;(System.Linq.Expressions.MemberMemberBinding);Argument[0];Argument[this];taint;df-generated |
-| System.Linq.Expressions;ExpressionVisitor;VisitMemberMemberBinding;(System.Linq.Expressions.MemberMemberBinding);Argument[0];ReturnValue;taint;df-generated |
-| System.Linq.Expressions;ExpressionVisitor;VisitMethodCall;(System.Linq.Expressions.MethodCallExpression);Argument[0];Argument[this];taint;df-generated |
-| System.Linq.Expressions;ExpressionVisitor;VisitMethodCall;(System.Linq.Expressions.MethodCallExpression);Argument[0];ReturnValue;taint;df-generated |
-| System.Linq.Expressions;ExpressionVisitor;VisitNew;(System.Linq.Expressions.NewExpression);Argument[0];Argument[this];taint;df-generated |
-| System.Linq.Expressions;ExpressionVisitor;VisitNew;(System.Linq.Expressions.NewExpression);Argument[0];ReturnValue;taint;df-generated |
-| System.Linq.Expressions;ExpressionVisitor;VisitNewArray;(System.Linq.Expressions.NewArrayExpression);Argument[0];Argument[this];taint;df-generated |
-| System.Linq.Expressions;ExpressionVisitor;VisitNewArray;(System.Linq.Expressions.NewArrayExpression);Argument[0];ReturnValue;taint;df-generated |
-| System.Linq.Expressions;ExpressionVisitor;VisitParameter;(System.Linq.Expressions.ParameterExpression);Argument[0];Argument[this];taint;df-generated |
-| System.Linq.Expressions;ExpressionVisitor;VisitParameter;(System.Linq.Expressions.ParameterExpression);Argument[0];ReturnValue;taint;df-generated |
-| System.Linq.Expressions;ExpressionVisitor;VisitRuntimeVariables;(System.Linq.Expressions.RuntimeVariablesExpression);Argument[0];Argument[this];taint;df-generated |
-| System.Linq.Expressions;ExpressionVisitor;VisitRuntimeVariables;(System.Linq.Expressions.RuntimeVariablesExpression);Argument[0];ReturnValue;taint;df-generated |
-| System.Linq.Expressions;ExpressionVisitor;VisitSwitch;(System.Linq.Expressions.SwitchExpression);Argument[0];Argument[this];taint;df-generated |
-| System.Linq.Expressions;ExpressionVisitor;VisitSwitch;(System.Linq.Expressions.SwitchExpression);Argument[0];ReturnValue;taint;df-generated |
-| System.Linq.Expressions;ExpressionVisitor;VisitSwitchCase;(System.Linq.Expressions.SwitchCase);Argument[0];Argument[this];taint;df-generated |
-| System.Linq.Expressions;ExpressionVisitor;VisitSwitchCase;(System.Linq.Expressions.SwitchCase);Argument[0];ReturnValue;taint;df-generated |
-| System.Linq.Expressions;ExpressionVisitor;VisitTry;(System.Linq.Expressions.TryExpression);Argument[0];Argument[this];taint;df-generated |
-| System.Linq.Expressions;ExpressionVisitor;VisitTry;(System.Linq.Expressions.TryExpression);Argument[0];ReturnValue;taint;df-generated |
-| System.Linq.Expressions;ExpressionVisitor;VisitTypeBinary;(System.Linq.Expressions.TypeBinaryExpression);Argument[0];Argument[this];taint;df-generated |
-| System.Linq.Expressions;ExpressionVisitor;VisitTypeBinary;(System.Linq.Expressions.TypeBinaryExpression);Argument[0];ReturnValue;taint;df-generated |
-| System.Linq.Expressions;ExpressionVisitor;VisitUnary;(System.Linq.Expressions.UnaryExpression);Argument[0];Argument[this];taint;df-generated |
-| System.Linq.Expressions;ExpressionVisitor;VisitUnary;(System.Linq.Expressions.UnaryExpression);Argument[0];ReturnValue;taint;df-generated |
-| System.Linq.Expressions;GotoExpression;Accept;(System.Linq.Expressions.ExpressionVisitor);Argument[this];Argument[0];taint;df-generated |
-| System.Linq.Expressions;GotoExpression;Accept;(System.Linq.Expressions.ExpressionVisitor);Argument[this];ReturnValue;taint;df-generated |
-| System.Linq.Expressions;GotoExpression;Update;(System.Linq.Expressions.LabelTarget,System.Linq.Expressions.Expression);Argument[this];ReturnValue;value;df-generated |
+| System.Linq.Expressions;ExpressionVisitor;VisitMemberInit;(System.Linq.Expressions.MemberInitExpression);Argument[0];ReturnValue;value;dfc-generated |
+| System.Linq.Expressions;ExpressionVisitor;VisitMemberListBinding;(System.Linq.Expressions.MemberListBinding);Argument[0];ReturnValue;value;dfc-generated |
+| System.Linq.Expressions;ExpressionVisitor;VisitMemberMemberBinding;(System.Linq.Expressions.MemberMemberBinding);Argument[0];ReturnValue;value;dfc-generated |
+| System.Linq.Expressions;ExpressionVisitor;VisitMethodCall;(System.Linq.Expressions.MethodCallExpression);Argument[0];ReturnValue;value;dfc-generated |
+| System.Linq.Expressions;ExpressionVisitor;VisitNew;(System.Linq.Expressions.NewExpression);Argument[0];ReturnValue;value;dfc-generated |
+| System.Linq.Expressions;ExpressionVisitor;VisitNewArray;(System.Linq.Expressions.NewArrayExpression);Argument[0];ReturnValue;value;dfc-generated |
+| System.Linq.Expressions;ExpressionVisitor;VisitParameter;(System.Linq.Expressions.ParameterExpression);Argument[0];ReturnValue;value;dfc-generated |
+| System.Linq.Expressions;ExpressionVisitor;VisitRuntimeVariables;(System.Linq.Expressions.RuntimeVariablesExpression);Argument[0];ReturnValue;value;dfc-generated |
+| System.Linq.Expressions;ExpressionVisitor;VisitSwitch;(System.Linq.Expressions.SwitchExpression);Argument[0];ReturnValue;value;dfc-generated |
+| System.Linq.Expressions;ExpressionVisitor;VisitSwitchCase;(System.Linq.Expressions.SwitchCase);Argument[0];ReturnValue;value;dfc-generated |
+| System.Linq.Expressions;ExpressionVisitor;VisitTry;(System.Linq.Expressions.TryExpression);Argument[0];ReturnValue;value;dfc-generated |
+| System.Linq.Expressions;ExpressionVisitor;VisitTypeBinary;(System.Linq.Expressions.TypeBinaryExpression);Argument[0];ReturnValue;value;dfc-generated |
+| System.Linq.Expressions;ExpressionVisitor;VisitUnary;(System.Linq.Expressions.UnaryExpression);Argument[0];ReturnValue;value;dfc-generated |
+| System.Linq.Expressions;GotoExpression;Accept;(System.Linq.Expressions.ExpressionVisitor);Argument[this];ReturnValue;value;dfc-generated |
+| System.Linq.Expressions;GotoExpression;Update;(System.Linq.Expressions.LabelTarget,System.Linq.Expressions.Expression);Argument[this];ReturnValue;value;dfc-generated |
 | System.Linq.Expressions;IArgumentProvider;GetArgument;(System.Int32);Argument[this];ReturnValue;taint;df-generated |
-| System.Linq.Expressions;IndexExpression;Accept;(System.Linq.Expressions.ExpressionVisitor);Argument[this];Argument[0];taint;df-generated |
-| System.Linq.Expressions;IndexExpression;Accept;(System.Linq.Expressions.ExpressionVisitor);Argument[this];ReturnValue;taint;df-generated |
+| System.Linq.Expressions;IndexExpression;Accept;(System.Linq.Expressions.ExpressionVisitor);Argument[this];ReturnValue;value;dfc-generated |
+| System.Linq.Expressions;IndexExpression;GetArgument;(System.Int32);Argument[this].SyntheticField[System.Linq.Expressions.IndexExpression._arguments].Element;ReturnValue;value;df-generated |
+| System.Linq.Expressions;IndexExpression;GetArgument;(System.Int32);Argument[this].SyntheticField[System.Linq.Expressions.IndexExpression._arguments].Element;ReturnValue;value;dfc-generated |
 | System.Linq.Expressions;IndexExpression;GetArgument;(System.Int32);Argument[this];ReturnValue;taint;df-generated |
-| System.Linq.Expressions;IndexExpression;Update;(System.Linq.Expressions.Expression,System.Collections.Generic.IEnumerable<System.Linq.Expressions.Expression>);Argument[this];ReturnValue;value;df-generated |
-| System.Linq.Expressions;IndexExpression;get_Arguments;();Argument[this];ReturnValue;taint;df-generated |
-| System.Linq.Expressions;InvocationExpression;Accept;(System.Linq.Expressions.ExpressionVisitor);Argument[this];Argument[0];taint;df-generated |
-| System.Linq.Expressions;InvocationExpression;Accept;(System.Linq.Expressions.ExpressionVisitor);Argument[this];ReturnValue;taint;df-generated |
+| System.Linq.Expressions;IndexExpression;GetArgument;(System.Int32);Argument[this];ReturnValue;taint;dfc-generated |
+| System.Linq.Expressions;IndexExpression;Update;(System.Linq.Expressions.Expression,System.Collections.Generic.IEnumerable<System.Linq.Expressions.Expression>);Argument[1];ReturnValue.SyntheticField[System.Linq.Expressions.IndexExpression._arguments];value;dfc-generated |
+| System.Linq.Expressions;IndexExpression;Update;(System.Linq.Expressions.Expression,System.Collections.Generic.IEnumerable<System.Linq.Expressions.Expression>);Argument[this];ReturnValue;value;dfc-generated |
+| System.Linq.Expressions;IndexExpression;get_Arguments;();Argument[this].SyntheticField[System.Linq.Expressions.IndexExpression._arguments];ReturnValue;value;dfc-generated |
+| System.Linq.Expressions;InvocationExpression;Accept;(System.Linq.Expressions.ExpressionVisitor);Argument[this];ReturnValue;value;dfc-generated |
 | System.Linq.Expressions;InvocationExpression;GetArgument;(System.Int32);Argument[this];ReturnValue;taint;df-generated |
-| System.Linq.Expressions;InvocationExpression;Update;(System.Linq.Expressions.Expression,System.Collections.Generic.IEnumerable<System.Linq.Expressions.Expression>);Argument[this];ReturnValue;value;df-generated |
-| System.Linq.Expressions;LabelExpression;Accept;(System.Linq.Expressions.ExpressionVisitor);Argument[this];Argument[0];taint;df-generated |
-| System.Linq.Expressions;LabelExpression;Accept;(System.Linq.Expressions.ExpressionVisitor);Argument[this];ReturnValue;taint;df-generated |
-| System.Linq.Expressions;LabelExpression;Update;(System.Linq.Expressions.LabelTarget,System.Linq.Expressions.Expression);Argument[this];ReturnValue;value;df-generated |
-| System.Linq.Expressions;LabelTarget;ToString;();Argument[this];ReturnValue;taint;df-generated |
+| System.Linq.Expressions;InvocationExpression;Update;(System.Linq.Expressions.Expression,System.Collections.Generic.IEnumerable<System.Linq.Expressions.Expression>);Argument[this];ReturnValue;value;dfc-generated |
+| System.Linq.Expressions;LabelExpression;Accept;(System.Linq.Expressions.ExpressionVisitor);Argument[this];ReturnValue;value;dfc-generated |
+| System.Linq.Expressions;LabelExpression;Update;(System.Linq.Expressions.LabelTarget,System.Linq.Expressions.Expression);Argument[this];ReturnValue;value;dfc-generated |
+| System.Linq.Expressions;LabelTarget;ToString;();Argument[this].Property[System.Linq.Expressions.LabelTarget.Name];ReturnValue;value;dfc-generated |
 | System.Linq.Expressions;LambdaExpression;get_Body;();Argument[this];ReturnValue;taint;df-generated |
 | System.Linq.Expressions;LambdaExpression;get_Name;();Argument[this];ReturnValue;taint;df-generated |
-| System.Linq.Expressions;ListInitExpression;Accept;(System.Linq.Expressions.ExpressionVisitor);Argument[this];Argument[0];taint;df-generated |
-| System.Linq.Expressions;ListInitExpression;Accept;(System.Linq.Expressions.ExpressionVisitor);Argument[this];ReturnValue;taint;df-generated |
-| System.Linq.Expressions;ListInitExpression;Reduce;();Argument[this];ReturnValue;value;df-generated |
-| System.Linq.Expressions;ListInitExpression;Update;(System.Linq.Expressions.NewExpression,System.Collections.Generic.IEnumerable<System.Linq.Expressions.ElementInit>);Argument[this];ReturnValue;value;df-generated |
-| System.Linq.Expressions;LoopExpression;Accept;(System.Linq.Expressions.ExpressionVisitor);Argument[this];Argument[0];taint;df-generated |
-| System.Linq.Expressions;LoopExpression;Accept;(System.Linq.Expressions.ExpressionVisitor);Argument[this];ReturnValue;taint;df-generated |
-| System.Linq.Expressions;LoopExpression;Update;(System.Linq.Expressions.LabelTarget,System.Linq.Expressions.LabelTarget,System.Linq.Expressions.Expression);Argument[this];ReturnValue;value;df-generated |
-| System.Linq.Expressions;MemberAssignment;Update;(System.Linq.Expressions.Expression);Argument[this];ReturnValue;value;df-generated |
-| System.Linq.Expressions;MemberAssignment;get_Expression;();Argument[this];ReturnValue;taint;df-generated |
+| System.Linq.Expressions;LambdaExpression;get_Parameters;();Argument[this];ReturnValue;taint;df-generated |
+| System.Linq.Expressions;ListInitExpression;Accept;(System.Linq.Expressions.ExpressionVisitor);Argument[this];ReturnValue;value;dfc-generated |
+| System.Linq.Expressions;ListInitExpression;Reduce;();Argument[this];ReturnValue;value;dfc-generated |
+| System.Linq.Expressions;ListInitExpression;Update;(System.Linq.Expressions.NewExpression,System.Collections.Generic.IEnumerable<System.Linq.Expressions.ElementInit>);Argument[this];ReturnValue;value;dfc-generated |
+| System.Linq.Expressions;LoopExpression;Accept;(System.Linq.Expressions.ExpressionVisitor);Argument[this];ReturnValue;value;dfc-generated |
+| System.Linq.Expressions;LoopExpression;Update;(System.Linq.Expressions.LabelTarget,System.Linq.Expressions.LabelTarget,System.Linq.Expressions.Expression);Argument[this];ReturnValue;value;dfc-generated |
+| System.Linq.Expressions;MemberAssignment;Update;(System.Linq.Expressions.Expression);Argument[0];ReturnValue.SyntheticField[System.Linq.Expressions.MemberAssignment._expression];value;dfc-generated |
+| System.Linq.Expressions;MemberAssignment;Update;(System.Linq.Expressions.Expression);Argument[this];ReturnValue;value;dfc-generated |
+| System.Linq.Expressions;MemberAssignment;get_Expression;();Argument[this].SyntheticField[System.Linq.Expressions.MemberAssignment._expression];ReturnValue;value;dfc-generated |
 | System.Linq.Expressions;MemberBinding;ToString;();Argument[this];ReturnValue;taint;df-generated |
-| System.Linq.Expressions;MemberExpression;Accept;(System.Linq.Expressions.ExpressionVisitor);Argument[this];Argument[0];taint;df-generated |
-| System.Linq.Expressions;MemberExpression;Accept;(System.Linq.Expressions.ExpressionVisitor);Argument[this];ReturnValue;taint;df-generated |
+| System.Linq.Expressions;MemberExpression;Accept;(System.Linq.Expressions.ExpressionVisitor);Argument[this];ReturnValue;value;dfc-generated |
 | System.Linq.Expressions;MemberExpression;Update;(System.Linq.Expressions.Expression);Argument[this];ReturnValue;value;df-generated |
-| System.Linq.Expressions;MemberExpression;get_Member;();Argument[this];ReturnValue;taint;df-generated |
-| System.Linq.Expressions;MemberInitExpression;Accept;(System.Linq.Expressions.ExpressionVisitor);Argument[this];Argument[0];taint;df-generated |
-| System.Linq.Expressions;MemberInitExpression;Accept;(System.Linq.Expressions.ExpressionVisitor);Argument[this];ReturnValue;taint;df-generated |
-| System.Linq.Expressions;MemberInitExpression;Reduce;();Argument[this];ReturnValue;value;df-generated |
-| System.Linq.Expressions;MemberInitExpression;Update;(System.Linq.Expressions.NewExpression,System.Collections.Generic.IEnumerable<System.Linq.Expressions.MemberBinding>);Argument[this];ReturnValue;value;df-generated |
-| System.Linq.Expressions;MemberListBinding;Update;(System.Collections.Generic.IEnumerable<System.Linq.Expressions.ElementInit>);Argument[this];ReturnValue;value;df-generated |
-| System.Linq.Expressions;MemberMemberBinding;Update;(System.Collections.Generic.IEnumerable<System.Linq.Expressions.MemberBinding>);Argument[this];ReturnValue;value;df-generated |
-| System.Linq.Expressions;MethodCallExpression;Accept;(System.Linq.Expressions.ExpressionVisitor);Argument[this];Argument[0];taint;df-generated |
-| System.Linq.Expressions;MethodCallExpression;Accept;(System.Linq.Expressions.ExpressionVisitor);Argument[this];ReturnValue;taint;df-generated |
+| System.Linq.Expressions;MemberExpression;get_Member;();Argument[this].SyntheticField[System.Linq.Expressions.FieldExpression._field];ReturnValue;value;dfc-generated |
+| System.Linq.Expressions;MemberExpression;get_Member;();Argument[this].SyntheticField[System.Linq.Expressions.PropertyExpression._property];ReturnValue;value;dfc-generated |
+| System.Linq.Expressions;MemberInitExpression;Accept;(System.Linq.Expressions.ExpressionVisitor);Argument[this];ReturnValue;value;dfc-generated |
+| System.Linq.Expressions;MemberInitExpression;Reduce;();Argument[this];ReturnValue;value;dfc-generated |
+| System.Linq.Expressions;MemberInitExpression;Update;(System.Linq.Expressions.NewExpression,System.Collections.Generic.IEnumerable<System.Linq.Expressions.MemberBinding>);Argument[this];ReturnValue;value;dfc-generated |
+| System.Linq.Expressions;MemberListBinding;Update;(System.Collections.Generic.IEnumerable<System.Linq.Expressions.ElementInit>);Argument[this];ReturnValue;value;dfc-generated |
+| System.Linq.Expressions;MemberMemberBinding;Update;(System.Collections.Generic.IEnumerable<System.Linq.Expressions.MemberBinding>);Argument[this];ReturnValue;value;dfc-generated |
+| System.Linq.Expressions;MethodCallExpression;Accept;(System.Linq.Expressions.ExpressionVisitor);Argument[this];ReturnValue;value;dfc-generated |
 | System.Linq.Expressions;MethodCallExpression;GetArgument;(System.Int32);Argument[this];ReturnValue;taint;df-generated |
-| System.Linq.Expressions;MethodCallExpression;Update;(System.Linq.Expressions.Expression,System.Collections.Generic.IEnumerable<System.Linq.Expressions.Expression>);Argument[this];ReturnValue;value;df-generated |
+| System.Linq.Expressions;MethodCallExpression;Update;(System.Linq.Expressions.Expression,System.Collections.Generic.IEnumerable<System.Linq.Expressions.Expression>);Argument[this];ReturnValue;value;dfc-generated |
 | System.Linq.Expressions;MethodCallExpression;get_Arguments;();Argument[this];ReturnValue;taint;df-generated |
 | System.Linq.Expressions;MethodCallExpression;get_Object;();Argument[this];ReturnValue;taint;df-generated |
-| System.Linq.Expressions;NewArrayExpression;Accept;(System.Linq.Expressions.ExpressionVisitor);Argument[this];Argument[0];taint;df-generated |
-| System.Linq.Expressions;NewArrayExpression;Accept;(System.Linq.Expressions.ExpressionVisitor);Argument[this];ReturnValue;taint;df-generated |
-| System.Linq.Expressions;NewArrayExpression;Update;(System.Collections.Generic.IEnumerable<System.Linq.Expressions.Expression>);Argument[this];ReturnValue;value;df-generated |
-| System.Linq.Expressions;NewExpression;Accept;(System.Linq.Expressions.ExpressionVisitor);Argument[this];Argument[0];taint;df-generated |
-| System.Linq.Expressions;NewExpression;Accept;(System.Linq.Expressions.ExpressionVisitor);Argument[this];ReturnValue;taint;df-generated |
+| System.Linq.Expressions;NewArrayExpression;Accept;(System.Linq.Expressions.ExpressionVisitor);Argument[this];ReturnValue;value;dfc-generated |
+| System.Linq.Expressions;NewArrayExpression;Update;(System.Collections.Generic.IEnumerable<System.Linq.Expressions.Expression>);Argument[this];ReturnValue;value;dfc-generated |
+| System.Linq.Expressions;NewExpression;Accept;(System.Linq.Expressions.ExpressionVisitor);Argument[this];ReturnValue;value;dfc-generated |
+| System.Linq.Expressions;NewExpression;GetArgument;(System.Int32);Argument[this].SyntheticField[System.Linq.Expressions.NewExpression._arguments].Element;ReturnValue;value;df-generated |
+| System.Linq.Expressions;NewExpression;GetArgument;(System.Int32);Argument[this].SyntheticField[System.Linq.Expressions.NewExpression._arguments].Element;ReturnValue;value;dfc-generated |
 | System.Linq.Expressions;NewExpression;GetArgument;(System.Int32);Argument[this];ReturnValue;taint;df-generated |
-| System.Linq.Expressions;NewExpression;Update;(System.Collections.Generic.IEnumerable<System.Linq.Expressions.Expression>);Argument[this];ReturnValue;value;df-generated |
-| System.Linq.Expressions;NewExpression;get_Arguments;();Argument[this];ReturnValue;taint;df-generated |
-| System.Linq.Expressions;ParameterExpression;Accept;(System.Linq.Expressions.ExpressionVisitor);Argument[this];Argument[0];taint;df-generated |
-| System.Linq.Expressions;ParameterExpression;Accept;(System.Linq.Expressions.ExpressionVisitor);Argument[this];ReturnValue;taint;df-generated |
-| System.Linq.Expressions;RuntimeVariablesExpression;Accept;(System.Linq.Expressions.ExpressionVisitor);Argument[this];Argument[0];taint;df-generated |
-| System.Linq.Expressions;RuntimeVariablesExpression;Accept;(System.Linq.Expressions.ExpressionVisitor);Argument[this];ReturnValue;taint;df-generated |
-| System.Linq.Expressions;RuntimeVariablesExpression;Update;(System.Collections.Generic.IEnumerable<System.Linq.Expressions.ParameterExpression>);Argument[this];ReturnValue;value;df-generated |
-| System.Linq.Expressions;SwitchCase;Update;(System.Collections.Generic.IEnumerable<System.Linq.Expressions.Expression>,System.Linq.Expressions.Expression);Argument[this];ReturnValue;value;df-generated |
-| System.Linq.Expressions;SwitchExpression;Accept;(System.Linq.Expressions.ExpressionVisitor);Argument[this];Argument[0];taint;df-generated |
-| System.Linq.Expressions;SwitchExpression;Accept;(System.Linq.Expressions.ExpressionVisitor);Argument[this];ReturnValue;taint;df-generated |
-| System.Linq.Expressions;SwitchExpression;Update;(System.Linq.Expressions.Expression,System.Collections.Generic.IEnumerable<System.Linq.Expressions.SwitchCase>,System.Linq.Expressions.Expression);Argument[this];ReturnValue;value;df-generated |
-| System.Linq.Expressions;TryExpression;Accept;(System.Linq.Expressions.ExpressionVisitor);Argument[this];Argument[0];taint;df-generated |
-| System.Linq.Expressions;TryExpression;Accept;(System.Linq.Expressions.ExpressionVisitor);Argument[this];ReturnValue;taint;df-generated |
-| System.Linq.Expressions;TryExpression;Update;(System.Linq.Expressions.Expression,System.Collections.Generic.IEnumerable<System.Linq.Expressions.CatchBlock>,System.Linq.Expressions.Expression,System.Linq.Expressions.Expression);Argument[this];ReturnValue;value;df-generated |
-| System.Linq.Expressions;TypeBinaryExpression;Accept;(System.Linq.Expressions.ExpressionVisitor);Argument[this];Argument[0];taint;df-generated |
-| System.Linq.Expressions;TypeBinaryExpression;Accept;(System.Linq.Expressions.ExpressionVisitor);Argument[this];ReturnValue;taint;df-generated |
-| System.Linq.Expressions;TypeBinaryExpression;Update;(System.Linq.Expressions.Expression);Argument[this];ReturnValue;value;df-generated |
-| System.Linq.Expressions;UnaryExpression;Accept;(System.Linq.Expressions.ExpressionVisitor);Argument[this];Argument[0];taint;df-generated |
-| System.Linq.Expressions;UnaryExpression;Accept;(System.Linq.Expressions.ExpressionVisitor);Argument[this];ReturnValue;taint;df-generated |
-| System.Linq.Expressions;UnaryExpression;Reduce;();Argument[this];ReturnValue;value;df-generated |
-| System.Linq.Expressions;UnaryExpression;Update;(System.Linq.Expressions.Expression);Argument[this];ReturnValue;value;df-generated |
+| System.Linq.Expressions;NewExpression;GetArgument;(System.Int32);Argument[this];ReturnValue;taint;dfc-generated |
+| System.Linq.Expressions;NewExpression;Update;(System.Collections.Generic.IEnumerable<System.Linq.Expressions.Expression>);Argument[0];ReturnValue.SyntheticField[System.Linq.Expressions.NewExpression._arguments];value;dfc-generated |
+| System.Linq.Expressions;NewExpression;Update;(System.Collections.Generic.IEnumerable<System.Linq.Expressions.Expression>);Argument[this];ReturnValue;value;dfc-generated |
+| System.Linq.Expressions;NewExpression;get_Arguments;();Argument[this].SyntheticField[System.Linq.Expressions.NewExpression._arguments];ReturnValue;value;dfc-generated |
+| System.Linq.Expressions;ParameterExpression;Accept;(System.Linq.Expressions.ExpressionVisitor);Argument[this];ReturnValue;value;dfc-generated |
+| System.Linq.Expressions;RuntimeVariablesExpression;Accept;(System.Linq.Expressions.ExpressionVisitor);Argument[this];ReturnValue;value;dfc-generated |
+| System.Linq.Expressions;RuntimeVariablesExpression;Update;(System.Collections.Generic.IEnumerable<System.Linq.Expressions.ParameterExpression>);Argument[this];ReturnValue;value;dfc-generated |
+| System.Linq.Expressions;SwitchCase;Update;(System.Collections.Generic.IEnumerable<System.Linq.Expressions.Expression>,System.Linq.Expressions.Expression);Argument[this];ReturnValue;value;dfc-generated |
+| System.Linq.Expressions;SwitchExpression;Accept;(System.Linq.Expressions.ExpressionVisitor);Argument[this];ReturnValue;value;dfc-generated |
+| System.Linq.Expressions;SwitchExpression;Update;(System.Linq.Expressions.Expression,System.Collections.Generic.IEnumerable<System.Linq.Expressions.SwitchCase>,System.Linq.Expressions.Expression);Argument[this];ReturnValue;value;dfc-generated |
+| System.Linq.Expressions;TryExpression;Accept;(System.Linq.Expressions.ExpressionVisitor);Argument[this];ReturnValue;value;dfc-generated |
+| System.Linq.Expressions;TryExpression;Update;(System.Linq.Expressions.Expression,System.Collections.Generic.IEnumerable<System.Linq.Expressions.CatchBlock>,System.Linq.Expressions.Expression,System.Linq.Expressions.Expression);Argument[this];ReturnValue;value;dfc-generated |
+| System.Linq.Expressions;TypeBinaryExpression;Accept;(System.Linq.Expressions.ExpressionVisitor);Argument[this];ReturnValue;value;dfc-generated |
+| System.Linq.Expressions;TypeBinaryExpression;Update;(System.Linq.Expressions.Expression);Argument[this];ReturnValue;value;dfc-generated |
+| System.Linq.Expressions;UnaryExpression;Accept;(System.Linq.Expressions.ExpressionVisitor);Argument[this];ReturnValue;value;dfc-generated |
+| System.Linq.Expressions;UnaryExpression;Reduce;();Argument[this];ReturnValue;value;dfc-generated |
+| System.Linq.Expressions;UnaryExpression;Update;(System.Linq.Expressions.Expression);Argument[this];ReturnValue;value;dfc-generated |
 | System.Linq;Enumerable;Aggregate<TSource,TAccumulate,TResult>;(System.Collections.Generic.IEnumerable<TSource>,TAccumulate,System.Func<TAccumulate,TSource,TAccumulate>,System.Func<TAccumulate,TResult>);Argument[0].Element;Argument[2].Parameter[1];value;manual |
 | System.Linq;Enumerable;Aggregate<TSource,TAccumulate,TResult>;(System.Collections.Generic.IEnumerable<TSource>,TAccumulate,System.Func<TAccumulate,TSource,TAccumulate>,System.Func<TAccumulate,TResult>);Argument[1];Argument[2].Parameter[0];value;manual |
 | System.Linq;Enumerable;Aggregate<TSource,TAccumulate,TResult>;(System.Collections.Generic.IEnumerable<TSource>,TAccumulate,System.Func<TAccumulate,TSource,TAccumulate>,System.Func<TAccumulate,TResult>);Argument[2].ReturnValue;Argument[3].Parameter[0];value;manual |
@@ -11665,9 +12071,11 @@ summary
 | System.Linq;Enumerable;Average<TSource>;(System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,System.Single>);Argument[0].Element;Argument[1].Parameter[0];value;manual |
 | System.Linq;Enumerable;Average<TSource>;(System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,System.Single>);Argument[1];Argument[1].Parameter[delegate-self];value;manual |
 | System.Linq;Enumerable;Cast<TResult>;(System.Collections.IEnumerable);Argument[0].Element;ReturnValue.Element;value;manual |
-| System.Linq;Enumerable;Chunk<TSource>;(System.Collections.Generic.IEnumerable<TSource>,System.Int32);Argument[0].Element;ReturnValue;taint;df-generated |
+| System.Linq;Enumerable;Chunk<TSource>;(System.Collections.Generic.IEnumerable<TSource>,System.Int32);Argument[0].Element;ReturnValue.Element.Element;value;dfc-generated |
 | System.Linq;Enumerable;Concat<TSource>;(System.Collections.Generic.IEnumerable<TSource>,System.Collections.Generic.IEnumerable<TSource>);Argument[0].Element;ReturnValue.Element;value;manual |
 | System.Linq;Enumerable;Concat<TSource>;(System.Collections.Generic.IEnumerable<TSource>,System.Collections.Generic.IEnumerable<TSource>);Argument[1].Element;ReturnValue.Element;value;manual |
+| System.Linq;Enumerable;Contains<TSource>;(System.Collections.Generic.IEnumerable<TSource>,TSource,System.Collections.Generic.IEqualityComparer<TSource>);Argument[0].Element;Argument[2];taint;df-generated |
+| System.Linq;Enumerable;Contains<TSource>;(System.Collections.Generic.IEnumerable<TSource>,TSource,System.Collections.Generic.IEqualityComparer<TSource>);Argument[1];Argument[2];taint;df-generated |
 | System.Linq;Enumerable;Count<TSource>;(System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,System.Boolean>);Argument[0].Element;Argument[1].Parameter[0];value;manual |
 | System.Linq;Enumerable;Count<TSource>;(System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,System.Boolean>);Argument[1];Argument[1].Parameter[delegate-self];value;manual |
 | System.Linq;Enumerable;DefaultIfEmpty<TSource>;(System.Collections.Generic.IEnumerable<TSource>);Argument[0].Element;ReturnValue.Element;value;manual |
@@ -11675,15 +12083,35 @@ summary
 | System.Linq;Enumerable;DefaultIfEmpty<TSource>;(System.Collections.Generic.IEnumerable<TSource>,TSource);Argument[1];ReturnValue.Element;value;manual |
 | System.Linq;Enumerable;Distinct<TSource>;(System.Collections.Generic.IEnumerable<TSource>);Argument[0].Element;ReturnValue.Element;value;manual |
 | System.Linq;Enumerable;Distinct<TSource>;(System.Collections.Generic.IEnumerable<TSource>,System.Collections.Generic.IEqualityComparer<TSource>);Argument[0].Element;ReturnValue.Element;value;manual |
+| System.Linq;Enumerable;DistinctBy<TSource,TKey>;(System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,TKey>);Argument[0].Element;Argument[1].Parameter[0];value;dfc-generated |
+| System.Linq;Enumerable;DistinctBy<TSource,TKey>;(System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,TKey>);Argument[0].Element;Argument[1].Parameter[0];value;hq-generated |
+| System.Linq;Enumerable;DistinctBy<TSource,TKey>;(System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,TKey>);Argument[0].Element;ReturnValue.Element;value;dfc-generated |
+| System.Linq;Enumerable;DistinctBy<TSource,TKey>;(System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,TKey>);Argument[0].Element;ReturnValue.Element;value;hq-generated |
+| System.Linq;Enumerable;DistinctBy<TSource,TKey>;(System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,TKey>);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | System.Linq;Enumerable;DistinctBy<TSource,TKey>;(System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,TKey>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
+| System.Linq;Enumerable;DistinctBy<TSource,TKey>;(System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,TKey>,System.Collections.Generic.IEqualityComparer<TKey>);Argument[0].Element;Argument[1].Parameter[0];value;dfc-generated |
+| System.Linq;Enumerable;DistinctBy<TSource,TKey>;(System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,TKey>,System.Collections.Generic.IEqualityComparer<TKey>);Argument[0].Element;Argument[1].Parameter[0];value;hq-generated |
+| System.Linq;Enumerable;DistinctBy<TSource,TKey>;(System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,TKey>,System.Collections.Generic.IEqualityComparer<TKey>);Argument[0].Element;ReturnValue.Element;value;dfc-generated |
+| System.Linq;Enumerable;DistinctBy<TSource,TKey>;(System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,TKey>,System.Collections.Generic.IEqualityComparer<TKey>);Argument[0].Element;ReturnValue.Element;value;hq-generated |
+| System.Linq;Enumerable;DistinctBy<TSource,TKey>;(System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,TKey>,System.Collections.Generic.IEqualityComparer<TKey>);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | System.Linq;Enumerable;DistinctBy<TSource,TKey>;(System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,TKey>,System.Collections.Generic.IEqualityComparer<TKey>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
-| System.Linq;Enumerable;ElementAt<TSource>;(System.Collections.Generic.IEnumerable<TSource>,System.Index);Argument[0].Element;ReturnValue;taint;df-generated |
+| System.Linq;Enumerable;ElementAt<TSource>;(System.Collections.Generic.IEnumerable<TSource>,System.Index);Argument[0].Element;ReturnValue;value;dfc-generated |
 | System.Linq;Enumerable;ElementAt<TSource>;(System.Collections.Generic.IEnumerable<TSource>,System.Int32);Argument[0].Element;ReturnValue;value;manual |
-| System.Linq;Enumerable;ElementAtOrDefault<TSource>;(System.Collections.Generic.IEnumerable<TSource>,System.Index);Argument[0].Element;ReturnValue;taint;df-generated |
+| System.Linq;Enumerable;ElementAtOrDefault<TSource>;(System.Collections.Generic.IEnumerable<TSource>,System.Index);Argument[0].Element;ReturnValue;value;dfc-generated |
 | System.Linq;Enumerable;ElementAtOrDefault<TSource>;(System.Collections.Generic.IEnumerable<TSource>,System.Int32);Argument[0].Element;ReturnValue;value;manual |
 | System.Linq;Enumerable;Except<TSource>;(System.Collections.Generic.IEnumerable<TSource>,System.Collections.Generic.IEnumerable<TSource>);Argument[0].Element;ReturnValue.Element;value;manual |
 | System.Linq;Enumerable;Except<TSource>;(System.Collections.Generic.IEnumerable<TSource>,System.Collections.Generic.IEnumerable<TSource>,System.Collections.Generic.IEqualityComparer<TSource>);Argument[0].Element;ReturnValue.Element;value;manual |
+| System.Linq;Enumerable;ExceptBy<TSource,TKey>;(System.Collections.Generic.IEnumerable<TSource>,System.Collections.Generic.IEnumerable<TKey>,System.Func<TSource,TKey>);Argument[0].Element;Argument[2].Parameter[0];value;dfc-generated |
+| System.Linq;Enumerable;ExceptBy<TSource,TKey>;(System.Collections.Generic.IEnumerable<TSource>,System.Collections.Generic.IEnumerable<TKey>,System.Func<TSource,TKey>);Argument[0].Element;Argument[2].Parameter[0];value;hq-generated |
+| System.Linq;Enumerable;ExceptBy<TSource,TKey>;(System.Collections.Generic.IEnumerable<TSource>,System.Collections.Generic.IEnumerable<TKey>,System.Func<TSource,TKey>);Argument[0].Element;ReturnValue.Element;value;dfc-generated |
+| System.Linq;Enumerable;ExceptBy<TSource,TKey>;(System.Collections.Generic.IEnumerable<TSource>,System.Collections.Generic.IEnumerable<TKey>,System.Func<TSource,TKey>);Argument[0].Element;ReturnValue.Element;value;hq-generated |
+| System.Linq;Enumerable;ExceptBy<TSource,TKey>;(System.Collections.Generic.IEnumerable<TSource>,System.Collections.Generic.IEnumerable<TKey>,System.Func<TSource,TKey>);Argument[2];Argument[2].Parameter[delegate-self];value;dfc-generated |
 | System.Linq;Enumerable;ExceptBy<TSource,TKey>;(System.Collections.Generic.IEnumerable<TSource>,System.Collections.Generic.IEnumerable<TKey>,System.Func<TSource,TKey>);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
+| System.Linq;Enumerable;ExceptBy<TSource,TKey>;(System.Collections.Generic.IEnumerable<TSource>,System.Collections.Generic.IEnumerable<TKey>,System.Func<TSource,TKey>,System.Collections.Generic.IEqualityComparer<TKey>);Argument[0].Element;Argument[2].Parameter[0];value;dfc-generated |
+| System.Linq;Enumerable;ExceptBy<TSource,TKey>;(System.Collections.Generic.IEnumerable<TSource>,System.Collections.Generic.IEnumerable<TKey>,System.Func<TSource,TKey>,System.Collections.Generic.IEqualityComparer<TKey>);Argument[0].Element;Argument[2].Parameter[0];value;hq-generated |
+| System.Linq;Enumerable;ExceptBy<TSource,TKey>;(System.Collections.Generic.IEnumerable<TSource>,System.Collections.Generic.IEnumerable<TKey>,System.Func<TSource,TKey>,System.Collections.Generic.IEqualityComparer<TKey>);Argument[0].Element;ReturnValue.Element;value;dfc-generated |
+| System.Linq;Enumerable;ExceptBy<TSource,TKey>;(System.Collections.Generic.IEnumerable<TSource>,System.Collections.Generic.IEnumerable<TKey>,System.Func<TSource,TKey>,System.Collections.Generic.IEqualityComparer<TKey>);Argument[0].Element;ReturnValue.Element;value;hq-generated |
+| System.Linq;Enumerable;ExceptBy<TSource,TKey>;(System.Collections.Generic.IEnumerable<TSource>,System.Collections.Generic.IEnumerable<TKey>,System.Func<TSource,TKey>,System.Collections.Generic.IEqualityComparer<TKey>);Argument[2];Argument[2].Parameter[delegate-self];value;dfc-generated |
 | System.Linq;Enumerable;ExceptBy<TSource,TKey>;(System.Collections.Generic.IEnumerable<TSource>,System.Collections.Generic.IEnumerable<TKey>,System.Func<TSource,TKey>,System.Collections.Generic.IEqualityComparer<TKey>);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
 | System.Linq;Enumerable;First<TSource>;(System.Collections.Generic.IEnumerable<TSource>);Argument[0].Element;ReturnValue;value;manual |
 | System.Linq;Enumerable;First<TSource>;(System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,System.Boolean>);Argument[0].Element;Argument[1].Parameter[0];value;manual |
@@ -11693,9 +12121,16 @@ summary
 | System.Linq;Enumerable;FirstOrDefault<TSource>;(System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,System.Boolean>);Argument[0].Element;Argument[1].Parameter[0];value;manual |
 | System.Linq;Enumerable;FirstOrDefault<TSource>;(System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,System.Boolean>);Argument[0].Element;ReturnValue;value;manual |
 | System.Linq;Enumerable;FirstOrDefault<TSource>;(System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,System.Boolean>);Argument[1];Argument[1].Parameter[delegate-self];value;manual |
+| System.Linq;Enumerable;FirstOrDefault<TSource>;(System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,System.Boolean>,TSource);Argument[0].Element;Argument[1].Parameter[0];value;dfc-generated |
+| System.Linq;Enumerable;FirstOrDefault<TSource>;(System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,System.Boolean>,TSource);Argument[0].Element;Argument[1].Parameter[0];value;hq-generated |
+| System.Linq;Enumerable;FirstOrDefault<TSource>;(System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,System.Boolean>,TSource);Argument[0].Element;ReturnValue;value;dfc-generated |
+| System.Linq;Enumerable;FirstOrDefault<TSource>;(System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,System.Boolean>,TSource);Argument[0].Element;ReturnValue;value;hq-generated |
+| System.Linq;Enumerable;FirstOrDefault<TSource>;(System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,System.Boolean>,TSource);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | System.Linq;Enumerable;FirstOrDefault<TSource>;(System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,System.Boolean>,TSource);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
-| System.Linq;Enumerable;FirstOrDefault<TSource>;(System.Collections.Generic.IEnumerable<TSource>,TSource);Argument[0].Element;ReturnValue;taint;df-generated |
-| System.Linq;Enumerable;FirstOrDefault<TSource>;(System.Collections.Generic.IEnumerable<TSource>,TSource);Argument[1];ReturnValue;taint;df-generated |
+| System.Linq;Enumerable;FirstOrDefault<TSource>;(System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,System.Boolean>,TSource);Argument[2];ReturnValue;value;dfc-generated |
+| System.Linq;Enumerable;FirstOrDefault<TSource>;(System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,System.Boolean>,TSource);Argument[2];ReturnValue;value;hq-generated |
+| System.Linq;Enumerable;FirstOrDefault<TSource>;(System.Collections.Generic.IEnumerable<TSource>,TSource);Argument[0].Element;ReturnValue;value;dfc-generated |
+| System.Linq;Enumerable;FirstOrDefault<TSource>;(System.Collections.Generic.IEnumerable<TSource>,TSource);Argument[1];ReturnValue;value;dfc-generated |
 | System.Linq;Enumerable;GroupBy<TSource,TKey,TElement,TResult>;(System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,TKey>,System.Func<TSource,TElement>,System.Func<TKey,System.Collections.Generic.IEnumerable<TElement>,TResult>);Argument[0].Element;Argument[1].Parameter[0];value;manual |
 | System.Linq;Enumerable;GroupBy<TSource,TKey,TElement,TResult>;(System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,TKey>,System.Func<TSource,TElement>,System.Func<TKey,System.Collections.Generic.IEnumerable<TElement>,TResult>);Argument[0].Element;Argument[2].Parameter[0];value;manual |
 | System.Linq;Enumerable;GroupBy<TSource,TKey,TElement,TResult>;(System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,TKey>,System.Func<TSource,TElement>,System.Func<TKey,System.Collections.Generic.IEnumerable<TElement>,TResult>);Argument[1].ReturnValue;Argument[2].Parameter[0];value;manual |
@@ -11757,7 +12192,17 @@ summary
 | System.Linq;Enumerable;Intersect<TSource>;(System.Collections.Generic.IEnumerable<TSource>,System.Collections.Generic.IEnumerable<TSource>);Argument[1].Element;ReturnValue.Element;value;manual |
 | System.Linq;Enumerable;Intersect<TSource>;(System.Collections.Generic.IEnumerable<TSource>,System.Collections.Generic.IEnumerable<TSource>,System.Collections.Generic.IEqualityComparer<TSource>);Argument[0].Element;ReturnValue.Element;value;manual |
 | System.Linq;Enumerable;Intersect<TSource>;(System.Collections.Generic.IEnumerable<TSource>,System.Collections.Generic.IEnumerable<TSource>,System.Collections.Generic.IEqualityComparer<TSource>);Argument[1].Element;ReturnValue.Element;value;manual |
+| System.Linq;Enumerable;IntersectBy<TSource,TKey>;(System.Collections.Generic.IEnumerable<TSource>,System.Collections.Generic.IEnumerable<TKey>,System.Func<TSource,TKey>);Argument[0].Element;Argument[2].Parameter[0];value;dfc-generated |
+| System.Linq;Enumerable;IntersectBy<TSource,TKey>;(System.Collections.Generic.IEnumerable<TSource>,System.Collections.Generic.IEnumerable<TKey>,System.Func<TSource,TKey>);Argument[0].Element;Argument[2].Parameter[0];value;hq-generated |
+| System.Linq;Enumerable;IntersectBy<TSource,TKey>;(System.Collections.Generic.IEnumerable<TSource>,System.Collections.Generic.IEnumerable<TKey>,System.Func<TSource,TKey>);Argument[0].Element;ReturnValue.Element;value;dfc-generated |
+| System.Linq;Enumerable;IntersectBy<TSource,TKey>;(System.Collections.Generic.IEnumerable<TSource>,System.Collections.Generic.IEnumerable<TKey>,System.Func<TSource,TKey>);Argument[0].Element;ReturnValue.Element;value;hq-generated |
+| System.Linq;Enumerable;IntersectBy<TSource,TKey>;(System.Collections.Generic.IEnumerable<TSource>,System.Collections.Generic.IEnumerable<TKey>,System.Func<TSource,TKey>);Argument[2];Argument[2].Parameter[delegate-self];value;dfc-generated |
 | System.Linq;Enumerable;IntersectBy<TSource,TKey>;(System.Collections.Generic.IEnumerable<TSource>,System.Collections.Generic.IEnumerable<TKey>,System.Func<TSource,TKey>);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
+| System.Linq;Enumerable;IntersectBy<TSource,TKey>;(System.Collections.Generic.IEnumerable<TSource>,System.Collections.Generic.IEnumerable<TKey>,System.Func<TSource,TKey>,System.Collections.Generic.IEqualityComparer<TKey>);Argument[0].Element;Argument[2].Parameter[0];value;dfc-generated |
+| System.Linq;Enumerable;IntersectBy<TSource,TKey>;(System.Collections.Generic.IEnumerable<TSource>,System.Collections.Generic.IEnumerable<TKey>,System.Func<TSource,TKey>,System.Collections.Generic.IEqualityComparer<TKey>);Argument[0].Element;Argument[2].Parameter[0];value;hq-generated |
+| System.Linq;Enumerable;IntersectBy<TSource,TKey>;(System.Collections.Generic.IEnumerable<TSource>,System.Collections.Generic.IEnumerable<TKey>,System.Func<TSource,TKey>,System.Collections.Generic.IEqualityComparer<TKey>);Argument[0].Element;ReturnValue.Element;value;dfc-generated |
+| System.Linq;Enumerable;IntersectBy<TSource,TKey>;(System.Collections.Generic.IEnumerable<TSource>,System.Collections.Generic.IEnumerable<TKey>,System.Func<TSource,TKey>,System.Collections.Generic.IEqualityComparer<TKey>);Argument[0].Element;ReturnValue.Element;value;hq-generated |
+| System.Linq;Enumerable;IntersectBy<TSource,TKey>;(System.Collections.Generic.IEnumerable<TSource>,System.Collections.Generic.IEnumerable<TKey>,System.Func<TSource,TKey>,System.Collections.Generic.IEqualityComparer<TKey>);Argument[2];Argument[2].Parameter[delegate-self];value;dfc-generated |
 | System.Linq;Enumerable;IntersectBy<TSource,TKey>;(System.Collections.Generic.IEnumerable<TSource>,System.Collections.Generic.IEnumerable<TKey>,System.Func<TSource,TKey>,System.Collections.Generic.IEqualityComparer<TKey>);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
 | System.Linq;Enumerable;Join<TOuter,TInner,TKey,TResult>;(System.Collections.Generic.IEnumerable<TOuter>,System.Collections.Generic.IEnumerable<TInner>,System.Func<TOuter,TKey>,System.Func<TInner,TKey>,System.Func<TOuter,TInner,TResult>);Argument[0].Element;Argument[2].Parameter[0];value;manual |
 | System.Linq;Enumerable;Join<TOuter,TInner,TKey,TResult>;(System.Collections.Generic.IEnumerable<TOuter>,System.Collections.Generic.IEnumerable<TInner>,System.Func<TOuter,TKey>,System.Func<TInner,TKey>,System.Func<TOuter,TInner,TResult>);Argument[0].Element;Argument[4].Parameter[0];value;manual |
@@ -11783,15 +12228,18 @@ summary
 | System.Linq;Enumerable;LastOrDefault<TSource>;(System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,System.Boolean>);Argument[0].Element;Argument[1].Parameter[0];value;manual |
 | System.Linq;Enumerable;LastOrDefault<TSource>;(System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,System.Boolean>);Argument[0].Element;ReturnValue;value;manual |
 | System.Linq;Enumerable;LastOrDefault<TSource>;(System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,System.Boolean>);Argument[1];Argument[1].Parameter[delegate-self];value;manual |
+| System.Linq;Enumerable;LastOrDefault<TSource>;(System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,System.Boolean>,TSource);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | System.Linq;Enumerable;LastOrDefault<TSource>;(System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,System.Boolean>,TSource);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
-| System.Linq;Enumerable;LastOrDefault<TSource>;(System.Collections.Generic.IEnumerable<TSource>,TSource);Argument[0].Element;ReturnValue;taint;df-generated |
-| System.Linq;Enumerable;LastOrDefault<TSource>;(System.Collections.Generic.IEnumerable<TSource>,TSource);Argument[1];ReturnValue;taint;df-generated |
+| System.Linq;Enumerable;LastOrDefault<TSource>;(System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,System.Boolean>,TSource);Argument[2];ReturnValue;value;dfc-generated |
+| System.Linq;Enumerable;LastOrDefault<TSource>;(System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,System.Boolean>,TSource);Argument[2];ReturnValue;value;hq-generated |
+| System.Linq;Enumerable;LastOrDefault<TSource>;(System.Collections.Generic.IEnumerable<TSource>,TSource);Argument[0].Element;ReturnValue;value;dfc-generated |
+| System.Linq;Enumerable;LastOrDefault<TSource>;(System.Collections.Generic.IEnumerable<TSource>,TSource);Argument[1];ReturnValue;value;dfc-generated |
 | System.Linq;Enumerable;LongCount<TSource>;(System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,System.Boolean>);Argument[0].Element;Argument[1].Parameter[0];value;manual |
 | System.Linq;Enumerable;LongCount<TSource>;(System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,System.Boolean>);Argument[1];Argument[1].Parameter[delegate-self];value;manual |
-| System.Linq;Enumerable;Max;(System.Collections.Generic.IEnumerable<System.Nullable<System.Double>>);Argument[0].Element;ReturnValue;taint;df-generated |
-| System.Linq;Enumerable;Max;(System.Collections.Generic.IEnumerable<System.Nullable<System.Int32>>);Argument[0].Element;ReturnValue;taint;df-generated |
-| System.Linq;Enumerable;Max;(System.Collections.Generic.IEnumerable<System.Nullable<System.Int64>>);Argument[0].Element;ReturnValue;taint;df-generated |
-| System.Linq;Enumerable;Max;(System.Collections.Generic.IEnumerable<System.Nullable<System.Single>>);Argument[0].Element;ReturnValue;taint;df-generated |
+| System.Linq;Enumerable;Max;(System.Collections.Generic.IEnumerable<System.Nullable<System.Double>>);Argument[0].Element;ReturnValue;value;dfc-generated |
+| System.Linq;Enumerable;Max;(System.Collections.Generic.IEnumerable<System.Nullable<System.Int32>>);Argument[0].Element;ReturnValue;value;dfc-generated |
+| System.Linq;Enumerable;Max;(System.Collections.Generic.IEnumerable<System.Nullable<System.Int64>>);Argument[0].Element;ReturnValue;value;dfc-generated |
+| System.Linq;Enumerable;Max;(System.Collections.Generic.IEnumerable<System.Nullable<System.Single>>);Argument[0].Element;ReturnValue;value;dfc-generated |
 | System.Linq;Enumerable;Max<TSource,TResult>;(System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,TResult>);Argument[0].Element;Argument[1].Parameter[0];value;manual |
 | System.Linq;Enumerable;Max<TSource,TResult>;(System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,TResult>);Argument[1];Argument[1].Parameter[delegate-self];value;manual |
 | System.Linq;Enumerable;Max<TSource>;(System.Collections.Generic.IEnumerable<TSource>);Argument[0].Element;ReturnValue;taint;df-generated |
@@ -11819,10 +12267,10 @@ summary
 | System.Linq;Enumerable;Max<TSource>;(System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,System.Single>);Argument[1];Argument[1].Parameter[delegate-self];value;manual |
 | System.Linq;Enumerable;MaxBy<TSource,TKey>;(System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,TKey>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
 | System.Linq;Enumerable;MaxBy<TSource,TKey>;(System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,TKey>,System.Collections.Generic.IComparer<TKey>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
-| System.Linq;Enumerable;Min;(System.Collections.Generic.IEnumerable<System.Nullable<System.Double>>);Argument[0].Element;ReturnValue;taint;df-generated |
-| System.Linq;Enumerable;Min;(System.Collections.Generic.IEnumerable<System.Nullable<System.Int32>>);Argument[0].Element;ReturnValue;taint;df-generated |
-| System.Linq;Enumerable;Min;(System.Collections.Generic.IEnumerable<System.Nullable<System.Int64>>);Argument[0].Element;ReturnValue;taint;df-generated |
-| System.Linq;Enumerable;Min;(System.Collections.Generic.IEnumerable<System.Nullable<System.Single>>);Argument[0].Element;ReturnValue;taint;df-generated |
+| System.Linq;Enumerable;Min;(System.Collections.Generic.IEnumerable<System.Nullable<System.Double>>);Argument[0].Element;ReturnValue;value;dfc-generated |
+| System.Linq;Enumerable;Min;(System.Collections.Generic.IEnumerable<System.Nullable<System.Int32>>);Argument[0].Element;ReturnValue;value;dfc-generated |
+| System.Linq;Enumerable;Min;(System.Collections.Generic.IEnumerable<System.Nullable<System.Int64>>);Argument[0].Element;ReturnValue;value;dfc-generated |
+| System.Linq;Enumerable;Min;(System.Collections.Generic.IEnumerable<System.Nullable<System.Single>>);Argument[0].Element;ReturnValue;value;dfc-generated |
 | System.Linq;Enumerable;Min<TSource,TResult>;(System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,TResult>);Argument[0].Element;Argument[1].Parameter[0];value;manual |
 | System.Linq;Enumerable;Min<TSource,TResult>;(System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,TResult>);Argument[1];Argument[1].Parameter[delegate-self];value;manual |
 | System.Linq;Enumerable;Min<TSource>;(System.Collections.Generic.IEnumerable<TSource>);Argument[0].Element;ReturnValue;taint;df-generated |
@@ -11851,9 +12299,8 @@ summary
 | System.Linq;Enumerable;MinBy<TSource,TKey>;(System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,TKey>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
 | System.Linq;Enumerable;MinBy<TSource,TKey>;(System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,TKey>,System.Collections.Generic.IComparer<TKey>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
 | System.Linq;Enumerable;OfType<TResult>;(System.Collections.IEnumerable);Argument[0].Element;ReturnValue.Element;value;manual |
-| System.Linq;Enumerable;Order<T>;(System.Collections.Generic.IEnumerable<T>);Argument[0].Element;ReturnValue;taint;df-generated |
-| System.Linq;Enumerable;Order<T>;(System.Collections.Generic.IEnumerable<T>,System.Collections.Generic.IComparer<T>);Argument[0].Element;ReturnValue;taint;df-generated |
-| System.Linq;Enumerable;Order<T>;(System.Collections.Generic.IEnumerable<T>,System.Collections.Generic.IComparer<T>);Argument[1];ReturnValue;taint;df-generated |
+| System.Linq;Enumerable;Order<T>;(System.Collections.Generic.IEnumerable<T>);Argument[0].Element;ReturnValue.Element;value;dfc-generated |
+| System.Linq;Enumerable;Order<T>;(System.Collections.Generic.IEnumerable<T>,System.Collections.Generic.IComparer<T>);Argument[0].Element;ReturnValue.Element;value;dfc-generated |
 | System.Linq;Enumerable;OrderBy<TSource,TKey>;(System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,TKey>);Argument[0].Element;Argument[1].Parameter[0];value;manual |
 | System.Linq;Enumerable;OrderBy<TSource,TKey>;(System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,TKey>);Argument[0].Element;ReturnValue.Element;value;manual |
 | System.Linq;Enumerable;OrderBy<TSource,TKey>;(System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,TKey>);Argument[1];Argument[1].Parameter[delegate-self];value;manual |
@@ -11866,9 +12313,8 @@ summary
 | System.Linq;Enumerable;OrderByDescending<TSource,TKey>;(System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,TKey>,System.Collections.Generic.IComparer<TKey>);Argument[0].Element;Argument[1].Parameter[0];value;manual |
 | System.Linq;Enumerable;OrderByDescending<TSource,TKey>;(System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,TKey>,System.Collections.Generic.IComparer<TKey>);Argument[0].Element;ReturnValue.Element;value;manual |
 | System.Linq;Enumerable;OrderByDescending<TSource,TKey>;(System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,TKey>,System.Collections.Generic.IComparer<TKey>);Argument[1];Argument[1].Parameter[delegate-self];value;manual |
-| System.Linq;Enumerable;OrderDescending<T>;(System.Collections.Generic.IEnumerable<T>);Argument[0].Element;ReturnValue;taint;df-generated |
-| System.Linq;Enumerable;OrderDescending<T>;(System.Collections.Generic.IEnumerable<T>,System.Collections.Generic.IComparer<T>);Argument[0].Element;ReturnValue;taint;df-generated |
-| System.Linq;Enumerable;OrderDescending<T>;(System.Collections.Generic.IEnumerable<T>,System.Collections.Generic.IComparer<T>);Argument[1];ReturnValue;taint;df-generated |
+| System.Linq;Enumerable;OrderDescending<T>;(System.Collections.Generic.IEnumerable<T>);Argument[0].Element;ReturnValue.Element;value;dfc-generated |
+| System.Linq;Enumerable;OrderDescending<T>;(System.Collections.Generic.IEnumerable<T>,System.Collections.Generic.IComparer<T>);Argument[0].Element;ReturnValue.Element;value;dfc-generated |
 | System.Linq;Enumerable;Prepend<TSource>;(System.Collections.Generic.IEnumerable<TSource>,TSource);Argument[1];ReturnValue;taint;df-generated |
 | System.Linq;Enumerable;Repeat<TResult>;(TResult,System.Int32);Argument[0];ReturnValue;taint;df-generated |
 | System.Linq;Enumerable;Reverse<TSource>;(System.Collections.Generic.IEnumerable<TSource>);Argument[0].Element;ReturnValue.Element;value;manual |
@@ -11896,6 +12342,8 @@ summary
 | System.Linq;Enumerable;SelectMany<TSource,TResult>;(System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,System.Int32,System.Collections.Generic.IEnumerable<TResult>>);Argument[0].Element;Argument[1].Parameter[0];value;manual |
 | System.Linq;Enumerable;SelectMany<TSource,TResult>;(System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,System.Int32,System.Collections.Generic.IEnumerable<TResult>>);Argument[1].ReturnValue;ReturnValue.Element;value;manual |
 | System.Linq;Enumerable;SelectMany<TSource,TResult>;(System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,System.Int32,System.Collections.Generic.IEnumerable<TResult>>);Argument[1];Argument[1].Parameter[delegate-self];value;manual |
+| System.Linq;Enumerable;SequenceEqual<TSource>;(System.Collections.Generic.IEnumerable<TSource>,System.Collections.Generic.IEnumerable<TSource>,System.Collections.Generic.IEqualityComparer<TSource>);Argument[0].Element;Argument[2];taint;df-generated |
+| System.Linq;Enumerable;SequenceEqual<TSource>;(System.Collections.Generic.IEnumerable<TSource>,System.Collections.Generic.IEnumerable<TSource>,System.Collections.Generic.IEqualityComparer<TSource>);Argument[1].Element;Argument[2];taint;df-generated |
 | System.Linq;Enumerable;Single<TSource>;(System.Collections.Generic.IEnumerable<TSource>);Argument[0].Element;ReturnValue;value;manual |
 | System.Linq;Enumerable;Single<TSource>;(System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,System.Boolean>);Argument[0].Element;Argument[1].Parameter[0];value;manual |
 | System.Linq;Enumerable;Single<TSource>;(System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,System.Boolean>);Argument[0].Element;ReturnValue;value;manual |
@@ -11904,9 +12352,16 @@ summary
 | System.Linq;Enumerable;SingleOrDefault<TSource>;(System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,System.Boolean>);Argument[0].Element;Argument[1].Parameter[0];value;manual |
 | System.Linq;Enumerable;SingleOrDefault<TSource>;(System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,System.Boolean>);Argument[0].Element;ReturnValue;value;manual |
 | System.Linq;Enumerable;SingleOrDefault<TSource>;(System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,System.Boolean>);Argument[1];Argument[1].Parameter[delegate-self];value;manual |
+| System.Linq;Enumerable;SingleOrDefault<TSource>;(System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,System.Boolean>,TSource);Argument[0].Element;Argument[1].Parameter[0];value;dfc-generated |
+| System.Linq;Enumerable;SingleOrDefault<TSource>;(System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,System.Boolean>,TSource);Argument[0].Element;Argument[1].Parameter[0];value;hq-generated |
+| System.Linq;Enumerable;SingleOrDefault<TSource>;(System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,System.Boolean>,TSource);Argument[0].Element;ReturnValue;value;dfc-generated |
+| System.Linq;Enumerable;SingleOrDefault<TSource>;(System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,System.Boolean>,TSource);Argument[0].Element;ReturnValue;value;hq-generated |
+| System.Linq;Enumerable;SingleOrDefault<TSource>;(System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,System.Boolean>,TSource);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | System.Linq;Enumerable;SingleOrDefault<TSource>;(System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,System.Boolean>,TSource);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
-| System.Linq;Enumerable;SingleOrDefault<TSource>;(System.Collections.Generic.IEnumerable<TSource>,TSource);Argument[0].Element;ReturnValue;taint;df-generated |
-| System.Linq;Enumerable;SingleOrDefault<TSource>;(System.Collections.Generic.IEnumerable<TSource>,TSource);Argument[1];ReturnValue;taint;df-generated |
+| System.Linq;Enumerable;SingleOrDefault<TSource>;(System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,System.Boolean>,TSource);Argument[2];ReturnValue;value;dfc-generated |
+| System.Linq;Enumerable;SingleOrDefault<TSource>;(System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,System.Boolean>,TSource);Argument[2];ReturnValue;value;hq-generated |
+| System.Linq;Enumerable;SingleOrDefault<TSource>;(System.Collections.Generic.IEnumerable<TSource>,TSource);Argument[0].Element;ReturnValue;value;dfc-generated |
+| System.Linq;Enumerable;SingleOrDefault<TSource>;(System.Collections.Generic.IEnumerable<TSource>,TSource);Argument[1];ReturnValue;value;dfc-generated |
 | System.Linq;Enumerable;Skip<TSource>;(System.Collections.Generic.IEnumerable<TSource>,System.Int32);Argument[0].Element;ReturnValue.Element;value;manual |
 | System.Linq;Enumerable;SkipLast<TSource>;(System.Collections.Generic.IEnumerable<TSource>,System.Int32);Argument[0].Element;ReturnValue;taint;df-generated |
 | System.Linq;Enumerable;SkipWhile<TSource>;(System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,System.Boolean>);Argument[0].Element;Argument[1].Parameter[0];value;manual |
@@ -11957,11 +12412,16 @@ summary
 | System.Linq;Enumerable;ThenByDescending<TSource,TKey>;(System.Linq.IOrderedEnumerable<TSource>,System.Func<TSource,TKey>,System.Collections.Generic.IComparer<TKey>);Argument[0].Element;ReturnValue.Element;value;manual |
 | System.Linq;Enumerable;ThenByDescending<TSource,TKey>;(System.Linq.IOrderedEnumerable<TSource>,System.Func<TSource,TKey>,System.Collections.Generic.IComparer<TKey>);Argument[1];Argument[1].Parameter[delegate-self];value;manual |
 | System.Linq;Enumerable;ToArray<TSource>;(System.Collections.Generic.IEnumerable<TSource>);Argument[0].Element;ReturnValue.Element;value;manual |
-| System.Linq;Enumerable;ToDictionary<TKey,TValue>;(System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<TKey,TValue>>);Argument[0].Element;ReturnValue;taint;df-generated |
-| System.Linq;Enumerable;ToDictionary<TKey,TValue>;(System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<TKey,TValue>>,System.Collections.Generic.IEqualityComparer<TKey>);Argument[0].Element;ReturnValue;taint;df-generated |
-| System.Linq;Enumerable;ToDictionary<TKey,TValue>;(System.Collections.Generic.IEnumerable<System.ValueTuple<TKey,TValue>>);Argument[0].Element;ReturnValue;taint;df-generated |
-| System.Linq;Enumerable;ToDictionary<TKey,TValue>;(System.Collections.Generic.IEnumerable<System.ValueTuple<TKey,TValue>>,System.Collections.Generic.IEqualityComparer<TKey>);Argument[0].Element;ReturnValue;taint;df-generated |
-| System.Linq;Enumerable;ToDictionary<TKey,TValue>;(System.Collections.Generic.IEnumerable<System.ValueTuple<TKey,TValue>>,System.Collections.Generic.IEqualityComparer<TKey>);Argument[1];ReturnValue;taint;df-generated |
+| System.Linq;Enumerable;ToDictionary<TKey,TValue>;(System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<TKey,TValue>>);Argument[0].Element.Property[System.Collections.Generic.KeyValuePair`2.Key];ReturnValue.Element.Property[System.Collections.Generic.KeyValuePair`2.Key];value;dfc-generated |
+| System.Linq;Enumerable;ToDictionary<TKey,TValue>;(System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<TKey,TValue>>);Argument[0].Element.Property[System.Collections.Generic.KeyValuePair`2.Value];ReturnValue.Element.Property[System.Collections.Generic.KeyValuePair`2.Value];value;dfc-generated |
+| System.Linq;Enumerable;ToDictionary<TKey,TValue>;(System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<TKey,TValue>>,System.Collections.Generic.IEqualityComparer<TKey>);Argument[0].Element.Property[System.Collections.Generic.KeyValuePair`2.Key];ReturnValue.Element.Property[System.Collections.Generic.KeyValuePair`2.Key];value;dfc-generated |
+| System.Linq;Enumerable;ToDictionary<TKey,TValue>;(System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<TKey,TValue>>,System.Collections.Generic.IEqualityComparer<TKey>);Argument[0].Element.Property[System.Collections.Generic.KeyValuePair`2.Value];ReturnValue.Element.Property[System.Collections.Generic.KeyValuePair`2.Value];value;dfc-generated |
+| System.Linq;Enumerable;ToDictionary<TKey,TValue>;(System.Collections.Generic.IEnumerable<System.ValueTuple<TKey,TValue>>);Argument[0].Element.Field[System.ValueTuple`2.Item1];ReturnValue.Element.Property[System.Collections.Generic.KeyValuePair`2.Key];value;dfc-generated |
+| System.Linq;Enumerable;ToDictionary<TKey,TValue>;(System.Collections.Generic.IEnumerable<System.ValueTuple<TKey,TValue>>);Argument[0].Element.Field[System.ValueTuple`2.Item2];ReturnValue.Element.Property[System.Collections.Generic.KeyValuePair`2.Value];value;dfc-generated |
+| System.Linq;Enumerable;ToDictionary<TKey,TValue>;(System.Collections.Generic.IEnumerable<System.ValueTuple<TKey,TValue>>);Argument[0].Element.Field[System.ValueTuple`2.Item2];ReturnValue.Element;value;dfc-generated |
+| System.Linq;Enumerable;ToDictionary<TKey,TValue>;(System.Collections.Generic.IEnumerable<System.ValueTuple<TKey,TValue>>,System.Collections.Generic.IEqualityComparer<TKey>);Argument[0].Element.Field[System.ValueTuple`2.Item1];ReturnValue.Element.Property[System.Collections.Generic.KeyValuePair`2.Key];value;dfc-generated |
+| System.Linq;Enumerable;ToDictionary<TKey,TValue>;(System.Collections.Generic.IEnumerable<System.ValueTuple<TKey,TValue>>,System.Collections.Generic.IEqualityComparer<TKey>);Argument[0].Element.Field[System.ValueTuple`2.Item2];ReturnValue.Element.Property[System.Collections.Generic.KeyValuePair`2.Value];value;dfc-generated |
+| System.Linq;Enumerable;ToDictionary<TKey,TValue>;(System.Collections.Generic.IEnumerable<System.ValueTuple<TKey,TValue>>,System.Collections.Generic.IEqualityComparer<TKey>);Argument[0].Element.Field[System.ValueTuple`2.Item2];ReturnValue.Element;value;dfc-generated |
 | System.Linq;Enumerable;ToDictionary<TSource,TKey,TElement>;(System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,TKey>,System.Func<TSource,TElement>);Argument[0].Element;Argument[1].Parameter[0];value;manual |
 | System.Linq;Enumerable;ToDictionary<TSource,TKey,TElement>;(System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,TKey>,System.Func<TSource,TElement>);Argument[0].Element;Argument[2].Parameter[0];value;manual |
 | System.Linq;Enumerable;ToDictionary<TSource,TKey,TElement>;(System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,TKey>,System.Func<TSource,TElement>);Argument[1];Argument[1].Parameter[delegate-self];value;manual |
@@ -11978,8 +12438,6 @@ summary
 | System.Linq;Enumerable;ToDictionary<TSource,TKey>;(System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,TKey>,System.Collections.Generic.IEqualityComparer<TKey>);Argument[0].Element;Argument[1].Parameter[0];value;manual |
 | System.Linq;Enumerable;ToDictionary<TSource,TKey>;(System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,TKey>,System.Collections.Generic.IEqualityComparer<TKey>);Argument[0].Element;ReturnValue.Element;value;manual |
 | System.Linq;Enumerable;ToDictionary<TSource,TKey>;(System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,TKey>,System.Collections.Generic.IEqualityComparer<TKey>);Argument[1];Argument[1].Parameter[delegate-self];value;manual |
-| System.Linq;Enumerable;ToHashSet<TSource>;(System.Collections.Generic.IEnumerable<TSource>);Argument[0].Element;ReturnValue;taint;df-generated |
-| System.Linq;Enumerable;ToHashSet<TSource>;(System.Collections.Generic.IEnumerable<TSource>,System.Collections.Generic.IEqualityComparer<TSource>);Argument[0].Element;ReturnValue;taint;df-generated |
 | System.Linq;Enumerable;ToList<TSource>;(System.Collections.Generic.IEnumerable<TSource>);Argument[0].Element;ReturnValue.Element;value;manual |
 | System.Linq;Enumerable;ToLookup<TSource,TKey,TElement>;(System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,TKey>,System.Func<TSource,TElement>);Argument[0].Element;Argument[1].Parameter[0];value;manual |
 | System.Linq;Enumerable;ToLookup<TSource,TKey,TElement>;(System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,TKey>,System.Func<TSource,TElement>);Argument[0].Element;Argument[2].Parameter[0];value;manual |
@@ -12001,7 +12459,25 @@ summary
 | System.Linq;Enumerable;Union<TSource>;(System.Collections.Generic.IEnumerable<TSource>,System.Collections.Generic.IEnumerable<TSource>);Argument[1].Element;ReturnValue.Element;value;manual |
 | System.Linq;Enumerable;Union<TSource>;(System.Collections.Generic.IEnumerable<TSource>,System.Collections.Generic.IEnumerable<TSource>,System.Collections.Generic.IEqualityComparer<TSource>);Argument[0].Element;ReturnValue.Element;value;manual |
 | System.Linq;Enumerable;Union<TSource>;(System.Collections.Generic.IEnumerable<TSource>,System.Collections.Generic.IEnumerable<TSource>,System.Collections.Generic.IEqualityComparer<TSource>);Argument[1].Element;ReturnValue.Element;value;manual |
+| System.Linq;Enumerable;UnionBy<TSource,TKey>;(System.Collections.Generic.IEnumerable<TSource>,System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,TKey>);Argument[0].Element;Argument[2].Parameter[0];value;dfc-generated |
+| System.Linq;Enumerable;UnionBy<TSource,TKey>;(System.Collections.Generic.IEnumerable<TSource>,System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,TKey>);Argument[0].Element;Argument[2].Parameter[0];value;hq-generated |
+| System.Linq;Enumerable;UnionBy<TSource,TKey>;(System.Collections.Generic.IEnumerable<TSource>,System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,TKey>);Argument[0].Element;ReturnValue.Element;value;dfc-generated |
+| System.Linq;Enumerable;UnionBy<TSource,TKey>;(System.Collections.Generic.IEnumerable<TSource>,System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,TKey>);Argument[0].Element;ReturnValue.Element;value;hq-generated |
+| System.Linq;Enumerable;UnionBy<TSource,TKey>;(System.Collections.Generic.IEnumerable<TSource>,System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,TKey>);Argument[1].Element;Argument[2].Parameter[0];value;dfc-generated |
+| System.Linq;Enumerable;UnionBy<TSource,TKey>;(System.Collections.Generic.IEnumerable<TSource>,System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,TKey>);Argument[1].Element;Argument[2].Parameter[0];value;hq-generated |
+| System.Linq;Enumerable;UnionBy<TSource,TKey>;(System.Collections.Generic.IEnumerable<TSource>,System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,TKey>);Argument[1].Element;ReturnValue.Element;value;dfc-generated |
+| System.Linq;Enumerable;UnionBy<TSource,TKey>;(System.Collections.Generic.IEnumerable<TSource>,System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,TKey>);Argument[1].Element;ReturnValue.Element;value;hq-generated |
+| System.Linq;Enumerable;UnionBy<TSource,TKey>;(System.Collections.Generic.IEnumerable<TSource>,System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,TKey>);Argument[2];Argument[2].Parameter[delegate-self];value;dfc-generated |
 | System.Linq;Enumerable;UnionBy<TSource,TKey>;(System.Collections.Generic.IEnumerable<TSource>,System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,TKey>);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
+| System.Linq;Enumerable;UnionBy<TSource,TKey>;(System.Collections.Generic.IEnumerable<TSource>,System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,TKey>,System.Collections.Generic.IEqualityComparer<TKey>);Argument[0].Element;Argument[2].Parameter[0];value;dfc-generated |
+| System.Linq;Enumerable;UnionBy<TSource,TKey>;(System.Collections.Generic.IEnumerable<TSource>,System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,TKey>,System.Collections.Generic.IEqualityComparer<TKey>);Argument[0].Element;Argument[2].Parameter[0];value;hq-generated |
+| System.Linq;Enumerable;UnionBy<TSource,TKey>;(System.Collections.Generic.IEnumerable<TSource>,System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,TKey>,System.Collections.Generic.IEqualityComparer<TKey>);Argument[0].Element;ReturnValue.Element;value;dfc-generated |
+| System.Linq;Enumerable;UnionBy<TSource,TKey>;(System.Collections.Generic.IEnumerable<TSource>,System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,TKey>,System.Collections.Generic.IEqualityComparer<TKey>);Argument[0].Element;ReturnValue.Element;value;hq-generated |
+| System.Linq;Enumerable;UnionBy<TSource,TKey>;(System.Collections.Generic.IEnumerable<TSource>,System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,TKey>,System.Collections.Generic.IEqualityComparer<TKey>);Argument[1].Element;Argument[2].Parameter[0];value;dfc-generated |
+| System.Linq;Enumerable;UnionBy<TSource,TKey>;(System.Collections.Generic.IEnumerable<TSource>,System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,TKey>,System.Collections.Generic.IEqualityComparer<TKey>);Argument[1].Element;Argument[2].Parameter[0];value;hq-generated |
+| System.Linq;Enumerable;UnionBy<TSource,TKey>;(System.Collections.Generic.IEnumerable<TSource>,System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,TKey>,System.Collections.Generic.IEqualityComparer<TKey>);Argument[1].Element;ReturnValue.Element;value;dfc-generated |
+| System.Linq;Enumerable;UnionBy<TSource,TKey>;(System.Collections.Generic.IEnumerable<TSource>,System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,TKey>,System.Collections.Generic.IEqualityComparer<TKey>);Argument[1].Element;ReturnValue.Element;value;hq-generated |
+| System.Linq;Enumerable;UnionBy<TSource,TKey>;(System.Collections.Generic.IEnumerable<TSource>,System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,TKey>,System.Collections.Generic.IEqualityComparer<TKey>);Argument[2];Argument[2].Parameter[delegate-self];value;dfc-generated |
 | System.Linq;Enumerable;UnionBy<TSource,TKey>;(System.Collections.Generic.IEnumerable<TSource>,System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,TKey>,System.Collections.Generic.IEqualityComparer<TKey>);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
 | System.Linq;Enumerable;Where<TSource>;(System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,System.Boolean>);Argument[0].Element;Argument[1].Parameter[0];value;manual |
 | System.Linq;Enumerable;Where<TSource>;(System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,System.Boolean>);Argument[0].Element;ReturnValue.Element;value;manual |
@@ -12013,27 +12489,48 @@ summary
 | System.Linq;Enumerable;Zip<TFirst,TSecond,TResult>;(System.Collections.Generic.IEnumerable<TFirst>,System.Collections.Generic.IEnumerable<TSecond>,System.Func<TFirst,TSecond,TResult>);Argument[1].Element;Argument[2].Parameter[1];value;manual |
 | System.Linq;Enumerable;Zip<TFirst,TSecond,TResult>;(System.Collections.Generic.IEnumerable<TFirst>,System.Collections.Generic.IEnumerable<TSecond>,System.Func<TFirst,TSecond,TResult>);Argument[2].ReturnValue;ReturnValue.Element;value;manual |
 | System.Linq;Enumerable;Zip<TFirst,TSecond,TResult>;(System.Collections.Generic.IEnumerable<TFirst>,System.Collections.Generic.IEnumerable<TSecond>,System.Func<TFirst,TSecond,TResult>);Argument[2];Argument[2].Parameter[delegate-self];value;manual |
-| System.Linq;Enumerable;Zip<TFirst,TSecond,TThird>;(System.Collections.Generic.IEnumerable<TFirst>,System.Collections.Generic.IEnumerable<TSecond>,System.Collections.Generic.IEnumerable<TThird>);Argument[0].Element;ReturnValue;taint;df-generated |
-| System.Linq;Enumerable;Zip<TFirst,TSecond,TThird>;(System.Collections.Generic.IEnumerable<TFirst>,System.Collections.Generic.IEnumerable<TSecond>,System.Collections.Generic.IEnumerable<TThird>);Argument[1].Element;ReturnValue;taint;df-generated |
-| System.Linq;Enumerable;Zip<TFirst,TSecond,TThird>;(System.Collections.Generic.IEnumerable<TFirst>,System.Collections.Generic.IEnumerable<TSecond>,System.Collections.Generic.IEnumerable<TThird>);Argument[2].Element;ReturnValue;taint;df-generated |
-| System.Linq;Enumerable;Zip<TFirst,TSecond>;(System.Collections.Generic.IEnumerable<TFirst>,System.Collections.Generic.IEnumerable<TSecond>);Argument[0].Element;ReturnValue;taint;df-generated |
-| System.Linq;Enumerable;Zip<TFirst,TSecond>;(System.Collections.Generic.IEnumerable<TFirst>,System.Collections.Generic.IEnumerable<TSecond>);Argument[1].Element;ReturnValue;taint;df-generated |
+| System.Linq;Enumerable;Zip<TFirst,TSecond,TThird>;(System.Collections.Generic.IEnumerable<TFirst>,System.Collections.Generic.IEnumerable<TSecond>,System.Collections.Generic.IEnumerable<TThird>);Argument[0].Element;ReturnValue.Element.Field[System.ValueTuple`3.Item1];value;dfc-generated |
+| System.Linq;Enumerable;Zip<TFirst,TSecond,TThird>;(System.Collections.Generic.IEnumerable<TFirst>,System.Collections.Generic.IEnumerable<TSecond>,System.Collections.Generic.IEnumerable<TThird>);Argument[1].Element;ReturnValue.Element.Field[System.ValueTuple`3.Item2];value;dfc-generated |
+| System.Linq;Enumerable;Zip<TFirst,TSecond,TThird>;(System.Collections.Generic.IEnumerable<TFirst>,System.Collections.Generic.IEnumerable<TSecond>,System.Collections.Generic.IEnumerable<TThird>);Argument[2].Element;ReturnValue.Element.Field[System.ValueTuple`3.Item3];value;dfc-generated |
+| System.Linq;Enumerable;Zip<TFirst,TSecond>;(System.Collections.Generic.IEnumerable<TFirst>,System.Collections.Generic.IEnumerable<TSecond>);Argument[0].Element;ReturnValue.Element.Field[System.ValueTuple`2.Item1];value;dfc-generated |
+| System.Linq;Enumerable;Zip<TFirst,TSecond>;(System.Collections.Generic.IEnumerable<TFirst>,System.Collections.Generic.IEnumerable<TSecond>);Argument[1].Element;ReturnValue.Element.Field[System.ValueTuple`2.Item2];value;dfc-generated |
 | System.Linq;EnumerableExecutor<T>;EnumerableExecutor;(System.Linq.Expressions.Expression);Argument[0];Argument[this];taint;df-generated |
-| System.Linq;EnumerableQuery<T>;CreateQuery<TElement>;(System.Linq.Expressions.Expression);Argument[0];ReturnValue;taint;df-generated |
 | System.Linq;EnumerableQuery<T>;EnumerableQuery;(System.Collections.Generic.IEnumerable<T>);Argument[0].Element;Argument[this];taint;df-generated |
-| System.Linq;EnumerableQuery<T>;EnumerableQuery;(System.Linq.Expressions.Expression);Argument[0];Argument[this];taint;df-generated |
+| System.Linq;EnumerableQuery<T>;EnumerableQuery;(System.Linq.Expressions.Expression);Argument[0];Argument[this].SyntheticField[System.Linq.EnumerableQuery`1._expression];value;dfc-generated |
 | System.Linq;EnumerableQuery<T>;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.Generic.IEnumerator`1.Current];value;manual |
 | System.Linq;EnumerableQuery<T>;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.IEnumerator.Current];value;manual |
 | System.Linq;EnumerableQuery<T>;ToString;();Argument[this];ReturnValue;taint;df-generated |
-| System.Linq;EnumerableQuery<T>;get_Expression;();Argument[this];ReturnValue;taint;df-generated |
-| System.Linq;EnumerableQuery<T>;get_Provider;();Argument[this];ReturnValue;value;df-generated |
+| System.Linq;EnumerableQuery<T>;get_Expression;();Argument[this].SyntheticField[System.Linq.EnumerableQuery`1._expression];ReturnValue;value;dfc-generated |
+| System.Linq;EnumerableQuery<T>;get_Provider;();Argument[this];ReturnValue;value;dfc-generated |
 | System.Linq;IOrderedEnumerable<TElement>;CreateOrderedEnumerable<TKey>;(System.Func<TElement,TKey>,System.Collections.Generic.IComparer<TKey>,System.Boolean);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
-| System.Linq;IQueryProvider;CreateQuery<TElement>;(System.Linq.Expressions.Expression);Argument[0];ReturnValue;taint;df-generated |
-| System.Linq;IQueryable;get_Expression;();Argument[this];ReturnValue;taint;df-generated |
-| System.Linq;IQueryable;get_Provider;();Argument[this];ReturnValue;value;df-generated |
+| System.Linq;IQueryable;get_Provider;();Argument[this];ReturnValue;value;dfc-generated |
+| System.Linq;ImmutableArrayExtensions;Aggregate<T>;(System.Collections.Immutable.ImmutableArray<T>,System.Func<T,T,T>);Argument[1].ReturnValue;Argument[1].Parameter[0];value;dfc-generated |
+| System.Linq;ImmutableArrayExtensions;Aggregate<T>;(System.Collections.Immutable.ImmutableArray<T>,System.Func<T,T,T>);Argument[1].ReturnValue;Argument[1].Parameter[0];value;hq-generated |
+| System.Linq;ImmutableArrayExtensions;Aggregate<T>;(System.Collections.Immutable.ImmutableArray<T>,System.Func<T,T,T>);Argument[1].ReturnValue;ReturnValue;value;dfc-generated |
+| System.Linq;ImmutableArrayExtensions;Aggregate<T>;(System.Collections.Immutable.ImmutableArray<T>,System.Func<T,T,T>);Argument[1].ReturnValue;ReturnValue;value;hq-generated |
+| System.Linq;ImmutableArrayExtensions;Aggregate<T>;(System.Collections.Immutable.ImmutableArray<T>,System.Func<T,T,T>);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | System.Linq;ImmutableArrayExtensions;Aggregate<T>;(System.Collections.Immutable.ImmutableArray<T>,System.Func<T,T,T>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
+| System.Linq;ImmutableArrayExtensions;Aggregate<TAccumulate,T>;(System.Collections.Immutable.ImmutableArray<T>,TAccumulate,System.Func<TAccumulate,T,TAccumulate>);Argument[1];Argument[2].Parameter[0];value;dfc-generated |
+| System.Linq;ImmutableArrayExtensions;Aggregate<TAccumulate,T>;(System.Collections.Immutable.ImmutableArray<T>,TAccumulate,System.Func<TAccumulate,T,TAccumulate>);Argument[1];Argument[2].Parameter[0];value;hq-generated |
+| System.Linq;ImmutableArrayExtensions;Aggregate<TAccumulate,T>;(System.Collections.Immutable.ImmutableArray<T>,TAccumulate,System.Func<TAccumulate,T,TAccumulate>);Argument[1];ReturnValue;value;dfc-generated |
+| System.Linq;ImmutableArrayExtensions;Aggregate<TAccumulate,T>;(System.Collections.Immutable.ImmutableArray<T>,TAccumulate,System.Func<TAccumulate,T,TAccumulate>);Argument[1];ReturnValue;value;hq-generated |
+| System.Linq;ImmutableArrayExtensions;Aggregate<TAccumulate,T>;(System.Collections.Immutable.ImmutableArray<T>,TAccumulate,System.Func<TAccumulate,T,TAccumulate>);Argument[2].ReturnValue;Argument[2].Parameter[0];value;dfc-generated |
+| System.Linq;ImmutableArrayExtensions;Aggregate<TAccumulate,T>;(System.Collections.Immutable.ImmutableArray<T>,TAccumulate,System.Func<TAccumulate,T,TAccumulate>);Argument[2].ReturnValue;Argument[2].Parameter[0];value;hq-generated |
+| System.Linq;ImmutableArrayExtensions;Aggregate<TAccumulate,T>;(System.Collections.Immutable.ImmutableArray<T>,TAccumulate,System.Func<TAccumulate,T,TAccumulate>);Argument[2].ReturnValue;ReturnValue;value;dfc-generated |
+| System.Linq;ImmutableArrayExtensions;Aggregate<TAccumulate,T>;(System.Collections.Immutable.ImmutableArray<T>,TAccumulate,System.Func<TAccumulate,T,TAccumulate>);Argument[2].ReturnValue;ReturnValue;value;hq-generated |
+| System.Linq;ImmutableArrayExtensions;Aggregate<TAccumulate,T>;(System.Collections.Immutable.ImmutableArray<T>,TAccumulate,System.Func<TAccumulate,T,TAccumulate>);Argument[2];Argument[2].Parameter[delegate-self];value;dfc-generated |
 | System.Linq;ImmutableArrayExtensions;Aggregate<TAccumulate,T>;(System.Collections.Immutable.ImmutableArray<T>,TAccumulate,System.Func<TAccumulate,T,TAccumulate>);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
+| System.Linq;ImmutableArrayExtensions;Aggregate<TAccumulate,TResult,T>;(System.Collections.Immutable.ImmutableArray<T>,TAccumulate,System.Func<TAccumulate,T,TAccumulate>,System.Func<TAccumulate,TResult>);Argument[1];Argument[2].Parameter[0];value;dfc-generated |
+| System.Linq;ImmutableArrayExtensions;Aggregate<TAccumulate,TResult,T>;(System.Collections.Immutable.ImmutableArray<T>,TAccumulate,System.Func<TAccumulate,T,TAccumulate>,System.Func<TAccumulate,TResult>);Argument[1];Argument[2].Parameter[0];value;hq-generated |
+| System.Linq;ImmutableArrayExtensions;Aggregate<TAccumulate,TResult,T>;(System.Collections.Immutable.ImmutableArray<T>,TAccumulate,System.Func<TAccumulate,T,TAccumulate>,System.Func<TAccumulate,TResult>);Argument[1];Argument[3].Parameter[0];value;dfc-generated |
+| System.Linq;ImmutableArrayExtensions;Aggregate<TAccumulate,TResult,T>;(System.Collections.Immutable.ImmutableArray<T>,TAccumulate,System.Func<TAccumulate,T,TAccumulate>,System.Func<TAccumulate,TResult>);Argument[1];Argument[3].Parameter[0];value;hq-generated |
+| System.Linq;ImmutableArrayExtensions;Aggregate<TAccumulate,TResult,T>;(System.Collections.Immutable.ImmutableArray<T>,TAccumulate,System.Func<TAccumulate,T,TAccumulate>,System.Func<TAccumulate,TResult>);Argument[2].ReturnValue;Argument[3].Parameter[0];value;dfc-generated |
+| System.Linq;ImmutableArrayExtensions;Aggregate<TAccumulate,TResult,T>;(System.Collections.Immutable.ImmutableArray<T>,TAccumulate,System.Func<TAccumulate,T,TAccumulate>,System.Func<TAccumulate,TResult>);Argument[2].ReturnValue;Argument[3].Parameter[0];value;hq-generated |
+| System.Linq;ImmutableArrayExtensions;Aggregate<TAccumulate,TResult,T>;(System.Collections.Immutable.ImmutableArray<T>,TAccumulate,System.Func<TAccumulate,T,TAccumulate>,System.Func<TAccumulate,TResult>);Argument[2];Argument[2].Parameter[delegate-self];value;dfc-generated |
 | System.Linq;ImmutableArrayExtensions;Aggregate<TAccumulate,TResult,T>;(System.Collections.Immutable.ImmutableArray<T>,TAccumulate,System.Func<TAccumulate,T,TAccumulate>,System.Func<TAccumulate,TResult>);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
+| System.Linq;ImmutableArrayExtensions;Aggregate<TAccumulate,TResult,T>;(System.Collections.Immutable.ImmutableArray<T>,TAccumulate,System.Func<TAccumulate,T,TAccumulate>,System.Func<TAccumulate,TResult>);Argument[3].ReturnValue;ReturnValue;value;dfc-generated |
+| System.Linq;ImmutableArrayExtensions;Aggregate<TAccumulate,TResult,T>;(System.Collections.Immutable.ImmutableArray<T>,TAccumulate,System.Func<TAccumulate,T,TAccumulate>,System.Func<TAccumulate,TResult>);Argument[3].ReturnValue;ReturnValue;value;hq-generated |
+| System.Linq;ImmutableArrayExtensions;Aggregate<TAccumulate,TResult,T>;(System.Collections.Immutable.ImmutableArray<T>,TAccumulate,System.Func<TAccumulate,T,TAccumulate>,System.Func<TAccumulate,TResult>);Argument[3];Argument[3].Parameter[delegate-self];value;dfc-generated |
 | System.Linq;ImmutableArrayExtensions;Aggregate<TAccumulate,TResult,T>;(System.Collections.Immutable.ImmutableArray<T>,TAccumulate,System.Func<TAccumulate,T,TAccumulate>,System.Func<TAccumulate,TResult>);Argument[3];Argument[3].Parameter[delegate-self];value;hq-generated |
 | System.Linq;ImmutableArrayExtensions;All<T>;(System.Collections.Immutable.ImmutableArray<T>,System.Func<T,System.Boolean>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
 | System.Linq;ImmutableArrayExtensions;Any<T>;(System.Collections.Immutable.ImmutableArray<T>,System.Func<T,System.Boolean>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
@@ -12051,31 +12548,89 @@ summary
 | System.Linq;ImmutableArrayExtensions;LastOrDefault<T>;(System.Collections.Immutable.ImmutableArray<T>+Builder);Argument[0].Element;ReturnValue;value;manual |
 | System.Linq;ImmutableArrayExtensions;LastOrDefault<T>;(System.Collections.Immutable.ImmutableArray<T>,System.Func<T,System.Boolean>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
 | System.Linq;ImmutableArrayExtensions;Select<T,TResult>;(System.Collections.Immutable.ImmutableArray<T>,System.Func<T,TResult>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
+| System.Linq;ImmutableArrayExtensions;SelectMany<TSource,TCollection,TResult>;(System.Collections.Immutable.ImmutableArray<TSource>,System.Func<TSource,System.Collections.Generic.IEnumerable<TCollection>>,System.Func<TSource,TCollection,TResult>);Argument[1].ReturnValue.Element;Argument[2].Parameter[1];value;dfc-generated |
+| System.Linq;ImmutableArrayExtensions;SelectMany<TSource,TCollection,TResult>;(System.Collections.Immutable.ImmutableArray<TSource>,System.Func<TSource,System.Collections.Generic.IEnumerable<TCollection>>,System.Func<TSource,TCollection,TResult>);Argument[1].ReturnValue.Element;Argument[2].Parameter[1];value;hq-generated |
+| System.Linq;ImmutableArrayExtensions;SelectMany<TSource,TCollection,TResult>;(System.Collections.Immutable.ImmutableArray<TSource>,System.Func<TSource,System.Collections.Generic.IEnumerable<TCollection>>,System.Func<TSource,TCollection,TResult>);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | System.Linq;ImmutableArrayExtensions;SelectMany<TSource,TCollection,TResult>;(System.Collections.Immutable.ImmutableArray<TSource>,System.Func<TSource,System.Collections.Generic.IEnumerable<TCollection>>,System.Func<TSource,TCollection,TResult>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
+| System.Linq;ImmutableArrayExtensions;SelectMany<TSource,TCollection,TResult>;(System.Collections.Immutable.ImmutableArray<TSource>,System.Func<TSource,System.Collections.Generic.IEnumerable<TCollection>>,System.Func<TSource,TCollection,TResult>);Argument[2].ReturnValue;ReturnValue.Element;value;dfc-generated |
+| System.Linq;ImmutableArrayExtensions;SelectMany<TSource,TCollection,TResult>;(System.Collections.Immutable.ImmutableArray<TSource>,System.Func<TSource,System.Collections.Generic.IEnumerable<TCollection>>,System.Func<TSource,TCollection,TResult>);Argument[2].ReturnValue;ReturnValue.Element;value;hq-generated |
+| System.Linq;ImmutableArrayExtensions;SelectMany<TSource,TCollection,TResult>;(System.Collections.Immutable.ImmutableArray<TSource>,System.Func<TSource,System.Collections.Generic.IEnumerable<TCollection>>,System.Func<TSource,TCollection,TResult>);Argument[2];Argument[2].Parameter[delegate-self];value;dfc-generated |
 | System.Linq;ImmutableArrayExtensions;SelectMany<TSource,TCollection,TResult>;(System.Collections.Immutable.ImmutableArray<TSource>,System.Func<TSource,System.Collections.Generic.IEnumerable<TCollection>>,System.Func<TSource,TCollection,TResult>);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
+| System.Linq;ImmutableArrayExtensions;SequenceEqual<TDerived,TBase>;(System.Collections.Immutable.ImmutableArray<TBase>,System.Collections.Generic.IEnumerable<TDerived>,System.Collections.Generic.IEqualityComparer<TBase>);Argument[0].Element;Argument[2];taint;df-generated |
+| System.Linq;ImmutableArrayExtensions;SequenceEqual<TDerived,TBase>;(System.Collections.Immutable.ImmutableArray<TBase>,System.Collections.Generic.IEnumerable<TDerived>,System.Collections.Generic.IEqualityComparer<TBase>);Argument[1].Element;Argument[2];taint;df-generated |
+| System.Linq;ImmutableArrayExtensions;SequenceEqual<TDerived,TBase>;(System.Collections.Immutable.ImmutableArray<TBase>,System.Collections.Immutable.ImmutableArray<TDerived>,System.Collections.Generic.IEqualityComparer<TBase>);Argument[0].Element;Argument[2];taint;df-generated |
+| System.Linq;ImmutableArrayExtensions;SequenceEqual<TDerived,TBase>;(System.Collections.Immutable.ImmutableArray<TBase>,System.Collections.Immutable.ImmutableArray<TDerived>,System.Collections.Generic.IEqualityComparer<TBase>);Argument[1].Element;Argument[2];taint;df-generated |
 | System.Linq;ImmutableArrayExtensions;SequenceEqual<TDerived,TBase>;(System.Collections.Immutable.ImmutableArray<TBase>,System.Collections.Immutable.ImmutableArray<TDerived>,System.Func<TBase,TBase,System.Boolean>);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
 | System.Linq;ImmutableArrayExtensions;Single<T>;(System.Collections.Immutable.ImmutableArray<T>);Argument[0].Element;ReturnValue;taint;df-generated |
 | System.Linq;ImmutableArrayExtensions;Single<T>;(System.Collections.Immutable.ImmutableArray<T>,System.Func<T,System.Boolean>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
 | System.Linq;ImmutableArrayExtensions;SingleOrDefault<T>;(System.Collections.Immutable.ImmutableArray<T>,System.Func<T,System.Boolean>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
 | System.Linq;ImmutableArrayExtensions;ToArray<T>;(System.Collections.Immutable.ImmutableArray<T>);Argument[0].Element;ReturnValue;taint;df-generated |
+| System.Linq;ImmutableArrayExtensions;ToDictionary<TKey,T>;(System.Collections.Immutable.ImmutableArray<T>,System.Func<T,TKey>);Argument[0].Element;Argument[1].Parameter[0];value;dfc-generated |
+| System.Linq;ImmutableArrayExtensions;ToDictionary<TKey,T>;(System.Collections.Immutable.ImmutableArray<T>,System.Func<T,TKey>);Argument[0].Element;Argument[1].Parameter[0];value;hq-generated |
+| System.Linq;ImmutableArrayExtensions;ToDictionary<TKey,T>;(System.Collections.Immutable.ImmutableArray<T>,System.Func<T,TKey>);Argument[0].Element;ReturnValue.Element.Property[System.Collections.Generic.KeyValuePair`2.Value];value;dfc-generated |
+| System.Linq;ImmutableArrayExtensions;ToDictionary<TKey,T>;(System.Collections.Immutable.ImmutableArray<T>,System.Func<T,TKey>);Argument[0].Element;ReturnValue.Element.Property[System.Collections.Generic.KeyValuePair`2.Value];value;hq-generated |
+| System.Linq;ImmutableArrayExtensions;ToDictionary<TKey,T>;(System.Collections.Immutable.ImmutableArray<T>,System.Func<T,TKey>);Argument[1].ReturnValue;ReturnValue.Element.Property[System.Collections.Generic.KeyValuePair`2.Key];value;dfc-generated |
+| System.Linq;ImmutableArrayExtensions;ToDictionary<TKey,T>;(System.Collections.Immutable.ImmutableArray<T>,System.Func<T,TKey>);Argument[1].ReturnValue;ReturnValue.Element.Property[System.Collections.Generic.KeyValuePair`2.Key];value;hq-generated |
+| System.Linq;ImmutableArrayExtensions;ToDictionary<TKey,T>;(System.Collections.Immutable.ImmutableArray<T>,System.Func<T,TKey>);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | System.Linq;ImmutableArrayExtensions;ToDictionary<TKey,T>;(System.Collections.Immutable.ImmutableArray<T>,System.Func<T,TKey>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
+| System.Linq;ImmutableArrayExtensions;ToDictionary<TKey,T>;(System.Collections.Immutable.ImmutableArray<T>,System.Func<T,TKey>,System.Collections.Generic.IEqualityComparer<TKey>);Argument[0].Element;Argument[1].Parameter[0];value;dfc-generated |
+| System.Linq;ImmutableArrayExtensions;ToDictionary<TKey,T>;(System.Collections.Immutable.ImmutableArray<T>,System.Func<T,TKey>,System.Collections.Generic.IEqualityComparer<TKey>);Argument[0].Element;Argument[1].Parameter[0];value;hq-generated |
+| System.Linq;ImmutableArrayExtensions;ToDictionary<TKey,T>;(System.Collections.Immutable.ImmutableArray<T>,System.Func<T,TKey>,System.Collections.Generic.IEqualityComparer<TKey>);Argument[0].Element;ReturnValue.Element.Property[System.Collections.Generic.KeyValuePair`2.Value];value;dfc-generated |
+| System.Linq;ImmutableArrayExtensions;ToDictionary<TKey,T>;(System.Collections.Immutable.ImmutableArray<T>,System.Func<T,TKey>,System.Collections.Generic.IEqualityComparer<TKey>);Argument[0].Element;ReturnValue.Element.Property[System.Collections.Generic.KeyValuePair`2.Value];value;hq-generated |
+| System.Linq;ImmutableArrayExtensions;ToDictionary<TKey,T>;(System.Collections.Immutable.ImmutableArray<T>,System.Func<T,TKey>,System.Collections.Generic.IEqualityComparer<TKey>);Argument[1].ReturnValue;ReturnValue.Element.Property[System.Collections.Generic.KeyValuePair`2.Key];value;dfc-generated |
+| System.Linq;ImmutableArrayExtensions;ToDictionary<TKey,T>;(System.Collections.Immutable.ImmutableArray<T>,System.Func<T,TKey>,System.Collections.Generic.IEqualityComparer<TKey>);Argument[1].ReturnValue;ReturnValue.Element.Property[System.Collections.Generic.KeyValuePair`2.Key];value;hq-generated |
+| System.Linq;ImmutableArrayExtensions;ToDictionary<TKey,T>;(System.Collections.Immutable.ImmutableArray<T>,System.Func<T,TKey>,System.Collections.Generic.IEqualityComparer<TKey>);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | System.Linq;ImmutableArrayExtensions;ToDictionary<TKey,T>;(System.Collections.Immutable.ImmutableArray<T>,System.Func<T,TKey>,System.Collections.Generic.IEqualityComparer<TKey>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
+| System.Linq;ImmutableArrayExtensions;ToDictionary<TKey,TElement,T>;(System.Collections.Immutable.ImmutableArray<T>,System.Func<T,TKey>,System.Func<T,TElement>);Argument[1].ReturnValue;ReturnValue.Element.Property[System.Collections.Generic.KeyValuePair`2.Key];value;dfc-generated |
+| System.Linq;ImmutableArrayExtensions;ToDictionary<TKey,TElement,T>;(System.Collections.Immutable.ImmutableArray<T>,System.Func<T,TKey>,System.Func<T,TElement>);Argument[1].ReturnValue;ReturnValue.Element.Property[System.Collections.Generic.KeyValuePair`2.Key];value;hq-generated |
+| System.Linq;ImmutableArrayExtensions;ToDictionary<TKey,TElement,T>;(System.Collections.Immutable.ImmutableArray<T>,System.Func<T,TKey>,System.Func<T,TElement>);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | System.Linq;ImmutableArrayExtensions;ToDictionary<TKey,TElement,T>;(System.Collections.Immutable.ImmutableArray<T>,System.Func<T,TKey>,System.Func<T,TElement>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
+| System.Linq;ImmutableArrayExtensions;ToDictionary<TKey,TElement,T>;(System.Collections.Immutable.ImmutableArray<T>,System.Func<T,TKey>,System.Func<T,TElement>);Argument[2].ReturnValue;ReturnValue.Element.Property[System.Collections.Generic.KeyValuePair`2.Value];value;dfc-generated |
+| System.Linq;ImmutableArrayExtensions;ToDictionary<TKey,TElement,T>;(System.Collections.Immutable.ImmutableArray<T>,System.Func<T,TKey>,System.Func<T,TElement>);Argument[2].ReturnValue;ReturnValue.Element.Property[System.Collections.Generic.KeyValuePair`2.Value];value;hq-generated |
+| System.Linq;ImmutableArrayExtensions;ToDictionary<TKey,TElement,T>;(System.Collections.Immutable.ImmutableArray<T>,System.Func<T,TKey>,System.Func<T,TElement>);Argument[2];Argument[2].Parameter[delegate-self];value;dfc-generated |
 | System.Linq;ImmutableArrayExtensions;ToDictionary<TKey,TElement,T>;(System.Collections.Immutable.ImmutableArray<T>,System.Func<T,TKey>,System.Func<T,TElement>);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
+| System.Linq;ImmutableArrayExtensions;ToDictionary<TKey,TElement,T>;(System.Collections.Immutable.ImmutableArray<T>,System.Func<T,TKey>,System.Func<T,TElement>,System.Collections.Generic.IEqualityComparer<TKey>);Argument[1].ReturnValue;ReturnValue.Element.Property[System.Collections.Generic.KeyValuePair`2.Key];value;dfc-generated |
+| System.Linq;ImmutableArrayExtensions;ToDictionary<TKey,TElement,T>;(System.Collections.Immutable.ImmutableArray<T>,System.Func<T,TKey>,System.Func<T,TElement>,System.Collections.Generic.IEqualityComparer<TKey>);Argument[1].ReturnValue;ReturnValue.Element.Property[System.Collections.Generic.KeyValuePair`2.Key];value;hq-generated |
+| System.Linq;ImmutableArrayExtensions;ToDictionary<TKey,TElement,T>;(System.Collections.Immutable.ImmutableArray<T>,System.Func<T,TKey>,System.Func<T,TElement>,System.Collections.Generic.IEqualityComparer<TKey>);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | System.Linq;ImmutableArrayExtensions;ToDictionary<TKey,TElement,T>;(System.Collections.Immutable.ImmutableArray<T>,System.Func<T,TKey>,System.Func<T,TElement>,System.Collections.Generic.IEqualityComparer<TKey>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
+| System.Linq;ImmutableArrayExtensions;ToDictionary<TKey,TElement,T>;(System.Collections.Immutable.ImmutableArray<T>,System.Func<T,TKey>,System.Func<T,TElement>,System.Collections.Generic.IEqualityComparer<TKey>);Argument[2].ReturnValue;ReturnValue.Element.Property[System.Collections.Generic.KeyValuePair`2.Value];value;dfc-generated |
+| System.Linq;ImmutableArrayExtensions;ToDictionary<TKey,TElement,T>;(System.Collections.Immutable.ImmutableArray<T>,System.Func<T,TKey>,System.Func<T,TElement>,System.Collections.Generic.IEqualityComparer<TKey>);Argument[2].ReturnValue;ReturnValue.Element.Property[System.Collections.Generic.KeyValuePair`2.Value];value;hq-generated |
+| System.Linq;ImmutableArrayExtensions;ToDictionary<TKey,TElement,T>;(System.Collections.Immutable.ImmutableArray<T>,System.Func<T,TKey>,System.Func<T,TElement>,System.Collections.Generic.IEqualityComparer<TKey>);Argument[2];Argument[2].Parameter[delegate-self];value;dfc-generated |
 | System.Linq;ImmutableArrayExtensions;ToDictionary<TKey,TElement,T>;(System.Collections.Immutable.ImmutableArray<T>,System.Func<T,TKey>,System.Func<T,TElement>,System.Collections.Generic.IEqualityComparer<TKey>);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
 | System.Linq;ImmutableArrayExtensions;Where<T>;(System.Collections.Immutable.ImmutableArray<T>,System.Func<T,System.Boolean>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
+| System.Linq;Lookup<TKey,TElement>;ApplyResultSelector<TResult>;(System.Func<TKey,System.Collections.Generic.IEnumerable<TElement>,TResult>);Argument[0].ReturnValue;ReturnValue.Element;value;dfc-generated |
+| System.Linq;Lookup<TKey,TElement>;ApplyResultSelector<TResult>;(System.Func<TKey,System.Collections.Generic.IEnumerable<TElement>,TResult>);Argument[0].ReturnValue;ReturnValue.Element;value;hq-generated |
+| System.Linq;Lookup<TKey,TElement>;ApplyResultSelector<TResult>;(System.Func<TKey,System.Collections.Generic.IEnumerable<TElement>,TResult>);Argument[0];Argument[0].Parameter[delegate-self];value;dfc-generated |
 | System.Linq;Lookup<TKey,TElement>;ApplyResultSelector<TResult>;(System.Func<TKey,System.Collections.Generic.IEnumerable<TElement>,TResult>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Linq;Lookup<TKey,TElement>;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.Generic.IEnumerator`1.Current];value;manual |
 | System.Linq;Lookup<TKey,TElement>;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.IEnumerator.Current];value;manual |
 | System.Linq;Lookup<TKey,TElement>;get_Item;(TKey);Argument[this];ReturnValue;taint;df-generated |
 | System.Linq;OrderedParallelQuery<TSource>;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.Generic.IEnumerator`1.Current];value;manual |
+| System.Linq;ParallelEnumerable;Aggregate<TSource,TAccumulate,TResult>;(System.Linq.ParallelQuery<TSource>,System.Func<TAccumulate>,System.Func<TAccumulate,TSource,TAccumulate>,System.Func<TAccumulate,TAccumulate,TAccumulate>,System.Func<TAccumulate,TResult>);Argument[1].ReturnValue;ReturnValue;value;dfc-generated |
+| System.Linq;ParallelEnumerable;Aggregate<TSource,TAccumulate,TResult>;(System.Linq.ParallelQuery<TSource>,System.Func<TAccumulate>,System.Func<TAccumulate,TSource,TAccumulate>,System.Func<TAccumulate,TAccumulate,TAccumulate>,System.Func<TAccumulate,TResult>);Argument[1].ReturnValue;ReturnValue;value;hq-generated |
+| System.Linq;ParallelEnumerable;Aggregate<TSource,TAccumulate,TResult>;(System.Linq.ParallelQuery<TSource>,System.Func<TAccumulate>,System.Func<TAccumulate,TSource,TAccumulate>,System.Func<TAccumulate,TAccumulate,TAccumulate>,System.Func<TAccumulate,TResult>);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | System.Linq;ParallelEnumerable;Aggregate<TSource,TAccumulate,TResult>;(System.Linq.ParallelQuery<TSource>,System.Func<TAccumulate>,System.Func<TAccumulate,TSource,TAccumulate>,System.Func<TAccumulate,TAccumulate,TAccumulate>,System.Func<TAccumulate,TResult>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
+| System.Linq;ParallelEnumerable;Aggregate<TSource,TAccumulate,TResult>;(System.Linq.ParallelQuery<TSource>,System.Func<TAccumulate>,System.Func<TAccumulate,TSource,TAccumulate>,System.Func<TAccumulate,TAccumulate,TAccumulate>,System.Func<TAccumulate,TResult>);Argument[2];Argument[2].Parameter[delegate-self];value;dfc-generated |
 | System.Linq;ParallelEnumerable;Aggregate<TSource,TAccumulate,TResult>;(System.Linq.ParallelQuery<TSource>,System.Func<TAccumulate>,System.Func<TAccumulate,TSource,TAccumulate>,System.Func<TAccumulate,TAccumulate,TAccumulate>,System.Func<TAccumulate,TResult>);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
+| System.Linq;ParallelEnumerable;Aggregate<TSource,TAccumulate,TResult>;(System.Linq.ParallelQuery<TSource>,System.Func<TAccumulate>,System.Func<TAccumulate,TSource,TAccumulate>,System.Func<TAccumulate,TAccumulate,TAccumulate>,System.Func<TAccumulate,TResult>);Argument[3].ReturnValue;ReturnValue;value;dfc-generated |
+| System.Linq;ParallelEnumerable;Aggregate<TSource,TAccumulate,TResult>;(System.Linq.ParallelQuery<TSource>,System.Func<TAccumulate>,System.Func<TAccumulate,TSource,TAccumulate>,System.Func<TAccumulate,TAccumulate,TAccumulate>,System.Func<TAccumulate,TResult>);Argument[3].ReturnValue;ReturnValue;value;hq-generated |
+| System.Linq;ParallelEnumerable;Aggregate<TSource,TAccumulate,TResult>;(System.Linq.ParallelQuery<TSource>,System.Func<TAccumulate>,System.Func<TAccumulate,TSource,TAccumulate>,System.Func<TAccumulate,TAccumulate,TAccumulate>,System.Func<TAccumulate,TResult>);Argument[3];Argument[3].Parameter[delegate-self];value;dfc-generated |
 | System.Linq;ParallelEnumerable;Aggregate<TSource,TAccumulate,TResult>;(System.Linq.ParallelQuery<TSource>,System.Func<TAccumulate>,System.Func<TAccumulate,TSource,TAccumulate>,System.Func<TAccumulate,TAccumulate,TAccumulate>,System.Func<TAccumulate,TResult>);Argument[3];Argument[3].Parameter[delegate-self];value;hq-generated |
+| System.Linq;ParallelEnumerable;Aggregate<TSource,TAccumulate,TResult>;(System.Linq.ParallelQuery<TSource>,System.Func<TAccumulate>,System.Func<TAccumulate,TSource,TAccumulate>,System.Func<TAccumulate,TAccumulate,TAccumulate>,System.Func<TAccumulate,TResult>);Argument[4].ReturnValue;ReturnValue;value;dfc-generated |
+| System.Linq;ParallelEnumerable;Aggregate<TSource,TAccumulate,TResult>;(System.Linq.ParallelQuery<TSource>,System.Func<TAccumulate>,System.Func<TAccumulate,TSource,TAccumulate>,System.Func<TAccumulate,TAccumulate,TAccumulate>,System.Func<TAccumulate,TResult>);Argument[4].ReturnValue;ReturnValue;value;hq-generated |
+| System.Linq;ParallelEnumerable;Aggregate<TSource,TAccumulate,TResult>;(System.Linq.ParallelQuery<TSource>,System.Func<TAccumulate>,System.Func<TAccumulate,TSource,TAccumulate>,System.Func<TAccumulate,TAccumulate,TAccumulate>,System.Func<TAccumulate,TResult>);Argument[4];Argument[4].Parameter[delegate-self];value;dfc-generated |
 | System.Linq;ParallelEnumerable;Aggregate<TSource,TAccumulate,TResult>;(System.Linq.ParallelQuery<TSource>,System.Func<TAccumulate>,System.Func<TAccumulate,TSource,TAccumulate>,System.Func<TAccumulate,TAccumulate,TAccumulate>,System.Func<TAccumulate,TResult>);Argument[4];Argument[4].Parameter[delegate-self];value;hq-generated |
+| System.Linq;ParallelEnumerable;Aggregate<TSource,TAccumulate,TResult>;(System.Linq.ParallelQuery<TSource>,TAccumulate,System.Func<TAccumulate,TSource,TAccumulate>,System.Func<TAccumulate,TAccumulate,TAccumulate>,System.Func<TAccumulate,TResult>);Argument[1];ReturnValue;value;dfc-generated |
+| System.Linq;ParallelEnumerable;Aggregate<TSource,TAccumulate,TResult>;(System.Linq.ParallelQuery<TSource>,TAccumulate,System.Func<TAccumulate,TSource,TAccumulate>,System.Func<TAccumulate,TAccumulate,TAccumulate>,System.Func<TAccumulate,TResult>);Argument[1];ReturnValue;value;hq-generated |
+| System.Linq;ParallelEnumerable;Aggregate<TSource,TAccumulate,TResult>;(System.Linq.ParallelQuery<TSource>,TAccumulate,System.Func<TAccumulate,TSource,TAccumulate>,System.Func<TAccumulate,TAccumulate,TAccumulate>,System.Func<TAccumulate,TResult>);Argument[2];Argument[2].Parameter[delegate-self];value;dfc-generated |
 | System.Linq;ParallelEnumerable;Aggregate<TSource,TAccumulate,TResult>;(System.Linq.ParallelQuery<TSource>,TAccumulate,System.Func<TAccumulate,TSource,TAccumulate>,System.Func<TAccumulate,TAccumulate,TAccumulate>,System.Func<TAccumulate,TResult>);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
+| System.Linq;ParallelEnumerable;Aggregate<TSource,TAccumulate,TResult>;(System.Linq.ParallelQuery<TSource>,TAccumulate,System.Func<TAccumulate,TSource,TAccumulate>,System.Func<TAccumulate,TAccumulate,TAccumulate>,System.Func<TAccumulate,TResult>);Argument[3].ReturnValue;ReturnValue;value;dfc-generated |
+| System.Linq;ParallelEnumerable;Aggregate<TSource,TAccumulate,TResult>;(System.Linq.ParallelQuery<TSource>,TAccumulate,System.Func<TAccumulate,TSource,TAccumulate>,System.Func<TAccumulate,TAccumulate,TAccumulate>,System.Func<TAccumulate,TResult>);Argument[3].ReturnValue;ReturnValue;value;hq-generated |
+| System.Linq;ParallelEnumerable;Aggregate<TSource,TAccumulate,TResult>;(System.Linq.ParallelQuery<TSource>,TAccumulate,System.Func<TAccumulate,TSource,TAccumulate>,System.Func<TAccumulate,TAccumulate,TAccumulate>,System.Func<TAccumulate,TResult>);Argument[3];Argument[3].Parameter[delegate-self];value;dfc-generated |
 | System.Linq;ParallelEnumerable;Aggregate<TSource,TAccumulate,TResult>;(System.Linq.ParallelQuery<TSource>,TAccumulate,System.Func<TAccumulate,TSource,TAccumulate>,System.Func<TAccumulate,TAccumulate,TAccumulate>,System.Func<TAccumulate,TResult>);Argument[3];Argument[3].Parameter[delegate-self];value;hq-generated |
+| System.Linq;ParallelEnumerable;Aggregate<TSource,TAccumulate,TResult>;(System.Linq.ParallelQuery<TSource>,TAccumulate,System.Func<TAccumulate,TSource,TAccumulate>,System.Func<TAccumulate,TAccumulate,TAccumulate>,System.Func<TAccumulate,TResult>);Argument[4].ReturnValue;ReturnValue;value;dfc-generated |
+| System.Linq;ParallelEnumerable;Aggregate<TSource,TAccumulate,TResult>;(System.Linq.ParallelQuery<TSource>,TAccumulate,System.Func<TAccumulate,TSource,TAccumulate>,System.Func<TAccumulate,TAccumulate,TAccumulate>,System.Func<TAccumulate,TResult>);Argument[4].ReturnValue;ReturnValue;value;hq-generated |
+| System.Linq;ParallelEnumerable;Aggregate<TSource,TAccumulate,TResult>;(System.Linq.ParallelQuery<TSource>,TAccumulate,System.Func<TAccumulate,TSource,TAccumulate>,System.Func<TAccumulate,TAccumulate,TAccumulate>,System.Func<TAccumulate,TResult>);Argument[4];Argument[4].Parameter[delegate-self];value;dfc-generated |
 | System.Linq;ParallelEnumerable;Aggregate<TSource,TAccumulate,TResult>;(System.Linq.ParallelQuery<TSource>,TAccumulate,System.Func<TAccumulate,TSource,TAccumulate>,System.Func<TAccumulate,TAccumulate,TAccumulate>,System.Func<TAccumulate,TResult>);Argument[4];Argument[4].Parameter[delegate-self];value;hq-generated |
 | System.Linq;ParallelEnumerable;Aggregate<TSource,TAccumulate,TResult>;(System.Linq.ParallelQuery<TSource>,TAccumulate,System.Func<TAccumulate,TSource,TAccumulate>,System.Func<TAccumulate,TResult>);Argument[0].Element;Argument[2].Parameter[1];value;manual |
 | System.Linq;ParallelEnumerable;Aggregate<TSource,TAccumulate,TResult>;(System.Linq.ParallelQuery<TSource>,TAccumulate,System.Func<TAccumulate,TSource,TAccumulate>,System.Func<TAccumulate,TResult>);Argument[1];Argument[2].Parameter[0];value;manual |
@@ -12100,7 +12655,7 @@ summary
 | System.Linq;ParallelEnumerable;AsParallel;(System.Collections.IEnumerable);Argument[0].Element;ReturnValue;taint;df-generated |
 | System.Linq;ParallelEnumerable;AsParallel<TSource>;(System.Collections.Concurrent.Partitioner<TSource>);Argument[0];ReturnValue;taint;df-generated |
 | System.Linq;ParallelEnumerable;AsParallel<TSource>;(System.Collections.Generic.IEnumerable<TSource>);Argument[0].Element;ReturnValue;taint;df-generated |
-| System.Linq;ParallelEnumerable;AsSequential<TSource>;(System.Linq.ParallelQuery<TSource>);Argument[0].Element;ReturnValue;taint;df-generated |
+| System.Linq;ParallelEnumerable;AsSequential<TSource>;(System.Linq.ParallelQuery<TSource>);Argument[0];ReturnValue;value;dfc-generated |
 | System.Linq;ParallelEnumerable;AsUnordered<TSource>;(System.Linq.ParallelQuery<TSource>);Argument[0].Element;ReturnValue;taint;df-generated |
 | System.Linq;ParallelEnumerable;Average<TSource>;(System.Linq.ParallelQuery<TSource>,System.Func<TSource,System.Decimal>);Argument[0].Element;Argument[1].Parameter[0];value;manual |
 | System.Linq;ParallelEnumerable;Average<TSource>;(System.Linq.ParallelQuery<TSource>,System.Func<TSource,System.Decimal>);Argument[1];Argument[1].Parameter[delegate-self];value;manual |
@@ -12355,6 +12910,8 @@ summary
 | System.Linq;ParallelEnumerable;SelectMany<TSource,TResult>;(System.Linq.ParallelQuery<TSource>,System.Func<TSource,System.Int32,System.Collections.Generic.IEnumerable<TResult>>);Argument[0].Element;Argument[1].Parameter[0];value;manual |
 | System.Linq;ParallelEnumerable;SelectMany<TSource,TResult>;(System.Linq.ParallelQuery<TSource>,System.Func<TSource,System.Int32,System.Collections.Generic.IEnumerable<TResult>>);Argument[1].ReturnValue;ReturnValue.Element;value;manual |
 | System.Linq;ParallelEnumerable;SelectMany<TSource,TResult>;(System.Linq.ParallelQuery<TSource>,System.Func<TSource,System.Int32,System.Collections.Generic.IEnumerable<TResult>>);Argument[1];Argument[1].Parameter[delegate-self];value;manual |
+| System.Linq;ParallelEnumerable;SequenceEqual<TSource>;(System.Linq.ParallelQuery<TSource>,System.Linq.ParallelQuery<TSource>,System.Collections.Generic.IEqualityComparer<TSource>);Argument[0].Element;Argument[2];taint;df-generated |
+| System.Linq;ParallelEnumerable;SequenceEqual<TSource>;(System.Linq.ParallelQuery<TSource>,System.Linq.ParallelQuery<TSource>,System.Collections.Generic.IEqualityComparer<TSource>);Argument[1].Element;Argument[2];taint;df-generated |
 | System.Linq;ParallelEnumerable;Single<TSource>;(System.Linq.ParallelQuery<TSource>);Argument[0].Element;ReturnValue;value;manual |
 | System.Linq;ParallelEnumerable;Single<TSource>;(System.Linq.ParallelQuery<TSource>,System.Func<TSource,System.Boolean>);Argument[0].Element;Argument[1].Parameter[0];value;manual |
 | System.Linq;ParallelEnumerable;Single<TSource>;(System.Linq.ParallelQuery<TSource>,System.Func<TSource,System.Boolean>);Argument[0].Element;ReturnValue;value;manual |
@@ -12488,7 +13045,6 @@ summary
 | System.Linq;Queryable;All<TSource>;(System.Linq.IQueryable<TSource>,System.Linq.Expressions.Expression<System.Func<TSource,System.Boolean>>);Argument[1];Argument[1].Parameter[delegate-self];value;manual |
 | System.Linq;Queryable;Any<TSource>;(System.Linq.IQueryable<TSource>,System.Linq.Expressions.Expression<System.Func<TSource,System.Boolean>>);Argument[0].Element;Argument[1].Parameter[0];value;manual |
 | System.Linq;Queryable;Any<TSource>;(System.Linq.IQueryable<TSource>,System.Linq.Expressions.Expression<System.Func<TSource,System.Boolean>>);Argument[1];Argument[1].Parameter[delegate-self];value;manual |
-| System.Linq;Queryable;Append<TSource>;(System.Linq.IQueryable<TSource>,TSource);Argument[0].Element;ReturnValue;taint;df-generated |
 | System.Linq;Queryable;AsQueryable;(System.Collections.IEnumerable);Argument[0].Element;ReturnValue.Element;value;manual |
 | System.Linq;Queryable;AsQueryable<TElement>;(System.Collections.Generic.IEnumerable<TElement>);Argument[0].Element;ReturnValue.Element;value;manual |
 | System.Linq;Queryable;Average<TSource>;(System.Linq.IQueryable<TSource>,System.Linq.Expressions.Expression<System.Func<TSource,System.Decimal>>);Argument[0].Element;Argument[1].Parameter[0];value;manual |
@@ -12512,7 +13068,6 @@ summary
 | System.Linq;Queryable;Average<TSource>;(System.Linq.IQueryable<TSource>,System.Linq.Expressions.Expression<System.Func<TSource,System.Single>>);Argument[0].Element;Argument[1].Parameter[0];value;manual |
 | System.Linq;Queryable;Average<TSource>;(System.Linq.IQueryable<TSource>,System.Linq.Expressions.Expression<System.Func<TSource,System.Single>>);Argument[1];Argument[1].Parameter[delegate-self];value;manual |
 | System.Linq;Queryable;Cast<TResult>;(System.Linq.IQueryable);Argument[0].Element;ReturnValue.Element;value;manual |
-| System.Linq;Queryable;Chunk<TSource>;(System.Linq.IQueryable<TSource>,System.Int32);Argument[0].Element;ReturnValue;taint;df-generated |
 | System.Linq;Queryable;Concat<TSource>;(System.Linq.IQueryable<TSource>,System.Collections.Generic.IEnumerable<TSource>);Argument[0].Element;ReturnValue.Element;value;manual |
 | System.Linq;Queryable;Concat<TSource>;(System.Linq.IQueryable<TSource>,System.Collections.Generic.IEnumerable<TSource>);Argument[1].Element;ReturnValue.Element;value;manual |
 | System.Linq;Queryable;Count<TSource>;(System.Linq.IQueryable<TSource>,System.Linq.Expressions.Expression<System.Func<TSource,System.Boolean>>);Argument[0].Element;Argument[1].Parameter[0];value;manual |
@@ -12522,23 +13077,12 @@ summary
 | System.Linq;Queryable;DefaultIfEmpty<TSource>;(System.Linq.IQueryable<TSource>,TSource);Argument[1];ReturnValue.Element;value;manual |
 | System.Linq;Queryable;Distinct<TSource>;(System.Linq.IQueryable<TSource>);Argument[0].Element;ReturnValue.Element;value;manual |
 | System.Linq;Queryable;Distinct<TSource>;(System.Linq.IQueryable<TSource>,System.Collections.Generic.IEqualityComparer<TSource>);Argument[0].Element;ReturnValue.Element;value;manual |
-| System.Linq;Queryable;DistinctBy<TSource,TKey>;(System.Linq.IQueryable<TSource>,System.Linq.Expressions.Expression<System.Func<TSource,TKey>>);Argument[0].Element;ReturnValue;taint;df-generated |
-| System.Linq;Queryable;DistinctBy<TSource,TKey>;(System.Linq.IQueryable<TSource>,System.Linq.Expressions.Expression<System.Func<TSource,TKey>>);Argument[0].Element;ReturnValue;taint;hq-generated |
-| System.Linq;Queryable;DistinctBy<TSource,TKey>;(System.Linq.IQueryable<TSource>,System.Linq.Expressions.Expression<System.Func<TSource,TKey>>);Argument[1];Argument[1].Parameter[delegate-self];value;df-generated |
 | System.Linq;Queryable;DistinctBy<TSource,TKey>;(System.Linq.IQueryable<TSource>,System.Linq.Expressions.Expression<System.Func<TSource,TKey>>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
-| System.Linq;Queryable;DistinctBy<TSource,TKey>;(System.Linq.IQueryable<TSource>,System.Linq.Expressions.Expression<System.Func<TSource,TKey>>,System.Collections.Generic.IEqualityComparer<TKey>);Argument[0].Element;ReturnValue;taint;df-generated |
-| System.Linq;Queryable;DistinctBy<TSource,TKey>;(System.Linq.IQueryable<TSource>,System.Linq.Expressions.Expression<System.Func<TSource,TKey>>,System.Collections.Generic.IEqualityComparer<TKey>);Argument[0].Element;ReturnValue;taint;hq-generated |
-| System.Linq;Queryable;DistinctBy<TSource,TKey>;(System.Linq.IQueryable<TSource>,System.Linq.Expressions.Expression<System.Func<TSource,TKey>>,System.Collections.Generic.IEqualityComparer<TKey>);Argument[1];Argument[1].Parameter[delegate-self];value;df-generated |
 | System.Linq;Queryable;DistinctBy<TSource,TKey>;(System.Linq.IQueryable<TSource>,System.Linq.Expressions.Expression<System.Func<TSource,TKey>>,System.Collections.Generic.IEqualityComparer<TKey>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
 | System.Linq;Queryable;ElementAt<TSource>;(System.Linq.IQueryable<TSource>,System.Int32);Argument[0].Element;ReturnValue;value;manual |
 | System.Linq;Queryable;ElementAtOrDefault<TSource>;(System.Linq.IQueryable<TSource>,System.Int32);Argument[0].Element;ReturnValue;value;manual |
 | System.Linq;Queryable;Except<TSource>;(System.Linq.IQueryable<TSource>,System.Collections.Generic.IEnumerable<TSource>);Argument[0].Element;ReturnValue.Element;value;manual |
 | System.Linq;Queryable;Except<TSource>;(System.Linq.IQueryable<TSource>,System.Collections.Generic.IEnumerable<TSource>,System.Collections.Generic.IEqualityComparer<TSource>);Argument[0].Element;ReturnValue.Element;value;manual |
-| System.Linq;Queryable;ExceptBy<TSource,TKey>;(System.Linq.IQueryable<TSource>,System.Collections.Generic.IEnumerable<TKey>,System.Linq.Expressions.Expression<System.Func<TSource,TKey>>);Argument[0].Element;ReturnValue;taint;df-generated |
-| System.Linq;Queryable;ExceptBy<TSource,TKey>;(System.Linq.IQueryable<TSource>,System.Collections.Generic.IEnumerable<TKey>,System.Linq.Expressions.Expression<System.Func<TSource,TKey>>);Argument[0].Element;ReturnValue;taint;hq-generated |
-| System.Linq;Queryable;ExceptBy<TSource,TKey>;(System.Linq.IQueryable<TSource>,System.Collections.Generic.IEnumerable<TKey>,System.Linq.Expressions.Expression<System.Func<TSource,TKey>>);Argument[1].Element;ReturnValue;taint;df-generated |
-| System.Linq;Queryable;ExceptBy<TSource,TKey>;(System.Linq.IQueryable<TSource>,System.Collections.Generic.IEnumerable<TKey>,System.Linq.Expressions.Expression<System.Func<TSource,TKey>>);Argument[1].Element;ReturnValue;taint;hq-generated |
-| System.Linq;Queryable;ExceptBy<TSource,TKey>;(System.Linq.IQueryable<TSource>,System.Collections.Generic.IEnumerable<TKey>,System.Linq.Expressions.Expression<System.Func<TSource,TKey>>);Argument[2];Argument[2].Parameter[delegate-self];value;df-generated |
 | System.Linq;Queryable;ExceptBy<TSource,TKey>;(System.Linq.IQueryable<TSource>,System.Collections.Generic.IEnumerable<TKey>,System.Linq.Expressions.Expression<System.Func<TSource,TKey>>);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
 | System.Linq;Queryable;ExceptBy<TSource,TKey>;(System.Linq.IQueryable<TSource>,System.Collections.Generic.IEnumerable<TKey>,System.Linq.Expressions.Expression<System.Func<TSource,TKey>>,System.Collections.Generic.IEqualityComparer<TKey>);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
 | System.Linq;Queryable;First<TSource>;(System.Linq.IQueryable<TSource>);Argument[0].Element;ReturnValue;value;manual |
@@ -12608,11 +13152,6 @@ summary
 | System.Linq;Queryable;Intersect<TSource>;(System.Linq.IQueryable<TSource>,System.Collections.Generic.IEnumerable<TSource>);Argument[1].Element;ReturnValue.Element;value;manual |
 | System.Linq;Queryable;Intersect<TSource>;(System.Linq.IQueryable<TSource>,System.Collections.Generic.IEnumerable<TSource>,System.Collections.Generic.IEqualityComparer<TSource>);Argument[0].Element;ReturnValue.Element;value;manual |
 | System.Linq;Queryable;Intersect<TSource>;(System.Linq.IQueryable<TSource>,System.Collections.Generic.IEnumerable<TSource>,System.Collections.Generic.IEqualityComparer<TSource>);Argument[1].Element;ReturnValue.Element;value;manual |
-| System.Linq;Queryable;IntersectBy<TSource,TKey>;(System.Linq.IQueryable<TSource>,System.Collections.Generic.IEnumerable<TKey>,System.Linq.Expressions.Expression<System.Func<TSource,TKey>>);Argument[0].Element;ReturnValue;taint;df-generated |
-| System.Linq;Queryable;IntersectBy<TSource,TKey>;(System.Linq.IQueryable<TSource>,System.Collections.Generic.IEnumerable<TKey>,System.Linq.Expressions.Expression<System.Func<TSource,TKey>>);Argument[0].Element;ReturnValue;taint;hq-generated |
-| System.Linq;Queryable;IntersectBy<TSource,TKey>;(System.Linq.IQueryable<TSource>,System.Collections.Generic.IEnumerable<TKey>,System.Linq.Expressions.Expression<System.Func<TSource,TKey>>);Argument[1].Element;ReturnValue;taint;df-generated |
-| System.Linq;Queryable;IntersectBy<TSource,TKey>;(System.Linq.IQueryable<TSource>,System.Collections.Generic.IEnumerable<TKey>,System.Linq.Expressions.Expression<System.Func<TSource,TKey>>);Argument[1].Element;ReturnValue;taint;hq-generated |
-| System.Linq;Queryable;IntersectBy<TSource,TKey>;(System.Linq.IQueryable<TSource>,System.Collections.Generic.IEnumerable<TKey>,System.Linq.Expressions.Expression<System.Func<TSource,TKey>>);Argument[2];Argument[2].Parameter[delegate-self];value;df-generated |
 | System.Linq;Queryable;IntersectBy<TSource,TKey>;(System.Linq.IQueryable<TSource>,System.Collections.Generic.IEnumerable<TKey>,System.Linq.Expressions.Expression<System.Func<TSource,TKey>>);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
 | System.Linq;Queryable;IntersectBy<TSource,TKey>;(System.Linq.IQueryable<TSource>,System.Collections.Generic.IEnumerable<TKey>,System.Linq.Expressions.Expression<System.Func<TSource,TKey>>,System.Collections.Generic.IEqualityComparer<TKey>);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
 | System.Linq;Queryable;Join<TOuter,TInner,TKey,TResult>;(System.Linq.IQueryable<TOuter>,System.Collections.Generic.IEnumerable<TInner>,System.Linq.Expressions.Expression<System.Func<TOuter,TKey>>,System.Linq.Expressions.Expression<System.Func<TInner,TKey>>,System.Linq.Expressions.Expression<System.Func<TOuter,TInner,TResult>>);Argument[0].Element;Argument[2].Parameter[0];value;manual |
@@ -12651,7 +13190,6 @@ summary
 | System.Linq;Queryable;MinBy<TSource,TKey>;(System.Linq.IQueryable<TSource>,System.Linq.Expressions.Expression<System.Func<TSource,TKey>>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
 | System.Linq;Queryable;MinBy<TSource,TKey>;(System.Linq.IQueryable<TSource>,System.Linq.Expressions.Expression<System.Func<TSource,TKey>>,System.Collections.Generic.IComparer<TSource>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
 | System.Linq;Queryable;OfType<TResult>;(System.Linq.IQueryable);Argument[0].Element;ReturnValue.Element;value;manual |
-| System.Linq;Queryable;Order<T>;(System.Linq.IQueryable<T>,System.Collections.Generic.IComparer<T>);Argument[0].Element;ReturnValue;taint;df-generated |
 | System.Linq;Queryable;OrderBy<TSource,TKey>;(System.Linq.IQueryable<TSource>,System.Linq.Expressions.Expression<System.Func<TSource,TKey>>);Argument[0].Element;Argument[1].Parameter[0];value;manual |
 | System.Linq;Queryable;OrderBy<TSource,TKey>;(System.Linq.IQueryable<TSource>,System.Linq.Expressions.Expression<System.Func<TSource,TKey>>);Argument[0].Element;ReturnValue.Element;value;manual |
 | System.Linq;Queryable;OrderBy<TSource,TKey>;(System.Linq.IQueryable<TSource>,System.Linq.Expressions.Expression<System.Func<TSource,TKey>>);Argument[1];Argument[1].Parameter[delegate-self];value;manual |
@@ -12664,8 +13202,6 @@ summary
 | System.Linq;Queryable;OrderByDescending<TSource,TKey>;(System.Linq.IQueryable<TSource>,System.Linq.Expressions.Expression<System.Func<TSource,TKey>>,System.Collections.Generic.IComparer<TKey>);Argument[0].Element;Argument[1].Parameter[0];value;manual |
 | System.Linq;Queryable;OrderByDescending<TSource,TKey>;(System.Linq.IQueryable<TSource>,System.Linq.Expressions.Expression<System.Func<TSource,TKey>>,System.Collections.Generic.IComparer<TKey>);Argument[0].Element;ReturnValue.Element;value;manual |
 | System.Linq;Queryable;OrderByDescending<TSource,TKey>;(System.Linq.IQueryable<TSource>,System.Linq.Expressions.Expression<System.Func<TSource,TKey>>,System.Collections.Generic.IComparer<TKey>);Argument[1];Argument[1].Parameter[delegate-self];value;manual |
-| System.Linq;Queryable;OrderDescending<T>;(System.Linq.IQueryable<T>,System.Collections.Generic.IComparer<T>);Argument[0].Element;ReturnValue;taint;df-generated |
-| System.Linq;Queryable;Prepend<TSource>;(System.Linq.IQueryable<TSource>,TSource);Argument[0].Element;ReturnValue;taint;df-generated |
 | System.Linq;Queryable;Reverse<TSource>;(System.Linq.IQueryable<TSource>);Argument[0].Element;ReturnValue.Element;value;manual |
 | System.Linq;Queryable;Select<TSource,TResult>;(System.Linq.IQueryable<TSource>,System.Linq.Expressions.Expression<System.Func<TSource,System.Int32,TResult>>);Argument[0].Element;Argument[1].Parameter[0];value;manual |
 | System.Linq;Queryable;Select<TSource,TResult>;(System.Linq.IQueryable<TSource>,System.Linq.Expressions.Expression<System.Func<TSource,System.Int32,TResult>>);Argument[1].ReturnValue;ReturnValue.Element;value;manual |
@@ -12701,7 +13237,6 @@ summary
 | System.Linq;Queryable;SingleOrDefault<TSource>;(System.Linq.IQueryable<TSource>,System.Linq.Expressions.Expression<System.Func<TSource,System.Boolean>>);Argument[1];Argument[1].Parameter[delegate-self];value;manual |
 | System.Linq;Queryable;SingleOrDefault<TSource>;(System.Linq.IQueryable<TSource>,System.Linq.Expressions.Expression<System.Func<TSource,System.Boolean>>,TSource);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
 | System.Linq;Queryable;Skip<TSource>;(System.Linq.IQueryable<TSource>,System.Int32);Argument[0].Element;ReturnValue.Element;value;manual |
-| System.Linq;Queryable;SkipLast<TSource>;(System.Linq.IQueryable<TSource>,System.Int32);Argument[0].Element;ReturnValue;taint;df-generated |
 | System.Linq;Queryable;SkipWhile<TSource>;(System.Linq.IQueryable<TSource>,System.Linq.Expressions.Expression<System.Func<TSource,System.Boolean>>);Argument[0].Element;Argument[1].Parameter[0];value;manual |
 | System.Linq;Queryable;SkipWhile<TSource>;(System.Linq.IQueryable<TSource>,System.Linq.Expressions.Expression<System.Func<TSource,System.Boolean>>);Argument[0].Element;ReturnValue.Element;value;manual |
 | System.Linq;Queryable;SkipWhile<TSource>;(System.Linq.IQueryable<TSource>,System.Linq.Expressions.Expression<System.Func<TSource,System.Boolean>>);Argument[1];Argument[1].Parameter[delegate-self];value;manual |
@@ -12729,8 +13264,6 @@ summary
 | System.Linq;Queryable;Sum<TSource>;(System.Linq.IQueryable<TSource>,System.Linq.Expressions.Expression<System.Func<TSource,System.Single>>);Argument[0].Element;Argument[1].Parameter[0];value;manual |
 | System.Linq;Queryable;Sum<TSource>;(System.Linq.IQueryable<TSource>,System.Linq.Expressions.Expression<System.Func<TSource,System.Single>>);Argument[1];Argument[1].Parameter[delegate-self];value;manual |
 | System.Linq;Queryable;Take<TSource>;(System.Linq.IQueryable<TSource>,System.Int32);Argument[0].Element;ReturnValue.Element;value;manual |
-| System.Linq;Queryable;Take<TSource>;(System.Linq.IQueryable<TSource>,System.Range);Argument[0].Element;ReturnValue;taint;df-generated |
-| System.Linq;Queryable;TakeLast<TSource>;(System.Linq.IQueryable<TSource>,System.Int32);Argument[0].Element;ReturnValue;taint;df-generated |
 | System.Linq;Queryable;TakeWhile<TSource>;(System.Linq.IQueryable<TSource>,System.Linq.Expressions.Expression<System.Func<TSource,System.Boolean>>);Argument[0].Element;Argument[1].Parameter[0];value;manual |
 | System.Linq;Queryable;TakeWhile<TSource>;(System.Linq.IQueryable<TSource>,System.Linq.Expressions.Expression<System.Func<TSource,System.Boolean>>);Argument[0].Element;ReturnValue.Element;value;manual |
 | System.Linq;Queryable;TakeWhile<TSource>;(System.Linq.IQueryable<TSource>,System.Linq.Expressions.Expression<System.Func<TSource,System.Boolean>>);Argument[1];Argument[1].Parameter[delegate-self];value;manual |
@@ -12753,11 +13286,6 @@ summary
 | System.Linq;Queryable;Union<TSource>;(System.Linq.IQueryable<TSource>,System.Collections.Generic.IEnumerable<TSource>);Argument[1].Element;ReturnValue.Element;value;manual |
 | System.Linq;Queryable;Union<TSource>;(System.Linq.IQueryable<TSource>,System.Collections.Generic.IEnumerable<TSource>,System.Collections.Generic.IEqualityComparer<TSource>);Argument[0].Element;ReturnValue.Element;value;manual |
 | System.Linq;Queryable;Union<TSource>;(System.Linq.IQueryable<TSource>,System.Collections.Generic.IEnumerable<TSource>,System.Collections.Generic.IEqualityComparer<TSource>);Argument[1].Element;ReturnValue.Element;value;manual |
-| System.Linq;Queryable;UnionBy<TSource,TKey>;(System.Linq.IQueryable<TSource>,System.Collections.Generic.IEnumerable<TSource>,System.Linq.Expressions.Expression<System.Func<TSource,TKey>>);Argument[0].Element;ReturnValue;taint;df-generated |
-| System.Linq;Queryable;UnionBy<TSource,TKey>;(System.Linq.IQueryable<TSource>,System.Collections.Generic.IEnumerable<TSource>,System.Linq.Expressions.Expression<System.Func<TSource,TKey>>);Argument[0].Element;ReturnValue;taint;hq-generated |
-| System.Linq;Queryable;UnionBy<TSource,TKey>;(System.Linq.IQueryable<TSource>,System.Collections.Generic.IEnumerable<TSource>,System.Linq.Expressions.Expression<System.Func<TSource,TKey>>);Argument[1].Element;ReturnValue;taint;df-generated |
-| System.Linq;Queryable;UnionBy<TSource,TKey>;(System.Linq.IQueryable<TSource>,System.Collections.Generic.IEnumerable<TSource>,System.Linq.Expressions.Expression<System.Func<TSource,TKey>>);Argument[1].Element;ReturnValue;taint;hq-generated |
-| System.Linq;Queryable;UnionBy<TSource,TKey>;(System.Linq.IQueryable<TSource>,System.Collections.Generic.IEnumerable<TSource>,System.Linq.Expressions.Expression<System.Func<TSource,TKey>>);Argument[2];Argument[2].Parameter[delegate-self];value;df-generated |
 | System.Linq;Queryable;UnionBy<TSource,TKey>;(System.Linq.IQueryable<TSource>,System.Collections.Generic.IEnumerable<TSource>,System.Linq.Expressions.Expression<System.Func<TSource,TKey>>);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
 | System.Linq;Queryable;UnionBy<TSource,TKey>;(System.Linq.IQueryable<TSource>,System.Collections.Generic.IEnumerable<TSource>,System.Linq.Expressions.Expression<System.Func<TSource,TKey>>,System.Collections.Generic.IEqualityComparer<TKey>);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
 | System.Linq;Queryable;Where<TSource>;(System.Linq.IQueryable<TSource>,System.Linq.Expressions.Expression<System.Func<TSource,System.Boolean>>);Argument[0].Element;Argument[1].Parameter[0];value;manual |
@@ -12770,11 +13298,6 @@ summary
 | System.Linq;Queryable;Zip<TFirst,TSecond,TResult>;(System.Linq.IQueryable<TFirst>,System.Collections.Generic.IEnumerable<TSecond>,System.Linq.Expressions.Expression<System.Func<TFirst,TSecond,TResult>>);Argument[1].Element;Argument[2].Parameter[1];value;manual |
 | System.Linq;Queryable;Zip<TFirst,TSecond,TResult>;(System.Linq.IQueryable<TFirst>,System.Collections.Generic.IEnumerable<TSecond>,System.Linq.Expressions.Expression<System.Func<TFirst,TSecond,TResult>>);Argument[2].ReturnValue;ReturnValue.Element;value;manual |
 | System.Linq;Queryable;Zip<TFirst,TSecond,TResult>;(System.Linq.IQueryable<TFirst>,System.Collections.Generic.IEnumerable<TSecond>,System.Linq.Expressions.Expression<System.Func<TFirst,TSecond,TResult>>);Argument[2];Argument[2].Parameter[delegate-self];value;manual |
-| System.Linq;Queryable;Zip<TFirst,TSecond,TThird>;(System.Linq.IQueryable<TFirst>,System.Collections.Generic.IEnumerable<TSecond>,System.Collections.Generic.IEnumerable<TThird>);Argument[0].Element;ReturnValue;taint;df-generated |
-| System.Linq;Queryable;Zip<TFirst,TSecond,TThird>;(System.Linq.IQueryable<TFirst>,System.Collections.Generic.IEnumerable<TSecond>,System.Collections.Generic.IEnumerable<TThird>);Argument[1].Element;ReturnValue;taint;df-generated |
-| System.Linq;Queryable;Zip<TFirst,TSecond,TThird>;(System.Linq.IQueryable<TFirst>,System.Collections.Generic.IEnumerable<TSecond>,System.Collections.Generic.IEnumerable<TThird>);Argument[2].Element;ReturnValue;taint;df-generated |
-| System.Linq;Queryable;Zip<TFirst,TSecond>;(System.Linq.IQueryable<TFirst>,System.Collections.Generic.IEnumerable<TSecond>);Argument[0].Element;ReturnValue;taint;df-generated |
-| System.Linq;Queryable;Zip<TFirst,TSecond>;(System.Linq.IQueryable<TFirst>,System.Collections.Generic.IEnumerable<TSecond>);Argument[1].Element;ReturnValue;taint;df-generated |
 | System.Media;SoundPlayer;GetObjectData;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);Argument[this];Argument[0];taint;df-generated |
 | System.Media;SoundPlayer;add_LoadCompleted;(System.ComponentModel.AsyncCompletedEventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Media;SoundPlayer;add_SoundLocationChanged;(System.EventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
@@ -12782,35 +13305,40 @@ summary
 | System.Media;SoundPlayer;remove_LoadCompleted;(System.ComponentModel.AsyncCompletedEventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Media;SoundPlayer;remove_SoundLocationChanged;(System.EventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Media;SoundPlayer;remove_StreamChanged;(System.EventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
-| System.Net.Cache;HttpRequestCachePolicy;HttpRequestCachePolicy;(System.Net.Cache.HttpCacheAgeControl,System.TimeSpan);Argument[1];Argument[this];taint;df-generated |
-| System.Net.Cache;HttpRequestCachePolicy;HttpRequestCachePolicy;(System.Net.Cache.HttpCacheAgeControl,System.TimeSpan,System.TimeSpan);Argument[1];Argument[this];taint;df-generated |
-| System.Net.Cache;HttpRequestCachePolicy;HttpRequestCachePolicy;(System.Net.Cache.HttpCacheAgeControl,System.TimeSpan,System.TimeSpan);Argument[2];Argument[this];taint;df-generated |
-| System.Net.Cache;HttpRequestCachePolicy;get_MaxAge;();Argument[this];ReturnValue;taint;df-generated |
-| System.Net.Cache;HttpRequestCachePolicy;get_MaxStale;();Argument[this];ReturnValue;taint;df-generated |
-| System.Net.Cache;HttpRequestCachePolicy;get_MinFresh;();Argument[this];ReturnValue;taint;df-generated |
-| System.Net.Http.Headers;AuthenticationHeaderValue;AuthenticationHeaderValue;(System.String,System.String);Argument[0];Argument[this];taint;df-generated |
-| System.Net.Http.Headers;AuthenticationHeaderValue;AuthenticationHeaderValue;(System.String,System.String);Argument[1];Argument[this];taint;df-generated |
-| System.Net.Http.Headers;AuthenticationHeaderValue;Clone;();Argument[this];ReturnValue;taint;df-generated |
-| System.Net.Http.Headers;AuthenticationHeaderValue;Clone;();Argument[this];ReturnValue;value;df-generated |
-| System.Net.Http.Headers;AuthenticationHeaderValue;ToString;();Argument[this];ReturnValue;taint;df-generated |
-| System.Net.Http.Headers;AuthenticationHeaderValue;get_Parameter;();Argument[this];ReturnValue;taint;df-generated |
-| System.Net.Http.Headers;AuthenticationHeaderValue;get_Scheme;();Argument[this];ReturnValue;taint;df-generated |
-| System.Net.Http.Headers;CacheControlHeaderValue;Clone;();Argument[this];ReturnValue;taint;df-generated |
-| System.Net.Http.Headers;CacheControlHeaderValue;Clone;();Argument[this];ReturnValue;value;df-generated |
+| System.Net.Cache;HttpRequestCachePolicy;HttpRequestCachePolicy;(System.Net.Cache.HttpCacheAgeControl,System.TimeSpan);Argument[1];Argument[this].SyntheticField[System.Net.Cache.HttpRequestCachePolicy._maxAge];value;dfc-generated |
+| System.Net.Cache;HttpRequestCachePolicy;HttpRequestCachePolicy;(System.Net.Cache.HttpCacheAgeControl,System.TimeSpan);Argument[1];Argument[this].SyntheticField[System.Net.Cache.HttpRequestCachePolicy._maxStale];value;dfc-generated |
+| System.Net.Cache;HttpRequestCachePolicy;HttpRequestCachePolicy;(System.Net.Cache.HttpCacheAgeControl,System.TimeSpan);Argument[1];Argument[this].SyntheticField[System.Net.Cache.HttpRequestCachePolicy._minFresh];value;dfc-generated |
+| System.Net.Cache;HttpRequestCachePolicy;HttpRequestCachePolicy;(System.Net.Cache.HttpCacheAgeControl,System.TimeSpan,System.TimeSpan);Argument[1];Argument[this].SyntheticField[System.Net.Cache.HttpRequestCachePolicy._maxAge];value;dfc-generated |
+| System.Net.Cache;HttpRequestCachePolicy;HttpRequestCachePolicy;(System.Net.Cache.HttpCacheAgeControl,System.TimeSpan,System.TimeSpan);Argument[2];Argument[this].SyntheticField[System.Net.Cache.HttpRequestCachePolicy._maxStale];value;dfc-generated |
+| System.Net.Cache;HttpRequestCachePolicy;HttpRequestCachePolicy;(System.Net.Cache.HttpCacheAgeControl,System.TimeSpan,System.TimeSpan);Argument[2];Argument[this].SyntheticField[System.Net.Cache.HttpRequestCachePolicy._minFresh];value;dfc-generated |
+| System.Net.Cache;HttpRequestCachePolicy;get_MaxAge;();Argument[this].SyntheticField[System.Net.Cache.HttpRequestCachePolicy._maxAge];ReturnValue;value;dfc-generated |
+| System.Net.Cache;HttpRequestCachePolicy;get_MaxStale;();Argument[this].SyntheticField[System.Net.Cache.HttpRequestCachePolicy._maxStale];ReturnValue;value;dfc-generated |
+| System.Net.Cache;HttpRequestCachePolicy;get_MinFresh;();Argument[this].SyntheticField[System.Net.Cache.HttpRequestCachePolicy._minFresh];ReturnValue;value;dfc-generated |
+| System.Net.Http.Headers;AuthenticationHeaderValue;AuthenticationHeaderValue;(System.String,System.String);Argument[0];Argument[this].SyntheticField[System.Net.Http.Headers.AuthenticationHeaderValue._scheme];value;dfc-generated |
+| System.Net.Http.Headers;AuthenticationHeaderValue;AuthenticationHeaderValue;(System.String,System.String);Argument[1];Argument[this].SyntheticField[System.Net.Http.Headers.AuthenticationHeaderValue._parameter];value;dfc-generated |
+| System.Net.Http.Headers;AuthenticationHeaderValue;Clone;();Argument[this].SyntheticField[System.Net.Http.Headers.AuthenticationHeaderValue._parameter];ReturnValue.SyntheticField[System.Net.Http.Headers.AuthenticationHeaderValue._parameter];value;dfc-generated |
+| System.Net.Http.Headers;AuthenticationHeaderValue;Clone;();Argument[this].SyntheticField[System.Net.Http.Headers.AuthenticationHeaderValue._scheme];ReturnValue.SyntheticField[System.Net.Http.Headers.AuthenticationHeaderValue._scheme];value;dfc-generated |
+| System.Net.Http.Headers;AuthenticationHeaderValue;Clone;();Argument[this];ReturnValue;value;dfc-generated |
+| System.Net.Http.Headers;AuthenticationHeaderValue;ToString;();Argument[this].SyntheticField[System.Net.Http.Headers.AuthenticationHeaderValue._parameter];ReturnValue;taint;dfc-generated |
+| System.Net.Http.Headers;AuthenticationHeaderValue;ToString;();Argument[this].SyntheticField[System.Net.Http.Headers.AuthenticationHeaderValue._scheme];ReturnValue;value;dfc-generated |
+| System.Net.Http.Headers;AuthenticationHeaderValue;get_Parameter;();Argument[this].SyntheticField[System.Net.Http.Headers.AuthenticationHeaderValue._parameter];ReturnValue;value;dfc-generated |
+| System.Net.Http.Headers;AuthenticationHeaderValue;get_Scheme;();Argument[this].SyntheticField[System.Net.Http.Headers.AuthenticationHeaderValue._scheme];ReturnValue;value;dfc-generated |
+| System.Net.Http.Headers;CacheControlHeaderValue;Clone;();Argument[this];ReturnValue;value;dfc-generated |
 | System.Net.Http.Headers;CacheControlHeaderValue;ToString;();Argument[this];ReturnValue;taint;df-generated |
-| System.Net.Http.Headers;ContentDispositionHeaderValue;Clone;();Argument[this];ReturnValue;taint;df-generated |
-| System.Net.Http.Headers;ContentDispositionHeaderValue;Clone;();Argument[this];ReturnValue;value;df-generated |
-| System.Net.Http.Headers;ContentDispositionHeaderValue;ContentDispositionHeaderValue;(System.Net.Http.Headers.ContentDispositionHeaderValue);Argument[0];Argument[this];taint;df-generated |
-| System.Net.Http.Headers;ContentDispositionHeaderValue;ContentDispositionHeaderValue;(System.String);Argument[0];Argument[this];taint;df-generated |
-| System.Net.Http.Headers;ContentDispositionHeaderValue;ToString;();Argument[this];ReturnValue;taint;df-generated |
-| System.Net.Http.Headers;ContentRangeHeaderValue;Clone;();Argument[this];ReturnValue;taint;df-generated |
-| System.Net.Http.Headers;ContentRangeHeaderValue;Clone;();Argument[this];ReturnValue;value;df-generated |
-| System.Net.Http.Headers;EntityTagHeaderValue;Clone;();Argument[this];ReturnValue;taint;df-generated |
-| System.Net.Http.Headers;EntityTagHeaderValue;Clone;();Argument[this];ReturnValue;value;df-generated |
-| System.Net.Http.Headers;EntityTagHeaderValue;EntityTagHeaderValue;(System.String,System.Boolean);Argument[0];Argument[this];taint;df-generated |
-| System.Net.Http.Headers;EntityTagHeaderValue;ToString;();Argument[this];ReturnValue;taint;df-generated |
-| System.Net.Http.Headers;EntityTagHeaderValue;get_Tag;();Argument[this];ReturnValue;taint;df-generated |
+| System.Net.Http.Headers;ContentDispositionHeaderValue;Clone;();Argument[this];ReturnValue;value;dfc-generated |
+| System.Net.Http.Headers;ContentDispositionHeaderValue;ContentDispositionHeaderValue;(System.Net.Http.Headers.ContentDispositionHeaderValue);Argument[0].SyntheticField[System.Net.Http.Headers.ContentDispositionHeaderValue._dispositionType];Argument[this].SyntheticField[System.Net.Http.Headers.ContentDispositionHeaderValue._dispositionType];value;dfc-generated |
+| System.Net.Http.Headers;ContentDispositionHeaderValue;ContentDispositionHeaderValue;(System.String);Argument[0];Argument[this].SyntheticField[System.Net.Http.Headers.ContentDispositionHeaderValue._dispositionType];value;dfc-generated |
+| System.Net.Http.Headers;ContentDispositionHeaderValue;ToString;();Argument[this].SyntheticField[System.Net.Http.Headers.ContentDispositionHeaderValue._dispositionType];ReturnValue;taint;dfc-generated |
+| System.Net.Http.Headers;ContentRangeHeaderValue;Clone;();Argument[this];ReturnValue;value;dfc-generated |
+| System.Net.Http.Headers;EntityTagHeaderValue;Clone;();Argument[this].SyntheticField[System.Net.Http.Headers.EntityTagHeaderValue._tag];ReturnValue.SyntheticField[System.Net.Http.Headers.EntityTagHeaderValue._tag];value;dfc-generated |
+| System.Net.Http.Headers;EntityTagHeaderValue;Clone;();Argument[this];ReturnValue;value;dfc-generated |
+| System.Net.Http.Headers;EntityTagHeaderValue;EntityTagHeaderValue;(System.String,System.Boolean);Argument[0];Argument[this].SyntheticField[System.Net.Http.Headers.EntityTagHeaderValue._tag];value;dfc-generated |
+| System.Net.Http.Headers;EntityTagHeaderValue;ToString;();Argument[this].SyntheticField[System.Net.Http.Headers.EntityTagHeaderValue._tag];ReturnValue;value;dfc-generated |
+| System.Net.Http.Headers;EntityTagHeaderValue;get_Tag;();Argument[this].SyntheticField[System.Net.Http.Headers.EntityTagHeaderValue._tag];ReturnValue;value;dfc-generated |
+| System.Net.Http.Headers;HeaderStringValues+Enumerator;get_Current;();Argument[this].Property[System.Net.Http.Headers.HeaderStringValues+Enumerator.Current];ReturnValue;value;df-generated |
+| System.Net.Http.Headers;HeaderStringValues+Enumerator;get_Current;();Argument[this].Property[System.Net.Http.Headers.HeaderStringValues+Enumerator.Current];ReturnValue;value;dfc-generated |
 | System.Net.Http.Headers;HeaderStringValues+Enumerator;get_Current;();Argument[this];ReturnValue;taint;df-generated |
+| System.Net.Http.Headers;HeaderStringValues+Enumerator;get_Current;();Argument[this];ReturnValue;taint;dfc-generated |
 | System.Net.Http.Headers;HeaderStringValues;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.Generic.IEnumerator`1.Current];value;manual |
 | System.Net.Http.Headers;HeaderStringValues;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.IEnumerator.Current];value;manual |
 | System.Net.Http.Headers;HeaderStringValues;GetEnumerator;();Argument[this];ReturnValue;taint;df-generated |
@@ -12831,8 +13359,8 @@ summary
 | System.Net.Http.Headers;HttpHeadersNonValidated;TryGetValue;(System.String,System.Net.Http.Headers.HeaderStringValues);Argument[0];ReturnValue;taint;df-generated |
 | System.Net.Http.Headers;HttpHeadersNonValidated;TryGetValues;(System.String,System.Net.Http.Headers.HeaderStringValues);Argument[0];ReturnValue;taint;df-generated |
 | System.Net.Http.Headers;HttpHeadersNonValidated;get_Item;(System.String);Argument[0];ReturnValue;taint;df-generated |
-| System.Net.Http.Headers;HttpHeadersNonValidated;get_Keys;();Argument[this];ReturnValue;taint;df-generated |
-| System.Net.Http.Headers;HttpHeadersNonValidated;get_Values;();Argument[this];ReturnValue;taint;df-generated |
+| System.Net.Http.Headers;HttpHeadersNonValidated;get_Keys;();Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Key];ReturnValue.Element;value;dfc-generated |
+| System.Net.Http.Headers;HttpHeadersNonValidated;get_Values;();Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Value];ReturnValue.Element;value;dfc-generated |
 | System.Net.Http.Headers;HttpRequestHeaders;get_Connection;();Argument[this];ReturnValue;taint;df-generated |
 | System.Net.Http.Headers;HttpRequestHeaders;get_Pragma;();Argument[this];ReturnValue;taint;df-generated |
 | System.Net.Http.Headers;HttpRequestHeaders;get_Trailer;();Argument[this];ReturnValue;taint;df-generated |
@@ -12847,96 +13375,92 @@ summary
 | System.Net.Http.Headers;HttpResponseHeaders;get_Upgrade;();Argument[this];ReturnValue;taint;df-generated |
 | System.Net.Http.Headers;HttpResponseHeaders;get_Via;();Argument[this];ReturnValue;taint;df-generated |
 | System.Net.Http.Headers;HttpResponseHeaders;get_Warning;();Argument[this];ReturnValue;taint;df-generated |
-| System.Net.Http.Headers;MediaTypeHeaderValue;Clone;();Argument[this];ReturnValue;taint;df-generated |
-| System.Net.Http.Headers;MediaTypeHeaderValue;Clone;();Argument[this];ReturnValue;value;df-generated |
-| System.Net.Http.Headers;MediaTypeHeaderValue;MediaTypeHeaderValue;(System.Net.Http.Headers.MediaTypeHeaderValue);Argument[0];Argument[this];taint;df-generated |
-| System.Net.Http.Headers;MediaTypeHeaderValue;MediaTypeHeaderValue;(System.String,System.String);Argument[0];Argument[this];taint;df-generated |
-| System.Net.Http.Headers;MediaTypeHeaderValue;ToString;();Argument[this];ReturnValue;taint;df-generated |
-| System.Net.Http.Headers;MediaTypeHeaderValue;TryParse;(System.String,System.Net.Http.Headers.MediaTypeHeaderValue);Argument[0];ReturnValue;taint;df-generated |
-| System.Net.Http.Headers;MediaTypeWithQualityHeaderValue;Clone;();Argument[this];ReturnValue;taint;df-generated |
-| System.Net.Http.Headers;MediaTypeWithQualityHeaderValue;Clone;();Argument[this];ReturnValue;value;df-generated |
+| System.Net.Http.Headers;MediaTypeHeaderValue;Clone;();Argument[this];ReturnValue;value;dfc-generated |
+| System.Net.Http.Headers;MediaTypeHeaderValue;MediaTypeHeaderValue;(System.Net.Http.Headers.MediaTypeHeaderValue);Argument[0].SyntheticField[System.Net.Http.Headers.MediaTypeHeaderValue._mediaType];Argument[this].SyntheticField[System.Net.Http.Headers.MediaTypeHeaderValue._mediaType];value;dfc-generated |
+| System.Net.Http.Headers;MediaTypeHeaderValue;MediaTypeHeaderValue;(System.String,System.String);Argument[0];Argument[this].SyntheticField[System.Net.Http.Headers.MediaTypeHeaderValue._mediaType];value;dfc-generated |
+| System.Net.Http.Headers;MediaTypeHeaderValue;ToString;();Argument[this].SyntheticField[System.Net.Http.Headers.MediaTypeHeaderValue._mediaType];ReturnValue;value;dfc-generated |
+| System.Net.Http.Headers;MediaTypeHeaderValue;TryParse;(System.String,System.Net.Http.Headers.MediaTypeHeaderValue);Argument[0];ReturnValue.SyntheticField[System.Net.Http.Headers.MediaTypeHeaderValue._mediaType];taint;dfc-generated |
+| System.Net.Http.Headers;MediaTypeWithQualityHeaderValue;Clone;();Argument[this];ReturnValue;value;dfc-generated |
 | System.Net.Http.Headers;MediaTypeWithQualityHeaderValue;TryParse;(System.String,System.Net.Http.Headers.MediaTypeWithQualityHeaderValue);Argument[0];ReturnValue;taint;df-generated |
-| System.Net.Http.Headers;NameValueHeaderValue;Clone;();Argument[this];ReturnValue;taint;df-generated |
-| System.Net.Http.Headers;NameValueHeaderValue;Clone;();Argument[this];ReturnValue;value;df-generated |
-| System.Net.Http.Headers;NameValueHeaderValue;NameValueHeaderValue;(System.Net.Http.Headers.NameValueHeaderValue);Argument[0];Argument[this];taint;df-generated |
-| System.Net.Http.Headers;NameValueHeaderValue;NameValueHeaderValue;(System.String,System.String);Argument[0];Argument[this];taint;df-generated |
-| System.Net.Http.Headers;NameValueHeaderValue;NameValueHeaderValue;(System.String,System.String);Argument[1];Argument[this];taint;df-generated |
-| System.Net.Http.Headers;NameValueHeaderValue;ToString;();Argument[this];ReturnValue;taint;df-generated |
-| System.Net.Http.Headers;NameValueHeaderValue;get_Name;();Argument[this];ReturnValue;taint;df-generated |
-| System.Net.Http.Headers;NameValueWithParametersHeaderValue;Clone;();Argument[this];ReturnValue;taint;df-generated |
-| System.Net.Http.Headers;NameValueWithParametersHeaderValue;Clone;();Argument[this];ReturnValue;value;df-generated |
-| System.Net.Http.Headers;ProductHeaderValue;Clone;();Argument[this];ReturnValue;taint;df-generated |
-| System.Net.Http.Headers;ProductHeaderValue;Clone;();Argument[this];ReturnValue;value;df-generated |
-| System.Net.Http.Headers;ProductHeaderValue;ProductHeaderValue;(System.String,System.String);Argument[0];Argument[this];taint;df-generated |
-| System.Net.Http.Headers;ProductHeaderValue;ProductHeaderValue;(System.String,System.String);Argument[1];Argument[this];taint;df-generated |
-| System.Net.Http.Headers;ProductHeaderValue;ToString;();Argument[this];ReturnValue;taint;df-generated |
-| System.Net.Http.Headers;ProductHeaderValue;get_Name;();Argument[this];ReturnValue;taint;df-generated |
-| System.Net.Http.Headers;ProductHeaderValue;get_Version;();Argument[this];ReturnValue;taint;df-generated |
-| System.Net.Http.Headers;ProductInfoHeaderValue;Clone;();Argument[this];ReturnValue;taint;df-generated |
-| System.Net.Http.Headers;ProductInfoHeaderValue;Clone;();Argument[this];ReturnValue;value;df-generated |
-| System.Net.Http.Headers;ProductInfoHeaderValue;Parse;(System.String);Argument[0];ReturnValue;taint;df-generated |
-| System.Net.Http.Headers;ProductInfoHeaderValue;ProductInfoHeaderValue;(System.Net.Http.Headers.ProductHeaderValue);Argument[0];Argument[this];taint;df-generated |
-| System.Net.Http.Headers;ProductInfoHeaderValue;ProductInfoHeaderValue;(System.String);Argument[0];Argument[this];taint;df-generated |
-| System.Net.Http.Headers;ProductInfoHeaderValue;ToString;();Argument[this];ReturnValue;taint;df-generated |
-| System.Net.Http.Headers;ProductInfoHeaderValue;TryParse;(System.String,System.Net.Http.Headers.ProductInfoHeaderValue);Argument[0];ReturnValue;taint;df-generated |
-| System.Net.Http.Headers;ProductInfoHeaderValue;get_Comment;();Argument[this];ReturnValue;taint;df-generated |
-| System.Net.Http.Headers;ProductInfoHeaderValue;get_Product;();Argument[this];ReturnValue;taint;df-generated |
-| System.Net.Http.Headers;RangeConditionHeaderValue;Clone;();Argument[this];ReturnValue;taint;df-generated |
-| System.Net.Http.Headers;RangeConditionHeaderValue;Clone;();Argument[this];ReturnValue;value;df-generated |
-| System.Net.Http.Headers;RangeConditionHeaderValue;RangeConditionHeaderValue;(System.DateTimeOffset);Argument[0];Argument[this];taint;df-generated |
-| System.Net.Http.Headers;RangeConditionHeaderValue;RangeConditionHeaderValue;(System.Net.Http.Headers.EntityTagHeaderValue);Argument[0];Argument[this];taint;df-generated |
+| System.Net.Http.Headers;NameValueHeaderValue;Clone;();Argument[this];ReturnValue;value;dfc-generated |
+| System.Net.Http.Headers;NameValueHeaderValue;NameValueHeaderValue;(System.Net.Http.Headers.NameValueHeaderValue);Argument[0].SyntheticField[System.Net.Http.Headers.NameValueHeaderValue._name];Argument[this].SyntheticField[System.Net.Http.Headers.NameValueHeaderValue._name];value;dfc-generated |
+| System.Net.Http.Headers;NameValueHeaderValue;NameValueHeaderValue;(System.Net.Http.Headers.NameValueHeaderValue);Argument[0].SyntheticField[System.Net.Http.Headers.NameValueHeaderValue._value];Argument[this].SyntheticField[System.Net.Http.Headers.NameValueHeaderValue._value];value;dfc-generated |
+| System.Net.Http.Headers;NameValueHeaderValue;NameValueHeaderValue;(System.String,System.String);Argument[0];Argument[this].SyntheticField[System.Net.Http.Headers.NameValueHeaderValue._name];value;dfc-generated |
+| System.Net.Http.Headers;NameValueHeaderValue;NameValueHeaderValue;(System.String,System.String);Argument[1];Argument[this].SyntheticField[System.Net.Http.Headers.NameValueHeaderValue._value];value;dfc-generated |
+| System.Net.Http.Headers;NameValueHeaderValue;ToString;();Argument[this].SyntheticField[System.Net.Http.Headers.NameValueHeaderValue._name];ReturnValue;value;dfc-generated |
+| System.Net.Http.Headers;NameValueHeaderValue;ToString;();Argument[this].SyntheticField[System.Net.Http.Headers.NameValueHeaderValue._value];ReturnValue;taint;dfc-generated |
+| System.Net.Http.Headers;NameValueHeaderValue;get_Name;();Argument[this].SyntheticField[System.Net.Http.Headers.NameValueHeaderValue._name];ReturnValue;value;dfc-generated |
+| System.Net.Http.Headers;NameValueWithParametersHeaderValue;Clone;();Argument[this];ReturnValue;value;dfc-generated |
+| System.Net.Http.Headers;ProductHeaderValue;Clone;();Argument[this].SyntheticField[System.Net.Http.Headers.ProductHeaderValue._name];ReturnValue.SyntheticField[System.Net.Http.Headers.ProductHeaderValue._name];value;dfc-generated |
+| System.Net.Http.Headers;ProductHeaderValue;Clone;();Argument[this].SyntheticField[System.Net.Http.Headers.ProductHeaderValue._version];ReturnValue.SyntheticField[System.Net.Http.Headers.ProductHeaderValue._version];value;dfc-generated |
+| System.Net.Http.Headers;ProductHeaderValue;Clone;();Argument[this];ReturnValue;value;dfc-generated |
+| System.Net.Http.Headers;ProductHeaderValue;ProductHeaderValue;(System.String,System.String);Argument[0];Argument[this].SyntheticField[System.Net.Http.Headers.ProductHeaderValue._name];value;dfc-generated |
+| System.Net.Http.Headers;ProductHeaderValue;ProductHeaderValue;(System.String,System.String);Argument[1];Argument[this].SyntheticField[System.Net.Http.Headers.ProductHeaderValue._version];value;dfc-generated |
+| System.Net.Http.Headers;ProductHeaderValue;ToString;();Argument[this].SyntheticField[System.Net.Http.Headers.ProductHeaderValue._name];ReturnValue;value;dfc-generated |
+| System.Net.Http.Headers;ProductHeaderValue;ToString;();Argument[this].SyntheticField[System.Net.Http.Headers.ProductHeaderValue._version];ReturnValue;taint;dfc-generated |
+| System.Net.Http.Headers;ProductHeaderValue;get_Name;();Argument[this].SyntheticField[System.Net.Http.Headers.ProductHeaderValue._name];ReturnValue;value;dfc-generated |
+| System.Net.Http.Headers;ProductHeaderValue;get_Version;();Argument[this].SyntheticField[System.Net.Http.Headers.ProductHeaderValue._version];ReturnValue;value;dfc-generated |
+| System.Net.Http.Headers;ProductInfoHeaderValue;Clone;();Argument[this].SyntheticField[System.Net.Http.Headers.ProductInfoHeaderValue._comment];ReturnValue.SyntheticField[System.Net.Http.Headers.ProductInfoHeaderValue._comment];value;dfc-generated |
+| System.Net.Http.Headers;ProductInfoHeaderValue;Clone;();Argument[this].SyntheticField[System.Net.Http.Headers.ProductInfoHeaderValue._product];ReturnValue.SyntheticField[System.Net.Http.Headers.ProductInfoHeaderValue._product];value;dfc-generated |
+| System.Net.Http.Headers;ProductInfoHeaderValue;Clone;();Argument[this];ReturnValue;value;dfc-generated |
+| System.Net.Http.Headers;ProductInfoHeaderValue;ProductInfoHeaderValue;(System.Net.Http.Headers.ProductHeaderValue);Argument[0];Argument[this].SyntheticField[System.Net.Http.Headers.ProductInfoHeaderValue._product];value;dfc-generated |
+| System.Net.Http.Headers;ProductInfoHeaderValue;ProductInfoHeaderValue;(System.String);Argument[0];Argument[this].SyntheticField[System.Net.Http.Headers.ProductInfoHeaderValue._comment];value;dfc-generated |
+| System.Net.Http.Headers;ProductInfoHeaderValue;ToString;();Argument[this].SyntheticField[System.Net.Http.Headers.ProductInfoHeaderValue._comment];ReturnValue;value;dfc-generated |
+| System.Net.Http.Headers;ProductInfoHeaderValue;get_Comment;();Argument[this].SyntheticField[System.Net.Http.Headers.ProductInfoHeaderValue._comment];ReturnValue;value;dfc-generated |
+| System.Net.Http.Headers;ProductInfoHeaderValue;get_Product;();Argument[this].SyntheticField[System.Net.Http.Headers.ProductInfoHeaderValue._product];ReturnValue;value;dfc-generated |
+| System.Net.Http.Headers;RangeConditionHeaderValue;Clone;();Argument[this].SyntheticField[System.Net.Http.Headers.RangeConditionHeaderValue._date];ReturnValue.SyntheticField[System.Net.Http.Headers.RangeConditionHeaderValue._date];value;dfc-generated |
+| System.Net.Http.Headers;RangeConditionHeaderValue;Clone;();Argument[this].SyntheticField[System.Net.Http.Headers.RangeConditionHeaderValue._entityTag];ReturnValue.SyntheticField[System.Net.Http.Headers.RangeConditionHeaderValue._entityTag];value;dfc-generated |
+| System.Net.Http.Headers;RangeConditionHeaderValue;Clone;();Argument[this];ReturnValue;value;dfc-generated |
+| System.Net.Http.Headers;RangeConditionHeaderValue;RangeConditionHeaderValue;(System.DateTimeOffset);Argument[0];Argument[this].SyntheticField[System.Net.Http.Headers.RangeConditionHeaderValue._date];value;dfc-generated |
+| System.Net.Http.Headers;RangeConditionHeaderValue;RangeConditionHeaderValue;(System.Net.Http.Headers.EntityTagHeaderValue);Argument[0];Argument[this].SyntheticField[System.Net.Http.Headers.RangeConditionHeaderValue._entityTag];value;dfc-generated |
 | System.Net.Http.Headers;RangeConditionHeaderValue;ToString;();Argument[this];ReturnValue;taint;df-generated |
-| System.Net.Http.Headers;RangeConditionHeaderValue;get_Date;();Argument[this];ReturnValue;taint;df-generated |
-| System.Net.Http.Headers;RangeConditionHeaderValue;get_EntityTag;();Argument[this];ReturnValue;taint;df-generated |
-| System.Net.Http.Headers;RangeHeaderValue;Clone;();Argument[this];ReturnValue;taint;df-generated |
-| System.Net.Http.Headers;RangeHeaderValue;Clone;();Argument[this];ReturnValue;value;df-generated |
-| System.Net.Http.Headers;RangeItemHeaderValue;Clone;();Argument[this];ReturnValue;taint;df-generated |
-| System.Net.Http.Headers;RangeItemHeaderValue;Clone;();Argument[this];ReturnValue;value;df-generated |
-| System.Net.Http.Headers;RetryConditionHeaderValue;Clone;();Argument[this];ReturnValue;taint;df-generated |
-| System.Net.Http.Headers;RetryConditionHeaderValue;Clone;();Argument[this];ReturnValue;value;df-generated |
-| System.Net.Http.Headers;RetryConditionHeaderValue;RetryConditionHeaderValue;(System.DateTimeOffset);Argument[0];Argument[this];taint;df-generated |
-| System.Net.Http.Headers;RetryConditionHeaderValue;RetryConditionHeaderValue;(System.TimeSpan);Argument[0];Argument[this];taint;df-generated |
-| System.Net.Http.Headers;RetryConditionHeaderValue;get_Date;();Argument[this];ReturnValue;taint;df-generated |
-| System.Net.Http.Headers;RetryConditionHeaderValue;get_Delta;();Argument[this];ReturnValue;taint;df-generated |
-| System.Net.Http.Headers;StringWithQualityHeaderValue;Clone;();Argument[this];ReturnValue;taint;df-generated |
-| System.Net.Http.Headers;StringWithQualityHeaderValue;Clone;();Argument[this];ReturnValue;value;df-generated |
-| System.Net.Http.Headers;StringWithQualityHeaderValue;StringWithQualityHeaderValue;(System.String);Argument[0];Argument[this];taint;df-generated |
-| System.Net.Http.Headers;StringWithQualityHeaderValue;StringWithQualityHeaderValue;(System.String,System.Double);Argument[0];Argument[this];taint;df-generated |
-| System.Net.Http.Headers;StringWithQualityHeaderValue;ToString;();Argument[this];ReturnValue;taint;df-generated |
-| System.Net.Http.Headers;StringWithQualityHeaderValue;get_Value;();Argument[this];ReturnValue;taint;df-generated |
-| System.Net.Http.Headers;TransferCodingHeaderValue;Clone;();Argument[this];ReturnValue;taint;df-generated |
-| System.Net.Http.Headers;TransferCodingHeaderValue;Clone;();Argument[this];ReturnValue;value;df-generated |
-| System.Net.Http.Headers;TransferCodingHeaderValue;ToString;();Argument[this];ReturnValue;taint;df-generated |
-| System.Net.Http.Headers;TransferCodingHeaderValue;TransferCodingHeaderValue;(System.Net.Http.Headers.TransferCodingHeaderValue);Argument[0];Argument[this];taint;df-generated |
-| System.Net.Http.Headers;TransferCodingHeaderValue;TransferCodingHeaderValue;(System.String);Argument[0];Argument[this];taint;df-generated |
-| System.Net.Http.Headers;TransferCodingHeaderValue;TryParse;(System.String,System.Net.Http.Headers.TransferCodingHeaderValue);Argument[0];ReturnValue;taint;df-generated |
-| System.Net.Http.Headers;TransferCodingHeaderValue;get_Value;();Argument[this];ReturnValue;taint;df-generated |
-| System.Net.Http.Headers;TransferCodingWithQualityHeaderValue;Clone;();Argument[this];ReturnValue;taint;df-generated |
-| System.Net.Http.Headers;TransferCodingWithQualityHeaderValue;Clone;();Argument[this];ReturnValue;value;df-generated |
+| System.Net.Http.Headers;RangeConditionHeaderValue;get_Date;();Argument[this].SyntheticField[System.Net.Http.Headers.RangeConditionHeaderValue._date];ReturnValue;value;dfc-generated |
+| System.Net.Http.Headers;RangeConditionHeaderValue;get_EntityTag;();Argument[this].SyntheticField[System.Net.Http.Headers.RangeConditionHeaderValue._entityTag];ReturnValue;value;dfc-generated |
+| System.Net.Http.Headers;RangeHeaderValue;Clone;();Argument[this];ReturnValue;value;dfc-generated |
+| System.Net.Http.Headers;RangeItemHeaderValue;Clone;();Argument[this];ReturnValue;value;dfc-generated |
+| System.Net.Http.Headers;RetryConditionHeaderValue;Clone;();Argument[this].SyntheticField[System.Net.Http.Headers.RetryConditionHeaderValue._date];ReturnValue.SyntheticField[System.Net.Http.Headers.RetryConditionHeaderValue._date];value;dfc-generated |
+| System.Net.Http.Headers;RetryConditionHeaderValue;Clone;();Argument[this].SyntheticField[System.Net.Http.Headers.RetryConditionHeaderValue._delta];ReturnValue.SyntheticField[System.Net.Http.Headers.RetryConditionHeaderValue._delta];value;dfc-generated |
+| System.Net.Http.Headers;RetryConditionHeaderValue;Clone;();Argument[this];ReturnValue;value;dfc-generated |
+| System.Net.Http.Headers;RetryConditionHeaderValue;RetryConditionHeaderValue;(System.DateTimeOffset);Argument[0];Argument[this].SyntheticField[System.Net.Http.Headers.RetryConditionHeaderValue._date];value;dfc-generated |
+| System.Net.Http.Headers;RetryConditionHeaderValue;RetryConditionHeaderValue;(System.TimeSpan);Argument[0];Argument[this].SyntheticField[System.Net.Http.Headers.RetryConditionHeaderValue._delta];value;dfc-generated |
+| System.Net.Http.Headers;RetryConditionHeaderValue;get_Date;();Argument[this].SyntheticField[System.Net.Http.Headers.RetryConditionHeaderValue._date];ReturnValue;value;dfc-generated |
+| System.Net.Http.Headers;RetryConditionHeaderValue;get_Delta;();Argument[this].SyntheticField[System.Net.Http.Headers.RetryConditionHeaderValue._delta];ReturnValue;value;dfc-generated |
+| System.Net.Http.Headers;StringWithQualityHeaderValue;Clone;();Argument[this].SyntheticField[System.Net.Http.Headers.StringWithQualityHeaderValue._value];ReturnValue.SyntheticField[System.Net.Http.Headers.StringWithQualityHeaderValue._value];value;dfc-generated |
+| System.Net.Http.Headers;StringWithQualityHeaderValue;Clone;();Argument[this];ReturnValue;value;dfc-generated |
+| System.Net.Http.Headers;StringWithQualityHeaderValue;StringWithQualityHeaderValue;(System.String);Argument[0];Argument[this].SyntheticField[System.Net.Http.Headers.StringWithQualityHeaderValue._value];value;dfc-generated |
+| System.Net.Http.Headers;StringWithQualityHeaderValue;StringWithQualityHeaderValue;(System.String,System.Double);Argument[0];Argument[this].SyntheticField[System.Net.Http.Headers.StringWithQualityHeaderValue._value];value;dfc-generated |
+| System.Net.Http.Headers;StringWithQualityHeaderValue;ToString;();Argument[this].SyntheticField[System.Net.Http.Headers.StringWithQualityHeaderValue._value];ReturnValue;value;dfc-generated |
+| System.Net.Http.Headers;StringWithQualityHeaderValue;get_Value;();Argument[this].SyntheticField[System.Net.Http.Headers.StringWithQualityHeaderValue._value];ReturnValue;value;dfc-generated |
+| System.Net.Http.Headers;TransferCodingHeaderValue;Clone;();Argument[this];ReturnValue;value;dfc-generated |
+| System.Net.Http.Headers;TransferCodingHeaderValue;ToString;();Argument[this].SyntheticField[System.Net.Http.Headers.TransferCodingHeaderValue._value];ReturnValue;taint;dfc-generated |
+| System.Net.Http.Headers;TransferCodingHeaderValue;TransferCodingHeaderValue;(System.Net.Http.Headers.TransferCodingHeaderValue);Argument[0].SyntheticField[System.Net.Http.Headers.TransferCodingHeaderValue._value];Argument[this].SyntheticField[System.Net.Http.Headers.TransferCodingHeaderValue._value];value;dfc-generated |
+| System.Net.Http.Headers;TransferCodingHeaderValue;TransferCodingHeaderValue;(System.String);Argument[0];Argument[this].SyntheticField[System.Net.Http.Headers.TransferCodingHeaderValue._value];value;dfc-generated |
+| System.Net.Http.Headers;TransferCodingHeaderValue;TryParse;(System.String,System.Net.Http.Headers.TransferCodingHeaderValue);Argument[0];ReturnValue.SyntheticField[System.Net.Http.Headers.TransferCodingHeaderValue._value];taint;dfc-generated |
+| System.Net.Http.Headers;TransferCodingHeaderValue;get_Value;();Argument[this].SyntheticField[System.Net.Http.Headers.TransferCodingHeaderValue._value];ReturnValue;value;dfc-generated |
+| System.Net.Http.Headers;TransferCodingWithQualityHeaderValue;Clone;();Argument[this];ReturnValue;value;dfc-generated |
 | System.Net.Http.Headers;TransferCodingWithQualityHeaderValue;TryParse;(System.String,System.Net.Http.Headers.TransferCodingWithQualityHeaderValue);Argument[0];ReturnValue;taint;df-generated |
-| System.Net.Http.Headers;ViaHeaderValue;Clone;();Argument[this];ReturnValue;taint;df-generated |
-| System.Net.Http.Headers;ViaHeaderValue;Clone;();Argument[this];ReturnValue;value;df-generated |
-| System.Net.Http.Headers;ViaHeaderValue;ViaHeaderValue;(System.String,System.String,System.String,System.String);Argument[0];Argument[this];taint;df-generated |
-| System.Net.Http.Headers;ViaHeaderValue;ViaHeaderValue;(System.String,System.String,System.String,System.String);Argument[1];Argument[this];taint;df-generated |
-| System.Net.Http.Headers;ViaHeaderValue;ViaHeaderValue;(System.String,System.String,System.String,System.String);Argument[2];Argument[this];taint;df-generated |
-| System.Net.Http.Headers;ViaHeaderValue;ViaHeaderValue;(System.String,System.String,System.String,System.String);Argument[3];Argument[this];taint;df-generated |
-| System.Net.Http.Headers;ViaHeaderValue;get_Comment;();Argument[this];ReturnValue;taint;df-generated |
-| System.Net.Http.Headers;ViaHeaderValue;get_ProtocolName;();Argument[this];ReturnValue;taint;df-generated |
-| System.Net.Http.Headers;ViaHeaderValue;get_ProtocolVersion;();Argument[this];ReturnValue;taint;df-generated |
-| System.Net.Http.Headers;ViaHeaderValue;get_ReceivedBy;();Argument[this];ReturnValue;taint;df-generated |
-| System.Net.Http.Headers;WarningHeaderValue;Clone;();Argument[this];ReturnValue;taint;df-generated |
-| System.Net.Http.Headers;WarningHeaderValue;Clone;();Argument[this];ReturnValue;value;df-generated |
-| System.Net.Http.Headers;WarningHeaderValue;WarningHeaderValue;(System.Int32,System.String,System.String);Argument[1];Argument[this];taint;df-generated |
-| System.Net.Http.Headers;WarningHeaderValue;WarningHeaderValue;(System.Int32,System.String,System.String);Argument[2];Argument[this];taint;df-generated |
-| System.Net.Http.Headers;WarningHeaderValue;WarningHeaderValue;(System.Int32,System.String,System.String,System.DateTimeOffset);Argument[1];Argument[this];taint;df-generated |
-| System.Net.Http.Headers;WarningHeaderValue;WarningHeaderValue;(System.Int32,System.String,System.String,System.DateTimeOffset);Argument[2];Argument[this];taint;df-generated |
-| System.Net.Http.Headers;WarningHeaderValue;WarningHeaderValue;(System.Int32,System.String,System.String,System.DateTimeOffset);Argument[3];Argument[this];taint;df-generated |
-| System.Net.Http.Headers;WarningHeaderValue;get_Agent;();Argument[this];ReturnValue;taint;df-generated |
-| System.Net.Http.Headers;WarningHeaderValue;get_Date;();Argument[this];ReturnValue;taint;df-generated |
-| System.Net.Http.Headers;WarningHeaderValue;get_Text;();Argument[this];ReturnValue;taint;df-generated |
+| System.Net.Http.Headers;ViaHeaderValue;Clone;();Argument[this];ReturnValue;value;dfc-generated |
+| System.Net.Http.Headers;ViaHeaderValue;ViaHeaderValue;(System.String,System.String,System.String,System.String);Argument[0];Argument[this].SyntheticField[System.Net.Http.Headers.ViaHeaderValue._protocolVersion];value;dfc-generated |
+| System.Net.Http.Headers;ViaHeaderValue;ViaHeaderValue;(System.String,System.String,System.String,System.String);Argument[1];Argument[this].SyntheticField[System.Net.Http.Headers.ViaHeaderValue._receivedBy];value;dfc-generated |
+| System.Net.Http.Headers;ViaHeaderValue;ViaHeaderValue;(System.String,System.String,System.String,System.String);Argument[2];Argument[this].SyntheticField[System.Net.Http.Headers.ViaHeaderValue._protocolName];value;dfc-generated |
+| System.Net.Http.Headers;ViaHeaderValue;ViaHeaderValue;(System.String,System.String,System.String,System.String);Argument[3];Argument[this].SyntheticField[System.Net.Http.Headers.ViaHeaderValue._comment];value;dfc-generated |
+| System.Net.Http.Headers;ViaHeaderValue;get_Comment;();Argument[this].SyntheticField[System.Net.Http.Headers.ViaHeaderValue._comment];ReturnValue;value;dfc-generated |
+| System.Net.Http.Headers;ViaHeaderValue;get_ProtocolName;();Argument[this].SyntheticField[System.Net.Http.Headers.ViaHeaderValue._protocolName];ReturnValue;value;dfc-generated |
+| System.Net.Http.Headers;ViaHeaderValue;get_ProtocolVersion;();Argument[this].SyntheticField[System.Net.Http.Headers.ViaHeaderValue._protocolVersion];ReturnValue;value;dfc-generated |
+| System.Net.Http.Headers;ViaHeaderValue;get_ReceivedBy;();Argument[this].SyntheticField[System.Net.Http.Headers.ViaHeaderValue._receivedBy];ReturnValue;value;dfc-generated |
+| System.Net.Http.Headers;WarningHeaderValue;Clone;();Argument[this].SyntheticField[System.Net.Http.Headers.WarningHeaderValue._agent];ReturnValue.SyntheticField[System.Net.Http.Headers.WarningHeaderValue._agent];value;dfc-generated |
+| System.Net.Http.Headers;WarningHeaderValue;Clone;();Argument[this].SyntheticField[System.Net.Http.Headers.WarningHeaderValue._date];ReturnValue.SyntheticField[System.Net.Http.Headers.WarningHeaderValue._date];value;dfc-generated |
+| System.Net.Http.Headers;WarningHeaderValue;Clone;();Argument[this].SyntheticField[System.Net.Http.Headers.WarningHeaderValue._text];ReturnValue.SyntheticField[System.Net.Http.Headers.WarningHeaderValue._text];value;dfc-generated |
+| System.Net.Http.Headers;WarningHeaderValue;Clone;();Argument[this];ReturnValue;value;dfc-generated |
+| System.Net.Http.Headers;WarningHeaderValue;WarningHeaderValue;(System.Int32,System.String,System.String);Argument[1];Argument[this].SyntheticField[System.Net.Http.Headers.WarningHeaderValue._agent];value;dfc-generated |
+| System.Net.Http.Headers;WarningHeaderValue;WarningHeaderValue;(System.Int32,System.String,System.String);Argument[2];Argument[this].SyntheticField[System.Net.Http.Headers.WarningHeaderValue._text];value;dfc-generated |
+| System.Net.Http.Headers;WarningHeaderValue;WarningHeaderValue;(System.Int32,System.String,System.String,System.DateTimeOffset);Argument[1];Argument[this].SyntheticField[System.Net.Http.Headers.WarningHeaderValue._agent];value;dfc-generated |
+| System.Net.Http.Headers;WarningHeaderValue;WarningHeaderValue;(System.Int32,System.String,System.String,System.DateTimeOffset);Argument[2];Argument[this].SyntheticField[System.Net.Http.Headers.WarningHeaderValue._text];value;dfc-generated |
+| System.Net.Http.Headers;WarningHeaderValue;WarningHeaderValue;(System.Int32,System.String,System.String,System.DateTimeOffset);Argument[3];Argument[this].SyntheticField[System.Net.Http.Headers.WarningHeaderValue._date];value;dfc-generated |
+| System.Net.Http.Headers;WarningHeaderValue;get_Agent;();Argument[this].SyntheticField[System.Net.Http.Headers.WarningHeaderValue._agent];ReturnValue;value;dfc-generated |
+| System.Net.Http.Headers;WarningHeaderValue;get_Date;();Argument[this].SyntheticField[System.Net.Http.Headers.WarningHeaderValue._date];ReturnValue;value;dfc-generated |
+| System.Net.Http.Headers;WarningHeaderValue;get_Text;();Argument[this].SyntheticField[System.Net.Http.Headers.WarningHeaderValue._text];ReturnValue;value;dfc-generated |
 | System.Net.Http.Json;JsonContent;Create;(System.Object,System.Text.Json.Serialization.Metadata.JsonTypeInfo,System.Net.Http.Headers.MediaTypeHeaderValue);Argument[1];ReturnValue;taint;df-generated |
-| System.Net.Http.Json;JsonContent;Create;(System.Object,System.Type,System.Net.Http.Headers.MediaTypeHeaderValue,System.Text.Json.JsonSerializerOptions);Argument[3];ReturnValue;taint;df-generated |
-| System.Net.Http.Json;JsonContent;Create<T>;(T,System.Net.Http.Headers.MediaTypeHeaderValue,System.Text.Json.JsonSerializerOptions);Argument[2];ReturnValue;taint;df-generated |
 | System.Net.Http.Json;JsonContent;Create<T>;(T,System.Text.Json.Serialization.Metadata.JsonTypeInfo<T>,System.Net.Http.Headers.MediaTypeHeaderValue);Argument[1];ReturnValue;taint;df-generated |
 | System.Net.Http.Json;JsonContent;SerializeToStream;(System.IO.Stream,System.Net.TransportContext,System.Threading.CancellationToken);Argument[this];Argument[0];taint;df-generated |
 | System.Net.Http.Json;JsonContent;SerializeToStreamAsync;(System.IO.Stream,System.Net.TransportContext);Argument[0];ReturnValue;taint;df-generated |
@@ -12950,10 +13474,16 @@ summary
 | System.Net.Http.Metrics;HttpMetricsEnrichmentContext;get_Exception;();Argument[this];ReturnValue;taint;df-generated |
 | System.Net.Http.Metrics;HttpMetricsEnrichmentContext;get_Request;();Argument[this];ReturnValue;taint;df-generated |
 | System.Net.Http.Metrics;HttpMetricsEnrichmentContext;get_Response;();Argument[this];ReturnValue;taint;df-generated |
-| System.Net.Http;ByteArrayContent;ByteArrayContent;(System.Byte[]);Argument[0].Element;Argument[this];taint;df-generated |
-| System.Net.Http;ByteArrayContent;ByteArrayContent;(System.Byte[],System.Int32,System.Int32);Argument[0].Element;Argument[this];taint;df-generated |
+| System.Net.Http;ByteArrayContent;ByteArrayContent;(System.Byte[]);Argument[0];Argument[this].SyntheticField[System.Net.Http.ByteArrayContent._content];value;dfc-generated |
+| System.Net.Http;ByteArrayContent;ByteArrayContent;(System.Byte[],System.Int32,System.Int32);Argument[0];Argument[this].SyntheticField[System.Net.Http.ByteArrayContent._content];value;dfc-generated |
+| System.Net.Http;ByteArrayContent;CreateContentReadStream;(System.Threading.CancellationToken);Argument[this].SyntheticField[System.Net.Http.ByteArrayContent._content].Element;ReturnValue;taint;df-generated |
+| System.Net.Http;ByteArrayContent;CreateContentReadStream;(System.Threading.CancellationToken);Argument[this].SyntheticField[System.Net.Http.ByteArrayContent._content].Element;ReturnValue;taint;dfc-generated |
 | System.Net.Http;ByteArrayContent;CreateContentReadStream;(System.Threading.CancellationToken);Argument[this];ReturnValue;taint;df-generated |
+| System.Net.Http;ByteArrayContent;CreateContentReadStream;(System.Threading.CancellationToken);Argument[this];ReturnValue;taint;dfc-generated |
+| System.Net.Http;ByteArrayContent;CreateContentReadStreamAsync;();Argument[this].SyntheticField[System.Net.Http.ByteArrayContent._content].Element;ReturnValue.Property[System.Threading.Tasks.Task`1.Result];taint;df-generated |
+| System.Net.Http;ByteArrayContent;CreateContentReadStreamAsync;();Argument[this].SyntheticField[System.Net.Http.ByteArrayContent._content].Element;ReturnValue.Property[System.Threading.Tasks.Task`1.Result];taint;dfc-generated |
 | System.Net.Http;ByteArrayContent;CreateContentReadStreamAsync;();Argument[this];ReturnValue;taint;df-generated |
+| System.Net.Http;ByteArrayContent;CreateContentReadStreamAsync;();Argument[this];ReturnValue;taint;dfc-generated |
 | System.Net.Http;ByteArrayContent;SerializeToStream;(System.IO.Stream,System.Net.TransportContext,System.Threading.CancellationToken);Argument[this];Argument[0];taint;df-generated |
 | System.Net.Http;ByteArrayContent;SerializeToStreamAsync;(System.IO.Stream,System.Net.TransportContext);Argument[0];ReturnValue;taint;df-generated |
 | System.Net.Http;ByteArrayContent;SerializeToStreamAsync;(System.IO.Stream,System.Net.TransportContext);Argument[this];Argument[0];taint;df-generated |
@@ -12963,7 +13493,6 @@ summary
 | System.Net.Http;ByteArrayContent;SerializeToStreamAsync;(System.IO.Stream,System.Net.TransportContext,System.Threading.CancellationToken);Argument[this];Argument[0];taint;df-generated |
 | System.Net.Http;ByteArrayContent;SerializeToStreamAsync;(System.IO.Stream,System.Net.TransportContext,System.Threading.CancellationToken);Argument[this];ReturnValue;taint;df-generated |
 | System.Net.Http;DelegatingHandler;DelegatingHandler;(System.Net.Http.HttpMessageHandler);Argument[0];Argument[this];taint;df-generated |
-| System.Net.Http;DelegatingHandler;SendAsync;(System.Net.Http.HttpRequestMessage,System.Threading.CancellationToken);Argument[1];ReturnValue;taint;df-generated |
 | System.Net.Http;FormUrlEncodedContent;SerializeToStreamAsync;(System.IO.Stream,System.Net.TransportContext,System.Threading.CancellationToken);Argument[0];ReturnValue;taint;df-generated |
 | System.Net.Http;FormUrlEncodedContent;SerializeToStreamAsync;(System.IO.Stream,System.Net.TransportContext,System.Threading.CancellationToken);Argument[2];ReturnValue;taint;df-generated |
 | System.Net.Http;FormUrlEncodedContent;SerializeToStreamAsync;(System.IO.Stream,System.Net.TransportContext,System.Threading.CancellationToken);Argument[this];Argument[0];taint;df-generated |
@@ -12976,9 +13505,7 @@ summary
 | System.Net.Http;HttpClient;SendAsync;(System.Net.Http.HttpRequestMessage);Argument[this];Argument[0];taint;df-generated |
 | System.Net.Http;HttpClient;SendAsync;(System.Net.Http.HttpRequestMessage,System.Net.Http.HttpCompletionOption);Argument[this];Argument[0];taint;df-generated |
 | System.Net.Http;HttpClient;SendAsync;(System.Net.Http.HttpRequestMessage,System.Net.Http.HttpCompletionOption,System.Threading.CancellationToken);Argument[this];Argument[0];taint;df-generated |
-| System.Net.Http;HttpClient;SendAsync;(System.Net.Http.HttpRequestMessage,System.Threading.CancellationToken);Argument[1];ReturnValue;taint;df-generated |
 | System.Net.Http;HttpClient;SendAsync;(System.Net.Http.HttpRequestMessage,System.Threading.CancellationToken);Argument[this];Argument[0];taint;df-generated |
-| System.Net.Http;HttpClientHandler;SendAsync;(System.Net.Http.HttpRequestMessage,System.Threading.CancellationToken);Argument[1];ReturnValue;taint;df-generated |
 | System.Net.Http;HttpClientHandler;get_Properties;();Argument[this];ReturnValue;taint;df-generated |
 | System.Net.Http;HttpClientHandler;set_ServerCertificateCustomValidationCallback;(System.Func<System.Net.Http.HttpRequestMessage,System.Security.Cryptography.X509Certificates.X509Certificate2,System.Security.Cryptography.X509Certificates.X509Chain,System.Net.Security.SslPolicyErrors,System.Boolean>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Net.Http;HttpContent;CopyTo;(System.IO.Stream,System.Net.TransportContext,System.Threading.CancellationToken);Argument[this];Argument[0];taint;df-generated |
@@ -12995,8 +13522,6 @@ summary
 | System.Net.Http;HttpContent;ReadAsStream;(System.Threading.CancellationToken);Argument[this];ReturnValue;taint;df-generated |
 | System.Net.Http;HttpContent;ReadAsStreamAsync;();Argument[this];ReturnValue;taint;df-generated |
 | System.Net.Http;HttpContent;ReadAsStreamAsync;(System.Threading.CancellationToken);Argument[this];ReturnValue;taint;df-generated |
-| System.Net.Http;HttpContent;ReadAsStringAsync;();Argument[this];ReturnValue;taint;df-generated |
-| System.Net.Http;HttpContent;ReadAsStringAsync;(System.Threading.CancellationToken);Argument[this];ReturnValue;taint;df-generated |
 | System.Net.Http;HttpContent;SerializeToStream;(System.IO.Stream,System.Net.TransportContext,System.Threading.CancellationToken);Argument[this];Argument[0];taint;df-generated |
 | System.Net.Http;HttpContent;SerializeToStreamAsync;(System.IO.Stream,System.Net.TransportContext);Argument[0];ReturnValue;taint;df-generated |
 | System.Net.Http;HttpContent;SerializeToStreamAsync;(System.IO.Stream,System.Net.TransportContext);Argument[this];Argument[0];taint;df-generated |
@@ -13005,20 +13530,19 @@ summary
 | System.Net.Http;HttpContent;SerializeToStreamAsync;(System.IO.Stream,System.Net.TransportContext,System.Threading.CancellationToken);Argument[2];ReturnValue;taint;df-generated |
 | System.Net.Http;HttpContent;SerializeToStreamAsync;(System.IO.Stream,System.Net.TransportContext,System.Threading.CancellationToken);Argument[this];Argument[0];taint;df-generated |
 | System.Net.Http;HttpContent;SerializeToStreamAsync;(System.IO.Stream,System.Net.TransportContext,System.Threading.CancellationToken);Argument[this];ReturnValue;taint;df-generated |
-| System.Net.Http;HttpMessageHandler;SendAsync;(System.Net.Http.HttpRequestMessage,System.Threading.CancellationToken);Argument[1];ReturnValue;taint;df-generated |
 | System.Net.Http;HttpMessageInvoker;HttpMessageInvoker;(System.Net.Http.HttpMessageHandler,System.Boolean);Argument[0];Argument[this];taint;df-generated |
 | System.Net.Http;HttpMessageInvoker;Send;(System.Net.Http.HttpRequestMessage,System.Threading.CancellationToken);Argument[this];Argument[0];taint;df-generated |
-| System.Net.Http;HttpMessageInvoker;SendAsync;(System.Net.Http.HttpRequestMessage,System.Threading.CancellationToken);Argument[1];ReturnValue;taint;df-generated |
 | System.Net.Http;HttpMessageInvoker;SendAsync;(System.Net.Http.HttpRequestMessage,System.Threading.CancellationToken);Argument[this];Argument[0];taint;df-generated |
-| System.Net.Http;HttpMethod;HttpMethod;(System.String);Argument[0];Argument[this];taint;df-generated |
-| System.Net.Http;HttpMethod;ToString;();Argument[this];ReturnValue;taint;df-generated |
-| System.Net.Http;HttpMethod;get_Method;();Argument[this];ReturnValue;taint;df-generated |
+| System.Net.Http;HttpMethod;HttpMethod;(System.String);Argument[0];Argument[this].SyntheticField[System.Net.Http.HttpMethod._method];value;dfc-generated |
+| System.Net.Http;HttpMethod;ToString;();Argument[this].SyntheticField[System.Net.Http.HttpMethod._method];ReturnValue;value;dfc-generated |
+| System.Net.Http;HttpMethod;get_Method;();Argument[this].SyntheticField[System.Net.Http.HttpMethod._method];ReturnValue;value;dfc-generated |
 | System.Net.Http;HttpRequestMessage;HttpRequestMessage;(System.Net.Http.HttpMethod,System.String);Argument[0];Argument[this];taint;manual |
 | System.Net.Http;HttpRequestMessage;HttpRequestMessage;(System.Net.Http.HttpMethod,System.String);Argument[1];Argument[this];taint;manual |
-| System.Net.Http;HttpRequestMessage;HttpRequestMessage;(System.Net.Http.HttpMethod,System.Uri);Argument[0];Argument[this];taint;df-generated |
-| System.Net.Http;HttpRequestMessage;HttpRequestMessage;(System.Net.Http.HttpMethod,System.Uri);Argument[1];Argument[this];taint;df-generated |
-| System.Net.Http;HttpRequestMessage;ToString;();Argument[this];ReturnValue;taint;df-generated |
-| System.Net.Http;HttpRequestMessage;get_Properties;();Argument[this];ReturnValue;taint;df-generated |
+| System.Net.Http;HttpRequestMessage;HttpRequestMessage;(System.Net.Http.HttpMethod,System.Uri);Argument[0];Argument[this].SyntheticField[System.Net.Http.HttpRequestMessage._method];value;dfc-generated |
+| System.Net.Http;HttpRequestMessage;HttpRequestMessage;(System.Net.Http.HttpMethod,System.Uri);Argument[1];Argument[this].SyntheticField[System.Net.Http.HttpRequestMessage._requestUri];value;dfc-generated |
+| System.Net.Http;HttpRequestMessage;ToString;();Argument[this].SyntheticField[System.Net.Http.HttpRequestMessage._method];ReturnValue;taint;dfc-generated |
+| System.Net.Http;HttpRequestMessage;ToString;();Argument[this].SyntheticField[System.Net.Http.HttpRequestMessage._requestUri];ReturnValue;taint;dfc-generated |
+| System.Net.Http;HttpRequestMessage;get_Properties;();Argument[this].Property[System.Net.Http.HttpRequestMessage.Options];ReturnValue;value;dfc-generated |
 | System.Net.Http;HttpRequestOptions;Add;(System.Collections.Generic.KeyValuePair<System.String,System.Object>);Argument[0].Property[System.Collections.Generic.KeyValuePair`2.Key];Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Key];value;manual |
 | System.Net.Http;HttpRequestOptions;Add;(System.Collections.Generic.KeyValuePair<System.String,System.Object>);Argument[0].Property[System.Collections.Generic.KeyValuePair`2.Value];Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Value];value;manual |
 | System.Net.Http;HttpRequestOptions;Add;(System.Collections.Generic.KeyValuePair<System.String,System.Object>);Argument[0];Argument[this].Element;value;manual |
@@ -13035,9 +13559,8 @@ summary
 | System.Net.Http;HttpRequestOptions;get_Values;();Argument[this];ReturnValue;taint;df-generated |
 | System.Net.Http;HttpRequestOptions;set_Item;(System.String,System.Object);Argument[0];Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Key];value;manual |
 | System.Net.Http;HttpRequestOptions;set_Item;(System.String,System.Object);Argument[1];Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Value];value;manual |
-| System.Net.Http;HttpResponseMessage;EnsureSuccessStatusCode;();Argument[this];ReturnValue;value;df-generated |
-| System.Net.Http;HttpResponseMessage;ToString;();Argument[this];ReturnValue;taint;df-generated |
-| System.Net.Http;MessageProcessingHandler;SendAsync;(System.Net.Http.HttpRequestMessage,System.Threading.CancellationToken);Argument[1];ReturnValue;taint;df-generated |
+| System.Net.Http;HttpResponseMessage;EnsureSuccessStatusCode;();Argument[this];ReturnValue;value;dfc-generated |
+| System.Net.Http;HttpResponseMessage;ToString;();Argument[this].Property[System.Net.Http.HttpResponseMessage.ReasonPhrase];ReturnValue;taint;dfc-generated |
 | System.Net.Http;MultipartContent;Add;(System.Net.Http.HttpContent);Argument[0];Argument[this].Element;value;manual |
 | System.Net.Http;MultipartContent;CreateContentReadStream;(System.Threading.CancellationToken);Argument[this];ReturnValue;taint;df-generated |
 | System.Net.Http;MultipartContent;CreateContentReadStreamAsync;();Argument[this];ReturnValue;taint;df-generated |
@@ -13055,8 +13578,8 @@ summary
 | System.Net.Http;MultipartContent;SerializeToStreamAsync;(System.IO.Stream,System.Net.TransportContext,System.Threading.CancellationToken);Argument[this];ReturnValue;taint;df-generated |
 | System.Net.Http;MultipartContent;set_HeaderEncodingSelector;(System.Net.Http.HeaderEncodingSelector<System.Net.Http.HttpContent>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Net.Http;MultipartFormDataContent;Add;(System.Net.Http.HttpContent);Argument[0];Argument[this].Element;value;manual |
-| System.Net.Http;MultipartFormDataContent;Add;(System.Net.Http.HttpContent,System.String);Argument[0];Argument[this];taint;df-generated |
-| System.Net.Http;MultipartFormDataContent;Add;(System.Net.Http.HttpContent,System.String,System.String);Argument[0];Argument[this];taint;df-generated |
+| System.Net.Http;MultipartFormDataContent;Add;(System.Net.Http.HttpContent,System.String);Argument[0];Argument[this].Element;value;dfc-generated |
+| System.Net.Http;MultipartFormDataContent;Add;(System.Net.Http.HttpContent,System.String,System.String);Argument[0];Argument[this].Element;value;dfc-generated |
 | System.Net.Http;MultipartFormDataContent;SerializeToStreamAsync;(System.IO.Stream,System.Net.TransportContext,System.Threading.CancellationToken);Argument[0];ReturnValue;taint;df-generated |
 | System.Net.Http;MultipartFormDataContent;SerializeToStreamAsync;(System.IO.Stream,System.Net.TransportContext,System.Threading.CancellationToken);Argument[2];ReturnValue;taint;df-generated |
 | System.Net.Http;MultipartFormDataContent;SerializeToStreamAsync;(System.IO.Stream,System.Net.TransportContext,System.Threading.CancellationToken);Argument[this];Argument[0];taint;df-generated |
@@ -13074,7 +13597,6 @@ summary
 | System.Net.Http;ReadOnlyMemoryContent;SerializeToStreamAsync;(System.IO.Stream,System.Net.TransportContext,System.Threading.CancellationToken);Argument[this];ReturnValue;taint;df-generated |
 | System.Net.Http;SocketsHttpConnectionContext;get_DnsEndPoint;();Argument[this];ReturnValue;taint;df-generated |
 | System.Net.Http;SocketsHttpConnectionContext;get_InitialRequestMessage;();Argument[this];ReturnValue;taint;df-generated |
-| System.Net.Http;SocketsHttpHandler;SendAsync;(System.Net.Http.HttpRequestMessage,System.Threading.CancellationToken);Argument[1];ReturnValue;taint;df-generated |
 | System.Net.Http;SocketsHttpHandler;set_ConnectCallback;(System.Func<System.Net.Http.SocketsHttpConnectionContext,System.Threading.CancellationToken,System.Threading.Tasks.ValueTask<System.IO.Stream>>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Net.Http;SocketsHttpHandler;set_PlaintextStreamFilter;(System.Func<System.Net.Http.SocketsHttpPlaintextStreamFilterContext,System.Threading.CancellationToken,System.Threading.Tasks.ValueTask<System.IO.Stream>>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Net.Http;SocketsHttpHandler;set_RequestHeaderEncodingSelector;(System.Net.Http.HeaderEncodingSelector<System.Net.Http.HttpRequestMessage>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
@@ -13102,10 +13624,8 @@ summary
 | System.Net.Mail;AlternateView;CreateAlternateViewFromString;(System.String,System.Net.Mime.ContentType);Argument[0];ReturnValue;taint;df-generated |
 | System.Net.Mail;AlternateView;CreateAlternateViewFromString;(System.String,System.Net.Mime.ContentType);Argument[1];ReturnValue;taint;df-generated |
 | System.Net.Mail;AlternateView;CreateAlternateViewFromString;(System.String,System.Text.Encoding,System.String);Argument[0];ReturnValue;taint;df-generated |
-| System.Net.Mail;AlternateViewCollection;InsertItem;(System.Int32,System.Net.Mail.AlternateView);Argument[1];Argument[this];taint;df-generated |
-| System.Net.Mail;AlternateViewCollection;InsertItem;(System.Int32,System.Net.Mail.AlternateView);Argument[this];Argument[1];taint;df-generated |
+| System.Net.Mail;AlternateViewCollection;InsertItem;(System.Int32,System.Net.Mail.AlternateView);Argument[1];Argument[this].SyntheticField[System.Collections.ObjectModel.Collection`1.items].Element;value;dfc-generated |
 | System.Net.Mail;AlternateViewCollection;SetItem;(System.Int32,System.Net.Mail.AlternateView);Argument[1];Argument[this];taint;df-generated |
-| System.Net.Mail;AlternateViewCollection;SetItem;(System.Int32,System.Net.Mail.AlternateView);Argument[this];Argument[1];taint;df-generated |
 | System.Net.Mail;Attachment;Attachment;(System.IO.Stream,System.Net.Mime.ContentType);Argument[1];Argument[this];taint;df-generated |
 | System.Net.Mail;Attachment;Attachment;(System.IO.Stream,System.String);Argument[1];Argument[this];taint;df-generated |
 | System.Net.Mail;Attachment;Attachment;(System.IO.Stream,System.String,System.String);Argument[1];Argument[this];taint;df-generated |
@@ -13120,47 +13640,46 @@ summary
 | System.Net.Mail;Attachment;CreateAttachmentFromString;(System.String,System.String,System.Text.Encoding,System.String);Argument[0];ReturnValue;taint;df-generated |
 | System.Net.Mail;Attachment;CreateAttachmentFromString;(System.String,System.String,System.Text.Encoding,System.String);Argument[1];ReturnValue;taint;df-generated |
 | System.Net.Mail;Attachment;get_ContentDisposition;();Argument[this];ReturnValue;taint;df-generated |
-| System.Net.Mail;AttachmentBase;AttachmentBase;(System.IO.Stream);Argument[0];Argument[this];taint;df-generated |
-| System.Net.Mail;AttachmentBase;AttachmentBase;(System.IO.Stream,System.Net.Mime.ContentType);Argument[0];Argument[this];taint;df-generated |
-| System.Net.Mail;AttachmentBase;AttachmentBase;(System.IO.Stream,System.Net.Mime.ContentType);Argument[1];Argument[this];taint;df-generated |
-| System.Net.Mail;AttachmentBase;AttachmentBase;(System.IO.Stream,System.String);Argument[0];Argument[this];taint;df-generated |
-| System.Net.Mail;AttachmentBase;AttachmentBase;(System.String);Argument[0];Argument[this];taint;df-generated |
-| System.Net.Mail;AttachmentBase;AttachmentBase;(System.String,System.Net.Mime.ContentType);Argument[0];Argument[this];taint;df-generated |
-| System.Net.Mail;AttachmentBase;AttachmentBase;(System.String,System.Net.Mime.ContentType);Argument[1];Argument[this];taint;df-generated |
-| System.Net.Mail;AttachmentBase;AttachmentBase;(System.String,System.String);Argument[0];Argument[this];taint;df-generated |
-| System.Net.Mail;AttachmentBase;get_ContentStream;();Argument[this];ReturnValue;taint;df-generated |
-| System.Net.Mail;AttachmentCollection;InsertItem;(System.Int32,System.Net.Mail.Attachment);Argument[1];Argument[this];taint;df-generated |
-| System.Net.Mail;AttachmentCollection;InsertItem;(System.Int32,System.Net.Mail.Attachment);Argument[this];Argument[1];taint;df-generated |
+| System.Net.Mail;AttachmentBase;AttachmentBase;(System.IO.Stream);Argument[0];Argument[this].SyntheticField[System.Net.Mail.AttachmentBase._part].SyntheticField[System.Net.Mime.MimePart._stream];value;dfc-generated |
+| System.Net.Mail;AttachmentBase;AttachmentBase;(System.IO.Stream,System.Net.Mime.ContentType);Argument[0];Argument[this].SyntheticField[System.Net.Mail.AttachmentBase._part].SyntheticField[System.Net.Mime.MimePart._stream];value;dfc-generated |
+| System.Net.Mail;AttachmentBase;AttachmentBase;(System.IO.Stream,System.String);Argument[0];Argument[this].SyntheticField[System.Net.Mail.AttachmentBase._part].SyntheticField[System.Net.Mime.MimePart._stream];value;dfc-generated |
+| System.Net.Mail;AttachmentBase;AttachmentBase;(System.String);Argument[0];Argument[this].SyntheticField[System.Net.Mail.AttachmentBase._part].SyntheticField[System.Net.Mime.MimePart._stream];taint;dfc-generated |
+| System.Net.Mail;AttachmentBase;AttachmentBase;(System.String,System.Net.Mime.ContentType);Argument[0];Argument[this].SyntheticField[System.Net.Mail.AttachmentBase._part].SyntheticField[System.Net.Mime.MimePart._stream];taint;dfc-generated |
+| System.Net.Mail;AttachmentBase;AttachmentBase;(System.String,System.String);Argument[0];Argument[this].SyntheticField[System.Net.Mail.AttachmentBase._part].SyntheticField[System.Net.Mime.MimePart._stream];taint;dfc-generated |
+| System.Net.Mail;AttachmentBase;get_ContentStream;();Argument[this].SyntheticField[System.Net.Mail.AttachmentBase._part].SyntheticField[System.Net.Mime.MimePart._stream];ReturnValue;value;dfc-generated |
+| System.Net.Mail;AttachmentCollection;InsertItem;(System.Int32,System.Net.Mail.Attachment);Argument[1];Argument[this].SyntheticField[System.Collections.ObjectModel.Collection`1.items].Element;value;dfc-generated |
 | System.Net.Mail;AttachmentCollection;SetItem;(System.Int32,System.Net.Mail.Attachment);Argument[1];Argument[this];taint;df-generated |
-| System.Net.Mail;AttachmentCollection;SetItem;(System.Int32,System.Net.Mail.Attachment);Argument[this];Argument[1];taint;df-generated |
 | System.Net.Mail;LinkedResource;CreateLinkedResourceFromString;(System.String);Argument[0];ReturnValue;taint;df-generated |
 | System.Net.Mail;LinkedResource;CreateLinkedResourceFromString;(System.String,System.Net.Mime.ContentType);Argument[0];ReturnValue;taint;df-generated |
 | System.Net.Mail;LinkedResource;CreateLinkedResourceFromString;(System.String,System.Net.Mime.ContentType);Argument[1];ReturnValue;taint;df-generated |
 | System.Net.Mail;LinkedResource;CreateLinkedResourceFromString;(System.String,System.Text.Encoding,System.String);Argument[0];ReturnValue;taint;df-generated |
-| System.Net.Mail;LinkedResourceCollection;InsertItem;(System.Int32,System.Net.Mail.LinkedResource);Argument[1];Argument[this];taint;df-generated |
-| System.Net.Mail;LinkedResourceCollection;InsertItem;(System.Int32,System.Net.Mail.LinkedResource);Argument[this];Argument[1];taint;df-generated |
+| System.Net.Mail;LinkedResourceCollection;InsertItem;(System.Int32,System.Net.Mail.LinkedResource);Argument[1];Argument[this].SyntheticField[System.Collections.ObjectModel.Collection`1.items].Element;value;dfc-generated |
 | System.Net.Mail;LinkedResourceCollection;SetItem;(System.Int32,System.Net.Mail.LinkedResource);Argument[1];Argument[this];taint;df-generated |
-| System.Net.Mail;LinkedResourceCollection;SetItem;(System.Int32,System.Net.Mail.LinkedResource);Argument[this];Argument[1];taint;df-generated |
-| System.Net.Mail;MailAddress;MailAddress;(System.String,System.String,System.Text.Encoding);Argument[0];Argument[this];taint;df-generated |
-| System.Net.Mail;MailAddress;MailAddress;(System.String,System.String,System.Text.Encoding);Argument[1];Argument[this];taint;df-generated |
-| System.Net.Mail;MailAddress;MailAddress;(System.String,System.String,System.Text.Encoding);Argument[2];Argument[this];taint;df-generated |
+| System.Net.Mail;MailAddress;MailAddress;(System.String,System.String,System.Text.Encoding);Argument[0];Argument[this].SyntheticField[System.Net.Mail.MailAddress._displayName];taint;dfc-generated |
+| System.Net.Mail;MailAddress;MailAddress;(System.String,System.String,System.Text.Encoding);Argument[0];Argument[this].SyntheticField[System.Net.Mail.MailAddress._host];taint;dfc-generated |
+| System.Net.Mail;MailAddress;MailAddress;(System.String,System.String,System.Text.Encoding);Argument[0];Argument[this].SyntheticField[System.Net.Mail.MailAddress._userName];taint;dfc-generated |
+| System.Net.Mail;MailAddress;MailAddress;(System.String,System.String,System.Text.Encoding);Argument[1];Argument[this].SyntheticField[System.Net.Mail.MailAddress._displayName];value;dfc-generated |
 | System.Net.Mail;MailAddress;ToString;();Argument[this];ReturnValue;taint;df-generated |
-| System.Net.Mail;MailAddress;TryCreate;(System.String,System.Net.Mail.MailAddress);Argument[0];ReturnValue;taint;df-generated |
-| System.Net.Mail;MailAddress;TryCreate;(System.String,System.String,System.Net.Mail.MailAddress);Argument[0];ReturnValue;taint;df-generated |
-| System.Net.Mail;MailAddress;TryCreate;(System.String,System.String,System.Net.Mail.MailAddress);Argument[1];ReturnValue;taint;df-generated |
-| System.Net.Mail;MailAddress;TryCreate;(System.String,System.String,System.Text.Encoding,System.Net.Mail.MailAddress);Argument[0];ReturnValue;taint;df-generated |
-| System.Net.Mail;MailAddress;TryCreate;(System.String,System.String,System.Text.Encoding,System.Net.Mail.MailAddress);Argument[1];ReturnValue;taint;df-generated |
-| System.Net.Mail;MailAddress;TryCreate;(System.String,System.String,System.Text.Encoding,System.Net.Mail.MailAddress);Argument[2];ReturnValue;taint;df-generated |
-| System.Net.Mail;MailAddress;get_Address;();Argument[this];ReturnValue;taint;df-generated |
-| System.Net.Mail;MailAddress;get_DisplayName;();Argument[this];ReturnValue;taint;df-generated |
-| System.Net.Mail;MailAddress;get_Host;();Argument[this];ReturnValue;taint;df-generated |
-| System.Net.Mail;MailAddress;get_User;();Argument[this];ReturnValue;taint;df-generated |
+| System.Net.Mail;MailAddress;TryCreate;(System.String,System.Net.Mail.MailAddress);Argument[0];ReturnValue.SyntheticField[System.Net.Mail.MailAddress._displayName];taint;dfc-generated |
+| System.Net.Mail;MailAddress;TryCreate;(System.String,System.Net.Mail.MailAddress);Argument[0];ReturnValue.SyntheticField[System.Net.Mail.MailAddress._host];taint;dfc-generated |
+| System.Net.Mail;MailAddress;TryCreate;(System.String,System.Net.Mail.MailAddress);Argument[0];ReturnValue.SyntheticField[System.Net.Mail.MailAddress._userName];taint;dfc-generated |
+| System.Net.Mail;MailAddress;TryCreate;(System.String,System.String,System.Net.Mail.MailAddress);Argument[0];ReturnValue.SyntheticField[System.Net.Mail.MailAddress._displayName];taint;dfc-generated |
+| System.Net.Mail;MailAddress;TryCreate;(System.String,System.String,System.Net.Mail.MailAddress);Argument[0];ReturnValue.SyntheticField[System.Net.Mail.MailAddress._host];taint;dfc-generated |
+| System.Net.Mail;MailAddress;TryCreate;(System.String,System.String,System.Net.Mail.MailAddress);Argument[0];ReturnValue.SyntheticField[System.Net.Mail.MailAddress._userName];taint;dfc-generated |
+| System.Net.Mail;MailAddress;TryCreate;(System.String,System.String,System.Net.Mail.MailAddress);Argument[1];ReturnValue.SyntheticField[System.Net.Mail.MailAddress._displayName];value;dfc-generated |
+| System.Net.Mail;MailAddress;TryCreate;(System.String,System.String,System.Text.Encoding,System.Net.Mail.MailAddress);Argument[0];ReturnValue.SyntheticField[System.Net.Mail.MailAddress._displayName];taint;dfc-generated |
+| System.Net.Mail;MailAddress;TryCreate;(System.String,System.String,System.Text.Encoding,System.Net.Mail.MailAddress);Argument[0];ReturnValue.SyntheticField[System.Net.Mail.MailAddress._host];taint;dfc-generated |
+| System.Net.Mail;MailAddress;TryCreate;(System.String,System.String,System.Text.Encoding,System.Net.Mail.MailAddress);Argument[0];ReturnValue.SyntheticField[System.Net.Mail.MailAddress._userName];taint;dfc-generated |
+| System.Net.Mail;MailAddress;TryCreate;(System.String,System.String,System.Text.Encoding,System.Net.Mail.MailAddress);Argument[1];ReturnValue.SyntheticField[System.Net.Mail.MailAddress._displayName];value;dfc-generated |
+| System.Net.Mail;MailAddress;get_Address;();Argument[this].SyntheticField[System.Net.Mail.MailAddress._host];ReturnValue;taint;dfc-generated |
+| System.Net.Mail;MailAddress;get_Address;();Argument[this].SyntheticField[System.Net.Mail.MailAddress._userName];ReturnValue;taint;dfc-generated |
+| System.Net.Mail;MailAddress;get_DisplayName;();Argument[this].SyntheticField[System.Net.Mail.MailAddress._displayName];ReturnValue;value;dfc-generated |
+| System.Net.Mail;MailAddress;get_Host;();Argument[this].SyntheticField[System.Net.Mail.MailAddress._host];ReturnValue;value;dfc-generated |
+| System.Net.Mail;MailAddress;get_User;();Argument[this].SyntheticField[System.Net.Mail.MailAddress._userName];ReturnValue;value;dfc-generated |
 | System.Net.Mail;MailAddressCollection;Add;(System.String);Argument[0];Argument[this].Element;value;manual |
-| System.Net.Mail;MailAddressCollection;InsertItem;(System.Int32,System.Net.Mail.MailAddress);Argument[1];Argument[this];taint;df-generated |
-| System.Net.Mail;MailAddressCollection;InsertItem;(System.Int32,System.Net.Mail.MailAddress);Argument[this];Argument[1];taint;df-generated |
+| System.Net.Mail;MailAddressCollection;InsertItem;(System.Int32,System.Net.Mail.MailAddress);Argument[1];Argument[this].SyntheticField[System.Collections.ObjectModel.Collection`1.items].Element;value;dfc-generated |
 | System.Net.Mail;MailAddressCollection;SetItem;(System.Int32,System.Net.Mail.MailAddress);Argument[1];Argument[this];taint;df-generated |
-| System.Net.Mail;MailAddressCollection;SetItem;(System.Int32,System.Net.Mail.MailAddress);Argument[this];Argument[1];taint;df-generated |
-| System.Net.Mail;MailAddressCollection;ToString;();Argument[this];ReturnValue;taint;df-generated |
+| System.Net.Mail;MailAddressCollection;ToString;();Argument[this].Element;ReturnValue;taint;dfc-generated |
 | System.Net.Mail;MailMessage;MailMessage;(System.Net.Mail.MailAddress,System.Net.Mail.MailAddress);Argument[0];Argument[this];taint;df-generated |
 | System.Net.Mail;MailMessage;MailMessage;(System.String,System.String,System.String,System.String);Argument[2];Argument[this];taint;df-generated |
 | System.Net.Mail;MailMessage;MailMessage;(System.String,System.String,System.String,System.String);Argument[3];Argument[this];taint;df-generated |
@@ -13176,10 +13695,8 @@ summary
 | System.Net.Mail;SmtpClient;SendAsync;(System.String,System.String,System.String,System.String,System.Object);Argument[3];Argument[this];taint;df-generated |
 | System.Net.Mail;SmtpClient;SendMailAsync;(System.Net.Mail.MailMessage);Argument[0];Argument[this];taint;df-generated |
 | System.Net.Mail;SmtpClient;SendMailAsync;(System.Net.Mail.MailMessage,System.Threading.CancellationToken);Argument[0];Argument[this];taint;df-generated |
-| System.Net.Mail;SmtpClient;SendMailAsync;(System.Net.Mail.MailMessage,System.Threading.CancellationToken);Argument[1];ReturnValue;taint;df-generated |
 | System.Net.Mail;SmtpClient;SendMailAsync;(System.String,System.String,System.String,System.String);Argument[3];Argument[this];taint;df-generated |
 | System.Net.Mail;SmtpClient;SendMailAsync;(System.String,System.String,System.String,System.String,System.Threading.CancellationToken);Argument[3];Argument[this];taint;df-generated |
-| System.Net.Mail;SmtpClient;SendMailAsync;(System.String,System.String,System.String,System.String,System.Threading.CancellationToken);Argument[4];ReturnValue;taint;df-generated |
 | System.Net.Mail;SmtpClient;SmtpClient;(System.String);Argument[0];Argument[this];taint;df-generated |
 | System.Net.Mail;SmtpClient;SmtpClient;(System.String,System.Int32);Argument[0];Argument[this];taint;df-generated |
 | System.Net.Mail;SmtpClient;add_SendCompleted;(System.Net.Mail.SendCompletedEventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
@@ -13187,22 +13704,19 @@ summary
 | System.Net.Mail;SmtpClient;remove_SendCompleted;(System.Net.Mail.SendCompletedEventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Net.Mail;SmtpException;GetObjectData;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);Argument[this];Argument[0];taint;df-generated |
 | System.Net.Mail;SmtpFailedRecipientException;GetObjectData;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);Argument[this];Argument[0];taint;df-generated |
-| System.Net.Mail;SmtpFailedRecipientException;SmtpFailedRecipientException;(System.Net.Mail.SmtpStatusCode,System.String);Argument[1];Argument[this];taint;df-generated |
-| System.Net.Mail;SmtpFailedRecipientException;SmtpFailedRecipientException;(System.Net.Mail.SmtpStatusCode,System.String,System.String);Argument[1];Argument[this];taint;df-generated |
-| System.Net.Mail;SmtpFailedRecipientException;SmtpFailedRecipientException;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);Argument[0];Argument[this];taint;df-generated |
-| System.Net.Mail;SmtpFailedRecipientException;SmtpFailedRecipientException;(System.String,System.String,System.Exception);Argument[1];Argument[this];taint;df-generated |
-| System.Net.Mail;SmtpFailedRecipientException;get_FailedRecipient;();Argument[this];ReturnValue;taint;df-generated |
+| System.Net.Mail;SmtpFailedRecipientException;SmtpFailedRecipientException;(System.Net.Mail.SmtpStatusCode,System.String);Argument[1];Argument[this].SyntheticField[System.Net.Mail.SmtpFailedRecipientException._failedRecipient];value;dfc-generated |
+| System.Net.Mail;SmtpFailedRecipientException;SmtpFailedRecipientException;(System.Net.Mail.SmtpStatusCode,System.String,System.String);Argument[1];Argument[this].SyntheticField[System.Net.Mail.SmtpFailedRecipientException._failedRecipient];value;dfc-generated |
+| System.Net.Mail;SmtpFailedRecipientException;SmtpFailedRecipientException;(System.String,System.String,System.Exception);Argument[1];Argument[this].SyntheticField[System.Net.Mail.SmtpFailedRecipientException._failedRecipient];value;dfc-generated |
+| System.Net.Mail;SmtpFailedRecipientException;get_FailedRecipient;();Argument[this].SyntheticField[System.Net.Mail.SmtpFailedRecipientException._failedRecipient];ReturnValue;value;dfc-generated |
 | System.Net.Mail;SmtpFailedRecipientsException;GetObjectData;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);Argument[this];Argument[0];taint;df-generated |
-| System.Net.Mail;SmtpFailedRecipientsException;SmtpFailedRecipientsException;(System.String,System.Exception);Argument[1];Argument[this];taint;df-generated |
-| System.Net.Mail;SmtpFailedRecipientsException;SmtpFailedRecipientsException;(System.String,System.Net.Mail.SmtpFailedRecipientException[]);Argument[1].Element;Argument[this];taint;df-generated |
-| System.Net.Mail;SmtpFailedRecipientsException;get_InnerExceptions;();Argument[this];ReturnValue;taint;df-generated |
-| System.Net.Mail;SmtpPermission;Copy;();Argument[this];ReturnValue;taint;df-generated |
-| System.Net.Mail;SmtpPermission;Copy;();Argument[this];ReturnValue;value;df-generated |
-| System.Net.Mail;SmtpPermission;Intersect;(System.Security.IPermission);Argument[0];ReturnValue;taint;df-generated |
-| System.Net.Mail;SmtpPermission;Intersect;(System.Security.IPermission);Argument[this];ReturnValue;taint;df-generated |
+| System.Net.Mail;SmtpFailedRecipientsException;SmtpFailedRecipientsException;(System.String,System.Exception);Argument[1];Argument[this].SyntheticField[System.Net.Mail.SmtpFailedRecipientsException._innerExceptions].Element;value;dfc-generated |
+| System.Net.Mail;SmtpFailedRecipientsException;SmtpFailedRecipientsException;(System.String,System.Net.Mail.SmtpFailedRecipientException[]);Argument[1];Argument[this].SyntheticField[System.Net.Mail.SmtpFailedRecipientsException._innerExceptions];value;dfc-generated |
+| System.Net.Mail;SmtpFailedRecipientsException;get_InnerExceptions;();Argument[this].SyntheticField[System.Net.Mail.SmtpFailedRecipientsException._innerExceptions];ReturnValue;value;dfc-generated |
+| System.Net.Mail;SmtpPermission;Copy;();Argument[this];ReturnValue;value;dfc-generated |
+| System.Net.Mail;SmtpPermission;Intersect;(System.Security.IPermission);Argument[0];ReturnValue;value;dfc-generated |
 | System.Net.Mail;SmtpPermission;Union;(System.Security.IPermission);Argument[this];ReturnValue;taint;df-generated |
-| System.Net.Mime;ContentDisposition;ContentDisposition;(System.String);Argument[0];Argument[this];taint;df-generated |
-| System.Net.Mime;ContentDisposition;ToString;();Argument[this];ReturnValue;taint;df-generated |
+| System.Net.Mime;ContentDisposition;ContentDisposition;(System.String);Argument[0];Argument[this].SyntheticField[System.Net.Mime.ContentDisposition._disposition];value;dfc-generated |
+| System.Net.Mime;ContentDisposition;ToString;();Argument[this].SyntheticField[System.Net.Mime.ContentDisposition._disposition];ReturnValue;value;dfc-generated |
 | System.Net.Mime;ContentType;ContentType;(System.String);Argument[0];Argument[this];taint;df-generated |
 | System.Net.Mime;ContentType;ToString;();Argument[this];ReturnValue;taint;df-generated |
 | System.Net.Mime;ContentType;get_Parameters;();Argument[this];ReturnValue;taint;df-generated |
@@ -13246,18 +13760,16 @@ summary
 | System.Net.NetworkInformation;NetworkChange;add_NetworkAvailabilityChanged;(System.Net.NetworkInformation.NetworkAvailabilityChangedEventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Net.NetworkInformation;NetworkChange;remove_NetworkAddressChanged;(System.Net.NetworkInformation.NetworkAddressChangedEventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Net.NetworkInformation;NetworkChange;remove_NetworkAvailabilityChanged;(System.Net.NetworkInformation.NetworkAvailabilityChangedEventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
-| System.Net.NetworkInformation;NetworkInformationPermission;Copy;();Argument[this];ReturnValue;taint;df-generated |
-| System.Net.NetworkInformation;NetworkInformationPermission;Copy;();Argument[this];ReturnValue;value;df-generated |
-| System.Net.NetworkInformation;NetworkInformationPermission;Intersect;(System.Security.IPermission);Argument[0];ReturnValue;taint;df-generated |
-| System.Net.NetworkInformation;NetworkInformationPermission;Intersect;(System.Security.IPermission);Argument[this];ReturnValue;taint;df-generated |
+| System.Net.NetworkInformation;NetworkInformationPermission;Copy;();Argument[this];ReturnValue;value;dfc-generated |
+| System.Net.NetworkInformation;NetworkInformationPermission;Intersect;(System.Security.IPermission);Argument[0];ReturnValue;value;dfc-generated |
 | System.Net.NetworkInformation;NetworkInformationPermission;Union;(System.Security.IPermission);Argument[this];ReturnValue;taint;df-generated |
 | System.Net.NetworkInformation;NetworkInterface;GetIPProperties;();Argument[this];ReturnValue;taint;df-generated |
 | System.Net.NetworkInformation;NetworkInterface;GetPhysicalAddress;();Argument[this];ReturnValue;taint;df-generated |
 | System.Net.NetworkInformation;NetworkInterface;get_Description;();Argument[this];ReturnValue;taint;df-generated |
 | System.Net.NetworkInformation;NetworkInterface;get_Id;();Argument[this];ReturnValue;taint;df-generated |
 | System.Net.NetworkInformation;NetworkInterface;get_Name;();Argument[this];ReturnValue;taint;df-generated |
-| System.Net.NetworkInformation;PhysicalAddress;GetAddressBytes;();Argument[this];ReturnValue;taint;df-generated |
-| System.Net.NetworkInformation;PhysicalAddress;PhysicalAddress;(System.Byte[]);Argument[0].Element;Argument[this];taint;df-generated |
+| System.Net.NetworkInformation;PhysicalAddress;GetAddressBytes;();Argument[this].SyntheticField[System.Net.NetworkInformation.PhysicalAddress._address].Element;ReturnValue.Element;value;dfc-generated |
+| System.Net.NetworkInformation;PhysicalAddress;PhysicalAddress;(System.Byte[]);Argument[0];Argument[this].SyntheticField[System.Net.NetworkInformation.PhysicalAddress._address];value;dfc-generated |
 | System.Net.NetworkInformation;Ping;add_PingCompleted;(System.Net.NetworkInformation.PingCompletedEventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Net.NetworkInformation;Ping;remove_PingCompleted;(System.Net.NetworkInformation.PingCompletedEventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Net.NetworkInformation;PingCompletedEventHandler;BeginInvoke;(System.Object,System.Net.NetworkInformation.PingCompletedEventArgs,System.AsyncCallback,System.Object);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
@@ -13267,17 +13779,12 @@ summary
 | System.Net.NetworkInformation;UnicastIPAddressInformationCollection;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.Generic.IEnumerator`1.Current];value;manual |
 | System.Net.NetworkInformation;UnicastIPAddressInformationCollection;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.IEnumerator.Current];value;manual |
 | System.Net.NetworkInformation;UnicastIPAddressInformationCollection;get_Item;(System.Int32);Argument[this];ReturnValue;taint;df-generated |
-| System.Net.PeerToPeer.Collaboration;PeerCollaborationPermission;Copy;();Argument[this];ReturnValue;taint;df-generated |
-| System.Net.PeerToPeer.Collaboration;PeerCollaborationPermission;Copy;();Argument[this];ReturnValue;value;df-generated |
-| System.Net.PeerToPeer.Collaboration;PeerCollaborationPermission;Intersect;(System.Security.IPermission);Argument[0];ReturnValue;taint;df-generated |
-| System.Net.PeerToPeer.Collaboration;PeerCollaborationPermission;Intersect;(System.Security.IPermission);Argument[this];ReturnValue;taint;df-generated |
+| System.Net.PeerToPeer.Collaboration;PeerCollaborationPermission;Copy;();Argument[this];ReturnValue;value;dfc-generated |
+| System.Net.PeerToPeer.Collaboration;PeerCollaborationPermission;Intersect;(System.Security.IPermission);Argument[0];ReturnValue;value;dfc-generated |
 | System.Net.PeerToPeer.Collaboration;PeerCollaborationPermission;Union;(System.Security.IPermission);Argument[this];ReturnValue;taint;df-generated |
-| System.Net.PeerToPeer;PnrpPermission;Copy;();Argument[this];ReturnValue;taint;df-generated |
-| System.Net.PeerToPeer;PnrpPermission;Copy;();Argument[this];ReturnValue;value;df-generated |
-| System.Net.PeerToPeer;PnrpPermission;Intersect;(System.Security.IPermission);Argument[0];ReturnValue;taint;df-generated |
-| System.Net.PeerToPeer;PnrpPermission;Intersect;(System.Security.IPermission);Argument[this];ReturnValue;taint;df-generated |
+| System.Net.PeerToPeer;PnrpPermission;Copy;();Argument[this];ReturnValue;value;dfc-generated |
+| System.Net.PeerToPeer;PnrpPermission;Intersect;(System.Security.IPermission);Argument[0];ReturnValue;value;dfc-generated |
 | System.Net.PeerToPeer;PnrpPermission;Union;(System.Security.IPermission);Argument[this];ReturnValue;taint;df-generated |
-| System.Net.Quic;QuicConnection;CloseAsync;(System.Int64,System.Threading.CancellationToken);Argument[this];ReturnValue;taint;df-generated |
 | System.Net.Quic;QuicConnection;DisposeAsync;();Argument[this];ReturnValue;taint;df-generated |
 | System.Net.Quic;QuicConnection;get_LocalEndPoint;();Argument[this];ReturnValue;taint;df-generated |
 | System.Net.Quic;QuicConnection;get_NegotiatedApplicationProtocol;();Argument[this];ReturnValue;taint;df-generated |
@@ -13285,15 +13792,13 @@ summary
 | System.Net.Quic;QuicConnection;get_RemoteEndPoint;();Argument[this];ReturnValue;taint;df-generated |
 | System.Net.Quic;QuicConnection;get_TargetHostName;();Argument[this];ReturnValue;taint;df-generated |
 | System.Net.Quic;QuicListener;DisposeAsync;();Argument[this];ReturnValue;taint;df-generated |
-| System.Net.Quic;QuicListener;ListenAsync;(System.Net.Quic.QuicListenerOptions,System.Threading.CancellationToken);Argument[0];ReturnValue;taint;df-generated |
 | System.Net.Quic;QuicListenerOptions;set_ConnectionOptionsCallback;(System.Func<System.Net.Quic.QuicConnection,System.Net.Security.SslClientHelloInfo,System.Threading.CancellationToken,System.Threading.Tasks.ValueTask<System.Net.Quic.QuicServerConnectionOptions>>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Net.Quic;QuicStream;BeginRead;(System.Byte[],System.Int32,System.Int32,System.AsyncCallback,System.Object);Argument[3];Argument[3].Parameter[delegate-self];value;manual |
 | System.Net.Quic;QuicStream;BeginRead;(System.Byte[],System.Int32,System.Int32,System.AsyncCallback,System.Object);Argument[this];Argument[0].Element;taint;manual |
 | System.Net.Quic;QuicStream;BeginWrite;(System.Byte[],System.Int32,System.Int32,System.AsyncCallback,System.Object);Argument[0].Element;Argument[this];taint;manual |
 | System.Net.Quic;QuicStream;BeginWrite;(System.Byte[],System.Int32,System.Int32,System.AsyncCallback,System.Object);Argument[3];Argument[3].Parameter[delegate-self];value;manual |
 | System.Net.Quic;QuicStream;DisposeAsync;();Argument[this];ReturnValue;taint;df-generated |
-| System.Net.Quic;QuicStream;FlushAsync;(System.Threading.CancellationToken);Argument[0];ReturnValue;taint;df-generated |
-| System.Net.Quic;QuicStream;FlushAsync;(System.Threading.CancellationToken);Argument[this];ReturnValue;taint;df-generated |
+| System.Net.Quic;QuicStream;FlushAsync;(System.Threading.CancellationToken);Argument[this];ReturnValue.SyntheticField[System.Threading.Tasks.Task.m_stateObject];value;dfc-generated |
 | System.Net.Quic;QuicStream;Read;(System.Byte[],System.Int32,System.Int32);Argument[this];Argument[0].Element;taint;manual |
 | System.Net.Quic;QuicStream;Read;(System.Span<System.Byte>);Argument[this];Argument[0].Element;taint;manual |
 | System.Net.Quic;QuicStream;ReadAsync;(System.Byte[],System.Int32,System.Int32,System.Threading.CancellationToken);Argument[this];Argument[0].Element;taint;manual |
@@ -13303,9 +13808,9 @@ summary
 | System.Net.Quic;QuicStream;WriteAsync;(System.ReadOnlyMemory<System.Byte>,System.Threading.CancellationToken);Argument[0];ReturnValue;taint;df-generated |
 | System.Net.Quic;QuicStream;WriteAsync;(System.ReadOnlyMemory<System.Byte>,System.Threading.CancellationToken);Argument[1];ReturnValue;taint;df-generated |
 | System.Net.Quic;QuicStream;WriteAsync;(System.ReadOnlyMemory<System.Byte>,System.Threading.CancellationToken);Argument[this];ReturnValue;taint;df-generated |
-| System.Net.Security;AuthenticatedStream;AuthenticatedStream;(System.IO.Stream,System.Boolean);Argument[0];Argument[this];taint;df-generated |
+| System.Net.Security;AuthenticatedStream;AuthenticatedStream;(System.IO.Stream,System.Boolean);Argument[0];Argument[this].SyntheticField[System.Net.Security.AuthenticatedStream._innerStream];value;dfc-generated |
 | System.Net.Security;AuthenticatedStream;DisposeAsync;();Argument[this];ReturnValue;taint;df-generated |
-| System.Net.Security;AuthenticatedStream;get_InnerStream;();Argument[this];ReturnValue;taint;df-generated |
+| System.Net.Security;AuthenticatedStream;get_InnerStream;();Argument[this].SyntheticField[System.Net.Security.AuthenticatedStream._innerStream];ReturnValue;value;dfc-generated |
 | System.Net.Security;LocalCertificateSelectionCallback;BeginInvoke;(System.Object,System.String,System.Security.Cryptography.X509Certificates.X509CertificateCollection,System.Security.Cryptography.X509Certificates.X509Certificate,System.String[],System.AsyncCallback,System.Object);Argument[5];Argument[5].Parameter[delegate-self];value;hq-generated |
 | System.Net.Security;NegotiateAuthentication;GetOutgoingBlob;(System.ReadOnlySpan<System.Byte>,System.Net.Security.NegotiateAuthenticationStatusCode);Argument[this];ReturnValue;taint;df-generated |
 | System.Net.Security;NegotiateAuthentication;GetOutgoingBlob;(System.String,System.Net.Security.NegotiateAuthenticationStatusCode);Argument[this];ReturnValue;taint;df-generated |
@@ -13332,8 +13837,7 @@ summary
 | System.Net.Security;NegotiateStream;BeginWrite;(System.Byte[],System.Int32,System.Int32,System.AsyncCallback,System.Object);Argument[0].Element;Argument[this];taint;manual |
 | System.Net.Security;NegotiateStream;BeginWrite;(System.Byte[],System.Int32,System.Int32,System.AsyncCallback,System.Object);Argument[3];Argument[3].Parameter[delegate-self];value;manual |
 | System.Net.Security;NegotiateStream;DisposeAsync;();Argument[this];ReturnValue;taint;df-generated |
-| System.Net.Security;NegotiateStream;FlushAsync;(System.Threading.CancellationToken);Argument[0];ReturnValue;taint;df-generated |
-| System.Net.Security;NegotiateStream;FlushAsync;(System.Threading.CancellationToken);Argument[this];ReturnValue;taint;df-generated |
+| System.Net.Security;NegotiateStream;FlushAsync;(System.Threading.CancellationToken);Argument[this];ReturnValue.SyntheticField[System.Threading.Tasks.Task.m_stateObject];value;dfc-generated |
 | System.Net.Security;NegotiateStream;Read;(System.Byte[],System.Int32,System.Int32);Argument[this];Argument[0].Element;taint;manual |
 | System.Net.Security;NegotiateStream;ReadAsync;(System.Byte[],System.Int32,System.Int32,System.Threading.CancellationToken);Argument[this];Argument[0].Element;taint;manual |
 | System.Net.Security;NegotiateStream;ReadAsync;(System.Memory<System.Byte>,System.Threading.CancellationToken);Argument[this];Argument[0].Element;taint;manual |
@@ -13347,7 +13851,6 @@ summary
 | System.Net.Security;ServerCertificateSelectionCallback;BeginInvoke;(System.Object,System.String,System.AsyncCallback,System.Object);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
 | System.Net.Security;ServerOptionsSelectionCallback;BeginInvoke;(System.Net.Security.SslStream,System.Net.Security.SslClientHelloInfo,System.Object,System.Threading.CancellationToken,System.AsyncCallback,System.Object);Argument[4];Argument[4].Parameter[delegate-self];value;hq-generated |
 | System.Net.Security;SslApplicationProtocol;ToString;();Argument[this];ReturnValue;taint;df-generated |
-| System.Net.Security;SslApplicationProtocol;get_Protocol;();Argument[this];ReturnValue;taint;df-generated |
 | System.Net.Security;SslCertificateTrust;CreateForX509Collection;(System.Security.Cryptography.X509Certificates.X509Certificate2Collection,System.Boolean);Argument[0].Element;ReturnValue;taint;df-generated |
 | System.Net.Security;SslCertificateTrust;CreateForX509Store;(System.Security.Cryptography.X509Certificates.X509Store,System.Boolean);Argument[0];ReturnValue;taint;df-generated |
 | System.Net.Security;SslClientAuthenticationOptions;set_LocalCertificateSelectionCallback;(System.Net.Security.LocalCertificateSelectionCallback);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
@@ -13356,9 +13859,11 @@ summary
 | System.Net.Security;SslServerAuthenticationOptions;set_ServerCertificateSelectionCallback;(System.Net.Security.ServerCertificateSelectionCallback);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Net.Security;SslStream;AuthenticateAsClient;(System.Net.Security.SslClientAuthenticationOptions);Argument[0];Argument[this];taint;df-generated |
 | System.Net.Security;SslStream;AuthenticateAsClientAsync;(System.Net.Security.SslClientAuthenticationOptions,System.Threading.CancellationToken);Argument[0];Argument[this];taint;df-generated |
+| System.Net.Security;SslStream;AuthenticateAsClientAsync;(System.Net.Security.SslClientAuthenticationOptions,System.Threading.CancellationToken);Argument[1];Argument[this];taint;df-generated |
 | System.Net.Security;SslStream;AuthenticateAsServer;(System.Net.Security.SslServerAuthenticationOptions);Argument[0];Argument[this];taint;df-generated |
 | System.Net.Security;SslStream;AuthenticateAsServerAsync;(System.Net.Security.ServerOptionsSelectionCallback,System.Object,System.Threading.CancellationToken);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Net.Security;SslStream;AuthenticateAsServerAsync;(System.Net.Security.SslServerAuthenticationOptions,System.Threading.CancellationToken);Argument[0];Argument[this];taint;df-generated |
+| System.Net.Security;SslStream;AuthenticateAsServerAsync;(System.Net.Security.SslServerAuthenticationOptions,System.Threading.CancellationToken);Argument[1];Argument[this];taint;df-generated |
 | System.Net.Security;SslStream;BeginAuthenticateAsClient;(System.String,System.AsyncCallback,System.Object);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
 | System.Net.Security;SslStream;BeginAuthenticateAsClient;(System.String,System.Security.Cryptography.X509Certificates.X509CertificateCollection,System.Boolean,System.AsyncCallback,System.Object);Argument[3];Argument[3].Parameter[delegate-self];value;hq-generated |
 | System.Net.Security;SslStream;BeginAuthenticateAsClient;(System.String,System.Security.Cryptography.X509Certificates.X509CertificateCollection,System.Security.Authentication.SslProtocols,System.Boolean,System.AsyncCallback,System.Object);Argument[4];Argument[4].Parameter[delegate-self];value;hq-generated |
@@ -13370,8 +13875,8 @@ summary
 | System.Net.Security;SslStream;BeginWrite;(System.Byte[],System.Int32,System.Int32,System.AsyncCallback,System.Object);Argument[0].Element;Argument[this];taint;manual |
 | System.Net.Security;SslStream;BeginWrite;(System.Byte[],System.Int32,System.Int32,System.AsyncCallback,System.Object);Argument[3];Argument[3].Parameter[delegate-self];value;manual |
 | System.Net.Security;SslStream;DisposeAsync;();Argument[this];ReturnValue;taint;df-generated |
-| System.Net.Security;SslStream;FlushAsync;(System.Threading.CancellationToken);Argument[0];ReturnValue;taint;df-generated |
-| System.Net.Security;SslStream;FlushAsync;(System.Threading.CancellationToken);Argument[this];ReturnValue;taint;df-generated |
+| System.Net.Security;SslStream;FlushAsync;(System.Threading.CancellationToken);Argument[this];ReturnValue.SyntheticField[System.Threading.Tasks.Task.m_stateObject];value;dfc-generated |
+| System.Net.Security;SslStream;NegotiateClientCertificateAsync;(System.Threading.CancellationToken);Argument[0];Argument[this];taint;df-generated |
 | System.Net.Security;SslStream;Read;(System.Byte[],System.Int32,System.Int32);Argument[this];Argument[0].Element;taint;manual |
 | System.Net.Security;SslStream;ReadAsync;(System.Byte[],System.Int32,System.Int32,System.Threading.CancellationToken);Argument[this];Argument[0].Element;taint;manual |
 | System.Net.Security;SslStream;ReadAsync;(System.Memory<System.Byte>,System.Threading.CancellationToken);Argument[this];Argument[0].Element;taint;manual |
@@ -13380,7 +13885,7 @@ summary
 | System.Net.Security;SslStream;SslStream;(System.IO.Stream,System.Boolean,System.Net.Security.RemoteCertificateValidationCallback,System.Net.Security.LocalCertificateSelectionCallback);Argument[3];Argument[3].Parameter[delegate-self];value;hq-generated |
 | System.Net.Security;SslStream;SslStream;(System.IO.Stream,System.Boolean,System.Net.Security.RemoteCertificateValidationCallback,System.Net.Security.LocalCertificateSelectionCallback,System.Net.Security.EncryptionPolicy);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
 | System.Net.Security;SslStream;SslStream;(System.IO.Stream,System.Boolean,System.Net.Security.RemoteCertificateValidationCallback,System.Net.Security.LocalCertificateSelectionCallback,System.Net.Security.EncryptionPolicy);Argument[3];Argument[3].Parameter[delegate-self];value;hq-generated |
-| System.Net.Security;SslStream;Write;(System.Byte[]);Argument[0].Element;Argument[this];taint;df-generated |
+| System.Net.Security;SslStream;Write;(System.Byte[]);Argument[0].Element;Argument[this];taint;dfc-generated |
 | System.Net.Security;SslStream;Write;(System.Byte[],System.Int32,System.Int32);Argument[0].Element;Argument[this];taint;manual |
 | System.Net.Security;SslStream;WriteAsync;(System.Byte[],System.Int32,System.Int32,System.Threading.CancellationToken);Argument[0].Element;Argument[this];taint;manual |
 | System.Net.Security;SslStream;WriteAsync;(System.ReadOnlyMemory<System.Byte>,System.Threading.CancellationToken);Argument[0];ReturnValue;taint;df-generated |
@@ -13403,9 +13908,8 @@ summary
 | System.Net.Sockets;NetworkStream;BeginRead;(System.Byte[],System.Int32,System.Int32,System.AsyncCallback,System.Object);Argument[this];Argument[0].Element;taint;manual |
 | System.Net.Sockets;NetworkStream;BeginWrite;(System.Byte[],System.Int32,System.Int32,System.AsyncCallback,System.Object);Argument[0].Element;Argument[this];taint;manual |
 | System.Net.Sockets;NetworkStream;BeginWrite;(System.Byte[],System.Int32,System.Int32,System.AsyncCallback,System.Object);Argument[3];Argument[3].Parameter[delegate-self];value;manual |
-| System.Net.Sockets;NetworkStream;FlushAsync;(System.Threading.CancellationToken);Argument[0];ReturnValue;taint;df-generated |
-| System.Net.Sockets;NetworkStream;FlushAsync;(System.Threading.CancellationToken);Argument[this];ReturnValue;taint;df-generated |
-| System.Net.Sockets;NetworkStream;NetworkStream;(System.Net.Sockets.Socket,System.IO.FileAccess,System.Boolean);Argument[0];Argument[this];taint;df-generated |
+| System.Net.Sockets;NetworkStream;FlushAsync;(System.Threading.CancellationToken);Argument[this];ReturnValue.SyntheticField[System.Threading.Tasks.Task.m_stateObject];value;dfc-generated |
+| System.Net.Sockets;NetworkStream;NetworkStream;(System.Net.Sockets.Socket,System.IO.FileAccess,System.Boolean);Argument[0];Argument[this].SyntheticField[System.Net.Sockets.NetworkStream._streamSocket];value;dfc-generated |
 | System.Net.Sockets;NetworkStream;Read;(System.Byte[],System.Int32,System.Int32);Argument[this];Argument[0].Element;taint;manual |
 | System.Net.Sockets;NetworkStream;Read;(System.Span<System.Byte>);Argument[this];Argument[0].Element;taint;manual |
 | System.Net.Sockets;NetworkStream;ReadAsync;(System.Byte[],System.Int32,System.Int32,System.Threading.CancellationToken);Argument[this];Argument[0].Element;taint;manual |
@@ -13415,16 +13919,9 @@ summary
 | System.Net.Sockets;NetworkStream;WriteAsync;(System.ReadOnlyMemory<System.Byte>,System.Threading.CancellationToken);Argument[0];ReturnValue;taint;df-generated |
 | System.Net.Sockets;NetworkStream;WriteAsync;(System.ReadOnlyMemory<System.Byte>,System.Threading.CancellationToken);Argument[1];ReturnValue;taint;df-generated |
 | System.Net.Sockets;NetworkStream;WriteAsync;(System.ReadOnlyMemory<System.Byte>,System.Threading.CancellationToken);Argument[this];ReturnValue;taint;df-generated |
-| System.Net.Sockets;NetworkStream;get_Socket;();Argument[this];ReturnValue;taint;df-generated |
-| System.Net.Sockets;SafeSocketHandle;SafeSocketHandle;(System.IntPtr,System.Boolean);Argument[0];Argument[this];taint;df-generated |
+| System.Net.Sockets;NetworkStream;get_Socket;();Argument[this].SyntheticField[System.Net.Sockets.NetworkStream._streamSocket];ReturnValue;value;dfc-generated |
 | System.Net.Sockets;Socket;Accept;();Argument[this];ReturnValue;taint;df-generated |
-| System.Net.Sockets;Socket;AcceptAsync;(System.Net.Sockets.Socket);Argument[0];ReturnValue;taint;df-generated |
-| System.Net.Sockets;Socket;AcceptAsync;(System.Net.Sockets.Socket,System.Threading.CancellationToken);Argument[0];ReturnValue;taint;df-generated |
-| System.Net.Sockets;Socket;AcceptAsync;(System.Net.Sockets.Socket,System.Threading.CancellationToken);Argument[1];ReturnValue;taint;df-generated |
-| System.Net.Sockets;Socket;AcceptAsync;(System.Net.Sockets.Socket,System.Threading.CancellationToken);Argument[this];ReturnValue;taint;df-generated |
 | System.Net.Sockets;Socket;AcceptAsync;(System.Net.Sockets.SocketAsyncEventArgs);Argument[this];Argument[0];taint;df-generated |
-| System.Net.Sockets;Socket;AcceptAsync;(System.Threading.CancellationToken);Argument[0];ReturnValue;taint;df-generated |
-| System.Net.Sockets;Socket;AcceptAsync;(System.Threading.CancellationToken);Argument[this];ReturnValue;taint;df-generated |
 | System.Net.Sockets;Socket;BeginAccept;(System.AsyncCallback,System.Object);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Net.Sockets;Socket;BeginAccept;(System.Int32,System.AsyncCallback,System.Object);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
 | System.Net.Sockets;Socket;BeginAccept;(System.Net.Sockets.Socket,System.Int32,System.AsyncCallback,System.Object);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
@@ -13437,7 +13934,13 @@ summary
 | System.Net.Sockets;Socket;BeginReceive;(System.Byte[],System.Int32,System.Int32,System.Net.Sockets.SocketFlags,System.Net.Sockets.SocketError,System.AsyncCallback,System.Object);Argument[5];Argument[5].Parameter[delegate-self];value;hq-generated |
 | System.Net.Sockets;Socket;BeginReceive;(System.Collections.Generic.IList<System.ArraySegment<System.Byte>>,System.Net.Sockets.SocketFlags,System.AsyncCallback,System.Object);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
 | System.Net.Sockets;Socket;BeginReceive;(System.Collections.Generic.IList<System.ArraySegment<System.Byte>>,System.Net.Sockets.SocketFlags,System.Net.Sockets.SocketError,System.AsyncCallback,System.Object);Argument[3];Argument[3].Parameter[delegate-self];value;hq-generated |
+| System.Net.Sockets;Socket;BeginReceiveFrom;(System.Byte[],System.Int32,System.Int32,System.Net.Sockets.SocketFlags,System.Net.EndPoint,System.AsyncCallback,System.Object);Argument[4];ReturnValue;value;dfc-generated |
+| System.Net.Sockets;Socket;BeginReceiveFrom;(System.Byte[],System.Int32,System.Int32,System.Net.Sockets.SocketFlags,System.Net.EndPoint,System.AsyncCallback,System.Object);Argument[4];ReturnValue;value;hq-generated |
+| System.Net.Sockets;Socket;BeginReceiveFrom;(System.Byte[],System.Int32,System.Int32,System.Net.Sockets.SocketFlags,System.Net.EndPoint,System.AsyncCallback,System.Object);Argument[5];Argument[5].Parameter[delegate-self];value;dfc-generated |
 | System.Net.Sockets;Socket;BeginReceiveFrom;(System.Byte[],System.Int32,System.Int32,System.Net.Sockets.SocketFlags,System.Net.EndPoint,System.AsyncCallback,System.Object);Argument[5];Argument[5].Parameter[delegate-self];value;hq-generated |
+| System.Net.Sockets;Socket;BeginReceiveMessageFrom;(System.Byte[],System.Int32,System.Int32,System.Net.Sockets.SocketFlags,System.Net.EndPoint,System.AsyncCallback,System.Object);Argument[4];ReturnValue;value;dfc-generated |
+| System.Net.Sockets;Socket;BeginReceiveMessageFrom;(System.Byte[],System.Int32,System.Int32,System.Net.Sockets.SocketFlags,System.Net.EndPoint,System.AsyncCallback,System.Object);Argument[4];ReturnValue;value;hq-generated |
+| System.Net.Sockets;Socket;BeginReceiveMessageFrom;(System.Byte[],System.Int32,System.Int32,System.Net.Sockets.SocketFlags,System.Net.EndPoint,System.AsyncCallback,System.Object);Argument[5];Argument[5].Parameter[delegate-self];value;dfc-generated |
 | System.Net.Sockets;Socket;BeginReceiveMessageFrom;(System.Byte[],System.Int32,System.Int32,System.Net.Sockets.SocketFlags,System.Net.EndPoint,System.AsyncCallback,System.Object);Argument[5];Argument[5].Parameter[delegate-self];value;hq-generated |
 | System.Net.Sockets;Socket;BeginSend;(System.Byte[],System.Int32,System.Int32,System.Net.Sockets.SocketFlags,System.AsyncCallback,System.Object);Argument[4];Argument[4].Parameter[delegate-self];value;hq-generated |
 | System.Net.Sockets;Socket;BeginSend;(System.Byte[],System.Int32,System.Int32,System.Net.Sockets.SocketFlags,System.Net.Sockets.SocketError,System.AsyncCallback,System.Object);Argument[5];Argument[5].Parameter[delegate-self];value;hq-generated |
@@ -13448,75 +13951,25 @@ summary
 | System.Net.Sockets;Socket;BeginSendTo;(System.Byte[],System.Int32,System.Int32,System.Net.Sockets.SocketFlags,System.Net.EndPoint,System.AsyncCallback,System.Object);Argument[5];Argument[5].Parameter[delegate-self];value;hq-generated |
 | System.Net.Sockets;Socket;Bind;(System.Net.EndPoint);Argument[0];Argument[this];taint;df-generated |
 | System.Net.Sockets;Socket;Connect;(System.Net.EndPoint);Argument[0];Argument[this];taint;df-generated |
-| System.Net.Sockets;Socket;Connect;(System.Net.IPAddress,System.Int32);Argument[0];Argument[this];taint;df-generated |
-| System.Net.Sockets;Socket;Connect;(System.Net.IPAddress[],System.Int32);Argument[0].Element;Argument[this];taint;df-generated |
 | System.Net.Sockets;Socket;ConnectAsync;(System.Net.EndPoint);Argument[0];Argument[this];taint;df-generated |
 | System.Net.Sockets;Socket;ConnectAsync;(System.Net.EndPoint,System.Threading.CancellationToken);Argument[0];Argument[this];taint;df-generated |
-| System.Net.Sockets;Socket;ConnectAsync;(System.Net.EndPoint,System.Threading.CancellationToken);Argument[0];ReturnValue;taint;df-generated |
-| System.Net.Sockets;Socket;ConnectAsync;(System.Net.EndPoint,System.Threading.CancellationToken);Argument[this];ReturnValue;taint;df-generated |
-| System.Net.Sockets;Socket;ConnectAsync;(System.Net.IPAddress,System.Int32);Argument[0];Argument[this];taint;df-generated |
-| System.Net.Sockets;Socket;ConnectAsync;(System.Net.IPAddress,System.Int32,System.Threading.CancellationToken);Argument[0];Argument[this];taint;df-generated |
-| System.Net.Sockets;Socket;ConnectAsync;(System.Net.IPAddress,System.Int32,System.Threading.CancellationToken);Argument[this];ReturnValue;taint;df-generated |
 | System.Net.Sockets;Socket;ConnectAsync;(System.Net.Sockets.SocketAsyncEventArgs);Argument[0];Argument[this];taint;df-generated |
 | System.Net.Sockets;Socket;ConnectAsync;(System.Net.Sockets.SocketAsyncEventArgs);Argument[this];Argument[0];taint;df-generated |
-| System.Net.Sockets;Socket;ConnectAsync;(System.String,System.Int32,System.Threading.CancellationToken);Argument[this];ReturnValue;taint;df-generated |
-| System.Net.Sockets;Socket;DisconnectAsync;(System.Boolean,System.Threading.CancellationToken);Argument[1];ReturnValue;taint;df-generated |
-| System.Net.Sockets;Socket;DisconnectAsync;(System.Boolean,System.Threading.CancellationToken);Argument[this];ReturnValue;taint;df-generated |
 | System.Net.Sockets;Socket;DisconnectAsync;(System.Net.Sockets.SocketAsyncEventArgs);Argument[this];Argument[0];taint;df-generated |
-| System.Net.Sockets;Socket;ReceiveAsync;(System.Memory<System.Byte>,System.Net.Sockets.SocketFlags,System.Threading.CancellationToken);Argument[0];ReturnValue;taint;df-generated |
-| System.Net.Sockets;Socket;ReceiveAsync;(System.Memory<System.Byte>,System.Net.Sockets.SocketFlags,System.Threading.CancellationToken);Argument[2];ReturnValue;taint;df-generated |
-| System.Net.Sockets;Socket;ReceiveAsync;(System.Memory<System.Byte>,System.Net.Sockets.SocketFlags,System.Threading.CancellationToken);Argument[this];ReturnValue;taint;df-generated |
-| System.Net.Sockets;Socket;ReceiveAsync;(System.Memory<System.Byte>,System.Threading.CancellationToken);Argument[0];ReturnValue;taint;df-generated |
-| System.Net.Sockets;Socket;ReceiveAsync;(System.Memory<System.Byte>,System.Threading.CancellationToken);Argument[1];ReturnValue;taint;df-generated |
-| System.Net.Sockets;Socket;ReceiveAsync;(System.Memory<System.Byte>,System.Threading.CancellationToken);Argument[this];ReturnValue;taint;df-generated |
+| System.Net.Sockets;Socket;EndReceiveFrom;(System.IAsyncResult,System.Net.EndPoint);Argument[1];ReturnValue;value;dfc-generated |
+| System.Net.Sockets;Socket;EndReceiveMessageFrom;(System.IAsyncResult,System.Net.Sockets.SocketFlags,System.Net.EndPoint,System.Net.Sockets.IPPacketInformation);Argument[2];ReturnValue;value;dfc-generated |
 | System.Net.Sockets;Socket;ReceiveAsync;(System.Net.Sockets.SocketAsyncEventArgs);Argument[this];Argument[0];taint;df-generated |
-| System.Net.Sockets;Socket;ReceiveFrom;(System.Byte[],System.Int32,System.Int32,System.Net.Sockets.SocketFlags,System.Net.EndPoint);Argument[4];Argument[this];taint;df-generated |
-| System.Net.Sockets;Socket;ReceiveFrom;(System.Byte[],System.Int32,System.Net.Sockets.SocketFlags,System.Net.EndPoint);Argument[3];Argument[this];taint;df-generated |
-| System.Net.Sockets;Socket;ReceiveFrom;(System.Byte[],System.Int32,System.Net.Sockets.SocketFlags,System.Net.EndPoint);Argument[3];ReturnValue;taint;df-generated |
-| System.Net.Sockets;Socket;ReceiveFrom;(System.Byte[],System.Net.EndPoint);Argument[1];Argument[this];taint;df-generated |
-| System.Net.Sockets;Socket;ReceiveFrom;(System.Byte[],System.Net.EndPoint);Argument[1];ReturnValue;taint;df-generated |
-| System.Net.Sockets;Socket;ReceiveFrom;(System.Byte[],System.Net.Sockets.SocketFlags,System.Net.EndPoint);Argument[2];Argument[this];taint;df-generated |
-| System.Net.Sockets;Socket;ReceiveFrom;(System.Byte[],System.Net.Sockets.SocketFlags,System.Net.EndPoint);Argument[2];ReturnValue;taint;df-generated |
-| System.Net.Sockets;Socket;ReceiveFrom;(System.Span<System.Byte>,System.Net.EndPoint);Argument[1];Argument[this];taint;df-generated |
-| System.Net.Sockets;Socket;ReceiveFrom;(System.Span<System.Byte>,System.Net.EndPoint);Argument[1];ReturnValue;taint;df-generated |
-| System.Net.Sockets;Socket;ReceiveFrom;(System.Span<System.Byte>,System.Net.Sockets.SocketFlags,System.Net.EndPoint);Argument[2];Argument[this];taint;df-generated |
-| System.Net.Sockets;Socket;ReceiveFromAsync;(System.ArraySegment<System.Byte>,System.Net.EndPoint);Argument[1];ReturnValue;taint;df-generated |
-| System.Net.Sockets;Socket;ReceiveFromAsync;(System.ArraySegment<System.Byte>,System.Net.Sockets.SocketFlags,System.Net.EndPoint);Argument[2];ReturnValue;taint;df-generated |
-| System.Net.Sockets;Socket;ReceiveFromAsync;(System.Memory<System.Byte>,System.Net.EndPoint,System.Threading.CancellationToken);Argument[0];ReturnValue;taint;df-generated |
-| System.Net.Sockets;Socket;ReceiveFromAsync;(System.Memory<System.Byte>,System.Net.EndPoint,System.Threading.CancellationToken);Argument[1];ReturnValue;taint;df-generated |
-| System.Net.Sockets;Socket;ReceiveFromAsync;(System.Memory<System.Byte>,System.Net.EndPoint,System.Threading.CancellationToken);Argument[2];ReturnValue;taint;df-generated |
-| System.Net.Sockets;Socket;ReceiveFromAsync;(System.Memory<System.Byte>,System.Net.EndPoint,System.Threading.CancellationToken);Argument[this];ReturnValue;taint;df-generated |
-| System.Net.Sockets;Socket;ReceiveFromAsync;(System.Memory<System.Byte>,System.Net.Sockets.SocketFlags,System.Net.EndPoint,System.Threading.CancellationToken);Argument[0];ReturnValue;taint;df-generated |
-| System.Net.Sockets;Socket;ReceiveFromAsync;(System.Memory<System.Byte>,System.Net.Sockets.SocketFlags,System.Net.EndPoint,System.Threading.CancellationToken);Argument[2];ReturnValue;taint;df-generated |
-| System.Net.Sockets;Socket;ReceiveFromAsync;(System.Memory<System.Byte>,System.Net.Sockets.SocketFlags,System.Net.EndPoint,System.Threading.CancellationToken);Argument[3];ReturnValue;taint;df-generated |
-| System.Net.Sockets;Socket;ReceiveFromAsync;(System.Memory<System.Byte>,System.Net.Sockets.SocketFlags,System.Net.EndPoint,System.Threading.CancellationToken);Argument[this];ReturnValue;taint;df-generated |
-| System.Net.Sockets;Socket;ReceiveFromAsync;(System.Memory<System.Byte>,System.Net.Sockets.SocketFlags,System.Net.SocketAddress,System.Threading.CancellationToken);Argument[0];ReturnValue;taint;df-generated |
-| System.Net.Sockets;Socket;ReceiveFromAsync;(System.Memory<System.Byte>,System.Net.Sockets.SocketFlags,System.Net.SocketAddress,System.Threading.CancellationToken);Argument[2];ReturnValue;taint;df-generated |
-| System.Net.Sockets;Socket;ReceiveFromAsync;(System.Memory<System.Byte>,System.Net.Sockets.SocketFlags,System.Net.SocketAddress,System.Threading.CancellationToken);Argument[3];ReturnValue;taint;df-generated |
-| System.Net.Sockets;Socket;ReceiveFromAsync;(System.Memory<System.Byte>,System.Net.Sockets.SocketFlags,System.Net.SocketAddress,System.Threading.CancellationToken);Argument[this];ReturnValue;taint;df-generated |
+| System.Net.Sockets;Socket;ReceiveFrom;(System.Byte[],System.Int32,System.Int32,System.Net.Sockets.SocketFlags,System.Net.EndPoint);Argument[4];ReturnValue;value;dfc-generated |
+| System.Net.Sockets;Socket;ReceiveFrom;(System.Byte[],System.Int32,System.Net.Sockets.SocketFlags,System.Net.EndPoint);Argument[3];ReturnValue;value;dfc-generated |
+| System.Net.Sockets;Socket;ReceiveFrom;(System.Byte[],System.Net.EndPoint);Argument[1];ReturnValue;value;dfc-generated |
+| System.Net.Sockets;Socket;ReceiveFrom;(System.Byte[],System.Net.Sockets.SocketFlags,System.Net.EndPoint);Argument[2];ReturnValue;value;dfc-generated |
+| System.Net.Sockets;Socket;ReceiveFrom;(System.Span<System.Byte>,System.Net.EndPoint);Argument[1];ReturnValue;value;dfc-generated |
+| System.Net.Sockets;Socket;ReceiveFrom;(System.Span<System.Byte>,System.Net.Sockets.SocketFlags,System.Net.EndPoint);Argument[2];ReturnValue;value;dfc-generated |
 | System.Net.Sockets;Socket;ReceiveFromAsync;(System.Net.Sockets.SocketAsyncEventArgs);Argument[this];Argument[0];taint;df-generated |
-| System.Net.Sockets;Socket;ReceiveMessageFrom;(System.Byte[],System.Int32,System.Int32,System.Net.Sockets.SocketFlags,System.Net.EndPoint,System.Net.Sockets.IPPacketInformation);Argument[4];Argument[this];taint;df-generated |
-| System.Net.Sockets;Socket;ReceiveMessageFrom;(System.Span<System.Byte>,System.Net.Sockets.SocketFlags,System.Net.EndPoint,System.Net.Sockets.IPPacketInformation);Argument[2];Argument[this];taint;df-generated |
-| System.Net.Sockets;Socket;ReceiveMessageFromAsync;(System.ArraySegment<System.Byte>,System.Net.EndPoint);Argument[1];ReturnValue;taint;df-generated |
-| System.Net.Sockets;Socket;ReceiveMessageFromAsync;(System.ArraySegment<System.Byte>,System.Net.Sockets.SocketFlags,System.Net.EndPoint);Argument[2];ReturnValue;taint;df-generated |
-| System.Net.Sockets;Socket;ReceiveMessageFromAsync;(System.Memory<System.Byte>,System.Net.EndPoint,System.Threading.CancellationToken);Argument[0];ReturnValue;taint;df-generated |
-| System.Net.Sockets;Socket;ReceiveMessageFromAsync;(System.Memory<System.Byte>,System.Net.EndPoint,System.Threading.CancellationToken);Argument[1];ReturnValue;taint;df-generated |
-| System.Net.Sockets;Socket;ReceiveMessageFromAsync;(System.Memory<System.Byte>,System.Net.EndPoint,System.Threading.CancellationToken);Argument[2];ReturnValue;taint;df-generated |
-| System.Net.Sockets;Socket;ReceiveMessageFromAsync;(System.Memory<System.Byte>,System.Net.EndPoint,System.Threading.CancellationToken);Argument[this];ReturnValue;taint;df-generated |
-| System.Net.Sockets;Socket;ReceiveMessageFromAsync;(System.Memory<System.Byte>,System.Net.Sockets.SocketFlags,System.Net.EndPoint,System.Threading.CancellationToken);Argument[0];ReturnValue;taint;df-generated |
-| System.Net.Sockets;Socket;ReceiveMessageFromAsync;(System.Memory<System.Byte>,System.Net.Sockets.SocketFlags,System.Net.EndPoint,System.Threading.CancellationToken);Argument[2];ReturnValue;taint;df-generated |
-| System.Net.Sockets;Socket;ReceiveMessageFromAsync;(System.Memory<System.Byte>,System.Net.Sockets.SocketFlags,System.Net.EndPoint,System.Threading.CancellationToken);Argument[3];ReturnValue;taint;df-generated |
-| System.Net.Sockets;Socket;ReceiveMessageFromAsync;(System.Memory<System.Byte>,System.Net.Sockets.SocketFlags,System.Net.EndPoint,System.Threading.CancellationToken);Argument[this];ReturnValue;taint;df-generated |
+| System.Net.Sockets;Socket;ReceiveMessageFrom;(System.Byte[],System.Int32,System.Int32,System.Net.Sockets.SocketFlags,System.Net.EndPoint,System.Net.Sockets.IPPacketInformation);Argument[4];ReturnValue;value;dfc-generated |
+| System.Net.Sockets;Socket;ReceiveMessageFrom;(System.Span<System.Byte>,System.Net.Sockets.SocketFlags,System.Net.EndPoint,System.Net.Sockets.IPPacketInformation);Argument[2];ReturnValue;value;dfc-generated |
 | System.Net.Sockets;Socket;ReceiveMessageFromAsync;(System.Net.Sockets.SocketAsyncEventArgs);Argument[this];Argument[0];taint;df-generated |
 | System.Net.Sockets;Socket;SendAsync;(System.Net.Sockets.SocketAsyncEventArgs);Argument[this];Argument[0];taint;df-generated |
-| System.Net.Sockets;Socket;SendAsync;(System.ReadOnlyMemory<System.Byte>,System.Net.Sockets.SocketFlags,System.Threading.CancellationToken);Argument[2];ReturnValue;taint;df-generated |
-| System.Net.Sockets;Socket;SendAsync;(System.ReadOnlyMemory<System.Byte>,System.Net.Sockets.SocketFlags,System.Threading.CancellationToken);Argument[this];ReturnValue;taint;df-generated |
-| System.Net.Sockets;Socket;SendAsync;(System.ReadOnlyMemory<System.Byte>,System.Threading.CancellationToken);Argument[1];ReturnValue;taint;df-generated |
-| System.Net.Sockets;Socket;SendAsync;(System.ReadOnlyMemory<System.Byte>,System.Threading.CancellationToken);Argument[this];ReturnValue;taint;df-generated |
-| System.Net.Sockets;Socket;SendFileAsync;(System.String,System.ReadOnlyMemory<System.Byte>,System.ReadOnlyMemory<System.Byte>,System.Net.Sockets.TransmitFileOptions,System.Threading.CancellationToken);Argument[4];ReturnValue;taint;df-generated |
-| System.Net.Sockets;Socket;SendFileAsync;(System.String,System.ReadOnlyMemory<System.Byte>,System.ReadOnlyMemory<System.Byte>,System.Net.Sockets.TransmitFileOptions,System.Threading.CancellationToken);Argument[this];ReturnValue;taint;df-generated |
-| System.Net.Sockets;Socket;SendFileAsync;(System.String,System.Threading.CancellationToken);Argument[1];ReturnValue;taint;df-generated |
-| System.Net.Sockets;Socket;SendFileAsync;(System.String,System.Threading.CancellationToken);Argument[this];ReturnValue;taint;df-generated |
 | System.Net.Sockets;Socket;SendPacketsAsync;(System.Net.Sockets.SocketAsyncEventArgs);Argument[this];Argument[0];taint;df-generated |
 | System.Net.Sockets;Socket;SendTo;(System.Byte[],System.Int32,System.Int32,System.Net.Sockets.SocketFlags,System.Net.EndPoint);Argument[4];Argument[this];taint;df-generated |
 | System.Net.Sockets;Socket;SendTo;(System.Byte[],System.Int32,System.Net.Sockets.SocketFlags,System.Net.EndPoint);Argument[3];Argument[this];taint;df-generated |
@@ -13529,45 +13982,21 @@ summary
 | System.Net.Sockets;Socket;SendToAsync;(System.Net.Sockets.SocketAsyncEventArgs);Argument[0];Argument[this];taint;df-generated |
 | System.Net.Sockets;Socket;SendToAsync;(System.Net.Sockets.SocketAsyncEventArgs);Argument[this];Argument[0];taint;df-generated |
 | System.Net.Sockets;Socket;SendToAsync;(System.ReadOnlyMemory<System.Byte>,System.Net.EndPoint,System.Threading.CancellationToken);Argument[1];Argument[this];taint;df-generated |
-| System.Net.Sockets;Socket;SendToAsync;(System.ReadOnlyMemory<System.Byte>,System.Net.EndPoint,System.Threading.CancellationToken);Argument[1];ReturnValue;taint;df-generated |
-| System.Net.Sockets;Socket;SendToAsync;(System.ReadOnlyMemory<System.Byte>,System.Net.EndPoint,System.Threading.CancellationToken);Argument[2];ReturnValue;taint;df-generated |
-| System.Net.Sockets;Socket;SendToAsync;(System.ReadOnlyMemory<System.Byte>,System.Net.EndPoint,System.Threading.CancellationToken);Argument[this];ReturnValue;taint;df-generated |
 | System.Net.Sockets;Socket;SendToAsync;(System.ReadOnlyMemory<System.Byte>,System.Net.Sockets.SocketFlags,System.Net.EndPoint,System.Threading.CancellationToken);Argument[2];Argument[this];taint;df-generated |
-| System.Net.Sockets;Socket;SendToAsync;(System.ReadOnlyMemory<System.Byte>,System.Net.Sockets.SocketFlags,System.Net.EndPoint,System.Threading.CancellationToken);Argument[2];ReturnValue;taint;df-generated |
-| System.Net.Sockets;Socket;SendToAsync;(System.ReadOnlyMemory<System.Byte>,System.Net.Sockets.SocketFlags,System.Net.EndPoint,System.Threading.CancellationToken);Argument[3];ReturnValue;taint;df-generated |
-| System.Net.Sockets;Socket;SendToAsync;(System.ReadOnlyMemory<System.Byte>,System.Net.Sockets.SocketFlags,System.Net.EndPoint,System.Threading.CancellationToken);Argument[this];ReturnValue;taint;df-generated |
-| System.Net.Sockets;Socket;SendToAsync;(System.ReadOnlyMemory<System.Byte>,System.Net.Sockets.SocketFlags,System.Net.SocketAddress,System.Threading.CancellationToken);Argument[2];ReturnValue;taint;df-generated |
-| System.Net.Sockets;Socket;SendToAsync;(System.ReadOnlyMemory<System.Byte>,System.Net.Sockets.SocketFlags,System.Net.SocketAddress,System.Threading.CancellationToken);Argument[3];ReturnValue;taint;df-generated |
-| System.Net.Sockets;Socket;SendToAsync;(System.ReadOnlyMemory<System.Byte>,System.Net.Sockets.SocketFlags,System.Net.SocketAddress,System.Threading.CancellationToken);Argument[this];ReturnValue;taint;df-generated |
-| System.Net.Sockets;Socket;get_Handle;();Argument[this];ReturnValue;taint;df-generated |
 | System.Net.Sockets;Socket;get_LocalEndPoint;();Argument[this];ReturnValue;taint;df-generated |
 | System.Net.Sockets;Socket;get_RemoteEndPoint;();Argument[this];ReturnValue;taint;df-generated |
 | System.Net.Sockets;Socket;get_SafeHandle;();Argument[this];ReturnValue;taint;df-generated |
-| System.Net.Sockets;SocketAsyncEventArgs;SetBuffer;(System.Byte[],System.Int32,System.Int32);Argument[0].Element;Argument[this];taint;df-generated |
-| System.Net.Sockets;SocketAsyncEventArgs;SetBuffer;(System.Memory<System.Byte>);Argument[0];Argument[this];taint;df-generated |
+| System.Net.Sockets;SocketAsyncEventArgs;SetBuffer;(System.Memory<System.Byte>);Argument[0];Argument[this].SyntheticField[System.Net.Sockets.SocketAsyncEventArgs._buffer];value;dfc-generated |
 | System.Net.Sockets;SocketAsyncEventArgs;add_Completed;(System.EventHandler<System.Net.Sockets.SocketAsyncEventArgs>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Net.Sockets;SocketAsyncEventArgs;get_ConnectByNameError;();Argument[this];ReturnValue;taint;df-generated |
 | System.Net.Sockets;SocketAsyncEventArgs;get_ConnectSocket;();Argument[this];ReturnValue;taint;df-generated |
-| System.Net.Sockets;SocketAsyncEventArgs;get_MemoryBuffer;();Argument[this];ReturnValue;taint;df-generated |
+| System.Net.Sockets;SocketAsyncEventArgs;get_MemoryBuffer;();Argument[this].SyntheticField[System.Net.Sockets.SocketAsyncEventArgs._buffer];ReturnValue;value;dfc-generated |
 | System.Net.Sockets;SocketAsyncEventArgs;get_ReceiveMessageFromPacketInfo;();Argument[this];ReturnValue;taint;df-generated |
 | System.Net.Sockets;SocketAsyncEventArgs;remove_Completed;(System.EventHandler<System.Net.Sockets.SocketAsyncEventArgs>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
-| System.Net.Sockets;SocketException;get_Message;();Argument[this];ReturnValue;taint;df-generated |
-| System.Net.Sockets;SocketTaskExtensions;AcceptAsync;(System.Net.Sockets.Socket,System.Net.Sockets.Socket);Argument[1];ReturnValue;taint;df-generated |
+| System.Net.Sockets;SocketException;get_Message;();Argument[this].Property[System.Exception.Message];ReturnValue;value;dfc-generated |
+| System.Net.Sockets;SocketException;get_Message;();Argument[this].SyntheticField[System.Exception._message];ReturnValue;value;dfc-generated |
 | System.Net.Sockets;SocketTaskExtensions;ConnectAsync;(System.Net.Sockets.Socket,System.Net.EndPoint);Argument[1];Argument[0];taint;df-generated |
-| System.Net.Sockets;SocketTaskExtensions;ConnectAsync;(System.Net.Sockets.Socket,System.Net.EndPoint,System.Threading.CancellationToken);Argument[0];ReturnValue;taint;df-generated |
 | System.Net.Sockets;SocketTaskExtensions;ConnectAsync;(System.Net.Sockets.Socket,System.Net.EndPoint,System.Threading.CancellationToken);Argument[1];Argument[0];taint;df-generated |
-| System.Net.Sockets;SocketTaskExtensions;ConnectAsync;(System.Net.Sockets.Socket,System.Net.EndPoint,System.Threading.CancellationToken);Argument[1];ReturnValue;taint;df-generated |
-| System.Net.Sockets;SocketTaskExtensions;ConnectAsync;(System.Net.Sockets.Socket,System.Net.IPAddress,System.Int32);Argument[1];Argument[0];taint;df-generated |
-| System.Net.Sockets;SocketTaskExtensions;ConnectAsync;(System.Net.Sockets.Socket,System.Net.IPAddress,System.Int32,System.Threading.CancellationToken);Argument[0];ReturnValue;taint;df-generated |
-| System.Net.Sockets;SocketTaskExtensions;ConnectAsync;(System.Net.Sockets.Socket,System.Net.IPAddress,System.Int32,System.Threading.CancellationToken);Argument[1];Argument[0];taint;df-generated |
-| System.Net.Sockets;SocketTaskExtensions;ConnectAsync;(System.Net.Sockets.Socket,System.String,System.Int32,System.Threading.CancellationToken);Argument[0];ReturnValue;taint;df-generated |
-| System.Net.Sockets;SocketTaskExtensions;ReceiveAsync;(System.Net.Sockets.Socket,System.Memory<System.Byte>,System.Net.Sockets.SocketFlags,System.Threading.CancellationToken);Argument[0];ReturnValue;taint;df-generated |
-| System.Net.Sockets;SocketTaskExtensions;ReceiveAsync;(System.Net.Sockets.Socket,System.Memory<System.Byte>,System.Net.Sockets.SocketFlags,System.Threading.CancellationToken);Argument[1];ReturnValue;taint;df-generated |
-| System.Net.Sockets;SocketTaskExtensions;ReceiveAsync;(System.Net.Sockets.Socket,System.Memory<System.Byte>,System.Net.Sockets.SocketFlags,System.Threading.CancellationToken);Argument[3];ReturnValue;taint;df-generated |
-| System.Net.Sockets;SocketTaskExtensions;ReceiveFromAsync;(System.Net.Sockets.Socket,System.ArraySegment<System.Byte>,System.Net.Sockets.SocketFlags,System.Net.EndPoint);Argument[3];ReturnValue;taint;df-generated |
-| System.Net.Sockets;SocketTaskExtensions;ReceiveMessageFromAsync;(System.Net.Sockets.Socket,System.ArraySegment<System.Byte>,System.Net.Sockets.SocketFlags,System.Net.EndPoint);Argument[3];ReturnValue;taint;df-generated |
-| System.Net.Sockets;SocketTaskExtensions;SendAsync;(System.Net.Sockets.Socket,System.ReadOnlyMemory<System.Byte>,System.Net.Sockets.SocketFlags,System.Threading.CancellationToken);Argument[0];ReturnValue;taint;df-generated |
-| System.Net.Sockets;SocketTaskExtensions;SendAsync;(System.Net.Sockets.Socket,System.ReadOnlyMemory<System.Byte>,System.Net.Sockets.SocketFlags,System.Threading.CancellationToken);Argument[3];ReturnValue;taint;df-generated |
 | System.Net.Sockets;SocketTaskExtensions;SendToAsync;(System.Net.Sockets.Socket,System.ArraySegment<System.Byte>,System.Net.Sockets.SocketFlags,System.Net.EndPoint);Argument[3];Argument[0];taint;df-generated |
 | System.Net.Sockets;TcpClient;BeginConnect;(System.Net.IPAddress,System.Int32,System.AsyncCallback,System.Object);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
 | System.Net.Sockets;TcpClient;BeginConnect;(System.Net.IPAddress[],System.Int32,System.AsyncCallback,System.Object);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
@@ -13577,14 +14006,11 @@ summary
 | System.Net.Sockets;TcpClient;ConnectAsync;(System.Net.IPEndPoint,System.Threading.CancellationToken);Argument[0];Argument[this];taint;df-generated |
 | System.Net.Sockets;TcpClient;TcpClient;(System.Net.IPEndPoint);Argument[0];Argument[this];taint;df-generated |
 | System.Net.Sockets;TcpListener;AcceptSocket;();Argument[this];ReturnValue;taint;df-generated |
-| System.Net.Sockets;TcpListener;AcceptSocketAsync;(System.Threading.CancellationToken);Argument[0];ReturnValue;taint;df-generated |
-| System.Net.Sockets;TcpListener;AcceptSocketAsync;(System.Threading.CancellationToken);Argument[this];ReturnValue;taint;df-generated |
 | System.Net.Sockets;TcpListener;AcceptTcpClient;();Argument[this];ReturnValue;taint;df-generated |
 | System.Net.Sockets;TcpListener;BeginAcceptSocket;(System.AsyncCallback,System.Object);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Net.Sockets;TcpListener;BeginAcceptTcpClient;(System.AsyncCallback,System.Object);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
-| System.Net.Sockets;TcpListener;TcpListener;(System.Net.IPAddress,System.Int32);Argument[0];Argument[this];taint;df-generated |
-| System.Net.Sockets;TcpListener;TcpListener;(System.Net.IPEndPoint);Argument[0];Argument[this];taint;df-generated |
-| System.Net.Sockets;TcpListener;get_LocalEndpoint;();Argument[this];ReturnValue;taint;df-generated |
+| System.Net.Sockets;TcpListener;TcpListener;(System.Net.IPEndPoint);Argument[0];Argument[this].SyntheticField[System.Net.Sockets.TcpListener._serverSocketEP];value;dfc-generated |
+| System.Net.Sockets;TcpListener;get_LocalEndpoint;();Argument[this].SyntheticField[System.Net.Sockets.TcpListener._serverSocketEP];ReturnValue;value;dfc-generated |
 | System.Net.Sockets;TcpListener;get_Server;();Argument[this];ReturnValue;taint;df-generated |
 | System.Net.Sockets;UdpClient;BeginReceive;(System.AsyncCallback,System.Object);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Net.Sockets;UdpClient;BeginSend;(System.Byte[],System.Int32,System.AsyncCallback,System.Object);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
@@ -13597,22 +14023,12 @@ summary
 | System.Net.Sockets;UdpClient;Send;(System.ReadOnlySpan<System.Byte>,System.Net.IPEndPoint);Argument[1];Argument[this];taint;df-generated |
 | System.Net.Sockets;UdpClient;SendAsync;(System.Byte[],System.Int32,System.Net.IPEndPoint);Argument[2];Argument[this];taint;df-generated |
 | System.Net.Sockets;UdpClient;SendAsync;(System.ReadOnlyMemory<System.Byte>,System.Net.IPEndPoint,System.Threading.CancellationToken);Argument[1];Argument[this];taint;df-generated |
-| System.Net.Sockets;UdpClient;SendAsync;(System.ReadOnlyMemory<System.Byte>,System.Net.IPEndPoint,System.Threading.CancellationToken);Argument[1];ReturnValue;taint;df-generated |
-| System.Net.Sockets;UdpClient;SendAsync;(System.ReadOnlyMemory<System.Byte>,System.Net.IPEndPoint,System.Threading.CancellationToken);Argument[2];ReturnValue;taint;df-generated |
-| System.Net.Sockets;UdpClient;SendAsync;(System.ReadOnlyMemory<System.Byte>,System.Net.IPEndPoint,System.Threading.CancellationToken);Argument[this];ReturnValue;taint;df-generated |
-| System.Net.Sockets;UdpClient;SendAsync;(System.ReadOnlyMemory<System.Byte>,System.String,System.Int32,System.Threading.CancellationToken);Argument[3];ReturnValue;taint;df-generated |
-| System.Net.Sockets;UdpClient;SendAsync;(System.ReadOnlyMemory<System.Byte>,System.String,System.Int32,System.Threading.CancellationToken);Argument[this];ReturnValue;taint;df-generated |
-| System.Net.Sockets;UdpClient;SendAsync;(System.ReadOnlyMemory<System.Byte>,System.Threading.CancellationToken);Argument[1];ReturnValue;taint;df-generated |
-| System.Net.Sockets;UdpClient;SendAsync;(System.ReadOnlyMemory<System.Byte>,System.Threading.CancellationToken);Argument[this];ReturnValue;taint;df-generated |
 | System.Net.Sockets;UdpClient;UdpClient;(System.Net.IPEndPoint);Argument[0];Argument[this];taint;df-generated |
-| System.Net.Sockets;UdpReceiveResult;UdpReceiveResult;(System.Byte[],System.Net.IPEndPoint);Argument[0].Element;Argument[this];taint;df-generated |
-| System.Net.Sockets;UdpReceiveResult;UdpReceiveResult;(System.Byte[],System.Net.IPEndPoint);Argument[1];Argument[this];taint;df-generated |
-| System.Net.Sockets;UdpReceiveResult;get_Buffer;();Argument[this];ReturnValue;taint;df-generated |
-| System.Net.Sockets;UdpReceiveResult;get_RemoteEndPoint;();Argument[this];ReturnValue;taint;df-generated |
+| System.Net.Sockets;UdpReceiveResult;UdpReceiveResult;(System.Byte[],System.Net.IPEndPoint);Argument[0];Argument[this].SyntheticField[System.Net.Sockets.UdpReceiveResult._buffer];value;dfc-generated |
+| System.Net.Sockets;UdpReceiveResult;UdpReceiveResult;(System.Byte[],System.Net.IPEndPoint);Argument[1];Argument[this].SyntheticField[System.Net.Sockets.UdpReceiveResult._remoteEndPoint];value;dfc-generated |
+| System.Net.Sockets;UdpReceiveResult;get_Buffer;();Argument[this].SyntheticField[System.Net.Sockets.UdpReceiveResult._buffer];ReturnValue;value;dfc-generated |
+| System.Net.Sockets;UdpReceiveResult;get_RemoteEndPoint;();Argument[this].SyntheticField[System.Net.Sockets.UdpReceiveResult._remoteEndPoint];ReturnValue;value;dfc-generated |
 | System.Net.Sockets;UnixDomainSocketEndPoint;ToString;();Argument[this];ReturnValue;taint;df-generated |
-| System.Net.WebSockets;ClientWebSocket;SendAsync;(System.ArraySegment<System.Byte>,System.Net.WebSockets.WebSocketMessageType,System.Boolean,System.Threading.CancellationToken);Argument[this];ReturnValue;taint;df-generated |
-| System.Net.WebSockets;ClientWebSocket;SendAsync;(System.ReadOnlyMemory<System.Byte>,System.Net.WebSockets.WebSocketMessageType,System.Boolean,System.Threading.CancellationToken);Argument[this];ReturnValue;taint;df-generated |
-| System.Net.WebSockets;ClientWebSocket;SendAsync;(System.ReadOnlyMemory<System.Byte>,System.Net.WebSockets.WebSocketMessageType,System.Net.WebSockets.WebSocketMessageFlags,System.Threading.CancellationToken);Argument[this];ReturnValue;taint;df-generated |
 | System.Net.WebSockets;ClientWebSocket;get_CloseStatus;();Argument[this];ReturnValue;taint;df-generated |
 | System.Net.WebSockets;ClientWebSocket;get_CloseStatusDescription;();Argument[this];ReturnValue;taint;df-generated |
 | System.Net.WebSockets;ClientWebSocket;get_SubProtocol;();Argument[this];ReturnValue;taint;df-generated |
@@ -13627,13 +14043,8 @@ summary
 | System.Net.WebSockets;HttpListenerWebSocketContext;get_SecWebSocketVersion;();Argument[this];ReturnValue;taint;df-generated |
 | System.Net.WebSockets;HttpListenerWebSocketContext;get_User;();Argument[this];ReturnValue;taint;df-generated |
 | System.Net.WebSockets;HttpListenerWebSocketContext;get_WebSocket;();Argument[this];ReturnValue;taint;df-generated |
-| System.Net.WebSockets;WebSocket;CreateClientWebSocket;(System.IO.Stream,System.String,System.Int32,System.Int32,System.TimeSpan,System.Boolean,System.ArraySegment<System.Byte>);Argument[0];ReturnValue;taint;df-generated |
-| System.Net.WebSockets;WebSocket;CreateClientWebSocket;(System.IO.Stream,System.String,System.Int32,System.Int32,System.TimeSpan,System.Boolean,System.ArraySegment<System.Byte>);Argument[1];ReturnValue;taint;df-generated |
-| System.Net.WebSockets;WebSocket;CreateFromStream;(System.IO.Stream,System.Boolean,System.String,System.TimeSpan);Argument[0];ReturnValue;taint;df-generated |
-| System.Net.WebSockets;WebSocket;CreateFromStream;(System.IO.Stream,System.Boolean,System.String,System.TimeSpan);Argument[2];ReturnValue;taint;df-generated |
-| System.Net.WebSockets;WebSocket;SendAsync;(System.ArraySegment<System.Byte>,System.Net.WebSockets.WebSocketMessageType,System.Boolean,System.Threading.CancellationToken);Argument[this];ReturnValue;taint;df-generated |
-| System.Net.WebSockets;WebSocket;SendAsync;(System.ReadOnlyMemory<System.Byte>,System.Net.WebSockets.WebSocketMessageType,System.Boolean,System.Threading.CancellationToken);Argument[this];ReturnValue;taint;df-generated |
-| System.Net.WebSockets;WebSocket;SendAsync;(System.ReadOnlyMemory<System.Byte>,System.Net.WebSockets.WebSocketMessageType,System.Net.WebSockets.WebSocketMessageFlags,System.Threading.CancellationToken);Argument[this];ReturnValue;taint;df-generated |
+| System.Net.WebSockets;WebSocket;CreateClientWebSocket;(System.IO.Stream,System.String,System.Int32,System.Int32,System.TimeSpan,System.Boolean,System.ArraySegment<System.Byte>);Argument[1];ReturnValue.SyntheticField[System.Net.WebSockets.ManagedWebSocket._subprotocol];value;dfc-generated |
+| System.Net.WebSockets;WebSocket;CreateFromStream;(System.IO.Stream,System.Boolean,System.String,System.TimeSpan);Argument[2];ReturnValue.SyntheticField[System.Net.WebSockets.ManagedWebSocket._subprotocol];value;dfc-generated |
 | System.Net.WebSockets;WebSocket;get_CloseStatus;();Argument[this];ReturnValue;taint;df-generated |
 | System.Net.WebSockets;WebSocket;get_CloseStatusDescription;();Argument[this];ReturnValue;taint;df-generated |
 | System.Net.WebSockets;WebSocket;get_SubProtocol;();Argument[this];ReturnValue;taint;df-generated |
@@ -13664,25 +14075,21 @@ summary
 | System.Net;CookieCollection;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.IEnumerator.Current];value;manual |
 | System.Net;CookieCollection;get_Item;(System.Int32);Argument[this];ReturnValue;taint;df-generated |
 | System.Net;CookieCollection;get_Item;(System.String);Argument[this];ReturnValue;taint;df-generated |
-| System.Net;CookieCollection;get_SyncRoot;();Argument[this];ReturnValue;taint;df-generated |
-| System.Net;CookieCollection;get_SyncRoot;();Argument[this];ReturnValue;value;df-generated |
+| System.Net;CookieCollection;get_SyncRoot;();Argument[this];ReturnValue;value;dfc-generated |
 | System.Net;CookieException;GetObjectData;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);Argument[this];Argument[0];taint;df-generated |
-| System.Net;CredentialCache;GetCredential;(System.String,System.Int32,System.String);Argument[this];ReturnValue;value;df-generated |
-| System.Net;CredentialCache;GetCredential;(System.Uri,System.String);Argument[this];ReturnValue;taint;df-generated |
-| System.Net;CredentialCache;GetCredential;(System.Uri,System.String);Argument[this];ReturnValue;value;df-generated |
+| System.Net;CredentialCache;GetCredential;(System.String,System.Int32,System.String);Argument[this];ReturnValue;value;dfc-generated |
+| System.Net;CredentialCache;GetCredential;(System.Uri,System.String);Argument[this];ReturnValue;value;dfc-generated |
 | System.Net;CredentialCache;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.IEnumerator.Current];value;manual |
 | System.Net;Dns;BeginGetHostAddresses;(System.String,System.AsyncCallback,System.Object);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
 | System.Net;Dns;BeginGetHostByName;(System.String,System.AsyncCallback,System.Object);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
 | System.Net;Dns;BeginGetHostEntry;(System.Net.IPAddress,System.AsyncCallback,System.Object);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
 | System.Net;Dns;BeginGetHostEntry;(System.String,System.AsyncCallback,System.Object);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
 | System.Net;Dns;BeginResolve;(System.String,System.AsyncCallback,System.Object);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
-| System.Net;DnsEndPoint;DnsEndPoint;(System.String,System.Int32,System.Net.Sockets.AddressFamily);Argument[0];Argument[this];taint;df-generated |
-| System.Net;DnsEndPoint;ToString;();Argument[this];ReturnValue;taint;df-generated |
-| System.Net;DnsEndPoint;get_Host;();Argument[this];ReturnValue;taint;df-generated |
-| System.Net;DnsPermission;Copy;();Argument[this];ReturnValue;taint;df-generated |
-| System.Net;DnsPermission;Copy;();Argument[this];ReturnValue;value;df-generated |
-| System.Net;DnsPermission;Intersect;(System.Security.IPermission);Argument[0];ReturnValue;taint;df-generated |
-| System.Net;DnsPermission;Intersect;(System.Security.IPermission);Argument[this];ReturnValue;taint;df-generated |
+| System.Net;DnsEndPoint;DnsEndPoint;(System.String,System.Int32,System.Net.Sockets.AddressFamily);Argument[0];Argument[this].SyntheticField[System.Net.DnsEndPoint._host];value;dfc-generated |
+| System.Net;DnsEndPoint;ToString;();Argument[this].SyntheticField[System.Net.DnsEndPoint._host];ReturnValue;taint;dfc-generated |
+| System.Net;DnsEndPoint;get_Host;();Argument[this].SyntheticField[System.Net.DnsEndPoint._host];ReturnValue;value;dfc-generated |
+| System.Net;DnsPermission;Copy;();Argument[this];ReturnValue;value;dfc-generated |
+| System.Net;DnsPermission;Intersect;(System.Security.IPermission);Argument[0];ReturnValue;value;dfc-generated |
 | System.Net;DnsPermission;Union;(System.Security.IPermission);Argument[this];ReturnValue;taint;df-generated |
 | System.Net;DownloadDataCompletedEventArgs;get_Result;();Argument[this];ReturnValue;taint;df-generated |
 | System.Net;DownloadDataCompletedEventHandler;BeginInvoke;(System.Object,System.Net.DownloadDataCompletedEventArgs,System.AsyncCallback,System.Object);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
@@ -13691,28 +14098,24 @@ summary
 | System.Net;DownloadStringCompletedEventHandler;BeginInvoke;(System.Object,System.Net.DownloadStringCompletedEventArgs,System.AsyncCallback,System.Object);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
 | System.Net;FileWebRequest;BeginGetRequestStream;(System.AsyncCallback,System.Object);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Net;FileWebRequest;BeginGetResponse;(System.AsyncCallback,System.Object);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
-| System.Net;FileWebRequest;EndGetRequestStream;(System.IAsyncResult);Argument[0];ReturnValue;taint;df-generated |
 | System.Net;FileWebRequest;EndGetRequestStream;(System.IAsyncResult);Argument[this];ReturnValue;taint;df-generated |
-| System.Net;FileWebRequest;EndGetResponse;(System.IAsyncResult);Argument[0];ReturnValue;taint;df-generated |
 | System.Net;FileWebRequest;EndGetResponse;(System.IAsyncResult);Argument[this];ReturnValue;taint;df-generated |
 | System.Net;FileWebRequest;GetObjectData;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);Argument[this];Argument[0];taint;df-generated |
 | System.Net;FileWebRequest;GetRequestStream;();Argument[this];ReturnValue;taint;df-generated |
 | System.Net;FileWebRequest;GetRequestStreamAsync;();Argument[this];ReturnValue;taint;df-generated |
 | System.Net;FileWebRequest;GetResponse;();Argument[this];ReturnValue;taint;df-generated |
-| System.Net;FileWebRequest;get_RequestUri;();Argument[this];ReturnValue;taint;df-generated |
+| System.Net;FileWebRequest;get_RequestUri;();Argument[this].SyntheticField[System.Net.FileWebRequest._uri];ReturnValue;value;dfc-generated |
 | System.Net;FileWebResponse;GetObjectData;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);Argument[this];Argument[0];taint;df-generated |
 | System.Net;FileWebResponse;GetResponseStream;();Argument[this];ReturnValue;taint;df-generated |
 | System.Net;FileWebResponse;get_Headers;();Argument[this];ReturnValue;taint;df-generated |
 | System.Net;FileWebResponse;get_ResponseUri;();Argument[this];ReturnValue;taint;df-generated |
 | System.Net;FtpWebRequest;BeginGetRequestStream;(System.AsyncCallback,System.Object);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Net;FtpWebRequest;BeginGetResponse;(System.AsyncCallback,System.Object);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
-| System.Net;FtpWebRequest;EndGetRequestStream;(System.IAsyncResult);Argument[0];ReturnValue;taint;df-generated |
 | System.Net;FtpWebRequest;EndGetRequestStream;(System.IAsyncResult);Argument[this];ReturnValue;taint;df-generated |
-| System.Net;FtpWebRequest;EndGetResponse;(System.IAsyncResult);Argument[0];ReturnValue;taint;df-generated |
 | System.Net;FtpWebRequest;EndGetResponse;(System.IAsyncResult);Argument[this];ReturnValue;taint;df-generated |
 | System.Net;FtpWebRequest;GetRequestStream;();Argument[this];ReturnValue;taint;df-generated |
 | System.Net;FtpWebRequest;GetResponse;();Argument[this];ReturnValue;taint;df-generated |
-| System.Net;FtpWebRequest;get_RequestUri;();Argument[this];ReturnValue;taint;df-generated |
+| System.Net;FtpWebRequest;get_RequestUri;();Argument[this].SyntheticField[System.Net.FtpWebRequest._uri];ReturnValue;value;dfc-generated |
 | System.Net;FtpWebResponse;GetResponseStream;();Argument[this];ReturnValue;taint;df-generated |
 | System.Net;FtpWebResponse;get_BannerMessage;();Argument[this];ReturnValue;taint;df-generated |
 | System.Net;FtpWebResponse;get_ExitMessage;();Argument[this];ReturnValue;taint;df-generated |
@@ -13722,7 +14125,10 @@ summary
 | System.Net;FtpWebResponse;get_WelcomeMessage;();Argument[this];ReturnValue;taint;df-generated |
 | System.Net;HttpContinueDelegate;BeginInvoke;(System.Int32,System.Net.WebHeaderCollection,System.AsyncCallback,System.Object);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
 | System.Net;HttpListener+ExtendedProtectionSelector;BeginInvoke;(System.Net.HttpListenerRequest,System.AsyncCallback,System.Object);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
+| System.Net;HttpListener;BeginGetContext;(System.AsyncCallback,System.Object);Argument[0];Argument[0].Parameter[delegate-self];value;dfc-generated |
 | System.Net;HttpListener;BeginGetContext;(System.AsyncCallback,System.Object);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
+| System.Net;HttpListener;BeginGetContext;(System.AsyncCallback,System.Object);Argument[1];ReturnValue.SyntheticField[System.Net.ListenerAsyncResult._state];value;dfc-generated |
+| System.Net;HttpListener;BeginGetContext;(System.AsyncCallback,System.Object);Argument[1];ReturnValue.SyntheticField[System.Net.ListenerAsyncResult._state];value;hq-generated |
 | System.Net;HttpListener;get_DefaultServiceNames;();Argument[this];ReturnValue;taint;df-generated |
 | System.Net;HttpListener;get_Prefixes;();Argument[this];ReturnValue;taint;df-generated |
 | System.Net;HttpListener;get_TimeoutManager;();Argument[this];ReturnValue;taint;df-generated |
@@ -13750,26 +14156,29 @@ summary
 | System.Net;HttpListenerRequest;get_ProtocolVersion;();Argument[this];ReturnValue;taint;df-generated |
 | System.Net;HttpListenerRequest;get_RawUrl;();Argument[this];ReturnValue;taint;df-generated |
 | System.Net;HttpListenerRequest;get_Url;();Argument[this];ReturnValue;taint;df-generated |
-| System.Net;HttpListenerRequest;get_UrlReferrer;();Argument[this];ReturnValue;taint;df-generated |
 | System.Net;HttpListenerRequest;get_UserAgent;();Argument[this];ReturnValue;taint;df-generated |
 | System.Net;HttpListenerRequest;get_UserHostName;();Argument[this];ReturnValue;taint;df-generated |
-| System.Net;HttpListenerResponse;AppendCookie;(System.Net.Cookie);Argument[0];Argument[this];taint;df-generated |
+| System.Net;HttpListenerResponse;AppendCookie;(System.Net.Cookie);Argument[0];Argument[this].Property[System.Net.HttpListenerResponse.Cookies].Element;value;dfc-generated |
 | System.Net;HttpListenerResponse;Close;(System.Byte[],System.Boolean);Argument[0].Element;Argument[this];taint;df-generated |
 | System.Net;HttpListenerResponse;CopyFrom;(System.Net.HttpListenerResponse);Argument[0];Argument[this];taint;df-generated |
 | System.Net;HttpListenerResponse;get_OutputStream;();Argument[this];ReturnValue;taint;df-generated |
 | System.Net;HttpWebRequest;BeginGetRequestStream;(System.AsyncCallback,System.Object);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Net;HttpWebRequest;BeginGetResponse;(System.AsyncCallback,System.Object);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
-| System.Net;HttpWebRequest;EndGetRequestStream;(System.IAsyncResult);Argument[0];ReturnValue;taint;df-generated |
+| System.Net;HttpWebRequest;EndGetRequestStream;(System.IAsyncResult);Argument[0].Property[System.Threading.Tasks.Task`1.Result];ReturnValue;value;df-generated |
+| System.Net;HttpWebRequest;EndGetRequestStream;(System.IAsyncResult);Argument[0].Property[System.Threading.Tasks.Task`1.Result];ReturnValue;value;dfc-generated |
 | System.Net;HttpWebRequest;EndGetRequestStream;(System.IAsyncResult);Argument[this];ReturnValue;taint;df-generated |
-| System.Net;HttpWebRequest;EndGetRequestStream;(System.IAsyncResult,System.Net.TransportContext);Argument[0];ReturnValue;taint;df-generated |
-| System.Net;HttpWebRequest;EndGetResponse;(System.IAsyncResult);Argument[0];ReturnValue;taint;df-generated |
+| System.Net;HttpWebRequest;EndGetRequestStream;(System.IAsyncResult);Argument[this];ReturnValue;taint;dfc-generated |
+| System.Net;HttpWebRequest;EndGetRequestStream;(System.IAsyncResult,System.Net.TransportContext);Argument[0].Property[System.Threading.Tasks.Task`1.Result];ReturnValue;value;dfc-generated |
+| System.Net;HttpWebRequest;EndGetResponse;(System.IAsyncResult);Argument[0].Property[System.Threading.Tasks.Task`1.Result];ReturnValue;value;df-generated |
+| System.Net;HttpWebRequest;EndGetResponse;(System.IAsyncResult);Argument[0].Property[System.Threading.Tasks.Task`1.Result];ReturnValue;value;dfc-generated |
 | System.Net;HttpWebRequest;EndGetResponse;(System.IAsyncResult);Argument[this];ReturnValue;taint;df-generated |
+| System.Net;HttpWebRequest;EndGetResponse;(System.IAsyncResult);Argument[this];ReturnValue;taint;dfc-generated |
 | System.Net;HttpWebRequest;GetObjectData;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);Argument[this];Argument[0];taint;df-generated |
 | System.Net;HttpWebRequest;GetRequestStream;();Argument[this];ReturnValue;taint;df-generated |
 | System.Net;HttpWebRequest;GetRequestStream;(System.Net.TransportContext);Argument[this];ReturnValue;taint;df-generated |
 | System.Net;HttpWebRequest;GetResponse;();Argument[this];ReturnValue;taint;df-generated |
-| System.Net;HttpWebRequest;get_Address;();Argument[this];ReturnValue;taint;df-generated |
-| System.Net;HttpWebRequest;get_RequestUri;();Argument[this];ReturnValue;taint;df-generated |
+| System.Net;HttpWebRequest;get_Address;();Argument[this].SyntheticField[System.Net.HttpWebRequest._requestUri];ReturnValue;value;dfc-generated |
+| System.Net;HttpWebRequest;get_RequestUri;();Argument[this].SyntheticField[System.Net.HttpWebRequest._requestUri];ReturnValue;value;dfc-generated |
 | System.Net;HttpWebRequest;set_ContinueDelegate;(System.Net.HttpContinueDelegate);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Net;HttpWebRequest;set_ServerCertificateValidationCallback;(System.Net.Security.RemoteCertificateValidationCallback);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Net;HttpWebResponse;GetObjectData;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);Argument[this];Argument[0];taint;df-generated |
@@ -13780,27 +14189,22 @@ summary
 | System.Net;HttpWebResponse;get_ResponseUri;();Argument[this];ReturnValue;taint;df-generated |
 | System.Net;HttpWebResponse;get_Server;();Argument[this];ReturnValue;taint;df-generated |
 | System.Net;HttpWebResponse;get_StatusDescription;();Argument[this];ReturnValue;taint;df-generated |
-| System.Net;ICredentials;GetCredential;(System.Uri,System.String);Argument[this];ReturnValue;taint;df-generated |
-| System.Net;ICredentials;GetCredential;(System.Uri,System.String);Argument[this];ReturnValue;value;df-generated |
-| System.Net;ICredentialsByHost;GetCredential;(System.String,System.Int32,System.String);Argument[this];ReturnValue;value;df-generated |
-| System.Net;IPAddress;MapToIPv4;();Argument[this];ReturnValue;value;df-generated |
-| System.Net;IPAddress;MapToIPv6;();Argument[this];ReturnValue;value;df-generated |
+| System.Net;ICredentials;GetCredential;(System.Uri,System.String);Argument[this];ReturnValue;value;dfc-generated |
+| System.Net;ICredentialsByHost;GetCredential;(System.String,System.Int32,System.String);Argument[this];ReturnValue;value;dfc-generated |
+| System.Net;IPAddress;MapToIPv4;();Argument[this];ReturnValue;value;dfc-generated |
+| System.Net;IPAddress;MapToIPv6;();Argument[this];ReturnValue;value;dfc-generated |
 | System.Net;IPAddress;ToString;();Argument[this];ReturnValue;taint;df-generated |
-| System.Net;IPAddress;ToString;(System.String,System.IFormatProvider);Argument[1];ReturnValue;taint;df-generated |
-| System.Net;IPAddress;ToString;(System.String,System.IFormatProvider);Argument[this];ReturnValue;taint;df-generated |
+| System.Net;IPAddress;ToString;(System.String,System.IFormatProvider);Argument[this];ReturnValue;taint;dfc-generated |
 | System.Net;IPEndPoint;IPEndPoint;(System.Net.IPAddress,System.Int32);Argument[0];Argument[this];taint;df-generated |
 | System.Net;IPHostEntry;get_Aliases;();Argument[this];ReturnValue;taint;manual |
 | System.Net;IPHostEntry;get_HostName;();Argument[this];ReturnValue;taint;manual |
-| System.Net;IPNetwork;IPNetwork;(System.Net.IPAddress,System.Int32);Argument[0];Argument[this];taint;df-generated |
-| System.Net;IPNetwork;ToString;(System.String,System.IFormatProvider);Argument[1];ReturnValue;taint;df-generated |
-| System.Net;IPNetwork;ToString;(System.String,System.IFormatProvider);Argument[this];ReturnValue;taint;df-generated |
-| System.Net;IPNetwork;get_BaseAddress;();Argument[this];ReturnValue;taint;df-generated |
-| System.Net;IWebProxy;GetProxy;(System.Uri);Argument[0];ReturnValue;taint;df-generated |
-| System.Net;IWebProxy;GetProxy;(System.Uri);Argument[this];ReturnValue;taint;df-generated |
+| System.Net;IPNetwork;IPNetwork;(System.Net.IPAddress,System.Int32);Argument[0];Argument[this].SyntheticField[System.Net.IPNetwork._baseAddress];value;dfc-generated |
+| System.Net;IPNetwork;ToString;(System.String,System.IFormatProvider);Argument[this];ReturnValue;taint;dfc-generated |
+| System.Net;IPNetwork;get_BaseAddress;();Argument[this].SyntheticField[System.Net.IPNetwork._baseAddress];ReturnValue;value;dfc-generated |
+| System.Net;IWebProxy;GetProxy;(System.Uri);Argument[0];ReturnValue;value;dfc-generated |
 | System.Net;IWebRequestCreate;Create;(System.Uri);Argument[0];ReturnValue;taint;df-generated |
-| System.Net;NetworkCredential;GetCredential;(System.String,System.Int32,System.String);Argument[this];ReturnValue;value;df-generated |
-| System.Net;NetworkCredential;GetCredential;(System.Uri,System.String);Argument[this];ReturnValue;taint;df-generated |
-| System.Net;NetworkCredential;GetCredential;(System.Uri,System.String);Argument[this];ReturnValue;value;df-generated |
+| System.Net;NetworkCredential;GetCredential;(System.String,System.Int32,System.String);Argument[this];ReturnValue;value;dfc-generated |
+| System.Net;NetworkCredential;GetCredential;(System.Uri,System.String);Argument[this];ReturnValue;value;dfc-generated |
 | System.Net;NetworkCredential;NetworkCredential;(System.String,System.Security.SecureString,System.String);Argument[0];Argument[this];taint;df-generated |
 | System.Net;NetworkCredential;NetworkCredential;(System.String,System.Security.SecureString,System.String);Argument[2];Argument[this];taint;df-generated |
 | System.Net;NetworkCredential;NetworkCredential;(System.String,System.String,System.String);Argument[0];Argument[this];taint;df-generated |
@@ -13813,11 +14217,8 @@ summary
 | System.Net;ProtocolViolationException;GetObjectData;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);Argument[this];Argument[0];taint;df-generated |
 | System.Net;ServicePoint;set_BindIPEndPointDelegate;(System.Net.BindIPEndPoint);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Net;ServicePointManager;set_ServerCertificateValidationCallback;(System.Net.Security.RemoteCertificateValidationCallback);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
-| System.Net;SocketAddress;get_Buffer;();Argument[this];ReturnValue;taint;df-generated |
-| System.Net;SocketPermission;Copy;();Argument[this];ReturnValue;taint;df-generated |
-| System.Net;SocketPermission;Copy;();Argument[this];ReturnValue;value;df-generated |
-| System.Net;SocketPermission;Intersect;(System.Security.IPermission);Argument[0];ReturnValue;taint;df-generated |
-| System.Net;SocketPermission;Intersect;(System.Security.IPermission);Argument[this];ReturnValue;taint;df-generated |
+| System.Net;SocketPermission;Copy;();Argument[this];ReturnValue;value;dfc-generated |
+| System.Net;SocketPermission;Intersect;(System.Security.IPermission);Argument[0];ReturnValue;value;dfc-generated |
 | System.Net;SocketPermission;Union;(System.Security.IPermission);Argument[this];ReturnValue;taint;df-generated |
 | System.Net;UploadDataCompletedEventArgs;get_Result;();Argument[this];ReturnValue;taint;df-generated |
 | System.Net;UploadDataCompletedEventHandler;BeginInvoke;(System.Object,System.Net.UploadDataCompletedEventArgs,System.AsyncCallback,System.Object);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
@@ -13828,132 +14229,41 @@ summary
 | System.Net;UploadStringCompletedEventHandler;BeginInvoke;(System.Object,System.Net.UploadStringCompletedEventArgs,System.AsyncCallback,System.Object);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
 | System.Net;UploadValuesCompletedEventArgs;get_Result;();Argument[this];ReturnValue;taint;df-generated |
 | System.Net;UploadValuesCompletedEventHandler;BeginInvoke;(System.Object,System.Net.UploadValuesCompletedEventArgs,System.AsyncCallback,System.Object);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
-| System.Net;WebClient;DownloadData;(System.String);Argument[0];Argument[this];taint;df-generated |
-| System.Net;WebClient;DownloadData;(System.Uri);Argument[0];Argument[this];taint;df-generated |
-| System.Net;WebClient;DownloadDataAsync;(System.Uri);Argument[0];Argument[this];taint;df-generated |
-| System.Net;WebClient;DownloadDataAsync;(System.Uri,System.Object);Argument[0];Argument[this];taint;df-generated |
-| System.Net;WebClient;DownloadDataTaskAsync;(System.String);Argument[0];Argument[this];taint;df-generated |
-| System.Net;WebClient;DownloadDataTaskAsync;(System.Uri);Argument[0];Argument[this];taint;df-generated |
-| System.Net;WebClient;DownloadFile;(System.String,System.String);Argument[0];Argument[this];taint;df-generated |
-| System.Net;WebClient;DownloadFile;(System.Uri,System.String);Argument[0];Argument[this];taint;df-generated |
-| System.Net;WebClient;DownloadFileAsync;(System.Uri,System.String);Argument[0];Argument[this];taint;df-generated |
-| System.Net;WebClient;DownloadFileAsync;(System.Uri,System.String,System.Object);Argument[0];Argument[this];taint;df-generated |
-| System.Net;WebClient;DownloadFileTaskAsync;(System.String,System.String);Argument[0];Argument[this];taint;df-generated |
-| System.Net;WebClient;DownloadFileTaskAsync;(System.Uri,System.String);Argument[0];Argument[this];taint;df-generated |
-| System.Net;WebClient;DownloadString;(System.String);Argument[0];Argument[this];taint;df-generated |
-| System.Net;WebClient;DownloadString;(System.Uri);Argument[0];Argument[this];taint;df-generated |
-| System.Net;WebClient;DownloadStringAsync;(System.Uri);Argument[0];Argument[this];taint;df-generated |
-| System.Net;WebClient;DownloadStringAsync;(System.Uri,System.Object);Argument[0];Argument[this];taint;df-generated |
-| System.Net;WebClient;DownloadStringTaskAsync;(System.String);Argument[0];Argument[this];taint;df-generated |
-| System.Net;WebClient;DownloadStringTaskAsync;(System.Uri);Argument[0];Argument[this];taint;df-generated |
-| System.Net;WebClient;GetWebRequest;(System.Uri);Argument[0];ReturnValue;taint;df-generated |
-| System.Net;WebClient;GetWebRequest;(System.Uri);Argument[this];ReturnValue;taint;df-generated |
-| System.Net;WebClient;GetWebResponse;(System.Net.WebRequest);Argument[0];Argument[this];taint;df-generated |
-| System.Net;WebClient;GetWebResponse;(System.Net.WebRequest);Argument[0];ReturnValue;taint;df-generated |
-| System.Net;WebClient;GetWebResponse;(System.Net.WebRequest,System.IAsyncResult);Argument[0];Argument[this];taint;df-generated |
-| System.Net;WebClient;GetWebResponse;(System.Net.WebRequest,System.IAsyncResult);Argument[0];ReturnValue;taint;df-generated |
-| System.Net;WebClient;GetWebResponse;(System.Net.WebRequest,System.IAsyncResult);Argument[1];Argument[this];taint;df-generated |
-| System.Net;WebClient;GetWebResponse;(System.Net.WebRequest,System.IAsyncResult);Argument[1];ReturnValue;taint;df-generated |
-| System.Net;WebClient;OpenRead;(System.String);Argument[0];Argument[this];taint;df-generated |
-| System.Net;WebClient;OpenRead;(System.Uri);Argument[0];Argument[this];taint;df-generated |
-| System.Net;WebClient;OpenReadAsync;(System.Uri);Argument[0];Argument[this];taint;df-generated |
-| System.Net;WebClient;OpenReadAsync;(System.Uri,System.Object);Argument[0];Argument[this];taint;df-generated |
-| System.Net;WebClient;OpenReadTaskAsync;(System.String);Argument[0];Argument[this];taint;df-generated |
-| System.Net;WebClient;OpenReadTaskAsync;(System.Uri);Argument[0];Argument[this];taint;df-generated |
-| System.Net;WebClient;OpenWrite;(System.String);Argument[0];Argument[this];taint;df-generated |
-| System.Net;WebClient;OpenWrite;(System.String);Argument[0];ReturnValue;taint;df-generated |
 | System.Net;WebClient;OpenWrite;(System.String);Argument[this];ReturnValue;taint;df-generated |
-| System.Net;WebClient;OpenWrite;(System.String,System.String);Argument[0];Argument[this];taint;df-generated |
-| System.Net;WebClient;OpenWrite;(System.String,System.String);Argument[0];ReturnValue;taint;df-generated |
 | System.Net;WebClient;OpenWrite;(System.String,System.String);Argument[1];Argument[this];taint;df-generated |
 | System.Net;WebClient;OpenWrite;(System.String,System.String);Argument[1];ReturnValue;taint;df-generated |
 | System.Net;WebClient;OpenWrite;(System.String,System.String);Argument[this];ReturnValue;taint;df-generated |
-| System.Net;WebClient;OpenWrite;(System.Uri);Argument[0];Argument[this];taint;df-generated |
-| System.Net;WebClient;OpenWrite;(System.Uri);Argument[0];ReturnValue;taint;df-generated |
 | System.Net;WebClient;OpenWrite;(System.Uri);Argument[this];ReturnValue;taint;df-generated |
-| System.Net;WebClient;OpenWrite;(System.Uri,System.String);Argument[0];Argument[this];taint;df-generated |
-| System.Net;WebClient;OpenWrite;(System.Uri,System.String);Argument[0];ReturnValue;taint;df-generated |
 | System.Net;WebClient;OpenWrite;(System.Uri,System.String);Argument[1];Argument[this];taint;df-generated |
 | System.Net;WebClient;OpenWrite;(System.Uri,System.String);Argument[1];ReturnValue;taint;df-generated |
 | System.Net;WebClient;OpenWrite;(System.Uri,System.String);Argument[this];ReturnValue;taint;df-generated |
-| System.Net;WebClient;OpenWriteAsync;(System.Uri);Argument[0];Argument[this];taint;df-generated |
-| System.Net;WebClient;OpenWriteAsync;(System.Uri,System.String);Argument[0];Argument[this];taint;df-generated |
 | System.Net;WebClient;OpenWriteAsync;(System.Uri,System.String);Argument[1];Argument[this];taint;df-generated |
-| System.Net;WebClient;OpenWriteAsync;(System.Uri,System.String,System.Object);Argument[0];Argument[this];taint;df-generated |
 | System.Net;WebClient;OpenWriteAsync;(System.Uri,System.String,System.Object);Argument[1];Argument[this];taint;df-generated |
-| System.Net;WebClient;OpenWriteTaskAsync;(System.String);Argument[0];Argument[this];taint;df-generated |
-| System.Net;WebClient;OpenWriteTaskAsync;(System.String,System.String);Argument[0];Argument[this];taint;df-generated |
 | System.Net;WebClient;OpenWriteTaskAsync;(System.String,System.String);Argument[1];Argument[this];taint;df-generated |
-| System.Net;WebClient;OpenWriteTaskAsync;(System.Uri);Argument[0];Argument[this];taint;df-generated |
-| System.Net;WebClient;OpenWriteTaskAsync;(System.Uri,System.String);Argument[0];Argument[this];taint;df-generated |
 | System.Net;WebClient;OpenWriteTaskAsync;(System.Uri,System.String);Argument[1];Argument[this];taint;df-generated |
-| System.Net;WebClient;UploadData;(System.String,System.Byte[]);Argument[0];Argument[this];taint;df-generated |
-| System.Net;WebClient;UploadData;(System.String,System.String,System.Byte[]);Argument[0];Argument[this];taint;df-generated |
 | System.Net;WebClient;UploadData;(System.String,System.String,System.Byte[]);Argument[1];Argument[this];taint;df-generated |
-| System.Net;WebClient;UploadData;(System.Uri,System.Byte[]);Argument[0];Argument[this];taint;df-generated |
-| System.Net;WebClient;UploadData;(System.Uri,System.String,System.Byte[]);Argument[0];Argument[this];taint;df-generated |
 | System.Net;WebClient;UploadData;(System.Uri,System.String,System.Byte[]);Argument[1];Argument[this];taint;df-generated |
-| System.Net;WebClient;UploadDataAsync;(System.Uri,System.Byte[]);Argument[0];Argument[this];taint;df-generated |
-| System.Net;WebClient;UploadDataAsync;(System.Uri,System.String,System.Byte[]);Argument[0];Argument[this];taint;df-generated |
 | System.Net;WebClient;UploadDataAsync;(System.Uri,System.String,System.Byte[]);Argument[1];Argument[this];taint;df-generated |
-| System.Net;WebClient;UploadDataAsync;(System.Uri,System.String,System.Byte[],System.Object);Argument[0];Argument[this];taint;df-generated |
 | System.Net;WebClient;UploadDataAsync;(System.Uri,System.String,System.Byte[],System.Object);Argument[1];Argument[this];taint;df-generated |
-| System.Net;WebClient;UploadDataTaskAsync;(System.String,System.Byte[]);Argument[0];Argument[this];taint;df-generated |
-| System.Net;WebClient;UploadDataTaskAsync;(System.String,System.String,System.Byte[]);Argument[0];Argument[this];taint;df-generated |
 | System.Net;WebClient;UploadDataTaskAsync;(System.String,System.String,System.Byte[]);Argument[1];Argument[this];taint;df-generated |
-| System.Net;WebClient;UploadDataTaskAsync;(System.Uri,System.Byte[]);Argument[0];Argument[this];taint;df-generated |
-| System.Net;WebClient;UploadDataTaskAsync;(System.Uri,System.String,System.Byte[]);Argument[0];Argument[this];taint;df-generated |
 | System.Net;WebClient;UploadDataTaskAsync;(System.Uri,System.String,System.Byte[]);Argument[1];Argument[this];taint;df-generated |
-| System.Net;WebClient;UploadFile;(System.String,System.String);Argument[0];Argument[this];taint;df-generated |
-| System.Net;WebClient;UploadFile;(System.String,System.String,System.String);Argument[0];Argument[this];taint;df-generated |
 | System.Net;WebClient;UploadFile;(System.String,System.String,System.String);Argument[1];Argument[this];taint;df-generated |
-| System.Net;WebClient;UploadFile;(System.Uri,System.String);Argument[0];Argument[this];taint;df-generated |
-| System.Net;WebClient;UploadFile;(System.Uri,System.String,System.String);Argument[0];Argument[this];taint;df-generated |
 | System.Net;WebClient;UploadFile;(System.Uri,System.String,System.String);Argument[1];Argument[this];taint;df-generated |
-| System.Net;WebClient;UploadFileAsync;(System.Uri,System.String);Argument[0];Argument[this];taint;df-generated |
-| System.Net;WebClient;UploadFileAsync;(System.Uri,System.String,System.String);Argument[0];Argument[this];taint;df-generated |
 | System.Net;WebClient;UploadFileAsync;(System.Uri,System.String,System.String);Argument[1];Argument[this];taint;df-generated |
-| System.Net;WebClient;UploadFileAsync;(System.Uri,System.String,System.String,System.Object);Argument[0];Argument[this];taint;df-generated |
 | System.Net;WebClient;UploadFileAsync;(System.Uri,System.String,System.String,System.Object);Argument[1];Argument[this];taint;df-generated |
-| System.Net;WebClient;UploadFileTaskAsync;(System.String,System.String);Argument[0];Argument[this];taint;df-generated |
-| System.Net;WebClient;UploadFileTaskAsync;(System.String,System.String,System.String);Argument[0];Argument[this];taint;df-generated |
 | System.Net;WebClient;UploadFileTaskAsync;(System.String,System.String,System.String);Argument[1];Argument[this];taint;df-generated |
-| System.Net;WebClient;UploadFileTaskAsync;(System.Uri,System.String);Argument[0];Argument[this];taint;df-generated |
-| System.Net;WebClient;UploadFileTaskAsync;(System.Uri,System.String,System.String);Argument[0];Argument[this];taint;df-generated |
 | System.Net;WebClient;UploadFileTaskAsync;(System.Uri,System.String,System.String);Argument[1];Argument[this];taint;df-generated |
-| System.Net;WebClient;UploadString;(System.String,System.String);Argument[0];Argument[this];taint;df-generated |
-| System.Net;WebClient;UploadString;(System.String,System.String,System.String);Argument[0];Argument[this];taint;df-generated |
 | System.Net;WebClient;UploadString;(System.String,System.String,System.String);Argument[1];Argument[this];taint;df-generated |
-| System.Net;WebClient;UploadString;(System.Uri,System.String);Argument[0];Argument[this];taint;df-generated |
-| System.Net;WebClient;UploadString;(System.Uri,System.String,System.String);Argument[0];Argument[this];taint;df-generated |
 | System.Net;WebClient;UploadString;(System.Uri,System.String,System.String);Argument[1];Argument[this];taint;df-generated |
-| System.Net;WebClient;UploadStringAsync;(System.Uri,System.String);Argument[0];Argument[this];taint;df-generated |
-| System.Net;WebClient;UploadStringAsync;(System.Uri,System.String,System.String);Argument[0];Argument[this];taint;df-generated |
 | System.Net;WebClient;UploadStringAsync;(System.Uri,System.String,System.String);Argument[1];Argument[this];taint;df-generated |
-| System.Net;WebClient;UploadStringAsync;(System.Uri,System.String,System.String,System.Object);Argument[0];Argument[this];taint;df-generated |
 | System.Net;WebClient;UploadStringAsync;(System.Uri,System.String,System.String,System.Object);Argument[1];Argument[this];taint;df-generated |
-| System.Net;WebClient;UploadStringTaskAsync;(System.String,System.String);Argument[0];Argument[this];taint;df-generated |
-| System.Net;WebClient;UploadStringTaskAsync;(System.String,System.String,System.String);Argument[0];Argument[this];taint;df-generated |
 | System.Net;WebClient;UploadStringTaskAsync;(System.String,System.String,System.String);Argument[1];Argument[this];taint;df-generated |
-| System.Net;WebClient;UploadStringTaskAsync;(System.Uri,System.String);Argument[0];Argument[this];taint;df-generated |
-| System.Net;WebClient;UploadStringTaskAsync;(System.Uri,System.String,System.String);Argument[0];Argument[this];taint;df-generated |
 | System.Net;WebClient;UploadStringTaskAsync;(System.Uri,System.String,System.String);Argument[1];Argument[this];taint;df-generated |
-| System.Net;WebClient;UploadValues;(System.String,System.Collections.Specialized.NameValueCollection);Argument[0];Argument[this];taint;df-generated |
-| System.Net;WebClient;UploadValues;(System.String,System.String,System.Collections.Specialized.NameValueCollection);Argument[0];Argument[this];taint;df-generated |
 | System.Net;WebClient;UploadValues;(System.String,System.String,System.Collections.Specialized.NameValueCollection);Argument[1];Argument[this];taint;df-generated |
-| System.Net;WebClient;UploadValues;(System.Uri,System.Collections.Specialized.NameValueCollection);Argument[0];Argument[this];taint;df-generated |
-| System.Net;WebClient;UploadValues;(System.Uri,System.String,System.Collections.Specialized.NameValueCollection);Argument[0];Argument[this];taint;df-generated |
 | System.Net;WebClient;UploadValues;(System.Uri,System.String,System.Collections.Specialized.NameValueCollection);Argument[1];Argument[this];taint;df-generated |
-| System.Net;WebClient;UploadValuesAsync;(System.Uri,System.Collections.Specialized.NameValueCollection);Argument[0];Argument[this];taint;df-generated |
-| System.Net;WebClient;UploadValuesAsync;(System.Uri,System.String,System.Collections.Specialized.NameValueCollection);Argument[0];Argument[this];taint;df-generated |
 | System.Net;WebClient;UploadValuesAsync;(System.Uri,System.String,System.Collections.Specialized.NameValueCollection);Argument[1];Argument[this];taint;df-generated |
-| System.Net;WebClient;UploadValuesAsync;(System.Uri,System.String,System.Collections.Specialized.NameValueCollection,System.Object);Argument[0];Argument[this];taint;df-generated |
 | System.Net;WebClient;UploadValuesAsync;(System.Uri,System.String,System.Collections.Specialized.NameValueCollection,System.Object);Argument[1];Argument[this];taint;df-generated |
-| System.Net;WebClient;UploadValuesTaskAsync;(System.String,System.Collections.Specialized.NameValueCollection);Argument[0];Argument[this];taint;df-generated |
-| System.Net;WebClient;UploadValuesTaskAsync;(System.String,System.String,System.Collections.Specialized.NameValueCollection);Argument[0];Argument[this];taint;df-generated |
 | System.Net;WebClient;UploadValuesTaskAsync;(System.String,System.String,System.Collections.Specialized.NameValueCollection);Argument[1];Argument[this];taint;df-generated |
-| System.Net;WebClient;UploadValuesTaskAsync;(System.Uri,System.Collections.Specialized.NameValueCollection);Argument[0];Argument[this];taint;df-generated |
-| System.Net;WebClient;UploadValuesTaskAsync;(System.Uri,System.String,System.Collections.Specialized.NameValueCollection);Argument[0];Argument[this];taint;df-generated |
 | System.Net;WebClient;UploadValuesTaskAsync;(System.Uri,System.String,System.Collections.Specialized.NameValueCollection);Argument[1];Argument[this];taint;df-generated |
 | System.Net;WebClient;add_DownloadDataCompleted;(System.Net.DownloadDataCompletedEventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Net;WebClient;add_DownloadFileCompleted;(System.ComponentModel.AsyncCompletedEventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
@@ -13981,8 +14291,8 @@ summary
 | System.Net;WebClient;remove_UploadValuesCompleted;(System.Net.UploadValuesCompletedEventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Net;WebClient;remove_WriteStreamClosed;(System.Net.WriteStreamClosedEventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Net;WebException;GetObjectData;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);Argument[this];Argument[0];taint;df-generated |
-| System.Net;WebException;WebException;(System.String,System.Exception,System.Net.WebExceptionStatus,System.Net.WebResponse);Argument[3];Argument[this];taint;df-generated |
-| System.Net;WebException;get_Response;();Argument[this];ReturnValue;taint;df-generated |
+| System.Net;WebException;WebException;(System.String,System.Exception,System.Net.WebExceptionStatus,System.Net.WebResponse);Argument[3];Argument[this].SyntheticField[System.Net.WebException._response];value;dfc-generated |
+| System.Net;WebException;get_Response;();Argument[this].SyntheticField[System.Net.WebException._response];ReturnValue;value;dfc-generated |
 | System.Net;WebHeaderCollection;Add;(System.String);Argument[0];Argument[this].Element;value;manual |
 | System.Net;WebHeaderCollection;Add;(System.String,System.String);Argument[0];Argument[this];taint;df-generated |
 | System.Net;WebHeaderCollection;Clear;();Argument[this].WithoutElement;Argument[this];value;manual |
@@ -13998,123 +14308,112 @@ summary
 | System.Net;WebHeaderCollection;get_Item;(System.Net.HttpRequestHeader);Argument[this];ReturnValue;taint;df-generated |
 | System.Net;WebHeaderCollection;get_Item;(System.Net.HttpResponseHeader);Argument[this];ReturnValue;taint;df-generated |
 | System.Net;WebHeaderCollection;get_Keys;();Argument[this];ReturnValue;taint;df-generated |
-| System.Net;WebPermission;Copy;();Argument[this];ReturnValue;taint;df-generated |
-| System.Net;WebPermission;Copy;();Argument[this];ReturnValue;value;df-generated |
-| System.Net;WebPermission;Intersect;(System.Security.IPermission);Argument[0];ReturnValue;taint;df-generated |
-| System.Net;WebPermission;Intersect;(System.Security.IPermission);Argument[this];ReturnValue;taint;df-generated |
+| System.Net;WebPermission;Copy;();Argument[this];ReturnValue;value;dfc-generated |
+| System.Net;WebPermission;Intersect;(System.Security.IPermission);Argument[0];ReturnValue;value;dfc-generated |
 | System.Net;WebPermission;Union;(System.Security.IPermission);Argument[this];ReturnValue;taint;df-generated |
 | System.Net;WebProxy;GetObjectData;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);Argument[this];Argument[0];taint;df-generated |
-| System.Net;WebProxy;GetProxy;(System.Uri);Argument[0];ReturnValue;taint;df-generated |
-| System.Net;WebProxy;GetProxy;(System.Uri);Argument[this];ReturnValue;taint;df-generated |
+| System.Net;WebProxy;GetProxy;(System.Uri);Argument[0];ReturnValue;value;dfc-generated |
+| System.Net;WebProxy;GetProxy;(System.Uri);Argument[this].Property[System.Net.WebProxy.Address];ReturnValue;value;dfc-generated |
 | System.Net;WebRequest;BeginGetRequestStream;(System.AsyncCallback,System.Object);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Net;WebRequest;BeginGetResponse;(System.AsyncCallback,System.Object);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Net;WebRequest;Create;(System.String);Argument[0];ReturnValue;taint;df-generated |
 | System.Net;WebRequest;Create;(System.Uri);Argument[0];ReturnValue;taint;df-generated |
 | System.Net;WebRequest;CreateDefault;(System.Uri);Argument[0];ReturnValue;taint;df-generated |
-| System.Net;WebRequest;CreateHttp;(System.String);Argument[0];ReturnValue;taint;df-generated |
-| System.Net;WebRequest;CreateHttp;(System.Uri);Argument[0];ReturnValue;taint;df-generated |
-| System.Net;WebRequest;EndGetRequestStream;(System.IAsyncResult);Argument[0];ReturnValue;taint;df-generated |
+| System.Net;WebRequest;CreateHttp;(System.String);Argument[0];ReturnValue.SyntheticField[System.Net.HttpWebRequest._requestUri];taint;dfc-generated |
+| System.Net;WebRequest;CreateHttp;(System.Uri);Argument[0];ReturnValue.SyntheticField[System.Net.HttpWebRequest._requestUri];value;dfc-generated |
 | System.Net;WebRequest;EndGetRequestStream;(System.IAsyncResult);Argument[this];ReturnValue;taint;df-generated |
-| System.Net;WebRequest;EndGetResponse;(System.IAsyncResult);Argument[0];ReturnValue;taint;df-generated |
 | System.Net;WebRequest;EndGetResponse;(System.IAsyncResult);Argument[this];ReturnValue;taint;df-generated |
 | System.Net;WebRequest;GetObjectData;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);Argument[this];Argument[0];taint;df-generated |
 | System.Net;WebRequest;GetRequestStream;();Argument[this];ReturnValue;taint;df-generated |
 | System.Net;WebRequest;GetRequestStreamAsync;();Argument[this];ReturnValue;taint;df-generated |
 | System.Net;WebRequest;GetResponse;();Argument[this];ReturnValue;taint;df-generated |
-| System.Net;WebRequest;get_RequestUri;();Argument[this];ReturnValue;taint;df-generated |
 | System.Net;WebResponse;GetObjectData;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);Argument[this];Argument[0];taint;df-generated |
 | System.Net;WebResponse;GetResponseStream;();Argument[this];ReturnValue;taint;df-generated |
 | System.Net;WebResponse;get_Headers;();Argument[this];ReturnValue;taint;df-generated |
 | System.Net;WebResponse;get_ResponseUri;();Argument[this];ReturnValue;taint;df-generated |
-| System.Net;WebUtility;HtmlDecode;(System.String);Argument[0];ReturnValue;taint;df-generated |
+| System.Net;WebUtility;HtmlDecode;(System.String);Argument[0];ReturnValue;value;dfc-generated |
 | System.Net;WebUtility;HtmlDecode;(System.String,System.IO.TextWriter);Argument[0];Argument[1];taint;df-generated |
 | System.Net;WebUtility;HtmlEncode;(System.String);Argument[0];ReturnValue;taint;manual |
 | System.Net;WebUtility;HtmlEncode;(System.String,System.IO.TextWriter);Argument[0];ReturnValue;taint;manual |
-| System.Net;WebUtility;UrlDecode;(System.String);Argument[0];ReturnValue;taint;df-generated |
+| System.Net;WebUtility;UrlDecode;(System.String);Argument[0];ReturnValue;value;dfc-generated |
 | System.Net;WebUtility;UrlEncode;(System.String);Argument[0];ReturnValue;taint;manual |
 | System.Net;WriteStreamClosedEventHandler;BeginInvoke;(System.Object,System.Net.WriteStreamClosedEventArgs,System.AsyncCallback,System.Object);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
-| System.Numerics;BigInteger;Abs;(System.Numerics.BigInteger);Argument[0];ReturnValue;taint;df-generated |
-| System.Numerics;BigInteger;Clamp;(System.Numerics.BigInteger,System.Numerics.BigInteger,System.Numerics.BigInteger);Argument[0];ReturnValue;taint;df-generated |
-| System.Numerics;BigInteger;Clamp;(System.Numerics.BigInteger,System.Numerics.BigInteger,System.Numerics.BigInteger);Argument[1];ReturnValue;taint;df-generated |
-| System.Numerics;BigInteger;Clamp;(System.Numerics.BigInteger,System.Numerics.BigInteger,System.Numerics.BigInteger);Argument[2];ReturnValue;taint;df-generated |
-| System.Numerics;BigInteger;CopySign;(System.Numerics.BigInteger,System.Numerics.BigInteger);Argument[0];ReturnValue;taint;df-generated |
-| System.Numerics;BigInteger;CreateChecked<TOther>;(TOther);Argument[0];ReturnValue;taint;df-generated |
-| System.Numerics;BigInteger;CreateSaturating<TOther>;(TOther);Argument[0];ReturnValue;taint;df-generated |
-| System.Numerics;BigInteger;CreateTruncating<TOther>;(TOther);Argument[0];ReturnValue;taint;df-generated |
-| System.Numerics;BigInteger;DivRem;(System.Numerics.BigInteger,System.Numerics.BigInteger);Argument[0];ReturnValue;taint;df-generated |
-| System.Numerics;BigInteger;DivRem;(System.Numerics.BigInteger,System.Numerics.BigInteger,System.Numerics.BigInteger);Argument[0];ReturnValue;taint;df-generated |
-| System.Numerics;BigInteger;Max;(System.Numerics.BigInteger,System.Numerics.BigInteger);Argument[0];ReturnValue;taint;df-generated |
-| System.Numerics;BigInteger;Max;(System.Numerics.BigInteger,System.Numerics.BigInteger);Argument[1];ReturnValue;taint;df-generated |
-| System.Numerics;BigInteger;MaxMagnitude;(System.Numerics.BigInteger,System.Numerics.BigInteger);Argument[0];ReturnValue;taint;df-generated |
-| System.Numerics;BigInteger;MaxMagnitude;(System.Numerics.BigInteger,System.Numerics.BigInteger);Argument[1];ReturnValue;taint;df-generated |
-| System.Numerics;BigInteger;MaxMagnitudeNumber;(System.Numerics.BigInteger,System.Numerics.BigInteger);Argument[0];ReturnValue;taint;df-generated |
-| System.Numerics;BigInteger;MaxMagnitudeNumber;(System.Numerics.BigInteger,System.Numerics.BigInteger);Argument[1];ReturnValue;taint;df-generated |
-| System.Numerics;BigInteger;MaxNumber;(System.Numerics.BigInteger,System.Numerics.BigInteger);Argument[0];ReturnValue;taint;df-generated |
-| System.Numerics;BigInteger;MaxNumber;(System.Numerics.BigInteger,System.Numerics.BigInteger);Argument[1];ReturnValue;taint;df-generated |
-| System.Numerics;BigInteger;Min;(System.Numerics.BigInteger,System.Numerics.BigInteger);Argument[0];ReturnValue;taint;df-generated |
-| System.Numerics;BigInteger;Min;(System.Numerics.BigInteger,System.Numerics.BigInteger);Argument[1];ReturnValue;taint;df-generated |
-| System.Numerics;BigInteger;MinMagnitude;(System.Numerics.BigInteger,System.Numerics.BigInteger);Argument[0];ReturnValue;taint;df-generated |
-| System.Numerics;BigInteger;MinMagnitude;(System.Numerics.BigInteger,System.Numerics.BigInteger);Argument[1];ReturnValue;taint;df-generated |
-| System.Numerics;BigInteger;MinMagnitudeNumber;(System.Numerics.BigInteger,System.Numerics.BigInteger);Argument[0];ReturnValue;taint;df-generated |
-| System.Numerics;BigInteger;MinMagnitudeNumber;(System.Numerics.BigInteger,System.Numerics.BigInteger);Argument[1];ReturnValue;taint;df-generated |
-| System.Numerics;BigInteger;MinNumber;(System.Numerics.BigInteger,System.Numerics.BigInteger);Argument[0];ReturnValue;taint;df-generated |
-| System.Numerics;BigInteger;MinNumber;(System.Numerics.BigInteger,System.Numerics.BigInteger);Argument[1];ReturnValue;taint;df-generated |
-| System.Numerics;BigInteger;Pow;(System.Numerics.BigInteger,System.Int32);Argument[0];ReturnValue;taint;df-generated |
-| System.Numerics;BigInteger;Remainder;(System.Numerics.BigInteger,System.Numerics.BigInteger);Argument[0];ReturnValue;taint;df-generated |
-| System.Numerics;BigInteger;RotateLeft;(System.Numerics.BigInteger,System.Int32);Argument[0];ReturnValue;taint;df-generated |
-| System.Numerics;BigInteger;RotateRight;(System.Numerics.BigInteger,System.Int32);Argument[0];ReturnValue;taint;df-generated |
-| System.Numerics;BigInteger;ToString;(System.String,System.IFormatProvider);Argument[1];ReturnValue;taint;df-generated |
-| System.Numerics;BigInteger;ToString;(System.String,System.IFormatProvider);Argument[this];ReturnValue;taint;df-generated |
-| System.Numerics;Complex;CreateChecked<TOther>;(TOther);Argument[0];ReturnValue;taint;df-generated |
-| System.Numerics;Complex;CreateSaturating<TOther>;(TOther);Argument[0];ReturnValue;taint;df-generated |
-| System.Numerics;Complex;CreateTruncating<TOther>;(TOther);Argument[0];ReturnValue;taint;df-generated |
-| System.Numerics;Complex;MaxMagnitude;(System.Numerics.Complex,System.Numerics.Complex);Argument[0];ReturnValue;taint;df-generated |
-| System.Numerics;Complex;MaxMagnitude;(System.Numerics.Complex,System.Numerics.Complex);Argument[1];ReturnValue;taint;df-generated |
-| System.Numerics;Complex;MaxMagnitudeNumber;(System.Numerics.Complex,System.Numerics.Complex);Argument[0];ReturnValue;taint;df-generated |
-| System.Numerics;Complex;MaxMagnitudeNumber;(System.Numerics.Complex,System.Numerics.Complex);Argument[1];ReturnValue;taint;df-generated |
-| System.Numerics;Complex;MinMagnitude;(System.Numerics.Complex,System.Numerics.Complex);Argument[0];ReturnValue;taint;df-generated |
-| System.Numerics;Complex;MinMagnitude;(System.Numerics.Complex,System.Numerics.Complex);Argument[1];ReturnValue;taint;df-generated |
-| System.Numerics;Complex;MinMagnitudeNumber;(System.Numerics.Complex,System.Numerics.Complex);Argument[0];ReturnValue;taint;df-generated |
-| System.Numerics;Complex;MinMagnitudeNumber;(System.Numerics.Complex,System.Numerics.Complex);Argument[1];ReturnValue;taint;df-generated |
-| System.Numerics;Complex;ToString;(System.String,System.IFormatProvider);Argument[1];ReturnValue;taint;df-generated |
-| System.Numerics;Complex;ToString;(System.String,System.IFormatProvider);Argument[this];ReturnValue;taint;df-generated |
-| System.Numerics;IAdditionOperators<TSelf,TOther,TResult>;op_CheckedAddition;(TSelf,TOther);Argument[0];ReturnValue;taint;df-generated |
-| System.Numerics;IAdditionOperators<TSelf,TOther,TResult>;op_CheckedAddition;(TSelf,TOther);Argument[1];ReturnValue;taint;df-generated |
-| System.Numerics;INumber<TSelf>;Clamp;(TSelf,TSelf,TSelf);Argument[0];ReturnValue;taint;df-generated |
-| System.Numerics;INumber<TSelf>;Clamp;(TSelf,TSelf,TSelf);Argument[1];ReturnValue;taint;df-generated |
-| System.Numerics;INumber<TSelf>;Clamp;(TSelf,TSelf,TSelf);Argument[2];ReturnValue;taint;df-generated |
-| System.Numerics;INumber<TSelf>;CopySign;(TSelf,TSelf);Argument[0];ReturnValue;taint;df-generated |
-| System.Numerics;INumber<TSelf>;Max;(TSelf,TSelf);Argument[0];ReturnValue;taint;df-generated |
-| System.Numerics;INumber<TSelf>;Max;(TSelf,TSelf);Argument[1];ReturnValue;taint;df-generated |
-| System.Numerics;INumber<TSelf>;MaxNumber;(TSelf,TSelf);Argument[0];ReturnValue;taint;df-generated |
-| System.Numerics;INumber<TSelf>;MaxNumber;(TSelf,TSelf);Argument[1];ReturnValue;taint;df-generated |
-| System.Numerics;INumber<TSelf>;Min;(TSelf,TSelf);Argument[0];ReturnValue;taint;df-generated |
-| System.Numerics;INumber<TSelf>;Min;(TSelf,TSelf);Argument[1];ReturnValue;taint;df-generated |
-| System.Numerics;INumber<TSelf>;MinNumber;(TSelf,TSelf);Argument[0];ReturnValue;taint;df-generated |
-| System.Numerics;INumber<TSelf>;MinNumber;(TSelf,TSelf);Argument[1];ReturnValue;taint;df-generated |
-| System.Numerics;INumberBase<TSelf>;CreateChecked<TOther>;(TOther);Argument[0];ReturnValue;taint;df-generated |
-| System.Numerics;INumberBase<TSelf>;CreateSaturating<TOther>;(TOther);Argument[0];ReturnValue;taint;df-generated |
-| System.Numerics;INumberBase<TSelf>;CreateTruncating<TOther>;(TOther);Argument[0];ReturnValue;taint;df-generated |
-| System.Numerics;Plane;Normalize;(System.Numerics.Plane);Argument[0];ReturnValue;taint;df-generated |
-| System.Numerics;Plane;Plane;(System.Numerics.Vector3,System.Single);Argument[0];Argument[this];taint;df-generated |
-| System.Numerics;Plane;ToString;();Argument[this];ReturnValue;taint;df-generated |
-| System.Numerics;Vector2;ToString;(System.String,System.IFormatProvider);Argument[1];ReturnValue;taint;df-generated |
-| System.Numerics;Vector2;ToString;(System.String,System.IFormatProvider);Argument[this];ReturnValue;taint;df-generated |
-| System.Numerics;Vector3;ToString;(System.String,System.IFormatProvider);Argument[1];ReturnValue;taint;df-generated |
-| System.Numerics;Vector3;ToString;(System.String,System.IFormatProvider);Argument[this];ReturnValue;taint;df-generated |
-| System.Numerics;Vector4;ToString;(System.String,System.IFormatProvider);Argument[1];ReturnValue;taint;df-generated |
-| System.Numerics;Vector4;ToString;(System.String,System.IFormatProvider);Argument[this];ReturnValue;taint;df-generated |
-| System.Numerics;Vector;Abs<T>;(System.Numerics.Vector<T>);Argument[0];ReturnValue;taint;df-generated |
-| System.Numerics;Vector;WithElement<T>;(System.Numerics.Vector<T>,System.Int32,T);Argument[0];ReturnValue;taint;df-generated |
-| System.Numerics;Vector<T>;ToString;(System.String,System.IFormatProvider);Argument[1];ReturnValue;taint;df-generated |
-| System.Numerics;Vector<T>;ToString;(System.String,System.IFormatProvider);Argument[this];ReturnValue;taint;df-generated |
-| System.Numerics;Vector<T>;op_UnaryPlus;(System.Numerics.Vector<T>);Argument[0];ReturnValue;taint;df-generated |
+| System.Numerics;BigInteger;Abs;(System.Numerics.BigInteger);Argument[0];ReturnValue;value;dfc-generated |
+| System.Numerics;BigInteger;Clamp;(System.Numerics.BigInteger,System.Numerics.BigInteger,System.Numerics.BigInteger);Argument[0];ReturnValue;value;dfc-generated |
+| System.Numerics;BigInteger;Clamp;(System.Numerics.BigInteger,System.Numerics.BigInteger,System.Numerics.BigInteger);Argument[1];ReturnValue;value;dfc-generated |
+| System.Numerics;BigInteger;Clamp;(System.Numerics.BigInteger,System.Numerics.BigInteger,System.Numerics.BigInteger);Argument[2];ReturnValue;value;dfc-generated |
+| System.Numerics;BigInteger;CopySign;(System.Numerics.BigInteger,System.Numerics.BigInteger);Argument[0];ReturnValue;value;dfc-generated |
+| System.Numerics;BigInteger;CreateChecked<TOther>;(TOther);Argument[0];ReturnValue;value;dfc-generated |
+| System.Numerics;BigInteger;CreateSaturating<TOther>;(TOther);Argument[0];ReturnValue;value;dfc-generated |
+| System.Numerics;BigInteger;CreateTruncating<TOther>;(TOther);Argument[0];ReturnValue;value;dfc-generated |
+| System.Numerics;BigInteger;DivRem;(System.Numerics.BigInteger,System.Numerics.BigInteger);Argument[0];ReturnValue.Field[System.ValueTuple`2.Item2];value;dfc-generated |
+| System.Numerics;BigInteger;DivRem;(System.Numerics.BigInteger,System.Numerics.BigInteger,System.Numerics.BigInteger);Argument[0];ReturnValue;value;dfc-generated |
+| System.Numerics;BigInteger;Max;(System.Numerics.BigInteger,System.Numerics.BigInteger);Argument[0];ReturnValue;value;dfc-generated |
+| System.Numerics;BigInteger;Max;(System.Numerics.BigInteger,System.Numerics.BigInteger);Argument[1];ReturnValue;value;dfc-generated |
+| System.Numerics;BigInteger;MaxMagnitude;(System.Numerics.BigInteger,System.Numerics.BigInteger);Argument[0];ReturnValue;value;dfc-generated |
+| System.Numerics;BigInteger;MaxMagnitude;(System.Numerics.BigInteger,System.Numerics.BigInteger);Argument[1];ReturnValue;value;dfc-generated |
+| System.Numerics;BigInteger;MaxMagnitudeNumber;(System.Numerics.BigInteger,System.Numerics.BigInteger);Argument[0];ReturnValue;value;dfc-generated |
+| System.Numerics;BigInteger;MaxMagnitudeNumber;(System.Numerics.BigInteger,System.Numerics.BigInteger);Argument[1];ReturnValue;value;dfc-generated |
+| System.Numerics;BigInteger;MaxNumber;(System.Numerics.BigInteger,System.Numerics.BigInteger);Argument[0];ReturnValue;value;dfc-generated |
+| System.Numerics;BigInteger;MaxNumber;(System.Numerics.BigInteger,System.Numerics.BigInteger);Argument[1];ReturnValue;value;dfc-generated |
+| System.Numerics;BigInteger;Min;(System.Numerics.BigInteger,System.Numerics.BigInteger);Argument[0];ReturnValue;value;dfc-generated |
+| System.Numerics;BigInteger;Min;(System.Numerics.BigInteger,System.Numerics.BigInteger);Argument[1];ReturnValue;value;dfc-generated |
+| System.Numerics;BigInteger;MinMagnitude;(System.Numerics.BigInteger,System.Numerics.BigInteger);Argument[0];ReturnValue;value;dfc-generated |
+| System.Numerics;BigInteger;MinMagnitude;(System.Numerics.BigInteger,System.Numerics.BigInteger);Argument[1];ReturnValue;value;dfc-generated |
+| System.Numerics;BigInteger;MinMagnitudeNumber;(System.Numerics.BigInteger,System.Numerics.BigInteger);Argument[0];ReturnValue;value;dfc-generated |
+| System.Numerics;BigInteger;MinMagnitudeNumber;(System.Numerics.BigInteger,System.Numerics.BigInteger);Argument[1];ReturnValue;value;dfc-generated |
+| System.Numerics;BigInteger;MinNumber;(System.Numerics.BigInteger,System.Numerics.BigInteger);Argument[0];ReturnValue;value;dfc-generated |
+| System.Numerics;BigInteger;MinNumber;(System.Numerics.BigInteger,System.Numerics.BigInteger);Argument[1];ReturnValue;value;dfc-generated |
+| System.Numerics;BigInteger;Pow;(System.Numerics.BigInteger,System.Int32);Argument[0];ReturnValue;value;dfc-generated |
+| System.Numerics;BigInteger;Remainder;(System.Numerics.BigInteger,System.Numerics.BigInteger);Argument[0];ReturnValue;value;dfc-generated |
+| System.Numerics;BigInteger;RotateLeft;(System.Numerics.BigInteger,System.Int32);Argument[0];ReturnValue;value;dfc-generated |
+| System.Numerics;BigInteger;RotateRight;(System.Numerics.BigInteger,System.Int32);Argument[0];ReturnValue;value;dfc-generated |
+| System.Numerics;BigInteger;ToString;(System.String,System.IFormatProvider);Argument[this];ReturnValue;taint;dfc-generated |
+| System.Numerics;Complex;CreateChecked<TOther>;(TOther);Argument[0];ReturnValue;value;dfc-generated |
+| System.Numerics;Complex;CreateSaturating<TOther>;(TOther);Argument[0];ReturnValue;value;dfc-generated |
+| System.Numerics;Complex;CreateTruncating<TOther>;(TOther);Argument[0];ReturnValue;value;dfc-generated |
+| System.Numerics;Complex;MaxMagnitude;(System.Numerics.Complex,System.Numerics.Complex);Argument[0];ReturnValue;value;dfc-generated |
+| System.Numerics;Complex;MaxMagnitude;(System.Numerics.Complex,System.Numerics.Complex);Argument[1];ReturnValue;value;dfc-generated |
+| System.Numerics;Complex;MaxMagnitudeNumber;(System.Numerics.Complex,System.Numerics.Complex);Argument[0];ReturnValue;value;dfc-generated |
+| System.Numerics;Complex;MaxMagnitudeNumber;(System.Numerics.Complex,System.Numerics.Complex);Argument[1];ReturnValue;value;dfc-generated |
+| System.Numerics;Complex;MinMagnitude;(System.Numerics.Complex,System.Numerics.Complex);Argument[0];ReturnValue;value;dfc-generated |
+| System.Numerics;Complex;MinMagnitude;(System.Numerics.Complex,System.Numerics.Complex);Argument[1];ReturnValue;value;dfc-generated |
+| System.Numerics;Complex;MinMagnitudeNumber;(System.Numerics.Complex,System.Numerics.Complex);Argument[0];ReturnValue;value;dfc-generated |
+| System.Numerics;Complex;MinMagnitudeNumber;(System.Numerics.Complex,System.Numerics.Complex);Argument[1];ReturnValue;value;dfc-generated |
+| System.Numerics;Complex;ToString;(System.String,System.IFormatProvider);Argument[this];ReturnValue;taint;dfc-generated |
+| System.Numerics;IAdditionOperators<TSelf,TOther,TResult>;op_CheckedAddition;(TSelf,TOther);Argument[0];ReturnValue;taint;dfc-generated |
+| System.Numerics;IAdditionOperators<TSelf,TOther,TResult>;op_CheckedAddition;(TSelf,TOther);Argument[1];ReturnValue;taint;dfc-generated |
+| System.Numerics;INumber<TSelf>;Clamp;(TSelf,TSelf,TSelf);Argument[0];ReturnValue;value;dfc-generated |
+| System.Numerics;INumber<TSelf>;Clamp;(TSelf,TSelf,TSelf);Argument[1];ReturnValue;value;dfc-generated |
+| System.Numerics;INumber<TSelf>;Clamp;(TSelf,TSelf,TSelf);Argument[2];ReturnValue;value;dfc-generated |
+| System.Numerics;INumber<TSelf>;CopySign;(TSelf,TSelf);Argument[0];ReturnValue;value;dfc-generated |
+| System.Numerics;INumber<TSelf>;Max;(TSelf,TSelf);Argument[0];ReturnValue;value;dfc-generated |
+| System.Numerics;INumber<TSelf>;Max;(TSelf,TSelf);Argument[1];ReturnValue;value;dfc-generated |
+| System.Numerics;INumber<TSelf>;MaxNumber;(TSelf,TSelf);Argument[0];ReturnValue;value;dfc-generated |
+| System.Numerics;INumber<TSelf>;MaxNumber;(TSelf,TSelf);Argument[1];ReturnValue;value;dfc-generated |
+| System.Numerics;INumber<TSelf>;Min;(TSelf,TSelf);Argument[0];ReturnValue;value;dfc-generated |
+| System.Numerics;INumber<TSelf>;Min;(TSelf,TSelf);Argument[1];ReturnValue;value;dfc-generated |
+| System.Numerics;INumber<TSelf>;MinNumber;(TSelf,TSelf);Argument[0];ReturnValue;value;dfc-generated |
+| System.Numerics;INumber<TSelf>;MinNumber;(TSelf,TSelf);Argument[1];ReturnValue;value;dfc-generated |
+| System.Numerics;INumberBase<TSelf>;CreateChecked<TOther>;(TOther);Argument[0];ReturnValue;value;dfc-generated |
+| System.Numerics;INumberBase<TSelf>;CreateSaturating<TOther>;(TOther);Argument[0];ReturnValue;value;dfc-generated |
+| System.Numerics;INumberBase<TSelf>;CreateTruncating<TOther>;(TOther);Argument[0];ReturnValue;value;dfc-generated |
+| System.Numerics;Plane;Normalize;(System.Numerics.Plane);Argument[0];ReturnValue;value;dfc-generated |
+| System.Numerics;Plane;Plane;(System.Numerics.Vector3,System.Single);Argument[0];Argument[this].Field[System.Numerics.Plane.Normal];value;dfc-generated |
+| System.Numerics;Plane;ToString;();Argument[this].Field[System.Numerics.Plane.Normal];ReturnValue;taint;dfc-generated |
+| System.Numerics;Vector2;ToString;(System.String,System.IFormatProvider);Argument[this];ReturnValue;taint;dfc-generated |
+| System.Numerics;Vector3;ToString;(System.String,System.IFormatProvider);Argument[this];ReturnValue;taint;dfc-generated |
+| System.Numerics;Vector4;ToString;(System.String,System.IFormatProvider);Argument[this];ReturnValue;taint;dfc-generated |
+| System.Numerics;Vector;Abs<T>;(System.Numerics.Vector<T>);Argument[0];ReturnValue;value;dfc-generated |
+| System.Numerics;Vector;StoreUnsafe<T>;(System.Numerics.Vector<T>,T);Argument[1];ReturnValue;value;dfc-generated |
+| System.Numerics;Vector;WithElement<T>;(System.Numerics.Vector<T>,System.Int32,T);Argument[0];ReturnValue;value;dfc-generated |
+| System.Numerics;Vector<T>;ToString;(System.String,System.IFormatProvider);Argument[this];ReturnValue;taint;dfc-generated |
+| System.Numerics;Vector<T>;op_UnaryPlus;(System.Numerics.Vector<T>);Argument[0];ReturnValue;value;dfc-generated |
 | System.Reflection.Emit;AssemblyBuilder;DefineDynamicAssembly;(System.Reflection.AssemblyName,System.Reflection.Emit.AssemblyBuilderAccess);Argument[0];ReturnValue;taint;df-generated |
 | System.Reflection.Emit;AssemblyBuilder;DefineDynamicAssembly;(System.Reflection.AssemblyName,System.Reflection.Emit.AssemblyBuilderAccess,System.Collections.Generic.IEnumerable<System.Reflection.Emit.CustomAttributeBuilder>);Argument[0];ReturnValue;taint;df-generated |
 | System.Reflection.Emit;AssemblyBuilder;DefineDynamicModuleCore;(System.String);Argument[0];Argument[this];taint;df-generated |
 | System.Reflection.Emit;AssemblyBuilder;DefineDynamicModuleCore;(System.String);Argument[0];ReturnValue;taint;df-generated |
 | System.Reflection.Emit;AssemblyBuilder;DefineDynamicModuleCore;(System.String);Argument[this];ReturnValue;taint;df-generated |
-| System.Reflection.Emit;AssemblyBuilder;GetCustomAttributes;(System.Boolean);Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection.Emit;AssemblyBuilder;GetDynamicModuleCore;(System.String);Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection.Emit;AssemblyBuilder;GetFile;(System.String);Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection.Emit;AssemblyBuilder;GetLoadedModules;(System.Boolean);Argument[this];ReturnValue;taint;df-generated |
@@ -14124,7 +14423,6 @@ summary
 | System.Reflection.Emit;AssemblyBuilder;GetModules;(System.Boolean);Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection.Emit;AssemblyBuilder;GetSatelliteAssembly;(System.Globalization.CultureInfo);Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection.Emit;AssemblyBuilder;GetSatelliteAssembly;(System.Globalization.CultureInfo,System.Version);Argument[this];ReturnValue;taint;df-generated |
-| System.Reflection.Emit;AssemblyBuilder;GetType;(System.String,System.Boolean,System.Boolean);Argument[0];ReturnValue;taint;df-generated |
 | System.Reflection.Emit;AssemblyBuilder;GetType;(System.String,System.Boolean,System.Boolean);Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection.Emit;AssemblyBuilder;get_CodeBase;();Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection.Emit;AssemblyBuilder;get_EntryPoint;();Argument[this];ReturnValue;taint;df-generated |
@@ -14133,9 +14431,11 @@ summary
 | System.Reflection.Emit;AssemblyBuilder;get_ManifestModule;();Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection.Emit;ConstructorBuilder;DefineParameterCore;(System.Int32,System.Reflection.ParameterAttributes,System.String);Argument[2];ReturnValue;taint;df-generated |
 | System.Reflection.Emit;ConstructorBuilder;DefineParameterCore;(System.Int32,System.Reflection.ParameterAttributes,System.String);Argument[this];ReturnValue;taint;df-generated |
-| System.Reflection.Emit;ConstructorBuilder;GetCustomAttributes;(System.Boolean);Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection.Emit;ConstructorBuilder;GetILGeneratorCore;(System.Int32);Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection.Emit;ConstructorBuilder;GetParameters;();Argument[this];ReturnValue;taint;df-generated |
+| System.Reflection.Emit;ConstructorBuilder;Invoke;(System.Object,System.Reflection.BindingFlags,System.Reflection.Binder,System.Object[],System.Globalization.CultureInfo);Argument[0];Argument[this];taint;df-generated |
+| System.Reflection.Emit;ConstructorBuilder;Invoke;(System.Object,System.Reflection.BindingFlags,System.Reflection.Binder,System.Object[],System.Globalization.CultureInfo);Argument[3].Element;Argument[this];taint;df-generated |
+| System.Reflection.Emit;ConstructorBuilder;Invoke;(System.Object,System.Reflection.BindingFlags,System.Reflection.Binder,System.Object[],System.Globalization.CultureInfo);Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection.Emit;ConstructorBuilder;get_DeclaringType;();Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection.Emit;ConstructorBuilder;get_MethodHandle;();Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection.Emit;ConstructorBuilder;get_Module;();Argument[this];ReturnValue;taint;df-generated |
@@ -14159,31 +14459,43 @@ summary
 | System.Reflection.Emit;CustomAttributeBuilder;CustomAttributeBuilder;(System.Reflection.ConstructorInfo,System.Object[],System.Reflection.PropertyInfo[],System.Object[],System.Reflection.FieldInfo[],System.Object[]);Argument[5].Element;Argument[this];taint;df-generated |
 | System.Reflection.Emit;DynamicILInfo;get_DynamicMethod;();Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection.Emit;DynamicMethod;CreateDelegate;(System.Type);Argument[this];ReturnValue;taint;df-generated |
-| System.Reflection.Emit;DynamicMethod;DynamicMethod;(System.String,System.Reflection.MethodAttributes,System.Reflection.CallingConventions,System.Type,System.Type[],System.Reflection.Module,System.Boolean);Argument[0];Argument[this];taint;df-generated |
-| System.Reflection.Emit;DynamicMethod;DynamicMethod;(System.String,System.Reflection.MethodAttributes,System.Reflection.CallingConventions,System.Type,System.Type[],System.Reflection.Module,System.Boolean);Argument[5];Argument[this];taint;df-generated |
-| System.Reflection.Emit;DynamicMethod;DynamicMethod;(System.String,System.Reflection.MethodAttributes,System.Reflection.CallingConventions,System.Type,System.Type[],System.Type,System.Boolean);Argument[0];Argument[this];taint;df-generated |
-| System.Reflection.Emit;DynamicMethod;DynamicMethod;(System.String,System.Type,System.Type[]);Argument[0];Argument[this];taint;df-generated |
-| System.Reflection.Emit;DynamicMethod;DynamicMethod;(System.String,System.Type,System.Type[],System.Boolean);Argument[0];Argument[this];taint;df-generated |
-| System.Reflection.Emit;DynamicMethod;DynamicMethod;(System.String,System.Type,System.Type[],System.Reflection.Module);Argument[0];Argument[this];taint;df-generated |
-| System.Reflection.Emit;DynamicMethod;DynamicMethod;(System.String,System.Type,System.Type[],System.Reflection.Module);Argument[3];Argument[this];taint;df-generated |
-| System.Reflection.Emit;DynamicMethod;DynamicMethod;(System.String,System.Type,System.Type[],System.Reflection.Module,System.Boolean);Argument[0];Argument[this];taint;df-generated |
-| System.Reflection.Emit;DynamicMethod;DynamicMethod;(System.String,System.Type,System.Type[],System.Reflection.Module,System.Boolean);Argument[3];Argument[this];taint;df-generated |
-| System.Reflection.Emit;DynamicMethod;DynamicMethod;(System.String,System.Type,System.Type[],System.Type);Argument[0];Argument[this];taint;df-generated |
-| System.Reflection.Emit;DynamicMethod;DynamicMethod;(System.String,System.Type,System.Type[],System.Type,System.Boolean);Argument[0];Argument[this];taint;df-generated |
-| System.Reflection.Emit;DynamicMethod;GetBaseDefinition;();Argument[this];ReturnValue;taint;df-generated |
-| System.Reflection.Emit;DynamicMethod;GetBaseDefinition;();Argument[this];ReturnValue;value;df-generated |
-| System.Reflection.Emit;DynamicMethod;GetCustomAttributes;(System.Boolean);Argument[this];ReturnValue;taint;df-generated |
+| System.Reflection.Emit;DynamicMethod;DynamicMethod;(System.String,System.Reflection.MethodAttributes,System.Reflection.CallingConventions,System.Type,System.Type[],System.Reflection.Module,System.Boolean);Argument[0];Argument[this].SyntheticField[System.Reflection.Emit.DynamicMethod._name];value;dfc-generated |
+| System.Reflection.Emit;DynamicMethod;DynamicMethod;(System.String,System.Reflection.MethodAttributes,System.Reflection.CallingConventions,System.Type,System.Type[],System.Reflection.Module,System.Boolean);Argument[5];Argument[this].SyntheticField[System.Reflection.Emit.DynamicMethod._module];value;dfc-generated |
+| System.Reflection.Emit;DynamicMethod;DynamicMethod;(System.String,System.Reflection.MethodAttributes,System.Reflection.CallingConventions,System.Type,System.Type[],System.Type,System.Boolean);Argument[0];Argument[this].SyntheticField[System.Reflection.Emit.DynamicMethod._name];value;dfc-generated |
+| System.Reflection.Emit;DynamicMethod;DynamicMethod;(System.String,System.Type,System.Type[]);Argument[0];Argument[this].SyntheticField[System.Reflection.Emit.DynamicMethod._name];value;dfc-generated |
+| System.Reflection.Emit;DynamicMethod;DynamicMethod;(System.String,System.Type,System.Type[],System.Boolean);Argument[0];Argument[this].SyntheticField[System.Reflection.Emit.DynamicMethod._name];value;dfc-generated |
+| System.Reflection.Emit;DynamicMethod;DynamicMethod;(System.String,System.Type,System.Type[],System.Reflection.Module);Argument[0];Argument[this].SyntheticField[System.Reflection.Emit.DynamicMethod._name];value;dfc-generated |
+| System.Reflection.Emit;DynamicMethod;DynamicMethod;(System.String,System.Type,System.Type[],System.Reflection.Module);Argument[3];Argument[this].SyntheticField[System.Reflection.Emit.DynamicMethod._module];value;dfc-generated |
+| System.Reflection.Emit;DynamicMethod;DynamicMethod;(System.String,System.Type,System.Type[],System.Reflection.Module,System.Boolean);Argument[0];Argument[this].SyntheticField[System.Reflection.Emit.DynamicMethod._name];value;dfc-generated |
+| System.Reflection.Emit;DynamicMethod;DynamicMethod;(System.String,System.Type,System.Type[],System.Reflection.Module,System.Boolean);Argument[3];Argument[this].SyntheticField[System.Reflection.Emit.DynamicMethod._module];value;dfc-generated |
+| System.Reflection.Emit;DynamicMethod;DynamicMethod;(System.String,System.Type,System.Type[],System.Type);Argument[0];Argument[this].SyntheticField[System.Reflection.Emit.DynamicMethod._name];value;dfc-generated |
+| System.Reflection.Emit;DynamicMethod;DynamicMethod;(System.String,System.Type,System.Type[],System.Type,System.Boolean);Argument[0];Argument[this].SyntheticField[System.Reflection.Emit.DynamicMethod._name];value;dfc-generated |
+| System.Reflection.Emit;DynamicMethod;GetBaseDefinition;();Argument[this];ReturnValue;value;dfc-generated |
+| System.Reflection.Emit;DynamicMethod;GetParameters;();Argument[this];ReturnValue.Element.Field[System.Reflection.ParameterInfo.MemberImpl];value;df-generated |
+| System.Reflection.Emit;DynamicMethod;GetParameters;();Argument[this];ReturnValue.Element.Field[System.Reflection.ParameterInfo.MemberImpl];value;dfc-generated |
 | System.Reflection.Emit;DynamicMethod;GetParameters;();Argument[this];ReturnValue;taint;df-generated |
+| System.Reflection.Emit;DynamicMethod;GetParameters;();Argument[this];ReturnValue;taint;dfc-generated |
+| System.Reflection.Emit;DynamicMethod;Invoke;(System.Object,System.Reflection.BindingFlags,System.Reflection.Binder,System.Object[],System.Globalization.CultureInfo);Argument[0];Argument[this];taint;df-generated |
+| System.Reflection.Emit;DynamicMethod;Invoke;(System.Object,System.Reflection.BindingFlags,System.Reflection.Binder,System.Object[],System.Globalization.CultureInfo);Argument[3].Element;Argument[this];taint;df-generated |
+| System.Reflection.Emit;DynamicMethod;Invoke;(System.Object,System.Reflection.BindingFlags,System.Reflection.Binder,System.Object[],System.Globalization.CultureInfo);Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection.Emit;DynamicMethod;get_DeclaringType;();Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection.Emit;DynamicMethod;get_MethodHandle;();Argument[this];ReturnValue;taint;df-generated |
+| System.Reflection.Emit;DynamicMethod;get_Module;();Argument[this].SyntheticField[System.Reflection.Emit.DynamicMethod._module];ReturnValue;value;df-generated |
+| System.Reflection.Emit;DynamicMethod;get_Module;();Argument[this].SyntheticField[System.Reflection.Emit.DynamicMethod._module];ReturnValue;value;dfc-generated |
 | System.Reflection.Emit;DynamicMethod;get_Module;();Argument[this];ReturnValue;taint;df-generated |
+| System.Reflection.Emit;DynamicMethod;get_Module;();Argument[this];ReturnValue;taint;dfc-generated |
+| System.Reflection.Emit;DynamicMethod;get_Name;();Argument[this].SyntheticField[System.Reflection.Emit.DynamicMethod._name];ReturnValue;value;df-generated |
+| System.Reflection.Emit;DynamicMethod;get_Name;();Argument[this].SyntheticField[System.Reflection.Emit.DynamicMethod._name];ReturnValue;value;dfc-generated |
 | System.Reflection.Emit;DynamicMethod;get_Name;();Argument[this];ReturnValue;taint;df-generated |
+| System.Reflection.Emit;DynamicMethod;get_Name;();Argument[this];ReturnValue;taint;dfc-generated |
 | System.Reflection.Emit;DynamicMethod;get_ReflectedType;();Argument[this];ReturnValue;taint;df-generated |
+| System.Reflection.Emit;DynamicMethod;get_ReturnParameter;();Argument[this];ReturnValue.Field[System.Reflection.ParameterInfo.MemberImpl];value;df-generated |
+| System.Reflection.Emit;DynamicMethod;get_ReturnParameter;();Argument[this];ReturnValue.Field[System.Reflection.ParameterInfo.MemberImpl];value;dfc-generated |
 | System.Reflection.Emit;DynamicMethod;get_ReturnParameter;();Argument[this];ReturnValue;taint;df-generated |
+| System.Reflection.Emit;DynamicMethod;get_ReturnParameter;();Argument[this];ReturnValue;taint;dfc-generated |
 | System.Reflection.Emit;DynamicMethod;get_ReturnType;();Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection.Emit;DynamicMethod;get_ReturnTypeCustomAttributes;();Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection.Emit;EnumBuilder;GetConstructorImpl;(System.Reflection.BindingFlags,System.Reflection.Binder,System.Reflection.CallingConventions,System.Type[],System.Reflection.ParameterModifier[]);Argument[this];ReturnValue;taint;df-generated |
-| System.Reflection.Emit;EnumBuilder;GetCustomAttributes;(System.Boolean);Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection.Emit;EnumBuilder;GetElementType;();Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection.Emit;EnumBuilder;GetEnumUnderlyingType;();Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection.Emit;EnumBuilder;GetEvent;(System.String,System.Reflection.BindingFlags);Argument[this];ReturnValue;taint;df-generated |
@@ -14208,15 +14520,13 @@ summary
 | System.Reflection.Emit;EnumBuilder;get_Namespace;();Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection.Emit;EnumBuilder;get_ReflectedType;();Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection.Emit;EnumBuilder;get_TypeHandle;();Argument[this];ReturnValue;taint;df-generated |
-| System.Reflection.Emit;EnumBuilder;get_UnderlyingField;();Argument[this];ReturnValue;taint;df-generated |
+| System.Reflection.Emit;EnumBuilder;get_UnderlyingField;();Argument[this].Property[System.Reflection.Emit.EnumBuilder.UnderlyingFieldCore];ReturnValue;value;dfc-generated |
 | System.Reflection.Emit;EnumBuilder;get_UnderlyingFieldCore;();Argument[this];ReturnValue;taint;df-generated |
-| System.Reflection.Emit;EnumBuilder;get_UnderlyingSystemType;();Argument[this];ReturnValue;taint;df-generated |
-| System.Reflection.Emit;EnumBuilder;get_UnderlyingSystemType;();Argument[this];ReturnValue;value;df-generated |
+| System.Reflection.Emit;EnumBuilder;get_UnderlyingSystemType;();Argument[this];ReturnValue;value;dfc-generated |
 | System.Reflection.Emit;EventBuilder;AddOtherMethodCore;(System.Reflection.Emit.MethodBuilder);Argument[0];Argument[this];taint;df-generated |
 | System.Reflection.Emit;EventBuilder;SetAddOnMethodCore;(System.Reflection.Emit.MethodBuilder);Argument[0];Argument[this];taint;df-generated |
 | System.Reflection.Emit;EventBuilder;SetRaiseMethodCore;(System.Reflection.Emit.MethodBuilder);Argument[0];Argument[this];taint;df-generated |
 | System.Reflection.Emit;EventBuilder;SetRemoveOnMethodCore;(System.Reflection.Emit.MethodBuilder);Argument[0];Argument[this];taint;df-generated |
-| System.Reflection.Emit;FieldBuilder;GetCustomAttributes;(System.Boolean);Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection.Emit;FieldBuilder;SetConstantCore;(System.Object);Argument[0];Argument[this];taint;df-generated |
 | System.Reflection.Emit;FieldBuilder;SetCustomAttributeCore;(System.Reflection.ConstructorInfo,System.ReadOnlySpan<System.Byte>);Argument[1];Argument[this];taint;df-generated |
 | System.Reflection.Emit;FieldBuilder;get_DeclaringType;();Argument[this];ReturnValue;taint;df-generated |
@@ -14226,13 +14536,11 @@ summary
 | System.Reflection.Emit;FieldBuilder;get_Name;();Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection.Emit;FieldBuilder;get_ReflectedType;();Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection.Emit;GenericTypeParameterBuilder;GetConstructorImpl;(System.Reflection.BindingFlags,System.Reflection.Binder,System.Reflection.CallingConventions,System.Type[],System.Reflection.ParameterModifier[]);Argument[this];ReturnValue;taint;df-generated |
-| System.Reflection.Emit;GenericTypeParameterBuilder;GetCustomAttributes;(System.Boolean);Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection.Emit;GenericTypeParameterBuilder;GetElementType;();Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection.Emit;GenericTypeParameterBuilder;GetEvent;(System.String,System.Reflection.BindingFlags);Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection.Emit;GenericTypeParameterBuilder;GetField;(System.String,System.Reflection.BindingFlags);Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection.Emit;GenericTypeParameterBuilder;GetGenericArguments;();Argument[this];ReturnValue;taint;df-generated |
-| System.Reflection.Emit;GenericTypeParameterBuilder;GetGenericTypeDefinition;();Argument[this];ReturnValue;taint;df-generated |
-| System.Reflection.Emit;GenericTypeParameterBuilder;GetGenericTypeDefinition;();Argument[this];ReturnValue;value;df-generated |
+| System.Reflection.Emit;GenericTypeParameterBuilder;GetGenericTypeDefinition;();Argument[this];ReturnValue;value;dfc-generated |
 | System.Reflection.Emit;GenericTypeParameterBuilder;GetInterface;(System.String,System.Boolean);Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection.Emit;GenericTypeParameterBuilder;GetInterfaces;();Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection.Emit;GenericTypeParameterBuilder;GetMethodImpl;(System.String,System.Reflection.BindingFlags,System.Reflection.Binder,System.Reflection.CallingConventions,System.Type[],System.Reflection.ParameterModifier[]);Argument[this];ReturnValue;taint;df-generated |
@@ -14256,8 +14564,7 @@ summary
 | System.Reflection.Emit;GenericTypeParameterBuilder;get_Namespace;();Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection.Emit;GenericTypeParameterBuilder;get_ReflectedType;();Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection.Emit;GenericTypeParameterBuilder;get_TypeHandle;();Argument[this];ReturnValue;taint;df-generated |
-| System.Reflection.Emit;GenericTypeParameterBuilder;get_UnderlyingSystemType;();Argument[this];ReturnValue;taint;df-generated |
-| System.Reflection.Emit;GenericTypeParameterBuilder;get_UnderlyingSystemType;();Argument[this];ReturnValue;value;df-generated |
+| System.Reflection.Emit;GenericTypeParameterBuilder;get_UnderlyingSystemType;();Argument[this];ReturnValue;value;dfc-generated |
 | System.Reflection.Emit;ILGenerator;DeclareLocal;(System.Type);Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection.Emit;ILGenerator;DeclareLocal;(System.Type,System.Boolean);Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection.Emit;LocalBuilder;get_LocalType;();Argument[this];ReturnValue;taint;df-generated |
@@ -14265,14 +14572,14 @@ summary
 | System.Reflection.Emit;MethodBuilder;DefineGenericParametersCore;(System.String[]);Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection.Emit;MethodBuilder;DefineParameterCore;(System.Int32,System.Reflection.ParameterAttributes,System.String);Argument[2];ReturnValue;taint;df-generated |
 | System.Reflection.Emit;MethodBuilder;DefineParameterCore;(System.Int32,System.Reflection.ParameterAttributes,System.String);Argument[this];ReturnValue;taint;df-generated |
-| System.Reflection.Emit;MethodBuilder;GetBaseDefinition;();Argument[this];ReturnValue;taint;df-generated |
-| System.Reflection.Emit;MethodBuilder;GetBaseDefinition;();Argument[this];ReturnValue;value;df-generated |
-| System.Reflection.Emit;MethodBuilder;GetCustomAttributes;(System.Boolean);Argument[this];ReturnValue;taint;df-generated |
+| System.Reflection.Emit;MethodBuilder;GetBaseDefinition;();Argument[this];ReturnValue;value;dfc-generated |
 | System.Reflection.Emit;MethodBuilder;GetGenericArguments;();Argument[this];ReturnValue;taint;df-generated |
-| System.Reflection.Emit;MethodBuilder;GetGenericMethodDefinition;();Argument[this];ReturnValue;taint;df-generated |
-| System.Reflection.Emit;MethodBuilder;GetGenericMethodDefinition;();Argument[this];ReturnValue;value;df-generated |
+| System.Reflection.Emit;MethodBuilder;GetGenericMethodDefinition;();Argument[this];ReturnValue;value;dfc-generated |
 | System.Reflection.Emit;MethodBuilder;GetILGeneratorCore;(System.Int32);Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection.Emit;MethodBuilder;GetParameters;();Argument[this];ReturnValue;taint;df-generated |
+| System.Reflection.Emit;MethodBuilder;Invoke;(System.Object,System.Reflection.BindingFlags,System.Reflection.Binder,System.Object[],System.Globalization.CultureInfo);Argument[0];Argument[this];taint;df-generated |
+| System.Reflection.Emit;MethodBuilder;Invoke;(System.Object,System.Reflection.BindingFlags,System.Reflection.Binder,System.Object[],System.Globalization.CultureInfo);Argument[3].Element;Argument[this];taint;df-generated |
+| System.Reflection.Emit;MethodBuilder;Invoke;(System.Object,System.Reflection.BindingFlags,System.Reflection.Binder,System.Object[],System.Globalization.CultureInfo);Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection.Emit;MethodBuilder;MakeGenericMethod;(System.Type[]);Argument[0].Element;ReturnValue;taint;df-generated |
 | System.Reflection.Emit;MethodBuilder;MakeGenericMethod;(System.Type[]);Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection.Emit;MethodBuilder;SetCustomAttributeCore;(System.Reflection.ConstructorInfo,System.ReadOnlySpan<System.Byte>);Argument[1];Argument[this];taint;df-generated |
@@ -14310,9 +14617,10 @@ summary
 | System.Reflection.Emit;ModuleBuilder;DefineType;(System.String,System.Reflection.TypeAttributes,System.Type,System.Type[]);Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection.Emit;ModuleBuilder;DefineTypeCore;(System.String,System.Reflection.TypeAttributes,System.Type,System.Type[],System.Reflection.Emit.PackingSize,System.Int32);Argument[0];ReturnValue;taint;df-generated |
 | System.Reflection.Emit;ModuleBuilder;DefineTypeCore;(System.String,System.Reflection.TypeAttributes,System.Type,System.Type[],System.Reflection.Emit.PackingSize,System.Int32);Argument[this];ReturnValue;taint;df-generated |
+| System.Reflection.Emit;ModuleBuilder;GetArrayMethod;(System.Type,System.String,System.Reflection.CallingConventions,System.Type,System.Type[]);Argument[1];ReturnValue;taint;df-generated |
+| System.Reflection.Emit;ModuleBuilder;GetArrayMethod;(System.Type,System.String,System.Reflection.CallingConventions,System.Type,System.Type[]);Argument[4].Element;ReturnValue;taint;df-generated |
 | System.Reflection.Emit;ModuleBuilder;GetArrayMethodCore;(System.Type,System.String,System.Reflection.CallingConventions,System.Type,System.Type[]);Argument[1];ReturnValue;taint;df-generated |
 | System.Reflection.Emit;ModuleBuilder;GetArrayMethodCore;(System.Type,System.String,System.Reflection.CallingConventions,System.Type,System.Type[]);Argument[4].Element;ReturnValue;taint;df-generated |
-| System.Reflection.Emit;ModuleBuilder;GetCustomAttributes;(System.Boolean);Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection.Emit;ModuleBuilder;GetField;(System.String,System.Reflection.BindingFlags);Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection.Emit;ModuleBuilder;GetMethodImpl;(System.String,System.Reflection.BindingFlags,System.Reflection.Binder,System.Reflection.CallingConventions,System.Type[],System.Reflection.ParameterModifier[]);Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection.Emit;ModuleBuilder;GetType;(System.String,System.Boolean,System.Boolean);Argument[this];ReturnValue;taint;df-generated |
@@ -14325,7 +14633,7 @@ summary
 | System.Reflection.Emit;ModuleBuilder;get_ModuleVersionId;();Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection.Emit;ModuleBuilder;get_Name;();Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection.Emit;ModuleBuilder;get_ScopeName;();Argument[this];ReturnValue;taint;df-generated |
-| System.Reflection.Emit;OpCode;ToString;();Argument[this];ReturnValue;taint;df-generated |
+| System.Reflection.Emit;OpCode;ToString;();Argument[this].Property[System.Reflection.Emit.OpCode.Name];ReturnValue;value;dfc-generated |
 | System.Reflection.Emit;ParameterBuilder;SetConstant;(System.Object);Argument[0];Argument[this];taint;df-generated |
 | System.Reflection.Emit;ParameterBuilder;SetCustomAttribute;(System.Reflection.ConstructorInfo,System.Byte[]);Argument[1].Element;Argument[this];taint;df-generated |
 | System.Reflection.Emit;ParameterBuilder;SetCustomAttribute;(System.Reflection.Emit.CustomAttributeBuilder);Argument[0];Argument[this];taint;df-generated |
@@ -14333,10 +14641,11 @@ summary
 | System.Reflection.Emit;ParameterBuilder;get_Name;();Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection.Emit;PropertyBuilder;AddOtherMethodCore;(System.Reflection.Emit.MethodBuilder);Argument[0];Argument[this];taint;df-generated |
 | System.Reflection.Emit;PropertyBuilder;GetAccessors;(System.Boolean);Argument[this];ReturnValue;taint;df-generated |
-| System.Reflection.Emit;PropertyBuilder;GetCustomAttributes;(System.Boolean);Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection.Emit;PropertyBuilder;GetGetMethod;(System.Boolean);Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection.Emit;PropertyBuilder;GetIndexParameters;();Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection.Emit;PropertyBuilder;GetSetMethod;(System.Boolean);Argument[this];ReturnValue;taint;df-generated |
+| System.Reflection.Emit;PropertyBuilder;GetValue;(System.Object,System.Object[]);Argument[0];Argument[this];taint;df-generated |
+| System.Reflection.Emit;PropertyBuilder;GetValue;(System.Object,System.Object[]);Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection.Emit;PropertyBuilder;SetConstantCore;(System.Object);Argument[0];Argument[this];taint;df-generated |
 | System.Reflection.Emit;PropertyBuilder;SetGetMethodCore;(System.Reflection.Emit.MethodBuilder);Argument[0];Argument[this];taint;df-generated |
 | System.Reflection.Emit;PropertyBuilder;SetSetMethodCore;(System.Reflection.Emit.MethodBuilder);Argument[0];Argument[this];taint;df-generated |
@@ -14349,7 +14658,7 @@ summary
 | System.Reflection.Emit;SignatureHelper;GetLocalVarSigHelper;(System.Reflection.Module);Argument[0];ReturnValue;taint;df-generated |
 | System.Reflection.Emit;SignatureHelper;GetMethodSigHelper;(System.Reflection.Module,System.Reflection.CallingConventions,System.Type);Argument[0];ReturnValue;taint;df-generated |
 | System.Reflection.Emit;SignatureHelper;GetMethodSigHelper;(System.Reflection.Module,System.Type,System.Type[]);Argument[0];ReturnValue;taint;df-generated |
-| System.Reflection.Emit;TypeBuilder;CreateTypeInfoCore;();Argument[this];ReturnValue;value;df-generated |
+| System.Reflection.Emit;TypeBuilder;CreateTypeInfoCore;();Argument[this];ReturnValue;value;dfc-generated |
 | System.Reflection.Emit;TypeBuilder;DefineConstructorCore;(System.Reflection.MethodAttributes,System.Reflection.CallingConventions,System.Type[],System.Type[][],System.Type[][]);Argument[3].Element;ReturnValue;taint;df-generated |
 | System.Reflection.Emit;TypeBuilder;DefineConstructorCore;(System.Reflection.MethodAttributes,System.Reflection.CallingConventions,System.Type[],System.Type[][],System.Type[][]);Argument[4].Element;ReturnValue;taint;df-generated |
 | System.Reflection.Emit;TypeBuilder;DefineConstructorCore;(System.Reflection.MethodAttributes,System.Reflection.CallingConventions,System.Type[],System.Type[][],System.Type[][]);Argument[this];ReturnValue;taint;df-generated |
@@ -14382,14 +14691,12 @@ summary
 | System.Reflection.Emit;TypeBuilder;DefinePropertyCore;(System.String,System.Reflection.PropertyAttributes,System.Reflection.CallingConventions,System.Type,System.Type[],System.Type[],System.Type[],System.Type[][],System.Type[][]);Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection.Emit;TypeBuilder;GetConstructor;(System.Type,System.Reflection.ConstructorInfo);Argument[1];ReturnValue;taint;df-generated |
 | System.Reflection.Emit;TypeBuilder;GetConstructorImpl;(System.Reflection.BindingFlags,System.Reflection.Binder,System.Reflection.CallingConventions,System.Type[],System.Reflection.ParameterModifier[]);Argument[this];ReturnValue;taint;df-generated |
-| System.Reflection.Emit;TypeBuilder;GetCustomAttributes;(System.Boolean);Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection.Emit;TypeBuilder;GetElementType;();Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection.Emit;TypeBuilder;GetEvent;(System.String,System.Reflection.BindingFlags);Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection.Emit;TypeBuilder;GetField;(System.String,System.Reflection.BindingFlags);Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection.Emit;TypeBuilder;GetField;(System.Type,System.Reflection.FieldInfo);Argument[1];ReturnValue;taint;df-generated |
 | System.Reflection.Emit;TypeBuilder;GetGenericArguments;();Argument[this];ReturnValue;taint;df-generated |
-| System.Reflection.Emit;TypeBuilder;GetGenericTypeDefinition;();Argument[this];ReturnValue;taint;df-generated |
-| System.Reflection.Emit;TypeBuilder;GetGenericTypeDefinition;();Argument[this];ReturnValue;value;df-generated |
+| System.Reflection.Emit;TypeBuilder;GetGenericTypeDefinition;();Argument[this];ReturnValue;value;dfc-generated |
 | System.Reflection.Emit;TypeBuilder;GetInterface;(System.String,System.Boolean);Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection.Emit;TypeBuilder;GetInterfaces;();Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection.Emit;TypeBuilder;GetMethod;(System.Type,System.Reflection.MethodInfo);Argument[1];ReturnValue;taint;df-generated |
@@ -14413,16 +14720,15 @@ summary
 | System.Reflection.Emit;TypeBuilder;get_Namespace;();Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection.Emit;TypeBuilder;get_ReflectedType;();Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection.Emit;TypeBuilder;get_TypeHandle;();Argument[this];ReturnValue;taint;df-generated |
-| System.Reflection.Emit;TypeBuilder;get_UnderlyingSystemType;();Argument[this];ReturnValue;taint;df-generated |
-| System.Reflection.Emit;TypeBuilder;get_UnderlyingSystemType;();Argument[this];ReturnValue;value;df-generated |
+| System.Reflection.Emit;TypeBuilder;get_UnderlyingSystemType;();Argument[this];ReturnValue;value;dfc-generated |
 | System.Reflection.Metadata.Ecma335;BlobEncoder;CustomAttributeSignature;(System.Action<System.Reflection.Metadata.Ecma335.FixedArgumentsEncoder>,System.Action<System.Reflection.Metadata.Ecma335.CustomAttributeNamedArgumentsEncoder>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Reflection.Metadata.Ecma335;BlobEncoder;CustomAttributeSignature;(System.Action<System.Reflection.Metadata.Ecma335.FixedArgumentsEncoder>,System.Action<System.Reflection.Metadata.Ecma335.CustomAttributeNamedArgumentsEncoder>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
-| System.Reflection.Metadata.Ecma335;CustomModifiersEncoder;AddModifier;(System.Reflection.Metadata.EntityHandle,System.Boolean);Argument[this];ReturnValue;value;df-generated |
-| System.Reflection.Metadata.Ecma335;ExceptionRegionEncoder;Add;(System.Reflection.Metadata.ExceptionRegionKind,System.Int32,System.Int32,System.Int32,System.Int32,System.Reflection.Metadata.EntityHandle,System.Int32);Argument[this];ReturnValue;value;df-generated |
-| System.Reflection.Metadata.Ecma335;ExceptionRegionEncoder;AddCatch;(System.Int32,System.Int32,System.Int32,System.Int32,System.Reflection.Metadata.EntityHandle);Argument[this];ReturnValue;taint;df-generated |
-| System.Reflection.Metadata.Ecma335;ExceptionRegionEncoder;AddFault;(System.Int32,System.Int32,System.Int32,System.Int32);Argument[this];ReturnValue;taint;df-generated |
-| System.Reflection.Metadata.Ecma335;ExceptionRegionEncoder;AddFilter;(System.Int32,System.Int32,System.Int32,System.Int32,System.Int32);Argument[this];ReturnValue;taint;df-generated |
-| System.Reflection.Metadata.Ecma335;ExceptionRegionEncoder;AddFinally;(System.Int32,System.Int32,System.Int32,System.Int32);Argument[this];ReturnValue;taint;df-generated |
+| System.Reflection.Metadata.Ecma335;CustomModifiersEncoder;AddModifier;(System.Reflection.Metadata.EntityHandle,System.Boolean);Argument[this];ReturnValue;value;dfc-generated |
+| System.Reflection.Metadata.Ecma335;ExceptionRegionEncoder;Add;(System.Reflection.Metadata.ExceptionRegionKind,System.Int32,System.Int32,System.Int32,System.Int32,System.Reflection.Metadata.EntityHandle,System.Int32);Argument[this];ReturnValue;value;dfc-generated |
+| System.Reflection.Metadata.Ecma335;ExceptionRegionEncoder;AddCatch;(System.Int32,System.Int32,System.Int32,System.Int32,System.Reflection.Metadata.EntityHandle);Argument[this];ReturnValue;value;dfc-generated |
+| System.Reflection.Metadata.Ecma335;ExceptionRegionEncoder;AddFault;(System.Int32,System.Int32,System.Int32,System.Int32);Argument[this];ReturnValue;value;dfc-generated |
+| System.Reflection.Metadata.Ecma335;ExceptionRegionEncoder;AddFilter;(System.Int32,System.Int32,System.Int32,System.Int32,System.Int32);Argument[this];ReturnValue;value;dfc-generated |
+| System.Reflection.Metadata.Ecma335;ExceptionRegionEncoder;AddFinally;(System.Int32,System.Int32,System.Int32,System.Int32);Argument[this];ReturnValue;value;dfc-generated |
 | System.Reflection.Metadata.Ecma335;InstructionEncoder;Switch;(System.Int32);Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection.Metadata.Ecma335;LiteralEncoder;TaggedScalar;(System.Action<System.Reflection.Metadata.Ecma335.CustomAttributeElementTypeEncoder>,System.Action<System.Reflection.Metadata.Ecma335.ScalarEncoder>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Reflection.Metadata.Ecma335;LiteralEncoder;TaggedScalar;(System.Action<System.Reflection.Metadata.Ecma335.CustomAttributeElementTypeEncoder>,System.Action<System.Reflection.Metadata.Ecma335.ScalarEncoder>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
@@ -14443,40 +14749,52 @@ summary
 | System.Reflection.Metadata.Ecma335;NamedArgumentsEncoder;AddArgument;(System.Boolean,System.Action<System.Reflection.Metadata.Ecma335.NamedArgumentTypeEncoder>,System.Action<System.Reflection.Metadata.Ecma335.NameEncoder>,System.Action<System.Reflection.Metadata.Ecma335.LiteralEncoder>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
 | System.Reflection.Metadata.Ecma335;NamedArgumentsEncoder;AddArgument;(System.Boolean,System.Action<System.Reflection.Metadata.Ecma335.NamedArgumentTypeEncoder>,System.Action<System.Reflection.Metadata.Ecma335.NameEncoder>,System.Action<System.Reflection.Metadata.Ecma335.LiteralEncoder>);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
 | System.Reflection.Metadata.Ecma335;NamedArgumentsEncoder;AddArgument;(System.Boolean,System.Action<System.Reflection.Metadata.Ecma335.NamedArgumentTypeEncoder>,System.Action<System.Reflection.Metadata.Ecma335.NameEncoder>,System.Action<System.Reflection.Metadata.Ecma335.LiteralEncoder>);Argument[3];Argument[3].Parameter[delegate-self];value;hq-generated |
-| System.Reflection.Metadata.Ecma335;PermissionSetEncoder;AddPermission;(System.String,System.Collections.Immutable.ImmutableArray<System.Byte>);Argument[this];ReturnValue;value;df-generated |
-| System.Reflection.Metadata.Ecma335;PermissionSetEncoder;AddPermission;(System.String,System.Reflection.Metadata.BlobBuilder);Argument[this];ReturnValue;value;df-generated |
+| System.Reflection.Metadata.Ecma335;PermissionSetEncoder;AddPermission;(System.String,System.Collections.Immutable.ImmutableArray<System.Byte>);Argument[this];ReturnValue;value;dfc-generated |
+| System.Reflection.Metadata.Ecma335;PermissionSetEncoder;AddPermission;(System.String,System.Reflection.Metadata.BlobBuilder);Argument[this];ReturnValue;value;dfc-generated |
 | System.Reflection.Metadata.Ecma335;PortablePdbBuilder;PortablePdbBuilder;(System.Reflection.Metadata.Ecma335.MetadataBuilder,System.Collections.Immutable.ImmutableArray<System.Int32>,System.Reflection.Metadata.MethodDefinitionHandle,System.Func<System.Collections.Generic.IEnumerable<System.Reflection.Metadata.Blob>,System.Reflection.Metadata.BlobContentId>);Argument[3];Argument[3].Parameter[delegate-self];value;hq-generated |
 | System.Reflection.Metadata.Ecma335;PortablePdbBuilder;Serialize;(System.Reflection.Metadata.BlobBuilder);Argument[0];Argument[this];taint;df-generated |
-| System.Reflection.Metadata.Ecma335;SignatureDecoder<TType,TGenericContext>;DecodeFieldSignature;(System.Reflection.Metadata.BlobReader);Argument[this];ReturnValue;taint;df-generated |
-| System.Reflection.Metadata.Ecma335;SignatureDecoder<TType,TGenericContext>;DecodeLocalSignature;(System.Reflection.Metadata.BlobReader);Argument[this];ReturnValue;taint;df-generated |
-| System.Reflection.Metadata.Ecma335;SignatureDecoder<TType,TGenericContext>;DecodeMethodSpecificationSignature;(System.Reflection.Metadata.BlobReader);Argument[this];ReturnValue;taint;df-generated |
-| System.Reflection.Metadata.Ecma335;SignatureDecoder<TType,TGenericContext>;DecodeType;(System.Reflection.Metadata.BlobReader,System.Boolean);Argument[this];ReturnValue;taint;df-generated |
+| System.Reflection.Metadata.Ecma335;PortablePdbBuilder;Serialize;(System.Reflection.Metadata.BlobBuilder);Argument[this];ReturnValue;taint;df-generated |
+| System.Reflection.Metadata.Ecma335;SignatureDecoder<TType,TGenericContext>;DecodeFieldSignature;(System.Reflection.Metadata.BlobReader);Argument[0];ReturnValue;value;dfc-generated |
+| System.Reflection.Metadata.Ecma335;SignatureDecoder<TType,TGenericContext>;DecodeLocalSignature;(System.Reflection.Metadata.BlobReader);Argument[0];ReturnValue;value;dfc-generated |
+| System.Reflection.Metadata.Ecma335;SignatureDecoder<TType,TGenericContext>;DecodeMethodSignature;(System.Reflection.Metadata.BlobReader);Argument[0];ReturnValue;value;dfc-generated |
+| System.Reflection.Metadata.Ecma335;SignatureDecoder<TType,TGenericContext>;DecodeMethodSpecificationSignature;(System.Reflection.Metadata.BlobReader);Argument[0];ReturnValue;value;dfc-generated |
+| System.Reflection.Metadata.Ecma335;SignatureDecoder<TType,TGenericContext>;DecodeType;(System.Reflection.Metadata.BlobReader,System.Boolean);Argument[0];ReturnValue;value;dfc-generated |
 | System.Reflection.Metadata.Ecma335;SignatureDecoder<TType,TGenericContext>;SignatureDecoder;(System.Reflection.Metadata.ISignatureTypeProvider<TType,TGenericContext>,System.Reflection.Metadata.MetadataReader,TGenericContext);Argument[0];Argument[this];taint;df-generated |
 | System.Reflection.Metadata.Ecma335;SignatureDecoder<TType,TGenericContext>;SignatureDecoder;(System.Reflection.Metadata.ISignatureTypeProvider<TType,TGenericContext>,System.Reflection.Metadata.MetadataReader,TGenericContext);Argument[1];Argument[this];taint;df-generated |
 | System.Reflection.Metadata.Ecma335;SignatureDecoder<TType,TGenericContext>;SignatureDecoder;(System.Reflection.Metadata.ISignatureTypeProvider<TType,TGenericContext>,System.Reflection.Metadata.MetadataReader,TGenericContext);Argument[2];Argument[this];taint;df-generated |
+| System.Reflection.Metadata.Ecma335;SignatureTypeEncoder;Array;(System.Action<System.Reflection.Metadata.Ecma335.SignatureTypeEncoder>,System.Action<System.Reflection.Metadata.Ecma335.ArrayShapeEncoder>);Argument[0];Argument[0].Parameter[delegate-self];value;dfc-generated |
 | System.Reflection.Metadata.Ecma335;SignatureTypeEncoder;Array;(System.Action<System.Reflection.Metadata.Ecma335.SignatureTypeEncoder>,System.Action<System.Reflection.Metadata.Ecma335.ArrayShapeEncoder>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
+| System.Reflection.Metadata.Ecma335;SignatureTypeEncoder;Array;(System.Action<System.Reflection.Metadata.Ecma335.SignatureTypeEncoder>,System.Action<System.Reflection.Metadata.Ecma335.ArrayShapeEncoder>);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | System.Reflection.Metadata.Ecma335;SignatureTypeEncoder;Array;(System.Action<System.Reflection.Metadata.Ecma335.SignatureTypeEncoder>,System.Action<System.Reflection.Metadata.Ecma335.ArrayShapeEncoder>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
-| System.Reflection.Metadata.Ecma335;SignatureTypeEncoder;Array;(System.Reflection.Metadata.Ecma335.SignatureTypeEncoder,System.Reflection.Metadata.Ecma335.ArrayShapeEncoder);Argument[this];ReturnValue;taint;df-generated |
-| System.Reflection.Metadata.Ecma335;SignatureTypeEncoder;Pointer;();Argument[this];ReturnValue;value;df-generated |
-| System.Reflection.Metadata.Ecma335;SignatureTypeEncoder;SZArray;();Argument[this];ReturnValue;value;df-generated |
-| System.Reflection.Metadata;AssemblyDefinition;GetAssemblyName;();Argument[this];ReturnValue;taint;df-generated |
+| System.Reflection.Metadata.Ecma335;SignatureTypeEncoder;Array;(System.Action<System.Reflection.Metadata.Ecma335.SignatureTypeEncoder>,System.Action<System.Reflection.Metadata.Ecma335.ArrayShapeEncoder>);Argument[this];Argument[0].Parameter[0];value;dfc-generated |
+| System.Reflection.Metadata.Ecma335;SignatureTypeEncoder;Array;(System.Action<System.Reflection.Metadata.Ecma335.SignatureTypeEncoder>,System.Action<System.Reflection.Metadata.Ecma335.ArrayShapeEncoder>);Argument[this];Argument[0].Parameter[0];value;hq-generated |
+| System.Reflection.Metadata.Ecma335;SignatureTypeEncoder;Array;(System.Reflection.Metadata.Ecma335.SignatureTypeEncoder,System.Reflection.Metadata.Ecma335.ArrayShapeEncoder);Argument[this];ReturnValue;value;dfc-generated |
+| System.Reflection.Metadata.Ecma335;SignatureTypeEncoder;Pointer;();Argument[this];ReturnValue;value;dfc-generated |
+| System.Reflection.Metadata.Ecma335;SignatureTypeEncoder;SZArray;();Argument[this];ReturnValue;value;dfc-generated |
 | System.Reflection.Metadata;AssemblyDefinition;GetCustomAttributes;();Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection.Metadata;AssemblyDefinition;GetDeclarativeSecurityAttributes;();Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection.Metadata;AssemblyFile;GetCustomAttributes;();Argument[this];ReturnValue;taint;df-generated |
+| System.Reflection.Metadata;AssemblyFileHandleCollection+Enumerator;get_Current;();Argument[this].Property[System.Reflection.Metadata.AssemblyFileHandleCollection+Enumerator.Current];ReturnValue;value;df-generated |
+| System.Reflection.Metadata;AssemblyFileHandleCollection+Enumerator;get_Current;();Argument[this].Property[System.Reflection.Metadata.AssemblyFileHandleCollection+Enumerator.Current];ReturnValue;value;dfc-generated |
 | System.Reflection.Metadata;AssemblyFileHandleCollection+Enumerator;get_Current;();Argument[this];ReturnValue;taint;df-generated |
+| System.Reflection.Metadata;AssemblyFileHandleCollection+Enumerator;get_Current;();Argument[this];ReturnValue;taint;dfc-generated |
 | System.Reflection.Metadata;AssemblyFileHandleCollection;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.Generic.IEnumerator`1.Current];value;manual |
 | System.Reflection.Metadata;AssemblyFileHandleCollection;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.IEnumerator.Current];value;manual |
-| System.Reflection.Metadata;AssemblyReference;GetAssemblyName;();Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection.Metadata;AssemblyReference;GetCustomAttributes;();Argument[this];ReturnValue;taint;df-generated |
+| System.Reflection.Metadata;AssemblyReferenceHandleCollection+Enumerator;get_Current;();Argument[this].Property[System.Reflection.Metadata.AssemblyReferenceHandleCollection+Enumerator.Current];ReturnValue;value;df-generated |
+| System.Reflection.Metadata;AssemblyReferenceHandleCollection+Enumerator;get_Current;();Argument[this].Property[System.Reflection.Metadata.AssemblyReferenceHandleCollection+Enumerator.Current];ReturnValue;value;dfc-generated |
 | System.Reflection.Metadata;AssemblyReferenceHandleCollection+Enumerator;get_Current;();Argument[this];ReturnValue;taint;df-generated |
+| System.Reflection.Metadata;AssemblyReferenceHandleCollection+Enumerator;get_Current;();Argument[this];ReturnValue;taint;dfc-generated |
 | System.Reflection.Metadata;AssemblyReferenceHandleCollection;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.Generic.IEnumerator`1.Current];value;manual |
 | System.Reflection.Metadata;AssemblyReferenceHandleCollection;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.IEnumerator.Current];value;manual |
 | System.Reflection.Metadata;AssemblyReferenceHandleCollection;GetEnumerator;();Argument[this];ReturnValue;taint;df-generated |
-| System.Reflection.Metadata;Blob;GetBytes;();Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection.Metadata;BlobBuilder+Blobs;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.Generic.IEnumerator`1.Current];value;manual |
 | System.Reflection.Metadata;BlobBuilder+Blobs;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.IEnumerator.Current];value;manual |
-| System.Reflection.Metadata;BlobBuilder+Blobs;GetEnumerator;();Argument[this];ReturnValue;value;df-generated |
+| System.Reflection.Metadata;BlobBuilder+Blobs;GetEnumerator;();Argument[this];ReturnValue;value;dfc-generated |
+| System.Reflection.Metadata;BlobBuilder+Blobs;get_Current;();Argument[this].Property[System.Reflection.Metadata.BlobBuilder+Blobs.Current];ReturnValue;value;df-generated |
+| System.Reflection.Metadata;BlobBuilder+Blobs;get_Current;();Argument[this].Property[System.Reflection.Metadata.BlobBuilder+Blobs.Current];ReturnValue;value;dfc-generated |
 | System.Reflection.Metadata;BlobBuilder+Blobs;get_Current;();Argument[this];ReturnValue;taint;df-generated |
+| System.Reflection.Metadata;BlobBuilder+Blobs;get_Current;();Argument[this];ReturnValue;taint;dfc-generated |
 | System.Reflection.Metadata;BlobBuilder;GetBlobs;();Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection.Metadata;BlobBuilder;LinkPrefix;(System.Reflection.Metadata.BlobBuilder);Argument[0];Argument[this];taint;df-generated |
 | System.Reflection.Metadata;BlobBuilder;LinkPrefix;(System.Reflection.Metadata.BlobBuilder);Argument[this];Argument[0];taint;df-generated |
@@ -14484,8 +14802,9 @@ summary
 | System.Reflection.Metadata;BlobBuilder;LinkSuffix;(System.Reflection.Metadata.BlobBuilder);Argument[this];Argument[0];taint;df-generated |
 | System.Reflection.Metadata;BlobBuilder;ReserveBytes;(System.Int32);Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection.Metadata;BlobBuilder;TryWriteBytes;(System.IO.Stream,System.Int32);Argument[0];Argument[this];taint;df-generated |
-| System.Reflection.Metadata;BlobContentId;BlobContentId;(System.Guid,System.UInt32);Argument[0];Argument[this];taint;df-generated |
-| System.Reflection.Metadata;BlobContentId;get_Guid;();Argument[this];ReturnValue;taint;df-generated |
+| System.Reflection.Metadata;BlobBuilder;WriteContentTo;(System.Reflection.Metadata.BlobWriter);Argument[0];ReturnValue;value;dfc-generated |
+| System.Reflection.Metadata;BlobContentId;BlobContentId;(System.Guid,System.UInt32);Argument[0];Argument[this].SyntheticField[System.Reflection.Metadata.BlobContentId._guid];value;dfc-generated |
+| System.Reflection.Metadata;BlobContentId;get_Guid;();Argument[this].SyntheticField[System.Reflection.Metadata.BlobContentId._guid];ReturnValue;value;dfc-generated |
 | System.Reflection.Metadata;BlobReader;ReadConstant;(System.Reflection.Metadata.ConstantTypeCode);Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection.Metadata;BlobReader;ReadSerializedString;();Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection.Metadata;BlobReader;ReadUTF8;(System.Int32);Argument[this];ReturnValue;taint;df-generated |
@@ -14493,88 +14812,133 @@ summary
 | System.Reflection.Metadata;BlobReader;get_CurrentPointer;();Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection.Metadata;BlobReader;get_StartPointer;();Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection.Metadata;BlobWriter;BlobWriter;(System.Byte[],System.Int32,System.Int32);Argument[0].Element;Argument[this];taint;df-generated |
-| System.Reflection.Metadata;BlobWriter;ToArray;();Argument[this];ReturnValue;taint;df-generated |
-| System.Reflection.Metadata;BlobWriter;ToArray;(System.Int32,System.Int32);Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection.Metadata;BlobWriter;WriteBytes;(System.IO.Stream,System.Int32);Argument[0];Argument[this];taint;df-generated |
 | System.Reflection.Metadata;BlobWriter;get_Blob;();Argument[this];ReturnValue;taint;df-generated |
+| System.Reflection.Metadata;CustomAttributeHandleCollection+Enumerator;get_Current;();Argument[this].Property[System.Reflection.Metadata.CustomAttributeHandleCollection+Enumerator.Current];ReturnValue;value;df-generated |
+| System.Reflection.Metadata;CustomAttributeHandleCollection+Enumerator;get_Current;();Argument[this].Property[System.Reflection.Metadata.CustomAttributeHandleCollection+Enumerator.Current];ReturnValue;value;dfc-generated |
 | System.Reflection.Metadata;CustomAttributeHandleCollection+Enumerator;get_Current;();Argument[this];ReturnValue;taint;df-generated |
+| System.Reflection.Metadata;CustomAttributeHandleCollection+Enumerator;get_Current;();Argument[this];ReturnValue;taint;dfc-generated |
 | System.Reflection.Metadata;CustomAttributeHandleCollection;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.Generic.IEnumerator`1.Current];value;manual |
 | System.Reflection.Metadata;CustomAttributeHandleCollection;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.IEnumerator.Current];value;manual |
 | System.Reflection.Metadata;CustomAttributeHandleCollection;GetEnumerator;();Argument[this];ReturnValue;taint;df-generated |
+| System.Reflection.Metadata;CustomDebugInformationHandleCollection+Enumerator;get_Current;();Argument[this].Property[System.Reflection.Metadata.CustomDebugInformationHandleCollection+Enumerator.Current];ReturnValue;value;df-generated |
+| System.Reflection.Metadata;CustomDebugInformationHandleCollection+Enumerator;get_Current;();Argument[this].Property[System.Reflection.Metadata.CustomDebugInformationHandleCollection+Enumerator.Current];ReturnValue;value;dfc-generated |
 | System.Reflection.Metadata;CustomDebugInformationHandleCollection+Enumerator;get_Current;();Argument[this];ReturnValue;taint;df-generated |
+| System.Reflection.Metadata;CustomDebugInformationHandleCollection+Enumerator;get_Current;();Argument[this];ReturnValue;taint;dfc-generated |
 | System.Reflection.Metadata;CustomDebugInformationHandleCollection;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.Generic.IEnumerator`1.Current];value;manual |
 | System.Reflection.Metadata;CustomDebugInformationHandleCollection;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.IEnumerator.Current];value;manual |
 | System.Reflection.Metadata;CustomDebugInformationHandleCollection;GetEnumerator;();Argument[this];ReturnValue;taint;df-generated |
+| System.Reflection.Metadata;DeclarativeSecurityAttributeHandleCollection+Enumerator;get_Current;();Argument[this].Property[System.Reflection.Metadata.DeclarativeSecurityAttributeHandleCollection+Enumerator.Current];ReturnValue;value;df-generated |
+| System.Reflection.Metadata;DeclarativeSecurityAttributeHandleCollection+Enumerator;get_Current;();Argument[this].Property[System.Reflection.Metadata.DeclarativeSecurityAttributeHandleCollection+Enumerator.Current];ReturnValue;value;dfc-generated |
 | System.Reflection.Metadata;DeclarativeSecurityAttributeHandleCollection+Enumerator;get_Current;();Argument[this];ReturnValue;taint;df-generated |
+| System.Reflection.Metadata;DeclarativeSecurityAttributeHandleCollection+Enumerator;get_Current;();Argument[this];ReturnValue;taint;dfc-generated |
 | System.Reflection.Metadata;DeclarativeSecurityAttributeHandleCollection;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.Generic.IEnumerator`1.Current];value;manual |
 | System.Reflection.Metadata;DeclarativeSecurityAttributeHandleCollection;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.IEnumerator.Current];value;manual |
 | System.Reflection.Metadata;DeclarativeSecurityAttributeHandleCollection;GetEnumerator;();Argument[this];ReturnValue;taint;df-generated |
+| System.Reflection.Metadata;DocumentHandleCollection+Enumerator;get_Current;();Argument[this].Property[System.Reflection.Metadata.DocumentHandleCollection+Enumerator.Current];ReturnValue;value;df-generated |
+| System.Reflection.Metadata;DocumentHandleCollection+Enumerator;get_Current;();Argument[this].Property[System.Reflection.Metadata.DocumentHandleCollection+Enumerator.Current];ReturnValue;value;dfc-generated |
 | System.Reflection.Metadata;DocumentHandleCollection+Enumerator;get_Current;();Argument[this];ReturnValue;taint;df-generated |
+| System.Reflection.Metadata;DocumentHandleCollection+Enumerator;get_Current;();Argument[this];ReturnValue;taint;dfc-generated |
 | System.Reflection.Metadata;DocumentHandleCollection;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.Generic.IEnumerator`1.Current];value;manual |
 | System.Reflection.Metadata;DocumentHandleCollection;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.IEnumerator.Current];value;manual |
 | System.Reflection.Metadata;DocumentHandleCollection;GetEnumerator;();Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection.Metadata;EventAccessors;get_Others;();Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection.Metadata;EventDefinition;GetCustomAttributes;();Argument[this];ReturnValue;taint;df-generated |
+| System.Reflection.Metadata;EventDefinitionHandleCollection+Enumerator;get_Current;();Argument[this].Property[System.Reflection.Metadata.EventDefinitionHandleCollection+Enumerator.Current];ReturnValue;value;df-generated |
+| System.Reflection.Metadata;EventDefinitionHandleCollection+Enumerator;get_Current;();Argument[this].Property[System.Reflection.Metadata.EventDefinitionHandleCollection+Enumerator.Current];ReturnValue;value;dfc-generated |
 | System.Reflection.Metadata;EventDefinitionHandleCollection+Enumerator;get_Current;();Argument[this];ReturnValue;taint;df-generated |
+| System.Reflection.Metadata;EventDefinitionHandleCollection+Enumerator;get_Current;();Argument[this];ReturnValue;taint;dfc-generated |
 | System.Reflection.Metadata;EventDefinitionHandleCollection;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.Generic.IEnumerator`1.Current];value;manual |
 | System.Reflection.Metadata;EventDefinitionHandleCollection;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.IEnumerator.Current];value;manual |
 | System.Reflection.Metadata;EventDefinitionHandleCollection;GetEnumerator;();Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection.Metadata;ExportedType;GetCustomAttributes;();Argument[this];ReturnValue;taint;df-generated |
+| System.Reflection.Metadata;ExportedTypeHandleCollection+Enumerator;get_Current;();Argument[this].Property[System.Reflection.Metadata.ExportedTypeHandleCollection+Enumerator.Current];ReturnValue;value;df-generated |
+| System.Reflection.Metadata;ExportedTypeHandleCollection+Enumerator;get_Current;();Argument[this].Property[System.Reflection.Metadata.ExportedTypeHandleCollection+Enumerator.Current];ReturnValue;value;dfc-generated |
 | System.Reflection.Metadata;ExportedTypeHandleCollection+Enumerator;get_Current;();Argument[this];ReturnValue;taint;df-generated |
+| System.Reflection.Metadata;ExportedTypeHandleCollection+Enumerator;get_Current;();Argument[this];ReturnValue;taint;dfc-generated |
 | System.Reflection.Metadata;ExportedTypeHandleCollection;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.Generic.IEnumerator`1.Current];value;manual |
 | System.Reflection.Metadata;ExportedTypeHandleCollection;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.IEnumerator.Current];value;manual |
-| System.Reflection.Metadata;FieldDefinition;DecodeSignature<TType,TGenericContext>;(System.Reflection.Metadata.ISignatureTypeProvider<TType,TGenericContext>,TGenericContext);Argument[0];ReturnValue;taint;df-generated |
-| System.Reflection.Metadata;FieldDefinition;DecodeSignature<TType,TGenericContext>;(System.Reflection.Metadata.ISignatureTypeProvider<TType,TGenericContext>,TGenericContext);Argument[1];ReturnValue;taint;df-generated |
 | System.Reflection.Metadata;FieldDefinition;GetCustomAttributes;();Argument[this];ReturnValue;taint;df-generated |
+| System.Reflection.Metadata;FieldDefinitionHandleCollection+Enumerator;get_Current;();Argument[this].Property[System.Reflection.Metadata.FieldDefinitionHandleCollection+Enumerator.Current];ReturnValue;value;df-generated |
+| System.Reflection.Metadata;FieldDefinitionHandleCollection+Enumerator;get_Current;();Argument[this].Property[System.Reflection.Metadata.FieldDefinitionHandleCollection+Enumerator.Current];ReturnValue;value;dfc-generated |
 | System.Reflection.Metadata;FieldDefinitionHandleCollection+Enumerator;get_Current;();Argument[this];ReturnValue;taint;df-generated |
+| System.Reflection.Metadata;FieldDefinitionHandleCollection+Enumerator;get_Current;();Argument[this];ReturnValue;taint;dfc-generated |
 | System.Reflection.Metadata;FieldDefinitionHandleCollection;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.Generic.IEnumerator`1.Current];value;manual |
 | System.Reflection.Metadata;FieldDefinitionHandleCollection;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.IEnumerator.Current];value;manual |
 | System.Reflection.Metadata;FieldDefinitionHandleCollection;GetEnumerator;();Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection.Metadata;GenericParameter;GetCustomAttributes;();Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection.Metadata;GenericParameterConstraint;GetCustomAttributes;();Argument[this];ReturnValue;taint;df-generated |
+| System.Reflection.Metadata;GenericParameterConstraintHandleCollection+Enumerator;get_Current;();Argument[this].Property[System.Reflection.Metadata.GenericParameterConstraintHandleCollection+Enumerator.Current];ReturnValue;value;df-generated |
+| System.Reflection.Metadata;GenericParameterConstraintHandleCollection+Enumerator;get_Current;();Argument[this].Property[System.Reflection.Metadata.GenericParameterConstraintHandleCollection+Enumerator.Current];ReturnValue;value;dfc-generated |
 | System.Reflection.Metadata;GenericParameterConstraintHandleCollection+Enumerator;get_Current;();Argument[this];ReturnValue;taint;df-generated |
+| System.Reflection.Metadata;GenericParameterConstraintHandleCollection+Enumerator;get_Current;();Argument[this];ReturnValue;taint;dfc-generated |
 | System.Reflection.Metadata;GenericParameterConstraintHandleCollection;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.Generic.IEnumerator`1.Current];value;manual |
 | System.Reflection.Metadata;GenericParameterConstraintHandleCollection;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.IEnumerator.Current];value;manual |
+| System.Reflection.Metadata;GenericParameterHandleCollection+Enumerator;get_Current;();Argument[this].Property[System.Reflection.Metadata.GenericParameterHandleCollection+Enumerator.Current];ReturnValue;value;df-generated |
+| System.Reflection.Metadata;GenericParameterHandleCollection+Enumerator;get_Current;();Argument[this].Property[System.Reflection.Metadata.GenericParameterHandleCollection+Enumerator.Current];ReturnValue;value;dfc-generated |
 | System.Reflection.Metadata;GenericParameterHandleCollection+Enumerator;get_Current;();Argument[this];ReturnValue;taint;df-generated |
+| System.Reflection.Metadata;GenericParameterHandleCollection+Enumerator;get_Current;();Argument[this];ReturnValue;taint;dfc-generated |
 | System.Reflection.Metadata;GenericParameterHandleCollection;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.Generic.IEnumerator`1.Current];value;manual |
 | System.Reflection.Metadata;GenericParameterHandleCollection;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.IEnumerator.Current];value;manual |
 | System.Reflection.Metadata;ImportDefinitionCollection+Enumerator;get_Current;();Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection.Metadata;ImportDefinitionCollection;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.Generic.IEnumerator`1.Current];value;manual |
 | System.Reflection.Metadata;ImportDefinitionCollection;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.IEnumerator.Current];value;manual |
 | System.Reflection.Metadata;ImportDefinitionCollection;GetEnumerator;();Argument[this];ReturnValue;taint;df-generated |
+| System.Reflection.Metadata;ImportScopeCollection+Enumerator;get_Current;();Argument[this].Property[System.Reflection.Metadata.ImportScopeCollection+Enumerator.Current];ReturnValue;value;df-generated |
+| System.Reflection.Metadata;ImportScopeCollection+Enumerator;get_Current;();Argument[this].Property[System.Reflection.Metadata.ImportScopeCollection+Enumerator.Current];ReturnValue;value;dfc-generated |
 | System.Reflection.Metadata;ImportScopeCollection+Enumerator;get_Current;();Argument[this];ReturnValue;taint;df-generated |
+| System.Reflection.Metadata;ImportScopeCollection+Enumerator;get_Current;();Argument[this];ReturnValue;taint;dfc-generated |
 | System.Reflection.Metadata;ImportScopeCollection;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.Generic.IEnumerator`1.Current];value;manual |
 | System.Reflection.Metadata;ImportScopeCollection;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.IEnumerator.Current];value;manual |
 | System.Reflection.Metadata;ImportScopeCollection;GetEnumerator;();Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection.Metadata;InterfaceImplementation;GetCustomAttributes;();Argument[this];ReturnValue;taint;df-generated |
+| System.Reflection.Metadata;InterfaceImplementationHandleCollection+Enumerator;get_Current;();Argument[this].Property[System.Reflection.Metadata.InterfaceImplementationHandleCollection+Enumerator.Current];ReturnValue;value;df-generated |
+| System.Reflection.Metadata;InterfaceImplementationHandleCollection+Enumerator;get_Current;();Argument[this].Property[System.Reflection.Metadata.InterfaceImplementationHandleCollection+Enumerator.Current];ReturnValue;value;dfc-generated |
 | System.Reflection.Metadata;InterfaceImplementationHandleCollection+Enumerator;get_Current;();Argument[this];ReturnValue;taint;df-generated |
+| System.Reflection.Metadata;InterfaceImplementationHandleCollection+Enumerator;get_Current;();Argument[this];ReturnValue;taint;dfc-generated |
 | System.Reflection.Metadata;InterfaceImplementationHandleCollection;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.Generic.IEnumerator`1.Current];value;manual |
 | System.Reflection.Metadata;InterfaceImplementationHandleCollection;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.IEnumerator.Current];value;manual |
 | System.Reflection.Metadata;InterfaceImplementationHandleCollection;GetEnumerator;();Argument[this];ReturnValue;taint;df-generated |
+| System.Reflection.Metadata;LocalConstantHandleCollection+Enumerator;get_Current;();Argument[this].Property[System.Reflection.Metadata.LocalConstantHandleCollection+Enumerator.Current];ReturnValue;value;df-generated |
+| System.Reflection.Metadata;LocalConstantHandleCollection+Enumerator;get_Current;();Argument[this].Property[System.Reflection.Metadata.LocalConstantHandleCollection+Enumerator.Current];ReturnValue;value;dfc-generated |
 | System.Reflection.Metadata;LocalConstantHandleCollection+Enumerator;get_Current;();Argument[this];ReturnValue;taint;df-generated |
+| System.Reflection.Metadata;LocalConstantHandleCollection+Enumerator;get_Current;();Argument[this];ReturnValue;taint;dfc-generated |
 | System.Reflection.Metadata;LocalConstantHandleCollection;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.Generic.IEnumerator`1.Current];value;manual |
 | System.Reflection.Metadata;LocalConstantHandleCollection;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.IEnumerator.Current];value;manual |
 | System.Reflection.Metadata;LocalConstantHandleCollection;GetEnumerator;();Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection.Metadata;LocalScope;GetChildren;();Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection.Metadata;LocalScope;GetLocalConstants;();Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection.Metadata;LocalScope;GetLocalVariables;();Argument[this];ReturnValue;taint;df-generated |
+| System.Reflection.Metadata;LocalScopeHandleCollection+ChildrenEnumerator;get_Current;();Argument[this].Property[System.Reflection.Metadata.LocalScopeHandleCollection+ChildrenEnumerator.Current];ReturnValue;value;df-generated |
+| System.Reflection.Metadata;LocalScopeHandleCollection+ChildrenEnumerator;get_Current;();Argument[this].Property[System.Reflection.Metadata.LocalScopeHandleCollection+ChildrenEnumerator.Current];ReturnValue;value;dfc-generated |
 | System.Reflection.Metadata;LocalScopeHandleCollection+ChildrenEnumerator;get_Current;();Argument[this];ReturnValue;taint;df-generated |
+| System.Reflection.Metadata;LocalScopeHandleCollection+ChildrenEnumerator;get_Current;();Argument[this];ReturnValue;taint;dfc-generated |
+| System.Reflection.Metadata;LocalScopeHandleCollection+Enumerator;get_Current;();Argument[this].Property[System.Reflection.Metadata.LocalScopeHandleCollection+Enumerator.Current];ReturnValue;value;df-generated |
+| System.Reflection.Metadata;LocalScopeHandleCollection+Enumerator;get_Current;();Argument[this].Property[System.Reflection.Metadata.LocalScopeHandleCollection+Enumerator.Current];ReturnValue;value;dfc-generated |
 | System.Reflection.Metadata;LocalScopeHandleCollection+Enumerator;get_Current;();Argument[this];ReturnValue;taint;df-generated |
+| System.Reflection.Metadata;LocalScopeHandleCollection+Enumerator;get_Current;();Argument[this];ReturnValue;taint;dfc-generated |
 | System.Reflection.Metadata;LocalScopeHandleCollection;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.Generic.IEnumerator`1.Current];value;manual |
 | System.Reflection.Metadata;LocalScopeHandleCollection;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.IEnumerator.Current];value;manual |
 | System.Reflection.Metadata;LocalScopeHandleCollection;GetEnumerator;();Argument[this];ReturnValue;taint;df-generated |
+| System.Reflection.Metadata;LocalVariableHandleCollection+Enumerator;get_Current;();Argument[this].Property[System.Reflection.Metadata.LocalVariableHandleCollection+Enumerator.Current];ReturnValue;value;df-generated |
+| System.Reflection.Metadata;LocalVariableHandleCollection+Enumerator;get_Current;();Argument[this].Property[System.Reflection.Metadata.LocalVariableHandleCollection+Enumerator.Current];ReturnValue;value;dfc-generated |
 | System.Reflection.Metadata;LocalVariableHandleCollection+Enumerator;get_Current;();Argument[this];ReturnValue;taint;df-generated |
+| System.Reflection.Metadata;LocalVariableHandleCollection+Enumerator;get_Current;();Argument[this];ReturnValue;taint;dfc-generated |
 | System.Reflection.Metadata;LocalVariableHandleCollection;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.Generic.IEnumerator`1.Current];value;manual |
 | System.Reflection.Metadata;LocalVariableHandleCollection;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.IEnumerator.Current];value;manual |
 | System.Reflection.Metadata;LocalVariableHandleCollection;GetEnumerator;();Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection.Metadata;ManifestResource;GetCustomAttributes;();Argument[this];ReturnValue;taint;df-generated |
+| System.Reflection.Metadata;ManifestResourceHandleCollection+Enumerator;get_Current;();Argument[this].Property[System.Reflection.Metadata.ManifestResourceHandleCollection+Enumerator.Current];ReturnValue;value;df-generated |
+| System.Reflection.Metadata;ManifestResourceHandleCollection+Enumerator;get_Current;();Argument[this].Property[System.Reflection.Metadata.ManifestResourceHandleCollection+Enumerator.Current];ReturnValue;value;dfc-generated |
 | System.Reflection.Metadata;ManifestResourceHandleCollection+Enumerator;get_Current;();Argument[this];ReturnValue;taint;df-generated |
+| System.Reflection.Metadata;ManifestResourceHandleCollection+Enumerator;get_Current;();Argument[this];ReturnValue;taint;dfc-generated |
 | System.Reflection.Metadata;ManifestResourceHandleCollection;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.Generic.IEnumerator`1.Current];value;manual |
 | System.Reflection.Metadata;ManifestResourceHandleCollection;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.IEnumerator.Current];value;manual |
-| System.Reflection.Metadata;MemberReference;DecodeFieldSignature<TType,TGenericContext>;(System.Reflection.Metadata.ISignatureTypeProvider<TType,TGenericContext>,TGenericContext);Argument[0];ReturnValue;taint;df-generated |
-| System.Reflection.Metadata;MemberReference;DecodeFieldSignature<TType,TGenericContext>;(System.Reflection.Metadata.ISignatureTypeProvider<TType,TGenericContext>,TGenericContext);Argument[1];ReturnValue;taint;df-generated |
 | System.Reflection.Metadata;MemberReference;GetCustomAttributes;();Argument[this];ReturnValue;taint;df-generated |
+| System.Reflection.Metadata;MemberReferenceHandleCollection+Enumerator;get_Current;();Argument[this].Property[System.Reflection.Metadata.MemberReferenceHandleCollection+Enumerator.Current];ReturnValue;value;df-generated |
+| System.Reflection.Metadata;MemberReferenceHandleCollection+Enumerator;get_Current;();Argument[this].Property[System.Reflection.Metadata.MemberReferenceHandleCollection+Enumerator.Current];ReturnValue;value;dfc-generated |
 | System.Reflection.Metadata;MemberReferenceHandleCollection+Enumerator;get_Current;();Argument[this];ReturnValue;taint;df-generated |
+| System.Reflection.Metadata;MemberReferenceHandleCollection+Enumerator;get_Current;();Argument[this];ReturnValue;taint;dfc-generated |
 | System.Reflection.Metadata;MemberReferenceHandleCollection;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.Generic.IEnumerator`1.Current];value;manual |
 | System.Reflection.Metadata;MemberReferenceHandleCollection;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.IEnumerator.Current];value;manual |
 | System.Reflection.Metadata;MetadataReader;GetAssemblyDefinition;();Argument[this];ReturnValue;taint;df-generated |
@@ -14640,31 +15004,38 @@ summary
 | System.Reflection.Metadata;MetadataReaderProvider;FromPortablePdbImage;(System.Collections.Immutable.ImmutableArray<System.Byte>);Argument[0].Element;ReturnValue;taint;df-generated |
 | System.Reflection.Metadata;MetadataReaderProvider;FromPortablePdbStream;(System.IO.Stream,System.Reflection.Metadata.MetadataStreamOptions,System.Int32);Argument[0];ReturnValue;taint;df-generated |
 | System.Reflection.Metadata;MetadataReaderProvider;GetMetadataReader;(System.Reflection.Metadata.MetadataReaderOptions,System.Reflection.Metadata.MetadataStringDecoder);Argument[this];ReturnValue;taint;df-generated |
-| System.Reflection.Metadata;MetadataStringDecoder;GetString;(System.Byte*,System.Int32);Argument[0];ReturnValue;taint;df-generated |
-| System.Reflection.Metadata;MetadataStringDecoder;GetString;(System.Byte*,System.Int32);Argument[this];ReturnValue;taint;df-generated |
+| System.Reflection.Metadata;MetadataStringDecoder;GetString;(System.Byte*,System.Int32);Argument[0].Element;ReturnValue;taint;dfc-generated |
 | System.Reflection.Metadata;MethodBodyBlock;Create;(System.Reflection.Metadata.BlobReader);Argument[0];ReturnValue;taint;df-generated |
 | System.Reflection.Metadata;MethodBodyBlock;GetILReader;();Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection.Metadata;MethodBodyBlock;get_ExceptionRegions;();Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection.Metadata;MethodBodyBlock;get_LocalSignature;();Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection.Metadata;MethodDebugInformation;GetSequencePoints;();Argument[this];ReturnValue;taint;df-generated |
+| System.Reflection.Metadata;MethodDebugInformationHandleCollection+Enumerator;get_Current;();Argument[this].Property[System.Reflection.Metadata.MethodDebugInformationHandleCollection+Enumerator.Current];ReturnValue;value;df-generated |
+| System.Reflection.Metadata;MethodDebugInformationHandleCollection+Enumerator;get_Current;();Argument[this].Property[System.Reflection.Metadata.MethodDebugInformationHandleCollection+Enumerator.Current];ReturnValue;value;dfc-generated |
 | System.Reflection.Metadata;MethodDebugInformationHandleCollection+Enumerator;get_Current;();Argument[this];ReturnValue;taint;df-generated |
+| System.Reflection.Metadata;MethodDebugInformationHandleCollection+Enumerator;get_Current;();Argument[this];ReturnValue;taint;dfc-generated |
 | System.Reflection.Metadata;MethodDebugInformationHandleCollection;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.Generic.IEnumerator`1.Current];value;manual |
 | System.Reflection.Metadata;MethodDebugInformationHandleCollection;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.IEnumerator.Current];value;manual |
 | System.Reflection.Metadata;MethodDebugInformationHandleCollection;GetEnumerator;();Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection.Metadata;MethodDefinition;GetCustomAttributes;();Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection.Metadata;MethodDefinition;GetDeclarativeSecurityAttributes;();Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection.Metadata;MethodDefinition;GetParameters;();Argument[this];ReturnValue;taint;df-generated |
+| System.Reflection.Metadata;MethodDefinitionHandleCollection+Enumerator;get_Current;();Argument[this].Property[System.Reflection.Metadata.MethodDefinitionHandleCollection+Enumerator.Current];ReturnValue;value;df-generated |
+| System.Reflection.Metadata;MethodDefinitionHandleCollection+Enumerator;get_Current;();Argument[this].Property[System.Reflection.Metadata.MethodDefinitionHandleCollection+Enumerator.Current];ReturnValue;value;dfc-generated |
 | System.Reflection.Metadata;MethodDefinitionHandleCollection+Enumerator;get_Current;();Argument[this];ReturnValue;taint;df-generated |
+| System.Reflection.Metadata;MethodDefinitionHandleCollection+Enumerator;get_Current;();Argument[this];ReturnValue;taint;dfc-generated |
 | System.Reflection.Metadata;MethodDefinitionHandleCollection;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.Generic.IEnumerator`1.Current];value;manual |
 | System.Reflection.Metadata;MethodDefinitionHandleCollection;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.IEnumerator.Current];value;manual |
 | System.Reflection.Metadata;MethodDefinitionHandleCollection;GetEnumerator;();Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection.Metadata;MethodImplementation;GetCustomAttributes;();Argument[this];ReturnValue;taint;df-generated |
+| System.Reflection.Metadata;MethodImplementationHandleCollection+Enumerator;get_Current;();Argument[this].Property[System.Reflection.Metadata.MethodImplementationHandleCollection+Enumerator.Current];ReturnValue;value;df-generated |
+| System.Reflection.Metadata;MethodImplementationHandleCollection+Enumerator;get_Current;();Argument[this].Property[System.Reflection.Metadata.MethodImplementationHandleCollection+Enumerator.Current];ReturnValue;value;dfc-generated |
 | System.Reflection.Metadata;MethodImplementationHandleCollection+Enumerator;get_Current;();Argument[this];ReturnValue;taint;df-generated |
+| System.Reflection.Metadata;MethodImplementationHandleCollection+Enumerator;get_Current;();Argument[this];ReturnValue;taint;dfc-generated |
 | System.Reflection.Metadata;MethodImplementationHandleCollection;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.Generic.IEnumerator`1.Current];value;manual |
 | System.Reflection.Metadata;MethodImplementationHandleCollection;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.IEnumerator.Current];value;manual |
 | System.Reflection.Metadata;MethodImport;get_Module;();Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection.Metadata;MethodImport;get_Name;();Argument[this];ReturnValue;taint;df-generated |
-| System.Reflection.Metadata;MethodSpecification;DecodeSignature<TType,TGenericContext>;(System.Reflection.Metadata.ISignatureTypeProvider<TType,TGenericContext>,TGenericContext);Argument[1];ReturnValue;taint;df-generated |
 | System.Reflection.Metadata;MethodSpecification;GetCustomAttributes;();Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection.Metadata;ModuleDefinition;GetCustomAttributes;();Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection.Metadata;ModuleReference;GetCustomAttributes;();Argument[this];ReturnValue;taint;df-generated |
@@ -14677,13 +15048,19 @@ summary
 | System.Reflection.Metadata;PEReaderExtensions;GetMetadataReader;(System.Reflection.PortableExecutable.PEReader,System.Reflection.Metadata.MetadataReaderOptions);Argument[0];ReturnValue;taint;df-generated |
 | System.Reflection.Metadata;PEReaderExtensions;GetMetadataReader;(System.Reflection.PortableExecutable.PEReader,System.Reflection.Metadata.MetadataReaderOptions,System.Reflection.Metadata.MetadataStringDecoder);Argument[0];ReturnValue;taint;df-generated |
 | System.Reflection.Metadata;Parameter;GetCustomAttributes;();Argument[this];ReturnValue;taint;df-generated |
+| System.Reflection.Metadata;ParameterHandleCollection+Enumerator;get_Current;();Argument[this].Property[System.Reflection.Metadata.ParameterHandleCollection+Enumerator.Current];ReturnValue;value;df-generated |
+| System.Reflection.Metadata;ParameterHandleCollection+Enumerator;get_Current;();Argument[this].Property[System.Reflection.Metadata.ParameterHandleCollection+Enumerator.Current];ReturnValue;value;dfc-generated |
 | System.Reflection.Metadata;ParameterHandleCollection+Enumerator;get_Current;();Argument[this];ReturnValue;taint;df-generated |
+| System.Reflection.Metadata;ParameterHandleCollection+Enumerator;get_Current;();Argument[this];ReturnValue;taint;dfc-generated |
 | System.Reflection.Metadata;ParameterHandleCollection;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.Generic.IEnumerator`1.Current];value;manual |
 | System.Reflection.Metadata;ParameterHandleCollection;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.IEnumerator.Current];value;manual |
 | System.Reflection.Metadata;ParameterHandleCollection;GetEnumerator;();Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection.Metadata;PropertyAccessors;get_Others;();Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection.Metadata;PropertyDefinition;GetCustomAttributes;();Argument[this];ReturnValue;taint;df-generated |
+| System.Reflection.Metadata;PropertyDefinitionHandleCollection+Enumerator;get_Current;();Argument[this].Property[System.Reflection.Metadata.PropertyDefinitionHandleCollection+Enumerator.Current];ReturnValue;value;df-generated |
+| System.Reflection.Metadata;PropertyDefinitionHandleCollection+Enumerator;get_Current;();Argument[this].Property[System.Reflection.Metadata.PropertyDefinitionHandleCollection+Enumerator.Current];ReturnValue;value;dfc-generated |
 | System.Reflection.Metadata;PropertyDefinitionHandleCollection+Enumerator;get_Current;();Argument[this];ReturnValue;taint;df-generated |
+| System.Reflection.Metadata;PropertyDefinitionHandleCollection+Enumerator;get_Current;();Argument[this];ReturnValue;taint;dfc-generated |
 | System.Reflection.Metadata;PropertyDefinitionHandleCollection;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.Generic.IEnumerator`1.Current];value;manual |
 | System.Reflection.Metadata;PropertyDefinitionHandleCollection;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.IEnumerator.Current];value;manual |
 | System.Reflection.Metadata;PropertyDefinitionHandleCollection;GetEnumerator;();Argument[this];ReturnValue;taint;df-generated |
@@ -14691,7 +15068,6 @@ summary
 | System.Reflection.Metadata;SequencePointCollection;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.Generic.IEnumerator`1.Current];value;manual |
 | System.Reflection.Metadata;SequencePointCollection;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.IEnumerator.Current];value;manual |
 | System.Reflection.Metadata;SequencePointCollection;GetEnumerator;();Argument[this];ReturnValue;taint;df-generated |
-| System.Reflection.Metadata;StandaloneSignature;DecodeLocalSignature<TType,TGenericContext>;(System.Reflection.Metadata.ISignatureTypeProvider<TType,TGenericContext>,TGenericContext);Argument[1];ReturnValue;taint;df-generated |
 | System.Reflection.Metadata;StandaloneSignature;GetCustomAttributes;();Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection.Metadata;TypeDefinition;GetCustomAttributes;();Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection.Metadata;TypeDefinition;GetDeclarativeSecurityAttributes;();Argument[this];ReturnValue;taint;df-generated |
@@ -14700,25 +15076,33 @@ summary
 | System.Reflection.Metadata;TypeDefinition;GetInterfaceImplementations;();Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection.Metadata;TypeDefinition;GetMethods;();Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection.Metadata;TypeDefinition;GetProperties;();Argument[this];ReturnValue;taint;df-generated |
+| System.Reflection.Metadata;TypeDefinitionHandleCollection+Enumerator;get_Current;();Argument[this].Property[System.Reflection.Metadata.TypeDefinitionHandleCollection+Enumerator.Current];ReturnValue;value;df-generated |
+| System.Reflection.Metadata;TypeDefinitionHandleCollection+Enumerator;get_Current;();Argument[this].Property[System.Reflection.Metadata.TypeDefinitionHandleCollection+Enumerator.Current];ReturnValue;value;dfc-generated |
 | System.Reflection.Metadata;TypeDefinitionHandleCollection+Enumerator;get_Current;();Argument[this];ReturnValue;taint;df-generated |
+| System.Reflection.Metadata;TypeDefinitionHandleCollection+Enumerator;get_Current;();Argument[this];ReturnValue;taint;dfc-generated |
 | System.Reflection.Metadata;TypeDefinitionHandleCollection;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.Generic.IEnumerator`1.Current];value;manual |
 | System.Reflection.Metadata;TypeDefinitionHandleCollection;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.IEnumerator.Current];value;manual |
+| System.Reflection.Metadata;TypeReferenceHandleCollection+Enumerator;get_Current;();Argument[this].Property[System.Reflection.Metadata.TypeReferenceHandleCollection+Enumerator.Current];ReturnValue;value;df-generated |
+| System.Reflection.Metadata;TypeReferenceHandleCollection+Enumerator;get_Current;();Argument[this].Property[System.Reflection.Metadata.TypeReferenceHandleCollection+Enumerator.Current];ReturnValue;value;dfc-generated |
 | System.Reflection.Metadata;TypeReferenceHandleCollection+Enumerator;get_Current;();Argument[this];ReturnValue;taint;df-generated |
+| System.Reflection.Metadata;TypeReferenceHandleCollection+Enumerator;get_Current;();Argument[this];ReturnValue;taint;dfc-generated |
 | System.Reflection.Metadata;TypeReferenceHandleCollection;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.Generic.IEnumerator`1.Current];value;manual |
 | System.Reflection.Metadata;TypeReferenceHandleCollection;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.IEnumerator.Current];value;manual |
-| System.Reflection.Metadata;TypeSpecification;DecodeSignature<TType,TGenericContext>;(System.Reflection.Metadata.ISignatureTypeProvider<TType,TGenericContext>,TGenericContext);Argument[0];ReturnValue;taint;df-generated |
-| System.Reflection.Metadata;TypeSpecification;DecodeSignature<TType,TGenericContext>;(System.Reflection.Metadata.ISignatureTypeProvider<TType,TGenericContext>,TGenericContext);Argument[1];ReturnValue;taint;df-generated |
 | System.Reflection.Metadata;TypeSpecification;GetCustomAttributes;();Argument[this];ReturnValue;taint;df-generated |
+| System.Reflection.PortableExecutable;DebugDirectoryBuilder;AddEntry<TData>;(System.Reflection.PortableExecutable.DebugDirectoryEntryType,System.UInt32,System.UInt32,TData,System.Action<System.Reflection.Metadata.BlobBuilder,TData>);Argument[3];Argument[4].Parameter[1];value;dfc-generated |
+| System.Reflection.PortableExecutable;DebugDirectoryBuilder;AddEntry<TData>;(System.Reflection.PortableExecutable.DebugDirectoryEntryType,System.UInt32,System.UInt32,TData,System.Action<System.Reflection.Metadata.BlobBuilder,TData>);Argument[3];Argument[4].Parameter[1];value;hq-generated |
+| System.Reflection.PortableExecutable;DebugDirectoryBuilder;AddEntry<TData>;(System.Reflection.PortableExecutable.DebugDirectoryEntryType,System.UInt32,System.UInt32,TData,System.Action<System.Reflection.Metadata.BlobBuilder,TData>);Argument[4];Argument[4].Parameter[delegate-self];value;dfc-generated |
 | System.Reflection.PortableExecutable;DebugDirectoryBuilder;AddEntry<TData>;(System.Reflection.PortableExecutable.DebugDirectoryEntryType,System.UInt32,System.UInt32,TData,System.Action<System.Reflection.Metadata.BlobBuilder,TData>);Argument[4];Argument[4].Parameter[delegate-self];value;hq-generated |
 | System.Reflection.PortableExecutable;ManagedPEBuilder;GetDirectories;();Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection.PortableExecutable;ManagedPEBuilder;ManagedPEBuilder;(System.Reflection.PortableExecutable.PEHeaderBuilder,System.Reflection.Metadata.Ecma335.MetadataRootBuilder,System.Reflection.Metadata.BlobBuilder,System.Reflection.Metadata.BlobBuilder,System.Reflection.Metadata.BlobBuilder,System.Reflection.PortableExecutable.ResourceSectionBuilder,System.Reflection.PortableExecutable.DebugDirectoryBuilder,System.Int32,System.Reflection.Metadata.MethodDefinitionHandle,System.Reflection.PortableExecutable.CorFlags,System.Func<System.Collections.Generic.IEnumerable<System.Reflection.Metadata.Blob>,System.Reflection.Metadata.BlobContentId>);Argument[10];Argument[10].Parameter[delegate-self];value;hq-generated |
 | System.Reflection.PortableExecutable;ManagedPEBuilder;SerializeSection;(System.String,System.Reflection.PortableExecutable.SectionLocation);Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection.PortableExecutable;ManagedPEBuilder;Sign;(System.Reflection.Metadata.BlobBuilder,System.Func<System.Collections.Generic.IEnumerable<System.Reflection.Metadata.Blob>,System.Byte[]>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
-| System.Reflection.PortableExecutable;PEBuilder+Section;Section;(System.String,System.Reflection.PortableExecutable.SectionCharacteristics);Argument[0];Argument[this];taint;df-generated |
+| System.Reflection.PortableExecutable;PEBuilder+Section;Section;(System.String,System.Reflection.PortableExecutable.SectionCharacteristics);Argument[0];Argument[this].Field[System.Reflection.PortableExecutable.PEBuilder+Section.Name];value;dfc-generated |
 | System.Reflection.PortableExecutable;PEBuilder;GetDirectories;();Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection.PortableExecutable;PEBuilder;GetSections;();Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection.PortableExecutable;PEBuilder;PEBuilder;(System.Reflection.PortableExecutable.PEHeaderBuilder,System.Func<System.Collections.Generic.IEnumerable<System.Reflection.Metadata.Blob>,System.Reflection.Metadata.BlobContentId>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
 | System.Reflection.PortableExecutable;PEBuilder;Serialize;(System.Reflection.Metadata.BlobBuilder);Argument[0];Argument[this];taint;df-generated |
+| System.Reflection.PortableExecutable;PEBuilder;Serialize;(System.Reflection.Metadata.BlobBuilder);Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection.PortableExecutable;PEBuilder;SerializeSection;(System.String,System.Reflection.PortableExecutable.SectionLocation);Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection.PortableExecutable;PEHeaders;get_CoffHeader;();Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection.PortableExecutable;PEHeaders;get_CorHeader;();Argument[this];ReturnValue;taint;df-generated |
@@ -14732,11 +15116,15 @@ summary
 | System.Reflection.PortableExecutable;PEReader;PEReader;(System.Byte*,System.Int32,System.Boolean);Argument[0];Argument[this];taint;df-generated |
 | System.Reflection.PortableExecutable;PEReader;PEReader;(System.Collections.Immutable.ImmutableArray<System.Byte>);Argument[0].Element;Argument[this];taint;df-generated |
 | System.Reflection.PortableExecutable;PEReader;PEReader;(System.IO.Stream,System.Reflection.PortableExecutable.PEStreamOptions,System.Int32);Argument[0];Argument[this];taint;df-generated |
+| System.Reflection.PortableExecutable;PEReader;TryOpenAssociatedPortablePdb;(System.String,System.Func<System.String,System.IO.Stream>,System.Reflection.Metadata.MetadataReaderProvider,System.String);Argument[0];Argument[1].Parameter[0];taint;dfc-generated |
+| System.Reflection.PortableExecutable;PEReader;TryOpenAssociatedPortablePdb;(System.String,System.Func<System.String,System.IO.Stream>,System.Reflection.Metadata.MetadataReaderProvider,System.String);Argument[0];Argument[1].Parameter[0];taint;hq-generated |
+| System.Reflection.PortableExecutable;PEReader;TryOpenAssociatedPortablePdb;(System.String,System.Func<System.String,System.IO.Stream>,System.Reflection.Metadata.MetadataReaderProvider,System.String);Argument[0];ReturnValue;taint;dfc-generated |
+| System.Reflection.PortableExecutable;PEReader;TryOpenAssociatedPortablePdb;(System.String,System.Func<System.String,System.IO.Stream>,System.Reflection.Metadata.MetadataReaderProvider,System.String);Argument[0];ReturnValue;taint;hq-generated |
+| System.Reflection.PortableExecutable;PEReader;TryOpenAssociatedPortablePdb;(System.String,System.Func<System.String,System.IO.Stream>,System.Reflection.Metadata.MetadataReaderProvider,System.String);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | System.Reflection.PortableExecutable;PEReader;TryOpenAssociatedPortablePdb;(System.String,System.Func<System.String,System.IO.Stream>,System.Reflection.Metadata.MetadataReaderProvider,System.String);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
 | System.Reflection.PortableExecutable;PEReader;get_PEHeaders;();Argument[this];ReturnValue;taint;df-generated |
-| System.Reflection;Assembly;CreateQualifiedName;(System.String,System.String);Argument[0];ReturnValue;taint;df-generated |
-| System.Reflection;Assembly;CreateQualifiedName;(System.String,System.String);Argument[1];ReturnValue;taint;df-generated |
-| System.Reflection;Assembly;GetCustomAttributes;(System.Boolean);Argument[this];ReturnValue;taint;df-generated |
+| System.Reflection;Assembly;CreateQualifiedName;(System.String,System.String);Argument[0];ReturnValue;taint;dfc-generated |
+| System.Reflection;Assembly;CreateQualifiedName;(System.String,System.String);Argument[1];ReturnValue;taint;dfc-generated |
 | System.Reflection;Assembly;GetFile;(System.String);Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection;Assembly;GetLoadedModules;();Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection;Assembly;GetLoadedModules;(System.Boolean);Argument[this];ReturnValue;taint;df-generated |
@@ -14748,52 +15136,63 @@ summary
 | System.Reflection;Assembly;GetObjectData;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);Argument[this];Argument[0];taint;df-generated |
 | System.Reflection;Assembly;GetSatelliteAssembly;(System.Globalization.CultureInfo);Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection;Assembly;GetSatelliteAssembly;(System.Globalization.CultureInfo,System.Version);Argument[this];ReturnValue;taint;df-generated |
-| System.Reflection;Assembly;GetType;(System.String,System.Boolean,System.Boolean);Argument[0];ReturnValue;taint;df-generated |
 | System.Reflection;Assembly;GetType;(System.String,System.Boolean,System.Boolean);Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection;Assembly;LoadModule;(System.String,System.Byte[]);Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection;Assembly;LoadModule;(System.String,System.Byte[],System.Byte[]);Argument[this];ReturnValue;taint;df-generated |
-| System.Reflection;Assembly;ToString;();Argument[this];ReturnValue;taint;df-generated |
+| System.Reflection;Assembly;ToString;();Argument[this].Property[System.Reflection.Assembly.FullName];ReturnValue;value;dfc-generated |
 | System.Reflection;Assembly;add_ModuleResolve;(System.Reflection.ModuleResolveEventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Reflection;Assembly;get_CodeBase;();Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection;Assembly;get_CustomAttributes;();Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection;Assembly;get_EntryPoint;();Argument[this];ReturnValue;taint;df-generated |
-| System.Reflection;Assembly;get_EscapedCodeBase;();Argument[this];ReturnValue;taint;df-generated |
+| System.Reflection;Assembly;get_EscapedCodeBase;();Argument[this].Property[System.Reflection.Assembly.CodeBase];ReturnValue;value;dfc-generated |
 | System.Reflection;Assembly;get_FullName;();Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection;Assembly;get_ImageRuntimeVersion;();Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection;Assembly;get_Location;();Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection;Assembly;get_ManifestModule;();Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection;Assembly;get_Modules;();Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection;Assembly;remove_ModuleResolve;(System.Reflection.ModuleResolveEventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
-| System.Reflection;AssemblyExtensions;GetModules;(System.Reflection.Assembly);Argument[0];ReturnValue;taint;df-generated |
-| System.Reflection;AssemblyName;Clone;();Argument[this];ReturnValue;taint;df-generated |
-| System.Reflection;AssemblyName;Clone;();Argument[this];ReturnValue;value;df-generated |
+| System.Reflection;AssemblyName;Clone;();Argument[this];ReturnValue;value;dfc-generated |
 | System.Reflection;AssemblyName;GetObjectData;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);Argument[this];Argument[0];taint;df-generated |
-| System.Reflection;AssemblyName;GetPublicKey;();Argument[this];ReturnValue;taint;df-generated |
-| System.Reflection;AssemblyName;SetPublicKey;(System.Byte[]);Argument[0].Element;Argument[this];taint;df-generated |
+| System.Reflection;AssemblyName;GetPublicKey;();Argument[this].SyntheticField[System.Reflection.AssemblyName._publicKey];ReturnValue;value;dfc-generated |
+| System.Reflection;AssemblyName;SetPublicKey;(System.Byte[]);Argument[0];Argument[this].SyntheticField[System.Reflection.AssemblyName._publicKey];value;dfc-generated |
 | System.Reflection;AssemblyName;SetPublicKeyToken;(System.Byte[]);Argument[0].Element;Argument[this];taint;df-generated |
-| System.Reflection;AssemblyName;ToString;();Argument[this];ReturnValue;taint;df-generated |
+| System.Reflection;AssemblyName;ToString;();Argument[this].Property[System.Reflection.AssemblyName.FullName];ReturnValue;value;dfc-generated |
 | System.Reflection;AssemblyName;get_EscapedCodeBase;();Argument[this];ReturnValue;taint;df-generated |
-| System.Reflection;Binder;BindToField;(System.Reflection.BindingFlags,System.Reflection.FieldInfo[],System.Object,System.Globalization.CultureInfo);Argument[1].Element;ReturnValue;taint;df-generated |
-| System.Reflection;Binder;BindToMethod;(System.Reflection.BindingFlags,System.Reflection.MethodBase[],System.Object[],System.Reflection.ParameterModifier[],System.Globalization.CultureInfo,System.String[],System.Object);Argument[1].Element;ReturnValue;taint;df-generated |
-| System.Reflection;Binder;BindToMethod;(System.Reflection.BindingFlags,System.Reflection.MethodBase[],System.Object[],System.Reflection.ParameterModifier[],System.Globalization.CultureInfo,System.String[],System.Object);Argument[2].Element;ReturnValue;taint;df-generated |
-| System.Reflection;Binder;ReorderArgumentArray;(System.Object[],System.Object);Argument[0].Element;ReturnValue;taint;df-generated |
-| System.Reflection;Binder;SelectMethod;(System.Reflection.BindingFlags,System.Reflection.MethodBase[],System.Type[],System.Reflection.ParameterModifier[]);Argument[1].Element;ReturnValue;taint;df-generated |
-| System.Reflection;Binder;SelectProperty;(System.Reflection.BindingFlags,System.Reflection.PropertyInfo[],System.Type,System.Type[],System.Reflection.ParameterModifier[]);Argument[1].Element;ReturnValue;taint;df-generated |
+| System.Reflection;Binder;BindToField;(System.Reflection.BindingFlags,System.Reflection.FieldInfo[],System.Object,System.Globalization.CultureInfo);Argument[1].Element;ReturnValue;value;dfc-generated |
+| System.Reflection;Binder;BindToMethod;(System.Reflection.BindingFlags,System.Reflection.MethodBase[],System.Object[],System.Reflection.ParameterModifier[],System.Globalization.CultureInfo,System.String[],System.Object);Argument[1].Element;ReturnValue;value;dfc-generated |
+| System.Reflection;Binder;BindToMethod;(System.Reflection.BindingFlags,System.Reflection.MethodBase[],System.Object[],System.Reflection.ParameterModifier[],System.Globalization.CultureInfo,System.String[],System.Object);Argument[2].Element;ReturnValue.Element;value;dfc-generated |
+| System.Reflection;Binder;BindToMethod;(System.Reflection.BindingFlags,System.Reflection.MethodBase[],System.Object[],System.Reflection.ParameterModifier[],System.Globalization.CultureInfo,System.String[],System.Object);Argument[2];ReturnValue;value;dfc-generated |
+| System.Reflection;Binder;ReorderArgumentArray;(System.Object[],System.Object);Argument[0].Element.Element;Argument[0].Element;value;dfc-generated |
+| System.Reflection;Binder;ReorderArgumentArray;(System.Object[],System.Object);Argument[0].Element.Element;ReturnValue.Element;value;dfc-generated |
+| System.Reflection;Binder;ReorderArgumentArray;(System.Object[],System.Object);Argument[0];ReturnValue;value;dfc-generated |
+| System.Reflection;Binder;SelectMethod;(System.Reflection.BindingFlags,System.Reflection.MethodBase[],System.Type[],System.Reflection.ParameterModifier[]);Argument[1].Element;ReturnValue;value;dfc-generated |
+| System.Reflection;Binder;SelectProperty;(System.Reflection.BindingFlags,System.Reflection.PropertyInfo[],System.Type,System.Type[],System.Reflection.ParameterModifier[]);Argument[1].Element;ReturnValue;value;dfc-generated |
+| System.Reflection;ConstructorInvoker;Invoke;(System.Object);Argument[0];Argument[this];taint;df-generated |
+| System.Reflection;ConstructorInvoker;Invoke;(System.Object,System.Object);Argument[0];Argument[this];taint;df-generated |
+| System.Reflection;ConstructorInvoker;Invoke;(System.Object,System.Object);Argument[1];Argument[this];taint;df-generated |
+| System.Reflection;ConstructorInvoker;Invoke;(System.Object,System.Object,System.Object);Argument[0];Argument[this];taint;df-generated |
+| System.Reflection;ConstructorInvoker;Invoke;(System.Object,System.Object,System.Object);Argument[1];Argument[this];taint;df-generated |
+| System.Reflection;ConstructorInvoker;Invoke;(System.Object,System.Object,System.Object);Argument[2];Argument[this];taint;df-generated |
+| System.Reflection;ConstructorInvoker;Invoke;(System.Object,System.Object,System.Object,System.Object);Argument[0];Argument[this];taint;df-generated |
+| System.Reflection;ConstructorInvoker;Invoke;(System.Object,System.Object,System.Object,System.Object);Argument[1];Argument[this];taint;df-generated |
+| System.Reflection;ConstructorInvoker;Invoke;(System.Object,System.Object,System.Object,System.Object);Argument[2];Argument[this];taint;df-generated |
+| System.Reflection;ConstructorInvoker;Invoke;(System.Object,System.Object,System.Object,System.Object);Argument[3];Argument[this];taint;df-generated |
+| System.Reflection;ConstructorInvoker;Invoke;(System.Span<System.Object>);Argument[0];Argument[this];taint;df-generated |
 | System.Reflection;CustomAttributeData;get_Constructor;();Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection;CustomAttributeData;get_ConstructorArguments;();Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection;CustomAttributeData;get_NamedArguments;();Argument[this];ReturnValue;taint;df-generated |
-| System.Reflection;CustomAttributeNamedArgument;CustomAttributeNamedArgument;(System.Reflection.MemberInfo,System.Object);Argument[0];Argument[this];taint;df-generated |
-| System.Reflection;CustomAttributeNamedArgument;CustomAttributeNamedArgument;(System.Reflection.MemberInfo,System.Object);Argument[1];Argument[this];taint;df-generated |
-| System.Reflection;CustomAttributeNamedArgument;CustomAttributeNamedArgument;(System.Reflection.MemberInfo,System.Reflection.CustomAttributeTypedArgument);Argument[0];Argument[this];taint;df-generated |
-| System.Reflection;CustomAttributeNamedArgument;CustomAttributeNamedArgument;(System.Reflection.MemberInfo,System.Reflection.CustomAttributeTypedArgument);Argument[1];Argument[this];taint;df-generated |
+| System.Reflection;CustomAttributeNamedArgument;CustomAttributeNamedArgument;(System.Reflection.MemberInfo,System.Object);Argument[0];Argument[this].SyntheticField[System.Reflection.CustomAttributeNamedArgument._memberInfo];value;dfc-generated |
+| System.Reflection;CustomAttributeNamedArgument;CustomAttributeNamedArgument;(System.Reflection.MemberInfo,System.Reflection.CustomAttributeTypedArgument);Argument[0];Argument[this].SyntheticField[System.Reflection.CustomAttributeNamedArgument._memberInfo];value;dfc-generated |
+| System.Reflection;CustomAttributeNamedArgument;CustomAttributeNamedArgument;(System.Reflection.MemberInfo,System.Reflection.CustomAttributeTypedArgument);Argument[1];Argument[this].SyntheticField[System.Reflection.CustomAttributeNamedArgument._value];value;dfc-generated |
 | System.Reflection;CustomAttributeNamedArgument;ToString;();Argument[this];ReturnValue;taint;df-generated |
-| System.Reflection;CustomAttributeNamedArgument;get_MemberInfo;();Argument[this];ReturnValue;taint;df-generated |
+| System.Reflection;CustomAttributeNamedArgument;get_MemberInfo;();Argument[this].SyntheticField[System.Reflection.CustomAttributeNamedArgument._memberInfo];ReturnValue;value;dfc-generated |
 | System.Reflection;CustomAttributeNamedArgument;get_MemberName;();Argument[this];ReturnValue;taint;df-generated |
-| System.Reflection;CustomAttributeNamedArgument;get_TypedValue;();Argument[this];ReturnValue;taint;df-generated |
-| System.Reflection;CustomAttributeTypedArgument;CustomAttributeTypedArgument;(System.Object);Argument[0];Argument[this];taint;df-generated |
-| System.Reflection;CustomAttributeTypedArgument;CustomAttributeTypedArgument;(System.Type,System.Object);Argument[1];Argument[this];taint;df-generated |
-| System.Reflection;CustomAttributeTypedArgument;ToString;();Argument[this];ReturnValue;taint;df-generated |
-| System.Reflection;CustomAttributeTypedArgument;get_Value;();Argument[this];ReturnValue;taint;df-generated |
+| System.Reflection;CustomAttributeNamedArgument;get_TypedValue;();Argument[this].SyntheticField[System.Reflection.CustomAttributeNamedArgument._value];ReturnValue;value;dfc-generated |
+| System.Reflection;CustomAttributeTypedArgument;CustomAttributeTypedArgument;(System.Object);Argument[0];Argument[this].SyntheticField[System.Reflection.CustomAttributeTypedArgument._value];value;dfc-generated |
+| System.Reflection;CustomAttributeTypedArgument;CustomAttributeTypedArgument;(System.Type,System.Object);Argument[1];Argument[this].SyntheticField[System.Reflection.CustomAttributeTypedArgument._value];value;dfc-generated |
+| System.Reflection;CustomAttributeTypedArgument;ToString;();Argument[this].Property[System.Reflection.CustomAttributeTypedArgument.Value];ReturnValue;taint;dfc-generated |
+| System.Reflection;CustomAttributeTypedArgument;ToString;();Argument[this].SyntheticField[System.Reflection.CustomAttributeTypedArgument._value];ReturnValue;taint;dfc-generated |
+| System.Reflection;CustomAttributeTypedArgument;get_Value;();Argument[this].SyntheticField[System.Reflection.CustomAttributeTypedArgument._value];ReturnValue;value;dfc-generated |
 | System.Reflection;EventInfo;GetAddMethod;();Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection;EventInfo;GetAddMethod;(System.Boolean);Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection;EventInfo;GetRaiseMethod;();Argument[this];ReturnValue;taint;df-generated |
@@ -14804,25 +15203,19 @@ summary
 | System.Reflection;EventInfo;get_EventHandlerType;();Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection;EventInfo;get_RaiseMethod;();Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection;EventInfo;get_RemoveMethod;();Argument[this];ReturnValue;taint;df-generated |
-| System.Reflection;EventInfoExtensions;GetAddMethod;(System.Reflection.EventInfo);Argument[0];ReturnValue;taint;df-generated |
 | System.Reflection;EventInfoExtensions;GetAddMethod;(System.Reflection.EventInfo,System.Boolean);Argument[0];ReturnValue;taint;df-generated |
-| System.Reflection;EventInfoExtensions;GetRaiseMethod;(System.Reflection.EventInfo);Argument[0];ReturnValue;taint;df-generated |
 | System.Reflection;EventInfoExtensions;GetRaiseMethod;(System.Reflection.EventInfo,System.Boolean);Argument[0];ReturnValue;taint;df-generated |
-| System.Reflection;EventInfoExtensions;GetRemoveMethod;(System.Reflection.EventInfo);Argument[0];ReturnValue;taint;df-generated |
 | System.Reflection;EventInfoExtensions;GetRemoveMethod;(System.Reflection.EventInfo,System.Boolean);Argument[0];ReturnValue;taint;df-generated |
 | System.Reflection;ExceptionHandlingClause;get_CatchType;();Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection;FieldInfo;GetModifiedFieldType;();Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection;FieldInfo;get_FieldHandle;();Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection;FieldInfo;get_FieldType;();Argument[this];ReturnValue;taint;df-generated |
-| System.Reflection;ICustomAttributeProvider;GetCustomAttributes;(System.Boolean);Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection;IReflect;GetField;(System.String,System.Reflection.BindingFlags);Argument[this];ReturnValue;taint;df-generated |
-| System.Reflection;IReflect;get_UnderlyingSystemType;();Argument[this];ReturnValue;taint;df-generated |
-| System.Reflection;IReflect;get_UnderlyingSystemType;();Argument[this];ReturnValue;value;df-generated |
-| System.Reflection;IReflectableType;GetTypeInfo;();Argument[this];ReturnValue;value;df-generated |
+| System.Reflection;IReflect;get_UnderlyingSystemType;();Argument[this];ReturnValue;value;dfc-generated |
+| System.Reflection;IReflectableType;GetTypeInfo;();Argument[this];ReturnValue;value;dfc-generated |
 | System.Reflection;LocalVariableInfo;get_LocalType;();Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection;ManifestResourceInfo;get_ReferencedAssembly;();Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection;MemberFilter;BeginInvoke;(System.Reflection.MemberInfo,System.Object,System.AsyncCallback,System.Object);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
-| System.Reflection;MemberInfo;GetCustomAttributes;(System.Boolean);Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection;MemberInfo;get_CustomAttributes;();Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection;MemberInfo;get_DeclaringType;();Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection;MemberInfo;get_Module;();Argument[this];ReturnValue;taint;df-generated |
@@ -14831,26 +15224,54 @@ summary
 | System.Reflection;MethodBase;GetGenericArguments;();Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection;MethodBase;GetMethodBody;();Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection;MethodBase;GetParameters;();Argument[this];ReturnValue;taint;df-generated |
+| System.Reflection;MethodBase;Invoke;(System.Object,System.Object[]);Argument[0];Argument[this];taint;df-generated |
+| System.Reflection;MethodBase;Invoke;(System.Object,System.Object[]);Argument[1].Element;Argument[this];taint;df-generated |
+| System.Reflection;MethodBase;Invoke;(System.Object,System.Object[]);Argument[this];ReturnValue;taint;df-generated |
+| System.Reflection;MethodBase;Invoke;(System.Object,System.Reflection.BindingFlags,System.Reflection.Binder,System.Object[],System.Globalization.CultureInfo);Argument[0];Argument[this];taint;df-generated |
+| System.Reflection;MethodBase;Invoke;(System.Object,System.Reflection.BindingFlags,System.Reflection.Binder,System.Object[],System.Globalization.CultureInfo);Argument[3].Element;Argument[this];taint;df-generated |
+| System.Reflection;MethodBase;Invoke;(System.Object,System.Reflection.BindingFlags,System.Reflection.Binder,System.Object[],System.Globalization.CultureInfo);Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection;MethodBase;get_MethodHandle;();Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection;MethodBody;GetILAsByteArray;();Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection;MethodBody;get_ExceptionHandlingClauses;();Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection;MethodBody;get_LocalVariables;();Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection;MethodInfo;CreateDelegate;(System.Type);Argument[this];ReturnValue;taint;df-generated |
-| System.Reflection;MethodInfo;CreateDelegate<T>;();Argument[this];ReturnValue;taint;df-generated |
-| System.Reflection;MethodInfo;GetBaseDefinition;();Argument[this];ReturnValue;taint;df-generated |
-| System.Reflection;MethodInfo;GetBaseDefinition;();Argument[this];ReturnValue;value;df-generated |
+| System.Reflection;MethodInfo;GetBaseDefinition;();Argument[this];ReturnValue;value;dfc-generated |
 | System.Reflection;MethodInfo;GetGenericArguments;();Argument[this];ReturnValue;taint;df-generated |
-| System.Reflection;MethodInfo;GetGenericMethodDefinition;();Argument[this];ReturnValue;taint;df-generated |
-| System.Reflection;MethodInfo;GetGenericMethodDefinition;();Argument[this];ReturnValue;value;df-generated |
+| System.Reflection;MethodInfo;GetGenericMethodDefinition;();Argument[this];ReturnValue;value;dfc-generated |
 | System.Reflection;MethodInfo;MakeGenericMethod;(System.Type[]);Argument[0].Element;ReturnValue;taint;df-generated |
 | System.Reflection;MethodInfo;MakeGenericMethod;(System.Type[]);Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection;MethodInfo;get_ReturnParameter;();Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection;MethodInfo;get_ReturnType;();Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection;MethodInfo;get_ReturnTypeCustomAttributes;();Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection;MethodInfoExtensions;GetBaseDefinition;(System.Reflection.MethodInfo);Argument[0];ReturnValue;taint;df-generated |
+| System.Reflection;MethodInvoker;Invoke;(System.Object);Argument[0];Argument[this];taint;df-generated |
+| System.Reflection;MethodInvoker;Invoke;(System.Object);Argument[this];ReturnValue;taint;df-generated |
+| System.Reflection;MethodInvoker;Invoke;(System.Object,System.Object);Argument[0];Argument[this];taint;df-generated |
+| System.Reflection;MethodInvoker;Invoke;(System.Object,System.Object);Argument[1];Argument[this];taint;df-generated |
+| System.Reflection;MethodInvoker;Invoke;(System.Object,System.Object);Argument[this];ReturnValue;taint;df-generated |
+| System.Reflection;MethodInvoker;Invoke;(System.Object,System.Object,System.Object);Argument[0];Argument[this];taint;df-generated |
+| System.Reflection;MethodInvoker;Invoke;(System.Object,System.Object,System.Object);Argument[1];Argument[this];taint;df-generated |
+| System.Reflection;MethodInvoker;Invoke;(System.Object,System.Object,System.Object);Argument[2];Argument[this];taint;df-generated |
+| System.Reflection;MethodInvoker;Invoke;(System.Object,System.Object,System.Object);Argument[this];ReturnValue;taint;df-generated |
+| System.Reflection;MethodInvoker;Invoke;(System.Object,System.Object,System.Object,System.Object);Argument[0];Argument[this];taint;df-generated |
+| System.Reflection;MethodInvoker;Invoke;(System.Object,System.Object,System.Object,System.Object);Argument[1];Argument[this];taint;df-generated |
+| System.Reflection;MethodInvoker;Invoke;(System.Object,System.Object,System.Object,System.Object);Argument[2];Argument[this];taint;df-generated |
+| System.Reflection;MethodInvoker;Invoke;(System.Object,System.Object,System.Object,System.Object);Argument[3];Argument[this];taint;df-generated |
+| System.Reflection;MethodInvoker;Invoke;(System.Object,System.Object,System.Object,System.Object);Argument[this];ReturnValue;taint;df-generated |
+| System.Reflection;MethodInvoker;Invoke;(System.Object,System.Object,System.Object,System.Object,System.Object);Argument[0];Argument[this];taint;df-generated |
+| System.Reflection;MethodInvoker;Invoke;(System.Object,System.Object,System.Object,System.Object,System.Object);Argument[1];Argument[this];taint;df-generated |
+| System.Reflection;MethodInvoker;Invoke;(System.Object,System.Object,System.Object,System.Object,System.Object);Argument[2];Argument[this];taint;df-generated |
+| System.Reflection;MethodInvoker;Invoke;(System.Object,System.Object,System.Object,System.Object,System.Object);Argument[3];Argument[this];taint;df-generated |
+| System.Reflection;MethodInvoker;Invoke;(System.Object,System.Object,System.Object,System.Object,System.Object);Argument[4];Argument[this];taint;df-generated |
+| System.Reflection;MethodInvoker;Invoke;(System.Object,System.Object,System.Object,System.Object,System.Object);Argument[this];ReturnValue;taint;df-generated |
+| System.Reflection;MethodInvoker;Invoke;(System.Object,System.Span<System.Object>);Argument[0];Argument[this];taint;df-generated |
+| System.Reflection;MethodInvoker;Invoke;(System.Object,System.Span<System.Object>);Argument[1];Argument[this];taint;df-generated |
+| System.Reflection;MethodInvoker;Invoke;(System.Object,System.Span<System.Object>);Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection;Missing;GetObjectData;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);Argument[this];Argument[0];taint;df-generated |
+| System.Reflection;Module;FindTypes;(System.Reflection.TypeFilter,System.Object);Argument[0];Argument[0].Parameter[delegate-self];value;dfc-generated |
 | System.Reflection;Module;FindTypes;(System.Reflection.TypeFilter,System.Object);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
-| System.Reflection;Module;GetCustomAttributes;(System.Boolean);Argument[this];ReturnValue;taint;df-generated |
+| System.Reflection;Module;FindTypes;(System.Reflection.TypeFilter,System.Object);Argument[1];Argument[0].Parameter[1];value;dfc-generated |
+| System.Reflection;Module;FindTypes;(System.Reflection.TypeFilter,System.Object);Argument[1];Argument[0].Parameter[1];value;hq-generated |
 | System.Reflection;Module;GetField;(System.String);Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection;Module;GetField;(System.String,System.Reflection.BindingFlags);Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection;Module;GetMethod;(System.String);Argument[this];ReturnValue;taint;df-generated |
@@ -14874,16 +15295,15 @@ summary
 | System.Reflection;Module;get_ModuleVersionId;();Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection;Module;get_Name;();Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection;Module;get_ScopeName;();Argument[this];ReturnValue;taint;df-generated |
-| System.Reflection;ModuleExtensions;GetModuleVersionId;(System.Reflection.Module);Argument[0];ReturnValue;taint;df-generated |
+| System.Reflection;ModuleExtensions;GetModuleVersionId;(System.Reflection.Module);Argument[0].Property[System.Reflection.Module.ModuleVersionId];ReturnValue;value;dfc-generated |
 | System.Reflection;ModuleResolveEventHandler;BeginInvoke;(System.Object,System.ResolveEventArgs,System.AsyncCallback,System.Object);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
-| System.Reflection;ParameterInfo;GetCustomAttributes;(System.Boolean);Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection;ParameterInfo;GetModifiedParameterType;();Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection;ParameterInfo;GetRealObject;(System.Runtime.Serialization.StreamingContext);Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection;ParameterInfo;ToString;();Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection;ParameterInfo;get_CustomAttributes;();Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection;ParameterInfo;get_DefaultValue;();Argument[this];ReturnValue;taint;df-generated |
-| System.Reflection;ParameterInfo;get_Member;();Argument[this];ReturnValue;taint;df-generated |
-| System.Reflection;ParameterInfo;get_Name;();Argument[this];ReturnValue;taint;df-generated |
+| System.Reflection;ParameterInfo;get_Member;();Argument[this].Field[System.Reflection.ParameterInfo.MemberImpl];ReturnValue;value;dfc-generated |
+| System.Reflection;ParameterInfo;get_Name;();Argument[this].Field[System.Reflection.ParameterInfo.NameImpl];ReturnValue;value;dfc-generated |
 | System.Reflection;ParameterInfo;get_ParameterType;();Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection;ParameterInfo;get_RawDefaultValue;();Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection;Pointer;Box;(System.Void*,System.Type);Argument[0];ReturnValue;taint;df-generated |
@@ -14898,27 +15318,25 @@ summary
 | System.Reflection;PropertyInfo;GetModifiedPropertyType;();Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection;PropertyInfo;GetSetMethod;();Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection;PropertyInfo;GetSetMethod;(System.Boolean);Argument[this];ReturnValue;taint;df-generated |
+| System.Reflection;PropertyInfo;GetValue;(System.Object);Argument[0];Argument[this];taint;df-generated |
+| System.Reflection;PropertyInfo;GetValue;(System.Object);Argument[this];ReturnValue;taint;df-generated |
+| System.Reflection;PropertyInfo;GetValue;(System.Object,System.Object[]);Argument[0];Argument[this];taint;df-generated |
+| System.Reflection;PropertyInfo;GetValue;(System.Object,System.Object[]);Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection;PropertyInfo;get_GetMethod;();Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection;PropertyInfo;get_PropertyType;();Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection;PropertyInfo;get_SetMethod;();Argument[this];ReturnValue;taint;df-generated |
-| System.Reflection;PropertyInfoExtensions;GetAccessors;(System.Reflection.PropertyInfo);Argument[0];ReturnValue;taint;df-generated |
 | System.Reflection;PropertyInfoExtensions;GetAccessors;(System.Reflection.PropertyInfo,System.Boolean);Argument[0];ReturnValue;taint;df-generated |
-| System.Reflection;PropertyInfoExtensions;GetGetMethod;(System.Reflection.PropertyInfo);Argument[0];ReturnValue;taint;df-generated |
 | System.Reflection;PropertyInfoExtensions;GetGetMethod;(System.Reflection.PropertyInfo,System.Boolean);Argument[0];ReturnValue;taint;df-generated |
-| System.Reflection;PropertyInfoExtensions;GetSetMethod;(System.Reflection.PropertyInfo);Argument[0];ReturnValue;taint;df-generated |
 | System.Reflection;PropertyInfoExtensions;GetSetMethod;(System.Reflection.PropertyInfo,System.Boolean);Argument[0];ReturnValue;taint;df-generated |
-| System.Reflection;ReflectionContext;GetTypeForObject;(System.Object);Argument[this];ReturnValue;taint;df-generated |
-| System.Reflection;ReflectionContext;MapAssembly;(System.Reflection.Assembly);Argument[0];ReturnValue;taint;df-generated |
-| System.Reflection;ReflectionContext;MapAssembly;(System.Reflection.Assembly);Argument[this];ReturnValue;taint;df-generated |
-| System.Reflection;ReflectionContext;MapType;(System.Reflection.TypeInfo);Argument[0];ReturnValue;taint;df-generated |
-| System.Reflection;ReflectionContext;MapType;(System.Reflection.TypeInfo);Argument[this];ReturnValue;taint;df-generated |
+| System.Reflection;ReflectionContext;MapAssembly;(System.Reflection.Assembly);Argument[0];ReturnValue;value;dfc-generated |
+| System.Reflection;ReflectionContext;MapType;(System.Reflection.TypeInfo);Argument[0];ReturnValue;value;dfc-generated |
 | System.Reflection;ReflectionTypeLoadException;GetObjectData;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);Argument[this];Argument[0];taint;df-generated |
-| System.Reflection;ReflectionTypeLoadException;get_Message;();Argument[this];ReturnValue;taint;df-generated |
-| System.Reflection;RuntimeReflectionExtensions;GetMethodInfo;(System.Delegate);Argument[0];ReturnValue;taint;df-generated |
+| System.Reflection;ReflectionTypeLoadException;get_Message;();Argument[this].Property[System.Exception.Message];ReturnValue;value;dfc-generated |
+| System.Reflection;ReflectionTypeLoadException;get_Message;();Argument[this].SyntheticField[System.Exception._message];ReturnValue;value;dfc-generated |
+| System.Reflection;RuntimeReflectionExtensions;GetMethodInfo;(System.Delegate);Argument[0].Property[System.Delegate.Method];ReturnValue;value;dfc-generated |
 | System.Reflection;RuntimeReflectionExtensions;GetRuntimeBaseDefinition;(System.Reflection.MethodInfo);Argument[0];ReturnValue;taint;df-generated |
 | System.Reflection;StrongNameKeyPair;GetObjectData;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);Argument[this];Argument[0];taint;df-generated |
 | System.Reflection;TypeDelegator;GetConstructorImpl;(System.Reflection.BindingFlags,System.Reflection.Binder,System.Reflection.CallingConventions,System.Type[],System.Reflection.ParameterModifier[]);Argument[this];ReturnValue;taint;df-generated |
-| System.Reflection;TypeDelegator;GetCustomAttributes;(System.Boolean);Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection;TypeDelegator;GetElementType;();Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection;TypeDelegator;GetEvent;(System.String,System.Reflection.BindingFlags);Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection;TypeDelegator;GetField;(System.String,System.Reflection.BindingFlags);Argument[this];ReturnValue;taint;df-generated |
@@ -14938,30 +15356,23 @@ summary
 | System.Reflection;TypeDelegator;get_Name;();Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection;TypeDelegator;get_Namespace;();Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection;TypeDelegator;get_TypeHandle;();Argument[this];ReturnValue;taint;df-generated |
-| System.Reflection;TypeDelegator;get_UnderlyingSystemType;();Argument[this];ReturnValue;taint;df-generated |
-| System.Reflection;TypeDelegator;get_UnderlyingSystemType;();Argument[this];ReturnValue;value;df-generated |
+| System.Reflection;TypeDelegator;get_UnderlyingSystemType;();Argument[this];ReturnValue;value;dfc-generated |
 | System.Reflection;TypeFilter;BeginInvoke;(System.Type,System.Object,System.AsyncCallback,System.Object);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
-| System.Reflection;TypeInfo;AsType;();Argument[this];ReturnValue;value;df-generated |
+| System.Reflection;TypeInfo;AsType;();Argument[this];ReturnValue;value;dfc-generated |
 | System.Reflection;TypeInfo;GetDeclaredEvent;(System.String);Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection;TypeInfo;GetDeclaredField;(System.String);Argument[this];ReturnValue;taint;df-generated |
-| System.Reflection;TypeInfo;GetTypeInfo;();Argument[this];ReturnValue;value;df-generated |
+| System.Reflection;TypeInfo;GetTypeInfo;();Argument[this];ReturnValue;value;dfc-generated |
 | System.Reflection;TypeInfo;get_GenericTypeParameters;();Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection;TypeInfo;get_ImplementedInterfaces;();Argument[this];ReturnValue;taint;df-generated |
 | System.Resources;IResourceReader;GetEnumerator;();Argument[this];ReturnValue;taint;df-generated |
-| System.Resources;MissingSatelliteAssemblyException;MissingSatelliteAssemblyException;(System.String,System.String);Argument[1];Argument[this];taint;df-generated |
-| System.Resources;MissingSatelliteAssemblyException;get_CultureName;();Argument[this];ReturnValue;taint;df-generated |
-| System.Resources;ResourceManager;CreateFileBasedResourceManager;(System.String,System.String,System.Type);Argument[0];ReturnValue;taint;df-generated |
-| System.Resources;ResourceManager;CreateFileBasedResourceManager;(System.String,System.String,System.Type);Argument[1];ReturnValue;taint;df-generated |
+| System.Resources;MissingSatelliteAssemblyException;MissingSatelliteAssemblyException;(System.String,System.String);Argument[1];Argument[this].SyntheticField[System.Resources.MissingSatelliteAssemblyException._cultureName];value;dfc-generated |
+| System.Resources;MissingSatelliteAssemblyException;get_CultureName;();Argument[this].SyntheticField[System.Resources.MissingSatelliteAssemblyException._cultureName];ReturnValue;value;dfc-generated |
 | System.Resources;ResourceManager;GetObject;(System.String,System.Globalization.CultureInfo);Argument[1];Argument[this];taint;df-generated |
-| System.Resources;ResourceManager;GetResourceFileName;(System.Globalization.CultureInfo);Argument[0];ReturnValue;taint;df-generated |
-| System.Resources;ResourceManager;GetResourceFileName;(System.Globalization.CultureInfo);Argument[this];ReturnValue;taint;df-generated |
+| System.Resources;ResourceManager;GetResourceFileName;(System.Globalization.CultureInfo);Argument[0].Property[System.Globalization.CultureInfo.Name];ReturnValue;taint;dfc-generated |
 | System.Resources;ResourceManager;GetStream;(System.String,System.Globalization.CultureInfo);Argument[1];Argument[this];taint;df-generated |
 | System.Resources;ResourceManager;GetString;(System.String,System.Globalization.CultureInfo);Argument[1];Argument[this];taint;df-generated |
-| System.Resources;ResourceManager;ResourceManager;(System.String,System.Reflection.Assembly);Argument[0];Argument[this];taint;df-generated |
-| System.Resources;ResourceManager;ResourceManager;(System.String,System.Reflection.Assembly);Argument[1];Argument[this];taint;df-generated |
-| System.Resources;ResourceManager;ResourceManager;(System.String,System.Reflection.Assembly,System.Type);Argument[0];Argument[this];taint;df-generated |
-| System.Resources;ResourceManager;ResourceManager;(System.String,System.Reflection.Assembly,System.Type);Argument[1];Argument[this];taint;df-generated |
-| System.Resources;ResourceManager;get_BaseName;();Argument[this];ReturnValue;taint;df-generated |
+| System.Resources;ResourceManager;ResourceManager;(System.String,System.Reflection.Assembly);Argument[1];Argument[this].Field[System.Resources.ResourceManager.MainAssembly];value;dfc-generated |
+| System.Resources;ResourceManager;ResourceManager;(System.String,System.Reflection.Assembly,System.Type);Argument[1];Argument[this].Field[System.Resources.ResourceManager.MainAssembly];value;dfc-generated |
 | System.Resources;ResourceReader;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.IEnumerator.Current];value;manual |
 | System.Resources;ResourceReader;GetEnumerator;();Argument[this];ReturnValue;taint;df-generated |
 | System.Resources;ResourceReader;GetResourceData;(System.String,System.String,System.Byte[]);Argument[this];ReturnValue;taint;df-generated |
@@ -14971,31 +15382,54 @@ summary
 | System.Resources;ResourceSet;GetObject;(System.String);Argument[this];ReturnValue;taint;df-generated |
 | System.Resources;ResourceSet;GetObject;(System.String,System.Boolean);Argument[this];ReturnValue;taint;df-generated |
 | System.Resources;ResourceSet;ResourceSet;(System.IO.Stream);Argument[0];Argument[this];taint;df-generated |
-| System.Resources;ResourceSet;ResourceSet;(System.Resources.IResourceReader);Argument[0].Element;Argument[this];taint;df-generated |
 | System.Resources;ResourceWriter;ResourceWriter;(System.IO.Stream);Argument[0];Argument[this];taint;df-generated |
 | System.Resources;ResourceWriter;ResourceWriter;(System.String);Argument[0];Argument[this];taint;df-generated |
 | System.Resources;ResourceWriter;set_TypeNameConverter;(System.Func<System.Type,System.String>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
-| System.Runtime.CompilerServices;AsyncIteratorMethodBuilder;AwaitOnCompleted<TAwaiter,TStateMachine>;(TAwaiter,TStateMachine);Argument[1];Argument[this];taint;df-generated |
-| System.Runtime.CompilerServices;AsyncIteratorMethodBuilder;AwaitUnsafeOnCompleted<TAwaiter,TStateMachine>;(TAwaiter,TStateMachine);Argument[1];Argument[this];taint;df-generated |
-| System.Runtime.CompilerServices;AsyncTaskMethodBuilder;AwaitOnCompleted<TAwaiter,TStateMachine>;(TAwaiter,TStateMachine);Argument[1];Argument[this];taint;df-generated |
-| System.Runtime.CompilerServices;AsyncTaskMethodBuilder;AwaitUnsafeOnCompleted<TAwaiter,TStateMachine>;(TAwaiter,TStateMachine);Argument[1];Argument[this];taint;df-generated |
+| System.Runtime.CompilerServices;AsyncIteratorMethodBuilder;AwaitOnCompleted<TAwaiter,TStateMachine>;(TAwaiter,TStateMachine);Argument[0];ReturnValue;value;dfc-generated |
+| System.Runtime.CompilerServices;AsyncIteratorMethodBuilder;AwaitOnCompleted<TAwaiter,TStateMachine>;(TAwaiter,TStateMachine);Argument[1];ReturnValue;value;dfc-generated |
+| System.Runtime.CompilerServices;AsyncIteratorMethodBuilder;AwaitUnsafeOnCompleted<TAwaiter,TStateMachine>;(TAwaiter,TStateMachine);Argument[0];ReturnValue;value;dfc-generated |
+| System.Runtime.CompilerServices;AsyncIteratorMethodBuilder;AwaitUnsafeOnCompleted<TAwaiter,TStateMachine>;(TAwaiter,TStateMachine);Argument[1];ReturnValue;value;dfc-generated |
+| System.Runtime.CompilerServices;AsyncIteratorMethodBuilder;MoveNext<TStateMachine>;(TStateMachine);Argument[0];ReturnValue;value;dfc-generated |
+| System.Runtime.CompilerServices;AsyncTaskMethodBuilder;AwaitOnCompleted<TAwaiter,TStateMachine>;(TAwaiter,TStateMachine);Argument[0];ReturnValue;value;dfc-generated |
+| System.Runtime.CompilerServices;AsyncTaskMethodBuilder;AwaitOnCompleted<TAwaiter,TStateMachine>;(TAwaiter,TStateMachine);Argument[1];ReturnValue;value;dfc-generated |
+| System.Runtime.CompilerServices;AsyncTaskMethodBuilder;AwaitUnsafeOnCompleted<TAwaiter,TStateMachine>;(TAwaiter,TStateMachine);Argument[0];ReturnValue;value;dfc-generated |
+| System.Runtime.CompilerServices;AsyncTaskMethodBuilder;AwaitUnsafeOnCompleted<TAwaiter,TStateMachine>;(TAwaiter,TStateMachine);Argument[1];ReturnValue;value;dfc-generated |
+| System.Runtime.CompilerServices;AsyncTaskMethodBuilder;Start<TStateMachine>;(TStateMachine);Argument[0];ReturnValue;value;dfc-generated |
 | System.Runtime.CompilerServices;AsyncTaskMethodBuilder;get_Task;();Argument[this];ReturnValue;taint;df-generated |
-| System.Runtime.CompilerServices;AsyncTaskMethodBuilder<TResult>;AwaitOnCompleted<TAwaiter,TStateMachine>;(TAwaiter,TStateMachine);Argument[1];Argument[this];taint;df-generated |
-| System.Runtime.CompilerServices;AsyncTaskMethodBuilder<TResult>;AwaitUnsafeOnCompleted<TAwaiter,TStateMachine>;(TAwaiter,TStateMachine);Argument[1];Argument[this];taint;df-generated |
-| System.Runtime.CompilerServices;AsyncTaskMethodBuilder<TResult>;SetResult;(TResult);Argument[0];Argument[this];taint;df-generated |
-| System.Runtime.CompilerServices;AsyncTaskMethodBuilder<TResult>;get_Task;();Argument[this];ReturnValue;taint;df-generated |
-| System.Runtime.CompilerServices;AsyncValueTaskMethodBuilder;AwaitOnCompleted<TAwaiter,TStateMachine>;(TAwaiter,TStateMachine);Argument[1];Argument[this];taint;df-generated |
-| System.Runtime.CompilerServices;AsyncValueTaskMethodBuilder;AwaitUnsafeOnCompleted<TAwaiter,TStateMachine>;(TAwaiter,TStateMachine);Argument[1];Argument[this];taint;df-generated |
-| System.Runtime.CompilerServices;AsyncValueTaskMethodBuilder<TResult>;AwaitOnCompleted<TAwaiter,TStateMachine>;(TAwaiter,TStateMachine);Argument[1];Argument[this];taint;df-generated |
-| System.Runtime.CompilerServices;AsyncValueTaskMethodBuilder<TResult>;AwaitUnsafeOnCompleted<TAwaiter,TStateMachine>;(TAwaiter,TStateMachine);Argument[1];Argument[this];taint;df-generated |
+| System.Runtime.CompilerServices;AsyncTaskMethodBuilder<TResult>;AwaitOnCompleted<TAwaiter,TStateMachine>;(TAwaiter,TStateMachine);Argument[0];ReturnValue;value;dfc-generated |
+| System.Runtime.CompilerServices;AsyncTaskMethodBuilder<TResult>;AwaitOnCompleted<TAwaiter,TStateMachine>;(TAwaiter,TStateMachine);Argument[1];ReturnValue;value;dfc-generated |
+| System.Runtime.CompilerServices;AsyncTaskMethodBuilder<TResult>;AwaitUnsafeOnCompleted<TAwaiter,TStateMachine>;(TAwaiter,TStateMachine);Argument[0];ReturnValue;value;dfc-generated |
+| System.Runtime.CompilerServices;AsyncTaskMethodBuilder<TResult>;AwaitUnsafeOnCompleted<TAwaiter,TStateMachine>;(TAwaiter,TStateMachine);Argument[1];ReturnValue;value;dfc-generated |
+| System.Runtime.CompilerServices;AsyncTaskMethodBuilder<TResult>;SetResult;(TResult);Argument[0];Argument[this].SyntheticField[System.Runtime.CompilerServices.AsyncTaskMethodBuilder`1.m_task].Property[System.Threading.Tasks.Task`1.Result];value;dfc-generated |
+| System.Runtime.CompilerServices;AsyncTaskMethodBuilder<TResult>;Start<TStateMachine>;(TStateMachine);Argument[0];ReturnValue;value;dfc-generated |
+| System.Runtime.CompilerServices;AsyncTaskMethodBuilder<TResult>;get_Task;();Argument[this].SyntheticField[System.Runtime.CompilerServices.AsyncTaskMethodBuilder`1.m_task];ReturnValue;value;dfc-generated |
+| System.Runtime.CompilerServices;AsyncValueTaskMethodBuilder;AwaitOnCompleted<TAwaiter,TStateMachine>;(TAwaiter,TStateMachine);Argument[0];ReturnValue;value;dfc-generated |
+| System.Runtime.CompilerServices;AsyncValueTaskMethodBuilder;AwaitOnCompleted<TAwaiter,TStateMachine>;(TAwaiter,TStateMachine);Argument[1];ReturnValue;value;dfc-generated |
+| System.Runtime.CompilerServices;AsyncValueTaskMethodBuilder;AwaitUnsafeOnCompleted<TAwaiter,TStateMachine>;(TAwaiter,TStateMachine);Argument[0];ReturnValue;value;dfc-generated |
+| System.Runtime.CompilerServices;AsyncValueTaskMethodBuilder;AwaitUnsafeOnCompleted<TAwaiter,TStateMachine>;(TAwaiter,TStateMachine);Argument[1];ReturnValue;value;dfc-generated |
+| System.Runtime.CompilerServices;AsyncValueTaskMethodBuilder;Start<TStateMachine>;(TStateMachine);Argument[0];ReturnValue;value;dfc-generated |
+| System.Runtime.CompilerServices;AsyncValueTaskMethodBuilder<TResult>;AwaitOnCompleted<TAwaiter,TStateMachine>;(TAwaiter,TStateMachine);Argument[0];ReturnValue;value;dfc-generated |
+| System.Runtime.CompilerServices;AsyncValueTaskMethodBuilder<TResult>;AwaitOnCompleted<TAwaiter,TStateMachine>;(TAwaiter,TStateMachine);Argument[1];ReturnValue;value;dfc-generated |
+| System.Runtime.CompilerServices;AsyncValueTaskMethodBuilder<TResult>;AwaitUnsafeOnCompleted<TAwaiter,TStateMachine>;(TAwaiter,TStateMachine);Argument[0];ReturnValue;value;dfc-generated |
+| System.Runtime.CompilerServices;AsyncValueTaskMethodBuilder<TResult>;AwaitUnsafeOnCompleted<TAwaiter,TStateMachine>;(TAwaiter,TStateMachine);Argument[1];ReturnValue;value;dfc-generated |
 | System.Runtime.CompilerServices;AsyncValueTaskMethodBuilder<TResult>;SetResult;(TResult);Argument[0];Argument[this];taint;df-generated |
+| System.Runtime.CompilerServices;AsyncValueTaskMethodBuilder<TResult>;Start<TStateMachine>;(TStateMachine);Argument[0];ReturnValue;value;dfc-generated |
 | System.Runtime.CompilerServices;AsyncValueTaskMethodBuilder<TResult>;get_Task;();Argument[this];ReturnValue;taint;df-generated |
+| System.Runtime.CompilerServices;AsyncVoidMethodBuilder;AwaitOnCompleted<TAwaiter,TStateMachine>;(TAwaiter,TStateMachine);Argument[0];ReturnValue;value;dfc-generated |
+| System.Runtime.CompilerServices;AsyncVoidMethodBuilder;AwaitOnCompleted<TAwaiter,TStateMachine>;(TAwaiter,TStateMachine);Argument[1];ReturnValue;value;dfc-generated |
+| System.Runtime.CompilerServices;AsyncVoidMethodBuilder;AwaitUnsafeOnCompleted<TAwaiter,TStateMachine>;(TAwaiter,TStateMachine);Argument[0];ReturnValue;value;dfc-generated |
+| System.Runtime.CompilerServices;AsyncVoidMethodBuilder;AwaitUnsafeOnCompleted<TAwaiter,TStateMachine>;(TAwaiter,TStateMachine);Argument[1];ReturnValue;value;dfc-generated |
+| System.Runtime.CompilerServices;AsyncVoidMethodBuilder;Start<TStateMachine>;(TStateMachine);Argument[0];ReturnValue;value;dfc-generated |
 | System.Runtime.CompilerServices;CallSite;get_Binder;();Argument[this];ReturnValue;taint;df-generated |
 | System.Runtime.CompilerServices;ConditionalWeakTable<TKey,TValue>+CreateValueCallback;BeginInvoke;(TKey,System.AsyncCallback,System.Object);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
 | System.Runtime.CompilerServices;ConditionalWeakTable<TKey,TValue>;Clear;();Argument[this].WithoutElement;Argument[this];value;manual |
 | System.Runtime.CompilerServices;ConditionalWeakTable<TKey,TValue>;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.Generic.IEnumerator`1.Current];value;manual |
 | System.Runtime.CompilerServices;ConditionalWeakTable<TKey,TValue>;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.IEnumerator.Current];value;manual |
-| System.Runtime.CompilerServices;ConditionalWeakTable<TKey,TValue>;GetOrCreateValue;(TKey);Argument[0];ReturnValue;taint;df-generated |
+| System.Runtime.CompilerServices;ConditionalWeakTable<TKey,TValue>;GetValue;(TKey,System.Runtime.CompilerServices.ConditionalWeakTable<TKey,TValue>+CreateValueCallback);Argument[0];Argument[1].Parameter[0];value;dfc-generated |
+| System.Runtime.CompilerServices;ConditionalWeakTable<TKey,TValue>;GetValue;(TKey,System.Runtime.CompilerServices.ConditionalWeakTable<TKey,TValue>+CreateValueCallback);Argument[0];Argument[1].Parameter[0];value;hq-generated |
+| System.Runtime.CompilerServices;ConditionalWeakTable<TKey,TValue>;GetValue;(TKey,System.Runtime.CompilerServices.ConditionalWeakTable<TKey,TValue>+CreateValueCallback);Argument[1].ReturnValue;ReturnValue;value;dfc-generated |
+| System.Runtime.CompilerServices;ConditionalWeakTable<TKey,TValue>;GetValue;(TKey,System.Runtime.CompilerServices.ConditionalWeakTable<TKey,TValue>+CreateValueCallback);Argument[1].ReturnValue;ReturnValue;value;hq-generated |
+| System.Runtime.CompilerServices;ConditionalWeakTable<TKey,TValue>;GetValue;(TKey,System.Runtime.CompilerServices.ConditionalWeakTable<TKey,TValue>+CreateValueCallback);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | System.Runtime.CompilerServices;ConditionalWeakTable<TKey,TValue>;GetValue;(TKey,System.Runtime.CompilerServices.ConditionalWeakTable<TKey,TValue>+CreateValueCallback);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
 | System.Runtime.CompilerServices;ConfiguredCancelableAsyncEnumerable<T>+Enumerator;get_Current;();Argument[this];ReturnValue;taint;df-generated |
 | System.Runtime.CompilerServices;ConfiguredCancelableAsyncEnumerable<T>;ConfigureAwait;(System.Boolean);Argument[this];ReturnValue;taint;df-generated |
@@ -15016,23 +15450,29 @@ summary
 | System.Runtime.CompilerServices;ConfiguredValueTaskAwaitable<TResult>+ConfiguredValueTaskAwaiter;OnCompleted;(System.Action);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Runtime.CompilerServices;ConfiguredValueTaskAwaitable<TResult>+ConfiguredValueTaskAwaiter;UnsafeOnCompleted;(System.Action);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Runtime.CompilerServices;ConfiguredValueTaskAwaitable<TResult>;GetAwaiter;();Argument[this];ReturnValue;taint;df-generated |
-| System.Runtime.CompilerServices;ContractHelper;RaiseContractFailedEvent;(System.Diagnostics.Contracts.ContractFailureKind,System.String,System.String,System.Exception);Argument[1];ReturnValue;taint;df-generated |
-| System.Runtime.CompilerServices;ContractHelper;RaiseContractFailedEvent;(System.Diagnostics.Contracts.ContractFailureKind,System.String,System.String,System.Exception);Argument[2];ReturnValue;taint;df-generated |
+| System.Runtime.CompilerServices;ContractHelper;RaiseContractFailedEvent;(System.Diagnostics.Contracts.ContractFailureKind,System.String,System.String,System.Exception);Argument[1];ReturnValue;taint;dfc-generated |
+| System.Runtime.CompilerServices;ContractHelper;RaiseContractFailedEvent;(System.Diagnostics.Contracts.ContractFailureKind,System.String,System.String,System.Exception);Argument[2];ReturnValue;taint;dfc-generated |
 | System.Runtime.CompilerServices;DefaultInterpolatedStringHandler;DefaultInterpolatedStringHandler;(System.Int32,System.Int32,System.IFormatProvider);Argument[2];Argument[this];taint;df-generated |
 | System.Runtime.CompilerServices;DefaultInterpolatedStringHandler;DefaultInterpolatedStringHandler;(System.Int32,System.Int32,System.IFormatProvider,System.Span<System.Char>);Argument[2];Argument[this];taint;df-generated |
 | System.Runtime.CompilerServices;DefaultInterpolatedStringHandler;DefaultInterpolatedStringHandler;(System.Int32,System.Int32,System.IFormatProvider,System.Span<System.Char>);Argument[3];Argument[this];taint;df-generated |
-| System.Runtime.CompilerServices;FormattableStringFactory;Create;(System.String,System.Object[]);Argument[0];ReturnValue;taint;df-generated |
-| System.Runtime.CompilerServices;FormattableStringFactory;Create;(System.String,System.Object[]);Argument[1].Element;ReturnValue;taint;df-generated |
+| System.Runtime.CompilerServices;FormattableStringFactory;Create;(System.String,System.Object[]);Argument[0];ReturnValue.SyntheticField[System.Runtime.CompilerServices.FormattableStringFactory+ConcreteFormattableString._format];value;dfc-generated |
+| System.Runtime.CompilerServices;FormattableStringFactory;Create;(System.String,System.Object[]);Argument[1];ReturnValue.SyntheticField[System.Runtime.CompilerServices.FormattableStringFactory+ConcreteFormattableString._arguments];value;dfc-generated |
 | System.Runtime.CompilerServices;ICriticalNotifyCompletion;UnsafeOnCompleted;(System.Action);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Runtime.CompilerServices;INotifyCompletion;OnCompleted;(System.Action);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Runtime.CompilerServices;IRuntimeVariables;get_Item;(System.Int32);Argument[this];ReturnValue;taint;df-generated |
 | System.Runtime.CompilerServices;ITuple;get_Item;(System.Int32);Argument[this];ReturnValue;taint;df-generated |
-| System.Runtime.CompilerServices;NullableAttribute;NullableAttribute;(System.Byte[]);Argument[0].Element;Argument[this];taint;df-generated |
-| System.Runtime.CompilerServices;PoolingAsyncValueTaskMethodBuilder;AwaitOnCompleted<TAwaiter,TStateMachine>;(TAwaiter,TStateMachine);Argument[1];Argument[this];taint;df-generated |
-| System.Runtime.CompilerServices;PoolingAsyncValueTaskMethodBuilder;AwaitUnsafeOnCompleted<TAwaiter,TStateMachine>;(TAwaiter,TStateMachine);Argument[1];Argument[this];taint;df-generated |
-| System.Runtime.CompilerServices;PoolingAsyncValueTaskMethodBuilder<TResult>;AwaitOnCompleted<TAwaiter,TStateMachine>;(TAwaiter,TStateMachine);Argument[1];Argument[this];taint;df-generated |
-| System.Runtime.CompilerServices;PoolingAsyncValueTaskMethodBuilder<TResult>;AwaitUnsafeOnCompleted<TAwaiter,TStateMachine>;(TAwaiter,TStateMachine);Argument[1];Argument[this];taint;df-generated |
+| System.Runtime.CompilerServices;NullableAttribute;NullableAttribute;(System.Byte[]);Argument[0];Argument[this].Field[System.Runtime.CompilerServices.NullableAttribute.NullableFlags];value;dfc-generated |
+| System.Runtime.CompilerServices;PoolingAsyncValueTaskMethodBuilder;AwaitOnCompleted<TAwaiter,TStateMachine>;(TAwaiter,TStateMachine);Argument[0];ReturnValue;value;dfc-generated |
+| System.Runtime.CompilerServices;PoolingAsyncValueTaskMethodBuilder;AwaitOnCompleted<TAwaiter,TStateMachine>;(TAwaiter,TStateMachine);Argument[1];ReturnValue;value;dfc-generated |
+| System.Runtime.CompilerServices;PoolingAsyncValueTaskMethodBuilder;AwaitUnsafeOnCompleted<TAwaiter,TStateMachine>;(TAwaiter,TStateMachine);Argument[0];ReturnValue;value;dfc-generated |
+| System.Runtime.CompilerServices;PoolingAsyncValueTaskMethodBuilder;AwaitUnsafeOnCompleted<TAwaiter,TStateMachine>;(TAwaiter,TStateMachine);Argument[1];ReturnValue;value;dfc-generated |
+| System.Runtime.CompilerServices;PoolingAsyncValueTaskMethodBuilder;Start<TStateMachine>;(TStateMachine);Argument[0];ReturnValue;value;dfc-generated |
+| System.Runtime.CompilerServices;PoolingAsyncValueTaskMethodBuilder<TResult>;AwaitOnCompleted<TAwaiter,TStateMachine>;(TAwaiter,TStateMachine);Argument[0];ReturnValue;value;dfc-generated |
+| System.Runtime.CompilerServices;PoolingAsyncValueTaskMethodBuilder<TResult>;AwaitOnCompleted<TAwaiter,TStateMachine>;(TAwaiter,TStateMachine);Argument[1];ReturnValue;value;dfc-generated |
+| System.Runtime.CompilerServices;PoolingAsyncValueTaskMethodBuilder<TResult>;AwaitUnsafeOnCompleted<TAwaiter,TStateMachine>;(TAwaiter,TStateMachine);Argument[0];ReturnValue;value;dfc-generated |
+| System.Runtime.CompilerServices;PoolingAsyncValueTaskMethodBuilder<TResult>;AwaitUnsafeOnCompleted<TAwaiter,TStateMachine>;(TAwaiter,TStateMachine);Argument[1];ReturnValue;value;dfc-generated |
 | System.Runtime.CompilerServices;PoolingAsyncValueTaskMethodBuilder<TResult>;SetResult;(TResult);Argument[0];Argument[this];taint;df-generated |
+| System.Runtime.CompilerServices;PoolingAsyncValueTaskMethodBuilder<TResult>;Start<TStateMachine>;(TStateMachine);Argument[0];ReturnValue;value;dfc-generated |
 | System.Runtime.CompilerServices;PoolingAsyncValueTaskMethodBuilder<TResult>;get_Task;();Argument[this];ReturnValue;taint;df-generated |
 | System.Runtime.CompilerServices;ReadOnlyCollectionBuilder<T>;Add;(System.Object);Argument[0];Argument[this].Element;value;manual |
 | System.Runtime.CompilerServices;ReadOnlyCollectionBuilder<T>;Add;(T);Argument[0];Argument[this].Element;value;manual |
@@ -15044,30 +15484,44 @@ summary
 | System.Runtime.CompilerServices;ReadOnlyCollectionBuilder<T>;Insert;(System.Int32,System.Object);Argument[1];Argument[this].Element;value;manual |
 | System.Runtime.CompilerServices;ReadOnlyCollectionBuilder<T>;Insert;(System.Int32,T);Argument[1];Argument[this].Element;value;manual |
 | System.Runtime.CompilerServices;ReadOnlyCollectionBuilder<T>;ReadOnlyCollectionBuilder;(System.Collections.Generic.IEnumerable<T>);Argument[0].Element;Argument[this];taint;df-generated |
-| System.Runtime.CompilerServices;ReadOnlyCollectionBuilder<T>;Remove;(System.Object);Argument[0];Argument[this];taint;df-generated |
-| System.Runtime.CompilerServices;ReadOnlyCollectionBuilder<T>;Remove;(System.Object);Argument[this];Argument[0];taint;df-generated |
 | System.Runtime.CompilerServices;ReadOnlyCollectionBuilder<T>;get_Item;(System.Int32);Argument[this].Element;ReturnValue;value;manual |
-| System.Runtime.CompilerServices;ReadOnlyCollectionBuilder<T>;get_SyncRoot;();Argument[this];ReturnValue;taint;df-generated |
-| System.Runtime.CompilerServices;ReadOnlyCollectionBuilder<T>;get_SyncRoot;();Argument[this];ReturnValue;value;df-generated |
+| System.Runtime.CompilerServices;ReadOnlyCollectionBuilder<T>;get_SyncRoot;();Argument[this];ReturnValue;value;dfc-generated |
 | System.Runtime.CompilerServices;ReadOnlyCollectionBuilder<T>;set_Item;(System.Int32,System.Object);Argument[1];Argument[this].Element;value;manual |
 | System.Runtime.CompilerServices;ReadOnlyCollectionBuilder<T>;set_Item;(System.Int32,T);Argument[1];Argument[this].Element;value;manual |
 | System.Runtime.CompilerServices;RuntimeHelpers+CleanupCode;BeginInvoke;(System.Object,System.Boolean,System.AsyncCallback,System.Object);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
 | System.Runtime.CompilerServices;RuntimeHelpers+TryCode;BeginInvoke;(System.Object,System.AsyncCallback,System.Object);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
+| System.Runtime.CompilerServices;RuntimeHelpers;ExecuteCodeWithGuaranteedCleanup;(System.Runtime.CompilerServices.RuntimeHelpers+TryCode,System.Runtime.CompilerServices.RuntimeHelpers+CleanupCode,System.Object);Argument[0];Argument[0].Parameter[delegate-self];value;dfc-generated |
 | System.Runtime.CompilerServices;RuntimeHelpers;ExecuteCodeWithGuaranteedCleanup;(System.Runtime.CompilerServices.RuntimeHelpers+TryCode,System.Runtime.CompilerServices.RuntimeHelpers+CleanupCode,System.Object);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
+| System.Runtime.CompilerServices;RuntimeHelpers;ExecuteCodeWithGuaranteedCleanup;(System.Runtime.CompilerServices.RuntimeHelpers+TryCode,System.Runtime.CompilerServices.RuntimeHelpers+CleanupCode,System.Object);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | System.Runtime.CompilerServices;RuntimeHelpers;ExecuteCodeWithGuaranteedCleanup;(System.Runtime.CompilerServices.RuntimeHelpers+TryCode,System.Runtime.CompilerServices.RuntimeHelpers+CleanupCode,System.Object);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
+| System.Runtime.CompilerServices;RuntimeHelpers;ExecuteCodeWithGuaranteedCleanup;(System.Runtime.CompilerServices.RuntimeHelpers+TryCode,System.Runtime.CompilerServices.RuntimeHelpers+CleanupCode,System.Object);Argument[2];Argument[0].Parameter[0];value;dfc-generated |
+| System.Runtime.CompilerServices;RuntimeHelpers;ExecuteCodeWithGuaranteedCleanup;(System.Runtime.CompilerServices.RuntimeHelpers+TryCode,System.Runtime.CompilerServices.RuntimeHelpers+CleanupCode,System.Object);Argument[2];Argument[0].Parameter[0];value;hq-generated |
+| System.Runtime.CompilerServices;RuntimeHelpers;ExecuteCodeWithGuaranteedCleanup;(System.Runtime.CompilerServices.RuntimeHelpers+TryCode,System.Runtime.CompilerServices.RuntimeHelpers+CleanupCode,System.Object);Argument[2];Argument[1].Parameter[0];value;dfc-generated |
+| System.Runtime.CompilerServices;RuntimeHelpers;ExecuteCodeWithGuaranteedCleanup;(System.Runtime.CompilerServices.RuntimeHelpers+TryCode,System.Runtime.CompilerServices.RuntimeHelpers+CleanupCode,System.Object);Argument[2];Argument[1].Parameter[0];value;hq-generated |
 | System.Runtime.CompilerServices;RuntimeWrappedException;GetObjectData;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);Argument[this];Argument[0];taint;df-generated |
-| System.Runtime.CompilerServices;RuntimeWrappedException;RuntimeWrappedException;(System.Object);Argument[0];Argument[this];taint;df-generated |
-| System.Runtime.CompilerServices;RuntimeWrappedException;get_WrappedException;();Argument[this];ReturnValue;taint;df-generated |
-| System.Runtime.CompilerServices;StrongBox<T>;StrongBox;(T);Argument[0];Argument[this];taint;df-generated |
+| System.Runtime.CompilerServices;RuntimeWrappedException;RuntimeWrappedException;(System.Object);Argument[0];Argument[this].SyntheticField[System.Runtime.CompilerServices.RuntimeWrappedException._wrappedException];value;dfc-generated |
+| System.Runtime.CompilerServices;RuntimeWrappedException;get_WrappedException;();Argument[this].SyntheticField[System.Runtime.CompilerServices.RuntimeWrappedException._wrappedException];ReturnValue;value;dfc-generated |
+| System.Runtime.CompilerServices;StrongBox<T>;StrongBox;(T);Argument[0];Argument[this].Field[System.Runtime.CompilerServices.StrongBox`1.Value];value;dfc-generated |
 | System.Runtime.CompilerServices;SwitchExpressionException;GetObjectData;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);Argument[this];Argument[0];taint;df-generated |
-| System.Runtime.CompilerServices;SwitchExpressionException;get_Message;();Argument[this];ReturnValue;taint;df-generated |
+| System.Runtime.CompilerServices;SwitchExpressionException;get_Message;();Argument[this].Property[System.Exception.Message];ReturnValue;value;dfc-generated |
+| System.Runtime.CompilerServices;SwitchExpressionException;get_Message;();Argument[this].Property[System.Runtime.CompilerServices.SwitchExpressionException.UnmatchedValue];ReturnValue;taint;dfc-generated |
+| System.Runtime.CompilerServices;SwitchExpressionException;get_Message;();Argument[this].SyntheticField[System.Exception._message];ReturnValue;value;dfc-generated |
 | System.Runtime.CompilerServices;TaskAwaiter;OnCompleted;(System.Action);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Runtime.CompilerServices;TaskAwaiter;UnsafeOnCompleted;(System.Action);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Runtime.CompilerServices;TaskAwaiter<TResult>;GetResult;();Argument[this].SyntheticField[m_task_task_awaiter].Property[System.Threading.Tasks.Task`1.Result];ReturnValue;value;manual |
 | System.Runtime.CompilerServices;TaskAwaiter<TResult>;OnCompleted;(System.Action);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Runtime.CompilerServices;TaskAwaiter<TResult>;UnsafeOnCompleted;(System.Action);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
-| System.Runtime.CompilerServices;TupleElementNamesAttribute;TupleElementNamesAttribute;(System.String[]);Argument[0].Element;Argument[this];taint;df-generated |
-| System.Runtime.CompilerServices;TupleElementNamesAttribute;get_TransformNames;();Argument[this];ReturnValue;taint;df-generated |
+| System.Runtime.CompilerServices;TupleElementNamesAttribute;TupleElementNamesAttribute;(System.String[]);Argument[0];Argument[this].SyntheticField[System.Runtime.CompilerServices.TupleElementNamesAttribute._transformNames];value;dfc-generated |
+| System.Runtime.CompilerServices;TupleElementNamesAttribute;get_TransformNames;();Argument[this].SyntheticField[System.Runtime.CompilerServices.TupleElementNamesAttribute._transformNames];ReturnValue;value;dfc-generated |
+| System.Runtime.CompilerServices;Unsafe;Add<T>;(T,System.Int32);Argument[0];ReturnValue;value;dfc-generated |
+| System.Runtime.CompilerServices;Unsafe;Add<T>;(T,System.IntPtr);Argument[0];ReturnValue;value;dfc-generated |
+| System.Runtime.CompilerServices;Unsafe;Add<T>;(T,System.UIntPtr);Argument[0];ReturnValue;value;dfc-generated |
+| System.Runtime.CompilerServices;Unsafe;AddByteOffset<T>;(T,System.UIntPtr);Argument[0];ReturnValue;value;dfc-generated |
+| System.Runtime.CompilerServices;Unsafe;Copy<T>;(T,System.Void*);Argument[0];ReturnValue;value;dfc-generated |
+| System.Runtime.CompilerServices;Unsafe;Subtract<T>;(T,System.Int32);Argument[0];ReturnValue;value;dfc-generated |
+| System.Runtime.CompilerServices;Unsafe;Subtract<T>;(T,System.IntPtr);Argument[0];ReturnValue;value;dfc-generated |
+| System.Runtime.CompilerServices;Unsafe;Subtract<T>;(T,System.UIntPtr);Argument[0];ReturnValue;value;dfc-generated |
+| System.Runtime.CompilerServices;Unsafe;SubtractByteOffset<T>;(T,System.UIntPtr);Argument[0];ReturnValue;value;dfc-generated |
 | System.Runtime.CompilerServices;ValueTaskAwaiter;OnCompleted;(System.Action);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Runtime.CompilerServices;ValueTaskAwaiter;UnsafeOnCompleted;(System.Action);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Runtime.CompilerServices;ValueTaskAwaiter<TResult>;GetResult;();Argument[this];ReturnValue;taint;df-generated |
@@ -15075,12 +15529,12 @@ summary
 | System.Runtime.CompilerServices;ValueTaskAwaiter<TResult>;UnsafeOnCompleted;(System.Action);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Runtime.CompilerServices;YieldAwaitable+YieldAwaiter;OnCompleted;(System.Action);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Runtime.CompilerServices;YieldAwaitable+YieldAwaiter;UnsafeOnCompleted;(System.Action);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
-| System.Runtime.ExceptionServices;ExceptionDispatchInfo;Capture;(System.Exception);Argument[0];ReturnValue;taint;df-generated |
-| System.Runtime.ExceptionServices;ExceptionDispatchInfo;SetCurrentStackTrace;(System.Exception);Argument[0];ReturnValue;taint;df-generated |
-| System.Runtime.ExceptionServices;ExceptionDispatchInfo;SetRemoteStackTrace;(System.Exception,System.String);Argument[0];ReturnValue;taint;df-generated |
-| System.Runtime.ExceptionServices;ExceptionDispatchInfo;SetRemoteStackTrace;(System.Exception,System.String);Argument[1];Argument[0];taint;df-generated |
-| System.Runtime.ExceptionServices;ExceptionDispatchInfo;SetRemoteStackTrace;(System.Exception,System.String);Argument[1];ReturnValue;taint;df-generated |
-| System.Runtime.ExceptionServices;ExceptionDispatchInfo;get_SourceException;();Argument[this];ReturnValue;taint;df-generated |
+| System.Runtime.ExceptionServices;ExceptionDispatchInfo;Capture;(System.Exception);Argument[0];ReturnValue.SyntheticField[System.Runtime.ExceptionServices.ExceptionDispatchInfo._exception];value;dfc-generated |
+| System.Runtime.ExceptionServices;ExceptionDispatchInfo;SetCurrentStackTrace;(System.Exception);Argument[0];ReturnValue;value;dfc-generated |
+| System.Runtime.ExceptionServices;ExceptionDispatchInfo;SetRemoteStackTrace;(System.Exception,System.String);Argument[0];ReturnValue;value;dfc-generated |
+| System.Runtime.ExceptionServices;ExceptionDispatchInfo;SetRemoteStackTrace;(System.Exception,System.String);Argument[1];Argument[0].SyntheticField[System.Exception._remoteStackTraceString];taint;dfc-generated |
+| System.Runtime.ExceptionServices;ExceptionDispatchInfo;SetRemoteStackTrace;(System.Exception,System.String);Argument[1];ReturnValue.SyntheticField[System.Exception._remoteStackTraceString];taint;dfc-generated |
+| System.Runtime.ExceptionServices;ExceptionDispatchInfo;get_SourceException;();Argument[this].SyntheticField[System.Runtime.ExceptionServices.ExceptionDispatchInfo._exception];ReturnValue;value;dfc-generated |
 | System.Runtime.InteropServices.JavaScript;JSMarshalerArgument+ArgumentToJSCallback<T>;BeginInvoke;(System.Runtime.InteropServices.JavaScript.JSMarshalerArgument,T,System.AsyncCallback,System.Object);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
 | System.Runtime.InteropServices.JavaScript;JSMarshalerArgument+ArgumentToManagedCallback<T>;BeginInvoke;(System.Runtime.InteropServices.JavaScript.JSMarshalerArgument,T,System.AsyncCallback,System.Object);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
 | System.Runtime.InteropServices.JavaScript;JSMarshalerArgument;ToJS;(System.Action);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
@@ -15134,132 +15588,138 @@ summary
 | System.Runtime.InteropServices.JavaScript;JSMarshalerArgument;ToManaged<TResult>;(System.Func<TResult>,System.Runtime.InteropServices.JavaScript.JSMarshalerArgument+ArgumentToManagedCallback<TResult>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Runtime.InteropServices.JavaScript;JSMarshalerArgument;ToManaged<TResult>;(System.Func<TResult>,System.Runtime.InteropServices.JavaScript.JSMarshalerArgument+ArgumentToManagedCallback<TResult>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
 | System.Runtime.InteropServices.Marshalling;AnsiStringMarshaller+ManagedToUnmanagedIn;ToUnmanaged;();Argument[this];ReturnValue;taint;df-generated |
-| System.Runtime.InteropServices.Marshalling;ArrayMarshaller<T,TUnmanagedElement>+ManagedToUnmanagedIn;FromManaged;(T[],System.Span<TUnmanagedElement>);Argument[0].Element;Argument[this];taint;df-generated |
-| System.Runtime.InteropServices.Marshalling;ArrayMarshaller<T,TUnmanagedElement>+ManagedToUnmanagedIn;FromManaged;(T[],System.Span<TUnmanagedElement>);Argument[1];Argument[this];taint;df-generated |
-| System.Runtime.InteropServices.Marshalling;ArrayMarshaller<T,TUnmanagedElement>+ManagedToUnmanagedIn;GetManagedValuesSource;();Argument[this];ReturnValue;taint;df-generated |
+| System.Runtime.InteropServices.Marshalling;ArrayMarshaller<T,TUnmanagedElement>+ManagedToUnmanagedIn;FromManaged;(T[],System.Span<TUnmanagedElement>);Argument[0];Argument[this].SyntheticField[System.Runtime.InteropServices.Marshalling.ArrayMarshaller`2+ManagedToUnmanagedIn._managedArray];value;dfc-generated |
+| System.Runtime.InteropServices.Marshalling;ArrayMarshaller<T,TUnmanagedElement>+ManagedToUnmanagedIn;GetManagedValuesSource;();Argument[this].SyntheticField[System.Runtime.InteropServices.Marshalling.ArrayMarshaller`2+ManagedToUnmanagedIn._managedArray].Element;ReturnValue.Element;value;dfc-generated |
 | System.Runtime.InteropServices.Marshalling;ArrayMarshaller<T,TUnmanagedElement>+ManagedToUnmanagedIn;GetUnmanagedValuesDestination;();Argument[this];ReturnValue;taint;df-generated |
-| System.Runtime.InteropServices.Marshalling;ArrayMarshaller<T,TUnmanagedElement>;GetManagedValuesDestination;(T[]);Argument[0].Element;ReturnValue;taint;df-generated |
-| System.Runtime.InteropServices.Marshalling;ArrayMarshaller<T,TUnmanagedElement>;GetManagedValuesSource;(T[]);Argument[0].Element;ReturnValue;taint;df-generated |
+| System.Runtime.InteropServices.Marshalling;ArrayMarshaller<T,TUnmanagedElement>;GetManagedValuesDestination;(T[]);Argument[0].Element;ReturnValue.Element;value;dfc-generated |
+| System.Runtime.InteropServices.Marshalling;ArrayMarshaller<T,TUnmanagedElement>;GetManagedValuesSource;(T[]);Argument[0].Element;ReturnValue.Element;value;dfc-generated |
 | System.Runtime.InteropServices.Marshalling;BStrStringMarshaller+ManagedToUnmanagedIn;ToUnmanaged;();Argument[this];ReturnValue;taint;df-generated |
-| System.Runtime.InteropServices.Marshalling;IIUnknownStrategy;CreateInstancePointer;(System.Void*);Argument[0];ReturnValue;taint;df-generated |
+| System.Runtime.InteropServices.Marshalling;IIUnknownStrategy;CreateInstancePointer;(System.Void*);Argument[0];ReturnValue;value;dfc-generated |
 | System.Runtime.InteropServices.Marshalling;PointerArrayMarshaller<T,TUnmanagedElement>+ManagedToUnmanagedIn;FromManaged;(T*[],System.Span<TUnmanagedElement>);Argument[0].Element;Argument[this];taint;df-generated |
 | System.Runtime.InteropServices.Marshalling;PointerArrayMarshaller<T,TUnmanagedElement>+ManagedToUnmanagedIn;FromManaged;(T*[],System.Span<TUnmanagedElement>);Argument[1];Argument[this];taint;df-generated |
 | System.Runtime.InteropServices.Marshalling;PointerArrayMarshaller<T,TUnmanagedElement>+ManagedToUnmanagedIn;GetUnmanagedValuesDestination;();Argument[this];ReturnValue;taint;df-generated |
-| System.Runtime.InteropServices.Marshalling;ReadOnlySpanMarshaller<T,TUnmanagedElement>+ManagedToUnmanagedIn;FromManaged;(System.ReadOnlySpan<T>,System.Span<TUnmanagedElement>);Argument[0];Argument[this];taint;df-generated |
-| System.Runtime.InteropServices.Marshalling;ReadOnlySpanMarshaller<T,TUnmanagedElement>+ManagedToUnmanagedIn;FromManaged;(System.ReadOnlySpan<T>,System.Span<TUnmanagedElement>);Argument[1];Argument[this];taint;df-generated |
-| System.Runtime.InteropServices.Marshalling;ReadOnlySpanMarshaller<T,TUnmanagedElement>+ManagedToUnmanagedIn;GetManagedValuesSource;();Argument[this];ReturnValue;taint;df-generated |
+| System.Runtime.InteropServices.Marshalling;ReadOnlySpanMarshaller<T,TUnmanagedElement>+ManagedToUnmanagedIn;FromManaged;(System.ReadOnlySpan<T>,System.Span<TUnmanagedElement>);Argument[0];Argument[this].SyntheticField[System.Runtime.InteropServices.Marshalling.ReadOnlySpanMarshaller`2+ManagedToUnmanagedIn._managedArray];value;dfc-generated |
+| System.Runtime.InteropServices.Marshalling;ReadOnlySpanMarshaller<T,TUnmanagedElement>+ManagedToUnmanagedIn;GetManagedValuesSource;();Argument[this].SyntheticField[System.Runtime.InteropServices.Marshalling.ReadOnlySpanMarshaller`2+ManagedToUnmanagedIn._managedArray];ReturnValue;value;dfc-generated |
 | System.Runtime.InteropServices.Marshalling;ReadOnlySpanMarshaller<T,TUnmanagedElement>+ManagedToUnmanagedIn;GetUnmanagedValuesDestination;();Argument[this];ReturnValue;taint;df-generated |
-| System.Runtime.InteropServices.Marshalling;ReadOnlySpanMarshaller<T,TUnmanagedElement>+UnmanagedToManagedOut;GetManagedValuesSource;(System.ReadOnlySpan<T>);Argument[0];ReturnValue;taint;df-generated |
-| System.Runtime.InteropServices.Marshalling;SafeHandleMarshaller<T>+ManagedToUnmanagedIn;FromManaged;(T);Argument[0];Argument[this];taint;df-generated |
-| System.Runtime.InteropServices.Marshalling;SafeHandleMarshaller<T>+ManagedToUnmanagedIn;ToUnmanaged;();Argument[this];ReturnValue;taint;df-generated |
-| System.Runtime.InteropServices.Marshalling;SafeHandleMarshaller<T>+ManagedToUnmanagedOut;FromUnmanaged;(System.IntPtr);Argument[0];Argument[this];taint;df-generated |
-| System.Runtime.InteropServices.Marshalling;SafeHandleMarshaller<T>+ManagedToUnmanagedOut;ToManaged;();Argument[this];ReturnValue;taint;df-generated |
-| System.Runtime.InteropServices.Marshalling;SafeHandleMarshaller<T>+ManagedToUnmanagedRef;FromManaged;(T);Argument[0];Argument[this];taint;df-generated |
-| System.Runtime.InteropServices.Marshalling;SafeHandleMarshaller<T>+ManagedToUnmanagedRef;FromUnmanaged;(System.IntPtr);Argument[0];Argument[this];taint;df-generated |
-| System.Runtime.InteropServices.Marshalling;SafeHandleMarshaller<T>+ManagedToUnmanagedRef;ToManagedFinally;();Argument[this];ReturnValue;taint;df-generated |
-| System.Runtime.InteropServices.Marshalling;SafeHandleMarshaller<T>+ManagedToUnmanagedRef;ToUnmanaged;();Argument[this];ReturnValue;taint;df-generated |
+| System.Runtime.InteropServices.Marshalling;ReadOnlySpanMarshaller<T,TUnmanagedElement>+UnmanagedToManagedOut;GetManagedValuesSource;(System.ReadOnlySpan<T>);Argument[0];ReturnValue;value;dfc-generated |
+| System.Runtime.InteropServices.Marshalling;SafeHandleMarshaller<T>+ManagedToUnmanagedIn;FromManaged;(T);Argument[0];Argument[this].SyntheticField[System.Runtime.InteropServices.Marshalling.SafeHandleMarshaller`1+ManagedToUnmanagedIn._handle];value;dfc-generated |
+| System.Runtime.InteropServices.Marshalling;SafeHandleMarshaller<T>+ManagedToUnmanagedIn;ToUnmanaged;();Argument[this].SyntheticField[System.Runtime.InteropServices.Marshalling.SafeHandleMarshaller`1+ManagedToUnmanagedIn._handle].Field[System.Runtime.InteropServices.SafeHandle.handle];ReturnValue;value;dfc-generated |
+| System.Runtime.InteropServices.Marshalling;SafeHandleMarshaller<T>+ManagedToUnmanagedOut;FromUnmanaged;(System.IntPtr);Argument[0];Argument[this].SyntheticField[System.Runtime.InteropServices.Marshalling.SafeHandleMarshaller`1+ManagedToUnmanagedOut._newHandle].Field[System.Runtime.InteropServices.SafeHandle.handle];value;dfc-generated |
+| System.Runtime.InteropServices.Marshalling;SafeHandleMarshaller<T>+ManagedToUnmanagedOut;ToManaged;();Argument[this].SyntheticField[System.Runtime.InteropServices.Marshalling.SafeHandleMarshaller`1+ManagedToUnmanagedOut._newHandle];ReturnValue;value;dfc-generated |
+| System.Runtime.InteropServices.Marshalling;SafeHandleMarshaller<T>+ManagedToUnmanagedRef;FromManaged;(T);Argument[0].Field[System.Runtime.InteropServices.SafeHandle.handle];Argument[this].SyntheticField[System.Runtime.InteropServices.Marshalling.SafeHandleMarshaller`1+ManagedToUnmanagedRef._originalHandleValue];value;dfc-generated |
+| System.Runtime.InteropServices.Marshalling;SafeHandleMarshaller<T>+ManagedToUnmanagedRef;FromManaged;(T);Argument[0];Argument[this].SyntheticField[System.Runtime.InteropServices.Marshalling.SafeHandleMarshaller`1+ManagedToUnmanagedRef._handle];value;dfc-generated |
+| System.Runtime.InteropServices.Marshalling;SafeHandleMarshaller<T>+ManagedToUnmanagedRef;FromUnmanaged;(System.IntPtr);Argument[0];Argument[this].SyntheticField[System.Runtime.InteropServices.Marshalling.SafeHandleMarshaller`1+ManagedToUnmanagedRef._handleToReturn].Field[System.Runtime.InteropServices.SafeHandle.handle];value;dfc-generated |
+| System.Runtime.InteropServices.Marshalling;SafeHandleMarshaller<T>+ManagedToUnmanagedRef;FromUnmanaged;(System.IntPtr);Argument[0];Argument[this].SyntheticField[System.Runtime.InteropServices.Marshalling.SafeHandleMarshaller`1+ManagedToUnmanagedRef._newHandle].Field[System.Runtime.InteropServices.SafeHandle.handle];value;dfc-generated |
+| System.Runtime.InteropServices.Marshalling;SafeHandleMarshaller<T>+ManagedToUnmanagedRef;FromUnmanaged;(System.IntPtr);Argument[this].SyntheticField[System.Runtime.InteropServices.Marshalling.SafeHandleMarshaller`1+ManagedToUnmanagedRef._handle];Argument[this].SyntheticField[System.Runtime.InteropServices.Marshalling.SafeHandleMarshaller`1+ManagedToUnmanagedRef._handleToReturn];value;dfc-generated |
+| System.Runtime.InteropServices.Marshalling;SafeHandleMarshaller<T>+ManagedToUnmanagedRef;FromUnmanaged;(System.IntPtr);Argument[this].SyntheticField[System.Runtime.InteropServices.Marshalling.SafeHandleMarshaller`1+ManagedToUnmanagedRef._newHandle];Argument[this].SyntheticField[System.Runtime.InteropServices.Marshalling.SafeHandleMarshaller`1+ManagedToUnmanagedRef._handleToReturn];value;dfc-generated |
+| System.Runtime.InteropServices.Marshalling;SafeHandleMarshaller<T>+ManagedToUnmanagedRef;ToManagedFinally;();Argument[this].SyntheticField[System.Runtime.InteropServices.Marshalling.SafeHandleMarshaller`1+ManagedToUnmanagedRef._handleToReturn];ReturnValue;value;dfc-generated |
+| System.Runtime.InteropServices.Marshalling;SafeHandleMarshaller<T>+ManagedToUnmanagedRef;ToUnmanaged;();Argument[this].SyntheticField[System.Runtime.InteropServices.Marshalling.SafeHandleMarshaller`1+ManagedToUnmanagedRef._originalHandleValue];ReturnValue;value;dfc-generated |
 | System.Runtime.InteropServices.Marshalling;SpanMarshaller<T,TUnmanagedElement>+ManagedToUnmanagedIn;FromManaged;(System.Span<T>,System.Span<TUnmanagedElement>);Argument[0];Argument[this];taint;df-generated |
 | System.Runtime.InteropServices.Marshalling;SpanMarshaller<T,TUnmanagedElement>+ManagedToUnmanagedIn;FromManaged;(System.Span<T>,System.Span<TUnmanagedElement>);Argument[1];Argument[this];taint;df-generated |
 | System.Runtime.InteropServices.Marshalling;SpanMarshaller<T,TUnmanagedElement>+ManagedToUnmanagedIn;GetUnmanagedValuesDestination;();Argument[this];ReturnValue;taint;df-generated |
-| System.Runtime.InteropServices.Marshalling;SpanMarshaller<T,TUnmanagedElement>;GetManagedValuesDestination;(System.Span<T>);Argument[0];ReturnValue;taint;df-generated |
+| System.Runtime.InteropServices.Marshalling;SpanMarshaller<T,TUnmanagedElement>;GetManagedValuesDestination;(System.Span<T>);Argument[0];ReturnValue;value;dfc-generated |
 | System.Runtime.InteropServices.Marshalling;Utf8StringMarshaller+ManagedToUnmanagedIn;ToUnmanaged;();Argument[this];ReturnValue;taint;df-generated |
-| System.Runtime.InteropServices.Marshalling;VirtualMethodTableInfo;Deconstruct;(System.Void*,System.Void**);Argument[this];ReturnValue;taint;df-generated |
+| System.Runtime.InteropServices.Marshalling;VirtualMethodTableInfo;Deconstruct;(System.Void*,System.Void**);Argument[this].Property[System.Runtime.InteropServices.Marshalling.VirtualMethodTableInfo.ThisPointer];ReturnValue;value;dfc-generated |
+| System.Runtime.InteropServices.Marshalling;VirtualMethodTableInfo;Deconstruct;(System.Void*,System.Void**);Argument[this].Property[System.Runtime.InteropServices.Marshalling.VirtualMethodTableInfo.VirtualMethodTable];ReturnValue;value;dfc-generated |
 | System.Runtime.InteropServices.ObjectiveC;ObjectiveCMarshal+UnhandledExceptionPropagationHandler;BeginInvoke;(System.Exception,System.RuntimeMethodHandle,System.IntPtr,System.AsyncCallback,System.Object);Argument[3];Argument[3].Parameter[delegate-self];value;hq-generated |
 | System.Runtime.InteropServices.ObjectiveC;ObjectiveCMarshal;Initialize;(System.Runtime.InteropServices.ObjectiveC.ObjectiveCMarshal+UnhandledExceptionPropagationHandler);Argument[3];Argument[3].Parameter[delegate-self];value;hq-generated |
-| System.Runtime.InteropServices;ArrayWithOffset;ArrayWithOffset;(System.Object,System.Int32);Argument[0];Argument[this];taint;df-generated |
-| System.Runtime.InteropServices;ArrayWithOffset;GetArray;();Argument[this];ReturnValue;taint;df-generated |
-| System.Runtime.InteropServices;CLong;CLong;(System.IntPtr);Argument[0];Argument[this];taint;df-generated |
-| System.Runtime.InteropServices;CLong;get_Value;();Argument[this];ReturnValue;taint;df-generated |
-| System.Runtime.InteropServices;CULong;CULong;(System.UIntPtr);Argument[0];Argument[this];taint;df-generated |
-| System.Runtime.InteropServices;CULong;get_Value;();Argument[this];ReturnValue;taint;df-generated |
+| System.Runtime.InteropServices;ArrayWithOffset;ArrayWithOffset;(System.Object,System.Int32);Argument[0];Argument[this].SyntheticField[System.Runtime.InteropServices.ArrayWithOffset.m_array];value;dfc-generated |
+| System.Runtime.InteropServices;ArrayWithOffset;GetArray;();Argument[this].SyntheticField[System.Runtime.InteropServices.ArrayWithOffset.m_array];ReturnValue;value;dfc-generated |
+| System.Runtime.InteropServices;CLong;CLong;(System.IntPtr);Argument[0];Argument[this].SyntheticField[System.Runtime.InteropServices.CLong._value];value;dfc-generated |
+| System.Runtime.InteropServices;CLong;get_Value;();Argument[this].SyntheticField[System.Runtime.InteropServices.CLong._value];ReturnValue;value;dfc-generated |
+| System.Runtime.InteropServices;CULong;CULong;(System.UIntPtr);Argument[0];Argument[this].SyntheticField[System.Runtime.InteropServices.CULong._value];value;dfc-generated |
+| System.Runtime.InteropServices;CULong;get_Value;();Argument[this].SyntheticField[System.Runtime.InteropServices.CULong._value];ReturnValue;value;dfc-generated |
 | System.Runtime.InteropServices;CollectionsMarshal;AsSpan<T>;(System.Collections.Generic.List<T>);Argument[0].Element;ReturnValue;taint;df-generated |
 | System.Runtime.InteropServices;ComAwareEventInfo;GetAddMethod;(System.Boolean);Argument[this];ReturnValue;taint;df-generated |
-| System.Runtime.InteropServices;ComAwareEventInfo;GetCustomAttributes;(System.Boolean);Argument[this];ReturnValue;taint;df-generated |
 | System.Runtime.InteropServices;ComAwareEventInfo;GetRaiseMethod;(System.Boolean);Argument[this];ReturnValue;taint;df-generated |
 | System.Runtime.InteropServices;ComAwareEventInfo;GetRemoveMethod;(System.Boolean);Argument[this];ReturnValue;taint;df-generated |
 | System.Runtime.InteropServices;ComAwareEventInfo;get_DeclaringType;();Argument[this];ReturnValue;taint;df-generated |
 | System.Runtime.InteropServices;ComAwareEventInfo;get_Module;();Argument[this];ReturnValue;taint;df-generated |
 | System.Runtime.InteropServices;ComAwareEventInfo;get_Name;();Argument[this];ReturnValue;taint;df-generated |
 | System.Runtime.InteropServices;ComAwareEventInfo;get_ReflectedType;();Argument[this];ReturnValue;taint;df-generated |
-| System.Runtime.InteropServices;CriticalHandle;CriticalHandle;(System.IntPtr);Argument[0];Argument[this];taint;df-generated |
-| System.Runtime.InteropServices;CriticalHandle;SetHandle;(System.IntPtr);Argument[0];Argument[this];taint;df-generated |
+| System.Runtime.InteropServices;CriticalHandle;CriticalHandle;(System.IntPtr);Argument[0];Argument[this].Field[System.Runtime.InteropServices.CriticalHandle.handle];value;dfc-generated |
+| System.Runtime.InteropServices;CriticalHandle;SetHandle;(System.IntPtr);Argument[0];Argument[this].Field[System.Runtime.InteropServices.CriticalHandle.handle];value;dfc-generated |
 | System.Runtime.InteropServices;DllImportResolver;BeginInvoke;(System.String,System.Reflection.Assembly,System.Nullable<System.Runtime.InteropServices.DllImportSearchPath>,System.AsyncCallback,System.Object);Argument[3];Argument[3].Parameter[delegate-self];value;hq-generated |
-| System.Runtime.InteropServices;GCHandle;FromIntPtr;(System.IntPtr);Argument[0];ReturnValue;taint;df-generated |
-| System.Runtime.InteropServices;GCHandle;ToIntPtr;(System.Runtime.InteropServices.GCHandle);Argument[0];ReturnValue;taint;df-generated |
-| System.Runtime.InteropServices;HandleRef;HandleRef;(System.Object,System.IntPtr);Argument[0];Argument[this];taint;df-generated |
-| System.Runtime.InteropServices;HandleRef;HandleRef;(System.Object,System.IntPtr);Argument[1];Argument[this];taint;df-generated |
-| System.Runtime.InteropServices;HandleRef;ToIntPtr;(System.Runtime.InteropServices.HandleRef);Argument[0];ReturnValue;taint;df-generated |
-| System.Runtime.InteropServices;HandleRef;get_Handle;();Argument[this];ReturnValue;taint;df-generated |
-| System.Runtime.InteropServices;HandleRef;get_Wrapper;();Argument[this];ReturnValue;taint;df-generated |
+| System.Runtime.InteropServices;GCHandle;FromIntPtr;(System.IntPtr);Argument[0];ReturnValue.SyntheticField[System.Runtime.InteropServices.GCHandle._handle];value;dfc-generated |
+| System.Runtime.InteropServices;GCHandle;ToIntPtr;(System.Runtime.InteropServices.GCHandle);Argument[0].SyntheticField[System.Runtime.InteropServices.GCHandle._handle];ReturnValue;value;dfc-generated |
+| System.Runtime.InteropServices;HandleRef;HandleRef;(System.Object,System.IntPtr);Argument[0];Argument[this].SyntheticField[System.Runtime.InteropServices.HandleRef._wrapper];value;dfc-generated |
+| System.Runtime.InteropServices;HandleRef;HandleRef;(System.Object,System.IntPtr);Argument[1];Argument[this].SyntheticField[System.Runtime.InteropServices.HandleRef._handle];value;dfc-generated |
+| System.Runtime.InteropServices;HandleRef;ToIntPtr;(System.Runtime.InteropServices.HandleRef);Argument[0].SyntheticField[System.Runtime.InteropServices.HandleRef._handle];ReturnValue;value;dfc-generated |
+| System.Runtime.InteropServices;HandleRef;get_Handle;();Argument[this].SyntheticField[System.Runtime.InteropServices.HandleRef._handle];ReturnValue;value;dfc-generated |
+| System.Runtime.InteropServices;HandleRef;get_Wrapper;();Argument[this].SyntheticField[System.Runtime.InteropServices.HandleRef._wrapper];ReturnValue;value;dfc-generated |
 | System.Runtime.InteropServices;ImmutableCollectionsMarshal;AsArray<T>;(System.Collections.Immutable.ImmutableArray<T>);Argument[0].Element;ReturnValue;taint;df-generated |
 | System.Runtime.InteropServices;ImmutableCollectionsMarshal;AsImmutableArray<T>;(T[]);Argument[0].Element;ReturnValue;taint;df-generated |
-| System.Runtime.InteropServices;Marshal;InitHandle;(System.Runtime.InteropServices.SafeHandle,System.IntPtr);Argument[1];Argument[0];taint;df-generated |
+| System.Runtime.InteropServices;Marshal;InitHandle;(System.Runtime.InteropServices.SafeHandle,System.IntPtr);Argument[1];Argument[0].Field[System.Runtime.InteropServices.SafeHandle.handle];value;dfc-generated |
 | System.Runtime.InteropServices;MemoryMarshal;CreateFromPinnedArray<T>;(T[],System.Int32,System.Int32);Argument[0].Element;ReturnValue;taint;df-generated |
-| System.Runtime.InteropServices;MemoryMarshal;ToEnumerable<T>;(System.ReadOnlyMemory<T>);Argument[0];ReturnValue;taint;df-generated |
+| System.Runtime.InteropServices;MemoryMarshal;CreateSpan<T>;(T,System.Int32);Argument[0];ReturnValue;value;dfc-generated |
+| System.Runtime.InteropServices;MemoryMarshal;ToEnumerable<T>;(System.ReadOnlyMemory<T>);Argument[0].Property[System.ReadOnlyMemory`1.Span].Element;ReturnValue.Element;value;dfc-generated |
 | System.Runtime.InteropServices;MemoryMarshal;TryGetMemoryManager<T,TManager>;(System.ReadOnlyMemory<T>,TManager);Argument[0];ReturnValue;taint;df-generated |
 | System.Runtime.InteropServices;MemoryMarshal;TryGetMemoryManager<T,TManager>;(System.ReadOnlyMemory<T>,TManager,System.Int32,System.Int32);Argument[0];ReturnValue;taint;df-generated |
-| System.Runtime.InteropServices;MemoryMarshal;TryGetString;(System.ReadOnlyMemory<System.Char>,System.String,System.Int32,System.Int32);Argument[0];ReturnValue;taint;df-generated |
-| System.Runtime.InteropServices;NFloat;Clamp;(System.Runtime.InteropServices.NFloat,System.Runtime.InteropServices.NFloat,System.Runtime.InteropServices.NFloat);Argument[0];ReturnValue;taint;df-generated |
-| System.Runtime.InteropServices;NFloat;Clamp;(System.Runtime.InteropServices.NFloat,System.Runtime.InteropServices.NFloat,System.Runtime.InteropServices.NFloat);Argument[1];ReturnValue;taint;df-generated |
-| System.Runtime.InteropServices;NFloat;Clamp;(System.Runtime.InteropServices.NFloat,System.Runtime.InteropServices.NFloat,System.Runtime.InteropServices.NFloat);Argument[2];ReturnValue;taint;df-generated |
-| System.Runtime.InteropServices;NFloat;CopySign;(System.Runtime.InteropServices.NFloat,System.Runtime.InteropServices.NFloat);Argument[0];ReturnValue;taint;df-generated |
-| System.Runtime.InteropServices;NFloat;CreateChecked<TOther>;(TOther);Argument[0];ReturnValue;taint;df-generated |
-| System.Runtime.InteropServices;NFloat;CreateSaturating<TOther>;(TOther);Argument[0];ReturnValue;taint;df-generated |
-| System.Runtime.InteropServices;NFloat;CreateTruncating<TOther>;(TOther);Argument[0];ReturnValue;taint;df-generated |
-| System.Runtime.InteropServices;NFloat;Max;(System.Runtime.InteropServices.NFloat,System.Runtime.InteropServices.NFloat);Argument[0];ReturnValue;taint;df-generated |
-| System.Runtime.InteropServices;NFloat;Max;(System.Runtime.InteropServices.NFloat,System.Runtime.InteropServices.NFloat);Argument[1];ReturnValue;taint;df-generated |
-| System.Runtime.InteropServices;NFloat;MaxNumber;(System.Runtime.InteropServices.NFloat,System.Runtime.InteropServices.NFloat);Argument[0];ReturnValue;taint;df-generated |
-| System.Runtime.InteropServices;NFloat;MaxNumber;(System.Runtime.InteropServices.NFloat,System.Runtime.InteropServices.NFloat);Argument[1];ReturnValue;taint;df-generated |
-| System.Runtime.InteropServices;NFloat;Min;(System.Runtime.InteropServices.NFloat,System.Runtime.InteropServices.NFloat);Argument[0];ReturnValue;taint;df-generated |
-| System.Runtime.InteropServices;NFloat;Min;(System.Runtime.InteropServices.NFloat,System.Runtime.InteropServices.NFloat);Argument[1];ReturnValue;taint;df-generated |
-| System.Runtime.InteropServices;NFloat;MinNumber;(System.Runtime.InteropServices.NFloat,System.Runtime.InteropServices.NFloat);Argument[0];ReturnValue;taint;df-generated |
-| System.Runtime.InteropServices;NFloat;MinNumber;(System.Runtime.InteropServices.NFloat,System.Runtime.InteropServices.NFloat);Argument[1];ReturnValue;taint;df-generated |
-| System.Runtime.InteropServices;NFloat;System.Numerics.IAdditionOperators<System.Runtime.InteropServices.NFloat,System.Runtime.InteropServices.NFloat,System.Runtime.InteropServices.NFloat>.op_CheckedAddition;(System.Runtime.InteropServices.NFloat,System.Runtime.InteropServices.NFloat);Argument[0];ReturnValue;taint;df-generated |
-| System.Runtime.InteropServices;NFloat;System.Numerics.IAdditionOperators<System.Runtime.InteropServices.NFloat,System.Runtime.InteropServices.NFloat,System.Runtime.InteropServices.NFloat>.op_CheckedAddition;(System.Runtime.InteropServices.NFloat,System.Runtime.InteropServices.NFloat);Argument[1];ReturnValue;taint;df-generated |
+| System.Runtime.InteropServices;MemoryMarshal;TryGetString;(System.ReadOnlyMemory<System.Char>,System.String,System.Int32,System.Int32);Argument[0].SyntheticField[System.ReadOnlyMemory`1._object];ReturnValue;value;dfc-generated |
+| System.Runtime.InteropServices;NFloat;Clamp;(System.Runtime.InteropServices.NFloat,System.Runtime.InteropServices.NFloat,System.Runtime.InteropServices.NFloat);Argument[0];ReturnValue;value;dfc-generated |
+| System.Runtime.InteropServices;NFloat;Clamp;(System.Runtime.InteropServices.NFloat,System.Runtime.InteropServices.NFloat,System.Runtime.InteropServices.NFloat);Argument[1];ReturnValue;value;dfc-generated |
+| System.Runtime.InteropServices;NFloat;Clamp;(System.Runtime.InteropServices.NFloat,System.Runtime.InteropServices.NFloat,System.Runtime.InteropServices.NFloat);Argument[2];ReturnValue;value;dfc-generated |
+| System.Runtime.InteropServices;NFloat;CopySign;(System.Runtime.InteropServices.NFloat,System.Runtime.InteropServices.NFloat);Argument[0];ReturnValue;value;dfc-generated |
+| System.Runtime.InteropServices;NFloat;CreateChecked<TOther>;(TOther);Argument[0];ReturnValue;value;dfc-generated |
+| System.Runtime.InteropServices;NFloat;CreateSaturating<TOther>;(TOther);Argument[0];ReturnValue;value;dfc-generated |
+| System.Runtime.InteropServices;NFloat;CreateTruncating<TOther>;(TOther);Argument[0];ReturnValue;value;dfc-generated |
+| System.Runtime.InteropServices;NFloat;Max;(System.Runtime.InteropServices.NFloat,System.Runtime.InteropServices.NFloat);Argument[0];ReturnValue;value;dfc-generated |
+| System.Runtime.InteropServices;NFloat;Max;(System.Runtime.InteropServices.NFloat,System.Runtime.InteropServices.NFloat);Argument[1];ReturnValue;value;dfc-generated |
+| System.Runtime.InteropServices;NFloat;MaxNumber;(System.Runtime.InteropServices.NFloat,System.Runtime.InteropServices.NFloat);Argument[0];ReturnValue;value;dfc-generated |
+| System.Runtime.InteropServices;NFloat;MaxNumber;(System.Runtime.InteropServices.NFloat,System.Runtime.InteropServices.NFloat);Argument[1];ReturnValue;value;dfc-generated |
+| System.Runtime.InteropServices;NFloat;Min;(System.Runtime.InteropServices.NFloat,System.Runtime.InteropServices.NFloat);Argument[0];ReturnValue;value;dfc-generated |
+| System.Runtime.InteropServices;NFloat;Min;(System.Runtime.InteropServices.NFloat,System.Runtime.InteropServices.NFloat);Argument[1];ReturnValue;value;dfc-generated |
+| System.Runtime.InteropServices;NFloat;MinNumber;(System.Runtime.InteropServices.NFloat,System.Runtime.InteropServices.NFloat);Argument[0];ReturnValue;value;dfc-generated |
+| System.Runtime.InteropServices;NFloat;MinNumber;(System.Runtime.InteropServices.NFloat,System.Runtime.InteropServices.NFloat);Argument[1];ReturnValue;value;dfc-generated |
+| System.Runtime.InteropServices;NFloat;System.Numerics.IAdditionOperators<System.Runtime.InteropServices.NFloat,System.Runtime.InteropServices.NFloat,System.Runtime.InteropServices.NFloat>.op_CheckedAddition;(System.Runtime.InteropServices.NFloat,System.Runtime.InteropServices.NFloat);Argument[0];ReturnValue;taint;dfc-generated |
+| System.Runtime.InteropServices;NFloat;System.Numerics.IAdditionOperators<System.Runtime.InteropServices.NFloat,System.Runtime.InteropServices.NFloat,System.Runtime.InteropServices.NFloat>.op_CheckedAddition;(System.Runtime.InteropServices.NFloat,System.Runtime.InteropServices.NFloat);Argument[1];ReturnValue;taint;dfc-generated |
 | System.Runtime.InteropServices;NFloat;ToString;(System.IFormatProvider);Argument[0];ReturnValue;taint;df-generated |
-| System.Runtime.InteropServices;NFloat;ToString;(System.String,System.IFormatProvider);Argument[1];ReturnValue;taint;df-generated |
-| System.Runtime.InteropServices;NFloat;ToString;(System.String,System.IFormatProvider);Argument[this];ReturnValue;taint;df-generated |
+| System.Runtime.InteropServices;NFloat;ToString;(System.String,System.IFormatProvider);Argument[this];ReturnValue;taint;dfc-generated |
 | System.Runtime.InteropServices;NativeLibrary;SetDllImportResolver;(System.Reflection.Assembly,System.Runtime.InteropServices.DllImportResolver);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
-| System.Runtime.InteropServices;OSPlatform;Create;(System.String);Argument[0];ReturnValue;taint;df-generated |
-| System.Runtime.InteropServices;OSPlatform;ToString;();Argument[this];ReturnValue;taint;df-generated |
+| System.Runtime.InteropServices;OSPlatform;Create;(System.String);Argument[0];ReturnValue.SyntheticField[System.Runtime.InteropServices.OSPlatform.Name];value;dfc-generated |
+| System.Runtime.InteropServices;OSPlatform;ToString;();Argument[this].SyntheticField[System.Runtime.InteropServices.OSPlatform.Name];ReturnValue;value;dfc-generated |
 | System.Runtime.InteropServices;PosixSignalRegistration;Create;(System.Runtime.InteropServices.PosixSignal,System.Action<System.Runtime.InteropServices.PosixSignalContext>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
-| System.Runtime.InteropServices;SafeHandle;DangerousGetHandle;();Argument[this];ReturnValue;taint;df-generated |
-| System.Runtime.InteropServices;SafeHandle;SafeHandle;(System.IntPtr,System.Boolean);Argument[0];Argument[this];taint;df-generated |
-| System.Runtime.InteropServices;SafeHandle;SetHandle;(System.IntPtr);Argument[0];Argument[this];taint;df-generated |
-| System.Runtime.InteropServices;SequenceMarshal;TryGetArray<T>;(System.Buffers.ReadOnlySequence<T>,System.ArraySegment<T>);Argument[0];ReturnValue;taint;df-generated |
-| System.Runtime.InteropServices;SequenceMarshal;TryGetReadOnlyMemory<T>;(System.Buffers.ReadOnlySequence<T>,System.ReadOnlyMemory<T>);Argument[0];ReturnValue;taint;df-generated |
+| System.Runtime.InteropServices;SafeBuffer;AcquirePointer;(System.Byte*);Argument[0];ReturnValue;value;dfc-generated |
+| System.Runtime.InteropServices;SafeHandle;DangerousGetHandle;();Argument[this].Field[System.Runtime.InteropServices.SafeHandle.handle];ReturnValue;value;dfc-generated |
+| System.Runtime.InteropServices;SafeHandle;SafeHandle;(System.IntPtr,System.Boolean);Argument[0];Argument[this].Field[System.Runtime.InteropServices.SafeHandle.handle];value;dfc-generated |
+| System.Runtime.InteropServices;SafeHandle;SetHandle;(System.IntPtr);Argument[0];Argument[this].Field[System.Runtime.InteropServices.SafeHandle.handle];value;dfc-generated |
+| System.Runtime.InteropServices;SequenceMarshal;TryGetReadOnlyMemory<T>;(System.Buffers.ReadOnlySequence<T>,System.ReadOnlyMemory<T>);Argument[0].Property[System.Buffers.ReadOnlySequence`1.First];ReturnValue;value;dfc-generated |
 | System.Runtime.InteropServices;SequenceMarshal;TryGetReadOnlySequenceSegment<T>;(System.Buffers.ReadOnlySequence<T>,System.Buffers.ReadOnlySequenceSegment<T>,System.Int32,System.Buffers.ReadOnlySequenceSegment<T>,System.Int32);Argument[0];ReturnValue;taint;df-generated |
-| System.Runtime.Intrinsics;Vector64;Abs<T>;(System.Runtime.Intrinsics.Vector64<T>);Argument[0];ReturnValue;taint;df-generated |
-| System.Runtime.Intrinsics;Vector64;Ceiling;(System.Runtime.Intrinsics.Vector64<System.Double>);Argument[0];ReturnValue;taint;df-generated |
-| System.Runtime.Intrinsics;Vector64;Ceiling;(System.Runtime.Intrinsics.Vector64<System.Single>);Argument[0];ReturnValue;taint;df-generated |
-| System.Runtime.Intrinsics;Vector64;Floor;(System.Runtime.Intrinsics.Vector64<System.Double>);Argument[0];ReturnValue;taint;df-generated |
-| System.Runtime.Intrinsics;Vector64;Floor;(System.Runtime.Intrinsics.Vector64<System.Single>);Argument[0];ReturnValue;taint;df-generated |
-| System.Runtime.Intrinsics;Vector64;WithElement<T>;(System.Runtime.Intrinsics.Vector64<T>,System.Int32,T);Argument[0];ReturnValue;taint;df-generated |
-| System.Runtime.Intrinsics;Vector64<T>;op_UnaryPlus;(System.Runtime.Intrinsics.Vector64<T>);Argument[0];ReturnValue;taint;df-generated |
+| System.Runtime.InteropServices;SequenceMarshal;TryRead<T>;(System.Buffers.SequenceReader<System.Byte>,T);Argument[0];ReturnValue;value;dfc-generated |
+| System.Runtime.Intrinsics;Vector64;Abs<T>;(System.Runtime.Intrinsics.Vector64<T>);Argument[0];ReturnValue;value;dfc-generated |
+| System.Runtime.Intrinsics;Vector64;Ceiling;(System.Runtime.Intrinsics.Vector64<System.Double>);Argument[0];ReturnValue;value;dfc-generated |
+| System.Runtime.Intrinsics;Vector64;Ceiling;(System.Runtime.Intrinsics.Vector64<System.Single>);Argument[0];ReturnValue;value;dfc-generated |
+| System.Runtime.Intrinsics;Vector64;Floor;(System.Runtime.Intrinsics.Vector64<System.Double>);Argument[0];ReturnValue;value;dfc-generated |
+| System.Runtime.Intrinsics;Vector64;Floor;(System.Runtime.Intrinsics.Vector64<System.Single>);Argument[0];ReturnValue;value;dfc-generated |
+| System.Runtime.Intrinsics;Vector64;StoreUnsafe<T>;(System.Runtime.Intrinsics.Vector64<T>,T);Argument[1];ReturnValue;value;dfc-generated |
+| System.Runtime.Intrinsics;Vector64;WithElement<T>;(System.Runtime.Intrinsics.Vector64<T>,System.Int32,T);Argument[0];ReturnValue;value;dfc-generated |
+| System.Runtime.Intrinsics;Vector64<T>;op_UnaryPlus;(System.Runtime.Intrinsics.Vector64<T>);Argument[0];ReturnValue;value;dfc-generated |
 | System.Runtime.Intrinsics;Vector128;GetLower<T>;(System.Runtime.Intrinsics.Vector128<T>);Argument[0];ReturnValue;taint;df-generated |
 | System.Runtime.Intrinsics;Vector128;GetUpper<T>;(System.Runtime.Intrinsics.Vector128<T>);Argument[0];ReturnValue;taint;df-generated |
-| System.Runtime.Intrinsics;Vector128;WithElement<T>;(System.Runtime.Intrinsics.Vector128<T>,System.Int32,T);Argument[0];ReturnValue;taint;df-generated |
-| System.Runtime.Intrinsics;Vector128;WithLower<T>;(System.Runtime.Intrinsics.Vector128<T>,System.Runtime.Intrinsics.Vector64<T>);Argument[0];ReturnValue;taint;df-generated |
-| System.Runtime.Intrinsics;Vector128;WithUpper<T>;(System.Runtime.Intrinsics.Vector128<T>,System.Runtime.Intrinsics.Vector64<T>);Argument[0];ReturnValue;taint;df-generated |
-| System.Runtime.Intrinsics;Vector128<T>;op_UnaryPlus;(System.Runtime.Intrinsics.Vector128<T>);Argument[0];ReturnValue;taint;df-generated |
+| System.Runtime.Intrinsics;Vector128;StoreUnsafe<T>;(System.Runtime.Intrinsics.Vector128<T>,T);Argument[1];ReturnValue;value;dfc-generated |
+| System.Runtime.Intrinsics;Vector128;WithElement<T>;(System.Runtime.Intrinsics.Vector128<T>,System.Int32,T);Argument[0];ReturnValue;value;dfc-generated |
+| System.Runtime.Intrinsics;Vector128;WithLower<T>;(System.Runtime.Intrinsics.Vector128<T>,System.Runtime.Intrinsics.Vector64<T>);Argument[0];ReturnValue;value;dfc-generated |
+| System.Runtime.Intrinsics;Vector128;WithUpper<T>;(System.Runtime.Intrinsics.Vector128<T>,System.Runtime.Intrinsics.Vector64<T>);Argument[0];ReturnValue;value;dfc-generated |
+| System.Runtime.Intrinsics;Vector128<T>;op_UnaryPlus;(System.Runtime.Intrinsics.Vector128<T>);Argument[0];ReturnValue;value;dfc-generated |
 | System.Runtime.Intrinsics;Vector256;GetLower<T>;(System.Runtime.Intrinsics.Vector256<T>);Argument[0];ReturnValue;taint;df-generated |
 | System.Runtime.Intrinsics;Vector256;GetUpper<T>;(System.Runtime.Intrinsics.Vector256<T>);Argument[0];ReturnValue;taint;df-generated |
-| System.Runtime.Intrinsics;Vector256;WithElement<T>;(System.Runtime.Intrinsics.Vector256<T>,System.Int32,T);Argument[0];ReturnValue;taint;df-generated |
-| System.Runtime.Intrinsics;Vector256;WithLower<T>;(System.Runtime.Intrinsics.Vector256<T>,System.Runtime.Intrinsics.Vector128<T>);Argument[0];ReturnValue;taint;df-generated |
-| System.Runtime.Intrinsics;Vector256;WithUpper<T>;(System.Runtime.Intrinsics.Vector256<T>,System.Runtime.Intrinsics.Vector128<T>);Argument[0];ReturnValue;taint;df-generated |
-| System.Runtime.Intrinsics;Vector256<T>;op_UnaryPlus;(System.Runtime.Intrinsics.Vector256<T>);Argument[0];ReturnValue;taint;df-generated |
+| System.Runtime.Intrinsics;Vector256;StoreUnsafe<T>;(System.Runtime.Intrinsics.Vector256<T>,T);Argument[1];ReturnValue;value;dfc-generated |
+| System.Runtime.Intrinsics;Vector256;WithElement<T>;(System.Runtime.Intrinsics.Vector256<T>,System.Int32,T);Argument[0];ReturnValue;value;dfc-generated |
+| System.Runtime.Intrinsics;Vector256;WithLower<T>;(System.Runtime.Intrinsics.Vector256<T>,System.Runtime.Intrinsics.Vector128<T>);Argument[0];ReturnValue;value;dfc-generated |
+| System.Runtime.Intrinsics;Vector256;WithUpper<T>;(System.Runtime.Intrinsics.Vector256<T>,System.Runtime.Intrinsics.Vector128<T>);Argument[0];ReturnValue;value;dfc-generated |
+| System.Runtime.Intrinsics;Vector256<T>;op_UnaryPlus;(System.Runtime.Intrinsics.Vector256<T>);Argument[0];ReturnValue;value;dfc-generated |
 | System.Runtime.Intrinsics;Vector512;GetLower<T>;(System.Runtime.Intrinsics.Vector512<T>);Argument[0];ReturnValue;taint;df-generated |
 | System.Runtime.Intrinsics;Vector512;GetUpper<T>;(System.Runtime.Intrinsics.Vector512<T>);Argument[0];ReturnValue;taint;df-generated |
-| System.Runtime.Intrinsics;Vector512;WithElement<T>;(System.Runtime.Intrinsics.Vector512<T>,System.Int32,T);Argument[0];ReturnValue;taint;df-generated |
-| System.Runtime.Intrinsics;Vector512;WithLower<T>;(System.Runtime.Intrinsics.Vector512<T>,System.Runtime.Intrinsics.Vector256<T>);Argument[0];ReturnValue;taint;df-generated |
-| System.Runtime.Intrinsics;Vector512;WithUpper<T>;(System.Runtime.Intrinsics.Vector512<T>,System.Runtime.Intrinsics.Vector256<T>);Argument[0];ReturnValue;taint;df-generated |
-| System.Runtime.Intrinsics;Vector512<T>;op_UnaryPlus;(System.Runtime.Intrinsics.Vector512<T>);Argument[0];ReturnValue;taint;df-generated |
+| System.Runtime.Intrinsics;Vector512;StoreUnsafe<T>;(System.Runtime.Intrinsics.Vector512<T>,T);Argument[1];ReturnValue;value;dfc-generated |
+| System.Runtime.Intrinsics;Vector512;WithElement<T>;(System.Runtime.Intrinsics.Vector512<T>,System.Int32,T);Argument[0];ReturnValue;value;dfc-generated |
+| System.Runtime.Intrinsics;Vector512;WithLower<T>;(System.Runtime.Intrinsics.Vector512<T>,System.Runtime.Intrinsics.Vector256<T>);Argument[0];ReturnValue;value;dfc-generated |
+| System.Runtime.Intrinsics;Vector512;WithUpper<T>;(System.Runtime.Intrinsics.Vector512<T>,System.Runtime.Intrinsics.Vector256<T>);Argument[0];ReturnValue;value;dfc-generated |
+| System.Runtime.Intrinsics;Vector512<T>;op_UnaryPlus;(System.Runtime.Intrinsics.Vector512<T>);Argument[0];ReturnValue;value;dfc-generated |
 | System.Runtime.Loader;AssemblyDependencyResolver;ResolveAssemblyToPath;(System.Reflection.AssemblyName);Argument[0];ReturnValue;taint;df-generated |
 | System.Runtime.Loader;AssemblyDependencyResolver;ResolveAssemblyToPath;(System.Reflection.AssemblyName);Argument[this];ReturnValue;taint;df-generated |
-| System.Runtime.Loader;AssemblyDependencyResolver;ResolveUnmanagedDllToPath;(System.String);Argument[0];ReturnValue;taint;df-generated |
-| System.Runtime.Loader;AssemblyDependencyResolver;ResolveUnmanagedDllToPath;(System.String);Argument[this];ReturnValue;taint;df-generated |
+| System.Runtime.Loader;AssemblyDependencyResolver;ResolveUnmanagedDllToPath;(System.String);Argument[0];ReturnValue;taint;dfc-generated |
 | System.Runtime.Loader;AssemblyLoadContext;EnterContextualReflection;();Argument[this];ReturnValue;taint;df-generated |
-| System.Runtime.Loader;AssemblyLoadContext;ToString;();Argument[this];ReturnValue;taint;df-generated |
+| System.Runtime.Loader;AssemblyLoadContext;ToString;();Argument[this].Property[System.Runtime.Loader.AssemblyLoadContext.Name];ReturnValue;taint;dfc-generated |
 | System.Runtime.Loader;AssemblyLoadContext;add_Resolving;(System.Func<System.Runtime.Loader.AssemblyLoadContext,System.Reflection.AssemblyName,System.Reflection.Assembly>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Runtime.Loader;AssemblyLoadContext;add_ResolvingUnmanagedDll;(System.Func<System.Reflection.Assembly,System.String,System.IntPtr>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Runtime.Loader;AssemblyLoadContext;add_Unloading;(System.Action<System.Runtime.Loader.AssemblyLoadContext>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
@@ -15267,30 +15727,31 @@ summary
 | System.Runtime.Loader;AssemblyLoadContext;remove_Resolving;(System.Func<System.Runtime.Loader.AssemblyLoadContext,System.Reflection.AssemblyName,System.Reflection.Assembly>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Runtime.Loader;AssemblyLoadContext;remove_ResolvingUnmanagedDll;(System.Func<System.Reflection.Assembly,System.String,System.IntPtr>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Runtime.Loader;AssemblyLoadContext;remove_Unloading;(System.Action<System.Runtime.Loader.AssemblyLoadContext>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
-| System.Runtime.Remoting;ObjectHandle;ObjectHandle;(System.Object);Argument[0];Argument[this];taint;df-generated |
-| System.Runtime.Remoting;ObjectHandle;Unwrap;();Argument[this];ReturnValue;taint;df-generated |
+| System.Runtime.Remoting;ObjectHandle;ObjectHandle;(System.Object);Argument[0];Argument[this].SyntheticField[System.Runtime.Remoting.ObjectHandle._wrappedObject];value;dfc-generated |
+| System.Runtime.Remoting;ObjectHandle;Unwrap;();Argument[this].SyntheticField[System.Runtime.Remoting.ObjectHandle._wrappedObject];ReturnValue;value;dfc-generated |
 | System.Runtime.Serialization.DataContracts;DataContract;IsDictionaryLike;(System.String,System.String,System.String);Argument[this];ReturnValue;taint;df-generated |
 | System.Runtime.Serialization.DataContracts;DataContract;get_BaseContract;();Argument[this];ReturnValue;taint;df-generated |
 | System.Runtime.Serialization.DataContracts;DataContract;get_DataMembers;();Argument[this];ReturnValue;taint;df-generated |
 | System.Runtime.Serialization.DataContracts;DataContractSet;DataContractSet;(System.Runtime.Serialization.DataContracts.DataContractSet);Argument[0];Argument[this];taint;df-generated |
 | System.Runtime.Serialization.DataContracts;DataContractSet;DataContractSet;(System.Runtime.Serialization.ISerializationSurrogateProvider,System.Collections.Generic.IEnumerable<System.Type>,System.Collections.Generic.IEnumerable<System.Type>);Argument[0];Argument[this];taint;df-generated |
-| System.Runtime.Serialization.DataContracts;DataContractSet;DataContractSet;(System.Runtime.Serialization.ISerializationSurrogateProvider,System.Collections.Generic.IEnumerable<System.Type>,System.Collections.Generic.IEnumerable<System.Type>);Argument[1].Element;Argument[this];taint;df-generated |
-| System.Runtime.Serialization.DataContracts;DataContractSet;DataContractSet;(System.Runtime.Serialization.ISerializationSurrogateProvider,System.Collections.Generic.IEnumerable<System.Type>,System.Collections.Generic.IEnumerable<System.Type>);Argument[2].Element;Argument[this];taint;df-generated |
-| System.Runtime.Serialization.DataContracts;DataContractSet;ImportSchemaSet;(System.Xml.Schema.XmlSchemaSet,System.Collections.Generic.IEnumerable<System.Xml.Schema.XmlSchemaElement>,System.Boolean);Argument[1].Element;ReturnValue;taint;df-generated |
+| System.Runtime.Serialization.DataContracts;DataContractSet;ImportSchemaSet;(System.Xml.Schema.XmlSchemaSet,System.Collections.Generic.IEnumerable<System.Xml.Schema.XmlSchemaElement>,System.Boolean);Argument[1].Element.Property[System.Xml.Schema.XmlSchemaElement.QualifiedName];ReturnValue.Element;value;dfc-generated |
 | System.Runtime.Serialization.DataContracts;DataMember;get_MemberTypeContract;();Argument[this];ReturnValue;taint;df-generated |
 | System.Runtime.Serialization.Formatters.Binary;BinaryFormatter;BinaryFormatter;(System.Runtime.Serialization.ISurrogateSelector,System.Runtime.Serialization.StreamingContext);Argument[0];Argument[this];taint;df-generated |
 | System.Runtime.Serialization.Formatters.Binary;BinaryFormatter;BinaryFormatter;(System.Runtime.Serialization.ISurrogateSelector,System.Runtime.Serialization.StreamingContext);Argument[1];Argument[this];taint;df-generated |
-| System.Runtime.Serialization.Json;DataContractJsonSerializer;DataContractJsonSerializer;(System.Type,System.Runtime.Serialization.Json.DataContractJsonSerializerSettings);Argument[1];Argument[this];taint;df-generated |
-| System.Runtime.Serialization.Json;DataContractJsonSerializer;GetSerializationSurrogateProvider;();Argument[this];ReturnValue;taint;df-generated |
-| System.Runtime.Serialization.Json;DataContractJsonSerializer;SetSerializationSurrogateProvider;(System.Runtime.Serialization.ISerializationSurrogateProvider);Argument[0];Argument[this];taint;df-generated |
-| System.Runtime.Serialization.Json;DataContractJsonSerializer;get_DateTimeFormat;();Argument[this];ReturnValue;taint;df-generated |
+| System.Runtime.Serialization.Json;DataContractJsonSerializer;DataContractJsonSerializer;(System.Type,System.Runtime.Serialization.Json.DataContractJsonSerializerSettings);Argument[1].Property[System.Runtime.Serialization.Json.DataContractJsonSerializerSettings.DateTimeFormat];Argument[this].SyntheticField[System.Runtime.Serialization.Json.DataContractJsonSerializer._dateTimeFormat];value;dfc-generated |
+| System.Runtime.Serialization.Json;DataContractJsonSerializer;GetSerializationSurrogateProvider;();Argument[this].SyntheticField[System.Runtime.Serialization.Json.DataContractJsonSerializer._serializationSurrogateProvider];ReturnValue;value;dfc-generated |
+| System.Runtime.Serialization.Json;DataContractJsonSerializer;ReadObject;(System.IO.Stream);Argument[this];ReturnValue;taint;df-generated |
+| System.Runtime.Serialization.Json;DataContractJsonSerializer;ReadObject;(System.Xml.XmlDictionaryReader);Argument[this];ReturnValue;taint;df-generated |
+| System.Runtime.Serialization.Json;DataContractJsonSerializer;ReadObject;(System.Xml.XmlDictionaryReader,System.Boolean);Argument[this];ReturnValue;taint;df-generated |
+| System.Runtime.Serialization.Json;DataContractJsonSerializer;ReadObject;(System.Xml.XmlReader);Argument[this];ReturnValue;taint;df-generated |
+| System.Runtime.Serialization.Json;DataContractJsonSerializer;ReadObject;(System.Xml.XmlReader,System.Boolean);Argument[this];ReturnValue;taint;df-generated |
+| System.Runtime.Serialization.Json;DataContractJsonSerializer;SetSerializationSurrogateProvider;(System.Runtime.Serialization.ISerializationSurrogateProvider);Argument[0];Argument[this].SyntheticField[System.Runtime.Serialization.Json.DataContractJsonSerializer._serializationSurrogateProvider];value;dfc-generated |
+| System.Runtime.Serialization.Json;DataContractJsonSerializer;get_DateTimeFormat;();Argument[this].SyntheticField[System.Runtime.Serialization.Json.DataContractJsonSerializer._dateTimeFormat];ReturnValue;value;dfc-generated |
 | System.Runtime.Serialization.Json;IXmlJsonReaderInitializer;SetInput;(System.Byte[],System.Int32,System.Int32,System.Text.Encoding,System.Xml.XmlDictionaryReaderQuotas,System.Xml.OnXmlDictionaryReaderClose);Argument[5];Argument[5].Parameter[delegate-self];value;hq-generated |
 | System.Runtime.Serialization.Json;IXmlJsonReaderInitializer;SetInput;(System.IO.Stream,System.Text.Encoding,System.Xml.XmlDictionaryReaderQuotas,System.Xml.OnXmlDictionaryReaderClose);Argument[3];Argument[3].Parameter[delegate-self];value;hq-generated |
 | System.Runtime.Serialization.Json;IXmlJsonWriterInitializer;SetOutput;(System.IO.Stream,System.Text.Encoding,System.Boolean);Argument[0];Argument[this];taint;df-generated |
 | System.Runtime.Serialization.Json;IXmlJsonWriterInitializer;SetOutput;(System.IO.Stream,System.Text.Encoding,System.Boolean);Argument[1];Argument[this];taint;df-generated |
 | System.Runtime.Serialization.Json;JsonReaderWriterFactory;CreateJsonReader;(System.Byte[],System.Int32,System.Int32,System.Text.Encoding,System.Xml.XmlDictionaryReaderQuotas,System.Xml.OnXmlDictionaryReaderClose);Argument[5];Argument[5].Parameter[delegate-self];value;hq-generated |
-| System.Runtime.Serialization.Json;JsonReaderWriterFactory;CreateJsonReader;(System.Byte[],System.Int32,System.Int32,System.Xml.XmlDictionaryReaderQuotas);Argument[0].Element;ReturnValue;taint;df-generated |
-| System.Runtime.Serialization.Json;JsonReaderWriterFactory;CreateJsonReader;(System.Byte[],System.Xml.XmlDictionaryReaderQuotas);Argument[0].Element;ReturnValue;taint;df-generated |
 | System.Runtime.Serialization.Json;JsonReaderWriterFactory;CreateJsonReader;(System.IO.Stream,System.Text.Encoding,System.Xml.XmlDictionaryReaderQuotas,System.Xml.OnXmlDictionaryReaderClose);Argument[3];Argument[3].Parameter[delegate-self];value;hq-generated |
 | System.Runtime.Serialization.Json;JsonReaderWriterFactory;CreateJsonWriter;(System.IO.Stream);Argument[0];ReturnValue;taint;df-generated |
 | System.Runtime.Serialization.Json;JsonReaderWriterFactory;CreateJsonWriter;(System.IO.Stream,System.Text.Encoding);Argument[0];ReturnValue;taint;df-generated |
@@ -15302,92 +15763,104 @@ summary
 | System.Runtime.Serialization.Json;JsonReaderWriterFactory;CreateJsonWriter;(System.IO.Stream,System.Text.Encoding,System.Boolean,System.Boolean,System.String);Argument[0];ReturnValue;taint;df-generated |
 | System.Runtime.Serialization.Json;JsonReaderWriterFactory;CreateJsonWriter;(System.IO.Stream,System.Text.Encoding,System.Boolean,System.Boolean,System.String);Argument[1];ReturnValue;taint;df-generated |
 | System.Runtime.Serialization.Json;JsonReaderWriterFactory;CreateJsonWriter;(System.IO.Stream,System.Text.Encoding,System.Boolean,System.Boolean,System.String);Argument[4];ReturnValue;taint;df-generated |
-| System.Runtime.Serialization;DataContractSerializer;DataContractSerializer;(System.Type,System.Runtime.Serialization.DataContractSerializerSettings);Argument[1];Argument[this];taint;df-generated |
+| System.Runtime.Serialization;DataContractSerializer;DataContractSerializer;(System.Type,System.Runtime.Serialization.DataContractSerializerSettings);Argument[1].Property[System.Runtime.Serialization.DataContractSerializerSettings.DataContractResolver];Argument[this].SyntheticField[System.Runtime.Serialization.DataContractSerializer._dataContractResolver];value;dfc-generated |
 | System.Runtime.Serialization;DataContractSerializer;DataContractSerializer;(System.Type,System.Xml.XmlDictionaryString,System.Xml.XmlDictionaryString,System.Collections.Generic.IEnumerable<System.Type>);Argument[1];Argument[this];taint;df-generated |
 | System.Runtime.Serialization;DataContractSerializer;DataContractSerializer;(System.Type,System.Xml.XmlDictionaryString,System.Xml.XmlDictionaryString,System.Collections.Generic.IEnumerable<System.Type>);Argument[2];Argument[this];taint;df-generated |
-| System.Runtime.Serialization;DataContractSerializer;get_DataContractResolver;();Argument[this];ReturnValue;taint;df-generated |
-| System.Runtime.Serialization;DataContractSerializerExtensions;GetSerializationSurrogateProvider;(System.Runtime.Serialization.DataContractSerializer);Argument[0];ReturnValue;taint;df-generated |
-| System.Runtime.Serialization;DataContractSerializerExtensions;SetSerializationSurrogateProvider;(System.Runtime.Serialization.DataContractSerializer,System.Runtime.Serialization.ISerializationSurrogateProvider);Argument[1];Argument[0];taint;df-generated |
-| System.Runtime.Serialization;DateTimeFormat;DateTimeFormat;(System.String,System.IFormatProvider);Argument[0];Argument[this];taint;df-generated |
-| System.Runtime.Serialization;DateTimeFormat;DateTimeFormat;(System.String,System.IFormatProvider);Argument[1];Argument[this];taint;df-generated |
-| System.Runtime.Serialization;DateTimeFormat;get_FormatProvider;();Argument[this];ReturnValue;taint;df-generated |
-| System.Runtime.Serialization;DateTimeFormat;get_FormatString;();Argument[this];ReturnValue;taint;df-generated |
-| System.Runtime.Serialization;FormatterConverter;Convert;(System.Object,System.Type);Argument[0];ReturnValue;taint;df-generated |
-| System.Runtime.Serialization;FormatterConverter;Convert;(System.Object,System.TypeCode);Argument[0];ReturnValue;taint;df-generated |
-| System.Runtime.Serialization;FormatterConverter;ToString;(System.Object);Argument[0];ReturnValue;taint;df-generated |
+| System.Runtime.Serialization;DataContractSerializer;ReadObject;(System.Xml.XmlDictionaryReader,System.Boolean);Argument[this];ReturnValue;taint;df-generated |
+| System.Runtime.Serialization;DataContractSerializer;ReadObject;(System.Xml.XmlDictionaryReader,System.Boolean,System.Runtime.Serialization.DataContractResolver);Argument[this];ReturnValue;taint;df-generated |
+| System.Runtime.Serialization;DataContractSerializer;ReadObject;(System.Xml.XmlReader);Argument[this];ReturnValue;taint;df-generated |
+| System.Runtime.Serialization;DataContractSerializer;ReadObject;(System.Xml.XmlReader,System.Boolean);Argument[this];ReturnValue;taint;df-generated |
+| System.Runtime.Serialization;DataContractSerializer;get_DataContractResolver;();Argument[this].SyntheticField[System.Runtime.Serialization.DataContractSerializer._dataContractResolver];ReturnValue;value;dfc-generated |
+| System.Runtime.Serialization;DataContractSerializerExtensions;GetSerializationSurrogateProvider;(System.Runtime.Serialization.DataContractSerializer);Argument[0].SyntheticField[System.Runtime.Serialization.DataContractSerializer._serializationSurrogateProvider];ReturnValue;value;dfc-generated |
+| System.Runtime.Serialization;DataContractSerializerExtensions;SetSerializationSurrogateProvider;(System.Runtime.Serialization.DataContractSerializer,System.Runtime.Serialization.ISerializationSurrogateProvider);Argument[1];Argument[0].SyntheticField[System.Runtime.Serialization.DataContractSerializer._serializationSurrogateProvider];value;dfc-generated |
+| System.Runtime.Serialization;DateTimeFormat;DateTimeFormat;(System.String,System.IFormatProvider);Argument[0];Argument[this].SyntheticField[System.Runtime.Serialization.DateTimeFormat._formatString];value;dfc-generated |
+| System.Runtime.Serialization;DateTimeFormat;DateTimeFormat;(System.String,System.IFormatProvider);Argument[1];Argument[this].SyntheticField[System.Runtime.Serialization.DateTimeFormat._formatProvider];value;dfc-generated |
+| System.Runtime.Serialization;DateTimeFormat;get_FormatProvider;();Argument[this].SyntheticField[System.Runtime.Serialization.DateTimeFormat._formatProvider];ReturnValue;value;dfc-generated |
+| System.Runtime.Serialization;DateTimeFormat;get_FormatString;();Argument[this].SyntheticField[System.Runtime.Serialization.DateTimeFormat._formatString];ReturnValue;value;dfc-generated |
+| System.Runtime.Serialization;FormatterConverter;Convert;(System.Object,System.Type);Argument[0];ReturnValue;taint;dfc-generated |
+| System.Runtime.Serialization;FormatterConverter;Convert;(System.Object,System.TypeCode);Argument[0];ReturnValue;taint;dfc-generated |
+| System.Runtime.Serialization;FormatterConverter;ToString;(System.Object);Argument[0];ReturnValue;taint;dfc-generated |
 | System.Runtime.Serialization;FormatterServices;GetSurrogateForCyclicalReference;(System.Runtime.Serialization.ISerializationSurrogate);Argument[0];ReturnValue;taint;df-generated |
-| System.Runtime.Serialization;FormatterServices;PopulateObjectMembers;(System.Object,System.Reflection.MemberInfo[],System.Object[]);Argument[0];ReturnValue;taint;df-generated |
-| System.Runtime.Serialization;IFormatterConverter;Convert;(System.Object,System.Type);Argument[0];ReturnValue;taint;df-generated |
-| System.Runtime.Serialization;IFormatterConverter;Convert;(System.Object,System.TypeCode);Argument[0];ReturnValue;taint;df-generated |
-| System.Runtime.Serialization;IFormatterConverter;ToString;(System.Object);Argument[0];ReturnValue;taint;df-generated |
+| System.Runtime.Serialization;FormatterServices;PopulateObjectMembers;(System.Object,System.Reflection.MemberInfo[],System.Object[]);Argument[0];ReturnValue;value;dfc-generated |
+| System.Runtime.Serialization;IFormatterConverter;Convert;(System.Object,System.Type);Argument[0];ReturnValue;taint;dfc-generated |
+| System.Runtime.Serialization;IFormatterConverter;Convert;(System.Object,System.TypeCode);Argument[0];ReturnValue;taint;dfc-generated |
+| System.Runtime.Serialization;IFormatterConverter;ToString;(System.Object);Argument[0];ReturnValue;taint;dfc-generated |
 | System.Runtime.Serialization;IObjectReference;GetRealObject;(System.Runtime.Serialization.StreamingContext);Argument[this];ReturnValue;taint;df-generated |
 | System.Runtime.Serialization;ISerializable;GetObjectData;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);Argument[this];Argument[0];taint;df-generated |
-| System.Runtime.Serialization;ISurrogateSelector;ChainSelector;(System.Runtime.Serialization.ISurrogateSelector);Argument[0];Argument[this];taint;df-generated |
-| System.Runtime.Serialization;ISurrogateSelector;ChainSelector;(System.Runtime.Serialization.ISurrogateSelector);Argument[this];Argument[0];taint;df-generated |
-| System.Runtime.Serialization;ISurrogateSelector;GetNextSelector;();Argument[this];ReturnValue;taint;df-generated |
-| System.Runtime.Serialization;ISurrogateSelector;GetSurrogate;(System.Type,System.Runtime.Serialization.StreamingContext,System.Runtime.Serialization.ISurrogateSelector);Argument[this];ReturnValue;taint;df-generated |
+| System.Runtime.Serialization;ISurrogateSelector;GetSurrogate;(System.Type,System.Runtime.Serialization.StreamingContext,System.Runtime.Serialization.ISurrogateSelector);Argument[this];ReturnValue;value;dfc-generated |
 | System.Runtime.Serialization;ObjectIDGenerator;GetId;(System.Object,System.Boolean);Argument[0];Argument[this];taint;df-generated |
 | System.Runtime.Serialization;ObjectManager;GetObject;(System.Int64);Argument[this];ReturnValue;taint;df-generated |
 | System.Runtime.Serialization;ObjectManager;ObjectManager;(System.Runtime.Serialization.ISurrogateSelector,System.Runtime.Serialization.StreamingContext);Argument[0];Argument[this];taint;df-generated |
 | System.Runtime.Serialization;ObjectManager;ObjectManager;(System.Runtime.Serialization.ISurrogateSelector,System.Runtime.Serialization.StreamingContext);Argument[1];Argument[this];taint;df-generated |
-| System.Runtime.Serialization;SerializationEntry;get_Name;();Argument[this];ReturnValue;taint;df-generated |
-| System.Runtime.Serialization;SerializationEntry;get_Value;();Argument[this];ReturnValue;taint;df-generated |
-| System.Runtime.Serialization;SerializationInfo;AddValue;(System.String,System.Boolean);Argument[0];Argument[this];taint;df-generated |
-| System.Runtime.Serialization;SerializationInfo;AddValue;(System.String,System.Byte);Argument[0];Argument[this];taint;df-generated |
-| System.Runtime.Serialization;SerializationInfo;AddValue;(System.String,System.Char);Argument[0];Argument[this];taint;df-generated |
-| System.Runtime.Serialization;SerializationInfo;AddValue;(System.String,System.DateTime);Argument[0];Argument[this];taint;df-generated |
-| System.Runtime.Serialization;SerializationInfo;AddValue;(System.String,System.Decimal);Argument[0];Argument[this];taint;df-generated |
-| System.Runtime.Serialization;SerializationInfo;AddValue;(System.String,System.Double);Argument[0];Argument[this];taint;df-generated |
-| System.Runtime.Serialization;SerializationInfo;AddValue;(System.String,System.Int16);Argument[0];Argument[this];taint;df-generated |
-| System.Runtime.Serialization;SerializationInfo;AddValue;(System.String,System.Int32);Argument[0];Argument[this];taint;df-generated |
-| System.Runtime.Serialization;SerializationInfo;AddValue;(System.String,System.Int64);Argument[0];Argument[this];taint;df-generated |
-| System.Runtime.Serialization;SerializationInfo;AddValue;(System.String,System.Object);Argument[0];Argument[this];taint;df-generated |
-| System.Runtime.Serialization;SerializationInfo;AddValue;(System.String,System.Object);Argument[1];Argument[this];taint;df-generated |
-| System.Runtime.Serialization;SerializationInfo;AddValue;(System.String,System.Object,System.Type);Argument[0];Argument[this];taint;df-generated |
-| System.Runtime.Serialization;SerializationInfo;AddValue;(System.String,System.Object,System.Type);Argument[1];Argument[this];taint;df-generated |
-| System.Runtime.Serialization;SerializationInfo;AddValue;(System.String,System.SByte);Argument[0];Argument[this];taint;df-generated |
-| System.Runtime.Serialization;SerializationInfo;AddValue;(System.String,System.Single);Argument[0];Argument[this];taint;df-generated |
-| System.Runtime.Serialization;SerializationInfo;AddValue;(System.String,System.UInt16);Argument[0];Argument[this];taint;df-generated |
-| System.Runtime.Serialization;SerializationInfo;AddValue;(System.String,System.UInt32);Argument[0];Argument[this];taint;df-generated |
-| System.Runtime.Serialization;SerializationInfo;AddValue;(System.String,System.UInt64);Argument[0];Argument[this];taint;df-generated |
-| System.Runtime.Serialization;SerializationInfo;GetEnumerator;();Argument[this];ReturnValue;taint;df-generated |
-| System.Runtime.Serialization;SerializationInfo;GetString;(System.String);Argument[this];ReturnValue;taint;df-generated |
-| System.Runtime.Serialization;SerializationInfo;GetValue;(System.String,System.Type);Argument[this];ReturnValue;taint;df-generated |
+| System.Runtime.Serialization;SerializationEntry;get_Name;();Argument[this].SyntheticField[System.Runtime.Serialization.SerializationEntry._name];ReturnValue;value;dfc-generated |
+| System.Runtime.Serialization;SerializationEntry;get_Value;();Argument[this].SyntheticField[System.Runtime.Serialization.SerializationEntry._value];ReturnValue;value;dfc-generated |
+| System.Runtime.Serialization;SerializationInfo;AddValue;(System.String,System.Boolean);Argument[0];Argument[this].SyntheticField[System.Runtime.Serialization.SerializationInfo._names].Element;value;dfc-generated |
+| System.Runtime.Serialization;SerializationInfo;AddValue;(System.String,System.Byte);Argument[0];Argument[this].SyntheticField[System.Runtime.Serialization.SerializationInfo._names].Element;value;dfc-generated |
+| System.Runtime.Serialization;SerializationInfo;AddValue;(System.String,System.Char);Argument[0];Argument[this].SyntheticField[System.Runtime.Serialization.SerializationInfo._names].Element;value;dfc-generated |
+| System.Runtime.Serialization;SerializationInfo;AddValue;(System.String,System.DateTime);Argument[0];Argument[this].SyntheticField[System.Runtime.Serialization.SerializationInfo._names].Element;value;dfc-generated |
+| System.Runtime.Serialization;SerializationInfo;AddValue;(System.String,System.Decimal);Argument[0];Argument[this].SyntheticField[System.Runtime.Serialization.SerializationInfo._names].Element;value;dfc-generated |
+| System.Runtime.Serialization;SerializationInfo;AddValue;(System.String,System.Double);Argument[0];Argument[this].SyntheticField[System.Runtime.Serialization.SerializationInfo._names].Element;value;dfc-generated |
+| System.Runtime.Serialization;SerializationInfo;AddValue;(System.String,System.Int16);Argument[0];Argument[this].SyntheticField[System.Runtime.Serialization.SerializationInfo._names].Element;value;dfc-generated |
+| System.Runtime.Serialization;SerializationInfo;AddValue;(System.String,System.Int32);Argument[0];Argument[this].SyntheticField[System.Runtime.Serialization.SerializationInfo._names].Element;value;dfc-generated |
+| System.Runtime.Serialization;SerializationInfo;AddValue;(System.String,System.Int64);Argument[0];Argument[this].SyntheticField[System.Runtime.Serialization.SerializationInfo._names].Element;value;dfc-generated |
+| System.Runtime.Serialization;SerializationInfo;AddValue;(System.String,System.Object);Argument[0];Argument[this].SyntheticField[System.Runtime.Serialization.SerializationInfo._names].Element;value;dfc-generated |
+| System.Runtime.Serialization;SerializationInfo;AddValue;(System.String,System.Object);Argument[1];Argument[this].SyntheticField[System.Runtime.Serialization.SerializationInfo._values].Element;value;dfc-generated |
+| System.Runtime.Serialization;SerializationInfo;AddValue;(System.String,System.Object,System.Type);Argument[0];Argument[this].SyntheticField[System.Runtime.Serialization.SerializationInfo._names].Element;value;dfc-generated |
+| System.Runtime.Serialization;SerializationInfo;AddValue;(System.String,System.Object,System.Type);Argument[1];Argument[this].SyntheticField[System.Runtime.Serialization.SerializationInfo._values].Element;value;dfc-generated |
+| System.Runtime.Serialization;SerializationInfo;AddValue;(System.String,System.SByte);Argument[0];Argument[this].SyntheticField[System.Runtime.Serialization.SerializationInfo._names].Element;value;dfc-generated |
+| System.Runtime.Serialization;SerializationInfo;AddValue;(System.String,System.Single);Argument[0];Argument[this].SyntheticField[System.Runtime.Serialization.SerializationInfo._names].Element;value;dfc-generated |
+| System.Runtime.Serialization;SerializationInfo;AddValue;(System.String,System.UInt16);Argument[0];Argument[this].SyntheticField[System.Runtime.Serialization.SerializationInfo._names].Element;value;dfc-generated |
+| System.Runtime.Serialization;SerializationInfo;AddValue;(System.String,System.UInt32);Argument[0];Argument[this].SyntheticField[System.Runtime.Serialization.SerializationInfo._names].Element;value;dfc-generated |
+| System.Runtime.Serialization;SerializationInfo;AddValue;(System.String,System.UInt64);Argument[0];Argument[this].SyntheticField[System.Runtime.Serialization.SerializationInfo._names].Element;value;dfc-generated |
+| System.Runtime.Serialization;SerializationInfo;GetEnumerator;();Argument[this].SyntheticField[System.Runtime.Serialization.SerializationInfo._names];ReturnValue.SyntheticField[System.Runtime.Serialization.SerializationInfoEnumerator._members];value;dfc-generated |
+| System.Runtime.Serialization;SerializationInfo;GetEnumerator;();Argument[this].SyntheticField[System.Runtime.Serialization.SerializationInfo._values];ReturnValue.SyntheticField[System.Runtime.Serialization.SerializationInfoEnumerator._data];value;dfc-generated |
+| System.Runtime.Serialization;SerializationInfo;GetString;(System.String);Argument[this].SyntheticField[System.Runtime.Serialization.SerializationInfo._values].Element;ReturnValue;value;dfc-generated |
+| System.Runtime.Serialization;SerializationInfo;GetValue;(System.String,System.Type);Argument[this].SyntheticField[System.Runtime.Serialization.SerializationInfo._values].Element;ReturnValue;value;dfc-generated |
 | System.Runtime.Serialization;SerializationInfo;SerializationInfo;(System.Type,System.Runtime.Serialization.IFormatterConverter);Argument[1];Argument[this];taint;df-generated |
+| System.Runtime.Serialization;SerializationInfoEnumerator;get_Current;();Argument[this].Property[System.Runtime.Serialization.SerializationInfoEnumerator.Current];ReturnValue;value;df-generated |
+| System.Runtime.Serialization;SerializationInfoEnumerator;get_Current;();Argument[this].Property[System.Runtime.Serialization.SerializationInfoEnumerator.Current];ReturnValue;value;dfc-generated |
+| System.Runtime.Serialization;SerializationInfoEnumerator;get_Current;();Argument[this].SyntheticField[System.Runtime.Serialization.SerializationInfoEnumerator._data].Element;ReturnValue.SyntheticField[System.Runtime.Serialization.SerializationEntry._value];value;df-generated |
+| System.Runtime.Serialization;SerializationInfoEnumerator;get_Current;();Argument[this].SyntheticField[System.Runtime.Serialization.SerializationInfoEnumerator._data].Element;ReturnValue.SyntheticField[System.Runtime.Serialization.SerializationEntry._value];value;dfc-generated |
+| System.Runtime.Serialization;SerializationInfoEnumerator;get_Current;();Argument[this].SyntheticField[System.Runtime.Serialization.SerializationInfoEnumerator._members].Element;ReturnValue.SyntheticField[System.Runtime.Serialization.SerializationEntry._name];value;df-generated |
+| System.Runtime.Serialization;SerializationInfoEnumerator;get_Current;();Argument[this].SyntheticField[System.Runtime.Serialization.SerializationInfoEnumerator._members].Element;ReturnValue.SyntheticField[System.Runtime.Serialization.SerializationEntry._name];value;dfc-generated |
 | System.Runtime.Serialization;SerializationInfoEnumerator;get_Current;();Argument[this];ReturnValue;taint;df-generated |
-| System.Runtime.Serialization;SerializationInfoEnumerator;get_Name;();Argument[this];ReturnValue;taint;df-generated |
-| System.Runtime.Serialization;SerializationInfoEnumerator;get_Value;();Argument[this];ReturnValue;taint;df-generated |
+| System.Runtime.Serialization;SerializationInfoEnumerator;get_Current;();Argument[this];ReturnValue;taint;dfc-generated |
+| System.Runtime.Serialization;SerializationInfoEnumerator;get_Name;();Argument[this].SyntheticField[System.Runtime.Serialization.SerializationInfoEnumerator._members].Element;ReturnValue;value;dfc-generated |
+| System.Runtime.Serialization;SerializationInfoEnumerator;get_Value;();Argument[this].SyntheticField[System.Runtime.Serialization.SerializationInfoEnumerator._data].Element;ReturnValue;value;dfc-generated |
 | System.Runtime.Serialization;SerializationObjectManager;SerializationObjectManager;(System.Runtime.Serialization.StreamingContext);Argument[0];Argument[this];taint;df-generated |
-| System.Runtime.Serialization;StreamingContext;StreamingContext;(System.Runtime.Serialization.StreamingContextStates,System.Object);Argument[1];Argument[this];taint;df-generated |
-| System.Runtime.Serialization;StreamingContext;get_Context;();Argument[this];ReturnValue;taint;df-generated |
-| System.Runtime.Serialization;SurrogateSelector;ChainSelector;(System.Runtime.Serialization.ISurrogateSelector);Argument[0];Argument[this];taint;df-generated |
-| System.Runtime.Serialization;SurrogateSelector;ChainSelector;(System.Runtime.Serialization.ISurrogateSelector);Argument[this];Argument[0];taint;df-generated |
-| System.Runtime.Serialization;SurrogateSelector;GetNextSelector;();Argument[this];ReturnValue;taint;df-generated |
-| System.Runtime.Serialization;SurrogateSelector;GetSurrogate;(System.Type,System.Runtime.Serialization.StreamingContext,System.Runtime.Serialization.ISurrogateSelector);Argument[this];ReturnValue;taint;df-generated |
-| System.Runtime.Serialization;XPathQueryGenerator;CreateFromDataContractSerializer;(System.Type,System.Reflection.MemberInfo[],System.Text.StringBuilder,System.Xml.XmlNamespaceManager);Argument[2];ReturnValue;taint;df-generated |
-| System.Runtime.Serialization;XmlSerializableServices;AddDefaultSchema;(System.Xml.Schema.XmlSchemaSet,System.Xml.XmlQualifiedName);Argument[1];Argument[0];taint;df-generated |
+| System.Runtime.Serialization;StreamingContext;StreamingContext;(System.Runtime.Serialization.StreamingContextStates,System.Object);Argument[1];Argument[this].SyntheticField[System.Runtime.Serialization.StreamingContext._additionalContext];value;dfc-generated |
+| System.Runtime.Serialization;StreamingContext;get_Context;();Argument[this].SyntheticField[System.Runtime.Serialization.StreamingContext._additionalContext];ReturnValue;value;dfc-generated |
+| System.Runtime.Serialization;SurrogateSelector;ChainSelector;(System.Runtime.Serialization.ISurrogateSelector);Argument[0];Argument[this].SyntheticField[System.Runtime.Serialization.SurrogateSelector._nextSelector];value;dfc-generated |
+| System.Runtime.Serialization;SurrogateSelector;GetNextSelector;();Argument[this].SyntheticField[System.Runtime.Serialization.SurrogateSelector._nextSelector];ReturnValue;value;dfc-generated |
+| System.Runtime.Serialization;SurrogateSelector;GetSurrogate;(System.Type,System.Runtime.Serialization.StreamingContext,System.Runtime.Serialization.ISurrogateSelector);Argument[this].SyntheticField[System.Runtime.Serialization.SurrogateSelector._nextSelector];ReturnValue;value;dfc-generated |
+| System.Runtime.Serialization;SurrogateSelector;GetSurrogate;(System.Type,System.Runtime.Serialization.StreamingContext,System.Runtime.Serialization.ISurrogateSelector);Argument[this];ReturnValue;value;dfc-generated |
+| System.Runtime.Serialization;XPathQueryGenerator;CreateFromDataContractSerializer;(System.Type,System.Reflection.MemberInfo[],System.Text.StringBuilder,System.Xml.XmlNamespaceManager);Argument[2];ReturnValue;taint;dfc-generated |
+| System.Runtime.Serialization;XmlObjectSerializer;ReadObject;(System.IO.Stream);Argument[this];ReturnValue;taint;df-generated |
+| System.Runtime.Serialization;XmlObjectSerializer;ReadObject;(System.Xml.XmlDictionaryReader);Argument[this];ReturnValue;taint;df-generated |
+| System.Runtime.Serialization;XmlObjectSerializer;ReadObject;(System.Xml.XmlDictionaryReader,System.Boolean);Argument[this];ReturnValue;taint;df-generated |
+| System.Runtime.Serialization;XmlObjectSerializer;ReadObject;(System.Xml.XmlReader);Argument[this];ReturnValue;taint;df-generated |
+| System.Runtime.Serialization;XmlObjectSerializer;ReadObject;(System.Xml.XmlReader,System.Boolean);Argument[this];ReturnValue;taint;df-generated |
 | System.Runtime.Serialization;XmlSerializableServices;WriteNodes;(System.Xml.XmlWriter,System.Xml.XmlNode[]);Argument[1].Element;Argument[0];taint;df-generated |
-| System.Runtime.Serialization;XsdDataContractExporter;XsdDataContractExporter;(System.Xml.Schema.XmlSchemaSet);Argument[0];Argument[this];taint;df-generated |
-| System.Runtime.Serialization;XsdDataContractExporter;get_Schemas;();Argument[this];ReturnValue;taint;df-generated |
-| System.Runtime.Versioning;FrameworkName;FrameworkName;(System.String,System.Version,System.String);Argument[0];Argument[this];taint;df-generated |
-| System.Runtime.Versioning;FrameworkName;FrameworkName;(System.String,System.Version,System.String);Argument[1];Argument[this];taint;df-generated |
-| System.Runtime.Versioning;FrameworkName;FrameworkName;(System.String,System.Version,System.String);Argument[2];Argument[this];taint;df-generated |
+| System.Runtime.Serialization;XsdDataContractExporter;XsdDataContractExporter;(System.Xml.Schema.XmlSchemaSet);Argument[0];Argument[this].SyntheticField[System.Runtime.Serialization.XsdDataContractExporter._schemas];value;dfc-generated |
+| System.Runtime.Serialization;XsdDataContractExporter;get_Schemas;();Argument[this].SyntheticField[System.Runtime.Serialization.XsdDataContractExporter._schemas];ReturnValue;value;dfc-generated |
+| System.Runtime.Versioning;FrameworkName;FrameworkName;(System.String,System.Version,System.String);Argument[0];Argument[this].SyntheticField[System.Runtime.Versioning.FrameworkName._identifier];value;dfc-generated |
+| System.Runtime.Versioning;FrameworkName;FrameworkName;(System.String,System.Version,System.String);Argument[1];Argument[this].SyntheticField[System.Runtime.Versioning.FrameworkName._version];value;dfc-generated |
+| System.Runtime.Versioning;FrameworkName;FrameworkName;(System.String,System.Version,System.String);Argument[2];Argument[this].SyntheticField[System.Runtime.Versioning.FrameworkName._profile];value;dfc-generated |
 | System.Runtime.Versioning;FrameworkName;ToString;();Argument[this];ReturnValue;taint;df-generated |
 | System.Runtime.Versioning;FrameworkName;get_FullName;();Argument[this];ReturnValue;taint;df-generated |
-| System.Runtime.Versioning;FrameworkName;get_Identifier;();Argument[this];ReturnValue;taint;df-generated |
-| System.Runtime.Versioning;FrameworkName;get_Profile;();Argument[this];ReturnValue;taint;df-generated |
-| System.Runtime.Versioning;FrameworkName;get_Version;();Argument[this];ReturnValue;taint;df-generated |
-| System.Runtime.Versioning;TargetFrameworkAttribute;TargetFrameworkAttribute;(System.String);Argument[0];Argument[this];taint;df-generated |
-| System.Runtime.Versioning;TargetFrameworkAttribute;get_FrameworkName;();Argument[this];ReturnValue;taint;df-generated |
-| System.Runtime.Versioning;VersioningHelper;MakeVersionSafeName;(System.String,System.Runtime.Versioning.ResourceScope,System.Runtime.Versioning.ResourceScope);Argument[0];ReturnValue;taint;df-generated |
-| System.Runtime.Versioning;VersioningHelper;MakeVersionSafeName;(System.String,System.Runtime.Versioning.ResourceScope,System.Runtime.Versioning.ResourceScope,System.Type);Argument[0];ReturnValue;taint;df-generated |
+| System.Runtime.Versioning;FrameworkName;get_Identifier;();Argument[this].SyntheticField[System.Runtime.Versioning.FrameworkName._identifier];ReturnValue;value;dfc-generated |
+| System.Runtime.Versioning;FrameworkName;get_Profile;();Argument[this].SyntheticField[System.Runtime.Versioning.FrameworkName._profile];ReturnValue;value;dfc-generated |
+| System.Runtime.Versioning;FrameworkName;get_Version;();Argument[this].SyntheticField[System.Runtime.Versioning.FrameworkName._version];ReturnValue;value;dfc-generated |
+| System.Runtime.Versioning;TargetFrameworkAttribute;TargetFrameworkAttribute;(System.String);Argument[0];Argument[this].SyntheticField[System.Runtime.Versioning.TargetFrameworkAttribute._frameworkName];value;dfc-generated |
+| System.Runtime.Versioning;TargetFrameworkAttribute;get_FrameworkName;();Argument[this].SyntheticField[System.Runtime.Versioning.TargetFrameworkAttribute._frameworkName];ReturnValue;value;dfc-generated |
+| System.Runtime.Versioning;VersioningHelper;MakeVersionSafeName;(System.String,System.Runtime.Versioning.ResourceScope,System.Runtime.Versioning.ResourceScope);Argument[0];ReturnValue;taint;dfc-generated |
+| System.Runtime.Versioning;VersioningHelper;MakeVersionSafeName;(System.String,System.Runtime.Versioning.ResourceScope,System.Runtime.Versioning.ResourceScope,System.Type);Argument[0];ReturnValue;taint;dfc-generated |
 | System.Runtime;ControlledExecution;Run;(System.Action,System.Threading.CancellationToken);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Runtime;DependentHandle;get_TargetAndDependent;();Argument[this];ReturnValue;taint;df-generated |
 | System.Security.AccessControl;AceEnumerator;get_Current;();Argument[this];ReturnValue;taint;df-generated |
 | System.Security.AccessControl;GenericAcl;CopyTo;(System.Array,System.Int32);Argument[this].Element;Argument[0].Element;value;manual |
 | System.Security.AccessControl;GenericAcl;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.IEnumerator.Current];value;manual |
-| System.Security.AccessControl;GenericAcl;get_SyncRoot;();Argument[this];ReturnValue;taint;df-generated |
-| System.Security.AccessControl;GenericAcl;get_SyncRoot;();Argument[this];ReturnValue;value;df-generated |
+| System.Security.AccessControl;GenericAcl;get_SyncRoot;();Argument[this];ReturnValue;value;dfc-generated |
 | System.Security.AccessControl;NativeObjectSecurity+ExceptionFromErrorCode;BeginInvoke;(System.Int32,System.String,System.Runtime.InteropServices.SafeHandle,System.Object,System.AsyncCallback,System.Object);Argument[4];Argument[4].Parameter[delegate-self];value;hq-generated |
 | System.Security.AccessControl;NativeObjectSecurity;NativeObjectSecurity;(System.Boolean,System.Security.AccessControl.ResourceType,System.Runtime.InteropServices.SafeHandle,System.Security.AccessControl.AccessControlSections,System.Security.AccessControl.NativeObjectSecurity+ExceptionFromErrorCode,System.Object);Argument[4];Argument[4].Parameter[delegate-self];value;hq-generated |
 | System.Security.AccessControl;NativeObjectSecurity;NativeObjectSecurity;(System.Boolean,System.Security.AccessControl.ResourceType,System.Security.AccessControl.NativeObjectSecurity+ExceptionFromErrorCode,System.Object);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
@@ -15395,72 +15868,66 @@ summary
 | System.Security.AccessControl;ObjectSecurity<T>;ObjectSecurity;(System.Boolean,System.Security.AccessControl.ResourceType,System.Runtime.InteropServices.SafeHandle,System.Security.AccessControl.AccessControlSections,System.Security.AccessControl.NativeObjectSecurity+ExceptionFromErrorCode,System.Object);Argument[4];Argument[4].Parameter[delegate-self];value;hq-generated |
 | System.Security.AccessControl;ObjectSecurity<T>;ObjectSecurity;(System.Boolean,System.Security.AccessControl.ResourceType,System.String,System.Security.AccessControl.AccessControlSections,System.Security.AccessControl.NativeObjectSecurity+ExceptionFromErrorCode,System.Object);Argument[4];Argument[4].Parameter[delegate-self];value;hq-generated |
 | System.Security.AccessControl;PrivilegeNotHeldException;GetObjectData;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);Argument[this];Argument[0];taint;df-generated |
-| System.Security.Authentication.ExtendedProtection;ExtendedProtectionPolicy;ExtendedProtectionPolicy;(System.Security.Authentication.ExtendedProtection.PolicyEnforcement,System.Security.Authentication.ExtendedProtection.ChannelBinding);Argument[1];Argument[this];taint;df-generated |
-| System.Security.Authentication.ExtendedProtection;ExtendedProtectionPolicy;ExtendedProtectionPolicy;(System.Security.Authentication.ExtendedProtection.PolicyEnforcement,System.Security.Authentication.ExtendedProtection.ProtectionScenario,System.Security.Authentication.ExtendedProtection.ServiceNameCollection);Argument[2].Element;Argument[this];taint;df-generated |
+| System.Security.Authentication.ExtendedProtection;ExtendedProtectionPolicy;ExtendedProtectionPolicy;(System.Security.Authentication.ExtendedProtection.PolicyEnforcement,System.Security.Authentication.ExtendedProtection.ChannelBinding);Argument[1];Argument[this].SyntheticField[System.Security.Authentication.ExtendedProtection.ExtendedProtectionPolicy._customChannelBinding];value;dfc-generated |
+| System.Security.Authentication.ExtendedProtection;ExtendedProtectionPolicy;ExtendedProtectionPolicy;(System.Security.Authentication.ExtendedProtection.PolicyEnforcement,System.Security.Authentication.ExtendedProtection.ProtectionScenario,System.Security.Authentication.ExtendedProtection.ServiceNameCollection);Argument[2];Argument[this].SyntheticField[System.Security.Authentication.ExtendedProtection.ExtendedProtectionPolicy._customServiceNames];value;dfc-generated |
 | System.Security.Authentication.ExtendedProtection;ExtendedProtectionPolicy;GetObjectData;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);Argument[this];Argument[0];taint;df-generated |
-| System.Security.Authentication.ExtendedProtection;ExtendedProtectionPolicy;ToString;();Argument[this];ReturnValue;taint;df-generated |
-| System.Security.Authentication.ExtendedProtection;ExtendedProtectionPolicy;get_CustomChannelBinding;();Argument[this];ReturnValue;taint;df-generated |
-| System.Security.Authentication.ExtendedProtection;ExtendedProtectionPolicy;get_CustomServiceNames;();Argument[this];ReturnValue;taint;df-generated |
-| System.Security.Authentication.ExtendedProtection;ExtendedProtectionPolicyTypeConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[1];ReturnValue;taint;df-generated |
-| System.Security.Authentication.ExtendedProtection;ExtendedProtectionPolicyTypeConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[2];ReturnValue;taint;df-generated |
-| System.Security.Authentication.ExtendedProtection;ExtendedProtectionPolicyTypeConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[this];ReturnValue;taint;df-generated |
-| System.Security.Authentication.ExtendedProtection;ServiceNameCollection;Merge;(System.Collections.IEnumerable);Argument[0].Element;ReturnValue;taint;df-generated |
-| System.Security.Authentication.ExtendedProtection;ServiceNameCollection;Merge;(System.String);Argument[0];ReturnValue;taint;df-generated |
-| System.Security.Authentication.ExtendedProtection;ServiceNameCollection;ServiceNameCollection;(System.Collections.ICollection);Argument[0].Element;Argument[this];taint;df-generated |
-| System.Security.Claims;Claim;Claim;(System.IO.BinaryReader,System.Security.Claims.ClaimsIdentity);Argument[0];Argument[this];taint;df-generated |
+| System.Security.Authentication.ExtendedProtection;ExtendedProtectionPolicy;ToString;();Argument[this].SyntheticField[System.Security.Authentication.ExtendedProtection.ExtendedProtectionPolicy._customServiceNames].Element;ReturnValue;taint;dfc-generated |
+| System.Security.Authentication.ExtendedProtection;ExtendedProtectionPolicy;get_CustomChannelBinding;();Argument[this].SyntheticField[System.Security.Authentication.ExtendedProtection.ExtendedProtectionPolicy._customChannelBinding];ReturnValue;value;dfc-generated |
+| System.Security.Authentication.ExtendedProtection;ExtendedProtectionPolicy;get_CustomServiceNames;();Argument[this].SyntheticField[System.Security.Authentication.ExtendedProtection.ExtendedProtectionPolicy._customServiceNames];ReturnValue;value;dfc-generated |
+| System.Security.Authentication.ExtendedProtection;ExtendedProtectionPolicyTypeConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[2].Element;ReturnValue;taint;dfc-generated |
+| System.Security.Authentication.ExtendedProtection;ExtendedProtectionPolicyTypeConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[2];ReturnValue;taint;dfc-generated |
+| System.Security.Authentication.ExtendedProtection;ServiceNameCollection;Merge;(System.Collections.IEnumerable);Argument[0].Element;ReturnValue.Property[System.Collections.ReadOnlyCollectionBase.InnerList].Element;value;dfc-generated |
+| System.Security.Authentication.ExtendedProtection;ServiceNameCollection;Merge;(System.Collections.IEnumerable);Argument[0].Property[System.Collections.ReadOnlyCollectionBase.InnerList].Element;ReturnValue.Property[System.Collections.ReadOnlyCollectionBase.InnerList].Element;value;dfc-generated |
+| System.Security.Authentication.ExtendedProtection;ServiceNameCollection;Merge;(System.String);Argument[0];ReturnValue.Property[System.Collections.ReadOnlyCollectionBase.InnerList].Element;value;dfc-generated |
+| System.Security.Authentication.ExtendedProtection;ServiceNameCollection;ServiceNameCollection;(System.Collections.ICollection);Argument[0].Element;Argument[this].Property[System.Collections.ReadOnlyCollectionBase.InnerList].Element;value;dfc-generated |
+| System.Security.Authentication.ExtendedProtection;ServiceNameCollection;ServiceNameCollection;(System.Collections.ICollection);Argument[0].Property[System.Collections.ReadOnlyCollectionBase.InnerList].Element;Argument[this].Property[System.Collections.ReadOnlyCollectionBase.InnerList].Element;value;dfc-generated |
 | System.Security.Claims;Claim;Claim;(System.IO.BinaryReader,System.Security.Claims.ClaimsIdentity);Argument[1];Argument[this];taint;df-generated |
 | System.Security.Claims;Claim;Claim;(System.Security.Claims.Claim,System.Security.Claims.ClaimsIdentity);Argument[0];Argument[this];taint;df-generated |
 | System.Security.Claims;Claim;Claim;(System.Security.Claims.Claim,System.Security.Claims.ClaimsIdentity);Argument[1];Argument[this];taint;df-generated |
-| System.Security.Claims;Claim;Clone;();Argument[this];ReturnValue;taint;df-generated |
-| System.Security.Claims;Claim;Clone;(System.Security.Claims.ClaimsIdentity);Argument[0];ReturnValue;taint;df-generated |
-| System.Security.Claims;Claim;Clone;(System.Security.Claims.ClaimsIdentity);Argument[this];ReturnValue;taint;df-generated |
 | System.Security.Claims;Claim;ToString;();Argument[this];ReturnValue;taint;df-generated |
-| System.Security.Claims;Claim;WriteTo;(System.IO.BinaryWriter,System.Byte[]);Argument[1].Element;Argument[0];taint;df-generated |
 | System.Security.Claims;Claim;get_CustomSerializationData;();Argument[this];ReturnValue;taint;df-generated |
 | System.Security.Claims;Claim;get_Issuer;();Argument[this];ReturnValue;taint;df-generated |
 | System.Security.Claims;Claim;get_OriginalIssuer;();Argument[this];ReturnValue;taint;df-generated |
 | System.Security.Claims;Claim;get_Type;();Argument[this];ReturnValue;taint;df-generated |
 | System.Security.Claims;Claim;get_Value;();Argument[this];ReturnValue;taint;df-generated |
 | System.Security.Claims;Claim;get_ValueType;();Argument[this];ReturnValue;taint;df-generated |
-| System.Security.Claims;ClaimsIdentity;AddClaim;(System.Security.Claims.Claim);Argument[0];Argument[this];taint;df-generated |
-| System.Security.Claims;ClaimsIdentity;AddClaims;(System.Collections.Generic.IEnumerable<System.Security.Claims.Claim>);Argument[0].Element;Argument[this];taint;df-generated |
-| System.Security.Claims;ClaimsIdentity;ClaimsIdentity;(System.IO.BinaryReader);Argument[0];Argument[this];taint;df-generated |
+| System.Security.Claims;ClaimsIdentity;AddClaim;(System.Security.Claims.Claim);Argument[0];Argument[this].SyntheticField[System.Security.Claims.ClaimsIdentity._instanceClaims].Element;value;dfc-generated |
+| System.Security.Claims;ClaimsIdentity;AddClaims;(System.Collections.Generic.IEnumerable<System.Security.Claims.Claim>);Argument[0].Element;Argument[this].SyntheticField[System.Security.Claims.ClaimsIdentity._instanceClaims].Element;value;dfc-generated |
 | System.Security.Claims;ClaimsIdentity;ClaimsIdentity;(System.Security.Claims.ClaimsIdentity);Argument[0];Argument[this];taint;df-generated |
-| System.Security.Claims;ClaimsIdentity;ClaimsIdentity;(System.Security.Principal.IIdentity,System.Collections.Generic.IEnumerable<System.Security.Claims.Claim>,System.String,System.String,System.String);Argument[0];Argument[this];taint;df-generated |
-| System.Security.Claims;ClaimsIdentity;ClaimsIdentity;(System.Security.Principal.IIdentity,System.Collections.Generic.IEnumerable<System.Security.Claims.Claim>,System.String,System.String,System.String);Argument[1].Element;Argument[this];taint;df-generated |
-| System.Security.Claims;ClaimsIdentity;ClaimsIdentity;(System.Security.Principal.IIdentity,System.Collections.Generic.IEnumerable<System.Security.Claims.Claim>,System.String,System.String,System.String);Argument[2];Argument[this];taint;df-generated |
-| System.Security.Claims;ClaimsIdentity;ClaimsIdentity;(System.Security.Principal.IIdentity,System.Collections.Generic.IEnumerable<System.Security.Claims.Claim>,System.String,System.String,System.String);Argument[3];Argument[this];taint;df-generated |
-| System.Security.Claims;ClaimsIdentity;ClaimsIdentity;(System.Security.Principal.IIdentity,System.Collections.Generic.IEnumerable<System.Security.Claims.Claim>,System.String,System.String,System.String);Argument[4];Argument[this];taint;df-generated |
-| System.Security.Claims;ClaimsIdentity;Clone;();Argument[this];ReturnValue;taint;df-generated |
-| System.Security.Claims;ClaimsIdentity;CreateClaim;(System.IO.BinaryReader);Argument[0];ReturnValue;taint;df-generated |
-| System.Security.Claims;ClaimsIdentity;CreateClaim;(System.IO.BinaryReader);Argument[this];ReturnValue;taint;df-generated |
+| System.Security.Claims;ClaimsIdentity;ClaimsIdentity;(System.Security.Principal.IIdentity,System.Collections.Generic.IEnumerable<System.Security.Claims.Claim>,System.String,System.String,System.String);Argument[1].Element;Argument[this].SyntheticField[System.Security.Claims.ClaimsIdentity._instanceClaims].Element;value;dfc-generated |
+| System.Security.Claims;ClaimsIdentity;ClaimsIdentity;(System.Security.Principal.IIdentity,System.Collections.Generic.IEnumerable<System.Security.Claims.Claim>,System.String,System.String,System.String);Argument[2];Argument[this].SyntheticField[System.Security.Claims.ClaimsIdentity._authenticationType];value;dfc-generated |
+| System.Security.Claims;ClaimsIdentity;ClaimsIdentity;(System.Security.Principal.IIdentity,System.Collections.Generic.IEnumerable<System.Security.Claims.Claim>,System.String,System.String,System.String);Argument[3];Argument[this].SyntheticField[System.Security.Claims.ClaimsIdentity._nameClaimType];value;dfc-generated |
+| System.Security.Claims;ClaimsIdentity;ClaimsIdentity;(System.Security.Principal.IIdentity,System.Collections.Generic.IEnumerable<System.Security.Claims.Claim>,System.String,System.String,System.String);Argument[4];Argument[this].SyntheticField[System.Security.Claims.ClaimsIdentity._roleClaimType];value;dfc-generated |
 | System.Security.Claims;ClaimsIdentity;FindAll;(System.Predicate<System.Security.Claims.Claim>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Security.Claims;ClaimsIdentity;FindFirst;(System.Predicate<System.Security.Claims.Claim>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
-| System.Security.Claims;ClaimsIdentity;FindFirst;(System.String);Argument[this];ReturnValue;taint;df-generated |
+| System.Security.Claims;ClaimsIdentity;FindFirst;(System.String);Argument[this].Property[System.Security.Claims.ClaimsIdentity.Claims].Element;ReturnValue;value;dfc-generated |
+| System.Security.Claims;ClaimsIdentity;FindFirst;(System.String);Argument[this].SyntheticField[System.Security.Claims.ClaimsIdentity._instanceClaims].Element;ReturnValue;value;dfc-generated |
+| System.Security.Claims;ClaimsIdentity;HasClaim;(System.Predicate<System.Security.Claims.Claim>);Argument[0];Argument[0].Parameter[delegate-self];value;dfc-generated |
 | System.Security.Claims;ClaimsIdentity;HasClaim;(System.Predicate<System.Security.Claims.Claim>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
-| System.Security.Claims;ClaimsIdentity;WriteTo;(System.IO.BinaryWriter,System.Byte[]);Argument[1].Element;Argument[0];taint;df-generated |
-| System.Security.Claims;ClaimsIdentity;get_AuthenticationType;();Argument[this];ReturnValue;taint;df-generated |
-| System.Security.Claims;ClaimsIdentity;get_Claims;();Argument[this];ReturnValue;taint;df-generated |
+| System.Security.Claims;ClaimsIdentity;HasClaim;(System.Predicate<System.Security.Claims.Claim>);Argument[this].Property[System.Security.Claims.ClaimsIdentity.Claims].Element;Argument[0].Parameter[0];value;dfc-generated |
+| System.Security.Claims;ClaimsIdentity;HasClaim;(System.Predicate<System.Security.Claims.Claim>);Argument[this].Property[System.Security.Claims.ClaimsIdentity.Claims].Element;Argument[0].Parameter[0];value;hq-generated |
+| System.Security.Claims;ClaimsIdentity;HasClaim;(System.Predicate<System.Security.Claims.Claim>);Argument[this].SyntheticField[System.Security.Claims.ClaimsIdentity._instanceClaims].Element;Argument[0].Parameter[0];value;dfc-generated |
+| System.Security.Claims;ClaimsIdentity;HasClaim;(System.Predicate<System.Security.Claims.Claim>);Argument[this].SyntheticField[System.Security.Claims.ClaimsIdentity._instanceClaims].Element;Argument[0].Parameter[0];value;hq-generated |
+| System.Security.Claims;ClaimsIdentity;get_AuthenticationType;();Argument[this].SyntheticField[System.Security.Claims.ClaimsIdentity._authenticationType];ReturnValue;value;dfc-generated |
+| System.Security.Claims;ClaimsIdentity;get_Claims;();Argument[this].SyntheticField[System.Security.Claims.ClaimsIdentity._instanceClaims].Element;ReturnValue.Element;value;dfc-generated |
+| System.Security.Claims;ClaimsIdentity;get_Claims;();Argument[this].SyntheticField[System.Security.Claims.ClaimsIdentity._instanceClaims];ReturnValue;value;dfc-generated |
 | System.Security.Claims;ClaimsIdentity;get_CustomSerializationData;();Argument[this];ReturnValue;taint;df-generated |
 | System.Security.Claims;ClaimsIdentity;get_Name;();Argument[this];ReturnValue;taint;df-generated |
-| System.Security.Claims;ClaimsIdentity;get_NameClaimType;();Argument[this];ReturnValue;taint;df-generated |
-| System.Security.Claims;ClaimsIdentity;get_RoleClaimType;();Argument[this];ReturnValue;taint;df-generated |
-| System.Security.Claims;ClaimsPrincipal;AddIdentities;(System.Collections.Generic.IEnumerable<System.Security.Claims.ClaimsIdentity>);Argument[0].Element;Argument[this];taint;df-generated |
-| System.Security.Claims;ClaimsPrincipal;AddIdentity;(System.Security.Claims.ClaimsIdentity);Argument[0];Argument[this];taint;df-generated |
-| System.Security.Claims;ClaimsPrincipal;ClaimsPrincipal;(System.Collections.Generic.IEnumerable<System.Security.Claims.ClaimsIdentity>);Argument[0].Element;Argument[this];taint;df-generated |
-| System.Security.Claims;ClaimsPrincipal;ClaimsPrincipal;(System.Security.Principal.IIdentity);Argument[0];Argument[this];taint;df-generated |
-| System.Security.Claims;ClaimsPrincipal;ClaimsPrincipal;(System.Security.Principal.IPrincipal);Argument[0];Argument[this];taint;df-generated |
-| System.Security.Claims;ClaimsPrincipal;Clone;();Argument[this];ReturnValue;taint;df-generated |
-| System.Security.Claims;ClaimsPrincipal;CreateClaimsIdentity;(System.IO.BinaryReader);Argument[0];ReturnValue;taint;df-generated |
+| System.Security.Claims;ClaimsIdentity;get_NameClaimType;();Argument[this].SyntheticField[System.Security.Claims.ClaimsIdentity._nameClaimType];ReturnValue;value;dfc-generated |
+| System.Security.Claims;ClaimsIdentity;get_RoleClaimType;();Argument[this].SyntheticField[System.Security.Claims.ClaimsIdentity._roleClaimType];ReturnValue;value;dfc-generated |
+| System.Security.Claims;ClaimsPrincipal;AddIdentities;(System.Collections.Generic.IEnumerable<System.Security.Claims.ClaimsIdentity>);Argument[0].Element;Argument[this].SyntheticField[System.Security.Claims.ClaimsPrincipal._identities].Element;value;dfc-generated |
+| System.Security.Claims;ClaimsPrincipal;AddIdentity;(System.Security.Claims.ClaimsIdentity);Argument[0];Argument[this].SyntheticField[System.Security.Claims.ClaimsPrincipal._identities].Element;value;dfc-generated |
+| System.Security.Claims;ClaimsPrincipal;ClaimsPrincipal;(System.Collections.Generic.IEnumerable<System.Security.Claims.ClaimsIdentity>);Argument[0].Element;Argument[this].SyntheticField[System.Security.Claims.ClaimsPrincipal._identities].Element;value;dfc-generated |
+| System.Security.Claims;ClaimsPrincipal;ClaimsPrincipal;(System.Security.Principal.IIdentity);Argument[0];Argument[this].SyntheticField[System.Security.Claims.ClaimsPrincipal._identities].Element;value;dfc-generated |
+| System.Security.Claims;ClaimsPrincipal;ClaimsPrincipal;(System.Security.Principal.IPrincipal);Argument[0].Property[System.Security.Claims.ClaimsPrincipal.Identities].Element;Argument[this].SyntheticField[System.Security.Claims.ClaimsPrincipal._identities].Element;value;dfc-generated |
 | System.Security.Claims;ClaimsPrincipal;FindAll;(System.Predicate<System.Security.Claims.Claim>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Security.Claims;ClaimsPrincipal;FindFirst;(System.Predicate<System.Security.Claims.Claim>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Security.Claims;ClaimsPrincipal;FindFirst;(System.String);Argument[this];ReturnValue;taint;df-generated |
 | System.Security.Claims;ClaimsPrincipal;HasClaim;(System.Predicate<System.Security.Claims.Claim>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
-| System.Security.Claims;ClaimsPrincipal;WriteTo;(System.IO.BinaryWriter,System.Byte[]);Argument[1].Element;Argument[0];taint;df-generated |
 | System.Security.Claims;ClaimsPrincipal;get_Claims;();Argument[this];ReturnValue;taint;df-generated |
 | System.Security.Claims;ClaimsPrincipal;get_CustomSerializationData;();Argument[this];ReturnValue;taint;df-generated |
-| System.Security.Claims;ClaimsPrincipal;get_Identities;();Argument[this];ReturnValue;taint;df-generated |
-| System.Security.Claims;ClaimsPrincipal;get_Identity;();Argument[this];ReturnValue;taint;df-generated |
+| System.Security.Claims;ClaimsPrincipal;get_Identities;();Argument[this].SyntheticField[System.Security.Claims.ClaimsPrincipal._identities];ReturnValue;value;dfc-generated |
+| System.Security.Claims;ClaimsPrincipal;get_Identity;();Argument[this].SyntheticField[System.Security.Claims.ClaimsPrincipal._identities].Element;ReturnValue;value;dfc-generated |
 | System.Security.Claims;ClaimsPrincipal;set_ClaimsPrincipalSelector;(System.Func<System.Security.Claims.ClaimsPrincipal>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Security.Claims;ClaimsPrincipal;set_PrimaryIdentitySelector;(System.Func<System.Collections.Generic.IEnumerable<System.Security.Claims.ClaimsIdentity>,System.Security.Claims.ClaimsIdentity>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Security.Cryptography.X509Certificates;CertificateRequest;CertificateRequest;(System.Security.Cryptography.X509Certificates.X500DistinguishedName,System.Security.Cryptography.ECDsa,System.Security.Cryptography.HashAlgorithmName);Argument[1];Argument[this];taint;df-generated |
@@ -15470,28 +15937,29 @@ summary
 | System.Security.Cryptography.X509Certificates;CertificateRequest;CertificateRequest;(System.String,System.Security.Cryptography.ECDsa,System.Security.Cryptography.HashAlgorithmName);Argument[1];Argument[this];taint;df-generated |
 | System.Security.Cryptography.X509Certificates;CertificateRequest;CertificateRequest;(System.String,System.Security.Cryptography.RSA,System.Security.Cryptography.HashAlgorithmName,System.Security.Cryptography.RSASignaturePadding);Argument[1];Argument[this];taint;df-generated |
 | System.Security.Cryptography.X509Certificates;CertificateRequest;CertificateRequest;(System.String,System.Security.Cryptography.RSA,System.Security.Cryptography.HashAlgorithmName,System.Security.Cryptography.RSASignaturePadding);Argument[3];Argument[this];taint;df-generated |
-| System.Security.Cryptography.X509Certificates;CertificateRequest;LoadSigningRequest;(System.Byte[],System.Security.Cryptography.HashAlgorithmName,System.Security.Cryptography.X509Certificates.CertificateRequestLoadOptions,System.Security.Cryptography.RSASignaturePadding);Argument[3];ReturnValue;taint;df-generated |
-| System.Security.Cryptography.X509Certificates;CertificateRequest;LoadSigningRequest;(System.ReadOnlySpan<System.Byte>,System.Security.Cryptography.HashAlgorithmName,System.Int32,System.Security.Cryptography.X509Certificates.CertificateRequestLoadOptions,System.Security.Cryptography.RSASignaturePadding);Argument[4];ReturnValue;taint;df-generated |
-| System.Security.Cryptography.X509Certificates;CertificateRequest;LoadSigningRequestPem;(System.ReadOnlySpan<System.Char>,System.Security.Cryptography.HashAlgorithmName,System.Security.Cryptography.X509Certificates.CertificateRequestLoadOptions,System.Security.Cryptography.RSASignaturePadding);Argument[3];ReturnValue;taint;df-generated |
-| System.Security.Cryptography.X509Certificates;CertificateRequest;LoadSigningRequestPem;(System.String,System.Security.Cryptography.HashAlgorithmName,System.Security.Cryptography.X509Certificates.CertificateRequestLoadOptions,System.Security.Cryptography.RSASignaturePadding);Argument[3];ReturnValue;taint;df-generated |
-| System.Security.Cryptography.X509Certificates;PublicKey;PublicKey;(System.Security.Cryptography.Oid,System.Security.Cryptography.AsnEncodedData,System.Security.Cryptography.AsnEncodedData);Argument[0];Argument[this];taint;df-generated |
+| System.Security.Cryptography.X509Certificates;PublicKey;PublicKey;(System.Security.Cryptography.Oid,System.Security.Cryptography.AsnEncodedData,System.Security.Cryptography.AsnEncodedData);Argument[0];Argument[this].SyntheticField[System.Security.Cryptography.X509Certificates.PublicKey._oid];value;dfc-generated |
 | System.Security.Cryptography.X509Certificates;PublicKey;get_Key;();Argument[this];ReturnValue;taint;df-generated |
-| System.Security.Cryptography.X509Certificates;PublicKey;get_Oid;();Argument[this];ReturnValue;taint;df-generated |
-| System.Security.Cryptography.X509Certificates;X500DistinguishedName;Format;(System.Boolean);Argument[this];ReturnValue;taint;df-generated |
+| System.Security.Cryptography.X509Certificates;PublicKey;get_Oid;();Argument[this].SyntheticField[System.Security.Cryptography.X509Certificates.PublicKey._oid];ReturnValue;value;dfc-generated |
+| System.Security.Cryptography.X509Certificates;X500DistinguishedName;Format;(System.Boolean);Argument[this].SyntheticField[System.Security.Cryptography.AsnEncodedData._rawData].Element;ReturnValue;taint;dfc-generated |
 | System.Security.Cryptography.X509Certificates;X500DistinguishedName;X500DistinguishedName;(System.Security.Cryptography.X509Certificates.X500DistinguishedName);Argument[0];Argument[this];taint;df-generated |
 | System.Security.Cryptography.X509Certificates;X500DistinguishedName;X500DistinguishedName;(System.String,System.Security.Cryptography.X509Certificates.X500DistinguishedNameFlags);Argument[0];Argument[this];taint;df-generated |
 | System.Security.Cryptography.X509Certificates;X500RelativeDistinguishedName;GetSingleElementType;();Argument[this];ReturnValue;taint;df-generated |
-| System.Security.Cryptography.X509Certificates;X509AuthorityInformationAccessExtension;CopyFrom;(System.Security.Cryptography.AsnEncodedData);Argument[0];Argument[this];taint;df-generated |
-| System.Security.Cryptography.X509Certificates;X509AuthorityKeyIdentifierExtension;CopyFrom;(System.Security.Cryptography.AsnEncodedData);Argument[0];Argument[this];taint;df-generated |
+| System.Security.Cryptography.X509Certificates;X509AuthorityInformationAccessExtension;CopyFrom;(System.Security.Cryptography.AsnEncodedData);Argument[0].SyntheticField[System.Security.Cryptography.AsnEncodedData._rawData].Element;Argument[this].SyntheticField[System.Security.Cryptography.AsnEncodedData._rawData].Element;value;dfc-generated |
+| System.Security.Cryptography.X509Certificates;X509AuthorityInformationAccessExtension;CopyFrom;(System.Security.Cryptography.AsnEncodedData);Argument[0].SyntheticField[System.Security.Cryptography.AsnEncodedData._rawData];Argument[this].SyntheticField[System.Security.Cryptography.AsnEncodedData._rawData];value;dfc-generated |
+| System.Security.Cryptography.X509Certificates;X509AuthorityKeyIdentifierExtension;CopyFrom;(System.Security.Cryptography.AsnEncodedData);Argument[0].SyntheticField[System.Security.Cryptography.AsnEncodedData._rawData].Element;Argument[this].SyntheticField[System.Security.Cryptography.AsnEncodedData._rawData].Element;value;dfc-generated |
+| System.Security.Cryptography.X509Certificates;X509AuthorityKeyIdentifierExtension;CopyFrom;(System.Security.Cryptography.AsnEncodedData);Argument[0].SyntheticField[System.Security.Cryptography.AsnEncodedData._rawData];Argument[this].SyntheticField[System.Security.Cryptography.AsnEncodedData._rawData];value;dfc-generated |
 | System.Security.Cryptography.X509Certificates;X509AuthorityKeyIdentifierExtension;get_KeyIdentifier;();Argument[this];ReturnValue;taint;df-generated |
 | System.Security.Cryptography.X509Certificates;X509AuthorityKeyIdentifierExtension;get_NamedIssuer;();Argument[this];ReturnValue;taint;df-generated |
 | System.Security.Cryptography.X509Certificates;X509AuthorityKeyIdentifierExtension;get_RawIssuer;();Argument[this];ReturnValue;taint;df-generated |
 | System.Security.Cryptography.X509Certificates;X509AuthorityKeyIdentifierExtension;get_SerialNumber;();Argument[this];ReturnValue;taint;df-generated |
-| System.Security.Cryptography.X509Certificates;X509BasicConstraintsExtension;CopyFrom;(System.Security.Cryptography.AsnEncodedData);Argument[0];Argument[this];taint;df-generated |
-| System.Security.Cryptography.X509Certificates;X509Certificate2;ToString;(System.Boolean);Argument[this];ReturnValue;taint;df-generated |
+| System.Security.Cryptography.X509Certificates;X509BasicConstraintsExtension;CopyFrom;(System.Security.Cryptography.AsnEncodedData);Argument[0].SyntheticField[System.Security.Cryptography.AsnEncodedData._rawData].Element;Argument[this].SyntheticField[System.Security.Cryptography.AsnEncodedData._rawData].Element;value;dfc-generated |
+| System.Security.Cryptography.X509Certificates;X509BasicConstraintsExtension;CopyFrom;(System.Security.Cryptography.AsnEncodedData);Argument[0].SyntheticField[System.Security.Cryptography.AsnEncodedData._rawData];Argument[this].SyntheticField[System.Security.Cryptography.AsnEncodedData._rawData];value;dfc-generated |
+| System.Security.Cryptography.X509Certificates;X509Certificate2;ToString;();Argument[this].Property[System.Security.Cryptography.X509Certificates.X509Certificate.Issuer];ReturnValue;taint;dfc-generated |
+| System.Security.Cryptography.X509Certificates;X509Certificate2;ToString;();Argument[this].Property[System.Security.Cryptography.X509Certificates.X509Certificate.Subject];ReturnValue;taint;dfc-generated |
+| System.Security.Cryptography.X509Certificates;X509Certificate2;ToString;(System.Boolean);Argument[this].Property[System.Security.Cryptography.X509Certificates.X509Certificate.Issuer];ReturnValue;taint;dfc-generated |
+| System.Security.Cryptography.X509Certificates;X509Certificate2;ToString;(System.Boolean);Argument[this].Property[System.Security.Cryptography.X509Certificates.X509Certificate.Subject];ReturnValue;taint;dfc-generated |
 | System.Security.Cryptography.X509Certificates;X509Certificate2;get_Extensions;();Argument[this];ReturnValue;taint;df-generated |
 | System.Security.Cryptography.X509Certificates;X509Certificate2;get_PublicKey;();Argument[this];ReturnValue;taint;df-generated |
-| System.Security.Cryptography.X509Certificates;X509Certificate2;get_RawData;();Argument[this];ReturnValue;taint;df-generated |
 | System.Security.Cryptography.X509Certificates;X509Certificate2Collection;Add;(System.Security.Cryptography.X509Certificates.X509Certificate2);Argument[0];Argument[this].Element;value;manual |
 | System.Security.Cryptography.X509Certificates;X509Certificate2Collection;AddRange;(System.Security.Cryptography.X509Certificates.X509Certificate2Collection);Argument[0].Element;Argument[this].Element;value;manual |
 | System.Security.Cryptography.X509Certificates;X509Certificate2Collection;AddRange;(System.Security.Cryptography.X509Certificates.X509Certificate2[]);Argument[0].Element;Argument[this].Element;value;manual |
@@ -15499,12 +15967,12 @@ summary
 | System.Security.Cryptography.X509Certificates;X509Certificate2Collection;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.Generic.IEnumerator`1.Current];value;manual |
 | System.Security.Cryptography.X509Certificates;X509Certificate2Collection;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Security.Cryptography.X509Certificates.X509Certificate2Enumerator.Current];value;manual |
 | System.Security.Cryptography.X509Certificates;X509Certificate2Collection;Insert;(System.Int32,System.Security.Cryptography.X509Certificates.X509Certificate2);Argument[1];Argument[this].Element;value;manual |
-| System.Security.Cryptography.X509Certificates;X509Certificate2Collection;Remove;(System.Security.Cryptography.X509Certificates.X509Certificate2);Argument[0];Argument[this];taint;df-generated |
 | System.Security.Cryptography.X509Certificates;X509Certificate2Collection;RemoveRange;(System.Security.Cryptography.X509Certificates.X509Certificate2Collection);Argument[0].Element;Argument[this];taint;df-generated |
-| System.Security.Cryptography.X509Certificates;X509Certificate2Collection;RemoveRange;(System.Security.Cryptography.X509Certificates.X509Certificate2[]);Argument[0].Element;Argument[this];taint;df-generated |
-| System.Security.Cryptography.X509Certificates;X509Certificate2Collection;X509Certificate2Collection;(System.Security.Cryptography.X509Certificates.X509Certificate2);Argument[0];Argument[this];taint;df-generated |
+| System.Security.Cryptography.X509Certificates;X509Certificate2Collection;RemoveRange;(System.Security.Cryptography.X509Certificates.X509Certificate2[]);Argument[0].Element;Argument[this].Element;value;dfc-generated |
+| System.Security.Cryptography.X509Certificates;X509Certificate2Collection;RemoveRange;(System.Security.Cryptography.X509Certificates.X509Certificate2[]);Argument[0].Element;Argument[this].Property[System.Collections.CollectionBase.List].Element;value;dfc-generated |
 | System.Security.Cryptography.X509Certificates;X509Certificate2Collection;X509Certificate2Collection;(System.Security.Cryptography.X509Certificates.X509Certificate2Collection);Argument[0].Element;Argument[this];taint;df-generated |
-| System.Security.Cryptography.X509Certificates;X509Certificate2Collection;X509Certificate2Collection;(System.Security.Cryptography.X509Certificates.X509Certificate2[]);Argument[0].Element;Argument[this];taint;df-generated |
+| System.Security.Cryptography.X509Certificates;X509Certificate2Collection;X509Certificate2Collection;(System.Security.Cryptography.X509Certificates.X509Certificate2[]);Argument[0].Element;Argument[this].Element;value;dfc-generated |
+| System.Security.Cryptography.X509Certificates;X509Certificate2Collection;X509Certificate2Collection;(System.Security.Cryptography.X509Certificates.X509Certificate2[]);Argument[0].Element;Argument[this].Property[System.Collections.CollectionBase.List].Element;value;dfc-generated |
 | System.Security.Cryptography.X509Certificates;X509Certificate2Collection;get_Item;(System.Int32);Argument[this].Element;ReturnValue;value;manual |
 | System.Security.Cryptography.X509Certificates;X509Certificate2Collection;set_Item;(System.Int32,System.Security.Cryptography.X509Certificates.X509Certificate2);Argument[1];Argument[this].Element;value;manual |
 | System.Security.Cryptography.X509Certificates;X509Certificate2Enumerator;get_Current;();Argument[this];ReturnValue;taint;df-generated |
@@ -15514,9 +15982,9 @@ summary
 | System.Security.Cryptography.X509Certificates;X509Certificate;GetRawCertData;();Argument[this];ReturnValue;taint;df-generated |
 | System.Security.Cryptography.X509Certificates;X509Certificate;GetRawCertDataString;();Argument[this];ReturnValue;taint;df-generated |
 | System.Security.Cryptography.X509Certificates;X509Certificate;ToString;();Argument[this];ReturnValue;taint;df-generated |
-| System.Security.Cryptography.X509Certificates;X509Certificate;ToString;(System.Boolean);Argument[this];ReturnValue;taint;df-generated |
+| System.Security.Cryptography.X509Certificates;X509Certificate;ToString;(System.Boolean);Argument[this].Property[System.Security.Cryptography.X509Certificates.X509Certificate.Issuer];ReturnValue;taint;dfc-generated |
+| System.Security.Cryptography.X509Certificates;X509Certificate;ToString;(System.Boolean);Argument[this].Property[System.Security.Cryptography.X509Certificates.X509Certificate.Subject];ReturnValue;taint;dfc-generated |
 | System.Security.Cryptography.X509Certificates;X509Certificate;get_Handle;();Argument[this];ReturnValue;taint;df-generated |
-| System.Security.Cryptography.X509Certificates;X509CertificateCollection+X509CertificateEnumerator;X509CertificateEnumerator;(System.Security.Cryptography.X509Certificates.X509CertificateCollection);Argument[0].Element;Argument[this];taint;df-generated |
 | System.Security.Cryptography.X509Certificates;X509CertificateCollection+X509CertificateEnumerator;get_Current;();Argument[this];ReturnValue;taint;df-generated |
 | System.Security.Cryptography.X509Certificates;X509CertificateCollection;Add;(System.Security.Cryptography.X509Certificates.X509Certificate);Argument[0];Argument[this].Element;value;manual |
 | System.Security.Cryptography.X509Certificates;X509CertificateCollection;AddRange;(System.Security.Cryptography.X509Certificates.X509CertificateCollection);Argument[0].Element;Argument[this].Element;value;manual |
@@ -15524,13 +15992,11 @@ summary
 | System.Security.Cryptography.X509Certificates;X509CertificateCollection;CopyTo;(System.Security.Cryptography.X509Certificates.X509Certificate[],System.Int32);Argument[this].Element;Argument[0].Element;value;manual |
 | System.Security.Cryptography.X509Certificates;X509CertificateCollection;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Security.Cryptography.X509Certificates.X509CertificateCollection+X509CertificateEnumerator.Current];value;manual |
 | System.Security.Cryptography.X509Certificates;X509CertificateCollection;Insert;(System.Int32,System.Security.Cryptography.X509Certificates.X509Certificate);Argument[1];Argument[this].Element;value;manual |
-| System.Security.Cryptography.X509Certificates;X509CertificateCollection;Remove;(System.Security.Cryptography.X509Certificates.X509Certificate);Argument[0];Argument[this];taint;df-generated |
 | System.Security.Cryptography.X509Certificates;X509CertificateCollection;X509CertificateCollection;(System.Security.Cryptography.X509Certificates.X509CertificateCollection);Argument[0].Element;Argument[this];taint;df-generated |
-| System.Security.Cryptography.X509Certificates;X509CertificateCollection;X509CertificateCollection;(System.Security.Cryptography.X509Certificates.X509Certificate[]);Argument[0].Element;Argument[this];taint;df-generated |
+| System.Security.Cryptography.X509Certificates;X509CertificateCollection;X509CertificateCollection;(System.Security.Cryptography.X509Certificates.X509Certificate[]);Argument[0].Element;Argument[this].Element;value;dfc-generated |
+| System.Security.Cryptography.X509Certificates;X509CertificateCollection;X509CertificateCollection;(System.Security.Cryptography.X509Certificates.X509Certificate[]);Argument[0].Element;Argument[this].Property[System.Collections.CollectionBase.List].Element;value;dfc-generated |
 | System.Security.Cryptography.X509Certificates;X509CertificateCollection;get_Item;(System.Int32);Argument[this].Element;ReturnValue;value;manual |
 | System.Security.Cryptography.X509Certificates;X509CertificateCollection;set_Item;(System.Int32,System.Security.Cryptography.X509Certificates.X509Certificate);Argument[1];Argument[this].Element;value;manual |
-| System.Security.Cryptography.X509Certificates;X509Chain;Build;(System.Security.Cryptography.X509Certificates.X509Certificate2);Argument[0];Argument[this];taint;df-generated |
-| System.Security.Cryptography.X509Certificates;X509Chain;get_ChainContext;();Argument[this];ReturnValue;taint;df-generated |
 | System.Security.Cryptography.X509Certificates;X509Chain;get_SafeHandle;();Argument[this];ReturnValue;taint;df-generated |
 | System.Security.Cryptography.X509Certificates;X509ChainElementCollection;CopyTo;(System.Array,System.Int32);Argument[this].Element;Argument[0].Element;value;manual |
 | System.Security.Cryptography.X509Certificates;X509ChainElementCollection;CopyTo;(System.Security.Cryptography.X509Certificates.X509ChainElement[],System.Int32);Argument[this].Element;Argument[0].Element;value;manual |
@@ -15538,13 +16004,17 @@ summary
 | System.Security.Cryptography.X509Certificates;X509ChainElementCollection;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.IEnumerator.Current];value;manual |
 | System.Security.Cryptography.X509Certificates;X509ChainElementCollection;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Security.Cryptography.X509Certificates.X509ChainElementEnumerator.Current];value;manual |
 | System.Security.Cryptography.X509Certificates;X509ChainElementCollection;get_Item;(System.Int32);Argument[this];ReturnValue;taint;df-generated |
-| System.Security.Cryptography.X509Certificates;X509ChainElementCollection;get_SyncRoot;();Argument[this];ReturnValue;taint;df-generated |
-| System.Security.Cryptography.X509Certificates;X509ChainElementCollection;get_SyncRoot;();Argument[this];ReturnValue;value;df-generated |
+| System.Security.Cryptography.X509Certificates;X509ChainElementCollection;get_SyncRoot;();Argument[this];ReturnValue;value;dfc-generated |
+| System.Security.Cryptography.X509Certificates;X509ChainElementEnumerator;get_Current;();Argument[this].Property[System.Security.Cryptography.X509Certificates.X509ChainElementEnumerator.Current];ReturnValue;value;df-generated |
+| System.Security.Cryptography.X509Certificates;X509ChainElementEnumerator;get_Current;();Argument[this].Property[System.Security.Cryptography.X509Certificates.X509ChainElementEnumerator.Current];ReturnValue;value;dfc-generated |
 | System.Security.Cryptography.X509Certificates;X509ChainElementEnumerator;get_Current;();Argument[this];ReturnValue;taint;df-generated |
+| System.Security.Cryptography.X509Certificates;X509ChainElementEnumerator;get_Current;();Argument[this];ReturnValue;taint;dfc-generated |
 | System.Security.Cryptography.X509Certificates;X509ChainPolicy;Clone;();Argument[this];ReturnValue;taint;df-generated |
-| System.Security.Cryptography.X509Certificates;X509EnhancedKeyUsageExtension;CopyFrom;(System.Security.Cryptography.AsnEncodedData);Argument[0];Argument[this];taint;df-generated |
+| System.Security.Cryptography.X509Certificates;X509EnhancedKeyUsageExtension;CopyFrom;(System.Security.Cryptography.AsnEncodedData);Argument[0].SyntheticField[System.Security.Cryptography.AsnEncodedData._rawData].Element;Argument[this].SyntheticField[System.Security.Cryptography.AsnEncodedData._rawData].Element;value;dfc-generated |
+| System.Security.Cryptography.X509Certificates;X509EnhancedKeyUsageExtension;CopyFrom;(System.Security.Cryptography.AsnEncodedData);Argument[0].SyntheticField[System.Security.Cryptography.AsnEncodedData._rawData];Argument[this].SyntheticField[System.Security.Cryptography.AsnEncodedData._rawData];value;dfc-generated |
 | System.Security.Cryptography.X509Certificates;X509EnhancedKeyUsageExtension;get_EnhancedKeyUsages;();Argument[this];ReturnValue;taint;df-generated |
-| System.Security.Cryptography.X509Certificates;X509Extension;CopyFrom;(System.Security.Cryptography.AsnEncodedData);Argument[0];Argument[this];taint;df-generated |
+| System.Security.Cryptography.X509Certificates;X509Extension;CopyFrom;(System.Security.Cryptography.AsnEncodedData);Argument[0].SyntheticField[System.Security.Cryptography.AsnEncodedData._rawData].Element;Argument[this].SyntheticField[System.Security.Cryptography.AsnEncodedData._rawData].Element;value;dfc-generated |
+| System.Security.Cryptography.X509Certificates;X509Extension;CopyFrom;(System.Security.Cryptography.AsnEncodedData);Argument[0].SyntheticField[System.Security.Cryptography.AsnEncodedData._rawData];Argument[this].SyntheticField[System.Security.Cryptography.AsnEncodedData._rawData];value;dfc-generated |
 | System.Security.Cryptography.X509Certificates;X509ExtensionCollection;Add;(System.Security.Cryptography.X509Certificates.X509Extension);Argument[0];Argument[this].Element;value;manual |
 | System.Security.Cryptography.X509Certificates;X509ExtensionCollection;CopyTo;(System.Array,System.Int32);Argument[this].Element;Argument[0].Element;value;manual |
 | System.Security.Cryptography.X509Certificates;X509ExtensionCollection;CopyTo;(System.Security.Cryptography.X509Certificates.X509Extension[],System.Int32);Argument[this].Element;Argument[0].Element;value;manual |
@@ -15553,42 +16023,45 @@ summary
 | System.Security.Cryptography.X509Certificates;X509ExtensionCollection;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Security.Cryptography.X509Certificates.X509ExtensionEnumerator.Current];value;manual |
 | System.Security.Cryptography.X509Certificates;X509ExtensionCollection;get_Item;(System.Int32);Argument[this];ReturnValue;taint;df-generated |
 | System.Security.Cryptography.X509Certificates;X509ExtensionCollection;get_Item;(System.String);Argument[this];ReturnValue;taint;df-generated |
-| System.Security.Cryptography.X509Certificates;X509ExtensionCollection;get_SyncRoot;();Argument[this];ReturnValue;taint;df-generated |
-| System.Security.Cryptography.X509Certificates;X509ExtensionCollection;get_SyncRoot;();Argument[this];ReturnValue;value;df-generated |
+| System.Security.Cryptography.X509Certificates;X509ExtensionCollection;get_SyncRoot;();Argument[this];ReturnValue;value;dfc-generated |
+| System.Security.Cryptography.X509Certificates;X509ExtensionEnumerator;get_Current;();Argument[this].Property[System.Security.Cryptography.X509Certificates.X509ExtensionEnumerator.Current];ReturnValue;value;df-generated |
+| System.Security.Cryptography.X509Certificates;X509ExtensionEnumerator;get_Current;();Argument[this].Property[System.Security.Cryptography.X509Certificates.X509ExtensionEnumerator.Current];ReturnValue;value;dfc-generated |
 | System.Security.Cryptography.X509Certificates;X509ExtensionEnumerator;get_Current;();Argument[this];ReturnValue;taint;df-generated |
-| System.Security.Cryptography.X509Certificates;X509KeyUsageExtension;CopyFrom;(System.Security.Cryptography.AsnEncodedData);Argument[0];Argument[this];taint;df-generated |
+| System.Security.Cryptography.X509Certificates;X509ExtensionEnumerator;get_Current;();Argument[this];ReturnValue;taint;dfc-generated |
+| System.Security.Cryptography.X509Certificates;X509KeyUsageExtension;CopyFrom;(System.Security.Cryptography.AsnEncodedData);Argument[0].SyntheticField[System.Security.Cryptography.AsnEncodedData._rawData].Element;Argument[this].SyntheticField[System.Security.Cryptography.AsnEncodedData._rawData].Element;value;dfc-generated |
+| System.Security.Cryptography.X509Certificates;X509KeyUsageExtension;CopyFrom;(System.Security.Cryptography.AsnEncodedData);Argument[0].SyntheticField[System.Security.Cryptography.AsnEncodedData._rawData];Argument[this].SyntheticField[System.Security.Cryptography.AsnEncodedData._rawData];value;dfc-generated |
 | System.Security.Cryptography.X509Certificates;X509SignatureGenerator;CreateForECDsa;(System.Security.Cryptography.ECDsa);Argument[0];ReturnValue;taint;df-generated |
 | System.Security.Cryptography.X509Certificates;X509SignatureGenerator;CreateForRSA;(System.Security.Cryptography.RSA,System.Security.Cryptography.RSASignaturePadding);Argument[0];ReturnValue;taint;df-generated |
 | System.Security.Cryptography.X509Certificates;X509SignatureGenerator;CreateForRSA;(System.Security.Cryptography.RSA,System.Security.Cryptography.RSASignaturePadding);Argument[1];ReturnValue;taint;df-generated |
-| System.Security.Cryptography.X509Certificates;X509SubjectAlternativeNameExtension;CopyFrom;(System.Security.Cryptography.AsnEncodedData);Argument[0];Argument[this];taint;df-generated |
-| System.Security.Cryptography.X509Certificates;X509SubjectKeyIdentifierExtension;CopyFrom;(System.Security.Cryptography.AsnEncodedData);Argument[0];Argument[this];taint;df-generated |
+| System.Security.Cryptography.X509Certificates;X509SubjectAlternativeNameExtension;CopyFrom;(System.Security.Cryptography.AsnEncodedData);Argument[0].SyntheticField[System.Security.Cryptography.AsnEncodedData._rawData].Element;Argument[this].SyntheticField[System.Security.Cryptography.AsnEncodedData._rawData].Element;value;dfc-generated |
+| System.Security.Cryptography.X509Certificates;X509SubjectAlternativeNameExtension;CopyFrom;(System.Security.Cryptography.AsnEncodedData);Argument[0].SyntheticField[System.Security.Cryptography.AsnEncodedData._rawData];Argument[this].SyntheticField[System.Security.Cryptography.AsnEncodedData._rawData];value;dfc-generated |
+| System.Security.Cryptography.X509Certificates;X509SubjectKeyIdentifierExtension;CopyFrom;(System.Security.Cryptography.AsnEncodedData);Argument[0].SyntheticField[System.Security.Cryptography.AsnEncodedData._rawData].Element;Argument[this].SyntheticField[System.Security.Cryptography.AsnEncodedData._rawData].Element;value;dfc-generated |
+| System.Security.Cryptography.X509Certificates;X509SubjectKeyIdentifierExtension;CopyFrom;(System.Security.Cryptography.AsnEncodedData);Argument[0].SyntheticField[System.Security.Cryptography.AsnEncodedData._rawData];Argument[this].SyntheticField[System.Security.Cryptography.AsnEncodedData._rawData];value;dfc-generated |
 | System.Security.Cryptography.X509Certificates;X509SubjectKeyIdentifierExtension;get_SubjectKeyIdentifier;();Argument[this];ReturnValue;taint;df-generated |
-| System.Security.Cryptography.X509Certificates;X509SubjectKeyIdentifierExtension;get_SubjectKeyIdentifierBytes;();Argument[this];ReturnValue;taint;df-generated |
 | System.Security.Cryptography.Xml;CipherData;CipherData;(System.Byte[]);Argument[0].Element;Argument[this];taint;df-generated |
 | System.Security.Cryptography.Xml;CipherData;CipherData;(System.Security.Cryptography.Xml.CipherReference);Argument[0];Argument[this];taint;df-generated |
-| System.Security.Cryptography.Xml;CipherData;GetXml;();Argument[this];ReturnValue;taint;df-generated |
-| System.Security.Cryptography.Xml;CipherData;LoadXml;(System.Xml.XmlElement);Argument[0].Element;Argument[this];taint;df-generated |
-| System.Security.Cryptography.Xml;CipherReference;GetXml;();Argument[this];ReturnValue;taint;df-generated |
-| System.Security.Cryptography.Xml;CipherReference;LoadXml;(System.Xml.XmlElement);Argument[0].Element;Argument[this];taint;df-generated |
+| System.Security.Cryptography.Xml;CipherData;GetXml;();Argument[this].SyntheticField[System.Security.Cryptography.Xml.CipherData._cachedXml];ReturnValue;value;dfc-generated |
+| System.Security.Cryptography.Xml;CipherData;LoadXml;(System.Xml.XmlElement);Argument[0];Argument[this].SyntheticField[System.Security.Cryptography.Xml.CipherData._cachedXml];value;dfc-generated |
+| System.Security.Cryptography.Xml;CipherReference;GetXml;();Argument[this].SyntheticField[System.Security.Cryptography.Xml.EncryptedReference._cachedXml];ReturnValue;value;dfc-generated |
+| System.Security.Cryptography.Xml;CipherReference;LoadXml;(System.Xml.XmlElement);Argument[0];Argument[this].SyntheticField[System.Security.Cryptography.Xml.EncryptedReference._cachedXml];value;dfc-generated |
 | System.Security.Cryptography.Xml;DSAKeyValue;DSAKeyValue;(System.Security.Cryptography.DSA);Argument[0];Argument[this];taint;df-generated |
-| System.Security.Cryptography.Xml;DSAKeyValue;GetXml;();Argument[this];ReturnValue;taint;df-generated |
 | System.Security.Cryptography.Xml;DSAKeyValue;LoadXml;(System.Xml.XmlElement);Argument[0].Element;Argument[this];taint;df-generated |
 | System.Security.Cryptography.Xml;DataObject;DataObject;(System.String,System.String,System.String,System.Xml.XmlElement);Argument[0];Argument[this];taint;df-generated |
 | System.Security.Cryptography.Xml;DataObject;DataObject;(System.String,System.String,System.String,System.Xml.XmlElement);Argument[1];Argument[this];taint;df-generated |
 | System.Security.Cryptography.Xml;DataObject;DataObject;(System.String,System.String,System.String,System.Xml.XmlElement);Argument[2];Argument[this];taint;df-generated |
 | System.Security.Cryptography.Xml;DataObject;DataObject;(System.String,System.String,System.String,System.Xml.XmlElement);Argument[3].Element;Argument[this];taint;df-generated |
-| System.Security.Cryptography.Xml;DataObject;GetXml;();Argument[this];ReturnValue;taint;df-generated |
-| System.Security.Cryptography.Xml;DataObject;LoadXml;(System.Xml.XmlElement);Argument[0].Element;Argument[this];taint;df-generated |
+| System.Security.Cryptography.Xml;DataObject;GetXml;();Argument[this].SyntheticField[System.Security.Cryptography.Xml.DataObject._cachedXml];ReturnValue;value;dfc-generated |
+| System.Security.Cryptography.Xml;DataObject;LoadXml;(System.Xml.XmlElement);Argument[0];Argument[this].SyntheticField[System.Security.Cryptography.Xml.DataObject._cachedXml];value;dfc-generated |
 | System.Security.Cryptography.Xml;EncryptedData;GetXml;();Argument[this];ReturnValue;taint;df-generated |
 | System.Security.Cryptography.Xml;EncryptedData;LoadXml;(System.Xml.XmlElement);Argument[0].Element;Argument[this];taint;df-generated |
-| System.Security.Cryptography.Xml;EncryptedKey;AddReference;(System.Security.Cryptography.Xml.DataReference);Argument[0];Argument[this];taint;df-generated |
-| System.Security.Cryptography.Xml;EncryptedKey;AddReference;(System.Security.Cryptography.Xml.KeyReference);Argument[0];Argument[this];taint;df-generated |
+| System.Security.Cryptography.Xml;EncryptedKey;AddReference;(System.Security.Cryptography.Xml.DataReference);Argument[0];Argument[this].Property[System.Security.Cryptography.Xml.EncryptedKey.ReferenceList].Element;value;dfc-generated |
+| System.Security.Cryptography.Xml;EncryptedKey;AddReference;(System.Security.Cryptography.Xml.KeyReference);Argument[0];Argument[this].Property[System.Security.Cryptography.Xml.EncryptedKey.ReferenceList].Element;value;dfc-generated |
 | System.Security.Cryptography.Xml;EncryptedKey;GetXml;();Argument[this];ReturnValue;taint;df-generated |
 | System.Security.Cryptography.Xml;EncryptedKey;LoadXml;(System.Xml.XmlElement);Argument[0].Element;Argument[this];taint;df-generated |
 | System.Security.Cryptography.Xml;EncryptedReference;EncryptedReference;(System.String,System.Security.Cryptography.Xml.TransformChain);Argument[0];Argument[this];taint;df-generated |
 | System.Security.Cryptography.Xml;EncryptedReference;EncryptedReference;(System.String,System.Security.Cryptography.Xml.TransformChain);Argument[1];Argument[this];taint;df-generated |
-| System.Security.Cryptography.Xml;EncryptedReference;GetXml;();Argument[this];ReturnValue;taint;df-generated |
-| System.Security.Cryptography.Xml;EncryptedReference;LoadXml;(System.Xml.XmlElement);Argument[0].Element;Argument[this];taint;df-generated |
+| System.Security.Cryptography.Xml;EncryptedReference;GetXml;();Argument[this].SyntheticField[System.Security.Cryptography.Xml.EncryptedReference._cachedXml];ReturnValue;value;dfc-generated |
+| System.Security.Cryptography.Xml;EncryptedReference;LoadXml;(System.Xml.XmlElement);Argument[0];Argument[this].SyntheticField[System.Security.Cryptography.Xml.EncryptedReference._cachedXml];value;dfc-generated |
 | System.Security.Cryptography.Xml;EncryptedType;GetXml;();Argument[this];ReturnValue;taint;df-generated |
 | System.Security.Cryptography.Xml;EncryptedType;LoadXml;(System.Xml.XmlElement);Argument[0].Element;Argument[this];taint;df-generated |
 | System.Security.Cryptography.Xml;EncryptedXml;EncryptedXml;(System.Xml.XmlDocument,System.Security.Policy.Evidence);Argument[0].Element;Argument[this];taint;df-generated |
@@ -15596,64 +16069,60 @@ summary
 | System.Security.Cryptography.Xml;EncryptedXml;GetDecryptionKey;(System.Security.Cryptography.Xml.EncryptedData,System.String);Argument[this];ReturnValue;taint;df-generated |
 | System.Security.Cryptography.Xml;EncryptedXml;GetIdElement;(System.Xml.XmlDocument,System.String);Argument[0].Element;ReturnValue;taint;df-generated |
 | System.Security.Cryptography.Xml;EncryptionMethod;EncryptionMethod;(System.String);Argument[0];Argument[this];taint;df-generated |
-| System.Security.Cryptography.Xml;EncryptionMethod;GetXml;();Argument[this];ReturnValue;taint;df-generated |
-| System.Security.Cryptography.Xml;EncryptionMethod;LoadXml;(System.Xml.XmlElement);Argument[0].Element;Argument[this];taint;df-generated |
+| System.Security.Cryptography.Xml;EncryptionMethod;GetXml;();Argument[this].SyntheticField[System.Security.Cryptography.Xml.EncryptionMethod._cachedXml];ReturnValue;value;dfc-generated |
+| System.Security.Cryptography.Xml;EncryptionMethod;LoadXml;(System.Xml.XmlElement);Argument[0];Argument[this].SyntheticField[System.Security.Cryptography.Xml.EncryptionMethod._cachedXml];value;dfc-generated |
 | System.Security.Cryptography.Xml;EncryptionProperty;EncryptionProperty;(System.Xml.XmlElement);Argument[0].Element;Argument[this];taint;df-generated |
-| System.Security.Cryptography.Xml;EncryptionProperty;GetXml;();Argument[this];ReturnValue;taint;df-generated |
-| System.Security.Cryptography.Xml;EncryptionProperty;LoadXml;(System.Xml.XmlElement);Argument[0].Element;Argument[this];taint;df-generated |
+| System.Security.Cryptography.Xml;EncryptionProperty;GetXml;();Argument[this].SyntheticField[System.Security.Cryptography.Xml.EncryptionProperty._cachedXml];ReturnValue;value;dfc-generated |
+| System.Security.Cryptography.Xml;EncryptionProperty;LoadXml;(System.Xml.XmlElement);Argument[0];Argument[this].SyntheticField[System.Security.Cryptography.Xml.EncryptionProperty._cachedXml];value;dfc-generated |
 | System.Security.Cryptography.Xml;EncryptionProperty;get_Id;();Argument[this];ReturnValue;taint;df-generated |
 | System.Security.Cryptography.Xml;EncryptionProperty;get_Target;();Argument[this];ReturnValue;taint;df-generated |
 | System.Security.Cryptography.Xml;EncryptionPropertyCollection;Add;(System.Object);Argument[0];Argument[this].Element;value;manual |
-| System.Security.Cryptography.Xml;EncryptionPropertyCollection;Add;(System.Security.Cryptography.Xml.EncryptionProperty);Argument[0];Argument[this];taint;df-generated |
+| System.Security.Cryptography.Xml;EncryptionPropertyCollection;Add;(System.Security.Cryptography.Xml.EncryptionProperty);Argument[0];Argument[this].SyntheticField[System.Security.Cryptography.Xml.EncryptionPropertyCollection._props].Element;value;dfc-generated |
 | System.Security.Cryptography.Xml;EncryptionPropertyCollection;Clear;();Argument[this].WithoutElement;Argument[this];value;manual |
 | System.Security.Cryptography.Xml;EncryptionPropertyCollection;CopyTo;(System.Array,System.Int32);Argument[this].Element;Argument[0].Element;value;manual |
-| System.Security.Cryptography.Xml;EncryptionPropertyCollection;CopyTo;(System.Security.Cryptography.Xml.EncryptionProperty[],System.Int32);Argument[this];Argument[0].Element;taint;df-generated |
+| System.Security.Cryptography.Xml;EncryptionPropertyCollection;CopyTo;(System.Security.Cryptography.Xml.EncryptionProperty[],System.Int32);Argument[this].SyntheticField[System.Security.Cryptography.Xml.EncryptionPropertyCollection._props].Element;Argument[0].Element;value;dfc-generated |
 | System.Security.Cryptography.Xml;EncryptionPropertyCollection;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.IEnumerator.Current];value;manual |
 | System.Security.Cryptography.Xml;EncryptionPropertyCollection;Insert;(System.Int32,System.Object);Argument[1];Argument[this].Element;value;manual |
-| System.Security.Cryptography.Xml;EncryptionPropertyCollection;Insert;(System.Int32,System.Security.Cryptography.Xml.EncryptionProperty);Argument[1];Argument[this];taint;df-generated |
-| System.Security.Cryptography.Xml;EncryptionPropertyCollection;Item;(System.Int32);Argument[this];ReturnValue;taint;df-generated |
-| System.Security.Cryptography.Xml;EncryptionPropertyCollection;Remove;(System.Object);Argument[0];Argument[this];taint;df-generated |
-| System.Security.Cryptography.Xml;EncryptionPropertyCollection;Remove;(System.Object);Argument[this];Argument[0];taint;df-generated |
+| System.Security.Cryptography.Xml;EncryptionPropertyCollection;Insert;(System.Int32,System.Security.Cryptography.Xml.EncryptionProperty);Argument[1];Argument[this].SyntheticField[System.Security.Cryptography.Xml.EncryptionPropertyCollection._props].Element;value;dfc-generated |
+| System.Security.Cryptography.Xml;EncryptionPropertyCollection;Item;(System.Int32);Argument[this].SyntheticField[System.Security.Cryptography.Xml.EncryptionPropertyCollection._props].Element;ReturnValue;value;dfc-generated |
 | System.Security.Cryptography.Xml;EncryptionPropertyCollection;get_Item;(System.Int32);Argument[this].Element;ReturnValue;value;manual |
-| System.Security.Cryptography.Xml;EncryptionPropertyCollection;get_ItemOf;(System.Int32);Argument[this];ReturnValue;taint;df-generated |
-| System.Security.Cryptography.Xml;EncryptionPropertyCollection;get_SyncRoot;();Argument[this];ReturnValue;taint;df-generated |
-| System.Security.Cryptography.Xml;EncryptionPropertyCollection;get_SyncRoot;();Argument[this];ReturnValue;value;df-generated |
+| System.Security.Cryptography.Xml;EncryptionPropertyCollection;get_ItemOf;(System.Int32);Argument[this].Element;ReturnValue;value;dfc-generated |
+| System.Security.Cryptography.Xml;EncryptionPropertyCollection;get_ItemOf;(System.Int32);Argument[this].SyntheticField[System.Security.Cryptography.Xml.EncryptionPropertyCollection._props].Element;ReturnValue;value;dfc-generated |
+| System.Security.Cryptography.Xml;EncryptionPropertyCollection;get_SyncRoot;();Argument[this].SyntheticField[System.Security.Cryptography.Xml.EncryptionPropertyCollection._props].Property[System.Collections.ArrayList.SyncRoot];ReturnValue;value;dfc-generated |
+| System.Security.Cryptography.Xml;EncryptionPropertyCollection;get_SyncRoot;();Argument[this];ReturnValue;value;dfc-generated |
 | System.Security.Cryptography.Xml;EncryptionPropertyCollection;set_Item;(System.Int32,System.Object);Argument[1];Argument[this].Element;value;manual |
-| System.Security.Cryptography.Xml;EncryptionPropertyCollection;set_ItemOf;(System.Int32,System.Security.Cryptography.Xml.EncryptionProperty);Argument[1];Argument[this];taint;df-generated |
-| System.Security.Cryptography.Xml;KeyInfo;AddClause;(System.Security.Cryptography.Xml.KeyInfoClause);Argument[0];Argument[this];taint;df-generated |
+| System.Security.Cryptography.Xml;EncryptionPropertyCollection;set_ItemOf;(System.Int32,System.Security.Cryptography.Xml.EncryptionProperty);Argument[1];Argument[this].Element;value;dfc-generated |
+| System.Security.Cryptography.Xml;EncryptionPropertyCollection;set_ItemOf;(System.Int32,System.Security.Cryptography.Xml.EncryptionProperty);Argument[1];Argument[this].SyntheticField[System.Security.Cryptography.Xml.EncryptionPropertyCollection._props].Element;value;dfc-generated |
+| System.Security.Cryptography.Xml;KeyInfo;AddClause;(System.Security.Cryptography.Xml.KeyInfoClause);Argument[0];Argument[this].SyntheticField[System.Security.Cryptography.Xml.KeyInfo._keyInfoClauses].Element;value;dfc-generated |
 | System.Security.Cryptography.Xml;KeyInfo;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.IEnumerator.Current];value;manual |
-| System.Security.Cryptography.Xml;KeyInfo;GetEnumerator;(System.Type);Argument[this];ReturnValue;taint;df-generated |
-| System.Security.Cryptography.Xml;KeyInfo;LoadXml;(System.Xml.XmlElement);Argument[0].Element;Argument[this];taint;df-generated |
-| System.Security.Cryptography.Xml;KeyInfoClause;GetXml;();Argument[this];ReturnValue;taint;df-generated |
+| System.Security.Cryptography.Xml;KeyInfo;GetEnumerator;(System.Type);Argument[this].SyntheticField[System.Security.Cryptography.Xml.KeyInfo._keyInfoClauses].Element;ReturnValue.Property[System.Collections.IEnumerator.Current];value;dfc-generated |
 | System.Security.Cryptography.Xml;KeyInfoClause;LoadXml;(System.Xml.XmlElement);Argument[0].Element;Argument[this];taint;df-generated |
-| System.Security.Cryptography.Xml;KeyInfoEncryptedKey;GetXml;();Argument[this];ReturnValue;taint;df-generated |
+| System.Security.Cryptography.Xml;KeyInfoEncryptedKey;GetXml;();Argument[this].SyntheticField[System.Security.Cryptography.Xml.KeyInfoEncryptedKey._encryptedKey].SyntheticField[System.Security.Cryptography.Xml.EncryptedType._cachedXml];ReturnValue;value;dfc-generated |
 | System.Security.Cryptography.Xml;KeyInfoEncryptedKey;KeyInfoEncryptedKey;(System.Security.Cryptography.Xml.EncryptedKey);Argument[0];Argument[this];taint;df-generated |
 | System.Security.Cryptography.Xml;KeyInfoEncryptedKey;LoadXml;(System.Xml.XmlElement);Argument[0].Element;Argument[this];taint;df-generated |
-| System.Security.Cryptography.Xml;KeyInfoName;GetXml;();Argument[this];ReturnValue;taint;df-generated |
+| System.Security.Cryptography.Xml;KeyInfoEncryptedKey;LoadXml;(System.Xml.XmlElement);Argument[0].Element;Argument[this];taint;dfc-generated |
+| System.Security.Cryptography.Xml;KeyInfoEncryptedKey;LoadXml;(System.Xml.XmlElement);Argument[0];Argument[this].SyntheticField[System.Security.Cryptography.Xml.KeyInfoEncryptedKey._encryptedKey].SyntheticField[System.Security.Cryptography.Xml.EncryptedType._cachedXml];value;df-generated |
+| System.Security.Cryptography.Xml;KeyInfoEncryptedKey;LoadXml;(System.Xml.XmlElement);Argument[0];Argument[this].SyntheticField[System.Security.Cryptography.Xml.KeyInfoEncryptedKey._encryptedKey].SyntheticField[System.Security.Cryptography.Xml.EncryptedType._cachedXml];value;dfc-generated |
 | System.Security.Cryptography.Xml;KeyInfoName;KeyInfoName;(System.String);Argument[0];Argument[this];taint;df-generated |
 | System.Security.Cryptography.Xml;KeyInfoName;LoadXml;(System.Xml.XmlElement);Argument[0].Element;Argument[this];taint;df-generated |
-| System.Security.Cryptography.Xml;KeyInfoNode;GetXml;();Argument[this];ReturnValue;taint;df-generated |
 | System.Security.Cryptography.Xml;KeyInfoNode;KeyInfoNode;(System.Xml.XmlElement);Argument[0].Element;Argument[this];taint;df-generated |
 | System.Security.Cryptography.Xml;KeyInfoNode;LoadXml;(System.Xml.XmlElement);Argument[0].Element;Argument[this];taint;df-generated |
-| System.Security.Cryptography.Xml;KeyInfoRetrievalMethod;GetXml;();Argument[this];ReturnValue;taint;df-generated |
 | System.Security.Cryptography.Xml;KeyInfoRetrievalMethod;KeyInfoRetrievalMethod;(System.String);Argument[0];Argument[this];taint;df-generated |
 | System.Security.Cryptography.Xml;KeyInfoRetrievalMethod;KeyInfoRetrievalMethod;(System.String,System.String);Argument[0];Argument[this];taint;df-generated |
 | System.Security.Cryptography.Xml;KeyInfoRetrievalMethod;KeyInfoRetrievalMethod;(System.String,System.String);Argument[1];Argument[this];taint;df-generated |
 | System.Security.Cryptography.Xml;KeyInfoRetrievalMethod;LoadXml;(System.Xml.XmlElement);Argument[0].Element;Argument[this];taint;df-generated |
-| System.Security.Cryptography.Xml;KeyInfoX509Data;AddSubjectKeyId;(System.Byte[]);Argument[0].Element;Argument[this];taint;df-generated |
-| System.Security.Cryptography.Xml;KeyInfoX509Data;AddSubjectName;(System.String);Argument[0];Argument[this];taint;df-generated |
-| System.Security.Cryptography.Xml;KeyInfoX509Data;GetXml;();Argument[this];ReturnValue;taint;df-generated |
+| System.Security.Cryptography.Xml;KeyInfoX509Data;AddSubjectKeyId;(System.Byte[]);Argument[0];Argument[this].SyntheticField[System.Security.Cryptography.Xml.KeyInfoX509Data._subjectKeyIds].Element;value;dfc-generated |
+| System.Security.Cryptography.Xml;KeyInfoX509Data;AddSubjectName;(System.String);Argument[0];Argument[this].SyntheticField[System.Security.Cryptography.Xml.KeyInfoX509Data._subjectNames].Element;value;dfc-generated |
 | System.Security.Cryptography.Xml;KeyInfoX509Data;LoadXml;(System.Xml.XmlElement);Argument[0].Element;Argument[this];taint;df-generated |
 | System.Security.Cryptography.Xml;KeyInfoX509Data;get_Certificates;();Argument[this];ReturnValue;taint;df-generated |
 | System.Security.Cryptography.Xml;KeyInfoX509Data;get_IssuerSerials;();Argument[this];ReturnValue;taint;df-generated |
-| System.Security.Cryptography.Xml;KeyInfoX509Data;get_SubjectKeyIds;();Argument[this];ReturnValue;taint;df-generated |
-| System.Security.Cryptography.Xml;KeyInfoX509Data;get_SubjectNames;();Argument[this];ReturnValue;taint;df-generated |
-| System.Security.Cryptography.Xml;RSAKeyValue;GetXml;();Argument[this];ReturnValue;taint;df-generated |
+| System.Security.Cryptography.Xml;KeyInfoX509Data;get_SubjectKeyIds;();Argument[this].SyntheticField[System.Security.Cryptography.Xml.KeyInfoX509Data._subjectKeyIds];ReturnValue;value;dfc-generated |
+| System.Security.Cryptography.Xml;KeyInfoX509Data;get_SubjectNames;();Argument[this].SyntheticField[System.Security.Cryptography.Xml.KeyInfoX509Data._subjectNames];ReturnValue;value;dfc-generated |
 | System.Security.Cryptography.Xml;RSAKeyValue;LoadXml;(System.Xml.XmlElement);Argument[0].Element;Argument[this];taint;df-generated |
 | System.Security.Cryptography.Xml;RSAKeyValue;RSAKeyValue;(System.Security.Cryptography.RSA);Argument[0];Argument[this];taint;df-generated |
 | System.Security.Cryptography.Xml;Reference;AddTransform;(System.Security.Cryptography.Xml.Transform);Argument[this];Argument[0];taint;df-generated |
-| System.Security.Cryptography.Xml;Reference;GetXml;();Argument[this];ReturnValue;taint;df-generated |
-| System.Security.Cryptography.Xml;Reference;LoadXml;(System.Xml.XmlElement);Argument[0].Element;Argument[this];taint;df-generated |
+| System.Security.Cryptography.Xml;Reference;GetXml;();Argument[this].SyntheticField[System.Security.Cryptography.Xml.Reference._cachedXml];ReturnValue;value;dfc-generated |
+| System.Security.Cryptography.Xml;Reference;LoadXml;(System.Xml.XmlElement);Argument[0];Argument[this].SyntheticField[System.Security.Cryptography.Xml.Reference._cachedXml];value;dfc-generated |
 | System.Security.Cryptography.Xml;Reference;Reference;(System.IO.Stream);Argument[0];Argument[this];taint;df-generated |
 | System.Security.Cryptography.Xml;Reference;Reference;(System.String);Argument[0];Argument[this];taint;df-generated |
 | System.Security.Cryptography.Xml;ReferenceList;Add;(System.Object);Argument[0];Argument[this].Element;value;manual |
@@ -15661,86 +16130,83 @@ summary
 | System.Security.Cryptography.Xml;ReferenceList;CopyTo;(System.Array,System.Int32);Argument[this].Element;Argument[0].Element;value;manual |
 | System.Security.Cryptography.Xml;ReferenceList;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.IEnumerator.Current];value;manual |
 | System.Security.Cryptography.Xml;ReferenceList;Insert;(System.Int32,System.Object);Argument[1];Argument[this].Element;value;manual |
-| System.Security.Cryptography.Xml;ReferenceList;Item;(System.Int32);Argument[this];ReturnValue;taint;df-generated |
-| System.Security.Cryptography.Xml;ReferenceList;Remove;(System.Object);Argument[0];Argument[this];taint;df-generated |
-| System.Security.Cryptography.Xml;ReferenceList;Remove;(System.Object);Argument[this];Argument[0];taint;df-generated |
+| System.Security.Cryptography.Xml;ReferenceList;Item;(System.Int32);Argument[this].SyntheticField[System.Security.Cryptography.Xml.ReferenceList._references].Element;ReturnValue;value;dfc-generated |
 | System.Security.Cryptography.Xml;ReferenceList;get_Item;(System.Int32);Argument[this].Element;ReturnValue;value;manual |
-| System.Security.Cryptography.Xml;ReferenceList;get_SyncRoot;();Argument[this];ReturnValue;taint;df-generated |
-| System.Security.Cryptography.Xml;ReferenceList;get_SyncRoot;();Argument[this];ReturnValue;value;df-generated |
+| System.Security.Cryptography.Xml;ReferenceList;get_SyncRoot;();Argument[this].SyntheticField[System.Security.Cryptography.Xml.ReferenceList._references].Property[System.Collections.ArrayList.SyncRoot];ReturnValue;value;dfc-generated |
+| System.Security.Cryptography.Xml;ReferenceList;get_SyncRoot;();Argument[this];ReturnValue;value;dfc-generated |
 | System.Security.Cryptography.Xml;ReferenceList;set_Item;(System.Int32,System.Object);Argument[1];Argument[this].Element;value;manual |
-| System.Security.Cryptography.Xml;ReferenceList;set_ItemOf;(System.Int32,System.Security.Cryptography.Xml.EncryptedReference);Argument[1];Argument[this];taint;df-generated |
+| System.Security.Cryptography.Xml;ReferenceList;set_ItemOf;(System.Int32,System.Security.Cryptography.Xml.EncryptedReference);Argument[1];Argument[this].Element;value;dfc-generated |
+| System.Security.Cryptography.Xml;ReferenceList;set_ItemOf;(System.Int32,System.Security.Cryptography.Xml.EncryptedReference);Argument[1];Argument[this].SyntheticField[System.Security.Cryptography.Xml.ReferenceList._references].Element;value;dfc-generated |
 | System.Security.Cryptography.Xml;Signature;AddObject;(System.Security.Cryptography.Xml.DataObject);Argument[0];Argument[this];taint;df-generated |
 | System.Security.Cryptography.Xml;Signature;LoadXml;(System.Xml.XmlElement);Argument[0].Element;Argument[this];taint;df-generated |
-| System.Security.Cryptography.Xml;SignedInfo;AddReference;(System.Security.Cryptography.Xml.Reference);Argument[0];Argument[this];taint;df-generated |
-| System.Security.Cryptography.Xml;SignedInfo;AddReference;(System.Security.Cryptography.Xml.Reference);Argument[this];Argument[0];taint;df-generated |
+| System.Security.Cryptography.Xml;SignedInfo;AddReference;(System.Security.Cryptography.Xml.Reference);Argument[0];Argument[this].SyntheticField[System.Security.Cryptography.Xml.SignedInfo._references].Element;value;dfc-generated |
 | System.Security.Cryptography.Xml;SignedInfo;CopyTo;(System.Array,System.Int32);Argument[this].Element;Argument[0].Element;value;manual |
 | System.Security.Cryptography.Xml;SignedInfo;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.IEnumerator.Current];value;manual |
-| System.Security.Cryptography.Xml;SignedInfo;GetXml;();Argument[this];ReturnValue;taint;df-generated |
-| System.Security.Cryptography.Xml;SignedInfo;LoadXml;(System.Xml.XmlElement);Argument[0].Element;Argument[this];taint;df-generated |
+| System.Security.Cryptography.Xml;SignedInfo;GetXml;();Argument[this].SyntheticField[System.Security.Cryptography.Xml.SignedInfo._cachedXml];ReturnValue;value;dfc-generated |
+| System.Security.Cryptography.Xml;SignedInfo;LoadXml;(System.Xml.XmlElement);Argument[0];Argument[this].SyntheticField[System.Security.Cryptography.Xml.SignedInfo._cachedXml];value;dfc-generated |
 | System.Security.Cryptography.Xml;SignedInfo;get_CanonicalizationMethodObject;();Argument[this];ReturnValue;taint;df-generated |
-| System.Security.Cryptography.Xml;SignedInfo;get_References;();Argument[this];ReturnValue;taint;df-generated |
-| System.Security.Cryptography.Xml;SignedInfo;get_SyncRoot;();Argument[this];ReturnValue;taint;df-generated |
-| System.Security.Cryptography.Xml;SignedInfo;get_SyncRoot;();Argument[this];ReturnValue;value;df-generated |
+| System.Security.Cryptography.Xml;SignedInfo;get_References;();Argument[this].SyntheticField[System.Security.Cryptography.Xml.SignedInfo._references];ReturnValue;value;dfc-generated |
+| System.Security.Cryptography.Xml;SignedInfo;get_SyncRoot;();Argument[this];ReturnValue;value;dfc-generated |
 | System.Security.Cryptography.Xml;SignedXml;CheckSignature;(System.Security.Cryptography.KeyedHashAlgorithm);Argument[0];Argument[this];taint;df-generated |
 | System.Security.Cryptography.Xml;SignedXml;CheckSignatureReturningKey;(System.Security.Cryptography.AsymmetricAlgorithm);Argument[this];ReturnValue;taint;df-generated |
 | System.Security.Cryptography.Xml;SignedXml;ComputeSignature;(System.Security.Cryptography.KeyedHashAlgorithm);Argument[0];Argument[this];taint;df-generated |
 | System.Security.Cryptography.Xml;SignedXml;GetIdElement;(System.Xml.XmlDocument,System.String);Argument[0].Element;ReturnValue;taint;df-generated |
 | System.Security.Cryptography.Xml;SignedXml;GetPublicKey;();Argument[this];ReturnValue;taint;df-generated |
-| System.Security.Cryptography.Xml;SignedXml;GetXml;();Argument[this];ReturnValue;taint;df-generated |
 | System.Security.Cryptography.Xml;SignedXml;LoadXml;(System.Xml.XmlElement);Argument[0].Element;Argument[this];taint;df-generated |
 | System.Security.Cryptography.Xml;SignedXml;SignedXml;(System.Xml.XmlDocument);Argument[0].Element;Argument[this];taint;df-generated |
 | System.Security.Cryptography.Xml;SignedXml;SignedXml;(System.Xml.XmlElement);Argument[0].Element;Argument[this];taint;df-generated |
 | System.Security.Cryptography.Xml;SignedXml;get_SafeCanonicalizationMethods;();Argument[this];ReturnValue;taint;df-generated |
-| System.Security.Cryptography.Xml;SignedXml;get_Signature;();Argument[this];ReturnValue;taint;df-generated |
-| System.Security.Cryptography.Xml;SignedXml;get_SignatureValue;();Argument[this];ReturnValue;taint;df-generated |
-| System.Security.Cryptography.Xml;SignedXml;get_SignedInfo;();Argument[this];ReturnValue;taint;df-generated |
+| System.Security.Cryptography.Xml;SignedXml;get_Signature;();Argument[this].Field[System.Security.Cryptography.Xml.SignedXml.m_signature];ReturnValue;value;dfc-generated |
+| System.Security.Cryptography.Xml;SignedXml;get_SignatureValue;();Argument[this].Field[System.Security.Cryptography.Xml.SignedXml.m_signature].Property[System.Security.Cryptography.Xml.Signature.SignatureValue];ReturnValue;value;dfc-generated |
+| System.Security.Cryptography.Xml;SignedXml;get_SignedInfo;();Argument[this].Field[System.Security.Cryptography.Xml.SignedXml.m_signature].Property[System.Security.Cryptography.Xml.Signature.SignedInfo];ReturnValue;value;dfc-generated |
 | System.Security.Cryptography.Xml;SignedXml;set_Resolver;(System.Xml.XmlResolver);Argument[0];Argument[this];taint;df-generated |
 | System.Security.Cryptography.Xml;SignedXml;set_SignatureFormatValidator;(System.Func<System.Security.Cryptography.Xml.SignedXml,System.Boolean>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
-| System.Security.Cryptography.Xml;Transform;GetDigestedOutput;(System.Security.Cryptography.HashAlgorithm);Argument[0];ReturnValue;taint;df-generated |
-| System.Security.Cryptography.Xml;Transform;GetInnerXml;();Argument[this];ReturnValue;taint;df-generated |
 | System.Security.Cryptography.Xml;Transform;GetOutput;();Argument[this];ReturnValue;taint;df-generated |
 | System.Security.Cryptography.Xml;Transform;GetOutput;(System.Type);Argument[this];ReturnValue;taint;df-generated |
-| System.Security.Cryptography.Xml;Transform;GetXml;();Argument[this];ReturnValue;taint;df-generated |
 | System.Security.Cryptography.Xml;Transform;LoadInnerXml;(System.Xml.XmlNodeList);Argument[0].Element;Argument[this];taint;df-generated |
 | System.Security.Cryptography.Xml;Transform;LoadInput;(System.Object);Argument[0];Argument[this];taint;df-generated |
 | System.Security.Cryptography.Xml;Transform;get_InputTypes;();Argument[this];ReturnValue;taint;df-generated |
 | System.Security.Cryptography.Xml;Transform;get_OutputTypes;();Argument[this];ReturnValue;taint;df-generated |
 | System.Security.Cryptography.Xml;Transform;get_PropagatedNamespaces;();Argument[this];ReturnValue;taint;df-generated |
-| System.Security.Cryptography.Xml;TransformChain;Add;(System.Security.Cryptography.Xml.Transform);Argument[0];Argument[this];taint;df-generated |
-| System.Security.Cryptography.Xml;TransformChain;GetEnumerator;();Argument[this];ReturnValue;taint;df-generated |
-| System.Security.Cryptography.Xml;TransformChain;get_Item;(System.Int32);Argument[this];ReturnValue;taint;df-generated |
+| System.Security.Cryptography.Xml;TransformChain;Add;(System.Security.Cryptography.Xml.Transform);Argument[0];Argument[this].SyntheticField[System.Security.Cryptography.Xml.TransformChain._transforms].Element;value;dfc-generated |
+| System.Security.Cryptography.Xml;TransformChain;GetEnumerator;();Argument[this].SyntheticField[System.Security.Cryptography.Xml.TransformChain._transforms].Element;ReturnValue.Property[System.Collections.IEnumerator.Current];value;dfc-generated |
+| System.Security.Cryptography.Xml;TransformChain;get_Item;(System.Int32);Argument[this].SyntheticField[System.Security.Cryptography.Xml.TransformChain._transforms].Element;ReturnValue;value;dfc-generated |
 | System.Security.Cryptography.Xml;XmlDecryptionTransform;AddExceptUri;(System.String);Argument[0];Argument[this];taint;df-generated |
-| System.Security.Cryptography.Xml;XmlDecryptionTransform;GetInnerXml;();Argument[this];ReturnValue;taint;df-generated |
+| System.Security.Cryptography.Xml;XmlDecryptionTransform;GetOutput;();Argument[this].SyntheticField[System.Security.Cryptography.Xml.XmlDecryptionTransform._containingDocument];ReturnValue;value;df-generated |
+| System.Security.Cryptography.Xml;XmlDecryptionTransform;GetOutput;();Argument[this].SyntheticField[System.Security.Cryptography.Xml.XmlDecryptionTransform._containingDocument];ReturnValue;value;dfc-generated |
 | System.Security.Cryptography.Xml;XmlDecryptionTransform;GetOutput;();Argument[this];ReturnValue;taint;df-generated |
+| System.Security.Cryptography.Xml;XmlDecryptionTransform;GetOutput;();Argument[this];ReturnValue;taint;dfc-generated |
+| System.Security.Cryptography.Xml;XmlDecryptionTransform;GetOutput;(System.Type);Argument[this].SyntheticField[System.Security.Cryptography.Xml.XmlDecryptionTransform._containingDocument];ReturnValue;value;df-generated |
+| System.Security.Cryptography.Xml;XmlDecryptionTransform;GetOutput;(System.Type);Argument[this].SyntheticField[System.Security.Cryptography.Xml.XmlDecryptionTransform._containingDocument];ReturnValue;value;dfc-generated |
 | System.Security.Cryptography.Xml;XmlDecryptionTransform;GetOutput;(System.Type);Argument[this];ReturnValue;taint;df-generated |
+| System.Security.Cryptography.Xml;XmlDecryptionTransform;GetOutput;(System.Type);Argument[this];ReturnValue;taint;dfc-generated |
 | System.Security.Cryptography.Xml;XmlDecryptionTransform;LoadInnerXml;(System.Xml.XmlNodeList);Argument[0].Element;Argument[this];taint;df-generated |
+| System.Security.Cryptography.Xml;XmlDecryptionTransform;LoadInput;(System.Object);Argument[0];Argument[this].SyntheticField[System.Security.Cryptography.Xml.XmlDecryptionTransform._containingDocument];value;df-generated |
+| System.Security.Cryptography.Xml;XmlDecryptionTransform;LoadInput;(System.Object);Argument[0];Argument[this].SyntheticField[System.Security.Cryptography.Xml.XmlDecryptionTransform._containingDocument];value;dfc-generated |
 | System.Security.Cryptography.Xml;XmlDecryptionTransform;LoadInput;(System.Object);Argument[0];Argument[this];taint;df-generated |
+| System.Security.Cryptography.Xml;XmlDecryptionTransform;LoadInput;(System.Object);Argument[0];Argument[this];taint;dfc-generated |
 | System.Security.Cryptography.Xml;XmlDecryptionTransform;get_InputTypes;();Argument[this];ReturnValue;taint;df-generated |
 | System.Security.Cryptography.Xml;XmlDecryptionTransform;get_OutputTypes;();Argument[this];ReturnValue;taint;df-generated |
-| System.Security.Cryptography.Xml;XmlDsigBase64Transform;GetInnerXml;();Argument[this];ReturnValue;taint;df-generated |
 | System.Security.Cryptography.Xml;XmlDsigBase64Transform;GetOutput;();Argument[this];ReturnValue;taint;df-generated |
 | System.Security.Cryptography.Xml;XmlDsigBase64Transform;GetOutput;(System.Type);Argument[this];ReturnValue;taint;df-generated |
 | System.Security.Cryptography.Xml;XmlDsigBase64Transform;LoadInnerXml;(System.Xml.XmlNodeList);Argument[0].Element;Argument[this];taint;df-generated |
 | System.Security.Cryptography.Xml;XmlDsigBase64Transform;LoadInput;(System.Object);Argument[0];Argument[this];taint;df-generated |
 | System.Security.Cryptography.Xml;XmlDsigBase64Transform;get_InputTypes;();Argument[this];ReturnValue;taint;df-generated |
 | System.Security.Cryptography.Xml;XmlDsigBase64Transform;get_OutputTypes;();Argument[this];ReturnValue;taint;df-generated |
-| System.Security.Cryptography.Xml;XmlDsigC14NTransform;GetDigestedOutput;(System.Security.Cryptography.HashAlgorithm);Argument[0];ReturnValue;taint;df-generated |
-| System.Security.Cryptography.Xml;XmlDsigC14NTransform;GetInnerXml;();Argument[this];ReturnValue;taint;df-generated |
+| System.Security.Cryptography.Xml;XmlDsigC14NTransform;GetDigestedOutput;(System.Security.Cryptography.HashAlgorithm);Argument[0].Property[System.Security.Cryptography.HashAlgorithm.Hash].Element;ReturnValue.Element;value;dfc-generated |
 | System.Security.Cryptography.Xml;XmlDsigC14NTransform;GetOutput;();Argument[this];ReturnValue;taint;df-generated |
 | System.Security.Cryptography.Xml;XmlDsigC14NTransform;GetOutput;(System.Type);Argument[this];ReturnValue;taint;df-generated |
 | System.Security.Cryptography.Xml;XmlDsigC14NTransform;LoadInnerXml;(System.Xml.XmlNodeList);Argument[0].Element;Argument[this];taint;df-generated |
 | System.Security.Cryptography.Xml;XmlDsigC14NTransform;LoadInput;(System.Object);Argument[0];Argument[this];taint;df-generated |
 | System.Security.Cryptography.Xml;XmlDsigC14NTransform;get_InputTypes;();Argument[this];ReturnValue;taint;df-generated |
 | System.Security.Cryptography.Xml;XmlDsigC14NTransform;get_OutputTypes;();Argument[this];ReturnValue;taint;df-generated |
-| System.Security.Cryptography.Xml;XmlDsigEnvelopedSignatureTransform;GetInnerXml;();Argument[this];ReturnValue;taint;df-generated |
 | System.Security.Cryptography.Xml;XmlDsigEnvelopedSignatureTransform;GetOutput;();Argument[this];ReturnValue;taint;df-generated |
 | System.Security.Cryptography.Xml;XmlDsigEnvelopedSignatureTransform;GetOutput;(System.Type);Argument[this];ReturnValue;taint;df-generated |
 | System.Security.Cryptography.Xml;XmlDsigEnvelopedSignatureTransform;LoadInnerXml;(System.Xml.XmlNodeList);Argument[0].Element;Argument[this];taint;df-generated |
 | System.Security.Cryptography.Xml;XmlDsigEnvelopedSignatureTransform;LoadInput;(System.Object);Argument[0];Argument[this];taint;df-generated |
 | System.Security.Cryptography.Xml;XmlDsigEnvelopedSignatureTransform;get_InputTypes;();Argument[this];ReturnValue;taint;df-generated |
 | System.Security.Cryptography.Xml;XmlDsigEnvelopedSignatureTransform;get_OutputTypes;();Argument[this];ReturnValue;taint;df-generated |
-| System.Security.Cryptography.Xml;XmlDsigExcC14NTransform;GetDigestedOutput;(System.Security.Cryptography.HashAlgorithm);Argument[0];ReturnValue;taint;df-generated |
-| System.Security.Cryptography.Xml;XmlDsigExcC14NTransform;GetInnerXml;();Argument[this];ReturnValue;taint;df-generated |
+| System.Security.Cryptography.Xml;XmlDsigExcC14NTransform;GetDigestedOutput;(System.Security.Cryptography.HashAlgorithm);Argument[0].Property[System.Security.Cryptography.HashAlgorithm.Hash].Element;ReturnValue.Element;value;dfc-generated |
 | System.Security.Cryptography.Xml;XmlDsigExcC14NTransform;GetOutput;();Argument[this];ReturnValue;taint;df-generated |
 | System.Security.Cryptography.Xml;XmlDsigExcC14NTransform;GetOutput;(System.Type);Argument[this];ReturnValue;taint;df-generated |
 | System.Security.Cryptography.Xml;XmlDsigExcC14NTransform;LoadInnerXml;(System.Xml.XmlNodeList);Argument[0].Element;Argument[this];taint;df-generated |
@@ -15748,55 +16214,56 @@ summary
 | System.Security.Cryptography.Xml;XmlDsigExcC14NTransform;XmlDsigExcC14NTransform;(System.Boolean,System.String);Argument[1];Argument[this];taint;df-generated |
 | System.Security.Cryptography.Xml;XmlDsigExcC14NTransform;get_InputTypes;();Argument[this];ReturnValue;taint;df-generated |
 | System.Security.Cryptography.Xml;XmlDsigExcC14NTransform;get_OutputTypes;();Argument[this];ReturnValue;taint;df-generated |
-| System.Security.Cryptography.Xml;XmlDsigXPathTransform;GetInnerXml;();Argument[this];ReturnValue;taint;df-generated |
 | System.Security.Cryptography.Xml;XmlDsigXPathTransform;GetOutput;();Argument[this];ReturnValue;taint;df-generated |
 | System.Security.Cryptography.Xml;XmlDsigXPathTransform;GetOutput;(System.Type);Argument[this];ReturnValue;taint;df-generated |
 | System.Security.Cryptography.Xml;XmlDsigXPathTransform;LoadInnerXml;(System.Xml.XmlNodeList);Argument[0].Element;Argument[this];taint;df-generated |
 | System.Security.Cryptography.Xml;XmlDsigXPathTransform;LoadInput;(System.Object);Argument[0];Argument[this];taint;df-generated |
 | System.Security.Cryptography.Xml;XmlDsigXPathTransform;get_InputTypes;();Argument[this];ReturnValue;taint;df-generated |
 | System.Security.Cryptography.Xml;XmlDsigXPathTransform;get_OutputTypes;();Argument[this];ReturnValue;taint;df-generated |
-| System.Security.Cryptography.Xml;XmlDsigXsltTransform;GetInnerXml;();Argument[this];ReturnValue;taint;df-generated |
+| System.Security.Cryptography.Xml;XmlDsigXsltTransform;GetInnerXml;();Argument[this].SyntheticField[System.Security.Cryptography.Xml.XmlDsigXsltTransform._xslNodes];ReturnValue;value;dfc-generated |
 | System.Security.Cryptography.Xml;XmlDsigXsltTransform;GetOutput;();Argument[this];ReturnValue;taint;df-generated |
 | System.Security.Cryptography.Xml;XmlDsigXsltTransform;GetOutput;(System.Type);Argument[this];ReturnValue;taint;df-generated |
 | System.Security.Cryptography.Xml;XmlDsigXsltTransform;LoadInnerXml;(System.Xml.XmlNodeList);Argument[0].Element;Argument[this];taint;df-generated |
+| System.Security.Cryptography.Xml;XmlDsigXsltTransform;LoadInnerXml;(System.Xml.XmlNodeList);Argument[0].Element;Argument[this];taint;dfc-generated |
+| System.Security.Cryptography.Xml;XmlDsigXsltTransform;LoadInnerXml;(System.Xml.XmlNodeList);Argument[0];Argument[this].SyntheticField[System.Security.Cryptography.Xml.XmlDsigXsltTransform._xslNodes];value;df-generated |
+| System.Security.Cryptography.Xml;XmlDsigXsltTransform;LoadInnerXml;(System.Xml.XmlNodeList);Argument[0];Argument[this].SyntheticField[System.Security.Cryptography.Xml.XmlDsigXsltTransform._xslNodes];value;dfc-generated |
 | System.Security.Cryptography.Xml;XmlDsigXsltTransform;LoadInput;(System.Object);Argument[0];Argument[this];taint;df-generated |
 | System.Security.Cryptography.Xml;XmlDsigXsltTransform;get_InputTypes;();Argument[this];ReturnValue;taint;df-generated |
 | System.Security.Cryptography.Xml;XmlDsigXsltTransform;get_OutputTypes;();Argument[this];ReturnValue;taint;df-generated |
-| System.Security.Cryptography.Xml;XmlLicenseTransform;GetInnerXml;();Argument[this];ReturnValue;taint;df-generated |
 | System.Security.Cryptography.Xml;XmlLicenseTransform;GetOutput;();Argument[this];ReturnValue;taint;df-generated |
 | System.Security.Cryptography.Xml;XmlLicenseTransform;GetOutput;(System.Type);Argument[this];ReturnValue;taint;df-generated |
 | System.Security.Cryptography.Xml;XmlLicenseTransform;LoadInnerXml;(System.Xml.XmlNodeList);Argument[0].Element;Argument[this];taint;df-generated |
 | System.Security.Cryptography.Xml;XmlLicenseTransform;LoadInput;(System.Object);Argument[0];Argument[this];taint;df-generated |
 | System.Security.Cryptography.Xml;XmlLicenseTransform;get_InputTypes;();Argument[this];ReturnValue;taint;df-generated |
 | System.Security.Cryptography.Xml;XmlLicenseTransform;get_OutputTypes;();Argument[this];ReturnValue;taint;df-generated |
-| System.Security.Cryptography;AesCng;TryEncryptCbcCore;(System.ReadOnlySpan<System.Byte>,System.ReadOnlySpan<System.Byte>,System.Span<System.Byte>,System.Security.Cryptography.PaddingMode,System.Int32);Argument[0];Argument[2];taint;df-generated |
-| System.Security.Cryptography;AesCng;TryEncryptCfbCore;(System.ReadOnlySpan<System.Byte>,System.ReadOnlySpan<System.Byte>,System.Span<System.Byte>,System.Security.Cryptography.PaddingMode,System.Int32,System.Int32);Argument[0];Argument[2];taint;df-generated |
-| System.Security.Cryptography;AesCng;TryEncryptEcbCore;(System.ReadOnlySpan<System.Byte>,System.Span<System.Byte>,System.Security.Cryptography.PaddingMode,System.Int32);Argument[0];Argument[1];taint;df-generated |
-| System.Security.Cryptography;AesCryptoServiceProvider;get_LegalBlockSizes;();Argument[this];ReturnValue;taint;df-generated |
-| System.Security.Cryptography;AesCryptoServiceProvider;get_LegalKeySizes;();Argument[this];ReturnValue;taint;df-generated |
-| System.Security.Cryptography;AesManaged;get_LegalBlockSizes;();Argument[this];ReturnValue;taint;df-generated |
-| System.Security.Cryptography;AesManaged;get_LegalKeySizes;();Argument[this];ReturnValue;taint;df-generated |
-| System.Security.Cryptography;AsnEncodedData;AsnEncodedData;(System.Byte[]);Argument[0].Element;Argument[this];taint;df-generated |
-| System.Security.Cryptography;AsnEncodedData;AsnEncodedData;(System.ReadOnlySpan<System.Byte>);Argument[0];Argument[this];taint;df-generated |
-| System.Security.Cryptography;AsnEncodedData;AsnEncodedData;(System.Security.Cryptography.AsnEncodedData);Argument[0];Argument[this];taint;df-generated |
-| System.Security.Cryptography;AsnEncodedData;AsnEncodedData;(System.Security.Cryptography.Oid,System.ReadOnlySpan<System.Byte>);Argument[0];Argument[this];taint;df-generated |
-| System.Security.Cryptography;AsnEncodedData;AsnEncodedData;(System.Security.Cryptography.Oid,System.ReadOnlySpan<System.Byte>);Argument[1];Argument[this];taint;df-generated |
-| System.Security.Cryptography;AsnEncodedData;AsnEncodedData;(System.String,System.ReadOnlySpan<System.Byte>);Argument[0];Argument[this];taint;df-generated |
-| System.Security.Cryptography;AsnEncodedData;AsnEncodedData;(System.String,System.ReadOnlySpan<System.Byte>);Argument[1];Argument[this];taint;df-generated |
-| System.Security.Cryptography;AsnEncodedData;CopyFrom;(System.Security.Cryptography.AsnEncodedData);Argument[0];Argument[this];taint;df-generated |
-| System.Security.Cryptography;AsnEncodedData;Format;(System.Boolean);Argument[this];ReturnValue;taint;df-generated |
+| System.Security.Cryptography;AesCng;TryEncryptCbcCore;(System.ReadOnlySpan<System.Byte>,System.ReadOnlySpan<System.Byte>,System.Span<System.Byte>,System.Security.Cryptography.PaddingMode,System.Int32);Argument[0].Element;Argument[2].Element;value;dfc-generated |
+| System.Security.Cryptography;AesCng;TryEncryptCfbCore;(System.ReadOnlySpan<System.Byte>,System.ReadOnlySpan<System.Byte>,System.Span<System.Byte>,System.Security.Cryptography.PaddingMode,System.Int32,System.Int32);Argument[0].Element;Argument[2].Element;value;dfc-generated |
+| System.Security.Cryptography;AesCng;TryEncryptEcbCore;(System.ReadOnlySpan<System.Byte>,System.Span<System.Byte>,System.Security.Cryptography.PaddingMode,System.Int32);Argument[0].Element;Argument[1].Element;value;dfc-generated |
+| System.Security.Cryptography;AesCryptoServiceProvider;get_LegalBlockSizes;();Argument[this].Field[System.Security.Cryptography.SymmetricAlgorithm.LegalBlockSizesValue].Element;ReturnValue.Element;value;dfc-generated |
+| System.Security.Cryptography;AesCryptoServiceProvider;get_LegalKeySizes;();Argument[this].Field[System.Security.Cryptography.SymmetricAlgorithm.LegalKeySizesValue].Element;ReturnValue.Element;value;dfc-generated |
+| System.Security.Cryptography;AesManaged;get_LegalBlockSizes;();Argument[this].Field[System.Security.Cryptography.SymmetricAlgorithm.LegalBlockSizesValue].Element;ReturnValue.Element;value;dfc-generated |
+| System.Security.Cryptography;AesManaged;get_LegalKeySizes;();Argument[this].Field[System.Security.Cryptography.SymmetricAlgorithm.LegalKeySizesValue].Element;ReturnValue.Element;value;dfc-generated |
+| System.Security.Cryptography;AsnEncodedData;AsnEncodedData;(System.Byte[]);Argument[0].Element;Argument[this].SyntheticField[System.Security.Cryptography.AsnEncodedData._rawData].Element;value;dfc-generated |
+| System.Security.Cryptography;AsnEncodedData;AsnEncodedData;(System.Byte[]);Argument[0];Argument[this].SyntheticField[System.Security.Cryptography.AsnEncodedData._rawData];value;dfc-generated |
+| System.Security.Cryptography;AsnEncodedData;AsnEncodedData;(System.ReadOnlySpan<System.Byte>);Argument[0].Element;Argument[this].SyntheticField[System.Security.Cryptography.AsnEncodedData._rawData].Element;value;dfc-generated |
+| System.Security.Cryptography;AsnEncodedData;AsnEncodedData;(System.Security.Cryptography.AsnEncodedData);Argument[0].SyntheticField[System.Security.Cryptography.AsnEncodedData._rawData].Element;Argument[this].SyntheticField[System.Security.Cryptography.AsnEncodedData._rawData].Element;value;dfc-generated |
+| System.Security.Cryptography;AsnEncodedData;AsnEncodedData;(System.Security.Cryptography.AsnEncodedData);Argument[0].SyntheticField[System.Security.Cryptography.AsnEncodedData._rawData];Argument[this].SyntheticField[System.Security.Cryptography.AsnEncodedData._rawData];value;dfc-generated |
+| System.Security.Cryptography;AsnEncodedData;AsnEncodedData;(System.Security.Cryptography.Oid,System.ReadOnlySpan<System.Byte>);Argument[1].Element;Argument[this].SyntheticField[System.Security.Cryptography.AsnEncodedData._rawData].Element;value;dfc-generated |
+| System.Security.Cryptography;AsnEncodedData;AsnEncodedData;(System.String,System.ReadOnlySpan<System.Byte>);Argument[1].Element;Argument[this].SyntheticField[System.Security.Cryptography.AsnEncodedData._rawData].Element;value;dfc-generated |
+| System.Security.Cryptography;AsnEncodedData;CopyFrom;(System.Security.Cryptography.AsnEncodedData);Argument[0].SyntheticField[System.Security.Cryptography.AsnEncodedData._rawData].Element;Argument[this].SyntheticField[System.Security.Cryptography.AsnEncodedData._rawData].Element;value;dfc-generated |
+| System.Security.Cryptography;AsnEncodedData;CopyFrom;(System.Security.Cryptography.AsnEncodedData);Argument[0].SyntheticField[System.Security.Cryptography.AsnEncodedData._rawData];Argument[this].SyntheticField[System.Security.Cryptography.AsnEncodedData._rawData];value;dfc-generated |
+| System.Security.Cryptography;AsnEncodedData;Format;(System.Boolean);Argument[this].SyntheticField[System.Security.Cryptography.AsnEncodedData._rawData].Element;ReturnValue;taint;dfc-generated |
 | System.Security.Cryptography;AsnEncodedDataCollection;Add;(System.Security.Cryptography.AsnEncodedData);Argument[0];Argument[this].Element;value;manual |
-| System.Security.Cryptography;AsnEncodedDataCollection;AsnEncodedDataCollection;(System.Security.Cryptography.AsnEncodedData);Argument[0];Argument[this];taint;df-generated |
+| System.Security.Cryptography;AsnEncodedDataCollection;AsnEncodedDataCollection;(System.Security.Cryptography.AsnEncodedData);Argument[0];Argument[this].SyntheticField[System.Security.Cryptography.AsnEncodedDataCollection._list].Element;value;dfc-generated |
 | System.Security.Cryptography;AsnEncodedDataCollection;CopyTo;(System.Array,System.Int32);Argument[this].Element;Argument[0].Element;value;manual |
 | System.Security.Cryptography;AsnEncodedDataCollection;CopyTo;(System.Security.Cryptography.AsnEncodedData[],System.Int32);Argument[this].Element;Argument[0].Element;value;manual |
 | System.Security.Cryptography;AsnEncodedDataCollection;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.IEnumerator.Current];value;manual |
 | System.Security.Cryptography;AsnEncodedDataCollection;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Security.Cryptography.AsnEncodedDataEnumerator.Current];value;manual |
-| System.Security.Cryptography;AsnEncodedDataCollection;get_Item;(System.Int32);Argument[this];ReturnValue;taint;df-generated |
-| System.Security.Cryptography;AsnEncodedDataCollection;get_SyncRoot;();Argument[this];ReturnValue;taint;df-generated |
-| System.Security.Cryptography;AsnEncodedDataCollection;get_SyncRoot;();Argument[this];ReturnValue;value;df-generated |
+| System.Security.Cryptography;AsnEncodedDataCollection;get_Item;(System.Int32);Argument[this].SyntheticField[System.Security.Cryptography.AsnEncodedDataCollection._list].Element;ReturnValue;value;dfc-generated |
+| System.Security.Cryptography;AsnEncodedDataCollection;get_SyncRoot;();Argument[this];ReturnValue;value;dfc-generated |
 | System.Security.Cryptography;AsnEncodedDataEnumerator;get_Current;();Argument[this];ReturnValue;taint;df-generated |
 | System.Security.Cryptography;AsymmetricAlgorithm;get_KeyExchangeAlgorithm;();Argument[this];ReturnValue;taint;df-generated |
-| System.Security.Cryptography;AsymmetricAlgorithm;get_LegalKeySizes;();Argument[this];ReturnValue;taint;df-generated |
+| System.Security.Cryptography;AsymmetricAlgorithm;get_LegalKeySizes;();Argument[this].Field[System.Security.Cryptography.AsymmetricAlgorithm.LegalKeySizesValue].Element;ReturnValue.Element;value;dfc-generated |
 | System.Security.Cryptography;AsymmetricAlgorithm;get_SignatureAlgorithm;();Argument[this];ReturnValue;taint;df-generated |
 | System.Security.Cryptography;AsymmetricKeyExchangeDeformatter;SetKey;(System.Security.Cryptography.AsymmetricAlgorithm);Argument[0];Argument[this];taint;df-generated |
 | System.Security.Cryptography;AsymmetricKeyExchangeFormatter;SetKey;(System.Security.Cryptography.AsymmetricAlgorithm);Argument[0];Argument[this];taint;df-generated |
@@ -15804,20 +16271,22 @@ summary
 | System.Security.Cryptography;AsymmetricSignatureDeformatter;SetKey;(System.Security.Cryptography.AsymmetricAlgorithm);Argument[0];Argument[this];taint;df-generated |
 | System.Security.Cryptography;AsymmetricSignatureFormatter;SetHashAlgorithm;(System.String);Argument[0];Argument[this];taint;df-generated |
 | System.Security.Cryptography;AsymmetricSignatureFormatter;SetKey;(System.Security.Cryptography.AsymmetricAlgorithm);Argument[0];Argument[this];taint;df-generated |
-| System.Security.Cryptography;CngAlgorithm;CngAlgorithm;(System.String);Argument[0];Argument[this];taint;df-generated |
-| System.Security.Cryptography;CngAlgorithm;ToString;();Argument[this];ReturnValue;taint;df-generated |
-| System.Security.Cryptography;CngAlgorithm;get_Algorithm;();Argument[this];ReturnValue;taint;df-generated |
-| System.Security.Cryptography;CngAlgorithmGroup;CngAlgorithmGroup;(System.String);Argument[0];Argument[this];taint;df-generated |
-| System.Security.Cryptography;CngAlgorithmGroup;ToString;();Argument[this];ReturnValue;taint;df-generated |
-| System.Security.Cryptography;CngAlgorithmGroup;get_AlgorithmGroup;();Argument[this];ReturnValue;taint;df-generated |
-| System.Security.Cryptography;CngKeyBlobFormat;CngKeyBlobFormat;(System.String);Argument[0];Argument[this];taint;df-generated |
-| System.Security.Cryptography;CngKeyBlobFormat;ToString;();Argument[this];ReturnValue;taint;df-generated |
-| System.Security.Cryptography;CngKeyBlobFormat;get_Format;();Argument[this];ReturnValue;taint;df-generated |
-| System.Security.Cryptography;CngProperty;CngProperty;(System.String,System.Byte[],System.Security.Cryptography.CngPropertyOptions);Argument[1].Element;Argument[this];taint;df-generated |
-| System.Security.Cryptography;CngProperty;GetValue;();Argument[this];ReturnValue;taint;df-generated |
-| System.Security.Cryptography;CngProvider;CngProvider;(System.String);Argument[0];Argument[this];taint;df-generated |
-| System.Security.Cryptography;CngProvider;ToString;();Argument[this];ReturnValue;taint;df-generated |
-| System.Security.Cryptography;CngProvider;get_Provider;();Argument[this];ReturnValue;taint;df-generated |
+| System.Security.Cryptography;CngAlgorithm;CngAlgorithm;(System.String);Argument[0];Argument[this].SyntheticField[System.Security.Cryptography.CngAlgorithm._algorithm];value;dfc-generated |
+| System.Security.Cryptography;CngAlgorithm;ToString;();Argument[this].SyntheticField[System.Security.Cryptography.CngAlgorithm._algorithm];ReturnValue;value;dfc-generated |
+| System.Security.Cryptography;CngAlgorithm;get_Algorithm;();Argument[this].SyntheticField[System.Security.Cryptography.CngAlgorithm._algorithm];ReturnValue;value;dfc-generated |
+| System.Security.Cryptography;CngAlgorithmGroup;CngAlgorithmGroup;(System.String);Argument[0];Argument[this].SyntheticField[System.Security.Cryptography.CngAlgorithmGroup._algorithmGroup];value;dfc-generated |
+| System.Security.Cryptography;CngAlgorithmGroup;ToString;();Argument[this].SyntheticField[System.Security.Cryptography.CngAlgorithmGroup._algorithmGroup];ReturnValue;value;dfc-generated |
+| System.Security.Cryptography;CngAlgorithmGroup;get_AlgorithmGroup;();Argument[this].SyntheticField[System.Security.Cryptography.CngAlgorithmGroup._algorithmGroup];ReturnValue;value;dfc-generated |
+| System.Security.Cryptography;CngKeyBlobFormat;CngKeyBlobFormat;(System.String);Argument[0];Argument[this].SyntheticField[System.Security.Cryptography.CngKeyBlobFormat._format];value;dfc-generated |
+| System.Security.Cryptography;CngKeyBlobFormat;ToString;();Argument[this].SyntheticField[System.Security.Cryptography.CngKeyBlobFormat._format];ReturnValue;value;dfc-generated |
+| System.Security.Cryptography;CngKeyBlobFormat;get_Format;();Argument[this].SyntheticField[System.Security.Cryptography.CngKeyBlobFormat._format];ReturnValue;value;dfc-generated |
+| System.Security.Cryptography;CngProperty;CngProperty;(System.String,System.Byte[],System.Security.Cryptography.CngPropertyOptions);Argument[1].Element;Argument[this].SyntheticField[System.Security.Cryptography.CngProperty._value].Element;value;dfc-generated |
+| System.Security.Cryptography;CngProperty;CngProperty;(System.String,System.Byte[],System.Security.Cryptography.CngPropertyOptions);Argument[1];Argument[this].SyntheticField[System.Security.Cryptography.CngProperty._value];value;dfc-generated |
+| System.Security.Cryptography;CngProperty;GetValue;();Argument[this].SyntheticField[System.Security.Cryptography.CngProperty._value].Element;ReturnValue.Element;value;dfc-generated |
+| System.Security.Cryptography;CngProperty;GetValue;();Argument[this].SyntheticField[System.Security.Cryptography.CngProperty._value];ReturnValue;value;dfc-generated |
+| System.Security.Cryptography;CngProvider;CngProvider;(System.String);Argument[0];Argument[this].SyntheticField[System.Security.Cryptography.CngProvider._provider];value;dfc-generated |
+| System.Security.Cryptography;CngProvider;ToString;();Argument[this].SyntheticField[System.Security.Cryptography.CngProvider._provider];ReturnValue;value;dfc-generated |
+| System.Security.Cryptography;CngProvider;get_Provider;();Argument[this].SyntheticField[System.Security.Cryptography.CngProvider._provider];ReturnValue;value;dfc-generated |
 | System.Security.Cryptography;CryptoStream;BeginRead;(System.Byte[],System.Int32,System.Int32,System.AsyncCallback,System.Object);Argument[3];Argument[3].Parameter[delegate-self];value;manual |
 | System.Security.Cryptography;CryptoStream;BeginRead;(System.Byte[],System.Int32,System.Int32,System.AsyncCallback,System.Object);Argument[this];Argument[0].Element;taint;manual |
 | System.Security.Cryptography;CryptoStream;BeginWrite;(System.Byte[],System.Int32,System.Int32,System.AsyncCallback,System.Object);Argument[0].Element;Argument[this];taint;manual |
@@ -15827,8 +16296,7 @@ summary
 | System.Security.Cryptography;CryptoStream;CryptoStream;(System.IO.Stream,System.Security.Cryptography.ICryptoTransform,System.Security.Cryptography.CryptoStreamMode,System.Boolean);Argument[0];Argument[this];taint;df-generated |
 | System.Security.Cryptography;CryptoStream;CryptoStream;(System.IO.Stream,System.Security.Cryptography.ICryptoTransform,System.Security.Cryptography.CryptoStreamMode,System.Boolean);Argument[1];Argument[this];taint;df-generated |
 | System.Security.Cryptography;CryptoStream;DisposeAsync;();Argument[this];ReturnValue;taint;df-generated |
-| System.Security.Cryptography;CryptoStream;FlushAsync;(System.Threading.CancellationToken);Argument[0];ReturnValue;taint;df-generated |
-| System.Security.Cryptography;CryptoStream;FlushAsync;(System.Threading.CancellationToken);Argument[this];ReturnValue;taint;df-generated |
+| System.Security.Cryptography;CryptoStream;FlushAsync;(System.Threading.CancellationToken);Argument[this];ReturnValue.SyntheticField[System.Threading.Tasks.Task.m_stateObject];value;dfc-generated |
 | System.Security.Cryptography;CryptoStream;Read;(System.Byte[],System.Int32,System.Int32);Argument[this];Argument[0].Element;taint;manual |
 | System.Security.Cryptography;CryptoStream;ReadAsync;(System.Byte[],System.Int32,System.Int32,System.Threading.CancellationToken);Argument[this];Argument[0].Element;taint;manual |
 | System.Security.Cryptography;CryptoStream;ReadAsync;(System.Memory<System.Byte>,System.Threading.CancellationToken);Argument[this];Argument[0].Element;taint;manual |
@@ -15838,10 +16306,10 @@ summary
 | System.Security.Cryptography;CryptoStream;WriteAsync;(System.ReadOnlyMemory<System.Byte>,System.Threading.CancellationToken);Argument[1];ReturnValue;taint;df-generated |
 | System.Security.Cryptography;CryptoStream;WriteAsync;(System.ReadOnlyMemory<System.Byte>,System.Threading.CancellationToken);Argument[this];ReturnValue;taint;df-generated |
 | System.Security.Cryptography;DSACng;get_KeyExchangeAlgorithm;();Argument[this];ReturnValue;taint;df-generated |
-| System.Security.Cryptography;DSACng;get_LegalKeySizes;();Argument[this];ReturnValue;taint;df-generated |
+| System.Security.Cryptography;DSACng;get_LegalKeySizes;();Argument[this].Field[System.Security.Cryptography.AsymmetricAlgorithm.LegalKeySizesValue].Element;ReturnValue.Element;value;dfc-generated |
 | System.Security.Cryptography;DSACng;get_SignatureAlgorithm;();Argument[this];ReturnValue;taint;df-generated |
 | System.Security.Cryptography;DSACryptoServiceProvider;get_KeyExchangeAlgorithm;();Argument[this];ReturnValue;taint;df-generated |
-| System.Security.Cryptography;DSACryptoServiceProvider;get_LegalKeySizes;();Argument[this];ReturnValue;taint;df-generated |
+| System.Security.Cryptography;DSACryptoServiceProvider;get_LegalKeySizes;();Argument[this].Field[System.Security.Cryptography.AsymmetricAlgorithm.LegalKeySizesValue].Element;ReturnValue.Element;value;dfc-generated |
 | System.Security.Cryptography;DSACryptoServiceProvider;get_SignatureAlgorithm;();Argument[this];ReturnValue;taint;df-generated |
 | System.Security.Cryptography;DSASignatureDeformatter;DSASignatureDeformatter;(System.Security.Cryptography.AsymmetricAlgorithm);Argument[0];Argument[this];taint;df-generated |
 | System.Security.Cryptography;DSASignatureDeformatter;SetHashAlgorithm;(System.String);Argument[0];Argument[this];taint;df-generated |
@@ -15852,34 +16320,58 @@ summary
 | System.Security.Cryptography;ECDiffieHellman;get_KeyExchangeAlgorithm;();Argument[this];ReturnValue;taint;df-generated |
 | System.Security.Cryptography;ECDiffieHellman;get_PublicKey;();Argument[this];ReturnValue;taint;df-generated |
 | System.Security.Cryptography;ECDiffieHellman;get_SignatureAlgorithm;();Argument[this];ReturnValue;taint;df-generated |
-| System.Security.Cryptography;ECDiffieHellmanCng;get_LegalKeySizes;();Argument[this];ReturnValue;taint;df-generated |
+| System.Security.Cryptography;ECDiffieHellmanCng;get_LegalKeySizes;();Argument[this].Field[System.Security.Cryptography.AsymmetricAlgorithm.LegalKeySizesValue].Element;ReturnValue.Element;value;dfc-generated |
 | System.Security.Cryptography;ECDiffieHellmanCng;get_PublicKey;();Argument[this];ReturnValue;taint;df-generated |
 | System.Security.Cryptography;ECDiffieHellmanOpenSsl;get_PublicKey;();Argument[this];ReturnValue;taint;df-generated |
-| System.Security.Cryptography;ECDiffieHellmanPublicKey;ECDiffieHellmanPublicKey;(System.Byte[]);Argument[0].Element;Argument[this];taint;df-generated |
-| System.Security.Cryptography;ECDiffieHellmanPublicKey;ToByteArray;();Argument[this];ReturnValue;taint;df-generated |
+| System.Security.Cryptography;ECDiffieHellmanPublicKey;ECDiffieHellmanPublicKey;(System.Byte[]);Argument[0].Element;Argument[this].SyntheticField[System.Security.Cryptography.ECDiffieHellmanPublicKey._keyBlob].Element;value;dfc-generated |
+| System.Security.Cryptography;ECDiffieHellmanPublicKey;ToByteArray;();Argument[this].SyntheticField[System.Security.Cryptography.ECDiffieHellmanPublicKey._keyBlob].Element;ReturnValue.Element;value;dfc-generated |
 | System.Security.Cryptography;ECDsa;get_KeyExchangeAlgorithm;();Argument[this];ReturnValue;taint;df-generated |
 | System.Security.Cryptography;ECDsa;get_SignatureAlgorithm;();Argument[this];ReturnValue;taint;df-generated |
-| System.Security.Cryptography;ECDsaCng;get_LegalKeySizes;();Argument[this];ReturnValue;taint;df-generated |
-| System.Security.Cryptography;HMACMD5;HMACMD5;(System.Byte[]);Argument[0].Element;Argument[this];taint;df-generated |
-| System.Security.Cryptography;HMACSHA1;HMACSHA1;(System.Byte[]);Argument[0].Element;Argument[this];taint;df-generated |
-| System.Security.Cryptography;HMACSHA3_256;HMACSHA3_256;(System.Byte[]);Argument[0].Element;Argument[this];taint;df-generated |
-| System.Security.Cryptography;HMACSHA3_384;HMACSHA3_384;(System.Byte[]);Argument[0].Element;Argument[this];taint;df-generated |
-| System.Security.Cryptography;HMACSHA3_512;HMACSHA3_512;(System.Byte[]);Argument[0].Element;Argument[this];taint;df-generated |
-| System.Security.Cryptography;HMACSHA256;HMACSHA256;(System.Byte[]);Argument[0].Element;Argument[this];taint;df-generated |
-| System.Security.Cryptography;HMACSHA384;HMACSHA384;(System.Byte[]);Argument[0].Element;Argument[this];taint;df-generated |
-| System.Security.Cryptography;HMACSHA512;HMACSHA512;(System.Byte[]);Argument[0].Element;Argument[this];taint;df-generated |
-| System.Security.Cryptography;HashAlgorithm;ComputeHash;(System.Byte[]);Argument[this];ReturnValue;taint;df-generated |
-| System.Security.Cryptography;HashAlgorithm;ComputeHash;(System.Byte[],System.Int32,System.Int32);Argument[this];ReturnValue;taint;df-generated |
-| System.Security.Cryptography;HashAlgorithm;ComputeHash;(System.IO.Stream);Argument[this];ReturnValue;taint;df-generated |
-| System.Security.Cryptography;HashAlgorithm;ComputeHashAsync;(System.IO.Stream,System.Threading.CancellationToken);Argument[this];ReturnValue;taint;df-generated |
-| System.Security.Cryptography;HashAlgorithm;get_Hash;();Argument[this];ReturnValue;taint;df-generated |
-| System.Security.Cryptography;HashAlgorithmName;HashAlgorithmName;(System.String);Argument[0];Argument[this];taint;df-generated |
-| System.Security.Cryptography;HashAlgorithmName;ToString;();Argument[this];ReturnValue;taint;df-generated |
-| System.Security.Cryptography;HashAlgorithmName;get_Name;();Argument[this];ReturnValue;taint;df-generated |
+| System.Security.Cryptography;ECDsaCng;get_LegalKeySizes;();Argument[this].Field[System.Security.Cryptography.AsymmetricAlgorithm.LegalKeySizesValue].Element;ReturnValue.Element;value;dfc-generated |
+| System.Security.Cryptography;HMACMD5;HMACMD5;(System.Byte[]);Argument[0].Element;Argument[this].Field[System.Security.Cryptography.KeyedHashAlgorithm.KeyValue].Element;value;dfc-generated |
+| System.Security.Cryptography;HMACMD5;HMACMD5;(System.Byte[]);Argument[0];Argument[this].Field[System.Security.Cryptography.KeyedHashAlgorithm.KeyValue];value;dfc-generated |
+| System.Security.Cryptography;HMACMD5;HMACMD5;(System.Byte[]);Argument[0];Argument[this].SyntheticField[System.Security.Cryptography.HMACMD5._hMacCommon].SyntheticField[System.Security.Cryptography.HMACCommon.ActualKey];value;dfc-generated |
+| System.Security.Cryptography;HMACMD5;HMACMD5;(System.Byte[]);Argument[this].SyntheticField[System.Security.Cryptography.HMACMD5._hMacCommon].SyntheticField[System.Security.Cryptography.HMACCommon.ActualKey];Argument[this].Field[System.Security.Cryptography.KeyedHashAlgorithm.KeyValue];value;dfc-generated |
+| System.Security.Cryptography;HMACSHA1;HMACSHA1;(System.Byte[]);Argument[0].Element;Argument[this].Field[System.Security.Cryptography.KeyedHashAlgorithm.KeyValue].Element;value;dfc-generated |
+| System.Security.Cryptography;HMACSHA1;HMACSHA1;(System.Byte[]);Argument[0];Argument[this].Field[System.Security.Cryptography.KeyedHashAlgorithm.KeyValue];value;dfc-generated |
+| System.Security.Cryptography;HMACSHA1;HMACSHA1;(System.Byte[]);Argument[0];Argument[this].SyntheticField[System.Security.Cryptography.HMACSHA1._hMacCommon].SyntheticField[System.Security.Cryptography.HMACCommon.ActualKey];value;dfc-generated |
+| System.Security.Cryptography;HMACSHA1;HMACSHA1;(System.Byte[]);Argument[this].SyntheticField[System.Security.Cryptography.HMACSHA1._hMacCommon].SyntheticField[System.Security.Cryptography.HMACCommon.ActualKey];Argument[this].Field[System.Security.Cryptography.KeyedHashAlgorithm.KeyValue];value;dfc-generated |
+| System.Security.Cryptography;HMACSHA3_256;HMACSHA3_256;(System.Byte[]);Argument[0].Element;Argument[this].Field[System.Security.Cryptography.KeyedHashAlgorithm.KeyValue].Element;value;dfc-generated |
+| System.Security.Cryptography;HMACSHA3_256;HMACSHA3_256;(System.Byte[]);Argument[0];Argument[this].Field[System.Security.Cryptography.KeyedHashAlgorithm.KeyValue];value;dfc-generated |
+| System.Security.Cryptography;HMACSHA3_256;HMACSHA3_256;(System.Byte[]);Argument[0];Argument[this].SyntheticField[System.Security.Cryptography.HMACSHA3_256._hMacCommon].SyntheticField[System.Security.Cryptography.HMACCommon.ActualKey];value;dfc-generated |
+| System.Security.Cryptography;HMACSHA3_256;HMACSHA3_256;(System.Byte[]);Argument[this].SyntheticField[System.Security.Cryptography.HMACSHA3_256._hMacCommon].SyntheticField[System.Security.Cryptography.HMACCommon.ActualKey];Argument[this].Field[System.Security.Cryptography.KeyedHashAlgorithm.KeyValue];value;dfc-generated |
+| System.Security.Cryptography;HMACSHA3_384;HMACSHA3_384;(System.Byte[]);Argument[0].Element;Argument[this].Field[System.Security.Cryptography.KeyedHashAlgorithm.KeyValue].Element;value;dfc-generated |
+| System.Security.Cryptography;HMACSHA3_384;HMACSHA3_384;(System.Byte[]);Argument[0];Argument[this].Field[System.Security.Cryptography.KeyedHashAlgorithm.KeyValue];value;dfc-generated |
+| System.Security.Cryptography;HMACSHA3_384;HMACSHA3_384;(System.Byte[]);Argument[0];Argument[this].SyntheticField[System.Security.Cryptography.HMACSHA3_384._hMacCommon].SyntheticField[System.Security.Cryptography.HMACCommon.ActualKey];value;dfc-generated |
+| System.Security.Cryptography;HMACSHA3_384;HMACSHA3_384;(System.Byte[]);Argument[this].SyntheticField[System.Security.Cryptography.HMACSHA3_384._hMacCommon].SyntheticField[System.Security.Cryptography.HMACCommon.ActualKey];Argument[this].Field[System.Security.Cryptography.KeyedHashAlgorithm.KeyValue];value;dfc-generated |
+| System.Security.Cryptography;HMACSHA3_512;HMACSHA3_512;(System.Byte[]);Argument[0].Element;Argument[this].Field[System.Security.Cryptography.KeyedHashAlgorithm.KeyValue].Element;value;dfc-generated |
+| System.Security.Cryptography;HMACSHA3_512;HMACSHA3_512;(System.Byte[]);Argument[0];Argument[this].Field[System.Security.Cryptography.KeyedHashAlgorithm.KeyValue];value;dfc-generated |
+| System.Security.Cryptography;HMACSHA3_512;HMACSHA3_512;(System.Byte[]);Argument[0];Argument[this].SyntheticField[System.Security.Cryptography.HMACSHA3_512._hMacCommon].SyntheticField[System.Security.Cryptography.HMACCommon.ActualKey];value;dfc-generated |
+| System.Security.Cryptography;HMACSHA3_512;HMACSHA3_512;(System.Byte[]);Argument[this].SyntheticField[System.Security.Cryptography.HMACSHA3_512._hMacCommon].SyntheticField[System.Security.Cryptography.HMACCommon.ActualKey];Argument[this].Field[System.Security.Cryptography.KeyedHashAlgorithm.KeyValue];value;dfc-generated |
+| System.Security.Cryptography;HMACSHA256;HMACSHA256;(System.Byte[]);Argument[0].Element;Argument[this].Field[System.Security.Cryptography.KeyedHashAlgorithm.KeyValue].Element;value;dfc-generated |
+| System.Security.Cryptography;HMACSHA256;HMACSHA256;(System.Byte[]);Argument[0];Argument[this].Field[System.Security.Cryptography.KeyedHashAlgorithm.KeyValue];value;dfc-generated |
+| System.Security.Cryptography;HMACSHA256;HMACSHA256;(System.Byte[]);Argument[0];Argument[this].SyntheticField[System.Security.Cryptography.HMACSHA256._hMacCommon].SyntheticField[System.Security.Cryptography.HMACCommon.ActualKey];value;dfc-generated |
+| System.Security.Cryptography;HMACSHA256;HMACSHA256;(System.Byte[]);Argument[this].SyntheticField[System.Security.Cryptography.HMACSHA256._hMacCommon].SyntheticField[System.Security.Cryptography.HMACCommon.ActualKey];Argument[this].Field[System.Security.Cryptography.KeyedHashAlgorithm.KeyValue];value;dfc-generated |
+| System.Security.Cryptography;HMACSHA384;HMACSHA384;(System.Byte[]);Argument[0].Element;Argument[this].Field[System.Security.Cryptography.KeyedHashAlgorithm.KeyValue].Element;value;dfc-generated |
+| System.Security.Cryptography;HMACSHA384;HMACSHA384;(System.Byte[]);Argument[0];Argument[this].Field[System.Security.Cryptography.KeyedHashAlgorithm.KeyValue];value;dfc-generated |
+| System.Security.Cryptography;HMACSHA384;HMACSHA384;(System.Byte[]);Argument[0];Argument[this].SyntheticField[System.Security.Cryptography.HMACSHA384._hMacCommon].SyntheticField[System.Security.Cryptography.HMACCommon.ActualKey];value;dfc-generated |
+| System.Security.Cryptography;HMACSHA384;HMACSHA384;(System.Byte[]);Argument[this].SyntheticField[System.Security.Cryptography.HMACSHA384._hMacCommon].SyntheticField[System.Security.Cryptography.HMACCommon.ActualKey];Argument[this].Field[System.Security.Cryptography.KeyedHashAlgorithm.KeyValue];value;dfc-generated |
+| System.Security.Cryptography;HMACSHA512;HMACSHA512;(System.Byte[]);Argument[0].Element;Argument[this].Field[System.Security.Cryptography.KeyedHashAlgorithm.KeyValue].Element;value;dfc-generated |
+| System.Security.Cryptography;HMACSHA512;HMACSHA512;(System.Byte[]);Argument[0];Argument[this].Field[System.Security.Cryptography.KeyedHashAlgorithm.KeyValue];value;dfc-generated |
+| System.Security.Cryptography;HMACSHA512;HMACSHA512;(System.Byte[]);Argument[0];Argument[this].SyntheticField[System.Security.Cryptography.HMACSHA512._hMacCommon].SyntheticField[System.Security.Cryptography.HMACCommon.ActualKey];value;dfc-generated |
+| System.Security.Cryptography;HMACSHA512;HMACSHA512;(System.Byte[]);Argument[this].SyntheticField[System.Security.Cryptography.HMACSHA512._hMacCommon].SyntheticField[System.Security.Cryptography.HMACCommon.ActualKey];Argument[this].Field[System.Security.Cryptography.KeyedHashAlgorithm.KeyValue];value;dfc-generated |
+| System.Security.Cryptography;HashAlgorithm;ComputeHash;(System.Byte[]);Argument[this].Field[System.Security.Cryptography.HashAlgorithm.HashValue].Element;ReturnValue.Element;value;dfc-generated |
+| System.Security.Cryptography;HashAlgorithm;ComputeHash;(System.Byte[],System.Int32,System.Int32);Argument[this].Field[System.Security.Cryptography.HashAlgorithm.HashValue].Element;ReturnValue.Element;value;dfc-generated |
+| System.Security.Cryptography;HashAlgorithm;ComputeHash;(System.IO.Stream);Argument[this].Field[System.Security.Cryptography.HashAlgorithm.HashValue].Element;ReturnValue.Element;value;dfc-generated |
+| System.Security.Cryptography;HashAlgorithm;ComputeHashAsync;(System.IO.Stream,System.Threading.CancellationToken);Argument[this].Field[System.Security.Cryptography.HashAlgorithm.HashValue].Element;ReturnValue.Property[System.Threading.Tasks.Task`1.Result].Element;value;dfc-generated |
+| System.Security.Cryptography;HashAlgorithm;get_Hash;();Argument[this].Field[System.Security.Cryptography.HashAlgorithm.HashValue].Element;ReturnValue.Element;value;dfc-generated |
+| System.Security.Cryptography;HashAlgorithmName;HashAlgorithmName;(System.String);Argument[0];Argument[this].SyntheticField[System.Security.Cryptography.HashAlgorithmName._name];value;dfc-generated |
+| System.Security.Cryptography;HashAlgorithmName;ToString;();Argument[this].SyntheticField[System.Security.Cryptography.HashAlgorithmName._name];ReturnValue;value;dfc-generated |
+| System.Security.Cryptography;HashAlgorithmName;get_Name;();Argument[this].SyntheticField[System.Security.Cryptography.HashAlgorithmName._name];ReturnValue;value;dfc-generated |
 | System.Security.Cryptography;IncrementalHash;CreateHMAC;(System.Security.Cryptography.HashAlgorithmName,System.Byte[]);Argument[0];ReturnValue;taint;df-generated |
 | System.Security.Cryptography;IncrementalHash;CreateHMAC;(System.Security.Cryptography.HashAlgorithmName,System.ReadOnlySpan<System.Byte>);Argument[0];ReturnValue;taint;df-generated |
-| System.Security.Cryptography;IncrementalHash;CreateHash;(System.Security.Cryptography.HashAlgorithmName);Argument[0];ReturnValue;taint;df-generated |
-| System.Security.Cryptography;IncrementalHash;get_AlgorithmName;();Argument[this];ReturnValue;taint;df-generated |
+| System.Security.Cryptography;IncrementalHash;CreateHash;(System.Security.Cryptography.HashAlgorithmName);Argument[0];ReturnValue.SyntheticField[System.Security.Cryptography.IncrementalHash._algorithmName];value;dfc-generated |
+| System.Security.Cryptography;IncrementalHash;get_AlgorithmName;();Argument[this].SyntheticField[System.Security.Cryptography.IncrementalHash._algorithmName];ReturnValue;value;dfc-generated |
 | System.Security.Cryptography;Oid;FromFriendlyName;(System.String,System.Security.Cryptography.OidGroup);Argument[0];ReturnValue;taint;df-generated |
 | System.Security.Cryptography;Oid;FromOidValue;(System.String,System.Security.Cryptography.OidGroup);Argument[0];ReturnValue;taint;df-generated |
 | System.Security.Cryptography;Oid;Oid;(System.Security.Cryptography.Oid);Argument[0];Argument[this];taint;df-generated |
@@ -15893,22 +16385,24 @@ summary
 | System.Security.Cryptography;OidCollection;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Security.Cryptography.OidEnumerator.Current];value;manual |
 | System.Security.Cryptography;OidCollection;get_Item;(System.Int32);Argument[this];ReturnValue;taint;df-generated |
 | System.Security.Cryptography;OidCollection;get_Item;(System.String);Argument[this];ReturnValue;taint;df-generated |
-| System.Security.Cryptography;OidCollection;get_SyncRoot;();Argument[this];ReturnValue;taint;df-generated |
-| System.Security.Cryptography;OidCollection;get_SyncRoot;();Argument[this];ReturnValue;value;df-generated |
+| System.Security.Cryptography;OidCollection;get_SyncRoot;();Argument[this];ReturnValue;value;dfc-generated |
+| System.Security.Cryptography;OidEnumerator;get_Current;();Argument[this].Property[System.Security.Cryptography.OidEnumerator.Current];ReturnValue;value;df-generated |
+| System.Security.Cryptography;OidEnumerator;get_Current;();Argument[this].Property[System.Security.Cryptography.OidEnumerator.Current];ReturnValue;value;dfc-generated |
 | System.Security.Cryptography;OidEnumerator;get_Current;();Argument[this];ReturnValue;taint;df-generated |
+| System.Security.Cryptography;OidEnumerator;get_Current;();Argument[this];ReturnValue;taint;dfc-generated |
 | System.Security.Cryptography;PasswordDeriveBytes;PasswordDeriveBytes;(System.Byte[],System.Byte[],System.String,System.Int32,System.Security.Cryptography.CspParameters);Argument[0].Element;Argument[this];taint;df-generated |
 | System.Security.Cryptography;PasswordDeriveBytes;PasswordDeriveBytes;(System.Byte[],System.Byte[],System.String,System.Int32,System.Security.Cryptography.CspParameters);Argument[1].Element;Argument[this];taint;df-generated |
 | System.Security.Cryptography;PasswordDeriveBytes;PasswordDeriveBytes;(System.Byte[],System.Byte[],System.String,System.Int32,System.Security.Cryptography.CspParameters);Argument[2];Argument[this];taint;df-generated |
 | System.Security.Cryptography;PasswordDeriveBytes;PasswordDeriveBytes;(System.Byte[],System.Byte[],System.String,System.Int32,System.Security.Cryptography.CspParameters);Argument[4];Argument[this];taint;df-generated |
 | System.Security.Cryptography;RSA;get_KeyExchangeAlgorithm;();Argument[this];ReturnValue;taint;df-generated |
 | System.Security.Cryptography;RSA;get_SignatureAlgorithm;();Argument[this];ReturnValue;taint;df-generated |
-| System.Security.Cryptography;RSACng;get_LegalKeySizes;();Argument[this];ReturnValue;taint;df-generated |
+| System.Security.Cryptography;RSACng;get_LegalKeySizes;();Argument[this].Field[System.Security.Cryptography.AsymmetricAlgorithm.LegalKeySizesValue].Element;ReturnValue.Element;value;dfc-generated |
 | System.Security.Cryptography;RSACryptoServiceProvider;get_KeyExchangeAlgorithm;();Argument[this];ReturnValue;taint;df-generated |
-| System.Security.Cryptography;RSACryptoServiceProvider;get_LegalKeySizes;();Argument[this];ReturnValue;taint;df-generated |
+| System.Security.Cryptography;RSACryptoServiceProvider;get_LegalKeySizes;();Argument[this].Field[System.Security.Cryptography.AsymmetricAlgorithm.LegalKeySizesValue].Element;ReturnValue.Element;value;dfc-generated |
 | System.Security.Cryptography;RSACryptoServiceProvider;get_SignatureAlgorithm;();Argument[this];ReturnValue;taint;df-generated |
-| System.Security.Cryptography;RSAEncryptionPadding;CreateOaep;(System.Security.Cryptography.HashAlgorithmName);Argument[0];ReturnValue;taint;df-generated |
-| System.Security.Cryptography;RSAEncryptionPadding;ToString;();Argument[this];ReturnValue;taint;df-generated |
-| System.Security.Cryptography;RSAEncryptionPadding;get_OaepHashAlgorithm;();Argument[this];ReturnValue;taint;df-generated |
+| System.Security.Cryptography;RSAEncryptionPadding;CreateOaep;(System.Security.Cryptography.HashAlgorithmName);Argument[0];ReturnValue.SyntheticField[System.Security.Cryptography.RSAEncryptionPadding._oaepHashAlgorithm];value;dfc-generated |
+| System.Security.Cryptography;RSAEncryptionPadding;ToString;();Argument[this].SyntheticField[System.Security.Cryptography.RSAEncryptionPadding._oaepHashAlgorithm].Property[System.Security.Cryptography.HashAlgorithmName.Name];ReturnValue;taint;dfc-generated |
+| System.Security.Cryptography;RSAEncryptionPadding;get_OaepHashAlgorithm;();Argument[this].SyntheticField[System.Security.Cryptography.RSAEncryptionPadding._oaepHashAlgorithm];ReturnValue;value;dfc-generated |
 | System.Security.Cryptography;RSAOAEPKeyExchangeDeformatter;RSAOAEPKeyExchangeDeformatter;(System.Security.Cryptography.AsymmetricAlgorithm);Argument[0];Argument[this];taint;df-generated |
 | System.Security.Cryptography;RSAOAEPKeyExchangeDeformatter;SetKey;(System.Security.Cryptography.AsymmetricAlgorithm);Argument[0];Argument[this];taint;df-generated |
 | System.Security.Cryptography;RSAOAEPKeyExchangeFormatter;RSAOAEPKeyExchangeFormatter;(System.Security.Cryptography.AsymmetricAlgorithm);Argument[0];Argument[this];taint;df-generated |
@@ -15923,237 +16417,191 @@ summary
 | System.Security.Cryptography;RSAPKCS1SignatureFormatter;RSAPKCS1SignatureFormatter;(System.Security.Cryptography.AsymmetricAlgorithm);Argument[0];Argument[this];taint;df-generated |
 | System.Security.Cryptography;RSAPKCS1SignatureFormatter;SetHashAlgorithm;(System.String);Argument[0];Argument[this];taint;df-generated |
 | System.Security.Cryptography;RSAPKCS1SignatureFormatter;SetKey;(System.Security.Cryptography.AsymmetricAlgorithm);Argument[0];Argument[this];taint;df-generated |
-| System.Security.Cryptography;RijndaelManaged;get_LegalKeySizes;();Argument[this];ReturnValue;taint;df-generated |
+| System.Security.Cryptography;RijndaelManaged;get_LegalKeySizes;();Argument[this].Field[System.Security.Cryptography.SymmetricAlgorithm.LegalKeySizesValue].Element;ReturnValue.Element;value;dfc-generated |
 | System.Security.Cryptography;SP800108HmacCounterKdf;SP800108HmacCounterKdf;(System.Byte[],System.Security.Cryptography.HashAlgorithmName);Argument[1];Argument[this];taint;df-generated |
 | System.Security.Cryptography;SP800108HmacCounterKdf;SP800108HmacCounterKdf;(System.ReadOnlySpan<System.Byte>,System.Security.Cryptography.HashAlgorithmName);Argument[1];Argument[this];taint;df-generated |
-| System.Security.Cryptography;SafeEvpPKeyHandle;DuplicateHandle;();Argument[this];ReturnValue;taint;df-generated |
 | System.Security.Cryptography;SignatureDescription;CreateDeformatter;(System.Security.Cryptography.AsymmetricAlgorithm);Argument[0];ReturnValue;taint;df-generated |
-| System.Security.Cryptography;SignatureDescription;CreateDeformatter;(System.Security.Cryptography.AsymmetricAlgorithm);Argument[this];ReturnValue;taint;df-generated |
 | System.Security.Cryptography;SignatureDescription;CreateFormatter;(System.Security.Cryptography.AsymmetricAlgorithm);Argument[0];ReturnValue;taint;df-generated |
-| System.Security.Cryptography;SignatureDescription;CreateFormatter;(System.Security.Cryptography.AsymmetricAlgorithm);Argument[this];ReturnValue;taint;df-generated |
-| System.Security.Cryptography;SymmetricAlgorithm;EncryptCbc;(System.ReadOnlySpan<System.Byte>,System.ReadOnlySpan<System.Byte>,System.Span<System.Byte>,System.Security.Cryptography.PaddingMode);Argument[0];Argument[2];taint;df-generated |
-| System.Security.Cryptography;SymmetricAlgorithm;EncryptCfb;(System.ReadOnlySpan<System.Byte>,System.ReadOnlySpan<System.Byte>,System.Span<System.Byte>,System.Security.Cryptography.PaddingMode,System.Int32);Argument[0];Argument[2];taint;df-generated |
-| System.Security.Cryptography;SymmetricAlgorithm;EncryptEcb;(System.ReadOnlySpan<System.Byte>,System.Span<System.Byte>,System.Security.Cryptography.PaddingMode);Argument[0];Argument[1];taint;df-generated |
-| System.Security.Cryptography;SymmetricAlgorithm;TryEncryptCbc;(System.ReadOnlySpan<System.Byte>,System.ReadOnlySpan<System.Byte>,System.Span<System.Byte>,System.Int32,System.Security.Cryptography.PaddingMode);Argument[0];Argument[2];taint;df-generated |
-| System.Security.Cryptography;SymmetricAlgorithm;TryEncryptCbcCore;(System.ReadOnlySpan<System.Byte>,System.ReadOnlySpan<System.Byte>,System.Span<System.Byte>,System.Security.Cryptography.PaddingMode,System.Int32);Argument[0];Argument[2];taint;df-generated |
-| System.Security.Cryptography;SymmetricAlgorithm;TryEncryptCfb;(System.ReadOnlySpan<System.Byte>,System.ReadOnlySpan<System.Byte>,System.Span<System.Byte>,System.Int32,System.Security.Cryptography.PaddingMode,System.Int32);Argument[0];Argument[2];taint;df-generated |
-| System.Security.Cryptography;SymmetricAlgorithm;TryEncryptCfbCore;(System.ReadOnlySpan<System.Byte>,System.ReadOnlySpan<System.Byte>,System.Span<System.Byte>,System.Security.Cryptography.PaddingMode,System.Int32,System.Int32);Argument[0];Argument[2];taint;df-generated |
-| System.Security.Cryptography;SymmetricAlgorithm;TryEncryptEcb;(System.ReadOnlySpan<System.Byte>,System.Span<System.Byte>,System.Security.Cryptography.PaddingMode,System.Int32);Argument[0];Argument[1];taint;df-generated |
-| System.Security.Cryptography;SymmetricAlgorithm;TryEncryptEcbCore;(System.ReadOnlySpan<System.Byte>,System.Span<System.Byte>,System.Security.Cryptography.PaddingMode,System.Int32);Argument[0];Argument[1];taint;df-generated |
-| System.Security.Cryptography;SymmetricAlgorithm;get_LegalBlockSizes;();Argument[this];ReturnValue;taint;df-generated |
-| System.Security.Cryptography;SymmetricAlgorithm;get_LegalKeySizes;();Argument[this];ReturnValue;taint;df-generated |
-| System.Security.Cryptography;TripleDESCng;TryEncryptCbcCore;(System.ReadOnlySpan<System.Byte>,System.ReadOnlySpan<System.Byte>,System.Span<System.Byte>,System.Security.Cryptography.PaddingMode,System.Int32);Argument[0];Argument[2];taint;df-generated |
-| System.Security.Cryptography;TripleDESCng;TryEncryptCfbCore;(System.ReadOnlySpan<System.Byte>,System.ReadOnlySpan<System.Byte>,System.Span<System.Byte>,System.Security.Cryptography.PaddingMode,System.Int32,System.Int32);Argument[0];Argument[2];taint;df-generated |
-| System.Security.Cryptography;TripleDESCng;TryEncryptEcbCore;(System.ReadOnlySpan<System.Byte>,System.Span<System.Byte>,System.Security.Cryptography.PaddingMode,System.Int32);Argument[0];Argument[1];taint;df-generated |
-| System.Security.Cryptography;TripleDESCryptoServiceProvider;get_LegalBlockSizes;();Argument[this];ReturnValue;taint;df-generated |
-| System.Security.Cryptography;TripleDESCryptoServiceProvider;get_LegalKeySizes;();Argument[this];ReturnValue;taint;df-generated |
-| System.Security.Permissions;DataProtectionPermission;Copy;();Argument[this];ReturnValue;taint;df-generated |
-| System.Security.Permissions;DataProtectionPermission;Copy;();Argument[this];ReturnValue;value;df-generated |
-| System.Security.Permissions;DataProtectionPermission;Intersect;(System.Security.IPermission);Argument[0];ReturnValue;taint;df-generated |
-| System.Security.Permissions;DataProtectionPermission;Intersect;(System.Security.IPermission);Argument[this];ReturnValue;taint;df-generated |
+| System.Security.Cryptography;SymmetricAlgorithm;EncryptCbc;(System.ReadOnlySpan<System.Byte>,System.ReadOnlySpan<System.Byte>,System.Span<System.Byte>,System.Security.Cryptography.PaddingMode);Argument[0].Element;Argument[2].Element;value;dfc-generated |
+| System.Security.Cryptography;SymmetricAlgorithm;EncryptCfb;(System.ReadOnlySpan<System.Byte>,System.ReadOnlySpan<System.Byte>,System.Span<System.Byte>,System.Security.Cryptography.PaddingMode,System.Int32);Argument[0].Element;Argument[2].Element;value;dfc-generated |
+| System.Security.Cryptography;SymmetricAlgorithm;EncryptEcb;(System.ReadOnlySpan<System.Byte>,System.Span<System.Byte>,System.Security.Cryptography.PaddingMode);Argument[0].Element;Argument[1].Element;value;dfc-generated |
+| System.Security.Cryptography;SymmetricAlgorithm;TryEncryptCbc;(System.ReadOnlySpan<System.Byte>,System.ReadOnlySpan<System.Byte>,System.Span<System.Byte>,System.Int32,System.Security.Cryptography.PaddingMode);Argument[0].Element;Argument[2].Element;value;dfc-generated |
+| System.Security.Cryptography;SymmetricAlgorithm;TryEncryptCbcCore;(System.ReadOnlySpan<System.Byte>,System.ReadOnlySpan<System.Byte>,System.Span<System.Byte>,System.Security.Cryptography.PaddingMode,System.Int32);Argument[0].Element;Argument[2].Element;value;dfc-generated |
+| System.Security.Cryptography;SymmetricAlgorithm;TryEncryptCfb;(System.ReadOnlySpan<System.Byte>,System.ReadOnlySpan<System.Byte>,System.Span<System.Byte>,System.Int32,System.Security.Cryptography.PaddingMode,System.Int32);Argument[0].Element;Argument[2].Element;value;dfc-generated |
+| System.Security.Cryptography;SymmetricAlgorithm;TryEncryptCfbCore;(System.ReadOnlySpan<System.Byte>,System.ReadOnlySpan<System.Byte>,System.Span<System.Byte>,System.Security.Cryptography.PaddingMode,System.Int32,System.Int32);Argument[0].Element;Argument[2].Element;value;dfc-generated |
+| System.Security.Cryptography;SymmetricAlgorithm;TryEncryptEcb;(System.ReadOnlySpan<System.Byte>,System.Span<System.Byte>,System.Security.Cryptography.PaddingMode,System.Int32);Argument[0].Element;Argument[1].Element;value;dfc-generated |
+| System.Security.Cryptography;SymmetricAlgorithm;TryEncryptEcbCore;(System.ReadOnlySpan<System.Byte>,System.Span<System.Byte>,System.Security.Cryptography.PaddingMode,System.Int32);Argument[0].Element;Argument[1].Element;value;dfc-generated |
+| System.Security.Cryptography;SymmetricAlgorithm;get_LegalBlockSizes;();Argument[this].Field[System.Security.Cryptography.SymmetricAlgorithm.LegalBlockSizesValue].Element;ReturnValue.Element;value;dfc-generated |
+| System.Security.Cryptography;SymmetricAlgorithm;get_LegalKeySizes;();Argument[this].Field[System.Security.Cryptography.SymmetricAlgorithm.LegalKeySizesValue].Element;ReturnValue.Element;value;dfc-generated |
+| System.Security.Cryptography;TripleDESCng;TryEncryptCbcCore;(System.ReadOnlySpan<System.Byte>,System.ReadOnlySpan<System.Byte>,System.Span<System.Byte>,System.Security.Cryptography.PaddingMode,System.Int32);Argument[0].Element;Argument[2].Element;value;dfc-generated |
+| System.Security.Cryptography;TripleDESCng;TryEncryptCfbCore;(System.ReadOnlySpan<System.Byte>,System.ReadOnlySpan<System.Byte>,System.Span<System.Byte>,System.Security.Cryptography.PaddingMode,System.Int32,System.Int32);Argument[0].Element;Argument[2].Element;value;dfc-generated |
+| System.Security.Cryptography;TripleDESCng;TryEncryptEcbCore;(System.ReadOnlySpan<System.Byte>,System.Span<System.Byte>,System.Security.Cryptography.PaddingMode,System.Int32);Argument[0].Element;Argument[1].Element;value;dfc-generated |
+| System.Security.Cryptography;TripleDESCryptoServiceProvider;get_LegalBlockSizes;();Argument[this].Field[System.Security.Cryptography.SymmetricAlgorithm.LegalBlockSizesValue].Element;ReturnValue.Element;value;dfc-generated |
+| System.Security.Cryptography;TripleDESCryptoServiceProvider;get_LegalKeySizes;();Argument[this].Field[System.Security.Cryptography.SymmetricAlgorithm.LegalKeySizesValue].Element;ReturnValue.Element;value;dfc-generated |
+| System.Security.Permissions;DataProtectionPermission;Copy;();Argument[this];ReturnValue;value;dfc-generated |
+| System.Security.Permissions;DataProtectionPermission;Intersect;(System.Security.IPermission);Argument[0];ReturnValue;value;dfc-generated |
 | System.Security.Permissions;DataProtectionPermission;Union;(System.Security.IPermission);Argument[this];ReturnValue;taint;df-generated |
-| System.Security.Permissions;EnvironmentPermission;Copy;();Argument[this];ReturnValue;taint;df-generated |
-| System.Security.Permissions;EnvironmentPermission;Copy;();Argument[this];ReturnValue;value;df-generated |
-| System.Security.Permissions;EnvironmentPermission;Intersect;(System.Security.IPermission);Argument[0];ReturnValue;taint;df-generated |
-| System.Security.Permissions;EnvironmentPermission;Intersect;(System.Security.IPermission);Argument[this];ReturnValue;taint;df-generated |
+| System.Security.Permissions;EnvironmentPermission;Copy;();Argument[this];ReturnValue;value;dfc-generated |
+| System.Security.Permissions;EnvironmentPermission;Intersect;(System.Security.IPermission);Argument[0];ReturnValue;value;dfc-generated |
 | System.Security.Permissions;EnvironmentPermission;Union;(System.Security.IPermission);Argument[this];ReturnValue;taint;df-generated |
-| System.Security.Permissions;FileDialogPermission;Copy;();Argument[this];ReturnValue;taint;df-generated |
-| System.Security.Permissions;FileDialogPermission;Copy;();Argument[this];ReturnValue;value;df-generated |
-| System.Security.Permissions;FileDialogPermission;Intersect;(System.Security.IPermission);Argument[0];ReturnValue;taint;df-generated |
-| System.Security.Permissions;FileDialogPermission;Intersect;(System.Security.IPermission);Argument[this];ReturnValue;taint;df-generated |
+| System.Security.Permissions;FileDialogPermission;Copy;();Argument[this];ReturnValue;value;dfc-generated |
+| System.Security.Permissions;FileDialogPermission;Intersect;(System.Security.IPermission);Argument[0];ReturnValue;value;dfc-generated |
 | System.Security.Permissions;FileDialogPermission;Union;(System.Security.IPermission);Argument[this];ReturnValue;taint;df-generated |
-| System.Security.Permissions;FileIOPermission;Copy;();Argument[this];ReturnValue;taint;df-generated |
-| System.Security.Permissions;FileIOPermission;Copy;();Argument[this];ReturnValue;value;df-generated |
-| System.Security.Permissions;FileIOPermission;Intersect;(System.Security.IPermission);Argument[0];ReturnValue;taint;df-generated |
-| System.Security.Permissions;FileIOPermission;Intersect;(System.Security.IPermission);Argument[this];ReturnValue;taint;df-generated |
+| System.Security.Permissions;FileIOPermission;Copy;();Argument[this];ReturnValue;value;dfc-generated |
+| System.Security.Permissions;FileIOPermission;Intersect;(System.Security.IPermission);Argument[0];ReturnValue;value;dfc-generated |
 | System.Security.Permissions;FileIOPermission;Union;(System.Security.IPermission);Argument[this];ReturnValue;taint;df-generated |
-| System.Security.Permissions;GacIdentityPermission;Copy;();Argument[this];ReturnValue;taint;df-generated |
-| System.Security.Permissions;GacIdentityPermission;Copy;();Argument[this];ReturnValue;value;df-generated |
-| System.Security.Permissions;GacIdentityPermission;Intersect;(System.Security.IPermission);Argument[0];ReturnValue;taint;df-generated |
-| System.Security.Permissions;GacIdentityPermission;Intersect;(System.Security.IPermission);Argument[this];ReturnValue;taint;df-generated |
+| System.Security.Permissions;GacIdentityPermission;Copy;();Argument[this];ReturnValue;value;dfc-generated |
+| System.Security.Permissions;GacIdentityPermission;Intersect;(System.Security.IPermission);Argument[0];ReturnValue;value;dfc-generated |
 | System.Security.Permissions;GacIdentityPermission;Union;(System.Security.IPermission);Argument[this];ReturnValue;taint;df-generated |
-| System.Security.Permissions;IsolatedStorageFilePermission;Copy;();Argument[this];ReturnValue;taint;df-generated |
-| System.Security.Permissions;IsolatedStorageFilePermission;Copy;();Argument[this];ReturnValue;value;df-generated |
-| System.Security.Permissions;IsolatedStorageFilePermission;Intersect;(System.Security.IPermission);Argument[0];ReturnValue;taint;df-generated |
-| System.Security.Permissions;IsolatedStorageFilePermission;Intersect;(System.Security.IPermission);Argument[this];ReturnValue;taint;df-generated |
+| System.Security.Permissions;IsolatedStorageFilePermission;Copy;();Argument[this];ReturnValue;value;dfc-generated |
+| System.Security.Permissions;IsolatedStorageFilePermission;Intersect;(System.Security.IPermission);Argument[0];ReturnValue;value;dfc-generated |
 | System.Security.Permissions;IsolatedStorageFilePermission;Union;(System.Security.IPermission);Argument[this];ReturnValue;taint;df-generated |
-| System.Security.Permissions;KeyContainerPermission;Copy;();Argument[this];ReturnValue;taint;df-generated |
-| System.Security.Permissions;KeyContainerPermission;Copy;();Argument[this];ReturnValue;value;df-generated |
-| System.Security.Permissions;KeyContainerPermission;Intersect;(System.Security.IPermission);Argument[0];ReturnValue;taint;df-generated |
-| System.Security.Permissions;KeyContainerPermission;Intersect;(System.Security.IPermission);Argument[this];ReturnValue;taint;df-generated |
+| System.Security.Permissions;KeyContainerPermission;Copy;();Argument[this];ReturnValue;value;dfc-generated |
+| System.Security.Permissions;KeyContainerPermission;Intersect;(System.Security.IPermission);Argument[0];ReturnValue;value;dfc-generated |
 | System.Security.Permissions;KeyContainerPermission;Union;(System.Security.IPermission);Argument[this];ReturnValue;taint;df-generated |
 | System.Security.Permissions;KeyContainerPermissionAccessEntryCollection;Clear;();Argument[this].WithoutElement;Argument[this];value;manual |
 | System.Security.Permissions;KeyContainerPermissionAccessEntryCollection;CopyTo;(System.Array,System.Int32);Argument[this].Element;Argument[0].Element;value;manual |
 | System.Security.Permissions;KeyContainerPermissionAccessEntryCollection;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.IEnumerator.Current];value;manual |
-| System.Security.Permissions;KeyContainerPermissionAccessEntryCollection;get_SyncRoot;();Argument[this];ReturnValue;taint;df-generated |
-| System.Security.Permissions;KeyContainerPermissionAccessEntryCollection;get_SyncRoot;();Argument[this];ReturnValue;value;df-generated |
+| System.Security.Permissions;KeyContainerPermissionAccessEntryCollection;get_SyncRoot;();Argument[this];ReturnValue;value;dfc-generated |
 | System.Security.Permissions;KeyContainerPermissionAccessEntryEnumerator;get_Current;();Argument[this];ReturnValue;taint;df-generated |
-| System.Security.Permissions;MediaPermission;Copy;();Argument[this];ReturnValue;taint;df-generated |
-| System.Security.Permissions;MediaPermission;Copy;();Argument[this];ReturnValue;value;df-generated |
-| System.Security.Permissions;MediaPermission;Intersect;(System.Security.IPermission);Argument[0];ReturnValue;taint;df-generated |
-| System.Security.Permissions;MediaPermission;Intersect;(System.Security.IPermission);Argument[this];ReturnValue;taint;df-generated |
+| System.Security.Permissions;MediaPermission;Copy;();Argument[this];ReturnValue;value;dfc-generated |
+| System.Security.Permissions;MediaPermission;Intersect;(System.Security.IPermission);Argument[0];ReturnValue;value;dfc-generated |
 | System.Security.Permissions;MediaPermission;Union;(System.Security.IPermission);Argument[this];ReturnValue;taint;df-generated |
-| System.Security.Permissions;PrincipalPermission;Copy;();Argument[this];ReturnValue;taint;df-generated |
-| System.Security.Permissions;PrincipalPermission;Copy;();Argument[this];ReturnValue;value;df-generated |
-| System.Security.Permissions;PrincipalPermission;Intersect;(System.Security.IPermission);Argument[0];ReturnValue;taint;df-generated |
-| System.Security.Permissions;PrincipalPermission;Intersect;(System.Security.IPermission);Argument[this];ReturnValue;taint;df-generated |
+| System.Security.Permissions;PrincipalPermission;Copy;();Argument[this];ReturnValue;value;dfc-generated |
+| System.Security.Permissions;PrincipalPermission;Intersect;(System.Security.IPermission);Argument[0];ReturnValue;value;dfc-generated |
 | System.Security.Permissions;PrincipalPermission;Union;(System.Security.IPermission);Argument[this];ReturnValue;taint;df-generated |
-| System.Security.Permissions;PublisherIdentityPermission;Copy;();Argument[this];ReturnValue;taint;df-generated |
-| System.Security.Permissions;PublisherIdentityPermission;Copy;();Argument[this];ReturnValue;value;df-generated |
-| System.Security.Permissions;PublisherIdentityPermission;Intersect;(System.Security.IPermission);Argument[0];ReturnValue;taint;df-generated |
-| System.Security.Permissions;PublisherIdentityPermission;Intersect;(System.Security.IPermission);Argument[this];ReturnValue;taint;df-generated |
+| System.Security.Permissions;PublisherIdentityPermission;Copy;();Argument[this];ReturnValue;value;dfc-generated |
+| System.Security.Permissions;PublisherIdentityPermission;Intersect;(System.Security.IPermission);Argument[0];ReturnValue;value;dfc-generated |
 | System.Security.Permissions;PublisherIdentityPermission;Union;(System.Security.IPermission);Argument[this];ReturnValue;taint;df-generated |
-| System.Security.Permissions;ReflectionPermission;Copy;();Argument[this];ReturnValue;taint;df-generated |
-| System.Security.Permissions;ReflectionPermission;Copy;();Argument[this];ReturnValue;value;df-generated |
-| System.Security.Permissions;ReflectionPermission;Intersect;(System.Security.IPermission);Argument[0];ReturnValue;taint;df-generated |
-| System.Security.Permissions;ReflectionPermission;Intersect;(System.Security.IPermission);Argument[this];ReturnValue;taint;df-generated |
+| System.Security.Permissions;ReflectionPermission;Copy;();Argument[this];ReturnValue;value;dfc-generated |
+| System.Security.Permissions;ReflectionPermission;Intersect;(System.Security.IPermission);Argument[0];ReturnValue;value;dfc-generated |
 | System.Security.Permissions;ReflectionPermission;Union;(System.Security.IPermission);Argument[this];ReturnValue;taint;df-generated |
-| System.Security.Permissions;RegistryPermission;Copy;();Argument[this];ReturnValue;taint;df-generated |
-| System.Security.Permissions;RegistryPermission;Copy;();Argument[this];ReturnValue;value;df-generated |
-| System.Security.Permissions;RegistryPermission;Intersect;(System.Security.IPermission);Argument[0];ReturnValue;taint;df-generated |
-| System.Security.Permissions;RegistryPermission;Intersect;(System.Security.IPermission);Argument[this];ReturnValue;taint;df-generated |
+| System.Security.Permissions;RegistryPermission;Copy;();Argument[this];ReturnValue;value;dfc-generated |
+| System.Security.Permissions;RegistryPermission;Intersect;(System.Security.IPermission);Argument[0];ReturnValue;value;dfc-generated |
 | System.Security.Permissions;RegistryPermission;Union;(System.Security.IPermission);Argument[this];ReturnValue;taint;df-generated |
-| System.Security.Permissions;ResourcePermissionBase;Copy;();Argument[this];ReturnValue;taint;df-generated |
-| System.Security.Permissions;ResourcePermissionBase;Copy;();Argument[this];ReturnValue;value;df-generated |
-| System.Security.Permissions;ResourcePermissionBase;Intersect;(System.Security.IPermission);Argument[0];ReturnValue;taint;df-generated |
-| System.Security.Permissions;ResourcePermissionBase;Intersect;(System.Security.IPermission);Argument[this];ReturnValue;taint;df-generated |
+| System.Security.Permissions;ResourcePermissionBase;Copy;();Argument[this];ReturnValue;value;dfc-generated |
+| System.Security.Permissions;ResourcePermissionBase;Intersect;(System.Security.IPermission);Argument[0];ReturnValue;value;dfc-generated |
 | System.Security.Permissions;ResourcePermissionBase;Union;(System.Security.IPermission);Argument[this];ReturnValue;taint;df-generated |
-| System.Security.Permissions;SecurityPermission;Copy;();Argument[this];ReturnValue;taint;df-generated |
-| System.Security.Permissions;SecurityPermission;Copy;();Argument[this];ReturnValue;value;df-generated |
-| System.Security.Permissions;SecurityPermission;Intersect;(System.Security.IPermission);Argument[0];ReturnValue;taint;df-generated |
-| System.Security.Permissions;SecurityPermission;Intersect;(System.Security.IPermission);Argument[this];ReturnValue;taint;df-generated |
+| System.Security.Permissions;SecurityPermission;Copy;();Argument[this];ReturnValue;value;dfc-generated |
+| System.Security.Permissions;SecurityPermission;Intersect;(System.Security.IPermission);Argument[0];ReturnValue;value;dfc-generated |
 | System.Security.Permissions;SecurityPermission;Union;(System.Security.IPermission);Argument[this];ReturnValue;taint;df-generated |
-| System.Security.Permissions;SiteIdentityPermission;Copy;();Argument[this];ReturnValue;taint;df-generated |
-| System.Security.Permissions;SiteIdentityPermission;Copy;();Argument[this];ReturnValue;value;df-generated |
-| System.Security.Permissions;SiteIdentityPermission;Intersect;(System.Security.IPermission);Argument[0];ReturnValue;taint;df-generated |
-| System.Security.Permissions;SiteIdentityPermission;Intersect;(System.Security.IPermission);Argument[this];ReturnValue;taint;df-generated |
+| System.Security.Permissions;SiteIdentityPermission;Copy;();Argument[this];ReturnValue;value;dfc-generated |
+| System.Security.Permissions;SiteIdentityPermission;Intersect;(System.Security.IPermission);Argument[0];ReturnValue;value;dfc-generated |
 | System.Security.Permissions;SiteIdentityPermission;Union;(System.Security.IPermission);Argument[this];ReturnValue;taint;df-generated |
-| System.Security.Permissions;StorePermission;Copy;();Argument[this];ReturnValue;taint;df-generated |
-| System.Security.Permissions;StorePermission;Copy;();Argument[this];ReturnValue;value;df-generated |
-| System.Security.Permissions;StorePermission;Intersect;(System.Security.IPermission);Argument[0];ReturnValue;taint;df-generated |
-| System.Security.Permissions;StorePermission;Intersect;(System.Security.IPermission);Argument[this];ReturnValue;taint;df-generated |
+| System.Security.Permissions;StorePermission;Copy;();Argument[this];ReturnValue;value;dfc-generated |
+| System.Security.Permissions;StorePermission;Intersect;(System.Security.IPermission);Argument[0];ReturnValue;value;dfc-generated |
 | System.Security.Permissions;StorePermission;Union;(System.Security.IPermission);Argument[this];ReturnValue;taint;df-generated |
-| System.Security.Permissions;StrongNameIdentityPermission;Copy;();Argument[this];ReturnValue;taint;df-generated |
-| System.Security.Permissions;StrongNameIdentityPermission;Copy;();Argument[this];ReturnValue;value;df-generated |
-| System.Security.Permissions;StrongNameIdentityPermission;Intersect;(System.Security.IPermission);Argument[0];ReturnValue;taint;df-generated |
-| System.Security.Permissions;StrongNameIdentityPermission;Intersect;(System.Security.IPermission);Argument[this];ReturnValue;taint;df-generated |
+| System.Security.Permissions;StrongNameIdentityPermission;Copy;();Argument[this];ReturnValue;value;dfc-generated |
+| System.Security.Permissions;StrongNameIdentityPermission;Intersect;(System.Security.IPermission);Argument[0];ReturnValue;value;dfc-generated |
 | System.Security.Permissions;StrongNameIdentityPermission;Union;(System.Security.IPermission);Argument[this];ReturnValue;taint;df-generated |
-| System.Security.Permissions;TypeDescriptorPermission;Copy;();Argument[this];ReturnValue;taint;df-generated |
-| System.Security.Permissions;TypeDescriptorPermission;Copy;();Argument[this];ReturnValue;value;df-generated |
-| System.Security.Permissions;TypeDescriptorPermission;Intersect;(System.Security.IPermission);Argument[0];ReturnValue;taint;df-generated |
-| System.Security.Permissions;TypeDescriptorPermission;Intersect;(System.Security.IPermission);Argument[this];ReturnValue;taint;df-generated |
+| System.Security.Permissions;TypeDescriptorPermission;Copy;();Argument[this];ReturnValue;value;dfc-generated |
+| System.Security.Permissions;TypeDescriptorPermission;Intersect;(System.Security.IPermission);Argument[0];ReturnValue;value;dfc-generated |
 | System.Security.Permissions;TypeDescriptorPermission;Union;(System.Security.IPermission);Argument[this];ReturnValue;taint;df-generated |
-| System.Security.Permissions;UIPermission;Copy;();Argument[this];ReturnValue;taint;df-generated |
-| System.Security.Permissions;UIPermission;Copy;();Argument[this];ReturnValue;value;df-generated |
-| System.Security.Permissions;UIPermission;Intersect;(System.Security.IPermission);Argument[0];ReturnValue;taint;df-generated |
-| System.Security.Permissions;UIPermission;Intersect;(System.Security.IPermission);Argument[this];ReturnValue;taint;df-generated |
+| System.Security.Permissions;UIPermission;Copy;();Argument[this];ReturnValue;value;dfc-generated |
+| System.Security.Permissions;UIPermission;Intersect;(System.Security.IPermission);Argument[0];ReturnValue;value;dfc-generated |
 | System.Security.Permissions;UIPermission;Union;(System.Security.IPermission);Argument[this];ReturnValue;taint;df-generated |
-| System.Security.Permissions;UrlIdentityPermission;Copy;();Argument[this];ReturnValue;taint;df-generated |
-| System.Security.Permissions;UrlIdentityPermission;Copy;();Argument[this];ReturnValue;value;df-generated |
-| System.Security.Permissions;UrlIdentityPermission;Intersect;(System.Security.IPermission);Argument[0];ReturnValue;taint;df-generated |
-| System.Security.Permissions;UrlIdentityPermission;Intersect;(System.Security.IPermission);Argument[this];ReturnValue;taint;df-generated |
+| System.Security.Permissions;UrlIdentityPermission;Copy;();Argument[this];ReturnValue;value;dfc-generated |
+| System.Security.Permissions;UrlIdentityPermission;Intersect;(System.Security.IPermission);Argument[0];ReturnValue;value;dfc-generated |
 | System.Security.Permissions;UrlIdentityPermission;Union;(System.Security.IPermission);Argument[this];ReturnValue;taint;df-generated |
-| System.Security.Permissions;WebBrowserPermission;Copy;();Argument[this];ReturnValue;taint;df-generated |
-| System.Security.Permissions;WebBrowserPermission;Copy;();Argument[this];ReturnValue;value;df-generated |
-| System.Security.Permissions;WebBrowserPermission;Intersect;(System.Security.IPermission);Argument[0];ReturnValue;taint;df-generated |
-| System.Security.Permissions;WebBrowserPermission;Intersect;(System.Security.IPermission);Argument[this];ReturnValue;taint;df-generated |
+| System.Security.Permissions;WebBrowserPermission;Copy;();Argument[this];ReturnValue;value;dfc-generated |
+| System.Security.Permissions;WebBrowserPermission;Intersect;(System.Security.IPermission);Argument[0];ReturnValue;value;dfc-generated |
 | System.Security.Permissions;WebBrowserPermission;Union;(System.Security.IPermission);Argument[this];ReturnValue;taint;df-generated |
-| System.Security.Permissions;ZoneIdentityPermission;Copy;();Argument[this];ReturnValue;taint;df-generated |
-| System.Security.Permissions;ZoneIdentityPermission;Copy;();Argument[this];ReturnValue;value;df-generated |
-| System.Security.Permissions;ZoneIdentityPermission;Intersect;(System.Security.IPermission);Argument[0];ReturnValue;taint;df-generated |
-| System.Security.Permissions;ZoneIdentityPermission;Intersect;(System.Security.IPermission);Argument[this];ReturnValue;taint;df-generated |
+| System.Security.Permissions;ZoneIdentityPermission;Copy;();Argument[this];ReturnValue;value;dfc-generated |
+| System.Security.Permissions;ZoneIdentityPermission;Intersect;(System.Security.IPermission);Argument[0];ReturnValue;value;dfc-generated |
 | System.Security.Permissions;ZoneIdentityPermission;Union;(System.Security.IPermission);Argument[this];ReturnValue;taint;df-generated |
-| System.Security.Policy;AllMembershipCondition;Copy;();Argument[this];ReturnValue;value;df-generated |
-| System.Security.Policy;ApplicationDirectoryMembershipCondition;Copy;();Argument[this];ReturnValue;value;df-generated |
+| System.Security.Policy;AllMembershipCondition;Copy;();Argument[this];ReturnValue;value;dfc-generated |
+| System.Security.Policy;ApplicationDirectoryMembershipCondition;Copy;();Argument[this];ReturnValue;value;dfc-generated |
 | System.Security.Policy;ApplicationTrustCollection;Clear;();Argument[this].WithoutElement;Argument[this];value;manual |
 | System.Security.Policy;ApplicationTrustCollection;CopyTo;(System.Array,System.Int32);Argument[this].Element;Argument[0].Element;value;manual |
 | System.Security.Policy;ApplicationTrustCollection;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.IEnumerator.Current];value;manual |
-| System.Security.Policy;ApplicationTrustCollection;get_SyncRoot;();Argument[this];ReturnValue;taint;df-generated |
-| System.Security.Policy;ApplicationTrustCollection;get_SyncRoot;();Argument[this];ReturnValue;value;df-generated |
+| System.Security.Policy;ApplicationTrustCollection;get_SyncRoot;();Argument[this];ReturnValue;value;dfc-generated |
 | System.Security.Policy;ApplicationTrustEnumerator;get_Current;();Argument[this];ReturnValue;taint;df-generated |
 | System.Security.Policy;Evidence;Clear;();Argument[this].WithoutElement;Argument[this];value;manual |
 | System.Security.Policy;Evidence;CopyTo;(System.Array,System.Int32);Argument[this].Element;Argument[0].Element;value;manual |
 | System.Security.Policy;Evidence;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.IEnumerator.Current];value;manual |
-| System.Security.Policy;Evidence;get_SyncRoot;();Argument[this];ReturnValue;taint;df-generated |
-| System.Security.Policy;Evidence;get_SyncRoot;();Argument[this];ReturnValue;value;df-generated |
-| System.Security.Policy;GacMembershipCondition;Copy;();Argument[this];ReturnValue;value;df-generated |
+| System.Security.Policy;Evidence;get_SyncRoot;();Argument[this];ReturnValue;value;dfc-generated |
+| System.Security.Policy;GacMembershipCondition;Copy;();Argument[this];ReturnValue;value;dfc-generated |
 | System.Security.Policy;Hash;GetObjectData;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);Argument[this];Argument[0];taint;df-generated |
-| System.Security.Policy;HashMembershipCondition;Copy;();Argument[this];ReturnValue;value;df-generated |
+| System.Security.Policy;HashMembershipCondition;Copy;();Argument[this];ReturnValue;value;dfc-generated |
 | System.Security.Policy;HashMembershipCondition;GetObjectData;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);Argument[this];Argument[0];taint;df-generated |
-| System.Security.Policy;IMembershipCondition;Copy;();Argument[this];ReturnValue;value;df-generated |
-| System.Security.Policy;PolicyStatement;Copy;();Argument[this];ReturnValue;value;df-generated |
-| System.Security.Policy;PublisherMembershipCondition;Copy;();Argument[this];ReturnValue;value;df-generated |
-| System.Security.Policy;SiteMembershipCondition;Copy;();Argument[this];ReturnValue;value;df-generated |
-| System.Security.Policy;StrongNameMembershipCondition;Copy;();Argument[this];ReturnValue;value;df-generated |
-| System.Security.Policy;UrlMembershipCondition;Copy;();Argument[this];ReturnValue;value;df-generated |
-| System.Security.Policy;ZoneMembershipCondition;Copy;();Argument[this];ReturnValue;value;df-generated |
-| System.Security.Principal;GenericIdentity;Clone;();Argument[this];ReturnValue;taint;df-generated |
-| System.Security.Principal;GenericIdentity;GenericIdentity;(System.Security.Principal.GenericIdentity);Argument[0];Argument[this];taint;df-generated |
-| System.Security.Principal;GenericIdentity;GenericIdentity;(System.String);Argument[0];Argument[this];taint;df-generated |
-| System.Security.Principal;GenericIdentity;GenericIdentity;(System.String,System.String);Argument[0];Argument[this];taint;df-generated |
-| System.Security.Principal;GenericIdentity;GenericIdentity;(System.String,System.String);Argument[1];Argument[this];taint;df-generated |
-| System.Security.Principal;GenericIdentity;get_AuthenticationType;();Argument[this];ReturnValue;taint;df-generated |
-| System.Security.Principal;GenericIdentity;get_Claims;();Argument[this];ReturnValue;taint;df-generated |
+| System.Security.Policy;IMembershipCondition;Copy;();Argument[this];ReturnValue;value;dfc-generated |
+| System.Security.Policy;PolicyStatement;Copy;();Argument[this];ReturnValue;value;dfc-generated |
+| System.Security.Policy;PublisherMembershipCondition;Copy;();Argument[this];ReturnValue;value;dfc-generated |
+| System.Security.Policy;SiteMembershipCondition;Copy;();Argument[this];ReturnValue;value;dfc-generated |
+| System.Security.Policy;StrongNameMembershipCondition;Copy;();Argument[this];ReturnValue;value;dfc-generated |
+| System.Security.Policy;UrlMembershipCondition;Copy;();Argument[this];ReturnValue;value;dfc-generated |
+| System.Security.Policy;ZoneMembershipCondition;Copy;();Argument[this];ReturnValue;value;dfc-generated |
+| System.Security.Principal;GenericIdentity;Clone;();Argument[this].SyntheticField[System.Security.Principal.GenericIdentity.m_name];ReturnValue.SyntheticField[System.Security.Principal.GenericIdentity.m_name];value;dfc-generated |
+| System.Security.Principal;GenericIdentity;Clone;();Argument[this].SyntheticField[System.Security.Principal.GenericIdentity.m_type];ReturnValue.SyntheticField[System.Security.Principal.GenericIdentity.m_type];value;dfc-generated |
+| System.Security.Principal;GenericIdentity;GenericIdentity;(System.Security.Principal.GenericIdentity);Argument[0].SyntheticField[System.Security.Principal.GenericIdentity.m_name];Argument[this].SyntheticField[System.Security.Principal.GenericIdentity.m_name];value;dfc-generated |
+| System.Security.Principal;GenericIdentity;GenericIdentity;(System.Security.Principal.GenericIdentity);Argument[0].SyntheticField[System.Security.Principal.GenericIdentity.m_type];Argument[this].SyntheticField[System.Security.Principal.GenericIdentity.m_type];value;dfc-generated |
+| System.Security.Principal;GenericIdentity;GenericIdentity;(System.String);Argument[0];Argument[this].SyntheticField[System.Security.Principal.GenericIdentity.m_name];value;dfc-generated |
+| System.Security.Principal;GenericIdentity;GenericIdentity;(System.String,System.String);Argument[0];Argument[this].SyntheticField[System.Security.Principal.GenericIdentity.m_name];value;dfc-generated |
+| System.Security.Principal;GenericIdentity;GenericIdentity;(System.String,System.String);Argument[1];Argument[this].SyntheticField[System.Security.Principal.GenericIdentity.m_type];value;dfc-generated |
+| System.Security.Principal;GenericIdentity;get_AuthenticationType;();Argument[this].SyntheticField[System.Security.Claims.ClaimsIdentity._authenticationType];ReturnValue;value;dfc-generated |
+| System.Security.Principal;GenericIdentity;get_AuthenticationType;();Argument[this].SyntheticField[System.Security.Principal.GenericIdentity.m_type];ReturnValue;value;dfc-generated |
+| System.Security.Principal;GenericIdentity;get_Claims;();Argument[this].Property[System.Security.Claims.ClaimsIdentity.Claims];ReturnValue;value;dfc-generated |
+| System.Security.Principal;GenericIdentity;get_Claims;();Argument[this].SyntheticField[System.Security.Claims.ClaimsIdentity._instanceClaims].Element;ReturnValue.Element;value;dfc-generated |
+| System.Security.Principal;GenericIdentity;get_Claims;();Argument[this].SyntheticField[System.Security.Claims.ClaimsIdentity._instanceClaims];ReturnValue;value;dfc-generated |
+| System.Security.Principal;GenericIdentity;get_Name;();Argument[this].SyntheticField[System.Security.Principal.GenericIdentity.m_name];ReturnValue;value;df-generated |
+| System.Security.Principal;GenericIdentity;get_Name;();Argument[this].SyntheticField[System.Security.Principal.GenericIdentity.m_name];ReturnValue;value;dfc-generated |
 | System.Security.Principal;GenericIdentity;get_Name;();Argument[this];ReturnValue;taint;df-generated |
-| System.Security.Principal;GenericPrincipal;GenericPrincipal;(System.Security.Principal.IIdentity,System.String[]);Argument[0];Argument[this];taint;df-generated |
-| System.Security.Principal;GenericPrincipal;GenericPrincipal;(System.Security.Principal.IIdentity,System.String[]);Argument[1].Element;Argument[this];taint;df-generated |
-| System.Security.Principal;GenericPrincipal;get_Identity;();Argument[this];ReturnValue;taint;df-generated |
-| System.Security.Principal;IIdentity;get_AuthenticationType;();Argument[this];ReturnValue;taint;df-generated |
+| System.Security.Principal;GenericIdentity;get_Name;();Argument[this];ReturnValue;taint;dfc-generated |
+| System.Security.Principal;GenericPrincipal;GenericPrincipal;(System.Security.Principal.IIdentity,System.String[]);Argument[0];Argument[this].SyntheticField[System.Security.Principal.GenericPrincipal.m_identity];value;dfc-generated |
+| System.Security.Principal;GenericPrincipal;get_Identity;();Argument[this].SyntheticField[System.Security.Claims.ClaimsPrincipal._identities].Element;ReturnValue;value;dfc-generated |
+| System.Security.Principal;GenericPrincipal;get_Identity;();Argument[this].SyntheticField[System.Security.Principal.GenericPrincipal.m_identity];ReturnValue;value;dfc-generated |
 | System.Security.Principal;IIdentity;get_Name;();Argument[this];ReturnValue;taint;df-generated |
-| System.Security.Principal;IPrincipal;get_Identity;();Argument[this];ReturnValue;taint;df-generated |
 | System.Security.Principal;IdentityNotMappedException;GetObjectData;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);Argument[this];Argument[0];taint;df-generated |
 | System.Security.Principal;IdentityReferenceCollection;Add;(System.Security.Principal.IdentityReference);Argument[0];Argument[this].Element;value;manual |
 | System.Security.Principal;IdentityReferenceCollection;Clear;();Argument[this].WithoutElement;Argument[this];value;manual |
 | System.Security.Principal;IdentityReferenceCollection;CopyTo;(System.Security.Principal.IdentityReference[],System.Int32);Argument[this].Element;Argument[0].Element;value;manual |
 | System.Security.Principal;IdentityReferenceCollection;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.Generic.IEnumerator`1.Current];value;manual |
 | System.Security.Principal;IdentityReferenceCollection;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.IEnumerator.Current];value;manual |
-| System.Security.Principal;WindowsIdentity;Clone;();Argument[this];ReturnValue;taint;df-generated |
 | System.Security.Principal;WindowsIdentity;GetObjectData;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);Argument[this];Argument[0];taint;df-generated |
 | System.Security.Principal;WindowsIdentity;RunImpersonated;(Microsoft.Win32.SafeHandles.SafeAccessTokenHandle,System.Action);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
 | System.Security.Principal;WindowsIdentity;RunImpersonated<T>;(Microsoft.Win32.SafeHandles.SafeAccessTokenHandle,System.Func<T>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
 | System.Security.Principal;WindowsIdentity;RunImpersonatedAsync;(Microsoft.Win32.SafeHandles.SafeAccessTokenHandle,System.Func<System.Threading.Tasks.Task>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
 | System.Security.Principal;WindowsIdentity;RunImpersonatedAsync<T>;(Microsoft.Win32.SafeHandles.SafeAccessTokenHandle,System.Func<System.Threading.Tasks.Task<T>>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
-| System.Security.Principal;WindowsIdentity;get_AuthenticationType;();Argument[this];ReturnValue;taint;df-generated |
-| System.Security.Principal;WindowsIdentity;get_Claims;();Argument[this];ReturnValue;taint;df-generated |
+| System.Security.Principal;WindowsIdentity;get_AuthenticationType;();Argument[this].SyntheticField[System.Security.Claims.ClaimsIdentity._authenticationType];ReturnValue;value;dfc-generated |
+| System.Security.Principal;WindowsIdentity;get_Claims;();Argument[this].SyntheticField[System.Security.Claims.ClaimsIdentity._instanceClaims].Element;ReturnValue.Element;value;dfc-generated |
+| System.Security.Principal;WindowsIdentity;get_Claims;();Argument[this].SyntheticField[System.Security.Claims.ClaimsIdentity._instanceClaims];ReturnValue;value;dfc-generated |
 | System.Security.Principal;WindowsIdentity;get_Name;();Argument[this];ReturnValue;taint;df-generated |
-| System.Security.Principal;WindowsPrincipal;get_Identity;();Argument[this];ReturnValue;taint;df-generated |
-| System.Security;CodeAccessPermission;Copy;();Argument[this];ReturnValue;taint;df-generated |
-| System.Security;CodeAccessPermission;Copy;();Argument[this];ReturnValue;value;df-generated |
-| System.Security;CodeAccessPermission;Intersect;(System.Security.IPermission);Argument[0];ReturnValue;taint;df-generated |
-| System.Security;CodeAccessPermission;Intersect;(System.Security.IPermission);Argument[this];ReturnValue;taint;df-generated |
+| System.Security.Principal;WindowsPrincipal;get_Identity;();Argument[this].SyntheticField[System.Security.Claims.ClaimsPrincipal._identities].Element;ReturnValue;value;dfc-generated |
+| System.Security;CodeAccessPermission;Copy;();Argument[this];ReturnValue;value;dfc-generated |
+| System.Security;CodeAccessPermission;Intersect;(System.Security.IPermission);Argument[0];ReturnValue;value;dfc-generated |
 | System.Security;CodeAccessPermission;Union;(System.Security.IPermission);Argument[this];ReturnValue;taint;df-generated |
 | System.Security;HostProtectionException;GetObjectData;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);Argument[this];Argument[0];taint;df-generated |
-| System.Security;IPermission;Copy;();Argument[this];ReturnValue;taint;df-generated |
-| System.Security;IPermission;Copy;();Argument[this];ReturnValue;value;df-generated |
-| System.Security;IPermission;Intersect;(System.Security.IPermission);Argument[0];ReturnValue;taint;df-generated |
-| System.Security;IPermission;Intersect;(System.Security.IPermission);Argument[this];ReturnValue;taint;df-generated |
+| System.Security;IPermission;Copy;();Argument[this];ReturnValue;value;dfc-generated |
+| System.Security;IPermission;Intersect;(System.Security.IPermission);Argument[0];ReturnValue;value;dfc-generated |
 | System.Security;IPermission;Union;(System.Security.IPermission);Argument[this];ReturnValue;taint;df-generated |
 | System.Security;PermissionSet;CopyTo;(System.Array,System.Int32);Argument[this].Element;Argument[0].Element;value;manual |
 | System.Security;PermissionSet;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.IEnumerator.Current];value;manual |
-| System.Security;PermissionSet;get_SyncRoot;();Argument[this];ReturnValue;taint;df-generated |
-| System.Security;PermissionSet;get_SyncRoot;();Argument[this];ReturnValue;value;df-generated |
+| System.Security;PermissionSet;get_SyncRoot;();Argument[this];ReturnValue;value;dfc-generated |
 | System.Security;SecurityContext;Run;(System.Security.SecurityContext,System.Threading.ContextCallback,System.Object);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
-| System.Security;SecurityElement;AddAttribute;(System.String,System.String);Argument[0];Argument[this];taint;df-generated |
-| System.Security;SecurityElement;AddAttribute;(System.String,System.String);Argument[1];Argument[this];taint;df-generated |
-| System.Security;SecurityElement;AddChild;(System.Security.SecurityElement);Argument[0];Argument[this];taint;df-generated |
-| System.Security;SecurityElement;Attribute;(System.String);Argument[this];ReturnValue;taint;df-generated |
-| System.Security;SecurityElement;Copy;();Argument[this];ReturnValue;taint;df-generated |
-| System.Security;SecurityElement;Escape;(System.String);Argument[0];ReturnValue;taint;df-generated |
-| System.Security;SecurityElement;SearchForChildByTag;(System.String);Argument[this];ReturnValue;taint;df-generated |
-| System.Security;SecurityElement;SearchForTextOfTag;(System.String);Argument[this];ReturnValue;taint;df-generated |
-| System.Security;SecurityElement;SecurityElement;(System.String);Argument[0];Argument[this];taint;df-generated |
-| System.Security;SecurityElement;SecurityElement;(System.String,System.String);Argument[0];Argument[this];taint;df-generated |
-| System.Security;SecurityElement;SecurityElement;(System.String,System.String);Argument[1];Argument[this];taint;df-generated |
-| System.Security;SecurityElement;ToString;();Argument[this];ReturnValue;taint;df-generated |
+| System.Security;SecurityElement;AddAttribute;(System.String,System.String);Argument[0];Argument[this].SyntheticField[System.Security.SecurityElement._attributes].Element;value;dfc-generated |
+| System.Security;SecurityElement;AddAttribute;(System.String,System.String);Argument[1];Argument[this].SyntheticField[System.Security.SecurityElement._attributes].Element;value;dfc-generated |
+| System.Security;SecurityElement;AddChild;(System.Security.SecurityElement);Argument[0];Argument[this].SyntheticField[System.Security.SecurityElement._children].Element;value;dfc-generated |
+| System.Security;SecurityElement;Attribute;(System.String);Argument[this].SyntheticField[System.Security.SecurityElement._attributes].Element;ReturnValue;value;dfc-generated |
+| System.Security;SecurityElement;Copy;();Argument[this].SyntheticField[System.Security.SecurityElement._tag];ReturnValue.SyntheticField[System.Security.SecurityElement._tag];value;dfc-generated |
+| System.Security;SecurityElement;Copy;();Argument[this].SyntheticField[System.Security.SecurityElement._text];ReturnValue.SyntheticField[System.Security.SecurityElement._text];value;dfc-generated |
+| System.Security;SecurityElement;Escape;(System.String);Argument[0];ReturnValue;value;dfc-generated |
+| System.Security;SecurityElement;SearchForChildByTag;(System.String);Argument[this].SyntheticField[System.Security.SecurityElement._children].Element;ReturnValue;value;dfc-generated |
+| System.Security;SecurityElement;SearchForTextOfTag;(System.String);Argument[this].SyntheticField[System.Security.SecurityElement._text];ReturnValue;value;dfc-generated |
+| System.Security;SecurityElement;SecurityElement;(System.String);Argument[0];Argument[this].SyntheticField[System.Security.SecurityElement._tag];value;dfc-generated |
+| System.Security;SecurityElement;SecurityElement;(System.String,System.String);Argument[0];Argument[this].SyntheticField[System.Security.SecurityElement._tag];value;dfc-generated |
+| System.Security;SecurityElement;SecurityElement;(System.String,System.String);Argument[1];Argument[this].SyntheticField[System.Security.SecurityElement._text];value;dfc-generated |
+| System.Security;SecurityElement;ToString;();Argument[this].SyntheticField[System.Security.SecurityElement._attributes].Element;ReturnValue;taint;dfc-generated |
+| System.Security;SecurityElement;ToString;();Argument[this].SyntheticField[System.Security.SecurityElement._tag];ReturnValue;taint;dfc-generated |
+| System.Security;SecurityElement;ToString;();Argument[this].SyntheticField[System.Security.SecurityElement._text];ReturnValue;taint;dfc-generated |
 | System.Security;SecurityException;GetObjectData;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);Argument[this];Argument[0];taint;df-generated |
 | System.ServiceProcess;ServiceControllerPermissionEntryCollection;OnInsert;(System.Int32,System.Object);Argument[1];Argument[this];taint;df-generated |
 | System.ServiceProcess;ServiceControllerPermissionEntryCollection;OnSet;(System.Int32,System.Object,System.Object);Argument[2];Argument[this];taint;df-generated |
 | System.Text.Encodings.Web;TextEncoder;Encode;(System.IO.TextWriter,System.Char[],System.Int32,System.Int32);Argument[1].Element;Argument[0];taint;df-generated |
 | System.Text.Encodings.Web;TextEncoder;Encode;(System.IO.TextWriter,System.String);Argument[1];Argument[0];taint;df-generated |
 | System.Text.Encodings.Web;TextEncoder;Encode;(System.IO.TextWriter,System.String,System.Int32,System.Int32);Argument[1];Argument[0];taint;df-generated |
-| System.Text.Encodings.Web;TextEncoder;Encode;(System.ReadOnlySpan<System.Char>,System.Span<System.Char>,System.Int32,System.Int32,System.Boolean);Argument[0];Argument[1];taint;df-generated |
-| System.Text.Encodings.Web;TextEncoder;Encode;(System.String);Argument[0];ReturnValue;taint;df-generated |
-| System.Text.Encodings.Web;TextEncoder;EncodeUtf8;(System.ReadOnlySpan<System.Byte>,System.Span<System.Byte>,System.Int32,System.Int32,System.Boolean);Argument[0];Argument[1];taint;df-generated |
+| System.Text.Encodings.Web;TextEncoder;Encode;(System.ReadOnlySpan<System.Char>,System.Span<System.Char>,System.Int32,System.Int32,System.Boolean);Argument[0].Element;Argument[1].Element;value;dfc-generated |
+| System.Text.Encodings.Web;TextEncoder;Encode;(System.String);Argument[0];ReturnValue;value;dfc-generated |
+| System.Text.Encodings.Web;TextEncoder;EncodeUtf8;(System.ReadOnlySpan<System.Byte>,System.Span<System.Byte>,System.Int32,System.Int32,System.Boolean);Argument[0].Element;Argument[1].Element;value;dfc-generated |
 | System.Text.Json.Nodes;JsonArray;Add;(System.Text.Json.Nodes.JsonNode);Argument[0];Argument[this].Element;value;manual |
 | System.Text.Json.Nodes;JsonArray;Add<T>;(T);Argument[0];Argument[this];taint;df-generated |
 | System.Text.Json.Nodes;JsonArray;Add<T>;(T);Argument[this];Argument[0];taint;df-generated |
@@ -16166,12 +16614,12 @@ summary
 | System.Text.Json.Nodes;JsonArray;Insert;(System.Int32,System.Text.Json.Nodes.JsonNode);Argument[1];Argument[this].Element;value;manual |
 | System.Text.Json.Nodes;JsonArray;JsonArray;(System.Text.Json.Nodes.JsonNodeOptions,System.Text.Json.Nodes.JsonNode[]);Argument[this];Argument[1].Element;taint;df-generated |
 | System.Text.Json.Nodes;JsonArray;JsonArray;(System.Text.Json.Nodes.JsonNode[]);Argument[this];Argument[0].Element;taint;df-generated |
-| System.Text.Json.Nodes;JsonNode;AsArray;();Argument[this];ReturnValue;taint;df-generated |
-| System.Text.Json.Nodes;JsonNode;AsObject;();Argument[this];ReturnValue;taint;df-generated |
-| System.Text.Json.Nodes;JsonNode;AsValue;();Argument[this];ReturnValue;taint;df-generated |
+| System.Text.Json.Nodes;JsonNode;AsArray;();Argument[this];ReturnValue;value;dfc-generated |
+| System.Text.Json.Nodes;JsonNode;AsObject;();Argument[this];ReturnValue;value;dfc-generated |
+| System.Text.Json.Nodes;JsonNode;AsValue;();Argument[this];ReturnValue;value;dfc-generated |
 | System.Text.Json.Nodes;JsonNode;DeepClone;();Argument[this];ReturnValue;taint;df-generated |
 | System.Text.Json.Nodes;JsonNode;GetValue<T>;();Argument[this];ReturnValue;taint;df-generated |
-| System.Text.Json.Nodes;JsonNode;Parse;(System.Text.Json.Utf8JsonReader,System.Nullable<System.Text.Json.Nodes.JsonNodeOptions>);Argument[0];ReturnValue;taint;df-generated |
+| System.Text.Json.Nodes;JsonNode;Parse;(System.Text.Json.Utf8JsonReader,System.Nullable<System.Text.Json.Nodes.JsonNodeOptions>);Argument[0];ReturnValue;value;dfc-generated |
 | System.Text.Json.Nodes;JsonNode;ReplaceWith<T>;(T);Argument[this];Argument[0];taint;df-generated |
 | System.Text.Json.Nodes;JsonNode;ToString;();Argument[this];ReturnValue;taint;df-generated |
 | System.Text.Json.Nodes;JsonNode;get_Item;(System.Int32);Argument[this].Element;ReturnValue;value;manual |
@@ -16189,7 +16637,8 @@ summary
 | System.Text.Json.Nodes;JsonObject;Create;(System.Text.Json.JsonElement,System.Nullable<System.Text.Json.Nodes.JsonNodeOptions>);Argument[0];ReturnValue;taint;df-generated |
 | System.Text.Json.Nodes;JsonObject;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.Generic.IEnumerator`1.Current];value;manual |
 | System.Text.Json.Nodes;JsonObject;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.IEnumerator.Current];value;manual |
-| System.Text.Json.Nodes;JsonObject;JsonObject;(System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<System.String,System.Text.Json.Nodes.JsonNode>>,System.Nullable<System.Text.Json.Nodes.JsonNodeOptions>);Argument[0].Element;Argument[this];taint;df-generated |
+| System.Text.Json.Nodes;JsonObject;JsonObject;(System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<System.String,System.Text.Json.Nodes.JsonNode>>,System.Nullable<System.Text.Json.Nodes.JsonNodeOptions>);Argument[0].Element.Property[System.Collections.Generic.KeyValuePair`2.Key];Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Key];value;dfc-generated |
+| System.Text.Json.Nodes;JsonObject;JsonObject;(System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<System.String,System.Text.Json.Nodes.JsonNode>>,System.Nullable<System.Text.Json.Nodes.JsonNodeOptions>);Argument[0].Element.Property[System.Collections.Generic.KeyValuePair`2.Value];Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Value];value;dfc-generated |
 | System.Text.Json.Nodes;JsonObject;TryGetPropertyValue;(System.String,System.Text.Json.Nodes.JsonNode);Argument[this];ReturnValue;taint;df-generated |
 | System.Text.Json.Nodes;JsonObject;TryGetValue;(System.String,System.Text.Json.Nodes.JsonNode);Argument[this];ReturnValue;taint;df-generated |
 | System.Text.Json.Nodes;JsonObject;get_Keys;();Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Key];ReturnValue.Element;value;manual |
@@ -16251,86 +16700,103 @@ summary
 | System.Text.Json.Serialization.Metadata;JsonTypeInfo<T>;set_CreateObject;(System.Func<T>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Text.Json.Serialization.Metadata;JsonTypeInfoResolver;Combine;(System.Text.Json.Serialization.Metadata.IJsonTypeInfoResolver[]);Argument[0].Element;ReturnValue;taint;df-generated |
 | System.Text.Json.Serialization.Metadata;JsonTypeInfoResolver;WithAddedModifier;(System.Text.Json.Serialization.Metadata.IJsonTypeInfoResolver,System.Action<System.Text.Json.Serialization.Metadata.JsonTypeInfo>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
-| System.Text.Json.Serialization;JsonConverter<T>;ReadAsPropertyName;(System.Text.Json.Utf8JsonReader,System.Type,System.Text.Json.JsonSerializerOptions);Argument[0];ReturnValue;taint;df-generated |
+| System.Text.Json.Serialization;JsonConverter<T>;ReadAsPropertyName;(System.Text.Json.Utf8JsonReader,System.Type,System.Text.Json.JsonSerializerOptions);Argument[0];ReturnValue;value;dfc-generated |
 | System.Text.Json.Serialization;JsonConverterFactory;CreateConverter;(System.Type,System.Text.Json.JsonSerializerOptions);Argument[this];ReturnValue;taint;df-generated |
 | System.Text.Json.Serialization;JsonNumberEnumConverter<TEnum>;CreateConverter;(System.Type,System.Text.Json.JsonSerializerOptions);Argument[this];ReturnValue;taint;df-generated |
 | System.Text.Json.Serialization;JsonSerializerContext;GetTypeInfo;(System.Type,System.Text.Json.JsonSerializerOptions);Argument[1];ReturnValue;taint;df-generated |
 | System.Text.Json.Serialization;JsonSerializerContext;GetTypeInfo;(System.Type,System.Text.Json.JsonSerializerOptions);Argument[this];ReturnValue;taint;df-generated |
-| System.Text.Json.Serialization;JsonSerializerContext;JsonSerializerContext;(System.Text.Json.JsonSerializerOptions);Argument[0];Argument[this];taint;df-generated |
-| System.Text.Json.Serialization;JsonSerializerContext;JsonSerializerContext;(System.Text.Json.JsonSerializerOptions);Argument[this];Argument[0];taint;df-generated |
-| System.Text.Json.Serialization;JsonSerializerContext;get_Options;();Argument[this];ReturnValue;taint;df-generated |
+| System.Text.Json.Serialization;JsonSerializerContext;JsonSerializerContext;(System.Text.Json.JsonSerializerOptions);Argument[0];Argument[this].SyntheticField[System.Text.Json.Serialization.JsonSerializerContext._options];value;dfc-generated |
+| System.Text.Json.Serialization;JsonSerializerContext;get_Options;();Argument[this].SyntheticField[System.Text.Json.Serialization.JsonSerializerContext._options];ReturnValue;value;dfc-generated |
 | System.Text.Json.Serialization;JsonStringEnumConverter;CreateConverter;(System.Type,System.Text.Json.JsonSerializerOptions);Argument[this];ReturnValue;taint;df-generated |
 | System.Text.Json.Serialization;JsonStringEnumConverter;JsonStringEnumConverter;(System.Text.Json.JsonNamingPolicy,System.Boolean);Argument[0];Argument[this];taint;df-generated |
 | System.Text.Json.Serialization;JsonStringEnumConverter<TEnum>;CreateConverter;(System.Type,System.Text.Json.JsonSerializerOptions);Argument[this];ReturnValue;taint;df-generated |
 | System.Text.Json.Serialization;JsonStringEnumConverter<TEnum>;JsonStringEnumConverter;(System.Text.Json.JsonNamingPolicy,System.Boolean);Argument[0];Argument[this];taint;df-generated |
 | System.Text.Json;JsonDocument;Parse;(System.Buffers.ReadOnlySequence<System.Byte>,System.Text.Json.JsonDocumentOptions);Argument[0];ReturnValue;taint;df-generated |
-| System.Text.Json;JsonDocument;Parse;(System.IO.Stream,System.Text.Json.JsonDocumentOptions);Argument[0];ReturnValue;taint;df-generated |
 | System.Text.Json;JsonDocument;Parse;(System.ReadOnlyMemory<System.Byte>,System.Text.Json.JsonDocumentOptions);Argument[0];ReturnValue;taint;df-generated |
-| System.Text.Json;JsonDocument;ParseValue;(System.Text.Json.Utf8JsonReader);Argument[0];ReturnValue;taint;df-generated |
-| System.Text.Json;JsonDocument;TryParseValue;(System.Text.Json.Utf8JsonReader,System.Text.Json.JsonDocument);Argument[0];ReturnValue;taint;df-generated |
+| System.Text.Json;JsonDocument;ParseValue;(System.Text.Json.Utf8JsonReader);Argument[0];ReturnValue;value;dfc-generated |
+| System.Text.Json;JsonDocument;TryParseValue;(System.Text.Json.Utf8JsonReader,System.Text.Json.JsonDocument);Argument[0];ReturnValue;value;dfc-generated |
 | System.Text.Json;JsonDocument;get_RootElement;();Argument[this];ReturnValue;taint;df-generated |
 | System.Text.Json;JsonElement+ArrayEnumerator;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.Generic.IEnumerator`1.Current];value;manual |
 | System.Text.Json;JsonElement+ArrayEnumerator;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.IEnumerator.Current];value;manual |
-| System.Text.Json;JsonElement+ArrayEnumerator;GetEnumerator;();Argument[this];ReturnValue;taint;df-generated |
+| System.Text.Json;JsonElement+ArrayEnumerator;GetEnumerator;();Argument[this];ReturnValue;value;dfc-generated |
+| System.Text.Json;JsonElement+ArrayEnumerator;get_Current;();Argument[this].Property[System.Text.Json.JsonElement+ArrayEnumerator.Current];ReturnValue;value;df-generated |
+| System.Text.Json;JsonElement+ArrayEnumerator;get_Current;();Argument[this].Property[System.Text.Json.JsonElement+ArrayEnumerator.Current];ReturnValue;value;dfc-generated |
 | System.Text.Json;JsonElement+ArrayEnumerator;get_Current;();Argument[this];ReturnValue;taint;df-generated |
+| System.Text.Json;JsonElement+ArrayEnumerator;get_Current;();Argument[this];ReturnValue;taint;dfc-generated |
 | System.Text.Json;JsonElement+ObjectEnumerator;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.Generic.IEnumerator`1.Current];value;manual |
 | System.Text.Json;JsonElement+ObjectEnumerator;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.IEnumerator.Current];value;manual |
-| System.Text.Json;JsonElement+ObjectEnumerator;GetEnumerator;();Argument[this];ReturnValue;taint;df-generated |
+| System.Text.Json;JsonElement+ObjectEnumerator;GetEnumerator;();Argument[this];ReturnValue;value;dfc-generated |
+| System.Text.Json;JsonElement+ObjectEnumerator;get_Current;();Argument[this].Property[System.Text.Json.JsonElement+ObjectEnumerator.Current];ReturnValue;value;df-generated |
+| System.Text.Json;JsonElement+ObjectEnumerator;get_Current;();Argument[this].Property[System.Text.Json.JsonElement+ObjectEnumerator.Current];ReturnValue;value;dfc-generated |
 | System.Text.Json;JsonElement+ObjectEnumerator;get_Current;();Argument[this];ReturnValue;taint;df-generated |
-| System.Text.Json;JsonElement;Clone;();Argument[this];ReturnValue;value;df-generated |
+| System.Text.Json;JsonElement+ObjectEnumerator;get_Current;();Argument[this];ReturnValue;taint;dfc-generated |
+| System.Text.Json;JsonElement;Clone;();Argument[this];ReturnValue;value;dfc-generated |
 | System.Text.Json;JsonElement;EnumerateArray;();Argument[this];ReturnValue;taint;df-generated |
 | System.Text.Json;JsonElement;EnumerateObject;();Argument[this];ReturnValue;taint;df-generated |
 | System.Text.Json;JsonElement;GetProperty;(System.ReadOnlySpan<System.Byte>);Argument[this];ReturnValue;taint;df-generated |
 | System.Text.Json;JsonElement;GetProperty;(System.ReadOnlySpan<System.Char>);Argument[this];ReturnValue;taint;df-generated |
 | System.Text.Json;JsonElement;GetProperty;(System.String);Argument[this];ReturnValue;taint;df-generated |
-| System.Text.Json;JsonElement;ParseValue;(System.Text.Json.Utf8JsonReader);Argument[0];ReturnValue;taint;df-generated |
+| System.Text.Json;JsonElement;ParseValue;(System.Text.Json.Utf8JsonReader);Argument[0];ReturnValue;value;dfc-generated |
 | System.Text.Json;JsonElement;TryGetProperty;(System.ReadOnlySpan<System.Byte>,System.Text.Json.JsonElement);Argument[this];ReturnValue;taint;df-generated |
 | System.Text.Json;JsonElement;TryGetProperty;(System.ReadOnlySpan<System.Char>,System.Text.Json.JsonElement);Argument[this];ReturnValue;taint;df-generated |
 | System.Text.Json;JsonElement;TryGetProperty;(System.String,System.Text.Json.JsonElement);Argument[this];ReturnValue;taint;df-generated |
-| System.Text.Json;JsonElement;TryParseValue;(System.Text.Json.Utf8JsonReader,System.Nullable<System.Text.Json.JsonElement>);Argument[0];ReturnValue;taint;df-generated |
+| System.Text.Json;JsonElement;TryParseValue;(System.Text.Json.Utf8JsonReader,System.Nullable<System.Text.Json.JsonElement>);Argument[0];ReturnValue;value;dfc-generated |
 | System.Text.Json;JsonElement;get_Item;(System.Int32);Argument[this];ReturnValue;taint;df-generated |
 | System.Text.Json;JsonEncodedText;Encode;(System.ReadOnlySpan<System.Byte>,System.Text.Encodings.Web.JavaScriptEncoder);Argument[0];ReturnValue;taint;df-generated |
 | System.Text.Json;JsonEncodedText;ToString;();Argument[this];ReturnValue;taint;df-generated |
-| System.Text.Json;JsonEncodedText;get_EncodedUtf8Bytes;();Argument[this];ReturnValue;taint;df-generated |
 | System.Text.Json;JsonEncodedText;get_Value;();Argument[this];ReturnValue;taint;df-generated |
 | System.Text.Json;JsonException;GetObjectData;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);Argument[this];Argument[0];taint;df-generated |
-| System.Text.Json;JsonException;JsonException;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);Argument[0];Argument[this];taint;df-generated |
-| System.Text.Json;JsonException;JsonException;(System.String);Argument[0];Argument[this];taint;df-generated |
-| System.Text.Json;JsonException;JsonException;(System.String,System.Exception);Argument[0];Argument[this];taint;df-generated |
-| System.Text.Json;JsonException;JsonException;(System.String,System.String,System.Nullable<System.Int64>,System.Nullable<System.Int64>);Argument[0];Argument[this];taint;df-generated |
-| System.Text.Json;JsonException;JsonException;(System.String,System.String,System.Nullable<System.Int64>,System.Nullable<System.Int64>,System.Exception);Argument[0];Argument[this];taint;df-generated |
-| System.Text.Json;JsonException;get_Message;();Argument[this];ReturnValue;taint;df-generated |
-| System.Text.Json;JsonNamingPolicy;ConvertName;(System.String);Argument[0];ReturnValue;taint;df-generated |
+| System.Text.Json;JsonException;JsonException;(System.String);Argument[0];Argument[this].SyntheticField[System.Text.Json.JsonException._message];value;dfc-generated |
+| System.Text.Json;JsonException;JsonException;(System.String,System.Exception);Argument[0];Argument[this].SyntheticField[System.Text.Json.JsonException._message];value;dfc-generated |
+| System.Text.Json;JsonException;JsonException;(System.String,System.String,System.Nullable<System.Int64>,System.Nullable<System.Int64>);Argument[0];Argument[this].SyntheticField[System.Text.Json.JsonException._message];value;dfc-generated |
+| System.Text.Json;JsonException;JsonException;(System.String,System.String,System.Nullable<System.Int64>,System.Nullable<System.Int64>,System.Exception);Argument[0];Argument[this].SyntheticField[System.Text.Json.JsonException._message];value;dfc-generated |
+| System.Text.Json;JsonException;get_Message;();Argument[this].Property[System.Exception.Message];ReturnValue;value;dfc-generated |
+| System.Text.Json;JsonException;get_Message;();Argument[this].SyntheticField[System.Exception._message];ReturnValue;value;dfc-generated |
+| System.Text.Json;JsonException;get_Message;();Argument[this].SyntheticField[System.Text.Json.JsonException._message];ReturnValue;value;dfc-generated |
+| System.Text.Json;JsonNamingPolicy;ConvertName;(System.String);Argument[0];ReturnValue;value;dfc-generated |
 | System.Text.Json;JsonProperty;get_Name;();Argument[this];ReturnValue;taint;df-generated |
-| System.Text.Json;JsonReaderState;JsonReaderState;(System.Text.Json.JsonReaderOptions);Argument[0];Argument[this];taint;df-generated |
-| System.Text.Json;JsonReaderState;get_Options;();Argument[this];ReturnValue;taint;df-generated |
-| System.Text.Json;JsonSerializer;Deserialize;(System.Text.Json.Utf8JsonReader,System.Text.Json.Serialization.Metadata.JsonTypeInfo);Argument[0];ReturnValue;taint;df-generated |
-| System.Text.Json;JsonSerializer;Deserialize;(System.Text.Json.Utf8JsonReader,System.Type,System.Text.Json.JsonSerializerOptions);Argument[0];ReturnValue;taint;df-generated |
-| System.Text.Json;JsonSerializer;Deserialize;(System.Text.Json.Utf8JsonReader,System.Type,System.Text.Json.Serialization.JsonSerializerContext);Argument[0];ReturnValue;taint;df-generated |
-| System.Text.Json;JsonSerializer;Deserialize<TValue>;(System.Text.Json.Utf8JsonReader,System.Text.Json.JsonSerializerOptions);Argument[0];ReturnValue;taint;df-generated |
-| System.Text.Json;JsonSerializer;Deserialize<TValue>;(System.Text.Json.Utf8JsonReader,System.Text.Json.Serialization.Metadata.JsonTypeInfo<TValue>);Argument[0];ReturnValue;taint;df-generated |
+| System.Text.Json;JsonReaderState;JsonReaderState;(System.Text.Json.JsonReaderOptions);Argument[0];Argument[this].SyntheticField[System.Text.Json.JsonReaderState._readerOptions];value;dfc-generated |
+| System.Text.Json;JsonReaderState;get_Options;();Argument[this].SyntheticField[System.Text.Json.JsonReaderState._readerOptions];ReturnValue;value;dfc-generated |
+| System.Text.Json;JsonSerializer;Deserialize;(System.Text.Json.Utf8JsonReader,System.Text.Json.Serialization.Metadata.JsonTypeInfo);Argument[0];ReturnValue;value;dfc-generated |
+| System.Text.Json;JsonSerializer;Deserialize;(System.Text.Json.Utf8JsonReader,System.Type,System.Text.Json.JsonSerializerOptions);Argument[0];ReturnValue;value;dfc-generated |
+| System.Text.Json;JsonSerializer;Deserialize;(System.Text.Json.Utf8JsonReader,System.Type,System.Text.Json.Serialization.JsonSerializerContext);Argument[0];ReturnValue;value;dfc-generated |
+| System.Text.Json;JsonSerializer;Deserialize<TValue>;(System.Text.Json.Utf8JsonReader,System.Text.Json.JsonSerializerOptions);Argument[0];ReturnValue;value;dfc-generated |
+| System.Text.Json;JsonSerializer;Deserialize<TValue>;(System.Text.Json.Utf8JsonReader,System.Text.Json.Serialization.Metadata.JsonTypeInfo<TValue>);Argument[0];ReturnValue;value;dfc-generated |
+| System.Text.Json;JsonSerializer;Serialize;(System.IO.Stream,System.Object,System.Text.Json.Serialization.Metadata.JsonTypeInfo);Argument[1];Argument[2];taint;df-generated |
+| System.Text.Json;JsonSerializer;Serialize;(System.Object,System.Text.Json.Serialization.Metadata.JsonTypeInfo);Argument[0];Argument[1];taint;df-generated |
+| System.Text.Json;JsonSerializer;Serialize;(System.Text.Json.Utf8JsonWriter,System.Object,System.Text.Json.Serialization.Metadata.JsonTypeInfo);Argument[0];Argument[2];taint;df-generated |
+| System.Text.Json;JsonSerializer;Serialize;(System.Text.Json.Utf8JsonWriter,System.Object,System.Text.Json.Serialization.Metadata.JsonTypeInfo);Argument[1];Argument[2];taint;df-generated |
+| System.Text.Json;JsonSerializer;Serialize<TValue>;(System.IO.Stream,TValue,System.Text.Json.Serialization.Metadata.JsonTypeInfo<TValue>);Argument[1];Argument[2];taint;df-generated |
+| System.Text.Json;JsonSerializer;Serialize<TValue>;(System.Text.Json.Utf8JsonWriter,TValue,System.Text.Json.Serialization.Metadata.JsonTypeInfo<TValue>);Argument[0];Argument[2];taint;df-generated |
+| System.Text.Json;JsonSerializer;Serialize<TValue>;(System.Text.Json.Utf8JsonWriter,TValue,System.Text.Json.Serialization.Metadata.JsonTypeInfo<TValue>);Argument[1];Argument[2];taint;df-generated |
+| System.Text.Json;JsonSerializer;Serialize<TValue>;(TValue,System.Text.Json.Serialization.Metadata.JsonTypeInfo<TValue>);Argument[0];Argument[1];taint;df-generated |
+| System.Text.Json;JsonSerializer;SerializeAsync;(System.IO.Stream,System.Object,System.Text.Json.Serialization.Metadata.JsonTypeInfo,System.Threading.CancellationToken);Argument[1];Argument[2];taint;df-generated |
+| System.Text.Json;JsonSerializer;SerializeAsync<TValue>;(System.IO.Stream,TValue,System.Text.Json.Serialization.Metadata.JsonTypeInfo<TValue>,System.Threading.CancellationToken);Argument[1];Argument[2];taint;df-generated |
+| System.Text.Json;JsonSerializer;SerializeToDocument;(System.Object,System.Text.Json.Serialization.Metadata.JsonTypeInfo);Argument[0];Argument[1];taint;df-generated |
+| System.Text.Json;JsonSerializer;SerializeToDocument<TValue>;(TValue,System.Text.Json.Serialization.Metadata.JsonTypeInfo<TValue>);Argument[0];Argument[1];taint;df-generated |
+| System.Text.Json;JsonSerializer;SerializeToElement;(System.Object,System.Text.Json.Serialization.Metadata.JsonTypeInfo);Argument[0];Argument[1];taint;df-generated |
+| System.Text.Json;JsonSerializer;SerializeToElement<TValue>;(TValue,System.Text.Json.Serialization.Metadata.JsonTypeInfo<TValue>);Argument[0];Argument[1];taint;df-generated |
+| System.Text.Json;JsonSerializer;SerializeToNode;(System.Object,System.Text.Json.Serialization.Metadata.JsonTypeInfo);Argument[0];Argument[1];taint;df-generated |
+| System.Text.Json;JsonSerializer;SerializeToNode<TValue>;(TValue,System.Text.Json.Serialization.Metadata.JsonTypeInfo<TValue>);Argument[0];Argument[1];taint;df-generated |
+| System.Text.Json;JsonSerializer;SerializeToUtf8Bytes;(System.Object,System.Text.Json.Serialization.Metadata.JsonTypeInfo);Argument[0];Argument[1];taint;df-generated |
+| System.Text.Json;JsonSerializer;SerializeToUtf8Bytes<TValue>;(TValue,System.Text.Json.Serialization.Metadata.JsonTypeInfo<TValue>);Argument[0];Argument[1];taint;df-generated |
 | System.Text.Json;JsonSerializerOptions;GetConverter;(System.Type);Argument[this];ReturnValue;taint;df-generated |
 | System.Text.Json;JsonSerializerOptions;GetTypeInfo;(System.Type);Argument[this];ReturnValue;taint;df-generated |
 | System.Text.Json;JsonSerializerOptions;JsonSerializerOptions;(System.Text.Json.JsonSerializerOptions);Argument[0];Argument[this];taint;df-generated |
 | System.Text.Json;JsonSerializerOptions;TryGetTypeInfo;(System.Type,System.Text.Json.Serialization.Metadata.JsonTypeInfo);Argument[this];ReturnValue;taint;df-generated |
-| System.Text.Json;Utf8JsonReader;CopyString;(System.Span<System.Byte>);Argument[this];Argument[0];taint;df-generated |
-| System.Text.Json;Utf8JsonReader;GetComment;();Argument[this];ReturnValue;taint;df-generated |
-| System.Text.Json;Utf8JsonReader;GetString;();Argument[this];ReturnValue;taint;df-generated |
-| System.Text.Json;Utf8JsonReader;Utf8JsonReader;(System.Buffers.ReadOnlySequence<System.Byte>,System.Boolean,System.Text.Json.JsonReaderState);Argument[0];Argument[this];taint;df-generated |
-| System.Text.Json;Utf8JsonReader;Utf8JsonReader;(System.Buffers.ReadOnlySequence<System.Byte>,System.Boolean,System.Text.Json.JsonReaderState);Argument[2];Argument[this];taint;df-generated |
-| System.Text.Json;Utf8JsonReader;Utf8JsonReader;(System.ReadOnlySpan<System.Byte>,System.Boolean,System.Text.Json.JsonReaderState);Argument[0];Argument[this];taint;df-generated |
-| System.Text.Json;Utf8JsonReader;Utf8JsonReader;(System.ReadOnlySpan<System.Byte>,System.Boolean,System.Text.Json.JsonReaderState);Argument[2];Argument[this];taint;df-generated |
-| System.Text.Json;Utf8JsonReader;get_CurrentState;();Argument[this];ReturnValue;taint;df-generated |
-| System.Text.Json;Utf8JsonReader;get_Position;();Argument[this];ReturnValue;taint;df-generated |
+| System.Text.Json;Utf8JsonReader;CopyString;(System.Span<System.Byte>);Argument[this].Property[System.Text.Json.Utf8JsonReader.ValueSpan].Element;Argument[0].Element;value;dfc-generated |
+| System.Text.Json;Utf8JsonReader;GetComment;();Argument[this].Property[System.Text.Json.Utf8JsonReader.ValueSpan].Element;ReturnValue;taint;dfc-generated |
+| System.Text.Json;Utf8JsonReader;GetString;();Argument[this].Property[System.Text.Json.Utf8JsonReader.ValueSpan].Element;ReturnValue;taint;dfc-generated |
+| System.Text.Json;Utf8JsonReader;Utf8JsonReader;(System.Buffers.ReadOnlySequence<System.Byte>,System.Boolean,System.Text.Json.JsonReaderState);Argument[2].SyntheticField[System.Text.Json.JsonReaderState._readerOptions];Argument[this].SyntheticField[System.Text.Json.Utf8JsonReader._readerOptions];value;dfc-generated |
+| System.Text.Json;Utf8JsonReader;Utf8JsonReader;(System.ReadOnlySpan<System.Byte>,System.Boolean,System.Text.Json.JsonReaderState);Argument[2].SyntheticField[System.Text.Json.JsonReaderState._readerOptions];Argument[this].SyntheticField[System.Text.Json.Utf8JsonReader._readerOptions];value;dfc-generated |
+| System.Text.Json;Utf8JsonReader;get_CurrentState;();Argument[this].SyntheticField[System.Text.Json.Utf8JsonReader._readerOptions];ReturnValue.SyntheticField[System.Text.Json.JsonReaderState._readerOptions];value;dfc-generated |
 | System.Text.Json;Utf8JsonWriter;DisposeAsync;();Argument[this];ReturnValue;taint;df-generated |
 | System.Text.Json;Utf8JsonWriter;Reset;(System.Buffers.IBufferWriter<System.Byte>);Argument[0];Argument[this];taint;df-generated |
 | System.Text.Json;Utf8JsonWriter;Reset;(System.IO.Stream);Argument[0];Argument[this];taint;df-generated |
-| System.Text.Json;Utf8JsonWriter;Utf8JsonWriter;(System.Buffers.IBufferWriter<System.Byte>,System.Text.Json.JsonWriterOptions);Argument[0];Argument[this];taint;df-generated |
-| System.Text.Json;Utf8JsonWriter;Utf8JsonWriter;(System.Buffers.IBufferWriter<System.Byte>,System.Text.Json.JsonWriterOptions);Argument[1];Argument[this];taint;df-generated |
-| System.Text.Json;Utf8JsonWriter;Utf8JsonWriter;(System.IO.Stream,System.Text.Json.JsonWriterOptions);Argument[0];Argument[this];taint;df-generated |
-| System.Text.Json;Utf8JsonWriter;Utf8JsonWriter;(System.IO.Stream,System.Text.Json.JsonWriterOptions);Argument[1];Argument[this];taint;df-generated |
-| System.Text.Json;Utf8JsonWriter;get_Options;();Argument[this];ReturnValue;taint;df-generated |
-| System.Text.RegularExpressions;Capture;ToString;();Argument[this];ReturnValue;taint;df-generated |
+| System.Text.Json;Utf8JsonWriter;Utf8JsonWriter;(System.Buffers.IBufferWriter<System.Byte>,System.Text.Json.JsonWriterOptions);Argument[1];Argument[this].SyntheticField[System.Text.Json.Utf8JsonWriter._options];value;dfc-generated |
+| System.Text.Json;Utf8JsonWriter;Utf8JsonWriter;(System.IO.Stream,System.Text.Json.JsonWriterOptions);Argument[1];Argument[this].SyntheticField[System.Text.Json.Utf8JsonWriter._options];value;dfc-generated |
+| System.Text.Json;Utf8JsonWriter;get_Options;();Argument[this].SyntheticField[System.Text.Json.Utf8JsonWriter._options];ReturnValue;value;dfc-generated |
+| System.Text.RegularExpressions;Capture;ToString;();Argument[this].Property[System.Text.RegularExpressions.Capture.Value];ReturnValue;value;dfc-generated |
 | System.Text.RegularExpressions;Capture;get_Value;();Argument[this];ReturnValue;taint;df-generated |
 | System.Text.RegularExpressions;CaptureCollection;Add;(System.Object);Argument[0];Argument[this].Element;value;manual |
 | System.Text.RegularExpressions;CaptureCollection;Add;(System.Text.RegularExpressions.Capture);Argument[0];Argument[this].Element;value;manual |
@@ -16341,16 +16807,13 @@ summary
 | System.Text.RegularExpressions;CaptureCollection;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.IEnumerator.Current];value;manual |
 | System.Text.RegularExpressions;CaptureCollection;Insert;(System.Int32,System.Object);Argument[1];Argument[this].Element;value;manual |
 | System.Text.RegularExpressions;CaptureCollection;Insert;(System.Int32,System.Text.RegularExpressions.Capture);Argument[1];Argument[this].Element;value;manual |
-| System.Text.RegularExpressions;CaptureCollection;Remove;(System.Object);Argument[0];Argument[this];taint;df-generated |
-| System.Text.RegularExpressions;CaptureCollection;Remove;(System.Object);Argument[this];Argument[0];taint;df-generated |
 | System.Text.RegularExpressions;CaptureCollection;get_Item;(System.Int32);Argument[this].Element;ReturnValue;value;manual |
-| System.Text.RegularExpressions;CaptureCollection;get_SyncRoot;();Argument[this];ReturnValue;taint;df-generated |
-| System.Text.RegularExpressions;CaptureCollection;get_SyncRoot;();Argument[this];ReturnValue;value;df-generated |
+| System.Text.RegularExpressions;CaptureCollection;get_SyncRoot;();Argument[this];ReturnValue;value;dfc-generated |
 | System.Text.RegularExpressions;CaptureCollection;set_Item;(System.Int32,System.Object);Argument[1];Argument[this].Element;value;manual |
 | System.Text.RegularExpressions;CaptureCollection;set_Item;(System.Int32,System.Text.RegularExpressions.Capture);Argument[1];Argument[this].Element;value;manual |
-| System.Text.RegularExpressions;GeneratedRegexAttribute;GeneratedRegexAttribute;(System.String,System.Text.RegularExpressions.RegexOptions,System.Int32,System.String);Argument[0];Argument[this];taint;df-generated |
-| System.Text.RegularExpressions;GeneratedRegexAttribute;GeneratedRegexAttribute;(System.String,System.Text.RegularExpressions.RegexOptions,System.Int32,System.String);Argument[3];Argument[this];taint;df-generated |
-| System.Text.RegularExpressions;Group;Synchronized;(System.Text.RegularExpressions.Group);Argument[0];ReturnValue;taint;df-generated |
+| System.Text.RegularExpressions;GeneratedRegexAttribute;GeneratedRegexAttribute;(System.String,System.Text.RegularExpressions.RegexOptions,System.Int32,System.String);Argument[0];Argument[this].Property[System.Text.RegularExpressions.GeneratedRegexAttribute.Pattern];value;dfc-generated |
+| System.Text.RegularExpressions;GeneratedRegexAttribute;GeneratedRegexAttribute;(System.String,System.Text.RegularExpressions.RegexOptions,System.Int32,System.String);Argument[3];Argument[this].Property[System.Text.RegularExpressions.GeneratedRegexAttribute.CultureName];value;dfc-generated |
+| System.Text.RegularExpressions;Group;Synchronized;(System.Text.RegularExpressions.Group);Argument[0];ReturnValue;value;dfc-generated |
 | System.Text.RegularExpressions;GroupCollection;Add;(System.Object);Argument[0];Argument[this].Element;value;manual |
 | System.Text.RegularExpressions;GroupCollection;Add;(System.Text.RegularExpressions.Group);Argument[0];Argument[this].Element;value;manual |
 | System.Text.RegularExpressions;GroupCollection;Clear;();Argument[this].WithoutElement;Argument[this];value;manual |
@@ -16360,19 +16823,16 @@ summary
 | System.Text.RegularExpressions;GroupCollection;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.IEnumerator.Current];value;manual |
 | System.Text.RegularExpressions;GroupCollection;Insert;(System.Int32,System.Object);Argument[1];Argument[this].Element;value;manual |
 | System.Text.RegularExpressions;GroupCollection;Insert;(System.Int32,System.Text.RegularExpressions.Group);Argument[1];Argument[this].Element;value;manual |
-| System.Text.RegularExpressions;GroupCollection;Remove;(System.Object);Argument[0];Argument[this];taint;df-generated |
-| System.Text.RegularExpressions;GroupCollection;Remove;(System.Object);Argument[this];Argument[0];taint;df-generated |
-| System.Text.RegularExpressions;GroupCollection;TryGetValue;(System.String,System.Text.RegularExpressions.Group);Argument[this];ReturnValue;taint;df-generated |
+| System.Text.RegularExpressions;GroupCollection;TryGetValue;(System.String,System.Text.RegularExpressions.Group);Argument[this].Element;ReturnValue;value;dfc-generated |
 | System.Text.RegularExpressions;GroupCollection;get_Item;(System.Int32);Argument[this].Element;ReturnValue;value;manual |
 | System.Text.RegularExpressions;GroupCollection;get_Item;(System.String);Argument[this].Element;ReturnValue;value;manual |
 | System.Text.RegularExpressions;GroupCollection;get_Keys;();Argument[this];ReturnValue;taint;df-generated |
-| System.Text.RegularExpressions;GroupCollection;get_SyncRoot;();Argument[this];ReturnValue;taint;df-generated |
-| System.Text.RegularExpressions;GroupCollection;get_SyncRoot;();Argument[this];ReturnValue;value;df-generated |
+| System.Text.RegularExpressions;GroupCollection;get_SyncRoot;();Argument[this];ReturnValue;value;dfc-generated |
 | System.Text.RegularExpressions;GroupCollection;get_Values;();Argument[this];ReturnValue;taint;df-generated |
 | System.Text.RegularExpressions;GroupCollection;set_Item;(System.Int32,System.Object);Argument[1];Argument[this].Element;value;manual |
 | System.Text.RegularExpressions;GroupCollection;set_Item;(System.Int32,System.Text.RegularExpressions.Group);Argument[1];Argument[this].Element;value;manual |
-| System.Text.RegularExpressions;Match;NextMatch;();Argument[this];ReturnValue;taint;df-generated |
-| System.Text.RegularExpressions;Match;Synchronized;(System.Text.RegularExpressions.Match);Argument[0];ReturnValue;taint;df-generated |
+| System.Text.RegularExpressions;Match;NextMatch;();Argument[this];ReturnValue;value;dfc-generated |
+| System.Text.RegularExpressions;Match;Synchronized;(System.Text.RegularExpressions.Match);Argument[0];ReturnValue;value;dfc-generated |
 | System.Text.RegularExpressions;MatchCollection;Add;(System.Object);Argument[0];Argument[this].Element;value;manual |
 | System.Text.RegularExpressions;MatchCollection;Add;(System.Text.RegularExpressions.Match);Argument[0];Argument[this].Element;value;manual |
 | System.Text.RegularExpressions;MatchCollection;Clear;();Argument[this].WithoutElement;Argument[this];value;manual |
@@ -16382,15 +16842,12 @@ summary
 | System.Text.RegularExpressions;MatchCollection;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.IEnumerator.Current];value;manual |
 | System.Text.RegularExpressions;MatchCollection;Insert;(System.Int32,System.Object);Argument[1];Argument[this].Element;value;manual |
 | System.Text.RegularExpressions;MatchCollection;Insert;(System.Int32,System.Text.RegularExpressions.Match);Argument[1];Argument[this].Element;value;manual |
-| System.Text.RegularExpressions;MatchCollection;Remove;(System.Object);Argument[0];Argument[this];taint;df-generated |
-| System.Text.RegularExpressions;MatchCollection;Remove;(System.Object);Argument[this];Argument[0];taint;df-generated |
 | System.Text.RegularExpressions;MatchCollection;get_Item;(System.Int32);Argument[this].Element;ReturnValue;value;manual |
-| System.Text.RegularExpressions;MatchCollection;get_SyncRoot;();Argument[this];ReturnValue;taint;df-generated |
-| System.Text.RegularExpressions;MatchCollection;get_SyncRoot;();Argument[this];ReturnValue;value;df-generated |
+| System.Text.RegularExpressions;MatchCollection;get_SyncRoot;();Argument[this];ReturnValue;value;dfc-generated |
 | System.Text.RegularExpressions;MatchCollection;set_Item;(System.Int32,System.Object);Argument[1];Argument[this].Element;value;manual |
 | System.Text.RegularExpressions;MatchCollection;set_Item;(System.Int32,System.Text.RegularExpressions.Match);Argument[1];Argument[this].Element;value;manual |
 | System.Text.RegularExpressions;MatchEvaluator;BeginInvoke;(System.Text.RegularExpressions.Match,System.AsyncCallback,System.Object);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
-| System.Text.RegularExpressions;Regex+ValueMatchEnumerator;GetEnumerator;();Argument[this];ReturnValue;value;df-generated |
+| System.Text.RegularExpressions;Regex+ValueMatchEnumerator;GetEnumerator;();Argument[this];ReturnValue;value;dfc-generated |
 | System.Text.RegularExpressions;Regex+ValueMatchEnumerator;get_Current;();Argument[this];ReturnValue;taint;df-generated |
 | System.Text.RegularExpressions;Regex;Count;(System.String);Argument[0];Argument[this];taint;df-generated |
 | System.Text.RegularExpressions;Regex;EnumerateMatches;(System.ReadOnlySpan<System.Char>);Argument[0];ReturnValue;taint;df-generated |
@@ -16404,10 +16861,9 @@ summary
 | System.Text.RegularExpressions;Regex;EnumerateMatches;(System.ReadOnlySpan<System.Char>,System.String,System.Text.RegularExpressions.RegexOptions,System.TimeSpan);Argument[0];ReturnValue;taint;df-generated |
 | System.Text.RegularExpressions;Regex;EnumerateMatches;(System.ReadOnlySpan<System.Char>,System.String,System.Text.RegularExpressions.RegexOptions,System.TimeSpan);Argument[1];ReturnValue;taint;df-generated |
 | System.Text.RegularExpressions;Regex;EnumerateMatches;(System.ReadOnlySpan<System.Char>,System.String,System.Text.RegularExpressions.RegexOptions,System.TimeSpan);Argument[3];ReturnValue;taint;df-generated |
-| System.Text.RegularExpressions;Regex;Escape;(System.String);Argument[0];ReturnValue;taint;df-generated |
-| System.Text.RegularExpressions;Regex;GetGroupNames;();Argument[this];ReturnValue;taint;df-generated |
+| System.Text.RegularExpressions;Regex;Escape;(System.String);Argument[0];ReturnValue;value;dfc-generated |
 | System.Text.RegularExpressions;Regex;GetObjectData;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);Argument[this];Argument[0];taint;df-generated |
-| System.Text.RegularExpressions;Regex;GroupNameFromNumber;(System.Int32);Argument[this];ReturnValue;taint;df-generated |
+| System.Text.RegularExpressions;Regex;GroupNameFromNumber;(System.Int32);Argument[this].Field[System.Text.RegularExpressions.Regex.capslist].Element;ReturnValue;value;dfc-generated |
 | System.Text.RegularExpressions;Regex;IsMatch;(System.String);Argument[0];Argument[this];taint;df-generated |
 | System.Text.RegularExpressions;Regex;IsMatch;(System.String,System.Int32);Argument[0];Argument[this];taint;df-generated |
 | System.Text.RegularExpressions;Regex;Match;(System.String);Argument[0];Argument[this];taint;df-generated |
@@ -16424,51 +16880,62 @@ summary
 | System.Text.RegularExpressions;Regex;Matches;(System.String,System.String,System.Text.RegularExpressions.RegexOptions,System.TimeSpan);Argument[0];ReturnValue;taint;df-generated |
 | System.Text.RegularExpressions;Regex;Matches;(System.String,System.String,System.Text.RegularExpressions.RegexOptions,System.TimeSpan);Argument[1];ReturnValue;taint;df-generated |
 | System.Text.RegularExpressions;Regex;Matches;(System.String,System.String,System.Text.RegularExpressions.RegexOptions,System.TimeSpan);Argument[3];ReturnValue;taint;df-generated |
-| System.Text.RegularExpressions;Regex;Replace;(System.String,System.String);Argument[0];Argument[this];taint;df-generated |
-| System.Text.RegularExpressions;Regex;Replace;(System.String,System.String);Argument[0];ReturnValue;taint;df-generated |
-| System.Text.RegularExpressions;Regex;Replace;(System.String,System.String,System.Int32);Argument[0];Argument[this];taint;df-generated |
-| System.Text.RegularExpressions;Regex;Replace;(System.String,System.String,System.Int32);Argument[0];ReturnValue;taint;df-generated |
-| System.Text.RegularExpressions;Regex;Replace;(System.String,System.String,System.Int32,System.Int32);Argument[0];Argument[this];taint;df-generated |
-| System.Text.RegularExpressions;Regex;Replace;(System.String,System.String,System.Int32,System.Int32);Argument[0];ReturnValue;taint;df-generated |
-| System.Text.RegularExpressions;Regex;Replace;(System.String,System.String,System.String);Argument[0];ReturnValue;taint;df-generated |
-| System.Text.RegularExpressions;Regex;Replace;(System.String,System.String,System.String,System.Text.RegularExpressions.RegexOptions);Argument[0];ReturnValue;taint;df-generated |
-| System.Text.RegularExpressions;Regex;Replace;(System.String,System.String,System.String,System.Text.RegularExpressions.RegexOptions,System.TimeSpan);Argument[0];ReturnValue;taint;df-generated |
+| System.Text.RegularExpressions;Regex;Replace;(System.String,System.String);Argument[0];ReturnValue;value;dfc-generated |
+| System.Text.RegularExpressions;Regex;Replace;(System.String,System.String,System.Int32);Argument[0];ReturnValue;value;dfc-generated |
+| System.Text.RegularExpressions;Regex;Replace;(System.String,System.String,System.Int32,System.Int32);Argument[0];ReturnValue;value;dfc-generated |
+| System.Text.RegularExpressions;Regex;Replace;(System.String,System.String,System.String);Argument[0];ReturnValue;value;dfc-generated |
+| System.Text.RegularExpressions;Regex;Replace;(System.String,System.String,System.String,System.Text.RegularExpressions.RegexOptions);Argument[0];ReturnValue;value;dfc-generated |
+| System.Text.RegularExpressions;Regex;Replace;(System.String,System.String,System.String,System.Text.RegularExpressions.RegexOptions,System.TimeSpan);Argument[0];ReturnValue;value;dfc-generated |
+| System.Text.RegularExpressions;Regex;Replace;(System.String,System.String,System.Text.RegularExpressions.MatchEvaluator);Argument[0];ReturnValue;value;dfc-generated |
+| System.Text.RegularExpressions;Regex;Replace;(System.String,System.String,System.Text.RegularExpressions.MatchEvaluator);Argument[0];ReturnValue;value;hq-generated |
+| System.Text.RegularExpressions;Regex;Replace;(System.String,System.String,System.Text.RegularExpressions.MatchEvaluator);Argument[2];Argument[2].Parameter[delegate-self];value;dfc-generated |
 | System.Text.RegularExpressions;Regex;Replace;(System.String,System.String,System.Text.RegularExpressions.MatchEvaluator);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
+| System.Text.RegularExpressions;Regex;Replace;(System.String,System.String,System.Text.RegularExpressions.MatchEvaluator,System.Text.RegularExpressions.RegexOptions);Argument[0];ReturnValue;value;dfc-generated |
+| System.Text.RegularExpressions;Regex;Replace;(System.String,System.String,System.Text.RegularExpressions.MatchEvaluator,System.Text.RegularExpressions.RegexOptions);Argument[0];ReturnValue;value;hq-generated |
+| System.Text.RegularExpressions;Regex;Replace;(System.String,System.String,System.Text.RegularExpressions.MatchEvaluator,System.Text.RegularExpressions.RegexOptions);Argument[2];Argument[2].Parameter[delegate-self];value;dfc-generated |
 | System.Text.RegularExpressions;Regex;Replace;(System.String,System.String,System.Text.RegularExpressions.MatchEvaluator,System.Text.RegularExpressions.RegexOptions);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
+| System.Text.RegularExpressions;Regex;Replace;(System.String,System.String,System.Text.RegularExpressions.MatchEvaluator,System.Text.RegularExpressions.RegexOptions,System.TimeSpan);Argument[0];ReturnValue;value;dfc-generated |
+| System.Text.RegularExpressions;Regex;Replace;(System.String,System.String,System.Text.RegularExpressions.MatchEvaluator,System.Text.RegularExpressions.RegexOptions,System.TimeSpan);Argument[0];ReturnValue;value;hq-generated |
+| System.Text.RegularExpressions;Regex;Replace;(System.String,System.String,System.Text.RegularExpressions.MatchEvaluator,System.Text.RegularExpressions.RegexOptions,System.TimeSpan);Argument[2];Argument[2].Parameter[delegate-self];value;dfc-generated |
 | System.Text.RegularExpressions;Regex;Replace;(System.String,System.String,System.Text.RegularExpressions.MatchEvaluator,System.Text.RegularExpressions.RegexOptions,System.TimeSpan);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
+| System.Text.RegularExpressions;Regex;Replace;(System.String,System.Text.RegularExpressions.MatchEvaluator);Argument[0];ReturnValue;value;dfc-generated |
+| System.Text.RegularExpressions;Regex;Replace;(System.String,System.Text.RegularExpressions.MatchEvaluator);Argument[0];ReturnValue;value;hq-generated |
+| System.Text.RegularExpressions;Regex;Replace;(System.String,System.Text.RegularExpressions.MatchEvaluator);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | System.Text.RegularExpressions;Regex;Replace;(System.String,System.Text.RegularExpressions.MatchEvaluator);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
+| System.Text.RegularExpressions;Regex;Replace;(System.String,System.Text.RegularExpressions.MatchEvaluator,System.Int32);Argument[0];ReturnValue;value;dfc-generated |
+| System.Text.RegularExpressions;Regex;Replace;(System.String,System.Text.RegularExpressions.MatchEvaluator,System.Int32);Argument[0];ReturnValue;value;hq-generated |
+| System.Text.RegularExpressions;Regex;Replace;(System.String,System.Text.RegularExpressions.MatchEvaluator,System.Int32);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | System.Text.RegularExpressions;Regex;Replace;(System.String,System.Text.RegularExpressions.MatchEvaluator,System.Int32);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
+| System.Text.RegularExpressions;Regex;Replace;(System.String,System.Text.RegularExpressions.MatchEvaluator,System.Int32,System.Int32);Argument[0];ReturnValue;value;dfc-generated |
+| System.Text.RegularExpressions;Regex;Replace;(System.String,System.Text.RegularExpressions.MatchEvaluator,System.Int32,System.Int32);Argument[0];ReturnValue;value;hq-generated |
+| System.Text.RegularExpressions;Regex;Replace;(System.String,System.Text.RegularExpressions.MatchEvaluator,System.Int32,System.Int32);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | System.Text.RegularExpressions;Regex;Replace;(System.String,System.Text.RegularExpressions.MatchEvaluator,System.Int32,System.Int32);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
-| System.Text.RegularExpressions;Regex;Split;(System.String);Argument[0];Argument[this];taint;df-generated |
-| System.Text.RegularExpressions;Regex;Split;(System.String);Argument[0];ReturnValue;taint;df-generated |
-| System.Text.RegularExpressions;Regex;Split;(System.String,System.Int32);Argument[0];Argument[this];taint;df-generated |
-| System.Text.RegularExpressions;Regex;Split;(System.String,System.Int32);Argument[0];ReturnValue;taint;df-generated |
-| System.Text.RegularExpressions;Regex;Split;(System.String,System.Int32,System.Int32);Argument[0];Argument[this];taint;df-generated |
-| System.Text.RegularExpressions;Regex;Split;(System.String,System.Int32,System.Int32);Argument[0];ReturnValue;taint;df-generated |
-| System.Text.RegularExpressions;Regex;Split;(System.String,System.String);Argument[0];ReturnValue;taint;df-generated |
-| System.Text.RegularExpressions;Regex;Split;(System.String,System.String,System.Text.RegularExpressions.RegexOptions);Argument[0];ReturnValue;taint;df-generated |
-| System.Text.RegularExpressions;Regex;Split;(System.String,System.String,System.Text.RegularExpressions.RegexOptions,System.TimeSpan);Argument[0];ReturnValue;taint;df-generated |
-| System.Text.RegularExpressions;Regex;ToString;();Argument[this];ReturnValue;taint;df-generated |
-| System.Text.RegularExpressions;Regex;Unescape;(System.String);Argument[0];ReturnValue;taint;df-generated |
-| System.Text.RegularExpressions;Regex;get_MatchTimeout;();Argument[this];ReturnValue;taint;df-generated |
+| System.Text.RegularExpressions;Regex;Split;(System.String);Argument[0];ReturnValue.Element;value;dfc-generated |
+| System.Text.RegularExpressions;Regex;Split;(System.String,System.Int32);Argument[0];ReturnValue.Element;value;dfc-generated |
+| System.Text.RegularExpressions;Regex;Split;(System.String,System.Int32,System.Int32);Argument[0];ReturnValue.Element;value;dfc-generated |
+| System.Text.RegularExpressions;Regex;Split;(System.String,System.String);Argument[0];ReturnValue.Element;value;dfc-generated |
+| System.Text.RegularExpressions;Regex;Split;(System.String,System.String,System.Text.RegularExpressions.RegexOptions);Argument[0];ReturnValue.Element;value;dfc-generated |
+| System.Text.RegularExpressions;Regex;Split;(System.String,System.String,System.Text.RegularExpressions.RegexOptions,System.TimeSpan);Argument[0];ReturnValue.Element;value;dfc-generated |
+| System.Text.RegularExpressions;Regex;ToString;();Argument[this].Field[System.Text.RegularExpressions.Regex.pattern];ReturnValue;value;dfc-generated |
+| System.Text.RegularExpressions;Regex;Unescape;(System.String);Argument[0];ReturnValue;value;dfc-generated |
+| System.Text.RegularExpressions;Regex;get_MatchTimeout;();Argument[this].Field[System.Text.RegularExpressions.Regex.internalMatchTimeout];ReturnValue;value;dfc-generated |
 | System.Text.RegularExpressions;RegexCompilationInfo;RegexCompilationInfo;(System.String,System.Text.RegularExpressions.RegexOptions,System.String,System.String,System.Boolean,System.TimeSpan);Argument[0];Argument[this];taint;df-generated |
 | System.Text.RegularExpressions;RegexCompilationInfo;RegexCompilationInfo;(System.String,System.Text.RegularExpressions.RegexOptions,System.String,System.String,System.Boolean,System.TimeSpan);Argument[2];Argument[this];taint;df-generated |
 | System.Text.RegularExpressions;RegexCompilationInfo;RegexCompilationInfo;(System.String,System.Text.RegularExpressions.RegexOptions,System.String,System.String,System.Boolean,System.TimeSpan);Argument[3];Argument[this];taint;df-generated |
 | System.Text.RegularExpressions;RegexCompilationInfo;RegexCompilationInfo;(System.String,System.Text.RegularExpressions.RegexOptions,System.String,System.String,System.Boolean,System.TimeSpan);Argument[5];Argument[this];taint;df-generated |
 | System.Text.RegularExpressions;RegexMatchTimeoutException;GetObjectData;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);Argument[this];Argument[0];taint;df-generated |
 | System.Text.RegularExpressions;RegexParseException;GetObjectData;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);Argument[this];Argument[0];taint;df-generated |
-| System.Text.RegularExpressions;RegexRunner;Scan;(System.Text.RegularExpressions.Regex,System.String,System.Int32,System.Int32,System.Int32,System.Int32,System.Boolean);Argument[0];Argument[this];taint;df-generated |
-| System.Text.RegularExpressions;RegexRunner;Scan;(System.Text.RegularExpressions.Regex,System.String,System.Int32,System.Int32,System.Int32,System.Int32,System.Boolean);Argument[0];ReturnValue;taint;df-generated |
-| System.Text.RegularExpressions;RegexRunner;Scan;(System.Text.RegularExpressions.Regex,System.String,System.Int32,System.Int32,System.Int32,System.Int32,System.Boolean);Argument[1];Argument[this];taint;df-generated |
-| System.Text.RegularExpressions;RegexRunner;Scan;(System.Text.RegularExpressions.Regex,System.String,System.Int32,System.Int32,System.Int32,System.Int32,System.Boolean);Argument[this];ReturnValue;taint;df-generated |
-| System.Text.RegularExpressions;RegexRunner;Scan;(System.Text.RegularExpressions.Regex,System.String,System.Int32,System.Int32,System.Int32,System.Int32,System.Boolean,System.TimeSpan);Argument[0];Argument[this];taint;df-generated |
-| System.Text.RegularExpressions;RegexRunner;Scan;(System.Text.RegularExpressions.Regex,System.String,System.Int32,System.Int32,System.Int32,System.Int32,System.Boolean,System.TimeSpan);Argument[0];ReturnValue;taint;df-generated |
-| System.Text.RegularExpressions;RegexRunner;Scan;(System.Text.RegularExpressions.Regex,System.String,System.Int32,System.Int32,System.Int32,System.Int32,System.Boolean,System.TimeSpan);Argument[1];Argument[this];taint;df-generated |
-| System.Text.RegularExpressions;RegexRunner;Scan;(System.Text.RegularExpressions.Regex,System.String,System.Int32,System.Int32,System.Int32,System.Int32,System.Boolean,System.TimeSpan);Argument[this];ReturnValue;taint;df-generated |
+| System.Text.RegularExpressions;RegexRunner;Scan;(System.ReadOnlySpan<System.Char>);Argument[0];Argument[this];taint;df-generated |
+| System.Text.RegularExpressions;RegexRunner;Scan;(System.Text.RegularExpressions.Regex,System.String,System.Int32,System.Int32,System.Int32,System.Int32,System.Boolean);Argument[1];Argument[this].Field[System.Text.RegularExpressions.RegexRunner.runtext];value;dfc-generated |
+| System.Text.RegularExpressions;RegexRunner;Scan;(System.Text.RegularExpressions.Regex,System.String,System.Int32,System.Int32,System.Int32,System.Int32,System.Boolean);Argument[this].Field[System.Text.RegularExpressions.RegexRunner.runmatch];ReturnValue;value;dfc-generated |
+| System.Text.RegularExpressions;RegexRunner;Scan;(System.Text.RegularExpressions.Regex,System.String,System.Int32,System.Int32,System.Int32,System.Int32,System.Boolean,System.TimeSpan);Argument[1];Argument[this].Field[System.Text.RegularExpressions.RegexRunner.runtext];value;dfc-generated |
+| System.Text.RegularExpressions;RegexRunner;Scan;(System.Text.RegularExpressions.Regex,System.String,System.Int32,System.Int32,System.Int32,System.Int32,System.Boolean,System.TimeSpan);Argument[this].Field[System.Text.RegularExpressions.RegexRunner.runmatch];ReturnValue;value;dfc-generated |
 | System.Text.RegularExpressions;RegexRunnerFactory;CreateInstance;();Argument[this];ReturnValue;taint;df-generated |
 | System.Text.Unicode;Utf8+TryWriteInterpolatedStringHandler;TryWriteInterpolatedStringHandler;(System.Int32,System.Int32,System.Span<System.Byte>,System.Boolean);Argument[2];Argument[this];taint;df-generated |
 | System.Text.Unicode;Utf8+TryWriteInterpolatedStringHandler;TryWriteInterpolatedStringHandler;(System.Int32,System.Int32,System.Span<System.Byte>,System.IFormatProvider,System.Boolean);Argument[2];Argument[this];taint;df-generated |
 | System.Text.Unicode;Utf8+TryWriteInterpolatedStringHandler;TryWriteInterpolatedStringHandler;(System.Int32,System.Int32,System.Span<System.Byte>,System.IFormatProvider,System.Boolean);Argument[3];Argument[this];taint;df-generated |
+| System.Text.Unicode;Utf8;TryWrite;(System.Span<System.Byte>,System.IFormatProvider,System.Text.Unicode.Utf8+TryWriteInterpolatedStringHandler,System.Int32);Argument[2];ReturnValue;value;dfc-generated |
+| System.Text.Unicode;Utf8;TryWrite;(System.Span<System.Byte>,System.Text.Unicode.Utf8+TryWriteInterpolatedStringHandler,System.Int32);Argument[1];ReturnValue;value;dfc-generated |
 | System.Text;ASCIIEncoding;GetBytes;(System.Char*,System.Int32,System.Byte*,System.Int32);Argument[0];ReturnValue;taint;manual |
 | System.Text;ASCIIEncoding;GetBytes;(System.Char[],System.Int32,System.Int32,System.Byte[],System.Int32);Argument[0].Element;ReturnValue;taint;manual |
 | System.Text;ASCIIEncoding;GetBytes;(System.ReadOnlySpan<System.Char>,System.Span<System.Byte>);Argument[0];ReturnValue;taint;manual |
@@ -16479,25 +16946,23 @@ summary
 | System.Text;ASCIIEncoding;GetDecoder;();Argument[this];ReturnValue;taint;df-generated |
 | System.Text;ASCIIEncoding;GetEncoder;();Argument[this];ReturnValue;taint;df-generated |
 | System.Text;ASCIIEncoding;GetString;(System.Byte[],System.Int32,System.Int32);Argument[0].Element;ReturnValue;taint;manual |
-| System.Text;CodePagesEncodingProvider;GetEncodings;();Argument[this];ReturnValue;taint;df-generated |
 | System.Text;Decoder;get_FallbackBuffer;();Argument[this];ReturnValue;taint;df-generated |
 | System.Text;DecoderExceptionFallback;CreateFallbackBuffer;();Argument[this];ReturnValue;taint;df-generated |
 | System.Text;DecoderFallback;CreateFallbackBuffer;();Argument[this];ReturnValue;taint;df-generated |
-| System.Text;DecoderFallbackException;DecoderFallbackException;(System.String,System.Byte[],System.Int32);Argument[1].Element;Argument[this];taint;df-generated |
-| System.Text;DecoderFallbackException;get_BytesUnknown;();Argument[this];ReturnValue;taint;df-generated |
+| System.Text;DecoderFallbackException;DecoderFallbackException;(System.String,System.Byte[],System.Int32);Argument[1];Argument[this].SyntheticField[System.Text.DecoderFallbackException._bytesUnknown];value;dfc-generated |
+| System.Text;DecoderFallbackException;get_BytesUnknown;();Argument[this].SyntheticField[System.Text.DecoderFallbackException._bytesUnknown];ReturnValue;value;dfc-generated |
 | System.Text;DecoderReplacementFallback;CreateFallbackBuffer;();Argument[this];ReturnValue;taint;df-generated |
-| System.Text;DecoderReplacementFallback;DecoderReplacementFallback;(System.String);Argument[0];Argument[this];taint;df-generated |
-| System.Text;DecoderReplacementFallback;get_DefaultString;();Argument[this];ReturnValue;taint;df-generated |
+| System.Text;DecoderReplacementFallback;DecoderReplacementFallback;(System.String);Argument[0];Argument[this].SyntheticField[System.Text.DecoderReplacementFallback._strDefault];value;dfc-generated |
+| System.Text;DecoderReplacementFallback;get_DefaultString;();Argument[this].SyntheticField[System.Text.DecoderReplacementFallback._strDefault];ReturnValue;value;dfc-generated |
 | System.Text;DecoderReplacementFallbackBuffer;DecoderReplacementFallbackBuffer;(System.Text.DecoderReplacementFallback);Argument[0];Argument[this];taint;df-generated |
 | System.Text;Encoder;get_FallbackBuffer;();Argument[this];ReturnValue;taint;df-generated |
 | System.Text;EncoderExceptionFallback;CreateFallbackBuffer;();Argument[this];ReturnValue;taint;df-generated |
 | System.Text;EncoderFallback;CreateFallbackBuffer;();Argument[this];ReturnValue;taint;df-generated |
 | System.Text;EncoderReplacementFallback;CreateFallbackBuffer;();Argument[this];ReturnValue;taint;df-generated |
-| System.Text;EncoderReplacementFallback;EncoderReplacementFallback;(System.String);Argument[0];Argument[this];taint;df-generated |
-| System.Text;EncoderReplacementFallback;get_DefaultString;();Argument[this];ReturnValue;taint;df-generated |
+| System.Text;EncoderReplacementFallback;EncoderReplacementFallback;(System.String);Argument[0];Argument[this].SyntheticField[System.Text.EncoderReplacementFallback._strDefault];value;dfc-generated |
+| System.Text;EncoderReplacementFallback;get_DefaultString;();Argument[this].SyntheticField[System.Text.EncoderReplacementFallback._strDefault];ReturnValue;value;dfc-generated |
 | System.Text;EncoderReplacementFallbackBuffer;EncoderReplacementFallbackBuffer;(System.Text.EncoderReplacementFallback);Argument[0];Argument[this];taint;df-generated |
-| System.Text;Encoding;Clone;();Argument[this];ReturnValue;taint;df-generated |
-| System.Text;Encoding;Clone;();Argument[this];ReturnValue;value;df-generated |
+| System.Text;Encoding;Clone;();Argument[this];ReturnValue;value;dfc-generated |
 | System.Text;Encoding;Convert;(System.Text.Encoding,System.Text.Encoding,System.Byte[]);Argument[2].Element;ReturnValue;taint;df-generated |
 | System.Text;Encoding;Convert;(System.Text.Encoding,System.Text.Encoding,System.Byte[],System.Int32,System.Int32);Argument[2].Element;ReturnValue;taint;df-generated |
 | System.Text;Encoding;CreateTranscodingStream;(System.IO.Stream,System.Text.Encoding,System.Text.Encoding,System.Boolean);Argument[0];ReturnValue;taint;df-generated |
@@ -16532,18 +16997,18 @@ summary
 | System.Text;Encoding;get_EncodingName;();Argument[this];ReturnValue;taint;df-generated |
 | System.Text;Encoding;get_HeaderName;();Argument[this];ReturnValue;taint;df-generated |
 | System.Text;Encoding;get_WebName;();Argument[this];ReturnValue;taint;df-generated |
-| System.Text;EncodingExtensions;GetString;(System.Text.Encoding,System.Buffers.ReadOnlySequence<System.Byte>);Argument[1];ReturnValue;taint;df-generated |
+| System.Text;EncodingExtensions;GetString;(System.Text.Encoding,System.Buffers.ReadOnlySequence<System.Byte>);Argument[1].Property[System.Buffers.ReadOnlySequence`1.FirstSpan].Element;ReturnValue;taint;dfc-generated |
 | System.Text;EncodingInfo;EncodingInfo;(System.Text.EncodingProvider,System.Int32,System.String,System.String);Argument[0];Argument[this];taint;df-generated |
 | System.Text;EncodingProvider;GetEncoding;(System.Int32,System.Text.EncoderFallback,System.Text.DecoderFallback);Argument[1];ReturnValue;taint;df-generated |
 | System.Text;EncodingProvider;GetEncoding;(System.Int32,System.Text.EncoderFallback,System.Text.DecoderFallback);Argument[2];ReturnValue;taint;df-generated |
 | System.Text;EncodingProvider;GetEncoding;(System.String,System.Text.EncoderFallback,System.Text.DecoderFallback);Argument[1];ReturnValue;taint;df-generated |
 | System.Text;EncodingProvider;GetEncoding;(System.String,System.Text.EncoderFallback,System.Text.DecoderFallback);Argument[2];ReturnValue;taint;df-generated |
-| System.Text;EncodingProvider;GetEncodings;();Argument[this];ReturnValue;taint;df-generated |
-| System.Text;Rune;ToString;(System.String,System.IFormatProvider);Argument[1];ReturnValue;taint;df-generated |
-| System.Text;Rune;ToString;(System.String,System.IFormatProvider);Argument[this];ReturnValue;taint;df-generated |
-| System.Text;SpanLineEnumerator;GetEnumerator;();Argument[this];ReturnValue;value;df-generated |
-| System.Text;SpanLineEnumerator;get_Current;();Argument[this];ReturnValue;taint;df-generated |
-| System.Text;SpanRuneEnumerator;GetEnumerator;();Argument[this];ReturnValue;value;df-generated |
+| System.Text;Rune;ToString;(System.String,System.IFormatProvider);Argument[this];ReturnValue;taint;dfc-generated |
+| System.Text;SpanLineEnumerator;GetEnumerator;();Argument[this];ReturnValue;value;dfc-generated |
+| System.Text;SpanLineEnumerator;MoveNext;();Argument[this].SyntheticField[System.Text.SpanLineEnumerator._remaining].Element;Argument[this].SyntheticField[System.Text.SpanLineEnumerator._current].Element;value;dfc-generated |
+| System.Text;SpanLineEnumerator;MoveNext;();Argument[this].SyntheticField[System.Text.SpanLineEnumerator._remaining];Argument[this].SyntheticField[System.Text.SpanLineEnumerator._current];value;dfc-generated |
+| System.Text;SpanLineEnumerator;get_Current;();Argument[this].SyntheticField[System.Text.SpanLineEnumerator._current];ReturnValue;value;dfc-generated |
+| System.Text;SpanRuneEnumerator;GetEnumerator;();Argument[this];ReturnValue;value;dfc-generated |
 | System.Text;SpanRuneEnumerator;get_Current;();Argument[this];ReturnValue;taint;df-generated |
 | System.Text;StringBuilder+AppendInterpolatedStringHandler;AppendFormatted;(System.String);Argument[0];Argument[this];taint;df-generated |
 | System.Text;StringBuilder+AppendInterpolatedStringHandler;AppendFormatted<T>;(T);Argument[0];Argument[this];taint;df-generated |
@@ -16552,7 +17017,7 @@ summary
 | System.Text;StringBuilder+AppendInterpolatedStringHandler;AppendInterpolatedStringHandler;(System.Int32,System.Int32,System.Text.StringBuilder,System.IFormatProvider);Argument[2];Argument[this];taint;df-generated |
 | System.Text;StringBuilder+AppendInterpolatedStringHandler;AppendInterpolatedStringHandler;(System.Int32,System.Int32,System.Text.StringBuilder,System.IFormatProvider);Argument[3];Argument[this];taint;df-generated |
 | System.Text;StringBuilder+AppendInterpolatedStringHandler;AppendLiteral;(System.String);Argument[0];Argument[this];taint;df-generated |
-| System.Text;StringBuilder+ChunkEnumerator;GetEnumerator;();Argument[this];ReturnValue;value;df-generated |
+| System.Text;StringBuilder+ChunkEnumerator;GetEnumerator;();Argument[this];ReturnValue;value;dfc-generated |
 | System.Text;StringBuilder+ChunkEnumerator;get_Current;();Argument[this];ReturnValue;taint;df-generated |
 | System.Text;StringBuilder;Append;(System.Boolean);Argument[this];ReturnValue;value;manual |
 | System.Text;StringBuilder;Append;(System.Byte);Argument[this];ReturnValue;value;manual |
@@ -16604,12 +17069,8 @@ summary
 | System.Text;StringBuilder;AppendFormat;(System.IFormatProvider,System.String,System.Object[]);Argument[1];Argument[this];taint;manual |
 | System.Text;StringBuilder;AppendFormat;(System.IFormatProvider,System.String,System.Object[]);Argument[2].Element;Argument[this];taint;manual |
 | System.Text;StringBuilder;AppendFormat;(System.IFormatProvider,System.String,System.Object[]);Argument[this];ReturnValue;value;manual |
-| System.Text;StringBuilder;AppendFormat;(System.IFormatProvider,System.Text.CompositeFormat,System.Object[]);Argument[0];Argument[this];taint;df-generated |
-| System.Text;StringBuilder;AppendFormat;(System.IFormatProvider,System.Text.CompositeFormat,System.Object[]);Argument[0];ReturnValue;taint;df-generated |
-| System.Text;StringBuilder;AppendFormat;(System.IFormatProvider,System.Text.CompositeFormat,System.Object[]);Argument[this];ReturnValue;taint;df-generated |
-| System.Text;StringBuilder;AppendFormat;(System.IFormatProvider,System.Text.CompositeFormat,System.ReadOnlySpan<System.Object>);Argument[0];Argument[this];taint;df-generated |
-| System.Text;StringBuilder;AppendFormat;(System.IFormatProvider,System.Text.CompositeFormat,System.ReadOnlySpan<System.Object>);Argument[0];ReturnValue;taint;df-generated |
-| System.Text;StringBuilder;AppendFormat;(System.IFormatProvider,System.Text.CompositeFormat,System.ReadOnlySpan<System.Object>);Argument[this];ReturnValue;taint;df-generated |
+| System.Text;StringBuilder;AppendFormat;(System.IFormatProvider,System.Text.CompositeFormat,System.Object[]);Argument[this];ReturnValue;value;dfc-generated |
+| System.Text;StringBuilder;AppendFormat;(System.IFormatProvider,System.Text.CompositeFormat,System.ReadOnlySpan<System.Object>);Argument[this];ReturnValue;value;dfc-generated |
 | System.Text;StringBuilder;AppendFormat;(System.String,System.Object);Argument[0];Argument[this];taint;manual |
 | System.Text;StringBuilder;AppendFormat;(System.String,System.Object);Argument[1];Argument[this];taint;manual |
 | System.Text;StringBuilder;AppendFormat;(System.String,System.Object);Argument[this];ReturnValue;value;manual |
@@ -16625,15 +17086,9 @@ summary
 | System.Text;StringBuilder;AppendFormat;(System.String,System.Object[]);Argument[0];Argument[this];taint;manual |
 | System.Text;StringBuilder;AppendFormat;(System.String,System.Object[]);Argument[1].Element;Argument[this];taint;manual |
 | System.Text;StringBuilder;AppendFormat;(System.String,System.Object[]);Argument[this];ReturnValue;value;manual |
-| System.Text;StringBuilder;AppendFormat<TArg0,TArg1,TArg2>;(System.IFormatProvider,System.Text.CompositeFormat,TArg0,TArg1,TArg2);Argument[0];Argument[this];taint;df-generated |
-| System.Text;StringBuilder;AppendFormat<TArg0,TArg1,TArg2>;(System.IFormatProvider,System.Text.CompositeFormat,TArg0,TArg1,TArg2);Argument[0];ReturnValue;taint;df-generated |
-| System.Text;StringBuilder;AppendFormat<TArg0,TArg1,TArg2>;(System.IFormatProvider,System.Text.CompositeFormat,TArg0,TArg1,TArg2);Argument[this];ReturnValue;taint;df-generated |
-| System.Text;StringBuilder;AppendFormat<TArg0,TArg1>;(System.IFormatProvider,System.Text.CompositeFormat,TArg0,TArg1);Argument[0];Argument[this];taint;df-generated |
-| System.Text;StringBuilder;AppendFormat<TArg0,TArg1>;(System.IFormatProvider,System.Text.CompositeFormat,TArg0,TArg1);Argument[0];ReturnValue;taint;df-generated |
-| System.Text;StringBuilder;AppendFormat<TArg0,TArg1>;(System.IFormatProvider,System.Text.CompositeFormat,TArg0,TArg1);Argument[this];ReturnValue;taint;df-generated |
-| System.Text;StringBuilder;AppendFormat<TArg0>;(System.IFormatProvider,System.Text.CompositeFormat,TArg0);Argument[0];Argument[this];taint;df-generated |
-| System.Text;StringBuilder;AppendFormat<TArg0>;(System.IFormatProvider,System.Text.CompositeFormat,TArg0);Argument[0];ReturnValue;taint;df-generated |
-| System.Text;StringBuilder;AppendFormat<TArg0>;(System.IFormatProvider,System.Text.CompositeFormat,TArg0);Argument[this];ReturnValue;taint;df-generated |
+| System.Text;StringBuilder;AppendFormat<TArg0,TArg1,TArg2>;(System.IFormatProvider,System.Text.CompositeFormat,TArg0,TArg1,TArg2);Argument[this];ReturnValue;value;dfc-generated |
+| System.Text;StringBuilder;AppendFormat<TArg0,TArg1>;(System.IFormatProvider,System.Text.CompositeFormat,TArg0,TArg1);Argument[this];ReturnValue;value;dfc-generated |
+| System.Text;StringBuilder;AppendFormat<TArg0>;(System.IFormatProvider,System.Text.CompositeFormat,TArg0);Argument[this];ReturnValue;value;dfc-generated |
 | System.Text;StringBuilder;AppendJoin;(System.Char,System.Object[]);Argument[1].Element;Argument[this];taint;manual |
 | System.Text;StringBuilder;AppendJoin;(System.Char,System.Object[]);Argument[this];ReturnValue;value;manual |
 | System.Text;StringBuilder;AppendJoin;(System.Char,System.String[]);Argument[1].Element;Argument[this];taint;manual |
@@ -16656,33 +17111,36 @@ summary
 | System.Text;StringBuilder;AppendLine;(System.String);Argument[this];ReturnValue;value;manual |
 | System.Text;StringBuilder;AppendLine;(System.Text.StringBuilder+AppendInterpolatedStringHandler);Argument[0];Argument[this];taint;manual |
 | System.Text;StringBuilder;AppendLine;(System.Text.StringBuilder+AppendInterpolatedStringHandler);Argument[this];ReturnValue;value;manual |
-| System.Text;StringBuilder;Clear;();Argument[this];ReturnValue;value;df-generated |
+| System.Text;StringBuilder;Clear;();Argument[this];ReturnValue;value;dfc-generated |
 | System.Text;StringBuilder;GetChunks;();Argument[this];ReturnValue;taint;df-generated |
+| System.Text;StringBuilder;GetObjectData;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);Argument[this];Argument[0].SyntheticField[System.Runtime.Serialization.SerializationInfo._values].Element;taint;df-generated |
+| System.Text;StringBuilder;GetObjectData;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);Argument[this];Argument[0].SyntheticField[System.Runtime.Serialization.SerializationInfo._values].Element;taint;dfc-generated |
 | System.Text;StringBuilder;GetObjectData;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);Argument[this];Argument[0];taint;df-generated |
-| System.Text;StringBuilder;Insert;(System.Int32,System.Boolean);Argument[this];ReturnValue;taint;df-generated |
-| System.Text;StringBuilder;Insert;(System.Int32,System.Byte);Argument[this];ReturnValue;taint;df-generated |
-| System.Text;StringBuilder;Insert;(System.Int32,System.Char);Argument[this];ReturnValue;value;df-generated |
-| System.Text;StringBuilder;Insert;(System.Int32,System.Char[]);Argument[this];ReturnValue;value;df-generated |
-| System.Text;StringBuilder;Insert;(System.Int32,System.Char[],System.Int32,System.Int32);Argument[this];ReturnValue;value;df-generated |
-| System.Text;StringBuilder;Insert;(System.Int32,System.Decimal);Argument[this];ReturnValue;taint;df-generated |
-| System.Text;StringBuilder;Insert;(System.Int32,System.Double);Argument[this];ReturnValue;taint;df-generated |
-| System.Text;StringBuilder;Insert;(System.Int32,System.Int16);Argument[this];ReturnValue;taint;df-generated |
-| System.Text;StringBuilder;Insert;(System.Int32,System.Int32);Argument[this];ReturnValue;taint;df-generated |
-| System.Text;StringBuilder;Insert;(System.Int32,System.Int64);Argument[this];ReturnValue;taint;df-generated |
-| System.Text;StringBuilder;Insert;(System.Int32,System.Object);Argument[this];ReturnValue;taint;df-generated |
-| System.Text;StringBuilder;Insert;(System.Int32,System.ReadOnlySpan<System.Char>);Argument[this];ReturnValue;value;df-generated |
-| System.Text;StringBuilder;Insert;(System.Int32,System.SByte);Argument[this];ReturnValue;taint;df-generated |
-| System.Text;StringBuilder;Insert;(System.Int32,System.Single);Argument[this];ReturnValue;taint;df-generated |
-| System.Text;StringBuilder;Insert;(System.Int32,System.String);Argument[this];ReturnValue;value;df-generated |
-| System.Text;StringBuilder;Insert;(System.Int32,System.String,System.Int32);Argument[this];ReturnValue;taint;df-generated |
-| System.Text;StringBuilder;Insert;(System.Int32,System.UInt16);Argument[this];ReturnValue;taint;df-generated |
-| System.Text;StringBuilder;Insert;(System.Int32,System.UInt32);Argument[this];ReturnValue;taint;df-generated |
-| System.Text;StringBuilder;Insert;(System.Int32,System.UInt64);Argument[this];ReturnValue;taint;df-generated |
-| System.Text;StringBuilder;Remove;(System.Int32,System.Int32);Argument[this];ReturnValue;value;df-generated |
-| System.Text;StringBuilder;Replace;(System.Char,System.Char);Argument[this];ReturnValue;taint;df-generated |
-| System.Text;StringBuilder;Replace;(System.Char,System.Char,System.Int32,System.Int32);Argument[this];ReturnValue;value;df-generated |
-| System.Text;StringBuilder;Replace;(System.String,System.String);Argument[this];ReturnValue;taint;df-generated |
-| System.Text;StringBuilder;Replace;(System.String,System.String,System.Int32,System.Int32);Argument[this];ReturnValue;taint;df-generated |
+| System.Text;StringBuilder;GetObjectData;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);Argument[this];Argument[0];taint;dfc-generated |
+| System.Text;StringBuilder;Insert;(System.Int32,System.Boolean);Argument[this];ReturnValue;value;dfc-generated |
+| System.Text;StringBuilder;Insert;(System.Int32,System.Byte);Argument[this];ReturnValue;value;dfc-generated |
+| System.Text;StringBuilder;Insert;(System.Int32,System.Char);Argument[this];ReturnValue;value;dfc-generated |
+| System.Text;StringBuilder;Insert;(System.Int32,System.Char[]);Argument[this];ReturnValue;value;dfc-generated |
+| System.Text;StringBuilder;Insert;(System.Int32,System.Char[],System.Int32,System.Int32);Argument[this];ReturnValue;value;dfc-generated |
+| System.Text;StringBuilder;Insert;(System.Int32,System.Decimal);Argument[this];ReturnValue;value;dfc-generated |
+| System.Text;StringBuilder;Insert;(System.Int32,System.Double);Argument[this];ReturnValue;value;dfc-generated |
+| System.Text;StringBuilder;Insert;(System.Int32,System.Int16);Argument[this];ReturnValue;value;dfc-generated |
+| System.Text;StringBuilder;Insert;(System.Int32,System.Int32);Argument[this];ReturnValue;value;dfc-generated |
+| System.Text;StringBuilder;Insert;(System.Int32,System.Int64);Argument[this];ReturnValue;value;dfc-generated |
+| System.Text;StringBuilder;Insert;(System.Int32,System.Object);Argument[this];ReturnValue;value;dfc-generated |
+| System.Text;StringBuilder;Insert;(System.Int32,System.ReadOnlySpan<System.Char>);Argument[this];ReturnValue;value;dfc-generated |
+| System.Text;StringBuilder;Insert;(System.Int32,System.SByte);Argument[this];ReturnValue;value;dfc-generated |
+| System.Text;StringBuilder;Insert;(System.Int32,System.Single);Argument[this];ReturnValue;value;dfc-generated |
+| System.Text;StringBuilder;Insert;(System.Int32,System.String);Argument[this];ReturnValue;value;dfc-generated |
+| System.Text;StringBuilder;Insert;(System.Int32,System.String,System.Int32);Argument[this];ReturnValue;value;dfc-generated |
+| System.Text;StringBuilder;Insert;(System.Int32,System.UInt16);Argument[this];ReturnValue;value;dfc-generated |
+| System.Text;StringBuilder;Insert;(System.Int32,System.UInt32);Argument[this];ReturnValue;value;dfc-generated |
+| System.Text;StringBuilder;Insert;(System.Int32,System.UInt64);Argument[this];ReturnValue;value;dfc-generated |
+| System.Text;StringBuilder;Remove;(System.Int32,System.Int32);Argument[this];ReturnValue;value;dfc-generated |
+| System.Text;StringBuilder;Replace;(System.Char,System.Char);Argument[this];ReturnValue;value;dfc-generated |
+| System.Text;StringBuilder;Replace;(System.Char,System.Char,System.Int32,System.Int32);Argument[this];ReturnValue;value;dfc-generated |
+| System.Text;StringBuilder;Replace;(System.String,System.String);Argument[this];ReturnValue;value;dfc-generated |
+| System.Text;StringBuilder;Replace;(System.String,System.String,System.Int32,System.Int32);Argument[this];ReturnValue;value;dfc-generated |
 | System.Text;StringBuilder;StringBuilder;(System.String);Argument[0];Argument[this];taint;manual |
 | System.Text;StringBuilder;StringBuilder;(System.String,System.Int32);Argument[0];Argument[this];taint;manual |
 | System.Text;StringBuilder;StringBuilder;(System.String,System.Int32,System.Int32,System.Int32);Argument[0];Argument[this];taint;manual |
@@ -16690,7 +17148,7 @@ summary
 | System.Text;StringBuilder;ToString;(System.Int32,System.Int32);Argument[this];ReturnValue;taint;manual |
 | System.Text;StringRuneEnumerator;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.Generic.IEnumerator`1.Current];value;manual |
 | System.Text;StringRuneEnumerator;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.IEnumerator.Current];value;manual |
-| System.Text;StringRuneEnumerator;GetEnumerator;();Argument[this];ReturnValue;value;df-generated |
+| System.Text;StringRuneEnumerator;GetEnumerator;();Argument[this];ReturnValue;value;dfc-generated |
 | System.Text;StringRuneEnumerator;get_Current;();Argument[this];ReturnValue;taint;df-generated |
 | System.Text;UTF7Encoding;GetBytes;(System.Char*,System.Int32,System.Byte*,System.Int32);Argument[0];ReturnValue;taint;manual |
 | System.Text;UTF7Encoding;GetBytes;(System.Char[],System.Int32,System.Int32,System.Byte[],System.Int32);Argument[0].Element;ReturnValue;taint;manual |
@@ -16727,15 +17185,12 @@ summary
 | System.Text;UnicodeEncoding;GetEncoder;();Argument[this];ReturnValue;taint;df-generated |
 | System.Text;UnicodeEncoding;GetString;(System.Byte[],System.Int32,System.Int32);Argument[0].Element;ReturnValue;taint;manual |
 | System.Threading.Channels;Channel;CreateBounded<T>;(System.Threading.Channels.BoundedChannelOptions,System.Action<T>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
-| System.Threading.RateLimiting;ConcurrencyLimiter;AcquireAsyncCore;(System.Int32,System.Threading.CancellationToken);Argument[this];ReturnValue;taint;df-generated |
 | System.Threading.RateLimiting;ConcurrencyLimiter;AttemptAcquireCore;(System.Int32);Argument[this];ReturnValue;taint;df-generated |
-| System.Threading.RateLimiting;FixedWindowRateLimiter;AcquireAsyncCore;(System.Int32,System.Threading.CancellationToken);Argument[this];ReturnValue;taint;df-generated |
 | System.Threading.RateLimiting;FixedWindowRateLimiter;AttemptAcquireCore;(System.Int32);Argument[this];ReturnValue;taint;df-generated |
 | System.Threading.RateLimiting;FixedWindowRateLimiter;get_ReplenishmentPeriod;();Argument[this];ReturnValue;taint;df-generated |
-| System.Threading.RateLimiting;MetadataName;Create<T>;(System.String);Argument[0];ReturnValue;taint;df-generated |
-| System.Threading.RateLimiting;MetadataName<T>;MetadataName;(System.String);Argument[0];Argument[this];taint;df-generated |
-| System.Threading.RateLimiting;MetadataName<T>;ToString;();Argument[this];ReturnValue;taint;df-generated |
-| System.Threading.RateLimiting;MetadataName<T>;get_Name;();Argument[this];ReturnValue;taint;df-generated |
+| System.Threading.RateLimiting;MetadataName<T>;MetadataName;(System.String);Argument[0];Argument[this].SyntheticField[System.Threading.RateLimiting.MetadataName`1._name];value;dfc-generated |
+| System.Threading.RateLimiting;MetadataName<T>;ToString;();Argument[this].SyntheticField[System.Threading.RateLimiting.MetadataName`1._name];ReturnValue;value;dfc-generated |
+| System.Threading.RateLimiting;MetadataName<T>;get_Name;();Argument[this].SyntheticField[System.Threading.RateLimiting.MetadataName`1._name];ReturnValue;value;dfc-generated |
 | System.Threading.RateLimiting;PartitionedRateLimiter;Create<TResource,TPartitionKey>;(System.Func<TResource,System.Threading.RateLimiting.RateLimitPartition<TPartitionKey>>,System.Collections.Generic.IEqualityComparer<TPartitionKey>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Threading.RateLimiting;PartitionedRateLimiter;CreateChained<TResource>;(System.Threading.RateLimiting.PartitionedRateLimiter<TResource>[]);Argument[0].Element;ReturnValue;taint;df-generated |
 | System.Threading.RateLimiting;PartitionedRateLimiter<TResource>;DisposeAsync;();Argument[this];ReturnValue;taint;df-generated |
@@ -16750,30 +17205,29 @@ summary
 | System.Threading.RateLimiting;RateLimitPartition;GetSlidingWindowLimiter<TKey>;(TKey,System.Func<TKey,System.Threading.RateLimiting.SlidingWindowRateLimiterOptions>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
 | System.Threading.RateLimiting;RateLimitPartition;GetTokenBucketLimiter<TKey>;(TKey,System.Func<TKey,System.Threading.RateLimiting.TokenBucketRateLimiterOptions>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
 | System.Threading.RateLimiting;RateLimitPartition<TKey>;RateLimitPartition;(TKey,System.Func<TKey,System.Threading.RateLimiting.RateLimiter>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
-| System.Threading.RateLimiting;RateLimiter;AcquireAsync;(System.Int32,System.Threading.CancellationToken);Argument[this];ReturnValue;taint;df-generated |
-| System.Threading.RateLimiting;RateLimiter;AcquireAsyncCore;(System.Int32,System.Threading.CancellationToken);Argument[this];ReturnValue;taint;df-generated |
 | System.Threading.RateLimiting;RateLimiter;AttemptAcquire;(System.Int32);Argument[this];ReturnValue;taint;df-generated |
 | System.Threading.RateLimiting;RateLimiter;AttemptAcquireCore;(System.Int32);Argument[this];ReturnValue;taint;df-generated |
 | System.Threading.RateLimiting;RateLimiter;DisposeAsync;();Argument[this];ReturnValue;taint;df-generated |
 | System.Threading.RateLimiting;ReplenishingRateLimiter;get_ReplenishmentPeriod;();Argument[this];ReturnValue;taint;df-generated |
-| System.Threading.RateLimiting;SlidingWindowRateLimiter;AcquireAsyncCore;(System.Int32,System.Threading.CancellationToken);Argument[this];ReturnValue;taint;df-generated |
 | System.Threading.RateLimiting;SlidingWindowRateLimiter;AttemptAcquireCore;(System.Int32);Argument[this];ReturnValue;taint;df-generated |
 | System.Threading.RateLimiting;SlidingWindowRateLimiter;get_ReplenishmentPeriod;();Argument[this];ReturnValue;taint;df-generated |
-| System.Threading.RateLimiting;TokenBucketRateLimiter;AcquireAsyncCore;(System.Int32,System.Threading.CancellationToken);Argument[this];ReturnValue;taint;df-generated |
 | System.Threading.RateLimiting;TokenBucketRateLimiter;AttemptAcquireCore;(System.Int32);Argument[this];ReturnValue;taint;df-generated |
 | System.Threading.RateLimiting;TokenBucketRateLimiter;get_ReplenishmentPeriod;();Argument[this];ReturnValue;taint;df-generated |
 | System.Threading.Tasks.Dataflow;ActionBlock<TInput>;ActionBlock;(System.Action<TInput>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Threading.Tasks.Dataflow;ActionBlock<TInput>;ActionBlock;(System.Action<TInput>,System.Threading.Tasks.Dataflow.ExecutionDataflowBlockOptions);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Threading.Tasks.Dataflow;ActionBlock<TInput>;ActionBlock;(System.Func<TInput,System.Threading.Tasks.Task>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Threading.Tasks.Dataflow;ActionBlock<TInput>;ActionBlock;(System.Func<TInput,System.Threading.Tasks.Task>,System.Threading.Tasks.Dataflow.ExecutionDataflowBlockOptions);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
+| System.Threading.Tasks.Dataflow;ActionBlock<TInput>;Fault;(System.Exception);Argument[0];Argument[this];taint;df-generated |
 | System.Threading.Tasks.Dataflow;ActionBlock<TInput>;get_Completion;();Argument[this];ReturnValue;taint;df-generated |
 | System.Threading.Tasks.Dataflow;BatchBlock<T>;BatchBlock;(System.Int32,System.Threading.Tasks.Dataflow.GroupingDataflowBlockOptions);Argument[1];Argument[this];taint;df-generated |
+| System.Threading.Tasks.Dataflow;BatchBlock<T>;Fault;(System.Exception);Argument[0];Argument[this];taint;df-generated |
 | System.Threading.Tasks.Dataflow;BatchBlock<T>;LinkTo;(System.Threading.Tasks.Dataflow.ITargetBlock<T[]>,System.Threading.Tasks.Dataflow.DataflowLinkOptions);Argument[0];ReturnValue;taint;df-generated |
 | System.Threading.Tasks.Dataflow;BatchBlock<T>;LinkTo;(System.Threading.Tasks.Dataflow.ITargetBlock<T[]>,System.Threading.Tasks.Dataflow.DataflowLinkOptions);Argument[this];ReturnValue;taint;df-generated |
 | System.Threading.Tasks.Dataflow;BatchBlock<T>;ReserveMessage;(System.Threading.Tasks.Dataflow.DataflowMessageHeader,System.Threading.Tasks.Dataflow.ITargetBlock<T[]>);Argument[1];Argument[this];taint;df-generated |
 | System.Threading.Tasks.Dataflow;BatchBlock<T>;TryReceive;(System.Predicate<T[]>,T[]);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Threading.Tasks.Dataflow;BatchBlock<T>;get_Completion;();Argument[this];ReturnValue;taint;df-generated |
 | System.Threading.Tasks.Dataflow;BatchedJoinBlock<T1,T2,T3>;BatchedJoinBlock;(System.Int32,System.Threading.Tasks.Dataflow.GroupingDataflowBlockOptions);Argument[1];Argument[this];taint;df-generated |
+| System.Threading.Tasks.Dataflow;BatchedJoinBlock<T1,T2,T3>;Fault;(System.Exception);Argument[0];Argument[this];taint;df-generated |
 | System.Threading.Tasks.Dataflow;BatchedJoinBlock<T1,T2,T3>;LinkTo;(System.Threading.Tasks.Dataflow.ITargetBlock<System.Tuple<System.Collections.Generic.IList<T1>,System.Collections.Generic.IList<T2>,System.Collections.Generic.IList<T3>>>,System.Threading.Tasks.Dataflow.DataflowLinkOptions);Argument[0];ReturnValue;taint;df-generated |
 | System.Threading.Tasks.Dataflow;BatchedJoinBlock<T1,T2,T3>;LinkTo;(System.Threading.Tasks.Dataflow.ITargetBlock<System.Tuple<System.Collections.Generic.IList<T1>,System.Collections.Generic.IList<T2>,System.Collections.Generic.IList<T3>>>,System.Threading.Tasks.Dataflow.DataflowLinkOptions);Argument[this];ReturnValue;taint;df-generated |
 | System.Threading.Tasks.Dataflow;BatchedJoinBlock<T1,T2,T3>;ReserveMessage;(System.Threading.Tasks.Dataflow.DataflowMessageHeader,System.Threading.Tasks.Dataflow.ITargetBlock<System.Tuple<System.Collections.Generic.IList<T1>,System.Collections.Generic.IList<T2>,System.Collections.Generic.IList<T3>>>);Argument[1];Argument[this];taint;df-generated |
@@ -16783,6 +17237,7 @@ summary
 | System.Threading.Tasks.Dataflow;BatchedJoinBlock<T1,T2,T3>;get_Target2;();Argument[this];ReturnValue;taint;df-generated |
 | System.Threading.Tasks.Dataflow;BatchedJoinBlock<T1,T2,T3>;get_Target3;();Argument[this];ReturnValue;taint;df-generated |
 | System.Threading.Tasks.Dataflow;BatchedJoinBlock<T1,T2>;BatchedJoinBlock;(System.Int32,System.Threading.Tasks.Dataflow.GroupingDataflowBlockOptions);Argument[1];Argument[this];taint;df-generated |
+| System.Threading.Tasks.Dataflow;BatchedJoinBlock<T1,T2>;Fault;(System.Exception);Argument[0];Argument[this];taint;df-generated |
 | System.Threading.Tasks.Dataflow;BatchedJoinBlock<T1,T2>;LinkTo;(System.Threading.Tasks.Dataflow.ITargetBlock<System.Tuple<System.Collections.Generic.IList<T1>,System.Collections.Generic.IList<T2>>>,System.Threading.Tasks.Dataflow.DataflowLinkOptions);Argument[0];ReturnValue;taint;df-generated |
 | System.Threading.Tasks.Dataflow;BatchedJoinBlock<T1,T2>;LinkTo;(System.Threading.Tasks.Dataflow.ITargetBlock<System.Tuple<System.Collections.Generic.IList<T1>,System.Collections.Generic.IList<T2>>>,System.Threading.Tasks.Dataflow.DataflowLinkOptions);Argument[this];ReturnValue;taint;df-generated |
 | System.Threading.Tasks.Dataflow;BatchedJoinBlock<T1,T2>;ReserveMessage;(System.Threading.Tasks.Dataflow.DataflowMessageHeader,System.Threading.Tasks.Dataflow.ITargetBlock<System.Tuple<System.Collections.Generic.IList<T1>,System.Collections.Generic.IList<T2>>>);Argument[1];Argument[this];taint;df-generated |
@@ -16793,6 +17248,7 @@ summary
 | System.Threading.Tasks.Dataflow;BroadcastBlock<T>;BroadcastBlock;(System.Func<T,T>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Threading.Tasks.Dataflow;BroadcastBlock<T>;BroadcastBlock;(System.Func<T,T>,System.Threading.Tasks.Dataflow.DataflowBlockOptions);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Threading.Tasks.Dataflow;BroadcastBlock<T>;ConsumeMessage;(System.Threading.Tasks.Dataflow.DataflowMessageHeader,System.Threading.Tasks.Dataflow.ITargetBlock<T>,System.Boolean);Argument[this];ReturnValue;taint;df-generated |
+| System.Threading.Tasks.Dataflow;BroadcastBlock<T>;Fault;(System.Exception);Argument[0];Argument[this];taint;df-generated |
 | System.Threading.Tasks.Dataflow;BroadcastBlock<T>;LinkTo;(System.Threading.Tasks.Dataflow.ITargetBlock<T>,System.Threading.Tasks.Dataflow.DataflowLinkOptions);Argument[0];ReturnValue;taint;df-generated |
 | System.Threading.Tasks.Dataflow;BroadcastBlock<T>;LinkTo;(System.Threading.Tasks.Dataflow.ITargetBlock<T>,System.Threading.Tasks.Dataflow.DataflowLinkOptions);Argument[this];ReturnValue;taint;df-generated |
 | System.Threading.Tasks.Dataflow;BroadcastBlock<T>;ReserveMessage;(System.Threading.Tasks.Dataflow.DataflowMessageHeader,System.Threading.Tasks.Dataflow.ITargetBlock<T>);Argument[1];Argument[this];taint;df-generated |
@@ -16800,12 +17256,12 @@ summary
 | System.Threading.Tasks.Dataflow;BroadcastBlock<T>;TryReceiveAll;(System.Collections.Generic.IList<T>);Argument[this];ReturnValue;taint;df-generated |
 | System.Threading.Tasks.Dataflow;BroadcastBlock<T>;get_Completion;();Argument[this];ReturnValue;taint;df-generated |
 | System.Threading.Tasks.Dataflow;BufferBlock<T>;BufferBlock;(System.Threading.Tasks.Dataflow.DataflowBlockOptions);Argument[0];Argument[this];taint;df-generated |
+| System.Threading.Tasks.Dataflow;BufferBlock<T>;Fault;(System.Exception);Argument[0];Argument[this];taint;df-generated |
 | System.Threading.Tasks.Dataflow;BufferBlock<T>;LinkTo;(System.Threading.Tasks.Dataflow.ITargetBlock<T>,System.Threading.Tasks.Dataflow.DataflowLinkOptions);Argument[0];ReturnValue;taint;df-generated |
 | System.Threading.Tasks.Dataflow;BufferBlock<T>;LinkTo;(System.Threading.Tasks.Dataflow.ITargetBlock<T>,System.Threading.Tasks.Dataflow.DataflowLinkOptions);Argument[this];ReturnValue;taint;df-generated |
 | System.Threading.Tasks.Dataflow;BufferBlock<T>;ReserveMessage;(System.Threading.Tasks.Dataflow.DataflowMessageHeader,System.Threading.Tasks.Dataflow.ITargetBlock<T>);Argument[1];Argument[this];taint;df-generated |
 | System.Threading.Tasks.Dataflow;BufferBlock<T>;TryReceive;(System.Predicate<T>,T);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Threading.Tasks.Dataflow;BufferBlock<T>;get_Completion;();Argument[this];ReturnValue;taint;df-generated |
-| System.Threading.Tasks.Dataflow;DataflowBlock;AsObservable<TOutput>;(System.Threading.Tasks.Dataflow.ISourceBlock<TOutput>);Argument[0];ReturnValue;taint;df-generated |
 | System.Threading.Tasks.Dataflow;DataflowBlock;AsObserver<TInput>;(System.Threading.Tasks.Dataflow.ITargetBlock<TInput>);Argument[0];ReturnValue;taint;df-generated |
 | System.Threading.Tasks.Dataflow;DataflowBlock;Choose<T1,T2,T3>;(System.Threading.Tasks.Dataflow.ISourceBlock<T1>,System.Action<T1>,System.Threading.Tasks.Dataflow.ISourceBlock<T2>,System.Action<T2>,System.Threading.Tasks.Dataflow.ISourceBlock<T3>,System.Action<T3>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
 | System.Threading.Tasks.Dataflow;DataflowBlock;Choose<T1,T2,T3>;(System.Threading.Tasks.Dataflow.ISourceBlock<T1>,System.Action<T1>,System.Threading.Tasks.Dataflow.ISourceBlock<T2>,System.Action<T2>,System.Threading.Tasks.Dataflow.ISourceBlock<T3>,System.Action<T3>);Argument[3];Argument[3].Parameter[delegate-self];value;hq-generated |
@@ -16837,8 +17293,10 @@ summary
 | System.Threading.Tasks.Dataflow;DataflowBlock;SendAsync<TInput>;(System.Threading.Tasks.Dataflow.ITargetBlock<TInput>,TInput);Argument[1];Argument[0];taint;df-generated |
 | System.Threading.Tasks.Dataflow;DataflowBlock;SendAsync<TInput>;(System.Threading.Tasks.Dataflow.ITargetBlock<TInput>,TInput,System.Threading.CancellationToken);Argument[1];Argument[0];taint;df-generated |
 | System.Threading.Tasks.Dataflow;DataflowBlock;TryReceive<TOutput>;(System.Threading.Tasks.Dataflow.IReceivableSourceBlock<TOutput>,TOutput);Argument[0];ReturnValue;taint;df-generated |
+| System.Threading.Tasks.Dataflow;IDataflowBlock;Fault;(System.Exception);Argument[0];Argument[this];taint;df-generated |
 | System.Threading.Tasks.Dataflow;IDataflowBlock;get_Completion;();Argument[this];ReturnValue;taint;df-generated |
 | System.Threading.Tasks.Dataflow;IReceivableSourceBlock<TOutput>;TryReceive;(System.Predicate<TOutput>,TOutput);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
+| System.Threading.Tasks.Dataflow;JoinBlock<T1,T2,T3>;Fault;(System.Exception);Argument[0];Argument[this];taint;df-generated |
 | System.Threading.Tasks.Dataflow;JoinBlock<T1,T2,T3>;JoinBlock;(System.Threading.Tasks.Dataflow.GroupingDataflowBlockOptions);Argument[0];Argument[this];taint;df-generated |
 | System.Threading.Tasks.Dataflow;JoinBlock<T1,T2,T3>;LinkTo;(System.Threading.Tasks.Dataflow.ITargetBlock<System.Tuple<T1,T2,T3>>,System.Threading.Tasks.Dataflow.DataflowLinkOptions);Argument[0];ReturnValue;taint;df-generated |
 | System.Threading.Tasks.Dataflow;JoinBlock<T1,T2,T3>;LinkTo;(System.Threading.Tasks.Dataflow.ITargetBlock<System.Tuple<T1,T2,T3>>,System.Threading.Tasks.Dataflow.DataflowLinkOptions);Argument[this];ReturnValue;taint;df-generated |
@@ -16848,6 +17306,7 @@ summary
 | System.Threading.Tasks.Dataflow;JoinBlock<T1,T2,T3>;get_Target1;();Argument[this];ReturnValue;taint;df-generated |
 | System.Threading.Tasks.Dataflow;JoinBlock<T1,T2,T3>;get_Target2;();Argument[this];ReturnValue;taint;df-generated |
 | System.Threading.Tasks.Dataflow;JoinBlock<T1,T2,T3>;get_Target3;();Argument[this];ReturnValue;taint;df-generated |
+| System.Threading.Tasks.Dataflow;JoinBlock<T1,T2>;Fault;(System.Exception);Argument[0];Argument[this];taint;df-generated |
 | System.Threading.Tasks.Dataflow;JoinBlock<T1,T2>;JoinBlock;(System.Threading.Tasks.Dataflow.GroupingDataflowBlockOptions);Argument[0];Argument[this];taint;df-generated |
 | System.Threading.Tasks.Dataflow;JoinBlock<T1,T2>;LinkTo;(System.Threading.Tasks.Dataflow.ITargetBlock<System.Tuple<T1,T2>>,System.Threading.Tasks.Dataflow.DataflowLinkOptions);Argument[0];ReturnValue;taint;df-generated |
 | System.Threading.Tasks.Dataflow;JoinBlock<T1,T2>;LinkTo;(System.Threading.Tasks.Dataflow.ITargetBlock<System.Tuple<T1,T2>>,System.Threading.Tasks.Dataflow.DataflowLinkOptions);Argument[this];ReturnValue;taint;df-generated |
@@ -16856,6 +17315,7 @@ summary
 | System.Threading.Tasks.Dataflow;JoinBlock<T1,T2>;get_Completion;();Argument[this];ReturnValue;taint;df-generated |
 | System.Threading.Tasks.Dataflow;JoinBlock<T1,T2>;get_Target1;();Argument[this];ReturnValue;taint;df-generated |
 | System.Threading.Tasks.Dataflow;JoinBlock<T1,T2>;get_Target2;();Argument[this];ReturnValue;taint;df-generated |
+| System.Threading.Tasks.Dataflow;TransformBlock<TInput,TOutput>;Fault;(System.Exception);Argument[0];Argument[this];taint;df-generated |
 | System.Threading.Tasks.Dataflow;TransformBlock<TInput,TOutput>;LinkTo;(System.Threading.Tasks.Dataflow.ITargetBlock<TOutput>,System.Threading.Tasks.Dataflow.DataflowLinkOptions);Argument[0];ReturnValue;taint;df-generated |
 | System.Threading.Tasks.Dataflow;TransformBlock<TInput,TOutput>;LinkTo;(System.Threading.Tasks.Dataflow.ITargetBlock<TOutput>,System.Threading.Tasks.Dataflow.DataflowLinkOptions);Argument[this];ReturnValue;taint;df-generated |
 | System.Threading.Tasks.Dataflow;TransformBlock<TInput,TOutput>;ReserveMessage;(System.Threading.Tasks.Dataflow.DataflowMessageHeader,System.Threading.Tasks.Dataflow.ITargetBlock<TOutput>);Argument[1];Argument[this];taint;df-generated |
@@ -16865,6 +17325,7 @@ summary
 | System.Threading.Tasks.Dataflow;TransformBlock<TInput,TOutput>;TransformBlock;(System.Func<TInput,TOutput>,System.Threading.Tasks.Dataflow.ExecutionDataflowBlockOptions);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Threading.Tasks.Dataflow;TransformBlock<TInput,TOutput>;TryReceive;(System.Predicate<TOutput>,TOutput);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Threading.Tasks.Dataflow;TransformBlock<TInput,TOutput>;get_Completion;();Argument[this];ReturnValue;taint;df-generated |
+| System.Threading.Tasks.Dataflow;TransformManyBlock<TInput,TOutput>;Fault;(System.Exception);Argument[0];Argument[this];taint;df-generated |
 | System.Threading.Tasks.Dataflow;TransformManyBlock<TInput,TOutput>;LinkTo;(System.Threading.Tasks.Dataflow.ITargetBlock<TOutput>,System.Threading.Tasks.Dataflow.DataflowLinkOptions);Argument[0];ReturnValue;taint;df-generated |
 | System.Threading.Tasks.Dataflow;TransformManyBlock<TInput,TOutput>;LinkTo;(System.Threading.Tasks.Dataflow.ITargetBlock<TOutput>,System.Threading.Tasks.Dataflow.DataflowLinkOptions);Argument[this];ReturnValue;taint;df-generated |
 | System.Threading.Tasks.Dataflow;TransformManyBlock<TInput,TOutput>;ReserveMessage;(System.Threading.Tasks.Dataflow.DataflowMessageHeader,System.Threading.Tasks.Dataflow.ITargetBlock<TOutput>);Argument[1];Argument[this];taint;df-generated |
@@ -16876,24 +17337,28 @@ summary
 | System.Threading.Tasks.Dataflow;TransformManyBlock<TInput,TOutput>;TransformManyBlock;(System.Func<TInput,System.Threading.Tasks.Task<System.Collections.Generic.IEnumerable<TOutput>>>,System.Threading.Tasks.Dataflow.ExecutionDataflowBlockOptions);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Threading.Tasks.Dataflow;TransformManyBlock<TInput,TOutput>;TryReceive;(System.Predicate<TOutput>,TOutput);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Threading.Tasks.Dataflow;TransformManyBlock<TInput,TOutput>;get_Completion;();Argument[this];ReturnValue;taint;df-generated |
-| System.Threading.Tasks.Dataflow;WriteOnceBlock<T>;ConsumeMessage;(System.Threading.Tasks.Dataflow.DataflowMessageHeader,System.Threading.Tasks.Dataflow.ITargetBlock<T>,System.Boolean);Argument[this];ReturnValue;taint;df-generated |
+| System.Threading.Tasks.Dataflow;WriteOnceBlock<T>;ConsumeMessage;(System.Threading.Tasks.Dataflow.DataflowMessageHeader,System.Threading.Tasks.Dataflow.ITargetBlock<T>,System.Boolean);Argument[this].SyntheticField[System.Threading.Tasks.Dataflow.WriteOnceBlock`1._value];ReturnValue;value;dfc-generated |
+| System.Threading.Tasks.Dataflow;WriteOnceBlock<T>;Fault;(System.Exception);Argument[0];Argument[this];taint;df-generated |
 | System.Threading.Tasks.Dataflow;WriteOnceBlock<T>;LinkTo;(System.Threading.Tasks.Dataflow.ITargetBlock<T>,System.Threading.Tasks.Dataflow.DataflowLinkOptions);Argument[0];ReturnValue;taint;df-generated |
 | System.Threading.Tasks.Dataflow;WriteOnceBlock<T>;LinkTo;(System.Threading.Tasks.Dataflow.ITargetBlock<T>,System.Threading.Tasks.Dataflow.DataflowLinkOptions);Argument[this];Argument[0];taint;df-generated |
 | System.Threading.Tasks.Dataflow;WriteOnceBlock<T>;LinkTo;(System.Threading.Tasks.Dataflow.ITargetBlock<T>,System.Threading.Tasks.Dataflow.DataflowLinkOptions);Argument[this];ReturnValue;taint;df-generated |
-| System.Threading.Tasks.Dataflow;WriteOnceBlock<T>;OfferMessage;(System.Threading.Tasks.Dataflow.DataflowMessageHeader,T,System.Threading.Tasks.Dataflow.ISourceBlock<T>,System.Boolean);Argument[1];Argument[this];taint;df-generated |
+| System.Threading.Tasks.Dataflow;WriteOnceBlock<T>;OfferMessage;(System.Threading.Tasks.Dataflow.DataflowMessageHeader,T,System.Threading.Tasks.Dataflow.ISourceBlock<T>,System.Boolean);Argument[1];Argument[this].SyntheticField[System.Threading.Tasks.Dataflow.WriteOnceBlock`1._value];value;dfc-generated |
 | System.Threading.Tasks.Dataflow;WriteOnceBlock<T>;ReleaseReservation;(System.Threading.Tasks.Dataflow.DataflowMessageHeader,System.Threading.Tasks.Dataflow.ITargetBlock<T>);Argument[this];Argument[1];taint;df-generated |
 | System.Threading.Tasks.Dataflow;WriteOnceBlock<T>;ToString;();Argument[this];ReturnValue;taint;df-generated |
 | System.Threading.Tasks.Dataflow;WriteOnceBlock<T>;TryReceive;(System.Predicate<T>,T);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
-| System.Threading.Tasks.Dataflow;WriteOnceBlock<T>;TryReceiveAll;(System.Collections.Generic.IList<T>);Argument[this];ReturnValue;taint;df-generated |
+| System.Threading.Tasks.Dataflow;WriteOnceBlock<T>;TryReceiveAll;(System.Collections.Generic.IList<T>);Argument[this].SyntheticField[System.Threading.Tasks.Dataflow.WriteOnceBlock`1._value];ReturnValue.Element;value;dfc-generated |
 | System.Threading.Tasks.Dataflow;WriteOnceBlock<T>;WriteOnceBlock;(System.Func<T,T>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
+| System.Threading.Tasks.Dataflow;WriteOnceBlock<T>;WriteOnceBlock;(System.Func<T,T>,System.Threading.Tasks.Dataflow.DataflowBlockOptions);Argument[0];Argument[0].Parameter[delegate-self];value;dfc-generated |
 | System.Threading.Tasks.Dataflow;WriteOnceBlock<T>;WriteOnceBlock;(System.Func<T,T>,System.Threading.Tasks.Dataflow.DataflowBlockOptions);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
+| System.Threading.Tasks.Dataflow;WriteOnceBlock<T>;WriteOnceBlock;(System.Func<T,T>,System.Threading.Tasks.Dataflow.DataflowBlockOptions);Argument[0];Argument[this].SyntheticField[System.Threading.Tasks.Dataflow.WriteOnceBlock`1._cloningFunction];value;dfc-generated |
+| System.Threading.Tasks.Dataflow;WriteOnceBlock<T>;WriteOnceBlock;(System.Func<T,T>,System.Threading.Tasks.Dataflow.DataflowBlockOptions);Argument[0];Argument[this].SyntheticField[System.Threading.Tasks.Dataflow.WriteOnceBlock`1._cloningFunction];value;hq-generated |
 | System.Threading.Tasks.Dataflow;WriteOnceBlock<T>;get_Completion;();Argument[this];ReturnValue;taint;df-generated |
 | System.Threading.Tasks.Sources;IValueTaskSource;OnCompleted;(System.Action<System.Object>,System.Object,System.Int16,System.Threading.Tasks.Sources.ValueTaskSourceOnCompletedFlags);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Threading.Tasks.Sources;IValueTaskSource<TResult>;OnCompleted;(System.Action<System.Object>,System.Object,System.Int16,System.Threading.Tasks.Sources.ValueTaskSourceOnCompletedFlags);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
-| System.Threading.Tasks.Sources;ManualResetValueTaskSourceCore<TResult>;GetResult;(System.Int16);Argument[this];ReturnValue;taint;df-generated |
+| System.Threading.Tasks.Sources;ManualResetValueTaskSourceCore<TResult>;GetResult;(System.Int16);Argument[this].SyntheticField[System.Threading.Tasks.Sources.ManualResetValueTaskSourceCore`1._result];ReturnValue;value;dfc-generated |
 | System.Threading.Tasks.Sources;ManualResetValueTaskSourceCore<TResult>;OnCompleted;(System.Action<System.Object>,System.Object,System.Int16,System.Threading.Tasks.Sources.ValueTaskSourceOnCompletedFlags);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Threading.Tasks.Sources;ManualResetValueTaskSourceCore<TResult>;SetException;(System.Exception);Argument[0];Argument[this];taint;df-generated |
-| System.Threading.Tasks.Sources;ManualResetValueTaskSourceCore<TResult>;SetResult;(TResult);Argument[0];Argument[this];taint;df-generated |
+| System.Threading.Tasks.Sources;ManualResetValueTaskSourceCore<TResult>;SetResult;(TResult);Argument[0];Argument[this].SyntheticField[System.Threading.Tasks.Sources.ManualResetValueTaskSourceCore`1._result];value;dfc-generated |
 | System.Threading.Tasks;ConcurrentExclusiveSchedulerPair;ConcurrentExclusiveSchedulerPair;(System.Threading.Tasks.TaskScheduler,System.Int32,System.Int32);Argument[0];Argument[this];taint;df-generated |
 | System.Threading.Tasks;ConcurrentExclusiveSchedulerPair;get_ConcurrentScheduler;();Argument[this];ReturnValue;taint;df-generated |
 | System.Threading.Tasks;ConcurrentExclusiveSchedulerPair;get_ExclusiveScheduler;();Argument[this];ReturnValue;taint;df-generated |
@@ -17047,14 +17512,17 @@ summary
 | System.Threading.Tasks;Task;WhenAll<TResult>;(System.Collections.Generic.IEnumerable<System.Threading.Tasks.Task<TResult>>);Argument[0].Element.Property[System.Threading.Tasks.Task`1.Result];ReturnValue.Property[System.Threading.Tasks.Task`1.Result].Element;value;manual |
 | System.Threading.Tasks;Task;WhenAll<TResult>;(System.Threading.Tasks.Task<TResult>[]);Argument[0].Element.Property[System.Threading.Tasks.Task`1.Result];ReturnValue.Property[System.Threading.Tasks.Task`1.Result].Element;value;manual |
 | System.Threading.Tasks;Task;WhenAny;(System.Collections.Generic.IEnumerable<System.Threading.Tasks.Task>);Argument[0].Element;ReturnValue;taint;df-generated |
-| System.Threading.Tasks;Task;WhenAny;(System.Threading.Tasks.Task,System.Threading.Tasks.Task);Argument[0];ReturnValue;taint;df-generated |
-| System.Threading.Tasks;Task;WhenAny;(System.Threading.Tasks.Task,System.Threading.Tasks.Task);Argument[1];ReturnValue;taint;df-generated |
+| System.Threading.Tasks;Task;WhenAny;(System.Threading.Tasks.Task,System.Threading.Tasks.Task);Argument[0];ReturnValue.Property[System.Threading.Tasks.Task`1.Result];value;dfc-generated |
+| System.Threading.Tasks;Task;WhenAny;(System.Threading.Tasks.Task,System.Threading.Tasks.Task);Argument[1];ReturnValue.Property[System.Threading.Tasks.Task`1.Result];value;dfc-generated |
 | System.Threading.Tasks;Task;WhenAny;(System.Threading.Tasks.Task[]);Argument[0].Element;ReturnValue;taint;df-generated |
 | System.Threading.Tasks;Task;WhenAny<TResult>;(System.Collections.Generic.IEnumerable<System.Threading.Tasks.Task<TResult>>);Argument[0].Element.Property[System.Threading.Tasks.Task`1.Result];ReturnValue.Property[System.Threading.Tasks.Task`1.Result].Element;value;manual |
 | System.Threading.Tasks;Task;WhenAny<TResult>;(System.Threading.Tasks.Task<TResult>,System.Threading.Tasks.Task<TResult>);Argument[0].Element.Property[System.Threading.Tasks.Task`1.Result];ReturnValue.Property[System.Threading.Tasks.Task`1.Result].Element;value;manual |
 | System.Threading.Tasks;Task;WhenAny<TResult>;(System.Threading.Tasks.Task<TResult>,System.Threading.Tasks.Task<TResult>);Argument[1].Element.Property[System.Threading.Tasks.Task`1.Result];ReturnValue.Property[System.Threading.Tasks.Task`1.Result].Element;value;manual |
 | System.Threading.Tasks;Task;WhenAny<TResult>;(System.Threading.Tasks.Task<TResult>[]);Argument[0].Element.Property[System.Threading.Tasks.Task`1.Result];ReturnValue.Property[System.Threading.Tasks.Task`1.Result].Element;value;manual |
+| System.Threading.Tasks;Task;get_AsyncState;();Argument[this].SyntheticField[System.Threading.Tasks.Task.m_stateObject];ReturnValue;value;df-generated |
+| System.Threading.Tasks;Task;get_AsyncState;();Argument[this].SyntheticField[System.Threading.Tasks.Task.m_stateObject];ReturnValue;value;dfc-generated |
 | System.Threading.Tasks;Task;get_AsyncState;();Argument[this];ReturnValue;taint;df-generated |
+| System.Threading.Tasks;Task;get_AsyncState;();Argument[this];ReturnValue;taint;dfc-generated |
 | System.Threading.Tasks;Task;get_AsyncWaitHandle;();Argument[this];ReturnValue;taint;df-generated |
 | System.Threading.Tasks;Task<TResult>;ConfigureAwait;(System.Boolean);Argument[this];ReturnValue.SyntheticField[m_configuredTaskAwaiter].SyntheticField[m_task_configured_task_awaitable];value;manual |
 | System.Threading.Tasks;Task<TResult>;ConfigureAwait;(System.Threading.Tasks.ConfigureAwaitOptions);Argument[this];ReturnValue;taint;df-generated |
@@ -17149,8 +17617,8 @@ summary
 | System.Threading.Tasks;TaskAsyncEnumerableExtensions;ConfigureAwait<T>;(System.Collections.Generic.IAsyncEnumerable<T>,System.Boolean);Argument[0];ReturnValue;taint;df-generated |
 | System.Threading.Tasks;TaskAsyncEnumerableExtensions;WithCancellation<T>;(System.Collections.Generic.IAsyncEnumerable<T>,System.Threading.CancellationToken);Argument[0];ReturnValue;taint;df-generated |
 | System.Threading.Tasks;TaskAsyncEnumerableExtensions;WithCancellation<T>;(System.Collections.Generic.IAsyncEnumerable<T>,System.Threading.CancellationToken);Argument[1];ReturnValue;taint;df-generated |
-| System.Threading.Tasks;TaskCanceledException;TaskCanceledException;(System.Threading.Tasks.Task);Argument[0];Argument[this];taint;df-generated |
-| System.Threading.Tasks;TaskCanceledException;get_Task;();Argument[this];ReturnValue;taint;df-generated |
+| System.Threading.Tasks;TaskCanceledException;TaskCanceledException;(System.Threading.Tasks.Task);Argument[0];Argument[this].SyntheticField[System.Threading.Tasks.TaskCanceledException._canceledTask];value;dfc-generated |
+| System.Threading.Tasks;TaskCanceledException;get_Task;();Argument[this].SyntheticField[System.Threading.Tasks.TaskCanceledException._canceledTask];ReturnValue;value;dfc-generated |
 | System.Threading.Tasks;TaskCompletionSource;TaskCompletionSource;(System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[0];Argument[this];taint;df-generated |
 | System.Threading.Tasks;TaskCompletionSource;get_Task;();Argument[this];ReturnValue;taint;df-generated |
 | System.Threading.Tasks;TaskCompletionSource<TResult>;SetResult;(TResult);Argument[0];Argument[this];taint;df-generated |
@@ -17222,41 +17690,185 @@ summary
 | System.Threading.Tasks;TaskFactory;ContinueWhenAny<TResult>;(System.Threading.Tasks.Task[],System.Func<System.Threading.Tasks.Task,TResult>,System.Threading.CancellationToken,System.Threading.Tasks.TaskContinuationOptions,System.Threading.Tasks.TaskScheduler);Argument[1];Argument[1].Parameter[delegate-self];value;manual |
 | System.Threading.Tasks;TaskFactory;ContinueWhenAny<TResult>;(System.Threading.Tasks.Task[],System.Func<System.Threading.Tasks.Task,TResult>,System.Threading.Tasks.TaskContinuationOptions);Argument[1].ReturnValue;ReturnValue.Property[System.Threading.Tasks.Task`1.Result];value;manual |
 | System.Threading.Tasks;TaskFactory;ContinueWhenAny<TResult>;(System.Threading.Tasks.Task[],System.Func<System.Threading.Tasks.Task,TResult>,System.Threading.Tasks.TaskContinuationOptions);Argument[1];Argument[1].Parameter[delegate-self];value;manual |
+| System.Threading.Tasks;TaskFactory;FromAsync;(System.Func<System.AsyncCallback,System.Object,System.IAsyncResult>,System.Action<System.IAsyncResult>,System.Object);Argument[0].ReturnValue;Argument[1].Parameter[0];value;dfc-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync;(System.Func<System.AsyncCallback,System.Object,System.IAsyncResult>,System.Action<System.IAsyncResult>,System.Object);Argument[0].ReturnValue;Argument[1].Parameter[0];value;hq-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync;(System.Func<System.AsyncCallback,System.Object,System.IAsyncResult>,System.Action<System.IAsyncResult>,System.Object);Argument[0];Argument[0].Parameter[delegate-self];value;dfc-generated |
 | System.Threading.Tasks;TaskFactory;FromAsync;(System.Func<System.AsyncCallback,System.Object,System.IAsyncResult>,System.Action<System.IAsyncResult>,System.Object);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync;(System.Func<System.AsyncCallback,System.Object,System.IAsyncResult>,System.Action<System.IAsyncResult>,System.Object);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | System.Threading.Tasks;TaskFactory;FromAsync;(System.Func<System.AsyncCallback,System.Object,System.IAsyncResult>,System.Action<System.IAsyncResult>,System.Object);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync;(System.Func<System.AsyncCallback,System.Object,System.IAsyncResult>,System.Action<System.IAsyncResult>,System.Object);Argument[2];Argument[0].Parameter[1];value;dfc-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync;(System.Func<System.AsyncCallback,System.Object,System.IAsyncResult>,System.Action<System.IAsyncResult>,System.Object);Argument[2];Argument[0].Parameter[1];value;hq-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync;(System.Func<System.AsyncCallback,System.Object,System.IAsyncResult>,System.Action<System.IAsyncResult>,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[0].ReturnValue;Argument[1].Parameter[0];value;dfc-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync;(System.Func<System.AsyncCallback,System.Object,System.IAsyncResult>,System.Action<System.IAsyncResult>,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[0].ReturnValue;Argument[1].Parameter[0];value;hq-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync;(System.Func<System.AsyncCallback,System.Object,System.IAsyncResult>,System.Action<System.IAsyncResult>,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[0];Argument[0].Parameter[delegate-self];value;dfc-generated |
 | System.Threading.Tasks;TaskFactory;FromAsync;(System.Func<System.AsyncCallback,System.Object,System.IAsyncResult>,System.Action<System.IAsyncResult>,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync;(System.Func<System.AsyncCallback,System.Object,System.IAsyncResult>,System.Action<System.IAsyncResult>,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | System.Threading.Tasks;TaskFactory;FromAsync;(System.Func<System.AsyncCallback,System.Object,System.IAsyncResult>,System.Action<System.IAsyncResult>,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync;(System.Func<System.AsyncCallback,System.Object,System.IAsyncResult>,System.Action<System.IAsyncResult>,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[2];Argument[0].Parameter[1];value;dfc-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync;(System.Func<System.AsyncCallback,System.Object,System.IAsyncResult>,System.Action<System.IAsyncResult>,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[2];Argument[0].Parameter[1];value;hq-generated |
 | System.Threading.Tasks;TaskFactory;FromAsync;(System.IAsyncResult,System.Action<System.IAsyncResult>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
 | System.Threading.Tasks;TaskFactory;FromAsync;(System.IAsyncResult,System.Action<System.IAsyncResult>,System.Threading.Tasks.TaskCreationOptions);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
 | System.Threading.Tasks;TaskFactory;FromAsync;(System.IAsyncResult,System.Action<System.IAsyncResult>,System.Threading.Tasks.TaskCreationOptions,System.Threading.Tasks.TaskScheduler);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TArg1,TArg2,TArg3,TResult>;(System.Func<TArg1,TArg2,TArg3,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,TArg2,TArg3,System.Object);Argument[0].ReturnValue;Argument[1].Parameter[0];value;dfc-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TArg1,TArg2,TArg3,TResult>;(System.Func<TArg1,TArg2,TArg3,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,TArg2,TArg3,System.Object);Argument[0].ReturnValue;Argument[1].Parameter[0];value;hq-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TArg1,TArg2,TArg3,TResult>;(System.Func<TArg1,TArg2,TArg3,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,TArg2,TArg3,System.Object);Argument[0];Argument[0].Parameter[delegate-self];value;dfc-generated |
 | System.Threading.Tasks;TaskFactory;FromAsync<TArg1,TArg2,TArg3,TResult>;(System.Func<TArg1,TArg2,TArg3,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,TArg2,TArg3,System.Object);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TArg1,TArg2,TArg3,TResult>;(System.Func<TArg1,TArg2,TArg3,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,TArg2,TArg3,System.Object);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | System.Threading.Tasks;TaskFactory;FromAsync<TArg1,TArg2,TArg3,TResult>;(System.Func<TArg1,TArg2,TArg3,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,TArg2,TArg3,System.Object);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TArg1,TArg2,TArg3,TResult>;(System.Func<TArg1,TArg2,TArg3,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,TArg2,TArg3,System.Object);Argument[2];Argument[0].Parameter[0];value;dfc-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TArg1,TArg2,TArg3,TResult>;(System.Func<TArg1,TArg2,TArg3,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,TArg2,TArg3,System.Object);Argument[2];Argument[0].Parameter[0];value;hq-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TArg1,TArg2,TArg3,TResult>;(System.Func<TArg1,TArg2,TArg3,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,TArg2,TArg3,System.Object);Argument[3];Argument[0].Parameter[1];value;dfc-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TArg1,TArg2,TArg3,TResult>;(System.Func<TArg1,TArg2,TArg3,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,TArg2,TArg3,System.Object);Argument[3];Argument[0].Parameter[1];value;hq-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TArg1,TArg2,TArg3,TResult>;(System.Func<TArg1,TArg2,TArg3,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,TArg2,TArg3,System.Object);Argument[4];Argument[0].Parameter[2];value;dfc-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TArg1,TArg2,TArg3,TResult>;(System.Func<TArg1,TArg2,TArg3,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,TArg2,TArg3,System.Object);Argument[4];Argument[0].Parameter[2];value;hq-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TArg1,TArg2,TArg3,TResult>;(System.Func<TArg1,TArg2,TArg3,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,TArg2,TArg3,System.Object);Argument[5];Argument[0].Parameter[4];value;dfc-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TArg1,TArg2,TArg3,TResult>;(System.Func<TArg1,TArg2,TArg3,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,TArg2,TArg3,System.Object);Argument[5];Argument[0].Parameter[4];value;hq-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TArg1,TArg2,TArg3,TResult>;(System.Func<TArg1,TArg2,TArg3,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,TArg2,TArg3,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[0].ReturnValue;Argument[1].Parameter[0];value;dfc-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TArg1,TArg2,TArg3,TResult>;(System.Func<TArg1,TArg2,TArg3,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,TArg2,TArg3,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[0].ReturnValue;Argument[1].Parameter[0];value;hq-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TArg1,TArg2,TArg3,TResult>;(System.Func<TArg1,TArg2,TArg3,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,TArg2,TArg3,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[0];Argument[0].Parameter[delegate-self];value;dfc-generated |
 | System.Threading.Tasks;TaskFactory;FromAsync<TArg1,TArg2,TArg3,TResult>;(System.Func<TArg1,TArg2,TArg3,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,TArg2,TArg3,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TArg1,TArg2,TArg3,TResult>;(System.Func<TArg1,TArg2,TArg3,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,TArg2,TArg3,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | System.Threading.Tasks;TaskFactory;FromAsync<TArg1,TArg2,TArg3,TResult>;(System.Func<TArg1,TArg2,TArg3,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,TArg2,TArg3,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TArg1,TArg2,TArg3,TResult>;(System.Func<TArg1,TArg2,TArg3,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,TArg2,TArg3,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[2];Argument[0].Parameter[0];value;dfc-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TArg1,TArg2,TArg3,TResult>;(System.Func<TArg1,TArg2,TArg3,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,TArg2,TArg3,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[2];Argument[0].Parameter[0];value;hq-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TArg1,TArg2,TArg3,TResult>;(System.Func<TArg1,TArg2,TArg3,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,TArg2,TArg3,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[3];Argument[0].Parameter[1];value;dfc-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TArg1,TArg2,TArg3,TResult>;(System.Func<TArg1,TArg2,TArg3,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,TArg2,TArg3,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[3];Argument[0].Parameter[1];value;hq-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TArg1,TArg2,TArg3,TResult>;(System.Func<TArg1,TArg2,TArg3,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,TArg2,TArg3,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[4];Argument[0].Parameter[2];value;dfc-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TArg1,TArg2,TArg3,TResult>;(System.Func<TArg1,TArg2,TArg3,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,TArg2,TArg3,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[4];Argument[0].Parameter[2];value;hq-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TArg1,TArg2,TArg3,TResult>;(System.Func<TArg1,TArg2,TArg3,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,TArg2,TArg3,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[5];Argument[0].Parameter[4];value;dfc-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TArg1,TArg2,TArg3,TResult>;(System.Func<TArg1,TArg2,TArg3,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,TArg2,TArg3,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[5];Argument[0].Parameter[4];value;hq-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TArg1,TArg2,TArg3>;(System.Func<TArg1,TArg2,TArg3,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Action<System.IAsyncResult>,TArg1,TArg2,TArg3,System.Object);Argument[0].ReturnValue;Argument[1].Parameter[0];value;dfc-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TArg1,TArg2,TArg3>;(System.Func<TArg1,TArg2,TArg3,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Action<System.IAsyncResult>,TArg1,TArg2,TArg3,System.Object);Argument[0].ReturnValue;Argument[1].Parameter[0];value;hq-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TArg1,TArg2,TArg3>;(System.Func<TArg1,TArg2,TArg3,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Action<System.IAsyncResult>,TArg1,TArg2,TArg3,System.Object);Argument[0];Argument[0].Parameter[delegate-self];value;dfc-generated |
 | System.Threading.Tasks;TaskFactory;FromAsync<TArg1,TArg2,TArg3>;(System.Func<TArg1,TArg2,TArg3,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Action<System.IAsyncResult>,TArg1,TArg2,TArg3,System.Object);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TArg1,TArg2,TArg3>;(System.Func<TArg1,TArg2,TArg3,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Action<System.IAsyncResult>,TArg1,TArg2,TArg3,System.Object);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | System.Threading.Tasks;TaskFactory;FromAsync<TArg1,TArg2,TArg3>;(System.Func<TArg1,TArg2,TArg3,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Action<System.IAsyncResult>,TArg1,TArg2,TArg3,System.Object);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TArg1,TArg2,TArg3>;(System.Func<TArg1,TArg2,TArg3,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Action<System.IAsyncResult>,TArg1,TArg2,TArg3,System.Object);Argument[2];Argument[0].Parameter[0];value;dfc-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TArg1,TArg2,TArg3>;(System.Func<TArg1,TArg2,TArg3,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Action<System.IAsyncResult>,TArg1,TArg2,TArg3,System.Object);Argument[2];Argument[0].Parameter[0];value;hq-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TArg1,TArg2,TArg3>;(System.Func<TArg1,TArg2,TArg3,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Action<System.IAsyncResult>,TArg1,TArg2,TArg3,System.Object);Argument[3];Argument[0].Parameter[1];value;dfc-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TArg1,TArg2,TArg3>;(System.Func<TArg1,TArg2,TArg3,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Action<System.IAsyncResult>,TArg1,TArg2,TArg3,System.Object);Argument[3];Argument[0].Parameter[1];value;hq-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TArg1,TArg2,TArg3>;(System.Func<TArg1,TArg2,TArg3,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Action<System.IAsyncResult>,TArg1,TArg2,TArg3,System.Object);Argument[4];Argument[0].Parameter[2];value;dfc-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TArg1,TArg2,TArg3>;(System.Func<TArg1,TArg2,TArg3,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Action<System.IAsyncResult>,TArg1,TArg2,TArg3,System.Object);Argument[4];Argument[0].Parameter[2];value;hq-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TArg1,TArg2,TArg3>;(System.Func<TArg1,TArg2,TArg3,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Action<System.IAsyncResult>,TArg1,TArg2,TArg3,System.Object);Argument[5];Argument[0].Parameter[4];value;dfc-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TArg1,TArg2,TArg3>;(System.Func<TArg1,TArg2,TArg3,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Action<System.IAsyncResult>,TArg1,TArg2,TArg3,System.Object);Argument[5];Argument[0].Parameter[4];value;hq-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TArg1,TArg2,TArg3>;(System.Func<TArg1,TArg2,TArg3,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Action<System.IAsyncResult>,TArg1,TArg2,TArg3,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[0].ReturnValue;Argument[1].Parameter[0];value;dfc-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TArg1,TArg2,TArg3>;(System.Func<TArg1,TArg2,TArg3,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Action<System.IAsyncResult>,TArg1,TArg2,TArg3,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[0].ReturnValue;Argument[1].Parameter[0];value;hq-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TArg1,TArg2,TArg3>;(System.Func<TArg1,TArg2,TArg3,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Action<System.IAsyncResult>,TArg1,TArg2,TArg3,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[0];Argument[0].Parameter[delegate-self];value;dfc-generated |
 | System.Threading.Tasks;TaskFactory;FromAsync<TArg1,TArg2,TArg3>;(System.Func<TArg1,TArg2,TArg3,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Action<System.IAsyncResult>,TArg1,TArg2,TArg3,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TArg1,TArg2,TArg3>;(System.Func<TArg1,TArg2,TArg3,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Action<System.IAsyncResult>,TArg1,TArg2,TArg3,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | System.Threading.Tasks;TaskFactory;FromAsync<TArg1,TArg2,TArg3>;(System.Func<TArg1,TArg2,TArg3,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Action<System.IAsyncResult>,TArg1,TArg2,TArg3,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TArg1,TArg2,TArg3>;(System.Func<TArg1,TArg2,TArg3,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Action<System.IAsyncResult>,TArg1,TArg2,TArg3,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[2];Argument[0].Parameter[0];value;dfc-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TArg1,TArg2,TArg3>;(System.Func<TArg1,TArg2,TArg3,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Action<System.IAsyncResult>,TArg1,TArg2,TArg3,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[2];Argument[0].Parameter[0];value;hq-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TArg1,TArg2,TArg3>;(System.Func<TArg1,TArg2,TArg3,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Action<System.IAsyncResult>,TArg1,TArg2,TArg3,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[3];Argument[0].Parameter[1];value;dfc-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TArg1,TArg2,TArg3>;(System.Func<TArg1,TArg2,TArg3,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Action<System.IAsyncResult>,TArg1,TArg2,TArg3,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[3];Argument[0].Parameter[1];value;hq-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TArg1,TArg2,TArg3>;(System.Func<TArg1,TArg2,TArg3,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Action<System.IAsyncResult>,TArg1,TArg2,TArg3,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[4];Argument[0].Parameter[2];value;dfc-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TArg1,TArg2,TArg3>;(System.Func<TArg1,TArg2,TArg3,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Action<System.IAsyncResult>,TArg1,TArg2,TArg3,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[4];Argument[0].Parameter[2];value;hq-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TArg1,TArg2,TArg3>;(System.Func<TArg1,TArg2,TArg3,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Action<System.IAsyncResult>,TArg1,TArg2,TArg3,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[5];Argument[0].Parameter[4];value;dfc-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TArg1,TArg2,TArg3>;(System.Func<TArg1,TArg2,TArg3,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Action<System.IAsyncResult>,TArg1,TArg2,TArg3,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[5];Argument[0].Parameter[4];value;hq-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TArg1,TArg2,TResult>;(System.Func<TArg1,TArg2,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,TArg2,System.Object);Argument[0].ReturnValue;Argument[1].Parameter[0];value;dfc-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TArg1,TArg2,TResult>;(System.Func<TArg1,TArg2,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,TArg2,System.Object);Argument[0].ReturnValue;Argument[1].Parameter[0];value;hq-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TArg1,TArg2,TResult>;(System.Func<TArg1,TArg2,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,TArg2,System.Object);Argument[0];Argument[0].Parameter[delegate-self];value;dfc-generated |
 | System.Threading.Tasks;TaskFactory;FromAsync<TArg1,TArg2,TResult>;(System.Func<TArg1,TArg2,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,TArg2,System.Object);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TArg1,TArg2,TResult>;(System.Func<TArg1,TArg2,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,TArg2,System.Object);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | System.Threading.Tasks;TaskFactory;FromAsync<TArg1,TArg2,TResult>;(System.Func<TArg1,TArg2,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,TArg2,System.Object);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TArg1,TArg2,TResult>;(System.Func<TArg1,TArg2,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,TArg2,System.Object);Argument[2];Argument[0].Parameter[0];value;dfc-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TArg1,TArg2,TResult>;(System.Func<TArg1,TArg2,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,TArg2,System.Object);Argument[2];Argument[0].Parameter[0];value;hq-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TArg1,TArg2,TResult>;(System.Func<TArg1,TArg2,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,TArg2,System.Object);Argument[3];Argument[0].Parameter[1];value;dfc-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TArg1,TArg2,TResult>;(System.Func<TArg1,TArg2,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,TArg2,System.Object);Argument[3];Argument[0].Parameter[1];value;hq-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TArg1,TArg2,TResult>;(System.Func<TArg1,TArg2,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,TArg2,System.Object);Argument[4];Argument[0].Parameter[3];value;dfc-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TArg1,TArg2,TResult>;(System.Func<TArg1,TArg2,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,TArg2,System.Object);Argument[4];Argument[0].Parameter[3];value;hq-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TArg1,TArg2,TResult>;(System.Func<TArg1,TArg2,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,TArg2,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[0].ReturnValue;Argument[1].Parameter[0];value;dfc-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TArg1,TArg2,TResult>;(System.Func<TArg1,TArg2,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,TArg2,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[0].ReturnValue;Argument[1].Parameter[0];value;hq-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TArg1,TArg2,TResult>;(System.Func<TArg1,TArg2,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,TArg2,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[0];Argument[0].Parameter[delegate-self];value;dfc-generated |
 | System.Threading.Tasks;TaskFactory;FromAsync<TArg1,TArg2,TResult>;(System.Func<TArg1,TArg2,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,TArg2,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TArg1,TArg2,TResult>;(System.Func<TArg1,TArg2,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,TArg2,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | System.Threading.Tasks;TaskFactory;FromAsync<TArg1,TArg2,TResult>;(System.Func<TArg1,TArg2,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,TArg2,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TArg1,TArg2,TResult>;(System.Func<TArg1,TArg2,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,TArg2,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[2];Argument[0].Parameter[0];value;dfc-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TArg1,TArg2,TResult>;(System.Func<TArg1,TArg2,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,TArg2,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[2];Argument[0].Parameter[0];value;hq-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TArg1,TArg2,TResult>;(System.Func<TArg1,TArg2,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,TArg2,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[3];Argument[0].Parameter[1];value;dfc-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TArg1,TArg2,TResult>;(System.Func<TArg1,TArg2,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,TArg2,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[3];Argument[0].Parameter[1];value;hq-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TArg1,TArg2,TResult>;(System.Func<TArg1,TArg2,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,TArg2,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[4];Argument[0].Parameter[3];value;dfc-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TArg1,TArg2,TResult>;(System.Func<TArg1,TArg2,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,TArg2,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[4];Argument[0].Parameter[3];value;hq-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TArg1,TArg2>;(System.Func<TArg1,TArg2,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Action<System.IAsyncResult>,TArg1,TArg2,System.Object);Argument[0].ReturnValue;Argument[1].Parameter[0];value;dfc-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TArg1,TArg2>;(System.Func<TArg1,TArg2,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Action<System.IAsyncResult>,TArg1,TArg2,System.Object);Argument[0].ReturnValue;Argument[1].Parameter[0];value;hq-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TArg1,TArg2>;(System.Func<TArg1,TArg2,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Action<System.IAsyncResult>,TArg1,TArg2,System.Object);Argument[0];Argument[0].Parameter[delegate-self];value;dfc-generated |
 | System.Threading.Tasks;TaskFactory;FromAsync<TArg1,TArg2>;(System.Func<TArg1,TArg2,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Action<System.IAsyncResult>,TArg1,TArg2,System.Object);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TArg1,TArg2>;(System.Func<TArg1,TArg2,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Action<System.IAsyncResult>,TArg1,TArg2,System.Object);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | System.Threading.Tasks;TaskFactory;FromAsync<TArg1,TArg2>;(System.Func<TArg1,TArg2,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Action<System.IAsyncResult>,TArg1,TArg2,System.Object);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TArg1,TArg2>;(System.Func<TArg1,TArg2,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Action<System.IAsyncResult>,TArg1,TArg2,System.Object);Argument[2];Argument[0].Parameter[0];value;dfc-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TArg1,TArg2>;(System.Func<TArg1,TArg2,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Action<System.IAsyncResult>,TArg1,TArg2,System.Object);Argument[2];Argument[0].Parameter[0];value;hq-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TArg1,TArg2>;(System.Func<TArg1,TArg2,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Action<System.IAsyncResult>,TArg1,TArg2,System.Object);Argument[3];Argument[0].Parameter[1];value;dfc-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TArg1,TArg2>;(System.Func<TArg1,TArg2,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Action<System.IAsyncResult>,TArg1,TArg2,System.Object);Argument[3];Argument[0].Parameter[1];value;hq-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TArg1,TArg2>;(System.Func<TArg1,TArg2,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Action<System.IAsyncResult>,TArg1,TArg2,System.Object);Argument[4];Argument[0].Parameter[3];value;dfc-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TArg1,TArg2>;(System.Func<TArg1,TArg2,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Action<System.IAsyncResult>,TArg1,TArg2,System.Object);Argument[4];Argument[0].Parameter[3];value;hq-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TArg1,TArg2>;(System.Func<TArg1,TArg2,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Action<System.IAsyncResult>,TArg1,TArg2,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[0].ReturnValue;Argument[1].Parameter[0];value;dfc-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TArg1,TArg2>;(System.Func<TArg1,TArg2,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Action<System.IAsyncResult>,TArg1,TArg2,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[0].ReturnValue;Argument[1].Parameter[0];value;hq-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TArg1,TArg2>;(System.Func<TArg1,TArg2,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Action<System.IAsyncResult>,TArg1,TArg2,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[0];Argument[0].Parameter[delegate-self];value;dfc-generated |
 | System.Threading.Tasks;TaskFactory;FromAsync<TArg1,TArg2>;(System.Func<TArg1,TArg2,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Action<System.IAsyncResult>,TArg1,TArg2,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TArg1,TArg2>;(System.Func<TArg1,TArg2,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Action<System.IAsyncResult>,TArg1,TArg2,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | System.Threading.Tasks;TaskFactory;FromAsync<TArg1,TArg2>;(System.Func<TArg1,TArg2,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Action<System.IAsyncResult>,TArg1,TArg2,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TArg1,TArg2>;(System.Func<TArg1,TArg2,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Action<System.IAsyncResult>,TArg1,TArg2,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[2];Argument[0].Parameter[0];value;dfc-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TArg1,TArg2>;(System.Func<TArg1,TArg2,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Action<System.IAsyncResult>,TArg1,TArg2,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[2];Argument[0].Parameter[0];value;hq-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TArg1,TArg2>;(System.Func<TArg1,TArg2,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Action<System.IAsyncResult>,TArg1,TArg2,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[3];Argument[0].Parameter[1];value;dfc-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TArg1,TArg2>;(System.Func<TArg1,TArg2,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Action<System.IAsyncResult>,TArg1,TArg2,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[3];Argument[0].Parameter[1];value;hq-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TArg1,TArg2>;(System.Func<TArg1,TArg2,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Action<System.IAsyncResult>,TArg1,TArg2,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[4];Argument[0].Parameter[3];value;dfc-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TArg1,TArg2>;(System.Func<TArg1,TArg2,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Action<System.IAsyncResult>,TArg1,TArg2,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[4];Argument[0].Parameter[3];value;hq-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TArg1,TResult>;(System.Func<TArg1,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,System.Object);Argument[0].ReturnValue;Argument[1].Parameter[0];value;dfc-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TArg1,TResult>;(System.Func<TArg1,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,System.Object);Argument[0].ReturnValue;Argument[1].Parameter[0];value;hq-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TArg1,TResult>;(System.Func<TArg1,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,System.Object);Argument[0];Argument[0].Parameter[delegate-self];value;dfc-generated |
 | System.Threading.Tasks;TaskFactory;FromAsync<TArg1,TResult>;(System.Func<TArg1,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,System.Object);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TArg1,TResult>;(System.Func<TArg1,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,System.Object);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | System.Threading.Tasks;TaskFactory;FromAsync<TArg1,TResult>;(System.Func<TArg1,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,System.Object);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TArg1,TResult>;(System.Func<TArg1,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,System.Object);Argument[2];Argument[0].Parameter[0];value;dfc-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TArg1,TResult>;(System.Func<TArg1,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,System.Object);Argument[2];Argument[0].Parameter[0];value;hq-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TArg1,TResult>;(System.Func<TArg1,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,System.Object);Argument[3];Argument[0].Parameter[2];value;dfc-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TArg1,TResult>;(System.Func<TArg1,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,System.Object);Argument[3];Argument[0].Parameter[2];value;hq-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TArg1,TResult>;(System.Func<TArg1,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[0].ReturnValue;Argument[1].Parameter[0];value;dfc-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TArg1,TResult>;(System.Func<TArg1,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[0].ReturnValue;Argument[1].Parameter[0];value;hq-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TArg1,TResult>;(System.Func<TArg1,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[0];Argument[0].Parameter[delegate-self];value;dfc-generated |
 | System.Threading.Tasks;TaskFactory;FromAsync<TArg1,TResult>;(System.Func<TArg1,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TArg1,TResult>;(System.Func<TArg1,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | System.Threading.Tasks;TaskFactory;FromAsync<TArg1,TResult>;(System.Func<TArg1,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TArg1,TResult>;(System.Func<TArg1,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[2];Argument[0].Parameter[0];value;dfc-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TArg1,TResult>;(System.Func<TArg1,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[2];Argument[0].Parameter[0];value;hq-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TArg1,TResult>;(System.Func<TArg1,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[3];Argument[0].Parameter[2];value;dfc-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TArg1,TResult>;(System.Func<TArg1,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[3];Argument[0].Parameter[2];value;hq-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TArg1>;(System.Func<TArg1,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Action<System.IAsyncResult>,TArg1,System.Object);Argument[0].ReturnValue;Argument[1].Parameter[0];value;dfc-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TArg1>;(System.Func<TArg1,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Action<System.IAsyncResult>,TArg1,System.Object);Argument[0].ReturnValue;Argument[1].Parameter[0];value;hq-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TArg1>;(System.Func<TArg1,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Action<System.IAsyncResult>,TArg1,System.Object);Argument[0];Argument[0].Parameter[delegate-self];value;dfc-generated |
 | System.Threading.Tasks;TaskFactory;FromAsync<TArg1>;(System.Func<TArg1,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Action<System.IAsyncResult>,TArg1,System.Object);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TArg1>;(System.Func<TArg1,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Action<System.IAsyncResult>,TArg1,System.Object);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | System.Threading.Tasks;TaskFactory;FromAsync<TArg1>;(System.Func<TArg1,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Action<System.IAsyncResult>,TArg1,System.Object);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TArg1>;(System.Func<TArg1,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Action<System.IAsyncResult>,TArg1,System.Object);Argument[2];Argument[0].Parameter[0];value;dfc-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TArg1>;(System.Func<TArg1,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Action<System.IAsyncResult>,TArg1,System.Object);Argument[2];Argument[0].Parameter[0];value;hq-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TArg1>;(System.Func<TArg1,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Action<System.IAsyncResult>,TArg1,System.Object);Argument[3];Argument[0].Parameter[2];value;dfc-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TArg1>;(System.Func<TArg1,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Action<System.IAsyncResult>,TArg1,System.Object);Argument[3];Argument[0].Parameter[2];value;hq-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TArg1>;(System.Func<TArg1,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Action<System.IAsyncResult>,TArg1,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[0].ReturnValue;Argument[1].Parameter[0];value;dfc-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TArg1>;(System.Func<TArg1,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Action<System.IAsyncResult>,TArg1,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[0].ReturnValue;Argument[1].Parameter[0];value;hq-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TArg1>;(System.Func<TArg1,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Action<System.IAsyncResult>,TArg1,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[0];Argument[0].Parameter[delegate-self];value;dfc-generated |
 | System.Threading.Tasks;TaskFactory;FromAsync<TArg1>;(System.Func<TArg1,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Action<System.IAsyncResult>,TArg1,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TArg1>;(System.Func<TArg1,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Action<System.IAsyncResult>,TArg1,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | System.Threading.Tasks;TaskFactory;FromAsync<TArg1>;(System.Func<TArg1,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Action<System.IAsyncResult>,TArg1,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TArg1>;(System.Func<TArg1,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Action<System.IAsyncResult>,TArg1,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[2];Argument[0].Parameter[0];value;dfc-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TArg1>;(System.Func<TArg1,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Action<System.IAsyncResult>,TArg1,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[2];Argument[0].Parameter[0];value;hq-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TArg1>;(System.Func<TArg1,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Action<System.IAsyncResult>,TArg1,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[3];Argument[0].Parameter[2];value;dfc-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TArg1>;(System.Func<TArg1,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Action<System.IAsyncResult>,TArg1,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[3];Argument[0].Parameter[2];value;hq-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TResult>;(System.Func<System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,System.Object);Argument[0].ReturnValue;Argument[1].Parameter[0];value;dfc-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TResult>;(System.Func<System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,System.Object);Argument[0].ReturnValue;Argument[1].Parameter[0];value;hq-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TResult>;(System.Func<System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,System.Object);Argument[0];Argument[0].Parameter[delegate-self];value;dfc-generated |
 | System.Threading.Tasks;TaskFactory;FromAsync<TResult>;(System.Func<System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,System.Object);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TResult>;(System.Func<System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,System.Object);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | System.Threading.Tasks;TaskFactory;FromAsync<TResult>;(System.Func<System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,System.Object);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TResult>;(System.Func<System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,System.Object);Argument[2];Argument[0].Parameter[1];value;dfc-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TResult>;(System.Func<System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,System.Object);Argument[2];Argument[0].Parameter[1];value;hq-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TResult>;(System.Func<System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[0].ReturnValue;Argument[1].Parameter[0];value;dfc-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TResult>;(System.Func<System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[0].ReturnValue;Argument[1].Parameter[0];value;hq-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TResult>;(System.Func<System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[0];Argument[0].Parameter[delegate-self];value;dfc-generated |
 | System.Threading.Tasks;TaskFactory;FromAsync<TResult>;(System.Func<System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TResult>;(System.Func<System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | System.Threading.Tasks;TaskFactory;FromAsync<TResult>;(System.Func<System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TResult>;(System.Func<System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[2];Argument[0].Parameter[1];value;dfc-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TResult>;(System.Func<System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[2];Argument[0].Parameter[1];value;hq-generated |
 | System.Threading.Tasks;TaskFactory;FromAsync<TResult>;(System.IAsyncResult,System.Func<System.IAsyncResult,TResult>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
 | System.Threading.Tasks;TaskFactory;FromAsync<TResult>;(System.IAsyncResult,System.Func<System.IAsyncResult,TResult>,System.Threading.Tasks.TaskCreationOptions);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
 | System.Threading.Tasks;TaskFactory;FromAsync<TResult>;(System.IAsyncResult,System.Func<System.IAsyncResult,TResult>,System.Threading.Tasks.TaskCreationOptions,System.Threading.Tasks.TaskScheduler);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
@@ -17292,12 +17904,12 @@ summary
 | System.Threading.Tasks;TaskFactory;StartNew<TResult>;(System.Func<TResult>,System.Threading.CancellationToken,System.Threading.Tasks.TaskCreationOptions,System.Threading.Tasks.TaskScheduler);Argument[0];Argument[0].Parameter[delegate-self];value;manual |
 | System.Threading.Tasks;TaskFactory;StartNew<TResult>;(System.Func<TResult>,System.Threading.Tasks.TaskCreationOptions);Argument[0].ReturnValue;ReturnValue.Property[System.Threading.Tasks.Task`1.Result];value;manual |
 | System.Threading.Tasks;TaskFactory;StartNew<TResult>;(System.Func<TResult>,System.Threading.Tasks.TaskCreationOptions);Argument[0];Argument[0].Parameter[delegate-self];value;manual |
-| System.Threading.Tasks;TaskFactory;TaskFactory;(System.Threading.CancellationToken);Argument[0];Argument[this];taint;df-generated |
-| System.Threading.Tasks;TaskFactory;TaskFactory;(System.Threading.CancellationToken,System.Threading.Tasks.TaskCreationOptions,System.Threading.Tasks.TaskContinuationOptions,System.Threading.Tasks.TaskScheduler);Argument[0];Argument[this];taint;df-generated |
-| System.Threading.Tasks;TaskFactory;TaskFactory;(System.Threading.CancellationToken,System.Threading.Tasks.TaskCreationOptions,System.Threading.Tasks.TaskContinuationOptions,System.Threading.Tasks.TaskScheduler);Argument[3];Argument[this];taint;df-generated |
-| System.Threading.Tasks;TaskFactory;TaskFactory;(System.Threading.Tasks.TaskScheduler);Argument[0];Argument[this];taint;df-generated |
-| System.Threading.Tasks;TaskFactory;get_CancellationToken;();Argument[this];ReturnValue;taint;df-generated |
-| System.Threading.Tasks;TaskFactory;get_Scheduler;();Argument[this];ReturnValue;taint;df-generated |
+| System.Threading.Tasks;TaskFactory;TaskFactory;(System.Threading.CancellationToken);Argument[0];Argument[this].SyntheticField[System.Threading.Tasks.TaskFactory.m_defaultCancellationToken];value;dfc-generated |
+| System.Threading.Tasks;TaskFactory;TaskFactory;(System.Threading.CancellationToken,System.Threading.Tasks.TaskCreationOptions,System.Threading.Tasks.TaskContinuationOptions,System.Threading.Tasks.TaskScheduler);Argument[0];Argument[this].SyntheticField[System.Threading.Tasks.TaskFactory.m_defaultCancellationToken];value;dfc-generated |
+| System.Threading.Tasks;TaskFactory;TaskFactory;(System.Threading.CancellationToken,System.Threading.Tasks.TaskCreationOptions,System.Threading.Tasks.TaskContinuationOptions,System.Threading.Tasks.TaskScheduler);Argument[3];Argument[this].SyntheticField[System.Threading.Tasks.TaskFactory.m_defaultScheduler];value;dfc-generated |
+| System.Threading.Tasks;TaskFactory;TaskFactory;(System.Threading.Tasks.TaskScheduler);Argument[0];Argument[this].SyntheticField[System.Threading.Tasks.TaskFactory.m_defaultScheduler];value;dfc-generated |
+| System.Threading.Tasks;TaskFactory;get_CancellationToken;();Argument[this].SyntheticField[System.Threading.Tasks.TaskFactory.m_defaultCancellationToken];ReturnValue;value;dfc-generated |
+| System.Threading.Tasks;TaskFactory;get_Scheduler;();Argument[this].SyntheticField[System.Threading.Tasks.TaskFactory.m_defaultScheduler];ReturnValue;value;dfc-generated |
 | System.Threading.Tasks;TaskFactory<TResult>;ContinueWhenAll;(System.Threading.Tasks.Task[],System.Func<System.Threading.Tasks.Task[],TResult>);Argument[1].ReturnValue;ReturnValue.Property[System.Threading.Tasks.Task`1.Result];value;manual |
 | System.Threading.Tasks;TaskFactory<TResult>;ContinueWhenAll;(System.Threading.Tasks.Task[],System.Func<System.Threading.Tasks.Task[],TResult>);Argument[1];Argument[1].Parameter[delegate-self];value;manual |
 | System.Threading.Tasks;TaskFactory<TResult>;ContinueWhenAll;(System.Threading.Tasks.Task[],System.Func<System.Threading.Tasks.Task[],TResult>,System.Threading.CancellationToken);Argument[1].ReturnValue;ReturnValue.Property[System.Threading.Tasks.Task`1.Result];value;manual |
@@ -17338,25 +17950,97 @@ summary
 | System.Threading.Tasks;TaskFactory<TResult>;ContinueWhenAny<TAntecedentResult>;(System.Threading.Tasks.Task<TAntecedentResult>[],System.Func<System.Threading.Tasks.Task<TAntecedentResult>,TResult>,System.Threading.Tasks.TaskContinuationOptions);Argument[0];Argument[1].Parameter[0];value;manual |
 | System.Threading.Tasks;TaskFactory<TResult>;ContinueWhenAny<TAntecedentResult>;(System.Threading.Tasks.Task<TAntecedentResult>[],System.Func<System.Threading.Tasks.Task<TAntecedentResult>,TResult>,System.Threading.Tasks.TaskContinuationOptions);Argument[1].ReturnValue;ReturnValue.Property[System.Threading.Tasks.Task`1.Result];value;manual |
 | System.Threading.Tasks;TaskFactory<TResult>;ContinueWhenAny<TAntecedentResult>;(System.Threading.Tasks.Task<TAntecedentResult>[],System.Func<System.Threading.Tasks.Task<TAntecedentResult>,TResult>,System.Threading.Tasks.TaskContinuationOptions);Argument[1];Argument[1].Parameter[delegate-self];value;manual |
+| System.Threading.Tasks;TaskFactory<TResult>;FromAsync;(System.Func<System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,System.Object);Argument[0].ReturnValue;Argument[1].Parameter[0];value;dfc-generated |
+| System.Threading.Tasks;TaskFactory<TResult>;FromAsync;(System.Func<System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,System.Object);Argument[0].ReturnValue;Argument[1].Parameter[0];value;hq-generated |
+| System.Threading.Tasks;TaskFactory<TResult>;FromAsync;(System.Func<System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,System.Object);Argument[0];Argument[0].Parameter[delegate-self];value;dfc-generated |
 | System.Threading.Tasks;TaskFactory<TResult>;FromAsync;(System.Func<System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,System.Object);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
+| System.Threading.Tasks;TaskFactory<TResult>;FromAsync;(System.Func<System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,System.Object);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | System.Threading.Tasks;TaskFactory<TResult>;FromAsync;(System.Func<System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,System.Object);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
+| System.Threading.Tasks;TaskFactory<TResult>;FromAsync;(System.Func<System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,System.Object);Argument[2];Argument[0].Parameter[1];value;dfc-generated |
+| System.Threading.Tasks;TaskFactory<TResult>;FromAsync;(System.Func<System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,System.Object);Argument[2];Argument[0].Parameter[1];value;hq-generated |
+| System.Threading.Tasks;TaskFactory<TResult>;FromAsync;(System.Func<System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[0].ReturnValue;Argument[1].Parameter[0];value;dfc-generated |
+| System.Threading.Tasks;TaskFactory<TResult>;FromAsync;(System.Func<System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[0].ReturnValue;Argument[1].Parameter[0];value;hq-generated |
+| System.Threading.Tasks;TaskFactory<TResult>;FromAsync;(System.Func<System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[0];Argument[0].Parameter[delegate-self];value;dfc-generated |
 | System.Threading.Tasks;TaskFactory<TResult>;FromAsync;(System.Func<System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
+| System.Threading.Tasks;TaskFactory<TResult>;FromAsync;(System.Func<System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | System.Threading.Tasks;TaskFactory<TResult>;FromAsync;(System.Func<System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
+| System.Threading.Tasks;TaskFactory<TResult>;FromAsync;(System.Func<System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[2];Argument[0].Parameter[1];value;dfc-generated |
+| System.Threading.Tasks;TaskFactory<TResult>;FromAsync;(System.Func<System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[2];Argument[0].Parameter[1];value;hq-generated |
 | System.Threading.Tasks;TaskFactory<TResult>;FromAsync;(System.IAsyncResult,System.Func<System.IAsyncResult,TResult>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
 | System.Threading.Tasks;TaskFactory<TResult>;FromAsync;(System.IAsyncResult,System.Func<System.IAsyncResult,TResult>,System.Threading.Tasks.TaskCreationOptions);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
 | System.Threading.Tasks;TaskFactory<TResult>;FromAsync;(System.IAsyncResult,System.Func<System.IAsyncResult,TResult>,System.Threading.Tasks.TaskCreationOptions,System.Threading.Tasks.TaskScheduler);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
+| System.Threading.Tasks;TaskFactory<TResult>;FromAsync<TArg1,TArg2,TArg3>;(System.Func<TArg1,TArg2,TArg3,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,TArg2,TArg3,System.Object);Argument[0].ReturnValue;Argument[1].Parameter[0];value;dfc-generated |
+| System.Threading.Tasks;TaskFactory<TResult>;FromAsync<TArg1,TArg2,TArg3>;(System.Func<TArg1,TArg2,TArg3,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,TArg2,TArg3,System.Object);Argument[0].ReturnValue;Argument[1].Parameter[0];value;hq-generated |
+| System.Threading.Tasks;TaskFactory<TResult>;FromAsync<TArg1,TArg2,TArg3>;(System.Func<TArg1,TArg2,TArg3,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,TArg2,TArg3,System.Object);Argument[0];Argument[0].Parameter[delegate-self];value;dfc-generated |
 | System.Threading.Tasks;TaskFactory<TResult>;FromAsync<TArg1,TArg2,TArg3>;(System.Func<TArg1,TArg2,TArg3,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,TArg2,TArg3,System.Object);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
+| System.Threading.Tasks;TaskFactory<TResult>;FromAsync<TArg1,TArg2,TArg3>;(System.Func<TArg1,TArg2,TArg3,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,TArg2,TArg3,System.Object);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | System.Threading.Tasks;TaskFactory<TResult>;FromAsync<TArg1,TArg2,TArg3>;(System.Func<TArg1,TArg2,TArg3,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,TArg2,TArg3,System.Object);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
+| System.Threading.Tasks;TaskFactory<TResult>;FromAsync<TArg1,TArg2,TArg3>;(System.Func<TArg1,TArg2,TArg3,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,TArg2,TArg3,System.Object);Argument[2];Argument[0].Parameter[0];value;dfc-generated |
+| System.Threading.Tasks;TaskFactory<TResult>;FromAsync<TArg1,TArg2,TArg3>;(System.Func<TArg1,TArg2,TArg3,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,TArg2,TArg3,System.Object);Argument[2];Argument[0].Parameter[0];value;hq-generated |
+| System.Threading.Tasks;TaskFactory<TResult>;FromAsync<TArg1,TArg2,TArg3>;(System.Func<TArg1,TArg2,TArg3,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,TArg2,TArg3,System.Object);Argument[3];Argument[0].Parameter[1];value;dfc-generated |
+| System.Threading.Tasks;TaskFactory<TResult>;FromAsync<TArg1,TArg2,TArg3>;(System.Func<TArg1,TArg2,TArg3,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,TArg2,TArg3,System.Object);Argument[3];Argument[0].Parameter[1];value;hq-generated |
+| System.Threading.Tasks;TaskFactory<TResult>;FromAsync<TArg1,TArg2,TArg3>;(System.Func<TArg1,TArg2,TArg3,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,TArg2,TArg3,System.Object);Argument[4];Argument[0].Parameter[2];value;dfc-generated |
+| System.Threading.Tasks;TaskFactory<TResult>;FromAsync<TArg1,TArg2,TArg3>;(System.Func<TArg1,TArg2,TArg3,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,TArg2,TArg3,System.Object);Argument[4];Argument[0].Parameter[2];value;hq-generated |
+| System.Threading.Tasks;TaskFactory<TResult>;FromAsync<TArg1,TArg2,TArg3>;(System.Func<TArg1,TArg2,TArg3,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,TArg2,TArg3,System.Object);Argument[5];Argument[0].Parameter[4];value;dfc-generated |
+| System.Threading.Tasks;TaskFactory<TResult>;FromAsync<TArg1,TArg2,TArg3>;(System.Func<TArg1,TArg2,TArg3,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,TArg2,TArg3,System.Object);Argument[5];Argument[0].Parameter[4];value;hq-generated |
+| System.Threading.Tasks;TaskFactory<TResult>;FromAsync<TArg1,TArg2,TArg3>;(System.Func<TArg1,TArg2,TArg3,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,TArg2,TArg3,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[0].ReturnValue;Argument[1].Parameter[0];value;dfc-generated |
+| System.Threading.Tasks;TaskFactory<TResult>;FromAsync<TArg1,TArg2,TArg3>;(System.Func<TArg1,TArg2,TArg3,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,TArg2,TArg3,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[0].ReturnValue;Argument[1].Parameter[0];value;hq-generated |
+| System.Threading.Tasks;TaskFactory<TResult>;FromAsync<TArg1,TArg2,TArg3>;(System.Func<TArg1,TArg2,TArg3,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,TArg2,TArg3,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[0];Argument[0].Parameter[delegate-self];value;dfc-generated |
 | System.Threading.Tasks;TaskFactory<TResult>;FromAsync<TArg1,TArg2,TArg3>;(System.Func<TArg1,TArg2,TArg3,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,TArg2,TArg3,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
+| System.Threading.Tasks;TaskFactory<TResult>;FromAsync<TArg1,TArg2,TArg3>;(System.Func<TArg1,TArg2,TArg3,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,TArg2,TArg3,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | System.Threading.Tasks;TaskFactory<TResult>;FromAsync<TArg1,TArg2,TArg3>;(System.Func<TArg1,TArg2,TArg3,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,TArg2,TArg3,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
+| System.Threading.Tasks;TaskFactory<TResult>;FromAsync<TArg1,TArg2,TArg3>;(System.Func<TArg1,TArg2,TArg3,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,TArg2,TArg3,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[2];Argument[0].Parameter[0];value;dfc-generated |
+| System.Threading.Tasks;TaskFactory<TResult>;FromAsync<TArg1,TArg2,TArg3>;(System.Func<TArg1,TArg2,TArg3,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,TArg2,TArg3,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[2];Argument[0].Parameter[0];value;hq-generated |
+| System.Threading.Tasks;TaskFactory<TResult>;FromAsync<TArg1,TArg2,TArg3>;(System.Func<TArg1,TArg2,TArg3,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,TArg2,TArg3,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[3];Argument[0].Parameter[1];value;dfc-generated |
+| System.Threading.Tasks;TaskFactory<TResult>;FromAsync<TArg1,TArg2,TArg3>;(System.Func<TArg1,TArg2,TArg3,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,TArg2,TArg3,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[3];Argument[0].Parameter[1];value;hq-generated |
+| System.Threading.Tasks;TaskFactory<TResult>;FromAsync<TArg1,TArg2,TArg3>;(System.Func<TArg1,TArg2,TArg3,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,TArg2,TArg3,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[4];Argument[0].Parameter[2];value;dfc-generated |
+| System.Threading.Tasks;TaskFactory<TResult>;FromAsync<TArg1,TArg2,TArg3>;(System.Func<TArg1,TArg2,TArg3,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,TArg2,TArg3,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[4];Argument[0].Parameter[2];value;hq-generated |
+| System.Threading.Tasks;TaskFactory<TResult>;FromAsync<TArg1,TArg2,TArg3>;(System.Func<TArg1,TArg2,TArg3,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,TArg2,TArg3,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[5];Argument[0].Parameter[4];value;dfc-generated |
+| System.Threading.Tasks;TaskFactory<TResult>;FromAsync<TArg1,TArg2,TArg3>;(System.Func<TArg1,TArg2,TArg3,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,TArg2,TArg3,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[5];Argument[0].Parameter[4];value;hq-generated |
+| System.Threading.Tasks;TaskFactory<TResult>;FromAsync<TArg1,TArg2>;(System.Func<TArg1,TArg2,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,TArg2,System.Object);Argument[0].ReturnValue;Argument[1].Parameter[0];value;dfc-generated |
+| System.Threading.Tasks;TaskFactory<TResult>;FromAsync<TArg1,TArg2>;(System.Func<TArg1,TArg2,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,TArg2,System.Object);Argument[0].ReturnValue;Argument[1].Parameter[0];value;hq-generated |
+| System.Threading.Tasks;TaskFactory<TResult>;FromAsync<TArg1,TArg2>;(System.Func<TArg1,TArg2,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,TArg2,System.Object);Argument[0];Argument[0].Parameter[delegate-self];value;dfc-generated |
 | System.Threading.Tasks;TaskFactory<TResult>;FromAsync<TArg1,TArg2>;(System.Func<TArg1,TArg2,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,TArg2,System.Object);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
+| System.Threading.Tasks;TaskFactory<TResult>;FromAsync<TArg1,TArg2>;(System.Func<TArg1,TArg2,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,TArg2,System.Object);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | System.Threading.Tasks;TaskFactory<TResult>;FromAsync<TArg1,TArg2>;(System.Func<TArg1,TArg2,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,TArg2,System.Object);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
+| System.Threading.Tasks;TaskFactory<TResult>;FromAsync<TArg1,TArg2>;(System.Func<TArg1,TArg2,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,TArg2,System.Object);Argument[2];Argument[0].Parameter[0];value;dfc-generated |
+| System.Threading.Tasks;TaskFactory<TResult>;FromAsync<TArg1,TArg2>;(System.Func<TArg1,TArg2,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,TArg2,System.Object);Argument[2];Argument[0].Parameter[0];value;hq-generated |
+| System.Threading.Tasks;TaskFactory<TResult>;FromAsync<TArg1,TArg2>;(System.Func<TArg1,TArg2,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,TArg2,System.Object);Argument[3];Argument[0].Parameter[1];value;dfc-generated |
+| System.Threading.Tasks;TaskFactory<TResult>;FromAsync<TArg1,TArg2>;(System.Func<TArg1,TArg2,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,TArg2,System.Object);Argument[3];Argument[0].Parameter[1];value;hq-generated |
+| System.Threading.Tasks;TaskFactory<TResult>;FromAsync<TArg1,TArg2>;(System.Func<TArg1,TArg2,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,TArg2,System.Object);Argument[4];Argument[0].Parameter[3];value;dfc-generated |
+| System.Threading.Tasks;TaskFactory<TResult>;FromAsync<TArg1,TArg2>;(System.Func<TArg1,TArg2,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,TArg2,System.Object);Argument[4];Argument[0].Parameter[3];value;hq-generated |
+| System.Threading.Tasks;TaskFactory<TResult>;FromAsync<TArg1,TArg2>;(System.Func<TArg1,TArg2,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,TArg2,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[0].ReturnValue;Argument[1].Parameter[0];value;dfc-generated |
+| System.Threading.Tasks;TaskFactory<TResult>;FromAsync<TArg1,TArg2>;(System.Func<TArg1,TArg2,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,TArg2,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[0].ReturnValue;Argument[1].Parameter[0];value;hq-generated |
+| System.Threading.Tasks;TaskFactory<TResult>;FromAsync<TArg1,TArg2>;(System.Func<TArg1,TArg2,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,TArg2,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[0];Argument[0].Parameter[delegate-self];value;dfc-generated |
 | System.Threading.Tasks;TaskFactory<TResult>;FromAsync<TArg1,TArg2>;(System.Func<TArg1,TArg2,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,TArg2,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
+| System.Threading.Tasks;TaskFactory<TResult>;FromAsync<TArg1,TArg2>;(System.Func<TArg1,TArg2,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,TArg2,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | System.Threading.Tasks;TaskFactory<TResult>;FromAsync<TArg1,TArg2>;(System.Func<TArg1,TArg2,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,TArg2,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
+| System.Threading.Tasks;TaskFactory<TResult>;FromAsync<TArg1,TArg2>;(System.Func<TArg1,TArg2,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,TArg2,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[2];Argument[0].Parameter[0];value;dfc-generated |
+| System.Threading.Tasks;TaskFactory<TResult>;FromAsync<TArg1,TArg2>;(System.Func<TArg1,TArg2,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,TArg2,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[2];Argument[0].Parameter[0];value;hq-generated |
+| System.Threading.Tasks;TaskFactory<TResult>;FromAsync<TArg1,TArg2>;(System.Func<TArg1,TArg2,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,TArg2,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[3];Argument[0].Parameter[1];value;dfc-generated |
+| System.Threading.Tasks;TaskFactory<TResult>;FromAsync<TArg1,TArg2>;(System.Func<TArg1,TArg2,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,TArg2,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[3];Argument[0].Parameter[1];value;hq-generated |
+| System.Threading.Tasks;TaskFactory<TResult>;FromAsync<TArg1,TArg2>;(System.Func<TArg1,TArg2,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,TArg2,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[4];Argument[0].Parameter[3];value;dfc-generated |
+| System.Threading.Tasks;TaskFactory<TResult>;FromAsync<TArg1,TArg2>;(System.Func<TArg1,TArg2,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,TArg2,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[4];Argument[0].Parameter[3];value;hq-generated |
+| System.Threading.Tasks;TaskFactory<TResult>;FromAsync<TArg1>;(System.Func<TArg1,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,System.Object);Argument[0].ReturnValue;Argument[1].Parameter[0];value;dfc-generated |
+| System.Threading.Tasks;TaskFactory<TResult>;FromAsync<TArg1>;(System.Func<TArg1,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,System.Object);Argument[0].ReturnValue;Argument[1].Parameter[0];value;hq-generated |
+| System.Threading.Tasks;TaskFactory<TResult>;FromAsync<TArg1>;(System.Func<TArg1,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,System.Object);Argument[0];Argument[0].Parameter[delegate-self];value;dfc-generated |
 | System.Threading.Tasks;TaskFactory<TResult>;FromAsync<TArg1>;(System.Func<TArg1,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,System.Object);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
+| System.Threading.Tasks;TaskFactory<TResult>;FromAsync<TArg1>;(System.Func<TArg1,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,System.Object);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | System.Threading.Tasks;TaskFactory<TResult>;FromAsync<TArg1>;(System.Func<TArg1,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,System.Object);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
+| System.Threading.Tasks;TaskFactory<TResult>;FromAsync<TArg1>;(System.Func<TArg1,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,System.Object);Argument[2];Argument[0].Parameter[0];value;dfc-generated |
+| System.Threading.Tasks;TaskFactory<TResult>;FromAsync<TArg1>;(System.Func<TArg1,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,System.Object);Argument[2];Argument[0].Parameter[0];value;hq-generated |
+| System.Threading.Tasks;TaskFactory<TResult>;FromAsync<TArg1>;(System.Func<TArg1,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,System.Object);Argument[3];Argument[0].Parameter[2];value;dfc-generated |
+| System.Threading.Tasks;TaskFactory<TResult>;FromAsync<TArg1>;(System.Func<TArg1,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,System.Object);Argument[3];Argument[0].Parameter[2];value;hq-generated |
+| System.Threading.Tasks;TaskFactory<TResult>;FromAsync<TArg1>;(System.Func<TArg1,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[0].ReturnValue;Argument[1].Parameter[0];value;dfc-generated |
+| System.Threading.Tasks;TaskFactory<TResult>;FromAsync<TArg1>;(System.Func<TArg1,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[0].ReturnValue;Argument[1].Parameter[0];value;hq-generated |
+| System.Threading.Tasks;TaskFactory<TResult>;FromAsync<TArg1>;(System.Func<TArg1,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[0];Argument[0].Parameter[delegate-self];value;dfc-generated |
 | System.Threading.Tasks;TaskFactory<TResult>;FromAsync<TArg1>;(System.Func<TArg1,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
+| System.Threading.Tasks;TaskFactory<TResult>;FromAsync<TArg1>;(System.Func<TArg1,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | System.Threading.Tasks;TaskFactory<TResult>;FromAsync<TArg1>;(System.Func<TArg1,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
+| System.Threading.Tasks;TaskFactory<TResult>;FromAsync<TArg1>;(System.Func<TArg1,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[2];Argument[0].Parameter[0];value;dfc-generated |
+| System.Threading.Tasks;TaskFactory<TResult>;FromAsync<TArg1>;(System.Func<TArg1,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[2];Argument[0].Parameter[0];value;hq-generated |
+| System.Threading.Tasks;TaskFactory<TResult>;FromAsync<TArg1>;(System.Func<TArg1,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[3];Argument[0].Parameter[2];value;dfc-generated |
+| System.Threading.Tasks;TaskFactory<TResult>;FromAsync<TArg1>;(System.Func<TArg1,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[3];Argument[0].Parameter[2];value;hq-generated |
 | System.Threading.Tasks;TaskFactory<TResult>;StartNew;(System.Func<System.Object,TResult>,System.Object);Argument[0].ReturnValue;ReturnValue.Property[System.Threading.Tasks.Task`1.Result];value;manual |
 | System.Threading.Tasks;TaskFactory<TResult>;StartNew;(System.Func<System.Object,TResult>,System.Object);Argument[0];Argument[0].Parameter[delegate-self];value;manual |
 | System.Threading.Tasks;TaskFactory<TResult>;StartNew;(System.Func<System.Object,TResult>,System.Object);Argument[1];Argument[0].Parameter[0];value;manual |
@@ -17377,68 +18061,116 @@ summary
 | System.Threading.Tasks;TaskFactory<TResult>;StartNew;(System.Func<TResult>,System.Threading.CancellationToken,System.Threading.Tasks.TaskCreationOptions,System.Threading.Tasks.TaskScheduler);Argument[0];Argument[0].Parameter[delegate-self];value;manual |
 | System.Threading.Tasks;TaskFactory<TResult>;StartNew;(System.Func<TResult>,System.Threading.Tasks.TaskCreationOptions);Argument[0].ReturnValue;ReturnValue.Property[System.Threading.Tasks.Task`1.Result];value;manual |
 | System.Threading.Tasks;TaskFactory<TResult>;StartNew;(System.Func<TResult>,System.Threading.Tasks.TaskCreationOptions);Argument[0];Argument[0].Parameter[delegate-self];value;manual |
-| System.Threading.Tasks;TaskFactory<TResult>;TaskFactory;(System.Threading.CancellationToken);Argument[0];Argument[this];taint;df-generated |
-| System.Threading.Tasks;TaskFactory<TResult>;TaskFactory;(System.Threading.CancellationToken,System.Threading.Tasks.TaskCreationOptions,System.Threading.Tasks.TaskContinuationOptions,System.Threading.Tasks.TaskScheduler);Argument[0];Argument[this];taint;df-generated |
-| System.Threading.Tasks;TaskFactory<TResult>;TaskFactory;(System.Threading.CancellationToken,System.Threading.Tasks.TaskCreationOptions,System.Threading.Tasks.TaskContinuationOptions,System.Threading.Tasks.TaskScheduler);Argument[3];Argument[this];taint;df-generated |
-| System.Threading.Tasks;TaskFactory<TResult>;TaskFactory;(System.Threading.Tasks.TaskScheduler);Argument[0];Argument[this];taint;df-generated |
-| System.Threading.Tasks;TaskFactory<TResult>;get_CancellationToken;();Argument[this];ReturnValue;taint;df-generated |
-| System.Threading.Tasks;TaskFactory<TResult>;get_Scheduler;();Argument[this];ReturnValue;taint;df-generated |
+| System.Threading.Tasks;TaskFactory<TResult>;TaskFactory;(System.Threading.CancellationToken);Argument[0];Argument[this].SyntheticField[System.Threading.Tasks.TaskFactory`1.m_defaultCancellationToken];value;dfc-generated |
+| System.Threading.Tasks;TaskFactory<TResult>;TaskFactory;(System.Threading.CancellationToken,System.Threading.Tasks.TaskCreationOptions,System.Threading.Tasks.TaskContinuationOptions,System.Threading.Tasks.TaskScheduler);Argument[0];Argument[this].SyntheticField[System.Threading.Tasks.TaskFactory`1.m_defaultCancellationToken];value;dfc-generated |
+| System.Threading.Tasks;TaskFactory<TResult>;TaskFactory;(System.Threading.CancellationToken,System.Threading.Tasks.TaskCreationOptions,System.Threading.Tasks.TaskContinuationOptions,System.Threading.Tasks.TaskScheduler);Argument[3];Argument[this].SyntheticField[System.Threading.Tasks.TaskFactory`1.m_defaultScheduler];value;dfc-generated |
+| System.Threading.Tasks;TaskFactory<TResult>;TaskFactory;(System.Threading.Tasks.TaskScheduler);Argument[0];Argument[this].SyntheticField[System.Threading.Tasks.TaskFactory`1.m_defaultScheduler];value;dfc-generated |
+| System.Threading.Tasks;TaskFactory<TResult>;get_CancellationToken;();Argument[this].SyntheticField[System.Threading.Tasks.TaskFactory`1.m_defaultCancellationToken];ReturnValue;value;dfc-generated |
+| System.Threading.Tasks;TaskFactory<TResult>;get_Scheduler;();Argument[this].SyntheticField[System.Threading.Tasks.TaskFactory`1.m_defaultScheduler];ReturnValue;value;dfc-generated |
 | System.Threading.Tasks;TaskScheduler;GetScheduledTasks;();Argument[this];ReturnValue;taint;df-generated |
 | System.Threading.Tasks;TaskScheduler;add_UnobservedTaskException;(System.EventHandler<System.Threading.Tasks.UnobservedTaskExceptionEventArgs>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Threading.Tasks;TaskScheduler;remove_UnobservedTaskException;(System.EventHandler<System.Threading.Tasks.UnobservedTaskExceptionEventArgs>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
+| System.Threading.Tasks;TaskToAsyncResult;Begin;(System.Threading.Tasks.Task,System.AsyncCallback,System.Object);Argument[0];ReturnValue.SyntheticField[System.Threading.Tasks.TaskToAsyncResult+TaskAsyncResult._task];value;dfc-generated |
+| System.Threading.Tasks;TaskToAsyncResult;Begin;(System.Threading.Tasks.Task,System.AsyncCallback,System.Object);Argument[0];ReturnValue.SyntheticField[System.Threading.Tasks.TaskToAsyncResult+TaskAsyncResult._task];value;hq-generated |
+| System.Threading.Tasks;TaskToAsyncResult;Begin;(System.Threading.Tasks.Task,System.AsyncCallback,System.Object);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | System.Threading.Tasks;TaskToAsyncResult;Begin;(System.Threading.Tasks.Task,System.AsyncCallback,System.Object);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
-| System.Threading.Tasks;UnobservedTaskExceptionEventArgs;UnobservedTaskExceptionEventArgs;(System.AggregateException);Argument[0];Argument[this];taint;df-generated |
-| System.Threading.Tasks;UnobservedTaskExceptionEventArgs;get_Exception;();Argument[this];ReturnValue;taint;df-generated |
-| System.Threading.Tasks;ValueTask;AsTask;();Argument[this];ReturnValue;taint;df-generated |
+| System.Threading.Tasks;UnobservedTaskExceptionEventArgs;UnobservedTaskExceptionEventArgs;(System.AggregateException);Argument[0];Argument[this].SyntheticField[System.Threading.Tasks.UnobservedTaskExceptionEventArgs.m_exception];value;dfc-generated |
+| System.Threading.Tasks;UnobservedTaskExceptionEventArgs;get_Exception;();Argument[this].SyntheticField[System.Threading.Tasks.UnobservedTaskExceptionEventArgs.m_exception];ReturnValue;value;dfc-generated |
+| System.Threading.Tasks;ValueTask;AsTask;();Argument[this].SyntheticField[System.Threading.Tasks.ValueTask._obj];ReturnValue;value;dfc-generated |
 | System.Threading.Tasks;ValueTask;ConfigureAwait;(System.Boolean);Argument[this];ReturnValue;taint;df-generated |
 | System.Threading.Tasks;ValueTask;FromResult<TResult>;(TResult);Argument[0];ReturnValue;taint;df-generated |
 | System.Threading.Tasks;ValueTask;GetAwaiter;();Argument[this];ReturnValue;taint;df-generated |
-| System.Threading.Tasks;ValueTask;Preserve;();Argument[this];ReturnValue;taint;df-generated |
-| System.Threading.Tasks;ValueTask;ValueTask;(System.Threading.Tasks.Sources.IValueTaskSource,System.Int16);Argument[0];Argument[this];taint;df-generated |
-| System.Threading.Tasks;ValueTask;ValueTask;(System.Threading.Tasks.Task);Argument[0];Argument[this];taint;df-generated |
-| System.Threading.Tasks;ValueTask<TResult>;AsTask;();Argument[this];ReturnValue;taint;df-generated |
+| System.Threading.Tasks;ValueTask;Preserve;();Argument[this].SyntheticField[System.Threading.Tasks.ValueTask._obj];ReturnValue.SyntheticField[System.Threading.Tasks.ValueTask._obj];value;dfc-generated |
+| System.Threading.Tasks;ValueTask;Preserve;();Argument[this];ReturnValue;value;dfc-generated |
+| System.Threading.Tasks;ValueTask;ValueTask;(System.Threading.Tasks.Sources.IValueTaskSource,System.Int16);Argument[0];Argument[this].SyntheticField[System.Threading.Tasks.ValueTask._obj];value;dfc-generated |
+| System.Threading.Tasks;ValueTask;ValueTask;(System.Threading.Tasks.Task);Argument[0];Argument[this].SyntheticField[System.Threading.Tasks.ValueTask._obj];value;dfc-generated |
+| System.Threading.Tasks;ValueTask<TResult>;AsTask;();Argument[this].SyntheticField[System.Threading.Tasks.ValueTask`1._obj];ReturnValue;value;dfc-generated |
+| System.Threading.Tasks;ValueTask<TResult>;AsTask;();Argument[this].SyntheticField[System.Threading.Tasks.ValueTask`1._result];ReturnValue.Property[System.Threading.Tasks.Task`1.Result];value;dfc-generated |
 | System.Threading.Tasks;ValueTask<TResult>;ConfigureAwait;(System.Boolean);Argument[this];ReturnValue;taint;df-generated |
 | System.Threading.Tasks;ValueTask<TResult>;GetAwaiter;();Argument[this];ReturnValue;taint;df-generated |
 | System.Threading.Tasks;ValueTask<TResult>;Preserve;();Argument[this];ReturnValue;taint;df-generated |
 | System.Threading.Tasks;ValueTask<TResult>;ToString;();Argument[this];ReturnValue;taint;df-generated |
-| System.Threading.Tasks;ValueTask<TResult>;ValueTask;(System.Threading.Tasks.Sources.IValueTaskSource<TResult>,System.Int16);Argument[0];Argument[this];taint;df-generated |
-| System.Threading.Tasks;ValueTask<TResult>;ValueTask;(System.Threading.Tasks.Task<TResult>);Argument[0];Argument[this];taint;df-generated |
-| System.Threading.Tasks;ValueTask<TResult>;ValueTask;(TResult);Argument[0];Argument[this];taint;df-generated |
-| System.Threading.Tasks;ValueTask<TResult>;get_Result;();Argument[this];ReturnValue;taint;df-generated |
-| System.Threading;AbandonedMutexException;AbandonedMutexException;(System.Int32,System.Threading.WaitHandle);Argument[1];Argument[this];taint;df-generated |
-| System.Threading;AbandonedMutexException;AbandonedMutexException;(System.String,System.Exception,System.Int32,System.Threading.WaitHandle);Argument[3];Argument[this];taint;df-generated |
-| System.Threading;AbandonedMutexException;AbandonedMutexException;(System.String,System.Int32,System.Threading.WaitHandle);Argument[2];Argument[this];taint;df-generated |
-| System.Threading;AbandonedMutexException;get_Mutex;();Argument[this];ReturnValue;taint;df-generated |
+| System.Threading.Tasks;ValueTask<TResult>;ValueTask;(System.Threading.Tasks.Sources.IValueTaskSource<TResult>,System.Int16);Argument[0];Argument[this].SyntheticField[System.Threading.Tasks.ValueTask`1._obj];value;dfc-generated |
+| System.Threading.Tasks;ValueTask<TResult>;ValueTask;(System.Threading.Tasks.Task<TResult>);Argument[0];Argument[this].SyntheticField[System.Threading.Tasks.ValueTask`1._obj];value;dfc-generated |
+| System.Threading.Tasks;ValueTask<TResult>;ValueTask;(TResult);Argument[0];Argument[this].SyntheticField[System.Threading.Tasks.ValueTask`1._result];value;dfc-generated |
+| System.Threading.Tasks;ValueTask<TResult>;get_Result;();Argument[this].SyntheticField[System.Threading.Tasks.ValueTask`1._result];ReturnValue;value;dfc-generated |
+| System.Threading;AbandonedMutexException;AbandonedMutexException;(System.Int32,System.Threading.WaitHandle);Argument[1];Argument[this].SyntheticField[System.Threading.AbandonedMutexException._mutex];value;dfc-generated |
+| System.Threading;AbandonedMutexException;AbandonedMutexException;(System.String,System.Exception,System.Int32,System.Threading.WaitHandle);Argument[3];Argument[this].SyntheticField[System.Threading.AbandonedMutexException._mutex];value;dfc-generated |
+| System.Threading;AbandonedMutexException;AbandonedMutexException;(System.String,System.Int32,System.Threading.WaitHandle);Argument[2];Argument[this].SyntheticField[System.Threading.AbandonedMutexException._mutex];value;dfc-generated |
+| System.Threading;AbandonedMutexException;get_Mutex;();Argument[this].SyntheticField[System.Threading.AbandonedMutexException._mutex];ReturnValue;value;dfc-generated |
 | System.Threading;AsyncLocal<T>;AsyncLocal;(System.Action<System.Threading.AsyncLocalValueChangedArgs<T>>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Threading;Barrier;Barrier;(System.Int32,System.Action<System.Threading.Barrier>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
 | System.Threading;CancellationToken;Register;(System.Action);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Threading;CancellationToken;Register;(System.Action,System.Boolean);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
+| System.Threading;CancellationToken;Register;(System.Action<System.Object,System.Threading.CancellationToken>,System.Object);Argument[0];Argument[0].Parameter[delegate-self];value;dfc-generated |
 | System.Threading;CancellationToken;Register;(System.Action<System.Object,System.Threading.CancellationToken>,System.Object);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
+| System.Threading;CancellationToken;Register;(System.Action<System.Object,System.Threading.CancellationToken>,System.Object);Argument[1];Argument[0].Parameter[0];value;dfc-generated |
+| System.Threading;CancellationToken;Register;(System.Action<System.Object,System.Threading.CancellationToken>,System.Object);Argument[1];Argument[0].Parameter[0];value;hq-generated |
+| System.Threading;CancellationToken;Register;(System.Action<System.Object>,System.Object);Argument[0];Argument[0].Parameter[delegate-self];value;dfc-generated |
 | System.Threading;CancellationToken;Register;(System.Action<System.Object>,System.Object);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
+| System.Threading;CancellationToken;Register;(System.Action<System.Object>,System.Object);Argument[1];Argument[0].Parameter[0];value;dfc-generated |
+| System.Threading;CancellationToken;Register;(System.Action<System.Object>,System.Object);Argument[1];Argument[0].Parameter[0];value;hq-generated |
+| System.Threading;CancellationToken;Register;(System.Action<System.Object>,System.Object,System.Boolean);Argument[0];Argument[0].Parameter[delegate-self];value;dfc-generated |
 | System.Threading;CancellationToken;Register;(System.Action<System.Object>,System.Object,System.Boolean);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
+| System.Threading;CancellationToken;Register;(System.Action<System.Object>,System.Object,System.Boolean);Argument[1];Argument[0].Parameter[0];value;dfc-generated |
+| System.Threading;CancellationToken;Register;(System.Action<System.Object>,System.Object,System.Boolean);Argument[1];Argument[0].Parameter[0];value;hq-generated |
+| System.Threading;CancellationToken;UnsafeRegister;(System.Action<System.Object,System.Threading.CancellationToken>,System.Object);Argument[0];Argument[0].Parameter[delegate-self];value;dfc-generated |
 | System.Threading;CancellationToken;UnsafeRegister;(System.Action<System.Object,System.Threading.CancellationToken>,System.Object);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
+| System.Threading;CancellationToken;UnsafeRegister;(System.Action<System.Object,System.Threading.CancellationToken>,System.Object);Argument[1];Argument[0].Parameter[0];value;dfc-generated |
+| System.Threading;CancellationToken;UnsafeRegister;(System.Action<System.Object,System.Threading.CancellationToken>,System.Object);Argument[1];Argument[0].Parameter[0];value;hq-generated |
+| System.Threading;CancellationToken;UnsafeRegister;(System.Action<System.Object>,System.Object);Argument[0];Argument[0].Parameter[delegate-self];value;dfc-generated |
 | System.Threading;CancellationToken;UnsafeRegister;(System.Action<System.Object>,System.Object);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
+| System.Threading;CancellationToken;UnsafeRegister;(System.Action<System.Object>,System.Object);Argument[1];Argument[0].Parameter[0];value;dfc-generated |
+| System.Threading;CancellationToken;UnsafeRegister;(System.Action<System.Object>,System.Object);Argument[1];Argument[0].Parameter[0];value;hq-generated |
 | System.Threading;CancellationToken;get_WaitHandle;();Argument[this];ReturnValue;taint;df-generated |
 | System.Threading;CancellationTokenRegistration;DisposeAsync;();Argument[this];ReturnValue;taint;df-generated |
-| System.Threading;CancellationTokenSource;CancelAsync;();Argument[this];ReturnValue;taint;df-generated |
+| System.Threading;CancellationTokenSource;CancelAsync;();Argument[this];ReturnValue.SyntheticField[System.Threading.Tasks.Task.m_stateObject];value;dfc-generated |
 | System.Threading;CancellationTokenSource;get_Token;();Argument[this];ReturnValue;taint;df-generated |
-| System.Threading;CompressedStack;CreateCopy;();Argument[this];ReturnValue;value;df-generated |
+| System.Threading;CompressedStack;CreateCopy;();Argument[this];ReturnValue;value;dfc-generated |
 | System.Threading;CompressedStack;GetObjectData;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);Argument[this];Argument[0];taint;df-generated |
+| System.Threading;CompressedStack;Run;(System.Threading.CompressedStack,System.Threading.ContextCallback,System.Object);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | System.Threading;CompressedStack;Run;(System.Threading.CompressedStack,System.Threading.ContextCallback,System.Object);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
+| System.Threading;CompressedStack;Run;(System.Threading.CompressedStack,System.Threading.ContextCallback,System.Object);Argument[2];Argument[1].Parameter[0];value;dfc-generated |
+| System.Threading;CompressedStack;Run;(System.Threading.CompressedStack,System.Threading.ContextCallback,System.Object);Argument[2];Argument[1].Parameter[0];value;hq-generated |
 | System.Threading;ContextCallback;BeginInvoke;(System.Object,System.AsyncCallback,System.Object);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
 | System.Threading;CountdownEvent;get_WaitHandle;();Argument[this];ReturnValue;taint;df-generated |
-| System.Threading;ExecutionContext;CreateCopy;();Argument[this];ReturnValue;value;df-generated |
+| System.Threading;ExecutionContext;CreateCopy;();Argument[this];ReturnValue;value;dfc-generated |
 | System.Threading;ExecutionContext;GetObjectData;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);Argument[this];Argument[0];taint;df-generated |
+| System.Threading;ExecutionContext;Run;(System.Threading.ExecutionContext,System.Threading.ContextCallback,System.Object);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | System.Threading;ExecutionContext;Run;(System.Threading.ExecutionContext,System.Threading.ContextCallback,System.Object);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
+| System.Threading;ExecutionContext;Run;(System.Threading.ExecutionContext,System.Threading.ContextCallback,System.Object);Argument[2];Argument[1].Parameter[0];value;dfc-generated |
+| System.Threading;ExecutionContext;Run;(System.Threading.ExecutionContext,System.Threading.ContextCallback,System.Object);Argument[2];Argument[1].Parameter[0];value;hq-generated |
 | System.Threading;HostExecutionContextManager;SetHostExecutionContext;(System.Threading.HostExecutionContext);Argument[0];ReturnValue;taint;df-generated |
 | System.Threading;IOCompletionCallback;BeginInvoke;(System.UInt32,System.UInt32,System.Threading.NativeOverlapped*,System.AsyncCallback,System.Object);Argument[3];Argument[3].Parameter[delegate-self];value;hq-generated |
-| System.Threading;LazyInitializer;EnsureInitialized<T>;(T);Argument[0];ReturnValue;taint;df-generated |
-| System.Threading;LazyInitializer;EnsureInitialized<T>;(T,System.Boolean,System.Object);Argument[0];ReturnValue;taint;df-generated |
-| System.Threading;LazyInitializer;EnsureInitialized<T>;(T,System.Boolean,System.Object);Argument[2];ReturnValue;taint;df-generated |
+| System.Threading;Interlocked;CompareExchange;(System.IntPtr,System.IntPtr,System.IntPtr);Argument[0];ReturnValue;value;dfc-generated |
+| System.Threading;Interlocked;CompareExchange;(System.UIntPtr,System.UIntPtr,System.UIntPtr);Argument[0];ReturnValue;value;dfc-generated |
+| System.Threading;Interlocked;CompareExchange<T>;(T,T,T);Argument[0];ReturnValue;value;dfc-generated |
+| System.Threading;Interlocked;Exchange;(System.IntPtr,System.IntPtr);Argument[0];ReturnValue;value;dfc-generated |
+| System.Threading;Interlocked;Exchange;(System.UIntPtr,System.UIntPtr);Argument[0];ReturnValue;value;dfc-generated |
+| System.Threading;Interlocked;Exchange<T>;(T,T);Argument[0];ReturnValue;value;dfc-generated |
+| System.Threading;LazyInitializer;EnsureInitialized<T>;(T);Argument[0];ReturnValue;value;dfc-generated |
+| System.Threading;LazyInitializer;EnsureInitialized<T>;(T,System.Boolean,System.Object);Argument[0];ReturnValue;value;dfc-generated |
+| System.Threading;LazyInitializer;EnsureInitialized<T>;(T,System.Boolean,System.Object);Argument[2];ReturnValue;value;dfc-generated |
+| System.Threading;LazyInitializer;EnsureInitialized<T>;(T,System.Boolean,System.Object,System.Func<T>);Argument[0];ReturnValue;value;dfc-generated |
+| System.Threading;LazyInitializer;EnsureInitialized<T>;(T,System.Boolean,System.Object,System.Func<T>);Argument[0];ReturnValue;value;hq-generated |
+| System.Threading;LazyInitializer;EnsureInitialized<T>;(T,System.Boolean,System.Object,System.Func<T>);Argument[2];ReturnValue;value;dfc-generated |
+| System.Threading;LazyInitializer;EnsureInitialized<T>;(T,System.Boolean,System.Object,System.Func<T>);Argument[2];ReturnValue;value;hq-generated |
+| System.Threading;LazyInitializer;EnsureInitialized<T>;(T,System.Boolean,System.Object,System.Func<T>);Argument[3].ReturnValue;ReturnValue;value;dfc-generated |
+| System.Threading;LazyInitializer;EnsureInitialized<T>;(T,System.Boolean,System.Object,System.Func<T>);Argument[3].ReturnValue;ReturnValue;value;hq-generated |
+| System.Threading;LazyInitializer;EnsureInitialized<T>;(T,System.Boolean,System.Object,System.Func<T>);Argument[3];Argument[3].Parameter[delegate-self];value;dfc-generated |
 | System.Threading;LazyInitializer;EnsureInitialized<T>;(T,System.Boolean,System.Object,System.Func<T>);Argument[3];Argument[3].Parameter[delegate-self];value;hq-generated |
+| System.Threading;LazyInitializer;EnsureInitialized<T>;(T,System.Func<T>);Argument[0];ReturnValue;value;dfc-generated |
+| System.Threading;LazyInitializer;EnsureInitialized<T>;(T,System.Func<T>);Argument[0];ReturnValue;value;hq-generated |
+| System.Threading;LazyInitializer;EnsureInitialized<T>;(T,System.Func<T>);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | System.Threading;LazyInitializer;EnsureInitialized<T>;(T,System.Func<T>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
+| System.Threading;LazyInitializer;EnsureInitialized<T>;(T,System.Object,System.Func<T>);Argument[0];ReturnValue;value;dfc-generated |
+| System.Threading;LazyInitializer;EnsureInitialized<T>;(T,System.Object,System.Func<T>);Argument[0];ReturnValue;value;hq-generated |
+| System.Threading;LazyInitializer;EnsureInitialized<T>;(T,System.Object,System.Func<T>);Argument[1];ReturnValue;value;dfc-generated |
+| System.Threading;LazyInitializer;EnsureInitialized<T>;(T,System.Object,System.Func<T>);Argument[1];ReturnValue;value;hq-generated |
+| System.Threading;LazyInitializer;EnsureInitialized<T>;(T,System.Object,System.Func<T>);Argument[2];Argument[2].Parameter[delegate-self];value;dfc-generated |
 | System.Threading;LazyInitializer;EnsureInitialized<T>;(T,System.Object,System.Func<T>);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
 | System.Threading;ManualResetEventSlim;get_WaitHandle;();Argument[this];ReturnValue;taint;df-generated |
+| System.Threading;Mutex;TryOpenExisting;(System.String,System.Threading.Mutex);Argument[1];ReturnValue;value;dfc-generated |
 | System.Threading;Overlapped;Overlapped;(System.Int32,System.Int32,System.IntPtr,System.IAsyncResult);Argument[2];Argument[this];taint;df-generated |
 | System.Threading;Overlapped;Overlapped;(System.Int32,System.Int32,System.IntPtr,System.IAsyncResult);Argument[3];Argument[this];taint;df-generated |
 | System.Threading;Overlapped;Pack;(System.Threading.IOCompletionCallback);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
@@ -17451,6 +18183,8 @@ summary
 | System.Threading;PeriodicTimer;WaitForNextTickAsync;(System.Threading.CancellationToken);Argument[this];ReturnValue;taint;df-generated |
 | System.Threading;PreAllocatedOverlapped;PreAllocatedOverlapped;(System.Threading.IOCompletionCallback,System.Object,System.Object);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Threading;PreAllocatedOverlapped;UnsafeCreate;(System.Threading.IOCompletionCallback,System.Object,System.Object);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
+| System.Threading;ReaderWriterLock;DowngradeFromWriterLock;(System.Threading.LockCookie);Argument[0];ReturnValue;value;dfc-generated |
+| System.Threading;ReaderWriterLock;RestoreLock;(System.Threading.LockCookie);Argument[0];ReturnValue;value;dfc-generated |
 | System.Threading;RegisteredWaitHandle;Unregister;(System.Threading.WaitHandle);Argument[0];Argument[this];taint;df-generated |
 | System.Threading;SemaphoreSlim;WaitAsync;();Argument[this];ReturnValue;taint;df-generated |
 | System.Threading;SemaphoreSlim;WaitAsync;(System.Int32);Argument[this];ReturnValue;taint;df-generated |
@@ -17464,15 +18198,24 @@ summary
 | System.Threading;SpinWait;SpinUntil;(System.Func<System.Boolean>,System.Int32);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Threading;SpinWait;SpinUntil;(System.Func<System.Boolean>,System.TimeSpan);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Threading;SynchronizationContext;Post;(System.Threading.SendOrPostCallback,System.Object);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
+| System.Threading;SynchronizationContext;Send;(System.Threading.SendOrPostCallback,System.Object);Argument[0];Argument[0].Parameter[delegate-self];value;dfc-generated |
 | System.Threading;SynchronizationContext;Send;(System.Threading.SendOrPostCallback,System.Object);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
-| System.Threading;Thread;GetData;(System.LocalDataStoreSlot);Argument[0];ReturnValue;taint;df-generated |
-| System.Threading;Thread;SetData;(System.LocalDataStoreSlot,System.Object);Argument[1];Argument[0];taint;df-generated |
+| System.Threading;SynchronizationContext;Send;(System.Threading.SendOrPostCallback,System.Object);Argument[1];Argument[0].Parameter[0];value;dfc-generated |
+| System.Threading;SynchronizationContext;Send;(System.Threading.SendOrPostCallback,System.Object);Argument[1];Argument[0].Parameter[0];value;hq-generated |
+| System.Threading;Thread;GetData;(System.LocalDataStoreSlot);Argument[0].SyntheticField[System.LocalDataStoreSlot.Data].Property[System.Threading.ThreadLocal`1.Value];ReturnValue;value;dfc-generated |
+| System.Threading;Thread;SetData;(System.LocalDataStoreSlot,System.Object);Argument[1];Argument[0].SyntheticField[System.LocalDataStoreSlot.Data].Property[System.Threading.ThreadLocal`1.Value];value;dfc-generated |
 | System.Threading;Thread;Thread;(System.Threading.ParameterizedThreadStart);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Threading;Thread;Thread;(System.Threading.ParameterizedThreadStart,System.Int32);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Threading;Thread;Thread;(System.Threading.ThreadStart);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Threading;Thread;Thread;(System.Threading.ThreadStart,System.Int32);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
-| System.Threading;ThreadExceptionEventArgs;ThreadExceptionEventArgs;(System.Exception);Argument[0];Argument[this];taint;df-generated |
-| System.Threading;ThreadExceptionEventArgs;get_Exception;();Argument[this];ReturnValue;taint;df-generated |
+| System.Threading;Thread;VolatileRead;(System.IntPtr);Argument[0];ReturnValue;value;dfc-generated |
+| System.Threading;Thread;VolatileRead;(System.Object);Argument[0];ReturnValue;value;dfc-generated |
+| System.Threading;Thread;VolatileRead;(System.UIntPtr);Argument[0];ReturnValue;value;dfc-generated |
+| System.Threading;Thread;VolatileWrite;(System.IntPtr,System.IntPtr);Argument[0];ReturnValue;value;dfc-generated |
+| System.Threading;Thread;VolatileWrite;(System.Object,System.Object);Argument[0];ReturnValue;value;dfc-generated |
+| System.Threading;Thread;VolatileWrite;(System.UIntPtr,System.UIntPtr);Argument[0];ReturnValue;value;dfc-generated |
+| System.Threading;ThreadExceptionEventArgs;ThreadExceptionEventArgs;(System.Exception);Argument[0];Argument[this].SyntheticField[System.Threading.ThreadExceptionEventArgs.m_exception];value;dfc-generated |
+| System.Threading;ThreadExceptionEventArgs;get_Exception;();Argument[this].SyntheticField[System.Threading.ThreadExceptionEventArgs.m_exception];ReturnValue;value;dfc-generated |
 | System.Threading;ThreadExceptionEventHandler;BeginInvoke;(System.Object,System.Threading.ThreadExceptionEventArgs,System.AsyncCallback,System.Object);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
 | System.Threading;ThreadLocal<T>;ThreadLocal;(System.Func<T>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Threading;ThreadLocal<T>;ThreadLocal;(System.Func<T>,System.Boolean);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
@@ -17502,28 +18245,38 @@ summary
 | System.Threading;Timer;Timer;(System.Threading.TimerCallback,System.Object,System.TimeSpan,System.TimeSpan);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Threading;Timer;Timer;(System.Threading.TimerCallback,System.Object,System.UInt32,System.UInt32);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Threading;TimerCallback;BeginInvoke;(System.Object,System.AsyncCallback,System.Object);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
+| System.Threading;Volatile;Write;(System.IntPtr,System.IntPtr);Argument[0];ReturnValue;value;dfc-generated |
+| System.Threading;Volatile;Write;(System.UIntPtr,System.UIntPtr);Argument[0];ReturnValue;value;dfc-generated |
+| System.Threading;Volatile;Write<T>;(T,T);Argument[0];ReturnValue;value;dfc-generated |
 | System.Threading;WaitCallback;BeginInvoke;(System.Object,System.AsyncCallback,System.Object);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
-| System.Threading;WaitHandleExtensions;GetSafeWaitHandle;(System.Threading.WaitHandle);Argument[0];ReturnValue;taint;df-generated |
+| System.Threading;WaitHandleExtensions;GetSafeWaitHandle;(System.Threading.WaitHandle);Argument[0].Property[System.Threading.WaitHandle.SafeWaitHandle];ReturnValue;value;dfc-generated |
 | System.Threading;WaitHandleExtensions;SetSafeWaitHandle;(System.Threading.WaitHandle,Microsoft.Win32.SafeHandles.SafeWaitHandle);Argument[1];Argument[0];taint;df-generated |
 | System.Threading;WaitOrTimerCallback;BeginInvoke;(System.Object,System.Boolean,System.AsyncCallback,System.Object);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
 | System.Timers;ElapsedEventHandler;BeginInvoke;(System.Object,System.Timers.ElapsedEventArgs,System.AsyncCallback,System.Object);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
 | System.Timers;Timer;add_Elapsed;(System.Timers.ElapsedEventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Timers;Timer;remove_Elapsed;(System.Timers.ElapsedEventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
-| System.Timers;TimersDescriptionAttribute;get_Description;();Argument[this];ReturnValue;taint;df-generated |
+| System.Timers;TimersDescriptionAttribute;get_Description;();Argument[this].Property[System.ComponentModel.DescriptionAttribute.DescriptionValue];ReturnValue;value;dfc-generated |
+| System.Timers;TimersDescriptionAttribute;get_Description;();Argument[this].Property[System.ComponentModel.DescriptionAttribute.Description];Argument[this].Property[System.ComponentModel.DescriptionAttribute.DescriptionValue];taint;dfc-generated |
+| System.Timers;TimersDescriptionAttribute;get_Description;();Argument[this].Property[System.ComponentModel.DescriptionAttribute.Description];ReturnValue;value;dfc-generated |
+| System.Transactions;CommittableTransaction;BeginCommit;(System.AsyncCallback,System.Object);Argument[0];Argument[0].Parameter[delegate-self];value;dfc-generated |
 | System.Transactions;CommittableTransaction;BeginCommit;(System.AsyncCallback,System.Object);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
+| System.Transactions;CommittableTransaction;BeginCommit;(System.AsyncCallback,System.Object);Argument[1];ReturnValue.SyntheticField[System.Transactions.Transaction._internalTransaction].SyntheticField[System.Transactions.InternalTransaction._asyncState];value;dfc-generated |
+| System.Transactions;CommittableTransaction;BeginCommit;(System.AsyncCallback,System.Object);Argument[1];ReturnValue.SyntheticField[System.Transactions.Transaction._internalTransaction].SyntheticField[System.Transactions.InternalTransaction._asyncState];value;hq-generated |
+| System.Transactions;CommittableTransaction;BeginCommit;(System.AsyncCallback,System.Object);Argument[this];ReturnValue;value;dfc-generated |
+| System.Transactions;CommittableTransaction;BeginCommit;(System.AsyncCallback,System.Object);Argument[this];ReturnValue;value;hq-generated |
+| System.Transactions;CommittableTransaction;get_AsyncState;();Argument[this].SyntheticField[System.Transactions.Transaction._internalTransaction].SyntheticField[System.Transactions.InternalTransaction._asyncState];ReturnValue;value;df-generated |
+| System.Transactions;CommittableTransaction;get_AsyncState;();Argument[this].SyntheticField[System.Transactions.Transaction._internalTransaction].SyntheticField[System.Transactions.InternalTransaction._asyncState];ReturnValue;value;dfc-generated |
 | System.Transactions;CommittableTransaction;get_AsyncState;();Argument[this];ReturnValue;taint;df-generated |
+| System.Transactions;CommittableTransaction;get_AsyncState;();Argument[this];ReturnValue;taint;dfc-generated |
 | System.Transactions;CommittableTransaction;get_AsyncWaitHandle;();Argument[this];ReturnValue;taint;df-generated |
-| System.Transactions;DistributedTransactionPermission;Copy;();Argument[this];ReturnValue;taint;df-generated |
-| System.Transactions;DistributedTransactionPermission;Copy;();Argument[this];ReturnValue;value;df-generated |
-| System.Transactions;DistributedTransactionPermission;Intersect;(System.Security.IPermission);Argument[0];ReturnValue;taint;df-generated |
-| System.Transactions;DistributedTransactionPermission;Intersect;(System.Security.IPermission);Argument[this];ReturnValue;taint;df-generated |
+| System.Transactions;DistributedTransactionPermission;Copy;();Argument[this];ReturnValue;value;dfc-generated |
+| System.Transactions;DistributedTransactionPermission;Intersect;(System.Security.IPermission);Argument[0];ReturnValue;value;dfc-generated |
 | System.Transactions;DistributedTransactionPermission;Union;(System.Security.IPermission);Argument[this];ReturnValue;taint;df-generated |
 | System.Transactions;HostCurrentTransactionCallback;BeginInvoke;(System.AsyncCallback,System.Object);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Transactions;Transaction;Clone;();Argument[this];ReturnValue;taint;df-generated |
 | System.Transactions;Transaction;EnlistDurable;(System.Guid,System.Transactions.ISinglePhaseNotification,System.Transactions.EnlistmentOptions);Argument[0];ReturnValue;taint;df-generated |
 | System.Transactions;Transaction;EnlistPromotableSinglePhase;(System.Transactions.IPromotableSinglePhaseNotification);Argument[0];Argument[this];taint;df-generated |
-| System.Transactions;Transaction;EnlistPromotableSinglePhase;(System.Transactions.IPromotableSinglePhaseNotification,System.Guid);Argument[0];Argument[this];taint;df-generated |
-| System.Transactions;Transaction;EnlistPromotableSinglePhase;(System.Transactions.IPromotableSinglePhaseNotification,System.Guid);Argument[1];Argument[this];taint;df-generated |
+| System.Transactions;Transaction;EnlistPromotableSinglePhase;(System.Transactions.IPromotableSinglePhaseNotification,System.Guid);Argument[1];Argument[this].SyntheticField[System.Transactions.Transaction._internalTransaction].SyntheticField[System.Transactions.InternalTransaction._promoterType];value;dfc-generated |
 | System.Transactions;Transaction;EnlistVolatile;(System.Transactions.IEnlistmentNotification,System.Transactions.EnlistmentOptions);Argument[0];ReturnValue;taint;df-generated |
 | System.Transactions;Transaction;EnlistVolatile;(System.Transactions.IEnlistmentNotification,System.Transactions.EnlistmentOptions);Argument[this];ReturnValue;taint;df-generated |
 | System.Transactions;Transaction;EnlistVolatile;(System.Transactions.ISinglePhaseNotification,System.Transactions.EnlistmentOptions);Argument[0];ReturnValue;taint;df-generated |
@@ -17533,7 +18286,7 @@ summary
 | System.Transactions;Transaction;Rollback;(System.Exception);Argument[0];Argument[this];taint;df-generated |
 | System.Transactions;Transaction;SetDistributedTransactionIdentifier;(System.Transactions.IPromotableSinglePhaseNotification,System.Guid);Argument[1];Argument[this];taint;df-generated |
 | System.Transactions;Transaction;add_TransactionCompleted;(System.Transactions.TransactionCompletedEventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
-| System.Transactions;Transaction;get_PromoterType;();Argument[this];ReturnValue;taint;df-generated |
+| System.Transactions;Transaction;get_PromoterType;();Argument[this].SyntheticField[System.Transactions.Transaction._internalTransaction].SyntheticField[System.Transactions.InternalTransaction._promoterType];ReturnValue;value;dfc-generated |
 | System.Transactions;Transaction;get_TransactionInformation;();Argument[this];ReturnValue;taint;df-generated |
 | System.Transactions;Transaction;remove_TransactionCompleted;(System.Transactions.TransactionCompletedEventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Transactions;TransactionCompletedEventHandler;BeginInvoke;(System.Object,System.Transactions.TransactionEventArgs,System.AsyncCallback,System.Object);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
@@ -17547,10 +18300,8 @@ summary
 | System.Transactions;TransactionScope;TransactionScope;(System.Transactions.Transaction,System.Transactions.TransactionScopeAsyncFlowOption);Argument[0];Argument[this];taint;df-generated |
 | System.Transactions;TransactionStartedEventHandler;BeginInvoke;(System.Object,System.Transactions.TransactionEventArgs,System.AsyncCallback,System.Object);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
 | System.Web.UI.WebControls;TextBox;get_Text;();Argument[this];ReturnValue;taint;manual |
-| System.Web;AspNetHostingPermission;Copy;();Argument[this];ReturnValue;taint;df-generated |
-| System.Web;AspNetHostingPermission;Copy;();Argument[this];ReturnValue;value;df-generated |
-| System.Web;AspNetHostingPermission;Intersect;(System.Security.IPermission);Argument[0];ReturnValue;taint;df-generated |
-| System.Web;AspNetHostingPermission;Intersect;(System.Security.IPermission);Argument[this];ReturnValue;taint;df-generated |
+| System.Web;AspNetHostingPermission;Copy;();Argument[this];ReturnValue;value;dfc-generated |
+| System.Web;AspNetHostingPermission;Intersect;(System.Security.IPermission);Argument[0];ReturnValue;value;dfc-generated |
 | System.Web;AspNetHostingPermission;Union;(System.Security.IPermission);Argument[this];ReturnValue;taint;df-generated |
 | System.Web;HttpCookie;get_Value;();Argument[this];ReturnValue;taint;manual |
 | System.Web;HttpCookie;get_Values;();Argument[this];ReturnValue;taint;manual |
@@ -17558,8 +18309,7 @@ summary
 | System.Web;HttpServerUtility;UrlEncode;(System.String);Argument[0];ReturnValue;taint;manual |
 | System.Web;HttpUtility;HtmlAttributeEncode;(System.String);Argument[0];ReturnValue;taint;manual |
 | System.Web;HttpUtility;HtmlAttributeEncode;(System.String,System.IO.TextWriter);Argument[0];ReturnValue;taint;manual |
-| System.Web;HttpUtility;HtmlDecode;(System.String);Argument[0];ReturnValue;taint;df-generated |
-| System.Web;HttpUtility;HtmlDecode;(System.String,System.IO.TextWriter);Argument[0];Argument[1];taint;df-generated |
+| System.Web;HttpUtility;HtmlDecode;(System.String);Argument[0];ReturnValue;value;dfc-generated |
 | System.Web;HttpUtility;HtmlEncode;(System.Object);Argument[0];ReturnValue;taint;manual |
 | System.Web;HttpUtility;HtmlEncode;(System.String);Argument[0];ReturnValue;taint;manual |
 | System.Web;HttpUtility;HtmlEncode;(System.String,System.IO.TextWriter);Argument[0];ReturnValue;taint;manual |
@@ -17569,48 +18319,46 @@ summary
 | System.Web;HttpUtility;UrlEncode;(System.Byte[],System.Int32,System.Int32);Argument[0];ReturnValue;taint;manual |
 | System.Web;HttpUtility;UrlEncode;(System.String);Argument[0];ReturnValue;taint;manual |
 | System.Web;HttpUtility;UrlEncode;(System.String,System.Text.Encoding);Argument[0];ReturnValue;taint;manual |
-| System.Web;HttpUtility;UrlEncodeToBytes;(System.Byte[]);Argument[0].Element;ReturnValue;taint;df-generated |
-| System.Web;HttpUtility;UrlEncodeToBytes;(System.Byte[],System.Int32,System.Int32);Argument[0].Element;ReturnValue;taint;df-generated |
-| System.Web;HttpUtility;UrlEncodeToBytes;(System.String);Argument[0];ReturnValue;taint;df-generated |
-| System.Web;HttpUtility;UrlEncodeToBytes;(System.String,System.Text.Encoding);Argument[0];ReturnValue;taint;df-generated |
-| System.Web;HttpUtility;UrlPathEncode;(System.String);Argument[0];ReturnValue;taint;df-generated |
+| System.Web;HttpUtility;UrlEncodeToBytes;(System.Byte[]);Argument[0].Element;ReturnValue.Element;value;dfc-generated |
+| System.Web;HttpUtility;UrlEncodeToBytes;(System.Byte[]);Argument[0];ReturnValue;value;dfc-generated |
+| System.Web;HttpUtility;UrlEncodeToBytes;(System.Byte[],System.Int32,System.Int32);Argument[0].Element;ReturnValue.Element;value;dfc-generated |
+| System.Web;HttpUtility;UrlEncodeToBytes;(System.Byte[],System.Int32,System.Int32);Argument[0];ReturnValue;value;dfc-generated |
+| System.Web;HttpUtility;UrlEncodeToBytes;(System.String);Argument[0];ReturnValue;taint;dfc-generated |
+| System.Web;HttpUtility;UrlEncodeToBytes;(System.String,System.Text.Encoding);Argument[0];ReturnValue;taint;dfc-generated |
+| System.Web;HttpUtility;UrlPathEncode;(System.String);Argument[0];ReturnValue;value;dfc-generated |
 | System.Windows.Input;ICommand;add_CanExecuteChanged;(System.EventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Windows.Input;ICommand;remove_CanExecuteChanged;(System.EventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
-| System.Windows.Markup;ValueSerializerAttribute;ValueSerializerAttribute;(System.String);Argument[0];Argument[this];taint;df-generated |
-| System.Windows.Markup;ValueSerializerAttribute;get_ValueSerializerTypeName;();Argument[this];ReturnValue;taint;df-generated |
-| System.Xaml.Permissions;XamlLoadPermission;Copy;();Argument[this];ReturnValue;taint;df-generated |
-| System.Xaml.Permissions;XamlLoadPermission;Copy;();Argument[this];ReturnValue;value;df-generated |
-| System.Xaml.Permissions;XamlLoadPermission;Intersect;(System.Security.IPermission);Argument[0];ReturnValue;taint;df-generated |
-| System.Xaml.Permissions;XamlLoadPermission;Intersect;(System.Security.IPermission);Argument[this];ReturnValue;taint;df-generated |
+| System.Windows.Markup;ValueSerializerAttribute;ValueSerializerAttribute;(System.String);Argument[0];Argument[this].SyntheticField[System.Windows.Markup.ValueSerializerAttribute._valueSerializerTypeName];value;dfc-generated |
+| System.Windows.Markup;ValueSerializerAttribute;get_ValueSerializerTypeName;();Argument[this].SyntheticField[System.Windows.Markup.ValueSerializerAttribute._valueSerializerTypeName];ReturnValue;value;dfc-generated |
+| System.Xaml.Permissions;XamlLoadPermission;Copy;();Argument[this];ReturnValue;value;dfc-generated |
+| System.Xaml.Permissions;XamlLoadPermission;Intersect;(System.Security.IPermission);Argument[0];ReturnValue;value;dfc-generated |
 | System.Xaml.Permissions;XamlLoadPermission;Union;(System.Security.IPermission);Argument[this];ReturnValue;taint;df-generated |
 | System.Xml.Linq;Extensions;Ancestors<T>;(System.Collections.Generic.IEnumerable<T>);Argument[0].Element;ReturnValue;taint;df-generated |
 | System.Xml.Linq;Extensions;Ancestors<T>;(System.Collections.Generic.IEnumerable<T>,System.Xml.Linq.XName);Argument[0].Element;ReturnValue;taint;df-generated |
-| System.Xml.Linq;Extensions;AncestorsAndSelf;(System.Collections.Generic.IEnumerable<System.Xml.Linq.XElement>);Argument[0].Element;ReturnValue;taint;df-generated |
-| System.Xml.Linq;Extensions;AncestorsAndSelf;(System.Collections.Generic.IEnumerable<System.Xml.Linq.XElement>,System.Xml.Linq.XName);Argument[0].Element;ReturnValue;taint;df-generated |
+| System.Xml.Linq;Extensions;AncestorsAndSelf;(System.Collections.Generic.IEnumerable<System.Xml.Linq.XElement>);Argument[0].Element;ReturnValue.Element;value;dfc-generated |
+| System.Xml.Linq;Extensions;AncestorsAndSelf;(System.Collections.Generic.IEnumerable<System.Xml.Linq.XElement>,System.Xml.Linq.XName);Argument[0].Element;ReturnValue.Element;value;dfc-generated |
 | System.Xml.Linq;Extensions;Attributes;(System.Collections.Generic.IEnumerable<System.Xml.Linq.XElement>);Argument[0].Element;ReturnValue;taint;df-generated |
 | System.Xml.Linq;Extensions;Attributes;(System.Collections.Generic.IEnumerable<System.Xml.Linq.XElement>,System.Xml.Linq.XName);Argument[0].Element;ReturnValue;taint;df-generated |
-| System.Xml.Linq;Extensions;DescendantNodes<T>;(System.Collections.Generic.IEnumerable<T>);Argument[0].Element;ReturnValue;taint;df-generated |
-| System.Xml.Linq;Extensions;DescendantNodesAndSelf;(System.Collections.Generic.IEnumerable<System.Xml.Linq.XElement>);Argument[0].Element;ReturnValue;taint;df-generated |
+| System.Xml.Linq;Extensions;DescendantNodes<T>;(System.Collections.Generic.IEnumerable<T>);Argument[0].Element.Property[System.Xml.Linq.XContainer.FirstNode];ReturnValue.Element;value;dfc-generated |
+| System.Xml.Linq;Extensions;DescendantNodesAndSelf;(System.Collections.Generic.IEnumerable<System.Xml.Linq.XElement>);Argument[0].Element.Property[System.Xml.Linq.XContainer.FirstNode];ReturnValue.Element;value;dfc-generated |
+| System.Xml.Linq;Extensions;DescendantNodesAndSelf;(System.Collections.Generic.IEnumerable<System.Xml.Linq.XElement>);Argument[0].Element;ReturnValue.Element;value;dfc-generated |
 | System.Xml.Linq;Extensions;Descendants<T>;(System.Collections.Generic.IEnumerable<T>);Argument[0].Element;ReturnValue;taint;df-generated |
 | System.Xml.Linq;Extensions;Descendants<T>;(System.Collections.Generic.IEnumerable<T>,System.Xml.Linq.XName);Argument[0].Element;ReturnValue;taint;df-generated |
-| System.Xml.Linq;Extensions;DescendantsAndSelf;(System.Collections.Generic.IEnumerable<System.Xml.Linq.XElement>);Argument[0].Element;ReturnValue;taint;df-generated |
-| System.Xml.Linq;Extensions;DescendantsAndSelf;(System.Collections.Generic.IEnumerable<System.Xml.Linq.XElement>,System.Xml.Linq.XName);Argument[0].Element;ReturnValue;taint;df-generated |
+| System.Xml.Linq;Extensions;DescendantsAndSelf;(System.Collections.Generic.IEnumerable<System.Xml.Linq.XElement>);Argument[0].Element;ReturnValue.Element;value;dfc-generated |
+| System.Xml.Linq;Extensions;DescendantsAndSelf;(System.Collections.Generic.IEnumerable<System.Xml.Linq.XElement>,System.Xml.Linq.XName);Argument[0].Element;ReturnValue.Element;value;dfc-generated |
 | System.Xml.Linq;Extensions;Elements<T>;(System.Collections.Generic.IEnumerable<T>);Argument[0].Element;ReturnValue;taint;df-generated |
 | System.Xml.Linq;Extensions;Elements<T>;(System.Collections.Generic.IEnumerable<T>,System.Xml.Linq.XName);Argument[0].Element;ReturnValue;taint;df-generated |
-| System.Xml.Linq;Extensions;InDocumentOrder<T>;(System.Collections.Generic.IEnumerable<T>);Argument[0].Element;ReturnValue;taint;df-generated |
+| System.Xml.Linq;Extensions;InDocumentOrder<T>;(System.Collections.Generic.IEnumerable<T>);Argument[0].Element;ReturnValue.Element;value;dfc-generated |
 | System.Xml.Linq;Extensions;Nodes<T>;(System.Collections.Generic.IEnumerable<T>);Argument[0].Element;ReturnValue;taint;df-generated |
 | System.Xml.Linq;XAttribute;SetValue;(System.Object);Argument[0];Argument[this];taint;df-generated |
-| System.Xml.Linq;XAttribute;XAttribute;(System.Xml.Linq.XAttribute);Argument[0];Argument[this];taint;df-generated |
-| System.Xml.Linq;XAttribute;XAttribute;(System.Xml.Linq.XName,System.Object);Argument[0];Argument[this];taint;df-generated |
-| System.Xml.Linq;XAttribute;XAttribute;(System.Xml.Linq.XName,System.Object);Argument[1];Argument[this];taint;df-generated |
-| System.Xml.Linq;XAttribute;get_Name;();Argument[this];ReturnValue;taint;df-generated |
+| System.Xml.Linq;XAttribute;XAttribute;(System.Xml.Linq.XAttribute);Argument[0].SyntheticField[System.Xml.Linq.XAttribute.name];Argument[this].SyntheticField[System.Xml.Linq.XAttribute.name];value;dfc-generated |
+| System.Xml.Linq;XAttribute;XAttribute;(System.Xml.Linq.XName,System.Object);Argument[0];Argument[this].SyntheticField[System.Xml.Linq.XAttribute.name];value;dfc-generated |
+| System.Xml.Linq;XAttribute;get_Name;();Argument[this].SyntheticField[System.Xml.Linq.XAttribute.name];ReturnValue;value;dfc-generated |
 | System.Xml.Linq;XAttribute;get_NextAttribute;();Argument[this];ReturnValue;taint;df-generated |
 | System.Xml.Linq;XAttribute;get_PreviousAttribute;();Argument[this];ReturnValue;taint;df-generated |
 | System.Xml.Linq;XCData;WriteTo;(System.Xml.XmlWriter);Argument[this];Argument[0];taint;df-generated |
-| System.Xml.Linq;XCData;WriteToAsync;(System.Xml.XmlWriter,System.Threading.CancellationToken);Argument[1];ReturnValue;taint;df-generated |
 | System.Xml.Linq;XCData;WriteToAsync;(System.Xml.XmlWriter,System.Threading.CancellationToken);Argument[this];Argument[0];taint;df-generated |
 | System.Xml.Linq;XComment;WriteTo;(System.Xml.XmlWriter);Argument[this];Argument[0];taint;df-generated |
-| System.Xml.Linq;XComment;WriteToAsync;(System.Xml.XmlWriter,System.Threading.CancellationToken);Argument[1];ReturnValue;taint;df-generated |
 | System.Xml.Linq;XComment;WriteToAsync;(System.Xml.XmlWriter,System.Threading.CancellationToken);Argument[this];Argument[0];taint;df-generated |
 | System.Xml.Linq;XComment;XComment;(System.String);Argument[0];Argument[this];taint;df-generated |
 | System.Xml.Linq;XComment;XComment;(System.Xml.Linq.XComment);Argument[0];Argument[this];taint;df-generated |
@@ -17618,7 +18366,6 @@ summary
 | System.Xml.Linq;XContainer;Add;(System.Object);Argument[this];Argument[0];taint;df-generated |
 | System.Xml.Linq;XContainer;Add;(System.Object[]);Argument[0].Element;Argument[this];taint;df-generated |
 | System.Xml.Linq;XContainer;AddFirst;(System.Object);Argument[this];Argument[0];taint;df-generated |
-| System.Xml.Linq;XContainer;CreateWriter;();Argument[this];ReturnValue;taint;df-generated |
 | System.Xml.Linq;XContainer;DescendantNodes;();Argument[this];ReturnValue;taint;df-generated |
 | System.Xml.Linq;XContainer;Descendants;();Argument[this];ReturnValue;taint;df-generated |
 | System.Xml.Linq;XContainer;Descendants;(System.Xml.Linq.XName);Argument[this];ReturnValue;taint;df-generated |
@@ -17631,11 +18378,15 @@ summary
 | System.Xml.Linq;XContainer;ReplaceNodes;(System.Object[]);Argument[0].Element;Argument[this];taint;df-generated |
 | System.Xml.Linq;XContainer;get_FirstNode;();Argument[this];ReturnValue;taint;df-generated |
 | System.Xml.Linq;XContainer;get_LastNode;();Argument[this];ReturnValue;taint;df-generated |
-| System.Xml.Linq;XDeclaration;ToString;();Argument[this];ReturnValue;taint;df-generated |
-| System.Xml.Linq;XDeclaration;XDeclaration;(System.String,System.String,System.String);Argument[0];Argument[this];taint;df-generated |
-| System.Xml.Linq;XDeclaration;XDeclaration;(System.String,System.String,System.String);Argument[1];Argument[this];taint;df-generated |
-| System.Xml.Linq;XDeclaration;XDeclaration;(System.String,System.String,System.String);Argument[2];Argument[this];taint;df-generated |
-| System.Xml.Linq;XDeclaration;XDeclaration;(System.Xml.Linq.XDeclaration);Argument[0];Argument[this];taint;df-generated |
+| System.Xml.Linq;XDeclaration;ToString;();Argument[this].SyntheticField[System.Xml.Linq.XDeclaration._encoding];ReturnValue;taint;dfc-generated |
+| System.Xml.Linq;XDeclaration;ToString;();Argument[this].SyntheticField[System.Xml.Linq.XDeclaration._standalone];ReturnValue;taint;dfc-generated |
+| System.Xml.Linq;XDeclaration;ToString;();Argument[this].SyntheticField[System.Xml.Linq.XDeclaration._version];ReturnValue;taint;dfc-generated |
+| System.Xml.Linq;XDeclaration;XDeclaration;(System.String,System.String,System.String);Argument[0];Argument[this].SyntheticField[System.Xml.Linq.XDeclaration._version];value;dfc-generated |
+| System.Xml.Linq;XDeclaration;XDeclaration;(System.String,System.String,System.String);Argument[1];Argument[this].SyntheticField[System.Xml.Linq.XDeclaration._encoding];value;dfc-generated |
+| System.Xml.Linq;XDeclaration;XDeclaration;(System.String,System.String,System.String);Argument[2];Argument[this].SyntheticField[System.Xml.Linq.XDeclaration._standalone];value;dfc-generated |
+| System.Xml.Linq;XDeclaration;XDeclaration;(System.Xml.Linq.XDeclaration);Argument[0].SyntheticField[System.Xml.Linq.XDeclaration._encoding];Argument[this].SyntheticField[System.Xml.Linq.XDeclaration._encoding];value;dfc-generated |
+| System.Xml.Linq;XDeclaration;XDeclaration;(System.Xml.Linq.XDeclaration);Argument[0].SyntheticField[System.Xml.Linq.XDeclaration._standalone];Argument[this].SyntheticField[System.Xml.Linq.XDeclaration._standalone];value;dfc-generated |
+| System.Xml.Linq;XDeclaration;XDeclaration;(System.Xml.Linq.XDeclaration);Argument[0].SyntheticField[System.Xml.Linq.XDeclaration._version];Argument[this].SyntheticField[System.Xml.Linq.XDeclaration._version];value;dfc-generated |
 | System.Xml.Linq;XDocument;Load;(System.IO.Stream);Argument[0];ReturnValue;taint;df-generated |
 | System.Xml.Linq;XDocument;Load;(System.IO.Stream,System.Xml.Linq.LoadOptions);Argument[0];ReturnValue;taint;df-generated |
 | System.Xml.Linq;XDocument;Load;(System.IO.TextReader);Argument[0];ReturnValue;taint;df-generated |
@@ -17647,10 +18398,8 @@ summary
 | System.Xml.Linq;XDocument;Parse;(System.String);Argument[0];ReturnValue;taint;df-generated |
 | System.Xml.Linq;XDocument;Parse;(System.String,System.Xml.Linq.LoadOptions);Argument[0];ReturnValue;taint;df-generated |
 | System.Xml.Linq;XDocument;Save;(System.Xml.XmlWriter);Argument[this];Argument[0];taint;df-generated |
-| System.Xml.Linq;XDocument;SaveAsync;(System.Xml.XmlWriter,System.Threading.CancellationToken);Argument[1];ReturnValue;taint;df-generated |
 | System.Xml.Linq;XDocument;SaveAsync;(System.Xml.XmlWriter,System.Threading.CancellationToken);Argument[this];Argument[0];taint;df-generated |
 | System.Xml.Linq;XDocument;WriteTo;(System.Xml.XmlWriter);Argument[this];Argument[0];taint;df-generated |
-| System.Xml.Linq;XDocument;WriteToAsync;(System.Xml.XmlWriter,System.Threading.CancellationToken);Argument[1];ReturnValue;taint;df-generated |
 | System.Xml.Linq;XDocument;WriteToAsync;(System.Xml.XmlWriter,System.Threading.CancellationToken);Argument[this];Argument[0];taint;df-generated |
 | System.Xml.Linq;XDocument;XDocument;(System.Object[]);Argument[0].Element;Argument[this];taint;df-generated |
 | System.Xml.Linq;XDocument;XDocument;(System.Xml.Linq.XDeclaration,System.Object[]);Argument[0];Argument[this];taint;df-generated |
@@ -17658,15 +18407,13 @@ summary
 | System.Xml.Linq;XDocument;get_DocumentType;();Argument[this];ReturnValue;taint;df-generated |
 | System.Xml.Linq;XDocument;get_Root;();Argument[this];ReturnValue;taint;df-generated |
 | System.Xml.Linq;XDocumentType;WriteTo;(System.Xml.XmlWriter);Argument[this];Argument[0];taint;df-generated |
-| System.Xml.Linq;XDocumentType;WriteToAsync;(System.Xml.XmlWriter,System.Threading.CancellationToken);Argument[1];ReturnValue;taint;df-generated |
 | System.Xml.Linq;XDocumentType;WriteToAsync;(System.Xml.XmlWriter,System.Threading.CancellationToken);Argument[this];Argument[0];taint;df-generated |
-| System.Xml.Linq;XDocumentType;XDocumentType;(System.String,System.String,System.String,System.String);Argument[0];Argument[this];taint;df-generated |
 | System.Xml.Linq;XDocumentType;XDocumentType;(System.String,System.String,System.String,System.String);Argument[1];Argument[this];taint;df-generated |
 | System.Xml.Linq;XDocumentType;XDocumentType;(System.String,System.String,System.String,System.String);Argument[2];Argument[this];taint;df-generated |
 | System.Xml.Linq;XDocumentType;XDocumentType;(System.String,System.String,System.String,System.String);Argument[3];Argument[this];taint;df-generated |
 | System.Xml.Linq;XDocumentType;XDocumentType;(System.Xml.Linq.XDocumentType);Argument[0];Argument[this];taint;df-generated |
-| System.Xml.Linq;XElement;AncestorsAndSelf;();Argument[this];ReturnValue;taint;df-generated |
-| System.Xml.Linq;XElement;AncestorsAndSelf;(System.Xml.Linq.XName);Argument[this];ReturnValue;taint;df-generated |
+| System.Xml.Linq;XElement;AncestorsAndSelf;();Argument[this];ReturnValue.Element;value;dfc-generated |
+| System.Xml.Linq;XElement;AncestorsAndSelf;(System.Xml.Linq.XName);Argument[this];ReturnValue.Element;value;dfc-generated |
 | System.Xml.Linq;XElement;Attribute;(System.Xml.Linq.XName);Argument[this];ReturnValue;taint;df-generated |
 | System.Xml.Linq;XElement;Attributes;();Argument[this];ReturnValue;taint;df-generated |
 | System.Xml.Linq;XElement;Attributes;(System.Xml.Linq.XName);Argument[this];ReturnValue;taint;df-generated |
@@ -17690,13 +18437,11 @@ summary
 | System.Xml.Linq;XElement;ReplaceAttributes;(System.Object);Argument[0];Argument[this];taint;df-generated |
 | System.Xml.Linq;XElement;ReplaceAttributes;(System.Object);Argument[this];Argument[0];taint;df-generated |
 | System.Xml.Linq;XElement;ReplaceAttributes;(System.Object[]);Argument[0].Element;Argument[this];taint;df-generated |
-| System.Xml.Linq;XElement;SaveAsync;(System.Xml.XmlWriter,System.Threading.CancellationToken);Argument[1];ReturnValue;taint;df-generated |
 | System.Xml.Linq;XElement;SetAttributeValue;(System.Xml.Linq.XName,System.Object);Argument[0];Argument[this];taint;df-generated |
 | System.Xml.Linq;XElement;SetAttributeValue;(System.Xml.Linq.XName,System.Object);Argument[1];Argument[this];taint;df-generated |
 | System.Xml.Linq;XElement;SetElementValue;(System.Xml.Linq.XName,System.Object);Argument[1];Argument[this];taint;df-generated |
 | System.Xml.Linq;XElement;SetValue;(System.Object);Argument[0];Argument[this];taint;df-generated |
 | System.Xml.Linq;XElement;WriteTo;(System.Xml.XmlWriter);Argument[this];Argument[0];taint;df-generated |
-| System.Xml.Linq;XElement;WriteToAsync;(System.Xml.XmlWriter,System.Threading.CancellationToken);Argument[1];ReturnValue;taint;df-generated |
 | System.Xml.Linq;XElement;WriteToAsync;(System.Xml.XmlWriter,System.Threading.CancellationToken);Argument[this];Argument[0];taint;df-generated |
 | System.Xml.Linq;XElement;WriteXml;(System.Xml.XmlWriter);Argument[this];Argument[0];taint;df-generated |
 | System.Xml.Linq;XElement;XElement;(System.Xml.Linq.XElement);Argument[0];Argument[this];taint;df-generated |
@@ -17707,24 +18452,20 @@ summary
 | System.Xml.Linq;XElement;XElement;(System.Xml.Linq.XStreamingElement);Argument[this];Argument[0];taint;df-generated |
 | System.Xml.Linq;XElement;get_FirstAttribute;();Argument[this];ReturnValue;taint;df-generated |
 | System.Xml.Linq;XElement;get_LastAttribute;();Argument[this];ReturnValue;taint;df-generated |
-| System.Xml.Linq;XName;Get;(System.String);Argument[0];ReturnValue;taint;df-generated |
-| System.Xml.Linq;XName;Get;(System.String,System.String);Argument[0];ReturnValue;taint;df-generated |
 | System.Xml.Linq;XName;GetObjectData;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);Argument[this];Argument[0];taint;df-generated |
-| System.Xml.Linq;XName;ToString;();Argument[this];ReturnValue;taint;df-generated |
+| System.Xml.Linq;XName;ToString;();Argument[this].SyntheticField[System.Xml.Linq.XName._ns].Property[System.Xml.Linq.XNamespace.NamespaceName];ReturnValue;taint;dfc-generated |
 | System.Xml.Linq;XName;get_LocalName;();Argument[this];ReturnValue;taint;df-generated |
-| System.Xml.Linq;XName;get_Namespace;();Argument[this];ReturnValue;taint;df-generated |
-| System.Xml.Linq;XName;get_NamespaceName;();Argument[this];ReturnValue;taint;df-generated |
-| System.Xml.Linq;XNamespace;GetName;(System.String);Argument[0];ReturnValue;taint;df-generated |
-| System.Xml.Linq;XNamespace;GetName;(System.String);Argument[this];ReturnValue;taint;df-generated |
+| System.Xml.Linq;XName;get_Namespace;();Argument[this].SyntheticField[System.Xml.Linq.XName._ns];ReturnValue;value;dfc-generated |
+| System.Xml.Linq;XName;get_NamespaceName;();Argument[this].SyntheticField[System.Xml.Linq.XName._ns].Property[System.Xml.Linq.XNamespace.NamespaceName];ReturnValue;value;dfc-generated |
+| System.Xml.Linq;XNamespace;GetName;(System.String);Argument[this];ReturnValue.SyntheticField[System.Xml.Linq.XName._ns];value;dfc-generated |
 | System.Xml.Linq;XNamespace;ToString;();Argument[this];ReturnValue;taint;df-generated |
 | System.Xml.Linq;XNamespace;get_NamespaceName;();Argument[this];ReturnValue;taint;df-generated |
-| System.Xml.Linq;XNamespace;op_Addition;(System.Xml.Linq.XNamespace,System.String);Argument[0];ReturnValue;taint;df-generated |
-| System.Xml.Linq;XNamespace;op_Addition;(System.Xml.Linq.XNamespace,System.String);Argument[1];ReturnValue;taint;df-generated |
+| System.Xml.Linq;XNamespace;op_Addition;(System.Xml.Linq.XNamespace,System.String);Argument[0];ReturnValue.SyntheticField[System.Xml.Linq.XName._ns];value;dfc-generated |
 | System.Xml.Linq;XNode;AddAfterSelf;(System.Object);Argument[this];Argument[0];taint;df-generated |
 | System.Xml.Linq;XNode;AddBeforeSelf;(System.Object);Argument[this];Argument[0];taint;df-generated |
 | System.Xml.Linq;XNode;Ancestors;();Argument[this];ReturnValue;taint;df-generated |
 | System.Xml.Linq;XNode;Ancestors;(System.Xml.Linq.XName);Argument[this];ReturnValue;taint;df-generated |
-| System.Xml.Linq;XNode;CreateReader;(System.Xml.Linq.ReaderOptions);Argument[this];ReturnValue;taint;df-generated |
+| System.Xml.Linq;XNode;CreateReader;(System.Xml.Linq.ReaderOptions);Argument[this];ReturnValue.SyntheticField[System.Xml.Linq.XNodeReader._source];value;dfc-generated |
 | System.Xml.Linq;XNode;ElementsAfterSelf;();Argument[this];ReturnValue;taint;df-generated |
 | System.Xml.Linq;XNode;ElementsAfterSelf;(System.Xml.Linq.XName);Argument[this];ReturnValue;taint;df-generated |
 | System.Xml.Linq;XNode;NodesAfterSelf;();Argument[this];ReturnValue;taint;df-generated |
@@ -17732,23 +18473,32 @@ summary
 | System.Xml.Linq;XNode;ReadFromAsync;(System.Xml.XmlReader,System.Threading.CancellationToken);Argument[0];ReturnValue;taint;df-generated |
 | System.Xml.Linq;XNode;ReplaceWith;(System.Object);Argument[this];Argument[0];taint;df-generated |
 | System.Xml.Linq;XNode;WriteTo;(System.Xml.XmlWriter);Argument[this];Argument[0];taint;df-generated |
-| System.Xml.Linq;XNode;WriteToAsync;(System.Xml.XmlWriter,System.Threading.CancellationToken);Argument[1];ReturnValue;taint;df-generated |
 | System.Xml.Linq;XNode;WriteToAsync;(System.Xml.XmlWriter,System.Threading.CancellationToken);Argument[this];Argument[0];taint;df-generated |
 | System.Xml.Linq;XNode;get_NextNode;();Argument[this];ReturnValue;taint;df-generated |
-| System.Xml.Linq;XObject;AddAnnotation;(System.Object);Argument[0];Argument[this];taint;df-generated |
-| System.Xml.Linq;XObject;Annotation;(System.Type);Argument[this];ReturnValue;taint;df-generated |
-| System.Xml.Linq;XObject;Annotation<T>;();Argument[this];ReturnValue;taint;df-generated |
-| System.Xml.Linq;XObject;Annotations;(System.Type);Argument[this];ReturnValue;taint;df-generated |
-| System.Xml.Linq;XObject;Annotations<T>;();Argument[this];ReturnValue;taint;df-generated |
+| System.Xml.Linq;XNodeDocumentOrderComparer;Compare;(System.Object,System.Object);Argument[0];Argument[this];taint;df-generated |
+| System.Xml.Linq;XNodeDocumentOrderComparer;Compare;(System.Object,System.Object);Argument[1];Argument[this];taint;df-generated |
+| System.Xml.Linq;XNodeEqualityComparer;Equals;(System.Object,System.Object);Argument[0];Argument[this];taint;df-generated |
+| System.Xml.Linq;XNodeEqualityComparer;Equals;(System.Object,System.Object);Argument[1];Argument[this];taint;df-generated |
+| System.Xml.Linq;XNodeEqualityComparer;GetHashCode;(System.Object);Argument[0];Argument[this];taint;df-generated |
+| System.Xml.Linq;XObject;AddAnnotation;(System.Object);Argument[0];Argument[this].SyntheticField[System.Xml.Linq.XObject.annotations].Element;value;dfc-generated |
+| System.Xml.Linq;XObject;AddAnnotation;(System.Object);Argument[0];Argument[this].SyntheticField[System.Xml.Linq.XObject.annotations];value;dfc-generated |
+| System.Xml.Linq;XObject;AddAnnotation;(System.Object);Argument[this].SyntheticField[System.Xml.Linq.XObject.annotations];Argument[this].SyntheticField[System.Xml.Linq.XObject.annotations].Element;value;dfc-generated |
+| System.Xml.Linq;XObject;Annotation;(System.Type);Argument[this].SyntheticField[System.Xml.Linq.XObject.annotations].Element;ReturnValue;value;dfc-generated |
+| System.Xml.Linq;XObject;Annotation;(System.Type);Argument[this].SyntheticField[System.Xml.Linq.XObject.annotations];ReturnValue;value;dfc-generated |
+| System.Xml.Linq;XObject;Annotation<T>;();Argument[this].SyntheticField[System.Xml.Linq.XObject.annotations].Element;ReturnValue;value;dfc-generated |
+| System.Xml.Linq;XObject;Annotation<T>;();Argument[this].SyntheticField[System.Xml.Linq.XObject.annotations];ReturnValue;value;dfc-generated |
+| System.Xml.Linq;XObject;Annotations;(System.Type);Argument[this].SyntheticField[System.Xml.Linq.XObject.annotations].Element;ReturnValue.Element;value;dfc-generated |
+| System.Xml.Linq;XObject;Annotations;(System.Type);Argument[this].SyntheticField[System.Xml.Linq.XObject.annotations];ReturnValue.Element;value;dfc-generated |
+| System.Xml.Linq;XObject;Annotations<T>;();Argument[this].SyntheticField[System.Xml.Linq.XObject.annotations].Element;ReturnValue.Element;value;dfc-generated |
+| System.Xml.Linq;XObject;Annotations<T>;();Argument[this].SyntheticField[System.Xml.Linq.XObject.annotations];ReturnValue.Element;value;dfc-generated |
 | System.Xml.Linq;XObject;add_Changed;(System.EventHandler<System.Xml.Linq.XObjectChangeEventArgs>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Xml.Linq;XObject;add_Changing;(System.EventHandler<System.Xml.Linq.XObjectChangeEventArgs>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Xml.Linq;XObject;get_BaseUri;();Argument[this];ReturnValue;taint;df-generated |
-| System.Xml.Linq;XObject;get_Document;();Argument[this];ReturnValue;taint;df-generated |
+| System.Xml.Linq;XObject;get_Document;();Argument[this];ReturnValue;value;dfc-generated |
 | System.Xml.Linq;XObject;get_Parent;();Argument[this];ReturnValue;taint;df-generated |
 | System.Xml.Linq;XObject;remove_Changed;(System.EventHandler<System.Xml.Linq.XObjectChangeEventArgs>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Xml.Linq;XObject;remove_Changing;(System.EventHandler<System.Xml.Linq.XObjectChangeEventArgs>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Xml.Linq;XProcessingInstruction;WriteTo;(System.Xml.XmlWriter);Argument[this];Argument[0];taint;df-generated |
-| System.Xml.Linq;XProcessingInstruction;WriteToAsync;(System.Xml.XmlWriter,System.Threading.CancellationToken);Argument[1];ReturnValue;taint;df-generated |
 | System.Xml.Linq;XProcessingInstruction;WriteToAsync;(System.Xml.XmlWriter,System.Threading.CancellationToken);Argument[this];Argument[0];taint;df-generated |
 | System.Xml.Linq;XProcessingInstruction;XProcessingInstruction;(System.String,System.String);Argument[0];Argument[this];taint;df-generated |
 | System.Xml.Linq;XProcessingInstruction;XProcessingInstruction;(System.String,System.String);Argument[1];Argument[this];taint;df-generated |
@@ -17757,16 +18507,20 @@ summary
 | System.Xml.Linq;XStreamingElement;XStreamingElement;(System.Xml.Linq.XName,System.Object);Argument[1];Argument[this];taint;df-generated |
 | System.Xml.Linq;XStreamingElement;XStreamingElement;(System.Xml.Linq.XName,System.Object[]);Argument[1].Element;Argument[this];taint;df-generated |
 | System.Xml.Linq;XText;WriteTo;(System.Xml.XmlWriter);Argument[this];Argument[0];taint;df-generated |
-| System.Xml.Linq;XText;WriteToAsync;(System.Xml.XmlWriter,System.Threading.CancellationToken);Argument[1];ReturnValue;taint;df-generated |
 | System.Xml.Linq;XText;WriteToAsync;(System.Xml.XmlWriter,System.Threading.CancellationToken);Argument[this];Argument[0];taint;df-generated |
 | System.Xml.Linq;XText;XText;(System.String);Argument[0];Argument[this];taint;df-generated |
 | System.Xml.Linq;XText;XText;(System.Xml.Linq.XText);Argument[0];Argument[this];taint;df-generated |
+| System.Xml.Resolvers;XmlPreloadedResolver;GetEntity;(System.Uri,System.String,System.Type);Argument[0].Property[System.Uri.LocalPath];ReturnValue;taint;df-generated |
+| System.Xml.Resolvers;XmlPreloadedResolver;GetEntity;(System.Uri,System.String,System.Type);Argument[0].Property[System.Uri.LocalPath];ReturnValue;taint;dfc-generated |
 | System.Xml.Resolvers;XmlPreloadedResolver;GetEntity;(System.Uri,System.String,System.Type);Argument[0];ReturnValue;taint;df-generated |
+| System.Xml.Resolvers;XmlPreloadedResolver;GetEntity;(System.Uri,System.String,System.Type);Argument[0];ReturnValue;taint;dfc-generated |
+| System.Xml.Resolvers;XmlPreloadedResolver;GetEntityAsync;(System.Uri,System.String,System.Type);Argument[0].Property[System.Uri.LocalPath];ReturnValue.Property[System.Threading.Tasks.Task`1.Result];taint;df-generated |
+| System.Xml.Resolvers;XmlPreloadedResolver;GetEntityAsync;(System.Uri,System.String,System.Type);Argument[0].Property[System.Uri.LocalPath];ReturnValue.Property[System.Threading.Tasks.Task`1.Result];taint;dfc-generated |
 | System.Xml.Resolvers;XmlPreloadedResolver;GetEntityAsync;(System.Uri,System.String,System.Type);Argument[0];ReturnValue;taint;df-generated |
-| System.Xml.Resolvers;XmlPreloadedResolver;ResolveUri;(System.Uri,System.String);Argument[0];ReturnValue;taint;df-generated |
-| System.Xml.Resolvers;XmlPreloadedResolver;ResolveUri;(System.Uri,System.String);Argument[1];ReturnValue;taint;df-generated |
+| System.Xml.Resolvers;XmlPreloadedResolver;GetEntityAsync;(System.Uri,System.String,System.Type);Argument[0];ReturnValue;taint;dfc-generated |
+| System.Xml.Resolvers;XmlPreloadedResolver;ResolveUri;(System.Uri,System.String);Argument[0];ReturnValue;value;dfc-generated |
+| System.Xml.Resolvers;XmlPreloadedResolver;ResolveUri;(System.Uri,System.String);Argument[1];ReturnValue;taint;dfc-generated |
 | System.Xml.Resolvers;XmlPreloadedResolver;XmlPreloadedResolver;(System.Xml.XmlResolver,System.Xml.Resolvers.XmlKnownDtds,System.Collections.Generic.IEqualityComparer<System.Uri>);Argument[0];Argument[this];taint;df-generated |
-| System.Xml.Resolvers;XmlPreloadedResolver;XmlPreloadedResolver;(System.Xml.XmlResolver,System.Xml.Resolvers.XmlKnownDtds,System.Collections.Generic.IEqualityComparer<System.Uri>);Argument[2];Argument[this];taint;df-generated |
 | System.Xml.Resolvers;XmlPreloadedResolver;get_PreloadedUris;();Argument[this];ReturnValue;taint;df-generated |
 | System.Xml.Resolvers;XmlPreloadedResolver;set_Credentials;(System.Net.ICredentials);Argument[0];Argument[this];taint;df-generated |
 | System.Xml.Schema;Extensions;GetSchemaInfo;(System.Xml.Linq.XAttribute);Argument[0];ReturnValue;taint;df-generated |
@@ -17784,10 +18538,10 @@ summary
 | System.Xml.Schema;ValidationEventArgs;get_Exception;();Argument[this];ReturnValue;taint;df-generated |
 | System.Xml.Schema;ValidationEventArgs;get_Message;();Argument[this];ReturnValue;taint;df-generated |
 | System.Xml.Schema;ValidationEventHandler;BeginInvoke;(System.Object,System.Xml.Schema.ValidationEventArgs,System.AsyncCallback,System.Object);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
-| System.Xml.Schema;XmlAtomicValue;Clone;();Argument[this];ReturnValue;taint;df-generated |
-| System.Xml.Schema;XmlAtomicValue;Clone;();Argument[this];ReturnValue;value;df-generated |
+| System.Xml.Schema;XmlAtomicValue;Clone;();Argument[this];ReturnValue;value;dfc-generated |
 | System.Xml.Schema;XmlAtomicValue;ToString;();Argument[this];ReturnValue;taint;df-generated |
 | System.Xml.Schema;XmlAtomicValue;ValueAs;(System.Type,System.Xml.IXmlNamespaceResolver);Argument[1];ReturnValue;taint;df-generated |
+| System.Xml.Schema;XmlAtomicValue;ValueAs;(System.Type,System.Xml.IXmlNamespaceResolver);Argument[this];Argument[1];taint;df-generated |
 | System.Xml.Schema;XmlAtomicValue;ValueAs;(System.Type,System.Xml.IXmlNamespaceResolver);Argument[this];ReturnValue;taint;df-generated |
 | System.Xml.Schema;XmlAtomicValue;ValueAs;(System.Type,System.Xml.IXmlNamespaceResolver);Argument[this];ReturnValue;value;df-generated |
 | System.Xml.Schema;XmlAtomicValue;get_TypedValue;();Argument[this];ReturnValue;taint;df-generated |
@@ -17814,37 +18568,41 @@ summary
 | System.Xml.Schema;XmlSchemaCollection;Add;(System.String,System.Xml.XmlReader);Argument[1];ReturnValue;taint;df-generated |
 | System.Xml.Schema;XmlSchemaCollection;Add;(System.String,System.Xml.XmlReader,System.Xml.XmlResolver);Argument[1];ReturnValue;taint;df-generated |
 | System.Xml.Schema;XmlSchemaCollection;Add;(System.Xml.Schema.XmlSchema);Argument[0];Argument[this].Element;value;manual |
-| System.Xml.Schema;XmlSchemaCollection;Add;(System.Xml.Schema.XmlSchema,System.Xml.XmlResolver);Argument[0];ReturnValue;taint;df-generated |
+| System.Xml.Schema;XmlSchemaCollection;Add;(System.Xml.Schema.XmlSchema,System.Xml.XmlResolver);Argument[0];ReturnValue;value;dfc-generated |
 | System.Xml.Schema;XmlSchemaCollection;Add;(System.Xml.Schema.XmlSchemaCollection);Argument[0];Argument[this].Element;value;manual |
 | System.Xml.Schema;XmlSchemaCollection;CopyTo;(System.Array,System.Int32);Argument[this].Element;Argument[0].Element;value;manual |
 | System.Xml.Schema;XmlSchemaCollection;CopyTo;(System.Xml.Schema.XmlSchema[],System.Int32);Argument[this].Element;Argument[0].Element;value;manual |
 | System.Xml.Schema;XmlSchemaCollection;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.IEnumerator.Current];value;manual |
 | System.Xml.Schema;XmlSchemaCollection;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Xml.Schema.XmlSchemaCollectionEnumerator.Current];value;manual |
-| System.Xml.Schema;XmlSchemaCollection;XmlSchemaCollection;(System.Xml.XmlNameTable);Argument[0];Argument[this];taint;df-generated |
+| System.Xml.Schema;XmlSchemaCollection;XmlSchemaCollection;(System.Xml.XmlNameTable);Argument[0];Argument[this].SyntheticField[System.Xml.Schema.XmlSchemaCollection._nameTable];value;dfc-generated |
 | System.Xml.Schema;XmlSchemaCollection;add_ValidationEventHandler;(System.Xml.Schema.ValidationEventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Xml.Schema;XmlSchemaCollection;get_Item;(System.String);Argument[this];ReturnValue;taint;df-generated |
-| System.Xml.Schema;XmlSchemaCollection;get_NameTable;();Argument[this];ReturnValue;taint;df-generated |
-| System.Xml.Schema;XmlSchemaCollection;get_SyncRoot;();Argument[this];ReturnValue;taint;df-generated |
-| System.Xml.Schema;XmlSchemaCollection;get_SyncRoot;();Argument[this];ReturnValue;value;df-generated |
+| System.Xml.Schema;XmlSchemaCollection;get_NameTable;();Argument[this].SyntheticField[System.Xml.Schema.XmlSchemaCollection._nameTable];ReturnValue;value;dfc-generated |
+| System.Xml.Schema;XmlSchemaCollection;get_SyncRoot;();Argument[this];ReturnValue;value;dfc-generated |
 | System.Xml.Schema;XmlSchemaCollection;remove_ValidationEventHandler;(System.Xml.Schema.ValidationEventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
+| System.Xml.Schema;XmlSchemaCollectionEnumerator;get_Current;();Argument[this].Property[System.Xml.Schema.XmlSchemaCollectionEnumerator.Current];ReturnValue;value;df-generated |
+| System.Xml.Schema;XmlSchemaCollectionEnumerator;get_Current;();Argument[this].Property[System.Xml.Schema.XmlSchemaCollectionEnumerator.Current];ReturnValue;value;dfc-generated |
 | System.Xml.Schema;XmlSchemaCollectionEnumerator;get_Current;();Argument[this];ReturnValue;taint;df-generated |
+| System.Xml.Schema;XmlSchemaCollectionEnumerator;get_Current;();Argument[this];ReturnValue;taint;dfc-generated |
 | System.Xml.Schema;XmlSchemaComplexContentExtension;get_Attributes;();Argument[this];ReturnValue;taint;df-generated |
 | System.Xml.Schema;XmlSchemaComplexContentRestriction;get_Attributes;();Argument[this];ReturnValue;taint;df-generated |
 | System.Xml.Schema;XmlSchemaComplexType;get_AttributeWildcard;();Argument[this];ReturnValue;taint;df-generated |
 | System.Xml.Schema;XmlSchemaComplexType;get_ContentTypeParticle;();Argument[this];ReturnValue;taint;df-generated |
 | System.Xml.Schema;XmlSchemaDatatype;ChangeType;(System.Object,System.Type);Argument[0];ReturnValue;taint;df-generated |
 | System.Xml.Schema;XmlSchemaDatatype;ChangeType;(System.Object,System.Type);Argument[this];ReturnValue;taint;df-generated |
+| System.Xml.Schema;XmlSchemaDatatype;ChangeType;(System.Object,System.Type,System.Xml.IXmlNamespaceResolver);Argument[0];Argument[2];taint;df-generated |
 | System.Xml.Schema;XmlSchemaDatatype;ChangeType;(System.Object,System.Type,System.Xml.IXmlNamespaceResolver);Argument[0];ReturnValue;taint;df-generated |
 | System.Xml.Schema;XmlSchemaDatatype;ChangeType;(System.Object,System.Type,System.Xml.IXmlNamespaceResolver);Argument[2];ReturnValue;taint;df-generated |
 | System.Xml.Schema;XmlSchemaDatatype;ChangeType;(System.Object,System.Type,System.Xml.IXmlNamespaceResolver);Argument[this];ReturnValue;taint;df-generated |
+| System.Xml.Schema;XmlSchemaDatatype;ParseValue;(System.String,System.Xml.XmlNameTable,System.Xml.IXmlNamespaceResolver);Argument[0];Argument[2];taint;df-generated |
 | System.Xml.Schema;XmlSchemaDatatype;ParseValue;(System.String,System.Xml.XmlNameTable,System.Xml.IXmlNamespaceResolver);Argument[0];ReturnValue;taint;df-generated |
 | System.Xml.Schema;XmlSchemaDatatype;ParseValue;(System.String,System.Xml.XmlNameTable,System.Xml.IXmlNamespaceResolver);Argument[this];ReturnValue;taint;df-generated |
 | System.Xml.Schema;XmlSchemaElement;get_ElementSchemaType;();Argument[this];ReturnValue;taint;df-generated |
 | System.Xml.Schema;XmlSchemaElement;get_ElementType;();Argument[this];ReturnValue;taint;df-generated |
 | System.Xml.Schema;XmlSchemaElement;get_QualifiedName;();Argument[this];ReturnValue;taint;df-generated |
 | System.Xml.Schema;XmlSchemaException;GetObjectData;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);Argument[this];Argument[0];taint;df-generated |
-| System.Xml.Schema;XmlSchemaException;XmlSchemaException;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);Argument[0];Argument[this];taint;df-generated |
-| System.Xml.Schema;XmlSchemaException;get_Message;();Argument[this];ReturnValue;taint;df-generated |
+| System.Xml.Schema;XmlSchemaException;get_Message;();Argument[this].Property[System.Exception.Message];ReturnValue;value;dfc-generated |
+| System.Xml.Schema;XmlSchemaException;get_Message;();Argument[this].SyntheticField[System.Exception._message];ReturnValue;value;dfc-generated |
 | System.Xml.Schema;XmlSchemaException;get_SourceSchemaObject;();Argument[this];ReturnValue;taint;df-generated |
 | System.Xml.Schema;XmlSchemaException;get_SourceUri;();Argument[this];ReturnValue;taint;df-generated |
 | System.Xml.Schema;XmlSchemaGroup;get_QualifiedName;();Argument[this];ReturnValue;taint;df-generated |
@@ -17855,13 +18613,7 @@ summary
 | System.Xml.Schema;XmlSchemaInference;InferSchema;(System.Xml.XmlReader);Argument[0];Argument[this];taint;df-generated |
 | System.Xml.Schema;XmlSchemaInference;InferSchema;(System.Xml.XmlReader);Argument[0];ReturnValue;taint;df-generated |
 | System.Xml.Schema;XmlSchemaInference;InferSchema;(System.Xml.XmlReader);Argument[this];ReturnValue;taint;df-generated |
-| System.Xml.Schema;XmlSchemaInference;InferSchema;(System.Xml.XmlReader,System.Xml.Schema.XmlSchemaSet);Argument[0];Argument[1];taint;df-generated |
-| System.Xml.Schema;XmlSchemaInference;InferSchema;(System.Xml.XmlReader,System.Xml.Schema.XmlSchemaSet);Argument[0];Argument[this];taint;df-generated |
-| System.Xml.Schema;XmlSchemaInference;InferSchema;(System.Xml.XmlReader,System.Xml.Schema.XmlSchemaSet);Argument[0];ReturnValue;taint;df-generated |
-| System.Xml.Schema;XmlSchemaInference;InferSchema;(System.Xml.XmlReader,System.Xml.Schema.XmlSchemaSet);Argument[1];Argument[this];taint;df-generated |
-| System.Xml.Schema;XmlSchemaInference;InferSchema;(System.Xml.XmlReader,System.Xml.Schema.XmlSchemaSet);Argument[1];ReturnValue;taint;df-generated |
-| System.Xml.Schema;XmlSchemaInference;InferSchema;(System.Xml.XmlReader,System.Xml.Schema.XmlSchemaSet);Argument[this];Argument[1];taint;df-generated |
-| System.Xml.Schema;XmlSchemaInference;InferSchema;(System.Xml.XmlReader,System.Xml.Schema.XmlSchemaSet);Argument[this];ReturnValue;taint;df-generated |
+| System.Xml.Schema;XmlSchemaInference;InferSchema;(System.Xml.XmlReader,System.Xml.Schema.XmlSchemaSet);Argument[1];ReturnValue;value;dfc-generated |
 | System.Xml.Schema;XmlSchemaInferenceException;GetObjectData;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);Argument[this];Argument[0];taint;df-generated |
 | System.Xml.Schema;XmlSchemaInfo;get_MemberType;();Argument[this];ReturnValue;taint;df-generated |
 | System.Xml.Schema;XmlSchemaInfo;get_SchemaAttribute;();Argument[this];ReturnValue;taint;df-generated |
@@ -17873,7 +18625,6 @@ summary
 | System.Xml.Schema;XmlSchemaObjectCollection;Insert;(System.Int32,System.Xml.Schema.XmlSchemaObject);Argument[1];Argument[this].Element;value;manual |
 | System.Xml.Schema;XmlSchemaObjectCollection;OnInsert;(System.Int32,System.Object);Argument[1];Argument[this];taint;df-generated |
 | System.Xml.Schema;XmlSchemaObjectCollection;OnSet;(System.Int32,System.Object,System.Object);Argument[2];Argument[this];taint;df-generated |
-| System.Xml.Schema;XmlSchemaObjectCollection;Remove;(System.Xml.Schema.XmlSchemaObject);Argument[0];Argument[this];taint;df-generated |
 | System.Xml.Schema;XmlSchemaObjectCollection;XmlSchemaObjectCollection;(System.Xml.Schema.XmlSchemaObject);Argument[0];Argument[this];taint;df-generated |
 | System.Xml.Schema;XmlSchemaObjectCollection;get_Item;(System.Int32);Argument[this].Element;ReturnValue;value;manual |
 | System.Xml.Schema;XmlSchemaObjectCollection;set_Item;(System.Int32,System.Xml.Schema.XmlSchemaObject);Argument[1];Argument[this].Element;value;manual |
@@ -17899,13 +18650,13 @@ summary
 | System.Xml.Schema;XmlSchemaSet;Add;(System.Xml.Schema.XmlSchema);Argument[0];ReturnValue;taint;df-generated |
 | System.Xml.Schema;XmlSchemaSet;Add;(System.Xml.Schema.XmlSchemaSet);Argument[0];Argument[this];taint;df-generated |
 | System.Xml.Schema;XmlSchemaSet;CopyTo;(System.Xml.Schema.XmlSchema[],System.Int32);Argument[this];Argument[0].Element;taint;df-generated |
-| System.Xml.Schema;XmlSchemaSet;Remove;(System.Xml.Schema.XmlSchema);Argument[0];ReturnValue;taint;df-generated |
+| System.Xml.Schema;XmlSchemaSet;Remove;(System.Xml.Schema.XmlSchema);Argument[0];ReturnValue;value;dfc-generated |
 | System.Xml.Schema;XmlSchemaSet;Reprocess;(System.Xml.Schema.XmlSchema);Argument[0];Argument[this];taint;df-generated |
 | System.Xml.Schema;XmlSchemaSet;Reprocess;(System.Xml.Schema.XmlSchema);Argument[0];ReturnValue;taint;df-generated |
 | System.Xml.Schema;XmlSchemaSet;Schemas;();Argument[this];ReturnValue;taint;df-generated |
-| System.Xml.Schema;XmlSchemaSet;XmlSchemaSet;(System.Xml.XmlNameTable);Argument[0];Argument[this];taint;df-generated |
+| System.Xml.Schema;XmlSchemaSet;XmlSchemaSet;(System.Xml.XmlNameTable);Argument[0];Argument[this].SyntheticField[System.Xml.Schema.XmlSchemaSet._nameTable];value;dfc-generated |
 | System.Xml.Schema;XmlSchemaSet;add_ValidationEventHandler;(System.Xml.Schema.ValidationEventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
-| System.Xml.Schema;XmlSchemaSet;get_NameTable;();Argument[this];ReturnValue;taint;df-generated |
+| System.Xml.Schema;XmlSchemaSet;get_NameTable;();Argument[this].SyntheticField[System.Xml.Schema.XmlSchemaSet._nameTable];ReturnValue;value;dfc-generated |
 | System.Xml.Schema;XmlSchemaSet;remove_ValidationEventHandler;(System.Xml.Schema.ValidationEventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Xml.Schema;XmlSchemaSet;set_XmlResolver;(System.Xml.XmlResolver);Argument[0];Argument[this];taint;df-generated |
 | System.Xml.Schema;XmlSchemaSimpleContentExtension;get_Attributes;();Argument[this];ReturnValue;taint;df-generated |
@@ -17919,12 +18670,12 @@ summary
 | System.Xml.Schema;XmlSchemaType;get_Datatype;();Argument[this];ReturnValue;taint;df-generated |
 | System.Xml.Schema;XmlSchemaType;get_QualifiedName;();Argument[this];ReturnValue;taint;df-generated |
 | System.Xml.Schema;XmlSchemaValidationException;GetObjectData;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);Argument[this];Argument[0];taint;df-generated |
-| System.Xml.Schema;XmlSchemaValidationException;SetSourceObject;(System.Object);Argument[0];Argument[this];taint;df-generated |
-| System.Xml.Schema;XmlSchemaValidationException;get_SourceObject;();Argument[this];ReturnValue;taint;df-generated |
+| System.Xml.Schema;XmlSchemaValidationException;SetSourceObject;(System.Object);Argument[0];Argument[this].SyntheticField[System.Xml.Schema.XmlSchemaValidationException._sourceNodeObject];value;dfc-generated |
+| System.Xml.Schema;XmlSchemaValidationException;get_SourceObject;();Argument[this].SyntheticField[System.Xml.Schema.XmlSchemaValidationException._sourceNodeObject];ReturnValue;value;dfc-generated |
 | System.Xml.Schema;XmlSchemaValidator;AddSchema;(System.Xml.Schema.XmlSchema);Argument[0];Argument[this];taint;df-generated |
-| System.Xml.Schema;XmlSchemaValidator;GetExpectedAttributes;();Argument[this];ReturnValue;taint;df-generated |
-| System.Xml.Schema;XmlSchemaValidator;GetExpectedParticles;();Argument[this];ReturnValue;taint;df-generated |
-| System.Xml.Schema;XmlSchemaValidator;Initialize;(System.Xml.Schema.XmlSchemaObject);Argument[0];Argument[this];taint;df-generated |
+| System.Xml.Schema;XmlSchemaValidator;GetExpectedAttributes;();Argument[this].SyntheticField[System.Xml.Schema.XmlSchemaValidator._partialValidationType];ReturnValue.Element;value;dfc-generated |
+| System.Xml.Schema;XmlSchemaValidator;GetExpectedParticles;();Argument[this].SyntheticField[System.Xml.Schema.XmlSchemaValidator._partialValidationType];ReturnValue.Element;value;dfc-generated |
+| System.Xml.Schema;XmlSchemaValidator;Initialize;(System.Xml.Schema.XmlSchemaObject);Argument[0];Argument[this].SyntheticField[System.Xml.Schema.XmlSchemaValidator._partialValidationType];value;dfc-generated |
 | System.Xml.Schema;XmlSchemaValidator;SkipToEndElement;(System.Xml.Schema.XmlSchemaInfo);Argument[this];Argument[0];taint;df-generated |
 | System.Xml.Schema;XmlSchemaValidator;ValidateAttribute;(System.String,System.String,System.String,System.Xml.Schema.XmlSchemaInfo);Argument[2];Argument[this];taint;df-generated |
 | System.Xml.Schema;XmlSchemaValidator;ValidateAttribute;(System.String,System.String,System.String,System.Xml.Schema.XmlSchemaInfo);Argument[2];ReturnValue;taint;df-generated |
@@ -17939,9 +18690,7 @@ summary
 | System.Xml.Schema;XmlSchemaValidator;ValidateEndElement;(System.Xml.Schema.XmlSchemaInfo,System.Object);Argument[1];ReturnValue;taint;df-generated |
 | System.Xml.Schema;XmlSchemaValidator;ValidateEndElement;(System.Xml.Schema.XmlSchemaInfo,System.Object);Argument[this];Argument[0];taint;df-generated |
 | System.Xml.Schema;XmlSchemaValidator;ValidateEndElement;(System.Xml.Schema.XmlSchemaInfo,System.Object);Argument[this];ReturnValue;taint;df-generated |
-| System.Xml.Schema;XmlSchemaValidator;ValidateText;(System.String);Argument[0];Argument[this];taint;df-generated |
 | System.Xml.Schema;XmlSchemaValidator;ValidateText;(System.Xml.Schema.XmlValueGetter);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
-| System.Xml.Schema;XmlSchemaValidator;ValidateWhitespace;(System.String);Argument[0];Argument[this];taint;df-generated |
 | System.Xml.Schema;XmlSchemaValidator;ValidateWhitespace;(System.Xml.Schema.XmlValueGetter);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Xml.Schema;XmlSchemaValidator;XmlSchemaValidator;(System.Xml.XmlNameTable,System.Xml.Schema.XmlSchemaSet,System.Xml.IXmlNamespaceResolver,System.Xml.Schema.XmlSchemaValidationFlags);Argument[0];Argument[this];taint;df-generated |
 | System.Xml.Schema;XmlSchemaValidator;XmlSchemaValidator;(System.Xml.XmlNameTable,System.Xml.Schema.XmlSchemaSet,System.Xml.IXmlNamespaceResolver,System.Xml.Schema.XmlSchemaValidationFlags);Argument[1];Argument[this];taint;df-generated |
@@ -17950,13 +18699,11 @@ summary
 | System.Xml.Schema;XmlSchemaValidator;remove_ValidationEventHandler;(System.Xml.Schema.ValidationEventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Xml.Schema;XmlSchemaValidator;set_XmlResolver;(System.Xml.XmlResolver);Argument[0];Argument[this];taint;df-generated |
 | System.Xml.Schema;XmlValueGetter;BeginInvoke;(System.AsyncCallback,System.Object);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
-| System.Xml.Serialization;CodeIdentifiers;Add;(System.String,System.Object);Argument[1];Argument[this];taint;df-generated |
-| System.Xml.Serialization;CodeIdentifiers;Add;(System.String,System.Object);Argument[this];Argument[1];taint;df-generated |
-| System.Xml.Serialization;CodeIdentifiers;AddUnique;(System.String,System.Object);Argument[0];ReturnValue;taint;df-generated |
-| System.Xml.Serialization;CodeIdentifiers;AddUnique;(System.String,System.Object);Argument[1];Argument[this];taint;df-generated |
-| System.Xml.Serialization;CodeIdentifiers;AddUnique;(System.String,System.Object);Argument[this];Argument[1];taint;df-generated |
-| System.Xml.Serialization;CodeIdentifiers;MakeUnique;(System.String);Argument[0];ReturnValue;taint;df-generated |
-| System.Xml.Serialization;CodeIdentifiers;ToArray;(System.Type);Argument[this];ReturnValue;taint;df-generated |
+| System.Xml.Serialization;CodeIdentifiers;Add;(System.String,System.Object);Argument[1];Argument[this].SyntheticField[System.Xml.Serialization.CodeIdentifiers._list].Element;value;dfc-generated |
+| System.Xml.Serialization;CodeIdentifiers;AddUnique;(System.String,System.Object);Argument[0];ReturnValue;value;dfc-generated |
+| System.Xml.Serialization;CodeIdentifiers;AddUnique;(System.String,System.Object);Argument[1];Argument[this].SyntheticField[System.Xml.Serialization.CodeIdentifiers._list].Element;value;dfc-generated |
+| System.Xml.Serialization;CodeIdentifiers;MakeUnique;(System.String);Argument[0];ReturnValue;value;dfc-generated |
+| System.Xml.Serialization;CodeIdentifiers;ToArray;(System.Type);Argument[this].SyntheticField[System.Xml.Serialization.CodeIdentifiers._list].Element;ReturnValue.Element;value;dfc-generated |
 | System.Xml.Serialization;IXmlSerializable;ReadXml;(System.Xml.XmlReader);Argument[0];Argument[this];taint;df-generated |
 | System.Xml.Serialization;IXmlSerializable;WriteXml;(System.Xml.XmlWriter);Argument[this];Argument[0];taint;df-generated |
 | System.Xml.Serialization;ImportContext;ImportContext;(System.Xml.Serialization.CodeIdentifiers,System.Boolean);Argument[0];Argument[this];taint;df-generated |
@@ -17964,7 +18711,6 @@ summary
 | System.Xml.Serialization;SoapAttributeAttribute;SoapAttributeAttribute;(System.String);Argument[0];Argument[this];taint;df-generated |
 | System.Xml.Serialization;SoapAttributeOverrides;get_Item;(System.Type);Argument[this];ReturnValue;taint;df-generated |
 | System.Xml.Serialization;SoapAttributeOverrides;get_Item;(System.Type,System.String);Argument[this];ReturnValue;taint;df-generated |
-| System.Xml.Serialization;SoapAttributes;SoapAttributes;(System.Reflection.ICustomAttributeProvider);Argument[0];Argument[this];taint;df-generated |
 | System.Xml.Serialization;SoapElementAttribute;SoapElementAttribute;(System.String);Argument[0];Argument[this];taint;df-generated |
 | System.Xml.Serialization;SoapEnumAttribute;SoapEnumAttribute;(System.String);Argument[0];Argument[this];taint;df-generated |
 | System.Xml.Serialization;SoapReflectionImporter;ImportTypeMapping;(System.Type,System.String);Argument[1];ReturnValue;taint;df-generated |
@@ -17973,10 +18719,10 @@ summary
 | System.Xml.Serialization;SoapTypeAttribute;SoapTypeAttribute;(System.String);Argument[0];Argument[this];taint;df-generated |
 | System.Xml.Serialization;SoapTypeAttribute;SoapTypeAttribute;(System.String,System.String);Argument[0];Argument[this];taint;df-generated |
 | System.Xml.Serialization;SoapTypeAttribute;SoapTypeAttribute;(System.String,System.String);Argument[1];Argument[this];taint;df-generated |
-| System.Xml.Serialization;UnreferencedObjectEventArgs;UnreferencedObjectEventArgs;(System.Object,System.String);Argument[0];Argument[this];taint;df-generated |
-| System.Xml.Serialization;UnreferencedObjectEventArgs;UnreferencedObjectEventArgs;(System.Object,System.String);Argument[1];Argument[this];taint;df-generated |
-| System.Xml.Serialization;UnreferencedObjectEventArgs;get_UnreferencedId;();Argument[this];ReturnValue;taint;df-generated |
-| System.Xml.Serialization;UnreferencedObjectEventArgs;get_UnreferencedObject;();Argument[this];ReturnValue;taint;df-generated |
+| System.Xml.Serialization;UnreferencedObjectEventArgs;UnreferencedObjectEventArgs;(System.Object,System.String);Argument[0];Argument[this].SyntheticField[System.Xml.Serialization.UnreferencedObjectEventArgs._o];value;dfc-generated |
+| System.Xml.Serialization;UnreferencedObjectEventArgs;UnreferencedObjectEventArgs;(System.Object,System.String);Argument[1];Argument[this].SyntheticField[System.Xml.Serialization.UnreferencedObjectEventArgs._id];value;dfc-generated |
+| System.Xml.Serialization;UnreferencedObjectEventArgs;get_UnreferencedId;();Argument[this].SyntheticField[System.Xml.Serialization.UnreferencedObjectEventArgs._id];ReturnValue;value;dfc-generated |
+| System.Xml.Serialization;UnreferencedObjectEventArgs;get_UnreferencedObject;();Argument[this].SyntheticField[System.Xml.Serialization.UnreferencedObjectEventArgs._o];ReturnValue;value;dfc-generated |
 | System.Xml.Serialization;UnreferencedObjectEventHandler;BeginInvoke;(System.Object,System.Xml.Serialization.UnreferencedObjectEventArgs,System.AsyncCallback,System.Object);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
 | System.Xml.Serialization;XmlAnyElementAttribute;XmlAnyElementAttribute;(System.String);Argument[0];Argument[this];taint;df-generated |
 | System.Xml.Serialization;XmlAnyElementAttribute;XmlAnyElementAttribute;(System.String,System.String);Argument[0];Argument[this];taint;df-generated |
@@ -17984,7 +18730,6 @@ summary
 | System.Xml.Serialization;XmlAnyElementAttributes;Add;(System.Xml.Serialization.XmlAnyElementAttribute);Argument[0];Argument[this].Element;value;manual |
 | System.Xml.Serialization;XmlAnyElementAttributes;CopyTo;(System.Xml.Serialization.XmlAnyElementAttribute[],System.Int32);Argument[this].Element;Argument[0].Element;value;manual |
 | System.Xml.Serialization;XmlAnyElementAttributes;Insert;(System.Int32,System.Xml.Serialization.XmlAnyElementAttribute);Argument[1];Argument[this].Element;value;manual |
-| System.Xml.Serialization;XmlAnyElementAttributes;Remove;(System.Xml.Serialization.XmlAnyElementAttribute);Argument[0];Argument[this];taint;df-generated |
 | System.Xml.Serialization;XmlAnyElementAttributes;get_Item;(System.Int32);Argument[this].Element;ReturnValue;value;manual |
 | System.Xml.Serialization;XmlAnyElementAttributes;set_Item;(System.Int32,System.Xml.Serialization.XmlAnyElementAttribute);Argument[1];Argument[this].Element;value;manual |
 | System.Xml.Serialization;XmlArrayAttribute;XmlArrayAttribute;(System.String);Argument[0];Argument[this];taint;df-generated |
@@ -17993,7 +18738,6 @@ summary
 | System.Xml.Serialization;XmlArrayItemAttributes;Add;(System.Xml.Serialization.XmlArrayItemAttribute);Argument[0];Argument[this].Element;value;manual |
 | System.Xml.Serialization;XmlArrayItemAttributes;CopyTo;(System.Xml.Serialization.XmlArrayItemAttribute[],System.Int32);Argument[this].Element;Argument[0].Element;value;manual |
 | System.Xml.Serialization;XmlArrayItemAttributes;Insert;(System.Int32,System.Xml.Serialization.XmlArrayItemAttribute);Argument[1];Argument[this].Element;value;manual |
-| System.Xml.Serialization;XmlArrayItemAttributes;Remove;(System.Xml.Serialization.XmlArrayItemAttribute);Argument[0];Argument[this];taint;df-generated |
 | System.Xml.Serialization;XmlArrayItemAttributes;get_Item;(System.Int32);Argument[this].Element;ReturnValue;value;manual |
 | System.Xml.Serialization;XmlArrayItemAttributes;set_Item;(System.Int32,System.Xml.Serialization.XmlArrayItemAttribute);Argument[1];Argument[this].Element;value;manual |
 | System.Xml.Serialization;XmlAttributeAttribute;XmlAttributeAttribute;(System.String);Argument[0];Argument[this];taint;df-generated |
@@ -18003,7 +18747,6 @@ summary
 | System.Xml.Serialization;XmlAttributeEventArgs;get_ObjectBeingDeserialized;();Argument[this];ReturnValue;taint;df-generated |
 | System.Xml.Serialization;XmlAttributeEventHandler;BeginInvoke;(System.Object,System.Xml.Serialization.XmlAttributeEventArgs,System.AsyncCallback,System.Object);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
 | System.Xml.Serialization;XmlAttributeOverrides;get_Item;(System.Type);Argument[this];ReturnValue;taint;df-generated |
-| System.Xml.Serialization;XmlAttributes;XmlAttributes;(System.Reflection.ICustomAttributeProvider);Argument[0];Argument[this];taint;df-generated |
 | System.Xml.Serialization;XmlAttributes;get_XmlAnyElements;();Argument[this];ReturnValue;taint;df-generated |
 | System.Xml.Serialization;XmlAttributes;get_XmlArrayItems;();Argument[this];ReturnValue;taint;df-generated |
 | System.Xml.Serialization;XmlAttributes;get_XmlChoiceIdentifier;();Argument[this];ReturnValue;taint;df-generated |
@@ -18018,7 +18761,6 @@ summary
 | System.Xml.Serialization;XmlElementAttributes;Add;(System.Xml.Serialization.XmlElementAttribute);Argument[0];Argument[this].Element;value;manual |
 | System.Xml.Serialization;XmlElementAttributes;CopyTo;(System.Xml.Serialization.XmlElementAttribute[],System.Int32);Argument[this].Element;Argument[0].Element;value;manual |
 | System.Xml.Serialization;XmlElementAttributes;Insert;(System.Int32,System.Xml.Serialization.XmlElementAttribute);Argument[1];Argument[this].Element;value;manual |
-| System.Xml.Serialization;XmlElementAttributes;Remove;(System.Xml.Serialization.XmlElementAttribute);Argument[0];Argument[this];taint;df-generated |
 | System.Xml.Serialization;XmlElementAttributes;get_Item;(System.Int32);Argument[this].Element;ReturnValue;value;manual |
 | System.Xml.Serialization;XmlElementAttributes;set_Item;(System.Int32,System.Xml.Serialization.XmlElementAttribute);Argument[1];Argument[this].Element;value;manual |
 | System.Xml.Serialization;XmlElementEventArgs;get_Element;();Argument[this];ReturnValue;taint;df-generated |
@@ -18060,19 +18802,20 @@ summary
 | System.Xml.Serialization;XmlReflectionImporter;XmlReflectionImporter;(System.Xml.Serialization.XmlAttributeOverrides,System.String);Argument[0];Argument[this];taint;df-generated |
 | System.Xml.Serialization;XmlReflectionImporter;XmlReflectionImporter;(System.Xml.Serialization.XmlAttributeOverrides,System.String);Argument[1];Argument[this];taint;df-generated |
 | System.Xml.Serialization;XmlRootAttribute;XmlRootAttribute;(System.String);Argument[0];Argument[this];taint;df-generated |
-| System.Xml.Serialization;XmlSchemaEnumerator;XmlSchemaEnumerator;(System.Xml.Serialization.XmlSchemas);Argument[0].Element;Argument[this];taint;df-generated |
+| System.Xml.Serialization;XmlSchemaEnumerator;XmlSchemaEnumerator;(System.Xml.Serialization.XmlSchemas);Argument[0];Argument[this].SyntheticField[System.Xml.Serialization.XmlSchemaEnumerator._list];value;dfc-generated |
+| System.Xml.Serialization;XmlSchemaEnumerator;get_Current;();Argument[this].SyntheticField[System.Xml.Serialization.XmlSchemaEnumerator._list].Element;ReturnValue;value;df-generated |
+| System.Xml.Serialization;XmlSchemaEnumerator;get_Current;();Argument[this].SyntheticField[System.Xml.Serialization.XmlSchemaEnumerator._list].Element;ReturnValue;value;dfc-generated |
 | System.Xml.Serialization;XmlSchemaEnumerator;get_Current;();Argument[this];ReturnValue;taint;df-generated |
+| System.Xml.Serialization;XmlSchemaEnumerator;get_Current;();Argument[this];ReturnValue;taint;dfc-generated |
 | System.Xml.Serialization;XmlSchemaExporter;ExportMembersMapping;(System.Xml.Serialization.XmlMembersMapping);Argument[0];Argument[this];taint;df-generated |
 | System.Xml.Serialization;XmlSchemaExporter;ExportMembersMapping;(System.Xml.Serialization.XmlMembersMapping,System.Boolean);Argument[0];Argument[this];taint;df-generated |
 | System.Xml.Serialization;XmlSchemaExporter;ExportTypeMapping;(System.Xml.Serialization.XmlMembersMapping);Argument[0];Argument[this];taint;df-generated |
 | System.Xml.Serialization;XmlSchemaExporter;ExportTypeMapping;(System.Xml.Serialization.XmlTypeMapping);Argument[0];Argument[this];taint;df-generated |
 | System.Xml.Serialization;XmlSchemaExporter;XmlSchemaExporter;(System.Xml.Serialization.XmlSchemas);Argument[0].Element;Argument[this];taint;df-generated |
-| System.Xml.Serialization;XmlSchemaProviderAttribute;XmlSchemaProviderAttribute;(System.String);Argument[0];Argument[this];taint;df-generated |
-| System.Xml.Serialization;XmlSchemaProviderAttribute;get_MethodName;();Argument[this];ReturnValue;taint;df-generated |
+| System.Xml.Serialization;XmlSchemaProviderAttribute;XmlSchemaProviderAttribute;(System.String);Argument[0];Argument[this].SyntheticField[System.Xml.Serialization.XmlSchemaProviderAttribute._methodName];value;dfc-generated |
+| System.Xml.Serialization;XmlSchemaProviderAttribute;get_MethodName;();Argument[this].SyntheticField[System.Xml.Serialization.XmlSchemaProviderAttribute._methodName];ReturnValue;value;dfc-generated |
 | System.Xml.Serialization;XmlSchemas;Add;(System.Xml.Schema.XmlSchema);Argument[0];Argument[this].Element;value;manual |
-| System.Xml.Serialization;XmlSchemas;Add;(System.Xml.Schema.XmlSchema,System.Uri);Argument[0];Argument[this];taint;df-generated |
-| System.Xml.Serialization;XmlSchemas;Add;(System.Xml.Schema.XmlSchema,System.Uri);Argument[1];Argument[0];taint;df-generated |
-| System.Xml.Serialization;XmlSchemas;Add;(System.Xml.Schema.XmlSchema,System.Uri);Argument[1];Argument[this];taint;df-generated |
+| System.Xml.Serialization;XmlSchemas;Add;(System.Xml.Schema.XmlSchema,System.Uri);Argument[0];Argument[this].Property[System.Collections.CollectionBase.List].Element;value;dfc-generated |
 | System.Xml.Serialization;XmlSchemas;Add;(System.Xml.Serialization.XmlSchemas);Argument[0];Argument[this].Element;value;manual |
 | System.Xml.Serialization;XmlSchemas;Compile;(System.Xml.Schema.ValidationEventHandler,System.Boolean);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Xml.Serialization;XmlSchemas;CopyTo;(System.Xml.Schema.XmlSchema[],System.Int32);Argument[this].Element;Argument[0].Element;value;manual |
@@ -18081,28 +18824,38 @@ summary
 | System.Xml.Serialization;XmlSchemas;Insert;(System.Int32,System.Xml.Schema.XmlSchema);Argument[1];Argument[this].Element;value;manual |
 | System.Xml.Serialization;XmlSchemas;OnInsert;(System.Int32,System.Object);Argument[1];Argument[this];taint;df-generated |
 | System.Xml.Serialization;XmlSchemas;OnSet;(System.Int32,System.Object,System.Object);Argument[2];Argument[this];taint;df-generated |
-| System.Xml.Serialization;XmlSchemas;Remove;(System.Xml.Schema.XmlSchema);Argument[0];Argument[this];taint;df-generated |
 | System.Xml.Serialization;XmlSchemas;get_Item;(System.Int32);Argument[this].Element;ReturnValue;value;manual |
 | System.Xml.Serialization;XmlSchemas;get_Item;(System.String);Argument[this].Element;ReturnValue;value;manual |
 | System.Xml.Serialization;XmlSchemas;set_Item;(System.Int32,System.Xml.Schema.XmlSchema);Argument[1];Argument[this].Element;value;manual |
 | System.Xml.Serialization;XmlSerializationCollectionFixupCallback;BeginInvoke;(System.Object,System.Object,System.AsyncCallback,System.Object);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
 | System.Xml.Serialization;XmlSerializationFixupCallback;BeginInvoke;(System.Object,System.AsyncCallback,System.Object);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
 | System.Xml.Serialization;XmlSerializationReadCallback;BeginInvoke;(System.AsyncCallback,System.Object);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
+| System.Xml.Serialization;XmlSerializationReader+CollectionFixup;CollectionFixup;(System.Object,System.Xml.Serialization.XmlSerializationCollectionFixupCallback,System.Object);Argument[0];Argument[this].SyntheticField[System.Xml.Serialization.XmlSerializationReader+CollectionFixup._collection];value;dfc-generated |
+| System.Xml.Serialization;XmlSerializationReader+CollectionFixup;CollectionFixup;(System.Object,System.Xml.Serialization.XmlSerializationCollectionFixupCallback,System.Object);Argument[0];Argument[this].SyntheticField[System.Xml.Serialization.XmlSerializationReader+CollectionFixup._collection];value;hq-generated |
+| System.Xml.Serialization;XmlSerializationReader+CollectionFixup;CollectionFixup;(System.Object,System.Xml.Serialization.XmlSerializationCollectionFixupCallback,System.Object);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | System.Xml.Serialization;XmlSerializationReader+CollectionFixup;CollectionFixup;(System.Object,System.Xml.Serialization.XmlSerializationCollectionFixupCallback,System.Object);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
-| System.Xml.Serialization;XmlSerializationReader+CollectionFixup;get_Callback;();Argument[this];ReturnValue;taint;df-generated |
-| System.Xml.Serialization;XmlSerializationReader+CollectionFixup;get_Collection;();Argument[this];ReturnValue;taint;df-generated |
-| System.Xml.Serialization;XmlSerializationReader+CollectionFixup;get_CollectionItems;();Argument[this];ReturnValue;taint;df-generated |
+| System.Xml.Serialization;XmlSerializationReader+CollectionFixup;CollectionFixup;(System.Object,System.Xml.Serialization.XmlSerializationCollectionFixupCallback,System.Object);Argument[1];Argument[this].SyntheticField[System.Xml.Serialization.XmlSerializationReader+CollectionFixup._callback];value;dfc-generated |
+| System.Xml.Serialization;XmlSerializationReader+CollectionFixup;CollectionFixup;(System.Object,System.Xml.Serialization.XmlSerializationCollectionFixupCallback,System.Object);Argument[1];Argument[this].SyntheticField[System.Xml.Serialization.XmlSerializationReader+CollectionFixup._callback];value;hq-generated |
+| System.Xml.Serialization;XmlSerializationReader+CollectionFixup;CollectionFixup;(System.Object,System.Xml.Serialization.XmlSerializationCollectionFixupCallback,System.Object);Argument[2];Argument[this].SyntheticField[System.Xml.Serialization.XmlSerializationReader+CollectionFixup._collectionItems];value;dfc-generated |
+| System.Xml.Serialization;XmlSerializationReader+CollectionFixup;CollectionFixup;(System.Object,System.Xml.Serialization.XmlSerializationCollectionFixupCallback,System.Object);Argument[2];Argument[this].SyntheticField[System.Xml.Serialization.XmlSerializationReader+CollectionFixup._collectionItems];value;hq-generated |
+| System.Xml.Serialization;XmlSerializationReader+CollectionFixup;get_Callback;();Argument[this].SyntheticField[System.Xml.Serialization.XmlSerializationReader+CollectionFixup._callback];ReturnValue;value;dfc-generated |
+| System.Xml.Serialization;XmlSerializationReader+CollectionFixup;get_Collection;();Argument[this].SyntheticField[System.Xml.Serialization.XmlSerializationReader+CollectionFixup._collection];ReturnValue;value;dfc-generated |
+| System.Xml.Serialization;XmlSerializationReader+CollectionFixup;get_CollectionItems;();Argument[this].SyntheticField[System.Xml.Serialization.XmlSerializationReader+CollectionFixup._collectionItems];ReturnValue;value;dfc-generated |
 | System.Xml.Serialization;XmlSerializationReader+Fixup;Fixup;(System.Object,System.Xml.Serialization.XmlSerializationFixupCallback,System.Int32);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
+| System.Xml.Serialization;XmlSerializationReader+Fixup;Fixup;(System.Object,System.Xml.Serialization.XmlSerializationFixupCallback,System.String[]);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | System.Xml.Serialization;XmlSerializationReader+Fixup;Fixup;(System.Object,System.Xml.Serialization.XmlSerializationFixupCallback,System.String[]);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
-| System.Xml.Serialization;XmlSerializationReader+Fixup;get_Callback;();Argument[this];ReturnValue;taint;df-generated |
-| System.Xml.Serialization;XmlSerializationReader+Fixup;get_Ids;();Argument[this];ReturnValue;taint;df-generated |
+| System.Xml.Serialization;XmlSerializationReader+Fixup;Fixup;(System.Object,System.Xml.Serialization.XmlSerializationFixupCallback,System.String[]);Argument[1];Argument[this].SyntheticField[System.Xml.Serialization.XmlSerializationReader+Fixup._callback];value;dfc-generated |
+| System.Xml.Serialization;XmlSerializationReader+Fixup;Fixup;(System.Object,System.Xml.Serialization.XmlSerializationFixupCallback,System.String[]);Argument[1];Argument[this].SyntheticField[System.Xml.Serialization.XmlSerializationReader+Fixup._callback];value;hq-generated |
+| System.Xml.Serialization;XmlSerializationReader+Fixup;Fixup;(System.Object,System.Xml.Serialization.XmlSerializationFixupCallback,System.String[]);Argument[2];Argument[this].SyntheticField[System.Xml.Serialization.XmlSerializationReader+Fixup._ids];value;dfc-generated |
+| System.Xml.Serialization;XmlSerializationReader+Fixup;Fixup;(System.Object,System.Xml.Serialization.XmlSerializationFixupCallback,System.String[]);Argument[2];Argument[this].SyntheticField[System.Xml.Serialization.XmlSerializationReader+Fixup._ids];value;hq-generated |
+| System.Xml.Serialization;XmlSerializationReader+Fixup;get_Callback;();Argument[this].SyntheticField[System.Xml.Serialization.XmlSerializationReader+Fixup._callback];ReturnValue;value;dfc-generated |
+| System.Xml.Serialization;XmlSerializationReader+Fixup;get_Ids;();Argument[this].SyntheticField[System.Xml.Serialization.XmlSerializationReader+Fixup._ids];ReturnValue;value;dfc-generated |
 | System.Xml.Serialization;XmlSerializationReader;AddFixup;(System.Xml.Serialization.XmlSerializationReader+CollectionFixup);Argument[0];Argument[this];taint;df-generated |
 | System.Xml.Serialization;XmlSerializationReader;AddFixup;(System.Xml.Serialization.XmlSerializationReader+Fixup);Argument[0];Argument[this];taint;df-generated |
 | System.Xml.Serialization;XmlSerializationReader;AddReadCallback;(System.String,System.String,System.Type,System.Xml.Serialization.XmlSerializationReadCallback);Argument[3];Argument[3].Parameter[delegate-self];value;hq-generated |
 | System.Xml.Serialization;XmlSerializationReader;AddTarget;(System.String,System.Object);Argument[1];Argument[this];taint;df-generated |
-| System.Xml.Serialization;XmlSerializationReader;AddTarget;(System.String,System.Object);Argument[this];Argument[1];taint;df-generated |
-| System.Xml.Serialization;XmlSerializationReader;CollapseWhitespace;(System.String);Argument[0];ReturnValue;taint;df-generated |
-| System.Xml.Serialization;XmlSerializationReader;EnsureArrayIndex;(System.Array,System.Int32,System.Type);Argument[0].Element;ReturnValue;taint;df-generated |
+| System.Xml.Serialization;XmlSerializationReader;CollapseWhitespace;(System.String);Argument[0];ReturnValue;taint;dfc-generated |
+| System.Xml.Serialization;XmlSerializationReader;EnsureArrayIndex;(System.Array,System.Int32,System.Type);Argument[0];ReturnValue;value;dfc-generated |
 | System.Xml.Serialization;XmlSerializationReader;GetTarget;(System.String);Argument[this];ReturnValue;taint;df-generated |
 | System.Xml.Serialization;XmlSerializationReader;ReadNullableString;();Argument[this];ReturnValue;taint;df-generated |
 | System.Xml.Serialization;XmlSerializationReader;ReadReference;(System.String);Argument[this];ReturnValue;taint;df-generated |
@@ -18111,35 +18864,29 @@ summary
 | System.Xml.Serialization;XmlSerializationReader;ReadReferencingElement;(System.String);Argument[this];ReturnValue;taint;df-generated |
 | System.Xml.Serialization;XmlSerializationReader;ReadReferencingElement;(System.String,System.String,System.Boolean,System.String);Argument[this];ReturnValue;taint;df-generated |
 | System.Xml.Serialization;XmlSerializationReader;ReadReferencingElement;(System.String,System.String,System.String);Argument[this];ReturnValue;taint;df-generated |
-| System.Xml.Serialization;XmlSerializationReader;ReadSerializable;(System.Xml.Serialization.IXmlSerializable);Argument[0];ReturnValue;taint;df-generated |
-| System.Xml.Serialization;XmlSerializationReader;ReadSerializable;(System.Xml.Serialization.IXmlSerializable);Argument[this];Argument[0];taint;df-generated |
-| System.Xml.Serialization;XmlSerializationReader;ReadSerializable;(System.Xml.Serialization.IXmlSerializable);Argument[this];ReturnValue;taint;df-generated |
-| System.Xml.Serialization;XmlSerializationReader;ReadSerializable;(System.Xml.Serialization.IXmlSerializable,System.Boolean);Argument[0];ReturnValue;taint;df-generated |
-| System.Xml.Serialization;XmlSerializationReader;ReadSerializable;(System.Xml.Serialization.IXmlSerializable,System.Boolean);Argument[this];Argument[0];taint;df-generated |
-| System.Xml.Serialization;XmlSerializationReader;ReadSerializable;(System.Xml.Serialization.IXmlSerializable,System.Boolean);Argument[this];ReturnValue;taint;df-generated |
-| System.Xml.Serialization;XmlSerializationReader;ReadString;(System.String);Argument[0];ReturnValue;taint;df-generated |
-| System.Xml.Serialization;XmlSerializationReader;ReadString;(System.String);Argument[this];ReturnValue;taint;df-generated |
-| System.Xml.Serialization;XmlSerializationReader;ReadString;(System.String,System.Boolean);Argument[0];ReturnValue;taint;df-generated |
-| System.Xml.Serialization;XmlSerializationReader;ReadString;(System.String,System.Boolean);Argument[this];ReturnValue;taint;df-generated |
+| System.Xml.Serialization;XmlSerializationReader;ReadSerializable;(System.Xml.Serialization.IXmlSerializable);Argument[0];ReturnValue;value;dfc-generated |
+| System.Xml.Serialization;XmlSerializationReader;ReadSerializable;(System.Xml.Serialization.IXmlSerializable,System.Boolean);Argument[0];ReturnValue;value;dfc-generated |
+| System.Xml.Serialization;XmlSerializationReader;ReadString;(System.String);Argument[0];ReturnValue;taint;dfc-generated |
+| System.Xml.Serialization;XmlSerializationReader;ReadString;(System.String,System.Boolean);Argument[0];ReturnValue;taint;dfc-generated |
 | System.Xml.Serialization;XmlSerializationReader;ReadTypedPrimitive;(System.Xml.XmlQualifiedName);Argument[this];ReturnValue;taint;df-generated |
-| System.Xml.Serialization;XmlSerializationReader;ShrinkArray;(System.Array,System.Int32,System.Type,System.Boolean);Argument[0].Element;ReturnValue;taint;df-generated |
-| System.Xml.Serialization;XmlSerializationReader;ToByteArrayBase64;(System.String);Argument[0];ReturnValue;taint;df-generated |
-| System.Xml.Serialization;XmlSerializationReader;ToXmlNCName;(System.String);Argument[0];ReturnValue;taint;df-generated |
-| System.Xml.Serialization;XmlSerializationReader;ToXmlName;(System.String);Argument[0];ReturnValue;taint;df-generated |
-| System.Xml.Serialization;XmlSerializationReader;ToXmlNmToken;(System.String);Argument[0];ReturnValue;taint;df-generated |
-| System.Xml.Serialization;XmlSerializationReader;ToXmlNmTokens;(System.String);Argument[0];ReturnValue;taint;df-generated |
+| System.Xml.Serialization;XmlSerializationReader;ShrinkArray;(System.Array,System.Int32,System.Type,System.Boolean);Argument[0];ReturnValue;value;dfc-generated |
+| System.Xml.Serialization;XmlSerializationReader;ToByteArrayBase64;(System.String);Argument[0];ReturnValue.Element;taint;dfc-generated |
+| System.Xml.Serialization;XmlSerializationReader;ToXmlNCName;(System.String);Argument[0];ReturnValue;taint;dfc-generated |
+| System.Xml.Serialization;XmlSerializationReader;ToXmlName;(System.String);Argument[0];ReturnValue;taint;dfc-generated |
+| System.Xml.Serialization;XmlSerializationReader;ToXmlNmToken;(System.String);Argument[0];ReturnValue;taint;dfc-generated |
+| System.Xml.Serialization;XmlSerializationReader;ToXmlNmTokens;(System.String);Argument[0];ReturnValue;taint;dfc-generated |
 | System.Xml.Serialization;XmlSerializationReader;get_Document;();Argument[this];ReturnValue;taint;df-generated |
 | System.Xml.Serialization;XmlSerializationReader;get_Reader;();Argument[this];ReturnValue;taint;df-generated |
 | System.Xml.Serialization;XmlSerializationWriteCallback;BeginInvoke;(System.Object,System.AsyncCallback,System.Object);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
 | System.Xml.Serialization;XmlSerializationWriter;AddWriteCallback;(System.Type,System.String,System.String,System.Xml.Serialization.XmlSerializationWriteCallback);Argument[3];Argument[3].Parameter[delegate-self];value;hq-generated |
-| System.Xml.Serialization;XmlSerializationWriter;FromByteArrayBase64;(System.Byte[]);Argument[0].Element;ReturnValue;taint;df-generated |
-| System.Xml.Serialization;XmlSerializationWriter;FromByteArrayHex;(System.Byte[]);Argument[0].Element;ReturnValue;taint;df-generated |
-| System.Xml.Serialization;XmlSerializationWriter;FromEnum;(System.Int64,System.String[],System.Int64[]);Argument[1].Element;ReturnValue;taint;df-generated |
-| System.Xml.Serialization;XmlSerializationWriter;FromEnum;(System.Int64,System.String[],System.Int64[],System.String);Argument[1].Element;ReturnValue;taint;df-generated |
-| System.Xml.Serialization;XmlSerializationWriter;FromXmlNCName;(System.String);Argument[0];ReturnValue;taint;df-generated |
-| System.Xml.Serialization;XmlSerializationWriter;FromXmlName;(System.String);Argument[0];ReturnValue;taint;df-generated |
-| System.Xml.Serialization;XmlSerializationWriter;FromXmlNmToken;(System.String);Argument[0];ReturnValue;taint;df-generated |
-| System.Xml.Serialization;XmlSerializationWriter;FromXmlNmTokens;(System.String);Argument[0];ReturnValue;taint;df-generated |
+| System.Xml.Serialization;XmlSerializationWriter;FromByteArrayBase64;(System.Byte[]);Argument[0];ReturnValue;value;dfc-generated |
+| System.Xml.Serialization;XmlSerializationWriter;FromByteArrayHex;(System.Byte[]);Argument[0].Element;ReturnValue;taint;dfc-generated |
+| System.Xml.Serialization;XmlSerializationWriter;FromEnum;(System.Int64,System.String[],System.Int64[]);Argument[1].Element;ReturnValue;taint;dfc-generated |
+| System.Xml.Serialization;XmlSerializationWriter;FromEnum;(System.Int64,System.String[],System.Int64[],System.String);Argument[1].Element;ReturnValue;taint;dfc-generated |
+| System.Xml.Serialization;XmlSerializationWriter;FromXmlNCName;(System.String);Argument[0];ReturnValue;value;dfc-generated |
+| System.Xml.Serialization;XmlSerializationWriter;FromXmlName;(System.String);Argument[0];ReturnValue;value;dfc-generated |
+| System.Xml.Serialization;XmlSerializationWriter;FromXmlNmToken;(System.String);Argument[0];ReturnValue;value;dfc-generated |
+| System.Xml.Serialization;XmlSerializationWriter;FromXmlNmTokens;(System.String);Argument[0];ReturnValue;value;dfc-generated |
 | System.Xml.Serialization;XmlSerializationWriter;FromXmlQualifiedName;(System.Xml.XmlQualifiedName);Argument[0];Argument[this];taint;df-generated |
 | System.Xml.Serialization;XmlSerializationWriter;FromXmlQualifiedName;(System.Xml.XmlQualifiedName);Argument[0];ReturnValue;taint;df-generated |
 | System.Xml.Serialization;XmlSerializationWriter;FromXmlQualifiedName;(System.Xml.XmlQualifiedName);Argument[this];ReturnValue;taint;df-generated |
@@ -18154,64 +18901,103 @@ summary
 | System.Xml.Serialization;XmlSerializationWriter;WriteAttribute;(System.String,System.String,System.Byte[]);Argument[2].Element;Argument[this];taint;df-generated |
 | System.Xml.Serialization;XmlSerializationWriter;WriteAttribute;(System.String,System.String,System.String);Argument[0];Argument[this];taint;df-generated |
 | System.Xml.Serialization;XmlSerializationWriter;WriteAttribute;(System.String,System.String,System.String);Argument[2];Argument[this];taint;df-generated |
+| System.Xml.Serialization;XmlSerializationWriter;WriteAttribute;(System.String,System.String,System.String,System.String);Argument[0];Argument[this];taint;df-generated |
 | System.Xml.Serialization;XmlSerializationWriter;WriteAttribute;(System.String,System.String,System.String,System.String);Argument[1];Argument[this];taint;df-generated |
 | System.Xml.Serialization;XmlSerializationWriter;WriteAttribute;(System.String,System.String,System.String,System.String);Argument[3];Argument[this];taint;df-generated |
 | System.Xml.Serialization;XmlSerializationWriter;WriteElementEncoded;(System.Xml.XmlNode,System.String,System.String,System.Boolean,System.Boolean);Argument[0].Element;Argument[this];taint;df-generated |
+| System.Xml.Serialization;XmlSerializationWriter;WriteElementEncoded;(System.Xml.XmlNode,System.String,System.String,System.Boolean,System.Boolean);Argument[1];Argument[this];taint;df-generated |
 | System.Xml.Serialization;XmlSerializationWriter;WriteElementLiteral;(System.Xml.XmlNode,System.String,System.String,System.Boolean,System.Boolean);Argument[0].Element;Argument[this];taint;df-generated |
+| System.Xml.Serialization;XmlSerializationWriter;WriteElementLiteral;(System.Xml.XmlNode,System.String,System.String,System.Boolean,System.Boolean);Argument[1];Argument[this];taint;df-generated |
+| System.Xml.Serialization;XmlSerializationWriter;WriteElementQualifiedName;(System.String,System.String,System.Xml.XmlQualifiedName);Argument[0];Argument[this];taint;df-generated |
 | System.Xml.Serialization;XmlSerializationWriter;WriteElementQualifiedName;(System.String,System.String,System.Xml.XmlQualifiedName);Argument[2];Argument[this];taint;df-generated |
+| System.Xml.Serialization;XmlSerializationWriter;WriteElementQualifiedName;(System.String,System.String,System.Xml.XmlQualifiedName,System.Xml.XmlQualifiedName);Argument[0];Argument[this];taint;df-generated |
 | System.Xml.Serialization;XmlSerializationWriter;WriteElementQualifiedName;(System.String,System.String,System.Xml.XmlQualifiedName,System.Xml.XmlQualifiedName);Argument[2];Argument[this];taint;df-generated |
 | System.Xml.Serialization;XmlSerializationWriter;WriteElementQualifiedName;(System.String,System.String,System.Xml.XmlQualifiedName,System.Xml.XmlQualifiedName);Argument[3];Argument[this];taint;df-generated |
+| System.Xml.Serialization;XmlSerializationWriter;WriteElementQualifiedName;(System.String,System.Xml.XmlQualifiedName);Argument[0];Argument[this];taint;df-generated |
 | System.Xml.Serialization;XmlSerializationWriter;WriteElementQualifiedName;(System.String,System.Xml.XmlQualifiedName);Argument[1];Argument[this];taint;df-generated |
+| System.Xml.Serialization;XmlSerializationWriter;WriteElementQualifiedName;(System.String,System.Xml.XmlQualifiedName,System.Xml.XmlQualifiedName);Argument[0];Argument[this];taint;df-generated |
 | System.Xml.Serialization;XmlSerializationWriter;WriteElementQualifiedName;(System.String,System.Xml.XmlQualifiedName,System.Xml.XmlQualifiedName);Argument[1];Argument[this];taint;df-generated |
 | System.Xml.Serialization;XmlSerializationWriter;WriteElementQualifiedName;(System.String,System.Xml.XmlQualifiedName,System.Xml.XmlQualifiedName);Argument[2];Argument[this];taint;df-generated |
+| System.Xml.Serialization;XmlSerializationWriter;WriteElementString;(System.String,System.String);Argument[0];Argument[this];taint;df-generated |
 | System.Xml.Serialization;XmlSerializationWriter;WriteElementString;(System.String,System.String);Argument[1];Argument[this];taint;df-generated |
+| System.Xml.Serialization;XmlSerializationWriter;WriteElementString;(System.String,System.String,System.String);Argument[0];Argument[this];taint;df-generated |
 | System.Xml.Serialization;XmlSerializationWriter;WriteElementString;(System.String,System.String,System.String);Argument[2];Argument[this];taint;df-generated |
+| System.Xml.Serialization;XmlSerializationWriter;WriteElementString;(System.String,System.String,System.String,System.Xml.XmlQualifiedName);Argument[0];Argument[this];taint;df-generated |
 | System.Xml.Serialization;XmlSerializationWriter;WriteElementString;(System.String,System.String,System.String,System.Xml.XmlQualifiedName);Argument[2];Argument[this];taint;df-generated |
 | System.Xml.Serialization;XmlSerializationWriter;WriteElementString;(System.String,System.String,System.String,System.Xml.XmlQualifiedName);Argument[3];Argument[this];taint;df-generated |
+| System.Xml.Serialization;XmlSerializationWriter;WriteElementString;(System.String,System.String,System.Xml.XmlQualifiedName);Argument[0];Argument[this];taint;df-generated |
 | System.Xml.Serialization;XmlSerializationWriter;WriteElementString;(System.String,System.String,System.Xml.XmlQualifiedName);Argument[1];Argument[this];taint;df-generated |
 | System.Xml.Serialization;XmlSerializationWriter;WriteElementString;(System.String,System.String,System.Xml.XmlQualifiedName);Argument[2];Argument[this];taint;df-generated |
+| System.Xml.Serialization;XmlSerializationWriter;WriteElementStringRaw;(System.String,System.Byte[]);Argument[0];Argument[this];taint;df-generated |
 | System.Xml.Serialization;XmlSerializationWriter;WriteElementStringRaw;(System.String,System.Byte[]);Argument[1].Element;Argument[this];taint;df-generated |
+| System.Xml.Serialization;XmlSerializationWriter;WriteElementStringRaw;(System.String,System.Byte[],System.Xml.XmlQualifiedName);Argument[0];Argument[this];taint;df-generated |
 | System.Xml.Serialization;XmlSerializationWriter;WriteElementStringRaw;(System.String,System.Byte[],System.Xml.XmlQualifiedName);Argument[1].Element;Argument[this];taint;df-generated |
 | System.Xml.Serialization;XmlSerializationWriter;WriteElementStringRaw;(System.String,System.Byte[],System.Xml.XmlQualifiedName);Argument[2];Argument[this];taint;df-generated |
+| System.Xml.Serialization;XmlSerializationWriter;WriteElementStringRaw;(System.String,System.String);Argument[0];Argument[this];taint;df-generated |
 | System.Xml.Serialization;XmlSerializationWriter;WriteElementStringRaw;(System.String,System.String);Argument[1];Argument[this];taint;df-generated |
+| System.Xml.Serialization;XmlSerializationWriter;WriteElementStringRaw;(System.String,System.String,System.Byte[]);Argument[0];Argument[this];taint;df-generated |
 | System.Xml.Serialization;XmlSerializationWriter;WriteElementStringRaw;(System.String,System.String,System.Byte[]);Argument[2].Element;Argument[this];taint;df-generated |
+| System.Xml.Serialization;XmlSerializationWriter;WriteElementStringRaw;(System.String,System.String,System.Byte[],System.Xml.XmlQualifiedName);Argument[0];Argument[this];taint;df-generated |
 | System.Xml.Serialization;XmlSerializationWriter;WriteElementStringRaw;(System.String,System.String,System.Byte[],System.Xml.XmlQualifiedName);Argument[2].Element;Argument[this];taint;df-generated |
 | System.Xml.Serialization;XmlSerializationWriter;WriteElementStringRaw;(System.String,System.String,System.Byte[],System.Xml.XmlQualifiedName);Argument[3];Argument[this];taint;df-generated |
+| System.Xml.Serialization;XmlSerializationWriter;WriteElementStringRaw;(System.String,System.String,System.String);Argument[0];Argument[this];taint;df-generated |
 | System.Xml.Serialization;XmlSerializationWriter;WriteElementStringRaw;(System.String,System.String,System.String);Argument[2];Argument[this];taint;df-generated |
+| System.Xml.Serialization;XmlSerializationWriter;WriteElementStringRaw;(System.String,System.String,System.String,System.Xml.XmlQualifiedName);Argument[0];Argument[this];taint;df-generated |
 | System.Xml.Serialization;XmlSerializationWriter;WriteElementStringRaw;(System.String,System.String,System.String,System.Xml.XmlQualifiedName);Argument[2];Argument[this];taint;df-generated |
 | System.Xml.Serialization;XmlSerializationWriter;WriteElementStringRaw;(System.String,System.String,System.String,System.Xml.XmlQualifiedName);Argument[3];Argument[this];taint;df-generated |
+| System.Xml.Serialization;XmlSerializationWriter;WriteElementStringRaw;(System.String,System.String,System.Xml.XmlQualifiedName);Argument[0];Argument[this];taint;df-generated |
 | System.Xml.Serialization;XmlSerializationWriter;WriteElementStringRaw;(System.String,System.String,System.Xml.XmlQualifiedName);Argument[1];Argument[this];taint;df-generated |
 | System.Xml.Serialization;XmlSerializationWriter;WriteElementStringRaw;(System.String,System.String,System.Xml.XmlQualifiedName);Argument[2];Argument[this];taint;df-generated |
+| System.Xml.Serialization;XmlSerializationWriter;WriteEmptyTag;(System.String);Argument[0];Argument[this];taint;df-generated |
+| System.Xml.Serialization;XmlSerializationWriter;WriteEmptyTag;(System.String,System.String);Argument[0];Argument[this];taint;df-generated |
 | System.Xml.Serialization;XmlSerializationWriter;WriteId;(System.Object);Argument[0];Argument[this];taint;df-generated |
-| System.Xml.Serialization;XmlSerializationWriter;WriteId;(System.Object);Argument[this];Argument[0];taint;df-generated |
 | System.Xml.Serialization;XmlSerializationWriter;WriteNamespaceDeclarations;(System.Xml.Serialization.XmlSerializerNamespaces);Argument[0];Argument[this];taint;df-generated |
+| System.Xml.Serialization;XmlSerializationWriter;WriteNullTagEncoded;(System.String);Argument[0];Argument[this];taint;df-generated |
+| System.Xml.Serialization;XmlSerializationWriter;WriteNullTagEncoded;(System.String,System.String);Argument[0];Argument[this];taint;df-generated |
+| System.Xml.Serialization;XmlSerializationWriter;WriteNullTagLiteral;(System.String);Argument[0];Argument[this];taint;df-generated |
+| System.Xml.Serialization;XmlSerializationWriter;WriteNullTagLiteral;(System.String,System.String);Argument[0];Argument[this];taint;df-generated |
+| System.Xml.Serialization;XmlSerializationWriter;WriteNullableQualifiedNameEncoded;(System.String,System.String,System.Xml.XmlQualifiedName,System.Xml.XmlQualifiedName);Argument[0];Argument[this];taint;df-generated |
 | System.Xml.Serialization;XmlSerializationWriter;WriteNullableQualifiedNameEncoded;(System.String,System.String,System.Xml.XmlQualifiedName,System.Xml.XmlQualifiedName);Argument[2];Argument[this];taint;df-generated |
 | System.Xml.Serialization;XmlSerializationWriter;WriteNullableQualifiedNameEncoded;(System.String,System.String,System.Xml.XmlQualifiedName,System.Xml.XmlQualifiedName);Argument[3];Argument[this];taint;df-generated |
+| System.Xml.Serialization;XmlSerializationWriter;WriteNullableQualifiedNameLiteral;(System.String,System.String,System.Xml.XmlQualifiedName);Argument[0];Argument[this];taint;df-generated |
 | System.Xml.Serialization;XmlSerializationWriter;WriteNullableQualifiedNameLiteral;(System.String,System.String,System.Xml.XmlQualifiedName);Argument[2];Argument[this];taint;df-generated |
+| System.Xml.Serialization;XmlSerializationWriter;WriteNullableStringEncoded;(System.String,System.String,System.String,System.Xml.XmlQualifiedName);Argument[0];Argument[this];taint;df-generated |
 | System.Xml.Serialization;XmlSerializationWriter;WriteNullableStringEncoded;(System.String,System.String,System.String,System.Xml.XmlQualifiedName);Argument[2];Argument[this];taint;df-generated |
 | System.Xml.Serialization;XmlSerializationWriter;WriteNullableStringEncoded;(System.String,System.String,System.String,System.Xml.XmlQualifiedName);Argument[3];Argument[this];taint;df-generated |
+| System.Xml.Serialization;XmlSerializationWriter;WriteNullableStringEncodedRaw;(System.String,System.String,System.Byte[],System.Xml.XmlQualifiedName);Argument[0];Argument[this];taint;df-generated |
 | System.Xml.Serialization;XmlSerializationWriter;WriteNullableStringEncodedRaw;(System.String,System.String,System.Byte[],System.Xml.XmlQualifiedName);Argument[2].Element;Argument[this];taint;df-generated |
 | System.Xml.Serialization;XmlSerializationWriter;WriteNullableStringEncodedRaw;(System.String,System.String,System.Byte[],System.Xml.XmlQualifiedName);Argument[3];Argument[this];taint;df-generated |
+| System.Xml.Serialization;XmlSerializationWriter;WriteNullableStringEncodedRaw;(System.String,System.String,System.String,System.Xml.XmlQualifiedName);Argument[0];Argument[this];taint;df-generated |
 | System.Xml.Serialization;XmlSerializationWriter;WriteNullableStringEncodedRaw;(System.String,System.String,System.String,System.Xml.XmlQualifiedName);Argument[2];Argument[this];taint;df-generated |
 | System.Xml.Serialization;XmlSerializationWriter;WriteNullableStringEncodedRaw;(System.String,System.String,System.String,System.Xml.XmlQualifiedName);Argument[3];Argument[this];taint;df-generated |
+| System.Xml.Serialization;XmlSerializationWriter;WriteNullableStringLiteral;(System.String,System.String,System.String);Argument[0];Argument[this];taint;df-generated |
 | System.Xml.Serialization;XmlSerializationWriter;WriteNullableStringLiteral;(System.String,System.String,System.String);Argument[2];Argument[this];taint;df-generated |
+| System.Xml.Serialization;XmlSerializationWriter;WriteNullableStringLiteralRaw;(System.String,System.String,System.Byte[]);Argument[0];Argument[this];taint;df-generated |
 | System.Xml.Serialization;XmlSerializationWriter;WriteNullableStringLiteralRaw;(System.String,System.String,System.Byte[]);Argument[2].Element;Argument[this];taint;df-generated |
+| System.Xml.Serialization;XmlSerializationWriter;WriteNullableStringLiteralRaw;(System.String,System.String,System.String);Argument[0];Argument[this];taint;df-generated |
 | System.Xml.Serialization;XmlSerializationWriter;WriteNullableStringLiteralRaw;(System.String,System.String,System.String);Argument[2];Argument[this];taint;df-generated |
+| System.Xml.Serialization;XmlSerializationWriter;WritePotentiallyReferencingElement;(System.String,System.String,System.Object);Argument[0];Argument[this];taint;df-generated |
 | System.Xml.Serialization;XmlSerializationWriter;WritePotentiallyReferencingElement;(System.String,System.String,System.Object);Argument[2];Argument[this];taint;df-generated |
-| System.Xml.Serialization;XmlSerializationWriter;WritePotentiallyReferencingElement;(System.String,System.String,System.Object);Argument[this];Argument[2];taint;df-generated |
+| System.Xml.Serialization;XmlSerializationWriter;WritePotentiallyReferencingElement;(System.String,System.String,System.Object,System.Type);Argument[0];Argument[this];taint;df-generated |
 | System.Xml.Serialization;XmlSerializationWriter;WritePotentiallyReferencingElement;(System.String,System.String,System.Object,System.Type);Argument[2];Argument[this];taint;df-generated |
-| System.Xml.Serialization;XmlSerializationWriter;WritePotentiallyReferencingElement;(System.String,System.String,System.Object,System.Type);Argument[this];Argument[2];taint;df-generated |
+| System.Xml.Serialization;XmlSerializationWriter;WritePotentiallyReferencingElement;(System.String,System.String,System.Object,System.Type,System.Boolean);Argument[0];Argument[this];taint;df-generated |
 | System.Xml.Serialization;XmlSerializationWriter;WritePotentiallyReferencingElement;(System.String,System.String,System.Object,System.Type,System.Boolean);Argument[2];Argument[this];taint;df-generated |
-| System.Xml.Serialization;XmlSerializationWriter;WritePotentiallyReferencingElement;(System.String,System.String,System.Object,System.Type,System.Boolean);Argument[this];Argument[2];taint;df-generated |
+| System.Xml.Serialization;XmlSerializationWriter;WritePotentiallyReferencingElement;(System.String,System.String,System.Object,System.Type,System.Boolean,System.Boolean);Argument[0];Argument[this];taint;df-generated |
 | System.Xml.Serialization;XmlSerializationWriter;WritePotentiallyReferencingElement;(System.String,System.String,System.Object,System.Type,System.Boolean,System.Boolean);Argument[2];Argument[this];taint;df-generated |
-| System.Xml.Serialization;XmlSerializationWriter;WritePotentiallyReferencingElement;(System.String,System.String,System.Object,System.Type,System.Boolean,System.Boolean);Argument[this];Argument[2];taint;df-generated |
+| System.Xml.Serialization;XmlSerializationWriter;WriteReferencingElement;(System.String,System.String,System.Object);Argument[0];Argument[this];taint;df-generated |
 | System.Xml.Serialization;XmlSerializationWriter;WriteReferencingElement;(System.String,System.String,System.Object);Argument[2];Argument[this];taint;df-generated |
-| System.Xml.Serialization;XmlSerializationWriter;WriteReferencingElement;(System.String,System.String,System.Object);Argument[this];Argument[2];taint;df-generated |
+| System.Xml.Serialization;XmlSerializationWriter;WriteReferencingElement;(System.String,System.String,System.Object,System.Boolean);Argument[0];Argument[this];taint;df-generated |
 | System.Xml.Serialization;XmlSerializationWriter;WriteReferencingElement;(System.String,System.String,System.Object,System.Boolean);Argument[2];Argument[this];taint;df-generated |
-| System.Xml.Serialization;XmlSerializationWriter;WriteReferencingElement;(System.String,System.String,System.Object,System.Boolean);Argument[this];Argument[2];taint;df-generated |
-| System.Xml.Serialization;XmlSerializationWriter;WriteSerializable;(System.Xml.Serialization.IXmlSerializable,System.String,System.String,System.Boolean);Argument[0];Argument[this];taint;df-generated |
-| System.Xml.Serialization;XmlSerializationWriter;WriteSerializable;(System.Xml.Serialization.IXmlSerializable,System.String,System.String,System.Boolean,System.Boolean);Argument[0];Argument[this];taint;df-generated |
+| System.Xml.Serialization;XmlSerializationWriter;WriteSerializable;(System.Xml.Serialization.IXmlSerializable,System.String,System.String,System.Boolean);Argument[1];Argument[this];taint;df-generated |
+| System.Xml.Serialization;XmlSerializationWriter;WriteSerializable;(System.Xml.Serialization.IXmlSerializable,System.String,System.String,System.Boolean,System.Boolean);Argument[1];Argument[this];taint;df-generated |
+| System.Xml.Serialization;XmlSerializationWriter;WriteStartElement;(System.String);Argument[0];Argument[this];taint;df-generated |
+| System.Xml.Serialization;XmlSerializationWriter;WriteStartElement;(System.String,System.String);Argument[0];Argument[this];taint;df-generated |
+| System.Xml.Serialization;XmlSerializationWriter;WriteStartElement;(System.String,System.String,System.Boolean);Argument[0];Argument[this];taint;df-generated |
+| System.Xml.Serialization;XmlSerializationWriter;WriteStartElement;(System.String,System.String,System.Object);Argument[0];Argument[this];taint;df-generated |
+| System.Xml.Serialization;XmlSerializationWriter;WriteStartElement;(System.String,System.String,System.Object,System.Boolean);Argument[0];Argument[this];taint;df-generated |
+| System.Xml.Serialization;XmlSerializationWriter;WriteStartElement;(System.String,System.String,System.Object,System.Boolean,System.Xml.Serialization.XmlSerializerNamespaces);Argument[0];Argument[this];taint;df-generated |
 | System.Xml.Serialization;XmlSerializationWriter;WriteStartElement;(System.String,System.String,System.Object,System.Boolean,System.Xml.Serialization.XmlSerializerNamespaces);Argument[4];Argument[this];taint;df-generated |
+| System.Xml.Serialization;XmlSerializationWriter;WriteTypedPrimitive;(System.String,System.String,System.Object,System.Boolean);Argument[0];Argument[this];taint;df-generated |
 | System.Xml.Serialization;XmlSerializationWriter;WriteTypedPrimitive;(System.String,System.String,System.Object,System.Boolean);Argument[2];Argument[this];taint;df-generated |
 | System.Xml.Serialization;XmlSerializationWriter;WriteValue;(System.Byte[]);Argument[0].Element;Argument[this];taint;df-generated |
 | System.Xml.Serialization;XmlSerializationWriter;WriteValue;(System.String);Argument[0];Argument[this];taint;df-generated |
@@ -18252,26 +19038,25 @@ summary
 | System.Xml.Serialization;XmlTypeAttribute;XmlTypeAttribute;(System.String);Argument[0];Argument[this];taint;df-generated |
 | System.Xml.Serialization;XmlTypeMapping;get_XsdTypeName;();Argument[this];ReturnValue;taint;df-generated |
 | System.Xml.Serialization;XmlTypeMapping;get_XsdTypeNamespace;();Argument[this];ReturnValue;taint;df-generated |
-| System.Xml.XPath;Extensions;CreateNavigator;(System.Xml.Linq.XNode);Argument[0];ReturnValue;taint;df-generated |
-| System.Xml.XPath;Extensions;CreateNavigator;(System.Xml.Linq.XNode,System.Xml.XmlNameTable);Argument[0];ReturnValue;taint;df-generated |
-| System.Xml.XPath;Extensions;CreateNavigator;(System.Xml.Linq.XNode,System.Xml.XmlNameTable);Argument[1];ReturnValue;taint;df-generated |
+| System.Xml.XPath;Extensions;CreateNavigator;(System.Xml.Linq.XNode);Argument[0];ReturnValue.SyntheticField[System.Xml.XPath.XNodeNavigator._source];value;dfc-generated |
+| System.Xml.XPath;Extensions;CreateNavigator;(System.Xml.Linq.XNode,System.Xml.XmlNameTable);Argument[0];ReturnValue.SyntheticField[System.Xml.XPath.XNodeNavigator._source];value;dfc-generated |
+| System.Xml.XPath;Extensions;CreateNavigator;(System.Xml.Linq.XNode,System.Xml.XmlNameTable);Argument[1];ReturnValue.SyntheticField[System.Xml.XPath.XNodeNavigator._nameTable];value;dfc-generated |
 | System.Xml.XPath;IXPathNavigable;CreateNavigator;();Argument[this];ReturnValue;taint;df-generated |
 | System.Xml.XPath;XDocumentExtensions;ToXPathNavigable;(System.Xml.Linq.XNode);Argument[0];ReturnValue;taint;df-generated |
 | System.Xml.XPath;XPathDocument;CreateNavigator;();Argument[this];ReturnValue;taint;df-generated |
 | System.Xml.XPath;XPathDocument;XPathDocument;(System.Xml.XmlReader,System.Xml.XmlSpace);Argument[0];Argument[this];taint;df-generated |
 | System.Xml.XPath;XPathException;GetObjectData;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);Argument[this];Argument[0];taint;df-generated |
-| System.Xml.XPath;XPathException;XPathException;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);Argument[0];Argument[this];taint;df-generated |
-| System.Xml.XPath;XPathException;get_Message;();Argument[this];ReturnValue;taint;df-generated |
-| System.Xml.XPath;XPathExpression;Clone;();Argument[this];ReturnValue;taint;df-generated |
-| System.Xml.XPath;XPathExpression;Clone;();Argument[this];ReturnValue;value;df-generated |
+| System.Xml.XPath;XPathException;get_Message;();Argument[this].Property[System.Exception.Message];ReturnValue;value;dfc-generated |
+| System.Xml.XPath;XPathException;get_Message;();Argument[this].SyntheticField[System.Exception._message];ReturnValue;value;dfc-generated |
+| System.Xml.XPath;XPathExpression;Clone;();Argument[this];ReturnValue;value;dfc-generated |
 | System.Xml.XPath;XPathExpression;Compile;(System.String);Argument[0];ReturnValue;taint;df-generated |
-| System.Xml.XPath;XPathExpression;Compile;(System.String,System.Xml.IXmlNamespaceResolver);Argument[0];ReturnValue;taint;df-generated |
-| System.Xml.XPath;XPathExpression;Compile;(System.String,System.Xml.IXmlNamespaceResolver);Argument[1];ReturnValue;taint;df-generated |
+| System.Xml.XPath;XPathExpression;Compile;(System.String,System.Xml.IXmlNamespaceResolver);Argument[0];ReturnValue.SyntheticField[MS.Internal.Xml.XPath.CompiledXpathExpr._expr];value;dfc-generated |
 | System.Xml.XPath;XPathExpression;SetContext;(System.Xml.IXmlNamespaceResolver);Argument[0];Argument[this];taint;df-generated |
 | System.Xml.XPath;XPathExpression;SetContext;(System.Xml.XmlNamespaceManager);Argument[0].Element;Argument[this];taint;df-generated |
 | System.Xml.XPath;XPathExpression;get_Expression;();Argument[this];ReturnValue;taint;df-generated |
 | System.Xml.XPath;XPathItem;ValueAs;(System.Type);Argument[this];ReturnValue;taint;df-generated |
 | System.Xml.XPath;XPathItem;ValueAs;(System.Type,System.Xml.IXmlNamespaceResolver);Argument[1];ReturnValue;taint;df-generated |
+| System.Xml.XPath;XPathItem;ValueAs;(System.Type,System.Xml.IXmlNamespaceResolver);Argument[this];Argument[1];taint;df-generated |
 | System.Xml.XPath;XPathItem;ValueAs;(System.Type,System.Xml.IXmlNamespaceResolver);Argument[this];ReturnValue;taint;df-generated |
 | System.Xml.XPath;XPathItem;ValueAs;(System.Type,System.Xml.IXmlNamespaceResolver);Argument[this];ReturnValue;value;df-generated |
 | System.Xml.XPath;XPathItem;get_TypedValue;();Argument[this];ReturnValue;taint;df-generated |
@@ -18279,8 +19064,7 @@ summary
 | System.Xml.XPath;XPathItem;get_XmlType;();Argument[this];ReturnValue;taint;df-generated |
 | System.Xml.XPath;XPathNavigator;AppendChild;();Argument[this];ReturnValue;taint;df-generated |
 | System.Xml.XPath;XPathNavigator;CheckValidity;(System.Xml.Schema.XmlSchemaSet,System.Xml.Schema.ValidationEventHandler);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
-| System.Xml.XPath;XPathNavigator;Clone;();Argument[this];ReturnValue;taint;df-generated |
-| System.Xml.XPath;XPathNavigator;Clone;();Argument[this];ReturnValue;value;df-generated |
+| System.Xml.XPath;XPathNavigator;Clone;();Argument[this];ReturnValue;value;dfc-generated |
 | System.Xml.XPath;XPathNavigator;Compile;(System.String);Argument[0];ReturnValue;taint;df-generated |
 | System.Xml.XPath;XPathNavigator;CreateAttributes;();Argument[this];ReturnValue;taint;df-generated |
 | System.Xml.XPath;XPathNavigator;CreateNavigator;();Argument[this];ReturnValue;taint;df-generated |
@@ -18292,9 +19076,11 @@ summary
 | System.Xml.XPath;XPathNavigator;GetNamespacesInScope;(System.Xml.XmlNamespaceScope);Argument[this];ReturnValue;taint;df-generated |
 | System.Xml.XPath;XPathNavigator;InsertAfter;();Argument[this];ReturnValue;taint;df-generated |
 | System.Xml.XPath;XPathNavigator;InsertBefore;();Argument[this];ReturnValue;taint;df-generated |
-| System.Xml.XPath;XPathNavigator;LookupNamespace;(System.String);Argument[0];ReturnValue;taint;df-generated |
-| System.Xml.XPath;XPathNavigator;LookupNamespace;(System.String);Argument[this];ReturnValue;taint;df-generated |
+| System.Xml.XPath;XPathNavigator;LookupNamespace;(System.String);Argument[0];ReturnValue;value;dfc-generated |
+| System.Xml.XPath;XPathNavigator;LookupPrefix;(System.String);Argument[this].Property[System.Xml.XPath.XPathNavigator.LocalName];ReturnValue;value;df-generated |
+| System.Xml.XPath;XPathNavigator;LookupPrefix;(System.String);Argument[this].Property[System.Xml.XPath.XPathNavigator.LocalName];ReturnValue;value;dfc-generated |
 | System.Xml.XPath;XPathNavigator;LookupPrefix;(System.String);Argument[this];ReturnValue;taint;df-generated |
+| System.Xml.XPath;XPathNavigator;LookupPrefix;(System.String);Argument[this];ReturnValue;taint;dfc-generated |
 | System.Xml.XPath;XPathNavigator;MoveTo;(System.Xml.XPath.XPathNavigator);Argument[0];Argument[this];taint;df-generated |
 | System.Xml.XPath;XPathNavigator;PrependChild;();Argument[this];ReturnValue;taint;df-generated |
 | System.Xml.XPath;XPathNavigator;ReadSubtree;();Argument[this];ReturnValue;taint;df-generated |
@@ -18308,6 +19094,7 @@ summary
 | System.Xml.XPath;XPathNavigator;SelectSingleNode;(System.Xml.XPath.XPathExpression);Argument[0];ReturnValue;taint;df-generated |
 | System.Xml.XPath;XPathNavigator;ToString;();Argument[this];ReturnValue;taint;df-generated |
 | System.Xml.XPath;XPathNavigator;ValueAs;(System.Type,System.Xml.IXmlNamespaceResolver);Argument[1];ReturnValue;taint;df-generated |
+| System.Xml.XPath;XPathNavigator;ValueAs;(System.Type,System.Xml.IXmlNamespaceResolver);Argument[this];Argument[1];taint;df-generated |
 | System.Xml.XPath;XPathNavigator;ValueAs;(System.Type,System.Xml.IXmlNamespaceResolver);Argument[this];ReturnValue;taint;df-generated |
 | System.Xml.XPath;XPathNavigator;ValueAs;(System.Type,System.Xml.IXmlNamespaceResolver);Argument[this];ReturnValue;value;df-generated |
 | System.Xml.XPath;XPathNavigator;WriteSubtree;(System.Xml.XmlWriter);Argument[this];Argument[0];taint;df-generated |
@@ -18320,17 +19107,15 @@ summary
 | System.Xml.XPath;XPathNavigator;get_SchemaInfo;();Argument[this];ReturnValue;taint;df-generated |
 | System.Xml.XPath;XPathNavigator;get_TypedValue;();Argument[this];ReturnValue;taint;df-generated |
 | System.Xml.XPath;XPathNavigator;get_UnderlyingObject;();Argument[this];ReturnValue;taint;df-generated |
-| System.Xml.XPath;XPathNavigator;get_XmlLang;();Argument[this];ReturnValue;taint;df-generated |
+| System.Xml.XPath;XPathNavigator;get_XmlLang;();Argument[this].Property[System.Xml.XPath.XPathItem.Value];ReturnValue;value;dfc-generated |
 | System.Xml.XPath;XPathNavigator;get_XmlType;();Argument[this];ReturnValue;taint;df-generated |
-| System.Xml.XPath;XPathNodeIterator;Clone;();Argument[this];ReturnValue;taint;df-generated |
-| System.Xml.XPath;XPathNodeIterator;Clone;();Argument[this];ReturnValue;value;df-generated |
+| System.Xml.XPath;XPathNodeIterator;Clone;();Argument[this];ReturnValue;value;dfc-generated |
 | System.Xml.XPath;XPathNodeIterator;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.IEnumerator.Current];value;manual |
 | System.Xml.XPath;XPathNodeIterator;get_Current;();Argument[this];ReturnValue;taint;df-generated |
 | System.Xml.Xsl;IXsltContextFunction;Invoke;(System.Xml.Xsl.XsltContext,System.Object[],System.Xml.XPath.XPathNavigator);Argument[0].Element;ReturnValue;taint;df-generated |
 | System.Xml.Xsl;IXsltContextFunction;Invoke;(System.Xml.Xsl.XsltContext,System.Object[],System.Xml.XPath.XPathNavigator);Argument[1].Element;ReturnValue;taint;df-generated |
 | System.Xml.Xsl;IXsltContextFunction;Invoke;(System.Xml.Xsl.XsltContext,System.Object[],System.Xml.XPath.XPathNavigator);Argument[2];ReturnValue;taint;df-generated |
 | System.Xml.Xsl;IXsltContextFunction;get_ArgTypes;();Argument[this];ReturnValue;taint;df-generated |
-| System.Xml.Xsl;XslCompiledTransform;Load;(System.Reflection.MethodInfo,System.Byte[],System.Type[]);Argument[0];Argument[this];taint;df-generated |
 | System.Xml.Xsl;XslTransform;Transform;(System.Xml.XPath.IXPathNavigable,System.Xml.Xsl.XsltArgumentList);Argument[1];ReturnValue;taint;df-generated |
 | System.Xml.Xsl;XslTransform;Transform;(System.Xml.XPath.IXPathNavigable,System.Xml.Xsl.XsltArgumentList);Argument[this];ReturnValue;taint;df-generated |
 | System.Xml.Xsl;XslTransform;Transform;(System.Xml.XPath.IXPathNavigable,System.Xml.Xsl.XsltArgumentList,System.Xml.XmlResolver);Argument[1];ReturnValue;taint;df-generated |
@@ -18353,8 +19138,8 @@ summary
 | System.Xml.Xsl;XsltCompileException;GetObjectData;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);Argument[this];Argument[0];taint;df-generated |
 | System.Xml.Xsl;XsltContext;ResolveFunction;(System.String,System.String,System.Xml.XPath.XPathResultType[]);Argument[this];ReturnValue;taint;df-generated |
 | System.Xml.Xsl;XsltException;GetObjectData;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);Argument[this];Argument[0];taint;df-generated |
-| System.Xml.Xsl;XsltException;XsltException;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);Argument[0];Argument[this];taint;df-generated |
-| System.Xml.Xsl;XsltException;get_Message;();Argument[this];ReturnValue;taint;df-generated |
+| System.Xml.Xsl;XsltException;get_Message;();Argument[this].Property[System.Exception.Message];ReturnValue;value;dfc-generated |
+| System.Xml.Xsl;XsltException;get_Message;();Argument[this].SyntheticField[System.Exception._message];ReturnValue;value;dfc-generated |
 | System.Xml.Xsl;XsltException;get_SourceUri;();Argument[this];ReturnValue;taint;df-generated |
 | System.Xml.Xsl;XsltMessageEncounteredEventArgs;get_Message;();Argument[this];ReturnValue;taint;df-generated |
 | System.Xml.Xsl;XsltMessageEncounteredEventHandler;BeginInvoke;(System.Object,System.Xml.Xsl.XsltMessageEncounteredEventArgs,System.AsyncCallback,System.Object);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
@@ -18368,19 +19153,16 @@ summary
 | System.Xml;IXmlBinaryWriterInitializer;SetOutput;(System.IO.Stream,System.Xml.IXmlDictionary,System.Xml.XmlBinaryWriterSession,System.Boolean);Argument[2];Argument[this];taint;df-generated |
 | System.Xml;IXmlDictionary;TryLookup;(System.Int32,System.Xml.XmlDictionaryString);Argument[this];ReturnValue;taint;df-generated |
 | System.Xml;IXmlDictionary;TryLookup;(System.String,System.Xml.XmlDictionaryString);Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;IXmlDictionary;TryLookup;(System.Xml.XmlDictionaryString,System.Xml.XmlDictionaryString);Argument[0];ReturnValue;taint;df-generated |
+| System.Xml;IXmlDictionary;TryLookup;(System.Xml.XmlDictionaryString,System.Xml.XmlDictionaryString);Argument[0];ReturnValue;value;dfc-generated |
 | System.Xml;IXmlNamespaceResolver;GetNamespacesInScope;(System.Xml.XmlNamespaceScope);Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;IXmlNamespaceResolver;LookupNamespace;(System.String);Argument[0];ReturnValue;taint;df-generated |
-| System.Xml;IXmlNamespaceResolver;LookupNamespace;(System.String);Argument[this];ReturnValue;taint;df-generated |
+| System.Xml;IXmlNamespaceResolver;LookupNamespace;(System.String);Argument[0];ReturnValue;value;dfc-generated |
 | System.Xml;IXmlNamespaceResolver;LookupPrefix;(System.String);Argument[this];ReturnValue;taint;df-generated |
 | System.Xml;IXmlTextReaderInitializer;SetInput;(System.Byte[],System.Int32,System.Int32,System.Text.Encoding,System.Xml.XmlDictionaryReaderQuotas,System.Xml.OnXmlDictionaryReaderClose);Argument[5];Argument[5].Parameter[delegate-self];value;hq-generated |
 | System.Xml;IXmlTextReaderInitializer;SetInput;(System.IO.Stream,System.Text.Encoding,System.Xml.XmlDictionaryReaderQuotas,System.Xml.OnXmlDictionaryReaderClose);Argument[3];Argument[3].Parameter[delegate-self];value;hq-generated |
 | System.Xml;IXmlTextWriterInitializer;SetOutput;(System.IO.Stream,System.Text.Encoding,System.Boolean);Argument[0];Argument[this];taint;df-generated |
 | System.Xml;IXmlTextWriterInitializer;SetOutput;(System.IO.Stream,System.Text.Encoding,System.Boolean);Argument[1];Argument[this];taint;df-generated |
-| System.Xml;NameTable;Add;(System.Char[],System.Int32,System.Int32);Argument[0].Element;ReturnValue;taint;df-generated |
-| System.Xml;NameTable;Add;(System.Char[],System.Int32,System.Int32);Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;NameTable;Add;(System.String);Argument[0];ReturnValue;taint;df-generated |
-| System.Xml;NameTable;Add;(System.String);Argument[this];ReturnValue;taint;df-generated |
+| System.Xml;NameTable;Add;(System.Char[],System.Int32,System.Int32);Argument[0].Element;ReturnValue;taint;dfc-generated |
+| System.Xml;NameTable;Add;(System.String);Argument[0];ReturnValue;value;dfc-generated |
 | System.Xml;NameTable;Get;(System.Char[],System.Int32,System.Int32);Argument[this];ReturnValue;taint;df-generated |
 | System.Xml;NameTable;Get;(System.String);Argument[this];ReturnValue;taint;df-generated |
 | System.Xml;OnXmlDictionaryReaderClose;BeginInvoke;(System.Xml.XmlDictionaryReader,System.AsyncCallback,System.Object);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
@@ -18411,8 +19193,7 @@ summary
 | System.Xml;XmlAttribute;PrependChild;(System.Xml.XmlNode);Argument[0].Element;ReturnValue;taint;df-generated |
 | System.Xml;XmlAttribute;PrependChild;(System.Xml.XmlNode);Argument[this];Argument[0].Element;taint;df-generated |
 | System.Xml;XmlAttribute;PrependChild;(System.Xml.XmlNode);Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlAttribute;RemoveChild;(System.Xml.XmlNode);Argument[0].Element;Argument[this];taint;df-generated |
-| System.Xml;XmlAttribute;RemoveChild;(System.Xml.XmlNode);Argument[0].Element;ReturnValue;taint;df-generated |
+| System.Xml;XmlAttribute;RemoveChild;(System.Xml.XmlNode);Argument[0];ReturnValue;value;dfc-generated |
 | System.Xml;XmlAttribute;ReplaceChild;(System.Xml.XmlNode,System.Xml.XmlNode);Argument[0].Element;Argument[this];taint;df-generated |
 | System.Xml;XmlAttribute;ReplaceChild;(System.Xml.XmlNode,System.Xml.XmlNode);Argument[1].Element;Argument[0].Element;taint;df-generated |
 | System.Xml;XmlAttribute;ReplaceChild;(System.Xml.XmlNode,System.Xml.XmlNode);Argument[1].Element;Argument[this];taint;df-generated |
@@ -18431,35 +19212,24 @@ summary
 | System.Xml;XmlAttribute;get_Prefix;();Argument[this];ReturnValue;taint;manual |
 | System.Xml;XmlAttribute;get_SchemaInfo;();Argument[this];ReturnValue;taint;manual |
 | System.Xml;XmlAttribute;get_Value;();Argument[this];ReturnValue;taint;manual |
-| System.Xml;XmlAttributeCollection;Append;(System.Xml.XmlAttribute);Argument[0].Element;ReturnValue;taint;df-generated |
-| System.Xml;XmlAttributeCollection;Append;(System.Xml.XmlAttribute);Argument[this];Argument[0].Element;taint;df-generated |
-| System.Xml;XmlAttributeCollection;Append;(System.Xml.XmlAttribute);Argument[this];ReturnValue;taint;df-generated |
+| System.Xml;XmlAttributeCollection;Append;(System.Xml.XmlAttribute);Argument[0];ReturnValue;value;dfc-generated |
 | System.Xml;XmlAttributeCollection;CopyTo;(System.Array,System.Int32);Argument[this].Element;Argument[0].Element;value;manual |
 | System.Xml;XmlAttributeCollection;CopyTo;(System.Xml.XmlAttribute[],System.Int32);Argument[this].Element;Argument[0].Element;value;manual |
-| System.Xml;XmlAttributeCollection;InsertAfter;(System.Xml.XmlAttribute,System.Xml.XmlAttribute);Argument[0].Element;ReturnValue;taint;df-generated |
-| System.Xml;XmlAttributeCollection;InsertAfter;(System.Xml.XmlAttribute,System.Xml.XmlAttribute);Argument[this];Argument[0].Element;taint;df-generated |
-| System.Xml;XmlAttributeCollection;InsertAfter;(System.Xml.XmlAttribute,System.Xml.XmlAttribute);Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlAttributeCollection;InsertBefore;(System.Xml.XmlAttribute,System.Xml.XmlAttribute);Argument[0].Element;ReturnValue;taint;df-generated |
-| System.Xml;XmlAttributeCollection;InsertBefore;(System.Xml.XmlAttribute,System.Xml.XmlAttribute);Argument[this];Argument[0].Element;taint;df-generated |
-| System.Xml;XmlAttributeCollection;InsertBefore;(System.Xml.XmlAttribute,System.Xml.XmlAttribute);Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlAttributeCollection;Prepend;(System.Xml.XmlAttribute);Argument[0].Element;ReturnValue;taint;df-generated |
-| System.Xml;XmlAttributeCollection;Prepend;(System.Xml.XmlAttribute);Argument[this];Argument[0].Element;taint;df-generated |
-| System.Xml;XmlAttributeCollection;Prepend;(System.Xml.XmlAttribute);Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlAttributeCollection;Remove;(System.Xml.XmlAttribute);Argument[0].Element;ReturnValue;taint;df-generated |
+| System.Xml;XmlAttributeCollection;InsertAfter;(System.Xml.XmlAttribute,System.Xml.XmlAttribute);Argument[0];ReturnValue;value;dfc-generated |
+| System.Xml;XmlAttributeCollection;InsertBefore;(System.Xml.XmlAttribute,System.Xml.XmlAttribute);Argument[0];ReturnValue;value;dfc-generated |
+| System.Xml;XmlAttributeCollection;Prepend;(System.Xml.XmlAttribute);Argument[0];ReturnValue;value;dfc-generated |
+| System.Xml;XmlAttributeCollection;Remove;(System.Xml.XmlAttribute);Argument[0];ReturnValue;value;dfc-generated |
 | System.Xml;XmlAttributeCollection;RemoveAt;(System.Int32);Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlAttributeCollection;SetNamedItem;(System.Xml.XmlNode);Argument[0].Element;ReturnValue;taint;df-generated |
-| System.Xml;XmlAttributeCollection;SetNamedItem;(System.Xml.XmlNode);Argument[this];Argument[0].Element;taint;df-generated |
-| System.Xml;XmlAttributeCollection;SetNamedItem;(System.Xml.XmlNode);Argument[this];ReturnValue;taint;df-generated |
+| System.Xml;XmlAttributeCollection;SetNamedItem;(System.Xml.XmlNode);Argument[0];ReturnValue;value;dfc-generated |
 | System.Xml;XmlAttributeCollection;get_ItemOf;(System.Int32);Argument[this];ReturnValue;taint;df-generated |
 | System.Xml;XmlAttributeCollection;get_ItemOf;(System.String);Argument[this];ReturnValue;taint;df-generated |
 | System.Xml;XmlAttributeCollection;get_ItemOf;(System.String,System.String);Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlAttributeCollection;get_SyncRoot;();Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlAttributeCollection;get_SyncRoot;();Argument[this];ReturnValue;value;df-generated |
-| System.Xml;XmlBinaryReaderSession;Add;(System.Int32,System.String);Argument[1];ReturnValue;taint;df-generated |
-| System.Xml;XmlBinaryReaderSession;Add;(System.Int32,System.String);Argument[this];ReturnValue;taint;df-generated |
+| System.Xml;XmlAttributeCollection;get_SyncRoot;();Argument[this];ReturnValue;value;dfc-generated |
+| System.Xml;XmlBinaryReaderSession;Add;(System.Int32,System.String);Argument[1];ReturnValue.SyntheticField[System.Xml.XmlDictionaryString._value];value;dfc-generated |
+| System.Xml;XmlBinaryReaderSession;Add;(System.Int32,System.String);Argument[this];ReturnValue.SyntheticField[System.Xml.XmlDictionaryString._dictionary];value;dfc-generated |
 | System.Xml;XmlBinaryReaderSession;TryLookup;(System.Int32,System.Xml.XmlDictionaryString);Argument[this];ReturnValue;taint;df-generated |
 | System.Xml;XmlBinaryReaderSession;TryLookup;(System.String,System.Xml.XmlDictionaryString);Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlBinaryReaderSession;TryLookup;(System.Xml.XmlDictionaryString,System.Xml.XmlDictionaryString);Argument[0];ReturnValue;taint;df-generated |
+| System.Xml;XmlBinaryReaderSession;TryLookup;(System.Xml.XmlDictionaryString,System.Xml.XmlDictionaryString);Argument[0];ReturnValue;value;dfc-generated |
 | System.Xml;XmlCDataSection;CloneNode;(System.Boolean);Argument[this];ReturnValue;taint;df-generated |
 | System.Xml;XmlCDataSection;WriteContentTo;(System.Xml.XmlWriter);Argument[this];Argument[0];taint;df-generated |
 | System.Xml;XmlCDataSection;WriteTo;(System.Xml.XmlWriter);Argument[this];Argument[0];taint;df-generated |
@@ -18468,9 +19238,9 @@ summary
 | System.Xml;XmlCDataSection;get_NodeType;();Argument[this];ReturnValue;taint;manual |
 | System.Xml;XmlCDataSection;get_ParentNode;();Argument[this];ReturnValue;taint;manual |
 | System.Xml;XmlCDataSection;get_PreviousText;();Argument[this];ReturnValue;taint;manual |
-| System.Xml;XmlCharacterData;AppendData;(System.String);Argument[0];Argument[this];taint;df-generated |
-| System.Xml;XmlCharacterData;Substring;(System.Int32,System.Int32);Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlCharacterData;XmlCharacterData;(System.String,System.Xml.XmlDocument);Argument[0];Argument[this];taint;df-generated |
+| System.Xml;XmlCharacterData;AppendData;(System.String);Argument[0];Argument[this].SyntheticField[System.Xml.XmlCharacterData._data];taint;dfc-generated |
+| System.Xml;XmlCharacterData;Substring;(System.Int32,System.Int32);Argument[this].SyntheticField[System.Xml.XmlCharacterData._data];ReturnValue;taint;dfc-generated |
+| System.Xml;XmlCharacterData;XmlCharacterData;(System.String,System.Xml.XmlDocument);Argument[0];Argument[this].SyntheticField[System.Xml.XmlCharacterData._data];value;dfc-generated |
 | System.Xml;XmlCharacterData;get_InnerText;();Argument[this];ReturnValue;taint;manual |
 | System.Xml;XmlCharacterData;get_Value;();Argument[this];ReturnValue;taint;manual |
 | System.Xml;XmlComment;CloneNode;(System.Boolean);Argument[this];ReturnValue;taint;df-generated |
@@ -18479,31 +19249,31 @@ summary
 | System.Xml;XmlComment;get_LocalName;();Argument[this];ReturnValue;taint;manual |
 | System.Xml;XmlComment;get_Name;();Argument[this];ReturnValue;taint;manual |
 | System.Xml;XmlComment;get_NodeType;();Argument[this];ReturnValue;taint;manual |
-| System.Xml;XmlConvert;DecodeName;(System.String);Argument[0];ReturnValue;taint;df-generated |
-| System.Xml;XmlConvert;EncodeLocalName;(System.String);Argument[0];ReturnValue;taint;df-generated |
-| System.Xml;XmlConvert;EncodeName;(System.String);Argument[0];ReturnValue;taint;df-generated |
-| System.Xml;XmlConvert;EncodeNmToken;(System.String);Argument[0];ReturnValue;taint;df-generated |
-| System.Xml;XmlConvert;VerifyNCName;(System.String);Argument[0];ReturnValue;taint;df-generated |
-| System.Xml;XmlConvert;VerifyNMTOKEN;(System.String);Argument[0];ReturnValue;taint;df-generated |
-| System.Xml;XmlConvert;VerifyName;(System.String);Argument[0];ReturnValue;taint;df-generated |
-| System.Xml;XmlConvert;VerifyPublicId;(System.String);Argument[0];ReturnValue;taint;df-generated |
-| System.Xml;XmlConvert;VerifyTOKEN;(System.String);Argument[0];ReturnValue;taint;df-generated |
-| System.Xml;XmlConvert;VerifyWhitespace;(System.String);Argument[0];ReturnValue;taint;df-generated |
-| System.Xml;XmlConvert;VerifyXmlChars;(System.String);Argument[0];ReturnValue;taint;df-generated |
+| System.Xml;XmlConvert;DecodeName;(System.String);Argument[0];ReturnValue;value;dfc-generated |
+| System.Xml;XmlConvert;EncodeLocalName;(System.String);Argument[0];ReturnValue;value;dfc-generated |
+| System.Xml;XmlConvert;EncodeName;(System.String);Argument[0];ReturnValue;value;dfc-generated |
+| System.Xml;XmlConvert;EncodeNmToken;(System.String);Argument[0];ReturnValue;value;dfc-generated |
+| System.Xml;XmlConvert;VerifyNCName;(System.String);Argument[0];ReturnValue;value;dfc-generated |
+| System.Xml;XmlConvert;VerifyNMTOKEN;(System.String);Argument[0];ReturnValue;value;dfc-generated |
+| System.Xml;XmlConvert;VerifyName;(System.String);Argument[0];ReturnValue;value;dfc-generated |
+| System.Xml;XmlConvert;VerifyPublicId;(System.String);Argument[0];ReturnValue;value;dfc-generated |
+| System.Xml;XmlConvert;VerifyTOKEN;(System.String);Argument[0];ReturnValue;value;dfc-generated |
+| System.Xml;XmlConvert;VerifyWhitespace;(System.String);Argument[0];ReturnValue;value;dfc-generated |
+| System.Xml;XmlConvert;VerifyXmlChars;(System.String);Argument[0];ReturnValue;value;dfc-generated |
 | System.Xml;XmlDataDocument;CloneNode;(System.Boolean);Argument[this];ReturnValue;taint;df-generated |
 | System.Xml;XmlDataDocument;CreateElement;(System.String,System.String,System.String);Argument[0];ReturnValue;taint;df-generated |
 | System.Xml;XmlDataDocument;CreateElement;(System.String,System.String,System.String);Argument[1];ReturnValue;taint;df-generated |
 | System.Xml;XmlDataDocument;CreateElement;(System.String,System.String,System.String);Argument[2];ReturnValue;taint;df-generated |
 | System.Xml;XmlDataDocument;CreateElement;(System.String,System.String,System.String);Argument[this];ReturnValue;taint;df-generated |
 | System.Xml;XmlDataDocument;CreateEntityReference;(System.String);Argument[0];ReturnValue;taint;df-generated |
-| System.Xml;XmlDataDocument;CreateNavigator;(System.Xml.XmlNode);Argument[0].Element;ReturnValue;taint;df-generated |
-| System.Xml;XmlDataDocument;CreateNavigator;(System.Xml.XmlNode);Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlDataDocument;GetElementById;(System.String);Argument[this];ReturnValue;taint;df-generated |
+| System.Xml;XmlDataDocument;CreateNavigator;(System.Xml.XmlNode);Argument[0];ReturnValue.SyntheticField[System.Xml.DocumentXPathNavigator._source];value;dfc-generated |
+| System.Xml;XmlDataDocument;CreateNavigator;(System.Xml.XmlNode);Argument[this];ReturnValue.SyntheticField[System.Xml.DataDocumentXPathNavigator._doc];value;dfc-generated |
+| System.Xml;XmlDataDocument;CreateNavigator;(System.Xml.XmlNode);Argument[this];ReturnValue.SyntheticField[System.Xml.DocumentXPathNavigator._document];value;dfc-generated |
 | System.Xml;XmlDataDocument;GetElementFromRow;(System.Data.DataRow);Argument[0];ReturnValue;taint;df-generated |
 | System.Xml;XmlDataDocument;GetElementsByTagName;(System.String);Argument[0];ReturnValue;taint;df-generated |
 | System.Xml;XmlDataDocument;GetRowFromElement;(System.Xml.XmlElement);Argument[0].Element;ReturnValue;taint;df-generated |
-| System.Xml;XmlDataDocument;XmlDataDocument;(System.Data.DataSet);Argument[0];Argument[this];taint;df-generated |
-| System.Xml;XmlDataDocument;get_DataSet;();Argument[this];ReturnValue;taint;df-generated |
+| System.Xml;XmlDataDocument;XmlDataDocument;(System.Data.DataSet);Argument[0];Argument[this].SyntheticField[System.Xml.XmlDataDocument._dataSet];value;dfc-generated |
+| System.Xml;XmlDataDocument;get_DataSet;();Argument[this].SyntheticField[System.Xml.XmlDataDocument._dataSet];ReturnValue;value;dfc-generated |
 | System.Xml;XmlDeclaration;CloneNode;(System.Boolean);Argument[this];ReturnValue;taint;df-generated |
 | System.Xml;XmlDeclaration;WriteContentTo;(System.Xml.XmlWriter);Argument[this];Argument[0];taint;df-generated |
 | System.Xml;XmlDeclaration;WriteTo;(System.Xml.XmlWriter);Argument[this];Argument[0];taint;df-generated |
@@ -18515,11 +19285,11 @@ summary
 | System.Xml;XmlDeclaration;get_Name;();Argument[this];ReturnValue;taint;manual |
 | System.Xml;XmlDeclaration;get_NodeType;();Argument[this];ReturnValue;taint;manual |
 | System.Xml;XmlDeclaration;get_Value;();Argument[this];ReturnValue;taint;manual |
-| System.Xml;XmlDictionary;Add;(System.String);Argument[0];ReturnValue;taint;df-generated |
-| System.Xml;XmlDictionary;Add;(System.String);Argument[this];ReturnValue;taint;df-generated |
+| System.Xml;XmlDictionary;Add;(System.String);Argument[0];ReturnValue.SyntheticField[System.Xml.XmlDictionaryString._value];value;dfc-generated |
+| System.Xml;XmlDictionary;Add;(System.String);Argument[this];ReturnValue.SyntheticField[System.Xml.XmlDictionaryString._dictionary];value;dfc-generated |
 | System.Xml;XmlDictionary;TryLookup;(System.Int32,System.Xml.XmlDictionaryString);Argument[this];ReturnValue;taint;df-generated |
 | System.Xml;XmlDictionary;TryLookup;(System.String,System.Xml.XmlDictionaryString);Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlDictionary;TryLookup;(System.Xml.XmlDictionaryString,System.Xml.XmlDictionaryString);Argument[0];ReturnValue;taint;df-generated |
+| System.Xml;XmlDictionary;TryLookup;(System.Xml.XmlDictionaryString,System.Xml.XmlDictionaryString);Argument[0];ReturnValue;value;dfc-generated |
 | System.Xml;XmlDictionaryReader;CreateBinaryReader;(System.Byte[],System.Int32,System.Int32,System.Xml.IXmlDictionary,System.Xml.XmlDictionaryReaderQuotas);Argument[0].Element;ReturnValue;taint;df-generated |
 | System.Xml;XmlDictionaryReader;CreateBinaryReader;(System.Byte[],System.Int32,System.Int32,System.Xml.IXmlDictionary,System.Xml.XmlDictionaryReaderQuotas);Argument[3];ReturnValue;taint;df-generated |
 | System.Xml;XmlDictionaryReader;CreateBinaryReader;(System.Byte[],System.Int32,System.Int32,System.Xml.IXmlDictionary,System.Xml.XmlDictionaryReaderQuotas,System.Xml.XmlBinaryReaderSession);Argument[0].Element;ReturnValue;taint;df-generated |
@@ -18535,35 +19305,32 @@ summary
 | System.Xml;XmlDictionaryReader;CreateBinaryReader;(System.IO.Stream,System.Xml.IXmlDictionary,System.Xml.XmlDictionaryReaderQuotas,System.Xml.XmlBinaryReaderSession);Argument[3];ReturnValue;taint;df-generated |
 | System.Xml;XmlDictionaryReader;CreateBinaryReader;(System.IO.Stream,System.Xml.IXmlDictionary,System.Xml.XmlDictionaryReaderQuotas,System.Xml.XmlBinaryReaderSession,System.Xml.OnXmlDictionaryReaderClose);Argument[4];Argument[4].Parameter[delegate-self];value;hq-generated |
 | System.Xml;XmlDictionaryReader;CreateBinaryReader;(System.IO.Stream,System.Xml.XmlDictionaryReaderQuotas);Argument[0];ReturnValue;taint;df-generated |
-| System.Xml;XmlDictionaryReader;CreateDictionaryReader;(System.Xml.XmlReader);Argument[0];ReturnValue;taint;df-generated |
+| System.Xml;XmlDictionaryReader;CreateDictionaryReader;(System.Xml.XmlReader);Argument[0];ReturnValue;value;dfc-generated |
 | System.Xml;XmlDictionaryReader;CreateMtomReader;(System.Byte[],System.Int32,System.Int32,System.Text.Encoding[],System.String,System.Xml.XmlDictionaryReaderQuotas,System.Int32,System.Xml.OnXmlDictionaryReaderClose);Argument[7];Argument[7].Parameter[delegate-self];value;hq-generated |
 | System.Xml;XmlDictionaryReader;CreateMtomReader;(System.IO.Stream,System.Text.Encoding[],System.String,System.Xml.XmlDictionaryReaderQuotas,System.Int32,System.Xml.OnXmlDictionaryReaderClose);Argument[5];Argument[5].Parameter[delegate-self];value;hq-generated |
 | System.Xml;XmlDictionaryReader;CreateTextReader;(System.Byte[],System.Int32,System.Int32,System.Text.Encoding,System.Xml.XmlDictionaryReaderQuotas,System.Xml.OnXmlDictionaryReaderClose);Argument[5];Argument[5].Parameter[delegate-self];value;hq-generated |
-| System.Xml;XmlDictionaryReader;CreateTextReader;(System.Byte[],System.Int32,System.Int32,System.Xml.XmlDictionaryReaderQuotas);Argument[0].Element;ReturnValue;taint;df-generated |
-| System.Xml;XmlDictionaryReader;CreateTextReader;(System.Byte[],System.Xml.XmlDictionaryReaderQuotas);Argument[0].Element;ReturnValue;taint;df-generated |
 | System.Xml;XmlDictionaryReader;CreateTextReader;(System.IO.Stream,System.Text.Encoding,System.Xml.XmlDictionaryReaderQuotas,System.Xml.OnXmlDictionaryReaderClose);Argument[3];Argument[3].Parameter[delegate-self];value;hq-generated |
 | System.Xml;XmlDictionaryReader;GetAttribute;(System.Xml.XmlDictionaryString,System.Xml.XmlDictionaryString);Argument[this];ReturnValue;taint;df-generated |
 | System.Xml;XmlDictionaryReader;GetNonAtomizedNames;(System.String,System.String);Argument[this];ReturnValue;taint;df-generated |
 | System.Xml;XmlDictionaryReader;ReadContentAs;(System.Type,System.Xml.IXmlNamespaceResolver);Argument[1];ReturnValue;taint;df-generated |
+| System.Xml;XmlDictionaryReader;ReadContentAs;(System.Type,System.Xml.IXmlNamespaceResolver);Argument[this];Argument[1];taint;df-generated |
 | System.Xml;XmlDictionaryReader;ReadContentAs;(System.Type,System.Xml.IXmlNamespaceResolver);Argument[this];ReturnValue;taint;df-generated |
 | System.Xml;XmlDictionaryReader;ReadContentAsQualifiedName;(System.String,System.String);Argument[this];ReturnValue;taint;df-generated |
 | System.Xml;XmlDictionaryReader;ReadContentAsString;();Argument[this];ReturnValue;taint;df-generated |
 | System.Xml;XmlDictionaryReader;ReadContentAsString;(System.Int32);Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlDictionaryReader;ReadContentAsString;(System.String[],System.Int32);Argument[0].Element;ReturnValue;taint;df-generated |
-| System.Xml;XmlDictionaryReader;ReadContentAsString;(System.String[],System.Int32);Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlDictionaryReader;ReadContentAsString;(System.Xml.XmlDictionaryString[],System.Int32);Argument[0].Element;ReturnValue;taint;df-generated |
-| System.Xml;XmlDictionaryReader;ReadContentAsString;(System.Xml.XmlDictionaryString[],System.Int32);Argument[this];ReturnValue;taint;df-generated |
+| System.Xml;XmlDictionaryReader;ReadContentAsString;(System.String[],System.Int32);Argument[0].Element;ReturnValue;value;dfc-generated |
+| System.Xml;XmlDictionaryReader;ReadContentAsString;(System.Xml.XmlDictionaryString[],System.Int32);Argument[0].Element.Property[System.Xml.XmlDictionaryString.Value];ReturnValue;value;dfc-generated |
 | System.Xml;XmlDictionaryReader;ReadContentAsUniqueId;();Argument[this];ReturnValue;taint;df-generated |
 | System.Xml;XmlDictionaryReader;ReadElementContentAsString;();Argument[this];ReturnValue;taint;df-generated |
 | System.Xml;XmlDictionaryReader;ReadElementContentAsUniqueId;();Argument[this];ReturnValue;taint;df-generated |
 | System.Xml;XmlDictionaryReader;ReadString;();Argument[this];ReturnValue;taint;df-generated |
 | System.Xml;XmlDictionaryReader;ReadString;(System.Int32);Argument[this];ReturnValue;taint;df-generated |
 | System.Xml;XmlDictionaryReader;get_Quotas;();Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlDictionaryString;ToString;();Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlDictionaryString;XmlDictionaryString;(System.Xml.IXmlDictionary,System.String,System.Int32);Argument[0];Argument[this];taint;df-generated |
-| System.Xml;XmlDictionaryString;XmlDictionaryString;(System.Xml.IXmlDictionary,System.String,System.Int32);Argument[1];Argument[this];taint;df-generated |
-| System.Xml;XmlDictionaryString;get_Dictionary;();Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlDictionaryString;get_Value;();Argument[this];ReturnValue;taint;df-generated |
+| System.Xml;XmlDictionaryString;ToString;();Argument[this].SyntheticField[System.Xml.XmlDictionaryString._value];ReturnValue;value;dfc-generated |
+| System.Xml;XmlDictionaryString;XmlDictionaryString;(System.Xml.IXmlDictionary,System.String,System.Int32);Argument[0];Argument[this].SyntheticField[System.Xml.XmlDictionaryString._dictionary];value;dfc-generated |
+| System.Xml;XmlDictionaryString;XmlDictionaryString;(System.Xml.IXmlDictionary,System.String,System.Int32);Argument[1];Argument[this].SyntheticField[System.Xml.XmlDictionaryString._value];value;dfc-generated |
+| System.Xml;XmlDictionaryString;get_Dictionary;();Argument[this].SyntheticField[System.Xml.XmlDictionaryString._dictionary];ReturnValue;value;dfc-generated |
+| System.Xml;XmlDictionaryString;get_Value;();Argument[this].SyntheticField[System.Xml.XmlDictionaryString._value];ReturnValue;value;dfc-generated |
 | System.Xml;XmlDictionaryWriter;CreateBinaryWriter;(System.IO.Stream);Argument[0];ReturnValue;taint;df-generated |
 | System.Xml;XmlDictionaryWriter;CreateBinaryWriter;(System.IO.Stream,System.Xml.IXmlDictionary);Argument[0];ReturnValue;taint;df-generated |
 | System.Xml;XmlDictionaryWriter;CreateBinaryWriter;(System.IO.Stream,System.Xml.IXmlDictionary);Argument[1];ReturnValue;taint;df-generated |
@@ -18573,31 +19340,71 @@ summary
 | System.Xml;XmlDictionaryWriter;CreateBinaryWriter;(System.IO.Stream,System.Xml.IXmlDictionary,System.Xml.XmlBinaryWriterSession,System.Boolean);Argument[0];ReturnValue;taint;df-generated |
 | System.Xml;XmlDictionaryWriter;CreateBinaryWriter;(System.IO.Stream,System.Xml.IXmlDictionary,System.Xml.XmlBinaryWriterSession,System.Boolean);Argument[1];ReturnValue;taint;df-generated |
 | System.Xml;XmlDictionaryWriter;CreateBinaryWriter;(System.IO.Stream,System.Xml.IXmlDictionary,System.Xml.XmlBinaryWriterSession,System.Boolean);Argument[2];ReturnValue;taint;df-generated |
-| System.Xml;XmlDictionaryWriter;CreateDictionaryWriter;(System.Xml.XmlWriter);Argument[0];ReturnValue;taint;df-generated |
+| System.Xml;XmlDictionaryWriter;CreateDictionaryWriter;(System.Xml.XmlWriter);Argument[0];ReturnValue;value;dfc-generated |
+| System.Xml;XmlDictionaryWriter;WriteArray;(System.String,System.String,System.String,System.Boolean[],System.Int32,System.Int32);Argument[0];Argument[this];taint;df-generated |
+| System.Xml;XmlDictionaryWriter;WriteArray;(System.String,System.String,System.String,System.Boolean[],System.Int32,System.Int32);Argument[1];Argument[this];taint;df-generated |
+| System.Xml;XmlDictionaryWriter;WriteArray;(System.String,System.String,System.String,System.DateTime[],System.Int32,System.Int32);Argument[0];Argument[this];taint;df-generated |
+| System.Xml;XmlDictionaryWriter;WriteArray;(System.String,System.String,System.String,System.DateTime[],System.Int32,System.Int32);Argument[1];Argument[this];taint;df-generated |
+| System.Xml;XmlDictionaryWriter;WriteArray;(System.String,System.String,System.String,System.Decimal[],System.Int32,System.Int32);Argument[0];Argument[this];taint;df-generated |
+| System.Xml;XmlDictionaryWriter;WriteArray;(System.String,System.String,System.String,System.Decimal[],System.Int32,System.Int32);Argument[1];Argument[this];taint;df-generated |
+| System.Xml;XmlDictionaryWriter;WriteArray;(System.String,System.String,System.String,System.Double[],System.Int32,System.Int32);Argument[0];Argument[this];taint;df-generated |
+| System.Xml;XmlDictionaryWriter;WriteArray;(System.String,System.String,System.String,System.Double[],System.Int32,System.Int32);Argument[1];Argument[this];taint;df-generated |
+| System.Xml;XmlDictionaryWriter;WriteArray;(System.String,System.String,System.String,System.Guid[],System.Int32,System.Int32);Argument[0];Argument[this];taint;df-generated |
+| System.Xml;XmlDictionaryWriter;WriteArray;(System.String,System.String,System.String,System.Guid[],System.Int32,System.Int32);Argument[1];Argument[this];taint;df-generated |
+| System.Xml;XmlDictionaryWriter;WriteArray;(System.String,System.String,System.String,System.Int16[],System.Int32,System.Int32);Argument[0];Argument[this];taint;df-generated |
+| System.Xml;XmlDictionaryWriter;WriteArray;(System.String,System.String,System.String,System.Int16[],System.Int32,System.Int32);Argument[1];Argument[this];taint;df-generated |
+| System.Xml;XmlDictionaryWriter;WriteArray;(System.String,System.String,System.String,System.Int32[],System.Int32,System.Int32);Argument[0];Argument[this];taint;df-generated |
+| System.Xml;XmlDictionaryWriter;WriteArray;(System.String,System.String,System.String,System.Int32[],System.Int32,System.Int32);Argument[1];Argument[this];taint;df-generated |
+| System.Xml;XmlDictionaryWriter;WriteArray;(System.String,System.String,System.String,System.Int64[],System.Int32,System.Int32);Argument[0];Argument[this];taint;df-generated |
+| System.Xml;XmlDictionaryWriter;WriteArray;(System.String,System.String,System.String,System.Int64[],System.Int32,System.Int32);Argument[1];Argument[this];taint;df-generated |
+| System.Xml;XmlDictionaryWriter;WriteArray;(System.String,System.String,System.String,System.Single[],System.Int32,System.Int32);Argument[0];Argument[this];taint;df-generated |
+| System.Xml;XmlDictionaryWriter;WriteArray;(System.String,System.String,System.String,System.Single[],System.Int32,System.Int32);Argument[1];Argument[this];taint;df-generated |
+| System.Xml;XmlDictionaryWriter;WriteArray;(System.String,System.String,System.String,System.TimeSpan[],System.Int32,System.Int32);Argument[0];Argument[this];taint;df-generated |
+| System.Xml;XmlDictionaryWriter;WriteArray;(System.String,System.String,System.String,System.TimeSpan[],System.Int32,System.Int32);Argument[1];Argument[this];taint;df-generated |
+| System.Xml;XmlDictionaryWriter;WriteArray;(System.String,System.Xml.XmlDictionaryString,System.Xml.XmlDictionaryString,System.Boolean[],System.Int32,System.Int32);Argument[0];Argument[this];taint;df-generated |
+| System.Xml;XmlDictionaryWriter;WriteArray;(System.String,System.Xml.XmlDictionaryString,System.Xml.XmlDictionaryString,System.Boolean[],System.Int32,System.Int32);Argument[1];Argument[this];taint;df-generated |
+| System.Xml;XmlDictionaryWriter;WriteArray;(System.String,System.Xml.XmlDictionaryString,System.Xml.XmlDictionaryString,System.DateTime[],System.Int32,System.Int32);Argument[0];Argument[this];taint;df-generated |
+| System.Xml;XmlDictionaryWriter;WriteArray;(System.String,System.Xml.XmlDictionaryString,System.Xml.XmlDictionaryString,System.DateTime[],System.Int32,System.Int32);Argument[1];Argument[this];taint;df-generated |
+| System.Xml;XmlDictionaryWriter;WriteArray;(System.String,System.Xml.XmlDictionaryString,System.Xml.XmlDictionaryString,System.Decimal[],System.Int32,System.Int32);Argument[0];Argument[this];taint;df-generated |
+| System.Xml;XmlDictionaryWriter;WriteArray;(System.String,System.Xml.XmlDictionaryString,System.Xml.XmlDictionaryString,System.Decimal[],System.Int32,System.Int32);Argument[1];Argument[this];taint;df-generated |
+| System.Xml;XmlDictionaryWriter;WriteArray;(System.String,System.Xml.XmlDictionaryString,System.Xml.XmlDictionaryString,System.Double[],System.Int32,System.Int32);Argument[0];Argument[this];taint;df-generated |
+| System.Xml;XmlDictionaryWriter;WriteArray;(System.String,System.Xml.XmlDictionaryString,System.Xml.XmlDictionaryString,System.Double[],System.Int32,System.Int32);Argument[1];Argument[this];taint;df-generated |
+| System.Xml;XmlDictionaryWriter;WriteArray;(System.String,System.Xml.XmlDictionaryString,System.Xml.XmlDictionaryString,System.Guid[],System.Int32,System.Int32);Argument[0];Argument[this];taint;df-generated |
+| System.Xml;XmlDictionaryWriter;WriteArray;(System.String,System.Xml.XmlDictionaryString,System.Xml.XmlDictionaryString,System.Guid[],System.Int32,System.Int32);Argument[1];Argument[this];taint;df-generated |
+| System.Xml;XmlDictionaryWriter;WriteArray;(System.String,System.Xml.XmlDictionaryString,System.Xml.XmlDictionaryString,System.Int16[],System.Int32,System.Int32);Argument[0];Argument[this];taint;df-generated |
+| System.Xml;XmlDictionaryWriter;WriteArray;(System.String,System.Xml.XmlDictionaryString,System.Xml.XmlDictionaryString,System.Int16[],System.Int32,System.Int32);Argument[1];Argument[this];taint;df-generated |
+| System.Xml;XmlDictionaryWriter;WriteArray;(System.String,System.Xml.XmlDictionaryString,System.Xml.XmlDictionaryString,System.Int32[],System.Int32,System.Int32);Argument[0];Argument[this];taint;df-generated |
+| System.Xml;XmlDictionaryWriter;WriteArray;(System.String,System.Xml.XmlDictionaryString,System.Xml.XmlDictionaryString,System.Int32[],System.Int32,System.Int32);Argument[1];Argument[this];taint;df-generated |
+| System.Xml;XmlDictionaryWriter;WriteArray;(System.String,System.Xml.XmlDictionaryString,System.Xml.XmlDictionaryString,System.Int64[],System.Int32,System.Int32);Argument[0];Argument[this];taint;df-generated |
+| System.Xml;XmlDictionaryWriter;WriteArray;(System.String,System.Xml.XmlDictionaryString,System.Xml.XmlDictionaryString,System.Int64[],System.Int32,System.Int32);Argument[1];Argument[this];taint;df-generated |
+| System.Xml;XmlDictionaryWriter;WriteArray;(System.String,System.Xml.XmlDictionaryString,System.Xml.XmlDictionaryString,System.Single[],System.Int32,System.Int32);Argument[0];Argument[this];taint;df-generated |
+| System.Xml;XmlDictionaryWriter;WriteArray;(System.String,System.Xml.XmlDictionaryString,System.Xml.XmlDictionaryString,System.Single[],System.Int32,System.Int32);Argument[1];Argument[this];taint;df-generated |
+| System.Xml;XmlDictionaryWriter;WriteArray;(System.String,System.Xml.XmlDictionaryString,System.Xml.XmlDictionaryString,System.TimeSpan[],System.Int32,System.Int32);Argument[0];Argument[this];taint;df-generated |
+| System.Xml;XmlDictionaryWriter;WriteArray;(System.String,System.Xml.XmlDictionaryString,System.Xml.XmlDictionaryString,System.TimeSpan[],System.Int32,System.Int32);Argument[1];Argument[this];taint;df-generated |
+| System.Xml;XmlDictionaryWriter;WriteAttributeString;(System.String,System.Xml.XmlDictionaryString,System.Xml.XmlDictionaryString,System.String);Argument[0];Argument[this];taint;df-generated |
 | System.Xml;XmlDictionaryWriter;WriteAttributeString;(System.String,System.Xml.XmlDictionaryString,System.Xml.XmlDictionaryString,System.String);Argument[1];Argument[this];taint;df-generated |
 | System.Xml;XmlDictionaryWriter;WriteAttributeString;(System.String,System.Xml.XmlDictionaryString,System.Xml.XmlDictionaryString,System.String);Argument[3];Argument[this];taint;df-generated |
 | System.Xml;XmlDictionaryWriter;WriteAttributeString;(System.Xml.XmlDictionaryString,System.Xml.XmlDictionaryString,System.String);Argument[0];Argument[this];taint;df-generated |
 | System.Xml;XmlDictionaryWriter;WriteAttributeString;(System.Xml.XmlDictionaryString,System.Xml.XmlDictionaryString,System.String);Argument[2];Argument[this];taint;df-generated |
 | System.Xml;XmlDictionaryWriter;WriteBase64Async;(System.Byte[],System.Int32,System.Int32);Argument[0].Element;Argument[this];taint;df-generated |
+| System.Xml;XmlDictionaryWriter;WriteElementString;(System.String,System.Xml.XmlDictionaryString,System.Xml.XmlDictionaryString,System.String);Argument[0];Argument[this];taint;df-generated |
+| System.Xml;XmlDictionaryWriter;WriteElementString;(System.String,System.Xml.XmlDictionaryString,System.Xml.XmlDictionaryString,System.String);Argument[1];Argument[this];taint;df-generated |
 | System.Xml;XmlDictionaryWriter;WriteElementString;(System.String,System.Xml.XmlDictionaryString,System.Xml.XmlDictionaryString,System.String);Argument[3];Argument[this];taint;df-generated |
+| System.Xml;XmlDictionaryWriter;WriteElementString;(System.Xml.XmlDictionaryString,System.Xml.XmlDictionaryString,System.String);Argument[0];Argument[this];taint;df-generated |
 | System.Xml;XmlDictionaryWriter;WriteElementString;(System.Xml.XmlDictionaryString,System.Xml.XmlDictionaryString,System.String);Argument[2];Argument[this];taint;df-generated |
 | System.Xml;XmlDictionaryWriter;WriteNode;(System.Xml.XmlDictionaryReader,System.Boolean);Argument[0];Argument[this];taint;df-generated |
 | System.Xml;XmlDictionaryWriter;WriteNode;(System.Xml.XmlReader,System.Boolean);Argument[0];Argument[this];taint;df-generated |
 | System.Xml;XmlDictionaryWriter;WriteQualifiedName;(System.Xml.XmlDictionaryString,System.Xml.XmlDictionaryString);Argument[0];Argument[this];taint;df-generated |
 | System.Xml;XmlDictionaryWriter;WriteQualifiedName;(System.Xml.XmlDictionaryString,System.Xml.XmlDictionaryString);Argument[1];Argument[this];taint;df-generated |
+| System.Xml;XmlDictionaryWriter;WriteStartAttribute;(System.String,System.Xml.XmlDictionaryString,System.Xml.XmlDictionaryString);Argument[0];Argument[this];taint;df-generated |
 | System.Xml;XmlDictionaryWriter;WriteStartAttribute;(System.String,System.Xml.XmlDictionaryString,System.Xml.XmlDictionaryString);Argument[1];Argument[this];taint;df-generated |
 | System.Xml;XmlDictionaryWriter;WriteStartAttribute;(System.Xml.XmlDictionaryString,System.Xml.XmlDictionaryString);Argument[0];Argument[this];taint;df-generated |
+| System.Xml;XmlDictionaryWriter;WriteStartElement;(System.String,System.Xml.XmlDictionaryString,System.Xml.XmlDictionaryString);Argument[0];Argument[this];taint;df-generated |
+| System.Xml;XmlDictionaryWriter;WriteStartElement;(System.String,System.Xml.XmlDictionaryString,System.Xml.XmlDictionaryString);Argument[1];Argument[this];taint;df-generated |
+| System.Xml;XmlDictionaryWriter;WriteStartElement;(System.Xml.XmlDictionaryString,System.Xml.XmlDictionaryString);Argument[0];Argument[this];taint;df-generated |
 | System.Xml;XmlDictionaryWriter;WriteString;(System.Xml.XmlDictionaryString);Argument[0];Argument[this];taint;df-generated |
 | System.Xml;XmlDictionaryWriter;WriteTextNode;(System.Xml.XmlDictionaryReader,System.Boolean);Argument[0];Argument[this];taint;df-generated |
 | System.Xml;XmlDictionaryWriter;WriteValue;(System.Xml.XmlDictionaryString);Argument[0];Argument[this];taint;df-generated |
-| System.Xml;XmlDictionaryWriter;WriteXmlAttribute;(System.String,System.String);Argument[0];Argument[this];taint;df-generated |
-| System.Xml;XmlDictionaryWriter;WriteXmlAttribute;(System.String,System.String);Argument[1];Argument[this];taint;df-generated |
-| System.Xml;XmlDictionaryWriter;WriteXmlAttribute;(System.Xml.XmlDictionaryString,System.Xml.XmlDictionaryString);Argument[0];Argument[this];taint;df-generated |
-| System.Xml;XmlDictionaryWriter;WriteXmlAttribute;(System.Xml.XmlDictionaryString,System.Xml.XmlDictionaryString);Argument[1];Argument[this];taint;df-generated |
-| System.Xml;XmlDictionaryWriter;WriteXmlnsAttribute;(System.String,System.String);Argument[0];Argument[this];taint;df-generated |
-| System.Xml;XmlDictionaryWriter;WriteXmlnsAttribute;(System.String,System.String);Argument[1];Argument[this];taint;df-generated |
-| System.Xml;XmlDictionaryWriter;WriteXmlnsAttribute;(System.String,System.Xml.XmlDictionaryString);Argument[0];Argument[this];taint;df-generated |
-| System.Xml;XmlDictionaryWriter;WriteXmlnsAttribute;(System.String,System.Xml.XmlDictionaryString);Argument[1];Argument[this];taint;df-generated |
 | System.Xml;XmlDocument;CloneNode;(System.Boolean);Argument[this];ReturnValue;taint;df-generated |
 | System.Xml;XmlDocument;CreateAttribute;(System.String);Argument[0];ReturnValue;taint;df-generated |
 | System.Xml;XmlDocument;CreateAttribute;(System.String);Argument[this];ReturnValue;taint;df-generated |
@@ -18610,15 +19417,10 @@ summary
 | System.Xml;XmlDocument;CreateAttribute;(System.String,System.String,System.String);Argument[this];ReturnValue;taint;df-generated |
 | System.Xml;XmlDocument;CreateCDataSection;(System.String);Argument[this];ReturnValue;taint;df-generated |
 | System.Xml;XmlDocument;CreateComment;(System.String);Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlDocument;CreateDefaultAttribute;(System.String,System.String,System.String);Argument[0];ReturnValue;taint;df-generated |
-| System.Xml;XmlDocument;CreateDefaultAttribute;(System.String,System.String,System.String);Argument[1];ReturnValue;taint;df-generated |
-| System.Xml;XmlDocument;CreateDefaultAttribute;(System.String,System.String,System.String);Argument[2];ReturnValue;taint;df-generated |
-| System.Xml;XmlDocument;CreateDefaultAttribute;(System.String,System.String,System.String);Argument[this];ReturnValue;taint;df-generated |
 | System.Xml;XmlDocument;CreateDocumentFragment;();Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlDocument;CreateDocumentType;(System.String,System.String,System.String,System.String);Argument[0];ReturnValue;taint;df-generated |
-| System.Xml;XmlDocument;CreateDocumentType;(System.String,System.String,System.String,System.String);Argument[1];ReturnValue;taint;df-generated |
-| System.Xml;XmlDocument;CreateDocumentType;(System.String,System.String,System.String,System.String);Argument[2];ReturnValue;taint;df-generated |
-| System.Xml;XmlDocument;CreateDocumentType;(System.String,System.String,System.String,System.String);Argument[3];ReturnValue;taint;df-generated |
+| System.Xml;XmlDocument;CreateDocumentType;(System.String,System.String,System.String,System.String);Argument[1];ReturnValue.SyntheticField[System.Xml.XmlDocumentType._publicId];value;dfc-generated |
+| System.Xml;XmlDocument;CreateDocumentType;(System.String,System.String,System.String,System.String);Argument[2];ReturnValue.SyntheticField[System.Xml.XmlDocumentType._systemId];value;dfc-generated |
+| System.Xml;XmlDocument;CreateDocumentType;(System.String,System.String,System.String,System.String);Argument[3];ReturnValue.SyntheticField[System.Xml.XmlDocumentType._internalSubset];value;dfc-generated |
 | System.Xml;XmlDocument;CreateElement;(System.String);Argument[0];ReturnValue;taint;df-generated |
 | System.Xml;XmlDocument;CreateElement;(System.String);Argument[this];ReturnValue;taint;df-generated |
 | System.Xml;XmlDocument;CreateElement;(System.String,System.String);Argument[0];ReturnValue;taint;df-generated |
@@ -18629,9 +19431,12 @@ summary
 | System.Xml;XmlDocument;CreateElement;(System.String,System.String,System.String);Argument[2];ReturnValue;taint;df-generated |
 | System.Xml;XmlDocument;CreateElement;(System.String,System.String,System.String);Argument[this];ReturnValue;taint;df-generated |
 | System.Xml;XmlDocument;CreateEntityReference;(System.String);Argument[0];ReturnValue;taint;df-generated |
+| System.Xml;XmlDocument;CreateNavigator;();Argument[this];ReturnValue.SyntheticField[System.Xml.DocumentXPathNavigator._source];value;df-generated |
+| System.Xml;XmlDocument;CreateNavigator;();Argument[this];ReturnValue.SyntheticField[System.Xml.DocumentXPathNavigator._source];value;dfc-generated |
 | System.Xml;XmlDocument;CreateNavigator;();Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlDocument;CreateNavigator;(System.Xml.XmlNode);Argument[0].Element;ReturnValue;taint;df-generated |
-| System.Xml;XmlDocument;CreateNavigator;(System.Xml.XmlNode);Argument[this];ReturnValue;taint;df-generated |
+| System.Xml;XmlDocument;CreateNavigator;();Argument[this];ReturnValue;taint;dfc-generated |
+| System.Xml;XmlDocument;CreateNavigator;(System.Xml.XmlNode);Argument[0];ReturnValue.SyntheticField[System.Xml.DocumentXPathNavigator._source];value;dfc-generated |
+| System.Xml;XmlDocument;CreateNavigator;(System.Xml.XmlNode);Argument[this];ReturnValue.SyntheticField[System.Xml.DocumentXPathNavigator._document];value;dfc-generated |
 | System.Xml;XmlDocument;CreateNode;(System.String,System.String,System.String);Argument[1];ReturnValue;taint;df-generated |
 | System.Xml;XmlDocument;CreateNode;(System.String,System.String,System.String);Argument[2];ReturnValue;taint;df-generated |
 | System.Xml;XmlDocument;CreateNode;(System.String,System.String,System.String);Argument[this];ReturnValue;taint;df-generated |
@@ -18642,15 +19447,13 @@ summary
 | System.Xml;XmlDocument;CreateNode;(System.Xml.XmlNodeType,System.String,System.String,System.String);Argument[2];ReturnValue;taint;df-generated |
 | System.Xml;XmlDocument;CreateNode;(System.Xml.XmlNodeType,System.String,System.String,System.String);Argument[3];ReturnValue;taint;df-generated |
 | System.Xml;XmlDocument;CreateNode;(System.Xml.XmlNodeType,System.String,System.String,System.String);Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlDocument;CreateProcessingInstruction;(System.String,System.String);Argument[0];ReturnValue;taint;df-generated |
-| System.Xml;XmlDocument;CreateProcessingInstruction;(System.String,System.String);Argument[1];ReturnValue;taint;df-generated |
+| System.Xml;XmlDocument;CreateProcessingInstruction;(System.String,System.String);Argument[0];ReturnValue.SyntheticField[System.Xml.XmlProcessingInstruction._target];value;dfc-generated |
 | System.Xml;XmlDocument;CreateSignificantWhitespace;(System.String);Argument[this];ReturnValue;taint;df-generated |
 | System.Xml;XmlDocument;CreateTextNode;(System.String);Argument[this];ReturnValue;taint;df-generated |
 | System.Xml;XmlDocument;CreateWhitespace;(System.String);Argument[this];ReturnValue;taint;df-generated |
 | System.Xml;XmlDocument;CreateXmlDeclaration;(System.String,System.String,System.String);Argument[0];ReturnValue;taint;df-generated |
 | System.Xml;XmlDocument;CreateXmlDeclaration;(System.String,System.String,System.String);Argument[1];ReturnValue;taint;df-generated |
 | System.Xml;XmlDocument;CreateXmlDeclaration;(System.String,System.String,System.String);Argument[2];ReturnValue;taint;df-generated |
-| System.Xml;XmlDocument;GetElementById;(System.String);Argument[this];ReturnValue;taint;df-generated |
 | System.Xml;XmlDocument;GetElementsByTagName;(System.String);Argument[0];ReturnValue;taint;df-generated |
 | System.Xml;XmlDocument;GetElementsByTagName;(System.String,System.String);Argument[0];ReturnValue;taint;df-generated |
 | System.Xml;XmlDocument;GetElementsByTagName;(System.String,System.String);Argument[1];ReturnValue;taint;df-generated |
@@ -18705,17 +19508,16 @@ summary
 | System.Xml;XmlDocumentType;CloneNode;(System.Boolean);Argument[this];ReturnValue;taint;df-generated |
 | System.Xml;XmlDocumentType;WriteContentTo;(System.Xml.XmlWriter);Argument[this];Argument[0];taint;df-generated |
 | System.Xml;XmlDocumentType;WriteTo;(System.Xml.XmlWriter);Argument[this];Argument[0];taint;df-generated |
-| System.Xml;XmlDocumentType;XmlDocumentType;(System.String,System.String,System.String,System.String,System.Xml.XmlDocument);Argument[0];Argument[this];taint;df-generated |
-| System.Xml;XmlDocumentType;XmlDocumentType;(System.String,System.String,System.String,System.String,System.Xml.XmlDocument);Argument[1];Argument[this];taint;df-generated |
-| System.Xml;XmlDocumentType;XmlDocumentType;(System.String,System.String,System.String,System.String,System.Xml.XmlDocument);Argument[2];Argument[this];taint;df-generated |
-| System.Xml;XmlDocumentType;XmlDocumentType;(System.String,System.String,System.String,System.String,System.Xml.XmlDocument);Argument[3];Argument[this];taint;df-generated |
-| System.Xml;XmlDocumentType;get_InternalSubset;();Argument[this];ReturnValue;taint;df-generated |
+| System.Xml;XmlDocumentType;XmlDocumentType;(System.String,System.String,System.String,System.String,System.Xml.XmlDocument);Argument[1];Argument[this].SyntheticField[System.Xml.XmlDocumentType._publicId];value;dfc-generated |
+| System.Xml;XmlDocumentType;XmlDocumentType;(System.String,System.String,System.String,System.String,System.Xml.XmlDocument);Argument[2];Argument[this].SyntheticField[System.Xml.XmlDocumentType._systemId];value;dfc-generated |
+| System.Xml;XmlDocumentType;XmlDocumentType;(System.String,System.String,System.String,System.String,System.Xml.XmlDocument);Argument[3];Argument[this].SyntheticField[System.Xml.XmlDocumentType._internalSubset];value;dfc-generated |
+| System.Xml;XmlDocumentType;get_InternalSubset;();Argument[this].SyntheticField[System.Xml.XmlDocumentType._internalSubset];ReturnValue;value;dfc-generated |
 | System.Xml;XmlDocumentType;get_IsReadOnly;();Argument[this];ReturnValue;taint;manual |
 | System.Xml;XmlDocumentType;get_LocalName;();Argument[this];ReturnValue;taint;manual |
 | System.Xml;XmlDocumentType;get_Name;();Argument[this];ReturnValue;taint;manual |
 | System.Xml;XmlDocumentType;get_NodeType;();Argument[this];ReturnValue;taint;manual |
-| System.Xml;XmlDocumentType;get_PublicId;();Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlDocumentType;get_SystemId;();Argument[this];ReturnValue;taint;df-generated |
+| System.Xml;XmlDocumentType;get_PublicId;();Argument[this].SyntheticField[System.Xml.XmlDocumentType._publicId];ReturnValue;value;dfc-generated |
+| System.Xml;XmlDocumentType;get_SystemId;();Argument[this].SyntheticField[System.Xml.XmlDocumentType._systemId];ReturnValue;value;dfc-generated |
 | System.Xml;XmlElement;CloneNode;(System.Boolean);Argument[this];ReturnValue;taint;df-generated |
 | System.Xml;XmlElement;GetAttribute;(System.String);Argument[this];ReturnValue;taint;df-generated |
 | System.Xml;XmlElement;GetAttribute;(System.String,System.String);Argument[this];ReturnValue;taint;df-generated |
@@ -18726,14 +19528,12 @@ summary
 | System.Xml;XmlElement;GetElementsByTagName;(System.String,System.String);Argument[1];ReturnValue;taint;df-generated |
 | System.Xml;XmlElement;RemoveAttributeAt;(System.Int32);Argument[this];ReturnValue;taint;df-generated |
 | System.Xml;XmlElement;RemoveAttributeNode;(System.String,System.String);Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlElement;RemoveAttributeNode;(System.Xml.XmlAttribute);Argument[0].Element;ReturnValue;taint;df-generated |
-| System.Xml;XmlElement;SetAttribute;(System.String,System.String,System.String);Argument[2];ReturnValue;taint;df-generated |
+| System.Xml;XmlElement;RemoveAttributeNode;(System.Xml.XmlAttribute);Argument[0];ReturnValue;value;dfc-generated |
+| System.Xml;XmlElement;SetAttribute;(System.String,System.String,System.String);Argument[2];ReturnValue;value;dfc-generated |
 | System.Xml;XmlElement;SetAttributeNode;(System.String,System.String);Argument[0];ReturnValue;taint;df-generated |
 | System.Xml;XmlElement;SetAttributeNode;(System.String,System.String);Argument[1];ReturnValue;taint;df-generated |
 | System.Xml;XmlElement;SetAttributeNode;(System.String,System.String);Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlElement;SetAttributeNode;(System.Xml.XmlAttribute);Argument[0].Element;ReturnValue;taint;df-generated |
-| System.Xml;XmlElement;SetAttributeNode;(System.Xml.XmlAttribute);Argument[this];Argument[0].Element;taint;df-generated |
-| System.Xml;XmlElement;SetAttributeNode;(System.Xml.XmlAttribute);Argument[this];ReturnValue;taint;df-generated |
+| System.Xml;XmlElement;SetAttributeNode;(System.Xml.XmlAttribute);Argument[0];ReturnValue;value;dfc-generated |
 | System.Xml;XmlElement;WriteContentTo;(System.Xml.XmlWriter);Argument[this];Argument[0];taint;df-generated |
 | System.Xml;XmlElement;WriteTo;(System.Xml.XmlWriter);Argument[this];Argument[0];taint;df-generated |
 | System.Xml;XmlElement;get_Attributes;();Argument[this];ReturnValue;taint;manual |
@@ -18773,17 +19573,16 @@ summary
 | System.Xml;XmlEntityReference;get_NodeType;();Argument[this];ReturnValue;taint;manual |
 | System.Xml;XmlEntityReference;get_Value;();Argument[this];ReturnValue;taint;manual |
 | System.Xml;XmlException;GetObjectData;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);Argument[this];Argument[0];taint;df-generated |
-| System.Xml;XmlException;XmlException;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);Argument[0];Argument[this];taint;df-generated |
-| System.Xml;XmlException;get_Message;();Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlException;get_SourceUri;();Argument[this];ReturnValue;taint;df-generated |
+| System.Xml;XmlException;XmlException;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);Argument[0].Element.Property[System.Runtime.Serialization.SerializationEntry.Value];Argument[this].SyntheticField[System.Xml.XmlException._sourceUri];value;dfc-generated |
+| System.Xml;XmlException;get_Message;();Argument[this].Property[System.Exception.Message];ReturnValue;value;dfc-generated |
+| System.Xml;XmlException;get_Message;();Argument[this].SyntheticField[System.Exception._message];ReturnValue;value;dfc-generated |
+| System.Xml;XmlException;get_SourceUri;();Argument[this].SyntheticField[System.Xml.XmlException._sourceUri];ReturnValue;value;dfc-generated |
 | System.Xml;XmlImplementation;CreateDocument;();Argument[this];ReturnValue;taint;df-generated |
 | System.Xml;XmlImplementation;XmlImplementation;(System.Xml.XmlNameTable);Argument[0];Argument[this];taint;df-generated |
 | System.Xml;XmlLinkedNode;get_NextSibling;();Argument[this];ReturnValue;taint;manual |
 | System.Xml;XmlLinkedNode;get_PreviousSibling;();Argument[this];ReturnValue;taint;manual |
-| System.Xml;XmlNameTable;Add;(System.Char[],System.Int32,System.Int32);Argument[0].Element;ReturnValue;taint;df-generated |
-| System.Xml;XmlNameTable;Add;(System.Char[],System.Int32,System.Int32);Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlNameTable;Add;(System.String);Argument[0];ReturnValue;taint;df-generated |
-| System.Xml;XmlNameTable;Add;(System.String);Argument[this];ReturnValue;taint;df-generated |
+| System.Xml;XmlNameTable;Add;(System.Char[],System.Int32,System.Int32);Argument[0].Element;ReturnValue;taint;dfc-generated |
+| System.Xml;XmlNameTable;Add;(System.String);Argument[0];ReturnValue;value;dfc-generated |
 | System.Xml;XmlNameTable;Get;(System.Char[],System.Int32,System.Int32);Argument[this];ReturnValue;taint;df-generated |
 | System.Xml;XmlNameTable;Get;(System.String);Argument[this];ReturnValue;taint;df-generated |
 | System.Xml;XmlNamedNodeMap;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.IEnumerator.Current];value;manual |
@@ -18792,23 +19591,22 @@ summary
 | System.Xml;XmlNamedNodeMap;Item;(System.Int32);Argument[this];ReturnValue;taint;df-generated |
 | System.Xml;XmlNamedNodeMap;RemoveNamedItem;(System.String);Argument[this];ReturnValue;taint;df-generated |
 | System.Xml;XmlNamedNodeMap;RemoveNamedItem;(System.String,System.String);Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlNamedNodeMap;SetNamedItem;(System.Xml.XmlNode);Argument[0].Element;ReturnValue;taint;df-generated |
-| System.Xml;XmlNamedNodeMap;SetNamedItem;(System.Xml.XmlNode);Argument[this];Argument[0].Element;taint;df-generated |
-| System.Xml;XmlNamedNodeMap;SetNamedItem;(System.Xml.XmlNode);Argument[this];ReturnValue;taint;df-generated |
+| System.Xml;XmlNamedNodeMap;SetNamedItem;(System.Xml.XmlNode);Argument[0];ReturnValue;value;dfc-generated |
 | System.Xml;XmlNamespaceManager;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.IEnumerator.Current];value;manual |
 | System.Xml;XmlNamespaceManager;GetNamespacesInScope;(System.Xml.XmlNamespaceScope);Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlNamespaceManager;LookupNamespace;(System.String);Argument[0];ReturnValue;taint;df-generated |
-| System.Xml;XmlNamespaceManager;LookupNamespace;(System.String);Argument[this];ReturnValue;taint;df-generated |
+| System.Xml;XmlNamespaceManager;LookupNamespace;(System.String);Argument[0];ReturnValue;value;dfc-generated |
 | System.Xml;XmlNamespaceManager;LookupPrefix;(System.String);Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlNamespaceManager;XmlNamespaceManager;(System.Xml.XmlNameTable);Argument[0];Argument[this];taint;df-generated |
+| System.Xml;XmlNamespaceManager;XmlNamespaceManager;(System.Xml.XmlNameTable);Argument[0];Argument[this].SyntheticField[System.Xml.XmlNamespaceManager._nameTable];value;dfc-generated |
 | System.Xml;XmlNamespaceManager;get_DefaultNamespace;();Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlNamespaceManager;get_NameTable;();Argument[this];ReturnValue;taint;df-generated |
+| System.Xml;XmlNamespaceManager;get_NameTable;();Argument[this].SyntheticField[System.Xml.XmlNamespaceManager._nameTable];ReturnValue;value;dfc-generated |
 | System.Xml;XmlNode;AppendChild;(System.Xml.XmlNode);Argument[0].Element;Argument[this];taint;df-generated |
 | System.Xml;XmlNode;AppendChild;(System.Xml.XmlNode);Argument[0].Element;ReturnValue;taint;df-generated |
 | System.Xml;XmlNode;AppendChild;(System.Xml.XmlNode);Argument[this];Argument[0].Element;taint;df-generated |
 | System.Xml;XmlNode;AppendChild;(System.Xml.XmlNode);Argument[this];ReturnValue;taint;df-generated |
 | System.Xml;XmlNode;Clone;();Argument[this];ReturnValue;taint;df-generated |
+| System.Xml;XmlNode;Clone;();Argument[this];ReturnValue;taint;dfc-generated |
 | System.Xml;XmlNode;Clone;();Argument[this];ReturnValue;value;df-generated |
+| System.Xml;XmlNode;Clone;();Argument[this];ReturnValue;value;dfc-generated |
 | System.Xml;XmlNode;CloneNode;(System.Boolean);Argument[this];ReturnValue;taint;df-generated |
 | System.Xml;XmlNode;CreateNavigator;();Argument[this];ReturnValue;taint;df-generated |
 | System.Xml;XmlNode;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.IEnumerator.Current];value;manual |
@@ -18834,8 +19632,7 @@ summary
 | System.Xml;XmlNode;PrependChild;(System.Xml.XmlNode);Argument[0].Element;ReturnValue;taint;df-generated |
 | System.Xml;XmlNode;PrependChild;(System.Xml.XmlNode);Argument[this];Argument[0].Element;taint;df-generated |
 | System.Xml;XmlNode;PrependChild;(System.Xml.XmlNode);Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlNode;RemoveChild;(System.Xml.XmlNode);Argument[0].Element;Argument[this];taint;df-generated |
-| System.Xml;XmlNode;RemoveChild;(System.Xml.XmlNode);Argument[0].Element;ReturnValue;taint;df-generated |
+| System.Xml;XmlNode;RemoveChild;(System.Xml.XmlNode);Argument[0];ReturnValue;value;dfc-generated |
 | System.Xml;XmlNode;ReplaceChild;(System.Xml.XmlNode,System.Xml.XmlNode);Argument[0].Element;Argument[this];taint;df-generated |
 | System.Xml;XmlNode;ReplaceChild;(System.Xml.XmlNode,System.Xml.XmlNode);Argument[1].Element;Argument[0].Element;taint;df-generated |
 | System.Xml;XmlNode;ReplaceChild;(System.Xml.XmlNode,System.Xml.XmlNode);Argument[1].Element;Argument[this];taint;df-generated |
@@ -18871,16 +19668,16 @@ summary
 | System.Xml;XmlNode;get_PreviousText;();Argument[this];ReturnValue;taint;manual |
 | System.Xml;XmlNode;get_SchemaInfo;();Argument[this];ReturnValue;taint;manual |
 | System.Xml;XmlNode;get_Value;();Argument[this];ReturnValue;taint;manual |
-| System.Xml;XmlNodeChangedEventArgs;XmlNodeChangedEventArgs;(System.Xml.XmlNode,System.Xml.XmlNode,System.Xml.XmlNode,System.String,System.String,System.Xml.XmlNodeChangedAction);Argument[0].Element;Argument[this];taint;df-generated |
-| System.Xml;XmlNodeChangedEventArgs;XmlNodeChangedEventArgs;(System.Xml.XmlNode,System.Xml.XmlNode,System.Xml.XmlNode,System.String,System.String,System.Xml.XmlNodeChangedAction);Argument[1].Element;Argument[this];taint;df-generated |
-| System.Xml;XmlNodeChangedEventArgs;XmlNodeChangedEventArgs;(System.Xml.XmlNode,System.Xml.XmlNode,System.Xml.XmlNode,System.String,System.String,System.Xml.XmlNodeChangedAction);Argument[2].Element;Argument[this];taint;df-generated |
-| System.Xml;XmlNodeChangedEventArgs;XmlNodeChangedEventArgs;(System.Xml.XmlNode,System.Xml.XmlNode,System.Xml.XmlNode,System.String,System.String,System.Xml.XmlNodeChangedAction);Argument[3];Argument[this];taint;df-generated |
-| System.Xml;XmlNodeChangedEventArgs;XmlNodeChangedEventArgs;(System.Xml.XmlNode,System.Xml.XmlNode,System.Xml.XmlNode,System.String,System.String,System.Xml.XmlNodeChangedAction);Argument[4];Argument[this];taint;df-generated |
-| System.Xml;XmlNodeChangedEventArgs;get_NewParent;();Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlNodeChangedEventArgs;get_NewValue;();Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlNodeChangedEventArgs;get_Node;();Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlNodeChangedEventArgs;get_OldParent;();Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlNodeChangedEventArgs;get_OldValue;();Argument[this];ReturnValue;taint;df-generated |
+| System.Xml;XmlNodeChangedEventArgs;XmlNodeChangedEventArgs;(System.Xml.XmlNode,System.Xml.XmlNode,System.Xml.XmlNode,System.String,System.String,System.Xml.XmlNodeChangedAction);Argument[0];Argument[this].SyntheticField[System.Xml.XmlNodeChangedEventArgs._node];value;dfc-generated |
+| System.Xml;XmlNodeChangedEventArgs;XmlNodeChangedEventArgs;(System.Xml.XmlNode,System.Xml.XmlNode,System.Xml.XmlNode,System.String,System.String,System.Xml.XmlNodeChangedAction);Argument[1];Argument[this].SyntheticField[System.Xml.XmlNodeChangedEventArgs._oldParent];value;dfc-generated |
+| System.Xml;XmlNodeChangedEventArgs;XmlNodeChangedEventArgs;(System.Xml.XmlNode,System.Xml.XmlNode,System.Xml.XmlNode,System.String,System.String,System.Xml.XmlNodeChangedAction);Argument[2];Argument[this].SyntheticField[System.Xml.XmlNodeChangedEventArgs._newParent];value;dfc-generated |
+| System.Xml;XmlNodeChangedEventArgs;XmlNodeChangedEventArgs;(System.Xml.XmlNode,System.Xml.XmlNode,System.Xml.XmlNode,System.String,System.String,System.Xml.XmlNodeChangedAction);Argument[3];Argument[this].SyntheticField[System.Xml.XmlNodeChangedEventArgs._oldValue];value;dfc-generated |
+| System.Xml;XmlNodeChangedEventArgs;XmlNodeChangedEventArgs;(System.Xml.XmlNode,System.Xml.XmlNode,System.Xml.XmlNode,System.String,System.String,System.Xml.XmlNodeChangedAction);Argument[4];Argument[this].SyntheticField[System.Xml.XmlNodeChangedEventArgs._newValue];value;dfc-generated |
+| System.Xml;XmlNodeChangedEventArgs;get_NewParent;();Argument[this].SyntheticField[System.Xml.XmlNodeChangedEventArgs._newParent];ReturnValue;value;dfc-generated |
+| System.Xml;XmlNodeChangedEventArgs;get_NewValue;();Argument[this].SyntheticField[System.Xml.XmlNodeChangedEventArgs._newValue];ReturnValue;value;dfc-generated |
+| System.Xml;XmlNodeChangedEventArgs;get_Node;();Argument[this].SyntheticField[System.Xml.XmlNodeChangedEventArgs._node];ReturnValue;value;dfc-generated |
+| System.Xml;XmlNodeChangedEventArgs;get_OldParent;();Argument[this].SyntheticField[System.Xml.XmlNodeChangedEventArgs._oldParent];ReturnValue;value;dfc-generated |
+| System.Xml;XmlNodeChangedEventArgs;get_OldValue;();Argument[this].SyntheticField[System.Xml.XmlNodeChangedEventArgs._oldValue];ReturnValue;value;dfc-generated |
 | System.Xml;XmlNodeChangedEventHandler;BeginInvoke;(System.Object,System.Xml.XmlNodeChangedEventArgs,System.AsyncCallback,System.Object);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
 | System.Xml;XmlNodeList;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.IEnumerator.Current];value;manual |
 | System.Xml;XmlNodeList;Item;(System.Int32);Argument[this];ReturnValue;taint;df-generated |
@@ -18889,14 +19686,17 @@ summary
 | System.Xml;XmlNodeReader;GetAttribute;(System.String);Argument[this];ReturnValue;taint;df-generated |
 | System.Xml;XmlNodeReader;GetAttribute;(System.String,System.String);Argument[this];ReturnValue;taint;df-generated |
 | System.Xml;XmlNodeReader;GetNamespacesInScope;(System.Xml.XmlNamespaceScope);Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlNodeReader;LookupNamespace;(System.String);Argument[0];ReturnValue;taint;df-generated |
-| System.Xml;XmlNodeReader;LookupNamespace;(System.String);Argument[this];ReturnValue;taint;df-generated |
+| System.Xml;XmlNodeReader;LookupNamespace;(System.String);Argument[0];ReturnValue;value;dfc-generated |
 | System.Xml;XmlNodeReader;LookupPrefix;(System.String);Argument[this];ReturnValue;taint;df-generated |
+| System.Xml;XmlNodeReader;MoveToAttribute;(System.String);Argument[0];Argument[this];taint;df-generated |
 | System.Xml;XmlNodeReader;ReadContentAsBase64;(System.Byte[],System.Int32,System.Int32);Argument[0].Element;Argument[this];taint;df-generated |
 | System.Xml;XmlNodeReader;ReadContentAsBinHex;(System.Byte[],System.Int32,System.Int32);Argument[0].Element;Argument[this];taint;df-generated |
 | System.Xml;XmlNodeReader;ReadElementContentAsBase64;(System.Byte[],System.Int32,System.Int32);Argument[0].Element;Argument[this];taint;df-generated |
 | System.Xml;XmlNodeReader;ReadElementContentAsBinHex;(System.Byte[],System.Int32,System.Int32);Argument[0].Element;Argument[this];taint;df-generated |
+| System.Xml;XmlNodeReader;ReadString;();Argument[this].Property[System.Xml.XmlReader.Value];ReturnValue;taint;df-generated |
+| System.Xml;XmlNodeReader;ReadString;();Argument[this].Property[System.Xml.XmlReader.Value];ReturnValue;taint;dfc-generated |
 | System.Xml;XmlNodeReader;ReadString;();Argument[this];ReturnValue;taint;df-generated |
+| System.Xml;XmlNodeReader;ReadString;();Argument[this];ReturnValue;taint;dfc-generated |
 | System.Xml;XmlNodeReader;XmlNodeReader;(System.Xml.XmlNode);Argument[0].Element;Argument[this];taint;df-generated |
 | System.Xml;XmlNodeReader;get_BaseURI;();Argument[this];ReturnValue;taint;df-generated |
 | System.Xml;XmlNodeReader;get_LocalName;();Argument[this];ReturnValue;taint;df-generated |
@@ -18904,7 +19704,7 @@ summary
 | System.Xml;XmlNodeReader;get_NameTable;();Argument[this];ReturnValue;taint;df-generated |
 | System.Xml;XmlNodeReader;get_NamespaceURI;();Argument[this];ReturnValue;taint;df-generated |
 | System.Xml;XmlNodeReader;get_Prefix;();Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlNodeReader;get_SchemaInfo;();Argument[this];ReturnValue;taint;df-generated |
+| System.Xml;XmlNodeReader;get_SchemaInfo;();Argument[this];ReturnValue;value;dfc-generated |
 | System.Xml;XmlNodeReader;get_Value;();Argument[this];ReturnValue;taint;df-generated |
 | System.Xml;XmlNodeReader;get_XmlLang;();Argument[this];ReturnValue;taint;df-generated |
 | System.Xml;XmlNotation;CloneNode;(System.Boolean);Argument[this];ReturnValue;taint;df-generated |
@@ -18927,20 +19727,23 @@ summary
 | System.Xml;XmlParserContext;XmlParserContext;(System.Xml.XmlNameTable,System.Xml.XmlNamespaceManager,System.String,System.String,System.String,System.String,System.String,System.String,System.Xml.XmlSpace,System.Text.Encoding);Argument[6];Argument[this];taint;df-generated |
 | System.Xml;XmlParserContext;XmlParserContext;(System.Xml.XmlNameTable,System.Xml.XmlNamespaceManager,System.String,System.String,System.String,System.String,System.String,System.String,System.Xml.XmlSpace,System.Text.Encoding);Argument[7];Argument[this];taint;df-generated |
 | System.Xml;XmlParserContext;XmlParserContext;(System.Xml.XmlNameTable,System.Xml.XmlNamespaceManager,System.String,System.String,System.String,System.String,System.String,System.String,System.Xml.XmlSpace,System.Text.Encoding);Argument[9];Argument[this];taint;df-generated |
+| System.Xml;XmlProcessingInstruction;CloneNode;(System.Boolean);Argument[this].SyntheticField[System.Xml.XmlProcessingInstruction._target];ReturnValue.SyntheticField[System.Xml.XmlProcessingInstruction._target];value;df-generated |
+| System.Xml;XmlProcessingInstruction;CloneNode;(System.Boolean);Argument[this].SyntheticField[System.Xml.XmlProcessingInstruction._target];ReturnValue.SyntheticField[System.Xml.XmlProcessingInstruction._target];value;dfc-generated |
 | System.Xml;XmlProcessingInstruction;CloneNode;(System.Boolean);Argument[this];ReturnValue;taint;df-generated |
+| System.Xml;XmlProcessingInstruction;CloneNode;(System.Boolean);Argument[this];ReturnValue;taint;dfc-generated |
 | System.Xml;XmlProcessingInstruction;WriteContentTo;(System.Xml.XmlWriter);Argument[this];Argument[0];taint;df-generated |
 | System.Xml;XmlProcessingInstruction;WriteTo;(System.Xml.XmlWriter);Argument[this];Argument[0];taint;df-generated |
-| System.Xml;XmlProcessingInstruction;XmlProcessingInstruction;(System.String,System.String,System.Xml.XmlDocument);Argument[0];Argument[this];taint;df-generated |
-| System.Xml;XmlProcessingInstruction;XmlProcessingInstruction;(System.String,System.String,System.Xml.XmlDocument);Argument[1];Argument[this];taint;df-generated |
+| System.Xml;XmlProcessingInstruction;XmlProcessingInstruction;(System.String,System.String,System.Xml.XmlDocument);Argument[0];Argument[this].SyntheticField[System.Xml.XmlProcessingInstruction._target];value;dfc-generated |
 | System.Xml;XmlProcessingInstruction;get_InnerText;();Argument[this];ReturnValue;taint;manual |
 | System.Xml;XmlProcessingInstruction;get_LocalName;();Argument[this];ReturnValue;taint;manual |
 | System.Xml;XmlProcessingInstruction;get_Name;();Argument[this];ReturnValue;taint;manual |
 | System.Xml;XmlProcessingInstruction;get_NodeType;();Argument[this];ReturnValue;taint;manual |
-| System.Xml;XmlProcessingInstruction;get_Target;();Argument[this];ReturnValue;taint;df-generated |
+| System.Xml;XmlProcessingInstruction;get_Target;();Argument[this].SyntheticField[System.Xml.XmlProcessingInstruction._target];ReturnValue;value;dfc-generated |
 | System.Xml;XmlProcessingInstruction;get_Value;();Argument[this];ReturnValue;taint;manual |
-| System.Xml;XmlQualifiedName;ToString;();Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlQualifiedName;ToString;(System.String,System.String);Argument[0];ReturnValue;taint;df-generated |
-| System.Xml;XmlQualifiedName;ToString;(System.String,System.String);Argument[1];ReturnValue;taint;df-generated |
+| System.Xml;XmlQualifiedName;ToString;();Argument[this].Property[System.Xml.XmlQualifiedName.Name];ReturnValue;value;dfc-generated |
+| System.Xml;XmlQualifiedName;ToString;();Argument[this].Property[System.Xml.XmlQualifiedName.Namespace];ReturnValue;taint;dfc-generated |
+| System.Xml;XmlQualifiedName;ToString;(System.String,System.String);Argument[0];ReturnValue;value;dfc-generated |
+| System.Xml;XmlQualifiedName;ToString;(System.String,System.String);Argument[1];ReturnValue;taint;dfc-generated |
 | System.Xml;XmlReader;Create;(System.IO.Stream);Argument[0];ReturnValue;taint;manual |
 | System.Xml;XmlReader;Create;(System.IO.Stream,System.Xml.XmlReaderSettings);Argument[0];ReturnValue;taint;manual |
 | System.Xml;XmlReader;Create;(System.IO.Stream,System.Xml.XmlReaderSettings,System.String);Argument[0];ReturnValue;taint;manual |
@@ -18957,9 +19760,10 @@ summary
 | System.Xml;XmlReader;GetAttribute;(System.String);Argument[this];ReturnValue;taint;df-generated |
 | System.Xml;XmlReader;GetAttribute;(System.String,System.String);Argument[this];ReturnValue;taint;df-generated |
 | System.Xml;XmlReader;GetValueAsync;();Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlReader;LookupNamespace;(System.String);Argument[0];ReturnValue;taint;df-generated |
-| System.Xml;XmlReader;LookupNamespace;(System.String);Argument[this];ReturnValue;taint;df-generated |
+| System.Xml;XmlReader;LookupNamespace;(System.String);Argument[0];ReturnValue;value;dfc-generated |
+| System.Xml;XmlReader;MoveToAttribute;(System.String);Argument[0];Argument[this];taint;df-generated |
 | System.Xml;XmlReader;ReadContentAs;(System.Type,System.Xml.IXmlNamespaceResolver);Argument[1];ReturnValue;taint;df-generated |
+| System.Xml;XmlReader;ReadContentAs;(System.Type,System.Xml.IXmlNamespaceResolver);Argument[this];Argument[1];taint;df-generated |
 | System.Xml;XmlReader;ReadContentAs;(System.Type,System.Xml.IXmlNamespaceResolver);Argument[this];ReturnValue;taint;df-generated |
 | System.Xml;XmlReader;ReadContentAsAsync;(System.Type,System.Xml.IXmlNamespaceResolver);Argument[1];Argument[this];taint;df-generated |
 | System.Xml;XmlReader;ReadContentAsAsync;(System.Type,System.Xml.IXmlNamespaceResolver);Argument[1];ReturnValue;taint;df-generated |
@@ -18972,8 +19776,10 @@ summary
 | System.Xml;XmlReader;ReadContentAsString;();Argument[this];ReturnValue;taint;df-generated |
 | System.Xml;XmlReader;ReadContentAsStringAsync;();Argument[this];ReturnValue;taint;df-generated |
 | System.Xml;XmlReader;ReadElementContentAs;(System.Type,System.Xml.IXmlNamespaceResolver);Argument[1];ReturnValue;taint;df-generated |
+| System.Xml;XmlReader;ReadElementContentAs;(System.Type,System.Xml.IXmlNamespaceResolver);Argument[this];Argument[1];taint;df-generated |
 | System.Xml;XmlReader;ReadElementContentAs;(System.Type,System.Xml.IXmlNamespaceResolver);Argument[this];ReturnValue;taint;df-generated |
 | System.Xml;XmlReader;ReadElementContentAs;(System.Type,System.Xml.IXmlNamespaceResolver,System.String,System.String);Argument[1];ReturnValue;taint;df-generated |
+| System.Xml;XmlReader;ReadElementContentAs;(System.Type,System.Xml.IXmlNamespaceResolver,System.String,System.String);Argument[this];Argument[1];taint;df-generated |
 | System.Xml;XmlReader;ReadElementContentAs;(System.Type,System.Xml.IXmlNamespaceResolver,System.String,System.String);Argument[this];ReturnValue;taint;df-generated |
 | System.Xml;XmlReader;ReadElementContentAsAsync;(System.Type,System.Xml.IXmlNamespaceResolver);Argument[1];Argument[this];taint;df-generated |
 | System.Xml;XmlReader;ReadElementContentAsAsync;(System.Type,System.Xml.IXmlNamespaceResolver);Argument[1];ReturnValue;taint;df-generated |
@@ -19001,7 +19807,7 @@ summary
 | System.Xml;XmlReader;get_NameTable;();Argument[this];ReturnValue;taint;df-generated |
 | System.Xml;XmlReader;get_NamespaceURI;();Argument[this];ReturnValue;taint;df-generated |
 | System.Xml;XmlReader;get_Prefix;();Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlReader;get_SchemaInfo;();Argument[this];ReturnValue;taint;df-generated |
+| System.Xml;XmlReader;get_SchemaInfo;();Argument[this];ReturnValue;value;dfc-generated |
 | System.Xml;XmlReader;get_Settings;();Argument[this];ReturnValue;taint;df-generated |
 | System.Xml;XmlReader;get_Value;();Argument[this];ReturnValue;taint;df-generated |
 | System.Xml;XmlReader;get_XmlLang;();Argument[this];ReturnValue;taint;df-generated |
@@ -19010,13 +19816,19 @@ summary
 | System.Xml;XmlReaderSettings;set_XmlResolver;(System.Xml.XmlResolver);Argument[0];Argument[this];taint;df-generated |
 | System.Xml;XmlResolver;GetEntity;(System.Uri,System.String,System.Type);Argument[0];ReturnValue;taint;df-generated |
 | System.Xml;XmlResolver;GetEntityAsync;(System.Uri,System.String,System.Type);Argument[0];ReturnValue;taint;df-generated |
-| System.Xml;XmlResolver;ResolveUri;(System.Uri,System.String);Argument[0];ReturnValue;taint;df-generated |
-| System.Xml;XmlResolver;ResolveUri;(System.Uri,System.String);Argument[1];ReturnValue;taint;df-generated |
+| System.Xml;XmlResolver;ResolveUri;(System.Uri,System.String);Argument[0];ReturnValue;value;dfc-generated |
+| System.Xml;XmlResolver;ResolveUri;(System.Uri,System.String);Argument[1];ReturnValue;taint;dfc-generated |
 | System.Xml;XmlResolver;set_Credentials;(System.Net.ICredentials);Argument[0];Argument[this];taint;df-generated |
+| System.Xml;XmlSecureResolver;GetEntity;(System.Uri,System.String,System.Type);Argument[0].Property[System.Uri.LocalPath];ReturnValue;taint;df-generated |
+| System.Xml;XmlSecureResolver;GetEntity;(System.Uri,System.String,System.Type);Argument[0].Property[System.Uri.LocalPath];ReturnValue;taint;dfc-generated |
 | System.Xml;XmlSecureResolver;GetEntity;(System.Uri,System.String,System.Type);Argument[0];ReturnValue;taint;df-generated |
+| System.Xml;XmlSecureResolver;GetEntity;(System.Uri,System.String,System.Type);Argument[0];ReturnValue;taint;dfc-generated |
+| System.Xml;XmlSecureResolver;GetEntityAsync;(System.Uri,System.String,System.Type);Argument[0].Property[System.Uri.LocalPath];ReturnValue.Property[System.Threading.Tasks.Task`1.Result];taint;df-generated |
+| System.Xml;XmlSecureResolver;GetEntityAsync;(System.Uri,System.String,System.Type);Argument[0].Property[System.Uri.LocalPath];ReturnValue.Property[System.Threading.Tasks.Task`1.Result];taint;dfc-generated |
 | System.Xml;XmlSecureResolver;GetEntityAsync;(System.Uri,System.String,System.Type);Argument[0];ReturnValue;taint;df-generated |
-| System.Xml;XmlSecureResolver;ResolveUri;(System.Uri,System.String);Argument[0];ReturnValue;taint;df-generated |
-| System.Xml;XmlSecureResolver;ResolveUri;(System.Uri,System.String);Argument[1];ReturnValue;taint;df-generated |
+| System.Xml;XmlSecureResolver;GetEntityAsync;(System.Uri,System.String,System.Type);Argument[0];ReturnValue;taint;dfc-generated |
+| System.Xml;XmlSecureResolver;ResolveUri;(System.Uri,System.String);Argument[0];ReturnValue;value;dfc-generated |
+| System.Xml;XmlSecureResolver;ResolveUri;(System.Uri,System.String);Argument[1];ReturnValue;taint;dfc-generated |
 | System.Xml;XmlSecureResolver;set_Credentials;(System.Net.ICredentials);Argument[0];Argument[this];taint;df-generated |
 | System.Xml;XmlSignificantWhitespace;CloneNode;(System.Boolean);Argument[this];ReturnValue;taint;df-generated |
 | System.Xml;XmlSignificantWhitespace;WriteContentTo;(System.Xml.XmlWriter);Argument[this];Argument[0];taint;df-generated |
@@ -19042,26 +19854,35 @@ summary
 | System.Xml;XmlTextReader;GetAttribute;(System.String,System.String);Argument[this];ReturnValue;taint;df-generated |
 | System.Xml;XmlTextReader;GetNamespacesInScope;(System.Xml.XmlNamespaceScope);Argument[this];ReturnValue;taint;df-generated |
 | System.Xml;XmlTextReader;GetRemainder;();Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlTextReader;LookupNamespace;(System.String);Argument[0];ReturnValue;taint;df-generated |
-| System.Xml;XmlTextReader;LookupNamespace;(System.String);Argument[this];ReturnValue;taint;df-generated |
+| System.Xml;XmlTextReader;LookupNamespace;(System.String);Argument[0];ReturnValue;value;dfc-generated |
 | System.Xml;XmlTextReader;LookupPrefix;(System.String);Argument[this];ReturnValue;taint;df-generated |
+| System.Xml;XmlTextReader;MoveToAttribute;(System.String);Argument[0];Argument[this];taint;df-generated |
 | System.Xml;XmlTextReader;ReadContentAsBase64;(System.Byte[],System.Int32,System.Int32);Argument[0].Element;Argument[this];taint;df-generated |
 | System.Xml;XmlTextReader;ReadContentAsBinHex;(System.Byte[],System.Int32,System.Int32);Argument[0].Element;Argument[this];taint;df-generated |
 | System.Xml;XmlTextReader;ReadElementContentAsBase64;(System.Byte[],System.Int32,System.Int32);Argument[0].Element;Argument[this];taint;df-generated |
 | System.Xml;XmlTextReader;ReadElementContentAsBinHex;(System.Byte[],System.Int32,System.Int32);Argument[0].Element;Argument[this];taint;df-generated |
+| System.Xml;XmlTextReader;ReadString;();Argument[this].Property[System.Xml.XmlReader.Value];ReturnValue;taint;df-generated |
+| System.Xml;XmlTextReader;ReadString;();Argument[this].Property[System.Xml.XmlReader.Value];ReturnValue;taint;dfc-generated |
 | System.Xml;XmlTextReader;ReadString;();Argument[this];ReturnValue;taint;df-generated |
+| System.Xml;XmlTextReader;ReadString;();Argument[this];ReturnValue;taint;dfc-generated |
 | System.Xml;XmlTextReader;XmlTextReader;(System.IO.Stream,System.Xml.XmlNodeType,System.Xml.XmlParserContext);Argument[2];Argument[this];taint;df-generated |
-| System.Xml;XmlTextReader;XmlTextReader;(System.String);Argument[0];Argument[this];taint;df-generated |
-| System.Xml;XmlTextReader;XmlTextReader;(System.String,System.IO.Stream,System.Xml.XmlNameTable);Argument[0];Argument[this];taint;df-generated |
-| System.Xml;XmlTextReader;XmlTextReader;(System.String,System.IO.TextReader,System.Xml.XmlNameTable);Argument[0];Argument[this];taint;df-generated |
-| System.Xml;XmlTextReader;XmlTextReader;(System.String,System.Xml.XmlNameTable);Argument[0];Argument[this];taint;df-generated |
+| System.Xml;XmlTextReader;XmlTextReader;(System.String);Argument[0];Argument[this].SyntheticField[System.Xml.XmlTextReader._impl].SyntheticField[System.Xml.XmlTextReaderImpl._reportedBaseUri];taint;dfc-generated |
+| System.Xml;XmlTextReader;XmlTextReader;(System.String,System.IO.Stream,System.Xml.XmlNameTable);Argument[0];Argument[this].SyntheticField[System.Xml.XmlTextReader._impl].SyntheticField[System.Xml.XmlTextReaderImpl._reportedBaseUri];value;dfc-generated |
+| System.Xml;XmlTextReader;XmlTextReader;(System.String,System.IO.TextReader,System.Xml.XmlNameTable);Argument[0];Argument[this].SyntheticField[System.Xml.XmlTextReader._impl].SyntheticField[System.Xml.XmlTextReaderImpl._reportedBaseUri];value;dfc-generated |
+| System.Xml;XmlTextReader;XmlTextReader;(System.String,System.Xml.XmlNameTable);Argument[0];Argument[this].SyntheticField[System.Xml.XmlTextReader._impl].SyntheticField[System.Xml.XmlTextReaderImpl._reportedBaseUri];taint;dfc-generated |
 | System.Xml;XmlTextReader;XmlTextReader;(System.String,System.Xml.XmlNodeType,System.Xml.XmlParserContext);Argument[2];Argument[this];taint;df-generated |
-| System.Xml;XmlTextReader;XmlTextReader;(System.Xml.XmlNameTable);Argument[0];Argument[this];taint;df-generated |
+| System.Xml;XmlTextReader;XmlTextReader;(System.Xml.XmlNameTable);Argument[0];Argument[this].SyntheticField[System.Xml.XmlTextReader._impl].SyntheticField[System.Xml.XmlTextReaderImpl._nameTable];value;dfc-generated |
+| System.Xml;XmlTextReader;get_BaseURI;();Argument[this].SyntheticField[System.Xml.XmlTextReader._impl].SyntheticField[System.Xml.XmlTextReaderImpl._reportedBaseUri];ReturnValue;value;df-generated |
+| System.Xml;XmlTextReader;get_BaseURI;();Argument[this].SyntheticField[System.Xml.XmlTextReader._impl].SyntheticField[System.Xml.XmlTextReaderImpl._reportedBaseUri];ReturnValue;value;dfc-generated |
 | System.Xml;XmlTextReader;get_BaseURI;();Argument[this];ReturnValue;taint;df-generated |
+| System.Xml;XmlTextReader;get_BaseURI;();Argument[this];ReturnValue;taint;dfc-generated |
 | System.Xml;XmlTextReader;get_Encoding;();Argument[this];ReturnValue;taint;df-generated |
 | System.Xml;XmlTextReader;get_LocalName;();Argument[this];ReturnValue;taint;df-generated |
 | System.Xml;XmlTextReader;get_Name;();Argument[this];ReturnValue;taint;df-generated |
+| System.Xml;XmlTextReader;get_NameTable;();Argument[this].SyntheticField[System.Xml.XmlTextReader._impl].SyntheticField[System.Xml.XmlTextReaderImpl._nameTable];ReturnValue;value;df-generated |
+| System.Xml;XmlTextReader;get_NameTable;();Argument[this].SyntheticField[System.Xml.XmlTextReader._impl].SyntheticField[System.Xml.XmlTextReaderImpl._nameTable];ReturnValue;value;dfc-generated |
 | System.Xml;XmlTextReader;get_NameTable;();Argument[this];ReturnValue;taint;df-generated |
+| System.Xml;XmlTextReader;get_NameTable;();Argument[this];ReturnValue;taint;dfc-generated |
 | System.Xml;XmlTextReader;get_NamespaceURI;();Argument[this];ReturnValue;taint;df-generated |
 | System.Xml;XmlTextReader;get_Prefix;();Argument[this];ReturnValue;taint;df-generated |
 | System.Xml;XmlTextReader;get_Value;();Argument[this];ReturnValue;taint;df-generated |
@@ -19073,46 +19894,87 @@ summary
 | System.Xml;XmlTextWriter;WriteCData;(System.String);Argument[0];Argument[this];taint;df-generated |
 | System.Xml;XmlTextWriter;WriteChars;(System.Char[],System.Int32,System.Int32);Argument[0].Element;Argument[this];taint;df-generated |
 | System.Xml;XmlTextWriter;WriteComment;(System.String);Argument[0];Argument[this];taint;df-generated |
+| System.Xml;XmlTextWriter;WriteDocType;(System.String,System.String,System.String,System.String);Argument[0];Argument[this].SyntheticField[System.Xml.XmlTextWriter._textWriter];taint;df-generated |
+| System.Xml;XmlTextWriter;WriteDocType;(System.String,System.String,System.String,System.String);Argument[0];Argument[this].SyntheticField[System.Xml.XmlTextWriter._textWriter];taint;dfc-generated |
 | System.Xml;XmlTextWriter;WriteDocType;(System.String,System.String,System.String,System.String);Argument[0];Argument[this];taint;df-generated |
+| System.Xml;XmlTextWriter;WriteDocType;(System.String,System.String,System.String,System.String);Argument[0];Argument[this];taint;dfc-generated |
+| System.Xml;XmlTextWriter;WriteDocType;(System.String,System.String,System.String,System.String);Argument[1];Argument[this].SyntheticField[System.Xml.XmlTextWriter._textWriter];taint;df-generated |
+| System.Xml;XmlTextWriter;WriteDocType;(System.String,System.String,System.String,System.String);Argument[1];Argument[this].SyntheticField[System.Xml.XmlTextWriter._textWriter];taint;dfc-generated |
 | System.Xml;XmlTextWriter;WriteDocType;(System.String,System.String,System.String,System.String);Argument[1];Argument[this];taint;df-generated |
+| System.Xml;XmlTextWriter;WriteDocType;(System.String,System.String,System.String,System.String);Argument[1];Argument[this];taint;dfc-generated |
+| System.Xml;XmlTextWriter;WriteDocType;(System.String,System.String,System.String,System.String);Argument[2];Argument[this].SyntheticField[System.Xml.XmlTextWriter._textWriter];taint;df-generated |
+| System.Xml;XmlTextWriter;WriteDocType;(System.String,System.String,System.String,System.String);Argument[2];Argument[this].SyntheticField[System.Xml.XmlTextWriter._textWriter];taint;dfc-generated |
 | System.Xml;XmlTextWriter;WriteDocType;(System.String,System.String,System.String,System.String);Argument[2];Argument[this];taint;df-generated |
+| System.Xml;XmlTextWriter;WriteDocType;(System.String,System.String,System.String,System.String);Argument[2];Argument[this];taint;dfc-generated |
+| System.Xml;XmlTextWriter;WriteDocType;(System.String,System.String,System.String,System.String);Argument[3];Argument[this].SyntheticField[System.Xml.XmlTextWriter._textWriter];taint;df-generated |
+| System.Xml;XmlTextWriter;WriteDocType;(System.String,System.String,System.String,System.String);Argument[3];Argument[this].SyntheticField[System.Xml.XmlTextWriter._textWriter];taint;dfc-generated |
 | System.Xml;XmlTextWriter;WriteDocType;(System.String,System.String,System.String,System.String);Argument[3];Argument[this];taint;df-generated |
+| System.Xml;XmlTextWriter;WriteDocType;(System.String,System.String,System.String,System.String);Argument[3];Argument[this];taint;dfc-generated |
 | System.Xml;XmlTextWriter;WriteEntityRef;(System.String);Argument[0];Argument[this];taint;df-generated |
+| System.Xml;XmlTextWriter;WriteName;(System.String);Argument[0];Argument[this].SyntheticField[System.Xml.XmlTextWriter._textWriter];taint;df-generated |
+| System.Xml;XmlTextWriter;WriteName;(System.String);Argument[0];Argument[this].SyntheticField[System.Xml.XmlTextWriter._textWriter];taint;dfc-generated |
 | System.Xml;XmlTextWriter;WriteName;(System.String);Argument[0];Argument[this];taint;df-generated |
+| System.Xml;XmlTextWriter;WriteName;(System.String);Argument[0];Argument[this];taint;dfc-generated |
+| System.Xml;XmlTextWriter;WriteNmToken;(System.String);Argument[0];Argument[this].SyntheticField[System.Xml.XmlTextWriter._textWriter];taint;df-generated |
+| System.Xml;XmlTextWriter;WriteNmToken;(System.String);Argument[0];Argument[this].SyntheticField[System.Xml.XmlTextWriter._textWriter];taint;dfc-generated |
 | System.Xml;XmlTextWriter;WriteNmToken;(System.String);Argument[0];Argument[this];taint;df-generated |
+| System.Xml;XmlTextWriter;WriteNmToken;(System.String);Argument[0];Argument[this];taint;dfc-generated |
+| System.Xml;XmlTextWriter;WriteProcessingInstruction;(System.String,System.String);Argument[0];Argument[this].SyntheticField[System.Xml.XmlTextWriter._textWriter];taint;df-generated |
+| System.Xml;XmlTextWriter;WriteProcessingInstruction;(System.String,System.String);Argument[0];Argument[this].SyntheticField[System.Xml.XmlTextWriter._textWriter];taint;dfc-generated |
 | System.Xml;XmlTextWriter;WriteProcessingInstruction;(System.String,System.String);Argument[0];Argument[this];taint;df-generated |
-| System.Xml;XmlTextWriter;WriteProcessingInstruction;(System.String,System.String);Argument[1];Argument[this];taint;df-generated |
+| System.Xml;XmlTextWriter;WriteProcessingInstruction;(System.String,System.String);Argument[0];Argument[this];taint;dfc-generated |
+| System.Xml;XmlTextWriter;WriteQualifiedName;(System.String,System.String);Argument[0];Argument[this].SyntheticField[System.Xml.XmlTextWriter._textWriter];taint;df-generated |
+| System.Xml;XmlTextWriter;WriteQualifiedName;(System.String,System.String);Argument[0];Argument[this].SyntheticField[System.Xml.XmlTextWriter._textWriter];taint;dfc-generated |
 | System.Xml;XmlTextWriter;WriteQualifiedName;(System.String,System.String);Argument[0];Argument[this];taint;df-generated |
+| System.Xml;XmlTextWriter;WriteQualifiedName;(System.String,System.String);Argument[0];Argument[this];taint;dfc-generated |
 | System.Xml;XmlTextWriter;WriteRaw;(System.Char[],System.Int32,System.Int32);Argument[0].Element;Argument[this];taint;df-generated |
 | System.Xml;XmlTextWriter;WriteRaw;(System.String);Argument[0];Argument[this];taint;df-generated |
+| System.Xml;XmlTextWriter;WriteStartAttribute;(System.String,System.String,System.String);Argument[0];Argument[this].SyntheticField[System.Xml.XmlTextWriter._textWriter];taint;df-generated |
+| System.Xml;XmlTextWriter;WriteStartAttribute;(System.String,System.String,System.String);Argument[0];Argument[this].SyntheticField[System.Xml.XmlTextWriter._textWriter];taint;dfc-generated |
 | System.Xml;XmlTextWriter;WriteStartAttribute;(System.String,System.String,System.String);Argument[0];Argument[this];taint;df-generated |
+| System.Xml;XmlTextWriter;WriteStartAttribute;(System.String,System.String,System.String);Argument[0];Argument[this];taint;dfc-generated |
+| System.Xml;XmlTextWriter;WriteStartAttribute;(System.String,System.String,System.String);Argument[1];Argument[this].SyntheticField[System.Xml.XmlTextWriter._textWriter];taint;df-generated |
+| System.Xml;XmlTextWriter;WriteStartAttribute;(System.String,System.String,System.String);Argument[1];Argument[this].SyntheticField[System.Xml.XmlTextWriter._textWriter];taint;dfc-generated |
 | System.Xml;XmlTextWriter;WriteStartAttribute;(System.String,System.String,System.String);Argument[1];Argument[this];taint;df-generated |
+| System.Xml;XmlTextWriter;WriteStartAttribute;(System.String,System.String,System.String);Argument[1];Argument[this];taint;dfc-generated |
+| System.Xml;XmlTextWriter;WriteStartElement;(System.String,System.String,System.String);Argument[0];Argument[this].SyntheticField[System.Xml.XmlTextWriter._textWriter];taint;df-generated |
+| System.Xml;XmlTextWriter;WriteStartElement;(System.String,System.String,System.String);Argument[0];Argument[this].SyntheticField[System.Xml.XmlTextWriter._textWriter];taint;dfc-generated |
 | System.Xml;XmlTextWriter;WriteStartElement;(System.String,System.String,System.String);Argument[0];Argument[this];taint;df-generated |
+| System.Xml;XmlTextWriter;WriteStartElement;(System.String,System.String,System.String);Argument[0];Argument[this];taint;dfc-generated |
+| System.Xml;XmlTextWriter;WriteStartElement;(System.String,System.String,System.String);Argument[1];Argument[this].SyntheticField[System.Xml.XmlTextWriter._textWriter];taint;df-generated |
+| System.Xml;XmlTextWriter;WriteStartElement;(System.String,System.String,System.String);Argument[1];Argument[this].SyntheticField[System.Xml.XmlTextWriter._textWriter];taint;dfc-generated |
 | System.Xml;XmlTextWriter;WriteStartElement;(System.String,System.String,System.String);Argument[1];Argument[this];taint;df-generated |
+| System.Xml;XmlTextWriter;WriteStartElement;(System.String,System.String,System.String);Argument[1];Argument[this];taint;dfc-generated |
 | System.Xml;XmlTextWriter;WriteString;(System.String);Argument[0];Argument[this];taint;df-generated |
 | System.Xml;XmlTextWriter;WriteWhitespace;(System.String);Argument[0];Argument[this];taint;df-generated |
 | System.Xml;XmlTextWriter;XmlTextWriter;(System.IO.Stream,System.Text.Encoding);Argument[1];Argument[this];taint;df-generated |
 | System.Xml;XmlTextWriter;XmlTextWriter;(System.IO.TextWriter);Argument[0];Argument[this];taint;df-generated |
-| System.Xml;XmlTextWriter;get_BaseStream;();Argument[this];ReturnValue;taint;df-generated |
+| System.Xml;XmlTextWriter;get_BaseStream;();Argument[this].SyntheticField[System.Xml.XmlTextWriter._textWriter].Property[System.IO.StreamWriter.BaseStream];ReturnValue;value;dfc-generated |
 | System.Xml;XmlTextWriter;get_XmlLang;();Argument[this];ReturnValue;taint;df-generated |
+| System.Xml;XmlUrlResolver;GetEntity;(System.Uri,System.String,System.Type);Argument[0].Property[System.Uri.LocalPath];ReturnValue;taint;df-generated |
+| System.Xml;XmlUrlResolver;GetEntity;(System.Uri,System.String,System.Type);Argument[0].Property[System.Uri.LocalPath];ReturnValue;taint;dfc-generated |
 | System.Xml;XmlUrlResolver;GetEntity;(System.Uri,System.String,System.Type);Argument[0];ReturnValue;taint;df-generated |
+| System.Xml;XmlUrlResolver;GetEntity;(System.Uri,System.String,System.Type);Argument[0];ReturnValue;taint;dfc-generated |
 | System.Xml;XmlUrlResolver;GetEntityAsync;(System.Uri,System.String,System.Type);Argument[0];ReturnValue;taint;df-generated |
-| System.Xml;XmlUrlResolver;ResolveUri;(System.Uri,System.String);Argument[0];ReturnValue;taint;df-generated |
-| System.Xml;XmlUrlResolver;ResolveUri;(System.Uri,System.String);Argument[1];ReturnValue;taint;df-generated |
+| System.Xml;XmlUrlResolver;ResolveUri;(System.Uri,System.String);Argument[0];ReturnValue;value;dfc-generated |
+| System.Xml;XmlUrlResolver;ResolveUri;(System.Uri,System.String);Argument[1];ReturnValue;taint;dfc-generated |
 | System.Xml;XmlUrlResolver;set_Credentials;(System.Net.ICredentials);Argument[0];Argument[this];taint;df-generated |
 | System.Xml;XmlUrlResolver;set_Proxy;(System.Net.IWebProxy);Argument[0];Argument[this];taint;df-generated |
 | System.Xml;XmlValidatingReader;GetAttribute;(System.Int32);Argument[this];ReturnValue;taint;df-generated |
 | System.Xml;XmlValidatingReader;GetAttribute;(System.String);Argument[this];ReturnValue;taint;df-generated |
 | System.Xml;XmlValidatingReader;GetAttribute;(System.String,System.String);Argument[this];ReturnValue;taint;df-generated |
 | System.Xml;XmlValidatingReader;GetNamespacesInScope;(System.Xml.XmlNamespaceScope);Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlValidatingReader;LookupNamespace;(System.String);Argument[0];ReturnValue;taint;df-generated |
-| System.Xml;XmlValidatingReader;LookupNamespace;(System.String);Argument[this];ReturnValue;taint;df-generated |
+| System.Xml;XmlValidatingReader;LookupNamespace;(System.String);Argument[0];ReturnValue;value;dfc-generated |
 | System.Xml;XmlValidatingReader;LookupPrefix;(System.String);Argument[this];ReturnValue;taint;df-generated |
+| System.Xml;XmlValidatingReader;MoveToAttribute;(System.String);Argument[0];Argument[this];taint;df-generated |
 | System.Xml;XmlValidatingReader;ReadContentAsBase64;(System.Byte[],System.Int32,System.Int32);Argument[0].Element;Argument[this];taint;df-generated |
 | System.Xml;XmlValidatingReader;ReadContentAsBinHex;(System.Byte[],System.Int32,System.Int32);Argument[0].Element;Argument[this];taint;df-generated |
 | System.Xml;XmlValidatingReader;ReadElementContentAsBase64;(System.Byte[],System.Int32,System.Int32);Argument[0].Element;Argument[this];taint;df-generated |
 | System.Xml;XmlValidatingReader;ReadElementContentAsBinHex;(System.Byte[],System.Int32,System.Int32);Argument[0].Element;Argument[this];taint;df-generated |
+| System.Xml;XmlValidatingReader;ReadString;();Argument[this].Property[System.Xml.XmlReader.Value];ReturnValue;taint;df-generated |
+| System.Xml;XmlValidatingReader;ReadString;();Argument[this].Property[System.Xml.XmlReader.Value];ReturnValue;taint;dfc-generated |
 | System.Xml;XmlValidatingReader;ReadString;();Argument[this];ReturnValue;taint;df-generated |
+| System.Xml;XmlValidatingReader;ReadString;();Argument[this];ReturnValue;taint;dfc-generated |
 | System.Xml;XmlValidatingReader;ReadTypedValue;();Argument[this];ReturnValue;taint;df-generated |
 | System.Xml;XmlValidatingReader;XmlValidatingReader;(System.IO.Stream,System.Xml.XmlNodeType,System.Xml.XmlParserContext);Argument[2];Argument[this];taint;df-generated |
 | System.Xml;XmlValidatingReader;XmlValidatingReader;(System.String,System.Xml.XmlNodeType,System.Xml.XmlParserContext);Argument[2];Argument[this];taint;df-generated |
@@ -19149,6 +20011,8 @@ summary
 | System.Xml;XmlWriter;Create;(System.String);Argument[0];ReturnValue;taint;df-generated |
 | System.Xml;XmlWriter;Create;(System.String,System.Xml.XmlWriterSettings);Argument[0];ReturnValue;taint;df-generated |
 | System.Xml;XmlWriter;Create;(System.String,System.Xml.XmlWriterSettings);Argument[1];ReturnValue;taint;df-generated |
+| System.Xml;XmlWriter;Create;(System.Text.StringBuilder);Argument[0];ReturnValue;taint;df-generated |
+| System.Xml;XmlWriter;Create;(System.Text.StringBuilder,System.Xml.XmlWriterSettings);Argument[0];ReturnValue;taint;df-generated |
 | System.Xml;XmlWriter;Create;(System.Text.StringBuilder,System.Xml.XmlWriterSettings);Argument[1];ReturnValue;taint;df-generated |
 | System.Xml;XmlWriter;Create;(System.Xml.XmlWriter);Argument[0];ReturnValue;taint;df-generated |
 | System.Xml;XmlWriter;Create;(System.Xml.XmlWriter,System.Xml.XmlWriterSettings);Argument[0];ReturnValue;taint;df-generated |
@@ -19194,7 +20058,6 @@ summary
 | System.Xml;XmlWriter;WriteNode;(System.Xml.XmlReader,System.Boolean);Argument[0];Argument[this];taint;df-generated |
 | System.Xml;XmlWriter;WriteNodeAsync;(System.Xml.XmlReader,System.Boolean);Argument[0];Argument[this];taint;df-generated |
 | System.Xml;XmlWriter;WriteProcessingInstruction;(System.String,System.String);Argument[0];Argument[this];taint;df-generated |
-| System.Xml;XmlWriter;WriteProcessingInstruction;(System.String,System.String);Argument[1];Argument[this];taint;df-generated |
 | System.Xml;XmlWriter;WriteQualifiedName;(System.String,System.String);Argument[0];Argument[this];taint;df-generated |
 | System.Xml;XmlWriter;WriteQualifiedNameAsync;(System.String,System.String);Argument[0];Argument[this];taint;df-generated |
 | System.Xml;XmlWriter;WriteRaw;(System.Char[],System.Int32,System.Int32);Argument[0].Element;Argument[this];taint;df-generated |
@@ -19235,14 +20098,18 @@ summary
 | System;Action<T1,T2,T3>;BeginInvoke;(T1,T2,T3,System.AsyncCallback,System.Object);Argument[3];Argument[3].Parameter[delegate-self];value;hq-generated |
 | System;Action<T1,T2>;BeginInvoke;(T1,T2,System.AsyncCallback,System.Object);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
 | System;Action<T>;BeginInvoke;(T,System.AsyncCallback,System.Object);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
-| System;AggregateException;AggregateException;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);Argument[0];Argument[this];taint;df-generated |
-| System;AggregateException;AggregateException;(System.String,System.Exception);Argument[1];Argument[this];taint;df-generated |
+| System;AggregateException;AggregateException;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);Argument[0].SyntheticField[System.Runtime.Serialization.SerializationInfo._values].Element;Argument[this].SyntheticField[System.AggregateException._innerExceptions];value;dfc-generated |
+| System;AggregateException;AggregateException;(System.String,System.Exception);Argument[1];Argument[this].SyntheticField[System.AggregateException._innerExceptions].Element;value;dfc-generated |
 | System;AggregateException;GetBaseException;();Argument[this];ReturnValue;taint;df-generated |
 | System;AggregateException;GetObjectData;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);Argument[this];Argument[0];taint;df-generated |
+| System;AggregateException;Handle;(System.Func<System.Exception,System.Boolean>);Argument[0];Argument[0].Parameter[delegate-self];value;dfc-generated |
 | System;AggregateException;Handle;(System.Func<System.Exception,System.Boolean>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
-| System;AggregateException;get_Message;();Argument[this];ReturnValue;taint;df-generated |
-| System;AppDomain;ApplyPolicy;(System.String);Argument[0];ReturnValue;taint;df-generated |
-| System;AppDomain;ToString;();Argument[this];ReturnValue;taint;df-generated |
+| System;AggregateException;Handle;(System.Func<System.Exception,System.Boolean>);Argument[this].SyntheticField[System.AggregateException._innerExceptions].Element;Argument[0].Parameter[0];value;dfc-generated |
+| System;AggregateException;Handle;(System.Func<System.Exception,System.Boolean>);Argument[this].SyntheticField[System.AggregateException._innerExceptions].Element;Argument[0].Parameter[0];value;hq-generated |
+| System;AggregateException;get_Message;();Argument[this].Property[System.Exception.Message];ReturnValue;value;dfc-generated |
+| System;AggregateException;get_Message;();Argument[this].SyntheticField[System.Exception._message];ReturnValue;value;dfc-generated |
+| System;AppDomain;ApplyPolicy;(System.String);Argument[0];ReturnValue;value;dfc-generated |
+| System;AppDomain;ToString;();Argument[this].Property[System.AppDomain.FriendlyName];ReturnValue;taint;dfc-generated |
 | System;AppDomain;add_AssemblyLoad;(System.AssemblyLoadEventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System;AppDomain;add_AssemblyResolve;(System.ResolveEventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System;AppDomain;add_DomainUnload;(System.EventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
@@ -19261,137 +20128,169 @@ summary
 | System;AppDomain;remove_ResourceResolve;(System.ResolveEventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System;AppDomain;remove_TypeResolve;(System.ResolveEventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System;AppDomain;remove_UnhandledException;(System.UnhandledExceptionEventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
-| System;ApplicationId;ApplicationId;(System.Byte[],System.String,System.Version,System.String,System.String);Argument[0].Element;Argument[this];taint;df-generated |
-| System;ApplicationId;Copy;();Argument[this];ReturnValue;taint;df-generated |
-| System;ApplicationId;get_PublicKeyToken;();Argument[this];ReturnValue;taint;df-generated |
+| System;ApplicationId;ApplicationId;(System.Byte[],System.String,System.Version,System.String,System.String);Argument[0].Element;Argument[this].SyntheticField[System.ApplicationId._publicKeyToken].Element;value;dfc-generated |
+| System;ApplicationId;Copy;();Argument[this].SyntheticField[System.ApplicationId._publicKeyToken].Element;ReturnValue.SyntheticField[System.ApplicationId._publicKeyToken].Element;value;dfc-generated |
+| System;ApplicationId;get_PublicKeyToken;();Argument[this].SyntheticField[System.ApplicationId._publicKeyToken].Element;ReturnValue.Element;value;dfc-generated |
 | System;ApplicationIdentity;GetObjectData;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);Argument[this];Argument[0];taint;df-generated |
-| System;ArgumentException;ArgumentException;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);Argument[0];Argument[this];taint;df-generated |
-| System;ArgumentException;ArgumentException;(System.String,System.String);Argument[1];Argument[this];taint;df-generated |
-| System;ArgumentException;ArgumentException;(System.String,System.String,System.Exception);Argument[1];Argument[this];taint;df-generated |
+| System;ArgumentException;ArgumentException;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);Argument[0].SyntheticField[System.Runtime.Serialization.SerializationInfo._values].Element;Argument[this].SyntheticField[System.ArgumentException._paramName];value;dfc-generated |
+| System;ArgumentException;ArgumentException;(System.String,System.String);Argument[1];Argument[this].SyntheticField[System.ArgumentException._paramName];value;dfc-generated |
+| System;ArgumentException;ArgumentException;(System.String,System.String,System.Exception);Argument[1];Argument[this].SyntheticField[System.ArgumentException._paramName];value;dfc-generated |
 | System;ArgumentException;GetObjectData;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);Argument[this];Argument[0];taint;df-generated |
-| System;ArgumentException;get_Message;();Argument[this];ReturnValue;taint;df-generated |
-| System;ArgumentException;get_ParamName;();Argument[this];ReturnValue;taint;df-generated |
-| System;ArgumentOutOfRangeException;ArgumentOutOfRangeException;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);Argument[0];Argument[this];taint;df-generated |
-| System;ArgumentOutOfRangeException;ArgumentOutOfRangeException;(System.String,System.Object,System.String);Argument[1];Argument[this];taint;df-generated |
+| System;ArgumentException;get_Message;();Argument[this].Property[System.Exception.Message];ReturnValue;value;dfc-generated |
+| System;ArgumentException;get_Message;();Argument[this].SyntheticField[System.ArgumentException._paramName];ReturnValue;taint;dfc-generated |
+| System;ArgumentException;get_Message;();Argument[this].SyntheticField[System.Exception._message];ReturnValue;value;dfc-generated |
+| System;ArgumentException;get_ParamName;();Argument[this].SyntheticField[System.ArgumentException._paramName];ReturnValue;value;dfc-generated |
+| System;ArgumentOutOfRangeException;ArgumentOutOfRangeException;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);Argument[0].SyntheticField[System.Runtime.Serialization.SerializationInfo._values].Element;Argument[this].SyntheticField[System.ArgumentOutOfRangeException._actualValue];value;dfc-generated |
+| System;ArgumentOutOfRangeException;ArgumentOutOfRangeException;(System.String,System.Object,System.String);Argument[1];Argument[this].SyntheticField[System.ArgumentOutOfRangeException._actualValue];value;dfc-generated |
 | System;ArgumentOutOfRangeException;GetObjectData;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);Argument[this];Argument[0];taint;df-generated |
-| System;ArgumentOutOfRangeException;get_ActualValue;();Argument[this];ReturnValue;taint;df-generated |
-| System;ArgumentOutOfRangeException;get_Message;();Argument[this];ReturnValue;taint;df-generated |
+| System;ArgumentOutOfRangeException;get_ActualValue;();Argument[this].SyntheticField[System.ArgumentOutOfRangeException._actualValue];ReturnValue;value;dfc-generated |
+| System;ArgumentOutOfRangeException;get_Message;();Argument[this].Property[System.Exception.Message];ReturnValue;value;dfc-generated |
+| System;ArgumentOutOfRangeException;get_Message;();Argument[this].SyntheticField[System.ArgumentException._paramName];ReturnValue;taint;dfc-generated |
+| System;ArgumentOutOfRangeException;get_Message;();Argument[this].SyntheticField[System.Exception._message];ReturnValue;value;dfc-generated |
 | System;Array;Add;(System.Object);Argument[0];Argument[this].Element;value;manual |
 | System;Array;AsReadOnly<T>;(T[]);Argument[0].Element;ReturnValue.Element;value;manual |
 | System;Array;Clear;();Argument[this].WithoutElement;Argument[this];value;manual |
 | System;Array;Clear;(System.Array);Argument[0].WithoutElement;Argument[0];value;manual |
 | System;Array;Clear;(System.Array,System.Int32,System.Int32);Argument[0].WithoutElement;Argument[0];value;manual |
 | System;Array;Clone;();Argument[this].Element;ReturnValue.Element;value;manual |
+| System;Array;ConvertAll<TInput,TOutput>;(TInput[],System.Converter<TInput,TOutput>);Argument[0].Element;Argument[1].Parameter[0];value;dfc-generated |
+| System;Array;ConvertAll<TInput,TOutput>;(TInput[],System.Converter<TInput,TOutput>);Argument[0].Element;Argument[1].Parameter[0];value;hq-generated |
+| System;Array;ConvertAll<TInput,TOutput>;(TInput[],System.Converter<TInput,TOutput>);Argument[1].ReturnValue;ReturnValue.Element;value;dfc-generated |
+| System;Array;ConvertAll<TInput,TOutput>;(TInput[],System.Converter<TInput,TOutput>);Argument[1].ReturnValue;ReturnValue.Element;value;hq-generated |
+| System;Array;ConvertAll<TInput,TOutput>;(TInput[],System.Converter<TInput,TOutput>);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | System;Array;ConvertAll<TInput,TOutput>;(TInput[],System.Converter<TInput,TOutput>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
 | System;Array;CopyTo;(System.Array,System.Int32);Argument[this].Element;Argument[0].Element;value;manual |
 | System;Array;CopyTo;(System.Array,System.Int64);Argument[this].Element;Argument[0].Element;value;manual |
+| System;Array;Exists<T>;(T[],System.Predicate<T>);Argument[0].Element;Argument[1].Parameter[0];value;dfc-generated |
+| System;Array;Exists<T>;(T[],System.Predicate<T>);Argument[0].Element;Argument[1].Parameter[0];value;hq-generated |
+| System;Array;Exists<T>;(T[],System.Predicate<T>);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | System;Array;Exists<T>;(T[],System.Predicate<T>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
-| System;Array;Fill<T>;(T[],T);Argument[1];Argument[0].Element;taint;df-generated |
-| System;Array;Fill<T>;(T[],T,System.Int32,System.Int32);Argument[1];Argument[0].Element;taint;df-generated |
+| System;Array;Fill<T>;(T[],T);Argument[1];Argument[0].Element;value;dfc-generated |
+| System;Array;Fill<T>;(T[],T,System.Int32,System.Int32);Argument[1];Argument[0].Element;value;dfc-generated |
 | System;Array;Find<T>;(T[],System.Predicate<T>);Argument[0].Element;Argument[1].Parameter[0];value;manual |
 | System;Array;Find<T>;(T[],System.Predicate<T>);Argument[0].Element;ReturnValue;value;manual |
 | System;Array;Find<T>;(T[],System.Predicate<T>);Argument[1];Argument[1].Parameter[delegate-self];value;manual |
 | System;Array;FindAll<T>;(T[],System.Predicate<T>);Argument[0].Element;Argument[1].Parameter[0];value;manual |
 | System;Array;FindAll<T>;(T[],System.Predicate<T>);Argument[0].Element;ReturnValue;value;manual |
 | System;Array;FindAll<T>;(T[],System.Predicate<T>);Argument[1];Argument[1].Parameter[delegate-self];value;manual |
+| System;Array;FindIndex<T>;(T[],System.Int32,System.Int32,System.Predicate<T>);Argument[0].Element;Argument[3].Parameter[0];value;dfc-generated |
+| System;Array;FindIndex<T>;(T[],System.Int32,System.Int32,System.Predicate<T>);Argument[0].Element;Argument[3].Parameter[0];value;hq-generated |
+| System;Array;FindIndex<T>;(T[],System.Int32,System.Int32,System.Predicate<T>);Argument[3];Argument[3].Parameter[delegate-self];value;dfc-generated |
 | System;Array;FindIndex<T>;(T[],System.Int32,System.Int32,System.Predicate<T>);Argument[3];Argument[3].Parameter[delegate-self];value;hq-generated |
+| System;Array;FindIndex<T>;(T[],System.Int32,System.Predicate<T>);Argument[0].Element;Argument[2].Parameter[0];value;dfc-generated |
+| System;Array;FindIndex<T>;(T[],System.Int32,System.Predicate<T>);Argument[0].Element;Argument[2].Parameter[0];value;hq-generated |
+| System;Array;FindIndex<T>;(T[],System.Int32,System.Predicate<T>);Argument[2];Argument[2].Parameter[delegate-self];value;dfc-generated |
 | System;Array;FindIndex<T>;(T[],System.Int32,System.Predicate<T>);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
+| System;Array;FindIndex<T>;(T[],System.Predicate<T>);Argument[0].Element;Argument[1].Parameter[0];value;dfc-generated |
+| System;Array;FindIndex<T>;(T[],System.Predicate<T>);Argument[0].Element;Argument[1].Parameter[0];value;hq-generated |
+| System;Array;FindIndex<T>;(T[],System.Predicate<T>);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | System;Array;FindIndex<T>;(T[],System.Predicate<T>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
 | System;Array;FindLast<T>;(T[],System.Predicate<T>);Argument[0].Element;Argument[1].Parameter[0];value;manual |
 | System;Array;FindLast<T>;(T[],System.Predicate<T>);Argument[0].Element;ReturnValue;value;manual |
 | System;Array;FindLast<T>;(T[],System.Predicate<T>);Argument[1];Argument[1].Parameter[delegate-self];value;manual |
+| System;Array;FindLastIndex<T>;(T[],System.Int32,System.Int32,System.Predicate<T>);Argument[0].Element;Argument[3].Parameter[0];value;dfc-generated |
+| System;Array;FindLastIndex<T>;(T[],System.Int32,System.Int32,System.Predicate<T>);Argument[0].Element;Argument[3].Parameter[0];value;hq-generated |
+| System;Array;FindLastIndex<T>;(T[],System.Int32,System.Int32,System.Predicate<T>);Argument[3];Argument[3].Parameter[delegate-self];value;dfc-generated |
 | System;Array;FindLastIndex<T>;(T[],System.Int32,System.Int32,System.Predicate<T>);Argument[3];Argument[3].Parameter[delegate-self];value;hq-generated |
+| System;Array;FindLastIndex<T>;(T[],System.Int32,System.Predicate<T>);Argument[0].Element;Argument[2].Parameter[0];value;dfc-generated |
+| System;Array;FindLastIndex<T>;(T[],System.Int32,System.Predicate<T>);Argument[0].Element;Argument[2].Parameter[0];value;hq-generated |
+| System;Array;FindLastIndex<T>;(T[],System.Int32,System.Predicate<T>);Argument[2];Argument[2].Parameter[delegate-self];value;dfc-generated |
 | System;Array;FindLastIndex<T>;(T[],System.Int32,System.Predicate<T>);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
+| System;Array;FindLastIndex<T>;(T[],System.Predicate<T>);Argument[0].Element;Argument[1].Parameter[0];value;dfc-generated |
+| System;Array;FindLastIndex<T>;(T[],System.Predicate<T>);Argument[0].Element;Argument[1].Parameter[0];value;hq-generated |
+| System;Array;FindLastIndex<T>;(T[],System.Predicate<T>);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | System;Array;FindLastIndex<T>;(T[],System.Predicate<T>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
+| System;Array;ForEach<T>;(T[],System.Action<T>);Argument[0].Element;Argument[1].Parameter[0];value;dfc-generated |
+| System;Array;ForEach<T>;(T[],System.Action<T>);Argument[0].Element;Argument[1].Parameter[0];value;hq-generated |
+| System;Array;ForEach<T>;(T[],System.Action<T>);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | System;Array;ForEach<T>;(T[],System.Action<T>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
 | System;Array;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.IEnumerator.Current];value;manual |
 | System;Array;Insert;(System.Int32,System.Object);Argument[1];Argument[this].Element;value;manual |
-| System;Array;Remove;(System.Object);Argument[0];Argument[this];taint;df-generated |
-| System;Array;Remove;(System.Object);Argument[this];Argument[0];taint;df-generated |
+| System;Array;Resize<T>;(T[],System.Int32);Argument[0];ReturnValue;value;dfc-generated |
 | System;Array;Reverse;(System.Array);Argument[0].Element;ReturnValue.Element;value;manual |
 | System;Array;Reverse;(System.Array,System.Int32,System.Int32);Argument[0].Element;ReturnValue.Element;value;manual |
 | System;Array;Reverse<T>;(T[]);Argument[0].Element;ReturnValue.Element;value;manual |
 | System;Array;Reverse<T>;(T[],System.Int32,System.Int32);Argument[0].Element;ReturnValue.Element;value;manual |
 | System;Array;Sort<T>;(T[],System.Comparison<T>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
+| System;Array;TrueForAll<T>;(T[],System.Predicate<T>);Argument[0].Element;Argument[1].Parameter[0];value;dfc-generated |
+| System;Array;TrueForAll<T>;(T[],System.Predicate<T>);Argument[0].Element;Argument[1].Parameter[0];value;hq-generated |
+| System;Array;TrueForAll<T>;(T[],System.Predicate<T>);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | System;Array;TrueForAll<T>;(T[],System.Predicate<T>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
 | System;Array;get_Item;(System.Int32);Argument[this].Element;ReturnValue;value;manual |
-| System;Array;get_SyncRoot;();Argument[this];ReturnValue;taint;df-generated |
-| System;Array;get_SyncRoot;();Argument[this];ReturnValue;value;df-generated |
+| System;Array;get_SyncRoot;();Argument[this];ReturnValue;value;dfc-generated |
 | System;Array;set_Item;(System.Int32,System.Object);Argument[1];Argument[this].Element;value;manual |
+| System;ArraySegment<T>+Enumerator;get_Current;();Argument[this].Property[System.ArraySegment`1+Enumerator.Current];ReturnValue;value;df-generated |
+| System;ArraySegment<T>+Enumerator;get_Current;();Argument[this].Property[System.ArraySegment`1+Enumerator.Current];ReturnValue;value;dfc-generated |
+| System;ArraySegment<T>+Enumerator;get_Current;();Argument[this].SyntheticField[System.ArraySegment`1+Enumerator._array].Element;ReturnValue;value;df-generated |
+| System;ArraySegment<T>+Enumerator;get_Current;();Argument[this].SyntheticField[System.ArraySegment`1+Enumerator._array].Element;ReturnValue;value;dfc-generated |
 | System;ArraySegment<T>+Enumerator;get_Current;();Argument[this];ReturnValue;taint;df-generated |
+| System;ArraySegment<T>+Enumerator;get_Current;();Argument[this];ReturnValue;taint;dfc-generated |
 | System;ArraySegment<T>;Add;(T);Argument[0];Argument[this].Element;value;manual |
-| System;ArraySegment<T>;ArraySegment;(T[]);Argument[0].Element;Argument[this];taint;df-generated |
-| System;ArraySegment<T>;ArraySegment;(T[],System.Int32,System.Int32);Argument[0].Element;Argument[this];taint;df-generated |
+| System;ArraySegment<T>;ArraySegment;(T[]);Argument[0];Argument[this].SyntheticField[System.ArraySegment`1._array];value;dfc-generated |
+| System;ArraySegment<T>;ArraySegment;(T[],System.Int32,System.Int32);Argument[0];Argument[this].SyntheticField[System.ArraySegment`1._array];value;dfc-generated |
 | System;ArraySegment<T>;Clear;();Argument[this].WithoutElement;Argument[this];value;manual |
 | System;ArraySegment<T>;CopyTo;(T[],System.Int32);Argument[this].Element;Argument[0].Element;value;manual |
 | System;ArraySegment<T>;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.Generic.IEnumerator`1.Current];value;manual |
 | System;ArraySegment<T>;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.IEnumerator.Current];value;manual |
-| System;ArraySegment<T>;GetEnumerator;();Argument[this];ReturnValue;taint;df-generated |
+| System;ArraySegment<T>;GetEnumerator;();Argument[this].Property[System.ArraySegment`1.Array];ReturnValue.SyntheticField[System.ArraySegment`1+Enumerator._array];value;dfc-generated |
+| System;ArraySegment<T>;GetEnumerator;();Argument[this].SyntheticField[System.ArraySegment`1._array];ReturnValue.SyntheticField[System.ArraySegment`1+Enumerator._array];value;dfc-generated |
 | System;ArraySegment<T>;Insert;(System.Int32,T);Argument[1];Argument[this].Element;value;manual |
-| System;ArraySegment<T>;Slice;(System.Int32);Argument[this];ReturnValue;taint;df-generated |
-| System;ArraySegment<T>;Slice;(System.Int32,System.Int32);Argument[this];ReturnValue;taint;df-generated |
-| System;ArraySegment<T>;get_Array;();Argument[this];ReturnValue;taint;df-generated |
+| System;ArraySegment<T>;Slice;(System.Int32);Argument[this].SyntheticField[System.ArraySegment`1._array];ReturnValue.SyntheticField[System.ArraySegment`1._array];value;dfc-generated |
+| System;ArraySegment<T>;Slice;(System.Int32,System.Int32);Argument[this].SyntheticField[System.ArraySegment`1._array];ReturnValue.SyntheticField[System.ArraySegment`1._array];value;dfc-generated |
+| System;ArraySegment<T>;get_Array;();Argument[this].SyntheticField[System.ArraySegment`1._array];ReturnValue;value;dfc-generated |
 | System;ArraySegment<T>;get_Item;(System.Int32);Argument[this].Element;ReturnValue;value;manual |
-| System;ArraySegment<T>;get_Item;(System.Int32);Argument[this];ReturnValue;taint;df-generated |
+| System;ArraySegment<T>;get_Item;(System.Int32);Argument[this].SyntheticField[System.ArraySegment`1._array].Element;ReturnValue;value;dfc-generated |
 | System;ArraySegment<T>;set_Item;(System.Int32,T);Argument[1];Argument[this].Element;value;manual |
 | System;AssemblyLoadEventHandler;BeginInvoke;(System.Object,System.AssemblyLoadEventArgs,System.AsyncCallback,System.Object);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
 | System;AsyncCallback;BeginInvoke;(System.IAsyncResult,System.AsyncCallback,System.Object);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
 | System;Attribute;get_TypeId;();Argument[this];ReturnValue;taint;df-generated |
-| System;BadImageFormatException;BadImageFormatException;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);Argument[0];Argument[this];taint;df-generated |
-| System;BadImageFormatException;BadImageFormatException;(System.String,System.String);Argument[1];Argument[this];taint;df-generated |
-| System;BadImageFormatException;BadImageFormatException;(System.String,System.String,System.Exception);Argument[1];Argument[this];taint;df-generated |
+| System;BadImageFormatException;BadImageFormatException;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);Argument[0].SyntheticField[System.Runtime.Serialization.SerializationInfo._values].Element;Argument[this].SyntheticField[System.BadImageFormatException._fileName];value;dfc-generated |
+| System;BadImageFormatException;BadImageFormatException;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);Argument[0].SyntheticField[System.Runtime.Serialization.SerializationInfo._values].Element;Argument[this].SyntheticField[System.BadImageFormatException._fusionLog];value;dfc-generated |
+| System;BadImageFormatException;BadImageFormatException;(System.String,System.String);Argument[1];Argument[this].SyntheticField[System.BadImageFormatException._fileName];value;dfc-generated |
+| System;BadImageFormatException;BadImageFormatException;(System.String,System.String,System.Exception);Argument[1];Argument[this].SyntheticField[System.BadImageFormatException._fileName];value;dfc-generated |
 | System;BadImageFormatException;GetObjectData;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);Argument[this];Argument[0];taint;df-generated |
-| System;BadImageFormatException;get_FileName;();Argument[this];ReturnValue;taint;df-generated |
-| System;BadImageFormatException;get_FusionLog;();Argument[this];ReturnValue;taint;df-generated |
-| System;BadImageFormatException;get_Message;();Argument[this];ReturnValue;taint;df-generated |
+| System;BadImageFormatException;get_FileName;();Argument[this].SyntheticField[System.BadImageFormatException._fileName];ReturnValue;value;dfc-generated |
+| System;BadImageFormatException;get_FusionLog;();Argument[this].SyntheticField[System.BadImageFormatException._fusionLog];ReturnValue;value;dfc-generated |
+| System;BadImageFormatException;get_Message;();Argument[this].SyntheticField[System.Exception._message];ReturnValue;value;dfc-generated |
 | System;Boolean;Parse;(System.String);Argument[0];ReturnValue;taint;manual |
 | System;Boolean;ToDateTime;(System.IFormatProvider);Argument[this];ReturnValue;value;df-generated |
 | System;Boolean;ToDecimal;(System.IFormatProvider);Argument[this];ReturnValue;value;df-generated |
-| System;Boolean;ToString;(System.IFormatProvider);Argument[0];ReturnValue;taint;df-generated |
-| System;Boolean;ToString;(System.IFormatProvider);Argument[this];ReturnValue;value;df-generated |
-| System;Boolean;ToType;(System.Type,System.IFormatProvider);Argument[1];ReturnValue;taint;df-generated |
-| System;Boolean;ToType;(System.Type,System.IFormatProvider);Argument[this];ReturnValue;taint;df-generated |
+| System;Boolean;ToString;(System.IFormatProvider);Argument[this];ReturnValue;value;dfc-generated |
+| System;Boolean;ToType;(System.Type,System.IFormatProvider);Argument[this];ReturnValue;value;dfc-generated |
 | System;Boolean;TryParse;(System.ReadOnlySpan<System.Char>,System.Boolean);Argument[0].Element;Argument[1];taint;manual |
 | System;Boolean;TryParse;(System.ReadOnlySpan<System.Char>,System.Boolean);Argument[0].Element;ReturnValue;taint;manual |
 | System;Boolean;TryParse;(System.String,System.Boolean);Argument[0];Argument[1];taint;manual |
 | System;Boolean;TryParse;(System.String,System.Boolean);Argument[0];ReturnValue;taint;manual |
-| System;Byte;Clamp;(System.Byte,System.Byte,System.Byte);Argument[0];ReturnValue;taint;df-generated |
-| System;Byte;Clamp;(System.Byte,System.Byte,System.Byte);Argument[1];ReturnValue;taint;df-generated |
-| System;Byte;Clamp;(System.Byte,System.Byte,System.Byte);Argument[2];ReturnValue;taint;df-generated |
-| System;Byte;CopySign;(System.Byte,System.Byte);Argument[0];ReturnValue;taint;df-generated |
-| System;Byte;CreateChecked<TOther>;(TOther);Argument[0];ReturnValue;taint;df-generated |
-| System;Byte;CreateSaturating<TOther>;(TOther);Argument[0];ReturnValue;taint;df-generated |
-| System;Byte;CreateTruncating<TOther>;(TOther);Argument[0];ReturnValue;taint;df-generated |
-| System;Byte;Max;(System.Byte,System.Byte);Argument[0];ReturnValue;taint;df-generated |
-| System;Byte;Max;(System.Byte,System.Byte);Argument[1];ReturnValue;taint;df-generated |
-| System;Byte;MaxNumber;(System.Byte,System.Byte);Argument[0];ReturnValue;taint;df-generated |
-| System;Byte;MaxNumber;(System.Byte,System.Byte);Argument[1];ReturnValue;taint;df-generated |
-| System;Byte;Min;(System.Byte,System.Byte);Argument[0];ReturnValue;taint;df-generated |
-| System;Byte;Min;(System.Byte,System.Byte);Argument[1];ReturnValue;taint;df-generated |
-| System;Byte;MinNumber;(System.Byte,System.Byte);Argument[0];ReturnValue;taint;df-generated |
-| System;Byte;MinNumber;(System.Byte,System.Byte);Argument[1];ReturnValue;taint;df-generated |
-| System;Byte;System.Numerics.IAdditionOperators<System.Byte,System.Byte,System.Byte>.op_CheckedAddition;(System.Byte,System.Byte);Argument[0];ReturnValue;taint;df-generated |
-| System;Byte;System.Numerics.IAdditionOperators<System.Byte,System.Byte,System.Byte>.op_CheckedAddition;(System.Byte,System.Byte);Argument[1];ReturnValue;taint;df-generated |
+| System;Byte;Clamp;(System.Byte,System.Byte,System.Byte);Argument[0];ReturnValue;value;dfc-generated |
+| System;Byte;Clamp;(System.Byte,System.Byte,System.Byte);Argument[1];ReturnValue;value;dfc-generated |
+| System;Byte;Clamp;(System.Byte,System.Byte,System.Byte);Argument[2];ReturnValue;value;dfc-generated |
+| System;Byte;CopySign;(System.Byte,System.Byte);Argument[0];ReturnValue;value;dfc-generated |
+| System;Byte;CreateChecked<TOther>;(TOther);Argument[0];ReturnValue;value;dfc-generated |
+| System;Byte;CreateSaturating<TOther>;(TOther);Argument[0];ReturnValue;value;dfc-generated |
+| System;Byte;CreateTruncating<TOther>;(TOther);Argument[0];ReturnValue;value;dfc-generated |
+| System;Byte;Max;(System.Byte,System.Byte);Argument[0];ReturnValue;value;dfc-generated |
+| System;Byte;Max;(System.Byte,System.Byte);Argument[1];ReturnValue;value;dfc-generated |
+| System;Byte;MaxNumber;(System.Byte,System.Byte);Argument[0];ReturnValue;value;dfc-generated |
+| System;Byte;MaxNumber;(System.Byte,System.Byte);Argument[1];ReturnValue;value;dfc-generated |
+| System;Byte;Min;(System.Byte,System.Byte);Argument[0];ReturnValue;value;dfc-generated |
+| System;Byte;Min;(System.Byte,System.Byte);Argument[1];ReturnValue;value;dfc-generated |
+| System;Byte;MinNumber;(System.Byte,System.Byte);Argument[0];ReturnValue;value;dfc-generated |
+| System;Byte;MinNumber;(System.Byte,System.Byte);Argument[1];ReturnValue;value;dfc-generated |
+| System;Byte;System.Numerics.IAdditionOperators<System.Byte,System.Byte,System.Byte>.op_CheckedAddition;(System.Byte,System.Byte);Argument[0];ReturnValue;taint;dfc-generated |
+| System;Byte;System.Numerics.IAdditionOperators<System.Byte,System.Byte,System.Byte>.op_CheckedAddition;(System.Byte,System.Byte);Argument[1];ReturnValue;taint;dfc-generated |
 | System;Byte;ToDateTime;(System.IFormatProvider);Argument[this];ReturnValue;value;df-generated |
 | System;Byte;ToDecimal;(System.IFormatProvider);Argument[this];ReturnValue;value;df-generated |
-| System;Byte;ToString;(System.IFormatProvider);Argument[0];ReturnValue;taint;df-generated |
-| System;Byte;ToString;(System.IFormatProvider);Argument[this];ReturnValue;value;df-generated |
-| System;Byte;ToString;(System.String,System.IFormatProvider);Argument[1];ReturnValue;taint;df-generated |
-| System;Byte;ToString;(System.String,System.IFormatProvider);Argument[this];ReturnValue;taint;df-generated |
-| System;Byte;ToType;(System.Type,System.IFormatProvider);Argument[1];ReturnValue;taint;df-generated |
-| System;Byte;ToType;(System.Type,System.IFormatProvider);Argument[this];ReturnValue;taint;df-generated |
-| System;Char;System.Numerics.IAdditionOperators<System.Char,System.Char,System.Char>.op_CheckedAddition;(System.Char,System.Char);Argument[0];ReturnValue;taint;df-generated |
-| System;Char;System.Numerics.IAdditionOperators<System.Char,System.Char,System.Char>.op_CheckedAddition;(System.Char,System.Char);Argument[1];ReturnValue;taint;df-generated |
+| System;Byte;ToString;(System.IFormatProvider);Argument[this];ReturnValue;value;dfc-generated |
+| System;Byte;ToString;(System.String,System.IFormatProvider);Argument[this];ReturnValue;taint;dfc-generated |
+| System;Byte;ToType;(System.Type,System.IFormatProvider);Argument[this];ReturnValue;value;dfc-generated |
+| System;Char;System.Numerics.IAdditionOperators<System.Char,System.Char,System.Char>.op_CheckedAddition;(System.Char,System.Char);Argument[0];ReturnValue;taint;dfc-generated |
+| System;Char;System.Numerics.IAdditionOperators<System.Char,System.Char,System.Char>.op_CheckedAddition;(System.Char,System.Char);Argument[1];ReturnValue;taint;dfc-generated |
 | System;Char;ToDateTime;(System.IFormatProvider);Argument[this];ReturnValue;value;df-generated |
 | System;Char;ToDecimal;(System.IFormatProvider);Argument[this];ReturnValue;value;df-generated |
-| System;Char;ToString;(System.IFormatProvider);Argument[0];ReturnValue;taint;df-generated |
-| System;Char;ToString;(System.IFormatProvider);Argument[this];ReturnValue;value;df-generated |
-| System;Char;ToString;(System.String,System.IFormatProvider);Argument[1];ReturnValue;taint;df-generated |
-| System;Char;ToString;(System.String,System.IFormatProvider);Argument[this];ReturnValue;taint;df-generated |
-| System;Char;ToType;(System.Type,System.IFormatProvider);Argument[1];ReturnValue;taint;df-generated |
-| System;Char;ToType;(System.Type,System.IFormatProvider);Argument[this];ReturnValue;taint;df-generated |
-| System;CharEnumerator;Clone;();Argument[this];ReturnValue;taint;df-generated |
-| System;CharEnumerator;Clone;();Argument[this];ReturnValue;value;df-generated |
+| System;Char;ToString;(System.IFormatProvider);Argument[this];ReturnValue;value;dfc-generated |
+| System;Char;ToString;(System.String,System.IFormatProvider);Argument[this];ReturnValue;taint;dfc-generated |
+| System;Char;ToType;(System.Type,System.IFormatProvider);Argument[this];ReturnValue;value;dfc-generated |
+| System;CharEnumerator;Clone;();Argument[this];ReturnValue;value;dfc-generated |
 | System;CharEnumerator;get_Current;();Argument[this];ReturnValue;taint;df-generated |
 | System;Comparison<T>;BeginInvoke;(T,T,System.AsyncCallback,System.Object);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
 | System;Console;add_CancelKeyPress;(System.ConsoleCancelEventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
@@ -19728,117 +20627,95 @@ summary
 | System;DBNull;GetObjectData;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);Argument[this];Argument[0];taint;df-generated |
 | System;DBNull;ToDateTime;(System.IFormatProvider);Argument[this];ReturnValue;value;df-generated |
 | System;DBNull;ToDecimal;(System.IFormatProvider);Argument[this];ReturnValue;value;df-generated |
-| System;DBNull;ToString;(System.IFormatProvider);Argument[0];ReturnValue;taint;df-generated |
-| System;DBNull;ToString;(System.IFormatProvider);Argument[this];ReturnValue;value;df-generated |
-| System;DBNull;ToType;(System.Type,System.IFormatProvider);Argument[1];ReturnValue;taint;df-generated |
-| System;DBNull;ToType;(System.Type,System.IFormatProvider);Argument[this];ReturnValue;taint;df-generated |
-| System;DateOnly;ToString;(System.String,System.IFormatProvider);Argument[1];ReturnValue;taint;df-generated |
-| System;DateOnly;ToString;(System.String,System.IFormatProvider);Argument[this];ReturnValue;taint;df-generated |
+| System;DBNull;ToString;(System.IFormatProvider);Argument[this];ReturnValue;value;dfc-generated |
+| System;DBNull;ToType;(System.Type,System.IFormatProvider);Argument[this];ReturnValue;value;dfc-generated |
+| System;DateOnly;ToString;(System.String,System.IFormatProvider);Argument[this];ReturnValue;taint;dfc-generated |
 | System;DateTime;GetObjectData;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);Argument[this];Argument[0];taint;df-generated |
 | System;DateTime;ToDateTime;(System.IFormatProvider);Argument[this];ReturnValue;value;df-generated |
 | System;DateTime;ToDecimal;(System.IFormatProvider);Argument[this];ReturnValue;value;df-generated |
 | System;DateTime;ToLocalTime;();Argument[this];ReturnValue;value;df-generated |
-| System;DateTime;ToString;(System.IFormatProvider);Argument[0];ReturnValue;taint;df-generated |
-| System;DateTime;ToString;(System.IFormatProvider);Argument[this];ReturnValue;value;df-generated |
-| System;DateTime;ToString;(System.String,System.IFormatProvider);Argument[1];ReturnValue;taint;df-generated |
-| System;DateTime;ToString;(System.String,System.IFormatProvider);Argument[this];ReturnValue;taint;df-generated |
-| System;DateTime;ToType;(System.Type,System.IFormatProvider);Argument[1];ReturnValue;taint;df-generated |
-| System;DateTime;ToType;(System.Type,System.IFormatProvider);Argument[this];ReturnValue;taint;df-generated |
-| System;DateTimeOffset;Deconstruct;(System.DateOnly,System.TimeOnly,System.TimeSpan);Argument[this];ReturnValue;taint;df-generated |
+| System;DateTime;ToString;(System.IFormatProvider);Argument[this];ReturnValue;value;dfc-generated |
+| System;DateTime;ToString;(System.String,System.IFormatProvider);Argument[this];ReturnValue;taint;dfc-generated |
+| System;DateTime;ToType;(System.Type,System.IFormatProvider);Argument[this];ReturnValue;value;dfc-generated |
+| System;DateTimeOffset;Deconstruct;(System.DateOnly,System.TimeOnly,System.TimeSpan);Argument[this].Property[System.DateTimeOffset.Offset];ReturnValue;value;dfc-generated |
 | System;DateTimeOffset;GetObjectData;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);Argument[this];Argument[0];taint;df-generated |
-| System;DateTimeOffset;ToString;(System.String,System.IFormatProvider);Argument[1];ReturnValue;taint;df-generated |
-| System;DateTimeOffset;ToString;(System.String,System.IFormatProvider);Argument[this];ReturnValue;taint;df-generated |
-| System;Decimal;Clamp;(System.Decimal,System.Decimal,System.Decimal);Argument[0];ReturnValue;taint;df-generated |
-| System;Decimal;Clamp;(System.Decimal,System.Decimal,System.Decimal);Argument[1];ReturnValue;taint;df-generated |
-| System;Decimal;Clamp;(System.Decimal,System.Decimal,System.Decimal);Argument[2];ReturnValue;taint;df-generated |
-| System;Decimal;CopySign;(System.Decimal,System.Decimal);Argument[0];ReturnValue;taint;df-generated |
-| System;Decimal;CreateChecked<TOther>;(TOther);Argument[0];ReturnValue;taint;df-generated |
-| System;Decimal;CreateSaturating<TOther>;(TOther);Argument[0];ReturnValue;taint;df-generated |
-| System;Decimal;CreateTruncating<TOther>;(TOther);Argument[0];ReturnValue;taint;df-generated |
+| System;DateTimeOffset;ToString;(System.String,System.IFormatProvider);Argument[this];ReturnValue;taint;dfc-generated |
+| System;Decimal;Clamp;(System.Decimal,System.Decimal,System.Decimal);Argument[0];ReturnValue;value;dfc-generated |
+| System;Decimal;Clamp;(System.Decimal,System.Decimal,System.Decimal);Argument[1];ReturnValue;value;dfc-generated |
+| System;Decimal;Clamp;(System.Decimal,System.Decimal,System.Decimal);Argument[2];ReturnValue;value;dfc-generated |
+| System;Decimal;CopySign;(System.Decimal,System.Decimal);Argument[0];ReturnValue;value;dfc-generated |
+| System;Decimal;CreateChecked<TOther>;(TOther);Argument[0];ReturnValue;value;dfc-generated |
+| System;Decimal;CreateSaturating<TOther>;(TOther);Argument[0];ReturnValue;value;dfc-generated |
+| System;Decimal;CreateTruncating<TOther>;(TOther);Argument[0];ReturnValue;value;dfc-generated |
 | System;Decimal;GetObjectData;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);Argument[this];Argument[0];taint;df-generated |
-| System;Decimal;Max;(System.Decimal,System.Decimal);Argument[0];ReturnValue;taint;df-generated |
-| System;Decimal;Max;(System.Decimal,System.Decimal);Argument[1];ReturnValue;taint;df-generated |
-| System;Decimal;MaxNumber;(System.Decimal,System.Decimal);Argument[0];ReturnValue;taint;df-generated |
-| System;Decimal;MaxNumber;(System.Decimal,System.Decimal);Argument[1];ReturnValue;taint;df-generated |
-| System;Decimal;Min;(System.Decimal,System.Decimal);Argument[0];ReturnValue;taint;df-generated |
-| System;Decimal;Min;(System.Decimal,System.Decimal);Argument[1];ReturnValue;taint;df-generated |
-| System;Decimal;MinNumber;(System.Decimal,System.Decimal);Argument[0];ReturnValue;taint;df-generated |
-| System;Decimal;MinNumber;(System.Decimal,System.Decimal);Argument[1];ReturnValue;taint;df-generated |
+| System;Decimal;Max;(System.Decimal,System.Decimal);Argument[0];ReturnValue;value;dfc-generated |
+| System;Decimal;Max;(System.Decimal,System.Decimal);Argument[1];ReturnValue;value;dfc-generated |
+| System;Decimal;MaxNumber;(System.Decimal,System.Decimal);Argument[0];ReturnValue;value;dfc-generated |
+| System;Decimal;MaxNumber;(System.Decimal,System.Decimal);Argument[1];ReturnValue;value;dfc-generated |
+| System;Decimal;Min;(System.Decimal,System.Decimal);Argument[0];ReturnValue;value;dfc-generated |
+| System;Decimal;Min;(System.Decimal,System.Decimal);Argument[1];ReturnValue;value;dfc-generated |
+| System;Decimal;MinNumber;(System.Decimal,System.Decimal);Argument[0];ReturnValue;value;dfc-generated |
+| System;Decimal;MinNumber;(System.Decimal,System.Decimal);Argument[1];ReturnValue;value;dfc-generated |
 | System;Decimal;ToDateTime;(System.IFormatProvider);Argument[this];ReturnValue;value;df-generated |
 | System;Decimal;ToDecimal;(System.IFormatProvider);Argument[this];ReturnValue;value;df-generated |
-| System;Decimal;ToString;(System.IFormatProvider);Argument[0];ReturnValue;taint;df-generated |
-| System;Decimal;ToString;(System.IFormatProvider);Argument[this];ReturnValue;value;df-generated |
-| System;Decimal;ToString;(System.String,System.IFormatProvider);Argument[1];ReturnValue;taint;df-generated |
-| System;Decimal;ToString;(System.String,System.IFormatProvider);Argument[this];ReturnValue;taint;df-generated |
-| System;Decimal;ToType;(System.Type,System.IFormatProvider);Argument[1];ReturnValue;taint;df-generated |
-| System;Decimal;ToType;(System.Type,System.IFormatProvider);Argument[this];ReturnValue;taint;df-generated |
-| System;Delegate;Clone;();Argument[this];ReturnValue;taint;df-generated |
-| System;Delegate;Clone;();Argument[this];ReturnValue;value;df-generated |
-| System;Delegate;Combine;(System.Delegate,System.Delegate);Argument[0];ReturnValue;taint;df-generated |
-| System;Delegate;Combine;(System.Delegate,System.Delegate);Argument[1];ReturnValue;taint;df-generated |
-| System;Delegate;Combine;(System.Delegate[]);Argument[0].Element;ReturnValue;taint;df-generated |
-| System;Delegate;CombineImpl;(System.Delegate);Argument[this];ReturnValue;value;df-generated |
+| System;Decimal;ToString;(System.IFormatProvider);Argument[this];ReturnValue;value;dfc-generated |
+| System;Decimal;ToString;(System.String,System.IFormatProvider);Argument[this];ReturnValue;taint;dfc-generated |
+| System;Decimal;ToType;(System.Type,System.IFormatProvider);Argument[this];ReturnValue;value;dfc-generated |
+| System;Delegate;Clone;();Argument[this];ReturnValue;value;dfc-generated |
+| System;Delegate;Combine;(System.Delegate,System.Delegate);Argument[1];ReturnValue;value;dfc-generated |
+| System;Delegate;Combine;(System.Delegate[]);Argument[0].Element;ReturnValue;value;dfc-generated |
+| System;Delegate;CombineImpl;(System.Delegate);Argument[this];ReturnValue;value;dfc-generated |
 | System;Delegate;CreateDelegate;(System.Type,System.Reflection.MethodInfo,System.Boolean);Argument[1];ReturnValue;taint;df-generated |
-| System;Delegate;Delegate;(System.Object,System.String);Argument[0];Argument[this];taint;df-generated |
-| System;Delegate;Delegate;(System.Object,System.String);Argument[1];Argument[this];taint;df-generated |
+| System;Delegate;Delegate;(System.Object,System.String);Argument[0];Argument[this].SyntheticField[System.Delegate._target];value;dfc-generated |
 | System;Delegate;Delegate;(System.Type,System.String);Argument[1];Argument[this];taint;df-generated |
-| System;Delegate;DynamicInvoke;(System.Object[]);Argument[this];Argument[0].Element;taint;df-generated |
-| System;Delegate;DynamicInvokeImpl;(System.Object[]);Argument[this];Argument[0].Element;taint;df-generated |
-| System;Delegate;GetInvocationList;();Argument[this];ReturnValue;taint;df-generated |
+| System;Delegate;DynamicInvoke;(System.Object[]);Argument[this].SyntheticField[System.Delegate._target];Argument[0].Element;value;dfc-generated |
+| System;Delegate;DynamicInvokeImpl;(System.Object[]);Argument[this].SyntheticField[System.Delegate._target];Argument[0].Element;value;dfc-generated |
+| System;Delegate;GetInvocationList;();Argument[this];ReturnValue.Element;value;dfc-generated |
 | System;Delegate;GetMethodImpl;();Argument[this];ReturnValue;taint;df-generated |
 | System;Delegate;GetObjectData;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);Argument[this];Argument[0];taint;df-generated |
-| System;Delegate;Remove;(System.Delegate,System.Delegate);Argument[0];ReturnValue;taint;df-generated |
-| System;Delegate;RemoveAll;(System.Delegate,System.Delegate);Argument[0];ReturnValue;taint;df-generated |
-| System;Delegate;RemoveImpl;(System.Delegate);Argument[this];ReturnValue;taint;df-generated |
-| System;Delegate;RemoveImpl;(System.Delegate);Argument[this];ReturnValue;value;df-generated |
-| System;Delegate;get_Method;();Argument[this];ReturnValue;taint;df-generated |
-| System;Delegate;get_Target;();Argument[this];ReturnValue;taint;df-generated |
-| System;Double;Clamp;(System.Double,System.Double,System.Double);Argument[0];ReturnValue;taint;df-generated |
-| System;Double;Clamp;(System.Double,System.Double,System.Double);Argument[1];ReturnValue;taint;df-generated |
-| System;Double;Clamp;(System.Double,System.Double,System.Double);Argument[2];ReturnValue;taint;df-generated |
-| System;Double;CopySign;(System.Double,System.Double);Argument[0];ReturnValue;taint;df-generated |
-| System;Double;CreateChecked<TOther>;(TOther);Argument[0];ReturnValue;taint;df-generated |
-| System;Double;CreateSaturating<TOther>;(TOther);Argument[0];ReturnValue;taint;df-generated |
-| System;Double;CreateTruncating<TOther>;(TOther);Argument[0];ReturnValue;taint;df-generated |
-| System;Double;Max;(System.Double,System.Double);Argument[0];ReturnValue;taint;df-generated |
-| System;Double;Max;(System.Double,System.Double);Argument[1];ReturnValue;taint;df-generated |
-| System;Double;MaxNumber;(System.Double,System.Double);Argument[0];ReturnValue;taint;df-generated |
-| System;Double;MaxNumber;(System.Double,System.Double);Argument[1];ReturnValue;taint;df-generated |
-| System;Double;Min;(System.Double,System.Double);Argument[0];ReturnValue;taint;df-generated |
-| System;Double;Min;(System.Double,System.Double);Argument[1];ReturnValue;taint;df-generated |
-| System;Double;MinNumber;(System.Double,System.Double);Argument[0];ReturnValue;taint;df-generated |
-| System;Double;MinNumber;(System.Double,System.Double);Argument[1];ReturnValue;taint;df-generated |
+| System;Delegate;Remove;(System.Delegate,System.Delegate);Argument[0];ReturnValue;value;dfc-generated |
+| System;Delegate;RemoveAll;(System.Delegate,System.Delegate);Argument[0];ReturnValue;value;dfc-generated |
+| System;Delegate;RemoveImpl;(System.Delegate);Argument[this];ReturnValue;value;dfc-generated |
+| System;Delegate;get_Target;();Argument[this].SyntheticField[System.Delegate._target];ReturnValue;value;dfc-generated |
+| System;Double;Clamp;(System.Double,System.Double,System.Double);Argument[0];ReturnValue;value;dfc-generated |
+| System;Double;Clamp;(System.Double,System.Double,System.Double);Argument[1];ReturnValue;value;dfc-generated |
+| System;Double;Clamp;(System.Double,System.Double,System.Double);Argument[2];ReturnValue;value;dfc-generated |
+| System;Double;CopySign;(System.Double,System.Double);Argument[0];ReturnValue;value;dfc-generated |
+| System;Double;CreateChecked<TOther>;(TOther);Argument[0];ReturnValue;value;dfc-generated |
+| System;Double;CreateSaturating<TOther>;(TOther);Argument[0];ReturnValue;value;dfc-generated |
+| System;Double;CreateTruncating<TOther>;(TOther);Argument[0];ReturnValue;value;dfc-generated |
+| System;Double;Max;(System.Double,System.Double);Argument[0];ReturnValue;value;dfc-generated |
+| System;Double;Max;(System.Double,System.Double);Argument[1];ReturnValue;value;dfc-generated |
+| System;Double;MaxNumber;(System.Double,System.Double);Argument[0];ReturnValue;value;dfc-generated |
+| System;Double;MaxNumber;(System.Double,System.Double);Argument[1];ReturnValue;value;dfc-generated |
+| System;Double;Min;(System.Double,System.Double);Argument[0];ReturnValue;value;dfc-generated |
+| System;Double;Min;(System.Double,System.Double);Argument[1];ReturnValue;value;dfc-generated |
+| System;Double;MinNumber;(System.Double,System.Double);Argument[0];ReturnValue;value;dfc-generated |
+| System;Double;MinNumber;(System.Double,System.Double);Argument[1];ReturnValue;value;dfc-generated |
 | System;Double;ToDateTime;(System.IFormatProvider);Argument[this];ReturnValue;value;df-generated |
 | System;Double;ToDecimal;(System.IFormatProvider);Argument[this];ReturnValue;value;df-generated |
-| System;Double;ToString;(System.IFormatProvider);Argument[0];ReturnValue;taint;df-generated |
-| System;Double;ToString;(System.IFormatProvider);Argument[this];ReturnValue;value;df-generated |
-| System;Double;ToString;(System.String,System.IFormatProvider);Argument[1];ReturnValue;taint;df-generated |
-| System;Double;ToString;(System.String,System.IFormatProvider);Argument[this];ReturnValue;taint;df-generated |
-| System;Double;ToType;(System.Type,System.IFormatProvider);Argument[1];ReturnValue;taint;df-generated |
-| System;Double;ToType;(System.Type,System.IFormatProvider);Argument[this];ReturnValue;taint;df-generated |
+| System;Double;ToString;(System.IFormatProvider);Argument[this];ReturnValue;value;dfc-generated |
+| System;Double;ToString;(System.String,System.IFormatProvider);Argument[this];ReturnValue;taint;dfc-generated |
+| System;Double;ToType;(System.Type,System.IFormatProvider);Argument[this];ReturnValue;value;dfc-generated |
 | System;Enum;ToDateTime;(System.IFormatProvider);Argument[this];ReturnValue;value;df-generated |
 | System;Enum;ToDecimal;(System.IFormatProvider);Argument[this];ReturnValue;value;df-generated |
-| System;Enum;ToString;(System.IFormatProvider);Argument[0];ReturnValue;taint;df-generated |
-| System;Enum;ToString;(System.IFormatProvider);Argument[this];ReturnValue;value;df-generated |
-| System;Enum;ToString;(System.String,System.IFormatProvider);Argument[1];ReturnValue;taint;df-generated |
-| System;Enum;ToString;(System.String,System.IFormatProvider);Argument[this];ReturnValue;taint;df-generated |
-| System;Enum;ToType;(System.Type,System.IFormatProvider);Argument[1];ReturnValue;taint;df-generated |
-| System;Enum;ToType;(System.Type,System.IFormatProvider);Argument[this];ReturnValue;taint;df-generated |
-| System;Environment;ExpandEnvironmentVariables;(System.String);Argument[0];ReturnValue;taint;df-generated |
+| System;Enum;ToString;(System.IFormatProvider);Argument[this];ReturnValue;value;dfc-generated |
+| System;Enum;ToString;(System.String,System.IFormatProvider);Argument[this];ReturnValue;taint;dfc-generated |
+| System;Enum;ToType;(System.Type,System.IFormatProvider);Argument[this];ReturnValue;value;dfc-generated |
+| System;Environment;ExpandEnvironmentVariables;(System.String);Argument[0];ReturnValue;value;dfc-generated |
 | System;EventHandler;BeginInvoke;(System.Object,System.EventArgs,System.AsyncCallback,System.Object);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
 | System;EventHandler<TEventArgs>;BeginInvoke;(System.Object,TEventArgs,System.AsyncCallback,System.Object);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
 | System;Exception;Exception;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);Argument[0];Argument[this];taint;df-generated |
-| System;Exception;Exception;(System.String);Argument[0];Argument[this];taint;df-generated |
-| System;Exception;Exception;(System.String,System.Exception);Argument[0];Argument[this];taint;df-generated |
-| System;Exception;Exception;(System.String,System.Exception);Argument[1];Argument[this];taint;df-generated |
+| System;Exception;Exception;(System.String);Argument[0];Argument[this].SyntheticField[System.Exception._message];value;dfc-generated |
+| System;Exception;Exception;(System.String,System.Exception);Argument[0];Argument[this].SyntheticField[System.Exception._message];value;dfc-generated |
+| System;Exception;Exception;(System.String,System.Exception);Argument[1];Argument[this].SyntheticField[System.Exception._innerException];value;dfc-generated |
 | System;Exception;GetBaseException;();Argument[this];ReturnValue;taint;df-generated |
 | System;Exception;GetObjectData;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);Argument[this];Argument[0];taint;df-generated |
 | System;Exception;ToString;();Argument[this];ReturnValue;taint;df-generated |
 | System;Exception;add_SerializeObjectState;(System.EventHandler<System.Runtime.Serialization.SafeSerializationEventArgs>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
-| System;Exception;get_InnerException;();Argument[this];ReturnValue;taint;df-generated |
-| System;Exception;get_Message;();Argument[this];ReturnValue;taint;df-generated |
-| System;Exception;get_StackTrace;();Argument[this];ReturnValue;taint;df-generated |
-| System;Exception;get_TargetSite;();Argument[this];ReturnValue;taint;df-generated |
+| System;Exception;get_InnerException;();Argument[this].SyntheticField[System.Exception._innerException];ReturnValue;value;dfc-generated |
+| System;Exception;get_Message;();Argument[this].SyntheticField[System.Exception._message];ReturnValue;value;dfc-generated |
+| System;Exception;get_StackTrace;();Argument[this].SyntheticField[System.Exception._remoteStackTraceString];ReturnValue;value;dfc-generated |
 | System;Exception;remove_SerializeObjectState;(System.EventHandler<System.Runtime.Serialization.SafeSerializationEventArgs>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System;FormattableString;CurrentCulture;(System.FormattableString);Argument[0];ReturnValue;taint;df-generated |
 | System;FormattableString;GetArgument;(System.Int32);Argument[this];ReturnValue;taint;df-generated |
@@ -19846,8 +20723,7 @@ summary
 | System;FormattableString;Invariant;(System.FormattableString);Argument[0];ReturnValue;taint;df-generated |
 | System;FormattableString;ToString;();Argument[this];ReturnValue;taint;df-generated |
 | System;FormattableString;ToString;(System.IFormatProvider);Argument[this];ReturnValue;taint;df-generated |
-| System;FormattableString;ToString;(System.String,System.IFormatProvider);Argument[1];ReturnValue;taint;df-generated |
-| System;FormattableString;ToString;(System.String,System.IFormatProvider);Argument[this];ReturnValue;taint;df-generated |
+| System;FormattableString;ToString;(System.String,System.IFormatProvider);Argument[this];ReturnValue;taint;dfc-generated |
 | System;FormattableString;get_Format;();Argument[this];ReturnValue;taint;df-generated |
 | System;Func<T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,TResult>;BeginInvoke;(T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,System.AsyncCallback,System.Object);Argument[16];Argument[16].Parameter[delegate-self];value;hq-generated |
 | System;Func<T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,TResult>;BeginInvoke;(T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,System.AsyncCallback,System.Object);Argument[15];Argument[15].Parameter[delegate-self];value;hq-generated |
@@ -19869,102 +20745,91 @@ summary
 | System;GC;RegisterNoGCRegionCallback;(System.Int64,System.Action);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
 | System;GCMemoryInfo;get_GenerationInfo;();Argument[this];ReturnValue;taint;df-generated |
 | System;GCMemoryInfo;get_PauseDurations;();Argument[this];ReturnValue;taint;df-generated |
-| System;Guid;ToString;(System.String,System.IFormatProvider);Argument[1];ReturnValue;taint;df-generated |
-| System;Guid;ToString;(System.String,System.IFormatProvider);Argument[this];ReturnValue;taint;df-generated |
-| System;Half;BitDecrement;(System.Half);Argument[0];ReturnValue;taint;df-generated |
-| System;Half;BitIncrement;(System.Half);Argument[0];ReturnValue;taint;df-generated |
-| System;Half;Clamp;(System.Half,System.Half,System.Half);Argument[0];ReturnValue;taint;df-generated |
-| System;Half;Clamp;(System.Half,System.Half,System.Half);Argument[1];ReturnValue;taint;df-generated |
-| System;Half;Clamp;(System.Half,System.Half,System.Half);Argument[2];ReturnValue;taint;df-generated |
-| System;Half;CopySign;(System.Half,System.Half);Argument[0];ReturnValue;taint;df-generated |
-| System;Half;CreateChecked<TOther>;(TOther);Argument[0];ReturnValue;taint;df-generated |
-| System;Half;CreateSaturating<TOther>;(TOther);Argument[0];ReturnValue;taint;df-generated |
-| System;Half;CreateTruncating<TOther>;(TOther);Argument[0];ReturnValue;taint;df-generated |
-| System;Half;Max;(System.Half,System.Half);Argument[0];ReturnValue;taint;df-generated |
-| System;Half;Max;(System.Half,System.Half);Argument[1];ReturnValue;taint;df-generated |
-| System;Half;MaxMagnitudeNumber;(System.Half,System.Half);Argument[0];ReturnValue;taint;df-generated |
-| System;Half;MaxMagnitudeNumber;(System.Half,System.Half);Argument[1];ReturnValue;taint;df-generated |
-| System;Half;MaxNumber;(System.Half,System.Half);Argument[0];ReturnValue;taint;df-generated |
-| System;Half;MaxNumber;(System.Half,System.Half);Argument[1];ReturnValue;taint;df-generated |
-| System;Half;Min;(System.Half,System.Half);Argument[0];ReturnValue;taint;df-generated |
-| System;Half;Min;(System.Half,System.Half);Argument[1];ReturnValue;taint;df-generated |
-| System;Half;MinMagnitudeNumber;(System.Half,System.Half);Argument[0];ReturnValue;taint;df-generated |
-| System;Half;MinMagnitudeNumber;(System.Half,System.Half);Argument[1];ReturnValue;taint;df-generated |
-| System;Half;MinNumber;(System.Half,System.Half);Argument[0];ReturnValue;taint;df-generated |
-| System;Half;MinNumber;(System.Half,System.Half);Argument[1];ReturnValue;taint;df-generated |
+| System;Guid;ToString;(System.String,System.IFormatProvider);Argument[this];ReturnValue;taint;dfc-generated |
+| System;Half;BitDecrement;(System.Half);Argument[0];ReturnValue;value;dfc-generated |
+| System;Half;BitIncrement;(System.Half);Argument[0];ReturnValue;value;dfc-generated |
+| System;Half;Clamp;(System.Half,System.Half,System.Half);Argument[0];ReturnValue;value;dfc-generated |
+| System;Half;Clamp;(System.Half,System.Half,System.Half);Argument[1];ReturnValue;value;dfc-generated |
+| System;Half;Clamp;(System.Half,System.Half,System.Half);Argument[2];ReturnValue;value;dfc-generated |
+| System;Half;CopySign;(System.Half,System.Half);Argument[0];ReturnValue;value;dfc-generated |
+| System;Half;CreateChecked<TOther>;(TOther);Argument[0];ReturnValue;value;dfc-generated |
+| System;Half;CreateSaturating<TOther>;(TOther);Argument[0];ReturnValue;value;dfc-generated |
+| System;Half;CreateTruncating<TOther>;(TOther);Argument[0];ReturnValue;value;dfc-generated |
+| System;Half;Max;(System.Half,System.Half);Argument[0];ReturnValue;value;dfc-generated |
+| System;Half;Max;(System.Half,System.Half);Argument[1];ReturnValue;value;dfc-generated |
+| System;Half;MaxMagnitudeNumber;(System.Half,System.Half);Argument[0];ReturnValue;value;dfc-generated |
+| System;Half;MaxMagnitudeNumber;(System.Half,System.Half);Argument[1];ReturnValue;value;dfc-generated |
+| System;Half;MaxNumber;(System.Half,System.Half);Argument[0];ReturnValue;value;dfc-generated |
+| System;Half;MaxNumber;(System.Half,System.Half);Argument[1];ReturnValue;value;dfc-generated |
+| System;Half;Min;(System.Half,System.Half);Argument[0];ReturnValue;value;dfc-generated |
+| System;Half;Min;(System.Half,System.Half);Argument[1];ReturnValue;value;dfc-generated |
+| System;Half;MinMagnitudeNumber;(System.Half,System.Half);Argument[0];ReturnValue;value;dfc-generated |
+| System;Half;MinMagnitudeNumber;(System.Half,System.Half);Argument[1];ReturnValue;value;dfc-generated |
+| System;Half;MinNumber;(System.Half,System.Half);Argument[0];ReturnValue;value;dfc-generated |
+| System;Half;MinNumber;(System.Half,System.Half);Argument[1];ReturnValue;value;dfc-generated |
 | System;Half;ToString;(System.IFormatProvider);Argument[0];ReturnValue;taint;df-generated |
-| System;Half;ToString;(System.String,System.IFormatProvider);Argument[1];ReturnValue;taint;df-generated |
-| System;Half;ToString;(System.String,System.IFormatProvider);Argument[this];ReturnValue;taint;df-generated |
+| System;Half;ToString;(System.String,System.IFormatProvider);Argument[this];ReturnValue;taint;dfc-generated |
+| System;HashCode;Add<T>;(T,System.Collections.Generic.IEqualityComparer<T>);Argument[0];Argument[1];taint;df-generated |
 | System;IAsyncDisposable;DisposeAsync;();Argument[this];ReturnValue;taint;df-generated |
 | System;IAsyncResult;get_AsyncState;();Argument[this];ReturnValue;taint;df-generated |
 | System;IAsyncResult;get_AsyncWaitHandle;();Argument[this];ReturnValue;taint;df-generated |
-| System;ICloneable;Clone;();Argument[this];ReturnValue;taint;df-generated |
-| System;ICloneable;Clone;();Argument[this];ReturnValue;value;df-generated |
+| System;ICloneable;Clone;();Argument[this];ReturnValue;value;dfc-generated |
 | System;IConvertible;ToDateTime;(System.IFormatProvider);Argument[this];ReturnValue;value;df-generated |
 | System;IConvertible;ToDecimal;(System.IFormatProvider);Argument[this];ReturnValue;value;df-generated |
-| System;IConvertible;ToString;(System.IFormatProvider);Argument[0];ReturnValue;taint;df-generated |
-| System;IConvertible;ToString;(System.IFormatProvider);Argument[this];ReturnValue;value;df-generated |
-| System;IConvertible;ToType;(System.Type,System.IFormatProvider);Argument[1];ReturnValue;taint;df-generated |
-| System;IConvertible;ToType;(System.Type,System.IFormatProvider);Argument[this];ReturnValue;taint;df-generated |
-| System;IFormatProvider;GetFormat;(System.Type);Argument[this];ReturnValue;taint;df-generated |
-| System;IFormattable;ToString;(System.String,System.IFormatProvider);Argument[1];ReturnValue;taint;df-generated |
-| System;IFormattable;ToString;(System.String,System.IFormatProvider);Argument[this];ReturnValue;taint;df-generated |
-| System;IServiceProvider;GetService;(System.Type);Argument[this];ReturnValue;taint;df-generated |
-| System;Int16;Clamp;(System.Int16,System.Int16,System.Int16);Argument[0];ReturnValue;taint;df-generated |
-| System;Int16;Clamp;(System.Int16,System.Int16,System.Int16);Argument[1];ReturnValue;taint;df-generated |
-| System;Int16;Clamp;(System.Int16,System.Int16,System.Int16);Argument[2];ReturnValue;taint;df-generated |
-| System;Int16;CopySign;(System.Int16,System.Int16);Argument[0];ReturnValue;taint;df-generated |
-| System;Int16;CreateChecked<TOther>;(TOther);Argument[0];ReturnValue;taint;df-generated |
-| System;Int16;CreateSaturating<TOther>;(TOther);Argument[0];ReturnValue;taint;df-generated |
-| System;Int16;CreateTruncating<TOther>;(TOther);Argument[0];ReturnValue;taint;df-generated |
-| System;Int16;Max;(System.Int16,System.Int16);Argument[0];ReturnValue;taint;df-generated |
-| System;Int16;Max;(System.Int16,System.Int16);Argument[1];ReturnValue;taint;df-generated |
-| System;Int16;MaxNumber;(System.Int16,System.Int16);Argument[0];ReturnValue;taint;df-generated |
-| System;Int16;MaxNumber;(System.Int16,System.Int16);Argument[1];ReturnValue;taint;df-generated |
-| System;Int16;Min;(System.Int16,System.Int16);Argument[0];ReturnValue;taint;df-generated |
-| System;Int16;Min;(System.Int16,System.Int16);Argument[1];ReturnValue;taint;df-generated |
-| System;Int16;MinNumber;(System.Int16,System.Int16);Argument[0];ReturnValue;taint;df-generated |
-| System;Int16;MinNumber;(System.Int16,System.Int16);Argument[1];ReturnValue;taint;df-generated |
-| System;Int16;System.Numerics.IAdditionOperators<System.Int16,System.Int16,System.Int16>.op_CheckedAddition;(System.Int16,System.Int16);Argument[0];ReturnValue;taint;df-generated |
-| System;Int16;System.Numerics.IAdditionOperators<System.Int16,System.Int16,System.Int16>.op_CheckedAddition;(System.Int16,System.Int16);Argument[1];ReturnValue;taint;df-generated |
+| System;IConvertible;ToString;(System.IFormatProvider);Argument[this];ReturnValue;value;dfc-generated |
+| System;IConvertible;ToType;(System.Type,System.IFormatProvider);Argument[this];ReturnValue;value;dfc-generated |
+| System;IFormatProvider;GetFormat;(System.Type);Argument[this];ReturnValue;value;dfc-generated |
+| System;IFormattable;ToString;(System.String,System.IFormatProvider);Argument[this];ReturnValue;taint;dfc-generated |
+| System;IServiceProvider;GetService;(System.Type);Argument[this];ReturnValue;value;dfc-generated |
+| System;Int16;Clamp;(System.Int16,System.Int16,System.Int16);Argument[0];ReturnValue;value;dfc-generated |
+| System;Int16;Clamp;(System.Int16,System.Int16,System.Int16);Argument[1];ReturnValue;value;dfc-generated |
+| System;Int16;Clamp;(System.Int16,System.Int16,System.Int16);Argument[2];ReturnValue;value;dfc-generated |
+| System;Int16;CopySign;(System.Int16,System.Int16);Argument[0];ReturnValue;value;dfc-generated |
+| System;Int16;CreateChecked<TOther>;(TOther);Argument[0];ReturnValue;value;dfc-generated |
+| System;Int16;CreateSaturating<TOther>;(TOther);Argument[0];ReturnValue;value;dfc-generated |
+| System;Int16;CreateTruncating<TOther>;(TOther);Argument[0];ReturnValue;value;dfc-generated |
+| System;Int16;Max;(System.Int16,System.Int16);Argument[0];ReturnValue;value;dfc-generated |
+| System;Int16;Max;(System.Int16,System.Int16);Argument[1];ReturnValue;value;dfc-generated |
+| System;Int16;MaxNumber;(System.Int16,System.Int16);Argument[0];ReturnValue;value;dfc-generated |
+| System;Int16;MaxNumber;(System.Int16,System.Int16);Argument[1];ReturnValue;value;dfc-generated |
+| System;Int16;Min;(System.Int16,System.Int16);Argument[0];ReturnValue;value;dfc-generated |
+| System;Int16;Min;(System.Int16,System.Int16);Argument[1];ReturnValue;value;dfc-generated |
+| System;Int16;MinNumber;(System.Int16,System.Int16);Argument[0];ReturnValue;value;dfc-generated |
+| System;Int16;MinNumber;(System.Int16,System.Int16);Argument[1];ReturnValue;value;dfc-generated |
+| System;Int16;System.Numerics.IAdditionOperators<System.Int16,System.Int16,System.Int16>.op_CheckedAddition;(System.Int16,System.Int16);Argument[0];ReturnValue;taint;dfc-generated |
+| System;Int16;System.Numerics.IAdditionOperators<System.Int16,System.Int16,System.Int16>.op_CheckedAddition;(System.Int16,System.Int16);Argument[1];ReturnValue;taint;dfc-generated |
 | System;Int16;ToDateTime;(System.IFormatProvider);Argument[this];ReturnValue;value;df-generated |
 | System;Int16;ToDecimal;(System.IFormatProvider);Argument[this];ReturnValue;value;df-generated |
-| System;Int16;ToString;(System.IFormatProvider);Argument[0];ReturnValue;taint;df-generated |
-| System;Int16;ToString;(System.IFormatProvider);Argument[this];ReturnValue;value;df-generated |
-| System;Int16;ToString;(System.String,System.IFormatProvider);Argument[1];ReturnValue;taint;df-generated |
-| System;Int16;ToString;(System.String,System.IFormatProvider);Argument[this];ReturnValue;taint;df-generated |
-| System;Int16;ToType;(System.Type,System.IFormatProvider);Argument[1];ReturnValue;taint;df-generated |
-| System;Int16;ToType;(System.Type,System.IFormatProvider);Argument[this];ReturnValue;taint;df-generated |
-| System;Int32;Clamp;(System.Int32,System.Int32,System.Int32);Argument[0];ReturnValue;taint;df-generated |
-| System;Int32;Clamp;(System.Int32,System.Int32,System.Int32);Argument[1];ReturnValue;taint;df-generated |
-| System;Int32;Clamp;(System.Int32,System.Int32,System.Int32);Argument[2];ReturnValue;taint;df-generated |
-| System;Int32;CopySign;(System.Int32,System.Int32);Argument[0];ReturnValue;taint;df-generated |
-| System;Int32;CreateChecked<TOther>;(TOther);Argument[0];ReturnValue;taint;df-generated |
-| System;Int32;CreateSaturating<TOther>;(TOther);Argument[0];ReturnValue;taint;df-generated |
-| System;Int32;CreateTruncating<TOther>;(TOther);Argument[0];ReturnValue;taint;df-generated |
-| System;Int32;Max;(System.Int32,System.Int32);Argument[0];ReturnValue;taint;df-generated |
-| System;Int32;Max;(System.Int32,System.Int32);Argument[1];ReturnValue;taint;df-generated |
-| System;Int32;MaxNumber;(System.Int32,System.Int32);Argument[0];ReturnValue;taint;df-generated |
-| System;Int32;MaxNumber;(System.Int32,System.Int32);Argument[1];ReturnValue;taint;df-generated |
-| System;Int32;Min;(System.Int32,System.Int32);Argument[0];ReturnValue;taint;df-generated |
-| System;Int32;Min;(System.Int32,System.Int32);Argument[1];ReturnValue;taint;df-generated |
-| System;Int32;MinNumber;(System.Int32,System.Int32);Argument[0];ReturnValue;taint;df-generated |
-| System;Int32;MinNumber;(System.Int32,System.Int32);Argument[1];ReturnValue;taint;df-generated |
+| System;Int16;ToString;(System.IFormatProvider);Argument[this];ReturnValue;value;dfc-generated |
+| System;Int16;ToString;(System.String,System.IFormatProvider);Argument[this];ReturnValue;taint;dfc-generated |
+| System;Int16;ToType;(System.Type,System.IFormatProvider);Argument[this];ReturnValue;value;dfc-generated |
+| System;Int32;Clamp;(System.Int32,System.Int32,System.Int32);Argument[0];ReturnValue;value;dfc-generated |
+| System;Int32;Clamp;(System.Int32,System.Int32,System.Int32);Argument[1];ReturnValue;value;dfc-generated |
+| System;Int32;Clamp;(System.Int32,System.Int32,System.Int32);Argument[2];ReturnValue;value;dfc-generated |
+| System;Int32;CopySign;(System.Int32,System.Int32);Argument[0];ReturnValue;value;dfc-generated |
+| System;Int32;CreateChecked<TOther>;(TOther);Argument[0];ReturnValue;value;dfc-generated |
+| System;Int32;CreateSaturating<TOther>;(TOther);Argument[0];ReturnValue;value;dfc-generated |
+| System;Int32;CreateTruncating<TOther>;(TOther);Argument[0];ReturnValue;value;dfc-generated |
+| System;Int32;Max;(System.Int32,System.Int32);Argument[0];ReturnValue;value;dfc-generated |
+| System;Int32;Max;(System.Int32,System.Int32);Argument[1];ReturnValue;value;dfc-generated |
+| System;Int32;MaxNumber;(System.Int32,System.Int32);Argument[0];ReturnValue;value;dfc-generated |
+| System;Int32;MaxNumber;(System.Int32,System.Int32);Argument[1];ReturnValue;value;dfc-generated |
+| System;Int32;Min;(System.Int32,System.Int32);Argument[0];ReturnValue;value;dfc-generated |
+| System;Int32;Min;(System.Int32,System.Int32);Argument[1];ReturnValue;value;dfc-generated |
+| System;Int32;MinNumber;(System.Int32,System.Int32);Argument[0];ReturnValue;value;dfc-generated |
+| System;Int32;MinNumber;(System.Int32,System.Int32);Argument[1];ReturnValue;value;dfc-generated |
 | System;Int32;Parse;(System.ReadOnlySpan<System.Char>,System.Globalization.NumberStyles,System.IFormatProvider);Argument[0].Element;ReturnValue;taint;manual |
 | System;Int32;Parse;(System.String);Argument[0];ReturnValue;taint;manual |
 | System;Int32;Parse;(System.String,System.Globalization.NumberStyles);Argument[0];ReturnValue;taint;manual |
 | System;Int32;Parse;(System.String,System.Globalization.NumberStyles,System.IFormatProvider);Argument[0];ReturnValue;taint;manual |
 | System;Int32;Parse;(System.String,System.IFormatProvider);Argument[0];ReturnValue;taint;manual |
-| System;Int32;System.Numerics.IAdditionOperators<System.Int32,System.Int32,System.Int32>.op_CheckedAddition;(System.Int32,System.Int32);Argument[0];ReturnValue;taint;df-generated |
-| System;Int32;System.Numerics.IAdditionOperators<System.Int32,System.Int32,System.Int32>.op_CheckedAddition;(System.Int32,System.Int32);Argument[1];ReturnValue;taint;df-generated |
+| System;Int32;System.Numerics.IAdditionOperators<System.Int32,System.Int32,System.Int32>.op_CheckedAddition;(System.Int32,System.Int32);Argument[0];ReturnValue;taint;dfc-generated |
+| System;Int32;System.Numerics.IAdditionOperators<System.Int32,System.Int32,System.Int32>.op_CheckedAddition;(System.Int32,System.Int32);Argument[1];ReturnValue;taint;dfc-generated |
 | System;Int32;ToDateTime;(System.IFormatProvider);Argument[this];ReturnValue;value;df-generated |
 | System;Int32;ToDecimal;(System.IFormatProvider);Argument[this];ReturnValue;value;df-generated |
-| System;Int32;ToString;(System.IFormatProvider);Argument[0];ReturnValue;taint;df-generated |
-| System;Int32;ToString;(System.IFormatProvider);Argument[this];ReturnValue;value;df-generated |
-| System;Int32;ToString;(System.String,System.IFormatProvider);Argument[1];ReturnValue;taint;df-generated |
-| System;Int32;ToString;(System.String,System.IFormatProvider);Argument[this];ReturnValue;taint;df-generated |
-| System;Int32;ToType;(System.Type,System.IFormatProvider);Argument[1];ReturnValue;taint;df-generated |
-| System;Int32;ToType;(System.Type,System.IFormatProvider);Argument[this];ReturnValue;taint;df-generated |
+| System;Int32;ToString;(System.IFormatProvider);Argument[this];ReturnValue;value;dfc-generated |
+| System;Int32;ToString;(System.String,System.IFormatProvider);Argument[this];ReturnValue;taint;dfc-generated |
+| System;Int32;ToType;(System.Type,System.IFormatProvider);Argument[this];ReturnValue;value;dfc-generated |
 | System;Int32;TryParse;(System.ReadOnlySpan<System.Char>,System.Globalization.NumberStyles,System.IFormatProvider,System.Int32);Argument[0].Element;Argument[3];taint;manual |
 | System;Int32;TryParse;(System.ReadOnlySpan<System.Char>,System.Globalization.NumberStyles,System.IFormatProvider,System.Int32);Argument[0].Element;ReturnValue;taint;manual |
 | System;Int32;TryParse;(System.ReadOnlySpan<System.Char>,System.Int32);Argument[0].Element;Argument[1];taint;manual |
@@ -19973,99 +20838,103 @@ summary
 | System;Int32;TryParse;(System.String,System.Globalization.NumberStyles,System.IFormatProvider,System.Int32);Argument[0];ReturnValue;taint;manual |
 | System;Int32;TryParse;(System.String,System.Int32);Argument[0];Argument[1];taint;manual |
 | System;Int32;TryParse;(System.String,System.Int32);Argument[0];ReturnValue;taint;manual |
-| System;Int64;Clamp;(System.Int64,System.Int64,System.Int64);Argument[0];ReturnValue;taint;df-generated |
-| System;Int64;Clamp;(System.Int64,System.Int64,System.Int64);Argument[1];ReturnValue;taint;df-generated |
-| System;Int64;Clamp;(System.Int64,System.Int64,System.Int64);Argument[2];ReturnValue;taint;df-generated |
-| System;Int64;CopySign;(System.Int64,System.Int64);Argument[0];ReturnValue;taint;df-generated |
-| System;Int64;CreateChecked<TOther>;(TOther);Argument[0];ReturnValue;taint;df-generated |
-| System;Int64;CreateSaturating<TOther>;(TOther);Argument[0];ReturnValue;taint;df-generated |
-| System;Int64;CreateTruncating<TOther>;(TOther);Argument[0];ReturnValue;taint;df-generated |
-| System;Int64;Max;(System.Int64,System.Int64);Argument[0];ReturnValue;taint;df-generated |
-| System;Int64;Max;(System.Int64,System.Int64);Argument[1];ReturnValue;taint;df-generated |
-| System;Int64;MaxNumber;(System.Int64,System.Int64);Argument[0];ReturnValue;taint;df-generated |
-| System;Int64;MaxNumber;(System.Int64,System.Int64);Argument[1];ReturnValue;taint;df-generated |
-| System;Int64;Min;(System.Int64,System.Int64);Argument[0];ReturnValue;taint;df-generated |
-| System;Int64;Min;(System.Int64,System.Int64);Argument[1];ReturnValue;taint;df-generated |
-| System;Int64;MinNumber;(System.Int64,System.Int64);Argument[0];ReturnValue;taint;df-generated |
-| System;Int64;MinNumber;(System.Int64,System.Int64);Argument[1];ReturnValue;taint;df-generated |
-| System;Int64;System.Numerics.IAdditionOperators<System.Int64,System.Int64,System.Int64>.op_CheckedAddition;(System.Int64,System.Int64);Argument[0];ReturnValue;taint;df-generated |
-| System;Int64;System.Numerics.IAdditionOperators<System.Int64,System.Int64,System.Int64>.op_CheckedAddition;(System.Int64,System.Int64);Argument[1];ReturnValue;taint;df-generated |
+| System;Int64;Clamp;(System.Int64,System.Int64,System.Int64);Argument[0];ReturnValue;value;dfc-generated |
+| System;Int64;Clamp;(System.Int64,System.Int64,System.Int64);Argument[1];ReturnValue;value;dfc-generated |
+| System;Int64;Clamp;(System.Int64,System.Int64,System.Int64);Argument[2];ReturnValue;value;dfc-generated |
+| System;Int64;CopySign;(System.Int64,System.Int64);Argument[0];ReturnValue;value;dfc-generated |
+| System;Int64;CreateChecked<TOther>;(TOther);Argument[0];ReturnValue;value;dfc-generated |
+| System;Int64;CreateSaturating<TOther>;(TOther);Argument[0];ReturnValue;value;dfc-generated |
+| System;Int64;CreateTruncating<TOther>;(TOther);Argument[0];ReturnValue;value;dfc-generated |
+| System;Int64;Max;(System.Int64,System.Int64);Argument[0];ReturnValue;value;dfc-generated |
+| System;Int64;Max;(System.Int64,System.Int64);Argument[1];ReturnValue;value;dfc-generated |
+| System;Int64;MaxNumber;(System.Int64,System.Int64);Argument[0];ReturnValue;value;dfc-generated |
+| System;Int64;MaxNumber;(System.Int64,System.Int64);Argument[1];ReturnValue;value;dfc-generated |
+| System;Int64;Min;(System.Int64,System.Int64);Argument[0];ReturnValue;value;dfc-generated |
+| System;Int64;Min;(System.Int64,System.Int64);Argument[1];ReturnValue;value;dfc-generated |
+| System;Int64;MinNumber;(System.Int64,System.Int64);Argument[0];ReturnValue;value;dfc-generated |
+| System;Int64;MinNumber;(System.Int64,System.Int64);Argument[1];ReturnValue;value;dfc-generated |
+| System;Int64;System.Numerics.IAdditionOperators<System.Int64,System.Int64,System.Int64>.op_CheckedAddition;(System.Int64,System.Int64);Argument[0];ReturnValue;taint;dfc-generated |
+| System;Int64;System.Numerics.IAdditionOperators<System.Int64,System.Int64,System.Int64>.op_CheckedAddition;(System.Int64,System.Int64);Argument[1];ReturnValue;taint;dfc-generated |
 | System;Int64;ToDateTime;(System.IFormatProvider);Argument[this];ReturnValue;value;df-generated |
 | System;Int64;ToDecimal;(System.IFormatProvider);Argument[this];ReturnValue;value;df-generated |
-| System;Int64;ToString;(System.IFormatProvider);Argument[0];ReturnValue;taint;df-generated |
-| System;Int64;ToString;(System.IFormatProvider);Argument[this];ReturnValue;value;df-generated |
-| System;Int64;ToString;(System.String,System.IFormatProvider);Argument[1];ReturnValue;taint;df-generated |
-| System;Int64;ToString;(System.String,System.IFormatProvider);Argument[this];ReturnValue;taint;df-generated |
-| System;Int64;ToType;(System.Type,System.IFormatProvider);Argument[1];ReturnValue;taint;df-generated |
-| System;Int64;ToType;(System.Type,System.IFormatProvider);Argument[this];ReturnValue;taint;df-generated |
-| System;Int128;Abs;(System.Int128);Argument[0];ReturnValue;taint;df-generated |
-| System;Int128;Clamp;(System.Int128,System.Int128,System.Int128);Argument[0];ReturnValue;taint;df-generated |
-| System;Int128;Clamp;(System.Int128,System.Int128,System.Int128);Argument[1];ReturnValue;taint;df-generated |
-| System;Int128;Clamp;(System.Int128,System.Int128,System.Int128);Argument[2];ReturnValue;taint;df-generated |
-| System;Int128;CopySign;(System.Int128,System.Int128);Argument[0];ReturnValue;taint;df-generated |
-| System;Int128;CreateChecked<TOther>;(TOther);Argument[0];ReturnValue;taint;df-generated |
-| System;Int128;CreateSaturating<TOther>;(TOther);Argument[0];ReturnValue;taint;df-generated |
-| System;Int128;CreateTruncating<TOther>;(TOther);Argument[0];ReturnValue;taint;df-generated |
-| System;Int128;Max;(System.Int128,System.Int128);Argument[0];ReturnValue;taint;df-generated |
-| System;Int128;Max;(System.Int128,System.Int128);Argument[1];ReturnValue;taint;df-generated |
-| System;Int128;MaxMagnitude;(System.Int128,System.Int128);Argument[0];ReturnValue;taint;df-generated |
-| System;Int128;MaxMagnitude;(System.Int128,System.Int128);Argument[1];ReturnValue;taint;df-generated |
-| System;Int128;MaxMagnitudeNumber;(System.Int128,System.Int128);Argument[0];ReturnValue;taint;df-generated |
-| System;Int128;MaxMagnitudeNumber;(System.Int128,System.Int128);Argument[1];ReturnValue;taint;df-generated |
-| System;Int128;MaxNumber;(System.Int128,System.Int128);Argument[0];ReturnValue;taint;df-generated |
-| System;Int128;MaxNumber;(System.Int128,System.Int128);Argument[1];ReturnValue;taint;df-generated |
-| System;Int128;Min;(System.Int128,System.Int128);Argument[0];ReturnValue;taint;df-generated |
-| System;Int128;Min;(System.Int128,System.Int128);Argument[1];ReturnValue;taint;df-generated |
-| System;Int128;MinMagnitude;(System.Int128,System.Int128);Argument[0];ReturnValue;taint;df-generated |
-| System;Int128;MinMagnitude;(System.Int128,System.Int128);Argument[1];ReturnValue;taint;df-generated |
-| System;Int128;MinMagnitudeNumber;(System.Int128,System.Int128);Argument[0];ReturnValue;taint;df-generated |
-| System;Int128;MinMagnitudeNumber;(System.Int128,System.Int128);Argument[1];ReturnValue;taint;df-generated |
-| System;Int128;MinNumber;(System.Int128,System.Int128);Argument[0];ReturnValue;taint;df-generated |
-| System;Int128;MinNumber;(System.Int128,System.Int128);Argument[1];ReturnValue;taint;df-generated |
-| System;Int128;System.Numerics.IAdditionOperators<System.Int128,System.Int128,System.Int128>.op_CheckedAddition;(System.Int128,System.Int128);Argument[0];ReturnValue;taint;df-generated |
-| System;Int128;System.Numerics.IAdditionOperators<System.Int128,System.Int128,System.Int128>.op_CheckedAddition;(System.Int128,System.Int128);Argument[1];ReturnValue;taint;df-generated |
-| System;Int128;ToString;(System.String,System.IFormatProvider);Argument[1];ReturnValue;taint;df-generated |
-| System;Int128;ToString;(System.String,System.IFormatProvider);Argument[this];ReturnValue;taint;df-generated |
-| System;IntPtr;Abs;(System.IntPtr);Argument[0];ReturnValue;taint;df-generated |
-| System;IntPtr;Add;(System.IntPtr,System.Int32);Argument[0];ReturnValue;taint;df-generated |
-| System;IntPtr;Clamp;(System.IntPtr,System.IntPtr,System.IntPtr);Argument[0];ReturnValue;taint;df-generated |
-| System;IntPtr;Clamp;(System.IntPtr,System.IntPtr,System.IntPtr);Argument[1];ReturnValue;taint;df-generated |
-| System;IntPtr;Clamp;(System.IntPtr,System.IntPtr,System.IntPtr);Argument[2];ReturnValue;taint;df-generated |
-| System;IntPtr;CopySign;(System.IntPtr,System.IntPtr);Argument[0];ReturnValue;taint;df-generated |
-| System;IntPtr;CreateChecked<TOther>;(TOther);Argument[0];ReturnValue;taint;df-generated |
-| System;IntPtr;CreateSaturating<TOther>;(TOther);Argument[0];ReturnValue;taint;df-generated |
-| System;IntPtr;CreateTruncating<TOther>;(TOther);Argument[0];ReturnValue;taint;df-generated |
+| System;Int64;ToString;(System.IFormatProvider);Argument[this];ReturnValue;value;dfc-generated |
+| System;Int64;ToString;(System.String,System.IFormatProvider);Argument[this];ReturnValue;taint;dfc-generated |
+| System;Int64;ToType;(System.Type,System.IFormatProvider);Argument[this];ReturnValue;value;dfc-generated |
+| System;Int128;Abs;(System.Int128);Argument[0];ReturnValue;value;dfc-generated |
+| System;Int128;Clamp;(System.Int128,System.Int128,System.Int128);Argument[0];ReturnValue;value;dfc-generated |
+| System;Int128;Clamp;(System.Int128,System.Int128,System.Int128);Argument[1];ReturnValue;value;dfc-generated |
+| System;Int128;Clamp;(System.Int128,System.Int128,System.Int128);Argument[2];ReturnValue;value;dfc-generated |
+| System;Int128;CopySign;(System.Int128,System.Int128);Argument[0];ReturnValue;value;dfc-generated |
+| System;Int128;CreateChecked<TOther>;(TOther);Argument[0];ReturnValue;value;dfc-generated |
+| System;Int128;CreateSaturating<TOther>;(TOther);Argument[0];ReturnValue;value;dfc-generated |
+| System;Int128;CreateTruncating<TOther>;(TOther);Argument[0];ReturnValue;value;dfc-generated |
+| System;Int128;Max;(System.Int128,System.Int128);Argument[0];ReturnValue;value;dfc-generated |
+| System;Int128;Max;(System.Int128,System.Int128);Argument[1];ReturnValue;value;dfc-generated |
+| System;Int128;MaxMagnitude;(System.Int128,System.Int128);Argument[0];ReturnValue;value;dfc-generated |
+| System;Int128;MaxMagnitude;(System.Int128,System.Int128);Argument[1];ReturnValue;value;dfc-generated |
+| System;Int128;MaxMagnitudeNumber;(System.Int128,System.Int128);Argument[0];ReturnValue;value;dfc-generated |
+| System;Int128;MaxMagnitudeNumber;(System.Int128,System.Int128);Argument[1];ReturnValue;value;dfc-generated |
+| System;Int128;MaxNumber;(System.Int128,System.Int128);Argument[0];ReturnValue;value;dfc-generated |
+| System;Int128;MaxNumber;(System.Int128,System.Int128);Argument[1];ReturnValue;value;dfc-generated |
+| System;Int128;Min;(System.Int128,System.Int128);Argument[0];ReturnValue;value;dfc-generated |
+| System;Int128;Min;(System.Int128,System.Int128);Argument[1];ReturnValue;value;dfc-generated |
+| System;Int128;MinMagnitude;(System.Int128,System.Int128);Argument[0];ReturnValue;value;dfc-generated |
+| System;Int128;MinMagnitude;(System.Int128,System.Int128);Argument[1];ReturnValue;value;dfc-generated |
+| System;Int128;MinMagnitudeNumber;(System.Int128,System.Int128);Argument[0];ReturnValue;value;dfc-generated |
+| System;Int128;MinMagnitudeNumber;(System.Int128,System.Int128);Argument[1];ReturnValue;value;dfc-generated |
+| System;Int128;MinNumber;(System.Int128,System.Int128);Argument[0];ReturnValue;value;dfc-generated |
+| System;Int128;MinNumber;(System.Int128,System.Int128);Argument[1];ReturnValue;value;dfc-generated |
+| System;Int128;System.Numerics.IAdditionOperators<System.Int128,System.Int128,System.Int128>.op_CheckedAddition;(System.Int128,System.Int128);Argument[0];ReturnValue;taint;dfc-generated |
+| System;Int128;System.Numerics.IAdditionOperators<System.Int128,System.Int128,System.Int128>.op_CheckedAddition;(System.Int128,System.Int128);Argument[1];ReturnValue;taint;dfc-generated |
+| System;Int128;ToString;(System.String,System.IFormatProvider);Argument[this];ReturnValue;taint;dfc-generated |
+| System;IntPtr;Abs;(System.IntPtr);Argument[0];ReturnValue;value;dfc-generated |
+| System;IntPtr;Add;(System.IntPtr,System.Int32);Argument[0];ReturnValue;taint;dfc-generated |
+| System;IntPtr;Clamp;(System.IntPtr,System.IntPtr,System.IntPtr);Argument[0];ReturnValue;value;dfc-generated |
+| System;IntPtr;Clamp;(System.IntPtr,System.IntPtr,System.IntPtr);Argument[1];ReturnValue;value;dfc-generated |
+| System;IntPtr;Clamp;(System.IntPtr,System.IntPtr,System.IntPtr);Argument[2];ReturnValue;value;dfc-generated |
+| System;IntPtr;CopySign;(System.IntPtr,System.IntPtr);Argument[0];ReturnValue;value;dfc-generated |
+| System;IntPtr;CreateChecked<TOther>;(TOther);Argument[0];ReturnValue;value;dfc-generated |
+| System;IntPtr;CreateSaturating<TOther>;(TOther);Argument[0];ReturnValue;value;dfc-generated |
+| System;IntPtr;CreateTruncating<TOther>;(TOther);Argument[0];ReturnValue;value;dfc-generated |
 | System;IntPtr;GetObjectData;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);Argument[this];Argument[0];taint;df-generated |
-| System;IntPtr;Max;(System.IntPtr,System.IntPtr);Argument[0];ReturnValue;taint;df-generated |
-| System;IntPtr;Max;(System.IntPtr,System.IntPtr);Argument[1];ReturnValue;taint;df-generated |
-| System;IntPtr;MaxMagnitude;(System.IntPtr,System.IntPtr);Argument[0];ReturnValue;taint;df-generated |
-| System;IntPtr;MaxMagnitude;(System.IntPtr,System.IntPtr);Argument[1];ReturnValue;taint;df-generated |
-| System;IntPtr;MaxMagnitudeNumber;(System.IntPtr,System.IntPtr);Argument[0];ReturnValue;taint;df-generated |
-| System;IntPtr;MaxMagnitudeNumber;(System.IntPtr,System.IntPtr);Argument[1];ReturnValue;taint;df-generated |
-| System;IntPtr;MaxNumber;(System.IntPtr,System.IntPtr);Argument[0];ReturnValue;taint;df-generated |
-| System;IntPtr;MaxNumber;(System.IntPtr,System.IntPtr);Argument[1];ReturnValue;taint;df-generated |
-| System;IntPtr;Min;(System.IntPtr,System.IntPtr);Argument[0];ReturnValue;taint;df-generated |
-| System;IntPtr;Min;(System.IntPtr,System.IntPtr);Argument[1];ReturnValue;taint;df-generated |
-| System;IntPtr;MinMagnitude;(System.IntPtr,System.IntPtr);Argument[0];ReturnValue;taint;df-generated |
-| System;IntPtr;MinMagnitude;(System.IntPtr,System.IntPtr);Argument[1];ReturnValue;taint;df-generated |
-| System;IntPtr;MinMagnitudeNumber;(System.IntPtr,System.IntPtr);Argument[0];ReturnValue;taint;df-generated |
-| System;IntPtr;MinMagnitudeNumber;(System.IntPtr,System.IntPtr);Argument[1];ReturnValue;taint;df-generated |
-| System;IntPtr;MinNumber;(System.IntPtr,System.IntPtr);Argument[0];ReturnValue;taint;df-generated |
-| System;IntPtr;MinNumber;(System.IntPtr,System.IntPtr);Argument[1];ReturnValue;taint;df-generated |
-| System;IntPtr;System.Numerics.IAdditionOperators<nint,nint,nint>.op_Addition;(System.IntPtr,System.IntPtr);Argument[0];ReturnValue;taint;df-generated |
-| System;IntPtr;System.Numerics.IAdditionOperators<nint,nint,nint>.op_Addition;(System.IntPtr,System.IntPtr);Argument[1];ReturnValue;taint;df-generated |
-| System;IntPtr;System.Numerics.IAdditionOperators<nint,nint,nint>.op_CheckedAddition;(System.IntPtr,System.IntPtr);Argument[0];ReturnValue;taint;df-generated |
-| System;IntPtr;System.Numerics.IAdditionOperators<nint,nint,nint>.op_CheckedAddition;(System.IntPtr,System.IntPtr);Argument[1];ReturnValue;taint;df-generated |
-| System;IntPtr;ToString;(System.String,System.IFormatProvider);Argument[1];ReturnValue;taint;df-generated |
-| System;IntPtr;ToString;(System.String,System.IFormatProvider);Argument[this];ReturnValue;taint;df-generated |
-| System;IntPtr;op_Addition;(System.IntPtr,System.Int32);Argument[0];ReturnValue;taint;df-generated |
+| System;IntPtr;Max;(System.IntPtr,System.IntPtr);Argument[0];ReturnValue;value;dfc-generated |
+| System;IntPtr;Max;(System.IntPtr,System.IntPtr);Argument[1];ReturnValue;value;dfc-generated |
+| System;IntPtr;MaxMagnitude;(System.IntPtr,System.IntPtr);Argument[0];ReturnValue;value;dfc-generated |
+| System;IntPtr;MaxMagnitude;(System.IntPtr,System.IntPtr);Argument[1];ReturnValue;value;dfc-generated |
+| System;IntPtr;MaxMagnitudeNumber;(System.IntPtr,System.IntPtr);Argument[0];ReturnValue;value;dfc-generated |
+| System;IntPtr;MaxMagnitudeNumber;(System.IntPtr,System.IntPtr);Argument[1];ReturnValue;value;dfc-generated |
+| System;IntPtr;MaxNumber;(System.IntPtr,System.IntPtr);Argument[0];ReturnValue;value;dfc-generated |
+| System;IntPtr;MaxNumber;(System.IntPtr,System.IntPtr);Argument[1];ReturnValue;value;dfc-generated |
+| System;IntPtr;Min;(System.IntPtr,System.IntPtr);Argument[0];ReturnValue;value;dfc-generated |
+| System;IntPtr;Min;(System.IntPtr,System.IntPtr);Argument[1];ReturnValue;value;dfc-generated |
+| System;IntPtr;MinMagnitude;(System.IntPtr,System.IntPtr);Argument[0];ReturnValue;value;dfc-generated |
+| System;IntPtr;MinMagnitude;(System.IntPtr,System.IntPtr);Argument[1];ReturnValue;value;dfc-generated |
+| System;IntPtr;MinMagnitudeNumber;(System.IntPtr,System.IntPtr);Argument[0];ReturnValue;value;dfc-generated |
+| System;IntPtr;MinMagnitudeNumber;(System.IntPtr,System.IntPtr);Argument[1];ReturnValue;value;dfc-generated |
+| System;IntPtr;MinNumber;(System.IntPtr,System.IntPtr);Argument[0];ReturnValue;value;dfc-generated |
+| System;IntPtr;MinNumber;(System.IntPtr,System.IntPtr);Argument[1];ReturnValue;value;dfc-generated |
+| System;IntPtr;System.Numerics.IAdditionOperators<nint,nint,nint>.op_Addition;(System.IntPtr,System.IntPtr);Argument[0];ReturnValue;taint;dfc-generated |
+| System;IntPtr;System.Numerics.IAdditionOperators<nint,nint,nint>.op_Addition;(System.IntPtr,System.IntPtr);Argument[1];ReturnValue;taint;dfc-generated |
+| System;IntPtr;System.Numerics.IAdditionOperators<nint,nint,nint>.op_CheckedAddition;(System.IntPtr,System.IntPtr);Argument[0];ReturnValue;taint;dfc-generated |
+| System;IntPtr;System.Numerics.IAdditionOperators<nint,nint,nint>.op_CheckedAddition;(System.IntPtr,System.IntPtr);Argument[1];ReturnValue;taint;dfc-generated |
+| System;IntPtr;ToString;(System.String,System.IFormatProvider);Argument[this];ReturnValue;taint;dfc-generated |
+| System;IntPtr;op_Addition;(System.IntPtr,System.Int32);Argument[0];ReturnValue;taint;dfc-generated |
+| System;Lazy<T,TMetadata>;Lazy;(System.Func<T>,TMetadata);Argument[0];Argument[0].Parameter[delegate-self];value;dfc-generated |
 | System;Lazy<T,TMetadata>;Lazy;(System.Func<T>,TMetadata);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
+| System;Lazy<T,TMetadata>;Lazy;(System.Func<T>,TMetadata);Argument[1];Argument[this].SyntheticField[System.Lazy`2._metadata];value;dfc-generated |
+| System;Lazy<T,TMetadata>;Lazy;(System.Func<T>,TMetadata);Argument[1];Argument[this].SyntheticField[System.Lazy`2._metadata];value;hq-generated |
+| System;Lazy<T,TMetadata>;Lazy;(System.Func<T>,TMetadata,System.Boolean);Argument[0];Argument[0].Parameter[delegate-self];value;dfc-generated |
 | System;Lazy<T,TMetadata>;Lazy;(System.Func<T>,TMetadata,System.Boolean);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
+| System;Lazy<T,TMetadata>;Lazy;(System.Func<T>,TMetadata,System.Boolean);Argument[1];Argument[this].SyntheticField[System.Lazy`2._metadata];value;dfc-generated |
+| System;Lazy<T,TMetadata>;Lazy;(System.Func<T>,TMetadata,System.Boolean);Argument[1];Argument[this].SyntheticField[System.Lazy`2._metadata];value;hq-generated |
+| System;Lazy<T,TMetadata>;Lazy;(System.Func<T>,TMetadata,System.Threading.LazyThreadSafetyMode);Argument[0];Argument[0].Parameter[delegate-self];value;dfc-generated |
 | System;Lazy<T,TMetadata>;Lazy;(System.Func<T>,TMetadata,System.Threading.LazyThreadSafetyMode);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
-| System;Lazy<T,TMetadata>;Lazy;(TMetadata);Argument[0];Argument[this];taint;df-generated |
-| System;Lazy<T,TMetadata>;Lazy;(TMetadata,System.Boolean);Argument[0];Argument[this];taint;df-generated |
-| System;Lazy<T,TMetadata>;Lazy;(TMetadata,System.Threading.LazyThreadSafetyMode);Argument[0];Argument[this];taint;df-generated |
-| System;Lazy<T,TMetadata>;get_Metadata;();Argument[this];ReturnValue;taint;df-generated |
+| System;Lazy<T,TMetadata>;Lazy;(System.Func<T>,TMetadata,System.Threading.LazyThreadSafetyMode);Argument[1];Argument[this].SyntheticField[System.Lazy`2._metadata];value;dfc-generated |
+| System;Lazy<T,TMetadata>;Lazy;(System.Func<T>,TMetadata,System.Threading.LazyThreadSafetyMode);Argument[1];Argument[this].SyntheticField[System.Lazy`2._metadata];value;hq-generated |
+| System;Lazy<T,TMetadata>;Lazy;(TMetadata);Argument[0];Argument[this].SyntheticField[System.Lazy`2._metadata];value;dfc-generated |
+| System;Lazy<T,TMetadata>;Lazy;(TMetadata,System.Boolean);Argument[0];Argument[this].SyntheticField[System.Lazy`2._metadata];value;dfc-generated |
+| System;Lazy<T,TMetadata>;Lazy;(TMetadata,System.Threading.LazyThreadSafetyMode);Argument[0];Argument[this].SyntheticField[System.Lazy`2._metadata];value;dfc-generated |
+| System;Lazy<T,TMetadata>;get_Metadata;();Argument[this].SyntheticField[System.Lazy`2._metadata];ReturnValue;value;dfc-generated |
 | System;Lazy<T>;Lazy;(System.Func<T>);Argument[0].ReturnValue;Argument[this].Property[System.Lazy`1.Value];value;manual |
 | System;Lazy<T>;Lazy;(System.Func<T>);Argument[0];Argument[0].Parameter[delegate-self];value;manual |
 | System;Lazy<T>;Lazy;(System.Func<T>,System.Boolean);Argument[0].ReturnValue;Argument[this].Property[System.Lazy`1.Value];value;manual |
@@ -20075,37 +20944,37 @@ summary
 | System;Lazy<T>;Lazy;(T);Argument[0];Argument[this];taint;df-generated |
 | System;Lazy<T>;ToString;();Argument[this];ReturnValue;taint;df-generated |
 | System;Lazy<T>;get_Value;();Argument[this];ReturnValue;taint;manual |
-| System;Math;Abs;(System.IntPtr);Argument[0];ReturnValue;taint;df-generated |
-| System;Math;Clamp;(System.IntPtr,System.IntPtr,System.IntPtr);Argument[0];ReturnValue;taint;df-generated |
-| System;Math;Clamp;(System.IntPtr,System.IntPtr,System.IntPtr);Argument[1];ReturnValue;taint;df-generated |
-| System;Math;Clamp;(System.IntPtr,System.IntPtr,System.IntPtr);Argument[2];ReturnValue;taint;df-generated |
-| System;Math;Clamp;(System.UIntPtr,System.UIntPtr,System.UIntPtr);Argument[0];ReturnValue;taint;df-generated |
-| System;Math;Clamp;(System.UIntPtr,System.UIntPtr,System.UIntPtr);Argument[1];ReturnValue;taint;df-generated |
-| System;Math;Clamp;(System.UIntPtr,System.UIntPtr,System.UIntPtr);Argument[2];ReturnValue;taint;df-generated |
-| System;Math;Max;(System.IntPtr,System.IntPtr);Argument[0];ReturnValue;taint;df-generated |
-| System;Math;Max;(System.IntPtr,System.IntPtr);Argument[1];ReturnValue;taint;df-generated |
-| System;Math;Max;(System.UIntPtr,System.UIntPtr);Argument[0];ReturnValue;taint;df-generated |
-| System;Math;Max;(System.UIntPtr,System.UIntPtr);Argument[1];ReturnValue;taint;df-generated |
-| System;Math;Min;(System.IntPtr,System.IntPtr);Argument[0];ReturnValue;taint;df-generated |
-| System;Math;Min;(System.IntPtr,System.IntPtr);Argument[1];ReturnValue;taint;df-generated |
-| System;Math;Min;(System.UIntPtr,System.UIntPtr);Argument[0];ReturnValue;taint;df-generated |
-| System;Math;Min;(System.UIntPtr,System.UIntPtr);Argument[1];ReturnValue;taint;df-generated |
-| System;Memory<T>;CopyTo;(System.Memory<T>);Argument[this];Argument[0];taint;df-generated |
-| System;Memory<T>;Memory;(T[]);Argument[0].Element;Argument[this];taint;df-generated |
-| System;Memory<T>;Memory;(T[],System.Int32,System.Int32);Argument[0].Element;Argument[this];taint;df-generated |
-| System;Memory<T>;Slice;(System.Int32);Argument[this];ReturnValue;taint;df-generated |
-| System;Memory<T>;Slice;(System.Int32,System.Int32);Argument[this];ReturnValue;taint;df-generated |
-| System;Memory<T>;ToArray;();Argument[this];ReturnValue;taint;df-generated |
-| System;Memory<T>;ToString;();Argument[this];ReturnValue;taint;df-generated |
-| System;Memory<T>;TryCopyTo;(System.Memory<T>);Argument[this];Argument[0];taint;df-generated |
+| System;Math;Abs;(System.IntPtr);Argument[0];ReturnValue;value;dfc-generated |
+| System;Math;Clamp;(System.IntPtr,System.IntPtr,System.IntPtr);Argument[0];ReturnValue;value;dfc-generated |
+| System;Math;Clamp;(System.IntPtr,System.IntPtr,System.IntPtr);Argument[1];ReturnValue;value;dfc-generated |
+| System;Math;Clamp;(System.IntPtr,System.IntPtr,System.IntPtr);Argument[2];ReturnValue;value;dfc-generated |
+| System;Math;Clamp;(System.UIntPtr,System.UIntPtr,System.UIntPtr);Argument[0];ReturnValue;value;dfc-generated |
+| System;Math;Clamp;(System.UIntPtr,System.UIntPtr,System.UIntPtr);Argument[1];ReturnValue;value;dfc-generated |
+| System;Math;Clamp;(System.UIntPtr,System.UIntPtr,System.UIntPtr);Argument[2];ReturnValue;value;dfc-generated |
+| System;Math;Max;(System.IntPtr,System.IntPtr);Argument[0];ReturnValue;value;dfc-generated |
+| System;Math;Max;(System.IntPtr,System.IntPtr);Argument[1];ReturnValue;value;dfc-generated |
+| System;Math;Max;(System.UIntPtr,System.UIntPtr);Argument[0];ReturnValue;value;dfc-generated |
+| System;Math;Max;(System.UIntPtr,System.UIntPtr);Argument[1];ReturnValue;value;dfc-generated |
+| System;Math;Min;(System.IntPtr,System.IntPtr);Argument[0];ReturnValue;value;dfc-generated |
+| System;Math;Min;(System.IntPtr,System.IntPtr);Argument[1];ReturnValue;value;dfc-generated |
+| System;Math;Min;(System.UIntPtr,System.UIntPtr);Argument[0];ReturnValue;value;dfc-generated |
+| System;Math;Min;(System.UIntPtr,System.UIntPtr);Argument[1];ReturnValue;value;dfc-generated |
+| System;Memory<T>;CopyTo;(System.Memory<T>);Argument[this].Property[System.Memory`1.Span].Element;Argument[0].Property[System.Memory`1.Span].Element;value;dfc-generated |
+| System;Memory<T>;Memory;(T[]);Argument[0];Argument[this].SyntheticField[System.Memory`1._object];value;dfc-generated |
+| System;Memory<T>;Memory;(T[],System.Int32,System.Int32);Argument[0];Argument[this].SyntheticField[System.Memory`1._object];value;dfc-generated |
+| System;Memory<T>;Slice;(System.Int32);Argument[this].SyntheticField[System.Memory`1._object];ReturnValue.SyntheticField[System.Memory`1._object];value;dfc-generated |
+| System;Memory<T>;Slice;(System.Int32,System.Int32);Argument[this].SyntheticField[System.Memory`1._object];ReturnValue.SyntheticField[System.Memory`1._object];value;dfc-generated |
+| System;Memory<T>;ToArray;();Argument[this].Property[System.Memory`1.Span].Element;ReturnValue.Element;value;dfc-generated |
+| System;Memory<T>;ToString;();Argument[this].SyntheticField[System.Memory`1._object];ReturnValue;value;dfc-generated |
+| System;Memory<T>;TryCopyTo;(System.Memory<T>);Argument[this].Property[System.Memory`1.Span].Element;Argument[0].Property[System.Memory`1.Span].Element;value;dfc-generated |
 | System;MemoryExtensions+TryWriteInterpolatedStringHandler;TryWriteInterpolatedStringHandler;(System.Int32,System.Int32,System.Span<System.Char>,System.Boolean);Argument[2];Argument[this];taint;df-generated |
 | System;MemoryExtensions+TryWriteInterpolatedStringHandler;TryWriteInterpolatedStringHandler;(System.Int32,System.Int32,System.Span<System.Char>,System.IFormatProvider,System.Boolean);Argument[2];Argument[this];taint;df-generated |
 | System;MemoryExtensions+TryWriteInterpolatedStringHandler;TryWriteInterpolatedStringHandler;(System.Int32,System.Int32,System.Span<System.Char>,System.IFormatProvider,System.Boolean);Argument[3];Argument[this];taint;df-generated |
-| System;MemoryExtensions;AsMemory;(System.String);Argument[0];ReturnValue;taint;df-generated |
-| System;MemoryExtensions;AsMemory;(System.String,System.Index);Argument[0];ReturnValue;taint;df-generated |
-| System;MemoryExtensions;AsMemory;(System.String,System.Int32);Argument[0];ReturnValue;taint;df-generated |
-| System;MemoryExtensions;AsMemory;(System.String,System.Int32,System.Int32);Argument[0];ReturnValue;taint;df-generated |
-| System;MemoryExtensions;AsMemory;(System.String,System.Range);Argument[0];ReturnValue;taint;df-generated |
+| System;MemoryExtensions;AsMemory;(System.String);Argument[0];ReturnValue.SyntheticField[System.ReadOnlyMemory`1._object];value;dfc-generated |
+| System;MemoryExtensions;AsMemory;(System.String,System.Index);Argument[0];ReturnValue.SyntheticField[System.ReadOnlyMemory`1._object];value;dfc-generated |
+| System;MemoryExtensions;AsMemory;(System.String,System.Int32);Argument[0];ReturnValue.SyntheticField[System.ReadOnlyMemory`1._object];value;dfc-generated |
+| System;MemoryExtensions;AsMemory;(System.String,System.Int32,System.Int32);Argument[0];ReturnValue.SyntheticField[System.ReadOnlyMemory`1._object];value;dfc-generated |
+| System;MemoryExtensions;AsMemory;(System.String,System.Range);Argument[0];ReturnValue.SyntheticField[System.ReadOnlyMemory`1._object];value;dfc-generated |
 | System;MemoryExtensions;AsMemory<T>;(System.ArraySegment<T>);Argument[0].Element;ReturnValue;taint;df-generated |
 | System;MemoryExtensions;AsMemory<T>;(System.ArraySegment<T>,System.Int32);Argument[0].Element;ReturnValue;taint;df-generated |
 | System;MemoryExtensions;AsMemory<T>;(System.ArraySegment<T>,System.Int32,System.Int32);Argument[0].Element;ReturnValue;taint;df-generated |
@@ -20114,81 +20983,107 @@ summary
 | System;MemoryExtensions;AsMemory<T>;(T[],System.Int32);Argument[0].Element;ReturnValue;taint;df-generated |
 | System;MemoryExtensions;AsMemory<T>;(T[],System.Int32,System.Int32);Argument[0].Element;ReturnValue;taint;df-generated |
 | System;MemoryExtensions;AsMemory<T>;(T[],System.Range);Argument[0].Element;ReturnValue;taint;df-generated |
-| System;MemoryExtensions;AsSpan<T>;(System.ArraySegment<T>);Argument[0].Element;ReturnValue;taint;df-generated |
-| System;MemoryExtensions;AsSpan<T>;(System.ArraySegment<T>,System.Index);Argument[0].Element;ReturnValue;taint;df-generated |
-| System;MemoryExtensions;AsSpan<T>;(System.ArraySegment<T>,System.Int32);Argument[0].Element;ReturnValue;taint;df-generated |
-| System;MemoryExtensions;AsSpan<T>;(System.ArraySegment<T>,System.Int32,System.Int32);Argument[0].Element;ReturnValue;taint;df-generated |
-| System;MemoryExtensions;AsSpan<T>;(System.ArraySegment<T>,System.Range);Argument[0].Element;ReturnValue;taint;df-generated |
-| System;MemoryExtensions;AsSpan<T>;(T[]);Argument[0].Element;ReturnValue;taint;df-generated |
-| System;MemoryExtensions;AsSpan<T>;(T[],System.Int32,System.Int32);Argument[0].Element;ReturnValue;taint;df-generated |
-| System;MemoryExtensions;CopyTo<T>;(T[],System.Memory<T>);Argument[0].Element;Argument[1];taint;df-generated |
-| System;MemoryExtensions;CopyTo<T>;(T[],System.Span<T>);Argument[0].Element;Argument[1];taint;df-generated |
-| System;MemoryExtensions;EnumerateLines;(System.ReadOnlySpan<System.Char>);Argument[0];ReturnValue;taint;df-generated |
+| System;MemoryExtensions;AsSpan<T>;(System.ArraySegment<T>);Argument[0].Property[System.ArraySegment`1.Array].Element;ReturnValue.Element;value;dfc-generated |
+| System;MemoryExtensions;AsSpan<T>;(System.ArraySegment<T>,System.Index);Argument[0].Property[System.ArraySegment`1.Array].Element;ReturnValue.Element;value;dfc-generated |
+| System;MemoryExtensions;AsSpan<T>;(System.ArraySegment<T>,System.Int32);Argument[0].Property[System.ArraySegment`1.Array].Element;ReturnValue.Element;value;dfc-generated |
+| System;MemoryExtensions;AsSpan<T>;(System.ArraySegment<T>,System.Int32,System.Int32);Argument[0].Property[System.ArraySegment`1.Array].Element;ReturnValue.Element;value;dfc-generated |
+| System;MemoryExtensions;AsSpan<T>;(System.ArraySegment<T>,System.Range);Argument[0].Property[System.ArraySegment`1.Array].Element;ReturnValue.Element;value;dfc-generated |
+| System;MemoryExtensions;AsSpan<T>;(T[]);Argument[0].Element;ReturnValue.Element;value;dfc-generated |
+| System;MemoryExtensions;AsSpan<T>;(T[],System.Int32,System.Int32);Argument[0].Element;ReturnValue.Element;value;dfc-generated |
+| System;MemoryExtensions;CommonPrefixLength<T>;(System.ReadOnlySpan<T>,System.ReadOnlySpan<T>,System.Collections.Generic.IEqualityComparer<T>);Argument[0];Argument[2];taint;df-generated |
+| System;MemoryExtensions;CommonPrefixLength<T>;(System.ReadOnlySpan<T>,System.ReadOnlySpan<T>,System.Collections.Generic.IEqualityComparer<T>);Argument[1];Argument[2];taint;df-generated |
+| System;MemoryExtensions;CommonPrefixLength<T>;(System.Span<T>,System.ReadOnlySpan<T>,System.Collections.Generic.IEqualityComparer<T>);Argument[1];Argument[2];taint;df-generated |
+| System;MemoryExtensions;CopyTo<T>;(T[],System.Memory<T>);Argument[0].Element;Argument[1].Property[System.Memory`1.Span].Element;value;dfc-generated |
+| System;MemoryExtensions;CopyTo<T>;(T[],System.Span<T>);Argument[0].Element;Argument[1].Element;value;dfc-generated |
+| System;MemoryExtensions;EnumerateLines;(System.ReadOnlySpan<System.Char>);Argument[0];ReturnValue.SyntheticField[System.Text.SpanLineEnumerator._remaining];value;dfc-generated |
 | System;MemoryExtensions;EnumerateRunes;(System.ReadOnlySpan<System.Char>);Argument[0];ReturnValue;taint;df-generated |
 | System;MemoryExtensions;Replace<T>;(System.ReadOnlySpan<T>,System.Span<T>,T,T);Argument[0].Element;Argument[1].Element;value;manual |
 | System;MemoryExtensions;Replace<T>;(System.ReadOnlySpan<T>,System.Span<T>,T,T);Argument[3];Argument[1].Element;value;manual |
 | System;MemoryExtensions;Replace<T>;(System.Span<T>,T,T);Argument[2];Argument[0].Element;value;manual |
+| System;MemoryExtensions;SequenceEqual<T>;(System.ReadOnlySpan<T>,System.ReadOnlySpan<T>,System.Collections.Generic.IEqualityComparer<T>);Argument[0];Argument[2];taint;df-generated |
+| System;MemoryExtensions;SequenceEqual<T>;(System.ReadOnlySpan<T>,System.ReadOnlySpan<T>,System.Collections.Generic.IEqualityComparer<T>);Argument[1];Argument[2];taint;df-generated |
+| System;MemoryExtensions;SequenceEqual<T>;(System.Span<T>,System.ReadOnlySpan<T>,System.Collections.Generic.IEqualityComparer<T>);Argument[1];Argument[2];taint;df-generated |
+| System;MemoryExtensions;Sort<T>;(System.Span<T>,System.Comparison<T>);Argument[0].Element;Argument[1].Parameter[0];value;dfc-generated |
+| System;MemoryExtensions;Sort<T>;(System.Span<T>,System.Comparison<T>);Argument[0].Element;Argument[1].Parameter[0];value;hq-generated |
+| System;MemoryExtensions;Sort<T>;(System.Span<T>,System.Comparison<T>);Argument[0].Element;Argument[1].Parameter[1];value;dfc-generated |
+| System;MemoryExtensions;Sort<T>;(System.Span<T>,System.Comparison<T>);Argument[0].Element;Argument[1].Parameter[1];value;hq-generated |
+| System;MemoryExtensions;Sort<T>;(System.Span<T>,System.Comparison<T>);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | System;MemoryExtensions;Sort<T>;(System.Span<T>,System.Comparison<T>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
 | System;MemoryExtensions;Sort<TKey,TValue>;(System.Span<TKey>,System.Span<TValue>,System.Comparison<TKey>);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
 | System;MemoryExtensions;Trim;(System.Memory<System.Char>);Argument[0];ReturnValue;taint;df-generated |
-| System;MemoryExtensions;Trim;(System.ReadOnlyMemory<System.Char>);Argument[0];ReturnValue;taint;df-generated |
-| System;MemoryExtensions;Trim;(System.ReadOnlySpan<System.Char>);Argument[0];ReturnValue;taint;df-generated |
-| System;MemoryExtensions;Trim;(System.ReadOnlySpan<System.Char>,System.Char);Argument[0];ReturnValue;taint;df-generated |
-| System;MemoryExtensions;Trim;(System.ReadOnlySpan<System.Char>,System.ReadOnlySpan<System.Char>);Argument[0];ReturnValue;taint;df-generated |
-| System;MemoryExtensions;Trim;(System.Span<System.Char>);Argument[0];ReturnValue;taint;df-generated |
-| System;MemoryExtensions;Trim<T>;(System.Memory<T>,System.ReadOnlySpan<T>);Argument[0];ReturnValue;taint;df-generated |
+| System;MemoryExtensions;Trim;(System.ReadOnlyMemory<System.Char>);Argument[0].SyntheticField[System.ReadOnlyMemory`1._object];ReturnValue.SyntheticField[System.ReadOnlyMemory`1._object];value;dfc-generated |
+| System;MemoryExtensions;Trim;(System.ReadOnlySpan<System.Char>);Argument[0].Element;ReturnValue.Element;value;dfc-generated |
+| System;MemoryExtensions;Trim;(System.ReadOnlySpan<System.Char>);Argument[0];ReturnValue;value;dfc-generated |
+| System;MemoryExtensions;Trim;(System.ReadOnlySpan<System.Char>,System.Char);Argument[0].Element;ReturnValue.Element;value;dfc-generated |
+| System;MemoryExtensions;Trim;(System.ReadOnlySpan<System.Char>,System.ReadOnlySpan<System.Char>);Argument[0].Element;ReturnValue.Element;value;dfc-generated |
+| System;MemoryExtensions;Trim;(System.Span<System.Char>);Argument[0].Element;ReturnValue.Element;value;dfc-generated |
+| System;MemoryExtensions;Trim;(System.Span<System.Char>);Argument[0];ReturnValue;value;dfc-generated |
+| System;MemoryExtensions;Trim<T>;(System.Memory<T>,System.ReadOnlySpan<T>);Argument[0];ReturnValue;value;dfc-generated |
 | System;MemoryExtensions;Trim<T>;(System.Memory<T>,T);Argument[0];ReturnValue;taint;df-generated |
-| System;MemoryExtensions;Trim<T>;(System.ReadOnlyMemory<T>,System.ReadOnlySpan<T>);Argument[0];ReturnValue;taint;df-generated |
+| System;MemoryExtensions;Trim<T>;(System.ReadOnlyMemory<T>,System.ReadOnlySpan<T>);Argument[0];ReturnValue;value;dfc-generated |
 | System;MemoryExtensions;Trim<T>;(System.ReadOnlyMemory<T>,T);Argument[0];ReturnValue;taint;df-generated |
-| System;MemoryExtensions;Trim<T>;(System.ReadOnlySpan<T>,System.ReadOnlySpan<T>);Argument[0];ReturnValue;taint;df-generated |
-| System;MemoryExtensions;Trim<T>;(System.ReadOnlySpan<T>,T);Argument[0];ReturnValue;taint;df-generated |
-| System;MemoryExtensions;Trim<T>;(System.Span<T>,System.ReadOnlySpan<T>);Argument[0];ReturnValue;taint;df-generated |
-| System;MemoryExtensions;Trim<T>;(System.Span<T>,T);Argument[0];ReturnValue;taint;df-generated |
+| System;MemoryExtensions;Trim<T>;(System.ReadOnlySpan<T>,System.ReadOnlySpan<T>);Argument[0].Element;ReturnValue.Element;value;dfc-generated |
+| System;MemoryExtensions;Trim<T>;(System.ReadOnlySpan<T>,System.ReadOnlySpan<T>);Argument[0];ReturnValue;value;dfc-generated |
+| System;MemoryExtensions;Trim<T>;(System.ReadOnlySpan<T>,T);Argument[0].Element;ReturnValue.Element;value;dfc-generated |
+| System;MemoryExtensions;Trim<T>;(System.Span<T>,System.ReadOnlySpan<T>);Argument[0].Element;ReturnValue.Element;value;dfc-generated |
+| System;MemoryExtensions;Trim<T>;(System.Span<T>,System.ReadOnlySpan<T>);Argument[0];ReturnValue;value;dfc-generated |
+| System;MemoryExtensions;Trim<T>;(System.Span<T>,T);Argument[0].Element;ReturnValue.Element;value;dfc-generated |
 | System;MemoryExtensions;TrimEnd;(System.Memory<System.Char>);Argument[0];ReturnValue;taint;df-generated |
-| System;MemoryExtensions;TrimEnd;(System.ReadOnlyMemory<System.Char>);Argument[0];ReturnValue;taint;df-generated |
-| System;MemoryExtensions;TrimEnd;(System.ReadOnlySpan<System.Char>);Argument[0];ReturnValue;taint;df-generated |
-| System;MemoryExtensions;TrimEnd;(System.ReadOnlySpan<System.Char>,System.Char);Argument[0];ReturnValue;taint;df-generated |
-| System;MemoryExtensions;TrimEnd;(System.ReadOnlySpan<System.Char>,System.ReadOnlySpan<System.Char>);Argument[0];ReturnValue;taint;df-generated |
-| System;MemoryExtensions;TrimEnd;(System.Span<System.Char>);Argument[0];ReturnValue;taint;df-generated |
-| System;MemoryExtensions;TrimEnd<T>;(System.Memory<T>,System.ReadOnlySpan<T>);Argument[0];ReturnValue;taint;df-generated |
+| System;MemoryExtensions;TrimEnd;(System.ReadOnlyMemory<System.Char>);Argument[0].SyntheticField[System.ReadOnlyMemory`1._object];ReturnValue.SyntheticField[System.ReadOnlyMemory`1._object];value;dfc-generated |
+| System;MemoryExtensions;TrimEnd;(System.ReadOnlySpan<System.Char>);Argument[0].Element;ReturnValue.Element;value;dfc-generated |
+| System;MemoryExtensions;TrimEnd;(System.ReadOnlySpan<System.Char>,System.Char);Argument[0].Element;ReturnValue.Element;value;dfc-generated |
+| System;MemoryExtensions;TrimEnd;(System.ReadOnlySpan<System.Char>,System.ReadOnlySpan<System.Char>);Argument[0].Element;ReturnValue.Element;value;dfc-generated |
+| System;MemoryExtensions;TrimEnd;(System.Span<System.Char>);Argument[0].Element;ReturnValue.Element;value;dfc-generated |
+| System;MemoryExtensions;TrimEnd<T>;(System.Memory<T>,System.ReadOnlySpan<T>);Argument[0];ReturnValue;value;dfc-generated |
 | System;MemoryExtensions;TrimEnd<T>;(System.Memory<T>,T);Argument[0];ReturnValue;taint;df-generated |
-| System;MemoryExtensions;TrimEnd<T>;(System.ReadOnlyMemory<T>,System.ReadOnlySpan<T>);Argument[0];ReturnValue;taint;df-generated |
+| System;MemoryExtensions;TrimEnd<T>;(System.ReadOnlyMemory<T>,System.ReadOnlySpan<T>);Argument[0];ReturnValue;value;dfc-generated |
 | System;MemoryExtensions;TrimEnd<T>;(System.ReadOnlyMemory<T>,T);Argument[0];ReturnValue;taint;df-generated |
-| System;MemoryExtensions;TrimEnd<T>;(System.ReadOnlySpan<T>,System.ReadOnlySpan<T>);Argument[0];ReturnValue;taint;df-generated |
-| System;MemoryExtensions;TrimEnd<T>;(System.ReadOnlySpan<T>,T);Argument[0];ReturnValue;taint;df-generated |
-| System;MemoryExtensions;TrimEnd<T>;(System.Span<T>,System.ReadOnlySpan<T>);Argument[0];ReturnValue;taint;df-generated |
-| System;MemoryExtensions;TrimEnd<T>;(System.Span<T>,T);Argument[0];ReturnValue;taint;df-generated |
+| System;MemoryExtensions;TrimEnd<T>;(System.ReadOnlySpan<T>,System.ReadOnlySpan<T>);Argument[0].Element;ReturnValue.Element;value;dfc-generated |
+| System;MemoryExtensions;TrimEnd<T>;(System.ReadOnlySpan<T>,System.ReadOnlySpan<T>);Argument[0];ReturnValue;value;dfc-generated |
+| System;MemoryExtensions;TrimEnd<T>;(System.ReadOnlySpan<T>,T);Argument[0].Element;ReturnValue.Element;value;dfc-generated |
+| System;MemoryExtensions;TrimEnd<T>;(System.Span<T>,System.ReadOnlySpan<T>);Argument[0].Element;ReturnValue.Element;value;dfc-generated |
+| System;MemoryExtensions;TrimEnd<T>;(System.Span<T>,System.ReadOnlySpan<T>);Argument[0];ReturnValue;value;dfc-generated |
+| System;MemoryExtensions;TrimEnd<T>;(System.Span<T>,T);Argument[0].Element;ReturnValue.Element;value;dfc-generated |
 | System;MemoryExtensions;TrimStart;(System.Memory<System.Char>);Argument[0];ReturnValue;taint;df-generated |
-| System;MemoryExtensions;TrimStart;(System.ReadOnlyMemory<System.Char>);Argument[0];ReturnValue;taint;df-generated |
-| System;MemoryExtensions;TrimStart;(System.ReadOnlySpan<System.Char>);Argument[0];ReturnValue;taint;df-generated |
-| System;MemoryExtensions;TrimStart;(System.ReadOnlySpan<System.Char>,System.Char);Argument[0];ReturnValue;taint;df-generated |
-| System;MemoryExtensions;TrimStart;(System.ReadOnlySpan<System.Char>,System.ReadOnlySpan<System.Char>);Argument[0];ReturnValue;taint;df-generated |
-| System;MemoryExtensions;TrimStart;(System.Span<System.Char>);Argument[0];ReturnValue;taint;df-generated |
-| System;MemoryExtensions;TrimStart<T>;(System.Memory<T>,System.ReadOnlySpan<T>);Argument[0];ReturnValue;taint;df-generated |
+| System;MemoryExtensions;TrimStart;(System.ReadOnlyMemory<System.Char>);Argument[0].SyntheticField[System.ReadOnlyMemory`1._object];ReturnValue.SyntheticField[System.ReadOnlyMemory`1._object];value;dfc-generated |
+| System;MemoryExtensions;TrimStart;(System.ReadOnlySpan<System.Char>);Argument[0].Element;ReturnValue.Element;value;dfc-generated |
+| System;MemoryExtensions;TrimStart;(System.ReadOnlySpan<System.Char>,System.Char);Argument[0].Element;ReturnValue.Element;value;dfc-generated |
+| System;MemoryExtensions;TrimStart;(System.ReadOnlySpan<System.Char>,System.ReadOnlySpan<System.Char>);Argument[0].Element;ReturnValue.Element;value;dfc-generated |
+| System;MemoryExtensions;TrimStart;(System.Span<System.Char>);Argument[0].Element;ReturnValue.Element;value;dfc-generated |
+| System;MemoryExtensions;TrimStart<T>;(System.Memory<T>,System.ReadOnlySpan<T>);Argument[0];ReturnValue;value;dfc-generated |
 | System;MemoryExtensions;TrimStart<T>;(System.Memory<T>,T);Argument[0];ReturnValue;taint;df-generated |
-| System;MemoryExtensions;TrimStart<T>;(System.ReadOnlyMemory<T>,System.ReadOnlySpan<T>);Argument[0];ReturnValue;taint;df-generated |
+| System;MemoryExtensions;TrimStart<T>;(System.ReadOnlyMemory<T>,System.ReadOnlySpan<T>);Argument[0];ReturnValue;value;dfc-generated |
 | System;MemoryExtensions;TrimStart<T>;(System.ReadOnlyMemory<T>,T);Argument[0];ReturnValue;taint;df-generated |
-| System;MemoryExtensions;TrimStart<T>;(System.ReadOnlySpan<T>,System.ReadOnlySpan<T>);Argument[0];ReturnValue;taint;df-generated |
-| System;MemoryExtensions;TrimStart<T>;(System.ReadOnlySpan<T>,T);Argument[0];ReturnValue;taint;df-generated |
-| System;MemoryExtensions;TrimStart<T>;(System.Span<T>,System.ReadOnlySpan<T>);Argument[0];ReturnValue;taint;df-generated |
-| System;MemoryExtensions;TrimStart<T>;(System.Span<T>,T);Argument[0];ReturnValue;taint;df-generated |
-| System;MissingFieldException;MissingFieldException;(System.String,System.String);Argument[0];Argument[this];taint;df-generated |
-| System;MissingFieldException;MissingFieldException;(System.String,System.String);Argument[1];Argument[this];taint;df-generated |
-| System;MissingFieldException;get_Message;();Argument[this];ReturnValue;taint;df-generated |
+| System;MemoryExtensions;TrimStart<T>;(System.ReadOnlySpan<T>,System.ReadOnlySpan<T>);Argument[0].Element;ReturnValue.Element;value;dfc-generated |
+| System;MemoryExtensions;TrimStart<T>;(System.ReadOnlySpan<T>,System.ReadOnlySpan<T>);Argument[0];ReturnValue;value;dfc-generated |
+| System;MemoryExtensions;TrimStart<T>;(System.ReadOnlySpan<T>,T);Argument[0].Element;ReturnValue.Element;value;dfc-generated |
+| System;MemoryExtensions;TrimStart<T>;(System.Span<T>,System.ReadOnlySpan<T>);Argument[0].Element;ReturnValue.Element;value;dfc-generated |
+| System;MemoryExtensions;TrimStart<T>;(System.Span<T>,System.ReadOnlySpan<T>);Argument[0];ReturnValue;value;dfc-generated |
+| System;MemoryExtensions;TrimStart<T>;(System.Span<T>,T);Argument[0].Element;ReturnValue.Element;value;dfc-generated |
+| System;MemoryExtensions;TryWrite;(System.Span<System.Char>,System.IFormatProvider,System.MemoryExtensions+TryWriteInterpolatedStringHandler,System.Int32);Argument[2];ReturnValue;value;dfc-generated |
+| System;MemoryExtensions;TryWrite;(System.Span<System.Char>,System.MemoryExtensions+TryWriteInterpolatedStringHandler,System.Int32);Argument[1];ReturnValue;value;dfc-generated |
+| System;MissingFieldException;MissingFieldException;(System.String,System.String);Argument[0];Argument[this].Field[System.MissingMemberException.ClassName];value;dfc-generated |
+| System;MissingFieldException;MissingFieldException;(System.String,System.String);Argument[1];Argument[this].Field[System.MissingMemberException.MemberName];value;dfc-generated |
+| System;MissingFieldException;get_Message;();Argument[this].SyntheticField[System.Exception._message];ReturnValue;value;dfc-generated |
 | System;MissingMemberException;GetObjectData;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);Argument[this];Argument[0];taint;df-generated |
-| System;MissingMemberException;MissingMemberException;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);Argument[0];Argument[this];taint;df-generated |
-| System;MissingMemberException;MissingMemberException;(System.String,System.String);Argument[0];Argument[this];taint;df-generated |
-| System;MissingMemberException;MissingMemberException;(System.String,System.String);Argument[1];Argument[this];taint;df-generated |
-| System;MissingMemberException;get_Message;();Argument[this];ReturnValue;taint;df-generated |
-| System;MissingMethodException;MissingMethodException;(System.String,System.String);Argument[0];Argument[this];taint;df-generated |
-| System;MissingMethodException;MissingMethodException;(System.String,System.String);Argument[1];Argument[this];taint;df-generated |
-| System;MissingMethodException;get_Message;();Argument[this];ReturnValue;taint;df-generated |
-| System;MulticastDelegate;CombineImpl;(System.Delegate);Argument[this];ReturnValue;value;df-generated |
-| System;MulticastDelegate;GetInvocationList;();Argument[this];ReturnValue;taint;df-generated |
+| System;MissingMemberException;MissingMemberException;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);Argument[0].SyntheticField[System.Runtime.Serialization.SerializationInfo._values].Element;Argument[this].Field[System.MissingMemberException.ClassName];value;dfc-generated |
+| System;MissingMemberException;MissingMemberException;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);Argument[0].SyntheticField[System.Runtime.Serialization.SerializationInfo._values].Element;Argument[this].Field[System.MissingMemberException.MemberName];value;dfc-generated |
+| System;MissingMemberException;MissingMemberException;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);Argument[0].SyntheticField[System.Runtime.Serialization.SerializationInfo._values].Element;Argument[this].Field[System.MissingMemberException.Signature];value;dfc-generated |
+| System;MissingMemberException;MissingMemberException;(System.String,System.String);Argument[0];Argument[this].Field[System.MissingMemberException.ClassName];value;dfc-generated |
+| System;MissingMemberException;MissingMemberException;(System.String,System.String);Argument[1];Argument[this].Field[System.MissingMemberException.MemberName];value;dfc-generated |
+| System;MissingMemberException;get_Message;();Argument[this].SyntheticField[System.Exception._message];ReturnValue;value;dfc-generated |
+| System;MissingMethodException;MissingMethodException;(System.String,System.String);Argument[0];Argument[this].Field[System.MissingMemberException.ClassName];value;dfc-generated |
+| System;MissingMethodException;MissingMethodException;(System.String,System.String);Argument[1];Argument[this].Field[System.MissingMemberException.MemberName];value;dfc-generated |
+| System;MissingMethodException;get_Message;();Argument[this].SyntheticField[System.Exception._message];ReturnValue;value;dfc-generated |
+| System;MulticastDelegate;CombineImpl;(System.Delegate);Argument[0];ReturnValue.SyntheticField[System.MulticastDelegate.delegates].Element;value;dfc-generated |
+| System;MulticastDelegate;CombineImpl;(System.Delegate);Argument[this];ReturnValue.SyntheticField[System.MulticastDelegate.delegates].Element;value;dfc-generated |
+| System;MulticastDelegate;CombineImpl;(System.Delegate);Argument[this];ReturnValue;value;dfc-generated |
+| System;MulticastDelegate;GetInvocationList;();Argument[this].SyntheticField[System.MulticastDelegate.delegates].Element;ReturnValue.Element;value;dfc-generated |
+| System;MulticastDelegate;GetInvocationList;();Argument[this];ReturnValue.Element;value;dfc-generated |
 | System;MulticastDelegate;GetMethodImpl;();Argument[this];ReturnValue;taint;df-generated |
 | System;MulticastDelegate;GetObjectData;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);Argument[this];Argument[0];taint;df-generated |
-| System;MulticastDelegate;RemoveImpl;(System.Delegate);Argument[this];ReturnValue;taint;df-generated |
-| System;MulticastDelegate;RemoveImpl;(System.Delegate);Argument[this];ReturnValue;value;df-generated |
+| System;MulticastDelegate;RemoveImpl;(System.Delegate);Argument[this].SyntheticField[System.MulticastDelegate.delegates].Element;ReturnValue;value;dfc-generated |
+| System;MulticastDelegate;RemoveImpl;(System.Delegate);Argument[this];ReturnValue;value;dfc-generated |
 | System;NotFiniteNumberException;GetObjectData;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);Argument[this];Argument[0];taint;df-generated |
 | System;Nullable<T>;GetValueOrDefault;();Argument[this].Property[System.Nullable`1.Value];ReturnValue;value;manual |
 | System;Nullable<T>;GetValueOrDefault;(T);Argument[0];ReturnValue;value;manual |
@@ -20198,14 +21093,13 @@ summary
 | System;Nullable<T>;get_HasValue;();Argument[this].Property[System.Nullable`1.Value];ReturnValue;taint;manual |
 | System;Nullable<T>;get_Value;();Argument[this];ReturnValue;taint;manual |
 | System;ObjectDisposedException;GetObjectData;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);Argument[this];Argument[0];taint;df-generated |
-| System;ObjectDisposedException;ObjectDisposedException;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);Argument[0];Argument[this];taint;df-generated |
-| System;ObjectDisposedException;ObjectDisposedException;(System.String,System.String);Argument[0];Argument[this];taint;df-generated |
-| System;ObjectDisposedException;get_Message;();Argument[this];ReturnValue;taint;df-generated |
-| System;ObjectDisposedException;get_ObjectName;();Argument[this];ReturnValue;taint;df-generated |
-| System;OperatingSystem;Clone;();Argument[this];ReturnValue;taint;df-generated |
-| System;OperatingSystem;Clone;();Argument[this];ReturnValue;value;df-generated |
+| System;ObjectDisposedException;ObjectDisposedException;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);Argument[0].SyntheticField[System.Runtime.Serialization.SerializationInfo._values].Element;Argument[this].SyntheticField[System.ObjectDisposedException._objectName];value;dfc-generated |
+| System;ObjectDisposedException;ObjectDisposedException;(System.String,System.String);Argument[0];Argument[this].SyntheticField[System.ObjectDisposedException._objectName];value;dfc-generated |
+| System;ObjectDisposedException;get_Message;();Argument[this].SyntheticField[System.Exception._message];ReturnValue;value;dfc-generated |
+| System;ObjectDisposedException;get_ObjectName;();Argument[this].SyntheticField[System.ObjectDisposedException._objectName];ReturnValue;value;dfc-generated |
+| System;OperatingSystem;Clone;();Argument[this];ReturnValue;value;dfc-generated |
 | System;OperatingSystem;GetObjectData;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);Argument[this];Argument[0];taint;df-generated |
-| System;OperatingSystem;ToString;();Argument[this];ReturnValue;taint;df-generated |
+| System;OperatingSystem;ToString;();Argument[this].Property[System.OperatingSystem.VersionString];ReturnValue;value;dfc-generated |
 | System;OperatingSystem;get_ServicePack;();Argument[this];ReturnValue;taint;df-generated |
 | System;OperatingSystem;get_Version;();Argument[this];ReturnValue;taint;df-generated |
 | System;OperatingSystem;get_VersionString;();Argument[this];ReturnValue;taint;df-generated |
@@ -20216,14 +21110,14 @@ summary
 | System;Progress<T>;Progress;(System.Action<T>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System;Progress<T>;add_ProgressChanged;(System.EventHandler<T>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System;Progress<T>;remove_ProgressChanged;(System.EventHandler<T>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
-| System;ReadOnlyMemory<T>;CopyTo;(System.Memory<T>);Argument[this];Argument[0];taint;df-generated |
-| System;ReadOnlyMemory<T>;ReadOnlyMemory;(T[]);Argument[0].Element;Argument[this];taint;df-generated |
-| System;ReadOnlyMemory<T>;ReadOnlyMemory;(T[],System.Int32,System.Int32);Argument[0].Element;Argument[this];taint;df-generated |
-| System;ReadOnlyMemory<T>;Slice;(System.Int32);Argument[this];ReturnValue;taint;df-generated |
-| System;ReadOnlyMemory<T>;Slice;(System.Int32,System.Int32);Argument[this];ReturnValue;taint;df-generated |
-| System;ReadOnlyMemory<T>;ToArray;();Argument[this];ReturnValue;taint;df-generated |
-| System;ReadOnlyMemory<T>;ToString;();Argument[this];ReturnValue;taint;df-generated |
-| System;ReadOnlyMemory<T>;TryCopyTo;(System.Memory<T>);Argument[this];Argument[0];taint;df-generated |
+| System;ReadOnlyMemory<T>;CopyTo;(System.Memory<T>);Argument[this].Property[System.ReadOnlyMemory`1.Span].Element;Argument[0].Property[System.Memory`1.Span].Element;value;dfc-generated |
+| System;ReadOnlyMemory<T>;ReadOnlyMemory;(T[]);Argument[0];Argument[this].SyntheticField[System.ReadOnlyMemory`1._object];value;dfc-generated |
+| System;ReadOnlyMemory<T>;ReadOnlyMemory;(T[],System.Int32,System.Int32);Argument[0];Argument[this].SyntheticField[System.ReadOnlyMemory`1._object];value;dfc-generated |
+| System;ReadOnlyMemory<T>;Slice;(System.Int32);Argument[this].SyntheticField[System.ReadOnlyMemory`1._object];ReturnValue.SyntheticField[System.ReadOnlyMemory`1._object];value;dfc-generated |
+| System;ReadOnlyMemory<T>;Slice;(System.Int32,System.Int32);Argument[this].SyntheticField[System.ReadOnlyMemory`1._object];ReturnValue.SyntheticField[System.ReadOnlyMemory`1._object];value;dfc-generated |
+| System;ReadOnlyMemory<T>;ToArray;();Argument[this].Property[System.ReadOnlyMemory`1.Span].Element;ReturnValue.Element;value;dfc-generated |
+| System;ReadOnlyMemory<T>;ToString;();Argument[this].SyntheticField[System.ReadOnlyMemory`1._object];ReturnValue;value;dfc-generated |
+| System;ReadOnlyMemory<T>;TryCopyTo;(System.Memory<T>);Argument[this].Property[System.ReadOnlyMemory`1.Span].Element;Argument[0].Property[System.Memory`1.Span].Element;value;dfc-generated |
 | System;ReadOnlySpan<T>;CopyTo;(System.Span<T>);Argument[this].Element;Argument[0].Element;value;manual |
 | System;ReadOnlySpan<T>;GetEnumerator;();Argument[this];ReturnValue;taint;df-generated |
 | System;ReadOnlySpan<T>;GetPinnableReference;();Argument[this].Element;ReturnValue;value;manual |
@@ -20236,68 +21130,65 @@ summary
 | System;ReadOnlySpan<T>;TryCopyTo;(System.Span<T>);Argument[this].Element;Argument[0].Element;value;manual |
 | System;ReadOnlySpan<T>;get_Item;(System.Int32);Argument[this].Element;ReturnValue;value;manual |
 | System;ResolveEventHandler;BeginInvoke;(System.Object,System.ResolveEventArgs,System.AsyncCallback,System.Object);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
-| System;RuntimeFieldHandle;FromIntPtr;(System.IntPtr);Argument[0];ReturnValue;taint;df-generated |
+| System;RuntimeFieldHandle;FromIntPtr;(System.IntPtr);Argument[0];ReturnValue.SyntheticField[System.RuntimeFieldHandle.value];value;dfc-generated |
 | System;RuntimeFieldHandle;GetObjectData;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);Argument[this];Argument[0];taint;df-generated |
-| System;RuntimeFieldHandle;ToIntPtr;(System.RuntimeFieldHandle);Argument[0];ReturnValue;taint;df-generated |
-| System;RuntimeFieldHandle;get_Value;();Argument[this];ReturnValue;taint;df-generated |
-| System;RuntimeMethodHandle;FromIntPtr;(System.IntPtr);Argument[0];ReturnValue;taint;df-generated |
+| System;RuntimeFieldHandle;ToIntPtr;(System.RuntimeFieldHandle);Argument[0].Property[System.RuntimeFieldHandle.Value];ReturnValue;value;dfc-generated |
+| System;RuntimeFieldHandle;ToIntPtr;(System.RuntimeFieldHandle);Argument[0].SyntheticField[System.RuntimeFieldHandle.value];ReturnValue;value;dfc-generated |
+| System;RuntimeFieldHandle;get_Value;();Argument[this].SyntheticField[System.RuntimeFieldHandle.value];ReturnValue;value;dfc-generated |
+| System;RuntimeMethodHandle;FromIntPtr;(System.IntPtr);Argument[0];ReturnValue.SyntheticField[System.RuntimeMethodHandle.value];value;dfc-generated |
 | System;RuntimeMethodHandle;GetObjectData;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);Argument[this];Argument[0];taint;df-generated |
-| System;RuntimeMethodHandle;ToIntPtr;(System.RuntimeMethodHandle);Argument[0];ReturnValue;taint;df-generated |
-| System;RuntimeMethodHandle;get_Value;();Argument[this];ReturnValue;taint;df-generated |
-| System;RuntimeTypeHandle;FromIntPtr;(System.IntPtr);Argument[0];ReturnValue;taint;df-generated |
+| System;RuntimeMethodHandle;ToIntPtr;(System.RuntimeMethodHandle);Argument[0].Property[System.RuntimeMethodHandle.Value];ReturnValue;value;dfc-generated |
+| System;RuntimeMethodHandle;ToIntPtr;(System.RuntimeMethodHandle);Argument[0].SyntheticField[System.RuntimeMethodHandle.value];ReturnValue;value;dfc-generated |
+| System;RuntimeMethodHandle;get_Value;();Argument[this].SyntheticField[System.RuntimeMethodHandle.value];ReturnValue;value;dfc-generated |
+| System;RuntimeTypeHandle;FromIntPtr;(System.IntPtr);Argument[0];ReturnValue.SyntheticField[System.RuntimeTypeHandle.value];value;dfc-generated |
 | System;RuntimeTypeHandle;GetObjectData;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);Argument[this];Argument[0];taint;df-generated |
-| System;RuntimeTypeHandle;ToIntPtr;(System.RuntimeTypeHandle);Argument[0];ReturnValue;taint;df-generated |
-| System;RuntimeTypeHandle;get_Value;();Argument[this];ReturnValue;taint;df-generated |
-| System;SByte;Clamp;(System.SByte,System.SByte,System.SByte);Argument[0];ReturnValue;taint;df-generated |
-| System;SByte;Clamp;(System.SByte,System.SByte,System.SByte);Argument[1];ReturnValue;taint;df-generated |
-| System;SByte;Clamp;(System.SByte,System.SByte,System.SByte);Argument[2];ReturnValue;taint;df-generated |
-| System;SByte;CopySign;(System.SByte,System.SByte);Argument[0];ReturnValue;taint;df-generated |
-| System;SByte;CreateChecked<TOther>;(TOther);Argument[0];ReturnValue;taint;df-generated |
-| System;SByte;CreateSaturating<TOther>;(TOther);Argument[0];ReturnValue;taint;df-generated |
-| System;SByte;CreateTruncating<TOther>;(TOther);Argument[0];ReturnValue;taint;df-generated |
-| System;SByte;Max;(System.SByte,System.SByte);Argument[0];ReturnValue;taint;df-generated |
-| System;SByte;Max;(System.SByte,System.SByte);Argument[1];ReturnValue;taint;df-generated |
-| System;SByte;MaxNumber;(System.SByte,System.SByte);Argument[0];ReturnValue;taint;df-generated |
-| System;SByte;MaxNumber;(System.SByte,System.SByte);Argument[1];ReturnValue;taint;df-generated |
-| System;SByte;Min;(System.SByte,System.SByte);Argument[0];ReturnValue;taint;df-generated |
-| System;SByte;Min;(System.SByte,System.SByte);Argument[1];ReturnValue;taint;df-generated |
-| System;SByte;MinNumber;(System.SByte,System.SByte);Argument[0];ReturnValue;taint;df-generated |
-| System;SByte;MinNumber;(System.SByte,System.SByte);Argument[1];ReturnValue;taint;df-generated |
-| System;SByte;System.Numerics.IAdditionOperators<System.SByte,System.SByte,System.SByte>.op_CheckedAddition;(System.SByte,System.SByte);Argument[0];ReturnValue;taint;df-generated |
-| System;SByte;System.Numerics.IAdditionOperators<System.SByte,System.SByte,System.SByte>.op_CheckedAddition;(System.SByte,System.SByte);Argument[1];ReturnValue;taint;df-generated |
+| System;RuntimeTypeHandle;ToIntPtr;(System.RuntimeTypeHandle);Argument[0].Property[System.RuntimeTypeHandle.Value];ReturnValue;value;dfc-generated |
+| System;RuntimeTypeHandle;ToIntPtr;(System.RuntimeTypeHandle);Argument[0].SyntheticField[System.RuntimeTypeHandle.value];ReturnValue;value;dfc-generated |
+| System;RuntimeTypeHandle;get_Value;();Argument[this].SyntheticField[System.RuntimeTypeHandle.value];ReturnValue;value;dfc-generated |
+| System;SByte;Clamp;(System.SByte,System.SByte,System.SByte);Argument[0];ReturnValue;value;dfc-generated |
+| System;SByte;Clamp;(System.SByte,System.SByte,System.SByte);Argument[1];ReturnValue;value;dfc-generated |
+| System;SByte;Clamp;(System.SByte,System.SByte,System.SByte);Argument[2];ReturnValue;value;dfc-generated |
+| System;SByte;CopySign;(System.SByte,System.SByte);Argument[0];ReturnValue;value;dfc-generated |
+| System;SByte;CreateChecked<TOther>;(TOther);Argument[0];ReturnValue;value;dfc-generated |
+| System;SByte;CreateSaturating<TOther>;(TOther);Argument[0];ReturnValue;value;dfc-generated |
+| System;SByte;CreateTruncating<TOther>;(TOther);Argument[0];ReturnValue;value;dfc-generated |
+| System;SByte;Max;(System.SByte,System.SByte);Argument[0];ReturnValue;value;dfc-generated |
+| System;SByte;Max;(System.SByte,System.SByte);Argument[1];ReturnValue;value;dfc-generated |
+| System;SByte;MaxNumber;(System.SByte,System.SByte);Argument[0];ReturnValue;value;dfc-generated |
+| System;SByte;MaxNumber;(System.SByte,System.SByte);Argument[1];ReturnValue;value;dfc-generated |
+| System;SByte;Min;(System.SByte,System.SByte);Argument[0];ReturnValue;value;dfc-generated |
+| System;SByte;Min;(System.SByte,System.SByte);Argument[1];ReturnValue;value;dfc-generated |
+| System;SByte;MinNumber;(System.SByte,System.SByte);Argument[0];ReturnValue;value;dfc-generated |
+| System;SByte;MinNumber;(System.SByte,System.SByte);Argument[1];ReturnValue;value;dfc-generated |
+| System;SByte;System.Numerics.IAdditionOperators<System.SByte,System.SByte,System.SByte>.op_CheckedAddition;(System.SByte,System.SByte);Argument[0];ReturnValue;taint;dfc-generated |
+| System;SByte;System.Numerics.IAdditionOperators<System.SByte,System.SByte,System.SByte>.op_CheckedAddition;(System.SByte,System.SByte);Argument[1];ReturnValue;taint;dfc-generated |
 | System;SByte;ToDateTime;(System.IFormatProvider);Argument[this];ReturnValue;value;df-generated |
 | System;SByte;ToDecimal;(System.IFormatProvider);Argument[this];ReturnValue;value;df-generated |
-| System;SByte;ToString;(System.IFormatProvider);Argument[0];ReturnValue;taint;df-generated |
-| System;SByte;ToString;(System.IFormatProvider);Argument[this];ReturnValue;value;df-generated |
-| System;SByte;ToString;(System.String,System.IFormatProvider);Argument[1];ReturnValue;taint;df-generated |
-| System;SByte;ToString;(System.String,System.IFormatProvider);Argument[this];ReturnValue;taint;df-generated |
-| System;SByte;ToType;(System.Type,System.IFormatProvider);Argument[1];ReturnValue;taint;df-generated |
-| System;SByte;ToType;(System.Type,System.IFormatProvider);Argument[this];ReturnValue;taint;df-generated |
-| System;SequencePosition;GetObject;();Argument[this];ReturnValue;taint;df-generated |
-| System;SequencePosition;SequencePosition;(System.Object,System.Int32);Argument[0];Argument[this];taint;df-generated |
-| System;Single;Clamp;(System.Single,System.Single,System.Single);Argument[0];ReturnValue;taint;df-generated |
-| System;Single;Clamp;(System.Single,System.Single,System.Single);Argument[1];ReturnValue;taint;df-generated |
-| System;Single;Clamp;(System.Single,System.Single,System.Single);Argument[2];ReturnValue;taint;df-generated |
-| System;Single;CopySign;(System.Single,System.Single);Argument[0];ReturnValue;taint;df-generated |
-| System;Single;CreateChecked<TOther>;(TOther);Argument[0];ReturnValue;taint;df-generated |
-| System;Single;CreateSaturating<TOther>;(TOther);Argument[0];ReturnValue;taint;df-generated |
-| System;Single;CreateTruncating<TOther>;(TOther);Argument[0];ReturnValue;taint;df-generated |
-| System;Single;Max;(System.Single,System.Single);Argument[0];ReturnValue;taint;df-generated |
-| System;Single;Max;(System.Single,System.Single);Argument[1];ReturnValue;taint;df-generated |
-| System;Single;MaxNumber;(System.Single,System.Single);Argument[0];ReturnValue;taint;df-generated |
-| System;Single;MaxNumber;(System.Single,System.Single);Argument[1];ReturnValue;taint;df-generated |
-| System;Single;Min;(System.Single,System.Single);Argument[0];ReturnValue;taint;df-generated |
-| System;Single;Min;(System.Single,System.Single);Argument[1];ReturnValue;taint;df-generated |
-| System;Single;MinNumber;(System.Single,System.Single);Argument[0];ReturnValue;taint;df-generated |
-| System;Single;MinNumber;(System.Single,System.Single);Argument[1];ReturnValue;taint;df-generated |
+| System;SByte;ToString;(System.IFormatProvider);Argument[this];ReturnValue;value;dfc-generated |
+| System;SByte;ToString;(System.String,System.IFormatProvider);Argument[this];ReturnValue;taint;dfc-generated |
+| System;SByte;ToType;(System.Type,System.IFormatProvider);Argument[this];ReturnValue;value;dfc-generated |
+| System;SequencePosition;GetObject;();Argument[this].SyntheticField[System.SequencePosition._object];ReturnValue;value;dfc-generated |
+| System;SequencePosition;SequencePosition;(System.Object,System.Int32);Argument[0];Argument[this].SyntheticField[System.SequencePosition._object];value;dfc-generated |
+| System;Single;Clamp;(System.Single,System.Single,System.Single);Argument[0];ReturnValue;value;dfc-generated |
+| System;Single;Clamp;(System.Single,System.Single,System.Single);Argument[1];ReturnValue;value;dfc-generated |
+| System;Single;Clamp;(System.Single,System.Single,System.Single);Argument[2];ReturnValue;value;dfc-generated |
+| System;Single;CopySign;(System.Single,System.Single);Argument[0];ReturnValue;value;dfc-generated |
+| System;Single;CreateChecked<TOther>;(TOther);Argument[0];ReturnValue;value;dfc-generated |
+| System;Single;CreateSaturating<TOther>;(TOther);Argument[0];ReturnValue;value;dfc-generated |
+| System;Single;CreateTruncating<TOther>;(TOther);Argument[0];ReturnValue;value;dfc-generated |
+| System;Single;Max;(System.Single,System.Single);Argument[0];ReturnValue;value;dfc-generated |
+| System;Single;Max;(System.Single,System.Single);Argument[1];ReturnValue;value;dfc-generated |
+| System;Single;MaxNumber;(System.Single,System.Single);Argument[0];ReturnValue;value;dfc-generated |
+| System;Single;MaxNumber;(System.Single,System.Single);Argument[1];ReturnValue;value;dfc-generated |
+| System;Single;Min;(System.Single,System.Single);Argument[0];ReturnValue;value;dfc-generated |
+| System;Single;Min;(System.Single,System.Single);Argument[1];ReturnValue;value;dfc-generated |
+| System;Single;MinNumber;(System.Single,System.Single);Argument[0];ReturnValue;value;dfc-generated |
+| System;Single;MinNumber;(System.Single,System.Single);Argument[1];ReturnValue;value;dfc-generated |
 | System;Single;ToDateTime;(System.IFormatProvider);Argument[this];ReturnValue;value;df-generated |
 | System;Single;ToDecimal;(System.IFormatProvider);Argument[this];ReturnValue;value;df-generated |
-| System;Single;ToString;(System.IFormatProvider);Argument[0];ReturnValue;taint;df-generated |
-| System;Single;ToString;(System.IFormatProvider);Argument[this];ReturnValue;value;df-generated |
-| System;Single;ToString;(System.String,System.IFormatProvider);Argument[1];ReturnValue;taint;df-generated |
-| System;Single;ToString;(System.String,System.IFormatProvider);Argument[this];ReturnValue;taint;df-generated |
-| System;Single;ToType;(System.Type,System.IFormatProvider);Argument[1];ReturnValue;taint;df-generated |
-| System;Single;ToType;(System.Type,System.IFormatProvider);Argument[this];ReturnValue;taint;df-generated |
+| System;Single;ToString;(System.IFormatProvider);Argument[this];ReturnValue;value;dfc-generated |
+| System;Single;ToString;(System.String,System.IFormatProvider);Argument[this];ReturnValue;taint;dfc-generated |
+| System;Single;ToType;(System.Type,System.IFormatProvider);Argument[this];ReturnValue;value;dfc-generated |
 | System;Span<T>;Clear;();Argument[this].WithoutElement;Argument[this];value;manual |
 | System;Span<T>;CopyTo;(System.Span<T>);Argument[this].Element;Argument[0].Element;value;manual |
 | System;Span<T>;Fill;(T);Argument[0];Argument[this].Element;value;manual |
@@ -20341,6 +21232,11 @@ summary
 | System;String;Concat;(System.String[]);Argument[0].Element;ReturnValue;taint;manual |
 | System;String;Concat<T>;(System.Collections.Generic.IEnumerable<T>);Argument[0].Element;ReturnValue;taint;manual |
 | System;String;Copy;(System.String);Argument[0];ReturnValue;value;manual |
+| System;String;Create;(System.IFormatProvider,System.Runtime.CompilerServices.DefaultInterpolatedStringHandler);Argument[1];ReturnValue;value;dfc-generated |
+| System;String;Create;(System.IFormatProvider,System.Span<System.Char>,System.Runtime.CompilerServices.DefaultInterpolatedStringHandler);Argument[2];ReturnValue;value;dfc-generated |
+| System;String;Create<TState>;(System.Int32,TState,System.Buffers.SpanAction<System.Char,TState>);Argument[1];Argument[2].Parameter[1];value;dfc-generated |
+| System;String;Create<TState>;(System.Int32,TState,System.Buffers.SpanAction<System.Char,TState>);Argument[1];Argument[2].Parameter[1];value;hq-generated |
+| System;String;Create<TState>;(System.Int32,TState,System.Buffers.SpanAction<System.Char,TState>);Argument[2];Argument[2].Parameter[delegate-self];value;dfc-generated |
 | System;String;Create<TState>;(System.Int32,TState,System.Buffers.SpanAction<System.Char,TState>);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
 | System;String;EnumerateRunes;();Argument[this];ReturnValue;taint;df-generated |
 | System;String;Format;(System.IFormatProvider,System.String,System.Object);Argument[1];ReturnValue;taint;manual |
@@ -20354,8 +21250,8 @@ summary
 | System;String;Format;(System.IFormatProvider,System.String,System.Object,System.Object,System.Object);Argument[4];ReturnValue;taint;manual |
 | System;String;Format;(System.IFormatProvider,System.String,System.Object[]);Argument[1];ReturnValue;taint;manual |
 | System;String;Format;(System.IFormatProvider,System.String,System.Object[]);Argument[2].Element;ReturnValue;taint;manual |
-| System;String;Format;(System.IFormatProvider,System.Text.CompositeFormat,System.Object[]);Argument[1];ReturnValue;taint;df-generated |
-| System;String;Format;(System.IFormatProvider,System.Text.CompositeFormat,System.ReadOnlySpan<System.Object>);Argument[1];ReturnValue;taint;df-generated |
+| System;String;Format;(System.IFormatProvider,System.Text.CompositeFormat,System.Object[]);Argument[1].Property[System.Text.CompositeFormat.Format];ReturnValue;value;dfc-generated |
+| System;String;Format;(System.IFormatProvider,System.Text.CompositeFormat,System.ReadOnlySpan<System.Object>);Argument[1].Property[System.Text.CompositeFormat.Format];ReturnValue;value;dfc-generated |
 | System;String;Format;(System.String,System.Object);Argument[0];ReturnValue;taint;manual |
 | System;String;Format;(System.String,System.Object);Argument[1];ReturnValue;taint;manual |
 | System;String;Format;(System.String,System.Object,System.Object);Argument[0];ReturnValue;taint;manual |
@@ -20367,9 +21263,9 @@ summary
 | System;String;Format;(System.String,System.Object,System.Object,System.Object);Argument[3];ReturnValue;taint;manual |
 | System;String;Format;(System.String,System.Object[]);Argument[0];ReturnValue;taint;manual |
 | System;String;Format;(System.String,System.Object[]);Argument[1].Element;ReturnValue;taint;manual |
-| System;String;Format<TArg0,TArg1,TArg2>;(System.IFormatProvider,System.Text.CompositeFormat,TArg0,TArg1,TArg2);Argument[1];ReturnValue;taint;df-generated |
-| System;String;Format<TArg0,TArg1>;(System.IFormatProvider,System.Text.CompositeFormat,TArg0,TArg1);Argument[1];ReturnValue;taint;df-generated |
-| System;String;Format<TArg0>;(System.IFormatProvider,System.Text.CompositeFormat,TArg0);Argument[1];ReturnValue;taint;df-generated |
+| System;String;Format<TArg0,TArg1,TArg2>;(System.IFormatProvider,System.Text.CompositeFormat,TArg0,TArg1,TArg2);Argument[1].Property[System.Text.CompositeFormat.Format];ReturnValue;value;dfc-generated |
+| System;String;Format<TArg0,TArg1>;(System.IFormatProvider,System.Text.CompositeFormat,TArg0,TArg1);Argument[1].Property[System.Text.CompositeFormat.Format];ReturnValue;value;dfc-generated |
+| System;String;Format<TArg0>;(System.IFormatProvider,System.Text.CompositeFormat,TArg0);Argument[1].Property[System.Text.CompositeFormat.Format];ReturnValue;value;dfc-generated |
 | System;String;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.CharEnumerator.Current];value;manual |
 | System;String;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.Generic.IEnumerator`1.Current];value;manual |
 | System;String;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.IEnumerator.Current];value;manual |
@@ -20399,18 +21295,18 @@ summary
 | System;String;PadLeft;(System.Int32,System.Char);Argument[this];ReturnValue;taint;manual |
 | System;String;PadRight;(System.Int32);Argument[this];ReturnValue;taint;manual |
 | System;String;PadRight;(System.Int32,System.Char);Argument[this];ReturnValue;taint;manual |
-| System;String;Parse;(System.String,System.IFormatProvider);Argument[0];ReturnValue;taint;df-generated |
+| System;String;Parse;(System.String,System.IFormatProvider);Argument[0];ReturnValue;value;dfc-generated |
 | System;String;Remove;(System.Int32);Argument[this];ReturnValue;taint;manual |
 | System;String;Remove;(System.Int32,System.Int32);Argument[this];ReturnValue;taint;manual |
 | System;String;Replace;(System.Char,System.Char);Argument[1];ReturnValue;taint;manual |
 | System;String;Replace;(System.Char,System.Char);Argument[this];ReturnValue;taint;manual |
 | System;String;Replace;(System.String,System.String);Argument[1];ReturnValue;taint;manual |
 | System;String;Replace;(System.String,System.String);Argument[this];ReturnValue;taint;manual |
-| System;String;Replace;(System.String,System.String,System.Boolean,System.Globalization.CultureInfo);Argument[this];ReturnValue;taint;df-generated |
-| System;String;Replace;(System.String,System.String,System.StringComparison);Argument[1];ReturnValue;taint;df-generated |
-| System;String;Replace;(System.String,System.String,System.StringComparison);Argument[this];ReturnValue;taint;df-generated |
-| System;String;ReplaceLineEndings;();Argument[this];ReturnValue;taint;df-generated |
-| System;String;ReplaceLineEndings;(System.String);Argument[this];ReturnValue;taint;df-generated |
+| System;String;Replace;(System.String,System.String,System.Boolean,System.Globalization.CultureInfo);Argument[this];ReturnValue;value;dfc-generated |
+| System;String;Replace;(System.String,System.String,System.StringComparison);Argument[1];ReturnValue;taint;dfc-generated |
+| System;String;Replace;(System.String,System.String,System.StringComparison);Argument[this];ReturnValue;value;dfc-generated |
+| System;String;ReplaceLineEndings;();Argument[this];ReturnValue;value;dfc-generated |
+| System;String;ReplaceLineEndings;(System.String);Argument[this];ReturnValue;value;dfc-generated |
 | System;String;Split;(System.Char,System.Int32,System.StringSplitOptions);Argument[this];ReturnValue.Element;taint;manual |
 | System;String;Split;(System.Char,System.StringSplitOptions);Argument[this];ReturnValue.Element;taint;manual |
 | System;String;Split;(System.Char[]);Argument[this];ReturnValue.Element;taint;manual |
@@ -20432,8 +21328,7 @@ summary
 | System;String;ToLowerInvariant;();Argument[this];ReturnValue;taint;manual |
 | System;String;ToString;();Argument[this];ReturnValue;value;manual |
 | System;String;ToString;(System.IFormatProvider);Argument[this];ReturnValue;value;manual |
-| System;String;ToType;(System.Type,System.IFormatProvider);Argument[1];ReturnValue;taint;df-generated |
-| System;String;ToType;(System.Type,System.IFormatProvider);Argument[this];ReturnValue;taint;df-generated |
+| System;String;ToType;(System.Type,System.IFormatProvider);Argument[this];ReturnValue;value;dfc-generated |
 | System;String;ToUpper;();Argument[this];ReturnValue;taint;manual |
 | System;String;ToUpper;(System.Globalization.CultureInfo);Argument[this];ReturnValue;taint;manual |
 | System;String;ToUpperInvariant;();Argument[this];ReturnValue;taint;manual |
@@ -20446,58 +21341,63 @@ summary
 | System;String;TrimStart;();Argument[this];ReturnValue;taint;manual |
 | System;String;TrimStart;(System.Char);Argument[this];ReturnValue;taint;manual |
 | System;String;TrimStart;(System.Char[]);Argument[this];ReturnValue;taint;manual |
-| System;String;TryParse;(System.String,System.IFormatProvider,System.String);Argument[0];ReturnValue;taint;df-generated |
-| System;StringNormalizationExtensions;Normalize;(System.String);Argument[0];ReturnValue;taint;df-generated |
-| System;StringNormalizationExtensions;Normalize;(System.String,System.Text.NormalizationForm);Argument[0];ReturnValue;taint;df-generated |
-| System;TimeOnly;ToString;(System.String,System.IFormatProvider);Argument[1];ReturnValue;taint;df-generated |
-| System;TimeOnly;ToString;(System.String,System.IFormatProvider);Argument[this];ReturnValue;taint;df-generated |
+| System;String;TryParse;(System.String,System.IFormatProvider,System.String);Argument[0];ReturnValue;value;dfc-generated |
+| System;StringComparer;Compare;(System.Object,System.Object);Argument[0];Argument[this];taint;df-generated |
+| System;StringComparer;Compare;(System.Object,System.Object);Argument[1];Argument[this];taint;df-generated |
+| System;StringComparer;Equals;(System.Object,System.Object);Argument[0];Argument[this];taint;df-generated |
+| System;StringComparer;Equals;(System.Object,System.Object);Argument[1];Argument[this];taint;df-generated |
+| System;StringComparer;GetHashCode;(System.Object);Argument[0];Argument[this];taint;df-generated |
+| System;StringNormalizationExtensions;Normalize;(System.String);Argument[0];ReturnValue;value;dfc-generated |
+| System;StringNormalizationExtensions;Normalize;(System.String,System.Text.NormalizationForm);Argument[0];ReturnValue;value;dfc-generated |
+| System;TimeOnly;ToString;(System.String,System.IFormatProvider);Argument[this];ReturnValue;taint;dfc-generated |
 | System;TimeProvider;CreateTimer;(System.Threading.TimerCallback,System.Object,System.TimeSpan,System.TimeSpan);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
-| System;TimeSpan;ToString;(System.String,System.IFormatProvider);Argument[1];ReturnValue;taint;df-generated |
-| System;TimeSpan;ToString;(System.String,System.IFormatProvider);Argument[this];ReturnValue;taint;df-generated |
-| System;TimeSpan;op_UnaryPlus;(System.TimeSpan);Argument[0];ReturnValue;taint;df-generated |
+| System;TimeSpan;ToString;(System.String,System.IFormatProvider);Argument[this];ReturnValue;taint;dfc-generated |
+| System;TimeSpan;op_UnaryPlus;(System.TimeSpan);Argument[0];ReturnValue;value;dfc-generated |
 | System;TimeZone;GetDaylightChanges;(System.Int32);Argument[this];ReturnValue;taint;df-generated |
 | System;TimeZone;get_DaylightName;();Argument[this];ReturnValue;taint;df-generated |
 | System;TimeZone;get_StandardName;();Argument[this];ReturnValue;taint;df-generated |
-| System;TimeZoneInfo+AdjustmentRule;CreateAdjustmentRule;(System.DateTime,System.DateTime,System.TimeSpan,System.TimeZoneInfo+TransitionTime,System.TimeZoneInfo+TransitionTime);Argument[2];ReturnValue;taint;df-generated |
-| System;TimeZoneInfo+AdjustmentRule;CreateAdjustmentRule;(System.DateTime,System.DateTime,System.TimeSpan,System.TimeZoneInfo+TransitionTime,System.TimeZoneInfo+TransitionTime);Argument[3];ReturnValue;taint;df-generated |
-| System;TimeZoneInfo+AdjustmentRule;CreateAdjustmentRule;(System.DateTime,System.DateTime,System.TimeSpan,System.TimeZoneInfo+TransitionTime,System.TimeZoneInfo+TransitionTime);Argument[4];ReturnValue;taint;df-generated |
-| System;TimeZoneInfo+AdjustmentRule;CreateAdjustmentRule;(System.DateTime,System.DateTime,System.TimeSpan,System.TimeZoneInfo+TransitionTime,System.TimeZoneInfo+TransitionTime,System.TimeSpan);Argument[2];ReturnValue;taint;df-generated |
-| System;TimeZoneInfo+AdjustmentRule;CreateAdjustmentRule;(System.DateTime,System.DateTime,System.TimeSpan,System.TimeZoneInfo+TransitionTime,System.TimeZoneInfo+TransitionTime,System.TimeSpan);Argument[3];ReturnValue;taint;df-generated |
-| System;TimeZoneInfo+AdjustmentRule;CreateAdjustmentRule;(System.DateTime,System.DateTime,System.TimeSpan,System.TimeZoneInfo+TransitionTime,System.TimeZoneInfo+TransitionTime,System.TimeSpan);Argument[4];ReturnValue;taint;df-generated |
-| System;TimeZoneInfo+AdjustmentRule;CreateAdjustmentRule;(System.DateTime,System.DateTime,System.TimeSpan,System.TimeZoneInfo+TransitionTime,System.TimeZoneInfo+TransitionTime,System.TimeSpan);Argument[5];ReturnValue;taint;df-generated |
+| System;TimeZoneInfo+AdjustmentRule;CreateAdjustmentRule;(System.DateTime,System.DateTime,System.TimeSpan,System.TimeZoneInfo+TransitionTime,System.TimeZoneInfo+TransitionTime);Argument[2];ReturnValue.SyntheticField[System.TimeZoneInfo+AdjustmentRule._daylightDelta];value;dfc-generated |
+| System;TimeZoneInfo+AdjustmentRule;CreateAdjustmentRule;(System.DateTime,System.DateTime,System.TimeSpan,System.TimeZoneInfo+TransitionTime,System.TimeZoneInfo+TransitionTime);Argument[3];ReturnValue.SyntheticField[System.TimeZoneInfo+AdjustmentRule._daylightTransitionStart];value;dfc-generated |
+| System;TimeZoneInfo+AdjustmentRule;CreateAdjustmentRule;(System.DateTime,System.DateTime,System.TimeSpan,System.TimeZoneInfo+TransitionTime,System.TimeZoneInfo+TransitionTime);Argument[4];ReturnValue.SyntheticField[System.TimeZoneInfo+AdjustmentRule._daylightTransitionEnd];value;dfc-generated |
+| System;TimeZoneInfo+AdjustmentRule;CreateAdjustmentRule;(System.DateTime,System.DateTime,System.TimeSpan,System.TimeZoneInfo+TransitionTime,System.TimeZoneInfo+TransitionTime,System.TimeSpan);Argument[2];ReturnValue.SyntheticField[System.TimeZoneInfo+AdjustmentRule._daylightDelta];value;dfc-generated |
+| System;TimeZoneInfo+AdjustmentRule;CreateAdjustmentRule;(System.DateTime,System.DateTime,System.TimeSpan,System.TimeZoneInfo+TransitionTime,System.TimeZoneInfo+TransitionTime,System.TimeSpan);Argument[3];ReturnValue.SyntheticField[System.TimeZoneInfo+AdjustmentRule._daylightTransitionStart];value;dfc-generated |
+| System;TimeZoneInfo+AdjustmentRule;CreateAdjustmentRule;(System.DateTime,System.DateTime,System.TimeSpan,System.TimeZoneInfo+TransitionTime,System.TimeZoneInfo+TransitionTime,System.TimeSpan);Argument[4];ReturnValue.SyntheticField[System.TimeZoneInfo+AdjustmentRule._daylightTransitionEnd];value;dfc-generated |
+| System;TimeZoneInfo+AdjustmentRule;CreateAdjustmentRule;(System.DateTime,System.DateTime,System.TimeSpan,System.TimeZoneInfo+TransitionTime,System.TimeZoneInfo+TransitionTime,System.TimeSpan);Argument[5];ReturnValue.SyntheticField[System.TimeZoneInfo+AdjustmentRule._baseUtcOffsetDelta];value;dfc-generated |
 | System;TimeZoneInfo+AdjustmentRule;GetObjectData;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);Argument[this];Argument[0];taint;df-generated |
-| System;TimeZoneInfo+AdjustmentRule;get_BaseUtcOffsetDelta;();Argument[this];ReturnValue;taint;df-generated |
-| System;TimeZoneInfo+AdjustmentRule;get_DaylightDelta;();Argument[this];ReturnValue;taint;df-generated |
-| System;TimeZoneInfo+AdjustmentRule;get_DaylightTransitionEnd;();Argument[this];ReturnValue;taint;df-generated |
-| System;TimeZoneInfo+AdjustmentRule;get_DaylightTransitionStart;();Argument[this];ReturnValue;taint;df-generated |
+| System;TimeZoneInfo+AdjustmentRule;get_BaseUtcOffsetDelta;();Argument[this].SyntheticField[System.TimeZoneInfo+AdjustmentRule._baseUtcOffsetDelta];ReturnValue;value;dfc-generated |
+| System;TimeZoneInfo+AdjustmentRule;get_DaylightDelta;();Argument[this].SyntheticField[System.TimeZoneInfo+AdjustmentRule._daylightDelta];ReturnValue;value;dfc-generated |
+| System;TimeZoneInfo+AdjustmentRule;get_DaylightTransitionEnd;();Argument[this].SyntheticField[System.TimeZoneInfo+AdjustmentRule._daylightTransitionEnd];ReturnValue;value;dfc-generated |
+| System;TimeZoneInfo+AdjustmentRule;get_DaylightTransitionStart;();Argument[this].SyntheticField[System.TimeZoneInfo+AdjustmentRule._daylightTransitionStart];ReturnValue;value;dfc-generated |
 | System;TimeZoneInfo+TransitionTime;GetObjectData;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);Argument[this];Argument[0];taint;df-generated |
-| System;TimeZoneInfo;CreateCustomTimeZone;(System.String,System.TimeSpan,System.String,System.String);Argument[0];ReturnValue;taint;df-generated |
-| System;TimeZoneInfo;CreateCustomTimeZone;(System.String,System.TimeSpan,System.String,System.String);Argument[1];ReturnValue;taint;df-generated |
-| System;TimeZoneInfo;CreateCustomTimeZone;(System.String,System.TimeSpan,System.String,System.String);Argument[2];ReturnValue;taint;df-generated |
-| System;TimeZoneInfo;CreateCustomTimeZone;(System.String,System.TimeSpan,System.String,System.String);Argument[3];ReturnValue;taint;df-generated |
-| System;TimeZoneInfo;CreateCustomTimeZone;(System.String,System.TimeSpan,System.String,System.String,System.String,System.TimeZoneInfo+AdjustmentRule[]);Argument[0];ReturnValue;taint;df-generated |
-| System;TimeZoneInfo;CreateCustomTimeZone;(System.String,System.TimeSpan,System.String,System.String,System.String,System.TimeZoneInfo+AdjustmentRule[]);Argument[1];ReturnValue;taint;df-generated |
-| System;TimeZoneInfo;CreateCustomTimeZone;(System.String,System.TimeSpan,System.String,System.String,System.String,System.TimeZoneInfo+AdjustmentRule[]);Argument[2];ReturnValue;taint;df-generated |
-| System;TimeZoneInfo;CreateCustomTimeZone;(System.String,System.TimeSpan,System.String,System.String,System.String,System.TimeZoneInfo+AdjustmentRule[]);Argument[3];ReturnValue;taint;df-generated |
-| System;TimeZoneInfo;CreateCustomTimeZone;(System.String,System.TimeSpan,System.String,System.String,System.String,System.TimeZoneInfo+AdjustmentRule[]);Argument[4];ReturnValue;taint;df-generated |
-| System;TimeZoneInfo;CreateCustomTimeZone;(System.String,System.TimeSpan,System.String,System.String,System.String,System.TimeZoneInfo+AdjustmentRule[]);Argument[5].Element;ReturnValue;taint;df-generated |
-| System;TimeZoneInfo;CreateCustomTimeZone;(System.String,System.TimeSpan,System.String,System.String,System.String,System.TimeZoneInfo+AdjustmentRule[],System.Boolean);Argument[0];ReturnValue;taint;df-generated |
-| System;TimeZoneInfo;CreateCustomTimeZone;(System.String,System.TimeSpan,System.String,System.String,System.String,System.TimeZoneInfo+AdjustmentRule[],System.Boolean);Argument[1];ReturnValue;taint;df-generated |
-| System;TimeZoneInfo;CreateCustomTimeZone;(System.String,System.TimeSpan,System.String,System.String,System.String,System.TimeZoneInfo+AdjustmentRule[],System.Boolean);Argument[2];ReturnValue;taint;df-generated |
-| System;TimeZoneInfo;CreateCustomTimeZone;(System.String,System.TimeSpan,System.String,System.String,System.String,System.TimeZoneInfo+AdjustmentRule[],System.Boolean);Argument[3];ReturnValue;taint;df-generated |
-| System;TimeZoneInfo;CreateCustomTimeZone;(System.String,System.TimeSpan,System.String,System.String,System.String,System.TimeZoneInfo+AdjustmentRule[],System.Boolean);Argument[4];ReturnValue;taint;df-generated |
-| System;TimeZoneInfo;CreateCustomTimeZone;(System.String,System.TimeSpan,System.String,System.String,System.String,System.TimeZoneInfo+AdjustmentRule[],System.Boolean);Argument[5].Element;ReturnValue;taint;df-generated |
-| System;TimeZoneInfo;FindSystemTimeZoneById;(System.String);Argument[0];ReturnValue;taint;df-generated |
+| System;TimeZoneInfo;CreateCustomTimeZone;(System.String,System.TimeSpan,System.String,System.String);Argument[0];ReturnValue.SyntheticField[System.TimeZoneInfo._id];value;dfc-generated |
+| System;TimeZoneInfo;CreateCustomTimeZone;(System.String,System.TimeSpan,System.String,System.String);Argument[1];ReturnValue.SyntheticField[System.TimeZoneInfo._baseUtcOffset];value;dfc-generated |
+| System;TimeZoneInfo;CreateCustomTimeZone;(System.String,System.TimeSpan,System.String,System.String);Argument[2];ReturnValue.SyntheticField[System.TimeZoneInfo._displayName];value;dfc-generated |
+| System;TimeZoneInfo;CreateCustomTimeZone;(System.String,System.TimeSpan,System.String,System.String);Argument[3];ReturnValue.SyntheticField[System.TimeZoneInfo._daylightDisplayName];value;dfc-generated |
+| System;TimeZoneInfo;CreateCustomTimeZone;(System.String,System.TimeSpan,System.String,System.String);Argument[3];ReturnValue.SyntheticField[System.TimeZoneInfo._standardDisplayName];value;dfc-generated |
+| System;TimeZoneInfo;CreateCustomTimeZone;(System.String,System.TimeSpan,System.String,System.String,System.String,System.TimeZoneInfo+AdjustmentRule[]);Argument[0];ReturnValue.SyntheticField[System.TimeZoneInfo._id];value;dfc-generated |
+| System;TimeZoneInfo;CreateCustomTimeZone;(System.String,System.TimeSpan,System.String,System.String,System.String,System.TimeZoneInfo+AdjustmentRule[]);Argument[1];ReturnValue.SyntheticField[System.TimeZoneInfo._baseUtcOffset];value;dfc-generated |
+| System;TimeZoneInfo;CreateCustomTimeZone;(System.String,System.TimeSpan,System.String,System.String,System.String,System.TimeZoneInfo+AdjustmentRule[]);Argument[2];ReturnValue.SyntheticField[System.TimeZoneInfo._displayName];value;dfc-generated |
+| System;TimeZoneInfo;CreateCustomTimeZone;(System.String,System.TimeSpan,System.String,System.String,System.String,System.TimeZoneInfo+AdjustmentRule[]);Argument[3];ReturnValue.SyntheticField[System.TimeZoneInfo._standardDisplayName];value;dfc-generated |
+| System;TimeZoneInfo;CreateCustomTimeZone;(System.String,System.TimeSpan,System.String,System.String,System.String,System.TimeZoneInfo+AdjustmentRule[]);Argument[4];ReturnValue.SyntheticField[System.TimeZoneInfo._daylightDisplayName];value;dfc-generated |
+| System;TimeZoneInfo;CreateCustomTimeZone;(System.String,System.TimeSpan,System.String,System.String,System.String,System.TimeZoneInfo+AdjustmentRule[],System.Boolean);Argument[0];ReturnValue.SyntheticField[System.TimeZoneInfo._id];value;dfc-generated |
+| System;TimeZoneInfo;CreateCustomTimeZone;(System.String,System.TimeSpan,System.String,System.String,System.String,System.TimeZoneInfo+AdjustmentRule[],System.Boolean);Argument[1];ReturnValue.SyntheticField[System.TimeZoneInfo._baseUtcOffset];value;dfc-generated |
+| System;TimeZoneInfo;CreateCustomTimeZone;(System.String,System.TimeSpan,System.String,System.String,System.String,System.TimeZoneInfo+AdjustmentRule[],System.Boolean);Argument[2];ReturnValue.SyntheticField[System.TimeZoneInfo._displayName];value;dfc-generated |
+| System;TimeZoneInfo;CreateCustomTimeZone;(System.String,System.TimeSpan,System.String,System.String,System.String,System.TimeZoneInfo+AdjustmentRule[],System.Boolean);Argument[3];ReturnValue.SyntheticField[System.TimeZoneInfo._standardDisplayName];value;dfc-generated |
+| System;TimeZoneInfo;CreateCustomTimeZone;(System.String,System.TimeSpan,System.String,System.String,System.String,System.TimeZoneInfo+AdjustmentRule[],System.Boolean);Argument[4];ReturnValue.SyntheticField[System.TimeZoneInfo._daylightDisplayName];value;dfc-generated |
+| System;TimeZoneInfo;FindSystemTimeZoneById;(System.String);Argument[0];ReturnValue.SyntheticField[System.TimeZoneInfo._id];value;dfc-generated |
 | System;TimeZoneInfo;GetObjectData;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);Argument[this];Argument[0];taint;df-generated |
-| System;TimeZoneInfo;GetUtcOffset;(System.DateTime);Argument[this];ReturnValue;taint;df-generated |
-| System;TimeZoneInfo;GetUtcOffset;(System.DateTimeOffset);Argument[this];ReturnValue;taint;df-generated |
-| System;TimeZoneInfo;ToString;();Argument[this];ReturnValue;taint;df-generated |
-| System;TimeZoneInfo;TryFindSystemTimeZoneById;(System.String,System.TimeZoneInfo);Argument[0];ReturnValue;taint;df-generated |
-| System;TimeZoneInfo;get_BaseUtcOffset;();Argument[this];ReturnValue;taint;df-generated |
-| System;TimeZoneInfo;get_DaylightName;();Argument[this];ReturnValue;taint;df-generated |
-| System;TimeZoneInfo;get_DisplayName;();Argument[this];ReturnValue;taint;df-generated |
-| System;TimeZoneInfo;get_Id;();Argument[this];ReturnValue;taint;df-generated |
-| System;TimeZoneInfo;get_StandardName;();Argument[this];ReturnValue;taint;df-generated |
+| System;TimeZoneInfo;GetUtcOffset;(System.DateTime);Argument[this].Property[System.TimeZoneInfo.BaseUtcOffset];ReturnValue;value;dfc-generated |
+| System;TimeZoneInfo;GetUtcOffset;(System.DateTime);Argument[this].SyntheticField[System.TimeZoneInfo._baseUtcOffset];ReturnValue;value;dfc-generated |
+| System;TimeZoneInfo;GetUtcOffset;(System.DateTimeOffset);Argument[this].Property[System.TimeZoneInfo.BaseUtcOffset];ReturnValue;value;dfc-generated |
+| System;TimeZoneInfo;GetUtcOffset;(System.DateTimeOffset);Argument[this].SyntheticField[System.TimeZoneInfo._baseUtcOffset];ReturnValue;value;dfc-generated |
+| System;TimeZoneInfo;ToString;();Argument[this].Property[System.TimeZoneInfo.DisplayName];ReturnValue;value;dfc-generated |
+| System;TimeZoneInfo;ToString;();Argument[this].SyntheticField[System.TimeZoneInfo._displayName];ReturnValue;value;dfc-generated |
+| System;TimeZoneInfo;TryFindSystemTimeZoneById;(System.String,System.TimeZoneInfo);Argument[0];ReturnValue.SyntheticField[System.TimeZoneInfo._id];value;dfc-generated |
+| System;TimeZoneInfo;get_BaseUtcOffset;();Argument[this].SyntheticField[System.TimeZoneInfo._baseUtcOffset];ReturnValue;value;dfc-generated |
+| System;TimeZoneInfo;get_DaylightName;();Argument[this].SyntheticField[System.TimeZoneInfo._daylightDisplayName];ReturnValue;value;dfc-generated |
+| System;TimeZoneInfo;get_DisplayName;();Argument[this].SyntheticField[System.TimeZoneInfo._displayName];ReturnValue;value;dfc-generated |
+| System;TimeZoneInfo;get_Id;();Argument[this].SyntheticField[System.TimeZoneInfo._id];ReturnValue;value;dfc-generated |
+| System;TimeZoneInfo;get_StandardName;();Argument[this].SyntheticField[System.TimeZoneInfo._standardDisplayName];ReturnValue;value;dfc-generated |
 | System;Tuple;Create<T1,T2,T3,T4,T5,T6,T7,T8>;(T1,T2,T3,T4,T5,T6,T7,T8);Argument[0];ReturnValue.Property[System.Tuple`8.Item1];value;manual |
 | System;Tuple;Create<T1,T2,T3,T4,T5,T6,T7,T8>;(T1,T2,T3,T4,T5,T6,T7,T8);Argument[1];ReturnValue.Property[System.Tuple`8.Item2];value;manual |
 | System;Tuple;Create<T1,T2,T3,T4,T5,T6,T7,T8>;(T1,T2,T3,T4,T5,T6,T7,T8);Argument[2];ReturnValue.Property[System.Tuple`8.Item3];value;manual |
@@ -20793,7 +21693,7 @@ summary
 | System;TupleExtensions;ToTuple<T1,T2,T3,T4>;(System.ValueTuple<T1,T2,T3,T4>);Argument[0];ReturnValue;taint;df-generated |
 | System;TupleExtensions;ToTuple<T1,T2,T3>;(System.ValueTuple<T1,T2,T3>);Argument[0];ReturnValue;taint;df-generated |
 | System;TupleExtensions;ToTuple<T1,T2>;(System.ValueTuple<T1,T2>);Argument[0];ReturnValue;taint;df-generated |
-| System;TupleExtensions;ToTuple<T1>;(System.ValueTuple<T1>);Argument[0];ReturnValue;taint;df-generated |
+| System;TupleExtensions;ToTuple<T1>;(System.ValueTuple<T1>);Argument[0].Field[System.ValueTuple`1.Item1];ReturnValue.Property[System.Tuple`1.Item1];value;dfc-generated |
 | System;TupleExtensions;ToValueTuple<T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,T18,T19,T20,T21>;(System.Tuple<T1,T2,T3,T4,T5,T6,T7,System.Tuple<T8,T9,T10,T11,T12,T13,T14,System.Tuple<T15,T16,T17,T18,T19,T20,T21>>>);Argument[0];ReturnValue;taint;df-generated |
 | System;TupleExtensions;ToValueTuple<T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,T18,T19,T20>;(System.Tuple<T1,T2,T3,T4,T5,T6,T7,System.Tuple<T8,T9,T10,T11,T12,T13,T14,System.Tuple<T15,T16,T17,T18,T19,T20>>>);Argument[0];ReturnValue;taint;df-generated |
 | System;TupleExtensions;ToValueTuple<T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,T18,T19>;(System.Tuple<T1,T2,T3,T4,T5,T6,T7,System.Tuple<T8,T9,T10,T11,T12,T13,T14,System.Tuple<T15,T16,T17,T18,T19>>>);Argument[0];ReturnValue;taint;df-generated |
@@ -20814,9 +21714,15 @@ summary
 | System;TupleExtensions;ToValueTuple<T1,T2,T3,T4>;(System.Tuple<T1,T2,T3,T4>);Argument[0];ReturnValue;taint;df-generated |
 | System;TupleExtensions;ToValueTuple<T1,T2,T3>;(System.Tuple<T1,T2,T3>);Argument[0];ReturnValue;taint;df-generated |
 | System;TupleExtensions;ToValueTuple<T1,T2>;(System.Tuple<T1,T2>);Argument[0];ReturnValue;taint;df-generated |
-| System;TupleExtensions;ToValueTuple<T1>;(System.Tuple<T1>);Argument[0];ReturnValue;taint;df-generated |
+| System;TupleExtensions;ToValueTuple<T1>;(System.Tuple<T1>);Argument[0].Property[System.Tuple`1.Item1];ReturnValue.Field[System.ValueTuple`1.Item1];value;dfc-generated |
+| System;Type;FindInterfaces;(System.Reflection.TypeFilter,System.Object);Argument[0];Argument[0].Parameter[delegate-self];value;dfc-generated |
 | System;Type;FindInterfaces;(System.Reflection.TypeFilter,System.Object);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
+| System;Type;FindInterfaces;(System.Reflection.TypeFilter,System.Object);Argument[1];Argument[0].Parameter[1];value;dfc-generated |
+| System;Type;FindInterfaces;(System.Reflection.TypeFilter,System.Object);Argument[1];Argument[0].Parameter[1];value;hq-generated |
+| System;Type;FindMembers;(System.Reflection.MemberTypes,System.Reflection.BindingFlags,System.Reflection.MemberFilter,System.Object);Argument[2];Argument[2].Parameter[delegate-self];value;dfc-generated |
 | System;Type;FindMembers;(System.Reflection.MemberTypes,System.Reflection.BindingFlags,System.Reflection.MemberFilter,System.Object);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
+| System;Type;FindMembers;(System.Reflection.MemberTypes,System.Reflection.BindingFlags,System.Reflection.MemberFilter,System.Object);Argument[3];Argument[2].Parameter[1];value;dfc-generated |
+| System;Type;FindMembers;(System.Reflection.MemberTypes,System.Reflection.BindingFlags,System.Reflection.MemberFilter,System.Object);Argument[3];Argument[2].Parameter[1];value;hq-generated |
 | System;Type;GetConstructorImpl;(System.Reflection.BindingFlags,System.Reflection.Binder,System.Reflection.CallingConventions,System.Type[],System.Reflection.ParameterModifier[]);Argument[this];ReturnValue;taint;df-generated |
 | System;Type;GetElementType;();Argument[this];ReturnValue;taint;df-generated |
 | System;Type;GetEnumUnderlyingType;();Argument[this];ReturnValue;taint;df-generated |
@@ -20825,8 +21731,7 @@ summary
 | System;Type;GetFunctionPointerParameterTypes;();Argument[this];ReturnValue;taint;df-generated |
 | System;Type;GetFunctionPointerReturnType;();Argument[this];ReturnValue;taint;df-generated |
 | System;Type;GetGenericArguments;();Argument[this];ReturnValue;taint;df-generated |
-| System;Type;GetGenericTypeDefinition;();Argument[this];ReturnValue;taint;df-generated |
-| System;Type;GetGenericTypeDefinition;();Argument[this];ReturnValue;value;df-generated |
+| System;Type;GetGenericTypeDefinition;();Argument[this];ReturnValue;value;dfc-generated |
 | System;Type;GetInterface;(System.String,System.Boolean);Argument[this];ReturnValue;taint;df-generated |
 | System;Type;GetInterfaces;();Argument[this];ReturnValue;taint;df-generated |
 | System;Type;GetMethodImpl;(System.String,System.Int32,System.Reflection.BindingFlags,System.Reflection.Binder,System.Reflection.CallingConventions,System.Type[],System.Reflection.ParameterModifier[]);Argument[this];ReturnValue;taint;df-generated |
@@ -20842,7 +21747,7 @@ summary
 | System;Type;MakeArrayType;();Argument[this];ReturnValue;taint;df-generated |
 | System;Type;MakeArrayType;(System.Int32);Argument[this];ReturnValue;taint;df-generated |
 | System;Type;MakeByRefType;();Argument[this];ReturnValue;taint;df-generated |
-| System;Type;MakeGenericSignatureType;(System.Type,System.Type[]);Argument[1].Element;ReturnValue;taint;df-generated |
+| System;Type;MakeGenericSignatureType;(System.Type,System.Type[]);Argument[1].Element;ReturnValue.SyntheticField[System.Reflection.SignatureConstructedGenericType._genericTypeArguments].Element;value;dfc-generated |
 | System;Type;MakeGenericType;(System.Type[]);Argument[this];ReturnValue;taint;df-generated |
 | System;Type;MakePointerType;();Argument[this];ReturnValue;taint;df-generated |
 | System;Type;ToString;();Argument[this];ReturnValue;taint;df-generated |
@@ -20859,212 +21764,197 @@ summary
 | System;Type;get_ReflectedType;();Argument[this];ReturnValue;taint;df-generated |
 | System;Type;get_StructLayoutAttribute;();Argument[this];ReturnValue;taint;df-generated |
 | System;Type;get_TypeHandle;();Argument[this];ReturnValue;taint;df-generated |
-| System;Type;get_UnderlyingSystemType;();Argument[this];ReturnValue;taint;df-generated |
-| System;Type;get_UnderlyingSystemType;();Argument[this];ReturnValue;value;df-generated |
+| System;Type;get_UnderlyingSystemType;();Argument[this];ReturnValue;value;dfc-generated |
 | System;TypeInitializationException;GetObjectData;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);Argument[this];Argument[0];taint;df-generated |
 | System;TypeInitializationException;get_TypeName;();Argument[this];ReturnValue;taint;df-generated |
 | System;TypeLoadException;GetObjectData;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);Argument[this];Argument[0];taint;df-generated |
-| System;TypeLoadException;TypeLoadException;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);Argument[0];Argument[this];taint;df-generated |
-| System;TypeLoadException;get_Message;();Argument[this];ReturnValue;taint;df-generated |
-| System;TypeLoadException;get_TypeName;();Argument[this];ReturnValue;taint;df-generated |
-| System;UInt16;Clamp;(System.UInt16,System.UInt16,System.UInt16);Argument[0];ReturnValue;taint;df-generated |
-| System;UInt16;Clamp;(System.UInt16,System.UInt16,System.UInt16);Argument[1];ReturnValue;taint;df-generated |
-| System;UInt16;Clamp;(System.UInt16,System.UInt16,System.UInt16);Argument[2];ReturnValue;taint;df-generated |
-| System;UInt16;CopySign;(System.UInt16,System.UInt16);Argument[0];ReturnValue;taint;df-generated |
-| System;UInt16;CreateChecked<TOther>;(TOther);Argument[0];ReturnValue;taint;df-generated |
-| System;UInt16;CreateSaturating<TOther>;(TOther);Argument[0];ReturnValue;taint;df-generated |
-| System;UInt16;CreateTruncating<TOther>;(TOther);Argument[0];ReturnValue;taint;df-generated |
-| System;UInt16;Max;(System.UInt16,System.UInt16);Argument[0];ReturnValue;taint;df-generated |
-| System;UInt16;Max;(System.UInt16,System.UInt16);Argument[1];ReturnValue;taint;df-generated |
-| System;UInt16;MaxNumber;(System.UInt16,System.UInt16);Argument[0];ReturnValue;taint;df-generated |
-| System;UInt16;MaxNumber;(System.UInt16,System.UInt16);Argument[1];ReturnValue;taint;df-generated |
-| System;UInt16;Min;(System.UInt16,System.UInt16);Argument[0];ReturnValue;taint;df-generated |
-| System;UInt16;Min;(System.UInt16,System.UInt16);Argument[1];ReturnValue;taint;df-generated |
-| System;UInt16;MinNumber;(System.UInt16,System.UInt16);Argument[0];ReturnValue;taint;df-generated |
-| System;UInt16;MinNumber;(System.UInt16,System.UInt16);Argument[1];ReturnValue;taint;df-generated |
-| System;UInt16;System.Numerics.IAdditionOperators<System.UInt16,System.UInt16,System.UInt16>.op_CheckedAddition;(System.UInt16,System.UInt16);Argument[0];ReturnValue;taint;df-generated |
-| System;UInt16;System.Numerics.IAdditionOperators<System.UInt16,System.UInt16,System.UInt16>.op_CheckedAddition;(System.UInt16,System.UInt16);Argument[1];ReturnValue;taint;df-generated |
+| System;TypeLoadException;TypeLoadException;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);Argument[0].SyntheticField[System.Runtime.Serialization.SerializationInfo._values].Element;Argument[this].SyntheticField[System.TypeLoadException._className];value;dfc-generated |
+| System;TypeLoadException;get_Message;();Argument[this].SyntheticField[System.Exception._message];ReturnValue;value;dfc-generated |
+| System;TypeLoadException;get_TypeName;();Argument[this].SyntheticField[System.TypeLoadException._className];ReturnValue;value;dfc-generated |
+| System;UInt16;Clamp;(System.UInt16,System.UInt16,System.UInt16);Argument[0];ReturnValue;value;dfc-generated |
+| System;UInt16;Clamp;(System.UInt16,System.UInt16,System.UInt16);Argument[1];ReturnValue;value;dfc-generated |
+| System;UInt16;Clamp;(System.UInt16,System.UInt16,System.UInt16);Argument[2];ReturnValue;value;dfc-generated |
+| System;UInt16;CopySign;(System.UInt16,System.UInt16);Argument[0];ReturnValue;value;dfc-generated |
+| System;UInt16;CreateChecked<TOther>;(TOther);Argument[0];ReturnValue;value;dfc-generated |
+| System;UInt16;CreateSaturating<TOther>;(TOther);Argument[0];ReturnValue;value;dfc-generated |
+| System;UInt16;CreateTruncating<TOther>;(TOther);Argument[0];ReturnValue;value;dfc-generated |
+| System;UInt16;Max;(System.UInt16,System.UInt16);Argument[0];ReturnValue;value;dfc-generated |
+| System;UInt16;Max;(System.UInt16,System.UInt16);Argument[1];ReturnValue;value;dfc-generated |
+| System;UInt16;MaxNumber;(System.UInt16,System.UInt16);Argument[0];ReturnValue;value;dfc-generated |
+| System;UInt16;MaxNumber;(System.UInt16,System.UInt16);Argument[1];ReturnValue;value;dfc-generated |
+| System;UInt16;Min;(System.UInt16,System.UInt16);Argument[0];ReturnValue;value;dfc-generated |
+| System;UInt16;Min;(System.UInt16,System.UInt16);Argument[1];ReturnValue;value;dfc-generated |
+| System;UInt16;MinNumber;(System.UInt16,System.UInt16);Argument[0];ReturnValue;value;dfc-generated |
+| System;UInt16;MinNumber;(System.UInt16,System.UInt16);Argument[1];ReturnValue;value;dfc-generated |
+| System;UInt16;System.Numerics.IAdditionOperators<System.UInt16,System.UInt16,System.UInt16>.op_CheckedAddition;(System.UInt16,System.UInt16);Argument[0];ReturnValue;taint;dfc-generated |
+| System;UInt16;System.Numerics.IAdditionOperators<System.UInt16,System.UInt16,System.UInt16>.op_CheckedAddition;(System.UInt16,System.UInt16);Argument[1];ReturnValue;taint;dfc-generated |
 | System;UInt16;ToDateTime;(System.IFormatProvider);Argument[this];ReturnValue;value;df-generated |
 | System;UInt16;ToDecimal;(System.IFormatProvider);Argument[this];ReturnValue;value;df-generated |
-| System;UInt16;ToString;(System.IFormatProvider);Argument[0];ReturnValue;taint;df-generated |
-| System;UInt16;ToString;(System.IFormatProvider);Argument[this];ReturnValue;value;df-generated |
-| System;UInt16;ToString;(System.String,System.IFormatProvider);Argument[1];ReturnValue;taint;df-generated |
-| System;UInt16;ToString;(System.String,System.IFormatProvider);Argument[this];ReturnValue;taint;df-generated |
-| System;UInt16;ToType;(System.Type,System.IFormatProvider);Argument[1];ReturnValue;taint;df-generated |
-| System;UInt16;ToType;(System.Type,System.IFormatProvider);Argument[this];ReturnValue;taint;df-generated |
-| System;UInt32;Clamp;(System.UInt32,System.UInt32,System.UInt32);Argument[0];ReturnValue;taint;df-generated |
-| System;UInt32;Clamp;(System.UInt32,System.UInt32,System.UInt32);Argument[1];ReturnValue;taint;df-generated |
-| System;UInt32;Clamp;(System.UInt32,System.UInt32,System.UInt32);Argument[2];ReturnValue;taint;df-generated |
-| System;UInt32;CopySign;(System.UInt32,System.UInt32);Argument[0];ReturnValue;taint;df-generated |
-| System;UInt32;CreateChecked<TOther>;(TOther);Argument[0];ReturnValue;taint;df-generated |
-| System;UInt32;CreateSaturating<TOther>;(TOther);Argument[0];ReturnValue;taint;df-generated |
-| System;UInt32;CreateTruncating<TOther>;(TOther);Argument[0];ReturnValue;taint;df-generated |
-| System;UInt32;Max;(System.UInt32,System.UInt32);Argument[0];ReturnValue;taint;df-generated |
-| System;UInt32;Max;(System.UInt32,System.UInt32);Argument[1];ReturnValue;taint;df-generated |
-| System;UInt32;MaxNumber;(System.UInt32,System.UInt32);Argument[0];ReturnValue;taint;df-generated |
-| System;UInt32;MaxNumber;(System.UInt32,System.UInt32);Argument[1];ReturnValue;taint;df-generated |
-| System;UInt32;Min;(System.UInt32,System.UInt32);Argument[0];ReturnValue;taint;df-generated |
-| System;UInt32;Min;(System.UInt32,System.UInt32);Argument[1];ReturnValue;taint;df-generated |
-| System;UInt32;MinNumber;(System.UInt32,System.UInt32);Argument[0];ReturnValue;taint;df-generated |
-| System;UInt32;MinNumber;(System.UInt32,System.UInt32);Argument[1];ReturnValue;taint;df-generated |
-| System;UInt32;System.Numerics.IAdditionOperators<System.UInt32,System.UInt32,System.UInt32>.op_CheckedAddition;(System.UInt32,System.UInt32);Argument[0];ReturnValue;taint;df-generated |
-| System;UInt32;System.Numerics.IAdditionOperators<System.UInt32,System.UInt32,System.UInt32>.op_CheckedAddition;(System.UInt32,System.UInt32);Argument[1];ReturnValue;taint;df-generated |
+| System;UInt16;ToString;(System.IFormatProvider);Argument[this];ReturnValue;value;dfc-generated |
+| System;UInt16;ToString;(System.String,System.IFormatProvider);Argument[this];ReturnValue;taint;dfc-generated |
+| System;UInt16;ToType;(System.Type,System.IFormatProvider);Argument[this];ReturnValue;value;dfc-generated |
+| System;UInt32;Clamp;(System.UInt32,System.UInt32,System.UInt32);Argument[0];ReturnValue;value;dfc-generated |
+| System;UInt32;Clamp;(System.UInt32,System.UInt32,System.UInt32);Argument[1];ReturnValue;value;dfc-generated |
+| System;UInt32;Clamp;(System.UInt32,System.UInt32,System.UInt32);Argument[2];ReturnValue;value;dfc-generated |
+| System;UInt32;CopySign;(System.UInt32,System.UInt32);Argument[0];ReturnValue;value;dfc-generated |
+| System;UInt32;CreateChecked<TOther>;(TOther);Argument[0];ReturnValue;value;dfc-generated |
+| System;UInt32;CreateSaturating<TOther>;(TOther);Argument[0];ReturnValue;value;dfc-generated |
+| System;UInt32;CreateTruncating<TOther>;(TOther);Argument[0];ReturnValue;value;dfc-generated |
+| System;UInt32;Max;(System.UInt32,System.UInt32);Argument[0];ReturnValue;value;dfc-generated |
+| System;UInt32;Max;(System.UInt32,System.UInt32);Argument[1];ReturnValue;value;dfc-generated |
+| System;UInt32;MaxNumber;(System.UInt32,System.UInt32);Argument[0];ReturnValue;value;dfc-generated |
+| System;UInt32;MaxNumber;(System.UInt32,System.UInt32);Argument[1];ReturnValue;value;dfc-generated |
+| System;UInt32;Min;(System.UInt32,System.UInt32);Argument[0];ReturnValue;value;dfc-generated |
+| System;UInt32;Min;(System.UInt32,System.UInt32);Argument[1];ReturnValue;value;dfc-generated |
+| System;UInt32;MinNumber;(System.UInt32,System.UInt32);Argument[0];ReturnValue;value;dfc-generated |
+| System;UInt32;MinNumber;(System.UInt32,System.UInt32);Argument[1];ReturnValue;value;dfc-generated |
+| System;UInt32;System.Numerics.IAdditionOperators<System.UInt32,System.UInt32,System.UInt32>.op_CheckedAddition;(System.UInt32,System.UInt32);Argument[0];ReturnValue;taint;dfc-generated |
+| System;UInt32;System.Numerics.IAdditionOperators<System.UInt32,System.UInt32,System.UInt32>.op_CheckedAddition;(System.UInt32,System.UInt32);Argument[1];ReturnValue;taint;dfc-generated |
 | System;UInt32;ToDateTime;(System.IFormatProvider);Argument[this];ReturnValue;value;df-generated |
 | System;UInt32;ToDecimal;(System.IFormatProvider);Argument[this];ReturnValue;value;df-generated |
-| System;UInt32;ToString;(System.IFormatProvider);Argument[0];ReturnValue;taint;df-generated |
-| System;UInt32;ToString;(System.IFormatProvider);Argument[this];ReturnValue;value;df-generated |
-| System;UInt32;ToString;(System.String,System.IFormatProvider);Argument[1];ReturnValue;taint;df-generated |
-| System;UInt32;ToString;(System.String,System.IFormatProvider);Argument[this];ReturnValue;taint;df-generated |
-| System;UInt32;ToType;(System.Type,System.IFormatProvider);Argument[1];ReturnValue;taint;df-generated |
-| System;UInt32;ToType;(System.Type,System.IFormatProvider);Argument[this];ReturnValue;taint;df-generated |
-| System;UInt64;Clamp;(System.UInt64,System.UInt64,System.UInt64);Argument[0];ReturnValue;taint;df-generated |
-| System;UInt64;Clamp;(System.UInt64,System.UInt64,System.UInt64);Argument[1];ReturnValue;taint;df-generated |
-| System;UInt64;Clamp;(System.UInt64,System.UInt64,System.UInt64);Argument[2];ReturnValue;taint;df-generated |
-| System;UInt64;CopySign;(System.UInt64,System.UInt64);Argument[0];ReturnValue;taint;df-generated |
-| System;UInt64;CreateChecked<TOther>;(TOther);Argument[0];ReturnValue;taint;df-generated |
-| System;UInt64;CreateSaturating<TOther>;(TOther);Argument[0];ReturnValue;taint;df-generated |
-| System;UInt64;CreateTruncating<TOther>;(TOther);Argument[0];ReturnValue;taint;df-generated |
-| System;UInt64;Max;(System.UInt64,System.UInt64);Argument[0];ReturnValue;taint;df-generated |
-| System;UInt64;Max;(System.UInt64,System.UInt64);Argument[1];ReturnValue;taint;df-generated |
-| System;UInt64;MaxNumber;(System.UInt64,System.UInt64);Argument[0];ReturnValue;taint;df-generated |
-| System;UInt64;MaxNumber;(System.UInt64,System.UInt64);Argument[1];ReturnValue;taint;df-generated |
-| System;UInt64;Min;(System.UInt64,System.UInt64);Argument[0];ReturnValue;taint;df-generated |
-| System;UInt64;Min;(System.UInt64,System.UInt64);Argument[1];ReturnValue;taint;df-generated |
-| System;UInt64;MinNumber;(System.UInt64,System.UInt64);Argument[0];ReturnValue;taint;df-generated |
-| System;UInt64;MinNumber;(System.UInt64,System.UInt64);Argument[1];ReturnValue;taint;df-generated |
-| System;UInt64;System.Numerics.IAdditionOperators<System.UInt64,System.UInt64,System.UInt64>.op_CheckedAddition;(System.UInt64,System.UInt64);Argument[0];ReturnValue;taint;df-generated |
-| System;UInt64;System.Numerics.IAdditionOperators<System.UInt64,System.UInt64,System.UInt64>.op_CheckedAddition;(System.UInt64,System.UInt64);Argument[1];ReturnValue;taint;df-generated |
+| System;UInt32;ToString;(System.IFormatProvider);Argument[this];ReturnValue;value;dfc-generated |
+| System;UInt32;ToString;(System.String,System.IFormatProvider);Argument[this];ReturnValue;taint;dfc-generated |
+| System;UInt32;ToType;(System.Type,System.IFormatProvider);Argument[this];ReturnValue;value;dfc-generated |
+| System;UInt64;Clamp;(System.UInt64,System.UInt64,System.UInt64);Argument[0];ReturnValue;value;dfc-generated |
+| System;UInt64;Clamp;(System.UInt64,System.UInt64,System.UInt64);Argument[1];ReturnValue;value;dfc-generated |
+| System;UInt64;Clamp;(System.UInt64,System.UInt64,System.UInt64);Argument[2];ReturnValue;value;dfc-generated |
+| System;UInt64;CopySign;(System.UInt64,System.UInt64);Argument[0];ReturnValue;value;dfc-generated |
+| System;UInt64;CreateChecked<TOther>;(TOther);Argument[0];ReturnValue;value;dfc-generated |
+| System;UInt64;CreateSaturating<TOther>;(TOther);Argument[0];ReturnValue;value;dfc-generated |
+| System;UInt64;CreateTruncating<TOther>;(TOther);Argument[0];ReturnValue;value;dfc-generated |
+| System;UInt64;Max;(System.UInt64,System.UInt64);Argument[0];ReturnValue;value;dfc-generated |
+| System;UInt64;Max;(System.UInt64,System.UInt64);Argument[1];ReturnValue;value;dfc-generated |
+| System;UInt64;MaxNumber;(System.UInt64,System.UInt64);Argument[0];ReturnValue;value;dfc-generated |
+| System;UInt64;MaxNumber;(System.UInt64,System.UInt64);Argument[1];ReturnValue;value;dfc-generated |
+| System;UInt64;Min;(System.UInt64,System.UInt64);Argument[0];ReturnValue;value;dfc-generated |
+| System;UInt64;Min;(System.UInt64,System.UInt64);Argument[1];ReturnValue;value;dfc-generated |
+| System;UInt64;MinNumber;(System.UInt64,System.UInt64);Argument[0];ReturnValue;value;dfc-generated |
+| System;UInt64;MinNumber;(System.UInt64,System.UInt64);Argument[1];ReturnValue;value;dfc-generated |
+| System;UInt64;System.Numerics.IAdditionOperators<System.UInt64,System.UInt64,System.UInt64>.op_CheckedAddition;(System.UInt64,System.UInt64);Argument[0];ReturnValue;taint;dfc-generated |
+| System;UInt64;System.Numerics.IAdditionOperators<System.UInt64,System.UInt64,System.UInt64>.op_CheckedAddition;(System.UInt64,System.UInt64);Argument[1];ReturnValue;taint;dfc-generated |
 | System;UInt64;ToDateTime;(System.IFormatProvider);Argument[this];ReturnValue;value;df-generated |
 | System;UInt64;ToDecimal;(System.IFormatProvider);Argument[this];ReturnValue;value;df-generated |
-| System;UInt64;ToString;(System.IFormatProvider);Argument[0];ReturnValue;taint;df-generated |
-| System;UInt64;ToString;(System.IFormatProvider);Argument[this];ReturnValue;value;df-generated |
-| System;UInt64;ToString;(System.String,System.IFormatProvider);Argument[1];ReturnValue;taint;df-generated |
-| System;UInt64;ToString;(System.String,System.IFormatProvider);Argument[this];ReturnValue;taint;df-generated |
-| System;UInt64;ToType;(System.Type,System.IFormatProvider);Argument[1];ReturnValue;taint;df-generated |
-| System;UInt64;ToType;(System.Type,System.IFormatProvider);Argument[this];ReturnValue;taint;df-generated |
-| System;UInt128;Abs;(System.UInt128);Argument[0];ReturnValue;taint;df-generated |
-| System;UInt128;Clamp;(System.UInt128,System.UInt128,System.UInt128);Argument[0];ReturnValue;taint;df-generated |
-| System;UInt128;Clamp;(System.UInt128,System.UInt128,System.UInt128);Argument[1];ReturnValue;taint;df-generated |
-| System;UInt128;Clamp;(System.UInt128,System.UInt128,System.UInt128);Argument[2];ReturnValue;taint;df-generated |
-| System;UInt128;CopySign;(System.UInt128,System.UInt128);Argument[0];ReturnValue;taint;df-generated |
-| System;UInt128;CreateChecked<TOther>;(TOther);Argument[0];ReturnValue;taint;df-generated |
-| System;UInt128;CreateSaturating<TOther>;(TOther);Argument[0];ReturnValue;taint;df-generated |
-| System;UInt128;CreateTruncating<TOther>;(TOther);Argument[0];ReturnValue;taint;df-generated |
-| System;UInt128;Max;(System.UInt128,System.UInt128);Argument[0];ReturnValue;taint;df-generated |
-| System;UInt128;Max;(System.UInt128,System.UInt128);Argument[1];ReturnValue;taint;df-generated |
-| System;UInt128;MaxMagnitude;(System.UInt128,System.UInt128);Argument[0];ReturnValue;taint;df-generated |
-| System;UInt128;MaxMagnitude;(System.UInt128,System.UInt128);Argument[1];ReturnValue;taint;df-generated |
-| System;UInt128;MaxMagnitudeNumber;(System.UInt128,System.UInt128);Argument[0];ReturnValue;taint;df-generated |
-| System;UInt128;MaxMagnitudeNumber;(System.UInt128,System.UInt128);Argument[1];ReturnValue;taint;df-generated |
-| System;UInt128;MaxNumber;(System.UInt128,System.UInt128);Argument[0];ReturnValue;taint;df-generated |
-| System;UInt128;MaxNumber;(System.UInt128,System.UInt128);Argument[1];ReturnValue;taint;df-generated |
-| System;UInt128;Min;(System.UInt128,System.UInt128);Argument[0];ReturnValue;taint;df-generated |
-| System;UInt128;Min;(System.UInt128,System.UInt128);Argument[1];ReturnValue;taint;df-generated |
-| System;UInt128;MinMagnitude;(System.UInt128,System.UInt128);Argument[0];ReturnValue;taint;df-generated |
-| System;UInt128;MinMagnitude;(System.UInt128,System.UInt128);Argument[1];ReturnValue;taint;df-generated |
-| System;UInt128;MinMagnitudeNumber;(System.UInt128,System.UInt128);Argument[0];ReturnValue;taint;df-generated |
-| System;UInt128;MinMagnitudeNumber;(System.UInt128,System.UInt128);Argument[1];ReturnValue;taint;df-generated |
-| System;UInt128;MinNumber;(System.UInt128,System.UInt128);Argument[0];ReturnValue;taint;df-generated |
-| System;UInt128;MinNumber;(System.UInt128,System.UInt128);Argument[1];ReturnValue;taint;df-generated |
-| System;UInt128;System.Numerics.IAdditionOperators<System.UInt128,System.UInt128,System.UInt128>.op_CheckedAddition;(System.UInt128,System.UInt128);Argument[0];ReturnValue;taint;df-generated |
-| System;UInt128;System.Numerics.IAdditionOperators<System.UInt128,System.UInt128,System.UInt128>.op_CheckedAddition;(System.UInt128,System.UInt128);Argument[1];ReturnValue;taint;df-generated |
-| System;UInt128;ToString;(System.String,System.IFormatProvider);Argument[1];ReturnValue;taint;df-generated |
-| System;UInt128;ToString;(System.String,System.IFormatProvider);Argument[this];ReturnValue;taint;df-generated |
-| System;UIntPtr;Abs;(System.UIntPtr);Argument[0];ReturnValue;taint;df-generated |
-| System;UIntPtr;Add;(System.UIntPtr,System.Int32);Argument[0];ReturnValue;taint;df-generated |
-| System;UIntPtr;Clamp;(System.UIntPtr,System.UIntPtr,System.UIntPtr);Argument[0];ReturnValue;taint;df-generated |
-| System;UIntPtr;Clamp;(System.UIntPtr,System.UIntPtr,System.UIntPtr);Argument[1];ReturnValue;taint;df-generated |
-| System;UIntPtr;Clamp;(System.UIntPtr,System.UIntPtr,System.UIntPtr);Argument[2];ReturnValue;taint;df-generated |
-| System;UIntPtr;CopySign;(System.UIntPtr,System.UIntPtr);Argument[0];ReturnValue;taint;df-generated |
-| System;UIntPtr;CreateChecked<TOther>;(TOther);Argument[0];ReturnValue;taint;df-generated |
-| System;UIntPtr;CreateSaturating<TOther>;(TOther);Argument[0];ReturnValue;taint;df-generated |
-| System;UIntPtr;CreateTruncating<TOther>;(TOther);Argument[0];ReturnValue;taint;df-generated |
+| System;UInt64;ToString;(System.IFormatProvider);Argument[this];ReturnValue;value;dfc-generated |
+| System;UInt64;ToString;(System.String,System.IFormatProvider);Argument[this];ReturnValue;taint;dfc-generated |
+| System;UInt64;ToType;(System.Type,System.IFormatProvider);Argument[this];ReturnValue;value;dfc-generated |
+| System;UInt128;Abs;(System.UInt128);Argument[0];ReturnValue;value;dfc-generated |
+| System;UInt128;Clamp;(System.UInt128,System.UInt128,System.UInt128);Argument[0];ReturnValue;value;dfc-generated |
+| System;UInt128;Clamp;(System.UInt128,System.UInt128,System.UInt128);Argument[1];ReturnValue;value;dfc-generated |
+| System;UInt128;Clamp;(System.UInt128,System.UInt128,System.UInt128);Argument[2];ReturnValue;value;dfc-generated |
+| System;UInt128;CopySign;(System.UInt128,System.UInt128);Argument[0];ReturnValue;value;dfc-generated |
+| System;UInt128;CreateChecked<TOther>;(TOther);Argument[0];ReturnValue;value;dfc-generated |
+| System;UInt128;CreateSaturating<TOther>;(TOther);Argument[0];ReturnValue;value;dfc-generated |
+| System;UInt128;CreateTruncating<TOther>;(TOther);Argument[0];ReturnValue;value;dfc-generated |
+| System;UInt128;Max;(System.UInt128,System.UInt128);Argument[0];ReturnValue;value;dfc-generated |
+| System;UInt128;Max;(System.UInt128,System.UInt128);Argument[1];ReturnValue;value;dfc-generated |
+| System;UInt128;MaxMagnitude;(System.UInt128,System.UInt128);Argument[0];ReturnValue;value;dfc-generated |
+| System;UInt128;MaxMagnitude;(System.UInt128,System.UInt128);Argument[1];ReturnValue;value;dfc-generated |
+| System;UInt128;MaxMagnitudeNumber;(System.UInt128,System.UInt128);Argument[0];ReturnValue;value;dfc-generated |
+| System;UInt128;MaxMagnitudeNumber;(System.UInt128,System.UInt128);Argument[1];ReturnValue;value;dfc-generated |
+| System;UInt128;MaxNumber;(System.UInt128,System.UInt128);Argument[0];ReturnValue;value;dfc-generated |
+| System;UInt128;MaxNumber;(System.UInt128,System.UInt128);Argument[1];ReturnValue;value;dfc-generated |
+| System;UInt128;Min;(System.UInt128,System.UInt128);Argument[0];ReturnValue;value;dfc-generated |
+| System;UInt128;Min;(System.UInt128,System.UInt128);Argument[1];ReturnValue;value;dfc-generated |
+| System;UInt128;MinMagnitude;(System.UInt128,System.UInt128);Argument[0];ReturnValue;value;dfc-generated |
+| System;UInt128;MinMagnitude;(System.UInt128,System.UInt128);Argument[1];ReturnValue;value;dfc-generated |
+| System;UInt128;MinMagnitudeNumber;(System.UInt128,System.UInt128);Argument[0];ReturnValue;value;dfc-generated |
+| System;UInt128;MinMagnitudeNumber;(System.UInt128,System.UInt128);Argument[1];ReturnValue;value;dfc-generated |
+| System;UInt128;MinNumber;(System.UInt128,System.UInt128);Argument[0];ReturnValue;value;dfc-generated |
+| System;UInt128;MinNumber;(System.UInt128,System.UInt128);Argument[1];ReturnValue;value;dfc-generated |
+| System;UInt128;System.Numerics.IAdditionOperators<System.UInt128,System.UInt128,System.UInt128>.op_CheckedAddition;(System.UInt128,System.UInt128);Argument[0];ReturnValue;taint;dfc-generated |
+| System;UInt128;System.Numerics.IAdditionOperators<System.UInt128,System.UInt128,System.UInt128>.op_CheckedAddition;(System.UInt128,System.UInt128);Argument[1];ReturnValue;taint;dfc-generated |
+| System;UInt128;ToString;(System.String,System.IFormatProvider);Argument[this];ReturnValue;taint;dfc-generated |
+| System;UIntPtr;Abs;(System.UIntPtr);Argument[0];ReturnValue;value;dfc-generated |
+| System;UIntPtr;Add;(System.UIntPtr,System.Int32);Argument[0];ReturnValue;taint;dfc-generated |
+| System;UIntPtr;Clamp;(System.UIntPtr,System.UIntPtr,System.UIntPtr);Argument[0];ReturnValue;value;dfc-generated |
+| System;UIntPtr;Clamp;(System.UIntPtr,System.UIntPtr,System.UIntPtr);Argument[1];ReturnValue;value;dfc-generated |
+| System;UIntPtr;Clamp;(System.UIntPtr,System.UIntPtr,System.UIntPtr);Argument[2];ReturnValue;value;dfc-generated |
+| System;UIntPtr;CopySign;(System.UIntPtr,System.UIntPtr);Argument[0];ReturnValue;value;dfc-generated |
+| System;UIntPtr;CreateChecked<TOther>;(TOther);Argument[0];ReturnValue;value;dfc-generated |
+| System;UIntPtr;CreateSaturating<TOther>;(TOther);Argument[0];ReturnValue;value;dfc-generated |
+| System;UIntPtr;CreateTruncating<TOther>;(TOther);Argument[0];ReturnValue;value;dfc-generated |
 | System;UIntPtr;GetObjectData;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);Argument[this];Argument[0];taint;df-generated |
-| System;UIntPtr;Max;(System.UIntPtr,System.UIntPtr);Argument[0];ReturnValue;taint;df-generated |
-| System;UIntPtr;Max;(System.UIntPtr,System.UIntPtr);Argument[1];ReturnValue;taint;df-generated |
-| System;UIntPtr;MaxMagnitude;(System.UIntPtr,System.UIntPtr);Argument[0];ReturnValue;taint;df-generated |
-| System;UIntPtr;MaxMagnitude;(System.UIntPtr,System.UIntPtr);Argument[1];ReturnValue;taint;df-generated |
-| System;UIntPtr;MaxMagnitudeNumber;(System.UIntPtr,System.UIntPtr);Argument[0];ReturnValue;taint;df-generated |
-| System;UIntPtr;MaxMagnitudeNumber;(System.UIntPtr,System.UIntPtr);Argument[1];ReturnValue;taint;df-generated |
-| System;UIntPtr;MaxNumber;(System.UIntPtr,System.UIntPtr);Argument[0];ReturnValue;taint;df-generated |
-| System;UIntPtr;MaxNumber;(System.UIntPtr,System.UIntPtr);Argument[1];ReturnValue;taint;df-generated |
-| System;UIntPtr;Min;(System.UIntPtr,System.UIntPtr);Argument[0];ReturnValue;taint;df-generated |
-| System;UIntPtr;Min;(System.UIntPtr,System.UIntPtr);Argument[1];ReturnValue;taint;df-generated |
-| System;UIntPtr;MinMagnitude;(System.UIntPtr,System.UIntPtr);Argument[0];ReturnValue;taint;df-generated |
-| System;UIntPtr;MinMagnitude;(System.UIntPtr,System.UIntPtr);Argument[1];ReturnValue;taint;df-generated |
-| System;UIntPtr;MinMagnitudeNumber;(System.UIntPtr,System.UIntPtr);Argument[0];ReturnValue;taint;df-generated |
-| System;UIntPtr;MinMagnitudeNumber;(System.UIntPtr,System.UIntPtr);Argument[1];ReturnValue;taint;df-generated |
-| System;UIntPtr;MinNumber;(System.UIntPtr,System.UIntPtr);Argument[0];ReturnValue;taint;df-generated |
-| System;UIntPtr;MinNumber;(System.UIntPtr,System.UIntPtr);Argument[1];ReturnValue;taint;df-generated |
-| System;UIntPtr;System.Numerics.IAdditionOperators<nuint,nuint,nuint>.op_Addition;(System.UIntPtr,System.UIntPtr);Argument[0];ReturnValue;taint;df-generated |
-| System;UIntPtr;System.Numerics.IAdditionOperators<nuint,nuint,nuint>.op_Addition;(System.UIntPtr,System.UIntPtr);Argument[1];ReturnValue;taint;df-generated |
-| System;UIntPtr;System.Numerics.IAdditionOperators<nuint,nuint,nuint>.op_CheckedAddition;(System.UIntPtr,System.UIntPtr);Argument[0];ReturnValue;taint;df-generated |
-| System;UIntPtr;System.Numerics.IAdditionOperators<nuint,nuint,nuint>.op_CheckedAddition;(System.UIntPtr,System.UIntPtr);Argument[1];ReturnValue;taint;df-generated |
-| System;UIntPtr;ToString;(System.String,System.IFormatProvider);Argument[1];ReturnValue;taint;df-generated |
-| System;UIntPtr;ToString;(System.String,System.IFormatProvider);Argument[this];ReturnValue;taint;df-generated |
-| System;UIntPtr;op_Addition;(System.UIntPtr,System.Int32);Argument[0];ReturnValue;taint;df-generated |
-| System;UnhandledExceptionEventArgs;UnhandledExceptionEventArgs;(System.Object,System.Boolean);Argument[0];Argument[this];taint;df-generated |
-| System;UnhandledExceptionEventArgs;get_ExceptionObject;();Argument[this];ReturnValue;taint;df-generated |
+| System;UIntPtr;Max;(System.UIntPtr,System.UIntPtr);Argument[0];ReturnValue;value;dfc-generated |
+| System;UIntPtr;Max;(System.UIntPtr,System.UIntPtr);Argument[1];ReturnValue;value;dfc-generated |
+| System;UIntPtr;MaxMagnitude;(System.UIntPtr,System.UIntPtr);Argument[0];ReturnValue;value;dfc-generated |
+| System;UIntPtr;MaxMagnitude;(System.UIntPtr,System.UIntPtr);Argument[1];ReturnValue;value;dfc-generated |
+| System;UIntPtr;MaxMagnitudeNumber;(System.UIntPtr,System.UIntPtr);Argument[0];ReturnValue;value;dfc-generated |
+| System;UIntPtr;MaxMagnitudeNumber;(System.UIntPtr,System.UIntPtr);Argument[1];ReturnValue;value;dfc-generated |
+| System;UIntPtr;MaxNumber;(System.UIntPtr,System.UIntPtr);Argument[0];ReturnValue;value;dfc-generated |
+| System;UIntPtr;MaxNumber;(System.UIntPtr,System.UIntPtr);Argument[1];ReturnValue;value;dfc-generated |
+| System;UIntPtr;Min;(System.UIntPtr,System.UIntPtr);Argument[0];ReturnValue;value;dfc-generated |
+| System;UIntPtr;Min;(System.UIntPtr,System.UIntPtr);Argument[1];ReturnValue;value;dfc-generated |
+| System;UIntPtr;MinMagnitude;(System.UIntPtr,System.UIntPtr);Argument[0];ReturnValue;value;dfc-generated |
+| System;UIntPtr;MinMagnitude;(System.UIntPtr,System.UIntPtr);Argument[1];ReturnValue;value;dfc-generated |
+| System;UIntPtr;MinMagnitudeNumber;(System.UIntPtr,System.UIntPtr);Argument[0];ReturnValue;value;dfc-generated |
+| System;UIntPtr;MinMagnitudeNumber;(System.UIntPtr,System.UIntPtr);Argument[1];ReturnValue;value;dfc-generated |
+| System;UIntPtr;MinNumber;(System.UIntPtr,System.UIntPtr);Argument[0];ReturnValue;value;dfc-generated |
+| System;UIntPtr;MinNumber;(System.UIntPtr,System.UIntPtr);Argument[1];ReturnValue;value;dfc-generated |
+| System;UIntPtr;System.Numerics.IAdditionOperators<nuint,nuint,nuint>.op_Addition;(System.UIntPtr,System.UIntPtr);Argument[0];ReturnValue;taint;dfc-generated |
+| System;UIntPtr;System.Numerics.IAdditionOperators<nuint,nuint,nuint>.op_Addition;(System.UIntPtr,System.UIntPtr);Argument[1];ReturnValue;taint;dfc-generated |
+| System;UIntPtr;System.Numerics.IAdditionOperators<nuint,nuint,nuint>.op_CheckedAddition;(System.UIntPtr,System.UIntPtr);Argument[0];ReturnValue;taint;dfc-generated |
+| System;UIntPtr;System.Numerics.IAdditionOperators<nuint,nuint,nuint>.op_CheckedAddition;(System.UIntPtr,System.UIntPtr);Argument[1];ReturnValue;taint;dfc-generated |
+| System;UIntPtr;ToString;(System.String,System.IFormatProvider);Argument[this];ReturnValue;taint;dfc-generated |
+| System;UIntPtr;op_Addition;(System.UIntPtr,System.Int32);Argument[0];ReturnValue;taint;dfc-generated |
+| System;UnhandledExceptionEventArgs;UnhandledExceptionEventArgs;(System.Object,System.Boolean);Argument[0];Argument[this].SyntheticField[System.UnhandledExceptionEventArgs._exception];value;dfc-generated |
+| System;UnhandledExceptionEventArgs;get_ExceptionObject;();Argument[this].SyntheticField[System.UnhandledExceptionEventArgs._exception];ReturnValue;value;dfc-generated |
 | System;UnhandledExceptionEventHandler;BeginInvoke;(System.Object,System.UnhandledExceptionEventArgs,System.AsyncCallback,System.Object);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
-| System;Uri;EscapeDataString;(System.String);Argument[0];ReturnValue;taint;df-generated |
-| System;Uri;EscapeString;(System.String);Argument[0];ReturnValue;taint;df-generated |
-| System;Uri;EscapeUriString;(System.String);Argument[0];ReturnValue;taint;df-generated |
+| System;Uri;EscapeDataString;(System.String);Argument[0];ReturnValue;value;dfc-generated |
+| System;Uri;EscapeString;(System.String);Argument[0];ReturnValue;value;dfc-generated |
+| System;Uri;EscapeUriString;(System.String);Argument[0];ReturnValue;value;dfc-generated |
 | System;Uri;GetComponents;(System.UriComponents,System.UriFormat);Argument[this];ReturnValue;taint;df-generated |
 | System;Uri;GetLeftPart;(System.UriPartial);Argument[this];ReturnValue;taint;df-generated |
 | System;Uri;GetObjectData;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);Argument[this];Argument[0];taint;df-generated |
 | System;Uri;MakeRelative;(System.Uri);Argument[0];ReturnValue;taint;df-generated |
 | System;Uri;MakeRelativeUri;(System.Uri);Argument[0];ReturnValue;taint;df-generated |
 | System;Uri;ToString;();Argument[this];ReturnValue;taint;manual |
-| System;Uri;ToString;(System.String,System.IFormatProvider);Argument[1];ReturnValue;taint;df-generated |
-| System;Uri;ToString;(System.String,System.IFormatProvider);Argument[this];ReturnValue;taint;df-generated |
-| System;Uri;TryCreate;(System.String,System.UriCreationOptions,System.Uri);Argument[0];ReturnValue;taint;df-generated |
-| System;Uri;TryCreate;(System.String,System.UriKind,System.Uri);Argument[0];ReturnValue;taint;df-generated |
-| System;Uri;TryCreate;(System.Uri,System.String,System.Uri);Argument[0];ReturnValue;taint;df-generated |
-| System;Uri;TryCreate;(System.Uri,System.String,System.Uri);Argument[1];ReturnValue;taint;df-generated |
+| System;Uri;ToString;(System.String,System.IFormatProvider);Argument[this].SyntheticField[System.Uri._string];ReturnValue;value;dfc-generated |
+| System;Uri;ToString;(System.String,System.IFormatProvider);Argument[this];ReturnValue;taint;dfc-generated |
+| System;Uri;TryCreate;(System.String,System.UriCreationOptions,System.Uri);Argument[0];ReturnValue.SyntheticField[System.Uri._string];value;dfc-generated |
+| System;Uri;TryCreate;(System.String,System.UriKind,System.Uri);Argument[0];ReturnValue.SyntheticField[System.Uri._string];value;dfc-generated |
+| System;Uri;TryCreate;(System.Uri,System.String,System.Uri);Argument[1];ReturnValue.SyntheticField[System.Uri._string];value;dfc-generated |
 | System;Uri;TryCreate;(System.Uri,System.Uri,System.Uri);Argument[0];ReturnValue;taint;df-generated |
 | System;Uri;TryCreate;(System.Uri,System.Uri,System.Uri);Argument[1];ReturnValue;taint;df-generated |
-| System;Uri;UnescapeDataString;(System.String);Argument[0];ReturnValue;taint;df-generated |
-| System;Uri;Uri;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);Argument[0];Argument[this];taint;df-generated |
+| System;Uri;UnescapeDataString;(System.String);Argument[0];ReturnValue;value;dfc-generated |
 | System;Uri;Uri;(System.String);Argument[0];Argument[this];taint;manual |
 | System;Uri;Uri;(System.String,System.Boolean);Argument[0];Argument[this];taint;manual |
-| System;Uri;Uri;(System.String,System.UriCreationOptions);Argument[0];Argument[this];taint;df-generated |
+| System;Uri;Uri;(System.String,System.UriCreationOptions);Argument[0];Argument[this].SyntheticField[System.Uri._string];value;dfc-generated |
 | System;Uri;Uri;(System.String,System.UriKind);Argument[0];Argument[this];taint;manual |
-| System;Uri;Uri;(System.Uri,System.String);Argument[0];Argument[this];taint;df-generated |
-| System;Uri;Uri;(System.Uri,System.String);Argument[1];Argument[this];taint;df-generated |
-| System;Uri;Uri;(System.Uri,System.String,System.Boolean);Argument[0];Argument[this];taint;df-generated |
-| System;Uri;Uri;(System.Uri,System.String,System.Boolean);Argument[1];Argument[this];taint;df-generated |
+| System;Uri;Uri;(System.Uri,System.String);Argument[1];Argument[this].SyntheticField[System.Uri._string];value;dfc-generated |
+| System;Uri;Uri;(System.Uri,System.String,System.Boolean);Argument[1];Argument[this].SyntheticField[System.Uri._string];value;dfc-generated |
 | System;Uri;Uri;(System.Uri,System.Uri);Argument[0];Argument[this];taint;df-generated |
 | System;Uri;Uri;(System.Uri,System.Uri);Argument[1];Argument[this];taint;df-generated |
 | System;Uri;get_AbsolutePath;();Argument[this];ReturnValue;taint;df-generated |
 | System;Uri;get_Authority;();Argument[this];ReturnValue;taint;df-generated |
-| System;Uri;get_DnsSafeHost;();Argument[this];ReturnValue;taint;df-generated |
+| System;Uri;get_DnsSafeHost;();Argument[this].Property[System.Uri.IdnHost];ReturnValue;value;dfc-generated |
 | System;Uri;get_Host;();Argument[this];ReturnValue;taint;df-generated |
 | System;Uri;get_IdnHost;();Argument[this];ReturnValue;taint;df-generated |
-| System;Uri;get_LocalPath;();Argument[this];ReturnValue;taint;df-generated |
+| System;Uri;get_LocalPath;();Argument[this].SyntheticField[System.Uri._string];ReturnValue;value;dfc-generated |
 | System;Uri;get_OriginalString;();Argument[this];ReturnValue;taint;manual |
 | System;Uri;get_PathAndQuery;();Argument[this];ReturnValue;taint;manual |
 | System;Uri;get_Query;();Argument[this];ReturnValue;taint;manual |
 | System;Uri;get_Scheme;();Argument[this];ReturnValue;taint;df-generated |
 | System;Uri;get_UserInfo;();Argument[this];ReturnValue;taint;df-generated |
-| System;UriBuilder;UriBuilder;(System.String);Argument[0];Argument[this];taint;df-generated |
+| System;UriBuilder;UriBuilder;(System.String);Argument[0];Argument[this].SyntheticField[System.UriBuilder._uri];taint;dfc-generated |
 | System;UriBuilder;UriBuilder;(System.String,System.String);Argument[0];Argument[this];taint;df-generated |
 | System;UriBuilder;UriBuilder;(System.String,System.String);Argument[1];Argument[this];taint;df-generated |
 | System;UriBuilder;UriBuilder;(System.String,System.String,System.Int32,System.String);Argument[3];Argument[this];taint;df-generated |
 | System;UriBuilder;UriBuilder;(System.String,System.String,System.Int32,System.String,System.String);Argument[4];Argument[this];taint;df-generated |
-| System;UriBuilder;UriBuilder;(System.Uri);Argument[0];Argument[this];taint;df-generated |
-| System;UriBuilder;get_Uri;();Argument[this];ReturnValue;taint;df-generated |
+| System;UriBuilder;UriBuilder;(System.Uri);Argument[0];Argument[this].SyntheticField[System.UriBuilder._uri];value;dfc-generated |
+| System;UriBuilder;get_Uri;();Argument[this].SyntheticField[System.UriBuilder._uri];ReturnValue;value;dfc-generated |
 | System;UriFormatException;GetObjectData;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);Argument[this];Argument[0];taint;df-generated |
 | System;UriParser;GetComponents;(System.Uri,System.UriComponents,System.UriFormat);Argument[0];ReturnValue;taint;df-generated |
-| System;UriParser;OnNewUri;();Argument[this];ReturnValue;value;df-generated |
+| System;UriParser;OnNewUri;();Argument[this];ReturnValue;value;dfc-generated |
 | System;UriParser;Register;(System.UriParser,System.String,System.Int32);Argument[1];Argument[0];taint;df-generated |
 | System;UriParser;Resolve;(System.Uri,System.Uri,System.UriFormatException);Argument[0];ReturnValue;taint;df-generated |
 | System;UriParser;Resolve;(System.Uri,System.Uri,System.UriFormatException);Argument[1];ReturnValue;taint;df-generated |
-| System;UriTypeConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[0];ReturnValue;taint;df-generated |
-| System;UriTypeConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue;taint;df-generated |
-| System;UriTypeConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[this];ReturnValue;taint;df-generated |
-| System;UriTypeConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[1];ReturnValue;taint;df-generated |
-| System;UriTypeConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[2];ReturnValue;taint;df-generated |
-| System;UriTypeConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[this];ReturnValue;taint;df-generated |
+| System;UriTypeConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2].Property[System.Uri.OriginalString];ReturnValue;taint;dfc-generated |
+| System;UriTypeConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue.Element;taint;dfc-generated |
+| System;UriTypeConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue;taint;dfc-generated |
+| System;UriTypeConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue;value;dfc-generated |
+| System;UriTypeConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[2].Element;ReturnValue;taint;dfc-generated |
+| System;UriTypeConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[2].Property[System.Uri.OriginalString];ReturnValue;value;dfc-generated |
+| System;UriTypeConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[2];ReturnValue;taint;dfc-generated |
 | System;ValueTuple;Create<T1,T2,T3,T4,T5,T6,T7,T8>;(T1,T2,T3,T4,T5,T6,T7,T8);Argument[0];ReturnValue.Field[System.ValueTuple`8.Item1];value;manual |
 | System;ValueTuple;Create<T1,T2,T3,T4,T5,T6,T7,T8>;(T1,T2,T3,T4,T5,T6,T7,T8);Argument[1];ReturnValue.Field[System.ValueTuple`8.Item2];value;manual |
 | System;ValueTuple;Create<T1,T2,T3,T4,T5,T6,T7,T8>;(T1,T2,T3,T4,T5,T6,T7,T8);Argument[2];ReturnValue.Field[System.ValueTuple`8.Item3];value;manual |
@@ -21179,15 +22069,255 @@ summary
 | System;ValueTuple<T1>;ToString;();Argument[this];ReturnValue;taint;df-generated |
 | System;ValueTuple<T1>;ValueTuple;(T1);Argument[0];Argument[this].Field[System.ValueTuple`1.Item1];value;manual |
 | System;ValueTuple<T1>;get_Item;(System.Int32);Argument[this].Field[System.ValueTuple`1.Item1];ReturnValue;value;manual |
-| System;Version;Clone;();Argument[this];ReturnValue;taint;df-generated |
-| System;Version;Clone;();Argument[this];ReturnValue;value;df-generated |
-| System;Version;ToString;(System.String,System.IFormatProvider);Argument[1];ReturnValue;taint;df-generated |
-| System;Version;ToString;(System.String,System.IFormatProvider);Argument[this];ReturnValue;taint;df-generated |
+| System;Version;Clone;();Argument[this];ReturnValue;value;dfc-generated |
+| System;Version;ToString;(System.String,System.IFormatProvider);Argument[this];ReturnValue;taint;dfc-generated |
+| System;WeakReference;GetObjectData;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);Argument[this].Property[System.WeakReference.Target];Argument[0].SyntheticField[System.Runtime.Serialization.SerializationInfo._values].Element;value;df-generated |
+| System;WeakReference;GetObjectData;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);Argument[this].Property[System.WeakReference.Target];Argument[0].SyntheticField[System.Runtime.Serialization.SerializationInfo._values].Element;value;dfc-generated |
 | System;WeakReference;GetObjectData;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);Argument[this];Argument[0];taint;df-generated |
+| System;WeakReference;GetObjectData;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);Argument[this];Argument[0];taint;dfc-generated |
 | System;WeakReference<T>;GetObjectData;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);Argument[this];Argument[0];taint;df-generated |
 | System;WeakReference<T>;TryGetTarget;(T);Argument[this];ReturnValue;taint;df-generated |
 neutral
+| Dapper;SqlMapper+GridReader;Dispose;();summary;df-generated |
+| Dapper;SqlMapper+Identity;Equals;(Dapper.SqlMapper+Identity);summary;df-generated |
+| Funq;Container;Dispose;();summary;df-generated |
+| Microsoft.AspNetCore.Authentication.Cookies;PostConfigureCookieAuthenticationOptions;PostConfigure;(System.String,Microsoft.AspNetCore.Authentication.Cookies.CookieAuthenticationOptions);summary;df-generated |
+| Microsoft.AspNetCore.Authentication.OAuth;OAuthTokenResponse;Dispose;();summary;df-generated |
+| Microsoft.AspNetCore.Builder;ConfigureHostBuilder;Build;();summary;df-generated |
+| Microsoft.AspNetCore.Builder;ConfigureHostBuilder;get_Properties;();summary;df-generated |
+| Microsoft.AspNetCore.Builder;WebApplication;Dispose;();summary;df-generated |
+| Microsoft.AspNetCore.Builder;WebApplication;StartAsync;(System.Threading.CancellationToken);summary;df-generated |
+| Microsoft.AspNetCore.Builder;WebApplication;StopAsync;(System.Threading.CancellationToken);summary;df-generated |
+| Microsoft.AspNetCore.Builder;WebApplication;get_Services;();summary;df-generated |
+| Microsoft.AspNetCore.Builder;WebApplicationBuilder;ConfigureContainer<TContainerBuilder>;(Microsoft.Extensions.DependencyInjection.IServiceProviderFactory<TContainerBuilder>,System.Action<TContainerBuilder>);summary;df-generated |
+| Microsoft.AspNetCore.Builder;WebApplicationBuilder;get_Configuration;();summary;df-generated |
+| Microsoft.AspNetCore.Components.Authorization;CascadingAuthenticationState;Dispose;();summary;df-generated |
+| Microsoft.AspNetCore.Components.Forms;DataAnnotationsValidator;Dispose;();summary;df-generated |
+| Microsoft.AspNetCore.Components.Forms;FieldIdentifier;Equals;(Microsoft.AspNetCore.Components.Forms.FieldIdentifier);summary;df-generated |
+| Microsoft.AspNetCore.Components.Forms;InputBase<TValue>;Dispose;();summary;df-generated |
+| Microsoft.AspNetCore.Components.Forms;InputFile;Dispose;();summary;df-generated |
+| Microsoft.AspNetCore.Components.Forms;ValidationMessage<TValue>;Dispose;();summary;df-generated |
+| Microsoft.AspNetCore.Components.Forms;ValidationSummary;Dispose;();summary;df-generated |
+| Microsoft.AspNetCore.Components.RenderTree;Renderer;Dispose;();summary;df-generated |
+| Microsoft.AspNetCore.Components.Rendering;RenderTreeBuilder;Dispose;();summary;df-generated |
+| Microsoft.AspNetCore.Components.Routing;NavLink;Dispose;();summary;df-generated |
+| Microsoft.AspNetCore.Components.Routing;Router;Dispose;();summary;df-generated |
+| Microsoft.AspNetCore.Components.Sections;SectionContent;Dispose;();summary;df-generated |
+| Microsoft.AspNetCore.Components.Sections;SectionOutlet;Dispose;();summary;df-generated |
+| Microsoft.AspNetCore.Components.Server;RevalidatingServerAuthenticationStateProvider;Dispose;();summary;df-generated |
+| Microsoft.AspNetCore.Components.Web;HtmlRenderer;Dispose;();summary;df-generated |
+| Microsoft.AspNetCore.Components;OwningComponentBase;Dispose;();summary;df-generated |
+| Microsoft.AspNetCore.Components;PersistingComponentStateSubscription;Dispose;();summary;df-generated |
+| Microsoft.AspNetCore.Connections;ConnectionItems;Contains;(System.Collections.Generic.KeyValuePair<System.Object,System.Object>);summary;df-generated |
+| Microsoft.AspNetCore.Connections;ConnectionItems;ContainsKey;(System.Object);summary;df-generated |
+| Microsoft.AspNetCore.Connections;ConnectionItems;Remove;(System.Collections.Generic.KeyValuePair<System.Object,System.Object>);summary;df-generated |
+| Microsoft.AspNetCore.Connections;ConnectionItems;Remove;(System.Object);summary;df-generated |
+| Microsoft.AspNetCore.Connections;ConnectionItems;TryGetValue;(System.Object,System.Object);summary;df-generated |
+| Microsoft.AspNetCore.Connections;ConnectionItems;get_Count;();summary;df-generated |
+| Microsoft.AspNetCore.Connections;ConnectionItems;get_IsReadOnly;();summary;df-generated |
+| Microsoft.AspNetCore.DataProtection;Secret;Dispose;();summary;df-generated |
+| Microsoft.AspNetCore.Http.Connections;ConnectionOptionsSetup;Configure;(Microsoft.AspNetCore.Http.Connections.ConnectionOptions);summary;df-generated |
+| Microsoft.AspNetCore.Http.Features;RequestServicesFeature;Dispose;();summary;df-generated |
+| Microsoft.AspNetCore.Http;EndpointMetadataCollection+Enumerator;Dispose;();summary;df-generated |
+| Microsoft.AspNetCore.Http;EndpointMetadataCollection+Enumerator;MoveNext;();summary;df-generated |
+| Microsoft.AspNetCore.Http;EndpointMetadataCollection+Enumerator;Reset;();summary;df-generated |
+| Microsoft.AspNetCore.Http;EndpointMetadataCollection+Enumerator;get_Current;();summary;df-generated |
+| Microsoft.AspNetCore.Http;EndpointMetadataCollection;get_Count;();summary;df-generated |
+| Microsoft.AspNetCore.Http;EndpointMetadataCollection;get_Item;(System.Int32);summary;df-generated |
+| Microsoft.AspNetCore.Http;FormCollection+Enumerator;Dispose;();summary;df-generated |
+| Microsoft.AspNetCore.Http;FormCollection+Enumerator;MoveNext;();summary;df-generated |
+| Microsoft.AspNetCore.Http;FormCollection+Enumerator;Reset;();summary;df-generated |
+| Microsoft.AspNetCore.Http;FormCollection+Enumerator;get_Current;();summary;df-generated |
+| Microsoft.AspNetCore.Http;FragmentString;Equals;(Microsoft.AspNetCore.Http.FragmentString);summary;df-generated |
+| Microsoft.AspNetCore.Http;HeaderDictionary+Enumerator;Dispose;();summary;df-generated |
+| Microsoft.AspNetCore.Http;HeaderDictionary+Enumerator;MoveNext;();summary;df-generated |
+| Microsoft.AspNetCore.Http;HeaderDictionary+Enumerator;Reset;();summary;df-generated |
+| Microsoft.AspNetCore.Http;HeaderDictionary+Enumerator;get_Current;();summary;df-generated |
+| Microsoft.AspNetCore.Http;HeaderDictionary;Contains;(System.Collections.Generic.KeyValuePair<System.String,Microsoft.Extensions.Primitives.StringValues>);summary;df-generated |
+| Microsoft.AspNetCore.Http;HeaderDictionary;ContainsKey;(System.String);summary;df-generated |
+| Microsoft.AspNetCore.Http;HeaderDictionary;Remove;(System.Collections.Generic.KeyValuePair<System.String,Microsoft.Extensions.Primitives.StringValues>);summary;df-generated |
+| Microsoft.AspNetCore.Http;HeaderDictionary;Remove;(System.String);summary;df-generated |
+| Microsoft.AspNetCore.Http;HeaderDictionary;TryGetValue;(System.String,Microsoft.Extensions.Primitives.StringValues);summary;df-generated |
+| Microsoft.AspNetCore.Http;HeaderDictionary;get_Count;();summary;df-generated |
+| Microsoft.AspNetCore.Http;HeaderDictionary;get_IsReadOnly;();summary;df-generated |
+| Microsoft.AspNetCore.Http;HostString;Equals;(Microsoft.AspNetCore.Http.HostString);summary;df-generated |
+| Microsoft.AspNetCore.Http;PathString;Equals;(Microsoft.AspNetCore.Http.PathString);summary;df-generated |
+| Microsoft.AspNetCore.Http;QueryCollection+Enumerator;Dispose;();summary;df-generated |
+| Microsoft.AspNetCore.Http;QueryCollection+Enumerator;MoveNext;();summary;df-generated |
+| Microsoft.AspNetCore.Http;QueryCollection+Enumerator;Reset;();summary;df-generated |
+| Microsoft.AspNetCore.Http;QueryCollection+Enumerator;get_Current;();summary;df-generated |
+| Microsoft.AspNetCore.Http;QueryString;Equals;(Microsoft.AspNetCore.Http.QueryString);summary;df-generated |
+| Microsoft.AspNetCore.Identity;RoleManager<TRole>;Dispose;();summary;df-generated |
+| Microsoft.AspNetCore.Identity;RoleStoreBase<TRole,TKey,TUserRole,TRoleClaim>;Dispose;();summary;df-generated |
+| Microsoft.AspNetCore.Identity;UserManager<TUser>;Dispose;();summary;df-generated |
+| Microsoft.AspNetCore.Identity;UserStoreBase<TUser,TKey,TUserClaim,TUserLogin,TUserToken>;Dispose;();summary;df-generated |
+| Microsoft.AspNetCore.Mvc.Diagnostics;EventData+Enumerator;Dispose;();summary;df-generated |
+| Microsoft.AspNetCore.Mvc.Diagnostics;EventData+Enumerator;MoveNext;();summary;df-generated |
+| Microsoft.AspNetCore.Mvc.Diagnostics;EventData+Enumerator;Reset;();summary;df-generated |
+| Microsoft.AspNetCore.Mvc.Diagnostics;EventData+Enumerator;get_Current;();summary;df-generated |
+| Microsoft.AspNetCore.Mvc.Diagnostics;EventData;get_Count;();summary;df-generated |
+| Microsoft.AspNetCore.Mvc.Diagnostics;EventData;get_Item;(System.Int32);summary;df-generated |
+| Microsoft.AspNetCore.Mvc.Formatters.Xml;DelegatingEnumerator<TWrapped,TDeclared>;Dispose;();summary;df-generated |
+| Microsoft.AspNetCore.Mvc.Formatters.Xml;DelegatingEnumerator<TWrapped,TDeclared>;MoveNext;();summary;df-generated |
+| Microsoft.AspNetCore.Mvc.Formatters.Xml;DelegatingEnumerator<TWrapped,TDeclared>;Reset;();summary;df-generated |
+| Microsoft.AspNetCore.Mvc.Formatters.Xml;DelegatingEnumerator<TWrapped,TDeclared>;get_Current;();summary;df-generated |
+| Microsoft.AspNetCore.Mvc.Formatters.Xml;ProblemDetailsWrapper;GetSchema;();summary;df-generated |
+| Microsoft.AspNetCore.Mvc.Formatters.Xml;SerializableErrorWrapper;GetSchema;();summary;df-generated |
+| Microsoft.AspNetCore.Mvc.Infrastructure;ConfigureCompatibilityOptions<TOptions>;PostConfigure;(System.String,TOptions);summary;df-generated |
+| Microsoft.AspNetCore.Mvc.ModelBinding.Metadata;ModelMetadataIdentity;Equals;(Microsoft.AspNetCore.Mvc.ModelBinding.Metadata.ModelMetadataIdentity);summary;df-generated |
+| Microsoft.AspNetCore.Mvc.ModelBinding.Validation;ValidationStateDictionary;Contains;(System.Collections.Generic.KeyValuePair<System.Object,Microsoft.AspNetCore.Mvc.ModelBinding.Validation.ValidationStateEntry>);summary;df-generated |
+| Microsoft.AspNetCore.Mvc.ModelBinding.Validation;ValidationStateDictionary;ContainsKey;(System.Object);summary;df-generated |
+| Microsoft.AspNetCore.Mvc.ModelBinding.Validation;ValidationStateDictionary;Remove;(System.Collections.Generic.KeyValuePair<System.Object,Microsoft.AspNetCore.Mvc.ModelBinding.Validation.ValidationStateEntry>);summary;df-generated |
+| Microsoft.AspNetCore.Mvc.ModelBinding.Validation;ValidationStateDictionary;Remove;(System.Object);summary;df-generated |
+| Microsoft.AspNetCore.Mvc.ModelBinding.Validation;ValidationStateDictionary;TryGetValue;(System.Object,Microsoft.AspNetCore.Mvc.ModelBinding.Validation.ValidationStateEntry);summary;df-generated |
+| Microsoft.AspNetCore.Mvc.ModelBinding.Validation;ValidationStateDictionary;get_Count;();summary;df-generated |
+| Microsoft.AspNetCore.Mvc.ModelBinding.Validation;ValidationStateDictionary;get_IsReadOnly;();summary;df-generated |
+| Microsoft.AspNetCore.Mvc.ModelBinding.Validation;ValidationStateDictionary;get_Item;(System.Object);summary;df-generated |
+| Microsoft.AspNetCore.Mvc.ModelBinding.Validation;ValidationStateDictionary;get_Keys;();summary;df-generated |
+| Microsoft.AspNetCore.Mvc.ModelBinding.Validation;ValidationStateDictionary;get_Values;();summary;df-generated |
+| Microsoft.AspNetCore.Mvc.ModelBinding.Validation;ValidationVisitor+StateManager;Dispose;();summary;df-generated |
+| Microsoft.AspNetCore.Mvc.ModelBinding;BindingSource;Equals;(Microsoft.AspNetCore.Mvc.ModelBinding.BindingSource);summary;df-generated |
+| Microsoft.AspNetCore.Mvc.ModelBinding;ModelBindingContext+NestedScope;Dispose;();summary;df-generated |
+| Microsoft.AspNetCore.Mvc.ModelBinding;ModelBindingResult;Equals;(Microsoft.AspNetCore.Mvc.ModelBinding.ModelBindingResult);summary;df-generated |
+| Microsoft.AspNetCore.Mvc.ModelBinding;ModelMetadata;Equals;(Microsoft.AspNetCore.Mvc.ModelBinding.ModelMetadata);summary;df-generated |
+| Microsoft.AspNetCore.Mvc.ModelBinding;ModelStateDictionary+Enumerator;Dispose;();summary;df-generated |
+| Microsoft.AspNetCore.Mvc.ModelBinding;ModelStateDictionary+Enumerator;MoveNext;();summary;df-generated |
+| Microsoft.AspNetCore.Mvc.ModelBinding;ModelStateDictionary+Enumerator;Reset;();summary;df-generated |
+| Microsoft.AspNetCore.Mvc.ModelBinding;ModelStateDictionary+Enumerator;get_Current;();summary;df-generated |
+| Microsoft.AspNetCore.Mvc.ModelBinding;ModelStateDictionary+KeyEnumerator;Dispose;();summary;df-generated |
+| Microsoft.AspNetCore.Mvc.ModelBinding;ModelStateDictionary+KeyEnumerator;MoveNext;();summary;df-generated |
+| Microsoft.AspNetCore.Mvc.ModelBinding;ModelStateDictionary+KeyEnumerator;Reset;();summary;df-generated |
+| Microsoft.AspNetCore.Mvc.ModelBinding;ModelStateDictionary+KeyEnumerator;get_Current;();summary;df-generated |
+| Microsoft.AspNetCore.Mvc.ModelBinding;ModelStateDictionary+ValueEnumerator;Dispose;();summary;df-generated |
+| Microsoft.AspNetCore.Mvc.ModelBinding;ModelStateDictionary+ValueEnumerator;MoveNext;();summary;df-generated |
+| Microsoft.AspNetCore.Mvc.ModelBinding;ModelStateDictionary+ValueEnumerator;Reset;();summary;df-generated |
+| Microsoft.AspNetCore.Mvc.ModelBinding;ModelStateDictionary+ValueEnumerator;get_Current;();summary;df-generated |
+| Microsoft.AspNetCore.Mvc.ModelBinding;ModelStateDictionary;ContainsKey;(System.String);summary;df-generated |
+| Microsoft.AspNetCore.Mvc.ModelBinding;ModelStateDictionary;TryGetValue;(System.String,Microsoft.AspNetCore.Mvc.ModelBinding.ModelStateEntry);summary;df-generated |
+| Microsoft.AspNetCore.Mvc.ModelBinding;ModelStateDictionary;get_Count;();summary;df-generated |
+| Microsoft.AspNetCore.Mvc.ModelBinding;ModelStateDictionary;get_Item;(System.String);summary;df-generated |
+| Microsoft.AspNetCore.Mvc.ModelBinding;ModelStateDictionary;get_Keys;();summary;df-generated |
+| Microsoft.AspNetCore.Mvc.ModelBinding;ModelStateDictionary;get_Values;();summary;df-generated |
+| Microsoft.AspNetCore.Mvc.ModelBinding;ValueProviderResult;Equals;(Microsoft.AspNetCore.Mvc.ModelBinding.ValueProviderResult);summary;df-generated |
+| Microsoft.AspNetCore.Mvc.Rendering;MvcForm;Dispose;();summary;df-generated |
+| Microsoft.AspNetCore.Mvc.TagHelpers.Cache;CacheTagKey;Equals;(Microsoft.AspNetCore.Mvc.TagHelpers.Cache.CacheTagKey);summary;df-generated |
+| Microsoft.AspNetCore.Mvc.ViewFeatures;AttributeDictionary+Enumerator;Dispose;();summary;df-generated |
+| Microsoft.AspNetCore.Mvc.ViewFeatures;AttributeDictionary+Enumerator;MoveNext;();summary;df-generated |
+| Microsoft.AspNetCore.Mvc.ViewFeatures;AttributeDictionary+Enumerator;Reset;();summary;df-generated |
+| Microsoft.AspNetCore.Mvc.ViewFeatures;AttributeDictionary+Enumerator;get_Current;();summary;df-generated |
+| Microsoft.AspNetCore.Mvc.ViewFeatures;AttributeDictionary;Contains;(System.Collections.Generic.KeyValuePair<System.String,System.String>);summary;df-generated |
+| Microsoft.AspNetCore.Mvc.ViewFeatures;AttributeDictionary;ContainsKey;(System.String);summary;df-generated |
+| Microsoft.AspNetCore.Mvc.ViewFeatures;AttributeDictionary;Remove;(System.Collections.Generic.KeyValuePair<System.String,System.String>);summary;df-generated |
+| Microsoft.AspNetCore.Mvc.ViewFeatures;AttributeDictionary;Remove;(System.String);summary;df-generated |
+| Microsoft.AspNetCore.Mvc.ViewFeatures;AttributeDictionary;TryGetValue;(System.String,System.String);summary;df-generated |
+| Microsoft.AspNetCore.Mvc.ViewFeatures;AttributeDictionary;get_Count;();summary;df-generated |
+| Microsoft.AspNetCore.Mvc.ViewFeatures;AttributeDictionary;get_IsReadOnly;();summary;df-generated |
+| Microsoft.AspNetCore.Mvc.ViewFeatures;AttributeDictionary;get_Item;(System.String);summary;df-generated |
+| Microsoft.AspNetCore.Mvc.ViewFeatures;AttributeDictionary;get_Keys;();summary;df-generated |
+| Microsoft.AspNetCore.Mvc.ViewFeatures;AttributeDictionary;get_Values;();summary;df-generated |
+| Microsoft.AspNetCore.Mvc.ViewFeatures;TempDataDictionary;Contains;(System.Collections.Generic.KeyValuePair<System.String,System.Object>);summary;df-generated |
+| Microsoft.AspNetCore.Mvc.ViewFeatures;TempDataDictionary;ContainsKey;(System.String);summary;df-generated |
+| Microsoft.AspNetCore.Mvc.ViewFeatures;TempDataDictionary;Remove;(System.Collections.Generic.KeyValuePair<System.String,System.Object>);summary;df-generated |
+| Microsoft.AspNetCore.Mvc.ViewFeatures;TempDataDictionary;Remove;(System.String);summary;df-generated |
+| Microsoft.AspNetCore.Mvc.ViewFeatures;TempDataDictionary;TryGetValue;(System.String,System.Object);summary;df-generated |
+| Microsoft.AspNetCore.Mvc.ViewFeatures;TempDataDictionary;get_Count;();summary;df-generated |
+| Microsoft.AspNetCore.Mvc.ViewFeatures;TempDataDictionary;get_IsReadOnly;();summary;df-generated |
+| Microsoft.AspNetCore.Mvc.ViewFeatures;ViewDataDictionary;Contains;(System.Collections.Generic.KeyValuePair<System.String,System.Object>);summary;df-generated |
+| Microsoft.AspNetCore.Mvc.ViewFeatures;ViewDataDictionary;ContainsKey;(System.String);summary;df-generated |
+| Microsoft.AspNetCore.Mvc.ViewFeatures;ViewDataDictionary;Remove;(System.Collections.Generic.KeyValuePair<System.String,System.Object>);summary;df-generated |
+| Microsoft.AspNetCore.Mvc.ViewFeatures;ViewDataDictionary;Remove;(System.String);summary;df-generated |
+| Microsoft.AspNetCore.Mvc.ViewFeatures;ViewDataDictionary;TryGetValue;(System.String,System.Object);summary;df-generated |
+| Microsoft.AspNetCore.Mvc.ViewFeatures;ViewDataDictionary;get_Count;();summary;df-generated |
+| Microsoft.AspNetCore.Mvc.ViewFeatures;ViewDataDictionary;get_IsReadOnly;();summary;df-generated |
+| Microsoft.AspNetCore.Mvc;Controller;Dispose;();summary;df-generated |
+| Microsoft.AspNetCore.Mvc;RemoteAttributeBase;IsValid;(System.Object);summary;df-generated |
+| Microsoft.AspNetCore.Razor.TagHelpers;NullHtmlEncoder;FindFirstCharacterToEncode;(System.Char*,System.Int32);summary;df-generated |
+| Microsoft.AspNetCore.Razor.TagHelpers;NullHtmlEncoder;TryEncodeUnicodeScalar;(System.Int32,System.Char*,System.Int32,System.Int32);summary;df-generated |
+| Microsoft.AspNetCore.Razor.TagHelpers;NullHtmlEncoder;WillEncode;(System.Int32);summary;df-generated |
+| Microsoft.AspNetCore.Razor.TagHelpers;NullHtmlEncoder;get_MaxOutputCharactersPerInputCharacter;();summary;df-generated |
+| Microsoft.AspNetCore.Razor.TagHelpers;TagHelperAttributeList;Remove;(Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute);summary;df-generated |
+| Microsoft.AspNetCore.Razor.TagHelpers;TagHelperAttributeList;RemoveAt;(System.Int32);summary;df-generated |
+| Microsoft.AspNetCore.Razor.TagHelpers;TagHelperAttributeList;get_IsReadOnly;();summary;df-generated |
+| Microsoft.AspNetCore.ResponseCompression;BrotliCompressionProviderOptions;get_Value;();summary;df-generated |
+| Microsoft.AspNetCore.ResponseCompression;GzipCompressionProviderOptions;get_Value;();summary;df-generated |
+| Microsoft.AspNetCore.Routing.Matching;EndpointMetadataComparer;Compare;(Microsoft.AspNetCore.Http.Endpoint,Microsoft.AspNetCore.Http.Endpoint);summary;df-generated |
+| Microsoft.AspNetCore.Routing.Matching;EndpointMetadataComparer<TMetadata>;Compare;(Microsoft.AspNetCore.Http.Endpoint,Microsoft.AspNetCore.Http.Endpoint);summary;df-generated |
+| Microsoft.AspNetCore.Routing;CompositeEndpointDataSource;Dispose;();summary;df-generated |
+| Microsoft.AspNetCore.Routing;RouteValueDictionary+Enumerator;Dispose;();summary;df-generated |
+| Microsoft.AspNetCore.Routing;RouteValueDictionary+Enumerator;MoveNext;();summary;df-generated |
+| Microsoft.AspNetCore.Routing;RouteValueDictionary+Enumerator;Reset;();summary;df-generated |
+| Microsoft.AspNetCore.Routing;RouteValueDictionary+Enumerator;get_Current;();summary;df-generated |
+| Microsoft.AspNetCore.Routing;RouteValueDictionary;Contains;(System.Collections.Generic.KeyValuePair<System.String,System.Object>);summary;df-generated |
+| Microsoft.AspNetCore.Routing;RouteValueDictionary;ContainsKey;(System.String);summary;df-generated |
+| Microsoft.AspNetCore.Routing;RouteValueDictionary;Remove;(System.Collections.Generic.KeyValuePair<System.String,System.Object>);summary;df-generated |
+| Microsoft.AspNetCore.Routing;RouteValueDictionary;Remove;(System.String);summary;df-generated |
+| Microsoft.AspNetCore.Routing;RouteValueDictionary;TryGetValue;(System.String,System.Object);summary;df-generated |
+| Microsoft.AspNetCore.Routing;RouteValueDictionary;get_Count;();summary;df-generated |
+| Microsoft.AspNetCore.Routing;RouteValueDictionary;get_IsReadOnly;();summary;df-generated |
+| Microsoft.AspNetCore.Routing;RouteValueDictionary;get_Item;(System.String);summary;df-generated |
+| Microsoft.AspNetCore.Routing;RouteValueDictionary;get_Keys;();summary;df-generated |
+| Microsoft.AspNetCore.Routing;RouteValueDictionary;get_Values;();summary;df-generated |
+| Microsoft.AspNetCore.Routing;RouteValueEqualityComparer;Equals;(System.Object,System.Object);summary;df-generated |
+| Microsoft.AspNetCore.Routing;RouteValueEqualityComparer;GetHashCode;(System.Object);summary;df-generated |
+| Microsoft.AspNetCore.Server.HttpSys;DelegationRule;Dispose;();summary;df-generated |
+| Microsoft.AspNetCore.Server.HttpSys;HttpSysException;get_ErrorCode;();summary;df-generated |
+| Microsoft.AspNetCore.Server.HttpSys;UrlPrefixCollection;Contains;(Microsoft.AspNetCore.Server.HttpSys.UrlPrefix);summary;df-generated |
+| Microsoft.AspNetCore.Server.HttpSys;UrlPrefixCollection;Remove;(Microsoft.AspNetCore.Server.HttpSys.UrlPrefix);summary;df-generated |
+| Microsoft.AspNetCore.Server.HttpSys;UrlPrefixCollection;get_Count;();summary;df-generated |
+| Microsoft.AspNetCore.Server.HttpSys;UrlPrefixCollection;get_IsReadOnly;();summary;df-generated |
+| Microsoft.AspNetCore.Server.Kestrel.Core;KestrelServer;Dispose;();summary;df-generated |
+| Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets;SocketConnectionContextFactory;Dispose;();summary;df-generated |
+| Microsoft.AspNetCore.SignalR;Hub;Dispose;();summary;df-generated |
+| Microsoft.AspNetCore.SignalR;HubConnectionStore+Enumerator;Dispose;();summary;df-generated |
+| Microsoft.AspNetCore.SignalR;HubConnectionStore+Enumerator;MoveNext;();summary;df-generated |
+| Microsoft.AspNetCore.SignalR;HubConnectionStore+Enumerator;Reset;();summary;df-generated |
+| Microsoft.AspNetCore.SignalR;HubConnectionStore+Enumerator;get_Current;();summary;df-generated |
+| Microsoft.AspNetCore.SignalR;HubOptionsSetup;Configure;(Microsoft.AspNetCore.SignalR.HubOptions);summary;df-generated |
+| Microsoft.AspNetCore.SignalR;HubOptionsSetup<THub>;Configure;(Microsoft.AspNetCore.SignalR.HubOptions<THub>);summary;df-generated |
+| Microsoft.AspNetCore.WebUtilities;BufferedReadStream;Dispose;(System.Boolean);summary;df-generated |
+| Microsoft.AspNetCore.WebUtilities;BufferedReadStream;Flush;();summary;df-generated |
+| Microsoft.AspNetCore.WebUtilities;BufferedReadStream;Seek;(System.Int64,System.IO.SeekOrigin);summary;df-generated |
+| Microsoft.AspNetCore.WebUtilities;BufferedReadStream;SetLength;(System.Int64);summary;df-generated |
+| Microsoft.AspNetCore.WebUtilities;BufferedReadStream;get_CanRead;();summary;df-generated |
+| Microsoft.AspNetCore.WebUtilities;BufferedReadStream;get_CanSeek;();summary;df-generated |
+| Microsoft.AspNetCore.WebUtilities;BufferedReadStream;get_CanTimeout;();summary;df-generated |
+| Microsoft.AspNetCore.WebUtilities;BufferedReadStream;get_CanWrite;();summary;df-generated |
+| Microsoft.AspNetCore.WebUtilities;BufferedReadStream;get_Length;();summary;df-generated |
+| Microsoft.AspNetCore.WebUtilities;FileBufferingReadStream;Dispose;(System.Boolean);summary;df-generated |
+| Microsoft.AspNetCore.WebUtilities;FileBufferingReadStream;Flush;();summary;df-generated |
+| Microsoft.AspNetCore.WebUtilities;FileBufferingReadStream;Seek;(System.Int64,System.IO.SeekOrigin);summary;df-generated |
+| Microsoft.AspNetCore.WebUtilities;FileBufferingReadStream;SetLength;(System.Int64);summary;df-generated |
+| Microsoft.AspNetCore.WebUtilities;FileBufferingReadStream;get_CanRead;();summary;df-generated |
+| Microsoft.AspNetCore.WebUtilities;FileBufferingReadStream;get_CanSeek;();summary;df-generated |
+| Microsoft.AspNetCore.WebUtilities;FileBufferingReadStream;get_CanWrite;();summary;df-generated |
+| Microsoft.AspNetCore.WebUtilities;FileBufferingReadStream;get_Length;();summary;df-generated |
+| Microsoft.AspNetCore.WebUtilities;FileBufferingWriteStream;Dispose;(System.Boolean);summary;df-generated |
+| Microsoft.AspNetCore.WebUtilities;FileBufferingWriteStream;Flush;();summary;df-generated |
+| Microsoft.AspNetCore.WebUtilities;FileBufferingWriteStream;Seek;(System.Int64,System.IO.SeekOrigin);summary;df-generated |
+| Microsoft.AspNetCore.WebUtilities;FileBufferingWriteStream;SetLength;(System.Int64);summary;df-generated |
+| Microsoft.AspNetCore.WebUtilities;FileBufferingWriteStream;get_CanRead;();summary;df-generated |
+| Microsoft.AspNetCore.WebUtilities;FileBufferingWriteStream;get_CanSeek;();summary;df-generated |
+| Microsoft.AspNetCore.WebUtilities;FileBufferingWriteStream;get_CanWrite;();summary;df-generated |
+| Microsoft.AspNetCore.WebUtilities;FileBufferingWriteStream;get_Length;();summary;df-generated |
+| Microsoft.AspNetCore.WebUtilities;FormReader;Dispose;();summary;df-generated |
+| Microsoft.AspNetCore.WebUtilities;HttpRequestStreamReader;Dispose;(System.Boolean);summary;df-generated |
+| Microsoft.AspNetCore.WebUtilities;HttpRequestStreamReader;Peek;();summary;df-generated |
+| Microsoft.AspNetCore.WebUtilities;HttpResponseStreamWriter;Dispose;(System.Boolean);summary;df-generated |
+| Microsoft.AspNetCore.WebUtilities;HttpResponseStreamWriter;Flush;();summary;df-generated |
+| Microsoft.AspNetCore.WebUtilities;HttpResponseStreamWriter;Write;(System.Char);summary;df-generated |
+| Microsoft.AspNetCore.WebUtilities;HttpResponseStreamWriter;Write;(System.ReadOnlySpan<System.Char>);summary;df-generated |
+| Microsoft.AspNetCore.WebUtilities;HttpResponseStreamWriter;WriteLine;(System.ReadOnlySpan<System.Char>);summary;df-generated |
+| Microsoft.CSharp.RuntimeBinder;Binder;BinaryOperation;(Microsoft.CSharp.RuntimeBinder.CSharpBinderFlags,System.Linq.Expressions.ExpressionType,System.Type,System.Collections.Generic.IEnumerable<Microsoft.CSharp.RuntimeBinder.CSharpArgumentInfo>);summary;df-generated |
 | Microsoft.CSharp.RuntimeBinder;Binder;Convert;(Microsoft.CSharp.RuntimeBinder.CSharpBinderFlags,System.Type,System.Type);summary;df-generated |
+| Microsoft.CSharp.RuntimeBinder;Binder;GetIndex;(Microsoft.CSharp.RuntimeBinder.CSharpBinderFlags,System.Type,System.Collections.Generic.IEnumerable<Microsoft.CSharp.RuntimeBinder.CSharpArgumentInfo>);summary;df-generated |
+| Microsoft.CSharp.RuntimeBinder;Binder;GetMember;(Microsoft.CSharp.RuntimeBinder.CSharpBinderFlags,System.String,System.Type,System.Collections.Generic.IEnumerable<Microsoft.CSharp.RuntimeBinder.CSharpArgumentInfo>);summary;df-generated |
+| Microsoft.CSharp.RuntimeBinder;Binder;Invoke;(Microsoft.CSharp.RuntimeBinder.CSharpBinderFlags,System.Type,System.Collections.Generic.IEnumerable<Microsoft.CSharp.RuntimeBinder.CSharpArgumentInfo>);summary;df-generated |
+| Microsoft.CSharp.RuntimeBinder;Binder;InvokeConstructor;(Microsoft.CSharp.RuntimeBinder.CSharpBinderFlags,System.Type,System.Collections.Generic.IEnumerable<Microsoft.CSharp.RuntimeBinder.CSharpArgumentInfo>);summary;df-generated |
+| Microsoft.CSharp.RuntimeBinder;Binder;InvokeMember;(Microsoft.CSharp.RuntimeBinder.CSharpBinderFlags,System.String,System.Collections.Generic.IEnumerable<System.Type>,System.Type,System.Collections.Generic.IEnumerable<Microsoft.CSharp.RuntimeBinder.CSharpArgumentInfo>);summary;df-generated |
+| Microsoft.CSharp.RuntimeBinder;Binder;IsEvent;(Microsoft.CSharp.RuntimeBinder.CSharpBinderFlags,System.String,System.Type);summary;df-generated |
+| Microsoft.CSharp.RuntimeBinder;Binder;SetIndex;(Microsoft.CSharp.RuntimeBinder.CSharpBinderFlags,System.Type,System.Collections.Generic.IEnumerable<Microsoft.CSharp.RuntimeBinder.CSharpArgumentInfo>);summary;df-generated |
+| Microsoft.CSharp.RuntimeBinder;Binder;SetMember;(Microsoft.CSharp.RuntimeBinder.CSharpBinderFlags,System.String,System.Type,System.Collections.Generic.IEnumerable<Microsoft.CSharp.RuntimeBinder.CSharpArgumentInfo>);summary;df-generated |
+| Microsoft.CSharp.RuntimeBinder;Binder;UnaryOperation;(Microsoft.CSharp.RuntimeBinder.CSharpBinderFlags,System.Linq.Expressions.ExpressionType,System.Type,System.Collections.Generic.IEnumerable<Microsoft.CSharp.RuntimeBinder.CSharpArgumentInfo>);summary;df-generated |
 | Microsoft.CSharp.RuntimeBinder;RuntimeBinderException;RuntimeBinderException;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);summary;df-generated |
 | Microsoft.CSharp.RuntimeBinder;RuntimeBinderException;RuntimeBinderException;(System.String);summary;df-generated |
 | Microsoft.CSharp.RuntimeBinder;RuntimeBinderException;RuntimeBinderException;(System.String,System.Exception);summary;df-generated |
@@ -21196,6 +22326,7 @@ neutral
 | Microsoft.CSharp.RuntimeBinder;RuntimeBinderInternalCompilerException;RuntimeBinderInternalCompilerException;(System.String,System.Exception);summary;df-generated |
 | Microsoft.CSharp;CSharpCodeProvider;GetConverter;(System.Type);summary;df-generated |
 | Microsoft.CSharp;CSharpCodeProvider;get_FileExtension;();summary;df-generated |
+| Microsoft.EntityFrameworkCore;DbContext;Dispose;();summary;df-generated |
 | Microsoft.Extensions.Caching.Distributed;DistributedCacheExtensions;GetString;(Microsoft.Extensions.Caching.Distributed.IDistributedCache,System.String);summary;df-generated |
 | Microsoft.Extensions.Caching.Distributed;DistributedCacheExtensions;GetStringAsync;(Microsoft.Extensions.Caching.Distributed.IDistributedCache,System.String,System.Threading.CancellationToken);summary;df-generated |
 | Microsoft.Extensions.Caching.Distributed;DistributedCacheExtensions;Set;(Microsoft.Extensions.Caching.Distributed.IDistributedCache,System.String,System.Byte[]);summary;df-generated |
@@ -21215,6 +22346,7 @@ neutral
 | Microsoft.Extensions.Caching.Distributed;MemoryDistributedCache;Get;(System.String);summary;df-generated |
 | Microsoft.Extensions.Caching.Distributed;MemoryDistributedCache;GetAsync;(System.String,System.Threading.CancellationToken);summary;df-generated |
 | Microsoft.Extensions.Caching.Distributed;MemoryDistributedCache;MemoryDistributedCache;(Microsoft.Extensions.Options.IOptions<Microsoft.Extensions.Caching.Memory.MemoryDistributedCacheOptions>);summary;df-generated |
+| Microsoft.Extensions.Caching.Distributed;MemoryDistributedCache;MemoryDistributedCache;(Microsoft.Extensions.Options.IOptions<Microsoft.Extensions.Caching.Memory.MemoryDistributedCacheOptions>,Microsoft.Extensions.Logging.ILoggerFactory);summary;df-generated |
 | Microsoft.Extensions.Caching.Distributed;MemoryDistributedCache;Refresh;(System.String);summary;df-generated |
 | Microsoft.Extensions.Caching.Distributed;MemoryDistributedCache;RefreshAsync;(System.String,System.Threading.CancellationToken);summary;df-generated |
 | Microsoft.Extensions.Caching.Distributed;MemoryDistributedCache;Remove;(System.String);summary;df-generated |
@@ -21223,6 +22355,7 @@ neutral
 | Microsoft.Extensions.Caching.Distributed;MemoryDistributedCache;SetAsync;(System.String,System.Byte[],Microsoft.Extensions.Caching.Distributed.DistributedCacheEntryOptions,System.Threading.CancellationToken);summary;df-generated |
 | Microsoft.Extensions.Caching.Memory;CacheExtensions;Get;(Microsoft.Extensions.Caching.Memory.IMemoryCache,System.Object);summary;df-generated |
 | Microsoft.Extensions.Caching.Memory;CacheExtensions;Get<TItem>;(Microsoft.Extensions.Caching.Memory.IMemoryCache,System.Object);summary;df-generated |
+| Microsoft.Extensions.Caching.Memory;CacheExtensions;GetOrCreateAsync<TItem>;(Microsoft.Extensions.Caching.Memory.IMemoryCache,System.Object,System.Func<Microsoft.Extensions.Caching.Memory.ICacheEntry,System.Threading.Tasks.Task<TItem>>);summary;df-generated |
 | Microsoft.Extensions.Caching.Memory;CacheExtensions;TryGetValue<TItem>;(Microsoft.Extensions.Caching.Memory.IMemoryCache,System.Object,TItem);summary;df-generated |
 | Microsoft.Extensions.Caching.Memory;ICacheEntry;get_Key;();summary;df-generated |
 | Microsoft.Extensions.Caching.Memory;IMemoryCache;GetCurrentStatistics;();summary;df-generated |
@@ -21239,109 +22372,177 @@ neutral
 | Microsoft.Extensions.Caching.Memory;MemoryCache;get_Count;();summary;df-generated |
 | Microsoft.Extensions.Caching.Memory;MemoryCacheEntryOptions;get_ExpirationTokens;();summary;df-generated |
 | Microsoft.Extensions.Caching.Memory;MemoryCacheEntryOptions;get_PostEvictionCallbacks;();summary;df-generated |
+| Microsoft.Extensions.Caching.Memory;MemoryCacheOptions;get_Value;();summary;df-generated |
 | Microsoft.Extensions.Configuration.CommandLine;CommandLineConfigurationProvider;CommandLineConfigurationProvider;(System.Collections.Generic.IEnumerable<System.String>,System.Collections.Generic.IDictionary<System.String,System.String>);summary;df-generated |
 | Microsoft.Extensions.Configuration.CommandLine;CommandLineConfigurationProvider;Load;();summary;df-generated |
+| Microsoft.Extensions.Configuration.CommandLine;CommandLineConfigurationSource;Build;(Microsoft.Extensions.Configuration.IConfigurationBuilder);summary;df-generated |
 | Microsoft.Extensions.Configuration.EnvironmentVariables;EnvironmentVariablesConfigurationProvider;Load;();summary;df-generated |
+| Microsoft.Extensions.Configuration.EnvironmentVariables;EnvironmentVariablesConfigurationProvider;ToString;();summary;df-generated |
+| Microsoft.Extensions.Configuration.EnvironmentVariables;EnvironmentVariablesConfigurationSource;Build;(Microsoft.Extensions.Configuration.IConfigurationBuilder);summary;df-generated |
 | Microsoft.Extensions.Configuration.Ini;IniConfigurationProvider;IniConfigurationProvider;(Microsoft.Extensions.Configuration.Ini.IniConfigurationSource);summary;df-generated |
 | Microsoft.Extensions.Configuration.Ini;IniConfigurationProvider;Load;(System.IO.Stream);summary;df-generated |
+| Microsoft.Extensions.Configuration.Ini;IniConfigurationSource;Build;(Microsoft.Extensions.Configuration.IConfigurationBuilder);summary;df-generated |
 | Microsoft.Extensions.Configuration.Ini;IniStreamConfigurationProvider;IniStreamConfigurationProvider;(Microsoft.Extensions.Configuration.Ini.IniStreamConfigurationSource);summary;df-generated |
 | Microsoft.Extensions.Configuration.Ini;IniStreamConfigurationProvider;Load;(System.IO.Stream);summary;df-generated |
 | Microsoft.Extensions.Configuration.Ini;IniStreamConfigurationProvider;Read;(System.IO.Stream);summary;df-generated |
+| Microsoft.Extensions.Configuration.Ini;IniStreamConfigurationSource;Build;(Microsoft.Extensions.Configuration.IConfigurationBuilder);summary;df-generated |
 | Microsoft.Extensions.Configuration.Json;JsonConfigurationProvider;JsonConfigurationProvider;(Microsoft.Extensions.Configuration.Json.JsonConfigurationSource);summary;df-generated |
 | Microsoft.Extensions.Configuration.Json;JsonConfigurationProvider;Load;(System.IO.Stream);summary;df-generated |
+| Microsoft.Extensions.Configuration.Json;JsonConfigurationSource;Build;(Microsoft.Extensions.Configuration.IConfigurationBuilder);summary;df-generated |
 | Microsoft.Extensions.Configuration.Json;JsonStreamConfigurationProvider;JsonStreamConfigurationProvider;(Microsoft.Extensions.Configuration.Json.JsonStreamConfigurationSource);summary;df-generated |
 | Microsoft.Extensions.Configuration.Json;JsonStreamConfigurationProvider;Load;(System.IO.Stream);summary;df-generated |
+| Microsoft.Extensions.Configuration.Json;JsonStreamConfigurationSource;Build;(Microsoft.Extensions.Configuration.IConfigurationBuilder);summary;df-generated |
+| Microsoft.Extensions.Configuration.KeyPerFile;KeyPerFileConfigurationProvider;Dispose;();summary;df-generated |
+| Microsoft.Extensions.Configuration.KeyPerFile;KeyPerFileConfigurationProvider;Load;();summary;df-generated |
+| Microsoft.Extensions.Configuration.KeyPerFile;KeyPerFileConfigurationProvider;ToString;();summary;df-generated |
+| Microsoft.Extensions.Configuration.KeyPerFile;KeyPerFileConfigurationSource;Build;(Microsoft.Extensions.Configuration.IConfigurationBuilder);summary;df-generated |
 | Microsoft.Extensions.Configuration.Memory;MemoryConfigurationProvider;Add;(System.String,System.String);summary;df-generated |
+| Microsoft.Extensions.Configuration.Memory;MemoryConfigurationSource;Build;(Microsoft.Extensions.Configuration.IConfigurationBuilder);summary;df-generated |
 | Microsoft.Extensions.Configuration.UserSecrets;UserSecretsIdAttribute;UserSecretsIdAttribute;(System.String);summary;df-generated |
 | Microsoft.Extensions.Configuration.UserSecrets;UserSecretsIdAttribute;get_UserSecretsId;();summary;df-generated |
 | Microsoft.Extensions.Configuration.Xml;XmlConfigurationProvider;Load;(System.IO.Stream);summary;df-generated |
 | Microsoft.Extensions.Configuration.Xml;XmlConfigurationProvider;XmlConfigurationProvider;(Microsoft.Extensions.Configuration.Xml.XmlConfigurationSource);summary;df-generated |
-| Microsoft.Extensions.Configuration.Xml;XmlDocumentDecryptor;DecryptDocumentAndCreateXmlReader;(System.Xml.XmlDocument);summary;df-generated |
+| Microsoft.Extensions.Configuration.Xml;XmlConfigurationSource;Build;(Microsoft.Extensions.Configuration.IConfigurationBuilder);summary;df-generated |
 | Microsoft.Extensions.Configuration.Xml;XmlStreamConfigurationProvider;Load;(System.IO.Stream);summary;df-generated |
-| Microsoft.Extensions.Configuration.Xml;XmlStreamConfigurationProvider;Read;(System.IO.Stream,Microsoft.Extensions.Configuration.Xml.XmlDocumentDecryptor);summary;df-generated |
 | Microsoft.Extensions.Configuration.Xml;XmlStreamConfigurationProvider;XmlStreamConfigurationProvider;(Microsoft.Extensions.Configuration.Xml.XmlStreamConfigurationSource);summary;df-generated |
+| Microsoft.Extensions.Configuration.Xml;XmlStreamConfigurationSource;Build;(Microsoft.Extensions.Configuration.IConfigurationBuilder);summary;df-generated |
 | Microsoft.Extensions.Configuration;ChainedConfigurationProvider;Dispose;();summary;df-generated |
 | Microsoft.Extensions.Configuration;ChainedConfigurationProvider;Load;();summary;df-generated |
 | Microsoft.Extensions.Configuration;ChainedConfigurationProvider;Set;(System.String,System.String);summary;df-generated |
+| Microsoft.Extensions.Configuration;ChainedConfigurationProvider;TryGet;(System.String,System.String);summary;df-generated |
+| Microsoft.Extensions.Configuration;ChainedConfigurationSource;Build;(Microsoft.Extensions.Configuration.IConfigurationBuilder);summary;df-generated |
 | Microsoft.Extensions.Configuration;ConfigurationBinder;Bind;(Microsoft.Extensions.Configuration.IConfiguration,System.Object);summary;df-generated |
+| Microsoft.Extensions.Configuration;ConfigurationBinder;Bind;(Microsoft.Extensions.Configuration.IConfiguration,System.Object,System.Action<Microsoft.Extensions.Configuration.BinderOptions>);summary;df-generated |
 | Microsoft.Extensions.Configuration;ConfigurationBinder;Bind;(Microsoft.Extensions.Configuration.IConfiguration,System.String,System.Object);summary;df-generated |
+| Microsoft.Extensions.Configuration;ConfigurationBinder;Get;(Microsoft.Extensions.Configuration.IConfiguration,System.Type,System.Action<Microsoft.Extensions.Configuration.BinderOptions>);summary;df-generated |
+| Microsoft.Extensions.Configuration;ConfigurationBinder;Get<T>;(Microsoft.Extensions.Configuration.IConfiguration,System.Action<Microsoft.Extensions.Configuration.BinderOptions>);summary;df-generated |
+| Microsoft.Extensions.Configuration;ConfigurationBinder;GetValue;(Microsoft.Extensions.Configuration.IConfiguration,System.Type,System.String);summary;df-generated |
+| Microsoft.Extensions.Configuration;ConfigurationBinder;GetValue<T>;(Microsoft.Extensions.Configuration.IConfiguration,System.String);summary;df-generated |
+| Microsoft.Extensions.Configuration;ConfigurationBuilder;get_Sources;();summary;df-generated |
 | Microsoft.Extensions.Configuration;ConfigurationDebugViewContext;ConfigurationDebugViewContext;(System.String,System.String,System.String,Microsoft.Extensions.Configuration.IConfigurationProvider);summary;df-generated |
 | Microsoft.Extensions.Configuration;ConfigurationDebugViewContext;get_ConfigurationProvider;();summary;df-generated |
 | Microsoft.Extensions.Configuration;ConfigurationDebugViewContext;get_Key;();summary;df-generated |
 | Microsoft.Extensions.Configuration;ConfigurationDebugViewContext;get_Path;();summary;df-generated |
 | Microsoft.Extensions.Configuration;ConfigurationDebugViewContext;get_Value;();summary;df-generated |
+| Microsoft.Extensions.Configuration;ConfigurationExtensions;AsEnumerable;(Microsoft.Extensions.Configuration.IConfiguration);summary;df-generated |
+| Microsoft.Extensions.Configuration;ConfigurationExtensions;AsEnumerable;(Microsoft.Extensions.Configuration.IConfiguration,System.Boolean);summary;df-generated |
 | Microsoft.Extensions.Configuration;ConfigurationExtensions;Exists;(Microsoft.Extensions.Configuration.IConfigurationSection);summary;df-generated |
+| Microsoft.Extensions.Configuration;ConfigurationExtensions;GetConnectionString;(Microsoft.Extensions.Configuration.IConfiguration,System.String);summary;df-generated |
+| Microsoft.Extensions.Configuration;ConfigurationExtensions;GetRequiredSection;(Microsoft.Extensions.Configuration.IConfiguration,System.String);summary;df-generated |
 | Microsoft.Extensions.Configuration;ConfigurationKeyComparer;Compare;(System.String,System.String);summary;df-generated |
 | Microsoft.Extensions.Configuration;ConfigurationKeyComparer;get_Instance;();summary;df-generated |
 | Microsoft.Extensions.Configuration;ConfigurationKeyNameAttribute;ConfigurationKeyNameAttribute;(System.String);summary;df-generated |
 | Microsoft.Extensions.Configuration;ConfigurationKeyNameAttribute;get_Name;();summary;df-generated |
 | Microsoft.Extensions.Configuration;ConfigurationManager;Dispose;();summary;df-generated |
 | Microsoft.Extensions.Configuration;ConfigurationManager;GetChildren;();summary;df-generated |
+| Microsoft.Extensions.Configuration;ConfigurationManager;GetSection;(System.String);summary;df-generated |
 | Microsoft.Extensions.Configuration;ConfigurationManager;Reload;();summary;df-generated |
+| Microsoft.Extensions.Configuration;ConfigurationManager;get_Sources;();summary;df-generated |
 | Microsoft.Extensions.Configuration;ConfigurationManager;set_Item;(System.String,System.String);summary;df-generated |
 | Microsoft.Extensions.Configuration;ConfigurationProvider;Load;();summary;df-generated |
 | Microsoft.Extensions.Configuration;ConfigurationProvider;OnReload;();summary;df-generated |
 | Microsoft.Extensions.Configuration;ConfigurationProvider;Set;(System.String,System.String);summary;df-generated |
+| Microsoft.Extensions.Configuration;ConfigurationProvider;ToString;();summary;df-generated |
+| Microsoft.Extensions.Configuration;ConfigurationProvider;TryGet;(System.String,System.String);summary;df-generated |
 | Microsoft.Extensions.Configuration;ConfigurationReloadToken;OnReload;();summary;df-generated |
+| Microsoft.Extensions.Configuration;ConfigurationReloadToken;get_ActiveChangeCallbacks;();summary;df-generated |
 | Microsoft.Extensions.Configuration;ConfigurationReloadToken;get_HasChanged;();summary;df-generated |
 | Microsoft.Extensions.Configuration;ConfigurationRoot;Dispose;();summary;df-generated |
 | Microsoft.Extensions.Configuration;ConfigurationRoot;GetChildren;();summary;df-generated |
+| Microsoft.Extensions.Configuration;ConfigurationRoot;GetSection;(System.String);summary;df-generated |
 | Microsoft.Extensions.Configuration;ConfigurationRoot;Reload;();summary;df-generated |
 | Microsoft.Extensions.Configuration;ConfigurationRoot;set_Item;(System.String,System.String);summary;df-generated |
 | Microsoft.Extensions.Configuration;ConfigurationSection;GetChildren;();summary;df-generated |
+| Microsoft.Extensions.Configuration;ConfigurationSection;GetSection;(System.String);summary;df-generated |
 | Microsoft.Extensions.Configuration;ConfigurationSection;get_Key;();summary;df-generated |
+| Microsoft.Extensions.Configuration;ConfigurationSection;get_Path;();summary;df-generated |
 | Microsoft.Extensions.Configuration;ConfigurationSection;set_Item;(System.String,System.String);summary;df-generated |
 | Microsoft.Extensions.Configuration;FileConfigurationProvider;Dispose;();summary;df-generated |
 | Microsoft.Extensions.Configuration;FileConfigurationProvider;Dispose;(System.Boolean);summary;df-generated |
 | Microsoft.Extensions.Configuration;FileConfigurationProvider;FileConfigurationProvider;(Microsoft.Extensions.Configuration.FileConfigurationSource);summary;df-generated |
 | Microsoft.Extensions.Configuration;FileConfigurationProvider;Load;();summary;df-generated |
 | Microsoft.Extensions.Configuration;FileConfigurationProvider;Load;(System.IO.Stream);summary;df-generated |
+| Microsoft.Extensions.Configuration;FileConfigurationProvider;ToString;();summary;df-generated |
 | Microsoft.Extensions.Configuration;FileConfigurationProvider;get_Source;();summary;df-generated |
+| Microsoft.Extensions.Configuration;FileConfigurationSource;Build;(Microsoft.Extensions.Configuration.IConfigurationBuilder);summary;df-generated |
 | Microsoft.Extensions.Configuration;FileConfigurationSource;EnsureDefaults;(Microsoft.Extensions.Configuration.IConfigurationBuilder);summary;df-generated |
 | Microsoft.Extensions.Configuration;FileConfigurationSource;ResolveFileProvider;();summary;df-generated |
 | Microsoft.Extensions.Configuration;IConfiguration;GetChildren;();summary;df-generated |
+| Microsoft.Extensions.Configuration;IConfiguration;GetSection;(System.String);summary;df-generated |
 | Microsoft.Extensions.Configuration;IConfiguration;set_Item;(System.String,System.String);summary;df-generated |
+| Microsoft.Extensions.Configuration;IConfigurationBuilder;get_Sources;();summary;df-generated |
 | Microsoft.Extensions.Configuration;IConfigurationProvider;Load;();summary;df-generated |
 | Microsoft.Extensions.Configuration;IConfigurationProvider;Set;(System.String,System.String);summary;df-generated |
+| Microsoft.Extensions.Configuration;IConfigurationProvider;TryGet;(System.String,System.String);summary;df-generated |
 | Microsoft.Extensions.Configuration;IConfigurationRoot;Reload;();summary;df-generated |
 | Microsoft.Extensions.Configuration;IConfigurationSection;get_Key;();summary;df-generated |
+| Microsoft.Extensions.Configuration;IConfigurationSection;get_Path;();summary;df-generated |
+| Microsoft.Extensions.Configuration;IConfigurationSource;Build;(Microsoft.Extensions.Configuration.IConfigurationBuilder);summary;df-generated |
 | Microsoft.Extensions.Configuration;StreamConfigurationProvider;Load;();summary;df-generated |
 | Microsoft.Extensions.Configuration;StreamConfigurationProvider;Load;(System.IO.Stream);summary;df-generated |
 | Microsoft.Extensions.Configuration;StreamConfigurationProvider;StreamConfigurationProvider;(Microsoft.Extensions.Configuration.StreamConfigurationSource);summary;df-generated |
 | Microsoft.Extensions.Configuration;StreamConfigurationProvider;get_Source;();summary;df-generated |
+| Microsoft.Extensions.Configuration;StreamConfigurationSource;Build;(Microsoft.Extensions.Configuration.IConfigurationBuilder);summary;df-generated |
 | Microsoft.Extensions.DependencyInjection.Extensions;ServiceCollectionDescriptorExtensions;TryAddKeyedScoped;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Type,System.Object);summary;df-generated |
+| Microsoft.Extensions.DependencyInjection.Extensions;ServiceCollectionDescriptorExtensions;TryAddKeyedScoped;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Type,System.Object,System.Func<System.IServiceProvider,System.Object,System.Object>);summary;df-generated |
 | Microsoft.Extensions.DependencyInjection.Extensions;ServiceCollectionDescriptorExtensions;TryAddKeyedScoped;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Type,System.Object,System.Type);summary;df-generated |
 | Microsoft.Extensions.DependencyInjection.Extensions;ServiceCollectionDescriptorExtensions;TryAddKeyedScoped<TService,TImplementation>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Object);summary;df-generated |
 | Microsoft.Extensions.DependencyInjection.Extensions;ServiceCollectionDescriptorExtensions;TryAddKeyedScoped<TService>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Object);summary;df-generated |
+| Microsoft.Extensions.DependencyInjection.Extensions;ServiceCollectionDescriptorExtensions;TryAddKeyedScoped<TService>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Object,System.Func<System.IServiceProvider,System.Object,TService>);summary;df-generated |
 | Microsoft.Extensions.DependencyInjection.Extensions;ServiceCollectionDescriptorExtensions;TryAddKeyedSingleton;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Type,System.Object);summary;df-generated |
+| Microsoft.Extensions.DependencyInjection.Extensions;ServiceCollectionDescriptorExtensions;TryAddKeyedSingleton;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Type,System.Object,System.Func<System.IServiceProvider,System.Object,System.Object>);summary;df-generated |
 | Microsoft.Extensions.DependencyInjection.Extensions;ServiceCollectionDescriptorExtensions;TryAddKeyedSingleton;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Type,System.Object,System.Type);summary;df-generated |
 | Microsoft.Extensions.DependencyInjection.Extensions;ServiceCollectionDescriptorExtensions;TryAddKeyedSingleton<TService,TImplementation>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Object);summary;df-generated |
 | Microsoft.Extensions.DependencyInjection.Extensions;ServiceCollectionDescriptorExtensions;TryAddKeyedSingleton<TService>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Object);summary;df-generated |
+| Microsoft.Extensions.DependencyInjection.Extensions;ServiceCollectionDescriptorExtensions;TryAddKeyedSingleton<TService>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Object,System.Func<System.IServiceProvider,System.Object,TService>);summary;df-generated |
 | Microsoft.Extensions.DependencyInjection.Extensions;ServiceCollectionDescriptorExtensions;TryAddKeyedTransient;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Type,System.Object);summary;df-generated |
+| Microsoft.Extensions.DependencyInjection.Extensions;ServiceCollectionDescriptorExtensions;TryAddKeyedTransient;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Type,System.Object,System.Func<System.IServiceProvider,System.Object,System.Object>);summary;df-generated |
 | Microsoft.Extensions.DependencyInjection.Extensions;ServiceCollectionDescriptorExtensions;TryAddKeyedTransient;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Type,System.Object,System.Type);summary;df-generated |
 | Microsoft.Extensions.DependencyInjection.Extensions;ServiceCollectionDescriptorExtensions;TryAddKeyedTransient<TService,TImplementation>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Object);summary;df-generated |
 | Microsoft.Extensions.DependencyInjection.Extensions;ServiceCollectionDescriptorExtensions;TryAddKeyedTransient<TService>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Object);summary;df-generated |
+| Microsoft.Extensions.DependencyInjection.Extensions;ServiceCollectionDescriptorExtensions;TryAddKeyedTransient<TService>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Object,System.Func<System.IServiceProvider,System.Object,TService>);summary;df-generated |
 | Microsoft.Extensions.DependencyInjection.Extensions;ServiceCollectionDescriptorExtensions;TryAddScoped;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Type);summary;df-generated |
+| Microsoft.Extensions.DependencyInjection.Extensions;ServiceCollectionDescriptorExtensions;TryAddScoped;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Type,System.Func<System.IServiceProvider,System.Object>);summary;df-generated |
 | Microsoft.Extensions.DependencyInjection.Extensions;ServiceCollectionDescriptorExtensions;TryAddScoped;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Type,System.Type);summary;df-generated |
 | Microsoft.Extensions.DependencyInjection.Extensions;ServiceCollectionDescriptorExtensions;TryAddScoped<TService,TImplementation>;(Microsoft.Extensions.DependencyInjection.IServiceCollection);summary;df-generated |
 | Microsoft.Extensions.DependencyInjection.Extensions;ServiceCollectionDescriptorExtensions;TryAddScoped<TService>;(Microsoft.Extensions.DependencyInjection.IServiceCollection);summary;df-generated |
+| Microsoft.Extensions.DependencyInjection.Extensions;ServiceCollectionDescriptorExtensions;TryAddScoped<TService>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Func<System.IServiceProvider,TService>);summary;df-generated |
 | Microsoft.Extensions.DependencyInjection.Extensions;ServiceCollectionDescriptorExtensions;TryAddSingleton;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Type);summary;df-generated |
+| Microsoft.Extensions.DependencyInjection.Extensions;ServiceCollectionDescriptorExtensions;TryAddSingleton;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Type,System.Func<System.IServiceProvider,System.Object>);summary;df-generated |
 | Microsoft.Extensions.DependencyInjection.Extensions;ServiceCollectionDescriptorExtensions;TryAddSingleton;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Type,System.Type);summary;df-generated |
 | Microsoft.Extensions.DependencyInjection.Extensions;ServiceCollectionDescriptorExtensions;TryAddSingleton<TService,TImplementation>;(Microsoft.Extensions.DependencyInjection.IServiceCollection);summary;df-generated |
 | Microsoft.Extensions.DependencyInjection.Extensions;ServiceCollectionDescriptorExtensions;TryAddSingleton<TService>;(Microsoft.Extensions.DependencyInjection.IServiceCollection);summary;df-generated |
+| Microsoft.Extensions.DependencyInjection.Extensions;ServiceCollectionDescriptorExtensions;TryAddSingleton<TService>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Func<System.IServiceProvider,TService>);summary;df-generated |
 | Microsoft.Extensions.DependencyInjection.Extensions;ServiceCollectionDescriptorExtensions;TryAddSingleton<TService>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,TService);summary;df-generated |
 | Microsoft.Extensions.DependencyInjection.Extensions;ServiceCollectionDescriptorExtensions;TryAddTransient;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Type);summary;df-generated |
+| Microsoft.Extensions.DependencyInjection.Extensions;ServiceCollectionDescriptorExtensions;TryAddTransient;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Type,System.Func<System.IServiceProvider,System.Object>);summary;df-generated |
 | Microsoft.Extensions.DependencyInjection.Extensions;ServiceCollectionDescriptorExtensions;TryAddTransient;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Type,System.Type);summary;df-generated |
 | Microsoft.Extensions.DependencyInjection.Extensions;ServiceCollectionDescriptorExtensions;TryAddTransient<TService,TImplementation>;(Microsoft.Extensions.DependencyInjection.IServiceCollection);summary;df-generated |
 | Microsoft.Extensions.DependencyInjection.Extensions;ServiceCollectionDescriptorExtensions;TryAddTransient<TService>;(Microsoft.Extensions.DependencyInjection.IServiceCollection);summary;df-generated |
+| Microsoft.Extensions.DependencyInjection.Extensions;ServiceCollectionDescriptorExtensions;TryAddTransient<TService>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Func<System.IServiceProvider,TService>);summary;df-generated |
 | Microsoft.Extensions.DependencyInjection;ActivatorUtilities;CreateFactory;(System.Type,System.Type[]);summary;df-generated |
 | Microsoft.Extensions.DependencyInjection;ActivatorUtilities;CreateFactory<T>;(System.Type[]);summary;df-generated |
 | Microsoft.Extensions.DependencyInjection;ActivatorUtilities;CreateInstance;(System.IServiceProvider,System.Type,System.Object[]);summary;df-generated |
 | Microsoft.Extensions.DependencyInjection;ActivatorUtilities;CreateInstance<T>;(System.IServiceProvider,System.Object[]);summary;df-generated |
 | Microsoft.Extensions.DependencyInjection;AsyncServiceScope;Dispose;();summary;df-generated |
+| Microsoft.Extensions.DependencyInjection;DefaultServiceProviderFactory;CreateBuilder;(Microsoft.Extensions.DependencyInjection.IServiceCollection);summary;df-generated |
 | Microsoft.Extensions.DependencyInjection;DefaultServiceProviderFactory;CreateServiceProvider;(Microsoft.Extensions.DependencyInjection.IServiceCollection);summary;df-generated |
 | Microsoft.Extensions.DependencyInjection;FromKeyedServicesAttribute;FromKeyedServicesAttribute;(System.Object);summary;df-generated |
 | Microsoft.Extensions.DependencyInjection;FromKeyedServicesAttribute;get_Key;();summary;df-generated |
+| Microsoft.Extensions.DependencyInjection;HttpClientFactoryServiceCollectionExtensions;AddHttpClient;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.String,System.Action<System.IServiceProvider,System.Net.Http.HttpClient>);summary;df-generated |
+| Microsoft.Extensions.DependencyInjection;HttpClientFactoryServiceCollectionExtensions;AddHttpClient;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.String,System.Action<System.Net.Http.HttpClient>);summary;df-generated |
+| Microsoft.Extensions.DependencyInjection;HttpClientFactoryServiceCollectionExtensions;AddHttpClient<TClient,TImplementation>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Action<System.IServiceProvider,System.Net.Http.HttpClient>);summary;df-generated |
+| Microsoft.Extensions.DependencyInjection;HttpClientFactoryServiceCollectionExtensions;AddHttpClient<TClient,TImplementation>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Action<System.Net.Http.HttpClient>);summary;df-generated |
+| Microsoft.Extensions.DependencyInjection;HttpClientFactoryServiceCollectionExtensions;AddHttpClient<TClient,TImplementation>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Func<System.Net.Http.HttpClient,System.IServiceProvider,TImplementation>);summary;df-generated |
+| Microsoft.Extensions.DependencyInjection;HttpClientFactoryServiceCollectionExtensions;AddHttpClient<TClient,TImplementation>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Func<System.Net.Http.HttpClient,TImplementation>);summary;df-generated |
+| Microsoft.Extensions.DependencyInjection;HttpClientFactoryServiceCollectionExtensions;AddHttpClient<TClient,TImplementation>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.String,System.Action<System.IServiceProvider,System.Net.Http.HttpClient>);summary;df-generated |
+| Microsoft.Extensions.DependencyInjection;HttpClientFactoryServiceCollectionExtensions;AddHttpClient<TClient,TImplementation>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.String,System.Action<System.Net.Http.HttpClient>);summary;df-generated |
+| Microsoft.Extensions.DependencyInjection;HttpClientFactoryServiceCollectionExtensions;AddHttpClient<TClient,TImplementation>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.String,System.Func<System.Net.Http.HttpClient,System.IServiceProvider,TImplementation>);summary;df-generated |
+| Microsoft.Extensions.DependencyInjection;HttpClientFactoryServiceCollectionExtensions;AddHttpClient<TClient,TImplementation>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.String,System.Func<System.Net.Http.HttpClient,TImplementation>);summary;df-generated |
+| Microsoft.Extensions.DependencyInjection;HttpClientFactoryServiceCollectionExtensions;AddHttpClient<TClient>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Action<System.IServiceProvider,System.Net.Http.HttpClient>);summary;df-generated |
+| Microsoft.Extensions.DependencyInjection;HttpClientFactoryServiceCollectionExtensions;AddHttpClient<TClient>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Action<System.Net.Http.HttpClient>);summary;df-generated |
+| Microsoft.Extensions.DependencyInjection;HttpClientFactoryServiceCollectionExtensions;AddHttpClient<TClient>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.String,System.Action<System.IServiceProvider,System.Net.Http.HttpClient>);summary;df-generated |
+| Microsoft.Extensions.DependencyInjection;HttpClientFactoryServiceCollectionExtensions;AddHttpClient<TClient>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.String,System.Action<System.Net.Http.HttpClient>);summary;df-generated |
 | Microsoft.Extensions.DependencyInjection;IHttpClientBuilder;get_Name;();summary;df-generated |
 | Microsoft.Extensions.DependencyInjection;IHttpClientBuilder;get_Services;();summary;df-generated |
 | Microsoft.Extensions.DependencyInjection;IKeyedServiceProvider;GetKeyedService;(System.Type,System.Object);summary;df-generated |
@@ -21354,6 +22555,7 @@ neutral
 | Microsoft.Extensions.DependencyInjection;ISocketsHttpHandlerBuilder;get_Services;();summary;df-generated |
 | Microsoft.Extensions.DependencyInjection;ISupportRequiredService;GetRequiredService;(System.Type);summary;df-generated |
 | Microsoft.Extensions.DependencyInjection;KeyedService;get_AnyKey;();summary;df-generated |
+| Microsoft.Extensions.DependencyInjection;OAuthPostConfigureOptions<TOptions,THandler>;PostConfigure;(System.String,TOptions);summary;df-generated |
 | Microsoft.Extensions.DependencyInjection;OptionsServiceCollectionExtensions;AddOptions<TOptions>;(Microsoft.Extensions.DependencyInjection.IServiceCollection);summary;df-generated |
 | Microsoft.Extensions.DependencyInjection;OptionsServiceCollectionExtensions;AddOptions<TOptions>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.String);summary;df-generated |
 | Microsoft.Extensions.DependencyInjection;OptionsServiceCollectionExtensions;AddOptionsWithValidateOnStart<TOptions,TValidateOptions>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.String);summary;df-generated |
@@ -21401,6 +22603,7 @@ neutral
 | Microsoft.Extensions.DependencyInjection;ServiceProviderKeyedServiceExtensions;GetKeyedServices<T>;(System.IServiceProvider,System.Object);summary;df-generated |
 | Microsoft.Extensions.DependencyInjection;ServiceProviderKeyedServiceExtensions;GetRequiredKeyedService;(System.IServiceProvider,System.Type,System.Object);summary;df-generated |
 | Microsoft.Extensions.DependencyInjection;ServiceProviderKeyedServiceExtensions;GetRequiredKeyedService<T>;(System.IServiceProvider,System.Object);summary;df-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceProviderServiceExtensions;CreateAsyncScope;(Microsoft.Extensions.DependencyInjection.IServiceScopeFactory);summary;df-generated |
 | Microsoft.Extensions.DependencyInjection;ServiceProviderServiceExtensions;CreateAsyncScope;(System.IServiceProvider);summary;df-generated |
 | Microsoft.Extensions.DependencyInjection;ServiceProviderServiceExtensions;CreateScope;(System.IServiceProvider);summary;df-generated |
 | Microsoft.Extensions.DependencyInjection;ServiceProviderServiceExtensions;GetServices;(System.IServiceProvider,System.Type);summary;df-generated |
@@ -21418,56 +22621,90 @@ neutral
 | Microsoft.Extensions.Diagnostics.Metrics;InstrumentRule;get_ListenerName;();summary;df-generated |
 | Microsoft.Extensions.Diagnostics.Metrics;InstrumentRule;get_MeterName;();summary;df-generated |
 | Microsoft.Extensions.Diagnostics.Metrics;InstrumentRule;get_Scopes;();summary;df-generated |
+| Microsoft.Extensions.Diagnostics.Metrics;MetricsBuilderConsoleExtensions;AddDebugConsole;(Microsoft.Extensions.Diagnostics.Metrics.IMetricsBuilder);summary;df-generated |
 | Microsoft.Extensions.Diagnostics.Metrics;MetricsOptions;get_Rules;();summary;df-generated |
 | Microsoft.Extensions.FileProviders.Composite;CompositeDirectoryContents;get_Exists;();summary;df-generated |
+| Microsoft.Extensions.FileProviders.Embedded;EmbeddedResourceFileInfo;CreateReadStream;();summary;df-generated |
+| Microsoft.Extensions.FileProviders.Embedded;EmbeddedResourceFileInfo;get_Exists;();summary;df-generated |
+| Microsoft.Extensions.FileProviders.Embedded;EmbeddedResourceFileInfo;get_IsDirectory;();summary;df-generated |
+| Microsoft.Extensions.FileProviders.Embedded;EmbeddedResourceFileInfo;get_LastModified;();summary;df-generated |
+| Microsoft.Extensions.FileProviders.Embedded;EmbeddedResourceFileInfo;get_Length;();summary;df-generated |
+| Microsoft.Extensions.FileProviders.Embedded;EmbeddedResourceFileInfo;get_Name;();summary;df-generated |
+| Microsoft.Extensions.FileProviders.Embedded;EmbeddedResourceFileInfo;get_PhysicalPath;();summary;df-generated |
 | Microsoft.Extensions.FileProviders.Internal;PhysicalDirectoryContents;PhysicalDirectoryContents;(System.String);summary;df-generated |
 | Microsoft.Extensions.FileProviders.Internal;PhysicalDirectoryContents;PhysicalDirectoryContents;(System.String,Microsoft.Extensions.FileProviders.Physical.ExclusionFilters);summary;df-generated |
 | Microsoft.Extensions.FileProviders.Internal;PhysicalDirectoryContents;get_Exists;();summary;df-generated |
+| Microsoft.Extensions.FileProviders.Physical;PhysicalDirectoryInfo;CreateReadStream;();summary;df-generated |
 | Microsoft.Extensions.FileProviders.Physical;PhysicalDirectoryInfo;get_Exists;();summary;df-generated |
 | Microsoft.Extensions.FileProviders.Physical;PhysicalDirectoryInfo;get_IsDirectory;();summary;df-generated |
 | Microsoft.Extensions.FileProviders.Physical;PhysicalDirectoryInfo;get_LastModified;();summary;df-generated |
 | Microsoft.Extensions.FileProviders.Physical;PhysicalDirectoryInfo;get_Length;();summary;df-generated |
+| Microsoft.Extensions.FileProviders.Physical;PhysicalDirectoryInfo;get_Name;();summary;df-generated |
+| Microsoft.Extensions.FileProviders.Physical;PhysicalDirectoryInfo;get_PhysicalPath;();summary;df-generated |
+| Microsoft.Extensions.FileProviders.Physical;PhysicalFileInfo;CreateReadStream;();summary;df-generated |
 | Microsoft.Extensions.FileProviders.Physical;PhysicalFileInfo;get_Exists;();summary;df-generated |
 | Microsoft.Extensions.FileProviders.Physical;PhysicalFileInfo;get_IsDirectory;();summary;df-generated |
 | Microsoft.Extensions.FileProviders.Physical;PhysicalFileInfo;get_LastModified;();summary;df-generated |
 | Microsoft.Extensions.FileProviders.Physical;PhysicalFileInfo;get_Length;();summary;df-generated |
+| Microsoft.Extensions.FileProviders.Physical;PhysicalFileInfo;get_Name;();summary;df-generated |
+| Microsoft.Extensions.FileProviders.Physical;PhysicalFileInfo;get_PhysicalPath;();summary;df-generated |
 | Microsoft.Extensions.FileProviders.Physical;PhysicalFilesWatcher;CreateFileChangeToken;(System.String);summary;df-generated |
 | Microsoft.Extensions.FileProviders.Physical;PhysicalFilesWatcher;Dispose;();summary;df-generated |
 | Microsoft.Extensions.FileProviders.Physical;PhysicalFilesWatcher;Dispose;(System.Boolean);summary;df-generated |
 | Microsoft.Extensions.FileProviders.Physical;PhysicalFilesWatcher;PhysicalFilesWatcher;(System.String,System.IO.FileSystemWatcher,System.Boolean);summary;df-generated |
+| Microsoft.Extensions.FileProviders.Physical;PollingFileChangeToken;get_ActiveChangeCallbacks;();summary;df-generated |
 | Microsoft.Extensions.FileProviders.Physical;PollingFileChangeToken;get_HasChanged;();summary;df-generated |
 | Microsoft.Extensions.FileProviders.Physical;PollingWildCardChangeToken;GetLastWriteUtc;(System.String);summary;df-generated |
 | Microsoft.Extensions.FileProviders.Physical;PollingWildCardChangeToken;PollingWildCardChangeToken;(System.String,System.String);summary;df-generated |
+| Microsoft.Extensions.FileProviders.Physical;PollingWildCardChangeToken;get_ActiveChangeCallbacks;();summary;df-generated |
 | Microsoft.Extensions.FileProviders.Physical;PollingWildCardChangeToken;get_HasChanged;();summary;df-generated |
+| Microsoft.Extensions.FileProviders;CompositeFileProvider;GetDirectoryContents;(System.String);summary;df-generated |
 | Microsoft.Extensions.FileProviders;CompositeFileProvider;GetFileInfo;(System.String);summary;df-generated |
 | Microsoft.Extensions.FileProviders;CompositeFileProvider;Watch;(System.String);summary;df-generated |
+| Microsoft.Extensions.FileProviders;EmbeddedFileProvider;GetDirectoryContents;(System.String);summary;df-generated |
+| Microsoft.Extensions.FileProviders;EmbeddedFileProvider;GetFileInfo;(System.String);summary;df-generated |
+| Microsoft.Extensions.FileProviders;EmbeddedFileProvider;Watch;(System.String);summary;df-generated |
 | Microsoft.Extensions.FileProviders;IDirectoryContents;get_Exists;();summary;df-generated |
+| Microsoft.Extensions.FileProviders;IFileInfo;CreateReadStream;();summary;df-generated |
 | Microsoft.Extensions.FileProviders;IFileInfo;get_Exists;();summary;df-generated |
 | Microsoft.Extensions.FileProviders;IFileInfo;get_IsDirectory;();summary;df-generated |
 | Microsoft.Extensions.FileProviders;IFileInfo;get_LastModified;();summary;df-generated |
 | Microsoft.Extensions.FileProviders;IFileInfo;get_Length;();summary;df-generated |
+| Microsoft.Extensions.FileProviders;IFileInfo;get_Name;();summary;df-generated |
+| Microsoft.Extensions.FileProviders;IFileInfo;get_PhysicalPath;();summary;df-generated |
+| Microsoft.Extensions.FileProviders;IFileProvider;GetDirectoryContents;(System.String);summary;df-generated |
 | Microsoft.Extensions.FileProviders;IFileProvider;GetFileInfo;(System.String);summary;df-generated |
 | Microsoft.Extensions.FileProviders;IFileProvider;Watch;(System.String);summary;df-generated |
+| Microsoft.Extensions.FileProviders;ManifestEmbeddedFileProvider;GetDirectoryContents;(System.String);summary;df-generated |
+| Microsoft.Extensions.FileProviders;ManifestEmbeddedFileProvider;GetFileInfo;(System.String);summary;df-generated |
+| Microsoft.Extensions.FileProviders;ManifestEmbeddedFileProvider;Watch;(System.String);summary;df-generated |
 | Microsoft.Extensions.FileProviders;NotFoundDirectoryContents;get_Exists;();summary;df-generated |
 | Microsoft.Extensions.FileProviders;NotFoundDirectoryContents;get_Singleton;();summary;df-generated |
+| Microsoft.Extensions.FileProviders;NotFoundFileInfo;CreateReadStream;();summary;df-generated |
 | Microsoft.Extensions.FileProviders;NotFoundFileInfo;NotFoundFileInfo;(System.String);summary;df-generated |
 | Microsoft.Extensions.FileProviders;NotFoundFileInfo;get_Exists;();summary;df-generated |
 | Microsoft.Extensions.FileProviders;NotFoundFileInfo;get_IsDirectory;();summary;df-generated |
 | Microsoft.Extensions.FileProviders;NotFoundFileInfo;get_LastModified;();summary;df-generated |
 | Microsoft.Extensions.FileProviders;NotFoundFileInfo;get_Length;();summary;df-generated |
+| Microsoft.Extensions.FileProviders;NotFoundFileInfo;get_Name;();summary;df-generated |
+| Microsoft.Extensions.FileProviders;NotFoundFileInfo;get_PhysicalPath;();summary;df-generated |
 | Microsoft.Extensions.FileProviders;NullChangeToken;get_ActiveChangeCallbacks;();summary;df-generated |
 | Microsoft.Extensions.FileProviders;NullChangeToken;get_HasChanged;();summary;df-generated |
 | Microsoft.Extensions.FileProviders;NullChangeToken;get_Singleton;();summary;df-generated |
+| Microsoft.Extensions.FileProviders;NullFileProvider;GetDirectoryContents;(System.String);summary;df-generated |
 | Microsoft.Extensions.FileProviders;NullFileProvider;GetFileInfo;(System.String);summary;df-generated |
 | Microsoft.Extensions.FileProviders;NullFileProvider;Watch;(System.String);summary;df-generated |
 | Microsoft.Extensions.FileProviders;PhysicalFileProvider;Dispose;();summary;df-generated |
 | Microsoft.Extensions.FileProviders;PhysicalFileProvider;Dispose;(System.Boolean);summary;df-generated |
+| Microsoft.Extensions.FileProviders;PhysicalFileProvider;GetDirectoryContents;(System.String);summary;df-generated |
 | Microsoft.Extensions.FileProviders;PhysicalFileProvider;GetFileInfo;(System.String);summary;df-generated |
 | Microsoft.Extensions.FileProviders;PhysicalFileProvider;PhysicalFileProvider;(System.String);summary;df-generated |
 | Microsoft.Extensions.FileProviders;PhysicalFileProvider;PhysicalFileProvider;(System.String,Microsoft.Extensions.FileProviders.Physical.ExclusionFilters);summary;df-generated |
 | Microsoft.Extensions.FileProviders;PhysicalFileProvider;Watch;(System.String);summary;df-generated |
 | Microsoft.Extensions.FileProviders;PhysicalFileProvider;get_Root;();summary;df-generated |
+| Microsoft.Extensions.FileSystemGlobbing.Abstractions;DirectoryInfoBase;GetFile;(System.String);summary;df-generated |
 | Microsoft.Extensions.FileSystemGlobbing.Abstractions;DirectoryInfoWrapper;DirectoryInfoWrapper;(System.IO.DirectoryInfo);summary;df-generated |
+| Microsoft.Extensions.FileSystemGlobbing.Abstractions;DirectoryInfoWrapper;GetFile;(System.String);summary;df-generated |
 | Microsoft.Extensions.FileSystemGlobbing.Internal.PathSegments;CurrentPathSegment;Match;(System.String);summary;df-generated |
 | Microsoft.Extensions.FileSystemGlobbing.Internal.PathSegments;CurrentPathSegment;get_CanProduceStem;();summary;df-generated |
 | Microsoft.Extensions.FileSystemGlobbing.Internal.PathSegments;LiteralPathSegment;Equals;(System.Object);summary;df-generated |
@@ -21486,6 +22723,7 @@ neutral
 | Microsoft.Extensions.FileSystemGlobbing.Internal.PathSegments;WildcardPathSegment;get_CanProduceStem;();summary;df-generated |
 | Microsoft.Extensions.FileSystemGlobbing.Internal.PathSegments;WildcardPathSegment;get_Contains;();summary;df-generated |
 | Microsoft.Extensions.FileSystemGlobbing.Internal.PathSegments;WildcardPathSegment;get_EndsWith;();summary;df-generated |
+| Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts;PatternContext<TFrame>;Declare;(System.Action<Microsoft.Extensions.FileSystemGlobbing.Internal.IPathSegment,System.Boolean>);summary;df-generated |
 | Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts;PatternContext<TFrame>;IsStackEmpty;();summary;df-generated |
 | Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts;PatternContext<TFrame>;PopDirectory;();summary;df-generated |
 | Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts;PatternContext<TFrame>;PushDirectory;(Microsoft.Extensions.FileSystemGlobbing.Abstractions.DirectoryInfoBase);summary;df-generated |
@@ -21500,6 +22738,7 @@ neutral
 | Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts;PatternContextLinear;get_Pattern;();summary;df-generated |
 | Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts;PatternContextLinearExclude;PatternContextLinearExclude;(Microsoft.Extensions.FileSystemGlobbing.Internal.ILinearPattern);summary;df-generated |
 | Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts;PatternContextLinearExclude;Test;(Microsoft.Extensions.FileSystemGlobbing.Abstractions.DirectoryInfoBase);summary;df-generated |
+| Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts;PatternContextLinearInclude;Declare;(System.Action<Microsoft.Extensions.FileSystemGlobbing.Internal.IPathSegment,System.Boolean>);summary;df-generated |
 | Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts;PatternContextLinearInclude;PatternContextLinearInclude;(Microsoft.Extensions.FileSystemGlobbing.Internal.ILinearPattern);summary;df-generated |
 | Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts;PatternContextLinearInclude;Test;(Microsoft.Extensions.FileSystemGlobbing.Abstractions.DirectoryInfoBase);summary;df-generated |
 | Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts;PatternContextRagged+FrameData;get_StemItems;();summary;df-generated |
@@ -21514,6 +22753,7 @@ neutral
 | Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts;PatternContextRagged;get_Pattern;();summary;df-generated |
 | Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts;PatternContextRaggedExclude;PatternContextRaggedExclude;(Microsoft.Extensions.FileSystemGlobbing.Internal.IRaggedPattern);summary;df-generated |
 | Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts;PatternContextRaggedExclude;Test;(Microsoft.Extensions.FileSystemGlobbing.Abstractions.DirectoryInfoBase);summary;df-generated |
+| Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts;PatternContextRaggedInclude;Declare;(System.Action<Microsoft.Extensions.FileSystemGlobbing.Internal.IPathSegment,System.Boolean>);summary;df-generated |
 | Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts;PatternContextRaggedInclude;PatternContextRaggedInclude;(Microsoft.Extensions.FileSystemGlobbing.Internal.IRaggedPattern);summary;df-generated |
 | Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts;PatternContextRaggedInclude;Test;(Microsoft.Extensions.FileSystemGlobbing.Abstractions.DirectoryInfoBase);summary;df-generated |
 | Microsoft.Extensions.FileSystemGlobbing.Internal.Patterns;PatternBuilder;Build;(System.String);summary;df-generated |
@@ -21524,6 +22764,7 @@ neutral
 | Microsoft.Extensions.FileSystemGlobbing.Internal;IPathSegment;get_CanProduceStem;();summary;df-generated |
 | Microsoft.Extensions.FileSystemGlobbing.Internal;IPattern;CreatePatternContextForExclude;();summary;df-generated |
 | Microsoft.Extensions.FileSystemGlobbing.Internal;IPattern;CreatePatternContextForInclude;();summary;df-generated |
+| Microsoft.Extensions.FileSystemGlobbing.Internal;IPatternContext;Declare;(System.Action<Microsoft.Extensions.FileSystemGlobbing.Internal.IPathSegment,System.Boolean>);summary;df-generated |
 | Microsoft.Extensions.FileSystemGlobbing.Internal;IPatternContext;PopDirectory;();summary;df-generated |
 | Microsoft.Extensions.FileSystemGlobbing.Internal;IPatternContext;PushDirectory;(Microsoft.Extensions.FileSystemGlobbing.Abstractions.DirectoryInfoBase);summary;df-generated |
 | Microsoft.Extensions.FileSystemGlobbing.Internal;IPatternContext;Test;(Microsoft.Extensions.FileSystemGlobbing.Abstractions.DirectoryInfoBase);summary;df-generated |
@@ -21542,6 +22783,7 @@ neutral
 | Microsoft.Extensions.FileSystemGlobbing;FilePatternMatch;GetHashCode;();summary;df-generated |
 | Microsoft.Extensions.FileSystemGlobbing;FilePatternMatch;get_Path;();summary;df-generated |
 | Microsoft.Extensions.FileSystemGlobbing;FilePatternMatch;get_Stem;();summary;df-generated |
+| Microsoft.Extensions.FileSystemGlobbing;InMemoryDirectoryInfo;GetFile;(System.String);summary;df-generated |
 | Microsoft.Extensions.FileSystemGlobbing;InMemoryDirectoryInfo;InMemoryDirectoryInfo;(System.String,System.Collections.Generic.IEnumerable<System.String>);summary;df-generated |
 | Microsoft.Extensions.FileSystemGlobbing;Matcher;Execute;(Microsoft.Extensions.FileSystemGlobbing.Abstractions.DirectoryInfoBase);summary;df-generated |
 | Microsoft.Extensions.FileSystemGlobbing;Matcher;Matcher;(System.StringComparison);summary;df-generated |
@@ -21565,12 +22807,14 @@ neutral
 | Microsoft.Extensions.Hosting;BackgroundService;ExecuteAsync;(System.Threading.CancellationToken);summary;df-generated |
 | Microsoft.Extensions.Hosting;BackgroundService;StopAsync;(System.Threading.CancellationToken);summary;df-generated |
 | Microsoft.Extensions.Hosting;Host;CreateApplicationBuilder;();summary;df-generated |
+| Microsoft.Extensions.Hosting;Host;CreateApplicationBuilder;(Microsoft.Extensions.Hosting.HostApplicationBuilderSettings);summary;df-generated |
 | Microsoft.Extensions.Hosting;Host;CreateApplicationBuilder;(System.String[]);summary;df-generated |
 | Microsoft.Extensions.Hosting;Host;CreateDefaultBuilder;();summary;df-generated |
 | Microsoft.Extensions.Hosting;Host;CreateDefaultBuilder;(System.String[]);summary;df-generated |
 | Microsoft.Extensions.Hosting;HostAbortedException;HostAbortedException;(System.String);summary;df-generated |
 | Microsoft.Extensions.Hosting;HostAbortedException;HostAbortedException;(System.String,System.Exception);summary;df-generated |
 | Microsoft.Extensions.Hosting;HostApplicationBuilder;Build;();summary;df-generated |
+| Microsoft.Extensions.Hosting;HostApplicationBuilder;ConfigureContainer<TContainerBuilder>;(Microsoft.Extensions.DependencyInjection.IServiceProviderFactory<TContainerBuilder>,System.Action<TContainerBuilder>);summary;df-generated |
 | Microsoft.Extensions.Hosting;HostApplicationBuilder;HostApplicationBuilder;(System.String[]);summary;df-generated |
 | Microsoft.Extensions.Hosting;HostApplicationBuilder;get_Configuration;();summary;df-generated |
 | Microsoft.Extensions.Hosting;HostBuilder;Build;();summary;df-generated |
@@ -21593,11 +22837,14 @@ neutral
 | Microsoft.Extensions.Hosting;HostingEnvironmentExtensions;IsEnvironment;(Microsoft.Extensions.Hosting.IHostingEnvironment,System.String);summary;df-generated |
 | Microsoft.Extensions.Hosting;HostingEnvironmentExtensions;IsProduction;(Microsoft.Extensions.Hosting.IHostingEnvironment);summary;df-generated |
 | Microsoft.Extensions.Hosting;HostingEnvironmentExtensions;IsStaging;(Microsoft.Extensions.Hosting.IHostingEnvironment);summary;df-generated |
+| Microsoft.Extensions.Hosting;HostingHostBuilderExtensions;RunConsoleAsync;(Microsoft.Extensions.Hosting.IHostBuilder,System.Action<Microsoft.Extensions.Hosting.ConsoleLifetimeOptions>,System.Threading.CancellationToken);summary;df-generated |
 | Microsoft.Extensions.Hosting;HostingHostBuilderExtensions;RunConsoleAsync;(Microsoft.Extensions.Hosting.IHostBuilder,System.Threading.CancellationToken);summary;df-generated |
 | Microsoft.Extensions.Hosting;IApplicationLifetime;StopApplication;();summary;df-generated |
 | Microsoft.Extensions.Hosting;IHost;StartAsync;(System.Threading.CancellationToken);summary;df-generated |
 | Microsoft.Extensions.Hosting;IHost;StopAsync;(System.Threading.CancellationToken);summary;df-generated |
 | Microsoft.Extensions.Hosting;IHost;get_Services;();summary;df-generated |
+| Microsoft.Extensions.Hosting;IHostApplicationBuilder;ConfigureContainer<TContainerBuilder>;(Microsoft.Extensions.DependencyInjection.IServiceProviderFactory<TContainerBuilder>,System.Action<TContainerBuilder>);summary;df-generated |
+| Microsoft.Extensions.Hosting;IHostApplicationBuilder;get_Configuration;();summary;df-generated |
 | Microsoft.Extensions.Hosting;IHostApplicationLifetime;StopApplication;();summary;df-generated |
 | Microsoft.Extensions.Hosting;IHostBuilder;Build;();summary;df-generated |
 | Microsoft.Extensions.Hosting;IHostBuilder;get_Properties;();summary;df-generated |
@@ -21613,13 +22860,17 @@ neutral
 | Microsoft.Extensions.Http.Logging;IHttpClientLogger;LogRequestFailed;(System.Object,System.Net.Http.HttpRequestMessage,System.Net.Http.HttpResponseMessage,System.Exception,System.TimeSpan);summary;df-generated |
 | Microsoft.Extensions.Http.Logging;IHttpClientLogger;LogRequestStart;(System.Net.Http.HttpRequestMessage);summary;df-generated |
 | Microsoft.Extensions.Http.Logging;IHttpClientLogger;LogRequestStop;(System.Object,System.Net.Http.HttpRequestMessage,System.Net.Http.HttpResponseMessage,System.TimeSpan);summary;df-generated |
+| Microsoft.Extensions.Http.Logging;LoggingHttpMessageHandler;SendAsync;(System.Net.Http.HttpRequestMessage,System.Threading.CancellationToken);summary;df-generated |
+| Microsoft.Extensions.Http.Logging;LoggingScopeHttpMessageHandler;SendAsync;(System.Net.Http.HttpRequestMessage,System.Threading.CancellationToken);summary;df-generated |
 | Microsoft.Extensions.Http;HttpClientFactoryOptions;get_HttpClientActions;();summary;df-generated |
 | Microsoft.Extensions.Http;HttpClientFactoryOptions;get_HttpMessageHandlerBuilderActions;();summary;df-generated |
 | Microsoft.Extensions.Http;HttpMessageHandlerBuilder;get_AdditionalHandlers;();summary;df-generated |
 | Microsoft.Extensions.Http;HttpMessageHandlerBuilder;get_Services;();summary;df-generated |
+| Microsoft.Extensions.Http;IHttpMessageHandlerBuilderFilter;Configure;(System.Action<Microsoft.Extensions.Http.HttpMessageHandlerBuilder>);summary;df-generated |
 | Microsoft.Extensions.Http;ITypedHttpClientFactory<TClient>;CreateClient;(System.Net.Http.HttpClient);summary;df-generated |
 | Microsoft.Extensions.Internal;ISystemClock;get_UtcNow;();summary;df-generated |
 | Microsoft.Extensions.Internal;SystemClock;get_UtcNow;();summary;df-generated |
+| Microsoft.Extensions.Logging.Abstractions;LogEntry<TState>;LogEntry;(Microsoft.Extensions.Logging.LogLevel,System.String,Microsoft.Extensions.Logging.EventId,TState,System.Exception,System.Func<TState,System.Exception,System.String>);summary;df-generated |
 | Microsoft.Extensions.Logging.Abstractions;LogEntry<TState>;get_Category;();summary;df-generated |
 | Microsoft.Extensions.Logging.Abstractions;LogEntry<TState>;get_EventId;();summary;df-generated |
 | Microsoft.Extensions.Logging.Abstractions;LogEntry<TState>;get_Exception;();summary;df-generated |
@@ -21638,12 +22889,15 @@ neutral
 | Microsoft.Extensions.Logging.Configuration;LoggerProviderOptionsChangeTokenSource<TOptions,TProvider>;LoggerProviderOptionsChangeTokenSource;(Microsoft.Extensions.Logging.Configuration.ILoggerProviderConfiguration<TProvider>);summary;df-generated |
 | Microsoft.Extensions.Logging.Configuration;LoggingBuilderConfigurationExtensions;AddConfiguration;(Microsoft.Extensions.Logging.ILoggingBuilder);summary;df-generated |
 | Microsoft.Extensions.Logging.Console;ConfigurationConsoleLoggerSettings;TryGetSwitch;(System.String,Microsoft.Extensions.Logging.LogLevel);summary;df-generated |
+| Microsoft.Extensions.Logging.Console;ConfigurationConsoleLoggerSettings;get_ChangeToken;();summary;df-generated |
 | Microsoft.Extensions.Logging.Console;ConfigurationConsoleLoggerSettings;get_IncludeScopes;();summary;df-generated |
 | Microsoft.Extensions.Logging.Console;ConsoleFormatter;ConsoleFormatter;(System.String);summary;df-generated |
 | Microsoft.Extensions.Logging.Console;ConsoleFormatter;get_Name;();summary;df-generated |
 | Microsoft.Extensions.Logging.Console;ConsoleLoggerProvider;ConsoleLoggerProvider;(Microsoft.Extensions.Options.IOptionsMonitor<Microsoft.Extensions.Logging.Console.ConsoleLoggerOptions>);summary;df-generated |
 | Microsoft.Extensions.Logging.Console;ConsoleLoggerProvider;Dispose;();summary;df-generated |
 | Microsoft.Extensions.Logging.Console;ConsoleLoggerSettings;TryGetSwitch;(System.String,Microsoft.Extensions.Logging.LogLevel);summary;df-generated |
+| Microsoft.Extensions.Logging.Console;ConsoleLoggerSettings;get_ChangeToken;();summary;df-generated |
+| Microsoft.Extensions.Logging.Console;ConsoleLoggerSettings;get_IncludeScopes;();summary;df-generated |
 | Microsoft.Extensions.Logging.Console;IConsoleLoggerSettings;TryGetSwitch;(System.String,Microsoft.Extensions.Logging.LogLevel);summary;df-generated |
 | Microsoft.Extensions.Logging.Console;IConsoleLoggerSettings;get_ChangeToken;();summary;df-generated |
 | Microsoft.Extensions.Logging.Console;IConsoleLoggerSettings;get_IncludeScopes;();summary;df-generated |
@@ -21695,6 +22949,7 @@ neutral
 | Microsoft.Extensions.Logging;LoggerExtensions;LogWarning;(Microsoft.Extensions.Logging.ILogger,System.Exception,System.String,System.Object[]);summary;df-generated |
 | Microsoft.Extensions.Logging;LoggerExtensions;LogWarning;(Microsoft.Extensions.Logging.ILogger,System.String,System.Object[]);summary;df-generated |
 | Microsoft.Extensions.Logging;LoggerFactory;CheckDisposed;();summary;df-generated |
+| Microsoft.Extensions.Logging;LoggerFactory;Create;(System.Action<Microsoft.Extensions.Logging.ILoggingBuilder>);summary;df-generated |
 | Microsoft.Extensions.Logging;LoggerFactory;Dispose;();summary;df-generated |
 | Microsoft.Extensions.Logging;LoggerFactory;LoggerFactory;(System.Collections.Generic.IEnumerable<Microsoft.Extensions.Logging.ILoggerProvider>);summary;df-generated |
 | Microsoft.Extensions.Logging;LoggerFactory;LoggerFactory;(System.Collections.Generic.IEnumerable<Microsoft.Extensions.Logging.ILoggerProvider>,Microsoft.Extensions.Logging.LoggerFilterOptions);summary;df-generated |
@@ -21702,6 +22957,7 @@ neutral
 | Microsoft.Extensions.Logging;LoggerFactory;LoggerFactory;(System.Collections.Generic.IEnumerable<Microsoft.Extensions.Logging.ILoggerProvider>,Microsoft.Extensions.Options.IOptionsMonitor<Microsoft.Extensions.Logging.LoggerFilterOptions>,Microsoft.Extensions.Options.IOptions<Microsoft.Extensions.Logging.LoggerFactoryOptions>);summary;df-generated |
 | Microsoft.Extensions.Logging;LoggerFactoryExtensions;CreateLogger;(Microsoft.Extensions.Logging.ILoggerFactory,System.Type);summary;df-generated |
 | Microsoft.Extensions.Logging;LoggerFactoryExtensions;CreateLogger<T>;(Microsoft.Extensions.Logging.ILoggerFactory);summary;df-generated |
+| Microsoft.Extensions.Logging;LoggerFilterRule;LoggerFilterRule;(System.String,System.String,System.Nullable<Microsoft.Extensions.Logging.LogLevel>,System.Func<System.String,System.String,Microsoft.Extensions.Logging.LogLevel,System.Boolean>);summary;df-generated |
 | Microsoft.Extensions.Logging;LoggerFilterRule;get_CategoryName;();summary;df-generated |
 | Microsoft.Extensions.Logging;LoggerFilterRule;get_Filter;();summary;df-generated |
 | Microsoft.Extensions.Logging;LoggerFilterRule;get_LogLevel;();summary;df-generated |
@@ -21734,10 +22990,12 @@ neutral
 | Microsoft.Extensions.Logging;ProviderAliasAttribute;ProviderAliasAttribute;(System.String);summary;df-generated |
 | Microsoft.Extensions.Logging;ProviderAliasAttribute;get_Alias;();summary;df-generated |
 | Microsoft.Extensions.Options;ConfigurationChangeTokenSource<TOptions>;ConfigurationChangeTokenSource;(Microsoft.Extensions.Configuration.IConfiguration);summary;df-generated |
+| Microsoft.Extensions.Options;ConfigurationChangeTokenSource<TOptions>;GetChangeToken;();summary;df-generated |
 | Microsoft.Extensions.Options;ConfigurationChangeTokenSource<TOptions>;get_Name;();summary;df-generated |
 | Microsoft.Extensions.Options;ConfigureFromConfigurationOptions<TOptions>;ConfigureFromConfigurationOptions;(Microsoft.Extensions.Configuration.IConfiguration);summary;df-generated |
 | Microsoft.Extensions.Options;ConfigureNamedOptions<TOptions,TDep1,TDep2,TDep3,TDep4,TDep5>;Configure;(System.String,TOptions);summary;df-generated |
 | Microsoft.Extensions.Options;ConfigureNamedOptions<TOptions,TDep1,TDep2,TDep3,TDep4,TDep5>;Configure;(TOptions);summary;df-generated |
+| Microsoft.Extensions.Options;ConfigureNamedOptions<TOptions,TDep1,TDep2,TDep3,TDep4,TDep5>;ConfigureNamedOptions;(System.String,TDep1,TDep2,TDep3,TDep4,TDep5,System.Action<TOptions,TDep1,TDep2,TDep3,TDep4,TDep5>);summary;df-generated |
 | Microsoft.Extensions.Options;ConfigureNamedOptions<TOptions,TDep1,TDep2,TDep3,TDep4,TDep5>;get_Action;();summary;df-generated |
 | Microsoft.Extensions.Options;ConfigureNamedOptions<TOptions,TDep1,TDep2,TDep3,TDep4,TDep5>;get_Dependency1;();summary;df-generated |
 | Microsoft.Extensions.Options;ConfigureNamedOptions<TOptions,TDep1,TDep2,TDep3,TDep4,TDep5>;get_Dependency2;();summary;df-generated |
@@ -21747,6 +23005,7 @@ neutral
 | Microsoft.Extensions.Options;ConfigureNamedOptions<TOptions,TDep1,TDep2,TDep3,TDep4,TDep5>;get_Name;();summary;df-generated |
 | Microsoft.Extensions.Options;ConfigureNamedOptions<TOptions,TDep1,TDep2,TDep3,TDep4>;Configure;(System.String,TOptions);summary;df-generated |
 | Microsoft.Extensions.Options;ConfigureNamedOptions<TOptions,TDep1,TDep2,TDep3,TDep4>;Configure;(TOptions);summary;df-generated |
+| Microsoft.Extensions.Options;ConfigureNamedOptions<TOptions,TDep1,TDep2,TDep3,TDep4>;ConfigureNamedOptions;(System.String,TDep1,TDep2,TDep3,TDep4,System.Action<TOptions,TDep1,TDep2,TDep3,TDep4>);summary;df-generated |
 | Microsoft.Extensions.Options;ConfigureNamedOptions<TOptions,TDep1,TDep2,TDep3,TDep4>;get_Action;();summary;df-generated |
 | Microsoft.Extensions.Options;ConfigureNamedOptions<TOptions,TDep1,TDep2,TDep3,TDep4>;get_Dependency1;();summary;df-generated |
 | Microsoft.Extensions.Options;ConfigureNamedOptions<TOptions,TDep1,TDep2,TDep3,TDep4>;get_Dependency2;();summary;df-generated |
@@ -21755,6 +23014,7 @@ neutral
 | Microsoft.Extensions.Options;ConfigureNamedOptions<TOptions,TDep1,TDep2,TDep3,TDep4>;get_Name;();summary;df-generated |
 | Microsoft.Extensions.Options;ConfigureNamedOptions<TOptions,TDep1,TDep2,TDep3>;Configure;(System.String,TOptions);summary;df-generated |
 | Microsoft.Extensions.Options;ConfigureNamedOptions<TOptions,TDep1,TDep2,TDep3>;Configure;(TOptions);summary;df-generated |
+| Microsoft.Extensions.Options;ConfigureNamedOptions<TOptions,TDep1,TDep2,TDep3>;ConfigureNamedOptions;(System.String,TDep1,TDep2,TDep3,System.Action<TOptions,TDep1,TDep2,TDep3>);summary;df-generated |
 | Microsoft.Extensions.Options;ConfigureNamedOptions<TOptions,TDep1,TDep2,TDep3>;get_Action;();summary;df-generated |
 | Microsoft.Extensions.Options;ConfigureNamedOptions<TOptions,TDep1,TDep2,TDep3>;get_Dependency1;();summary;df-generated |
 | Microsoft.Extensions.Options;ConfigureNamedOptions<TOptions,TDep1,TDep2,TDep3>;get_Dependency2;();summary;df-generated |
@@ -21762,20 +23022,24 @@ neutral
 | Microsoft.Extensions.Options;ConfigureNamedOptions<TOptions,TDep1,TDep2,TDep3>;get_Name;();summary;df-generated |
 | Microsoft.Extensions.Options;ConfigureNamedOptions<TOptions,TDep1,TDep2>;Configure;(System.String,TOptions);summary;df-generated |
 | Microsoft.Extensions.Options;ConfigureNamedOptions<TOptions,TDep1,TDep2>;Configure;(TOptions);summary;df-generated |
+| Microsoft.Extensions.Options;ConfigureNamedOptions<TOptions,TDep1,TDep2>;ConfigureNamedOptions;(System.String,TDep1,TDep2,System.Action<TOptions,TDep1,TDep2>);summary;df-generated |
 | Microsoft.Extensions.Options;ConfigureNamedOptions<TOptions,TDep1,TDep2>;get_Action;();summary;df-generated |
 | Microsoft.Extensions.Options;ConfigureNamedOptions<TOptions,TDep1,TDep2>;get_Dependency1;();summary;df-generated |
 | Microsoft.Extensions.Options;ConfigureNamedOptions<TOptions,TDep1,TDep2>;get_Dependency2;();summary;df-generated |
 | Microsoft.Extensions.Options;ConfigureNamedOptions<TOptions,TDep1,TDep2>;get_Name;();summary;df-generated |
 | Microsoft.Extensions.Options;ConfigureNamedOptions<TOptions,TDep>;Configure;(System.String,TOptions);summary;df-generated |
 | Microsoft.Extensions.Options;ConfigureNamedOptions<TOptions,TDep>;Configure;(TOptions);summary;df-generated |
+| Microsoft.Extensions.Options;ConfigureNamedOptions<TOptions,TDep>;ConfigureNamedOptions;(System.String,TDep,System.Action<TOptions,TDep>);summary;df-generated |
 | Microsoft.Extensions.Options;ConfigureNamedOptions<TOptions,TDep>;get_Action;();summary;df-generated |
 | Microsoft.Extensions.Options;ConfigureNamedOptions<TOptions,TDep>;get_Dependency;();summary;df-generated |
 | Microsoft.Extensions.Options;ConfigureNamedOptions<TOptions,TDep>;get_Name;();summary;df-generated |
 | Microsoft.Extensions.Options;ConfigureNamedOptions<TOptions>;Configure;(System.String,TOptions);summary;df-generated |
 | Microsoft.Extensions.Options;ConfigureNamedOptions<TOptions>;Configure;(TOptions);summary;df-generated |
+| Microsoft.Extensions.Options;ConfigureNamedOptions<TOptions>;ConfigureNamedOptions;(System.String,System.Action<TOptions>);summary;df-generated |
 | Microsoft.Extensions.Options;ConfigureNamedOptions<TOptions>;get_Action;();summary;df-generated |
 | Microsoft.Extensions.Options;ConfigureNamedOptions<TOptions>;get_Name;();summary;df-generated |
 | Microsoft.Extensions.Options;ConfigureOptions<TOptions>;Configure;(TOptions);summary;df-generated |
+| Microsoft.Extensions.Options;ConfigureOptions<TOptions>;ConfigureOptions;(System.Action<TOptions>);summary;df-generated |
 | Microsoft.Extensions.Options;ConfigureOptions<TOptions>;get_Action;();summary;df-generated |
 | Microsoft.Extensions.Options;DataAnnotationValidateOptions<TOptions>;DataAnnotationValidateOptions;(System.String);summary;df-generated |
 | Microsoft.Extensions.Options;DataAnnotationValidateOptions<TOptions>;Validate;(System.String,TOptions);summary;df-generated |
@@ -21787,8 +23051,10 @@ neutral
 | Microsoft.Extensions.Options;IOptionsChangeTokenSource<TOptions>;get_Name;();summary;df-generated |
 | Microsoft.Extensions.Options;IOptionsFactory<TOptions>;Create;(System.String);summary;df-generated |
 | Microsoft.Extensions.Options;IOptionsMonitor<TOptions>;Get;(System.String);summary;df-generated |
+| Microsoft.Extensions.Options;IOptionsMonitor<TOptions>;OnChange;(System.Action<TOptions,System.String>);summary;df-generated |
 | Microsoft.Extensions.Options;IOptionsMonitor<TOptions>;get_CurrentValue;();summary;df-generated |
 | Microsoft.Extensions.Options;IOptionsMonitorCache<TOptions>;Clear;();summary;df-generated |
+| Microsoft.Extensions.Options;IOptionsMonitorCache<TOptions>;GetOrAdd;(System.String,System.Func<TOptions>);summary;df-generated |
 | Microsoft.Extensions.Options;IOptionsMonitorCache<TOptions>;TryAdd;(System.String,TOptions);summary;df-generated |
 | Microsoft.Extensions.Options;IOptionsMonitorCache<TOptions>;TryRemove;(System.String);summary;df-generated |
 | Microsoft.Extensions.Options;IOptionsSnapshot<TOptions>;Get;(System.String);summary;df-generated |
@@ -21796,11 +23062,13 @@ neutral
 | Microsoft.Extensions.Options;IStartupValidator;Validate;();summary;df-generated |
 | Microsoft.Extensions.Options;IValidateOptions<TOptions>;Validate;(System.String,TOptions);summary;df-generated |
 | Microsoft.Extensions.Options;NamedConfigureFromConfigurationOptions<TOptions>;NamedConfigureFromConfigurationOptions;(System.String,Microsoft.Extensions.Configuration.IConfiguration);summary;df-generated |
+| Microsoft.Extensions.Options;NamedConfigureFromConfigurationOptions<TOptions>;NamedConfigureFromConfigurationOptions;(System.String,Microsoft.Extensions.Configuration.IConfiguration,System.Action<Microsoft.Extensions.Configuration.BinderOptions>);summary;df-generated |
 | Microsoft.Extensions.Options;Options;Create<TOptions>;(TOptions);summary;df-generated |
 | Microsoft.Extensions.Options;OptionsBuilder<TOptions>;OptionsBuilder;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.String);summary;df-generated |
 | Microsoft.Extensions.Options;OptionsBuilder<TOptions>;get_Name;();summary;df-generated |
 | Microsoft.Extensions.Options;OptionsBuilder<TOptions>;get_Services;();summary;df-generated |
 | Microsoft.Extensions.Options;OptionsCache<TOptions>;Clear;();summary;df-generated |
+| Microsoft.Extensions.Options;OptionsCache<TOptions>;GetOrAdd;(System.String,System.Func<TOptions>);summary;df-generated |
 | Microsoft.Extensions.Options;OptionsCache<TOptions>;TryAdd;(System.String,TOptions);summary;df-generated |
 | Microsoft.Extensions.Options;OptionsCache<TOptions>;TryRemove;(System.String);summary;df-generated |
 | Microsoft.Extensions.Options;OptionsFactory<TOptions>;Create;(System.String);summary;df-generated |
@@ -21810,7 +23078,9 @@ neutral
 | Microsoft.Extensions.Options;OptionsManager<TOptions>;get_Value;();summary;df-generated |
 | Microsoft.Extensions.Options;OptionsMonitor<TOptions>;Dispose;();summary;df-generated |
 | Microsoft.Extensions.Options;OptionsMonitor<TOptions>;Get;(System.String);summary;df-generated |
+| Microsoft.Extensions.Options;OptionsMonitor<TOptions>;OnChange;(System.Action<TOptions,System.String>);summary;df-generated |
 | Microsoft.Extensions.Options;OptionsMonitor<TOptions>;get_CurrentValue;();summary;df-generated |
+| Microsoft.Extensions.Options;OptionsMonitorExtensions;OnChange<TOptions>;(Microsoft.Extensions.Options.IOptionsMonitor<TOptions>,System.Action<TOptions>);summary;df-generated |
 | Microsoft.Extensions.Options;OptionsValidationException;OptionsValidationException;(System.String,System.Type,System.Collections.Generic.IEnumerable<System.String>);summary;df-generated |
 | Microsoft.Extensions.Options;OptionsValidationException;get_Failures;();summary;df-generated |
 | Microsoft.Extensions.Options;OptionsValidationException;get_OptionsName;();summary;df-generated |
@@ -21818,7 +23088,7 @@ neutral
 | Microsoft.Extensions.Options;OptionsWrapper<TOptions>;OptionsWrapper;(TOptions);summary;df-generated |
 | Microsoft.Extensions.Options;OptionsWrapper<TOptions>;get_Value;();summary;df-generated |
 | Microsoft.Extensions.Options;PostConfigureOptions<TOptions,TDep1,TDep2,TDep3,TDep4,TDep5>;PostConfigure;(System.String,TOptions);summary;df-generated |
-| Microsoft.Extensions.Options;PostConfigureOptions<TOptions,TDep1,TDep2,TDep3,TDep4,TDep5>;PostConfigure;(TOptions);summary;df-generated |
+| Microsoft.Extensions.Options;PostConfigureOptions<TOptions,TDep1,TDep2,TDep3,TDep4,TDep5>;PostConfigureOptions;(System.String,TDep1,TDep2,TDep3,TDep4,TDep5,System.Action<TOptions,TDep1,TDep2,TDep3,TDep4,TDep5>);summary;df-generated |
 | Microsoft.Extensions.Options;PostConfigureOptions<TOptions,TDep1,TDep2,TDep3,TDep4,TDep5>;get_Action;();summary;df-generated |
 | Microsoft.Extensions.Options;PostConfigureOptions<TOptions,TDep1,TDep2,TDep3,TDep4,TDep5>;get_Dependency1;();summary;df-generated |
 | Microsoft.Extensions.Options;PostConfigureOptions<TOptions,TDep1,TDep2,TDep3,TDep4,TDep5>;get_Dependency2;();summary;df-generated |
@@ -21827,7 +23097,7 @@ neutral
 | Microsoft.Extensions.Options;PostConfigureOptions<TOptions,TDep1,TDep2,TDep3,TDep4,TDep5>;get_Dependency5;();summary;df-generated |
 | Microsoft.Extensions.Options;PostConfigureOptions<TOptions,TDep1,TDep2,TDep3,TDep4,TDep5>;get_Name;();summary;df-generated |
 | Microsoft.Extensions.Options;PostConfigureOptions<TOptions,TDep1,TDep2,TDep3,TDep4>;PostConfigure;(System.String,TOptions);summary;df-generated |
-| Microsoft.Extensions.Options;PostConfigureOptions<TOptions,TDep1,TDep2,TDep3,TDep4>;PostConfigure;(TOptions);summary;df-generated |
+| Microsoft.Extensions.Options;PostConfigureOptions<TOptions,TDep1,TDep2,TDep3,TDep4>;PostConfigureOptions;(System.String,TDep1,TDep2,TDep3,TDep4,System.Action<TOptions,TDep1,TDep2,TDep3,TDep4>);summary;df-generated |
 | Microsoft.Extensions.Options;PostConfigureOptions<TOptions,TDep1,TDep2,TDep3,TDep4>;get_Action;();summary;df-generated |
 | Microsoft.Extensions.Options;PostConfigureOptions<TOptions,TDep1,TDep2,TDep3,TDep4>;get_Dependency1;();summary;df-generated |
 | Microsoft.Extensions.Options;PostConfigureOptions<TOptions,TDep1,TDep2,TDep3,TDep4>;get_Dependency2;();summary;df-generated |
@@ -21835,24 +23105,25 @@ neutral
 | Microsoft.Extensions.Options;PostConfigureOptions<TOptions,TDep1,TDep2,TDep3,TDep4>;get_Dependency4;();summary;df-generated |
 | Microsoft.Extensions.Options;PostConfigureOptions<TOptions,TDep1,TDep2,TDep3,TDep4>;get_Name;();summary;df-generated |
 | Microsoft.Extensions.Options;PostConfigureOptions<TOptions,TDep1,TDep2,TDep3>;PostConfigure;(System.String,TOptions);summary;df-generated |
-| Microsoft.Extensions.Options;PostConfigureOptions<TOptions,TDep1,TDep2,TDep3>;PostConfigure;(TOptions);summary;df-generated |
+| Microsoft.Extensions.Options;PostConfigureOptions<TOptions,TDep1,TDep2,TDep3>;PostConfigureOptions;(System.String,TDep1,TDep2,TDep3,System.Action<TOptions,TDep1,TDep2,TDep3>);summary;df-generated |
 | Microsoft.Extensions.Options;PostConfigureOptions<TOptions,TDep1,TDep2,TDep3>;get_Action;();summary;df-generated |
 | Microsoft.Extensions.Options;PostConfigureOptions<TOptions,TDep1,TDep2,TDep3>;get_Dependency1;();summary;df-generated |
 | Microsoft.Extensions.Options;PostConfigureOptions<TOptions,TDep1,TDep2,TDep3>;get_Dependency2;();summary;df-generated |
 | Microsoft.Extensions.Options;PostConfigureOptions<TOptions,TDep1,TDep2,TDep3>;get_Dependency3;();summary;df-generated |
 | Microsoft.Extensions.Options;PostConfigureOptions<TOptions,TDep1,TDep2,TDep3>;get_Name;();summary;df-generated |
 | Microsoft.Extensions.Options;PostConfigureOptions<TOptions,TDep1,TDep2>;PostConfigure;(System.String,TOptions);summary;df-generated |
-| Microsoft.Extensions.Options;PostConfigureOptions<TOptions,TDep1,TDep2>;PostConfigure;(TOptions);summary;df-generated |
+| Microsoft.Extensions.Options;PostConfigureOptions<TOptions,TDep1,TDep2>;PostConfigureOptions;(System.String,TDep1,TDep2,System.Action<TOptions,TDep1,TDep2>);summary;df-generated |
 | Microsoft.Extensions.Options;PostConfigureOptions<TOptions,TDep1,TDep2>;get_Action;();summary;df-generated |
 | Microsoft.Extensions.Options;PostConfigureOptions<TOptions,TDep1,TDep2>;get_Dependency1;();summary;df-generated |
 | Microsoft.Extensions.Options;PostConfigureOptions<TOptions,TDep1,TDep2>;get_Dependency2;();summary;df-generated |
 | Microsoft.Extensions.Options;PostConfigureOptions<TOptions,TDep1,TDep2>;get_Name;();summary;df-generated |
 | Microsoft.Extensions.Options;PostConfigureOptions<TOptions,TDep>;PostConfigure;(System.String,TOptions);summary;df-generated |
-| Microsoft.Extensions.Options;PostConfigureOptions<TOptions,TDep>;PostConfigure;(TOptions);summary;df-generated |
+| Microsoft.Extensions.Options;PostConfigureOptions<TOptions,TDep>;PostConfigureOptions;(System.String,TDep,System.Action<TOptions,TDep>);summary;df-generated |
 | Microsoft.Extensions.Options;PostConfigureOptions<TOptions,TDep>;get_Action;();summary;df-generated |
 | Microsoft.Extensions.Options;PostConfigureOptions<TOptions,TDep>;get_Dependency;();summary;df-generated |
 | Microsoft.Extensions.Options;PostConfigureOptions<TOptions,TDep>;get_Name;();summary;df-generated |
 | Microsoft.Extensions.Options;PostConfigureOptions<TOptions>;PostConfigure;(System.String,TOptions);summary;df-generated |
+| Microsoft.Extensions.Options;PostConfigureOptions<TOptions>;PostConfigureOptions;(System.String,System.Action<TOptions>);summary;df-generated |
 | Microsoft.Extensions.Options;PostConfigureOptions<TOptions>;get_Action;();summary;df-generated |
 | Microsoft.Extensions.Options;PostConfigureOptions<TOptions>;get_Name;();summary;df-generated |
 | Microsoft.Extensions.Options;ValidateEnumeratedItemsAttribute;ValidateEnumeratedItemsAttribute;(System.Type);summary;df-generated |
@@ -21860,6 +23131,7 @@ neutral
 | Microsoft.Extensions.Options;ValidateObjectMembersAttribute;ValidateObjectMembersAttribute;(System.Type);summary;df-generated |
 | Microsoft.Extensions.Options;ValidateObjectMembersAttribute;get_Validator;();summary;df-generated |
 | Microsoft.Extensions.Options;ValidateOptions<TOptions,TDep1,TDep2,TDep3,TDep4,TDep5>;Validate;(System.String,TOptions);summary;df-generated |
+| Microsoft.Extensions.Options;ValidateOptions<TOptions,TDep1,TDep2,TDep3,TDep4,TDep5>;ValidateOptions;(System.String,TDep1,TDep2,TDep3,TDep4,TDep5,System.Func<TOptions,TDep1,TDep2,TDep3,TDep4,TDep5,System.Boolean>,System.String);summary;df-generated |
 | Microsoft.Extensions.Options;ValidateOptions<TOptions,TDep1,TDep2,TDep3,TDep4,TDep5>;get_Dependency1;();summary;df-generated |
 | Microsoft.Extensions.Options;ValidateOptions<TOptions,TDep1,TDep2,TDep3,TDep4,TDep5>;get_Dependency2;();summary;df-generated |
 | Microsoft.Extensions.Options;ValidateOptions<TOptions,TDep1,TDep2,TDep3,TDep4,TDep5>;get_Dependency3;();summary;df-generated |
@@ -21869,6 +23141,7 @@ neutral
 | Microsoft.Extensions.Options;ValidateOptions<TOptions,TDep1,TDep2,TDep3,TDep4,TDep5>;get_Name;();summary;df-generated |
 | Microsoft.Extensions.Options;ValidateOptions<TOptions,TDep1,TDep2,TDep3,TDep4,TDep5>;get_Validation;();summary;df-generated |
 | Microsoft.Extensions.Options;ValidateOptions<TOptions,TDep1,TDep2,TDep3,TDep4>;Validate;(System.String,TOptions);summary;df-generated |
+| Microsoft.Extensions.Options;ValidateOptions<TOptions,TDep1,TDep2,TDep3,TDep4>;ValidateOptions;(System.String,TDep1,TDep2,TDep3,TDep4,System.Func<TOptions,TDep1,TDep2,TDep3,TDep4,System.Boolean>,System.String);summary;df-generated |
 | Microsoft.Extensions.Options;ValidateOptions<TOptions,TDep1,TDep2,TDep3,TDep4>;get_Dependency1;();summary;df-generated |
 | Microsoft.Extensions.Options;ValidateOptions<TOptions,TDep1,TDep2,TDep3,TDep4>;get_Dependency2;();summary;df-generated |
 | Microsoft.Extensions.Options;ValidateOptions<TOptions,TDep1,TDep2,TDep3,TDep4>;get_Dependency3;();summary;df-generated |
@@ -21877,6 +23150,7 @@ neutral
 | Microsoft.Extensions.Options;ValidateOptions<TOptions,TDep1,TDep2,TDep3,TDep4>;get_Name;();summary;df-generated |
 | Microsoft.Extensions.Options;ValidateOptions<TOptions,TDep1,TDep2,TDep3,TDep4>;get_Validation;();summary;df-generated |
 | Microsoft.Extensions.Options;ValidateOptions<TOptions,TDep1,TDep2,TDep3>;Validate;(System.String,TOptions);summary;df-generated |
+| Microsoft.Extensions.Options;ValidateOptions<TOptions,TDep1,TDep2,TDep3>;ValidateOptions;(System.String,TDep1,TDep2,TDep3,System.Func<TOptions,TDep1,TDep2,TDep3,System.Boolean>,System.String);summary;df-generated |
 | Microsoft.Extensions.Options;ValidateOptions<TOptions,TDep1,TDep2,TDep3>;get_Dependency1;();summary;df-generated |
 | Microsoft.Extensions.Options;ValidateOptions<TOptions,TDep1,TDep2,TDep3>;get_Dependency2;();summary;df-generated |
 | Microsoft.Extensions.Options;ValidateOptions<TOptions,TDep1,TDep2,TDep3>;get_Dependency3;();summary;df-generated |
@@ -21884,17 +23158,20 @@ neutral
 | Microsoft.Extensions.Options;ValidateOptions<TOptions,TDep1,TDep2,TDep3>;get_Name;();summary;df-generated |
 | Microsoft.Extensions.Options;ValidateOptions<TOptions,TDep1,TDep2,TDep3>;get_Validation;();summary;df-generated |
 | Microsoft.Extensions.Options;ValidateOptions<TOptions,TDep1,TDep2>;Validate;(System.String,TOptions);summary;df-generated |
+| Microsoft.Extensions.Options;ValidateOptions<TOptions,TDep1,TDep2>;ValidateOptions;(System.String,TDep1,TDep2,System.Func<TOptions,TDep1,TDep2,System.Boolean>,System.String);summary;df-generated |
 | Microsoft.Extensions.Options;ValidateOptions<TOptions,TDep1,TDep2>;get_Dependency1;();summary;df-generated |
 | Microsoft.Extensions.Options;ValidateOptions<TOptions,TDep1,TDep2>;get_Dependency2;();summary;df-generated |
 | Microsoft.Extensions.Options;ValidateOptions<TOptions,TDep1,TDep2>;get_FailureMessage;();summary;df-generated |
 | Microsoft.Extensions.Options;ValidateOptions<TOptions,TDep1,TDep2>;get_Name;();summary;df-generated |
 | Microsoft.Extensions.Options;ValidateOptions<TOptions,TDep1,TDep2>;get_Validation;();summary;df-generated |
 | Microsoft.Extensions.Options;ValidateOptions<TOptions,TDep>;Validate;(System.String,TOptions);summary;df-generated |
+| Microsoft.Extensions.Options;ValidateOptions<TOptions,TDep>;ValidateOptions;(System.String,TDep,System.Func<TOptions,TDep,System.Boolean>,System.String);summary;df-generated |
 | Microsoft.Extensions.Options;ValidateOptions<TOptions,TDep>;get_Dependency;();summary;df-generated |
 | Microsoft.Extensions.Options;ValidateOptions<TOptions,TDep>;get_FailureMessage;();summary;df-generated |
 | Microsoft.Extensions.Options;ValidateOptions<TOptions,TDep>;get_Name;();summary;df-generated |
 | Microsoft.Extensions.Options;ValidateOptions<TOptions,TDep>;get_Validation;();summary;df-generated |
 | Microsoft.Extensions.Options;ValidateOptions<TOptions>;Validate;(System.String,TOptions);summary;df-generated |
+| Microsoft.Extensions.Options;ValidateOptions<TOptions>;ValidateOptions;(System.String,System.Func<TOptions,System.Boolean>,System.String);summary;df-generated |
 | Microsoft.Extensions.Options;ValidateOptions<TOptions>;get_FailureMessage;();summary;df-generated |
 | Microsoft.Extensions.Options;ValidateOptions<TOptions>;get_Name;();summary;df-generated |
 | Microsoft.Extensions.Options;ValidateOptions<TOptions>;get_Validation;();summary;df-generated |
@@ -21902,7 +23179,10 @@ neutral
 | Microsoft.Extensions.Options;ValidateOptionsResult;Fail;(System.String);summary;df-generated |
 | Microsoft.Extensions.Options;ValidateOptionsResultBuilder;Build;();summary;df-generated |
 | Microsoft.Extensions.Options;ValidateOptionsResultBuilder;Clear;();summary;df-generated |
+| Microsoft.Extensions.Primitives;CancellationChangeToken;get_ActiveChangeCallbacks;();summary;df-generated |
 | Microsoft.Extensions.Primitives;CancellationChangeToken;get_HasChanged;();summary;df-generated |
+| Microsoft.Extensions.Primitives;ChangeToken;OnChange;(System.Func<Microsoft.Extensions.Primitives.IChangeToken>,System.Action);summary;df-generated |
+| Microsoft.Extensions.Primitives;ChangeToken;OnChange<TState>;(System.Func<Microsoft.Extensions.Primitives.IChangeToken>,System.Action<TState>,TState);summary;df-generated |
 | Microsoft.Extensions.Primitives;CompositeChangeToken;CompositeChangeToken;(System.Collections.Generic.IReadOnlyList<Microsoft.Extensions.Primitives.IChangeToken>);summary;df-generated |
 | Microsoft.Extensions.Primitives;CompositeChangeToken;get_ActiveChangeCallbacks;();summary;df-generated |
 | Microsoft.Extensions.Primitives;CompositeChangeToken;get_ChangeTokens;();summary;df-generated |
@@ -21914,6 +23194,7 @@ neutral
 | Microsoft.Extensions.Primitives;InplaceStringBuilder;Append;(System.String);summary;df-generated |
 | Microsoft.Extensions.Primitives;InplaceStringBuilder;Append;(System.String,System.Int32,System.Int32);summary;df-generated |
 | Microsoft.Extensions.Primitives;InplaceStringBuilder;InplaceStringBuilder;(System.Int32);summary;df-generated |
+| Microsoft.Extensions.Primitives;StringSegment;AsMemory;();summary;df-generated |
 | Microsoft.Extensions.Primitives;StringSegment;AsSpan;();summary;df-generated |
 | Microsoft.Extensions.Primitives;StringSegment;AsSpan;(System.Int32);summary;df-generated |
 | Microsoft.Extensions.Primitives;StringSegment;AsSpan;(System.Int32,System.Int32);summary;df-generated |
@@ -21934,6 +23215,7 @@ neutral
 | Microsoft.Extensions.Primitives;StringSegment;IndexOfAny;(System.Char[],System.Int32,System.Int32);summary;df-generated |
 | Microsoft.Extensions.Primitives;StringSegment;IsNullOrEmpty;(Microsoft.Extensions.Primitives.StringSegment);summary;df-generated |
 | Microsoft.Extensions.Primitives;StringSegment;LastIndexOf;(System.Char);summary;df-generated |
+| Microsoft.Extensions.Primitives;StringSegment;Split;(System.Char[]);summary;df-generated |
 | Microsoft.Extensions.Primitives;StringSegment;StartsWith;(System.String,System.StringComparison);summary;df-generated |
 | Microsoft.Extensions.Primitives;StringSegment;StringSegment;(System.String);summary;df-generated |
 | Microsoft.Extensions.Primitives;StringSegment;StringSegment;(System.String,System.Int32,System.Int32);summary;df-generated |
@@ -21957,10 +23239,21 @@ neutral
 | Microsoft.Extensions.Primitives;StringTokenizer+Enumerator;Dispose;();summary;df-generated |
 | Microsoft.Extensions.Primitives;StringTokenizer+Enumerator;MoveNext;();summary;df-generated |
 | Microsoft.Extensions.Primitives;StringTokenizer+Enumerator;Reset;();summary;df-generated |
+| Microsoft.Extensions.Primitives;StringTokenizer+Enumerator;get_Current;();summary;df-generated |
 | Microsoft.Extensions.Primitives;StringValues+Enumerator;Dispose;();summary;df-generated |
-| Microsoft.Extensions.Primitives;StringValues+Enumerator;Enumerator;(Microsoft.Extensions.Primitives.StringValues);summary;df-generated |
 | Microsoft.Extensions.Primitives;StringValues+Enumerator;MoveNext;();summary;df-generated |
 | Microsoft.Extensions.Primitives;StringValues+Enumerator;Reset;();summary;df-generated |
+| Microsoft.Extensions.Primitives;StringValues+Enumerator;get_Current;();summary;df-generated |
+| Microsoft.Extensions.Primitives;StringValues;Contains;(System.String);summary;df-generated |
+| Microsoft.Extensions.Primitives;StringValues;Equals;(Microsoft.Extensions.Primitives.StringValues);summary;df-generated |
+| Microsoft.Extensions.Primitives;StringValues;Equals;(System.String);summary;df-generated |
+| Microsoft.Extensions.Primitives;StringValues;Equals;(System.String[]);summary;df-generated |
+| Microsoft.Extensions.Primitives;StringValues;IndexOf;(System.String);summary;df-generated |
+| Microsoft.Extensions.Primitives;StringValues;Remove;(System.String);summary;df-generated |
+| Microsoft.Extensions.Primitives;StringValues;RemoveAt;(System.Int32);summary;df-generated |
+| Microsoft.Extensions.Primitives;StringValues;get_Count;();summary;df-generated |
+| Microsoft.Extensions.Primitives;StringValues;get_IsReadOnly;();summary;df-generated |
+| Microsoft.Extensions.Primitives;StringValues;get_Item;(System.Int32);summary;df-generated |
 | Microsoft.Extensions.Primitives;StringValues;op_Equality;(Microsoft.Extensions.Primitives.StringValues,Microsoft.Extensions.Primitives.StringValues);summary;df-generated |
 | Microsoft.Extensions.Primitives;StringValues;op_Equality;(Microsoft.Extensions.Primitives.StringValues,System.Object);summary;df-generated |
 | Microsoft.Extensions.Primitives;StringValues;op_Equality;(Microsoft.Extensions.Primitives.StringValues,System.String);summary;df-generated |
@@ -21975,6 +23268,44 @@ neutral
 | Microsoft.Extensions.Primitives;StringValues;op_Inequality;(System.Object,Microsoft.Extensions.Primitives.StringValues);summary;df-generated |
 | Microsoft.Extensions.Primitives;StringValues;op_Inequality;(System.String,Microsoft.Extensions.Primitives.StringValues);summary;df-generated |
 | Microsoft.Extensions.Primitives;StringValues;op_Inequality;(System.String[],Microsoft.Extensions.Primitives.StringValues);summary;df-generated |
+| Microsoft.Extensions.WebEncoders.Testing;HtmlTestEncoder;FindFirstCharacterToEncode;(System.Char*,System.Int32);summary;df-generated |
+| Microsoft.Extensions.WebEncoders.Testing;HtmlTestEncoder;TryEncodeUnicodeScalar;(System.Int32,System.Char*,System.Int32,System.Int32);summary;df-generated |
+| Microsoft.Extensions.WebEncoders.Testing;HtmlTestEncoder;WillEncode;(System.Int32);summary;df-generated |
+| Microsoft.Extensions.WebEncoders.Testing;HtmlTestEncoder;get_MaxOutputCharactersPerInputCharacter;();summary;df-generated |
+| Microsoft.Extensions.WebEncoders.Testing;JavaScriptTestEncoder;FindFirstCharacterToEncode;(System.Char*,System.Int32);summary;df-generated |
+| Microsoft.Extensions.WebEncoders.Testing;JavaScriptTestEncoder;TryEncodeUnicodeScalar;(System.Int32,System.Char*,System.Int32,System.Int32);summary;df-generated |
+| Microsoft.Extensions.WebEncoders.Testing;JavaScriptTestEncoder;WillEncode;(System.Int32);summary;df-generated |
+| Microsoft.Extensions.WebEncoders.Testing;JavaScriptTestEncoder;get_MaxOutputCharactersPerInputCharacter;();summary;df-generated |
+| Microsoft.Extensions.WebEncoders.Testing;UrlTestEncoder;FindFirstCharacterToEncode;(System.Char*,System.Int32);summary;df-generated |
+| Microsoft.Extensions.WebEncoders.Testing;UrlTestEncoder;TryEncodeUnicodeScalar;(System.Int32,System.Char*,System.Int32,System.Int32);summary;df-generated |
+| Microsoft.Extensions.WebEncoders.Testing;UrlTestEncoder;WillEncode;(System.Int32);summary;df-generated |
+| Microsoft.Extensions.WebEncoders.Testing;UrlTestEncoder;get_MaxOutputCharactersPerInputCharacter;();summary;df-generated |
+| Microsoft.JSInterop.Implementation;JSInProcessObjectReference;Dispose;();summary;df-generated |
+| Microsoft.JSInterop;DotNetObjectReference<TValue>;Dispose;();summary;df-generated |
+| Microsoft.JSInterop;DotNetStreamReference;Dispose;();summary;df-generated |
+| Microsoft.JSInterop;JSRuntime;Dispose;();summary;df-generated |
+| Microsoft.Net.Http.Headers;MediaTypeHeaderValueComparer;Compare;(Microsoft.Net.Http.Headers.MediaTypeHeaderValue,Microsoft.Net.Http.Headers.MediaTypeHeaderValue);summary;df-generated |
+| Microsoft.Net.Http.Headers;StringWithQualityHeaderValueComparer;Compare;(Microsoft.Net.Http.Headers.StringWithQualityHeaderValue,Microsoft.Net.Http.Headers.StringWithQualityHeaderValue);summary;df-generated |
+| Microsoft.SqlServer.Server;SqlDataRecord;GetBoolean;(System.Int32);summary;df-generated |
+| Microsoft.SqlServer.Server;SqlDataRecord;GetByte;(System.Int32);summary;df-generated |
+| Microsoft.SqlServer.Server;SqlDataRecord;GetBytes;(System.Int32,System.Int64,System.Byte[],System.Int32,System.Int32);summary;df-generated |
+| Microsoft.SqlServer.Server;SqlDataRecord;GetChar;(System.Int32);summary;df-generated |
+| Microsoft.SqlServer.Server;SqlDataRecord;GetChars;(System.Int32,System.Int64,System.Char[],System.Int32,System.Int32);summary;df-generated |
+| Microsoft.SqlServer.Server;SqlDataRecord;GetData;(System.Int32);summary;df-generated |
+| Microsoft.SqlServer.Server;SqlDataRecord;GetDataTypeName;(System.Int32);summary;manual |
+| Microsoft.SqlServer.Server;SqlDataRecord;GetDateTime;(System.Int32);summary;df-generated |
+| Microsoft.SqlServer.Server;SqlDataRecord;GetDecimal;(System.Int32);summary;df-generated |
+| Microsoft.SqlServer.Server;SqlDataRecord;GetDouble;(System.Int32);summary;df-generated |
+| Microsoft.SqlServer.Server;SqlDataRecord;GetFieldType;(System.Int32);summary;df-generated |
+| Microsoft.SqlServer.Server;SqlDataRecord;GetFloat;(System.Int32);summary;df-generated |
+| Microsoft.SqlServer.Server;SqlDataRecord;GetGuid;(System.Int32);summary;manual |
+| Microsoft.SqlServer.Server;SqlDataRecord;GetInt16;(System.Int32);summary;df-generated |
+| Microsoft.SqlServer.Server;SqlDataRecord;GetInt32;(System.Int32);summary;df-generated |
+| Microsoft.SqlServer.Server;SqlDataRecord;GetInt64;(System.Int32);summary;df-generated |
+| Microsoft.SqlServer.Server;SqlDataRecord;GetName;(System.Int32);summary;manual |
+| Microsoft.SqlServer.Server;SqlDataRecord;GetOrdinal;(System.String);summary;df-generated |
+| Microsoft.SqlServer.Server;SqlDataRecord;IsDBNull;(System.Int32);summary;df-generated |
+| Microsoft.SqlServer.Server;SqlDataRecord;get_FieldCount;();summary;df-generated |
 | Microsoft.VisualBasic.CompilerServices;BooleanType;FromObject;(System.Object);summary;df-generated |
 | Microsoft.VisualBasic.CompilerServices;BooleanType;FromString;(System.String);summary;df-generated |
 | Microsoft.VisualBasic.CompilerServices;ByteType;FromObject;(System.Object);summary;df-generated |
@@ -22163,7 +23494,6 @@ neutral
 | Microsoft.VisualBasic.CompilerServices;StringType;FromShort;(System.Int16);summary;df-generated |
 | Microsoft.VisualBasic.CompilerServices;StringType;FromSingle;(System.Single);summary;df-generated |
 | Microsoft.VisualBasic.CompilerServices;StringType;FromSingle;(System.Single,System.Globalization.NumberFormatInfo);summary;df-generated |
-| Microsoft.VisualBasic.CompilerServices;StringType;MidStmtStr;(System.String,System.Int32,System.Int32,System.String);summary;df-generated |
 | Microsoft.VisualBasic.CompilerServices;StringType;StrCmp;(System.String,System.String,System.Boolean);summary;df-generated |
 | Microsoft.VisualBasic.CompilerServices;StringType;StrLike;(System.String,System.String,Microsoft.VisualBasic.CompareMethod);summary;df-generated |
 | Microsoft.VisualBasic.CompilerServices;StringType;StrLikeBinary;(System.String,System.String);summary;df-generated |
@@ -22269,6 +23599,7 @@ neutral
 | Microsoft.VisualBasic;Collection;Contains;(System.String);summary;df-generated |
 | Microsoft.VisualBasic;Collection;IndexOf;(System.Object);summary;df-generated |
 | Microsoft.VisualBasic;Collection;Remove;(System.Int32);summary;df-generated |
+| Microsoft.VisualBasic;Collection;Remove;(System.Object);summary;df-generated |
 | Microsoft.VisualBasic;Collection;Remove;(System.String);summary;df-generated |
 | Microsoft.VisualBasic;Collection;RemoveAt;(System.Int32);summary;df-generated |
 | Microsoft.VisualBasic;Collection;get_Count;();summary;df-generated |
@@ -22359,7 +23690,6 @@ neutral
 | Microsoft.VisualBasic;FileSystem;FileClose;(System.Int32[]);summary;df-generated |
 | Microsoft.VisualBasic;FileSystem;FileCopy;(System.String,System.String);summary;df-generated |
 | Microsoft.VisualBasic;FileSystem;FileDateTime;(System.String);summary;df-generated |
-| Microsoft.VisualBasic;FileSystem;FileGet;(System.Int32,System.Array,System.Int64,System.Boolean,System.Boolean);summary;df-generated |
 | Microsoft.VisualBasic;FileSystem;FileGet;(System.Int32,System.Boolean,System.Int64);summary;df-generated |
 | Microsoft.VisualBasic;FileSystem;FileGet;(System.Int32,System.Byte,System.Int64);summary;df-generated |
 | Microsoft.VisualBasic;FileSystem;FileGet;(System.Int32,System.Char,System.Int64);summary;df-generated |
@@ -22370,9 +23700,6 @@ neutral
 | Microsoft.VisualBasic;FileSystem;FileGet;(System.Int32,System.Int32,System.Int64);summary;df-generated |
 | Microsoft.VisualBasic;FileSystem;FileGet;(System.Int32,System.Int64,System.Int64);summary;df-generated |
 | Microsoft.VisualBasic;FileSystem;FileGet;(System.Int32,System.Single,System.Int64);summary;df-generated |
-| Microsoft.VisualBasic;FileSystem;FileGet;(System.Int32,System.String,System.Int64,System.Boolean);summary;df-generated |
-| Microsoft.VisualBasic;FileSystem;FileGet;(System.Int32,System.ValueType,System.Int64);summary;df-generated |
-| Microsoft.VisualBasic;FileSystem;FileGetObject;(System.Int32,System.Object,System.Int64);summary;df-generated |
 | Microsoft.VisualBasic;FileSystem;FileLen;(System.String);summary;df-generated |
 | Microsoft.VisualBasic;FileSystem;FileOpen;(System.Int32,System.String,Microsoft.VisualBasic.OpenMode,Microsoft.VisualBasic.OpenAccess,Microsoft.VisualBasic.OpenShare,System.Int32);summary;df-generated |
 | Microsoft.VisualBasic;FileSystem;FilePut;(System.Int32,System.Array,System.Int64,System.Boolean,System.Boolean);summary;df-generated |
@@ -22402,9 +23729,7 @@ neutral
 | Microsoft.VisualBasic;FileSystem;Input;(System.Int32,System.Int16);summary;df-generated |
 | Microsoft.VisualBasic;FileSystem;Input;(System.Int32,System.Int32);summary;df-generated |
 | Microsoft.VisualBasic;FileSystem;Input;(System.Int32,System.Int64);summary;df-generated |
-| Microsoft.VisualBasic;FileSystem;Input;(System.Int32,System.Object);summary;df-generated |
 | Microsoft.VisualBasic;FileSystem;Input;(System.Int32,System.Single);summary;df-generated |
-| Microsoft.VisualBasic;FileSystem;Input;(System.Int32,System.String);summary;df-generated |
 | Microsoft.VisualBasic;FileSystem;InputString;(System.Int32,System.Int32);summary;df-generated |
 | Microsoft.VisualBasic;FileSystem;Kill;(System.String);summary;df-generated |
 | Microsoft.VisualBasic;FileSystem;LOF;(System.Int32);summary;df-generated |
@@ -22578,8 +23903,10 @@ neutral
 | Microsoft.Win32.SafeHandles;SafeNCryptProviderHandle;ReleaseNativeHandle;();summary;df-generated |
 | Microsoft.Win32.SafeHandles;SafeNCryptSecretHandle;ReleaseNativeHandle;();summary;df-generated |
 | Microsoft.Win32.SafeHandles;SafePipeHandle;ReleaseHandle;();summary;df-generated |
+| Microsoft.Win32.SafeHandles;SafePipeHandle;SafePipeHandle;(System.IntPtr,System.Boolean);summary;df-generated |
 | Microsoft.Win32.SafeHandles;SafePipeHandle;get_IsInvalid;();summary;df-generated |
 | Microsoft.Win32.SafeHandles;SafeProcessHandle;ReleaseHandle;();summary;df-generated |
+| Microsoft.Win32.SafeHandles;SafeProcessHandle;SafeProcessHandle;(System.IntPtr,System.Boolean);summary;df-generated |
 | Microsoft.Win32.SafeHandles;SafeRegistryHandle;ReleaseHandle;();summary;df-generated |
 | Microsoft.Win32.SafeHandles;SafeRegistryHandle;SafeRegistryHandle;(System.IntPtr,System.Boolean);summary;df-generated |
 | Microsoft.Win32.SafeHandles;SafeWaitHandle;ReleaseHandle;();summary;df-generated |
@@ -22642,12 +23969,290 @@ neutral
 | Microsoft.Win32;SystemEvents;CreateTimer;(System.Int32);summary;df-generated |
 | Microsoft.Win32;SystemEvents;InvokeOnEventsThread;(System.Delegate);summary;df-generated |
 | Microsoft.Win32;SystemEvents;KillTimer;(System.IntPtr);summary;df-generated |
+| Microsoft.Win32;SystemEvents;add_DisplaySettingsChanged;(System.EventHandler);summary;df-generated |
+| Microsoft.Win32;SystemEvents;add_DisplaySettingsChanging;(System.EventHandler);summary;df-generated |
+| Microsoft.Win32;SystemEvents;add_EventsThreadShutdown;(System.EventHandler);summary;df-generated |
+| Microsoft.Win32;SystemEvents;add_InstalledFontsChanged;(System.EventHandler);summary;df-generated |
+| Microsoft.Win32;SystemEvents;add_LowMemory;(System.EventHandler);summary;df-generated |
+| Microsoft.Win32;SystemEvents;add_PaletteChanged;(System.EventHandler);summary;df-generated |
+| Microsoft.Win32;SystemEvents;add_PowerModeChanged;(Microsoft.Win32.PowerModeChangedEventHandler);summary;df-generated |
+| Microsoft.Win32;SystemEvents;add_SessionEnded;(Microsoft.Win32.SessionEndedEventHandler);summary;df-generated |
+| Microsoft.Win32;SystemEvents;add_SessionEnding;(Microsoft.Win32.SessionEndingEventHandler);summary;df-generated |
+| Microsoft.Win32;SystemEvents;add_SessionSwitch;(Microsoft.Win32.SessionSwitchEventHandler);summary;df-generated |
+| Microsoft.Win32;SystemEvents;add_TimeChanged;(System.EventHandler);summary;df-generated |
+| Microsoft.Win32;SystemEvents;add_TimerElapsed;(Microsoft.Win32.TimerElapsedEventHandler);summary;df-generated |
+| Microsoft.Win32;SystemEvents;add_UserPreferenceChanged;(Microsoft.Win32.UserPreferenceChangedEventHandler);summary;df-generated |
+| Microsoft.Win32;SystemEvents;add_UserPreferenceChanging;(Microsoft.Win32.UserPreferenceChangingEventHandler);summary;df-generated |
+| Microsoft.Win32;SystemEvents;remove_DisplaySettingsChanged;(System.EventHandler);summary;df-generated |
+| Microsoft.Win32;SystemEvents;remove_DisplaySettingsChanging;(System.EventHandler);summary;df-generated |
+| Microsoft.Win32;SystemEvents;remove_EventsThreadShutdown;(System.EventHandler);summary;df-generated |
+| Microsoft.Win32;SystemEvents;remove_InstalledFontsChanged;(System.EventHandler);summary;df-generated |
+| Microsoft.Win32;SystemEvents;remove_LowMemory;(System.EventHandler);summary;df-generated |
+| Microsoft.Win32;SystemEvents;remove_PaletteChanged;(System.EventHandler);summary;df-generated |
+| Microsoft.Win32;SystemEvents;remove_PowerModeChanged;(Microsoft.Win32.PowerModeChangedEventHandler);summary;df-generated |
+| Microsoft.Win32;SystemEvents;remove_SessionEnded;(Microsoft.Win32.SessionEndedEventHandler);summary;df-generated |
+| Microsoft.Win32;SystemEvents;remove_SessionEnding;(Microsoft.Win32.SessionEndingEventHandler);summary;df-generated |
+| Microsoft.Win32;SystemEvents;remove_SessionSwitch;(Microsoft.Win32.SessionSwitchEventHandler);summary;df-generated |
+| Microsoft.Win32;SystemEvents;remove_TimeChanged;(System.EventHandler);summary;df-generated |
+| Microsoft.Win32;SystemEvents;remove_TimerElapsed;(Microsoft.Win32.TimerElapsedEventHandler);summary;df-generated |
+| Microsoft.Win32;SystemEvents;remove_UserPreferenceChanged;(Microsoft.Win32.UserPreferenceChangedEventHandler);summary;df-generated |
+| Microsoft.Win32;SystemEvents;remove_UserPreferenceChanging;(Microsoft.Win32.UserPreferenceChangingEventHandler);summary;df-generated |
 | Microsoft.Win32;TimerElapsedEventArgs;TimerElapsedEventArgs;(System.IntPtr);summary;df-generated |
 | Microsoft.Win32;TimerElapsedEventArgs;get_TimerId;();summary;df-generated |
 | Microsoft.Win32;UserPreferenceChangedEventArgs;UserPreferenceChangedEventArgs;(Microsoft.Win32.UserPreferenceCategory);summary;df-generated |
 | Microsoft.Win32;UserPreferenceChangedEventArgs;get_Category;();summary;df-generated |
 | Microsoft.Win32;UserPreferenceChangingEventArgs;UserPreferenceChangingEventArgs;(Microsoft.Win32.UserPreferenceCategory);summary;df-generated |
 | Microsoft.Win32;UserPreferenceChangingEventArgs;get_Category;();summary;df-generated |
+| Newtonsoft.Json.Linq;JArray;Contains;(Newtonsoft.Json.Linq.JToken);summary;df-generated |
+| Newtonsoft.Json.Linq;JArray;IndexOf;(Newtonsoft.Json.Linq.JToken);summary;df-generated |
+| Newtonsoft.Json.Linq;JArray;Remove;(Newtonsoft.Json.Linq.JToken);summary;df-generated |
+| Newtonsoft.Json.Linq;JArray;RemoveAt;(System.Int32);summary;df-generated |
+| Newtonsoft.Json.Linq;JArray;get_IsReadOnly;();summary;df-generated |
+| Newtonsoft.Json.Linq;JContainer;AddIndex;(System.ComponentModel.PropertyDescriptor);summary;df-generated |
+| Newtonsoft.Json.Linq;JContainer;AddNew;();summary;df-generated |
+| Newtonsoft.Json.Linq;JContainer;Contains;(Newtonsoft.Json.Linq.JToken);summary;df-generated |
+| Newtonsoft.Json.Linq;JContainer;Contains;(System.Object);summary;df-generated |
+| Newtonsoft.Json.Linq;JContainer;IndexOf;(Newtonsoft.Json.Linq.JToken);summary;df-generated |
+| Newtonsoft.Json.Linq;JContainer;IndexOf;(System.Object);summary;df-generated |
+| Newtonsoft.Json.Linq;JContainer;Remove;(Newtonsoft.Json.Linq.JToken);summary;df-generated |
+| Newtonsoft.Json.Linq;JContainer;Remove;(System.Object);summary;df-generated |
+| Newtonsoft.Json.Linq;JContainer;RemoveAt;(System.Int32);summary;df-generated |
+| Newtonsoft.Json.Linq;JContainer;RemoveIndex;(System.ComponentModel.PropertyDescriptor);summary;df-generated |
+| Newtonsoft.Json.Linq;JContainer;RemoveSort;();summary;df-generated |
+| Newtonsoft.Json.Linq;JContainer;add_CollectionChanged;(System.Collections.Specialized.NotifyCollectionChangedEventHandler);summary;df-generated |
+| Newtonsoft.Json.Linq;JContainer;add_ListChanged;(System.ComponentModel.ListChangedEventHandler);summary;df-generated |
+| Newtonsoft.Json.Linq;JContainer;get_AllowEdit;();summary;df-generated |
+| Newtonsoft.Json.Linq;JContainer;get_AllowNew;();summary;df-generated |
+| Newtonsoft.Json.Linq;JContainer;get_AllowRemove;();summary;df-generated |
+| Newtonsoft.Json.Linq;JContainer;get_Count;();summary;df-generated |
+| Newtonsoft.Json.Linq;JContainer;get_IsFixedSize;();summary;df-generated |
+| Newtonsoft.Json.Linq;JContainer;get_IsReadOnly;();summary;df-generated |
+| Newtonsoft.Json.Linq;JContainer;get_IsSorted;();summary;df-generated |
+| Newtonsoft.Json.Linq;JContainer;get_IsSynchronized;();summary;df-generated |
+| Newtonsoft.Json.Linq;JContainer;get_SortDirection;();summary;df-generated |
+| Newtonsoft.Json.Linq;JContainer;get_SortProperty;();summary;df-generated |
+| Newtonsoft.Json.Linq;JContainer;get_SupportsChangeNotification;();summary;df-generated |
+| Newtonsoft.Json.Linq;JContainer;get_SupportsSearching;();summary;df-generated |
+| Newtonsoft.Json.Linq;JContainer;get_SupportsSorting;();summary;df-generated |
+| Newtonsoft.Json.Linq;JContainer;remove_CollectionChanged;(System.Collections.Specialized.NotifyCollectionChangedEventHandler);summary;df-generated |
+| Newtonsoft.Json.Linq;JContainer;remove_ListChanged;(System.ComponentModel.ListChangedEventHandler);summary;df-generated |
+| Newtonsoft.Json.Linq;JEnumerable<T>;Equals;(Newtonsoft.Json.Linq.JEnumerable<T>);summary;df-generated |
+| Newtonsoft.Json.Linq;JObject;Contains;(System.Collections.Generic.KeyValuePair<System.String,Newtonsoft.Json.Linq.JToken>);summary;df-generated |
+| Newtonsoft.Json.Linq;JObject;ContainsKey;(System.String);summary;df-generated |
+| Newtonsoft.Json.Linq;JObject;GetAttributes;();summary;df-generated |
+| Newtonsoft.Json.Linq;JObject;GetClassName;();summary;df-generated |
+| Newtonsoft.Json.Linq;JObject;GetComponentName;();summary;df-generated |
+| Newtonsoft.Json.Linq;JObject;GetConverter;();summary;df-generated |
+| Newtonsoft.Json.Linq;JObject;GetDefaultEvent;();summary;df-generated |
+| Newtonsoft.Json.Linq;JObject;GetDefaultProperty;();summary;df-generated |
+| Newtonsoft.Json.Linq;JObject;GetEditor;(System.Type);summary;df-generated |
+| Newtonsoft.Json.Linq;JObject;GetEvents;();summary;df-generated |
+| Newtonsoft.Json.Linq;JObject;GetEvents;(System.Attribute[]);summary;df-generated |
+| Newtonsoft.Json.Linq;JObject;Remove;(System.Collections.Generic.KeyValuePair<System.String,Newtonsoft.Json.Linq.JToken>);summary;df-generated |
+| Newtonsoft.Json.Linq;JObject;Remove;(System.String);summary;df-generated |
+| Newtonsoft.Json.Linq;JObject;TryGetValue;(System.String,Newtonsoft.Json.Linq.JToken);summary;df-generated |
+| Newtonsoft.Json.Linq;JObject;add_PropertyChanged;(System.ComponentModel.PropertyChangedEventHandler);summary;df-generated |
+| Newtonsoft.Json.Linq;JObject;add_PropertyChanging;(System.ComponentModel.PropertyChangingEventHandler);summary;df-generated |
+| Newtonsoft.Json.Linq;JObject;get_IsReadOnly;();summary;df-generated |
+| Newtonsoft.Json.Linq;JObject;remove_PropertyChanged;(System.ComponentModel.PropertyChangedEventHandler);summary;df-generated |
+| Newtonsoft.Json.Linq;JObject;remove_PropertyChanging;(System.ComponentModel.PropertyChangingEventHandler);summary;df-generated |
+| Newtonsoft.Json.Linq;JPropertyDescriptor;CanResetValue;(System.Object);summary;df-generated |
+| Newtonsoft.Json.Linq;JPropertyDescriptor;ShouldSerializeValue;(System.Object);summary;df-generated |
+| Newtonsoft.Json.Linq;JPropertyDescriptor;get_ComponentType;();summary;df-generated |
+| Newtonsoft.Json.Linq;JPropertyDescriptor;get_IsReadOnly;();summary;df-generated |
+| Newtonsoft.Json.Linq;JPropertyDescriptor;get_NameHashCode;();summary;df-generated |
+| Newtonsoft.Json.Linq;JPropertyDescriptor;get_PropertyType;();summary;df-generated |
+| Newtonsoft.Json.Linq;JToken;GetMetaObject;(System.Linq.Expressions.Expression);summary;df-generated |
+| Newtonsoft.Json.Linq;JTokenEqualityComparer;Equals;(Newtonsoft.Json.Linq.JToken,Newtonsoft.Json.Linq.JToken);summary;df-generated |
+| Newtonsoft.Json.Linq;JTokenEqualityComparer;GetHashCode;(Newtonsoft.Json.Linq.JToken);summary;df-generated |
+| Newtonsoft.Json.Linq;JValue;CompareTo;(Newtonsoft.Json.Linq.JValue);summary;df-generated |
+| Newtonsoft.Json.Linq;JValue;CompareTo;(System.Object);summary;df-generated |
+| Newtonsoft.Json.Linq;JValue;Equals;(Newtonsoft.Json.Linq.JValue);summary;df-generated |
+| Newtonsoft.Json.Linq;JValue;GetTypeCode;();summary;df-generated |
+| Newtonsoft.Json.Linq;JValue;ToBoolean;(System.IFormatProvider);summary;df-generated |
+| Newtonsoft.Json.Linq;JValue;ToByte;(System.IFormatProvider);summary;df-generated |
+| Newtonsoft.Json.Linq;JValue;ToChar;(System.IFormatProvider);summary;df-generated |
+| Newtonsoft.Json.Linq;JValue;ToDouble;(System.IFormatProvider);summary;df-generated |
+| Newtonsoft.Json.Linq;JValue;ToInt16;(System.IFormatProvider);summary;df-generated |
+| Newtonsoft.Json.Linq;JValue;ToInt32;(System.IFormatProvider);summary;df-generated |
+| Newtonsoft.Json.Linq;JValue;ToInt64;(System.IFormatProvider);summary;df-generated |
+| Newtonsoft.Json.Linq;JValue;ToSByte;(System.IFormatProvider);summary;df-generated |
+| Newtonsoft.Json.Linq;JValue;ToSingle;(System.IFormatProvider);summary;df-generated |
+| Newtonsoft.Json.Linq;JValue;ToUInt16;(System.IFormatProvider);summary;df-generated |
+| Newtonsoft.Json.Linq;JValue;ToUInt32;(System.IFormatProvider);summary;df-generated |
+| Newtonsoft.Json.Linq;JValue;ToUInt64;(System.IFormatProvider);summary;df-generated |
+| Newtonsoft.Json.Serialization;DefaultSerializationBinder;BindToName;(System.Type,System.String,System.String);summary;df-generated |
+| Newtonsoft.Json.Serialization;DefaultSerializationBinder;BindToType;(System.String,System.String);summary;df-generated |
+| Newtonsoft.Json.Serialization;JsonPropertyCollection;GetKeyForItem;(Newtonsoft.Json.Serialization.JsonProperty);summary;df-generated |
+| Newtonsoft.Json;JsonReader;Dispose;();summary;df-generated |
+| Newtonsoft.Json;JsonWriter;Dispose;();summary;df-generated |
+| ServiceStack.AsyncEx;CancellationTokenTaskSource<T>;Dispose;();summary;df-generated |
+| ServiceStack.Caching;CacheClientWithPrefix;Dispose;();summary;df-generated |
+| ServiceStack.Caching;MemoryCacheClient;Dispose;();summary;df-generated |
+| ServiceStack.Caching;MultiCacheClient;Dispose;();summary;df-generated |
+| ServiceStack.Messaging;BackgroundMqClient;Dispose;();summary;df-generated |
+| ServiceStack.Messaging;BackgroundMqCollection<T>;Dispose;();summary;df-generated |
+| ServiceStack.Messaging;BackgroundMqMessageFactory;Dispose;();summary;df-generated |
+| ServiceStack.Messaging;BackgroundMqService;Dispose;();summary;df-generated |
+| ServiceStack.Messaging;BackgroundMqWorker;Dispose;();summary;df-generated |
+| ServiceStack.Messaging;InMemoryMessageQueueClient;Dispose;();summary;df-generated |
+| ServiceStack.Messaging;InMemoryTransientMessageFactory;Dispose;();summary;df-generated |
+| ServiceStack.Messaging;MessageHandler<T>;Dispose;();summary;df-generated |
+| ServiceStack.Messaging;MessageQueueClientFactory;Dispose;();summary;df-generated |
+| ServiceStack.Messaging;RedisMessageFactory;Dispose;();summary;df-generated |
+| ServiceStack.Messaging;RedisMessageProducer;Dispose;();summary;df-generated |
+| ServiceStack.Messaging;RedisMessageQueueClient;Dispose;();summary;df-generated |
+| ServiceStack.Messaging;RedisMessageQueueClientFactory;Dispose;();summary;df-generated |
+| ServiceStack.Messaging;TransientMessageServiceBase;Dispose;();summary;df-generated |
+| ServiceStack.MiniProfiler.Data;ProfiledCommand;Cancel;();summary;df-generated |
+| ServiceStack.MiniProfiler.Data;ProfiledCommand;CreateDbParameter;();summary;df-generated |
+| ServiceStack.MiniProfiler.Data;ProfiledCommand;Dispose;(System.Boolean);summary;df-generated |
+| ServiceStack.MiniProfiler.Data;ProfiledCommand;ExecuteNonQuery;();summary;df-generated |
+| ServiceStack.MiniProfiler.Data;ProfiledCommand;Prepare;();summary;df-generated |
+| ServiceStack.MiniProfiler.Data;ProfiledConnection;ChangeDatabase;(System.String);summary;df-generated |
+| ServiceStack.MiniProfiler.Data;ProfiledConnection;Close;();summary;df-generated |
+| ServiceStack.MiniProfiler.Data;ProfiledConnection;CreateDbCommand;();summary;df-generated |
+| ServiceStack.MiniProfiler.Data;ProfiledConnection;Dispose;(System.Boolean);summary;df-generated |
+| ServiceStack.MiniProfiler.Data;ProfiledConnection;Open;();summary;df-generated |
+| ServiceStack.MiniProfiler.Data;ProfiledConnection;get_CanRaiseEvents;();summary;df-generated |
+| ServiceStack.MiniProfiler.Data;ProfiledConnection;get_ConnectionTimeout;();summary;df-generated |
+| ServiceStack.MiniProfiler.Data;ProfiledConnection;get_DataSource;();summary;df-generated |
+| ServiceStack.MiniProfiler.Data;ProfiledConnection;get_Database;();summary;df-generated |
+| ServiceStack.MiniProfiler.Data;ProfiledConnection;get_State;();summary;df-generated |
+| ServiceStack.MiniProfiler.Data;ProfiledDbDataReader;Close;();summary;df-generated |
+| ServiceStack.MiniProfiler.Data;ProfiledDbDataReader;GetBoolean;(System.Int32);summary;df-generated |
+| ServiceStack.MiniProfiler.Data;ProfiledDbDataReader;GetByte;(System.Int32);summary;df-generated |
+| ServiceStack.MiniProfiler.Data;ProfiledDbDataReader;GetBytes;(System.Int32,System.Int64,System.Byte[],System.Int32,System.Int32);summary;df-generated |
+| ServiceStack.MiniProfiler.Data;ProfiledDbDataReader;GetChar;(System.Int32);summary;df-generated |
+| ServiceStack.MiniProfiler.Data;ProfiledDbDataReader;GetChars;(System.Int32,System.Int64,System.Char[],System.Int32,System.Int32);summary;df-generated |
+| ServiceStack.MiniProfiler.Data;ProfiledDbDataReader;GetDataTypeName;(System.Int32);summary;manual |
+| ServiceStack.MiniProfiler.Data;ProfiledDbDataReader;GetDateTime;(System.Int32);summary;df-generated |
+| ServiceStack.MiniProfiler.Data;ProfiledDbDataReader;GetDecimal;(System.Int32);summary;df-generated |
+| ServiceStack.MiniProfiler.Data;ProfiledDbDataReader;GetDouble;(System.Int32);summary;df-generated |
+| ServiceStack.MiniProfiler.Data;ProfiledDbDataReader;GetFieldType;(System.Int32);summary;df-generated |
+| ServiceStack.MiniProfiler.Data;ProfiledDbDataReader;GetFloat;(System.Int32);summary;df-generated |
+| ServiceStack.MiniProfiler.Data;ProfiledDbDataReader;GetGuid;(System.Int32);summary;manual |
+| ServiceStack.MiniProfiler.Data;ProfiledDbDataReader;GetInt16;(System.Int32);summary;df-generated |
+| ServiceStack.MiniProfiler.Data;ProfiledDbDataReader;GetInt32;(System.Int32);summary;df-generated |
+| ServiceStack.MiniProfiler.Data;ProfiledDbDataReader;GetInt64;(System.Int32);summary;df-generated |
+| ServiceStack.MiniProfiler.Data;ProfiledDbDataReader;GetName;(System.Int32);summary;manual |
+| ServiceStack.MiniProfiler.Data;ProfiledDbDataReader;GetOrdinal;(System.String);summary;df-generated |
+| ServiceStack.MiniProfiler.Data;ProfiledDbDataReader;IsDBNull;(System.Int32);summary;df-generated |
+| ServiceStack.MiniProfiler.Data;ProfiledDbDataReader;NextResult;();summary;df-generated |
+| ServiceStack.MiniProfiler.Data;ProfiledDbDataReader;Read;();summary;df-generated |
+| ServiceStack.MiniProfiler.Data;ProfiledDbDataReader;get_Depth;();summary;df-generated |
+| ServiceStack.MiniProfiler.Data;ProfiledDbDataReader;get_FieldCount;();summary;df-generated |
+| ServiceStack.MiniProfiler.Data;ProfiledDbDataReader;get_HasRows;();summary;df-generated |
+| ServiceStack.MiniProfiler.Data;ProfiledDbDataReader;get_IsClosed;();summary;df-generated |
+| ServiceStack.MiniProfiler.Data;ProfiledDbDataReader;get_RecordsAffected;();summary;df-generated |
+| ServiceStack.MiniProfiler.Data;ProfiledDbTransaction;Commit;();summary;df-generated |
+| ServiceStack.MiniProfiler.Data;ProfiledDbTransaction;Dispose;(System.Boolean);summary;df-generated |
+| ServiceStack.MiniProfiler.Data;ProfiledDbTransaction;Rollback;();summary;df-generated |
+| ServiceStack.MiniProfiler.Data;ProfiledDbTransaction;get_DbConnection;();summary;df-generated |
+| ServiceStack.MiniProfiler.Data;ProfiledDbTransaction;get_IsolationLevel;();summary;df-generated |
+| ServiceStack.MiniProfiler.Data;ProfiledProviderFactory;CreateCommand;();summary;df-generated |
+| ServiceStack.MiniProfiler.Data;ProfiledProviderFactory;CreateConnection;();summary;df-generated |
+| ServiceStack.MiniProfiler.Data;ProfiledProviderFactory;CreateConnectionStringBuilder;();summary;df-generated |
+| ServiceStack.MiniProfiler.Data;ProfiledProviderFactory;CreateParameter;();summary;df-generated |
+| ServiceStack.NetCore;NetCoreContainerAdapter;Dispose;();summary;df-generated |
+| ServiceStack.NetCore;NetCoreHeadersCollection;GetValues;(System.String);summary;df-generated |
+| ServiceStack.NetCore;NetCoreHeadersCollection;Remove;(System.String);summary;df-generated |
+| ServiceStack.NetCore;NetCoreHeadersCollection;get_Count;();summary;df-generated |
+| ServiceStack.NetCore;NetCoreQueryStringCollection;GetValues;(System.String);summary;df-generated |
+| ServiceStack.NetCore;NetCoreQueryStringCollection;Remove;(System.String);summary;df-generated |
+| ServiceStack.NetCore;NetCoreQueryStringCollection;get_Count;();summary;df-generated |
+| ServiceStack.OrmLite.Dapper;SqlMapper+GridReader;Dispose;();summary;df-generated |
+| ServiceStack.OrmLite.Dapper;SqlMapper+Identity;Equals;(ServiceStack.OrmLite.Dapper.SqlMapper+Identity);summary;df-generated |
+| ServiceStack.OrmLite;OrmLiteCommand;Cancel;();summary;df-generated |
+| ServiceStack.OrmLite;OrmLiteCommand;CreateParameter;();summary;df-generated |
+| ServiceStack.OrmLite;OrmLiteCommand;Dispose;();summary;df-generated |
+| ServiceStack.OrmLite;OrmLiteCommand;ExecuteNonQuery;();summary;df-generated |
+| ServiceStack.OrmLite;OrmLiteCommand;ExecuteReader;(System.Data.CommandBehavior);summary;df-generated |
+| ServiceStack.OrmLite;OrmLiteCommand;Prepare;();summary;df-generated |
+| ServiceStack.OrmLite;OrmLiteCommand;get_Parameters;();summary;df-generated |
+| ServiceStack.OrmLite;OrmLiteConnection;BeginTransaction;();summary;df-generated |
+| ServiceStack.OrmLite;OrmLiteConnection;BeginTransaction;(System.Data.IsolationLevel);summary;df-generated |
+| ServiceStack.OrmLite;OrmLiteConnection;ChangeDatabase;(System.String);summary;df-generated |
+| ServiceStack.OrmLite;OrmLiteConnection;Close;();summary;df-generated |
+| ServiceStack.OrmLite;OrmLiteConnection;CreateCommand;();summary;df-generated |
+| ServiceStack.OrmLite;OrmLiteConnection;Dispose;();summary;df-generated |
+| ServiceStack.OrmLite;OrmLiteConnection;Open;();summary;df-generated |
+| ServiceStack.OrmLite;OrmLiteConnection;get_ConnectionTimeout;();summary;df-generated |
+| ServiceStack.OrmLite;OrmLiteConnection;get_Database;();summary;df-generated |
+| ServiceStack.OrmLite;OrmLiteConnection;get_State;();summary;df-generated |
+| ServiceStack.OrmLite;OrmLiteDataParameter;get_IsNullable;();summary;df-generated |
+| ServiceStack.OrmLite;OrmLitePersistenceProvider;Dispose;();summary;df-generated |
+| ServiceStack.OrmLite;OrmLiteResultsFilter;Dispose;();summary;df-generated |
+| ServiceStack.OrmLite;OrmLiteSPStatement;Dispose;();summary;df-generated |
+| ServiceStack.OrmLite;OrmLiteTransaction;Commit;();summary;df-generated |
+| ServiceStack.OrmLite;OrmLiteTransaction;Dispose;();summary;df-generated |
+| ServiceStack.OrmLite;OrmLiteTransaction;Rollback;();summary;df-generated |
+| ServiceStack.OrmLite;OrmLiteTransaction;get_Connection;();summary;df-generated |
+| ServiceStack.OrmLite;OrmLiteTransaction;get_IsolationLevel;();summary;df-generated |
+| ServiceStack.Script;PageResult;Dispose;();summary;df-generated |
+| ServiceStack.Script;ScriptContext;Dispose;();summary;df-generated |
+| ServiceStack.Script;SharpCodePage;Dispose;();summary;df-generated |
+| ServiceStack.Serialization;XmlSerializerWrapper;IsStartObject;(System.Xml.XmlDictionaryReader);summary;df-generated |
+| ServiceStack.Serialization;XmlSerializerWrapper;WriteEndObject;(System.Xml.XmlDictionaryWriter);summary;df-generated |
+| ServiceStack.Serialization;XmlSerializerWrapper;WriteObject;(System.Xml.XmlDictionaryWriter,System.Object);summary;df-generated |
+| ServiceStack.Serialization;XmlSerializerWrapper;WriteObjectContent;(System.Xml.XmlDictionaryWriter,System.Object);summary;df-generated |
+| ServiceStack.Serialization;XmlSerializerWrapper;WriteStartObject;(System.Xml.XmlDictionaryWriter,System.Object);summary;df-generated |
+| ServiceStack.Text.Pools;PooledObject<T>;Dispose;();summary;df-generated |
+| ServiceStack.Text;DirectStreamWriter;Flush;();summary;df-generated |
+| ServiceStack.Text;DirectStreamWriter;Write;(System.Char);summary;df-generated |
+| ServiceStack.Text;JsConfigScope;Dispose;();summary;df-generated |
+| ServiceStack.Text;RecyclableMemoryStream;Close;();summary;df-generated |
+| ServiceStack.Text;RecyclableMemoryStream;Dispose;(System.Boolean);summary;df-generated |
+| ServiceStack.Text;RecyclableMemoryStream;ReadByte;();summary;df-generated |
+| ServiceStack.Text;RecyclableMemoryStream;Seek;(System.Int64,System.IO.SeekOrigin);summary;df-generated |
+| ServiceStack.Text;RecyclableMemoryStream;SetLength;(System.Int64);summary;df-generated |
+| ServiceStack.Text;RecyclableMemoryStream;Write;(System.ReadOnlySpan<System.Byte>);summary;df-generated |
+| ServiceStack.Text;RecyclableMemoryStream;WriteByte;(System.Byte);summary;df-generated |
+| ServiceStack.Text;RecyclableMemoryStream;get_CanRead;();summary;df-generated |
+| ServiceStack.Text;RecyclableMemoryStream;get_CanSeek;();summary;df-generated |
+| ServiceStack.Text;RecyclableMemoryStream;get_CanTimeout;();summary;df-generated |
+| ServiceStack.Text;RecyclableMemoryStream;get_CanWrite;();summary;df-generated |
+| ServiceStack.Text;RecyclableMemoryStream;get_Length;();summary;df-generated |
+| ServiceStack.Validation;ExecOnceOnly;Dispose;();summary;df-generated |
+| ServiceStack;AsyncTimer;Dispose;();summary;df-generated |
+| ServiceStack;AuthenticateAttribute;Equals;(System.Object);summary;df-generated |
+| ServiceStack;AuthenticateAttribute;GetHashCode;();summary;df-generated |
+| ServiceStack;ByteArrayComparer;Equals;(System.Byte[],System.Byte[]);summary;df-generated |
+| ServiceStack;ByteArrayComparer;GetHashCode;(System.Byte[]);summary;df-generated |
+| ServiceStack;CachedServiceClient;Dispose;();summary;df-generated |
+| ServiceStack;CookieHandler;SendAsync;(System.Net.Http.HttpRequestMessage,System.Threading.CancellationToken);summary;df-generated |
+| ServiceStack;Defer;Dispose;();summary;df-generated |
+| ServiceStack;DisposableTracker;Dispose;();summary;df-generated |
+| ServiceStack;DynamicJson;TryGetMember;(System.Dynamic.GetMemberBinder,System.Object);summary;df-generated |
+| ServiceStack;DynamicJson;TrySetMember;(System.Dynamic.SetMemberBinder,System.Object);summary;df-generated |
+| ServiceStack;EventSubscription;Dispose;();summary;df-generated |
+| ServiceStack;HttpResult;Dispose;();summary;df-generated |
+| ServiceStack;JsonApiClient;Dispose;();summary;df-generated |
+| ServiceStack;LispReplTcpServer;Dispose;();summary;df-generated |
+| ServiceStack;LogicBase;Dispose;();summary;df-generated |
+| ServiceStack;LongRange;Equals;(ServiceStack.LongRange);summary;df-generated |
+| ServiceStack;MemoryServerEvents;Dispose;();summary;df-generated |
+| ServiceStack;NameValue;Equals;(ServiceStack.NameValue);summary;df-generated |
+| ServiceStack;ProfilerDiagnosticObserver;OnCompleted;();summary;df-generated |
+| ServiceStack;ProfilerDiagnosticObserver;OnError;(System.Exception);summary;df-generated |
+| ServiceStack;ProfilerDiagnosticObserver;OnNext;(System.Collections.Generic.KeyValuePair<System.String,System.Object>);summary;df-generated |
+| ServiceStack;ProfilerDiagnosticObserver;OnNext;(System.Diagnostics.DiagnosticListener);summary;df-generated |
+| ServiceStack;QueryDataSource<T>;Dispose;();summary;df-generated |
+| ServiceStack;RepositoryBase;Dispose;();summary;df-generated |
+| ServiceStack;RequiredClaimAttribute;Equals;(System.Object);summary;df-generated |
+| ServiceStack;RequiredClaimAttribute;GetHashCode;();summary;df-generated |
+| ServiceStack;RequiredPermissionAttribute;Equals;(System.Object);summary;df-generated |
+| ServiceStack;RequiredPermissionAttribute;GetHashCode;();summary;df-generated |
+| ServiceStack;RequiredRoleAttribute;Equals;(System.Object);summary;df-generated |
+| ServiceStack;RequiredRoleAttribute;GetHashCode;();summary;df-generated |
+| ServiceStack;RouteAttribute;Equals;(System.Object);summary;df-generated |
+| ServiceStack;RouteAttribute;GetHashCode;();summary;df-generated |
+| ServiceStack;ServerEventsClient;Dispose;();summary;df-generated |
+| ServiceStack;Service;Dispose;();summary;df-generated |
+| ServiceStack;ServiceClientBase;Dispose;();summary;df-generated |
+| ServiceStack;ServiceStackCodePage;Dispose;();summary;df-generated |
+| ServiceStack;ServiceStackHost;Dispose;();summary;df-generated |
+| ServiceStack;ServiceStackProvider;Dispose;();summary;df-generated |
 | System.Buffers.Binary;BinaryPrimitives;ReadDoubleBigEndian;(System.ReadOnlySpan<System.Byte>);summary;df-generated |
 | System.Buffers.Binary;BinaryPrimitives;ReadDoubleLittleEndian;(System.ReadOnlySpan<System.Byte>);summary;df-generated |
 | System.Buffers.Binary;BinaryPrimitives;ReadHalfBigEndian;(System.ReadOnlySpan<System.Byte>);summary;df-generated |
@@ -22819,16 +24424,20 @@ neutral
 | System.Buffers;ArrayBufferWriter<T>;Advance;(System.Int32);summary;df-generated |
 | System.Buffers;ArrayBufferWriter<T>;ArrayBufferWriter;(System.Int32);summary;df-generated |
 | System.Buffers;ArrayBufferWriter<T>;Clear;();summary;df-generated |
+| System.Buffers;ArrayBufferWriter<T>;GetMemory;(System.Int32);summary;df-generated |
 | System.Buffers;ArrayBufferWriter<T>;GetSpan;(System.Int32);summary;df-generated |
 | System.Buffers;ArrayBufferWriter<T>;ResetWrittenCount;();summary;df-generated |
 | System.Buffers;ArrayBufferWriter<T>;get_Capacity;();summary;df-generated |
 | System.Buffers;ArrayBufferWriter<T>;get_FreeCapacity;();summary;df-generated |
 | System.Buffers;ArrayBufferWriter<T>;get_WrittenCount;();summary;df-generated |
+| System.Buffers;ArrayBufferWriter<T>;get_WrittenMemory;();summary;df-generated |
+| System.Buffers;ArrayBufferWriter<T>;get_WrittenSpan;();summary;df-generated |
 | System.Buffers;ArrayPool<T>;Create;();summary;df-generated |
 | System.Buffers;ArrayPool<T>;Create;(System.Int32,System.Int32);summary;df-generated |
 | System.Buffers;ArrayPool<T>;Rent;(System.Int32);summary;df-generated |
 | System.Buffers;ArrayPool<T>;Return;(T[],System.Boolean);summary;df-generated |
 | System.Buffers;ArrayPool<T>;get_Shared;();summary;df-generated |
+| System.Buffers;BuffersExtensions;PositionOf<T>;(System.Buffers.ReadOnlySequence<T>,T);summary;df-generated |
 | System.Buffers;BuffersExtensions;ToArray<T>;(System.Buffers.ReadOnlySequence<T>);summary;df-generated |
 | System.Buffers;BuffersExtensions;Write<T>;(System.Buffers.IBufferWriter<T>,System.ReadOnlySpan<T>);summary;df-generated |
 | System.Buffers;IBufferWriter<T>;Advance;(System.Int32);summary;df-generated |
@@ -22844,17 +24453,27 @@ neutral
 | System.Buffers;MemoryManager<T>;Pin;(System.Int32);summary;df-generated |
 | System.Buffers;MemoryManager<T>;TryGetArray;(System.ArraySegment<T>);summary;df-generated |
 | System.Buffers;MemoryManager<T>;Unpin;();summary;df-generated |
+| System.Buffers;MemoryManager<T>;get_Memory;();summary;df-generated |
 | System.Buffers;MemoryPool<T>;Dispose;();summary;df-generated |
 | System.Buffers;MemoryPool<T>;Dispose;(System.Boolean);summary;df-generated |
 | System.Buffers;MemoryPool<T>;Rent;(System.Int32);summary;df-generated |
 | System.Buffers;MemoryPool<T>;get_MaxBufferSize;();summary;df-generated |
 | System.Buffers;MemoryPool<T>;get_Shared;();summary;df-generated |
 | System.Buffers;ReadOnlySequence<T>+Enumerator;MoveNext;();summary;df-generated |
+| System.Buffers;ReadOnlySequence<T>;GetEnumerator;();summary;df-generated |
 | System.Buffers;ReadOnlySequence<T>;GetOffset;(System.SequencePosition);summary;df-generated |
+| System.Buffers;ReadOnlySequence<T>;GetPosition;(System.Int64);summary;df-generated |
+| System.Buffers;ReadOnlySequence<T>;GetPosition;(System.Int64,System.SequencePosition);summary;df-generated |
+| System.Buffers;ReadOnlySequence<T>;ReadOnlySequence;(System.ReadOnlyMemory<T>);summary;df-generated |
+| System.Buffers;ReadOnlySequence<T>;Slice;(System.Int32,System.Int32);summary;df-generated |
+| System.Buffers;ReadOnlySequence<T>;Slice;(System.Int64,System.Int64);summary;df-generated |
 | System.Buffers;ReadOnlySequence<T>;ToString;();summary;df-generated |
+| System.Buffers;ReadOnlySequence<T>;get_End;();summary;df-generated |
+| System.Buffers;ReadOnlySequence<T>;get_First;();summary;df-generated |
 | System.Buffers;ReadOnlySequence<T>;get_IsEmpty;();summary;df-generated |
 | System.Buffers;ReadOnlySequence<T>;get_IsSingleSegment;();summary;df-generated |
 | System.Buffers;ReadOnlySequence<T>;get_Length;();summary;df-generated |
+| System.Buffers;ReadOnlySequence<T>;get_Start;();summary;df-generated |
 | System.Buffers;SearchValues;Create;(System.ReadOnlySpan<System.Char>);summary;df-generated |
 | System.Buffers;SearchValues<T>;Contains;(T);summary;df-generated |
 | System.Buffers;SequenceReader<T>;Advance;(System.Int64);summary;df-generated |
@@ -22871,14 +24490,9 @@ neutral
 | System.Buffers;SequenceReader<T>;TryAdvanceToAny;(System.ReadOnlySpan<T>,System.Boolean);summary;df-generated |
 | System.Buffers;SequenceReader<T>;get_End;();summary;df-generated |
 | System.Buffers;SequenceReader<T>;get_Length;();summary;df-generated |
+| System.Buffers;SequenceReader<T>;get_Position;();summary;df-generated |
 | System.Buffers;SequenceReader<T>;get_Remaining;();summary;df-generated |
 | System.Buffers;SequenceReader<T>;get_Sequence;();summary;df-generated |
-| System.Buffers;SequenceReaderExtensions;TryReadBigEndian;(System.Buffers.SequenceReader<System.Byte>,System.Int16);summary;df-generated |
-| System.Buffers;SequenceReaderExtensions;TryReadBigEndian;(System.Buffers.SequenceReader<System.Byte>,System.Int32);summary;df-generated |
-| System.Buffers;SequenceReaderExtensions;TryReadBigEndian;(System.Buffers.SequenceReader<System.Byte>,System.Int64);summary;df-generated |
-| System.Buffers;SequenceReaderExtensions;TryReadLittleEndian;(System.Buffers.SequenceReader<System.Byte>,System.Int16);summary;df-generated |
-| System.Buffers;SequenceReaderExtensions;TryReadLittleEndian;(System.Buffers.SequenceReader<System.Byte>,System.Int32);summary;df-generated |
-| System.Buffers;SequenceReaderExtensions;TryReadLittleEndian;(System.Buffers.SequenceReader<System.Byte>,System.Int64);summary;df-generated |
 | System.Buffers;StandardFormat;Equals;(System.Buffers.StandardFormat);summary;df-generated |
 | System.Buffers;StandardFormat;Equals;(System.Object);summary;df-generated |
 | System.Buffers;StandardFormat;GetHashCode;();summary;df-generated |
@@ -22902,6 +24516,7 @@ neutral
 | System.CodeDom.Compiler;CodeCompiler;FromFileBatch;(System.CodeDom.Compiler.CompilerParameters,System.String[]);summary;df-generated |
 | System.CodeDom.Compiler;CodeCompiler;FromSource;(System.CodeDom.Compiler.CompilerParameters,System.String);summary;df-generated |
 | System.CodeDom.Compiler;CodeCompiler;FromSourceBatch;(System.CodeDom.Compiler.CompilerParameters,System.String[]);summary;df-generated |
+| System.CodeDom.Compiler;CodeCompiler;GetResponseFileCmdArgs;(System.CodeDom.Compiler.CompilerParameters,System.String);summary;df-generated |
 | System.CodeDom.Compiler;CodeCompiler;ProcessCompilerOutputLine;(System.CodeDom.Compiler.CompilerResults,System.String);summary;df-generated |
 | System.CodeDom.Compiler;CodeCompiler;get_CompilerName;();summary;df-generated |
 | System.CodeDom.Compiler;CodeCompiler;get_FileExtension;();summary;df-generated |
@@ -22921,19 +24536,32 @@ neutral
 | System.CodeDom.Compiler;CodeDomProvider;Supports;(System.CodeDom.Compiler.GeneratorSupport);summary;df-generated |
 | System.CodeDom.Compiler;CodeDomProvider;get_FileExtension;();summary;df-generated |
 | System.CodeDom.Compiler;CodeDomProvider;get_LanguageOptions;();summary;df-generated |
+| System.CodeDom.Compiler;CodeGenerator;GenerateArrayIndexerExpression;(System.CodeDom.CodeArrayIndexerExpression);summary;df-generated |
+| System.CodeDom.Compiler;CodeGenerator;GenerateAssignStatement;(System.CodeDom.CodeAssignStatement);summary;df-generated |
 | System.CodeDom.Compiler;CodeGenerator;GenerateAttributeDeclarationsEnd;(System.CodeDom.CodeAttributeDeclarationCollection);summary;df-generated |
 | System.CodeDom.Compiler;CodeGenerator;GenerateAttributeDeclarationsStart;(System.CodeDom.CodeAttributeDeclarationCollection);summary;df-generated |
 | System.CodeDom.Compiler;CodeGenerator;GenerateBaseReferenceExpression;(System.CodeDom.CodeBaseReferenceExpression);summary;df-generated |
 | System.CodeDom.Compiler;CodeGenerator;GenerateComment;(System.CodeDom.CodeComment);summary;df-generated |
 | System.CodeDom.Compiler;CodeGenerator;GenerateCommentStatement;(System.CodeDom.CodeCommentStatement);summary;df-generated |
 | System.CodeDom.Compiler;CodeGenerator;GenerateCommentStatements;(System.CodeDom.CodeCommentStatementCollection);summary;df-generated |
+| System.CodeDom.Compiler;CodeGenerator;GenerateConditionStatement;(System.CodeDom.CodeConditionStatement);summary;df-generated |
+| System.CodeDom.Compiler;CodeGenerator;GenerateConstructor;(System.CodeDom.CodeConstructor,System.CodeDom.CodeTypeDeclaration);summary;df-generated |
 | System.CodeDom.Compiler;CodeGenerator;GenerateDecimalValue;(System.Decimal);summary;df-generated |
 | System.CodeDom.Compiler;CodeGenerator;GenerateDoubleValue;(System.Double);summary;df-generated |
+| System.CodeDom.Compiler;CodeGenerator;GenerateEntryPointMethod;(System.CodeDom.CodeEntryPointMethod,System.CodeDom.CodeTypeDeclaration);summary;df-generated |
+| System.CodeDom.Compiler;CodeGenerator;GenerateExpressionStatement;(System.CodeDom.CodeExpressionStatement);summary;df-generated |
+| System.CodeDom.Compiler;CodeGenerator;GenerateGotoStatement;(System.CodeDom.CodeGotoStatement);summary;df-generated |
+| System.CodeDom.Compiler;CodeGenerator;GenerateIndexerExpression;(System.CodeDom.CodeIndexerExpression);summary;df-generated |
+| System.CodeDom.Compiler;CodeGenerator;GenerateIterationStatement;(System.CodeDom.CodeIterationStatement);summary;df-generated |
 | System.CodeDom.Compiler;CodeGenerator;GenerateLinePragmaEnd;(System.CodeDom.CodeLinePragma);summary;df-generated |
+| System.CodeDom.Compiler;CodeGenerator;GenerateMethodReturnStatement;(System.CodeDom.CodeMethodReturnStatement);summary;df-generated |
 | System.CodeDom.Compiler;CodeGenerator;GenerateNamespaceEnd;(System.CodeDom.CodeNamespace);summary;df-generated |
 | System.CodeDom.Compiler;CodeGenerator;GeneratePropertySetValueReferenceExpression;(System.CodeDom.CodePropertySetValueReferenceExpression);summary;df-generated |
 | System.CodeDom.Compiler;CodeGenerator;GenerateSingleFloatValue;(System.Single);summary;df-generated |
+| System.CodeDom.Compiler;CodeGenerator;GenerateSnippetStatement;(System.CodeDom.CodeSnippetStatement);summary;df-generated |
 | System.CodeDom.Compiler;CodeGenerator;GenerateThisReferenceExpression;(System.CodeDom.CodeThisReferenceExpression);summary;df-generated |
+| System.CodeDom.Compiler;CodeGenerator;GenerateThrowExceptionStatement;(System.CodeDom.CodeThrowExceptionStatement);summary;df-generated |
+| System.CodeDom.Compiler;CodeGenerator;GenerateTypeConstructor;(System.CodeDom.CodeTypeConstructor);summary;df-generated |
 | System.CodeDom.Compiler;CodeGenerator;GenerateTypeEnd;(System.CodeDom.CodeTypeDeclaration);summary;df-generated |
 | System.CodeDom.Compiler;CodeGenerator;IsValidIdentifier;(System.String);summary;df-generated |
 | System.CodeDom.Compiler;CodeGenerator;IsValidLanguageIndependentIdentifier;(System.String);summary;df-generated |
@@ -22957,6 +24585,7 @@ neutral
 | System.CodeDom.Compiler;CompilerError;CompilerError;(System.String,System.Int32,System.Int32,System.String,System.String);summary;df-generated |
 | System.CodeDom.Compiler;CompilerErrorCollection;Contains;(System.CodeDom.Compiler.CompilerError);summary;df-generated |
 | System.CodeDom.Compiler;CompilerErrorCollection;IndexOf;(System.CodeDom.Compiler.CompilerError);summary;df-generated |
+| System.CodeDom.Compiler;CompilerErrorCollection;Remove;(System.CodeDom.Compiler.CompilerError);summary;df-generated |
 | System.CodeDom.Compiler;CompilerErrorCollection;get_HasErrors;();summary;df-generated |
 | System.CodeDom.Compiler;CompilerErrorCollection;get_HasWarnings;();summary;df-generated |
 | System.CodeDom.Compiler;CompilerInfo;CreateDefaultCompilerParameters;();summary;df-generated |
@@ -23009,101 +24638,153 @@ neutral
 | System.CodeDom.Compiler;TempFileCollection;TempFileCollection;(System.String);summary;df-generated |
 | System.CodeDom.Compiler;TempFileCollection;get_Count;();summary;df-generated |
 | System.CodeDom.Compiler;TempFileCollection;get_IsSynchronized;();summary;df-generated |
+| System.CodeDom;CodeArrayCreateExpression;CodeArrayCreateExpression;(System.String,System.CodeDom.CodeExpression);summary;df-generated |
+| System.CodeDom;CodeArrayCreateExpression;CodeArrayCreateExpression;(System.String,System.CodeDom.CodeExpression[]);summary;df-generated |
+| System.CodeDom;CodeArrayCreateExpression;CodeArrayCreateExpression;(System.String,System.Int32);summary;df-generated |
 | System.CodeDom;CodeArrayCreateExpression;CodeArrayCreateExpression;(System.Type,System.CodeDom.CodeExpression);summary;df-generated |
+| System.CodeDom;CodeArrayCreateExpression;CodeArrayCreateExpression;(System.Type,System.CodeDom.CodeExpression[]);summary;df-generated |
 | System.CodeDom;CodeArrayCreateExpression;CodeArrayCreateExpression;(System.Type,System.Int32);summary;df-generated |
+| System.CodeDom;CodeArrayIndexerExpression;CodeArrayIndexerExpression;(System.CodeDom.CodeExpression,System.CodeDom.CodeExpression[]);summary;df-generated |
 | System.CodeDom;CodeArrayIndexerExpression;get_Indices;();summary;df-generated |
 | System.CodeDom;CodeAssignStatement;CodeAssignStatement;(System.CodeDom.CodeExpression,System.CodeDom.CodeExpression);summary;df-generated |
 | System.CodeDom;CodeAttachEventStatement;CodeAttachEventStatement;(System.CodeDom.CodeExpression,System.String,System.CodeDom.CodeExpression);summary;df-generated |
 | System.CodeDom;CodeAttributeArgument;CodeAttributeArgument;(System.CodeDom.CodeExpression);summary;df-generated |
 | System.CodeDom;CodeAttributeArgumentCollection;Contains;(System.CodeDom.CodeAttributeArgument);summary;df-generated |
 | System.CodeDom;CodeAttributeArgumentCollection;IndexOf;(System.CodeDom.CodeAttributeArgument);summary;df-generated |
+| System.CodeDom;CodeAttributeArgumentCollection;Remove;(System.CodeDom.CodeAttributeArgument);summary;df-generated |
 | System.CodeDom;CodeAttributeDeclaration;CodeAttributeDeclaration;(System.CodeDom.CodeTypeReference);summary;df-generated |
 | System.CodeDom;CodeAttributeDeclarationCollection;Contains;(System.CodeDom.CodeAttributeDeclaration);summary;df-generated |
 | System.CodeDom;CodeAttributeDeclarationCollection;IndexOf;(System.CodeDom.CodeAttributeDeclaration);summary;df-generated |
+| System.CodeDom;CodeAttributeDeclarationCollection;Remove;(System.CodeDom.CodeAttributeDeclaration);summary;df-generated |
 | System.CodeDom;CodeBinaryOperatorExpression;CodeBinaryOperatorExpression;(System.CodeDom.CodeExpression,System.CodeDom.CodeBinaryOperatorType,System.CodeDom.CodeExpression);summary;df-generated |
+| System.CodeDom;CodeCastExpression;CodeCastExpression;(System.String,System.CodeDom.CodeExpression);summary;df-generated |
 | System.CodeDom;CodeCastExpression;CodeCastExpression;(System.Type,System.CodeDom.CodeExpression);summary;df-generated |
 | System.CodeDom;CodeCatchClause;get_Statements;();summary;df-generated |
 | System.CodeDom;CodeCatchClauseCollection;Contains;(System.CodeDom.CodeCatchClause);summary;df-generated |
 | System.CodeDom;CodeCatchClauseCollection;IndexOf;(System.CodeDom.CodeCatchClause);summary;df-generated |
+| System.CodeDom;CodeCatchClauseCollection;Remove;(System.CodeDom.CodeCatchClause);summary;df-generated |
 | System.CodeDom;CodeCommentStatement;CodeCommentStatement;(System.CodeDom.CodeComment);summary;df-generated |
 | System.CodeDom;CodeCommentStatement;CodeCommentStatement;(System.String);summary;df-generated |
 | System.CodeDom;CodeCommentStatement;CodeCommentStatement;(System.String,System.Boolean);summary;df-generated |
 | System.CodeDom;CodeCommentStatementCollection;Contains;(System.CodeDom.CodeCommentStatement);summary;df-generated |
 | System.CodeDom;CodeCommentStatementCollection;IndexOf;(System.CodeDom.CodeCommentStatement);summary;df-generated |
+| System.CodeDom;CodeCommentStatementCollection;Remove;(System.CodeDom.CodeCommentStatement);summary;df-generated |
 | System.CodeDom;CodeCompileUnit;get_AssemblyCustomAttributes;();summary;df-generated |
 | System.CodeDom;CodeCompileUnit;get_EndDirectives;();summary;df-generated |
 | System.CodeDom;CodeCompileUnit;get_Namespaces;();summary;df-generated |
 | System.CodeDom;CodeCompileUnit;get_ReferencedAssemblies;();summary;df-generated |
 | System.CodeDom;CodeCompileUnit;get_StartDirectives;();summary;df-generated |
+| System.CodeDom;CodeConditionStatement;CodeConditionStatement;(System.CodeDom.CodeExpression,System.CodeDom.CodeStatement[]);summary;df-generated |
+| System.CodeDom;CodeConditionStatement;CodeConditionStatement;(System.CodeDom.CodeExpression,System.CodeDom.CodeStatement[],System.CodeDom.CodeStatement[]);summary;df-generated |
 | System.CodeDom;CodeConditionStatement;get_FalseStatements;();summary;df-generated |
 | System.CodeDom;CodeConditionStatement;get_TrueStatements;();summary;df-generated |
 | System.CodeDom;CodeConstructor;get_BaseConstructorArgs;();summary;df-generated |
 | System.CodeDom;CodeConstructor;get_ChainedConstructorArgs;();summary;df-generated |
 | System.CodeDom;CodeDelegateInvokeExpression;CodeDelegateInvokeExpression;(System.CodeDom.CodeExpression);summary;df-generated |
+| System.CodeDom;CodeDelegateInvokeExpression;CodeDelegateInvokeExpression;(System.CodeDom.CodeExpression,System.CodeDom.CodeExpression[]);summary;df-generated |
 | System.CodeDom;CodeDelegateInvokeExpression;get_Parameters;();summary;df-generated |
 | System.CodeDom;CodeDirectionExpression;CodeDirectionExpression;(System.CodeDom.FieldDirection,System.CodeDom.CodeExpression);summary;df-generated |
 | System.CodeDom;CodeDirectiveCollection;Contains;(System.CodeDom.CodeDirective);summary;df-generated |
 | System.CodeDom;CodeDirectiveCollection;IndexOf;(System.CodeDom.CodeDirective);summary;df-generated |
+| System.CodeDom;CodeDirectiveCollection;Remove;(System.CodeDom.CodeDirective);summary;df-generated |
 | System.CodeDom;CodeExpressionCollection;Contains;(System.CodeDom.CodeExpression);summary;df-generated |
 | System.CodeDom;CodeExpressionCollection;IndexOf;(System.CodeDom.CodeExpression);summary;df-generated |
+| System.CodeDom;CodeExpressionCollection;Remove;(System.CodeDom.CodeExpression);summary;df-generated |
 | System.CodeDom;CodeExpressionStatement;CodeExpressionStatement;(System.CodeDom.CodeExpression);summary;df-generated |
+| System.CodeDom;CodeIndexerExpression;CodeIndexerExpression;(System.CodeDom.CodeExpression,System.CodeDom.CodeExpression[]);summary;df-generated |
 | System.CodeDom;CodeIndexerExpression;get_Indices;();summary;df-generated |
+| System.CodeDom;CodeIterationStatement;CodeIterationStatement;(System.CodeDom.CodeStatement,System.CodeDom.CodeExpression,System.CodeDom.CodeStatement,System.CodeDom.CodeStatement[]);summary;df-generated |
 | System.CodeDom;CodeIterationStatement;get_Statements;();summary;df-generated |
 | System.CodeDom;CodeMemberEvent;get_ImplementationTypes;();summary;df-generated |
+| System.CodeDom;CodeMemberMethod;add_PopulateImplementationTypes;(System.EventHandler);summary;df-generated |
+| System.CodeDom;CodeMemberMethod;add_PopulateParameters;(System.EventHandler);summary;df-generated |
+| System.CodeDom;CodeMemberMethod;add_PopulateStatements;(System.EventHandler);summary;df-generated |
 | System.CodeDom;CodeMemberMethod;get_ReturnTypeCustomAttributes;();summary;df-generated |
 | System.CodeDom;CodeMemberMethod;get_TypeParameters;();summary;df-generated |
+| System.CodeDom;CodeMemberMethod;remove_PopulateImplementationTypes;(System.EventHandler);summary;df-generated |
+| System.CodeDom;CodeMemberMethod;remove_PopulateParameters;(System.EventHandler);summary;df-generated |
+| System.CodeDom;CodeMemberMethod;remove_PopulateStatements;(System.EventHandler);summary;df-generated |
 | System.CodeDom;CodeMemberProperty;get_GetStatements;();summary;df-generated |
 | System.CodeDom;CodeMemberProperty;get_ImplementationTypes;();summary;df-generated |
 | System.CodeDom;CodeMemberProperty;get_Parameters;();summary;df-generated |
 | System.CodeDom;CodeMemberProperty;get_SetStatements;();summary;df-generated |
+| System.CodeDom;CodeMethodInvokeExpression;CodeMethodInvokeExpression;(System.CodeDom.CodeExpression,System.String,System.CodeDom.CodeExpression[]);summary;df-generated |
 | System.CodeDom;CodeMethodInvokeExpression;get_Parameters;();summary;df-generated |
 | System.CodeDom;CodeMethodReferenceExpression;get_TypeArguments;();summary;df-generated |
 | System.CodeDom;CodeMethodReturnStatement;CodeMethodReturnStatement;(System.CodeDom.CodeExpression);summary;df-generated |
+| System.CodeDom;CodeNamespace;add_PopulateComments;(System.EventHandler);summary;df-generated |
+| System.CodeDom;CodeNamespace;add_PopulateImports;(System.EventHandler);summary;df-generated |
+| System.CodeDom;CodeNamespace;add_PopulateTypes;(System.EventHandler);summary;df-generated |
+| System.CodeDom;CodeNamespace;remove_PopulateComments;(System.EventHandler);summary;df-generated |
+| System.CodeDom;CodeNamespace;remove_PopulateImports;(System.EventHandler);summary;df-generated |
+| System.CodeDom;CodeNamespace;remove_PopulateTypes;(System.EventHandler);summary;df-generated |
 | System.CodeDom;CodeNamespaceCollection;Contains;(System.CodeDom.CodeNamespace);summary;df-generated |
 | System.CodeDom;CodeNamespaceCollection;IndexOf;(System.CodeDom.CodeNamespace);summary;df-generated |
+| System.CodeDom;CodeNamespaceCollection;Remove;(System.CodeDom.CodeNamespace);summary;df-generated |
 | System.CodeDom;CodeNamespaceImportCollection;Contains;(System.Object);summary;df-generated |
 | System.CodeDom;CodeNamespaceImportCollection;IndexOf;(System.Object);summary;df-generated |
+| System.CodeDom;CodeNamespaceImportCollection;Remove;(System.Object);summary;df-generated |
 | System.CodeDom;CodeNamespaceImportCollection;RemoveAt;(System.Int32);summary;df-generated |
 | System.CodeDom;CodeNamespaceImportCollection;get_Count;();summary;df-generated |
 | System.CodeDom;CodeNamespaceImportCollection;get_IsFixedSize;();summary;df-generated |
 | System.CodeDom;CodeNamespaceImportCollection;get_IsReadOnly;();summary;df-generated |
 | System.CodeDom;CodeNamespaceImportCollection;get_IsSynchronized;();summary;df-generated |
 | System.CodeDom;CodeObject;get_UserData;();summary;df-generated |
+| System.CodeDom;CodeObjectCreateExpression;CodeObjectCreateExpression;(System.String,System.CodeDom.CodeExpression[]);summary;df-generated |
+| System.CodeDom;CodeObjectCreateExpression;CodeObjectCreateExpression;(System.Type,System.CodeDom.CodeExpression[]);summary;df-generated |
 | System.CodeDom;CodeObjectCreateExpression;get_Parameters;();summary;df-generated |
 | System.CodeDom;CodeParameterDeclarationExpressionCollection;Contains;(System.CodeDom.CodeParameterDeclarationExpression);summary;df-generated |
 | System.CodeDom;CodeParameterDeclarationExpressionCollection;IndexOf;(System.CodeDom.CodeParameterDeclarationExpression);summary;df-generated |
+| System.CodeDom;CodeParameterDeclarationExpressionCollection;Remove;(System.CodeDom.CodeParameterDeclarationExpression);summary;df-generated |
 | System.CodeDom;CodePrimitiveExpression;CodePrimitiveExpression;(System.Object);summary;df-generated |
+| System.CodeDom;CodeRemoveEventStatement;CodeRemoveEventStatement;(System.CodeDom.CodeExpression,System.String,System.CodeDom.CodeExpression);summary;df-generated |
 | System.CodeDom;CodeStatement;get_EndDirectives;();summary;df-generated |
 | System.CodeDom;CodeStatement;get_StartDirectives;();summary;df-generated |
 | System.CodeDom;CodeStatementCollection;Add;(System.CodeDom.CodeExpression);summary;df-generated |
 | System.CodeDom;CodeStatementCollection;Contains;(System.CodeDom.CodeStatement);summary;df-generated |
 | System.CodeDom;CodeStatementCollection;IndexOf;(System.CodeDom.CodeStatement);summary;df-generated |
+| System.CodeDom;CodeStatementCollection;Remove;(System.CodeDom.CodeStatement);summary;df-generated |
 | System.CodeDom;CodeThrowExceptionStatement;CodeThrowExceptionStatement;(System.CodeDom.CodeExpression);summary;df-generated |
+| System.CodeDom;CodeTryCatchFinallyStatement;CodeTryCatchFinallyStatement;(System.CodeDom.CodeStatement[],System.CodeDom.CodeCatchClause[]);summary;df-generated |
+| System.CodeDom;CodeTryCatchFinallyStatement;CodeTryCatchFinallyStatement;(System.CodeDom.CodeStatement[],System.CodeDom.CodeCatchClause[],System.CodeDom.CodeStatement[]);summary;df-generated |
 | System.CodeDom;CodeTryCatchFinallyStatement;get_CatchClauses;();summary;df-generated |
 | System.CodeDom;CodeTryCatchFinallyStatement;get_FinallyStatements;();summary;df-generated |
 | System.CodeDom;CodeTryCatchFinallyStatement;get_TryStatements;();summary;df-generated |
+| System.CodeDom;CodeTypeDeclaration;add_PopulateBaseTypes;(System.EventHandler);summary;df-generated |
+| System.CodeDom;CodeTypeDeclaration;add_PopulateMembers;(System.EventHandler);summary;df-generated |
 | System.CodeDom;CodeTypeDeclaration;get_TypeParameters;();summary;df-generated |
+| System.CodeDom;CodeTypeDeclaration;remove_PopulateBaseTypes;(System.EventHandler);summary;df-generated |
+| System.CodeDom;CodeTypeDeclaration;remove_PopulateMembers;(System.EventHandler);summary;df-generated |
 | System.CodeDom;CodeTypeDeclarationCollection;Contains;(System.CodeDom.CodeTypeDeclaration);summary;df-generated |
 | System.CodeDom;CodeTypeDeclarationCollection;IndexOf;(System.CodeDom.CodeTypeDeclaration);summary;df-generated |
+| System.CodeDom;CodeTypeDeclarationCollection;Remove;(System.CodeDom.CodeTypeDeclaration);summary;df-generated |
 | System.CodeDom;CodeTypeDelegate;get_Parameters;();summary;df-generated |
 | System.CodeDom;CodeTypeMember;get_Comments;();summary;df-generated |
 | System.CodeDom;CodeTypeMember;get_EndDirectives;();summary;df-generated |
 | System.CodeDom;CodeTypeMember;get_StartDirectives;();summary;df-generated |
 | System.CodeDom;CodeTypeMemberCollection;Contains;(System.CodeDom.CodeTypeMember);summary;df-generated |
 | System.CodeDom;CodeTypeMemberCollection;IndexOf;(System.CodeDom.CodeTypeMember);summary;df-generated |
+| System.CodeDom;CodeTypeMemberCollection;Remove;(System.CodeDom.CodeTypeMember);summary;df-generated |
+| System.CodeDom;CodeTypeOfExpression;CodeTypeOfExpression;(System.String);summary;df-generated |
 | System.CodeDom;CodeTypeOfExpression;CodeTypeOfExpression;(System.Type);summary;df-generated |
 | System.CodeDom;CodeTypeParameter;get_Constraints;();summary;df-generated |
 | System.CodeDom;CodeTypeParameter;get_CustomAttributes;();summary;df-generated |
+| System.CodeDom;CodeTypeParameterCollection;Add;(System.String);summary;df-generated |
 | System.CodeDom;CodeTypeParameterCollection;Contains;(System.CodeDom.CodeTypeParameter);summary;df-generated |
 | System.CodeDom;CodeTypeParameterCollection;IndexOf;(System.CodeDom.CodeTypeParameter);summary;df-generated |
+| System.CodeDom;CodeTypeParameterCollection;Remove;(System.CodeDom.CodeTypeParameter);summary;df-generated |
 | System.CodeDom;CodeTypeReference;CodeTypeReference;(System.CodeDom.CodeTypeParameter);summary;df-generated |
 | System.CodeDom;CodeTypeReference;CodeTypeReference;(System.CodeDom.CodeTypeReference,System.Int32);summary;df-generated |
+| System.CodeDom;CodeTypeReference;CodeTypeReference;(System.String,System.CodeDom.CodeTypeReference[]);summary;df-generated |
 | System.CodeDom;CodeTypeReference;CodeTypeReference;(System.String,System.Int32);summary;df-generated |
 | System.CodeDom;CodeTypeReference;CodeTypeReference;(System.Type);summary;df-generated |
 | System.CodeDom;CodeTypeReference;CodeTypeReference;(System.Type,System.CodeDom.CodeTypeReferenceOptions);summary;df-generated |
+| System.CodeDom;CodeTypeReferenceCollection;Add;(System.String);summary;df-generated |
 | System.CodeDom;CodeTypeReferenceCollection;Add;(System.Type);summary;df-generated |
 | System.CodeDom;CodeTypeReferenceCollection;Contains;(System.CodeDom.CodeTypeReference);summary;df-generated |
 | System.CodeDom;CodeTypeReferenceCollection;IndexOf;(System.CodeDom.CodeTypeReference);summary;df-generated |
+| System.CodeDom;CodeTypeReferenceCollection;Remove;(System.CodeDom.CodeTypeReference);summary;df-generated |
+| System.CodeDom;CodeTypeReferenceExpression;CodeTypeReferenceExpression;(System.String);summary;df-generated |
 | System.CodeDom;CodeTypeReferenceExpression;CodeTypeReferenceExpression;(System.Type);summary;df-generated |
 | System.Collections.Concurrent;BlockingCollection<T>;AddToAny;(System.Collections.Concurrent.BlockingCollection<T>[],T);summary;df-generated |
 | System.Collections.Concurrent;BlockingCollection<T>;AddToAny;(System.Collections.Concurrent.BlockingCollection<T>[],T,System.Threading.CancellationToken);summary;df-generated |
@@ -23136,6 +24817,9 @@ neutral
 | System.Collections.Concurrent;BlockingCollection<T>;get_IsCompleted;();summary;df-generated |
 | System.Collections.Concurrent;BlockingCollection<T>;get_IsSynchronized;();summary;df-generated |
 | System.Collections.Concurrent;ConcurrentBag<T>;ConcurrentBag;(System.Collections.Generic.IEnumerable<T>);summary;df-generated |
+| System.Collections.Concurrent;ConcurrentBag<T>;ToArray;();summary;df-generated |
+| System.Collections.Concurrent;ConcurrentBag<T>;TryAdd;(T);summary;df-generated |
+| System.Collections.Concurrent;ConcurrentBag<T>;TryTake;(T);summary;df-generated |
 | System.Collections.Concurrent;ConcurrentBag<T>;get_Count;();summary;df-generated |
 | System.Collections.Concurrent;ConcurrentBag<T>;get_IsEmpty;();summary;df-generated |
 | System.Collections.Concurrent;ConcurrentBag<T>;get_IsSynchronized;();summary;df-generated |
@@ -23159,6 +24843,9 @@ neutral
 | System.Collections.Concurrent;ConcurrentDictionary<TKey,TValue>;get_IsFixedSize;();summary;df-generated |
 | System.Collections.Concurrent;ConcurrentDictionary<TKey,TValue>;get_IsReadOnly;();summary;df-generated |
 | System.Collections.Concurrent;ConcurrentDictionary<TKey,TValue>;get_IsSynchronized;();summary;df-generated |
+| System.Collections.Concurrent;ConcurrentDictionary<TKey,TValue>;get_Item;(TKey);summary;df-generated |
+| System.Collections.Concurrent;ConcurrentDictionary<TKey,TValue>;get_Keys;();summary;df-generated |
+| System.Collections.Concurrent;ConcurrentDictionary<TKey,TValue>;get_Values;();summary;df-generated |
 | System.Collections.Concurrent;ConcurrentQueue<T>;ConcurrentQueue;(System.Collections.Generic.IEnumerable<T>);summary;df-generated |
 | System.Collections.Concurrent;ConcurrentQueue<T>;Enqueue;(T);summary;df-generated |
 | System.Collections.Concurrent;ConcurrentQueue<T>;ToArray;();summary;df-generated |
@@ -23174,6 +24861,7 @@ neutral
 | System.Collections.Concurrent;ConcurrentStack<T>;PushRange;(T[],System.Int32,System.Int32);summary;df-generated |
 | System.Collections.Concurrent;ConcurrentStack<T>;ToArray;();summary;df-generated |
 | System.Collections.Concurrent;ConcurrentStack<T>;TryAdd;(T);summary;df-generated |
+| System.Collections.Concurrent;ConcurrentStack<T>;TryTake;(T);summary;df-generated |
 | System.Collections.Concurrent;ConcurrentStack<T>;get_Count;();summary;df-generated |
 | System.Collections.Concurrent;ConcurrentStack<T>;get_IsEmpty;();summary;df-generated |
 | System.Collections.Concurrent;ConcurrentStack<T>;get_IsSynchronized;();summary;df-generated |
@@ -23192,9 +24880,12 @@ neutral
 | System.Collections.Concurrent;Partitioner<TSource>;GetDynamicPartitions;();summary;df-generated |
 | System.Collections.Concurrent;Partitioner<TSource>;GetPartitions;(System.Int32);summary;df-generated |
 | System.Collections.Concurrent;Partitioner<TSource>;get_SupportsDynamicPartitions;();summary;df-generated |
+| System.Collections.Frozen;FrozenDictionary;ToFrozenDictionary<TSource,TKey,TElement>;(System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,TKey>,System.Func<TSource,TElement>,System.Collections.Generic.IEqualityComparer<TKey>);summary;df-generated |
+| System.Collections.Frozen;FrozenDictionary;ToFrozenDictionary<TSource,TKey>;(System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,TKey>,System.Collections.Generic.IEqualityComparer<TKey>);summary;df-generated |
 | System.Collections.Frozen;FrozenDictionary<TKey,TValue>+Enumerator;Dispose;();summary;df-generated |
 | System.Collections.Frozen;FrozenDictionary<TKey,TValue>+Enumerator;MoveNext;();summary;df-generated |
 | System.Collections.Frozen;FrozenDictionary<TKey,TValue>+Enumerator;Reset;();summary;df-generated |
+| System.Collections.Frozen;FrozenDictionary<TKey,TValue>+Enumerator;get_Current;();summary;df-generated |
 | System.Collections.Frozen;FrozenDictionary<TKey,TValue>;Contains;(System.Collections.Generic.KeyValuePair<TKey,TValue>);summary;df-generated |
 | System.Collections.Frozen;FrozenDictionary<TKey,TValue>;Contains;(System.Object);summary;df-generated |
 | System.Collections.Frozen;FrozenDictionary<TKey,TValue>;ContainsKey;(TKey);summary;df-generated |
@@ -23212,9 +24903,12 @@ neutral
 | System.Collections.Frozen;FrozenDictionary<TKey,TValue>;get_IsReadOnly;();summary;df-generated |
 | System.Collections.Frozen;FrozenDictionary<TKey,TValue>;get_IsSynchronized;();summary;df-generated |
 | System.Collections.Frozen;FrozenDictionary<TKey,TValue>;get_Item;(TKey);summary;df-generated |
+| System.Collections.Frozen;FrozenDictionary<TKey,TValue>;get_Keys;();summary;df-generated |
+| System.Collections.Frozen;FrozenDictionary<TKey,TValue>;get_Values;();summary;df-generated |
 | System.Collections.Frozen;FrozenSet<T>+Enumerator;Dispose;();summary;df-generated |
 | System.Collections.Frozen;FrozenSet<T>+Enumerator;MoveNext;();summary;df-generated |
 | System.Collections.Frozen;FrozenSet<T>+Enumerator;Reset;();summary;df-generated |
+| System.Collections.Frozen;FrozenSet<T>+Enumerator;get_Current;();summary;df-generated |
 | System.Collections.Frozen;FrozenSet<T>;Contains;(T);summary;df-generated |
 | System.Collections.Frozen;FrozenSet<T>;ExceptWith;(System.Collections.Generic.IEnumerable<T>);summary;df-generated |
 | System.Collections.Frozen;FrozenSet<T>;GetEnumerator;();summary;df-generated |
@@ -23234,16 +24928,19 @@ neutral
 | System.Collections.Frozen;FrozenSet<T>;get_IsReadOnly;();summary;df-generated |
 | System.Collections.Frozen;FrozenSet<T>;get_IsSynchronized;();summary;df-generated |
 | System.Collections.Generic;CollectionExtensions;AddRange<T>;(System.Collections.Generic.List<T>,System.ReadOnlySpan<T>);summary;df-generated |
+| System.Collections.Generic;CollectionExtensions;GetValueOrDefault<TKey,TValue>;(System.Collections.Generic.IReadOnlyDictionary<TKey,TValue>,TKey);summary;df-generated |
 | System.Collections.Generic;CollectionExtensions;InsertRange<T>;(System.Collections.Generic.List<T>,System.Int32,System.ReadOnlySpan<T>);summary;df-generated |
-| System.Collections.Generic;Comparer<T>;Compare;(System.Object,System.Object);summary;df-generated |
 | System.Collections.Generic;Comparer<T>;Compare;(T,T);summary;df-generated |
+| System.Collections.Generic;Comparer<T>;Create;(System.Comparison<T>);summary;df-generated |
 | System.Collections.Generic;Comparer<T>;get_Default;();summary;df-generated |
 | System.Collections.Generic;Dictionary<TKey,TValue>+Enumerator;Dispose;();summary;df-generated |
 | System.Collections.Generic;Dictionary<TKey,TValue>+Enumerator;MoveNext;();summary;df-generated |
 | System.Collections.Generic;Dictionary<TKey,TValue>+Enumerator;Reset;();summary;df-generated |
+| System.Collections.Generic;Dictionary<TKey,TValue>+Enumerator;get_Current;();summary;df-generated |
 | System.Collections.Generic;Dictionary<TKey,TValue>+KeyCollection+Enumerator;Dispose;();summary;df-generated |
 | System.Collections.Generic;Dictionary<TKey,TValue>+KeyCollection+Enumerator;MoveNext;();summary;df-generated |
 | System.Collections.Generic;Dictionary<TKey,TValue>+KeyCollection+Enumerator;Reset;();summary;df-generated |
+| System.Collections.Generic;Dictionary<TKey,TValue>+KeyCollection+Enumerator;get_Current;();summary;df-generated |
 | System.Collections.Generic;Dictionary<TKey,TValue>+KeyCollection;Contains;(TKey);summary;df-generated |
 | System.Collections.Generic;Dictionary<TKey,TValue>+KeyCollection;Remove;(TKey);summary;df-generated |
 | System.Collections.Generic;Dictionary<TKey,TValue>+KeyCollection;get_Count;();summary;df-generated |
@@ -23252,6 +24949,7 @@ neutral
 | System.Collections.Generic;Dictionary<TKey,TValue>+ValueCollection+Enumerator;Dispose;();summary;df-generated |
 | System.Collections.Generic;Dictionary<TKey,TValue>+ValueCollection+Enumerator;MoveNext;();summary;df-generated |
 | System.Collections.Generic;Dictionary<TKey,TValue>+ValueCollection+Enumerator;Reset;();summary;df-generated |
+| System.Collections.Generic;Dictionary<TKey,TValue>+ValueCollection+Enumerator;get_Current;();summary;df-generated |
 | System.Collections.Generic;Dictionary<TKey,TValue>+ValueCollection;Contains;(TValue);summary;df-generated |
 | System.Collections.Generic;Dictionary<TKey,TValue>+ValueCollection;Remove;(TValue);summary;df-generated |
 | System.Collections.Generic;Dictionary<TKey,TValue>+ValueCollection;get_Count;();summary;df-generated |
@@ -23278,14 +24976,17 @@ neutral
 | System.Collections.Generic;Dictionary<TKey,TValue>;get_IsFixedSize;();summary;df-generated |
 | System.Collections.Generic;Dictionary<TKey,TValue>;get_IsReadOnly;();summary;df-generated |
 | System.Collections.Generic;Dictionary<TKey,TValue>;get_IsSynchronized;();summary;df-generated |
-| System.Collections.Generic;EqualityComparer<T>;Equals;(System.Object,System.Object);summary;df-generated |
+| System.Collections.Generic;Dictionary<TKey,TValue>;get_Item;(TKey);summary;df-generated |
+| System.Collections.Generic;Dictionary<TKey,TValue>;get_Keys;();summary;df-generated |
+| System.Collections.Generic;Dictionary<TKey,TValue>;get_Values;();summary;df-generated |
+| System.Collections.Generic;EqualityComparer<T>;Create;(System.Func<T,T,System.Boolean>,System.Func<T,System.Int32>);summary;df-generated |
 | System.Collections.Generic;EqualityComparer<T>;Equals;(T,T);summary;df-generated |
-| System.Collections.Generic;EqualityComparer<T>;GetHashCode;(System.Object);summary;df-generated |
 | System.Collections.Generic;EqualityComparer<T>;GetHashCode;(T);summary;df-generated |
 | System.Collections.Generic;EqualityComparer<T>;get_Default;();summary;df-generated |
 | System.Collections.Generic;HashSet<T>+Enumerator;Dispose;();summary;df-generated |
 | System.Collections.Generic;HashSet<T>+Enumerator;MoveNext;();summary;df-generated |
 | System.Collections.Generic;HashSet<T>+Enumerator;Reset;();summary;df-generated |
+| System.Collections.Generic;HashSet<T>+Enumerator;get_Current;();summary;df-generated |
 | System.Collections.Generic;HashSet<T>;Contains;(T);summary;df-generated |
 | System.Collections.Generic;HashSet<T>;CopyTo;(T[]);summary;df-generated |
 | System.Collections.Generic;HashSet<T>;CopyTo;(T[],System.Int32,System.Int32);summary;df-generated |
@@ -23304,6 +25005,7 @@ neutral
 | System.Collections.Generic;HashSet<T>;OnDeserialization;(System.Object);summary;df-generated |
 | System.Collections.Generic;HashSet<T>;Overlaps;(System.Collections.Generic.IEnumerable<T>);summary;df-generated |
 | System.Collections.Generic;HashSet<T>;Remove;(T);summary;df-generated |
+| System.Collections.Generic;HashSet<T>;RemoveWhere;(System.Predicate<T>);summary;df-generated |
 | System.Collections.Generic;HashSet<T>;SetEquals;(System.Collections.Generic.IEnumerable<T>);summary;df-generated |
 | System.Collections.Generic;HashSet<T>;SymmetricExceptWith;(System.Collections.Generic.IEnumerable<T>);summary;df-generated |
 | System.Collections.Generic;HashSet<T>;TrimExcess;();summary;df-generated |
@@ -23358,6 +25060,7 @@ neutral
 | System.Collections.Generic;LinkedList<T>+Enumerator;MoveNext;();summary;df-generated |
 | System.Collections.Generic;LinkedList<T>+Enumerator;OnDeserialization;(System.Object);summary;df-generated |
 | System.Collections.Generic;LinkedList<T>+Enumerator;Reset;();summary;df-generated |
+| System.Collections.Generic;LinkedList<T>+Enumerator;get_Current;();summary;df-generated |
 | System.Collections.Generic;LinkedList<T>;Contains;(T);summary;df-generated |
 | System.Collections.Generic;LinkedList<T>;OnDeserialization;(System.Object);summary;df-generated |
 | System.Collections.Generic;LinkedList<T>;Remove;(T);summary;df-generated |
@@ -23370,13 +25073,22 @@ neutral
 | System.Collections.Generic;List<T>+Enumerator;Dispose;();summary;df-generated |
 | System.Collections.Generic;List<T>+Enumerator;MoveNext;();summary;df-generated |
 | System.Collections.Generic;List<T>+Enumerator;Reset;();summary;df-generated |
+| System.Collections.Generic;List<T>+Enumerator;get_Current;();summary;df-generated |
 | System.Collections.Generic;List<T>;BinarySearch;(System.Int32,System.Int32,T,System.Collections.Generic.IComparer<T>);summary;df-generated |
 | System.Collections.Generic;List<T>;BinarySearch;(T);summary;df-generated |
 | System.Collections.Generic;List<T>;BinarySearch;(T,System.Collections.Generic.IComparer<T>);summary;df-generated |
 | System.Collections.Generic;List<T>;Contains;(System.Object);summary;df-generated |
 | System.Collections.Generic;List<T>;Contains;(T);summary;df-generated |
+| System.Collections.Generic;List<T>;ConvertAll<TOutput>;(System.Converter<T,TOutput>);summary;df-generated |
 | System.Collections.Generic;List<T>;CopyTo;(System.Int32,T[],System.Int32,System.Int32);summary;df-generated |
 | System.Collections.Generic;List<T>;EnsureCapacity;(System.Int32);summary;df-generated |
+| System.Collections.Generic;List<T>;Exists;(System.Predicate<T>);summary;df-generated |
+| System.Collections.Generic;List<T>;FindIndex;(System.Int32,System.Int32,System.Predicate<T>);summary;df-generated |
+| System.Collections.Generic;List<T>;FindIndex;(System.Int32,System.Predicate<T>);summary;df-generated |
+| System.Collections.Generic;List<T>;FindIndex;(System.Predicate<T>);summary;df-generated |
+| System.Collections.Generic;List<T>;FindLastIndex;(System.Int32,System.Int32,System.Predicate<T>);summary;df-generated |
+| System.Collections.Generic;List<T>;FindLastIndex;(System.Int32,System.Predicate<T>);summary;df-generated |
+| System.Collections.Generic;List<T>;FindLastIndex;(System.Predicate<T>);summary;df-generated |
 | System.Collections.Generic;List<T>;IndexOf;(System.Object);summary;df-generated |
 | System.Collections.Generic;List<T>;IndexOf;(T);summary;df-generated |
 | System.Collections.Generic;List<T>;IndexOf;(T,System.Int32);summary;df-generated |
@@ -23385,20 +25097,25 @@ neutral
 | System.Collections.Generic;List<T>;LastIndexOf;(T,System.Int32);summary;df-generated |
 | System.Collections.Generic;List<T>;LastIndexOf;(T,System.Int32,System.Int32);summary;df-generated |
 | System.Collections.Generic;List<T>;List;(System.Int32);summary;df-generated |
+| System.Collections.Generic;List<T>;Remove;(System.Object);summary;df-generated |
 | System.Collections.Generic;List<T>;Remove;(T);summary;df-generated |
+| System.Collections.Generic;List<T>;RemoveAll;(System.Predicate<T>);summary;df-generated |
 | System.Collections.Generic;List<T>;RemoveAt;(System.Int32);summary;df-generated |
 | System.Collections.Generic;List<T>;RemoveRange;(System.Int32,System.Int32);summary;df-generated |
 | System.Collections.Generic;List<T>;Reverse;();summary;df-generated |
 | System.Collections.Generic;List<T>;Reverse;(System.Int32,System.Int32);summary;df-generated |
 | System.Collections.Generic;List<T>;Sort;();summary;df-generated |
 | System.Collections.Generic;List<T>;Sort;(System.Collections.Generic.IComparer<T>);summary;df-generated |
+| System.Collections.Generic;List<T>;Sort;(System.Comparison<T>);summary;df-generated |
 | System.Collections.Generic;List<T>;Sort;(System.Int32,System.Int32,System.Collections.Generic.IComparer<T>);summary;df-generated |
 | System.Collections.Generic;List<T>;ToArray;();summary;df-generated |
 | System.Collections.Generic;List<T>;TrimExcess;();summary;df-generated |
+| System.Collections.Generic;List<T>;TrueForAll;(System.Predicate<T>);summary;df-generated |
 | System.Collections.Generic;List<T>;get_Count;();summary;df-generated |
 | System.Collections.Generic;List<T>;get_IsFixedSize;();summary;df-generated |
 | System.Collections.Generic;List<T>;get_IsReadOnly;();summary;df-generated |
 | System.Collections.Generic;List<T>;get_IsSynchronized;();summary;df-generated |
+| System.Collections.Generic;List<T>;get_Item;(System.Int32);summary;df-generated |
 | System.Collections.Generic;PriorityQueue<TElement,TPriority>+UnorderedItemsCollection+Enumerator;Dispose;();summary;df-generated |
 | System.Collections.Generic;PriorityQueue<TElement,TPriority>+UnorderedItemsCollection+Enumerator;MoveNext;();summary;df-generated |
 | System.Collections.Generic;PriorityQueue<TElement,TPriority>+UnorderedItemsCollection+Enumerator;Reset;();summary;df-generated |
@@ -23417,6 +25134,7 @@ neutral
 | System.Collections.Generic;Queue<T>+Enumerator;Dispose;();summary;df-generated |
 | System.Collections.Generic;Queue<T>+Enumerator;MoveNext;();summary;df-generated |
 | System.Collections.Generic;Queue<T>+Enumerator;Reset;();summary;df-generated |
+| System.Collections.Generic;Queue<T>+Enumerator;get_Current;();summary;df-generated |
 | System.Collections.Generic;Queue<T>;Contains;(T);summary;df-generated |
 | System.Collections.Generic;Queue<T>;EnsureCapacity;(System.Int32);summary;df-generated |
 | System.Collections.Generic;Queue<T>;Queue;(System.Int32);summary;df-generated |
@@ -23430,6 +25148,7 @@ neutral
 | System.Collections.Generic;SortedDictionary<TKey,TValue>+Enumerator;Dispose;();summary;df-generated |
 | System.Collections.Generic;SortedDictionary<TKey,TValue>+Enumerator;MoveNext;();summary;df-generated |
 | System.Collections.Generic;SortedDictionary<TKey,TValue>+Enumerator;Reset;();summary;df-generated |
+| System.Collections.Generic;SortedDictionary<TKey,TValue>+Enumerator;get_Current;();summary;df-generated |
 | System.Collections.Generic;SortedDictionary<TKey,TValue>+KeyCollection+Enumerator;Dispose;();summary;df-generated |
 | System.Collections.Generic;SortedDictionary<TKey,TValue>+KeyCollection+Enumerator;MoveNext;();summary;df-generated |
 | System.Collections.Generic;SortedDictionary<TKey,TValue>+KeyCollection+Enumerator;Reset;();summary;df-generated |
@@ -23462,6 +25181,9 @@ neutral
 | System.Collections.Generic;SortedDictionary<TKey,TValue>;get_IsFixedSize;();summary;df-generated |
 | System.Collections.Generic;SortedDictionary<TKey,TValue>;get_IsReadOnly;();summary;df-generated |
 | System.Collections.Generic;SortedDictionary<TKey,TValue>;get_IsSynchronized;();summary;df-generated |
+| System.Collections.Generic;SortedDictionary<TKey,TValue>;get_Item;(TKey);summary;df-generated |
+| System.Collections.Generic;SortedDictionary<TKey,TValue>;get_Keys;();summary;df-generated |
+| System.Collections.Generic;SortedDictionary<TKey,TValue>;get_Values;();summary;df-generated |
 | System.Collections.Generic;SortedList<TKey,TValue>;Contains;(System.Collections.Generic.KeyValuePair<TKey,TValue>);summary;df-generated |
 | System.Collections.Generic;SortedList<TKey,TValue>;Contains;(System.Object);summary;df-generated |
 | System.Collections.Generic;SortedList<TKey,TValue>;ContainsKey;(TKey);summary;df-generated |
@@ -23475,18 +25197,25 @@ neutral
 | System.Collections.Generic;SortedList<TKey,TValue>;SortedList;(System.Int32);summary;df-generated |
 | System.Collections.Generic;SortedList<TKey,TValue>;SortedList;(System.Int32,System.Collections.Generic.IComparer<TKey>);summary;df-generated |
 | System.Collections.Generic;SortedList<TKey,TValue>;TrimExcess;();summary;df-generated |
+| System.Collections.Generic;SortedList<TKey,TValue>;TryGetValue;(TKey,TValue);summary;df-generated |
 | System.Collections.Generic;SortedList<TKey,TValue>;get_Count;();summary;df-generated |
 | System.Collections.Generic;SortedList<TKey,TValue>;get_IsFixedSize;();summary;df-generated |
 | System.Collections.Generic;SortedList<TKey,TValue>;get_IsReadOnly;();summary;df-generated |
 | System.Collections.Generic;SortedList<TKey,TValue>;get_IsSynchronized;();summary;df-generated |
+| System.Collections.Generic;SortedList<TKey,TValue>;get_Item;(TKey);summary;df-generated |
+| System.Collections.Generic;SortedList<TKey,TValue>;get_Keys;();summary;df-generated |
+| System.Collections.Generic;SortedList<TKey,TValue>;get_Values;();summary;df-generated |
 | System.Collections.Generic;SortedSet<T>+Enumerator;Dispose;();summary;df-generated |
 | System.Collections.Generic;SortedSet<T>+Enumerator;MoveNext;();summary;df-generated |
 | System.Collections.Generic;SortedSet<T>+Enumerator;OnDeserialization;(System.Object);summary;df-generated |
 | System.Collections.Generic;SortedSet<T>+Enumerator;Reset;();summary;df-generated |
+| System.Collections.Generic;SortedSet<T>+Enumerator;get_Current;();summary;df-generated |
 | System.Collections.Generic;SortedSet<T>;Contains;(T);summary;df-generated |
 | System.Collections.Generic;SortedSet<T>;CreateSetComparer;();summary;df-generated |
 | System.Collections.Generic;SortedSet<T>;CreateSetComparer;(System.Collections.Generic.IEqualityComparer<T>);summary;df-generated |
 | System.Collections.Generic;SortedSet<T>;ExceptWith;(System.Collections.Generic.IEnumerable<T>);summary;df-generated |
+| System.Collections.Generic;SortedSet<T>;GetObjectData;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);summary;df-generated |
+| System.Collections.Generic;SortedSet<T>;IntersectWith;(System.Collections.Generic.IEnumerable<T>);summary;df-generated |
 | System.Collections.Generic;SortedSet<T>;IsProperSubsetOf;(System.Collections.Generic.IEnumerable<T>);summary;df-generated |
 | System.Collections.Generic;SortedSet<T>;IsProperSupersetOf;(System.Collections.Generic.IEnumerable<T>);summary;df-generated |
 | System.Collections.Generic;SortedSet<T>;IsSubsetOf;(System.Collections.Generic.IEnumerable<T>);summary;df-generated |
@@ -23494,14 +25223,18 @@ neutral
 | System.Collections.Generic;SortedSet<T>;OnDeserialization;(System.Object);summary;df-generated |
 | System.Collections.Generic;SortedSet<T>;Overlaps;(System.Collections.Generic.IEnumerable<T>);summary;df-generated |
 | System.Collections.Generic;SortedSet<T>;Remove;(T);summary;df-generated |
+| System.Collections.Generic;SortedSet<T>;RemoveWhere;(System.Predicate<T>);summary;df-generated |
 | System.Collections.Generic;SortedSet<T>;SetEquals;(System.Collections.Generic.IEnumerable<T>);summary;df-generated |
 | System.Collections.Generic;SortedSet<T>;SortedSet;(System.Collections.Generic.IEnumerable<T>);summary;df-generated |
+| System.Collections.Generic;SortedSet<T>;SymmetricExceptWith;(System.Collections.Generic.IEnumerable<T>);summary;df-generated |
+| System.Collections.Generic;SortedSet<T>;UnionWith;(System.Collections.Generic.IEnumerable<T>);summary;df-generated |
 | System.Collections.Generic;SortedSet<T>;get_Count;();summary;df-generated |
 | System.Collections.Generic;SortedSet<T>;get_IsReadOnly;();summary;df-generated |
 | System.Collections.Generic;SortedSet<T>;get_IsSynchronized;();summary;df-generated |
 | System.Collections.Generic;Stack<T>+Enumerator;Dispose;();summary;df-generated |
 | System.Collections.Generic;Stack<T>+Enumerator;MoveNext;();summary;df-generated |
 | System.Collections.Generic;Stack<T>+Enumerator;Reset;();summary;df-generated |
+| System.Collections.Generic;Stack<T>+Enumerator;get_Current;();summary;df-generated |
 | System.Collections.Generic;Stack<T>;Contains;(T);summary;df-generated |
 | System.Collections.Generic;Stack<T>;EnsureCapacity;(System.Int32);summary;df-generated |
 | System.Collections.Generic;Stack<T>;Stack;(System.Int32);summary;df-generated |
@@ -23520,6 +25253,7 @@ neutral
 | System.Collections.Immutable;IImmutableList<T>;InsertRange;(System.Int32,System.Collections.Generic.IEnumerable<T>);summary;df-generated |
 | System.Collections.Immutable;IImmutableList<T>;LastIndexOf;(T,System.Int32,System.Int32,System.Collections.Generic.IEqualityComparer<T>);summary;df-generated |
 | System.Collections.Immutable;IImmutableList<T>;Remove;(T,System.Collections.Generic.IEqualityComparer<T>);summary;df-generated |
+| System.Collections.Immutable;IImmutableList<T>;RemoveAll;(System.Predicate<T>);summary;df-generated |
 | System.Collections.Immutable;IImmutableList<T>;RemoveAt;(System.Int32);summary;df-generated |
 | System.Collections.Immutable;IImmutableList<T>;RemoveRange;(System.Collections.Generic.IEnumerable<T>,System.Collections.Generic.IEqualityComparer<T>);summary;df-generated |
 | System.Collections.Immutable;IImmutableList<T>;RemoveRange;(System.Int32,System.Int32);summary;df-generated |
@@ -23554,6 +25288,8 @@ neutral
 | System.Collections.Immutable;ImmutableArray;Create<T>;(T[]);summary;df-generated |
 | System.Collections.Immutable;ImmutableArray;CreateBuilder<T>;();summary;df-generated |
 | System.Collections.Immutable;ImmutableArray;CreateBuilder<T>;(System.Int32);summary;df-generated |
+| System.Collections.Immutable;ImmutableArray;CreateRange<TSource,TResult>;(System.Collections.Immutable.ImmutableArray<TSource>,System.Func<TSource,TResult>);summary;df-generated |
+| System.Collections.Immutable;ImmutableArray;CreateRange<TSource,TResult>;(System.Collections.Immutable.ImmutableArray<TSource>,System.Int32,System.Int32,System.Func<TSource,TResult>);summary;df-generated |
 | System.Collections.Immutable;ImmutableArray;ToImmutableArray<TSource>;(System.Collections.Immutable.ImmutableArray<TSource>+Builder);summary;df-generated |
 | System.Collections.Immutable;ImmutableArray<T>+Builder;AddRange;(System.Collections.Immutable.ImmutableArray<T>,System.Int32);summary;df-generated |
 | System.Collections.Immutable;ImmutableArray<T>+Builder;AddRange;(System.ReadOnlySpan<T>);summary;df-generated |
@@ -23564,34 +25300,32 @@ neutral
 | System.Collections.Immutable;ImmutableArray<T>+Builder;CopyTo;(T[]);summary;df-generated |
 | System.Collections.Immutable;ImmutableArray<T>+Builder;IndexOf;(T);summary;df-generated |
 | System.Collections.Immutable;ImmutableArray<T>+Builder;IndexOf;(T,System.Int32);summary;df-generated |
-| System.Collections.Immutable;ImmutableArray<T>+Builder;IndexOf;(T,System.Int32,System.Collections.Generic.IEqualityComparer<T>);summary;df-generated |
 | System.Collections.Immutable;ImmutableArray<T>+Builder;IndexOf;(T,System.Int32,System.Int32);summary;df-generated |
-| System.Collections.Immutable;ImmutableArray<T>+Builder;IndexOf;(T,System.Int32,System.Int32,System.Collections.Generic.IEqualityComparer<T>);summary;df-generated |
 | System.Collections.Immutable;ImmutableArray<T>+Builder;InsertRange;(System.Int32,System.Collections.Immutable.ImmutableArray<T>);summary;df-generated |
 | System.Collections.Immutable;ImmutableArray<T>+Builder;ItemRef;(System.Int32);summary;df-generated |
 | System.Collections.Immutable;ImmutableArray<T>+Builder;LastIndexOf;(T);summary;df-generated |
 | System.Collections.Immutable;ImmutableArray<T>+Builder;LastIndexOf;(T,System.Int32);summary;df-generated |
 | System.Collections.Immutable;ImmutableArray<T>+Builder;LastIndexOf;(T,System.Int32,System.Int32);summary;df-generated |
-| System.Collections.Immutable;ImmutableArray<T>+Builder;LastIndexOf;(T,System.Int32,System.Int32,System.Collections.Generic.IEqualityComparer<T>);summary;df-generated |
 | System.Collections.Immutable;ImmutableArray<T>+Builder;Remove;(T);summary;df-generated |
-| System.Collections.Immutable;ImmutableArray<T>+Builder;Remove;(T,System.Collections.Generic.IEqualityComparer<T>);summary;df-generated |
 | System.Collections.Immutable;ImmutableArray<T>+Builder;RemoveAt;(System.Int32);summary;df-generated |
 | System.Collections.Immutable;ImmutableArray<T>+Builder;RemoveRange;(System.Collections.Generic.IEnumerable<T>);summary;df-generated |
-| System.Collections.Immutable;ImmutableArray<T>+Builder;RemoveRange;(System.Collections.Generic.IEnumerable<T>,System.Collections.Generic.IEqualityComparer<T>);summary;df-generated |
 | System.Collections.Immutable;ImmutableArray<T>+Builder;RemoveRange;(System.Int32,System.Int32);summary;df-generated |
 | System.Collections.Immutable;ImmutableArray<T>+Builder;Reverse;();summary;df-generated |
 | System.Collections.Immutable;ImmutableArray<T>+Builder;Sort;();summary;df-generated |
 | System.Collections.Immutable;ImmutableArray<T>+Builder;Sort;(System.Collections.Generic.IComparer<T>);summary;df-generated |
+| System.Collections.Immutable;ImmutableArray<T>+Builder;Sort;(System.Comparison<T>);summary;df-generated |
 | System.Collections.Immutable;ImmutableArray<T>+Builder;Sort;(System.Int32,System.Int32,System.Collections.Generic.IComparer<T>);summary;df-generated |
 | System.Collections.Immutable;ImmutableArray<T>+Builder;ToArray;();summary;df-generated |
 | System.Collections.Immutable;ImmutableArray<T>+Builder;ToImmutable;();summary;df-generated |
+| System.Collections.Immutable;ImmutableArray<T>+Builder;get_Count;();summary;df-generated |
 | System.Collections.Immutable;ImmutableArray<T>+Builder;get_IsReadOnly;();summary;df-generated |
+| System.Collections.Immutable;ImmutableArray<T>+Builder;get_Item;(System.Int32);summary;df-generated |
 | System.Collections.Immutable;ImmutableArray<T>+Enumerator;MoveNext;();summary;df-generated |
+| System.Collections.Immutable;ImmutableArray<T>;AsMemory;();summary;df-generated |
 | System.Collections.Immutable;ImmutableArray<T>;Clear;();summary;df-generated |
 | System.Collections.Immutable;ImmutableArray<T>;CompareTo;(System.Object,System.Collections.IComparer);summary;df-generated |
 | System.Collections.Immutable;ImmutableArray<T>;Contains;(System.Object);summary;df-generated |
 | System.Collections.Immutable;ImmutableArray<T>;Contains;(T);summary;df-generated |
-| System.Collections.Immutable;ImmutableArray<T>;Contains;(T,System.Collections.Generic.IEqualityComparer<T>);summary;df-generated |
 | System.Collections.Immutable;ImmutableArray<T>;CopyTo;(System.Int32,T[],System.Int32,System.Int32);summary;df-generated |
 | System.Collections.Immutable;ImmutableArray<T>;CopyTo;(T[]);summary;df-generated |
 | System.Collections.Immutable;ImmutableArray<T>;Equals;(System.Collections.Immutable.ImmutableArray<T>);summary;df-generated |
@@ -23602,16 +25336,24 @@ neutral
 | System.Collections.Immutable;ImmutableArray<T>;IndexOf;(System.Object);summary;df-generated |
 | System.Collections.Immutable;ImmutableArray<T>;IndexOf;(T);summary;df-generated |
 | System.Collections.Immutable;ImmutableArray<T>;IndexOf;(T,System.Int32);summary;df-generated |
-| System.Collections.Immutable;ImmutableArray<T>;IndexOf;(T,System.Int32,System.Collections.Generic.IEqualityComparer<T>);summary;df-generated |
 | System.Collections.Immutable;ImmutableArray<T>;IndexOf;(T,System.Int32,System.Int32);summary;df-generated |
 | System.Collections.Immutable;ImmutableArray<T>;IndexOf;(T,System.Int32,System.Int32,System.Collections.Generic.IEqualityComparer<T>);summary;df-generated |
+| System.Collections.Immutable;ImmutableArray<T>;Insert;(System.Int32,T);summary;df-generated |
+| System.Collections.Immutable;ImmutableArray<T>;InsertRange;(System.Int32,System.Collections.Generic.IEnumerable<T>);summary;df-generated |
 | System.Collections.Immutable;ImmutableArray<T>;ItemRef;(System.Int32);summary;df-generated |
 | System.Collections.Immutable;ImmutableArray<T>;LastIndexOf;(T);summary;df-generated |
 | System.Collections.Immutable;ImmutableArray<T>;LastIndexOf;(T,System.Int32);summary;df-generated |
 | System.Collections.Immutable;ImmutableArray<T>;LastIndexOf;(T,System.Int32,System.Int32);summary;df-generated |
 | System.Collections.Immutable;ImmutableArray<T>;LastIndexOf;(T,System.Int32,System.Int32,System.Collections.Generic.IEqualityComparer<T>);summary;df-generated |
+| System.Collections.Immutable;ImmutableArray<T>;Remove;(System.Object);summary;df-generated |
 | System.Collections.Immutable;ImmutableArray<T>;Remove;(T);summary;df-generated |
+| System.Collections.Immutable;ImmutableArray<T>;Remove;(T,System.Collections.Generic.IEqualityComparer<T>);summary;df-generated |
+| System.Collections.Immutable;ImmutableArray<T>;RemoveAll;(System.Predicate<T>);summary;df-generated |
 | System.Collections.Immutable;ImmutableArray<T>;RemoveAt;(System.Int32);summary;df-generated |
+| System.Collections.Immutable;ImmutableArray<T>;RemoveRange;(System.Collections.Generic.IEnumerable<T>,System.Collections.Generic.IEqualityComparer<T>);summary;df-generated |
+| System.Collections.Immutable;ImmutableArray<T>;RemoveRange;(System.Int32,System.Int32);summary;df-generated |
+| System.Collections.Immutable;ImmutableArray<T>;Replace;(T,T,System.Collections.Generic.IEqualityComparer<T>);summary;df-generated |
+| System.Collections.Immutable;ImmutableArray<T>;SetItem;(System.Int32,T);summary;df-generated |
 | System.Collections.Immutable;ImmutableArray<T>;get_Count;();summary;df-generated |
 | System.Collections.Immutable;ImmutableArray<T>;get_IsDefault;();summary;df-generated |
 | System.Collections.Immutable;ImmutableArray<T>;get_IsDefaultOrEmpty;();summary;df-generated |
@@ -23619,6 +25361,7 @@ neutral
 | System.Collections.Immutable;ImmutableArray<T>;get_IsFixedSize;();summary;df-generated |
 | System.Collections.Immutable;ImmutableArray<T>;get_IsReadOnly;();summary;df-generated |
 | System.Collections.Immutable;ImmutableArray<T>;get_IsSynchronized;();summary;df-generated |
+| System.Collections.Immutable;ImmutableArray<T>;get_Item;(System.Int32);summary;df-generated |
 | System.Collections.Immutable;ImmutableArray<T>;get_Length;();summary;df-generated |
 | System.Collections.Immutable;ImmutableArray<T>;op_Equality;(System.Collections.Immutable.ImmutableArray<T>,System.Collections.Immutable.ImmutableArray<T>);summary;df-generated |
 | System.Collections.Immutable;ImmutableArray<T>;op_Equality;(System.Nullable<System.Collections.Immutable.ImmutableArray<T>>,System.Nullable<System.Collections.Immutable.ImmutableArray<T>>);summary;df-generated |
@@ -23629,6 +25372,11 @@ neutral
 | System.Collections.Immutable;ImmutableDictionary;CreateBuilder<TKey,TValue>;();summary;df-generated |
 | System.Collections.Immutable;ImmutableDictionary;GetValueOrDefault<TKey,TValue>;(System.Collections.Immutable.IImmutableDictionary<TKey,TValue>,TKey);summary;df-generated |
 | System.Collections.Immutable;ImmutableDictionary;ToImmutableDictionary<TKey,TValue>;(System.Collections.Immutable.ImmutableDictionary<TKey,TValue>+Builder);summary;df-generated |
+| System.Collections.Immutable;ImmutableDictionary;ToImmutableDictionary<TSource,TKey,TValue>;(System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,TKey>,System.Func<TSource,TValue>);summary;df-generated |
+| System.Collections.Immutable;ImmutableDictionary;ToImmutableDictionary<TSource,TKey,TValue>;(System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,TKey>,System.Func<TSource,TValue>,System.Collections.Generic.IEqualityComparer<TKey>);summary;df-generated |
+| System.Collections.Immutable;ImmutableDictionary;ToImmutableDictionary<TSource,TKey,TValue>;(System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,TKey>,System.Func<TSource,TValue>,System.Collections.Generic.IEqualityComparer<TKey>,System.Collections.Generic.IEqualityComparer<TValue>);summary;df-generated |
+| System.Collections.Immutable;ImmutableDictionary;ToImmutableDictionary<TSource,TKey>;(System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,TKey>);summary;df-generated |
+| System.Collections.Immutable;ImmutableDictionary;ToImmutableDictionary<TSource,TKey>;(System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,TKey>,System.Collections.Generic.IEqualityComparer<TKey>);summary;df-generated |
 | System.Collections.Immutable;ImmutableDictionary<TKey,TValue>+Builder;Contains;(System.Collections.Generic.KeyValuePair<TKey,TValue>);summary;df-generated |
 | System.Collections.Immutable;ImmutableDictionary<TKey,TValue>+Builder;Contains;(System.Object);summary;df-generated |
 | System.Collections.Immutable;ImmutableDictionary<TKey,TValue>+Builder;ContainsKey;(TKey);summary;df-generated |
@@ -23644,9 +25392,14 @@ neutral
 | System.Collections.Immutable;ImmutableDictionary<TKey,TValue>+Builder;get_IsFixedSize;();summary;df-generated |
 | System.Collections.Immutable;ImmutableDictionary<TKey,TValue>+Builder;get_IsReadOnly;();summary;df-generated |
 | System.Collections.Immutable;ImmutableDictionary<TKey,TValue>+Builder;get_IsSynchronized;();summary;df-generated |
+| System.Collections.Immutable;ImmutableDictionary<TKey,TValue>+Builder;get_Item;(TKey);summary;df-generated |
+| System.Collections.Immutable;ImmutableDictionary<TKey,TValue>+Builder;get_Keys;();summary;df-generated |
+| System.Collections.Immutable;ImmutableDictionary<TKey,TValue>+Builder;get_Values;();summary;df-generated |
 | System.Collections.Immutable;ImmutableDictionary<TKey,TValue>+Enumerator;Dispose;();summary;df-generated |
 | System.Collections.Immutable;ImmutableDictionary<TKey,TValue>+Enumerator;MoveNext;();summary;df-generated |
 | System.Collections.Immutable;ImmutableDictionary<TKey,TValue>+Enumerator;Reset;();summary;df-generated |
+| System.Collections.Immutable;ImmutableDictionary<TKey,TValue>+Enumerator;get_Current;();summary;df-generated |
+| System.Collections.Immutable;ImmutableDictionary<TKey,TValue>;Add;(TKey,TValue);summary;df-generated |
 | System.Collections.Immutable;ImmutableDictionary<TKey,TValue>;Contains;(System.Collections.Generic.KeyValuePair<TKey,TValue>);summary;df-generated |
 | System.Collections.Immutable;ImmutableDictionary<TKey,TValue>;Contains;(System.Object);summary;df-generated |
 | System.Collections.Immutable;ImmutableDictionary<TKey,TValue>;ContainsKey;(TKey);summary;df-generated |
@@ -23654,12 +25407,19 @@ neutral
 | System.Collections.Immutable;ImmutableDictionary<TKey,TValue>;Remove;(System.Collections.Generic.KeyValuePair<TKey,TValue>);summary;df-generated |
 | System.Collections.Immutable;ImmutableDictionary<TKey,TValue>;Remove;(System.Object);summary;df-generated |
 | System.Collections.Immutable;ImmutableDictionary<TKey,TValue>;Remove;(TKey);summary;df-generated |
+| System.Collections.Immutable;ImmutableDictionary<TKey,TValue>;RemoveRange;(System.Collections.Generic.IEnumerable<TKey>);summary;df-generated |
+| System.Collections.Immutable;ImmutableDictionary<TKey,TValue>;SetItem;(TKey,TValue);summary;df-generated |
+| System.Collections.Immutable;ImmutableDictionary<TKey,TValue>;SetItems;(System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<TKey,TValue>>);summary;df-generated |
+| System.Collections.Immutable;ImmutableDictionary<TKey,TValue>;TryGetKey;(TKey,TKey);summary;df-generated |
 | System.Collections.Immutable;ImmutableDictionary<TKey,TValue>;TryGetValue;(TKey,TValue);summary;df-generated |
 | System.Collections.Immutable;ImmutableDictionary<TKey,TValue>;get_Count;();summary;df-generated |
 | System.Collections.Immutable;ImmutableDictionary<TKey,TValue>;get_IsEmpty;();summary;df-generated |
 | System.Collections.Immutable;ImmutableDictionary<TKey,TValue>;get_IsFixedSize;();summary;df-generated |
 | System.Collections.Immutable;ImmutableDictionary<TKey,TValue>;get_IsReadOnly;();summary;df-generated |
 | System.Collections.Immutable;ImmutableDictionary<TKey,TValue>;get_IsSynchronized;();summary;df-generated |
+| System.Collections.Immutable;ImmutableDictionary<TKey,TValue>;get_Item;(TKey);summary;df-generated |
+| System.Collections.Immutable;ImmutableDictionary<TKey,TValue>;get_Keys;();summary;df-generated |
+| System.Collections.Immutable;ImmutableDictionary<TKey,TValue>;get_Values;();summary;df-generated |
 | System.Collections.Immutable;ImmutableHashSet;Create<T>;();summary;df-generated |
 | System.Collections.Immutable;ImmutableHashSet;Create<T>;(System.Collections.Generic.IEqualityComparer<T>);summary;df-generated |
 | System.Collections.Immutable;ImmutableHashSet;CreateBuilder<T>;();summary;df-generated |
@@ -23675,6 +25435,7 @@ neutral
 | System.Collections.Immutable;ImmutableHashSet<T>+Builder;Overlaps;(System.Collections.Generic.IEnumerable<T>);summary;df-generated |
 | System.Collections.Immutable;ImmutableHashSet<T>+Builder;Remove;(T);summary;df-generated |
 | System.Collections.Immutable;ImmutableHashSet<T>+Builder;SetEquals;(System.Collections.Generic.IEnumerable<T>);summary;df-generated |
+| System.Collections.Immutable;ImmutableHashSet<T>+Builder;SymmetricExceptWith;(System.Collections.Generic.IEnumerable<T>);summary;df-generated |
 | System.Collections.Immutable;ImmutableHashSet<T>+Builder;ToImmutable;();summary;df-generated |
 | System.Collections.Immutable;ImmutableHashSet<T>+Builder;UnionWith;(System.Collections.Generic.IEnumerable<T>);summary;df-generated |
 | System.Collections.Immutable;ImmutableHashSet<T>+Builder;get_Count;();summary;df-generated |
@@ -23682,8 +25443,11 @@ neutral
 | System.Collections.Immutable;ImmutableHashSet<T>+Enumerator;Dispose;();summary;df-generated |
 | System.Collections.Immutable;ImmutableHashSet<T>+Enumerator;MoveNext;();summary;df-generated |
 | System.Collections.Immutable;ImmutableHashSet<T>+Enumerator;Reset;();summary;df-generated |
+| System.Collections.Immutable;ImmutableHashSet<T>+Enumerator;get_Current;();summary;df-generated |
 | System.Collections.Immutable;ImmutableHashSet<T>;Contains;(T);summary;df-generated |
+| System.Collections.Immutable;ImmutableHashSet<T>;Except;(System.Collections.Generic.IEnumerable<T>);summary;df-generated |
 | System.Collections.Immutable;ImmutableHashSet<T>;ExceptWith;(System.Collections.Generic.IEnumerable<T>);summary;df-generated |
+| System.Collections.Immutable;ImmutableHashSet<T>;Intersect;(System.Collections.Generic.IEnumerable<T>);summary;df-generated |
 | System.Collections.Immutable;ImmutableHashSet<T>;IntersectWith;(System.Collections.Generic.IEnumerable<T>);summary;df-generated |
 | System.Collections.Immutable;ImmutableHashSet<T>;IsProperSubsetOf;(System.Collections.Generic.IEnumerable<T>);summary;df-generated |
 | System.Collections.Immutable;ImmutableHashSet<T>;IsProperSupersetOf;(System.Collections.Generic.IEnumerable<T>);summary;df-generated |
@@ -23692,30 +25456,21 @@ neutral
 | System.Collections.Immutable;ImmutableHashSet<T>;Overlaps;(System.Collections.Generic.IEnumerable<T>);summary;df-generated |
 | System.Collections.Immutable;ImmutableHashSet<T>;Remove;(T);summary;df-generated |
 | System.Collections.Immutable;ImmutableHashSet<T>;SetEquals;(System.Collections.Generic.IEnumerable<T>);summary;df-generated |
+| System.Collections.Immutable;ImmutableHashSet<T>;SymmetricExcept;(System.Collections.Generic.IEnumerable<T>);summary;df-generated |
 | System.Collections.Immutable;ImmutableHashSet<T>;SymmetricExceptWith;(System.Collections.Generic.IEnumerable<T>);summary;df-generated |
+| System.Collections.Immutable;ImmutableHashSet<T>;TryGetValue;(T,T);summary;df-generated |
+| System.Collections.Immutable;ImmutableHashSet<T>;Union;(System.Collections.Generic.IEnumerable<T>);summary;df-generated |
 | System.Collections.Immutable;ImmutableHashSet<T>;UnionWith;(System.Collections.Generic.IEnumerable<T>);summary;df-generated |
 | System.Collections.Immutable;ImmutableHashSet<T>;get_Count;();summary;df-generated |
 | System.Collections.Immutable;ImmutableHashSet<T>;get_IsEmpty;();summary;df-generated |
 | System.Collections.Immutable;ImmutableHashSet<T>;get_IsReadOnly;();summary;df-generated |
 | System.Collections.Immutable;ImmutableHashSet<T>;get_IsSynchronized;();summary;df-generated |
-| System.Collections.Immutable;ImmutableInterlocked;Enqueue<T>;(System.Collections.Immutable.ImmutableQueue<T>,T);summary;df-generated |
-| System.Collections.Immutable;ImmutableInterlocked;InterlockedCompareExchange<T>;(System.Collections.Immutable.ImmutableArray<T>,System.Collections.Immutable.ImmutableArray<T>,System.Collections.Immutable.ImmutableArray<T>);summary;df-generated |
-| System.Collections.Immutable;ImmutableInterlocked;InterlockedExchange<T>;(System.Collections.Immutable.ImmutableArray<T>,System.Collections.Immutable.ImmutableArray<T>);summary;df-generated |
-| System.Collections.Immutable;ImmutableInterlocked;InterlockedInitialize<T>;(System.Collections.Immutable.ImmutableArray<T>,System.Collections.Immutable.ImmutableArray<T>);summary;df-generated |
-| System.Collections.Immutable;ImmutableInterlocked;Push<T>;(System.Collections.Immutable.ImmutableStack<T>,T);summary;df-generated |
-| System.Collections.Immutable;ImmutableInterlocked;TryAdd<TKey,TValue>;(System.Collections.Immutable.ImmutableDictionary<TKey,TValue>,TKey,TValue);summary;df-generated |
-| System.Collections.Immutable;ImmutableInterlocked;TryDequeue<T>;(System.Collections.Immutable.ImmutableQueue<T>,T);summary;df-generated |
-| System.Collections.Immutable;ImmutableInterlocked;TryPop<T>;(System.Collections.Immutable.ImmutableStack<T>,T);summary;df-generated |
-| System.Collections.Immutable;ImmutableInterlocked;TryRemove<TKey,TValue>;(System.Collections.Immutable.ImmutableDictionary<TKey,TValue>,TKey,TValue);summary;df-generated |
-| System.Collections.Immutable;ImmutableInterlocked;TryUpdate<TKey,TValue>;(System.Collections.Immutable.ImmutableDictionary<TKey,TValue>,TKey,TValue,TValue);summary;df-generated |
 | System.Collections.Immutable;ImmutableList;Create<T>;();summary;df-generated |
 | System.Collections.Immutable;ImmutableList;CreateBuilder<T>;();summary;df-generated |
 | System.Collections.Immutable;ImmutableList;IndexOf<T>;(System.Collections.Immutable.IImmutableList<T>,T);summary;df-generated |
-| System.Collections.Immutable;ImmutableList;IndexOf<T>;(System.Collections.Immutable.IImmutableList<T>,T,System.Collections.Generic.IEqualityComparer<T>);summary;df-generated |
 | System.Collections.Immutable;ImmutableList;IndexOf<T>;(System.Collections.Immutable.IImmutableList<T>,T,System.Int32);summary;df-generated |
 | System.Collections.Immutable;ImmutableList;IndexOf<T>;(System.Collections.Immutable.IImmutableList<T>,T,System.Int32,System.Int32);summary;df-generated |
 | System.Collections.Immutable;ImmutableList;LastIndexOf<T>;(System.Collections.Immutable.IImmutableList<T>,T);summary;df-generated |
-| System.Collections.Immutable;ImmutableList;LastIndexOf<T>;(System.Collections.Immutable.IImmutableList<T>,T,System.Collections.Generic.IEqualityComparer<T>);summary;df-generated |
 | System.Collections.Immutable;ImmutableList;LastIndexOf<T>;(System.Collections.Immutable.IImmutableList<T>,T,System.Int32);summary;df-generated |
 | System.Collections.Immutable;ImmutableList;LastIndexOf<T>;(System.Collections.Immutable.IImmutableList<T>,T,System.Int32,System.Int32);summary;df-generated |
 | System.Collections.Immutable;ImmutableList;ToImmutableList<TSource>;(System.Collections.Immutable.ImmutableList<TSource>+Builder);summary;df-generated |
@@ -23723,19 +25478,26 @@ neutral
 | System.Collections.Immutable;ImmutableList<T>+Builder;Clear;();summary;df-generated |
 | System.Collections.Immutable;ImmutableList<T>+Builder;Contains;(System.Object);summary;df-generated |
 | System.Collections.Immutable;ImmutableList<T>+Builder;Contains;(T);summary;df-generated |
+| System.Collections.Immutable;ImmutableList<T>+Builder;ConvertAll<TOutput>;(System.Func<T,TOutput>);summary;df-generated |
 | System.Collections.Immutable;ImmutableList<T>+Builder;CopyTo;(System.Int32,T[],System.Int32,System.Int32);summary;df-generated |
+| System.Collections.Immutable;ImmutableList<T>+Builder;Exists;(System.Predicate<T>);summary;df-generated |
+| System.Collections.Immutable;ImmutableList<T>+Builder;FindIndex;(System.Int32,System.Int32,System.Predicate<T>);summary;df-generated |
+| System.Collections.Immutable;ImmutableList<T>+Builder;FindIndex;(System.Int32,System.Predicate<T>);summary;df-generated |
+| System.Collections.Immutable;ImmutableList<T>+Builder;FindIndex;(System.Predicate<T>);summary;df-generated |
+| System.Collections.Immutable;ImmutableList<T>+Builder;FindLastIndex;(System.Int32,System.Int32,System.Predicate<T>);summary;df-generated |
+| System.Collections.Immutable;ImmutableList<T>+Builder;FindLastIndex;(System.Int32,System.Predicate<T>);summary;df-generated |
+| System.Collections.Immutable;ImmutableList<T>+Builder;FindLastIndex;(System.Predicate<T>);summary;df-generated |
 | System.Collections.Immutable;ImmutableList<T>+Builder;IndexOf;(System.Object);summary;df-generated |
 | System.Collections.Immutable;ImmutableList<T>+Builder;IndexOf;(T);summary;df-generated |
 | System.Collections.Immutable;ImmutableList<T>+Builder;IndexOf;(T,System.Int32);summary;df-generated |
 | System.Collections.Immutable;ImmutableList<T>+Builder;IndexOf;(T,System.Int32,System.Int32);summary;df-generated |
-| System.Collections.Immutable;ImmutableList<T>+Builder;IndexOf;(T,System.Int32,System.Int32,System.Collections.Generic.IEqualityComparer<T>);summary;df-generated |
 | System.Collections.Immutable;ImmutableList<T>+Builder;ItemRef;(System.Int32);summary;df-generated |
 | System.Collections.Immutable;ImmutableList<T>+Builder;LastIndexOf;(T);summary;df-generated |
 | System.Collections.Immutable;ImmutableList<T>+Builder;LastIndexOf;(T,System.Int32);summary;df-generated |
 | System.Collections.Immutable;ImmutableList<T>+Builder;LastIndexOf;(T,System.Int32,System.Int32);summary;df-generated |
-| System.Collections.Immutable;ImmutableList<T>+Builder;LastIndexOf;(T,System.Int32,System.Int32,System.Collections.Generic.IEqualityComparer<T>);summary;df-generated |
+| System.Collections.Immutable;ImmutableList<T>+Builder;Remove;(System.Object);summary;df-generated |
 | System.Collections.Immutable;ImmutableList<T>+Builder;Remove;(T);summary;df-generated |
-| System.Collections.Immutable;ImmutableList<T>+Builder;Remove;(T,System.Collections.Generic.IEqualityComparer<T>);summary;df-generated |
+| System.Collections.Immutable;ImmutableList<T>+Builder;RemoveAll;(System.Predicate<T>);summary;df-generated |
 | System.Collections.Immutable;ImmutableList<T>+Builder;RemoveAt;(System.Int32);summary;df-generated |
 | System.Collections.Immutable;ImmutableList<T>+Builder;RemoveRange;(System.Collections.Generic.IEnumerable<T>);summary;df-generated |
 | System.Collections.Immutable;ImmutableList<T>+Builder;RemoveRange;(System.Collections.Generic.IEnumerable<T>,System.Collections.Generic.IEqualityComparer<T>);summary;df-generated |
@@ -23744,8 +25506,10 @@ neutral
 | System.Collections.Immutable;ImmutableList<T>+Builder;Reverse;(System.Int32,System.Int32);summary;df-generated |
 | System.Collections.Immutable;ImmutableList<T>+Builder;Sort;();summary;df-generated |
 | System.Collections.Immutable;ImmutableList<T>+Builder;Sort;(System.Collections.Generic.IComparer<T>);summary;df-generated |
+| System.Collections.Immutable;ImmutableList<T>+Builder;Sort;(System.Comparison<T>);summary;df-generated |
 | System.Collections.Immutable;ImmutableList<T>+Builder;Sort;(System.Int32,System.Int32,System.Collections.Generic.IComparer<T>);summary;df-generated |
 | System.Collections.Immutable;ImmutableList<T>+Builder;ToImmutable;();summary;df-generated |
+| System.Collections.Immutable;ImmutableList<T>+Builder;TrueForAll;(System.Predicate<T>);summary;df-generated |
 | System.Collections.Immutable;ImmutableList<T>+Builder;get_Count;();summary;df-generated |
 | System.Collections.Immutable;ImmutableList<T>+Builder;get_IsFixedSize;();summary;df-generated |
 | System.Collections.Immutable;ImmutableList<T>+Builder;get_IsReadOnly;();summary;df-generated |
@@ -23754,32 +25518,58 @@ neutral
 | System.Collections.Immutable;ImmutableList<T>+Enumerator;Dispose;();summary;df-generated |
 | System.Collections.Immutable;ImmutableList<T>+Enumerator;MoveNext;();summary;df-generated |
 | System.Collections.Immutable;ImmutableList<T>+Enumerator;Reset;();summary;df-generated |
+| System.Collections.Immutable;ImmutableList<T>+Enumerator;get_Current;();summary;df-generated |
 | System.Collections.Immutable;ImmutableList<T>;BinarySearch;(T);summary;df-generated |
 | System.Collections.Immutable;ImmutableList<T>;Clear;();summary;df-generated |
 | System.Collections.Immutable;ImmutableList<T>;Contains;(System.Object);summary;df-generated |
 | System.Collections.Immutable;ImmutableList<T>;Contains;(T);summary;df-generated |
+| System.Collections.Immutable;ImmutableList<T>;ConvertAll<TOutput>;(System.Func<T,TOutput>);summary;df-generated |
 | System.Collections.Immutable;ImmutableList<T>;CopyTo;(System.Int32,T[],System.Int32,System.Int32);summary;df-generated |
+| System.Collections.Immutable;ImmutableList<T>;Exists;(System.Predicate<T>);summary;df-generated |
+| System.Collections.Immutable;ImmutableList<T>;FindIndex;(System.Int32,System.Int32,System.Predicate<T>);summary;df-generated |
+| System.Collections.Immutable;ImmutableList<T>;FindIndex;(System.Int32,System.Predicate<T>);summary;df-generated |
+| System.Collections.Immutable;ImmutableList<T>;FindIndex;(System.Predicate<T>);summary;df-generated |
+| System.Collections.Immutable;ImmutableList<T>;FindLastIndex;(System.Int32,System.Int32,System.Predicate<T>);summary;df-generated |
+| System.Collections.Immutable;ImmutableList<T>;FindLastIndex;(System.Int32,System.Predicate<T>);summary;df-generated |
+| System.Collections.Immutable;ImmutableList<T>;FindLastIndex;(System.Predicate<T>);summary;df-generated |
 | System.Collections.Immutable;ImmutableList<T>;IndexOf;(System.Object);summary;df-generated |
 | System.Collections.Immutable;ImmutableList<T>;IndexOf;(T);summary;df-generated |
 | System.Collections.Immutable;ImmutableList<T>;IndexOf;(T,System.Int32,System.Int32,System.Collections.Generic.IEqualityComparer<T>);summary;df-generated |
+| System.Collections.Immutable;ImmutableList<T>;Insert;(System.Int32,T);summary;df-generated |
+| System.Collections.Immutable;ImmutableList<T>;InsertRange;(System.Int32,System.Collections.Generic.IEnumerable<T>);summary;df-generated |
 | System.Collections.Immutable;ImmutableList<T>;ItemRef;(System.Int32);summary;df-generated |
 | System.Collections.Immutable;ImmutableList<T>;LastIndexOf;(T,System.Int32,System.Int32,System.Collections.Generic.IEqualityComparer<T>);summary;df-generated |
+| System.Collections.Immutable;ImmutableList<T>;Remove;(System.Object);summary;df-generated |
 | System.Collections.Immutable;ImmutableList<T>;Remove;(T);summary;df-generated |
+| System.Collections.Immutable;ImmutableList<T>;Remove;(T,System.Collections.Generic.IEqualityComparer<T>);summary;df-generated |
+| System.Collections.Immutable;ImmutableList<T>;RemoveAll;(System.Predicate<T>);summary;df-generated |
 | System.Collections.Immutable;ImmutableList<T>;RemoveAt;(System.Int32);summary;df-generated |
+| System.Collections.Immutable;ImmutableList<T>;RemoveRange;(System.Collections.Generic.IEnumerable<T>,System.Collections.Generic.IEqualityComparer<T>);summary;df-generated |
+| System.Collections.Immutable;ImmutableList<T>;RemoveRange;(System.Int32,System.Int32);summary;df-generated |
+| System.Collections.Immutable;ImmutableList<T>;Replace;(T,T,System.Collections.Generic.IEqualityComparer<T>);summary;df-generated |
+| System.Collections.Immutable;ImmutableList<T>;SetItem;(System.Int32,T);summary;df-generated |
+| System.Collections.Immutable;ImmutableList<T>;TrueForAll;(System.Predicate<T>);summary;df-generated |
 | System.Collections.Immutable;ImmutableList<T>;get_Count;();summary;df-generated |
 | System.Collections.Immutable;ImmutableList<T>;get_IsEmpty;();summary;df-generated |
 | System.Collections.Immutable;ImmutableList<T>;get_IsFixedSize;();summary;df-generated |
 | System.Collections.Immutable;ImmutableList<T>;get_IsReadOnly;();summary;df-generated |
 | System.Collections.Immutable;ImmutableList<T>;get_IsSynchronized;();summary;df-generated |
+| System.Collections.Immutable;ImmutableList<T>;get_Item;(System.Int32);summary;df-generated |
 | System.Collections.Immutable;ImmutableQueue;Create<T>;();summary;df-generated |
 | System.Collections.Immutable;ImmutableQueue<T>+Enumerator;MoveNext;();summary;df-generated |
 | System.Collections.Immutable;ImmutableQueue<T>;Clear;();summary;df-generated |
+| System.Collections.Immutable;ImmutableQueue<T>;Dequeue;();summary;df-generated |
+| System.Collections.Immutable;ImmutableQueue<T>;Enqueue;(T);summary;df-generated |
+| System.Collections.Immutable;ImmutableQueue<T>;Peek;();summary;df-generated |
 | System.Collections.Immutable;ImmutableQueue<T>;PeekRef;();summary;df-generated |
 | System.Collections.Immutable;ImmutableQueue<T>;get_Empty;();summary;df-generated |
 | System.Collections.Immutable;ImmutableQueue<T>;get_IsEmpty;();summary;df-generated |
 | System.Collections.Immutable;ImmutableSortedDictionary;Create<TKey,TValue>;();summary;df-generated |
 | System.Collections.Immutable;ImmutableSortedDictionary;CreateBuilder<TKey,TValue>;();summary;df-generated |
 | System.Collections.Immutable;ImmutableSortedDictionary;ToImmutableSortedDictionary<TKey,TValue>;(System.Collections.Immutable.ImmutableSortedDictionary<TKey,TValue>+Builder);summary;df-generated |
+| System.Collections.Immutable;ImmutableSortedDictionary;ToImmutableSortedDictionary<TSource,TKey,TValue>;(System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,TKey>,System.Func<TSource,TValue>);summary;df-generated |
+| System.Collections.Immutable;ImmutableSortedDictionary;ToImmutableSortedDictionary<TSource,TKey,TValue>;(System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,TKey>,System.Func<TSource,TValue>,System.Collections.Generic.IComparer<TKey>);summary;df-generated |
+| System.Collections.Immutable;ImmutableSortedDictionary;ToImmutableSortedDictionary<TSource,TKey,TValue>;(System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,TKey>,System.Func<TSource,TValue>,System.Collections.Generic.IComparer<TKey>,System.Collections.Generic.IEqualityComparer<TValue>);summary;df-generated |
 | System.Collections.Immutable;ImmutableSortedDictionary<TKey,TValue>+Builder;Contains;(System.Collections.Generic.KeyValuePair<TKey,TValue>);summary;df-generated |
 | System.Collections.Immutable;ImmutableSortedDictionary<TKey,TValue>+Builder;Contains;(System.Object);summary;df-generated |
 | System.Collections.Immutable;ImmutableSortedDictionary<TKey,TValue>+Builder;ContainsKey;(TKey);summary;df-generated |
@@ -23796,9 +25586,14 @@ neutral
 | System.Collections.Immutable;ImmutableSortedDictionary<TKey,TValue>+Builder;get_IsFixedSize;();summary;df-generated |
 | System.Collections.Immutable;ImmutableSortedDictionary<TKey,TValue>+Builder;get_IsReadOnly;();summary;df-generated |
 | System.Collections.Immutable;ImmutableSortedDictionary<TKey,TValue>+Builder;get_IsSynchronized;();summary;df-generated |
+| System.Collections.Immutable;ImmutableSortedDictionary<TKey,TValue>+Builder;get_Item;(TKey);summary;df-generated |
+| System.Collections.Immutable;ImmutableSortedDictionary<TKey,TValue>+Builder;get_Keys;();summary;df-generated |
+| System.Collections.Immutable;ImmutableSortedDictionary<TKey,TValue>+Builder;get_Values;();summary;df-generated |
 | System.Collections.Immutable;ImmutableSortedDictionary<TKey,TValue>+Enumerator;Dispose;();summary;df-generated |
 | System.Collections.Immutable;ImmutableSortedDictionary<TKey,TValue>+Enumerator;MoveNext;();summary;df-generated |
 | System.Collections.Immutable;ImmutableSortedDictionary<TKey,TValue>+Enumerator;Reset;();summary;df-generated |
+| System.Collections.Immutable;ImmutableSortedDictionary<TKey,TValue>+Enumerator;get_Current;();summary;df-generated |
+| System.Collections.Immutable;ImmutableSortedDictionary<TKey,TValue>;Add;(TKey,TValue);summary;df-generated |
 | System.Collections.Immutable;ImmutableSortedDictionary<TKey,TValue>;Contains;(System.Collections.Generic.KeyValuePair<TKey,TValue>);summary;df-generated |
 | System.Collections.Immutable;ImmutableSortedDictionary<TKey,TValue>;Contains;(System.Object);summary;df-generated |
 | System.Collections.Immutable;ImmutableSortedDictionary<TKey,TValue>;ContainsKey;(TKey);summary;df-generated |
@@ -23806,6 +25601,10 @@ neutral
 | System.Collections.Immutable;ImmutableSortedDictionary<TKey,TValue>;Remove;(System.Collections.Generic.KeyValuePair<TKey,TValue>);summary;df-generated |
 | System.Collections.Immutable;ImmutableSortedDictionary<TKey,TValue>;Remove;(System.Object);summary;df-generated |
 | System.Collections.Immutable;ImmutableSortedDictionary<TKey,TValue>;Remove;(TKey);summary;df-generated |
+| System.Collections.Immutable;ImmutableSortedDictionary<TKey,TValue>;RemoveRange;(System.Collections.Generic.IEnumerable<TKey>);summary;df-generated |
+| System.Collections.Immutable;ImmutableSortedDictionary<TKey,TValue>;SetItem;(TKey,TValue);summary;df-generated |
+| System.Collections.Immutable;ImmutableSortedDictionary<TKey,TValue>;SetItems;(System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<TKey,TValue>>);summary;df-generated |
+| System.Collections.Immutable;ImmutableSortedDictionary<TKey,TValue>;TryGetKey;(TKey,TKey);summary;df-generated |
 | System.Collections.Immutable;ImmutableSortedDictionary<TKey,TValue>;TryGetValue;(TKey,TValue);summary;df-generated |
 | System.Collections.Immutable;ImmutableSortedDictionary<TKey,TValue>;ValueRef;(TKey);summary;df-generated |
 | System.Collections.Immutable;ImmutableSortedDictionary<TKey,TValue>;get_Count;();summary;df-generated |
@@ -23813,12 +25612,16 @@ neutral
 | System.Collections.Immutable;ImmutableSortedDictionary<TKey,TValue>;get_IsFixedSize;();summary;df-generated |
 | System.Collections.Immutable;ImmutableSortedDictionary<TKey,TValue>;get_IsReadOnly;();summary;df-generated |
 | System.Collections.Immutable;ImmutableSortedDictionary<TKey,TValue>;get_IsSynchronized;();summary;df-generated |
+| System.Collections.Immutable;ImmutableSortedDictionary<TKey,TValue>;get_Item;(TKey);summary;df-generated |
+| System.Collections.Immutable;ImmutableSortedDictionary<TKey,TValue>;get_Keys;();summary;df-generated |
+| System.Collections.Immutable;ImmutableSortedDictionary<TKey,TValue>;get_Values;();summary;df-generated |
 | System.Collections.Immutable;ImmutableSortedSet;Create<T>;();summary;df-generated |
 | System.Collections.Immutable;ImmutableSortedSet;CreateBuilder<T>;();summary;df-generated |
 | System.Collections.Immutable;ImmutableSortedSet;ToImmutableSortedSet<TSource>;(System.Collections.Immutable.ImmutableSortedSet<TSource>+Builder);summary;df-generated |
 | System.Collections.Immutable;ImmutableSortedSet<T>+Builder;Contains;(T);summary;df-generated |
 | System.Collections.Immutable;ImmutableSortedSet<T>+Builder;ExceptWith;(System.Collections.Generic.IEnumerable<T>);summary;df-generated |
 | System.Collections.Immutable;ImmutableSortedSet<T>+Builder;IndexOf;(T);summary;df-generated |
+| System.Collections.Immutable;ImmutableSortedSet<T>+Builder;IntersectWith;(System.Collections.Generic.IEnumerable<T>);summary;df-generated |
 | System.Collections.Immutable;ImmutableSortedSet<T>+Builder;IsProperSubsetOf;(System.Collections.Generic.IEnumerable<T>);summary;df-generated |
 | System.Collections.Immutable;ImmutableSortedSet<T>+Builder;IsProperSupersetOf;(System.Collections.Generic.IEnumerable<T>);summary;df-generated |
 | System.Collections.Immutable;ImmutableSortedSet<T>+Builder;IsSubsetOf;(System.Collections.Generic.IEnumerable<T>);summary;df-generated |
@@ -23827,7 +25630,9 @@ neutral
 | System.Collections.Immutable;ImmutableSortedSet<T>+Builder;Overlaps;(System.Collections.Generic.IEnumerable<T>);summary;df-generated |
 | System.Collections.Immutable;ImmutableSortedSet<T>+Builder;Remove;(T);summary;df-generated |
 | System.Collections.Immutable;ImmutableSortedSet<T>+Builder;SetEquals;(System.Collections.Generic.IEnumerable<T>);summary;df-generated |
+| System.Collections.Immutable;ImmutableSortedSet<T>+Builder;SymmetricExceptWith;(System.Collections.Generic.IEnumerable<T>);summary;df-generated |
 | System.Collections.Immutable;ImmutableSortedSet<T>+Builder;ToImmutable;();summary;df-generated |
+| System.Collections.Immutable;ImmutableSortedSet<T>+Builder;UnionWith;(System.Collections.Generic.IEnumerable<T>);summary;df-generated |
 | System.Collections.Immutable;ImmutableSortedSet<T>+Builder;get_Count;();summary;df-generated |
 | System.Collections.Immutable;ImmutableSortedSet<T>+Builder;get_IsReadOnly;();summary;df-generated |
 | System.Collections.Immutable;ImmutableSortedSet<T>+Builder;get_IsSynchronized;();summary;df-generated |
@@ -23835,11 +25640,14 @@ neutral
 | System.Collections.Immutable;ImmutableSortedSet<T>+Enumerator;Dispose;();summary;df-generated |
 | System.Collections.Immutable;ImmutableSortedSet<T>+Enumerator;MoveNext;();summary;df-generated |
 | System.Collections.Immutable;ImmutableSortedSet<T>+Enumerator;Reset;();summary;df-generated |
+| System.Collections.Immutable;ImmutableSortedSet<T>+Enumerator;get_Current;();summary;df-generated |
 | System.Collections.Immutable;ImmutableSortedSet<T>;Contains;(System.Object);summary;df-generated |
 | System.Collections.Immutable;ImmutableSortedSet<T>;Contains;(T);summary;df-generated |
+| System.Collections.Immutable;ImmutableSortedSet<T>;Except;(System.Collections.Generic.IEnumerable<T>);summary;df-generated |
 | System.Collections.Immutable;ImmutableSortedSet<T>;ExceptWith;(System.Collections.Generic.IEnumerable<T>);summary;df-generated |
 | System.Collections.Immutable;ImmutableSortedSet<T>;IndexOf;(System.Object);summary;df-generated |
 | System.Collections.Immutable;ImmutableSortedSet<T>;IndexOf;(T);summary;df-generated |
+| System.Collections.Immutable;ImmutableSortedSet<T>;Intersect;(System.Collections.Generic.IEnumerable<T>);summary;df-generated |
 | System.Collections.Immutable;ImmutableSortedSet<T>;IntersectWith;(System.Collections.Generic.IEnumerable<T>);summary;df-generated |
 | System.Collections.Immutable;ImmutableSortedSet<T>;IsProperSubsetOf;(System.Collections.Generic.IEnumerable<T>);summary;df-generated |
 | System.Collections.Immutable;ImmutableSortedSet<T>;IsProperSupersetOf;(System.Collections.Generic.IEnumerable<T>);summary;df-generated |
@@ -23847,20 +25655,28 @@ neutral
 | System.Collections.Immutable;ImmutableSortedSet<T>;IsSupersetOf;(System.Collections.Generic.IEnumerable<T>);summary;df-generated |
 | System.Collections.Immutable;ImmutableSortedSet<T>;ItemRef;(System.Int32);summary;df-generated |
 | System.Collections.Immutable;ImmutableSortedSet<T>;Overlaps;(System.Collections.Generic.IEnumerable<T>);summary;df-generated |
+| System.Collections.Immutable;ImmutableSortedSet<T>;Remove;(System.Object);summary;df-generated |
 | System.Collections.Immutable;ImmutableSortedSet<T>;Remove;(T);summary;df-generated |
 | System.Collections.Immutable;ImmutableSortedSet<T>;RemoveAt;(System.Int32);summary;df-generated |
 | System.Collections.Immutable;ImmutableSortedSet<T>;SetEquals;(System.Collections.Generic.IEnumerable<T>);summary;df-generated |
+| System.Collections.Immutable;ImmutableSortedSet<T>;SymmetricExcept;(System.Collections.Generic.IEnumerable<T>);summary;df-generated |
 | System.Collections.Immutable;ImmutableSortedSet<T>;SymmetricExceptWith;(System.Collections.Generic.IEnumerable<T>);summary;df-generated |
+| System.Collections.Immutable;ImmutableSortedSet<T>;TryGetValue;(T,T);summary;df-generated |
+| System.Collections.Immutable;ImmutableSortedSet<T>;Union;(System.Collections.Generic.IEnumerable<T>);summary;df-generated |
 | System.Collections.Immutable;ImmutableSortedSet<T>;UnionWith;(System.Collections.Generic.IEnumerable<T>);summary;df-generated |
 | System.Collections.Immutable;ImmutableSortedSet<T>;get_Count;();summary;df-generated |
 | System.Collections.Immutable;ImmutableSortedSet<T>;get_IsEmpty;();summary;df-generated |
 | System.Collections.Immutable;ImmutableSortedSet<T>;get_IsFixedSize;();summary;df-generated |
 | System.Collections.Immutable;ImmutableSortedSet<T>;get_IsReadOnly;();summary;df-generated |
 | System.Collections.Immutable;ImmutableSortedSet<T>;get_IsSynchronized;();summary;df-generated |
+| System.Collections.Immutable;ImmutableSortedSet<T>;get_Item;(System.Int32);summary;df-generated |
 | System.Collections.Immutable;ImmutableStack;Create<T>;();summary;df-generated |
 | System.Collections.Immutable;ImmutableStack<T>+Enumerator;MoveNext;();summary;df-generated |
 | System.Collections.Immutable;ImmutableStack<T>;Clear;();summary;df-generated |
+| System.Collections.Immutable;ImmutableStack<T>;Peek;();summary;df-generated |
 | System.Collections.Immutable;ImmutableStack<T>;PeekRef;();summary;df-generated |
+| System.Collections.Immutable;ImmutableStack<T>;Pop;();summary;df-generated |
+| System.Collections.Immutable;ImmutableStack<T>;Push;(T);summary;df-generated |
 | System.Collections.Immutable;ImmutableStack<T>;get_Empty;();summary;df-generated |
 | System.Collections.Immutable;ImmutableStack<T>;get_IsEmpty;();summary;df-generated |
 | System.Collections.ObjectModel;Collection<T>;ClearItems;();summary;df-generated |
@@ -23868,6 +25684,7 @@ neutral
 | System.Collections.ObjectModel;Collection<T>;Contains;(T);summary;df-generated |
 | System.Collections.ObjectModel;Collection<T>;IndexOf;(System.Object);summary;df-generated |
 | System.Collections.ObjectModel;Collection<T>;IndexOf;(T);summary;df-generated |
+| System.Collections.ObjectModel;Collection<T>;Remove;(System.Object);summary;df-generated |
 | System.Collections.ObjectModel;Collection<T>;Remove;(T);summary;df-generated |
 | System.Collections.ObjectModel;Collection<T>;RemoveAt;(System.Int32);summary;df-generated |
 | System.Collections.ObjectModel;Collection<T>;RemoveItem;(System.Int32);summary;df-generated |
@@ -23875,16 +25692,20 @@ neutral
 | System.Collections.ObjectModel;Collection<T>;get_IsFixedSize;();summary;df-generated |
 | System.Collections.ObjectModel;Collection<T>;get_IsReadOnly;();summary;df-generated |
 | System.Collections.ObjectModel;Collection<T>;get_IsSynchronized;();summary;df-generated |
+| System.Collections.ObjectModel;Collection<T>;get_Item;(System.Int32);summary;df-generated |
 | System.Collections.ObjectModel;KeyedCollection<TKey,TItem>;ChangeItemKey;(TItem,TKey);summary;df-generated |
 | System.Collections.ObjectModel;KeyedCollection<TKey,TItem>;ClearItems;();summary;df-generated |
 | System.Collections.ObjectModel;KeyedCollection<TKey,TItem>;Contains;(TKey);summary;df-generated |
 | System.Collections.ObjectModel;KeyedCollection<TKey,TItem>;GetKeyForItem;(TItem);summary;df-generated |
+| System.Collections.ObjectModel;KeyedCollection<TKey,TItem>;InsertItem;(System.Int32,TItem);summary;df-generated |
 | System.Collections.ObjectModel;KeyedCollection<TKey,TItem>;KeyedCollection;(System.Collections.Generic.IEqualityComparer<TKey>);summary;df-generated |
 | System.Collections.ObjectModel;KeyedCollection<TKey,TItem>;Remove;(TKey);summary;df-generated |
 | System.Collections.ObjectModel;KeyedCollection<TKey,TItem>;RemoveItem;(System.Int32);summary;df-generated |
+| System.Collections.ObjectModel;KeyedCollection<TKey,TItem>;SetItem;(System.Int32,TItem);summary;df-generated |
 | System.Collections.ObjectModel;ObservableCollection<T>;BlockReentrancy;();summary;df-generated |
 | System.Collections.ObjectModel;ObservableCollection<T>;CheckReentrancy;();summary;df-generated |
 | System.Collections.ObjectModel;ObservableCollection<T>;ClearItems;();summary;df-generated |
+| System.Collections.ObjectModel;ObservableCollection<T>;InsertItem;(System.Int32,T);summary;df-generated |
 | System.Collections.ObjectModel;ObservableCollection<T>;Move;(System.Int32,System.Int32);summary;df-generated |
 | System.Collections.ObjectModel;ObservableCollection<T>;MoveItem;(System.Int32,System.Int32);summary;df-generated |
 | System.Collections.ObjectModel;ObservableCollection<T>;ObservableCollection;(System.Collections.Generic.IEnumerable<T>);summary;df-generated |
@@ -23892,10 +25713,16 @@ neutral
 | System.Collections.ObjectModel;ObservableCollection<T>;OnCollectionChanged;(System.Collections.Specialized.NotifyCollectionChangedEventArgs);summary;df-generated |
 | System.Collections.ObjectModel;ObservableCollection<T>;OnPropertyChanged;(System.ComponentModel.PropertyChangedEventArgs);summary;df-generated |
 | System.Collections.ObjectModel;ObservableCollection<T>;RemoveItem;(System.Int32);summary;df-generated |
+| System.Collections.ObjectModel;ObservableCollection<T>;SetItem;(System.Int32,T);summary;df-generated |
+| System.Collections.ObjectModel;ObservableCollection<T>;add_CollectionChanged;(System.Collections.Specialized.NotifyCollectionChangedEventHandler);summary;df-generated |
+| System.Collections.ObjectModel;ObservableCollection<T>;add_PropertyChanged;(System.ComponentModel.PropertyChangedEventHandler);summary;df-generated |
+| System.Collections.ObjectModel;ObservableCollection<T>;remove_CollectionChanged;(System.Collections.Specialized.NotifyCollectionChangedEventHandler);summary;df-generated |
+| System.Collections.ObjectModel;ObservableCollection<T>;remove_PropertyChanged;(System.ComponentModel.PropertyChangedEventHandler);summary;df-generated |
 | System.Collections.ObjectModel;ReadOnlyCollection<T>;Contains;(System.Object);summary;df-generated |
 | System.Collections.ObjectModel;ReadOnlyCollection<T>;Contains;(T);summary;df-generated |
 | System.Collections.ObjectModel;ReadOnlyCollection<T>;IndexOf;(System.Object);summary;df-generated |
 | System.Collections.ObjectModel;ReadOnlyCollection<T>;IndexOf;(T);summary;df-generated |
+| System.Collections.ObjectModel;ReadOnlyCollection<T>;Remove;(System.Object);summary;df-generated |
 | System.Collections.ObjectModel;ReadOnlyCollection<T>;Remove;(T);summary;df-generated |
 | System.Collections.ObjectModel;ReadOnlyCollection<T>;RemoveAt;(System.Int32);summary;df-generated |
 | System.Collections.ObjectModel;ReadOnlyCollection<T>;get_Count;();summary;df-generated |
@@ -23903,6 +25730,7 @@ neutral
 | System.Collections.ObjectModel;ReadOnlyCollection<T>;get_IsFixedSize;();summary;df-generated |
 | System.Collections.ObjectModel;ReadOnlyCollection<T>;get_IsReadOnly;();summary;df-generated |
 | System.Collections.ObjectModel;ReadOnlyCollection<T>;get_IsSynchronized;();summary;df-generated |
+| System.Collections.ObjectModel;ReadOnlyCollection<T>;get_Item;(System.Int32);summary;df-generated |
 | System.Collections.ObjectModel;ReadOnlyDictionary<TKey,TValue>+KeyCollection;Contains;(TKey);summary;df-generated |
 | System.Collections.ObjectModel;ReadOnlyDictionary<TKey,TValue>+KeyCollection;Remove;(TKey);summary;df-generated |
 | System.Collections.ObjectModel;ReadOnlyDictionary<TKey,TValue>+KeyCollection;get_Count;();summary;df-generated |
@@ -23925,10 +25753,17 @@ neutral
 | System.Collections.ObjectModel;ReadOnlyDictionary<TKey,TValue>;get_IsFixedSize;();summary;df-generated |
 | System.Collections.ObjectModel;ReadOnlyDictionary<TKey,TValue>;get_IsReadOnly;();summary;df-generated |
 | System.Collections.ObjectModel;ReadOnlyDictionary<TKey,TValue>;get_IsSynchronized;();summary;df-generated |
+| System.Collections.ObjectModel;ReadOnlyDictionary<TKey,TValue>;get_Item;(TKey);summary;df-generated |
+| System.Collections.ObjectModel;ReadOnlyDictionary<TKey,TValue>;get_Keys;();summary;df-generated |
+| System.Collections.ObjectModel;ReadOnlyDictionary<TKey,TValue>;get_Values;();summary;df-generated |
 | System.Collections.ObjectModel;ReadOnlyObservableCollection<T>;OnCollectionChanged;(System.Collections.Specialized.NotifyCollectionChangedEventArgs);summary;df-generated |
 | System.Collections.ObjectModel;ReadOnlyObservableCollection<T>;OnPropertyChanged;(System.ComponentModel.PropertyChangedEventArgs);summary;df-generated |
 | System.Collections.ObjectModel;ReadOnlyObservableCollection<T>;ReadOnlyObservableCollection;(System.Collections.ObjectModel.ObservableCollection<T>);summary;df-generated |
+| System.Collections.ObjectModel;ReadOnlyObservableCollection<T>;add_CollectionChanged;(System.Collections.Specialized.NotifyCollectionChangedEventHandler);summary;df-generated |
+| System.Collections.ObjectModel;ReadOnlyObservableCollection<T>;add_PropertyChanged;(System.ComponentModel.PropertyChangedEventHandler);summary;df-generated |
 | System.Collections.ObjectModel;ReadOnlyObservableCollection<T>;get_Empty;();summary;df-generated |
+| System.Collections.ObjectModel;ReadOnlyObservableCollection<T>;remove_CollectionChanged;(System.Collections.Specialized.NotifyCollectionChangedEventHandler);summary;df-generated |
+| System.Collections.ObjectModel;ReadOnlyObservableCollection<T>;remove_PropertyChanged;(System.ComponentModel.PropertyChangedEventHandler);summary;df-generated |
 | System.Collections.Specialized;BitVector32+Section;Equals;(System.Collections.Specialized.BitVector32+Section);summary;df-generated |
 | System.Collections.Specialized;BitVector32+Section;Equals;(System.Object);summary;df-generated |
 | System.Collections.Specialized;BitVector32+Section;GetHashCode;();summary;df-generated |
@@ -23966,6 +25801,8 @@ neutral
 | System.Collections.Specialized;HybridDictionary;get_IsFixedSize;();summary;df-generated |
 | System.Collections.Specialized;HybridDictionary;get_IsReadOnly;();summary;df-generated |
 | System.Collections.Specialized;HybridDictionary;get_IsSynchronized;();summary;df-generated |
+| System.Collections.Specialized;INotifyCollectionChanged;add_CollectionChanged;(System.Collections.Specialized.NotifyCollectionChangedEventHandler);summary;df-generated |
+| System.Collections.Specialized;INotifyCollectionChanged;remove_CollectionChanged;(System.Collections.Specialized.NotifyCollectionChangedEventHandler);summary;df-generated |
 | System.Collections.Specialized;IOrderedDictionary;GetEnumerator;();summary;df-generated |
 | System.Collections.Specialized;IOrderedDictionary;Insert;(System.Int32,System.Object,System.Object);summary;df-generated |
 | System.Collections.Specialized;IOrderedDictionary;RemoveAt;(System.Int32);summary;df-generated |
@@ -24010,6 +25847,7 @@ neutral
 | System.Collections.Specialized;NotifyCollectionChangedEventArgs;get_NewStartingIndex;();summary;df-generated |
 | System.Collections.Specialized;NotifyCollectionChangedEventArgs;get_OldStartingIndex;();summary;df-generated |
 | System.Collections.Specialized;OrderedDictionary;Contains;(System.Object);summary;df-generated |
+| System.Collections.Specialized;OrderedDictionary;GetEnumerator;();summary;df-generated |
 | System.Collections.Specialized;OrderedDictionary;Insert;(System.Int32,System.Object,System.Object);summary;df-generated |
 | System.Collections.Specialized;OrderedDictionary;OnDeserialization;(System.Object);summary;df-generated |
 | System.Collections.Specialized;OrderedDictionary;OrderedDictionary;(System.Collections.IEqualityComparer);summary;df-generated |
@@ -24024,6 +25862,7 @@ neutral
 | System.Collections.Specialized;StringCollection;Contains;(System.String);summary;df-generated |
 | System.Collections.Specialized;StringCollection;IndexOf;(System.Object);summary;df-generated |
 | System.Collections.Specialized;StringCollection;IndexOf;(System.String);summary;df-generated |
+| System.Collections.Specialized;StringCollection;Remove;(System.Object);summary;df-generated |
 | System.Collections.Specialized;StringCollection;Remove;(System.String);summary;df-generated |
 | System.Collections.Specialized;StringCollection;RemoveAt;(System.Int32);summary;df-generated |
 | System.Collections.Specialized;StringCollection;get_Count;();summary;df-generated |
@@ -24052,6 +25891,7 @@ neutral
 | System.Collections;ArrayList;LastIndexOf;(System.Object);summary;df-generated |
 | System.Collections;ArrayList;LastIndexOf;(System.Object,System.Int32);summary;df-generated |
 | System.Collections;ArrayList;LastIndexOf;(System.Object,System.Int32,System.Int32);summary;df-generated |
+| System.Collections;ArrayList;Remove;(System.Object);summary;df-generated |
 | System.Collections;ArrayList;RemoveAt;(System.Int32);summary;df-generated |
 | System.Collections;ArrayList;RemoveRange;(System.Int32,System.Int32);summary;df-generated |
 | System.Collections;ArrayList;Reverse;();summary;df-generated |
@@ -24080,7 +25920,6 @@ neutral
 | System.Collections;BitArray;get_IsSynchronized;();summary;df-generated |
 | System.Collections;BitArray;get_Item;(System.Int32);summary;df-generated |
 | System.Collections;BitArray;set_Item;(System.Int32,System.Boolean);summary;df-generated |
-| System.Collections;CaseInsensitiveComparer;Compare;(System.Object,System.Object);summary;df-generated |
 | System.Collections;CaseInsensitiveComparer;get_Default;();summary;df-generated |
 | System.Collections;CaseInsensitiveComparer;get_DefaultInvariant;();summary;df-generated |
 | System.Collections;CaseInsensitiveHashCodeProvider;GetHashCode;(System.Object);summary;df-generated |
@@ -24096,12 +25935,12 @@ neutral
 | System.Collections;CollectionBase;OnRemoveComplete;(System.Int32,System.Object);summary;df-generated |
 | System.Collections;CollectionBase;OnSetComplete;(System.Int32,System.Object,System.Object);summary;df-generated |
 | System.Collections;CollectionBase;OnValidate;(System.Object);summary;df-generated |
+| System.Collections;CollectionBase;Remove;(System.Object);summary;df-generated |
 | System.Collections;CollectionBase;RemoveAt;(System.Int32);summary;df-generated |
 | System.Collections;CollectionBase;get_Count;();summary;df-generated |
 | System.Collections;CollectionBase;get_IsFixedSize;();summary;df-generated |
 | System.Collections;CollectionBase;get_IsReadOnly;();summary;df-generated |
 | System.Collections;CollectionBase;get_IsSynchronized;();summary;df-generated |
-| System.Collections;Comparer;Compare;(System.Object,System.Object);summary;df-generated |
 | System.Collections;DictionaryBase;Contains;(System.Object);summary;df-generated |
 | System.Collections;DictionaryBase;OnClear;();summary;df-generated |
 | System.Collections;DictionaryBase;OnClearComplete;();summary;df-generated |
@@ -24138,18 +25977,16 @@ neutral
 | System.Collections;Hashtable;get_IsSynchronized;();summary;df-generated |
 | System.Collections;ICollection;get_Count;();summary;df-generated |
 | System.Collections;ICollection;get_IsSynchronized;();summary;df-generated |
-| System.Collections;IComparer;Compare;(System.Object,System.Object);summary;df-generated |
 | System.Collections;IDictionary;Contains;(System.Object);summary;df-generated |
 | System.Collections;IDictionary;Remove;(System.Object);summary;df-generated |
 | System.Collections;IDictionary;get_IsFixedSize;();summary;df-generated |
 | System.Collections;IDictionary;get_IsReadOnly;();summary;df-generated |
 | System.Collections;IEnumerator;MoveNext;();summary;df-generated |
 | System.Collections;IEnumerator;Reset;();summary;df-generated |
-| System.Collections;IEqualityComparer;Equals;(System.Object,System.Object);summary;df-generated |
-| System.Collections;IEqualityComparer;GetHashCode;(System.Object);summary;df-generated |
 | System.Collections;IHashCodeProvider;GetHashCode;(System.Object);summary;df-generated |
 | System.Collections;IList;Contains;(System.Object);summary;df-generated |
 | System.Collections;IList;IndexOf;(System.Object);summary;df-generated |
+| System.Collections;IList;Remove;(System.Object);summary;df-generated |
 | System.Collections;IList;RemoveAt;(System.Int32);summary;df-generated |
 | System.Collections;IList;get_IsFixedSize;();summary;df-generated |
 | System.Collections;IList;get_IsReadOnly;();summary;df-generated |
@@ -24193,6 +26030,8 @@ neutral
 | System.ComponentModel.DataAnnotations.Schema;DatabaseGeneratedAttribute;get_DatabaseGeneratedOption;();summary;df-generated |
 | System.ComponentModel.DataAnnotations.Schema;ForeignKeyAttribute;ForeignKeyAttribute;(System.String);summary;df-generated |
 | System.ComponentModel.DataAnnotations.Schema;ForeignKeyAttribute;get_Name;();summary;df-generated |
+| System.ComponentModel.DataAnnotations.Schema;IndexAttribute;Equals;(System.Object);summary;df-generated |
+| System.ComponentModel.DataAnnotations.Schema;IndexAttribute;GetHashCode;();summary;df-generated |
 | System.ComponentModel.DataAnnotations.Schema;InversePropertyAttribute;InversePropertyAttribute;(System.String);summary;df-generated |
 | System.ComponentModel.DataAnnotations.Schema;InversePropertyAttribute;get_Property;();summary;df-generated |
 | System.ComponentModel.DataAnnotations.Schema;TableAttribute;TableAttribute;(System.String);summary;df-generated |
@@ -24281,7 +26120,6 @@ neutral
 | System.ComponentModel.DataAnnotations;ValidationAttribute;Validate;(System.Object,System.ComponentModel.DataAnnotations.ValidationContext);summary;df-generated |
 | System.ComponentModel.DataAnnotations;ValidationAttribute;Validate;(System.Object,System.String);summary;df-generated |
 | System.ComponentModel.DataAnnotations;ValidationAttribute;ValidationAttribute;(System.String);summary;df-generated |
-| System.ComponentModel.DataAnnotations;ValidationAttribute;get_ErrorMessageString;();summary;df-generated |
 | System.ComponentModel.DataAnnotations;ValidationAttribute;get_RequiresValidationContext;();summary;df-generated |
 | System.ComponentModel.DataAnnotations;ValidationContext;ValidationContext;(System.Object);summary;df-generated |
 | System.ComponentModel.DataAnnotations;ValidationContext;ValidationContext;(System.Object,System.Collections.Generic.IDictionary<System.Object,System.Object>);summary;df-generated |
@@ -24344,8 +26182,12 @@ neutral
 | System.ComponentModel.Design.Serialization;IDesignerSerializationManager;RemoveSerializationProvider;(System.ComponentModel.Design.Serialization.IDesignerSerializationProvider);summary;df-generated |
 | System.ComponentModel.Design.Serialization;IDesignerSerializationManager;ReportError;(System.Object);summary;df-generated |
 | System.ComponentModel.Design.Serialization;IDesignerSerializationManager;SetName;(System.Object,System.String);summary;df-generated |
+| System.ComponentModel.Design.Serialization;IDesignerSerializationManager;add_ResolveName;(System.ComponentModel.Design.Serialization.ResolveNameEventHandler);summary;df-generated |
+| System.ComponentModel.Design.Serialization;IDesignerSerializationManager;add_SerializationComplete;(System.EventHandler);summary;df-generated |
 | System.ComponentModel.Design.Serialization;IDesignerSerializationManager;get_Context;();summary;df-generated |
 | System.ComponentModel.Design.Serialization;IDesignerSerializationManager;get_Properties;();summary;df-generated |
+| System.ComponentModel.Design.Serialization;IDesignerSerializationManager;remove_ResolveName;(System.ComponentModel.Design.Serialization.ResolveNameEventHandler);summary;df-generated |
+| System.ComponentModel.Design.Serialization;IDesignerSerializationManager;remove_SerializationComplete;(System.EventHandler);summary;df-generated |
 | System.ComponentModel.Design.Serialization;IDesignerSerializationProvider;GetSerializer;(System.ComponentModel.Design.Serialization.IDesignerSerializationManager,System.Object,System.Type,System.Type);summary;df-generated |
 | System.ComponentModel.Design.Serialization;IDesignerSerializationService;Deserialize;(System.Object);summary;df-generated |
 | System.ComponentModel.Design.Serialization;IDesignerSerializationService;Serialize;(System.Collections.ICollection);summary;df-generated |
@@ -24421,6 +26263,7 @@ neutral
 | System.ComponentModel.Design;DesignerOptionService+DesignerOptionCollection;Contains;(System.Object);summary;df-generated |
 | System.ComponentModel.Design;DesignerOptionService+DesignerOptionCollection;IndexOf;(System.ComponentModel.Design.DesignerOptionService+DesignerOptionCollection);summary;df-generated |
 | System.ComponentModel.Design;DesignerOptionService+DesignerOptionCollection;IndexOf;(System.Object);summary;df-generated |
+| System.ComponentModel.Design;DesignerOptionService+DesignerOptionCollection;Remove;(System.Object);summary;df-generated |
 | System.ComponentModel.Design;DesignerOptionService+DesignerOptionCollection;RemoveAt;(System.Int32);summary;df-generated |
 | System.ComponentModel.Design;DesignerOptionService+DesignerOptionCollection;ShowDialog;();summary;df-generated |
 | System.ComponentModel.Design;DesignerOptionService+DesignerOptionCollection;get_Count;();summary;df-generated |
@@ -24446,9 +26289,12 @@ neutral
 | System.ComponentModel.Design;DesignerTransactionCloseEventArgs;DesignerTransactionCloseEventArgs;(System.Boolean,System.Boolean);summary;df-generated |
 | System.ComponentModel.Design;DesignerTransactionCloseEventArgs;get_LastTransaction;();summary;df-generated |
 | System.ComponentModel.Design;DesignerTransactionCloseEventArgs;get_TransactionCommitted;();summary;df-generated |
+| System.ComponentModel.Design;DesignerVerb;DesignerVerb;(System.String,System.EventHandler);summary;df-generated |
+| System.ComponentModel.Design;DesignerVerb;DesignerVerb;(System.String,System.EventHandler,System.ComponentModel.Design.CommandID);summary;df-generated |
 | System.ComponentModel.Design;DesignerVerbCollection;Contains;(System.ComponentModel.Design.DesignerVerb);summary;df-generated |
 | System.ComponentModel.Design;DesignerVerbCollection;IndexOf;(System.ComponentModel.Design.DesignerVerb);summary;df-generated |
 | System.ComponentModel.Design;DesignerVerbCollection;OnValidate;(System.Object);summary;df-generated |
+| System.ComponentModel.Design;DesignerVerbCollection;Remove;(System.ComponentModel.Design.DesignerVerb);summary;df-generated |
 | System.ComponentModel.Design;DesigntimeLicenseContext;get_UsageMode;();summary;df-generated |
 | System.ComponentModel.Design;DesigntimeLicenseContextSerializer;Serialize;(System.IO.Stream,System.String,System.ComponentModel.Design.DesigntimeLicenseContext);summary;df-generated |
 | System.ComponentModel.Design;HelpKeywordAttribute;Equals;(System.Object);summary;df-generated |
@@ -24459,6 +26305,20 @@ neutral
 | System.ComponentModel.Design;HelpKeywordAttribute;get_HelpKeyword;();summary;df-generated |
 | System.ComponentModel.Design;IComponentChangeService;OnComponentChanged;(System.Object,System.ComponentModel.MemberDescriptor,System.Object,System.Object);summary;df-generated |
 | System.ComponentModel.Design;IComponentChangeService;OnComponentChanging;(System.Object,System.ComponentModel.MemberDescriptor);summary;df-generated |
+| System.ComponentModel.Design;IComponentChangeService;add_ComponentAdded;(System.ComponentModel.Design.ComponentEventHandler);summary;df-generated |
+| System.ComponentModel.Design;IComponentChangeService;add_ComponentAdding;(System.ComponentModel.Design.ComponentEventHandler);summary;df-generated |
+| System.ComponentModel.Design;IComponentChangeService;add_ComponentChanged;(System.ComponentModel.Design.ComponentChangedEventHandler);summary;df-generated |
+| System.ComponentModel.Design;IComponentChangeService;add_ComponentChanging;(System.ComponentModel.Design.ComponentChangingEventHandler);summary;df-generated |
+| System.ComponentModel.Design;IComponentChangeService;add_ComponentRemoved;(System.ComponentModel.Design.ComponentEventHandler);summary;df-generated |
+| System.ComponentModel.Design;IComponentChangeService;add_ComponentRemoving;(System.ComponentModel.Design.ComponentEventHandler);summary;df-generated |
+| System.ComponentModel.Design;IComponentChangeService;add_ComponentRename;(System.ComponentModel.Design.ComponentRenameEventHandler);summary;df-generated |
+| System.ComponentModel.Design;IComponentChangeService;remove_ComponentAdded;(System.ComponentModel.Design.ComponentEventHandler);summary;df-generated |
+| System.ComponentModel.Design;IComponentChangeService;remove_ComponentAdding;(System.ComponentModel.Design.ComponentEventHandler);summary;df-generated |
+| System.ComponentModel.Design;IComponentChangeService;remove_ComponentChanged;(System.ComponentModel.Design.ComponentChangedEventHandler);summary;df-generated |
+| System.ComponentModel.Design;IComponentChangeService;remove_ComponentChanging;(System.ComponentModel.Design.ComponentChangingEventHandler);summary;df-generated |
+| System.ComponentModel.Design;IComponentChangeService;remove_ComponentRemoved;(System.ComponentModel.Design.ComponentEventHandler);summary;df-generated |
+| System.ComponentModel.Design;IComponentChangeService;remove_ComponentRemoving;(System.ComponentModel.Design.ComponentEventHandler);summary;df-generated |
+| System.ComponentModel.Design;IComponentChangeService;remove_ComponentRename;(System.ComponentModel.Design.ComponentRenameEventHandler);summary;df-generated |
 | System.ComponentModel.Design;IComponentDiscoveryService;GetComponentTypes;(System.ComponentModel.Design.IDesignerHost,System.Type);summary;df-generated |
 | System.ComponentModel.Design;IComponentInitializer;InitializeExistingComponent;(System.Collections.IDictionary);summary;df-generated |
 | System.ComponentModel.Design;IComponentInitializer;InitializeNewComponent;(System.Collections.IDictionary);summary;df-generated |
@@ -24466,8 +26326,16 @@ neutral
 | System.ComponentModel.Design;IDesigner;Initialize;(System.ComponentModel.IComponent);summary;df-generated |
 | System.ComponentModel.Design;IDesigner;get_Component;();summary;df-generated |
 | System.ComponentModel.Design;IDesigner;get_Verbs;();summary;df-generated |
+| System.ComponentModel.Design;IDesignerEventService;add_ActiveDesignerChanged;(System.ComponentModel.Design.ActiveDesignerEventHandler);summary;df-generated |
+| System.ComponentModel.Design;IDesignerEventService;add_DesignerCreated;(System.ComponentModel.Design.DesignerEventHandler);summary;df-generated |
+| System.ComponentModel.Design;IDesignerEventService;add_DesignerDisposed;(System.ComponentModel.Design.DesignerEventHandler);summary;df-generated |
+| System.ComponentModel.Design;IDesignerEventService;add_SelectionChanged;(System.EventHandler);summary;df-generated |
 | System.ComponentModel.Design;IDesignerEventService;get_ActiveDesigner;();summary;df-generated |
 | System.ComponentModel.Design;IDesignerEventService;get_Designers;();summary;df-generated |
+| System.ComponentModel.Design;IDesignerEventService;remove_ActiveDesignerChanged;(System.ComponentModel.Design.ActiveDesignerEventHandler);summary;df-generated |
+| System.ComponentModel.Design;IDesignerEventService;remove_DesignerCreated;(System.ComponentModel.Design.DesignerEventHandler);summary;df-generated |
+| System.ComponentModel.Design;IDesignerEventService;remove_DesignerDisposed;(System.ComponentModel.Design.DesignerEventHandler);summary;df-generated |
+| System.ComponentModel.Design;IDesignerEventService;remove_SelectionChanged;(System.EventHandler);summary;df-generated |
 | System.ComponentModel.Design;IDesignerFilter;PostFilterAttributes;(System.Collections.IDictionary);summary;df-generated |
 | System.ComponentModel.Design;IDesignerFilter;PostFilterEvents;(System.Collections.IDictionary);summary;df-generated |
 | System.ComponentModel.Design;IDesignerFilter;PostFilterProperties;(System.Collections.IDictionary);summary;df-generated |
@@ -24482,12 +26350,26 @@ neutral
 | System.ComponentModel.Design;IDesignerHost;DestroyComponent;(System.ComponentModel.IComponent);summary;df-generated |
 | System.ComponentModel.Design;IDesignerHost;GetDesigner;(System.ComponentModel.IComponent);summary;df-generated |
 | System.ComponentModel.Design;IDesignerHost;GetType;(System.String);summary;df-generated |
+| System.ComponentModel.Design;IDesignerHost;add_Activated;(System.EventHandler);summary;df-generated |
+| System.ComponentModel.Design;IDesignerHost;add_Deactivated;(System.EventHandler);summary;df-generated |
+| System.ComponentModel.Design;IDesignerHost;add_LoadComplete;(System.EventHandler);summary;df-generated |
+| System.ComponentModel.Design;IDesignerHost;add_TransactionClosed;(System.ComponentModel.Design.DesignerTransactionCloseEventHandler);summary;df-generated |
+| System.ComponentModel.Design;IDesignerHost;add_TransactionClosing;(System.ComponentModel.Design.DesignerTransactionCloseEventHandler);summary;df-generated |
+| System.ComponentModel.Design;IDesignerHost;add_TransactionOpened;(System.EventHandler);summary;df-generated |
+| System.ComponentModel.Design;IDesignerHost;add_TransactionOpening;(System.EventHandler);summary;df-generated |
 | System.ComponentModel.Design;IDesignerHost;get_Container;();summary;df-generated |
 | System.ComponentModel.Design;IDesignerHost;get_InTransaction;();summary;df-generated |
 | System.ComponentModel.Design;IDesignerHost;get_Loading;();summary;df-generated |
 | System.ComponentModel.Design;IDesignerHost;get_RootComponent;();summary;df-generated |
 | System.ComponentModel.Design;IDesignerHost;get_RootComponentClassName;();summary;df-generated |
 | System.ComponentModel.Design;IDesignerHost;get_TransactionDescription;();summary;df-generated |
+| System.ComponentModel.Design;IDesignerHost;remove_Activated;(System.EventHandler);summary;df-generated |
+| System.ComponentModel.Design;IDesignerHost;remove_Deactivated;(System.EventHandler);summary;df-generated |
+| System.ComponentModel.Design;IDesignerHost;remove_LoadComplete;(System.EventHandler);summary;df-generated |
+| System.ComponentModel.Design;IDesignerHost;remove_TransactionClosed;(System.ComponentModel.Design.DesignerTransactionCloseEventHandler);summary;df-generated |
+| System.ComponentModel.Design;IDesignerHost;remove_TransactionClosing;(System.ComponentModel.Design.DesignerTransactionCloseEventHandler);summary;df-generated |
+| System.ComponentModel.Design;IDesignerHost;remove_TransactionOpened;(System.EventHandler);summary;df-generated |
+| System.ComponentModel.Design;IDesignerHost;remove_TransactionOpening;(System.EventHandler);summary;df-generated |
 | System.ComponentModel.Design;IDesignerHostTransactionState;get_IsClosingTransaction;();summary;df-generated |
 | System.ComponentModel.Design;IDesignerOptionService;GetOptionValue;(System.String,System.String);summary;df-generated |
 | System.ComponentModel.Design;IDesignerOptionService;SetOptionValue;(System.String,System.String,System.Object);summary;df-generated |
@@ -24535,8 +26417,14 @@ neutral
 | System.ComponentModel.Design;ISelectionService;GetSelectedComponents;();summary;df-generated |
 | System.ComponentModel.Design;ISelectionService;SetSelectedComponents;(System.Collections.ICollection);summary;df-generated |
 | System.ComponentModel.Design;ISelectionService;SetSelectedComponents;(System.Collections.ICollection,System.ComponentModel.Design.SelectionTypes);summary;df-generated |
+| System.ComponentModel.Design;ISelectionService;add_SelectionChanged;(System.EventHandler);summary;df-generated |
+| System.ComponentModel.Design;ISelectionService;add_SelectionChanging;(System.EventHandler);summary;df-generated |
 | System.ComponentModel.Design;ISelectionService;get_PrimarySelection;();summary;df-generated |
 | System.ComponentModel.Design;ISelectionService;get_SelectionCount;();summary;df-generated |
+| System.ComponentModel.Design;ISelectionService;remove_SelectionChanged;(System.EventHandler);summary;df-generated |
+| System.ComponentModel.Design;ISelectionService;remove_SelectionChanging;(System.EventHandler);summary;df-generated |
+| System.ComponentModel.Design;IServiceContainer;AddService;(System.Type,System.ComponentModel.Design.ServiceCreatorCallback);summary;df-generated |
+| System.ComponentModel.Design;IServiceContainer;AddService;(System.Type,System.ComponentModel.Design.ServiceCreatorCallback,System.Boolean);summary;df-generated |
 | System.ComponentModel.Design;IServiceContainer;AddService;(System.Type,System.Object);summary;df-generated |
 | System.ComponentModel.Design;IServiceContainer;AddService;(System.Type,System.Object,System.Boolean);summary;df-generated |
 | System.ComponentModel.Design;IServiceContainer;RemoveService;(System.Type);summary;df-generated |
@@ -24556,10 +26444,15 @@ neutral
 | System.ComponentModel.Design;ITypeResolutionService;ReferenceAssembly;(System.Reflection.AssemblyName);summary;df-generated |
 | System.ComponentModel.Design;MenuCommand;Invoke;();summary;df-generated |
 | System.ComponentModel.Design;MenuCommand;Invoke;(System.Object);summary;df-generated |
+| System.ComponentModel.Design;MenuCommand;MenuCommand;(System.EventHandler,System.ComponentModel.Design.CommandID);summary;df-generated |
 | System.ComponentModel.Design;MenuCommand;OnCommandChanged;(System.EventArgs);summary;df-generated |
+| System.ComponentModel.Design;MenuCommand;add_CommandChanged;(System.EventHandler);summary;df-generated |
 | System.ComponentModel.Design;MenuCommand;get_CommandID;();summary;df-generated |
 | System.ComponentModel.Design;MenuCommand;get_OleStatus;();summary;df-generated |
 | System.ComponentModel.Design;MenuCommand;get_Properties;();summary;df-generated |
+| System.ComponentModel.Design;MenuCommand;remove_CommandChanged;(System.EventHandler);summary;df-generated |
+| System.ComponentModel.Design;ServiceContainer;AddService;(System.Type,System.ComponentModel.Design.ServiceCreatorCallback);summary;df-generated |
+| System.ComponentModel.Design;ServiceContainer;AddService;(System.Type,System.ComponentModel.Design.ServiceCreatorCallback,System.Boolean);summary;df-generated |
 | System.ComponentModel.Design;ServiceContainer;AddService;(System.Type,System.Object);summary;df-generated |
 | System.ComponentModel.Design;ServiceContainer;AddService;(System.Type,System.Object,System.Boolean);summary;df-generated |
 | System.ComponentModel.Design;ServiceContainer;Dispose;();summary;df-generated |
@@ -24591,10 +26484,13 @@ neutral
 | System.ComponentModel;AsyncCompletedEventArgs;get_Error;();summary;df-generated |
 | System.ComponentModel;AsyncCompletedEventArgs;get_UserState;();summary;df-generated |
 | System.ComponentModel;AsyncOperation;OperationCompleted;();summary;df-generated |
+| System.ComponentModel;AsyncOperation;Post;(System.Threading.SendOrPostCallback,System.Object);summary;df-generated |
+| System.ComponentModel;AsyncOperation;PostOperationCompleted;(System.Threading.SendOrPostCallback,System.Object);summary;df-generated |
 | System.ComponentModel;AsyncOperation;get_UserSuppliedState;();summary;df-generated |
 | System.ComponentModel;AsyncOperationManager;CreateOperation;(System.Object);summary;df-generated |
 | System.ComponentModel;AttributeCollection;Contains;(System.Attribute);summary;df-generated |
 | System.ComponentModel;AttributeCollection;Contains;(System.Attribute[]);summary;df-generated |
+| System.ComponentModel;AttributeCollection;FromExisting;(System.ComponentModel.AttributeCollection,System.Attribute[]);summary;df-generated |
 | System.ComponentModel;AttributeCollection;GetDefaultAttribute;(System.Type);summary;df-generated |
 | System.ComponentModel;AttributeCollection;Matches;(System.Attribute);summary;df-generated |
 | System.ComponentModel;AttributeCollection;Matches;(System.Attribute[]);summary;df-generated |
@@ -24614,8 +26510,14 @@ neutral
 | System.ComponentModel;BackgroundWorker;ReportProgress;(System.Int32,System.Object);summary;df-generated |
 | System.ComponentModel;BackgroundWorker;RunWorkerAsync;();summary;df-generated |
 | System.ComponentModel;BackgroundWorker;RunWorkerAsync;(System.Object);summary;df-generated |
+| System.ComponentModel;BackgroundWorker;add_DoWork;(System.ComponentModel.DoWorkEventHandler);summary;df-generated |
+| System.ComponentModel;BackgroundWorker;add_ProgressChanged;(System.ComponentModel.ProgressChangedEventHandler);summary;df-generated |
+| System.ComponentModel;BackgroundWorker;add_RunWorkerCompleted;(System.ComponentModel.RunWorkerCompletedEventHandler);summary;df-generated |
 | System.ComponentModel;BackgroundWorker;get_CancellationPending;();summary;df-generated |
 | System.ComponentModel;BackgroundWorker;get_IsBusy;();summary;df-generated |
+| System.ComponentModel;BackgroundWorker;remove_DoWork;(System.ComponentModel.DoWorkEventHandler);summary;df-generated |
+| System.ComponentModel;BackgroundWorker;remove_ProgressChanged;(System.ComponentModel.ProgressChangedEventHandler);summary;df-generated |
+| System.ComponentModel;BackgroundWorker;remove_RunWorkerCompleted;(System.ComponentModel.RunWorkerCompletedEventHandler);summary;df-generated |
 | System.ComponentModel;BaseNumberConverter;CanConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Type);summary;df-generated |
 | System.ComponentModel;BaseNumberConverter;CanConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Type);summary;df-generated |
 | System.ComponentModel;BindableAttribute;BindableAttribute;(System.Boolean);summary;df-generated |
@@ -24629,20 +26531,23 @@ neutral
 | System.ComponentModel;BindableAttribute;get_Direction;();summary;df-generated |
 | System.ComponentModel;BindingList<T>;AddIndex;(System.ComponentModel.PropertyDescriptor);summary;df-generated |
 | System.ComponentModel;BindingList<T>;AddNew;();summary;df-generated |
+| System.ComponentModel;BindingList<T>;AddNewCore;();summary;df-generated |
 | System.ComponentModel;BindingList<T>;ApplySortCore;(System.ComponentModel.PropertyDescriptor,System.ComponentModel.ListSortDirection);summary;df-generated |
 | System.ComponentModel;BindingList<T>;BindingList;(System.Collections.Generic.IList<T>);summary;df-generated |
 | System.ComponentModel;BindingList<T>;CancelNew;(System.Int32);summary;df-generated |
 | System.ComponentModel;BindingList<T>;ClearItems;();summary;df-generated |
 | System.ComponentModel;BindingList<T>;EndNew;(System.Int32);summary;df-generated |
 | System.ComponentModel;BindingList<T>;FindCore;(System.ComponentModel.PropertyDescriptor,System.Object);summary;df-generated |
-| System.ComponentModel;BindingList<T>;OnAddingNew;(System.ComponentModel.AddingNewEventArgs);summary;df-generated |
-| System.ComponentModel;BindingList<T>;OnListChanged;(System.ComponentModel.ListChangedEventArgs);summary;df-generated |
+| System.ComponentModel;BindingList<T>;InsertItem;(System.Int32,T);summary;df-generated |
 | System.ComponentModel;BindingList<T>;RemoveIndex;(System.ComponentModel.PropertyDescriptor);summary;df-generated |
 | System.ComponentModel;BindingList<T>;RemoveItem;(System.Int32);summary;df-generated |
 | System.ComponentModel;BindingList<T>;RemoveSort;();summary;df-generated |
 | System.ComponentModel;BindingList<T>;RemoveSortCore;();summary;df-generated |
 | System.ComponentModel;BindingList<T>;ResetBindings;();summary;df-generated |
 | System.ComponentModel;BindingList<T>;ResetItem;(System.Int32);summary;df-generated |
+| System.ComponentModel;BindingList<T>;SetItem;(System.Int32,T);summary;df-generated |
+| System.ComponentModel;BindingList<T>;add_AddingNew;(System.ComponentModel.AddingNewEventHandler);summary;df-generated |
+| System.ComponentModel;BindingList<T>;add_ListChanged;(System.ComponentModel.ListChangedEventHandler);summary;df-generated |
 | System.ComponentModel;BindingList<T>;get_AllowEdit;();summary;df-generated |
 | System.ComponentModel;BindingList<T>;get_AllowNew;();summary;df-generated |
 | System.ComponentModel;BindingList<T>;get_AllowRemove;();summary;df-generated |
@@ -24651,6 +26556,7 @@ neutral
 | System.ComponentModel;BindingList<T>;get_RaisesItemChangedEvents;();summary;df-generated |
 | System.ComponentModel;BindingList<T>;get_SortDirection;();summary;df-generated |
 | System.ComponentModel;BindingList<T>;get_SortDirectionCore;();summary;df-generated |
+| System.ComponentModel;BindingList<T>;get_SortProperty;();summary;df-generated |
 | System.ComponentModel;BindingList<T>;get_SortPropertyCore;();summary;df-generated |
 | System.ComponentModel;BindingList<T>;get_SupportsChangeNotification;();summary;df-generated |
 | System.ComponentModel;BindingList<T>;get_SupportsChangeNotificationCore;();summary;df-generated |
@@ -24658,6 +26564,8 @@ neutral
 | System.ComponentModel;BindingList<T>;get_SupportsSearchingCore;();summary;df-generated |
 | System.ComponentModel;BindingList<T>;get_SupportsSorting;();summary;df-generated |
 | System.ComponentModel;BindingList<T>;get_SupportsSortingCore;();summary;df-generated |
+| System.ComponentModel;BindingList<T>;remove_AddingNew;(System.ComponentModel.AddingNewEventHandler);summary;df-generated |
+| System.ComponentModel;BindingList<T>;remove_ListChanged;(System.ComponentModel.ListChangedEventHandler);summary;df-generated |
 | System.ComponentModel;BooleanConverter;CanConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Type);summary;df-generated |
 | System.ComponentModel;BooleanConverter;GetStandardValuesExclusive;(System.ComponentModel.ITypeDescriptorContext);summary;df-generated |
 | System.ComponentModel;BooleanConverter;GetStandardValuesSupported;(System.ComponentModel.ITypeDescriptorContext);summary;df-generated |
@@ -24698,9 +26606,11 @@ neutral
 | System.ComponentModel;Component;Dispose;();summary;df-generated |
 | System.ComponentModel;Component;Dispose;(System.Boolean);summary;df-generated |
 | System.ComponentModel;Component;GetService;(System.Type);summary;df-generated |
+| System.ComponentModel;Component;add_Disposed;(System.EventHandler);summary;df-generated |
 | System.ComponentModel;Component;get_CanRaiseEvents;();summary;df-generated |
 | System.ComponentModel;Component;get_DesignMode;();summary;df-generated |
 | System.ComponentModel;Component;get_Events;();summary;df-generated |
+| System.ComponentModel;Component;remove_Disposed;(System.EventHandler);summary;df-generated |
 | System.ComponentModel;ComponentConverter;ComponentConverter;(System.Type);summary;df-generated |
 | System.ComponentModel;ComponentConverter;GetPropertiesSupported;(System.ComponentModel.ITypeDescriptorContext);summary;df-generated |
 | System.ComponentModel;ComponentEditor;EditComponent;(System.ComponentModel.ITypeDescriptorContext,System.Object);summary;df-generated |
@@ -24717,6 +26627,7 @@ neutral
 | System.ComponentModel;CultureInfoConverter;CanConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Type);summary;df-generated |
 | System.ComponentModel;CultureInfoConverter;GetStandardValuesExclusive;(System.ComponentModel.ITypeDescriptorContext);summary;df-generated |
 | System.ComponentModel;CultureInfoConverter;GetStandardValuesSupported;(System.ComponentModel.ITypeDescriptorContext);summary;df-generated |
+| System.ComponentModel;CustomTypeDescriptor;GetAttributes;();summary;df-generated |
 | System.ComponentModel;CustomTypeDescriptor;GetClassName;();summary;df-generated |
 | System.ComponentModel;CustomTypeDescriptor;GetComponentName;();summary;df-generated |
 | System.ComponentModel;CustomTypeDescriptor;GetConverter;();summary;df-generated |
@@ -24782,7 +26693,6 @@ neutral
 | System.ComponentModel;DefaultValueAttribute;DefaultValueAttribute;(System.UInt64);summary;df-generated |
 | System.ComponentModel;DefaultValueAttribute;Equals;(System.Object);summary;df-generated |
 | System.ComponentModel;DefaultValueAttribute;GetHashCode;();summary;df-generated |
-| System.ComponentModel;DescriptionAttribute;DescriptionAttribute;(System.String);summary;df-generated |
 | System.ComponentModel;DescriptionAttribute;Equals;(System.Object);summary;df-generated |
 | System.ComponentModel;DescriptionAttribute;GetHashCode;();summary;df-generated |
 | System.ComponentModel;DescriptionAttribute;IsDefaultAttribute;();summary;df-generated |
@@ -24856,6 +26766,7 @@ neutral
 | System.ComponentModel;EventDescriptorCollection;InternalSort;(System.Collections.IComparer);summary;df-generated |
 | System.ComponentModel;EventDescriptorCollection;InternalSort;(System.String[]);summary;df-generated |
 | System.ComponentModel;EventDescriptorCollection;Remove;(System.ComponentModel.EventDescriptor);summary;df-generated |
+| System.ComponentModel;EventDescriptorCollection;Remove;(System.Object);summary;df-generated |
 | System.ComponentModel;EventDescriptorCollection;RemoveAt;(System.Int32);summary;df-generated |
 | System.ComponentModel;EventDescriptorCollection;get_Count;();summary;df-generated |
 | System.ComponentModel;EventDescriptorCollection;get_IsFixedSize;();summary;df-generated |
@@ -24871,16 +26782,20 @@ neutral
 | System.ComponentModel;GuidConverter;CanConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Type);summary;df-generated |
 | System.ComponentModel;HandledEventArgs;HandledEventArgs;(System.Boolean);summary;df-generated |
 | System.ComponentModel;IBindingList;AddIndex;(System.ComponentModel.PropertyDescriptor);summary;df-generated |
+| System.ComponentModel;IBindingList;AddNew;();summary;df-generated |
 | System.ComponentModel;IBindingList;RemoveIndex;(System.ComponentModel.PropertyDescriptor);summary;df-generated |
 | System.ComponentModel;IBindingList;RemoveSort;();summary;df-generated |
+| System.ComponentModel;IBindingList;add_ListChanged;(System.ComponentModel.ListChangedEventHandler);summary;df-generated |
 | System.ComponentModel;IBindingList;get_AllowEdit;();summary;df-generated |
 | System.ComponentModel;IBindingList;get_AllowNew;();summary;df-generated |
 | System.ComponentModel;IBindingList;get_AllowRemove;();summary;df-generated |
 | System.ComponentModel;IBindingList;get_IsSorted;();summary;df-generated |
 | System.ComponentModel;IBindingList;get_SortDirection;();summary;df-generated |
+| System.ComponentModel;IBindingList;get_SortProperty;();summary;df-generated |
 | System.ComponentModel;IBindingList;get_SupportsChangeNotification;();summary;df-generated |
 | System.ComponentModel;IBindingList;get_SupportsSearching;();summary;df-generated |
 | System.ComponentModel;IBindingList;get_SupportsSorting;();summary;df-generated |
+| System.ComponentModel;IBindingList;remove_ListChanged;(System.ComponentModel.ListChangedEventHandler);summary;df-generated |
 | System.ComponentModel;IBindingListView;RemoveFilter;();summary;df-generated |
 | System.ComponentModel;IBindingListView;get_SortDescriptions;();summary;df-generated |
 | System.ComponentModel;IBindingListView;get_SupportsAdvancedSorting;();summary;df-generated |
@@ -24901,7 +26816,10 @@ neutral
 | System.ComponentModel;IComNativeDescriptorHandler;GetProperties;(System.Object,System.Attribute[]);summary;df-generated |
 | System.ComponentModel;IComNativeDescriptorHandler;GetPropertyValue;(System.Object,System.Int32,System.Boolean);summary;df-generated |
 | System.ComponentModel;IComNativeDescriptorHandler;GetPropertyValue;(System.Object,System.String,System.Boolean);summary;df-generated |
+| System.ComponentModel;IComponent;add_Disposed;(System.EventHandler);summary;df-generated |
+| System.ComponentModel;IComponent;remove_Disposed;(System.EventHandler);summary;df-generated |
 | System.ComponentModel;IContainer;Remove;(System.ComponentModel.IComponent);summary;df-generated |
+| System.ComponentModel;ICustomTypeDescriptor;GetAttributes;();summary;df-generated |
 | System.ComponentModel;ICustomTypeDescriptor;GetClassName;();summary;df-generated |
 | System.ComponentModel;ICustomTypeDescriptor;GetComponentName;();summary;df-generated |
 | System.ComponentModel;ICustomTypeDescriptor;GetConverter;();summary;df-generated |
@@ -24910,6 +26828,7 @@ neutral
 | System.ComponentModel;ICustomTypeDescriptor;GetEditor;(System.Type);summary;df-generated |
 | System.ComponentModel;ICustomTypeDescriptor;GetEvents;();summary;df-generated |
 | System.ComponentModel;ICustomTypeDescriptor;GetEvents;(System.Attribute[]);summary;df-generated |
+| System.ComponentModel;IDataErrorInfo;get_Error;();summary;df-generated |
 | System.ComponentModel;IDataErrorInfo;get_Item;(System.String);summary;df-generated |
 | System.ComponentModel;IEditableObject;BeginEdit;();summary;df-generated |
 | System.ComponentModel;IEditableObject;CancelEdit;();summary;df-generated |
@@ -24920,7 +26839,13 @@ neutral
 | System.ComponentModel;IListSource;get_ContainsListCollection;();summary;df-generated |
 | System.ComponentModel;INestedContainer;get_Owner;();summary;df-generated |
 | System.ComponentModel;INotifyDataErrorInfo;GetErrors;(System.String);summary;df-generated |
+| System.ComponentModel;INotifyDataErrorInfo;add_ErrorsChanged;(System.EventHandler<System.ComponentModel.DataErrorsChangedEventArgs>);summary;df-generated |
 | System.ComponentModel;INotifyDataErrorInfo;get_HasErrors;();summary;df-generated |
+| System.ComponentModel;INotifyDataErrorInfo;remove_ErrorsChanged;(System.EventHandler<System.ComponentModel.DataErrorsChangedEventArgs>);summary;df-generated |
+| System.ComponentModel;INotifyPropertyChanged;add_PropertyChanged;(System.ComponentModel.PropertyChangedEventHandler);summary;df-generated |
+| System.ComponentModel;INotifyPropertyChanged;remove_PropertyChanged;(System.ComponentModel.PropertyChangedEventHandler);summary;df-generated |
+| System.ComponentModel;INotifyPropertyChanging;add_PropertyChanging;(System.ComponentModel.PropertyChangingEventHandler);summary;df-generated |
+| System.ComponentModel;INotifyPropertyChanging;remove_PropertyChanging;(System.ComponentModel.PropertyChangingEventHandler);summary;df-generated |
 | System.ComponentModel;IRaiseItemChangedEvents;get_RaisesItemChangedEvents;();summary;df-generated |
 | System.ComponentModel;IRevertibleChangeTracking;RejectChanges;();summary;df-generated |
 | System.ComponentModel;ISite;get_Component;();summary;df-generated |
@@ -24928,7 +26853,9 @@ neutral
 | System.ComponentModel;ISite;get_DesignMode;();summary;df-generated |
 | System.ComponentModel;ISupportInitialize;BeginInit;();summary;df-generated |
 | System.ComponentModel;ISupportInitialize;EndInit;();summary;df-generated |
+| System.ComponentModel;ISupportInitializeNotification;add_Initialized;(System.EventHandler);summary;df-generated |
 | System.ComponentModel;ISupportInitializeNotification;get_IsInitialized;();summary;df-generated |
+| System.ComponentModel;ISupportInitializeNotification;remove_Initialized;(System.EventHandler);summary;df-generated |
 | System.ComponentModel;ISynchronizeInvoke;BeginInvoke;(System.Delegate,System.Object[]);summary;df-generated |
 | System.ComponentModel;ISynchronizeInvoke;EndInvoke;(System.IAsyncResult);summary;df-generated |
 | System.ComponentModel;ISynchronizeInvoke;Invoke;(System.Delegate,System.Object[]);summary;df-generated |
@@ -25004,6 +26931,7 @@ neutral
 | System.ComponentModel;ListSortDescription;ListSortDescription;(System.ComponentModel.PropertyDescriptor,System.ComponentModel.ListSortDirection);summary;df-generated |
 | System.ComponentModel;ListSortDescriptionCollection;Contains;(System.Object);summary;df-generated |
 | System.ComponentModel;ListSortDescriptionCollection;IndexOf;(System.Object);summary;df-generated |
+| System.ComponentModel;ListSortDescriptionCollection;Remove;(System.Object);summary;df-generated |
 | System.ComponentModel;ListSortDescriptionCollection;RemoveAt;(System.Int32);summary;df-generated |
 | System.ComponentModel;ListSortDescriptionCollection;get_Count;();summary;df-generated |
 | System.ComponentModel;ListSortDescriptionCollection;get_IsFixedSize;();summary;df-generated |
@@ -25023,8 +26951,10 @@ neutral
 | System.ComponentModel;LookupBindingPropertiesAttribute;get_ValueMember;();summary;df-generated |
 | System.ComponentModel;MarshalByValueComponent;Dispose;();summary;df-generated |
 | System.ComponentModel;MarshalByValueComponent;Dispose;(System.Boolean);summary;df-generated |
+| System.ComponentModel;MarshalByValueComponent;add_Disposed;(System.EventHandler);summary;df-generated |
 | System.ComponentModel;MarshalByValueComponent;get_DesignMode;();summary;df-generated |
 | System.ComponentModel;MarshalByValueComponent;get_Events;();summary;df-generated |
+| System.ComponentModel;MarshalByValueComponent;remove_Disposed;(System.EventHandler);summary;df-generated |
 | System.ComponentModel;MaskedTextProvider;Add;(System.Char);summary;df-generated |
 | System.ComponentModel;MaskedTextProvider;Add;(System.Char,System.Int32,System.ComponentModel.MaskedTextResultHint);summary;df-generated |
 | System.ComponentModel;MaskedTextProvider;Add;(System.String);summary;df-generated |
@@ -25087,6 +27017,7 @@ neutral
 | System.ComponentModel;MaskedTextProvider;get_Mask;();summary;df-generated |
 | System.ComponentModel;MaskedTextProvider;get_MaskCompleted;();summary;df-generated |
 | System.ComponentModel;MaskedTextProvider;get_MaskFull;();summary;df-generated |
+| System.ComponentModel;MemberDescriptor;CreateAttributeCollection;();summary;df-generated |
 | System.ComponentModel;MemberDescriptor;Equals;(System.Object);summary;df-generated |
 | System.ComponentModel;MemberDescriptor;FindMethod;(System.Type,System.String,System.Type[],System.Type);summary;df-generated |
 | System.ComponentModel;MemberDescriptor;FindMethod;(System.Type,System.String,System.Type[],System.Type,System.Boolean);summary;df-generated |
@@ -25139,6 +27070,7 @@ neutral
 | System.ComponentModel;PropertyChangedEventArgs;get_PropertyName;();summary;df-generated |
 | System.ComponentModel;PropertyChangingEventArgs;PropertyChangingEventArgs;(System.String);summary;df-generated |
 | System.ComponentModel;PropertyChangingEventArgs;get_PropertyName;();summary;df-generated |
+| System.ComponentModel;PropertyDescriptor;AddValueChanged;(System.Object,System.EventHandler);summary;df-generated |
 | System.ComponentModel;PropertyDescriptor;CanResetValue;(System.Object);summary;df-generated |
 | System.ComponentModel;PropertyDescriptor;CreateInstance;(System.Type);summary;df-generated |
 | System.ComponentModel;PropertyDescriptor;Equals;(System.Object);summary;df-generated |
@@ -25153,6 +27085,7 @@ neutral
 | System.ComponentModel;PropertyDescriptor;PropertyDescriptor;(System.ComponentModel.MemberDescriptor);summary;df-generated |
 | System.ComponentModel;PropertyDescriptor;PropertyDescriptor;(System.ComponentModel.MemberDescriptor,System.Attribute[]);summary;df-generated |
 | System.ComponentModel;PropertyDescriptor;PropertyDescriptor;(System.String,System.Attribute[]);summary;df-generated |
+| System.ComponentModel;PropertyDescriptor;RemoveValueChanged;(System.Object,System.EventHandler);summary;df-generated |
 | System.ComponentModel;PropertyDescriptor;ShouldSerializeValue;(System.Object);summary;df-generated |
 | System.ComponentModel;PropertyDescriptor;get_ComponentType;();summary;df-generated |
 | System.ComponentModel;PropertyDescriptor;get_IsLocalizable;();summary;df-generated |
@@ -25167,6 +27100,7 @@ neutral
 | System.ComponentModel;PropertyDescriptorCollection;InternalSort;(System.Collections.IComparer);summary;df-generated |
 | System.ComponentModel;PropertyDescriptorCollection;InternalSort;(System.String[]);summary;df-generated |
 | System.ComponentModel;PropertyDescriptorCollection;Remove;(System.ComponentModel.PropertyDescriptor);summary;df-generated |
+| System.ComponentModel;PropertyDescriptorCollection;Remove;(System.Object);summary;df-generated |
 | System.ComponentModel;PropertyDescriptorCollection;RemoveAt;(System.Int32);summary;df-generated |
 | System.ComponentModel;PropertyDescriptorCollection;get_Count;();summary;df-generated |
 | System.ComponentModel;PropertyDescriptorCollection;get_IsFixedSize;();summary;df-generated |
@@ -25338,8 +27272,10 @@ neutral
 | System.ComponentModel;TypeDescriptor;RemoveProviderTransparent;(System.ComponentModel.TypeDescriptionProvider,System.Object);summary;df-generated |
 | System.ComponentModel;TypeDescriptor;RemoveProviderTransparent;(System.ComponentModel.TypeDescriptionProvider,System.Type);summary;df-generated |
 | System.ComponentModel;TypeDescriptor;SortDescriptorArray;(System.Collections.IList);summary;df-generated |
+| System.ComponentModel;TypeDescriptor;add_Refreshed;(System.ComponentModel.RefreshEventHandler);summary;df-generated |
 | System.ComponentModel;TypeDescriptor;get_ComObjectType;();summary;df-generated |
 | System.ComponentModel;TypeDescriptor;get_InterfaceType;();summary;df-generated |
+| System.ComponentModel;TypeDescriptor;remove_Refreshed;(System.ComponentModel.RefreshEventHandler);summary;df-generated |
 | System.ComponentModel;TypeListConverter;CanConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Type);summary;df-generated |
 | System.ComponentModel;TypeListConverter;CanConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Type);summary;df-generated |
 | System.ComponentModel;TypeListConverter;GetStandardValuesExclusive;(System.ComponentModel.ITypeDescriptorContext);summary;df-generated |
@@ -25384,6 +27320,8 @@ neutral
 | System.Configuration.Internal;DelegatingConfigHost;PrefetchSection;(System.String,System.String);summary;df-generated |
 | System.Configuration.Internal;DelegatingConfigHost;RefreshConfigPaths;();summary;df-generated |
 | System.Configuration.Internal;DelegatingConfigHost;RequireCompleteInit;(System.Configuration.Internal.IInternalConfigRecord);summary;df-generated |
+| System.Configuration.Internal;DelegatingConfigHost;StartMonitoringStreamForChanges;(System.String,System.Configuration.Internal.StreamChangeCallback);summary;df-generated |
+| System.Configuration.Internal;DelegatingConfigHost;StopMonitoringStreamForChanges;(System.String,System.Configuration.Internal.StreamChangeCallback);summary;df-generated |
 | System.Configuration.Internal;DelegatingConfigHost;VerifyDefinitionAllowed;(System.String,System.Configuration.ConfigurationAllowDefinition,System.Configuration.ConfigurationAllowExeDefinition,System.Configuration.Internal.IConfigErrorInfo);summary;df-generated |
 | System.Configuration.Internal;DelegatingConfigHost;WriteCompleted;(System.String,System.Boolean,System.Object);summary;df-generated |
 | System.Configuration.Internal;DelegatingConfigHost;WriteCompleted;(System.String,System.Boolean,System.Object,System.Boolean);summary;df-generated |
@@ -25437,6 +27375,8 @@ neutral
 | System.Configuration.Internal;IInternalConfigHost;PrefetchAll;(System.String,System.String);summary;df-generated |
 | System.Configuration.Internal;IInternalConfigHost;PrefetchSection;(System.String,System.String);summary;df-generated |
 | System.Configuration.Internal;IInternalConfigHost;RequireCompleteInit;(System.Configuration.Internal.IInternalConfigRecord);summary;df-generated |
+| System.Configuration.Internal;IInternalConfigHost;StartMonitoringStreamForChanges;(System.String,System.Configuration.Internal.StreamChangeCallback);summary;df-generated |
+| System.Configuration.Internal;IInternalConfigHost;StopMonitoringStreamForChanges;(System.String,System.Configuration.Internal.StreamChangeCallback);summary;df-generated |
 | System.Configuration.Internal;IInternalConfigHost;VerifyDefinitionAllowed;(System.String,System.Configuration.ConfigurationAllowDefinition,System.Configuration.ConfigurationAllowExeDefinition,System.Configuration.Internal.IConfigErrorInfo);summary;df-generated |
 | System.Configuration.Internal;IInternalConfigHost;WriteCompleted;(System.String,System.Boolean,System.Object);summary;df-generated |
 | System.Configuration.Internal;IInternalConfigHost;WriteCompleted;(System.String,System.Boolean,System.Object,System.Boolean);summary;df-generated |
@@ -25450,7 +27390,11 @@ neutral
 | System.Configuration.Internal;IInternalConfigRecord;ThrowIfInitErrors;();summary;df-generated |
 | System.Configuration.Internal;IInternalConfigRecord;get_HasInitErrors;();summary;df-generated |
 | System.Configuration.Internal;IInternalConfigRoot;RemoveConfig;(System.String);summary;df-generated |
+| System.Configuration.Internal;IInternalConfigRoot;add_ConfigChanged;(System.Configuration.Internal.InternalConfigEventHandler);summary;df-generated |
+| System.Configuration.Internal;IInternalConfigRoot;add_ConfigRemoved;(System.Configuration.Internal.InternalConfigEventHandler);summary;df-generated |
 | System.Configuration.Internal;IInternalConfigRoot;get_IsDesignTime;();summary;df-generated |
+| System.Configuration.Internal;IInternalConfigRoot;remove_ConfigChanged;(System.Configuration.Internal.InternalConfigEventHandler);summary;df-generated |
+| System.Configuration.Internal;IInternalConfigRoot;remove_ConfigRemoved;(System.Configuration.Internal.InternalConfigEventHandler);summary;df-generated |
 | System.Configuration.Internal;IInternalConfigSettingsFactory;CompleteInit;();summary;df-generated |
 | System.Configuration.Internal;IInternalConfigSettingsFactory;SetConfigurationSystem;(System.Configuration.Internal.IInternalConfigSystem,System.Boolean);summary;df-generated |
 | System.Configuration.Internal;IInternalConfigSystem;RefreshConfig;(System.String);summary;df-generated |
@@ -25466,17 +27410,21 @@ neutral
 | System.Configuration.Provider;ProviderException;ProviderException;(System.String,System.Exception);summary;df-generated |
 | System.Configuration;ApplicationSettingsBase;ApplicationSettingsBase;(System.ComponentModel.IComponent);summary;df-generated |
 | System.Configuration;ApplicationSettingsBase;GetPreviousVersion;(System.String);summary;df-generated |
-| System.Configuration;ApplicationSettingsBase;OnPropertyChanged;(System.Object,System.ComponentModel.PropertyChangedEventArgs);summary;df-generated |
-| System.Configuration;ApplicationSettingsBase;OnSettingChanging;(System.Object,System.Configuration.SettingChangingEventArgs);summary;df-generated |
-| System.Configuration;ApplicationSettingsBase;OnSettingsLoaded;(System.Object,System.Configuration.SettingsLoadedEventArgs);summary;df-generated |
-| System.Configuration;ApplicationSettingsBase;OnSettingsSaving;(System.Object,System.ComponentModel.CancelEventArgs);summary;df-generated |
 | System.Configuration;ApplicationSettingsBase;Reload;();summary;df-generated |
 | System.Configuration;ApplicationSettingsBase;Reset;();summary;df-generated |
 | System.Configuration;ApplicationSettingsBase;Save;();summary;df-generated |
 | System.Configuration;ApplicationSettingsBase;Upgrade;();summary;df-generated |
+| System.Configuration;ApplicationSettingsBase;add_PropertyChanged;(System.ComponentModel.PropertyChangedEventHandler);summary;df-generated |
+| System.Configuration;ApplicationSettingsBase;add_SettingChanging;(System.Configuration.SettingChangingEventHandler);summary;df-generated |
+| System.Configuration;ApplicationSettingsBase;add_SettingsLoaded;(System.Configuration.SettingsLoadedEventHandler);summary;df-generated |
+| System.Configuration;ApplicationSettingsBase;add_SettingsSaving;(System.Configuration.SettingsSavingEventHandler);summary;df-generated |
+| System.Configuration;ApplicationSettingsBase;remove_PropertyChanged;(System.ComponentModel.PropertyChangedEventHandler);summary;df-generated |
+| System.Configuration;ApplicationSettingsBase;remove_SettingChanging;(System.Configuration.SettingChangingEventHandler);summary;df-generated |
+| System.Configuration;ApplicationSettingsBase;remove_SettingsLoaded;(System.Configuration.SettingsLoadedEventHandler);summary;df-generated |
+| System.Configuration;ApplicationSettingsBase;remove_SettingsSaving;(System.Configuration.SettingsSavingEventHandler);summary;df-generated |
 | System.Configuration;ApplicationSettingsBase;set_Item;(System.String,System.Object);summary;df-generated |
+| System.Configuration;CallbackValidator;CallbackValidator;(System.Type,System.Configuration.ValidatorCallback);summary;df-generated |
 | System.Configuration;CallbackValidator;CanValidate;(System.Type);summary;df-generated |
-| System.Configuration;CallbackValidator;Validate;(System.Object);summary;df-generated |
 | System.Configuration;CommaDelimitedStringCollection;Remove;(System.String);summary;df-generated |
 | System.Configuration;CommaDelimitedStringCollection;SetReadOnly;();summary;df-generated |
 | System.Configuration;CommaDelimitedStringCollection;get_IsModified;();summary;df-generated |
@@ -25537,6 +27485,7 @@ neutral
 | System.Configuration;ConfigurationElementCollection;get_ThrowOnDuplicate;();summary;df-generated |
 | System.Configuration;ConfigurationElementProperty;ConfigurationElementProperty;(System.Configuration.ConfigurationValidatorBase);summary;df-generated |
 | System.Configuration;ConfigurationElementProperty;get_Validator;();summary;df-generated |
+| System.Configuration;ConfigurationErrorsException;ConfigurationErrorsException;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);summary;df-generated |
 | System.Configuration;ConfigurationErrorsException;ConfigurationErrorsException;(System.String);summary;df-generated |
 | System.Configuration;ConfigurationErrorsException;ConfigurationErrorsException;(System.String,System.Exception);summary;df-generated |
 | System.Configuration;ConfigurationErrorsException;ConfigurationErrorsException;(System.String,System.Exception,System.Xml.XmlNode);summary;df-generated |
@@ -25547,6 +27496,7 @@ neutral
 | System.Configuration;ConfigurationErrorsException;GetLineNumber;(System.Xml.XmlNode);summary;df-generated |
 | System.Configuration;ConfigurationErrorsException;GetLineNumber;(System.Xml.XmlReader);summary;df-generated |
 | System.Configuration;ConfigurationErrorsException;get_Line;();summary;df-generated |
+| System.Configuration;ConfigurationException;ConfigurationException;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);summary;df-generated |
 | System.Configuration;ConfigurationException;ConfigurationException;(System.String);summary;df-generated |
 | System.Configuration;ConfigurationException;ConfigurationException;(System.String,System.Exception);summary;df-generated |
 | System.Configuration;ConfigurationException;ConfigurationException;(System.String,System.Exception,System.Xml.XmlNode);summary;df-generated |
@@ -25597,11 +27547,13 @@ neutral
 | System.Configuration;ConfigurationSection;ShouldSerializeSectionInTargetVersion;(System.Runtime.Versioning.FrameworkName);summary;df-generated |
 | System.Configuration;ConfigurationSection;get_SectionInformation;();summary;df-generated |
 | System.Configuration;ConfigurationSectionCollection;CopyTo;(System.Configuration.ConfigurationSection[],System.Int32);summary;df-generated |
+| System.Configuration;ConfigurationSectionCollection;GetKey;(System.Int32);summary;df-generated |
 | System.Configuration;ConfigurationSectionCollection;Remove;(System.String);summary;df-generated |
 | System.Configuration;ConfigurationSectionCollection;RemoveAt;(System.Int32);summary;df-generated |
 | System.Configuration;ConfigurationSectionGroup;ForceDeclaration;();summary;df-generated |
 | System.Configuration;ConfigurationSectionGroup;ForceDeclaration;(System.Boolean);summary;df-generated |
 | System.Configuration;ConfigurationSectionGroup;ShouldSerializeSectionGroupInTargetVersion;(System.Runtime.Versioning.FrameworkName);summary;df-generated |
+| System.Configuration;ConfigurationSectionGroupCollection;GetKey;(System.Int32);summary;df-generated |
 | System.Configuration;ConfigurationSectionGroupCollection;Remove;(System.String);summary;df-generated |
 | System.Configuration;ConfigurationSectionGroupCollection;RemoveAt;(System.Int32);summary;df-generated |
 | System.Configuration;ConfigurationSettings;GetConfig;(System.String);summary;df-generated |
@@ -25609,7 +27561,6 @@ neutral
 | System.Configuration;ConfigurationValidatorAttribute;ConfigurationValidatorAttribute;(System.Type);summary;df-generated |
 | System.Configuration;ConfigurationValidatorAttribute;get_ValidatorType;();summary;df-generated |
 | System.Configuration;ConfigurationValidatorBase;CanValidate;(System.Type);summary;df-generated |
-| System.Configuration;ConfigurationValidatorBase;Validate;(System.Object);summary;df-generated |
 | System.Configuration;ConnectionStringSettings;ConnectionStringSettings;(System.String,System.String);summary;df-generated |
 | System.Configuration;ConnectionStringSettings;ConnectionStringSettings;(System.String,System.String,System.String);summary;df-generated |
 | System.Configuration;ConnectionStringSettingsCollection;CreateNewElement;();summary;df-generated |
@@ -25621,7 +27572,6 @@ neutral
 | System.Configuration;DefaultSection;IsModified;();summary;df-generated |
 | System.Configuration;DefaultSection;ResetModified;();summary;df-generated |
 | System.Configuration;DefaultValidator;CanValidate;(System.Type);summary;df-generated |
-| System.Configuration;DefaultValidator;Validate;(System.Object);summary;df-generated |
 | System.Configuration;DictionarySectionHandler;get_KeyAttributeName;();summary;df-generated |
 | System.Configuration;DictionarySectionHandler;get_ValueAttributeName;();summary;df-generated |
 | System.Configuration;DpapiProtectedConfigurationProvider;Decrypt;(System.Xml.XmlNode);summary;df-generated |
@@ -25654,7 +27604,6 @@ neutral
 | System.Configuration;IntegerValidator;IntegerValidator;(System.Int32,System.Int32);summary;df-generated |
 | System.Configuration;IntegerValidator;IntegerValidator;(System.Int32,System.Int32,System.Boolean);summary;df-generated |
 | System.Configuration;IntegerValidator;IntegerValidator;(System.Int32,System.Int32,System.Boolean,System.Int32);summary;df-generated |
-| System.Configuration;IntegerValidator;Validate;(System.Object);summary;df-generated |
 | System.Configuration;KeyValueConfigurationCollection;Add;(System.String,System.String);summary;df-generated |
 | System.Configuration;KeyValueConfigurationCollection;CreateNewElement;();summary;df-generated |
 | System.Configuration;KeyValueConfigurationCollection;Remove;(System.String);summary;df-generated |
@@ -25668,7 +27617,6 @@ neutral
 | System.Configuration;LongValidator;LongValidator;(System.Int64,System.Int64);summary;df-generated |
 | System.Configuration;LongValidator;LongValidator;(System.Int64,System.Int64,System.Boolean);summary;df-generated |
 | System.Configuration;LongValidator;LongValidator;(System.Int64,System.Int64,System.Boolean,System.Int64);summary;df-generated |
-| System.Configuration;LongValidator;Validate;(System.Object);summary;df-generated |
 | System.Configuration;NameValueConfigurationCollection;CreateNewElement;();summary;df-generated |
 | System.Configuration;NameValueConfigurationCollection;Remove;(System.Configuration.NameValueConfigurationElement);summary;df-generated |
 | System.Configuration;NameValueConfigurationCollection;Remove;(System.String);summary;df-generated |
@@ -25676,7 +27624,6 @@ neutral
 | System.Configuration;NameValueSectionHandler;get_KeyAttributeName;();summary;df-generated |
 | System.Configuration;NameValueSectionHandler;get_ValueAttributeName;();summary;df-generated |
 | System.Configuration;PositiveTimeSpanValidator;CanValidate;(System.Type);summary;df-generated |
-| System.Configuration;PositiveTimeSpanValidator;Validate;(System.Object);summary;df-generated |
 | System.Configuration;PropertyInformation;get_IsKey;();summary;df-generated |
 | System.Configuration;PropertyInformation;get_IsLocked;();summary;df-generated |
 | System.Configuration;PropertyInformation;get_IsModified;();summary;df-generated |
@@ -25686,6 +27633,7 @@ neutral
 | System.Configuration;PropertyInformation;get_Source;();summary;df-generated |
 | System.Configuration;PropertyInformation;get_Type;();summary;df-generated |
 | System.Configuration;PropertyInformation;get_ValueOrigin;();summary;df-generated |
+| System.Configuration;PropertyInformationCollection;get_Item;(System.String);summary;df-generated |
 | System.Configuration;ProtectedConfiguration;get_DefaultProvider;();summary;df-generated |
 | System.Configuration;ProtectedConfiguration;get_Providers;();summary;df-generated |
 | System.Configuration;ProtectedConfigurationProvider;Decrypt;(System.Xml.XmlNode);summary;df-generated |
@@ -25697,7 +27645,6 @@ neutral
 | System.Configuration;ProviderSettingsCollection;CreateNewElement;();summary;df-generated |
 | System.Configuration;ProviderSettingsCollection;Remove;(System.String);summary;df-generated |
 | System.Configuration;RegexStringValidator;CanValidate;(System.Type);summary;df-generated |
-| System.Configuration;RegexStringValidator;Validate;(System.Object);summary;df-generated |
 | System.Configuration;RegexStringValidatorAttribute;RegexStringValidatorAttribute;(System.String);summary;df-generated |
 | System.Configuration;RegexStringValidatorAttribute;get_Regex;();summary;df-generated |
 | System.Configuration;RsaProtectedConfigurationProvider;AddKey;(System.Int32,System.Boolean);summary;df-generated |
@@ -25783,16 +27730,13 @@ neutral
 | System.Configuration;StringValidator;CanValidate;(System.Type);summary;df-generated |
 | System.Configuration;StringValidator;StringValidator;(System.Int32);summary;df-generated |
 | System.Configuration;StringValidator;StringValidator;(System.Int32,System.Int32);summary;df-generated |
-| System.Configuration;StringValidator;Validate;(System.Object);summary;df-generated |
 | System.Configuration;SubclassTypeValidator;CanValidate;(System.Type);summary;df-generated |
 | System.Configuration;SubclassTypeValidator;SubclassTypeValidator;(System.Type);summary;df-generated |
-| System.Configuration;SubclassTypeValidator;Validate;(System.Object);summary;df-generated |
 | System.Configuration;SubclassTypeValidatorAttribute;SubclassTypeValidatorAttribute;(System.Type);summary;df-generated |
 | System.Configuration;SubclassTypeValidatorAttribute;get_BaseClass;();summary;df-generated |
 | System.Configuration;TimeSpanValidator;CanValidate;(System.Type);summary;df-generated |
 | System.Configuration;TimeSpanValidator;TimeSpanValidator;(System.TimeSpan,System.TimeSpan);summary;df-generated |
 | System.Configuration;TimeSpanValidator;TimeSpanValidator;(System.TimeSpan,System.TimeSpan,System.Boolean);summary;df-generated |
-| System.Configuration;TimeSpanValidator;Validate;(System.Object);summary;df-generated |
 | System.Data.Common;DBDataPermission;Add;(System.String,System.String,System.Data.KeyRestrictionBehavior);summary;df-generated |
 | System.Data.Common;DBDataPermission;Clear;();summary;df-generated |
 | System.Data.Common;DBDataPermission;CreateInstance;();summary;df-generated |
@@ -25824,24 +27768,30 @@ neutral
 | System.Data.Common;DataAdapter;ShouldSerializeFillLoadOption;();summary;df-generated |
 | System.Data.Common;DataAdapter;ShouldSerializeTableMappings;();summary;df-generated |
 | System.Data.Common;DataAdapter;Update;(System.Data.DataSet);summary;df-generated |
+| System.Data.Common;DataAdapter;add_FillError;(System.Data.FillErrorEventHandler);summary;df-generated |
+| System.Data.Common;DataAdapter;get_TableMappings;();summary;df-generated |
+| System.Data.Common;DataAdapter;remove_FillError;(System.Data.FillErrorEventHandler);summary;df-generated |
 | System.Data.Common;DataColumnMappingCollection;Contains;(System.Object);summary;df-generated |
 | System.Data.Common;DataColumnMappingCollection;Contains;(System.String);summary;df-generated |
 | System.Data.Common;DataColumnMappingCollection;IndexOf;(System.Object);summary;df-generated |
 | System.Data.Common;DataColumnMappingCollection;IndexOf;(System.String);summary;df-generated |
 | System.Data.Common;DataColumnMappingCollection;IndexOfDataSetColumn;(System.String);summary;df-generated |
 | System.Data.Common;DataColumnMappingCollection;Remove;(System.Data.Common.DataColumnMapping);summary;df-generated |
+| System.Data.Common;DataColumnMappingCollection;Remove;(System.Object);summary;df-generated |
 | System.Data.Common;DataColumnMappingCollection;RemoveAt;(System.Int32);summary;df-generated |
 | System.Data.Common;DataColumnMappingCollection;RemoveAt;(System.String);summary;df-generated |
 | System.Data.Common;DataColumnMappingCollection;get_Count;();summary;df-generated |
 | System.Data.Common;DataColumnMappingCollection;get_IsFixedSize;();summary;df-generated |
 | System.Data.Common;DataColumnMappingCollection;get_IsReadOnly;();summary;df-generated |
 | System.Data.Common;DataColumnMappingCollection;get_IsSynchronized;();summary;df-generated |
+| System.Data.Common;DataTableMapping;get_ColumnMappings;();summary;df-generated |
 | System.Data.Common;DataTableMappingCollection;Contains;(System.Object);summary;df-generated |
 | System.Data.Common;DataTableMappingCollection;Contains;(System.String);summary;df-generated |
 | System.Data.Common;DataTableMappingCollection;IndexOf;(System.Object);summary;df-generated |
 | System.Data.Common;DataTableMappingCollection;IndexOf;(System.String);summary;df-generated |
 | System.Data.Common;DataTableMappingCollection;IndexOfDataSetTable;(System.String);summary;df-generated |
 | System.Data.Common;DataTableMappingCollection;Remove;(System.Data.Common.DataTableMapping);summary;df-generated |
+| System.Data.Common;DataTableMappingCollection;Remove;(System.Object);summary;df-generated |
 | System.Data.Common;DataTableMappingCollection;RemoveAt;(System.Int32);summary;df-generated |
 | System.Data.Common;DataTableMappingCollection;RemoveAt;(System.String);summary;df-generated |
 | System.Data.Common;DataTableMappingCollection;get_Count;();summary;df-generated |
@@ -25878,11 +27828,21 @@ neutral
 | System.Data.Common;DbCommand;Cancel;();summary;df-generated |
 | System.Data.Common;DbCommand;CreateDbParameter;();summary;df-generated |
 | System.Data.Common;DbCommand;CreateParameter;();summary;df-generated |
+| System.Data.Common;DbCommand;ExecuteDbDataReaderAsync;(System.Data.CommandBehavior,System.Threading.CancellationToken);summary;df-generated |
 | System.Data.Common;DbCommand;ExecuteNonQuery;();summary;df-generated |
 | System.Data.Common;DbCommand;ExecuteNonQueryAsync;();summary;df-generated |
 | System.Data.Common;DbCommand;ExecuteNonQueryAsync;(System.Threading.CancellationToken);summary;df-generated |
+| System.Data.Common;DbCommand;ExecuteReader;();summary;df-generated |
 | System.Data.Common;DbCommand;ExecuteReader;(System.Data.CommandBehavior);summary;df-generated |
+| System.Data.Common;DbCommand;ExecuteReaderAsync;();summary;df-generated |
+| System.Data.Common;DbCommand;ExecuteReaderAsync;(System.Data.CommandBehavior);summary;df-generated |
+| System.Data.Common;DbCommand;ExecuteReaderAsync;(System.Data.CommandBehavior,System.Threading.CancellationToken);summary;df-generated |
+| System.Data.Common;DbCommand;ExecuteReaderAsync;(System.Threading.CancellationToken);summary;df-generated |
+| System.Data.Common;DbCommand;ExecuteScalarAsync;();summary;df-generated |
+| System.Data.Common;DbCommand;ExecuteScalarAsync;(System.Threading.CancellationToken);summary;df-generated |
 | System.Data.Common;DbCommand;Prepare;();summary;df-generated |
+| System.Data.Common;DbCommand;PrepareAsync;(System.Threading.CancellationToken);summary;df-generated |
+| System.Data.Common;DbCommand;get_Parameters;();summary;df-generated |
 | System.Data.Common;DbCommandBuilder;ApplyParameterInfo;(System.Data.Common.DbParameter,System.Data.DataRow,System.Data.StatementType,System.Boolean);summary;df-generated |
 | System.Data.Common;DbCommandBuilder;Dispose;(System.Boolean);summary;df-generated |
 | System.Data.Common;DbCommandBuilder;GetParameterName;(System.Int32);summary;df-generated |
@@ -25890,11 +27850,19 @@ neutral
 | System.Data.Common;DbCommandBuilder;GetSchemaTable;(System.Data.Common.DbCommand);summary;df-generated |
 | System.Data.Common;DbCommandBuilder;RefreshSchema;();summary;df-generated |
 | System.Data.Common;DbCommandBuilder;SetRowUpdatingHandler;(System.Data.Common.DbDataAdapter);summary;df-generated |
+| System.Data.Common;DbConnection;BeginDbTransactionAsync;(System.Data.IsolationLevel,System.Threading.CancellationToken);summary;df-generated |
+| System.Data.Common;DbConnection;BeginTransaction;();summary;df-generated |
+| System.Data.Common;DbConnection;BeginTransaction;(System.Data.IsolationLevel);summary;df-generated |
+| System.Data.Common;DbConnection;BeginTransactionAsync;(System.Data.IsolationLevel,System.Threading.CancellationToken);summary;df-generated |
+| System.Data.Common;DbConnection;BeginTransactionAsync;(System.Threading.CancellationToken);summary;df-generated |
 | System.Data.Common;DbConnection;ChangeDatabase;(System.String);summary;df-generated |
+| System.Data.Common;DbConnection;ChangeDatabaseAsync;(System.String,System.Threading.CancellationToken);summary;df-generated |
 | System.Data.Common;DbConnection;Close;();summary;df-generated |
 | System.Data.Common;DbConnection;CloseAsync;();summary;df-generated |
 | System.Data.Common;DbConnection;CreateBatch;();summary;df-generated |
+| System.Data.Common;DbConnection;CreateCommand;();summary;df-generated |
 | System.Data.Common;DbConnection;CreateDbBatch;();summary;df-generated |
+| System.Data.Common;DbConnection;CreateDbCommand;();summary;df-generated |
 | System.Data.Common;DbConnection;EnlistTransaction;(System.Transactions.Transaction);summary;df-generated |
 | System.Data.Common;DbConnection;GetSchema;();summary;df-generated |
 | System.Data.Common;DbConnection;GetSchema;(System.String);summary;df-generated |
@@ -25905,17 +27873,21 @@ neutral
 | System.Data.Common;DbConnection;OnStateChange;(System.Data.StateChangeEventArgs);summary;df-generated |
 | System.Data.Common;DbConnection;Open;();summary;df-generated |
 | System.Data.Common;DbConnection;OpenAsync;();summary;df-generated |
+| System.Data.Common;DbConnection;OpenAsync;(System.Threading.CancellationToken);summary;df-generated |
+| System.Data.Common;DbConnection;add_StateChange;(System.Data.StateChangeEventHandler);summary;df-generated |
 | System.Data.Common;DbConnection;get_CanCreateBatch;();summary;df-generated |
 | System.Data.Common;DbConnection;get_ConnectionTimeout;();summary;df-generated |
 | System.Data.Common;DbConnection;get_DataSource;();summary;df-generated |
 | System.Data.Common;DbConnection;get_Database;();summary;df-generated |
 | System.Data.Common;DbConnection;get_DbProviderFactory;();summary;df-generated |
 | System.Data.Common;DbConnection;get_State;();summary;df-generated |
+| System.Data.Common;DbConnection;remove_StateChange;(System.Data.StateChangeEventHandler);summary;df-generated |
 | System.Data.Common;DbConnectionStringBuilder;ClearPropertyDescriptors;();summary;df-generated |
 | System.Data.Common;DbConnectionStringBuilder;Contains;(System.Object);summary;df-generated |
 | System.Data.Common;DbConnectionStringBuilder;ContainsKey;(System.String);summary;df-generated |
 | System.Data.Common;DbConnectionStringBuilder;DbConnectionStringBuilder;(System.Boolean);summary;df-generated |
 | System.Data.Common;DbConnectionStringBuilder;EquivalentTo;(System.Data.Common.DbConnectionStringBuilder);summary;df-generated |
+| System.Data.Common;DbConnectionStringBuilder;GetAttributes;();summary;df-generated |
 | System.Data.Common;DbConnectionStringBuilder;GetClassName;();summary;df-generated |
 | System.Data.Common;DbConnectionStringBuilder;GetComponentName;();summary;df-generated |
 | System.Data.Common;DbConnectionStringBuilder;GetConverter;();summary;df-generated |
@@ -25933,6 +27905,9 @@ neutral
 | System.Data.Common;DbConnectionStringBuilder;get_IsSynchronized;();summary;df-generated |
 | System.Data.Common;DbDataAdapter;AddToBatch;(System.Data.IDbCommand);summary;df-generated |
 | System.Data.Common;DbDataAdapter;ClearBatch;();summary;df-generated |
+| System.Data.Common;DbDataAdapter;CreateRowUpdatedEvent;(System.Data.DataRow,System.Data.IDbCommand,System.Data.StatementType,System.Data.Common.DataTableMapping);summary;df-generated |
+| System.Data.Common;DbDataAdapter;CreateRowUpdatingEvent;(System.Data.DataRow,System.Data.IDbCommand,System.Data.StatementType,System.Data.Common.DataTableMapping);summary;df-generated |
+| System.Data.Common;DbDataAdapter;DbDataAdapter;(System.Data.Common.DbDataAdapter);summary;df-generated |
 | System.Data.Common;DbDataAdapter;Dispose;(System.Boolean);summary;df-generated |
 | System.Data.Common;DbDataAdapter;ExecuteBatch;();summary;df-generated |
 | System.Data.Common;DbDataAdapter;Fill;(System.Data.DataSet);summary;df-generated |
@@ -25968,17 +27943,21 @@ neutral
 | System.Data.Common;DbDataReader;GetChars;(System.Int32,System.Int64,System.Char[],System.Int32,System.Int32);summary;df-generated |
 | System.Data.Common;DbDataReader;GetColumnSchemaAsync;(System.Threading.CancellationToken);summary;df-generated |
 | System.Data.Common;DbDataReader;GetData;(System.Int32);summary;df-generated |
+| System.Data.Common;DbDataReader;GetDataTypeName;(System.Int32);summary;manual |
 | System.Data.Common;DbDataReader;GetDateTime;(System.Int32);summary;df-generated |
 | System.Data.Common;DbDataReader;GetDbDataReader;(System.Int32);summary;df-generated |
 | System.Data.Common;DbDataReader;GetDecimal;(System.Int32);summary;df-generated |
 | System.Data.Common;DbDataReader;GetDouble;(System.Int32);summary;df-generated |
 | System.Data.Common;DbDataReader;GetFieldType;(System.Int32);summary;df-generated |
 | System.Data.Common;DbDataReader;GetFloat;(System.Int32);summary;df-generated |
+| System.Data.Common;DbDataReader;GetGuid;(System.Int32);summary;manual |
 | System.Data.Common;DbDataReader;GetInt16;(System.Int32);summary;df-generated |
 | System.Data.Common;DbDataReader;GetInt32;(System.Int32);summary;df-generated |
 | System.Data.Common;DbDataReader;GetInt64;(System.Int32);summary;df-generated |
+| System.Data.Common;DbDataReader;GetName;(System.Int32);summary;manual |
 | System.Data.Common;DbDataReader;GetOrdinal;(System.String);summary;df-generated |
 | System.Data.Common;DbDataReader;GetProviderSpecificFieldType;(System.Int32);summary;df-generated |
+| System.Data.Common;DbDataReader;GetSchemaTableAsync;(System.Threading.CancellationToken);summary;df-generated |
 | System.Data.Common;DbDataReader;GetStream;(System.Int32);summary;df-generated |
 | System.Data.Common;DbDataReader;IsDBNull;(System.Int32);summary;df-generated |
 | System.Data.Common;DbDataReader;IsDBNullAsync;(System.Int32);summary;df-generated |
@@ -25997,6 +27976,7 @@ neutral
 | System.Data.Common;DbDataReader;get_VisibleFieldCount;();summary;df-generated |
 | System.Data.Common;DbDataReaderExtensions;CanGetColumnSchema;(System.Data.Common.DbDataReader);summary;df-generated |
 | System.Data.Common;DbDataReaderExtensions;GetColumnSchema;(System.Data.Common.DbDataReader);summary;df-generated |
+| System.Data.Common;DbDataRecord;GetAttributes;();summary;df-generated |
 | System.Data.Common;DbDataRecord;GetBoolean;(System.Int32);summary;df-generated |
 | System.Data.Common;DbDataRecord;GetByte;(System.Int32);summary;df-generated |
 | System.Data.Common;DbDataRecord;GetBytes;(System.Int32,System.Int64,System.Byte[],System.Int32,System.Int32);summary;df-generated |
@@ -26006,6 +27986,7 @@ neutral
 | System.Data.Common;DbDataRecord;GetComponentName;();summary;df-generated |
 | System.Data.Common;DbDataRecord;GetConverter;();summary;df-generated |
 | System.Data.Common;DbDataRecord;GetData;(System.Int32);summary;df-generated |
+| System.Data.Common;DbDataRecord;GetDataTypeName;(System.Int32);summary;manual |
 | System.Data.Common;DbDataRecord;GetDateTime;(System.Int32);summary;df-generated |
 | System.Data.Common;DbDataRecord;GetDbDataReader;(System.Int32);summary;df-generated |
 | System.Data.Common;DbDataRecord;GetDecimal;(System.Int32);summary;df-generated |
@@ -26017,15 +27998,19 @@ neutral
 | System.Data.Common;DbDataRecord;GetEvents;(System.Attribute[]);summary;df-generated |
 | System.Data.Common;DbDataRecord;GetFieldType;(System.Int32);summary;df-generated |
 | System.Data.Common;DbDataRecord;GetFloat;(System.Int32);summary;df-generated |
+| System.Data.Common;DbDataRecord;GetGuid;(System.Int32);summary;manual |
 | System.Data.Common;DbDataRecord;GetInt16;(System.Int32);summary;df-generated |
 | System.Data.Common;DbDataRecord;GetInt32;(System.Int32);summary;df-generated |
 | System.Data.Common;DbDataRecord;GetInt64;(System.Int32);summary;df-generated |
+| System.Data.Common;DbDataRecord;GetName;(System.Int32);summary;manual |
 | System.Data.Common;DbDataRecord;GetOrdinal;(System.String);summary;df-generated |
 | System.Data.Common;DbDataRecord;IsDBNull;(System.Int32);summary;df-generated |
 | System.Data.Common;DbDataRecord;get_FieldCount;();summary;df-generated |
 | System.Data.Common;DbDataSource;CreateBatch;();summary;df-generated |
+| System.Data.Common;DbDataSource;CreateCommand;(System.String);summary;df-generated |
 | System.Data.Common;DbDataSource;CreateConnection;();summary;df-generated |
 | System.Data.Common;DbDataSource;CreateDbBatch;();summary;df-generated |
+| System.Data.Common;DbDataSource;CreateDbCommand;(System.String);summary;df-generated |
 | System.Data.Common;DbDataSource;CreateDbConnection;();summary;df-generated |
 | System.Data.Common;DbDataSource;Dispose;();summary;df-generated |
 | System.Data.Common;DbDataSource;Dispose;(System.Boolean);summary;df-generated |
@@ -26047,8 +28032,11 @@ neutral
 | System.Data.Common;DbException;get_IsTransient;();summary;df-generated |
 | System.Data.Common;DbException;get_SqlState;();summary;df-generated |
 | System.Data.Common;DbParameter;ResetDbType;();summary;df-generated |
+| System.Data.Common;DbParameter;get_IsNullable;();summary;df-generated |
 | System.Data.Common;DbParameterCollection;Contains;(System.Object);summary;df-generated |
 | System.Data.Common;DbParameterCollection;Contains;(System.String);summary;df-generated |
+| System.Data.Common;DbParameterCollection;GetParameter;(System.Int32);summary;df-generated |
+| System.Data.Common;DbParameterCollection;GetParameter;(System.String);summary;df-generated |
 | System.Data.Common;DbParameterCollection;IndexOf;(System.Object);summary;df-generated |
 | System.Data.Common;DbParameterCollection;IndexOf;(System.String);summary;df-generated |
 | System.Data.Common;DbParameterCollection;Remove;(System.Object);summary;df-generated |
@@ -26083,12 +28071,19 @@ neutral
 | System.Data.Common;DbProviderSpecificTypePropertyAttribute;DbProviderSpecificTypePropertyAttribute;(System.Boolean);summary;df-generated |
 | System.Data.Common;DbProviderSpecificTypePropertyAttribute;get_IsProviderSpecificTypeProperty;();summary;df-generated |
 | System.Data.Common;DbTransaction;Commit;();summary;df-generated |
+| System.Data.Common;DbTransaction;CommitAsync;(System.Threading.CancellationToken);summary;df-generated |
 | System.Data.Common;DbTransaction;Dispose;();summary;df-generated |
 | System.Data.Common;DbTransaction;Dispose;(System.Boolean);summary;df-generated |
 | System.Data.Common;DbTransaction;Release;(System.String);summary;df-generated |
+| System.Data.Common;DbTransaction;ReleaseAsync;(System.String,System.Threading.CancellationToken);summary;df-generated |
 | System.Data.Common;DbTransaction;Rollback;();summary;df-generated |
 | System.Data.Common;DbTransaction;Rollback;(System.String);summary;df-generated |
+| System.Data.Common;DbTransaction;RollbackAsync;(System.String,System.Threading.CancellationToken);summary;df-generated |
+| System.Data.Common;DbTransaction;RollbackAsync;(System.Threading.CancellationToken);summary;df-generated |
 | System.Data.Common;DbTransaction;Save;(System.String);summary;df-generated |
+| System.Data.Common;DbTransaction;SaveAsync;(System.String,System.Threading.CancellationToken);summary;df-generated |
+| System.Data.Common;DbTransaction;get_Connection;();summary;df-generated |
+| System.Data.Common;DbTransaction;get_DbConnection;();summary;df-generated |
 | System.Data.Common;DbTransaction;get_IsolationLevel;();summary;df-generated |
 | System.Data.Common;DbTransaction;get_SupportsSavepoints;();summary;df-generated |
 | System.Data.Common;IDbColumnSchemaGenerator;GetColumnSchema;();summary;df-generated |
@@ -26096,6 +28091,171 @@ neutral
 | System.Data.Common;RowUpdatedEventArgs;get_RowCount;();summary;df-generated |
 | System.Data.Common;RowUpdatedEventArgs;get_StatementType;();summary;df-generated |
 | System.Data.Common;RowUpdatingEventArgs;get_StatementType;();summary;df-generated |
+| System.Data.Entity.Core.EntityClient;EntityCommand;Cancel;();summary;df-generated |
+| System.Data.Entity.Core.EntityClient;EntityCommand;CreateDbParameter;();summary;df-generated |
+| System.Data.Entity.Core.EntityClient;EntityCommand;ExecuteDbDataReaderAsync;(System.Data.CommandBehavior,System.Threading.CancellationToken);summary;df-generated |
+| System.Data.Entity.Core.EntityClient;EntityCommand;ExecuteNonQuery;();summary;df-generated |
+| System.Data.Entity.Core.EntityClient;EntityCommand;ExecuteNonQueryAsync;(System.Threading.CancellationToken);summary;df-generated |
+| System.Data.Entity.Core.EntityClient;EntityCommand;Prepare;();summary;df-generated |
+| System.Data.Entity.Core.EntityClient;EntityConnection;ChangeDatabase;(System.String);summary;df-generated |
+| System.Data.Entity.Core.EntityClient;EntityConnection;Close;();summary;df-generated |
+| System.Data.Entity.Core.EntityClient;EntityConnection;CreateDbCommand;();summary;df-generated |
+| System.Data.Entity.Core.EntityClient;EntityConnection;Dispose;(System.Boolean);summary;df-generated |
+| System.Data.Entity.Core.EntityClient;EntityConnection;EnlistTransaction;(System.Transactions.Transaction);summary;df-generated |
+| System.Data.Entity.Core.EntityClient;EntityConnection;Open;();summary;df-generated |
+| System.Data.Entity.Core.EntityClient;EntityConnection;OpenAsync;(System.Threading.CancellationToken);summary;df-generated |
+| System.Data.Entity.Core.EntityClient;EntityConnection;get_ConnectionTimeout;();summary;df-generated |
+| System.Data.Entity.Core.EntityClient;EntityConnection;get_DataSource;();summary;df-generated |
+| System.Data.Entity.Core.EntityClient;EntityConnection;get_Database;();summary;df-generated |
+| System.Data.Entity.Core.EntityClient;EntityConnection;get_DbProviderFactory;();summary;df-generated |
+| System.Data.Entity.Core.EntityClient;EntityConnection;get_State;();summary;df-generated |
+| System.Data.Entity.Core.EntityClient;EntityConnectionStringBuilder;ContainsKey;(System.String);summary;df-generated |
+| System.Data.Entity.Core.EntityClient;EntityConnectionStringBuilder;Remove;(System.String);summary;df-generated |
+| System.Data.Entity.Core.EntityClient;EntityConnectionStringBuilder;get_IsFixedSize;();summary;df-generated |
+| System.Data.Entity.Core.EntityClient;EntityDataReader;Close;();summary;df-generated |
+| System.Data.Entity.Core.EntityClient;EntityDataReader;Dispose;(System.Boolean);summary;df-generated |
+| System.Data.Entity.Core.EntityClient;EntityDataReader;GetBoolean;(System.Int32);summary;df-generated |
+| System.Data.Entity.Core.EntityClient;EntityDataReader;GetByte;(System.Int32);summary;df-generated |
+| System.Data.Entity.Core.EntityClient;EntityDataReader;GetBytes;(System.Int32,System.Int64,System.Byte[],System.Int32,System.Int32);summary;df-generated |
+| System.Data.Entity.Core.EntityClient;EntityDataReader;GetChar;(System.Int32);summary;df-generated |
+| System.Data.Entity.Core.EntityClient;EntityDataReader;GetChars;(System.Int32,System.Int64,System.Char[],System.Int32,System.Int32);summary;df-generated |
+| System.Data.Entity.Core.EntityClient;EntityDataReader;GetDataTypeName;(System.Int32);summary;manual |
+| System.Data.Entity.Core.EntityClient;EntityDataReader;GetDateTime;(System.Int32);summary;df-generated |
+| System.Data.Entity.Core.EntityClient;EntityDataReader;GetDbDataReader;(System.Int32);summary;df-generated |
+| System.Data.Entity.Core.EntityClient;EntityDataReader;GetDecimal;(System.Int32);summary;df-generated |
+| System.Data.Entity.Core.EntityClient;EntityDataReader;GetDouble;(System.Int32);summary;df-generated |
+| System.Data.Entity.Core.EntityClient;EntityDataReader;GetFieldType;(System.Int32);summary;df-generated |
+| System.Data.Entity.Core.EntityClient;EntityDataReader;GetFloat;(System.Int32);summary;df-generated |
+| System.Data.Entity.Core.EntityClient;EntityDataReader;GetGuid;(System.Int32);summary;manual |
+| System.Data.Entity.Core.EntityClient;EntityDataReader;GetInt16;(System.Int32);summary;df-generated |
+| System.Data.Entity.Core.EntityClient;EntityDataReader;GetInt32;(System.Int32);summary;df-generated |
+| System.Data.Entity.Core.EntityClient;EntityDataReader;GetInt64;(System.Int32);summary;df-generated |
+| System.Data.Entity.Core.EntityClient;EntityDataReader;GetName;(System.Int32);summary;manual |
+| System.Data.Entity.Core.EntityClient;EntityDataReader;GetOrdinal;(System.String);summary;df-generated |
+| System.Data.Entity.Core.EntityClient;EntityDataReader;GetProviderSpecificFieldType;(System.Int32);summary;df-generated |
+| System.Data.Entity.Core.EntityClient;EntityDataReader;IsDBNull;(System.Int32);summary;df-generated |
+| System.Data.Entity.Core.EntityClient;EntityDataReader;NextResult;();summary;df-generated |
+| System.Data.Entity.Core.EntityClient;EntityDataReader;NextResultAsync;(System.Threading.CancellationToken);summary;df-generated |
+| System.Data.Entity.Core.EntityClient;EntityDataReader;Read;();summary;df-generated |
+| System.Data.Entity.Core.EntityClient;EntityDataReader;ReadAsync;(System.Threading.CancellationToken);summary;df-generated |
+| System.Data.Entity.Core.EntityClient;EntityDataReader;get_Depth;();summary;df-generated |
+| System.Data.Entity.Core.EntityClient;EntityDataReader;get_FieldCount;();summary;df-generated |
+| System.Data.Entity.Core.EntityClient;EntityDataReader;get_HasRows;();summary;df-generated |
+| System.Data.Entity.Core.EntityClient;EntityDataReader;get_IsClosed;();summary;df-generated |
+| System.Data.Entity.Core.EntityClient;EntityDataReader;get_RecordsAffected;();summary;df-generated |
+| System.Data.Entity.Core.EntityClient;EntityDataReader;get_VisibleFieldCount;();summary;df-generated |
+| System.Data.Entity.Core.EntityClient;EntityParameter;ResetDbType;();summary;df-generated |
+| System.Data.Entity.Core.EntityClient;EntityParameter;get_IsNullable;();summary;df-generated |
+| System.Data.Entity.Core.EntityClient;EntityParameterCollection;Contains;(System.Object);summary;df-generated |
+| System.Data.Entity.Core.EntityClient;EntityParameterCollection;Contains;(System.String);summary;df-generated |
+| System.Data.Entity.Core.EntityClient;EntityParameterCollection;GetParameter;(System.Int32);summary;df-generated |
+| System.Data.Entity.Core.EntityClient;EntityParameterCollection;GetParameter;(System.String);summary;df-generated |
+| System.Data.Entity.Core.EntityClient;EntityParameterCollection;IndexOf;(System.Object);summary;df-generated |
+| System.Data.Entity.Core.EntityClient;EntityParameterCollection;IndexOf;(System.String);summary;df-generated |
+| System.Data.Entity.Core.EntityClient;EntityParameterCollection;Remove;(System.Object);summary;df-generated |
+| System.Data.Entity.Core.EntityClient;EntityParameterCollection;RemoveAt;(System.Int32);summary;df-generated |
+| System.Data.Entity.Core.EntityClient;EntityParameterCollection;RemoveAt;(System.String);summary;df-generated |
+| System.Data.Entity.Core.EntityClient;EntityParameterCollection;get_Count;();summary;df-generated |
+| System.Data.Entity.Core.EntityClient;EntityParameterCollection;get_IsFixedSize;();summary;df-generated |
+| System.Data.Entity.Core.EntityClient;EntityParameterCollection;get_IsReadOnly;();summary;df-generated |
+| System.Data.Entity.Core.EntityClient;EntityParameterCollection;get_IsSynchronized;();summary;df-generated |
+| System.Data.Entity.Core.EntityClient;EntityProviderFactory;CreateCommand;();summary;df-generated |
+| System.Data.Entity.Core.EntityClient;EntityProviderFactory;CreateCommandBuilder;();summary;df-generated |
+| System.Data.Entity.Core.EntityClient;EntityProviderFactory;CreateConnection;();summary;df-generated |
+| System.Data.Entity.Core.EntityClient;EntityProviderFactory;CreateConnectionStringBuilder;();summary;df-generated |
+| System.Data.Entity.Core.EntityClient;EntityProviderFactory;CreateDataAdapter;();summary;df-generated |
+| System.Data.Entity.Core.EntityClient;EntityProviderFactory;CreateParameter;();summary;df-generated |
+| System.Data.Entity.Core.EntityClient;EntityTransaction;Commit;();summary;df-generated |
+| System.Data.Entity.Core.EntityClient;EntityTransaction;Dispose;(System.Boolean);summary;df-generated |
+| System.Data.Entity.Core.EntityClient;EntityTransaction;Rollback;();summary;df-generated |
+| System.Data.Entity.Core.EntityClient;EntityTransaction;get_DbConnection;();summary;df-generated |
+| System.Data.Entity.Core.EntityClient;EntityTransaction;get_IsolationLevel;();summary;df-generated |
+| System.Data.Entity.Core.Metadata.Edm;ReadOnlyMetadataCollection<T>+Enumerator;Dispose;();summary;df-generated |
+| System.Data.Entity.Core.Metadata.Edm;ReadOnlyMetadataCollection<T>+Enumerator;MoveNext;();summary;df-generated |
+| System.Data.Entity.Core.Metadata.Edm;ReadOnlyMetadataCollection<T>+Enumerator;Reset;();summary;df-generated |
+| System.Data.Entity.Core.Metadata.Edm;ReadOnlyMetadataCollection<T>+Enumerator;get_Current;();summary;df-generated |
+| System.Data.Entity.Core.Objects.DataClasses;EntityCollection<TEntity>;Contains;(TEntity);summary;df-generated |
+| System.Data.Entity.Core.Objects.DataClasses;EntityCollection<TEntity>;Remove;(TEntity);summary;df-generated |
+| System.Data.Entity.Core.Objects.DataClasses;EntityCollection<TEntity>;get_ContainsListCollection;();summary;df-generated |
+| System.Data.Entity.Core.Objects.DataClasses;EntityCollection<TEntity>;get_Count;();summary;df-generated |
+| System.Data.Entity.Core.Objects.DataClasses;EntityCollection<TEntity>;get_IsReadOnly;();summary;df-generated |
+| System.Data.Entity.Core.Objects.DataClasses;StructuralObject;add_PropertyChanged;(System.ComponentModel.PropertyChangedEventHandler);summary;df-generated |
+| System.Data.Entity.Core.Objects.DataClasses;StructuralObject;add_PropertyChanging;(System.ComponentModel.PropertyChangingEventHandler);summary;df-generated |
+| System.Data.Entity.Core.Objects.DataClasses;StructuralObject;remove_PropertyChanged;(System.ComponentModel.PropertyChangedEventHandler);summary;df-generated |
+| System.Data.Entity.Core.Objects.DataClasses;StructuralObject;remove_PropertyChanging;(System.ComponentModel.PropertyChangingEventHandler);summary;df-generated |
+| System.Data.Entity.Core.Objects;DbUpdatableDataRecord;GetBoolean;(System.Int32);summary;df-generated |
+| System.Data.Entity.Core.Objects;DbUpdatableDataRecord;GetByte;(System.Int32);summary;df-generated |
+| System.Data.Entity.Core.Objects;DbUpdatableDataRecord;GetBytes;(System.Int32,System.Int64,System.Byte[],System.Int32,System.Int32);summary;df-generated |
+| System.Data.Entity.Core.Objects;DbUpdatableDataRecord;GetChar;(System.Int32);summary;df-generated |
+| System.Data.Entity.Core.Objects;DbUpdatableDataRecord;GetChars;(System.Int32,System.Int64,System.Char[],System.Int32,System.Int32);summary;df-generated |
+| System.Data.Entity.Core.Objects;DbUpdatableDataRecord;GetData;(System.Int32);summary;df-generated |
+| System.Data.Entity.Core.Objects;DbUpdatableDataRecord;GetDataTypeName;(System.Int32);summary;manual |
+| System.Data.Entity.Core.Objects;DbUpdatableDataRecord;GetDateTime;(System.Int32);summary;df-generated |
+| System.Data.Entity.Core.Objects;DbUpdatableDataRecord;GetDbDataReader;(System.Int32);summary;df-generated |
+| System.Data.Entity.Core.Objects;DbUpdatableDataRecord;GetDecimal;(System.Int32);summary;df-generated |
+| System.Data.Entity.Core.Objects;DbUpdatableDataRecord;GetDouble;(System.Int32);summary;df-generated |
+| System.Data.Entity.Core.Objects;DbUpdatableDataRecord;GetFieldType;(System.Int32);summary;df-generated |
+| System.Data.Entity.Core.Objects;DbUpdatableDataRecord;GetFloat;(System.Int32);summary;df-generated |
+| System.Data.Entity.Core.Objects;DbUpdatableDataRecord;GetGuid;(System.Int32);summary;manual |
+| System.Data.Entity.Core.Objects;DbUpdatableDataRecord;GetInt16;(System.Int32);summary;df-generated |
+| System.Data.Entity.Core.Objects;DbUpdatableDataRecord;GetInt32;(System.Int32);summary;df-generated |
+| System.Data.Entity.Core.Objects;DbUpdatableDataRecord;GetInt64;(System.Int32);summary;df-generated |
+| System.Data.Entity.Core.Objects;DbUpdatableDataRecord;GetName;(System.Int32);summary;manual |
+| System.Data.Entity.Core.Objects;DbUpdatableDataRecord;GetOrdinal;(System.String);summary;df-generated |
+| System.Data.Entity.Core.Objects;DbUpdatableDataRecord;IsDBNull;(System.Int32);summary;df-generated |
+| System.Data.Entity.Core.Objects;DbUpdatableDataRecord;get_FieldCount;();summary;df-generated |
+| System.Data.Entity.Core.Objects;ObjectContext;Dispose;();summary;df-generated |
+| System.Data.Entity.Core.Objects;ObjectParameterCollection;Contains;(System.Data.Entity.Core.Objects.ObjectParameter);summary;df-generated |
+| System.Data.Entity.Core.Objects;ObjectParameterCollection;Remove;(System.Data.Entity.Core.Objects.ObjectParameter);summary;df-generated |
+| System.Data.Entity.Core.Objects;ObjectParameterCollection;get_Count;();summary;df-generated |
+| System.Data.Entity.Core.Objects;ObjectParameterCollection;get_IsReadOnly;();summary;df-generated |
+| System.Data.Entity.Core.Objects;ObjectQuery;get_ContainsListCollection;();summary;df-generated |
+| System.Data.Entity.Core.Objects;ObjectQuery;get_ElementType;();summary;df-generated |
+| System.Data.Entity.Core.Objects;ObjectQuery;get_Expression;();summary;df-generated |
+| System.Data.Entity.Core.Objects;ObjectResult;Dispose;();summary;df-generated |
+| System.Data.Entity.Core.Objects;ObjectResult;get_ContainsListCollection;();summary;df-generated |
+| System.Data.Entity.Core.Objects;ProxyDataContractResolver;ResolveName;(System.String,System.String,System.Type,System.Runtime.Serialization.DataContractResolver);summary;df-generated |
+| System.Data.Entity.Core.Objects;ProxyDataContractResolver;TryResolveType;(System.Type,System.Type,System.Runtime.Serialization.DataContractResolver,System.Xml.XmlDictionaryString,System.Xml.XmlDictionaryString);summary;df-generated |
+| System.Data.Entity.Core;EntityKey;Equals;(System.Data.Entity.Core.EntityKey);summary;df-generated |
+| System.Data.Entity.Hierarchy;HierarchyId;CompareTo;(System.Object);summary;df-generated |
+| System.Data.Entity.Infrastructure.Interception;DatabaseLogger;Dispose;();summary;df-generated |
+| System.Data.Entity.Infrastructure;DbQuery;get_ContainsListCollection;();summary;df-generated |
+| System.Data.Entity.Infrastructure;DbQuery;get_ElementType;();summary;df-generated |
+| System.Data.Entity.Infrastructure;DbQuery;get_Expression;();summary;df-generated |
+| System.Data.Entity.Infrastructure;DbQuery<TResult>;get_ContainsListCollection;();summary;df-generated |
+| System.Data.Entity.Infrastructure;DbQuery<TResult>;get_ElementType;();summary;df-generated |
+| System.Data.Entity.Infrastructure;DbQuery<TResult>;get_Expression;();summary;df-generated |
+| System.Data.Entity.Infrastructure;DbRawSqlQuery;get_ContainsListCollection;();summary;df-generated |
+| System.Data.Entity.Infrastructure;DbRawSqlQuery<TElement>;get_ContainsListCollection;();summary;df-generated |
+| System.Data.Entity.Infrastructure;ObjectReferenceEqualityComparer;Equals;(System.Object,System.Object);summary;df-generated |
+| System.Data.Entity.Infrastructure;ObjectReferenceEqualityComparer;GetHashCode;(System.Object);summary;df-generated |
+| System.Data.Entity.Infrastructure;TransactionHandler;Dispose;();summary;df-generated |
+| System.Data.Entity.Migrations.Utilities;IndentedTextWriter;Close;();summary;df-generated |
+| System.Data.Entity.Migrations.Utilities;IndentedTextWriter;Flush;();summary;df-generated |
+| System.Data.Entity.Migrations.Utilities;IndentedTextWriter;Write;(System.Boolean);summary;df-generated |
+| System.Data.Entity.Migrations.Utilities;IndentedTextWriter;Write;(System.Char);summary;df-generated |
+| System.Data.Entity.Migrations.Utilities;IndentedTextWriter;Write;(System.Double);summary;df-generated |
+| System.Data.Entity.Migrations.Utilities;IndentedTextWriter;Write;(System.Int32);summary;df-generated |
+| System.Data.Entity.Migrations.Utilities;IndentedTextWriter;Write;(System.Int64);summary;df-generated |
+| System.Data.Entity.Migrations.Utilities;IndentedTextWriter;Write;(System.Single);summary;df-generated |
+| System.Data.Entity.Migrations.Utilities;IndentedTextWriter;WriteLine;();summary;df-generated |
+| System.Data.Entity.Migrations.Utilities;IndentedTextWriter;WriteLine;(System.Boolean);summary;df-generated |
+| System.Data.Entity.Migrations.Utilities;IndentedTextWriter;WriteLine;(System.Char);summary;df-generated |
+| System.Data.Entity.Migrations.Utilities;IndentedTextWriter;WriteLine;(System.Double);summary;df-generated |
+| System.Data.Entity.Migrations.Utilities;IndentedTextWriter;WriteLine;(System.Int32);summary;df-generated |
+| System.Data.Entity.Migrations.Utilities;IndentedTextWriter;WriteLine;(System.Int64);summary;df-generated |
+| System.Data.Entity.Migrations.Utilities;IndentedTextWriter;WriteLine;(System.Single);summary;df-generated |
+| System.Data.Entity.Migrations.Utilities;IndentedTextWriter;WriteLine;(System.UInt32);summary;df-generated |
+| System.Data.Entity.SqlServer.Utilities;TaskExtensions+CultureAwaiter;OnCompleted;(System.Action);summary;df-generated |
+| System.Data.Entity.SqlServer.Utilities;TaskExtensions+CultureAwaiter;UnsafeOnCompleted;(System.Action);summary;df-generated |
+| System.Data.Entity.SqlServer.Utilities;TaskExtensions+CultureAwaiter<T>;OnCompleted;(System.Action);summary;df-generated |
+| System.Data.Entity.SqlServer.Utilities;TaskExtensions+CultureAwaiter<T>;UnsafeOnCompleted;(System.Action);summary;df-generated |
+| System.Data.Entity.Utilities;TaskExtensions+CultureAwaiter;OnCompleted;(System.Action);summary;df-generated |
+| System.Data.Entity.Utilities;TaskExtensions+CultureAwaiter;UnsafeOnCompleted;(System.Action);summary;df-generated |
+| System.Data.Entity.Utilities;TaskExtensions+CultureAwaiter<T>;OnCompleted;(System.Action);summary;df-generated |
+| System.Data.Entity.Utilities;TaskExtensions+CultureAwaiter<T>;UnsafeOnCompleted;(System.Action);summary;df-generated |
+| System.Data.Entity;DbContext;Dispose;();summary;df-generated |
+| System.Data.Entity;DbContextTransaction;Dispose;();summary;df-generated |
 | System.Data.Odbc;OdbcPermission;Add;(System.String,System.String,System.Data.KeyRestrictionBehavior);summary;df-generated |
 | System.Data.Odbc;OdbcPermission;OdbcPermission;(System.Security.Permissions.PermissionState);summary;df-generated |
 | System.Data.Odbc;OdbcPermission;OdbcPermission;(System.Security.Permissions.PermissionState,System.Boolean);summary;df-generated |
@@ -26115,16 +28275,109 @@ neutral
 | System.Data.OracleClient;OraclePermissionAttribute;OraclePermissionAttribute;(System.Security.Permissions.SecurityAction);summary;df-generated |
 | System.Data.OracleClient;OraclePermissionAttribute;ShouldSerializeConnectionString;();summary;df-generated |
 | System.Data.OracleClient;OraclePermissionAttribute;ShouldSerializeKeyRestrictions;();summary;df-generated |
+| System.Data.SqlClient;SqlBulkCopy;Dispose;();summary;df-generated |
+| System.Data.SqlClient;SqlClientFactory;CreateCommand;();summary;df-generated |
+| System.Data.SqlClient;SqlClientFactory;CreateCommandBuilder;();summary;df-generated |
+| System.Data.SqlClient;SqlClientFactory;CreateConnection;();summary;df-generated |
+| System.Data.SqlClient;SqlClientFactory;CreateConnectionStringBuilder;();summary;df-generated |
+| System.Data.SqlClient;SqlClientFactory;CreateDataAdapter;();summary;df-generated |
+| System.Data.SqlClient;SqlClientFactory;CreateParameter;();summary;df-generated |
 | System.Data.SqlClient;SqlClientPermission;Add;(System.String,System.String,System.Data.KeyRestrictionBehavior);summary;df-generated |
 | System.Data.SqlClient;SqlClientPermission;SqlClientPermission;(System.Security.Permissions.PermissionState);summary;df-generated |
 | System.Data.SqlClient;SqlClientPermission;SqlClientPermission;(System.Security.Permissions.PermissionState,System.Boolean);summary;df-generated |
 | System.Data.SqlClient;SqlClientPermissionAttribute;CreatePermission;();summary;df-generated |
 | System.Data.SqlClient;SqlClientPermissionAttribute;SqlClientPermissionAttribute;(System.Security.Permissions.SecurityAction);summary;df-generated |
+| System.Data.SqlClient;SqlCommand;Cancel;();summary;df-generated |
+| System.Data.SqlClient;SqlCommand;CreateDbParameter;();summary;df-generated |
+| System.Data.SqlClient;SqlCommand;Dispose;(System.Boolean);summary;df-generated |
+| System.Data.SqlClient;SqlCommand;ExecuteDbDataReaderAsync;(System.Data.CommandBehavior,System.Threading.CancellationToken);summary;df-generated |
+| System.Data.SqlClient;SqlCommand;ExecuteNonQuery;();summary;df-generated |
+| System.Data.SqlClient;SqlCommand;ExecuteNonQueryAsync;(System.Threading.CancellationToken);summary;df-generated |
+| System.Data.SqlClient;SqlCommand;ExecuteScalarAsync;(System.Threading.CancellationToken);summary;df-generated |
+| System.Data.SqlClient;SqlCommand;Prepare;();summary;df-generated |
+| System.Data.SqlClient;SqlCommandBuilder;ApplyParameterInfo;(System.Data.Common.DbParameter,System.Data.DataRow,System.Data.StatementType,System.Boolean);summary;df-generated |
+| System.Data.SqlClient;SqlCommandBuilder;GetParameterName;(System.Int32);summary;df-generated |
+| System.Data.SqlClient;SqlCommandBuilder;GetParameterPlaceholder;(System.Int32);summary;df-generated |
+| System.Data.SqlClient;SqlCommandBuilder;GetSchemaTable;(System.Data.Common.DbCommand);summary;df-generated |
+| System.Data.SqlClient;SqlCommandBuilder;SetRowUpdatingHandler;(System.Data.Common.DbDataAdapter);summary;df-generated |
+| System.Data.SqlClient;SqlConnection;ChangeDatabase;(System.String);summary;df-generated |
+| System.Data.SqlClient;SqlConnection;Close;();summary;df-generated |
+| System.Data.SqlClient;SqlConnection;CreateDbCommand;();summary;df-generated |
+| System.Data.SqlClient;SqlConnection;Dispose;(System.Boolean);summary;df-generated |
+| System.Data.SqlClient;SqlConnection;GetSchema;();summary;df-generated |
+| System.Data.SqlClient;SqlConnection;GetSchema;(System.String);summary;df-generated |
+| System.Data.SqlClient;SqlConnection;GetSchema;(System.String,System.String[]);summary;df-generated |
+| System.Data.SqlClient;SqlConnection;Open;();summary;df-generated |
+| System.Data.SqlClient;SqlConnection;OpenAsync;(System.Threading.CancellationToken);summary;df-generated |
+| System.Data.SqlClient;SqlConnection;get_ConnectionTimeout;();summary;df-generated |
+| System.Data.SqlClient;SqlConnection;get_DataSource;();summary;df-generated |
+| System.Data.SqlClient;SqlConnection;get_Database;();summary;df-generated |
+| System.Data.SqlClient;SqlConnection;get_State;();summary;df-generated |
+| System.Data.SqlClient;SqlConnectionStringBuilder;ContainsKey;(System.String);summary;df-generated |
+| System.Data.SqlClient;SqlConnectionStringBuilder;Remove;(System.String);summary;df-generated |
+| System.Data.SqlClient;SqlConnectionStringBuilder;ShouldSerialize;(System.String);summary;df-generated |
+| System.Data.SqlClient;SqlDataAdapter;OnRowUpdated;(System.Data.Common.RowUpdatedEventArgs);summary;df-generated |
+| System.Data.SqlClient;SqlDataAdapter;OnRowUpdating;(System.Data.Common.RowUpdatingEventArgs);summary;df-generated |
+| System.Data.SqlClient;SqlDataReader;GetBoolean;(System.Int32);summary;df-generated |
+| System.Data.SqlClient;SqlDataReader;GetByte;(System.Int32);summary;df-generated |
+| System.Data.SqlClient;SqlDataReader;GetBytes;(System.Int32,System.Int64,System.Byte[],System.Int32,System.Int32);summary;df-generated |
+| System.Data.SqlClient;SqlDataReader;GetChar;(System.Int32);summary;df-generated |
+| System.Data.SqlClient;SqlDataReader;GetChars;(System.Int32,System.Int64,System.Char[],System.Int32,System.Int32);summary;df-generated |
+| System.Data.SqlClient;SqlDataReader;GetColumnSchema;();summary;df-generated |
+| System.Data.SqlClient;SqlDataReader;GetDataTypeName;(System.Int32);summary;manual |
+| System.Data.SqlClient;SqlDataReader;GetDateTime;(System.Int32);summary;df-generated |
+| System.Data.SqlClient;SqlDataReader;GetDecimal;(System.Int32);summary;df-generated |
+| System.Data.SqlClient;SqlDataReader;GetDouble;(System.Int32);summary;df-generated |
+| System.Data.SqlClient;SqlDataReader;GetFieldType;(System.Int32);summary;df-generated |
+| System.Data.SqlClient;SqlDataReader;GetFloat;(System.Int32);summary;df-generated |
+| System.Data.SqlClient;SqlDataReader;GetGuid;(System.Int32);summary;manual |
+| System.Data.SqlClient;SqlDataReader;GetInt16;(System.Int32);summary;df-generated |
+| System.Data.SqlClient;SqlDataReader;GetInt32;(System.Int32);summary;df-generated |
+| System.Data.SqlClient;SqlDataReader;GetInt64;(System.Int32);summary;df-generated |
+| System.Data.SqlClient;SqlDataReader;GetName;(System.Int32);summary;manual |
+| System.Data.SqlClient;SqlDataReader;GetOrdinal;(System.String);summary;df-generated |
+| System.Data.SqlClient;SqlDataReader;GetProviderSpecificFieldType;(System.Int32);summary;df-generated |
+| System.Data.SqlClient;SqlDataReader;GetStream;(System.Int32);summary;df-generated |
+| System.Data.SqlClient;SqlDataReader;IsDBNull;(System.Int32);summary;df-generated |
+| System.Data.SqlClient;SqlDataReader;IsDBNullAsync;(System.Int32,System.Threading.CancellationToken);summary;df-generated |
+| System.Data.SqlClient;SqlDataReader;NextResult;();summary;df-generated |
+| System.Data.SqlClient;SqlDataReader;NextResultAsync;(System.Threading.CancellationToken);summary;df-generated |
+| System.Data.SqlClient;SqlDataReader;Read;();summary;df-generated |
+| System.Data.SqlClient;SqlDataReader;ReadAsync;(System.Threading.CancellationToken);summary;df-generated |
+| System.Data.SqlClient;SqlDataReader;get_Depth;();summary;df-generated |
+| System.Data.SqlClient;SqlDataReader;get_FieldCount;();summary;df-generated |
+| System.Data.SqlClient;SqlDataReader;get_HasRows;();summary;df-generated |
+| System.Data.SqlClient;SqlDataReader;get_IsClosed;();summary;df-generated |
+| System.Data.SqlClient;SqlDataReader;get_RecordsAffected;();summary;df-generated |
+| System.Data.SqlClient;SqlDataReader;get_VisibleFieldCount;();summary;df-generated |
+| System.Data.SqlClient;SqlErrorCollection;get_Count;();summary;df-generated |
+| System.Data.SqlClient;SqlErrorCollection;get_IsSynchronized;();summary;df-generated |
+| System.Data.SqlClient;SqlParameter;ResetDbType;();summary;df-generated |
+| System.Data.SqlClient;SqlParameter;get_IsNullable;();summary;df-generated |
+| System.Data.SqlClient;SqlParameterCollection;Contains;(System.Object);summary;df-generated |
+| System.Data.SqlClient;SqlParameterCollection;Contains;(System.String);summary;df-generated |
+| System.Data.SqlClient;SqlParameterCollection;GetParameter;(System.Int32);summary;df-generated |
+| System.Data.SqlClient;SqlParameterCollection;GetParameter;(System.String);summary;df-generated |
+| System.Data.SqlClient;SqlParameterCollection;IndexOf;(System.Object);summary;df-generated |
+| System.Data.SqlClient;SqlParameterCollection;IndexOf;(System.String);summary;df-generated |
+| System.Data.SqlClient;SqlParameterCollection;Remove;(System.Object);summary;df-generated |
+| System.Data.SqlClient;SqlParameterCollection;RemoveAt;(System.Int32);summary;df-generated |
+| System.Data.SqlClient;SqlParameterCollection;RemoveAt;(System.String);summary;df-generated |
+| System.Data.SqlClient;SqlParameterCollection;get_Count;();summary;df-generated |
+| System.Data.SqlClient;SqlParameterCollection;get_IsFixedSize;();summary;df-generated |
+| System.Data.SqlClient;SqlParameterCollection;get_IsReadOnly;();summary;df-generated |
+| System.Data.SqlClient;SqlTransaction;Commit;();summary;df-generated |
+| System.Data.SqlClient;SqlTransaction;Dispose;(System.Boolean);summary;df-generated |
+| System.Data.SqlClient;SqlTransaction;Rollback;();summary;df-generated |
+| System.Data.SqlClient;SqlTransaction;get_DbConnection;();summary;df-generated |
+| System.Data.SqlClient;SqlTransaction;get_IsolationLevel;();summary;df-generated |
 | System.Data.SqlTypes;INullable;get_IsNull;();summary;df-generated |
 | System.Data.SqlTypes;SqlAlreadyFilledException;SqlAlreadyFilledException;(System.String);summary;df-generated |
 | System.Data.SqlTypes;SqlAlreadyFilledException;SqlAlreadyFilledException;(System.String,System.Exception);summary;df-generated |
+| System.Data.SqlTypes;SqlBinary;Add;(System.Data.SqlTypes.SqlBinary,System.Data.SqlTypes.SqlBinary);summary;df-generated |
 | System.Data.SqlTypes;SqlBinary;CompareTo;(System.Data.SqlTypes.SqlBinary);summary;df-generated |
 | System.Data.SqlTypes;SqlBinary;CompareTo;(System.Object);summary;df-generated |
+| System.Data.SqlTypes;SqlBinary;Concat;(System.Data.SqlTypes.SqlBinary,System.Data.SqlTypes.SqlBinary);summary;df-generated |
 | System.Data.SqlTypes;SqlBinary;Equals;(System.Data.SqlTypes.SqlBinary);summary;df-generated |
 | System.Data.SqlTypes;SqlBinary;Equals;(System.Data.SqlTypes.SqlBinary,System.Data.SqlTypes.SqlBinary);summary;df-generated |
 | System.Data.SqlTypes;SqlBinary;Equals;(System.Object);summary;df-generated |
@@ -26141,6 +28394,7 @@ neutral
 | System.Data.SqlTypes;SqlBinary;get_IsNull;();summary;df-generated |
 | System.Data.SqlTypes;SqlBinary;get_Item;(System.Int32);summary;df-generated |
 | System.Data.SqlTypes;SqlBinary;get_Length;();summary;df-generated |
+| System.Data.SqlTypes;SqlBinary;op_Addition;(System.Data.SqlTypes.SqlBinary,System.Data.SqlTypes.SqlBinary);summary;df-generated |
 | System.Data.SqlTypes;SqlBinary;op_Equality;(System.Data.SqlTypes.SqlBinary,System.Data.SqlTypes.SqlBinary);summary;df-generated |
 | System.Data.SqlTypes;SqlBinary;op_GreaterThan;(System.Data.SqlTypes.SqlBinary,System.Data.SqlTypes.SqlBinary);summary;df-generated |
 | System.Data.SqlTypes;SqlBinary;op_GreaterThanOrEqual;(System.Data.SqlTypes.SqlBinary,System.Data.SqlTypes.SqlBinary);summary;df-generated |
@@ -26252,6 +28506,7 @@ neutral
 | System.Data.SqlTypes;SqlBytes;SetLength;(System.Int64);summary;df-generated |
 | System.Data.SqlTypes;SqlBytes;SetNull;();summary;df-generated |
 | System.Data.SqlTypes;SqlBytes;SqlBytes;(System.Data.SqlTypes.SqlBinary);summary;df-generated |
+| System.Data.SqlTypes;SqlBytes;ToSqlBinary;();summary;df-generated |
 | System.Data.SqlTypes;SqlBytes;get_IsNull;();summary;df-generated |
 | System.Data.SqlTypes;SqlBytes;get_Item;(System.Int64);summary;df-generated |
 | System.Data.SqlTypes;SqlBytes;get_Length;();summary;df-generated |
@@ -26408,6 +28663,13 @@ neutral
 | System.Data.SqlTypes;SqlDouble;op_Multiply;(System.Data.SqlTypes.SqlDouble,System.Data.SqlTypes.SqlDouble);summary;df-generated |
 | System.Data.SqlTypes;SqlDouble;op_Subtraction;(System.Data.SqlTypes.SqlDouble,System.Data.SqlTypes.SqlDouble);summary;df-generated |
 | System.Data.SqlTypes;SqlDouble;op_UnaryNegation;(System.Data.SqlTypes.SqlDouble);summary;df-generated |
+| System.Data.SqlTypes;SqlFileStream;Flush;();summary;df-generated |
+| System.Data.SqlTypes;SqlFileStream;Seek;(System.Int64,System.IO.SeekOrigin);summary;df-generated |
+| System.Data.SqlTypes;SqlFileStream;SetLength;(System.Int64);summary;df-generated |
+| System.Data.SqlTypes;SqlFileStream;get_CanRead;();summary;df-generated |
+| System.Data.SqlTypes;SqlFileStream;get_CanSeek;();summary;df-generated |
+| System.Data.SqlTypes;SqlFileStream;get_CanWrite;();summary;df-generated |
+| System.Data.SqlTypes;SqlFileStream;get_Length;();summary;df-generated |
 | System.Data.SqlTypes;SqlGuid;CompareTo;(System.Data.SqlTypes.SqlGuid);summary;df-generated |
 | System.Data.SqlTypes;SqlGuid;CompareTo;(System.Object);summary;df-generated |
 | System.Data.SqlTypes;SqlGuid;Equals;(System.Data.SqlTypes.SqlGuid);summary;df-generated |
@@ -26693,6 +28955,7 @@ neutral
 | System.Data.SqlTypes;SqlSingle;op_Multiply;(System.Data.SqlTypes.SqlSingle,System.Data.SqlTypes.SqlSingle);summary;df-generated |
 | System.Data.SqlTypes;SqlSingle;op_Subtraction;(System.Data.SqlTypes.SqlSingle,System.Data.SqlTypes.SqlSingle);summary;df-generated |
 | System.Data.SqlTypes;SqlSingle;op_UnaryNegation;(System.Data.SqlTypes.SqlSingle);summary;df-generated |
+| System.Data.SqlTypes;SqlString;Clone;();summary;df-generated |
 | System.Data.SqlTypes;SqlString;CompareOptionsFromSqlCompareOptions;(System.Data.SqlTypes.SqlCompareOptions);summary;df-generated |
 | System.Data.SqlTypes;SqlString;CompareTo;(System.Data.SqlTypes.SqlString);summary;df-generated |
 | System.Data.SqlTypes;SqlString;CompareTo;(System.Object);summary;df-generated |
@@ -26747,6 +29010,9 @@ neutral
 | System.Data.SqlTypes;SqlXml;get_Value;();summary;df-generated |
 | System.Data;Constraint;CheckStateForProperty;();summary;df-generated |
 | System.Data;Constraint;get_ExtendedProperties;();summary;df-generated |
+| System.Data;ConstraintCollection;Add;(System.String,System.Data.DataColumn,System.Boolean);summary;df-generated |
+| System.Data;ConstraintCollection;Add;(System.String,System.Data.DataColumn,System.Data.DataColumn);summary;df-generated |
+| System.Data;ConstraintCollection;Add;(System.String,System.Data.DataColumn[],System.Data.DataColumn[]);summary;df-generated |
 | System.Data;ConstraintCollection;CanRemove;(System.Data.Constraint);summary;df-generated |
 | System.Data;ConstraintCollection;Contains;(System.String);summary;df-generated |
 | System.Data;ConstraintCollection;IndexOf;(System.Data.Constraint);summary;df-generated |
@@ -26754,6 +29020,8 @@ neutral
 | System.Data;ConstraintCollection;Remove;(System.Data.Constraint);summary;df-generated |
 | System.Data;ConstraintCollection;Remove;(System.String);summary;df-generated |
 | System.Data;ConstraintCollection;RemoveAt;(System.Int32);summary;df-generated |
+| System.Data;ConstraintCollection;add_CollectionChanged;(System.ComponentModel.CollectionChangeEventHandler);summary;df-generated |
+| System.Data;ConstraintCollection;remove_CollectionChanged;(System.ComponentModel.CollectionChangeEventHandler);summary;df-generated |
 | System.Data;ConstraintException;ConstraintException;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);summary;df-generated |
 | System.Data;ConstraintException;ConstraintException;(System.String);summary;df-generated |
 | System.Data;ConstraintException;ConstraintException;(System.String,System.Exception);summary;df-generated |
@@ -26778,6 +29046,8 @@ neutral
 | System.Data;DataColumnCollection;Remove;(System.Data.DataColumn);summary;df-generated |
 | System.Data;DataColumnCollection;Remove;(System.String);summary;df-generated |
 | System.Data;DataColumnCollection;RemoveAt;(System.Int32);summary;df-generated |
+| System.Data;DataColumnCollection;add_CollectionChanged;(System.ComponentModel.CollectionChangeEventHandler);summary;df-generated |
+| System.Data;DataColumnCollection;remove_CollectionChanged;(System.ComponentModel.CollectionChangeEventHandler);summary;df-generated |
 | System.Data;DataException;DataException;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);summary;df-generated |
 | System.Data;DataException;DataException;(System.String);summary;df-generated |
 | System.Data;DataException;DataException;(System.String,System.Exception);summary;df-generated |
@@ -26810,11 +29080,11 @@ neutral
 | System.Data;DataRelationCollection;Contains;(System.String);summary;df-generated |
 | System.Data;DataRelationCollection;IndexOf;(System.Data.DataRelation);summary;df-generated |
 | System.Data;DataRelationCollection;IndexOf;(System.String);summary;df-generated |
-| System.Data;DataRelationCollection;OnCollectionChanged;(System.ComponentModel.CollectionChangeEventArgs);summary;df-generated |
-| System.Data;DataRelationCollection;OnCollectionChanging;(System.ComponentModel.CollectionChangeEventArgs);summary;df-generated |
 | System.Data;DataRelationCollection;Remove;(System.String);summary;df-generated |
 | System.Data;DataRelationCollection;RemoveAt;(System.Int32);summary;df-generated |
 | System.Data;DataRelationCollection;RemoveCore;(System.Data.DataRelation);summary;df-generated |
+| System.Data;DataRelationCollection;add_CollectionChanged;(System.ComponentModel.CollectionChangeEventHandler);summary;df-generated |
+| System.Data;DataRelationCollection;remove_CollectionChanged;(System.ComponentModel.CollectionChangeEventHandler);summary;df-generated |
 | System.Data;DataRow;AcceptChanges;();summary;df-generated |
 | System.Data;DataRow;BeginEdit;();summary;df-generated |
 | System.Data;DataRow;CancelEdit;();summary;df-generated |
@@ -26872,6 +29142,7 @@ neutral
 | System.Data;DataRowView;Delete;();summary;df-generated |
 | System.Data;DataRowView;EndEdit;();summary;df-generated |
 | System.Data;DataRowView;Equals;(System.Object);summary;df-generated |
+| System.Data;DataRowView;GetAttributes;();summary;df-generated |
 | System.Data;DataRowView;GetClassName;();summary;df-generated |
 | System.Data;DataRowView;GetComponentName;();summary;df-generated |
 | System.Data;DataRowView;GetConverter;();summary;df-generated |
@@ -26881,16 +29152,22 @@ neutral
 | System.Data;DataRowView;GetEvents;();summary;df-generated |
 | System.Data;DataRowView;GetEvents;(System.Attribute[]);summary;df-generated |
 | System.Data;DataRowView;GetHashCode;();summary;df-generated |
+| System.Data;DataRowView;add_PropertyChanged;(System.ComponentModel.PropertyChangedEventHandler);summary;df-generated |
+| System.Data;DataRowView;get_Error;();summary;df-generated |
 | System.Data;DataRowView;get_IsEdit;();summary;df-generated |
 | System.Data;DataRowView;get_IsNew;();summary;df-generated |
 | System.Data;DataRowView;get_Item;(System.String);summary;df-generated |
 | System.Data;DataRowView;get_RowVersion;();summary;df-generated |
+| System.Data;DataRowView;remove_PropertyChanged;(System.ComponentModel.PropertyChangedEventHandler);summary;df-generated |
 | System.Data;DataRowView;set_Item;(System.Int32,System.Object);summary;df-generated |
 | System.Data;DataRowView;set_Item;(System.String,System.Object);summary;df-generated |
 | System.Data;DataSet;AcceptChanges;();summary;df-generated |
 | System.Data;DataSet;BeginInit;();summary;df-generated |
 | System.Data;DataSet;Clear;();summary;df-generated |
+| System.Data;DataSet;CreateDataReader;();summary;df-generated |
+| System.Data;DataSet;CreateDataReader;(System.Data.DataTable[]);summary;df-generated |
 | System.Data;DataSet;DataSet;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);summary;df-generated |
+| System.Data;DataSet;DataSet;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext,System.Boolean);summary;df-generated |
 | System.Data;DataSet;DetermineSchemaSerializationMode;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);summary;df-generated |
 | System.Data;DataSet;DetermineSchemaSerializationMode;(System.Xml.XmlReader);summary;df-generated |
 | System.Data;DataSet;EndInit;();summary;df-generated |
@@ -26909,6 +29186,7 @@ neutral
 | System.Data;DataSet;InitializeDerivedDataSet;();summary;df-generated |
 | System.Data;DataSet;IsBinarySerialized;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);summary;df-generated |
 | System.Data;DataSet;Load;(System.Data.IDataReader,System.Data.LoadOption,System.Data.DataTable[]);summary;df-generated |
+| System.Data;DataSet;Load;(System.Data.IDataReader,System.Data.LoadOption,System.Data.FillErrorEventHandler,System.Data.DataTable[]);summary;df-generated |
 | System.Data;DataSet;Load;(System.Data.IDataReader,System.Data.LoadOption,System.String[]);summary;df-generated |
 | System.Data;DataSet;Merge;(System.Data.DataRow[]);summary;df-generated |
 | System.Data;DataSet;Merge;(System.Data.DataRow[],System.Boolean,System.Data.MissingSchemaAction);summary;df-generated |
@@ -26947,20 +29225,30 @@ neutral
 | System.Data;DataSet;WriteXml;(System.Xml.XmlWriter);summary;df-generated |
 | System.Data;DataSet;WriteXml;(System.Xml.XmlWriter,System.Data.XmlWriteMode);summary;df-generated |
 | System.Data;DataSet;WriteXmlSchema;(System.IO.Stream);summary;df-generated |
+| System.Data;DataSet;WriteXmlSchema;(System.IO.Stream,System.Converter<System.Type,System.String>);summary;df-generated |
 | System.Data;DataSet;WriteXmlSchema;(System.IO.TextWriter);summary;df-generated |
+| System.Data;DataSet;WriteXmlSchema;(System.IO.TextWriter,System.Converter<System.Type,System.String>);summary;df-generated |
 | System.Data;DataSet;WriteXmlSchema;(System.String);summary;df-generated |
+| System.Data;DataSet;WriteXmlSchema;(System.String,System.Converter<System.Type,System.String>);summary;df-generated |
 | System.Data;DataSet;WriteXmlSchema;(System.Xml.XmlWriter);summary;df-generated |
+| System.Data;DataSet;WriteXmlSchema;(System.Xml.XmlWriter,System.Converter<System.Type,System.String>);summary;df-generated |
+| System.Data;DataSet;add_Initialized;(System.EventHandler);summary;df-generated |
+| System.Data;DataSet;add_MergeFailed;(System.Data.MergeFailedEventHandler);summary;df-generated |
 | System.Data;DataSet;get_ContainsListCollection;();summary;df-generated |
 | System.Data;DataSet;get_ExtendedProperties;();summary;df-generated |
 | System.Data;DataSet;get_HasErrors;();summary;df-generated |
 | System.Data;DataSet;get_IsInitialized;();summary;df-generated |
+| System.Data;DataSet;remove_Initialized;(System.EventHandler);summary;df-generated |
+| System.Data;DataSet;remove_MergeFailed;(System.Data.MergeFailedEventHandler);summary;df-generated |
 | System.Data;DataSysDescriptionAttribute;DataSysDescriptionAttribute;(System.String);summary;df-generated |
 | System.Data;DataTable;AcceptChanges;();summary;df-generated |
 | System.Data;DataTable;BeginInit;();summary;df-generated |
 | System.Data;DataTable;BeginLoadData;();summary;df-generated |
 | System.Data;DataTable;Clear;();summary;df-generated |
 | System.Data;DataTable;Compute;(System.String,System.String);summary;df-generated |
+| System.Data;DataTable;CreateDataReader;();summary;df-generated |
 | System.Data;DataTable;CreateInstance;();summary;df-generated |
+| System.Data;DataTable;DataTable;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);summary;df-generated |
 | System.Data;DataTable;EndInit;();summary;df-generated |
 | System.Data;DataTable;EndLoadData;();summary;df-generated |
 | System.Data;DataTable;GetDataTableSchema;(System.Xml.Schema.XmlSchemaSet);summary;df-generated |
@@ -26969,20 +29257,13 @@ neutral
 | System.Data;DataTable;ImportRow;(System.Data.DataRow);summary;df-generated |
 | System.Data;DataTable;Load;(System.Data.IDataReader);summary;df-generated |
 | System.Data;DataTable;Load;(System.Data.IDataReader,System.Data.LoadOption);summary;df-generated |
+| System.Data;DataTable;Load;(System.Data.IDataReader,System.Data.LoadOption,System.Data.FillErrorEventHandler);summary;df-generated |
 | System.Data;DataTable;Merge;(System.Data.DataTable);summary;df-generated |
 | System.Data;DataTable;Merge;(System.Data.DataTable,System.Boolean);summary;df-generated |
 | System.Data;DataTable;Merge;(System.Data.DataTable,System.Boolean,System.Data.MissingSchemaAction);summary;df-generated |
-| System.Data;DataTable;OnColumnChanged;(System.Data.DataColumnChangeEventArgs);summary;df-generated |
-| System.Data;DataTable;OnColumnChanging;(System.Data.DataColumnChangeEventArgs);summary;df-generated |
-| System.Data;DataTable;OnPropertyChanging;(System.ComponentModel.PropertyChangedEventArgs);summary;df-generated |
+| System.Data;DataTable;NewRow;();summary;df-generated |
+| System.Data;DataTable;NewRowFromBuilder;(System.Data.DataRowBuilder);summary;df-generated |
 | System.Data;DataTable;OnRemoveColumn;(System.Data.DataColumn);summary;df-generated |
-| System.Data;DataTable;OnRowChanged;(System.Data.DataRowChangeEventArgs);summary;df-generated |
-| System.Data;DataTable;OnRowChanging;(System.Data.DataRowChangeEventArgs);summary;df-generated |
-| System.Data;DataTable;OnRowDeleted;(System.Data.DataRowChangeEventArgs);summary;df-generated |
-| System.Data;DataTable;OnRowDeleting;(System.Data.DataRowChangeEventArgs);summary;df-generated |
-| System.Data;DataTable;OnTableCleared;(System.Data.DataTableClearEventArgs);summary;df-generated |
-| System.Data;DataTable;OnTableClearing;(System.Data.DataTableClearEventArgs);summary;df-generated |
-| System.Data;DataTable;OnTableNewRow;(System.Data.DataTableNewRowEventArgs);summary;df-generated |
 | System.Data;DataTable;ReadXml;(System.IO.Stream);summary;df-generated |
 | System.Data;DataTable;ReadXml;(System.IO.TextReader);summary;df-generated |
 | System.Data;DataTable;ReadXml;(System.String);summary;df-generated |
@@ -27018,12 +29299,32 @@ neutral
 | System.Data;DataTable;WriteXmlSchema;(System.String,System.Boolean);summary;df-generated |
 | System.Data;DataTable;WriteXmlSchema;(System.Xml.XmlWriter);summary;df-generated |
 | System.Data;DataTable;WriteXmlSchema;(System.Xml.XmlWriter,System.Boolean);summary;df-generated |
+| System.Data;DataTable;add_ColumnChanged;(System.Data.DataColumnChangeEventHandler);summary;df-generated |
+| System.Data;DataTable;add_ColumnChanging;(System.Data.DataColumnChangeEventHandler);summary;df-generated |
+| System.Data;DataTable;add_Initialized;(System.EventHandler);summary;df-generated |
+| System.Data;DataTable;add_RowChanged;(System.Data.DataRowChangeEventHandler);summary;df-generated |
+| System.Data;DataTable;add_RowChanging;(System.Data.DataRowChangeEventHandler);summary;df-generated |
+| System.Data;DataTable;add_RowDeleted;(System.Data.DataRowChangeEventHandler);summary;df-generated |
+| System.Data;DataTable;add_RowDeleting;(System.Data.DataRowChangeEventHandler);summary;df-generated |
+| System.Data;DataTable;add_TableCleared;(System.Data.DataTableClearEventHandler);summary;df-generated |
+| System.Data;DataTable;add_TableClearing;(System.Data.DataTableClearEventHandler);summary;df-generated |
+| System.Data;DataTable;add_TableNewRow;(System.Data.DataTableNewRowEventHandler);summary;df-generated |
 | System.Data;DataTable;get_ChildRelations;();summary;df-generated |
 | System.Data;DataTable;get_ContainsListCollection;();summary;df-generated |
 | System.Data;DataTable;get_ExtendedProperties;();summary;df-generated |
 | System.Data;DataTable;get_HasErrors;();summary;df-generated |
 | System.Data;DataTable;get_IsInitialized;();summary;df-generated |
 | System.Data;DataTable;get_ParentRelations;();summary;df-generated |
+| System.Data;DataTable;remove_ColumnChanged;(System.Data.DataColumnChangeEventHandler);summary;df-generated |
+| System.Data;DataTable;remove_ColumnChanging;(System.Data.DataColumnChangeEventHandler);summary;df-generated |
+| System.Data;DataTable;remove_Initialized;(System.EventHandler);summary;df-generated |
+| System.Data;DataTable;remove_RowChanged;(System.Data.DataRowChangeEventHandler);summary;df-generated |
+| System.Data;DataTable;remove_RowChanging;(System.Data.DataRowChangeEventHandler);summary;df-generated |
+| System.Data;DataTable;remove_RowDeleted;(System.Data.DataRowChangeEventHandler);summary;df-generated |
+| System.Data;DataTable;remove_RowDeleting;(System.Data.DataRowChangeEventHandler);summary;df-generated |
+| System.Data;DataTable;remove_TableCleared;(System.Data.DataTableClearEventHandler);summary;df-generated |
+| System.Data;DataTable;remove_TableClearing;(System.Data.DataTableClearEventHandler);summary;df-generated |
+| System.Data;DataTable;remove_TableNewRow;(System.Data.DataTableNewRowEventHandler);summary;df-generated |
 | System.Data;DataTableClearEventArgs;DataTableClearEventArgs;(System.Data.DataTable);summary;df-generated |
 | System.Data;DataTableClearEventArgs;get_Table;();summary;df-generated |
 | System.Data;DataTableCollection;CanRemove;(System.Data.DataTable);summary;df-generated |
@@ -27036,6 +29337,10 @@ neutral
 | System.Data;DataTableCollection;Remove;(System.String);summary;df-generated |
 | System.Data;DataTableCollection;Remove;(System.String,System.String);summary;df-generated |
 | System.Data;DataTableCollection;RemoveAt;(System.Int32);summary;df-generated |
+| System.Data;DataTableCollection;add_CollectionChanged;(System.ComponentModel.CollectionChangeEventHandler);summary;df-generated |
+| System.Data;DataTableCollection;add_CollectionChanging;(System.ComponentModel.CollectionChangeEventHandler);summary;df-generated |
+| System.Data;DataTableCollection;remove_CollectionChanged;(System.ComponentModel.CollectionChangeEventHandler);summary;df-generated |
+| System.Data;DataTableCollection;remove_CollectionChanging;(System.ComponentModel.CollectionChangeEventHandler);summary;df-generated |
 | System.Data;DataTableExtensions;AsDataView;(System.Data.DataTable);summary;df-generated |
 | System.Data;DataTableExtensions;AsDataView<T>;(System.Data.EnumerableRowCollection<T>);summary;df-generated |
 | System.Data;DataTableNewRowEventArgs;DataTableNewRowEventArgs;(System.Data.DataRow);summary;df-generated |
@@ -27046,14 +29351,17 @@ neutral
 | System.Data;DataTableReader;GetBytes;(System.Int32,System.Int64,System.Byte[],System.Int32,System.Int32);summary;df-generated |
 | System.Data;DataTableReader;GetChar;(System.Int32);summary;df-generated |
 | System.Data;DataTableReader;GetChars;(System.Int32,System.Int64,System.Char[],System.Int32,System.Int32);summary;df-generated |
+| System.Data;DataTableReader;GetDataTypeName;(System.Int32);summary;manual |
 | System.Data;DataTableReader;GetDateTime;(System.Int32);summary;df-generated |
 | System.Data;DataTableReader;GetDecimal;(System.Int32);summary;df-generated |
 | System.Data;DataTableReader;GetDouble;(System.Int32);summary;df-generated |
 | System.Data;DataTableReader;GetFieldType;(System.Int32);summary;df-generated |
 | System.Data;DataTableReader;GetFloat;(System.Int32);summary;df-generated |
+| System.Data;DataTableReader;GetGuid;(System.Int32);summary;manual |
 | System.Data;DataTableReader;GetInt16;(System.Int32);summary;df-generated |
 | System.Data;DataTableReader;GetInt32;(System.Int32);summary;df-generated |
 | System.Data;DataTableReader;GetInt64;(System.Int32);summary;df-generated |
+| System.Data;DataTableReader;GetName;(System.Int32);summary;manual |
 | System.Data;DataTableReader;GetOrdinal;(System.String);summary;df-generated |
 | System.Data;DataTableReader;GetProviderSpecificFieldType;(System.Int32);summary;df-generated |
 | System.Data;DataTableReader;IsDBNull;(System.Int32);summary;df-generated |
@@ -27065,6 +29373,7 @@ neutral
 | System.Data;DataTableReader;get_IsClosed;();summary;df-generated |
 | System.Data;DataTableReader;get_RecordsAffected;();summary;df-generated |
 | System.Data;DataView;AddIndex;(System.ComponentModel.PropertyDescriptor);summary;df-generated |
+| System.Data;DataView;AddNew;();summary;df-generated |
 | System.Data;DataView;BeginInit;();summary;df-generated |
 | System.Data;DataView;Close;();summary;df-generated |
 | System.Data;DataView;ColumnCollectionChanged;(System.Object,System.ComponentModel.CollectionChangeEventArgs);summary;df-generated |
@@ -27074,10 +29383,9 @@ neutral
 | System.Data;DataView;Dispose;(System.Boolean);summary;df-generated |
 | System.Data;DataView;EndInit;();summary;df-generated |
 | System.Data;DataView;Equals;(System.Data.DataView);summary;df-generated |
-| System.Data;DataView;IndexListChanged;(System.Object,System.ComponentModel.ListChangedEventArgs);summary;df-generated |
 | System.Data;DataView;IndexOf;(System.Object);summary;df-generated |
-| System.Data;DataView;OnListChanged;(System.ComponentModel.ListChangedEventArgs);summary;df-generated |
 | System.Data;DataView;Open;();summary;df-generated |
+| System.Data;DataView;Remove;(System.Object);summary;df-generated |
 | System.Data;DataView;RemoveAt;(System.Int32);summary;df-generated |
 | System.Data;DataView;RemoveFilter;();summary;df-generated |
 | System.Data;DataView;RemoveIndex;(System.ComponentModel.PropertyDescriptor);summary;df-generated |
@@ -27085,6 +29393,8 @@ neutral
 | System.Data;DataView;Reset;();summary;df-generated |
 | System.Data;DataView;UpdateIndex;();summary;df-generated |
 | System.Data;DataView;UpdateIndex;(System.Boolean);summary;df-generated |
+| System.Data;DataView;add_Initialized;(System.EventHandler);summary;df-generated |
+| System.Data;DataView;add_ListChanged;(System.ComponentModel.ListChangedEventHandler);summary;df-generated |
 | System.Data;DataView;get_AllowEdit;();summary;df-generated |
 | System.Data;DataView;get_AllowNew;();summary;df-generated |
 | System.Data;DataView;get_AllowRemove;();summary;df-generated |
@@ -27097,21 +29407,27 @@ neutral
 | System.Data;DataView;get_IsSynchronized;();summary;df-generated |
 | System.Data;DataView;get_SortDescriptions;();summary;df-generated |
 | System.Data;DataView;get_SortDirection;();summary;df-generated |
+| System.Data;DataView;get_SortProperty;();summary;df-generated |
 | System.Data;DataView;get_SupportsAdvancedSorting;();summary;df-generated |
 | System.Data;DataView;get_SupportsChangeNotification;();summary;df-generated |
 | System.Data;DataView;get_SupportsFiltering;();summary;df-generated |
 | System.Data;DataView;get_SupportsSearching;();summary;df-generated |
 | System.Data;DataView;get_SupportsSorting;();summary;df-generated |
+| System.Data;DataView;remove_Initialized;(System.EventHandler);summary;df-generated |
+| System.Data;DataView;remove_ListChanged;(System.ComponentModel.ListChangedEventHandler);summary;df-generated |
 | System.Data;DataViewManager;AddIndex;(System.ComponentModel.PropertyDescriptor);summary;df-generated |
+| System.Data;DataViewManager;AddNew;();summary;df-generated |
 | System.Data;DataViewManager;Contains;(System.Object);summary;df-generated |
 | System.Data;DataViewManager;DataViewManager;(System.Data.DataSet);summary;df-generated |
 | System.Data;DataViewManager;IndexOf;(System.Object);summary;df-generated |
 | System.Data;DataViewManager;OnListChanged;(System.ComponentModel.ListChangedEventArgs);summary;df-generated |
 | System.Data;DataViewManager;RelationCollectionChanged;(System.Object,System.ComponentModel.CollectionChangeEventArgs);summary;df-generated |
+| System.Data;DataViewManager;Remove;(System.Object);summary;df-generated |
 | System.Data;DataViewManager;RemoveAt;(System.Int32);summary;df-generated |
 | System.Data;DataViewManager;RemoveIndex;(System.ComponentModel.PropertyDescriptor);summary;df-generated |
 | System.Data;DataViewManager;RemoveSort;();summary;df-generated |
 | System.Data;DataViewManager;TableCollectionChanged;(System.Object,System.ComponentModel.CollectionChangeEventArgs);summary;df-generated |
+| System.Data;DataViewManager;add_ListChanged;(System.ComponentModel.ListChangedEventHandler);summary;df-generated |
 | System.Data;DataViewManager;get_AllowEdit;();summary;df-generated |
 | System.Data;DataViewManager;get_AllowNew;();summary;df-generated |
 | System.Data;DataViewManager;get_AllowRemove;();summary;df-generated |
@@ -27121,9 +29437,11 @@ neutral
 | System.Data;DataViewManager;get_IsSorted;();summary;df-generated |
 | System.Data;DataViewManager;get_IsSynchronized;();summary;df-generated |
 | System.Data;DataViewManager;get_SortDirection;();summary;df-generated |
+| System.Data;DataViewManager;get_SortProperty;();summary;df-generated |
 | System.Data;DataViewManager;get_SupportsChangeNotification;();summary;df-generated |
 | System.Data;DataViewManager;get_SupportsSearching;();summary;df-generated |
 | System.Data;DataViewManager;get_SupportsSorting;();summary;df-generated |
+| System.Data;DataViewManager;remove_ListChanged;(System.ComponentModel.ListChangedEventHandler);summary;df-generated |
 | System.Data;DataViewSettingCollection;get_Count;();summary;df-generated |
 | System.Data;DataViewSettingCollection;get_IsReadOnly;();summary;df-generated |
 | System.Data;DataViewSettingCollection;get_IsSynchronized;();summary;df-generated |
@@ -27146,6 +29464,7 @@ neutral
 | System.Data;IDataAdapter;Fill;(System.Data.DataSet);summary;df-generated |
 | System.Data;IDataAdapter;FillSchema;(System.Data.DataSet,System.Data.SchemaType);summary;df-generated |
 | System.Data;IDataAdapter;Update;(System.Data.DataSet);summary;df-generated |
+| System.Data;IDataAdapter;get_TableMappings;();summary;df-generated |
 | System.Data;IDataParameter;get_IsNullable;();summary;df-generated |
 | System.Data;IDataParameterCollection;Contains;(System.String);summary;df-generated |
 | System.Data;IDataParameterCollection;IndexOf;(System.String);summary;df-generated |
@@ -27181,15 +29500,21 @@ neutral
 | System.Data;IDbCommand;ExecuteNonQuery;();summary;df-generated |
 | System.Data;IDbCommand;ExecuteReader;(System.Data.CommandBehavior);summary;df-generated |
 | System.Data;IDbCommand;Prepare;();summary;df-generated |
+| System.Data;IDbCommand;get_Parameters;();summary;df-generated |
+| System.Data;IDbConnection;BeginTransaction;();summary;df-generated |
+| System.Data;IDbConnection;BeginTransaction;(System.Data.IsolationLevel);summary;df-generated |
 | System.Data;IDbConnection;ChangeDatabase;(System.String);summary;df-generated |
 | System.Data;IDbConnection;Close;();summary;df-generated |
+| System.Data;IDbConnection;CreateCommand;();summary;df-generated |
 | System.Data;IDbConnection;Open;();summary;df-generated |
 | System.Data;IDbConnection;get_ConnectionTimeout;();summary;df-generated |
 | System.Data;IDbConnection;get_Database;();summary;df-generated |
 | System.Data;IDbConnection;get_State;();summary;df-generated |
 | System.Data;IDbTransaction;Commit;();summary;df-generated |
 | System.Data;IDbTransaction;Rollback;();summary;df-generated |
+| System.Data;IDbTransaction;get_Connection;();summary;df-generated |
 | System.Data;IDbTransaction;get_IsolationLevel;();summary;df-generated |
+| System.Data;ITableMapping;get_ColumnMappings;();summary;df-generated |
 | System.Data;ITableMappingCollection;Contains;(System.String);summary;df-generated |
 | System.Data;ITableMappingCollection;IndexOf;(System.String);summary;df-generated |
 | System.Data;ITableMappingCollection;RemoveAt;(System.String);summary;df-generated |
@@ -27297,6 +29622,8 @@ neutral
 | System.Diagnostics.Contracts;Contract;Ensures;(System.Boolean,System.String);summary;df-generated |
 | System.Diagnostics.Contracts;Contract;EnsuresOnThrow<TException>;(System.Boolean);summary;df-generated |
 | System.Diagnostics.Contracts;Contract;EnsuresOnThrow<TException>;(System.Boolean,System.String);summary;df-generated |
+| System.Diagnostics.Contracts;Contract;Exists;(System.Int32,System.Int32,System.Predicate<System.Int32>);summary;df-generated |
+| System.Diagnostics.Contracts;Contract;ForAll;(System.Int32,System.Int32,System.Predicate<System.Int32>);summary;df-generated |
 | System.Diagnostics.Contracts;Contract;Invariant;(System.Boolean);summary;df-generated |
 | System.Diagnostics.Contracts;Contract;Invariant;(System.Boolean,System.String);summary;df-generated |
 | System.Diagnostics.Contracts;Contract;OldValue<T>;(T);summary;df-generated |
@@ -27306,6 +29633,8 @@ neutral
 | System.Diagnostics.Contracts;Contract;Requires<TException>;(System.Boolean,System.String);summary;df-generated |
 | System.Diagnostics.Contracts;Contract;Result<T>;();summary;df-generated |
 | System.Diagnostics.Contracts;Contract;ValueAtReturn<T>;(T);summary;df-generated |
+| System.Diagnostics.Contracts;Contract;add_ContractFailed;(System.EventHandler<System.Diagnostics.Contracts.ContractFailedEventArgs>);summary;df-generated |
+| System.Diagnostics.Contracts;Contract;remove_ContractFailed;(System.EventHandler<System.Diagnostics.Contracts.ContractFailedEventArgs>);summary;df-generated |
 | System.Diagnostics.Contracts;ContractClassAttribute;ContractClassAttribute;(System.Type);summary;df-generated |
 | System.Diagnostics.Contracts;ContractClassAttribute;get_TypeContainingContracts;();summary;df-generated |
 | System.Diagnostics.Contracts;ContractClassForAttribute;ContractClassForAttribute;(System.Type);summary;df-generated |
@@ -27441,6 +29770,8 @@ neutral
 | System.Diagnostics.Eventing.Reader;EventLogWatcher;EventLogWatcher;(System.Diagnostics.Eventing.Reader.EventLogQuery,System.Diagnostics.Eventing.Reader.EventBookmark);summary;df-generated |
 | System.Diagnostics.Eventing.Reader;EventLogWatcher;EventLogWatcher;(System.Diagnostics.Eventing.Reader.EventLogQuery,System.Diagnostics.Eventing.Reader.EventBookmark,System.Boolean);summary;df-generated |
 | System.Diagnostics.Eventing.Reader;EventLogWatcher;EventLogWatcher;(System.String);summary;df-generated |
+| System.Diagnostics.Eventing.Reader;EventLogWatcher;add_EventRecordWritten;(System.EventHandler<System.Diagnostics.Eventing.Reader.EventRecordWrittenEventArgs>);summary;df-generated |
+| System.Diagnostics.Eventing.Reader;EventLogWatcher;remove_EventRecordWritten;(System.EventHandler<System.Diagnostics.Eventing.Reader.EventRecordWrittenEventArgs>);summary;df-generated |
 | System.Diagnostics.Eventing.Reader;EventMetadata;get_Description;();summary;df-generated |
 | System.Diagnostics.Eventing.Reader;EventMetadata;get_Id;();summary;df-generated |
 | System.Diagnostics.Eventing.Reader;EventMetadata;get_Keywords;();summary;df-generated |
@@ -27522,6 +29853,7 @@ neutral
 | System.Diagnostics.Metrics;Histogram<T>;Record;(T,System.ReadOnlySpan<System.Collections.Generic.KeyValuePair<System.String,System.Object>>);summary;df-generated |
 | System.Diagnostics.Metrics;IMeterFactory;Create;(System.Diagnostics.Metrics.MeterOptions);summary;df-generated |
 | System.Diagnostics.Metrics;Instrument;Instrument;(System.Diagnostics.Metrics.Meter,System.String,System.String,System.String);summary;df-generated |
+| System.Diagnostics.Metrics;Instrument;Instrument;(System.Diagnostics.Metrics.Meter,System.String,System.String,System.String,System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<System.String,System.Object>>);summary;df-generated |
 | System.Diagnostics.Metrics;Instrument;Publish;();summary;df-generated |
 | System.Diagnostics.Metrics;Instrument;get_Description;();summary;df-generated |
 | System.Diagnostics.Metrics;Instrument;get_Enabled;();summary;df-generated |
@@ -27540,11 +29872,30 @@ neutral
 | System.Diagnostics.Metrics;Instrument<T>;RecordMeasurement;(T,System.ReadOnlySpan<System.Collections.Generic.KeyValuePair<System.String,System.Object>>);summary;df-generated |
 | System.Diagnostics.Metrics;Measurement<T>;Measurement;(T);summary;df-generated |
 | System.Diagnostics.Metrics;Measurement<T>;Measurement;(T,System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<System.String,System.Object>>);summary;df-generated |
+| System.Diagnostics.Metrics;Measurement<T>;get_Tags;();summary;df-generated |
 | System.Diagnostics.Metrics;Measurement<T>;get_Value;();summary;df-generated |
 | System.Diagnostics.Metrics;Meter;CreateCounter<T>;(System.String,System.String,System.String);summary;df-generated |
 | System.Diagnostics.Metrics;Meter;CreateCounter<T>;(System.String,System.String,System.String,System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<System.String,System.Object>>);summary;df-generated |
 | System.Diagnostics.Metrics;Meter;CreateHistogram<T>;(System.String,System.String,System.String);summary;df-generated |
 | System.Diagnostics.Metrics;Meter;CreateHistogram<T>;(System.String,System.String,System.String,System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<System.String,System.Object>>);summary;df-generated |
+| System.Diagnostics.Metrics;Meter;CreateObservableCounter<T>;(System.String,System.Func<System.Collections.Generic.IEnumerable<System.Diagnostics.Metrics.Measurement<T>>>,System.String,System.String);summary;df-generated |
+| System.Diagnostics.Metrics;Meter;CreateObservableCounter<T>;(System.String,System.Func<System.Collections.Generic.IEnumerable<System.Diagnostics.Metrics.Measurement<T>>>,System.String,System.String,System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<System.String,System.Object>>);summary;df-generated |
+| System.Diagnostics.Metrics;Meter;CreateObservableCounter<T>;(System.String,System.Func<System.Diagnostics.Metrics.Measurement<T>>,System.String,System.String);summary;df-generated |
+| System.Diagnostics.Metrics;Meter;CreateObservableCounter<T>;(System.String,System.Func<System.Diagnostics.Metrics.Measurement<T>>,System.String,System.String,System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<System.String,System.Object>>);summary;df-generated |
+| System.Diagnostics.Metrics;Meter;CreateObservableCounter<T>;(System.String,System.Func<T>,System.String,System.String);summary;df-generated |
+| System.Diagnostics.Metrics;Meter;CreateObservableCounter<T>;(System.String,System.Func<T>,System.String,System.String,System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<System.String,System.Object>>);summary;df-generated |
+| System.Diagnostics.Metrics;Meter;CreateObservableGauge<T>;(System.String,System.Func<System.Collections.Generic.IEnumerable<System.Diagnostics.Metrics.Measurement<T>>>,System.String,System.String);summary;df-generated |
+| System.Diagnostics.Metrics;Meter;CreateObservableGauge<T>;(System.String,System.Func<System.Collections.Generic.IEnumerable<System.Diagnostics.Metrics.Measurement<T>>>,System.String,System.String,System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<System.String,System.Object>>);summary;df-generated |
+| System.Diagnostics.Metrics;Meter;CreateObservableGauge<T>;(System.String,System.Func<System.Diagnostics.Metrics.Measurement<T>>,System.String,System.String);summary;df-generated |
+| System.Diagnostics.Metrics;Meter;CreateObservableGauge<T>;(System.String,System.Func<System.Diagnostics.Metrics.Measurement<T>>,System.String,System.String,System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<System.String,System.Object>>);summary;df-generated |
+| System.Diagnostics.Metrics;Meter;CreateObservableGauge<T>;(System.String,System.Func<T>,System.String,System.String);summary;df-generated |
+| System.Diagnostics.Metrics;Meter;CreateObservableGauge<T>;(System.String,System.Func<T>,System.String,System.String,System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<System.String,System.Object>>);summary;df-generated |
+| System.Diagnostics.Metrics;Meter;CreateObservableUpDownCounter<T>;(System.String,System.Func<System.Collections.Generic.IEnumerable<System.Diagnostics.Metrics.Measurement<T>>>,System.String,System.String);summary;df-generated |
+| System.Diagnostics.Metrics;Meter;CreateObservableUpDownCounter<T>;(System.String,System.Func<System.Collections.Generic.IEnumerable<System.Diagnostics.Metrics.Measurement<T>>>,System.String,System.String,System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<System.String,System.Object>>);summary;df-generated |
+| System.Diagnostics.Metrics;Meter;CreateObservableUpDownCounter<T>;(System.String,System.Func<System.Diagnostics.Metrics.Measurement<T>>,System.String,System.String);summary;df-generated |
+| System.Diagnostics.Metrics;Meter;CreateObservableUpDownCounter<T>;(System.String,System.Func<System.Diagnostics.Metrics.Measurement<T>>,System.String,System.String,System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<System.String,System.Object>>);summary;df-generated |
+| System.Diagnostics.Metrics;Meter;CreateObservableUpDownCounter<T>;(System.String,System.Func<T>,System.String,System.String);summary;df-generated |
+| System.Diagnostics.Metrics;Meter;CreateObservableUpDownCounter<T>;(System.String,System.Func<T>,System.String,System.String,System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<System.String,System.Object>>);summary;df-generated |
 | System.Diagnostics.Metrics;Meter;CreateUpDownCounter<T>;(System.String,System.String,System.String);summary;df-generated |
 | System.Diagnostics.Metrics;Meter;CreateUpDownCounter<T>;(System.String,System.String,System.String,System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<System.String,System.Object>>);summary;df-generated |
 | System.Diagnostics.Metrics;Meter;Dispose;();summary;df-generated |
@@ -27554,10 +29905,9 @@ neutral
 | System.Diagnostics.Metrics;Meter;Meter;(System.String,System.String);summary;df-generated |
 | System.Diagnostics.Metrics;Meter;Meter;(System.String,System.String,System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<System.String,System.Object>>,System.Object);summary;df-generated |
 | System.Diagnostics.Metrics;MeterFactoryExtensions;Create;(System.Diagnostics.Metrics.IMeterFactory,System.String,System.String,System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<System.String,System.Object>>);summary;df-generated |
-| System.Diagnostics.Metrics;MeterListener;DisableMeasurementEvents;(System.Diagnostics.Metrics.Instrument);summary;df-generated |
 | System.Diagnostics.Metrics;MeterListener;Dispose;();summary;df-generated |
-| System.Diagnostics.Metrics;MeterListener;EnableMeasurementEvents;(System.Diagnostics.Metrics.Instrument,System.Object);summary;df-generated |
 | System.Diagnostics.Metrics;MeterListener;RecordObservableInstruments;();summary;df-generated |
+| System.Diagnostics.Metrics;MeterListener;SetMeasurementEventCallback<T>;(System.Diagnostics.Metrics.MeasurementCallback<T>);summary;df-generated |
 | System.Diagnostics.Metrics;MeterListener;Start;();summary;df-generated |
 | System.Diagnostics.Metrics;ObservableCounter<T>;Observe;();summary;df-generated |
 | System.Diagnostics.Metrics;ObservableGauge<T>;Observe;();summary;df-generated |
@@ -27667,6 +30017,9 @@ neutral
 | System.Diagnostics.Tracing;EventListener;EventSourceIndex;(System.Diagnostics.Tracing.EventSource);summary;df-generated |
 | System.Diagnostics.Tracing;EventListener;OnEventSourceCreated;(System.Diagnostics.Tracing.EventSource);summary;df-generated |
 | System.Diagnostics.Tracing;EventListener;OnEventWritten;(System.Diagnostics.Tracing.EventWrittenEventArgs);summary;df-generated |
+| System.Diagnostics.Tracing;EventListener;add_EventWritten;(System.EventHandler<System.Diagnostics.Tracing.EventWrittenEventArgs>);summary;df-generated |
+| System.Diagnostics.Tracing;EventListener;remove_EventSourceCreated;(System.EventHandler<System.Diagnostics.Tracing.EventSourceCreatedEventArgs>);summary;df-generated |
+| System.Diagnostics.Tracing;EventListener;remove_EventWritten;(System.EventHandler<System.Diagnostics.Tracing.EventWrittenEventArgs>);summary;df-generated |
 | System.Diagnostics.Tracing;EventSource;Dispose;();summary;df-generated |
 | System.Diagnostics.Tracing;EventSource;Dispose;(System.Boolean);summary;df-generated |
 | System.Diagnostics.Tracing;EventSource;EventSource;(System.Boolean);summary;df-generated |
@@ -27686,7 +30039,6 @@ neutral
 | System.Diagnostics.Tracing;EventSource;SetCurrentThreadActivityId;(System.Guid,System.Guid);summary;df-generated |
 | System.Diagnostics.Tracing;EventSource;Write;(System.String);summary;df-generated |
 | System.Diagnostics.Tracing;EventSource;Write;(System.String,System.Diagnostics.Tracing.EventSourceOptions);summary;df-generated |
-| System.Diagnostics.Tracing;EventSource;Write<T>;(System.String,System.Diagnostics.Tracing.EventSourceOptions,System.Guid,System.Guid,T);summary;df-generated |
 | System.Diagnostics.Tracing;EventSource;Write<T>;(System.String,System.Diagnostics.Tracing.EventSourceOptions,T);summary;df-generated |
 | System.Diagnostics.Tracing;EventSource;Write<T>;(System.String,T);summary;df-generated |
 | System.Diagnostics.Tracing;EventSource;WriteEvent;(System.Int32);summary;df-generated |
@@ -27713,6 +30065,7 @@ neutral
 | System.Diagnostics.Tracing;EventSource;WriteEventWithRelatedActivityIdCore;(System.Int32,System.Guid*,System.Int32,System.Diagnostics.Tracing.EventSource+EventData*);summary;df-generated |
 | System.Diagnostics.Tracing;EventSource;get_CurrentThreadActivityId;();summary;df-generated |
 | System.Diagnostics.Tracing;EventSource;get_Settings;();summary;df-generated |
+| System.Diagnostics.Tracing;EventSource;remove_EventCommandExecuted;(System.EventHandler<System.Diagnostics.Tracing.EventCommandEventArgs>);summary;df-generated |
 | System.Diagnostics.Tracing;EventSourceException;EventSourceException;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);summary;df-generated |
 | System.Diagnostics.Tracing;EventSourceException;EventSourceException;(System.String);summary;df-generated |
 | System.Diagnostics.Tracing;EventSourceException;EventSourceException;(System.String,System.Exception);summary;df-generated |
@@ -27722,6 +30075,8 @@ neutral
 | System.Diagnostics.Tracing;EventWrittenEventArgs;get_Version;();summary;df-generated |
 | System.Diagnostics.Tracing;IncrementingEventCounter;Increment;(System.Double);summary;df-generated |
 | System.Diagnostics.Tracing;IncrementingEventCounter;IncrementingEventCounter;(System.String,System.Diagnostics.Tracing.EventSource);summary;df-generated |
+| System.Diagnostics.Tracing;IncrementingPollingCounter;IncrementingPollingCounter;(System.String,System.Diagnostics.Tracing.EventSource,System.Func<System.Double>);summary;df-generated |
+| System.Diagnostics.Tracing;PollingCounter;PollingCounter;(System.String,System.Diagnostics.Tracing.EventSource,System.Func<System.Double>);summary;df-generated |
 | System.Diagnostics;Activity+Enumerator<T>;MoveNext;();summary;df-generated |
 | System.Diagnostics;Activity+Enumerator<T>;get_Current;();summary;df-generated |
 | System.Diagnostics;Activity;Activity;(System.String);summary;df-generated |
@@ -27731,12 +30086,14 @@ neutral
 | System.Diagnostics;Activity;GetTagItem;(System.String);summary;df-generated |
 | System.Diagnostics;Activity;SetCustomProperty;(System.String,System.Object);summary;df-generated |
 | System.Diagnostics;Activity;Stop;();summary;df-generated |
+| System.Diagnostics;Activity;add_CurrentChanged;(System.EventHandler<System.Diagnostics.ActivityChangedEventArgs>);summary;df-generated |
 | System.Diagnostics;Activity;get_Baggage;();summary;df-generated |
 | System.Diagnostics;Activity;get_Context;();summary;df-generated |
 | System.Diagnostics;Activity;get_OperationName;();summary;df-generated |
 | System.Diagnostics;Activity;get_Recorded;();summary;df-generated |
 | System.Diagnostics;Activity;get_Status;();summary;df-generated |
 | System.Diagnostics;Activity;get_Tags;();summary;df-generated |
+| System.Diagnostics;Activity;remove_CurrentChanged;(System.EventHandler<System.Diagnostics.ActivityChangedEventArgs>);summary;df-generated |
 | System.Diagnostics;ActivityContext;ActivityContext;(System.Diagnostics.ActivityTraceId,System.Diagnostics.ActivitySpanId,System.Diagnostics.ActivityTraceFlags,System.String,System.Boolean);summary;df-generated |
 | System.Diagnostics;ActivityContext;Equals;(System.Diagnostics.ActivityContext);summary;df-generated |
 | System.Diagnostics;ActivityContext;Equals;(System.Object);summary;df-generated |
@@ -27790,10 +30147,12 @@ neutral
 | System.Diagnostics;ActivityTagsCollection+Enumerator;Dispose;();summary;df-generated |
 | System.Diagnostics;ActivityTagsCollection+Enumerator;MoveNext;();summary;df-generated |
 | System.Diagnostics;ActivityTagsCollection+Enumerator;Reset;();summary;df-generated |
+| System.Diagnostics;ActivityTagsCollection+Enumerator;get_Current;();summary;df-generated |
 | System.Diagnostics;ActivityTagsCollection;Contains;(System.Collections.Generic.KeyValuePair<System.String,System.Object>);summary;df-generated |
 | System.Diagnostics;ActivityTagsCollection;ContainsKey;(System.String);summary;df-generated |
 | System.Diagnostics;ActivityTagsCollection;Remove;(System.Collections.Generic.KeyValuePair<System.String,System.Object>);summary;df-generated |
 | System.Diagnostics;ActivityTagsCollection;Remove;(System.String);summary;df-generated |
+| System.Diagnostics;ActivityTagsCollection;TryGetValue;(System.String,System.Object);summary;df-generated |
 | System.Diagnostics;ActivityTagsCollection;get_Count;();summary;df-generated |
 | System.Diagnostics;ActivityTagsCollection;get_IsReadOnly;();summary;df-generated |
 | System.Diagnostics;ActivityTraceId;CopyTo;(System.Span<System.Byte>);summary;df-generated |
@@ -27839,8 +30198,6 @@ neutral
 | System.Diagnostics;Debug+WriteIfInterpolatedStringHandler;AppendLiteral;(System.String);summary;df-generated |
 | System.Diagnostics;Debug+WriteIfInterpolatedStringHandler;WriteIfInterpolatedStringHandler;(System.Int32,System.Int32,System.Boolean,System.Boolean);summary;df-generated |
 | System.Diagnostics;Debug;Assert;(System.Boolean);summary;df-generated |
-| System.Diagnostics;Debug;Assert;(System.Boolean,System.Diagnostics.Debug+AssertInterpolatedStringHandler);summary;df-generated |
-| System.Diagnostics;Debug;Assert;(System.Boolean,System.Diagnostics.Debug+AssertInterpolatedStringHandler,System.Diagnostics.Debug+AssertInterpolatedStringHandler);summary;df-generated |
 | System.Diagnostics;Debug;Assert;(System.Boolean,System.String);summary;df-generated |
 | System.Diagnostics;Debug;Assert;(System.Boolean,System.String,System.String);summary;df-generated |
 | System.Diagnostics;Debug;Assert;(System.Boolean,System.String,System.String,System.Object[]);summary;df-generated |
@@ -27856,8 +30213,6 @@ neutral
 | System.Diagnostics;Debug;Write;(System.Object,System.String);summary;df-generated |
 | System.Diagnostics;Debug;Write;(System.String);summary;df-generated |
 | System.Diagnostics;Debug;Write;(System.String,System.String);summary;df-generated |
-| System.Diagnostics;Debug;WriteIf;(System.Boolean,System.Diagnostics.Debug+WriteIfInterpolatedStringHandler);summary;df-generated |
-| System.Diagnostics;Debug;WriteIf;(System.Boolean,System.Diagnostics.Debug+WriteIfInterpolatedStringHandler,System.String);summary;df-generated |
 | System.Diagnostics;Debug;WriteIf;(System.Boolean,System.Object);summary;df-generated |
 | System.Diagnostics;Debug;WriteIf;(System.Boolean,System.Object,System.String);summary;df-generated |
 | System.Diagnostics;Debug;WriteIf;(System.Boolean,System.String);summary;df-generated |
@@ -27867,8 +30222,6 @@ neutral
 | System.Diagnostics;Debug;WriteLine;(System.String);summary;df-generated |
 | System.Diagnostics;Debug;WriteLine;(System.String,System.Object[]);summary;df-generated |
 | System.Diagnostics;Debug;WriteLine;(System.String,System.String);summary;df-generated |
-| System.Diagnostics;Debug;WriteLineIf;(System.Boolean,System.Diagnostics.Debug+WriteIfInterpolatedStringHandler);summary;df-generated |
-| System.Diagnostics;Debug;WriteLineIf;(System.Boolean,System.Diagnostics.Debug+WriteIfInterpolatedStringHandler,System.String);summary;df-generated |
 | System.Diagnostics;Debug;WriteLineIf;(System.Boolean,System.Object);summary;df-generated |
 | System.Diagnostics;Debug;WriteLineIf;(System.Boolean,System.Object,System.String);summary;df-generated |
 | System.Diagnostics;Debug;WriteLineIf;(System.Boolean,System.String);summary;df-generated |
@@ -27899,6 +30252,9 @@ neutral
 | System.Diagnostics;DebuggerVisualizerAttribute;DebuggerVisualizerAttribute;(System.Type,System.Type);summary;df-generated |
 | System.Diagnostics;DebuggerVisualizerAttribute;get_VisualizerObjectSourceTypeName;();summary;df-generated |
 | System.Diagnostics;DebuggerVisualizerAttribute;get_VisualizerTypeName;();summary;df-generated |
+| System.Diagnostics;DefaultTraceListener;Fail;(System.String);summary;df-generated |
+| System.Diagnostics;DefaultTraceListener;Fail;(System.String,System.String);summary;df-generated |
+| System.Diagnostics;DefaultTraceListener;WriteLine;(System.String);summary;df-generated |
 | System.Diagnostics;DelimitedListTraceListener;DelimitedListTraceListener;(System.IO.Stream);summary;df-generated |
 | System.Diagnostics;DelimitedListTraceListener;DelimitedListTraceListener;(System.IO.Stream,System.String);summary;df-generated |
 | System.Diagnostics;DelimitedListTraceListener;DelimitedListTraceListener;(System.IO.TextWriter);summary;df-generated |
@@ -27913,6 +30269,10 @@ neutral
 | System.Diagnostics;DiagnosticListener;IsEnabled;(System.String,System.Object,System.Object);summary;df-generated |
 | System.Diagnostics;DiagnosticListener;OnActivityExport;(System.Diagnostics.Activity,System.Object);summary;df-generated |
 | System.Diagnostics;DiagnosticListener;OnActivityImport;(System.Diagnostics.Activity,System.Object);summary;df-generated |
+| System.Diagnostics;DiagnosticListener;Subscribe;(System.IObserver<System.Collections.Generic.KeyValuePair<System.String,System.Object>>);summary;df-generated |
+| System.Diagnostics;DiagnosticListener;Subscribe;(System.IObserver<System.Collections.Generic.KeyValuePair<System.String,System.Object>>,System.Func<System.String,System.Object,System.Object,System.Boolean>);summary;df-generated |
+| System.Diagnostics;DiagnosticListener;Subscribe;(System.IObserver<System.Collections.Generic.KeyValuePair<System.String,System.Object>>,System.Func<System.String,System.Object,System.Object,System.Boolean>,System.Action<System.Diagnostics.Activity,System.Object>,System.Action<System.Diagnostics.Activity,System.Object>);summary;df-generated |
+| System.Diagnostics;DiagnosticListener;Subscribe;(System.IObserver<System.Collections.Generic.KeyValuePair<System.String,System.Object>>,System.Predicate<System.String>);summary;df-generated |
 | System.Diagnostics;DiagnosticListener;Write;(System.String,System.Object);summary;df-generated |
 | System.Diagnostics;DiagnosticListener;get_AllListeners;();summary;df-generated |
 | System.Diagnostics;DiagnosticSource;IsEnabled;(System.String);summary;df-generated |
@@ -27969,10 +30329,12 @@ neutral
 | System.Diagnostics;EventLog;WriteEvent;(System.Diagnostics.EventInstance,System.Object[]);summary;df-generated |
 | System.Diagnostics;EventLog;WriteEvent;(System.String,System.Diagnostics.EventInstance,System.Byte[],System.Object[]);summary;df-generated |
 | System.Diagnostics;EventLog;WriteEvent;(System.String,System.Diagnostics.EventInstance,System.Object[]);summary;df-generated |
+| System.Diagnostics;EventLog;add_EntryWritten;(System.Diagnostics.EntryWrittenEventHandler);summary;df-generated |
 | System.Diagnostics;EventLog;get_Entries;();summary;df-generated |
 | System.Diagnostics;EventLog;get_LogDisplayName;();summary;df-generated |
 | System.Diagnostics;EventLog;get_MinimumRetentionDays;();summary;df-generated |
 | System.Diagnostics;EventLog;get_OverflowAction;();summary;df-generated |
+| System.Diagnostics;EventLog;remove_EntryWritten;(System.Diagnostics.EntryWrittenEventHandler);summary;df-generated |
 | System.Diagnostics;EventLogEntry;Equals;(System.Diagnostics.EventLogEntry);summary;df-generated |
 | System.Diagnostics;EventLogEntry;get_Category;();summary;df-generated |
 | System.Diagnostics;EventLogEntry;get_CategoryNumber;();summary;df-generated |
@@ -28017,6 +30379,7 @@ neutral
 | System.Diagnostics;EventLogTraceListener;Dispose;(System.Boolean);summary;df-generated |
 | System.Diagnostics;EventLogTraceListener;EventLogTraceListener;(System.Diagnostics.EventLog);summary;df-generated |
 | System.Diagnostics;EventLogTraceListener;EventLogTraceListener;(System.String);summary;df-generated |
+| System.Diagnostics;EventLogTraceListener;WriteLine;(System.String);summary;df-generated |
 | System.Diagnostics;EventSourceCreationData;EventSourceCreationData;(System.String,System.String);summary;df-generated |
 | System.Diagnostics;EventTypeFilter;EventTypeFilter;(System.Diagnostics.SourceLevels);summary;df-generated |
 | System.Diagnostics;EventTypeFilter;ShouldTrace;(System.Diagnostics.TraceEventCache,System.String,System.Diagnostics.TraceEventType,System.Int32,System.String,System.Object[],System.Object,System.Object[]);summary;df-generated |
@@ -28091,9 +30454,13 @@ neutral
 | System.Diagnostics;Process;WaitForInputIdle;();summary;df-generated |
 | System.Diagnostics;Process;WaitForInputIdle;(System.Int32);summary;df-generated |
 | System.Diagnostics;Process;WaitForInputIdle;(System.TimeSpan);summary;df-generated |
+| System.Diagnostics;Process;add_ErrorDataReceived;(System.Diagnostics.DataReceivedEventHandler);summary;df-generated |
+| System.Diagnostics;Process;add_Exited;(System.EventHandler);summary;df-generated |
+| System.Diagnostics;Process;add_OutputDataReceived;(System.Diagnostics.DataReceivedEventHandler);summary;df-generated |
 | System.Diagnostics;Process;get_BasePriority;();summary;df-generated |
 | System.Diagnostics;Process;get_ExitCode;();summary;df-generated |
 | System.Diagnostics;Process;get_ExitTime;();summary;df-generated |
+| System.Diagnostics;Process;get_Handle;();summary;df-generated |
 | System.Diagnostics;Process;get_HandleCount;();summary;df-generated |
 | System.Diagnostics;Process;get_HasExited;();summary;df-generated |
 | System.Diagnostics;Process;get_Id;();summary;df-generated |
@@ -28123,6 +30490,9 @@ neutral
 | System.Diagnostics;Process;get_VirtualMemorySize;();summary;df-generated |
 | System.Diagnostics;Process;get_WorkingSet64;();summary;df-generated |
 | System.Diagnostics;Process;get_WorkingSet;();summary;df-generated |
+| System.Diagnostics;Process;remove_ErrorDataReceived;(System.Diagnostics.DataReceivedEventHandler);summary;df-generated |
+| System.Diagnostics;Process;remove_Exited;(System.EventHandler);summary;df-generated |
+| System.Diagnostics;Process;remove_OutputDataReceived;(System.Diagnostics.DataReceivedEventHandler);summary;df-generated |
 | System.Diagnostics;ProcessModule;get_FileVersionInfo;();summary;df-generated |
 | System.Diagnostics;ProcessModuleCollection;Contains;(System.Diagnostics.ProcessModule);summary;df-generated |
 | System.Diagnostics;ProcessModuleCollection;IndexOf;(System.Diagnostics.ProcessModule);summary;df-generated |
@@ -28190,25 +30560,31 @@ neutral
 | System.Diagnostics;Switch;OnValueChanged;();summary;df-generated |
 | System.Diagnostics;Switch;Refresh;();summary;df-generated |
 | System.Diagnostics;Switch;Switch;(System.String,System.String);summary;df-generated |
+| System.Diagnostics;Switch;add_Initializing;(System.EventHandler<System.Diagnostics.InitializingSwitchEventArgs>);summary;df-generated |
 | System.Diagnostics;Switch;get_Attributes;();summary;df-generated |
+| System.Diagnostics;Switch;remove_Initializing;(System.EventHandler<System.Diagnostics.InitializingSwitchEventArgs>);summary;df-generated |
 | System.Diagnostics;SwitchAttribute;GetAll;(System.Reflection.Assembly);summary;df-generated |
 | System.Diagnostics;SwitchLevelAttribute;SwitchLevelAttribute;(System.Type);summary;df-generated |
 | System.Diagnostics;TagList+Enumerator;Dispose;();summary;df-generated |
 | System.Diagnostics;TagList+Enumerator;MoveNext;();summary;df-generated |
 | System.Diagnostics;TagList+Enumerator;Reset;();summary;df-generated |
+| System.Diagnostics;TagList+Enumerator;get_Current;();summary;df-generated |
 | System.Diagnostics;TagList;Add;(System.String,System.Object);summary;df-generated |
 | System.Diagnostics;TagList;Contains;(System.Collections.Generic.KeyValuePair<System.String,System.Object>);summary;df-generated |
+| System.Diagnostics;TagList;CopyTo;(System.Span<System.Collections.Generic.KeyValuePair<System.String,System.Object>>);summary;df-generated |
 | System.Diagnostics;TagList;IndexOf;(System.Collections.Generic.KeyValuePair<System.String,System.Object>);summary;df-generated |
 | System.Diagnostics;TagList;Remove;(System.Collections.Generic.KeyValuePair<System.String,System.Object>);summary;df-generated |
 | System.Diagnostics;TagList;RemoveAt;(System.Int32);summary;df-generated |
 | System.Diagnostics;TagList;get_Count;();summary;df-generated |
 | System.Diagnostics;TagList;get_IsReadOnly;();summary;df-generated |
+| System.Diagnostics;TagList;get_Item;(System.Int32);summary;df-generated |
 | System.Diagnostics;TextWriterTraceListener;Close;();summary;df-generated |
 | System.Diagnostics;TextWriterTraceListener;Dispose;(System.Boolean);summary;df-generated |
 | System.Diagnostics;TextWriterTraceListener;Flush;();summary;df-generated |
 | System.Diagnostics;TextWriterTraceListener;TextWriterTraceListener;(System.IO.Stream);summary;df-generated |
 | System.Diagnostics;TextWriterTraceListener;TextWriterTraceListener;(System.IO.Stream,System.String);summary;df-generated |
 | System.Diagnostics;TextWriterTraceListener;TextWriterTraceListener;(System.IO.TextWriter);summary;df-generated |
+| System.Diagnostics;TextWriterTraceListener;WriteLine;(System.String);summary;df-generated |
 | System.Diagnostics;Trace;Assert;(System.Boolean);summary;df-generated |
 | System.Diagnostics;Trace;Assert;(System.Boolean,System.String);summary;df-generated |
 | System.Diagnostics;Trace;Assert;(System.Boolean,System.String,System.String);summary;df-generated |
@@ -28241,8 +30617,10 @@ neutral
 | System.Diagnostics;Trace;WriteLineIf;(System.Boolean,System.Object,System.String);summary;df-generated |
 | System.Diagnostics;Trace;WriteLineIf;(System.Boolean,System.String);summary;df-generated |
 | System.Diagnostics;Trace;WriteLineIf;(System.Boolean,System.String,System.String);summary;df-generated |
+| System.Diagnostics;Trace;add_Refreshing;(System.EventHandler);summary;df-generated |
 | System.Diagnostics;Trace;get_CorrelationManager;();summary;df-generated |
 | System.Diagnostics;Trace;get_Listeners;();summary;df-generated |
+| System.Diagnostics;Trace;remove_Refreshing;(System.EventHandler);summary;df-generated |
 | System.Diagnostics;TraceEventCache;get_Callstack;();summary;df-generated |
 | System.Diagnostics;TraceEventCache;get_DateTime;();summary;df-generated |
 | System.Diagnostics;TraceEventCache;get_LogicalOperationStack;();summary;df-generated |
@@ -28253,9 +30631,20 @@ neutral
 | System.Diagnostics;TraceListener;Close;();summary;df-generated |
 | System.Diagnostics;TraceListener;Dispose;();summary;df-generated |
 | System.Diagnostics;TraceListener;Dispose;(System.Boolean);summary;df-generated |
+| System.Diagnostics;TraceListener;Fail;(System.String);summary;df-generated |
+| System.Diagnostics;TraceListener;Fail;(System.String,System.String);summary;df-generated |
 | System.Diagnostics;TraceListener;Flush;();summary;df-generated |
 | System.Diagnostics;TraceListener;GetSupportedAttributes;();summary;df-generated |
+| System.Diagnostics;TraceListener;TraceEvent;(System.Diagnostics.TraceEventCache,System.String,System.Diagnostics.TraceEventType,System.Int32);summary;df-generated |
+| System.Diagnostics;TraceListener;TraceTransfer;(System.Diagnostics.TraceEventCache,System.String,System.Int32,System.String,System.Guid);summary;df-generated |
+| System.Diagnostics;TraceListener;Write;(System.Object);summary;df-generated |
+| System.Diagnostics;TraceListener;Write;(System.Object,System.String);summary;df-generated |
+| System.Diagnostics;TraceListener;Write;(System.String,System.String);summary;df-generated |
 | System.Diagnostics;TraceListener;WriteIndent;();summary;df-generated |
+| System.Diagnostics;TraceListener;WriteLine;(System.Object);summary;df-generated |
+| System.Diagnostics;TraceListener;WriteLine;(System.Object,System.String);summary;df-generated |
+| System.Diagnostics;TraceListener;WriteLine;(System.String);summary;df-generated |
+| System.Diagnostics;TraceListener;WriteLine;(System.String,System.String);summary;df-generated |
 | System.Diagnostics;TraceListener;get_Attributes;();summary;df-generated |
 | System.Diagnostics;TraceListener;get_IsThreadSafe;();summary;df-generated |
 | System.Diagnostics;TraceListenerCollection;Contains;(System.Diagnostics.TraceListener);summary;df-generated |
@@ -28263,6 +30652,7 @@ neutral
 | System.Diagnostics;TraceListenerCollection;IndexOf;(System.Diagnostics.TraceListener);summary;df-generated |
 | System.Diagnostics;TraceListenerCollection;IndexOf;(System.Object);summary;df-generated |
 | System.Diagnostics;TraceListenerCollection;Remove;(System.Diagnostics.TraceListener);summary;df-generated |
+| System.Diagnostics;TraceListenerCollection;Remove;(System.Object);summary;df-generated |
 | System.Diagnostics;TraceListenerCollection;Remove;(System.String);summary;df-generated |
 | System.Diagnostics;TraceListenerCollection;RemoveAt;(System.Int32);summary;df-generated |
 | System.Diagnostics;TraceListenerCollection;get_Count;();summary;df-generated |
@@ -28281,8 +30671,10 @@ neutral
 | System.Diagnostics;TraceSource;TraceInformation;(System.String,System.Object[]);summary;df-generated |
 | System.Diagnostics;TraceSource;TraceSource;(System.String);summary;df-generated |
 | System.Diagnostics;TraceSource;TraceTransfer;(System.Int32,System.String,System.Guid);summary;df-generated |
+| System.Diagnostics;TraceSource;add_Initializing;(System.EventHandler<System.Diagnostics.InitializingTraceSourceEventArgs>);summary;df-generated |
 | System.Diagnostics;TraceSource;get_Attributes;();summary;df-generated |
 | System.Diagnostics;TraceSource;get_DefaultLevel;();summary;df-generated |
+| System.Diagnostics;TraceSource;remove_Initializing;(System.EventHandler<System.Diagnostics.InitializingTraceSourceEventArgs>);summary;df-generated |
 | System.Diagnostics;TraceSwitch;OnSwitchSettingChanged;();summary;df-generated |
 | System.Diagnostics;TraceSwitch;OnValueChanged;();summary;df-generated |
 | System.Diagnostics;TraceSwitch;TraceSwitch;(System.String,System.String);summary;df-generated |
@@ -28294,12 +30686,34 @@ neutral
 | System.Diagnostics;UnreachableException;UnreachableException;(System.String);summary;df-generated |
 | System.Diagnostics;UnreachableException;UnreachableException;(System.String,System.Exception);summary;df-generated |
 | System.Diagnostics;XmlWriterTraceListener;Close;();summary;df-generated |
+| System.Diagnostics;XmlWriterTraceListener;Fail;(System.String,System.String);summary;df-generated |
+| System.Diagnostics;XmlWriterTraceListener;TraceTransfer;(System.Diagnostics.TraceEventCache,System.String,System.Int32,System.String,System.Guid);summary;df-generated |
+| System.Diagnostics;XmlWriterTraceListener;WriteLine;(System.String);summary;df-generated |
 | System.Diagnostics;XmlWriterTraceListener;XmlWriterTraceListener;(System.IO.Stream);summary;df-generated |
 | System.Diagnostics;XmlWriterTraceListener;XmlWriterTraceListener;(System.IO.Stream,System.String);summary;df-generated |
 | System.Diagnostics;XmlWriterTraceListener;XmlWriterTraceListener;(System.IO.TextWriter);summary;df-generated |
 | System.Diagnostics;XmlWriterTraceListener;XmlWriterTraceListener;(System.IO.TextWriter,System.String);summary;df-generated |
 | System.Diagnostics;XmlWriterTraceListener;XmlWriterTraceListener;(System.String);summary;df-generated |
 | System.Diagnostics;XmlWriterTraceListener;XmlWriterTraceListener;(System.String,System.String);summary;df-generated |
+| System.Drawing.Drawing2D;CustomLineCap;Dispose;();summary;df-generated |
+| System.Drawing.Drawing2D;GraphicsPath;Dispose;();summary;df-generated |
+| System.Drawing.Drawing2D;GraphicsPathIterator;Dispose;();summary;df-generated |
+| System.Drawing.Drawing2D;Matrix;Dispose;();summary;df-generated |
+| System.Drawing.Imaging;EncoderParameter;Dispose;();summary;df-generated |
+| System.Drawing.Imaging;EncoderParameters;Dispose;();summary;df-generated |
+| System.Drawing.Imaging;ImageAttributes;Dispose;();summary;df-generated |
+| System.Drawing.Printing;MarginsConverter;CanConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Type);summary;df-generated |
+| System.Drawing.Printing;MarginsConverter;CanConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Type);summary;df-generated |
+| System.Drawing.Printing;MarginsConverter;CreateInstance;(System.ComponentModel.ITypeDescriptorContext,System.Collections.IDictionary);summary;df-generated |
+| System.Drawing.Printing;MarginsConverter;GetCreateInstanceSupported;(System.ComponentModel.ITypeDescriptorContext);summary;df-generated |
+| System.Drawing.Printing;PrinterSettings+PaperSizeCollection;get_Count;();summary;df-generated |
+| System.Drawing.Printing;PrinterSettings+PaperSizeCollection;get_IsSynchronized;();summary;df-generated |
+| System.Drawing.Printing;PrinterSettings+PaperSourceCollection;get_Count;();summary;df-generated |
+| System.Drawing.Printing;PrinterSettings+PaperSourceCollection;get_IsSynchronized;();summary;df-generated |
+| System.Drawing.Printing;PrinterSettings+PrinterResolutionCollection;get_Count;();summary;df-generated |
+| System.Drawing.Printing;PrinterSettings+PrinterResolutionCollection;get_IsSynchronized;();summary;df-generated |
+| System.Drawing.Printing;PrinterSettings+StringCollection;get_Count;();summary;df-generated |
+| System.Drawing.Printing;PrinterSettings+StringCollection;get_IsSynchronized;();summary;df-generated |
 | System.Drawing.Printing;PrintingPermission;FromXml;(System.Security.SecurityElement);summary;df-generated |
 | System.Drawing.Printing;PrintingPermission;IsSubsetOf;(System.Security.IPermission);summary;df-generated |
 | System.Drawing.Printing;PrintingPermission;IsUnrestricted;();summary;df-generated |
@@ -28308,6 +30722,10 @@ neutral
 | System.Drawing.Printing;PrintingPermission;ToXml;();summary;df-generated |
 | System.Drawing.Printing;PrintingPermissionAttribute;CreatePermission;();summary;df-generated |
 | System.Drawing.Printing;PrintingPermissionAttribute;PrintingPermissionAttribute;(System.Security.Permissions.SecurityAction);summary;df-generated |
+| System.Drawing.Text;FontCollection;Dispose;();summary;df-generated |
+| System.Drawing;Brush;Dispose;();summary;df-generated |
+| System.Drawing;BufferedGraphics;Dispose;();summary;df-generated |
+| System.Drawing;BufferedGraphicsContext;Dispose;();summary;df-generated |
 | System.Drawing;Color;Equals;(System.Drawing.Color);summary;df-generated |
 | System.Drawing;Color;Equals;(System.Object);summary;df-generated |
 | System.Drawing;Color;FromArgb;(System.Int32);summary;df-generated |
@@ -28476,10 +30894,34 @@ neutral
 | System.Drawing;ColorConverter;CanConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Type);summary;df-generated |
 | System.Drawing;ColorConverter;CanConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Type);summary;df-generated |
 | System.Drawing;ColorConverter;GetStandardValuesSupported;(System.ComponentModel.ITypeDescriptorContext);summary;df-generated |
+| System.Drawing;ColorTranslator;FromHtml;(System.String);summary;df-generated |
 | System.Drawing;ColorTranslator;FromOle;(System.Int32);summary;df-generated |
 | System.Drawing;ColorTranslator;FromWin32;(System.Int32);summary;df-generated |
 | System.Drawing;ColorTranslator;ToOle;(System.Drawing.Color);summary;df-generated |
 | System.Drawing;ColorTranslator;ToWin32;(System.Drawing.Color);summary;df-generated |
+| System.Drawing;Font;Dispose;();summary;df-generated |
+| System.Drawing;FontConverter+FontNameConverter;CanConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Type);summary;df-generated |
+| System.Drawing;FontConverter+FontNameConverter;Dispose;();summary;df-generated |
+| System.Drawing;FontConverter+FontNameConverter;GetStandardValuesExclusive;(System.ComponentModel.ITypeDescriptorContext);summary;df-generated |
+| System.Drawing;FontConverter+FontNameConverter;GetStandardValuesSupported;(System.ComponentModel.ITypeDescriptorContext);summary;df-generated |
+| System.Drawing;FontConverter;CanConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Type);summary;df-generated |
+| System.Drawing;FontConverter;CanConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Type);summary;df-generated |
+| System.Drawing;FontConverter;CreateInstance;(System.ComponentModel.ITypeDescriptorContext,System.Collections.IDictionary);summary;df-generated |
+| System.Drawing;FontConverter;GetCreateInstanceSupported;(System.ComponentModel.ITypeDescriptorContext);summary;df-generated |
+| System.Drawing;FontConverter;GetPropertiesSupported;(System.ComponentModel.ITypeDescriptorContext);summary;df-generated |
+| System.Drawing;FontFamily;Dispose;();summary;df-generated |
+| System.Drawing;Graphics;Dispose;();summary;df-generated |
+| System.Drawing;Icon;Dispose;();summary;df-generated |
+| System.Drawing;IconConverter;CanConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Type);summary;df-generated |
+| System.Drawing;IconConverter;CanConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Type);summary;df-generated |
+| System.Drawing;Image;Dispose;();summary;df-generated |
+| System.Drawing;ImageConverter;CanConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Type);summary;df-generated |
+| System.Drawing;ImageConverter;CanConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Type);summary;df-generated |
+| System.Drawing;ImageConverter;GetPropertiesSupported;(System.ComponentModel.ITypeDescriptorContext);summary;df-generated |
+| System.Drawing;ImageFormatConverter;CanConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Type);summary;df-generated |
+| System.Drawing;ImageFormatConverter;CanConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Type);summary;df-generated |
+| System.Drawing;ImageFormatConverter;GetStandardValuesSupported;(System.ComponentModel.ITypeDescriptorContext);summary;df-generated |
+| System.Drawing;Pen;Dispose;();summary;df-generated |
 | System.Drawing;Point;Add;(System.Drawing.Point,System.Drawing.Size);summary;df-generated |
 | System.Drawing;Point;Ceiling;(System.Drawing.PointF);summary;df-generated |
 | System.Drawing;Point;Equals;(System.Drawing.Point);summary;df-generated |
@@ -28582,6 +31024,7 @@ neutral
 | System.Drawing;RectangleF;get_Top;();summary;df-generated |
 | System.Drawing;RectangleF;op_Equality;(System.Drawing.RectangleF,System.Drawing.RectangleF);summary;df-generated |
 | System.Drawing;RectangleF;op_Inequality;(System.Drawing.RectangleF,System.Drawing.RectangleF);summary;df-generated |
+| System.Drawing;Region;Dispose;();summary;df-generated |
 | System.Drawing;Size;Add;(System.Drawing.Size,System.Drawing.Size);summary;df-generated |
 | System.Drawing;Size;Ceiling;(System.Drawing.SizeF);summary;df-generated |
 | System.Drawing;Size;Equals;(System.Drawing.Size);summary;df-generated |
@@ -28635,6 +31078,7 @@ neutral
 | System.Drawing;SizeFConverter;CreateInstance;(System.ComponentModel.ITypeDescriptorContext,System.Collections.IDictionary);summary;df-generated |
 | System.Drawing;SizeFConverter;GetCreateInstanceSupported;(System.ComponentModel.ITypeDescriptorContext);summary;df-generated |
 | System.Drawing;SizeFConverter;GetPropertiesSupported;(System.ComponentModel.ITypeDescriptorContext);summary;df-generated |
+| System.Drawing;StringFormat;Dispose;();summary;df-generated |
 | System.Drawing;SystemColors;get_ActiveBorder;();summary;df-generated |
 | System.Drawing;SystemColors;get_ActiveCaption;();summary;df-generated |
 | System.Drawing;SystemColors;get_ActiveCaptionText;();summary;df-generated |
@@ -28668,6 +31112,8 @@ neutral
 | System.Drawing;SystemColors;get_Window;();summary;df-generated |
 | System.Drawing;SystemColors;get_WindowFrame;();summary;df-generated |
 | System.Drawing;SystemColors;get_WindowText;();summary;df-generated |
+| System.Drawing;ToolboxBitmapAttribute;Equals;(System.Object);summary;df-generated |
+| System.Drawing;ToolboxBitmapAttribute;GetHashCode;();summary;df-generated |
 | System.Dynamic;BinaryOperationBinder;BinaryOperationBinder;(System.Linq.Expressions.ExpressionType);summary;df-generated |
 | System.Dynamic;BinaryOperationBinder;Bind;(System.Dynamic.DynamicMetaObject,System.Dynamic.DynamicMetaObject[]);summary;df-generated |
 | System.Dynamic;BinaryOperationBinder;FallbackBinaryOperation;(System.Dynamic.DynamicMetaObject,System.Dynamic.DynamicMetaObject);summary;df-generated |
@@ -28748,8 +31194,11 @@ neutral
 | System.Dynamic;ExpandoObject;GetMetaObject;(System.Linq.Expressions.Expression);summary;df-generated |
 | System.Dynamic;ExpandoObject;Remove;(System.Collections.Generic.KeyValuePair<System.String,System.Object>);summary;df-generated |
 | System.Dynamic;ExpandoObject;Remove;(System.String);summary;df-generated |
+| System.Dynamic;ExpandoObject;TryGetValue;(System.String,System.Object);summary;df-generated |
+| System.Dynamic;ExpandoObject;add_PropertyChanged;(System.ComponentModel.PropertyChangedEventHandler);summary;df-generated |
 | System.Dynamic;ExpandoObject;get_Count;();summary;df-generated |
 | System.Dynamic;ExpandoObject;get_IsReadOnly;();summary;df-generated |
+| System.Dynamic;ExpandoObject;remove_PropertyChanged;(System.ComponentModel.PropertyChangedEventHandler);summary;df-generated |
 | System.Dynamic;GetIndexBinder;Bind;(System.Dynamic.DynamicMetaObject,System.Dynamic.DynamicMetaObject[]);summary;df-generated |
 | System.Dynamic;GetIndexBinder;FallbackGetIndex;(System.Dynamic.DynamicMetaObject,System.Dynamic.DynamicMetaObject[]);summary;df-generated |
 | System.Dynamic;GetIndexBinder;GetIndexBinder;(System.Dynamic.CallInfo);summary;df-generated |
@@ -28835,24 +31284,36 @@ neutral
 | System.Formats.Asn1;AsnDecoder;TryReadInt64;(System.ReadOnlySpan<System.Byte>,System.Formats.Asn1.AsnEncodingRules,System.Int64,System.Int32,System.Nullable<System.Formats.Asn1.Asn1Tag>);summary;df-generated |
 | System.Formats.Asn1;AsnDecoder;TryReadUInt32;(System.ReadOnlySpan<System.Byte>,System.Formats.Asn1.AsnEncodingRules,System.UInt32,System.Int32,System.Nullable<System.Formats.Asn1.Asn1Tag>);summary;df-generated |
 | System.Formats.Asn1;AsnDecoder;TryReadUInt64;(System.ReadOnlySpan<System.Byte>,System.Formats.Asn1.AsnEncodingRules,System.UInt64,System.Int32,System.Nullable<System.Formats.Asn1.Asn1Tag>);summary;df-generated |
+| System.Formats.Asn1;AsnReader;Clone;();summary;df-generated |
+| System.Formats.Asn1;AsnReader;PeekContentBytes;();summary;df-generated |
+| System.Formats.Asn1;AsnReader;PeekEncodedValue;();summary;df-generated |
 | System.Formats.Asn1;AsnReader;PeekTag;();summary;df-generated |
 | System.Formats.Asn1;AsnReader;ReadBoolean;(System.Nullable<System.Formats.Asn1.Asn1Tag>);summary;df-generated |
 | System.Formats.Asn1;AsnReader;ReadCharacterString;(System.Formats.Asn1.UniversalTagNumber,System.Nullable<System.Formats.Asn1.Asn1Tag>);summary;df-generated |
+| System.Formats.Asn1;AsnReader;ReadEncodedValue;();summary;df-generated |
+| System.Formats.Asn1;AsnReader;ReadEnumeratedBytes;(System.Nullable<System.Formats.Asn1.Asn1Tag>);summary;df-generated |
 | System.Formats.Asn1;AsnReader;ReadEnumeratedValue;(System.Type,System.Nullable<System.Formats.Asn1.Asn1Tag>);summary;df-generated |
 | System.Formats.Asn1;AsnReader;ReadEnumeratedValue<TEnum>;(System.Nullable<System.Formats.Asn1.Asn1Tag>);summary;df-generated |
 | System.Formats.Asn1;AsnReader;ReadGeneralizedTime;(System.Nullable<System.Formats.Asn1.Asn1Tag>);summary;df-generated |
 | System.Formats.Asn1;AsnReader;ReadInteger;(System.Nullable<System.Formats.Asn1.Asn1Tag>);summary;df-generated |
+| System.Formats.Asn1;AsnReader;ReadIntegerBytes;(System.Nullable<System.Formats.Asn1.Asn1Tag>);summary;df-generated |
 | System.Formats.Asn1;AsnReader;ReadNamedBitList;(System.Nullable<System.Formats.Asn1.Asn1Tag>);summary;df-generated |
 | System.Formats.Asn1;AsnReader;ReadNamedBitListValue;(System.Type,System.Nullable<System.Formats.Asn1.Asn1Tag>);summary;df-generated |
 | System.Formats.Asn1;AsnReader;ReadNamedBitListValue<TFlagsEnum>;(System.Nullable<System.Formats.Asn1.Asn1Tag>);summary;df-generated |
 | System.Formats.Asn1;AsnReader;ReadNull;(System.Nullable<System.Formats.Asn1.Asn1Tag>);summary;df-generated |
 | System.Formats.Asn1;AsnReader;ReadObjectIdentifier;(System.Nullable<System.Formats.Asn1.Asn1Tag>);summary;df-generated |
+| System.Formats.Asn1;AsnReader;ReadSequence;(System.Nullable<System.Formats.Asn1.Asn1Tag>);summary;df-generated |
+| System.Formats.Asn1;AsnReader;ReadSetOf;(System.Boolean,System.Nullable<System.Formats.Asn1.Asn1Tag>);summary;df-generated |
+| System.Formats.Asn1;AsnReader;ReadSetOf;(System.Nullable<System.Formats.Asn1.Asn1Tag>);summary;df-generated |
 | System.Formats.Asn1;AsnReader;ReadUtcTime;(System.Int32,System.Nullable<System.Formats.Asn1.Asn1Tag>);summary;df-generated |
 | System.Formats.Asn1;AsnReader;ReadUtcTime;(System.Nullable<System.Formats.Asn1.Asn1Tag>);summary;df-generated |
 | System.Formats.Asn1;AsnReader;ThrowIfNotEmpty;();summary;df-generated |
 | System.Formats.Asn1;AsnReader;TryReadCharacterString;(System.Span<System.Char>,System.Formats.Asn1.UniversalTagNumber,System.Int32,System.Nullable<System.Formats.Asn1.Asn1Tag>);summary;df-generated |
 | System.Formats.Asn1;AsnReader;TryReadInt32;(System.Int32,System.Nullable<System.Formats.Asn1.Asn1Tag>);summary;df-generated |
 | System.Formats.Asn1;AsnReader;TryReadInt64;(System.Int64,System.Nullable<System.Formats.Asn1.Asn1Tag>);summary;df-generated |
+| System.Formats.Asn1;AsnReader;TryReadPrimitiveBitString;(System.Int32,System.ReadOnlyMemory<System.Byte>,System.Nullable<System.Formats.Asn1.Asn1Tag>);summary;df-generated |
+| System.Formats.Asn1;AsnReader;TryReadPrimitiveCharacterStringBytes;(System.Formats.Asn1.Asn1Tag,System.ReadOnlyMemory<System.Byte>);summary;df-generated |
+| System.Formats.Asn1;AsnReader;TryReadPrimitiveOctetString;(System.ReadOnlyMemory<System.Byte>,System.Nullable<System.Formats.Asn1.Asn1Tag>);summary;df-generated |
 | System.Formats.Asn1;AsnReader;TryReadUInt32;(System.UInt32,System.Nullable<System.Formats.Asn1.Asn1Tag>);summary;df-generated |
 | System.Formats.Asn1;AsnReader;TryReadUInt64;(System.UInt64,System.Nullable<System.Formats.Asn1.Asn1Tag>);summary;df-generated |
 | System.Formats.Asn1;AsnReader;get_HasData;();summary;df-generated |
@@ -28861,6 +31322,8 @@ neutral
 | System.Formats.Asn1;AsnWriter;AsnWriter;(System.Formats.Asn1.AsnEncodingRules);summary;df-generated |
 | System.Formats.Asn1;AsnWriter;AsnWriter;(System.Formats.Asn1.AsnEncodingRules,System.Int32);summary;df-generated |
 | System.Formats.Asn1;AsnWriter;CopyTo;(System.Formats.Asn1.AsnWriter);summary;df-generated |
+| System.Formats.Asn1;AsnWriter;Encode;();summary;df-generated |
+| System.Formats.Asn1;AsnWriter;Encode;(System.Span<System.Byte>);summary;df-generated |
 | System.Formats.Asn1;AsnWriter;EncodedValueEquals;(System.Formats.Asn1.AsnWriter);summary;df-generated |
 | System.Formats.Asn1;AsnWriter;EncodedValueEquals;(System.ReadOnlySpan<System.Byte>);summary;df-generated |
 | System.Formats.Asn1;AsnWriter;GetEncodedLength;();summary;df-generated |
@@ -28868,6 +31331,7 @@ neutral
 | System.Formats.Asn1;AsnWriter;PopSequence;(System.Nullable<System.Formats.Asn1.Asn1Tag>);summary;df-generated |
 | System.Formats.Asn1;AsnWriter;PopSetOf;(System.Nullable<System.Formats.Asn1.Asn1Tag>);summary;df-generated |
 | System.Formats.Asn1;AsnWriter;Reset;();summary;df-generated |
+| System.Formats.Asn1;AsnWriter;TryEncode;(System.Span<System.Byte>,System.Int32);summary;df-generated |
 | System.Formats.Asn1;AsnWriter;WriteBitString;(System.ReadOnlySpan<System.Byte>,System.Int32,System.Nullable<System.Formats.Asn1.Asn1Tag>);summary;df-generated |
 | System.Formats.Asn1;AsnWriter;WriteBoolean;(System.Boolean,System.Nullable<System.Formats.Asn1.Asn1Tag>);summary;df-generated |
 | System.Formats.Asn1;AsnWriter;WriteCharacterString;(System.Formats.Asn1.UniversalTagNumber,System.ReadOnlySpan<System.Char>,System.Nullable<System.Formats.Asn1.Asn1Tag>);summary;df-generated |
@@ -28898,14 +31362,19 @@ neutral
 | System.Formats.Tar;PaxTarEntry;PaxTarEntry;(System.Formats.Tar.TarEntryType,System.String,System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<System.String,System.String>>);summary;df-generated |
 | System.Formats.Tar;PaxTarEntry;get_ExtendedAttributes;();summary;df-generated |
 | System.Formats.Tar;TarEntry;ExtractToFile;(System.String,System.Boolean);summary;df-generated |
+| System.Formats.Tar;TarEntry;ExtractToFileAsync;(System.String,System.Boolean,System.Threading.CancellationToken);summary;df-generated |
 | System.Formats.Tar;TarEntry;get_Checksum;();summary;df-generated |
 | System.Formats.Tar;TarEntry;get_EntryType;();summary;df-generated |
 | System.Formats.Tar;TarEntry;get_Format;();summary;df-generated |
 | System.Formats.Tar;TarEntry;get_Length;();summary;df-generated |
 | System.Formats.Tar;TarFile;CreateFromDirectory;(System.String,System.IO.Stream,System.Boolean);summary;df-generated |
 | System.Formats.Tar;TarFile;CreateFromDirectory;(System.String,System.String,System.Boolean);summary;df-generated |
+| System.Formats.Tar;TarFile;CreateFromDirectoryAsync;(System.String,System.IO.Stream,System.Boolean,System.Threading.CancellationToken);summary;df-generated |
+| System.Formats.Tar;TarFile;CreateFromDirectoryAsync;(System.String,System.String,System.Boolean,System.Threading.CancellationToken);summary;df-generated |
 | System.Formats.Tar;TarFile;ExtractToDirectory;(System.IO.Stream,System.String,System.Boolean);summary;df-generated |
 | System.Formats.Tar;TarFile;ExtractToDirectory;(System.String,System.String,System.Boolean);summary;df-generated |
+| System.Formats.Tar;TarFile;ExtractToDirectoryAsync;(System.IO.Stream,System.String,System.Boolean,System.Threading.CancellationToken);summary;df-generated |
+| System.Formats.Tar;TarFile;ExtractToDirectoryAsync;(System.String,System.String,System.Boolean,System.Threading.CancellationToken);summary;df-generated |
 | System.Formats.Tar;TarReader;Dispose;();summary;df-generated |
 | System.Formats.Tar;TarReader;GetNextEntry;(System.Boolean);summary;df-generated |
 | System.Formats.Tar;TarReader;GetNextEntryAsync;(System.Boolean,System.Threading.CancellationToken);summary;df-generated |
@@ -29463,6 +31932,11 @@ neutral
 | System.IO.Compression;ZipFile;ExtractToDirectory;(System.String,System.String,System.Boolean);summary;df-generated |
 | System.IO.Compression;ZipFile;ExtractToDirectory;(System.String,System.String,System.Text.Encoding);summary;df-generated |
 | System.IO.Compression;ZipFile;ExtractToDirectory;(System.String,System.String,System.Text.Encoding,System.Boolean);summary;df-generated |
+| System.IO.Compression;ZipFile;Open;(System.String,System.IO.Compression.ZipArchiveMode);summary;df-generated |
+| System.IO.Compression;ZipFile;Open;(System.String,System.IO.Compression.ZipArchiveMode,System.Text.Encoding);summary;df-generated |
+| System.IO.Compression;ZipFile;OpenRead;(System.String);summary;df-generated |
+| System.IO.Compression;ZipFileExtensions;CreateEntryFromFile;(System.IO.Compression.ZipArchive,System.String,System.String);summary;df-generated |
+| System.IO.Compression;ZipFileExtensions;CreateEntryFromFile;(System.IO.Compression.ZipArchive,System.String,System.String,System.IO.Compression.CompressionLevel);summary;df-generated |
 | System.IO.Compression;ZipFileExtensions;ExtractToDirectory;(System.IO.Compression.ZipArchive,System.String);summary;df-generated |
 | System.IO.Compression;ZipFileExtensions;ExtractToDirectory;(System.IO.Compression.ZipArchive,System.String,System.Boolean);summary;df-generated |
 | System.IO.Compression;ZipFileExtensions;ExtractToFile;(System.IO.Compression.ZipArchiveEntry,System.String);summary;df-generated |
@@ -29475,6 +31949,7 @@ neutral
 | System.IO.Enumeration;FileSystemEntry;get_LastAccessTimeUtc;();summary;df-generated |
 | System.IO.Enumeration;FileSystemEntry;get_LastWriteTimeUtc;();summary;df-generated |
 | System.IO.Enumeration;FileSystemEntry;get_Length;();summary;df-generated |
+| System.IO.Enumeration;FileSystemEnumerable<TResult>;FileSystemEnumerable;(System.String,System.IO.Enumeration.FileSystemEnumerable<TResult>+FindTransform,System.IO.EnumerationOptions);summary;df-generated |
 | System.IO.Enumeration;FileSystemEnumerator<TResult>;ContinueOnError;(System.Int32);summary;df-generated |
 | System.IO.Enumeration;FileSystemEnumerator<TResult>;Dispose;();summary;df-generated |
 | System.IO.Enumeration;FileSystemEnumerator<TResult>;Dispose;(System.Boolean);summary;df-generated |
@@ -29482,9 +31957,8 @@ neutral
 | System.IO.Enumeration;FileSystemEnumerator<TResult>;MoveNext;();summary;df-generated |
 | System.IO.Enumeration;FileSystemEnumerator<TResult>;OnDirectoryFinished;(System.ReadOnlySpan<System.Char>);summary;df-generated |
 | System.IO.Enumeration;FileSystemEnumerator<TResult>;Reset;();summary;df-generated |
-| System.IO.Enumeration;FileSystemEnumerator<TResult>;ShouldIncludeEntry;(System.IO.Enumeration.FileSystemEntry);summary;df-generated |
-| System.IO.Enumeration;FileSystemEnumerator<TResult>;ShouldRecurseIntoEntry;(System.IO.Enumeration.FileSystemEntry);summary;df-generated |
 | System.IO.Enumeration;FileSystemEnumerator<TResult>;TransformEntry;(System.IO.Enumeration.FileSystemEntry);summary;df-generated |
+| System.IO.Enumeration;FileSystemEnumerator<TResult>;get_Current;();summary;df-generated |
 | System.IO.Enumeration;FileSystemName;MatchesSimpleExpression;(System.ReadOnlySpan<System.Char>,System.ReadOnlySpan<System.Char>,System.Boolean);summary;df-generated |
 | System.IO.Enumeration;FileSystemName;MatchesWin32Expression;(System.ReadOnlySpan<System.Char>,System.ReadOnlySpan<System.Char>,System.Boolean);summary;df-generated |
 | System.IO.IsolatedStorage;INormalizeForIsolatedStorage;Normalize;();summary;df-generated |
@@ -29568,6 +32042,11 @@ neutral
 | System.IO.IsolatedStorage;IsolatedStorageFileStream;get_CanWrite;();summary;df-generated |
 | System.IO.IsolatedStorage;IsolatedStorageFileStream;get_IsAsync;();summary;df-generated |
 | System.IO.IsolatedStorage;IsolatedStorageFileStream;get_Length;();summary;df-generated |
+| System.IO.MemoryMappedFiles;MemoryMappedFile;CreateFromFile;(System.String);summary;df-generated |
+| System.IO.MemoryMappedFiles;MemoryMappedFile;CreateFromFile;(System.String,System.IO.FileMode);summary;df-generated |
+| System.IO.MemoryMappedFiles;MemoryMappedFile;CreateFromFile;(System.String,System.IO.FileMode,System.String);summary;df-generated |
+| System.IO.MemoryMappedFiles;MemoryMappedFile;CreateFromFile;(System.String,System.IO.FileMode,System.String,System.Int64);summary;df-generated |
+| System.IO.MemoryMappedFiles;MemoryMappedFile;CreateFromFile;(System.String,System.IO.FileMode,System.String,System.Int64,System.IO.MemoryMappedFiles.MemoryMappedFileAccess);summary;df-generated |
 | System.IO.MemoryMappedFiles;MemoryMappedFile;CreateNew;(System.String,System.Int64);summary;df-generated |
 | System.IO.MemoryMappedFiles;MemoryMappedFile;CreateNew;(System.String,System.Int64,System.IO.MemoryMappedFiles.MemoryMappedFileAccess);summary;df-generated |
 | System.IO.MemoryMappedFiles;MemoryMappedFile;CreateNew;(System.String,System.Int64,System.IO.MemoryMappedFiles.MemoryMappedFileAccess,System.IO.MemoryMappedFiles.MemoryMappedFileOptions,System.IO.HandleInheritability);summary;df-generated |
@@ -29607,8 +32086,17 @@ neutral
 | System.IO.Pipelines;PipeOptions;get_ResumeWriterThreshold;();summary;df-generated |
 | System.IO.Pipelines;PipeOptions;get_UseSynchronizationContext;();summary;df-generated |
 | System.IO.Pipelines;PipeOptions;get_WriterScheduler;();summary;df-generated |
+| System.IO.Pipelines;PipeReader;AdvanceTo;(System.SequencePosition);summary;df-generated |
+| System.IO.Pipelines;PipeReader;AdvanceTo;(System.SequencePosition,System.SequencePosition);summary;df-generated |
 | System.IO.Pipelines;PipeReader;CancelPendingRead;();summary;df-generated |
 | System.IO.Pipelines;PipeReader;Complete;(System.Exception);summary;df-generated |
+| System.IO.Pipelines;PipeReader;CompleteAsync;(System.Exception);summary;df-generated |
+| System.IO.Pipelines;PipeReader;CopyToAsync;(System.IO.Pipelines.PipeWriter,System.Threading.CancellationToken);summary;df-generated |
+| System.IO.Pipelines;PipeReader;OnWriterCompleted;(System.Action<System.Exception,System.Object>,System.Object);summary;df-generated |
+| System.IO.Pipelines;PipeReader;ReadAsync;(System.Threading.CancellationToken);summary;df-generated |
+| System.IO.Pipelines;PipeReader;ReadAtLeastAsync;(System.Int32,System.Threading.CancellationToken);summary;df-generated |
+| System.IO.Pipelines;PipeReader;ReadAtLeastAsyncCore;(System.Int32,System.Threading.CancellationToken);summary;df-generated |
+| System.IO.Pipelines;PipeReader;TryRead;(System.IO.Pipelines.ReadResult);summary;df-generated |
 | System.IO.Pipelines;PipeScheduler;get_Inline;();summary;df-generated |
 | System.IO.Pipelines;PipeScheduler;get_ThreadPool;();summary;df-generated |
 | System.IO.Pipelines;PipeWriter;Advance;(System.Int32);summary;df-generated |
@@ -29616,10 +32104,16 @@ neutral
 | System.IO.Pipelines;PipeWriter;Complete;(System.Exception);summary;df-generated |
 | System.IO.Pipelines;PipeWriter;CompleteAsync;(System.Exception);summary;df-generated |
 | System.IO.Pipelines;PipeWriter;CopyFromAsync;(System.IO.Stream,System.Threading.CancellationToken);summary;df-generated |
+| System.IO.Pipelines;PipeWriter;FlushAsync;(System.Threading.CancellationToken);summary;df-generated |
+| System.IO.Pipelines;PipeWriter;GetMemory;(System.Int32);summary;df-generated |
+| System.IO.Pipelines;PipeWriter;GetSpan;(System.Int32);summary;df-generated |
+| System.IO.Pipelines;PipeWriter;OnReaderCompleted;(System.Action<System.Exception,System.Object>,System.Object);summary;df-generated |
+| System.IO.Pipelines;PipeWriter;WriteAsync;(System.ReadOnlyMemory<System.Byte>,System.Threading.CancellationToken);summary;df-generated |
 | System.IO.Pipelines;PipeWriter;get_CanGetUnflushedBytes;();summary;df-generated |
 | System.IO.Pipelines;PipeWriter;get_UnflushedBytes;();summary;df-generated |
 | System.IO.Pipelines;ReadResult;get_IsCanceled;();summary;df-generated |
 | System.IO.Pipelines;ReadResult;get_IsCompleted;();summary;df-generated |
+| System.IO.Pipelines;StreamPipeExtensions;CopyToAsync;(System.IO.Stream,System.IO.Pipelines.PipeWriter,System.Threading.CancellationToken);summary;df-generated |
 | System.IO.Pipelines;StreamPipeReaderOptions;StreamPipeReaderOptions;(System.Buffers.MemoryPool<System.Byte>,System.Int32,System.Int32,System.Boolean);summary;df-generated |
 | System.IO.Pipelines;StreamPipeReaderOptions;StreamPipeReaderOptions;(System.Buffers.MemoryPool<System.Byte>,System.Int32,System.Int32,System.Boolean,System.Boolean);summary;df-generated |
 | System.IO.Pipelines;StreamPipeReaderOptions;get_BufferSize;();summary;df-generated |
@@ -29646,12 +32140,18 @@ neutral
 | System.IO.Pipes;NamedPipeClientStream;Connect;();summary;df-generated |
 | System.IO.Pipes;NamedPipeClientStream;Connect;(System.Int32);summary;df-generated |
 | System.IO.Pipes;NamedPipeClientStream;Connect;(System.TimeSpan);summary;df-generated |
+| System.IO.Pipes;NamedPipeClientStream;ConnectAsync;();summary;df-generated |
+| System.IO.Pipes;NamedPipeClientStream;ConnectAsync;(System.Int32);summary;df-generated |
+| System.IO.Pipes;NamedPipeClientStream;ConnectAsync;(System.Int32,System.Threading.CancellationToken);summary;df-generated |
+| System.IO.Pipes;NamedPipeClientStream;ConnectAsync;(System.Threading.CancellationToken);summary;df-generated |
+| System.IO.Pipes;NamedPipeClientStream;ConnectAsync;(System.TimeSpan,System.Threading.CancellationToken);summary;df-generated |
 | System.IO.Pipes;NamedPipeClientStream;NamedPipeClientStream;(System.String);summary;df-generated |
 | System.IO.Pipes;NamedPipeClientStream;NamedPipeClientStream;(System.String,System.String);summary;df-generated |
 | System.IO.Pipes;NamedPipeClientStream;NamedPipeClientStream;(System.String,System.String,System.IO.Pipes.PipeDirection);summary;df-generated |
 | System.IO.Pipes;NamedPipeClientStream;NamedPipeClientStream;(System.String,System.String,System.IO.Pipes.PipeDirection,System.IO.Pipes.PipeOptions);summary;df-generated |
 | System.IO.Pipes;NamedPipeClientStream;NamedPipeClientStream;(System.String,System.String,System.IO.Pipes.PipeDirection,System.IO.Pipes.PipeOptions,System.Security.Principal.TokenImpersonationLevel);summary;df-generated |
 | System.IO.Pipes;NamedPipeClientStream;get_NumberOfServerInstances;();summary;df-generated |
+| System.IO.Pipes;NamedPipeServerStream;BeginWaitForConnection;(System.AsyncCallback,System.Object);summary;df-generated |
 | System.IO.Pipes;NamedPipeServerStream;Disconnect;();summary;df-generated |
 | System.IO.Pipes;NamedPipeServerStream;EndWaitForConnection;(System.IAsyncResult);summary;df-generated |
 | System.IO.Pipes;NamedPipeServerStream;GetImpersonationUserName;();summary;df-generated |
@@ -29661,8 +32161,10 @@ neutral
 | System.IO.Pipes;NamedPipeServerStream;NamedPipeServerStream;(System.String,System.IO.Pipes.PipeDirection,System.Int32,System.IO.Pipes.PipeTransmissionMode);summary;df-generated |
 | System.IO.Pipes;NamedPipeServerStream;NamedPipeServerStream;(System.String,System.IO.Pipes.PipeDirection,System.Int32,System.IO.Pipes.PipeTransmissionMode,System.IO.Pipes.PipeOptions);summary;df-generated |
 | System.IO.Pipes;NamedPipeServerStream;NamedPipeServerStream;(System.String,System.IO.Pipes.PipeDirection,System.Int32,System.IO.Pipes.PipeTransmissionMode,System.IO.Pipes.PipeOptions,System.Int32,System.Int32);summary;df-generated |
+| System.IO.Pipes;NamedPipeServerStream;RunAsClient;(System.IO.Pipes.PipeStreamImpersonationWorker);summary;df-generated |
 | System.IO.Pipes;NamedPipeServerStream;WaitForConnection;();summary;df-generated |
 | System.IO.Pipes;NamedPipeServerStream;WaitForConnectionAsync;();summary;df-generated |
+| System.IO.Pipes;NamedPipeServerStream;WaitForConnectionAsync;(System.Threading.CancellationToken);summary;df-generated |
 | System.IO.Pipes;NamedPipeServerStreamAcl;Create;(System.String,System.IO.Pipes.PipeDirection,System.Int32,System.IO.Pipes.PipeTransmissionMode,System.IO.Pipes.PipeOptions,System.Int32,System.Int32,System.IO.Pipes.PipeSecurity,System.IO.HandleInheritability,System.IO.Pipes.PipeAccessRights);summary;df-generated |
 | System.IO.Pipes;PipeAccessRule;PipeAccessRule;(System.Security.Principal.IdentityReference,System.IO.Pipes.PipeAccessRights,System.Security.AccessControl.AccessControlType);summary;df-generated |
 | System.IO.Pipes;PipeAccessRule;PipeAccessRule;(System.String,System.IO.Pipes.PipeAccessRights,System.Security.AccessControl.AccessControlType);summary;df-generated |
@@ -29855,6 +32357,7 @@ neutral
 | System.IO;DriveInfo;get_DriveFormat;();summary;df-generated |
 | System.IO;DriveInfo;get_DriveType;();summary;df-generated |
 | System.IO;DriveInfo;get_IsReady;();summary;df-generated |
+| System.IO;DriveInfo;get_RootDirectory;();summary;df-generated |
 | System.IO;DriveInfo;get_TotalFreeSpace;();summary;df-generated |
 | System.IO;DriveInfo;get_TotalSize;();summary;df-generated |
 | System.IO;DriveNotFoundException;DriveNotFoundException;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);summary;df-generated |
@@ -29959,13 +32462,9 @@ neutral
 | System.IO;FileStream;EndRead;(System.IAsyncResult);summary;df-generated |
 | System.IO;FileStream;EndWrite;(System.IAsyncResult);summary;df-generated |
 | System.IO;FileStream;FileStream;(Microsoft.Win32.SafeHandles.SafeFileHandle,System.IO.FileAccess);summary;df-generated |
-| System.IO;FileStream;FileStream;(Microsoft.Win32.SafeHandles.SafeFileHandle,System.IO.FileAccess,System.Int32);summary;df-generated |
-| System.IO;FileStream;FileStream;(Microsoft.Win32.SafeHandles.SafeFileHandle,System.IO.FileAccess,System.Int32,System.Boolean);summary;df-generated |
 | System.IO;FileStream;FileStream;(System.IntPtr,System.IO.FileAccess);summary;df-generated |
 | System.IO;FileStream;FileStream;(System.IntPtr,System.IO.FileAccess,System.Boolean);summary;df-generated |
 | System.IO;FileStream;FileStream;(System.IntPtr,System.IO.FileAccess,System.Boolean,System.Int32);summary;df-generated |
-| System.IO;FileStream;FileStream;(System.IntPtr,System.IO.FileAccess,System.Boolean,System.Int32,System.Boolean);summary;df-generated |
-| System.IO;FileStream;FileStream;(System.String,System.IO.FileStreamOptions);summary;df-generated |
 | System.IO;FileStream;Flush;();summary;df-generated |
 | System.IO;FileStream;Flush;(System.Boolean);summary;df-generated |
 | System.IO;FileStream;Lock;(System.Int64,System.Int64);summary;df-generated |
@@ -30001,14 +32500,21 @@ neutral
 | System.IO;FileSystemWatcher;BeginInit;();summary;df-generated |
 | System.IO;FileSystemWatcher;Dispose;(System.Boolean);summary;df-generated |
 | System.IO;FileSystemWatcher;EndInit;();summary;df-generated |
-| System.IO;FileSystemWatcher;OnChanged;(System.IO.FileSystemEventArgs);summary;df-generated |
-| System.IO;FileSystemWatcher;OnCreated;(System.IO.FileSystemEventArgs);summary;df-generated |
-| System.IO;FileSystemWatcher;OnDeleted;(System.IO.FileSystemEventArgs);summary;df-generated |
 | System.IO;FileSystemWatcher;OnError;(System.IO.ErrorEventArgs);summary;df-generated |
 | System.IO;FileSystemWatcher;OnRenamed;(System.IO.RenamedEventArgs);summary;df-generated |
 | System.IO;FileSystemWatcher;WaitForChanged;(System.IO.WatcherChangeTypes);summary;df-generated |
 | System.IO;FileSystemWatcher;WaitForChanged;(System.IO.WatcherChangeTypes,System.Int32);summary;df-generated |
 | System.IO;FileSystemWatcher;WaitForChanged;(System.IO.WatcherChangeTypes,System.TimeSpan);summary;df-generated |
+| System.IO;FileSystemWatcher;add_Changed;(System.IO.FileSystemEventHandler);summary;df-generated |
+| System.IO;FileSystemWatcher;add_Created;(System.IO.FileSystemEventHandler);summary;df-generated |
+| System.IO;FileSystemWatcher;add_Deleted;(System.IO.FileSystemEventHandler);summary;df-generated |
+| System.IO;FileSystemWatcher;add_Error;(System.IO.ErrorEventHandler);summary;df-generated |
+| System.IO;FileSystemWatcher;add_Renamed;(System.IO.RenamedEventHandler);summary;df-generated |
+| System.IO;FileSystemWatcher;remove_Changed;(System.IO.FileSystemEventHandler);summary;df-generated |
+| System.IO;FileSystemWatcher;remove_Created;(System.IO.FileSystemEventHandler);summary;df-generated |
+| System.IO;FileSystemWatcher;remove_Deleted;(System.IO.FileSystemEventHandler);summary;df-generated |
+| System.IO;FileSystemWatcher;remove_Error;(System.IO.ErrorEventHandler);summary;df-generated |
+| System.IO;FileSystemWatcher;remove_Renamed;(System.IO.RenamedEventHandler);summary;df-generated |
 | System.IO;IOException;IOException;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);summary;df-generated |
 | System.IO;IOException;IOException;(System.String);summary;df-generated |
 | System.IO;IOException;IOException;(System.String,System.Exception);summary;df-generated |
@@ -30168,7 +32674,6 @@ neutral
 | System.IO;UnmanagedMemoryAccessor;Write;(System.Int64,System.UInt16);summary;df-generated |
 | System.IO;UnmanagedMemoryAccessor;Write;(System.Int64,System.UInt32);summary;df-generated |
 | System.IO;UnmanagedMemoryAccessor;Write;(System.Int64,System.UInt64);summary;df-generated |
-| System.IO;UnmanagedMemoryAccessor;Write<T>;(System.Int64,T);summary;df-generated |
 | System.IO;UnmanagedMemoryAccessor;WriteArray<T>;(System.Int64,T[],System.Int32,System.Int32);summary;df-generated |
 | System.IO;UnmanagedMemoryAccessor;get_CanRead;();summary;df-generated |
 | System.IO;UnmanagedMemoryAccessor;get_CanWrite;();summary;df-generated |
@@ -30469,7 +32974,6 @@ neutral
 | System.Linq.Expressions;LambdaExpression;Compile;(System.Boolean);summary;df-generated |
 | System.Linq.Expressions;LambdaExpression;Compile;(System.Runtime.CompilerServices.DebugInfoGenerator);summary;df-generated |
 | System.Linq.Expressions;LambdaExpression;get_NodeType;();summary;df-generated |
-| System.Linq.Expressions;LambdaExpression;get_Parameters;();summary;df-generated |
 | System.Linq.Expressions;LambdaExpression;get_ReturnType;();summary;df-generated |
 | System.Linq.Expressions;LambdaExpression;get_TailCall;();summary;df-generated |
 | System.Linq.Expressions;LambdaExpression;get_Type;();summary;df-generated |
@@ -30555,7 +33059,6 @@ neutral
 | System.Linq;Enumerable;Average;(System.Collections.Generic.IEnumerable<System.Nullable<System.Single>>);summary;df-generated |
 | System.Linq;Enumerable;Average;(System.Collections.Generic.IEnumerable<System.Single>);summary;df-generated |
 | System.Linq;Enumerable;Contains<TSource>;(System.Collections.Generic.IEnumerable<TSource>,TSource);summary;df-generated |
-| System.Linq;Enumerable;Contains<TSource>;(System.Collections.Generic.IEnumerable<TSource>,TSource,System.Collections.Generic.IEqualityComparer<TSource>);summary;df-generated |
 | System.Linq;Enumerable;Count<TSource>;(System.Collections.Generic.IEnumerable<TSource>);summary;df-generated |
 | System.Linq;Enumerable;Empty<TResult>;();summary;df-generated |
 | System.Linq;Enumerable;LongCount<TSource>;(System.Collections.Generic.IEnumerable<TSource>);summary;df-generated |
@@ -30565,15 +33068,18 @@ neutral
 | System.Linq;Enumerable;Max;(System.Collections.Generic.IEnumerable<System.Int64>);summary;df-generated |
 | System.Linq;Enumerable;Max;(System.Collections.Generic.IEnumerable<System.Nullable<System.Decimal>>);summary;df-generated |
 | System.Linq;Enumerable;Max;(System.Collections.Generic.IEnumerable<System.Single>);summary;df-generated |
+| System.Linq;Enumerable;MaxBy<TSource,TKey>;(System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,TKey>);summary;df-generated |
+| System.Linq;Enumerable;MaxBy<TSource,TKey>;(System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,TKey>,System.Collections.Generic.IComparer<TKey>);summary;df-generated |
 | System.Linq;Enumerable;Min;(System.Collections.Generic.IEnumerable<System.Decimal>);summary;df-generated |
 | System.Linq;Enumerable;Min;(System.Collections.Generic.IEnumerable<System.Double>);summary;df-generated |
 | System.Linq;Enumerable;Min;(System.Collections.Generic.IEnumerable<System.Int32>);summary;df-generated |
 | System.Linq;Enumerable;Min;(System.Collections.Generic.IEnumerable<System.Int64>);summary;df-generated |
 | System.Linq;Enumerable;Min;(System.Collections.Generic.IEnumerable<System.Nullable<System.Decimal>>);summary;df-generated |
 | System.Linq;Enumerable;Min;(System.Collections.Generic.IEnumerable<System.Single>);summary;df-generated |
+| System.Linq;Enumerable;MinBy<TSource,TKey>;(System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,TKey>);summary;df-generated |
+| System.Linq;Enumerable;MinBy<TSource,TKey>;(System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,TKey>,System.Collections.Generic.IComparer<TKey>);summary;df-generated |
 | System.Linq;Enumerable;Range;(System.Int32,System.Int32);summary;df-generated |
 | System.Linq;Enumerable;SequenceEqual<TSource>;(System.Collections.Generic.IEnumerable<TSource>,System.Collections.Generic.IEnumerable<TSource>);summary;df-generated |
-| System.Linq;Enumerable;SequenceEqual<TSource>;(System.Collections.Generic.IEnumerable<TSource>,System.Collections.Generic.IEnumerable<TSource>,System.Collections.Generic.IEqualityComparer<TSource>);summary;df-generated |
 | System.Linq;Enumerable;Sum;(System.Collections.Generic.IEnumerable<System.Decimal>);summary;df-generated |
 | System.Linq;Enumerable;Sum;(System.Collections.Generic.IEnumerable<System.Double>);summary;df-generated |
 | System.Linq;Enumerable;Sum;(System.Collections.Generic.IEnumerable<System.Int32>);summary;df-generated |
@@ -30584,27 +33090,44 @@ neutral
 | System.Linq;Enumerable;Sum;(System.Collections.Generic.IEnumerable<System.Nullable<System.Int64>>);summary;df-generated |
 | System.Linq;Enumerable;Sum;(System.Collections.Generic.IEnumerable<System.Nullable<System.Single>>);summary;df-generated |
 | System.Linq;Enumerable;Sum;(System.Collections.Generic.IEnumerable<System.Single>);summary;df-generated |
+| System.Linq;Enumerable;ToHashSet<TSource>;(System.Collections.Generic.IEnumerable<TSource>);summary;df-generated |
+| System.Linq;Enumerable;ToHashSet<TSource>;(System.Collections.Generic.IEnumerable<TSource>,System.Collections.Generic.IEqualityComparer<TSource>);summary;df-generated |
 | System.Linq;Enumerable;TryGetNonEnumeratedCount<TSource>;(System.Collections.Generic.IEnumerable<TSource>,System.Int32);summary;df-generated |
 | System.Linq;EnumerableQuery<T>;CreateQuery;(System.Linq.Expressions.Expression);summary;df-generated |
+| System.Linq;EnumerableQuery<T>;CreateQuery<TElement>;(System.Linq.Expressions.Expression);summary;df-generated |
 | System.Linq;EnumerableQuery<T>;Execute;(System.Linq.Expressions.Expression);summary;df-generated |
 | System.Linq;EnumerableQuery<T>;Execute<TElement>;(System.Linq.Expressions.Expression);summary;df-generated |
 | System.Linq;EnumerableQuery<T>;get_ElementType;();summary;df-generated |
+| System.Linq;EnumerableQuery<T>;get_Expression;();summary;df-generated |
 | System.Linq;IGrouping<TKey,TElement>;get_Key;();summary;df-generated |
 | System.Linq;ILookup<TKey,TElement>;Contains;(TKey);summary;df-generated |
 | System.Linq;ILookup<TKey,TElement>;get_Count;();summary;df-generated |
 | System.Linq;ILookup<TKey,TElement>;get_Item;(TKey);summary;df-generated |
+| System.Linq;IOrderedEnumerable<TElement>;CreateOrderedEnumerable<TKey>;(System.Func<TElement,TKey>,System.Collections.Generic.IComparer<TKey>,System.Boolean);summary;df-generated |
 | System.Linq;IQueryProvider;CreateQuery;(System.Linq.Expressions.Expression);summary;df-generated |
+| System.Linq;IQueryProvider;CreateQuery<TElement>;(System.Linq.Expressions.Expression);summary;df-generated |
 | System.Linq;IQueryProvider;Execute;(System.Linq.Expressions.Expression);summary;df-generated |
 | System.Linq;IQueryProvider;Execute<TResult>;(System.Linq.Expressions.Expression);summary;df-generated |
 | System.Linq;IQueryable;get_ElementType;();summary;df-generated |
+| System.Linq;IQueryable;get_Expression;();summary;df-generated |
+| System.Linq;ImmutableArrayExtensions;All<T>;(System.Collections.Immutable.ImmutableArray<T>,System.Func<T,System.Boolean>);summary;df-generated |
 | System.Linq;ImmutableArrayExtensions;Any<T>;(System.Collections.Immutable.ImmutableArray<T>);summary;df-generated |
 | System.Linq;ImmutableArrayExtensions;Any<T>;(System.Collections.Immutable.ImmutableArray<T>+Builder);summary;df-generated |
+| System.Linq;ImmutableArrayExtensions;Any<T>;(System.Collections.Immutable.ImmutableArray<T>,System.Func<T,System.Boolean>);summary;df-generated |
+| System.Linq;ImmutableArrayExtensions;First<T>;(System.Collections.Immutable.ImmutableArray<T>,System.Func<T,System.Boolean>);summary;df-generated |
+| System.Linq;ImmutableArrayExtensions;FirstOrDefault<T>;(System.Collections.Immutable.ImmutableArray<T>,System.Func<T,System.Boolean>);summary;df-generated |
+| System.Linq;ImmutableArrayExtensions;Last<T>;(System.Collections.Immutable.ImmutableArray<T>,System.Func<T,System.Boolean>);summary;df-generated |
 | System.Linq;ImmutableArrayExtensions;LastOrDefault<T>;(System.Collections.Immutable.ImmutableArray<T>);summary;df-generated |
-| System.Linq;ImmutableArrayExtensions;SequenceEqual<TDerived,TBase>;(System.Collections.Immutable.ImmutableArray<TBase>,System.Collections.Generic.IEnumerable<TDerived>,System.Collections.Generic.IEqualityComparer<TBase>);summary;df-generated |
-| System.Linq;ImmutableArrayExtensions;SequenceEqual<TDerived,TBase>;(System.Collections.Immutable.ImmutableArray<TBase>,System.Collections.Immutable.ImmutableArray<TDerived>,System.Collections.Generic.IEqualityComparer<TBase>);summary;df-generated |
+| System.Linq;ImmutableArrayExtensions;LastOrDefault<T>;(System.Collections.Immutable.ImmutableArray<T>,System.Func<T,System.Boolean>);summary;df-generated |
+| System.Linq;ImmutableArrayExtensions;Select<T,TResult>;(System.Collections.Immutable.ImmutableArray<T>,System.Func<T,TResult>);summary;df-generated |
+| System.Linq;ImmutableArrayExtensions;SequenceEqual<TDerived,TBase>;(System.Collections.Immutable.ImmutableArray<TBase>,System.Collections.Immutable.ImmutableArray<TDerived>,System.Func<TBase,TBase,System.Boolean>);summary;df-generated |
+| System.Linq;ImmutableArrayExtensions;Single<T>;(System.Collections.Immutable.ImmutableArray<T>,System.Func<T,System.Boolean>);summary;df-generated |
 | System.Linq;ImmutableArrayExtensions;SingleOrDefault<T>;(System.Collections.Immutable.ImmutableArray<T>);summary;df-generated |
+| System.Linq;ImmutableArrayExtensions;SingleOrDefault<T>;(System.Collections.Immutable.ImmutableArray<T>,System.Func<T,System.Boolean>);summary;df-generated |
+| System.Linq;ImmutableArrayExtensions;Where<T>;(System.Collections.Immutable.ImmutableArray<T>,System.Func<T,System.Boolean>);summary;df-generated |
 | System.Linq;Lookup<TKey,TElement>;Contains;(TKey);summary;df-generated |
 | System.Linq;Lookup<TKey,TElement>;get_Count;();summary;df-generated |
+| System.Linq;Lookup<TKey,TElement>;get_Item;(TKey);summary;df-generated |
 | System.Linq;ParallelEnumerable;Any<TSource>;(System.Linq.ParallelQuery<TSource>);summary;df-generated |
 | System.Linq;ParallelEnumerable;Average;(System.Linq.ParallelQuery<System.Decimal>);summary;df-generated |
 | System.Linq;ParallelEnumerable;Average;(System.Linq.ParallelQuery<System.Double>);summary;df-generated |
@@ -30620,6 +33143,7 @@ neutral
 | System.Linq;ParallelEnumerable;Contains<TSource>;(System.Linq.ParallelQuery<TSource>,TSource,System.Collections.Generic.IEqualityComparer<TSource>);summary;df-generated |
 | System.Linq;ParallelEnumerable;Count<TSource>;(System.Linq.ParallelQuery<TSource>);summary;df-generated |
 | System.Linq;ParallelEnumerable;Empty<TResult>;();summary;df-generated |
+| System.Linq;ParallelEnumerable;ForAll<TSource>;(System.Linq.ParallelQuery<TSource>,System.Action<TSource>);summary;df-generated |
 | System.Linq;ParallelEnumerable;LongCount<TSource>;(System.Linq.ParallelQuery<TSource>);summary;df-generated |
 | System.Linq;ParallelEnumerable;Max;(System.Linq.ParallelQuery<System.Decimal>);summary;df-generated |
 | System.Linq;ParallelEnumerable;Max;(System.Linq.ParallelQuery<System.Double>);summary;df-generated |
@@ -30647,7 +33171,6 @@ neutral
 | System.Linq;ParallelEnumerable;SequenceEqual<TSource>;(System.Linq.ParallelQuery<TSource>,System.Collections.Generic.IEnumerable<TSource>);summary;df-generated |
 | System.Linq;ParallelEnumerable;SequenceEqual<TSource>;(System.Linq.ParallelQuery<TSource>,System.Collections.Generic.IEnumerable<TSource>,System.Collections.Generic.IEqualityComparer<TSource>);summary;df-generated |
 | System.Linq;ParallelEnumerable;SequenceEqual<TSource>;(System.Linq.ParallelQuery<TSource>,System.Linq.ParallelQuery<TSource>);summary;df-generated |
-| System.Linq;ParallelEnumerable;SequenceEqual<TSource>;(System.Linq.ParallelQuery<TSource>,System.Linq.ParallelQuery<TSource>,System.Collections.Generic.IEqualityComparer<TSource>);summary;df-generated |
 | System.Linq;ParallelEnumerable;Sum;(System.Linq.ParallelQuery<System.Decimal>);summary;df-generated |
 | System.Linq;ParallelEnumerable;Sum;(System.Linq.ParallelQuery<System.Double>);summary;df-generated |
 | System.Linq;ParallelEnumerable;Sum;(System.Linq.ParallelQuery<System.Int32>);summary;df-generated |
@@ -30659,6 +33182,7 @@ neutral
 | System.Linq;ParallelEnumerable;Sum;(System.Linq.ParallelQuery<System.Nullable<System.Single>>);summary;df-generated |
 | System.Linq;ParallelEnumerable;Sum;(System.Linq.ParallelQuery<System.Single>);summary;df-generated |
 | System.Linq;Queryable;Any<TSource>;(System.Linq.IQueryable<TSource>);summary;df-generated |
+| System.Linq;Queryable;Append<TSource>;(System.Linq.IQueryable<TSource>,TSource);summary;df-generated |
 | System.Linq;Queryable;Average;(System.Linq.IQueryable<System.Decimal>);summary;df-generated |
 | System.Linq;Queryable;Average;(System.Linq.IQueryable<System.Double>);summary;df-generated |
 | System.Linq;Queryable;Average;(System.Linq.IQueryable<System.Int32>);summary;df-generated |
@@ -30669,14 +33193,19 @@ neutral
 | System.Linq;Queryable;Average;(System.Linq.IQueryable<System.Nullable<System.Int64>>);summary;df-generated |
 | System.Linq;Queryable;Average;(System.Linq.IQueryable<System.Nullable<System.Single>>);summary;df-generated |
 | System.Linq;Queryable;Average;(System.Linq.IQueryable<System.Single>);summary;df-generated |
+| System.Linq;Queryable;Chunk<TSource>;(System.Linq.IQueryable<TSource>,System.Int32);summary;df-generated |
 | System.Linq;Queryable;Contains<TSource>;(System.Linq.IQueryable<TSource>,TSource);summary;df-generated |
 | System.Linq;Queryable;Contains<TSource>;(System.Linq.IQueryable<TSource>,TSource,System.Collections.Generic.IEqualityComparer<TSource>);summary;df-generated |
 | System.Linq;Queryable;Count<TSource>;(System.Linq.IQueryable<TSource>);summary;df-generated |
+| System.Linq;Queryable;DistinctBy<TSource,TKey>;(System.Linq.IQueryable<TSource>,System.Linq.Expressions.Expression<System.Func<TSource,TKey>>);summary;df-generated |
+| System.Linq;Queryable;DistinctBy<TSource,TKey>;(System.Linq.IQueryable<TSource>,System.Linq.Expressions.Expression<System.Func<TSource,TKey>>,System.Collections.Generic.IEqualityComparer<TKey>);summary;df-generated |
 | System.Linq;Queryable;ElementAt<TSource>;(System.Linq.IQueryable<TSource>,System.Index);summary;df-generated |
 | System.Linq;Queryable;ElementAtOrDefault<TSource>;(System.Linq.IQueryable<TSource>,System.Index);summary;df-generated |
+| System.Linq;Queryable;ExceptBy<TSource,TKey>;(System.Linq.IQueryable<TSource>,System.Collections.Generic.IEnumerable<TKey>,System.Linq.Expressions.Expression<System.Func<TSource,TKey>>);summary;df-generated |
 | System.Linq;Queryable;ExceptBy<TSource,TKey>;(System.Linq.IQueryable<TSource>,System.Collections.Generic.IEnumerable<TKey>,System.Linq.Expressions.Expression<System.Func<TSource,TKey>>,System.Collections.Generic.IEqualityComparer<TKey>);summary;df-generated |
 | System.Linq;Queryable;FirstOrDefault<TSource>;(System.Linq.IQueryable<TSource>,System.Linq.Expressions.Expression<System.Func<TSource,System.Boolean>>,TSource);summary;df-generated |
 | System.Linq;Queryable;FirstOrDefault<TSource>;(System.Linq.IQueryable<TSource>,TSource);summary;df-generated |
+| System.Linq;Queryable;IntersectBy<TSource,TKey>;(System.Linq.IQueryable<TSource>,System.Collections.Generic.IEnumerable<TKey>,System.Linq.Expressions.Expression<System.Func<TSource,TKey>>);summary;df-generated |
 | System.Linq;Queryable;IntersectBy<TSource,TKey>;(System.Linq.IQueryable<TSource>,System.Collections.Generic.IEnumerable<TKey>,System.Linq.Expressions.Expression<System.Func<TSource,TKey>>,System.Collections.Generic.IEqualityComparer<TKey>);summary;df-generated |
 | System.Linq;Queryable;LastOrDefault<TSource>;(System.Linq.IQueryable<TSource>,System.Linq.Expressions.Expression<System.Func<TSource,System.Boolean>>,TSource);summary;df-generated |
 | System.Linq;Queryable;LastOrDefault<TSource>;(System.Linq.IQueryable<TSource>,TSource);summary;df-generated |
@@ -30690,11 +33219,15 @@ neutral
 | System.Linq;Queryable;MinBy<TSource,TKey>;(System.Linq.IQueryable<TSource>,System.Linq.Expressions.Expression<System.Func<TSource,TKey>>);summary;df-generated |
 | System.Linq;Queryable;MinBy<TSource,TKey>;(System.Linq.IQueryable<TSource>,System.Linq.Expressions.Expression<System.Func<TSource,TKey>>,System.Collections.Generic.IComparer<TSource>);summary;df-generated |
 | System.Linq;Queryable;Order<T>;(System.Linq.IQueryable<T>);summary;df-generated |
+| System.Linq;Queryable;Order<T>;(System.Linq.IQueryable<T>,System.Collections.Generic.IComparer<T>);summary;df-generated |
 | System.Linq;Queryable;OrderDescending<T>;(System.Linq.IQueryable<T>);summary;df-generated |
+| System.Linq;Queryable;OrderDescending<T>;(System.Linq.IQueryable<T>,System.Collections.Generic.IComparer<T>);summary;df-generated |
+| System.Linq;Queryable;Prepend<TSource>;(System.Linq.IQueryable<TSource>,TSource);summary;df-generated |
 | System.Linq;Queryable;SequenceEqual<TSource>;(System.Linq.IQueryable<TSource>,System.Collections.Generic.IEnumerable<TSource>);summary;df-generated |
 | System.Linq;Queryable;SequenceEqual<TSource>;(System.Linq.IQueryable<TSource>,System.Collections.Generic.IEnumerable<TSource>,System.Collections.Generic.IEqualityComparer<TSource>);summary;df-generated |
 | System.Linq;Queryable;SingleOrDefault<TSource>;(System.Linq.IQueryable<TSource>,System.Linq.Expressions.Expression<System.Func<TSource,System.Boolean>>,TSource);summary;df-generated |
 | System.Linq;Queryable;SingleOrDefault<TSource>;(System.Linq.IQueryable<TSource>,TSource);summary;df-generated |
+| System.Linq;Queryable;SkipLast<TSource>;(System.Linq.IQueryable<TSource>,System.Int32);summary;df-generated |
 | System.Linq;Queryable;Sum;(System.Linq.IQueryable<System.Decimal>);summary;df-generated |
 | System.Linq;Queryable;Sum;(System.Linq.IQueryable<System.Double>);summary;df-generated |
 | System.Linq;Queryable;Sum;(System.Linq.IQueryable<System.Int32>);summary;df-generated |
@@ -30705,7 +33238,12 @@ neutral
 | System.Linq;Queryable;Sum;(System.Linq.IQueryable<System.Nullable<System.Int64>>);summary;df-generated |
 | System.Linq;Queryable;Sum;(System.Linq.IQueryable<System.Nullable<System.Single>>);summary;df-generated |
 | System.Linq;Queryable;Sum;(System.Linq.IQueryable<System.Single>);summary;df-generated |
+| System.Linq;Queryable;Take<TSource>;(System.Linq.IQueryable<TSource>,System.Range);summary;df-generated |
+| System.Linq;Queryable;TakeLast<TSource>;(System.Linq.IQueryable<TSource>,System.Int32);summary;df-generated |
+| System.Linq;Queryable;UnionBy<TSource,TKey>;(System.Linq.IQueryable<TSource>,System.Collections.Generic.IEnumerable<TSource>,System.Linq.Expressions.Expression<System.Func<TSource,TKey>>);summary;df-generated |
 | System.Linq;Queryable;UnionBy<TSource,TKey>;(System.Linq.IQueryable<TSource>,System.Collections.Generic.IEnumerable<TSource>,System.Linq.Expressions.Expression<System.Func<TSource,TKey>>,System.Collections.Generic.IEqualityComparer<TKey>);summary;df-generated |
+| System.Linq;Queryable;Zip<TFirst,TSecond,TThird>;(System.Linq.IQueryable<TFirst>,System.Collections.Generic.IEnumerable<TSecond>,System.Collections.Generic.IEnumerable<TThird>);summary;df-generated |
+| System.Linq;Queryable;Zip<TFirst,TSecond>;(System.Linq.IQueryable<TFirst>,System.Collections.Generic.IEnumerable<TSecond>);summary;df-generated |
 | System.Media;SoundPlayer;Load;();summary;df-generated |
 | System.Media;SoundPlayer;LoadAsync;();summary;df-generated |
 | System.Media;SoundPlayer;OnLoadCompleted;(System.ComponentModel.AsyncCompletedEventArgs);summary;df-generated |
@@ -30718,7 +33256,13 @@ neutral
 | System.Media;SoundPlayer;SoundPlayer;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);summary;df-generated |
 | System.Media;SoundPlayer;SoundPlayer;(System.String);summary;df-generated |
 | System.Media;SoundPlayer;Stop;();summary;df-generated |
+| System.Media;SoundPlayer;add_LoadCompleted;(System.ComponentModel.AsyncCompletedEventHandler);summary;df-generated |
+| System.Media;SoundPlayer;add_SoundLocationChanged;(System.EventHandler);summary;df-generated |
+| System.Media;SoundPlayer;add_StreamChanged;(System.EventHandler);summary;df-generated |
 | System.Media;SoundPlayer;get_IsLoadCompleted;();summary;df-generated |
+| System.Media;SoundPlayer;remove_LoadCompleted;(System.ComponentModel.AsyncCompletedEventHandler);summary;df-generated |
+| System.Media;SoundPlayer;remove_SoundLocationChanged;(System.EventHandler);summary;df-generated |
+| System.Media;SoundPlayer;remove_StreamChanged;(System.EventHandler);summary;df-generated |
 | System.Media;SystemSound;Play;();summary;df-generated |
 | System.Media;SystemSounds;get_Asterisk;();summary;df-generated |
 | System.Media;SystemSounds;get_Beep;();summary;df-generated |
@@ -30774,6 +33318,7 @@ neutral
 | System.Net.Http.Headers;HeaderStringValues+Enumerator;Dispose;();summary;df-generated |
 | System.Net.Http.Headers;HeaderStringValues+Enumerator;MoveNext;();summary;df-generated |
 | System.Net.Http.Headers;HeaderStringValues+Enumerator;Reset;();summary;df-generated |
+| System.Net.Http.Headers;HeaderStringValues+Enumerator;get_Current;();summary;df-generated |
 | System.Net.Http.Headers;HeaderStringValues;get_Count;();summary;df-generated |
 | System.Net.Http.Headers;HttpContentHeaders;get_Allow;();summary;df-generated |
 | System.Net.Http.Headers;HttpContentHeaders;get_ContentEncoding;();summary;df-generated |
@@ -30797,9 +33342,14 @@ neutral
 | System.Net.Http.Headers;HttpHeadersNonValidated+Enumerator;Dispose;();summary;df-generated |
 | System.Net.Http.Headers;HttpHeadersNonValidated+Enumerator;MoveNext;();summary;df-generated |
 | System.Net.Http.Headers;HttpHeadersNonValidated+Enumerator;Reset;();summary;df-generated |
+| System.Net.Http.Headers;HttpHeadersNonValidated+Enumerator;get_Current;();summary;df-generated |
 | System.Net.Http.Headers;HttpHeadersNonValidated;Contains;(System.String);summary;df-generated |
 | System.Net.Http.Headers;HttpHeadersNonValidated;ContainsKey;(System.String);summary;df-generated |
+| System.Net.Http.Headers;HttpHeadersNonValidated;TryGetValue;(System.String,System.Net.Http.Headers.HeaderStringValues);summary;df-generated |
 | System.Net.Http.Headers;HttpHeadersNonValidated;get_Count;();summary;df-generated |
+| System.Net.Http.Headers;HttpHeadersNonValidated;get_Item;(System.String);summary;df-generated |
+| System.Net.Http.Headers;HttpHeadersNonValidated;get_Keys;();summary;df-generated |
+| System.Net.Http.Headers;HttpHeadersNonValidated;get_Values;();summary;df-generated |
 | System.Net.Http.Headers;HttpRequestHeaders;get_Accept;();summary;df-generated |
 | System.Net.Http.Headers;HttpRequestHeaders;get_AcceptCharset;();summary;df-generated |
 | System.Net.Http.Headers;HttpRequestHeaders;get_AcceptEncoding;();summary;df-generated |
@@ -30842,7 +33392,9 @@ neutral
 | System.Net.Http.Headers;ProductHeaderValue;TryParse;(System.String,System.Net.Http.Headers.ProductHeaderValue);summary;df-generated |
 | System.Net.Http.Headers;ProductInfoHeaderValue;Equals;(System.Object);summary;df-generated |
 | System.Net.Http.Headers;ProductInfoHeaderValue;GetHashCode;();summary;df-generated |
+| System.Net.Http.Headers;ProductInfoHeaderValue;Parse;(System.String);summary;df-generated |
 | System.Net.Http.Headers;ProductInfoHeaderValue;ProductInfoHeaderValue;(System.String,System.String);summary;df-generated |
+| System.Net.Http.Headers;ProductInfoHeaderValue;TryParse;(System.String,System.Net.Http.Headers.ProductInfoHeaderValue);summary;df-generated |
 | System.Net.Http.Headers;RangeConditionHeaderValue;Equals;(System.Object);summary;df-generated |
 | System.Net.Http.Headers;RangeConditionHeaderValue;GetHashCode;();summary;df-generated |
 | System.Net.Http.Headers;RangeConditionHeaderValue;Parse;(System.String);summary;df-generated |
@@ -30948,13 +33500,17 @@ neutral
 | System.Net.Http.Json;HttpContentJsonExtensions;ReadFromJsonAsync<T>;(System.Net.Http.HttpContent,System.Text.Json.JsonSerializerOptions,System.Threading.CancellationToken);summary;df-generated |
 | System.Net.Http.Json;HttpContentJsonExtensions;ReadFromJsonAsync<T>;(System.Net.Http.HttpContent,System.Text.Json.Serialization.Metadata.JsonTypeInfo<T>,System.Threading.CancellationToken);summary;df-generated |
 | System.Net.Http.Json;HttpContentJsonExtensions;ReadFromJsonAsync<T>;(System.Net.Http.HttpContent,System.Threading.CancellationToken);summary;df-generated |
+| System.Net.Http.Json;JsonContent;Create;(System.Object,System.Type,System.Net.Http.Headers.MediaTypeHeaderValue,System.Text.Json.JsonSerializerOptions);summary;df-generated |
+| System.Net.Http.Json;JsonContent;Create<T>;(T,System.Net.Http.Headers.MediaTypeHeaderValue,System.Text.Json.JsonSerializerOptions);summary;df-generated |
 | System.Net.Http.Json;JsonContent;TryComputeLength;(System.Int64);summary;df-generated |
 | System.Net.Http.Json;JsonContent;get_ObjectType;();summary;df-generated |
 | System.Net.Http.Json;JsonContent;get_Value;();summary;df-generated |
+| System.Net.Http.Metrics;HttpMetricsEnrichmentContext;AddCallback;(System.Net.Http.HttpRequestMessage,System.Action<System.Net.Http.Metrics.HttpMetricsEnrichmentContext>);summary;df-generated |
 | System.Net.Http.Metrics;HttpMetricsEnrichmentContext;AddCustomTag;(System.String,System.Object);summary;df-generated |
 | System.Net.Http;ByteArrayContent;TryComputeLength;(System.Int64);summary;df-generated |
 | System.Net.Http;DelegatingHandler;Dispose;(System.Boolean);summary;df-generated |
 | System.Net.Http;DelegatingHandler;Send;(System.Net.Http.HttpRequestMessage,System.Threading.CancellationToken);summary;df-generated |
+| System.Net.Http;DelegatingHandler;SendAsync;(System.Net.Http.HttpRequestMessage,System.Threading.CancellationToken);summary;df-generated |
 | System.Net.Http;FormUrlEncodedContent;FormUrlEncodedContent;(System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<System.String,System.String>>);summary;df-generated |
 | System.Net.Http;HttpClient;CancelPendingRequests;();summary;df-generated |
 | System.Net.Http;HttpClient;DeleteAsync;(System.String);summary;df-generated |
@@ -31000,6 +33556,7 @@ neutral
 | System.Net.Http;HttpClientFactoryExtensions;CreateClient;(System.Net.Http.IHttpClientFactory);summary;df-generated |
 | System.Net.Http;HttpClientHandler;Dispose;(System.Boolean);summary;df-generated |
 | System.Net.Http;HttpClientHandler;Send;(System.Net.Http.HttpRequestMessage,System.Threading.CancellationToken);summary;df-generated |
+| System.Net.Http;HttpClientHandler;SendAsync;(System.Net.Http.HttpRequestMessage,System.Threading.CancellationToken);summary;df-generated |
 | System.Net.Http;HttpClientHandler;get_ClientCertificates;();summary;df-generated |
 | System.Net.Http;HttpClientHandler;get_DangerousAcceptAnyServerCertificateValidator;();summary;df-generated |
 | System.Net.Http;HttpClientHandler;get_SupportsAutomaticDecompression;();summary;df-generated |
@@ -31009,6 +33566,8 @@ neutral
 | System.Net.Http;HttpContent;Dispose;(System.Boolean);summary;df-generated |
 | System.Net.Http;HttpContent;LoadIntoBufferAsync;();summary;df-generated |
 | System.Net.Http;HttpContent;LoadIntoBufferAsync;(System.Int64);summary;df-generated |
+| System.Net.Http;HttpContent;ReadAsStringAsync;();summary;df-generated |
+| System.Net.Http;HttpContent;ReadAsStringAsync;(System.Threading.CancellationToken);summary;df-generated |
 | System.Net.Http;HttpContent;TryComputeLength;(System.Int64);summary;df-generated |
 | System.Net.Http;HttpContent;get_Headers;();summary;df-generated |
 | System.Net.Http;HttpIOException;HttpIOException;(System.Net.Http.HttpRequestError,System.String,System.Exception);summary;df-generated |
@@ -31016,6 +33575,7 @@ neutral
 | System.Net.Http;HttpMessageHandler;Dispose;();summary;df-generated |
 | System.Net.Http;HttpMessageHandler;Dispose;(System.Boolean);summary;df-generated |
 | System.Net.Http;HttpMessageHandler;Send;(System.Net.Http.HttpRequestMessage,System.Threading.CancellationToken);summary;df-generated |
+| System.Net.Http;HttpMessageHandler;SendAsync;(System.Net.Http.HttpRequestMessage,System.Threading.CancellationToken);summary;df-generated |
 | System.Net.Http;HttpMessageHandlerFactoryExtensions;CreateHandler;(System.Net.Http.IHttpMessageHandlerFactory);summary;df-generated |
 | System.Net.Http;HttpMessageInvoker;Dispose;();summary;df-generated |
 | System.Net.Http;HttpMessageInvoker;Dispose;(System.Boolean);summary;df-generated |
@@ -31056,6 +33616,9 @@ neutral
 | System.Net.Http;HttpRequestOptions;TryGetValue<TValue>;(System.Net.Http.HttpRequestOptionsKey<TValue>,TValue);summary;df-generated |
 | System.Net.Http;HttpRequestOptions;get_Count;();summary;df-generated |
 | System.Net.Http;HttpRequestOptions;get_IsReadOnly;();summary;df-generated |
+| System.Net.Http;HttpRequestOptions;get_Item;(System.String);summary;df-generated |
+| System.Net.Http;HttpRequestOptions;get_Keys;();summary;df-generated |
+| System.Net.Http;HttpRequestOptions;get_Values;();summary;df-generated |
 | System.Net.Http;HttpRequestOptionsKey<TValue>;HttpRequestOptionsKey;(System.String);summary;df-generated |
 | System.Net.Http;HttpRequestOptionsKey<TValue>;get_Key;();summary;df-generated |
 | System.Net.Http;HttpResponseMessage;Dispose;();summary;df-generated |
@@ -31070,6 +33633,7 @@ neutral
 | System.Net.Http;MessageProcessingHandler;ProcessRequest;(System.Net.Http.HttpRequestMessage,System.Threading.CancellationToken);summary;df-generated |
 | System.Net.Http;MessageProcessingHandler;ProcessResponse;(System.Net.Http.HttpResponseMessage,System.Threading.CancellationToken);summary;df-generated |
 | System.Net.Http;MessageProcessingHandler;Send;(System.Net.Http.HttpRequestMessage,System.Threading.CancellationToken);summary;df-generated |
+| System.Net.Http;MessageProcessingHandler;SendAsync;(System.Net.Http.HttpRequestMessage,System.Threading.CancellationToken);summary;df-generated |
 | System.Net.Http;MultipartContent;Dispose;(System.Boolean);summary;df-generated |
 | System.Net.Http;MultipartContent;MultipartContent;(System.String);summary;df-generated |
 | System.Net.Http;MultipartContent;TryComputeLength;(System.Int64);summary;df-generated |
@@ -31077,6 +33641,7 @@ neutral
 | System.Net.Http;ReadOnlyMemoryContent;TryComputeLength;(System.Int64);summary;df-generated |
 | System.Net.Http;SocketsHttpHandler;Dispose;(System.Boolean);summary;df-generated |
 | System.Net.Http;SocketsHttpHandler;Send;(System.Net.Http.HttpRequestMessage,System.Threading.CancellationToken);summary;df-generated |
+| System.Net.Http;SocketsHttpHandler;SendAsync;(System.Net.Http.HttpRequestMessage,System.Threading.CancellationToken);summary;df-generated |
 | System.Net.Http;SocketsHttpHandler;get_IsSupported;();summary;df-generated |
 | System.Net.Http;SocketsHttpHandler;get_Properties;();summary;df-generated |
 | System.Net.Http;StreamContent;Dispose;(System.Boolean);summary;df-generated |
@@ -31096,12 +33661,16 @@ neutral
 | System.Net.Mail;AlternateView;get_LinkedResources;();summary;df-generated |
 | System.Net.Mail;AlternateViewCollection;ClearItems;();summary;df-generated |
 | System.Net.Mail;AlternateViewCollection;Dispose;();summary;df-generated |
+| System.Net.Mail;AlternateViewCollection;InsertItem;(System.Int32,System.Net.Mail.AlternateView);summary;df-generated |
 | System.Net.Mail;AlternateViewCollection;RemoveItem;(System.Int32);summary;df-generated |
+| System.Net.Mail;AlternateViewCollection;SetItem;(System.Int32,System.Net.Mail.AlternateView);summary;df-generated |
 | System.Net.Mail;AttachmentBase;Dispose;();summary;df-generated |
 | System.Net.Mail;AttachmentBase;Dispose;(System.Boolean);summary;df-generated |
 | System.Net.Mail;AttachmentCollection;ClearItems;();summary;df-generated |
 | System.Net.Mail;AttachmentCollection;Dispose;();summary;df-generated |
+| System.Net.Mail;AttachmentCollection;InsertItem;(System.Int32,System.Net.Mail.Attachment);summary;df-generated |
 | System.Net.Mail;AttachmentCollection;RemoveItem;(System.Int32);summary;df-generated |
+| System.Net.Mail;AttachmentCollection;SetItem;(System.Int32,System.Net.Mail.Attachment);summary;df-generated |
 | System.Net.Mail;LinkedResource;LinkedResource;(System.IO.Stream);summary;df-generated |
 | System.Net.Mail;LinkedResource;LinkedResource;(System.IO.Stream,System.Net.Mime.ContentType);summary;df-generated |
 | System.Net.Mail;LinkedResource;LinkedResource;(System.IO.Stream,System.String);summary;df-generated |
@@ -31110,11 +33679,15 @@ neutral
 | System.Net.Mail;LinkedResource;LinkedResource;(System.String,System.String);summary;df-generated |
 | System.Net.Mail;LinkedResourceCollection;ClearItems;();summary;df-generated |
 | System.Net.Mail;LinkedResourceCollection;Dispose;();summary;df-generated |
+| System.Net.Mail;LinkedResourceCollection;InsertItem;(System.Int32,System.Net.Mail.LinkedResource);summary;df-generated |
 | System.Net.Mail;LinkedResourceCollection;RemoveItem;(System.Int32);summary;df-generated |
+| System.Net.Mail;LinkedResourceCollection;SetItem;(System.Int32,System.Net.Mail.LinkedResource);summary;df-generated |
 | System.Net.Mail;MailAddress;Equals;(System.Object);summary;df-generated |
 | System.Net.Mail;MailAddress;GetHashCode;();summary;df-generated |
 | System.Net.Mail;MailAddress;MailAddress;(System.String);summary;df-generated |
 | System.Net.Mail;MailAddress;MailAddress;(System.String,System.String);summary;df-generated |
+| System.Net.Mail;MailAddressCollection;InsertItem;(System.Int32,System.Net.Mail.MailAddress);summary;df-generated |
+| System.Net.Mail;MailAddressCollection;SetItem;(System.Int32,System.Net.Mail.MailAddress);summary;df-generated |
 | System.Net.Mail;MailMessage;Dispose;();summary;df-generated |
 | System.Net.Mail;MailMessage;Dispose;(System.Boolean);summary;df-generated |
 | System.Net.Mail;MailMessage;MailMessage;(System.String,System.String);summary;df-generated |
@@ -31124,12 +33697,15 @@ neutral
 | System.Net.Mail;SmtpClient;Dispose;(System.Boolean);summary;df-generated |
 | System.Net.Mail;SmtpClient;OnSendCompleted;(System.ComponentModel.AsyncCompletedEventArgs);summary;df-generated |
 | System.Net.Mail;SmtpClient;SendAsyncCancel;();summary;df-generated |
+| System.Net.Mail;SmtpClient;add_SendCompleted;(System.Net.Mail.SendCompletedEventHandler);summary;df-generated |
 | System.Net.Mail;SmtpClient;get_ServicePoint;();summary;df-generated |
+| System.Net.Mail;SmtpClient;remove_SendCompleted;(System.Net.Mail.SendCompletedEventHandler);summary;df-generated |
 | System.Net.Mail;SmtpException;SmtpException;(System.Net.Mail.SmtpStatusCode);summary;df-generated |
 | System.Net.Mail;SmtpException;SmtpException;(System.Net.Mail.SmtpStatusCode,System.String);summary;df-generated |
 | System.Net.Mail;SmtpException;SmtpException;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);summary;df-generated |
 | System.Net.Mail;SmtpException;SmtpException;(System.String);summary;df-generated |
 | System.Net.Mail;SmtpException;SmtpException;(System.String,System.Exception);summary;df-generated |
+| System.Net.Mail;SmtpFailedRecipientException;SmtpFailedRecipientException;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);summary;df-generated |
 | System.Net.Mail;SmtpFailedRecipientException;SmtpFailedRecipientException;(System.String);summary;df-generated |
 | System.Net.Mail;SmtpFailedRecipientException;SmtpFailedRecipientException;(System.String,System.Exception);summary;df-generated |
 | System.Net.Mail;SmtpFailedRecipientsException;SmtpFailedRecipientsException;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);summary;df-generated |
@@ -31164,6 +33740,7 @@ neutral
 | System.Net.NetworkInformation;IPAddressInformationCollection;Remove;(System.Net.NetworkInformation.IPAddressInformation);summary;df-generated |
 | System.Net.NetworkInformation;IPAddressInformationCollection;get_Count;();summary;df-generated |
 | System.Net.NetworkInformation;IPAddressInformationCollection;get_IsReadOnly;();summary;df-generated |
+| System.Net.NetworkInformation;IPGlobalProperties;BeginGetUnicastAddresses;(System.AsyncCallback,System.Object);summary;df-generated |
 | System.Net.NetworkInformation;IPGlobalProperties;EndGetUnicastAddresses;(System.IAsyncResult);summary;df-generated |
 | System.Net.NetworkInformation;IPGlobalProperties;GetActiveTcpConnections;();summary;df-generated |
 | System.Net.NetworkInformation;IPGlobalProperties;GetActiveTcpListeners;();summary;df-generated |
@@ -31315,6 +33892,10 @@ neutral
 | System.Net.NetworkInformation;MulticastIPAddressInformationCollection;get_IsReadOnly;();summary;df-generated |
 | System.Net.NetworkInformation;NetworkAvailabilityEventArgs;get_IsAvailable;();summary;df-generated |
 | System.Net.NetworkInformation;NetworkChange;RegisterNetworkChange;(System.Net.NetworkInformation.NetworkChange);summary;df-generated |
+| System.Net.NetworkInformation;NetworkChange;add_NetworkAddressChanged;(System.Net.NetworkInformation.NetworkAddressChangedEventHandler);summary;df-generated |
+| System.Net.NetworkInformation;NetworkChange;add_NetworkAvailabilityChanged;(System.Net.NetworkInformation.NetworkAvailabilityChangedEventHandler);summary;df-generated |
+| System.Net.NetworkInformation;NetworkChange;remove_NetworkAddressChanged;(System.Net.NetworkInformation.NetworkAddressChangedEventHandler);summary;df-generated |
+| System.Net.NetworkInformation;NetworkChange;remove_NetworkAvailabilityChanged;(System.Net.NetworkInformation.NetworkAvailabilityChangedEventHandler);summary;df-generated |
 | System.Net.NetworkInformation;NetworkInformationException;NetworkInformationException;(System.Int32);summary;df-generated |
 | System.Net.NetworkInformation;NetworkInformationException;NetworkInformationException;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);summary;df-generated |
 | System.Net.NetworkInformation;NetworkInformationException;get_ErrorCode;();summary;df-generated |
@@ -31378,6 +33959,8 @@ neutral
 | System.Net.NetworkInformation;Ping;SendPingAsync;(System.String,System.Int32,System.Byte[]);summary;df-generated |
 | System.Net.NetworkInformation;Ping;SendPingAsync;(System.String,System.Int32,System.Byte[],System.Net.NetworkInformation.PingOptions);summary;df-generated |
 | System.Net.NetworkInformation;Ping;SendPingAsync;(System.String,System.TimeSpan,System.Byte[],System.Net.NetworkInformation.PingOptions,System.Threading.CancellationToken);summary;df-generated |
+| System.Net.NetworkInformation;Ping;add_PingCompleted;(System.Net.NetworkInformation.PingCompletedEventHandler);summary;df-generated |
+| System.Net.NetworkInformation;Ping;remove_PingCompleted;(System.Net.NetworkInformation.PingCompletedEventHandler);summary;df-generated |
 | System.Net.NetworkInformation;PingCompletedEventArgs;get_Reply;();summary;df-generated |
 | System.Net.NetworkInformation;PingException;PingException;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);summary;df-generated |
 | System.Net.NetworkInformation;PingException;PingException;(System.String);summary;df-generated |
@@ -31437,6 +34020,7 @@ neutral
 | System.Net.PeerToPeer;PnrpPermissionAttribute;CreatePermission;();summary;df-generated |
 | System.Net.PeerToPeer;PnrpPermissionAttribute;PnrpPermissionAttribute;(System.Security.Permissions.SecurityAction);summary;df-generated |
 | System.Net.Quic;QuicConnection;AcceptInboundStreamAsync;(System.Threading.CancellationToken);summary;df-generated |
+| System.Net.Quic;QuicConnection;CloseAsync;(System.Int64,System.Threading.CancellationToken);summary;df-generated |
 | System.Net.Quic;QuicConnection;ConnectAsync;(System.Net.Quic.QuicClientConnectionOptions,System.Threading.CancellationToken);summary;df-generated |
 | System.Net.Quic;QuicConnection;OpenOutboundStreamAsync;(System.Net.Quic.QuicStreamType,System.Threading.CancellationToken);summary;df-generated |
 | System.Net.Quic;QuicConnection;ToString;();summary;df-generated |
@@ -31446,6 +34030,7 @@ neutral
 | System.Net.Quic;QuicException;get_QuicError;();summary;df-generated |
 | System.Net.Quic;QuicException;get_TransportErrorCode;();summary;df-generated |
 | System.Net.Quic;QuicListener;AcceptConnectionAsync;(System.Threading.CancellationToken);summary;df-generated |
+| System.Net.Quic;QuicListener;ListenAsync;(System.Net.Quic.QuicListenerOptions,System.Threading.CancellationToken);summary;df-generated |
 | System.Net.Quic;QuicListener;ToString;();summary;df-generated |
 | System.Net.Quic;QuicListener;get_IsSupported;();summary;df-generated |
 | System.Net.Quic;QuicListener;get_LocalEndPoint;();summary;df-generated |
@@ -31505,6 +34090,15 @@ neutral
 | System.Net.Security;NegotiateStream;AuthenticateAsServer;(System.Net.NetworkCredential,System.Net.Security.ProtectionLevel,System.Security.Principal.TokenImpersonationLevel);summary;df-generated |
 | System.Net.Security;NegotiateStream;AuthenticateAsServerAsync;();summary;df-generated |
 | System.Net.Security;NegotiateStream;AuthenticateAsServerAsync;(System.Net.NetworkCredential,System.Net.Security.ProtectionLevel,System.Security.Principal.TokenImpersonationLevel);summary;df-generated |
+| System.Net.Security;NegotiateStream;BeginAuthenticateAsClient;(System.AsyncCallback,System.Object);summary;df-generated |
+| System.Net.Security;NegotiateStream;BeginAuthenticateAsClient;(System.Net.NetworkCredential,System.Security.Authentication.ExtendedProtection.ChannelBinding,System.String,System.AsyncCallback,System.Object);summary;df-generated |
+| System.Net.Security;NegotiateStream;BeginAuthenticateAsClient;(System.Net.NetworkCredential,System.Security.Authentication.ExtendedProtection.ChannelBinding,System.String,System.Net.Security.ProtectionLevel,System.Security.Principal.TokenImpersonationLevel,System.AsyncCallback,System.Object);summary;df-generated |
+| System.Net.Security;NegotiateStream;BeginAuthenticateAsClient;(System.Net.NetworkCredential,System.String,System.AsyncCallback,System.Object);summary;df-generated |
+| System.Net.Security;NegotiateStream;BeginAuthenticateAsClient;(System.Net.NetworkCredential,System.String,System.Net.Security.ProtectionLevel,System.Security.Principal.TokenImpersonationLevel,System.AsyncCallback,System.Object);summary;df-generated |
+| System.Net.Security;NegotiateStream;BeginAuthenticateAsServer;(System.AsyncCallback,System.Object);summary;df-generated |
+| System.Net.Security;NegotiateStream;BeginAuthenticateAsServer;(System.Net.NetworkCredential,System.Net.Security.ProtectionLevel,System.Security.Principal.TokenImpersonationLevel,System.AsyncCallback,System.Object);summary;df-generated |
+| System.Net.Security;NegotiateStream;BeginAuthenticateAsServer;(System.Net.NetworkCredential,System.Security.Authentication.ExtendedProtection.ExtendedProtectionPolicy,System.Net.Security.ProtectionLevel,System.Security.Principal.TokenImpersonationLevel,System.AsyncCallback,System.Object);summary;df-generated |
+| System.Net.Security;NegotiateStream;BeginAuthenticateAsServer;(System.Security.Authentication.ExtendedProtection.ExtendedProtectionPolicy,System.AsyncCallback,System.Object);summary;df-generated |
 | System.Net.Security;NegotiateStream;Dispose;(System.Boolean);summary;df-generated |
 | System.Net.Security;NegotiateStream;EndAuthenticateAsClient;(System.IAsyncResult);summary;df-generated |
 | System.Net.Security;NegotiateStream;EndAuthenticateAsServer;(System.IAsyncResult);summary;df-generated |
@@ -31531,6 +34125,7 @@ neutral
 | System.Net.Security;SslApplicationProtocol;GetHashCode;();summary;df-generated |
 | System.Net.Security;SslApplicationProtocol;SslApplicationProtocol;(System.Byte[]);summary;df-generated |
 | System.Net.Security;SslApplicationProtocol;SslApplicationProtocol;(System.String);summary;df-generated |
+| System.Net.Security;SslApplicationProtocol;get_Protocol;();summary;df-generated |
 | System.Net.Security;SslApplicationProtocol;op_Equality;(System.Net.Security.SslApplicationProtocol,System.Net.Security.SslApplicationProtocol);summary;df-generated |
 | System.Net.Security;SslApplicationProtocol;op_Inequality;(System.Net.Security.SslApplicationProtocol,System.Net.Security.SslApplicationProtocol);summary;df-generated |
 | System.Net.Security;SslClientHelloInfo;SslClientHelloInfo;(System.String,System.Security.Authentication.SslProtocols);summary;df-generated |
@@ -31545,22 +34140,31 @@ neutral
 | System.Net.Security;SslStream;AuthenticateAsServer;(System.Security.Cryptography.X509Certificates.X509Certificate);summary;df-generated |
 | System.Net.Security;SslStream;AuthenticateAsServer;(System.Security.Cryptography.X509Certificates.X509Certificate,System.Boolean,System.Boolean);summary;df-generated |
 | System.Net.Security;SslStream;AuthenticateAsServer;(System.Security.Cryptography.X509Certificates.X509Certificate,System.Boolean,System.Security.Authentication.SslProtocols,System.Boolean);summary;df-generated |
+| System.Net.Security;SslStream;AuthenticateAsServerAsync;(System.Net.Security.ServerOptionsSelectionCallback,System.Object,System.Threading.CancellationToken);summary;df-generated |
 | System.Net.Security;SslStream;AuthenticateAsServerAsync;(System.Security.Cryptography.X509Certificates.X509Certificate);summary;df-generated |
 | System.Net.Security;SslStream;AuthenticateAsServerAsync;(System.Security.Cryptography.X509Certificates.X509Certificate,System.Boolean,System.Boolean);summary;df-generated |
 | System.Net.Security;SslStream;AuthenticateAsServerAsync;(System.Security.Cryptography.X509Certificates.X509Certificate,System.Boolean,System.Security.Authentication.SslProtocols,System.Boolean);summary;df-generated |
+| System.Net.Security;SslStream;BeginAuthenticateAsClient;(System.String,System.AsyncCallback,System.Object);summary;df-generated |
+| System.Net.Security;SslStream;BeginAuthenticateAsClient;(System.String,System.Security.Cryptography.X509Certificates.X509CertificateCollection,System.Boolean,System.AsyncCallback,System.Object);summary;df-generated |
+| System.Net.Security;SslStream;BeginAuthenticateAsClient;(System.String,System.Security.Cryptography.X509Certificates.X509CertificateCollection,System.Security.Authentication.SslProtocols,System.Boolean,System.AsyncCallback,System.Object);summary;df-generated |
+| System.Net.Security;SslStream;BeginAuthenticateAsServer;(System.Security.Cryptography.X509Certificates.X509Certificate,System.AsyncCallback,System.Object);summary;df-generated |
+| System.Net.Security;SslStream;BeginAuthenticateAsServer;(System.Security.Cryptography.X509Certificates.X509Certificate,System.Boolean,System.Boolean,System.AsyncCallback,System.Object);summary;df-generated |
+| System.Net.Security;SslStream;BeginAuthenticateAsServer;(System.Security.Cryptography.X509Certificates.X509Certificate,System.Boolean,System.Security.Authentication.SslProtocols,System.Boolean,System.AsyncCallback,System.Object);summary;df-generated |
 | System.Net.Security;SslStream;Dispose;(System.Boolean);summary;df-generated |
 | System.Net.Security;SslStream;EndAuthenticateAsClient;(System.IAsyncResult);summary;df-generated |
 | System.Net.Security;SslStream;EndAuthenticateAsServer;(System.IAsyncResult);summary;df-generated |
 | System.Net.Security;SslStream;EndRead;(System.IAsyncResult);summary;df-generated |
 | System.Net.Security;SslStream;EndWrite;(System.IAsyncResult);summary;df-generated |
 | System.Net.Security;SslStream;Flush;();summary;df-generated |
-| System.Net.Security;SslStream;NegotiateClientCertificateAsync;(System.Threading.CancellationToken);summary;df-generated |
 | System.Net.Security;SslStream;ReadByte;();summary;df-generated |
 | System.Net.Security;SslStream;Seek;(System.Int64,System.IO.SeekOrigin);summary;df-generated |
 | System.Net.Security;SslStream;SetLength;(System.Int64);summary;df-generated |
 | System.Net.Security;SslStream;ShutdownAsync;();summary;df-generated |
 | System.Net.Security;SslStream;SslStream;(System.IO.Stream);summary;df-generated |
 | System.Net.Security;SslStream;SslStream;(System.IO.Stream,System.Boolean);summary;df-generated |
+| System.Net.Security;SslStream;SslStream;(System.IO.Stream,System.Boolean,System.Net.Security.RemoteCertificateValidationCallback);summary;df-generated |
+| System.Net.Security;SslStream;SslStream;(System.IO.Stream,System.Boolean,System.Net.Security.RemoteCertificateValidationCallback,System.Net.Security.LocalCertificateSelectionCallback);summary;df-generated |
+| System.Net.Security;SslStream;SslStream;(System.IO.Stream,System.Boolean,System.Net.Security.RemoteCertificateValidationCallback,System.Net.Security.LocalCertificateSelectionCallback,System.Net.Security.EncryptionPolicy);summary;df-generated |
 | System.Net.Security;SslStream;get_CanRead;();summary;df-generated |
 | System.Net.Security;SslStream;get_CanSeek;();summary;df-generated |
 | System.Net.Security;SslStream;get_CanTimeout;();summary;df-generated |
@@ -31613,6 +34217,7 @@ neutral
 | System.Net.Sockets;NetworkStream;get_DataAvailable;();summary;df-generated |
 | System.Net.Sockets;NetworkStream;get_Length;();summary;df-generated |
 | System.Net.Sockets;SafeSocketHandle;ReleaseHandle;();summary;df-generated |
+| System.Net.Sockets;SafeSocketHandle;SafeSocketHandle;(System.IntPtr,System.Boolean);summary;df-generated |
 | System.Net.Sockets;SafeSocketHandle;get_IsInvalid;();summary;df-generated |
 | System.Net.Sockets;SendPacketsElement;SendPacketsElement;(System.Byte[]);summary;df-generated |
 | System.Net.Sockets;SendPacketsElement;SendPacketsElement;(System.Byte[],System.Int32,System.Int32);summary;df-generated |
@@ -31629,15 +34234,43 @@ neutral
 | System.Net.Sockets;SendPacketsElement;SendPacketsElement;(System.String,System.Int64,System.Int32,System.Boolean);summary;df-generated |
 | System.Net.Sockets;SendPacketsElement;get_Offset;();summary;df-generated |
 | System.Net.Sockets;Socket;AcceptAsync;();summary;df-generated |
+| System.Net.Sockets;Socket;AcceptAsync;(System.Net.Sockets.Socket);summary;df-generated |
+| System.Net.Sockets;Socket;AcceptAsync;(System.Net.Sockets.Socket,System.Threading.CancellationToken);summary;df-generated |
+| System.Net.Sockets;Socket;AcceptAsync;(System.Threading.CancellationToken);summary;df-generated |
+| System.Net.Sockets;Socket;BeginAccept;(System.AsyncCallback,System.Object);summary;df-generated |
+| System.Net.Sockets;Socket;BeginAccept;(System.Int32,System.AsyncCallback,System.Object);summary;df-generated |
+| System.Net.Sockets;Socket;BeginAccept;(System.Net.Sockets.Socket,System.Int32,System.AsyncCallback,System.Object);summary;df-generated |
+| System.Net.Sockets;Socket;BeginConnect;(System.Net.EndPoint,System.AsyncCallback,System.Object);summary;df-generated |
+| System.Net.Sockets;Socket;BeginConnect;(System.Net.IPAddress,System.Int32,System.AsyncCallback,System.Object);summary;df-generated |
+| System.Net.Sockets;Socket;BeginConnect;(System.Net.IPAddress[],System.Int32,System.AsyncCallback,System.Object);summary;df-generated |
+| System.Net.Sockets;Socket;BeginConnect;(System.String,System.Int32,System.AsyncCallback,System.Object);summary;df-generated |
+| System.Net.Sockets;Socket;BeginDisconnect;(System.Boolean,System.AsyncCallback,System.Object);summary;df-generated |
+| System.Net.Sockets;Socket;BeginReceive;(System.Byte[],System.Int32,System.Int32,System.Net.Sockets.SocketFlags,System.AsyncCallback,System.Object);summary;df-generated |
+| System.Net.Sockets;Socket;BeginReceive;(System.Byte[],System.Int32,System.Int32,System.Net.Sockets.SocketFlags,System.Net.Sockets.SocketError,System.AsyncCallback,System.Object);summary;df-generated |
+| System.Net.Sockets;Socket;BeginReceive;(System.Collections.Generic.IList<System.ArraySegment<System.Byte>>,System.Net.Sockets.SocketFlags,System.AsyncCallback,System.Object);summary;df-generated |
+| System.Net.Sockets;Socket;BeginReceive;(System.Collections.Generic.IList<System.ArraySegment<System.Byte>>,System.Net.Sockets.SocketFlags,System.Net.Sockets.SocketError,System.AsyncCallback,System.Object);summary;df-generated |
+| System.Net.Sockets;Socket;BeginSend;(System.Byte[],System.Int32,System.Int32,System.Net.Sockets.SocketFlags,System.AsyncCallback,System.Object);summary;df-generated |
+| System.Net.Sockets;Socket;BeginSend;(System.Byte[],System.Int32,System.Int32,System.Net.Sockets.SocketFlags,System.Net.Sockets.SocketError,System.AsyncCallback,System.Object);summary;df-generated |
+| System.Net.Sockets;Socket;BeginSend;(System.Collections.Generic.IList<System.ArraySegment<System.Byte>>,System.Net.Sockets.SocketFlags,System.AsyncCallback,System.Object);summary;df-generated |
+| System.Net.Sockets;Socket;BeginSend;(System.Collections.Generic.IList<System.ArraySegment<System.Byte>>,System.Net.Sockets.SocketFlags,System.Net.Sockets.SocketError,System.AsyncCallback,System.Object);summary;df-generated |
+| System.Net.Sockets;Socket;BeginSendFile;(System.String,System.AsyncCallback,System.Object);summary;df-generated |
+| System.Net.Sockets;Socket;BeginSendFile;(System.String,System.Byte[],System.Byte[],System.Net.Sockets.TransmitFileOptions,System.AsyncCallback,System.Object);summary;df-generated |
+| System.Net.Sockets;Socket;BeginSendTo;(System.Byte[],System.Int32,System.Int32,System.Net.Sockets.SocketFlags,System.Net.EndPoint,System.AsyncCallback,System.Object);summary;df-generated |
 | System.Net.Sockets;Socket;CancelConnectAsync;(System.Net.Sockets.SocketAsyncEventArgs);summary;df-generated |
 | System.Net.Sockets;Socket;Close;();summary;df-generated |
 | System.Net.Sockets;Socket;Close;(System.Int32);summary;df-generated |
+| System.Net.Sockets;Socket;Connect;(System.Net.IPAddress,System.Int32);summary;df-generated |
+| System.Net.Sockets;Socket;Connect;(System.Net.IPAddress[],System.Int32);summary;df-generated |
 | System.Net.Sockets;Socket;Connect;(System.String,System.Int32);summary;df-generated |
+| System.Net.Sockets;Socket;ConnectAsync;(System.Net.IPAddress,System.Int32);summary;df-generated |
+| System.Net.Sockets;Socket;ConnectAsync;(System.Net.IPAddress,System.Int32,System.Threading.CancellationToken);summary;df-generated |
 | System.Net.Sockets;Socket;ConnectAsync;(System.Net.IPAddress[],System.Int32);summary;df-generated |
 | System.Net.Sockets;Socket;ConnectAsync;(System.Net.IPAddress[],System.Int32,System.Threading.CancellationToken);summary;df-generated |
 | System.Net.Sockets;Socket;ConnectAsync;(System.Net.Sockets.SocketType,System.Net.Sockets.ProtocolType,System.Net.Sockets.SocketAsyncEventArgs);summary;df-generated |
 | System.Net.Sockets;Socket;ConnectAsync;(System.String,System.Int32);summary;df-generated |
+| System.Net.Sockets;Socket;ConnectAsync;(System.String,System.Int32,System.Threading.CancellationToken);summary;df-generated |
 | System.Net.Sockets;Socket;Disconnect;(System.Boolean);summary;df-generated |
+| System.Net.Sockets;Socket;DisconnectAsync;(System.Boolean,System.Threading.CancellationToken);summary;df-generated |
 | System.Net.Sockets;Socket;Dispose;();summary;df-generated |
 | System.Net.Sockets;Socket;Dispose;(System.Boolean);summary;df-generated |
 | System.Net.Sockets;Socket;DuplicateAndClose;(System.Int32);summary;df-generated |
@@ -31648,8 +34281,6 @@ neutral
 | System.Net.Sockets;Socket;EndDisconnect;(System.IAsyncResult);summary;df-generated |
 | System.Net.Sockets;Socket;EndReceive;(System.IAsyncResult);summary;df-generated |
 | System.Net.Sockets;Socket;EndReceive;(System.IAsyncResult,System.Net.Sockets.SocketError);summary;df-generated |
-| System.Net.Sockets;Socket;EndReceiveFrom;(System.IAsyncResult,System.Net.EndPoint);summary;df-generated |
-| System.Net.Sockets;Socket;EndReceiveMessageFrom;(System.IAsyncResult,System.Net.Sockets.SocketFlags,System.Net.EndPoint,System.Net.Sockets.IPPacketInformation);summary;df-generated |
 | System.Net.Sockets;Socket;EndSend;(System.IAsyncResult);summary;df-generated |
 | System.Net.Sockets;Socket;EndSend;(System.IAsyncResult,System.Net.Sockets.SocketError);summary;df-generated |
 | System.Net.Sockets;Socket;EndSendFile;(System.IAsyncResult);summary;df-generated |
@@ -31679,7 +34310,18 @@ neutral
 | System.Net.Sockets;Socket;ReceiveAsync;(System.ArraySegment<System.Byte>,System.Net.Sockets.SocketFlags);summary;df-generated |
 | System.Net.Sockets;Socket;ReceiveAsync;(System.Collections.Generic.IList<System.ArraySegment<System.Byte>>);summary;df-generated |
 | System.Net.Sockets;Socket;ReceiveAsync;(System.Collections.Generic.IList<System.ArraySegment<System.Byte>>,System.Net.Sockets.SocketFlags);summary;df-generated |
+| System.Net.Sockets;Socket;ReceiveAsync;(System.Memory<System.Byte>,System.Net.Sockets.SocketFlags,System.Threading.CancellationToken);summary;df-generated |
+| System.Net.Sockets;Socket;ReceiveAsync;(System.Memory<System.Byte>,System.Threading.CancellationToken);summary;df-generated |
 | System.Net.Sockets;Socket;ReceiveFrom;(System.Span<System.Byte>,System.Net.Sockets.SocketFlags,System.Net.SocketAddress);summary;df-generated |
+| System.Net.Sockets;Socket;ReceiveFromAsync;(System.ArraySegment<System.Byte>,System.Net.EndPoint);summary;df-generated |
+| System.Net.Sockets;Socket;ReceiveFromAsync;(System.ArraySegment<System.Byte>,System.Net.Sockets.SocketFlags,System.Net.EndPoint);summary;df-generated |
+| System.Net.Sockets;Socket;ReceiveFromAsync;(System.Memory<System.Byte>,System.Net.EndPoint,System.Threading.CancellationToken);summary;df-generated |
+| System.Net.Sockets;Socket;ReceiveFromAsync;(System.Memory<System.Byte>,System.Net.Sockets.SocketFlags,System.Net.EndPoint,System.Threading.CancellationToken);summary;df-generated |
+| System.Net.Sockets;Socket;ReceiveFromAsync;(System.Memory<System.Byte>,System.Net.Sockets.SocketFlags,System.Net.SocketAddress,System.Threading.CancellationToken);summary;df-generated |
+| System.Net.Sockets;Socket;ReceiveMessageFromAsync;(System.ArraySegment<System.Byte>,System.Net.EndPoint);summary;df-generated |
+| System.Net.Sockets;Socket;ReceiveMessageFromAsync;(System.ArraySegment<System.Byte>,System.Net.Sockets.SocketFlags,System.Net.EndPoint);summary;df-generated |
+| System.Net.Sockets;Socket;ReceiveMessageFromAsync;(System.Memory<System.Byte>,System.Net.EndPoint,System.Threading.CancellationToken);summary;df-generated |
+| System.Net.Sockets;Socket;ReceiveMessageFromAsync;(System.Memory<System.Byte>,System.Net.Sockets.SocketFlags,System.Net.EndPoint,System.Threading.CancellationToken);summary;df-generated |
 | System.Net.Sockets;Socket;Select;(System.Collections.IList,System.Collections.IList,System.Collections.IList,System.Int32);summary;df-generated |
 | System.Net.Sockets;Socket;Select;(System.Collections.IList,System.Collections.IList,System.Collections.IList,System.TimeSpan);summary;df-generated |
 | System.Net.Sockets;Socket;Send;(System.Byte[]);summary;df-generated |
@@ -31697,10 +34339,15 @@ neutral
 | System.Net.Sockets;Socket;SendAsync;(System.ArraySegment<System.Byte>,System.Net.Sockets.SocketFlags);summary;df-generated |
 | System.Net.Sockets;Socket;SendAsync;(System.Collections.Generic.IList<System.ArraySegment<System.Byte>>);summary;df-generated |
 | System.Net.Sockets;Socket;SendAsync;(System.Collections.Generic.IList<System.ArraySegment<System.Byte>>,System.Net.Sockets.SocketFlags);summary;df-generated |
+| System.Net.Sockets;Socket;SendAsync;(System.ReadOnlyMemory<System.Byte>,System.Net.Sockets.SocketFlags,System.Threading.CancellationToken);summary;df-generated |
+| System.Net.Sockets;Socket;SendAsync;(System.ReadOnlyMemory<System.Byte>,System.Threading.CancellationToken);summary;df-generated |
 | System.Net.Sockets;Socket;SendFile;(System.String);summary;df-generated |
 | System.Net.Sockets;Socket;SendFile;(System.String,System.Byte[],System.Byte[],System.Net.Sockets.TransmitFileOptions);summary;df-generated |
 | System.Net.Sockets;Socket;SendFile;(System.String,System.ReadOnlySpan<System.Byte>,System.ReadOnlySpan<System.Byte>,System.Net.Sockets.TransmitFileOptions);summary;df-generated |
+| System.Net.Sockets;Socket;SendFileAsync;(System.String,System.ReadOnlyMemory<System.Byte>,System.ReadOnlyMemory<System.Byte>,System.Net.Sockets.TransmitFileOptions,System.Threading.CancellationToken);summary;df-generated |
+| System.Net.Sockets;Socket;SendFileAsync;(System.String,System.Threading.CancellationToken);summary;df-generated |
 | System.Net.Sockets;Socket;SendTo;(System.ReadOnlySpan<System.Byte>,System.Net.Sockets.SocketFlags,System.Net.SocketAddress);summary;df-generated |
+| System.Net.Sockets;Socket;SendToAsync;(System.ReadOnlyMemory<System.Byte>,System.Net.Sockets.SocketFlags,System.Net.SocketAddress,System.Threading.CancellationToken);summary;df-generated |
 | System.Net.Sockets;Socket;SetIPProtectionLevel;(System.Net.Sockets.IPProtectionLevel);summary;df-generated |
 | System.Net.Sockets;Socket;SetRawSocketOption;(System.Int32,System.Int32,System.ReadOnlySpan<System.Byte>);summary;df-generated |
 | System.Net.Sockets;Socket;SetSocketOption;(System.Net.Sockets.SocketOptionLevel,System.Net.Sockets.SocketOptionName,System.Boolean);summary;df-generated |
@@ -31715,6 +34362,7 @@ neutral
 | System.Net.Sockets;Socket;get_AddressFamily;();summary;df-generated |
 | System.Net.Sockets;Socket;get_Available;();summary;df-generated |
 | System.Net.Sockets;Socket;get_Connected;();summary;df-generated |
+| System.Net.Sockets;Socket;get_Handle;();summary;df-generated |
 | System.Net.Sockets;Socket;get_IsBound;();summary;df-generated |
 | System.Net.Sockets;Socket;get_OSSupportsIPv4;();summary;df-generated |
 | System.Net.Sockets;Socket;get_OSSupportsIPv6;();summary;df-generated |
@@ -31725,26 +34373,40 @@ neutral
 | System.Net.Sockets;Socket;get_SupportsIPv6;();summary;df-generated |
 | System.Net.Sockets;SocketAsyncEventArgs;Dispose;();summary;df-generated |
 | System.Net.Sockets;SocketAsyncEventArgs;OnCompleted;(System.Net.Sockets.SocketAsyncEventArgs);summary;df-generated |
+| System.Net.Sockets;SocketAsyncEventArgs;SetBuffer;(System.Byte[],System.Int32,System.Int32);summary;df-generated |
 | System.Net.Sockets;SocketAsyncEventArgs;SetBuffer;(System.Int32,System.Int32);summary;df-generated |
 | System.Net.Sockets;SocketAsyncEventArgs;SocketAsyncEventArgs;(System.Boolean);summary;df-generated |
+| System.Net.Sockets;SocketAsyncEventArgs;add_Completed;(System.EventHandler<System.Net.Sockets.SocketAsyncEventArgs>);summary;df-generated |
 | System.Net.Sockets;SocketAsyncEventArgs;get_Buffer;();summary;df-generated |
 | System.Net.Sockets;SocketAsyncEventArgs;get_BytesTransferred;();summary;df-generated |
 | System.Net.Sockets;SocketAsyncEventArgs;get_Count;();summary;df-generated |
 | System.Net.Sockets;SocketAsyncEventArgs;get_LastOperation;();summary;df-generated |
 | System.Net.Sockets;SocketAsyncEventArgs;get_Offset;();summary;df-generated |
+| System.Net.Sockets;SocketAsyncEventArgs;remove_Completed;(System.EventHandler<System.Net.Sockets.SocketAsyncEventArgs>);summary;df-generated |
 | System.Net.Sockets;SocketException;SocketException;(System.Int32);summary;df-generated |
 | System.Net.Sockets;SocketException;SocketException;(System.Int32,System.String);summary;df-generated |
 | System.Net.Sockets;SocketException;SocketException;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);summary;df-generated |
 | System.Net.Sockets;SocketException;get_ErrorCode;();summary;df-generated |
 | System.Net.Sockets;SocketException;get_SocketErrorCode;();summary;df-generated |
 | System.Net.Sockets;SocketTaskExtensions;AcceptAsync;(System.Net.Sockets.Socket);summary;df-generated |
+| System.Net.Sockets;SocketTaskExtensions;AcceptAsync;(System.Net.Sockets.Socket,System.Net.Sockets.Socket);summary;df-generated |
+| System.Net.Sockets;SocketTaskExtensions;ConnectAsync;(System.Net.Sockets.Socket,System.Net.IPAddress,System.Int32);summary;df-generated |
+| System.Net.Sockets;SocketTaskExtensions;ConnectAsync;(System.Net.Sockets.Socket,System.Net.IPAddress,System.Int32,System.Threading.CancellationToken);summary;df-generated |
 | System.Net.Sockets;SocketTaskExtensions;ConnectAsync;(System.Net.Sockets.Socket,System.Net.IPAddress[],System.Int32);summary;df-generated |
 | System.Net.Sockets;SocketTaskExtensions;ConnectAsync;(System.Net.Sockets.Socket,System.Net.IPAddress[],System.Int32,System.Threading.CancellationToken);summary;df-generated |
 | System.Net.Sockets;SocketTaskExtensions;ConnectAsync;(System.Net.Sockets.Socket,System.String,System.Int32);summary;df-generated |
+| System.Net.Sockets;SocketTaskExtensions;ConnectAsync;(System.Net.Sockets.Socket,System.String,System.Int32,System.Threading.CancellationToken);summary;df-generated |
 | System.Net.Sockets;SocketTaskExtensions;ReceiveAsync;(System.Net.Sockets.Socket,System.ArraySegment<System.Byte>,System.Net.Sockets.SocketFlags);summary;df-generated |
 | System.Net.Sockets;SocketTaskExtensions;ReceiveAsync;(System.Net.Sockets.Socket,System.Collections.Generic.IList<System.ArraySegment<System.Byte>>,System.Net.Sockets.SocketFlags);summary;df-generated |
+| System.Net.Sockets;SocketTaskExtensions;ReceiveAsync;(System.Net.Sockets.Socket,System.Memory<System.Byte>,System.Net.Sockets.SocketFlags,System.Threading.CancellationToken);summary;df-generated |
+| System.Net.Sockets;SocketTaskExtensions;ReceiveFromAsync;(System.Net.Sockets.Socket,System.ArraySegment<System.Byte>,System.Net.Sockets.SocketFlags,System.Net.EndPoint);summary;df-generated |
+| System.Net.Sockets;SocketTaskExtensions;ReceiveMessageFromAsync;(System.Net.Sockets.Socket,System.ArraySegment<System.Byte>,System.Net.Sockets.SocketFlags,System.Net.EndPoint);summary;df-generated |
 | System.Net.Sockets;SocketTaskExtensions;SendAsync;(System.Net.Sockets.Socket,System.ArraySegment<System.Byte>,System.Net.Sockets.SocketFlags);summary;df-generated |
 | System.Net.Sockets;SocketTaskExtensions;SendAsync;(System.Net.Sockets.Socket,System.Collections.Generic.IList<System.ArraySegment<System.Byte>>,System.Net.Sockets.SocketFlags);summary;df-generated |
+| System.Net.Sockets;SocketTaskExtensions;SendAsync;(System.Net.Sockets.Socket,System.ReadOnlyMemory<System.Byte>,System.Net.Sockets.SocketFlags,System.Threading.CancellationToken);summary;df-generated |
+| System.Net.Sockets;TcpClient;BeginConnect;(System.Net.IPAddress,System.Int32,System.AsyncCallback,System.Object);summary;df-generated |
+| System.Net.Sockets;TcpClient;BeginConnect;(System.Net.IPAddress[],System.Int32,System.AsyncCallback,System.Object);summary;df-generated |
+| System.Net.Sockets;TcpClient;BeginConnect;(System.String,System.Int32,System.AsyncCallback,System.Object);summary;df-generated |
 | System.Net.Sockets;TcpClient;Close;();summary;df-generated |
 | System.Net.Sockets;TcpClient;Connect;(System.Net.IPAddress,System.Int32);summary;df-generated |
 | System.Net.Sockets;TcpClient;Connect;(System.Net.IPAddress[],System.Int32);summary;df-generated |
@@ -31764,9 +34426,12 @@ neutral
 | System.Net.Sockets;TcpClient;get_Available;();summary;df-generated |
 | System.Net.Sockets;TcpClient;get_Connected;();summary;df-generated |
 | System.Net.Sockets;TcpListener;AcceptSocketAsync;();summary;df-generated |
+| System.Net.Sockets;TcpListener;AcceptSocketAsync;(System.Threading.CancellationToken);summary;df-generated |
 | System.Net.Sockets;TcpListener;AcceptTcpClientAsync;();summary;df-generated |
 | System.Net.Sockets;TcpListener;AcceptTcpClientAsync;(System.Threading.CancellationToken);summary;df-generated |
 | System.Net.Sockets;TcpListener;AllowNatTraversal;(System.Boolean);summary;df-generated |
+| System.Net.Sockets;TcpListener;BeginAcceptSocket;(System.AsyncCallback,System.Object);summary;df-generated |
+| System.Net.Sockets;TcpListener;BeginAcceptTcpClient;(System.AsyncCallback,System.Object);summary;df-generated |
 | System.Net.Sockets;TcpListener;Create;(System.Int32);summary;df-generated |
 | System.Net.Sockets;TcpListener;Dispose;();summary;df-generated |
 | System.Net.Sockets;TcpListener;EndAcceptSocket;(System.IAsyncResult);summary;df-generated |
@@ -31776,8 +34441,13 @@ neutral
 | System.Net.Sockets;TcpListener;Start;(System.Int32);summary;df-generated |
 | System.Net.Sockets;TcpListener;Stop;();summary;df-generated |
 | System.Net.Sockets;TcpListener;TcpListener;(System.Int32);summary;df-generated |
+| System.Net.Sockets;TcpListener;TcpListener;(System.Net.IPAddress,System.Int32);summary;df-generated |
 | System.Net.Sockets;TcpListener;get_Active;();summary;df-generated |
 | System.Net.Sockets;UdpClient;AllowNatTraversal;(System.Boolean);summary;df-generated |
+| System.Net.Sockets;UdpClient;BeginReceive;(System.AsyncCallback,System.Object);summary;df-generated |
+| System.Net.Sockets;UdpClient;BeginSend;(System.Byte[],System.Int32,System.AsyncCallback,System.Object);summary;df-generated |
+| System.Net.Sockets;UdpClient;BeginSend;(System.Byte[],System.Int32,System.Net.IPEndPoint,System.AsyncCallback,System.Object);summary;df-generated |
+| System.Net.Sockets;UdpClient;BeginSend;(System.Byte[],System.Int32,System.String,System.Int32,System.AsyncCallback,System.Object);summary;df-generated |
 | System.Net.Sockets;UdpClient;Close;();summary;df-generated |
 | System.Net.Sockets;UdpClient;Connect;(System.Net.IPAddress,System.Int32);summary;df-generated |
 | System.Net.Sockets;UdpClient;Connect;(System.String,System.Int32);summary;df-generated |
@@ -31798,6 +34468,8 @@ neutral
 | System.Net.Sockets;UdpClient;Send;(System.ReadOnlySpan<System.Byte>,System.String,System.Int32);summary;df-generated |
 | System.Net.Sockets;UdpClient;SendAsync;(System.Byte[],System.Int32);summary;df-generated |
 | System.Net.Sockets;UdpClient;SendAsync;(System.Byte[],System.Int32,System.String,System.Int32);summary;df-generated |
+| System.Net.Sockets;UdpClient;SendAsync;(System.ReadOnlyMemory<System.Byte>,System.String,System.Int32,System.Threading.CancellationToken);summary;df-generated |
+| System.Net.Sockets;UdpClient;SendAsync;(System.ReadOnlyMemory<System.Byte>,System.Threading.CancellationToken);summary;df-generated |
 | System.Net.Sockets;UdpClient;UdpClient;(System.Int32);summary;df-generated |
 | System.Net.Sockets;UdpClient;UdpClient;(System.Int32,System.Net.Sockets.AddressFamily);summary;df-generated |
 | System.Net.Sockets;UdpClient;UdpClient;(System.Net.Sockets.AddressFamily);summary;df-generated |
@@ -31822,6 +34494,9 @@ neutral
 | System.Net.WebSockets;ClientWebSocket;Dispose;();summary;df-generated |
 | System.Net.WebSockets;ClientWebSocket;ReceiveAsync;(System.ArraySegment<System.Byte>,System.Threading.CancellationToken);summary;df-generated |
 | System.Net.WebSockets;ClientWebSocket;ReceiveAsync;(System.Memory<System.Byte>,System.Threading.CancellationToken);summary;df-generated |
+| System.Net.WebSockets;ClientWebSocket;SendAsync;(System.ArraySegment<System.Byte>,System.Net.WebSockets.WebSocketMessageType,System.Boolean,System.Threading.CancellationToken);summary;df-generated |
+| System.Net.WebSockets;ClientWebSocket;SendAsync;(System.ReadOnlyMemory<System.Byte>,System.Net.WebSockets.WebSocketMessageType,System.Boolean,System.Threading.CancellationToken);summary;df-generated |
+| System.Net.WebSockets;ClientWebSocket;SendAsync;(System.ReadOnlyMemory<System.Byte>,System.Net.WebSockets.WebSocketMessageType,System.Net.WebSockets.WebSocketMessageFlags,System.Threading.CancellationToken);summary;df-generated |
 | System.Net.WebSockets;ClientWebSocket;get_HttpStatusCode;();summary;df-generated |
 | System.Net.WebSockets;ClientWebSocket;get_Options;();summary;df-generated |
 | System.Net.WebSockets;ClientWebSocket;get_State;();summary;df-generated |
@@ -31847,6 +34522,9 @@ neutral
 | System.Net.WebSockets;WebSocket;ReceiveAsync;(System.ArraySegment<System.Byte>,System.Threading.CancellationToken);summary;df-generated |
 | System.Net.WebSockets;WebSocket;ReceiveAsync;(System.Memory<System.Byte>,System.Threading.CancellationToken);summary;df-generated |
 | System.Net.WebSockets;WebSocket;RegisterPrefixes;();summary;df-generated |
+| System.Net.WebSockets;WebSocket;SendAsync;(System.ArraySegment<System.Byte>,System.Net.WebSockets.WebSocketMessageType,System.Boolean,System.Threading.CancellationToken);summary;df-generated |
+| System.Net.WebSockets;WebSocket;SendAsync;(System.ReadOnlyMemory<System.Byte>,System.Net.WebSockets.WebSocketMessageType,System.Boolean,System.Threading.CancellationToken);summary;df-generated |
+| System.Net.WebSockets;WebSocket;SendAsync;(System.ReadOnlyMemory<System.Byte>,System.Net.WebSockets.WebSocketMessageType,System.Net.WebSockets.WebSocketMessageFlags,System.Threading.CancellationToken);summary;df-generated |
 | System.Net.WebSockets;WebSocket;ThrowOnInvalidState;(System.Net.WebSockets.WebSocketState,System.Net.WebSockets.WebSocketState[]);summary;df-generated |
 | System.Net.WebSockets;WebSocket;get_DefaultKeepAliveInterval;();summary;df-generated |
 | System.Net.WebSockets;WebSocket;get_State;();summary;df-generated |
@@ -31908,6 +34586,11 @@ neutral
 | System.Net;CredentialCache;Remove;(System.Uri,System.String);summary;df-generated |
 | System.Net;CredentialCache;get_DefaultCredentials;();summary;df-generated |
 | System.Net;CredentialCache;get_DefaultNetworkCredentials;();summary;df-generated |
+| System.Net;Dns;BeginGetHostAddresses;(System.String,System.AsyncCallback,System.Object);summary;df-generated |
+| System.Net;Dns;BeginGetHostByName;(System.String,System.AsyncCallback,System.Object);summary;df-generated |
+| System.Net;Dns;BeginGetHostEntry;(System.Net.IPAddress,System.AsyncCallback,System.Object);summary;df-generated |
+| System.Net;Dns;BeginGetHostEntry;(System.String,System.AsyncCallback,System.Object);summary;df-generated |
+| System.Net;Dns;BeginResolve;(System.String,System.AsyncCallback,System.Object);summary;df-generated |
 | System.Net;Dns;EndGetHostAddresses;(System.IAsyncResult);summary;df-generated |
 | System.Net;Dns;EndGetHostByName;(System.IAsyncResult);summary;df-generated |
 | System.Net;Dns;EndGetHostEntry;(System.IAsyncResult);summary;df-generated |
@@ -31952,14 +34635,20 @@ neutral
 | System.Net;EndpointPermission;get_Port;();summary;df-generated |
 | System.Net;EndpointPermission;get_Transport;();summary;df-generated |
 | System.Net;FileWebRequest;Abort;();summary;df-generated |
+| System.Net;FileWebRequest;BeginGetRequestStream;(System.AsyncCallback,System.Object);summary;df-generated |
+| System.Net;FileWebRequest;BeginGetResponse;(System.AsyncCallback,System.Object);summary;df-generated |
 | System.Net;FileWebRequest;FileWebRequest;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);summary;df-generated |
 | System.Net;FileWebRequest;GetObjectData;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);summary;df-generated |
 | System.Net;FileWebRequest;GetResponseAsync;();summary;df-generated |
+| System.Net;FileWebRequest;get_RequestUri;();summary;df-generated |
 | System.Net;FileWebResponse;Close;();summary;df-generated |
 | System.Net;FileWebResponse;FileWebResponse;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);summary;df-generated |
 | System.Net;FileWebResponse;GetObjectData;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);summary;df-generated |
 | System.Net;FileWebResponse;get_SupportsHeaders;();summary;df-generated |
 | System.Net;FtpWebRequest;Abort;();summary;df-generated |
+| System.Net;FtpWebRequest;BeginGetRequestStream;(System.AsyncCallback,System.Object);summary;df-generated |
+| System.Net;FtpWebRequest;BeginGetResponse;(System.AsyncCallback,System.Object);summary;df-generated |
+| System.Net;FtpWebRequest;get_RequestUri;();summary;df-generated |
 | System.Net;FtpWebRequest;get_ServicePoint;();summary;df-generated |
 | System.Net;FtpWebResponse;Close;();summary;df-generated |
 | System.Net;FtpWebResponse;get_LastModified;();summary;df-generated |
@@ -31989,6 +34678,7 @@ neutral
 | System.Net;HttpListenerPrefixCollection;get_Count;();summary;df-generated |
 | System.Net;HttpListenerPrefixCollection;get_IsReadOnly;();summary;df-generated |
 | System.Net;HttpListenerPrefixCollection;get_IsSynchronized;();summary;df-generated |
+| System.Net;HttpListenerRequest;BeginGetClientCertificate;(System.AsyncCallback,System.Object);summary;df-generated |
 | System.Net;HttpListenerRequest;GetClientCertificateAsync;();summary;df-generated |
 | System.Net;HttpListenerRequest;get_AcceptTypes;();summary;df-generated |
 | System.Net;HttpListenerRequest;get_ClientCertificateError;();summary;df-generated |
@@ -32005,6 +34695,7 @@ neutral
 | System.Net;HttpListenerRequest;get_RemoteEndPoint;();summary;df-generated |
 | System.Net;HttpListenerRequest;get_RequestTraceIdentifier;();summary;df-generated |
 | System.Net;HttpListenerRequest;get_TransportContext;();summary;df-generated |
+| System.Net;HttpListenerRequest;get_UrlReferrer;();summary;df-generated |
 | System.Net;HttpListenerRequest;get_UserHostAddress;();summary;df-generated |
 | System.Net;HttpListenerRequest;get_UserLanguages;();summary;df-generated |
 | System.Net;HttpListenerResponse;Abort;();summary;df-generated |
@@ -32023,9 +34714,12 @@ neutral
 | System.Net;HttpWebRequest;AddRange;(System.String,System.Int32,System.Int32);summary;df-generated |
 | System.Net;HttpWebRequest;AddRange;(System.String,System.Int64);summary;df-generated |
 | System.Net;HttpWebRequest;AddRange;(System.String,System.Int64,System.Int64);summary;df-generated |
+| System.Net;HttpWebRequest;BeginGetRequestStream;(System.AsyncCallback,System.Object);summary;df-generated |
+| System.Net;HttpWebRequest;BeginGetResponse;(System.AsyncCallback,System.Object);summary;df-generated |
 | System.Net;HttpWebRequest;GetObjectData;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);summary;df-generated |
 | System.Net;HttpWebRequest;HttpWebRequest;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);summary;df-generated |
 | System.Net;HttpWebRequest;get_HaveResponse;();summary;df-generated |
+| System.Net;HttpWebRequest;get_RequestUri;();summary;df-generated |
 | System.Net;HttpWebRequest;get_ServicePoint;();summary;df-generated |
 | System.Net;HttpWebRequest;get_SupportsCookieContainer;();summary;df-generated |
 | System.Net;HttpWebResponse;Close;();summary;df-generated |
@@ -32135,6 +34829,7 @@ neutral
 | System.Net;SocketAddress;SocketAddress;(System.Net.Sockets.AddressFamily);summary;df-generated |
 | System.Net;SocketAddress;SocketAddress;(System.Net.Sockets.AddressFamily,System.Int32);summary;df-generated |
 | System.Net;SocketAddress;ToString;();summary;df-generated |
+| System.Net;SocketAddress;get_Buffer;();summary;df-generated |
 | System.Net;SocketAddress;get_Family;();summary;df-generated |
 | System.Net;SocketAddress;get_Item;(System.Int32);summary;df-generated |
 | System.Net;SocketAddress;set_Item;(System.Int32,System.Byte);summary;df-generated |
@@ -32155,6 +34850,27 @@ neutral
 | System.Net;UploadProgressChangedEventArgs;get_TotalBytesToReceive;();summary;df-generated |
 | System.Net;UploadProgressChangedEventArgs;get_TotalBytesToSend;();summary;df-generated |
 | System.Net;WebClient;CancelAsync;();summary;df-generated |
+| System.Net;WebClient;DownloadData;(System.String);summary;df-generated |
+| System.Net;WebClient;DownloadData;(System.Uri);summary;df-generated |
+| System.Net;WebClient;DownloadDataAsync;(System.Uri);summary;df-generated |
+| System.Net;WebClient;DownloadDataAsync;(System.Uri,System.Object);summary;df-generated |
+| System.Net;WebClient;DownloadDataTaskAsync;(System.String);summary;df-generated |
+| System.Net;WebClient;DownloadDataTaskAsync;(System.Uri);summary;df-generated |
+| System.Net;WebClient;DownloadFile;(System.String,System.String);summary;df-generated |
+| System.Net;WebClient;DownloadFile;(System.Uri,System.String);summary;df-generated |
+| System.Net;WebClient;DownloadFileAsync;(System.Uri,System.String);summary;df-generated |
+| System.Net;WebClient;DownloadFileAsync;(System.Uri,System.String,System.Object);summary;df-generated |
+| System.Net;WebClient;DownloadFileTaskAsync;(System.String,System.String);summary;df-generated |
+| System.Net;WebClient;DownloadFileTaskAsync;(System.Uri,System.String);summary;df-generated |
+| System.Net;WebClient;DownloadString;(System.String);summary;df-generated |
+| System.Net;WebClient;DownloadString;(System.Uri);summary;df-generated |
+| System.Net;WebClient;DownloadStringAsync;(System.Uri);summary;df-generated |
+| System.Net;WebClient;DownloadStringAsync;(System.Uri,System.Object);summary;df-generated |
+| System.Net;WebClient;DownloadStringTaskAsync;(System.String);summary;df-generated |
+| System.Net;WebClient;DownloadStringTaskAsync;(System.Uri);summary;df-generated |
+| System.Net;WebClient;GetWebRequest;(System.Uri);summary;df-generated |
+| System.Net;WebClient;GetWebResponse;(System.Net.WebRequest);summary;df-generated |
+| System.Net;WebClient;GetWebResponse;(System.Net.WebRequest,System.IAsyncResult);summary;df-generated |
 | System.Net;WebClient;OnDownloadDataCompleted;(System.Net.DownloadDataCompletedEventArgs);summary;df-generated |
 | System.Net;WebClient;OnDownloadFileCompleted;(System.ComponentModel.AsyncCompletedEventArgs);summary;df-generated |
 | System.Net;WebClient;OnDownloadProgressChanged;(System.Net.DownloadProgressChangedEventArgs);summary;df-generated |
@@ -32167,7 +34883,60 @@ neutral
 | System.Net;WebClient;OnUploadStringCompleted;(System.Net.UploadStringCompletedEventArgs);summary;df-generated |
 | System.Net;WebClient;OnUploadValuesCompleted;(System.Net.UploadValuesCompletedEventArgs);summary;df-generated |
 | System.Net;WebClient;OnWriteStreamClosed;(System.Net.WriteStreamClosedEventArgs);summary;df-generated |
+| System.Net;WebClient;OpenRead;(System.String);summary;df-generated |
+| System.Net;WebClient;OpenRead;(System.Uri);summary;df-generated |
+| System.Net;WebClient;OpenReadAsync;(System.Uri);summary;df-generated |
+| System.Net;WebClient;OpenReadAsync;(System.Uri,System.Object);summary;df-generated |
+| System.Net;WebClient;OpenReadTaskAsync;(System.String);summary;df-generated |
+| System.Net;WebClient;OpenReadTaskAsync;(System.Uri);summary;df-generated |
+| System.Net;WebClient;OpenWriteAsync;(System.Uri);summary;df-generated |
+| System.Net;WebClient;OpenWriteTaskAsync;(System.String);summary;df-generated |
+| System.Net;WebClient;OpenWriteTaskAsync;(System.Uri);summary;df-generated |
+| System.Net;WebClient;UploadData;(System.String,System.Byte[]);summary;df-generated |
+| System.Net;WebClient;UploadData;(System.Uri,System.Byte[]);summary;df-generated |
+| System.Net;WebClient;UploadDataAsync;(System.Uri,System.Byte[]);summary;df-generated |
+| System.Net;WebClient;UploadDataTaskAsync;(System.String,System.Byte[]);summary;df-generated |
+| System.Net;WebClient;UploadDataTaskAsync;(System.Uri,System.Byte[]);summary;df-generated |
+| System.Net;WebClient;UploadFile;(System.String,System.String);summary;df-generated |
+| System.Net;WebClient;UploadFile;(System.Uri,System.String);summary;df-generated |
+| System.Net;WebClient;UploadFileAsync;(System.Uri,System.String);summary;df-generated |
+| System.Net;WebClient;UploadFileTaskAsync;(System.String,System.String);summary;df-generated |
+| System.Net;WebClient;UploadFileTaskAsync;(System.Uri,System.String);summary;df-generated |
+| System.Net;WebClient;UploadString;(System.String,System.String);summary;df-generated |
+| System.Net;WebClient;UploadString;(System.Uri,System.String);summary;df-generated |
+| System.Net;WebClient;UploadStringAsync;(System.Uri,System.String);summary;df-generated |
+| System.Net;WebClient;UploadStringTaskAsync;(System.String,System.String);summary;df-generated |
+| System.Net;WebClient;UploadStringTaskAsync;(System.Uri,System.String);summary;df-generated |
+| System.Net;WebClient;UploadValues;(System.String,System.Collections.Specialized.NameValueCollection);summary;df-generated |
+| System.Net;WebClient;UploadValues;(System.Uri,System.Collections.Specialized.NameValueCollection);summary;df-generated |
+| System.Net;WebClient;UploadValuesAsync;(System.Uri,System.Collections.Specialized.NameValueCollection);summary;df-generated |
+| System.Net;WebClient;UploadValuesTaskAsync;(System.String,System.Collections.Specialized.NameValueCollection);summary;df-generated |
+| System.Net;WebClient;UploadValuesTaskAsync;(System.Uri,System.Collections.Specialized.NameValueCollection);summary;df-generated |
+| System.Net;WebClient;add_DownloadDataCompleted;(System.Net.DownloadDataCompletedEventHandler);summary;df-generated |
+| System.Net;WebClient;add_DownloadFileCompleted;(System.ComponentModel.AsyncCompletedEventHandler);summary;df-generated |
+| System.Net;WebClient;add_DownloadProgressChanged;(System.Net.DownloadProgressChangedEventHandler);summary;df-generated |
+| System.Net;WebClient;add_DownloadStringCompleted;(System.Net.DownloadStringCompletedEventHandler);summary;df-generated |
+| System.Net;WebClient;add_OpenReadCompleted;(System.Net.OpenReadCompletedEventHandler);summary;df-generated |
+| System.Net;WebClient;add_OpenWriteCompleted;(System.Net.OpenWriteCompletedEventHandler);summary;df-generated |
+| System.Net;WebClient;add_UploadDataCompleted;(System.Net.UploadDataCompletedEventHandler);summary;df-generated |
+| System.Net;WebClient;add_UploadFileCompleted;(System.Net.UploadFileCompletedEventHandler);summary;df-generated |
+| System.Net;WebClient;add_UploadProgressChanged;(System.Net.UploadProgressChangedEventHandler);summary;df-generated |
+| System.Net;WebClient;add_UploadStringCompleted;(System.Net.UploadStringCompletedEventHandler);summary;df-generated |
+| System.Net;WebClient;add_UploadValuesCompleted;(System.Net.UploadValuesCompletedEventHandler);summary;df-generated |
+| System.Net;WebClient;add_WriteStreamClosed;(System.Net.WriteStreamClosedEventHandler);summary;df-generated |
 | System.Net;WebClient;get_IsBusy;();summary;df-generated |
+| System.Net;WebClient;remove_DownloadDataCompleted;(System.Net.DownloadDataCompletedEventHandler);summary;df-generated |
+| System.Net;WebClient;remove_DownloadFileCompleted;(System.ComponentModel.AsyncCompletedEventHandler);summary;df-generated |
+| System.Net;WebClient;remove_DownloadProgressChanged;(System.Net.DownloadProgressChangedEventHandler);summary;df-generated |
+| System.Net;WebClient;remove_DownloadStringCompleted;(System.Net.DownloadStringCompletedEventHandler);summary;df-generated |
+| System.Net;WebClient;remove_OpenReadCompleted;(System.Net.OpenReadCompletedEventHandler);summary;df-generated |
+| System.Net;WebClient;remove_OpenWriteCompleted;(System.Net.OpenWriteCompletedEventHandler);summary;df-generated |
+| System.Net;WebClient;remove_UploadDataCompleted;(System.Net.UploadDataCompletedEventHandler);summary;df-generated |
+| System.Net;WebClient;remove_UploadFileCompleted;(System.Net.UploadFileCompletedEventHandler);summary;df-generated |
+| System.Net;WebClient;remove_UploadProgressChanged;(System.Net.UploadProgressChangedEventHandler);summary;df-generated |
+| System.Net;WebClient;remove_UploadStringCompleted;(System.Net.UploadStringCompletedEventHandler);summary;df-generated |
+| System.Net;WebClient;remove_UploadValuesCompleted;(System.Net.UploadValuesCompletedEventHandler);summary;df-generated |
+| System.Net;WebClient;remove_WriteStreamClosed;(System.Net.WriteStreamClosedEventHandler);summary;df-generated |
 | System.Net;WebException;WebException;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);summary;df-generated |
 | System.Net;WebException;WebException;(System.String);summary;df-generated |
 | System.Net;WebException;WebException;(System.String,System.Exception);summary;df-generated |
@@ -32218,11 +34987,14 @@ neutral
 | System.Net;WebProxy;WebProxy;(System.Uri,System.Boolean,System.String[],System.Net.ICredentials);summary;df-generated |
 | System.Net;WebProxy;get_BypassArrayList;();summary;df-generated |
 | System.Net;WebRequest;Abort;();summary;df-generated |
+| System.Net;WebRequest;BeginGetRequestStream;(System.AsyncCallback,System.Object);summary;df-generated |
+| System.Net;WebRequest;BeginGetResponse;(System.AsyncCallback,System.Object);summary;df-generated |
 | System.Net;WebRequest;GetObjectData;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);summary;df-generated |
 | System.Net;WebRequest;GetResponseAsync;();summary;df-generated |
 | System.Net;WebRequest;GetSystemWebProxy;();summary;df-generated |
 | System.Net;WebRequest;RegisterPrefix;(System.String,System.Net.IWebRequestCreate);summary;df-generated |
 | System.Net;WebRequest;WebRequest;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);summary;df-generated |
+| System.Net;WebRequest;get_RequestUri;();summary;df-generated |
 | System.Net;WebResponse;Close;();summary;df-generated |
 | System.Net;WebResponse;Dispose;();summary;df-generated |
 | System.Net;WebResponse;Dispose;(System.Boolean);summary;df-generated |
@@ -32234,6 +35006,7 @@ neutral
 | System.Net;WebUtility;UrlDecodeToBytes;(System.Byte[],System.Int32,System.Int32);summary;df-generated |
 | System.Net;WebUtility;UrlEncodeToBytes;(System.Byte[],System.Int32,System.Int32);summary;df-generated |
 | System.Net;WriteStreamClosedEventArgs;get_Error;();summary;df-generated |
+| System.Numerics;BigInteger;Abs;(System.Numerics.BigInteger);summary;df-generated |
 | System.Numerics;BigInteger;Add;(System.Numerics.BigInteger,System.Numerics.BigInteger);summary;df-generated |
 | System.Numerics;BigInteger;BigInteger;(System.Byte[]);summary;df-generated |
 | System.Numerics;BigInteger;BigInteger;(System.Decimal);summary;df-generated |
@@ -32249,6 +35022,7 @@ neutral
 | System.Numerics;BigInteger;CompareTo;(System.Numerics.BigInteger);summary;df-generated |
 | System.Numerics;BigInteger;CompareTo;(System.Object);summary;df-generated |
 | System.Numerics;BigInteger;CompareTo;(System.UInt64);summary;df-generated |
+| System.Numerics;BigInteger;DivRem;(System.Numerics.BigInteger,System.Numerics.BigInteger);summary;df-generated |
 | System.Numerics;BigInteger;Divide;(System.Numerics.BigInteger,System.Numerics.BigInteger);summary;df-generated |
 | System.Numerics;BigInteger;Equals;(System.Int64);summary;df-generated |
 | System.Numerics;BigInteger;Equals;(System.Numerics.BigInteger);summary;df-generated |
@@ -32283,6 +35057,10 @@ neutral
 | System.Numerics;BigInteger;Log10;(System.Numerics.BigInteger);summary;df-generated |
 | System.Numerics;BigInteger;Log;(System.Numerics.BigInteger);summary;df-generated |
 | System.Numerics;BigInteger;Log;(System.Numerics.BigInteger,System.Double);summary;df-generated |
+| System.Numerics;BigInteger;MaxMagnitude;(System.Numerics.BigInteger,System.Numerics.BigInteger);summary;df-generated |
+| System.Numerics;BigInteger;MaxMagnitudeNumber;(System.Numerics.BigInteger,System.Numerics.BigInteger);summary;df-generated |
+| System.Numerics;BigInteger;MinMagnitude;(System.Numerics.BigInteger,System.Numerics.BigInteger);summary;df-generated |
+| System.Numerics;BigInteger;MinMagnitudeNumber;(System.Numerics.BigInteger,System.Numerics.BigInteger);summary;df-generated |
 | System.Numerics;BigInteger;ModPow;(System.Numerics.BigInteger,System.Numerics.BigInteger,System.Numerics.BigInteger);summary;df-generated |
 | System.Numerics;BigInteger;Multiply;(System.Numerics.BigInteger,System.Numerics.BigInteger);summary;df-generated |
 | System.Numerics;BigInteger;Negate;(System.Numerics.BigInteger);summary;df-generated |
@@ -32293,8 +35071,32 @@ neutral
 | System.Numerics;BigInteger;Parse;(System.String,System.Globalization.NumberStyles,System.IFormatProvider);summary;df-generated |
 | System.Numerics;BigInteger;Parse;(System.String,System.IFormatProvider);summary;df-generated |
 | System.Numerics;BigInteger;PopCount;(System.Numerics.BigInteger);summary;df-generated |
+| System.Numerics;BigInteger;RotateLeft;(System.Numerics.BigInteger,System.Int32);summary;df-generated |
+| System.Numerics;BigInteger;RotateRight;(System.Numerics.BigInteger,System.Int32);summary;df-generated |
 | System.Numerics;BigInteger;Sign;(System.Numerics.BigInteger);summary;df-generated |
 | System.Numerics;BigInteger;Subtract;(System.Numerics.BigInteger,System.Numerics.BigInteger);summary;df-generated |
+| System.Numerics;BigInteger;System.Numerics.IAdditionOperators<System.Numerics.BigInteger,System.Numerics.BigInteger,System.Numerics.BigInteger>.op_Addition;(System.Numerics.BigInteger,System.Numerics.BigInteger);summary;df-generated |
+| System.Numerics;BigInteger;System.Numerics.IBitwiseOperators<System.Numerics.BigInteger,System.Numerics.BigInteger,System.Numerics.BigInteger>.op_BitwiseAnd;(System.Numerics.BigInteger,System.Numerics.BigInteger);summary;df-generated |
+| System.Numerics;BigInteger;System.Numerics.IBitwiseOperators<System.Numerics.BigInteger,System.Numerics.BigInteger,System.Numerics.BigInteger>.op_BitwiseOr;(System.Numerics.BigInteger,System.Numerics.BigInteger);summary;df-generated |
+| System.Numerics;BigInteger;System.Numerics.IBitwiseOperators<System.Numerics.BigInteger,System.Numerics.BigInteger,System.Numerics.BigInteger>.op_ExclusiveOr;(System.Numerics.BigInteger,System.Numerics.BigInteger);summary;df-generated |
+| System.Numerics;BigInteger;System.Numerics.IBitwiseOperators<System.Numerics.BigInteger,System.Numerics.BigInteger,System.Numerics.BigInteger>.op_OnesComplement;(System.Numerics.BigInteger);summary;df-generated |
+| System.Numerics;BigInteger;System.Numerics.IComparisonOperators<System.Numerics.BigInteger,System.Numerics.BigInteger,System.Boolean>.op_GreaterThan;(System.Numerics.BigInteger,System.Numerics.BigInteger);summary;df-generated |
+| System.Numerics;BigInteger;System.Numerics.IComparisonOperators<System.Numerics.BigInteger,System.Numerics.BigInteger,System.Boolean>.op_GreaterThanOrEqual;(System.Numerics.BigInteger,System.Numerics.BigInteger);summary;df-generated |
+| System.Numerics;BigInteger;System.Numerics.IComparisonOperators<System.Numerics.BigInteger,System.Numerics.BigInteger,System.Boolean>.op_LessThan;(System.Numerics.BigInteger,System.Numerics.BigInteger);summary;df-generated |
+| System.Numerics;BigInteger;System.Numerics.IComparisonOperators<System.Numerics.BigInteger,System.Numerics.BigInteger,System.Boolean>.op_LessThanOrEqual;(System.Numerics.BigInteger,System.Numerics.BigInteger);summary;df-generated |
+| System.Numerics;BigInteger;System.Numerics.IDecrementOperators<System.Numerics.BigInteger>.op_Decrement;(System.Numerics.BigInteger);summary;df-generated |
+| System.Numerics;BigInteger;System.Numerics.IDivisionOperators<System.Numerics.BigInteger,System.Numerics.BigInteger,System.Numerics.BigInteger>.op_Division;(System.Numerics.BigInteger,System.Numerics.BigInteger);summary;df-generated |
+| System.Numerics;BigInteger;System.Numerics.IEqualityOperators<System.Numerics.BigInteger,System.Numerics.BigInteger,System.Boolean>.op_Equality;(System.Numerics.BigInteger,System.Numerics.BigInteger);summary;df-generated |
+| System.Numerics;BigInteger;System.Numerics.IEqualityOperators<System.Numerics.BigInteger,System.Numerics.BigInteger,System.Boolean>.op_Inequality;(System.Numerics.BigInteger,System.Numerics.BigInteger);summary;df-generated |
+| System.Numerics;BigInteger;System.Numerics.IIncrementOperators<System.Numerics.BigInteger>.op_Increment;(System.Numerics.BigInteger);summary;df-generated |
+| System.Numerics;BigInteger;System.Numerics.IModulusOperators<System.Numerics.BigInteger,System.Numerics.BigInteger,System.Numerics.BigInteger>.op_Modulus;(System.Numerics.BigInteger,System.Numerics.BigInteger);summary;df-generated |
+| System.Numerics;BigInteger;System.Numerics.IMultiplyOperators<System.Numerics.BigInteger,System.Numerics.BigInteger,System.Numerics.BigInteger>.op_Multiply;(System.Numerics.BigInteger,System.Numerics.BigInteger);summary;df-generated |
+| System.Numerics;BigInteger;System.Numerics.IShiftOperators<System.Numerics.BigInteger,System.Int32,System.Numerics.BigInteger>.op_LeftShift;(System.Numerics.BigInteger,System.Int32);summary;df-generated |
+| System.Numerics;BigInteger;System.Numerics.IShiftOperators<System.Numerics.BigInteger,System.Int32,System.Numerics.BigInteger>.op_RightShift;(System.Numerics.BigInteger,System.Int32);summary;df-generated |
+| System.Numerics;BigInteger;System.Numerics.IShiftOperators<System.Numerics.BigInteger,System.Int32,System.Numerics.BigInteger>.op_UnsignedRightShift;(System.Numerics.BigInteger,System.Int32);summary;df-generated |
+| System.Numerics;BigInteger;System.Numerics.ISubtractionOperators<System.Numerics.BigInteger,System.Numerics.BigInteger,System.Numerics.BigInteger>.op_Subtraction;(System.Numerics.BigInteger,System.Numerics.BigInteger);summary;df-generated |
+| System.Numerics;BigInteger;System.Numerics.IUnaryNegationOperators<System.Numerics.BigInteger,System.Numerics.BigInteger>.op_UnaryNegation;(System.Numerics.BigInteger);summary;df-generated |
+| System.Numerics;BigInteger;System.Numerics.IUnaryPlusOperators<System.Numerics.BigInteger,System.Numerics.BigInteger>.op_UnaryPlus;(System.Numerics.BigInteger);summary;df-generated |
 | System.Numerics;BigInteger;ToByteArray;();summary;df-generated |
 | System.Numerics;BigInteger;ToByteArray;(System.Boolean,System.Boolean);summary;df-generated |
 | System.Numerics;BigInteger;ToString;();summary;df-generated |
@@ -32429,6 +35231,10 @@ neutral
 | System.Numerics;Complex;Log10;(System.Numerics.Complex);summary;df-generated |
 | System.Numerics;Complex;Log;(System.Numerics.Complex);summary;df-generated |
 | System.Numerics;Complex;Log;(System.Numerics.Complex,System.Double);summary;df-generated |
+| System.Numerics;Complex;MaxMagnitude;(System.Numerics.Complex,System.Numerics.Complex);summary;df-generated |
+| System.Numerics;Complex;MaxMagnitudeNumber;(System.Numerics.Complex,System.Numerics.Complex);summary;df-generated |
+| System.Numerics;Complex;MinMagnitude;(System.Numerics.Complex,System.Numerics.Complex);summary;df-generated |
+| System.Numerics;Complex;MinMagnitudeNumber;(System.Numerics.Complex,System.Numerics.Complex);summary;df-generated |
 | System.Numerics;Complex;Multiply;(System.Double,System.Numerics.Complex);summary;df-generated |
 | System.Numerics;Complex;Multiply;(System.Numerics.Complex,System.Double);summary;df-generated |
 | System.Numerics;Complex;Multiply;(System.Numerics.Complex,System.Numerics.Complex);summary;df-generated |
@@ -32446,6 +35252,16 @@ neutral
 | System.Numerics;Complex;Subtract;(System.Double,System.Numerics.Complex);summary;df-generated |
 | System.Numerics;Complex;Subtract;(System.Numerics.Complex,System.Double);summary;df-generated |
 | System.Numerics;Complex;Subtract;(System.Numerics.Complex,System.Numerics.Complex);summary;df-generated |
+| System.Numerics;Complex;System.Numerics.IAdditionOperators<System.Numerics.Complex,System.Numerics.Complex,System.Numerics.Complex>.op_Addition;(System.Numerics.Complex,System.Numerics.Complex);summary;df-generated |
+| System.Numerics;Complex;System.Numerics.IDecrementOperators<System.Numerics.Complex>.op_Decrement;(System.Numerics.Complex);summary;df-generated |
+| System.Numerics;Complex;System.Numerics.IDivisionOperators<System.Numerics.Complex,System.Numerics.Complex,System.Numerics.Complex>.op_Division;(System.Numerics.Complex,System.Numerics.Complex);summary;df-generated |
+| System.Numerics;Complex;System.Numerics.IEqualityOperators<System.Numerics.Complex,System.Numerics.Complex,System.Boolean>.op_Equality;(System.Numerics.Complex,System.Numerics.Complex);summary;df-generated |
+| System.Numerics;Complex;System.Numerics.IEqualityOperators<System.Numerics.Complex,System.Numerics.Complex,System.Boolean>.op_Inequality;(System.Numerics.Complex,System.Numerics.Complex);summary;df-generated |
+| System.Numerics;Complex;System.Numerics.IIncrementOperators<System.Numerics.Complex>.op_Increment;(System.Numerics.Complex);summary;df-generated |
+| System.Numerics;Complex;System.Numerics.IMultiplyOperators<System.Numerics.Complex,System.Numerics.Complex,System.Numerics.Complex>.op_Multiply;(System.Numerics.Complex,System.Numerics.Complex);summary;df-generated |
+| System.Numerics;Complex;System.Numerics.ISubtractionOperators<System.Numerics.Complex,System.Numerics.Complex,System.Numerics.Complex>.op_Subtraction;(System.Numerics.Complex,System.Numerics.Complex);summary;df-generated |
+| System.Numerics;Complex;System.Numerics.IUnaryNegationOperators<System.Numerics.Complex,System.Numerics.Complex>.op_UnaryNegation;(System.Numerics.Complex);summary;df-generated |
+| System.Numerics;Complex;System.Numerics.IUnaryPlusOperators<System.Numerics.Complex,System.Numerics.Complex>.op_UnaryPlus;(System.Numerics.Complex);summary;df-generated |
 | System.Numerics;Complex;Tan;(System.Numerics.Complex);summary;df-generated |
 | System.Numerics;Complex;Tanh;(System.Numerics.Complex);summary;df-generated |
 | System.Numerics;Complex;ToString;();summary;df-generated |
@@ -33112,7 +35928,6 @@ neutral
 | System.Numerics;Vector;Store<T>;(System.Numerics.Vector<T>,T*);summary;df-generated |
 | System.Numerics;Vector;StoreAligned<T>;(System.Numerics.Vector<T>,T*);summary;df-generated |
 | System.Numerics;Vector;StoreAlignedNonTemporal<T>;(System.Numerics.Vector<T>,T*);summary;df-generated |
-| System.Numerics;Vector;StoreUnsafe<T>;(System.Numerics.Vector<T>,T);summary;df-generated |
 | System.Numerics;Vector;StoreUnsafe<T>;(System.Numerics.Vector<T>,T,System.UIntPtr);summary;df-generated |
 | System.Numerics;Vector;Subtract<T>;(System.Numerics.Vector<T>,System.Numerics.Vector<T>);summary;df-generated |
 | System.Numerics;Vector;Sum<T>;(System.Numerics.Vector<T>);summary;df-generated |
@@ -33182,6 +35997,7 @@ neutral
 | System.Numerics;Vector<T>;op_UnsignedRightShift;(System.Numerics.Vector<T>,System.Int32);summary;df-generated |
 | System.Reflection.Emit;AssemblyBuilder;DefineDynamicModule;(System.String);summary;df-generated |
 | System.Reflection.Emit;AssemblyBuilder;Equals;(System.Object);summary;df-generated |
+| System.Reflection.Emit;AssemblyBuilder;GetCustomAttributes;(System.Boolean);summary;df-generated |
 | System.Reflection.Emit;AssemblyBuilder;GetCustomAttributes;(System.Type,System.Boolean);summary;df-generated |
 | System.Reflection.Emit;AssemblyBuilder;GetCustomAttributesData;();summary;df-generated |
 | System.Reflection.Emit;AssemblyBuilder;GetDynamicModule;(System.String);summary;df-generated |
@@ -33201,11 +36017,11 @@ neutral
 | System.Reflection.Emit;AssemblyBuilder;get_IsDynamic;();summary;df-generated |
 | System.Reflection.Emit;AssemblyBuilder;get_ReflectionOnly;();summary;df-generated |
 | System.Reflection.Emit;ConstructorBuilder;DefineParameter;(System.Int32,System.Reflection.ParameterAttributes,System.String);summary;df-generated |
+| System.Reflection.Emit;ConstructorBuilder;GetCustomAttributes;(System.Boolean);summary;df-generated |
 | System.Reflection.Emit;ConstructorBuilder;GetCustomAttributes;(System.Type,System.Boolean);summary;df-generated |
 | System.Reflection.Emit;ConstructorBuilder;GetILGenerator;();summary;df-generated |
 | System.Reflection.Emit;ConstructorBuilder;GetILGenerator;(System.Int32);summary;df-generated |
 | System.Reflection.Emit;ConstructorBuilder;GetMethodImplementationFlags;();summary;df-generated |
-| System.Reflection.Emit;ConstructorBuilder;Invoke;(System.Object,System.Reflection.BindingFlags,System.Reflection.Binder,System.Object[],System.Globalization.CultureInfo);summary;df-generated |
 | System.Reflection.Emit;ConstructorBuilder;Invoke;(System.Reflection.BindingFlags,System.Reflection.Binder,System.Object[],System.Globalization.CultureInfo);summary;df-generated |
 | System.Reflection.Emit;ConstructorBuilder;IsDefined;(System.Type,System.Boolean);summary;df-generated |
 | System.Reflection.Emit;ConstructorBuilder;SetCustomAttribute;(System.Reflection.ConstructorInfo,System.Byte[]);summary;df-generated |
@@ -33233,12 +36049,12 @@ neutral
 | System.Reflection.Emit;DynamicILInfo;SetLocalSignature;(System.Byte[]);summary;df-generated |
 | System.Reflection.Emit;DynamicMethod;CreateDelegate;(System.Type,System.Object);summary;df-generated |
 | System.Reflection.Emit;DynamicMethod;DefineParameter;(System.Int32,System.Reflection.ParameterAttributes,System.String);summary;df-generated |
+| System.Reflection.Emit;DynamicMethod;GetCustomAttributes;(System.Boolean);summary;df-generated |
 | System.Reflection.Emit;DynamicMethod;GetCustomAttributes;(System.Type,System.Boolean);summary;df-generated |
 | System.Reflection.Emit;DynamicMethod;GetDynamicILInfo;();summary;df-generated |
 | System.Reflection.Emit;DynamicMethod;GetILGenerator;();summary;df-generated |
 | System.Reflection.Emit;DynamicMethod;GetILGenerator;(System.Int32);summary;df-generated |
 | System.Reflection.Emit;DynamicMethod;GetMethodImplementationFlags;();summary;df-generated |
-| System.Reflection.Emit;DynamicMethod;Invoke;(System.Object,System.Reflection.BindingFlags,System.Reflection.Binder,System.Object[],System.Globalization.CultureInfo);summary;df-generated |
 | System.Reflection.Emit;DynamicMethod;IsDefined;(System.Type,System.Boolean);summary;df-generated |
 | System.Reflection.Emit;DynamicMethod;ToString;();summary;df-generated |
 | System.Reflection.Emit;DynamicMethod;get_Attributes;();summary;df-generated |
@@ -33253,6 +36069,7 @@ neutral
 | System.Reflection.Emit;EnumBuilder;DefineLiteralCore;(System.String,System.Object);summary;df-generated |
 | System.Reflection.Emit;EnumBuilder;GetAttributeFlagsImpl;();summary;df-generated |
 | System.Reflection.Emit;EnumBuilder;GetConstructors;(System.Reflection.BindingFlags);summary;df-generated |
+| System.Reflection.Emit;EnumBuilder;GetCustomAttributes;(System.Boolean);summary;df-generated |
 | System.Reflection.Emit;EnumBuilder;GetCustomAttributes;(System.Type,System.Boolean);summary;df-generated |
 | System.Reflection.Emit;EnumBuilder;GetEvents;();summary;df-generated |
 | System.Reflection.Emit;EnumBuilder;GetEvents;(System.Reflection.BindingFlags);summary;df-generated |
@@ -33287,6 +36104,7 @@ neutral
 | System.Reflection.Emit;EventBuilder;SetCustomAttributeCore;(System.Reflection.ConstructorInfo,System.ReadOnlySpan<System.Byte>);summary;df-generated |
 | System.Reflection.Emit;EventBuilder;SetRaiseMethod;(System.Reflection.Emit.MethodBuilder);summary;df-generated |
 | System.Reflection.Emit;EventBuilder;SetRemoveOnMethod;(System.Reflection.Emit.MethodBuilder);summary;df-generated |
+| System.Reflection.Emit;FieldBuilder;GetCustomAttributes;(System.Boolean);summary;df-generated |
 | System.Reflection.Emit;FieldBuilder;GetCustomAttributes;(System.Type,System.Boolean);summary;df-generated |
 | System.Reflection.Emit;FieldBuilder;GetValue;(System.Object);summary;df-generated |
 | System.Reflection.Emit;FieldBuilder;IsDefined;(System.Type,System.Boolean);summary;df-generated |
@@ -33301,6 +36119,7 @@ neutral
 | System.Reflection.Emit;GenericTypeParameterBuilder;Equals;(System.Object);summary;df-generated |
 | System.Reflection.Emit;GenericTypeParameterBuilder;GetAttributeFlagsImpl;();summary;df-generated |
 | System.Reflection.Emit;GenericTypeParameterBuilder;GetConstructors;(System.Reflection.BindingFlags);summary;df-generated |
+| System.Reflection.Emit;GenericTypeParameterBuilder;GetCustomAttributes;(System.Boolean);summary;df-generated |
 | System.Reflection.Emit;GenericTypeParameterBuilder;GetCustomAttributes;(System.Type,System.Boolean);summary;df-generated |
 | System.Reflection.Emit;GenericTypeParameterBuilder;GetEvents;();summary;df-generated |
 | System.Reflection.Emit;GenericTypeParameterBuilder;GetEvents;(System.Reflection.BindingFlags);summary;df-generated |
@@ -33389,12 +36208,12 @@ neutral
 | System.Reflection.Emit;MethodBuilder;DefineGenericParameters;(System.String[]);summary;df-generated |
 | System.Reflection.Emit;MethodBuilder;DefineParameter;(System.Int32,System.Reflection.ParameterAttributes,System.String);summary;df-generated |
 | System.Reflection.Emit;MethodBuilder;Equals;(System.Object);summary;df-generated |
+| System.Reflection.Emit;MethodBuilder;GetCustomAttributes;(System.Boolean);summary;df-generated |
 | System.Reflection.Emit;MethodBuilder;GetCustomAttributes;(System.Type,System.Boolean);summary;df-generated |
 | System.Reflection.Emit;MethodBuilder;GetHashCode;();summary;df-generated |
 | System.Reflection.Emit;MethodBuilder;GetILGenerator;();summary;df-generated |
 | System.Reflection.Emit;MethodBuilder;GetILGenerator;(System.Int32);summary;df-generated |
 | System.Reflection.Emit;MethodBuilder;GetMethodImplementationFlags;();summary;df-generated |
-| System.Reflection.Emit;MethodBuilder;Invoke;(System.Object,System.Reflection.BindingFlags,System.Reflection.Binder,System.Object[],System.Globalization.CultureInfo);summary;df-generated |
 | System.Reflection.Emit;MethodBuilder;IsDefined;(System.Type,System.Boolean);summary;df-generated |
 | System.Reflection.Emit;MethodBuilder;SetCustomAttribute;(System.Reflection.ConstructorInfo,System.Byte[]);summary;df-generated |
 | System.Reflection.Emit;MethodBuilder;SetCustomAttribute;(System.Reflection.Emit.CustomAttributeBuilder);summary;df-generated |
@@ -33425,7 +36244,7 @@ neutral
 | System.Reflection.Emit;ModuleBuilder;DefineUninitializedData;(System.String,System.Int32,System.Reflection.FieldAttributes);summary;df-generated |
 | System.Reflection.Emit;ModuleBuilder;DefineUninitializedDataCore;(System.String,System.Int32,System.Reflection.FieldAttributes);summary;df-generated |
 | System.Reflection.Emit;ModuleBuilder;Equals;(System.Object);summary;df-generated |
-| System.Reflection.Emit;ModuleBuilder;GetArrayMethod;(System.Type,System.String,System.Reflection.CallingConventions,System.Type,System.Type[]);summary;df-generated |
+| System.Reflection.Emit;ModuleBuilder;GetCustomAttributes;(System.Boolean);summary;df-generated |
 | System.Reflection.Emit;ModuleBuilder;GetCustomAttributes;(System.Type,System.Boolean);summary;df-generated |
 | System.Reflection.Emit;ModuleBuilder;GetCustomAttributesData;();summary;df-generated |
 | System.Reflection.Emit;ModuleBuilder;GetFieldMetadataToken;(System.Reflection.FieldInfo);summary;df-generated |
@@ -33470,8 +36289,8 @@ neutral
 | System.Reflection.Emit;ParameterBuilder;get_IsOut;();summary;df-generated |
 | System.Reflection.Emit;ParameterBuilder;get_Position;();summary;df-generated |
 | System.Reflection.Emit;PropertyBuilder;AddOtherMethod;(System.Reflection.Emit.MethodBuilder);summary;df-generated |
+| System.Reflection.Emit;PropertyBuilder;GetCustomAttributes;(System.Boolean);summary;df-generated |
 | System.Reflection.Emit;PropertyBuilder;GetCustomAttributes;(System.Type,System.Boolean);summary;df-generated |
-| System.Reflection.Emit;PropertyBuilder;GetValue;(System.Object,System.Object[]);summary;df-generated |
 | System.Reflection.Emit;PropertyBuilder;GetValue;(System.Object,System.Reflection.BindingFlags,System.Reflection.Binder,System.Object[],System.Globalization.CultureInfo);summary;df-generated |
 | System.Reflection.Emit;PropertyBuilder;IsDefined;(System.Type,System.Boolean);summary;df-generated |
 | System.Reflection.Emit;PropertyBuilder;SetConstant;(System.Object);summary;df-generated |
@@ -33538,6 +36357,7 @@ neutral
 | System.Reflection.Emit;TypeBuilder;DefineUninitializedDataCore;(System.String,System.Int32,System.Reflection.FieldAttributes);summary;df-generated |
 | System.Reflection.Emit;TypeBuilder;GetAttributeFlagsImpl;();summary;df-generated |
 | System.Reflection.Emit;TypeBuilder;GetConstructors;(System.Reflection.BindingFlags);summary;df-generated |
+| System.Reflection.Emit;TypeBuilder;GetCustomAttributes;(System.Boolean);summary;df-generated |
 | System.Reflection.Emit;TypeBuilder;GetCustomAttributes;(System.Type,System.Boolean);summary;df-generated |
 | System.Reflection.Emit;TypeBuilder;GetEvents;();summary;df-generated |
 | System.Reflection.Emit;TypeBuilder;GetEvents;(System.Reflection.BindingFlags);summary;df-generated |
@@ -33587,6 +36407,7 @@ neutral
 | System.Reflection.Metadata.Ecma335;ArrayShapeEncoder;Shape;(System.Int32,System.Collections.Immutable.ImmutableArray<System.Int32>,System.Collections.Immutable.ImmutableArray<System.Int32>);summary;df-generated |
 | System.Reflection.Metadata.Ecma335;ArrayShapeEncoder;get_Builder;();summary;df-generated |
 | System.Reflection.Metadata.Ecma335;BlobEncoder;BlobEncoder;(System.Reflection.Metadata.BlobBuilder);summary;df-generated |
+| System.Reflection.Metadata.Ecma335;BlobEncoder;CustomAttributeSignature;(System.Action<System.Reflection.Metadata.Ecma335.FixedArgumentsEncoder>,System.Action<System.Reflection.Metadata.Ecma335.CustomAttributeNamedArgumentsEncoder>);summary;df-generated |
 | System.Reflection.Metadata.Ecma335;BlobEncoder;CustomAttributeSignature;(System.Reflection.Metadata.Ecma335.FixedArgumentsEncoder,System.Reflection.Metadata.Ecma335.CustomAttributeNamedArgumentsEncoder);summary;df-generated |
 | System.Reflection.Metadata.Ecma335;BlobEncoder;Field;();summary;df-generated |
 | System.Reflection.Metadata.Ecma335;BlobEncoder;FieldSignature;();summary;df-generated |
@@ -33702,7 +36523,9 @@ neutral
 | System.Reflection.Metadata.Ecma335;LabelHandle;op_Inequality;(System.Reflection.Metadata.Ecma335.LabelHandle,System.Reflection.Metadata.Ecma335.LabelHandle);summary;df-generated |
 | System.Reflection.Metadata.Ecma335;LiteralEncoder;LiteralEncoder;(System.Reflection.Metadata.BlobBuilder);summary;df-generated |
 | System.Reflection.Metadata.Ecma335;LiteralEncoder;Scalar;();summary;df-generated |
+| System.Reflection.Metadata.Ecma335;LiteralEncoder;TaggedScalar;(System.Action<System.Reflection.Metadata.Ecma335.CustomAttributeElementTypeEncoder>,System.Action<System.Reflection.Metadata.Ecma335.ScalarEncoder>);summary;df-generated |
 | System.Reflection.Metadata.Ecma335;LiteralEncoder;TaggedScalar;(System.Reflection.Metadata.Ecma335.CustomAttributeElementTypeEncoder,System.Reflection.Metadata.Ecma335.ScalarEncoder);summary;df-generated |
+| System.Reflection.Metadata.Ecma335;LiteralEncoder;TaggedVector;(System.Action<System.Reflection.Metadata.Ecma335.CustomAttributeArrayTypeEncoder>,System.Action<System.Reflection.Metadata.Ecma335.VectorEncoder>);summary;df-generated |
 | System.Reflection.Metadata.Ecma335;LiteralEncoder;TaggedVector;(System.Reflection.Metadata.Ecma335.CustomAttributeArrayTypeEncoder,System.Reflection.Metadata.Ecma335.VectorEncoder);summary;df-generated |
 | System.Reflection.Metadata.Ecma335;LiteralEncoder;Vector;();summary;df-generated |
 | System.Reflection.Metadata.Ecma335;LiteralEncoder;get_Builder;();summary;df-generated |
@@ -33862,6 +36685,7 @@ neutral
 | System.Reflection.Metadata.Ecma335;MethodBodyStreamEncoder;MethodBodyStreamEncoder;(System.Reflection.Metadata.BlobBuilder);summary;df-generated |
 | System.Reflection.Metadata.Ecma335;MethodBodyStreamEncoder;get_Builder;();summary;df-generated |
 | System.Reflection.Metadata.Ecma335;MethodSignatureEncoder;MethodSignatureEncoder;(System.Reflection.Metadata.BlobBuilder,System.Boolean);summary;df-generated |
+| System.Reflection.Metadata.Ecma335;MethodSignatureEncoder;Parameters;(System.Int32,System.Action<System.Reflection.Metadata.Ecma335.ReturnTypeEncoder>,System.Action<System.Reflection.Metadata.Ecma335.ParametersEncoder>);summary;df-generated |
 | System.Reflection.Metadata.Ecma335;MethodSignatureEncoder;Parameters;(System.Int32,System.Reflection.Metadata.Ecma335.ReturnTypeEncoder,System.Reflection.Metadata.Ecma335.ParametersEncoder);summary;df-generated |
 | System.Reflection.Metadata.Ecma335;MethodSignatureEncoder;get_Builder;();summary;df-generated |
 | System.Reflection.Metadata.Ecma335;MethodSignatureEncoder;get_HasVarArgs;();summary;df-generated |
@@ -33873,6 +36697,7 @@ neutral
 | System.Reflection.Metadata.Ecma335;NamedArgumentTypeEncoder;SZArray;();summary;df-generated |
 | System.Reflection.Metadata.Ecma335;NamedArgumentTypeEncoder;ScalarType;();summary;df-generated |
 | System.Reflection.Metadata.Ecma335;NamedArgumentTypeEncoder;get_Builder;();summary;df-generated |
+| System.Reflection.Metadata.Ecma335;NamedArgumentsEncoder;AddArgument;(System.Boolean,System.Action<System.Reflection.Metadata.Ecma335.NamedArgumentTypeEncoder>,System.Action<System.Reflection.Metadata.Ecma335.NameEncoder>,System.Action<System.Reflection.Metadata.Ecma335.LiteralEncoder>);summary;df-generated |
 | System.Reflection.Metadata.Ecma335;NamedArgumentsEncoder;AddArgument;(System.Boolean,System.Reflection.Metadata.Ecma335.NamedArgumentTypeEncoder,System.Reflection.Metadata.Ecma335.NameEncoder,System.Reflection.Metadata.Ecma335.LiteralEncoder);summary;df-generated |
 | System.Reflection.Metadata.Ecma335;NamedArgumentsEncoder;NamedArgumentsEncoder;(System.Reflection.Metadata.BlobBuilder);summary;df-generated |
 | System.Reflection.Metadata.Ecma335;NamedArgumentsEncoder;get_Builder;();summary;df-generated |
@@ -33888,6 +36713,7 @@ neutral
 | System.Reflection.Metadata.Ecma335;ParametersEncoder;get_HasVarArgs;();summary;df-generated |
 | System.Reflection.Metadata.Ecma335;PermissionSetEncoder;PermissionSetEncoder;(System.Reflection.Metadata.BlobBuilder);summary;df-generated |
 | System.Reflection.Metadata.Ecma335;PermissionSetEncoder;get_Builder;();summary;df-generated |
+| System.Reflection.Metadata.Ecma335;PortablePdbBuilder;PortablePdbBuilder;(System.Reflection.Metadata.Ecma335.MetadataBuilder,System.Collections.Immutable.ImmutableArray<System.Int32>,System.Reflection.Metadata.MethodDefinitionHandle,System.Func<System.Collections.Generic.IEnumerable<System.Reflection.Metadata.Blob>,System.Reflection.Metadata.BlobContentId>);summary;df-generated |
 | System.Reflection.Metadata.Ecma335;PortablePdbBuilder;get_FormatVersion;();summary;df-generated |
 | System.Reflection.Metadata.Ecma335;PortablePdbBuilder;get_IdProvider;();summary;df-generated |
 | System.Reflection.Metadata.Ecma335;PortablePdbBuilder;get_MetadataVersion;();summary;df-generated |
@@ -33902,7 +36728,6 @@ neutral
 | System.Reflection.Metadata.Ecma335;ScalarEncoder;ScalarEncoder;(System.Reflection.Metadata.BlobBuilder);summary;df-generated |
 | System.Reflection.Metadata.Ecma335;ScalarEncoder;SystemType;(System.String);summary;df-generated |
 | System.Reflection.Metadata.Ecma335;ScalarEncoder;get_Builder;();summary;df-generated |
-| System.Reflection.Metadata.Ecma335;SignatureDecoder<TType,TGenericContext>;DecodeMethodSignature;(System.Reflection.Metadata.BlobReader);summary;df-generated |
 | System.Reflection.Metadata.Ecma335;SignatureTypeEncoder;Boolean;();summary;df-generated |
 | System.Reflection.Metadata.Ecma335;SignatureTypeEncoder;Byte;();summary;df-generated |
 | System.Reflection.Metadata.Ecma335;SignatureTypeEncoder;Char;();summary;df-generated |
@@ -33938,6 +36763,7 @@ neutral
 | System.Reflection.Metadata;ArrayShape;get_LowerBounds;();summary;df-generated |
 | System.Reflection.Metadata;ArrayShape;get_Rank;();summary;df-generated |
 | System.Reflection.Metadata;ArrayShape;get_Sizes;();summary;df-generated |
+| System.Reflection.Metadata;AssemblyDefinition;GetAssemblyName;();summary;df-generated |
 | System.Reflection.Metadata;AssemblyDefinition;get_Culture;();summary;df-generated |
 | System.Reflection.Metadata;AssemblyDefinition;get_Flags;();summary;df-generated |
 | System.Reflection.Metadata;AssemblyDefinition;get_HashAlgorithm;();summary;df-generated |
@@ -33966,6 +36792,7 @@ neutral
 | System.Reflection.Metadata;AssemblyFileHandleCollection+Enumerator;get_Current;();summary;df-generated |
 | System.Reflection.Metadata;AssemblyFileHandleCollection;GetEnumerator;();summary;df-generated |
 | System.Reflection.Metadata;AssemblyFileHandleCollection;get_Count;();summary;df-generated |
+| System.Reflection.Metadata;AssemblyReference;GetAssemblyName;();summary;df-generated |
 | System.Reflection.Metadata;AssemblyReference;get_Culture;();summary;df-generated |
 | System.Reflection.Metadata;AssemblyReference;get_Flags;();summary;df-generated |
 | System.Reflection.Metadata;AssemblyReference;get_HashValue;();summary;df-generated |
@@ -33983,6 +36810,7 @@ neutral
 | System.Reflection.Metadata;AssemblyReferenceHandleCollection+Enumerator;Reset;();summary;df-generated |
 | System.Reflection.Metadata;AssemblyReferenceHandleCollection+Enumerator;get_Current;();summary;df-generated |
 | System.Reflection.Metadata;AssemblyReferenceHandleCollection;get_Count;();summary;df-generated |
+| System.Reflection.Metadata;Blob;GetBytes;();summary;df-generated |
 | System.Reflection.Metadata;Blob;get_IsDefault;();summary;df-generated |
 | System.Reflection.Metadata;Blob;get_Length;();summary;df-generated |
 | System.Reflection.Metadata;BlobBuilder+Blobs;Dispose;();summary;df-generated |
@@ -34014,7 +36842,6 @@ neutral
 | System.Reflection.Metadata;BlobBuilder;WriteConstant;(System.Object);summary;df-generated |
 | System.Reflection.Metadata;BlobBuilder;WriteContentTo;(System.IO.Stream);summary;df-generated |
 | System.Reflection.Metadata;BlobBuilder;WriteContentTo;(System.Reflection.Metadata.BlobBuilder);summary;df-generated |
-| System.Reflection.Metadata;BlobBuilder;WriteContentTo;(System.Reflection.Metadata.BlobWriter);summary;df-generated |
 | System.Reflection.Metadata;BlobBuilder;WriteDateTime;(System.DateTime);summary;df-generated |
 | System.Reflection.Metadata;BlobBuilder;WriteDecimal;(System.Decimal);summary;df-generated |
 | System.Reflection.Metadata;BlobBuilder;WriteDouble;(System.Double);summary;df-generated |
@@ -34097,6 +36924,8 @@ neutral
 | System.Reflection.Metadata;BlobWriter;Clear;();summary;df-generated |
 | System.Reflection.Metadata;BlobWriter;ContentEquals;(System.Reflection.Metadata.BlobWriter);summary;df-generated |
 | System.Reflection.Metadata;BlobWriter;PadTo;(System.Int32);summary;df-generated |
+| System.Reflection.Metadata;BlobWriter;ToArray;();summary;df-generated |
+| System.Reflection.Metadata;BlobWriter;ToArray;(System.Int32,System.Int32);summary;df-generated |
 | System.Reflection.Metadata;BlobWriter;ToImmutableArray;();summary;df-generated |
 | System.Reflection.Metadata;BlobWriter;ToImmutableArray;(System.Int32,System.Int32);summary;df-generated |
 | System.Reflection.Metadata;BlobWriter;WriteBoolean;(System.Boolean);summary;df-generated |
@@ -34272,6 +37101,7 @@ neutral
 | System.Reflection.Metadata;ExportedTypeHandleCollection+Enumerator;get_Current;();summary;df-generated |
 | System.Reflection.Metadata;ExportedTypeHandleCollection;GetEnumerator;();summary;df-generated |
 | System.Reflection.Metadata;ExportedTypeHandleCollection;get_Count;();summary;df-generated |
+| System.Reflection.Metadata;FieldDefinition;DecodeSignature<TType,TGenericContext>;(System.Reflection.Metadata.ISignatureTypeProvider<TType,TGenericContext>,TGenericContext);summary;df-generated |
 | System.Reflection.Metadata;FieldDefinition;GetDeclaringType;();summary;df-generated |
 | System.Reflection.Metadata;FieldDefinition;GetDefaultValue;();summary;df-generated |
 | System.Reflection.Metadata;FieldDefinition;GetMarshallingDescriptor;();summary;df-generated |
@@ -34377,6 +37207,7 @@ neutral
 | System.Reflection.Metadata;ImportDefinitionCollection+Enumerator;Dispose;();summary;df-generated |
 | System.Reflection.Metadata;ImportDefinitionCollection+Enumerator;MoveNext;();summary;df-generated |
 | System.Reflection.Metadata;ImportDefinitionCollection+Enumerator;Reset;();summary;df-generated |
+| System.Reflection.Metadata;ImportDefinitionCollection+Enumerator;get_Current;();summary;df-generated |
 | System.Reflection.Metadata;ImportScope;GetImports;();summary;df-generated |
 | System.Reflection.Metadata;ImportScope;get_ImportsBlob;();summary;df-generated |
 | System.Reflection.Metadata;ImportScope;get_Parent;();summary;df-generated |
@@ -34466,6 +37297,7 @@ neutral
 | System.Reflection.Metadata;ManifestResourceHandleCollection+Enumerator;get_Current;();summary;df-generated |
 | System.Reflection.Metadata;ManifestResourceHandleCollection;GetEnumerator;();summary;df-generated |
 | System.Reflection.Metadata;ManifestResourceHandleCollection;get_Count;();summary;df-generated |
+| System.Reflection.Metadata;MemberReference;DecodeFieldSignature<TType,TGenericContext>;(System.Reflection.Metadata.ISignatureTypeProvider<TType,TGenericContext>,TGenericContext);summary;df-generated |
 | System.Reflection.Metadata;MemberReference;DecodeMethodSignature<TType,TGenericContext>;(System.Reflection.Metadata.ISignatureTypeProvider<TType,TGenericContext>,TGenericContext);summary;df-generated |
 | System.Reflection.Metadata;MemberReference;GetKind;();summary;df-generated |
 | System.Reflection.Metadata;MemberReference;get_Name;();summary;df-generated |
@@ -34588,6 +37420,7 @@ neutral
 | System.Reflection.Metadata;MethodSignature<TType>;get_ParameterTypes;();summary;df-generated |
 | System.Reflection.Metadata;MethodSignature<TType>;get_RequiredParameterCount;();summary;df-generated |
 | System.Reflection.Metadata;MethodSignature<TType>;get_ReturnType;();summary;df-generated |
+| System.Reflection.Metadata;MethodSpecification;DecodeSignature<TType,TGenericContext>;(System.Reflection.Metadata.ISignatureTypeProvider<TType,TGenericContext>,TGenericContext);summary;df-generated |
 | System.Reflection.Metadata;MethodSpecification;get_Method;();summary;df-generated |
 | System.Reflection.Metadata;MethodSpecification;get_Signature;();summary;df-generated |
 | System.Reflection.Metadata;MethodSpecificationHandle;Equals;(System.Object);summary;df-generated |
@@ -34672,6 +37505,7 @@ neutral
 | System.Reflection.Metadata;SequencePointCollection+Enumerator;Dispose;();summary;df-generated |
 | System.Reflection.Metadata;SequencePointCollection+Enumerator;MoveNext;();summary;df-generated |
 | System.Reflection.Metadata;SequencePointCollection+Enumerator;Reset;();summary;df-generated |
+| System.Reflection.Metadata;SequencePointCollection+Enumerator;get_Current;();summary;df-generated |
 | System.Reflection.Metadata;SignatureHeader;Equals;(System.Object);summary;df-generated |
 | System.Reflection.Metadata;SignatureHeader;Equals;(System.Reflection.Metadata.SignatureHeader);summary;df-generated |
 | System.Reflection.Metadata;SignatureHeader;GetHashCode;();summary;df-generated |
@@ -34687,6 +37521,7 @@ neutral
 | System.Reflection.Metadata;SignatureHeader;get_RawValue;();summary;df-generated |
 | System.Reflection.Metadata;SignatureHeader;op_Equality;(System.Reflection.Metadata.SignatureHeader,System.Reflection.Metadata.SignatureHeader);summary;df-generated |
 | System.Reflection.Metadata;SignatureHeader;op_Inequality;(System.Reflection.Metadata.SignatureHeader,System.Reflection.Metadata.SignatureHeader);summary;df-generated |
+| System.Reflection.Metadata;StandaloneSignature;DecodeLocalSignature<TType,TGenericContext>;(System.Reflection.Metadata.ISignatureTypeProvider<TType,TGenericContext>,TGenericContext);summary;df-generated |
 | System.Reflection.Metadata;StandaloneSignature;DecodeMethodSignature<TType,TGenericContext>;(System.Reflection.Metadata.ISignatureTypeProvider<TType,TGenericContext>,TGenericContext);summary;df-generated |
 | System.Reflection.Metadata;StandaloneSignature;GetKind;();summary;df-generated |
 | System.Reflection.Metadata;StandaloneSignature;get_Signature;();summary;df-generated |
@@ -34744,6 +37579,7 @@ neutral
 | System.Reflection.Metadata;TypeReferenceHandleCollection+Enumerator;get_Current;();summary;df-generated |
 | System.Reflection.Metadata;TypeReferenceHandleCollection;GetEnumerator;();summary;df-generated |
 | System.Reflection.Metadata;TypeReferenceHandleCollection;get_Count;();summary;df-generated |
+| System.Reflection.Metadata;TypeSpecification;DecodeSignature<TType,TGenericContext>;(System.Reflection.Metadata.ISignatureTypeProvider<TType,TGenericContext>,TGenericContext);summary;df-generated |
 | System.Reflection.Metadata;TypeSpecification;get_Signature;();summary;df-generated |
 | System.Reflection.Metadata;TypeSpecificationHandle;Equals;(System.Object);summary;df-generated |
 | System.Reflection.Metadata;TypeSpecificationHandle;Equals;(System.Reflection.Metadata.TypeSpecificationHandle);summary;df-generated |
@@ -34795,7 +37631,10 @@ neutral
 | System.Reflection.PortableExecutable;DebugDirectoryEntry;get_Type;();summary;df-generated |
 | System.Reflection.PortableExecutable;DirectoryEntry;DirectoryEntry;(System.Int32,System.Int32);summary;df-generated |
 | System.Reflection.PortableExecutable;ManagedPEBuilder;CreateSections;();summary;df-generated |
+| System.Reflection.PortableExecutable;ManagedPEBuilder;ManagedPEBuilder;(System.Reflection.PortableExecutable.PEHeaderBuilder,System.Reflection.Metadata.Ecma335.MetadataRootBuilder,System.Reflection.Metadata.BlobBuilder,System.Reflection.Metadata.BlobBuilder,System.Reflection.Metadata.BlobBuilder,System.Reflection.PortableExecutable.ResourceSectionBuilder,System.Reflection.PortableExecutable.DebugDirectoryBuilder,System.Int32,System.Reflection.Metadata.MethodDefinitionHandle,System.Reflection.PortableExecutable.CorFlags,System.Func<System.Collections.Generic.IEnumerable<System.Reflection.Metadata.Blob>,System.Reflection.Metadata.BlobContentId>);summary;df-generated |
+| System.Reflection.PortableExecutable;ManagedPEBuilder;Sign;(System.Reflection.Metadata.BlobBuilder,System.Func<System.Collections.Generic.IEnumerable<System.Reflection.Metadata.Blob>,System.Byte[]>);summary;df-generated |
 | System.Reflection.PortableExecutable;PEBuilder;CreateSections;();summary;df-generated |
+| System.Reflection.PortableExecutable;PEBuilder;PEBuilder;(System.Reflection.PortableExecutable.PEHeaderBuilder,System.Func<System.Collections.Generic.IEnumerable<System.Reflection.Metadata.Blob>,System.Reflection.Metadata.BlobContentId>);summary;df-generated |
 | System.Reflection.PortableExecutable;PEBuilder;get_Header;();summary;df-generated |
 | System.Reflection.PortableExecutable;PEBuilder;get_IdProvider;();summary;df-generated |
 | System.Reflection.PortableExecutable;PEBuilder;get_IsDeterministic;();summary;df-generated |
@@ -34918,6 +37757,7 @@ neutral
 | System.Reflection;Assembly;Equals;(System.Object);summary;df-generated |
 | System.Reflection;Assembly;GetAssembly;(System.Type);summary;df-generated |
 | System.Reflection;Assembly;GetCallingAssembly;();summary;df-generated |
+| System.Reflection;Assembly;GetCustomAttributes;(System.Boolean);summary;df-generated |
 | System.Reflection;Assembly;GetCustomAttributes;(System.Type,System.Boolean);summary;df-generated |
 | System.Reflection;Assembly;GetCustomAttributesData;();summary;df-generated |
 | System.Reflection;Assembly;GetEntryAssembly;();summary;df-generated |
@@ -34948,6 +37788,7 @@ neutral
 | System.Reflection;Assembly;ReflectionOnlyLoad;(System.String);summary;df-generated |
 | System.Reflection;Assembly;ReflectionOnlyLoadFrom;(System.String);summary;df-generated |
 | System.Reflection;Assembly;UnsafeLoadFrom;(System.String);summary;df-generated |
+| System.Reflection;Assembly;add_ModuleResolve;(System.Reflection.ModuleResolveEventHandler);summary;df-generated |
 | System.Reflection;Assembly;get_DefinedTypes;();summary;df-generated |
 | System.Reflection;Assembly;get_ExportedTypes;();summary;df-generated |
 | System.Reflection;Assembly;get_GlobalAssemblyCache;();summary;df-generated |
@@ -34959,6 +37800,7 @@ neutral
 | System.Reflection;Assembly;get_SecurityRuleSet;();summary;df-generated |
 | System.Reflection;Assembly;op_Equality;(System.Reflection.Assembly,System.Reflection.Assembly);summary;df-generated |
 | System.Reflection;Assembly;op_Inequality;(System.Reflection.Assembly,System.Reflection.Assembly);summary;df-generated |
+| System.Reflection;Assembly;remove_ModuleResolve;(System.Reflection.ModuleResolveEventHandler);summary;df-generated |
 | System.Reflection;AssemblyAlgorithmIdAttribute;AssemblyAlgorithmIdAttribute;(System.Configuration.Assemblies.AssemblyHashAlgorithm);summary;df-generated |
 | System.Reflection;AssemblyAlgorithmIdAttribute;AssemblyAlgorithmIdAttribute;(System.UInt32);summary;df-generated |
 | System.Reflection;AssemblyAlgorithmIdAttribute;get_AlgorithmId;();summary;df-generated |
@@ -34977,6 +37819,7 @@ neutral
 | System.Reflection;AssemblyDescriptionAttribute;AssemblyDescriptionAttribute;(System.String);summary;df-generated |
 | System.Reflection;AssemblyDescriptionAttribute;get_Description;();summary;df-generated |
 | System.Reflection;AssemblyExtensions;GetExportedTypes;(System.Reflection.Assembly);summary;df-generated |
+| System.Reflection;AssemblyExtensions;GetModules;(System.Reflection.Assembly);summary;df-generated |
 | System.Reflection;AssemblyExtensions;GetTypes;(System.Reflection.Assembly);summary;df-generated |
 | System.Reflection;AssemblyFileVersionAttribute;AssemblyFileVersionAttribute;(System.String);summary;df-generated |
 | System.Reflection;AssemblyFileVersionAttribute;get_Version;();summary;df-generated |
@@ -35022,11 +37865,6 @@ neutral
 | System.Reflection;ConstructorInfo;op_Inequality;(System.Reflection.ConstructorInfo,System.Reflection.ConstructorInfo);summary;df-generated |
 | System.Reflection;ConstructorInvoker;Create;(System.Reflection.ConstructorInfo);summary;df-generated |
 | System.Reflection;ConstructorInvoker;Invoke;();summary;df-generated |
-| System.Reflection;ConstructorInvoker;Invoke;(System.Object);summary;df-generated |
-| System.Reflection;ConstructorInvoker;Invoke;(System.Object,System.Object);summary;df-generated |
-| System.Reflection;ConstructorInvoker;Invoke;(System.Object,System.Object,System.Object);summary;df-generated |
-| System.Reflection;ConstructorInvoker;Invoke;(System.Object,System.Object,System.Object,System.Object);summary;df-generated |
-| System.Reflection;ConstructorInvoker;Invoke;(System.Span<System.Object>);summary;df-generated |
 | System.Reflection;CustomAttributeData;Equals;(System.Object);summary;df-generated |
 | System.Reflection;CustomAttributeData;GetCustomAttributes;(System.Reflection.Assembly);summary;df-generated |
 | System.Reflection;CustomAttributeData;GetCustomAttributes;(System.Reflection.MemberInfo);summary;df-generated |
@@ -35103,6 +37941,9 @@ neutral
 | System.Reflection;EventInfo;get_MemberType;();summary;df-generated |
 | System.Reflection;EventInfo;op_Equality;(System.Reflection.EventInfo,System.Reflection.EventInfo);summary;df-generated |
 | System.Reflection;EventInfo;op_Inequality;(System.Reflection.EventInfo,System.Reflection.EventInfo);summary;df-generated |
+| System.Reflection;EventInfoExtensions;GetAddMethod;(System.Reflection.EventInfo);summary;df-generated |
+| System.Reflection;EventInfoExtensions;GetRaiseMethod;(System.Reflection.EventInfo);summary;df-generated |
+| System.Reflection;EventInfoExtensions;GetRemoveMethod;(System.Reflection.EventInfo);summary;df-generated |
 | System.Reflection;ExceptionHandlingClause;ToString;();summary;df-generated |
 | System.Reflection;ExceptionHandlingClause;get_FilterOffset;();summary;df-generated |
 | System.Reflection;ExceptionHandlingClause;get_Flags;();summary;df-generated |
@@ -35141,6 +37982,7 @@ neutral
 | System.Reflection;FieldInfo;get_MemberType;();summary;df-generated |
 | System.Reflection;FieldInfo;op_Equality;(System.Reflection.FieldInfo,System.Reflection.FieldInfo);summary;df-generated |
 | System.Reflection;FieldInfo;op_Inequality;(System.Reflection.FieldInfo,System.Reflection.FieldInfo);summary;df-generated |
+| System.Reflection;ICustomAttributeProvider;GetCustomAttributes;(System.Boolean);summary;df-generated |
 | System.Reflection;ICustomAttributeProvider;GetCustomAttributes;(System.Type,System.Boolean);summary;df-generated |
 | System.Reflection;ICustomAttributeProvider;IsDefined;(System.Type,System.Boolean);summary;df-generated |
 | System.Reflection;ICustomTypeProvider;GetCustomType;();summary;df-generated |
@@ -35165,6 +38007,7 @@ neutral
 | System.Reflection;ManifestResourceInfo;get_FileName;();summary;df-generated |
 | System.Reflection;ManifestResourceInfo;get_ResourceLocation;();summary;df-generated |
 | System.Reflection;MemberInfo;Equals;(System.Object);summary;df-generated |
+| System.Reflection;MemberInfo;GetCustomAttributes;(System.Boolean);summary;df-generated |
 | System.Reflection;MemberInfo;GetCustomAttributes;(System.Type,System.Boolean);summary;df-generated |
 | System.Reflection;MemberInfo;GetCustomAttributesData;();summary;df-generated |
 | System.Reflection;MemberInfo;GetHashCode;();summary;df-generated |
@@ -35183,8 +38026,6 @@ neutral
 | System.Reflection;MethodBase;GetMethodFromHandle;(System.RuntimeMethodHandle);summary;df-generated |
 | System.Reflection;MethodBase;GetMethodFromHandle;(System.RuntimeMethodHandle,System.RuntimeTypeHandle);summary;df-generated |
 | System.Reflection;MethodBase;GetMethodImplementationFlags;();summary;df-generated |
-| System.Reflection;MethodBase;Invoke;(System.Object,System.Object[]);summary;df-generated |
-| System.Reflection;MethodBase;Invoke;(System.Object,System.Reflection.BindingFlags,System.Reflection.Binder,System.Object[],System.Globalization.CultureInfo);summary;df-generated |
 | System.Reflection;MethodBase;get_Attributes;();summary;df-generated |
 | System.Reflection;MethodBase;get_CallingConvention;();summary;df-generated |
 | System.Reflection;MethodBase;get_ContainsGenericParameters;();summary;df-generated |
@@ -35214,6 +38055,7 @@ neutral
 | System.Reflection;MethodBody;get_LocalSignatureMetadataToken;();summary;df-generated |
 | System.Reflection;MethodBody;get_MaxStackSize;();summary;df-generated |
 | System.Reflection;MethodInfo;CreateDelegate;(System.Type,System.Object);summary;df-generated |
+| System.Reflection;MethodInfo;CreateDelegate<T>;();summary;df-generated |
 | System.Reflection;MethodInfo;CreateDelegate<T>;(System.Object);summary;df-generated |
 | System.Reflection;MethodInfo;Equals;(System.Object);summary;df-generated |
 | System.Reflection;MethodInfo;GetHashCode;();summary;df-generated |
@@ -35221,13 +38063,8 @@ neutral
 | System.Reflection;MethodInfo;op_Equality;(System.Reflection.MethodInfo,System.Reflection.MethodInfo);summary;df-generated |
 | System.Reflection;MethodInfo;op_Inequality;(System.Reflection.MethodInfo,System.Reflection.MethodInfo);summary;df-generated |
 | System.Reflection;MethodInvoker;Create;(System.Reflection.MethodBase);summary;df-generated |
-| System.Reflection;MethodInvoker;Invoke;(System.Object);summary;df-generated |
-| System.Reflection;MethodInvoker;Invoke;(System.Object,System.Object);summary;df-generated |
-| System.Reflection;MethodInvoker;Invoke;(System.Object,System.Object,System.Object);summary;df-generated |
-| System.Reflection;MethodInvoker;Invoke;(System.Object,System.Object,System.Object,System.Object);summary;df-generated |
-| System.Reflection;MethodInvoker;Invoke;(System.Object,System.Object,System.Object,System.Object,System.Object);summary;df-generated |
-| System.Reflection;MethodInvoker;Invoke;(System.Object,System.Span<System.Object>);summary;df-generated |
 | System.Reflection;Module;Equals;(System.Object);summary;df-generated |
+| System.Reflection;Module;GetCustomAttributes;(System.Boolean);summary;df-generated |
 | System.Reflection;Module;GetCustomAttributes;(System.Type,System.Boolean);summary;df-generated |
 | System.Reflection;Module;GetCustomAttributesData;();summary;df-generated |
 | System.Reflection;Module;GetFields;();summary;df-generated |
@@ -35258,6 +38095,7 @@ neutral
 | System.Reflection;NullabilityInfoContext;Create;(System.Reflection.PropertyInfo);summary;df-generated |
 | System.Reflection;ObfuscateAssemblyAttribute;ObfuscateAssemblyAttribute;(System.Boolean);summary;df-generated |
 | System.Reflection;ObfuscateAssemblyAttribute;get_AssemblyIsPrivate;();summary;df-generated |
+| System.Reflection;ParameterInfo;GetCustomAttributes;(System.Boolean);summary;df-generated |
 | System.Reflection;ParameterInfo;GetCustomAttributes;(System.Type,System.Boolean);summary;df-generated |
 | System.Reflection;ParameterInfo;GetCustomAttributesData;();summary;df-generated |
 | System.Reflection;ParameterInfo;GetOptionalCustomModifiers;();summary;df-generated |
@@ -35282,8 +38120,6 @@ neutral
 | System.Reflection;PropertyInfo;GetOptionalCustomModifiers;();summary;df-generated |
 | System.Reflection;PropertyInfo;GetRawConstantValue;();summary;df-generated |
 | System.Reflection;PropertyInfo;GetRequiredCustomModifiers;();summary;df-generated |
-| System.Reflection;PropertyInfo;GetValue;(System.Object);summary;df-generated |
-| System.Reflection;PropertyInfo;GetValue;(System.Object,System.Object[]);summary;df-generated |
 | System.Reflection;PropertyInfo;GetValue;(System.Object,System.Reflection.BindingFlags,System.Reflection.Binder,System.Object[],System.Globalization.CultureInfo);summary;df-generated |
 | System.Reflection;PropertyInfo;SetValue;(System.Object,System.Object);summary;df-generated |
 | System.Reflection;PropertyInfo;SetValue;(System.Object,System.Object,System.Object[]);summary;df-generated |
@@ -35295,6 +38131,10 @@ neutral
 | System.Reflection;PropertyInfo;get_MemberType;();summary;df-generated |
 | System.Reflection;PropertyInfo;op_Equality;(System.Reflection.PropertyInfo,System.Reflection.PropertyInfo);summary;df-generated |
 | System.Reflection;PropertyInfo;op_Inequality;(System.Reflection.PropertyInfo,System.Reflection.PropertyInfo);summary;df-generated |
+| System.Reflection;PropertyInfoExtensions;GetAccessors;(System.Reflection.PropertyInfo);summary;df-generated |
+| System.Reflection;PropertyInfoExtensions;GetGetMethod;(System.Reflection.PropertyInfo);summary;df-generated |
+| System.Reflection;PropertyInfoExtensions;GetSetMethod;(System.Reflection.PropertyInfo);summary;df-generated |
+| System.Reflection;ReflectionContext;GetTypeForObject;(System.Object);summary;df-generated |
 | System.Reflection;ReflectionTypeLoadException;ReflectionTypeLoadException;(System.Type[],System.Exception[]);summary;df-generated |
 | System.Reflection;ReflectionTypeLoadException;ReflectionTypeLoadException;(System.Type[],System.Exception[],System.String);summary;df-generated |
 | System.Reflection;ReflectionTypeLoadException;get_LoaderExceptions;();summary;df-generated |
@@ -35323,6 +38163,7 @@ neutral
 | System.Reflection;TargetParameterCountException;TargetParameterCountException;(System.String,System.Exception);summary;df-generated |
 | System.Reflection;TypeDelegator;GetAttributeFlagsImpl;();summary;df-generated |
 | System.Reflection;TypeDelegator;GetConstructors;(System.Reflection.BindingFlags);summary;df-generated |
+| System.Reflection;TypeDelegator;GetCustomAttributes;(System.Boolean);summary;df-generated |
 | System.Reflection;TypeDelegator;GetCustomAttributes;(System.Type,System.Boolean);summary;df-generated |
 | System.Reflection;TypeDelegator;GetEvents;();summary;df-generated |
 | System.Reflection;TypeDelegator;GetEvents;(System.Reflection.BindingFlags);summary;df-generated |
@@ -35455,7 +38296,6 @@ neutral
 | System.Runtime.CompilerServices;AccessedThroughPropertyAttribute;get_PropertyName;();summary;df-generated |
 | System.Runtime.CompilerServices;AsyncIteratorMethodBuilder;Complete;();summary;df-generated |
 | System.Runtime.CompilerServices;AsyncIteratorMethodBuilder;Create;();summary;df-generated |
-| System.Runtime.CompilerServices;AsyncIteratorMethodBuilder;MoveNext<TStateMachine>;(TStateMachine);summary;df-generated |
 | System.Runtime.CompilerServices;AsyncIteratorStateMachineAttribute;AsyncIteratorStateMachineAttribute;(System.Type);summary;df-generated |
 | System.Runtime.CompilerServices;AsyncMethodBuilderAttribute;AsyncMethodBuilderAttribute;(System.Type);summary;df-generated |
 | System.Runtime.CompilerServices;AsyncMethodBuilderAttribute;get_BuilderType;();summary;df-generated |
@@ -35464,28 +38304,21 @@ neutral
 | System.Runtime.CompilerServices;AsyncTaskMethodBuilder;SetException;(System.Exception);summary;df-generated |
 | System.Runtime.CompilerServices;AsyncTaskMethodBuilder;SetResult;();summary;df-generated |
 | System.Runtime.CompilerServices;AsyncTaskMethodBuilder;SetStateMachine;(System.Runtime.CompilerServices.IAsyncStateMachine);summary;df-generated |
-| System.Runtime.CompilerServices;AsyncTaskMethodBuilder;Start<TStateMachine>;(TStateMachine);summary;df-generated |
 | System.Runtime.CompilerServices;AsyncTaskMethodBuilder<TResult>;Create;();summary;df-generated |
 | System.Runtime.CompilerServices;AsyncTaskMethodBuilder<TResult>;SetException;(System.Exception);summary;df-generated |
 | System.Runtime.CompilerServices;AsyncTaskMethodBuilder<TResult>;SetStateMachine;(System.Runtime.CompilerServices.IAsyncStateMachine);summary;df-generated |
-| System.Runtime.CompilerServices;AsyncTaskMethodBuilder<TResult>;Start<TStateMachine>;(TStateMachine);summary;df-generated |
 | System.Runtime.CompilerServices;AsyncValueTaskMethodBuilder;Create;();summary;df-generated |
 | System.Runtime.CompilerServices;AsyncValueTaskMethodBuilder;SetException;(System.Exception);summary;df-generated |
 | System.Runtime.CompilerServices;AsyncValueTaskMethodBuilder;SetResult;();summary;df-generated |
 | System.Runtime.CompilerServices;AsyncValueTaskMethodBuilder;SetStateMachine;(System.Runtime.CompilerServices.IAsyncStateMachine);summary;df-generated |
-| System.Runtime.CompilerServices;AsyncValueTaskMethodBuilder;Start<TStateMachine>;(TStateMachine);summary;df-generated |
 | System.Runtime.CompilerServices;AsyncValueTaskMethodBuilder;get_Task;();summary;df-generated |
 | System.Runtime.CompilerServices;AsyncValueTaskMethodBuilder<TResult>;Create;();summary;df-generated |
 | System.Runtime.CompilerServices;AsyncValueTaskMethodBuilder<TResult>;SetException;(System.Exception);summary;df-generated |
 | System.Runtime.CompilerServices;AsyncValueTaskMethodBuilder<TResult>;SetStateMachine;(System.Runtime.CompilerServices.IAsyncStateMachine);summary;df-generated |
-| System.Runtime.CompilerServices;AsyncValueTaskMethodBuilder<TResult>;Start<TStateMachine>;(TStateMachine);summary;df-generated |
-| System.Runtime.CompilerServices;AsyncVoidMethodBuilder;AwaitOnCompleted<TAwaiter,TStateMachine>;(TAwaiter,TStateMachine);summary;df-generated |
-| System.Runtime.CompilerServices;AsyncVoidMethodBuilder;AwaitUnsafeOnCompleted<TAwaiter,TStateMachine>;(TAwaiter,TStateMachine);summary;df-generated |
 | System.Runtime.CompilerServices;AsyncVoidMethodBuilder;Create;();summary;df-generated |
 | System.Runtime.CompilerServices;AsyncVoidMethodBuilder;SetException;(System.Exception);summary;df-generated |
 | System.Runtime.CompilerServices;AsyncVoidMethodBuilder;SetResult;();summary;df-generated |
 | System.Runtime.CompilerServices;AsyncVoidMethodBuilder;SetStateMachine;(System.Runtime.CompilerServices.IAsyncStateMachine);summary;df-generated |
-| System.Runtime.CompilerServices;AsyncVoidMethodBuilder;Start<TStateMachine>;(TStateMachine);summary;df-generated |
 | System.Runtime.CompilerServices;CallSite;Create;(System.Type,System.Runtime.CompilerServices.CallSiteBinder);summary;df-generated |
 | System.Runtime.CompilerServices;CallSite<T>;Create;(System.Runtime.CompilerServices.CallSiteBinder);summary;df-generated |
 | System.Runtime.CompilerServices;CallSite<T>;get_Update;();summary;df-generated |
@@ -35506,6 +38339,7 @@ neutral
 | System.Runtime.CompilerServices;CompilerFeatureRequiredAttribute;get_FeatureName;();summary;df-generated |
 | System.Runtime.CompilerServices;ConditionalWeakTable<TKey,TValue>;Add;(TKey,TValue);summary;df-generated |
 | System.Runtime.CompilerServices;ConditionalWeakTable<TKey,TValue>;AddOrUpdate;(TKey,TValue);summary;df-generated |
+| System.Runtime.CompilerServices;ConditionalWeakTable<TKey,TValue>;GetOrCreateValue;(TKey);summary;df-generated |
 | System.Runtime.CompilerServices;ConditionalWeakTable<TKey,TValue>;Remove;(TKey);summary;df-generated |
 | System.Runtime.CompilerServices;ConditionalWeakTable<TKey,TValue>;TryAdd;(TKey,TValue);summary;df-generated |
 | System.Runtime.CompilerServices;ConditionalWeakTable<TKey,TValue>;TryGetValue;(TKey,TValue);summary;df-generated |
@@ -35513,10 +38347,18 @@ neutral
 | System.Runtime.CompilerServices;ConfiguredCancelableAsyncEnumerable<T>+Enumerator;DisposeAsync;();summary;df-generated |
 | System.Runtime.CompilerServices;ConfiguredCancelableAsyncEnumerable<T>+Enumerator;MoveNextAsync;();summary;df-generated |
 | System.Runtime.CompilerServices;ConfiguredTaskAwaitable+ConfiguredTaskAwaiter;GetResult;();summary;df-generated |
+| System.Runtime.CompilerServices;ConfiguredTaskAwaitable+ConfiguredTaskAwaiter;OnCompleted;(System.Action);summary;df-generated |
+| System.Runtime.CompilerServices;ConfiguredTaskAwaitable+ConfiguredTaskAwaiter;UnsafeOnCompleted;(System.Action);summary;df-generated |
 | System.Runtime.CompilerServices;ConfiguredTaskAwaitable+ConfiguredTaskAwaiter;get_IsCompleted;();summary;df-generated |
+| System.Runtime.CompilerServices;ConfiguredTaskAwaitable<TResult>+ConfiguredTaskAwaiter;OnCompleted;(System.Action);summary;df-generated |
+| System.Runtime.CompilerServices;ConfiguredTaskAwaitable<TResult>+ConfiguredTaskAwaiter;UnsafeOnCompleted;(System.Action);summary;df-generated |
 | System.Runtime.CompilerServices;ConfiguredTaskAwaitable<TResult>+ConfiguredTaskAwaiter;get_IsCompleted;();summary;df-generated |
 | System.Runtime.CompilerServices;ConfiguredValueTaskAwaitable+ConfiguredValueTaskAwaiter;GetResult;();summary;df-generated |
+| System.Runtime.CompilerServices;ConfiguredValueTaskAwaitable+ConfiguredValueTaskAwaiter;OnCompleted;(System.Action);summary;df-generated |
+| System.Runtime.CompilerServices;ConfiguredValueTaskAwaitable+ConfiguredValueTaskAwaiter;UnsafeOnCompleted;(System.Action);summary;df-generated |
 | System.Runtime.CompilerServices;ConfiguredValueTaskAwaitable+ConfiguredValueTaskAwaiter;get_IsCompleted;();summary;df-generated |
+| System.Runtime.CompilerServices;ConfiguredValueTaskAwaitable<TResult>+ConfiguredValueTaskAwaiter;OnCompleted;(System.Action);summary;df-generated |
+| System.Runtime.CompilerServices;ConfiguredValueTaskAwaitable<TResult>+ConfiguredValueTaskAwaiter;UnsafeOnCompleted;(System.Action);summary;df-generated |
 | System.Runtime.CompilerServices;ConfiguredValueTaskAwaitable<TResult>+ConfiguredValueTaskAwaiter;get_IsCompleted;();summary;df-generated |
 | System.Runtime.CompilerServices;ContractHelper;TriggerFailure;(System.Diagnostics.Contracts.ContractFailureKind,System.String,System.String,System.String,System.Exception);summary;df-generated |
 | System.Runtime.CompilerServices;CppInlineNamespaceAttribute;CppInlineNamespaceAttribute;(System.String);summary;df-generated |
@@ -35553,7 +38395,9 @@ neutral
 | System.Runtime.CompilerServices;FixedBufferAttribute;get_Length;();summary;df-generated |
 | System.Runtime.CompilerServices;IAsyncStateMachine;MoveNext;();summary;df-generated |
 | System.Runtime.CompilerServices;IAsyncStateMachine;SetStateMachine;(System.Runtime.CompilerServices.IAsyncStateMachine);summary;df-generated |
+| System.Runtime.CompilerServices;ICriticalNotifyCompletion;UnsafeOnCompleted;(System.Action);summary;df-generated |
 | System.Runtime.CompilerServices;IDispatchConstantAttribute;get_Value;();summary;df-generated |
+| System.Runtime.CompilerServices;INotifyCompletion;OnCompleted;(System.Action);summary;df-generated |
 | System.Runtime.CompilerServices;IRuntimeVariables;get_Count;();summary;df-generated |
 | System.Runtime.CompilerServices;IRuntimeVariables;set_Item;(System.Int32,System.Object);summary;df-generated |
 | System.Runtime.CompilerServices;ITuple;get_Length;();summary;df-generated |
@@ -35579,17 +38423,16 @@ neutral
 | System.Runtime.CompilerServices;PoolingAsyncValueTaskMethodBuilder;SetException;(System.Exception);summary;df-generated |
 | System.Runtime.CompilerServices;PoolingAsyncValueTaskMethodBuilder;SetResult;();summary;df-generated |
 | System.Runtime.CompilerServices;PoolingAsyncValueTaskMethodBuilder;SetStateMachine;(System.Runtime.CompilerServices.IAsyncStateMachine);summary;df-generated |
-| System.Runtime.CompilerServices;PoolingAsyncValueTaskMethodBuilder;Start<TStateMachine>;(TStateMachine);summary;df-generated |
 | System.Runtime.CompilerServices;PoolingAsyncValueTaskMethodBuilder;get_Task;();summary;df-generated |
 | System.Runtime.CompilerServices;PoolingAsyncValueTaskMethodBuilder<TResult>;Create;();summary;df-generated |
 | System.Runtime.CompilerServices;PoolingAsyncValueTaskMethodBuilder<TResult>;SetException;(System.Exception);summary;df-generated |
 | System.Runtime.CompilerServices;PoolingAsyncValueTaskMethodBuilder<TResult>;SetStateMachine;(System.Runtime.CompilerServices.IAsyncStateMachine);summary;df-generated |
-| System.Runtime.CompilerServices;PoolingAsyncValueTaskMethodBuilder<TResult>;Start<TStateMachine>;(TStateMachine);summary;df-generated |
 | System.Runtime.CompilerServices;ReadOnlyCollectionBuilder<T>;Contains;(System.Object);summary;df-generated |
 | System.Runtime.CompilerServices;ReadOnlyCollectionBuilder<T>;Contains;(T);summary;df-generated |
 | System.Runtime.CompilerServices;ReadOnlyCollectionBuilder<T>;IndexOf;(System.Object);summary;df-generated |
 | System.Runtime.CompilerServices;ReadOnlyCollectionBuilder<T>;IndexOf;(T);summary;df-generated |
 | System.Runtime.CompilerServices;ReadOnlyCollectionBuilder<T>;ReadOnlyCollectionBuilder;(System.Int32);summary;df-generated |
+| System.Runtime.CompilerServices;ReadOnlyCollectionBuilder<T>;Remove;(System.Object);summary;df-generated |
 | System.Runtime.CompilerServices;ReadOnlyCollectionBuilder<T>;Remove;(T);summary;df-generated |
 | System.Runtime.CompilerServices;ReadOnlyCollectionBuilder<T>;RemoveAt;(System.Int32);summary;df-generated |
 | System.Runtime.CompilerServices;ReadOnlyCollectionBuilder<T>;Reverse;();summary;df-generated |
@@ -35637,18 +38480,18 @@ neutral
 | System.Runtime.CompilerServices;SwitchExpressionException;SwitchExpressionException;(System.String,System.Exception);summary;df-generated |
 | System.Runtime.CompilerServices;SwitchExpressionException;get_UnmatchedValue;();summary;df-generated |
 | System.Runtime.CompilerServices;TaskAwaiter;GetResult;();summary;df-generated |
+| System.Runtime.CompilerServices;TaskAwaiter;OnCompleted;(System.Action);summary;df-generated |
+| System.Runtime.CompilerServices;TaskAwaiter;UnsafeOnCompleted;(System.Action);summary;df-generated |
 | System.Runtime.CompilerServices;TaskAwaiter;get_IsCompleted;();summary;df-generated |
+| System.Runtime.CompilerServices;TaskAwaiter<TResult>;OnCompleted;(System.Action);summary;df-generated |
+| System.Runtime.CompilerServices;TaskAwaiter<TResult>;UnsafeOnCompleted;(System.Action);summary;df-generated |
 | System.Runtime.CompilerServices;TaskAwaiter<TResult>;get_IsCompleted;();summary;df-generated |
 | System.Runtime.CompilerServices;TypeForwardedFromAttribute;TypeForwardedFromAttribute;(System.String);summary;df-generated |
 | System.Runtime.CompilerServices;TypeForwardedFromAttribute;get_AssemblyFullName;();summary;df-generated |
 | System.Runtime.CompilerServices;TypeForwardedToAttribute;TypeForwardedToAttribute;(System.Type);summary;df-generated |
 | System.Runtime.CompilerServices;TypeForwardedToAttribute;get_Destination;();summary;df-generated |
 | System.Runtime.CompilerServices;Unsafe;Add<T>;(System.Void*,System.Int32);summary;df-generated |
-| System.Runtime.CompilerServices;Unsafe;Add<T>;(T,System.Int32);summary;df-generated |
-| System.Runtime.CompilerServices;Unsafe;Add<T>;(T,System.IntPtr);summary;df-generated |
-| System.Runtime.CompilerServices;Unsafe;Add<T>;(T,System.UIntPtr);summary;df-generated |
 | System.Runtime.CompilerServices;Unsafe;AddByteOffset<T>;(T,System.IntPtr);summary;df-generated |
-| System.Runtime.CompilerServices;Unsafe;AddByteOffset<T>;(T,System.UIntPtr);summary;df-generated |
 | System.Runtime.CompilerServices;Unsafe;AreSame<T>;(T,T);summary;df-generated |
 | System.Runtime.CompilerServices;Unsafe;As<T>;(System.Object);summary;df-generated |
 | System.Runtime.CompilerServices;Unsafe;As<TFrom,TTo>;(TFrom);summary;df-generated |
@@ -35658,7 +38501,6 @@ neutral
 | System.Runtime.CompilerServices;Unsafe;BitCast<TFrom,TTo>;(TFrom);summary;df-generated |
 | System.Runtime.CompilerServices;Unsafe;ByteOffset<T>;(T,T);summary;df-generated |
 | System.Runtime.CompilerServices;Unsafe;Copy<T>;(System.Void*,T);summary;df-generated |
-| System.Runtime.CompilerServices;Unsafe;Copy<T>;(T,System.Void*);summary;df-generated |
 | System.Runtime.CompilerServices;Unsafe;CopyBlock;(System.Byte,System.Byte,System.UInt32);summary;df-generated |
 | System.Runtime.CompilerServices;Unsafe;CopyBlock;(System.Void*,System.Void*,System.UInt32);summary;df-generated |
 | System.Runtime.CompilerServices;Unsafe;CopyBlockUnaligned;(System.Byte,System.Byte,System.UInt32);summary;df-generated |
@@ -35677,11 +38519,7 @@ neutral
 | System.Runtime.CompilerServices;Unsafe;SizeOf<T>;();summary;df-generated |
 | System.Runtime.CompilerServices;Unsafe;SkipInit<T>;(T);summary;df-generated |
 | System.Runtime.CompilerServices;Unsafe;Subtract<T>;(System.Void*,System.Int32);summary;df-generated |
-| System.Runtime.CompilerServices;Unsafe;Subtract<T>;(T,System.Int32);summary;df-generated |
-| System.Runtime.CompilerServices;Unsafe;Subtract<T>;(T,System.IntPtr);summary;df-generated |
-| System.Runtime.CompilerServices;Unsafe;Subtract<T>;(T,System.UIntPtr);summary;df-generated |
 | System.Runtime.CompilerServices;Unsafe;SubtractByteOffset<T>;(T,System.IntPtr);summary;df-generated |
-| System.Runtime.CompilerServices;Unsafe;SubtractByteOffset<T>;(T,System.UIntPtr);summary;df-generated |
 | System.Runtime.CompilerServices;Unsafe;Unbox<T>;(System.Object);summary;df-generated |
 | System.Runtime.CompilerServices;Unsafe;Write<T>;(System.Void*,T);summary;df-generated |
 | System.Runtime.CompilerServices;Unsafe;WriteUnaligned<T>;(System.Byte,T);summary;df-generated |
@@ -35689,9 +38527,15 @@ neutral
 | System.Runtime.CompilerServices;UnsafeAccessorAttribute;UnsafeAccessorAttribute;(System.Runtime.CompilerServices.UnsafeAccessorKind);summary;df-generated |
 | System.Runtime.CompilerServices;UnsafeAccessorAttribute;get_Kind;();summary;df-generated |
 | System.Runtime.CompilerServices;ValueTaskAwaiter;GetResult;();summary;df-generated |
+| System.Runtime.CompilerServices;ValueTaskAwaiter;OnCompleted;(System.Action);summary;df-generated |
+| System.Runtime.CompilerServices;ValueTaskAwaiter;UnsafeOnCompleted;(System.Action);summary;df-generated |
 | System.Runtime.CompilerServices;ValueTaskAwaiter;get_IsCompleted;();summary;df-generated |
+| System.Runtime.CompilerServices;ValueTaskAwaiter<TResult>;OnCompleted;(System.Action);summary;df-generated |
+| System.Runtime.CompilerServices;ValueTaskAwaiter<TResult>;UnsafeOnCompleted;(System.Action);summary;df-generated |
 | System.Runtime.CompilerServices;ValueTaskAwaiter<TResult>;get_IsCompleted;();summary;df-generated |
 | System.Runtime.CompilerServices;YieldAwaitable+YieldAwaiter;GetResult;();summary;df-generated |
+| System.Runtime.CompilerServices;YieldAwaitable+YieldAwaiter;OnCompleted;(System.Action);summary;df-generated |
+| System.Runtime.CompilerServices;YieldAwaitable+YieldAwaiter;UnsafeOnCompleted;(System.Action);summary;df-generated |
 | System.Runtime.CompilerServices;YieldAwaitable+YieldAwaiter;get_IsCompleted;();summary;df-generated |
 | System.Runtime.CompilerServices;YieldAwaitable;GetAwaiter;();summary;df-generated |
 | System.Runtime.ConstrainedExecution;ReliabilityContractAttribute;ReliabilityContractAttribute;(System.Runtime.ConstrainedExecution.Consistency,System.Runtime.ConstrainedExecution.Cer);summary;df-generated |
@@ -35895,6 +38739,7 @@ neutral
 | System.Runtime.InteropServices.JavaScript;JSImportAttribute;get_FunctionName;();summary;df-generated |
 | System.Runtime.InteropServices.JavaScript;JSImportAttribute;get_ModuleName;();summary;df-generated |
 | System.Runtime.InteropServices.JavaScript;JSMarshalerArgument;Initialize;();summary;df-generated |
+| System.Runtime.InteropServices.JavaScript;JSMarshalerArgument;ToJS;(System.Action);summary;df-generated |
 | System.Runtime.InteropServices.JavaScript;JSMarshalerArgument;ToJS;(System.ArraySegment<System.Byte>);summary;df-generated |
 | System.Runtime.InteropServices.JavaScript;JSMarshalerArgument;ToJS;(System.ArraySegment<System.Double>);summary;df-generated |
 | System.Runtime.InteropServices.JavaScript;JSMarshalerArgument;ToJS;(System.ArraySegment<System.Int32>);summary;df-generated |
@@ -35935,8 +38780,17 @@ neutral
 | System.Runtime.InteropServices.JavaScript;JSMarshalerArgument;ToJS;(System.String[]);summary;df-generated |
 | System.Runtime.InteropServices.JavaScript;JSMarshalerArgument;ToJS;(System.Threading.Tasks.Task);summary;df-generated |
 | System.Runtime.InteropServices.JavaScript;JSMarshalerArgument;ToJS;(System.Void*);summary;df-generated |
+| System.Runtime.InteropServices.JavaScript;JSMarshalerArgument;ToJS<T1,T2,T3,TResult>;(System.Func<T1,T2,T3,TResult>,System.Runtime.InteropServices.JavaScript.JSMarshalerArgument+ArgumentToManagedCallback<T1>,System.Runtime.InteropServices.JavaScript.JSMarshalerArgument+ArgumentToManagedCallback<T2>,System.Runtime.InteropServices.JavaScript.JSMarshalerArgument+ArgumentToManagedCallback<T3>,System.Runtime.InteropServices.JavaScript.JSMarshalerArgument+ArgumentToJSCallback<TResult>);summary;df-generated |
+| System.Runtime.InteropServices.JavaScript;JSMarshalerArgument;ToJS<T1,T2,T3>;(System.Action<T1,T2,T3>,System.Runtime.InteropServices.JavaScript.JSMarshalerArgument+ArgumentToManagedCallback<T1>,System.Runtime.InteropServices.JavaScript.JSMarshalerArgument+ArgumentToManagedCallback<T2>,System.Runtime.InteropServices.JavaScript.JSMarshalerArgument+ArgumentToManagedCallback<T3>);summary;df-generated |
+| System.Runtime.InteropServices.JavaScript;JSMarshalerArgument;ToJS<T1,T2,TResult>;(System.Func<T1,T2,TResult>,System.Runtime.InteropServices.JavaScript.JSMarshalerArgument+ArgumentToManagedCallback<T1>,System.Runtime.InteropServices.JavaScript.JSMarshalerArgument+ArgumentToManagedCallback<T2>,System.Runtime.InteropServices.JavaScript.JSMarshalerArgument+ArgumentToJSCallback<TResult>);summary;df-generated |
+| System.Runtime.InteropServices.JavaScript;JSMarshalerArgument;ToJS<T1,T2>;(System.Action<T1,T2>,System.Runtime.InteropServices.JavaScript.JSMarshalerArgument+ArgumentToManagedCallback<T1>,System.Runtime.InteropServices.JavaScript.JSMarshalerArgument+ArgumentToManagedCallback<T2>);summary;df-generated |
+| System.Runtime.InteropServices.JavaScript;JSMarshalerArgument;ToJS<T,TResult>;(System.Func<T,TResult>,System.Runtime.InteropServices.JavaScript.JSMarshalerArgument+ArgumentToManagedCallback<T>,System.Runtime.InteropServices.JavaScript.JSMarshalerArgument+ArgumentToJSCallback<TResult>);summary;df-generated |
+| System.Runtime.InteropServices.JavaScript;JSMarshalerArgument;ToJS<T>;(System.Action<T>,System.Runtime.InteropServices.JavaScript.JSMarshalerArgument+ArgumentToManagedCallback<T>);summary;df-generated |
+| System.Runtime.InteropServices.JavaScript;JSMarshalerArgument;ToJS<T>;(System.Threading.Tasks.Task<T>,System.Runtime.InteropServices.JavaScript.JSMarshalerArgument+ArgumentToJSCallback<T>);summary;df-generated |
+| System.Runtime.InteropServices.JavaScript;JSMarshalerArgument;ToJS<TResult>;(System.Func<TResult>,System.Runtime.InteropServices.JavaScript.JSMarshalerArgument+ArgumentToJSCallback<TResult>);summary;df-generated |
 | System.Runtime.InteropServices.JavaScript;JSMarshalerArgument;ToJSBig;(System.Int64);summary;df-generated |
 | System.Runtime.InteropServices.JavaScript;JSMarshalerArgument;ToJSBig;(System.Nullable<System.Int64>);summary;df-generated |
+| System.Runtime.InteropServices.JavaScript;JSMarshalerArgument;ToManaged;(System.Action);summary;df-generated |
 | System.Runtime.InteropServices.JavaScript;JSMarshalerArgument;ToManaged;(System.ArraySegment<System.Byte>);summary;df-generated |
 | System.Runtime.InteropServices.JavaScript;JSMarshalerArgument;ToManaged;(System.ArraySegment<System.Double>);summary;df-generated |
 | System.Runtime.InteropServices.JavaScript;JSMarshalerArgument;ToManaged;(System.ArraySegment<System.Int32>);summary;df-generated |
@@ -35977,6 +38831,14 @@ neutral
 | System.Runtime.InteropServices.JavaScript;JSMarshalerArgument;ToManaged;(System.String[]);summary;df-generated |
 | System.Runtime.InteropServices.JavaScript;JSMarshalerArgument;ToManaged;(System.Threading.Tasks.Task);summary;df-generated |
 | System.Runtime.InteropServices.JavaScript;JSMarshalerArgument;ToManaged;(System.Void*);summary;df-generated |
+| System.Runtime.InteropServices.JavaScript;JSMarshalerArgument;ToManaged<T1,T2,T3,TResult>;(System.Func<T1,T2,T3,TResult>,System.Runtime.InteropServices.JavaScript.JSMarshalerArgument+ArgumentToJSCallback<T1>,System.Runtime.InteropServices.JavaScript.JSMarshalerArgument+ArgumentToJSCallback<T2>,System.Runtime.InteropServices.JavaScript.JSMarshalerArgument+ArgumentToJSCallback<T3>,System.Runtime.InteropServices.JavaScript.JSMarshalerArgument+ArgumentToManagedCallback<TResult>);summary;df-generated |
+| System.Runtime.InteropServices.JavaScript;JSMarshalerArgument;ToManaged<T1,T2,T3>;(System.Action<T1,T2,T3>,System.Runtime.InteropServices.JavaScript.JSMarshalerArgument+ArgumentToJSCallback<T1>,System.Runtime.InteropServices.JavaScript.JSMarshalerArgument+ArgumentToJSCallback<T2>,System.Runtime.InteropServices.JavaScript.JSMarshalerArgument+ArgumentToJSCallback<T3>);summary;df-generated |
+| System.Runtime.InteropServices.JavaScript;JSMarshalerArgument;ToManaged<T1,T2,TResult>;(System.Func<T1,T2,TResult>,System.Runtime.InteropServices.JavaScript.JSMarshalerArgument+ArgumentToJSCallback<T1>,System.Runtime.InteropServices.JavaScript.JSMarshalerArgument+ArgumentToJSCallback<T2>,System.Runtime.InteropServices.JavaScript.JSMarshalerArgument+ArgumentToManagedCallback<TResult>);summary;df-generated |
+| System.Runtime.InteropServices.JavaScript;JSMarshalerArgument;ToManaged<T1,T2>;(System.Action<T1,T2>,System.Runtime.InteropServices.JavaScript.JSMarshalerArgument+ArgumentToJSCallback<T1>,System.Runtime.InteropServices.JavaScript.JSMarshalerArgument+ArgumentToJSCallback<T2>);summary;df-generated |
+| System.Runtime.InteropServices.JavaScript;JSMarshalerArgument;ToManaged<T,TResult>;(System.Func<T,TResult>,System.Runtime.InteropServices.JavaScript.JSMarshalerArgument+ArgumentToJSCallback<T>,System.Runtime.InteropServices.JavaScript.JSMarshalerArgument+ArgumentToManagedCallback<TResult>);summary;df-generated |
+| System.Runtime.InteropServices.JavaScript;JSMarshalerArgument;ToManaged<T>;(System.Action<T>,System.Runtime.InteropServices.JavaScript.JSMarshalerArgument+ArgumentToJSCallback<T>);summary;df-generated |
+| System.Runtime.InteropServices.JavaScript;JSMarshalerArgument;ToManaged<T>;(System.Threading.Tasks.Task<T>,System.Runtime.InteropServices.JavaScript.JSMarshalerArgument+ArgumentToManagedCallback<T>);summary;df-generated |
+| System.Runtime.InteropServices.JavaScript;JSMarshalerArgument;ToManaged<TResult>;(System.Func<TResult>,System.Runtime.InteropServices.JavaScript.JSMarshalerArgument+ArgumentToManagedCallback<TResult>);summary;df-generated |
 | System.Runtime.InteropServices.JavaScript;JSMarshalerArgument;ToManagedBig;(System.Int64);summary;df-generated |
 | System.Runtime.InteropServices.JavaScript;JSMarshalerArgument;ToManagedBig;(System.Nullable<System.Int64>);summary;df-generated |
 | System.Runtime.InteropServices.JavaScript;JSMarshalerType;Action;();summary;df-generated |
@@ -36150,6 +39012,7 @@ neutral
 | System.Runtime.InteropServices.Marshalling;VirtualMethodTableInfo;get_ThisPointer;();summary;df-generated |
 | System.Runtime.InteropServices.Marshalling;VirtualMethodTableInfo;get_VirtualMethodTable;();summary;df-generated |
 | System.Runtime.InteropServices.ObjectiveC;ObjectiveCMarshal;CreateReferenceTrackingHandle;(System.Object,System.Span<System.IntPtr>);summary;df-generated |
+| System.Runtime.InteropServices.ObjectiveC;ObjectiveCMarshal;Initialize;(System.Runtime.InteropServices.ObjectiveC.ObjectiveCMarshal+UnhandledExceptionPropagationHandler);summary;df-generated |
 | System.Runtime.InteropServices.ObjectiveC;ObjectiveCMarshal;SetMessageSendCallback;(System.Runtime.InteropServices.ObjectiveC.ObjectiveCMarshal+MessageSendFunction,System.IntPtr);summary;df-generated |
 | System.Runtime.InteropServices.ObjectiveC;ObjectiveCMarshal;SetMessageSendPendingException;(System.Exception);summary;df-generated |
 | System.Runtime.InteropServices;ArrayWithOffset;Equals;(System.Object);summary;df-generated |
@@ -36191,6 +39054,7 @@ neutral
 | System.Runtime.InteropServices;ComAliasNameAttribute;get_Value;();summary;df-generated |
 | System.Runtime.InteropServices;ComAwareEventInfo;AddEventHandler;(System.Object,System.Delegate);summary;df-generated |
 | System.Runtime.InteropServices;ComAwareEventInfo;ComAwareEventInfo;(System.Type,System.String);summary;df-generated |
+| System.Runtime.InteropServices;ComAwareEventInfo;GetCustomAttributes;(System.Boolean);summary;df-generated |
 | System.Runtime.InteropServices;ComAwareEventInfo;GetCustomAttributes;(System.Type,System.Boolean);summary;df-generated |
 | System.Runtime.InteropServices;ComAwareEventInfo;GetCustomAttributesData;();summary;df-generated |
 | System.Runtime.InteropServices;ComAwareEventInfo;GetOtherMethods;(System.Boolean);summary;df-generated |
@@ -36488,7 +39352,6 @@ neutral
 | System.Runtime.InteropServices;MemoryMarshal;CreateReadOnlySpan<T>;(T,System.Int32);summary;df-generated |
 | System.Runtime.InteropServices;MemoryMarshal;CreateReadOnlySpanFromNullTerminated;(System.Byte*);summary;df-generated |
 | System.Runtime.InteropServices;MemoryMarshal;CreateReadOnlySpanFromNullTerminated;(System.Char*);summary;df-generated |
-| System.Runtime.InteropServices;MemoryMarshal;CreateSpan<T>;(T,System.Int32);summary;df-generated |
 | System.Runtime.InteropServices;MemoryMarshal;GetArrayDataReference;(System.Array);summary;df-generated |
 | System.Runtime.InteropServices;MemoryMarshal;GetArrayDataReference<T>;(T[]);summary;df-generated |
 | System.Runtime.InteropServices;MemoryMarshal;GetReference<T>;(System.ReadOnlySpan<T>);summary;df-generated |
@@ -36601,17 +39464,32 @@ neutral
 | System.Runtime.InteropServices;NFloat;SinPi;(System.Runtime.InteropServices.NFloat);summary;df-generated |
 | System.Runtime.InteropServices;NFloat;Sinh;(System.Runtime.InteropServices.NFloat);summary;df-generated |
 | System.Runtime.InteropServices;NFloat;Sqrt;(System.Runtime.InteropServices.NFloat);summary;df-generated |
+| System.Runtime.InteropServices;NFloat;System.Numerics.IAdditionOperators<System.Runtime.InteropServices.NFloat,System.Runtime.InteropServices.NFloat,System.Runtime.InteropServices.NFloat>.op_Addition;(System.Runtime.InteropServices.NFloat,System.Runtime.InteropServices.NFloat);summary;df-generated |
 | System.Runtime.InteropServices;NFloat;System.Numerics.IAdditionOperators<System.Runtime.InteropServices.NFloat,System.Runtime.InteropServices.NFloat,System.Runtime.InteropServices.NFloat>.op_CheckedAddition;(System.Runtime.InteropServices.NFloat,System.Runtime.InteropServices.NFloat);summary;df-generated |
 | System.Runtime.InteropServices;NFloat;System.Numerics.IBitwiseOperators<System.Runtime.InteropServices.NFloat,System.Runtime.InteropServices.NFloat,System.Runtime.InteropServices.NFloat>.op_BitwiseAnd;(System.Runtime.InteropServices.NFloat,System.Runtime.InteropServices.NFloat);summary;df-generated |
 | System.Runtime.InteropServices;NFloat;System.Numerics.IBitwiseOperators<System.Runtime.InteropServices.NFloat,System.Runtime.InteropServices.NFloat,System.Runtime.InteropServices.NFloat>.op_BitwiseOr;(System.Runtime.InteropServices.NFloat,System.Runtime.InteropServices.NFloat);summary;df-generated |
 | System.Runtime.InteropServices;NFloat;System.Numerics.IBitwiseOperators<System.Runtime.InteropServices.NFloat,System.Runtime.InteropServices.NFloat,System.Runtime.InteropServices.NFloat>.op_ExclusiveOr;(System.Runtime.InteropServices.NFloat,System.Runtime.InteropServices.NFloat);summary;df-generated |
 | System.Runtime.InteropServices;NFloat;System.Numerics.IBitwiseOperators<System.Runtime.InteropServices.NFloat,System.Runtime.InteropServices.NFloat,System.Runtime.InteropServices.NFloat>.op_OnesComplement;(System.Runtime.InteropServices.NFloat);summary;df-generated |
+| System.Runtime.InteropServices;NFloat;System.Numerics.IComparisonOperators<System.Runtime.InteropServices.NFloat,System.Runtime.InteropServices.NFloat,System.Boolean>.op_GreaterThan;(System.Runtime.InteropServices.NFloat,System.Runtime.InteropServices.NFloat);summary;df-generated |
+| System.Runtime.InteropServices;NFloat;System.Numerics.IComparisonOperators<System.Runtime.InteropServices.NFloat,System.Runtime.InteropServices.NFloat,System.Boolean>.op_GreaterThanOrEqual;(System.Runtime.InteropServices.NFloat,System.Runtime.InteropServices.NFloat);summary;df-generated |
+| System.Runtime.InteropServices;NFloat;System.Numerics.IComparisonOperators<System.Runtime.InteropServices.NFloat,System.Runtime.InteropServices.NFloat,System.Boolean>.op_LessThan;(System.Runtime.InteropServices.NFloat,System.Runtime.InteropServices.NFloat);summary;df-generated |
+| System.Runtime.InteropServices;NFloat;System.Numerics.IComparisonOperators<System.Runtime.InteropServices.NFloat,System.Runtime.InteropServices.NFloat,System.Boolean>.op_LessThanOrEqual;(System.Runtime.InteropServices.NFloat,System.Runtime.InteropServices.NFloat);summary;df-generated |
 | System.Runtime.InteropServices;NFloat;System.Numerics.IDecrementOperators<System.Runtime.InteropServices.NFloat>.op_CheckedDecrement;(System.Runtime.InteropServices.NFloat);summary;df-generated |
+| System.Runtime.InteropServices;NFloat;System.Numerics.IDecrementOperators<System.Runtime.InteropServices.NFloat>.op_Decrement;(System.Runtime.InteropServices.NFloat);summary;df-generated |
 | System.Runtime.InteropServices;NFloat;System.Numerics.IDivisionOperators<System.Runtime.InteropServices.NFloat,System.Runtime.InteropServices.NFloat,System.Runtime.InteropServices.NFloat>.op_CheckedDivision;(System.Runtime.InteropServices.NFloat,System.Runtime.InteropServices.NFloat);summary;df-generated |
+| System.Runtime.InteropServices;NFloat;System.Numerics.IDivisionOperators<System.Runtime.InteropServices.NFloat,System.Runtime.InteropServices.NFloat,System.Runtime.InteropServices.NFloat>.op_Division;(System.Runtime.InteropServices.NFloat,System.Runtime.InteropServices.NFloat);summary;df-generated |
+| System.Runtime.InteropServices;NFloat;System.Numerics.IEqualityOperators<System.Runtime.InteropServices.NFloat,System.Runtime.InteropServices.NFloat,System.Boolean>.op_Equality;(System.Runtime.InteropServices.NFloat,System.Runtime.InteropServices.NFloat);summary;df-generated |
+| System.Runtime.InteropServices;NFloat;System.Numerics.IEqualityOperators<System.Runtime.InteropServices.NFloat,System.Runtime.InteropServices.NFloat,System.Boolean>.op_Inequality;(System.Runtime.InteropServices.NFloat,System.Runtime.InteropServices.NFloat);summary;df-generated |
 | System.Runtime.InteropServices;NFloat;System.Numerics.IIncrementOperators<System.Runtime.InteropServices.NFloat>.op_CheckedIncrement;(System.Runtime.InteropServices.NFloat);summary;df-generated |
+| System.Runtime.InteropServices;NFloat;System.Numerics.IIncrementOperators<System.Runtime.InteropServices.NFloat>.op_Increment;(System.Runtime.InteropServices.NFloat);summary;df-generated |
+| System.Runtime.InteropServices;NFloat;System.Numerics.IModulusOperators<System.Runtime.InteropServices.NFloat,System.Runtime.InteropServices.NFloat,System.Runtime.InteropServices.NFloat>.op_Modulus;(System.Runtime.InteropServices.NFloat,System.Runtime.InteropServices.NFloat);summary;df-generated |
 | System.Runtime.InteropServices;NFloat;System.Numerics.IMultiplyOperators<System.Runtime.InteropServices.NFloat,System.Runtime.InteropServices.NFloat,System.Runtime.InteropServices.NFloat>.op_CheckedMultiply;(System.Runtime.InteropServices.NFloat,System.Runtime.InteropServices.NFloat);summary;df-generated |
+| System.Runtime.InteropServices;NFloat;System.Numerics.IMultiplyOperators<System.Runtime.InteropServices.NFloat,System.Runtime.InteropServices.NFloat,System.Runtime.InteropServices.NFloat>.op_Multiply;(System.Runtime.InteropServices.NFloat,System.Runtime.InteropServices.NFloat);summary;df-generated |
 | System.Runtime.InteropServices;NFloat;System.Numerics.ISubtractionOperators<System.Runtime.InteropServices.NFloat,System.Runtime.InteropServices.NFloat,System.Runtime.InteropServices.NFloat>.op_CheckedSubtraction;(System.Runtime.InteropServices.NFloat,System.Runtime.InteropServices.NFloat);summary;df-generated |
+| System.Runtime.InteropServices;NFloat;System.Numerics.ISubtractionOperators<System.Runtime.InteropServices.NFloat,System.Runtime.InteropServices.NFloat,System.Runtime.InteropServices.NFloat>.op_Subtraction;(System.Runtime.InteropServices.NFloat,System.Runtime.InteropServices.NFloat);summary;df-generated |
 | System.Runtime.InteropServices;NFloat;System.Numerics.IUnaryNegationOperators<System.Runtime.InteropServices.NFloat,System.Runtime.InteropServices.NFloat>.op_CheckedUnaryNegation;(System.Runtime.InteropServices.NFloat);summary;df-generated |
+| System.Runtime.InteropServices;NFloat;System.Numerics.IUnaryNegationOperators<System.Runtime.InteropServices.NFloat,System.Runtime.InteropServices.NFloat>.op_UnaryNegation;(System.Runtime.InteropServices.NFloat);summary;df-generated |
+| System.Runtime.InteropServices;NFloat;System.Numerics.IUnaryPlusOperators<System.Runtime.InteropServices.NFloat,System.Runtime.InteropServices.NFloat>.op_UnaryPlus;(System.Runtime.InteropServices.NFloat);summary;df-generated |
 | System.Runtime.InteropServices;NFloat;Tan;(System.Runtime.InteropServices.NFloat);summary;df-generated |
 | System.Runtime.InteropServices;NFloat;TanPi;(System.Runtime.InteropServices.NFloat);summary;df-generated |
 | System.Runtime.InteropServices;NFloat;Tanh;(System.Runtime.InteropServices.NFloat);summary;df-generated |
@@ -36663,6 +39541,7 @@ neutral
 | System.Runtime.InteropServices;NativeLibrary;GetMainProgramHandle;();summary;df-generated |
 | System.Runtime.InteropServices;NativeLibrary;Load;(System.String);summary;df-generated |
 | System.Runtime.InteropServices;NativeLibrary;Load;(System.String,System.Reflection.Assembly,System.Nullable<System.Runtime.InteropServices.DllImportSearchPath>);summary;df-generated |
+| System.Runtime.InteropServices;NativeLibrary;SetDllImportResolver;(System.Reflection.Assembly,System.Runtime.InteropServices.DllImportResolver);summary;df-generated |
 | System.Runtime.InteropServices;NativeLibrary;TryGetExport;(System.IntPtr,System.String,System.IntPtr);summary;df-generated |
 | System.Runtime.InteropServices;NativeLibrary;TryLoad;(System.String,System.IntPtr);summary;df-generated |
 | System.Runtime.InteropServices;NativeLibrary;TryLoad;(System.String,System.Reflection.Assembly,System.Nullable<System.Runtime.InteropServices.DllImportSearchPath>,System.IntPtr);summary;df-generated |
@@ -36688,6 +39567,7 @@ neutral
 | System.Runtime.InteropServices;OSPlatform;op_Equality;(System.Runtime.InteropServices.OSPlatform,System.Runtime.InteropServices.OSPlatform);summary;df-generated |
 | System.Runtime.InteropServices;OSPlatform;op_Inequality;(System.Runtime.InteropServices.OSPlatform,System.Runtime.InteropServices.OSPlatform);summary;df-generated |
 | System.Runtime.InteropServices;PosixSignalContext;PosixSignalContext;(System.Runtime.InteropServices.PosixSignal);summary;df-generated |
+| System.Runtime.InteropServices;PosixSignalRegistration;Create;(System.Runtime.InteropServices.PosixSignal,System.Action<System.Runtime.InteropServices.PosixSignalContext>);summary;df-generated |
 | System.Runtime.InteropServices;PosixSignalRegistration;Dispose;();summary;df-generated |
 | System.Runtime.InteropServices;PrimaryInteropAssemblyAttribute;PrimaryInteropAssemblyAttribute;(System.Int32,System.Int32);summary;df-generated |
 | System.Runtime.InteropServices;PrimaryInteropAssemblyAttribute;get_MajorVersion;();summary;df-generated |
@@ -36716,7 +39596,6 @@ neutral
 | System.Runtime.InteropServices;SafeArrayTypeMismatchException;SafeArrayTypeMismatchException;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);summary;df-generated |
 | System.Runtime.InteropServices;SafeArrayTypeMismatchException;SafeArrayTypeMismatchException;(System.String);summary;df-generated |
 | System.Runtime.InteropServices;SafeArrayTypeMismatchException;SafeArrayTypeMismatchException;(System.String,System.Exception);summary;df-generated |
-| System.Runtime.InteropServices;SafeBuffer;AcquirePointer;(System.Byte*);summary;df-generated |
 | System.Runtime.InteropServices;SafeBuffer;Initialize;(System.UInt32,System.UInt32);summary;df-generated |
 | System.Runtime.InteropServices;SafeBuffer;Initialize;(System.UInt64);summary;df-generated |
 | System.Runtime.InteropServices;SafeBuffer;Initialize<T>;(System.UInt32);summary;df-generated |
@@ -36738,7 +39617,7 @@ neutral
 | System.Runtime.InteropServices;SafeHandle;SetHandleAsInvalid;();summary;df-generated |
 | System.Runtime.InteropServices;SafeHandle;get_IsClosed;();summary;df-generated |
 | System.Runtime.InteropServices;SafeHandle;get_IsInvalid;();summary;df-generated |
-| System.Runtime.InteropServices;SequenceMarshal;TryRead<T>;(System.Buffers.SequenceReader<System.Byte>,T);summary;df-generated |
+| System.Runtime.InteropServices;SequenceMarshal;TryGetArray<T>;(System.Buffers.ReadOnlySequence<T>,System.ArraySegment<T>);summary;df-generated |
 | System.Runtime.InteropServices;StructLayoutAttribute;StructLayoutAttribute;(System.Int16);summary;df-generated |
 | System.Runtime.InteropServices;StructLayoutAttribute;StructLayoutAttribute;(System.Runtime.InteropServices.LayoutKind);summary;df-generated |
 | System.Runtime.InteropServices;StructLayoutAttribute;get_Value;();summary;df-generated |
@@ -42148,7 +45027,6 @@ neutral
 | System.Runtime.Intrinsics;Vector64;Store<T>;(System.Runtime.Intrinsics.Vector64<T>,T*);summary;df-generated |
 | System.Runtime.Intrinsics;Vector64;StoreAligned<T>;(System.Runtime.Intrinsics.Vector64<T>,T*);summary;df-generated |
 | System.Runtime.Intrinsics;Vector64;StoreAlignedNonTemporal<T>;(System.Runtime.Intrinsics.Vector64<T>,T*);summary;df-generated |
-| System.Runtime.Intrinsics;Vector64;StoreUnsafe<T>;(System.Runtime.Intrinsics.Vector64<T>,T);summary;df-generated |
 | System.Runtime.Intrinsics;Vector64;StoreUnsafe<T>;(System.Runtime.Intrinsics.Vector64<T>,T,System.UIntPtr);summary;df-generated |
 | System.Runtime.Intrinsics;Vector64;Subtract<T>;(System.Runtime.Intrinsics.Vector64<T>,System.Runtime.Intrinsics.Vector64<T>);summary;df-generated |
 | System.Runtime.Intrinsics;Vector64;Sum<T>;(System.Runtime.Intrinsics.Vector64<T>);summary;df-generated |
@@ -42391,7 +45269,6 @@ neutral
 | System.Runtime.Intrinsics;Vector128;Store<T>;(System.Runtime.Intrinsics.Vector128<T>,T*);summary;df-generated |
 | System.Runtime.Intrinsics;Vector128;StoreAligned<T>;(System.Runtime.Intrinsics.Vector128<T>,T*);summary;df-generated |
 | System.Runtime.Intrinsics;Vector128;StoreAlignedNonTemporal<T>;(System.Runtime.Intrinsics.Vector128<T>,T*);summary;df-generated |
-| System.Runtime.Intrinsics;Vector128;StoreUnsafe<T>;(System.Runtime.Intrinsics.Vector128<T>,T);summary;df-generated |
 | System.Runtime.Intrinsics;Vector128;StoreUnsafe<T>;(System.Runtime.Intrinsics.Vector128<T>,T,System.UIntPtr);summary;df-generated |
 | System.Runtime.Intrinsics;Vector128;Subtract<T>;(System.Runtime.Intrinsics.Vector128<T>,System.Runtime.Intrinsics.Vector128<T>);summary;df-generated |
 | System.Runtime.Intrinsics;Vector128;Sum<T>;(System.Runtime.Intrinsics.Vector128<T>);summary;df-generated |
@@ -42628,7 +45505,6 @@ neutral
 | System.Runtime.Intrinsics;Vector256;Store<T>;(System.Runtime.Intrinsics.Vector256<T>,T*);summary;df-generated |
 | System.Runtime.Intrinsics;Vector256;StoreAligned<T>;(System.Runtime.Intrinsics.Vector256<T>,T*);summary;df-generated |
 | System.Runtime.Intrinsics;Vector256;StoreAlignedNonTemporal<T>;(System.Runtime.Intrinsics.Vector256<T>,T*);summary;df-generated |
-| System.Runtime.Intrinsics;Vector256;StoreUnsafe<T>;(System.Runtime.Intrinsics.Vector256<T>,T);summary;df-generated |
 | System.Runtime.Intrinsics;Vector256;StoreUnsafe<T>;(System.Runtime.Intrinsics.Vector256<T>,T,System.UIntPtr);summary;df-generated |
 | System.Runtime.Intrinsics;Vector256;Subtract<T>;(System.Runtime.Intrinsics.Vector256<T>,System.Runtime.Intrinsics.Vector256<T>);summary;df-generated |
 | System.Runtime.Intrinsics;Vector256;Sum<T>;(System.Runtime.Intrinsics.Vector256<T>);summary;df-generated |
@@ -42865,7 +45741,6 @@ neutral
 | System.Runtime.Intrinsics;Vector512;Store<T>;(System.Runtime.Intrinsics.Vector512<T>,T*);summary;df-generated |
 | System.Runtime.Intrinsics;Vector512;StoreAligned<T>;(System.Runtime.Intrinsics.Vector512<T>,T*);summary;df-generated |
 | System.Runtime.Intrinsics;Vector512;StoreAlignedNonTemporal<T>;(System.Runtime.Intrinsics.Vector512<T>,T*);summary;df-generated |
-| System.Runtime.Intrinsics;Vector512;StoreUnsafe<T>;(System.Runtime.Intrinsics.Vector512<T>,T);summary;df-generated |
 | System.Runtime.Intrinsics;Vector512;StoreUnsafe<T>;(System.Runtime.Intrinsics.Vector512<T>,T,System.UIntPtr);summary;df-generated |
 | System.Runtime.Intrinsics;Vector512;Subtract<T>;(System.Runtime.Intrinsics.Vector512<T>,System.Runtime.Intrinsics.Vector512<T>);summary;df-generated |
 | System.Runtime.Intrinsics;Vector512;Sum<T>;(System.Runtime.Intrinsics.Vector512<T>);summary;df-generated |
@@ -42939,11 +45814,17 @@ neutral
 | System.Runtime.Loader;AssemblyLoadContext;SetProfileOptimizationRoot;(System.String);summary;df-generated |
 | System.Runtime.Loader;AssemblyLoadContext;StartProfileOptimization;(System.String);summary;df-generated |
 | System.Runtime.Loader;AssemblyLoadContext;Unload;();summary;df-generated |
+| System.Runtime.Loader;AssemblyLoadContext;add_Resolving;(System.Func<System.Runtime.Loader.AssemblyLoadContext,System.Reflection.AssemblyName,System.Reflection.Assembly>);summary;df-generated |
+| System.Runtime.Loader;AssemblyLoadContext;add_ResolvingUnmanagedDll;(System.Func<System.Reflection.Assembly,System.String,System.IntPtr>);summary;df-generated |
+| System.Runtime.Loader;AssemblyLoadContext;add_Unloading;(System.Action<System.Runtime.Loader.AssemblyLoadContext>);summary;df-generated |
 | System.Runtime.Loader;AssemblyLoadContext;get_All;();summary;df-generated |
 | System.Runtime.Loader;AssemblyLoadContext;get_Assemblies;();summary;df-generated |
 | System.Runtime.Loader;AssemblyLoadContext;get_CurrentContextualReflectionContext;();summary;df-generated |
 | System.Runtime.Loader;AssemblyLoadContext;get_Default;();summary;df-generated |
 | System.Runtime.Loader;AssemblyLoadContext;get_IsCollectible;();summary;df-generated |
+| System.Runtime.Loader;AssemblyLoadContext;remove_Resolving;(System.Func<System.Runtime.Loader.AssemblyLoadContext,System.Reflection.AssemblyName,System.Reflection.Assembly>);summary;df-generated |
+| System.Runtime.Loader;AssemblyLoadContext;remove_ResolvingUnmanagedDll;(System.Func<System.Reflection.Assembly,System.String,System.IntPtr>);summary;df-generated |
+| System.Runtime.Loader;AssemblyLoadContext;remove_Unloading;(System.Action<System.Runtime.Loader.AssemblyLoadContext>);summary;df-generated |
 | System.Runtime.Serialization.DataContracts;DataContract;GetArrayTypeName;(System.Boolean);summary;df-generated |
 | System.Runtime.Serialization.DataContracts;DataContract;GetBuiltInDataContract;(System.String,System.String);summary;df-generated |
 | System.Runtime.Serialization.DataContracts;DataContract;GetXmlName;(System.Type);summary;df-generated |
@@ -42969,11 +45850,6 @@ neutral
 | System.Runtime.Serialization.Json;DataContractJsonSerializer;DataContractJsonSerializer;(System.Type,System.Xml.XmlDictionaryString,System.Collections.Generic.IEnumerable<System.Type>);summary;df-generated |
 | System.Runtime.Serialization.Json;DataContractJsonSerializer;IsStartObject;(System.Xml.XmlDictionaryReader);summary;df-generated |
 | System.Runtime.Serialization.Json;DataContractJsonSerializer;IsStartObject;(System.Xml.XmlReader);summary;df-generated |
-| System.Runtime.Serialization.Json;DataContractJsonSerializer;ReadObject;(System.IO.Stream);summary;df-generated |
-| System.Runtime.Serialization.Json;DataContractJsonSerializer;ReadObject;(System.Xml.XmlDictionaryReader);summary;df-generated |
-| System.Runtime.Serialization.Json;DataContractJsonSerializer;ReadObject;(System.Xml.XmlDictionaryReader,System.Boolean);summary;df-generated |
-| System.Runtime.Serialization.Json;DataContractJsonSerializer;ReadObject;(System.Xml.XmlReader);summary;df-generated |
-| System.Runtime.Serialization.Json;DataContractJsonSerializer;ReadObject;(System.Xml.XmlReader,System.Boolean);summary;df-generated |
 | System.Runtime.Serialization.Json;DataContractJsonSerializer;WriteEndObject;(System.Xml.XmlDictionaryWriter);summary;df-generated |
 | System.Runtime.Serialization.Json;DataContractJsonSerializer;WriteEndObject;(System.Xml.XmlWriter);summary;df-generated |
 | System.Runtime.Serialization.Json;DataContractJsonSerializer;WriteObject;(System.IO.Stream,System.Object);summary;df-generated |
@@ -42989,6 +45865,12 @@ neutral
 | System.Runtime.Serialization.Json;DataContractJsonSerializer;get_MaxItemsInObjectGraph;();summary;df-generated |
 | System.Runtime.Serialization.Json;DataContractJsonSerializer;get_SerializeReadOnlyTypes;();summary;df-generated |
 | System.Runtime.Serialization.Json;DataContractJsonSerializer;get_UseSimpleDictionaryFormat;();summary;df-generated |
+| System.Runtime.Serialization.Json;IXmlJsonReaderInitializer;SetInput;(System.Byte[],System.Int32,System.Int32,System.Text.Encoding,System.Xml.XmlDictionaryReaderQuotas,System.Xml.OnXmlDictionaryReaderClose);summary;df-generated |
+| System.Runtime.Serialization.Json;IXmlJsonReaderInitializer;SetInput;(System.IO.Stream,System.Text.Encoding,System.Xml.XmlDictionaryReaderQuotas,System.Xml.OnXmlDictionaryReaderClose);summary;df-generated |
+| System.Runtime.Serialization.Json;JsonReaderWriterFactory;CreateJsonReader;(System.Byte[],System.Int32,System.Int32,System.Text.Encoding,System.Xml.XmlDictionaryReaderQuotas,System.Xml.OnXmlDictionaryReaderClose);summary;df-generated |
+| System.Runtime.Serialization.Json;JsonReaderWriterFactory;CreateJsonReader;(System.Byte[],System.Int32,System.Int32,System.Xml.XmlDictionaryReaderQuotas);summary;df-generated |
+| System.Runtime.Serialization.Json;JsonReaderWriterFactory;CreateJsonReader;(System.Byte[],System.Xml.XmlDictionaryReaderQuotas);summary;df-generated |
+| System.Runtime.Serialization.Json;JsonReaderWriterFactory;CreateJsonReader;(System.IO.Stream,System.Text.Encoding,System.Xml.XmlDictionaryReaderQuotas,System.Xml.OnXmlDictionaryReaderClose);summary;df-generated |
 | System.Runtime.Serialization.Json;JsonReaderWriterFactory;CreateJsonReader;(System.IO.Stream,System.Xml.XmlDictionaryReaderQuotas);summary;df-generated |
 | System.Runtime.Serialization;CollectionDataContractAttribute;get_IsItemNameSetExplicitly;();summary;df-generated |
 | System.Runtime.Serialization;CollectionDataContractAttribute;get_IsKeyNameSetExplicitly;();summary;df-generated |
@@ -43010,10 +45892,6 @@ neutral
 | System.Runtime.Serialization;DataContractSerializer;DataContractSerializer;(System.Type,System.Xml.XmlDictionaryString,System.Xml.XmlDictionaryString);summary;df-generated |
 | System.Runtime.Serialization;DataContractSerializer;IsStartObject;(System.Xml.XmlDictionaryReader);summary;df-generated |
 | System.Runtime.Serialization;DataContractSerializer;IsStartObject;(System.Xml.XmlReader);summary;df-generated |
-| System.Runtime.Serialization;DataContractSerializer;ReadObject;(System.Xml.XmlDictionaryReader,System.Boolean);summary;df-generated |
-| System.Runtime.Serialization;DataContractSerializer;ReadObject;(System.Xml.XmlDictionaryReader,System.Boolean,System.Runtime.Serialization.DataContractResolver);summary;df-generated |
-| System.Runtime.Serialization;DataContractSerializer;ReadObject;(System.Xml.XmlReader);summary;df-generated |
-| System.Runtime.Serialization;DataContractSerializer;ReadObject;(System.Xml.XmlReader,System.Boolean);summary;df-generated |
 | System.Runtime.Serialization;DataContractSerializer;WriteEndObject;(System.Xml.XmlDictionaryWriter);summary;df-generated |
 | System.Runtime.Serialization;DataContractSerializer;WriteEndObject;(System.Xml.XmlWriter);summary;df-generated |
 | System.Runtime.Serialization;DataContractSerializer;WriteObject;(System.Xml.XmlDictionaryWriter,System.Object,System.Runtime.Serialization.DataContractResolver);summary;df-generated |
@@ -43102,6 +45980,8 @@ neutral
 | System.Runtime.Serialization;ISerializationSurrogateProvider;GetDeserializedObject;(System.Object,System.Type);summary;df-generated |
 | System.Runtime.Serialization;ISerializationSurrogateProvider;GetObjectToSerialize;(System.Object,System.Type);summary;df-generated |
 | System.Runtime.Serialization;ISerializationSurrogateProvider;GetSurrogateType;(System.Type);summary;df-generated |
+| System.Runtime.Serialization;ISurrogateSelector;ChainSelector;(System.Runtime.Serialization.ISurrogateSelector);summary;df-generated |
+| System.Runtime.Serialization;ISurrogateSelector;GetNextSelector;();summary;df-generated |
 | System.Runtime.Serialization;InvalidDataContractException;InvalidDataContractException;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);summary;df-generated |
 | System.Runtime.Serialization;InvalidDataContractException;InvalidDataContractException;(System.String);summary;df-generated |
 | System.Runtime.Serialization;InvalidDataContractException;InvalidDataContractException;(System.String,System.Exception);summary;df-generated |
@@ -43157,15 +46037,12 @@ neutral
 | System.Runtime.Serialization;StreamingContext;StreamingContext;(System.Runtime.Serialization.StreamingContextStates);summary;df-generated |
 | System.Runtime.Serialization;StreamingContext;get_State;();summary;df-generated |
 | System.Runtime.Serialization;SurrogateSelector;AddSurrogate;(System.Type,System.Runtime.Serialization.StreamingContext,System.Runtime.Serialization.ISerializationSurrogate);summary;df-generated |
+| System.Runtime.Serialization;SurrogateSelector;ChainSelector;(System.Runtime.Serialization.ISurrogateSelector);summary;df-generated |
+| System.Runtime.Serialization;SurrogateSelector;GetNextSelector;();summary;df-generated |
 | System.Runtime.Serialization;SurrogateSelector;RemoveSurrogate;(System.Type,System.Runtime.Serialization.StreamingContext);summary;df-generated |
 | System.Runtime.Serialization;XPathQueryGenerator;CreateFromDataContractSerializer;(System.Type,System.Reflection.MemberInfo[],System.Xml.XmlNamespaceManager);summary;df-generated |
 | System.Runtime.Serialization;XmlObjectSerializer;IsStartObject;(System.Xml.XmlDictionaryReader);summary;df-generated |
 | System.Runtime.Serialization;XmlObjectSerializer;IsStartObject;(System.Xml.XmlReader);summary;df-generated |
-| System.Runtime.Serialization;XmlObjectSerializer;ReadObject;(System.IO.Stream);summary;df-generated |
-| System.Runtime.Serialization;XmlObjectSerializer;ReadObject;(System.Xml.XmlDictionaryReader);summary;df-generated |
-| System.Runtime.Serialization;XmlObjectSerializer;ReadObject;(System.Xml.XmlDictionaryReader,System.Boolean);summary;df-generated |
-| System.Runtime.Serialization;XmlObjectSerializer;ReadObject;(System.Xml.XmlReader);summary;df-generated |
-| System.Runtime.Serialization;XmlObjectSerializer;ReadObject;(System.Xml.XmlReader,System.Boolean);summary;df-generated |
 | System.Runtime.Serialization;XmlObjectSerializer;WriteEndObject;(System.Xml.XmlDictionaryWriter);summary;df-generated |
 | System.Runtime.Serialization;XmlObjectSerializer;WriteEndObject;(System.Xml.XmlWriter);summary;df-generated |
 | System.Runtime.Serialization;XmlObjectSerializer;WriteObject;(System.IO.Stream,System.Object);summary;df-generated |
@@ -43175,6 +46052,7 @@ neutral
 | System.Runtime.Serialization;XmlObjectSerializer;WriteObjectContent;(System.Xml.XmlWriter,System.Object);summary;df-generated |
 | System.Runtime.Serialization;XmlObjectSerializer;WriteStartObject;(System.Xml.XmlDictionaryWriter,System.Object);summary;df-generated |
 | System.Runtime.Serialization;XmlObjectSerializer;WriteStartObject;(System.Xml.XmlWriter,System.Object);summary;df-generated |
+| System.Runtime.Serialization;XmlSerializableServices;AddDefaultSchema;(System.Xml.Schema.XmlSchemaSet,System.Xml.XmlQualifiedName);summary;df-generated |
 | System.Runtime.Serialization;XmlSerializableServices;ReadNodes;(System.Xml.XmlReader);summary;df-generated |
 | System.Runtime.Serialization;XsdDataContractExporter;CanExport;(System.Collections.Generic.ICollection<System.Reflection.Assembly>);summary;df-generated |
 | System.Runtime.Serialization;XsdDataContractExporter;CanExport;(System.Collections.Generic.ICollection<System.Type>);summary;df-generated |
@@ -43217,6 +46095,7 @@ neutral
 | System.Runtime;AmbiguousImplementationException;AmbiguousImplementationException;(System.String,System.Exception);summary;df-generated |
 | System.Runtime;AssemblyTargetedPatchBandAttribute;AssemblyTargetedPatchBandAttribute;(System.String);summary;df-generated |
 | System.Runtime;AssemblyTargetedPatchBandAttribute;get_TargetedPatchBand;();summary;df-generated |
+| System.Runtime;ControlledExecution;Run;(System.Action,System.Threading.CancellationToken);summary;df-generated |
 | System.Runtime;DependentHandle;DependentHandle;(System.Object,System.Object);summary;df-generated |
 | System.Runtime;DependentHandle;Dispose;();summary;df-generated |
 | System.Runtime;DependentHandle;get_IsAllocated;();summary;df-generated |
@@ -43402,7 +46281,10 @@ neutral
 | System.Security.AccessControl;GenericSecurityDescriptor;get_Revision;();summary;df-generated |
 | System.Security.AccessControl;NativeObjectSecurity;NativeObjectSecurity;(System.Boolean,System.Security.AccessControl.ResourceType);summary;df-generated |
 | System.Security.AccessControl;NativeObjectSecurity;NativeObjectSecurity;(System.Boolean,System.Security.AccessControl.ResourceType,System.Runtime.InteropServices.SafeHandle,System.Security.AccessControl.AccessControlSections);summary;df-generated |
+| System.Security.AccessControl;NativeObjectSecurity;NativeObjectSecurity;(System.Boolean,System.Security.AccessControl.ResourceType,System.Runtime.InteropServices.SafeHandle,System.Security.AccessControl.AccessControlSections,System.Security.AccessControl.NativeObjectSecurity+ExceptionFromErrorCode,System.Object);summary;df-generated |
+| System.Security.AccessControl;NativeObjectSecurity;NativeObjectSecurity;(System.Boolean,System.Security.AccessControl.ResourceType,System.Security.AccessControl.NativeObjectSecurity+ExceptionFromErrorCode,System.Object);summary;df-generated |
 | System.Security.AccessControl;NativeObjectSecurity;NativeObjectSecurity;(System.Boolean,System.Security.AccessControl.ResourceType,System.String,System.Security.AccessControl.AccessControlSections);summary;df-generated |
+| System.Security.AccessControl;NativeObjectSecurity;NativeObjectSecurity;(System.Boolean,System.Security.AccessControl.ResourceType,System.String,System.Security.AccessControl.AccessControlSections,System.Security.AccessControl.NativeObjectSecurity+ExceptionFromErrorCode,System.Object);summary;df-generated |
 | System.Security.AccessControl;NativeObjectSecurity;Persist;(System.Runtime.InteropServices.SafeHandle,System.Security.AccessControl.AccessControlSections);summary;df-generated |
 | System.Security.AccessControl;NativeObjectSecurity;Persist;(System.Runtime.InteropServices.SafeHandle,System.Security.AccessControl.AccessControlSections,System.Object);summary;df-generated |
 | System.Security.AccessControl;NativeObjectSecurity;Persist;(System.String,System.Security.AccessControl.AccessControlSections);summary;df-generated |
@@ -43465,7 +46347,9 @@ neutral
 | System.Security.AccessControl;ObjectSecurity<T>;AuditRuleFactory;(System.Security.Principal.IdentityReference,System.Int32,System.Boolean,System.Security.AccessControl.InheritanceFlags,System.Security.AccessControl.PropagationFlags,System.Security.AccessControl.AuditFlags);summary;df-generated |
 | System.Security.AccessControl;ObjectSecurity<T>;ObjectSecurity;(System.Boolean,System.Security.AccessControl.ResourceType);summary;df-generated |
 | System.Security.AccessControl;ObjectSecurity<T>;ObjectSecurity;(System.Boolean,System.Security.AccessControl.ResourceType,System.Runtime.InteropServices.SafeHandle,System.Security.AccessControl.AccessControlSections);summary;df-generated |
+| System.Security.AccessControl;ObjectSecurity<T>;ObjectSecurity;(System.Boolean,System.Security.AccessControl.ResourceType,System.Runtime.InteropServices.SafeHandle,System.Security.AccessControl.AccessControlSections,System.Security.AccessControl.NativeObjectSecurity+ExceptionFromErrorCode,System.Object);summary;df-generated |
 | System.Security.AccessControl;ObjectSecurity<T>;ObjectSecurity;(System.Boolean,System.Security.AccessControl.ResourceType,System.String,System.Security.AccessControl.AccessControlSections);summary;df-generated |
+| System.Security.AccessControl;ObjectSecurity<T>;ObjectSecurity;(System.Boolean,System.Security.AccessControl.ResourceType,System.String,System.Security.AccessControl.AccessControlSections,System.Security.AccessControl.NativeObjectSecurity+ExceptionFromErrorCode,System.Object);summary;df-generated |
 | System.Security.AccessControl;ObjectSecurity<T>;Persist;(System.Runtime.InteropServices.SafeHandle);summary;df-generated |
 | System.Security.AccessControl;ObjectSecurity<T>;Persist;(System.String);summary;df-generated |
 | System.Security.AccessControl;ObjectSecurity<T>;RemoveAccessRule;(System.Security.AccessControl.AccessRule<T>);summary;df-generated |
@@ -43565,32 +46449,49 @@ neutral
 | System.Security.Claims;Claim;Claim;(System.String,System.String,System.String,System.String);summary;df-generated |
 | System.Security.Claims;Claim;Claim;(System.String,System.String,System.String,System.String,System.String);summary;df-generated |
 | System.Security.Claims;Claim;Claim;(System.String,System.String,System.String,System.String,System.String,System.Security.Claims.ClaimsIdentity);summary;df-generated |
+| System.Security.Claims;Claim;Clone;();summary;df-generated |
+| System.Security.Claims;Claim;Clone;(System.Security.Claims.ClaimsIdentity);summary;df-generated |
 | System.Security.Claims;Claim;WriteTo;(System.IO.BinaryWriter);summary;df-generated |
+| System.Security.Claims;Claim;WriteTo;(System.IO.BinaryWriter,System.Byte[]);summary;df-generated |
 | System.Security.Claims;Claim;get_Properties;();summary;df-generated |
 | System.Security.Claims;ClaimsIdentity;ClaimsIdentity;(System.Collections.Generic.IEnumerable<System.Security.Claims.Claim>);summary;df-generated |
 | System.Security.Claims;ClaimsIdentity;ClaimsIdentity;(System.Collections.Generic.IEnumerable<System.Security.Claims.Claim>,System.String);summary;df-generated |
 | System.Security.Claims;ClaimsIdentity;ClaimsIdentity;(System.Collections.Generic.IEnumerable<System.Security.Claims.Claim>,System.String,System.String,System.String);summary;df-generated |
+| System.Security.Claims;ClaimsIdentity;ClaimsIdentity;(System.IO.BinaryReader);summary;df-generated |
 | System.Security.Claims;ClaimsIdentity;ClaimsIdentity;(System.Runtime.Serialization.SerializationInfo);summary;df-generated |
 | System.Security.Claims;ClaimsIdentity;ClaimsIdentity;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);summary;df-generated |
 | System.Security.Claims;ClaimsIdentity;ClaimsIdentity;(System.Security.Principal.IIdentity);summary;df-generated |
 | System.Security.Claims;ClaimsIdentity;ClaimsIdentity;(System.Security.Principal.IIdentity,System.Collections.Generic.IEnumerable<System.Security.Claims.Claim>);summary;df-generated |
 | System.Security.Claims;ClaimsIdentity;ClaimsIdentity;(System.String);summary;df-generated |
 | System.Security.Claims;ClaimsIdentity;ClaimsIdentity;(System.String,System.String,System.String);summary;df-generated |
+| System.Security.Claims;ClaimsIdentity;Clone;();summary;df-generated |
+| System.Security.Claims;ClaimsIdentity;CreateClaim;(System.IO.BinaryReader);summary;df-generated |
+| System.Security.Claims;ClaimsIdentity;FindAll;(System.Predicate<System.Security.Claims.Claim>);summary;df-generated |
 | System.Security.Claims;ClaimsIdentity;FindAll;(System.String);summary;df-generated |
+| System.Security.Claims;ClaimsIdentity;FindFirst;(System.Predicate<System.Security.Claims.Claim>);summary;df-generated |
 | System.Security.Claims;ClaimsIdentity;GetObjectData;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);summary;df-generated |
 | System.Security.Claims;ClaimsIdentity;HasClaim;(System.String,System.String);summary;df-generated |
 | System.Security.Claims;ClaimsIdentity;RemoveClaim;(System.Security.Claims.Claim);summary;df-generated |
 | System.Security.Claims;ClaimsIdentity;TryRemoveClaim;(System.Security.Claims.Claim);summary;df-generated |
 | System.Security.Claims;ClaimsIdentity;WriteTo;(System.IO.BinaryWriter);summary;df-generated |
+| System.Security.Claims;ClaimsIdentity;WriteTo;(System.IO.BinaryWriter,System.Byte[]);summary;df-generated |
+| System.Security.Claims;ClaimsIdentity;get_AuthenticationType;();summary;df-generated |
 | System.Security.Claims;ClaimsIdentity;get_IsAuthenticated;();summary;df-generated |
 | System.Security.Claims;ClaimsPrincipal;ClaimsPrincipal;(System.IO.BinaryReader);summary;df-generated |
 | System.Security.Claims;ClaimsPrincipal;ClaimsPrincipal;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);summary;df-generated |
+| System.Security.Claims;ClaimsPrincipal;Clone;();summary;df-generated |
+| System.Security.Claims;ClaimsPrincipal;CreateClaimsIdentity;(System.IO.BinaryReader);summary;df-generated |
+| System.Security.Claims;ClaimsPrincipal;FindAll;(System.Predicate<System.Security.Claims.Claim>);summary;df-generated |
 | System.Security.Claims;ClaimsPrincipal;FindAll;(System.String);summary;df-generated |
+| System.Security.Claims;ClaimsPrincipal;FindFirst;(System.Predicate<System.Security.Claims.Claim>);summary;df-generated |
 | System.Security.Claims;ClaimsPrincipal;GetObjectData;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);summary;df-generated |
+| System.Security.Claims;ClaimsPrincipal;HasClaim;(System.Predicate<System.Security.Claims.Claim>);summary;df-generated |
 | System.Security.Claims;ClaimsPrincipal;HasClaim;(System.String,System.String);summary;df-generated |
 | System.Security.Claims;ClaimsPrincipal;IsInRole;(System.String);summary;df-generated |
 | System.Security.Claims;ClaimsPrincipal;WriteTo;(System.IO.BinaryWriter);summary;df-generated |
+| System.Security.Claims;ClaimsPrincipal;WriteTo;(System.IO.BinaryWriter,System.Byte[]);summary;df-generated |
 | System.Security.Claims;ClaimsPrincipal;get_Current;();summary;df-generated |
+| System.Security.Claims;ClaimsPrincipal;get_Identity;();summary;df-generated |
 | System.Security.Cryptography.X509Certificates;CertificateRequest;CertificateRequest;(System.Security.Cryptography.X509Certificates.X500DistinguishedName,System.Security.Cryptography.X509Certificates.PublicKey,System.Security.Cryptography.HashAlgorithmName);summary;df-generated |
 | System.Security.Cryptography.X509Certificates;CertificateRequest;Create;(System.Security.Cryptography.X509Certificates.X500DistinguishedName,System.Security.Cryptography.X509Certificates.X509SignatureGenerator,System.DateTimeOffset,System.DateTimeOffset,System.Byte[]);summary;df-generated |
 | System.Security.Cryptography.X509Certificates;CertificateRequest;Create;(System.Security.Cryptography.X509Certificates.X500DistinguishedName,System.Security.Cryptography.X509Certificates.X509SignatureGenerator,System.DateTimeOffset,System.DateTimeOffset,System.ReadOnlySpan<System.Byte>);summary;df-generated |
@@ -43601,6 +46502,10 @@ neutral
 | System.Security.Cryptography.X509Certificates;CertificateRequest;CreateSigningRequest;(System.Security.Cryptography.X509Certificates.X509SignatureGenerator);summary;df-generated |
 | System.Security.Cryptography.X509Certificates;CertificateRequest;CreateSigningRequestPem;();summary;df-generated |
 | System.Security.Cryptography.X509Certificates;CertificateRequest;CreateSigningRequestPem;(System.Security.Cryptography.X509Certificates.X509SignatureGenerator);summary;df-generated |
+| System.Security.Cryptography.X509Certificates;CertificateRequest;LoadSigningRequest;(System.Byte[],System.Security.Cryptography.HashAlgorithmName,System.Security.Cryptography.X509Certificates.CertificateRequestLoadOptions,System.Security.Cryptography.RSASignaturePadding);summary;df-generated |
+| System.Security.Cryptography.X509Certificates;CertificateRequest;LoadSigningRequest;(System.ReadOnlySpan<System.Byte>,System.Security.Cryptography.HashAlgorithmName,System.Int32,System.Security.Cryptography.X509Certificates.CertificateRequestLoadOptions,System.Security.Cryptography.RSASignaturePadding);summary;df-generated |
+| System.Security.Cryptography.X509Certificates;CertificateRequest;LoadSigningRequestPem;(System.ReadOnlySpan<System.Char>,System.Security.Cryptography.HashAlgorithmName,System.Security.Cryptography.X509Certificates.CertificateRequestLoadOptions,System.Security.Cryptography.RSASignaturePadding);summary;df-generated |
+| System.Security.Cryptography.X509Certificates;CertificateRequest;LoadSigningRequestPem;(System.String,System.Security.Cryptography.HashAlgorithmName,System.Security.Cryptography.X509Certificates.CertificateRequestLoadOptions,System.Security.Cryptography.RSASignaturePadding);summary;df-generated |
 | System.Security.Cryptography.X509Certificates;CertificateRequest;get_CertificateExtensions;();summary;df-generated |
 | System.Security.Cryptography.X509Certificates;CertificateRequest;get_HashAlgorithm;();summary;df-generated |
 | System.Security.Cryptography.X509Certificates;CertificateRequest;get_OtherRequestAttributes;();summary;df-generated |
@@ -43729,6 +46634,7 @@ neutral
 | System.Security.Cryptography.X509Certificates;X509Certificate2;get_IssuerName;();summary;df-generated |
 | System.Security.Cryptography.X509Certificates;X509Certificate2;get_NotAfter;();summary;df-generated |
 | System.Security.Cryptography.X509Certificates;X509Certificate2;get_NotBefore;();summary;df-generated |
+| System.Security.Cryptography.X509Certificates;X509Certificate2;get_RawData;();summary;df-generated |
 | System.Security.Cryptography.X509Certificates;X509Certificate2;get_RawDataMemory;();summary;df-generated |
 | System.Security.Cryptography.X509Certificates;X509Certificate2;get_SerialNumber;();summary;df-generated |
 | System.Security.Cryptography.X509Certificates;X509Certificate2;get_SignatureAlgorithm;();summary;df-generated |
@@ -43750,11 +46656,14 @@ neutral
 | System.Security.Cryptography.X509Certificates;X509Certificate2Collection;Import;(System.String,System.String,System.Security.Cryptography.X509Certificates.X509KeyStorageFlags);summary;df-generated |
 | System.Security.Cryptography.X509Certificates;X509Certificate2Collection;ImportFromPem;(System.ReadOnlySpan<System.Char>);summary;df-generated |
 | System.Security.Cryptography.X509Certificates;X509Certificate2Collection;ImportFromPemFile;(System.String);summary;df-generated |
+| System.Security.Cryptography.X509Certificates;X509Certificate2Collection;Remove;(System.Security.Cryptography.X509Certificates.X509Certificate2);summary;df-generated |
 | System.Security.Cryptography.X509Certificates;X509Certificate2Collection;TryExportCertificatePems;(System.Span<System.Char>,System.Int32);summary;df-generated |
 | System.Security.Cryptography.X509Certificates;X509Certificate2Collection;TryExportPkcs7Pem;(System.Span<System.Char>,System.Int32);summary;df-generated |
+| System.Security.Cryptography.X509Certificates;X509Certificate2Collection;X509Certificate2Collection;(System.Security.Cryptography.X509Certificates.X509Certificate2);summary;df-generated |
 | System.Security.Cryptography.X509Certificates;X509Certificate2Enumerator;Dispose;();summary;df-generated |
 | System.Security.Cryptography.X509Certificates;X509Certificate2Enumerator;MoveNext;();summary;df-generated |
 | System.Security.Cryptography.X509Certificates;X509Certificate2Enumerator;Reset;();summary;df-generated |
+| System.Security.Cryptography.X509Certificates;X509Certificate2Enumerator;get_Current;();summary;df-generated |
 | System.Security.Cryptography.X509Certificates;X509Certificate2UI;DisplayCertificate;(System.Security.Cryptography.X509Certificates.X509Certificate2);summary;df-generated |
 | System.Security.Cryptography.X509Certificates;X509Certificate2UI;DisplayCertificate;(System.Security.Cryptography.X509Certificates.X509Certificate2,System.IntPtr);summary;df-generated |
 | System.Security.Cryptography.X509Certificates;X509Certificate2UI;SelectFromCollection;(System.Security.Cryptography.X509Certificates.X509Certificate2Collection,System.String,System.String,System.Security.Cryptography.X509Certificates.X509SelectionFlag);summary;df-generated |
@@ -43811,16 +46720,20 @@ neutral
 | System.Security.Cryptography.X509Certificates;X509Certificate;get_Subject;();summary;df-generated |
 | System.Security.Cryptography.X509Certificates;X509CertificateCollection+X509CertificateEnumerator;MoveNext;();summary;df-generated |
 | System.Security.Cryptography.X509Certificates;X509CertificateCollection+X509CertificateEnumerator;Reset;();summary;df-generated |
+| System.Security.Cryptography.X509Certificates;X509CertificateCollection+X509CertificateEnumerator;X509CertificateEnumerator;(System.Security.Cryptography.X509Certificates.X509CertificateCollection);summary;df-generated |
 | System.Security.Cryptography.X509Certificates;X509CertificateCollection;Contains;(System.Security.Cryptography.X509Certificates.X509Certificate);summary;df-generated |
 | System.Security.Cryptography.X509Certificates;X509CertificateCollection;GetHashCode;();summary;df-generated |
 | System.Security.Cryptography.X509Certificates;X509CertificateCollection;IndexOf;(System.Security.Cryptography.X509Certificates.X509Certificate);summary;df-generated |
 | System.Security.Cryptography.X509Certificates;X509CertificateCollection;OnValidate;(System.Object);summary;df-generated |
+| System.Security.Cryptography.X509Certificates;X509CertificateCollection;Remove;(System.Security.Cryptography.X509Certificates.X509Certificate);summary;df-generated |
+| System.Security.Cryptography.X509Certificates;X509Chain;Build;(System.Security.Cryptography.X509Certificates.X509Certificate2);summary;df-generated |
 | System.Security.Cryptography.X509Certificates;X509Chain;Create;();summary;df-generated |
 | System.Security.Cryptography.X509Certificates;X509Chain;Dispose;();summary;df-generated |
 | System.Security.Cryptography.X509Certificates;X509Chain;Dispose;(System.Boolean);summary;df-generated |
 | System.Security.Cryptography.X509Certificates;X509Chain;Reset;();summary;df-generated |
 | System.Security.Cryptography.X509Certificates;X509Chain;X509Chain;(System.Boolean);summary;df-generated |
 | System.Security.Cryptography.X509Certificates;X509Chain;X509Chain;(System.IntPtr);summary;df-generated |
+| System.Security.Cryptography.X509Certificates;X509Chain;get_ChainContext;();summary;df-generated |
 | System.Security.Cryptography.X509Certificates;X509Chain;get_ChainElements;();summary;df-generated |
 | System.Security.Cryptography.X509Certificates;X509Chain;get_ChainStatus;();summary;df-generated |
 | System.Security.Cryptography.X509Certificates;X509ChainElementCollection;get_Count;();summary;df-generated |
@@ -43828,6 +46741,7 @@ neutral
 | System.Security.Cryptography.X509Certificates;X509ChainElementEnumerator;Dispose;();summary;df-generated |
 | System.Security.Cryptography.X509Certificates;X509ChainElementEnumerator;MoveNext;();summary;df-generated |
 | System.Security.Cryptography.X509Certificates;X509ChainElementEnumerator;Reset;();summary;df-generated |
+| System.Security.Cryptography.X509Certificates;X509ChainElementEnumerator;get_Current;();summary;df-generated |
 | System.Security.Cryptography.X509Certificates;X509ChainPolicy;Reset;();summary;df-generated |
 | System.Security.Cryptography.X509Certificates;X509ChainPolicy;get_ApplicationPolicy;();summary;df-generated |
 | System.Security.Cryptography.X509Certificates;X509ChainPolicy;get_CertificatePolicy;();summary;df-generated |
@@ -43845,6 +46759,7 @@ neutral
 | System.Security.Cryptography.X509Certificates;X509ExtensionEnumerator;Dispose;();summary;df-generated |
 | System.Security.Cryptography.X509Certificates;X509ExtensionEnumerator;MoveNext;();summary;df-generated |
 | System.Security.Cryptography.X509Certificates;X509ExtensionEnumerator;Reset;();summary;df-generated |
+| System.Security.Cryptography.X509Certificates;X509ExtensionEnumerator;get_Current;();summary;df-generated |
 | System.Security.Cryptography.X509Certificates;X509KeyUsageExtension;X509KeyUsageExtension;(System.Security.Cryptography.AsnEncodedData,System.Boolean);summary;df-generated |
 | System.Security.Cryptography.X509Certificates;X509KeyUsageExtension;X509KeyUsageExtension;(System.Security.Cryptography.X509Certificates.X509KeyUsageFlags,System.Boolean);summary;df-generated |
 | System.Security.Cryptography.X509Certificates;X509KeyUsageExtension;get_KeyUsages;();summary;df-generated |
@@ -43880,8 +46795,10 @@ neutral
 | System.Security.Cryptography.X509Certificates;X509SubjectKeyIdentifierExtension;X509SubjectKeyIdentifierExtension;(System.Security.Cryptography.X509Certificates.PublicKey,System.Boolean);summary;df-generated |
 | System.Security.Cryptography.X509Certificates;X509SubjectKeyIdentifierExtension;X509SubjectKeyIdentifierExtension;(System.Security.Cryptography.X509Certificates.PublicKey,System.Security.Cryptography.X509Certificates.X509SubjectKeyIdentifierHashAlgorithm,System.Boolean);summary;df-generated |
 | System.Security.Cryptography.X509Certificates;X509SubjectKeyIdentifierExtension;X509SubjectKeyIdentifierExtension;(System.String,System.Boolean);summary;df-generated |
+| System.Security.Cryptography.X509Certificates;X509SubjectKeyIdentifierExtension;get_SubjectKeyIdentifierBytes;();summary;df-generated |
 | System.Security.Cryptography.Xml;CipherReference;CipherReference;(System.String);summary;df-generated |
 | System.Security.Cryptography.Xml;CipherReference;CipherReference;(System.String,System.Security.Cryptography.Xml.TransformChain);summary;df-generated |
+| System.Security.Cryptography.Xml;DSAKeyValue;GetXml;();summary;df-generated |
 | System.Security.Cryptography.Xml;DataReference;DataReference;(System.String);summary;df-generated |
 | System.Security.Cryptography.Xml;DataReference;DataReference;(System.String,System.Security.Cryptography.Xml.TransformChain);summary;df-generated |
 | System.Security.Cryptography.Xml;EncryptedKey;get_ReferenceList;();summary;df-generated |
@@ -43911,6 +46828,7 @@ neutral
 | System.Security.Cryptography.Xml;EncryptionPropertyCollection;Contains;(System.Security.Cryptography.Xml.EncryptionProperty);summary;df-generated |
 | System.Security.Cryptography.Xml;EncryptionPropertyCollection;IndexOf;(System.Object);summary;df-generated |
 | System.Security.Cryptography.Xml;EncryptionPropertyCollection;IndexOf;(System.Security.Cryptography.Xml.EncryptionProperty);summary;df-generated |
+| System.Security.Cryptography.Xml;EncryptionPropertyCollection;Remove;(System.Object);summary;df-generated |
 | System.Security.Cryptography.Xml;EncryptionPropertyCollection;Remove;(System.Security.Cryptography.Xml.EncryptionProperty);summary;df-generated |
 | System.Security.Cryptography.Xml;EncryptionPropertyCollection;RemoveAt;(System.Int32);summary;df-generated |
 | System.Security.Cryptography.Xml;EncryptionPropertyCollection;get_Count;();summary;df-generated |
@@ -43919,17 +46837,26 @@ neutral
 | System.Security.Cryptography.Xml;EncryptionPropertyCollection;get_IsSynchronized;();summary;df-generated |
 | System.Security.Cryptography.Xml;IRelDecryptor;Decrypt;(System.Security.Cryptography.Xml.EncryptionMethod,System.Security.Cryptography.Xml.KeyInfo,System.IO.Stream);summary;df-generated |
 | System.Security.Cryptography.Xml;KeyInfo;GetXml;();summary;df-generated |
+| System.Security.Cryptography.Xml;KeyInfo;LoadXml;(System.Xml.XmlElement);summary;df-generated |
 | System.Security.Cryptography.Xml;KeyInfo;get_Count;();summary;df-generated |
+| System.Security.Cryptography.Xml;KeyInfoClause;GetXml;();summary;df-generated |
+| System.Security.Cryptography.Xml;KeyInfoEncryptedKey;GetXml;();summary;df-generated |
+| System.Security.Cryptography.Xml;KeyInfoName;GetXml;();summary;df-generated |
+| System.Security.Cryptography.Xml;KeyInfoNode;GetXml;();summary;df-generated |
+| System.Security.Cryptography.Xml;KeyInfoRetrievalMethod;GetXml;();summary;df-generated |
 | System.Security.Cryptography.Xml;KeyInfoX509Data;AddCertificate;(System.Security.Cryptography.X509Certificates.X509Certificate);summary;df-generated |
 | System.Security.Cryptography.Xml;KeyInfoX509Data;AddIssuerSerial;(System.String,System.String);summary;df-generated |
 | System.Security.Cryptography.Xml;KeyInfoX509Data;AddSubjectKeyId;(System.String);summary;df-generated |
+| System.Security.Cryptography.Xml;KeyInfoX509Data;GetXml;();summary;df-generated |
 | System.Security.Cryptography.Xml;KeyInfoX509Data;KeyInfoX509Data;(System.Byte[]);summary;df-generated |
 | System.Security.Cryptography.Xml;KeyInfoX509Data;KeyInfoX509Data;(System.Security.Cryptography.X509Certificates.X509Certificate);summary;df-generated |
 | System.Security.Cryptography.Xml;KeyInfoX509Data;KeyInfoX509Data;(System.Security.Cryptography.X509Certificates.X509Certificate,System.Security.Cryptography.X509Certificates.X509IncludeOption);summary;df-generated |
 | System.Security.Cryptography.Xml;KeyReference;KeyReference;(System.String);summary;df-generated |
 | System.Security.Cryptography.Xml;KeyReference;KeyReference;(System.String,System.Security.Cryptography.Xml.TransformChain);summary;df-generated |
+| System.Security.Cryptography.Xml;RSAKeyValue;GetXml;();summary;df-generated |
 | System.Security.Cryptography.Xml;ReferenceList;Contains;(System.Object);summary;df-generated |
 | System.Security.Cryptography.Xml;ReferenceList;IndexOf;(System.Object);summary;df-generated |
+| System.Security.Cryptography.Xml;ReferenceList;Remove;(System.Object);summary;df-generated |
 | System.Security.Cryptography.Xml;ReferenceList;RemoveAt;(System.Int32);summary;df-generated |
 | System.Security.Cryptography.Xml;ReferenceList;get_Count;();summary;df-generated |
 | System.Security.Cryptography.Xml;ReferenceList;get_IsFixedSize;();summary;df-generated |
@@ -43946,16 +46873,30 @@ neutral
 | System.Security.Cryptography.Xml;SignedXml;CheckSignature;(System.Security.Cryptography.AsymmetricAlgorithm);summary;df-generated |
 | System.Security.Cryptography.Xml;SignedXml;CheckSignature;(System.Security.Cryptography.X509Certificates.X509Certificate2,System.Boolean);summary;df-generated |
 | System.Security.Cryptography.Xml;SignedXml;ComputeSignature;();summary;df-generated |
+| System.Security.Cryptography.Xml;SignedXml;GetXml;();summary;df-generated |
 | System.Security.Cryptography.Xml;SignedXml;get_SignatureLength;();summary;df-generated |
 | System.Security.Cryptography.Xml;SignedXml;get_SignatureMethod;();summary;df-generated |
+| System.Security.Cryptography.Xml;Transform;GetDigestedOutput;(System.Security.Cryptography.HashAlgorithm);summary;df-generated |
+| System.Security.Cryptography.Xml;Transform;GetInnerXml;();summary;df-generated |
+| System.Security.Cryptography.Xml;Transform;GetXml;();summary;df-generated |
 | System.Security.Cryptography.Xml;TransformChain;get_Count;();summary;df-generated |
+| System.Security.Cryptography.Xml;XmlDecryptionTransform;GetInnerXml;();summary;df-generated |
 | System.Security.Cryptography.Xml;XmlDecryptionTransform;IsTargetElement;(System.Xml.XmlElement,System.String);summary;df-generated |
+| System.Security.Cryptography.Xml;XmlDsigBase64Transform;GetInnerXml;();summary;df-generated |
+| System.Security.Cryptography.Xml;XmlDsigC14NTransform;GetDigestedOutput;(System.Security.Cryptography.HashAlgorithm);summary;df-generated |
+| System.Security.Cryptography.Xml;XmlDsigC14NTransform;GetInnerXml;();summary;df-generated |
 | System.Security.Cryptography.Xml;XmlDsigC14NTransform;XmlDsigC14NTransform;(System.Boolean);summary;df-generated |
+| System.Security.Cryptography.Xml;XmlDsigEnvelopedSignatureTransform;GetInnerXml;();summary;df-generated |
 | System.Security.Cryptography.Xml;XmlDsigEnvelopedSignatureTransform;XmlDsigEnvelopedSignatureTransform;(System.Boolean);summary;df-generated |
+| System.Security.Cryptography.Xml;XmlDsigExcC14NTransform;GetDigestedOutput;(System.Security.Cryptography.HashAlgorithm);summary;df-generated |
+| System.Security.Cryptography.Xml;XmlDsigExcC14NTransform;GetInnerXml;();summary;df-generated |
 | System.Security.Cryptography.Xml;XmlDsigExcC14NTransform;XmlDsigExcC14NTransform;(System.Boolean);summary;df-generated |
 | System.Security.Cryptography.Xml;XmlDsigExcC14NTransform;XmlDsigExcC14NTransform;(System.String);summary;df-generated |
 | System.Security.Cryptography.Xml;XmlDsigExcC14NWithCommentsTransform;XmlDsigExcC14NWithCommentsTransform;(System.String);summary;df-generated |
+| System.Security.Cryptography.Xml;XmlDsigXPathTransform;GetInnerXml;();summary;df-generated |
+| System.Security.Cryptography.Xml;XmlDsigXsltTransform;GetInnerXml;();summary;df-generated |
 | System.Security.Cryptography.Xml;XmlDsigXsltTransform;XmlDsigXsltTransform;(System.Boolean);summary;df-generated |
+| System.Security.Cryptography.Xml;XmlLicenseTransform;GetInnerXml;();summary;df-generated |
 | System.Security.Cryptography;Aes;Create;();summary;df-generated |
 | System.Security.Cryptography;Aes;Create;(System.String);summary;df-generated |
 | System.Security.Cryptography;AesCcm;AesCcm;(System.Byte[]);summary;df-generated |
@@ -45116,6 +48057,7 @@ neutral
 | System.Security.Cryptography;SP800108HmacCounterKdf;DeriveKey;(System.ReadOnlySpan<System.Char>,System.ReadOnlySpan<System.Char>,System.Span<System.Byte>);summary;df-generated |
 | System.Security.Cryptography;SP800108HmacCounterKdf;DeriveKey;(System.String,System.String,System.Int32);summary;df-generated |
 | System.Security.Cryptography;SP800108HmacCounterKdf;Dispose;();summary;df-generated |
+| System.Security.Cryptography;SafeEvpPKeyHandle;DuplicateHandle;();summary;df-generated |
 | System.Security.Cryptography;SafeEvpPKeyHandle;OpenPrivateKeyFromEngine;(System.String,System.String);summary;df-generated |
 | System.Security.Cryptography;SafeEvpPKeyHandle;OpenPublicKeyFromEngine;(System.String,System.String);summary;df-generated |
 | System.Security.Cryptography;SafeEvpPKeyHandle;ReleaseHandle;();summary;df-generated |
@@ -45743,10 +48685,15 @@ neutral
 | System.Security.Policy;ZoneMembershipCondition;ToXml;();summary;df-generated |
 | System.Security.Policy;ZoneMembershipCondition;ToXml;(System.Security.Policy.PolicyLevel);summary;df-generated |
 | System.Security.Policy;ZoneMembershipCondition;ZoneMembershipCondition;(System.Security.SecurityZone);summary;df-generated |
+| System.Security.Principal;GenericIdentity;Clone;();summary;df-generated |
+| System.Security.Principal;GenericIdentity;get_AuthenticationType;();summary;df-generated |
 | System.Security.Principal;GenericIdentity;get_IsAuthenticated;();summary;df-generated |
 | System.Security.Principal;GenericPrincipal;IsInRole;(System.String);summary;df-generated |
+| System.Security.Principal;GenericPrincipal;get_Identity;();summary;df-generated |
+| System.Security.Principal;IIdentity;get_AuthenticationType;();summary;df-generated |
 | System.Security.Principal;IIdentity;get_IsAuthenticated;();summary;df-generated |
 | System.Security.Principal;IPrincipal;IsInRole;(System.String);summary;df-generated |
+| System.Security.Principal;IPrincipal;get_Identity;();summary;df-generated |
 | System.Security.Principal;IdentityNotMappedException;IdentityNotMappedException;(System.String);summary;df-generated |
 | System.Security.Principal;IdentityNotMappedException;IdentityNotMappedException;(System.String,System.Exception);summary;df-generated |
 | System.Security.Principal;IdentityNotMappedException;get_UnmappedIdentities;();summary;df-generated |
@@ -45797,6 +48744,7 @@ neutral
 | System.Security.Principal;SecurityIdentifier;get_Value;();summary;df-generated |
 | System.Security.Principal;SecurityIdentifier;op_Equality;(System.Security.Principal.SecurityIdentifier,System.Security.Principal.SecurityIdentifier);summary;df-generated |
 | System.Security.Principal;SecurityIdentifier;op_Inequality;(System.Security.Principal.SecurityIdentifier,System.Security.Principal.SecurityIdentifier);summary;df-generated |
+| System.Security.Principal;WindowsIdentity;Clone;();summary;df-generated |
 | System.Security.Principal;WindowsIdentity;Dispose;();summary;df-generated |
 | System.Security.Principal;WindowsIdentity;Dispose;(System.Boolean);summary;df-generated |
 | System.Security.Principal;WindowsIdentity;GetAnonymous;();summary;df-generated |
@@ -45804,6 +48752,10 @@ neutral
 | System.Security.Principal;WindowsIdentity;GetCurrent;(System.Boolean);summary;df-generated |
 | System.Security.Principal;WindowsIdentity;GetCurrent;(System.Security.Principal.TokenAccessLevels);summary;df-generated |
 | System.Security.Principal;WindowsIdentity;OnDeserialization;(System.Object);summary;df-generated |
+| System.Security.Principal;WindowsIdentity;RunImpersonated;(Microsoft.Win32.SafeHandles.SafeAccessTokenHandle,System.Action);summary;df-generated |
+| System.Security.Principal;WindowsIdentity;RunImpersonated<T>;(Microsoft.Win32.SafeHandles.SafeAccessTokenHandle,System.Func<T>);summary;df-generated |
+| System.Security.Principal;WindowsIdentity;RunImpersonatedAsync;(Microsoft.Win32.SafeHandles.SafeAccessTokenHandle,System.Func<System.Threading.Tasks.Task>);summary;df-generated |
+| System.Security.Principal;WindowsIdentity;RunImpersonatedAsync<T>;(Microsoft.Win32.SafeHandles.SafeAccessTokenHandle,System.Func<System.Threading.Tasks.Task<T>>);summary;df-generated |
 | System.Security.Principal;WindowsIdentity;WindowsIdentity;(System.IntPtr);summary;df-generated |
 | System.Security.Principal;WindowsIdentity;WindowsIdentity;(System.IntPtr,System.String);summary;df-generated |
 | System.Security.Principal;WindowsIdentity;WindowsIdentity;(System.IntPtr,System.String,System.Security.Principal.WindowsAccountType);summary;df-generated |
@@ -45812,6 +48764,7 @@ neutral
 | System.Security.Principal;WindowsIdentity;WindowsIdentity;(System.Security.Principal.WindowsIdentity);summary;df-generated |
 | System.Security.Principal;WindowsIdentity;WindowsIdentity;(System.String);summary;df-generated |
 | System.Security.Principal;WindowsIdentity;get_AccessToken;();summary;df-generated |
+| System.Security.Principal;WindowsIdentity;get_AuthenticationType;();summary;df-generated |
 | System.Security.Principal;WindowsIdentity;get_DeviceClaims;();summary;df-generated |
 | System.Security.Principal;WindowsIdentity;get_Groups;();summary;df-generated |
 | System.Security.Principal;WindowsIdentity;get_ImpersonationLevel;();summary;df-generated |
@@ -45829,6 +48782,7 @@ neutral
 | System.Security.Principal;WindowsPrincipal;IsInRole;(System.String);summary;df-generated |
 | System.Security.Principal;WindowsPrincipal;WindowsPrincipal;(System.Security.Principal.WindowsIdentity);summary;df-generated |
 | System.Security.Principal;WindowsPrincipal;get_DeviceClaims;();summary;df-generated |
+| System.Security.Principal;WindowsPrincipal;get_Identity;();summary;df-generated |
 | System.Security.Principal;WindowsPrincipal;get_UserClaims;();summary;df-generated |
 | System.Security;CodeAccessPermission;Assert;();summary;df-generated |
 | System.Security;CodeAccessPermission;Demand;();summary;df-generated |
@@ -45935,6 +48889,7 @@ neutral
 | System.Security;SecurityContext;IsFlowSuppressed;();summary;df-generated |
 | System.Security;SecurityContext;IsWindowsIdentityFlowSuppressed;();summary;df-generated |
 | System.Security;SecurityContext;RestoreFlow;();summary;df-generated |
+| System.Security;SecurityContext;Run;(System.Security.SecurityContext,System.Threading.ContextCallback,System.Object);summary;df-generated |
 | System.Security;SecurityContext;SuppressFlow;();summary;df-generated |
 | System.Security;SecurityContext;SuppressFlowWindowsIdentity;();summary;df-generated |
 | System.Security;SecurityCriticalAttribute;SecurityCriticalAttribute;(System.Security.SecurityCriticalScope);summary;df-generated |
@@ -46049,6 +49004,7 @@ neutral
 | System.Text.Json.Nodes;JsonObject;JsonObject;(System.Nullable<System.Text.Json.Nodes.JsonNodeOptions>);summary;df-generated |
 | System.Text.Json.Nodes;JsonObject;Remove;(System.Collections.Generic.KeyValuePair<System.String,System.Text.Json.Nodes.JsonNode>);summary;df-generated |
 | System.Text.Json.Nodes;JsonObject;Remove;(System.String);summary;df-generated |
+| System.Text.Json.Nodes;JsonObject;TryGetValue;(System.String,System.Text.Json.Nodes.JsonNode);summary;df-generated |
 | System.Text.Json.Nodes;JsonObject;WriteTo;(System.Text.Json.Utf8JsonWriter,System.Text.Json.JsonSerializerOptions);summary;df-generated |
 | System.Text.Json.Nodes;JsonObject;get_Count;();summary;df-generated |
 | System.Text.Json.Nodes;JsonObject;get_IsReadOnly;();summary;df-generated |
@@ -46094,6 +49050,10 @@ neutral
 | System.Text.Json.Serialization.Metadata;JsonDerivedType;JsonDerivedType;(System.Type,System.String);summary;df-generated |
 | System.Text.Json.Serialization.Metadata;JsonDerivedType;get_DerivedType;();summary;df-generated |
 | System.Text.Json.Serialization.Metadata;JsonDerivedType;get_TypeDiscriminator;();summary;df-generated |
+| System.Text.Json.Serialization.Metadata;JsonMetadataServices;CreateImmutableDictionaryInfo<TCollection,TKey,TValue>;(System.Text.Json.JsonSerializerOptions,System.Text.Json.Serialization.Metadata.JsonCollectionInfoValues<TCollection>,System.Func<System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<TKey,TValue>>,TCollection>);summary;df-generated |
+| System.Text.Json.Serialization.Metadata;JsonMetadataServices;CreateImmutableEnumerableInfo<TCollection,TElement>;(System.Text.Json.JsonSerializerOptions,System.Text.Json.Serialization.Metadata.JsonCollectionInfoValues<TCollection>,System.Func<System.Collections.Generic.IEnumerable<TElement>,TCollection>);summary;df-generated |
+| System.Text.Json.Serialization.Metadata;JsonMetadataServices;CreateQueueInfo<TCollection>;(System.Text.Json.JsonSerializerOptions,System.Text.Json.Serialization.Metadata.JsonCollectionInfoValues<TCollection>,System.Action<TCollection,System.Object>);summary;df-generated |
+| System.Text.Json.Serialization.Metadata;JsonMetadataServices;CreateStackInfo<TCollection>;(System.Text.Json.JsonSerializerOptions,System.Text.Json.Serialization.Metadata.JsonCollectionInfoValues<TCollection>,System.Action<TCollection,System.Object>);summary;df-generated |
 | System.Text.Json.Serialization.Metadata;JsonMetadataServices;GetEnumConverter<T>;(System.Text.Json.JsonSerializerOptions);summary;df-generated |
 | System.Text.Json.Serialization.Metadata;JsonMetadataServices;GetNullableConverter<T>;(System.Text.Json.JsonSerializerOptions);summary;df-generated |
 | System.Text.Json.Serialization.Metadata;JsonMetadataServices;GetUnsupportedTypeConverter<T>;();summary;df-generated |
@@ -46136,6 +49096,7 @@ neutral
 | System.Text.Json.Serialization.Metadata;JsonPropertyInfo;get_PropertyType;();summary;df-generated |
 | System.Text.Json.Serialization.Metadata;JsonTypeInfo;MakeReadOnly;();summary;df-generated |
 | System.Text.Json.Serialization.Metadata;JsonTypeInfo;get_Converter;();summary;df-generated |
+| System.Text.Json.Serialization.Metadata;JsonTypeInfoResolver;WithAddedModifier;(System.Text.Json.Serialization.Metadata.IJsonTypeInfoResolver,System.Action<System.Text.Json.Serialization.Metadata.JsonTypeInfo>);summary;df-generated |
 | System.Text.Json.Serialization;IJsonOnDeserialized;OnDeserialized;();summary;df-generated |
 | System.Text.Json.Serialization;IJsonOnDeserializing;OnDeserializing;();summary;df-generated |
 | System.Text.Json.Serialization;IJsonOnSerialized;OnSerialized;();summary;df-generated |
@@ -46181,6 +49142,7 @@ neutral
 | System.Text.Json.Serialization;ReferenceResolver;GetReference;(System.Object,System.Boolean);summary;df-generated |
 | System.Text.Json.Serialization;ReferenceResolver;ResolveReference;(System.String);summary;df-generated |
 | System.Text.Json;JsonDocument;Dispose;();summary;df-generated |
+| System.Text.Json;JsonDocument;Parse;(System.IO.Stream,System.Text.Json.JsonDocumentOptions);summary;df-generated |
 | System.Text.Json;JsonDocument;Parse;(System.ReadOnlyMemory<System.Char>,System.Text.Json.JsonDocumentOptions);summary;df-generated |
 | System.Text.Json;JsonDocument;Parse;(System.String,System.Text.Json.JsonDocumentOptions);summary;df-generated |
 | System.Text.Json;JsonDocument;ParseAsync;(System.IO.Stream,System.Text.Json.JsonDocumentOptions,System.Threading.CancellationToken);summary;df-generated |
@@ -46188,6 +49150,7 @@ neutral
 | System.Text.Json;JsonElement+ArrayEnumerator;Dispose;();summary;df-generated |
 | System.Text.Json;JsonElement+ArrayEnumerator;MoveNext;();summary;df-generated |
 | System.Text.Json;JsonElement+ArrayEnumerator;Reset;();summary;df-generated |
+| System.Text.Json;JsonElement+ArrayEnumerator;get_Current;();summary;df-generated |
 | System.Text.Json;JsonElement+ObjectEnumerator;Dispose;();summary;df-generated |
 | System.Text.Json;JsonElement+ObjectEnumerator;MoveNext;();summary;df-generated |
 | System.Text.Json;JsonElement+ObjectEnumerator;Reset;();summary;df-generated |
@@ -46237,6 +49200,8 @@ neutral
 | System.Text.Json;JsonEncodedText;Equals;(System.Object);summary;df-generated |
 | System.Text.Json;JsonEncodedText;Equals;(System.Text.Json.JsonEncodedText);summary;df-generated |
 | System.Text.Json;JsonEncodedText;GetHashCode;();summary;df-generated |
+| System.Text.Json;JsonEncodedText;get_EncodedUtf8Bytes;();summary;df-generated |
+| System.Text.Json;JsonException;JsonException;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);summary;df-generated |
 | System.Text.Json;JsonNamingPolicy;get_CamelCase;();summary;df-generated |
 | System.Text.Json;JsonNamingPolicy;get_KebabCaseLower;();summary;df-generated |
 | System.Text.Json;JsonNamingPolicy;get_KebabCaseUpper;();summary;df-generated |
@@ -46290,46 +49255,30 @@ neutral
 | System.Text.Json;JsonSerializer;DeserializeAsync<TValue>;(System.IO.Stream,System.Text.Json.Serialization.Metadata.JsonTypeInfo<TValue>,System.Threading.CancellationToken);summary;df-generated |
 | System.Text.Json;JsonSerializer;DeserializeAsyncEnumerable<TValue>;(System.IO.Stream,System.Text.Json.JsonSerializerOptions,System.Threading.CancellationToken);summary;df-generated |
 | System.Text.Json;JsonSerializer;DeserializeAsyncEnumerable<TValue>;(System.IO.Stream,System.Text.Json.Serialization.Metadata.JsonTypeInfo<TValue>,System.Threading.CancellationToken);summary;df-generated |
-| System.Text.Json;JsonSerializer;Serialize;(System.IO.Stream,System.Object,System.Text.Json.Serialization.Metadata.JsonTypeInfo);summary;df-generated |
 | System.Text.Json;JsonSerializer;Serialize;(System.IO.Stream,System.Object,System.Type,System.Text.Json.JsonSerializerOptions);summary;df-generated |
 | System.Text.Json;JsonSerializer;Serialize;(System.IO.Stream,System.Object,System.Type,System.Text.Json.Serialization.JsonSerializerContext);summary;df-generated |
-| System.Text.Json;JsonSerializer;Serialize;(System.Object,System.Text.Json.Serialization.Metadata.JsonTypeInfo);summary;df-generated |
 | System.Text.Json;JsonSerializer;Serialize;(System.Object,System.Type,System.Text.Json.JsonSerializerOptions);summary;df-generated |
 | System.Text.Json;JsonSerializer;Serialize;(System.Object,System.Type,System.Text.Json.Serialization.JsonSerializerContext);summary;df-generated |
-| System.Text.Json;JsonSerializer;Serialize;(System.Text.Json.Utf8JsonWriter,System.Object,System.Text.Json.Serialization.Metadata.JsonTypeInfo);summary;df-generated |
 | System.Text.Json;JsonSerializer;Serialize;(System.Text.Json.Utf8JsonWriter,System.Object,System.Type,System.Text.Json.JsonSerializerOptions);summary;df-generated |
 | System.Text.Json;JsonSerializer;Serialize;(System.Text.Json.Utf8JsonWriter,System.Object,System.Type,System.Text.Json.Serialization.JsonSerializerContext);summary;df-generated |
 | System.Text.Json;JsonSerializer;Serialize<TValue>;(System.IO.Stream,TValue,System.Text.Json.JsonSerializerOptions);summary;df-generated |
-| System.Text.Json;JsonSerializer;Serialize<TValue>;(System.IO.Stream,TValue,System.Text.Json.Serialization.Metadata.JsonTypeInfo<TValue>);summary;df-generated |
 | System.Text.Json;JsonSerializer;Serialize<TValue>;(System.Text.Json.Utf8JsonWriter,TValue,System.Text.Json.JsonSerializerOptions);summary;df-generated |
-| System.Text.Json;JsonSerializer;Serialize<TValue>;(System.Text.Json.Utf8JsonWriter,TValue,System.Text.Json.Serialization.Metadata.JsonTypeInfo<TValue>);summary;df-generated |
 | System.Text.Json;JsonSerializer;Serialize<TValue>;(TValue,System.Text.Json.JsonSerializerOptions);summary;df-generated |
-| System.Text.Json;JsonSerializer;Serialize<TValue>;(TValue,System.Text.Json.Serialization.Metadata.JsonTypeInfo<TValue>);summary;df-generated |
-| System.Text.Json;JsonSerializer;SerializeAsync;(System.IO.Stream,System.Object,System.Text.Json.Serialization.Metadata.JsonTypeInfo,System.Threading.CancellationToken);summary;df-generated |
 | System.Text.Json;JsonSerializer;SerializeAsync;(System.IO.Stream,System.Object,System.Type,System.Text.Json.JsonSerializerOptions,System.Threading.CancellationToken);summary;df-generated |
 | System.Text.Json;JsonSerializer;SerializeAsync;(System.IO.Stream,System.Object,System.Type,System.Text.Json.Serialization.JsonSerializerContext,System.Threading.CancellationToken);summary;df-generated |
 | System.Text.Json;JsonSerializer;SerializeAsync<TValue>;(System.IO.Stream,TValue,System.Text.Json.JsonSerializerOptions,System.Threading.CancellationToken);summary;df-generated |
-| System.Text.Json;JsonSerializer;SerializeAsync<TValue>;(System.IO.Stream,TValue,System.Text.Json.Serialization.Metadata.JsonTypeInfo<TValue>,System.Threading.CancellationToken);summary;df-generated |
-| System.Text.Json;JsonSerializer;SerializeToDocument;(System.Object,System.Text.Json.Serialization.Metadata.JsonTypeInfo);summary;df-generated |
 | System.Text.Json;JsonSerializer;SerializeToDocument;(System.Object,System.Type,System.Text.Json.JsonSerializerOptions);summary;df-generated |
 | System.Text.Json;JsonSerializer;SerializeToDocument;(System.Object,System.Type,System.Text.Json.Serialization.JsonSerializerContext);summary;df-generated |
 | System.Text.Json;JsonSerializer;SerializeToDocument<TValue>;(TValue,System.Text.Json.JsonSerializerOptions);summary;df-generated |
-| System.Text.Json;JsonSerializer;SerializeToDocument<TValue>;(TValue,System.Text.Json.Serialization.Metadata.JsonTypeInfo<TValue>);summary;df-generated |
-| System.Text.Json;JsonSerializer;SerializeToElement;(System.Object,System.Text.Json.Serialization.Metadata.JsonTypeInfo);summary;df-generated |
 | System.Text.Json;JsonSerializer;SerializeToElement;(System.Object,System.Type,System.Text.Json.JsonSerializerOptions);summary;df-generated |
 | System.Text.Json;JsonSerializer;SerializeToElement;(System.Object,System.Type,System.Text.Json.Serialization.JsonSerializerContext);summary;df-generated |
 | System.Text.Json;JsonSerializer;SerializeToElement<TValue>;(TValue,System.Text.Json.JsonSerializerOptions);summary;df-generated |
-| System.Text.Json;JsonSerializer;SerializeToElement<TValue>;(TValue,System.Text.Json.Serialization.Metadata.JsonTypeInfo<TValue>);summary;df-generated |
-| System.Text.Json;JsonSerializer;SerializeToNode;(System.Object,System.Text.Json.Serialization.Metadata.JsonTypeInfo);summary;df-generated |
 | System.Text.Json;JsonSerializer;SerializeToNode;(System.Object,System.Type,System.Text.Json.JsonSerializerOptions);summary;df-generated |
 | System.Text.Json;JsonSerializer;SerializeToNode;(System.Object,System.Type,System.Text.Json.Serialization.JsonSerializerContext);summary;df-generated |
 | System.Text.Json;JsonSerializer;SerializeToNode<TValue>;(TValue,System.Text.Json.JsonSerializerOptions);summary;df-generated |
-| System.Text.Json;JsonSerializer;SerializeToNode<TValue>;(TValue,System.Text.Json.Serialization.Metadata.JsonTypeInfo<TValue>);summary;df-generated |
-| System.Text.Json;JsonSerializer;SerializeToUtf8Bytes;(System.Object,System.Text.Json.Serialization.Metadata.JsonTypeInfo);summary;df-generated |
 | System.Text.Json;JsonSerializer;SerializeToUtf8Bytes;(System.Object,System.Type,System.Text.Json.JsonSerializerOptions);summary;df-generated |
 | System.Text.Json;JsonSerializer;SerializeToUtf8Bytes;(System.Object,System.Type,System.Text.Json.Serialization.JsonSerializerContext);summary;df-generated |
 | System.Text.Json;JsonSerializer;SerializeToUtf8Bytes<TValue>;(TValue,System.Text.Json.JsonSerializerOptions);summary;df-generated |
-| System.Text.Json;JsonSerializer;SerializeToUtf8Bytes<TValue>;(TValue,System.Text.Json.Serialization.Metadata.JsonTypeInfo<TValue>);summary;df-generated |
 | System.Text.Json;JsonSerializer;get_IsReflectionEnabledByDefault;();summary;df-generated |
 | System.Text.Json;JsonSerializerOptions;AddContext<TContext>;();summary;df-generated |
 | System.Text.Json;JsonSerializerOptions;JsonSerializerOptions;(System.Text.Json.JsonSerializerDefaults);summary;df-generated |
@@ -46382,6 +49331,7 @@ neutral
 | System.Text.Json;Utf8JsonReader;get_BytesConsumed;();summary;df-generated |
 | System.Text.Json;Utf8JsonReader;get_CurrentDepth;();summary;df-generated |
 | System.Text.Json;Utf8JsonReader;get_IsFinalBlock;();summary;df-generated |
+| System.Text.Json;Utf8JsonReader;get_Position;();summary;df-generated |
 | System.Text.Json;Utf8JsonReader;get_TokenType;();summary;df-generated |
 | System.Text.Json;Utf8JsonWriter;Dispose;();summary;df-generated |
 | System.Text.Json;Utf8JsonWriter;Flush;();summary;df-generated |
@@ -46501,12 +49451,14 @@ neutral
 | System.Text.RegularExpressions;CaptureCollection;Contains;(System.Text.RegularExpressions.Capture);summary;df-generated |
 | System.Text.RegularExpressions;CaptureCollection;IndexOf;(System.Object);summary;df-generated |
 | System.Text.RegularExpressions;CaptureCollection;IndexOf;(System.Text.RegularExpressions.Capture);summary;df-generated |
+| System.Text.RegularExpressions;CaptureCollection;Remove;(System.Object);summary;df-generated |
 | System.Text.RegularExpressions;CaptureCollection;Remove;(System.Text.RegularExpressions.Capture);summary;df-generated |
 | System.Text.RegularExpressions;CaptureCollection;RemoveAt;(System.Int32);summary;df-generated |
 | System.Text.RegularExpressions;CaptureCollection;get_Count;();summary;df-generated |
 | System.Text.RegularExpressions;CaptureCollection;get_IsFixedSize;();summary;df-generated |
 | System.Text.RegularExpressions;CaptureCollection;get_IsReadOnly;();summary;df-generated |
 | System.Text.RegularExpressions;CaptureCollection;get_IsSynchronized;();summary;df-generated |
+| System.Text.RegularExpressions;CaptureCollection;get_Item;(System.Int32);summary;df-generated |
 | System.Text.RegularExpressions;GeneratedRegexAttribute;GeneratedRegexAttribute;(System.String);summary;df-generated |
 | System.Text.RegularExpressions;GeneratedRegexAttribute;GeneratedRegexAttribute;(System.String,System.Text.RegularExpressions.RegexOptions);summary;df-generated |
 | System.Text.RegularExpressions;GeneratedRegexAttribute;GeneratedRegexAttribute;(System.String,System.Text.RegularExpressions.RegexOptions,System.Int32);summary;df-generated |
@@ -46523,12 +49475,18 @@ neutral
 | System.Text.RegularExpressions;GroupCollection;ContainsKey;(System.String);summary;df-generated |
 | System.Text.RegularExpressions;GroupCollection;IndexOf;(System.Object);summary;df-generated |
 | System.Text.RegularExpressions;GroupCollection;IndexOf;(System.Text.RegularExpressions.Group);summary;df-generated |
+| System.Text.RegularExpressions;GroupCollection;Remove;(System.Object);summary;df-generated |
 | System.Text.RegularExpressions;GroupCollection;Remove;(System.Text.RegularExpressions.Group);summary;df-generated |
 | System.Text.RegularExpressions;GroupCollection;RemoveAt;(System.Int32);summary;df-generated |
+| System.Text.RegularExpressions;GroupCollection;TryGetValue;(System.String,System.Text.RegularExpressions.Group);summary;df-generated |
 | System.Text.RegularExpressions;GroupCollection;get_Count;();summary;df-generated |
 | System.Text.RegularExpressions;GroupCollection;get_IsFixedSize;();summary;df-generated |
 | System.Text.RegularExpressions;GroupCollection;get_IsReadOnly;();summary;df-generated |
 | System.Text.RegularExpressions;GroupCollection;get_IsSynchronized;();summary;df-generated |
+| System.Text.RegularExpressions;GroupCollection;get_Item;(System.Int32);summary;df-generated |
+| System.Text.RegularExpressions;GroupCollection;get_Item;(System.String);summary;df-generated |
+| System.Text.RegularExpressions;GroupCollection;get_Keys;();summary;df-generated |
+| System.Text.RegularExpressions;GroupCollection;get_Values;();summary;df-generated |
 | System.Text.RegularExpressions;Match;Result;(System.String);summary;df-generated |
 | System.Text.RegularExpressions;Match;get_Empty;();summary;df-generated |
 | System.Text.RegularExpressions;Match;get_Groups;();summary;df-generated |
@@ -46536,12 +49494,14 @@ neutral
 | System.Text.RegularExpressions;MatchCollection;Contains;(System.Text.RegularExpressions.Match);summary;df-generated |
 | System.Text.RegularExpressions;MatchCollection;IndexOf;(System.Object);summary;df-generated |
 | System.Text.RegularExpressions;MatchCollection;IndexOf;(System.Text.RegularExpressions.Match);summary;df-generated |
+| System.Text.RegularExpressions;MatchCollection;Remove;(System.Object);summary;df-generated |
 | System.Text.RegularExpressions;MatchCollection;Remove;(System.Text.RegularExpressions.Match);summary;df-generated |
 | System.Text.RegularExpressions;MatchCollection;RemoveAt;(System.Int32);summary;df-generated |
 | System.Text.RegularExpressions;MatchCollection;get_Count;();summary;df-generated |
 | System.Text.RegularExpressions;MatchCollection;get_IsFixedSize;();summary;df-generated |
 | System.Text.RegularExpressions;MatchCollection;get_IsReadOnly;();summary;df-generated |
 | System.Text.RegularExpressions;MatchCollection;get_IsSynchronized;();summary;df-generated |
+| System.Text.RegularExpressions;MatchCollection;get_Item;(System.Int32);summary;df-generated |
 | System.Text.RegularExpressions;Regex+ValueMatchEnumerator;MoveNext;();summary;df-generated |
 | System.Text.RegularExpressions;Regex;CompileToAssembly;(System.Text.RegularExpressions.RegexCompilationInfo[],System.Reflection.AssemblyName);summary;df-generated |
 | System.Text.RegularExpressions;Regex;CompileToAssembly;(System.Text.RegularExpressions.RegexCompilationInfo[],System.Reflection.AssemblyName,System.Reflection.Emit.CustomAttributeBuilder[]);summary;df-generated |
@@ -46554,6 +49514,7 @@ neutral
 | System.Text.RegularExpressions;Regex;Count;(System.String,System.String);summary;df-generated |
 | System.Text.RegularExpressions;Regex;Count;(System.String,System.String,System.Text.RegularExpressions.RegexOptions);summary;df-generated |
 | System.Text.RegularExpressions;Regex;Count;(System.String,System.String,System.Text.RegularExpressions.RegexOptions,System.TimeSpan);summary;df-generated |
+| System.Text.RegularExpressions;Regex;GetGroupNames;();summary;df-generated |
 | System.Text.RegularExpressions;Regex;GetGroupNumbers;();summary;df-generated |
 | System.Text.RegularExpressions;Regex;GroupNumberFromName;(System.String);summary;df-generated |
 | System.Text.RegularExpressions;Regex;InitializeReferences;();summary;df-generated |
@@ -46606,7 +49567,6 @@ neutral
 | System.Text.RegularExpressions;RegexRunner;MatchIndex;(System.Int32);summary;df-generated |
 | System.Text.RegularExpressions;RegexRunner;MatchLength;(System.Int32);summary;df-generated |
 | System.Text.RegularExpressions;RegexRunner;Popcrawl;();summary;df-generated |
-| System.Text.RegularExpressions;RegexRunner;Scan;(System.ReadOnlySpan<System.Char>);summary;df-generated |
 | System.Text.RegularExpressions;RegexRunner;TransferCapture;(System.Int32,System.Int32,System.Int32,System.Int32);summary;df-generated |
 | System.Text.RegularExpressions;RegexRunner;Uncapture;();summary;df-generated |
 | System.Text.RegularExpressions;ValueMatch;get_Index;();summary;df-generated |
@@ -46790,8 +49750,6 @@ neutral
 | System.Text.Unicode;Utf8;FromUtf16;(System.ReadOnlySpan<System.Char>,System.Span<System.Byte>,System.Int32,System.Int32,System.Boolean,System.Boolean);summary;df-generated |
 | System.Text.Unicode;Utf8;IsValid;(System.ReadOnlySpan<System.Byte>);summary;df-generated |
 | System.Text.Unicode;Utf8;ToUtf16;(System.ReadOnlySpan<System.Byte>,System.Span<System.Char>,System.Int32,System.Int32,System.Boolean,System.Boolean);summary;df-generated |
-| System.Text.Unicode;Utf8;TryWrite;(System.Span<System.Byte>,System.IFormatProvider,System.Text.Unicode.Utf8+TryWriteInterpolatedStringHandler,System.Int32);summary;df-generated |
-| System.Text.Unicode;Utf8;TryWrite;(System.Span<System.Byte>,System.Text.Unicode.Utf8+TryWriteInterpolatedStringHandler,System.Int32);summary;df-generated |
 | System.Text;ASCIIEncoding;GetByteCount;(System.Char*,System.Int32);summary;df-generated |
 | System.Text;ASCIIEncoding;GetByteCount;(System.Char[],System.Int32,System.Int32);summary;df-generated |
 | System.Text;ASCIIEncoding;GetByteCount;(System.ReadOnlySpan<System.Char>);summary;df-generated |
@@ -46838,6 +49796,7 @@ neutral
 | System.Text;Ascii;TrimStart;(System.ReadOnlySpan<System.Char>);summary;df-generated |
 | System.Text;CodePagesEncodingProvider;GetEncoding;(System.Int32);summary;df-generated |
 | System.Text;CodePagesEncodingProvider;GetEncoding;(System.String);summary;df-generated |
+| System.Text;CodePagesEncodingProvider;GetEncodings;();summary;df-generated |
 | System.Text;CodePagesEncodingProvider;get_Instance;();summary;df-generated |
 | System.Text;CompositeFormat;Parse;(System.String);summary;df-generated |
 | System.Text;CompositeFormat;get_Format;();summary;df-generated |
@@ -46982,6 +49941,7 @@ neutral
 | System.Text;EncodingInfo;get_Name;();summary;df-generated |
 | System.Text;EncodingProvider;GetEncoding;(System.Int32);summary;df-generated |
 | System.Text;EncodingProvider;GetEncoding;(System.String);summary;df-generated |
+| System.Text;EncodingProvider;GetEncodings;();summary;df-generated |
 | System.Text;Rune;CompareTo;(System.Object);summary;df-generated |
 | System.Text;Rune;CompareTo;(System.Text.Rune);summary;df-generated |
 | System.Text;Rune;DecodeFromUtf8;(System.ReadOnlySpan<System.Byte>,System.Text.Rune,System.Int32);summary;df-generated |
@@ -47040,7 +50000,6 @@ neutral
 | System.Text;Rune;op_Inequality;(System.Text.Rune,System.Text.Rune);summary;df-generated |
 | System.Text;Rune;op_LessThan;(System.Text.Rune,System.Text.Rune);summary;df-generated |
 | System.Text;Rune;op_LessThanOrEqual;(System.Text.Rune,System.Text.Rune);summary;df-generated |
-| System.Text;SpanLineEnumerator;MoveNext;();summary;df-generated |
 | System.Text;SpanRuneEnumerator;MoveNext;();summary;df-generated |
 | System.Text;StringBuilder+AppendInterpolatedStringHandler;AppendFormatted;(System.Object,System.Int32,System.String);summary;df-generated |
 | System.Text;StringBuilder+AppendInterpolatedStringHandler;AppendFormatted;(System.ReadOnlySpan<System.Char>);summary;df-generated |
@@ -47062,6 +50021,7 @@ neutral
 | System.Text;StringRuneEnumerator;Dispose;();summary;df-generated |
 | System.Text;StringRuneEnumerator;MoveNext;();summary;df-generated |
 | System.Text;StringRuneEnumerator;Reset;();summary;df-generated |
+| System.Text;StringRuneEnumerator;get_Current;();summary;df-generated |
 | System.Text;UTF7Encoding;Equals;(System.Object);summary;df-generated |
 | System.Text;UTF7Encoding;GetByteCount;(System.Char*,System.Int32);summary;df-generated |
 | System.Text;UTF7Encoding;GetByteCount;(System.Char[],System.Int32,System.Int32);summary;df-generated |
@@ -47118,6 +50078,7 @@ neutral
 | System.Threading.Channels;BoundedChannelOptions;BoundedChannelOptions;(System.Int32);summary;df-generated |
 | System.Threading.Channels;Channel;CreateBounded<T>;(System.Int32);summary;df-generated |
 | System.Threading.Channels;Channel;CreateBounded<T>;(System.Threading.Channels.BoundedChannelOptions);summary;df-generated |
+| System.Threading.Channels;Channel;CreateBounded<T>;(System.Threading.Channels.BoundedChannelOptions,System.Action<T>);summary;df-generated |
 | System.Threading.Channels;Channel;CreateUnbounded<T>;();summary;df-generated |
 | System.Threading.Channels;Channel;CreateUnbounded<T>;(System.Threading.Channels.UnboundedChannelOptions);summary;df-generated |
 | System.Threading.Channels;ChannelClosedException;ChannelClosedException;(System.Exception);summary;df-generated |
@@ -47138,11 +50099,13 @@ neutral
 | System.Threading.Channels;ChannelWriter<T>;TryWrite;(T);summary;df-generated |
 | System.Threading.Channels;ChannelWriter<T>;WaitToWriteAsync;(System.Threading.CancellationToken);summary;df-generated |
 | System.Threading.Channels;ChannelWriter<T>;WriteAsync;(T,System.Threading.CancellationToken);summary;df-generated |
+| System.Threading.RateLimiting;ConcurrencyLimiter;AcquireAsyncCore;(System.Int32,System.Threading.CancellationToken);summary;df-generated |
 | System.Threading.RateLimiting;ConcurrencyLimiter;ConcurrencyLimiter;(System.Threading.RateLimiting.ConcurrencyLimiterOptions);summary;df-generated |
 | System.Threading.RateLimiting;ConcurrencyLimiter;Dispose;(System.Boolean);summary;df-generated |
 | System.Threading.RateLimiting;ConcurrencyLimiter;DisposeAsyncCore;();summary;df-generated |
 | System.Threading.RateLimiting;ConcurrencyLimiter;GetStatistics;();summary;df-generated |
 | System.Threading.RateLimiting;ConcurrencyLimiter;get_IdleDuration;();summary;df-generated |
+| System.Threading.RateLimiting;FixedWindowRateLimiter;AcquireAsyncCore;(System.Int32,System.Threading.CancellationToken);summary;df-generated |
 | System.Threading.RateLimiting;FixedWindowRateLimiter;Dispose;(System.Boolean);summary;df-generated |
 | System.Threading.RateLimiting;FixedWindowRateLimiter;DisposeAsyncCore;();summary;df-generated |
 | System.Threading.RateLimiting;FixedWindowRateLimiter;FixedWindowRateLimiter;(System.Threading.RateLimiting.FixedWindowRateLimiterOptions);summary;df-generated |
@@ -47150,6 +50113,7 @@ neutral
 | System.Threading.RateLimiting;FixedWindowRateLimiter;TryReplenish;();summary;df-generated |
 | System.Threading.RateLimiting;FixedWindowRateLimiter;get_IdleDuration;();summary;df-generated |
 | System.Threading.RateLimiting;FixedWindowRateLimiter;get_IsAutoReplenishing;();summary;df-generated |
+| System.Threading.RateLimiting;MetadataName;Create<T>;(System.String);summary;df-generated |
 | System.Threading.RateLimiting;MetadataName;get_ReasonPhrase;();summary;df-generated |
 | System.Threading.RateLimiting;MetadataName;get_RetryAfter;();summary;df-generated |
 | System.Threading.RateLimiting;MetadataName<T>;Equals;(System.Object);summary;df-generated |
@@ -47157,6 +50121,7 @@ neutral
 | System.Threading.RateLimiting;MetadataName<T>;GetHashCode;();summary;df-generated |
 | System.Threading.RateLimiting;MetadataName<T>;op_Equality;(System.Threading.RateLimiting.MetadataName<T>,System.Threading.RateLimiting.MetadataName<T>);summary;df-generated |
 | System.Threading.RateLimiting;MetadataName<T>;op_Inequality;(System.Threading.RateLimiting.MetadataName<T>,System.Threading.RateLimiting.MetadataName<T>);summary;df-generated |
+| System.Threading.RateLimiting;PartitionedRateLimiter;Create<TResource,TPartitionKey>;(System.Func<TResource,System.Threading.RateLimiting.RateLimitPartition<TPartitionKey>>,System.Collections.Generic.IEqualityComparer<TPartitionKey>);summary;df-generated |
 | System.Threading.RateLimiting;PartitionedRateLimiter<TResource>;AcquireAsync;(TResource,System.Int32,System.Threading.CancellationToken);summary;df-generated |
 | System.Threading.RateLimiting;PartitionedRateLimiter<TResource>;AcquireAsyncCore;(TResource,System.Int32,System.Threading.CancellationToken);summary;df-generated |
 | System.Threading.RateLimiting;PartitionedRateLimiter<TResource>;AttemptAcquire;(TResource,System.Int32);summary;df-generated |
@@ -47165,12 +50130,21 @@ neutral
 | System.Threading.RateLimiting;PartitionedRateLimiter<TResource>;Dispose;(System.Boolean);summary;df-generated |
 | System.Threading.RateLimiting;PartitionedRateLimiter<TResource>;DisposeAsyncCore;();summary;df-generated |
 | System.Threading.RateLimiting;PartitionedRateLimiter<TResource>;GetStatistics;(TResource);summary;df-generated |
+| System.Threading.RateLimiting;PartitionedRateLimiter<TResource>;WithTranslatedKey<TOuter>;(System.Func<TOuter,TResource>,System.Boolean);summary;df-generated |
 | System.Threading.RateLimiting;RateLimitLease;Dispose;();summary;df-generated |
 | System.Threading.RateLimiting;RateLimitLease;Dispose;(System.Boolean);summary;df-generated |
 | System.Threading.RateLimiting;RateLimitLease;get_IsAcquired;();summary;df-generated |
+| System.Threading.RateLimiting;RateLimitPartition;Get<TKey>;(TKey,System.Func<TKey,System.Threading.RateLimiting.RateLimiter>);summary;df-generated |
+| System.Threading.RateLimiting;RateLimitPartition;GetConcurrencyLimiter<TKey>;(TKey,System.Func<TKey,System.Threading.RateLimiting.ConcurrencyLimiterOptions>);summary;df-generated |
+| System.Threading.RateLimiting;RateLimitPartition;GetFixedWindowLimiter<TKey>;(TKey,System.Func<TKey,System.Threading.RateLimiting.FixedWindowRateLimiterOptions>);summary;df-generated |
 | System.Threading.RateLimiting;RateLimitPartition;GetNoLimiter<TKey>;(TKey);summary;df-generated |
+| System.Threading.RateLimiting;RateLimitPartition;GetSlidingWindowLimiter<TKey>;(TKey,System.Func<TKey,System.Threading.RateLimiting.SlidingWindowRateLimiterOptions>);summary;df-generated |
+| System.Threading.RateLimiting;RateLimitPartition;GetTokenBucketLimiter<TKey>;(TKey,System.Func<TKey,System.Threading.RateLimiting.TokenBucketRateLimiterOptions>);summary;df-generated |
+| System.Threading.RateLimiting;RateLimitPartition<TKey>;RateLimitPartition;(TKey,System.Func<TKey,System.Threading.RateLimiting.RateLimiter>);summary;df-generated |
 | System.Threading.RateLimiting;RateLimitPartition<TKey>;get_Factory;();summary;df-generated |
 | System.Threading.RateLimiting;RateLimitPartition<TKey>;get_PartitionKey;();summary;df-generated |
+| System.Threading.RateLimiting;RateLimiter;AcquireAsync;(System.Int32,System.Threading.CancellationToken);summary;df-generated |
+| System.Threading.RateLimiting;RateLimiter;AcquireAsyncCore;(System.Int32,System.Threading.CancellationToken);summary;df-generated |
 | System.Threading.RateLimiting;RateLimiter;Dispose;();summary;df-generated |
 | System.Threading.RateLimiting;RateLimiter;Dispose;(System.Boolean);summary;df-generated |
 | System.Threading.RateLimiting;RateLimiter;DisposeAsyncCore;();summary;df-generated |
@@ -47178,6 +50152,7 @@ neutral
 | System.Threading.RateLimiting;RateLimiter;get_IdleDuration;();summary;df-generated |
 | System.Threading.RateLimiting;ReplenishingRateLimiter;TryReplenish;();summary;df-generated |
 | System.Threading.RateLimiting;ReplenishingRateLimiter;get_IsAutoReplenishing;();summary;df-generated |
+| System.Threading.RateLimiting;SlidingWindowRateLimiter;AcquireAsyncCore;(System.Int32,System.Threading.CancellationToken);summary;df-generated |
 | System.Threading.RateLimiting;SlidingWindowRateLimiter;Dispose;(System.Boolean);summary;df-generated |
 | System.Threading.RateLimiting;SlidingWindowRateLimiter;DisposeAsyncCore;();summary;df-generated |
 | System.Threading.RateLimiting;SlidingWindowRateLimiter;GetStatistics;();summary;df-generated |
@@ -47185,6 +50160,7 @@ neutral
 | System.Threading.RateLimiting;SlidingWindowRateLimiter;TryReplenish;();summary;df-generated |
 | System.Threading.RateLimiting;SlidingWindowRateLimiter;get_IdleDuration;();summary;df-generated |
 | System.Threading.RateLimiting;SlidingWindowRateLimiter;get_IsAutoReplenishing;();summary;df-generated |
+| System.Threading.RateLimiting;TokenBucketRateLimiter;AcquireAsyncCore;(System.Int32,System.Threading.CancellationToken);summary;df-generated |
 | System.Threading.RateLimiting;TokenBucketRateLimiter;Dispose;(System.Boolean);summary;df-generated |
 | System.Threading.RateLimiting;TokenBucketRateLimiter;DisposeAsyncCore;();summary;df-generated |
 | System.Threading.RateLimiting;TokenBucketRateLimiter;GetStatistics;();summary;df-generated |
@@ -47192,8 +50168,11 @@ neutral
 | System.Threading.RateLimiting;TokenBucketRateLimiter;TryReplenish;();summary;df-generated |
 | System.Threading.RateLimiting;TokenBucketRateLimiter;get_IdleDuration;();summary;df-generated |
 | System.Threading.RateLimiting;TokenBucketRateLimiter;get_IsAutoReplenishing;();summary;df-generated |
+| System.Threading.Tasks.Dataflow;ActionBlock<TInput>;ActionBlock;(System.Action<TInput>);summary;df-generated |
+| System.Threading.Tasks.Dataflow;ActionBlock<TInput>;ActionBlock;(System.Action<TInput>,System.Threading.Tasks.Dataflow.ExecutionDataflowBlockOptions);summary;df-generated |
+| System.Threading.Tasks.Dataflow;ActionBlock<TInput>;ActionBlock;(System.Func<TInput,System.Threading.Tasks.Task>);summary;df-generated |
+| System.Threading.Tasks.Dataflow;ActionBlock<TInput>;ActionBlock;(System.Func<TInput,System.Threading.Tasks.Task>,System.Threading.Tasks.Dataflow.ExecutionDataflowBlockOptions);summary;df-generated |
 | System.Threading.Tasks.Dataflow;ActionBlock<TInput>;Complete;();summary;df-generated |
-| System.Threading.Tasks.Dataflow;ActionBlock<TInput>;Fault;(System.Exception);summary;df-generated |
 | System.Threading.Tasks.Dataflow;ActionBlock<TInput>;OfferMessage;(System.Threading.Tasks.Dataflow.DataflowMessageHeader,TInput,System.Threading.Tasks.Dataflow.ISourceBlock<TInput>,System.Boolean);summary;df-generated |
 | System.Threading.Tasks.Dataflow;ActionBlock<TInput>;Post;(TInput);summary;df-generated |
 | System.Threading.Tasks.Dataflow;ActionBlock<TInput>;ToString;();summary;df-generated |
@@ -47201,45 +50180,66 @@ neutral
 | System.Threading.Tasks.Dataflow;BatchBlock<T>;BatchBlock;(System.Int32);summary;df-generated |
 | System.Threading.Tasks.Dataflow;BatchBlock<T>;Complete;();summary;df-generated |
 | System.Threading.Tasks.Dataflow;BatchBlock<T>;ConsumeMessage;(System.Threading.Tasks.Dataflow.DataflowMessageHeader,System.Threading.Tasks.Dataflow.ITargetBlock<T[]>,System.Boolean);summary;df-generated |
-| System.Threading.Tasks.Dataflow;BatchBlock<T>;Fault;(System.Exception);summary;df-generated |
+| System.Threading.Tasks.Dataflow;BatchBlock<T>;LinkTo;(System.Threading.Tasks.Dataflow.ITargetBlock<T[]>,System.Threading.Tasks.Dataflow.DataflowLinkOptions);summary;df-generated |
 | System.Threading.Tasks.Dataflow;BatchBlock<T>;OfferMessage;(System.Threading.Tasks.Dataflow.DataflowMessageHeader,T,System.Threading.Tasks.Dataflow.ISourceBlock<T>,System.Boolean);summary;df-generated |
 | System.Threading.Tasks.Dataflow;BatchBlock<T>;ReleaseReservation;(System.Threading.Tasks.Dataflow.DataflowMessageHeader,System.Threading.Tasks.Dataflow.ITargetBlock<T[]>);summary;df-generated |
+| System.Threading.Tasks.Dataflow;BatchBlock<T>;ReserveMessage;(System.Threading.Tasks.Dataflow.DataflowMessageHeader,System.Threading.Tasks.Dataflow.ITargetBlock<T[]>);summary;df-generated |
 | System.Threading.Tasks.Dataflow;BatchBlock<T>;ToString;();summary;df-generated |
 | System.Threading.Tasks.Dataflow;BatchBlock<T>;TriggerBatch;();summary;df-generated |
+| System.Threading.Tasks.Dataflow;BatchBlock<T>;TryReceive;(System.Predicate<T[]>,T[]);summary;df-generated |
 | System.Threading.Tasks.Dataflow;BatchBlock<T>;TryReceiveAll;(System.Collections.Generic.IList<T[]>);summary;df-generated |
 | System.Threading.Tasks.Dataflow;BatchBlock<T>;get_BatchSize;();summary;df-generated |
 | System.Threading.Tasks.Dataflow;BatchBlock<T>;get_OutputCount;();summary;df-generated |
 | System.Threading.Tasks.Dataflow;BatchedJoinBlock<T1,T2,T3>;BatchedJoinBlock;(System.Int32);summary;df-generated |
 | System.Threading.Tasks.Dataflow;BatchedJoinBlock<T1,T2,T3>;Complete;();summary;df-generated |
 | System.Threading.Tasks.Dataflow;BatchedJoinBlock<T1,T2,T3>;ConsumeMessage;(System.Threading.Tasks.Dataflow.DataflowMessageHeader,System.Threading.Tasks.Dataflow.ITargetBlock<System.Tuple<System.Collections.Generic.IList<T1>,System.Collections.Generic.IList<T2>,System.Collections.Generic.IList<T3>>>,System.Boolean);summary;df-generated |
-| System.Threading.Tasks.Dataflow;BatchedJoinBlock<T1,T2,T3>;Fault;(System.Exception);summary;df-generated |
+| System.Threading.Tasks.Dataflow;BatchedJoinBlock<T1,T2,T3>;LinkTo;(System.Threading.Tasks.Dataflow.ITargetBlock<System.Tuple<System.Collections.Generic.IList<T1>,System.Collections.Generic.IList<T2>,System.Collections.Generic.IList<T3>>>,System.Threading.Tasks.Dataflow.DataflowLinkOptions);summary;df-generated |
 | System.Threading.Tasks.Dataflow;BatchedJoinBlock<T1,T2,T3>;ReleaseReservation;(System.Threading.Tasks.Dataflow.DataflowMessageHeader,System.Threading.Tasks.Dataflow.ITargetBlock<System.Tuple<System.Collections.Generic.IList<T1>,System.Collections.Generic.IList<T2>,System.Collections.Generic.IList<T3>>>);summary;df-generated |
+| System.Threading.Tasks.Dataflow;BatchedJoinBlock<T1,T2,T3>;ReserveMessage;(System.Threading.Tasks.Dataflow.DataflowMessageHeader,System.Threading.Tasks.Dataflow.ITargetBlock<System.Tuple<System.Collections.Generic.IList<T1>,System.Collections.Generic.IList<T2>,System.Collections.Generic.IList<T3>>>);summary;df-generated |
 | System.Threading.Tasks.Dataflow;BatchedJoinBlock<T1,T2,T3>;ToString;();summary;df-generated |
+| System.Threading.Tasks.Dataflow;BatchedJoinBlock<T1,T2,T3>;TryReceive;(System.Predicate<System.Tuple<System.Collections.Generic.IList<T1>,System.Collections.Generic.IList<T2>,System.Collections.Generic.IList<T3>>>,System.Tuple<System.Collections.Generic.IList<T1>,System.Collections.Generic.IList<T2>,System.Collections.Generic.IList<T3>>);summary;df-generated |
 | System.Threading.Tasks.Dataflow;BatchedJoinBlock<T1,T2,T3>;TryReceiveAll;(System.Collections.Generic.IList<System.Tuple<System.Collections.Generic.IList<T1>,System.Collections.Generic.IList<T2>,System.Collections.Generic.IList<T3>>>);summary;df-generated |
 | System.Threading.Tasks.Dataflow;BatchedJoinBlock<T1,T2,T3>;get_BatchSize;();summary;df-generated |
 | System.Threading.Tasks.Dataflow;BatchedJoinBlock<T1,T2,T3>;get_OutputCount;();summary;df-generated |
 | System.Threading.Tasks.Dataflow;BatchedJoinBlock<T1,T2>;BatchedJoinBlock;(System.Int32);summary;df-generated |
 | System.Threading.Tasks.Dataflow;BatchedJoinBlock<T1,T2>;Complete;();summary;df-generated |
 | System.Threading.Tasks.Dataflow;BatchedJoinBlock<T1,T2>;ConsumeMessage;(System.Threading.Tasks.Dataflow.DataflowMessageHeader,System.Threading.Tasks.Dataflow.ITargetBlock<System.Tuple<System.Collections.Generic.IList<T1>,System.Collections.Generic.IList<T2>>>,System.Boolean);summary;df-generated |
-| System.Threading.Tasks.Dataflow;BatchedJoinBlock<T1,T2>;Fault;(System.Exception);summary;df-generated |
+| System.Threading.Tasks.Dataflow;BatchedJoinBlock<T1,T2>;LinkTo;(System.Threading.Tasks.Dataflow.ITargetBlock<System.Tuple<System.Collections.Generic.IList<T1>,System.Collections.Generic.IList<T2>>>,System.Threading.Tasks.Dataflow.DataflowLinkOptions);summary;df-generated |
 | System.Threading.Tasks.Dataflow;BatchedJoinBlock<T1,T2>;ReleaseReservation;(System.Threading.Tasks.Dataflow.DataflowMessageHeader,System.Threading.Tasks.Dataflow.ITargetBlock<System.Tuple<System.Collections.Generic.IList<T1>,System.Collections.Generic.IList<T2>>>);summary;df-generated |
+| System.Threading.Tasks.Dataflow;BatchedJoinBlock<T1,T2>;ReserveMessage;(System.Threading.Tasks.Dataflow.DataflowMessageHeader,System.Threading.Tasks.Dataflow.ITargetBlock<System.Tuple<System.Collections.Generic.IList<T1>,System.Collections.Generic.IList<T2>>>);summary;df-generated |
 | System.Threading.Tasks.Dataflow;BatchedJoinBlock<T1,T2>;ToString;();summary;df-generated |
+| System.Threading.Tasks.Dataflow;BatchedJoinBlock<T1,T2>;TryReceive;(System.Predicate<System.Tuple<System.Collections.Generic.IList<T1>,System.Collections.Generic.IList<T2>>>,System.Tuple<System.Collections.Generic.IList<T1>,System.Collections.Generic.IList<T2>>);summary;df-generated |
 | System.Threading.Tasks.Dataflow;BatchedJoinBlock<T1,T2>;TryReceiveAll;(System.Collections.Generic.IList<System.Tuple<System.Collections.Generic.IList<T1>,System.Collections.Generic.IList<T2>>>);summary;df-generated |
 | System.Threading.Tasks.Dataflow;BatchedJoinBlock<T1,T2>;get_BatchSize;();summary;df-generated |
 | System.Threading.Tasks.Dataflow;BatchedJoinBlock<T1,T2>;get_OutputCount;();summary;df-generated |
+| System.Threading.Tasks.Dataflow;BroadcastBlock<T>;BroadcastBlock;(System.Func<T,T>);summary;df-generated |
+| System.Threading.Tasks.Dataflow;BroadcastBlock<T>;BroadcastBlock;(System.Func<T,T>,System.Threading.Tasks.Dataflow.DataflowBlockOptions);summary;df-generated |
 | System.Threading.Tasks.Dataflow;BroadcastBlock<T>;Complete;();summary;df-generated |
-| System.Threading.Tasks.Dataflow;BroadcastBlock<T>;Fault;(System.Exception);summary;df-generated |
+| System.Threading.Tasks.Dataflow;BroadcastBlock<T>;ConsumeMessage;(System.Threading.Tasks.Dataflow.DataflowMessageHeader,System.Threading.Tasks.Dataflow.ITargetBlock<T>,System.Boolean);summary;df-generated |
+| System.Threading.Tasks.Dataflow;BroadcastBlock<T>;LinkTo;(System.Threading.Tasks.Dataflow.ITargetBlock<T>,System.Threading.Tasks.Dataflow.DataflowLinkOptions);summary;df-generated |
 | System.Threading.Tasks.Dataflow;BroadcastBlock<T>;OfferMessage;(System.Threading.Tasks.Dataflow.DataflowMessageHeader,T,System.Threading.Tasks.Dataflow.ISourceBlock<T>,System.Boolean);summary;df-generated |
 | System.Threading.Tasks.Dataflow;BroadcastBlock<T>;ReleaseReservation;(System.Threading.Tasks.Dataflow.DataflowMessageHeader,System.Threading.Tasks.Dataflow.ITargetBlock<T>);summary;df-generated |
+| System.Threading.Tasks.Dataflow;BroadcastBlock<T>;ReserveMessage;(System.Threading.Tasks.Dataflow.DataflowMessageHeader,System.Threading.Tasks.Dataflow.ITargetBlock<T>);summary;df-generated |
 | System.Threading.Tasks.Dataflow;BroadcastBlock<T>;ToString;();summary;df-generated |
+| System.Threading.Tasks.Dataflow;BroadcastBlock<T>;TryReceive;(System.Predicate<T>,T);summary;df-generated |
+| System.Threading.Tasks.Dataflow;BroadcastBlock<T>;TryReceiveAll;(System.Collections.Generic.IList<T>);summary;df-generated |
 | System.Threading.Tasks.Dataflow;BufferBlock<T>;Complete;();summary;df-generated |
 | System.Threading.Tasks.Dataflow;BufferBlock<T>;ConsumeMessage;(System.Threading.Tasks.Dataflow.DataflowMessageHeader,System.Threading.Tasks.Dataflow.ITargetBlock<T>,System.Boolean);summary;df-generated |
-| System.Threading.Tasks.Dataflow;BufferBlock<T>;Fault;(System.Exception);summary;df-generated |
+| System.Threading.Tasks.Dataflow;BufferBlock<T>;LinkTo;(System.Threading.Tasks.Dataflow.ITargetBlock<T>,System.Threading.Tasks.Dataflow.DataflowLinkOptions);summary;df-generated |
 | System.Threading.Tasks.Dataflow;BufferBlock<T>;OfferMessage;(System.Threading.Tasks.Dataflow.DataflowMessageHeader,T,System.Threading.Tasks.Dataflow.ISourceBlock<T>,System.Boolean);summary;df-generated |
 | System.Threading.Tasks.Dataflow;BufferBlock<T>;ReleaseReservation;(System.Threading.Tasks.Dataflow.DataflowMessageHeader,System.Threading.Tasks.Dataflow.ITargetBlock<T>);summary;df-generated |
+| System.Threading.Tasks.Dataflow;BufferBlock<T>;ReserveMessage;(System.Threading.Tasks.Dataflow.DataflowMessageHeader,System.Threading.Tasks.Dataflow.ITargetBlock<T>);summary;df-generated |
 | System.Threading.Tasks.Dataflow;BufferBlock<T>;ToString;();summary;df-generated |
+| System.Threading.Tasks.Dataflow;BufferBlock<T>;TryReceive;(System.Predicate<T>,T);summary;df-generated |
 | System.Threading.Tasks.Dataflow;BufferBlock<T>;TryReceiveAll;(System.Collections.Generic.IList<T>);summary;df-generated |
 | System.Threading.Tasks.Dataflow;BufferBlock<T>;get_Count;();summary;df-generated |
+| System.Threading.Tasks.Dataflow;DataflowBlock;AsObservable<TOutput>;(System.Threading.Tasks.Dataflow.ISourceBlock<TOutput>);summary;df-generated |
+| System.Threading.Tasks.Dataflow;DataflowBlock;Choose<T1,T2,T3>;(System.Threading.Tasks.Dataflow.ISourceBlock<T1>,System.Action<T1>,System.Threading.Tasks.Dataflow.ISourceBlock<T2>,System.Action<T2>,System.Threading.Tasks.Dataflow.ISourceBlock<T3>,System.Action<T3>);summary;df-generated |
+| System.Threading.Tasks.Dataflow;DataflowBlock;Choose<T1,T2,T3>;(System.Threading.Tasks.Dataflow.ISourceBlock<T1>,System.Action<T1>,System.Threading.Tasks.Dataflow.ISourceBlock<T2>,System.Action<T2>,System.Threading.Tasks.Dataflow.ISourceBlock<T3>,System.Action<T3>,System.Threading.Tasks.Dataflow.DataflowBlockOptions);summary;df-generated |
+| System.Threading.Tasks.Dataflow;DataflowBlock;Choose<T1,T2>;(System.Threading.Tasks.Dataflow.ISourceBlock<T1>,System.Action<T1>,System.Threading.Tasks.Dataflow.ISourceBlock<T2>,System.Action<T2>);summary;df-generated |
+| System.Threading.Tasks.Dataflow;DataflowBlock;Choose<T1,T2>;(System.Threading.Tasks.Dataflow.ISourceBlock<T1>,System.Action<T1>,System.Threading.Tasks.Dataflow.ISourceBlock<T2>,System.Action<T2>,System.Threading.Tasks.Dataflow.DataflowBlockOptions);summary;df-generated |
+| System.Threading.Tasks.Dataflow;DataflowBlock;LinkTo<TOutput>;(System.Threading.Tasks.Dataflow.ISourceBlock<TOutput>,System.Threading.Tasks.Dataflow.ITargetBlock<TOutput>,System.Predicate<TOutput>);summary;df-generated |
+| System.Threading.Tasks.Dataflow;DataflowBlock;LinkTo<TOutput>;(System.Threading.Tasks.Dataflow.ISourceBlock<TOutput>,System.Threading.Tasks.Dataflow.ITargetBlock<TOutput>,System.Threading.Tasks.Dataflow.DataflowLinkOptions,System.Predicate<TOutput>);summary;df-generated |
 | System.Threading.Tasks.Dataflow;DataflowBlock;NullTarget<TInput>;();summary;df-generated |
 | System.Threading.Tasks.Dataflow;DataflowBlock;OutputAvailableAsync<TOutput>;(System.Threading.Tasks.Dataflow.ISourceBlock<TOutput>);summary;df-generated |
 | System.Threading.Tasks.Dataflow;DataflowBlock;OutputAvailableAsync<TOutput>;(System.Threading.Tasks.Dataflow.ISourceBlock<TOutput>,System.Threading.CancellationToken);summary;df-generated |
@@ -47252,7 +50252,7 @@ neutral
 | System.Threading.Tasks.Dataflow;DataflowMessageHeader;op_Equality;(System.Threading.Tasks.Dataflow.DataflowMessageHeader,System.Threading.Tasks.Dataflow.DataflowMessageHeader);summary;df-generated |
 | System.Threading.Tasks.Dataflow;DataflowMessageHeader;op_Inequality;(System.Threading.Tasks.Dataflow.DataflowMessageHeader,System.Threading.Tasks.Dataflow.DataflowMessageHeader);summary;df-generated |
 | System.Threading.Tasks.Dataflow;IDataflowBlock;Complete;();summary;df-generated |
-| System.Threading.Tasks.Dataflow;IDataflowBlock;Fault;(System.Exception);summary;df-generated |
+| System.Threading.Tasks.Dataflow;IReceivableSourceBlock<TOutput>;TryReceive;(System.Predicate<TOutput>,TOutput);summary;df-generated |
 | System.Threading.Tasks.Dataflow;IReceivableSourceBlock<TOutput>;TryReceiveAll;(System.Collections.Generic.IList<TOutput>);summary;df-generated |
 | System.Threading.Tasks.Dataflow;ISourceBlock<TOutput>;ConsumeMessage;(System.Threading.Tasks.Dataflow.DataflowMessageHeader,System.Threading.Tasks.Dataflow.ITargetBlock<TOutput>,System.Boolean);summary;df-generated |
 | System.Threading.Tasks.Dataflow;ISourceBlock<TOutput>;LinkTo;(System.Threading.Tasks.Dataflow.ITargetBlock<TOutput>,System.Threading.Tasks.Dataflow.DataflowLinkOptions);summary;df-generated |
@@ -47261,50 +50261,118 @@ neutral
 | System.Threading.Tasks.Dataflow;ITargetBlock<TInput>;OfferMessage;(System.Threading.Tasks.Dataflow.DataflowMessageHeader,TInput,System.Threading.Tasks.Dataflow.ISourceBlock<TInput>,System.Boolean);summary;df-generated |
 | System.Threading.Tasks.Dataflow;JoinBlock<T1,T2,T3>;Complete;();summary;df-generated |
 | System.Threading.Tasks.Dataflow;JoinBlock<T1,T2,T3>;ConsumeMessage;(System.Threading.Tasks.Dataflow.DataflowMessageHeader,System.Threading.Tasks.Dataflow.ITargetBlock<System.Tuple<T1,T2,T3>>,System.Boolean);summary;df-generated |
-| System.Threading.Tasks.Dataflow;JoinBlock<T1,T2,T3>;Fault;(System.Exception);summary;df-generated |
+| System.Threading.Tasks.Dataflow;JoinBlock<T1,T2,T3>;LinkTo;(System.Threading.Tasks.Dataflow.ITargetBlock<System.Tuple<T1,T2,T3>>,System.Threading.Tasks.Dataflow.DataflowLinkOptions);summary;df-generated |
 | System.Threading.Tasks.Dataflow;JoinBlock<T1,T2,T3>;ReleaseReservation;(System.Threading.Tasks.Dataflow.DataflowMessageHeader,System.Threading.Tasks.Dataflow.ITargetBlock<System.Tuple<T1,T2,T3>>);summary;df-generated |
+| System.Threading.Tasks.Dataflow;JoinBlock<T1,T2,T3>;ReserveMessage;(System.Threading.Tasks.Dataflow.DataflowMessageHeader,System.Threading.Tasks.Dataflow.ITargetBlock<System.Tuple<T1,T2,T3>>);summary;df-generated |
 | System.Threading.Tasks.Dataflow;JoinBlock<T1,T2,T3>;ToString;();summary;df-generated |
+| System.Threading.Tasks.Dataflow;JoinBlock<T1,T2,T3>;TryReceive;(System.Predicate<System.Tuple<T1,T2,T3>>,System.Tuple<T1,T2,T3>);summary;df-generated |
 | System.Threading.Tasks.Dataflow;JoinBlock<T1,T2,T3>;TryReceiveAll;(System.Collections.Generic.IList<System.Tuple<T1,T2,T3>>);summary;df-generated |
 | System.Threading.Tasks.Dataflow;JoinBlock<T1,T2,T3>;get_OutputCount;();summary;df-generated |
 | System.Threading.Tasks.Dataflow;JoinBlock<T1,T2>;Complete;();summary;df-generated |
 | System.Threading.Tasks.Dataflow;JoinBlock<T1,T2>;ConsumeMessage;(System.Threading.Tasks.Dataflow.DataflowMessageHeader,System.Threading.Tasks.Dataflow.ITargetBlock<System.Tuple<T1,T2>>,System.Boolean);summary;df-generated |
-| System.Threading.Tasks.Dataflow;JoinBlock<T1,T2>;Fault;(System.Exception);summary;df-generated |
+| System.Threading.Tasks.Dataflow;JoinBlock<T1,T2>;LinkTo;(System.Threading.Tasks.Dataflow.ITargetBlock<System.Tuple<T1,T2>>,System.Threading.Tasks.Dataflow.DataflowLinkOptions);summary;df-generated |
 | System.Threading.Tasks.Dataflow;JoinBlock<T1,T2>;ReleaseReservation;(System.Threading.Tasks.Dataflow.DataflowMessageHeader,System.Threading.Tasks.Dataflow.ITargetBlock<System.Tuple<T1,T2>>);summary;df-generated |
+| System.Threading.Tasks.Dataflow;JoinBlock<T1,T2>;ReserveMessage;(System.Threading.Tasks.Dataflow.DataflowMessageHeader,System.Threading.Tasks.Dataflow.ITargetBlock<System.Tuple<T1,T2>>);summary;df-generated |
 | System.Threading.Tasks.Dataflow;JoinBlock<T1,T2>;ToString;();summary;df-generated |
+| System.Threading.Tasks.Dataflow;JoinBlock<T1,T2>;TryReceive;(System.Predicate<System.Tuple<T1,T2>>,System.Tuple<T1,T2>);summary;df-generated |
 | System.Threading.Tasks.Dataflow;JoinBlock<T1,T2>;TryReceiveAll;(System.Collections.Generic.IList<System.Tuple<T1,T2>>);summary;df-generated |
 | System.Threading.Tasks.Dataflow;JoinBlock<T1,T2>;get_OutputCount;();summary;df-generated |
 | System.Threading.Tasks.Dataflow;TransformBlock<TInput,TOutput>;Complete;();summary;df-generated |
 | System.Threading.Tasks.Dataflow;TransformBlock<TInput,TOutput>;ConsumeMessage;(System.Threading.Tasks.Dataflow.DataflowMessageHeader,System.Threading.Tasks.Dataflow.ITargetBlock<TOutput>,System.Boolean);summary;df-generated |
-| System.Threading.Tasks.Dataflow;TransformBlock<TInput,TOutput>;Fault;(System.Exception);summary;df-generated |
+| System.Threading.Tasks.Dataflow;TransformBlock<TInput,TOutput>;LinkTo;(System.Threading.Tasks.Dataflow.ITargetBlock<TOutput>,System.Threading.Tasks.Dataflow.DataflowLinkOptions);summary;df-generated |
 | System.Threading.Tasks.Dataflow;TransformBlock<TInput,TOutput>;OfferMessage;(System.Threading.Tasks.Dataflow.DataflowMessageHeader,TInput,System.Threading.Tasks.Dataflow.ISourceBlock<TInput>,System.Boolean);summary;df-generated |
 | System.Threading.Tasks.Dataflow;TransformBlock<TInput,TOutput>;ReleaseReservation;(System.Threading.Tasks.Dataflow.DataflowMessageHeader,System.Threading.Tasks.Dataflow.ITargetBlock<TOutput>);summary;df-generated |
+| System.Threading.Tasks.Dataflow;TransformBlock<TInput,TOutput>;ReserveMessage;(System.Threading.Tasks.Dataflow.DataflowMessageHeader,System.Threading.Tasks.Dataflow.ITargetBlock<TOutput>);summary;df-generated |
 | System.Threading.Tasks.Dataflow;TransformBlock<TInput,TOutput>;ToString;();summary;df-generated |
+| System.Threading.Tasks.Dataflow;TransformBlock<TInput,TOutput>;TransformBlock;(System.Func<TInput,System.Threading.Tasks.Task<TOutput>>);summary;df-generated |
+| System.Threading.Tasks.Dataflow;TransformBlock<TInput,TOutput>;TransformBlock;(System.Func<TInput,System.Threading.Tasks.Task<TOutput>>,System.Threading.Tasks.Dataflow.ExecutionDataflowBlockOptions);summary;df-generated |
+| System.Threading.Tasks.Dataflow;TransformBlock<TInput,TOutput>;TransformBlock;(System.Func<TInput,TOutput>);summary;df-generated |
+| System.Threading.Tasks.Dataflow;TransformBlock<TInput,TOutput>;TransformBlock;(System.Func<TInput,TOutput>,System.Threading.Tasks.Dataflow.ExecutionDataflowBlockOptions);summary;df-generated |
+| System.Threading.Tasks.Dataflow;TransformBlock<TInput,TOutput>;TryReceive;(System.Predicate<TOutput>,TOutput);summary;df-generated |
 | System.Threading.Tasks.Dataflow;TransformBlock<TInput,TOutput>;TryReceiveAll;(System.Collections.Generic.IList<TOutput>);summary;df-generated |
 | System.Threading.Tasks.Dataflow;TransformBlock<TInput,TOutput>;get_InputCount;();summary;df-generated |
 | System.Threading.Tasks.Dataflow;TransformBlock<TInput,TOutput>;get_OutputCount;();summary;df-generated |
 | System.Threading.Tasks.Dataflow;TransformManyBlock<TInput,TOutput>;Complete;();summary;df-generated |
 | System.Threading.Tasks.Dataflow;TransformManyBlock<TInput,TOutput>;ConsumeMessage;(System.Threading.Tasks.Dataflow.DataflowMessageHeader,System.Threading.Tasks.Dataflow.ITargetBlock<TOutput>,System.Boolean);summary;df-generated |
-| System.Threading.Tasks.Dataflow;TransformManyBlock<TInput,TOutput>;Fault;(System.Exception);summary;df-generated |
+| System.Threading.Tasks.Dataflow;TransformManyBlock<TInput,TOutput>;LinkTo;(System.Threading.Tasks.Dataflow.ITargetBlock<TOutput>,System.Threading.Tasks.Dataflow.DataflowLinkOptions);summary;df-generated |
 | System.Threading.Tasks.Dataflow;TransformManyBlock<TInput,TOutput>;OfferMessage;(System.Threading.Tasks.Dataflow.DataflowMessageHeader,TInput,System.Threading.Tasks.Dataflow.ISourceBlock<TInput>,System.Boolean);summary;df-generated |
 | System.Threading.Tasks.Dataflow;TransformManyBlock<TInput,TOutput>;ReleaseReservation;(System.Threading.Tasks.Dataflow.DataflowMessageHeader,System.Threading.Tasks.Dataflow.ITargetBlock<TOutput>);summary;df-generated |
+| System.Threading.Tasks.Dataflow;TransformManyBlock<TInput,TOutput>;ReserveMessage;(System.Threading.Tasks.Dataflow.DataflowMessageHeader,System.Threading.Tasks.Dataflow.ITargetBlock<TOutput>);summary;df-generated |
 | System.Threading.Tasks.Dataflow;TransformManyBlock<TInput,TOutput>;ToString;();summary;df-generated |
+| System.Threading.Tasks.Dataflow;TransformManyBlock<TInput,TOutput>;TransformManyBlock;(System.Func<TInput,System.Collections.Generic.IAsyncEnumerable<TOutput>>);summary;df-generated |
+| System.Threading.Tasks.Dataflow;TransformManyBlock<TInput,TOutput>;TransformManyBlock;(System.Func<TInput,System.Collections.Generic.IAsyncEnumerable<TOutput>>,System.Threading.Tasks.Dataflow.ExecutionDataflowBlockOptions);summary;df-generated |
+| System.Threading.Tasks.Dataflow;TransformManyBlock<TInput,TOutput>;TransformManyBlock;(System.Func<TInput,System.Collections.Generic.IEnumerable<TOutput>>);summary;df-generated |
+| System.Threading.Tasks.Dataflow;TransformManyBlock<TInput,TOutput>;TransformManyBlock;(System.Func<TInput,System.Collections.Generic.IEnumerable<TOutput>>,System.Threading.Tasks.Dataflow.ExecutionDataflowBlockOptions);summary;df-generated |
+| System.Threading.Tasks.Dataflow;TransformManyBlock<TInput,TOutput>;TransformManyBlock;(System.Func<TInput,System.Threading.Tasks.Task<System.Collections.Generic.IEnumerable<TOutput>>>);summary;df-generated |
+| System.Threading.Tasks.Dataflow;TransformManyBlock<TInput,TOutput>;TransformManyBlock;(System.Func<TInput,System.Threading.Tasks.Task<System.Collections.Generic.IEnumerable<TOutput>>>,System.Threading.Tasks.Dataflow.ExecutionDataflowBlockOptions);summary;df-generated |
+| System.Threading.Tasks.Dataflow;TransformManyBlock<TInput,TOutput>;TryReceive;(System.Predicate<TOutput>,TOutput);summary;df-generated |
 | System.Threading.Tasks.Dataflow;TransformManyBlock<TInput,TOutput>;TryReceiveAll;(System.Collections.Generic.IList<TOutput>);summary;df-generated |
 | System.Threading.Tasks.Dataflow;TransformManyBlock<TInput,TOutput>;get_InputCount;();summary;df-generated |
 | System.Threading.Tasks.Dataflow;TransformManyBlock<TInput,TOutput>;get_OutputCount;();summary;df-generated |
 | System.Threading.Tasks.Dataflow;WriteOnceBlock<T>;Complete;();summary;df-generated |
-| System.Threading.Tasks.Dataflow;WriteOnceBlock<T>;Fault;(System.Exception);summary;df-generated |
+| System.Threading.Tasks.Dataflow;WriteOnceBlock<T>;ConsumeMessage;(System.Threading.Tasks.Dataflow.DataflowMessageHeader,System.Threading.Tasks.Dataflow.ITargetBlock<T>,System.Boolean);summary;df-generated |
+| System.Threading.Tasks.Dataflow;WriteOnceBlock<T>;LinkTo;(System.Threading.Tasks.Dataflow.ITargetBlock<T>,System.Threading.Tasks.Dataflow.DataflowLinkOptions);summary;df-generated |
+| System.Threading.Tasks.Dataflow;WriteOnceBlock<T>;OfferMessage;(System.Threading.Tasks.Dataflow.DataflowMessageHeader,T,System.Threading.Tasks.Dataflow.ISourceBlock<T>,System.Boolean);summary;df-generated |
+| System.Threading.Tasks.Dataflow;WriteOnceBlock<T>;ReleaseReservation;(System.Threading.Tasks.Dataflow.DataflowMessageHeader,System.Threading.Tasks.Dataflow.ITargetBlock<T>);summary;df-generated |
 | System.Threading.Tasks.Dataflow;WriteOnceBlock<T>;ReserveMessage;(System.Threading.Tasks.Dataflow.DataflowMessageHeader,System.Threading.Tasks.Dataflow.ITargetBlock<T>);summary;df-generated |
+| System.Threading.Tasks.Dataflow;WriteOnceBlock<T>;TryReceive;(System.Predicate<T>,T);summary;df-generated |
+| System.Threading.Tasks.Dataflow;WriteOnceBlock<T>;TryReceiveAll;(System.Collections.Generic.IList<T>);summary;df-generated |
+| System.Threading.Tasks.Dataflow;WriteOnceBlock<T>;WriteOnceBlock;(System.Func<T,T>);summary;df-generated |
 | System.Threading.Tasks.Sources;IValueTaskSource;GetResult;(System.Int16);summary;df-generated |
 | System.Threading.Tasks.Sources;IValueTaskSource;GetStatus;(System.Int16);summary;df-generated |
+| System.Threading.Tasks.Sources;IValueTaskSource;OnCompleted;(System.Action<System.Object>,System.Object,System.Int16,System.Threading.Tasks.Sources.ValueTaskSourceOnCompletedFlags);summary;df-generated |
 | System.Threading.Tasks.Sources;IValueTaskSource<TResult>;GetResult;(System.Int16);summary;df-generated |
 | System.Threading.Tasks.Sources;IValueTaskSource<TResult>;GetStatus;(System.Int16);summary;df-generated |
+| System.Threading.Tasks.Sources;IValueTaskSource<TResult>;OnCompleted;(System.Action<System.Object>,System.Object,System.Int16,System.Threading.Tasks.Sources.ValueTaskSourceOnCompletedFlags);summary;df-generated |
 | System.Threading.Tasks.Sources;ManualResetValueTaskSourceCore<TResult>;GetStatus;(System.Int16);summary;df-generated |
+| System.Threading.Tasks.Sources;ManualResetValueTaskSourceCore<TResult>;OnCompleted;(System.Action<System.Object>,System.Object,System.Int16,System.Threading.Tasks.Sources.ValueTaskSourceOnCompletedFlags);summary;df-generated |
 | System.Threading.Tasks.Sources;ManualResetValueTaskSourceCore<TResult>;Reset;();summary;df-generated |
 | System.Threading.Tasks.Sources;ManualResetValueTaskSourceCore<TResult>;get_Version;();summary;df-generated |
 | System.Threading.Tasks;ConcurrentExclusiveSchedulerPair;Complete;();summary;df-generated |
 | System.Threading.Tasks;ConcurrentExclusiveSchedulerPair;ConcurrentExclusiveSchedulerPair;(System.Threading.Tasks.TaskScheduler);summary;df-generated |
 | System.Threading.Tasks;ConcurrentExclusiveSchedulerPair;ConcurrentExclusiveSchedulerPair;(System.Threading.Tasks.TaskScheduler,System.Int32);summary;df-generated |
 | System.Threading.Tasks;ConcurrentExclusiveSchedulerPair;get_Completion;();summary;df-generated |
+| System.Threading.Tasks;Parallel;For;(System.Int32,System.Int32,System.Action<System.Int32,System.Threading.Tasks.ParallelLoopState>);summary;df-generated |
+| System.Threading.Tasks;Parallel;For;(System.Int32,System.Int32,System.Action<System.Int32>);summary;df-generated |
+| System.Threading.Tasks;Parallel;For;(System.Int32,System.Int32,System.Threading.Tasks.ParallelOptions,System.Action<System.Int32,System.Threading.Tasks.ParallelLoopState>);summary;df-generated |
+| System.Threading.Tasks;Parallel;For;(System.Int32,System.Int32,System.Threading.Tasks.ParallelOptions,System.Action<System.Int32>);summary;df-generated |
+| System.Threading.Tasks;Parallel;For;(System.Int64,System.Int64,System.Action<System.Int64,System.Threading.Tasks.ParallelLoopState>);summary;df-generated |
+| System.Threading.Tasks;Parallel;For;(System.Int64,System.Int64,System.Action<System.Int64>);summary;df-generated |
+| System.Threading.Tasks;Parallel;For;(System.Int64,System.Int64,System.Threading.Tasks.ParallelOptions,System.Action<System.Int64,System.Threading.Tasks.ParallelLoopState>);summary;df-generated |
+| System.Threading.Tasks;Parallel;For;(System.Int64,System.Int64,System.Threading.Tasks.ParallelOptions,System.Action<System.Int64>);summary;df-generated |
+| System.Threading.Tasks;Parallel;For<TLocal>;(System.Int32,System.Int32,System.Func<TLocal>,System.Func<System.Int32,System.Threading.Tasks.ParallelLoopState,TLocal,TLocal>,System.Action<TLocal>);summary;df-generated |
+| System.Threading.Tasks;Parallel;For<TLocal>;(System.Int32,System.Int32,System.Threading.Tasks.ParallelOptions,System.Func<TLocal>,System.Func<System.Int32,System.Threading.Tasks.ParallelLoopState,TLocal,TLocal>,System.Action<TLocal>);summary;df-generated |
+| System.Threading.Tasks;Parallel;For<TLocal>;(System.Int64,System.Int64,System.Func<TLocal>,System.Func<System.Int64,System.Threading.Tasks.ParallelLoopState,TLocal,TLocal>,System.Action<TLocal>);summary;df-generated |
+| System.Threading.Tasks;Parallel;For<TLocal>;(System.Int64,System.Int64,System.Threading.Tasks.ParallelOptions,System.Func<TLocal>,System.Func<System.Int64,System.Threading.Tasks.ParallelLoopState,TLocal,TLocal>,System.Action<TLocal>);summary;df-generated |
+| System.Threading.Tasks;Parallel;ForAsync<T>;(T,T,System.Func<T,System.Threading.CancellationToken,System.Threading.Tasks.ValueTask>);summary;df-generated |
+| System.Threading.Tasks;Parallel;ForAsync<T>;(T,T,System.Threading.CancellationToken,System.Func<T,System.Threading.CancellationToken,System.Threading.Tasks.ValueTask>);summary;df-generated |
+| System.Threading.Tasks;Parallel;ForAsync<T>;(T,T,System.Threading.Tasks.ParallelOptions,System.Func<T,System.Threading.CancellationToken,System.Threading.Tasks.ValueTask>);summary;df-generated |
+| System.Threading.Tasks;Parallel;ForEach<TSource,TLocal>;(System.Collections.Concurrent.OrderablePartitioner<TSource>,System.Func<TLocal>,System.Func<TSource,System.Threading.Tasks.ParallelLoopState,System.Int64,TLocal,TLocal>,System.Action<TLocal>);summary;df-generated |
+| System.Threading.Tasks;Parallel;ForEach<TSource,TLocal>;(System.Collections.Concurrent.OrderablePartitioner<TSource>,System.Threading.Tasks.ParallelOptions,System.Func<TLocal>,System.Func<TSource,System.Threading.Tasks.ParallelLoopState,System.Int64,TLocal,TLocal>,System.Action<TLocal>);summary;df-generated |
+| System.Threading.Tasks;Parallel;ForEach<TSource,TLocal>;(System.Collections.Concurrent.Partitioner<TSource>,System.Func<TLocal>,System.Func<TSource,System.Threading.Tasks.ParallelLoopState,TLocal,TLocal>,System.Action<TLocal>);summary;df-generated |
+| System.Threading.Tasks;Parallel;ForEach<TSource,TLocal>;(System.Collections.Concurrent.Partitioner<TSource>,System.Threading.Tasks.ParallelOptions,System.Func<TLocal>,System.Func<TSource,System.Threading.Tasks.ParallelLoopState,TLocal,TLocal>,System.Action<TLocal>);summary;df-generated |
+| System.Threading.Tasks;Parallel;ForEach<TSource,TLocal>;(System.Collections.Generic.IEnumerable<TSource>,System.Func<TLocal>,System.Func<TSource,System.Threading.Tasks.ParallelLoopState,System.Int64,TLocal,TLocal>,System.Action<TLocal>);summary;df-generated |
+| System.Threading.Tasks;Parallel;ForEach<TSource,TLocal>;(System.Collections.Generic.IEnumerable<TSource>,System.Func<TLocal>,System.Func<TSource,System.Threading.Tasks.ParallelLoopState,TLocal,TLocal>,System.Action<TLocal>);summary;df-generated |
+| System.Threading.Tasks;Parallel;ForEach<TSource,TLocal>;(System.Collections.Generic.IEnumerable<TSource>,System.Threading.Tasks.ParallelOptions,System.Func<TLocal>,System.Func<TSource,System.Threading.Tasks.ParallelLoopState,System.Int64,TLocal,TLocal>,System.Action<TLocal>);summary;df-generated |
+| System.Threading.Tasks;Parallel;ForEach<TSource,TLocal>;(System.Collections.Generic.IEnumerable<TSource>,System.Threading.Tasks.ParallelOptions,System.Func<TLocal>,System.Func<TSource,System.Threading.Tasks.ParallelLoopState,TLocal,TLocal>,System.Action<TLocal>);summary;df-generated |
+| System.Threading.Tasks;Parallel;ForEach<TSource>;(System.Collections.Concurrent.OrderablePartitioner<TSource>,System.Action<TSource,System.Threading.Tasks.ParallelLoopState,System.Int64>);summary;df-generated |
+| System.Threading.Tasks;Parallel;ForEach<TSource>;(System.Collections.Concurrent.OrderablePartitioner<TSource>,System.Threading.Tasks.ParallelOptions,System.Action<TSource,System.Threading.Tasks.ParallelLoopState,System.Int64>);summary;df-generated |
+| System.Threading.Tasks;Parallel;ForEach<TSource>;(System.Collections.Concurrent.Partitioner<TSource>,System.Action<TSource,System.Threading.Tasks.ParallelLoopState>);summary;df-generated |
+| System.Threading.Tasks;Parallel;ForEach<TSource>;(System.Collections.Concurrent.Partitioner<TSource>,System.Action<TSource>);summary;df-generated |
+| System.Threading.Tasks;Parallel;ForEach<TSource>;(System.Collections.Concurrent.Partitioner<TSource>,System.Threading.Tasks.ParallelOptions,System.Action<TSource,System.Threading.Tasks.ParallelLoopState>);summary;df-generated |
+| System.Threading.Tasks;Parallel;ForEach<TSource>;(System.Collections.Concurrent.Partitioner<TSource>,System.Threading.Tasks.ParallelOptions,System.Action<TSource>);summary;df-generated |
+| System.Threading.Tasks;Parallel;ForEach<TSource>;(System.Collections.Generic.IEnumerable<TSource>,System.Action<TSource,System.Threading.Tasks.ParallelLoopState,System.Int64>);summary;df-generated |
+| System.Threading.Tasks;Parallel;ForEach<TSource>;(System.Collections.Generic.IEnumerable<TSource>,System.Action<TSource,System.Threading.Tasks.ParallelLoopState>);summary;df-generated |
+| System.Threading.Tasks;Parallel;ForEach<TSource>;(System.Collections.Generic.IEnumerable<TSource>,System.Action<TSource>);summary;df-generated |
+| System.Threading.Tasks;Parallel;ForEach<TSource>;(System.Collections.Generic.IEnumerable<TSource>,System.Threading.Tasks.ParallelOptions,System.Action<TSource,System.Threading.Tasks.ParallelLoopState,System.Int64>);summary;df-generated |
+| System.Threading.Tasks;Parallel;ForEach<TSource>;(System.Collections.Generic.IEnumerable<TSource>,System.Threading.Tasks.ParallelOptions,System.Action<TSource,System.Threading.Tasks.ParallelLoopState>);summary;df-generated |
+| System.Threading.Tasks;Parallel;ForEach<TSource>;(System.Collections.Generic.IEnumerable<TSource>,System.Threading.Tasks.ParallelOptions,System.Action<TSource>);summary;df-generated |
+| System.Threading.Tasks;Parallel;ForEachAsync<TSource>;(System.Collections.Generic.IAsyncEnumerable<TSource>,System.Func<TSource,System.Threading.CancellationToken,System.Threading.Tasks.ValueTask>);summary;df-generated |
+| System.Threading.Tasks;Parallel;ForEachAsync<TSource>;(System.Collections.Generic.IAsyncEnumerable<TSource>,System.Threading.CancellationToken,System.Func<TSource,System.Threading.CancellationToken,System.Threading.Tasks.ValueTask>);summary;df-generated |
+| System.Threading.Tasks;Parallel;ForEachAsync<TSource>;(System.Collections.Generic.IAsyncEnumerable<TSource>,System.Threading.Tasks.ParallelOptions,System.Func<TSource,System.Threading.CancellationToken,System.Threading.Tasks.ValueTask>);summary;df-generated |
+| System.Threading.Tasks;Parallel;ForEachAsync<TSource>;(System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,System.Threading.CancellationToken,System.Threading.Tasks.ValueTask>);summary;df-generated |
+| System.Threading.Tasks;Parallel;ForEachAsync<TSource>;(System.Collections.Generic.IEnumerable<TSource>,System.Threading.CancellationToken,System.Func<TSource,System.Threading.CancellationToken,System.Threading.Tasks.ValueTask>);summary;df-generated |
+| System.Threading.Tasks;Parallel;ForEachAsync<TSource>;(System.Collections.Generic.IEnumerable<TSource>,System.Threading.Tasks.ParallelOptions,System.Func<TSource,System.Threading.CancellationToken,System.Threading.Tasks.ValueTask>);summary;df-generated |
 | System.Threading.Tasks;Parallel;Invoke;(System.Action[]);summary;df-generated |
 | System.Threading.Tasks;Parallel;Invoke;(System.Threading.Tasks.ParallelOptions,System.Action[]);summary;df-generated |
 | System.Threading.Tasks;ParallelLoopResult;get_IsCompleted;();summary;df-generated |
@@ -47313,6 +50381,11 @@ neutral
 | System.Threading.Tasks;ParallelLoopState;get_IsExceptional;();summary;df-generated |
 | System.Threading.Tasks;ParallelLoopState;get_IsStopped;();summary;df-generated |
 | System.Threading.Tasks;ParallelLoopState;get_ShouldExitCurrentIteration;();summary;df-generated |
+| System.Threading.Tasks;Task;ContinueWith;(System.Action<System.Threading.Tasks.Task>);summary;df-generated |
+| System.Threading.Tasks;Task;ContinueWith;(System.Action<System.Threading.Tasks.Task>,System.Threading.CancellationToken);summary;df-generated |
+| System.Threading.Tasks;Task;ContinueWith;(System.Action<System.Threading.Tasks.Task>,System.Threading.CancellationToken,System.Threading.Tasks.TaskContinuationOptions,System.Threading.Tasks.TaskScheduler);summary;df-generated |
+| System.Threading.Tasks;Task;ContinueWith;(System.Action<System.Threading.Tasks.Task>,System.Threading.Tasks.TaskContinuationOptions);summary;df-generated |
+| System.Threading.Tasks;Task;ContinueWith;(System.Action<System.Threading.Tasks.Task>,System.Threading.Tasks.TaskScheduler);summary;df-generated |
 | System.Threading.Tasks;Task;Delay;(System.Int32);summary;df-generated |
 | System.Threading.Tasks;Task;Delay;(System.TimeSpan);summary;df-generated |
 | System.Threading.Tasks;Task;Delay;(System.TimeSpan,System.TimeProvider);summary;df-generated |
@@ -47321,10 +50394,18 @@ neutral
 | System.Threading.Tasks;Task;FromCanceled<TResult>;(System.Threading.CancellationToken);summary;df-generated |
 | System.Threading.Tasks;Task;FromException;(System.Exception);summary;df-generated |
 | System.Threading.Tasks;Task;FromException<TResult>;(System.Exception);summary;df-generated |
+| System.Threading.Tasks;Task;Run;(System.Action);summary;df-generated |
+| System.Threading.Tasks;Task;Run;(System.Action,System.Threading.CancellationToken);summary;df-generated |
+| System.Threading.Tasks;Task;Run;(System.Func<System.Threading.Tasks.Task>);summary;df-generated |
+| System.Threading.Tasks;Task;Run;(System.Func<System.Threading.Tasks.Task>,System.Threading.CancellationToken);summary;df-generated |
 | System.Threading.Tasks;Task;RunSynchronously;();summary;df-generated |
 | System.Threading.Tasks;Task;RunSynchronously;(System.Threading.Tasks.TaskScheduler);summary;df-generated |
 | System.Threading.Tasks;Task;Start;();summary;df-generated |
 | System.Threading.Tasks;Task;Start;(System.Threading.Tasks.TaskScheduler);summary;df-generated |
+| System.Threading.Tasks;Task;Task;(System.Action);summary;df-generated |
+| System.Threading.Tasks;Task;Task;(System.Action,System.Threading.CancellationToken);summary;df-generated |
+| System.Threading.Tasks;Task;Task;(System.Action,System.Threading.CancellationToken,System.Threading.Tasks.TaskCreationOptions);summary;df-generated |
+| System.Threading.Tasks;Task;Task;(System.Action,System.Threading.Tasks.TaskCreationOptions);summary;df-generated |
 | System.Threading.Tasks;Task;Wait;();summary;df-generated |
 | System.Threading.Tasks;Task;Wait;(System.Int32);summary;df-generated |
 | System.Threading.Tasks;Task;Wait;(System.Int32,System.Threading.CancellationToken);summary;df-generated |
@@ -47385,9 +50466,30 @@ neutral
 | System.Threading.Tasks;TaskCompletionSource<TResult>;TrySetCanceled;(System.Threading.CancellationToken);summary;df-generated |
 | System.Threading.Tasks;TaskCompletionSource<TResult>;TrySetException;(System.Collections.Generic.IEnumerable<System.Exception>);summary;df-generated |
 | System.Threading.Tasks;TaskCompletionSource<TResult>;TrySetException;(System.Exception);summary;df-generated |
+| System.Threading.Tasks;TaskFactory;ContinueWhenAll;(System.Threading.Tasks.Task[],System.Action<System.Threading.Tasks.Task[]>);summary;df-generated |
+| System.Threading.Tasks;TaskFactory;ContinueWhenAll;(System.Threading.Tasks.Task[],System.Action<System.Threading.Tasks.Task[]>,System.Threading.CancellationToken);summary;df-generated |
+| System.Threading.Tasks;TaskFactory;ContinueWhenAll;(System.Threading.Tasks.Task[],System.Action<System.Threading.Tasks.Task[]>,System.Threading.CancellationToken,System.Threading.Tasks.TaskContinuationOptions,System.Threading.Tasks.TaskScheduler);summary;df-generated |
+| System.Threading.Tasks;TaskFactory;ContinueWhenAll;(System.Threading.Tasks.Task[],System.Action<System.Threading.Tasks.Task[]>,System.Threading.Tasks.TaskContinuationOptions);summary;df-generated |
+| System.Threading.Tasks;TaskFactory;ContinueWhenAny;(System.Threading.Tasks.Task[],System.Action<System.Threading.Tasks.Task>);summary;df-generated |
+| System.Threading.Tasks;TaskFactory;ContinueWhenAny;(System.Threading.Tasks.Task[],System.Action<System.Threading.Tasks.Task>,System.Threading.CancellationToken);summary;df-generated |
+| System.Threading.Tasks;TaskFactory;ContinueWhenAny;(System.Threading.Tasks.Task[],System.Action<System.Threading.Tasks.Task>,System.Threading.CancellationToken,System.Threading.Tasks.TaskContinuationOptions,System.Threading.Tasks.TaskScheduler);summary;df-generated |
+| System.Threading.Tasks;TaskFactory;ContinueWhenAny;(System.Threading.Tasks.Task[],System.Action<System.Threading.Tasks.Task>,System.Threading.Tasks.TaskContinuationOptions);summary;df-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync;(System.IAsyncResult,System.Action<System.IAsyncResult>);summary;df-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync;(System.IAsyncResult,System.Action<System.IAsyncResult>,System.Threading.Tasks.TaskCreationOptions);summary;df-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync;(System.IAsyncResult,System.Action<System.IAsyncResult>,System.Threading.Tasks.TaskCreationOptions,System.Threading.Tasks.TaskScheduler);summary;df-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TResult>;(System.IAsyncResult,System.Func<System.IAsyncResult,TResult>);summary;df-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TResult>;(System.IAsyncResult,System.Func<System.IAsyncResult,TResult>,System.Threading.Tasks.TaskCreationOptions);summary;df-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TResult>;(System.IAsyncResult,System.Func<System.IAsyncResult,TResult>,System.Threading.Tasks.TaskCreationOptions,System.Threading.Tasks.TaskScheduler);summary;df-generated |
+| System.Threading.Tasks;TaskFactory;StartNew;(System.Action);summary;df-generated |
+| System.Threading.Tasks;TaskFactory;StartNew;(System.Action,System.Threading.CancellationToken);summary;df-generated |
+| System.Threading.Tasks;TaskFactory;StartNew;(System.Action,System.Threading.CancellationToken,System.Threading.Tasks.TaskCreationOptions,System.Threading.Tasks.TaskScheduler);summary;df-generated |
+| System.Threading.Tasks;TaskFactory;StartNew;(System.Action,System.Threading.Tasks.TaskCreationOptions);summary;df-generated |
 | System.Threading.Tasks;TaskFactory;TaskFactory;(System.Threading.Tasks.TaskCreationOptions,System.Threading.Tasks.TaskContinuationOptions);summary;df-generated |
 | System.Threading.Tasks;TaskFactory;get_ContinuationOptions;();summary;df-generated |
 | System.Threading.Tasks;TaskFactory;get_CreationOptions;();summary;df-generated |
+| System.Threading.Tasks;TaskFactory<TResult>;FromAsync;(System.IAsyncResult,System.Func<System.IAsyncResult,TResult>);summary;df-generated |
+| System.Threading.Tasks;TaskFactory<TResult>;FromAsync;(System.IAsyncResult,System.Func<System.IAsyncResult,TResult>,System.Threading.Tasks.TaskCreationOptions);summary;df-generated |
+| System.Threading.Tasks;TaskFactory<TResult>;FromAsync;(System.IAsyncResult,System.Func<System.IAsyncResult,TResult>,System.Threading.Tasks.TaskCreationOptions,System.Threading.Tasks.TaskScheduler);summary;df-generated |
 | System.Threading.Tasks;TaskFactory<TResult>;TaskFactory;(System.Threading.Tasks.TaskCreationOptions,System.Threading.Tasks.TaskContinuationOptions);summary;df-generated |
 | System.Threading.Tasks;TaskFactory<TResult>;get_ContinuationOptions;();summary;df-generated |
 | System.Threading.Tasks;TaskFactory<TResult>;get_CreationOptions;();summary;df-generated |
@@ -47396,10 +50498,12 @@ neutral
 | System.Threading.Tasks;TaskScheduler;TryDequeue;(System.Threading.Tasks.Task);summary;df-generated |
 | System.Threading.Tasks;TaskScheduler;TryExecuteTask;(System.Threading.Tasks.Task);summary;df-generated |
 | System.Threading.Tasks;TaskScheduler;TryExecuteTaskInline;(System.Threading.Tasks.Task,System.Boolean);summary;df-generated |
+| System.Threading.Tasks;TaskScheduler;add_UnobservedTaskException;(System.EventHandler<System.Threading.Tasks.UnobservedTaskExceptionEventArgs>);summary;df-generated |
 | System.Threading.Tasks;TaskScheduler;get_Current;();summary;df-generated |
 | System.Threading.Tasks;TaskScheduler;get_Default;();summary;df-generated |
 | System.Threading.Tasks;TaskScheduler;get_Id;();summary;df-generated |
 | System.Threading.Tasks;TaskScheduler;get_MaximumConcurrencyLevel;();summary;df-generated |
+| System.Threading.Tasks;TaskScheduler;remove_UnobservedTaskException;(System.EventHandler<System.Threading.Tasks.UnobservedTaskExceptionEventArgs>);summary;df-generated |
 | System.Threading.Tasks;TaskSchedulerException;TaskSchedulerException;(System.Exception);summary;df-generated |
 | System.Threading.Tasks;TaskSchedulerException;TaskSchedulerException;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);summary;df-generated |
 | System.Threading.Tasks;TaskSchedulerException;TaskSchedulerException;(System.String);summary;df-generated |
@@ -47444,10 +50548,12 @@ neutral
 | System.Threading;AsyncFlowControl;Undo;();summary;df-generated |
 | System.Threading;AsyncFlowControl;op_Equality;(System.Threading.AsyncFlowControl,System.Threading.AsyncFlowControl);summary;df-generated |
 | System.Threading;AsyncFlowControl;op_Inequality;(System.Threading.AsyncFlowControl,System.Threading.AsyncFlowControl);summary;df-generated |
+| System.Threading;AsyncLocal<T>;AsyncLocal;(System.Action<System.Threading.AsyncLocalValueChangedArgs<T>>);summary;df-generated |
 | System.Threading;AutoResetEvent;AutoResetEvent;(System.Boolean);summary;df-generated |
 | System.Threading;Barrier;AddParticipant;();summary;df-generated |
 | System.Threading;Barrier;AddParticipants;(System.Int32);summary;df-generated |
 | System.Threading;Barrier;Barrier;(System.Int32);summary;df-generated |
+| System.Threading;Barrier;Barrier;(System.Int32,System.Action<System.Threading.Barrier>);summary;df-generated |
 | System.Threading;Barrier;Dispose;();summary;df-generated |
 | System.Threading;Barrier;Dispose;(System.Boolean);summary;df-generated |
 | System.Threading;Barrier;RemoveParticipant;();summary;df-generated |
@@ -47468,6 +50574,8 @@ neutral
 | System.Threading;CancellationToken;Equals;(System.Object);summary;df-generated |
 | System.Threading;CancellationToken;Equals;(System.Threading.CancellationToken);summary;df-generated |
 | System.Threading;CancellationToken;GetHashCode;();summary;df-generated |
+| System.Threading;CancellationToken;Register;(System.Action);summary;df-generated |
+| System.Threading;CancellationToken;Register;(System.Action,System.Boolean);summary;df-generated |
 | System.Threading;CancellationToken;ThrowIfCancellationRequested;();summary;df-generated |
 | System.Threading;CancellationToken;get_CanBeCanceled;();summary;df-generated |
 | System.Threading;CancellationToken;get_IsCancellationRequested;();summary;df-generated |
@@ -47550,13 +50658,10 @@ neutral
 | System.Threading;Interlocked;CompareExchange;(System.Double,System.Double,System.Double);summary;df-generated |
 | System.Threading;Interlocked;CompareExchange;(System.Int32,System.Int32,System.Int32);summary;df-generated |
 | System.Threading;Interlocked;CompareExchange;(System.Int64,System.Int64,System.Int64);summary;df-generated |
-| System.Threading;Interlocked;CompareExchange;(System.IntPtr,System.IntPtr,System.IntPtr);summary;df-generated |
 | System.Threading;Interlocked;CompareExchange;(System.Object,System.Object,System.Object);summary;df-generated |
 | System.Threading;Interlocked;CompareExchange;(System.Single,System.Single,System.Single);summary;df-generated |
 | System.Threading;Interlocked;CompareExchange;(System.UInt32,System.UInt32,System.UInt32);summary;df-generated |
 | System.Threading;Interlocked;CompareExchange;(System.UInt64,System.UInt64,System.UInt64);summary;df-generated |
-| System.Threading;Interlocked;CompareExchange;(System.UIntPtr,System.UIntPtr,System.UIntPtr);summary;df-generated |
-| System.Threading;Interlocked;CompareExchange<T>;(T,T,T);summary;df-generated |
 | System.Threading;Interlocked;Decrement;(System.Int32);summary;df-generated |
 | System.Threading;Interlocked;Decrement;(System.Int64);summary;df-generated |
 | System.Threading;Interlocked;Decrement;(System.UInt32);summary;df-generated |
@@ -47564,13 +50669,10 @@ neutral
 | System.Threading;Interlocked;Exchange;(System.Double,System.Double);summary;df-generated |
 | System.Threading;Interlocked;Exchange;(System.Int32,System.Int32);summary;df-generated |
 | System.Threading;Interlocked;Exchange;(System.Int64,System.Int64);summary;df-generated |
-| System.Threading;Interlocked;Exchange;(System.IntPtr,System.IntPtr);summary;df-generated |
 | System.Threading;Interlocked;Exchange;(System.Object,System.Object);summary;df-generated |
 | System.Threading;Interlocked;Exchange;(System.Single,System.Single);summary;df-generated |
 | System.Threading;Interlocked;Exchange;(System.UInt32,System.UInt32);summary;df-generated |
 | System.Threading;Interlocked;Exchange;(System.UInt64,System.UInt64);summary;df-generated |
-| System.Threading;Interlocked;Exchange;(System.UIntPtr,System.UIntPtr);summary;df-generated |
-| System.Threading;Interlocked;Exchange<T>;(T,T);summary;df-generated |
 | System.Threading;Interlocked;Increment;(System.Int32);summary;df-generated |
 | System.Threading;Interlocked;Increment;(System.Int64);summary;df-generated |
 | System.Threading;Interlocked;Increment;(System.UInt32);summary;df-generated |
@@ -47627,22 +50729,25 @@ neutral
 | System.Threading;Mutex;Mutex;(System.Boolean,System.String,System.Boolean);summary;df-generated |
 | System.Threading;Mutex;OpenExisting;(System.String);summary;df-generated |
 | System.Threading;Mutex;ReleaseMutex;();summary;df-generated |
-| System.Threading;Mutex;TryOpenExisting;(System.String,System.Threading.Mutex);summary;df-generated |
 | System.Threading;Overlapped;Free;(System.Threading.NativeOverlapped*);summary;df-generated |
 | System.Threading;Overlapped;Overlapped;(System.Int32,System.Int32,System.Int32,System.IAsyncResult);summary;df-generated |
+| System.Threading;Overlapped;Pack;(System.Threading.IOCompletionCallback);summary;df-generated |
+| System.Threading;Overlapped;Pack;(System.Threading.IOCompletionCallback,System.Object);summary;df-generated |
 | System.Threading;Overlapped;Unpack;(System.Threading.NativeOverlapped*);summary;df-generated |
+| System.Threading;Overlapped;UnsafePack;(System.Threading.IOCompletionCallback);summary;df-generated |
+| System.Threading;Overlapped;UnsafePack;(System.Threading.IOCompletionCallback,System.Object);summary;df-generated |
 | System.Threading;PeriodicTimer;Dispose;();summary;df-generated |
 | System.Threading;PreAllocatedOverlapped;Dispose;();summary;df-generated |
+| System.Threading;PreAllocatedOverlapped;PreAllocatedOverlapped;(System.Threading.IOCompletionCallback,System.Object,System.Object);summary;df-generated |
+| System.Threading;PreAllocatedOverlapped;UnsafeCreate;(System.Threading.IOCompletionCallback,System.Object,System.Object);summary;df-generated |
 | System.Threading;ReaderWriterLock;AcquireReaderLock;(System.Int32);summary;df-generated |
 | System.Threading;ReaderWriterLock;AcquireReaderLock;(System.TimeSpan);summary;df-generated |
 | System.Threading;ReaderWriterLock;AcquireWriterLock;(System.Int32);summary;df-generated |
 | System.Threading;ReaderWriterLock;AcquireWriterLock;(System.TimeSpan);summary;df-generated |
 | System.Threading;ReaderWriterLock;AnyWritersSince;(System.Int32);summary;df-generated |
-| System.Threading;ReaderWriterLock;DowngradeFromWriterLock;(System.Threading.LockCookie);summary;df-generated |
 | System.Threading;ReaderWriterLock;ReleaseLock;();summary;df-generated |
 | System.Threading;ReaderWriterLock;ReleaseReaderLock;();summary;df-generated |
 | System.Threading;ReaderWriterLock;ReleaseWriterLock;();summary;df-generated |
-| System.Threading;ReaderWriterLock;RestoreLock;(System.Threading.LockCookie);summary;df-generated |
 | System.Threading;ReaderWriterLock;UpgradeToWriterLock;(System.Int32);summary;df-generated |
 | System.Threading;ReaderWriterLock;UpgradeToWriterLock;(System.TimeSpan);summary;df-generated |
 | System.Threading;ReaderWriterLock;get_IsReaderLockHeld;();summary;df-generated |
@@ -47709,11 +50814,15 @@ neutral
 | System.Threading;SpinWait;Reset;();summary;df-generated |
 | System.Threading;SpinWait;SpinOnce;();summary;df-generated |
 | System.Threading;SpinWait;SpinOnce;(System.Int32);summary;df-generated |
+| System.Threading;SpinWait;SpinUntil;(System.Func<System.Boolean>);summary;df-generated |
+| System.Threading;SpinWait;SpinUntil;(System.Func<System.Boolean>,System.Int32);summary;df-generated |
+| System.Threading;SpinWait;SpinUntil;(System.Func<System.Boolean>,System.TimeSpan);summary;df-generated |
 | System.Threading;SpinWait;get_NextSpinWillYield;();summary;df-generated |
 | System.Threading;SynchronizationContext;CreateCopy;();summary;df-generated |
 | System.Threading;SynchronizationContext;IsWaitNotificationRequired;();summary;df-generated |
 | System.Threading;SynchronizationContext;OperationCompleted;();summary;df-generated |
 | System.Threading;SynchronizationContext;OperationStarted;();summary;df-generated |
+| System.Threading;SynchronizationContext;Post;(System.Threading.SendOrPostCallback,System.Object);summary;df-generated |
 | System.Threading;SynchronizationContext;SetSynchronizationContext;(System.Threading.SynchronizationContext);summary;df-generated |
 | System.Threading;SynchronizationContext;SetWaitNotificationRequired;();summary;df-generated |
 | System.Threading;SynchronizationContext;Wait;(System.IntPtr[],System.Boolean,System.Int32);summary;df-generated |
@@ -47754,6 +50863,10 @@ neutral
 | System.Threading;Thread;Start;();summary;df-generated |
 | System.Threading;Thread;Start;(System.Object);summary;df-generated |
 | System.Threading;Thread;Suspend;();summary;df-generated |
+| System.Threading;Thread;Thread;(System.Threading.ParameterizedThreadStart);summary;df-generated |
+| System.Threading;Thread;Thread;(System.Threading.ParameterizedThreadStart,System.Int32);summary;df-generated |
+| System.Threading;Thread;Thread;(System.Threading.ThreadStart);summary;df-generated |
+| System.Threading;Thread;Thread;(System.Threading.ThreadStart,System.Int32);summary;df-generated |
 | System.Threading;Thread;TrySetApartmentState;(System.Threading.ApartmentState);summary;df-generated |
 | System.Threading;Thread;UnsafeStart;();summary;df-generated |
 | System.Threading;Thread;UnsafeStart;(System.Object);summary;df-generated |
@@ -47762,27 +50875,21 @@ neutral
 | System.Threading;Thread;VolatileRead;(System.Int16);summary;df-generated |
 | System.Threading;Thread;VolatileRead;(System.Int32);summary;df-generated |
 | System.Threading;Thread;VolatileRead;(System.Int64);summary;df-generated |
-| System.Threading;Thread;VolatileRead;(System.IntPtr);summary;df-generated |
-| System.Threading;Thread;VolatileRead;(System.Object);summary;df-generated |
 | System.Threading;Thread;VolatileRead;(System.SByte);summary;df-generated |
 | System.Threading;Thread;VolatileRead;(System.Single);summary;df-generated |
 | System.Threading;Thread;VolatileRead;(System.UInt16);summary;df-generated |
 | System.Threading;Thread;VolatileRead;(System.UInt32);summary;df-generated |
 | System.Threading;Thread;VolatileRead;(System.UInt64);summary;df-generated |
-| System.Threading;Thread;VolatileRead;(System.UIntPtr);summary;df-generated |
 | System.Threading;Thread;VolatileWrite;(System.Byte,System.Byte);summary;df-generated |
 | System.Threading;Thread;VolatileWrite;(System.Double,System.Double);summary;df-generated |
 | System.Threading;Thread;VolatileWrite;(System.Int16,System.Int16);summary;df-generated |
 | System.Threading;Thread;VolatileWrite;(System.Int32,System.Int32);summary;df-generated |
 | System.Threading;Thread;VolatileWrite;(System.Int64,System.Int64);summary;df-generated |
-| System.Threading;Thread;VolatileWrite;(System.IntPtr,System.IntPtr);summary;df-generated |
-| System.Threading;Thread;VolatileWrite;(System.Object,System.Object);summary;df-generated |
 | System.Threading;Thread;VolatileWrite;(System.SByte,System.SByte);summary;df-generated |
 | System.Threading;Thread;VolatileWrite;(System.Single,System.Single);summary;df-generated |
 | System.Threading;Thread;VolatileWrite;(System.UInt16,System.UInt16);summary;df-generated |
 | System.Threading;Thread;VolatileWrite;(System.UInt32,System.UInt32);summary;df-generated |
 | System.Threading;Thread;VolatileWrite;(System.UInt64,System.UInt64);summary;df-generated |
-| System.Threading;Thread;VolatileWrite;(System.UIntPtr,System.UIntPtr);summary;df-generated |
 | System.Threading;Thread;Yield;();summary;df-generated |
 | System.Threading;Thread;get_CurrentThread;();summary;df-generated |
 | System.Threading;Thread;get_ExecutionContext;();summary;df-generated |
@@ -47796,6 +50903,8 @@ neutral
 | System.Threading;ThreadLocal<T>;Dispose;();summary;df-generated |
 | System.Threading;ThreadLocal<T>;Dispose;(System.Boolean);summary;df-generated |
 | System.Threading;ThreadLocal<T>;ThreadLocal;(System.Boolean);summary;df-generated |
+| System.Threading;ThreadLocal<T>;ThreadLocal;(System.Func<T>);summary;df-generated |
+| System.Threading;ThreadLocal<T>;ThreadLocal;(System.Func<T>,System.Boolean);summary;df-generated |
 | System.Threading;ThreadLocal<T>;get_IsValueCreated;();summary;df-generated |
 | System.Threading;ThreadLocal<T>;get_Values;();summary;df-generated |
 | System.Threading;ThreadPool;BindHandle;(System.IntPtr);summary;df-generated |
@@ -47803,17 +50912,32 @@ neutral
 | System.Threading;ThreadPool;GetAvailableThreads;(System.Int32,System.Int32);summary;df-generated |
 | System.Threading;ThreadPool;GetMaxThreads;(System.Int32,System.Int32);summary;df-generated |
 | System.Threading;ThreadPool;GetMinThreads;(System.Int32,System.Int32);summary;df-generated |
+| System.Threading;ThreadPool;QueueUserWorkItem;(System.Threading.WaitCallback);summary;df-generated |
+| System.Threading;ThreadPool;QueueUserWorkItem;(System.Threading.WaitCallback,System.Object);summary;df-generated |
+| System.Threading;ThreadPool;QueueUserWorkItem<TState>;(System.Action<TState>,TState,System.Boolean);summary;df-generated |
+| System.Threading;ThreadPool;RegisterWaitForSingleObject;(System.Threading.WaitHandle,System.Threading.WaitOrTimerCallback,System.Object,System.Int32,System.Boolean);summary;df-generated |
+| System.Threading;ThreadPool;RegisterWaitForSingleObject;(System.Threading.WaitHandle,System.Threading.WaitOrTimerCallback,System.Object,System.Int64,System.Boolean);summary;df-generated |
+| System.Threading;ThreadPool;RegisterWaitForSingleObject;(System.Threading.WaitHandle,System.Threading.WaitOrTimerCallback,System.Object,System.TimeSpan,System.Boolean);summary;df-generated |
+| System.Threading;ThreadPool;RegisterWaitForSingleObject;(System.Threading.WaitHandle,System.Threading.WaitOrTimerCallback,System.Object,System.UInt32,System.Boolean);summary;df-generated |
 | System.Threading;ThreadPool;SetMaxThreads;(System.Int32,System.Int32);summary;df-generated |
 | System.Threading;ThreadPool;SetMinThreads;(System.Int32,System.Int32);summary;df-generated |
 | System.Threading;ThreadPool;UnsafeQueueNativeOverlapped;(System.Threading.NativeOverlapped*);summary;df-generated |
 | System.Threading;ThreadPool;UnsafeQueueUserWorkItem;(System.Threading.IThreadPoolWorkItem,System.Boolean);summary;df-generated |
+| System.Threading;ThreadPool;UnsafeQueueUserWorkItem;(System.Threading.WaitCallback,System.Object);summary;df-generated |
+| System.Threading;ThreadPool;UnsafeQueueUserWorkItem<TState>;(System.Action<TState>,TState,System.Boolean);summary;df-generated |
+| System.Threading;ThreadPool;UnsafeRegisterWaitForSingleObject;(System.Threading.WaitHandle,System.Threading.WaitOrTimerCallback,System.Object,System.Int32,System.Boolean);summary;df-generated |
+| System.Threading;ThreadPool;UnsafeRegisterWaitForSingleObject;(System.Threading.WaitHandle,System.Threading.WaitOrTimerCallback,System.Object,System.Int64,System.Boolean);summary;df-generated |
+| System.Threading;ThreadPool;UnsafeRegisterWaitForSingleObject;(System.Threading.WaitHandle,System.Threading.WaitOrTimerCallback,System.Object,System.TimeSpan,System.Boolean);summary;df-generated |
+| System.Threading;ThreadPool;UnsafeRegisterWaitForSingleObject;(System.Threading.WaitHandle,System.Threading.WaitOrTimerCallback,System.Object,System.UInt32,System.Boolean);summary;df-generated |
 | System.Threading;ThreadPool;get_CompletedWorkItemCount;();summary;df-generated |
 | System.Threading;ThreadPool;get_PendingWorkItemCount;();summary;df-generated |
 | System.Threading;ThreadPool;get_ThreadCount;();summary;df-generated |
+| System.Threading;ThreadPoolBoundHandle;AllocateNativeOverlapped;(System.Threading.IOCompletionCallback,System.Object,System.Object);summary;df-generated |
 | System.Threading;ThreadPoolBoundHandle;BindHandle;(System.Runtime.InteropServices.SafeHandle);summary;df-generated |
 | System.Threading;ThreadPoolBoundHandle;Dispose;();summary;df-generated |
 | System.Threading;ThreadPoolBoundHandle;FreeNativeOverlapped;(System.Threading.NativeOverlapped*);summary;df-generated |
 | System.Threading;ThreadPoolBoundHandle;GetNativeOverlappedState;(System.Threading.NativeOverlapped*);summary;df-generated |
+| System.Threading;ThreadPoolBoundHandle;UnsafeAllocateNativeOverlapped;(System.Threading.IOCompletionCallback,System.Object,System.Object);summary;df-generated |
 | System.Threading;ThreadStateException;ThreadStateException;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);summary;df-generated |
 | System.Threading;ThreadStateException;ThreadStateException;(System.String);summary;df-generated |
 | System.Threading;ThreadStateException;ThreadStateException;(System.String,System.Exception);summary;df-generated |
@@ -47823,6 +50947,11 @@ neutral
 | System.Threading;Timer;Change;(System.UInt32,System.UInt32);summary;df-generated |
 | System.Threading;Timer;Dispose;();summary;df-generated |
 | System.Threading;Timer;Dispose;(System.Threading.WaitHandle);summary;df-generated |
+| System.Threading;Timer;Timer;(System.Threading.TimerCallback);summary;df-generated |
+| System.Threading;Timer;Timer;(System.Threading.TimerCallback,System.Object,System.Int32,System.Int32);summary;df-generated |
+| System.Threading;Timer;Timer;(System.Threading.TimerCallback,System.Object,System.Int64,System.Int64);summary;df-generated |
+| System.Threading;Timer;Timer;(System.Threading.TimerCallback,System.Object,System.TimeSpan,System.TimeSpan);summary;df-generated |
+| System.Threading;Timer;Timer;(System.Threading.TimerCallback,System.Object,System.UInt32,System.UInt32);summary;df-generated |
 | System.Threading;Timer;get_ActiveCount;();summary;df-generated |
 | System.Threading;Volatile;Read;(System.Boolean);summary;df-generated |
 | System.Threading;Volatile;Read;(System.Byte);summary;df-generated |
@@ -47844,14 +50973,11 @@ neutral
 | System.Threading;Volatile;Write;(System.Int16,System.Int16);summary;df-generated |
 | System.Threading;Volatile;Write;(System.Int32,System.Int32);summary;df-generated |
 | System.Threading;Volatile;Write;(System.Int64,System.Int64);summary;df-generated |
-| System.Threading;Volatile;Write;(System.IntPtr,System.IntPtr);summary;df-generated |
 | System.Threading;Volatile;Write;(System.SByte,System.SByte);summary;df-generated |
 | System.Threading;Volatile;Write;(System.Single,System.Single);summary;df-generated |
 | System.Threading;Volatile;Write;(System.UInt16,System.UInt16);summary;df-generated |
 | System.Threading;Volatile;Write;(System.UInt32,System.UInt32);summary;df-generated |
 | System.Threading;Volatile;Write;(System.UInt64,System.UInt64);summary;df-generated |
-| System.Threading;Volatile;Write;(System.UIntPtr,System.UIntPtr);summary;df-generated |
-| System.Threading;Volatile;Write<T>;(T,T);summary;df-generated |
 | System.Threading;WaitHandle;Close;();summary;df-generated |
 | System.Threading;WaitHandle;Dispose;();summary;df-generated |
 | System.Threading;WaitHandle;Dispose;(System.Boolean);summary;df-generated |
@@ -47885,6 +51011,8 @@ neutral
 | System.Timers;Timer;Stop;();summary;df-generated |
 | System.Timers;Timer;Timer;(System.Double);summary;df-generated |
 | System.Timers;Timer;Timer;(System.TimeSpan);summary;df-generated |
+| System.Timers;Timer;add_Elapsed;(System.Timers.ElapsedEventHandler);summary;df-generated |
+| System.Timers;Timer;remove_Elapsed;(System.Timers.ElapsedEventHandler);summary;df-generated |
 | System.Timers;TimersDescriptionAttribute;TimersDescriptionAttribute;(System.String);summary;df-generated |
 | System.Transactions;CommittableTransaction;Commit;();summary;df-generated |
 | System.Transactions;CommittableTransaction;CommittableTransaction;(System.TimeSpan);summary;df-generated |
@@ -47931,9 +51059,11 @@ neutral
 | System.Transactions;Transaction;GetHashCode;();summary;df-generated |
 | System.Transactions;Transaction;GetPromotedToken;();summary;df-generated |
 | System.Transactions;Transaction;Rollback;();summary;df-generated |
+| System.Transactions;Transaction;add_TransactionCompleted;(System.Transactions.TransactionCompletedEventHandler);summary;df-generated |
 | System.Transactions;Transaction;get_IsolationLevel;();summary;df-generated |
 | System.Transactions;Transaction;op_Equality;(System.Transactions.Transaction,System.Transactions.Transaction);summary;df-generated |
 | System.Transactions;Transaction;op_Inequality;(System.Transactions.Transaction,System.Transactions.Transaction);summary;df-generated |
+| System.Transactions;Transaction;remove_TransactionCompleted;(System.Transactions.TransactionCompletedEventHandler);summary;df-generated |
 | System.Transactions;TransactionAbortedException;TransactionAbortedException;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);summary;df-generated |
 | System.Transactions;TransactionAbortedException;TransactionAbortedException;(System.String);summary;df-generated |
 | System.Transactions;TransactionAbortedException;TransactionAbortedException;(System.String,System.Exception);summary;df-generated |
@@ -47955,6 +51085,8 @@ neutral
 | System.Transactions;TransactionInterop;GetWhereabouts;();summary;df-generated |
 | System.Transactions;TransactionManager;RecoveryComplete;(System.Guid);summary;df-generated |
 | System.Transactions;TransactionManager;Reenlist;(System.Guid,System.Byte[],System.Transactions.IEnlistmentNotification);summary;df-generated |
+| System.Transactions;TransactionManager;add_DistributedTransactionStarted;(System.Transactions.TransactionStartedEventHandler);summary;df-generated |
+| System.Transactions;TransactionManager;remove_DistributedTransactionStarted;(System.Transactions.TransactionStartedEventHandler);summary;df-generated |
 | System.Transactions;TransactionManagerCommunicationException;TransactionManagerCommunicationException;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);summary;df-generated |
 | System.Transactions;TransactionManagerCommunicationException;TransactionManagerCommunicationException;(System.String);summary;df-generated |
 | System.Transactions;TransactionManagerCommunicationException;TransactionManagerCommunicationException;(System.String,System.Exception);summary;df-generated |
@@ -47986,6 +51118,8 @@ neutral
 | System.Web;AspNetHostingPermission;ToXml;();summary;df-generated |
 | System.Web;AspNetHostingPermissionAttribute;AspNetHostingPermissionAttribute;(System.Security.Permissions.SecurityAction);summary;df-generated |
 | System.Web;AspNetHostingPermissionAttribute;CreatePermission;();summary;df-generated |
+| System.Web;HtmlString;ToHtmlString;();summary;df-generated |
+| System.Web;HttpUtility;HtmlDecode;(System.String,System.IO.TextWriter);summary;df-generated |
 | System.Web;HttpUtility;ParseQueryString;(System.String);summary;df-generated |
 | System.Web;HttpUtility;ParseQueryString;(System.String,System.Text.Encoding);summary;df-generated |
 | System.Web;HttpUtility;UrlDecode;(System.Byte[],System.Int32,System.Int32,System.Text.Encoding);summary;df-generated |
@@ -48001,6 +51135,8 @@ neutral
 | System.Web;IHtmlString;ToHtmlString;();summary;df-generated |
 | System.Windows.Input;ICommand;CanExecute;(System.Object);summary;df-generated |
 | System.Windows.Input;ICommand;Execute;(System.Object);summary;df-generated |
+| System.Windows.Input;ICommand;add_CanExecuteChanged;(System.EventHandler);summary;df-generated |
+| System.Windows.Input;ICommand;remove_CanExecuteChanged;(System.EventHandler);summary;df-generated |
 | System.Windows.Markup;ValueSerializerAttribute;ValueSerializerAttribute;(System.Type);summary;df-generated |
 | System.Windows.Markup;ValueSerializerAttribute;get_ValueSerializerType;();summary;df-generated |
 | System.Xaml.Permissions;XamlAccessLevel;AssemblyAccessTo;(System.Reflection.Assembly);summary;df-generated |
@@ -48030,6 +51166,7 @@ neutral
 | System.Xml.Linq;XCData;get_NodeType;();summary;df-generated |
 | System.Xml.Linq;XComment;get_NodeType;();summary;df-generated |
 | System.Xml.Linq;XContainer;AddFirst;(System.Object[]);summary;df-generated |
+| System.Xml.Linq;XContainer;CreateWriter;();summary;df-generated |
 | System.Xml.Linq;XContainer;RemoveNodes;();summary;df-generated |
 | System.Xml.Linq;XDocument;LoadAsync;(System.IO.Stream,System.Xml.Linq.LoadOptions,System.Threading.CancellationToken);summary;df-generated |
 | System.Xml.Linq;XDocument;LoadAsync;(System.IO.TextReader,System.Xml.Linq.LoadOptions,System.Threading.CancellationToken);summary;df-generated |
@@ -48062,6 +51199,7 @@ neutral
 | System.Xml.Linq;XElement;Save;(System.Xml.XmlWriter);summary;df-generated |
 | System.Xml.Linq;XElement;SaveAsync;(System.IO.Stream,System.Xml.Linq.SaveOptions,System.Threading.CancellationToken);summary;df-generated |
 | System.Xml.Linq;XElement;SaveAsync;(System.IO.TextWriter,System.Xml.Linq.SaveOptions,System.Threading.CancellationToken);summary;df-generated |
+| System.Xml.Linq;XElement;SaveAsync;(System.Xml.XmlWriter,System.Threading.CancellationToken);summary;df-generated |
 | System.Xml.Linq;XElement;XElement;(System.Xml.Linq.XName,System.Object[]);summary;df-generated |
 | System.Xml.Linq;XElement;get_EmptySequence;();summary;df-generated |
 | System.Xml.Linq;XElement;get_HasAttributes;();summary;df-generated |
@@ -48070,6 +51208,8 @@ neutral
 | System.Xml.Linq;XElement;get_NodeType;();summary;df-generated |
 | System.Xml.Linq;XName;Equals;(System.Object);summary;df-generated |
 | System.Xml.Linq;XName;Equals;(System.Xml.Linq.XName);summary;df-generated |
+| System.Xml.Linq;XName;Get;(System.String);summary;df-generated |
+| System.Xml.Linq;XName;Get;(System.String,System.String);summary;df-generated |
 | System.Xml.Linq;XName;GetHashCode;();summary;df-generated |
 | System.Xml.Linq;XName;op_Equality;(System.Xml.Linq.XName,System.Xml.Linq.XName);summary;df-generated |
 | System.Xml.Linq;XName;op_Inequality;(System.Xml.Linq.XName,System.Xml.Linq.XName);summary;df-generated |
@@ -48098,18 +51238,19 @@ neutral
 | System.Xml.Linq;XNode;get_DocumentOrderComparer;();summary;df-generated |
 | System.Xml.Linq;XNode;get_EqualityComparer;();summary;df-generated |
 | System.Xml.Linq;XNode;get_PreviousNode;();summary;df-generated |
-| System.Xml.Linq;XNodeDocumentOrderComparer;Compare;(System.Object,System.Object);summary;df-generated |
 | System.Xml.Linq;XNodeDocumentOrderComparer;Compare;(System.Xml.Linq.XNode,System.Xml.Linq.XNode);summary;df-generated |
-| System.Xml.Linq;XNodeEqualityComparer;Equals;(System.Object,System.Object);summary;df-generated |
 | System.Xml.Linq;XNodeEqualityComparer;Equals;(System.Xml.Linq.XNode,System.Xml.Linq.XNode);summary;df-generated |
-| System.Xml.Linq;XNodeEqualityComparer;GetHashCode;(System.Object);summary;df-generated |
 | System.Xml.Linq;XNodeEqualityComparer;GetHashCode;(System.Xml.Linq.XNode);summary;df-generated |
 | System.Xml.Linq;XObject;HasLineInfo;();summary;df-generated |
 | System.Xml.Linq;XObject;RemoveAnnotations;(System.Type);summary;df-generated |
 | System.Xml.Linq;XObject;RemoveAnnotations<T>;();summary;df-generated |
+| System.Xml.Linq;XObject;add_Changed;(System.EventHandler<System.Xml.Linq.XObjectChangeEventArgs>);summary;df-generated |
+| System.Xml.Linq;XObject;add_Changing;(System.EventHandler<System.Xml.Linq.XObjectChangeEventArgs>);summary;df-generated |
 | System.Xml.Linq;XObject;get_LineNumber;();summary;df-generated |
 | System.Xml.Linq;XObject;get_LinePosition;();summary;df-generated |
 | System.Xml.Linq;XObject;get_NodeType;();summary;df-generated |
+| System.Xml.Linq;XObject;remove_Changed;(System.EventHandler<System.Xml.Linq.XObjectChangeEventArgs>);summary;df-generated |
+| System.Xml.Linq;XObject;remove_Changing;(System.EventHandler<System.Xml.Linq.XObjectChangeEventArgs>);summary;df-generated |
 | System.Xml.Linq;XObjectChangeEventArgs;XObjectChangeEventArgs;(System.Xml.Linq.XObjectChange);summary;df-generated |
 | System.Xml.Linq;XObjectChangeEventArgs;get_ObjectChange;();summary;df-generated |
 | System.Xml.Linq;XProcessingInstruction;get_NodeType;();summary;df-generated |
@@ -48135,6 +51276,12 @@ neutral
 | System.Xml.Resolvers;XmlPreloadedResolver;XmlPreloadedResolver;(System.Xml.Resolvers.XmlKnownDtds);summary;df-generated |
 | System.Xml.Resolvers;XmlPreloadedResolver;XmlPreloadedResolver;(System.Xml.XmlResolver);summary;df-generated |
 | System.Xml.Resolvers;XmlPreloadedResolver;XmlPreloadedResolver;(System.Xml.XmlResolver,System.Xml.Resolvers.XmlKnownDtds);summary;df-generated |
+| System.Xml.Schema;Extensions;Validate;(System.Xml.Linq.XAttribute,System.Xml.Schema.XmlSchemaObject,System.Xml.Schema.XmlSchemaSet,System.Xml.Schema.ValidationEventHandler);summary;df-generated |
+| System.Xml.Schema;Extensions;Validate;(System.Xml.Linq.XAttribute,System.Xml.Schema.XmlSchemaObject,System.Xml.Schema.XmlSchemaSet,System.Xml.Schema.ValidationEventHandler,System.Boolean);summary;df-generated |
+| System.Xml.Schema;Extensions;Validate;(System.Xml.Linq.XDocument,System.Xml.Schema.XmlSchemaSet,System.Xml.Schema.ValidationEventHandler);summary;df-generated |
+| System.Xml.Schema;Extensions;Validate;(System.Xml.Linq.XDocument,System.Xml.Schema.XmlSchemaSet,System.Xml.Schema.ValidationEventHandler,System.Boolean);summary;df-generated |
+| System.Xml.Schema;Extensions;Validate;(System.Xml.Linq.XElement,System.Xml.Schema.XmlSchemaObject,System.Xml.Schema.XmlSchemaSet,System.Xml.Schema.ValidationEventHandler);summary;df-generated |
+| System.Xml.Schema;Extensions;Validate;(System.Xml.Linq.XElement,System.Xml.Schema.XmlSchemaObject,System.Xml.Schema.XmlSchemaSet,System.Xml.Schema.ValidationEventHandler,System.Boolean);summary;df-generated |
 | System.Xml.Schema;IXmlSchemaInfo;get_IsDefault;();summary;df-generated |
 | System.Xml.Schema;IXmlSchemaInfo;get_IsNil;();summary;df-generated |
 | System.Xml.Schema;IXmlSchemaInfo;get_Validity;();summary;df-generated |
@@ -48146,6 +51293,11 @@ neutral
 | System.Xml.Schema;XmlAtomicValue;get_ValueAsInt;();summary;df-generated |
 | System.Xml.Schema;XmlAtomicValue;get_ValueAsLong;();summary;df-generated |
 | System.Xml.Schema;XmlAtomicValue;get_ValueType;();summary;df-generated |
+| System.Xml.Schema;XmlSchema;Compile;(System.Xml.Schema.ValidationEventHandler);summary;df-generated |
+| System.Xml.Schema;XmlSchema;Compile;(System.Xml.Schema.ValidationEventHandler,System.Xml.XmlResolver);summary;df-generated |
+| System.Xml.Schema;XmlSchema;Read;(System.IO.Stream,System.Xml.Schema.ValidationEventHandler);summary;df-generated |
+| System.Xml.Schema;XmlSchema;Read;(System.IO.TextReader,System.Xml.Schema.ValidationEventHandler);summary;df-generated |
+| System.Xml.Schema;XmlSchema;Read;(System.Xml.XmlReader,System.Xml.Schema.ValidationEventHandler);summary;df-generated |
 | System.Xml.Schema;XmlSchema;Write;(System.IO.Stream);summary;df-generated |
 | System.Xml.Schema;XmlSchema;Write;(System.IO.Stream,System.Xml.XmlNamespaceManager);summary;df-generated |
 | System.Xml.Schema;XmlSchema;Write;(System.IO.TextWriter);summary;df-generated |
@@ -48160,8 +51312,10 @@ neutral
 | System.Xml.Schema;XmlSchemaCollection;Add;(System.String,System.String);summary;df-generated |
 | System.Xml.Schema;XmlSchemaCollection;Contains;(System.String);summary;df-generated |
 | System.Xml.Schema;XmlSchemaCollection;Contains;(System.Xml.Schema.XmlSchema);summary;df-generated |
+| System.Xml.Schema;XmlSchemaCollection;add_ValidationEventHandler;(System.Xml.Schema.ValidationEventHandler);summary;df-generated |
 | System.Xml.Schema;XmlSchemaCollection;get_Count;();summary;df-generated |
 | System.Xml.Schema;XmlSchemaCollection;get_IsSynchronized;();summary;df-generated |
+| System.Xml.Schema;XmlSchemaCollection;remove_ValidationEventHandler;(System.Xml.Schema.ValidationEventHandler);summary;df-generated |
 | System.Xml.Schema;XmlSchemaCollectionEnumerator;MoveNext;();summary;df-generated |
 | System.Xml.Schema;XmlSchemaCollectionEnumerator;Reset;();summary;df-generated |
 | System.Xml.Schema;XmlSchemaCollectionEnumerator;get_Current;();summary;df-generated |
@@ -48177,6 +51331,7 @@ neutral
 | System.Xml.Schema;XmlSchemaElement;get_BlockResolved;();summary;df-generated |
 | System.Xml.Schema;XmlSchemaElement;get_Constraints;();summary;df-generated |
 | System.Xml.Schema;XmlSchemaElement;get_FinalResolved;();summary;df-generated |
+| System.Xml.Schema;XmlSchemaException;XmlSchemaException;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);summary;df-generated |
 | System.Xml.Schema;XmlSchemaException;XmlSchemaException;(System.String);summary;df-generated |
 | System.Xml.Schema;XmlSchemaException;XmlSchemaException;(System.String,System.Exception);summary;df-generated |
 | System.Xml.Schema;XmlSchemaException;XmlSchemaException;(System.String,System.Exception,System.Int32,System.Int32);summary;df-generated |
@@ -48186,10 +51341,14 @@ neutral
 | System.Xml.Schema;XmlSchemaInferenceException;XmlSchemaInferenceException;(System.String);summary;df-generated |
 | System.Xml.Schema;XmlSchemaInferenceException;XmlSchemaInferenceException;(System.String,System.Exception);summary;df-generated |
 | System.Xml.Schema;XmlSchemaInferenceException;XmlSchemaInferenceException;(System.String,System.Exception,System.Int32,System.Int32);summary;df-generated |
+| System.Xml.Schema;XmlSchemaInfo;get_IsDefault;();summary;df-generated |
+| System.Xml.Schema;XmlSchemaInfo;get_IsNil;();summary;df-generated |
+| System.Xml.Schema;XmlSchemaInfo;get_Validity;();summary;df-generated |
 | System.Xml.Schema;XmlSchemaObjectCollection;Contains;(System.Xml.Schema.XmlSchemaObject);summary;df-generated |
 | System.Xml.Schema;XmlSchemaObjectCollection;IndexOf;(System.Xml.Schema.XmlSchemaObject);summary;df-generated |
 | System.Xml.Schema;XmlSchemaObjectCollection;OnClear;();summary;df-generated |
 | System.Xml.Schema;XmlSchemaObjectCollection;OnRemove;(System.Int32,System.Object);summary;df-generated |
+| System.Xml.Schema;XmlSchemaObjectCollection;Remove;(System.Xml.Schema.XmlSchemaObject);summary;df-generated |
 | System.Xml.Schema;XmlSchemaObjectEnumerator;MoveNext;();summary;df-generated |
 | System.Xml.Schema;XmlSchemaObjectEnumerator;Reset;();summary;df-generated |
 | System.Xml.Schema;XmlSchemaObjectTable;Contains;(System.Xml.XmlQualifiedName);summary;df-generated |
@@ -48201,11 +51360,13 @@ neutral
 | System.Xml.Schema;XmlSchemaSet;Contains;(System.Xml.Schema.XmlSchema);summary;df-generated |
 | System.Xml.Schema;XmlSchemaSet;RemoveRecursive;(System.Xml.Schema.XmlSchema);summary;df-generated |
 | System.Xml.Schema;XmlSchemaSet;Schemas;(System.String);summary;df-generated |
+| System.Xml.Schema;XmlSchemaSet;add_ValidationEventHandler;(System.Xml.Schema.ValidationEventHandler);summary;df-generated |
 | System.Xml.Schema;XmlSchemaSet;get_Count;();summary;df-generated |
 | System.Xml.Schema;XmlSchemaSet;get_GlobalAttributes;();summary;df-generated |
 | System.Xml.Schema;XmlSchemaSet;get_GlobalElements;();summary;df-generated |
 | System.Xml.Schema;XmlSchemaSet;get_GlobalTypes;();summary;df-generated |
 | System.Xml.Schema;XmlSchemaSet;get_IsCompiled;();summary;df-generated |
+| System.Xml.Schema;XmlSchemaSet;remove_ValidationEventHandler;(System.Xml.Schema.ValidationEventHandler);summary;df-generated |
 | System.Xml.Schema;XmlSchemaType;GetBuiltInComplexType;(System.Xml.Schema.XmlTypeCode);summary;df-generated |
 | System.Xml.Schema;XmlSchemaType;GetBuiltInComplexType;(System.Xml.XmlQualifiedName);summary;df-generated |
 | System.Xml.Schema;XmlSchemaType;GetBuiltInSimpleType;(System.Xml.Schema.XmlTypeCode);summary;df-generated |
@@ -48221,7 +51382,14 @@ neutral
 | System.Xml.Schema;XmlSchemaValidator;EndValidation;();summary;df-generated |
 | System.Xml.Schema;XmlSchemaValidator;GetUnspecifiedDefaultAttributes;(System.Collections.ArrayList);summary;df-generated |
 | System.Xml.Schema;XmlSchemaValidator;Initialize;();summary;df-generated |
+| System.Xml.Schema;XmlSchemaValidator;ValidateAttribute;(System.String,System.String,System.Xml.Schema.XmlValueGetter,System.Xml.Schema.XmlSchemaInfo);summary;df-generated |
 | System.Xml.Schema;XmlSchemaValidator;ValidateEndOfAttributes;(System.Xml.Schema.XmlSchemaInfo);summary;df-generated |
+| System.Xml.Schema;XmlSchemaValidator;ValidateText;(System.String);summary;df-generated |
+| System.Xml.Schema;XmlSchemaValidator;ValidateText;(System.Xml.Schema.XmlValueGetter);summary;df-generated |
+| System.Xml.Schema;XmlSchemaValidator;ValidateWhitespace;(System.String);summary;df-generated |
+| System.Xml.Schema;XmlSchemaValidator;ValidateWhitespace;(System.Xml.Schema.XmlValueGetter);summary;df-generated |
+| System.Xml.Schema;XmlSchemaValidator;add_ValidationEventHandler;(System.Xml.Schema.ValidationEventHandler);summary;df-generated |
+| System.Xml.Schema;XmlSchemaValidator;remove_ValidationEventHandler;(System.Xml.Schema.ValidationEventHandler);summary;df-generated |
 | System.Xml.Serialization;CodeIdentifier;MakeCamel;(System.String);summary;df-generated |
 | System.Xml.Serialization;CodeIdentifier;MakePascal;(System.String);summary;df-generated |
 | System.Xml.Serialization;CodeIdentifier;MakeValid;(System.String);summary;df-generated |
@@ -48237,6 +51405,7 @@ neutral
 | System.Xml.Serialization;ImportContext;get_TypeIdentifiers;();summary;df-generated |
 | System.Xml.Serialization;SoapAttributeOverrides;Add;(System.Type,System.String,System.Xml.Serialization.SoapAttributes);summary;df-generated |
 | System.Xml.Serialization;SoapAttributeOverrides;Add;(System.Type,System.Xml.Serialization.SoapAttributes);summary;df-generated |
+| System.Xml.Serialization;SoapAttributes;SoapAttributes;(System.Reflection.ICustomAttributeProvider);summary;df-generated |
 | System.Xml.Serialization;SoapIncludeAttribute;SoapIncludeAttribute;(System.Type);summary;df-generated |
 | System.Xml.Serialization;SoapReflectionImporter;ImportMembersMapping;(System.String,System.String,System.Xml.Serialization.XmlReflectionMember[]);summary;df-generated |
 | System.Xml.Serialization;SoapReflectionImporter;ImportMembersMapping;(System.String,System.String,System.Xml.Serialization.XmlReflectionMember[],System.Boolean,System.Boolean);summary;df-generated |
@@ -48249,18 +51418,22 @@ neutral
 | System.Xml.Serialization;SoapReflectionImporter;SoapReflectionImporter;(System.Xml.Serialization.SoapAttributeOverrides);summary;df-generated |
 | System.Xml.Serialization;XmlAnyElementAttributes;Contains;(System.Xml.Serialization.XmlAnyElementAttribute);summary;df-generated |
 | System.Xml.Serialization;XmlAnyElementAttributes;IndexOf;(System.Xml.Serialization.XmlAnyElementAttribute);summary;df-generated |
+| System.Xml.Serialization;XmlAnyElementAttributes;Remove;(System.Xml.Serialization.XmlAnyElementAttribute);summary;df-generated |
 | System.Xml.Serialization;XmlArrayItemAttribute;XmlArrayItemAttribute;(System.Type);summary;df-generated |
 | System.Xml.Serialization;XmlArrayItemAttributes;Contains;(System.Xml.Serialization.XmlArrayItemAttribute);summary;df-generated |
 | System.Xml.Serialization;XmlArrayItemAttributes;IndexOf;(System.Xml.Serialization.XmlArrayItemAttribute);summary;df-generated |
+| System.Xml.Serialization;XmlArrayItemAttributes;Remove;(System.Xml.Serialization.XmlArrayItemAttribute);summary;df-generated |
 | System.Xml.Serialization;XmlAttributeAttribute;XmlAttributeAttribute;(System.Type);summary;df-generated |
 | System.Xml.Serialization;XmlAttributeEventArgs;get_LineNumber;();summary;df-generated |
 | System.Xml.Serialization;XmlAttributeEventArgs;get_LinePosition;();summary;df-generated |
 | System.Xml.Serialization;XmlAttributeOverrides;Add;(System.Type,System.String,System.Xml.Serialization.XmlAttributes);summary;df-generated |
 | System.Xml.Serialization;XmlAttributeOverrides;Add;(System.Type,System.Xml.Serialization.XmlAttributes);summary;df-generated |
 | System.Xml.Serialization;XmlAttributeOverrides;get_Item;(System.Type,System.String);summary;df-generated |
+| System.Xml.Serialization;XmlAttributes;XmlAttributes;(System.Reflection.ICustomAttributeProvider);summary;df-generated |
 | System.Xml.Serialization;XmlElementAttribute;XmlElementAttribute;(System.Type);summary;df-generated |
 | System.Xml.Serialization;XmlElementAttributes;Contains;(System.Xml.Serialization.XmlElementAttribute);summary;df-generated |
 | System.Xml.Serialization;XmlElementAttributes;IndexOf;(System.Xml.Serialization.XmlElementAttribute);summary;df-generated |
+| System.Xml.Serialization;XmlElementAttributes;Remove;(System.Xml.Serialization.XmlElementAttribute);summary;df-generated |
 | System.Xml.Serialization;XmlElementEventArgs;get_LineNumber;();summary;df-generated |
 | System.Xml.Serialization;XmlElementEventArgs;get_LinePosition;();summary;df-generated |
 | System.Xml.Serialization;XmlIncludeAttribute;XmlIncludeAttribute;(System.Type);summary;df-generated |
@@ -48283,6 +51456,7 @@ neutral
 | System.Xml.Serialization;XmlSchemaEnumerator;Dispose;();summary;df-generated |
 | System.Xml.Serialization;XmlSchemaEnumerator;MoveNext;();summary;df-generated |
 | System.Xml.Serialization;XmlSchemaEnumerator;Reset;();summary;df-generated |
+| System.Xml.Serialization;XmlSchemaEnumerator;get_Current;();summary;df-generated |
 | System.Xml.Serialization;XmlSchemaExporter;ExportAnyType;(System.String);summary;df-generated |
 | System.Xml.Serialization;XmlSchemaExporter;ExportAnyType;(System.Xml.Serialization.XmlMembersMapping);summary;df-generated |
 | System.Xml.Serialization;XmlSchemaImporter;ImportAnyType;(System.Xml.XmlQualifiedName,System.String);summary;df-generated |
@@ -48299,6 +51473,7 @@ neutral
 | System.Xml.Serialization;XmlSchemaImporter;XmlSchemaImporter;(System.Xml.Serialization.XmlSchemas);summary;df-generated |
 | System.Xml.Serialization;XmlSchemaImporter;XmlSchemaImporter;(System.Xml.Serialization.XmlSchemas,System.Xml.Serialization.CodeIdentifiers);summary;df-generated |
 | System.Xml.Serialization;XmlSchemas;AddReference;(System.Xml.Schema.XmlSchema);summary;df-generated |
+| System.Xml.Serialization;XmlSchemas;Compile;(System.Xml.Schema.ValidationEventHandler,System.Boolean);summary;df-generated |
 | System.Xml.Serialization;XmlSchemas;Contains;(System.String);summary;df-generated |
 | System.Xml.Serialization;XmlSchemas;Contains;(System.Xml.Schema.XmlSchema);summary;df-generated |
 | System.Xml.Serialization;XmlSchemas;GetSchemas;(System.String);summary;df-generated |
@@ -48306,7 +51481,10 @@ neutral
 | System.Xml.Serialization;XmlSchemas;IsDataSet;(System.Xml.Schema.XmlSchema);summary;df-generated |
 | System.Xml.Serialization;XmlSchemas;OnClear;();summary;df-generated |
 | System.Xml.Serialization;XmlSchemas;OnRemove;(System.Int32,System.Object);summary;df-generated |
+| System.Xml.Serialization;XmlSchemas;Remove;(System.Xml.Schema.XmlSchema);summary;df-generated |
 | System.Xml.Serialization;XmlSchemas;get_IsCompiled;();summary;df-generated |
+| System.Xml.Serialization;XmlSerializationReader+Fixup;Fixup;(System.Object,System.Xml.Serialization.XmlSerializationFixupCallback,System.Int32);summary;df-generated |
+| System.Xml.Serialization;XmlSerializationReader;AddReadCallback;(System.String,System.String,System.Type,System.Xml.Serialization.XmlSerializationReadCallback);summary;df-generated |
 | System.Xml.Serialization;XmlSerializationReader;CheckReaderCount;(System.Int32,System.Int32);summary;df-generated |
 | System.Xml.Serialization;XmlSerializationReader;CreateAbstractTypeException;(System.String,System.String);summary;df-generated |
 | System.Xml.Serialization;XmlSerializationReader;CreateBadDerivationException;(System.String,System.String,System.String,System.String,System.String,System.String);summary;df-generated |
@@ -48354,6 +51532,7 @@ neutral
 | System.Xml.Serialization;XmlSerializationReader;UnknownNode;(System.Object,System.String);summary;df-generated |
 | System.Xml.Serialization;XmlSerializationReader;UnreferencedObject;(System.String,System.Object);summary;df-generated |
 | System.Xml.Serialization;XmlSerializationReader;get_ReaderCount;();summary;df-generated |
+| System.Xml.Serialization;XmlSerializationWriter;AddWriteCallback;(System.Type,System.String,System.String,System.Xml.Serialization.XmlSerializationWriteCallback);summary;df-generated |
 | System.Xml.Serialization;XmlSerializationWriter;CreateChoiceIdentifierValueException;(System.String,System.String,System.String,System.String);summary;df-generated |
 | System.Xml.Serialization;XmlSerializationWriter;CreateInvalidAnyTypeException;(System.Object);summary;df-generated |
 | System.Xml.Serialization;XmlSerializationWriter;CreateInvalidAnyTypeException;(System.Type);summary;df-generated |
@@ -48370,22 +51549,11 @@ neutral
 | System.Xml.Serialization;XmlSerializationWriter;InitCallbacks;();summary;df-generated |
 | System.Xml.Serialization;XmlSerializationWriter;ResolveDynamicAssembly;(System.String);summary;df-generated |
 | System.Xml.Serialization;XmlSerializationWriter;TopLevelElement;();summary;df-generated |
-| System.Xml.Serialization;XmlSerializationWriter;WriteEmptyTag;(System.String);summary;df-generated |
-| System.Xml.Serialization;XmlSerializationWriter;WriteEmptyTag;(System.String,System.String);summary;df-generated |
 | System.Xml.Serialization;XmlSerializationWriter;WriteEndElement;();summary;df-generated |
 | System.Xml.Serialization;XmlSerializationWriter;WriteEndElement;(System.Object);summary;df-generated |
-| System.Xml.Serialization;XmlSerializationWriter;WriteNullTagEncoded;(System.String);summary;df-generated |
-| System.Xml.Serialization;XmlSerializationWriter;WriteNullTagEncoded;(System.String,System.String);summary;df-generated |
-| System.Xml.Serialization;XmlSerializationWriter;WriteNullTagLiteral;(System.String);summary;df-generated |
-| System.Xml.Serialization;XmlSerializationWriter;WriteNullTagLiteral;(System.String,System.String);summary;df-generated |
 | System.Xml.Serialization;XmlSerializationWriter;WriteReferencedElements;();summary;df-generated |
 | System.Xml.Serialization;XmlSerializationWriter;WriteRpcResult;(System.String,System.String);summary;df-generated |
 | System.Xml.Serialization;XmlSerializationWriter;WriteStartDocument;();summary;df-generated |
-| System.Xml.Serialization;XmlSerializationWriter;WriteStartElement;(System.String);summary;df-generated |
-| System.Xml.Serialization;XmlSerializationWriter;WriteStartElement;(System.String,System.String);summary;df-generated |
-| System.Xml.Serialization;XmlSerializationWriter;WriteStartElement;(System.String,System.String,System.Boolean);summary;df-generated |
-| System.Xml.Serialization;XmlSerializationWriter;WriteStartElement;(System.String,System.String,System.Object);summary;df-generated |
-| System.Xml.Serialization;XmlSerializationWriter;WriteStartElement;(System.String,System.String,System.Object,System.Boolean);summary;df-generated |
 | System.Xml.Serialization;XmlSerializer;CanDeserialize;(System.Xml.XmlReader);summary;df-generated |
 | System.Xml.Serialization;XmlSerializer;CreateReader;();summary;df-generated |
 | System.Xml.Serialization;XmlSerializer;CreateWriter;();summary;df-generated |
@@ -48408,6 +51576,14 @@ neutral
 | System.Xml.Serialization;XmlSerializer;XmlSerializer;(System.Type,System.Xml.Serialization.XmlAttributeOverrides);summary;df-generated |
 | System.Xml.Serialization;XmlSerializer;XmlSerializer;(System.Type,System.Xml.Serialization.XmlAttributeOverrides,System.Type[],System.Xml.Serialization.XmlRootAttribute,System.String);summary;df-generated |
 | System.Xml.Serialization;XmlSerializer;XmlSerializer;(System.Type,System.Xml.Serialization.XmlRootAttribute);summary;df-generated |
+| System.Xml.Serialization;XmlSerializer;add_UnknownAttribute;(System.Xml.Serialization.XmlAttributeEventHandler);summary;df-generated |
+| System.Xml.Serialization;XmlSerializer;add_UnknownElement;(System.Xml.Serialization.XmlElementEventHandler);summary;df-generated |
+| System.Xml.Serialization;XmlSerializer;add_UnknownNode;(System.Xml.Serialization.XmlNodeEventHandler);summary;df-generated |
+| System.Xml.Serialization;XmlSerializer;add_UnreferencedObject;(System.Xml.Serialization.UnreferencedObjectEventHandler);summary;df-generated |
+| System.Xml.Serialization;XmlSerializer;remove_UnknownAttribute;(System.Xml.Serialization.XmlAttributeEventHandler);summary;df-generated |
+| System.Xml.Serialization;XmlSerializer;remove_UnknownElement;(System.Xml.Serialization.XmlElementEventHandler);summary;df-generated |
+| System.Xml.Serialization;XmlSerializer;remove_UnknownNode;(System.Xml.Serialization.XmlNodeEventHandler);summary;df-generated |
+| System.Xml.Serialization;XmlSerializer;remove_UnreferencedObject;(System.Xml.Serialization.UnreferencedObjectEventHandler);summary;df-generated |
 | System.Xml.Serialization;XmlSerializerAssemblyAttribute;XmlSerializerAssemblyAttribute;(System.String);summary;df-generated |
 | System.Xml.Serialization;XmlSerializerFactory;CreateSerializer;(System.Type);summary;df-generated |
 | System.Xml.Serialization;XmlSerializerFactory;CreateSerializer;(System.Type,System.Type[]);summary;df-generated |
@@ -48438,6 +51614,7 @@ neutral
 | System.Xml.XPath;XPathDocument;XPathDocument;(System.String);summary;df-generated |
 | System.Xml.XPath;XPathDocument;XPathDocument;(System.String,System.Xml.XmlSpace);summary;df-generated |
 | System.Xml.XPath;XPathDocument;XPathDocument;(System.Xml.XmlReader);summary;df-generated |
+| System.Xml.XPath;XPathException;XPathException;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);summary;df-generated |
 | System.Xml.XPath;XPathException;XPathException;(System.String);summary;df-generated |
 | System.Xml.XPath;XPathException;XPathException;(System.String,System.Exception);summary;df-generated |
 | System.Xml.XPath;XPathExpression;AddSort;(System.Object,System.Collections.IComparer);summary;df-generated |
@@ -48454,6 +51631,7 @@ neutral
 | System.Xml.XPath;XPathNavigator;AppendChild;(System.Xml.XPath.XPathNavigator);summary;df-generated |
 | System.Xml.XPath;XPathNavigator;AppendChild;(System.Xml.XmlReader);summary;df-generated |
 | System.Xml.XPath;XPathNavigator;AppendChildElement;(System.String,System.String,System.String,System.String);summary;df-generated |
+| System.Xml.XPath;XPathNavigator;CheckValidity;(System.Xml.Schema.XmlSchemaSet,System.Xml.Schema.ValidationEventHandler);summary;df-generated |
 | System.Xml.XPath;XPathNavigator;ComparePosition;(System.Xml.XPath.XPathNavigator);summary;df-generated |
 | System.Xml.XPath;XPathNavigator;CreateAttribute;(System.String,System.String,System.String,System.String);summary;df-generated |
 | System.Xml.XPath;XPathNavigator;DeleteRange;(System.Xml.XPath.XPathNavigator);summary;df-generated |
@@ -48534,6 +51712,7 @@ neutral
 | System.Xml.Xsl;IXsltContextVariable;get_IsLocal;();summary;df-generated |
 | System.Xml.Xsl;IXsltContextVariable;get_IsParam;();summary;df-generated |
 | System.Xml.Xsl;IXsltContextVariable;get_VariableType;();summary;df-generated |
+| System.Xml.Xsl;XslCompiledTransform;Load;(System.Reflection.MethodInfo,System.Byte[],System.Type[]);summary;df-generated |
 | System.Xml.Xsl;XslCompiledTransform;Load;(System.String);summary;df-generated |
 | System.Xml.Xsl;XslCompiledTransform;Load;(System.String,System.Xml.Xsl.XsltSettings,System.Xml.XmlResolver);summary;df-generated |
 | System.Xml.Xsl;XslCompiledTransform;Load;(System.Type);summary;df-generated |
@@ -48582,6 +51761,8 @@ neutral
 | System.Xml.Xsl;XsltArgumentList;AddExtensionObject;(System.String,System.Object);summary;df-generated |
 | System.Xml.Xsl;XsltArgumentList;AddParam;(System.String,System.String,System.Object);summary;df-generated |
 | System.Xml.Xsl;XsltArgumentList;Clear;();summary;df-generated |
+| System.Xml.Xsl;XsltArgumentList;add_XsltMessageEncountered;(System.Xml.Xsl.XsltMessageEncounteredEventHandler);summary;df-generated |
+| System.Xml.Xsl;XsltArgumentList;remove_XsltMessageEncountered;(System.Xml.Xsl.XsltMessageEncounteredEventHandler);summary;df-generated |
 | System.Xml.Xsl;XsltCompileException;XsltCompileException;(System.Exception,System.String,System.Int32,System.Int32);summary;df-generated |
 | System.Xml.Xsl;XsltCompileException;XsltCompileException;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);summary;df-generated |
 | System.Xml.Xsl;XsltCompileException;XsltCompileException;(System.String);summary;df-generated |
@@ -48591,6 +51772,7 @@ neutral
 | System.Xml.Xsl;XsltContext;ResolveVariable;(System.String,System.String);summary;df-generated |
 | System.Xml.Xsl;XsltContext;XsltContext;(System.Xml.NameTable);summary;df-generated |
 | System.Xml.Xsl;XsltContext;get_Whitespace;();summary;df-generated |
+| System.Xml.Xsl;XsltException;XsltException;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);summary;df-generated |
 | System.Xml.Xsl;XsltException;XsltException;(System.String);summary;df-generated |
 | System.Xml.Xsl;XsltException;XsltException;(System.String,System.Exception);summary;df-generated |
 | System.Xml.Xsl;XsltException;get_LineNumber;();summary;df-generated |
@@ -48603,9 +51785,13 @@ neutral
 | System.Xml;IFragmentCapableXmlDictionaryWriter;get_CanFragment;();summary;df-generated |
 | System.Xml;IStreamProvider;GetStream;();summary;df-generated |
 | System.Xml;IStreamProvider;ReleaseStream;(System.IO.Stream);summary;df-generated |
+| System.Xml;IXmlBinaryReaderInitializer;SetInput;(System.Byte[],System.Int32,System.Int32,System.Xml.IXmlDictionary,System.Xml.XmlDictionaryReaderQuotas,System.Xml.XmlBinaryReaderSession,System.Xml.OnXmlDictionaryReaderClose);summary;df-generated |
+| System.Xml;IXmlBinaryReaderInitializer;SetInput;(System.IO.Stream,System.Xml.IXmlDictionary,System.Xml.XmlDictionaryReaderQuotas,System.Xml.XmlBinaryReaderSession,System.Xml.OnXmlDictionaryReaderClose);summary;df-generated |
 | System.Xml;IXmlLineInfo;HasLineInfo;();summary;df-generated |
 | System.Xml;IXmlLineInfo;get_LineNumber;();summary;df-generated |
 | System.Xml;IXmlLineInfo;get_LinePosition;();summary;df-generated |
+| System.Xml;IXmlTextReaderInitializer;SetInput;(System.Byte[],System.Int32,System.Int32,System.Text.Encoding,System.Xml.XmlDictionaryReaderQuotas,System.Xml.OnXmlDictionaryReaderClose);summary;df-generated |
+| System.Xml;IXmlTextReaderInitializer;SetInput;(System.IO.Stream,System.Text.Encoding,System.Xml.XmlDictionaryReaderQuotas,System.Xml.OnXmlDictionaryReaderClose);summary;df-generated |
 | System.Xml;UniqueId;Equals;(System.Object);summary;df-generated |
 | System.Xml;UniqueId;GetHashCode;();summary;df-generated |
 | System.Xml;UniqueId;ToCharArray;(System.Char[],System.Int32);summary;df-generated |
@@ -48681,14 +51867,23 @@ neutral
 | System.Xml;XmlConvert;ToUInt16;(System.String);summary;df-generated |
 | System.Xml;XmlConvert;ToUInt32;(System.String);summary;df-generated |
 | System.Xml;XmlConvert;ToUInt64;(System.String);summary;df-generated |
+| System.Xml;XmlDataDocument;GetElementById;(System.String);summary;df-generated |
 | System.Xml;XmlDictionary;XmlDictionary;(System.Int32);summary;df-generated |
 | System.Xml;XmlDictionary;get_Empty;();summary;df-generated |
+| System.Xml;XmlDictionaryReader;CreateBinaryReader;(System.Byte[],System.Int32,System.Int32,System.Xml.IXmlDictionary,System.Xml.XmlDictionaryReaderQuotas,System.Xml.XmlBinaryReaderSession,System.Xml.OnXmlDictionaryReaderClose);summary;df-generated |
+| System.Xml;XmlDictionaryReader;CreateBinaryReader;(System.IO.Stream,System.Xml.IXmlDictionary,System.Xml.XmlDictionaryReaderQuotas,System.Xml.XmlBinaryReaderSession,System.Xml.OnXmlDictionaryReaderClose);summary;df-generated |
 | System.Xml;XmlDictionaryReader;CreateMtomReader;(System.Byte[],System.Int32,System.Int32,System.Text.Encoding,System.Xml.XmlDictionaryReaderQuotas);summary;df-generated |
 | System.Xml;XmlDictionaryReader;CreateMtomReader;(System.Byte[],System.Int32,System.Int32,System.Text.Encoding[],System.String,System.Xml.XmlDictionaryReaderQuotas);summary;df-generated |
+| System.Xml;XmlDictionaryReader;CreateMtomReader;(System.Byte[],System.Int32,System.Int32,System.Text.Encoding[],System.String,System.Xml.XmlDictionaryReaderQuotas,System.Int32,System.Xml.OnXmlDictionaryReaderClose);summary;df-generated |
 | System.Xml;XmlDictionaryReader;CreateMtomReader;(System.Byte[],System.Int32,System.Int32,System.Text.Encoding[],System.Xml.XmlDictionaryReaderQuotas);summary;df-generated |
 | System.Xml;XmlDictionaryReader;CreateMtomReader;(System.IO.Stream,System.Text.Encoding,System.Xml.XmlDictionaryReaderQuotas);summary;df-generated |
 | System.Xml;XmlDictionaryReader;CreateMtomReader;(System.IO.Stream,System.Text.Encoding[],System.String,System.Xml.XmlDictionaryReaderQuotas);summary;df-generated |
+| System.Xml;XmlDictionaryReader;CreateMtomReader;(System.IO.Stream,System.Text.Encoding[],System.String,System.Xml.XmlDictionaryReaderQuotas,System.Int32,System.Xml.OnXmlDictionaryReaderClose);summary;df-generated |
 | System.Xml;XmlDictionaryReader;CreateMtomReader;(System.IO.Stream,System.Text.Encoding[],System.Xml.XmlDictionaryReaderQuotas);summary;df-generated |
+| System.Xml;XmlDictionaryReader;CreateTextReader;(System.Byte[],System.Int32,System.Int32,System.Text.Encoding,System.Xml.XmlDictionaryReaderQuotas,System.Xml.OnXmlDictionaryReaderClose);summary;df-generated |
+| System.Xml;XmlDictionaryReader;CreateTextReader;(System.Byte[],System.Int32,System.Int32,System.Xml.XmlDictionaryReaderQuotas);summary;df-generated |
+| System.Xml;XmlDictionaryReader;CreateTextReader;(System.Byte[],System.Xml.XmlDictionaryReaderQuotas);summary;df-generated |
+| System.Xml;XmlDictionaryReader;CreateTextReader;(System.IO.Stream,System.Text.Encoding,System.Xml.XmlDictionaryReaderQuotas,System.Xml.OnXmlDictionaryReaderClose);summary;df-generated |
 | System.Xml;XmlDictionaryReader;CreateTextReader;(System.IO.Stream,System.Xml.XmlDictionaryReaderQuotas);summary;df-generated |
 | System.Xml;XmlDictionaryReader;EndCanonicalization;();summary;df-generated |
 | System.Xml;XmlDictionaryReader;IndexOfLocalName;(System.String[],System.String);summary;df-generated |
@@ -48788,40 +51983,38 @@ neutral
 | System.Xml;XmlDictionaryWriter;CreateTextWriter;(System.IO.Stream,System.Text.Encoding,System.Boolean);summary;df-generated |
 | System.Xml;XmlDictionaryWriter;EndCanonicalization;();summary;df-generated |
 | System.Xml;XmlDictionaryWriter;StartCanonicalization;(System.IO.Stream,System.Boolean,System.String[]);summary;df-generated |
-| System.Xml;XmlDictionaryWriter;WriteArray;(System.String,System.String,System.String,System.Boolean[],System.Int32,System.Int32);summary;df-generated |
-| System.Xml;XmlDictionaryWriter;WriteArray;(System.String,System.String,System.String,System.DateTime[],System.Int32,System.Int32);summary;df-generated |
-| System.Xml;XmlDictionaryWriter;WriteArray;(System.String,System.String,System.String,System.Decimal[],System.Int32,System.Int32);summary;df-generated |
-| System.Xml;XmlDictionaryWriter;WriteArray;(System.String,System.String,System.String,System.Double[],System.Int32,System.Int32);summary;df-generated |
-| System.Xml;XmlDictionaryWriter;WriteArray;(System.String,System.String,System.String,System.Guid[],System.Int32,System.Int32);summary;df-generated |
-| System.Xml;XmlDictionaryWriter;WriteArray;(System.String,System.String,System.String,System.Int16[],System.Int32,System.Int32);summary;df-generated |
-| System.Xml;XmlDictionaryWriter;WriteArray;(System.String,System.String,System.String,System.Int32[],System.Int32,System.Int32);summary;df-generated |
-| System.Xml;XmlDictionaryWriter;WriteArray;(System.String,System.String,System.String,System.Int64[],System.Int32,System.Int32);summary;df-generated |
-| System.Xml;XmlDictionaryWriter;WriteArray;(System.String,System.String,System.String,System.Single[],System.Int32,System.Int32);summary;df-generated |
-| System.Xml;XmlDictionaryWriter;WriteArray;(System.String,System.String,System.String,System.TimeSpan[],System.Int32,System.Int32);summary;df-generated |
-| System.Xml;XmlDictionaryWriter;WriteArray;(System.String,System.Xml.XmlDictionaryString,System.Xml.XmlDictionaryString,System.Boolean[],System.Int32,System.Int32);summary;df-generated |
-| System.Xml;XmlDictionaryWriter;WriteArray;(System.String,System.Xml.XmlDictionaryString,System.Xml.XmlDictionaryString,System.DateTime[],System.Int32,System.Int32);summary;df-generated |
-| System.Xml;XmlDictionaryWriter;WriteArray;(System.String,System.Xml.XmlDictionaryString,System.Xml.XmlDictionaryString,System.Decimal[],System.Int32,System.Int32);summary;df-generated |
-| System.Xml;XmlDictionaryWriter;WriteArray;(System.String,System.Xml.XmlDictionaryString,System.Xml.XmlDictionaryString,System.Double[],System.Int32,System.Int32);summary;df-generated |
-| System.Xml;XmlDictionaryWriter;WriteArray;(System.String,System.Xml.XmlDictionaryString,System.Xml.XmlDictionaryString,System.Guid[],System.Int32,System.Int32);summary;df-generated |
-| System.Xml;XmlDictionaryWriter;WriteArray;(System.String,System.Xml.XmlDictionaryString,System.Xml.XmlDictionaryString,System.Int16[],System.Int32,System.Int32);summary;df-generated |
-| System.Xml;XmlDictionaryWriter;WriteArray;(System.String,System.Xml.XmlDictionaryString,System.Xml.XmlDictionaryString,System.Int32[],System.Int32,System.Int32);summary;df-generated |
-| System.Xml;XmlDictionaryWriter;WriteArray;(System.String,System.Xml.XmlDictionaryString,System.Xml.XmlDictionaryString,System.Int64[],System.Int32,System.Int32);summary;df-generated |
-| System.Xml;XmlDictionaryWriter;WriteArray;(System.String,System.Xml.XmlDictionaryString,System.Xml.XmlDictionaryString,System.Single[],System.Int32,System.Int32);summary;df-generated |
-| System.Xml;XmlDictionaryWriter;WriteArray;(System.String,System.Xml.XmlDictionaryString,System.Xml.XmlDictionaryString,System.TimeSpan[],System.Int32,System.Int32);summary;df-generated |
-| System.Xml;XmlDictionaryWriter;WriteStartElement;(System.String,System.Xml.XmlDictionaryString,System.Xml.XmlDictionaryString);summary;df-generated |
-| System.Xml;XmlDictionaryWriter;WriteStartElement;(System.Xml.XmlDictionaryString,System.Xml.XmlDictionaryString);summary;df-generated |
 | System.Xml;XmlDictionaryWriter;WriteValue;(System.Guid);summary;df-generated |
 | System.Xml;XmlDictionaryWriter;WriteValue;(System.TimeSpan);summary;df-generated |
 | System.Xml;XmlDictionaryWriter;WriteValue;(System.Xml.IStreamProvider);summary;df-generated |
 | System.Xml;XmlDictionaryWriter;WriteValue;(System.Xml.UniqueId);summary;df-generated |
 | System.Xml;XmlDictionaryWriter;WriteValueAsync;(System.Xml.IStreamProvider);summary;df-generated |
+| System.Xml;XmlDictionaryWriter;WriteXmlAttribute;(System.String,System.String);summary;df-generated |
+| System.Xml;XmlDictionaryWriter;WriteXmlAttribute;(System.Xml.XmlDictionaryString,System.Xml.XmlDictionaryString);summary;df-generated |
+| System.Xml;XmlDictionaryWriter;WriteXmlnsAttribute;(System.String,System.String);summary;df-generated |
+| System.Xml;XmlDictionaryWriter;WriteXmlnsAttribute;(System.String,System.Xml.XmlDictionaryString);summary;df-generated |
 | System.Xml;XmlDictionaryWriter;get_CanCanonicalize;();summary;df-generated |
+| System.Xml;XmlDocument;CreateDefaultAttribute;(System.String,System.String,System.String);summary;df-generated |
+| System.Xml;XmlDocument;GetElementById;(System.String);summary;df-generated |
 | System.Xml;XmlDocument;LoadXml;(System.String);summary;df-generated |
 | System.Xml;XmlDocument;ReadNode;(System.Xml.XmlReader);summary;df-generated |
 | System.Xml;XmlDocument;Save;(System.IO.Stream);summary;df-generated |
 | System.Xml;XmlDocument;Save;(System.IO.TextWriter);summary;df-generated |
 | System.Xml;XmlDocument;Save;(System.String);summary;df-generated |
+| System.Xml;XmlDocument;Validate;(System.Xml.Schema.ValidationEventHandler);summary;df-generated |
+| System.Xml;XmlDocument;Validate;(System.Xml.Schema.ValidationEventHandler,System.Xml.XmlNode);summary;df-generated |
 | System.Xml;XmlDocument;XmlDocument;(System.Xml.XmlNameTable);summary;df-generated |
+| System.Xml;XmlDocument;add_NodeChanged;(System.Xml.XmlNodeChangedEventHandler);summary;df-generated |
+| System.Xml;XmlDocument;add_NodeChanging;(System.Xml.XmlNodeChangedEventHandler);summary;df-generated |
+| System.Xml;XmlDocument;add_NodeInserted;(System.Xml.XmlNodeChangedEventHandler);summary;df-generated |
+| System.Xml;XmlDocument;add_NodeInserting;(System.Xml.XmlNodeChangedEventHandler);summary;df-generated |
+| System.Xml;XmlDocument;add_NodeRemoved;(System.Xml.XmlNodeChangedEventHandler);summary;df-generated |
+| System.Xml;XmlDocument;add_NodeRemoving;(System.Xml.XmlNodeChangedEventHandler);summary;df-generated |
+| System.Xml;XmlDocument;remove_NodeChanged;(System.Xml.XmlNodeChangedEventHandler);summary;df-generated |
+| System.Xml;XmlDocument;remove_NodeChanging;(System.Xml.XmlNodeChangedEventHandler);summary;df-generated |
+| System.Xml;XmlDocument;remove_NodeInserted;(System.Xml.XmlNodeChangedEventHandler);summary;df-generated |
+| System.Xml;XmlDocument;remove_NodeInserting;(System.Xml.XmlNodeChangedEventHandler);summary;df-generated |
+| System.Xml;XmlDocument;remove_NodeRemoved;(System.Xml.XmlNodeChangedEventHandler);summary;df-generated |
+| System.Xml;XmlDocument;remove_NodeRemoving;(System.Xml.XmlNodeChangedEventHandler);summary;df-generated |
 | System.Xml;XmlDocumentType;get_Entities;();summary;df-generated |
 | System.Xml;XmlDocumentType;get_Notations;();summary;df-generated |
 | System.Xml;XmlElement;HasAttribute;(System.String);summary;df-generated |
@@ -48854,7 +52047,6 @@ neutral
 | System.Xml;XmlNodeList;get_Count;();summary;df-generated |
 | System.Xml;XmlNodeReader;Close;();summary;df-generated |
 | System.Xml;XmlNodeReader;MoveToAttribute;(System.Int32);summary;df-generated |
-| System.Xml;XmlNodeReader;MoveToAttribute;(System.String);summary;df-generated |
 | System.Xml;XmlNodeReader;MoveToAttribute;(System.String,System.String);summary;df-generated |
 | System.Xml;XmlNodeReader;MoveToElement;();summary;df-generated |
 | System.Xml;XmlNodeReader;MoveToFirstAttribute;();summary;df-generated |
@@ -48894,7 +52086,6 @@ neutral
 | System.Xml;XmlReader;IsStartElement;(System.String);summary;df-generated |
 | System.Xml;XmlReader;IsStartElement;(System.String,System.String);summary;df-generated |
 | System.Xml;XmlReader;MoveToAttribute;(System.Int32);summary;df-generated |
-| System.Xml;XmlReader;MoveToAttribute;(System.String);summary;df-generated |
 | System.Xml;XmlReader;MoveToAttribute;(System.String,System.String);summary;df-generated |
 | System.Xml;XmlReader;MoveToContent;();summary;df-generated |
 | System.Xml;XmlReader;MoveToContentAsync;();summary;df-generated |
@@ -48963,6 +52154,8 @@ neutral
 | System.Xml;XmlReader;get_XmlSpace;();summary;df-generated |
 | System.Xml;XmlReaderSettings;Clone;();summary;df-generated |
 | System.Xml;XmlReaderSettings;Reset;();summary;df-generated |
+| System.Xml;XmlReaderSettings;add_ValidationEventHandler;(System.Xml.Schema.ValidationEventHandler);summary;df-generated |
+| System.Xml;XmlReaderSettings;remove_ValidationEventHandler;(System.Xml.Schema.ValidationEventHandler);summary;df-generated |
 | System.Xml;XmlResolver;SupportsType;(System.Uri,System.Type);summary;df-generated |
 | System.Xml;XmlResolver;get_FileSystemResolver;();summary;df-generated |
 | System.Xml;XmlResolver;get_ThrowingResolver;();summary;df-generated |
@@ -48973,7 +52166,6 @@ neutral
 | System.Xml;XmlTextReader;GetNamespacesInScope;(System.Xml.XmlNamespaceScope);summary;df-generated |
 | System.Xml;XmlTextReader;HasLineInfo;();summary;df-generated |
 | System.Xml;XmlTextReader;MoveToAttribute;(System.Int32);summary;df-generated |
-| System.Xml;XmlTextReader;MoveToAttribute;(System.String);summary;df-generated |
 | System.Xml;XmlTextReader;MoveToAttribute;(System.String,System.String);summary;df-generated |
 | System.Xml;XmlTextReader;MoveToElement;();summary;df-generated |
 | System.Xml;XmlTextReader;MoveToFirstAttribute;();summary;df-generated |
@@ -49024,7 +52216,6 @@ neutral
 | System.Xml;XmlValidatingReader;Close;();summary;df-generated |
 | System.Xml;XmlValidatingReader;HasLineInfo;();summary;df-generated |
 | System.Xml;XmlValidatingReader;MoveToAttribute;(System.Int32);summary;df-generated |
-| System.Xml;XmlValidatingReader;MoveToAttribute;(System.String);summary;df-generated |
 | System.Xml;XmlValidatingReader;MoveToAttribute;(System.String,System.String);summary;df-generated |
 | System.Xml;XmlValidatingReader;MoveToElement;();summary;df-generated |
 | System.Xml;XmlValidatingReader;MoveToFirstAttribute;();summary;df-generated |
@@ -49032,6 +52223,7 @@ neutral
 | System.Xml;XmlValidatingReader;Read;();summary;df-generated |
 | System.Xml;XmlValidatingReader;ReadAttributeValue;();summary;df-generated |
 | System.Xml;XmlValidatingReader;ResolveEntity;();summary;df-generated |
+| System.Xml;XmlValidatingReader;add_ValidationEventHandler;(System.Xml.Schema.ValidationEventHandler);summary;df-generated |
 | System.Xml;XmlValidatingReader;get_AttributeCount;();summary;df-generated |
 | System.Xml;XmlValidatingReader;get_CanReadBinaryContent;();summary;df-generated |
 | System.Xml;XmlValidatingReader;get_CanResolveEntity;();summary;df-generated |
@@ -49046,10 +52238,10 @@ neutral
 | System.Xml;XmlValidatingReader;get_QuoteChar;();summary;df-generated |
 | System.Xml;XmlValidatingReader;get_ReadState;();summary;df-generated |
 | System.Xml;XmlValidatingReader;get_XmlSpace;();summary;df-generated |
+| System.Xml;XmlValidatingReader;remove_ValidationEventHandler;(System.Xml.Schema.ValidationEventHandler);summary;df-generated |
 | System.Xml;XmlValidatingReader;set_XmlResolver;(System.Xml.XmlResolver);summary;df-generated |
 | System.Xml;XmlWhitespace;XmlWhitespace;(System.String,System.Xml.XmlDocument);summary;df-generated |
 | System.Xml;XmlWriter;Close;();summary;df-generated |
-| System.Xml;XmlWriter;Create;(System.Text.StringBuilder);summary;df-generated |
 | System.Xml;XmlWriter;Dispose;();summary;df-generated |
 | System.Xml;XmlWriter;Dispose;(System.Boolean);summary;df-generated |
 | System.Xml;XmlWriter;DisposeAsyncCore;();summary;df-generated |
@@ -49161,6 +52353,15 @@ neutral
 | System;AppDomain;SetShadowCopyPath;(System.String);summary;df-generated |
 | System;AppDomain;SetThreadPrincipal;(System.Security.Principal.IPrincipal);summary;df-generated |
 | System;AppDomain;Unload;(System.AppDomain);summary;df-generated |
+| System;AppDomain;add_AssemblyLoad;(System.AssemblyLoadEventHandler);summary;df-generated |
+| System;AppDomain;add_AssemblyResolve;(System.ResolveEventHandler);summary;df-generated |
+| System;AppDomain;add_DomainUnload;(System.EventHandler);summary;df-generated |
+| System;AppDomain;add_FirstChanceException;(System.EventHandler<System.Runtime.ExceptionServices.FirstChanceExceptionEventArgs>);summary;df-generated |
+| System;AppDomain;add_ProcessExit;(System.EventHandler);summary;df-generated |
+| System;AppDomain;add_ReflectionOnlyAssemblyResolve;(System.ResolveEventHandler);summary;df-generated |
+| System;AppDomain;add_ResourceResolve;(System.ResolveEventHandler);summary;df-generated |
+| System;AppDomain;add_TypeResolve;(System.ResolveEventHandler);summary;df-generated |
+| System;AppDomain;add_UnhandledException;(System.UnhandledExceptionEventHandler);summary;df-generated |
 | System;AppDomain;get_BaseDirectory;();summary;df-generated |
 | System;AppDomain;get_CurrentDomain;();summary;df-generated |
 | System;AppDomain;get_DynamicDirectory;();summary;df-generated |
@@ -49176,6 +52377,15 @@ neutral
 | System;AppDomain;get_RelativeSearchPath;();summary;df-generated |
 | System;AppDomain;get_SetupInformation;();summary;df-generated |
 | System;AppDomain;get_ShadowCopyFiles;();summary;df-generated |
+| System;AppDomain;remove_AssemblyLoad;(System.AssemblyLoadEventHandler);summary;df-generated |
+| System;AppDomain;remove_AssemblyResolve;(System.ResolveEventHandler);summary;df-generated |
+| System;AppDomain;remove_DomainUnload;(System.EventHandler);summary;df-generated |
+| System;AppDomain;remove_FirstChanceException;(System.EventHandler<System.Runtime.ExceptionServices.FirstChanceExceptionEventArgs>);summary;df-generated |
+| System;AppDomain;remove_ProcessExit;(System.EventHandler);summary;df-generated |
+| System;AppDomain;remove_ReflectionOnlyAssemblyResolve;(System.ResolveEventHandler);summary;df-generated |
+| System;AppDomain;remove_ResourceResolve;(System.ResolveEventHandler);summary;df-generated |
+| System;AppDomain;remove_TypeResolve;(System.ResolveEventHandler);summary;df-generated |
+| System;AppDomain;remove_UnhandledException;(System.UnhandledExceptionEventHandler);summary;df-generated |
 | System;AppDomainUnloadedException;AppDomainUnloadedException;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);summary;df-generated |
 | System;AppDomainUnloadedException;AppDomainUnloadedException;(System.String);summary;df-generated |
 | System;AppDomainUnloadedException;AppDomainUnloadedException;(System.String,System.Exception);summary;df-generated |
@@ -49277,8 +52487,8 @@ neutral
 | System;Array;LastIndexOf<T>;(T[],T);summary;df-generated |
 | System;Array;LastIndexOf<T>;(T[],T,System.Int32);summary;df-generated |
 | System;Array;LastIndexOf<T>;(T[],T,System.Int32,System.Int32);summary;df-generated |
+| System;Array;Remove;(System.Object);summary;df-generated |
 | System;Array;RemoveAt;(System.Int32);summary;df-generated |
-| System;Array;Resize<T>;(T[],System.Int32);summary;df-generated |
 | System;Array;SetValue;(System.Object,System.Int32);summary;df-generated |
 | System;Array;SetValue;(System.Object,System.Int32,System.Int32);summary;df-generated |
 | System;Array;SetValue;(System.Object,System.Int32,System.Int32,System.Int32);summary;df-generated |
@@ -49297,6 +52507,7 @@ neutral
 | System;Array;Sort;(System.Array,System.Int32,System.Int32,System.Collections.IComparer);summary;df-generated |
 | System;Array;Sort<T>;(T[]);summary;df-generated |
 | System;Array;Sort<T>;(T[],System.Collections.Generic.IComparer<T>);summary;df-generated |
+| System;Array;Sort<T>;(T[],System.Comparison<T>);summary;df-generated |
 | System;Array;Sort<T>;(T[],System.Int32,System.Int32);summary;df-generated |
 | System;Array;Sort<T>;(T[],System.Int32,System.Int32,System.Collections.Generic.IComparer<T>);summary;df-generated |
 | System;Array;Sort<TKey,TValue>;(TKey[],TValue[]);summary;df-generated |
@@ -49314,6 +52525,7 @@ neutral
 | System;ArraySegment<T>+Enumerator;Dispose;();summary;df-generated |
 | System;ArraySegment<T>+Enumerator;MoveNext;();summary;df-generated |
 | System;ArraySegment<T>+Enumerator;Reset;();summary;df-generated |
+| System;ArraySegment<T>+Enumerator;get_Current;();summary;df-generated |
 | System;ArraySegment<T>;Contains;(T);summary;df-generated |
 | System;ArraySegment<T>;CopyTo;(System.ArraySegment<T>);summary;df-generated |
 | System;ArraySegment<T>;CopyTo;(T[]);summary;df-generated |
@@ -49328,6 +52540,7 @@ neutral
 | System;ArraySegment<T>;get_Count;();summary;df-generated |
 | System;ArraySegment<T>;get_Empty;();summary;df-generated |
 | System;ArraySegment<T>;get_IsReadOnly;();summary;df-generated |
+| System;ArraySegment<T>;get_Item;(System.Int32);summary;df-generated |
 | System;ArraySegment<T>;get_Offset;();summary;df-generated |
 | System;ArraySegment<T>;op_Equality;(System.ArraySegment<T>,System.ArraySegment<T>);summary;df-generated |
 | System;ArraySegment<T>;op_Inequality;(System.ArraySegment<T>,System.ArraySegment<T>);summary;df-generated |
@@ -49824,6 +53037,7 @@ neutral
 | System;Console;WriteLine;(System.String,System.Object[]);summary;df-generated |
 | System;Console;WriteLine;(System.UInt32);summary;df-generated |
 | System;Console;WriteLine;(System.UInt64);summary;df-generated |
+| System;Console;add_CancelKeyPress;(System.ConsoleCancelEventHandler);summary;df-generated |
 | System;Console;get_CapsLock;();summary;df-generated |
 | System;Console;get_Error;();summary;df-generated |
 | System;Console;get_In;();summary;df-generated |
@@ -49835,6 +53049,7 @@ neutral
 | System;Console;get_LargestWindowWidth;();summary;df-generated |
 | System;Console;get_NumberLock;();summary;df-generated |
 | System;Console;get_Out;();summary;df-generated |
+| System;Console;remove_CancelKeyPress;(System.ConsoleCancelEventHandler);summary;df-generated |
 | System;ConsoleCancelEventArgs;get_SpecialKey;();summary;df-generated |
 | System;ConsoleKeyInfo;ConsoleKeyInfo;(System.Char,System.ConsoleKey,System.Boolean,System.Boolean,System.Boolean);summary;df-generated |
 | System;ConsoleKeyInfo;Equals;(System.ConsoleKeyInfo);summary;df-generated |
@@ -50221,6 +53436,21 @@ neutral
 | System;Decimal;Round;(System.Decimal,System.MidpointRounding);summary;df-generated |
 | System;Decimal;Sign;(System.Decimal);summary;df-generated |
 | System;Decimal;Subtract;(System.Decimal,System.Decimal);summary;df-generated |
+| System;Decimal;System.Numerics.IAdditionOperators<System.Decimal,System.Decimal,System.Decimal>.op_Addition;(System.Decimal,System.Decimal);summary;df-generated |
+| System;Decimal;System.Numerics.IComparisonOperators<System.Decimal,System.Decimal,System.Boolean>.op_GreaterThan;(System.Decimal,System.Decimal);summary;df-generated |
+| System;Decimal;System.Numerics.IComparisonOperators<System.Decimal,System.Decimal,System.Boolean>.op_GreaterThanOrEqual;(System.Decimal,System.Decimal);summary;df-generated |
+| System;Decimal;System.Numerics.IComparisonOperators<System.Decimal,System.Decimal,System.Boolean>.op_LessThan;(System.Decimal,System.Decimal);summary;df-generated |
+| System;Decimal;System.Numerics.IComparisonOperators<System.Decimal,System.Decimal,System.Boolean>.op_LessThanOrEqual;(System.Decimal,System.Decimal);summary;df-generated |
+| System;Decimal;System.Numerics.IDecrementOperators<System.Decimal>.op_Decrement;(System.Decimal);summary;df-generated |
+| System;Decimal;System.Numerics.IDivisionOperators<System.Decimal,System.Decimal,System.Decimal>.op_Division;(System.Decimal,System.Decimal);summary;df-generated |
+| System;Decimal;System.Numerics.IEqualityOperators<System.Decimal,System.Decimal,System.Boolean>.op_Equality;(System.Decimal,System.Decimal);summary;df-generated |
+| System;Decimal;System.Numerics.IEqualityOperators<System.Decimal,System.Decimal,System.Boolean>.op_Inequality;(System.Decimal,System.Decimal);summary;df-generated |
+| System;Decimal;System.Numerics.IIncrementOperators<System.Decimal>.op_Increment;(System.Decimal);summary;df-generated |
+| System;Decimal;System.Numerics.IModulusOperators<System.Decimal,System.Decimal,System.Decimal>.op_Modulus;(System.Decimal,System.Decimal);summary;df-generated |
+| System;Decimal;System.Numerics.IMultiplyOperators<System.Decimal,System.Decimal,System.Decimal>.op_Multiply;(System.Decimal,System.Decimal);summary;df-generated |
+| System;Decimal;System.Numerics.ISubtractionOperators<System.Decimal,System.Decimal,System.Decimal>.op_Subtraction;(System.Decimal,System.Decimal);summary;df-generated |
+| System;Decimal;System.Numerics.IUnaryNegationOperators<System.Decimal,System.Decimal>.op_UnaryNegation;(System.Decimal);summary;df-generated |
+| System;Decimal;System.Numerics.IUnaryPlusOperators<System.Decimal,System.Decimal>.op_UnaryPlus;(System.Decimal);summary;df-generated |
 | System;Decimal;ToBoolean;(System.IFormatProvider);summary;df-generated |
 | System;Decimal;ToByte;(System.Decimal);summary;df-generated |
 | System;Decimal;ToByte;(System.IFormatProvider);summary;df-generated |
@@ -50292,6 +53522,7 @@ neutral
 | System;Delegate;CreateDelegate;(System.Type,System.Type,System.String,System.Boolean,System.Boolean);summary;df-generated |
 | System;Delegate;Equals;(System.Object);summary;df-generated |
 | System;Delegate;GetHashCode;();summary;df-generated |
+| System;Delegate;get_Method;();summary;df-generated |
 | System;Delegate;op_Equality;(System.Delegate,System.Delegate);summary;df-generated |
 | System;Delegate;op_Inequality;(System.Delegate,System.Delegate);summary;df-generated |
 | System;DivideByZeroException;DivideByZeroException;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);summary;df-generated |
@@ -50410,8 +53641,14 @@ neutral
 | System;Double;System.Numerics.IBitwiseOperators<System.Double,System.Double,System.Double>.op_BitwiseOr;(System.Double,System.Double);summary;df-generated |
 | System;Double;System.Numerics.IBitwiseOperators<System.Double,System.Double,System.Double>.op_ExclusiveOr;(System.Double,System.Double);summary;df-generated |
 | System;Double;System.Numerics.IBitwiseOperators<System.Double,System.Double,System.Double>.op_OnesComplement;(System.Double);summary;df-generated |
+| System;Double;System.Numerics.IComparisonOperators<System.Double,System.Double,System.Boolean>.op_GreaterThan;(System.Double,System.Double);summary;df-generated |
+| System;Double;System.Numerics.IComparisonOperators<System.Double,System.Double,System.Boolean>.op_GreaterThanOrEqual;(System.Double,System.Double);summary;df-generated |
+| System;Double;System.Numerics.IComparisonOperators<System.Double,System.Double,System.Boolean>.op_LessThan;(System.Double,System.Double);summary;df-generated |
+| System;Double;System.Numerics.IComparisonOperators<System.Double,System.Double,System.Boolean>.op_LessThanOrEqual;(System.Double,System.Double);summary;df-generated |
 | System;Double;System.Numerics.IDecrementOperators<System.Double>.op_Decrement;(System.Double);summary;df-generated |
 | System;Double;System.Numerics.IDivisionOperators<System.Double,System.Double,System.Double>.op_Division;(System.Double,System.Double);summary;df-generated |
+| System;Double;System.Numerics.IEqualityOperators<System.Double,System.Double,System.Boolean>.op_Equality;(System.Double,System.Double);summary;df-generated |
+| System;Double;System.Numerics.IEqualityOperators<System.Double,System.Double,System.Boolean>.op_Inequality;(System.Double,System.Double);summary;df-generated |
 | System;Double;System.Numerics.IIncrementOperators<System.Double>.op_Increment;(System.Double);summary;df-generated |
 | System;Double;System.Numerics.IModulusOperators<System.Double,System.Double,System.Double>.op_Modulus;(System.Double,System.Double);summary;df-generated |
 | System;Double;System.Numerics.IMultiplyOperators<System.Double,System.Double,System.Double>.op_Multiply;(System.Double,System.Double);summary;df-generated |
@@ -50575,7 +53812,10 @@ neutral
 | System;Environment;get_Version;();summary;df-generated |
 | System;Environment;get_WorkingSet;();summary;df-generated |
 | System;Exception;GetType;();summary;df-generated |
+| System;Exception;add_SerializeObjectState;(System.EventHandler<System.Runtime.Serialization.SafeSerializationEventArgs>);summary;df-generated |
 | System;Exception;get_Data;();summary;df-generated |
+| System;Exception;get_TargetSite;();summary;df-generated |
+| System;Exception;remove_SerializeObjectState;(System.EventHandler<System.Runtime.Serialization.SafeSerializationEventArgs>);summary;df-generated |
 | System;ExecutionEngineException;ExecutionEngineException;(System.String);summary;df-generated |
 | System;ExecutionEngineException;ExecutionEngineException;(System.String,System.Exception);summary;df-generated |
 | System;FieldAccessException;FieldAccessException;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);summary;df-generated |
@@ -50609,6 +53849,7 @@ neutral
 | System;GC;ReRegisterForFinalize;(System.Object);summary;df-generated |
 | System;GC;RefreshMemoryLimit;();summary;df-generated |
 | System;GC;RegisterForFullGCNotification;(System.Int32,System.Int32);summary;df-generated |
+| System;GC;RegisterNoGCRegionCallback;(System.Int64,System.Action);summary;df-generated |
 | System;GC;RemoveMemoryPressure;(System.Int64);summary;df-generated |
 | System;GC;SuppressFinalize;(System.Object);summary;df-generated |
 | System;GC;TryStartNoGCRegion;(System.Int64);summary;df-generated |
@@ -50695,6 +53936,8 @@ neutral
 | System;Half;Atan;(System.Half);summary;df-generated |
 | System;Half;AtanPi;(System.Half);summary;df-generated |
 | System;Half;Atanh;(System.Half);summary;df-generated |
+| System;Half;BitDecrement;(System.Half);summary;df-generated |
+| System;Half;BitIncrement;(System.Half);summary;df-generated |
 | System;Half;Cbrt;(System.Half);summary;df-generated |
 | System;Half;Ceiling;(System.Half);summary;df-generated |
 | System;Half;Clamp;(System.Half,System.Half,System.Half);summary;df-generated |
@@ -50751,8 +53994,10 @@ neutral
 | System;Half;LogP1;(System.Half);summary;df-generated |
 | System;Half;Max;(System.Half,System.Half);summary;df-generated |
 | System;Half;MaxMagnitude;(System.Half,System.Half);summary;df-generated |
+| System;Half;MaxMagnitudeNumber;(System.Half,System.Half);summary;df-generated |
 | System;Half;Min;(System.Half,System.Half);summary;df-generated |
 | System;Half;MinMagnitude;(System.Half,System.Half);summary;df-generated |
+| System;Half;MinMagnitudeNumber;(System.Half,System.Half);summary;df-generated |
 | System;Half;Parse;(System.ReadOnlySpan<System.Byte>,System.Globalization.NumberStyles,System.IFormatProvider);summary;df-generated |
 | System;Half;Parse;(System.ReadOnlySpan<System.Byte>,System.IFormatProvider);summary;df-generated |
 | System;Half;Parse;(System.ReadOnlySpan<System.Char>,System.Globalization.NumberStyles,System.IFormatProvider);summary;df-generated |
@@ -50778,10 +54023,25 @@ neutral
 | System;Half;SinPi;(System.Half);summary;df-generated |
 | System;Half;Sinh;(System.Half);summary;df-generated |
 | System;Half;Sqrt;(System.Half);summary;df-generated |
+| System;Half;System.Numerics.IAdditionOperators<System.Half,System.Half,System.Half>.op_Addition;(System.Half,System.Half);summary;df-generated |
 | System;Half;System.Numerics.IBitwiseOperators<System.Half,System.Half,System.Half>.op_BitwiseAnd;(System.Half,System.Half);summary;df-generated |
 | System;Half;System.Numerics.IBitwiseOperators<System.Half,System.Half,System.Half>.op_BitwiseOr;(System.Half,System.Half);summary;df-generated |
 | System;Half;System.Numerics.IBitwiseOperators<System.Half,System.Half,System.Half>.op_ExclusiveOr;(System.Half,System.Half);summary;df-generated |
 | System;Half;System.Numerics.IBitwiseOperators<System.Half,System.Half,System.Half>.op_OnesComplement;(System.Half);summary;df-generated |
+| System;Half;System.Numerics.IComparisonOperators<System.Half,System.Half,System.Boolean>.op_GreaterThan;(System.Half,System.Half);summary;df-generated |
+| System;Half;System.Numerics.IComparisonOperators<System.Half,System.Half,System.Boolean>.op_GreaterThanOrEqual;(System.Half,System.Half);summary;df-generated |
+| System;Half;System.Numerics.IComparisonOperators<System.Half,System.Half,System.Boolean>.op_LessThan;(System.Half,System.Half);summary;df-generated |
+| System;Half;System.Numerics.IComparisonOperators<System.Half,System.Half,System.Boolean>.op_LessThanOrEqual;(System.Half,System.Half);summary;df-generated |
+| System;Half;System.Numerics.IDecrementOperators<System.Half>.op_Decrement;(System.Half);summary;df-generated |
+| System;Half;System.Numerics.IDivisionOperators<System.Half,System.Half,System.Half>.op_Division;(System.Half,System.Half);summary;df-generated |
+| System;Half;System.Numerics.IEqualityOperators<System.Half,System.Half,System.Boolean>.op_Equality;(System.Half,System.Half);summary;df-generated |
+| System;Half;System.Numerics.IEqualityOperators<System.Half,System.Half,System.Boolean>.op_Inequality;(System.Half,System.Half);summary;df-generated |
+| System;Half;System.Numerics.IIncrementOperators<System.Half>.op_Increment;(System.Half);summary;df-generated |
+| System;Half;System.Numerics.IModulusOperators<System.Half,System.Half,System.Half>.op_Modulus;(System.Half,System.Half);summary;df-generated |
+| System;Half;System.Numerics.IMultiplyOperators<System.Half,System.Half,System.Half>.op_Multiply;(System.Half,System.Half);summary;df-generated |
+| System;Half;System.Numerics.ISubtractionOperators<System.Half,System.Half,System.Half>.op_Subtraction;(System.Half,System.Half);summary;df-generated |
+| System;Half;System.Numerics.IUnaryNegationOperators<System.Half,System.Half>.op_UnaryNegation;(System.Half);summary;df-generated |
+| System;Half;System.Numerics.IUnaryPlusOperators<System.Half,System.Half>.op_UnaryPlus;(System.Half);summary;df-generated |
 | System;Half;Tan;(System.Half);summary;df-generated |
 | System;Half;TanPi;(System.Half);summary;df-generated |
 | System;Half;Tanh;(System.Half);summary;df-generated |
@@ -50827,7 +54087,6 @@ neutral
 | System;Half;get_Tau;();summary;df-generated |
 | System;Half;get_Zero;();summary;df-generated |
 | System;HashCode;Add<T>;(T);summary;df-generated |
-| System;HashCode;Add<T>;(T,System.Collections.Generic.IEqualityComparer<T>);summary;df-generated |
 | System;HashCode;AddBytes;(System.ReadOnlySpan<System.Byte>);summary;df-generated |
 | System;HashCode;Combine<T1,T2,T3,T4,T5,T6,T7,T8>;(T1,T2,T3,T4,T5,T6,T7,T8);summary;df-generated |
 | System;HashCode;Combine<T1,T2,T3,T4,T5,T6,T7>;(T1,T2,T3,T4,T5,T6,T7);summary;df-generated |
@@ -51064,7 +54323,10 @@ neutral
 | System;Int32;MinNumber;(System.Int32,System.Int32);summary;df-generated |
 | System;Int32;Parse;(System.ReadOnlySpan<System.Byte>,System.Globalization.NumberStyles,System.IFormatProvider);summary;df-generated |
 | System;Int32;Parse;(System.ReadOnlySpan<System.Byte>,System.IFormatProvider);summary;df-generated |
+| System;Int32;Parse;(System.ReadOnlySpan<System.Char>,System.Globalization.NumberStyles,System.IFormatProvider);summary;df-generated |
 | System;Int32;Parse;(System.ReadOnlySpan<System.Char>,System.IFormatProvider);summary;df-generated |
+| System;Int32;Parse;(System.String,System.Globalization.NumberStyles,System.IFormatProvider);summary;df-generated |
+| System;Int32;Parse;(System.String,System.IFormatProvider);summary;df-generated |
 | System;Int32;PopCount;(System.Int32);summary;df-generated |
 | System;Int32;RotateLeft;(System.Int32,System.Int32);summary;df-generated |
 | System;Int32;RotateRight;(System.Int32,System.Int32);summary;df-generated |
@@ -51123,7 +54385,9 @@ neutral
 | System;Int32;TryParse;(System.ReadOnlySpan<System.Byte>,System.Globalization.NumberStyles,System.IFormatProvider,System.Int32);summary;df-generated |
 | System;Int32;TryParse;(System.ReadOnlySpan<System.Byte>,System.IFormatProvider,System.Int32);summary;df-generated |
 | System;Int32;TryParse;(System.ReadOnlySpan<System.Byte>,System.Int32);summary;df-generated |
+| System;Int32;TryParse;(System.ReadOnlySpan<System.Char>,System.Globalization.NumberStyles,System.IFormatProvider,System.Int32);summary;df-generated |
 | System;Int32;TryParse;(System.ReadOnlySpan<System.Char>,System.IFormatProvider,System.Int32);summary;df-generated |
+| System;Int32;TryParse;(System.String,System.Globalization.NumberStyles,System.IFormatProvider,System.Int32);summary;df-generated |
 | System;Int32;TryParse;(System.String,System.IFormatProvider,System.Int32);summary;df-generated |
 | System;Int32;TryReadBigEndian;(System.ReadOnlySpan<System.Byte>,System.Boolean,System.Int32);summary;df-generated |
 | System;Int32;TryReadLittleEndian;(System.ReadOnlySpan<System.Byte>,System.Boolean,System.Int32);summary;df-generated |
@@ -51266,6 +54530,7 @@ neutral
 | System;Int64;get_One;();summary;df-generated |
 | System;Int64;get_Radix;();summary;df-generated |
 | System;Int64;get_Zero;();summary;df-generated |
+| System;Int128;Abs;(System.Int128);summary;df-generated |
 | System;Int128;CompareTo;(System.Int128);summary;df-generated |
 | System;Int128;CompareTo;(System.Object);summary;df-generated |
 | System;Int128;DivRem;(System.Int128,System.Int128);summary;df-generated |
@@ -51295,6 +54560,10 @@ neutral
 | System;Int128;IsZero;(System.Int128);summary;df-generated |
 | System;Int128;LeadingZeroCount;(System.Int128);summary;df-generated |
 | System;Int128;Log2;(System.Int128);summary;df-generated |
+| System;Int128;MaxMagnitude;(System.Int128,System.Int128);summary;df-generated |
+| System;Int128;MaxMagnitudeNumber;(System.Int128,System.Int128);summary;df-generated |
+| System;Int128;MinMagnitude;(System.Int128,System.Int128);summary;df-generated |
+| System;Int128;MinMagnitudeNumber;(System.Int128,System.Int128);summary;df-generated |
 | System;Int128;Parse;(System.ReadOnlySpan<System.Byte>,System.Globalization.NumberStyles,System.IFormatProvider);summary;df-generated |
 | System;Int128;Parse;(System.ReadOnlySpan<System.Byte>,System.IFormatProvider);summary;df-generated |
 | System;Int128;Parse;(System.ReadOnlySpan<System.Char>,System.Globalization.NumberStyles,System.IFormatProvider);summary;df-generated |
@@ -51307,6 +54576,34 @@ neutral
 | System;Int128;RotateLeft;(System.Int128,System.Int32);summary;df-generated |
 | System;Int128;RotateRight;(System.Int128,System.Int32);summary;df-generated |
 | System;Int128;Sign;(System.Int128);summary;df-generated |
+| System;Int128;System.Numerics.IAdditionOperators<System.Int128,System.Int128,System.Int128>.op_Addition;(System.Int128,System.Int128);summary;df-generated |
+| System;Int128;System.Numerics.IBitwiseOperators<System.Int128,System.Int128,System.Int128>.op_BitwiseAnd;(System.Int128,System.Int128);summary;df-generated |
+| System;Int128;System.Numerics.IBitwiseOperators<System.Int128,System.Int128,System.Int128>.op_BitwiseOr;(System.Int128,System.Int128);summary;df-generated |
+| System;Int128;System.Numerics.IBitwiseOperators<System.Int128,System.Int128,System.Int128>.op_ExclusiveOr;(System.Int128,System.Int128);summary;df-generated |
+| System;Int128;System.Numerics.IBitwiseOperators<System.Int128,System.Int128,System.Int128>.op_OnesComplement;(System.Int128);summary;df-generated |
+| System;Int128;System.Numerics.IComparisonOperators<System.Int128,System.Int128,System.Boolean>.op_GreaterThan;(System.Int128,System.Int128);summary;df-generated |
+| System;Int128;System.Numerics.IComparisonOperators<System.Int128,System.Int128,System.Boolean>.op_GreaterThanOrEqual;(System.Int128,System.Int128);summary;df-generated |
+| System;Int128;System.Numerics.IComparisonOperators<System.Int128,System.Int128,System.Boolean>.op_LessThan;(System.Int128,System.Int128);summary;df-generated |
+| System;Int128;System.Numerics.IComparisonOperators<System.Int128,System.Int128,System.Boolean>.op_LessThanOrEqual;(System.Int128,System.Int128);summary;df-generated |
+| System;Int128;System.Numerics.IDecrementOperators<System.Int128>.op_CheckedDecrement;(System.Int128);summary;df-generated |
+| System;Int128;System.Numerics.IDecrementOperators<System.Int128>.op_Decrement;(System.Int128);summary;df-generated |
+| System;Int128;System.Numerics.IDivisionOperators<System.Int128,System.Int128,System.Int128>.op_CheckedDivision;(System.Int128,System.Int128);summary;df-generated |
+| System;Int128;System.Numerics.IDivisionOperators<System.Int128,System.Int128,System.Int128>.op_Division;(System.Int128,System.Int128);summary;df-generated |
+| System;Int128;System.Numerics.IEqualityOperators<System.Int128,System.Int128,System.Boolean>.op_Equality;(System.Int128,System.Int128);summary;df-generated |
+| System;Int128;System.Numerics.IEqualityOperators<System.Int128,System.Int128,System.Boolean>.op_Inequality;(System.Int128,System.Int128);summary;df-generated |
+| System;Int128;System.Numerics.IIncrementOperators<System.Int128>.op_CheckedIncrement;(System.Int128);summary;df-generated |
+| System;Int128;System.Numerics.IIncrementOperators<System.Int128>.op_Increment;(System.Int128);summary;df-generated |
+| System;Int128;System.Numerics.IModulusOperators<System.Int128,System.Int128,System.Int128>.op_Modulus;(System.Int128,System.Int128);summary;df-generated |
+| System;Int128;System.Numerics.IMultiplyOperators<System.Int128,System.Int128,System.Int128>.op_CheckedMultiply;(System.Int128,System.Int128);summary;df-generated |
+| System;Int128;System.Numerics.IMultiplyOperators<System.Int128,System.Int128,System.Int128>.op_Multiply;(System.Int128,System.Int128);summary;df-generated |
+| System;Int128;System.Numerics.IShiftOperators<System.Int128,System.Int32,System.Int128>.op_LeftShift;(System.Int128,System.Int32);summary;df-generated |
+| System;Int128;System.Numerics.IShiftOperators<System.Int128,System.Int32,System.Int128>.op_RightShift;(System.Int128,System.Int32);summary;df-generated |
+| System;Int128;System.Numerics.IShiftOperators<System.Int128,System.Int32,System.Int128>.op_UnsignedRightShift;(System.Int128,System.Int32);summary;df-generated |
+| System;Int128;System.Numerics.ISubtractionOperators<System.Int128,System.Int128,System.Int128>.op_CheckedSubtraction;(System.Int128,System.Int128);summary;df-generated |
+| System;Int128;System.Numerics.ISubtractionOperators<System.Int128,System.Int128,System.Int128>.op_Subtraction;(System.Int128,System.Int128);summary;df-generated |
+| System;Int128;System.Numerics.IUnaryNegationOperators<System.Int128,System.Int128>.op_CheckedUnaryNegation;(System.Int128);summary;df-generated |
+| System;Int128;System.Numerics.IUnaryNegationOperators<System.Int128,System.Int128>.op_UnaryNegation;(System.Int128);summary;df-generated |
+| System;Int128;System.Numerics.IUnaryPlusOperators<System.Int128,System.Int128>.op_UnaryPlus;(System.Int128);summary;df-generated |
 | System;Int128;ToString;();summary;df-generated |
 | System;Int128;ToString;(System.IFormatProvider);summary;df-generated |
 | System;Int128;ToString;(System.String);summary;df-generated |
@@ -51341,6 +54638,7 @@ neutral
 | System;Int128;get_One;();summary;df-generated |
 | System;Int128;get_Radix;();summary;df-generated |
 | System;Int128;get_Zero;();summary;df-generated |
+| System;IntPtr;Abs;(System.IntPtr);summary;df-generated |
 | System;IntPtr;CompareTo;(System.IntPtr);summary;df-generated |
 | System;IntPtr;CompareTo;(System.Object);summary;df-generated |
 | System;IntPtr;DivRem;(System.IntPtr,System.IntPtr);summary;df-generated |
@@ -51372,6 +54670,10 @@ neutral
 | System;IntPtr;IsZero;(System.IntPtr);summary;df-generated |
 | System;IntPtr;LeadingZeroCount;(System.IntPtr);summary;df-generated |
 | System;IntPtr;Log2;(System.IntPtr);summary;df-generated |
+| System;IntPtr;MaxMagnitude;(System.IntPtr,System.IntPtr);summary;df-generated |
+| System;IntPtr;MaxMagnitudeNumber;(System.IntPtr,System.IntPtr);summary;df-generated |
+| System;IntPtr;MinMagnitude;(System.IntPtr,System.IntPtr);summary;df-generated |
+| System;IntPtr;MinMagnitudeNumber;(System.IntPtr,System.IntPtr);summary;df-generated |
 | System;IntPtr;Parse;(System.ReadOnlySpan<System.Byte>,System.Globalization.NumberStyles,System.IFormatProvider);summary;df-generated |
 | System;IntPtr;Parse;(System.ReadOnlySpan<System.Byte>,System.IFormatProvider);summary;df-generated |
 | System;IntPtr;Parse;(System.ReadOnlySpan<System.Char>,System.Globalization.NumberStyles,System.IFormatProvider);summary;df-generated |
@@ -51385,6 +54687,7 @@ neutral
 | System;IntPtr;RotateRight;(System.IntPtr,System.Int32);summary;df-generated |
 | System;IntPtr;Sign;(System.IntPtr);summary;df-generated |
 | System;IntPtr;Subtract;(System.IntPtr,System.Int32);summary;df-generated |
+| System;IntPtr;System.Numerics.IAdditionOperators<nint,nint,nint>.op_Addition;(System.IntPtr,System.IntPtr);summary;df-generated |
 | System;IntPtr;System.Numerics.IBitwiseOperators<nint,nint,nint>.op_BitwiseAnd;(System.IntPtr,System.IntPtr);summary;df-generated |
 | System;IntPtr;System.Numerics.IBitwiseOperators<nint,nint,nint>.op_BitwiseOr;(System.IntPtr,System.IntPtr);summary;df-generated |
 | System;IntPtr;System.Numerics.IBitwiseOperators<nint,nint,nint>.op_ExclusiveOr;(System.IntPtr,System.IntPtr);summary;df-generated |
@@ -51396,6 +54699,8 @@ neutral
 | System;IntPtr;System.Numerics.IDecrementOperators<nint>.op_CheckedDecrement;(System.IntPtr);summary;df-generated |
 | System;IntPtr;System.Numerics.IDecrementOperators<nint>.op_Decrement;(System.IntPtr);summary;df-generated |
 | System;IntPtr;System.Numerics.IDivisionOperators<nint,nint,nint>.op_Division;(System.IntPtr,System.IntPtr);summary;df-generated |
+| System;IntPtr;System.Numerics.IEqualityOperators<nint,nint,System.Boolean>.op_Equality;(System.IntPtr,System.IntPtr);summary;df-generated |
+| System;IntPtr;System.Numerics.IEqualityOperators<nint,nint,System.Boolean>.op_Inequality;(System.IntPtr,System.IntPtr);summary;df-generated |
 | System;IntPtr;System.Numerics.IIncrementOperators<nint>.op_CheckedIncrement;(System.IntPtr);summary;df-generated |
 | System;IntPtr;System.Numerics.IIncrementOperators<nint>.op_Increment;(System.IntPtr);summary;df-generated |
 | System;IntPtr;System.Numerics.IModulusOperators<nint,nint,nint>.op_Modulus;(System.IntPtr,System.IntPtr);summary;df-generated |
@@ -51659,9 +54964,7 @@ neutral
 | System;MemoryExtensions;BinarySearch<T>;(System.ReadOnlySpan<T>,System.IComparable<T>);summary;df-generated |
 | System;MemoryExtensions;BinarySearch<T>;(System.Span<T>,System.IComparable<T>);summary;df-generated |
 | System;MemoryExtensions;CommonPrefixLength<T>;(System.ReadOnlySpan<T>,System.ReadOnlySpan<T>);summary;df-generated |
-| System;MemoryExtensions;CommonPrefixLength<T>;(System.ReadOnlySpan<T>,System.ReadOnlySpan<T>,System.Collections.Generic.IEqualityComparer<T>);summary;df-generated |
 | System;MemoryExtensions;CommonPrefixLength<T>;(System.Span<T>,System.ReadOnlySpan<T>);summary;df-generated |
-| System;MemoryExtensions;CommonPrefixLength<T>;(System.Span<T>,System.ReadOnlySpan<T>,System.Collections.Generic.IEqualityComparer<T>);summary;df-generated |
 | System;MemoryExtensions;CompareTo;(System.ReadOnlySpan<System.Char>,System.ReadOnlySpan<System.Char>,System.StringComparison);summary;df-generated |
 | System;MemoryExtensions;Contains;(System.ReadOnlySpan<System.Char>,System.ReadOnlySpan<System.Char>,System.StringComparison);summary;df-generated |
 | System;MemoryExtensions;Contains<T>;(System.ReadOnlySpan<T>,T);summary;df-generated |
@@ -51761,13 +55064,12 @@ neutral
 | System;MemoryExtensions;SequenceCompareTo<T>;(System.ReadOnlySpan<T>,System.ReadOnlySpan<T>);summary;df-generated |
 | System;MemoryExtensions;SequenceCompareTo<T>;(System.Span<T>,System.ReadOnlySpan<T>);summary;df-generated |
 | System;MemoryExtensions;SequenceEqual<T>;(System.ReadOnlySpan<T>,System.ReadOnlySpan<T>);summary;df-generated |
-| System;MemoryExtensions;SequenceEqual<T>;(System.ReadOnlySpan<T>,System.ReadOnlySpan<T>,System.Collections.Generic.IEqualityComparer<T>);summary;df-generated |
 | System;MemoryExtensions;SequenceEqual<T>;(System.Span<T>,System.ReadOnlySpan<T>);summary;df-generated |
-| System;MemoryExtensions;SequenceEqual<T>;(System.Span<T>,System.ReadOnlySpan<T>,System.Collections.Generic.IEqualityComparer<T>);summary;df-generated |
 | System;MemoryExtensions;Sort<T,TComparer>;(System.Span<T>,TComparer);summary;df-generated |
 | System;MemoryExtensions;Sort<T>;(System.Span<T>);summary;df-generated |
 | System;MemoryExtensions;Sort<TKey,TValue,TComparer>;(System.Span<TKey>,System.Span<TValue>,TComparer);summary;df-generated |
 | System;MemoryExtensions;Sort<TKey,TValue>;(System.Span<TKey>,System.Span<TValue>);summary;df-generated |
+| System;MemoryExtensions;Sort<TKey,TValue>;(System.Span<TKey>,System.Span<TValue>,System.Comparison<TKey>);summary;df-generated |
 | System;MemoryExtensions;Split;(System.ReadOnlySpan<System.Char>,System.Span<System.Range>,System.Char,System.StringSplitOptions);summary;df-generated |
 | System;MemoryExtensions;Split;(System.ReadOnlySpan<System.Char>,System.Span<System.Range>,System.ReadOnlySpan<System.Char>,System.StringSplitOptions);summary;df-generated |
 | System;MemoryExtensions;SplitAny;(System.ReadOnlySpan<System.Char>,System.Span<System.Range>,System.ReadOnlySpan<System.Char>,System.StringSplitOptions);summary;df-generated |
@@ -51779,10 +55081,8 @@ neutral
 | System;MemoryExtensions;ToLowerInvariant;(System.ReadOnlySpan<System.Char>,System.Span<System.Char>);summary;df-generated |
 | System;MemoryExtensions;ToUpper;(System.ReadOnlySpan<System.Char>,System.Span<System.Char>,System.Globalization.CultureInfo);summary;df-generated |
 | System;MemoryExtensions;ToUpperInvariant;(System.ReadOnlySpan<System.Char>,System.Span<System.Char>);summary;df-generated |
-| System;MemoryExtensions;TryWrite;(System.Span<System.Char>,System.IFormatProvider,System.MemoryExtensions+TryWriteInterpolatedStringHandler,System.Int32);summary;df-generated |
 | System;MemoryExtensions;TryWrite;(System.Span<System.Char>,System.IFormatProvider,System.Text.CompositeFormat,System.Int32,System.Object[]);summary;df-generated |
 | System;MemoryExtensions;TryWrite;(System.Span<System.Char>,System.IFormatProvider,System.Text.CompositeFormat,System.Int32,System.ReadOnlySpan<System.Object>);summary;df-generated |
-| System;MemoryExtensions;TryWrite;(System.Span<System.Char>,System.MemoryExtensions+TryWriteInterpolatedStringHandler,System.Int32);summary;df-generated |
 | System;MemoryExtensions;TryWrite<TArg0,TArg1,TArg2>;(System.Span<System.Char>,System.IFormatProvider,System.Text.CompositeFormat,System.Int32,TArg0,TArg1,TArg2);summary;df-generated |
 | System;MemoryExtensions;TryWrite<TArg0,TArg1>;(System.Span<System.Char>,System.IFormatProvider,System.Text.CompositeFormat,System.Int32,TArg0,TArg1);summary;df-generated |
 | System;MemoryExtensions;TryWrite<TArg0>;(System.Span<System.Char>,System.IFormatProvider,System.Text.CompositeFormat,System.Int32,TArg0);summary;df-generated |
@@ -51886,7 +55186,10 @@ neutral
 | System;PlatformNotSupportedException;PlatformNotSupportedException;(System.String);summary;df-generated |
 | System;PlatformNotSupportedException;PlatformNotSupportedException;(System.String,System.Exception);summary;df-generated |
 | System;Progress<T>;OnReport;(T);summary;df-generated |
+| System;Progress<T>;Progress;(System.Action<T>);summary;df-generated |
 | System;Progress<T>;Report;(T);summary;df-generated |
+| System;Progress<T>;add_ProgressChanged;(System.EventHandler<T>);summary;df-generated |
+| System;Progress<T>;remove_ProgressChanged;(System.EventHandler<T>);summary;df-generated |
 | System;Random;GetItems<T>;(System.ReadOnlySpan<T>,System.Int32);summary;df-generated |
 | System;Random;GetItems<T>;(System.ReadOnlySpan<T>,System.Span<T>);summary;df-generated |
 | System;Random;GetItems<T>;(T[],System.Int32);summary;df-generated |
@@ -52203,8 +55506,14 @@ neutral
 | System;Single;System.Numerics.IBitwiseOperators<System.Single,System.Single,System.Single>.op_BitwiseOr;(System.Single,System.Single);summary;df-generated |
 | System;Single;System.Numerics.IBitwiseOperators<System.Single,System.Single,System.Single>.op_ExclusiveOr;(System.Single,System.Single);summary;df-generated |
 | System;Single;System.Numerics.IBitwiseOperators<System.Single,System.Single,System.Single>.op_OnesComplement;(System.Single);summary;df-generated |
+| System;Single;System.Numerics.IComparisonOperators<System.Single,System.Single,System.Boolean>.op_GreaterThan;(System.Single,System.Single);summary;df-generated |
+| System;Single;System.Numerics.IComparisonOperators<System.Single,System.Single,System.Boolean>.op_GreaterThanOrEqual;(System.Single,System.Single);summary;df-generated |
+| System;Single;System.Numerics.IComparisonOperators<System.Single,System.Single,System.Boolean>.op_LessThan;(System.Single,System.Single);summary;df-generated |
+| System;Single;System.Numerics.IComparisonOperators<System.Single,System.Single,System.Boolean>.op_LessThanOrEqual;(System.Single,System.Single);summary;df-generated |
 | System;Single;System.Numerics.IDecrementOperators<System.Single>.op_Decrement;(System.Single);summary;df-generated |
 | System;Single;System.Numerics.IDivisionOperators<System.Single,System.Single,System.Single>.op_Division;(System.Single,System.Single);summary;df-generated |
+| System;Single;System.Numerics.IEqualityOperators<System.Single,System.Single,System.Boolean>.op_Equality;(System.Single,System.Single);summary;df-generated |
+| System;Single;System.Numerics.IEqualityOperators<System.Single,System.Single,System.Boolean>.op_Inequality;(System.Single,System.Single);summary;df-generated |
 | System;Single;System.Numerics.IIncrementOperators<System.Single>.op_Increment;(System.Single);summary;df-generated |
 | System;Single;System.Numerics.IModulusOperators<System.Single,System.Single,System.Single>.op_Modulus;(System.Single,System.Single);summary;df-generated |
 | System;Single;System.Numerics.IMultiplyOperators<System.Single,System.Single,System.Single>.op_Multiply;(System.Single,System.Single);summary;df-generated |
@@ -52300,8 +55609,6 @@ neutral
 | System;String;Contains;(System.String,System.StringComparison);summary;df-generated |
 | System;String;CopyTo;(System.Int32,System.Char[],System.Int32,System.Int32);summary;df-generated |
 | System;String;CopyTo;(System.Span<System.Char>);summary;df-generated |
-| System;String;Create;(System.IFormatProvider,System.Runtime.CompilerServices.DefaultInterpolatedStringHandler);summary;df-generated |
-| System;String;Create;(System.IFormatProvider,System.Span<System.Char>,System.Runtime.CompilerServices.DefaultInterpolatedStringHandler);summary;df-generated |
 | System;String;EndsWith;(System.Char);summary;df-generated |
 | System;String;EndsWith;(System.String);summary;df-generated |
 | System;String;EndsWith;(System.String,System.Boolean,System.Globalization.CultureInfo);summary;df-generated |
@@ -52349,6 +55656,7 @@ neutral
 | System;String;LastIndexOfAny;(System.Char[],System.Int32);summary;df-generated |
 | System;String;LastIndexOfAny;(System.Char[],System.Int32,System.Int32);summary;df-generated |
 | System;String;Parse;(System.ReadOnlySpan<System.Char>,System.IFormatProvider);summary;df-generated |
+| System;String;Parse;(System.String,System.IFormatProvider);summary;df-generated |
 | System;String;StartsWith;(System.Char);summary;df-generated |
 | System;String;StartsWith;(System.String);summary;df-generated |
 | System;String;StartsWith;(System.String,System.Boolean,System.Globalization.CultureInfo);summary;df-generated |
@@ -52376,11 +55684,11 @@ neutral
 | System;String;ToUInt64;(System.IFormatProvider);summary;df-generated |
 | System;String;TryCopyTo;(System.Span<System.Char>);summary;df-generated |
 | System;String;TryParse;(System.ReadOnlySpan<System.Char>,System.IFormatProvider,System.String);summary;df-generated |
+| System;String;TryParse;(System.String,System.IFormatProvider,System.String);summary;df-generated |
 | System;String;get_Chars;(System.Int32);summary;df-generated |
 | System;String;get_Length;();summary;df-generated |
 | System;String;op_Equality;(System.String,System.String);summary;df-generated |
 | System;String;op_Inequality;(System.String,System.String);summary;df-generated |
-| System;StringComparer;Compare;(System.Object,System.Object);summary;df-generated |
 | System;StringComparer;Compare;(System.String,System.String);summary;df-generated |
 | System;StringComparer;Create;(System.Globalization.CultureInfo,System.Boolean);summary;df-generated |
 | System;StringComparer;Create;(System.Globalization.CultureInfo,System.Globalization.CompareOptions);summary;df-generated |
@@ -52475,6 +55783,7 @@ neutral
 | System;TimeOnly;op_LessThan;(System.TimeOnly,System.TimeOnly);summary;df-generated |
 | System;TimeOnly;op_LessThanOrEqual;(System.TimeOnly,System.TimeOnly);summary;df-generated |
 | System;TimeOnly;op_Subtraction;(System.TimeOnly,System.TimeOnly);summary;df-generated |
+| System;TimeProvider;CreateTimer;(System.Threading.TimerCallback,System.Object,System.TimeSpan,System.TimeSpan);summary;df-generated |
 | System;TimeProvider;GetElapsedTime;(System.Int64);summary;df-generated |
 | System;TimeProvider;GetElapsedTime;(System.Int64,System.Int64);summary;df-generated |
 | System;TimeProvider;GetLocalNow;();summary;df-generated |
@@ -52747,6 +56056,9 @@ neutral
 | System;Type;GetType;(System.String);summary;df-generated |
 | System;Type;GetType;(System.String,System.Boolean);summary;df-generated |
 | System;Type;GetType;(System.String,System.Boolean,System.Boolean);summary;df-generated |
+| System;Type;GetType;(System.String,System.Func<System.Reflection.AssemblyName,System.Reflection.Assembly>,System.Func<System.Reflection.Assembly,System.String,System.Boolean,System.Type>);summary;df-generated |
+| System;Type;GetType;(System.String,System.Func<System.Reflection.AssemblyName,System.Reflection.Assembly>,System.Func<System.Reflection.Assembly,System.String,System.Boolean,System.Type>,System.Boolean);summary;df-generated |
+| System;Type;GetType;(System.String,System.Func<System.Reflection.AssemblyName,System.Reflection.Assembly>,System.Func<System.Reflection.Assembly,System.String,System.Boolean,System.Type>,System.Boolean,System.Boolean);summary;df-generated |
 | System;Type;GetTypeArray;(System.Object[]);summary;df-generated |
 | System;Type;GetTypeCode;(System.Type);summary;df-generated |
 | System;Type;GetTypeCodeImpl;();summary;df-generated |
@@ -53235,6 +56547,7 @@ neutral
 | System;UInt64;get_One;();summary;df-generated |
 | System;UInt64;get_Radix;();summary;df-generated |
 | System;UInt64;get_Zero;();summary;df-generated |
+| System;UInt128;Abs;(System.UInt128);summary;df-generated |
 | System;UInt128;CompareTo;(System.Object);summary;df-generated |
 | System;UInt128;CompareTo;(System.UInt128);summary;df-generated |
 | System;UInt128;DivRem;(System.UInt128,System.UInt128);summary;df-generated |
@@ -53263,6 +56576,10 @@ neutral
 | System;UInt128;IsZero;(System.UInt128);summary;df-generated |
 | System;UInt128;LeadingZeroCount;(System.UInt128);summary;df-generated |
 | System;UInt128;Log2;(System.UInt128);summary;df-generated |
+| System;UInt128;MaxMagnitude;(System.UInt128,System.UInt128);summary;df-generated |
+| System;UInt128;MaxMagnitudeNumber;(System.UInt128,System.UInt128);summary;df-generated |
+| System;UInt128;MinMagnitude;(System.UInt128,System.UInt128);summary;df-generated |
+| System;UInt128;MinMagnitudeNumber;(System.UInt128,System.UInt128);summary;df-generated |
 | System;UInt128;Parse;(System.ReadOnlySpan<System.Byte>,System.Globalization.NumberStyles,System.IFormatProvider);summary;df-generated |
 | System;UInt128;Parse;(System.ReadOnlySpan<System.Byte>,System.IFormatProvider);summary;df-generated |
 | System;UInt128;Parse;(System.ReadOnlySpan<System.Char>,System.Globalization.NumberStyles,System.IFormatProvider);summary;df-generated |
@@ -53275,6 +56592,34 @@ neutral
 | System;UInt128;RotateLeft;(System.UInt128,System.Int32);summary;df-generated |
 | System;UInt128;RotateRight;(System.UInt128,System.Int32);summary;df-generated |
 | System;UInt128;Sign;(System.UInt128);summary;df-generated |
+| System;UInt128;System.Numerics.IAdditionOperators<System.UInt128,System.UInt128,System.UInt128>.op_Addition;(System.UInt128,System.UInt128);summary;df-generated |
+| System;UInt128;System.Numerics.IBitwiseOperators<System.UInt128,System.UInt128,System.UInt128>.op_BitwiseAnd;(System.UInt128,System.UInt128);summary;df-generated |
+| System;UInt128;System.Numerics.IBitwiseOperators<System.UInt128,System.UInt128,System.UInt128>.op_BitwiseOr;(System.UInt128,System.UInt128);summary;df-generated |
+| System;UInt128;System.Numerics.IBitwiseOperators<System.UInt128,System.UInt128,System.UInt128>.op_ExclusiveOr;(System.UInt128,System.UInt128);summary;df-generated |
+| System;UInt128;System.Numerics.IBitwiseOperators<System.UInt128,System.UInt128,System.UInt128>.op_OnesComplement;(System.UInt128);summary;df-generated |
+| System;UInt128;System.Numerics.IComparisonOperators<System.UInt128,System.UInt128,System.Boolean>.op_GreaterThan;(System.UInt128,System.UInt128);summary;df-generated |
+| System;UInt128;System.Numerics.IComparisonOperators<System.UInt128,System.UInt128,System.Boolean>.op_GreaterThanOrEqual;(System.UInt128,System.UInt128);summary;df-generated |
+| System;UInt128;System.Numerics.IComparisonOperators<System.UInt128,System.UInt128,System.Boolean>.op_LessThan;(System.UInt128,System.UInt128);summary;df-generated |
+| System;UInt128;System.Numerics.IComparisonOperators<System.UInt128,System.UInt128,System.Boolean>.op_LessThanOrEqual;(System.UInt128,System.UInt128);summary;df-generated |
+| System;UInt128;System.Numerics.IDecrementOperators<System.UInt128>.op_CheckedDecrement;(System.UInt128);summary;df-generated |
+| System;UInt128;System.Numerics.IDecrementOperators<System.UInt128>.op_Decrement;(System.UInt128);summary;df-generated |
+| System;UInt128;System.Numerics.IDivisionOperators<System.UInt128,System.UInt128,System.UInt128>.op_CheckedDivision;(System.UInt128,System.UInt128);summary;df-generated |
+| System;UInt128;System.Numerics.IDivisionOperators<System.UInt128,System.UInt128,System.UInt128>.op_Division;(System.UInt128,System.UInt128);summary;df-generated |
+| System;UInt128;System.Numerics.IEqualityOperators<System.UInt128,System.UInt128,System.Boolean>.op_Equality;(System.UInt128,System.UInt128);summary;df-generated |
+| System;UInt128;System.Numerics.IEqualityOperators<System.UInt128,System.UInt128,System.Boolean>.op_Inequality;(System.UInt128,System.UInt128);summary;df-generated |
+| System;UInt128;System.Numerics.IIncrementOperators<System.UInt128>.op_CheckedIncrement;(System.UInt128);summary;df-generated |
+| System;UInt128;System.Numerics.IIncrementOperators<System.UInt128>.op_Increment;(System.UInt128);summary;df-generated |
+| System;UInt128;System.Numerics.IModulusOperators<System.UInt128,System.UInt128,System.UInt128>.op_Modulus;(System.UInt128,System.UInt128);summary;df-generated |
+| System;UInt128;System.Numerics.IMultiplyOperators<System.UInt128,System.UInt128,System.UInt128>.op_CheckedMultiply;(System.UInt128,System.UInt128);summary;df-generated |
+| System;UInt128;System.Numerics.IMultiplyOperators<System.UInt128,System.UInt128,System.UInt128>.op_Multiply;(System.UInt128,System.UInt128);summary;df-generated |
+| System;UInt128;System.Numerics.IShiftOperators<System.UInt128,System.Int32,System.UInt128>.op_LeftShift;(System.UInt128,System.Int32);summary;df-generated |
+| System;UInt128;System.Numerics.IShiftOperators<System.UInt128,System.Int32,System.UInt128>.op_RightShift;(System.UInt128,System.Int32);summary;df-generated |
+| System;UInt128;System.Numerics.IShiftOperators<System.UInt128,System.Int32,System.UInt128>.op_UnsignedRightShift;(System.UInt128,System.Int32);summary;df-generated |
+| System;UInt128;System.Numerics.ISubtractionOperators<System.UInt128,System.UInt128,System.UInt128>.op_CheckedSubtraction;(System.UInt128,System.UInt128);summary;df-generated |
+| System;UInt128;System.Numerics.ISubtractionOperators<System.UInt128,System.UInt128,System.UInt128>.op_Subtraction;(System.UInt128,System.UInt128);summary;df-generated |
+| System;UInt128;System.Numerics.IUnaryNegationOperators<System.UInt128,System.UInt128>.op_CheckedUnaryNegation;(System.UInt128);summary;df-generated |
+| System;UInt128;System.Numerics.IUnaryNegationOperators<System.UInt128,System.UInt128>.op_UnaryNegation;(System.UInt128);summary;df-generated |
+| System;UInt128;System.Numerics.IUnaryPlusOperators<System.UInt128,System.UInt128>.op_UnaryPlus;(System.UInt128);summary;df-generated |
 | System;UInt128;ToString;();summary;df-generated |
 | System;UInt128;ToString;(System.IFormatProvider);summary;df-generated |
 | System;UInt128;ToString;(System.String);summary;df-generated |
@@ -53309,6 +56654,7 @@ neutral
 | System;UInt128;get_One;();summary;df-generated |
 | System;UInt128;get_Radix;();summary;df-generated |
 | System;UInt128;get_Zero;();summary;df-generated |
+| System;UIntPtr;Abs;(System.UIntPtr);summary;df-generated |
 | System;UIntPtr;CompareTo;(System.Object);summary;df-generated |
 | System;UIntPtr;CompareTo;(System.UIntPtr);summary;df-generated |
 | System;UIntPtr;DivRem;(System.UIntPtr,System.UIntPtr);summary;df-generated |
@@ -53337,6 +56683,10 @@ neutral
 | System;UIntPtr;IsZero;(System.UIntPtr);summary;df-generated |
 | System;UIntPtr;LeadingZeroCount;(System.UIntPtr);summary;df-generated |
 | System;UIntPtr;Log2;(System.UIntPtr);summary;df-generated |
+| System;UIntPtr;MaxMagnitude;(System.UIntPtr,System.UIntPtr);summary;df-generated |
+| System;UIntPtr;MaxMagnitudeNumber;(System.UIntPtr,System.UIntPtr);summary;df-generated |
+| System;UIntPtr;MinMagnitude;(System.UIntPtr,System.UIntPtr);summary;df-generated |
+| System;UIntPtr;MinMagnitudeNumber;(System.UIntPtr,System.UIntPtr);summary;df-generated |
 | System;UIntPtr;Parse;(System.ReadOnlySpan<System.Byte>,System.Globalization.NumberStyles,System.IFormatProvider);summary;df-generated |
 | System;UIntPtr;Parse;(System.ReadOnlySpan<System.Byte>,System.IFormatProvider);summary;df-generated |
 | System;UIntPtr;Parse;(System.ReadOnlySpan<System.Char>,System.Globalization.NumberStyles,System.IFormatProvider);summary;df-generated |
@@ -53350,6 +56700,7 @@ neutral
 | System;UIntPtr;RotateRight;(System.UIntPtr,System.Int32);summary;df-generated |
 | System;UIntPtr;Sign;(System.UIntPtr);summary;df-generated |
 | System;UIntPtr;Subtract;(System.UIntPtr,System.Int32);summary;df-generated |
+| System;UIntPtr;System.Numerics.IAdditionOperators<nuint,nuint,nuint>.op_Addition;(System.UIntPtr,System.UIntPtr);summary;df-generated |
 | System;UIntPtr;System.Numerics.IBitwiseOperators<nuint,nuint,nuint>.op_BitwiseAnd;(System.UIntPtr,System.UIntPtr);summary;df-generated |
 | System;UIntPtr;System.Numerics.IBitwiseOperators<nuint,nuint,nuint>.op_BitwiseOr;(System.UIntPtr,System.UIntPtr);summary;df-generated |
 | System;UIntPtr;System.Numerics.IBitwiseOperators<nuint,nuint,nuint>.op_ExclusiveOr;(System.UIntPtr,System.UIntPtr);summary;df-generated |
@@ -53361,6 +56712,8 @@ neutral
 | System;UIntPtr;System.Numerics.IDecrementOperators<nuint>.op_CheckedDecrement;(System.UIntPtr);summary;df-generated |
 | System;UIntPtr;System.Numerics.IDecrementOperators<nuint>.op_Decrement;(System.UIntPtr);summary;df-generated |
 | System;UIntPtr;System.Numerics.IDivisionOperators<nuint,nuint,nuint>.op_Division;(System.UIntPtr,System.UIntPtr);summary;df-generated |
+| System;UIntPtr;System.Numerics.IEqualityOperators<nuint,nuint,System.Boolean>.op_Equality;(System.UIntPtr,System.UIntPtr);summary;df-generated |
+| System;UIntPtr;System.Numerics.IEqualityOperators<nuint,nuint,System.Boolean>.op_Inequality;(System.UIntPtr,System.UIntPtr);summary;df-generated |
 | System;UIntPtr;System.Numerics.IIncrementOperators<nuint>.op_CheckedIncrement;(System.UIntPtr);summary;df-generated |
 | System;UIntPtr;System.Numerics.IIncrementOperators<nuint>.op_Increment;(System.UIntPtr);summary;df-generated |
 | System;UIntPtr;System.Numerics.IModulusOperators<nuint,nuint,nuint>.op_Modulus;(System.UIntPtr,System.UIntPtr);summary;df-generated |
@@ -53428,6 +56781,7 @@ neutral
 | System;Uri;Escape;();summary;df-generated |
 | System;Uri;FromHex;(System.Char);summary;df-generated |
 | System;Uri;GetHashCode;();summary;df-generated |
+| System;Uri;GetObjectData;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);summary;df-generated |
 | System;Uri;HexEscape;(System.Char);summary;df-generated |
 | System;Uri;HexUnescape;(System.String,System.Int32);summary;df-generated |
 | System;Uri;IsBadFileSystemCharacter;(System.Char);summary;df-generated |
@@ -53442,6 +56796,7 @@ neutral
 | System;Uri;TryFormat;(System.Span<System.Char>,System.Int32);summary;df-generated |
 | System;Uri;TryFormat;(System.Span<System.Char>,System.Int32,System.ReadOnlySpan<System.Char>,System.IFormatProvider);summary;df-generated |
 | System;Uri;Unescape;(System.String);summary;df-generated |
+| System;Uri;Uri;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);summary;df-generated |
 | System;Uri;get_AbsoluteUri;();summary;df-generated |
 | System;Uri;get_Fragment;();summary;df-generated |
 | System;Uri;get_HostNameType;();summary;df-generated |
diff --git a/csharp/ql/test/library-tests/dataflow/library/FlowSummariesFiltered.expected b/csharp/ql/test/library-tests/dataflow/library/FlowSummariesFiltered.expected
index 1a0077da2c4..6fb375dae85 100644
--- a/csharp/ql/test/library-tests/dataflow/library/FlowSummariesFiltered.expected
+++ b/csharp/ql/test/library-tests/dataflow/library/FlowSummariesFiltered.expected
@@ -473,10 +473,8 @@
 | Microsoft.AspNetCore.Mvc.ModelBinding.Metadata;DisplayMetadata;set_Placeholder;(System.Func<System.String>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | Microsoft.AspNetCore.Mvc.ModelBinding.Validation;ValidationEntry;ValidationEntry;(Microsoft.AspNetCore.Mvc.ModelBinding.ModelMetadata,System.String,System.Func<System.Object>);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
 | Microsoft.AspNetCore.Mvc.ModelBinding;BindingInfo;set_RequestPredicate;(System.Func<Microsoft.AspNetCore.Mvc.ActionContext,System.Boolean>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
-| Microsoft.AspNetCore.Mvc.ModelBinding;CompositeValueProvider;InsertItem;(System.Int32,Microsoft.AspNetCore.Mvc.ModelBinding.IValueProvider);Argument[1];Argument[this];taint;df-generated |
-| Microsoft.AspNetCore.Mvc.ModelBinding;CompositeValueProvider;InsertItem;(System.Int32,Microsoft.AspNetCore.Mvc.ModelBinding.IValueProvider);Argument[this];Argument[1];taint;df-generated |
+| Microsoft.AspNetCore.Mvc.ModelBinding;CompositeValueProvider;InsertItem;(System.Int32,Microsoft.AspNetCore.Mvc.ModelBinding.IValueProvider);Argument[1];Argument[this].SyntheticField[System.Collections.ObjectModel.Collection`1.items].Element;value;dfc-generated |
 | Microsoft.AspNetCore.Mvc.ModelBinding;CompositeValueProvider;SetItem;(System.Int32,Microsoft.AspNetCore.Mvc.ModelBinding.IValueProvider);Argument[1];Argument[this];taint;df-generated |
-| Microsoft.AspNetCore.Mvc.ModelBinding;CompositeValueProvider;SetItem;(System.Int32,Microsoft.AspNetCore.Mvc.ModelBinding.IValueProvider);Argument[this];Argument[1];taint;df-generated |
 | Microsoft.AspNetCore.Mvc.ModelBinding;EnumGroupAndName;EnumGroupAndName;(System.String,System.Func<System.String>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
 | Microsoft.AspNetCore.Mvc.ModelBinding;ModelBindingContext;set_PropertyFilter;(System.Func<Microsoft.AspNetCore.Mvc.ModelBinding.ModelMetadata,System.Boolean>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | Microsoft.AspNetCore.Mvc.ModelBinding;ModelStateDictionaryExtensions;AddModelError<TModel>;(Microsoft.AspNetCore.Mvc.ModelBinding.ModelStateDictionary,System.Linq.Expressions.Expression<System.Func<TModel,System.Object>>,System.Exception,Microsoft.AspNetCore.Mvc.ModelBinding.ModelMetadata);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
@@ -658,17 +656,6 @@
 | Microsoft.AspNetCore;WebHost;Start;(System.String,System.Action<Microsoft.AspNetCore.Routing.IRouteBuilder>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
 | Microsoft.AspNetCore;WebHost;StartWith;(System.Action<Microsoft.AspNetCore.Builder.IApplicationBuilder>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | Microsoft.AspNetCore;WebHost;StartWith;(System.String,System.Action<Microsoft.AspNetCore.Builder.IApplicationBuilder>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
-| Microsoft.CSharp.RuntimeBinder;Binder;BinaryOperation;(Microsoft.CSharp.RuntimeBinder.CSharpBinderFlags,System.Linq.Expressions.ExpressionType,System.Type,System.Collections.Generic.IEnumerable<Microsoft.CSharp.RuntimeBinder.CSharpArgumentInfo>);Argument[3].Element;ReturnValue;taint;df-generated |
-| Microsoft.CSharp.RuntimeBinder;Binder;GetIndex;(Microsoft.CSharp.RuntimeBinder.CSharpBinderFlags,System.Type,System.Collections.Generic.IEnumerable<Microsoft.CSharp.RuntimeBinder.CSharpArgumentInfo>);Argument[2].Element;ReturnValue;taint;df-generated |
-| Microsoft.CSharp.RuntimeBinder;Binder;GetMember;(Microsoft.CSharp.RuntimeBinder.CSharpBinderFlags,System.String,System.Type,System.Collections.Generic.IEnumerable<Microsoft.CSharp.RuntimeBinder.CSharpArgumentInfo>);Argument[3].Element;ReturnValue;taint;df-generated |
-| Microsoft.CSharp.RuntimeBinder;Binder;Invoke;(Microsoft.CSharp.RuntimeBinder.CSharpBinderFlags,System.Type,System.Collections.Generic.IEnumerable<Microsoft.CSharp.RuntimeBinder.CSharpArgumentInfo>);Argument[2].Element;ReturnValue;taint;df-generated |
-| Microsoft.CSharp.RuntimeBinder;Binder;InvokeConstructor;(Microsoft.CSharp.RuntimeBinder.CSharpBinderFlags,System.Type,System.Collections.Generic.IEnumerable<Microsoft.CSharp.RuntimeBinder.CSharpArgumentInfo>);Argument[2].Element;ReturnValue;taint;df-generated |
-| Microsoft.CSharp.RuntimeBinder;Binder;InvokeMember;(Microsoft.CSharp.RuntimeBinder.CSharpBinderFlags,System.String,System.Collections.Generic.IEnumerable<System.Type>,System.Type,System.Collections.Generic.IEnumerable<Microsoft.CSharp.RuntimeBinder.CSharpArgumentInfo>);Argument[2].Element;ReturnValue;taint;df-generated |
-| Microsoft.CSharp.RuntimeBinder;Binder;InvokeMember;(Microsoft.CSharp.RuntimeBinder.CSharpBinderFlags,System.String,System.Collections.Generic.IEnumerable<System.Type>,System.Type,System.Collections.Generic.IEnumerable<Microsoft.CSharp.RuntimeBinder.CSharpArgumentInfo>);Argument[4].Element;ReturnValue;taint;df-generated |
-| Microsoft.CSharp.RuntimeBinder;Binder;IsEvent;(Microsoft.CSharp.RuntimeBinder.CSharpBinderFlags,System.String,System.Type);Argument[1];ReturnValue;taint;df-generated |
-| Microsoft.CSharp.RuntimeBinder;Binder;SetIndex;(Microsoft.CSharp.RuntimeBinder.CSharpBinderFlags,System.Type,System.Collections.Generic.IEnumerable<Microsoft.CSharp.RuntimeBinder.CSharpArgumentInfo>);Argument[2].Element;ReturnValue;taint;df-generated |
-| Microsoft.CSharp.RuntimeBinder;Binder;SetMember;(Microsoft.CSharp.RuntimeBinder.CSharpBinderFlags,System.String,System.Type,System.Collections.Generic.IEnumerable<Microsoft.CSharp.RuntimeBinder.CSharpArgumentInfo>);Argument[3].Element;ReturnValue;taint;df-generated |
-| Microsoft.CSharp.RuntimeBinder;Binder;UnaryOperation;(Microsoft.CSharp.RuntimeBinder.CSharpBinderFlags,System.Linq.Expressions.ExpressionType,System.Type,System.Collections.Generic.IEnumerable<Microsoft.CSharp.RuntimeBinder.CSharpArgumentInfo>);Argument[3].Element;ReturnValue;taint;df-generated |
 | Microsoft.CSharp.RuntimeBinder;CSharpArgumentInfo;Create;(Microsoft.CSharp.RuntimeBinder.CSharpArgumentInfoFlags,System.String);Argument[1];ReturnValue;taint;df-generated |
 | Microsoft.CSharp;CSharpCodeProvider;CSharpCodeProvider;(System.Collections.Generic.IDictionary<System.String,System.String>);Argument[0].Element;Argument[this];taint;df-generated |
 | Microsoft.EntityFrameworkCore;DbSet<TEntity>;Add;(TEntity);Argument[0];Argument[this].Element;value;manual |
@@ -683,72 +670,76 @@
 | Microsoft.EntityFrameworkCore;DbSet<TEntity>;Update;(TEntity);Argument[0];Argument[this].Element;value;manual |
 | Microsoft.EntityFrameworkCore;DbSet<TEntity>;UpdateRange;(System.Collections.Generic.IEnumerable<TEntity>);Argument[0].WithElement;Argument[this];value;manual |
 | Microsoft.EntityFrameworkCore;DbSet<TEntity>;UpdateRange;(TEntity[]);Argument[0].WithElement;Argument[this];value;manual |
-| Microsoft.Extensions.Caching.Distributed;DistributedCacheEntryExtensions;SetAbsoluteExpiration;(Microsoft.Extensions.Caching.Distributed.DistributedCacheEntryOptions,System.DateTimeOffset);Argument[0];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Caching.Distributed;DistributedCacheEntryExtensions;SetAbsoluteExpiration;(Microsoft.Extensions.Caching.Distributed.DistributedCacheEntryOptions,System.DateTimeOffset);Argument[1];Argument[0];taint;df-generated |
-| Microsoft.Extensions.Caching.Distributed;DistributedCacheEntryExtensions;SetAbsoluteExpiration;(Microsoft.Extensions.Caching.Distributed.DistributedCacheEntryOptions,System.DateTimeOffset);Argument[1];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Caching.Distributed;DistributedCacheEntryExtensions;SetAbsoluteExpiration;(Microsoft.Extensions.Caching.Distributed.DistributedCacheEntryOptions,System.TimeSpan);Argument[0];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Caching.Distributed;DistributedCacheEntryExtensions;SetAbsoluteExpiration;(Microsoft.Extensions.Caching.Distributed.DistributedCacheEntryOptions,System.TimeSpan);Argument[1];Argument[0];taint;df-generated |
-| Microsoft.Extensions.Caching.Distributed;DistributedCacheEntryExtensions;SetAbsoluteExpiration;(Microsoft.Extensions.Caching.Distributed.DistributedCacheEntryOptions,System.TimeSpan);Argument[1];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Caching.Distributed;DistributedCacheEntryExtensions;SetSlidingExpiration;(Microsoft.Extensions.Caching.Distributed.DistributedCacheEntryOptions,System.TimeSpan);Argument[0];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Caching.Distributed;DistributedCacheEntryExtensions;SetSlidingExpiration;(Microsoft.Extensions.Caching.Distributed.DistributedCacheEntryOptions,System.TimeSpan);Argument[1];Argument[0];taint;df-generated |
-| Microsoft.Extensions.Caching.Distributed;DistributedCacheEntryExtensions;SetSlidingExpiration;(Microsoft.Extensions.Caching.Distributed.DistributedCacheEntryOptions,System.TimeSpan);Argument[1];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Caching.Distributed;MemoryDistributedCache;MemoryDistributedCache;(Microsoft.Extensions.Options.IOptions<Microsoft.Extensions.Caching.Memory.MemoryDistributedCacheOptions>,Microsoft.Extensions.Logging.ILoggerFactory);Argument[0];Argument[this];taint;df-generated |
-| Microsoft.Extensions.Caching.Memory;CacheEntryExtensions;AddExpirationToken;(Microsoft.Extensions.Caching.Memory.ICacheEntry,Microsoft.Extensions.Primitives.IChangeToken);Argument[0];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Caching.Memory;CacheEntryExtensions;AddExpirationToken;(Microsoft.Extensions.Caching.Memory.ICacheEntry,Microsoft.Extensions.Primitives.IChangeToken);Argument[1];Argument[0];taint;df-generated |
-| Microsoft.Extensions.Caching.Memory;CacheEntryExtensions;AddExpirationToken;(Microsoft.Extensions.Caching.Memory.ICacheEntry,Microsoft.Extensions.Primitives.IChangeToken);Argument[1];ReturnValue;taint;df-generated |
+| Microsoft.Extensions.Caching.Distributed;DistributedCacheEntryExtensions;SetAbsoluteExpiration;(Microsoft.Extensions.Caching.Distributed.DistributedCacheEntryOptions,System.DateTimeOffset);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Caching.Distributed;DistributedCacheEntryExtensions;SetAbsoluteExpiration;(Microsoft.Extensions.Caching.Distributed.DistributedCacheEntryOptions,System.TimeSpan);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Caching.Distributed;DistributedCacheEntryExtensions;SetSlidingExpiration;(Microsoft.Extensions.Caching.Distributed.DistributedCacheEntryOptions,System.TimeSpan);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Caching.Memory;CacheEntryExtensions;AddExpirationToken;(Microsoft.Extensions.Caching.Memory.ICacheEntry,Microsoft.Extensions.Primitives.IChangeToken);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Caching.Memory;CacheEntryExtensions;AddExpirationToken;(Microsoft.Extensions.Caching.Memory.ICacheEntry,Microsoft.Extensions.Primitives.IChangeToken);Argument[1];Argument[0].Property[Microsoft.Extensions.Caching.Memory.ICacheEntry.ExpirationTokens].Element;value;dfc-generated |
+| Microsoft.Extensions.Caching.Memory;CacheEntryExtensions;AddExpirationToken;(Microsoft.Extensions.Caching.Memory.ICacheEntry,Microsoft.Extensions.Primitives.IChangeToken);Argument[1];ReturnValue.Property[Microsoft.Extensions.Caching.Memory.ICacheEntry.ExpirationTokens].Element;value;dfc-generated |
+| Microsoft.Extensions.Caching.Memory;CacheEntryExtensions;RegisterPostEvictionCallback;(Microsoft.Extensions.Caching.Memory.ICacheEntry,Microsoft.Extensions.Caching.Memory.PostEvictionDelegate);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Caching.Memory;CacheEntryExtensions;RegisterPostEvictionCallback;(Microsoft.Extensions.Caching.Memory.ICacheEntry,Microsoft.Extensions.Caching.Memory.PostEvictionDelegate);Argument[0];ReturnValue;value;hq-generated |
+| Microsoft.Extensions.Caching.Memory;CacheEntryExtensions;RegisterPostEvictionCallback;(Microsoft.Extensions.Caching.Memory.ICacheEntry,Microsoft.Extensions.Caching.Memory.PostEvictionDelegate);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.Caching.Memory;CacheEntryExtensions;RegisterPostEvictionCallback;(Microsoft.Extensions.Caching.Memory.ICacheEntry,Microsoft.Extensions.Caching.Memory.PostEvictionDelegate);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
+| Microsoft.Extensions.Caching.Memory;CacheEntryExtensions;RegisterPostEvictionCallback;(Microsoft.Extensions.Caching.Memory.ICacheEntry,Microsoft.Extensions.Caching.Memory.PostEvictionDelegate,System.Object);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Caching.Memory;CacheEntryExtensions;RegisterPostEvictionCallback;(Microsoft.Extensions.Caching.Memory.ICacheEntry,Microsoft.Extensions.Caching.Memory.PostEvictionDelegate,System.Object);Argument[0];ReturnValue;value;hq-generated |
+| Microsoft.Extensions.Caching.Memory;CacheEntryExtensions;RegisterPostEvictionCallback;(Microsoft.Extensions.Caching.Memory.ICacheEntry,Microsoft.Extensions.Caching.Memory.PostEvictionDelegate,System.Object);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.Caching.Memory;CacheEntryExtensions;RegisterPostEvictionCallback;(Microsoft.Extensions.Caching.Memory.ICacheEntry,Microsoft.Extensions.Caching.Memory.PostEvictionDelegate,System.Object);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
-| Microsoft.Extensions.Caching.Memory;CacheEntryExtensions;SetAbsoluteExpiration;(Microsoft.Extensions.Caching.Memory.ICacheEntry,System.DateTimeOffset);Argument[0];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Caching.Memory;CacheEntryExtensions;SetAbsoluteExpiration;(Microsoft.Extensions.Caching.Memory.ICacheEntry,System.TimeSpan);Argument[0];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Caching.Memory;CacheEntryExtensions;SetOptions;(Microsoft.Extensions.Caching.Memory.ICacheEntry,Microsoft.Extensions.Caching.Memory.MemoryCacheEntryOptions);Argument[0];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Caching.Memory;CacheEntryExtensions;SetOptions;(Microsoft.Extensions.Caching.Memory.ICacheEntry,Microsoft.Extensions.Caching.Memory.MemoryCacheEntryOptions);Argument[1];Argument[0];taint;df-generated |
-| Microsoft.Extensions.Caching.Memory;CacheEntryExtensions;SetOptions;(Microsoft.Extensions.Caching.Memory.ICacheEntry,Microsoft.Extensions.Caching.Memory.MemoryCacheEntryOptions);Argument[1];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Caching.Memory;CacheEntryExtensions;SetPriority;(Microsoft.Extensions.Caching.Memory.ICacheEntry,Microsoft.Extensions.Caching.Memory.CacheItemPriority);Argument[0];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Caching.Memory;CacheEntryExtensions;SetSize;(Microsoft.Extensions.Caching.Memory.ICacheEntry,System.Int64);Argument[0];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Caching.Memory;CacheEntryExtensions;SetSlidingExpiration;(Microsoft.Extensions.Caching.Memory.ICacheEntry,System.TimeSpan);Argument[0];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Caching.Memory;CacheEntryExtensions;SetValue;(Microsoft.Extensions.Caching.Memory.ICacheEntry,System.Object);Argument[0];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Caching.Memory;CacheEntryExtensions;SetValue;(Microsoft.Extensions.Caching.Memory.ICacheEntry,System.Object);Argument[1];Argument[0];taint;df-generated |
-| Microsoft.Extensions.Caching.Memory;CacheEntryExtensions;SetValue;(Microsoft.Extensions.Caching.Memory.ICacheEntry,System.Object);Argument[1];ReturnValue;taint;df-generated |
+| Microsoft.Extensions.Caching.Memory;CacheEntryExtensions;SetAbsoluteExpiration;(Microsoft.Extensions.Caching.Memory.ICacheEntry,System.DateTimeOffset);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Caching.Memory;CacheEntryExtensions;SetAbsoluteExpiration;(Microsoft.Extensions.Caching.Memory.ICacheEntry,System.TimeSpan);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Caching.Memory;CacheEntryExtensions;SetOptions;(Microsoft.Extensions.Caching.Memory.ICacheEntry,Microsoft.Extensions.Caching.Memory.MemoryCacheEntryOptions);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Caching.Memory;CacheEntryExtensions;SetOptions;(Microsoft.Extensions.Caching.Memory.ICacheEntry,Microsoft.Extensions.Caching.Memory.MemoryCacheEntryOptions);Argument[1].Property[Microsoft.Extensions.Caching.Memory.MemoryCacheEntryOptions.ExpirationTokens].Element;Argument[0].Property[Microsoft.Extensions.Caching.Memory.ICacheEntry.ExpirationTokens].Element;value;dfc-generated |
+| Microsoft.Extensions.Caching.Memory;CacheEntryExtensions;SetOptions;(Microsoft.Extensions.Caching.Memory.ICacheEntry,Microsoft.Extensions.Caching.Memory.MemoryCacheEntryOptions);Argument[1].Property[Microsoft.Extensions.Caching.Memory.MemoryCacheEntryOptions.ExpirationTokens].Element;ReturnValue.Property[Microsoft.Extensions.Caching.Memory.ICacheEntry.ExpirationTokens].Element;value;dfc-generated |
+| Microsoft.Extensions.Caching.Memory;CacheEntryExtensions;SetPriority;(Microsoft.Extensions.Caching.Memory.ICacheEntry,Microsoft.Extensions.Caching.Memory.CacheItemPriority);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Caching.Memory;CacheEntryExtensions;SetSize;(Microsoft.Extensions.Caching.Memory.ICacheEntry,System.Int64);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Caching.Memory;CacheEntryExtensions;SetSlidingExpiration;(Microsoft.Extensions.Caching.Memory.ICacheEntry,System.TimeSpan);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Caching.Memory;CacheEntryExtensions;SetValue;(Microsoft.Extensions.Caching.Memory.ICacheEntry,System.Object);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Caching.Memory;CacheExtensions;GetOrCreate<TItem>;(Microsoft.Extensions.Caching.Memory.IMemoryCache,System.Object,System.Func<Microsoft.Extensions.Caching.Memory.ICacheEntry,TItem>);Argument[2].ReturnValue;ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Caching.Memory;CacheExtensions;GetOrCreate<TItem>;(Microsoft.Extensions.Caching.Memory.IMemoryCache,System.Object,System.Func<Microsoft.Extensions.Caching.Memory.ICacheEntry,TItem>);Argument[2].ReturnValue;ReturnValue;value;hq-generated |
+| Microsoft.Extensions.Caching.Memory;CacheExtensions;GetOrCreate<TItem>;(Microsoft.Extensions.Caching.Memory.IMemoryCache,System.Object,System.Func<Microsoft.Extensions.Caching.Memory.ICacheEntry,TItem>);Argument[2];Argument[2].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.Caching.Memory;CacheExtensions;GetOrCreate<TItem>;(Microsoft.Extensions.Caching.Memory.IMemoryCache,System.Object,System.Func<Microsoft.Extensions.Caching.Memory.ICacheEntry,TItem>);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
 | Microsoft.Extensions.Caching.Memory;CacheExtensions;GetOrCreateAsync<TItem>;(Microsoft.Extensions.Caching.Memory.IMemoryCache,System.Object,System.Func<Microsoft.Extensions.Caching.Memory.ICacheEntry,System.Threading.Tasks.Task<TItem>>);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
-| Microsoft.Extensions.Caching.Memory;CacheExtensions;Set<TItem>;(Microsoft.Extensions.Caching.Memory.IMemoryCache,System.Object,TItem);Argument[2];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Caching.Memory;CacheExtensions;Set<TItem>;(Microsoft.Extensions.Caching.Memory.IMemoryCache,System.Object,TItem,Microsoft.Extensions.Caching.Memory.MemoryCacheEntryOptions);Argument[2];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Caching.Memory;CacheExtensions;Set<TItem>;(Microsoft.Extensions.Caching.Memory.IMemoryCache,System.Object,TItem,Microsoft.Extensions.Primitives.IChangeToken);Argument[2];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Caching.Memory;CacheExtensions;Set<TItem>;(Microsoft.Extensions.Caching.Memory.IMemoryCache,System.Object,TItem,System.DateTimeOffset);Argument[2];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Caching.Memory;CacheExtensions;Set<TItem>;(Microsoft.Extensions.Caching.Memory.IMemoryCache,System.Object,TItem,System.TimeSpan);Argument[2];ReturnValue;taint;df-generated |
+| Microsoft.Extensions.Caching.Memory;CacheExtensions;Set<TItem>;(Microsoft.Extensions.Caching.Memory.IMemoryCache,System.Object,TItem);Argument[2];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Caching.Memory;CacheExtensions;Set<TItem>;(Microsoft.Extensions.Caching.Memory.IMemoryCache,System.Object,TItem,Microsoft.Extensions.Caching.Memory.MemoryCacheEntryOptions);Argument[2];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Caching.Memory;CacheExtensions;Set<TItem>;(Microsoft.Extensions.Caching.Memory.IMemoryCache,System.Object,TItem,Microsoft.Extensions.Primitives.IChangeToken);Argument[2];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Caching.Memory;CacheExtensions;Set<TItem>;(Microsoft.Extensions.Caching.Memory.IMemoryCache,System.Object,TItem,System.DateTimeOffset);Argument[2];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Caching.Memory;CacheExtensions;Set<TItem>;(Microsoft.Extensions.Caching.Memory.IMemoryCache,System.Object,TItem,System.TimeSpan);Argument[2];ReturnValue;value;dfc-generated |
 | Microsoft.Extensions.Caching.Memory;ICacheEntry;get_ExpirationTokens;();Argument[this];ReturnValue;taint;df-generated |
 | Microsoft.Extensions.Caching.Memory;ICacheEntry;get_PostEvictionCallbacks;();Argument[this];ReturnValue;taint;df-generated |
 | Microsoft.Extensions.Caching.Memory;IMemoryCache;CreateEntry;(System.Object);Argument[0];ReturnValue;taint;df-generated |
 | Microsoft.Extensions.Caching.Memory;IMemoryCache;CreateEntry;(System.Object);Argument[this];ReturnValue;taint;df-generated |
 | Microsoft.Extensions.Caching.Memory;MemoryCache;MemoryCache;(Microsoft.Extensions.Options.IOptions<Microsoft.Extensions.Caching.Memory.MemoryCacheOptions>,Microsoft.Extensions.Logging.ILoggerFactory);Argument[0];Argument[this];taint;df-generated |
-| Microsoft.Extensions.Caching.Memory;MemoryCacheEntryExtensions;AddExpirationToken;(Microsoft.Extensions.Caching.Memory.MemoryCacheEntryOptions,Microsoft.Extensions.Primitives.IChangeToken);Argument[0];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Caching.Memory;MemoryCacheEntryExtensions;AddExpirationToken;(Microsoft.Extensions.Caching.Memory.MemoryCacheEntryOptions,Microsoft.Extensions.Primitives.IChangeToken);Argument[1];Argument[0];taint;df-generated |
-| Microsoft.Extensions.Caching.Memory;MemoryCacheEntryExtensions;AddExpirationToken;(Microsoft.Extensions.Caching.Memory.MemoryCacheEntryOptions,Microsoft.Extensions.Primitives.IChangeToken);Argument[1];ReturnValue;taint;df-generated |
+| Microsoft.Extensions.Caching.Memory;MemoryCacheEntryExtensions;AddExpirationToken;(Microsoft.Extensions.Caching.Memory.MemoryCacheEntryOptions,Microsoft.Extensions.Primitives.IChangeToken);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Caching.Memory;MemoryCacheEntryExtensions;AddExpirationToken;(Microsoft.Extensions.Caching.Memory.MemoryCacheEntryOptions,Microsoft.Extensions.Primitives.IChangeToken);Argument[1];Argument[0].Property[Microsoft.Extensions.Caching.Memory.MemoryCacheEntryOptions.ExpirationTokens].Element;value;dfc-generated |
+| Microsoft.Extensions.Caching.Memory;MemoryCacheEntryExtensions;AddExpirationToken;(Microsoft.Extensions.Caching.Memory.MemoryCacheEntryOptions,Microsoft.Extensions.Primitives.IChangeToken);Argument[1];ReturnValue.Property[Microsoft.Extensions.Caching.Memory.MemoryCacheEntryOptions.ExpirationTokens].Element;value;dfc-generated |
+| Microsoft.Extensions.Caching.Memory;MemoryCacheEntryExtensions;RegisterPostEvictionCallback;(Microsoft.Extensions.Caching.Memory.MemoryCacheEntryOptions,Microsoft.Extensions.Caching.Memory.PostEvictionDelegate);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Caching.Memory;MemoryCacheEntryExtensions;RegisterPostEvictionCallback;(Microsoft.Extensions.Caching.Memory.MemoryCacheEntryOptions,Microsoft.Extensions.Caching.Memory.PostEvictionDelegate);Argument[0];ReturnValue;value;hq-generated |
+| Microsoft.Extensions.Caching.Memory;MemoryCacheEntryExtensions;RegisterPostEvictionCallback;(Microsoft.Extensions.Caching.Memory.MemoryCacheEntryOptions,Microsoft.Extensions.Caching.Memory.PostEvictionDelegate);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.Caching.Memory;MemoryCacheEntryExtensions;RegisterPostEvictionCallback;(Microsoft.Extensions.Caching.Memory.MemoryCacheEntryOptions,Microsoft.Extensions.Caching.Memory.PostEvictionDelegate);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
+| Microsoft.Extensions.Caching.Memory;MemoryCacheEntryExtensions;RegisterPostEvictionCallback;(Microsoft.Extensions.Caching.Memory.MemoryCacheEntryOptions,Microsoft.Extensions.Caching.Memory.PostEvictionDelegate,System.Object);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Caching.Memory;MemoryCacheEntryExtensions;RegisterPostEvictionCallback;(Microsoft.Extensions.Caching.Memory.MemoryCacheEntryOptions,Microsoft.Extensions.Caching.Memory.PostEvictionDelegate,System.Object);Argument[0];ReturnValue;value;hq-generated |
+| Microsoft.Extensions.Caching.Memory;MemoryCacheEntryExtensions;RegisterPostEvictionCallback;(Microsoft.Extensions.Caching.Memory.MemoryCacheEntryOptions,Microsoft.Extensions.Caching.Memory.PostEvictionDelegate,System.Object);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.Caching.Memory;MemoryCacheEntryExtensions;RegisterPostEvictionCallback;(Microsoft.Extensions.Caching.Memory.MemoryCacheEntryOptions,Microsoft.Extensions.Caching.Memory.PostEvictionDelegate,System.Object);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
-| Microsoft.Extensions.Caching.Memory;MemoryCacheEntryExtensions;SetAbsoluteExpiration;(Microsoft.Extensions.Caching.Memory.MemoryCacheEntryOptions,System.DateTimeOffset);Argument[0];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Caching.Memory;MemoryCacheEntryExtensions;SetAbsoluteExpiration;(Microsoft.Extensions.Caching.Memory.MemoryCacheEntryOptions,System.DateTimeOffset);Argument[1];Argument[0];taint;df-generated |
-| Microsoft.Extensions.Caching.Memory;MemoryCacheEntryExtensions;SetAbsoluteExpiration;(Microsoft.Extensions.Caching.Memory.MemoryCacheEntryOptions,System.DateTimeOffset);Argument[1];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Caching.Memory;MemoryCacheEntryExtensions;SetAbsoluteExpiration;(Microsoft.Extensions.Caching.Memory.MemoryCacheEntryOptions,System.TimeSpan);Argument[0];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Caching.Memory;MemoryCacheEntryExtensions;SetAbsoluteExpiration;(Microsoft.Extensions.Caching.Memory.MemoryCacheEntryOptions,System.TimeSpan);Argument[1];Argument[0];taint;df-generated |
-| Microsoft.Extensions.Caching.Memory;MemoryCacheEntryExtensions;SetAbsoluteExpiration;(Microsoft.Extensions.Caching.Memory.MemoryCacheEntryOptions,System.TimeSpan);Argument[1];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Caching.Memory;MemoryCacheEntryExtensions;SetPriority;(Microsoft.Extensions.Caching.Memory.MemoryCacheEntryOptions,Microsoft.Extensions.Caching.Memory.CacheItemPriority);Argument[0];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Caching.Memory;MemoryCacheEntryExtensions;SetSize;(Microsoft.Extensions.Caching.Memory.MemoryCacheEntryOptions,System.Int64);Argument[0];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Caching.Memory;MemoryCacheEntryExtensions;SetSlidingExpiration;(Microsoft.Extensions.Caching.Memory.MemoryCacheEntryOptions,System.TimeSpan);Argument[0];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Caching.Memory;MemoryCacheEntryExtensions;SetSlidingExpiration;(Microsoft.Extensions.Caching.Memory.MemoryCacheEntryOptions,System.TimeSpan);Argument[1];Argument[0];taint;df-generated |
-| Microsoft.Extensions.Caching.Memory;MemoryCacheEntryExtensions;SetSlidingExpiration;(Microsoft.Extensions.Caching.Memory.MemoryCacheEntryOptions,System.TimeSpan);Argument[1];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Caching.Memory;MemoryCacheOptions;get_Value;();Argument[this];ReturnValue;value;df-generated |
+| Microsoft.Extensions.Caching.Memory;MemoryCacheEntryExtensions;SetAbsoluteExpiration;(Microsoft.Extensions.Caching.Memory.MemoryCacheEntryOptions,System.DateTimeOffset);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Caching.Memory;MemoryCacheEntryExtensions;SetAbsoluteExpiration;(Microsoft.Extensions.Caching.Memory.MemoryCacheEntryOptions,System.TimeSpan);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Caching.Memory;MemoryCacheEntryExtensions;SetPriority;(Microsoft.Extensions.Caching.Memory.MemoryCacheEntryOptions,Microsoft.Extensions.Caching.Memory.CacheItemPriority);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Caching.Memory;MemoryCacheEntryExtensions;SetSize;(Microsoft.Extensions.Caching.Memory.MemoryCacheEntryOptions,System.Int64);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Caching.Memory;MemoryCacheEntryExtensions;SetSlidingExpiration;(Microsoft.Extensions.Caching.Memory.MemoryCacheEntryOptions,System.TimeSpan);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Caching.Memory;MemoryCacheOptions;get_Value;();Argument[this];ReturnValue;value;dfc-generated |
 | Microsoft.Extensions.Caching.Memory;PostEvictionCallbackRegistration;set_EvictionCallback;(Microsoft.Extensions.Caching.Memory.PostEvictionDelegate);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | Microsoft.Extensions.Caching.Memory;PostEvictionDelegate;BeginInvoke;(System.Object,System.Object,Microsoft.Extensions.Caching.Memory.EvictionReason,System.Object,System.AsyncCallback,System.Object);Argument[4];Argument[4].Parameter[delegate-self];value;hq-generated |
-| Microsoft.Extensions.Configuration.EnvironmentVariables;EnvironmentVariablesConfigurationProvider;EnvironmentVariablesConfigurationProvider;(System.String);Argument[0];Argument[this];taint;df-generated |
+| Microsoft.Extensions.Configuration.EnvironmentVariables;EnvironmentVariablesConfigurationProvider;EnvironmentVariablesConfigurationProvider;(System.String);Argument[0];Argument[this].SyntheticField[Microsoft.Extensions.Configuration.EnvironmentVariables.EnvironmentVariablesConfigurationProvider._prefix];value;dfc-generated |
+| Microsoft.Extensions.Configuration.EnvironmentVariables;EnvironmentVariablesConfigurationProvider;ToString;();Argument[this].SyntheticField[Microsoft.Extensions.Configuration.EnvironmentVariables.EnvironmentVariablesConfigurationProvider._prefix];ReturnValue;taint;dfc-generated |
 | Microsoft.Extensions.Configuration.KeyPerFile;KeyPerFileConfigurationSource;set_IgnoreCondition;(System.Func<System.String,System.Boolean>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | Microsoft.Extensions.Configuration.Memory;MemoryConfigurationProvider;MemoryConfigurationProvider;(Microsoft.Extensions.Configuration.Memory.MemoryConfigurationSource);Argument[0];Argument[this];taint;df-generated |
-| Microsoft.Extensions.Configuration.UserSecrets;PathHelper;GetSecretsPathFromSecretsId;(System.String);Argument[0];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Configuration.Xml;XmlDocumentDecryptor;CreateDecryptingXmlReader;(System.IO.Stream,System.Xml.XmlReaderSettings);Argument[0];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Configuration;ChainedBuilderExtensions;AddConfiguration;(Microsoft.Extensions.Configuration.IConfigurationBuilder,Microsoft.Extensions.Configuration.IConfiguration);Argument[0];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Configuration;ChainedBuilderExtensions;AddConfiguration;(Microsoft.Extensions.Configuration.IConfigurationBuilder,Microsoft.Extensions.Configuration.IConfiguration,System.Boolean);Argument[0];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Configuration;ChainedConfigurationProvider;ChainedConfigurationProvider;(Microsoft.Extensions.Configuration.ChainedConfigurationSource);Argument[0];Argument[this];taint;df-generated |
-| Microsoft.Extensions.Configuration;ChainedConfigurationProvider;get_Configuration;();Argument[this];ReturnValue;taint;df-generated |
+| Microsoft.Extensions.Configuration.UserSecrets;PathHelper;GetSecretsPathFromSecretsId;(System.String);Argument[0];ReturnValue;taint;dfc-generated |
+| Microsoft.Extensions.Configuration.Xml;XmlDocumentDecryptor;CreateDecryptingXmlReader;(System.IO.Stream,System.Xml.XmlReaderSettings);Argument[0];ReturnValue;taint;dfc-generated |
+| Microsoft.Extensions.Configuration.Xml;XmlDocumentDecryptor;DecryptDocumentAndCreateXmlReader;(System.Xml.XmlDocument);Argument[0].Element;Argument[this];taint;df-generated |
+| Microsoft.Extensions.Configuration.Xml;XmlStreamConfigurationProvider;Read;(System.IO.Stream,Microsoft.Extensions.Configuration.Xml.XmlDocumentDecryptor);Argument[0];Argument[1];taint;df-generated |
+| Microsoft.Extensions.Configuration;ChainedBuilderExtensions;AddConfiguration;(Microsoft.Extensions.Configuration.IConfigurationBuilder,Microsoft.Extensions.Configuration.IConfiguration);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Configuration;ChainedBuilderExtensions;AddConfiguration;(Microsoft.Extensions.Configuration.IConfigurationBuilder,Microsoft.Extensions.Configuration.IConfiguration,System.Boolean);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Configuration;ChainedConfigurationProvider;ChainedConfigurationProvider;(Microsoft.Extensions.Configuration.ChainedConfigurationSource);Argument[0].Property[Microsoft.Extensions.Configuration.ChainedConfigurationSource.Configuration];Argument[this].SyntheticField[Microsoft.Extensions.Configuration.ChainedConfigurationProvider._config];value;dfc-generated |
+| Microsoft.Extensions.Configuration;ChainedConfigurationProvider;TryGet;(System.String,System.String);Argument[this].SyntheticField[Microsoft.Extensions.Configuration.ChainedConfigurationProvider._config];ReturnValue;taint;dfc-generated |
+| Microsoft.Extensions.Configuration;ChainedConfigurationProvider;get_Configuration;();Argument[this].SyntheticField[Microsoft.Extensions.Configuration.ChainedConfigurationProvider._config];ReturnValue;value;dfc-generated |
 | Microsoft.Extensions.Configuration;CommandLineConfigurationExtensions;AddCommandLine;(Microsoft.Extensions.Configuration.IConfigurationBuilder,System.Action<Microsoft.Extensions.Configuration.CommandLine.CommandLineConfigurationSource>);Argument[1];Argument[0];taint;manual |
 | Microsoft.Extensions.Configuration;CommandLineConfigurationExtensions;AddCommandLine;(Microsoft.Extensions.Configuration.IConfigurationBuilder,System.Action<Microsoft.Extensions.Configuration.CommandLine.CommandLineConfigurationSource>);Argument[1];Argument[1].Parameter[delegate-self];value;manual |
 | Microsoft.Extensions.Configuration;CommandLineConfigurationExtensions;AddCommandLine;(Microsoft.Extensions.Configuration.IConfigurationBuilder,System.Action<Microsoft.Extensions.Configuration.CommandLine.CommandLineConfigurationSource>);Argument[1];ReturnValue;taint;manual |
@@ -763,99 +754,113 @@
 | Microsoft.Extensions.Configuration;ConfigurationBinder;Get;(Microsoft.Extensions.Configuration.IConfiguration,System.Type,System.Action<Microsoft.Extensions.Configuration.BinderOptions>);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
 | Microsoft.Extensions.Configuration;ConfigurationBinder;Get<T>;(Microsoft.Extensions.Configuration.IConfiguration);Argument[0];ReturnValue;taint;df-generated |
 | Microsoft.Extensions.Configuration;ConfigurationBinder;Get<T>;(Microsoft.Extensions.Configuration.IConfiguration,System.Action<Microsoft.Extensions.Configuration.BinderOptions>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
-| Microsoft.Extensions.Configuration;ConfigurationBinder;GetValue;(Microsoft.Extensions.Configuration.IConfiguration,System.Type,System.String);Argument[0];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Configuration;ConfigurationBinder;GetValue;(Microsoft.Extensions.Configuration.IConfiguration,System.Type,System.String,System.Object);Argument[0];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Configuration;ConfigurationBinder;GetValue;(Microsoft.Extensions.Configuration.IConfiguration,System.Type,System.String,System.Object);Argument[3];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Configuration;ConfigurationBinder;GetValue<T>;(Microsoft.Extensions.Configuration.IConfiguration,System.String);Argument[0];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Configuration;ConfigurationBinder;GetValue<T>;(Microsoft.Extensions.Configuration.IConfiguration,System.String,T);Argument[0];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Configuration;ConfigurationBinder;GetValue<T>;(Microsoft.Extensions.Configuration.IConfiguration,System.String,T);Argument[2];ReturnValue;taint;df-generated |
+| Microsoft.Extensions.Configuration;ConfigurationBinder;GetValue;(Microsoft.Extensions.Configuration.IConfiguration,System.Type,System.String,System.Object);Argument[3];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Configuration;ConfigurationBinder;GetValue<T>;(Microsoft.Extensions.Configuration.IConfiguration,System.String,T);Argument[2];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Configuration;ConfigurationBuilder;Add;(Microsoft.Extensions.Configuration.IConfigurationSource);Argument[0];Argument[this].SyntheticField[Microsoft.Extensions.Configuration.ConfigurationBuilder._sources].Element;value;dfc-generated |
+| Microsoft.Extensions.Configuration;ConfigurationBuilder;Add;(Microsoft.Extensions.Configuration.IConfigurationSource);Argument[0];ReturnValue.SyntheticField[Microsoft.Extensions.Configuration.ConfigurationBuilder._sources].Element;value;dfc-generated |
+| Microsoft.Extensions.Configuration;ConfigurationBuilder;get_Sources;();Argument[this].SyntheticField[Microsoft.Extensions.Configuration.ConfigurationBuilder._sources];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Configuration;ConfigurationExtensions;Add<TSource>;(Microsoft.Extensions.Configuration.IConfigurationBuilder,System.Action<TSource>);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Configuration;ConfigurationExtensions;Add<TSource>;(Microsoft.Extensions.Configuration.IConfigurationBuilder,System.Action<TSource>);Argument[0];ReturnValue;value;hq-generated |
+| Microsoft.Extensions.Configuration;ConfigurationExtensions;Add<TSource>;(Microsoft.Extensions.Configuration.IConfigurationBuilder,System.Action<TSource>);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.Configuration;ConfigurationExtensions;Add<TSource>;(Microsoft.Extensions.Configuration.IConfigurationBuilder,System.Action<TSource>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
-| Microsoft.Extensions.Configuration;ConfigurationExtensions;AsEnumerable;(Microsoft.Extensions.Configuration.IConfiguration);Argument[0];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Configuration;ConfigurationExtensions;AsEnumerable;(Microsoft.Extensions.Configuration.IConfiguration,System.Boolean);Argument[0];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Configuration;ConfigurationExtensions;GetConnectionString;(Microsoft.Extensions.Configuration.IConfiguration,System.String);Argument[0];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Configuration;ConfigurationExtensions;GetRequiredSection;(Microsoft.Extensions.Configuration.IConfiguration,System.String);Argument[0];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Configuration;ConfigurationExtensions;GetRequiredSection;(Microsoft.Extensions.Configuration.IConfiguration,System.String);Argument[1];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Configuration;ConfigurationPath;Combine;(System.Collections.Generic.IEnumerable<System.String>);Argument[0].Element;ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Configuration;ConfigurationPath;Combine;(System.String[]);Argument[0].Element;ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Configuration;ConfigurationPath;GetParentPath;(System.String);Argument[0];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Configuration;ConfigurationPath;GetSectionKey;(System.String);Argument[0];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Configuration;ConfigurationProvider;ToString;();Argument[this];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Configuration;ConfigurationRoot;ConfigurationRoot;(System.Collections.Generic.IList<Microsoft.Extensions.Configuration.IConfigurationProvider>);Argument[0].Element;Argument[this];taint;df-generated |
-| Microsoft.Extensions.Configuration;ConfigurationRootExtensions;GetDebugView;(Microsoft.Extensions.Configuration.IConfigurationRoot);Argument[0];ReturnValue;taint;df-generated |
+| Microsoft.Extensions.Configuration;ConfigurationManager;Add;(Microsoft.Extensions.Configuration.IConfigurationSource);Argument[0];Argument[this].SyntheticField[Microsoft.Extensions.Configuration.ConfigurationManager._sources].Element;value;dfc-generated |
+| Microsoft.Extensions.Configuration;ConfigurationManager;Add;(Microsoft.Extensions.Configuration.IConfigurationSource);Argument[0];ReturnValue.SyntheticField[Microsoft.Extensions.Configuration.ConfigurationManager._sources].Element;value;dfc-generated |
+| Microsoft.Extensions.Configuration;ConfigurationManager;get_Sources;();Argument[this].SyntheticField[Microsoft.Extensions.Configuration.ConfigurationManager._sources];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Configuration;ConfigurationPath;Combine;(System.Collections.Generic.IEnumerable<System.String>);Argument[0].Element;ReturnValue;taint;dfc-generated |
+| Microsoft.Extensions.Configuration;ConfigurationPath;Combine;(System.String[]);Argument[0].Element;ReturnValue;taint;dfc-generated |
+| Microsoft.Extensions.Configuration;ConfigurationPath;GetParentPath;(System.String);Argument[0];ReturnValue;taint;dfc-generated |
+| Microsoft.Extensions.Configuration;ConfigurationPath;GetSectionKey;(System.String);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Configuration;ConfigurationRoot;ConfigurationRoot;(System.Collections.Generic.IList<Microsoft.Extensions.Configuration.IConfigurationProvider>);Argument[0];Argument[this].SyntheticField[Microsoft.Extensions.Configuration.ConfigurationRoot._providers];value;dfc-generated |
+| Microsoft.Extensions.Configuration;ConfigurationRoot;get_Providers;();Argument[this].SyntheticField[Microsoft.Extensions.Configuration.ConfigurationRoot._providers];ReturnValue;value;df-generated |
+| Microsoft.Extensions.Configuration;ConfigurationRoot;get_Providers;();Argument[this].SyntheticField[Microsoft.Extensions.Configuration.ConfigurationRoot._providers];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Configuration;ConfigurationRootExtensions;GetDebugView;(Microsoft.Extensions.Configuration.IConfigurationRoot);Argument[0].Property[Microsoft.Extensions.Configuration.IConfigurationRoot.Providers].Element;ReturnValue;taint;dfc-generated |
+| Microsoft.Extensions.Configuration;ConfigurationRootExtensions;GetDebugView;(Microsoft.Extensions.Configuration.IConfigurationRoot,System.Func<Microsoft.Extensions.Configuration.ConfigurationDebugViewContext,System.String>);Argument[0].Property[Microsoft.Extensions.Configuration.IConfigurationRoot.Providers].Element;ReturnValue;taint;dfc-generated |
+| Microsoft.Extensions.Configuration;ConfigurationRootExtensions;GetDebugView;(Microsoft.Extensions.Configuration.IConfigurationRoot,System.Func<Microsoft.Extensions.Configuration.ConfigurationDebugViewContext,System.String>);Argument[0].Property[Microsoft.Extensions.Configuration.IConfigurationRoot.Providers].Element;ReturnValue;taint;hq-generated |
+| Microsoft.Extensions.Configuration;ConfigurationRootExtensions;GetDebugView;(Microsoft.Extensions.Configuration.IConfigurationRoot,System.Func<Microsoft.Extensions.Configuration.ConfigurationDebugViewContext,System.String>);Argument[1].ReturnValue;ReturnValue;taint;dfc-generated |
+| Microsoft.Extensions.Configuration;ConfigurationRootExtensions;GetDebugView;(Microsoft.Extensions.Configuration.IConfigurationRoot,System.Func<Microsoft.Extensions.Configuration.ConfigurationDebugViewContext,System.String>);Argument[1].ReturnValue;ReturnValue;taint;hq-generated |
+| Microsoft.Extensions.Configuration;ConfigurationRootExtensions;GetDebugView;(Microsoft.Extensions.Configuration.IConfigurationRoot,System.Func<Microsoft.Extensions.Configuration.ConfigurationDebugViewContext,System.String>);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.Configuration;ConfigurationRootExtensions;GetDebugView;(Microsoft.Extensions.Configuration.IConfigurationRoot,System.Func<Microsoft.Extensions.Configuration.ConfigurationDebugViewContext,System.String>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
-| Microsoft.Extensions.Configuration;ConfigurationSection;ConfigurationSection;(Microsoft.Extensions.Configuration.IConfigurationRoot,System.String);Argument[0];Argument[this];taint;df-generated |
-| Microsoft.Extensions.Configuration;ConfigurationSection;ConfigurationSection;(Microsoft.Extensions.Configuration.IConfigurationRoot,System.String);Argument[1];Argument[this];taint;df-generated |
-| Microsoft.Extensions.Configuration;EnvironmentVariablesExtensions;AddEnvironmentVariables;(Microsoft.Extensions.Configuration.IConfigurationBuilder);Argument[0];ReturnValue;taint;df-generated |
+| Microsoft.Extensions.Configuration;ConfigurationSection;ConfigurationSection;(Microsoft.Extensions.Configuration.IConfigurationRoot,System.String);Argument[1];Argument[this].SyntheticField[Microsoft.Extensions.Configuration.ConfigurationSection._path];value;dfc-generated |
+| Microsoft.Extensions.Configuration;ConfigurationSection;get_Path;();Argument[this].SyntheticField[Microsoft.Extensions.Configuration.ConfigurationSection._path];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Configuration;EnvironmentVariablesExtensions;AddEnvironmentVariables;(Microsoft.Extensions.Configuration.IConfigurationBuilder);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Configuration;EnvironmentVariablesExtensions;AddEnvironmentVariables;(Microsoft.Extensions.Configuration.IConfigurationBuilder,System.Action<Microsoft.Extensions.Configuration.EnvironmentVariables.EnvironmentVariablesConfigurationSource>);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Configuration;EnvironmentVariablesExtensions;AddEnvironmentVariables;(Microsoft.Extensions.Configuration.IConfigurationBuilder,System.Action<Microsoft.Extensions.Configuration.EnvironmentVariables.EnvironmentVariablesConfigurationSource>);Argument[0];ReturnValue;value;hq-generated |
+| Microsoft.Extensions.Configuration;EnvironmentVariablesExtensions;AddEnvironmentVariables;(Microsoft.Extensions.Configuration.IConfigurationBuilder,System.Action<Microsoft.Extensions.Configuration.EnvironmentVariables.EnvironmentVariablesConfigurationSource>);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.Configuration;EnvironmentVariablesExtensions;AddEnvironmentVariables;(Microsoft.Extensions.Configuration.IConfigurationBuilder,System.Action<Microsoft.Extensions.Configuration.EnvironmentVariables.EnvironmentVariablesConfigurationSource>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
-| Microsoft.Extensions.Configuration;EnvironmentVariablesExtensions;AddEnvironmentVariables;(Microsoft.Extensions.Configuration.IConfigurationBuilder,System.String);Argument[0];ReturnValue;taint;df-generated |
+| Microsoft.Extensions.Configuration;EnvironmentVariablesExtensions;AddEnvironmentVariables;(Microsoft.Extensions.Configuration.IConfigurationBuilder,System.String);Argument[0];ReturnValue;value;dfc-generated |
 | Microsoft.Extensions.Configuration;FileConfigurationExtensions;GetFileLoadExceptionHandler;(Microsoft.Extensions.Configuration.IConfigurationBuilder);Argument[0];ReturnValue;taint;df-generated |
 | Microsoft.Extensions.Configuration;FileConfigurationExtensions;GetFileProvider;(Microsoft.Extensions.Configuration.IConfigurationBuilder);Argument[0];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Configuration;FileConfigurationExtensions;SetBasePath;(Microsoft.Extensions.Configuration.IConfigurationBuilder,System.String);Argument[0];ReturnValue;taint;df-generated |
+| Microsoft.Extensions.Configuration;FileConfigurationExtensions;SetBasePath;(Microsoft.Extensions.Configuration.IConfigurationBuilder,System.String);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Configuration;FileConfigurationExtensions;SetFileLoadExceptionHandler;(Microsoft.Extensions.Configuration.IConfigurationBuilder,System.Action<Microsoft.Extensions.Configuration.FileLoadExceptionContext>);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Configuration;FileConfigurationExtensions;SetFileLoadExceptionHandler;(Microsoft.Extensions.Configuration.IConfigurationBuilder,System.Action<Microsoft.Extensions.Configuration.FileLoadExceptionContext>);Argument[0];ReturnValue;value;hq-generated |
+| Microsoft.Extensions.Configuration;FileConfigurationExtensions;SetFileLoadExceptionHandler;(Microsoft.Extensions.Configuration.IConfigurationBuilder,System.Action<Microsoft.Extensions.Configuration.FileLoadExceptionContext>);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.Configuration;FileConfigurationExtensions;SetFileLoadExceptionHandler;(Microsoft.Extensions.Configuration.IConfigurationBuilder,System.Action<Microsoft.Extensions.Configuration.FileLoadExceptionContext>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
-| Microsoft.Extensions.Configuration;FileConfigurationExtensions;SetFileProvider;(Microsoft.Extensions.Configuration.IConfigurationBuilder,Microsoft.Extensions.FileProviders.IFileProvider);Argument[0];ReturnValue;taint;df-generated |
+| Microsoft.Extensions.Configuration;FileConfigurationExtensions;SetFileProvider;(Microsoft.Extensions.Configuration.IConfigurationBuilder,Microsoft.Extensions.FileProviders.IFileProvider);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Configuration;FileConfigurationProvider;ToString;();Argument[this].Property[Microsoft.Extensions.Configuration.FileConfigurationProvider.Source].Property[Microsoft.Extensions.Configuration.FileConfigurationSource.Path];ReturnValue;taint;dfc-generated |
 | Microsoft.Extensions.Configuration;FileConfigurationSource;set_OnLoadException;(System.Action<Microsoft.Extensions.Configuration.FileLoadExceptionContext>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | Microsoft.Extensions.Configuration;IConfiguration;GetReloadToken;();Argument[this];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Configuration;IConfiguration;GetSection;(System.String);Argument[0];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Configuration;IConfiguration;GetSection;(System.String);Argument[this];ReturnValue;taint;df-generated |
 | Microsoft.Extensions.Configuration;IConfiguration;get_Item;(System.String);Argument[this];ReturnValue;taint;manual |
-| Microsoft.Extensions.Configuration;IConfigurationBuilder;Add;(Microsoft.Extensions.Configuration.IConfigurationSource);Argument[0];Argument[this];taint;df-generated |
-| Microsoft.Extensions.Configuration;IConfigurationBuilder;Add;(Microsoft.Extensions.Configuration.IConfigurationSource);Argument[this];ReturnValue;value;df-generated |
+| Microsoft.Extensions.Configuration;IConfigurationBuilder;Add;(Microsoft.Extensions.Configuration.IConfigurationSource);Argument[this];ReturnValue;value;dfc-generated |
 | Microsoft.Extensions.Configuration;IConfigurationBuilder;Build;();Argument[this];ReturnValue;taint;manual |
 | Microsoft.Extensions.Configuration;IConfigurationBuilder;get_Properties;();Argument[this];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Configuration;IConfigurationBuilder;get_Sources;();Argument[this];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Configuration;IConfigurationProvider;GetChildKeys;(System.Collections.Generic.IEnumerable<System.String>,System.String);Argument[0].Element;ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Configuration;IConfigurationProvider;GetChildKeys;(System.Collections.Generic.IEnumerable<System.String>,System.String);Argument[this];ReturnValue;taint;df-generated |
+| Microsoft.Extensions.Configuration;IConfigurationProvider;GetChildKeys;(System.Collections.Generic.IEnumerable<System.String>,System.String);Argument[0].Element;ReturnValue.Element;value;dfc-generated |
 | Microsoft.Extensions.Configuration;IConfigurationProvider;GetReloadToken;();Argument[this];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Configuration;IConfigurationProvider;TryGet;(System.String,System.String);Argument[this];ReturnValue;taint;df-generated |
 | Microsoft.Extensions.Configuration;IConfigurationRoot;get_Providers;();Argument[this];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Configuration;IConfigurationSection;get_Path;();Argument[this];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Configuration;IConfigurationSource;Build;(Microsoft.Extensions.Configuration.IConfigurationBuilder);Argument[this];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Configuration;IniConfigurationExtensions;AddIniFile;(Microsoft.Extensions.Configuration.IConfigurationBuilder,Microsoft.Extensions.FileProviders.IFileProvider,System.String,System.Boolean,System.Boolean);Argument[0];ReturnValue;taint;df-generated |
+| Microsoft.Extensions.Configuration;IniConfigurationExtensions;AddIniFile;(Microsoft.Extensions.Configuration.IConfigurationBuilder,Microsoft.Extensions.FileProviders.IFileProvider,System.String,System.Boolean,System.Boolean);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Configuration;IniConfigurationExtensions;AddIniFile;(Microsoft.Extensions.Configuration.IConfigurationBuilder,System.Action<Microsoft.Extensions.Configuration.Ini.IniConfigurationSource>);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Configuration;IniConfigurationExtensions;AddIniFile;(Microsoft.Extensions.Configuration.IConfigurationBuilder,System.Action<Microsoft.Extensions.Configuration.Ini.IniConfigurationSource>);Argument[0];ReturnValue;value;hq-generated |
+| Microsoft.Extensions.Configuration;IniConfigurationExtensions;AddIniFile;(Microsoft.Extensions.Configuration.IConfigurationBuilder,System.Action<Microsoft.Extensions.Configuration.Ini.IniConfigurationSource>);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.Configuration;IniConfigurationExtensions;AddIniFile;(Microsoft.Extensions.Configuration.IConfigurationBuilder,System.Action<Microsoft.Extensions.Configuration.Ini.IniConfigurationSource>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
-| Microsoft.Extensions.Configuration;IniConfigurationExtensions;AddIniFile;(Microsoft.Extensions.Configuration.IConfigurationBuilder,System.String);Argument[0];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Configuration;IniConfigurationExtensions;AddIniFile;(Microsoft.Extensions.Configuration.IConfigurationBuilder,System.String,System.Boolean);Argument[0];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Configuration;IniConfigurationExtensions;AddIniFile;(Microsoft.Extensions.Configuration.IConfigurationBuilder,System.String,System.Boolean,System.Boolean);Argument[0];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Configuration;IniConfigurationExtensions;AddIniStream;(Microsoft.Extensions.Configuration.IConfigurationBuilder,System.IO.Stream);Argument[0];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Configuration;JsonConfigurationExtensions;AddJsonFile;(Microsoft.Extensions.Configuration.IConfigurationBuilder,Microsoft.Extensions.FileProviders.IFileProvider,System.String,System.Boolean,System.Boolean);Argument[0];ReturnValue;taint;df-generated |
+| Microsoft.Extensions.Configuration;IniConfigurationExtensions;AddIniFile;(Microsoft.Extensions.Configuration.IConfigurationBuilder,System.String);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Configuration;IniConfigurationExtensions;AddIniFile;(Microsoft.Extensions.Configuration.IConfigurationBuilder,System.String,System.Boolean);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Configuration;IniConfigurationExtensions;AddIniFile;(Microsoft.Extensions.Configuration.IConfigurationBuilder,System.String,System.Boolean,System.Boolean);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Configuration;IniConfigurationExtensions;AddIniStream;(Microsoft.Extensions.Configuration.IConfigurationBuilder,System.IO.Stream);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Configuration;JsonConfigurationExtensions;AddJsonFile;(Microsoft.Extensions.Configuration.IConfigurationBuilder,Microsoft.Extensions.FileProviders.IFileProvider,System.String,System.Boolean,System.Boolean);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Configuration;JsonConfigurationExtensions;AddJsonFile;(Microsoft.Extensions.Configuration.IConfigurationBuilder,System.Action<Microsoft.Extensions.Configuration.Json.JsonConfigurationSource>);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Configuration;JsonConfigurationExtensions;AddJsonFile;(Microsoft.Extensions.Configuration.IConfigurationBuilder,System.Action<Microsoft.Extensions.Configuration.Json.JsonConfigurationSource>);Argument[0];ReturnValue;value;hq-generated |
+| Microsoft.Extensions.Configuration;JsonConfigurationExtensions;AddJsonFile;(Microsoft.Extensions.Configuration.IConfigurationBuilder,System.Action<Microsoft.Extensions.Configuration.Json.JsonConfigurationSource>);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.Configuration;JsonConfigurationExtensions;AddJsonFile;(Microsoft.Extensions.Configuration.IConfigurationBuilder,System.Action<Microsoft.Extensions.Configuration.Json.JsonConfigurationSource>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
-| Microsoft.Extensions.Configuration;JsonConfigurationExtensions;AddJsonFile;(Microsoft.Extensions.Configuration.IConfigurationBuilder,System.String);Argument[0];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Configuration;JsonConfigurationExtensions;AddJsonFile;(Microsoft.Extensions.Configuration.IConfigurationBuilder,System.String,System.Boolean);Argument[0];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Configuration;JsonConfigurationExtensions;AddJsonFile;(Microsoft.Extensions.Configuration.IConfigurationBuilder,System.String,System.Boolean,System.Boolean);Argument[0];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Configuration;JsonConfigurationExtensions;AddJsonStream;(Microsoft.Extensions.Configuration.IConfigurationBuilder,System.IO.Stream);Argument[0];ReturnValue;taint;df-generated |
+| Microsoft.Extensions.Configuration;JsonConfigurationExtensions;AddJsonFile;(Microsoft.Extensions.Configuration.IConfigurationBuilder,System.String);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Configuration;JsonConfigurationExtensions;AddJsonFile;(Microsoft.Extensions.Configuration.IConfigurationBuilder,System.String,System.Boolean);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Configuration;JsonConfigurationExtensions;AddJsonFile;(Microsoft.Extensions.Configuration.IConfigurationBuilder,System.String,System.Boolean,System.Boolean);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Configuration;JsonConfigurationExtensions;AddJsonStream;(Microsoft.Extensions.Configuration.IConfigurationBuilder,System.IO.Stream);Argument[0];ReturnValue;value;dfc-generated |
 | Microsoft.Extensions.Configuration;KeyPerFileConfigurationBuilderExtensions;AddKeyPerFile;(Microsoft.Extensions.Configuration.IConfigurationBuilder,System.Action<Microsoft.Extensions.Configuration.KeyPerFile.KeyPerFileConfigurationSource>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
-| Microsoft.Extensions.Configuration;MemoryConfigurationBuilderExtensions;AddInMemoryCollection;(Microsoft.Extensions.Configuration.IConfigurationBuilder);Argument[0];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Configuration;MemoryConfigurationBuilderExtensions;AddInMemoryCollection;(Microsoft.Extensions.Configuration.IConfigurationBuilder,System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<System.String,System.String>>);Argument[0];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Configuration;UserSecretsConfigurationExtensions;AddUserSecrets;(Microsoft.Extensions.Configuration.IConfigurationBuilder,System.Reflection.Assembly);Argument[0];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Configuration;UserSecretsConfigurationExtensions;AddUserSecrets;(Microsoft.Extensions.Configuration.IConfigurationBuilder,System.Reflection.Assembly,System.Boolean);Argument[0];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Configuration;UserSecretsConfigurationExtensions;AddUserSecrets;(Microsoft.Extensions.Configuration.IConfigurationBuilder,System.Reflection.Assembly,System.Boolean,System.Boolean);Argument[0];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Configuration;UserSecretsConfigurationExtensions;AddUserSecrets;(Microsoft.Extensions.Configuration.IConfigurationBuilder,System.String);Argument[0];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Configuration;UserSecretsConfigurationExtensions;AddUserSecrets;(Microsoft.Extensions.Configuration.IConfigurationBuilder,System.String,System.Boolean);Argument[0];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Configuration;UserSecretsConfigurationExtensions;AddUserSecrets<T>;(Microsoft.Extensions.Configuration.IConfigurationBuilder);Argument[0];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Configuration;UserSecretsConfigurationExtensions;AddUserSecrets<T>;(Microsoft.Extensions.Configuration.IConfigurationBuilder,System.Boolean);Argument[0];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Configuration;UserSecretsConfigurationExtensions;AddUserSecrets<T>;(Microsoft.Extensions.Configuration.IConfigurationBuilder,System.Boolean,System.Boolean);Argument[0];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Configuration;XmlConfigurationExtensions;AddXmlFile;(Microsoft.Extensions.Configuration.IConfigurationBuilder,Microsoft.Extensions.FileProviders.IFileProvider,System.String,System.Boolean,System.Boolean);Argument[0];ReturnValue;taint;df-generated |
+| Microsoft.Extensions.Configuration;MemoryConfigurationBuilderExtensions;AddInMemoryCollection;(Microsoft.Extensions.Configuration.IConfigurationBuilder);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Configuration;MemoryConfigurationBuilderExtensions;AddInMemoryCollection;(Microsoft.Extensions.Configuration.IConfigurationBuilder,System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<System.String,System.String>>);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Configuration;UserSecretsConfigurationExtensions;AddUserSecrets;(Microsoft.Extensions.Configuration.IConfigurationBuilder,System.Reflection.Assembly);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Configuration;UserSecretsConfigurationExtensions;AddUserSecrets;(Microsoft.Extensions.Configuration.IConfigurationBuilder,System.Reflection.Assembly,System.Boolean);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Configuration;UserSecretsConfigurationExtensions;AddUserSecrets;(Microsoft.Extensions.Configuration.IConfigurationBuilder,System.Reflection.Assembly,System.Boolean,System.Boolean);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Configuration;UserSecretsConfigurationExtensions;AddUserSecrets;(Microsoft.Extensions.Configuration.IConfigurationBuilder,System.String);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Configuration;UserSecretsConfigurationExtensions;AddUserSecrets;(Microsoft.Extensions.Configuration.IConfigurationBuilder,System.String,System.Boolean);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Configuration;UserSecretsConfigurationExtensions;AddUserSecrets<T>;(Microsoft.Extensions.Configuration.IConfigurationBuilder);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Configuration;UserSecretsConfigurationExtensions;AddUserSecrets<T>;(Microsoft.Extensions.Configuration.IConfigurationBuilder,System.Boolean);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Configuration;UserSecretsConfigurationExtensions;AddUserSecrets<T>;(Microsoft.Extensions.Configuration.IConfigurationBuilder,System.Boolean,System.Boolean);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Configuration;XmlConfigurationExtensions;AddXmlFile;(Microsoft.Extensions.Configuration.IConfigurationBuilder,Microsoft.Extensions.FileProviders.IFileProvider,System.String,System.Boolean,System.Boolean);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Configuration;XmlConfigurationExtensions;AddXmlFile;(Microsoft.Extensions.Configuration.IConfigurationBuilder,System.Action<Microsoft.Extensions.Configuration.Xml.XmlConfigurationSource>);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Configuration;XmlConfigurationExtensions;AddXmlFile;(Microsoft.Extensions.Configuration.IConfigurationBuilder,System.Action<Microsoft.Extensions.Configuration.Xml.XmlConfigurationSource>);Argument[0];ReturnValue;value;hq-generated |
+| Microsoft.Extensions.Configuration;XmlConfigurationExtensions;AddXmlFile;(Microsoft.Extensions.Configuration.IConfigurationBuilder,System.Action<Microsoft.Extensions.Configuration.Xml.XmlConfigurationSource>);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.Configuration;XmlConfigurationExtensions;AddXmlFile;(Microsoft.Extensions.Configuration.IConfigurationBuilder,System.Action<Microsoft.Extensions.Configuration.Xml.XmlConfigurationSource>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
-| Microsoft.Extensions.Configuration;XmlConfigurationExtensions;AddXmlFile;(Microsoft.Extensions.Configuration.IConfigurationBuilder,System.String);Argument[0];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Configuration;XmlConfigurationExtensions;AddXmlFile;(Microsoft.Extensions.Configuration.IConfigurationBuilder,System.String,System.Boolean);Argument[0];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Configuration;XmlConfigurationExtensions;AddXmlFile;(Microsoft.Extensions.Configuration.IConfigurationBuilder,System.String,System.Boolean,System.Boolean);Argument[0];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Configuration;XmlConfigurationExtensions;AddXmlStream;(Microsoft.Extensions.Configuration.IConfigurationBuilder,System.IO.Stream);Argument[0];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.DependencyInjection.Extensions;ServiceCollectionDescriptorExtensions;Add;(Microsoft.Extensions.DependencyInjection.IServiceCollection,Microsoft.Extensions.DependencyInjection.ServiceDescriptor);Argument[0].Element;ReturnValue;taint;df-generated |
-| Microsoft.Extensions.DependencyInjection.Extensions;ServiceCollectionDescriptorExtensions;Add;(Microsoft.Extensions.DependencyInjection.IServiceCollection,Microsoft.Extensions.DependencyInjection.ServiceDescriptor);Argument[1];Argument[0].Element;taint;df-generated |
-| Microsoft.Extensions.DependencyInjection.Extensions;ServiceCollectionDescriptorExtensions;Add;(Microsoft.Extensions.DependencyInjection.IServiceCollection,Microsoft.Extensions.DependencyInjection.ServiceDescriptor);Argument[1];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.DependencyInjection.Extensions;ServiceCollectionDescriptorExtensions;Add;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Collections.Generic.IEnumerable<Microsoft.Extensions.DependencyInjection.ServiceDescriptor>);Argument[0].Element;ReturnValue;taint;df-generated |
-| Microsoft.Extensions.DependencyInjection.Extensions;ServiceCollectionDescriptorExtensions;Add;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Collections.Generic.IEnumerable<Microsoft.Extensions.DependencyInjection.ServiceDescriptor>);Argument[1].Element;Argument[0].Element;taint;df-generated |
-| Microsoft.Extensions.DependencyInjection.Extensions;ServiceCollectionDescriptorExtensions;Add;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Collections.Generic.IEnumerable<Microsoft.Extensions.DependencyInjection.ServiceDescriptor>);Argument[1].Element;ReturnValue;taint;df-generated |
-| Microsoft.Extensions.DependencyInjection.Extensions;ServiceCollectionDescriptorExtensions;RemoveAll;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Type);Argument[0].Element;ReturnValue;taint;df-generated |
-| Microsoft.Extensions.DependencyInjection.Extensions;ServiceCollectionDescriptorExtensions;RemoveAll<T>;(Microsoft.Extensions.DependencyInjection.IServiceCollection);Argument[0].Element;ReturnValue;taint;df-generated |
-| Microsoft.Extensions.DependencyInjection.Extensions;ServiceCollectionDescriptorExtensions;RemoveAllKeyed;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Type,System.Object);Argument[0].Element;ReturnValue;taint;df-generated |
-| Microsoft.Extensions.DependencyInjection.Extensions;ServiceCollectionDescriptorExtensions;RemoveAllKeyed<T>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Object);Argument[0].Element;ReturnValue;taint;df-generated |
-| Microsoft.Extensions.DependencyInjection.Extensions;ServiceCollectionDescriptorExtensions;Replace;(Microsoft.Extensions.DependencyInjection.IServiceCollection,Microsoft.Extensions.DependencyInjection.ServiceDescriptor);Argument[0].Element;ReturnValue;taint;df-generated |
-| Microsoft.Extensions.DependencyInjection.Extensions;ServiceCollectionDescriptorExtensions;Replace;(Microsoft.Extensions.DependencyInjection.IServiceCollection,Microsoft.Extensions.DependencyInjection.ServiceDescriptor);Argument[1];Argument[0].Element;taint;df-generated |
-| Microsoft.Extensions.DependencyInjection.Extensions;ServiceCollectionDescriptorExtensions;Replace;(Microsoft.Extensions.DependencyInjection.IServiceCollection,Microsoft.Extensions.DependencyInjection.ServiceDescriptor);Argument[1];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.DependencyInjection.Extensions;ServiceCollectionDescriptorExtensions;TryAdd;(Microsoft.Extensions.DependencyInjection.IServiceCollection,Microsoft.Extensions.DependencyInjection.ServiceDescriptor);Argument[1];Argument[0].Element;taint;df-generated |
-| Microsoft.Extensions.DependencyInjection.Extensions;ServiceCollectionDescriptorExtensions;TryAdd;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Collections.Generic.IEnumerable<Microsoft.Extensions.DependencyInjection.ServiceDescriptor>);Argument[1].Element;Argument[0].Element;taint;df-generated |
-| Microsoft.Extensions.DependencyInjection.Extensions;ServiceCollectionDescriptorExtensions;TryAddEnumerable;(Microsoft.Extensions.DependencyInjection.IServiceCollection,Microsoft.Extensions.DependencyInjection.ServiceDescriptor);Argument[1];Argument[0].Element;taint;df-generated |
-| Microsoft.Extensions.DependencyInjection.Extensions;ServiceCollectionDescriptorExtensions;TryAddEnumerable;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Collections.Generic.IEnumerable<Microsoft.Extensions.DependencyInjection.ServiceDescriptor>);Argument[1].Element;Argument[0].Element;taint;df-generated |
+| Microsoft.Extensions.Configuration;XmlConfigurationExtensions;AddXmlFile;(Microsoft.Extensions.Configuration.IConfigurationBuilder,System.String);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Configuration;XmlConfigurationExtensions;AddXmlFile;(Microsoft.Extensions.Configuration.IConfigurationBuilder,System.String,System.Boolean);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Configuration;XmlConfigurationExtensions;AddXmlFile;(Microsoft.Extensions.Configuration.IConfigurationBuilder,System.String,System.Boolean,System.Boolean);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Configuration;XmlConfigurationExtensions;AddXmlStream;(Microsoft.Extensions.Configuration.IConfigurationBuilder,System.IO.Stream);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection.Extensions;ServiceCollectionDescriptorExtensions;Add;(Microsoft.Extensions.DependencyInjection.IServiceCollection,Microsoft.Extensions.DependencyInjection.ServiceDescriptor);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection.Extensions;ServiceCollectionDescriptorExtensions;Add;(Microsoft.Extensions.DependencyInjection.IServiceCollection,Microsoft.Extensions.DependencyInjection.ServiceDescriptor);Argument[1];Argument[0].Element;value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection.Extensions;ServiceCollectionDescriptorExtensions;Add;(Microsoft.Extensions.DependencyInjection.IServiceCollection,Microsoft.Extensions.DependencyInjection.ServiceDescriptor);Argument[1];ReturnValue.Element;value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection.Extensions;ServiceCollectionDescriptorExtensions;Add;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Collections.Generic.IEnumerable<Microsoft.Extensions.DependencyInjection.ServiceDescriptor>);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection.Extensions;ServiceCollectionDescriptorExtensions;Add;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Collections.Generic.IEnumerable<Microsoft.Extensions.DependencyInjection.ServiceDescriptor>);Argument[1].Element;Argument[0].Element;value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection.Extensions;ServiceCollectionDescriptorExtensions;Add;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Collections.Generic.IEnumerable<Microsoft.Extensions.DependencyInjection.ServiceDescriptor>);Argument[1].Element;ReturnValue.Element;value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection.Extensions;ServiceCollectionDescriptorExtensions;RemoveAll;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Type);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection.Extensions;ServiceCollectionDescriptorExtensions;RemoveAll<T>;(Microsoft.Extensions.DependencyInjection.IServiceCollection);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection.Extensions;ServiceCollectionDescriptorExtensions;RemoveAllKeyed;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Type,System.Object);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection.Extensions;ServiceCollectionDescriptorExtensions;RemoveAllKeyed<T>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Object);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection.Extensions;ServiceCollectionDescriptorExtensions;Replace;(Microsoft.Extensions.DependencyInjection.IServiceCollection,Microsoft.Extensions.DependencyInjection.ServiceDescriptor);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection.Extensions;ServiceCollectionDescriptorExtensions;Replace;(Microsoft.Extensions.DependencyInjection.IServiceCollection,Microsoft.Extensions.DependencyInjection.ServiceDescriptor);Argument[1];Argument[0].Element;value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection.Extensions;ServiceCollectionDescriptorExtensions;Replace;(Microsoft.Extensions.DependencyInjection.IServiceCollection,Microsoft.Extensions.DependencyInjection.ServiceDescriptor);Argument[1];ReturnValue.Element;value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection.Extensions;ServiceCollectionDescriptorExtensions;TryAdd;(Microsoft.Extensions.DependencyInjection.IServiceCollection,Microsoft.Extensions.DependencyInjection.ServiceDescriptor);Argument[1];Argument[0].Element;value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection.Extensions;ServiceCollectionDescriptorExtensions;TryAdd;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Collections.Generic.IEnumerable<Microsoft.Extensions.DependencyInjection.ServiceDescriptor>);Argument[1].Element;Argument[0].Element;value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection.Extensions;ServiceCollectionDescriptorExtensions;TryAddEnumerable;(Microsoft.Extensions.DependencyInjection.IServiceCollection,Microsoft.Extensions.DependencyInjection.ServiceDescriptor);Argument[1];Argument[0].Element;value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection.Extensions;ServiceCollectionDescriptorExtensions;TryAddEnumerable;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Collections.Generic.IEnumerable<Microsoft.Extensions.DependencyInjection.ServiceDescriptor>);Argument[1].Element;Argument[0].Element;value;dfc-generated |
 | Microsoft.Extensions.DependencyInjection.Extensions;ServiceCollectionDescriptorExtensions;TryAddKeyedScoped;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Type,System.Object,System.Func<System.IServiceProvider,System.Object,System.Object>);Argument[3];Argument[3].Parameter[delegate-self];value;hq-generated |
 | Microsoft.Extensions.DependencyInjection.Extensions;ServiceCollectionDescriptorExtensions;TryAddKeyedScoped<TService>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Object,System.Func<System.IServiceProvider,System.Object,TService>);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
 | Microsoft.Extensions.DependencyInjection.Extensions;ServiceCollectionDescriptorExtensions;TryAddKeyedSingleton;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Type,System.Object,System.Func<System.IServiceProvider,System.Object,System.Object>);Argument[3];Argument[3].Parameter[delegate-self];value;hq-generated |
@@ -869,10 +874,12 @@
 | Microsoft.Extensions.DependencyInjection.Extensions;ServiceCollectionDescriptorExtensions;TryAddSingleton<TService>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Func<System.IServiceProvider,TService>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
 | Microsoft.Extensions.DependencyInjection.Extensions;ServiceCollectionDescriptorExtensions;TryAddTransient;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Type,System.Func<System.IServiceProvider,System.Object>);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
 | Microsoft.Extensions.DependencyInjection.Extensions;ServiceCollectionDescriptorExtensions;TryAddTransient<TService>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Func<System.IServiceProvider,TService>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
-| Microsoft.Extensions.DependencyInjection;ActivatorUtilities;GetServiceOrCreateInstance;(System.IServiceProvider,System.Type);Argument[0];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.DependencyInjection;ActivatorUtilities;GetServiceOrCreateInstance<T>;(System.IServiceProvider);Argument[0];ReturnValue;taint;df-generated |
+| Microsoft.Extensions.DependencyInjection;ActivatorUtilities;GetServiceOrCreateInstance;(System.IServiceProvider,System.Type);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;ActivatorUtilities;GetServiceOrCreateInstance<T>;(System.IServiceProvider);Argument[0];ReturnValue;value;dfc-generated |
 | Microsoft.Extensions.DependencyInjection;AntiforgeryServiceCollectionExtensions;AddAntiforgery;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Action<Microsoft.AspNetCore.Antiforgery.AntiforgeryOptions>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
-| Microsoft.Extensions.DependencyInjection;AsyncServiceScope;AsyncServiceScope;(Microsoft.Extensions.DependencyInjection.IServiceScope);Argument[0];Argument[this];taint;df-generated |
+| Microsoft.Extensions.DependencyInjection;AsyncServiceScope;AsyncServiceScope;(Microsoft.Extensions.DependencyInjection.IServiceScope);Argument[0];Argument[this].SyntheticField[Microsoft.Extensions.DependencyInjection.AsyncServiceScope._serviceScope];value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;AsyncServiceScope;get_ServiceProvider;();Argument[this].SyntheticField[Microsoft.Extensions.DependencyInjection.AsyncServiceScope._serviceScope].Property[Microsoft.Extensions.DependencyInjection.IServiceScope.ServiceProvider];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;AsyncServiceScope;get_ServiceProvider;();Argument[this].SyntheticField[Microsoft.Extensions.DependencyInjection.AsyncServiceScope._serviceScope];ReturnValue;value;dfc-generated |
 | Microsoft.Extensions.DependencyInjection;AuthenticationCoreServiceCollectionExtensions;AddAuthenticationCore;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Action<Microsoft.AspNetCore.Authentication.AuthenticationOptions>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
 | Microsoft.Extensions.DependencyInjection;AuthenticationServiceCollectionExtensions;AddAuthentication;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Action<Microsoft.AspNetCore.Authentication.AuthenticationOptions>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
 | Microsoft.Extensions.DependencyInjection;AuthorizationServiceCollectionExtensions;AddAuthorizationCore;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Action<Microsoft.AspNetCore.Authorization.AuthorizationOptions>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
@@ -894,7 +901,7 @@
 | Microsoft.Extensions.DependencyInjection;CookiePolicyServiceCollectionExtensions;AddCookiePolicy<TService>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Action<Microsoft.AspNetCore.Builder.CookiePolicyOptions,TService>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
 | Microsoft.Extensions.DependencyInjection;CorsServiceCollectionExtensions;AddCors;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Action<Microsoft.AspNetCore.Cors.Infrastructure.CorsOptions>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
 | Microsoft.Extensions.DependencyInjection;DataProtectionServiceCollectionExtensions;AddDataProtection;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Action<Microsoft.AspNetCore.DataProtection.DataProtectionOptions>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
-| Microsoft.Extensions.DependencyInjection;DefaultServiceProviderFactory;CreateBuilder;(Microsoft.Extensions.DependencyInjection.IServiceCollection);Argument[0].Element;ReturnValue;taint;df-generated |
+| Microsoft.Extensions.DependencyInjection;DefaultServiceProviderFactory;CreateBuilder;(Microsoft.Extensions.DependencyInjection.IServiceCollection);Argument[0];ReturnValue;value;dfc-generated |
 | Microsoft.Extensions.DependencyInjection;DefaultServiceProviderFactory;DefaultServiceProviderFactory;(Microsoft.Extensions.DependencyInjection.ServiceProviderOptions);Argument[0];Argument[this];taint;df-generated |
 | Microsoft.Extensions.DependencyInjection;EncoderServiceCollectionExtensions;AddWebEncoders;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Action<Microsoft.Extensions.WebEncoders.WebEncoderOptions>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
 | Microsoft.Extensions.DependencyInjection;ExceptionHandlerServiceCollectionExtensions;AddExceptionHandler;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Action<Microsoft.AspNetCore.Builder.ExceptionHandlerOptions>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
@@ -907,31 +914,76 @@
 | Microsoft.Extensions.DependencyInjection;HealthChecksBuilderDelegateExtensions;AddCheck;(Microsoft.Extensions.DependencyInjection.IHealthChecksBuilder,System.String,System.Func<Microsoft.Extensions.Diagnostics.HealthChecks.HealthCheckResult>,System.Collections.Generic.IEnumerable<System.String>,System.Nullable<System.TimeSpan>);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
 | Microsoft.Extensions.DependencyInjection;HealthChecksBuilderDelegateExtensions;AddCheck;(Microsoft.Extensions.DependencyInjection.IHealthChecksBuilder,System.String,System.Func<System.Threading.CancellationToken,Microsoft.Extensions.Diagnostics.HealthChecks.HealthCheckResult>,System.Collections.Generic.IEnumerable<System.String>);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
 | Microsoft.Extensions.DependencyInjection;HealthChecksBuilderDelegateExtensions;AddCheck;(Microsoft.Extensions.DependencyInjection.IHealthChecksBuilder,System.String,System.Func<System.Threading.CancellationToken,Microsoft.Extensions.Diagnostics.HealthChecks.HealthCheckResult>,System.Collections.Generic.IEnumerable<System.String>,System.Nullable<System.TimeSpan>);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
-| Microsoft.Extensions.DependencyInjection;HttpClientBuilderExtensions;AddDefaultLogger;(Microsoft.Extensions.DependencyInjection.IHttpClientBuilder);Argument[0];ReturnValue;taint;df-generated |
+| Microsoft.Extensions.DependencyInjection;HttpClientBuilderExtensions;AddDefaultLogger;(Microsoft.Extensions.DependencyInjection.IHttpClientBuilder);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;HttpClientBuilderExtensions;AddHttpMessageHandler;(Microsoft.Extensions.DependencyInjection.IHttpClientBuilder,System.Func<System.IServiceProvider,System.Net.Http.DelegatingHandler>);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;HttpClientBuilderExtensions;AddHttpMessageHandler;(Microsoft.Extensions.DependencyInjection.IHttpClientBuilder,System.Func<System.IServiceProvider,System.Net.Http.DelegatingHandler>);Argument[0];ReturnValue;value;hq-generated |
+| Microsoft.Extensions.DependencyInjection;HttpClientBuilderExtensions;AddHttpMessageHandler;(Microsoft.Extensions.DependencyInjection.IHttpClientBuilder,System.Func<System.IServiceProvider,System.Net.Http.DelegatingHandler>);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.DependencyInjection;HttpClientBuilderExtensions;AddHttpMessageHandler;(Microsoft.Extensions.DependencyInjection.IHttpClientBuilder,System.Func<System.IServiceProvider,System.Net.Http.DelegatingHandler>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
+| Microsoft.Extensions.DependencyInjection;HttpClientBuilderExtensions;AddHttpMessageHandler;(Microsoft.Extensions.DependencyInjection.IHttpClientBuilder,System.Func<System.Net.Http.DelegatingHandler>);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;HttpClientBuilderExtensions;AddHttpMessageHandler;(Microsoft.Extensions.DependencyInjection.IHttpClientBuilder,System.Func<System.Net.Http.DelegatingHandler>);Argument[0];ReturnValue;value;hq-generated |
+| Microsoft.Extensions.DependencyInjection;HttpClientBuilderExtensions;AddHttpMessageHandler;(Microsoft.Extensions.DependencyInjection.IHttpClientBuilder,System.Func<System.Net.Http.DelegatingHandler>);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.DependencyInjection;HttpClientBuilderExtensions;AddHttpMessageHandler;(Microsoft.Extensions.DependencyInjection.IHttpClientBuilder,System.Func<System.Net.Http.DelegatingHandler>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
-| Microsoft.Extensions.DependencyInjection;HttpClientBuilderExtensions;AddHttpMessageHandler<THandler>;(Microsoft.Extensions.DependencyInjection.IHttpClientBuilder);Argument[0];ReturnValue;taint;df-generated |
+| Microsoft.Extensions.DependencyInjection;HttpClientBuilderExtensions;AddHttpMessageHandler<THandler>;(Microsoft.Extensions.DependencyInjection.IHttpClientBuilder);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;HttpClientBuilderExtensions;AddLogger;(Microsoft.Extensions.DependencyInjection.IHttpClientBuilder,System.Func<System.IServiceProvider,Microsoft.Extensions.Http.Logging.IHttpClientLogger>,System.Boolean);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;HttpClientBuilderExtensions;AddLogger;(Microsoft.Extensions.DependencyInjection.IHttpClientBuilder,System.Func<System.IServiceProvider,Microsoft.Extensions.Http.Logging.IHttpClientLogger>,System.Boolean);Argument[0];ReturnValue;value;hq-generated |
+| Microsoft.Extensions.DependencyInjection;HttpClientBuilderExtensions;AddLogger;(Microsoft.Extensions.DependencyInjection.IHttpClientBuilder,System.Func<System.IServiceProvider,Microsoft.Extensions.Http.Logging.IHttpClientLogger>,System.Boolean);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.DependencyInjection;HttpClientBuilderExtensions;AddLogger;(Microsoft.Extensions.DependencyInjection.IHttpClientBuilder,System.Func<System.IServiceProvider,Microsoft.Extensions.Http.Logging.IHttpClientLogger>,System.Boolean);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
-| Microsoft.Extensions.DependencyInjection;HttpClientBuilderExtensions;AddLogger<TLogger>;(Microsoft.Extensions.DependencyInjection.IHttpClientBuilder,System.Boolean);Argument[0];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.DependencyInjection;HttpClientBuilderExtensions;AddTypedClient<TClient,TImplementation>;(Microsoft.Extensions.DependencyInjection.IHttpClientBuilder);Argument[0];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.DependencyInjection;HttpClientBuilderExtensions;AddTypedClient<TClient>;(Microsoft.Extensions.DependencyInjection.IHttpClientBuilder);Argument[0];ReturnValue;taint;df-generated |
+| Microsoft.Extensions.DependencyInjection;HttpClientBuilderExtensions;AddLogger<TLogger>;(Microsoft.Extensions.DependencyInjection.IHttpClientBuilder,System.Boolean);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;HttpClientBuilderExtensions;AddTypedClient<TClient,TImplementation>;(Microsoft.Extensions.DependencyInjection.IHttpClientBuilder);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;HttpClientBuilderExtensions;AddTypedClient<TClient>;(Microsoft.Extensions.DependencyInjection.IHttpClientBuilder);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;HttpClientBuilderExtensions;AddTypedClient<TClient>;(Microsoft.Extensions.DependencyInjection.IHttpClientBuilder,System.Func<System.Net.Http.HttpClient,System.IServiceProvider,TClient>);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;HttpClientBuilderExtensions;AddTypedClient<TClient>;(Microsoft.Extensions.DependencyInjection.IHttpClientBuilder,System.Func<System.Net.Http.HttpClient,System.IServiceProvider,TClient>);Argument[0];ReturnValue;value;hq-generated |
+| Microsoft.Extensions.DependencyInjection;HttpClientBuilderExtensions;AddTypedClient<TClient>;(Microsoft.Extensions.DependencyInjection.IHttpClientBuilder,System.Func<System.Net.Http.HttpClient,System.IServiceProvider,TClient>);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.DependencyInjection;HttpClientBuilderExtensions;AddTypedClient<TClient>;(Microsoft.Extensions.DependencyInjection.IHttpClientBuilder,System.Func<System.Net.Http.HttpClient,System.IServiceProvider,TClient>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
+| Microsoft.Extensions.DependencyInjection;HttpClientBuilderExtensions;AddTypedClient<TClient>;(Microsoft.Extensions.DependencyInjection.IHttpClientBuilder,System.Func<System.Net.Http.HttpClient,TClient>);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;HttpClientBuilderExtensions;AddTypedClient<TClient>;(Microsoft.Extensions.DependencyInjection.IHttpClientBuilder,System.Func<System.Net.Http.HttpClient,TClient>);Argument[0];ReturnValue;value;hq-generated |
+| Microsoft.Extensions.DependencyInjection;HttpClientBuilderExtensions;AddTypedClient<TClient>;(Microsoft.Extensions.DependencyInjection.IHttpClientBuilder,System.Func<System.Net.Http.HttpClient,TClient>);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.DependencyInjection;HttpClientBuilderExtensions;AddTypedClient<TClient>;(Microsoft.Extensions.DependencyInjection.IHttpClientBuilder,System.Func<System.Net.Http.HttpClient,TClient>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
+| Microsoft.Extensions.DependencyInjection;HttpClientBuilderExtensions;ConfigureAdditionalHttpMessageHandlers;(Microsoft.Extensions.DependencyInjection.IHttpClientBuilder,System.Action<System.Collections.Generic.IList<System.Net.Http.DelegatingHandler>,System.IServiceProvider>);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;HttpClientBuilderExtensions;ConfigureAdditionalHttpMessageHandlers;(Microsoft.Extensions.DependencyInjection.IHttpClientBuilder,System.Action<System.Collections.Generic.IList<System.Net.Http.DelegatingHandler>,System.IServiceProvider>);Argument[0];ReturnValue;value;hq-generated |
+| Microsoft.Extensions.DependencyInjection;HttpClientBuilderExtensions;ConfigureAdditionalHttpMessageHandlers;(Microsoft.Extensions.DependencyInjection.IHttpClientBuilder,System.Action<System.Collections.Generic.IList<System.Net.Http.DelegatingHandler>,System.IServiceProvider>);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.DependencyInjection;HttpClientBuilderExtensions;ConfigureAdditionalHttpMessageHandlers;(Microsoft.Extensions.DependencyInjection.IHttpClientBuilder,System.Action<System.Collections.Generic.IList<System.Net.Http.DelegatingHandler>,System.IServiceProvider>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
+| Microsoft.Extensions.DependencyInjection;HttpClientBuilderExtensions;ConfigureHttpClient;(Microsoft.Extensions.DependencyInjection.IHttpClientBuilder,System.Action<System.IServiceProvider,System.Net.Http.HttpClient>);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;HttpClientBuilderExtensions;ConfigureHttpClient;(Microsoft.Extensions.DependencyInjection.IHttpClientBuilder,System.Action<System.IServiceProvider,System.Net.Http.HttpClient>);Argument[0];ReturnValue;value;hq-generated |
+| Microsoft.Extensions.DependencyInjection;HttpClientBuilderExtensions;ConfigureHttpClient;(Microsoft.Extensions.DependencyInjection.IHttpClientBuilder,System.Action<System.IServiceProvider,System.Net.Http.HttpClient>);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.DependencyInjection;HttpClientBuilderExtensions;ConfigureHttpClient;(Microsoft.Extensions.DependencyInjection.IHttpClientBuilder,System.Action<System.IServiceProvider,System.Net.Http.HttpClient>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
+| Microsoft.Extensions.DependencyInjection;HttpClientBuilderExtensions;ConfigureHttpClient;(Microsoft.Extensions.DependencyInjection.IHttpClientBuilder,System.Action<System.Net.Http.HttpClient>);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;HttpClientBuilderExtensions;ConfigureHttpClient;(Microsoft.Extensions.DependencyInjection.IHttpClientBuilder,System.Action<System.Net.Http.HttpClient>);Argument[0];ReturnValue;value;hq-generated |
+| Microsoft.Extensions.DependencyInjection;HttpClientBuilderExtensions;ConfigureHttpClient;(Microsoft.Extensions.DependencyInjection.IHttpClientBuilder,System.Action<System.Net.Http.HttpClient>);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.DependencyInjection;HttpClientBuilderExtensions;ConfigureHttpClient;(Microsoft.Extensions.DependencyInjection.IHttpClientBuilder,System.Action<System.Net.Http.HttpClient>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
+| Microsoft.Extensions.DependencyInjection;HttpClientBuilderExtensions;ConfigureHttpMessageHandlerBuilder;(Microsoft.Extensions.DependencyInjection.IHttpClientBuilder,System.Action<Microsoft.Extensions.Http.HttpMessageHandlerBuilder>);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;HttpClientBuilderExtensions;ConfigureHttpMessageHandlerBuilder;(Microsoft.Extensions.DependencyInjection.IHttpClientBuilder,System.Action<Microsoft.Extensions.Http.HttpMessageHandlerBuilder>);Argument[0];ReturnValue;value;hq-generated |
+| Microsoft.Extensions.DependencyInjection;HttpClientBuilderExtensions;ConfigureHttpMessageHandlerBuilder;(Microsoft.Extensions.DependencyInjection.IHttpClientBuilder,System.Action<Microsoft.Extensions.Http.HttpMessageHandlerBuilder>);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.DependencyInjection;HttpClientBuilderExtensions;ConfigureHttpMessageHandlerBuilder;(Microsoft.Extensions.DependencyInjection.IHttpClientBuilder,System.Action<Microsoft.Extensions.Http.HttpMessageHandlerBuilder>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
+| Microsoft.Extensions.DependencyInjection;HttpClientBuilderExtensions;ConfigurePrimaryHttpMessageHandler;(Microsoft.Extensions.DependencyInjection.IHttpClientBuilder,System.Action<System.Net.Http.HttpMessageHandler,System.IServiceProvider>);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;HttpClientBuilderExtensions;ConfigurePrimaryHttpMessageHandler;(Microsoft.Extensions.DependencyInjection.IHttpClientBuilder,System.Action<System.Net.Http.HttpMessageHandler,System.IServiceProvider>);Argument[0];ReturnValue;value;hq-generated |
+| Microsoft.Extensions.DependencyInjection;HttpClientBuilderExtensions;ConfigurePrimaryHttpMessageHandler;(Microsoft.Extensions.DependencyInjection.IHttpClientBuilder,System.Action<System.Net.Http.HttpMessageHandler,System.IServiceProvider>);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.DependencyInjection;HttpClientBuilderExtensions;ConfigurePrimaryHttpMessageHandler;(Microsoft.Extensions.DependencyInjection.IHttpClientBuilder,System.Action<System.Net.Http.HttpMessageHandler,System.IServiceProvider>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
+| Microsoft.Extensions.DependencyInjection;HttpClientBuilderExtensions;ConfigurePrimaryHttpMessageHandler;(Microsoft.Extensions.DependencyInjection.IHttpClientBuilder,System.Func<System.IServiceProvider,System.Net.Http.HttpMessageHandler>);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;HttpClientBuilderExtensions;ConfigurePrimaryHttpMessageHandler;(Microsoft.Extensions.DependencyInjection.IHttpClientBuilder,System.Func<System.IServiceProvider,System.Net.Http.HttpMessageHandler>);Argument[0];ReturnValue;value;hq-generated |
+| Microsoft.Extensions.DependencyInjection;HttpClientBuilderExtensions;ConfigurePrimaryHttpMessageHandler;(Microsoft.Extensions.DependencyInjection.IHttpClientBuilder,System.Func<System.IServiceProvider,System.Net.Http.HttpMessageHandler>);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.DependencyInjection;HttpClientBuilderExtensions;ConfigurePrimaryHttpMessageHandler;(Microsoft.Extensions.DependencyInjection.IHttpClientBuilder,System.Func<System.IServiceProvider,System.Net.Http.HttpMessageHandler>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
+| Microsoft.Extensions.DependencyInjection;HttpClientBuilderExtensions;ConfigurePrimaryHttpMessageHandler;(Microsoft.Extensions.DependencyInjection.IHttpClientBuilder,System.Func<System.Net.Http.HttpMessageHandler>);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;HttpClientBuilderExtensions;ConfigurePrimaryHttpMessageHandler;(Microsoft.Extensions.DependencyInjection.IHttpClientBuilder,System.Func<System.Net.Http.HttpMessageHandler>);Argument[0];ReturnValue;value;hq-generated |
+| Microsoft.Extensions.DependencyInjection;HttpClientBuilderExtensions;ConfigurePrimaryHttpMessageHandler;(Microsoft.Extensions.DependencyInjection.IHttpClientBuilder,System.Func<System.Net.Http.HttpMessageHandler>);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.DependencyInjection;HttpClientBuilderExtensions;ConfigurePrimaryHttpMessageHandler;(Microsoft.Extensions.DependencyInjection.IHttpClientBuilder,System.Func<System.Net.Http.HttpMessageHandler>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
-| Microsoft.Extensions.DependencyInjection;HttpClientBuilderExtensions;ConfigurePrimaryHttpMessageHandler<THandler>;(Microsoft.Extensions.DependencyInjection.IHttpClientBuilder);Argument[0];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.DependencyInjection;HttpClientBuilderExtensions;RedactLoggedHeaders;(Microsoft.Extensions.DependencyInjection.IHttpClientBuilder,System.Collections.Generic.IEnumerable<System.String>);Argument[0];ReturnValue;taint;df-generated |
+| Microsoft.Extensions.DependencyInjection;HttpClientBuilderExtensions;ConfigurePrimaryHttpMessageHandler<THandler>;(Microsoft.Extensions.DependencyInjection.IHttpClientBuilder);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;HttpClientBuilderExtensions;RedactLoggedHeaders;(Microsoft.Extensions.DependencyInjection.IHttpClientBuilder,System.Collections.Generic.IEnumerable<System.String>);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;HttpClientBuilderExtensions;RedactLoggedHeaders;(Microsoft.Extensions.DependencyInjection.IHttpClientBuilder,System.Func<System.String,System.Boolean>);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;HttpClientBuilderExtensions;RedactLoggedHeaders;(Microsoft.Extensions.DependencyInjection.IHttpClientBuilder,System.Func<System.String,System.Boolean>);Argument[0];ReturnValue;value;hq-generated |
+| Microsoft.Extensions.DependencyInjection;HttpClientBuilderExtensions;RedactLoggedHeaders;(Microsoft.Extensions.DependencyInjection.IHttpClientBuilder,System.Func<System.String,System.Boolean>);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.DependencyInjection;HttpClientBuilderExtensions;RedactLoggedHeaders;(Microsoft.Extensions.DependencyInjection.IHttpClientBuilder,System.Func<System.String,System.Boolean>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
-| Microsoft.Extensions.DependencyInjection;HttpClientBuilderExtensions;RemoveAllLoggers;(Microsoft.Extensions.DependencyInjection.IHttpClientBuilder);Argument[0];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.DependencyInjection;HttpClientBuilderExtensions;SetHandlerLifetime;(Microsoft.Extensions.DependencyInjection.IHttpClientBuilder,System.TimeSpan);Argument[0];ReturnValue;taint;df-generated |
+| Microsoft.Extensions.DependencyInjection;HttpClientBuilderExtensions;RemoveAllLoggers;(Microsoft.Extensions.DependencyInjection.IHttpClientBuilder);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;HttpClientBuilderExtensions;SetHandlerLifetime;(Microsoft.Extensions.DependencyInjection.IHttpClientBuilder,System.TimeSpan);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;HttpClientBuilderExtensions;UseSocketsHttpHandler;(Microsoft.Extensions.DependencyInjection.IHttpClientBuilder,System.Action<Microsoft.Extensions.DependencyInjection.ISocketsHttpHandlerBuilder>);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;HttpClientBuilderExtensions;UseSocketsHttpHandler;(Microsoft.Extensions.DependencyInjection.IHttpClientBuilder,System.Action<Microsoft.Extensions.DependencyInjection.ISocketsHttpHandlerBuilder>);Argument[0];ReturnValue;value;hq-generated |
+| Microsoft.Extensions.DependencyInjection;HttpClientBuilderExtensions;UseSocketsHttpHandler;(Microsoft.Extensions.DependencyInjection.IHttpClientBuilder,System.Action<Microsoft.Extensions.DependencyInjection.ISocketsHttpHandlerBuilder>);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.DependencyInjection;HttpClientBuilderExtensions;UseSocketsHttpHandler;(Microsoft.Extensions.DependencyInjection.IHttpClientBuilder,System.Action<Microsoft.Extensions.DependencyInjection.ISocketsHttpHandlerBuilder>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
+| Microsoft.Extensions.DependencyInjection;HttpClientBuilderExtensions;UseSocketsHttpHandler;(Microsoft.Extensions.DependencyInjection.IHttpClientBuilder,System.Action<System.Net.Http.SocketsHttpHandler,System.IServiceProvider>);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;HttpClientBuilderExtensions;UseSocketsHttpHandler;(Microsoft.Extensions.DependencyInjection.IHttpClientBuilder,System.Action<System.Net.Http.SocketsHttpHandler,System.IServiceProvider>);Argument[0];ReturnValue;value;hq-generated |
+| Microsoft.Extensions.DependencyInjection;HttpClientBuilderExtensions;UseSocketsHttpHandler;(Microsoft.Extensions.DependencyInjection.IHttpClientBuilder,System.Action<System.Net.Http.SocketsHttpHandler,System.IServiceProvider>);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.DependencyInjection;HttpClientBuilderExtensions;UseSocketsHttpHandler;(Microsoft.Extensions.DependencyInjection.IHttpClientBuilder,System.Action<System.Net.Http.SocketsHttpHandler,System.IServiceProvider>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
-| Microsoft.Extensions.DependencyInjection;HttpClientFactoryServiceCollectionExtensions;AddHttpClient;(Microsoft.Extensions.DependencyInjection.IServiceCollection);Argument[0].Element;ReturnValue;taint;df-generated |
+| Microsoft.Extensions.DependencyInjection;HttpClientFactoryServiceCollectionExtensions;AddHttpClient;(Microsoft.Extensions.DependencyInjection.IServiceCollection);Argument[0];ReturnValue;value;dfc-generated |
 | Microsoft.Extensions.DependencyInjection;HttpClientFactoryServiceCollectionExtensions;AddHttpClient;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.String);Argument[0].Element;ReturnValue;taint;df-generated |
 | Microsoft.Extensions.DependencyInjection;HttpClientFactoryServiceCollectionExtensions;AddHttpClient;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.String);Argument[1];ReturnValue;taint;df-generated |
 | Microsoft.Extensions.DependencyInjection;HttpClientFactoryServiceCollectionExtensions;AddHttpClient;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.String,System.Action<System.IServiceProvider,System.Net.Http.HttpClient>);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
@@ -954,12 +1006,14 @@
 | Microsoft.Extensions.DependencyInjection;HttpClientFactoryServiceCollectionExtensions;AddHttpClient<TClient>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.String);Argument[1];ReturnValue;taint;df-generated |
 | Microsoft.Extensions.DependencyInjection;HttpClientFactoryServiceCollectionExtensions;AddHttpClient<TClient>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.String,System.Action<System.IServiceProvider,System.Net.Http.HttpClient>);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
 | Microsoft.Extensions.DependencyInjection;HttpClientFactoryServiceCollectionExtensions;AddHttpClient<TClient>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.String,System.Action<System.Net.Http.HttpClient>);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
+| Microsoft.Extensions.DependencyInjection;HttpClientFactoryServiceCollectionExtensions;ConfigureHttpClientDefaults;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Action<Microsoft.Extensions.DependencyInjection.IHttpClientBuilder>);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;HttpClientFactoryServiceCollectionExtensions;ConfigureHttpClientDefaults;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Action<Microsoft.Extensions.DependencyInjection.IHttpClientBuilder>);Argument[0];ReturnValue;value;hq-generated |
+| Microsoft.Extensions.DependencyInjection;HttpClientFactoryServiceCollectionExtensions;ConfigureHttpClientDefaults;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Action<Microsoft.Extensions.DependencyInjection.IHttpClientBuilder>);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.DependencyInjection;HttpClientFactoryServiceCollectionExtensions;ConfigureHttpClientDefaults;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Action<Microsoft.Extensions.DependencyInjection.IHttpClientBuilder>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
 | Microsoft.Extensions.DependencyInjection;HttpJsonServiceExtensions;ConfigureHttpJsonOptions;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Action<Microsoft.AspNetCore.Http.Json.JsonOptions>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
 | Microsoft.Extensions.DependencyInjection;HttpLoggingServicesExtensions;AddHttpLogging;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Action<Microsoft.AspNetCore.HttpLogging.HttpLoggingOptions>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
 | Microsoft.Extensions.DependencyInjection;HttpLoggingServicesExtensions;AddW3CLogging;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Action<Microsoft.AspNetCore.HttpLogging.W3CLoggerOptions>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
-| Microsoft.Extensions.DependencyInjection;IServiceScope;get_ServiceProvider;();Argument[this];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.DependencyInjection;IServiceScope;get_ServiceProvider;();Argument[this];ReturnValue;value;df-generated |
+| Microsoft.Extensions.DependencyInjection;IServiceScope;get_ServiceProvider;();Argument[this];ReturnValue;value;dfc-generated |
 | Microsoft.Extensions.DependencyInjection;IServiceScopeFactory;CreateScope;();Argument[this];ReturnValue;taint;df-generated |
 | Microsoft.Extensions.DependencyInjection;IdentityServiceCollectionExtensions;AddIdentity<TUser,TRole>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Action<Microsoft.AspNetCore.Identity.IdentityOptions>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
 | Microsoft.Extensions.DependencyInjection;IdentityServiceCollectionExtensions;AddIdentityApiEndpoints<TUser>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Action<Microsoft.AspNetCore.Identity.IdentityOptions>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
@@ -968,13 +1022,25 @@
 | Microsoft.Extensions.DependencyInjection;IdentityServiceCollectionExtensions;ConfigureExternalCookie;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Action<Microsoft.AspNetCore.Authentication.Cookies.CookieAuthenticationOptions>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
 | Microsoft.Extensions.DependencyInjection;JsonProtocolDependencyInjectionExtensions;AddJsonProtocol<TBuilder>;(TBuilder,System.Action<Microsoft.AspNetCore.SignalR.JsonHubProtocolOptions>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
 | Microsoft.Extensions.DependencyInjection;LocalizationServiceCollectionExtensions;AddLocalization;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Action<Microsoft.Extensions.Localization.LocalizationOptions>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
-| Microsoft.Extensions.DependencyInjection;LoggingServiceCollectionExtensions;AddLogging;(Microsoft.Extensions.DependencyInjection.IServiceCollection);Argument[0].Element;ReturnValue;taint;df-generated |
+| Microsoft.Extensions.DependencyInjection;LoggingServiceCollectionExtensions;AddLogging;(Microsoft.Extensions.DependencyInjection.IServiceCollection);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;LoggingServiceCollectionExtensions;AddLogging;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Action<Microsoft.Extensions.Logging.ILoggingBuilder>);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;LoggingServiceCollectionExtensions;AddLogging;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Action<Microsoft.Extensions.Logging.ILoggingBuilder>);Argument[0];ReturnValue;value;hq-generated |
+| Microsoft.Extensions.DependencyInjection;LoggingServiceCollectionExtensions;AddLogging;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Action<Microsoft.Extensions.Logging.ILoggingBuilder>);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.DependencyInjection;LoggingServiceCollectionExtensions;AddLogging;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Action<Microsoft.Extensions.Logging.ILoggingBuilder>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
-| Microsoft.Extensions.DependencyInjection;MemoryCacheServiceCollectionExtensions;AddDistributedMemoryCache;(Microsoft.Extensions.DependencyInjection.IServiceCollection);Argument[0].Element;ReturnValue;taint;df-generated |
+| Microsoft.Extensions.DependencyInjection;MemoryCacheServiceCollectionExtensions;AddDistributedMemoryCache;(Microsoft.Extensions.DependencyInjection.IServiceCollection);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;MemoryCacheServiceCollectionExtensions;AddDistributedMemoryCache;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Action<Microsoft.Extensions.Caching.Memory.MemoryDistributedCacheOptions>);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;MemoryCacheServiceCollectionExtensions;AddDistributedMemoryCache;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Action<Microsoft.Extensions.Caching.Memory.MemoryDistributedCacheOptions>);Argument[0];ReturnValue;value;hq-generated |
+| Microsoft.Extensions.DependencyInjection;MemoryCacheServiceCollectionExtensions;AddDistributedMemoryCache;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Action<Microsoft.Extensions.Caching.Memory.MemoryDistributedCacheOptions>);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.DependencyInjection;MemoryCacheServiceCollectionExtensions;AddDistributedMemoryCache;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Action<Microsoft.Extensions.Caching.Memory.MemoryDistributedCacheOptions>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
-| Microsoft.Extensions.DependencyInjection;MemoryCacheServiceCollectionExtensions;AddMemoryCache;(Microsoft.Extensions.DependencyInjection.IServiceCollection);Argument[0].Element;ReturnValue;taint;df-generated |
+| Microsoft.Extensions.DependencyInjection;MemoryCacheServiceCollectionExtensions;AddMemoryCache;(Microsoft.Extensions.DependencyInjection.IServiceCollection);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;MemoryCacheServiceCollectionExtensions;AddMemoryCache;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Action<Microsoft.Extensions.Caching.Memory.MemoryCacheOptions>);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;MemoryCacheServiceCollectionExtensions;AddMemoryCache;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Action<Microsoft.Extensions.Caching.Memory.MemoryCacheOptions>);Argument[0];ReturnValue;value;hq-generated |
+| Microsoft.Extensions.DependencyInjection;MemoryCacheServiceCollectionExtensions;AddMemoryCache;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Action<Microsoft.Extensions.Caching.Memory.MemoryCacheOptions>);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.DependencyInjection;MemoryCacheServiceCollectionExtensions;AddMemoryCache;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Action<Microsoft.Extensions.Caching.Memory.MemoryCacheOptions>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
-| Microsoft.Extensions.DependencyInjection;MetricsServiceExtensions;AddMetrics;(Microsoft.Extensions.DependencyInjection.IServiceCollection);Argument[0].Element;ReturnValue;taint;df-generated |
+| Microsoft.Extensions.DependencyInjection;MetricsServiceExtensions;AddMetrics;(Microsoft.Extensions.DependencyInjection.IServiceCollection);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;MetricsServiceExtensions;AddMetrics;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Action<Microsoft.Extensions.Diagnostics.Metrics.IMetricsBuilder>);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;MetricsServiceExtensions;AddMetrics;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Action<Microsoft.Extensions.Diagnostics.Metrics.IMetricsBuilder>);Argument[0];ReturnValue;value;hq-generated |
+| Microsoft.Extensions.DependencyInjection;MetricsServiceExtensions;AddMetrics;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Action<Microsoft.Extensions.Diagnostics.Metrics.IMetricsBuilder>);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.DependencyInjection;MetricsServiceExtensions;AddMetrics;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Action<Microsoft.Extensions.Diagnostics.Metrics.IMetricsBuilder>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
 | Microsoft.Extensions.DependencyInjection;MvcCoreMvcBuilderExtensions;AddFormatterMappings;(Microsoft.Extensions.DependencyInjection.IMvcBuilder,System.Action<Microsoft.AspNetCore.Mvc.Formatters.FormatterMappings>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
 | Microsoft.Extensions.DependencyInjection;MvcCoreMvcBuilderExtensions;AddJsonOptions;(Microsoft.Extensions.DependencyInjection.IMvcBuilder,System.Action<Microsoft.AspNetCore.Mvc.JsonOptions>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
@@ -1039,24 +1105,54 @@
 | Microsoft.Extensions.DependencyInjection;OAuthExtensions;AddOAuth<TOptions,THandler>;(Microsoft.AspNetCore.Authentication.AuthenticationBuilder,System.String,System.String,System.Action<TOptions>);Argument[3];Argument[3].Parameter[delegate-self];value;hq-generated |
 | Microsoft.Extensions.DependencyInjection;ObjectFactory;BeginInvoke;(System.IServiceProvider,System.Object[],System.AsyncCallback,System.Object);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
 | Microsoft.Extensions.DependencyInjection;ObjectFactory<T>;BeginInvoke;(System.IServiceProvider,System.Object[],System.AsyncCallback,System.Object);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
-| Microsoft.Extensions.DependencyInjection;OptionsBuilderConfigurationExtensions;Bind<TOptions>;(Microsoft.Extensions.Options.OptionsBuilder<TOptions>,Microsoft.Extensions.Configuration.IConfiguration);Argument[0];ReturnValue;taint;df-generated |
+| Microsoft.Extensions.DependencyInjection;OptionsBuilderConfigurationExtensions;Bind<TOptions>;(Microsoft.Extensions.Options.OptionsBuilder<TOptions>,Microsoft.Extensions.Configuration.IConfiguration);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;OptionsBuilderConfigurationExtensions;Bind<TOptions>;(Microsoft.Extensions.Options.OptionsBuilder<TOptions>,Microsoft.Extensions.Configuration.IConfiguration,System.Action<Microsoft.Extensions.Configuration.BinderOptions>);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;OptionsBuilderConfigurationExtensions;Bind<TOptions>;(Microsoft.Extensions.Options.OptionsBuilder<TOptions>,Microsoft.Extensions.Configuration.IConfiguration,System.Action<Microsoft.Extensions.Configuration.BinderOptions>);Argument[0];ReturnValue;value;hq-generated |
+| Microsoft.Extensions.DependencyInjection;OptionsBuilderConfigurationExtensions;Bind<TOptions>;(Microsoft.Extensions.Options.OptionsBuilder<TOptions>,Microsoft.Extensions.Configuration.IConfiguration,System.Action<Microsoft.Extensions.Configuration.BinderOptions>);Argument[2];Argument[2].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.DependencyInjection;OptionsBuilderConfigurationExtensions;Bind<TOptions>;(Microsoft.Extensions.Options.OptionsBuilder<TOptions>,Microsoft.Extensions.Configuration.IConfiguration,System.Action<Microsoft.Extensions.Configuration.BinderOptions>);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
+| Microsoft.Extensions.DependencyInjection;OptionsBuilderConfigurationExtensions;BindConfiguration<TOptions>;(Microsoft.Extensions.Options.OptionsBuilder<TOptions>,System.String,System.Action<Microsoft.Extensions.Configuration.BinderOptions>);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;OptionsBuilderConfigurationExtensions;BindConfiguration<TOptions>;(Microsoft.Extensions.Options.OptionsBuilder<TOptions>,System.String,System.Action<Microsoft.Extensions.Configuration.BinderOptions>);Argument[0];ReturnValue;value;hq-generated |
+| Microsoft.Extensions.DependencyInjection;OptionsBuilderConfigurationExtensions;BindConfiguration<TOptions>;(Microsoft.Extensions.Options.OptionsBuilder<TOptions>,System.String,System.Action<Microsoft.Extensions.Configuration.BinderOptions>);Argument[2];Argument[2].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.DependencyInjection;OptionsBuilderConfigurationExtensions;BindConfiguration<TOptions>;(Microsoft.Extensions.Options.OptionsBuilder<TOptions>,System.String,System.Action<Microsoft.Extensions.Configuration.BinderOptions>);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
-| Microsoft.Extensions.DependencyInjection;OptionsBuilderDataAnnotationsExtensions;ValidateDataAnnotations<TOptions>;(Microsoft.Extensions.Options.OptionsBuilder<TOptions>);Argument[0];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.DependencyInjection;OptionsBuilderExtensions;ValidateOnStart<TOptions>;(Microsoft.Extensions.Options.OptionsBuilder<TOptions>);Argument[0];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.DependencyInjection;OptionsConfigurationServiceCollectionExtensions;Configure<TOptions>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,Microsoft.Extensions.Configuration.IConfiguration);Argument[0].Element;ReturnValue;taint;df-generated |
+| Microsoft.Extensions.DependencyInjection;OptionsBuilderDataAnnotationsExtensions;ValidateDataAnnotations<TOptions>;(Microsoft.Extensions.Options.OptionsBuilder<TOptions>);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;OptionsBuilderExtensions;ValidateOnStart<TOptions>;(Microsoft.Extensions.Options.OptionsBuilder<TOptions>);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;OptionsConfigurationServiceCollectionExtensions;Configure<TOptions>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,Microsoft.Extensions.Configuration.IConfiguration);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;OptionsConfigurationServiceCollectionExtensions;Configure<TOptions>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,Microsoft.Extensions.Configuration.IConfiguration,System.Action<Microsoft.Extensions.Configuration.BinderOptions>);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;OptionsConfigurationServiceCollectionExtensions;Configure<TOptions>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,Microsoft.Extensions.Configuration.IConfiguration,System.Action<Microsoft.Extensions.Configuration.BinderOptions>);Argument[0];ReturnValue;value;hq-generated |
+| Microsoft.Extensions.DependencyInjection;OptionsConfigurationServiceCollectionExtensions;Configure<TOptions>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,Microsoft.Extensions.Configuration.IConfiguration,System.Action<Microsoft.Extensions.Configuration.BinderOptions>);Argument[2];Argument[2].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.DependencyInjection;OptionsConfigurationServiceCollectionExtensions;Configure<TOptions>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,Microsoft.Extensions.Configuration.IConfiguration,System.Action<Microsoft.Extensions.Configuration.BinderOptions>);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
-| Microsoft.Extensions.DependencyInjection;OptionsConfigurationServiceCollectionExtensions;Configure<TOptions>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.String,Microsoft.Extensions.Configuration.IConfiguration);Argument[0].Element;ReturnValue;taint;df-generated |
+| Microsoft.Extensions.DependencyInjection;OptionsConfigurationServiceCollectionExtensions;Configure<TOptions>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.String,Microsoft.Extensions.Configuration.IConfiguration);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;OptionsConfigurationServiceCollectionExtensions;Configure<TOptions>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.String,Microsoft.Extensions.Configuration.IConfiguration,System.Action<Microsoft.Extensions.Configuration.BinderOptions>);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;OptionsConfigurationServiceCollectionExtensions;Configure<TOptions>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.String,Microsoft.Extensions.Configuration.IConfiguration,System.Action<Microsoft.Extensions.Configuration.BinderOptions>);Argument[0];ReturnValue;value;hq-generated |
+| Microsoft.Extensions.DependencyInjection;OptionsConfigurationServiceCollectionExtensions;Configure<TOptions>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.String,Microsoft.Extensions.Configuration.IConfiguration,System.Action<Microsoft.Extensions.Configuration.BinderOptions>);Argument[3];Argument[3].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.DependencyInjection;OptionsConfigurationServiceCollectionExtensions;Configure<TOptions>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.String,Microsoft.Extensions.Configuration.IConfiguration,System.Action<Microsoft.Extensions.Configuration.BinderOptions>);Argument[3];Argument[3].Parameter[delegate-self];value;hq-generated |
-| Microsoft.Extensions.DependencyInjection;OptionsServiceCollectionExtensions;AddOptions;(Microsoft.Extensions.DependencyInjection.IServiceCollection);Argument[0].Element;ReturnValue;taint;df-generated |
+| Microsoft.Extensions.DependencyInjection;OptionsServiceCollectionExtensions;AddOptions;(Microsoft.Extensions.DependencyInjection.IServiceCollection);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;OptionsServiceCollectionExtensions;Configure<TOptions>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Action<TOptions>);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;OptionsServiceCollectionExtensions;Configure<TOptions>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Action<TOptions>);Argument[0];ReturnValue;value;hq-generated |
+| Microsoft.Extensions.DependencyInjection;OptionsServiceCollectionExtensions;Configure<TOptions>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Action<TOptions>);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.DependencyInjection;OptionsServiceCollectionExtensions;Configure<TOptions>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Action<TOptions>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
+| Microsoft.Extensions.DependencyInjection;OptionsServiceCollectionExtensions;Configure<TOptions>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.String,System.Action<TOptions>);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;OptionsServiceCollectionExtensions;Configure<TOptions>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.String,System.Action<TOptions>);Argument[0];ReturnValue;value;hq-generated |
+| Microsoft.Extensions.DependencyInjection;OptionsServiceCollectionExtensions;Configure<TOptions>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.String,System.Action<TOptions>);Argument[2];Argument[2].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.DependencyInjection;OptionsServiceCollectionExtensions;Configure<TOptions>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.String,System.Action<TOptions>);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
+| Microsoft.Extensions.DependencyInjection;OptionsServiceCollectionExtensions;ConfigureAll<TOptions>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Action<TOptions>);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;OptionsServiceCollectionExtensions;ConfigureAll<TOptions>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Action<TOptions>);Argument[0];ReturnValue;value;hq-generated |
+| Microsoft.Extensions.DependencyInjection;OptionsServiceCollectionExtensions;ConfigureAll<TOptions>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Action<TOptions>);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.DependencyInjection;OptionsServiceCollectionExtensions;ConfigureAll<TOptions>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Action<TOptions>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
-| Microsoft.Extensions.DependencyInjection;OptionsServiceCollectionExtensions;ConfigureOptions;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Object);Argument[0].Element;ReturnValue;taint;df-generated |
-| Microsoft.Extensions.DependencyInjection;OptionsServiceCollectionExtensions;ConfigureOptions;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Type);Argument[0].Element;ReturnValue;taint;df-generated |
-| Microsoft.Extensions.DependencyInjection;OptionsServiceCollectionExtensions;ConfigureOptions<TConfigureOptions>;(Microsoft.Extensions.DependencyInjection.IServiceCollection);Argument[0].Element;ReturnValue;taint;df-generated |
+| Microsoft.Extensions.DependencyInjection;OptionsServiceCollectionExtensions;ConfigureOptions;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Object);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;OptionsServiceCollectionExtensions;ConfigureOptions;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Type);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;OptionsServiceCollectionExtensions;ConfigureOptions<TConfigureOptions>;(Microsoft.Extensions.DependencyInjection.IServiceCollection);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;OptionsServiceCollectionExtensions;PostConfigure<TOptions>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Action<TOptions>);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;OptionsServiceCollectionExtensions;PostConfigure<TOptions>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Action<TOptions>);Argument[0];ReturnValue;value;hq-generated |
+| Microsoft.Extensions.DependencyInjection;OptionsServiceCollectionExtensions;PostConfigure<TOptions>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Action<TOptions>);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.DependencyInjection;OptionsServiceCollectionExtensions;PostConfigure<TOptions>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Action<TOptions>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
+| Microsoft.Extensions.DependencyInjection;OptionsServiceCollectionExtensions;PostConfigure<TOptions>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.String,System.Action<TOptions>);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;OptionsServiceCollectionExtensions;PostConfigure<TOptions>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.String,System.Action<TOptions>);Argument[0];ReturnValue;value;hq-generated |
+| Microsoft.Extensions.DependencyInjection;OptionsServiceCollectionExtensions;PostConfigure<TOptions>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.String,System.Action<TOptions>);Argument[2];Argument[2].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.DependencyInjection;OptionsServiceCollectionExtensions;PostConfigure<TOptions>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.String,System.Action<TOptions>);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
+| Microsoft.Extensions.DependencyInjection;OptionsServiceCollectionExtensions;PostConfigureAll<TOptions>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Action<TOptions>);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;OptionsServiceCollectionExtensions;PostConfigureAll<TOptions>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Action<TOptions>);Argument[0];ReturnValue;value;hq-generated |
+| Microsoft.Extensions.DependencyInjection;OptionsServiceCollectionExtensions;PostConfigureAll<TOptions>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Action<TOptions>);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.DependencyInjection;OptionsServiceCollectionExtensions;PostConfigureAll<TOptions>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Action<TOptions>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
 | Microsoft.Extensions.DependencyInjection;OutputCacheConventionBuilderExtensions;CacheOutput<TBuilder>;(TBuilder,System.Action<Microsoft.AspNetCore.OutputCaching.OutputCachePolicyBuilder>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
 | Microsoft.Extensions.DependencyInjection;OutputCacheConventionBuilderExtensions;CacheOutput<TBuilder>;(TBuilder,System.Action<Microsoft.AspNetCore.OutputCaching.OutputCachePolicyBuilder>,System.Boolean);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
@@ -1074,96 +1170,217 @@
 | Microsoft.Extensions.DependencyInjection;ServerRazorComponentsBuilderExtensions;AddInteractiveServerComponents;(Microsoft.Extensions.DependencyInjection.IRazorComponentsBuilder,System.Action<Microsoft.AspNetCore.Components.Server.CircuitOptions>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
 | Microsoft.Extensions.DependencyInjection;ServerSideBlazorBuilderExtensions;AddCircuitOptions;(Microsoft.Extensions.DependencyInjection.IServerSideBlazorBuilder,System.Action<Microsoft.AspNetCore.Components.Server.CircuitOptions>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
 | Microsoft.Extensions.DependencyInjection;ServerSideBlazorBuilderExtensions;AddHubOptions;(Microsoft.Extensions.DependencyInjection.IServerSideBlazorBuilder,System.Action<Microsoft.AspNetCore.SignalR.HubOptions>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
-| Microsoft.Extensions.DependencyInjection;ServiceCollectionHostedServiceExtensions;AddHostedService<THostedService>;(Microsoft.Extensions.DependencyInjection.IServiceCollection);Argument[0].Element;ReturnValue;taint;df-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceCollectionHostedServiceExtensions;AddHostedService<THostedService>;(Microsoft.Extensions.DependencyInjection.IServiceCollection);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceCollectionHostedServiceExtensions;AddHostedService<THostedService>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Func<System.IServiceProvider,THostedService>);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceCollectionHostedServiceExtensions;AddHostedService<THostedService>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Func<System.IServiceProvider,THostedService>);Argument[0];ReturnValue;value;hq-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceCollectionHostedServiceExtensions;AddHostedService<THostedService>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Func<System.IServiceProvider,THostedService>);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.DependencyInjection;ServiceCollectionHostedServiceExtensions;AddHostedService<THostedService>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Func<System.IServiceProvider,THostedService>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
-| Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddKeyedScoped;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Type,System.Object);Argument[0].Element;ReturnValue;taint;df-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddKeyedScoped;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Type,System.Object);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddKeyedScoped;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Type,System.Object,System.Func<System.IServiceProvider,System.Object,System.Object>);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddKeyedScoped;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Type,System.Object,System.Func<System.IServiceProvider,System.Object,System.Object>);Argument[0];ReturnValue;value;hq-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddKeyedScoped;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Type,System.Object,System.Func<System.IServiceProvider,System.Object,System.Object>);Argument[3];Argument[3].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddKeyedScoped;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Type,System.Object,System.Func<System.IServiceProvider,System.Object,System.Object>);Argument[3];Argument[3].Parameter[delegate-self];value;hq-generated |
-| Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddKeyedScoped;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Type,System.Object,System.Type);Argument[0].Element;ReturnValue;taint;df-generated |
-| Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddKeyedScoped<TService,TImplementation>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Object);Argument[0].Element;ReturnValue;taint;df-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddKeyedScoped;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Type,System.Object,System.Type);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddKeyedScoped<TService,TImplementation>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Object);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddKeyedScoped<TService,TImplementation>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Object,System.Func<System.IServiceProvider,System.Object,TImplementation>);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddKeyedScoped<TService,TImplementation>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Object,System.Func<System.IServiceProvider,System.Object,TImplementation>);Argument[0];ReturnValue;value;hq-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddKeyedScoped<TService,TImplementation>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Object,System.Func<System.IServiceProvider,System.Object,TImplementation>);Argument[2];Argument[2].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddKeyedScoped<TService,TImplementation>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Object,System.Func<System.IServiceProvider,System.Object,TImplementation>);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
-| Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddKeyedScoped<TService>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Object);Argument[0].Element;ReturnValue;taint;df-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddKeyedScoped<TService>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Object);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddKeyedScoped<TService>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Object,System.Func<System.IServiceProvider,System.Object,TService>);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddKeyedScoped<TService>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Object,System.Func<System.IServiceProvider,System.Object,TService>);Argument[0];ReturnValue;value;hq-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddKeyedScoped<TService>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Object,System.Func<System.IServiceProvider,System.Object,TService>);Argument[2];Argument[2].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddKeyedScoped<TService>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Object,System.Func<System.IServiceProvider,System.Object,TService>);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
-| Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddKeyedSingleton;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Type,System.Object);Argument[0].Element;ReturnValue;taint;df-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddKeyedSingleton;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Type,System.Object);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddKeyedSingleton;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Type,System.Object,System.Func<System.IServiceProvider,System.Object,System.Object>);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddKeyedSingleton;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Type,System.Object,System.Func<System.IServiceProvider,System.Object,System.Object>);Argument[0];ReturnValue;value;hq-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddKeyedSingleton;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Type,System.Object,System.Func<System.IServiceProvider,System.Object,System.Object>);Argument[3];Argument[3].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddKeyedSingleton;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Type,System.Object,System.Func<System.IServiceProvider,System.Object,System.Object>);Argument[3];Argument[3].Parameter[delegate-self];value;hq-generated |
-| Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddKeyedSingleton;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Type,System.Object,System.Object);Argument[0].Element;ReturnValue;taint;df-generated |
-| Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddKeyedSingleton;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Type,System.Object,System.Object);Argument[3];Argument[0].Element;taint;df-generated |
-| Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddKeyedSingleton;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Type,System.Object,System.Object);Argument[3];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddKeyedSingleton;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Type,System.Object,System.Type);Argument[0].Element;ReturnValue;taint;df-generated |
-| Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddKeyedSingleton<TService,TImplementation>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Object);Argument[0].Element;ReturnValue;taint;df-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddKeyedSingleton;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Type,System.Object,System.Object);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddKeyedSingleton;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Type,System.Object,System.Type);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddKeyedSingleton<TService,TImplementation>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Object);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddKeyedSingleton<TService,TImplementation>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Object,System.Func<System.IServiceProvider,System.Object,TImplementation>);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddKeyedSingleton<TService,TImplementation>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Object,System.Func<System.IServiceProvider,System.Object,TImplementation>);Argument[0];ReturnValue;value;hq-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddKeyedSingleton<TService,TImplementation>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Object,System.Func<System.IServiceProvider,System.Object,TImplementation>);Argument[2];Argument[2].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddKeyedSingleton<TService,TImplementation>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Object,System.Func<System.IServiceProvider,System.Object,TImplementation>);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
-| Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddKeyedSingleton<TService>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Object);Argument[0].Element;ReturnValue;taint;df-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddKeyedSingleton<TService>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Object);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddKeyedSingleton<TService>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Object,System.Func<System.IServiceProvider,System.Object,TService>);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddKeyedSingleton<TService>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Object,System.Func<System.IServiceProvider,System.Object,TService>);Argument[0];ReturnValue;value;hq-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddKeyedSingleton<TService>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Object,System.Func<System.IServiceProvider,System.Object,TService>);Argument[2];Argument[2].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddKeyedSingleton<TService>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Object,System.Func<System.IServiceProvider,System.Object,TService>);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
-| Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddKeyedSingleton<TService>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Object,TService);Argument[0].Element;ReturnValue;taint;df-generated |
-| Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddKeyedSingleton<TService>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Object,TService);Argument[2];Argument[0].Element;taint;df-generated |
-| Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddKeyedSingleton<TService>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Object,TService);Argument[2];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddKeyedTransient;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Type,System.Object);Argument[0].Element;ReturnValue;taint;df-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddKeyedSingleton<TService>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Object,TService);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddKeyedTransient;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Type,System.Object);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddKeyedTransient;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Type,System.Object,System.Func<System.IServiceProvider,System.Object,System.Object>);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddKeyedTransient;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Type,System.Object,System.Func<System.IServiceProvider,System.Object,System.Object>);Argument[0];ReturnValue;value;hq-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddKeyedTransient;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Type,System.Object,System.Func<System.IServiceProvider,System.Object,System.Object>);Argument[3];Argument[3].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddKeyedTransient;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Type,System.Object,System.Func<System.IServiceProvider,System.Object,System.Object>);Argument[3];Argument[3].Parameter[delegate-self];value;hq-generated |
-| Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddKeyedTransient;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Type,System.Object,System.Type);Argument[0].Element;ReturnValue;taint;df-generated |
-| Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddKeyedTransient<TService,TImplementation>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Object);Argument[0].Element;ReturnValue;taint;df-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddKeyedTransient;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Type,System.Object,System.Type);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddKeyedTransient<TService,TImplementation>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Object);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddKeyedTransient<TService,TImplementation>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Object,System.Func<System.IServiceProvider,System.Object,TImplementation>);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddKeyedTransient<TService,TImplementation>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Object,System.Func<System.IServiceProvider,System.Object,TImplementation>);Argument[0];ReturnValue;value;hq-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddKeyedTransient<TService,TImplementation>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Object,System.Func<System.IServiceProvider,System.Object,TImplementation>);Argument[2];Argument[2].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddKeyedTransient<TService,TImplementation>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Object,System.Func<System.IServiceProvider,System.Object,TImplementation>);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
-| Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddKeyedTransient<TService>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Object);Argument[0].Element;ReturnValue;taint;df-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddKeyedTransient<TService>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Object);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddKeyedTransient<TService>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Object,System.Func<System.IServiceProvider,System.Object,TService>);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddKeyedTransient<TService>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Object,System.Func<System.IServiceProvider,System.Object,TService>);Argument[0];ReturnValue;value;hq-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddKeyedTransient<TService>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Object,System.Func<System.IServiceProvider,System.Object,TService>);Argument[2];Argument[2].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddKeyedTransient<TService>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Object,System.Func<System.IServiceProvider,System.Object,TService>);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
-| Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddScoped;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Type);Argument[0].Element;ReturnValue;taint;df-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddScoped;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Type);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddScoped;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Type,System.Func<System.IServiceProvider,System.Object>);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddScoped;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Type,System.Func<System.IServiceProvider,System.Object>);Argument[0];ReturnValue;value;hq-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddScoped;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Type,System.Func<System.IServiceProvider,System.Object>);Argument[2];Argument[2].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddScoped;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Type,System.Func<System.IServiceProvider,System.Object>);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
-| Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddScoped;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Type,System.Type);Argument[0].Element;ReturnValue;taint;df-generated |
-| Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddScoped<TService,TImplementation>;(Microsoft.Extensions.DependencyInjection.IServiceCollection);Argument[0].Element;ReturnValue;taint;df-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddScoped;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Type,System.Type);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddScoped<TService,TImplementation>;(Microsoft.Extensions.DependencyInjection.IServiceCollection);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddScoped<TService,TImplementation>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Func<System.IServiceProvider,TImplementation>);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddScoped<TService,TImplementation>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Func<System.IServiceProvider,TImplementation>);Argument[0];ReturnValue;value;hq-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddScoped<TService,TImplementation>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Func<System.IServiceProvider,TImplementation>);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddScoped<TService,TImplementation>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Func<System.IServiceProvider,TImplementation>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
-| Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddScoped<TService>;(Microsoft.Extensions.DependencyInjection.IServiceCollection);Argument[0].Element;ReturnValue;taint;df-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddScoped<TService>;(Microsoft.Extensions.DependencyInjection.IServiceCollection);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddScoped<TService>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Func<System.IServiceProvider,TService>);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddScoped<TService>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Func<System.IServiceProvider,TService>);Argument[0];ReturnValue;value;hq-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddScoped<TService>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Func<System.IServiceProvider,TService>);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddScoped<TService>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Func<System.IServiceProvider,TService>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
-| Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddSingleton;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Type);Argument[0].Element;ReturnValue;taint;df-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddSingleton;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Type);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddSingleton;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Type,System.Func<System.IServiceProvider,System.Object>);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddSingleton;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Type,System.Func<System.IServiceProvider,System.Object>);Argument[0];ReturnValue;value;hq-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddSingleton;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Type,System.Func<System.IServiceProvider,System.Object>);Argument[2];Argument[2].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddSingleton;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Type,System.Func<System.IServiceProvider,System.Object>);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
-| Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddSingleton;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Type,System.Object);Argument[0].Element;ReturnValue;taint;df-generated |
-| Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddSingleton;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Type,System.Type);Argument[0].Element;ReturnValue;taint;df-generated |
-| Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddSingleton<TService,TImplementation>;(Microsoft.Extensions.DependencyInjection.IServiceCollection);Argument[0].Element;ReturnValue;taint;df-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddSingleton;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Type,System.Object);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddSingleton;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Type,System.Type);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddSingleton<TService,TImplementation>;(Microsoft.Extensions.DependencyInjection.IServiceCollection);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddSingleton<TService,TImplementation>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Func<System.IServiceProvider,TImplementation>);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddSingleton<TService,TImplementation>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Func<System.IServiceProvider,TImplementation>);Argument[0];ReturnValue;value;hq-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddSingleton<TService,TImplementation>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Func<System.IServiceProvider,TImplementation>);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddSingleton<TService,TImplementation>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Func<System.IServiceProvider,TImplementation>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
-| Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddSingleton<TService>;(Microsoft.Extensions.DependencyInjection.IServiceCollection);Argument[0].Element;ReturnValue;taint;df-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddSingleton<TService>;(Microsoft.Extensions.DependencyInjection.IServiceCollection);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddSingleton<TService>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Func<System.IServiceProvider,TService>);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddSingleton<TService>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Func<System.IServiceProvider,TService>);Argument[0];ReturnValue;value;hq-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddSingleton<TService>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Func<System.IServiceProvider,TService>);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddSingleton<TService>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Func<System.IServiceProvider,TService>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
-| Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddSingleton<TService>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,TService);Argument[0].Element;ReturnValue;taint;df-generated |
-| Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddTransient;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Type);Argument[0].Element;ReturnValue;taint;df-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddSingleton<TService>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,TService);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddTransient;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Type);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddTransient;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Type,System.Func<System.IServiceProvider,System.Object>);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddTransient;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Type,System.Func<System.IServiceProvider,System.Object>);Argument[0];ReturnValue;value;hq-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddTransient;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Type,System.Func<System.IServiceProvider,System.Object>);Argument[2];Argument[2].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddTransient;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Type,System.Func<System.IServiceProvider,System.Object>);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
-| Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddTransient;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Type,System.Type);Argument[0].Element;ReturnValue;taint;df-generated |
-| Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddTransient<TService,TImplementation>;(Microsoft.Extensions.DependencyInjection.IServiceCollection);Argument[0].Element;ReturnValue;taint;df-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddTransient;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Type,System.Type);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddTransient<TService,TImplementation>;(Microsoft.Extensions.DependencyInjection.IServiceCollection);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddTransient<TService,TImplementation>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Func<System.IServiceProvider,TImplementation>);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddTransient<TService,TImplementation>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Func<System.IServiceProvider,TImplementation>);Argument[0];ReturnValue;value;hq-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddTransient<TService,TImplementation>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Func<System.IServiceProvider,TImplementation>);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddTransient<TService,TImplementation>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Func<System.IServiceProvider,TImplementation>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
-| Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddTransient<TService>;(Microsoft.Extensions.DependencyInjection.IServiceCollection);Argument[0].Element;ReturnValue;taint;df-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddTransient<TService>;(Microsoft.Extensions.DependencyInjection.IServiceCollection);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddTransient<TService>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Func<System.IServiceProvider,TService>);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddTransient<TService>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Func<System.IServiceProvider,TService>);Argument[0];ReturnValue;value;hq-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddTransient<TService>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Func<System.IServiceProvider,TService>);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.DependencyInjection;ServiceCollectionServiceExtensions;AddTransient<TService>;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Func<System.IServiceProvider,TService>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceDescriptor;Describe;(System.Type,System.Func<System.IServiceProvider,System.Object>,Microsoft.Extensions.DependencyInjection.ServiceLifetime);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.DependencyInjection;ServiceDescriptor;Describe;(System.Type,System.Func<System.IServiceProvider,System.Object>,Microsoft.Extensions.DependencyInjection.ServiceLifetime);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceDescriptor;Describe;(System.Type,System.Func<System.IServiceProvider,System.Object>,Microsoft.Extensions.DependencyInjection.ServiceLifetime);Argument[1];ReturnValue.SyntheticField[Microsoft.Extensions.DependencyInjection.ServiceDescriptor._implementationFactory];value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceDescriptor;Describe;(System.Type,System.Func<System.IServiceProvider,System.Object>,Microsoft.Extensions.DependencyInjection.ServiceLifetime);Argument[1];ReturnValue.SyntheticField[Microsoft.Extensions.DependencyInjection.ServiceDescriptor._implementationFactory];value;hq-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceDescriptor;DescribeKeyed;(System.Type,System.Object,System.Func<System.IServiceProvider,System.Object,System.Object>,Microsoft.Extensions.DependencyInjection.ServiceLifetime);Argument[2];Argument[2].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.DependencyInjection;ServiceDescriptor;DescribeKeyed;(System.Type,System.Object,System.Func<System.IServiceProvider,System.Object,System.Object>,Microsoft.Extensions.DependencyInjection.ServiceLifetime);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceDescriptor;DescribeKeyed;(System.Type,System.Object,System.Func<System.IServiceProvider,System.Object,System.Object>,Microsoft.Extensions.DependencyInjection.ServiceLifetime);Argument[2];ReturnValue.SyntheticField[Microsoft.Extensions.DependencyInjection.ServiceDescriptor._implementationFactory];value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceDescriptor;DescribeKeyed;(System.Type,System.Object,System.Func<System.IServiceProvider,System.Object,System.Object>,Microsoft.Extensions.DependencyInjection.ServiceLifetime);Argument[2];ReturnValue.SyntheticField[Microsoft.Extensions.DependencyInjection.ServiceDescriptor._implementationFactory];value;hq-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceDescriptor;KeyedScoped;(System.Type,System.Object,System.Func<System.IServiceProvider,System.Object,System.Object>);Argument[2];Argument[2].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.DependencyInjection;ServiceDescriptor;KeyedScoped;(System.Type,System.Object,System.Func<System.IServiceProvider,System.Object,System.Object>);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceDescriptor;KeyedScoped;(System.Type,System.Object,System.Func<System.IServiceProvider,System.Object,System.Object>);Argument[2];ReturnValue.SyntheticField[Microsoft.Extensions.DependencyInjection.ServiceDescriptor._implementationFactory];value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceDescriptor;KeyedScoped;(System.Type,System.Object,System.Func<System.IServiceProvider,System.Object,System.Object>);Argument[2];ReturnValue.SyntheticField[Microsoft.Extensions.DependencyInjection.ServiceDescriptor._implementationFactory];value;hq-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceDescriptor;KeyedScoped<TService,TImplementation>;(System.Object,System.Func<System.IServiceProvider,System.Object,TImplementation>);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.DependencyInjection;ServiceDescriptor;KeyedScoped<TService,TImplementation>;(System.Object,System.Func<System.IServiceProvider,System.Object,TImplementation>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceDescriptor;KeyedScoped<TService,TImplementation>;(System.Object,System.Func<System.IServiceProvider,System.Object,TImplementation>);Argument[1];ReturnValue.SyntheticField[Microsoft.Extensions.DependencyInjection.ServiceDescriptor._implementationFactory];value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceDescriptor;KeyedScoped<TService,TImplementation>;(System.Object,System.Func<System.IServiceProvider,System.Object,TImplementation>);Argument[1];ReturnValue.SyntheticField[Microsoft.Extensions.DependencyInjection.ServiceDescriptor._implementationFactory];value;hq-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceDescriptor;KeyedScoped<TService>;(System.Object,System.Func<System.IServiceProvider,System.Object,TService>);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.DependencyInjection;ServiceDescriptor;KeyedScoped<TService>;(System.Object,System.Func<System.IServiceProvider,System.Object,TService>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceDescriptor;KeyedScoped<TService>;(System.Object,System.Func<System.IServiceProvider,System.Object,TService>);Argument[1];ReturnValue.SyntheticField[Microsoft.Extensions.DependencyInjection.ServiceDescriptor._implementationFactory];value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceDescriptor;KeyedScoped<TService>;(System.Object,System.Func<System.IServiceProvider,System.Object,TService>);Argument[1];ReturnValue.SyntheticField[Microsoft.Extensions.DependencyInjection.ServiceDescriptor._implementationFactory];value;hq-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceDescriptor;KeyedSingleton;(System.Type,System.Object,System.Func<System.IServiceProvider,System.Object,System.Object>);Argument[2];Argument[2].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.DependencyInjection;ServiceDescriptor;KeyedSingleton;(System.Type,System.Object,System.Func<System.IServiceProvider,System.Object,System.Object>);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
-| Microsoft.Extensions.DependencyInjection;ServiceDescriptor;KeyedSingleton;(System.Type,System.Object,System.Object);Argument[2];ReturnValue;taint;df-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceDescriptor;KeyedSingleton;(System.Type,System.Object,System.Func<System.IServiceProvider,System.Object,System.Object>);Argument[2];ReturnValue.SyntheticField[Microsoft.Extensions.DependencyInjection.ServiceDescriptor._implementationFactory];value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceDescriptor;KeyedSingleton;(System.Type,System.Object,System.Func<System.IServiceProvider,System.Object,System.Object>);Argument[2];ReturnValue.SyntheticField[Microsoft.Extensions.DependencyInjection.ServiceDescriptor._implementationFactory];value;hq-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceDescriptor;KeyedSingleton;(System.Type,System.Object,System.Object);Argument[2];ReturnValue.SyntheticField[Microsoft.Extensions.DependencyInjection.ServiceDescriptor._implementationInstance];value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceDescriptor;KeyedSingleton<TService,TImplementation>;(System.Object,System.Func<System.IServiceProvider,System.Object,TImplementation>);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.DependencyInjection;ServiceDescriptor;KeyedSingleton<TService,TImplementation>;(System.Object,System.Func<System.IServiceProvider,System.Object,TImplementation>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceDescriptor;KeyedSingleton<TService,TImplementation>;(System.Object,System.Func<System.IServiceProvider,System.Object,TImplementation>);Argument[1];ReturnValue.SyntheticField[Microsoft.Extensions.DependencyInjection.ServiceDescriptor._implementationFactory];value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceDescriptor;KeyedSingleton<TService,TImplementation>;(System.Object,System.Func<System.IServiceProvider,System.Object,TImplementation>);Argument[1];ReturnValue.SyntheticField[Microsoft.Extensions.DependencyInjection.ServiceDescriptor._implementationFactory];value;hq-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceDescriptor;KeyedSingleton<TService>;(System.Object,System.Func<System.IServiceProvider,System.Object,TService>);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.DependencyInjection;ServiceDescriptor;KeyedSingleton<TService>;(System.Object,System.Func<System.IServiceProvider,System.Object,TService>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
-| Microsoft.Extensions.DependencyInjection;ServiceDescriptor;KeyedSingleton<TService>;(System.Object,TService);Argument[1];ReturnValue;taint;df-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceDescriptor;KeyedSingleton<TService>;(System.Object,System.Func<System.IServiceProvider,System.Object,TService>);Argument[1];ReturnValue.SyntheticField[Microsoft.Extensions.DependencyInjection.ServiceDescriptor._implementationFactory];value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceDescriptor;KeyedSingleton<TService>;(System.Object,System.Func<System.IServiceProvider,System.Object,TService>);Argument[1];ReturnValue.SyntheticField[Microsoft.Extensions.DependencyInjection.ServiceDescriptor._implementationFactory];value;hq-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceDescriptor;KeyedSingleton<TService>;(System.Object,TService);Argument[1];ReturnValue.SyntheticField[Microsoft.Extensions.DependencyInjection.ServiceDescriptor._implementationInstance];value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceDescriptor;KeyedTransient;(System.Type,System.Object,System.Func<System.IServiceProvider,System.Object,System.Object>);Argument[2];Argument[2].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.DependencyInjection;ServiceDescriptor;KeyedTransient;(System.Type,System.Object,System.Func<System.IServiceProvider,System.Object,System.Object>);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceDescriptor;KeyedTransient;(System.Type,System.Object,System.Func<System.IServiceProvider,System.Object,System.Object>);Argument[2];ReturnValue.SyntheticField[Microsoft.Extensions.DependencyInjection.ServiceDescriptor._implementationFactory];value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceDescriptor;KeyedTransient;(System.Type,System.Object,System.Func<System.IServiceProvider,System.Object,System.Object>);Argument[2];ReturnValue.SyntheticField[Microsoft.Extensions.DependencyInjection.ServiceDescriptor._implementationFactory];value;hq-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceDescriptor;KeyedTransient<TService,TImplementation>;(System.Object,System.Func<System.IServiceProvider,System.Object,TImplementation>);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.DependencyInjection;ServiceDescriptor;KeyedTransient<TService,TImplementation>;(System.Object,System.Func<System.IServiceProvider,System.Object,TImplementation>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceDescriptor;KeyedTransient<TService,TImplementation>;(System.Object,System.Func<System.IServiceProvider,System.Object,TImplementation>);Argument[1];ReturnValue.SyntheticField[Microsoft.Extensions.DependencyInjection.ServiceDescriptor._implementationFactory];value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceDescriptor;KeyedTransient<TService,TImplementation>;(System.Object,System.Func<System.IServiceProvider,System.Object,TImplementation>);Argument[1];ReturnValue.SyntheticField[Microsoft.Extensions.DependencyInjection.ServiceDescriptor._implementationFactory];value;hq-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceDescriptor;KeyedTransient<TService>;(System.Object,System.Func<System.IServiceProvider,System.Object,TService>);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.DependencyInjection;ServiceDescriptor;KeyedTransient<TService>;(System.Object,System.Func<System.IServiceProvider,System.Object,TService>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceDescriptor;KeyedTransient<TService>;(System.Object,System.Func<System.IServiceProvider,System.Object,TService>);Argument[1];ReturnValue.SyntheticField[Microsoft.Extensions.DependencyInjection.ServiceDescriptor._implementationFactory];value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceDescriptor;KeyedTransient<TService>;(System.Object,System.Func<System.IServiceProvider,System.Object,TService>);Argument[1];ReturnValue.SyntheticField[Microsoft.Extensions.DependencyInjection.ServiceDescriptor._implementationFactory];value;hq-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceDescriptor;Scoped;(System.Type,System.Func<System.IServiceProvider,System.Object>);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.DependencyInjection;ServiceDescriptor;Scoped;(System.Type,System.Func<System.IServiceProvider,System.Object>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceDescriptor;Scoped;(System.Type,System.Func<System.IServiceProvider,System.Object>);Argument[1];ReturnValue.SyntheticField[Microsoft.Extensions.DependencyInjection.ServiceDescriptor._implementationFactory];value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceDescriptor;Scoped;(System.Type,System.Func<System.IServiceProvider,System.Object>);Argument[1];ReturnValue.SyntheticField[Microsoft.Extensions.DependencyInjection.ServiceDescriptor._implementationFactory];value;hq-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceDescriptor;Scoped<TService,TImplementation>;(System.Func<System.IServiceProvider,TImplementation>);Argument[0];Argument[0].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.DependencyInjection;ServiceDescriptor;Scoped<TService,TImplementation>;(System.Func<System.IServiceProvider,TImplementation>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceDescriptor;Scoped<TService,TImplementation>;(System.Func<System.IServiceProvider,TImplementation>);Argument[0];ReturnValue.SyntheticField[Microsoft.Extensions.DependencyInjection.ServiceDescriptor._implementationFactory];value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceDescriptor;Scoped<TService,TImplementation>;(System.Func<System.IServiceProvider,TImplementation>);Argument[0];ReturnValue.SyntheticField[Microsoft.Extensions.DependencyInjection.ServiceDescriptor._implementationFactory];value;hq-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceDescriptor;Scoped<TService>;(System.Func<System.IServiceProvider,TService>);Argument[0];Argument[0].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.DependencyInjection;ServiceDescriptor;Scoped<TService>;(System.Func<System.IServiceProvider,TService>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceDescriptor;Scoped<TService>;(System.Func<System.IServiceProvider,TService>);Argument[0];ReturnValue.SyntheticField[Microsoft.Extensions.DependencyInjection.ServiceDescriptor._implementationFactory];value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceDescriptor;Scoped<TService>;(System.Func<System.IServiceProvider,TService>);Argument[0];ReturnValue.SyntheticField[Microsoft.Extensions.DependencyInjection.ServiceDescriptor._implementationFactory];value;hq-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceDescriptor;ServiceDescriptor;(System.Type,System.Func<System.IServiceProvider,System.Object>,Microsoft.Extensions.DependencyInjection.ServiceLifetime);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.DependencyInjection;ServiceDescriptor;ServiceDescriptor;(System.Type,System.Func<System.IServiceProvider,System.Object>,Microsoft.Extensions.DependencyInjection.ServiceLifetime);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceDescriptor;ServiceDescriptor;(System.Type,System.Func<System.IServiceProvider,System.Object>,Microsoft.Extensions.DependencyInjection.ServiceLifetime);Argument[1];Argument[this].SyntheticField[Microsoft.Extensions.DependencyInjection.ServiceDescriptor._implementationFactory];value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceDescriptor;ServiceDescriptor;(System.Type,System.Func<System.IServiceProvider,System.Object>,Microsoft.Extensions.DependencyInjection.ServiceLifetime);Argument[1];Argument[this].SyntheticField[Microsoft.Extensions.DependencyInjection.ServiceDescriptor._implementationFactory];value;hq-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceDescriptor;ServiceDescriptor;(System.Type,System.Object,System.Func<System.IServiceProvider,System.Object,System.Object>,Microsoft.Extensions.DependencyInjection.ServiceLifetime);Argument[2];Argument[2].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.DependencyInjection;ServiceDescriptor;ServiceDescriptor;(System.Type,System.Object,System.Func<System.IServiceProvider,System.Object,System.Object>,Microsoft.Extensions.DependencyInjection.ServiceLifetime);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
-| Microsoft.Extensions.DependencyInjection;ServiceDescriptor;ServiceDescriptor;(System.Type,System.Object,System.Object);Argument[2];Argument[this];taint;df-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceDescriptor;ServiceDescriptor;(System.Type,System.Object,System.Func<System.IServiceProvider,System.Object,System.Object>,Microsoft.Extensions.DependencyInjection.ServiceLifetime);Argument[2];Argument[this].SyntheticField[Microsoft.Extensions.DependencyInjection.ServiceDescriptor._implementationFactory];value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceDescriptor;ServiceDescriptor;(System.Type,System.Object,System.Func<System.IServiceProvider,System.Object,System.Object>,Microsoft.Extensions.DependencyInjection.ServiceLifetime);Argument[2];Argument[this].SyntheticField[Microsoft.Extensions.DependencyInjection.ServiceDescriptor._implementationFactory];value;hq-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceDescriptor;ServiceDescriptor;(System.Type,System.Object,System.Object);Argument[2];Argument[this].SyntheticField[Microsoft.Extensions.DependencyInjection.ServiceDescriptor._implementationInstance];value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceDescriptor;Singleton;(System.Type,System.Func<System.IServiceProvider,System.Object>);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.DependencyInjection;ServiceDescriptor;Singleton;(System.Type,System.Func<System.IServiceProvider,System.Object>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceDescriptor;Singleton;(System.Type,System.Func<System.IServiceProvider,System.Object>);Argument[1];ReturnValue.SyntheticField[Microsoft.Extensions.DependencyInjection.ServiceDescriptor._implementationFactory];value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceDescriptor;Singleton;(System.Type,System.Func<System.IServiceProvider,System.Object>);Argument[1];ReturnValue.SyntheticField[Microsoft.Extensions.DependencyInjection.ServiceDescriptor._implementationFactory];value;hq-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceDescriptor;Singleton<TService,TImplementation>;(System.Func<System.IServiceProvider,TImplementation>);Argument[0];Argument[0].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.DependencyInjection;ServiceDescriptor;Singleton<TService,TImplementation>;(System.Func<System.IServiceProvider,TImplementation>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceDescriptor;Singleton<TService,TImplementation>;(System.Func<System.IServiceProvider,TImplementation>);Argument[0];ReturnValue.SyntheticField[Microsoft.Extensions.DependencyInjection.ServiceDescriptor._implementationFactory];value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceDescriptor;Singleton<TService,TImplementation>;(System.Func<System.IServiceProvider,TImplementation>);Argument[0];ReturnValue.SyntheticField[Microsoft.Extensions.DependencyInjection.ServiceDescriptor._implementationFactory];value;hq-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceDescriptor;Singleton<TService>;(System.Func<System.IServiceProvider,TService>);Argument[0];Argument[0].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.DependencyInjection;ServiceDescriptor;Singleton<TService>;(System.Func<System.IServiceProvider,TService>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceDescriptor;Singleton<TService>;(System.Func<System.IServiceProvider,TService>);Argument[0];ReturnValue.SyntheticField[Microsoft.Extensions.DependencyInjection.ServiceDescriptor._implementationFactory];value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceDescriptor;Singleton<TService>;(System.Func<System.IServiceProvider,TService>);Argument[0];ReturnValue.SyntheticField[Microsoft.Extensions.DependencyInjection.ServiceDescriptor._implementationFactory];value;hq-generated |
 | Microsoft.Extensions.DependencyInjection;ServiceDescriptor;ToString;();Argument[this];ReturnValue;taint;df-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceDescriptor;Transient;(System.Type,System.Func<System.IServiceProvider,System.Object>);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.DependencyInjection;ServiceDescriptor;Transient;(System.Type,System.Func<System.IServiceProvider,System.Object>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceDescriptor;Transient;(System.Type,System.Func<System.IServiceProvider,System.Object>);Argument[1];ReturnValue.SyntheticField[Microsoft.Extensions.DependencyInjection.ServiceDescriptor._implementationFactory];value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceDescriptor;Transient;(System.Type,System.Func<System.IServiceProvider,System.Object>);Argument[1];ReturnValue.SyntheticField[Microsoft.Extensions.DependencyInjection.ServiceDescriptor._implementationFactory];value;hq-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceDescriptor;Transient<TService,TImplementation>;(System.Func<System.IServiceProvider,TImplementation>);Argument[0];Argument[0].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.DependencyInjection;ServiceDescriptor;Transient<TService,TImplementation>;(System.Func<System.IServiceProvider,TImplementation>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceDescriptor;Transient<TService,TImplementation>;(System.Func<System.IServiceProvider,TImplementation>);Argument[0];ReturnValue.SyntheticField[Microsoft.Extensions.DependencyInjection.ServiceDescriptor._implementationFactory];value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceDescriptor;Transient<TService,TImplementation>;(System.Func<System.IServiceProvider,TImplementation>);Argument[0];ReturnValue.SyntheticField[Microsoft.Extensions.DependencyInjection.ServiceDescriptor._implementationFactory];value;hq-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceDescriptor;Transient<TService>;(System.Func<System.IServiceProvider,TService>);Argument[0];Argument[0].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.DependencyInjection;ServiceDescriptor;Transient<TService>;(System.Func<System.IServiceProvider,TService>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
-| Microsoft.Extensions.DependencyInjection;ServiceDescriptor;get_ImplementationFactory;();Argument[this];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.DependencyInjection;ServiceDescriptor;get_ImplementationInstance;();Argument[this];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.DependencyInjection;ServiceDescriptor;get_KeyedImplementationFactory;();Argument[this];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.DependencyInjection;ServiceDescriptor;get_KeyedImplementationInstance;();Argument[this];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.DependencyInjection;ServiceProviderServiceExtensions;CreateAsyncScope;(Microsoft.Extensions.DependencyInjection.IServiceScopeFactory);Argument[0];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.DependencyInjection;ServiceProviderServiceExtensions;GetRequiredService;(System.IServiceProvider,System.Type);Argument[0];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.DependencyInjection;ServiceProviderServiceExtensions;GetRequiredService<T>;(System.IServiceProvider);Argument[0];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.DependencyInjection;ServiceProviderServiceExtensions;GetService<T>;(System.IServiceProvider);Argument[0];ReturnValue;taint;df-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceDescriptor;Transient<TService>;(System.Func<System.IServiceProvider,TService>);Argument[0];ReturnValue.SyntheticField[Microsoft.Extensions.DependencyInjection.ServiceDescriptor._implementationFactory];value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceDescriptor;Transient<TService>;(System.Func<System.IServiceProvider,TService>);Argument[0];ReturnValue.SyntheticField[Microsoft.Extensions.DependencyInjection.ServiceDescriptor._implementationFactory];value;hq-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceDescriptor;get_ImplementationFactory;();Argument[this].SyntheticField[Microsoft.Extensions.DependencyInjection.ServiceDescriptor._implementationFactory];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceDescriptor;get_ImplementationInstance;();Argument[this].SyntheticField[Microsoft.Extensions.DependencyInjection.ServiceDescriptor._implementationInstance];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceDescriptor;get_KeyedImplementationFactory;();Argument[this].SyntheticField[Microsoft.Extensions.DependencyInjection.ServiceDescriptor._implementationFactory];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceDescriptor;get_KeyedImplementationInstance;();Argument[this].SyntheticField[Microsoft.Extensions.DependencyInjection.ServiceDescriptor._implementationInstance];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceProviderServiceExtensions;GetRequiredService;(System.IServiceProvider,System.Type);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceProviderServiceExtensions;GetRequiredService<T>;(System.IServiceProvider);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;ServiceProviderServiceExtensions;GetService<T>;(System.IServiceProvider);Argument[0];ReturnValue;value;dfc-generated |
 | Microsoft.Extensions.DependencyInjection;SessionServiceCollectionExtensions;AddSession;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Action<Microsoft.AspNetCore.Builder.SessionOptions>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
 | Microsoft.Extensions.DependencyInjection;SignalRDependencyInjectionExtensions;AddHubOptions<THub>;(Microsoft.AspNetCore.SignalR.ISignalRServerBuilder,System.Action<Microsoft.AspNetCore.SignalR.HubOptions<THub>>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
 | Microsoft.Extensions.DependencyInjection;SignalRDependencyInjectionExtensions;AddSignalR;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Action<Microsoft.AspNetCore.SignalR.HubOptions>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
-| Microsoft.Extensions.DependencyInjection;SocketsHttpHandlerBuilderExtensions;Configure;(Microsoft.Extensions.DependencyInjection.ISocketsHttpHandlerBuilder,Microsoft.Extensions.Configuration.IConfiguration);Argument[0];ReturnValue;taint;df-generated |
+| Microsoft.Extensions.DependencyInjection;SocketsHttpHandlerBuilderExtensions;Configure;(Microsoft.Extensions.DependencyInjection.ISocketsHttpHandlerBuilder,Microsoft.Extensions.Configuration.IConfiguration);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;SocketsHttpHandlerBuilderExtensions;Configure;(Microsoft.Extensions.DependencyInjection.ISocketsHttpHandlerBuilder,System.Action<System.Net.Http.SocketsHttpHandler,System.IServiceProvider>);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.DependencyInjection;SocketsHttpHandlerBuilderExtensions;Configure;(Microsoft.Extensions.DependencyInjection.ISocketsHttpHandlerBuilder,System.Action<System.Net.Http.SocketsHttpHandler,System.IServiceProvider>);Argument[0];ReturnValue;value;hq-generated |
+| Microsoft.Extensions.DependencyInjection;SocketsHttpHandlerBuilderExtensions;Configure;(Microsoft.Extensions.DependencyInjection.ISocketsHttpHandlerBuilder,System.Action<System.Net.Http.SocketsHttpHandler,System.IServiceProvider>);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.DependencyInjection;SocketsHttpHandlerBuilderExtensions;Configure;(Microsoft.Extensions.DependencyInjection.ISocketsHttpHandlerBuilder,System.Action<System.Net.Http.SocketsHttpHandler,System.IServiceProvider>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
 | Microsoft.Extensions.DependencyInjection;TagHelperServicesExtensions;AddCacheTagHelperLimits;(Microsoft.Extensions.DependencyInjection.IMvcBuilder,System.Action<Microsoft.AspNetCore.Mvc.TagHelpers.CacheTagHelperOptions>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
 | Microsoft.Extensions.DependencyInjection;TagHelperServicesExtensions;AddCacheTagHelperLimits;(Microsoft.Extensions.DependencyInjection.IMvcCoreBuilder,System.Action<Microsoft.AspNetCore.Mvc.TagHelpers.CacheTagHelperOptions>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
@@ -1173,7 +1390,7 @@
 | Microsoft.Extensions.Diagnostics.HealthChecks;HealthCheckRegistration;set_Factory;(System.Func<System.IServiceProvider,Microsoft.Extensions.Diagnostics.HealthChecks.IHealthCheck>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | Microsoft.Extensions.Diagnostics.HealthChecks;HealthCheckService;CheckHealthAsync;(System.Func<Microsoft.Extensions.Diagnostics.HealthChecks.HealthCheckRegistration,System.Boolean>,System.Threading.CancellationToken);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | Microsoft.Extensions.Diagnostics.Metrics;IMetricsListener;Initialize;(Microsoft.Extensions.Diagnostics.Metrics.IObservableInstrumentsSource);Argument[0];Argument[this];taint;df-generated |
-| Microsoft.Extensions.Diagnostics.Metrics;IMetricsListener;InstrumentPublished;(System.Diagnostics.Metrics.Instrument,System.Object);Argument[this];ReturnValue;taint;df-generated |
+| Microsoft.Extensions.Diagnostics.Metrics;IMetricsListener;InstrumentPublished;(System.Diagnostics.Metrics.Instrument,System.Object);Argument[this];ReturnValue;value;dfc-generated |
 | Microsoft.Extensions.Diagnostics.Metrics;MeasurementHandlers;set_ByteHandler;(System.Diagnostics.Metrics.MeasurementCallback<System.Byte>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | Microsoft.Extensions.Diagnostics.Metrics;MeasurementHandlers;set_DecimalHandler;(System.Diagnostics.Metrics.MeasurementCallback<System.Decimal>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | Microsoft.Extensions.Diagnostics.Metrics;MeasurementHandlers;set_DoubleHandler;(System.Diagnostics.Metrics.MeasurementCallback<System.Double>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
@@ -1181,53 +1398,59 @@
 | Microsoft.Extensions.Diagnostics.Metrics;MeasurementHandlers;set_IntHandler;(System.Diagnostics.Metrics.MeasurementCallback<System.Int32>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | Microsoft.Extensions.Diagnostics.Metrics;MeasurementHandlers;set_LongHandler;(System.Diagnostics.Metrics.MeasurementCallback<System.Int64>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | Microsoft.Extensions.Diagnostics.Metrics;MeasurementHandlers;set_ShortHandler;(System.Diagnostics.Metrics.MeasurementCallback<System.Int16>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
-| Microsoft.Extensions.Diagnostics.Metrics;MetricsBuilderConfigurationExtensions;AddConfiguration;(Microsoft.Extensions.Diagnostics.Metrics.IMetricsBuilder,Microsoft.Extensions.Configuration.IConfiguration);Argument[0];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Diagnostics.Metrics;MetricsBuilderConsoleExtensions;AddDebugConsole;(Microsoft.Extensions.Diagnostics.Metrics.IMetricsBuilder);Argument[0];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Diagnostics.Metrics;MetricsBuilderExtensions;AddListener;(Microsoft.Extensions.Diagnostics.Metrics.IMetricsBuilder,Microsoft.Extensions.Diagnostics.Metrics.IMetricsListener);Argument[0];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Diagnostics.Metrics;MetricsBuilderExtensions;AddListener<T>;(Microsoft.Extensions.Diagnostics.Metrics.IMetricsBuilder);Argument[0];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Diagnostics.Metrics;MetricsBuilderExtensions;ClearListeners;(Microsoft.Extensions.Diagnostics.Metrics.IMetricsBuilder);Argument[0];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Diagnostics.Metrics;MetricsBuilderExtensions;DisableMetrics;(Microsoft.Extensions.Diagnostics.Metrics.IMetricsBuilder,System.String);Argument[0];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Diagnostics.Metrics;MetricsBuilderExtensions;DisableMetrics;(Microsoft.Extensions.Diagnostics.Metrics.IMetricsBuilder,System.String,System.String,System.String,Microsoft.Extensions.Diagnostics.Metrics.MeterScope);Argument[0];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Diagnostics.Metrics;MetricsBuilderExtensions;DisableMetrics;(Microsoft.Extensions.Diagnostics.Metrics.MetricsOptions,System.String);Argument[0];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Diagnostics.Metrics;MetricsBuilderExtensions;DisableMetrics;(Microsoft.Extensions.Diagnostics.Metrics.MetricsOptions,System.String,System.String,System.String,Microsoft.Extensions.Diagnostics.Metrics.MeterScope);Argument[0];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Diagnostics.Metrics;MetricsBuilderExtensions;EnableMetrics;(Microsoft.Extensions.Diagnostics.Metrics.IMetricsBuilder,System.String);Argument[0];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Diagnostics.Metrics;MetricsBuilderExtensions;EnableMetrics;(Microsoft.Extensions.Diagnostics.Metrics.IMetricsBuilder,System.String,System.String,System.String,Microsoft.Extensions.Diagnostics.Metrics.MeterScope);Argument[0];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Diagnostics.Metrics;MetricsBuilderExtensions;EnableMetrics;(Microsoft.Extensions.Diagnostics.Metrics.MetricsOptions,System.String);Argument[0];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Diagnostics.Metrics;MetricsBuilderExtensions;EnableMetrics;(Microsoft.Extensions.Diagnostics.Metrics.MetricsOptions,System.String,System.String,System.String,Microsoft.Extensions.Diagnostics.Metrics.MeterScope);Argument[0];ReturnValue;taint;df-generated |
+| Microsoft.Extensions.Diagnostics.Metrics;MetricsBuilderConfigurationExtensions;AddConfiguration;(Microsoft.Extensions.Diagnostics.Metrics.IMetricsBuilder,Microsoft.Extensions.Configuration.IConfiguration);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Diagnostics.Metrics;MetricsBuilderExtensions;AddListener;(Microsoft.Extensions.Diagnostics.Metrics.IMetricsBuilder,Microsoft.Extensions.Diagnostics.Metrics.IMetricsListener);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Diagnostics.Metrics;MetricsBuilderExtensions;AddListener<T>;(Microsoft.Extensions.Diagnostics.Metrics.IMetricsBuilder);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Diagnostics.Metrics;MetricsBuilderExtensions;ClearListeners;(Microsoft.Extensions.Diagnostics.Metrics.IMetricsBuilder);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Diagnostics.Metrics;MetricsBuilderExtensions;DisableMetrics;(Microsoft.Extensions.Diagnostics.Metrics.IMetricsBuilder,System.String);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Diagnostics.Metrics;MetricsBuilderExtensions;DisableMetrics;(Microsoft.Extensions.Diagnostics.Metrics.IMetricsBuilder,System.String,System.String,System.String,Microsoft.Extensions.Diagnostics.Metrics.MeterScope);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Diagnostics.Metrics;MetricsBuilderExtensions;DisableMetrics;(Microsoft.Extensions.Diagnostics.Metrics.MetricsOptions,System.String);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Diagnostics.Metrics;MetricsBuilderExtensions;DisableMetrics;(Microsoft.Extensions.Diagnostics.Metrics.MetricsOptions,System.String,System.String,System.String,Microsoft.Extensions.Diagnostics.Metrics.MeterScope);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Diagnostics.Metrics;MetricsBuilderExtensions;EnableMetrics;(Microsoft.Extensions.Diagnostics.Metrics.IMetricsBuilder,System.String);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Diagnostics.Metrics;MetricsBuilderExtensions;EnableMetrics;(Microsoft.Extensions.Diagnostics.Metrics.IMetricsBuilder,System.String,System.String,System.String,Microsoft.Extensions.Diagnostics.Metrics.MeterScope);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Diagnostics.Metrics;MetricsBuilderExtensions;EnableMetrics;(Microsoft.Extensions.Diagnostics.Metrics.MetricsOptions,System.String);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Diagnostics.Metrics;MetricsBuilderExtensions;EnableMetrics;(Microsoft.Extensions.Diagnostics.Metrics.MetricsOptions,System.String,System.String,System.String,Microsoft.Extensions.Diagnostics.Metrics.MeterScope);Argument[0];ReturnValue;value;dfc-generated |
 | Microsoft.Extensions.FileProviders.Composite;CompositeDirectoryContents;CompositeDirectoryContents;(System.Collections.Generic.IList<Microsoft.Extensions.FileProviders.IFileProvider>,System.String);Argument[0].Element;Argument[this];taint;df-generated |
 | Microsoft.Extensions.FileProviders.Composite;CompositeDirectoryContents;CompositeDirectoryContents;(System.Collections.Generic.IList<Microsoft.Extensions.FileProviders.IFileProvider>,System.String);Argument[1];Argument[this];taint;df-generated |
-| Microsoft.Extensions.FileProviders.Physical;PhysicalDirectoryInfo;PhysicalDirectoryInfo;(System.IO.DirectoryInfo);Argument[0];Argument[this];taint;df-generated |
-| Microsoft.Extensions.FileProviders.Physical;PhysicalFileInfo;PhysicalFileInfo;(System.IO.FileInfo);Argument[0];Argument[this];taint;df-generated |
+| Microsoft.Extensions.FileProviders.Physical;PhysicalDirectoryInfo;PhysicalDirectoryInfo;(System.IO.DirectoryInfo);Argument[0];Argument[this].SyntheticField[Microsoft.Extensions.FileProviders.Physical.PhysicalDirectoryInfo._info];value;dfc-generated |
+| Microsoft.Extensions.FileProviders.Physical;PhysicalDirectoryInfo;get_Name;();Argument[this].SyntheticField[Microsoft.Extensions.FileProviders.Physical.PhysicalDirectoryInfo._info].Property[System.IO.DirectoryInfo.Name];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.FileProviders.Physical;PhysicalDirectoryInfo;get_PhysicalPath;();Argument[this].SyntheticField[Microsoft.Extensions.FileProviders.Physical.PhysicalDirectoryInfo._info].Field[System.IO.FileSystemInfo.FullPath];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.FileProviders.Physical;PhysicalDirectoryInfo;get_PhysicalPath;();Argument[this].SyntheticField[Microsoft.Extensions.FileProviders.Physical.PhysicalDirectoryInfo._info].Property[System.IO.FileSystemInfo.FullName];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.FileProviders.Physical;PhysicalFileInfo;CreateReadStream;();Argument[this].Property[Microsoft.Extensions.FileProviders.Physical.PhysicalFileInfo.PhysicalPath];ReturnValue;taint;dfc-generated |
+| Microsoft.Extensions.FileProviders.Physical;PhysicalFileInfo;CreateReadStream;();Argument[this].SyntheticField[Microsoft.Extensions.FileProviders.Physical.PhysicalFileInfo._info].Property[System.IO.FileSystemInfo.FullName];ReturnValue;taint;dfc-generated |
+| Microsoft.Extensions.FileProviders.Physical;PhysicalFileInfo;PhysicalFileInfo;(System.IO.FileInfo);Argument[0];Argument[this].SyntheticField[Microsoft.Extensions.FileProviders.Physical.PhysicalFileInfo._info];value;dfc-generated |
+| Microsoft.Extensions.FileProviders.Physical;PhysicalFileInfo;get_Name;();Argument[this].SyntheticField[Microsoft.Extensions.FileProviders.Physical.PhysicalFileInfo._info].Property[System.IO.FileInfo.Name];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.FileProviders.Physical;PhysicalFileInfo;get_PhysicalPath;();Argument[this].SyntheticField[Microsoft.Extensions.FileProviders.Physical.PhysicalFileInfo._info].Property[System.IO.FileSystemInfo.FullName];ReturnValue;value;dfc-generated |
 | Microsoft.Extensions.FileProviders.Physical;PhysicalFilesWatcher;PhysicalFilesWatcher;(System.String,System.IO.FileSystemWatcher,System.Boolean,Microsoft.Extensions.FileProviders.Physical.ExclusionFilters);Argument[0];Argument[this];taint;df-generated |
 | Microsoft.Extensions.FileProviders.Physical;PhysicalFilesWatcher;PhysicalFilesWatcher;(System.String,System.IO.FileSystemWatcher,System.Boolean,Microsoft.Extensions.FileProviders.Physical.ExclusionFilters);Argument[1];Argument[this];taint;df-generated |
 | Microsoft.Extensions.FileProviders.Physical;PollingFileChangeToken;PollingFileChangeToken;(System.IO.FileInfo);Argument[0];Argument[this];taint;df-generated |
-| Microsoft.Extensions.FileProviders;CompositeFileProvider;CompositeFileProvider;(Microsoft.Extensions.FileProviders.IFileProvider[]);Argument[0].Element;Argument[this];taint;df-generated |
-| Microsoft.Extensions.FileProviders;CompositeFileProvider;CompositeFileProvider;(System.Collections.Generic.IEnumerable<Microsoft.Extensions.FileProviders.IFileProvider>);Argument[0].Element;Argument[this];taint;df-generated |
-| Microsoft.Extensions.FileProviders;CompositeFileProvider;get_FileProviders;();Argument[this];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.FileProviders;IFileInfo;CreateReadStream;();Argument[this];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.FileProviders;IFileInfo;get_Name;();Argument[this];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.FileProviders;IFileInfo;get_PhysicalPath;();Argument[this];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.FileProviders;IFileProvider;GetDirectoryContents;(System.String);Argument[0];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.FileProviders;IFileProvider;GetDirectoryContents;(System.String);Argument[this];ReturnValue;taint;df-generated |
+| Microsoft.Extensions.FileProviders;CompositeFileProvider;CompositeFileProvider;(Microsoft.Extensions.FileProviders.IFileProvider[]);Argument[0];Argument[this].SyntheticField[Microsoft.Extensions.FileProviders.CompositeFileProvider._fileProviders];value;dfc-generated |
+| Microsoft.Extensions.FileProviders;CompositeFileProvider;CompositeFileProvider;(System.Collections.Generic.IEnumerable<Microsoft.Extensions.FileProviders.IFileProvider>);Argument[0].Element;Argument[this].SyntheticField[Microsoft.Extensions.FileProviders.CompositeFileProvider._fileProviders].Element;value;dfc-generated |
+| Microsoft.Extensions.FileProviders;CompositeFileProvider;get_FileProviders;();Argument[this].SyntheticField[Microsoft.Extensions.FileProviders.CompositeFileProvider._fileProviders];ReturnValue;value;dfc-generated |
 | Microsoft.Extensions.FileSystemGlobbing.Abstractions;DirectoryInfoBase;EnumerateFileSystemInfos;();Argument[this];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.FileSystemGlobbing.Abstractions;DirectoryInfoBase;GetDirectory;(System.String);Argument[0];ReturnValue;taint;df-generated |
 | Microsoft.Extensions.FileSystemGlobbing.Abstractions;DirectoryInfoBase;GetDirectory;(System.String);Argument[this];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.FileSystemGlobbing.Abstractions;DirectoryInfoBase;GetFile;(System.String);Argument[this];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.FileSystemGlobbing.Abstractions;FileInfoWrapper;FileInfoWrapper;(System.IO.FileInfo);Argument[0];Argument[this];taint;df-generated |
+| Microsoft.Extensions.FileSystemGlobbing.Abstractions;FileInfoWrapper;FileInfoWrapper;(System.IO.FileInfo);Argument[0];Argument[this].SyntheticField[Microsoft.Extensions.FileSystemGlobbing.Abstractions.FileInfoWrapper._fileInfo];value;dfc-generated |
+| Microsoft.Extensions.FileSystemGlobbing.Abstractions;FileInfoWrapper;get_FullName;();Argument[this].SyntheticField[Microsoft.Extensions.FileSystemGlobbing.Abstractions.FileInfoWrapper._fileInfo].Property[System.IO.FileSystemInfo.FullName];ReturnValue;value;df-generated |
+| Microsoft.Extensions.FileSystemGlobbing.Abstractions;FileInfoWrapper;get_FullName;();Argument[this].SyntheticField[Microsoft.Extensions.FileSystemGlobbing.Abstractions.FileInfoWrapper._fileInfo].Property[System.IO.FileSystemInfo.FullName];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.FileSystemGlobbing.Abstractions;FileInfoWrapper;get_Name;();Argument[this].SyntheticField[Microsoft.Extensions.FileSystemGlobbing.Abstractions.FileInfoWrapper._fileInfo].Property[System.IO.FileInfo.Name];ReturnValue;value;df-generated |
+| Microsoft.Extensions.FileSystemGlobbing.Abstractions;FileInfoWrapper;get_Name;();Argument[this].SyntheticField[Microsoft.Extensions.FileSystemGlobbing.Abstractions.FileInfoWrapper._fileInfo].Property[System.IO.FileInfo.Name];ReturnValue;value;dfc-generated |
 | Microsoft.Extensions.FileSystemGlobbing.Abstractions;FileSystemInfoBase;get_FullName;();Argument[this];ReturnValue;taint;df-generated |
 | Microsoft.Extensions.FileSystemGlobbing.Abstractions;FileSystemInfoBase;get_Name;();Argument[this];ReturnValue;taint;df-generated |
 | Microsoft.Extensions.FileSystemGlobbing.Abstractions;FileSystemInfoBase;get_ParentDirectory;();Argument[this];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts;PatternContext<TFrame>;PushDataFrame;(TFrame);Argument[0];Argument[this];taint;df-generated |
+| Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts;PatternContext<TFrame>;PushDataFrame;(TFrame);Argument[0];Argument[this].Field[Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts.PatternContext`1.Frame];value;dfc-generated |
 | Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts;PatternContextLinear+FrameData;get_Stem;();Argument[this];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts;PatternContextLinear;CalculateStem;(Microsoft.Extensions.FileSystemGlobbing.Abstractions.FileInfoBase);Argument[0];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts;PatternContextLinear;CalculateStem;(Microsoft.Extensions.FileSystemGlobbing.Abstractions.FileInfoBase);Argument[this];ReturnValue;taint;df-generated |
+| Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts;PatternContextLinear;CalculateStem;(Microsoft.Extensions.FileSystemGlobbing.Abstractions.FileInfoBase);Argument[0].Property[Microsoft.Extensions.FileSystemGlobbing.Abstractions.FileSystemInfoBase.Name];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts;PatternContextLinear;CalculateStem;(Microsoft.Extensions.FileSystemGlobbing.Abstractions.FileInfoBase);Argument[this].Field[Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts.PatternContext`1.Frame].Property[Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts.PatternContextLinear+FrameData.Stem];ReturnValue;taint;dfc-generated |
 | Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts;PatternContextRagged+FrameData;get_Stem;();Argument[this];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts;PatternContextRagged;CalculateStem;(Microsoft.Extensions.FileSystemGlobbing.Abstractions.FileInfoBase);Argument[0];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts;PatternContextRagged;CalculateStem;(Microsoft.Extensions.FileSystemGlobbing.Abstractions.FileInfoBase);Argument[this];ReturnValue;taint;df-generated |
+| Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts;PatternContextRagged;CalculateStem;(Microsoft.Extensions.FileSystemGlobbing.Abstractions.FileInfoBase);Argument[0].Property[Microsoft.Extensions.FileSystemGlobbing.Abstractions.FileSystemInfoBase.Name];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts;PatternContextRagged;CalculateStem;(Microsoft.Extensions.FileSystemGlobbing.Abstractions.FileInfoBase);Argument[this].Field[Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts.PatternContext`1.Frame].Property[Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts.PatternContextRagged+FrameData.Stem];ReturnValue;taint;dfc-generated |
+| Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts;PatternContextRagged;PushDirectory;(Microsoft.Extensions.FileSystemGlobbing.Abstractions.DirectoryInfoBase);Argument[this].Property[Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts.PatternContextRagged.Pattern].Property[Microsoft.Extensions.FileSystemGlobbing.Internal.IRaggedPattern.EndsWith];Argument[this].Field[Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts.PatternContext`1.Frame].Field[Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts.PatternContextRagged+FrameData.SegmentGroup];value;dfc-generated |
+| Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts;PatternContextRagged;PushDirectory;(Microsoft.Extensions.FileSystemGlobbing.Abstractions.DirectoryInfoBase);Argument[this].Property[Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts.PatternContextRagged.Pattern].Property[Microsoft.Extensions.FileSystemGlobbing.Internal.IRaggedPattern.StartsWith];Argument[this].Field[Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts.PatternContext`1.Frame].Field[Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts.PatternContextRagged+FrameData.SegmentGroup];value;dfc-generated |
 | Microsoft.Extensions.FileSystemGlobbing.Internal;IPatternContext;Declare;(System.Action<Microsoft.Extensions.FileSystemGlobbing.Internal.IPathSegment,System.Boolean>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | Microsoft.Extensions.FileSystemGlobbing.Internal;MatcherContext;MatcherContext;(System.Collections.Generic.IEnumerable<Microsoft.Extensions.FileSystemGlobbing.Internal.IPattern>,System.Collections.Generic.IEnumerable<Microsoft.Extensions.FileSystemGlobbing.Internal.IPattern>,Microsoft.Extensions.FileSystemGlobbing.Abstractions.DirectoryInfoBase,System.StringComparison);Argument[2];Argument[this];taint;df-generated |
-| Microsoft.Extensions.FileSystemGlobbing;Matcher;AddExclude;(System.String);Argument[this];ReturnValue;value;df-generated |
-| Microsoft.Extensions.FileSystemGlobbing;Matcher;AddInclude;(System.String);Argument[this];ReturnValue;value;df-generated |
+| Microsoft.Extensions.FileSystemGlobbing;InMemoryDirectoryInfo;GetFile;(System.String);Argument[this];ReturnValue.SyntheticField[Microsoft.Extensions.FileSystemGlobbing.Internal.InMemoryFileInfo._parent];value;dfc-generated |
+| Microsoft.Extensions.FileSystemGlobbing;Matcher;AddExclude;(System.String);Argument[this];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.FileSystemGlobbing;Matcher;AddInclude;(System.String);Argument[this];ReturnValue;value;dfc-generated |
 | Microsoft.Extensions.Hosting.Internal;ApplicationLifetime;ApplicationLifetime;(Microsoft.Extensions.Logging.ILogger<Microsoft.Extensions.Hosting.Internal.ApplicationLifetime>);Argument[0];Argument[this];taint;df-generated |
 | Microsoft.Extensions.Hosting.Internal;ConsoleLifetime;ConsoleLifetime;(Microsoft.Extensions.Options.IOptions<Microsoft.Extensions.Hosting.ConsoleLifetimeOptions>,Microsoft.Extensions.Hosting.IHostEnvironment,Microsoft.Extensions.Hosting.IHostApplicationLifetime,Microsoft.Extensions.Options.IOptions<Microsoft.Extensions.Hosting.HostOptions>,Microsoft.Extensions.Logging.ILoggerFactory);Argument[0];Argument[this];taint;df-generated |
 | Microsoft.Extensions.Hosting.Internal;ConsoleLifetime;ConsoleLifetime;(Microsoft.Extensions.Options.IOptions<Microsoft.Extensions.Hosting.ConsoleLifetimeOptions>,Microsoft.Extensions.Hosting.IHostEnvironment,Microsoft.Extensions.Hosting.IHostApplicationLifetime,Microsoft.Extensions.Options.IOptions<Microsoft.Extensions.Hosting.HostOptions>,Microsoft.Extensions.Logging.ILoggerFactory);Argument[1];Argument[this];taint;df-generated |
@@ -1242,31 +1465,66 @@
 | Microsoft.Extensions.Hosting;GenericHostWebHostBuilderExtensions;ConfigureWebHost;(Microsoft.Extensions.Hosting.IHostBuilder,System.Action<Microsoft.AspNetCore.Hosting.IWebHostBuilder>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
 | Microsoft.Extensions.Hosting;GenericHostWebHostBuilderExtensions;ConfigureWebHost;(Microsoft.Extensions.Hosting.IHostBuilder,System.Action<Microsoft.AspNetCore.Hosting.IWebHostBuilder>,System.Action<Microsoft.Extensions.Hosting.WebHostBuilderOptions>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
 | Microsoft.Extensions.Hosting;GenericHostWebHostBuilderExtensions;ConfigureWebHost;(Microsoft.Extensions.Hosting.IHostBuilder,System.Action<Microsoft.AspNetCore.Hosting.IWebHostBuilder>,System.Action<Microsoft.Extensions.Hosting.WebHostBuilderOptions>);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
-| Microsoft.Extensions.Hosting;Host;CreateApplicationBuilder;(Microsoft.Extensions.Hosting.HostApplicationBuilderSettings);Argument[0];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Hosting;Host;CreateEmptyApplicationBuilder;(Microsoft.Extensions.Hosting.HostApplicationBuilderSettings);Argument[0];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Hosting;HostApplicationBuilder;HostApplicationBuilder;(Microsoft.Extensions.Hosting.HostApplicationBuilderSettings);Argument[0];Argument[this];taint;df-generated |
+| Microsoft.Extensions.Hosting;Host;CreateEmptyApplicationBuilder;(Microsoft.Extensions.Hosting.HostApplicationBuilderSettings);Argument[0].Property[Microsoft.Extensions.Hosting.HostApplicationBuilderSettings.Args];ReturnValue.Property[Microsoft.Extensions.Hosting.HostApplicationBuilder.Configuration];taint;dfc-generated |
+| Microsoft.Extensions.Hosting;HostApplicationBuilder;HostApplicationBuilder;(Microsoft.Extensions.Hosting.HostApplicationBuilderSettings);Argument[0].Property[Microsoft.Extensions.Hosting.HostApplicationBuilderSettings.Args];Argument[this].Property[Microsoft.Extensions.Hosting.HostApplicationBuilder.Configuration];taint;dfc-generated |
+| Microsoft.Extensions.Hosting;HostApplicationBuilder;get_Configuration;();Argument[this].Property[Microsoft.Extensions.Hosting.HostApplicationBuilder.Configuration];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Hosting;HostingHostBuilderExtensions;ConfigureAppConfiguration;(Microsoft.Extensions.Hosting.IHostBuilder,System.Action<Microsoft.Extensions.Configuration.IConfigurationBuilder>);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Hosting;HostingHostBuilderExtensions;ConfigureAppConfiguration;(Microsoft.Extensions.Hosting.IHostBuilder,System.Action<Microsoft.Extensions.Configuration.IConfigurationBuilder>);Argument[0];ReturnValue;value;hq-generated |
+| Microsoft.Extensions.Hosting;HostingHostBuilderExtensions;ConfigureAppConfiguration;(Microsoft.Extensions.Hosting.IHostBuilder,System.Action<Microsoft.Extensions.Configuration.IConfigurationBuilder>);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.Hosting;HostingHostBuilderExtensions;ConfigureAppConfiguration;(Microsoft.Extensions.Hosting.IHostBuilder,System.Action<Microsoft.Extensions.Configuration.IConfigurationBuilder>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
+| Microsoft.Extensions.Hosting;HostingHostBuilderExtensions;ConfigureContainer<TContainerBuilder>;(Microsoft.Extensions.Hosting.IHostBuilder,System.Action<TContainerBuilder>);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Hosting;HostingHostBuilderExtensions;ConfigureContainer<TContainerBuilder>;(Microsoft.Extensions.Hosting.IHostBuilder,System.Action<TContainerBuilder>);Argument[0];ReturnValue;value;hq-generated |
+| Microsoft.Extensions.Hosting;HostingHostBuilderExtensions;ConfigureContainer<TContainerBuilder>;(Microsoft.Extensions.Hosting.IHostBuilder,System.Action<TContainerBuilder>);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.Hosting;HostingHostBuilderExtensions;ConfigureContainer<TContainerBuilder>;(Microsoft.Extensions.Hosting.IHostBuilder,System.Action<TContainerBuilder>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
-| Microsoft.Extensions.Hosting;HostingHostBuilderExtensions;ConfigureDefaults;(Microsoft.Extensions.Hosting.IHostBuilder,System.String[]);Argument[0];ReturnValue;taint;df-generated |
+| Microsoft.Extensions.Hosting;HostingHostBuilderExtensions;ConfigureDefaults;(Microsoft.Extensions.Hosting.IHostBuilder,System.String[]);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Hosting;HostingHostBuilderExtensions;ConfigureHostOptions;(Microsoft.Extensions.Hosting.IHostBuilder,System.Action<Microsoft.Extensions.Hosting.HostBuilderContext,Microsoft.Extensions.Hosting.HostOptions>);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Hosting;HostingHostBuilderExtensions;ConfigureHostOptions;(Microsoft.Extensions.Hosting.IHostBuilder,System.Action<Microsoft.Extensions.Hosting.HostBuilderContext,Microsoft.Extensions.Hosting.HostOptions>);Argument[0];ReturnValue;value;hq-generated |
+| Microsoft.Extensions.Hosting;HostingHostBuilderExtensions;ConfigureHostOptions;(Microsoft.Extensions.Hosting.IHostBuilder,System.Action<Microsoft.Extensions.Hosting.HostBuilderContext,Microsoft.Extensions.Hosting.HostOptions>);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.Hosting;HostingHostBuilderExtensions;ConfigureHostOptions;(Microsoft.Extensions.Hosting.IHostBuilder,System.Action<Microsoft.Extensions.Hosting.HostBuilderContext,Microsoft.Extensions.Hosting.HostOptions>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
+| Microsoft.Extensions.Hosting;HostingHostBuilderExtensions;ConfigureHostOptions;(Microsoft.Extensions.Hosting.IHostBuilder,System.Action<Microsoft.Extensions.Hosting.HostOptions>);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Hosting;HostingHostBuilderExtensions;ConfigureHostOptions;(Microsoft.Extensions.Hosting.IHostBuilder,System.Action<Microsoft.Extensions.Hosting.HostOptions>);Argument[0];ReturnValue;value;hq-generated |
+| Microsoft.Extensions.Hosting;HostingHostBuilderExtensions;ConfigureHostOptions;(Microsoft.Extensions.Hosting.IHostBuilder,System.Action<Microsoft.Extensions.Hosting.HostOptions>);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.Hosting;HostingHostBuilderExtensions;ConfigureHostOptions;(Microsoft.Extensions.Hosting.IHostBuilder,System.Action<Microsoft.Extensions.Hosting.HostOptions>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
+| Microsoft.Extensions.Hosting;HostingHostBuilderExtensions;ConfigureLogging;(Microsoft.Extensions.Hosting.IHostBuilder,System.Action<Microsoft.Extensions.Hosting.HostBuilderContext,Microsoft.Extensions.Logging.ILoggingBuilder>);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Hosting;HostingHostBuilderExtensions;ConfigureLogging;(Microsoft.Extensions.Hosting.IHostBuilder,System.Action<Microsoft.Extensions.Hosting.HostBuilderContext,Microsoft.Extensions.Logging.ILoggingBuilder>);Argument[0];ReturnValue;value;hq-generated |
+| Microsoft.Extensions.Hosting;HostingHostBuilderExtensions;ConfigureLogging;(Microsoft.Extensions.Hosting.IHostBuilder,System.Action<Microsoft.Extensions.Hosting.HostBuilderContext,Microsoft.Extensions.Logging.ILoggingBuilder>);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.Hosting;HostingHostBuilderExtensions;ConfigureLogging;(Microsoft.Extensions.Hosting.IHostBuilder,System.Action<Microsoft.Extensions.Hosting.HostBuilderContext,Microsoft.Extensions.Logging.ILoggingBuilder>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
+| Microsoft.Extensions.Hosting;HostingHostBuilderExtensions;ConfigureLogging;(Microsoft.Extensions.Hosting.IHostBuilder,System.Action<Microsoft.Extensions.Logging.ILoggingBuilder>);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Hosting;HostingHostBuilderExtensions;ConfigureLogging;(Microsoft.Extensions.Hosting.IHostBuilder,System.Action<Microsoft.Extensions.Logging.ILoggingBuilder>);Argument[0];ReturnValue;value;hq-generated |
+| Microsoft.Extensions.Hosting;HostingHostBuilderExtensions;ConfigureLogging;(Microsoft.Extensions.Hosting.IHostBuilder,System.Action<Microsoft.Extensions.Logging.ILoggingBuilder>);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.Hosting;HostingHostBuilderExtensions;ConfigureLogging;(Microsoft.Extensions.Hosting.IHostBuilder,System.Action<Microsoft.Extensions.Logging.ILoggingBuilder>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
+| Microsoft.Extensions.Hosting;HostingHostBuilderExtensions;ConfigureMetrics;(Microsoft.Extensions.Hosting.IHostBuilder,System.Action<Microsoft.Extensions.Diagnostics.Metrics.IMetricsBuilder>);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Hosting;HostingHostBuilderExtensions;ConfigureMetrics;(Microsoft.Extensions.Hosting.IHostBuilder,System.Action<Microsoft.Extensions.Diagnostics.Metrics.IMetricsBuilder>);Argument[0];ReturnValue;value;hq-generated |
+| Microsoft.Extensions.Hosting;HostingHostBuilderExtensions;ConfigureMetrics;(Microsoft.Extensions.Hosting.IHostBuilder,System.Action<Microsoft.Extensions.Diagnostics.Metrics.IMetricsBuilder>);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.Hosting;HostingHostBuilderExtensions;ConfigureMetrics;(Microsoft.Extensions.Hosting.IHostBuilder,System.Action<Microsoft.Extensions.Diagnostics.Metrics.IMetricsBuilder>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
+| Microsoft.Extensions.Hosting;HostingHostBuilderExtensions;ConfigureMetrics;(Microsoft.Extensions.Hosting.IHostBuilder,System.Action<Microsoft.Extensions.Hosting.HostBuilderContext,Microsoft.Extensions.Diagnostics.Metrics.IMetricsBuilder>);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Hosting;HostingHostBuilderExtensions;ConfigureMetrics;(Microsoft.Extensions.Hosting.IHostBuilder,System.Action<Microsoft.Extensions.Hosting.HostBuilderContext,Microsoft.Extensions.Diagnostics.Metrics.IMetricsBuilder>);Argument[0];ReturnValue;value;hq-generated |
+| Microsoft.Extensions.Hosting;HostingHostBuilderExtensions;ConfigureMetrics;(Microsoft.Extensions.Hosting.IHostBuilder,System.Action<Microsoft.Extensions.Hosting.HostBuilderContext,Microsoft.Extensions.Diagnostics.Metrics.IMetricsBuilder>);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.Hosting;HostingHostBuilderExtensions;ConfigureMetrics;(Microsoft.Extensions.Hosting.IHostBuilder,System.Action<Microsoft.Extensions.Hosting.HostBuilderContext,Microsoft.Extensions.Diagnostics.Metrics.IMetricsBuilder>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
+| Microsoft.Extensions.Hosting;HostingHostBuilderExtensions;ConfigureServices;(Microsoft.Extensions.Hosting.IHostBuilder,System.Action<Microsoft.Extensions.DependencyInjection.IServiceCollection>);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Hosting;HostingHostBuilderExtensions;ConfigureServices;(Microsoft.Extensions.Hosting.IHostBuilder,System.Action<Microsoft.Extensions.DependencyInjection.IServiceCollection>);Argument[0];ReturnValue;value;hq-generated |
+| Microsoft.Extensions.Hosting;HostingHostBuilderExtensions;ConfigureServices;(Microsoft.Extensions.Hosting.IHostBuilder,System.Action<Microsoft.Extensions.DependencyInjection.IServiceCollection>);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.Hosting;HostingHostBuilderExtensions;ConfigureServices;(Microsoft.Extensions.Hosting.IHostBuilder,System.Action<Microsoft.Extensions.DependencyInjection.IServiceCollection>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
 | Microsoft.Extensions.Hosting;HostingHostBuilderExtensions;RunConsoleAsync;(Microsoft.Extensions.Hosting.IHostBuilder,System.Action<Microsoft.Extensions.Hosting.ConsoleLifetimeOptions>,System.Threading.CancellationToken);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
-| Microsoft.Extensions.Hosting;HostingHostBuilderExtensions;UseConsoleLifetime;(Microsoft.Extensions.Hosting.IHostBuilder);Argument[0];ReturnValue;taint;df-generated |
+| Microsoft.Extensions.Hosting;HostingHostBuilderExtensions;UseConsoleLifetime;(Microsoft.Extensions.Hosting.IHostBuilder);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Hosting;HostingHostBuilderExtensions;UseConsoleLifetime;(Microsoft.Extensions.Hosting.IHostBuilder,System.Action<Microsoft.Extensions.Hosting.ConsoleLifetimeOptions>);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Hosting;HostingHostBuilderExtensions;UseConsoleLifetime;(Microsoft.Extensions.Hosting.IHostBuilder,System.Action<Microsoft.Extensions.Hosting.ConsoleLifetimeOptions>);Argument[0];ReturnValue;value;hq-generated |
+| Microsoft.Extensions.Hosting;HostingHostBuilderExtensions;UseConsoleLifetime;(Microsoft.Extensions.Hosting.IHostBuilder,System.Action<Microsoft.Extensions.Hosting.ConsoleLifetimeOptions>);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.Hosting;HostingHostBuilderExtensions;UseConsoleLifetime;(Microsoft.Extensions.Hosting.IHostBuilder,System.Action<Microsoft.Extensions.Hosting.ConsoleLifetimeOptions>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
-| Microsoft.Extensions.Hosting;HostingHostBuilderExtensions;UseContentRoot;(Microsoft.Extensions.Hosting.IHostBuilder,System.String);Argument[0];ReturnValue;taint;df-generated |
+| Microsoft.Extensions.Hosting;HostingHostBuilderExtensions;UseContentRoot;(Microsoft.Extensions.Hosting.IHostBuilder,System.String);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Hosting;HostingHostBuilderExtensions;UseDefaultServiceProvider;(Microsoft.Extensions.Hosting.IHostBuilder,System.Action<Microsoft.Extensions.DependencyInjection.ServiceProviderOptions>);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Hosting;HostingHostBuilderExtensions;UseDefaultServiceProvider;(Microsoft.Extensions.Hosting.IHostBuilder,System.Action<Microsoft.Extensions.DependencyInjection.ServiceProviderOptions>);Argument[0];ReturnValue;value;hq-generated |
+| Microsoft.Extensions.Hosting;HostingHostBuilderExtensions;UseDefaultServiceProvider;(Microsoft.Extensions.Hosting.IHostBuilder,System.Action<Microsoft.Extensions.DependencyInjection.ServiceProviderOptions>);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.Hosting;HostingHostBuilderExtensions;UseDefaultServiceProvider;(Microsoft.Extensions.Hosting.IHostBuilder,System.Action<Microsoft.Extensions.DependencyInjection.ServiceProviderOptions>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
+| Microsoft.Extensions.Hosting;HostingHostBuilderExtensions;UseDefaultServiceProvider;(Microsoft.Extensions.Hosting.IHostBuilder,System.Action<Microsoft.Extensions.Hosting.HostBuilderContext,Microsoft.Extensions.DependencyInjection.ServiceProviderOptions>);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Hosting;HostingHostBuilderExtensions;UseDefaultServiceProvider;(Microsoft.Extensions.Hosting.IHostBuilder,System.Action<Microsoft.Extensions.Hosting.HostBuilderContext,Microsoft.Extensions.DependencyInjection.ServiceProviderOptions>);Argument[0];ReturnValue;value;hq-generated |
+| Microsoft.Extensions.Hosting;HostingHostBuilderExtensions;UseDefaultServiceProvider;(Microsoft.Extensions.Hosting.IHostBuilder,System.Action<Microsoft.Extensions.Hosting.HostBuilderContext,Microsoft.Extensions.DependencyInjection.ServiceProviderOptions>);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.Hosting;HostingHostBuilderExtensions;UseDefaultServiceProvider;(Microsoft.Extensions.Hosting.IHostBuilder,System.Action<Microsoft.Extensions.Hosting.HostBuilderContext,Microsoft.Extensions.DependencyInjection.ServiceProviderOptions>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
-| Microsoft.Extensions.Hosting;HostingHostBuilderExtensions;UseEnvironment;(Microsoft.Extensions.Hosting.IHostBuilder,System.String);Argument[0];ReturnValue;taint;df-generated |
+| Microsoft.Extensions.Hosting;HostingHostBuilderExtensions;UseEnvironment;(Microsoft.Extensions.Hosting.IHostBuilder,System.String);Argument[0];ReturnValue;value;dfc-generated |
 | Microsoft.Extensions.Hosting;IApplicationLifetime;get_ApplicationStarted;();Argument[this];ReturnValue;taint;df-generated |
 | Microsoft.Extensions.Hosting;IApplicationLifetime;get_ApplicationStopped;();Argument[this];ReturnValue;taint;df-generated |
 | Microsoft.Extensions.Hosting;IApplicationLifetime;get_ApplicationStopping;();Argument[this];ReturnValue;taint;df-generated |
 | Microsoft.Extensions.Hosting;IHostApplicationBuilder;ConfigureContainer<TContainerBuilder>;(Microsoft.Extensions.DependencyInjection.IServiceProviderFactory<TContainerBuilder>,System.Action<TContainerBuilder>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
-| Microsoft.Extensions.Hosting;IHostApplicationBuilder;get_Configuration;();Argument[this];ReturnValue;taint;df-generated |
 | Microsoft.Extensions.Hosting;IHostApplicationBuilder;get_Environment;();Argument[this];ReturnValue;taint;df-generated |
 | Microsoft.Extensions.Hosting;IHostApplicationBuilder;get_Logging;();Argument[this];ReturnValue;taint;df-generated |
 | Microsoft.Extensions.Hosting;IHostApplicationBuilder;get_Metrics;();Argument[this];ReturnValue;taint;df-generated |
@@ -1275,13 +1533,27 @@
 | Microsoft.Extensions.Hosting;IHostApplicationLifetime;get_ApplicationStarted;();Argument[this];ReturnValue;taint;df-generated |
 | Microsoft.Extensions.Hosting;IHostApplicationLifetime;get_ApplicationStopped;();Argument[this];ReturnValue;taint;df-generated |
 | Microsoft.Extensions.Hosting;IHostApplicationLifetime;get_ApplicationStopping;();Argument[this];ReturnValue;taint;df-generated |
+| Microsoft.Extensions.Hosting;IHostBuilder;ConfigureAppConfiguration;(System.Action<Microsoft.Extensions.Hosting.HostBuilderContext,Microsoft.Extensions.Configuration.IConfigurationBuilder>);Argument[0];Argument[0].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.Hosting;IHostBuilder;ConfigureAppConfiguration;(System.Action<Microsoft.Extensions.Hosting.HostBuilderContext,Microsoft.Extensions.Configuration.IConfigurationBuilder>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
+| Microsoft.Extensions.Hosting;IHostBuilder;ConfigureAppConfiguration;(System.Action<Microsoft.Extensions.Hosting.HostBuilderContext,Microsoft.Extensions.Configuration.IConfigurationBuilder>);Argument[this];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Hosting;IHostBuilder;ConfigureAppConfiguration;(System.Action<Microsoft.Extensions.Hosting.HostBuilderContext,Microsoft.Extensions.Configuration.IConfigurationBuilder>);Argument[this];ReturnValue;value;hq-generated |
+| Microsoft.Extensions.Hosting;IHostBuilder;ConfigureContainer<TContainerBuilder>;(System.Action<Microsoft.Extensions.Hosting.HostBuilderContext,TContainerBuilder>);Argument[0];Argument[0].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.Hosting;IHostBuilder;ConfigureContainer<TContainerBuilder>;(System.Action<Microsoft.Extensions.Hosting.HostBuilderContext,TContainerBuilder>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
+| Microsoft.Extensions.Hosting;IHostBuilder;ConfigureContainer<TContainerBuilder>;(System.Action<Microsoft.Extensions.Hosting.HostBuilderContext,TContainerBuilder>);Argument[this];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Hosting;IHostBuilder;ConfigureContainer<TContainerBuilder>;(System.Action<Microsoft.Extensions.Hosting.HostBuilderContext,TContainerBuilder>);Argument[this];ReturnValue;value;hq-generated |
+| Microsoft.Extensions.Hosting;IHostBuilder;ConfigureHostConfiguration;(System.Action<Microsoft.Extensions.Configuration.IConfigurationBuilder>);Argument[0];Argument[0].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.Hosting;IHostBuilder;ConfigureHostConfiguration;(System.Action<Microsoft.Extensions.Configuration.IConfigurationBuilder>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
+| Microsoft.Extensions.Hosting;IHostBuilder;ConfigureHostConfiguration;(System.Action<Microsoft.Extensions.Configuration.IConfigurationBuilder>);Argument[this];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Hosting;IHostBuilder;ConfigureHostConfiguration;(System.Action<Microsoft.Extensions.Configuration.IConfigurationBuilder>);Argument[this];ReturnValue;value;hq-generated |
+| Microsoft.Extensions.Hosting;IHostBuilder;ConfigureServices;(System.Action<Microsoft.Extensions.Hosting.HostBuilderContext,Microsoft.Extensions.DependencyInjection.IServiceCollection>);Argument[0];Argument[0].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.Hosting;IHostBuilder;ConfigureServices;(System.Action<Microsoft.Extensions.Hosting.HostBuilderContext,Microsoft.Extensions.DependencyInjection.IServiceCollection>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
-| Microsoft.Extensions.Hosting;IHostBuilder;UseServiceProviderFactory<TContainerBuilder>;(Microsoft.Extensions.DependencyInjection.IServiceProviderFactory<TContainerBuilder>);Argument[0];Argument[this];taint;df-generated |
-| Microsoft.Extensions.Hosting;IHostBuilder;UseServiceProviderFactory<TContainerBuilder>;(Microsoft.Extensions.DependencyInjection.IServiceProviderFactory<TContainerBuilder>);Argument[this];ReturnValue;value;df-generated |
+| Microsoft.Extensions.Hosting;IHostBuilder;ConfigureServices;(System.Action<Microsoft.Extensions.Hosting.HostBuilderContext,Microsoft.Extensions.DependencyInjection.IServiceCollection>);Argument[this];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Hosting;IHostBuilder;ConfigureServices;(System.Action<Microsoft.Extensions.Hosting.HostBuilderContext,Microsoft.Extensions.DependencyInjection.IServiceCollection>);Argument[this];ReturnValue;value;hq-generated |
+| Microsoft.Extensions.Hosting;IHostBuilder;UseServiceProviderFactory<TContainerBuilder>;(Microsoft.Extensions.DependencyInjection.IServiceProviderFactory<TContainerBuilder>);Argument[this];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Hosting;IHostBuilder;UseServiceProviderFactory<TContainerBuilder>;(System.Func<Microsoft.Extensions.Hosting.HostBuilderContext,Microsoft.Extensions.DependencyInjection.IServiceProviderFactory<TContainerBuilder>>);Argument[0];Argument[0].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.Hosting;IHostBuilder;UseServiceProviderFactory<TContainerBuilder>;(System.Func<Microsoft.Extensions.Hosting.HostBuilderContext,Microsoft.Extensions.DependencyInjection.IServiceProviderFactory<TContainerBuilder>>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
+| Microsoft.Extensions.Hosting;IHostBuilder;UseServiceProviderFactory<TContainerBuilder>;(System.Func<Microsoft.Extensions.Hosting.HostBuilderContext,Microsoft.Extensions.DependencyInjection.IServiceProviderFactory<TContainerBuilder>>);Argument[this];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Hosting;IHostBuilder;UseServiceProviderFactory<TContainerBuilder>;(System.Func<Microsoft.Extensions.Hosting.HostBuilderContext,Microsoft.Extensions.DependencyInjection.IServiceProviderFactory<TContainerBuilder>>);Argument[this];ReturnValue;value;hq-generated |
 | Microsoft.Extensions.Hosting;IHostLifetime;WaitForStartAsync;(System.Threading.CancellationToken);Argument[this];ReturnValue;taint;df-generated |
 | Microsoft.Extensions.Hosting;IHostedService;StartAsync;(System.Threading.CancellationToken);Argument[this];ReturnValue;taint;df-generated |
 | Microsoft.Extensions.Http.Logging;LoggingHttpMessageHandler;LoggingHttpMessageHandler;(Microsoft.Extensions.Logging.ILogger);Argument[0];Argument[this];taint;df-generated |
@@ -1292,75 +1564,151 @@
 | Microsoft.Extensions.Http.Logging;LoggingScopeHttpMessageHandler;LoggingScopeHttpMessageHandler;(Microsoft.Extensions.Logging.ILogger,Microsoft.Extensions.Http.HttpClientFactoryOptions);Argument[1];Argument[this];taint;df-generated |
 | Microsoft.Extensions.Http;HttpClientFactoryOptions;set_ShouldRedactHeaderValue;(System.Func<System.String,System.Boolean>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | Microsoft.Extensions.Http;HttpMessageHandlerBuilder;Build;();Argument[this];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Http;HttpMessageHandlerBuilder;CreateHandlerPipeline;(System.Net.Http.HttpMessageHandler,System.Collections.Generic.IEnumerable<System.Net.Http.DelegatingHandler>);Argument[0];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Http;HttpMessageHandlerBuilder;CreateHandlerPipeline;(System.Net.Http.HttpMessageHandler,System.Collections.Generic.IEnumerable<System.Net.Http.DelegatingHandler>);Argument[1].Element;ReturnValue;taint;df-generated |
+| Microsoft.Extensions.Http;HttpMessageHandlerBuilder;CreateHandlerPipeline;(System.Net.Http.HttpMessageHandler,System.Collections.Generic.IEnumerable<System.Net.Http.DelegatingHandler>);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Http;HttpMessageHandlerBuilder;CreateHandlerPipeline;(System.Net.Http.HttpMessageHandler,System.Collections.Generic.IEnumerable<System.Net.Http.DelegatingHandler>);Argument[1].Element;ReturnValue;value;dfc-generated |
 | Microsoft.Extensions.Http;IHttpMessageHandlerBuilderFilter;Configure;(System.Action<Microsoft.Extensions.Http.HttpMessageHandlerBuilder>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | Microsoft.Extensions.Localization;IResourceNamesCache;GetOrAdd;(System.String,System.Func<System.String,System.Collections.Generic.IList<System.String>>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
 | Microsoft.Extensions.Logging.Abstractions;LogEntry<TState>;LogEntry;(Microsoft.Extensions.Logging.LogLevel,System.String,Microsoft.Extensions.Logging.EventId,TState,System.Exception,System.Func<TState,System.Exception,System.String>);Argument[5];Argument[5].Parameter[delegate-self];value;hq-generated |
 | Microsoft.Extensions.Logging.Console;ConfigurationConsoleLoggerSettings;ConfigurationConsoleLoggerSettings;(Microsoft.Extensions.Configuration.IConfiguration);Argument[0];Argument[this];taint;df-generated |
 | Microsoft.Extensions.Logging.Console;ConsoleFormatter;Write<TState>;(Microsoft.Extensions.Logging.Abstractions.LogEntry<TState>,Microsoft.Extensions.Logging.IExternalScopeProvider,System.IO.TextWriter);Argument[0];Argument[2];taint;df-generated |
 | Microsoft.Extensions.Logging.Console;ConsoleLoggerProvider;ConsoleLoggerProvider;(Microsoft.Extensions.Options.IOptionsMonitor<Microsoft.Extensions.Logging.Console.ConsoleLoggerOptions>,System.Collections.Generic.IEnumerable<Microsoft.Extensions.Logging.Console.ConsoleFormatter>);Argument[0];Argument[this];taint;df-generated |
-| Microsoft.Extensions.Logging.Console;IConsoleLoggerSettings;Reload;();Argument[this];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Logging.Console;IConsoleLoggerSettings;Reload;();Argument[this];ReturnValue;value;df-generated |
+| Microsoft.Extensions.Logging.Console;IConsoleLoggerSettings;Reload;();Argument[this];ReturnValue;value;dfc-generated |
 | Microsoft.Extensions.Logging.EventLog;EventLogLoggerProvider;EventLogLoggerProvider;(Microsoft.Extensions.Logging.EventLog.EventLogSettings);Argument[0];Argument[this];taint;df-generated |
 | Microsoft.Extensions.Logging.EventLog;EventLogSettings;set_Filter;(System.Func<System.String,Microsoft.Extensions.Logging.LogLevel,System.Boolean>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | Microsoft.Extensions.Logging.EventSource;EventSourceLoggerProvider;EventSourceLoggerProvider;(Microsoft.Extensions.Logging.EventSource.LoggingEventSource);Argument[0];Argument[this];taint;df-generated |
 | Microsoft.Extensions.Logging.TraceSource;TraceSourceLoggerProvider;TraceSourceLoggerProvider;(System.Diagnostics.SourceSwitch,System.Diagnostics.TraceListener);Argument[0];Argument[this];taint;df-generated |
 | Microsoft.Extensions.Logging.TraceSource;TraceSourceLoggerProvider;TraceSourceLoggerProvider;(System.Diagnostics.SourceSwitch,System.Diagnostics.TraceListener);Argument[1];Argument[this];taint;df-generated |
-| Microsoft.Extensions.Logging;ConsoleLoggerExtensions;AddConsole;(Microsoft.Extensions.Logging.ILoggerFactory);Argument[0];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Logging;ConsoleLoggerExtensions;AddConsole;(Microsoft.Extensions.Logging.ILoggerFactory,Microsoft.Extensions.Configuration.IConfiguration);Argument[0];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Logging;ConsoleLoggerExtensions;AddConsole;(Microsoft.Extensions.Logging.ILoggerFactory,Microsoft.Extensions.Logging.Console.IConsoleLoggerSettings);Argument[0];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Logging;ConsoleLoggerExtensions;AddConsole;(Microsoft.Extensions.Logging.ILoggerFactory,Microsoft.Extensions.Logging.LogLevel);Argument[0];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Logging;ConsoleLoggerExtensions;AddConsole;(Microsoft.Extensions.Logging.ILoggerFactory,Microsoft.Extensions.Logging.LogLevel,System.Boolean);Argument[0];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Logging;ConsoleLoggerExtensions;AddConsole;(Microsoft.Extensions.Logging.ILoggerFactory,System.Boolean);Argument[0];ReturnValue;taint;df-generated |
+| Microsoft.Extensions.Logging;ConsoleLoggerExtensions;AddConsole;(Microsoft.Extensions.Logging.ILoggerFactory);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Logging;ConsoleLoggerExtensions;AddConsole;(Microsoft.Extensions.Logging.ILoggerFactory,Microsoft.Extensions.Configuration.IConfiguration);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Logging;ConsoleLoggerExtensions;AddConsole;(Microsoft.Extensions.Logging.ILoggerFactory,Microsoft.Extensions.Logging.Console.IConsoleLoggerSettings);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Logging;ConsoleLoggerExtensions;AddConsole;(Microsoft.Extensions.Logging.ILoggerFactory,Microsoft.Extensions.Logging.LogLevel);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Logging;ConsoleLoggerExtensions;AddConsole;(Microsoft.Extensions.Logging.ILoggerFactory,Microsoft.Extensions.Logging.LogLevel,System.Boolean);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Logging;ConsoleLoggerExtensions;AddConsole;(Microsoft.Extensions.Logging.ILoggerFactory,System.Boolean);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Logging;ConsoleLoggerExtensions;AddConsole;(Microsoft.Extensions.Logging.ILoggerFactory,System.Func<System.String,Microsoft.Extensions.Logging.LogLevel,System.Boolean>);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Logging;ConsoleLoggerExtensions;AddConsole;(Microsoft.Extensions.Logging.ILoggerFactory,System.Func<System.String,Microsoft.Extensions.Logging.LogLevel,System.Boolean>);Argument[0];ReturnValue;value;hq-generated |
+| Microsoft.Extensions.Logging;ConsoleLoggerExtensions;AddConsole;(Microsoft.Extensions.Logging.ILoggerFactory,System.Func<System.String,Microsoft.Extensions.Logging.LogLevel,System.Boolean>);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.Logging;ConsoleLoggerExtensions;AddConsole;(Microsoft.Extensions.Logging.ILoggerFactory,System.Func<System.String,Microsoft.Extensions.Logging.LogLevel,System.Boolean>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
+| Microsoft.Extensions.Logging;ConsoleLoggerExtensions;AddConsole;(Microsoft.Extensions.Logging.ILoggerFactory,System.Func<System.String,Microsoft.Extensions.Logging.LogLevel,System.Boolean>,System.Boolean);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Logging;ConsoleLoggerExtensions;AddConsole;(Microsoft.Extensions.Logging.ILoggerFactory,System.Func<System.String,Microsoft.Extensions.Logging.LogLevel,System.Boolean>,System.Boolean);Argument[0];ReturnValue;value;hq-generated |
+| Microsoft.Extensions.Logging;ConsoleLoggerExtensions;AddConsole;(Microsoft.Extensions.Logging.ILoggerFactory,System.Func<System.String,Microsoft.Extensions.Logging.LogLevel,System.Boolean>,System.Boolean);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.Logging;ConsoleLoggerExtensions;AddConsole;(Microsoft.Extensions.Logging.ILoggerFactory,System.Func<System.String,Microsoft.Extensions.Logging.LogLevel,System.Boolean>,System.Boolean);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
-| Microsoft.Extensions.Logging;ConsoleLoggerExtensions;AddConsole;(Microsoft.Extensions.Logging.ILoggingBuilder);Argument[0];ReturnValue;taint;df-generated |
+| Microsoft.Extensions.Logging;ConsoleLoggerExtensions;AddConsole;(Microsoft.Extensions.Logging.ILoggingBuilder);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Logging;ConsoleLoggerExtensions;AddConsole;(Microsoft.Extensions.Logging.ILoggingBuilder,System.Action<Microsoft.Extensions.Logging.Console.ConsoleLoggerOptions>);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Logging;ConsoleLoggerExtensions;AddConsole;(Microsoft.Extensions.Logging.ILoggingBuilder,System.Action<Microsoft.Extensions.Logging.Console.ConsoleLoggerOptions>);Argument[0];ReturnValue;value;hq-generated |
+| Microsoft.Extensions.Logging;ConsoleLoggerExtensions;AddConsole;(Microsoft.Extensions.Logging.ILoggingBuilder,System.Action<Microsoft.Extensions.Logging.Console.ConsoleLoggerOptions>);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.Logging;ConsoleLoggerExtensions;AddConsole;(Microsoft.Extensions.Logging.ILoggingBuilder,System.Action<Microsoft.Extensions.Logging.Console.ConsoleLoggerOptions>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
-| Microsoft.Extensions.Logging;ConsoleLoggerExtensions;AddConsoleFormatter<TFormatter,TOptions>;(Microsoft.Extensions.Logging.ILoggingBuilder);Argument[0];ReturnValue;taint;df-generated |
+| Microsoft.Extensions.Logging;ConsoleLoggerExtensions;AddConsoleFormatter<TFormatter,TOptions>;(Microsoft.Extensions.Logging.ILoggingBuilder);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Logging;ConsoleLoggerExtensions;AddConsoleFormatter<TFormatter,TOptions>;(Microsoft.Extensions.Logging.ILoggingBuilder,System.Action<TOptions>);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Logging;ConsoleLoggerExtensions;AddConsoleFormatter<TFormatter,TOptions>;(Microsoft.Extensions.Logging.ILoggingBuilder,System.Action<TOptions>);Argument[0];ReturnValue;value;hq-generated |
+| Microsoft.Extensions.Logging;ConsoleLoggerExtensions;AddConsoleFormatter<TFormatter,TOptions>;(Microsoft.Extensions.Logging.ILoggingBuilder,System.Action<TOptions>);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.Logging;ConsoleLoggerExtensions;AddConsoleFormatter<TFormatter,TOptions>;(Microsoft.Extensions.Logging.ILoggingBuilder,System.Action<TOptions>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
-| Microsoft.Extensions.Logging;ConsoleLoggerExtensions;AddJsonConsole;(Microsoft.Extensions.Logging.ILoggingBuilder);Argument[0];ReturnValue;taint;df-generated |
+| Microsoft.Extensions.Logging;ConsoleLoggerExtensions;AddJsonConsole;(Microsoft.Extensions.Logging.ILoggingBuilder);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Logging;ConsoleLoggerExtensions;AddJsonConsole;(Microsoft.Extensions.Logging.ILoggingBuilder,System.Action<Microsoft.Extensions.Logging.Console.JsonConsoleFormatterOptions>);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Logging;ConsoleLoggerExtensions;AddJsonConsole;(Microsoft.Extensions.Logging.ILoggingBuilder,System.Action<Microsoft.Extensions.Logging.Console.JsonConsoleFormatterOptions>);Argument[0];ReturnValue;value;hq-generated |
+| Microsoft.Extensions.Logging;ConsoleLoggerExtensions;AddJsonConsole;(Microsoft.Extensions.Logging.ILoggingBuilder,System.Action<Microsoft.Extensions.Logging.Console.JsonConsoleFormatterOptions>);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.Logging;ConsoleLoggerExtensions;AddJsonConsole;(Microsoft.Extensions.Logging.ILoggingBuilder,System.Action<Microsoft.Extensions.Logging.Console.JsonConsoleFormatterOptions>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
-| Microsoft.Extensions.Logging;ConsoleLoggerExtensions;AddSimpleConsole;(Microsoft.Extensions.Logging.ILoggingBuilder);Argument[0];ReturnValue;taint;df-generated |
+| Microsoft.Extensions.Logging;ConsoleLoggerExtensions;AddSimpleConsole;(Microsoft.Extensions.Logging.ILoggingBuilder);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Logging;ConsoleLoggerExtensions;AddSimpleConsole;(Microsoft.Extensions.Logging.ILoggingBuilder,System.Action<Microsoft.Extensions.Logging.Console.SimpleConsoleFormatterOptions>);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Logging;ConsoleLoggerExtensions;AddSimpleConsole;(Microsoft.Extensions.Logging.ILoggingBuilder,System.Action<Microsoft.Extensions.Logging.Console.SimpleConsoleFormatterOptions>);Argument[0];ReturnValue;value;hq-generated |
+| Microsoft.Extensions.Logging;ConsoleLoggerExtensions;AddSimpleConsole;(Microsoft.Extensions.Logging.ILoggingBuilder,System.Action<Microsoft.Extensions.Logging.Console.SimpleConsoleFormatterOptions>);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.Logging;ConsoleLoggerExtensions;AddSimpleConsole;(Microsoft.Extensions.Logging.ILoggingBuilder,System.Action<Microsoft.Extensions.Logging.Console.SimpleConsoleFormatterOptions>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
-| Microsoft.Extensions.Logging;ConsoleLoggerExtensions;AddSystemdConsole;(Microsoft.Extensions.Logging.ILoggingBuilder);Argument[0];ReturnValue;taint;df-generated |
+| Microsoft.Extensions.Logging;ConsoleLoggerExtensions;AddSystemdConsole;(Microsoft.Extensions.Logging.ILoggingBuilder);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Logging;ConsoleLoggerExtensions;AddSystemdConsole;(Microsoft.Extensions.Logging.ILoggingBuilder,System.Action<Microsoft.Extensions.Logging.Console.ConsoleFormatterOptions>);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Logging;ConsoleLoggerExtensions;AddSystemdConsole;(Microsoft.Extensions.Logging.ILoggingBuilder,System.Action<Microsoft.Extensions.Logging.Console.ConsoleFormatterOptions>);Argument[0];ReturnValue;value;hq-generated |
+| Microsoft.Extensions.Logging;ConsoleLoggerExtensions;AddSystemdConsole;(Microsoft.Extensions.Logging.ILoggingBuilder,System.Action<Microsoft.Extensions.Logging.Console.ConsoleFormatterOptions>);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.Logging;ConsoleLoggerExtensions;AddSystemdConsole;(Microsoft.Extensions.Logging.ILoggingBuilder,System.Action<Microsoft.Extensions.Logging.Console.ConsoleFormatterOptions>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
-| Microsoft.Extensions.Logging;DebugLoggerFactoryExtensions;AddDebug;(Microsoft.Extensions.Logging.ILoggerFactory);Argument[0];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Logging;DebugLoggerFactoryExtensions;AddDebug;(Microsoft.Extensions.Logging.ILoggerFactory,Microsoft.Extensions.Logging.LogLevel);Argument[0];ReturnValue;taint;df-generated |
+| Microsoft.Extensions.Logging;DebugLoggerFactoryExtensions;AddDebug;(Microsoft.Extensions.Logging.ILoggerFactory);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Logging;DebugLoggerFactoryExtensions;AddDebug;(Microsoft.Extensions.Logging.ILoggerFactory,Microsoft.Extensions.Logging.LogLevel);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Logging;DebugLoggerFactoryExtensions;AddDebug;(Microsoft.Extensions.Logging.ILoggerFactory,System.Func<System.String,Microsoft.Extensions.Logging.LogLevel,System.Boolean>);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Logging;DebugLoggerFactoryExtensions;AddDebug;(Microsoft.Extensions.Logging.ILoggerFactory,System.Func<System.String,Microsoft.Extensions.Logging.LogLevel,System.Boolean>);Argument[0];ReturnValue;value;hq-generated |
+| Microsoft.Extensions.Logging;DebugLoggerFactoryExtensions;AddDebug;(Microsoft.Extensions.Logging.ILoggerFactory,System.Func<System.String,Microsoft.Extensions.Logging.LogLevel,System.Boolean>);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.Logging;DebugLoggerFactoryExtensions;AddDebug;(Microsoft.Extensions.Logging.ILoggerFactory,System.Func<System.String,Microsoft.Extensions.Logging.LogLevel,System.Boolean>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
-| Microsoft.Extensions.Logging;DebugLoggerFactoryExtensions;AddDebug;(Microsoft.Extensions.Logging.ILoggingBuilder);Argument[0];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Logging;EventId;ToString;();Argument[this];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Logging;EventLoggerFactoryExtensions;AddEventLog;(Microsoft.Extensions.Logging.ILoggerFactory);Argument[0];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Logging;EventLoggerFactoryExtensions;AddEventLog;(Microsoft.Extensions.Logging.ILoggerFactory,Microsoft.Extensions.Logging.EventLog.EventLogSettings);Argument[0];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Logging;EventLoggerFactoryExtensions;AddEventLog;(Microsoft.Extensions.Logging.ILoggerFactory,Microsoft.Extensions.Logging.LogLevel);Argument[0];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Logging;EventLoggerFactoryExtensions;AddEventLog;(Microsoft.Extensions.Logging.ILoggingBuilder);Argument[0];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Logging;EventLoggerFactoryExtensions;AddEventLog;(Microsoft.Extensions.Logging.ILoggingBuilder,Microsoft.Extensions.Logging.EventLog.EventLogSettings);Argument[0];ReturnValue;taint;df-generated |
+| Microsoft.Extensions.Logging;DebugLoggerFactoryExtensions;AddDebug;(Microsoft.Extensions.Logging.ILoggingBuilder);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Logging;EventId;ToString;();Argument[this].Property[Microsoft.Extensions.Logging.EventId.Name];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Logging;EventLoggerFactoryExtensions;AddEventLog;(Microsoft.Extensions.Logging.ILoggerFactory);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Logging;EventLoggerFactoryExtensions;AddEventLog;(Microsoft.Extensions.Logging.ILoggerFactory,Microsoft.Extensions.Logging.EventLog.EventLogSettings);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Logging;EventLoggerFactoryExtensions;AddEventLog;(Microsoft.Extensions.Logging.ILoggerFactory,Microsoft.Extensions.Logging.LogLevel);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Logging;EventLoggerFactoryExtensions;AddEventLog;(Microsoft.Extensions.Logging.ILoggingBuilder);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Logging;EventLoggerFactoryExtensions;AddEventLog;(Microsoft.Extensions.Logging.ILoggingBuilder,Microsoft.Extensions.Logging.EventLog.EventLogSettings);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Logging;EventLoggerFactoryExtensions;AddEventLog;(Microsoft.Extensions.Logging.ILoggingBuilder,System.Action<Microsoft.Extensions.Logging.EventLog.EventLogSettings>);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Logging;EventLoggerFactoryExtensions;AddEventLog;(Microsoft.Extensions.Logging.ILoggingBuilder,System.Action<Microsoft.Extensions.Logging.EventLog.EventLogSettings>);Argument[0];ReturnValue;value;hq-generated |
+| Microsoft.Extensions.Logging;EventLoggerFactoryExtensions;AddEventLog;(Microsoft.Extensions.Logging.ILoggingBuilder,System.Action<Microsoft.Extensions.Logging.EventLog.EventLogSettings>);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.Logging;EventLoggerFactoryExtensions;AddEventLog;(Microsoft.Extensions.Logging.ILoggingBuilder,System.Action<Microsoft.Extensions.Logging.EventLog.EventLogSettings>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
-| Microsoft.Extensions.Logging;EventSourceLoggerFactoryExtensions;AddEventSourceLogger;(Microsoft.Extensions.Logging.ILoggerFactory);Argument[0];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Logging;EventSourceLoggerFactoryExtensions;AddEventSourceLogger;(Microsoft.Extensions.Logging.ILoggingBuilder);Argument[0];ReturnValue;taint;df-generated |
+| Microsoft.Extensions.Logging;EventSourceLoggerFactoryExtensions;AddEventSourceLogger;(Microsoft.Extensions.Logging.ILoggerFactory);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Logging;EventSourceLoggerFactoryExtensions;AddEventSourceLogger;(Microsoft.Extensions.Logging.ILoggingBuilder);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Logging;FilterLoggingBuilderExtensions;AddFilter;(Microsoft.Extensions.Logging.ILoggingBuilder,System.Func<Microsoft.Extensions.Logging.LogLevel,System.Boolean>);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Logging;FilterLoggingBuilderExtensions;AddFilter;(Microsoft.Extensions.Logging.ILoggingBuilder,System.Func<Microsoft.Extensions.Logging.LogLevel,System.Boolean>);Argument[0];ReturnValue;value;hq-generated |
+| Microsoft.Extensions.Logging;FilterLoggingBuilderExtensions;AddFilter;(Microsoft.Extensions.Logging.ILoggingBuilder,System.Func<Microsoft.Extensions.Logging.LogLevel,System.Boolean>);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.Logging;FilterLoggingBuilderExtensions;AddFilter;(Microsoft.Extensions.Logging.ILoggingBuilder,System.Func<Microsoft.Extensions.Logging.LogLevel,System.Boolean>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
+| Microsoft.Extensions.Logging;FilterLoggingBuilderExtensions;AddFilter;(Microsoft.Extensions.Logging.ILoggingBuilder,System.Func<System.String,Microsoft.Extensions.Logging.LogLevel,System.Boolean>);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Logging;FilterLoggingBuilderExtensions;AddFilter;(Microsoft.Extensions.Logging.ILoggingBuilder,System.Func<System.String,Microsoft.Extensions.Logging.LogLevel,System.Boolean>);Argument[0];ReturnValue;value;hq-generated |
+| Microsoft.Extensions.Logging;FilterLoggingBuilderExtensions;AddFilter;(Microsoft.Extensions.Logging.ILoggingBuilder,System.Func<System.String,Microsoft.Extensions.Logging.LogLevel,System.Boolean>);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.Logging;FilterLoggingBuilderExtensions;AddFilter;(Microsoft.Extensions.Logging.ILoggingBuilder,System.Func<System.String,Microsoft.Extensions.Logging.LogLevel,System.Boolean>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
+| Microsoft.Extensions.Logging;FilterLoggingBuilderExtensions;AddFilter;(Microsoft.Extensions.Logging.ILoggingBuilder,System.Func<System.String,System.String,Microsoft.Extensions.Logging.LogLevel,System.Boolean>);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Logging;FilterLoggingBuilderExtensions;AddFilter;(Microsoft.Extensions.Logging.ILoggingBuilder,System.Func<System.String,System.String,Microsoft.Extensions.Logging.LogLevel,System.Boolean>);Argument[0];ReturnValue;value;hq-generated |
+| Microsoft.Extensions.Logging;FilterLoggingBuilderExtensions;AddFilter;(Microsoft.Extensions.Logging.ILoggingBuilder,System.Func<System.String,System.String,Microsoft.Extensions.Logging.LogLevel,System.Boolean>);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.Logging;FilterLoggingBuilderExtensions;AddFilter;(Microsoft.Extensions.Logging.ILoggingBuilder,System.Func<System.String,System.String,Microsoft.Extensions.Logging.LogLevel,System.Boolean>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
-| Microsoft.Extensions.Logging;FilterLoggingBuilderExtensions;AddFilter;(Microsoft.Extensions.Logging.ILoggingBuilder,System.String,Microsoft.Extensions.Logging.LogLevel);Argument[0];ReturnValue;taint;df-generated |
+| Microsoft.Extensions.Logging;FilterLoggingBuilderExtensions;AddFilter;(Microsoft.Extensions.Logging.ILoggingBuilder,System.String,Microsoft.Extensions.Logging.LogLevel);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Logging;FilterLoggingBuilderExtensions;AddFilter;(Microsoft.Extensions.Logging.ILoggingBuilder,System.String,System.Func<Microsoft.Extensions.Logging.LogLevel,System.Boolean>);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Logging;FilterLoggingBuilderExtensions;AddFilter;(Microsoft.Extensions.Logging.ILoggingBuilder,System.String,System.Func<Microsoft.Extensions.Logging.LogLevel,System.Boolean>);Argument[0];ReturnValue;value;hq-generated |
+| Microsoft.Extensions.Logging;FilterLoggingBuilderExtensions;AddFilter;(Microsoft.Extensions.Logging.ILoggingBuilder,System.String,System.Func<Microsoft.Extensions.Logging.LogLevel,System.Boolean>);Argument[2];Argument[2].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.Logging;FilterLoggingBuilderExtensions;AddFilter;(Microsoft.Extensions.Logging.ILoggingBuilder,System.String,System.Func<Microsoft.Extensions.Logging.LogLevel,System.Boolean>);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
+| Microsoft.Extensions.Logging;FilterLoggingBuilderExtensions;AddFilter;(Microsoft.Extensions.Logging.LoggerFilterOptions,System.Func<Microsoft.Extensions.Logging.LogLevel,System.Boolean>);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Logging;FilterLoggingBuilderExtensions;AddFilter;(Microsoft.Extensions.Logging.LoggerFilterOptions,System.Func<Microsoft.Extensions.Logging.LogLevel,System.Boolean>);Argument[0];ReturnValue;value;hq-generated |
+| Microsoft.Extensions.Logging;FilterLoggingBuilderExtensions;AddFilter;(Microsoft.Extensions.Logging.LoggerFilterOptions,System.Func<Microsoft.Extensions.Logging.LogLevel,System.Boolean>);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.Logging;FilterLoggingBuilderExtensions;AddFilter;(Microsoft.Extensions.Logging.LoggerFilterOptions,System.Func<Microsoft.Extensions.Logging.LogLevel,System.Boolean>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
+| Microsoft.Extensions.Logging;FilterLoggingBuilderExtensions;AddFilter;(Microsoft.Extensions.Logging.LoggerFilterOptions,System.Func<System.String,Microsoft.Extensions.Logging.LogLevel,System.Boolean>);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Logging;FilterLoggingBuilderExtensions;AddFilter;(Microsoft.Extensions.Logging.LoggerFilterOptions,System.Func<System.String,Microsoft.Extensions.Logging.LogLevel,System.Boolean>);Argument[0];ReturnValue;value;hq-generated |
+| Microsoft.Extensions.Logging;FilterLoggingBuilderExtensions;AddFilter;(Microsoft.Extensions.Logging.LoggerFilterOptions,System.Func<System.String,Microsoft.Extensions.Logging.LogLevel,System.Boolean>);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.Logging;FilterLoggingBuilderExtensions;AddFilter;(Microsoft.Extensions.Logging.LoggerFilterOptions,System.Func<System.String,Microsoft.Extensions.Logging.LogLevel,System.Boolean>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
+| Microsoft.Extensions.Logging;FilterLoggingBuilderExtensions;AddFilter;(Microsoft.Extensions.Logging.LoggerFilterOptions,System.Func<System.String,System.String,Microsoft.Extensions.Logging.LogLevel,System.Boolean>);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Logging;FilterLoggingBuilderExtensions;AddFilter;(Microsoft.Extensions.Logging.LoggerFilterOptions,System.Func<System.String,System.String,Microsoft.Extensions.Logging.LogLevel,System.Boolean>);Argument[0];ReturnValue;value;hq-generated |
+| Microsoft.Extensions.Logging;FilterLoggingBuilderExtensions;AddFilter;(Microsoft.Extensions.Logging.LoggerFilterOptions,System.Func<System.String,System.String,Microsoft.Extensions.Logging.LogLevel,System.Boolean>);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.Logging;FilterLoggingBuilderExtensions;AddFilter;(Microsoft.Extensions.Logging.LoggerFilterOptions,System.Func<System.String,System.String,Microsoft.Extensions.Logging.LogLevel,System.Boolean>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
-| Microsoft.Extensions.Logging;FilterLoggingBuilderExtensions;AddFilter;(Microsoft.Extensions.Logging.LoggerFilterOptions,System.String,Microsoft.Extensions.Logging.LogLevel);Argument[0];ReturnValue;taint;df-generated |
+| Microsoft.Extensions.Logging;FilterLoggingBuilderExtensions;AddFilter;(Microsoft.Extensions.Logging.LoggerFilterOptions,System.String,Microsoft.Extensions.Logging.LogLevel);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Logging;FilterLoggingBuilderExtensions;AddFilter;(Microsoft.Extensions.Logging.LoggerFilterOptions,System.String,System.Func<Microsoft.Extensions.Logging.LogLevel,System.Boolean>);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Logging;FilterLoggingBuilderExtensions;AddFilter;(Microsoft.Extensions.Logging.LoggerFilterOptions,System.String,System.Func<Microsoft.Extensions.Logging.LogLevel,System.Boolean>);Argument[0];ReturnValue;value;hq-generated |
+| Microsoft.Extensions.Logging;FilterLoggingBuilderExtensions;AddFilter;(Microsoft.Extensions.Logging.LoggerFilterOptions,System.String,System.Func<Microsoft.Extensions.Logging.LogLevel,System.Boolean>);Argument[2];Argument[2].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.Logging;FilterLoggingBuilderExtensions;AddFilter;(Microsoft.Extensions.Logging.LoggerFilterOptions,System.String,System.Func<Microsoft.Extensions.Logging.LogLevel,System.Boolean>);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
+| Microsoft.Extensions.Logging;FilterLoggingBuilderExtensions;AddFilter<T>;(Microsoft.Extensions.Logging.ILoggingBuilder,System.Func<Microsoft.Extensions.Logging.LogLevel,System.Boolean>);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Logging;FilterLoggingBuilderExtensions;AddFilter<T>;(Microsoft.Extensions.Logging.ILoggingBuilder,System.Func<Microsoft.Extensions.Logging.LogLevel,System.Boolean>);Argument[0];ReturnValue;value;hq-generated |
+| Microsoft.Extensions.Logging;FilterLoggingBuilderExtensions;AddFilter<T>;(Microsoft.Extensions.Logging.ILoggingBuilder,System.Func<Microsoft.Extensions.Logging.LogLevel,System.Boolean>);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.Logging;FilterLoggingBuilderExtensions;AddFilter<T>;(Microsoft.Extensions.Logging.ILoggingBuilder,System.Func<Microsoft.Extensions.Logging.LogLevel,System.Boolean>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
+| Microsoft.Extensions.Logging;FilterLoggingBuilderExtensions;AddFilter<T>;(Microsoft.Extensions.Logging.ILoggingBuilder,System.Func<System.String,Microsoft.Extensions.Logging.LogLevel,System.Boolean>);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Logging;FilterLoggingBuilderExtensions;AddFilter<T>;(Microsoft.Extensions.Logging.ILoggingBuilder,System.Func<System.String,Microsoft.Extensions.Logging.LogLevel,System.Boolean>);Argument[0];ReturnValue;value;hq-generated |
+| Microsoft.Extensions.Logging;FilterLoggingBuilderExtensions;AddFilter<T>;(Microsoft.Extensions.Logging.ILoggingBuilder,System.Func<System.String,Microsoft.Extensions.Logging.LogLevel,System.Boolean>);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.Logging;FilterLoggingBuilderExtensions;AddFilter<T>;(Microsoft.Extensions.Logging.ILoggingBuilder,System.Func<System.String,Microsoft.Extensions.Logging.LogLevel,System.Boolean>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
-| Microsoft.Extensions.Logging;FilterLoggingBuilderExtensions;AddFilter<T>;(Microsoft.Extensions.Logging.ILoggingBuilder,System.String,Microsoft.Extensions.Logging.LogLevel);Argument[0];ReturnValue;taint;df-generated |
+| Microsoft.Extensions.Logging;FilterLoggingBuilderExtensions;AddFilter<T>;(Microsoft.Extensions.Logging.ILoggingBuilder,System.String,Microsoft.Extensions.Logging.LogLevel);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Logging;FilterLoggingBuilderExtensions;AddFilter<T>;(Microsoft.Extensions.Logging.ILoggingBuilder,System.String,System.Func<Microsoft.Extensions.Logging.LogLevel,System.Boolean>);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Logging;FilterLoggingBuilderExtensions;AddFilter<T>;(Microsoft.Extensions.Logging.ILoggingBuilder,System.String,System.Func<Microsoft.Extensions.Logging.LogLevel,System.Boolean>);Argument[0];ReturnValue;value;hq-generated |
+| Microsoft.Extensions.Logging;FilterLoggingBuilderExtensions;AddFilter<T>;(Microsoft.Extensions.Logging.ILoggingBuilder,System.String,System.Func<Microsoft.Extensions.Logging.LogLevel,System.Boolean>);Argument[2];Argument[2].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.Logging;FilterLoggingBuilderExtensions;AddFilter<T>;(Microsoft.Extensions.Logging.ILoggingBuilder,System.String,System.Func<Microsoft.Extensions.Logging.LogLevel,System.Boolean>);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
+| Microsoft.Extensions.Logging;FilterLoggingBuilderExtensions;AddFilter<T>;(Microsoft.Extensions.Logging.LoggerFilterOptions,System.Func<Microsoft.Extensions.Logging.LogLevel,System.Boolean>);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Logging;FilterLoggingBuilderExtensions;AddFilter<T>;(Microsoft.Extensions.Logging.LoggerFilterOptions,System.Func<Microsoft.Extensions.Logging.LogLevel,System.Boolean>);Argument[0];ReturnValue;value;hq-generated |
+| Microsoft.Extensions.Logging;FilterLoggingBuilderExtensions;AddFilter<T>;(Microsoft.Extensions.Logging.LoggerFilterOptions,System.Func<Microsoft.Extensions.Logging.LogLevel,System.Boolean>);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.Logging;FilterLoggingBuilderExtensions;AddFilter<T>;(Microsoft.Extensions.Logging.LoggerFilterOptions,System.Func<Microsoft.Extensions.Logging.LogLevel,System.Boolean>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
+| Microsoft.Extensions.Logging;FilterLoggingBuilderExtensions;AddFilter<T>;(Microsoft.Extensions.Logging.LoggerFilterOptions,System.Func<System.String,Microsoft.Extensions.Logging.LogLevel,System.Boolean>);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Logging;FilterLoggingBuilderExtensions;AddFilter<T>;(Microsoft.Extensions.Logging.LoggerFilterOptions,System.Func<System.String,Microsoft.Extensions.Logging.LogLevel,System.Boolean>);Argument[0];ReturnValue;value;hq-generated |
+| Microsoft.Extensions.Logging;FilterLoggingBuilderExtensions;AddFilter<T>;(Microsoft.Extensions.Logging.LoggerFilterOptions,System.Func<System.String,Microsoft.Extensions.Logging.LogLevel,System.Boolean>);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.Logging;FilterLoggingBuilderExtensions;AddFilter<T>;(Microsoft.Extensions.Logging.LoggerFilterOptions,System.Func<System.String,Microsoft.Extensions.Logging.LogLevel,System.Boolean>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
-| Microsoft.Extensions.Logging;FilterLoggingBuilderExtensions;AddFilter<T>;(Microsoft.Extensions.Logging.LoggerFilterOptions,System.String,Microsoft.Extensions.Logging.LogLevel);Argument[0];ReturnValue;taint;df-generated |
+| Microsoft.Extensions.Logging;FilterLoggingBuilderExtensions;AddFilter<T>;(Microsoft.Extensions.Logging.LoggerFilterOptions,System.String,Microsoft.Extensions.Logging.LogLevel);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Logging;FilterLoggingBuilderExtensions;AddFilter<T>;(Microsoft.Extensions.Logging.LoggerFilterOptions,System.String,System.Func<Microsoft.Extensions.Logging.LogLevel,System.Boolean>);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Logging;FilterLoggingBuilderExtensions;AddFilter<T>;(Microsoft.Extensions.Logging.LoggerFilterOptions,System.String,System.Func<Microsoft.Extensions.Logging.LogLevel,System.Boolean>);Argument[0];ReturnValue;value;hq-generated |
+| Microsoft.Extensions.Logging;FilterLoggingBuilderExtensions;AddFilter<T>;(Microsoft.Extensions.Logging.LoggerFilterOptions,System.String,System.Func<Microsoft.Extensions.Logging.LogLevel,System.Boolean>);Argument[2];Argument[2].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.Logging;FilterLoggingBuilderExtensions;AddFilter<T>;(Microsoft.Extensions.Logging.LoggerFilterOptions,System.String,System.Func<Microsoft.Extensions.Logging.LogLevel,System.Boolean>);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
+| Microsoft.Extensions.Logging;IExternalScopeProvider;ForEachScope<TState>;(System.Action<System.Object,TState>,TState);Argument[0];Argument[0].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.Logging;IExternalScopeProvider;ForEachScope<TState>;(System.Action<System.Object,TState>,TState);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
+| Microsoft.Extensions.Logging;IExternalScopeProvider;ForEachScope<TState>;(System.Action<System.Object,TState>,TState);Argument[1];Argument[0].Parameter[1];value;dfc-generated |
+| Microsoft.Extensions.Logging;IExternalScopeProvider;ForEachScope<TState>;(System.Action<System.Object,TState>,TState);Argument[1];Argument[0].Parameter[1];value;hq-generated |
 | Microsoft.Extensions.Logging;IExternalScopeProvider;Push;(System.Object);Argument[0];ReturnValue;taint;df-generated |
 | Microsoft.Extensions.Logging;IExternalScopeProvider;Push;(System.Object);Argument[this];ReturnValue;taint;df-generated |
 | Microsoft.Extensions.Logging;ILogger;BeginScope<TState>;(TState);Argument[0];ReturnValue;taint;df-generated |
 | Microsoft.Extensions.Logging;ILogger;BeginScope<TState>;(TState);Argument[this];ReturnValue;taint;df-generated |
+| Microsoft.Extensions.Logging;ILogger;Log<TState>;(Microsoft.Extensions.Logging.LogLevel,Microsoft.Extensions.Logging.EventId,TState,System.Exception,System.Func<TState,System.Exception,System.String>);Argument[2];Argument[4].Parameter[0];value;dfc-generated |
+| Microsoft.Extensions.Logging;ILogger;Log<TState>;(Microsoft.Extensions.Logging.LogLevel,Microsoft.Extensions.Logging.EventId,TState,System.Exception,System.Func<TState,System.Exception,System.String>);Argument[2];Argument[4].Parameter[0];value;hq-generated |
+| Microsoft.Extensions.Logging;ILogger;Log<TState>;(Microsoft.Extensions.Logging.LogLevel,Microsoft.Extensions.Logging.EventId,TState,System.Exception,System.Func<TState,System.Exception,System.String>);Argument[3];Argument[4].Parameter[1];value;dfc-generated |
+| Microsoft.Extensions.Logging;ILogger;Log<TState>;(Microsoft.Extensions.Logging.LogLevel,Microsoft.Extensions.Logging.EventId,TState,System.Exception,System.Func<TState,System.Exception,System.String>);Argument[3];Argument[4].Parameter[1];value;hq-generated |
+| Microsoft.Extensions.Logging;ILogger;Log<TState>;(Microsoft.Extensions.Logging.LogLevel,Microsoft.Extensions.Logging.EventId,TState,System.Exception,System.Func<TState,System.Exception,System.String>);Argument[4];Argument[4].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.Logging;ILogger;Log<TState>;(Microsoft.Extensions.Logging.LogLevel,Microsoft.Extensions.Logging.EventId,TState,System.Exception,System.Func<TState,System.Exception,System.String>);Argument[4];Argument[4].Parameter[delegate-self];value;hq-generated |
 | Microsoft.Extensions.Logging;ILoggerFactory;AddProvider;(Microsoft.Extensions.Logging.ILoggerProvider);Argument[this];Argument[0];taint;df-generated |
 | Microsoft.Extensions.Logging;ILoggerFactory;CreateLogger;(System.String);Argument[0];ReturnValue;taint;df-generated |
@@ -1378,55 +1726,143 @@
 | Microsoft.Extensions.Logging;LoggerFilterOptions;get_Rules;();Argument[this];ReturnValue;taint;df-generated |
 | Microsoft.Extensions.Logging;LoggerFilterRule;LoggerFilterRule;(System.String,System.String,System.Nullable<Microsoft.Extensions.Logging.LogLevel>,System.Func<System.String,System.String,Microsoft.Extensions.Logging.LogLevel,System.Boolean>);Argument[3];Argument[3].Parameter[delegate-self];value;hq-generated |
 | Microsoft.Extensions.Logging;LoggerFilterRule;ToString;();Argument[this];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Logging;LoggingBuilderExtensions;AddConfiguration;(Microsoft.Extensions.Logging.ILoggingBuilder,Microsoft.Extensions.Configuration.IConfiguration);Argument[0];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Logging;LoggingBuilderExtensions;AddProvider;(Microsoft.Extensions.Logging.ILoggingBuilder,Microsoft.Extensions.Logging.ILoggerProvider);Argument[0];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Logging;LoggingBuilderExtensions;ClearProviders;(Microsoft.Extensions.Logging.ILoggingBuilder);Argument[0];ReturnValue;taint;df-generated |
+| Microsoft.Extensions.Logging;LoggingBuilderExtensions;AddConfiguration;(Microsoft.Extensions.Logging.ILoggingBuilder,Microsoft.Extensions.Configuration.IConfiguration);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Logging;LoggingBuilderExtensions;AddProvider;(Microsoft.Extensions.Logging.ILoggingBuilder,Microsoft.Extensions.Logging.ILoggerProvider);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Logging;LoggingBuilderExtensions;ClearProviders;(Microsoft.Extensions.Logging.ILoggingBuilder);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Logging;LoggingBuilderExtensions;Configure;(Microsoft.Extensions.Logging.ILoggingBuilder,System.Action<Microsoft.Extensions.Logging.LoggerFactoryOptions>);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Logging;LoggingBuilderExtensions;Configure;(Microsoft.Extensions.Logging.ILoggingBuilder,System.Action<Microsoft.Extensions.Logging.LoggerFactoryOptions>);Argument[0];ReturnValue;value;hq-generated |
+| Microsoft.Extensions.Logging;LoggingBuilderExtensions;Configure;(Microsoft.Extensions.Logging.ILoggingBuilder,System.Action<Microsoft.Extensions.Logging.LoggerFactoryOptions>);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.Logging;LoggingBuilderExtensions;Configure;(Microsoft.Extensions.Logging.ILoggingBuilder,System.Action<Microsoft.Extensions.Logging.LoggerFactoryOptions>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
-| Microsoft.Extensions.Logging;LoggingBuilderExtensions;SetMinimumLevel;(Microsoft.Extensions.Logging.ILoggingBuilder,Microsoft.Extensions.Logging.LogLevel);Argument[0];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Logging;TraceSourceFactoryExtensions;AddTraceSource;(Microsoft.Extensions.Logging.ILoggerFactory,System.Diagnostics.SourceSwitch);Argument[0];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Logging;TraceSourceFactoryExtensions;AddTraceSource;(Microsoft.Extensions.Logging.ILoggerFactory,System.Diagnostics.SourceSwitch,System.Diagnostics.TraceListener);Argument[0];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Logging;TraceSourceFactoryExtensions;AddTraceSource;(Microsoft.Extensions.Logging.ILoggerFactory,System.String);Argument[0];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Logging;TraceSourceFactoryExtensions;AddTraceSource;(Microsoft.Extensions.Logging.ILoggerFactory,System.String,System.Diagnostics.TraceListener);Argument[0];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Logging;TraceSourceFactoryExtensions;AddTraceSource;(Microsoft.Extensions.Logging.ILoggingBuilder,System.Diagnostics.SourceSwitch);Argument[0];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Logging;TraceSourceFactoryExtensions;AddTraceSource;(Microsoft.Extensions.Logging.ILoggingBuilder,System.Diagnostics.SourceSwitch,System.Diagnostics.TraceListener);Argument[0];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Logging;TraceSourceFactoryExtensions;AddTraceSource;(Microsoft.Extensions.Logging.ILoggingBuilder,System.String);Argument[0];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Logging;TraceSourceFactoryExtensions;AddTraceSource;(Microsoft.Extensions.Logging.ILoggingBuilder,System.String,System.Diagnostics.TraceListener);Argument[0];ReturnValue;taint;df-generated |
+| Microsoft.Extensions.Logging;LoggingBuilderExtensions;SetMinimumLevel;(Microsoft.Extensions.Logging.ILoggingBuilder,Microsoft.Extensions.Logging.LogLevel);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Logging;TraceSourceFactoryExtensions;AddTraceSource;(Microsoft.Extensions.Logging.ILoggerFactory,System.Diagnostics.SourceSwitch);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Logging;TraceSourceFactoryExtensions;AddTraceSource;(Microsoft.Extensions.Logging.ILoggerFactory,System.Diagnostics.SourceSwitch,System.Diagnostics.TraceListener);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Logging;TraceSourceFactoryExtensions;AddTraceSource;(Microsoft.Extensions.Logging.ILoggerFactory,System.String);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Logging;TraceSourceFactoryExtensions;AddTraceSource;(Microsoft.Extensions.Logging.ILoggerFactory,System.String,System.Diagnostics.TraceListener);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Logging;TraceSourceFactoryExtensions;AddTraceSource;(Microsoft.Extensions.Logging.ILoggingBuilder,System.Diagnostics.SourceSwitch);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Logging;TraceSourceFactoryExtensions;AddTraceSource;(Microsoft.Extensions.Logging.ILoggingBuilder,System.Diagnostics.SourceSwitch,System.Diagnostics.TraceListener);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Logging;TraceSourceFactoryExtensions;AddTraceSource;(Microsoft.Extensions.Logging.ILoggingBuilder,System.String);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Logging;TraceSourceFactoryExtensions;AddTraceSource;(Microsoft.Extensions.Logging.ILoggingBuilder,System.String,System.Diagnostics.TraceListener);Argument[0];ReturnValue;value;dfc-generated |
 | Microsoft.Extensions.Options;ConfigurationChangeTokenSource<TOptions>;ConfigurationChangeTokenSource;(System.String,Microsoft.Extensions.Configuration.IConfiguration);Argument[1];Argument[this];taint;df-generated |
 | Microsoft.Extensions.Options;ConfigurationChangeTokenSource<TOptions>;GetChangeToken;();Argument[this];ReturnValue;taint;df-generated |
+| Microsoft.Extensions.Options;ConfigureNamedOptions<TOptions,TDep1,TDep2,TDep3,TDep4,TDep5>;Configure;(System.String,TOptions);Argument[1];Argument[this];taint;df-generated |
+| Microsoft.Extensions.Options;ConfigureNamedOptions<TOptions,TDep1,TDep2,TDep3,TDep4,TDep5>;Configure;(TOptions);Argument[0];Argument[this];taint;df-generated |
 | Microsoft.Extensions.Options;ConfigureNamedOptions<TOptions,TDep1,TDep2,TDep3,TDep4,TDep5>;ConfigureNamedOptions;(System.String,TDep1,TDep2,TDep3,TDep4,TDep5,System.Action<TOptions,TDep1,TDep2,TDep3,TDep4,TDep5>);Argument[6];Argument[6].Parameter[delegate-self];value;hq-generated |
+| Microsoft.Extensions.Options;ConfigureNamedOptions<TOptions,TDep1,TDep2,TDep3,TDep4>;Configure;(System.String,TOptions);Argument[1];Argument[this];taint;df-generated |
+| Microsoft.Extensions.Options;ConfigureNamedOptions<TOptions,TDep1,TDep2,TDep3,TDep4>;Configure;(TOptions);Argument[0];Argument[this];taint;df-generated |
 | Microsoft.Extensions.Options;ConfigureNamedOptions<TOptions,TDep1,TDep2,TDep3,TDep4>;ConfigureNamedOptions;(System.String,TDep1,TDep2,TDep3,TDep4,System.Action<TOptions,TDep1,TDep2,TDep3,TDep4>);Argument[5];Argument[5].Parameter[delegate-self];value;hq-generated |
+| Microsoft.Extensions.Options;ConfigureNamedOptions<TOptions,TDep1,TDep2,TDep3>;Configure;(System.String,TOptions);Argument[1];Argument[this];taint;df-generated |
+| Microsoft.Extensions.Options;ConfigureNamedOptions<TOptions,TDep1,TDep2,TDep3>;Configure;(TOptions);Argument[0];Argument[this];taint;df-generated |
 | Microsoft.Extensions.Options;ConfigureNamedOptions<TOptions,TDep1,TDep2,TDep3>;ConfigureNamedOptions;(System.String,TDep1,TDep2,TDep3,System.Action<TOptions,TDep1,TDep2,TDep3>);Argument[4];Argument[4].Parameter[delegate-self];value;hq-generated |
+| Microsoft.Extensions.Options;ConfigureNamedOptions<TOptions,TDep1,TDep2>;Configure;(System.String,TOptions);Argument[1];Argument[this];taint;df-generated |
+| Microsoft.Extensions.Options;ConfigureNamedOptions<TOptions,TDep1,TDep2>;Configure;(TOptions);Argument[0];Argument[this];taint;df-generated |
 | Microsoft.Extensions.Options;ConfigureNamedOptions<TOptions,TDep1,TDep2>;ConfigureNamedOptions;(System.String,TDep1,TDep2,System.Action<TOptions,TDep1,TDep2>);Argument[3];Argument[3].Parameter[delegate-self];value;hq-generated |
+| Microsoft.Extensions.Options;ConfigureNamedOptions<TOptions,TDep>;Configure;(System.String,TOptions);Argument[1];Argument[this];taint;df-generated |
+| Microsoft.Extensions.Options;ConfigureNamedOptions<TOptions,TDep>;Configure;(TOptions);Argument[0];Argument[this];taint;df-generated |
 | Microsoft.Extensions.Options;ConfigureNamedOptions<TOptions,TDep>;ConfigureNamedOptions;(System.String,TDep,System.Action<TOptions,TDep>);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
+| Microsoft.Extensions.Options;ConfigureNamedOptions<TOptions>;Configure;(System.String,TOptions);Argument[1];Argument[this];taint;df-generated |
+| Microsoft.Extensions.Options;ConfigureNamedOptions<TOptions>;Configure;(TOptions);Argument[0];Argument[this];taint;df-generated |
 | Microsoft.Extensions.Options;ConfigureNamedOptions<TOptions>;ConfigureNamedOptions;(System.String,System.Action<TOptions>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
+| Microsoft.Extensions.Options;ConfigureOptions<TOptions>;Configure;(TOptions);Argument[0];Argument[this];taint;df-generated |
 | Microsoft.Extensions.Options;ConfigureOptions<TOptions>;ConfigureOptions;(System.Action<TOptions>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | Microsoft.Extensions.Options;IOptionsMonitor<TOptions>;OnChange;(System.Action<TOptions,System.String>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | Microsoft.Extensions.Options;IOptionsMonitorCache<TOptions>;GetOrAdd;(System.String,System.Func<TOptions>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
 | Microsoft.Extensions.Options;NamedConfigureFromConfigurationOptions<TOptions>;NamedConfigureFromConfigurationOptions;(System.String,Microsoft.Extensions.Configuration.IConfiguration,System.Action<Microsoft.Extensions.Configuration.BinderOptions>);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
+| Microsoft.Extensions.Options;OptionsBuilder<TOptions>;Configure;(System.Action<TOptions>);Argument[0];Argument[0].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.Options;OptionsBuilder<TOptions>;Configure;(System.Action<TOptions>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
+| Microsoft.Extensions.Options;OptionsBuilder<TOptions>;Configure;(System.Action<TOptions>);Argument[this];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Options;OptionsBuilder<TOptions>;Configure;(System.Action<TOptions>);Argument[this];ReturnValue;value;hq-generated |
+| Microsoft.Extensions.Options;OptionsBuilder<TOptions>;Configure<TDep1,TDep2,TDep3,TDep4,TDep5>;(System.Action<TOptions,TDep1,TDep2,TDep3,TDep4,TDep5>);Argument[0];Argument[0].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.Options;OptionsBuilder<TOptions>;Configure<TDep1,TDep2,TDep3,TDep4,TDep5>;(System.Action<TOptions,TDep1,TDep2,TDep3,TDep4,TDep5>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
+| Microsoft.Extensions.Options;OptionsBuilder<TOptions>;Configure<TDep1,TDep2,TDep3,TDep4,TDep5>;(System.Action<TOptions,TDep1,TDep2,TDep3,TDep4,TDep5>);Argument[this];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Options;OptionsBuilder<TOptions>;Configure<TDep1,TDep2,TDep3,TDep4,TDep5>;(System.Action<TOptions,TDep1,TDep2,TDep3,TDep4,TDep5>);Argument[this];ReturnValue;value;hq-generated |
+| Microsoft.Extensions.Options;OptionsBuilder<TOptions>;Configure<TDep1,TDep2,TDep3,TDep4>;(System.Action<TOptions,TDep1,TDep2,TDep3,TDep4>);Argument[0];Argument[0].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.Options;OptionsBuilder<TOptions>;Configure<TDep1,TDep2,TDep3,TDep4>;(System.Action<TOptions,TDep1,TDep2,TDep3,TDep4>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
+| Microsoft.Extensions.Options;OptionsBuilder<TOptions>;Configure<TDep1,TDep2,TDep3,TDep4>;(System.Action<TOptions,TDep1,TDep2,TDep3,TDep4>);Argument[this];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Options;OptionsBuilder<TOptions>;Configure<TDep1,TDep2,TDep3,TDep4>;(System.Action<TOptions,TDep1,TDep2,TDep3,TDep4>);Argument[this];ReturnValue;value;hq-generated |
+| Microsoft.Extensions.Options;OptionsBuilder<TOptions>;Configure<TDep1,TDep2,TDep3>;(System.Action<TOptions,TDep1,TDep2,TDep3>);Argument[0];Argument[0].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.Options;OptionsBuilder<TOptions>;Configure<TDep1,TDep2,TDep3>;(System.Action<TOptions,TDep1,TDep2,TDep3>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
+| Microsoft.Extensions.Options;OptionsBuilder<TOptions>;Configure<TDep1,TDep2,TDep3>;(System.Action<TOptions,TDep1,TDep2,TDep3>);Argument[this];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Options;OptionsBuilder<TOptions>;Configure<TDep1,TDep2,TDep3>;(System.Action<TOptions,TDep1,TDep2,TDep3>);Argument[this];ReturnValue;value;hq-generated |
+| Microsoft.Extensions.Options;OptionsBuilder<TOptions>;Configure<TDep1,TDep2>;(System.Action<TOptions,TDep1,TDep2>);Argument[0];Argument[0].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.Options;OptionsBuilder<TOptions>;Configure<TDep1,TDep2>;(System.Action<TOptions,TDep1,TDep2>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
+| Microsoft.Extensions.Options;OptionsBuilder<TOptions>;Configure<TDep1,TDep2>;(System.Action<TOptions,TDep1,TDep2>);Argument[this];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Options;OptionsBuilder<TOptions>;Configure<TDep1,TDep2>;(System.Action<TOptions,TDep1,TDep2>);Argument[this];ReturnValue;value;hq-generated |
+| Microsoft.Extensions.Options;OptionsBuilder<TOptions>;Configure<TDep>;(System.Action<TOptions,TDep>);Argument[0];Argument[0].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.Options;OptionsBuilder<TOptions>;Configure<TDep>;(System.Action<TOptions,TDep>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
+| Microsoft.Extensions.Options;OptionsBuilder<TOptions>;Configure<TDep>;(System.Action<TOptions,TDep>);Argument[this];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Options;OptionsBuilder<TOptions>;Configure<TDep>;(System.Action<TOptions,TDep>);Argument[this];ReturnValue;value;hq-generated |
+| Microsoft.Extensions.Options;OptionsBuilder<TOptions>;PostConfigure;(System.Action<TOptions>);Argument[0];Argument[0].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.Options;OptionsBuilder<TOptions>;PostConfigure;(System.Action<TOptions>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
+| Microsoft.Extensions.Options;OptionsBuilder<TOptions>;PostConfigure;(System.Action<TOptions>);Argument[this];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Options;OptionsBuilder<TOptions>;PostConfigure;(System.Action<TOptions>);Argument[this];ReturnValue;value;hq-generated |
+| Microsoft.Extensions.Options;OptionsBuilder<TOptions>;PostConfigure<TDep1,TDep2,TDep3,TDep4,TDep5>;(System.Action<TOptions,TDep1,TDep2,TDep3,TDep4,TDep5>);Argument[0];Argument[0].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.Options;OptionsBuilder<TOptions>;PostConfigure<TDep1,TDep2,TDep3,TDep4,TDep5>;(System.Action<TOptions,TDep1,TDep2,TDep3,TDep4,TDep5>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
+| Microsoft.Extensions.Options;OptionsBuilder<TOptions>;PostConfigure<TDep1,TDep2,TDep3,TDep4,TDep5>;(System.Action<TOptions,TDep1,TDep2,TDep3,TDep4,TDep5>);Argument[this];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Options;OptionsBuilder<TOptions>;PostConfigure<TDep1,TDep2,TDep3,TDep4,TDep5>;(System.Action<TOptions,TDep1,TDep2,TDep3,TDep4,TDep5>);Argument[this];ReturnValue;value;hq-generated |
+| Microsoft.Extensions.Options;OptionsBuilder<TOptions>;PostConfigure<TDep1,TDep2,TDep3,TDep4>;(System.Action<TOptions,TDep1,TDep2,TDep3,TDep4>);Argument[0];Argument[0].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.Options;OptionsBuilder<TOptions>;PostConfigure<TDep1,TDep2,TDep3,TDep4>;(System.Action<TOptions,TDep1,TDep2,TDep3,TDep4>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
+| Microsoft.Extensions.Options;OptionsBuilder<TOptions>;PostConfigure<TDep1,TDep2,TDep3,TDep4>;(System.Action<TOptions,TDep1,TDep2,TDep3,TDep4>);Argument[this];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Options;OptionsBuilder<TOptions>;PostConfigure<TDep1,TDep2,TDep3,TDep4>;(System.Action<TOptions,TDep1,TDep2,TDep3,TDep4>);Argument[this];ReturnValue;value;hq-generated |
+| Microsoft.Extensions.Options;OptionsBuilder<TOptions>;PostConfigure<TDep1,TDep2,TDep3>;(System.Action<TOptions,TDep1,TDep2,TDep3>);Argument[0];Argument[0].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.Options;OptionsBuilder<TOptions>;PostConfigure<TDep1,TDep2,TDep3>;(System.Action<TOptions,TDep1,TDep2,TDep3>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
+| Microsoft.Extensions.Options;OptionsBuilder<TOptions>;PostConfigure<TDep1,TDep2,TDep3>;(System.Action<TOptions,TDep1,TDep2,TDep3>);Argument[this];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Options;OptionsBuilder<TOptions>;PostConfigure<TDep1,TDep2,TDep3>;(System.Action<TOptions,TDep1,TDep2,TDep3>);Argument[this];ReturnValue;value;hq-generated |
+| Microsoft.Extensions.Options;OptionsBuilder<TOptions>;PostConfigure<TDep1,TDep2>;(System.Action<TOptions,TDep1,TDep2>);Argument[0];Argument[0].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.Options;OptionsBuilder<TOptions>;PostConfigure<TDep1,TDep2>;(System.Action<TOptions,TDep1,TDep2>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
+| Microsoft.Extensions.Options;OptionsBuilder<TOptions>;PostConfigure<TDep1,TDep2>;(System.Action<TOptions,TDep1,TDep2>);Argument[this];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Options;OptionsBuilder<TOptions>;PostConfigure<TDep1,TDep2>;(System.Action<TOptions,TDep1,TDep2>);Argument[this];ReturnValue;value;hq-generated |
+| Microsoft.Extensions.Options;OptionsBuilder<TOptions>;PostConfigure<TDep>;(System.Action<TOptions,TDep>);Argument[0];Argument[0].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.Options;OptionsBuilder<TOptions>;PostConfigure<TDep>;(System.Action<TOptions,TDep>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
+| Microsoft.Extensions.Options;OptionsBuilder<TOptions>;PostConfigure<TDep>;(System.Action<TOptions,TDep>);Argument[this];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Options;OptionsBuilder<TOptions>;PostConfigure<TDep>;(System.Action<TOptions,TDep>);Argument[this];ReturnValue;value;hq-generated |
+| Microsoft.Extensions.Options;OptionsBuilder<TOptions>;Validate;(System.Func<TOptions,System.Boolean>);Argument[0];Argument[0].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.Options;OptionsBuilder<TOptions>;Validate;(System.Func<TOptions,System.Boolean>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
+| Microsoft.Extensions.Options;OptionsBuilder<TOptions>;Validate;(System.Func<TOptions,System.Boolean>);Argument[this];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Options;OptionsBuilder<TOptions>;Validate;(System.Func<TOptions,System.Boolean>);Argument[this];ReturnValue;value;hq-generated |
+| Microsoft.Extensions.Options;OptionsBuilder<TOptions>;Validate;(System.Func<TOptions,System.Boolean>,System.String);Argument[0];Argument[0].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.Options;OptionsBuilder<TOptions>;Validate;(System.Func<TOptions,System.Boolean>,System.String);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
+| Microsoft.Extensions.Options;OptionsBuilder<TOptions>;Validate;(System.Func<TOptions,System.Boolean>,System.String);Argument[this];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Options;OptionsBuilder<TOptions>;Validate;(System.Func<TOptions,System.Boolean>,System.String);Argument[this];ReturnValue;value;hq-generated |
+| Microsoft.Extensions.Options;OptionsBuilder<TOptions>;Validate<TDep1,TDep2,TDep3,TDep4,TDep5>;(System.Func<TOptions,TDep1,TDep2,TDep3,TDep4,TDep5,System.Boolean>);Argument[0];Argument[0].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.Options;OptionsBuilder<TOptions>;Validate<TDep1,TDep2,TDep3,TDep4,TDep5>;(System.Func<TOptions,TDep1,TDep2,TDep3,TDep4,TDep5,System.Boolean>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
+| Microsoft.Extensions.Options;OptionsBuilder<TOptions>;Validate<TDep1,TDep2,TDep3,TDep4,TDep5>;(System.Func<TOptions,TDep1,TDep2,TDep3,TDep4,TDep5,System.Boolean>);Argument[this];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Options;OptionsBuilder<TOptions>;Validate<TDep1,TDep2,TDep3,TDep4,TDep5>;(System.Func<TOptions,TDep1,TDep2,TDep3,TDep4,TDep5,System.Boolean>);Argument[this];ReturnValue;value;hq-generated |
+| Microsoft.Extensions.Options;OptionsBuilder<TOptions>;Validate<TDep1,TDep2,TDep3,TDep4,TDep5>;(System.Func<TOptions,TDep1,TDep2,TDep3,TDep4,TDep5,System.Boolean>,System.String);Argument[0];Argument[0].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.Options;OptionsBuilder<TOptions>;Validate<TDep1,TDep2,TDep3,TDep4,TDep5>;(System.Func<TOptions,TDep1,TDep2,TDep3,TDep4,TDep5,System.Boolean>,System.String);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
+| Microsoft.Extensions.Options;OptionsBuilder<TOptions>;Validate<TDep1,TDep2,TDep3,TDep4,TDep5>;(System.Func<TOptions,TDep1,TDep2,TDep3,TDep4,TDep5,System.Boolean>,System.String);Argument[this];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Options;OptionsBuilder<TOptions>;Validate<TDep1,TDep2,TDep3,TDep4,TDep5>;(System.Func<TOptions,TDep1,TDep2,TDep3,TDep4,TDep5,System.Boolean>,System.String);Argument[this];ReturnValue;value;hq-generated |
+| Microsoft.Extensions.Options;OptionsBuilder<TOptions>;Validate<TDep1,TDep2,TDep3,TDep4>;(System.Func<TOptions,TDep1,TDep2,TDep3,TDep4,System.Boolean>);Argument[0];Argument[0].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.Options;OptionsBuilder<TOptions>;Validate<TDep1,TDep2,TDep3,TDep4>;(System.Func<TOptions,TDep1,TDep2,TDep3,TDep4,System.Boolean>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
+| Microsoft.Extensions.Options;OptionsBuilder<TOptions>;Validate<TDep1,TDep2,TDep3,TDep4>;(System.Func<TOptions,TDep1,TDep2,TDep3,TDep4,System.Boolean>);Argument[this];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Options;OptionsBuilder<TOptions>;Validate<TDep1,TDep2,TDep3,TDep4>;(System.Func<TOptions,TDep1,TDep2,TDep3,TDep4,System.Boolean>);Argument[this];ReturnValue;value;hq-generated |
+| Microsoft.Extensions.Options;OptionsBuilder<TOptions>;Validate<TDep1,TDep2,TDep3,TDep4>;(System.Func<TOptions,TDep1,TDep2,TDep3,TDep4,System.Boolean>,System.String);Argument[0];Argument[0].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.Options;OptionsBuilder<TOptions>;Validate<TDep1,TDep2,TDep3,TDep4>;(System.Func<TOptions,TDep1,TDep2,TDep3,TDep4,System.Boolean>,System.String);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
+| Microsoft.Extensions.Options;OptionsBuilder<TOptions>;Validate<TDep1,TDep2,TDep3,TDep4>;(System.Func<TOptions,TDep1,TDep2,TDep3,TDep4,System.Boolean>,System.String);Argument[this];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Options;OptionsBuilder<TOptions>;Validate<TDep1,TDep2,TDep3,TDep4>;(System.Func<TOptions,TDep1,TDep2,TDep3,TDep4,System.Boolean>,System.String);Argument[this];ReturnValue;value;hq-generated |
+| Microsoft.Extensions.Options;OptionsBuilder<TOptions>;Validate<TDep1,TDep2,TDep3>;(System.Func<TOptions,TDep1,TDep2,TDep3,System.Boolean>);Argument[0];Argument[0].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.Options;OptionsBuilder<TOptions>;Validate<TDep1,TDep2,TDep3>;(System.Func<TOptions,TDep1,TDep2,TDep3,System.Boolean>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
+| Microsoft.Extensions.Options;OptionsBuilder<TOptions>;Validate<TDep1,TDep2,TDep3>;(System.Func<TOptions,TDep1,TDep2,TDep3,System.Boolean>);Argument[this];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Options;OptionsBuilder<TOptions>;Validate<TDep1,TDep2,TDep3>;(System.Func<TOptions,TDep1,TDep2,TDep3,System.Boolean>);Argument[this];ReturnValue;value;hq-generated |
+| Microsoft.Extensions.Options;OptionsBuilder<TOptions>;Validate<TDep1,TDep2,TDep3>;(System.Func<TOptions,TDep1,TDep2,TDep3,System.Boolean>,System.String);Argument[0];Argument[0].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.Options;OptionsBuilder<TOptions>;Validate<TDep1,TDep2,TDep3>;(System.Func<TOptions,TDep1,TDep2,TDep3,System.Boolean>,System.String);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
+| Microsoft.Extensions.Options;OptionsBuilder<TOptions>;Validate<TDep1,TDep2,TDep3>;(System.Func<TOptions,TDep1,TDep2,TDep3,System.Boolean>,System.String);Argument[this];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Options;OptionsBuilder<TOptions>;Validate<TDep1,TDep2,TDep3>;(System.Func<TOptions,TDep1,TDep2,TDep3,System.Boolean>,System.String);Argument[this];ReturnValue;value;hq-generated |
+| Microsoft.Extensions.Options;OptionsBuilder<TOptions>;Validate<TDep1,TDep2>;(System.Func<TOptions,TDep1,TDep2,System.Boolean>);Argument[0];Argument[0].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.Options;OptionsBuilder<TOptions>;Validate<TDep1,TDep2>;(System.Func<TOptions,TDep1,TDep2,System.Boolean>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
+| Microsoft.Extensions.Options;OptionsBuilder<TOptions>;Validate<TDep1,TDep2>;(System.Func<TOptions,TDep1,TDep2,System.Boolean>);Argument[this];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Options;OptionsBuilder<TOptions>;Validate<TDep1,TDep2>;(System.Func<TOptions,TDep1,TDep2,System.Boolean>);Argument[this];ReturnValue;value;hq-generated |
+| Microsoft.Extensions.Options;OptionsBuilder<TOptions>;Validate<TDep1,TDep2>;(System.Func<TOptions,TDep1,TDep2,System.Boolean>,System.String);Argument[0];Argument[0].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.Options;OptionsBuilder<TOptions>;Validate<TDep1,TDep2>;(System.Func<TOptions,TDep1,TDep2,System.Boolean>,System.String);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
+| Microsoft.Extensions.Options;OptionsBuilder<TOptions>;Validate<TDep1,TDep2>;(System.Func<TOptions,TDep1,TDep2,System.Boolean>,System.String);Argument[this];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Options;OptionsBuilder<TOptions>;Validate<TDep1,TDep2>;(System.Func<TOptions,TDep1,TDep2,System.Boolean>,System.String);Argument[this];ReturnValue;value;hq-generated |
+| Microsoft.Extensions.Options;OptionsBuilder<TOptions>;Validate<TDep>;(System.Func<TOptions,TDep,System.Boolean>);Argument[0];Argument[0].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.Options;OptionsBuilder<TOptions>;Validate<TDep>;(System.Func<TOptions,TDep,System.Boolean>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
+| Microsoft.Extensions.Options;OptionsBuilder<TOptions>;Validate<TDep>;(System.Func<TOptions,TDep,System.Boolean>);Argument[this];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Options;OptionsBuilder<TOptions>;Validate<TDep>;(System.Func<TOptions,TDep,System.Boolean>);Argument[this];ReturnValue;value;hq-generated |
+| Microsoft.Extensions.Options;OptionsBuilder<TOptions>;Validate<TDep>;(System.Func<TOptions,TDep,System.Boolean>,System.String);Argument[0];Argument[0].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.Options;OptionsBuilder<TOptions>;Validate<TDep>;(System.Func<TOptions,TDep,System.Boolean>,System.String);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
+| Microsoft.Extensions.Options;OptionsBuilder<TOptions>;Validate<TDep>;(System.Func<TOptions,TDep,System.Boolean>,System.String);Argument[this];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Options;OptionsBuilder<TOptions>;Validate<TDep>;(System.Func<TOptions,TDep,System.Boolean>,System.String);Argument[this];ReturnValue;value;hq-generated |
 | Microsoft.Extensions.Options;OptionsFactory<TOptions>;OptionsFactory;(System.Collections.Generic.IEnumerable<Microsoft.Extensions.Options.IConfigureOptions<TOptions>>,System.Collections.Generic.IEnumerable<Microsoft.Extensions.Options.IPostConfigureOptions<TOptions>>,System.Collections.Generic.IEnumerable<Microsoft.Extensions.Options.IValidateOptions<TOptions>>);Argument[0].Element;Argument[this];taint;df-generated |
 | Microsoft.Extensions.Options;OptionsFactory<TOptions>;OptionsFactory;(System.Collections.Generic.IEnumerable<Microsoft.Extensions.Options.IConfigureOptions<TOptions>>,System.Collections.Generic.IEnumerable<Microsoft.Extensions.Options.IPostConfigureOptions<TOptions>>,System.Collections.Generic.IEnumerable<Microsoft.Extensions.Options.IValidateOptions<TOptions>>);Argument[1].Element;Argument[this];taint;df-generated |
 | Microsoft.Extensions.Options;OptionsFactory<TOptions>;OptionsFactory;(System.Collections.Generic.IEnumerable<Microsoft.Extensions.Options.IConfigureOptions<TOptions>>,System.Collections.Generic.IEnumerable<Microsoft.Extensions.Options.IPostConfigureOptions<TOptions>>,System.Collections.Generic.IEnumerable<Microsoft.Extensions.Options.IValidateOptions<TOptions>>);Argument[2].Element;Argument[this];taint;df-generated |
@@ -1434,18 +1870,36 @@
 | Microsoft.Extensions.Options;OptionsMonitor<TOptions>;OptionsMonitor;(Microsoft.Extensions.Options.IOptionsFactory<TOptions>,System.Collections.Generic.IEnumerable<Microsoft.Extensions.Options.IOptionsChangeTokenSource<TOptions>>,Microsoft.Extensions.Options.IOptionsMonitorCache<TOptions>);Argument[0];Argument[this];taint;df-generated |
 | Microsoft.Extensions.Options;OptionsMonitor<TOptions>;OptionsMonitor;(Microsoft.Extensions.Options.IOptionsFactory<TOptions>,System.Collections.Generic.IEnumerable<Microsoft.Extensions.Options.IOptionsChangeTokenSource<TOptions>>,Microsoft.Extensions.Options.IOptionsMonitorCache<TOptions>);Argument[2];Argument[this];taint;df-generated |
 | Microsoft.Extensions.Options;OptionsMonitorExtensions;OnChange<TOptions>;(Microsoft.Extensions.Options.IOptionsMonitor<TOptions>,System.Action<TOptions>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
-| Microsoft.Extensions.Options;OptionsValidationException;get_Message;();Argument[this];ReturnValue;taint;df-generated |
+| Microsoft.Extensions.Options;OptionsValidationException;get_Message;();Argument[this].Property[Microsoft.Extensions.Options.OptionsValidationException.Failures].Element;ReturnValue;taint;dfc-generated |
+| Microsoft.Extensions.Options;OptionsValidationException;get_Message;();Argument[this].SyntheticField[System.Exception._message];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Options;PostConfigureOptions<TOptions,TDep1,TDep2,TDep3,TDep4,TDep5>;PostConfigure;(System.String,TOptions);Argument[1];Argument[this];taint;df-generated |
+| Microsoft.Extensions.Options;PostConfigureOptions<TOptions,TDep1,TDep2,TDep3,TDep4,TDep5>;PostConfigure;(TOptions);Argument[0];Argument[this];taint;df-generated |
 | Microsoft.Extensions.Options;PostConfigureOptions<TOptions,TDep1,TDep2,TDep3,TDep4,TDep5>;PostConfigureOptions;(System.String,TDep1,TDep2,TDep3,TDep4,TDep5,System.Action<TOptions,TDep1,TDep2,TDep3,TDep4,TDep5>);Argument[6];Argument[6].Parameter[delegate-self];value;hq-generated |
+| Microsoft.Extensions.Options;PostConfigureOptions<TOptions,TDep1,TDep2,TDep3,TDep4>;PostConfigure;(System.String,TOptions);Argument[1];Argument[this];taint;df-generated |
+| Microsoft.Extensions.Options;PostConfigureOptions<TOptions,TDep1,TDep2,TDep3,TDep4>;PostConfigure;(TOptions);Argument[0];Argument[this];taint;df-generated |
 | Microsoft.Extensions.Options;PostConfigureOptions<TOptions,TDep1,TDep2,TDep3,TDep4>;PostConfigureOptions;(System.String,TDep1,TDep2,TDep3,TDep4,System.Action<TOptions,TDep1,TDep2,TDep3,TDep4>);Argument[5];Argument[5].Parameter[delegate-self];value;hq-generated |
+| Microsoft.Extensions.Options;PostConfigureOptions<TOptions,TDep1,TDep2,TDep3>;PostConfigure;(System.String,TOptions);Argument[1];Argument[this];taint;df-generated |
+| Microsoft.Extensions.Options;PostConfigureOptions<TOptions,TDep1,TDep2,TDep3>;PostConfigure;(TOptions);Argument[0];Argument[this];taint;df-generated |
 | Microsoft.Extensions.Options;PostConfigureOptions<TOptions,TDep1,TDep2,TDep3>;PostConfigureOptions;(System.String,TDep1,TDep2,TDep3,System.Action<TOptions,TDep1,TDep2,TDep3>);Argument[4];Argument[4].Parameter[delegate-self];value;hq-generated |
+| Microsoft.Extensions.Options;PostConfigureOptions<TOptions,TDep1,TDep2>;PostConfigure;(System.String,TOptions);Argument[1];Argument[this];taint;df-generated |
+| Microsoft.Extensions.Options;PostConfigureOptions<TOptions,TDep1,TDep2>;PostConfigure;(TOptions);Argument[0];Argument[this];taint;df-generated |
 | Microsoft.Extensions.Options;PostConfigureOptions<TOptions,TDep1,TDep2>;PostConfigureOptions;(System.String,TDep1,TDep2,System.Action<TOptions,TDep1,TDep2>);Argument[3];Argument[3].Parameter[delegate-self];value;hq-generated |
+| Microsoft.Extensions.Options;PostConfigureOptions<TOptions,TDep>;PostConfigure;(System.String,TOptions);Argument[1];Argument[this];taint;df-generated |
+| Microsoft.Extensions.Options;PostConfigureOptions<TOptions,TDep>;PostConfigure;(TOptions);Argument[0];Argument[this];taint;df-generated |
 | Microsoft.Extensions.Options;PostConfigureOptions<TOptions,TDep>;PostConfigureOptions;(System.String,TDep,System.Action<TOptions,TDep>);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
+| Microsoft.Extensions.Options;PostConfigureOptions<TOptions>;PostConfigure;(System.String,TOptions);Argument[1];Argument[this];taint;df-generated |
 | Microsoft.Extensions.Options;PostConfigureOptions<TOptions>;PostConfigureOptions;(System.String,System.Action<TOptions>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
+| Microsoft.Extensions.Options;ValidateOptions<TOptions,TDep1,TDep2,TDep3,TDep4,TDep5>;Validate;(System.String,TOptions);Argument[1];Argument[this];taint;df-generated |
 | Microsoft.Extensions.Options;ValidateOptions<TOptions,TDep1,TDep2,TDep3,TDep4,TDep5>;ValidateOptions;(System.String,TDep1,TDep2,TDep3,TDep4,TDep5,System.Func<TOptions,TDep1,TDep2,TDep3,TDep4,TDep5,System.Boolean>,System.String);Argument[6];Argument[6].Parameter[delegate-self];value;hq-generated |
+| Microsoft.Extensions.Options;ValidateOptions<TOptions,TDep1,TDep2,TDep3,TDep4>;Validate;(System.String,TOptions);Argument[1];Argument[this];taint;df-generated |
 | Microsoft.Extensions.Options;ValidateOptions<TOptions,TDep1,TDep2,TDep3,TDep4>;ValidateOptions;(System.String,TDep1,TDep2,TDep3,TDep4,System.Func<TOptions,TDep1,TDep2,TDep3,TDep4,System.Boolean>,System.String);Argument[5];Argument[5].Parameter[delegate-self];value;hq-generated |
+| Microsoft.Extensions.Options;ValidateOptions<TOptions,TDep1,TDep2,TDep3>;Validate;(System.String,TOptions);Argument[1];Argument[this];taint;df-generated |
 | Microsoft.Extensions.Options;ValidateOptions<TOptions,TDep1,TDep2,TDep3>;ValidateOptions;(System.String,TDep1,TDep2,TDep3,System.Func<TOptions,TDep1,TDep2,TDep3,System.Boolean>,System.String);Argument[4];Argument[4].Parameter[delegate-self];value;hq-generated |
+| Microsoft.Extensions.Options;ValidateOptions<TOptions,TDep1,TDep2>;Validate;(System.String,TOptions);Argument[1];Argument[this];taint;df-generated |
 | Microsoft.Extensions.Options;ValidateOptions<TOptions,TDep1,TDep2>;ValidateOptions;(System.String,TDep1,TDep2,System.Func<TOptions,TDep1,TDep2,System.Boolean>,System.String);Argument[3];Argument[3].Parameter[delegate-self];value;hq-generated |
+| Microsoft.Extensions.Options;ValidateOptions<TOptions,TDep>;Validate;(System.String,TOptions);Argument[1];Argument[this];taint;df-generated |
 | Microsoft.Extensions.Options;ValidateOptions<TOptions,TDep>;ValidateOptions;(System.String,TDep,System.Func<TOptions,TDep,System.Boolean>,System.String);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
+| Microsoft.Extensions.Options;ValidateOptions<TOptions>;Validate;(System.String,TOptions);Argument[1];Argument[this];taint;df-generated |
 | Microsoft.Extensions.Options;ValidateOptions<TOptions>;ValidateOptions;(System.String,System.Func<TOptions,System.Boolean>,System.String);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
 | Microsoft.Extensions.Options;ValidateOptionsResultBuilder;AddError;(System.String,System.String);Argument[0];Argument[this];taint;df-generated |
 | Microsoft.Extensions.Options;ValidateOptionsResultBuilder;AddError;(System.String,System.String);Argument[1];Argument[this];taint;df-generated |
@@ -1457,23 +1911,27 @@
 | Microsoft.Extensions.Primitives;ChangeToken;OnChange;(System.Func<Microsoft.Extensions.Primitives.IChangeToken>,System.Action);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
 | Microsoft.Extensions.Primitives;ChangeToken;OnChange<TState>;(System.Func<Microsoft.Extensions.Primitives.IChangeToken>,System.Action<TState>,TState);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | Microsoft.Extensions.Primitives;ChangeToken;OnChange<TState>;(System.Func<Microsoft.Extensions.Primitives.IChangeToken>,System.Action<TState>,TState);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
-| Microsoft.Extensions.Primitives;Extensions;Append;(System.Text.StringBuilder,Microsoft.Extensions.Primitives.StringSegment);Argument[0];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Primitives;Extensions;Append;(System.Text.StringBuilder,Microsoft.Extensions.Primitives.StringSegment);Argument[1];Argument[0];taint;df-generated |
-| Microsoft.Extensions.Primitives;Extensions;Append;(System.Text.StringBuilder,Microsoft.Extensions.Primitives.StringSegment);Argument[1];ReturnValue;taint;df-generated |
+| Microsoft.Extensions.Primitives;Extensions;Append;(System.Text.StringBuilder,Microsoft.Extensions.Primitives.StringSegment);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Primitives;Extensions;Append;(System.Text.StringBuilder,Microsoft.Extensions.Primitives.StringSegment);Argument[1].Property[Microsoft.Extensions.Primitives.StringSegment.Buffer];Argument[0];taint;dfc-generated |
+| Microsoft.Extensions.Primitives;Extensions;Append;(System.Text.StringBuilder,Microsoft.Extensions.Primitives.StringSegment);Argument[1].Property[Microsoft.Extensions.Primitives.StringSegment.Buffer];ReturnValue;taint;dfc-generated |
+| Microsoft.Extensions.Primitives;IChangeToken;RegisterChangeCallback;(System.Action<System.Object>,System.Object);Argument[0];Argument[0].Parameter[delegate-self];value;dfc-generated |
 | Microsoft.Extensions.Primitives;IChangeToken;RegisterChangeCallback;(System.Action<System.Object>,System.Object);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
+| Microsoft.Extensions.Primitives;IChangeToken;RegisterChangeCallback;(System.Action<System.Object>,System.Object);Argument[this];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Primitives;IChangeToken;RegisterChangeCallback;(System.Action<System.Object>,System.Object);Argument[this];ReturnValue;value;hq-generated |
 | Microsoft.Extensions.Primitives;InplaceStringBuilder;ToString;();Argument[this];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Primitives;StringSegment;AsMemory;();Argument[this];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Primitives;StringSegment;Split;(System.Char[]);Argument[0].Element;ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Primitives;StringSegment;Split;(System.Char[]);Argument[this];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Primitives;StringSegment;Substring;(System.Int32);Argument[this];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Primitives;StringSegment;Substring;(System.Int32,System.Int32);Argument[this];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Primitives;StringSegment;ToString;();Argument[this];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Primitives;StringSegment;get_Value;();Argument[this];ReturnValue;taint;df-generated |
-| Microsoft.Extensions.Primitives;StringTokenizer+Enumerator;Enumerator;(Microsoft.Extensions.Primitives.StringTokenizer);Argument[0].Element;Argument[this];taint;df-generated |
+| Microsoft.Extensions.Primitives;StringSegment;Substring;(System.Int32);Argument[this].Property[Microsoft.Extensions.Primitives.StringSegment.Buffer];ReturnValue;taint;dfc-generated |
+| Microsoft.Extensions.Primitives;StringSegment;Substring;(System.Int32,System.Int32);Argument[this].Property[Microsoft.Extensions.Primitives.StringSegment.Buffer];ReturnValue;taint;dfc-generated |
+| Microsoft.Extensions.Primitives;StringSegment;ToString;();Argument[this].Property[Microsoft.Extensions.Primitives.StringSegment.Buffer];ReturnValue;taint;dfc-generated |
+| Microsoft.Extensions.Primitives;StringSegment;ToString;();Argument[this].Property[Microsoft.Extensions.Primitives.StringSegment.Value];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Primitives;StringSegment;get_Value;();Argument[this].Property[Microsoft.Extensions.Primitives.StringSegment.Buffer];ReturnValue;taint;dfc-generated |
+| Microsoft.Extensions.Primitives;StringTokenizer+Enumerator;Enumerator;(Microsoft.Extensions.Primitives.StringTokenizer);Argument[0];ReturnValue;value;dfc-generated |
+| Microsoft.Extensions.Primitives;StringTokenizer+Enumerator;get_Current;();Argument[this].Property[Microsoft.Extensions.Primitives.StringTokenizer+Enumerator.Current];ReturnValue;value;df-generated |
+| Microsoft.Extensions.Primitives;StringTokenizer+Enumerator;get_Current;();Argument[this].Property[Microsoft.Extensions.Primitives.StringTokenizer+Enumerator.Current];ReturnValue;value;dfc-generated |
 | Microsoft.Extensions.Primitives;StringTokenizer;GetEnumerator;();Argument[this];ReturnValue;taint;df-generated |
 | Microsoft.Extensions.Primitives;StringTokenizer;StringTokenizer;(Microsoft.Extensions.Primitives.StringSegment,System.Char[]);Argument[0];Argument[this];taint;df-generated |
 | Microsoft.Extensions.Primitives;StringTokenizer;StringTokenizer;(Microsoft.Extensions.Primitives.StringSegment,System.Char[]);Argument[1].Element;Argument[this];taint;df-generated |
 | Microsoft.Extensions.Primitives;StringTokenizer;StringTokenizer;(System.String,System.Char[]);Argument[1].Element;Argument[this];taint;df-generated |
+| Microsoft.Extensions.Primitives;StringValues+Enumerator;Enumerator;(Microsoft.Extensions.Primitives.StringValues);Argument[0];ReturnValue;value;dfc-generated |
 | Microsoft.Extensions.Primitives;StringValues+Enumerator;get_Current;();Argument[this];ReturnValue;taint;df-generated |
 | Microsoft.Extensions.Primitives;StringValues;Add;(System.String);Argument[0];ReturnValue;taint;manual |
 | Microsoft.Extensions.Primitives;StringValues;Add;(System.String);Argument[this];ReturnValue;taint;manual |
@@ -1529,16 +1987,21 @@
 | Microsoft.Extensions.Primitives;StringValues;set_Item;(System.Int32,System.String);Argument[0];ReturnValue;taint;manual |
 | Microsoft.Extensions.Primitives;StringValues;set_Item;(System.Int32,System.String);Argument[1];ReturnValue;taint;manual |
 | Microsoft.Extensions.Primitives;StringValues;set_Item;(System.Int32,System.String);Argument[this];ReturnValue;taint;manual |
+| Microsoft.VisualBasic.CompilerServices;StringType;MidStmtStr;(System.String,System.Int32,System.Int32,System.String);Argument[0];ReturnValue;value;dfc-generated |
 | Microsoft.VisualBasic;Collection;Clear;();Argument[this].WithoutElement;Argument[this];value;manual |
 | Microsoft.VisualBasic;Collection;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.IEnumerator.Current];value;manual |
 | Microsoft.VisualBasic;Collection;get_Item;(System.Int32);Argument[this].Element;ReturnValue;value;manual |
 | Microsoft.VisualBasic;Collection;get_Item;(System.Object);Argument[this].Element;ReturnValue;value;manual |
 | Microsoft.VisualBasic;Collection;get_Item;(System.String);Argument[this].Element;ReturnValue;value;manual |
+| Microsoft.VisualBasic;FileSystem;FileGet;(System.Int32,System.Array,System.Int64,System.Boolean,System.Boolean);Argument[1];ReturnValue;value;dfc-generated |
+| Microsoft.VisualBasic;FileSystem;FileGet;(System.Int32,System.String,System.Int64,System.Boolean);Argument[1];ReturnValue;value;dfc-generated |
+| Microsoft.VisualBasic;FileSystem;FileGet;(System.Int32,System.ValueType,System.Int64);Argument[1];ReturnValue;value;dfc-generated |
+| Microsoft.VisualBasic;FileSystem;FileGetObject;(System.Int32,System.Object,System.Int64);Argument[1];ReturnValue;value;dfc-generated |
+| Microsoft.VisualBasic;FileSystem;Input;(System.Int32,System.Object);Argument[1];ReturnValue;value;dfc-generated |
+| Microsoft.VisualBasic;FileSystem;Input;(System.Int32,System.String);Argument[1];ReturnValue;value;dfc-generated |
 | Microsoft.VisualBasic;VBCodeProvider;VBCodeProvider;(System.Collections.Generic.IDictionary<System.String,System.String>);Argument[0].Element;Argument[this];taint;df-generated |
-| Microsoft.Win32.SafeHandles;SafeFileHandle;SafeFileHandle;(System.IntPtr,System.Boolean);Argument[0];Argument[this];taint;df-generated |
-| Microsoft.Win32.SafeHandles;SafePipeHandle;SafePipeHandle;(System.IntPtr,System.Boolean);Argument[0];Argument[this];taint;df-generated |
-| Microsoft.Win32.SafeHandles;SafeProcessHandle;SafeProcessHandle;(System.IntPtr,System.Boolean);Argument[0];Argument[this];taint;df-generated |
-| Microsoft.Win32.SafeHandles;SafeWaitHandle;SafeWaitHandle;(System.IntPtr,System.Boolean);Argument[0];Argument[this];taint;df-generated |
+| Microsoft.Win32.SafeHandles;SafeFileHandle;SafeFileHandle;(System.IntPtr,System.Boolean);Argument[0];Argument[this].Field[System.Runtime.InteropServices.SafeHandle.handle];value;dfc-generated |
+| Microsoft.Win32.SafeHandles;SafeWaitHandle;SafeWaitHandle;(System.IntPtr,System.Boolean);Argument[0];Argument[this].Field[System.Runtime.InteropServices.SafeHandle.handle];value;dfc-generated |
 | Microsoft.Win32;PowerModeChangedEventHandler;BeginInvoke;(System.Object,Microsoft.Win32.PowerModeChangedEventArgs,System.AsyncCallback,System.Object);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
 | Microsoft.Win32;SessionEndedEventHandler;BeginInvoke;(System.Object,Microsoft.Win32.SessionEndedEventArgs,System.AsyncCallback,System.Object);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
 | Microsoft.Win32;SessionEndingEventHandler;BeginInvoke;(System.Object,Microsoft.Win32.SessionEndingEventArgs,System.AsyncCallback,System.Object);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
@@ -3032,7 +3495,9 @@
 | ServiceStack.Text;TextConfig;set_CreateSha;(System.Func<System.Security.Cryptography.SHA1>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | ServiceStack.Text;TypeConfig<T>;set_OnDeserializing;(System.Func<System.Object,System.String,System.Object,System.Object>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | ServiceStack.Text;TypeSerializer;set_OnSerialize;(System.Action<System.Object>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
-| ServiceStack.Validation;ValidationError;get_Message;();Argument[this];ReturnValue;taint;df-generated |
+| ServiceStack.Validation;ValidationError;get_Message;();Argument[this].Property[System.Exception.Message];ReturnValue;value;dfc-generated |
+| ServiceStack.Validation;ValidationError;get_Message;();Argument[this].SyntheticField[System.ArgumentException._paramName];ReturnValue;taint;dfc-generated |
+| ServiceStack.Validation;ValidationError;get_Message;();Argument[this].SyntheticField[System.Exception._message];ReturnValue;value;dfc-generated |
 | ServiceStack.Validation;ValidationFeature;set_ErrorResponseFilter;(System.Func<ServiceStack.Web.IRequest,ServiceStack.FluentValidation.Results.ValidationResult,System.Object,System.Object>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | ServiceStack.VirtualPath;AbstractVirtualDirectoryBase;GetPathToRoot;(System.String,System.Func<ServiceStack.IO.IVirtualDirectory,System.String>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
 | ServiceStack.VirtualPath;AbstractVirtualFileBase;GetPathToRoot;(System.String,System.Func<ServiceStack.IO.IVirtualDirectory,System.String>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
@@ -3635,138 +4100,130 @@
 | ServiceStack;UploadLocation;set_ValidateUpload;(System.Action<ServiceStack.Web.IRequest,ServiceStack.Web.IHttpFile>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | ServiceStack;UrlExtensions;ToUrl;(System.Object,System.String,System.Func<System.Type,System.String>);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
 | ServiceStack;UrlResolverDelegate;BeginInvoke;(ServiceStack.IServiceClientMeta,System.String,System.String,System.AsyncCallback,System.Object);Argument[3];Argument[3].Parameter[delegate-self];value;hq-generated |
-| ServiceStack;WebServiceException;get_Message;();Argument[this];ReturnValue;taint;df-generated |
+| ServiceStack;WebServiceException;get_Message;();Argument[this].SyntheticField[System.Exception._message];ReturnValue;value;dfc-generated |
 | ServiceStack;WriteComplexTypeDelegate;BeginInvoke;(System.IO.TextWriter,System.String,System.Object,System.AsyncCallback,System.Object);Argument[3];Argument[3].Parameter[delegate-self];value;hq-generated |
 | ServiceStack;X;Apply<T>;(T,System.Action<T>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
 | ServiceStack;X;Map<From,To>;(From,System.Func<From,To>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
 | ServiceStack;XLinqExtensions;GetAttributeValueOrDefault<T>;(System.Xml.Linq.XAttribute,System.String,System.Func<System.Xml.Linq.XAttribute,T>);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
 | ServiceStack;XLinqExtensions;GetElementValueOrDefault<T>;(System.Xml.Linq.XElement,System.String,System.Func<System.Xml.Linq.XElement,T>);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
-| System.Buffers;ArrayBufferWriter<T>;GetMemory;(System.Int32);Argument[this];ReturnValue;taint;df-generated |
-| System.Buffers;ArrayBufferWriter<T>;get_WrittenMemory;();Argument[this];ReturnValue;taint;df-generated |
-| System.Buffers;ArrayBufferWriter<T>;get_WrittenSpan;();Argument[this];ReturnValue;taint;df-generated |
 | System.Buffers;BuffersExtensions;CopyTo<T>;(System.Buffers.ReadOnlySequence<T>,System.Span<T>);Argument[0];Argument[1];taint;df-generated |
-| System.Buffers;BuffersExtensions;PositionOf<T>;(System.Buffers.ReadOnlySequence<T>,T);Argument[0];ReturnValue;taint;df-generated |
-| System.Buffers;MemoryHandle;MemoryHandle;(System.Void*,System.Runtime.InteropServices.GCHandle,System.Buffers.IPinnable);Argument[0];Argument[this];taint;df-generated |
-| System.Buffers;MemoryHandle;MemoryHandle;(System.Void*,System.Runtime.InteropServices.GCHandle,System.Buffers.IPinnable);Argument[1];Argument[this];taint;df-generated |
-| System.Buffers;MemoryHandle;MemoryHandle;(System.Void*,System.Runtime.InteropServices.GCHandle,System.Buffers.IPinnable);Argument[2];Argument[this];taint;df-generated |
-| System.Buffers;MemoryHandle;get_Pointer;();Argument[this];ReturnValue;taint;df-generated |
+| System.Buffers;MemoryHandle;MemoryHandle;(System.Void*,System.Runtime.InteropServices.GCHandle,System.Buffers.IPinnable);Argument[0];Argument[this].SyntheticField[System.Buffers.MemoryHandle._pointer];value;dfc-generated |
+| System.Buffers;MemoryHandle;get_Pointer;();Argument[this].SyntheticField[System.Buffers.MemoryHandle._pointer];ReturnValue;value;dfc-generated |
 | System.Buffers;MemoryManager<T>;CreateMemory;(System.Int32);Argument[this];ReturnValue;taint;df-generated |
 | System.Buffers;MemoryManager<T>;CreateMemory;(System.Int32,System.Int32);Argument[this];ReturnValue;taint;df-generated |
 | System.Buffers;MemoryManager<T>;get_Memory;();Argument[this];ReturnValue;taint;df-generated |
 | System.Buffers;ReadOnlySequence<T>+Enumerator;Enumerator;(System.Buffers.ReadOnlySequence<T>);Argument[0];Argument[this];taint;df-generated |
 | System.Buffers;ReadOnlySequence<T>+Enumerator;get_Current;();Argument[this];ReturnValue;taint;df-generated |
-| System.Buffers;ReadOnlySequence<T>;GetEnumerator;();Argument[this];ReturnValue;taint;df-generated |
-| System.Buffers;ReadOnlySequence<T>;GetPosition;(System.Int64);Argument[this];ReturnValue;taint;df-generated |
-| System.Buffers;ReadOnlySequence<T>;GetPosition;(System.Int64,System.SequencePosition);Argument[1];ReturnValue;taint;df-generated |
 | System.Buffers;ReadOnlySequence<T>;ReadOnlySequence;(System.Buffers.ReadOnlySequenceSegment<T>,System.Int32,System.Buffers.ReadOnlySequenceSegment<T>,System.Int32);Argument[0];Argument[this];taint;df-generated |
 | System.Buffers;ReadOnlySequence<T>;ReadOnlySequence;(System.Buffers.ReadOnlySequenceSegment<T>,System.Int32,System.Buffers.ReadOnlySequenceSegment<T>,System.Int32);Argument[2];Argument[this];taint;df-generated |
-| System.Buffers;ReadOnlySequence<T>;ReadOnlySequence;(System.ReadOnlyMemory<T>);Argument[0];Argument[this];taint;df-generated |
 | System.Buffers;ReadOnlySequence<T>;ReadOnlySequence;(T[]);Argument[0].Element;Argument[this];taint;df-generated |
 | System.Buffers;ReadOnlySequence<T>;ReadOnlySequence;(T[],System.Int32,System.Int32);Argument[0].Element;Argument[this];taint;df-generated |
-| System.Buffers;ReadOnlySequence<T>;Slice;(System.Int32,System.Int32);Argument[this];ReturnValue;taint;df-generated |
 | System.Buffers;ReadOnlySequence<T>;Slice;(System.Int32,System.SequencePosition);Argument[1];ReturnValue;taint;df-generated |
-| System.Buffers;ReadOnlySequence<T>;Slice;(System.Int32,System.SequencePosition);Argument[this];ReturnValue;taint;df-generated |
-| System.Buffers;ReadOnlySequence<T>;Slice;(System.Int64);Argument[this];ReturnValue;value;df-generated |
-| System.Buffers;ReadOnlySequence<T>;Slice;(System.Int64,System.Int64);Argument[this];ReturnValue;taint;df-generated |
+| System.Buffers;ReadOnlySequence<T>;Slice;(System.Int64);Argument[this];ReturnValue;value;dfc-generated |
 | System.Buffers;ReadOnlySequence<T>;Slice;(System.Int64,System.SequencePosition);Argument[1];ReturnValue;taint;df-generated |
-| System.Buffers;ReadOnlySequence<T>;Slice;(System.Int64,System.SequencePosition);Argument[this];ReturnValue;taint;df-generated |
 | System.Buffers;ReadOnlySequence<T>;Slice;(System.SequencePosition);Argument[0];ReturnValue;taint;df-generated |
 | System.Buffers;ReadOnlySequence<T>;Slice;(System.SequencePosition);Argument[this];ReturnValue;taint;df-generated |
 | System.Buffers;ReadOnlySequence<T>;Slice;(System.SequencePosition,System.Int32);Argument[0];ReturnValue;taint;df-generated |
-| System.Buffers;ReadOnlySequence<T>;Slice;(System.SequencePosition,System.Int32);Argument[this];ReturnValue;taint;df-generated |
 | System.Buffers;ReadOnlySequence<T>;Slice;(System.SequencePosition,System.Int64);Argument[0];ReturnValue;taint;df-generated |
-| System.Buffers;ReadOnlySequence<T>;Slice;(System.SequencePosition,System.Int64);Argument[this];ReturnValue;taint;df-generated |
 | System.Buffers;ReadOnlySequence<T>;Slice;(System.SequencePosition,System.SequencePosition);Argument[0];ReturnValue;taint;df-generated |
 | System.Buffers;ReadOnlySequence<T>;Slice;(System.SequencePosition,System.SequencePosition);Argument[1];ReturnValue;taint;df-generated |
-| System.Buffers;ReadOnlySequence<T>;TryGet;(System.SequencePosition,System.ReadOnlyMemory<T>,System.Boolean);Argument[0];ReturnValue;taint;df-generated |
-| System.Buffers;ReadOnlySequence<T>;get_End;();Argument[this];ReturnValue;taint;df-generated |
-| System.Buffers;ReadOnlySequence<T>;get_First;();Argument[this];ReturnValue;taint;df-generated |
+| System.Buffers;ReadOnlySequence<T>;TryGet;(System.SequencePosition,System.ReadOnlyMemory<T>,System.Boolean);Argument[0];ReturnValue;value;dfc-generated |
 | System.Buffers;ReadOnlySequence<T>;get_FirstSpan;();Argument[this];ReturnValue;taint;df-generated |
-| System.Buffers;ReadOnlySequence<T>;get_Start;();Argument[this];ReturnValue;taint;df-generated |
 | System.Buffers;ReadOnlySpanAction<T,TArg>;BeginInvoke;(System.ReadOnlySpan<T>,TArg,System.AsyncCallback,System.Object);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
 | System.Buffers;SearchValues;Create;(System.ReadOnlySpan<System.Byte>);Argument[0];ReturnValue;taint;df-generated |
 | System.Buffers;SequenceReader<T>;SequenceReader;(System.Buffers.ReadOnlySequence<T>);Argument[0];Argument[this];taint;df-generated |
-| System.Buffers;SequenceReader<T>;TryCopyTo;(System.Span<T>);Argument[this];Argument[0];taint;df-generated |
-| System.Buffers;SequenceReader<T>;TryPeek;(System.Int64,T);Argument[this];ReturnValue;taint;df-generated |
-| System.Buffers;SequenceReader<T>;TryPeek;(T);Argument[this];ReturnValue;taint;df-generated |
-| System.Buffers;SequenceReader<T>;TryRead;(T);Argument[this];ReturnValue;taint;df-generated |
+| System.Buffers;SequenceReader<T>;TryCopyTo;(System.Span<T>);Argument[this].Property[System.Buffers.SequenceReader`1.CurrentSpan].Element;Argument[0].Element;value;dfc-generated |
+| System.Buffers;SequenceReader<T>;TryCopyTo;(System.Span<T>);Argument[this].Property[System.Buffers.SequenceReader`1.UnreadSpan].Element;Argument[0].Element;value;dfc-generated |
+| System.Buffers;SequenceReader<T>;TryPeek;(System.Int64,T);Argument[this].Property[System.Buffers.SequenceReader`1.CurrentSpan].Element;ReturnValue;value;dfc-generated |
+| System.Buffers;SequenceReader<T>;TryPeek;(T);Argument[this].Property[System.Buffers.SequenceReader`1.CurrentSpan].Element;ReturnValue;value;dfc-generated |
+| System.Buffers;SequenceReader<T>;TryRead;(T);Argument[this].Property[System.Buffers.SequenceReader`1.CurrentSpan].Element;ReturnValue;value;dfc-generated |
 | System.Buffers;SequenceReader<T>;TryReadExact;(System.Int32,System.Buffers.ReadOnlySequence<T>);Argument[this];ReturnValue;taint;df-generated |
 | System.Buffers;SequenceReader<T>;TryReadTo;(System.Buffers.ReadOnlySequence<T>,System.ReadOnlySpan<T>,System.Boolean);Argument[this];ReturnValue;taint;df-generated |
 | System.Buffers;SequenceReader<T>;TryReadTo;(System.Buffers.ReadOnlySequence<T>,T,System.Boolean);Argument[this];ReturnValue;taint;df-generated |
 | System.Buffers;SequenceReader<T>;TryReadTo;(System.Buffers.ReadOnlySequence<T>,T,T,System.Boolean);Argument[this];ReturnValue;taint;df-generated |
-| System.Buffers;SequenceReader<T>;TryReadTo;(System.ReadOnlySpan<T>,System.ReadOnlySpan<T>,System.Boolean);Argument[this];ReturnValue;taint;df-generated |
-| System.Buffers;SequenceReader<T>;TryReadTo;(System.ReadOnlySpan<T>,T,System.Boolean);Argument[this];ReturnValue;taint;df-generated |
-| System.Buffers;SequenceReader<T>;TryReadTo;(System.ReadOnlySpan<T>,T,T,System.Boolean);Argument[this];ReturnValue;taint;df-generated |
+| System.Buffers;SequenceReader<T>;TryReadTo;(System.ReadOnlySpan<T>,System.ReadOnlySpan<T>,System.Boolean);Argument[this].Property[System.Buffers.SequenceReader`1.CurrentSpan].Element;ReturnValue.Element;value;dfc-generated |
+| System.Buffers;SequenceReader<T>;TryReadTo;(System.ReadOnlySpan<T>,System.ReadOnlySpan<T>,System.Boolean);Argument[this].Property[System.Buffers.SequenceReader`1.UnreadSpan].Element;ReturnValue.Element;value;dfc-generated |
+| System.Buffers;SequenceReader<T>;TryReadTo;(System.ReadOnlySpan<T>,T,System.Boolean);Argument[this].Property[System.Buffers.SequenceReader`1.CurrentSpan].Element;ReturnValue.Element;value;dfc-generated |
+| System.Buffers;SequenceReader<T>;TryReadTo;(System.ReadOnlySpan<T>,T,System.Boolean);Argument[this].Property[System.Buffers.SequenceReader`1.UnreadSpan].Element;ReturnValue.Element;value;dfc-generated |
+| System.Buffers;SequenceReader<T>;TryReadTo;(System.ReadOnlySpan<T>,T,T,System.Boolean);Argument[this].Property[System.Buffers.SequenceReader`1.CurrentSpan].Element;ReturnValue.Element;value;dfc-generated |
+| System.Buffers;SequenceReader<T>;TryReadTo;(System.ReadOnlySpan<T>,T,T,System.Boolean);Argument[this].Property[System.Buffers.SequenceReader`1.UnreadSpan].Element;ReturnValue.Element;value;dfc-generated |
 | System.Buffers;SequenceReader<T>;TryReadToAny;(System.Buffers.ReadOnlySequence<T>,System.ReadOnlySpan<T>,System.Boolean);Argument[this];ReturnValue;taint;df-generated |
-| System.Buffers;SequenceReader<T>;TryReadToAny;(System.ReadOnlySpan<T>,System.ReadOnlySpan<T>,System.Boolean);Argument[this];ReturnValue;taint;df-generated |
-| System.Buffers;SequenceReader<T>;get_Position;();Argument[this];ReturnValue;taint;df-generated |
+| System.Buffers;SequenceReader<T>;TryReadToAny;(System.ReadOnlySpan<T>,System.ReadOnlySpan<T>,System.Boolean);Argument[this].Property[System.Buffers.SequenceReader`1.CurrentSpan].Element;ReturnValue.Element;value;dfc-generated |
+| System.Buffers;SequenceReader<T>;TryReadToAny;(System.ReadOnlySpan<T>,System.ReadOnlySpan<T>,System.Boolean);Argument[this].Property[System.Buffers.SequenceReader`1.UnreadSpan].Element;ReturnValue.Element;value;dfc-generated |
 | System.Buffers;SequenceReader<T>;get_UnreadSequence;();Argument[this];ReturnValue;taint;df-generated |
-| System.Buffers;SequenceReader<T>;get_UnreadSpan;();Argument[this];ReturnValue;taint;df-generated |
+| System.Buffers;SequenceReader<T>;get_UnreadSpan;();Argument[this].Property[System.Buffers.SequenceReader`1.CurrentSpan].Element;ReturnValue.Element;value;dfc-generated |
+| System.Buffers;SequenceReaderExtensions;TryReadBigEndian;(System.Buffers.SequenceReader<System.Byte>,System.Int16);Argument[0];ReturnValue;value;dfc-generated |
+| System.Buffers;SequenceReaderExtensions;TryReadBigEndian;(System.Buffers.SequenceReader<System.Byte>,System.Int32);Argument[0];ReturnValue;value;dfc-generated |
+| System.Buffers;SequenceReaderExtensions;TryReadBigEndian;(System.Buffers.SequenceReader<System.Byte>,System.Int64);Argument[0];ReturnValue;value;dfc-generated |
+| System.Buffers;SequenceReaderExtensions;TryReadLittleEndian;(System.Buffers.SequenceReader<System.Byte>,System.Int16);Argument[0];ReturnValue;value;dfc-generated |
+| System.Buffers;SequenceReaderExtensions;TryReadLittleEndian;(System.Buffers.SequenceReader<System.Byte>,System.Int32);Argument[0];ReturnValue;value;dfc-generated |
+| System.Buffers;SequenceReaderExtensions;TryReadLittleEndian;(System.Buffers.SequenceReader<System.Byte>,System.Int64);Argument[0];ReturnValue;value;dfc-generated |
 | System.Buffers;SpanAction<T,TArg>;BeginInvoke;(System.Span<T>,TArg,System.AsyncCallback,System.Object);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
 | System.CodeDom.Compiler;CodeCompiler;FromDom;(System.CodeDom.Compiler.CompilerParameters,System.CodeDom.CodeCompileUnit);Argument[1];Argument[0];taint;df-generated |
 | System.CodeDom.Compiler;CodeCompiler;FromDom;(System.CodeDom.Compiler.CompilerParameters,System.CodeDom.CodeCompileUnit);Argument[1];Argument[this];taint;df-generated |
 | System.CodeDom.Compiler;CodeCompiler;FromDomBatch;(System.CodeDom.Compiler.CompilerParameters,System.CodeDom.CodeCompileUnit[]);Argument[1].Element;Argument[0];taint;df-generated |
 | System.CodeDom.Compiler;CodeCompiler;FromDomBatch;(System.CodeDom.Compiler.CompilerParameters,System.CodeDom.CodeCompileUnit[]);Argument[1].Element;Argument[this];taint;df-generated |
-| System.CodeDom.Compiler;CodeCompiler;GetResponseFileCmdArgs;(System.CodeDom.Compiler.CompilerParameters,System.String);Argument[0];ReturnValue;taint;df-generated |
-| System.CodeDom.Compiler;CodeCompiler;JoinStringArray;(System.String[],System.String);Argument[0].Element;ReturnValue;taint;df-generated |
-| System.CodeDom.Compiler;CodeCompiler;JoinStringArray;(System.String[],System.String);Argument[1];ReturnValue;taint;df-generated |
+| System.CodeDom.Compiler;CodeCompiler;JoinStringArray;(System.String[],System.String);Argument[0].Element;ReturnValue;taint;dfc-generated |
+| System.CodeDom.Compiler;CodeCompiler;JoinStringArray;(System.String[],System.String);Argument[1];ReturnValue;taint;dfc-generated |
 | System.CodeDom.Compiler;CodeDomProvider;CompileAssemblyFromDom;(System.CodeDom.Compiler.CompilerParameters,System.CodeDom.CodeCompileUnit[]);Argument[1].Element;Argument[0];taint;df-generated |
 | System.CodeDom.Compiler;CodeDomProvider;CompileAssemblyFromDom;(System.CodeDom.Compiler.CompilerParameters,System.CodeDom.CodeCompileUnit[]);Argument[1].Element;Argument[this];taint;df-generated |
 | System.CodeDom.Compiler;CodeDomProvider;CreateCompiler;();Argument[this];ReturnValue;taint;df-generated |
-| System.CodeDom.Compiler;CodeDomProvider;CreateEscapedIdentifier;(System.String);Argument[0];ReturnValue;taint;df-generated |
+| System.CodeDom.Compiler;CodeDomProvider;CreateEscapedIdentifier;(System.String);Argument[0];ReturnValue;value;dfc-generated |
 | System.CodeDom.Compiler;CodeDomProvider;CreateGenerator;();Argument[this];ReturnValue;taint;df-generated |
 | System.CodeDom.Compiler;CodeDomProvider;CreateGenerator;(System.IO.TextWriter);Argument[this];ReturnValue;taint;df-generated |
 | System.CodeDom.Compiler;CodeDomProvider;CreateGenerator;(System.String);Argument[this];ReturnValue;taint;df-generated |
-| System.CodeDom.Compiler;CodeDomProvider;CreateValidIdentifier;(System.String);Argument[0];ReturnValue;taint;df-generated |
+| System.CodeDom.Compiler;CodeDomProvider;CreateValidIdentifier;(System.String);Argument[0];ReturnValue;value;dfc-generated |
 | System.CodeDom.Compiler;CodeDomProvider;GenerateCodeFromCompileUnit;(System.CodeDom.CodeCompileUnit,System.IO.TextWriter,System.CodeDom.Compiler.CodeGeneratorOptions);Argument[0];Argument[this];taint;df-generated |
 | System.CodeDom.Compiler;CodeDomProvider;GenerateCodeFromCompileUnit;(System.CodeDom.CodeCompileUnit,System.IO.TextWriter,System.CodeDom.Compiler.CodeGeneratorOptions);Argument[2];Argument[this];taint;df-generated |
+| System.CodeDom.Compiler;CodeDomProvider;GenerateCodeFromExpression;(System.CodeDom.CodeExpression,System.IO.TextWriter,System.CodeDom.Compiler.CodeGeneratorOptions);Argument[0];Argument[this];taint;df-generated |
 | System.CodeDom.Compiler;CodeDomProvider;GenerateCodeFromExpression;(System.CodeDom.CodeExpression,System.IO.TextWriter,System.CodeDom.Compiler.CodeGeneratorOptions);Argument[2];Argument[this];taint;df-generated |
 | System.CodeDom.Compiler;CodeDomProvider;GenerateCodeFromMember;(System.CodeDom.CodeTypeMember,System.IO.TextWriter,System.CodeDom.Compiler.CodeGeneratorOptions);Argument[0];Argument[this];taint;df-generated |
 | System.CodeDom.Compiler;CodeDomProvider;GenerateCodeFromMember;(System.CodeDom.CodeTypeMember,System.IO.TextWriter,System.CodeDom.Compiler.CodeGeneratorOptions);Argument[2];Argument[this];taint;df-generated |
 | System.CodeDom.Compiler;CodeDomProvider;GenerateCodeFromNamespace;(System.CodeDom.CodeNamespace,System.IO.TextWriter,System.CodeDom.Compiler.CodeGeneratorOptions);Argument[0];Argument[this];taint;df-generated |
 | System.CodeDom.Compiler;CodeDomProvider;GenerateCodeFromNamespace;(System.CodeDom.CodeNamespace,System.IO.TextWriter,System.CodeDom.Compiler.CodeGeneratorOptions);Argument[2];Argument[this];taint;df-generated |
+| System.CodeDom.Compiler;CodeDomProvider;GenerateCodeFromStatement;(System.CodeDom.CodeStatement,System.IO.TextWriter,System.CodeDom.Compiler.CodeGeneratorOptions);Argument[0];Argument[this];taint;df-generated |
 | System.CodeDom.Compiler;CodeDomProvider;GenerateCodeFromStatement;(System.CodeDom.CodeStatement,System.IO.TextWriter,System.CodeDom.Compiler.CodeGeneratorOptions);Argument[2];Argument[this];taint;df-generated |
 | System.CodeDom.Compiler;CodeDomProvider;GenerateCodeFromType;(System.CodeDom.CodeTypeDeclaration,System.IO.TextWriter,System.CodeDom.Compiler.CodeGeneratorOptions);Argument[0];Argument[this];taint;df-generated |
 | System.CodeDom.Compiler;CodeDomProvider;GenerateCodeFromType;(System.CodeDom.CodeTypeDeclaration,System.IO.TextWriter,System.CodeDom.Compiler.CodeGeneratorOptions);Argument[2];Argument[this];taint;df-generated |
-| System.CodeDom.Compiler;CodeDomProvider;GetTypeOutput;(System.CodeDom.CodeTypeReference);Argument[0];ReturnValue;taint;df-generated |
+| System.CodeDom.Compiler;CodeDomProvider;GetTypeOutput;(System.CodeDom.CodeTypeReference);Argument[0].Property[System.CodeDom.CodeTypeReference.ArrayElementType].Property[System.CodeDom.CodeTypeReference.BaseType];ReturnValue;taint;dfc-generated |
+| System.CodeDom.Compiler;CodeDomProvider;GetTypeOutput;(System.CodeDom.CodeTypeReference);Argument[0].Property[System.CodeDom.CodeTypeReference.BaseType];ReturnValue;taint;dfc-generated |
 | System.CodeDom.Compiler;CodeGenerator;ContinueOnNewLine;(System.String);Argument[0];Argument[this];taint;df-generated |
-| System.CodeDom.Compiler;CodeGenerator;CreateEscapedIdentifier;(System.String);Argument[0];ReturnValue;taint;df-generated |
-| System.CodeDom.Compiler;CodeGenerator;CreateValidIdentifier;(System.String);Argument[0];ReturnValue;taint;df-generated |
+| System.CodeDom.Compiler;CodeGenerator;CreateEscapedIdentifier;(System.String);Argument[0];ReturnValue;value;dfc-generated |
+| System.CodeDom.Compiler;CodeGenerator;CreateValidIdentifier;(System.String);Argument[0];ReturnValue;value;dfc-generated |
 | System.CodeDom.Compiler;CodeGenerator;GenerateArgumentReferenceExpression;(System.CodeDom.CodeArgumentReferenceExpression);Argument[0];Argument[this];taint;df-generated |
 | System.CodeDom.Compiler;CodeGenerator;GenerateArrayCreateExpression;(System.CodeDom.CodeArrayCreateExpression);Argument[0];Argument[this];taint;df-generated |
-| System.CodeDom.Compiler;CodeGenerator;GenerateArrayIndexerExpression;(System.CodeDom.CodeArrayIndexerExpression);Argument[0];Argument[this];taint;df-generated |
-| System.CodeDom.Compiler;CodeGenerator;GenerateAssignStatement;(System.CodeDom.CodeAssignStatement);Argument[0];Argument[this];taint;df-generated |
 | System.CodeDom.Compiler;CodeGenerator;GenerateAttachEventStatement;(System.CodeDom.CodeAttachEventStatement);Argument[0];Argument[this];taint;df-generated |
 | System.CodeDom.Compiler;CodeGenerator;GenerateBinaryOperatorExpression;(System.CodeDom.CodeBinaryOperatorExpression);Argument[0];Argument[this];taint;df-generated |
 | System.CodeDom.Compiler;CodeGenerator;GenerateCastExpression;(System.CodeDom.CodeCastExpression);Argument[0];Argument[this];taint;df-generated |
-| System.CodeDom.Compiler;CodeGenerator;GenerateCodeFromMember;(System.CodeDom.CodeTypeMember,System.IO.TextWriter,System.CodeDom.Compiler.CodeGeneratorOptions);Argument[0];Argument[this];taint;df-generated |
-| System.CodeDom.Compiler;CodeGenerator;GenerateCodeFromMember;(System.CodeDom.CodeTypeMember,System.IO.TextWriter,System.CodeDom.Compiler.CodeGeneratorOptions);Argument[2];Argument[this];taint;df-generated |
+| System.CodeDom.Compiler;CodeGenerator;GenerateCodeFromCompileUnit;(System.CodeDom.CodeCompileUnit,System.IO.TextWriter,System.CodeDom.Compiler.CodeGeneratorOptions);Argument[2];Argument[this].SyntheticField[System.CodeDom.Compiler.CodeGenerator._options];value;df-generated |
+| System.CodeDom.Compiler;CodeGenerator;GenerateCodeFromCompileUnit;(System.CodeDom.CodeCompileUnit,System.IO.TextWriter,System.CodeDom.Compiler.CodeGeneratorOptions);Argument[2];Argument[this].SyntheticField[System.CodeDom.Compiler.CodeGenerator._options];value;dfc-generated |
+| System.CodeDom.Compiler;CodeGenerator;GenerateCodeFromExpression;(System.CodeDom.CodeExpression,System.IO.TextWriter,System.CodeDom.Compiler.CodeGeneratorOptions);Argument[2];Argument[this].SyntheticField[System.CodeDom.Compiler.CodeGenerator._options];value;df-generated |
+| System.CodeDom.Compiler;CodeGenerator;GenerateCodeFromExpression;(System.CodeDom.CodeExpression,System.IO.TextWriter,System.CodeDom.Compiler.CodeGeneratorOptions);Argument[2];Argument[this].SyntheticField[System.CodeDom.Compiler.CodeGenerator._options];value;dfc-generated |
+| System.CodeDom.Compiler;CodeGenerator;GenerateCodeFromMember;(System.CodeDom.CodeTypeMember,System.IO.TextWriter,System.CodeDom.Compiler.CodeGeneratorOptions);Argument[2];Argument[this].SyntheticField[System.CodeDom.Compiler.CodeGenerator._options];value;dfc-generated |
+| System.CodeDom.Compiler;CodeGenerator;GenerateCodeFromNamespace;(System.CodeDom.CodeNamespace,System.IO.TextWriter,System.CodeDom.Compiler.CodeGeneratorOptions);Argument[2];Argument[this].SyntheticField[System.CodeDom.Compiler.CodeGenerator._options];value;df-generated |
+| System.CodeDom.Compiler;CodeGenerator;GenerateCodeFromNamespace;(System.CodeDom.CodeNamespace,System.IO.TextWriter,System.CodeDom.Compiler.CodeGeneratorOptions);Argument[2];Argument[this].SyntheticField[System.CodeDom.Compiler.CodeGenerator._options];value;dfc-generated |
+| System.CodeDom.Compiler;CodeGenerator;GenerateCodeFromStatement;(System.CodeDom.CodeStatement,System.IO.TextWriter,System.CodeDom.Compiler.CodeGeneratorOptions);Argument[2];Argument[this].SyntheticField[System.CodeDom.Compiler.CodeGenerator._options];value;df-generated |
+| System.CodeDom.Compiler;CodeGenerator;GenerateCodeFromStatement;(System.CodeDom.CodeStatement,System.IO.TextWriter,System.CodeDom.Compiler.CodeGeneratorOptions);Argument[2];Argument[this].SyntheticField[System.CodeDom.Compiler.CodeGenerator._options];value;dfc-generated |
+| System.CodeDom.Compiler;CodeGenerator;GenerateCodeFromType;(System.CodeDom.CodeTypeDeclaration,System.IO.TextWriter,System.CodeDom.Compiler.CodeGeneratorOptions);Argument[2];Argument[this].SyntheticField[System.CodeDom.Compiler.CodeGenerator._options];value;df-generated |
+| System.CodeDom.Compiler;CodeGenerator;GenerateCodeFromType;(System.CodeDom.CodeTypeDeclaration,System.IO.TextWriter,System.CodeDom.Compiler.CodeGeneratorOptions);Argument[2];Argument[this].SyntheticField[System.CodeDom.Compiler.CodeGenerator._options];value;dfc-generated |
 | System.CodeDom.Compiler;CodeGenerator;GenerateCompileUnit;(System.CodeDom.CodeCompileUnit);Argument[0];Argument[this];taint;df-generated |
 | System.CodeDom.Compiler;CodeGenerator;GenerateCompileUnitEnd;(System.CodeDom.CodeCompileUnit);Argument[0];Argument[this];taint;df-generated |
 | System.CodeDom.Compiler;CodeGenerator;GenerateCompileUnitStart;(System.CodeDom.CodeCompileUnit);Argument[0];Argument[this];taint;df-generated |
-| System.CodeDom.Compiler;CodeGenerator;GenerateConditionStatement;(System.CodeDom.CodeConditionStatement);Argument[0];Argument[this];taint;df-generated |
-| System.CodeDom.Compiler;CodeGenerator;GenerateConstructor;(System.CodeDom.CodeConstructor,System.CodeDom.CodeTypeDeclaration);Argument[0];Argument[this];taint;df-generated |
 | System.CodeDom.Compiler;CodeGenerator;GenerateDefaultValueExpression;(System.CodeDom.CodeDefaultValueExpression);Argument[0];Argument[this];taint;df-generated |
 | System.CodeDom.Compiler;CodeGenerator;GenerateDelegateCreateExpression;(System.CodeDom.CodeDelegateCreateExpression);Argument[0];Argument[this];taint;df-generated |
 | System.CodeDom.Compiler;CodeGenerator;GenerateDelegateInvokeExpression;(System.CodeDom.CodeDelegateInvokeExpression);Argument[0];Argument[this];taint;df-generated |
 | System.CodeDom.Compiler;CodeGenerator;GenerateDirectionExpression;(System.CodeDom.CodeDirectionExpression);Argument[0];Argument[this];taint;df-generated |
 | System.CodeDom.Compiler;CodeGenerator;GenerateDirectives;(System.CodeDom.CodeDirectiveCollection);Argument[0].Element;Argument[this];taint;df-generated |
-| System.CodeDom.Compiler;CodeGenerator;GenerateEntryPointMethod;(System.CodeDom.CodeEntryPointMethod,System.CodeDom.CodeTypeDeclaration);Argument[0];Argument[this];taint;df-generated |
 | System.CodeDom.Compiler;CodeGenerator;GenerateEvent;(System.CodeDom.CodeMemberEvent,System.CodeDom.CodeTypeDeclaration);Argument[0];Argument[this];taint;df-generated |
 | System.CodeDom.Compiler;CodeGenerator;GenerateEventReferenceExpression;(System.CodeDom.CodeEventReferenceExpression);Argument[0];Argument[this];taint;df-generated |
 | System.CodeDom.Compiler;CodeGenerator;GenerateExpression;(System.CodeDom.CodeExpression);Argument[0];Argument[this];taint;df-generated |
-| System.CodeDom.Compiler;CodeGenerator;GenerateExpressionStatement;(System.CodeDom.CodeExpressionStatement);Argument[0];Argument[this];taint;df-generated |
 | System.CodeDom.Compiler;CodeGenerator;GenerateField;(System.CodeDom.CodeMemberField);Argument[0];Argument[this];taint;df-generated |
 | System.CodeDom.Compiler;CodeGenerator;GenerateFieldReferenceExpression;(System.CodeDom.CodeFieldReferenceExpression);Argument[0];Argument[this];taint;df-generated |
-| System.CodeDom.Compiler;CodeGenerator;GenerateGotoStatement;(System.CodeDom.CodeGotoStatement);Argument[0];Argument[this];taint;df-generated |
-| System.CodeDom.Compiler;CodeGenerator;GenerateIndexerExpression;(System.CodeDom.CodeIndexerExpression);Argument[0];Argument[this];taint;df-generated |
-| System.CodeDom.Compiler;CodeGenerator;GenerateIterationStatement;(System.CodeDom.CodeIterationStatement);Argument[0];Argument[this];taint;df-generated |
 | System.CodeDom.Compiler;CodeGenerator;GenerateLabeledStatement;(System.CodeDom.CodeLabeledStatement);Argument[0];Argument[this];taint;df-generated |
 | System.CodeDom.Compiler;CodeGenerator;GenerateLinePragmaStart;(System.CodeDom.CodeLinePragma);Argument[0];Argument[this];taint;df-generated |
 | System.CodeDom.Compiler;CodeGenerator;GenerateMethod;(System.CodeDom.CodeMemberMethod,System.CodeDom.CodeTypeDeclaration);Argument[0];Argument[this];taint;df-generated |
 | System.CodeDom.Compiler;CodeGenerator;GenerateMethodInvokeExpression;(System.CodeDom.CodeMethodInvokeExpression);Argument[0];Argument[this];taint;df-generated |
 | System.CodeDom.Compiler;CodeGenerator;GenerateMethodReferenceExpression;(System.CodeDom.CodeMethodReferenceExpression);Argument[0];Argument[this];taint;df-generated |
-| System.CodeDom.Compiler;CodeGenerator;GenerateMethodReturnStatement;(System.CodeDom.CodeMethodReturnStatement);Argument[0];Argument[this];taint;df-generated |
 | System.CodeDom.Compiler;CodeGenerator;GenerateNamespace;(System.CodeDom.CodeNamespace);Argument[0];Argument[this];taint;df-generated |
 | System.CodeDom.Compiler;CodeGenerator;GenerateNamespaceImport;(System.CodeDom.CodeNamespaceImport);Argument[0];Argument[this];taint;df-generated |
 | System.CodeDom.Compiler;CodeGenerator;GenerateNamespaceImports;(System.CodeDom.CodeNamespace);Argument[0];Argument[this];taint;df-generated |
@@ -3781,19 +4238,21 @@
 | System.CodeDom.Compiler;CodeGenerator;GenerateSnippetCompileUnit;(System.CodeDom.CodeSnippetCompileUnit);Argument[0];Argument[this];taint;df-generated |
 | System.CodeDom.Compiler;CodeGenerator;GenerateSnippetExpression;(System.CodeDom.CodeSnippetExpression);Argument[0];Argument[this];taint;df-generated |
 | System.CodeDom.Compiler;CodeGenerator;GenerateSnippetMember;(System.CodeDom.CodeSnippetTypeMember);Argument[0];Argument[this];taint;df-generated |
-| System.CodeDom.Compiler;CodeGenerator;GenerateSnippetStatement;(System.CodeDom.CodeSnippetStatement);Argument[0];Argument[this];taint;df-generated |
 | System.CodeDom.Compiler;CodeGenerator;GenerateStatement;(System.CodeDom.CodeStatement);Argument[0];Argument[this];taint;df-generated |
 | System.CodeDom.Compiler;CodeGenerator;GenerateStatements;(System.CodeDom.CodeStatementCollection);Argument[0].Element;Argument[this];taint;df-generated |
-| System.CodeDom.Compiler;CodeGenerator;GenerateThrowExceptionStatement;(System.CodeDom.CodeThrowExceptionStatement);Argument[0];Argument[this];taint;df-generated |
 | System.CodeDom.Compiler;CodeGenerator;GenerateTryCatchFinallyStatement;(System.CodeDom.CodeTryCatchFinallyStatement);Argument[0];Argument[this];taint;df-generated |
-| System.CodeDom.Compiler;CodeGenerator;GenerateTypeConstructor;(System.CodeDom.CodeTypeConstructor);Argument[0];Argument[this];taint;df-generated |
-| System.CodeDom.Compiler;CodeGenerator;GenerateTypeOfExpression;(System.CodeDom.CodeTypeOfExpression);Argument[0];Argument[this];taint;df-generated |
-| System.CodeDom.Compiler;CodeGenerator;GenerateTypeReferenceExpression;(System.CodeDom.CodeTypeReferenceExpression);Argument[0];Argument[this];taint;df-generated |
+| System.CodeDom.Compiler;CodeGenerator;GenerateTypeOfExpression;(System.CodeDom.CodeTypeOfExpression);Argument[0].Property[System.CodeDom.CodeTypeOfExpression.Type].Property[System.CodeDom.CodeTypeReference.BaseType];Argument[this].Property[System.CodeDom.Compiler.CodeGenerator.Output];taint;dfc-generated |
+| System.CodeDom.Compiler;CodeGenerator;GenerateTypeReferenceExpression;(System.CodeDom.CodeTypeReferenceExpression);Argument[0].Property[System.CodeDom.CodeTypeReferenceExpression.Type].Property[System.CodeDom.CodeTypeReference.BaseType];Argument[this].Property[System.CodeDom.Compiler.CodeGenerator.Output];taint;dfc-generated |
 | System.CodeDom.Compiler;CodeGenerator;GenerateTypeStart;(System.CodeDom.CodeTypeDeclaration);Argument[0];Argument[this];taint;df-generated |
-| System.CodeDom.Compiler;CodeGenerator;GenerateTypes;(System.CodeDom.CodeNamespace);Argument[0];Argument[this];taint;df-generated |
+| System.CodeDom.Compiler;CodeGenerator;GenerateTypes;(System.CodeDom.CodeNamespace);Argument[0].Property[System.CodeDom.CodeNamespace.Types].Element;Argument[this].SyntheticField[System.CodeDom.Compiler.CodeGenerator._currentClass];value;dfc-generated |
 | System.CodeDom.Compiler;CodeGenerator;GenerateVariableDeclarationStatement;(System.CodeDom.CodeVariableDeclarationStatement);Argument[0];Argument[this];taint;df-generated |
 | System.CodeDom.Compiler;CodeGenerator;GenerateVariableReferenceExpression;(System.CodeDom.CodeVariableReferenceExpression);Argument[0];Argument[this];taint;df-generated |
+| System.CodeDom.Compiler;CodeGenerator;GetTypeOutput;(System.CodeDom.CodeTypeReference);Argument[0].Property[System.CodeDom.CodeTypeReference.ArrayElementType].Property[System.CodeDom.CodeTypeReference.BaseType];ReturnValue;taint;df-generated |
+| System.CodeDom.Compiler;CodeGenerator;GetTypeOutput;(System.CodeDom.CodeTypeReference);Argument[0].Property[System.CodeDom.CodeTypeReference.ArrayElementType].Property[System.CodeDom.CodeTypeReference.BaseType];ReturnValue;taint;dfc-generated |
+| System.CodeDom.Compiler;CodeGenerator;GetTypeOutput;(System.CodeDom.CodeTypeReference);Argument[0].Property[System.CodeDom.CodeTypeReference.BaseType];ReturnValue;taint;df-generated |
+| System.CodeDom.Compiler;CodeGenerator;GetTypeOutput;(System.CodeDom.CodeTypeReference);Argument[0].Property[System.CodeDom.CodeTypeReference.BaseType];ReturnValue;taint;dfc-generated |
 | System.CodeDom.Compiler;CodeGenerator;GetTypeOutput;(System.CodeDom.CodeTypeReference);Argument[0];ReturnValue;taint;df-generated |
+| System.CodeDom.Compiler;CodeGenerator;GetTypeOutput;(System.CodeDom.CodeTypeReference);Argument[0];ReturnValue;taint;dfc-generated |
 | System.CodeDom.Compiler;CodeGenerator;OutputAttributeArgument;(System.CodeDom.CodeAttributeArgument);Argument[0];Argument[this];taint;df-generated |
 | System.CodeDom.Compiler;CodeGenerator;OutputAttributeDeclarations;(System.CodeDom.CodeAttributeDeclarationCollection);Argument[0].Element;Argument[this];taint;df-generated |
 | System.CodeDom.Compiler;CodeGenerator;OutputExpressionList;(System.CodeDom.CodeExpressionCollection);Argument[0].Element;Argument[this];taint;df-generated |
@@ -3804,184 +4263,204 @@
 | System.CodeDom.Compiler;CodeGenerator;OutputTypeNamePair;(System.CodeDom.CodeTypeReference,System.String);Argument[0];Argument[this];taint;df-generated |
 | System.CodeDom.Compiler;CodeGenerator;OutputTypeNamePair;(System.CodeDom.CodeTypeReference,System.String);Argument[1];Argument[this];taint;df-generated |
 | System.CodeDom.Compiler;CodeGenerator;QuoteSnippetString;(System.String);Argument[this];ReturnValue;taint;df-generated |
-| System.CodeDom.Compiler;CodeGenerator;get_CurrentClass;();Argument[this];ReturnValue;taint;df-generated |
+| System.CodeDom.Compiler;CodeGenerator;get_CurrentClass;();Argument[this].SyntheticField[System.CodeDom.Compiler.CodeGenerator._currentClass];ReturnValue;value;dfc-generated |
 | System.CodeDom.Compiler;CodeGenerator;get_CurrentMember;();Argument[this];ReturnValue;taint;df-generated |
 | System.CodeDom.Compiler;CodeGenerator;get_CurrentMemberName;();Argument[this];ReturnValue;taint;df-generated |
-| System.CodeDom.Compiler;CodeGenerator;get_CurrentTypeName;();Argument[this];ReturnValue;taint;df-generated |
-| System.CodeDom.Compiler;CodeGenerator;get_Options;();Argument[this];ReturnValue;taint;df-generated |
+| System.CodeDom.Compiler;CodeGenerator;get_CurrentTypeName;();Argument[this].SyntheticField[System.CodeDom.Compiler.CodeGenerator._currentClass].Property[System.CodeDom.CodeTypeMember.Name];ReturnValue;value;dfc-generated |
+| System.CodeDom.Compiler;CodeGenerator;get_Options;();Argument[this].SyntheticField[System.CodeDom.Compiler.CodeGenerator._options];ReturnValue;value;dfc-generated |
 | System.CodeDom.Compiler;CodeGenerator;get_Output;();Argument[this];ReturnValue;taint;df-generated |
 | System.CodeDom.Compiler;CodeGeneratorOptions;get_Item;(System.String);Argument[this];ReturnValue;taint;df-generated |
 | System.CodeDom.Compiler;CompilerError;ToString;();Argument[this];ReturnValue;taint;df-generated |
-| System.CodeDom.Compiler;CompilerErrorCollection;Add;(System.CodeDom.Compiler.CompilerError);Argument[0];Argument[this];taint;df-generated |
-| System.CodeDom.Compiler;CompilerErrorCollection;AddRange;(System.CodeDom.Compiler.CompilerErrorCollection);Argument[0].Element;Argument[this];taint;df-generated |
-| System.CodeDom.Compiler;CompilerErrorCollection;AddRange;(System.CodeDom.Compiler.CompilerError[]);Argument[0].Element;Argument[this];taint;df-generated |
-| System.CodeDom.Compiler;CompilerErrorCollection;CompilerErrorCollection;(System.CodeDom.Compiler.CompilerErrorCollection);Argument[0].Element;Argument[this];taint;df-generated |
-| System.CodeDom.Compiler;CompilerErrorCollection;CompilerErrorCollection;(System.CodeDom.Compiler.CompilerError[]);Argument[0].Element;Argument[this];taint;df-generated |
-| System.CodeDom.Compiler;CompilerErrorCollection;CopyTo;(System.CodeDom.Compiler.CompilerError[],System.Int32);Argument[this];Argument[0].Element;taint;df-generated |
-| System.CodeDom.Compiler;CompilerErrorCollection;Insert;(System.Int32,System.CodeDom.Compiler.CompilerError);Argument[1];Argument[this];taint;df-generated |
-| System.CodeDom.Compiler;CompilerErrorCollection;Remove;(System.CodeDom.Compiler.CompilerError);Argument[0];Argument[this];taint;df-generated |
-| System.CodeDom.Compiler;CompilerErrorCollection;get_Item;(System.Int32);Argument[this];ReturnValue;taint;df-generated |
-| System.CodeDom.Compiler;CompilerErrorCollection;set_Item;(System.Int32,System.CodeDom.Compiler.CompilerError);Argument[1];Argument[this];taint;df-generated |
+| System.CodeDom.Compiler;CompilerErrorCollection;Add;(System.CodeDom.Compiler.CompilerError);Argument[0];Argument[this].Property[System.Collections.CollectionBase.List].Element;value;dfc-generated |
+| System.CodeDom.Compiler;CompilerErrorCollection;AddRange;(System.CodeDom.Compiler.CompilerErrorCollection);Argument[0].Property[System.Collections.CollectionBase.List].Element;Argument[this].Property[System.Collections.CollectionBase.List].Element;value;dfc-generated |
+| System.CodeDom.Compiler;CompilerErrorCollection;AddRange;(System.CodeDom.Compiler.CompilerError[]);Argument[0].Element;Argument[this].Property[System.Collections.CollectionBase.List].Element;value;dfc-generated |
+| System.CodeDom.Compiler;CompilerErrorCollection;CompilerErrorCollection;(System.CodeDom.Compiler.CompilerErrorCollection);Argument[0].Property[System.Collections.CollectionBase.List].Element;Argument[this].Property[System.Collections.CollectionBase.List].Element;value;dfc-generated |
+| System.CodeDom.Compiler;CompilerErrorCollection;CompilerErrorCollection;(System.CodeDom.Compiler.CompilerError[]);Argument[0].Element;Argument[this].Property[System.Collections.CollectionBase.List].Element;value;dfc-generated |
+| System.CodeDom.Compiler;CompilerErrorCollection;CopyTo;(System.CodeDom.Compiler.CompilerError[],System.Int32);Argument[this].Property[System.Collections.CollectionBase.List].Element;Argument[0].Element;value;dfc-generated |
+| System.CodeDom.Compiler;CompilerErrorCollection;Insert;(System.Int32,System.CodeDom.Compiler.CompilerError);Argument[1];Argument[this].Property[System.Collections.CollectionBase.List].Element;value;dfc-generated |
+| System.CodeDom.Compiler;CompilerErrorCollection;get_Item;(System.Int32);Argument[this].Property[System.Collections.CollectionBase.List].Element;ReturnValue;value;dfc-generated |
+| System.CodeDom.Compiler;CompilerErrorCollection;set_Item;(System.Int32,System.CodeDom.Compiler.CompilerError);Argument[1];Argument[this].Property[System.Collections.CollectionBase.List].Element;value;dfc-generated |
 | System.CodeDom.Compiler;CompilerInfo;GetExtensions;();Argument[this];ReturnValue;taint;df-generated |
 | System.CodeDom.Compiler;CompilerInfo;GetLanguages;();Argument[this];ReturnValue;taint;df-generated |
-| System.CodeDom.Compiler;CompilerParameters;CompilerParameters;(System.String[],System.String,System.Boolean);Argument[0].Element;Argument[this];taint;df-generated |
-| System.CodeDom.Compiler;Executor;ExecWaitWithCapture;(System.IntPtr,System.String,System.CodeDom.Compiler.TempFileCollection,System.String,System.String);Argument[2].Element;ReturnValue;taint;df-generated |
-| System.CodeDom.Compiler;Executor;ExecWaitWithCapture;(System.IntPtr,System.String,System.CodeDom.Compiler.TempFileCollection,System.String,System.String);Argument[3];ReturnValue;taint;df-generated |
-| System.CodeDom.Compiler;Executor;ExecWaitWithCapture;(System.IntPtr,System.String,System.CodeDom.Compiler.TempFileCollection,System.String,System.String);Argument[4];ReturnValue;taint;df-generated |
-| System.CodeDom.Compiler;Executor;ExecWaitWithCapture;(System.IntPtr,System.String,System.String,System.CodeDom.Compiler.TempFileCollection,System.String,System.String);Argument[3].Element;ReturnValue;taint;df-generated |
-| System.CodeDom.Compiler;Executor;ExecWaitWithCapture;(System.String,System.CodeDom.Compiler.TempFileCollection,System.String,System.String);Argument[1].Element;ReturnValue;taint;df-generated |
-| System.CodeDom.Compiler;Executor;ExecWaitWithCapture;(System.String,System.CodeDom.Compiler.TempFileCollection,System.String,System.String);Argument[2];ReturnValue;taint;df-generated |
-| System.CodeDom.Compiler;Executor;ExecWaitWithCapture;(System.String,System.CodeDom.Compiler.TempFileCollection,System.String,System.String);Argument[3];ReturnValue;taint;df-generated |
-| System.CodeDom.Compiler;Executor;ExecWaitWithCapture;(System.String,System.String,System.CodeDom.Compiler.TempFileCollection,System.String,System.String);Argument[2].Element;ReturnValue;taint;df-generated |
-| System.CodeDom.Compiler;Executor;ExecWaitWithCapture;(System.String,System.String,System.CodeDom.Compiler.TempFileCollection,System.String,System.String);Argument[3];ReturnValue;taint;df-generated |
-| System.CodeDom.Compiler;Executor;ExecWaitWithCapture;(System.String,System.String,System.CodeDom.Compiler.TempFileCollection,System.String,System.String);Argument[4];ReturnValue;taint;df-generated |
-| System.CodeDom.Compiler;GeneratedCodeAttribute;GeneratedCodeAttribute;(System.String,System.String);Argument[0];Argument[this];taint;df-generated |
-| System.CodeDom.Compiler;GeneratedCodeAttribute;GeneratedCodeAttribute;(System.String,System.String);Argument[1];Argument[this];taint;df-generated |
-| System.CodeDom.Compiler;GeneratedCodeAttribute;get_Tool;();Argument[this];ReturnValue;taint;df-generated |
-| System.CodeDom.Compiler;GeneratedCodeAttribute;get_Version;();Argument[this];ReturnValue;taint;df-generated |
+| System.CodeDom.Compiler;CompilerParameters;CompilerParameters;(System.String[],System.String,System.Boolean);Argument[0].Element;Argument[this].Property[System.CodeDom.Compiler.CompilerParameters.ReferencedAssemblies].Element;value;dfc-generated |
+| System.CodeDom.Compiler;Executor;ExecWaitWithCapture;(System.IntPtr,System.String,System.CodeDom.Compiler.TempFileCollection,System.String,System.String);Argument[3];ReturnValue;value;dfc-generated |
+| System.CodeDom.Compiler;Executor;ExecWaitWithCapture;(System.IntPtr,System.String,System.CodeDom.Compiler.TempFileCollection,System.String,System.String);Argument[4];ReturnValue;value;dfc-generated |
+| System.CodeDom.Compiler;Executor;ExecWaitWithCapture;(System.IntPtr,System.String,System.String,System.CodeDom.Compiler.TempFileCollection,System.String,System.String);Argument[4];ReturnValue;value;dfc-generated |
+| System.CodeDom.Compiler;Executor;ExecWaitWithCapture;(System.IntPtr,System.String,System.String,System.CodeDom.Compiler.TempFileCollection,System.String,System.String);Argument[5];ReturnValue;value;dfc-generated |
+| System.CodeDom.Compiler;Executor;ExecWaitWithCapture;(System.String,System.CodeDom.Compiler.TempFileCollection,System.String,System.String);Argument[2];ReturnValue;value;dfc-generated |
+| System.CodeDom.Compiler;Executor;ExecWaitWithCapture;(System.String,System.CodeDom.Compiler.TempFileCollection,System.String,System.String);Argument[3];ReturnValue;value;dfc-generated |
+| System.CodeDom.Compiler;Executor;ExecWaitWithCapture;(System.String,System.String,System.CodeDom.Compiler.TempFileCollection,System.String,System.String);Argument[3];ReturnValue;value;dfc-generated |
+| System.CodeDom.Compiler;Executor;ExecWaitWithCapture;(System.String,System.String,System.CodeDom.Compiler.TempFileCollection,System.String,System.String);Argument[4];ReturnValue;value;dfc-generated |
+| System.CodeDom.Compiler;GeneratedCodeAttribute;GeneratedCodeAttribute;(System.String,System.String);Argument[0];Argument[this].SyntheticField[System.CodeDom.Compiler.GeneratedCodeAttribute._tool];value;dfc-generated |
+| System.CodeDom.Compiler;GeneratedCodeAttribute;GeneratedCodeAttribute;(System.String,System.String);Argument[1];Argument[this].SyntheticField[System.CodeDom.Compiler.GeneratedCodeAttribute._version];value;dfc-generated |
+| System.CodeDom.Compiler;GeneratedCodeAttribute;get_Tool;();Argument[this].SyntheticField[System.CodeDom.Compiler.GeneratedCodeAttribute._tool];ReturnValue;value;dfc-generated |
+| System.CodeDom.Compiler;GeneratedCodeAttribute;get_Version;();Argument[this].SyntheticField[System.CodeDom.Compiler.GeneratedCodeAttribute._version];ReturnValue;value;dfc-generated |
 | System.CodeDom.Compiler;ICodeCompiler;CompileAssemblyFromDom;(System.CodeDom.Compiler.CompilerParameters,System.CodeDom.CodeCompileUnit);Argument[1];Argument[0];taint;df-generated |
 | System.CodeDom.Compiler;ICodeCompiler;CompileAssemblyFromDom;(System.CodeDom.Compiler.CompilerParameters,System.CodeDom.CodeCompileUnit);Argument[1];Argument[this];taint;df-generated |
 | System.CodeDom.Compiler;ICodeCompiler;CompileAssemblyFromDomBatch;(System.CodeDom.Compiler.CompilerParameters,System.CodeDom.CodeCompileUnit[]);Argument[1].Element;Argument[0];taint;df-generated |
 | System.CodeDom.Compiler;ICodeCompiler;CompileAssemblyFromDomBatch;(System.CodeDom.Compiler.CompilerParameters,System.CodeDom.CodeCompileUnit[]);Argument[1].Element;Argument[this];taint;df-generated |
-| System.CodeDom.Compiler;ICodeGenerator;CreateEscapedIdentifier;(System.String);Argument[0];ReturnValue;taint;df-generated |
-| System.CodeDom.Compiler;ICodeGenerator;CreateValidIdentifier;(System.String);Argument[0];ReturnValue;taint;df-generated |
+| System.CodeDom.Compiler;ICodeGenerator;CreateEscapedIdentifier;(System.String);Argument[0];ReturnValue;value;dfc-generated |
+| System.CodeDom.Compiler;ICodeGenerator;CreateValidIdentifier;(System.String);Argument[0];ReturnValue;value;dfc-generated |
 | System.CodeDom.Compiler;ICodeGenerator;GenerateCodeFromCompileUnit;(System.CodeDom.CodeCompileUnit,System.IO.TextWriter,System.CodeDom.Compiler.CodeGeneratorOptions);Argument[0];Argument[this];taint;df-generated |
 | System.CodeDom.Compiler;ICodeGenerator;GenerateCodeFromCompileUnit;(System.CodeDom.CodeCompileUnit,System.IO.TextWriter,System.CodeDom.Compiler.CodeGeneratorOptions);Argument[2];Argument[this];taint;df-generated |
-| System.CodeDom.Compiler;ICodeGenerator;GenerateCodeFromExpression;(System.CodeDom.CodeExpression,System.IO.TextWriter,System.CodeDom.Compiler.CodeGeneratorOptions);Argument[0];Argument[this];taint;df-generated |
 | System.CodeDom.Compiler;ICodeGenerator;GenerateCodeFromExpression;(System.CodeDom.CodeExpression,System.IO.TextWriter,System.CodeDom.Compiler.CodeGeneratorOptions);Argument[2];Argument[this];taint;df-generated |
 | System.CodeDom.Compiler;ICodeGenerator;GenerateCodeFromNamespace;(System.CodeDom.CodeNamespace,System.IO.TextWriter,System.CodeDom.Compiler.CodeGeneratorOptions);Argument[0];Argument[this];taint;df-generated |
 | System.CodeDom.Compiler;ICodeGenerator;GenerateCodeFromNamespace;(System.CodeDom.CodeNamespace,System.IO.TextWriter,System.CodeDom.Compiler.CodeGeneratorOptions);Argument[2];Argument[this];taint;df-generated |
-| System.CodeDom.Compiler;ICodeGenerator;GenerateCodeFromStatement;(System.CodeDom.CodeStatement,System.IO.TextWriter,System.CodeDom.Compiler.CodeGeneratorOptions);Argument[0];Argument[this];taint;df-generated |
 | System.CodeDom.Compiler;ICodeGenerator;GenerateCodeFromStatement;(System.CodeDom.CodeStatement,System.IO.TextWriter,System.CodeDom.Compiler.CodeGeneratorOptions);Argument[2];Argument[this];taint;df-generated |
 | System.CodeDom.Compiler;ICodeGenerator;GenerateCodeFromType;(System.CodeDom.CodeTypeDeclaration,System.IO.TextWriter,System.CodeDom.Compiler.CodeGeneratorOptions);Argument[0];Argument[this];taint;df-generated |
 | System.CodeDom.Compiler;ICodeGenerator;GenerateCodeFromType;(System.CodeDom.CodeTypeDeclaration,System.IO.TextWriter,System.CodeDom.Compiler.CodeGeneratorOptions);Argument[2];Argument[this];taint;df-generated |
 | System.CodeDom.Compiler;ICodeGenerator;GetTypeOutput;(System.CodeDom.CodeTypeReference);Argument[0];ReturnValue;taint;df-generated |
-| System.CodeDom.Compiler;IndentedTextWriter;IndentedTextWriter;(System.IO.TextWriter,System.String);Argument[0];Argument[this];taint;df-generated |
-| System.CodeDom.Compiler;IndentedTextWriter;IndentedTextWriter;(System.IO.TextWriter,System.String);Argument[1];Argument[this];taint;df-generated |
-| System.CodeDom.Compiler;IndentedTextWriter;WriteLineNoTabs;(System.String);Argument[0];Argument[this];taint;df-generated |
+| System.CodeDom.Compiler;IndentedTextWriter;FlushAsync;();Argument[this].SyntheticField[System.CodeDom.Compiler.IndentedTextWriter._writer].SyntheticField[System.CodeDom.Compiler.IndentedTextWriter._writer];ReturnValue.SyntheticField[System.Threading.Tasks.Task.m_stateObject];value;dfc-generated |
+| System.CodeDom.Compiler;IndentedTextWriter;FlushAsync;();Argument[this].SyntheticField[System.CodeDom.Compiler.IndentedTextWriter._writer];ReturnValue.SyntheticField[System.Threading.Tasks.Task.m_stateObject];value;dfc-generated |
+| System.CodeDom.Compiler;IndentedTextWriter;FlushAsync;(System.Threading.CancellationToken);Argument[this].SyntheticField[System.CodeDom.Compiler.IndentedTextWriter._writer].SyntheticField[System.CodeDom.Compiler.IndentedTextWriter._writer];ReturnValue.SyntheticField[System.Threading.Tasks.Task.m_stateObject];value;dfc-generated |
+| System.CodeDom.Compiler;IndentedTextWriter;FlushAsync;(System.Threading.CancellationToken);Argument[this].SyntheticField[System.CodeDom.Compiler.IndentedTextWriter._writer];ReturnValue.SyntheticField[System.Threading.Tasks.Task.m_stateObject];value;dfc-generated |
+| System.CodeDom.Compiler;IndentedTextWriter;IndentedTextWriter;(System.IO.TextWriter,System.String);Argument[0];Argument[this].SyntheticField[System.CodeDom.Compiler.IndentedTextWriter._writer];value;dfc-generated |
+| System.CodeDom.Compiler;IndentedTextWriter;Write;(System.Char[]);Argument[0].Element;Argument[this].SyntheticField[System.CodeDom.Compiler.IndentedTextWriter._writer].SyntheticField[System.CodeDom.Compiler.IndentedTextWriter._writer];taint;df-generated |
+| System.CodeDom.Compiler;IndentedTextWriter;Write;(System.Char[]);Argument[0].Element;Argument[this].SyntheticField[System.CodeDom.Compiler.IndentedTextWriter._writer].SyntheticField[System.CodeDom.Compiler.IndentedTextWriter._writer];taint;dfc-generated |
+| System.CodeDom.Compiler;IndentedTextWriter;Write;(System.String,System.Object);Argument[0];Argument[this].SyntheticField[System.CodeDom.Compiler.IndentedTextWriter._writer].SyntheticField[System.CodeDom.Compiler.IndentedTextWriter._writer];taint;df-generated |
+| System.CodeDom.Compiler;IndentedTextWriter;Write;(System.String,System.Object);Argument[0];Argument[this].SyntheticField[System.CodeDom.Compiler.IndentedTextWriter._writer].SyntheticField[System.CodeDom.Compiler.IndentedTextWriter._writer];taint;dfc-generated |
+| System.CodeDom.Compiler;IndentedTextWriter;Write;(System.String,System.Object);Argument[1];Argument[this].SyntheticField[System.CodeDom.Compiler.IndentedTextWriter._writer].SyntheticField[System.CodeDom.Compiler.IndentedTextWriter._writer];taint;df-generated |
+| System.CodeDom.Compiler;IndentedTextWriter;Write;(System.String,System.Object);Argument[1];Argument[this].SyntheticField[System.CodeDom.Compiler.IndentedTextWriter._writer].SyntheticField[System.CodeDom.Compiler.IndentedTextWriter._writer];taint;dfc-generated |
+| System.CodeDom.Compiler;IndentedTextWriter;Write;(System.String,System.Object,System.Object);Argument[0];Argument[this].SyntheticField[System.CodeDom.Compiler.IndentedTextWriter._writer].SyntheticField[System.CodeDom.Compiler.IndentedTextWriter._writer];taint;df-generated |
+| System.CodeDom.Compiler;IndentedTextWriter;Write;(System.String,System.Object,System.Object);Argument[0];Argument[this].SyntheticField[System.CodeDom.Compiler.IndentedTextWriter._writer].SyntheticField[System.CodeDom.Compiler.IndentedTextWriter._writer];taint;dfc-generated |
+| System.CodeDom.Compiler;IndentedTextWriter;Write;(System.String,System.Object,System.Object);Argument[1];Argument[this].SyntheticField[System.CodeDom.Compiler.IndentedTextWriter._writer].SyntheticField[System.CodeDom.Compiler.IndentedTextWriter._writer];taint;df-generated |
+| System.CodeDom.Compiler;IndentedTextWriter;Write;(System.String,System.Object,System.Object);Argument[1];Argument[this].SyntheticField[System.CodeDom.Compiler.IndentedTextWriter._writer].SyntheticField[System.CodeDom.Compiler.IndentedTextWriter._writer];taint;dfc-generated |
+| System.CodeDom.Compiler;IndentedTextWriter;Write;(System.String,System.Object,System.Object);Argument[2];Argument[this].SyntheticField[System.CodeDom.Compiler.IndentedTextWriter._writer].SyntheticField[System.CodeDom.Compiler.IndentedTextWriter._writer];taint;df-generated |
+| System.CodeDom.Compiler;IndentedTextWriter;Write;(System.String,System.Object,System.Object);Argument[2];Argument[this].SyntheticField[System.CodeDom.Compiler.IndentedTextWriter._writer].SyntheticField[System.CodeDom.Compiler.IndentedTextWriter._writer];taint;dfc-generated |
+| System.CodeDom.Compiler;IndentedTextWriter;Write;(System.String,System.Object[]);Argument[0];Argument[this].SyntheticField[System.CodeDom.Compiler.IndentedTextWriter._writer].SyntheticField[System.CodeDom.Compiler.IndentedTextWriter._writer];taint;df-generated |
+| System.CodeDom.Compiler;IndentedTextWriter;Write;(System.String,System.Object[]);Argument[0];Argument[this].SyntheticField[System.CodeDom.Compiler.IndentedTextWriter._writer].SyntheticField[System.CodeDom.Compiler.IndentedTextWriter._writer];taint;dfc-generated |
+| System.CodeDom.Compiler;IndentedTextWriter;Write;(System.String,System.Object[]);Argument[1].Element;Argument[this].SyntheticField[System.CodeDom.Compiler.IndentedTextWriter._writer].SyntheticField[System.CodeDom.Compiler.IndentedTextWriter._writer];taint;df-generated |
+| System.CodeDom.Compiler;IndentedTextWriter;Write;(System.String,System.Object[]);Argument[1].Element;Argument[this].SyntheticField[System.CodeDom.Compiler.IndentedTextWriter._writer].SyntheticField[System.CodeDom.Compiler.IndentedTextWriter._writer];taint;dfc-generated |
+| System.CodeDom.Compiler;IndentedTextWriter;WriteLine;(System.Char[]);Argument[0].Element;Argument[this].SyntheticField[System.CodeDom.Compiler.IndentedTextWriter._writer].SyntheticField[System.CodeDom.Compiler.IndentedTextWriter._writer];taint;df-generated |
+| System.CodeDom.Compiler;IndentedTextWriter;WriteLine;(System.Char[]);Argument[0].Element;Argument[this].SyntheticField[System.CodeDom.Compiler.IndentedTextWriter._writer].SyntheticField[System.CodeDom.Compiler.IndentedTextWriter._writer];taint;dfc-generated |
+| System.CodeDom.Compiler;IndentedTextWriter;WriteLine;(System.Char[],System.Int32,System.Int32);Argument[0].Element;Argument[this].SyntheticField[System.CodeDom.Compiler.IndentedTextWriter._writer].SyntheticField[System.CodeDom.Compiler.IndentedTextWriter._writer];taint;df-generated |
+| System.CodeDom.Compiler;IndentedTextWriter;WriteLine;(System.Char[],System.Int32,System.Int32);Argument[0].Element;Argument[this].SyntheticField[System.CodeDom.Compiler.IndentedTextWriter._writer].SyntheticField[System.CodeDom.Compiler.IndentedTextWriter._writer];taint;dfc-generated |
+| System.CodeDom.Compiler;IndentedTextWriter;WriteLine;(System.String);Argument[0];Argument[this].SyntheticField[System.CodeDom.Compiler.IndentedTextWriter._writer].SyntheticField[System.CodeDom.Compiler.IndentedTextWriter._writer];taint;df-generated |
+| System.CodeDom.Compiler;IndentedTextWriter;WriteLine;(System.String);Argument[0];Argument[this].SyntheticField[System.CodeDom.Compiler.IndentedTextWriter._writer].SyntheticField[System.CodeDom.Compiler.IndentedTextWriter._writer];taint;dfc-generated |
+| System.CodeDom.Compiler;IndentedTextWriter;WriteLine;(System.String,System.Object);Argument[0];Argument[this].SyntheticField[System.CodeDom.Compiler.IndentedTextWriter._writer].SyntheticField[System.CodeDom.Compiler.IndentedTextWriter._writer];taint;df-generated |
+| System.CodeDom.Compiler;IndentedTextWriter;WriteLine;(System.String,System.Object);Argument[0];Argument[this].SyntheticField[System.CodeDom.Compiler.IndentedTextWriter._writer].SyntheticField[System.CodeDom.Compiler.IndentedTextWriter._writer];taint;dfc-generated |
+| System.CodeDom.Compiler;IndentedTextWriter;WriteLine;(System.String,System.Object);Argument[1];Argument[this].SyntheticField[System.CodeDom.Compiler.IndentedTextWriter._writer].SyntheticField[System.CodeDom.Compiler.IndentedTextWriter._writer];taint;df-generated |
+| System.CodeDom.Compiler;IndentedTextWriter;WriteLine;(System.String,System.Object);Argument[1];Argument[this].SyntheticField[System.CodeDom.Compiler.IndentedTextWriter._writer].SyntheticField[System.CodeDom.Compiler.IndentedTextWriter._writer];taint;dfc-generated |
+| System.CodeDom.Compiler;IndentedTextWriter;WriteLine;(System.String,System.Object,System.Object);Argument[0];Argument[this].SyntheticField[System.CodeDom.Compiler.IndentedTextWriter._writer].SyntheticField[System.CodeDom.Compiler.IndentedTextWriter._writer];taint;df-generated |
+| System.CodeDom.Compiler;IndentedTextWriter;WriteLine;(System.String,System.Object,System.Object);Argument[0];Argument[this].SyntheticField[System.CodeDom.Compiler.IndentedTextWriter._writer].SyntheticField[System.CodeDom.Compiler.IndentedTextWriter._writer];taint;dfc-generated |
+| System.CodeDom.Compiler;IndentedTextWriter;WriteLine;(System.String,System.Object,System.Object);Argument[1];Argument[this].SyntheticField[System.CodeDom.Compiler.IndentedTextWriter._writer].SyntheticField[System.CodeDom.Compiler.IndentedTextWriter._writer];taint;df-generated |
+| System.CodeDom.Compiler;IndentedTextWriter;WriteLine;(System.String,System.Object,System.Object);Argument[1];Argument[this].SyntheticField[System.CodeDom.Compiler.IndentedTextWriter._writer].SyntheticField[System.CodeDom.Compiler.IndentedTextWriter._writer];taint;dfc-generated |
+| System.CodeDom.Compiler;IndentedTextWriter;WriteLine;(System.String,System.Object,System.Object);Argument[2];Argument[this].SyntheticField[System.CodeDom.Compiler.IndentedTextWriter._writer].SyntheticField[System.CodeDom.Compiler.IndentedTextWriter._writer];taint;df-generated |
+| System.CodeDom.Compiler;IndentedTextWriter;WriteLine;(System.String,System.Object,System.Object);Argument[2];Argument[this].SyntheticField[System.CodeDom.Compiler.IndentedTextWriter._writer].SyntheticField[System.CodeDom.Compiler.IndentedTextWriter._writer];taint;dfc-generated |
+| System.CodeDom.Compiler;IndentedTextWriter;WriteLine;(System.String,System.Object[]);Argument[0];Argument[this].SyntheticField[System.CodeDom.Compiler.IndentedTextWriter._writer].SyntheticField[System.CodeDom.Compiler.IndentedTextWriter._writer];taint;df-generated |
+| System.CodeDom.Compiler;IndentedTextWriter;WriteLine;(System.String,System.Object[]);Argument[0];Argument[this].SyntheticField[System.CodeDom.Compiler.IndentedTextWriter._writer].SyntheticField[System.CodeDom.Compiler.IndentedTextWriter._writer];taint;dfc-generated |
+| System.CodeDom.Compiler;IndentedTextWriter;WriteLine;(System.String,System.Object[]);Argument[1].Element;Argument[this].SyntheticField[System.CodeDom.Compiler.IndentedTextWriter._writer].SyntheticField[System.CodeDom.Compiler.IndentedTextWriter._writer];taint;df-generated |
+| System.CodeDom.Compiler;IndentedTextWriter;WriteLine;(System.String,System.Object[]);Argument[1].Element;Argument[this].SyntheticField[System.CodeDom.Compiler.IndentedTextWriter._writer].SyntheticField[System.CodeDom.Compiler.IndentedTextWriter._writer];taint;dfc-generated |
+| System.CodeDom.Compiler;IndentedTextWriter;WriteLineAsync;(System.Char[],System.Int32,System.Int32);Argument[0].Element;Argument[this].SyntheticField[System.CodeDom.Compiler.IndentedTextWriter._writer].SyntheticField[System.CodeDom.Compiler.IndentedTextWriter._writer];taint;df-generated |
+| System.CodeDom.Compiler;IndentedTextWriter;WriteLineAsync;(System.Char[],System.Int32,System.Int32);Argument[0].Element;Argument[this].SyntheticField[System.CodeDom.Compiler.IndentedTextWriter._writer].SyntheticField[System.CodeDom.Compiler.IndentedTextWriter._writer];taint;dfc-generated |
+| System.CodeDom.Compiler;IndentedTextWriter;WriteLineAsync;(System.Char[],System.Int32,System.Int32);Argument[0].Element;Argument[this].SyntheticField[System.CodeDom.Compiler.IndentedTextWriter._writer];taint;df-generated |
+| System.CodeDom.Compiler;IndentedTextWriter;WriteLineAsync;(System.Char[],System.Int32,System.Int32);Argument[0].Element;Argument[this].SyntheticField[System.CodeDom.Compiler.IndentedTextWriter._writer];taint;dfc-generated |
+| System.CodeDom.Compiler;IndentedTextWriter;WriteLineAsync;(System.String);Argument[0];Argument[this].SyntheticField[System.CodeDom.Compiler.IndentedTextWriter._writer].SyntheticField[System.CodeDom.Compiler.IndentedTextWriter._writer];taint;df-generated |
+| System.CodeDom.Compiler;IndentedTextWriter;WriteLineAsync;(System.String);Argument[0];Argument[this].SyntheticField[System.CodeDom.Compiler.IndentedTextWriter._writer].SyntheticField[System.CodeDom.Compiler.IndentedTextWriter._writer];taint;dfc-generated |
+| System.CodeDom.Compiler;IndentedTextWriter;WriteLineAsync;(System.String);Argument[0];Argument[this].SyntheticField[System.CodeDom.Compiler.IndentedTextWriter._writer];taint;df-generated |
+| System.CodeDom.Compiler;IndentedTextWriter;WriteLineAsync;(System.String);Argument[0];Argument[this].SyntheticField[System.CodeDom.Compiler.IndentedTextWriter._writer];taint;dfc-generated |
+| System.CodeDom.Compiler;IndentedTextWriter;WriteLineNoTabs;(System.String);Argument[0];Argument[this].SyntheticField[System.CodeDom.Compiler.IndentedTextWriter._writer].SyntheticField[System.CodeDom.Compiler.IndentedTextWriter._writer];taint;dfc-generated |
 | System.CodeDom.Compiler;IndentedTextWriter;WriteLineNoTabsAsync;(System.String);Argument[0];Argument[this];taint;df-generated |
 | System.CodeDom.Compiler;IndentedTextWriter;WriteLineNoTabsAsync;(System.String);Argument[0];ReturnValue;taint;df-generated |
 | System.CodeDom.Compiler;IndentedTextWriter;WriteLineNoTabsAsync;(System.String);Argument[this];ReturnValue;taint;df-generated |
-| System.CodeDom.Compiler;IndentedTextWriter;get_InnerWriter;();Argument[this];ReturnValue;taint;df-generated |
-| System.CodeDom.Compiler;TempFileCollection;AddExtension;(System.String);Argument[0];ReturnValue;taint;df-generated |
-| System.CodeDom.Compiler;TempFileCollection;AddExtension;(System.String);Argument[this];ReturnValue;taint;df-generated |
-| System.CodeDom.Compiler;TempFileCollection;AddExtension;(System.String,System.Boolean);Argument[0];ReturnValue;taint;df-generated |
-| System.CodeDom.Compiler;TempFileCollection;AddExtension;(System.String,System.Boolean);Argument[this];ReturnValue;taint;df-generated |
+| System.CodeDom.Compiler;IndentedTextWriter;get_Encoding;();Argument[this].SyntheticField[System.CodeDom.Compiler.IndentedTextWriter._writer].Property[System.IO.TextWriter.Encoding];ReturnValue;value;df-generated |
+| System.CodeDom.Compiler;IndentedTextWriter;get_Encoding;();Argument[this].SyntheticField[System.CodeDom.Compiler.IndentedTextWriter._writer].Property[System.IO.TextWriter.Encoding];ReturnValue;value;dfc-generated |
+| System.CodeDom.Compiler;IndentedTextWriter;get_InnerWriter;();Argument[this].SyntheticField[System.CodeDom.Compiler.IndentedTextWriter._writer];ReturnValue;value;dfc-generated |
+| System.CodeDom.Compiler;TempFileCollection;AddExtension;(System.String);Argument[0];ReturnValue;taint;dfc-generated |
+| System.CodeDom.Compiler;TempFileCollection;AddExtension;(System.String);Argument[this].Property[System.CodeDom.Compiler.TempFileCollection.BasePath];ReturnValue;taint;dfc-generated |
+| System.CodeDom.Compiler;TempFileCollection;AddExtension;(System.String,System.Boolean);Argument[0];ReturnValue;taint;dfc-generated |
+| System.CodeDom.Compiler;TempFileCollection;AddExtension;(System.String,System.Boolean);Argument[this].Property[System.CodeDom.Compiler.TempFileCollection.BasePath];ReturnValue;taint;dfc-generated |
 | System.CodeDom.Compiler;TempFileCollection;CopyTo;(System.String[],System.Int32);Argument[this];Argument[0].Element;taint;df-generated |
 | System.CodeDom.Compiler;TempFileCollection;GetEnumerator;();Argument[this];ReturnValue;taint;df-generated |
-| System.CodeDom.Compiler;TempFileCollection;TempFileCollection;(System.String,System.Boolean);Argument[0];Argument[this];taint;df-generated |
+| System.CodeDom.Compiler;TempFileCollection;TempFileCollection;(System.String,System.Boolean);Argument[0];Argument[this].SyntheticField[System.CodeDom.Compiler.TempFileCollection._tempDir];value;dfc-generated |
 | System.CodeDom.Compiler;TempFileCollection;get_BasePath;();Argument[this];ReturnValue;taint;df-generated |
-| System.CodeDom.Compiler;TempFileCollection;get_TempDir;();Argument[this];ReturnValue;taint;df-generated |
+| System.CodeDom.Compiler;TempFileCollection;get_TempDir;();Argument[this].SyntheticField[System.CodeDom.Compiler.TempFileCollection._tempDir];ReturnValue;value;dfc-generated |
 | System.CodeDom;CodeArgumentReferenceExpression;CodeArgumentReferenceExpression;(System.String);Argument[0];Argument[this];taint;df-generated |
 | System.CodeDom;CodeArrayCreateExpression;CodeArrayCreateExpression;(System.CodeDom.CodeTypeReference,System.CodeDom.CodeExpression);Argument[0];Argument[this];taint;df-generated |
 | System.CodeDom;CodeArrayCreateExpression;CodeArrayCreateExpression;(System.CodeDom.CodeTypeReference,System.CodeDom.CodeExpression[]);Argument[0];Argument[this];taint;df-generated |
-| System.CodeDom;CodeArrayCreateExpression;CodeArrayCreateExpression;(System.CodeDom.CodeTypeReference,System.CodeDom.CodeExpression[]);Argument[1].Element;Argument[this];taint;df-generated |
 | System.CodeDom;CodeArrayCreateExpression;CodeArrayCreateExpression;(System.CodeDom.CodeTypeReference,System.Int32);Argument[0];Argument[this];taint;df-generated |
-| System.CodeDom;CodeArrayCreateExpression;CodeArrayCreateExpression;(System.String,System.CodeDom.CodeExpression);Argument[0];Argument[this];taint;df-generated |
-| System.CodeDom;CodeArrayCreateExpression;CodeArrayCreateExpression;(System.String,System.CodeDom.CodeExpression[]);Argument[0];Argument[this];taint;df-generated |
-| System.CodeDom;CodeArrayCreateExpression;CodeArrayCreateExpression;(System.String,System.CodeDom.CodeExpression[]);Argument[1].Element;Argument[this];taint;df-generated |
-| System.CodeDom;CodeArrayCreateExpression;CodeArrayCreateExpression;(System.String,System.Int32);Argument[0];Argument[this];taint;df-generated |
-| System.CodeDom;CodeArrayCreateExpression;CodeArrayCreateExpression;(System.Type,System.CodeDom.CodeExpression[]);Argument[1].Element;Argument[this];taint;df-generated |
 | System.CodeDom;CodeArrayCreateExpression;get_Initializers;();Argument[this];ReturnValue;taint;df-generated |
-| System.CodeDom;CodeArrayIndexerExpression;CodeArrayIndexerExpression;(System.CodeDom.CodeExpression,System.CodeDom.CodeExpression[]);Argument[1].Element;Argument[this];taint;df-generated |
 | System.CodeDom;CodeAttachEventStatement;CodeAttachEventStatement;(System.CodeDom.CodeEventReferenceExpression,System.CodeDom.CodeExpression);Argument[0];Argument[this];taint;df-generated |
 | System.CodeDom;CodeAttributeArgument;CodeAttributeArgument;(System.String,System.CodeDom.CodeExpression);Argument[0];Argument[this];taint;df-generated |
-| System.CodeDom;CodeAttributeArgumentCollection;Add;(System.CodeDom.CodeAttributeArgument);Argument[0];Argument[this];taint;df-generated |
-| System.CodeDom;CodeAttributeArgumentCollection;AddRange;(System.CodeDom.CodeAttributeArgumentCollection);Argument[0].Element;Argument[this];taint;df-generated |
-| System.CodeDom;CodeAttributeArgumentCollection;AddRange;(System.CodeDom.CodeAttributeArgument[]);Argument[0].Element;Argument[this];taint;df-generated |
-| System.CodeDom;CodeAttributeArgumentCollection;CodeAttributeArgumentCollection;(System.CodeDom.CodeAttributeArgumentCollection);Argument[0].Element;Argument[this];taint;df-generated |
-| System.CodeDom;CodeAttributeArgumentCollection;CodeAttributeArgumentCollection;(System.CodeDom.CodeAttributeArgument[]);Argument[0].Element;Argument[this];taint;df-generated |
-| System.CodeDom;CodeAttributeArgumentCollection;CopyTo;(System.CodeDom.CodeAttributeArgument[],System.Int32);Argument[this];Argument[0].Element;taint;df-generated |
-| System.CodeDom;CodeAttributeArgumentCollection;Insert;(System.Int32,System.CodeDom.CodeAttributeArgument);Argument[1];Argument[this];taint;df-generated |
-| System.CodeDom;CodeAttributeArgumentCollection;Remove;(System.CodeDom.CodeAttributeArgument);Argument[0];Argument[this];taint;df-generated |
-| System.CodeDom;CodeAttributeArgumentCollection;get_Item;(System.Int32);Argument[this];ReturnValue;taint;df-generated |
-| System.CodeDom;CodeAttributeArgumentCollection;set_Item;(System.Int32,System.CodeDom.CodeAttributeArgument);Argument[1];Argument[this];taint;df-generated |
-| System.CodeDom;CodeAttributeDeclaration;CodeAttributeDeclaration;(System.CodeDom.CodeTypeReference,System.CodeDom.CodeAttributeArgument[]);Argument[0];Argument[this];taint;df-generated |
-| System.CodeDom;CodeAttributeDeclaration;CodeAttributeDeclaration;(System.CodeDom.CodeTypeReference,System.CodeDom.CodeAttributeArgument[]);Argument[1].Element;Argument[this];taint;df-generated |
+| System.CodeDom;CodeAttributeArgumentCollection;Add;(System.CodeDom.CodeAttributeArgument);Argument[0];Argument[this].Property[System.Collections.CollectionBase.List].Element;value;dfc-generated |
+| System.CodeDom;CodeAttributeArgumentCollection;AddRange;(System.CodeDom.CodeAttributeArgumentCollection);Argument[0].Property[System.Collections.CollectionBase.List].Element;Argument[this].Property[System.Collections.CollectionBase.List].Element;value;dfc-generated |
+| System.CodeDom;CodeAttributeArgumentCollection;AddRange;(System.CodeDom.CodeAttributeArgument[]);Argument[0].Element;Argument[this].Property[System.Collections.CollectionBase.List].Element;value;dfc-generated |
+| System.CodeDom;CodeAttributeArgumentCollection;CodeAttributeArgumentCollection;(System.CodeDom.CodeAttributeArgumentCollection);Argument[0].Property[System.Collections.CollectionBase.List].Element;Argument[this].Property[System.Collections.CollectionBase.List].Element;value;dfc-generated |
+| System.CodeDom;CodeAttributeArgumentCollection;CodeAttributeArgumentCollection;(System.CodeDom.CodeAttributeArgument[]);Argument[0].Element;Argument[this].Property[System.Collections.CollectionBase.List].Element;value;dfc-generated |
+| System.CodeDom;CodeAttributeArgumentCollection;CopyTo;(System.CodeDom.CodeAttributeArgument[],System.Int32);Argument[this].Property[System.Collections.CollectionBase.List].Element;Argument[0].Element;value;dfc-generated |
+| System.CodeDom;CodeAttributeArgumentCollection;Insert;(System.Int32,System.CodeDom.CodeAttributeArgument);Argument[1];Argument[this].Property[System.Collections.CollectionBase.List].Element;value;dfc-generated |
+| System.CodeDom;CodeAttributeArgumentCollection;get_Item;(System.Int32);Argument[this].Property[System.Collections.CollectionBase.List].Element;ReturnValue;value;dfc-generated |
+| System.CodeDom;CodeAttributeArgumentCollection;set_Item;(System.Int32,System.CodeDom.CodeAttributeArgument);Argument[1];Argument[this].Property[System.Collections.CollectionBase.List].Element;value;dfc-generated |
+| System.CodeDom;CodeAttributeDeclaration;CodeAttributeDeclaration;(System.CodeDom.CodeTypeReference,System.CodeDom.CodeAttributeArgument[]);Argument[0];Argument[this].SyntheticField[System.CodeDom.CodeAttributeDeclaration._attributeType];value;dfc-generated |
 | System.CodeDom;CodeAttributeDeclaration;CodeAttributeDeclaration;(System.String);Argument[0];Argument[this];taint;df-generated |
 | System.CodeDom;CodeAttributeDeclaration;CodeAttributeDeclaration;(System.String,System.CodeDom.CodeAttributeArgument[]);Argument[0];Argument[this];taint;df-generated |
-| System.CodeDom;CodeAttributeDeclaration;CodeAttributeDeclaration;(System.String,System.CodeDom.CodeAttributeArgument[]);Argument[1].Element;Argument[this];taint;df-generated |
 | System.CodeDom;CodeAttributeDeclaration;get_Arguments;();Argument[this];ReturnValue;taint;df-generated |
-| System.CodeDom;CodeAttributeDeclaration;get_AttributeType;();Argument[this];ReturnValue;taint;df-generated |
-| System.CodeDom;CodeAttributeDeclarationCollection;Add;(System.CodeDom.CodeAttributeDeclaration);Argument[0];Argument[this];taint;df-generated |
-| System.CodeDom;CodeAttributeDeclarationCollection;AddRange;(System.CodeDom.CodeAttributeDeclarationCollection);Argument[0].Element;Argument[this];taint;df-generated |
-| System.CodeDom;CodeAttributeDeclarationCollection;AddRange;(System.CodeDom.CodeAttributeDeclaration[]);Argument[0].Element;Argument[this];taint;df-generated |
-| System.CodeDom;CodeAttributeDeclarationCollection;CodeAttributeDeclarationCollection;(System.CodeDom.CodeAttributeDeclarationCollection);Argument[0].Element;Argument[this];taint;df-generated |
-| System.CodeDom;CodeAttributeDeclarationCollection;CodeAttributeDeclarationCollection;(System.CodeDom.CodeAttributeDeclaration[]);Argument[0].Element;Argument[this];taint;df-generated |
-| System.CodeDom;CodeAttributeDeclarationCollection;CopyTo;(System.CodeDom.CodeAttributeDeclaration[],System.Int32);Argument[this];Argument[0].Element;taint;df-generated |
-| System.CodeDom;CodeAttributeDeclarationCollection;Insert;(System.Int32,System.CodeDom.CodeAttributeDeclaration);Argument[1];Argument[this];taint;df-generated |
-| System.CodeDom;CodeAttributeDeclarationCollection;Remove;(System.CodeDom.CodeAttributeDeclaration);Argument[0];Argument[this];taint;df-generated |
-| System.CodeDom;CodeAttributeDeclarationCollection;get_Item;(System.Int32);Argument[this];ReturnValue;taint;df-generated |
-| System.CodeDom;CodeAttributeDeclarationCollection;set_Item;(System.Int32,System.CodeDom.CodeAttributeDeclaration);Argument[1];Argument[this];taint;df-generated |
+| System.CodeDom;CodeAttributeDeclaration;get_AttributeType;();Argument[this].SyntheticField[System.CodeDom.CodeAttributeDeclaration._attributeType];ReturnValue;value;dfc-generated |
+| System.CodeDom;CodeAttributeDeclarationCollection;Add;(System.CodeDom.CodeAttributeDeclaration);Argument[0];Argument[this].Property[System.Collections.CollectionBase.List].Element;value;dfc-generated |
+| System.CodeDom;CodeAttributeDeclarationCollection;AddRange;(System.CodeDom.CodeAttributeDeclarationCollection);Argument[0].Property[System.Collections.CollectionBase.List].Element;Argument[this].Property[System.Collections.CollectionBase.List].Element;value;dfc-generated |
+| System.CodeDom;CodeAttributeDeclarationCollection;AddRange;(System.CodeDom.CodeAttributeDeclaration[]);Argument[0].Element;Argument[this].Property[System.Collections.CollectionBase.List].Element;value;dfc-generated |
+| System.CodeDom;CodeAttributeDeclarationCollection;CodeAttributeDeclarationCollection;(System.CodeDom.CodeAttributeDeclarationCollection);Argument[0].Property[System.Collections.CollectionBase.List].Element;Argument[this].Property[System.Collections.CollectionBase.List].Element;value;dfc-generated |
+| System.CodeDom;CodeAttributeDeclarationCollection;CodeAttributeDeclarationCollection;(System.CodeDom.CodeAttributeDeclaration[]);Argument[0].Element;Argument[this].Property[System.Collections.CollectionBase.List].Element;value;dfc-generated |
+| System.CodeDom;CodeAttributeDeclarationCollection;CopyTo;(System.CodeDom.CodeAttributeDeclaration[],System.Int32);Argument[this].Property[System.Collections.CollectionBase.List].Element;Argument[0].Element;value;dfc-generated |
+| System.CodeDom;CodeAttributeDeclarationCollection;Insert;(System.Int32,System.CodeDom.CodeAttributeDeclaration);Argument[1];Argument[this].Property[System.Collections.CollectionBase.List].Element;value;dfc-generated |
+| System.CodeDom;CodeAttributeDeclarationCollection;get_Item;(System.Int32);Argument[this].Property[System.Collections.CollectionBase.List].Element;ReturnValue;value;dfc-generated |
+| System.CodeDom;CodeAttributeDeclarationCollection;set_Item;(System.Int32,System.CodeDom.CodeAttributeDeclaration);Argument[1];Argument[this].Property[System.Collections.CollectionBase.List].Element;value;dfc-generated |
 | System.CodeDom;CodeCastExpression;CodeCastExpression;(System.CodeDom.CodeTypeReference,System.CodeDom.CodeExpression);Argument[0];Argument[this];taint;df-generated |
-| System.CodeDom;CodeCastExpression;CodeCastExpression;(System.String,System.CodeDom.CodeExpression);Argument[0];Argument[this];taint;df-generated |
 | System.CodeDom;CodeCatchClause;CodeCatchClause;(System.String);Argument[0];Argument[this];taint;df-generated |
 | System.CodeDom;CodeCatchClause;CodeCatchClause;(System.String,System.CodeDom.CodeTypeReference);Argument[0];Argument[this];taint;df-generated |
 | System.CodeDom;CodeCatchClause;CodeCatchClause;(System.String,System.CodeDom.CodeTypeReference);Argument[1];Argument[this];taint;df-generated |
 | System.CodeDom;CodeCatchClause;CodeCatchClause;(System.String,System.CodeDom.CodeTypeReference,System.CodeDom.CodeStatement[]);Argument[0];Argument[this];taint;df-generated |
 | System.CodeDom;CodeCatchClause;CodeCatchClause;(System.String,System.CodeDom.CodeTypeReference,System.CodeDom.CodeStatement[]);Argument[1];Argument[this];taint;df-generated |
-| System.CodeDom;CodeCatchClause;CodeCatchClause;(System.String,System.CodeDom.CodeTypeReference,System.CodeDom.CodeStatement[]);Argument[2].Element;Argument[this];taint;df-generated |
-| System.CodeDom;CodeCatchClauseCollection;Add;(System.CodeDom.CodeCatchClause);Argument[0];Argument[this];taint;df-generated |
-| System.CodeDom;CodeCatchClauseCollection;AddRange;(System.CodeDom.CodeCatchClauseCollection);Argument[0].Element;Argument[this];taint;df-generated |
-| System.CodeDom;CodeCatchClauseCollection;AddRange;(System.CodeDom.CodeCatchClause[]);Argument[0].Element;Argument[this];taint;df-generated |
-| System.CodeDom;CodeCatchClauseCollection;CodeCatchClauseCollection;(System.CodeDom.CodeCatchClauseCollection);Argument[0].Element;Argument[this];taint;df-generated |
-| System.CodeDom;CodeCatchClauseCollection;CodeCatchClauseCollection;(System.CodeDom.CodeCatchClause[]);Argument[0].Element;Argument[this];taint;df-generated |
-| System.CodeDom;CodeCatchClauseCollection;CopyTo;(System.CodeDom.CodeCatchClause[],System.Int32);Argument[this];Argument[0].Element;taint;df-generated |
-| System.CodeDom;CodeCatchClauseCollection;Insert;(System.Int32,System.CodeDom.CodeCatchClause);Argument[1];Argument[this];taint;df-generated |
-| System.CodeDom;CodeCatchClauseCollection;Remove;(System.CodeDom.CodeCatchClause);Argument[0];Argument[this];taint;df-generated |
-| System.CodeDom;CodeCatchClauseCollection;get_Item;(System.Int32);Argument[this];ReturnValue;taint;df-generated |
-| System.CodeDom;CodeCatchClauseCollection;set_Item;(System.Int32,System.CodeDom.CodeCatchClause);Argument[1];Argument[this];taint;df-generated |
+| System.CodeDom;CodeCatchClauseCollection;Add;(System.CodeDom.CodeCatchClause);Argument[0];Argument[this].Property[System.Collections.CollectionBase.List].Element;value;dfc-generated |
+| System.CodeDom;CodeCatchClauseCollection;AddRange;(System.CodeDom.CodeCatchClauseCollection);Argument[0].Property[System.Collections.CollectionBase.List].Element;Argument[this].Property[System.Collections.CollectionBase.List].Element;value;dfc-generated |
+| System.CodeDom;CodeCatchClauseCollection;AddRange;(System.CodeDom.CodeCatchClause[]);Argument[0].Element;Argument[this].Property[System.Collections.CollectionBase.List].Element;value;dfc-generated |
+| System.CodeDom;CodeCatchClauseCollection;CodeCatchClauseCollection;(System.CodeDom.CodeCatchClauseCollection);Argument[0].Property[System.Collections.CollectionBase.List].Element;Argument[this].Property[System.Collections.CollectionBase.List].Element;value;dfc-generated |
+| System.CodeDom;CodeCatchClauseCollection;CodeCatchClauseCollection;(System.CodeDom.CodeCatchClause[]);Argument[0].Element;Argument[this].Property[System.Collections.CollectionBase.List].Element;value;dfc-generated |
+| System.CodeDom;CodeCatchClauseCollection;CopyTo;(System.CodeDom.CodeCatchClause[],System.Int32);Argument[this].Property[System.Collections.CollectionBase.List].Element;Argument[0].Element;value;dfc-generated |
+| System.CodeDom;CodeCatchClauseCollection;Insert;(System.Int32,System.CodeDom.CodeCatchClause);Argument[1];Argument[this].Property[System.Collections.CollectionBase.List].Element;value;dfc-generated |
+| System.CodeDom;CodeCatchClauseCollection;get_Item;(System.Int32);Argument[this].Property[System.Collections.CollectionBase.List].Element;ReturnValue;value;dfc-generated |
+| System.CodeDom;CodeCatchClauseCollection;set_Item;(System.Int32,System.CodeDom.CodeCatchClause);Argument[1];Argument[this].Property[System.Collections.CollectionBase.List].Element;value;dfc-generated |
 | System.CodeDom;CodeChecksumPragma;CodeChecksumPragma;(System.String,System.Guid,System.Byte[]);Argument[0];Argument[this];taint;df-generated |
 | System.CodeDom;CodeComment;CodeComment;(System.String);Argument[0];Argument[this];taint;df-generated |
 | System.CodeDom;CodeComment;CodeComment;(System.String,System.Boolean);Argument[0];Argument[this];taint;df-generated |
-| System.CodeDom;CodeCommentStatementCollection;Add;(System.CodeDom.CodeCommentStatement);Argument[0];Argument[this];taint;df-generated |
-| System.CodeDom;CodeCommentStatementCollection;AddRange;(System.CodeDom.CodeCommentStatementCollection);Argument[0].Element;Argument[this];taint;df-generated |
-| System.CodeDom;CodeCommentStatementCollection;AddRange;(System.CodeDom.CodeCommentStatement[]);Argument[0].Element;Argument[this];taint;df-generated |
-| System.CodeDom;CodeCommentStatementCollection;CodeCommentStatementCollection;(System.CodeDom.CodeCommentStatementCollection);Argument[0].Element;Argument[this];taint;df-generated |
-| System.CodeDom;CodeCommentStatementCollection;CodeCommentStatementCollection;(System.CodeDom.CodeCommentStatement[]);Argument[0].Element;Argument[this];taint;df-generated |
-| System.CodeDom;CodeCommentStatementCollection;CopyTo;(System.CodeDom.CodeCommentStatement[],System.Int32);Argument[this];Argument[0].Element;taint;df-generated |
-| System.CodeDom;CodeCommentStatementCollection;Insert;(System.Int32,System.CodeDom.CodeCommentStatement);Argument[1];Argument[this];taint;df-generated |
-| System.CodeDom;CodeCommentStatementCollection;Remove;(System.CodeDom.CodeCommentStatement);Argument[0];Argument[this];taint;df-generated |
-| System.CodeDom;CodeCommentStatementCollection;get_Item;(System.Int32);Argument[this];ReturnValue;taint;df-generated |
-| System.CodeDom;CodeCommentStatementCollection;set_Item;(System.Int32,System.CodeDom.CodeCommentStatement);Argument[1];Argument[this];taint;df-generated |
-| System.CodeDom;CodeConditionStatement;CodeConditionStatement;(System.CodeDom.CodeExpression,System.CodeDom.CodeStatement[]);Argument[1].Element;Argument[this];taint;df-generated |
-| System.CodeDom;CodeConditionStatement;CodeConditionStatement;(System.CodeDom.CodeExpression,System.CodeDom.CodeStatement[],System.CodeDom.CodeStatement[]);Argument[1].Element;Argument[this];taint;df-generated |
-| System.CodeDom;CodeConditionStatement;CodeConditionStatement;(System.CodeDom.CodeExpression,System.CodeDom.CodeStatement[],System.CodeDom.CodeStatement[]);Argument[2].Element;Argument[this];taint;df-generated |
+| System.CodeDom;CodeCommentStatementCollection;Add;(System.CodeDom.CodeCommentStatement);Argument[0];Argument[this].Property[System.Collections.CollectionBase.List].Element;value;dfc-generated |
+| System.CodeDom;CodeCommentStatementCollection;AddRange;(System.CodeDom.CodeCommentStatementCollection);Argument[0].Property[System.Collections.CollectionBase.List].Element;Argument[this].Property[System.Collections.CollectionBase.List].Element;value;dfc-generated |
+| System.CodeDom;CodeCommentStatementCollection;AddRange;(System.CodeDom.CodeCommentStatement[]);Argument[0].Element;Argument[this].Property[System.Collections.CollectionBase.List].Element;value;dfc-generated |
+| System.CodeDom;CodeCommentStatementCollection;CodeCommentStatementCollection;(System.CodeDom.CodeCommentStatementCollection);Argument[0].Property[System.Collections.CollectionBase.List].Element;Argument[this].Property[System.Collections.CollectionBase.List].Element;value;dfc-generated |
+| System.CodeDom;CodeCommentStatementCollection;CodeCommentStatementCollection;(System.CodeDom.CodeCommentStatement[]);Argument[0].Element;Argument[this].Property[System.Collections.CollectionBase.List].Element;value;dfc-generated |
+| System.CodeDom;CodeCommentStatementCollection;CopyTo;(System.CodeDom.CodeCommentStatement[],System.Int32);Argument[this].Property[System.Collections.CollectionBase.List].Element;Argument[0].Element;value;dfc-generated |
+| System.CodeDom;CodeCommentStatementCollection;Insert;(System.Int32,System.CodeDom.CodeCommentStatement);Argument[1];Argument[this].Property[System.Collections.CollectionBase.List].Element;value;dfc-generated |
+| System.CodeDom;CodeCommentStatementCollection;get_Item;(System.Int32);Argument[this].Property[System.Collections.CollectionBase.List].Element;ReturnValue;value;dfc-generated |
+| System.CodeDom;CodeCommentStatementCollection;set_Item;(System.Int32,System.CodeDom.CodeCommentStatement);Argument[1];Argument[this].Property[System.Collections.CollectionBase.List].Element;value;dfc-generated |
 | System.CodeDom;CodeDefaultValueExpression;CodeDefaultValueExpression;(System.CodeDom.CodeTypeReference);Argument[0];Argument[this];taint;df-generated |
 | System.CodeDom;CodeDelegateCreateExpression;CodeDelegateCreateExpression;(System.CodeDom.CodeTypeReference,System.CodeDom.CodeExpression,System.String);Argument[0];Argument[this];taint;df-generated |
 | System.CodeDom;CodeDelegateCreateExpression;CodeDelegateCreateExpression;(System.CodeDom.CodeTypeReference,System.CodeDom.CodeExpression,System.String);Argument[2];Argument[this];taint;df-generated |
-| System.CodeDom;CodeDelegateInvokeExpression;CodeDelegateInvokeExpression;(System.CodeDom.CodeExpression,System.CodeDom.CodeExpression[]);Argument[1].Element;Argument[this];taint;df-generated |
-| System.CodeDom;CodeDirectiveCollection;Add;(System.CodeDom.CodeDirective);Argument[0];Argument[this];taint;df-generated |
-| System.CodeDom;CodeDirectiveCollection;AddRange;(System.CodeDom.CodeDirectiveCollection);Argument[0].Element;Argument[this];taint;df-generated |
-| System.CodeDom;CodeDirectiveCollection;AddRange;(System.CodeDom.CodeDirective[]);Argument[0].Element;Argument[this];taint;df-generated |
-| System.CodeDom;CodeDirectiveCollection;CodeDirectiveCollection;(System.CodeDom.CodeDirectiveCollection);Argument[0].Element;Argument[this];taint;df-generated |
-| System.CodeDom;CodeDirectiveCollection;CodeDirectiveCollection;(System.CodeDom.CodeDirective[]);Argument[0].Element;Argument[this];taint;df-generated |
-| System.CodeDom;CodeDirectiveCollection;CopyTo;(System.CodeDom.CodeDirective[],System.Int32);Argument[this];Argument[0].Element;taint;df-generated |
-| System.CodeDom;CodeDirectiveCollection;Insert;(System.Int32,System.CodeDom.CodeDirective);Argument[1];Argument[this];taint;df-generated |
-| System.CodeDom;CodeDirectiveCollection;Remove;(System.CodeDom.CodeDirective);Argument[0];Argument[this];taint;df-generated |
-| System.CodeDom;CodeDirectiveCollection;get_Item;(System.Int32);Argument[this];ReturnValue;taint;df-generated |
-| System.CodeDom;CodeDirectiveCollection;set_Item;(System.Int32,System.CodeDom.CodeDirective);Argument[1];Argument[this];taint;df-generated |
+| System.CodeDom;CodeDirectiveCollection;Add;(System.CodeDom.CodeDirective);Argument[0];Argument[this].Property[System.Collections.CollectionBase.List].Element;value;dfc-generated |
+| System.CodeDom;CodeDirectiveCollection;AddRange;(System.CodeDom.CodeDirectiveCollection);Argument[0].Property[System.Collections.CollectionBase.List].Element;Argument[this].Property[System.Collections.CollectionBase.List].Element;value;dfc-generated |
+| System.CodeDom;CodeDirectiveCollection;AddRange;(System.CodeDom.CodeDirective[]);Argument[0].Element;Argument[this].Property[System.Collections.CollectionBase.List].Element;value;dfc-generated |
+| System.CodeDom;CodeDirectiveCollection;CodeDirectiveCollection;(System.CodeDom.CodeDirectiveCollection);Argument[0].Property[System.Collections.CollectionBase.List].Element;Argument[this].Property[System.Collections.CollectionBase.List].Element;value;dfc-generated |
+| System.CodeDom;CodeDirectiveCollection;CodeDirectiveCollection;(System.CodeDom.CodeDirective[]);Argument[0].Element;Argument[this].Property[System.Collections.CollectionBase.List].Element;value;dfc-generated |
+| System.CodeDom;CodeDirectiveCollection;CopyTo;(System.CodeDom.CodeDirective[],System.Int32);Argument[this].Property[System.Collections.CollectionBase.List].Element;Argument[0].Element;value;dfc-generated |
+| System.CodeDom;CodeDirectiveCollection;Insert;(System.Int32,System.CodeDom.CodeDirective);Argument[1];Argument[this].Property[System.Collections.CollectionBase.List].Element;value;dfc-generated |
+| System.CodeDom;CodeDirectiveCollection;get_Item;(System.Int32);Argument[this].Property[System.Collections.CollectionBase.List].Element;ReturnValue;value;dfc-generated |
+| System.CodeDom;CodeDirectiveCollection;set_Item;(System.Int32,System.CodeDom.CodeDirective);Argument[1];Argument[this].Property[System.Collections.CollectionBase.List].Element;value;dfc-generated |
 | System.CodeDom;CodeEventReferenceExpression;CodeEventReferenceExpression;(System.CodeDom.CodeExpression,System.String);Argument[1];Argument[this];taint;df-generated |
-| System.CodeDom;CodeExpressionCollection;Add;(System.CodeDom.CodeExpression);Argument[0];Argument[this];taint;df-generated |
-| System.CodeDom;CodeExpressionCollection;AddRange;(System.CodeDom.CodeExpressionCollection);Argument[0].Element;Argument[this];taint;df-generated |
-| System.CodeDom;CodeExpressionCollection;AddRange;(System.CodeDom.CodeExpression[]);Argument[0].Element;Argument[this];taint;df-generated |
-| System.CodeDom;CodeExpressionCollection;CodeExpressionCollection;(System.CodeDom.CodeExpressionCollection);Argument[0].Element;Argument[this];taint;df-generated |
-| System.CodeDom;CodeExpressionCollection;CodeExpressionCollection;(System.CodeDom.CodeExpression[]);Argument[0].Element;Argument[this];taint;df-generated |
-| System.CodeDom;CodeExpressionCollection;CopyTo;(System.CodeDom.CodeExpression[],System.Int32);Argument[this];Argument[0].Element;taint;df-generated |
-| System.CodeDom;CodeExpressionCollection;Insert;(System.Int32,System.CodeDom.CodeExpression);Argument[1];Argument[this];taint;df-generated |
-| System.CodeDom;CodeExpressionCollection;Remove;(System.CodeDom.CodeExpression);Argument[0];Argument[this];taint;df-generated |
-| System.CodeDom;CodeExpressionCollection;get_Item;(System.Int32);Argument[this];ReturnValue;taint;df-generated |
-| System.CodeDom;CodeExpressionCollection;set_Item;(System.Int32,System.CodeDom.CodeExpression);Argument[1];Argument[this];taint;df-generated |
+| System.CodeDom;CodeExpressionCollection;Add;(System.CodeDom.CodeExpression);Argument[0];Argument[this].Property[System.Collections.CollectionBase.List].Element;value;dfc-generated |
+| System.CodeDom;CodeExpressionCollection;AddRange;(System.CodeDom.CodeExpressionCollection);Argument[0].Property[System.Collections.CollectionBase.List].Element;Argument[this].Property[System.Collections.CollectionBase.List].Element;value;dfc-generated |
+| System.CodeDom;CodeExpressionCollection;AddRange;(System.CodeDom.CodeExpression[]);Argument[0].Element;Argument[this].Property[System.Collections.CollectionBase.List].Element;value;dfc-generated |
+| System.CodeDom;CodeExpressionCollection;CodeExpressionCollection;(System.CodeDom.CodeExpressionCollection);Argument[0].Property[System.Collections.CollectionBase.List].Element;Argument[this].Property[System.Collections.CollectionBase.List].Element;value;dfc-generated |
+| System.CodeDom;CodeExpressionCollection;CodeExpressionCollection;(System.CodeDom.CodeExpression[]);Argument[0].Element;Argument[this].Property[System.Collections.CollectionBase.List].Element;value;dfc-generated |
+| System.CodeDom;CodeExpressionCollection;CopyTo;(System.CodeDom.CodeExpression[],System.Int32);Argument[this].Property[System.Collections.CollectionBase.List].Element;Argument[0].Element;value;dfc-generated |
+| System.CodeDom;CodeExpressionCollection;Insert;(System.Int32,System.CodeDom.CodeExpression);Argument[1];Argument[this].Property[System.Collections.CollectionBase.List].Element;value;dfc-generated |
+| System.CodeDom;CodeExpressionCollection;get_Item;(System.Int32);Argument[this].Property[System.Collections.CollectionBase.List].Element;ReturnValue;value;dfc-generated |
+| System.CodeDom;CodeExpressionCollection;set_Item;(System.Int32,System.CodeDom.CodeExpression);Argument[1];Argument[this].Property[System.Collections.CollectionBase.List].Element;value;dfc-generated |
 | System.CodeDom;CodeFieldReferenceExpression;CodeFieldReferenceExpression;(System.CodeDom.CodeExpression,System.String);Argument[1];Argument[this];taint;df-generated |
 | System.CodeDom;CodeGotoStatement;CodeGotoStatement;(System.String);Argument[0];Argument[this];taint;df-generated |
-| System.CodeDom;CodeIndexerExpression;CodeIndexerExpression;(System.CodeDom.CodeExpression,System.CodeDom.CodeExpression[]);Argument[1].Element;Argument[this];taint;df-generated |
-| System.CodeDom;CodeIterationStatement;CodeIterationStatement;(System.CodeDom.CodeStatement,System.CodeDom.CodeExpression,System.CodeDom.CodeStatement,System.CodeDom.CodeStatement[]);Argument[3].Element;Argument[this];taint;df-generated |
 | System.CodeDom;CodeLabeledStatement;CodeLabeledStatement;(System.String);Argument[0];Argument[this];taint;df-generated |
 | System.CodeDom;CodeLabeledStatement;CodeLabeledStatement;(System.String,System.CodeDom.CodeStatement);Argument[0];Argument[this];taint;df-generated |
 | System.CodeDom;CodeLinePragma;CodeLinePragma;(System.String,System.Int32);Argument[0];Argument[this];taint;df-generated |
 | System.CodeDom;CodeMemberField;CodeMemberField;(System.CodeDom.CodeTypeReference,System.String);Argument[0];Argument[this];taint;df-generated |
 | System.CodeDom;CodeMemberField;CodeMemberField;(System.CodeDom.CodeTypeReference,System.String);Argument[1];Argument[this];taint;df-generated |
-| System.CodeDom;CodeMemberField;CodeMemberField;(System.String,System.String);Argument[0];Argument[this];taint;df-generated |
 | System.CodeDom;CodeMemberField;CodeMemberField;(System.String,System.String);Argument[1];Argument[this];taint;df-generated |
 | System.CodeDom;CodeMemberField;CodeMemberField;(System.Type,System.String);Argument[1];Argument[this];taint;df-generated |
 | System.CodeDom;CodeMemberMethod;add_PopulateImplementationTypes;(System.EventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
@@ -3993,13 +4472,9 @@
 | System.CodeDom;CodeMemberMethod;remove_PopulateImplementationTypes;(System.EventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.CodeDom;CodeMemberMethod;remove_PopulateParameters;(System.EventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.CodeDom;CodeMemberMethod;remove_PopulateStatements;(System.EventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
-| System.CodeDom;CodeMethodInvokeExpression;CodeMethodInvokeExpression;(System.CodeDom.CodeExpression,System.String,System.CodeDom.CodeExpression[]);Argument[1];Argument[this];taint;df-generated |
-| System.CodeDom;CodeMethodInvokeExpression;CodeMethodInvokeExpression;(System.CodeDom.CodeExpression,System.String,System.CodeDom.CodeExpression[]);Argument[2].Element;Argument[this];taint;df-generated |
 | System.CodeDom;CodeMethodInvokeExpression;CodeMethodInvokeExpression;(System.CodeDom.CodeMethodReferenceExpression,System.CodeDom.CodeExpression[]);Argument[0];Argument[this];taint;df-generated |
-| System.CodeDom;CodeMethodInvokeExpression;CodeMethodInvokeExpression;(System.CodeDom.CodeMethodReferenceExpression,System.CodeDom.CodeExpression[]);Argument[1].Element;Argument[this];taint;df-generated |
 | System.CodeDom;CodeMethodReferenceExpression;CodeMethodReferenceExpression;(System.CodeDom.CodeExpression,System.String);Argument[1];Argument[this];taint;df-generated |
 | System.CodeDom;CodeMethodReferenceExpression;CodeMethodReferenceExpression;(System.CodeDom.CodeExpression,System.String,System.CodeDom.CodeTypeReference[]);Argument[1];Argument[this];taint;df-generated |
-| System.CodeDom;CodeMethodReferenceExpression;CodeMethodReferenceExpression;(System.CodeDom.CodeExpression,System.String,System.CodeDom.CodeTypeReference[]);Argument[2].Element;Argument[this];taint;df-generated |
 | System.CodeDom;CodeNamespace;CodeNamespace;(System.String);Argument[0];Argument[this];taint;df-generated |
 | System.CodeDom;CodeNamespace;add_PopulateComments;(System.EventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.CodeDom;CodeNamespace;add_PopulateImports;(System.EventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
@@ -4010,66 +4485,52 @@
 | System.CodeDom;CodeNamespace;remove_PopulateComments;(System.EventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.CodeDom;CodeNamespace;remove_PopulateImports;(System.EventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.CodeDom;CodeNamespace;remove_PopulateTypes;(System.EventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
-| System.CodeDom;CodeNamespaceCollection;Add;(System.CodeDom.CodeNamespace);Argument[0];Argument[this];taint;df-generated |
-| System.CodeDom;CodeNamespaceCollection;AddRange;(System.CodeDom.CodeNamespaceCollection);Argument[0].Element;Argument[this];taint;df-generated |
-| System.CodeDom;CodeNamespaceCollection;AddRange;(System.CodeDom.CodeNamespace[]);Argument[0].Element;Argument[this];taint;df-generated |
-| System.CodeDom;CodeNamespaceCollection;CodeNamespaceCollection;(System.CodeDom.CodeNamespaceCollection);Argument[0].Element;Argument[this];taint;df-generated |
-| System.CodeDom;CodeNamespaceCollection;CodeNamespaceCollection;(System.CodeDom.CodeNamespace[]);Argument[0].Element;Argument[this];taint;df-generated |
-| System.CodeDom;CodeNamespaceCollection;CopyTo;(System.CodeDom.CodeNamespace[],System.Int32);Argument[this];Argument[0].Element;taint;df-generated |
-| System.CodeDom;CodeNamespaceCollection;Insert;(System.Int32,System.CodeDom.CodeNamespace);Argument[1];Argument[this];taint;df-generated |
-| System.CodeDom;CodeNamespaceCollection;Remove;(System.CodeDom.CodeNamespace);Argument[0];Argument[this];taint;df-generated |
-| System.CodeDom;CodeNamespaceCollection;get_Item;(System.Int32);Argument[this];ReturnValue;taint;df-generated |
-| System.CodeDom;CodeNamespaceCollection;set_Item;(System.Int32,System.CodeDom.CodeNamespace);Argument[1];Argument[this];taint;df-generated |
+| System.CodeDom;CodeNamespaceCollection;Add;(System.CodeDom.CodeNamespace);Argument[0];Argument[this].Property[System.Collections.CollectionBase.List].Element;value;dfc-generated |
+| System.CodeDom;CodeNamespaceCollection;AddRange;(System.CodeDom.CodeNamespaceCollection);Argument[0].Property[System.Collections.CollectionBase.List].Element;Argument[this].Property[System.Collections.CollectionBase.List].Element;value;dfc-generated |
+| System.CodeDom;CodeNamespaceCollection;AddRange;(System.CodeDom.CodeNamespace[]);Argument[0].Element;Argument[this].Property[System.Collections.CollectionBase.List].Element;value;dfc-generated |
+| System.CodeDom;CodeNamespaceCollection;CodeNamespaceCollection;(System.CodeDom.CodeNamespaceCollection);Argument[0].Property[System.Collections.CollectionBase.List].Element;Argument[this].Property[System.Collections.CollectionBase.List].Element;value;dfc-generated |
+| System.CodeDom;CodeNamespaceCollection;CodeNamespaceCollection;(System.CodeDom.CodeNamespace[]);Argument[0].Element;Argument[this].Property[System.Collections.CollectionBase.List].Element;value;dfc-generated |
+| System.CodeDom;CodeNamespaceCollection;CopyTo;(System.CodeDom.CodeNamespace[],System.Int32);Argument[this].Property[System.Collections.CollectionBase.List].Element;Argument[0].Element;value;dfc-generated |
+| System.CodeDom;CodeNamespaceCollection;Insert;(System.Int32,System.CodeDom.CodeNamespace);Argument[1];Argument[this].Property[System.Collections.CollectionBase.List].Element;value;dfc-generated |
+| System.CodeDom;CodeNamespaceCollection;get_Item;(System.Int32);Argument[this].Property[System.Collections.CollectionBase.List].Element;ReturnValue;value;dfc-generated |
+| System.CodeDom;CodeNamespaceCollection;set_Item;(System.Int32,System.CodeDom.CodeNamespace);Argument[1];Argument[this].Property[System.Collections.CollectionBase.List].Element;value;dfc-generated |
 | System.CodeDom;CodeNamespaceImport;CodeNamespaceImport;(System.String);Argument[0];Argument[this];taint;df-generated |
-| System.CodeDom;CodeNamespaceImportCollection;Add;(System.CodeDom.CodeNamespaceImport);Argument[0];Argument[this];taint;df-generated |
-| System.CodeDom;CodeNamespaceImportCollection;AddRange;(System.CodeDom.CodeNamespaceImport[]);Argument[0].Element;Argument[this];taint;df-generated |
+| System.CodeDom;CodeNamespaceImportCollection;Add;(System.CodeDom.CodeNamespaceImport);Argument[0];Argument[this].SyntheticField[System.CodeDom.CodeNamespaceImportCollection._data].Element;value;dfc-generated |
+| System.CodeDom;CodeNamespaceImportCollection;AddRange;(System.CodeDom.CodeNamespaceImport[]);Argument[0].Element;Argument[this].SyntheticField[System.CodeDom.CodeNamespaceImportCollection._data].Element;value;dfc-generated |
 | System.CodeDom;CodeNamespaceImportCollection;Clear;();Argument[this].WithoutElement;Argument[this];value;manual |
-| System.CodeDom;CodeNamespaceImportCollection;GetEnumerator;();Argument[this];ReturnValue;taint;df-generated |
-| System.CodeDom;CodeNamespaceImportCollection;get_Item;(System.Int32);Argument[this];ReturnValue;taint;df-generated |
-| System.CodeDom;CodeNamespaceImportCollection;set_Item;(System.Int32,System.CodeDom.CodeNamespaceImport);Argument[1];Argument[this];taint;df-generated |
+| System.CodeDom;CodeNamespaceImportCollection;GetEnumerator;();Argument[this].SyntheticField[System.CodeDom.CodeNamespaceImportCollection._data].Element;ReturnValue.Property[System.Collections.IEnumerator.Current];value;dfc-generated |
+| System.CodeDom;CodeNamespaceImportCollection;get_Item;(System.Int32);Argument[this].SyntheticField[System.CodeDom.CodeNamespaceImportCollection._data].Element;ReturnValue;value;dfc-generated |
+| System.CodeDom;CodeNamespaceImportCollection;set_Item;(System.Int32,System.CodeDom.CodeNamespaceImport);Argument[1];Argument[this].SyntheticField[System.CodeDom.CodeNamespaceImportCollection._data].Element;value;dfc-generated |
 | System.CodeDom;CodeObjectCreateExpression;CodeObjectCreateExpression;(System.CodeDom.CodeTypeReference,System.CodeDom.CodeExpression[]);Argument[0];Argument[this];taint;df-generated |
-| System.CodeDom;CodeObjectCreateExpression;CodeObjectCreateExpression;(System.CodeDom.CodeTypeReference,System.CodeDom.CodeExpression[]);Argument[1].Element;Argument[this];taint;df-generated |
-| System.CodeDom;CodeObjectCreateExpression;CodeObjectCreateExpression;(System.String,System.CodeDom.CodeExpression[]);Argument[0];Argument[this];taint;df-generated |
-| System.CodeDom;CodeObjectCreateExpression;CodeObjectCreateExpression;(System.String,System.CodeDom.CodeExpression[]);Argument[1].Element;Argument[this];taint;df-generated |
-| System.CodeDom;CodeObjectCreateExpression;CodeObjectCreateExpression;(System.Type,System.CodeDom.CodeExpression[]);Argument[1].Element;Argument[this];taint;df-generated |
 | System.CodeDom;CodeParameterDeclarationExpression;CodeParameterDeclarationExpression;(System.CodeDom.CodeTypeReference,System.String);Argument[0];Argument[this];taint;df-generated |
 | System.CodeDom;CodeParameterDeclarationExpression;CodeParameterDeclarationExpression;(System.CodeDom.CodeTypeReference,System.String);Argument[1];Argument[this];taint;df-generated |
-| System.CodeDom;CodeParameterDeclarationExpression;CodeParameterDeclarationExpression;(System.String,System.String);Argument[0];Argument[this];taint;df-generated |
 | System.CodeDom;CodeParameterDeclarationExpression;CodeParameterDeclarationExpression;(System.String,System.String);Argument[1];Argument[this];taint;df-generated |
 | System.CodeDom;CodeParameterDeclarationExpression;CodeParameterDeclarationExpression;(System.Type,System.String);Argument[1];Argument[this];taint;df-generated |
-| System.CodeDom;CodeParameterDeclarationExpressionCollection;Add;(System.CodeDom.CodeParameterDeclarationExpression);Argument[0];Argument[this];taint;df-generated |
-| System.CodeDom;CodeParameterDeclarationExpressionCollection;AddRange;(System.CodeDom.CodeParameterDeclarationExpressionCollection);Argument[0].Element;Argument[this];taint;df-generated |
-| System.CodeDom;CodeParameterDeclarationExpressionCollection;AddRange;(System.CodeDom.CodeParameterDeclarationExpression[]);Argument[0].Element;Argument[this];taint;df-generated |
-| System.CodeDom;CodeParameterDeclarationExpressionCollection;CodeParameterDeclarationExpressionCollection;(System.CodeDom.CodeParameterDeclarationExpressionCollection);Argument[0].Element;Argument[this];taint;df-generated |
-| System.CodeDom;CodeParameterDeclarationExpressionCollection;CodeParameterDeclarationExpressionCollection;(System.CodeDom.CodeParameterDeclarationExpression[]);Argument[0].Element;Argument[this];taint;df-generated |
-| System.CodeDom;CodeParameterDeclarationExpressionCollection;CopyTo;(System.CodeDom.CodeParameterDeclarationExpression[],System.Int32);Argument[this];Argument[0].Element;taint;df-generated |
-| System.CodeDom;CodeParameterDeclarationExpressionCollection;Insert;(System.Int32,System.CodeDom.CodeParameterDeclarationExpression);Argument[1];Argument[this];taint;df-generated |
-| System.CodeDom;CodeParameterDeclarationExpressionCollection;Remove;(System.CodeDom.CodeParameterDeclarationExpression);Argument[0];Argument[this];taint;df-generated |
-| System.CodeDom;CodeParameterDeclarationExpressionCollection;get_Item;(System.Int32);Argument[this];ReturnValue;taint;df-generated |
-| System.CodeDom;CodeParameterDeclarationExpressionCollection;set_Item;(System.Int32,System.CodeDom.CodeParameterDeclarationExpression);Argument[1];Argument[this];taint;df-generated |
+| System.CodeDom;CodeParameterDeclarationExpressionCollection;Add;(System.CodeDom.CodeParameterDeclarationExpression);Argument[0];Argument[this].Property[System.Collections.CollectionBase.List].Element;value;dfc-generated |
+| System.CodeDom;CodeParameterDeclarationExpressionCollection;AddRange;(System.CodeDom.CodeParameterDeclarationExpressionCollection);Argument[0].Property[System.Collections.CollectionBase.List].Element;Argument[this].Property[System.Collections.CollectionBase.List].Element;value;dfc-generated |
+| System.CodeDom;CodeParameterDeclarationExpressionCollection;AddRange;(System.CodeDom.CodeParameterDeclarationExpression[]);Argument[0].Element;Argument[this].Property[System.Collections.CollectionBase.List].Element;value;dfc-generated |
+| System.CodeDom;CodeParameterDeclarationExpressionCollection;CodeParameterDeclarationExpressionCollection;(System.CodeDom.CodeParameterDeclarationExpressionCollection);Argument[0].Property[System.Collections.CollectionBase.List].Element;Argument[this].Property[System.Collections.CollectionBase.List].Element;value;dfc-generated |
+| System.CodeDom;CodeParameterDeclarationExpressionCollection;CodeParameterDeclarationExpressionCollection;(System.CodeDom.CodeParameterDeclarationExpression[]);Argument[0].Element;Argument[this].Property[System.Collections.CollectionBase.List].Element;value;dfc-generated |
+| System.CodeDom;CodeParameterDeclarationExpressionCollection;CopyTo;(System.CodeDom.CodeParameterDeclarationExpression[],System.Int32);Argument[this].Property[System.Collections.CollectionBase.List].Element;Argument[0].Element;value;dfc-generated |
+| System.CodeDom;CodeParameterDeclarationExpressionCollection;Insert;(System.Int32,System.CodeDom.CodeParameterDeclarationExpression);Argument[1];Argument[this].Property[System.Collections.CollectionBase.List].Element;value;dfc-generated |
+| System.CodeDom;CodeParameterDeclarationExpressionCollection;get_Item;(System.Int32);Argument[this].Property[System.Collections.CollectionBase.List].Element;ReturnValue;value;dfc-generated |
+| System.CodeDom;CodeParameterDeclarationExpressionCollection;set_Item;(System.Int32,System.CodeDom.CodeParameterDeclarationExpression);Argument[1];Argument[this].Property[System.Collections.CollectionBase.List].Element;value;dfc-generated |
 | System.CodeDom;CodePropertyReferenceExpression;CodePropertyReferenceExpression;(System.CodeDom.CodeExpression,System.String);Argument[1];Argument[this];taint;df-generated |
 | System.CodeDom;CodeRegionDirective;CodeRegionDirective;(System.CodeDom.CodeRegionMode,System.String);Argument[1];Argument[this];taint;df-generated |
 | System.CodeDom;CodeRemoveEventStatement;CodeRemoveEventStatement;(System.CodeDom.CodeEventReferenceExpression,System.CodeDom.CodeExpression);Argument[0];Argument[this];taint;df-generated |
-| System.CodeDom;CodeRemoveEventStatement;CodeRemoveEventStatement;(System.CodeDom.CodeExpression,System.String,System.CodeDom.CodeExpression);Argument[1];Argument[this];taint;df-generated |
 | System.CodeDom;CodeSnippetCompileUnit;CodeSnippetCompileUnit;(System.String);Argument[0];Argument[this];taint;df-generated |
 | System.CodeDom;CodeSnippetExpression;CodeSnippetExpression;(System.String);Argument[0];Argument[this];taint;df-generated |
 | System.CodeDom;CodeSnippetStatement;CodeSnippetStatement;(System.String);Argument[0];Argument[this];taint;df-generated |
 | System.CodeDom;CodeSnippetTypeMember;CodeSnippetTypeMember;(System.String);Argument[0];Argument[this];taint;df-generated |
-| System.CodeDom;CodeStatementCollection;Add;(System.CodeDom.CodeStatement);Argument[0];Argument[this];taint;df-generated |
-| System.CodeDom;CodeStatementCollection;AddRange;(System.CodeDom.CodeStatementCollection);Argument[0].Element;Argument[this];taint;df-generated |
-| System.CodeDom;CodeStatementCollection;AddRange;(System.CodeDom.CodeStatement[]);Argument[0].Element;Argument[this];taint;df-generated |
-| System.CodeDom;CodeStatementCollection;CodeStatementCollection;(System.CodeDom.CodeStatementCollection);Argument[0].Element;Argument[this];taint;df-generated |
-| System.CodeDom;CodeStatementCollection;CodeStatementCollection;(System.CodeDom.CodeStatement[]);Argument[0].Element;Argument[this];taint;df-generated |
-| System.CodeDom;CodeStatementCollection;CopyTo;(System.CodeDom.CodeStatement[],System.Int32);Argument[this];Argument[0].Element;taint;df-generated |
-| System.CodeDom;CodeStatementCollection;Insert;(System.Int32,System.CodeDom.CodeStatement);Argument[1];Argument[this];taint;df-generated |
-| System.CodeDom;CodeStatementCollection;Remove;(System.CodeDom.CodeStatement);Argument[0];Argument[this];taint;df-generated |
-| System.CodeDom;CodeStatementCollection;get_Item;(System.Int32);Argument[this];ReturnValue;taint;df-generated |
-| System.CodeDom;CodeStatementCollection;set_Item;(System.Int32,System.CodeDom.CodeStatement);Argument[1];Argument[this];taint;df-generated |
-| System.CodeDom;CodeTryCatchFinallyStatement;CodeTryCatchFinallyStatement;(System.CodeDom.CodeStatement[],System.CodeDom.CodeCatchClause[]);Argument[0].Element;Argument[this];taint;df-generated |
-| System.CodeDom;CodeTryCatchFinallyStatement;CodeTryCatchFinallyStatement;(System.CodeDom.CodeStatement[],System.CodeDom.CodeCatchClause[]);Argument[1].Element;Argument[this];taint;df-generated |
-| System.CodeDom;CodeTryCatchFinallyStatement;CodeTryCatchFinallyStatement;(System.CodeDom.CodeStatement[],System.CodeDom.CodeCatchClause[],System.CodeDom.CodeStatement[]);Argument[0].Element;Argument[this];taint;df-generated |
-| System.CodeDom;CodeTryCatchFinallyStatement;CodeTryCatchFinallyStatement;(System.CodeDom.CodeStatement[],System.CodeDom.CodeCatchClause[],System.CodeDom.CodeStatement[]);Argument[1].Element;Argument[this];taint;df-generated |
-| System.CodeDom;CodeTryCatchFinallyStatement;CodeTryCatchFinallyStatement;(System.CodeDom.CodeStatement[],System.CodeDom.CodeCatchClause[],System.CodeDom.CodeStatement[]);Argument[2].Element;Argument[this];taint;df-generated |
+| System.CodeDom;CodeStatementCollection;Add;(System.CodeDom.CodeStatement);Argument[0];Argument[this].Property[System.Collections.CollectionBase.List].Element;value;dfc-generated |
+| System.CodeDom;CodeStatementCollection;AddRange;(System.CodeDom.CodeStatementCollection);Argument[0].Property[System.Collections.CollectionBase.List].Element;Argument[this].Property[System.Collections.CollectionBase.List].Element;value;dfc-generated |
+| System.CodeDom;CodeStatementCollection;AddRange;(System.CodeDom.CodeStatement[]);Argument[0].Element;Argument[this].Property[System.Collections.CollectionBase.List].Element;value;dfc-generated |
+| System.CodeDom;CodeStatementCollection;CodeStatementCollection;(System.CodeDom.CodeStatementCollection);Argument[0].Property[System.Collections.CollectionBase.List].Element;Argument[this].Property[System.Collections.CollectionBase.List].Element;value;dfc-generated |
+| System.CodeDom;CodeStatementCollection;CodeStatementCollection;(System.CodeDom.CodeStatement[]);Argument[0].Element;Argument[this].Property[System.Collections.CollectionBase.List].Element;value;dfc-generated |
+| System.CodeDom;CodeStatementCollection;CopyTo;(System.CodeDom.CodeStatement[],System.Int32);Argument[this].Property[System.Collections.CollectionBase.List].Element;Argument[0].Element;value;dfc-generated |
+| System.CodeDom;CodeStatementCollection;Insert;(System.Int32,System.CodeDom.CodeStatement);Argument[1];Argument[this].Property[System.Collections.CollectionBase.List].Element;value;dfc-generated |
+| System.CodeDom;CodeStatementCollection;get_Item;(System.Int32);Argument[this].Property[System.Collections.CollectionBase.List].Element;ReturnValue;value;dfc-generated |
+| System.CodeDom;CodeStatementCollection;set_Item;(System.Int32,System.CodeDom.CodeStatement);Argument[1];Argument[this].Property[System.Collections.CollectionBase.List].Element;value;dfc-generated |
 | System.CodeDom;CodeTypeDeclaration;CodeTypeDeclaration;(System.String);Argument[0];Argument[this];taint;df-generated |
 | System.CodeDom;CodeTypeDeclaration;add_PopulateBaseTypes;(System.EventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.CodeDom;CodeTypeDeclaration;add_PopulateMembers;(System.EventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
@@ -4077,65 +4538,54 @@
 | System.CodeDom;CodeTypeDeclaration;get_Members;();Argument[this];ReturnValue;taint;df-generated |
 | System.CodeDom;CodeTypeDeclaration;remove_PopulateBaseTypes;(System.EventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.CodeDom;CodeTypeDeclaration;remove_PopulateMembers;(System.EventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
-| System.CodeDom;CodeTypeDeclarationCollection;Add;(System.CodeDom.CodeTypeDeclaration);Argument[0];Argument[this];taint;df-generated |
-| System.CodeDom;CodeTypeDeclarationCollection;AddRange;(System.CodeDom.CodeTypeDeclarationCollection);Argument[0].Element;Argument[this];taint;df-generated |
-| System.CodeDom;CodeTypeDeclarationCollection;AddRange;(System.CodeDom.CodeTypeDeclaration[]);Argument[0].Element;Argument[this];taint;df-generated |
-| System.CodeDom;CodeTypeDeclarationCollection;CodeTypeDeclarationCollection;(System.CodeDom.CodeTypeDeclarationCollection);Argument[0].Element;Argument[this];taint;df-generated |
-| System.CodeDom;CodeTypeDeclarationCollection;CodeTypeDeclarationCollection;(System.CodeDom.CodeTypeDeclaration[]);Argument[0].Element;Argument[this];taint;df-generated |
-| System.CodeDom;CodeTypeDeclarationCollection;CopyTo;(System.CodeDom.CodeTypeDeclaration[],System.Int32);Argument[this];Argument[0].Element;taint;df-generated |
-| System.CodeDom;CodeTypeDeclarationCollection;Insert;(System.Int32,System.CodeDom.CodeTypeDeclaration);Argument[1];Argument[this];taint;df-generated |
-| System.CodeDom;CodeTypeDeclarationCollection;Remove;(System.CodeDom.CodeTypeDeclaration);Argument[0];Argument[this];taint;df-generated |
-| System.CodeDom;CodeTypeDeclarationCollection;get_Item;(System.Int32);Argument[this];ReturnValue;taint;df-generated |
-| System.CodeDom;CodeTypeDeclarationCollection;set_Item;(System.Int32,System.CodeDom.CodeTypeDeclaration);Argument[1];Argument[this];taint;df-generated |
+| System.CodeDom;CodeTypeDeclarationCollection;Add;(System.CodeDom.CodeTypeDeclaration);Argument[0];Argument[this].Property[System.Collections.CollectionBase.List].Element;value;dfc-generated |
+| System.CodeDom;CodeTypeDeclarationCollection;AddRange;(System.CodeDom.CodeTypeDeclarationCollection);Argument[0].Property[System.Collections.CollectionBase.List].Element;Argument[this].Property[System.Collections.CollectionBase.List].Element;value;dfc-generated |
+| System.CodeDom;CodeTypeDeclarationCollection;AddRange;(System.CodeDom.CodeTypeDeclaration[]);Argument[0].Element;Argument[this].Property[System.Collections.CollectionBase.List].Element;value;dfc-generated |
+| System.CodeDom;CodeTypeDeclarationCollection;CodeTypeDeclarationCollection;(System.CodeDom.CodeTypeDeclarationCollection);Argument[0].Property[System.Collections.CollectionBase.List].Element;Argument[this].Property[System.Collections.CollectionBase.List].Element;value;dfc-generated |
+| System.CodeDom;CodeTypeDeclarationCollection;CodeTypeDeclarationCollection;(System.CodeDom.CodeTypeDeclaration[]);Argument[0].Element;Argument[this].Property[System.Collections.CollectionBase.List].Element;value;dfc-generated |
+| System.CodeDom;CodeTypeDeclarationCollection;CopyTo;(System.CodeDom.CodeTypeDeclaration[],System.Int32);Argument[this].Property[System.Collections.CollectionBase.List].Element;Argument[0].Element;value;dfc-generated |
+| System.CodeDom;CodeTypeDeclarationCollection;Insert;(System.Int32,System.CodeDom.CodeTypeDeclaration);Argument[1];Argument[this].Property[System.Collections.CollectionBase.List].Element;value;dfc-generated |
+| System.CodeDom;CodeTypeDeclarationCollection;get_Item;(System.Int32);Argument[this].Property[System.Collections.CollectionBase.List].Element;ReturnValue;value;dfc-generated |
+| System.CodeDom;CodeTypeDeclarationCollection;set_Item;(System.Int32,System.CodeDom.CodeTypeDeclaration);Argument[1];Argument[this].Property[System.Collections.CollectionBase.List].Element;value;dfc-generated |
 | System.CodeDom;CodeTypeDelegate;CodeTypeDelegate;(System.String);Argument[0];Argument[this];taint;df-generated |
-| System.CodeDom;CodeTypeMemberCollection;Add;(System.CodeDom.CodeTypeMember);Argument[0];Argument[this];taint;df-generated |
-| System.CodeDom;CodeTypeMemberCollection;AddRange;(System.CodeDom.CodeTypeMemberCollection);Argument[0].Element;Argument[this];taint;df-generated |
-| System.CodeDom;CodeTypeMemberCollection;AddRange;(System.CodeDom.CodeTypeMember[]);Argument[0].Element;Argument[this];taint;df-generated |
-| System.CodeDom;CodeTypeMemberCollection;CodeTypeMemberCollection;(System.CodeDom.CodeTypeMemberCollection);Argument[0].Element;Argument[this];taint;df-generated |
-| System.CodeDom;CodeTypeMemberCollection;CodeTypeMemberCollection;(System.CodeDom.CodeTypeMember[]);Argument[0].Element;Argument[this];taint;df-generated |
-| System.CodeDom;CodeTypeMemberCollection;CopyTo;(System.CodeDom.CodeTypeMember[],System.Int32);Argument[this];Argument[0].Element;taint;df-generated |
-| System.CodeDom;CodeTypeMemberCollection;Insert;(System.Int32,System.CodeDom.CodeTypeMember);Argument[1];Argument[this];taint;df-generated |
-| System.CodeDom;CodeTypeMemberCollection;Remove;(System.CodeDom.CodeTypeMember);Argument[0];Argument[this];taint;df-generated |
-| System.CodeDom;CodeTypeMemberCollection;get_Item;(System.Int32);Argument[this];ReturnValue;taint;df-generated |
-| System.CodeDom;CodeTypeMemberCollection;set_Item;(System.Int32,System.CodeDom.CodeTypeMember);Argument[1];Argument[this];taint;df-generated |
+| System.CodeDom;CodeTypeMemberCollection;Add;(System.CodeDom.CodeTypeMember);Argument[0];Argument[this].Property[System.Collections.CollectionBase.List].Element;value;dfc-generated |
+| System.CodeDom;CodeTypeMemberCollection;AddRange;(System.CodeDom.CodeTypeMemberCollection);Argument[0].Property[System.Collections.CollectionBase.List].Element;Argument[this].Property[System.Collections.CollectionBase.List].Element;value;dfc-generated |
+| System.CodeDom;CodeTypeMemberCollection;AddRange;(System.CodeDom.CodeTypeMember[]);Argument[0].Element;Argument[this].Property[System.Collections.CollectionBase.List].Element;value;dfc-generated |
+| System.CodeDom;CodeTypeMemberCollection;CodeTypeMemberCollection;(System.CodeDom.CodeTypeMemberCollection);Argument[0].Property[System.Collections.CollectionBase.List].Element;Argument[this].Property[System.Collections.CollectionBase.List].Element;value;dfc-generated |
+| System.CodeDom;CodeTypeMemberCollection;CodeTypeMemberCollection;(System.CodeDom.CodeTypeMember[]);Argument[0].Element;Argument[this].Property[System.Collections.CollectionBase.List].Element;value;dfc-generated |
+| System.CodeDom;CodeTypeMemberCollection;CopyTo;(System.CodeDom.CodeTypeMember[],System.Int32);Argument[this].Property[System.Collections.CollectionBase.List].Element;Argument[0].Element;value;dfc-generated |
+| System.CodeDom;CodeTypeMemberCollection;Insert;(System.Int32,System.CodeDom.CodeTypeMember);Argument[1];Argument[this].Property[System.Collections.CollectionBase.List].Element;value;dfc-generated |
+| System.CodeDom;CodeTypeMemberCollection;get_Item;(System.Int32);Argument[this].Property[System.Collections.CollectionBase.List].Element;ReturnValue;value;dfc-generated |
+| System.CodeDom;CodeTypeMemberCollection;set_Item;(System.Int32,System.CodeDom.CodeTypeMember);Argument[1];Argument[this].Property[System.Collections.CollectionBase.List].Element;value;dfc-generated |
 | System.CodeDom;CodeTypeOfExpression;CodeTypeOfExpression;(System.CodeDom.CodeTypeReference);Argument[0];Argument[this];taint;df-generated |
-| System.CodeDom;CodeTypeOfExpression;CodeTypeOfExpression;(System.String);Argument[0];Argument[this];taint;df-generated |
 | System.CodeDom;CodeTypeParameter;CodeTypeParameter;(System.String);Argument[0];Argument[this];taint;df-generated |
-| System.CodeDom;CodeTypeParameterCollection;Add;(System.CodeDom.CodeTypeParameter);Argument[0];Argument[this];taint;df-generated |
-| System.CodeDom;CodeTypeParameterCollection;Add;(System.String);Argument[0];Argument[this];taint;df-generated |
-| System.CodeDom;CodeTypeParameterCollection;AddRange;(System.CodeDom.CodeTypeParameterCollection);Argument[0].Element;Argument[this];taint;df-generated |
-| System.CodeDom;CodeTypeParameterCollection;AddRange;(System.CodeDom.CodeTypeParameter[]);Argument[0].Element;Argument[this];taint;df-generated |
-| System.CodeDom;CodeTypeParameterCollection;CodeTypeParameterCollection;(System.CodeDom.CodeTypeParameterCollection);Argument[0].Element;Argument[this];taint;df-generated |
-| System.CodeDom;CodeTypeParameterCollection;CodeTypeParameterCollection;(System.CodeDom.CodeTypeParameter[]);Argument[0].Element;Argument[this];taint;df-generated |
-| System.CodeDom;CodeTypeParameterCollection;CopyTo;(System.CodeDom.CodeTypeParameter[],System.Int32);Argument[this];Argument[0].Element;taint;df-generated |
-| System.CodeDom;CodeTypeParameterCollection;Insert;(System.Int32,System.CodeDom.CodeTypeParameter);Argument[1];Argument[this];taint;df-generated |
-| System.CodeDom;CodeTypeParameterCollection;Remove;(System.CodeDom.CodeTypeParameter);Argument[0];Argument[this];taint;df-generated |
-| System.CodeDom;CodeTypeParameterCollection;get_Item;(System.Int32);Argument[this];ReturnValue;taint;df-generated |
-| System.CodeDom;CodeTypeParameterCollection;set_Item;(System.Int32,System.CodeDom.CodeTypeParameter);Argument[1];Argument[this];taint;df-generated |
+| System.CodeDom;CodeTypeParameterCollection;Add;(System.CodeDom.CodeTypeParameter);Argument[0];Argument[this].Property[System.Collections.CollectionBase.List].Element;value;dfc-generated |
+| System.CodeDom;CodeTypeParameterCollection;AddRange;(System.CodeDom.CodeTypeParameterCollection);Argument[0].Property[System.Collections.CollectionBase.List].Element;Argument[this].Property[System.Collections.CollectionBase.List].Element;value;dfc-generated |
+| System.CodeDom;CodeTypeParameterCollection;AddRange;(System.CodeDom.CodeTypeParameter[]);Argument[0].Element;Argument[this].Property[System.Collections.CollectionBase.List].Element;value;dfc-generated |
+| System.CodeDom;CodeTypeParameterCollection;CodeTypeParameterCollection;(System.CodeDom.CodeTypeParameterCollection);Argument[0].Property[System.Collections.CollectionBase.List].Element;Argument[this].Property[System.Collections.CollectionBase.List].Element;value;dfc-generated |
+| System.CodeDom;CodeTypeParameterCollection;CodeTypeParameterCollection;(System.CodeDom.CodeTypeParameter[]);Argument[0].Element;Argument[this].Property[System.Collections.CollectionBase.List].Element;value;dfc-generated |
+| System.CodeDom;CodeTypeParameterCollection;CopyTo;(System.CodeDom.CodeTypeParameter[],System.Int32);Argument[this].Property[System.Collections.CollectionBase.List].Element;Argument[0].Element;value;dfc-generated |
+| System.CodeDom;CodeTypeParameterCollection;Insert;(System.Int32,System.CodeDom.CodeTypeParameter);Argument[1];Argument[this].Property[System.Collections.CollectionBase.List].Element;value;dfc-generated |
+| System.CodeDom;CodeTypeParameterCollection;get_Item;(System.Int32);Argument[this].Property[System.Collections.CollectionBase.List].Element;ReturnValue;value;dfc-generated |
+| System.CodeDom;CodeTypeParameterCollection;set_Item;(System.Int32,System.CodeDom.CodeTypeParameter);Argument[1];Argument[this].Property[System.Collections.CollectionBase.List].Element;value;dfc-generated |
 | System.CodeDom;CodeTypeReference;CodeTypeReference;(System.String);Argument[0];Argument[this];taint;df-generated |
 | System.CodeDom;CodeTypeReference;CodeTypeReference;(System.String,System.CodeDom.CodeTypeReferenceOptions);Argument[0];Argument[this];taint;df-generated |
-| System.CodeDom;CodeTypeReference;CodeTypeReference;(System.String,System.CodeDom.CodeTypeReference[]);Argument[1].Element;Argument[this];taint;df-generated |
-| System.CodeDom;CodeTypeReference;get_TypeArguments;();Argument[this];ReturnValue;taint;df-generated |
-| System.CodeDom;CodeTypeReferenceCollection;Add;(System.CodeDom.CodeTypeReference);Argument[0];Argument[this];taint;df-generated |
-| System.CodeDom;CodeTypeReferenceCollection;Add;(System.String);Argument[0];Argument[this];taint;df-generated |
-| System.CodeDom;CodeTypeReferenceCollection;AddRange;(System.CodeDom.CodeTypeReferenceCollection);Argument[0].Element;Argument[this];taint;df-generated |
-| System.CodeDom;CodeTypeReferenceCollection;AddRange;(System.CodeDom.CodeTypeReference[]);Argument[0].Element;Argument[this];taint;df-generated |
-| System.CodeDom;CodeTypeReferenceCollection;CodeTypeReferenceCollection;(System.CodeDom.CodeTypeReferenceCollection);Argument[0].Element;Argument[this];taint;df-generated |
-| System.CodeDom;CodeTypeReferenceCollection;CodeTypeReferenceCollection;(System.CodeDom.CodeTypeReference[]);Argument[0].Element;Argument[this];taint;df-generated |
-| System.CodeDom;CodeTypeReferenceCollection;CopyTo;(System.CodeDom.CodeTypeReference[],System.Int32);Argument[this];Argument[0].Element;taint;df-generated |
-| System.CodeDom;CodeTypeReferenceCollection;Insert;(System.Int32,System.CodeDom.CodeTypeReference);Argument[1];Argument[this];taint;df-generated |
-| System.CodeDom;CodeTypeReferenceCollection;Remove;(System.CodeDom.CodeTypeReference);Argument[0];Argument[this];taint;df-generated |
-| System.CodeDom;CodeTypeReferenceCollection;get_Item;(System.Int32);Argument[this];ReturnValue;taint;df-generated |
-| System.CodeDom;CodeTypeReferenceCollection;set_Item;(System.Int32,System.CodeDom.CodeTypeReference);Argument[1];Argument[this];taint;df-generated |
+| System.CodeDom;CodeTypeReference;get_TypeArguments;();Argument[this].Property[System.CodeDom.CodeTypeReference.ArrayElementType].Property[System.CodeDom.CodeTypeReference.TypeArguments];ReturnValue;value;dfc-generated |
+| System.CodeDom;CodeTypeReferenceCollection;Add;(System.CodeDom.CodeTypeReference);Argument[0];Argument[this].Property[System.Collections.CollectionBase.List].Element;value;dfc-generated |
+| System.CodeDom;CodeTypeReferenceCollection;AddRange;(System.CodeDom.CodeTypeReferenceCollection);Argument[0].Property[System.Collections.CollectionBase.List].Element;Argument[this].Property[System.Collections.CollectionBase.List].Element;value;dfc-generated |
+| System.CodeDom;CodeTypeReferenceCollection;AddRange;(System.CodeDom.CodeTypeReference[]);Argument[0].Element;Argument[this].Property[System.Collections.CollectionBase.List].Element;value;dfc-generated |
+| System.CodeDom;CodeTypeReferenceCollection;CodeTypeReferenceCollection;(System.CodeDom.CodeTypeReferenceCollection);Argument[0].Property[System.Collections.CollectionBase.List].Element;Argument[this].Property[System.Collections.CollectionBase.List].Element;value;dfc-generated |
+| System.CodeDom;CodeTypeReferenceCollection;CodeTypeReferenceCollection;(System.CodeDom.CodeTypeReference[]);Argument[0].Element;Argument[this].Property[System.Collections.CollectionBase.List].Element;value;dfc-generated |
+| System.CodeDom;CodeTypeReferenceCollection;CopyTo;(System.CodeDom.CodeTypeReference[],System.Int32);Argument[this].Property[System.Collections.CollectionBase.List].Element;Argument[0].Element;value;dfc-generated |
+| System.CodeDom;CodeTypeReferenceCollection;Insert;(System.Int32,System.CodeDom.CodeTypeReference);Argument[1];Argument[this].Property[System.Collections.CollectionBase.List].Element;value;dfc-generated |
+| System.CodeDom;CodeTypeReferenceCollection;get_Item;(System.Int32);Argument[this].Property[System.Collections.CollectionBase.List].Element;ReturnValue;value;dfc-generated |
+| System.CodeDom;CodeTypeReferenceCollection;set_Item;(System.Int32,System.CodeDom.CodeTypeReference);Argument[1];Argument[this].Property[System.Collections.CollectionBase.List].Element;value;dfc-generated |
 | System.CodeDom;CodeTypeReferenceExpression;CodeTypeReferenceExpression;(System.CodeDom.CodeTypeReference);Argument[0];Argument[this];taint;df-generated |
-| System.CodeDom;CodeTypeReferenceExpression;CodeTypeReferenceExpression;(System.String);Argument[0];Argument[this];taint;df-generated |
 | System.CodeDom;CodeVariableDeclarationStatement;CodeVariableDeclarationStatement;(System.CodeDom.CodeTypeReference,System.String);Argument[0];Argument[this];taint;df-generated |
 | System.CodeDom;CodeVariableDeclarationStatement;CodeVariableDeclarationStatement;(System.CodeDom.CodeTypeReference,System.String);Argument[1];Argument[this];taint;df-generated |
 | System.CodeDom;CodeVariableDeclarationStatement;CodeVariableDeclarationStatement;(System.CodeDom.CodeTypeReference,System.String,System.CodeDom.CodeExpression);Argument[0];Argument[this];taint;df-generated |
 | System.CodeDom;CodeVariableDeclarationStatement;CodeVariableDeclarationStatement;(System.CodeDom.CodeTypeReference,System.String,System.CodeDom.CodeExpression);Argument[1];Argument[this];taint;df-generated |
-| System.CodeDom;CodeVariableDeclarationStatement;CodeVariableDeclarationStatement;(System.String,System.String);Argument[0];Argument[this];taint;df-generated |
 | System.CodeDom;CodeVariableDeclarationStatement;CodeVariableDeclarationStatement;(System.String,System.String);Argument[1];Argument[this];taint;df-generated |
-| System.CodeDom;CodeVariableDeclarationStatement;CodeVariableDeclarationStatement;(System.String,System.String,System.CodeDom.CodeExpression);Argument[0];Argument[this];taint;df-generated |
 | System.CodeDom;CodeVariableDeclarationStatement;CodeVariableDeclarationStatement;(System.String,System.String,System.CodeDom.CodeExpression);Argument[1];Argument[this];taint;df-generated |
 | System.CodeDom;CodeVariableDeclarationStatement;CodeVariableDeclarationStatement;(System.Type,System.String);Argument[1];Argument[this];taint;df-generated |
 | System.CodeDom;CodeVariableDeclarationStatement;CodeVariableDeclarationStatement;(System.Type,System.String,System.CodeDom.CodeExpression);Argument[1];Argument[this];taint;df-generated |
@@ -4152,37 +4602,81 @@
 | System.Collections.Concurrent;ConcurrentBag<T>;Add;(T);Argument[0];Argument[this].Element;value;manual |
 | System.Collections.Concurrent;ConcurrentBag<T>;Clear;();Argument[this].WithoutElement;Argument[this];value;manual |
 | System.Collections.Concurrent;ConcurrentBag<T>;ToArray;();Argument[this];ReturnValue;taint;df-generated |
-| System.Collections.Concurrent;ConcurrentBag<T>;TryAdd;(T);Argument[0];Argument[this];taint;df-generated |
+| System.Collections.Concurrent;ConcurrentBag<T>;TryAdd;(T);Argument[0];Argument[this].Element;value;dfc-generated |
 | System.Collections.Concurrent;ConcurrentBag<T>;TryPeek;(T);Argument[this];ReturnValue;taint;df-generated |
 | System.Collections.Concurrent;ConcurrentBag<T>;TryTake;(T);Argument[this];ReturnValue;taint;df-generated |
 | System.Collections.Concurrent;ConcurrentDictionary<TKey,TValue>;Add;(System.Collections.Generic.KeyValuePair<TKey,TValue>);Argument[0].Property[System.Collections.Generic.KeyValuePair`2.Key];Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Key];value;manual |
 | System.Collections.Concurrent;ConcurrentDictionary<TKey,TValue>;Add;(System.Collections.Generic.KeyValuePair<TKey,TValue>);Argument[0].Property[System.Collections.Generic.KeyValuePair`2.Value];Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Value];value;manual |
+| System.Collections.Concurrent;ConcurrentDictionary<TKey,TValue>;AddOrUpdate;(TKey,System.Func<TKey,TValue>,System.Func<TKey,TValue,TValue>);Argument[0];Argument[1].Parameter[0];value;dfc-generated |
+| System.Collections.Concurrent;ConcurrentDictionary<TKey,TValue>;AddOrUpdate;(TKey,System.Func<TKey,TValue>,System.Func<TKey,TValue,TValue>);Argument[0];Argument[1].Parameter[0];value;hq-generated |
+| System.Collections.Concurrent;ConcurrentDictionary<TKey,TValue>;AddOrUpdate;(TKey,System.Func<TKey,TValue>,System.Func<TKey,TValue,TValue>);Argument[0];Argument[2].Parameter[0];value;dfc-generated |
+| System.Collections.Concurrent;ConcurrentDictionary<TKey,TValue>;AddOrUpdate;(TKey,System.Func<TKey,TValue>,System.Func<TKey,TValue,TValue>);Argument[0];Argument[2].Parameter[0];value;hq-generated |
+| System.Collections.Concurrent;ConcurrentDictionary<TKey,TValue>;AddOrUpdate;(TKey,System.Func<TKey,TValue>,System.Func<TKey,TValue,TValue>);Argument[1].ReturnValue;ReturnValue;value;dfc-generated |
+| System.Collections.Concurrent;ConcurrentDictionary<TKey,TValue>;AddOrUpdate;(TKey,System.Func<TKey,TValue>,System.Func<TKey,TValue,TValue>);Argument[1].ReturnValue;ReturnValue;value;hq-generated |
+| System.Collections.Concurrent;ConcurrentDictionary<TKey,TValue>;AddOrUpdate;(TKey,System.Func<TKey,TValue>,System.Func<TKey,TValue,TValue>);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | System.Collections.Concurrent;ConcurrentDictionary<TKey,TValue>;AddOrUpdate;(TKey,System.Func<TKey,TValue>,System.Func<TKey,TValue,TValue>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
+| System.Collections.Concurrent;ConcurrentDictionary<TKey,TValue>;AddOrUpdate;(TKey,System.Func<TKey,TValue>,System.Func<TKey,TValue,TValue>);Argument[2].ReturnValue;ReturnValue;value;dfc-generated |
+| System.Collections.Concurrent;ConcurrentDictionary<TKey,TValue>;AddOrUpdate;(TKey,System.Func<TKey,TValue>,System.Func<TKey,TValue,TValue>);Argument[2].ReturnValue;ReturnValue;value;hq-generated |
+| System.Collections.Concurrent;ConcurrentDictionary<TKey,TValue>;AddOrUpdate;(TKey,System.Func<TKey,TValue>,System.Func<TKey,TValue,TValue>);Argument[2];Argument[2].Parameter[delegate-self];value;dfc-generated |
 | System.Collections.Concurrent;ConcurrentDictionary<TKey,TValue>;AddOrUpdate;(TKey,System.Func<TKey,TValue>,System.Func<TKey,TValue,TValue>);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
+| System.Collections.Concurrent;ConcurrentDictionary<TKey,TValue>;AddOrUpdate;(TKey,TValue,System.Func<TKey,TValue,TValue>);Argument[0];Argument[2].Parameter[0];value;dfc-generated |
+| System.Collections.Concurrent;ConcurrentDictionary<TKey,TValue>;AddOrUpdate;(TKey,TValue,System.Func<TKey,TValue,TValue>);Argument[0];Argument[2].Parameter[0];value;hq-generated |
+| System.Collections.Concurrent;ConcurrentDictionary<TKey,TValue>;AddOrUpdate;(TKey,TValue,System.Func<TKey,TValue,TValue>);Argument[1];ReturnValue;value;dfc-generated |
+| System.Collections.Concurrent;ConcurrentDictionary<TKey,TValue>;AddOrUpdate;(TKey,TValue,System.Func<TKey,TValue,TValue>);Argument[1];ReturnValue;value;hq-generated |
+| System.Collections.Concurrent;ConcurrentDictionary<TKey,TValue>;AddOrUpdate;(TKey,TValue,System.Func<TKey,TValue,TValue>);Argument[2].ReturnValue;ReturnValue;value;dfc-generated |
+| System.Collections.Concurrent;ConcurrentDictionary<TKey,TValue>;AddOrUpdate;(TKey,TValue,System.Func<TKey,TValue,TValue>);Argument[2].ReturnValue;ReturnValue;value;hq-generated |
+| System.Collections.Concurrent;ConcurrentDictionary<TKey,TValue>;AddOrUpdate;(TKey,TValue,System.Func<TKey,TValue,TValue>);Argument[2];Argument[2].Parameter[delegate-self];value;dfc-generated |
 | System.Collections.Concurrent;ConcurrentDictionary<TKey,TValue>;AddOrUpdate;(TKey,TValue,System.Func<TKey,TValue,TValue>);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
+| System.Collections.Concurrent;ConcurrentDictionary<TKey,TValue>;AddOrUpdate<TArg>;(TKey,System.Func<TKey,TArg,TValue>,System.Func<TKey,TValue,TArg,TValue>,TArg);Argument[0];Argument[1].Parameter[0];value;dfc-generated |
+| System.Collections.Concurrent;ConcurrentDictionary<TKey,TValue>;AddOrUpdate<TArg>;(TKey,System.Func<TKey,TArg,TValue>,System.Func<TKey,TValue,TArg,TValue>,TArg);Argument[0];Argument[1].Parameter[0];value;hq-generated |
+| System.Collections.Concurrent;ConcurrentDictionary<TKey,TValue>;AddOrUpdate<TArg>;(TKey,System.Func<TKey,TArg,TValue>,System.Func<TKey,TValue,TArg,TValue>,TArg);Argument[0];Argument[2].Parameter[0];value;dfc-generated |
+| System.Collections.Concurrent;ConcurrentDictionary<TKey,TValue>;AddOrUpdate<TArg>;(TKey,System.Func<TKey,TArg,TValue>,System.Func<TKey,TValue,TArg,TValue>,TArg);Argument[0];Argument[2].Parameter[0];value;hq-generated |
+| System.Collections.Concurrent;ConcurrentDictionary<TKey,TValue>;AddOrUpdate<TArg>;(TKey,System.Func<TKey,TArg,TValue>,System.Func<TKey,TValue,TArg,TValue>,TArg);Argument[1].ReturnValue;ReturnValue;value;dfc-generated |
+| System.Collections.Concurrent;ConcurrentDictionary<TKey,TValue>;AddOrUpdate<TArg>;(TKey,System.Func<TKey,TArg,TValue>,System.Func<TKey,TValue,TArg,TValue>,TArg);Argument[1].ReturnValue;ReturnValue;value;hq-generated |
+| System.Collections.Concurrent;ConcurrentDictionary<TKey,TValue>;AddOrUpdate<TArg>;(TKey,System.Func<TKey,TArg,TValue>,System.Func<TKey,TValue,TArg,TValue>,TArg);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | System.Collections.Concurrent;ConcurrentDictionary<TKey,TValue>;AddOrUpdate<TArg>;(TKey,System.Func<TKey,TArg,TValue>,System.Func<TKey,TValue,TArg,TValue>,TArg);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
+| System.Collections.Concurrent;ConcurrentDictionary<TKey,TValue>;AddOrUpdate<TArg>;(TKey,System.Func<TKey,TArg,TValue>,System.Func<TKey,TValue,TArg,TValue>,TArg);Argument[2].ReturnValue;ReturnValue;value;dfc-generated |
+| System.Collections.Concurrent;ConcurrentDictionary<TKey,TValue>;AddOrUpdate<TArg>;(TKey,System.Func<TKey,TArg,TValue>,System.Func<TKey,TValue,TArg,TValue>,TArg);Argument[2].ReturnValue;ReturnValue;value;hq-generated |
+| System.Collections.Concurrent;ConcurrentDictionary<TKey,TValue>;AddOrUpdate<TArg>;(TKey,System.Func<TKey,TArg,TValue>,System.Func<TKey,TValue,TArg,TValue>,TArg);Argument[2];Argument[2].Parameter[delegate-self];value;dfc-generated |
 | System.Collections.Concurrent;ConcurrentDictionary<TKey,TValue>;AddOrUpdate<TArg>;(TKey,System.Func<TKey,TArg,TValue>,System.Func<TKey,TValue,TArg,TValue>,TArg);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
+| System.Collections.Concurrent;ConcurrentDictionary<TKey,TValue>;AddOrUpdate<TArg>;(TKey,System.Func<TKey,TArg,TValue>,System.Func<TKey,TValue,TArg,TValue>,TArg);Argument[3];Argument[1].Parameter[1];value;dfc-generated |
+| System.Collections.Concurrent;ConcurrentDictionary<TKey,TValue>;AddOrUpdate<TArg>;(TKey,System.Func<TKey,TArg,TValue>,System.Func<TKey,TValue,TArg,TValue>,TArg);Argument[3];Argument[1].Parameter[1];value;hq-generated |
+| System.Collections.Concurrent;ConcurrentDictionary<TKey,TValue>;AddOrUpdate<TArg>;(TKey,System.Func<TKey,TArg,TValue>,System.Func<TKey,TValue,TArg,TValue>,TArg);Argument[3];Argument[2].Parameter[2];value;dfc-generated |
+| System.Collections.Concurrent;ConcurrentDictionary<TKey,TValue>;AddOrUpdate<TArg>;(TKey,System.Func<TKey,TArg,TValue>,System.Func<TKey,TValue,TArg,TValue>,TArg);Argument[3];Argument[2].Parameter[2];value;hq-generated |
 | System.Collections.Concurrent;ConcurrentDictionary<TKey,TValue>;ConcurrentDictionary;(System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<TKey,TValue>>);Argument[0].Element.Property[System.Collections.Generic.KeyValuePair`2.Key];Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Key];value;manual |
 | System.Collections.Concurrent;ConcurrentDictionary<TKey,TValue>;ConcurrentDictionary;(System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<TKey,TValue>>);Argument[0].Element.Property[System.Collections.Generic.KeyValuePair`2.Value];Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Value];value;manual |
 | System.Collections.Concurrent;ConcurrentDictionary<TKey,TValue>;ConcurrentDictionary;(System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<TKey,TValue>>,System.Collections.Generic.IEqualityComparer<TKey>);Argument[0].Element.Property[System.Collections.Generic.KeyValuePair`2.Key];Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Key];value;manual |
 | System.Collections.Concurrent;ConcurrentDictionary<TKey,TValue>;ConcurrentDictionary;(System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<TKey,TValue>>,System.Collections.Generic.IEqualityComparer<TKey>);Argument[0].Element.Property[System.Collections.Generic.KeyValuePair`2.Value];Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Value];value;manual |
 | System.Collections.Concurrent;ConcurrentDictionary<TKey,TValue>;ConcurrentDictionary;(System.Int32,System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<TKey,TValue>>,System.Collections.Generic.IEqualityComparer<TKey>);Argument[1].Element.Property[System.Collections.Generic.KeyValuePair`2.Key];Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Key];value;manual |
 | System.Collections.Concurrent;ConcurrentDictionary<TKey,TValue>;ConcurrentDictionary;(System.Int32,System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<TKey,TValue>>,System.Collections.Generic.IEqualityComparer<TKey>);Argument[1].Element.Property[System.Collections.Generic.KeyValuePair`2.Value];Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Value];value;manual |
+| System.Collections.Concurrent;ConcurrentDictionary<TKey,TValue>;GetOrAdd;(TKey,System.Func<TKey,TValue>);Argument[0];Argument[1].Parameter[0];value;dfc-generated |
+| System.Collections.Concurrent;ConcurrentDictionary<TKey,TValue>;GetOrAdd;(TKey,System.Func<TKey,TValue>);Argument[0];Argument[1].Parameter[0];value;hq-generated |
+| System.Collections.Concurrent;ConcurrentDictionary<TKey,TValue>;GetOrAdd;(TKey,System.Func<TKey,TValue>);Argument[1].ReturnValue;ReturnValue;value;dfc-generated |
+| System.Collections.Concurrent;ConcurrentDictionary<TKey,TValue>;GetOrAdd;(TKey,System.Func<TKey,TValue>);Argument[1].ReturnValue;ReturnValue;value;hq-generated |
+| System.Collections.Concurrent;ConcurrentDictionary<TKey,TValue>;GetOrAdd;(TKey,System.Func<TKey,TValue>);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | System.Collections.Concurrent;ConcurrentDictionary<TKey,TValue>;GetOrAdd;(TKey,System.Func<TKey,TValue>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
-| System.Collections.Concurrent;ConcurrentDictionary<TKey,TValue>;GetOrAdd;(TKey,TValue);Argument[1];ReturnValue;taint;df-generated |
+| System.Collections.Concurrent;ConcurrentDictionary<TKey,TValue>;GetOrAdd;(TKey,TValue);Argument[1];ReturnValue;value;dfc-generated |
+| System.Collections.Concurrent;ConcurrentDictionary<TKey,TValue>;GetOrAdd<TArg>;(TKey,System.Func<TKey,TArg,TValue>,TArg);Argument[0];Argument[1].Parameter[0];value;dfc-generated |
+| System.Collections.Concurrent;ConcurrentDictionary<TKey,TValue>;GetOrAdd<TArg>;(TKey,System.Func<TKey,TArg,TValue>,TArg);Argument[0];Argument[1].Parameter[0];value;hq-generated |
+| System.Collections.Concurrent;ConcurrentDictionary<TKey,TValue>;GetOrAdd<TArg>;(TKey,System.Func<TKey,TArg,TValue>,TArg);Argument[1].ReturnValue;ReturnValue;value;dfc-generated |
+| System.Collections.Concurrent;ConcurrentDictionary<TKey,TValue>;GetOrAdd<TArg>;(TKey,System.Func<TKey,TArg,TValue>,TArg);Argument[1].ReturnValue;ReturnValue;value;hq-generated |
+| System.Collections.Concurrent;ConcurrentDictionary<TKey,TValue>;GetOrAdd<TArg>;(TKey,System.Func<TKey,TArg,TValue>,TArg);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | System.Collections.Concurrent;ConcurrentDictionary<TKey,TValue>;GetOrAdd<TArg>;(TKey,System.Func<TKey,TArg,TValue>,TArg);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
+| System.Collections.Concurrent;ConcurrentDictionary<TKey,TValue>;GetOrAdd<TArg>;(TKey,System.Func<TKey,TArg,TValue>,TArg);Argument[2];Argument[1].Parameter[1];value;dfc-generated |
+| System.Collections.Concurrent;ConcurrentDictionary<TKey,TValue>;GetOrAdd<TArg>;(TKey,System.Func<TKey,TArg,TValue>,TArg);Argument[2];Argument[1].Parameter[1];value;hq-generated |
 | System.Collections.Concurrent;ConcurrentDictionary<TKey,TValue>;get_Comparer;();Argument[this];ReturnValue;taint;df-generated |
 | System.Collections.Concurrent;ConcurrentDictionary<TKey,TValue>;get_Keys;();Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Key];ReturnValue.Element;value;manual |
 | System.Collections.Concurrent;ConcurrentDictionary<TKey,TValue>;get_Values;();Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Value];ReturnValue.Element;value;manual |
 | System.Collections.Concurrent;ConcurrentQueue<T>;Clear;();Argument[this].WithoutElement;Argument[this];value;manual |
 | System.Collections.Concurrent;ConcurrentStack<T>;Clear;();Argument[this].WithoutElement;Argument[this];value;manual |
-| System.Collections.Concurrent;ConcurrentStack<T>;ConcurrentStack;(System.Collections.Generic.IEnumerable<T>);Argument[0].Element;Argument[this];taint;df-generated |
-| System.Collections.Concurrent;ConcurrentStack<T>;TryPeek;(T);Argument[this];ReturnValue;taint;df-generated |
-| System.Collections.Concurrent;ConcurrentStack<T>;TryPop;(T);Argument[this];ReturnValue;taint;df-generated |
-| System.Collections.Concurrent;ConcurrentStack<T>;TryPopRange;(T[]);Argument[this];Argument[0].Element;taint;df-generated |
-| System.Collections.Concurrent;ConcurrentStack<T>;TryPopRange;(T[],System.Int32,System.Int32);Argument[this];Argument[0].Element;taint;df-generated |
-| System.Collections.Concurrent;ConcurrentStack<T>;TryTake;(T);Argument[this];ReturnValue;taint;df-generated |
+| System.Collections.Concurrent;ConcurrentStack<T>;ConcurrentStack;(System.Collections.Generic.IEnumerable<T>);Argument[0].Element;Argument[this].SyntheticField[System.Collections.Concurrent.ConcurrentStack`1._head].SyntheticField[System.Collections.Concurrent.ConcurrentStack`1+Node._value];value;dfc-generated |
+| System.Collections.Concurrent;ConcurrentStack<T>;TryPeek;(T);Argument[this].SyntheticField[System.Collections.Concurrent.ConcurrentStack`1._head].SyntheticField[System.Collections.Concurrent.ConcurrentStack`1+Node._value];ReturnValue;value;dfc-generated |
+| System.Collections.Concurrent;ConcurrentStack<T>;TryPop;(T);Argument[this].SyntheticField[System.Collections.Concurrent.ConcurrentStack`1._head].SyntheticField[System.Collections.Concurrent.ConcurrentStack`1+Node._value];ReturnValue;value;dfc-generated |
+| System.Collections.Concurrent;ConcurrentStack<T>;TryPopRange;(T[]);Argument[this].SyntheticField[System.Collections.Concurrent.ConcurrentStack`1._head].SyntheticField[System.Collections.Concurrent.ConcurrentStack`1+Node._value];Argument[0].Element;value;dfc-generated |
+| System.Collections.Concurrent;ConcurrentStack<T>;TryPopRange;(T[],System.Int32,System.Int32);Argument[this].SyntheticField[System.Collections.Concurrent.ConcurrentStack`1._head].SyntheticField[System.Collections.Concurrent.ConcurrentStack`1+Node._value];Argument[0].Element;value;dfc-generated |
+| System.Collections.Concurrent;ConcurrentStack<T>;TryTake;(T);Argument[this].SyntheticField[System.Collections.Concurrent.ConcurrentStack`1._head].SyntheticField[System.Collections.Concurrent.ConcurrentStack`1+Node._value];ReturnValue;value;dfc-generated |
 | System.Collections.Concurrent;IProducerConsumerCollection<T>;CopyTo;(T[],System.Int32);Argument[this].Element;Argument[0].Element;value;manual |
+| System.Collections.Concurrent;OrderablePartitioner<TSource>;GetDynamicPartitions;();Argument[this];ReturnValue;taint;df-generated |
 | System.Collections.Concurrent;Partitioner;Create<TSource>;(System.Collections.Generic.IEnumerable<TSource>);Argument[0].Element;ReturnValue;taint;df-generated |
 | System.Collections.Concurrent;Partitioner;Create<TSource>;(System.Collections.Generic.IEnumerable<TSource>,System.Collections.Concurrent.EnumerablePartitionerOptions);Argument[0].Element;ReturnValue;taint;df-generated |
 | System.Collections.Concurrent;Partitioner;Create<TSource>;(System.Collections.Generic.IList<TSource>,System.Boolean);Argument[0].Element;ReturnValue;taint;df-generated |
@@ -4191,34 +4685,40 @@
 | System.Collections.Frozen;FrozenDictionary;ToFrozenDictionary<TSource,TKey,TElement>;(System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,TKey>,System.Func<TSource,TElement>,System.Collections.Generic.IEqualityComparer<TKey>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
 | System.Collections.Frozen;FrozenDictionary;ToFrozenDictionary<TSource,TKey,TElement>;(System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,TKey>,System.Func<TSource,TElement>,System.Collections.Generic.IEqualityComparer<TKey>);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
 | System.Collections.Frozen;FrozenDictionary;ToFrozenDictionary<TSource,TKey>;(System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,TKey>,System.Collections.Generic.IEqualityComparer<TKey>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
+| System.Collections.Frozen;FrozenDictionary<TKey,TValue>+Enumerator;get_Current;();Argument[this].Property[System.Collections.Frozen.FrozenDictionary`2+Enumerator.Current];ReturnValue;value;df-generated |
+| System.Collections.Frozen;FrozenDictionary<TKey,TValue>+Enumerator;get_Current;();Argument[this].Property[System.Collections.Frozen.FrozenDictionary`2+Enumerator.Current];ReturnValue;value;dfc-generated |
 | System.Collections.Frozen;FrozenDictionary<TKey,TValue>+Enumerator;get_Current;();Argument[this];ReturnValue;taint;df-generated |
+| System.Collections.Frozen;FrozenDictionary<TKey,TValue>+Enumerator;get_Current;();Argument[this];ReturnValue;taint;dfc-generated |
 | System.Collections.Frozen;FrozenDictionary<TKey,TValue>;get_Keys;();Argument[this];ReturnValue;taint;df-generated |
 | System.Collections.Frozen;FrozenDictionary<TKey,TValue>;get_Values;();Argument[this];ReturnValue;taint;df-generated |
 | System.Collections.Frozen;FrozenSet;ToFrozenSet<T>;(System.Collections.Generic.IEnumerable<T>,System.Collections.Generic.IEqualityComparer<T>);Argument[0].Element;ReturnValue;taint;df-generated |
+| System.Collections.Frozen;FrozenSet<T>+Enumerator;get_Current;();Argument[this].Property[System.Collections.Frozen.FrozenSet`1+Enumerator.Current];ReturnValue;value;df-generated |
+| System.Collections.Frozen;FrozenSet<T>+Enumerator;get_Current;();Argument[this].Property[System.Collections.Frozen.FrozenSet`1+Enumerator.Current];ReturnValue;value;dfc-generated |
 | System.Collections.Frozen;FrozenSet<T>+Enumerator;get_Current;();Argument[this];ReturnValue;taint;df-generated |
-| System.Collections.Frozen;FrozenSet<T>;CopyTo;(System.Span<T>);Argument[this];Argument[0];taint;df-generated |
-| System.Collections.Frozen;FrozenSet<T>;TryGetValue;(T,T);Argument[this];ReturnValue;taint;df-generated |
+| System.Collections.Frozen;FrozenSet<T>+Enumerator;get_Current;();Argument[this];ReturnValue;taint;dfc-generated |
+| System.Collections.Frozen;FrozenSet<T>;CopyTo;(System.Span<T>);Argument[this].Property[System.Collections.Frozen.FrozenSet`1.Items].Element;Argument[0].Element;value;dfc-generated |
+| System.Collections.Frozen;FrozenSet<T>;TryGetValue;(T,T);Argument[this].Property[System.Collections.Frozen.FrozenSet`1.Items].Element;ReturnValue;value;dfc-generated |
 | System.Collections.Frozen;FrozenSet<T>;get_Items;();Argument[this];ReturnValue;taint;df-generated |
 | System.Collections.Generic;CollectionExtensions;AsReadOnly<T>;(System.Collections.Generic.IList<T>);Argument[0].Element;ReturnValue;taint;df-generated |
-| System.Collections.Generic;CollectionExtensions;AsReadOnly<TKey,TValue>;(System.Collections.Generic.IDictionary<TKey,TValue>);Argument[0].Element;ReturnValue;taint;df-generated |
+| System.Collections.Generic;CollectionExtensions;AsReadOnly<TKey,TValue>;(System.Collections.Generic.IDictionary<TKey,TValue>);Argument[0].Element.Property[System.Collections.Generic.KeyValuePair`2.Key];ReturnValue.Element.Property[System.Collections.Generic.KeyValuePair`2.Key];value;dfc-generated |
+| System.Collections.Generic;CollectionExtensions;AsReadOnly<TKey,TValue>;(System.Collections.Generic.IDictionary<TKey,TValue>);Argument[0].Element.Property[System.Collections.Generic.KeyValuePair`2.Value];ReturnValue.Element.Property[System.Collections.Generic.KeyValuePair`2.Value];value;dfc-generated |
 | System.Collections.Generic;CollectionExtensions;CopyTo<T>;(System.Collections.Generic.List<T>,System.Span<T>);Argument[0].Element;Argument[1];taint;df-generated |
-| System.Collections.Generic;CollectionExtensions;GetValueOrDefault<TKey,TValue>;(System.Collections.Generic.IReadOnlyDictionary<TKey,TValue>,TKey);Argument[0].Element;ReturnValue;taint;df-generated |
-| System.Collections.Generic;CollectionExtensions;GetValueOrDefault<TKey,TValue>;(System.Collections.Generic.IReadOnlyDictionary<TKey,TValue>,TKey);Argument[1];ReturnValue;taint;df-generated |
-| System.Collections.Generic;CollectionExtensions;GetValueOrDefault<TKey,TValue>;(System.Collections.Generic.IReadOnlyDictionary<TKey,TValue>,TKey,TValue);Argument[0].Element;ReturnValue;taint;df-generated |
-| System.Collections.Generic;CollectionExtensions;GetValueOrDefault<TKey,TValue>;(System.Collections.Generic.IReadOnlyDictionary<TKey,TValue>,TKey,TValue);Argument[1];ReturnValue;taint;df-generated |
-| System.Collections.Generic;CollectionExtensions;GetValueOrDefault<TKey,TValue>;(System.Collections.Generic.IReadOnlyDictionary<TKey,TValue>,TKey,TValue);Argument[2];ReturnValue;taint;df-generated |
+| System.Collections.Generic;CollectionExtensions;GetValueOrDefault<TKey,TValue>;(System.Collections.Generic.IReadOnlyDictionary<TKey,TValue>,TKey,TValue);Argument[2];ReturnValue;value;dfc-generated |
 | System.Collections.Generic;CollectionExtensions;Remove<TKey,TValue>;(System.Collections.Generic.IDictionary<TKey,TValue>,TKey,TValue);Argument[0].Element;ReturnValue;taint;df-generated |
-| System.Collections.Generic;CollectionExtensions;TryAdd<TKey,TValue>;(System.Collections.Generic.IDictionary<TKey,TValue>,TKey,TValue);Argument[0].Element;Argument[2];taint;df-generated |
-| System.Collections.Generic;CollectionExtensions;TryAdd<TKey,TValue>;(System.Collections.Generic.IDictionary<TKey,TValue>,TKey,TValue);Argument[1];Argument[0].Element;taint;df-generated |
-| System.Collections.Generic;CollectionExtensions;TryAdd<TKey,TValue>;(System.Collections.Generic.IDictionary<TKey,TValue>,TKey,TValue);Argument[2];Argument[0].Element;taint;df-generated |
+| System.Collections.Generic;CollectionExtensions;TryAdd<TKey,TValue>;(System.Collections.Generic.IDictionary<TKey,TValue>,TKey,TValue);Argument[1];Argument[0].Element.Property[System.Collections.Generic.KeyValuePair`2.Key];value;dfc-generated |
+| System.Collections.Generic;CollectionExtensions;TryAdd<TKey,TValue>;(System.Collections.Generic.IDictionary<TKey,TValue>,TKey,TValue);Argument[2];Argument[0].Element.Property[System.Collections.Generic.KeyValuePair`2.Value];value;dfc-generated |
 | System.Collections.Generic;Comparer<T>;Create;(System.Comparison<T>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Collections.Generic;Dictionary<TKey,TValue>+Enumerator;get_Current;();Argument[this];ReturnValue;taint;df-generated |
 | System.Collections.Generic;Dictionary<TKey,TValue>+KeyCollection+Enumerator;get_Current;();Argument[this];ReturnValue;taint;df-generated |
 | System.Collections.Generic;Dictionary<TKey,TValue>+KeyCollection;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.Generic.Dictionary`2+KeyCollection+Enumerator.Current];value;manual |
-| System.Collections.Generic;Dictionary<TKey,TValue>+KeyCollection;KeyCollection;(System.Collections.Generic.Dictionary<TKey,TValue>);Argument[0].Element;Argument[this];taint;df-generated |
+| System.Collections.Generic;Dictionary<TKey,TValue>+KeyCollection;KeyCollection;(System.Collections.Generic.Dictionary<TKey,TValue>);Argument[0];Argument[this].SyntheticField[System.Collections.Generic.Dictionary`2+KeyCollection._dictionary];value;dfc-generated |
+| System.Collections.Generic;Dictionary<TKey,TValue>+KeyCollection;get_SyncRoot;();Argument[this].SyntheticField[System.Collections.Generic.Dictionary`2+KeyCollection._dictionary].Property[System.Collections.ICollection.SyncRoot];ReturnValue;value;dfc-generated |
+| System.Collections.Generic;Dictionary<TKey,TValue>+KeyCollection;get_SyncRoot;();Argument[this].SyntheticField[System.Collections.Generic.Dictionary`2+KeyCollection._dictionary];ReturnValue;value;dfc-generated |
 | System.Collections.Generic;Dictionary<TKey,TValue>+ValueCollection+Enumerator;get_Current;();Argument[this];ReturnValue;taint;df-generated |
 | System.Collections.Generic;Dictionary<TKey,TValue>+ValueCollection;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.Generic.Dictionary`2+ValueCollection+Enumerator.Current];value;manual |
-| System.Collections.Generic;Dictionary<TKey,TValue>+ValueCollection;ValueCollection;(System.Collections.Generic.Dictionary<TKey,TValue>);Argument[0].Element;Argument[this];taint;df-generated |
+| System.Collections.Generic;Dictionary<TKey,TValue>+ValueCollection;ValueCollection;(System.Collections.Generic.Dictionary<TKey,TValue>);Argument[0];Argument[this].SyntheticField[System.Collections.Generic.Dictionary`2+ValueCollection._dictionary];value;dfc-generated |
+| System.Collections.Generic;Dictionary<TKey,TValue>+ValueCollection;get_SyncRoot;();Argument[this].SyntheticField[System.Collections.Generic.Dictionary`2+ValueCollection._dictionary].Property[System.Collections.ICollection.SyncRoot];ReturnValue;value;dfc-generated |
+| System.Collections.Generic;Dictionary<TKey,TValue>+ValueCollection;get_SyncRoot;();Argument[this].SyntheticField[System.Collections.Generic.Dictionary`2+ValueCollection._dictionary];ReturnValue;value;dfc-generated |
 | System.Collections.Generic;Dictionary<TKey,TValue>;Add;(System.Collections.Generic.KeyValuePair<TKey,TValue>);Argument[0].Property[System.Collections.Generic.KeyValuePair`2.Key];Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Key];value;manual |
 | System.Collections.Generic;Dictionary<TKey,TValue>;Add;(System.Collections.Generic.KeyValuePair<TKey,TValue>);Argument[0].Property[System.Collections.Generic.KeyValuePair`2.Value];Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Value];value;manual |
 | System.Collections.Generic;Dictionary<TKey,TValue>;Dictionary;(System.Collections.Generic.IDictionary<TKey,TValue>);Argument[0].Element.Property[System.Collections.Generic.KeyValuePair`2.Key];Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Key];value;manual |
@@ -4229,20 +4729,28 @@
 | System.Collections.Generic;Dictionary<TKey,TValue>;Dictionary;(System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<TKey,TValue>>);Argument[0].Element.Property[System.Collections.Generic.KeyValuePair`2.Value];Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Value];value;manual |
 | System.Collections.Generic;Dictionary<TKey,TValue>;Dictionary;(System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<TKey,TValue>>,System.Collections.Generic.IEqualityComparer<TKey>);Argument[0].Element.Property[System.Collections.Generic.KeyValuePair`2.Key];Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Key];value;manual |
 | System.Collections.Generic;Dictionary<TKey,TValue>;Dictionary;(System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<TKey,TValue>>,System.Collections.Generic.IEqualityComparer<TKey>);Argument[0].Element.Property[System.Collections.Generic.KeyValuePair`2.Value];Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Value];value;manual |
-| System.Collections.Generic;Dictionary<TKey,TValue>;Dictionary;(System.Int32,System.Collections.Generic.IEqualityComparer<TKey>);Argument[1];Argument[this];taint;df-generated |
+| System.Collections.Generic;Dictionary<TKey,TValue>;Dictionary;(System.Int32,System.Collections.Generic.IEqualityComparer<TKey>);Argument[1];Argument[this].SyntheticField[System.Collections.Generic.Dictionary`2._comparer];value;dfc-generated |
 | System.Collections.Generic;Dictionary<TKey,TValue>;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.Generic.Dictionary`2+Enumerator.Current];value;manual |
-| System.Collections.Generic;Dictionary<TKey,TValue>;get_Comparer;();Argument[this];ReturnValue;taint;df-generated |
+| System.Collections.Generic;Dictionary<TKey,TValue>;GetObjectData;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);Argument[this].Property[System.Collections.Generic.Dictionary`2.Comparer];Argument[0].SyntheticField[System.Runtime.Serialization.SerializationInfo._values].Element;value;df-generated |
+| System.Collections.Generic;Dictionary<TKey,TValue>;GetObjectData;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);Argument[this].Property[System.Collections.Generic.Dictionary`2.Comparer];Argument[0].SyntheticField[System.Runtime.Serialization.SerializationInfo._values].Element;value;dfc-generated |
+| System.Collections.Generic;Dictionary<TKey,TValue>;GetObjectData;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);Argument[this].SyntheticField[System.Collections.Generic.Dictionary`2._comparer];Argument[0].SyntheticField[System.Runtime.Serialization.SerializationInfo._values].Element;value;df-generated |
+| System.Collections.Generic;Dictionary<TKey,TValue>;GetObjectData;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);Argument[this].SyntheticField[System.Collections.Generic.Dictionary`2._comparer];Argument[0].SyntheticField[System.Runtime.Serialization.SerializationInfo._values].Element;value;dfc-generated |
+| System.Collections.Generic;Dictionary<TKey,TValue>;get_Comparer;();Argument[this].SyntheticField[System.Collections.Generic.Dictionary`2._comparer];ReturnValue;value;dfc-generated |
 | System.Collections.Generic;Dictionary<TKey,TValue>;get_Keys;();Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Key];ReturnValue.Element;value;manual |
 | System.Collections.Generic;Dictionary<TKey,TValue>;get_Values;();Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Value];ReturnValue.Element;value;manual |
 | System.Collections.Generic;EqualityComparer<T>;Create;(System.Func<T,T,System.Boolean>,System.Func<T,System.Int32>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Collections.Generic;EqualityComparer<T>;Create;(System.Func<T,T,System.Boolean>,System.Func<T,System.Int32>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
 | System.Collections.Generic;HashSet<T>+Enumerator;get_Current;();Argument[this];ReturnValue;taint;df-generated |
 | System.Collections.Generic;HashSet<T>;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.Generic.HashSet`1+Enumerator.Current];value;manual |
+| System.Collections.Generic;HashSet<T>;GetObjectData;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);Argument[this].Property[System.Collections.Generic.HashSet`1.Comparer];Argument[0].SyntheticField[System.Runtime.Serialization.SerializationInfo._values].Element;value;df-generated |
+| System.Collections.Generic;HashSet<T>;GetObjectData;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);Argument[this].Property[System.Collections.Generic.HashSet`1.Comparer];Argument[0].SyntheticField[System.Runtime.Serialization.SerializationInfo._values].Element;value;dfc-generated |
+| System.Collections.Generic;HashSet<T>;GetObjectData;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);Argument[this].SyntheticField[System.Collections.Generic.HashSet`1._comparer];Argument[0].SyntheticField[System.Runtime.Serialization.SerializationInfo._values].Element;value;df-generated |
+| System.Collections.Generic;HashSet<T>;GetObjectData;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);Argument[this].SyntheticField[System.Collections.Generic.HashSet`1._comparer];Argument[0].SyntheticField[System.Runtime.Serialization.SerializationInfo._values].Element;value;dfc-generated |
 | System.Collections.Generic;HashSet<T>;HashSet;(System.Collections.Generic.IEnumerable<T>,System.Collections.Generic.IEqualityComparer<T>);Argument[0].Element;Argument[this];taint;df-generated |
-| System.Collections.Generic;HashSet<T>;HashSet;(System.Collections.Generic.IEqualityComparer<T>);Argument[0];Argument[this];taint;df-generated |
+| System.Collections.Generic;HashSet<T>;HashSet;(System.Collections.Generic.IEqualityComparer<T>);Argument[0];Argument[this].SyntheticField[System.Collections.Generic.HashSet`1._comparer];value;dfc-generated |
 | System.Collections.Generic;HashSet<T>;RemoveWhere;(System.Predicate<T>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Collections.Generic;HashSet<T>;TryGetValue;(T,T);Argument[this];ReturnValue;taint;df-generated |
-| System.Collections.Generic;HashSet<T>;get_Comparer;();Argument[this];ReturnValue;taint;df-generated |
+| System.Collections.Generic;HashSet<T>;get_Comparer;();Argument[this].SyntheticField[System.Collections.Generic.HashSet`1._comparer];ReturnValue;value;dfc-generated |
 | System.Collections.Generic;ICollection<T>;Add;(T);Argument[0];Argument[this].Element;value;manual |
 | System.Collections.Generic;ICollection<T>;Clear;();Argument[this].WithoutElement;Argument[this];value;manual |
 | System.Collections.Generic;ICollection<T>;CopyTo;(T[],System.Int32);Argument[this].Element;Argument[0].Element;value;manual |
@@ -4258,24 +4766,20 @@
 | System.Collections.Generic;IList<T>;get_Item;(System.Int32);Argument[this].Element;ReturnValue;value;manual |
 | System.Collections.Generic;IList<T>;set_Item;(System.Int32,T);Argument[1];Argument[this].Element;value;manual |
 | System.Collections.Generic;ISet<T>;Add;(T);Argument[0];Argument[this].Element;value;manual |
-| System.Collections.Generic;KeyValuePair;Create<TKey,TValue>;(TKey,TValue);Argument[0];ReturnValue;taint;df-generated |
-| System.Collections.Generic;KeyValuePair;Create<TKey,TValue>;(TKey,TValue);Argument[1];ReturnValue;taint;df-generated |
+| System.Collections.Generic;KeyValuePair;Create<TKey,TValue>;(TKey,TValue);Argument[0];ReturnValue.Property[System.Collections.Generic.KeyValuePair`2.Key];value;dfc-generated |
+| System.Collections.Generic;KeyValuePair;Create<TKey,TValue>;(TKey,TValue);Argument[1];ReturnValue.Property[System.Collections.Generic.KeyValuePair`2.Value];value;dfc-generated |
 | System.Collections.Generic;KeyValuePair<TKey,TValue>;Deconstruct;(TKey,TValue);Argument[this];ReturnValue;taint;df-generated |
 | System.Collections.Generic;KeyValuePair<TKey,TValue>;KeyValuePair;(TKey,TValue);Argument[0];Argument[this].Property[System.Collections.Generic.KeyValuePair`2.Key];value;manual |
 | System.Collections.Generic;KeyValuePair<TKey,TValue>;KeyValuePair;(TKey,TValue);Argument[1];Argument[this].Property[System.Collections.Generic.KeyValuePair`2.Value];value;manual |
 | System.Collections.Generic;KeyValuePair<TKey,TValue>;get_Key;();Argument[this];ReturnValue;taint;df-generated |
 | System.Collections.Generic;KeyValuePair<TKey,TValue>;get_Value;();Argument[this];ReturnValue;taint;df-generated |
+| System.Collections.Generic;LinkedList<T>+Enumerator;get_Current;();Argument[this].Property[System.Collections.Generic.LinkedList`1+Enumerator.Current];ReturnValue;value;df-generated |
+| System.Collections.Generic;LinkedList<T>+Enumerator;get_Current;();Argument[this].Property[System.Collections.Generic.LinkedList`1+Enumerator.Current];ReturnValue;value;dfc-generated |
 | System.Collections.Generic;LinkedList<T>+Enumerator;get_Current;();Argument[this];ReturnValue;taint;df-generated |
-| System.Collections.Generic;LinkedList<T>;AddAfter;(System.Collections.Generic.LinkedListNode<T>,System.Collections.Generic.LinkedListNode<T>);Argument[0];Argument[1];taint;df-generated |
-| System.Collections.Generic;LinkedList<T>;AddAfter;(System.Collections.Generic.LinkedListNode<T>,System.Collections.Generic.LinkedListNode<T>);Argument[1];Argument[0];taint;df-generated |
-| System.Collections.Generic;LinkedList<T>;AddAfter;(System.Collections.Generic.LinkedListNode<T>,System.Collections.Generic.LinkedListNode<T>);Argument[this];Argument[1];taint;df-generated |
-| System.Collections.Generic;LinkedList<T>;AddAfter;(System.Collections.Generic.LinkedListNode<T>,T);Argument[0];ReturnValue;taint;df-generated |
-| System.Collections.Generic;LinkedList<T>;AddAfter;(System.Collections.Generic.LinkedListNode<T>,T);Argument[1];ReturnValue;taint;df-generated |
-| System.Collections.Generic;LinkedList<T>;AddBefore;(System.Collections.Generic.LinkedListNode<T>,System.Collections.Generic.LinkedListNode<T>);Argument[0];Argument[1];taint;df-generated |
-| System.Collections.Generic;LinkedList<T>;AddBefore;(System.Collections.Generic.LinkedListNode<T>,System.Collections.Generic.LinkedListNode<T>);Argument[0];Argument[this];taint;df-generated |
-| System.Collections.Generic;LinkedList<T>;AddBefore;(System.Collections.Generic.LinkedListNode<T>,System.Collections.Generic.LinkedListNode<T>);Argument[1];Argument[0];taint;df-generated |
-| System.Collections.Generic;LinkedList<T>;AddBefore;(System.Collections.Generic.LinkedListNode<T>,System.Collections.Generic.LinkedListNode<T>);Argument[1];Argument[this];taint;df-generated |
-| System.Collections.Generic;LinkedList<T>;AddBefore;(System.Collections.Generic.LinkedListNode<T>,System.Collections.Generic.LinkedListNode<T>);Argument[this];Argument[1];taint;df-generated |
+| System.Collections.Generic;LinkedList<T>+Enumerator;get_Current;();Argument[this];ReturnValue;taint;dfc-generated |
+| System.Collections.Generic;LinkedList<T>;AddAfter;(System.Collections.Generic.LinkedListNode<T>,System.Collections.Generic.LinkedListNode<T>);Argument[0].SyntheticField[System.Collections.Generic.LinkedListNode`1.next];Argument[1].SyntheticField[System.Collections.Generic.LinkedListNode`1.next];value;dfc-generated |
+| System.Collections.Generic;LinkedList<T>;AddAfter;(System.Collections.Generic.LinkedListNode<T>,T);Argument[0].SyntheticField[System.Collections.Generic.LinkedListNode`1.next];ReturnValue.SyntheticField[System.Collections.Generic.LinkedListNode`1.next];value;dfc-generated |
+| System.Collections.Generic;LinkedList<T>;AddBefore;(System.Collections.Generic.LinkedListNode<T>,System.Collections.Generic.LinkedListNode<T>);Argument[1];Argument[this].SyntheticField[System.Collections.Generic.LinkedList`1.head];value;dfc-generated |
 | System.Collections.Generic;LinkedList<T>;AddBefore;(System.Collections.Generic.LinkedListNode<T>,T);Argument[0];Argument[this];taint;df-generated |
 | System.Collections.Generic;LinkedList<T>;AddBefore;(System.Collections.Generic.LinkedListNode<T>,T);Argument[0];ReturnValue;taint;df-generated |
 | System.Collections.Generic;LinkedList<T>;AddBefore;(System.Collections.Generic.LinkedListNode<T>,T);Argument[1];Argument[0];taint;df-generated |
@@ -4286,8 +4790,7 @@
 | System.Collections.Generic;LinkedList<T>;AddFirst;(T);Argument[0];Argument[this];taint;df-generated |
 | System.Collections.Generic;LinkedList<T>;AddFirst;(T);Argument[0];ReturnValue;taint;df-generated |
 | System.Collections.Generic;LinkedList<T>;AddFirst;(T);Argument[this];ReturnValue;taint;df-generated |
-| System.Collections.Generic;LinkedList<T>;AddLast;(System.Collections.Generic.LinkedListNode<T>);Argument[0];Argument[this];taint;df-generated |
-| System.Collections.Generic;LinkedList<T>;AddLast;(System.Collections.Generic.LinkedListNode<T>);Argument[this];Argument[0];taint;df-generated |
+| System.Collections.Generic;LinkedList<T>;AddLast;(System.Collections.Generic.LinkedListNode<T>);Argument[this].SyntheticField[System.Collections.Generic.LinkedList`1.head];Argument[0].SyntheticField[System.Collections.Generic.LinkedListNode`1.next];value;dfc-generated |
 | System.Collections.Generic;LinkedList<T>;AddLast;(T);Argument[0];Argument[this];taint;df-generated |
 | System.Collections.Generic;LinkedList<T>;AddLast;(T);Argument[0];ReturnValue;taint;df-generated |
 | System.Collections.Generic;LinkedList<T>;AddLast;(T);Argument[this];ReturnValue;taint;df-generated |
@@ -4296,18 +4799,21 @@
 | System.Collections.Generic;LinkedList<T>;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.Generic.LinkedList`1+Enumerator.Current];value;manual |
 | System.Collections.Generic;LinkedList<T>;LinkedList;(System.Collections.Generic.IEnumerable<T>);Argument[0].Element;Argument[this];taint;df-generated |
 | System.Collections.Generic;LinkedList<T>;LinkedList;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);Argument[0];Argument[this];taint;df-generated |
-| System.Collections.Generic;LinkedList<T>;Remove;(System.Collections.Generic.LinkedListNode<T>);Argument[0];Argument[this];taint;df-generated |
-| System.Collections.Generic;LinkedList<T>;get_First;();Argument[this];ReturnValue;taint;df-generated |
+| System.Collections.Generic;LinkedList<T>;Remove;(System.Collections.Generic.LinkedListNode<T>);Argument[0].SyntheticField[System.Collections.Generic.LinkedListNode`1.next];Argument[this].SyntheticField[System.Collections.Generic.LinkedList`1.head];value;dfc-generated |
+| System.Collections.Generic;LinkedList<T>;get_First;();Argument[this].SyntheticField[System.Collections.Generic.LinkedList`1.head];ReturnValue;value;dfc-generated |
 | System.Collections.Generic;LinkedList<T>;get_Last;();Argument[this];ReturnValue;taint;df-generated |
 | System.Collections.Generic;LinkedListNode<T>;LinkedListNode;(T);Argument[0];Argument[this];taint;df-generated |
 | System.Collections.Generic;LinkedListNode<T>;get_List;();Argument[this];ReturnValue;taint;df-generated |
 | System.Collections.Generic;LinkedListNode<T>;get_Next;();Argument[this];ReturnValue;taint;df-generated |
 | System.Collections.Generic;LinkedListNode<T>;get_Previous;();Argument[this];ReturnValue;taint;df-generated |
+| System.Collections.Generic;List<T>+Enumerator;get_Current;();Argument[this].Property[System.Collections.Generic.List`1+Enumerator.Current];ReturnValue;value;df-generated |
+| System.Collections.Generic;List<T>+Enumerator;get_Current;();Argument[this].Property[System.Collections.Generic.List`1+Enumerator.Current];ReturnValue;value;dfc-generated |
 | System.Collections.Generic;List<T>+Enumerator;get_Current;();Argument[this];ReturnValue;taint;df-generated |
+| System.Collections.Generic;List<T>+Enumerator;get_Current;();Argument[this];ReturnValue;taint;dfc-generated |
 | System.Collections.Generic;List<T>;AddRange;(System.Collections.Generic.IEnumerable<T>);Argument[0].Element;Argument[this].Element;value;manual |
 | System.Collections.Generic;List<T>;AsReadOnly;();Argument[this].Element;ReturnValue.Element;value;manual |
 | System.Collections.Generic;List<T>;ConvertAll<TOutput>;(System.Converter<T,TOutput>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
-| System.Collections.Generic;List<T>;CopyTo;(T[]);Argument[this];Argument[0].Element;taint;df-generated |
+| System.Collections.Generic;List<T>;CopyTo;(T[]);Argument[this].Element;Argument[0].Element;value;dfc-generated |
 | System.Collections.Generic;List<T>;Exists;(System.Predicate<T>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Collections.Generic;List<T>;Find;(System.Predicate<T>);Argument[0];Argument[0].Parameter[delegate-self];value;manual |
 | System.Collections.Generic;List<T>;Find;(System.Predicate<T>);Argument[this].Element;Argument[0].Parameter[0];value;manual |
@@ -4331,39 +4837,55 @@
 | System.Collections.Generic;List<T>;InsertRange;(System.Int32,System.Collections.Generic.IEnumerable<T>);Argument[1].Element;Argument[this].Element;value;manual |
 | System.Collections.Generic;List<T>;List;(System.Collections.Generic.IEnumerable<T>);Argument[0].Element;Argument[this];taint;df-generated |
 | System.Collections.Generic;List<T>;RemoveAll;(System.Predicate<T>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
-| System.Collections.Generic;List<T>;Slice;(System.Int32,System.Int32);Argument[this];ReturnValue;taint;df-generated |
+| System.Collections.Generic;List<T>;Slice;(System.Int32,System.Int32);Argument[this].Element;ReturnValue.Element;value;dfc-generated |
 | System.Collections.Generic;List<T>;Sort;(System.Comparison<T>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Collections.Generic;List<T>;TrueForAll;(System.Predicate<T>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Collections.Generic;PriorityQueue<TElement,TPriority>+UnorderedItemsCollection+Enumerator;get_Current;();Argument[this];ReturnValue;taint;df-generated |
 | System.Collections.Generic;PriorityQueue<TElement,TPriority>+UnorderedItemsCollection;GetEnumerator;();Argument[this];ReturnValue;taint;df-generated |
 | System.Collections.Generic;PriorityQueue<TElement,TPriority>;Dequeue;();Argument[this];ReturnValue;taint;df-generated |
 | System.Collections.Generic;PriorityQueue<TElement,TPriority>;DequeueEnqueue;(TElement,TPriority);Argument[this];ReturnValue;taint;df-generated |
-| System.Collections.Generic;PriorityQueue<TElement,TPriority>;EnqueueDequeue;(TElement,TPriority);Argument[0];ReturnValue;taint;df-generated |
-| System.Collections.Generic;PriorityQueue<TElement,TPriority>;EnqueueDequeue;(TElement,TPriority);Argument[this];ReturnValue;taint;df-generated |
+| System.Collections.Generic;PriorityQueue<TElement,TPriority>;EnqueueDequeue;(TElement,TPriority);Argument[0];ReturnValue;value;dfc-generated |
 | System.Collections.Generic;PriorityQueue<TElement,TPriority>;EnqueueRange;(System.Collections.Generic.IEnumerable<System.ValueTuple<TElement,TPriority>>);Argument[0].Element;Argument[this];taint;df-generated |
 | System.Collections.Generic;PriorityQueue<TElement,TPriority>;Peek;();Argument[this];ReturnValue;taint;df-generated |
-| System.Collections.Generic;PriorityQueue<TElement,TPriority>;PriorityQueue;(System.Collections.Generic.IComparer<TPriority>);Argument[0];Argument[this];taint;df-generated |
-| System.Collections.Generic;PriorityQueue<TElement,TPriority>;PriorityQueue;(System.Collections.Generic.IEnumerable<System.ValueTuple<TElement,TPriority>>,System.Collections.Generic.IComparer<TPriority>);Argument[0].Element;Argument[this];taint;df-generated |
-| System.Collections.Generic;PriorityQueue<TElement,TPriority>;PriorityQueue;(System.Collections.Generic.IEnumerable<System.ValueTuple<TElement,TPriority>>,System.Collections.Generic.IComparer<TPriority>);Argument[1];Argument[this];taint;df-generated |
-| System.Collections.Generic;PriorityQueue<TElement,TPriority>;PriorityQueue;(System.Int32,System.Collections.Generic.IComparer<TPriority>);Argument[1];Argument[this];taint;df-generated |
+| System.Collections.Generic;PriorityQueue<TElement,TPriority>;PriorityQueue;(System.Collections.Generic.IComparer<TPriority>);Argument[0];Argument[this].SyntheticField[System.Collections.Generic.PriorityQueue`2._comparer];value;dfc-generated |
+| System.Collections.Generic;PriorityQueue<TElement,TPriority>;PriorityQueue;(System.Collections.Generic.IEnumerable<System.ValueTuple<TElement,TPriority>>,System.Collections.Generic.IComparer<TPriority>);Argument[1];Argument[this].SyntheticField[System.Collections.Generic.PriorityQueue`2._comparer];value;dfc-generated |
+| System.Collections.Generic;PriorityQueue<TElement,TPriority>;PriorityQueue;(System.Int32,System.Collections.Generic.IComparer<TPriority>);Argument[1];Argument[this].SyntheticField[System.Collections.Generic.PriorityQueue`2._comparer];value;dfc-generated |
 | System.Collections.Generic;PriorityQueue<TElement,TPriority>;TryDequeue;(TElement,TPriority);Argument[this];ReturnValue;taint;df-generated |
 | System.Collections.Generic;PriorityQueue<TElement,TPriority>;TryPeek;(TElement,TPriority);Argument[this];ReturnValue;taint;df-generated |
-| System.Collections.Generic;PriorityQueue<TElement,TPriority>;get_Comparer;();Argument[this];ReturnValue;taint;df-generated |
+| System.Collections.Generic;PriorityQueue<TElement,TPriority>;get_Comparer;();Argument[this].SyntheticField[System.Collections.Generic.PriorityQueue`2._comparer];ReturnValue;value;dfc-generated |
+| System.Collections.Generic;Queue<T>+Enumerator;get_Current;();Argument[this].Property[System.Collections.Generic.Queue`1+Enumerator.Current];ReturnValue;value;df-generated |
+| System.Collections.Generic;Queue<T>+Enumerator;get_Current;();Argument[this].Property[System.Collections.Generic.Queue`1+Enumerator.Current];ReturnValue;value;dfc-generated |
 | System.Collections.Generic;Queue<T>+Enumerator;get_Current;();Argument[this];ReturnValue;taint;df-generated |
+| System.Collections.Generic;Queue<T>+Enumerator;get_Current;();Argument[this];ReturnValue;taint;dfc-generated |
 | System.Collections.Generic;Queue<T>;Clear;();Argument[this].WithoutElement;Argument[this];value;manual |
 | System.Collections.Generic;Queue<T>;CopyTo;(T[],System.Int32);Argument[this].Element;Argument[0].Element;value;manual |
-| System.Collections.Generic;Queue<T>;Dequeue;();Argument[this];ReturnValue;taint;df-generated |
-| System.Collections.Generic;Queue<T>;Enqueue;(T);Argument[0];Argument[this];taint;df-generated |
+| System.Collections.Generic;Queue<T>;Dequeue;();Argument[this].SyntheticField[System.Collections.Generic.Queue`1._array].Element;ReturnValue;value;dfc-generated |
+| System.Collections.Generic;Queue<T>;Enqueue;(T);Argument[0];Argument[this].SyntheticField[System.Collections.Generic.Queue`1._array].Element;value;dfc-generated |
 | System.Collections.Generic;Queue<T>;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.Generic.Queue`1+Enumerator.Current];value;manual |
 | System.Collections.Generic;Queue<T>;Peek;();Argument[this].Element;ReturnValue;value;manual |
-| System.Collections.Generic;Queue<T>;Queue;(System.Collections.Generic.IEnumerable<T>);Argument[0].Element;Argument[this];taint;df-generated |
-| System.Collections.Generic;Queue<T>;TryDequeue;(T);Argument[this];ReturnValue;taint;df-generated |
-| System.Collections.Generic;Queue<T>;TryPeek;(T);Argument[this];ReturnValue;taint;df-generated |
+| System.Collections.Generic;Queue<T>;Queue;(System.Collections.Generic.IEnumerable<T>);Argument[0].Element;Argument[this].SyntheticField[System.Collections.Generic.Queue`1._array].Element;value;dfc-generated |
+| System.Collections.Generic;Queue<T>;TryDequeue;(T);Argument[this].SyntheticField[System.Collections.Generic.Queue`1._array].Element;ReturnValue;value;dfc-generated |
+| System.Collections.Generic;Queue<T>;TryPeek;(T);Argument[this].SyntheticField[System.Collections.Generic.Queue`1._array].Element;ReturnValue;value;dfc-generated |
+| System.Collections.Generic;SortedDictionary<TKey,TValue>+Enumerator;get_Current;();Argument[this].Property[System.Collections.Generic.SortedDictionary`2+Enumerator.Current].Property[System.Collections.Generic.KeyValuePair`2.Key];ReturnValue.Property[System.Collections.Generic.KeyValuePair`2.Key];value;df-generated |
+| System.Collections.Generic;SortedDictionary<TKey,TValue>+Enumerator;get_Current;();Argument[this].Property[System.Collections.Generic.SortedDictionary`2+Enumerator.Current].Property[System.Collections.Generic.KeyValuePair`2.Key];ReturnValue.Property[System.Collections.Generic.KeyValuePair`2.Key];value;dfc-generated |
+| System.Collections.Generic;SortedDictionary<TKey,TValue>+Enumerator;get_Current;();Argument[this].Property[System.Collections.Generic.SortedDictionary`2+Enumerator.Current].Property[System.Collections.Generic.KeyValuePair`2.Value];ReturnValue.Property[System.Collections.Generic.KeyValuePair`2.Value];value;df-generated |
+| System.Collections.Generic;SortedDictionary<TKey,TValue>+Enumerator;get_Current;();Argument[this].Property[System.Collections.Generic.SortedDictionary`2+Enumerator.Current].Property[System.Collections.Generic.KeyValuePair`2.Value];ReturnValue.Property[System.Collections.Generic.KeyValuePair`2.Value];value;dfc-generated |
 | System.Collections.Generic;SortedDictionary<TKey,TValue>+Enumerator;get_Current;();Argument[this];ReturnValue;taint;df-generated |
+| System.Collections.Generic;SortedDictionary<TKey,TValue>+Enumerator;get_Current;();Argument[this];ReturnValue;taint;dfc-generated |
+| System.Collections.Generic;SortedDictionary<TKey,TValue>+Enumerator;get_Key;();Argument[this].Property[System.Collections.Generic.SortedDictionary`2+Enumerator.Current].Property[System.Collections.Generic.KeyValuePair`2.Key];ReturnValue;value;df-generated |
+| System.Collections.Generic;SortedDictionary<TKey,TValue>+Enumerator;get_Key;();Argument[this].Property[System.Collections.Generic.SortedDictionary`2+Enumerator.Current].Property[System.Collections.Generic.KeyValuePair`2.Key];ReturnValue;value;dfc-generated |
+| System.Collections.Generic;SortedDictionary<TKey,TValue>+Enumerator;get_Value;();Argument[this].Property[System.Collections.Generic.SortedDictionary`2+Enumerator.Current].Property[System.Collections.Generic.KeyValuePair`2.Value];ReturnValue;value;df-generated |
+| System.Collections.Generic;SortedDictionary<TKey,TValue>+Enumerator;get_Value;();Argument[this].Property[System.Collections.Generic.SortedDictionary`2+Enumerator.Current].Property[System.Collections.Generic.KeyValuePair`2.Value];ReturnValue;value;dfc-generated |
+| System.Collections.Generic;SortedDictionary<TKey,TValue>+KeyCollection+Enumerator;get_Current;();Argument[this].Property[System.Collections.Generic.SortedDictionary`2+KeyCollection+Enumerator.Current];ReturnValue;value;df-generated |
+| System.Collections.Generic;SortedDictionary<TKey,TValue>+KeyCollection+Enumerator;get_Current;();Argument[this].Property[System.Collections.Generic.SortedDictionary`2+KeyCollection+Enumerator.Current];ReturnValue;value;dfc-generated |
 | System.Collections.Generic;SortedDictionary<TKey,TValue>+KeyCollection;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.Generic.SortedDictionary`2+KeyCollection+Enumerator.Current];value;manual |
-| System.Collections.Generic;SortedDictionary<TKey,TValue>+KeyCollection;KeyCollection;(System.Collections.Generic.SortedDictionary<TKey,TValue>);Argument[0].Element;Argument[this];taint;df-generated |
+| System.Collections.Generic;SortedDictionary<TKey,TValue>+KeyCollection;KeyCollection;(System.Collections.Generic.SortedDictionary<TKey,TValue>);Argument[0];Argument[this].SyntheticField[System.Collections.Generic.SortedDictionary`2+KeyCollection._dictionary];value;dfc-generated |
+| System.Collections.Generic;SortedDictionary<TKey,TValue>+KeyCollection;get_SyncRoot;();Argument[this].SyntheticField[System.Collections.Generic.SortedDictionary`2+KeyCollection._dictionary].Property[System.Collections.ICollection.SyncRoot];ReturnValue;value;dfc-generated |
+| System.Collections.Generic;SortedDictionary<TKey,TValue>+ValueCollection+Enumerator;get_Current;();Argument[this].Property[System.Collections.Generic.SortedDictionary`2+ValueCollection+Enumerator.Current];ReturnValue;value;df-generated |
+| System.Collections.Generic;SortedDictionary<TKey,TValue>+ValueCollection+Enumerator;get_Current;();Argument[this].Property[System.Collections.Generic.SortedDictionary`2+ValueCollection+Enumerator.Current];ReturnValue;value;dfc-generated |
 | System.Collections.Generic;SortedDictionary<TKey,TValue>+ValueCollection;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.Generic.SortedDictionary`2+ValueCollection+Enumerator.Current];value;manual |
-| System.Collections.Generic;SortedDictionary<TKey,TValue>+ValueCollection;ValueCollection;(System.Collections.Generic.SortedDictionary<TKey,TValue>);Argument[0].Element;Argument[this];taint;df-generated |
+| System.Collections.Generic;SortedDictionary<TKey,TValue>+ValueCollection;ValueCollection;(System.Collections.Generic.SortedDictionary<TKey,TValue>);Argument[0];Argument[this].SyntheticField[System.Collections.Generic.SortedDictionary`2+ValueCollection._dictionary];value;dfc-generated |
+| System.Collections.Generic;SortedDictionary<TKey,TValue>+ValueCollection;get_SyncRoot;();Argument[this].SyntheticField[System.Collections.Generic.SortedDictionary`2+ValueCollection._dictionary].Property[System.Collections.ICollection.SyncRoot];ReturnValue;value;dfc-generated |
 | System.Collections.Generic;SortedDictionary<TKey,TValue>;Add;(System.Collections.Generic.KeyValuePair<TKey,TValue>);Argument[0].Property[System.Collections.Generic.KeyValuePair`2.Key];Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Key];value;manual |
 | System.Collections.Generic;SortedDictionary<TKey,TValue>;Add;(System.Collections.Generic.KeyValuePair<TKey,TValue>);Argument[0].Property[System.Collections.Generic.KeyValuePair`2.Value];Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Value];value;manual |
 | System.Collections.Generic;SortedDictionary<TKey,TValue>;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.Generic.SortedDictionary`2+Enumerator.Current];value;manual |
@@ -4377,48 +4899,54 @@
 | System.Collections.Generic;SortedList<TKey,TValue>;Add;(System.Collections.Generic.KeyValuePair<TKey,TValue>);Argument[0].Property[System.Collections.Generic.KeyValuePair`2.Value];Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Value];value;manual |
 | System.Collections.Generic;SortedList<TKey,TValue>;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.Generic.IEnumerator`1.Current];value;manual |
 | System.Collections.Generic;SortedList<TKey,TValue>;GetKeyAtIndex;(System.Int32);Argument[this];ReturnValue;taint;df-generated |
-| System.Collections.Generic;SortedList<TKey,TValue>;GetValueAtIndex;(System.Int32);Argument[this];ReturnValue;taint;df-generated |
-| System.Collections.Generic;SortedList<TKey,TValue>;SetValueAtIndex;(System.Int32,TValue);Argument[1];Argument[this];taint;df-generated |
-| System.Collections.Generic;SortedList<TKey,TValue>;SortedList;(System.Collections.Generic.IComparer<TKey>);Argument[0];Argument[this];taint;df-generated |
+| System.Collections.Generic;SortedList<TKey,TValue>;GetValueAtIndex;(System.Int32);Argument[this].SyntheticField[System.Collections.Generic.SortedList`2.values].Element;ReturnValue;value;dfc-generated |
+| System.Collections.Generic;SortedList<TKey,TValue>;SetValueAtIndex;(System.Int32,TValue);Argument[1];Argument[this].SyntheticField[System.Collections.Generic.SortedList`2.values].Element;value;dfc-generated |
+| System.Collections.Generic;SortedList<TKey,TValue>;SortedList;(System.Collections.Generic.IComparer<TKey>);Argument[0];Argument[this].SyntheticField[System.Collections.Generic.SortedList`2.comparer];value;dfc-generated |
 | System.Collections.Generic;SortedList<TKey,TValue>;SortedList;(System.Collections.Generic.IDictionary<TKey,TValue>);Argument[0].Element.Property[System.Collections.Generic.KeyValuePair`2.Key];Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Key];value;manual |
 | System.Collections.Generic;SortedList<TKey,TValue>;SortedList;(System.Collections.Generic.IDictionary<TKey,TValue>);Argument[0].Element.Property[System.Collections.Generic.KeyValuePair`2.Value];Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Value];value;manual |
 | System.Collections.Generic;SortedList<TKey,TValue>;SortedList;(System.Collections.Generic.IDictionary<TKey,TValue>,System.Collections.Generic.IComparer<TKey>);Argument[0].Element.Property[System.Collections.Generic.KeyValuePair`2.Key];Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Key];value;manual |
 | System.Collections.Generic;SortedList<TKey,TValue>;SortedList;(System.Collections.Generic.IDictionary<TKey,TValue>,System.Collections.Generic.IComparer<TKey>);Argument[0].Element.Property[System.Collections.Generic.KeyValuePair`2.Value];Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Value];value;manual |
-| System.Collections.Generic;SortedList<TKey,TValue>;TryGetValue;(TKey,TValue);Argument[this];ReturnValue;taint;df-generated |
-| System.Collections.Generic;SortedList<TKey,TValue>;get_Comparer;();Argument[this];ReturnValue;taint;df-generated |
+| System.Collections.Generic;SortedList<TKey,TValue>;TryGetValue;(TKey,TValue);Argument[this].SyntheticField[System.Collections.Generic.SortedList`2.values].Element;ReturnValue;value;dfc-generated |
+| System.Collections.Generic;SortedList<TKey,TValue>;get_Comparer;();Argument[this].SyntheticField[System.Collections.Generic.SortedList`2.comparer];ReturnValue;value;dfc-generated |
 | System.Collections.Generic;SortedList<TKey,TValue>;get_Keys;();Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Key];ReturnValue.Element;value;manual |
 | System.Collections.Generic;SortedList<TKey,TValue>;get_Values;();Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Value];ReturnValue.Element;value;manual |
 | System.Collections.Generic;SortedSet<T>+Enumerator;get_Current;();Argument[this];ReturnValue;taint;df-generated |
-| System.Collections.Generic;SortedSet<T>;CopyTo;(T[]);Argument[this];Argument[0].Element;taint;df-generated |
-| System.Collections.Generic;SortedSet<T>;CopyTo;(T[],System.Int32,System.Int32);Argument[this];Argument[0].Element;taint;df-generated |
+| System.Collections.Generic;SortedSet<T>;CopyTo;(T[]);Argument[this].SyntheticField[System.Collections.Generic.SortedSet`1.root].SyntheticField[System.Collections.Generic.SortedSet`1+Node.Item];Argument[0].Element;value;dfc-generated |
+| System.Collections.Generic;SortedSet<T>;CopyTo;(T[],System.Int32,System.Int32);Argument[this].SyntheticField[System.Collections.Generic.SortedSet`1.root].SyntheticField[System.Collections.Generic.SortedSet`1+Node.Item];Argument[0].Element;value;dfc-generated |
 | System.Collections.Generic;SortedSet<T>;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.Generic.SortedSet`1+Enumerator.Current];value;manual |
-| System.Collections.Generic;SortedSet<T>;GetObjectData;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);Argument[this];Argument[0];taint;df-generated |
 | System.Collections.Generic;SortedSet<T>;GetViewBetween;(T,T);Argument[0];ReturnValue;taint;df-generated |
 | System.Collections.Generic;SortedSet<T>;GetViewBetween;(T,T);Argument[1];ReturnValue;taint;df-generated |
 | System.Collections.Generic;SortedSet<T>;GetViewBetween;(T,T);Argument[this];ReturnValue;taint;df-generated |
-| System.Collections.Generic;SortedSet<T>;IntersectWith;(System.Collections.Generic.IEnumerable<T>);Argument[0].Element;Argument[this];taint;df-generated |
+| System.Collections.Generic;SortedSet<T>;IntersectWith;(System.Collections.Generic.IEnumerable<T>);Argument[0].Element;Argument[this].Element;value;dfc-generated |
+| System.Collections.Generic;SortedSet<T>;IntersectWith;(System.Collections.Generic.IEnumerable<T>);Argument[0].Element;Argument[this].SyntheticField[System.Collections.Generic.SortedSet`1.root].SyntheticField[System.Collections.Generic.SortedSet`1+Node.Item];value;dfc-generated |
 | System.Collections.Generic;SortedSet<T>;RemoveWhere;(System.Predicate<T>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Collections.Generic;SortedSet<T>;Reverse;();Argument[this].Element;ReturnValue.Element;value;manual |
-| System.Collections.Generic;SortedSet<T>;SortedSet;(System.Collections.Generic.IComparer<T>);Argument[0];Argument[this];taint;df-generated |
-| System.Collections.Generic;SortedSet<T>;SortedSet;(System.Collections.Generic.IEnumerable<T>,System.Collections.Generic.IComparer<T>);Argument[0].Element;Argument[this];taint;df-generated |
+| System.Collections.Generic;SortedSet<T>;SortedSet;(System.Collections.Generic.IComparer<T>);Argument[0];Argument[this].SyntheticField[System.Collections.Generic.SortedSet`1.comparer];value;dfc-generated |
+| System.Collections.Generic;SortedSet<T>;SortedSet;(System.Collections.Generic.IEnumerable<T>,System.Collections.Generic.IComparer<T>);Argument[0].Element;Argument[this].SyntheticField[System.Collections.Generic.SortedSet`1.root].SyntheticField[System.Collections.Generic.SortedSet`1+Node.Item];value;dfc-generated |
 | System.Collections.Generic;SortedSet<T>;SortedSet;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);Argument[0];Argument[this];taint;df-generated |
-| System.Collections.Generic;SortedSet<T>;SymmetricExceptWith;(System.Collections.Generic.IEnumerable<T>);Argument[0].Element;Argument[this];taint;df-generated |
-| System.Collections.Generic;SortedSet<T>;TryGetValue;(T,T);Argument[this];ReturnValue;taint;df-generated |
-| System.Collections.Generic;SortedSet<T>;UnionWith;(System.Collections.Generic.IEnumerable<T>);Argument[0].Element;Argument[this];taint;df-generated |
-| System.Collections.Generic;SortedSet<T>;get_Comparer;();Argument[this];ReturnValue;taint;df-generated |
-| System.Collections.Generic;SortedSet<T>;get_Max;();Argument[this];ReturnValue;taint;df-generated |
-| System.Collections.Generic;SortedSet<T>;get_Min;();Argument[this];ReturnValue;taint;df-generated |
+| System.Collections.Generic;SortedSet<T>;SymmetricExceptWith;(System.Collections.Generic.IEnumerable<T>);Argument[0].Element;Argument[this].Element;value;dfc-generated |
+| System.Collections.Generic;SortedSet<T>;SymmetricExceptWith;(System.Collections.Generic.IEnumerable<T>);Argument[0].Element;Argument[this].SyntheticField[System.Collections.Generic.SortedSet`1.root].SyntheticField[System.Collections.Generic.SortedSet`1+Node.Item];value;dfc-generated |
+| System.Collections.Generic;SortedSet<T>;TryGetValue;(T,T);Argument[this].SyntheticField[System.Collections.Generic.SortedSet`1.root].SyntheticField[System.Collections.Generic.SortedSet`1+Node.Item];ReturnValue;value;dfc-generated |
+| System.Collections.Generic;SortedSet<T>;UnionWith;(System.Collections.Generic.IEnumerable<T>);Argument[0].Element;Argument[this].Element;value;dfc-generated |
+| System.Collections.Generic;SortedSet<T>;UnionWith;(System.Collections.Generic.IEnumerable<T>);Argument[0].Element;Argument[this].SyntheticField[System.Collections.Generic.SortedSet`1.root].SyntheticField[System.Collections.Generic.SortedSet`1+Node.Item];value;dfc-generated |
+| System.Collections.Generic;SortedSet<T>;UnionWith;(System.Collections.Generic.IEnumerable<T>);Argument[this].Element;Argument[this].SyntheticField[System.Collections.Generic.SortedSet`1.root].SyntheticField[System.Collections.Generic.SortedSet`1+Node.Item];value;dfc-generated |
+| System.Collections.Generic;SortedSet<T>;get_Comparer;();Argument[this].SyntheticField[System.Collections.Generic.SortedSet`1.comparer];ReturnValue;value;dfc-generated |
+| System.Collections.Generic;SortedSet<T>;get_Max;();Argument[this].SyntheticField[System.Collections.Generic.SortedSet`1.root].SyntheticField[System.Collections.Generic.SortedSet`1+Node.Item];ReturnValue;value;dfc-generated |
+| System.Collections.Generic;SortedSet<T>;get_Min;();Argument[this].SyntheticField[System.Collections.Generic.SortedSet`1.root].SyntheticField[System.Collections.Generic.SortedSet`1+Node.Item];ReturnValue;value;dfc-generated |
+| System.Collections.Generic;Stack<T>+Enumerator;get_Current;();Argument[this].Property[System.Collections.Generic.Stack`1+Enumerator.Current];ReturnValue;value;df-generated |
+| System.Collections.Generic;Stack<T>+Enumerator;get_Current;();Argument[this].Property[System.Collections.Generic.Stack`1+Enumerator.Current];ReturnValue;value;dfc-generated |
 | System.Collections.Generic;Stack<T>+Enumerator;get_Current;();Argument[this];ReturnValue;taint;df-generated |
+| System.Collections.Generic;Stack<T>+Enumerator;get_Current;();Argument[this];ReturnValue;taint;dfc-generated |
 | System.Collections.Generic;Stack<T>;Clear;();Argument[this].WithoutElement;Argument[this];value;manual |
 | System.Collections.Generic;Stack<T>;CopyTo;(T[],System.Int32);Argument[this].Element;Argument[0].Element;value;manual |
 | System.Collections.Generic;Stack<T>;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.Generic.Stack`1+Enumerator.Current];value;manual |
 | System.Collections.Generic;Stack<T>;Peek;();Argument[this].Element;ReturnValue;value;manual |
 | System.Collections.Generic;Stack<T>;Pop;();Argument[this].Element;ReturnValue;value;manual |
-| System.Collections.Generic;Stack<T>;Push;(T);Argument[0];Argument[this];taint;df-generated |
-| System.Collections.Generic;Stack<T>;Stack;(System.Collections.Generic.IEnumerable<T>);Argument[0].Element;Argument[this];taint;df-generated |
-| System.Collections.Generic;Stack<T>;ToArray;();Argument[this];ReturnValue;taint;df-generated |
-| System.Collections.Generic;Stack<T>;TryPeek;(T);Argument[this];ReturnValue;taint;df-generated |
-| System.Collections.Generic;Stack<T>;TryPop;(T);Argument[this];ReturnValue;taint;df-generated |
+| System.Collections.Generic;Stack<T>;Push;(T);Argument[0];Argument[this].SyntheticField[System.Collections.Generic.Stack`1._array].Element;value;dfc-generated |
+| System.Collections.Generic;Stack<T>;Stack;(System.Collections.Generic.IEnumerable<T>);Argument[0].Element;Argument[this].SyntheticField[System.Collections.Generic.Stack`1._array].Element;value;dfc-generated |
+| System.Collections.Generic;Stack<T>;ToArray;();Argument[this].SyntheticField[System.Collections.Generic.Stack`1._array].Element;ReturnValue.Element;value;dfc-generated |
+| System.Collections.Generic;Stack<T>;TryPeek;(T);Argument[this].SyntheticField[System.Collections.Generic.Stack`1._array].Element;ReturnValue;value;dfc-generated |
+| System.Collections.Generic;Stack<T>;TryPop;(T);Argument[this].SyntheticField[System.Collections.Generic.Stack`1._array].Element;ReturnValue;value;dfc-generated |
 | System.Collections.Immutable;IImmutableDictionary<TKey,TValue>;AddRange;(System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<TKey,TValue>>);Argument[0].Element;Argument[this].Element;value;manual |
 | System.Collections.Immutable;IImmutableDictionary<TKey,TValue>;Clear;();Argument[this].WithoutElement;ReturnValue;value;manual |
 | System.Collections.Immutable;IImmutableList<T>;Add;(T);Argument[0];Argument[this].Element;value;manual |
@@ -4429,7 +4957,7 @@
 | System.Collections.Immutable;IImmutableSet<T>;Add;(T);Argument[0];Argument[this].Element;value;manual |
 | System.Collections.Immutable;IImmutableSet<T>;Clear;();Argument[this].WithoutElement;ReturnValue;value;manual |
 | System.Collections.Immutable;IImmutableStack<T>;Clear;();Argument[this].WithoutElement;ReturnValue;value;manual |
-| System.Collections.Immutable;ImmutableArray;Create<T>;(System.Collections.Immutable.ImmutableArray<T>,System.Int32,System.Int32);Argument[0].Element;ReturnValue;taint;df-generated |
+| System.Collections.Immutable;ImmutableArray;Create<T>;(System.Collections.Immutable.ImmutableArray<T>,System.Int32,System.Int32);Argument[0];ReturnValue;value;dfc-generated |
 | System.Collections.Immutable;ImmutableArray;Create<T>;(System.ReadOnlySpan<T>);Argument[0];ReturnValue;taint;df-generated |
 | System.Collections.Immutable;ImmutableArray;Create<T>;(System.Span<T>);Argument[0];ReturnValue;taint;df-generated |
 | System.Collections.Immutable;ImmutableArray;Create<T>;(T);Argument[0];ReturnValue;taint;df-generated |
@@ -4444,13 +4972,19 @@
 | System.Collections.Immutable;ImmutableArray;Create<T>;(T,T,T,T);Argument[3];ReturnValue;taint;df-generated |
 | System.Collections.Immutable;ImmutableArray;Create<T>;(T[],System.Int32,System.Int32);Argument[0].Element;ReturnValue;taint;df-generated |
 | System.Collections.Immutable;ImmutableArray;CreateRange<T>;(System.Collections.Generic.IEnumerable<T>);Argument[0].Element;ReturnValue;taint;df-generated |
+| System.Collections.Immutable;ImmutableArray;CreateRange<TSource,TArg,TResult>;(System.Collections.Immutable.ImmutableArray<TSource>,System.Func<TSource,TArg,TResult>,TArg);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | System.Collections.Immutable;ImmutableArray;CreateRange<TSource,TArg,TResult>;(System.Collections.Immutable.ImmutableArray<TSource>,System.Func<TSource,TArg,TResult>,TArg);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
+| System.Collections.Immutable;ImmutableArray;CreateRange<TSource,TArg,TResult>;(System.Collections.Immutable.ImmutableArray<TSource>,System.Func<TSource,TArg,TResult>,TArg);Argument[2];Argument[1].Parameter[1];value;dfc-generated |
+| System.Collections.Immutable;ImmutableArray;CreateRange<TSource,TArg,TResult>;(System.Collections.Immutable.ImmutableArray<TSource>,System.Func<TSource,TArg,TResult>,TArg);Argument[2];Argument[1].Parameter[1];value;hq-generated |
+| System.Collections.Immutable;ImmutableArray;CreateRange<TSource,TArg,TResult>;(System.Collections.Immutable.ImmutableArray<TSource>,System.Int32,System.Int32,System.Func<TSource,TArg,TResult>,TArg);Argument[3];Argument[3].Parameter[delegate-self];value;dfc-generated |
 | System.Collections.Immutable;ImmutableArray;CreateRange<TSource,TArg,TResult>;(System.Collections.Immutable.ImmutableArray<TSource>,System.Int32,System.Int32,System.Func<TSource,TArg,TResult>,TArg);Argument[3];Argument[3].Parameter[delegate-self];value;hq-generated |
+| System.Collections.Immutable;ImmutableArray;CreateRange<TSource,TArg,TResult>;(System.Collections.Immutable.ImmutableArray<TSource>,System.Int32,System.Int32,System.Func<TSource,TArg,TResult>,TArg);Argument[4];Argument[3].Parameter[1];value;dfc-generated |
+| System.Collections.Immutable;ImmutableArray;CreateRange<TSource,TArg,TResult>;(System.Collections.Immutable.ImmutableArray<TSource>,System.Int32,System.Int32,System.Func<TSource,TArg,TResult>,TArg);Argument[4];Argument[3].Parameter[1];value;hq-generated |
 | System.Collections.Immutable;ImmutableArray;CreateRange<TSource,TResult>;(System.Collections.Immutable.ImmutableArray<TSource>,System.Func<TSource,TResult>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
 | System.Collections.Immutable;ImmutableArray;CreateRange<TSource,TResult>;(System.Collections.Immutable.ImmutableArray<TSource>,System.Int32,System.Int32,System.Func<TSource,TResult>);Argument[3];Argument[3].Parameter[delegate-self];value;hq-generated |
 | System.Collections.Immutable;ImmutableArray;ToImmutableArray<T>;(System.ReadOnlySpan<T>);Argument[0].Element;ReturnValue.Element;value;manual |
 | System.Collections.Immutable;ImmutableArray;ToImmutableArray<T>;(System.Span<T>);Argument[0].Element;ReturnValue.Element;value;manual |
-| System.Collections.Immutable;ImmutableArray;ToImmutableArray<TSource>;(System.Collections.Generic.IEnumerable<TSource>);Argument[0].Element;ReturnValue;taint;df-generated |
+| System.Collections.Immutable;ImmutableArray;ToImmutableArray<TSource>;(System.Collections.Generic.IEnumerable<TSource>);Argument[0];ReturnValue;value;dfc-generated |
 | System.Collections.Immutable;ImmutableArray<T>+Builder;AddRange;(System.Collections.Generic.IEnumerable<T>);Argument[0].Element;Argument[this].Element;value;manual |
 | System.Collections.Immutable;ImmutableArray<T>+Builder;AddRange;(System.Collections.Immutable.ImmutableArray<T>);Argument[0].Element;Argument[this].Element;value;manual |
 | System.Collections.Immutable;ImmutableArray<T>+Builder;AddRange;(System.Collections.Immutable.ImmutableArray<T>+Builder);Argument[0].Element;Argument[this].Element;value;manual |
@@ -4458,92 +4992,129 @@
 | System.Collections.Immutable;ImmutableArray<T>+Builder;AddRange<TDerived>;(System.Collections.Immutable.ImmutableArray<TDerived>);Argument[0].Element;Argument[this].Element;value;manual |
 | System.Collections.Immutable;ImmutableArray<T>+Builder;AddRange<TDerived>;(System.Collections.Immutable.ImmutableArray<TDerived>+Builder);Argument[0].Element;Argument[this].Element;value;manual |
 | System.Collections.Immutable;ImmutableArray<T>+Builder;AddRange<TDerived>;(TDerived[]);Argument[0].Element;Argument[this].Element;value;manual |
-| System.Collections.Immutable;ImmutableArray<T>+Builder;CopyTo;(System.Span<T>);Argument[this];Argument[0];taint;df-generated |
-| System.Collections.Immutable;ImmutableArray<T>+Builder;DrainToImmutable;();Argument[this];ReturnValue;taint;df-generated |
+| System.Collections.Immutable;ImmutableArray<T>+Builder;CopyTo;(System.Span<T>);Argument[this].SyntheticField[System.Collections.Immutable.ImmutableArray`1+Builder._elements].Element;Argument[0].Element;value;dfc-generated |
+| System.Collections.Immutable;ImmutableArray<T>+Builder;DrainToImmutable;();Argument[this].SyntheticField[System.Collections.Immutable.ImmutableArray`1+Builder._elements];ReturnValue.SyntheticField[System.Collections.Immutable.ImmutableArray`1.array];value;dfc-generated |
 | System.Collections.Immutable;ImmutableArray<T>+Builder;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.Generic.IEnumerator`1.Current];value;manual |
-| System.Collections.Immutable;ImmutableArray<T>+Builder;InsertRange;(System.Int32,System.Collections.Generic.IEnumerable<T>);Argument[1].Element;Argument[this];taint;df-generated |
-| System.Collections.Immutable;ImmutableArray<T>+Builder;MoveToImmutable;();Argument[this];ReturnValue;taint;df-generated |
+| System.Collections.Immutable;ImmutableArray<T>+Builder;IndexOf;(T,System.Int32,System.Collections.Generic.IEqualityComparer<T>);Argument[0];Argument[2];taint;df-generated |
+| System.Collections.Immutable;ImmutableArray<T>+Builder;IndexOf;(T,System.Int32,System.Collections.Generic.IEqualityComparer<T>);Argument[this];Argument[2];taint;df-generated |
+| System.Collections.Immutable;ImmutableArray<T>+Builder;IndexOf;(T,System.Int32,System.Int32,System.Collections.Generic.IEqualityComparer<T>);Argument[0];Argument[3];taint;df-generated |
+| System.Collections.Immutable;ImmutableArray<T>+Builder;IndexOf;(T,System.Int32,System.Int32,System.Collections.Generic.IEqualityComparer<T>);Argument[this];Argument[3];taint;df-generated |
+| System.Collections.Immutable;ImmutableArray<T>+Builder;InsertRange;(System.Int32,System.Collections.Generic.IEnumerable<T>);Argument[1].Element;Argument[this].SyntheticField[System.Collections.Immutable.ImmutableArray`1+Builder._elements].Element;value;dfc-generated |
+| System.Collections.Immutable;ImmutableArray<T>+Builder;LastIndexOf;(T,System.Int32,System.Int32,System.Collections.Generic.IEqualityComparer<T>);Argument[0];Argument[3];taint;df-generated |
+| System.Collections.Immutable;ImmutableArray<T>+Builder;LastIndexOf;(T,System.Int32,System.Int32,System.Collections.Generic.IEqualityComparer<T>);Argument[this];Argument[3];taint;df-generated |
+| System.Collections.Immutable;ImmutableArray<T>+Builder;MoveToImmutable;();Argument[this].SyntheticField[System.Collections.Immutable.ImmutableArray`1+Builder._elements];ReturnValue.SyntheticField[System.Collections.Immutable.ImmutableArray`1.array];value;dfc-generated |
+| System.Collections.Immutable;ImmutableArray<T>+Builder;Remove;(T,System.Collections.Generic.IEqualityComparer<T>);Argument[0];Argument[1];taint;df-generated |
+| System.Collections.Immutable;ImmutableArray<T>+Builder;Remove;(T,System.Collections.Generic.IEqualityComparer<T>);Argument[this];Argument[1];taint;df-generated |
+| System.Collections.Immutable;ImmutableArray<T>+Builder;RemoveAll;(System.Predicate<T>);Argument[0];Argument[0].Parameter[delegate-self];value;dfc-generated |
 | System.Collections.Immutable;ImmutableArray<T>+Builder;RemoveAll;(System.Predicate<T>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
-| System.Collections.Immutable;ImmutableArray<T>+Builder;Replace;(T,T);Argument[1];Argument[this];taint;df-generated |
-| System.Collections.Immutable;ImmutableArray<T>+Builder;Replace;(T,T,System.Collections.Generic.IEqualityComparer<T>);Argument[1];Argument[this];taint;df-generated |
+| System.Collections.Immutable;ImmutableArray<T>+Builder;RemoveAll;(System.Predicate<T>);Argument[this].SyntheticField[System.Collections.Immutable.ImmutableArray`1+Builder._elements].Element;Argument[0].Parameter[0];value;dfc-generated |
+| System.Collections.Immutable;ImmutableArray<T>+Builder;RemoveAll;(System.Predicate<T>);Argument[this].SyntheticField[System.Collections.Immutable.ImmutableArray`1+Builder._elements].Element;Argument[0].Parameter[0];value;hq-generated |
+| System.Collections.Immutable;ImmutableArray<T>+Builder;RemoveRange;(System.Collections.Generic.IEnumerable<T>,System.Collections.Generic.IEqualityComparer<T>);Argument[0].Element;Argument[1];taint;df-generated |
+| System.Collections.Immutable;ImmutableArray<T>+Builder;RemoveRange;(System.Collections.Generic.IEnumerable<T>,System.Collections.Generic.IEqualityComparer<T>);Argument[this];Argument[1];taint;df-generated |
+| System.Collections.Immutable;ImmutableArray<T>+Builder;Replace;(T,T);Argument[1];Argument[this].SyntheticField[System.Collections.Immutable.ImmutableArray`1+Builder._elements].Element;value;dfc-generated |
+| System.Collections.Immutable;ImmutableArray<T>+Builder;Replace;(T,T,System.Collections.Generic.IEqualityComparer<T>);Argument[1];Argument[this].SyntheticField[System.Collections.Immutable.ImmutableArray`1+Builder._elements].Element;value;dfc-generated |
 | System.Collections.Immutable;ImmutableArray<T>+Builder;Sort;(System.Comparison<T>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
-| System.Collections.Immutable;ImmutableArray<T>+Enumerator;get_Current;();Argument[this];ReturnValue;taint;df-generated |
-| System.Collections.Immutable;ImmutableArray<T>;Add;(T);Argument[0];ReturnValue;taint;df-generated |
-| System.Collections.Immutable;ImmutableArray<T>;AddRange;(System.Collections.Generic.IEnumerable<T>);Argument[0].Element;ReturnValue;taint;df-generated |
-| System.Collections.Immutable;ImmutableArray<T>;AddRange;(System.Collections.Generic.IEnumerable<T>);Argument[this];ReturnValue;taint;df-generated |
-| System.Collections.Immutable;ImmutableArray<T>;AddRange;(System.Collections.Immutable.ImmutableArray<T>);Argument[0].Element;ReturnValue;taint;df-generated |
-| System.Collections.Immutable;ImmutableArray<T>;AddRange;(System.Collections.Immutable.ImmutableArray<T>);Argument[this];ReturnValue;taint;df-generated |
-| System.Collections.Immutable;ImmutableArray<T>;AddRange;(System.Collections.Immutable.ImmutableArray<T>,System.Int32);Argument[0].Element;ReturnValue;taint;df-generated |
-| System.Collections.Immutable;ImmutableArray<T>;AddRange;(System.Collections.Immutable.ImmutableArray<T>,System.Int32);Argument[this];ReturnValue;taint;df-generated |
-| System.Collections.Immutable;ImmutableArray<T>;AddRange;(System.ReadOnlySpan<T>);Argument[0];ReturnValue;taint;df-generated |
-| System.Collections.Immutable;ImmutableArray<T>;AddRange;(System.ReadOnlySpan<T>);Argument[this];ReturnValue;taint;df-generated |
-| System.Collections.Immutable;ImmutableArray<T>;AddRange;(T[]);Argument[0].Element;ReturnValue;taint;df-generated |
-| System.Collections.Immutable;ImmutableArray<T>;AddRange;(T[]);Argument[this];ReturnValue;taint;df-generated |
-| System.Collections.Immutable;ImmutableArray<T>;AddRange;(T[],System.Int32);Argument[0].Element;ReturnValue;taint;df-generated |
-| System.Collections.Immutable;ImmutableArray<T>;AddRange;(T[],System.Int32);Argument[this];ReturnValue;taint;df-generated |
-| System.Collections.Immutable;ImmutableArray<T>;AddRange<TDerived>;(System.Collections.Immutable.ImmutableArray<TDerived>);Argument[this];ReturnValue;taint;df-generated |
-| System.Collections.Immutable;ImmutableArray<T>;AddRange<TDerived>;(TDerived[]);Argument[this];ReturnValue;taint;df-generated |
+| System.Collections.Immutable;ImmutableArray<T>+Enumerator;get_Current;();Argument[this].SyntheticField[System.Collections.Immutable.ImmutableArray`1+Enumerator._array].Element;ReturnValue;value;dfc-generated |
+| System.Collections.Immutable;ImmutableArray<T>;Add;(T);Argument[0];ReturnValue.SyntheticField[System.Collections.Immutable.ImmutableArray`1.array].Element;value;dfc-generated |
+| System.Collections.Immutable;ImmutableArray<T>;AddRange;(System.Collections.Generic.IEnumerable<T>);Argument[0].Element;ReturnValue.SyntheticField[System.Collections.Immutable.ImmutableArray`1.array].Element;value;dfc-generated |
+| System.Collections.Immutable;ImmutableArray<T>;AddRange;(System.Collections.Generic.IEnumerable<T>);Argument[this];ReturnValue;value;dfc-generated |
+| System.Collections.Immutable;ImmutableArray<T>;AddRange;(System.Collections.Immutable.ImmutableArray<T>);Argument[0];ReturnValue;value;dfc-generated |
+| System.Collections.Immutable;ImmutableArray<T>;AddRange;(System.Collections.Immutable.ImmutableArray<T>);Argument[this];ReturnValue;value;dfc-generated |
+| System.Collections.Immutable;ImmutableArray<T>;AddRange;(System.Collections.Immutable.ImmutableArray<T>,System.Int32);Argument[0].SyntheticField[System.Collections.Immutable.ImmutableArray`1.array].Element;ReturnValue.SyntheticField[System.Collections.Immutable.ImmutableArray`1.array].Element;value;dfc-generated |
+| System.Collections.Immutable;ImmutableArray<T>;AddRange;(System.Collections.Immutable.ImmutableArray<T>,System.Int32);Argument[this];ReturnValue;value;dfc-generated |
+| System.Collections.Immutable;ImmutableArray<T>;AddRange;(System.ReadOnlySpan<T>);Argument[0].Element;ReturnValue.Element;value;dfc-generated |
+| System.Collections.Immutable;ImmutableArray<T>;AddRange;(System.ReadOnlySpan<T>);Argument[0].Element;ReturnValue.SyntheticField[System.Collections.Immutable.ImmutableArray`1.array].Element;value;dfc-generated |
+| System.Collections.Immutable;ImmutableArray<T>;AddRange;(System.ReadOnlySpan<T>);Argument[this];ReturnValue;value;dfc-generated |
+| System.Collections.Immutable;ImmutableArray<T>;AddRange;(T[]);Argument[0];ReturnValue.SyntheticField[System.Collections.Immutable.ImmutableArray`1.array];value;dfc-generated |
+| System.Collections.Immutable;ImmutableArray<T>;AddRange;(T[]);Argument[this];ReturnValue;value;dfc-generated |
+| System.Collections.Immutable;ImmutableArray<T>;AddRange;(T[],System.Int32);Argument[0].Element;ReturnValue.SyntheticField[System.Collections.Immutable.ImmutableArray`1.array].Element;value;dfc-generated |
+| System.Collections.Immutable;ImmutableArray<T>;AddRange;(T[],System.Int32);Argument[this];ReturnValue;value;dfc-generated |
+| System.Collections.Immutable;ImmutableArray<T>;AddRange<TDerived>;(System.Collections.Immutable.ImmutableArray<TDerived>);Argument[this];ReturnValue;value;dfc-generated |
+| System.Collections.Immutable;ImmutableArray<T>;AddRange<TDerived>;(TDerived[]);Argument[this];ReturnValue;value;dfc-generated |
 | System.Collections.Immutable;ImmutableArray<T>;As<TOther>;();Argument[this];ReturnValue;taint;df-generated |
-| System.Collections.Immutable;ImmutableArray<T>;AsMemory;();Argument[this];ReturnValue;taint;df-generated |
-| System.Collections.Immutable;ImmutableArray<T>;AsSpan;();Argument[this];ReturnValue;taint;df-generated |
-| System.Collections.Immutable;ImmutableArray<T>;AsSpan;(System.Int32,System.Int32);Argument[this];ReturnValue;taint;df-generated |
-| System.Collections.Immutable;ImmutableArray<T>;AsSpan;(System.Range);Argument[this];ReturnValue;taint;df-generated |
+| System.Collections.Immutable;ImmutableArray<T>;AsSpan;();Argument[this].SyntheticField[System.Collections.Immutable.ImmutableArray`1.array].Element;ReturnValue.Element;value;dfc-generated |
+| System.Collections.Immutable;ImmutableArray<T>;AsSpan;(System.Int32,System.Int32);Argument[this].SyntheticField[System.Collections.Immutable.ImmutableArray`1.array].Element;ReturnValue.Element;value;dfc-generated |
+| System.Collections.Immutable;ImmutableArray<T>;AsSpan;(System.Range);Argument[this].SyntheticField[System.Collections.Immutable.ImmutableArray`1.array].Element;ReturnValue.Element;value;dfc-generated |
 | System.Collections.Immutable;ImmutableArray<T>;CastArray<TOther>;();Argument[this];ReturnValue;taint;df-generated |
 | System.Collections.Immutable;ImmutableArray<T>;CastUp<TDerived>;(System.Collections.Immutable.ImmutableArray<TDerived>);Argument[0].Element;ReturnValue;taint;df-generated |
-| System.Collections.Immutable;ImmutableArray<T>;CopyTo;(System.Span<T>);Argument[this];Argument[0];taint;df-generated |
-| System.Collections.Immutable;ImmutableArray<T>;GetEnumerator;();Argument[this];ReturnValue;taint;df-generated |
+| System.Collections.Immutable;ImmutableArray<T>;Contains;(T,System.Collections.Generic.IEqualityComparer<T>);Argument[0];Argument[1];taint;df-generated |
+| System.Collections.Immutable;ImmutableArray<T>;Contains;(T,System.Collections.Generic.IEqualityComparer<T>);Argument[this];Argument[1];taint;df-generated |
+| System.Collections.Immutable;ImmutableArray<T>;CopyTo;(System.Span<T>);Argument[this].SyntheticField[System.Collections.Immutable.ImmutableArray`1.array].Element;Argument[0].Element;value;dfc-generated |
+| System.Collections.Immutable;ImmutableArray<T>;GetEnumerator;();Argument[this].SyntheticField[System.Collections.Immutable.ImmutableArray`1.array];ReturnValue.SyntheticField[System.Collections.Immutable.ImmutableArray`1+Enumerator._array];value;dfc-generated |
+| System.Collections.Immutable;ImmutableArray<T>;IndexOf;(T,System.Int32,System.Collections.Generic.IEqualityComparer<T>);Argument[0];Argument[2];taint;df-generated |
+| System.Collections.Immutable;ImmutableArray<T>;IndexOf;(T,System.Int32,System.Collections.Generic.IEqualityComparer<T>);Argument[this];Argument[2];taint;df-generated |
+| System.Collections.Immutable;ImmutableArray<T>;IndexOf;(T,System.Int32,System.Int32,System.Collections.Generic.IEqualityComparer<T>);Argument[0];Argument[3];taint;df-generated |
+| System.Collections.Immutable;ImmutableArray<T>;IndexOf;(T,System.Int32,System.Int32,System.Collections.Generic.IEqualityComparer<T>);Argument[this];Argument[3];taint;df-generated |
+| System.Collections.Immutable;ImmutableArray<T>;Insert;(System.Int32,T);Argument[1];ReturnValue.SyntheticField[System.Collections.Immutable.ImmutableArray`1.array].Element;value;df-generated |
+| System.Collections.Immutable;ImmutableArray<T>;Insert;(System.Int32,T);Argument[1];ReturnValue.SyntheticField[System.Collections.Immutable.ImmutableArray`1.array].Element;value;dfc-generated |
 | System.Collections.Immutable;ImmutableArray<T>;Insert;(System.Int32,T);Argument[1];ReturnValue;taint;df-generated |
-| System.Collections.Immutable;ImmutableArray<T>;InsertRange;(System.Int32,System.Collections.Generic.IEnumerable<T>);Argument[1].Element;ReturnValue;taint;df-generated |
-| System.Collections.Immutable;ImmutableArray<T>;InsertRange;(System.Int32,System.Collections.Generic.IEnumerable<T>);Argument[this];ReturnValue;taint;df-generated |
-| System.Collections.Immutable;ImmutableArray<T>;InsertRange;(System.Int32,System.Collections.Immutable.ImmutableArray<T>);Argument[1].Element;ReturnValue;taint;df-generated |
-| System.Collections.Immutable;ImmutableArray<T>;InsertRange;(System.Int32,System.Collections.Immutable.ImmutableArray<T>);Argument[this];ReturnValue;taint;df-generated |
-| System.Collections.Immutable;ImmutableArray<T>;InsertRange;(System.Int32,System.ReadOnlySpan<T>);Argument[1];ReturnValue;taint;df-generated |
-| System.Collections.Immutable;ImmutableArray<T>;InsertRange;(System.Int32,System.ReadOnlySpan<T>);Argument[this];ReturnValue;taint;df-generated |
-| System.Collections.Immutable;ImmutableArray<T>;InsertRange;(System.Int32,T[]);Argument[1].Element;ReturnValue;taint;df-generated |
-| System.Collections.Immutable;ImmutableArray<T>;InsertRange;(System.Int32,T[]);Argument[this];ReturnValue;taint;df-generated |
-| System.Collections.Immutable;ImmutableArray<T>;OfType<TResult>;();Argument[this];ReturnValue;taint;df-generated |
-| System.Collections.Immutable;ImmutableArray<T>;Remove;(T);Argument[this];ReturnValue;taint;df-generated |
-| System.Collections.Immutable;ImmutableArray<T>;Remove;(T,System.Collections.Generic.IEqualityComparer<T>);Argument[this];ReturnValue;taint;df-generated |
+| System.Collections.Immutable;ImmutableArray<T>;Insert;(System.Int32,T);Argument[1];ReturnValue;taint;dfc-generated |
+| System.Collections.Immutable;ImmutableArray<T>;InsertRange;(System.Int32,System.Collections.Generic.IEnumerable<T>);Argument[1].Element;ReturnValue.SyntheticField[System.Collections.Immutable.ImmutableArray`1.array].Element;value;dfc-generated |
+| System.Collections.Immutable;ImmutableArray<T>;InsertRange;(System.Int32,System.Collections.Generic.IEnumerable<T>);Argument[this];ReturnValue;value;dfc-generated |
+| System.Collections.Immutable;ImmutableArray<T>;InsertRange;(System.Int32,System.Collections.Immutable.ImmutableArray<T>);Argument[1];ReturnValue;value;dfc-generated |
+| System.Collections.Immutable;ImmutableArray<T>;InsertRange;(System.Int32,System.Collections.Immutable.ImmutableArray<T>);Argument[this];ReturnValue;value;dfc-generated |
+| System.Collections.Immutable;ImmutableArray<T>;InsertRange;(System.Int32,System.ReadOnlySpan<T>);Argument[1].Element;ReturnValue.Element;value;dfc-generated |
+| System.Collections.Immutable;ImmutableArray<T>;InsertRange;(System.Int32,System.ReadOnlySpan<T>);Argument[1].Element;ReturnValue.SyntheticField[System.Collections.Immutable.ImmutableArray`1.array].Element;value;dfc-generated |
+| System.Collections.Immutable;ImmutableArray<T>;InsertRange;(System.Int32,System.ReadOnlySpan<T>);Argument[this];ReturnValue;value;dfc-generated |
+| System.Collections.Immutable;ImmutableArray<T>;InsertRange;(System.Int32,T[]);Argument[1];ReturnValue.SyntheticField[System.Collections.Immutable.ImmutableArray`1.array];value;dfc-generated |
+| System.Collections.Immutable;ImmutableArray<T>;InsertRange;(System.Int32,T[]);Argument[this];ReturnValue;value;dfc-generated |
+| System.Collections.Immutable;ImmutableArray<T>;LastIndexOf;(T,System.Int32,System.Int32,System.Collections.Generic.IEqualityComparer<T>);Argument[0];Argument[3];taint;df-generated |
+| System.Collections.Immutable;ImmutableArray<T>;LastIndexOf;(T,System.Int32,System.Int32,System.Collections.Generic.IEqualityComparer<T>);Argument[this];Argument[3];taint;df-generated |
+| System.Collections.Immutable;ImmutableArray<T>;OfType<TResult>;();Argument[this].SyntheticField[System.Collections.Immutable.ImmutableArray`1.array].Element;ReturnValue.Element;value;dfc-generated |
+| System.Collections.Immutable;ImmutableArray<T>;Remove;(T);Argument[this];ReturnValue;value;dfc-generated |
+| System.Collections.Immutable;ImmutableArray<T>;Remove;(T,System.Collections.Generic.IEqualityComparer<T>);Argument[this];ReturnValue;value;dfc-generated |
+| System.Collections.Immutable;ImmutableArray<T>;RemoveAll;(System.Predicate<T>);Argument[0];Argument[0].Parameter[delegate-self];value;dfc-generated |
 | System.Collections.Immutable;ImmutableArray<T>;RemoveAll;(System.Predicate<T>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
-| System.Collections.Immutable;ImmutableArray<T>;RemoveAt;(System.Int32);Argument[this];ReturnValue;taint;df-generated |
-| System.Collections.Immutable;ImmutableArray<T>;RemoveRange;(System.Collections.Generic.IEnumerable<T>);Argument[this];ReturnValue;taint;df-generated |
-| System.Collections.Immutable;ImmutableArray<T>;RemoveRange;(System.Collections.Generic.IEnumerable<T>,System.Collections.Generic.IEqualityComparer<T>);Argument[this];ReturnValue;taint;df-generated |
-| System.Collections.Immutable;ImmutableArray<T>;RemoveRange;(System.Collections.Immutable.ImmutableArray<T>);Argument[this];ReturnValue;taint;df-generated |
-| System.Collections.Immutable;ImmutableArray<T>;RemoveRange;(System.Collections.Immutable.ImmutableArray<T>,System.Collections.Generic.IEqualityComparer<T>);Argument[this];ReturnValue;taint;df-generated |
-| System.Collections.Immutable;ImmutableArray<T>;RemoveRange;(System.Int32,System.Int32);Argument[this];ReturnValue;taint;df-generated |
-| System.Collections.Immutable;ImmutableArray<T>;RemoveRange;(System.ReadOnlySpan<T>,System.Collections.Generic.IEqualityComparer<T>);Argument[this];ReturnValue;taint;df-generated |
-| System.Collections.Immutable;ImmutableArray<T>;RemoveRange;(T[],System.Collections.Generic.IEqualityComparer<T>);Argument[this];ReturnValue;taint;df-generated |
-| System.Collections.Immutable;ImmutableArray<T>;Replace;(T,T);Argument[1];ReturnValue;taint;df-generated |
+| System.Collections.Immutable;ImmutableArray<T>;RemoveAll;(System.Predicate<T>);Argument[this].SyntheticField[System.Collections.Immutable.ImmutableArray`1.array].Element;Argument[0].Parameter[0];value;dfc-generated |
+| System.Collections.Immutable;ImmutableArray<T>;RemoveAll;(System.Predicate<T>);Argument[this].SyntheticField[System.Collections.Immutable.ImmutableArray`1.array].Element;Argument[0].Parameter[0];value;hq-generated |
+| System.Collections.Immutable;ImmutableArray<T>;RemoveAll;(System.Predicate<T>);Argument[this];ReturnValue;value;dfc-generated |
+| System.Collections.Immutable;ImmutableArray<T>;RemoveAll;(System.Predicate<T>);Argument[this];ReturnValue;value;hq-generated |
+| System.Collections.Immutable;ImmutableArray<T>;RemoveAt;(System.Int32);Argument[this];ReturnValue;value;dfc-generated |
+| System.Collections.Immutable;ImmutableArray<T>;RemoveRange;(System.Collections.Generic.IEnumerable<T>);Argument[this];ReturnValue;value;dfc-generated |
+| System.Collections.Immutable;ImmutableArray<T>;RemoveRange;(System.Collections.Generic.IEnumerable<T>,System.Collections.Generic.IEqualityComparer<T>);Argument[this];ReturnValue;value;dfc-generated |
+| System.Collections.Immutable;ImmutableArray<T>;RemoveRange;(System.Collections.Immutable.ImmutableArray<T>);Argument[this];ReturnValue;value;dfc-generated |
+| System.Collections.Immutable;ImmutableArray<T>;RemoveRange;(System.Collections.Immutable.ImmutableArray<T>,System.Collections.Generic.IEqualityComparer<T>);Argument[this];ReturnValue;value;dfc-generated |
+| System.Collections.Immutable;ImmutableArray<T>;RemoveRange;(System.Int32,System.Int32);Argument[this];ReturnValue;value;dfc-generated |
+| System.Collections.Immutable;ImmutableArray<T>;RemoveRange;(System.ReadOnlySpan<T>,System.Collections.Generic.IEqualityComparer<T>);Argument[this];ReturnValue;value;dfc-generated |
+| System.Collections.Immutable;ImmutableArray<T>;RemoveRange;(T[],System.Collections.Generic.IEqualityComparer<T>);Argument[this];ReturnValue;value;dfc-generated |
+| System.Collections.Immutable;ImmutableArray<T>;Replace;(T,T);Argument[1];ReturnValue.SyntheticField[System.Collections.Immutable.ImmutableArray`1.array].Element;value;dfc-generated |
+| System.Collections.Immutable;ImmutableArray<T>;Replace;(T,T,System.Collections.Generic.IEqualityComparer<T>);Argument[0];Argument[2];taint;df-generated |
+| System.Collections.Immutable;ImmutableArray<T>;Replace;(T,T,System.Collections.Generic.IEqualityComparer<T>);Argument[0];Argument[2];taint;dfc-generated |
+| System.Collections.Immutable;ImmutableArray<T>;Replace;(T,T,System.Collections.Generic.IEqualityComparer<T>);Argument[1];ReturnValue.SyntheticField[System.Collections.Immutable.ImmutableArray`1.array].Element;value;df-generated |
+| System.Collections.Immutable;ImmutableArray<T>;Replace;(T,T,System.Collections.Generic.IEqualityComparer<T>);Argument[1];ReturnValue.SyntheticField[System.Collections.Immutable.ImmutableArray`1.array].Element;value;dfc-generated |
 | System.Collections.Immutable;ImmutableArray<T>;Replace;(T,T,System.Collections.Generic.IEqualityComparer<T>);Argument[1];ReturnValue;taint;df-generated |
+| System.Collections.Immutable;ImmutableArray<T>;Replace;(T,T,System.Collections.Generic.IEqualityComparer<T>);Argument[1];ReturnValue;taint;dfc-generated |
+| System.Collections.Immutable;ImmutableArray<T>;Replace;(T,T,System.Collections.Generic.IEqualityComparer<T>);Argument[this];Argument[2];taint;df-generated |
+| System.Collections.Immutable;ImmutableArray<T>;Replace;(T,T,System.Collections.Generic.IEqualityComparer<T>);Argument[this];Argument[2];taint;dfc-generated |
+| System.Collections.Immutable;ImmutableArray<T>;SetItem;(System.Int32,T);Argument[1];ReturnValue.SyntheticField[System.Collections.Immutable.ImmutableArray`1.array].Element;value;df-generated |
+| System.Collections.Immutable;ImmutableArray<T>;SetItem;(System.Int32,T);Argument[1];ReturnValue.SyntheticField[System.Collections.Immutable.ImmutableArray`1.array].Element;value;dfc-generated |
 | System.Collections.Immutable;ImmutableArray<T>;SetItem;(System.Int32,T);Argument[1];ReturnValue;taint;df-generated |
-| System.Collections.Immutable;ImmutableArray<T>;Slice;(System.Int32,System.Int32);Argument[this];ReturnValue;taint;df-generated |
-| System.Collections.Immutable;ImmutableArray<T>;Sort;();Argument[this];ReturnValue;taint;df-generated |
+| System.Collections.Immutable;ImmutableArray<T>;SetItem;(System.Int32,T);Argument[1];ReturnValue;taint;dfc-generated |
+| System.Collections.Immutable;ImmutableArray<T>;Slice;(System.Int32,System.Int32);Argument[this];ReturnValue;value;dfc-generated |
+| System.Collections.Immutable;ImmutableArray<T>;Sort;();Argument[this];ReturnValue;value;dfc-generated |
 | System.Collections.Immutable;ImmutableArray<T>;Sort;(System.Collections.Generic.IComparer<T>);Argument[this];Argument[0];taint;df-generated |
 | System.Collections.Immutable;ImmutableArray<T>;Sort;(System.Collections.Generic.IComparer<T>);Argument[this];ReturnValue;taint;df-generated |
+| System.Collections.Immutable;ImmutableArray<T>;Sort;(System.Comparison<T>);Argument[0];Argument[0].Parameter[delegate-self];value;dfc-generated |
 | System.Collections.Immutable;ImmutableArray<T>;Sort;(System.Comparison<T>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
+| System.Collections.Immutable;ImmutableArray<T>;Sort;(System.Comparison<T>);Argument[this];ReturnValue;value;dfc-generated |
+| System.Collections.Immutable;ImmutableArray<T>;Sort;(System.Comparison<T>);Argument[this];ReturnValue;value;hq-generated |
 | System.Collections.Immutable;ImmutableArray<T>;Sort;(System.Int32,System.Int32,System.Collections.Generic.IComparer<T>);Argument[this];Argument[2];taint;df-generated |
 | System.Collections.Immutable;ImmutableArray<T>;Sort;(System.Int32,System.Int32,System.Collections.Generic.IComparer<T>);Argument[this];ReturnValue;taint;df-generated |
-| System.Collections.Immutable;ImmutableArray<T>;ToBuilder;();Argument[this];ReturnValue;taint;df-generated |
-| System.Collections.Immutable;ImmutableArray<T>;get_Item;(System.Int32);Argument[this];ReturnValue;taint;df-generated |
+| System.Collections.Immutable;ImmutableArray<T>;ToBuilder;();Argument[this].Element;ReturnValue.Element;value;dfc-generated |
+| System.Collections.Immutable;ImmutableArray<T>;get_Item;(System.Int32);Argument[this].SyntheticField[System.Collections.Immutable.ImmutableArray`1.array].Element;ReturnValue;value;dfc-generated |
 | System.Collections.Immutable;ImmutableDictionary;Create<TKey,TValue>;(System.Collections.Generic.IEqualityComparer<TKey>);Argument[0];ReturnValue;taint;df-generated |
 | System.Collections.Immutable;ImmutableDictionary;Create<TKey,TValue>;(System.Collections.Generic.IEqualityComparer<TKey>,System.Collections.Generic.IEqualityComparer<TValue>);Argument[0];ReturnValue;taint;df-generated |
 | System.Collections.Immutable;ImmutableDictionary;Create<TKey,TValue>;(System.Collections.Generic.IEqualityComparer<TKey>,System.Collections.Generic.IEqualityComparer<TValue>);Argument[1];ReturnValue;taint;df-generated |
 | System.Collections.Immutable;ImmutableDictionary;CreateBuilder<TKey,TValue>;(System.Collections.Generic.IEqualityComparer<TKey>);Argument[0];ReturnValue;taint;df-generated |
 | System.Collections.Immutable;ImmutableDictionary;CreateBuilder<TKey,TValue>;(System.Collections.Generic.IEqualityComparer<TKey>,System.Collections.Generic.IEqualityComparer<TValue>);Argument[0];ReturnValue;taint;df-generated |
 | System.Collections.Immutable;ImmutableDictionary;CreateBuilder<TKey,TValue>;(System.Collections.Generic.IEqualityComparer<TKey>,System.Collections.Generic.IEqualityComparer<TValue>);Argument[1];ReturnValue;taint;df-generated |
-| System.Collections.Immutable;ImmutableDictionary;CreateRange<TKey,TValue>;(System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<TKey,TValue>>);Argument[0].Element;ReturnValue;taint;df-generated |
-| System.Collections.Immutable;ImmutableDictionary;CreateRange<TKey,TValue>;(System.Collections.Generic.IEqualityComparer<TKey>,System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<TKey,TValue>>);Argument[0];ReturnValue;taint;df-generated |
-| System.Collections.Immutable;ImmutableDictionary;CreateRange<TKey,TValue>;(System.Collections.Generic.IEqualityComparer<TKey>,System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<TKey,TValue>>);Argument[1].Element;ReturnValue;taint;df-generated |
-| System.Collections.Immutable;ImmutableDictionary;CreateRange<TKey,TValue>;(System.Collections.Generic.IEqualityComparer<TKey>,System.Collections.Generic.IEqualityComparer<TValue>,System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<TKey,TValue>>);Argument[0];ReturnValue;taint;df-generated |
-| System.Collections.Immutable;ImmutableDictionary;CreateRange<TKey,TValue>;(System.Collections.Generic.IEqualityComparer<TKey>,System.Collections.Generic.IEqualityComparer<TValue>,System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<TKey,TValue>>);Argument[1];ReturnValue;taint;df-generated |
-| System.Collections.Immutable;ImmutableDictionary;CreateRange<TKey,TValue>;(System.Collections.Generic.IEqualityComparer<TKey>,System.Collections.Generic.IEqualityComparer<TValue>,System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<TKey,TValue>>);Argument[2].Element;ReturnValue;taint;df-generated |
-| System.Collections.Immutable;ImmutableDictionary;GetValueOrDefault<TKey,TValue>;(System.Collections.Immutable.IImmutableDictionary<TKey,TValue>,TKey,TValue);Argument[2];ReturnValue;taint;df-generated |
-| System.Collections.Immutable;ImmutableDictionary;ToImmutableDictionary<TKey,TValue>;(System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<TKey,TValue>>);Argument[0].Element;ReturnValue;taint;df-generated |
-| System.Collections.Immutable;ImmutableDictionary;ToImmutableDictionary<TKey,TValue>;(System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<TKey,TValue>>,System.Collections.Generic.IEqualityComparer<TKey>);Argument[0].Element;ReturnValue;taint;df-generated |
-| System.Collections.Immutable;ImmutableDictionary;ToImmutableDictionary<TKey,TValue>;(System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<TKey,TValue>>,System.Collections.Generic.IEqualityComparer<TKey>);Argument[1];ReturnValue;taint;df-generated |
-| System.Collections.Immutable;ImmutableDictionary;ToImmutableDictionary<TKey,TValue>;(System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<TKey,TValue>>,System.Collections.Generic.IEqualityComparer<TKey>,System.Collections.Generic.IEqualityComparer<TValue>);Argument[0].Element;ReturnValue;taint;df-generated |
-| System.Collections.Immutable;ImmutableDictionary;ToImmutableDictionary<TKey,TValue>;(System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<TKey,TValue>>,System.Collections.Generic.IEqualityComparer<TKey>,System.Collections.Generic.IEqualityComparer<TValue>);Argument[1];ReturnValue;taint;df-generated |
-| System.Collections.Immutable;ImmutableDictionary;ToImmutableDictionary<TKey,TValue>;(System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<TKey,TValue>>,System.Collections.Generic.IEqualityComparer<TKey>,System.Collections.Generic.IEqualityComparer<TValue>);Argument[2];ReturnValue;taint;df-generated |
+| System.Collections.Immutable;ImmutableDictionary;CreateRange<TKey,TValue>;(System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<TKey,TValue>>);Argument[0];ReturnValue;value;dfc-generated |
+| System.Collections.Immutable;ImmutableDictionary;CreateRange<TKey,TValue>;(System.Collections.Generic.IEqualityComparer<TKey>,System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<TKey,TValue>>);Argument[1];ReturnValue;value;dfc-generated |
+| System.Collections.Immutable;ImmutableDictionary;CreateRange<TKey,TValue>;(System.Collections.Generic.IEqualityComparer<TKey>,System.Collections.Generic.IEqualityComparer<TValue>,System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<TKey,TValue>>);Argument[2];ReturnValue;value;dfc-generated |
+| System.Collections.Immutable;ImmutableDictionary;GetValueOrDefault<TKey,TValue>;(System.Collections.Immutable.IImmutableDictionary<TKey,TValue>,TKey,TValue);Argument[2];ReturnValue;value;dfc-generated |
+| System.Collections.Immutable;ImmutableDictionary;ToImmutableDictionary<TKey,TValue>;(System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<TKey,TValue>>);Argument[0];ReturnValue;value;dfc-generated |
+| System.Collections.Immutable;ImmutableDictionary;ToImmutableDictionary<TKey,TValue>;(System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<TKey,TValue>>,System.Collections.Generic.IEqualityComparer<TKey>);Argument[0];ReturnValue;value;dfc-generated |
+| System.Collections.Immutable;ImmutableDictionary;ToImmutableDictionary<TKey,TValue>;(System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<TKey,TValue>>,System.Collections.Generic.IEqualityComparer<TKey>,System.Collections.Generic.IEqualityComparer<TValue>);Argument[0];ReturnValue;value;dfc-generated |
 | System.Collections.Immutable;ImmutableDictionary;ToImmutableDictionary<TSource,TKey,TValue>;(System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,TKey>,System.Func<TSource,TValue>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
 | System.Collections.Immutable;ImmutableDictionary;ToImmutableDictionary<TSource,TKey,TValue>;(System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,TKey>,System.Func<TSource,TValue>);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
 | System.Collections.Immutable;ImmutableDictionary;ToImmutableDictionary<TSource,TKey,TValue>;(System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,TKey>,System.Func<TSource,TValue>,System.Collections.Generic.IEqualityComparer<TKey>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
@@ -4556,17 +5127,21 @@
 | System.Collections.Immutable;ImmutableDictionary<TKey,TValue>+Builder;Add;(System.Collections.Generic.KeyValuePair<TKey,TValue>);Argument[0].Property[System.Collections.Generic.KeyValuePair`2.Value];Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Value];value;manual |
 | System.Collections.Immutable;ImmutableDictionary<TKey,TValue>+Builder;AddRange;(System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<TKey,TValue>>);Argument[0].Element;Argument[this].Element;value;manual |
 | System.Collections.Immutable;ImmutableDictionary<TKey,TValue>+Builder;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.Immutable.ImmutableDictionary`2+Enumerator.Current];value;manual |
-| System.Collections.Immutable;ImmutableDictionary<TKey,TValue>+Builder;GetValueOrDefault;(TKey,TValue);Argument[1];ReturnValue;taint;df-generated |
-| System.Collections.Immutable;ImmutableDictionary<TKey,TValue>+Builder;TryGetKey;(TKey,TKey);Argument[0];ReturnValue;taint;df-generated |
+| System.Collections.Immutable;ImmutableDictionary<TKey,TValue>+Builder;GetValueOrDefault;(TKey,TValue);Argument[1];ReturnValue;value;dfc-generated |
+| System.Collections.Immutable;ImmutableDictionary<TKey,TValue>+Builder;TryGetKey;(TKey,TKey);Argument[0];ReturnValue;value;dfc-generated |
+| System.Collections.Immutable;ImmutableDictionary<TKey,TValue>+Builder;TryGetValue;(TKey,TValue);Argument[1];ReturnValue;value;dfc-generated |
 | System.Collections.Immutable;ImmutableDictionary<TKey,TValue>+Builder;get_Keys;();Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Key];ReturnValue.Element;value;manual |
 | System.Collections.Immutable;ImmutableDictionary<TKey,TValue>+Builder;get_Values;();Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Value];ReturnValue.Element;value;manual |
+| System.Collections.Immutable;ImmutableDictionary<TKey,TValue>+Enumerator;get_Current;();Argument[this].Property[System.Collections.Immutable.ImmutableDictionary`2+Enumerator.Current];ReturnValue;value;df-generated |
+| System.Collections.Immutable;ImmutableDictionary<TKey,TValue>+Enumerator;get_Current;();Argument[this].Property[System.Collections.Immutable.ImmutableDictionary`2+Enumerator.Current];ReturnValue;value;dfc-generated |
 | System.Collections.Immutable;ImmutableDictionary<TKey,TValue>+Enumerator;get_Current;();Argument[this];ReturnValue;taint;df-generated |
+| System.Collections.Immutable;ImmutableDictionary<TKey,TValue>+Enumerator;get_Current;();Argument[this];ReturnValue;taint;dfc-generated |
 | System.Collections.Immutable;ImmutableDictionary<TKey,TValue>;Add;(System.Collections.Generic.KeyValuePair<TKey,TValue>);Argument[0].Property[System.Collections.Generic.KeyValuePair`2.Key];Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Key];value;manual |
 | System.Collections.Immutable;ImmutableDictionary<TKey,TValue>;Add;(System.Collections.Generic.KeyValuePair<TKey,TValue>);Argument[0].Property[System.Collections.Generic.KeyValuePair`2.Value];Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Value];value;manual |
 | System.Collections.Immutable;ImmutableDictionary<TKey,TValue>;Add;(TKey,TValue);Argument[0];Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Key];value;manual |
 | System.Collections.Immutable;ImmutableDictionary<TKey,TValue>;Add;(TKey,TValue);Argument[1];Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Value];value;manual |
 | System.Collections.Immutable;ImmutableDictionary<TKey,TValue>;AddRange;(System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<TKey,TValue>>);Argument[0].Element;Argument[this].Element;value;manual |
-| System.Collections.Immutable;ImmutableDictionary<TKey,TValue>;Clear;();Argument[this];ReturnValue;taint;df-generated |
+| System.Collections.Immutable;ImmutableDictionary<TKey,TValue>;Clear;();Argument[this];ReturnValue;value;dfc-generated |
 | System.Collections.Immutable;ImmutableDictionary<TKey,TValue>;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.Immutable.ImmutableDictionary`2+Enumerator.Current];value;manual |
 | System.Collections.Immutable;ImmutableDictionary<TKey,TValue>;Remove;(TKey);Argument[this];ReturnValue;taint;df-generated |
 | System.Collections.Immutable;ImmutableDictionary<TKey,TValue>;RemoveRange;(System.Collections.Generic.IEnumerable<TKey>);Argument[this];ReturnValue;taint;df-generated |
@@ -4576,14 +5151,16 @@
 | System.Collections.Immutable;ImmutableDictionary<TKey,TValue>;SetItems;(System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<TKey,TValue>>);Argument[0].Element;ReturnValue;taint;df-generated |
 | System.Collections.Immutable;ImmutableDictionary<TKey,TValue>;SetItems;(System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<TKey,TValue>>);Argument[this];ReturnValue;taint;df-generated |
 | System.Collections.Immutable;ImmutableDictionary<TKey,TValue>;ToBuilder;();Argument[this];ReturnValue;taint;df-generated |
-| System.Collections.Immutable;ImmutableDictionary<TKey,TValue>;TryGetKey;(TKey,TKey);Argument[0];ReturnValue;taint;df-generated |
-| System.Collections.Immutable;ImmutableDictionary<TKey,TValue>;WithComparers;(System.Collections.Generic.IEqualityComparer<TKey>);Argument[0];ReturnValue;taint;df-generated |
-| System.Collections.Immutable;ImmutableDictionary<TKey,TValue>;WithComparers;(System.Collections.Generic.IEqualityComparer<TKey>);Argument[this];ReturnValue;taint;df-generated |
-| System.Collections.Immutable;ImmutableDictionary<TKey,TValue>;WithComparers;(System.Collections.Generic.IEqualityComparer<TKey>,System.Collections.Generic.IEqualityComparer<TValue>);Argument[this];ReturnValue;value;df-generated |
+| System.Collections.Immutable;ImmutableDictionary<TKey,TValue>;TryGetKey;(TKey,TKey);Argument[0];ReturnValue;value;dfc-generated |
+| System.Collections.Immutable;ImmutableDictionary<TKey,TValue>;TryGetValue;(TKey,TValue);Argument[1];ReturnValue;value;dfc-generated |
+| System.Collections.Immutable;ImmutableDictionary<TKey,TValue>;WithComparers;(System.Collections.Generic.IEqualityComparer<TKey>);Argument[0];ReturnValue.SyntheticField[System.Collections.Immutable.ImmutableDictionary`2._comparers].SyntheticField[System.Collections.Immutable.ImmutableDictionary`2+Comparers._keyComparer];value;dfc-generated |
+| System.Collections.Immutable;ImmutableDictionary<TKey,TValue>;WithComparers;(System.Collections.Generic.IEqualityComparer<TKey>,System.Collections.Generic.IEqualityComparer<TValue>);Argument[0];ReturnValue.SyntheticField[System.Collections.Immutable.ImmutableDictionary`2._comparers].SyntheticField[System.Collections.Immutable.ImmutableDictionary`2+Comparers._keyComparer];value;dfc-generated |
+| System.Collections.Immutable;ImmutableDictionary<TKey,TValue>;WithComparers;(System.Collections.Generic.IEqualityComparer<TKey>,System.Collections.Generic.IEqualityComparer<TValue>);Argument[1];ReturnValue.SyntheticField[System.Collections.Immutable.ImmutableDictionary`2._comparers].SyntheticField[System.Collections.Immutable.ImmutableDictionary`2+Comparers._valueComparer];value;dfc-generated |
+| System.Collections.Immutable;ImmutableDictionary<TKey,TValue>;WithComparers;(System.Collections.Generic.IEqualityComparer<TKey>,System.Collections.Generic.IEqualityComparer<TValue>);Argument[this];ReturnValue;value;dfc-generated |
 | System.Collections.Immutable;ImmutableDictionary<TKey,TValue>;get_Item;(TKey);Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Value];ReturnValue;value;manual |
-| System.Collections.Immutable;ImmutableDictionary<TKey,TValue>;get_KeyComparer;();Argument[this];ReturnValue;taint;df-generated |
+| System.Collections.Immutable;ImmutableDictionary<TKey,TValue>;get_KeyComparer;();Argument[this].SyntheticField[System.Collections.Immutable.ImmutableDictionary`2._comparers].SyntheticField[System.Collections.Immutable.ImmutableDictionary`2+Comparers._keyComparer];ReturnValue;value;dfc-generated |
 | System.Collections.Immutable;ImmutableDictionary<TKey,TValue>;get_Keys;();Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Key];ReturnValue.Element;value;manual |
-| System.Collections.Immutable;ImmutableDictionary<TKey,TValue>;get_ValueComparer;();Argument[this];ReturnValue;taint;df-generated |
+| System.Collections.Immutable;ImmutableDictionary<TKey,TValue>;get_ValueComparer;();Argument[this].SyntheticField[System.Collections.Immutable.ImmutableDictionary`2._comparers].SyntheticField[System.Collections.Immutable.ImmutableDictionary`2+Comparers._valueComparer];ReturnValue;value;dfc-generated |
 | System.Collections.Immutable;ImmutableDictionary<TKey,TValue>;get_Values;();Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Value];ReturnValue.Element;value;manual |
 | System.Collections.Immutable;ImmutableHashSet;Create<T>;(System.Collections.Generic.IEqualityComparer<T>,System.ReadOnlySpan<T>);Argument[1];ReturnValue;taint;df-generated |
 | System.Collections.Immutable;ImmutableHashSet;Create<T>;(System.Collections.Generic.IEqualityComparer<T>,T);Argument[1];ReturnValue;taint;df-generated |
@@ -4591,42 +5168,112 @@
 | System.Collections.Immutable;ImmutableHashSet;Create<T>;(System.ReadOnlySpan<T>);Argument[0];ReturnValue;taint;df-generated |
 | System.Collections.Immutable;ImmutableHashSet;Create<T>;(T);Argument[0];ReturnValue;taint;df-generated |
 | System.Collections.Immutable;ImmutableHashSet;Create<T>;(T[]);Argument[0].Element;ReturnValue;taint;df-generated |
-| System.Collections.Immutable;ImmutableHashSet;CreateRange<T>;(System.Collections.Generic.IEnumerable<T>);Argument[0].Element;ReturnValue;taint;df-generated |
-| System.Collections.Immutable;ImmutableHashSet;CreateRange<T>;(System.Collections.Generic.IEqualityComparer<T>,System.Collections.Generic.IEnumerable<T>);Argument[1].Element;ReturnValue;taint;df-generated |
-| System.Collections.Immutable;ImmutableHashSet;ToImmutableHashSet<TSource>;(System.Collections.Generic.IEnumerable<TSource>);Argument[0].Element;ReturnValue;taint;df-generated |
-| System.Collections.Immutable;ImmutableHashSet;ToImmutableHashSet<TSource>;(System.Collections.Generic.IEnumerable<TSource>,System.Collections.Generic.IEqualityComparer<TSource>);Argument[0].Element;ReturnValue;taint;df-generated |
+| System.Collections.Immutable;ImmutableHashSet;CreateRange<T>;(System.Collections.Generic.IEnumerable<T>);Argument[0];ReturnValue;value;dfc-generated |
+| System.Collections.Immutable;ImmutableHashSet;CreateRange<T>;(System.Collections.Generic.IEqualityComparer<T>,System.Collections.Generic.IEnumerable<T>);Argument[1];ReturnValue;value;dfc-generated |
+| System.Collections.Immutable;ImmutableHashSet;ToImmutableHashSet<TSource>;(System.Collections.Generic.IEnumerable<TSource>);Argument[0];ReturnValue;value;dfc-generated |
+| System.Collections.Immutable;ImmutableHashSet;ToImmutableHashSet<TSource>;(System.Collections.Generic.IEnumerable<TSource>,System.Collections.Generic.IEqualityComparer<TSource>);Argument[0];ReturnValue;value;dfc-generated |
 | System.Collections.Immutable;ImmutableHashSet<T>+Builder;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.Immutable.ImmutableHashSet`1+Enumerator.Current];value;manual |
 | System.Collections.Immutable;ImmutableHashSet<T>+Builder;SymmetricExceptWith;(System.Collections.Generic.IEnumerable<T>);Argument[0].Element;Argument[this];taint;df-generated |
-| System.Collections.Immutable;ImmutableHashSet<T>+Builder;TryGetValue;(T,T);Argument[0];ReturnValue;taint;df-generated |
+| System.Collections.Immutable;ImmutableHashSet<T>+Builder;TryGetValue;(T,T);Argument[0];ReturnValue;value;dfc-generated |
+| System.Collections.Immutable;ImmutableHashSet<T>+Enumerator;get_Current;();Argument[this].Property[System.Collections.Immutable.ImmutableHashSet`1+Enumerator.Current];ReturnValue;value;df-generated |
+| System.Collections.Immutable;ImmutableHashSet<T>+Enumerator;get_Current;();Argument[this].Property[System.Collections.Immutable.ImmutableHashSet`1+Enumerator.Current];ReturnValue;value;dfc-generated |
 | System.Collections.Immutable;ImmutableHashSet<T>+Enumerator;get_Current;();Argument[this];ReturnValue;taint;df-generated |
+| System.Collections.Immutable;ImmutableHashSet<T>+Enumerator;get_Current;();Argument[this];ReturnValue;taint;dfc-generated |
 | System.Collections.Immutable;ImmutableHashSet<T>;Add;(T);Argument[0];Argument[this].Element;value;manual |
 | System.Collections.Immutable;ImmutableHashSet<T>;Clear;();Argument[this].WithoutElement;ReturnValue;value;manual |
 | System.Collections.Immutable;ImmutableHashSet<T>;Except;(System.Collections.Generic.IEnumerable<T>);Argument[this];ReturnValue;taint;df-generated |
 | System.Collections.Immutable;ImmutableHashSet<T>;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.Immutable.ImmutableHashSet`1+Enumerator.Current];value;manual |
-| System.Collections.Immutable;ImmutableHashSet<T>;Intersect;(System.Collections.Generic.IEnumerable<T>);Argument[this];ReturnValue;taint;df-generated |
+| System.Collections.Immutable;ImmutableHashSet<T>;Intersect;(System.Collections.Generic.IEnumerable<T>);Argument[this];ReturnValue;value;dfc-generated |
 | System.Collections.Immutable;ImmutableHashSet<T>;Remove;(T);Argument[this];ReturnValue;taint;df-generated |
-| System.Collections.Immutable;ImmutableHashSet<T>;SymmetricExcept;(System.Collections.Generic.IEnumerable<T>);Argument[0].Element;ReturnValue;taint;df-generated |
-| System.Collections.Immutable;ImmutableHashSet<T>;SymmetricExcept;(System.Collections.Generic.IEnumerable<T>);Argument[this];ReturnValue;taint;df-generated |
+| System.Collections.Immutable;ImmutableHashSet<T>;SymmetricExcept;(System.Collections.Generic.IEnumerable<T>);Argument[this];ReturnValue;value;dfc-generated |
 | System.Collections.Immutable;ImmutableHashSet<T>;ToBuilder;();Argument[this];ReturnValue;taint;df-generated |
-| System.Collections.Immutable;ImmutableHashSet<T>;TryGetValue;(T,T);Argument[0];ReturnValue;taint;df-generated |
-| System.Collections.Immutable;ImmutableHashSet<T>;Union;(System.Collections.Generic.IEnumerable<T>);Argument[0].Element;ReturnValue;taint;df-generated |
-| System.Collections.Immutable;ImmutableHashSet<T>;Union;(System.Collections.Generic.IEnumerable<T>);Argument[this];ReturnValue;taint;df-generated |
-| System.Collections.Immutable;ImmutableHashSet<T>;WithComparer;(System.Collections.Generic.IEqualityComparer<T>);Argument[this];ReturnValue;value;df-generated |
+| System.Collections.Immutable;ImmutableHashSet<T>;TryGetValue;(T,T);Argument[0];ReturnValue;value;dfc-generated |
+| System.Collections.Immutable;ImmutableHashSet<T>;Union;(System.Collections.Generic.IEnumerable<T>);Argument[0];ReturnValue;value;dfc-generated |
+| System.Collections.Immutable;ImmutableHashSet<T>;WithComparer;(System.Collections.Generic.IEqualityComparer<T>);Argument[this];ReturnValue;value;dfc-generated |
 | System.Collections.Immutable;ImmutableHashSet<T>;get_KeyComparer;();Argument[this];ReturnValue;taint;df-generated |
+| System.Collections.Immutable;ImmutableInterlocked;AddOrUpdate<TKey,TValue>;(System.Collections.Immutable.ImmutableDictionary<TKey,TValue>,TKey,System.Func<TKey,TValue>,System.Func<TKey,TValue,TValue>);Argument[0];ReturnValue;value;dfc-generated |
+| System.Collections.Immutable;ImmutableInterlocked;AddOrUpdate<TKey,TValue>;(System.Collections.Immutable.ImmutableDictionary<TKey,TValue>,TKey,System.Func<TKey,TValue>,System.Func<TKey,TValue,TValue>);Argument[0];ReturnValue;value;hq-generated |
+| System.Collections.Immutable;ImmutableInterlocked;AddOrUpdate<TKey,TValue>;(System.Collections.Immutable.ImmutableDictionary<TKey,TValue>,TKey,System.Func<TKey,TValue>,System.Func<TKey,TValue,TValue>);Argument[1];Argument[2].Parameter[0];value;dfc-generated |
+| System.Collections.Immutable;ImmutableInterlocked;AddOrUpdate<TKey,TValue>;(System.Collections.Immutable.ImmutableDictionary<TKey,TValue>,TKey,System.Func<TKey,TValue>,System.Func<TKey,TValue,TValue>);Argument[1];Argument[2].Parameter[0];value;hq-generated |
+| System.Collections.Immutable;ImmutableInterlocked;AddOrUpdate<TKey,TValue>;(System.Collections.Immutable.ImmutableDictionary<TKey,TValue>,TKey,System.Func<TKey,TValue>,System.Func<TKey,TValue,TValue>);Argument[1];Argument[3].Parameter[0];value;dfc-generated |
+| System.Collections.Immutable;ImmutableInterlocked;AddOrUpdate<TKey,TValue>;(System.Collections.Immutable.ImmutableDictionary<TKey,TValue>,TKey,System.Func<TKey,TValue>,System.Func<TKey,TValue,TValue>);Argument[1];Argument[3].Parameter[0];value;hq-generated |
+| System.Collections.Immutable;ImmutableInterlocked;AddOrUpdate<TKey,TValue>;(System.Collections.Immutable.ImmutableDictionary<TKey,TValue>,TKey,System.Func<TKey,TValue>,System.Func<TKey,TValue,TValue>);Argument[2].ReturnValue;ReturnValue;value;dfc-generated |
+| System.Collections.Immutable;ImmutableInterlocked;AddOrUpdate<TKey,TValue>;(System.Collections.Immutable.ImmutableDictionary<TKey,TValue>,TKey,System.Func<TKey,TValue>,System.Func<TKey,TValue,TValue>);Argument[2].ReturnValue;ReturnValue;value;hq-generated |
+| System.Collections.Immutable;ImmutableInterlocked;AddOrUpdate<TKey,TValue>;(System.Collections.Immutable.ImmutableDictionary<TKey,TValue>,TKey,System.Func<TKey,TValue>,System.Func<TKey,TValue,TValue>);Argument[2];Argument[2].Parameter[delegate-self];value;dfc-generated |
 | System.Collections.Immutable;ImmutableInterlocked;AddOrUpdate<TKey,TValue>;(System.Collections.Immutable.ImmutableDictionary<TKey,TValue>,TKey,System.Func<TKey,TValue>,System.Func<TKey,TValue,TValue>);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
+| System.Collections.Immutable;ImmutableInterlocked;AddOrUpdate<TKey,TValue>;(System.Collections.Immutable.ImmutableDictionary<TKey,TValue>,TKey,System.Func<TKey,TValue>,System.Func<TKey,TValue,TValue>);Argument[3].ReturnValue;ReturnValue;value;dfc-generated |
+| System.Collections.Immutable;ImmutableInterlocked;AddOrUpdate<TKey,TValue>;(System.Collections.Immutable.ImmutableDictionary<TKey,TValue>,TKey,System.Func<TKey,TValue>,System.Func<TKey,TValue,TValue>);Argument[3].ReturnValue;ReturnValue;value;hq-generated |
+| System.Collections.Immutable;ImmutableInterlocked;AddOrUpdate<TKey,TValue>;(System.Collections.Immutable.ImmutableDictionary<TKey,TValue>,TKey,System.Func<TKey,TValue>,System.Func<TKey,TValue,TValue>);Argument[3];Argument[3].Parameter[delegate-self];value;dfc-generated |
 | System.Collections.Immutable;ImmutableInterlocked;AddOrUpdate<TKey,TValue>;(System.Collections.Immutable.ImmutableDictionary<TKey,TValue>,TKey,System.Func<TKey,TValue>,System.Func<TKey,TValue,TValue>);Argument[3];Argument[3].Parameter[delegate-self];value;hq-generated |
+| System.Collections.Immutable;ImmutableInterlocked;AddOrUpdate<TKey,TValue>;(System.Collections.Immutable.ImmutableDictionary<TKey,TValue>,TKey,TValue,System.Func<TKey,TValue,TValue>);Argument[0];ReturnValue;value;dfc-generated |
+| System.Collections.Immutable;ImmutableInterlocked;AddOrUpdate<TKey,TValue>;(System.Collections.Immutable.ImmutableDictionary<TKey,TValue>,TKey,TValue,System.Func<TKey,TValue,TValue>);Argument[0];ReturnValue;value;hq-generated |
+| System.Collections.Immutable;ImmutableInterlocked;AddOrUpdate<TKey,TValue>;(System.Collections.Immutable.ImmutableDictionary<TKey,TValue>,TKey,TValue,System.Func<TKey,TValue,TValue>);Argument[1];Argument[3].Parameter[0];value;dfc-generated |
+| System.Collections.Immutable;ImmutableInterlocked;AddOrUpdate<TKey,TValue>;(System.Collections.Immutable.ImmutableDictionary<TKey,TValue>,TKey,TValue,System.Func<TKey,TValue,TValue>);Argument[1];Argument[3].Parameter[0];value;hq-generated |
+| System.Collections.Immutable;ImmutableInterlocked;AddOrUpdate<TKey,TValue>;(System.Collections.Immutable.ImmutableDictionary<TKey,TValue>,TKey,TValue,System.Func<TKey,TValue,TValue>);Argument[2];ReturnValue;value;dfc-generated |
+| System.Collections.Immutable;ImmutableInterlocked;AddOrUpdate<TKey,TValue>;(System.Collections.Immutable.ImmutableDictionary<TKey,TValue>,TKey,TValue,System.Func<TKey,TValue,TValue>);Argument[2];ReturnValue;value;hq-generated |
+| System.Collections.Immutable;ImmutableInterlocked;AddOrUpdate<TKey,TValue>;(System.Collections.Immutable.ImmutableDictionary<TKey,TValue>,TKey,TValue,System.Func<TKey,TValue,TValue>);Argument[3].ReturnValue;ReturnValue;value;dfc-generated |
+| System.Collections.Immutable;ImmutableInterlocked;AddOrUpdate<TKey,TValue>;(System.Collections.Immutable.ImmutableDictionary<TKey,TValue>,TKey,TValue,System.Func<TKey,TValue,TValue>);Argument[3].ReturnValue;ReturnValue;value;hq-generated |
+| System.Collections.Immutable;ImmutableInterlocked;AddOrUpdate<TKey,TValue>;(System.Collections.Immutable.ImmutableDictionary<TKey,TValue>,TKey,TValue,System.Func<TKey,TValue,TValue>);Argument[3];Argument[3].Parameter[delegate-self];value;dfc-generated |
 | System.Collections.Immutable;ImmutableInterlocked;AddOrUpdate<TKey,TValue>;(System.Collections.Immutable.ImmutableDictionary<TKey,TValue>,TKey,TValue,System.Func<TKey,TValue,TValue>);Argument[3];Argument[3].Parameter[delegate-self];value;hq-generated |
+| System.Collections.Immutable;ImmutableInterlocked;Enqueue<T>;(System.Collections.Immutable.ImmutableQueue<T>,T);Argument[0];ReturnValue;value;dfc-generated |
+| System.Collections.Immutable;ImmutableInterlocked;GetOrAdd<TKey,TValue,TArg>;(System.Collections.Immutable.ImmutableDictionary<TKey,TValue>,TKey,System.Func<TKey,TArg,TValue>,TArg);Argument[0];ReturnValue;value;dfc-generated |
+| System.Collections.Immutable;ImmutableInterlocked;GetOrAdd<TKey,TValue,TArg>;(System.Collections.Immutable.ImmutableDictionary<TKey,TValue>,TKey,System.Func<TKey,TArg,TValue>,TArg);Argument[0];ReturnValue;value;hq-generated |
+| System.Collections.Immutable;ImmutableInterlocked;GetOrAdd<TKey,TValue,TArg>;(System.Collections.Immutable.ImmutableDictionary<TKey,TValue>,TKey,System.Func<TKey,TArg,TValue>,TArg);Argument[1];Argument[2].Parameter[0];value;dfc-generated |
+| System.Collections.Immutable;ImmutableInterlocked;GetOrAdd<TKey,TValue,TArg>;(System.Collections.Immutable.ImmutableDictionary<TKey,TValue>,TKey,System.Func<TKey,TArg,TValue>,TArg);Argument[1];Argument[2].Parameter[0];value;hq-generated |
+| System.Collections.Immutable;ImmutableInterlocked;GetOrAdd<TKey,TValue,TArg>;(System.Collections.Immutable.ImmutableDictionary<TKey,TValue>,TKey,System.Func<TKey,TArg,TValue>,TArg);Argument[2].ReturnValue;ReturnValue;value;dfc-generated |
+| System.Collections.Immutable;ImmutableInterlocked;GetOrAdd<TKey,TValue,TArg>;(System.Collections.Immutable.ImmutableDictionary<TKey,TValue>,TKey,System.Func<TKey,TArg,TValue>,TArg);Argument[2].ReturnValue;ReturnValue;value;hq-generated |
+| System.Collections.Immutable;ImmutableInterlocked;GetOrAdd<TKey,TValue,TArg>;(System.Collections.Immutable.ImmutableDictionary<TKey,TValue>,TKey,System.Func<TKey,TArg,TValue>,TArg);Argument[2];Argument[2].Parameter[delegate-self];value;dfc-generated |
 | System.Collections.Immutable;ImmutableInterlocked;GetOrAdd<TKey,TValue,TArg>;(System.Collections.Immutable.ImmutableDictionary<TKey,TValue>,TKey,System.Func<TKey,TArg,TValue>,TArg);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
+| System.Collections.Immutable;ImmutableInterlocked;GetOrAdd<TKey,TValue,TArg>;(System.Collections.Immutable.ImmutableDictionary<TKey,TValue>,TKey,System.Func<TKey,TArg,TValue>,TArg);Argument[3];Argument[2].Parameter[1];value;dfc-generated |
+| System.Collections.Immutable;ImmutableInterlocked;GetOrAdd<TKey,TValue,TArg>;(System.Collections.Immutable.ImmutableDictionary<TKey,TValue>,TKey,System.Func<TKey,TArg,TValue>,TArg);Argument[3];Argument[2].Parameter[1];value;hq-generated |
+| System.Collections.Immutable;ImmutableInterlocked;GetOrAdd<TKey,TValue>;(System.Collections.Immutable.ImmutableDictionary<TKey,TValue>,TKey,System.Func<TKey,TValue>);Argument[0];ReturnValue;value;dfc-generated |
+| System.Collections.Immutable;ImmutableInterlocked;GetOrAdd<TKey,TValue>;(System.Collections.Immutable.ImmutableDictionary<TKey,TValue>,TKey,System.Func<TKey,TValue>);Argument[0];ReturnValue;value;hq-generated |
+| System.Collections.Immutable;ImmutableInterlocked;GetOrAdd<TKey,TValue>;(System.Collections.Immutable.ImmutableDictionary<TKey,TValue>,TKey,System.Func<TKey,TValue>);Argument[1];Argument[2].Parameter[0];value;dfc-generated |
+| System.Collections.Immutable;ImmutableInterlocked;GetOrAdd<TKey,TValue>;(System.Collections.Immutable.ImmutableDictionary<TKey,TValue>,TKey,System.Func<TKey,TValue>);Argument[1];Argument[2].Parameter[0];value;hq-generated |
+| System.Collections.Immutable;ImmutableInterlocked;GetOrAdd<TKey,TValue>;(System.Collections.Immutable.ImmutableDictionary<TKey,TValue>,TKey,System.Func<TKey,TValue>);Argument[2].ReturnValue;ReturnValue;value;dfc-generated |
+| System.Collections.Immutable;ImmutableInterlocked;GetOrAdd<TKey,TValue>;(System.Collections.Immutable.ImmutableDictionary<TKey,TValue>,TKey,System.Func<TKey,TValue>);Argument[2].ReturnValue;ReturnValue;value;hq-generated |
+| System.Collections.Immutable;ImmutableInterlocked;GetOrAdd<TKey,TValue>;(System.Collections.Immutable.ImmutableDictionary<TKey,TValue>,TKey,System.Func<TKey,TValue>);Argument[2];Argument[2].Parameter[delegate-self];value;dfc-generated |
 | System.Collections.Immutable;ImmutableInterlocked;GetOrAdd<TKey,TValue>;(System.Collections.Immutable.ImmutableDictionary<TKey,TValue>,TKey,System.Func<TKey,TValue>);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
-| System.Collections.Immutable;ImmutableInterlocked;GetOrAdd<TKey,TValue>;(System.Collections.Immutable.ImmutableDictionary<TKey,TValue>,TKey,TValue);Argument[2];ReturnValue;taint;df-generated |
+| System.Collections.Immutable;ImmutableInterlocked;GetOrAdd<TKey,TValue>;(System.Collections.Immutable.ImmutableDictionary<TKey,TValue>,TKey,TValue);Argument[0];ReturnValue;value;dfc-generated |
+| System.Collections.Immutable;ImmutableInterlocked;GetOrAdd<TKey,TValue>;(System.Collections.Immutable.ImmutableDictionary<TKey,TValue>,TKey,TValue);Argument[2];ReturnValue;value;dfc-generated |
+| System.Collections.Immutable;ImmutableInterlocked;InterlockedCompareExchange<T>;(System.Collections.Immutable.ImmutableArray<T>,System.Collections.Immutable.ImmutableArray<T>,System.Collections.Immutable.ImmutableArray<T>);Argument[0];ReturnValue;value;dfc-generated |
+| System.Collections.Immutable;ImmutableInterlocked;InterlockedExchange<T>;(System.Collections.Immutable.ImmutableArray<T>,System.Collections.Immutable.ImmutableArray<T>);Argument[0];ReturnValue;value;dfc-generated |
+| System.Collections.Immutable;ImmutableInterlocked;InterlockedInitialize<T>;(System.Collections.Immutable.ImmutableArray<T>,System.Collections.Immutable.ImmutableArray<T>);Argument[0];ReturnValue;value;dfc-generated |
+| System.Collections.Immutable;ImmutableInterlocked;Push<T>;(System.Collections.Immutable.ImmutableStack<T>,T);Argument[0];ReturnValue;value;dfc-generated |
+| System.Collections.Immutable;ImmutableInterlocked;TryAdd<TKey,TValue>;(System.Collections.Immutable.ImmutableDictionary<TKey,TValue>,TKey,TValue);Argument[0];ReturnValue;value;dfc-generated |
+| System.Collections.Immutable;ImmutableInterlocked;TryDequeue<T>;(System.Collections.Immutable.ImmutableQueue<T>,T);Argument[0];ReturnValue;value;dfc-generated |
+| System.Collections.Immutable;ImmutableInterlocked;TryPop<T>;(System.Collections.Immutable.ImmutableStack<T>,T);Argument[0];ReturnValue;value;dfc-generated |
+| System.Collections.Immutable;ImmutableInterlocked;TryRemove<TKey,TValue>;(System.Collections.Immutable.ImmutableDictionary<TKey,TValue>,TKey,TValue);Argument[0];ReturnValue;value;dfc-generated |
+| System.Collections.Immutable;ImmutableInterlocked;TryRemove<TKey,TValue>;(System.Collections.Immutable.ImmutableDictionary<TKey,TValue>,TKey,TValue);Argument[2];ReturnValue;value;dfc-generated |
+| System.Collections.Immutable;ImmutableInterlocked;TryUpdate<TKey,TValue>;(System.Collections.Immutable.ImmutableDictionary<TKey,TValue>,TKey,TValue,TValue);Argument[0];ReturnValue;value;dfc-generated |
+| System.Collections.Immutable;ImmutableInterlocked;Update<T,TArg>;(System.Collections.Immutable.ImmutableArray<T>,System.Func<System.Collections.Immutable.ImmutableArray<T>,TArg,System.Collections.Immutable.ImmutableArray<T>>,TArg);Argument[0];ReturnValue;value;dfc-generated |
+| System.Collections.Immutable;ImmutableInterlocked;Update<T,TArg>;(System.Collections.Immutable.ImmutableArray<T>,System.Func<System.Collections.Immutable.ImmutableArray<T>,TArg,System.Collections.Immutable.ImmutableArray<T>>,TArg);Argument[0];ReturnValue;value;hq-generated |
+| System.Collections.Immutable;ImmutableInterlocked;Update<T,TArg>;(System.Collections.Immutable.ImmutableArray<T>,System.Func<System.Collections.Immutable.ImmutableArray<T>,TArg,System.Collections.Immutable.ImmutableArray<T>>,TArg);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | System.Collections.Immutable;ImmutableInterlocked;Update<T,TArg>;(System.Collections.Immutable.ImmutableArray<T>,System.Func<System.Collections.Immutable.ImmutableArray<T>,TArg,System.Collections.Immutable.ImmutableArray<T>>,TArg);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
+| System.Collections.Immutable;ImmutableInterlocked;Update<T,TArg>;(System.Collections.Immutable.ImmutableArray<T>,System.Func<System.Collections.Immutable.ImmutableArray<T>,TArg,System.Collections.Immutable.ImmutableArray<T>>,TArg);Argument[2];Argument[1].Parameter[1];value;dfc-generated |
+| System.Collections.Immutable;ImmutableInterlocked;Update<T,TArg>;(System.Collections.Immutable.ImmutableArray<T>,System.Func<System.Collections.Immutable.ImmutableArray<T>,TArg,System.Collections.Immutable.ImmutableArray<T>>,TArg);Argument[2];Argument[1].Parameter[1];value;hq-generated |
+| System.Collections.Immutable;ImmutableInterlocked;Update<T,TArg>;(T,System.Func<T,TArg,T>,TArg);Argument[0];ReturnValue;value;dfc-generated |
+| System.Collections.Immutable;ImmutableInterlocked;Update<T,TArg>;(T,System.Func<T,TArg,T>,TArg);Argument[0];ReturnValue;value;hq-generated |
+| System.Collections.Immutable;ImmutableInterlocked;Update<T,TArg>;(T,System.Func<T,TArg,T>,TArg);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | System.Collections.Immutable;ImmutableInterlocked;Update<T,TArg>;(T,System.Func<T,TArg,T>,TArg);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
+| System.Collections.Immutable;ImmutableInterlocked;Update<T,TArg>;(T,System.Func<T,TArg,T>,TArg);Argument[2];Argument[1].Parameter[1];value;dfc-generated |
+| System.Collections.Immutable;ImmutableInterlocked;Update<T,TArg>;(T,System.Func<T,TArg,T>,TArg);Argument[2];Argument[1].Parameter[1];value;hq-generated |
+| System.Collections.Immutable;ImmutableInterlocked;Update<T>;(System.Collections.Immutable.ImmutableArray<T>,System.Func<System.Collections.Immutable.ImmutableArray<T>,System.Collections.Immutable.ImmutableArray<T>>);Argument[0];ReturnValue;value;dfc-generated |
+| System.Collections.Immutable;ImmutableInterlocked;Update<T>;(System.Collections.Immutable.ImmutableArray<T>,System.Func<System.Collections.Immutable.ImmutableArray<T>,System.Collections.Immutable.ImmutableArray<T>>);Argument[0];ReturnValue;value;hq-generated |
+| System.Collections.Immutable;ImmutableInterlocked;Update<T>;(System.Collections.Immutable.ImmutableArray<T>,System.Func<System.Collections.Immutable.ImmutableArray<T>,System.Collections.Immutable.ImmutableArray<T>>);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | System.Collections.Immutable;ImmutableInterlocked;Update<T>;(System.Collections.Immutable.ImmutableArray<T>,System.Func<System.Collections.Immutable.ImmutableArray<T>,System.Collections.Immutable.ImmutableArray<T>>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
+| System.Collections.Immutable;ImmutableInterlocked;Update<T>;(T,System.Func<T,T>);Argument[0];ReturnValue;value;dfc-generated |
+| System.Collections.Immutable;ImmutableInterlocked;Update<T>;(T,System.Func<T,T>);Argument[0];ReturnValue;value;hq-generated |
+| System.Collections.Immutable;ImmutableInterlocked;Update<T>;(T,System.Func<T,T>);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | System.Collections.Immutable;ImmutableInterlocked;Update<T>;(T,System.Func<T,T>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
 | System.Collections.Immutable;ImmutableList;Create<T>;(System.ReadOnlySpan<T>);Argument[0];ReturnValue;taint;df-generated |
 | System.Collections.Immutable;ImmutableList;Create<T>;(T);Argument[0];ReturnValue;taint;df-generated |
 | System.Collections.Immutable;ImmutableList;Create<T>;(T[]);Argument[0].Element;ReturnValue;taint;df-generated |
 | System.Collections.Immutable;ImmutableList;CreateRange<T>;(System.Collections.Generic.IEnumerable<T>);Argument[0].Element;ReturnValue;taint;df-generated |
+| System.Collections.Immutable;ImmutableList;IndexOf<T>;(System.Collections.Immutable.IImmutableList<T>,T,System.Collections.Generic.IEqualityComparer<T>);Argument[0].Element;Argument[2];taint;df-generated |
+| System.Collections.Immutable;ImmutableList;IndexOf<T>;(System.Collections.Immutable.IImmutableList<T>,T,System.Collections.Generic.IEqualityComparer<T>);Argument[1];Argument[2];taint;df-generated |
+| System.Collections.Immutable;ImmutableList;LastIndexOf<T>;(System.Collections.Immutable.IImmutableList<T>,T,System.Collections.Generic.IEqualityComparer<T>);Argument[0].Element;Argument[2];taint;df-generated |
+| System.Collections.Immutable;ImmutableList;LastIndexOf<T>;(System.Collections.Immutable.IImmutableList<T>,T,System.Collections.Generic.IEqualityComparer<T>);Argument[1];Argument[2];taint;df-generated |
 | System.Collections.Immutable;ImmutableList;Remove<T>;(System.Collections.Immutable.IImmutableList<T>,T);Argument[0].Element;ReturnValue;taint;df-generated |
 | System.Collections.Immutable;ImmutableList;RemoveRange<T>;(System.Collections.Immutable.IImmutableList<T>,System.Collections.Generic.IEnumerable<T>);Argument[0].Element;ReturnValue;taint;df-generated |
 | System.Collections.Immutable;ImmutableList;Replace<T>;(System.Collections.Immutable.IImmutableList<T>,T,T);Argument[0].Element;ReturnValue;taint;df-generated |
@@ -4656,16 +5303,26 @@
 | System.Collections.Immutable;ImmutableList<T>+Builder;FindLastIndex;(System.Int32,System.Int32,System.Predicate<T>);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
 | System.Collections.Immutable;ImmutableList<T>+Builder;FindLastIndex;(System.Int32,System.Predicate<T>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
 | System.Collections.Immutable;ImmutableList<T>+Builder;FindLastIndex;(System.Predicate<T>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
+| System.Collections.Immutable;ImmutableList<T>+Builder;ForEach;(System.Action<T>);Argument[0];Argument[0].Parameter[delegate-self];value;dfc-generated |
 | System.Collections.Immutable;ImmutableList<T>+Builder;ForEach;(System.Action<T>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
+| System.Collections.Immutable;ImmutableList<T>+Builder;ForEach;(System.Action<T>);Argument[this].Element;Argument[0].Parameter[0];value;dfc-generated |
+| System.Collections.Immutable;ImmutableList<T>+Builder;ForEach;(System.Action<T>);Argument[this].Element;Argument[0].Parameter[0];value;hq-generated |
 | System.Collections.Immutable;ImmutableList<T>+Builder;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.Immutable.ImmutableList`1+Enumerator.Current];value;manual |
 | System.Collections.Immutable;ImmutableList<T>+Builder;GetRange;(System.Int32,System.Int32);Argument[this].Element;ReturnValue.Element;value;manual |
+| System.Collections.Immutable;ImmutableList<T>+Builder;IndexOf;(T,System.Int32,System.Int32,System.Collections.Generic.IEqualityComparer<T>);Argument[0];Argument[3];taint;df-generated |
 | System.Collections.Immutable;ImmutableList<T>+Builder;InsertRange;(System.Int32,System.Collections.Generic.IEnumerable<T>);Argument[1].Element;Argument[this].Element;value;manual |
+| System.Collections.Immutable;ImmutableList<T>+Builder;LastIndexOf;(T,System.Int32,System.Int32,System.Collections.Generic.IEqualityComparer<T>);Argument[0];Argument[3];taint;df-generated |
+| System.Collections.Immutable;ImmutableList<T>+Builder;Remove;(T,System.Collections.Generic.IEqualityComparer<T>);Argument[0];Argument[1];taint;df-generated |
 | System.Collections.Immutable;ImmutableList<T>+Builder;RemoveAll;(System.Predicate<T>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Collections.Immutable;ImmutableList<T>+Builder;Replace;(T,T);Argument[1];Argument[this];taint;df-generated |
+| System.Collections.Immutable;ImmutableList<T>+Builder;Replace;(T,T,System.Collections.Generic.IEqualityComparer<T>);Argument[0];Argument[2];taint;df-generated |
 | System.Collections.Immutable;ImmutableList<T>+Builder;Replace;(T,T,System.Collections.Generic.IEqualityComparer<T>);Argument[1];Argument[this];taint;df-generated |
 | System.Collections.Immutable;ImmutableList<T>+Builder;Sort;(System.Comparison<T>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Collections.Immutable;ImmutableList<T>+Builder;TrueForAll;(System.Predicate<T>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
+| System.Collections.Immutable;ImmutableList<T>+Enumerator;get_Current;();Argument[this].Property[System.Collections.Immutable.ImmutableList`1+Enumerator.Current];ReturnValue;value;df-generated |
+| System.Collections.Immutable;ImmutableList<T>+Enumerator;get_Current;();Argument[this].Property[System.Collections.Immutable.ImmutableList`1+Enumerator.Current];ReturnValue;value;dfc-generated |
 | System.Collections.Immutable;ImmutableList<T>+Enumerator;get_Current;();Argument[this];ReturnValue;taint;df-generated |
+| System.Collections.Immutable;ImmutableList<T>+Enumerator;get_Current;();Argument[this];ReturnValue;taint;dfc-generated |
 | System.Collections.Immutable;ImmutableList<T>;Add;(T);Argument[0];Argument[this].Element;value;manual |
 | System.Collections.Immutable;ImmutableList<T>;AddRange;(System.Collections.Generic.IEnumerable<T>);Argument[0].Element;Argument[this].Element;value;manual |
 | System.Collections.Immutable;ImmutableList<T>;BinarySearch;(System.Int32,System.Int32,T,System.Collections.Generic.IComparer<T>);Argument[2];Argument[3];taint;df-generated |
@@ -4690,12 +5347,18 @@
 | System.Collections.Immutable;ImmutableList<T>;FindLastIndex;(System.Int32,System.Int32,System.Predicate<T>);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
 | System.Collections.Immutable;ImmutableList<T>;FindLastIndex;(System.Int32,System.Predicate<T>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
 | System.Collections.Immutable;ImmutableList<T>;FindLastIndex;(System.Predicate<T>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
+| System.Collections.Immutable;ImmutableList<T>;ForEach;(System.Action<T>);Argument[0];Argument[0].Parameter[delegate-self];value;dfc-generated |
 | System.Collections.Immutable;ImmutableList<T>;ForEach;(System.Action<T>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
+| System.Collections.Immutable;ImmutableList<T>;ForEach;(System.Action<T>);Argument[this].Element;Argument[0].Parameter[0];value;dfc-generated |
+| System.Collections.Immutable;ImmutableList<T>;ForEach;(System.Action<T>);Argument[this].Element;Argument[0].Parameter[0];value;hq-generated |
 | System.Collections.Immutable;ImmutableList<T>;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.Immutable.ImmutableList`1+Enumerator.Current];value;manual |
 | System.Collections.Immutable;ImmutableList<T>;GetRange;(System.Int32,System.Int32);Argument[this].Element;ReturnValue.Element;value;manual |
+| System.Collections.Immutable;ImmutableList<T>;IndexOf;(T,System.Int32,System.Int32,System.Collections.Generic.IEqualityComparer<T>);Argument[0];Argument[3];taint;df-generated |
 | System.Collections.Immutable;ImmutableList<T>;Insert;(System.Int32,T);Argument[1];Argument[this].Element;value;manual |
 | System.Collections.Immutable;ImmutableList<T>;InsertRange;(System.Int32,System.Collections.Generic.IEnumerable<T>);Argument[1].Element;Argument[this].Element;value;manual |
+| System.Collections.Immutable;ImmutableList<T>;LastIndexOf;(T,System.Int32,System.Int32,System.Collections.Generic.IEqualityComparer<T>);Argument[0];Argument[3];taint;df-generated |
 | System.Collections.Immutable;ImmutableList<T>;Remove;(T);Argument[this];ReturnValue;taint;df-generated |
+| System.Collections.Immutable;ImmutableList<T>;Remove;(T,System.Collections.Generic.IEqualityComparer<T>);Argument[0];Argument[1];taint;df-generated |
 | System.Collections.Immutable;ImmutableList<T>;Remove;(T,System.Collections.Generic.IEqualityComparer<T>);Argument[this];ReturnValue;taint;df-generated |
 | System.Collections.Immutable;ImmutableList<T>;RemoveAll;(System.Predicate<T>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Collections.Immutable;ImmutableList<T>;RemoveAt;(System.Int32);Argument[this];ReturnValue;taint;df-generated |
@@ -4706,6 +5369,7 @@
 | System.Collections.Immutable;ImmutableList<T>;Replace;(T,T);Argument[1];Argument[this];taint;df-generated |
 | System.Collections.Immutable;ImmutableList<T>;Replace;(T,T);Argument[1];ReturnValue;taint;df-generated |
 | System.Collections.Immutable;ImmutableList<T>;Replace;(T,T);Argument[this];ReturnValue;taint;df-generated |
+| System.Collections.Immutable;ImmutableList<T>;Replace;(T,T,System.Collections.Generic.IEqualityComparer<T>);Argument[0];Argument[2];taint;df-generated |
 | System.Collections.Immutable;ImmutableList<T>;Replace;(T,T,System.Collections.Generic.IEqualityComparer<T>);Argument[1];Argument[this];taint;df-generated |
 | System.Collections.Immutable;ImmutableList<T>;Replace;(T,T,System.Collections.Generic.IEqualityComparer<T>);Argument[1];ReturnValue;taint;df-generated |
 | System.Collections.Immutable;ImmutableList<T>;Replace;(T,T,System.Collections.Generic.IEqualityComparer<T>);Argument[this];ReturnValue;taint;df-generated |
@@ -4714,10 +5378,13 @@
 | System.Collections.Immutable;ImmutableList<T>;SetItem;(System.Int32,T);Argument[1];Argument[this];taint;df-generated |
 | System.Collections.Immutable;ImmutableList<T>;SetItem;(System.Int32,T);Argument[1];ReturnValue;taint;df-generated |
 | System.Collections.Immutable;ImmutableList<T>;SetItem;(System.Int32,T);Argument[this];ReturnValue;taint;df-generated |
-| System.Collections.Immutable;ImmutableList<T>;Sort;();Argument[this];ReturnValue;taint;df-generated |
-| System.Collections.Immutable;ImmutableList<T>;Sort;(System.Collections.Generic.IComparer<T>);Argument[this];ReturnValue;taint;df-generated |
+| System.Collections.Immutable;ImmutableList<T>;Sort;();Argument[this];ReturnValue;value;dfc-generated |
+| System.Collections.Immutable;ImmutableList<T>;Sort;(System.Collections.Generic.IComparer<T>);Argument[this];ReturnValue;value;dfc-generated |
+| System.Collections.Immutable;ImmutableList<T>;Sort;(System.Comparison<T>);Argument[0];Argument[0].Parameter[delegate-self];value;dfc-generated |
 | System.Collections.Immutable;ImmutableList<T>;Sort;(System.Comparison<T>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
-| System.Collections.Immutable;ImmutableList<T>;Sort;(System.Int32,System.Int32,System.Collections.Generic.IComparer<T>);Argument[this];ReturnValue;taint;df-generated |
+| System.Collections.Immutable;ImmutableList<T>;Sort;(System.Comparison<T>);Argument[this];ReturnValue;value;dfc-generated |
+| System.Collections.Immutable;ImmutableList<T>;Sort;(System.Comparison<T>);Argument[this];ReturnValue;value;hq-generated |
+| System.Collections.Immutable;ImmutableList<T>;Sort;(System.Int32,System.Int32,System.Collections.Generic.IComparer<T>);Argument[this];ReturnValue;value;dfc-generated |
 | System.Collections.Immutable;ImmutableList<T>;ToBuilder;();Argument[this];ReturnValue;taint;df-generated |
 | System.Collections.Immutable;ImmutableList<T>;TrueForAll;(System.Predicate<T>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Collections.Immutable;ImmutableList<T>;get_Item;(System.Int32);Argument[this].Element;ReturnValue;value;manual |
@@ -4729,10 +5396,9 @@
 | System.Collections.Immutable;ImmutableQueue<T>+Enumerator;get_Current;();Argument[this];ReturnValue;taint;df-generated |
 | System.Collections.Immutable;ImmutableQueue<T>;Dequeue;();Argument[this];ReturnValue;taint;df-generated |
 | System.Collections.Immutable;ImmutableQueue<T>;Dequeue;(T);Argument[this];ReturnValue;taint;df-generated |
-| System.Collections.Immutable;ImmutableQueue<T>;Enqueue;(T);Argument[0];ReturnValue;taint;df-generated |
-| System.Collections.Immutable;ImmutableQueue<T>;Enqueue;(T);Argument[this];ReturnValue;taint;df-generated |
+| System.Collections.Immutable;ImmutableQueue<T>;Enqueue;(T);Argument[0];ReturnValue.SyntheticField[System.Collections.Immutable.ImmutableQueue`1._forwards].SyntheticField[System.Collections.Immutable.ImmutableStack`1._head];value;dfc-generated |
 | System.Collections.Immutable;ImmutableQueue<T>;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.Immutable.ImmutableQueue`1+Enumerator.Current];value;manual |
-| System.Collections.Immutable;ImmutableQueue<T>;Peek;();Argument[this];ReturnValue;taint;df-generated |
+| System.Collections.Immutable;ImmutableQueue<T>;Peek;();Argument[this].SyntheticField[System.Collections.Immutable.ImmutableQueue`1._forwards].SyntheticField[System.Collections.Immutable.ImmutableStack`1._head];ReturnValue;value;dfc-generated |
 | System.Collections.Immutable;ImmutableSortedDictionary;Create<TKey,TValue>;(System.Collections.Generic.IComparer<TKey>);Argument[0];ReturnValue;taint;df-generated |
 | System.Collections.Immutable;ImmutableSortedDictionary;Create<TKey,TValue>;(System.Collections.Generic.IComparer<TKey>,System.Collections.Generic.IEqualityComparer<TValue>);Argument[0];ReturnValue;taint;df-generated |
 | System.Collections.Immutable;ImmutableSortedDictionary;Create<TKey,TValue>;(System.Collections.Generic.IComparer<TKey>,System.Collections.Generic.IEqualityComparer<TValue>);Argument[1];ReturnValue;taint;df-generated |
@@ -4761,9 +5427,9 @@
 | System.Collections.Immutable;ImmutableSortedDictionary<TKey,TValue>+Builder;Add;(System.Collections.Generic.KeyValuePair<TKey,TValue>);Argument[0].Property[System.Collections.Generic.KeyValuePair`2.Value];Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Value];value;manual |
 | System.Collections.Immutable;ImmutableSortedDictionary<TKey,TValue>+Builder;AddRange;(System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<TKey,TValue>>);Argument[0].Element;Argument[this].Element;value;manual |
 | System.Collections.Immutable;ImmutableSortedDictionary<TKey,TValue>+Builder;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.Immutable.ImmutableSortedDictionary`2+Enumerator.Current];value;manual |
-| System.Collections.Immutable;ImmutableSortedDictionary<TKey,TValue>+Builder;GetValueOrDefault;(TKey,TValue);Argument[1];ReturnValue;taint;df-generated |
-| System.Collections.Immutable;ImmutableSortedDictionary<TKey,TValue>+Builder;TryGetKey;(TKey,TKey);Argument[0];ReturnValue;taint;df-generated |
-| System.Collections.Immutable;ImmutableSortedDictionary<TKey,TValue>+Builder;TryGetKey;(TKey,TKey);Argument[this];ReturnValue;taint;df-generated |
+| System.Collections.Immutable;ImmutableSortedDictionary<TKey,TValue>+Builder;GetValueOrDefault;(TKey,TValue);Argument[1];ReturnValue;value;dfc-generated |
+| System.Collections.Immutable;ImmutableSortedDictionary<TKey,TValue>+Builder;TryGetKey;(TKey,TKey);Argument[0];ReturnValue;value;dfc-generated |
+| System.Collections.Immutable;ImmutableSortedDictionary<TKey,TValue>+Builder;TryGetValue;(TKey,TValue);Argument[1];ReturnValue;value;dfc-generated |
 | System.Collections.Immutable;ImmutableSortedDictionary<TKey,TValue>+Builder;get_Keys;();Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Key];ReturnValue.Element;value;manual |
 | System.Collections.Immutable;ImmutableSortedDictionary<TKey,TValue>+Builder;get_Values;();Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Value];ReturnValue.Element;value;manual |
 | System.Collections.Immutable;ImmutableSortedDictionary<TKey,TValue>+Enumerator;get_Current;();Argument[this];ReturnValue;taint;df-generated |
@@ -4772,27 +5438,26 @@
 | System.Collections.Immutable;ImmutableSortedDictionary<TKey,TValue>;Add;(TKey,TValue);Argument[0];Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Key];value;manual |
 | System.Collections.Immutable;ImmutableSortedDictionary<TKey,TValue>;Add;(TKey,TValue);Argument[1];Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Value];value;manual |
 | System.Collections.Immutable;ImmutableSortedDictionary<TKey,TValue>;AddRange;(System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<TKey,TValue>>);Argument[0].Element;Argument[this].Element;value;manual |
-| System.Collections.Immutable;ImmutableSortedDictionary<TKey,TValue>;Clear;();Argument[this];ReturnValue;taint;df-generated |
+| System.Collections.Immutable;ImmutableSortedDictionary<TKey,TValue>;Clear;();Argument[this].SyntheticField[System.Collections.Immutable.ImmutableSortedDictionary`2._keyComparer];ReturnValue.SyntheticField[System.Collections.Immutable.ImmutableSortedDictionary`2._keyComparer];value;dfc-generated |
+| System.Collections.Immutable;ImmutableSortedDictionary<TKey,TValue>;Clear;();Argument[this].SyntheticField[System.Collections.Immutable.ImmutableSortedDictionary`2._valueComparer];ReturnValue.SyntheticField[System.Collections.Immutable.ImmutableSortedDictionary`2._valueComparer];value;dfc-generated |
+| System.Collections.Immutable;ImmutableSortedDictionary<TKey,TValue>;Clear;();Argument[this];ReturnValue;value;dfc-generated |
 | System.Collections.Immutable;ImmutableSortedDictionary<TKey,TValue>;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.Immutable.ImmutableSortedDictionary`2+Enumerator.Current];value;manual |
 | System.Collections.Immutable;ImmutableSortedDictionary<TKey,TValue>;Remove;(TKey);Argument[this];ReturnValue;taint;df-generated |
 | System.Collections.Immutable;ImmutableSortedDictionary<TKey,TValue>;RemoveRange;(System.Collections.Generic.IEnumerable<TKey>);Argument[this];ReturnValue;taint;df-generated |
-| System.Collections.Immutable;ImmutableSortedDictionary<TKey,TValue>;SetItem;(TKey,TValue);Argument[0];Argument[this];taint;df-generated |
-| System.Collections.Immutable;ImmutableSortedDictionary<TKey,TValue>;SetItem;(TKey,TValue);Argument[0];ReturnValue;taint;df-generated |
-| System.Collections.Immutable;ImmutableSortedDictionary<TKey,TValue>;SetItem;(TKey,TValue);Argument[1];Argument[this];taint;df-generated |
-| System.Collections.Immutable;ImmutableSortedDictionary<TKey,TValue>;SetItem;(TKey,TValue);Argument[1];ReturnValue;taint;df-generated |
-| System.Collections.Immutable;ImmutableSortedDictionary<TKey,TValue>;SetItem;(TKey,TValue);Argument[this];ReturnValue;taint;df-generated |
+| System.Collections.Immutable;ImmutableSortedDictionary<TKey,TValue>;SetItem;(TKey,TValue);Argument[0];ReturnValue.SyntheticField[System.Collections.Immutable.ImmutableSortedDictionary`2._root].SyntheticField[System.Collections.Immutable.ImmutableSortedDictionary`2+Node._key];value;dfc-generated |
 | System.Collections.Immutable;ImmutableSortedDictionary<TKey,TValue>;SetItems;(System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<TKey,TValue>>);Argument[0].Element;ReturnValue;taint;df-generated |
 | System.Collections.Immutable;ImmutableSortedDictionary<TKey,TValue>;SetItems;(System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<TKey,TValue>>);Argument[this];ReturnValue;taint;df-generated |
 | System.Collections.Immutable;ImmutableSortedDictionary<TKey,TValue>;ToBuilder;();Argument[this];ReturnValue;taint;df-generated |
-| System.Collections.Immutable;ImmutableSortedDictionary<TKey,TValue>;TryGetKey;(TKey,TKey);Argument[0];ReturnValue;taint;df-generated |
-| System.Collections.Immutable;ImmutableSortedDictionary<TKey,TValue>;TryGetKey;(TKey,TKey);Argument[this];ReturnValue;taint;df-generated |
-| System.Collections.Immutable;ImmutableSortedDictionary<TKey,TValue>;WithComparers;(System.Collections.Generic.IComparer<TKey>);Argument[0];ReturnValue;taint;df-generated |
-| System.Collections.Immutable;ImmutableSortedDictionary<TKey,TValue>;WithComparers;(System.Collections.Generic.IComparer<TKey>);Argument[this];ReturnValue;taint;df-generated |
-| System.Collections.Immutable;ImmutableSortedDictionary<TKey,TValue>;WithComparers;(System.Collections.Generic.IComparer<TKey>,System.Collections.Generic.IEqualityComparer<TValue>);Argument[this];ReturnValue;value;df-generated |
+| System.Collections.Immutable;ImmutableSortedDictionary<TKey,TValue>;TryGetKey;(TKey,TKey);Argument[0];ReturnValue;value;dfc-generated |
+| System.Collections.Immutable;ImmutableSortedDictionary<TKey,TValue>;TryGetKey;(TKey,TKey);Argument[this].SyntheticField[System.Collections.Immutable.ImmutableSortedDictionary`2._root].SyntheticField[System.Collections.Immutable.ImmutableSortedDictionary`2+Node._key];ReturnValue;value;dfc-generated |
+| System.Collections.Immutable;ImmutableSortedDictionary<TKey,TValue>;TryGetValue;(TKey,TValue);Argument[1];ReturnValue;value;dfc-generated |
+| System.Collections.Immutable;ImmutableSortedDictionary<TKey,TValue>;WithComparers;(System.Collections.Generic.IComparer<TKey>);Argument[0];ReturnValue.SyntheticField[System.Collections.Immutable.ImmutableSortedDictionary`2._keyComparer];value;dfc-generated |
+| System.Collections.Immutable;ImmutableSortedDictionary<TKey,TValue>;WithComparers;(System.Collections.Generic.IComparer<TKey>,System.Collections.Generic.IEqualityComparer<TValue>);Argument[0];ReturnValue.SyntheticField[System.Collections.Immutable.ImmutableSortedDictionary`2._keyComparer];value;dfc-generated |
+| System.Collections.Immutable;ImmutableSortedDictionary<TKey,TValue>;WithComparers;(System.Collections.Generic.IComparer<TKey>,System.Collections.Generic.IEqualityComparer<TValue>);Argument[1];ReturnValue.SyntheticField[System.Collections.Immutable.ImmutableSortedDictionary`2._valueComparer];value;dfc-generated |
 | System.Collections.Immutable;ImmutableSortedDictionary<TKey,TValue>;get_Item;(TKey);Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Value];ReturnValue;value;manual |
-| System.Collections.Immutable;ImmutableSortedDictionary<TKey,TValue>;get_KeyComparer;();Argument[this];ReturnValue;taint;df-generated |
+| System.Collections.Immutable;ImmutableSortedDictionary<TKey,TValue>;get_KeyComparer;();Argument[this].SyntheticField[System.Collections.Immutable.ImmutableSortedDictionary`2._keyComparer];ReturnValue;value;dfc-generated |
 | System.Collections.Immutable;ImmutableSortedDictionary<TKey,TValue>;get_Keys;();Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Key];ReturnValue.Element;value;manual |
-| System.Collections.Immutable;ImmutableSortedDictionary<TKey,TValue>;get_ValueComparer;();Argument[this];ReturnValue;taint;df-generated |
+| System.Collections.Immutable;ImmutableSortedDictionary<TKey,TValue>;get_ValueComparer;();Argument[this].SyntheticField[System.Collections.Immutable.ImmutableSortedDictionary`2._valueComparer];ReturnValue;value;dfc-generated |
 | System.Collections.Immutable;ImmutableSortedDictionary<TKey,TValue>;get_Values;();Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Value];ReturnValue.Element;value;manual |
 | System.Collections.Immutable;ImmutableSortedSet;Create<T>;(System.Collections.Generic.IComparer<T>);Argument[0];ReturnValue;taint;df-generated |
 | System.Collections.Immutable;ImmutableSortedSet;Create<T>;(System.Collections.Generic.IComparer<T>,System.ReadOnlySpan<T>);Argument[0];ReturnValue;taint;df-generated |
@@ -4812,36 +5477,39 @@
 | System.Collections.Immutable;ImmutableSortedSet;ToImmutableSortedSet<TSource>;(System.Collections.Generic.IEnumerable<TSource>,System.Collections.Generic.IComparer<TSource>);Argument[0].Element;ReturnValue;taint;df-generated |
 | System.Collections.Immutable;ImmutableSortedSet;ToImmutableSortedSet<TSource>;(System.Collections.Generic.IEnumerable<TSource>,System.Collections.Generic.IComparer<TSource>);Argument[1];ReturnValue;taint;df-generated |
 | System.Collections.Immutable;ImmutableSortedSet<T>+Builder;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.Immutable.ImmutableSortedSet`1+Enumerator.Current];value;manual |
-| System.Collections.Immutable;ImmutableSortedSet<T>+Builder;IntersectWith;(System.Collections.Generic.IEnumerable<T>);Argument[0].Element;Argument[this];taint;df-generated |
+| System.Collections.Immutable;ImmutableSortedSet<T>+Builder;IntersectWith;(System.Collections.Generic.IEnumerable<T>);Argument[0].Element;Argument[this].SyntheticField[System.Collections.Immutable.ImmutableSortedSet`1+Builder._root].SyntheticField[System.Collections.Immutable.ImmutableSortedSet`1+Node._key];value;dfc-generated |
 | System.Collections.Immutable;ImmutableSortedSet<T>+Builder;Reverse;();Argument[this].Element;ReturnValue.Element;value;manual |
-| System.Collections.Immutable;ImmutableSortedSet<T>+Builder;SymmetricExceptWith;(System.Collections.Generic.IEnumerable<T>);Argument[0].Element;Argument[this];taint;df-generated |
-| System.Collections.Immutable;ImmutableSortedSet<T>+Builder;TryGetValue;(T,T);Argument[0];ReturnValue;taint;df-generated |
-| System.Collections.Immutable;ImmutableSortedSet<T>+Builder;TryGetValue;(T,T);Argument[this];ReturnValue;taint;df-generated |
-| System.Collections.Immutable;ImmutableSortedSet<T>+Builder;UnionWith;(System.Collections.Generic.IEnumerable<T>);Argument[0].Element;Argument[this];taint;df-generated |
-| System.Collections.Immutable;ImmutableSortedSet<T>+Builder;get_Max;();Argument[this];ReturnValue;taint;df-generated |
-| System.Collections.Immutable;ImmutableSortedSet<T>+Builder;get_Min;();Argument[this];ReturnValue;taint;df-generated |
+| System.Collections.Immutable;ImmutableSortedSet<T>+Builder;SymmetricExceptWith;(System.Collections.Generic.IEnumerable<T>);Argument[0].Element;Argument[this].SyntheticField[System.Collections.Immutable.ImmutableSortedSet`1+Builder._root].SyntheticField[System.Collections.Immutable.ImmutableSortedSet`1+Node._key];value;dfc-generated |
+| System.Collections.Immutable;ImmutableSortedSet<T>+Builder;TryGetValue;(T,T);Argument[0];ReturnValue;value;dfc-generated |
+| System.Collections.Immutable;ImmutableSortedSet<T>+Builder;TryGetValue;(T,T);Argument[this].SyntheticField[System.Collections.Immutable.ImmutableSortedSet`1+Builder._root].SyntheticField[System.Collections.Immutable.ImmutableSortedSet`1+Node._key];ReturnValue;value;dfc-generated |
+| System.Collections.Immutable;ImmutableSortedSet<T>+Builder;UnionWith;(System.Collections.Generic.IEnumerable<T>);Argument[0].Element;Argument[this].SyntheticField[System.Collections.Immutable.ImmutableSortedSet`1+Builder._root].SyntheticField[System.Collections.Immutable.ImmutableSortedSet`1+Node._key];value;dfc-generated |
+| System.Collections.Immutable;ImmutableSortedSet<T>+Builder;get_Max;();Argument[this].SyntheticField[System.Collections.Immutable.ImmutableSortedSet`1+Builder._root].SyntheticField[System.Collections.Immutable.ImmutableSortedSet`1+Node._key];ReturnValue;value;dfc-generated |
+| System.Collections.Immutable;ImmutableSortedSet<T>+Builder;get_Min;();Argument[this].SyntheticField[System.Collections.Immutable.ImmutableSortedSet`1+Builder._root].SyntheticField[System.Collections.Immutable.ImmutableSortedSet`1+Node._key];ReturnValue;value;dfc-generated |
+| System.Collections.Immutable;ImmutableSortedSet<T>+Enumerator;get_Current;();Argument[this].Property[System.Collections.Immutable.ImmutableSortedSet`1+Enumerator.Current];ReturnValue;value;df-generated |
+| System.Collections.Immutable;ImmutableSortedSet<T>+Enumerator;get_Current;();Argument[this].Property[System.Collections.Immutable.ImmutableSortedSet`1+Enumerator.Current];ReturnValue;value;dfc-generated |
 | System.Collections.Immutable;ImmutableSortedSet<T>+Enumerator;get_Current;();Argument[this];ReturnValue;taint;df-generated |
+| System.Collections.Immutable;ImmutableSortedSet<T>+Enumerator;get_Current;();Argument[this];ReturnValue;taint;dfc-generated |
 | System.Collections.Immutable;ImmutableSortedSet<T>;Add;(T);Argument[0];Argument[this].Element;value;manual |
-| System.Collections.Immutable;ImmutableSortedSet<T>;Clear;();Argument[this];ReturnValue;taint;df-generated |
+| System.Collections.Immutable;ImmutableSortedSet<T>;Clear;();Argument[this].SyntheticField[System.Collections.Immutable.ImmutableSortedSet`1._comparer];ReturnValue.SyntheticField[System.Collections.Immutable.ImmutableSortedSet`1._comparer];value;dfc-generated |
+| System.Collections.Immutable;ImmutableSortedSet<T>;Clear;();Argument[this];ReturnValue;value;dfc-generated |
 | System.Collections.Immutable;ImmutableSortedSet<T>;Except;(System.Collections.Generic.IEnumerable<T>);Argument[this];ReturnValue;taint;df-generated |
 | System.Collections.Immutable;ImmutableSortedSet<T>;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.Immutable.ImmutableSortedSet`1+Enumerator.Current];value;manual |
 | System.Collections.Immutable;ImmutableSortedSet<T>;Intersect;(System.Collections.Generic.IEnumerable<T>);Argument[this];ReturnValue;taint;df-generated |
 | System.Collections.Immutable;ImmutableSortedSet<T>;Remove;(T);Argument[this];ReturnValue;taint;df-generated |
 | System.Collections.Immutable;ImmutableSortedSet<T>;Reverse;();Argument[this].Element;ReturnValue.Element;value;manual |
-| System.Collections.Immutable;ImmutableSortedSet<T>;SymmetricExcept;(System.Collections.Generic.IEnumerable<T>);Argument[0].Element;Argument[this];taint;df-generated |
-| System.Collections.Immutable;ImmutableSortedSet<T>;SymmetricExcept;(System.Collections.Generic.IEnumerable<T>);Argument[0].Element;ReturnValue;taint;df-generated |
-| System.Collections.Immutable;ImmutableSortedSet<T>;SymmetricExcept;(System.Collections.Generic.IEnumerable<T>);Argument[this];ReturnValue;taint;df-generated |
+| System.Collections.Immutable;ImmutableSortedSet<T>;SymmetricExcept;(System.Collections.Generic.IEnumerable<T>);Argument[0].Element;Argument[this].Element;value;dfc-generated |
+| System.Collections.Immutable;ImmutableSortedSet<T>;SymmetricExcept;(System.Collections.Generic.IEnumerable<T>);Argument[0].Element;ReturnValue.SyntheticField[System.Collections.Immutable.ImmutableSortedSet`1._root].SyntheticField[System.Collections.Immutable.ImmutableSortedSet`1+Node._key];value;dfc-generated |
 | System.Collections.Immutable;ImmutableSortedSet<T>;ToBuilder;();Argument[this];ReturnValue;taint;df-generated |
-| System.Collections.Immutable;ImmutableSortedSet<T>;TryGetValue;(T,T);Argument[0];ReturnValue;taint;df-generated |
-| System.Collections.Immutable;ImmutableSortedSet<T>;TryGetValue;(T,T);Argument[this];ReturnValue;taint;df-generated |
+| System.Collections.Immutable;ImmutableSortedSet<T>;TryGetValue;(T,T);Argument[0];ReturnValue;value;dfc-generated |
+| System.Collections.Immutable;ImmutableSortedSet<T>;TryGetValue;(T,T);Argument[this].SyntheticField[System.Collections.Immutable.ImmutableSortedSet`1._root].SyntheticField[System.Collections.Immutable.ImmutableSortedSet`1+Node._key];ReturnValue;value;dfc-generated |
 | System.Collections.Immutable;ImmutableSortedSet<T>;Union;(System.Collections.Generic.IEnumerable<T>);Argument[0].Element;ReturnValue;taint;df-generated |
 | System.Collections.Immutable;ImmutableSortedSet<T>;Union;(System.Collections.Generic.IEnumerable<T>);Argument[this];ReturnValue;taint;df-generated |
 | System.Collections.Immutable;ImmutableSortedSet<T>;Union;(System.Collections.Generic.IEnumerable<T>);Argument[this];ReturnValue;value;df-generated |
-| System.Collections.Immutable;ImmutableSortedSet<T>;WithComparer;(System.Collections.Generic.IComparer<T>);Argument[this];ReturnValue;value;df-generated |
+| System.Collections.Immutable;ImmutableSortedSet<T>;WithComparer;(System.Collections.Generic.IComparer<T>);Argument[0];ReturnValue.SyntheticField[System.Collections.Immutable.ImmutableSortedSet`1._comparer];value;dfc-generated |
 | System.Collections.Immutable;ImmutableSortedSet<T>;get_Item;(System.Int32);Argument[this].Element;ReturnValue;value;manual |
-| System.Collections.Immutable;ImmutableSortedSet<T>;get_KeyComparer;();Argument[this];ReturnValue;taint;df-generated |
-| System.Collections.Immutable;ImmutableSortedSet<T>;get_Max;();Argument[this];ReturnValue;taint;df-generated |
-| System.Collections.Immutable;ImmutableSortedSet<T>;get_Min;();Argument[this];ReturnValue;taint;df-generated |
+| System.Collections.Immutable;ImmutableSortedSet<T>;get_KeyComparer;();Argument[this].SyntheticField[System.Collections.Immutable.ImmutableSortedSet`1._comparer];ReturnValue;value;dfc-generated |
+| System.Collections.Immutable;ImmutableSortedSet<T>;get_Max;();Argument[this].SyntheticField[System.Collections.Immutable.ImmutableSortedSet`1._root].SyntheticField[System.Collections.Immutable.ImmutableSortedSet`1+Node._key];ReturnValue;value;dfc-generated |
+| System.Collections.Immutable;ImmutableSortedSet<T>;get_Min;();Argument[this].SyntheticField[System.Collections.Immutable.ImmutableSortedSet`1._root].SyntheticField[System.Collections.Immutable.ImmutableSortedSet`1+Node._key];ReturnValue;value;dfc-generated |
 | System.Collections.Immutable;ImmutableStack;Create<T>;(System.ReadOnlySpan<T>);Argument[0];ReturnValue;taint;df-generated |
 | System.Collections.Immutable;ImmutableStack;Create<T>;(T);Argument[0];ReturnValue;taint;df-generated |
 | System.Collections.Immutable;ImmutableStack;Create<T>;(T[]);Argument[0].Element;ReturnValue;taint;df-generated |
@@ -4849,39 +5517,39 @@
 | System.Collections.Immutable;ImmutableStack;Pop<T>;(System.Collections.Immutable.IImmutableStack<T>,T);Argument[0].Element;ReturnValue;taint;df-generated |
 | System.Collections.Immutable;ImmutableStack<T>+Enumerator;get_Current;();Argument[this];ReturnValue;taint;df-generated |
 | System.Collections.Immutable;ImmutableStack<T>;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.Immutable.ImmutableStack`1+Enumerator.Current];value;manual |
-| System.Collections.Immutable;ImmutableStack<T>;Peek;();Argument[this];ReturnValue;taint;df-generated |
-| System.Collections.Immutable;ImmutableStack<T>;Pop;();Argument[this];ReturnValue;taint;df-generated |
-| System.Collections.Immutable;ImmutableStack<T>;Pop;(T);Argument[this];ReturnValue;taint;df-generated |
-| System.Collections.Immutable;ImmutableStack<T>;Push;(T);Argument[0];ReturnValue;taint;df-generated |
-| System.Collections.Immutable;ImmutableStack<T>;Push;(T);Argument[this];ReturnValue;taint;df-generated |
-| System.Collections.ObjectModel;Collection<T>;Collection;(System.Collections.Generic.IList<T>);Argument[0].Element;Argument[this];taint;df-generated |
-| System.Collections.ObjectModel;Collection<T>;InsertItem;(System.Int32,T);Argument[1];Argument[this];taint;df-generated |
-| System.Collections.ObjectModel;Collection<T>;InsertItem;(System.Int32,T);Argument[this];Argument[1];taint;df-generated |
+| System.Collections.Immutable;ImmutableStack<T>;Peek;();Argument[this].SyntheticField[System.Collections.Immutable.ImmutableStack`1._head];ReturnValue;value;dfc-generated |
+| System.Collections.Immutable;ImmutableStack<T>;Pop;();Argument[this].SyntheticField[System.Collections.Immutable.ImmutableStack`1._tail];ReturnValue;value;dfc-generated |
+| System.Collections.Immutable;ImmutableStack<T>;Pop;(T);Argument[this].SyntheticField[System.Collections.Immutable.ImmutableStack`1._head];ReturnValue;value;dfc-generated |
+| System.Collections.Immutable;ImmutableStack<T>;Pop;(T);Argument[this].SyntheticField[System.Collections.Immutable.ImmutableStack`1._tail];ReturnValue;value;dfc-generated |
+| System.Collections.Immutable;ImmutableStack<T>;Push;(T);Argument[0];ReturnValue.SyntheticField[System.Collections.Immutable.ImmutableStack`1._head];value;dfc-generated |
+| System.Collections.Immutable;ImmutableStack<T>;Push;(T);Argument[this];ReturnValue.SyntheticField[System.Collections.Immutable.ImmutableStack`1._tail];value;dfc-generated |
+| System.Collections.ObjectModel;Collection<T>;Collection;(System.Collections.Generic.IList<T>);Argument[0];Argument[this].SyntheticField[System.Collections.ObjectModel.Collection`1.items];value;dfc-generated |
+| System.Collections.ObjectModel;Collection<T>;InsertItem;(System.Int32,T);Argument[1];Argument[this].SyntheticField[System.Collections.ObjectModel.Collection`1.items].Element;value;dfc-generated |
 | System.Collections.ObjectModel;Collection<T>;SetItem;(System.Int32,T);Argument[1];Argument[this];taint;df-generated |
-| System.Collections.ObjectModel;Collection<T>;SetItem;(System.Int32,T);Argument[this];Argument[1];taint;df-generated |
-| System.Collections.ObjectModel;Collection<T>;get_Items;();Argument[this];ReturnValue;taint;df-generated |
-| System.Collections.ObjectModel;KeyedCollection<TKey,TItem>;InsertItem;(System.Int32,TItem);Argument[1];Argument[this];taint;df-generated |
-| System.Collections.ObjectModel;KeyedCollection<TKey,TItem>;InsertItem;(System.Int32,TItem);Argument[this];Argument[1];taint;df-generated |
-| System.Collections.ObjectModel;KeyedCollection<TKey,TItem>;KeyedCollection;(System.Collections.Generic.IEqualityComparer<TKey>,System.Int32);Argument[0];Argument[this];taint;df-generated |
+| System.Collections.ObjectModel;Collection<T>;get_Items;();Argument[this].SyntheticField[System.Collections.ObjectModel.Collection`1.items];ReturnValue;value;dfc-generated |
+| System.Collections.ObjectModel;Collection<T>;get_SyncRoot;();Argument[this].SyntheticField[System.Collections.ObjectModel.Collection`1.items].Property[System.Collections.ICollection.SyncRoot];ReturnValue;value;dfc-generated |
+| System.Collections.ObjectModel;Collection<T>;get_SyncRoot;();Argument[this].SyntheticField[System.Collections.ObjectModel.Collection`1.items];ReturnValue;value;dfc-generated |
+| System.Collections.ObjectModel;KeyedCollection<TKey,TItem>;InsertItem;(System.Int32,TItem);Argument[1];Argument[this].SyntheticField[System.Collections.ObjectModel.Collection`1.items].Element;value;dfc-generated |
+| System.Collections.ObjectModel;KeyedCollection<TKey,TItem>;KeyedCollection;(System.Collections.Generic.IEqualityComparer<TKey>,System.Int32);Argument[0];Argument[this].SyntheticField[System.Collections.ObjectModel.KeyedCollection`2.comparer];value;dfc-generated |
 | System.Collections.ObjectModel;KeyedCollection<TKey,TItem>;SetItem;(System.Int32,TItem);Argument[1];Argument[this];taint;df-generated |
-| System.Collections.ObjectModel;KeyedCollection<TKey,TItem>;SetItem;(System.Int32,TItem);Argument[this];Argument[1];taint;df-generated |
-| System.Collections.ObjectModel;KeyedCollection<TKey,TItem>;TryGetValue;(TKey,TItem);Argument[this];ReturnValue;taint;df-generated |
-| System.Collections.ObjectModel;KeyedCollection<TKey,TItem>;get_Comparer;();Argument[this];ReturnValue;taint;df-generated |
+| System.Collections.ObjectModel;KeyedCollection<TKey,TItem>;TryGetValue;(TKey,TItem);Argument[1];ReturnValue;value;dfc-generated |
+| System.Collections.ObjectModel;KeyedCollection<TKey,TItem>;TryGetValue;(TKey,TItem);Argument[this].Property[System.Collections.ObjectModel.Collection`1.Items].Element;ReturnValue;value;dfc-generated |
+| System.Collections.ObjectModel;KeyedCollection<TKey,TItem>;get_Comparer;();Argument[this].SyntheticField[System.Collections.ObjectModel.KeyedCollection`2.comparer];ReturnValue;value;dfc-generated |
 | System.Collections.ObjectModel;KeyedCollection<TKey,TItem>;get_Dictionary;();Argument[this];ReturnValue;taint;df-generated |
 | System.Collections.ObjectModel;KeyedCollection<TKey,TItem>;get_Item;(TKey);Argument[this].Element;ReturnValue;value;manual |
-| System.Collections.ObjectModel;ObservableCollection<T>;InsertItem;(System.Int32,T);Argument[1];Argument[this];taint;df-generated |
-| System.Collections.ObjectModel;ObservableCollection<T>;InsertItem;(System.Int32,T);Argument[this];Argument[1];taint;df-generated |
+| System.Collections.ObjectModel;ObservableCollection<T>;InsertItem;(System.Int32,T);Argument[1];Argument[this].SyntheticField[System.Collections.ObjectModel.Collection`1.items].Element;value;dfc-generated |
 | System.Collections.ObjectModel;ObservableCollection<T>;SetItem;(System.Int32,T);Argument[1];Argument[this];taint;df-generated |
-| System.Collections.ObjectModel;ObservableCollection<T>;SetItem;(System.Int32,T);Argument[this];Argument[1];taint;df-generated |
 | System.Collections.ObjectModel;ObservableCollection<T>;add_PropertyChanged;(System.ComponentModel.PropertyChangedEventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Collections.ObjectModel;ObservableCollection<T>;remove_PropertyChanged;(System.ComponentModel.PropertyChangedEventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
-| System.Collections.ObjectModel;ReadOnlyCollection<T>;ReadOnlyCollection;(System.Collections.Generic.IList<T>);Argument[0].Element;Argument[this];taint;df-generated |
+| System.Collections.ObjectModel;ReadOnlyCollection<T>;ReadOnlyCollection;(System.Collections.Generic.IList<T>);Argument[0];Argument[this].SyntheticField[System.Collections.ObjectModel.ReadOnlyCollection`1.list];value;dfc-generated |
 | System.Collections.ObjectModel;ReadOnlyCollection<T>;get_Item;(System.Int32);Argument[this].Element;ReturnValue;value;manual |
-| System.Collections.ObjectModel;ReadOnlyCollection<T>;get_Items;();Argument[this];ReturnValue;taint;df-generated |
+| System.Collections.ObjectModel;ReadOnlyCollection<T>;get_Items;();Argument[this].SyntheticField[System.Collections.ObjectModel.ReadOnlyCollection`1.list];ReturnValue;value;dfc-generated |
+| System.Collections.ObjectModel;ReadOnlyCollection<T>;get_SyncRoot;();Argument[this].SyntheticField[System.Collections.ObjectModel.ReadOnlyCollection`1.list].Property[System.Collections.ICollection.SyncRoot];ReturnValue;value;dfc-generated |
 | System.Collections.ObjectModel;ReadOnlyDictionary<TKey,TValue>;Add;(System.Collections.Generic.KeyValuePair<TKey,TValue>);Argument[0].Property[System.Collections.Generic.KeyValuePair`2.Key];Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Key];value;manual |
 | System.Collections.ObjectModel;ReadOnlyDictionary<TKey,TValue>;Add;(System.Collections.Generic.KeyValuePair<TKey,TValue>);Argument[0].Property[System.Collections.Generic.KeyValuePair`2.Value];Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Value];value;manual |
 | System.Collections.ObjectModel;ReadOnlyDictionary<TKey,TValue>;ReadOnlyDictionary;(System.Collections.Generic.IDictionary<TKey,TValue>);Argument[0].Element.Property[System.Collections.Generic.KeyValuePair`2.Key];Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Key];value;manual |
 | System.Collections.ObjectModel;ReadOnlyDictionary<TKey,TValue>;ReadOnlyDictionary;(System.Collections.Generic.IDictionary<TKey,TValue>);Argument[0].Element.Property[System.Collections.Generic.KeyValuePair`2.Value];Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Value];value;manual |
+| System.Collections.ObjectModel;ReadOnlyDictionary<TKey,TValue>;TryGetValue;(TKey,TValue);Argument[1];ReturnValue;value;dfc-generated |
 | System.Collections.ObjectModel;ReadOnlyDictionary<TKey,TValue>;get_Dictionary;();Argument[this];ReturnValue;taint;df-generated |
 | System.Collections.ObjectModel;ReadOnlyDictionary<TKey,TValue>;get_Item;(TKey);Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Value];ReturnValue;value;manual |
 | System.Collections.ObjectModel;ReadOnlyDictionary<TKey,TValue>;get_Keys;();Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Key];ReturnValue.Element;value;manual |
@@ -4890,23 +5558,22 @@
 | System.Collections.ObjectModel;ReadOnlyObservableCollection<T>;add_PropertyChanged;(System.ComponentModel.PropertyChangedEventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Collections.ObjectModel;ReadOnlyObservableCollection<T>;remove_CollectionChanged;(System.Collections.Specialized.NotifyCollectionChangedEventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Collections.ObjectModel;ReadOnlyObservableCollection<T>;remove_PropertyChanged;(System.ComponentModel.PropertyChangedEventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
-| System.Collections.Specialized;CollectionsUtil;CreateCaseInsensitiveHashtable;(System.Collections.IDictionary);Argument[0].Element;ReturnValue;taint;df-generated |
+| System.Collections.Specialized;CollectionsUtil;CreateCaseInsensitiveHashtable;(System.Collections.IDictionary);Argument[0].Element.Property[System.Collections.Generic.KeyValuePair`2.Key];ReturnValue.Element.Property[System.Collections.Generic.KeyValuePair`2.Key];value;dfc-generated |
+| System.Collections.Specialized;CollectionsUtil;CreateCaseInsensitiveHashtable;(System.Collections.IDictionary);Argument[0].Element.Property[System.Collections.Generic.KeyValuePair`2.Value];ReturnValue.Element.Property[System.Collections.Generic.KeyValuePair`2.Value];value;dfc-generated |
 | System.Collections.Specialized;INotifyCollectionChanged;add_CollectionChanged;(System.Collections.Specialized.NotifyCollectionChangedEventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Collections.Specialized;INotifyCollectionChanged;remove_CollectionChanged;(System.Collections.Specialized.NotifyCollectionChangedEventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Collections.Specialized;IOrderedDictionary;get_Item;(System.Int32);Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Value];ReturnValue;value;manual |
 | System.Collections.Specialized;IOrderedDictionary;set_Item;(System.Int32,System.Object);Argument[0];Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Key];value;manual |
 | System.Collections.Specialized;IOrderedDictionary;set_Item;(System.Int32,System.Object);Argument[1];Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Value];value;manual |
 | System.Collections.Specialized;ListDictionary;ListDictionary;(System.Collections.IComparer);Argument[0];Argument[this];taint;df-generated |
-| System.Collections.Specialized;NameObjectCollectionBase;BaseAdd;(System.String,System.Object);Argument[0];Argument[this];taint;df-generated |
-| System.Collections.Specialized;NameObjectCollectionBase;BaseAdd;(System.String,System.Object);Argument[1];Argument[this];taint;df-generated |
+| System.Collections.Specialized;NameObjectCollectionBase;BaseAdd;(System.String,System.Object);Argument[1];Argument[this].SyntheticField[System.Collections.Specialized.NameObjectCollectionBase._nullKeyEntry].SyntheticField[System.Collections.Specialized.NameObjectCollectionBase+NameObjectEntry.Value];value;dfc-generated |
 | System.Collections.Specialized;NameObjectCollectionBase;BaseGet;(System.Int32);Argument[this];ReturnValue;taint;df-generated |
-| System.Collections.Specialized;NameObjectCollectionBase;BaseGet;(System.String);Argument[this];ReturnValue;taint;df-generated |
+| System.Collections.Specialized;NameObjectCollectionBase;BaseGet;(System.String);Argument[this].SyntheticField[System.Collections.Specialized.NameObjectCollectionBase._nullKeyEntry].SyntheticField[System.Collections.Specialized.NameObjectCollectionBase+NameObjectEntry.Value];ReturnValue;value;dfc-generated |
 | System.Collections.Specialized;NameObjectCollectionBase;BaseGetAllKeys;();Argument[this];ReturnValue;taint;df-generated |
 | System.Collections.Specialized;NameObjectCollectionBase;BaseGetAllValues;();Argument[this];ReturnValue;taint;df-generated |
 | System.Collections.Specialized;NameObjectCollectionBase;BaseGetAllValues;(System.Type);Argument[this];ReturnValue;taint;df-generated |
 | System.Collections.Specialized;NameObjectCollectionBase;BaseGetKey;(System.Int32);Argument[this];ReturnValue;taint;df-generated |
-| System.Collections.Specialized;NameObjectCollectionBase;BaseSet;(System.String,System.Object);Argument[0];Argument[this];taint;df-generated |
-| System.Collections.Specialized;NameObjectCollectionBase;BaseSet;(System.String,System.Object);Argument[1];Argument[this];taint;df-generated |
+| System.Collections.Specialized;NameObjectCollectionBase;BaseSet;(System.String,System.Object);Argument[1];Argument[this].SyntheticField[System.Collections.Specialized.NameObjectCollectionBase._nullKeyEntry].SyntheticField[System.Collections.Specialized.NameObjectCollectionBase+NameObjectEntry.Value];value;dfc-generated |
 | System.Collections.Specialized;NameObjectCollectionBase;NameObjectCollectionBase;(System.Collections.IEqualityComparer);Argument[0];Argument[this];taint;df-generated |
 | System.Collections.Specialized;NameObjectCollectionBase;NameObjectCollectionBase;(System.Collections.IHashCodeProvider,System.Collections.IComparer);Argument[0];Argument[this];taint;df-generated |
 | System.Collections.Specialized;NameObjectCollectionBase;NameObjectCollectionBase;(System.Collections.IHashCodeProvider,System.Collections.IComparer);Argument[1];Argument[this];taint;df-generated |
@@ -4920,8 +5587,8 @@
 | System.Collections.Specialized;NameValueCollection;Get;(System.Int32);Argument[this];ReturnValue;taint;df-generated |
 | System.Collections.Specialized;NameValueCollection;Get;(System.String);Argument[this];ReturnValue;taint;df-generated |
 | System.Collections.Specialized;NameValueCollection;GetKey;(System.Int32);Argument[this];ReturnValue;taint;df-generated |
-| System.Collections.Specialized;NameValueCollection;NameValueCollection;(System.Collections.Specialized.NameValueCollection);Argument[0].Element;Argument[this];taint;df-generated |
-| System.Collections.Specialized;NameValueCollection;NameValueCollection;(System.Int32,System.Collections.Specialized.NameValueCollection);Argument[1].Element;Argument[this];taint;df-generated |
+| System.Collections.Specialized;NameValueCollection;NameValueCollection;(System.Collections.Specialized.NameValueCollection);Argument[0];Argument[this].Element;value;dfc-generated |
+| System.Collections.Specialized;NameValueCollection;NameValueCollection;(System.Int32,System.Collections.Specialized.NameValueCollection);Argument[1];Argument[this].Element;value;dfc-generated |
 | System.Collections.Specialized;NameValueCollection;Set;(System.String,System.String);Argument[0];Argument[this];taint;df-generated |
 | System.Collections.Specialized;NameValueCollection;get_AllKeys;();Argument[this];ReturnValue;taint;df-generated |
 | System.Collections.Specialized;NameValueCollection;get_Item;(System.Int32);Argument[this];ReturnValue;taint;df-generated |
@@ -4955,7 +5622,7 @@
 | System.Collections.Specialized;StringDictionary;get_SyncRoot;();Argument[this];ReturnValue;taint;df-generated |
 | System.Collections.Specialized;StringDictionary;get_Values;();Argument[this];ReturnValue;taint;df-generated |
 | System.Collections.Specialized;StringEnumerator;get_Current;();Argument[this];ReturnValue;taint;df-generated |
-| System.Collections;ArrayList;Adapter;(System.Collections.IList);Argument[0].Element;ReturnValue;taint;df-generated |
+| System.Collections;ArrayList;Adapter;(System.Collections.IList);Argument[0];ReturnValue.SyntheticField[System.Collections.ArrayList+IListWrapper._list];value;dfc-generated |
 | System.Collections;ArrayList;AddRange;(System.Collections.ICollection);Argument[0].Element;Argument[this].Element;value;manual |
 | System.Collections;ArrayList;Clone;();Argument[this].Element;ReturnValue.Element;value;manual |
 | System.Collections;ArrayList;CopyTo;(System.Array);Argument[this];Argument[0].Element;taint;df-generated |
@@ -4965,29 +5632,34 @@
 | System.Collections;ArrayList;GetRange;(System.Int32,System.Int32);Argument[this].Element;ReturnValue.Element;value;manual |
 | System.Collections;ArrayList;InsertRange;(System.Int32,System.Collections.ICollection);Argument[1].Element;Argument[this].Element;value;manual |
 | System.Collections;ArrayList;ReadOnly;(System.Collections.ArrayList);Argument[0].Element;ReturnValue;taint;df-generated |
-| System.Collections;ArrayList;ReadOnly;(System.Collections.IList);Argument[0].Element;ReturnValue;taint;df-generated |
+| System.Collections;ArrayList;ReadOnly;(System.Collections.IList);Argument[0];ReturnValue.SyntheticField[System.Collections.ArrayList+ReadOnlyList._list];value;dfc-generated |
 | System.Collections;ArrayList;Repeat;(System.Object,System.Int32);Argument[0];ReturnValue.Element;value;manual |
 | System.Collections;ArrayList;SetRange;(System.Int32,System.Collections.ICollection);Argument[1].Element;Argument[this];taint;df-generated |
 | System.Collections;ArrayList;Synchronized;(System.Collections.ArrayList);Argument[0].Element;ReturnValue;taint;df-generated |
-| System.Collections;ArrayList;Synchronized;(System.Collections.IList);Argument[0].Element;ReturnValue;taint;df-generated |
+| System.Collections;ArrayList;Synchronized;(System.Collections.IList);Argument[0].Property[System.Collections.ICollection.SyncRoot];ReturnValue.SyntheticField[System.Collections.ArrayList+SyncIList._root];value;dfc-generated |
 | System.Collections;ArrayList;ToArray;();Argument[this];ReturnValue;taint;df-generated |
 | System.Collections;ArrayList;ToArray;(System.Type);Argument[this];ReturnValue;taint;df-generated |
-| System.Collections;BitArray;And;(System.Collections.BitArray);Argument[this];ReturnValue;value;df-generated |
+| System.Collections;BitArray;And;(System.Collections.BitArray);Argument[this];ReturnValue;value;dfc-generated |
 | System.Collections;BitArray;Clone;();Argument[this].Element;ReturnValue.Element;value;manual |
-| System.Collections;BitArray;LeftShift;(System.Int32);Argument[this];ReturnValue;value;df-generated |
-| System.Collections;BitArray;Not;();Argument[this];ReturnValue;value;df-generated |
-| System.Collections;BitArray;Or;(System.Collections.BitArray);Argument[this];ReturnValue;value;df-generated |
-| System.Collections;BitArray;RightShift;(System.Int32);Argument[this];ReturnValue;value;df-generated |
-| System.Collections;BitArray;Xor;(System.Collections.BitArray);Argument[this];ReturnValue;value;df-generated |
+| System.Collections;BitArray;LeftShift;(System.Int32);Argument[this];ReturnValue;value;dfc-generated |
+| System.Collections;BitArray;Not;();Argument[this];ReturnValue;value;dfc-generated |
+| System.Collections;BitArray;Or;(System.Collections.BitArray);Argument[this];ReturnValue;value;dfc-generated |
+| System.Collections;BitArray;RightShift;(System.Int32);Argument[this];ReturnValue;value;dfc-generated |
+| System.Collections;BitArray;Xor;(System.Collections.BitArray);Argument[this];ReturnValue;value;dfc-generated |
 | System.Collections;CaseInsensitiveComparer;CaseInsensitiveComparer;(System.Globalization.CultureInfo);Argument[0];Argument[this];taint;df-generated |
 | System.Collections;CaseInsensitiveHashCodeProvider;CaseInsensitiveHashCodeProvider;(System.Globalization.CultureInfo);Argument[0];Argument[this];taint;df-generated |
 | System.Collections;CollectionBase;OnInsert;(System.Int32,System.Object);Argument[1];Argument[this];taint;df-generated |
 | System.Collections;CollectionBase;OnSet;(System.Int32,System.Object,System.Object);Argument[2];Argument[this];taint;df-generated |
-| System.Collections;CollectionBase;get_InnerList;();Argument[this];ReturnValue;taint;df-generated |
-| System.Collections;CollectionBase;get_List;();Argument[this];ReturnValue;taint;df-generated |
-| System.Collections;Comparer;Comparer;(System.Globalization.CultureInfo);Argument[0];Argument[this];taint;df-generated |
-| System.Collections;DictionaryBase;OnGet;(System.Object,System.Object);Argument[1];ReturnValue;taint;df-generated |
-| System.Collections;DictionaryBase;get_Dictionary;();Argument[this];ReturnValue;taint;df-generated |
+| System.Collections;CollectionBase;Remove;(System.Object);Argument[0];Argument[this].Property[System.Collections.CollectionBase.InnerList].Element;value;dfc-generated |
+| System.Collections;CollectionBase;Remove;(System.Object);Argument[0];Argument[this].SyntheticField[System.Collections.CollectionBase._list].Element;value;dfc-generated |
+| System.Collections;CollectionBase;get_InnerList;();Argument[this].SyntheticField[System.Collections.CollectionBase._list];ReturnValue;value;dfc-generated |
+| System.Collections;CollectionBase;get_List;();Argument[this];ReturnValue;value;dfc-generated |
+| System.Collections;Comparer;Comparer;(System.Globalization.CultureInfo);Argument[0].Property[System.Globalization.CultureInfo.CompareInfo];Argument[this].SyntheticField[System.Collections.Comparer._compareInfo];value;dfc-generated |
+| System.Collections;Comparer;GetObjectData;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);Argument[this].SyntheticField[System.Collections.Comparer._compareInfo];Argument[0].SyntheticField[System.Runtime.Serialization.SerializationInfo._values].Element;value;df-generated |
+| System.Collections;Comparer;GetObjectData;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);Argument[this].SyntheticField[System.Collections.Comparer._compareInfo];Argument[0].SyntheticField[System.Runtime.Serialization.SerializationInfo._values].Element;value;dfc-generated |
+| System.Collections;DictionaryBase;OnGet;(System.Object,System.Object);Argument[1];ReturnValue;value;dfc-generated |
+| System.Collections;DictionaryBase;get_Dictionary;();Argument[this];ReturnValue;value;dfc-generated |
+| System.Collections;DictionaryBase;get_SyncRoot;();Argument[this].Property[System.Collections.DictionaryBase.InnerHashtable].Property[System.Collections.Hashtable.SyncRoot];ReturnValue;value;dfc-generated |
 | System.Collections;DictionaryEntry;Deconstruct;(System.Object,System.Object);Argument[this];ReturnValue;taint;df-generated |
 | System.Collections;DictionaryEntry;DictionaryEntry;(System.Object,System.Object);Argument[0];Argument[this];taint;df-generated |
 | System.Collections;DictionaryEntry;DictionaryEntry;(System.Object,System.Object);Argument[1];Argument[this];taint;df-generated |
@@ -5004,14 +5676,15 @@
 | System.Collections;Hashtable;Hashtable;(System.Collections.IDictionary,System.Single,System.Collections.IEqualityComparer);Argument[0].Element.Property[System.Collections.Generic.KeyValuePair`2.Value];Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Value];value;manual |
 | System.Collections;Hashtable;Hashtable;(System.Collections.IDictionary,System.Single,System.Collections.IHashCodeProvider,System.Collections.IComparer);Argument[0].Element.Property[System.Collections.Generic.KeyValuePair`2.Key];Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Key];value;manual |
 | System.Collections;Hashtable;Hashtable;(System.Collections.IDictionary,System.Single,System.Collections.IHashCodeProvider,System.Collections.IComparer);Argument[0].Element.Property[System.Collections.Generic.KeyValuePair`2.Value];Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Value];value;manual |
-| System.Collections;Hashtable;Hashtable;(System.Int32,System.Single,System.Collections.IEqualityComparer);Argument[2];Argument[this];taint;df-generated |
+| System.Collections;Hashtable;Hashtable;(System.Int32,System.Single,System.Collections.IEqualityComparer);Argument[2];Argument[this].SyntheticField[System.Collections.Hashtable._keycomparer];value;dfc-generated |
 | System.Collections;Hashtable;Hashtable;(System.Int32,System.Single,System.Collections.IHashCodeProvider,System.Collections.IComparer);Argument[2];Argument[this];taint;df-generated |
 | System.Collections;Hashtable;Hashtable;(System.Int32,System.Single,System.Collections.IHashCodeProvider,System.Collections.IComparer);Argument[3];Argument[this];taint;df-generated |
-| System.Collections;Hashtable;Synchronized;(System.Collections.Hashtable);Argument[0].Element;ReturnValue;taint;df-generated |
-| System.Collections;Hashtable;get_EqualityComparer;();Argument[this];ReturnValue;taint;df-generated |
+| System.Collections;Hashtable;Synchronized;(System.Collections.Hashtable);Argument[0];ReturnValue.SyntheticField[System.Collections.Hashtable+SyncHashtable._table];value;dfc-generated |
+| System.Collections;Hashtable;get_EqualityComparer;();Argument[this].SyntheticField[System.Collections.Hashtable._keycomparer];ReturnValue;value;dfc-generated |
 | System.Collections;ICollection;CopyTo;(System.Array,System.Int32);Argument[this].Element;Argument[0].Element;value;manual |
-| System.Collections;ICollection;get_SyncRoot;();Argument[this];ReturnValue;taint;df-generated |
-| System.Collections;ICollection;get_SyncRoot;();Argument[this];ReturnValue;value;df-generated |
+| System.Collections;ICollection;get_SyncRoot;();Argument[this];ReturnValue;value;dfc-generated |
+| System.Collections;IComparer;Compare;(System.Object,System.Object);Argument[0];Argument[this];taint;df-generated |
+| System.Collections;IComparer;Compare;(System.Object,System.Object);Argument[1];Argument[this];taint;df-generated |
 | System.Collections;IDictionary;Add;(System.Object,System.Object);Argument[0];Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Key];value;manual |
 | System.Collections;IDictionary;Add;(System.Object,System.Object);Argument[1];Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Value];value;manual |
 | System.Collections;IDictionary;Clear;();Argument[this].WithoutElement;Argument[this];value;manual |
@@ -5026,19 +5699,20 @@
 | System.Collections;IDictionaryEnumerator;get_Value;();Argument[this];ReturnValue;taint;df-generated |
 | System.Collections;IEnumerable;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.IEnumerator.Current];value;manual |
 | System.Collections;IEnumerator;get_Current;();Argument[this];ReturnValue;taint;df-generated |
+| System.Collections;IEqualityComparer;Equals;(System.Object,System.Object);Argument[0];Argument[this];taint;df-generated |
+| System.Collections;IEqualityComparer;Equals;(System.Object,System.Object);Argument[1];Argument[this];taint;df-generated |
+| System.Collections;IEqualityComparer;GetHashCode;(System.Object);Argument[0];Argument[this];taint;df-generated |
 | System.Collections;IList;Add;(System.Object);Argument[0];Argument[this].Element;value;manual |
 | System.Collections;IList;Clear;();Argument[this].WithoutElement;Argument[this];value;manual |
 | System.Collections;IList;Insert;(System.Int32,System.Object);Argument[1];Argument[this].Element;value;manual |
-| System.Collections;IList;Remove;(System.Object);Argument[0];Argument[this];taint;df-generated |
-| System.Collections;IList;Remove;(System.Object);Argument[this];Argument[0];taint;df-generated |
 | System.Collections;IList;get_Item;(System.Int32);Argument[this].Element;ReturnValue;value;manual |
 | System.Collections;IList;set_Item;(System.Int32,System.Object);Argument[1];Argument[this].Element;value;manual |
 | System.Collections;Queue;Clear;();Argument[this].WithoutElement;Argument[this];value;manual |
 | System.Collections;Queue;Clone;();Argument[this].Element;ReturnValue.Element;value;manual |
-| System.Collections;Queue;Dequeue;();Argument[this];ReturnValue;taint;df-generated |
-| System.Collections;Queue;Enqueue;(System.Object);Argument[0];Argument[this];taint;df-generated |
+| System.Collections;Queue;Dequeue;();Argument[this].SyntheticField[System.Collections.Queue._array].Element;ReturnValue;value;dfc-generated |
+| System.Collections;Queue;Enqueue;(System.Object);Argument[0];Argument[this].SyntheticField[System.Collections.Queue._array].Element;value;dfc-generated |
 | System.Collections;Queue;Peek;();Argument[this].Element;ReturnValue;value;manual |
-| System.Collections;Queue;Queue;(System.Collections.ICollection);Argument[0].Element;Argument[this];taint;df-generated |
+| System.Collections;Queue;Queue;(System.Collections.ICollection);Argument[0].Element;Argument[this].SyntheticField[System.Collections.Queue._array].Element;value;dfc-generated |
 | System.Collections;Queue;Synchronized;(System.Collections.Queue);Argument[0].Element;ReturnValue;taint;df-generated |
 | System.Collections;SortedList;Clone;();Argument[this].Element;ReturnValue.Element;value;manual |
 | System.Collections;SortedList;GetByIndex;(System.Int32);Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Value];ReturnValue;value;manual |
@@ -5055,13 +5729,13 @@
 | System.Collections;Stack;Clone;();Argument[this].Element;ReturnValue.Element;value;manual |
 | System.Collections;Stack;Peek;();Argument[this].Element;ReturnValue;value;manual |
 | System.Collections;Stack;Pop;();Argument[this].Element;ReturnValue;value;manual |
-| System.Collections;Stack;Push;(System.Object);Argument[0];Argument[this];taint;df-generated |
-| System.Collections;Stack;Stack;(System.Collections.ICollection);Argument[0].Element;Argument[this];taint;df-generated |
+| System.Collections;Stack;Push;(System.Object);Argument[0];Argument[this].SyntheticField[System.Collections.Stack._array].Element;value;dfc-generated |
+| System.Collections;Stack;Stack;(System.Collections.ICollection);Argument[0].Element;Argument[this].SyntheticField[System.Collections.Stack._array].Element;value;dfc-generated |
 | System.Collections;Stack;Synchronized;(System.Collections.Stack);Argument[0].Element;ReturnValue;taint;df-generated |
-| System.Collections;Stack;ToArray;();Argument[this];ReturnValue;taint;df-generated |
-| System.ComponentModel.DataAnnotations;AssociationAttribute;get_OtherKeyMembers;();Argument[this];ReturnValue;taint;df-generated |
-| System.ComponentModel.DataAnnotations;AssociationAttribute;get_ThisKeyMembers;();Argument[this];ReturnValue;taint;df-generated |
-| System.ComponentModel.DataAnnotations;DataTypeAttribute;GetDataTypeName;();Argument[this];ReturnValue;taint;df-generated |
+| System.Collections;Stack;ToArray;();Argument[this].SyntheticField[System.Collections.Stack._array].Element;ReturnValue.Element;value;dfc-generated |
+| System.ComponentModel.DataAnnotations;AssociationAttribute;get_OtherKeyMembers;();Argument[this].Property[System.ComponentModel.DataAnnotations.AssociationAttribute.OtherKey];ReturnValue.Element;taint;dfc-generated |
+| System.ComponentModel.DataAnnotations;AssociationAttribute;get_ThisKeyMembers;();Argument[this].Property[System.ComponentModel.DataAnnotations.AssociationAttribute.ThisKey];ReturnValue.Element;taint;dfc-generated |
+| System.ComponentModel.DataAnnotations;DataTypeAttribute;GetDataTypeName;();Argument[this].Property[System.ComponentModel.DataAnnotations.DataTypeAttribute.CustomDataType];ReturnValue;value;dfc-generated |
 | System.ComponentModel.DataAnnotations;DisplayAttribute;GetAutoGenerateField;();Argument[this];ReturnValue;taint;df-generated |
 | System.ComponentModel.DataAnnotations;DisplayAttribute;GetAutoGenerateFilter;();Argument[this];ReturnValue;taint;df-generated |
 | System.ComponentModel.DataAnnotations;DisplayAttribute;GetDescription;();Argument[this];ReturnValue;taint;df-generated |
@@ -5071,43 +5745,57 @@
 | System.ComponentModel.DataAnnotations;DisplayAttribute;GetPrompt;();Argument[this];ReturnValue;taint;df-generated |
 | System.ComponentModel.DataAnnotations;DisplayAttribute;GetShortName;();Argument[this];ReturnValue;taint;df-generated |
 | System.ComponentModel.DataAnnotations;DisplayFormatAttribute;GetNullDisplayText;();Argument[this];ReturnValue;taint;df-generated |
-| System.ComponentModel.DataAnnotations;FilterUIHintAttribute;FilterUIHintAttribute;(System.String,System.String,System.Object[]);Argument[0];Argument[this];taint;df-generated |
-| System.ComponentModel.DataAnnotations;FilterUIHintAttribute;FilterUIHintAttribute;(System.String,System.String,System.Object[]);Argument[1];Argument[this];taint;df-generated |
+| System.ComponentModel.DataAnnotations;FilterUIHintAttribute;FilterUIHintAttribute;(System.String,System.String,System.Object[]);Argument[0];Argument[this].SyntheticField[System.ComponentModel.DataAnnotations.FilterUIHintAttribute._implementation].SyntheticField[System.ComponentModel.DataAnnotations.UIHintAttribute+UIHintImplementation.UIHint];value;dfc-generated |
+| System.ComponentModel.DataAnnotations;FilterUIHintAttribute;FilterUIHintAttribute;(System.String,System.String,System.Object[]);Argument[1];Argument[this].SyntheticField[System.ComponentModel.DataAnnotations.FilterUIHintAttribute._implementation].SyntheticField[System.ComponentModel.DataAnnotations.UIHintAttribute+UIHintImplementation.PresentationLayer];value;dfc-generated |
 | System.ComponentModel.DataAnnotations;FilterUIHintAttribute;get_ControlParameters;();Argument[this];ReturnValue;taint;df-generated |
-| System.ComponentModel.DataAnnotations;FilterUIHintAttribute;get_FilterUIHint;();Argument[this];ReturnValue;taint;df-generated |
-| System.ComponentModel.DataAnnotations;FilterUIHintAttribute;get_PresentationLayer;();Argument[this];ReturnValue;taint;df-generated |
-| System.ComponentModel.DataAnnotations;UIHintAttribute;UIHintAttribute;(System.String,System.String,System.Object[]);Argument[0];Argument[this];taint;df-generated |
-| System.ComponentModel.DataAnnotations;UIHintAttribute;UIHintAttribute;(System.String,System.String,System.Object[]);Argument[1];Argument[this];taint;df-generated |
+| System.ComponentModel.DataAnnotations;FilterUIHintAttribute;get_FilterUIHint;();Argument[this].SyntheticField[System.ComponentModel.DataAnnotations.FilterUIHintAttribute._implementation].SyntheticField[System.ComponentModel.DataAnnotations.UIHintAttribute+UIHintImplementation.UIHint];ReturnValue;value;dfc-generated |
+| System.ComponentModel.DataAnnotations;FilterUIHintAttribute;get_PresentationLayer;();Argument[this].SyntheticField[System.ComponentModel.DataAnnotations.FilterUIHintAttribute._implementation].SyntheticField[System.ComponentModel.DataAnnotations.UIHintAttribute+UIHintImplementation.PresentationLayer];ReturnValue;value;dfc-generated |
+| System.ComponentModel.DataAnnotations;RegularExpressionAttribute;FormatErrorMessage;(System.String);Argument[this].Property[System.ComponentModel.DataAnnotations.RegularExpressionAttribute.Pattern];ReturnValue;taint;dfc-generated |
+| System.ComponentModel.DataAnnotations;UIHintAttribute;UIHintAttribute;(System.String,System.String,System.Object[]);Argument[0];Argument[this].SyntheticField[System.ComponentModel.DataAnnotations.UIHintAttribute._implementation].SyntheticField[System.ComponentModel.DataAnnotations.UIHintAttribute+UIHintImplementation.UIHint];value;dfc-generated |
+| System.ComponentModel.DataAnnotations;UIHintAttribute;UIHintAttribute;(System.String,System.String,System.Object[]);Argument[1];Argument[this].SyntheticField[System.ComponentModel.DataAnnotations.UIHintAttribute._implementation].SyntheticField[System.ComponentModel.DataAnnotations.UIHintAttribute+UIHintImplementation.PresentationLayer];value;dfc-generated |
 | System.ComponentModel.DataAnnotations;UIHintAttribute;get_ControlParameters;();Argument[this];ReturnValue;taint;df-generated |
-| System.ComponentModel.DataAnnotations;UIHintAttribute;get_PresentationLayer;();Argument[this];ReturnValue;taint;df-generated |
-| System.ComponentModel.DataAnnotations;UIHintAttribute;get_UIHint;();Argument[this];ReturnValue;taint;df-generated |
-| System.ComponentModel.DataAnnotations;ValidationAttribute;FormatErrorMessage;(System.String);Argument[0];ReturnValue;taint;df-generated |
-| System.ComponentModel.DataAnnotations;ValidationAttribute;FormatErrorMessage;(System.String);Argument[this];ReturnValue;taint;df-generated |
+| System.ComponentModel.DataAnnotations;UIHintAttribute;get_PresentationLayer;();Argument[this].SyntheticField[System.ComponentModel.DataAnnotations.UIHintAttribute._implementation].SyntheticField[System.ComponentModel.DataAnnotations.UIHintAttribute+UIHintImplementation.PresentationLayer];ReturnValue;value;dfc-generated |
+| System.ComponentModel.DataAnnotations;UIHintAttribute;get_UIHint;();Argument[this].SyntheticField[System.ComponentModel.DataAnnotations.UIHintAttribute._implementation].SyntheticField[System.ComponentModel.DataAnnotations.UIHintAttribute+UIHintImplementation.UIHint];ReturnValue;value;dfc-generated |
+| System.ComponentModel.DataAnnotations;ValidationAttribute;FormatErrorMessage;(System.String);Argument[0];ReturnValue;taint;dfc-generated |
+| System.ComponentModel.DataAnnotations;ValidationAttribute;FormatErrorMessage;(System.String);Argument[this].Property[System.ComponentModel.DataAnnotations.ValidationAttribute.ErrorMessageString];ReturnValue;taint;dfc-generated |
+| System.ComponentModel.DataAnnotations;ValidationAttribute;ValidationAttribute;(System.Func<System.String>);Argument[0];Argument[0].Parameter[delegate-self];value;dfc-generated |
 | System.ComponentModel.DataAnnotations;ValidationAttribute;ValidationAttribute;(System.Func<System.String>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
+| System.ComponentModel.DataAnnotations;ValidationAttribute;ValidationAttribute;(System.Func<System.String>);Argument[0];Argument[this].SyntheticField[System.ComponentModel.DataAnnotations.ValidationAttribute._errorMessageResourceAccessor];value;dfc-generated |
+| System.ComponentModel.DataAnnotations;ValidationAttribute;ValidationAttribute;(System.Func<System.String>);Argument[0];Argument[this].SyntheticField[System.ComponentModel.DataAnnotations.ValidationAttribute._errorMessageResourceAccessor];value;hq-generated |
+| System.ComponentModel.DataAnnotations;ValidationAttribute;get_ErrorMessageString;();Argument[this];ReturnValue;taint;df-generated |
+| System.ComponentModel.DataAnnotations;ValidationContext;InitializeServiceProvider;(System.Func<System.Type,System.Object>);Argument[0];Argument[0].Parameter[delegate-self];value;dfc-generated |
 | System.ComponentModel.DataAnnotations;ValidationContext;InitializeServiceProvider;(System.Func<System.Type,System.Object>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
+| System.ComponentModel.DataAnnotations;ValidationContext;InitializeServiceProvider;(System.Func<System.Type,System.Object>);Argument[0];Argument[this].SyntheticField[System.ComponentModel.DataAnnotations.ValidationContext._serviceProvider];value;dfc-generated |
+| System.ComponentModel.DataAnnotations;ValidationContext;InitializeServiceProvider;(System.Func<System.Type,System.Object>);Argument[0];Argument[this].SyntheticField[System.ComponentModel.DataAnnotations.ValidationContext._serviceProvider];value;hq-generated |
 | System.ComponentModel.DataAnnotations;ValidationContext;get_Items;();Argument[this];ReturnValue;taint;df-generated |
 | System.ComponentModel.DataAnnotations;ValidationException;ValidationException;(System.ComponentModel.DataAnnotations.ValidationResult,System.ComponentModel.DataAnnotations.ValidationAttribute,System.Object);Argument[0];Argument[this];taint;df-generated |
-| System.ComponentModel.DataAnnotations;ValidationResult;ToString;();Argument[this];ReturnValue;taint;df-generated |
-| System.ComponentModel.Design.Serialization;ContextStack;Append;(System.Object);Argument[0];Argument[this];taint;df-generated |
-| System.ComponentModel.Design.Serialization;ContextStack;Pop;();Argument[this];ReturnValue;taint;df-generated |
-| System.ComponentModel.Design.Serialization;ContextStack;Push;(System.Object);Argument[0];Argument[this];taint;df-generated |
-| System.ComponentModel.Design.Serialization;ContextStack;get_Current;();Argument[this];ReturnValue;taint;df-generated |
-| System.ComponentModel.Design.Serialization;ContextStack;get_Item;(System.Int32);Argument[this];ReturnValue;taint;df-generated |
-| System.ComponentModel.Design.Serialization;ContextStack;get_Item;(System.Type);Argument[this];ReturnValue;taint;df-generated |
+| System.ComponentModel.DataAnnotations;ValidationResult;ToString;();Argument[this].Property[System.ComponentModel.DataAnnotations.ValidationResult.ErrorMessage];ReturnValue;value;dfc-generated |
+| System.ComponentModel.Design.Serialization;ContextStack;Append;(System.Object);Argument[0];Argument[this].SyntheticField[System.ComponentModel.Design.Serialization.ContextStack._contextStack].Element;value;dfc-generated |
+| System.ComponentModel.Design.Serialization;ContextStack;Pop;();Argument[this].SyntheticField[System.ComponentModel.Design.Serialization.ContextStack._contextStack].Element;ReturnValue;value;dfc-generated |
+| System.ComponentModel.Design.Serialization;ContextStack;Push;(System.Object);Argument[0];Argument[this].SyntheticField[System.ComponentModel.Design.Serialization.ContextStack._contextStack].Element;value;dfc-generated |
+| System.ComponentModel.Design.Serialization;ContextStack;get_Current;();Argument[this].SyntheticField[System.ComponentModel.Design.Serialization.ContextStack._contextStack].Element;ReturnValue;value;dfc-generated |
+| System.ComponentModel.Design.Serialization;ContextStack;get_Item;(System.Int32);Argument[this].SyntheticField[System.ComponentModel.Design.Serialization.ContextStack._contextStack].Element;ReturnValue;value;dfc-generated |
+| System.ComponentModel.Design.Serialization;ContextStack;get_Item;(System.Type);Argument[this].SyntheticField[System.ComponentModel.Design.Serialization.ContextStack._contextStack].Element;ReturnValue;value;dfc-generated |
+| System.ComponentModel.Design.Serialization;DesignerSerializerAttribute;get_TypeId;();Argument[this].Property[System.ComponentModel.Design.Serialization.DesignerSerializerAttribute.SerializerBaseTypeName];Argument[this].SyntheticField[System.ComponentModel.Design.Serialization.DesignerSerializerAttribute._typeId];taint;df-generated |
+| System.ComponentModel.Design.Serialization;DesignerSerializerAttribute;get_TypeId;();Argument[this].Property[System.ComponentModel.Design.Serialization.DesignerSerializerAttribute.SerializerBaseTypeName];Argument[this].SyntheticField[System.ComponentModel.Design.Serialization.DesignerSerializerAttribute._typeId];taint;dfc-generated |
+| System.ComponentModel.Design.Serialization;DesignerSerializerAttribute;get_TypeId;();Argument[this].Property[System.ComponentModel.Design.Serialization.DesignerSerializerAttribute.SerializerBaseTypeName];ReturnValue;taint;df-generated |
+| System.ComponentModel.Design.Serialization;DesignerSerializerAttribute;get_TypeId;();Argument[this].Property[System.ComponentModel.Design.Serialization.DesignerSerializerAttribute.SerializerBaseTypeName];ReturnValue;taint;dfc-generated |
+| System.ComponentModel.Design.Serialization;DesignerSerializerAttribute;get_TypeId;();Argument[this].SyntheticField[System.ComponentModel.Design.Serialization.DesignerSerializerAttribute._typeId];ReturnValue;value;df-generated |
+| System.ComponentModel.Design.Serialization;DesignerSerializerAttribute;get_TypeId;();Argument[this].SyntheticField[System.ComponentModel.Design.Serialization.DesignerSerializerAttribute._typeId];ReturnValue;value;dfc-generated |
 | System.ComponentModel.Design.Serialization;IDesignerSerializationManager;add_ResolveName;(System.ComponentModel.Design.Serialization.ResolveNameEventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.ComponentModel.Design.Serialization;IDesignerSerializationManager;add_SerializationComplete;(System.EventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.ComponentModel.Design.Serialization;IDesignerSerializationManager;remove_ResolveName;(System.ComponentModel.Design.Serialization.ResolveNameEventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.ComponentModel.Design.Serialization;IDesignerSerializationManager;remove_SerializationComplete;(System.EventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.ComponentModel.Design.Serialization;ResolveNameEventHandler;BeginInvoke;(System.Object,System.ComponentModel.Design.Serialization.ResolveNameEventArgs,System.AsyncCallback,System.Object);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
 | System.ComponentModel.Design;ActiveDesignerEventHandler;BeginInvoke;(System.Object,System.ComponentModel.Design.ActiveDesignerEventArgs,System.AsyncCallback,System.Object);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
-| System.ComponentModel.Design;CommandID;ToString;();Argument[this];ReturnValue;taint;df-generated |
+| System.ComponentModel.Design;CommandID;ToString;();Argument[this].Property[System.ComponentModel.Design.CommandID.Guid];ReturnValue;taint;dfc-generated |
 | System.ComponentModel.Design;ComponentChangedEventHandler;BeginInvoke;(System.Object,System.ComponentModel.Design.ComponentChangedEventArgs,System.AsyncCallback,System.Object);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
 | System.ComponentModel.Design;ComponentChangingEventHandler;BeginInvoke;(System.Object,System.ComponentModel.Design.ComponentChangingEventArgs,System.AsyncCallback,System.Object);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
 | System.ComponentModel.Design;ComponentEventHandler;BeginInvoke;(System.Object,System.ComponentModel.Design.ComponentEventArgs,System.AsyncCallback,System.Object);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
 | System.ComponentModel.Design;ComponentRenameEventHandler;BeginInvoke;(System.Object,System.ComponentModel.Design.ComponentRenameEventArgs,System.AsyncCallback,System.Object);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
-| System.ComponentModel.Design;DesignerCollection;DesignerCollection;(System.Collections.IList);Argument[0].Element;Argument[this];taint;df-generated |
+| System.ComponentModel.Design;DesignerCollection;DesignerCollection;(System.Collections.IList);Argument[0];Argument[this].SyntheticField[System.ComponentModel.Design.DesignerCollection._designers];value;dfc-generated |
 | System.ComponentModel.Design;DesignerCollection;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.IEnumerator.Current];value;manual |
-| System.ComponentModel.Design;DesignerCollection;get_Item;(System.Int32);Argument[this];ReturnValue;taint;df-generated |
+| System.ComponentModel.Design;DesignerCollection;get_Item;(System.Int32);Argument[this].SyntheticField[System.ComponentModel.Design.DesignerCollection._designers].Element;ReturnValue;value;dfc-generated |
 | System.ComponentModel.Design;DesignerEventHandler;BeginInvoke;(System.Object,System.ComponentModel.Design.DesignerEventArgs,System.AsyncCallback,System.Object);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
 | System.ComponentModel.Design;DesignerOptionService+DesignerOptionCollection;get_Item;(System.Int32);Argument[this].Element;ReturnValue;value;manual |
 | System.ComponentModel.Design;DesignerOptionService+DesignerOptionCollection;get_Item;(System.String);Argument[this].Element;ReturnValue;value;manual |
@@ -5117,14 +5805,17 @@
 | System.ComponentModel.Design;DesignerTransactionCloseEventHandler;BeginInvoke;(System.Object,System.ComponentModel.Design.DesignerTransactionCloseEventArgs,System.AsyncCallback,System.Object);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
 | System.ComponentModel.Design;DesignerVerb;DesignerVerb;(System.String,System.EventHandler);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
 | System.ComponentModel.Design;DesignerVerb;DesignerVerb;(System.String,System.EventHandler,System.ComponentModel.Design.CommandID);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
-| System.ComponentModel.Design;DesignerVerb;get_Text;();Argument[this];ReturnValue;taint;df-generated |
+| System.ComponentModel.Design;DesignerVerb;ToString;();Argument[this].Property[System.ComponentModel.Design.DesignerVerb.Text];ReturnValue;taint;dfc-generated |
+| System.ComponentModel.Design;DesignerVerb;ToString;();Argument[this].Property[System.ComponentModel.Design.MenuCommand.CommandID].Property[System.ComponentModel.Design.CommandID.Guid];ReturnValue;taint;dfc-generated |
+| System.ComponentModel.Design;DesignerVerb;ToString;();Argument[this].Property[System.ComponentModel.Design.MenuCommand.Properties].Element;ReturnValue;taint;dfc-generated |
+| System.ComponentModel.Design;DesignerVerb;get_Text;();Argument[this].Property[System.ComponentModel.Design.MenuCommand.Properties].Element;ReturnValue;value;dfc-generated |
 | System.ComponentModel.Design;DesignerVerbCollection;Add;(System.ComponentModel.Design.DesignerVerb);Argument[0];Argument[this].Element;value;manual |
 | System.ComponentModel.Design;DesignerVerbCollection;AddRange;(System.ComponentModel.Design.DesignerVerbCollection);Argument[0].Element;Argument[this].Element;value;manual |
 | System.ComponentModel.Design;DesignerVerbCollection;AddRange;(System.ComponentModel.Design.DesignerVerb[]);Argument[0].Element;Argument[this].Element;value;manual |
 | System.ComponentModel.Design;DesignerVerbCollection;CopyTo;(System.ComponentModel.Design.DesignerVerb[],System.Int32);Argument[this].Element;Argument[0].Element;value;manual |
-| System.ComponentModel.Design;DesignerVerbCollection;DesignerVerbCollection;(System.ComponentModel.Design.DesignerVerb[]);Argument[0].Element;Argument[this];taint;df-generated |
+| System.ComponentModel.Design;DesignerVerbCollection;DesignerVerbCollection;(System.ComponentModel.Design.DesignerVerb[]);Argument[0].Element;Argument[this].Element;value;dfc-generated |
+| System.ComponentModel.Design;DesignerVerbCollection;DesignerVerbCollection;(System.ComponentModel.Design.DesignerVerb[]);Argument[0].Element;Argument[this].Property[System.Collections.CollectionBase.List].Element;value;dfc-generated |
 | System.ComponentModel.Design;DesignerVerbCollection;Insert;(System.Int32,System.ComponentModel.Design.DesignerVerb);Argument[1];Argument[this].Element;value;manual |
-| System.ComponentModel.Design;DesignerVerbCollection;Remove;(System.ComponentModel.Design.DesignerVerb);Argument[0];Argument[this];taint;df-generated |
 | System.ComponentModel.Design;DesignerVerbCollection;get_Item;(System.Int32);Argument[this].Element;ReturnValue;value;manual |
 | System.ComponentModel.Design;DesignerVerbCollection;set_Item;(System.Int32,System.ComponentModel.Design.DesignerVerb);Argument[1];Argument[this].Element;value;manual |
 | System.ComponentModel.Design;DesigntimeLicenseContext;GetSavedLicenseKey;(System.Type,System.Reflection.Assembly);Argument[this];ReturnValue;taint;df-generated |
@@ -5172,125 +5863,127 @@
 | System.ComponentModel.Design;IServiceContainer;AddService;(System.Type,System.ComponentModel.Design.ServiceCreatorCallback);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
 | System.ComponentModel.Design;IServiceContainer;AddService;(System.Type,System.ComponentModel.Design.ServiceCreatorCallback,System.Boolean);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
 | System.ComponentModel.Design;MenuCommand;MenuCommand;(System.EventHandler,System.ComponentModel.Design.CommandID);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
-| System.ComponentModel.Design;MenuCommand;ToString;();Argument[this];ReturnValue;taint;df-generated |
+| System.ComponentModel.Design;MenuCommand;ToString;();Argument[this].Property[System.ComponentModel.Design.MenuCommand.CommandID].Property[System.ComponentModel.Design.CommandID.Guid];ReturnValue;taint;dfc-generated |
 | System.ComponentModel.Design;MenuCommand;add_CommandChanged;(System.EventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.ComponentModel.Design;MenuCommand;remove_CommandChanged;(System.EventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.ComponentModel.Design;ServiceContainer;ServiceContainer;(System.IServiceProvider);Argument[0];Argument[this];taint;df-generated |
 | System.ComponentModel.Design;ServiceCreatorCallback;BeginInvoke;(System.ComponentModel.Design.IServiceContainer,System.Type,System.AsyncCallback,System.Object);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
 | System.ComponentModel;AddingNewEventHandler;BeginInvoke;(System.Object,System.ComponentModel.AddingNewEventArgs,System.AsyncCallback,System.Object);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
-| System.ComponentModel;ArrayConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[1];ReturnValue;taint;df-generated |
-| System.ComponentModel;ArrayConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[2];ReturnValue;taint;df-generated |
-| System.ComponentModel;ArrayConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[this];ReturnValue;taint;df-generated |
+| System.ComponentModel;ArrayConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[2].Element;ReturnValue;taint;dfc-generated |
+| System.ComponentModel;ArrayConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[2];ReturnValue;taint;dfc-generated |
 | System.ComponentModel;ArrayConverter;GetProperties;(System.ComponentModel.ITypeDescriptorContext,System.Object,System.Attribute[]);Argument[1];ReturnValue;taint;df-generated |
 | System.ComponentModel;AsyncCompletedEventHandler;BeginInvoke;(System.Object,System.ComponentModel.AsyncCompletedEventArgs,System.AsyncCallback,System.Object);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
 | System.ComponentModel;AsyncOperation;Post;(System.Threading.SendOrPostCallback,System.Object);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.ComponentModel;AsyncOperation;PostOperationCompleted;(System.Threading.SendOrPostCallback,System.Object);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.ComponentModel;AsyncOperation;get_SynchronizationContext;();Argument[this];ReturnValue;taint;df-generated |
-| System.ComponentModel;AttributeCollection;AttributeCollection;(System.Attribute[]);Argument[0].Element;Argument[this];taint;df-generated |
-| System.ComponentModel;AttributeCollection;FromExisting;(System.ComponentModel.AttributeCollection,System.Attribute[]);Argument[0].Element;ReturnValue;taint;df-generated |
-| System.ComponentModel;AttributeCollection;FromExisting;(System.ComponentModel.AttributeCollection,System.Attribute[]);Argument[1].Element;ReturnValue;taint;df-generated |
+| System.ComponentModel;AttributeCollection;AttributeCollection;(System.Attribute[]);Argument[0];Argument[this].SyntheticField[System.ComponentModel.AttributeCollection._attributes];value;dfc-generated |
 | System.ComponentModel;AttributeCollection;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.IEnumerator.Current];value;manual |
-| System.ComponentModel;AttributeCollection;get_Attributes;();Argument[this];ReturnValue;taint;df-generated |
-| System.ComponentModel;AttributeCollection;get_Item;(System.Int32);Argument[this];ReturnValue;taint;df-generated |
-| System.ComponentModel;AttributeCollection;get_Item;(System.Type);Argument[this];ReturnValue;taint;df-generated |
+| System.ComponentModel;AttributeCollection;get_Attributes;();Argument[this].SyntheticField[System.ComponentModel.AttributeCollection._attributes];ReturnValue;value;dfc-generated |
+| System.ComponentModel;AttributeCollection;get_Item;(System.Int32);Argument[this].Property[System.ComponentModel.AttributeCollection.Attributes].Element;ReturnValue;value;dfc-generated |
+| System.ComponentModel;AttributeCollection;get_Item;(System.Int32);Argument[this].SyntheticField[System.ComponentModel.AttributeCollection._attributes].Element;ReturnValue;value;dfc-generated |
+| System.ComponentModel;AttributeCollection;get_Item;(System.Type);Argument[this].Property[System.ComponentModel.AttributeCollection.Attributes].Element;ReturnValue;value;dfc-generated |
+| System.ComponentModel;AttributeCollection;get_Item;(System.Type);Argument[this].SyntheticField[System.ComponentModel.AttributeCollection._attributes].Element;ReturnValue;value;dfc-generated |
 | System.ComponentModel;BackgroundWorker;add_DoWork;(System.ComponentModel.DoWorkEventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.ComponentModel;BackgroundWorker;add_ProgressChanged;(System.ComponentModel.ProgressChangedEventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.ComponentModel;BackgroundWorker;add_RunWorkerCompleted;(System.ComponentModel.RunWorkerCompletedEventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.ComponentModel;BackgroundWorker;remove_DoWork;(System.ComponentModel.DoWorkEventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.ComponentModel;BackgroundWorker;remove_ProgressChanged;(System.ComponentModel.ProgressChangedEventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.ComponentModel;BackgroundWorker;remove_RunWorkerCompleted;(System.ComponentModel.RunWorkerCompletedEventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
-| System.ComponentModel;BaseNumberConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[0];ReturnValue;taint;df-generated |
-| System.ComponentModel;BaseNumberConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue;taint;df-generated |
-| System.ComponentModel;BaseNumberConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[this];ReturnValue;taint;df-generated |
-| System.ComponentModel;BaseNumberConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[1];ReturnValue;taint;df-generated |
-| System.ComponentModel;BaseNumberConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[2];ReturnValue;taint;df-generated |
-| System.ComponentModel;BaseNumberConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[this];ReturnValue;taint;df-generated |
-| System.ComponentModel;BindingList<T>;AddNewCore;();Argument[this];ReturnValue;taint;df-generated |
-| System.ComponentModel;BindingList<T>;InsertItem;(System.Int32,T);Argument[1];Argument[this];taint;df-generated |
-| System.ComponentModel;BindingList<T>;InsertItem;(System.Int32,T);Argument[this];Argument[1];taint;df-generated |
+| System.ComponentModel;BaseNumberConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue.Element;taint;dfc-generated |
+| System.ComponentModel;BaseNumberConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue;taint;dfc-generated |
+| System.ComponentModel;BaseNumberConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue;value;dfc-generated |
+| System.ComponentModel;BaseNumberConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[2].Element;ReturnValue;taint;dfc-generated |
+| System.ComponentModel;BaseNumberConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[2];ReturnValue;taint;dfc-generated |
+| System.ComponentModel;BindingList<T>;InsertItem;(System.Int32,T);Argument[1];Argument[this].SyntheticField[System.Collections.ObjectModel.Collection`1.items].Element;value;dfc-generated |
+| System.ComponentModel;BindingList<T>;OnAddingNew;(System.ComponentModel.AddingNewEventArgs);Argument[0];Argument[this];taint;df-generated |
+| System.ComponentModel;BindingList<T>;OnListChanged;(System.ComponentModel.ListChangedEventArgs);Argument[0];Argument[this];taint;df-generated |
 | System.ComponentModel;BindingList<T>;SetItem;(System.Int32,T);Argument[1];Argument[this];taint;df-generated |
-| System.ComponentModel;BindingList<T>;SetItem;(System.Int32,T);Argument[this];Argument[1];taint;df-generated |
 | System.ComponentModel;BindingList<T>;add_AddingNew;(System.ComponentModel.AddingNewEventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
+| System.ComponentModel;BindingList<T>;get_SortProperty;();Argument[this].Property[System.ComponentModel.BindingList`1.SortPropertyCore];ReturnValue;value;dfc-generated |
 | System.ComponentModel;BindingList<T>;remove_AddingNew;(System.ComponentModel.AddingNewEventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
-| System.ComponentModel;BooleanConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[0];ReturnValue;taint;df-generated |
-| System.ComponentModel;BooleanConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue;taint;df-generated |
-| System.ComponentModel;BooleanConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[this];ReturnValue;taint;df-generated |
-| System.ComponentModel;BooleanConverter;GetStandardValues;(System.ComponentModel.ITypeDescriptorContext);Argument[0];ReturnValue;taint;df-generated |
+| System.ComponentModel;BooleanConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue.Element;taint;dfc-generated |
+| System.ComponentModel;BooleanConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue;taint;dfc-generated |
+| System.ComponentModel;BooleanConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue;value;dfc-generated |
 | System.ComponentModel;BooleanConverter;GetStandardValues;(System.ComponentModel.ITypeDescriptorContext);Argument[this];ReturnValue;taint;df-generated |
 | System.ComponentModel;CancelEventHandler;BeginInvoke;(System.Object,System.ComponentModel.CancelEventArgs,System.AsyncCallback,System.Object);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
-| System.ComponentModel;CategoryAttribute;CategoryAttribute;(System.String);Argument[0];Argument[this];taint;df-generated |
-| System.ComponentModel;CategoryAttribute;get_Category;();Argument[this];ReturnValue;taint;df-generated |
-| System.ComponentModel;CharConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[0];ReturnValue;taint;df-generated |
-| System.ComponentModel;CharConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue;taint;df-generated |
-| System.ComponentModel;CharConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[this];ReturnValue;taint;df-generated |
-| System.ComponentModel;CharConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[1];ReturnValue;taint;df-generated |
-| System.ComponentModel;CharConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[2];ReturnValue;taint;df-generated |
-| System.ComponentModel;CharConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[this];ReturnValue;taint;df-generated |
+| System.ComponentModel;CategoryAttribute;CategoryAttribute;(System.String);Argument[0];Argument[this].SyntheticField[System.ComponentModel.CategoryAttribute._categoryValue];value;dfc-generated |
+| System.ComponentModel;CategoryAttribute;get_Category;();Argument[this].SyntheticField[System.ComponentModel.CategoryAttribute._categoryValue];ReturnValue;value;dfc-generated |
+| System.ComponentModel;CharConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue.Element;taint;dfc-generated |
+| System.ComponentModel;CharConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue;taint;dfc-generated |
+| System.ComponentModel;CharConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue;value;dfc-generated |
+| System.ComponentModel;CharConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[2].Element;ReturnValue;taint;dfc-generated |
+| System.ComponentModel;CharConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[2];ReturnValue;taint;dfc-generated |
 | System.ComponentModel;CollectionChangeEventHandler;BeginInvoke;(System.Object,System.ComponentModel.CollectionChangeEventArgs,System.AsyncCallback,System.Object);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
-| System.ComponentModel;CollectionConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[1];ReturnValue;taint;df-generated |
-| System.ComponentModel;CollectionConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[2];ReturnValue;taint;df-generated |
-| System.ComponentModel;CollectionConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[this];ReturnValue;taint;df-generated |
+| System.ComponentModel;CollectionConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[2].Element;ReturnValue;taint;dfc-generated |
+| System.ComponentModel;CollectionConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[2];ReturnValue;taint;dfc-generated |
 | System.ComponentModel;CollectionConverter;GetProperties;(System.ComponentModel.ITypeDescriptorContext,System.Object,System.Attribute[]);Argument[1];ReturnValue;taint;df-generated |
 | System.ComponentModel;Component;ToString;();Argument[this];ReturnValue;taint;df-generated |
 | System.ComponentModel;Component;get_Container;();Argument[this];ReturnValue;taint;df-generated |
-| System.ComponentModel;ComponentCollection;ComponentCollection;(System.ComponentModel.IComponent[]);Argument[0].Element;Argument[this];taint;df-generated |
+| System.ComponentModel;ComponentCollection;ComponentCollection;(System.ComponentModel.IComponent[]);Argument[0].Element;Argument[this].Property[System.Collections.ReadOnlyCollectionBase.InnerList].Element;value;dfc-generated |
 | System.ComponentModel;ComponentCollection;CopyTo;(System.ComponentModel.IComponent[],System.Int32);Argument[this].Element;Argument[0].Element;value;manual |
-| System.ComponentModel;ComponentCollection;get_Item;(System.Int32);Argument[this];ReturnValue;taint;df-generated |
-| System.ComponentModel;ComponentCollection;get_Item;(System.String);Argument[this];ReturnValue;taint;df-generated |
+| System.ComponentModel;ComponentCollection;get_Item;(System.Int32);Argument[this].Property[System.Collections.ReadOnlyCollectionBase.InnerList].Element;ReturnValue;value;dfc-generated |
+| System.ComponentModel;ComponentCollection;get_Item;(System.String);Argument[this].Property[System.Collections.ReadOnlyCollectionBase.InnerList].Element;ReturnValue;value;dfc-generated |
 | System.ComponentModel;ComponentConverter;GetProperties;(System.ComponentModel.ITypeDescriptorContext,System.Object,System.Attribute[]);Argument[1];ReturnValue;taint;df-generated |
-| System.ComponentModel;Container;CreateSite;(System.ComponentModel.IComponent,System.String);Argument[0];ReturnValue;taint;df-generated |
-| System.ComponentModel;Container;CreateSite;(System.ComponentModel.IComponent,System.String);Argument[1];ReturnValue;taint;df-generated |
-| System.ComponentModel;Container;CreateSite;(System.ComponentModel.IComponent,System.String);Argument[this];ReturnValue;taint;df-generated |
-| System.ComponentModel;Container;GetService;(System.Type);Argument[this];ReturnValue;taint;df-generated |
-| System.ComponentModel;Container;GetService;(System.Type);Argument[this];ReturnValue;value;df-generated |
-| System.ComponentModel;ContainerFilterService;FilterComponents;(System.ComponentModel.ComponentCollection);Argument[0].Element;ReturnValue;taint;df-generated |
-| System.ComponentModel;CultureInfoConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[0];ReturnValue;taint;df-generated |
-| System.ComponentModel;CultureInfoConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue;taint;df-generated |
-| System.ComponentModel;CultureInfoConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[this];ReturnValue;taint;df-generated |
-| System.ComponentModel;CultureInfoConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[1];ReturnValue;taint;df-generated |
-| System.ComponentModel;CultureInfoConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[2];ReturnValue;taint;df-generated |
-| System.ComponentModel;CultureInfoConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[this];ReturnValue;taint;df-generated |
-| System.ComponentModel;CultureInfoConverter;GetCultureName;(System.Globalization.CultureInfo);Argument[0];ReturnValue;taint;df-generated |
-| System.ComponentModel;CultureInfoConverter;GetStandardValues;(System.ComponentModel.ITypeDescriptorContext);Argument[0];ReturnValue;taint;df-generated |
+| System.ComponentModel;Container;CreateSite;(System.ComponentModel.IComponent,System.String);Argument[this];ReturnValue.SyntheticField[System.ComponentModel.Container+Site.Container];value;dfc-generated |
+| System.ComponentModel;Container;GetService;(System.Type);Argument[this];ReturnValue;value;dfc-generated |
+| System.ComponentModel;ContainerFilterService;FilterComponents;(System.ComponentModel.ComponentCollection);Argument[0];ReturnValue;value;dfc-generated |
+| System.ComponentModel;CultureInfoConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue.Element;taint;dfc-generated |
+| System.ComponentModel;CultureInfoConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue;taint;dfc-generated |
+| System.ComponentModel;CultureInfoConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue;value;dfc-generated |
+| System.ComponentModel;CultureInfoConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[2].Element;ReturnValue;taint;dfc-generated |
+| System.ComponentModel;CultureInfoConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[2];ReturnValue;taint;dfc-generated |
+| System.ComponentModel;CultureInfoConverter;GetCultureName;(System.Globalization.CultureInfo);Argument[0].Property[System.Globalization.CultureInfo.Name];ReturnValue;value;dfc-generated |
 | System.ComponentModel;CultureInfoConverter;GetStandardValues;(System.ComponentModel.ITypeDescriptorContext);Argument[this];ReturnValue;taint;df-generated |
 | System.ComponentModel;CustomTypeDescriptor;CustomTypeDescriptor;(System.ComponentModel.ICustomTypeDescriptor);Argument[0];Argument[this];taint;df-generated |
-| System.ComponentModel;DateOnlyConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[0];ReturnValue;taint;df-generated |
-| System.ComponentModel;DateOnlyConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue;taint;df-generated |
-| System.ComponentModel;DateOnlyConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[this];ReturnValue;taint;df-generated |
-| System.ComponentModel;DateOnlyConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[1];ReturnValue;taint;df-generated |
-| System.ComponentModel;DateOnlyConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[2];ReturnValue;taint;df-generated |
-| System.ComponentModel;DateOnlyConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[this];ReturnValue;taint;df-generated |
-| System.ComponentModel;DateTimeConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[0];ReturnValue;taint;df-generated |
-| System.ComponentModel;DateTimeConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue;taint;df-generated |
-| System.ComponentModel;DateTimeConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[this];ReturnValue;taint;df-generated |
-| System.ComponentModel;DateTimeConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[1];ReturnValue;taint;df-generated |
-| System.ComponentModel;DateTimeConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[2];ReturnValue;taint;df-generated |
-| System.ComponentModel;DateTimeConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[this];ReturnValue;taint;df-generated |
-| System.ComponentModel;DateTimeOffsetConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[0];ReturnValue;taint;df-generated |
-| System.ComponentModel;DateTimeOffsetConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue;taint;df-generated |
-| System.ComponentModel;DateTimeOffsetConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[this];ReturnValue;taint;df-generated |
-| System.ComponentModel;DateTimeOffsetConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[1];ReturnValue;taint;df-generated |
-| System.ComponentModel;DateTimeOffsetConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[2];ReturnValue;taint;df-generated |
-| System.ComponentModel;DateTimeOffsetConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[this];ReturnValue;taint;df-generated |
-| System.ComponentModel;DecimalConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[1];ReturnValue;taint;df-generated |
-| System.ComponentModel;DecimalConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[2];ReturnValue;taint;df-generated |
-| System.ComponentModel;DecimalConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[this];ReturnValue;taint;df-generated |
-| System.ComponentModel;DefaultValueAttribute;DefaultValueAttribute;(System.Object);Argument[0];Argument[this];taint;df-generated |
-| System.ComponentModel;DefaultValueAttribute;DefaultValueAttribute;(System.String);Argument[0];Argument[this];taint;df-generated |
-| System.ComponentModel;DefaultValueAttribute;DefaultValueAttribute;(System.Type,System.String);Argument[1];Argument[this];taint;df-generated |
-| System.ComponentModel;DefaultValueAttribute;SetValue;(System.Object);Argument[0];Argument[this];taint;df-generated |
-| System.ComponentModel;DefaultValueAttribute;get_Value;();Argument[this];ReturnValue;taint;df-generated |
-| System.ComponentModel;DescriptionAttribute;get_Description;();Argument[this];ReturnValue;taint;df-generated |
-| System.ComponentModel;DisplayNameAttribute;get_DisplayName;();Argument[this];ReturnValue;taint;df-generated |
+| System.ComponentModel;DateOnlyConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue.Element;taint;dfc-generated |
+| System.ComponentModel;DateOnlyConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue;taint;dfc-generated |
+| System.ComponentModel;DateOnlyConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue;value;dfc-generated |
+| System.ComponentModel;DateOnlyConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[2].Element;ReturnValue;taint;dfc-generated |
+| System.ComponentModel;DateOnlyConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[2];ReturnValue;taint;dfc-generated |
+| System.ComponentModel;DateTimeConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue.Element;taint;dfc-generated |
+| System.ComponentModel;DateTimeConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue;taint;dfc-generated |
+| System.ComponentModel;DateTimeConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue;value;dfc-generated |
+| System.ComponentModel;DateTimeConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[2].Element;ReturnValue;taint;dfc-generated |
+| System.ComponentModel;DateTimeConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[2];ReturnValue;taint;dfc-generated |
+| System.ComponentModel;DateTimeOffsetConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue.Element;taint;dfc-generated |
+| System.ComponentModel;DateTimeOffsetConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue;taint;dfc-generated |
+| System.ComponentModel;DateTimeOffsetConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue;value;dfc-generated |
+| System.ComponentModel;DateTimeOffsetConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[2].Element;ReturnValue;taint;dfc-generated |
+| System.ComponentModel;DateTimeOffsetConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[2];ReturnValue;taint;dfc-generated |
+| System.ComponentModel;DecimalConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[2].Element;ReturnValue;taint;dfc-generated |
+| System.ComponentModel;DecimalConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[2];ReturnValue;taint;dfc-generated |
+| System.ComponentModel;DefaultValueAttribute;DefaultValueAttribute;(System.Object);Argument[0];Argument[this].SyntheticField[System.ComponentModel.DefaultValueAttribute._value];value;dfc-generated |
+| System.ComponentModel;DefaultValueAttribute;DefaultValueAttribute;(System.String);Argument[0];Argument[this].SyntheticField[System.ComponentModel.DefaultValueAttribute._value];value;dfc-generated |
+| System.ComponentModel;DefaultValueAttribute;DefaultValueAttribute;(System.Type,System.String);Argument[1];Argument[this].SyntheticField[System.ComponentModel.DefaultValueAttribute._value];value;dfc-generated |
+| System.ComponentModel;DefaultValueAttribute;SetValue;(System.Object);Argument[0];Argument[this].SyntheticField[System.ComponentModel.DefaultValueAttribute._value];value;dfc-generated |
+| System.ComponentModel;DefaultValueAttribute;get_Value;();Argument[this].SyntheticField[System.ComponentModel.DefaultValueAttribute._value];ReturnValue;value;dfc-generated |
+| System.ComponentModel;DescriptionAttribute;DescriptionAttribute;(System.String);Argument[0];Argument[this].Property[System.ComponentModel.DescriptionAttribute.DescriptionValue];value;dfc-generated |
+| System.ComponentModel;DescriptionAttribute;get_Description;();Argument[this].Property[System.ComponentModel.DescriptionAttribute.DescriptionValue];ReturnValue;value;dfc-generated |
+| System.ComponentModel;DesignerAttribute;get_TypeId;();Argument[this].Property[System.ComponentModel.DesignerAttribute.DesignerBaseTypeName];Argument[this].SyntheticField[System.ComponentModel.DesignerAttribute._typeId];taint;df-generated |
+| System.ComponentModel;DesignerAttribute;get_TypeId;();Argument[this].Property[System.ComponentModel.DesignerAttribute.DesignerBaseTypeName];Argument[this].SyntheticField[System.ComponentModel.DesignerAttribute._typeId];taint;dfc-generated |
+| System.ComponentModel;DesignerAttribute;get_TypeId;();Argument[this].Property[System.ComponentModel.DesignerAttribute.DesignerBaseTypeName];ReturnValue;taint;df-generated |
+| System.ComponentModel;DesignerAttribute;get_TypeId;();Argument[this].Property[System.ComponentModel.DesignerAttribute.DesignerBaseTypeName];ReturnValue;taint;dfc-generated |
+| System.ComponentModel;DesignerAttribute;get_TypeId;();Argument[this].SyntheticField[System.ComponentModel.DesignerAttribute._typeId];ReturnValue;value;df-generated |
+| System.ComponentModel;DesignerAttribute;get_TypeId;();Argument[this].SyntheticField[System.ComponentModel.DesignerAttribute._typeId];ReturnValue;value;dfc-generated |
+| System.ComponentModel;DesignerCategoryAttribute;get_TypeId;();Argument[this].Property[System.ComponentModel.DesignerCategoryAttribute.Category];ReturnValue;taint;df-generated |
+| System.ComponentModel;DesignerCategoryAttribute;get_TypeId;();Argument[this].Property[System.ComponentModel.DesignerCategoryAttribute.Category];ReturnValue;taint;dfc-generated |
+| System.ComponentModel;DisplayNameAttribute;get_DisplayName;();Argument[this].Property[System.ComponentModel.DisplayNameAttribute.DisplayNameValue];ReturnValue;value;dfc-generated |
 | System.ComponentModel;DoWorkEventHandler;BeginInvoke;(System.Object,System.ComponentModel.DoWorkEventArgs,System.AsyncCallback,System.Object);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
-| System.ComponentModel;EnumConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[0];ReturnValue;taint;df-generated |
-| System.ComponentModel;EnumConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue;taint;df-generated |
-| System.ComponentModel;EnumConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[this];ReturnValue;taint;df-generated |
-| System.ComponentModel;EnumConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[1];ReturnValue;taint;df-generated |
-| System.ComponentModel;EnumConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[2];ReturnValue;taint;df-generated |
-| System.ComponentModel;EnumConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[this];ReturnValue;taint;df-generated |
-| System.ComponentModel;EnumConverter;GetStandardValues;(System.ComponentModel.ITypeDescriptorContext);Argument[0];ReturnValue;taint;df-generated |
+| System.ComponentModel;EditorAttribute;get_TypeId;();Argument[this].Property[System.ComponentModel.EditorAttribute.EditorBaseTypeName];Argument[this].SyntheticField[System.ComponentModel.EditorAttribute._typeId];taint;df-generated |
+| System.ComponentModel;EditorAttribute;get_TypeId;();Argument[this].Property[System.ComponentModel.EditorAttribute.EditorBaseTypeName];Argument[this].SyntheticField[System.ComponentModel.EditorAttribute._typeId];taint;dfc-generated |
+| System.ComponentModel;EditorAttribute;get_TypeId;();Argument[this].Property[System.ComponentModel.EditorAttribute.EditorBaseTypeName];ReturnValue;taint;df-generated |
+| System.ComponentModel;EditorAttribute;get_TypeId;();Argument[this].Property[System.ComponentModel.EditorAttribute.EditorBaseTypeName];ReturnValue;taint;dfc-generated |
+| System.ComponentModel;EditorAttribute;get_TypeId;();Argument[this].SyntheticField[System.ComponentModel.EditorAttribute._typeId];ReturnValue;value;df-generated |
+| System.ComponentModel;EditorAttribute;get_TypeId;();Argument[this].SyntheticField[System.ComponentModel.EditorAttribute._typeId];ReturnValue;value;dfc-generated |
+| System.ComponentModel;EnumConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue.Element;taint;dfc-generated |
+| System.ComponentModel;EnumConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue;taint;dfc-generated |
+| System.ComponentModel;EnumConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue;value;dfc-generated |
+| System.ComponentModel;EnumConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[2].Element;ReturnValue;taint;dfc-generated |
+| System.ComponentModel;EnumConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[2];ReturnValue;taint;dfc-generated |
+| System.ComponentModel;EnumConverter;GetStandardValues;(System.ComponentModel.ITypeDescriptorContext);Argument[this].Property[System.ComponentModel.EnumConverter.Values];ReturnValue;value;df-generated |
+| System.ComponentModel;EnumConverter;GetStandardValues;(System.ComponentModel.ITypeDescriptorContext);Argument[this].Property[System.ComponentModel.EnumConverter.Values];ReturnValue;value;dfc-generated |
 | System.ComponentModel;EnumConverter;GetStandardValues;(System.ComponentModel.ITypeDescriptorContext);Argument[this];ReturnValue;taint;df-generated |
+| System.ComponentModel;EnumConverter;GetStandardValues;(System.ComponentModel.ITypeDescriptorContext);Argument[this];ReturnValue;taint;dfc-generated |
 | System.ComponentModel;EventDescriptorCollection;Add;(System.ComponentModel.EventDescriptor);Argument[0];Argument[this].Element;value;manual |
 | System.ComponentModel;EventDescriptorCollection;Clear;();Argument[this].WithoutElement;Argument[this];value;manual |
 | System.ComponentModel;EventDescriptorCollection;EventDescriptorCollection;(System.ComponentModel.EventDescriptor[]);Argument[0].Element;Argument[this];taint;df-generated |
@@ -5307,25 +6000,20 @@
 | System.ComponentModel;EventDescriptorCollection;Sort;(System.String[],System.Collections.IComparer);Argument[this];ReturnValue;taint;df-generated |
 | System.ComponentModel;EventDescriptorCollection;get_Item;(System.Int32);Argument[this].Element;ReturnValue;value;manual |
 | System.ComponentModel;EventDescriptorCollection;get_Item;(System.String);Argument[this].Element;ReturnValue;value;manual |
-| System.ComponentModel;EventHandlerList;AddHandler;(System.Object,System.Delegate);Argument[0];Argument[this];taint;df-generated |
-| System.ComponentModel;EventHandlerList;AddHandler;(System.Object,System.Delegate);Argument[1];Argument[this];taint;df-generated |
-| System.ComponentModel;EventHandlerList;AddHandlers;(System.ComponentModel.EventHandlerList);Argument[0];Argument[this];taint;df-generated |
-| System.ComponentModel;EventHandlerList;get_Item;(System.Object);Argument[this];ReturnValue;taint;df-generated |
-| System.ComponentModel;EventHandlerList;set_Item;(System.Object,System.Delegate);Argument[0];Argument[this];taint;df-generated |
-| System.ComponentModel;EventHandlerList;set_Item;(System.Object,System.Delegate);Argument[1];Argument[this];taint;df-generated |
+| System.ComponentModel;EventHandlerList;AddHandler;(System.Object,System.Delegate);Argument[1];Argument[this].SyntheticField[System.ComponentModel.EventHandlerList._head].SyntheticField[System.ComponentModel.EventHandlerList+ListEntry._handler];value;dfc-generated |
+| System.ComponentModel;EventHandlerList;AddHandlers;(System.ComponentModel.EventHandlerList);Argument[0].SyntheticField[System.ComponentModel.EventHandlerList._head].SyntheticField[System.ComponentModel.EventHandlerList+ListEntry._handler];Argument[this].SyntheticField[System.ComponentModel.EventHandlerList._head].SyntheticField[System.ComponentModel.EventHandlerList+ListEntry._handler];value;dfc-generated |
+| System.ComponentModel;EventHandlerList;get_Item;(System.Object);Argument[this].SyntheticField[System.ComponentModel.EventHandlerList._head].SyntheticField[System.ComponentModel.EventHandlerList+ListEntry._handler];ReturnValue;value;dfc-generated |
+| System.ComponentModel;EventHandlerList;set_Item;(System.Object,System.Delegate);Argument[1];Argument[this].SyntheticField[System.ComponentModel.EventHandlerList._head].SyntheticField[System.ComponentModel.EventHandlerList+ListEntry._handler];value;dfc-generated |
 | System.ComponentModel;ExpandableObjectConverter;GetProperties;(System.ComponentModel.ITypeDescriptorContext,System.Object,System.Attribute[]);Argument[1];ReturnValue;taint;df-generated |
-| System.ComponentModel;GuidConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[0];ReturnValue;taint;df-generated |
-| System.ComponentModel;GuidConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue;taint;df-generated |
-| System.ComponentModel;GuidConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[this];ReturnValue;taint;df-generated |
-| System.ComponentModel;GuidConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[1];ReturnValue;taint;df-generated |
-| System.ComponentModel;GuidConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[2];ReturnValue;taint;df-generated |
-| System.ComponentModel;GuidConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[this];ReturnValue;taint;df-generated |
+| System.ComponentModel;GuidConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue.Element;taint;dfc-generated |
+| System.ComponentModel;GuidConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue;taint;dfc-generated |
+| System.ComponentModel;GuidConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue;value;dfc-generated |
+| System.ComponentModel;GuidConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[2].Element;ReturnValue;taint;dfc-generated |
+| System.ComponentModel;GuidConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[2];ReturnValue;taint;dfc-generated |
 | System.ComponentModel;HandledEventHandler;BeginInvoke;(System.Object,System.ComponentModel.HandledEventArgs,System.AsyncCallback,System.Object);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
-| System.ComponentModel;IBindingList;AddNew;();Argument[this];ReturnValue;taint;df-generated |
 | System.ComponentModel;IBindingList;ApplySort;(System.ComponentModel.PropertyDescriptor,System.ComponentModel.ListSortDirection);Argument[0];Argument[this];taint;df-generated |
 | System.ComponentModel;IBindingList;Find;(System.ComponentModel.PropertyDescriptor,System.Object);Argument[this].Element;ReturnValue;value;manual |
 | System.ComponentModel;IBindingList;add_ListChanged;(System.ComponentModel.ListChangedEventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
-| System.ComponentModel;IBindingList;get_SortProperty;();Argument[this];ReturnValue;taint;df-generated |
 | System.ComponentModel;IBindingList;remove_ListChanged;(System.ComponentModel.ListChangedEventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.ComponentModel;IBindingListView;ApplySort;(System.ComponentModel.ListSortDescriptionCollection);Argument[0].Element;Argument[this];taint;df-generated |
 | System.ComponentModel;IComponent;add_Disposed;(System.EventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
@@ -5334,12 +6022,9 @@
 | System.ComponentModel;IContainer;Add;(System.ComponentModel.IComponent,System.String);Argument[1];Argument[0];taint;df-generated |
 | System.ComponentModel;IContainer;Add;(System.ComponentModel.IComponent,System.String);Argument[this];Argument[0];taint;df-generated |
 | System.ComponentModel;IContainer;get_Components;();Argument[this];ReturnValue;taint;df-generated |
-| System.ComponentModel;ICustomTypeDescriptor;GetAttributes;();Argument[this];ReturnValue;taint;df-generated |
 | System.ComponentModel;ICustomTypeDescriptor;GetProperties;();Argument[this];ReturnValue;taint;df-generated |
 | System.ComponentModel;ICustomTypeDescriptor;GetProperties;(System.Attribute[]);Argument[this];ReturnValue;taint;df-generated |
-| System.ComponentModel;ICustomTypeDescriptor;GetPropertyOwner;(System.ComponentModel.PropertyDescriptor);Argument[this];ReturnValue;taint;df-generated |
-| System.ComponentModel;ICustomTypeDescriptor;GetPropertyOwner;(System.ComponentModel.PropertyDescriptor);Argument[this];ReturnValue;value;df-generated |
-| System.ComponentModel;IDataErrorInfo;get_Error;();Argument[this];ReturnValue;taint;df-generated |
+| System.ComponentModel;ICustomTypeDescriptor;GetPropertyOwner;(System.ComponentModel.PropertyDescriptor);Argument[this];ReturnValue;value;dfc-generated |
 | System.ComponentModel;IListSource;GetList;();Argument[this];ReturnValue;taint;df-generated |
 | System.ComponentModel;INestedSite;get_FullName;();Argument[this];ReturnValue;taint;df-generated |
 | System.ComponentModel;INotifyDataErrorInfo;add_ErrorsChanged;(System.EventHandler<System.ComponentModel.DataErrorsChangedEventArgs>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
@@ -5361,7 +6046,9 @@
 | System.ComponentModel;LicenseException;LicenseException;(System.Type,System.Object,System.String,System.Exception);Argument[1];Argument[this];taint;df-generated |
 | System.ComponentModel;LicenseProvider;GetLicense;(System.ComponentModel.LicenseContext,System.Type,System.Object,System.Boolean);Argument[0];ReturnValue;taint;df-generated |
 | System.ComponentModel;LicenseProvider;GetLicense;(System.ComponentModel.LicenseContext,System.Type,System.Object,System.Boolean);Argument[this];ReturnValue;taint;df-generated |
-| System.ComponentModel;LicenseProviderAttribute;LicenseProviderAttribute;(System.String);Argument[0];Argument[this];taint;df-generated |
+| System.ComponentModel;LicenseProviderAttribute;LicenseProviderAttribute;(System.String);Argument[0];Argument[this].SyntheticField[System.ComponentModel.LicenseProviderAttribute._licenseProviderName];value;dfc-generated |
+| System.ComponentModel;LicenseProviderAttribute;get_TypeId;();Argument[this].SyntheticField[System.ComponentModel.LicenseProviderAttribute._licenseProviderName];ReturnValue;taint;df-generated |
+| System.ComponentModel;LicenseProviderAttribute;get_TypeId;();Argument[this].SyntheticField[System.ComponentModel.LicenseProviderAttribute._licenseProviderName];ReturnValue;taint;dfc-generated |
 | System.ComponentModel;ListChangedEventHandler;BeginInvoke;(System.Object,System.ComponentModel.ListChangedEventArgs,System.AsyncCallback,System.Object);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
 | System.ComponentModel;ListSortDescriptionCollection;ListSortDescriptionCollection;(System.ComponentModel.ListSortDescription[]);Argument[0].Element;Argument[this];taint;df-generated |
 | System.ComponentModel;ListSortDescriptionCollection;get_Item;(System.Int32);Argument[this].Element;ReturnValue;value;manual |
@@ -5376,52 +6063,47 @@
 | System.ComponentModel;MaskedTextProvider;ToString;(System.Boolean,System.Boolean,System.Int32,System.Int32);Argument[this];ReturnValue;taint;df-generated |
 | System.ComponentModel;MaskedTextProvider;ToString;(System.Boolean,System.Int32,System.Int32);Argument[this];ReturnValue;taint;df-generated |
 | System.ComponentModel;MaskedTextProvider;ToString;(System.Int32,System.Int32);Argument[this];ReturnValue;taint;df-generated |
-| System.ComponentModel;MemberDescriptor;CreateAttributeCollection;();Argument[this];ReturnValue;taint;df-generated |
 | System.ComponentModel;MemberDescriptor;FillAttributes;(System.Collections.IList);Argument[this];Argument[0].Element;taint;df-generated |
-| System.ComponentModel;MemberDescriptor;GetInvocationTarget;(System.Type,System.Object);Argument[1];ReturnValue;taint;df-generated |
-| System.ComponentModel;MemberDescriptor;GetInvokee;(System.Type,System.Object);Argument[1];ReturnValue;taint;df-generated |
-| System.ComponentModel;MemberDescriptor;GetSite;(System.Object);Argument[0];ReturnValue;taint;df-generated |
-| System.ComponentModel;MemberDescriptor;MemberDescriptor;(System.ComponentModel.MemberDescriptor);Argument[0];Argument[this];taint;df-generated |
+| System.ComponentModel;MemberDescriptor;GetInvocationTarget;(System.Type,System.Object);Argument[1];ReturnValue;value;dfc-generated |
+| System.ComponentModel;MemberDescriptor;GetInvokee;(System.Type,System.Object);Argument[1];ReturnValue;value;dfc-generated |
+| System.ComponentModel;MemberDescriptor;GetSite;(System.Object);Argument[0].Property[System.ComponentModel.Component.Site];ReturnValue;value;dfc-generated |
+| System.ComponentModel;MemberDescriptor;GetSite;(System.Object);Argument[0].Property[System.ComponentModel.IComponent.Site];ReturnValue;value;dfc-generated |
+| System.ComponentModel;MemberDescriptor;MemberDescriptor;(System.ComponentModel.MemberDescriptor);Argument[this].SyntheticField[System.ComponentModel.MemberDescriptor._name];Argument[this].SyntheticField[System.ComponentModel.MemberDescriptor._displayName];value;dfc-generated |
 | System.ComponentModel;MemberDescriptor;MemberDescriptor;(System.ComponentModel.MemberDescriptor,System.Attribute[]);Argument[0];Argument[this];taint;df-generated |
 | System.ComponentModel;MemberDescriptor;MemberDescriptor;(System.ComponentModel.MemberDescriptor,System.Attribute[]);Argument[1].Element;Argument[this];taint;df-generated |
-| System.ComponentModel;MemberDescriptor;MemberDescriptor;(System.String,System.Attribute[]);Argument[0];Argument[this];taint;df-generated |
-| System.ComponentModel;MemberDescriptor;MemberDescriptor;(System.String,System.Attribute[]);Argument[1].Element;Argument[this];taint;df-generated |
+| System.ComponentModel;MemberDescriptor;MemberDescriptor;(System.String,System.Attribute[]);Argument[0];Argument[this].SyntheticField[System.ComponentModel.MemberDescriptor._displayName];value;dfc-generated |
+| System.ComponentModel;MemberDescriptor;MemberDescriptor;(System.String,System.Attribute[]);Argument[0];Argument[this].SyntheticField[System.ComponentModel.MemberDescriptor._name];value;dfc-generated |
 | System.ComponentModel;MemberDescriptor;get_Attributes;();Argument[this];ReturnValue;taint;df-generated |
-| System.ComponentModel;MemberDescriptor;get_DisplayName;();Argument[this];ReturnValue;taint;df-generated |
-| System.ComponentModel;MemberDescriptor;get_Name;();Argument[this];ReturnValue;taint;df-generated |
-| System.ComponentModel;MultilineStringConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[1];ReturnValue;taint;df-generated |
-| System.ComponentModel;MultilineStringConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[2];ReturnValue;taint;df-generated |
-| System.ComponentModel;MultilineStringConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[this];ReturnValue;taint;df-generated |
+| System.ComponentModel;MemberDescriptor;get_DisplayName;();Argument[this].SyntheticField[System.ComponentModel.MemberDescriptor._displayName];ReturnValue;value;dfc-generated |
+| System.ComponentModel;MemberDescriptor;get_Name;();Argument[this].SyntheticField[System.ComponentModel.MemberDescriptor._name];ReturnValue;value;dfc-generated |
+| System.ComponentModel;MultilineStringConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[2].Element;ReturnValue;taint;dfc-generated |
+| System.ComponentModel;MultilineStringConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[2];ReturnValue;taint;dfc-generated |
 | System.ComponentModel;MultilineStringConverter;GetProperties;(System.ComponentModel.ITypeDescriptorContext,System.Object,System.Attribute[]);Argument[1];ReturnValue;taint;df-generated |
-| System.ComponentModel;NestedContainer;CreateSite;(System.ComponentModel.IComponent,System.String);Argument[0];ReturnValue;taint;df-generated |
-| System.ComponentModel;NestedContainer;CreateSite;(System.ComponentModel.IComponent,System.String);Argument[1];ReturnValue;taint;df-generated |
-| System.ComponentModel;NestedContainer;CreateSite;(System.ComponentModel.IComponent,System.String);Argument[this];ReturnValue;taint;df-generated |
-| System.ComponentModel;NestedContainer;GetService;(System.Type);Argument[this];ReturnValue;taint;df-generated |
-| System.ComponentModel;NestedContainer;GetService;(System.Type);Argument[this];ReturnValue;value;df-generated |
-| System.ComponentModel;NullableConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[0];ReturnValue;taint;df-generated |
-| System.ComponentModel;NullableConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue;taint;df-generated |
-| System.ComponentModel;NullableConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[this];ReturnValue;taint;df-generated |
-| System.ComponentModel;NullableConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[1];ReturnValue;taint;df-generated |
-| System.ComponentModel;NullableConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[2];ReturnValue;taint;df-generated |
-| System.ComponentModel;NullableConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[this];ReturnValue;taint;df-generated |
+| System.ComponentModel;NestedContainer;CreateSite;(System.ComponentModel.IComponent,System.String);Argument[1];ReturnValue.SyntheticField[System.ComponentModel.NestedContainer+Site._name];value;dfc-generated |
+| System.ComponentModel;NestedContainer;CreateSite;(System.ComponentModel.IComponent,System.String);Argument[this];ReturnValue.SyntheticField[System.ComponentModel.Container+Site.Container];value;dfc-generated |
+| System.ComponentModel;NestedContainer;CreateSite;(System.ComponentModel.IComponent,System.String);Argument[this];ReturnValue.SyntheticField[System.ComponentModel.NestedContainer+Site.Container];value;dfc-generated |
+| System.ComponentModel;NestedContainer;GetService;(System.Type);Argument[this];ReturnValue;value;dfc-generated |
+| System.ComponentModel;NullableConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2].Property[System.Uri.OriginalString];ReturnValue;taint;dfc-generated |
+| System.ComponentModel;NullableConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue.Element;taint;dfc-generated |
+| System.ComponentModel;NullableConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue;taint;dfc-generated |
+| System.ComponentModel;NullableConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue;value;dfc-generated |
+| System.ComponentModel;NullableConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[1].Property[System.Globalization.CultureInfo.TextInfo].Property[System.Globalization.TextInfo.ListSeparator];ReturnValue;taint;dfc-generated |
+| System.ComponentModel;NullableConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[2].Element;ReturnValue;taint;dfc-generated |
+| System.ComponentModel;NullableConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[2];ReturnValue;taint;dfc-generated |
 | System.ComponentModel;NullableConverter;GetProperties;(System.ComponentModel.ITypeDescriptorContext,System.Object,System.Attribute[]);Argument[1];ReturnValue;taint;df-generated |
-| System.ComponentModel;NullableConverter;GetStandardValues;(System.ComponentModel.ITypeDescriptorContext);Argument[0];ReturnValue;taint;df-generated |
 | System.ComponentModel;NullableConverter;GetStandardValues;(System.ComponentModel.ITypeDescriptorContext);Argument[this];ReturnValue;taint;df-generated |
-| System.ComponentModel;ProgressChangedEventArgs;ProgressChangedEventArgs;(System.Int32,System.Object);Argument[1];Argument[this];taint;df-generated |
-| System.ComponentModel;ProgressChangedEventArgs;get_UserState;();Argument[this];ReturnValue;taint;df-generated |
+| System.ComponentModel;ProgressChangedEventArgs;ProgressChangedEventArgs;(System.Int32,System.Object);Argument[1];Argument[this].SyntheticField[System.ComponentModel.ProgressChangedEventArgs._userState];value;dfc-generated |
+| System.ComponentModel;ProgressChangedEventArgs;get_UserState;();Argument[this].SyntheticField[System.ComponentModel.ProgressChangedEventArgs._userState];ReturnValue;value;dfc-generated |
 | System.ComponentModel;ProgressChangedEventHandler;BeginInvoke;(System.Object,System.ComponentModel.ProgressChangedEventArgs,System.AsyncCallback,System.Object);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
 | System.ComponentModel;PropertyChangedEventHandler;BeginInvoke;(System.Object,System.ComponentModel.PropertyChangedEventArgs,System.AsyncCallback,System.Object);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
 | System.ComponentModel;PropertyChangingEventHandler;BeginInvoke;(System.Object,System.ComponentModel.PropertyChangingEventArgs,System.AsyncCallback,System.Object);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
 | System.ComponentModel;PropertyDescriptor;AddValueChanged;(System.Object,System.EventHandler);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
 | System.ComponentModel;PropertyDescriptor;GetEditor;(System.Type);Argument[this];ReturnValue;taint;df-generated |
-| System.ComponentModel;PropertyDescriptor;GetValue;(System.Object);Argument[0];Argument[this];taint;df-generated |
-| System.ComponentModel;PropertyDescriptor;GetValue;(System.Object);Argument[0];ReturnValue;taint;df-generated |
-| System.ComponentModel;PropertyDescriptor;GetValue;(System.Object);Argument[this];ReturnValue;taint;df-generated |
+| System.ComponentModel;PropertyDescriptor;GetValue;(System.Object);Argument[0];ReturnValue;taint;dfc-generated |
 | System.ComponentModel;PropertyDescriptor;RemoveValueChanged;(System.Object,System.EventHandler);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
 | System.ComponentModel;PropertyDescriptor;ResetValue;(System.Object);Argument[this];Argument[0];taint;df-generated |
 | System.ComponentModel;PropertyDescriptor;SetValue;(System.Object,System.Object);Argument[0];Argument[this];taint;df-generated |
 | System.ComponentModel;PropertyDescriptor;SetValue;(System.Object,System.Object);Argument[1];Argument[0];taint;df-generated |
-| System.ComponentModel;PropertyDescriptor;SetValue;(System.Object,System.Object);Argument[1];Argument[this];taint;df-generated |
 | System.ComponentModel;PropertyDescriptor;SetValue;(System.Object,System.Object);Argument[this];Argument[0];taint;df-generated |
 | System.ComponentModel;PropertyDescriptor;get_Converter;();Argument[this];ReturnValue;taint;df-generated |
 | System.ComponentModel;PropertyDescriptorCollection;Add;(System.ComponentModel.PropertyDescriptor);Argument[0].Property[System.Collections.Generic.KeyValuePair`2.Key];Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Key];value;manual |
@@ -5453,74 +6135,61 @@
 | System.ComponentModel;PropertyDescriptorCollection;set_Item;(System.Int32,System.Object);Argument[0];Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Key];value;manual |
 | System.ComponentModel;PropertyDescriptorCollection;set_Item;(System.Int32,System.Object);Argument[1];Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Value];value;manual |
 | System.ComponentModel;PropertyDescriptorCollection;set_Item;(System.Object,System.Object);Argument[1];Argument[this].Element;value;manual |
-| System.ComponentModel;PropertyTabAttribute;InitializeArrays;(System.String[],System.ComponentModel.PropertyTabScope[]);Argument[0].Element;Argument[this];taint;df-generated |
-| System.ComponentModel;PropertyTabAttribute;InitializeArrays;(System.Type[],System.ComponentModel.PropertyTabScope[]);Argument[0].Element;Argument[this];taint;df-generated |
-| System.ComponentModel;PropertyTabAttribute;PropertyTabAttribute;(System.String,System.ComponentModel.PropertyTabScope);Argument[0];Argument[this];taint;df-generated |
-| System.ComponentModel;PropertyTabAttribute;get_TabClassNames;();Argument[this];ReturnValue;taint;df-generated |
-| System.ComponentModel;PropertyTabAttribute;get_TabClasses;();Argument[this];ReturnValue;taint;df-generated |
-| System.ComponentModel;ReferenceConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[0];ReturnValue;taint;df-generated |
-| System.ComponentModel;ReferenceConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue;taint;df-generated |
-| System.ComponentModel;ReferenceConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[this];ReturnValue;taint;df-generated |
-| System.ComponentModel;ReferenceConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[1];ReturnValue;taint;df-generated |
-| System.ComponentModel;ReferenceConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[2];ReturnValue;taint;df-generated |
-| System.ComponentModel;ReferenceConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[this];ReturnValue;taint;df-generated |
-| System.ComponentModel;ReferenceConverter;GetStandardValues;(System.ComponentModel.ITypeDescriptorContext);Argument[0];ReturnValue;taint;df-generated |
+| System.ComponentModel;PropertyTabAttribute;InitializeArrays;(System.String[],System.ComponentModel.PropertyTabScope[]);Argument[0].Element;Argument[this].SyntheticField[System.ComponentModel.PropertyTabAttribute._tabClassNames].Element;value;dfc-generated |
+| System.ComponentModel;PropertyTabAttribute;InitializeArrays;(System.Type[],System.ComponentModel.PropertyTabScope[]);Argument[0].Element;Argument[this].SyntheticField[System.ComponentModel.PropertyTabAttribute._tabClasses].Element;value;dfc-generated |
+| System.ComponentModel;PropertyTabAttribute;PropertyTabAttribute;(System.String,System.ComponentModel.PropertyTabScope);Argument[0];Argument[this].SyntheticField[System.ComponentModel.PropertyTabAttribute._tabClassNames].Element;value;dfc-generated |
+| System.ComponentModel;PropertyTabAttribute;get_TabClassNames;();Argument[this].SyntheticField[System.ComponentModel.PropertyTabAttribute._tabClassNames].Element;ReturnValue.Element;value;dfc-generated |
+| System.ComponentModel;PropertyTabAttribute;get_TabClasses;();Argument[this].SyntheticField[System.ComponentModel.PropertyTabAttribute._tabClasses];ReturnValue;value;dfc-generated |
+| System.ComponentModel;ProvidePropertyAttribute;get_TypeId;();Argument[this].Property[System.ComponentModel.ProvidePropertyAttribute.PropertyName];ReturnValue;taint;df-generated |
+| System.ComponentModel;ProvidePropertyAttribute;get_TypeId;();Argument[this].Property[System.ComponentModel.ProvidePropertyAttribute.PropertyName];ReturnValue;taint;dfc-generated |
+| System.ComponentModel;ReferenceConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue.Element;taint;dfc-generated |
+| System.ComponentModel;ReferenceConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue;taint;dfc-generated |
+| System.ComponentModel;ReferenceConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue;value;dfc-generated |
+| System.ComponentModel;ReferenceConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[2].Element;ReturnValue;taint;dfc-generated |
+| System.ComponentModel;ReferenceConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[2];ReturnValue;taint;dfc-generated |
 | System.ComponentModel;ReferenceConverter;GetStandardValues;(System.ComponentModel.ITypeDescriptorContext);Argument[this];ReturnValue;taint;df-generated |
 | System.ComponentModel;RefreshEventHandler;BeginInvoke;(System.ComponentModel.RefreshEventArgs,System.AsyncCallback,System.Object);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
-| System.ComponentModel;RunWorkerCompletedEventArgs;RunWorkerCompletedEventArgs;(System.Object,System.Exception,System.Boolean);Argument[0];Argument[this];taint;df-generated |
-| System.ComponentModel;RunWorkerCompletedEventArgs;get_Result;();Argument[this];ReturnValue;taint;df-generated |
-| System.ComponentModel;RunWorkerCompletedEventArgs;get_UserState;();Argument[this];ReturnValue;taint;df-generated |
+| System.ComponentModel;RunWorkerCompletedEventArgs;RunWorkerCompletedEventArgs;(System.Object,System.Exception,System.Boolean);Argument[0];Argument[this].SyntheticField[System.ComponentModel.RunWorkerCompletedEventArgs._result];value;dfc-generated |
+| System.ComponentModel;RunWorkerCompletedEventArgs;get_Result;();Argument[this].SyntheticField[System.ComponentModel.RunWorkerCompletedEventArgs._result];ReturnValue;value;dfc-generated |
+| System.ComponentModel;RunWorkerCompletedEventArgs;get_UserState;();Argument[this].Property[System.ComponentModel.AsyncCompletedEventArgs.UserState];ReturnValue;value;dfc-generated |
 | System.ComponentModel;RunWorkerCompletedEventHandler;BeginInvoke;(System.Object,System.ComponentModel.RunWorkerCompletedEventArgs,System.AsyncCallback,System.Object);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
-| System.ComponentModel;StringConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[0];ReturnValue;taint;df-generated |
-| System.ComponentModel;StringConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue;taint;df-generated |
-| System.ComponentModel;StringConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[this];ReturnValue;taint;df-generated |
-| System.ComponentModel;TimeOnlyConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[0];ReturnValue;taint;df-generated |
-| System.ComponentModel;TimeOnlyConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue;taint;df-generated |
-| System.ComponentModel;TimeOnlyConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[this];ReturnValue;taint;df-generated |
-| System.ComponentModel;TimeOnlyConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[1];ReturnValue;taint;df-generated |
-| System.ComponentModel;TimeOnlyConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[2];ReturnValue;taint;df-generated |
-| System.ComponentModel;TimeOnlyConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[this];ReturnValue;taint;df-generated |
-| System.ComponentModel;TimeSpanConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[0];ReturnValue;taint;df-generated |
-| System.ComponentModel;TimeSpanConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue;taint;df-generated |
-| System.ComponentModel;TimeSpanConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[this];ReturnValue;taint;df-generated |
-| System.ComponentModel;TimeSpanConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[1];ReturnValue;taint;df-generated |
-| System.ComponentModel;TimeSpanConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[2];ReturnValue;taint;df-generated |
-| System.ComponentModel;TimeSpanConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[this];ReturnValue;taint;df-generated |
-| System.ComponentModel;ToolboxItemAttribute;ToolboxItemAttribute;(System.String);Argument[0];Argument[this];taint;df-generated |
-| System.ComponentModel;ToolboxItemAttribute;get_ToolboxItemTypeName;();Argument[this];ReturnValue;taint;df-generated |
-| System.ComponentModel;ToolboxItemFilterAttribute;ToString;();Argument[this];ReturnValue;taint;df-generated |
-| System.ComponentModel;TypeConverter+StandardValuesCollection;StandardValuesCollection;(System.Collections.ICollection);Argument[0].Element;Argument[this];taint;df-generated |
-| System.ComponentModel;TypeConverter+StandardValuesCollection;get_Item;(System.Int32);Argument[this];ReturnValue;taint;df-generated |
-| System.ComponentModel;TypeConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[0];ReturnValue;taint;df-generated |
-| System.ComponentModel;TypeConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue;taint;df-generated |
-| System.ComponentModel;TypeConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[this];ReturnValue;taint;df-generated |
-| System.ComponentModel;TypeConverter;ConvertFrom;(System.Object);Argument[0];ReturnValue;taint;df-generated |
-| System.ComponentModel;TypeConverter;ConvertFrom;(System.Object);Argument[this];ReturnValue;taint;df-generated |
-| System.ComponentModel;TypeConverter;ConvertFromInvariantString;(System.ComponentModel.ITypeDescriptorContext,System.String);Argument[0];ReturnValue;taint;df-generated |
-| System.ComponentModel;TypeConverter;ConvertFromInvariantString;(System.ComponentModel.ITypeDescriptorContext,System.String);Argument[1];ReturnValue;taint;df-generated |
-| System.ComponentModel;TypeConverter;ConvertFromInvariantString;(System.ComponentModel.ITypeDescriptorContext,System.String);Argument[this];ReturnValue;taint;df-generated |
-| System.ComponentModel;TypeConverter;ConvertFromInvariantString;(System.String);Argument[0];ReturnValue;taint;df-generated |
-| System.ComponentModel;TypeConverter;ConvertFromInvariantString;(System.String);Argument[this];ReturnValue;taint;df-generated |
-| System.ComponentModel;TypeConverter;ConvertFromString;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.String);Argument[0];ReturnValue;taint;df-generated |
-| System.ComponentModel;TypeConverter;ConvertFromString;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.String);Argument[2];ReturnValue;taint;df-generated |
-| System.ComponentModel;TypeConverter;ConvertFromString;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.String);Argument[this];ReturnValue;taint;df-generated |
-| System.ComponentModel;TypeConverter;ConvertFromString;(System.ComponentModel.ITypeDescriptorContext,System.String);Argument[0];ReturnValue;taint;df-generated |
-| System.ComponentModel;TypeConverter;ConvertFromString;(System.ComponentModel.ITypeDescriptorContext,System.String);Argument[1];ReturnValue;taint;df-generated |
-| System.ComponentModel;TypeConverter;ConvertFromString;(System.ComponentModel.ITypeDescriptorContext,System.String);Argument[this];ReturnValue;taint;df-generated |
-| System.ComponentModel;TypeConverter;ConvertFromString;(System.String);Argument[0];ReturnValue;taint;df-generated |
-| System.ComponentModel;TypeConverter;ConvertFromString;(System.String);Argument[this];ReturnValue;taint;df-generated |
-| System.ComponentModel;TypeConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[1];ReturnValue;taint;df-generated |
-| System.ComponentModel;TypeConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[2];ReturnValue;taint;df-generated |
-| System.ComponentModel;TypeConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[this];ReturnValue;taint;df-generated |
+| System.ComponentModel;StringConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue.Element;taint;dfc-generated |
+| System.ComponentModel;StringConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue;taint;dfc-generated |
+| System.ComponentModel;StringConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue;value;dfc-generated |
+| System.ComponentModel;TimeOnlyConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue.Element;taint;dfc-generated |
+| System.ComponentModel;TimeOnlyConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue;taint;dfc-generated |
+| System.ComponentModel;TimeOnlyConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue;value;dfc-generated |
+| System.ComponentModel;TimeOnlyConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[2].Element;ReturnValue;taint;dfc-generated |
+| System.ComponentModel;TimeOnlyConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[2];ReturnValue;taint;dfc-generated |
+| System.ComponentModel;TimeSpanConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue.Element;taint;dfc-generated |
+| System.ComponentModel;TimeSpanConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue;taint;dfc-generated |
+| System.ComponentModel;TimeSpanConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue;value;dfc-generated |
+| System.ComponentModel;TimeSpanConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[2].Element;ReturnValue;taint;dfc-generated |
+| System.ComponentModel;TimeSpanConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[2];ReturnValue;taint;dfc-generated |
+| System.ComponentModel;ToolboxItemAttribute;ToolboxItemAttribute;(System.String);Argument[0];Argument[this].SyntheticField[System.ComponentModel.ToolboxItemAttribute._toolboxItemTypeName];value;dfc-generated |
+| System.ComponentModel;ToolboxItemAttribute;get_ToolboxItemTypeName;();Argument[this].SyntheticField[System.ComponentModel.ToolboxItemAttribute._toolboxItemTypeName];ReturnValue;value;dfc-generated |
+| System.ComponentModel;ToolboxItemFilterAttribute;ToString;();Argument[this].Property[System.ComponentModel.ToolboxItemFilterAttribute.FilterString];ReturnValue;taint;dfc-generated |
+| System.ComponentModel;TypeConverter+StandardValuesCollection;StandardValuesCollection;(System.Collections.ICollection);Argument[0];Argument[this].SyntheticField[System.ComponentModel.TypeConverter+StandardValuesCollection._values];value;dfc-generated |
+| System.ComponentModel;TypeConverter+StandardValuesCollection;get_Item;(System.Int32);Argument[this].SyntheticField[System.ComponentModel.TypeConverter+StandardValuesCollection._values].Element;ReturnValue;value;dfc-generated |
+| System.ComponentModel;TypeConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue.Element;taint;dfc-generated |
+| System.ComponentModel;TypeConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue;taint;dfc-generated |
+| System.ComponentModel;TypeConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue;value;dfc-generated |
+| System.ComponentModel;TypeConverter;ConvertFrom;(System.Object);Argument[0].Property[System.Uri.OriginalString];ReturnValue;taint;dfc-generated |
+| System.ComponentModel;TypeConverter;ConvertFrom;(System.Object);Argument[0];ReturnValue;value;dfc-generated |
+| System.ComponentModel;TypeConverter;ConvertFromInvariantString;(System.ComponentModel.ITypeDescriptorContext,System.String);Argument[1];ReturnValue;value;dfc-generated |
+| System.ComponentModel;TypeConverter;ConvertFromInvariantString;(System.String);Argument[0];ReturnValue;value;dfc-generated |
+| System.ComponentModel;TypeConverter;ConvertFromString;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.String);Argument[2];ReturnValue;value;dfc-generated |
+| System.ComponentModel;TypeConverter;ConvertFromString;(System.ComponentModel.ITypeDescriptorContext,System.String);Argument[1];ReturnValue;value;dfc-generated |
+| System.ComponentModel;TypeConverter;ConvertFromString;(System.String);Argument[0];ReturnValue;value;dfc-generated |
+| System.ComponentModel;TypeConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[2].Element;ReturnValue;taint;dfc-generated |
+| System.ComponentModel;TypeConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[2];ReturnValue;taint;dfc-generated |
 | System.ComponentModel;TypeConverter;ConvertTo;(System.Object,System.Type);Argument[0];ReturnValue;taint;df-generated |
 | System.ComponentModel;TypeConverter;ConvertTo;(System.Object,System.Type);Argument[this];ReturnValue;taint;df-generated |
 | System.ComponentModel;TypeConverter;ConvertToInvariantString;(System.ComponentModel.ITypeDescriptorContext,System.Object);Argument[1];ReturnValue;taint;df-generated |
 | System.ComponentModel;TypeConverter;ConvertToInvariantString;(System.ComponentModel.ITypeDescriptorContext,System.Object);Argument[this];ReturnValue;taint;df-generated |
 | System.ComponentModel;TypeConverter;ConvertToInvariantString;(System.Object);Argument[0];ReturnValue;taint;df-generated |
 | System.ComponentModel;TypeConverter;ConvertToInvariantString;(System.Object);Argument[this];ReturnValue;taint;df-generated |
-| System.ComponentModel;TypeConverter;ConvertToString;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[1];ReturnValue;taint;df-generated |
-| System.ComponentModel;TypeConverter;ConvertToString;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue;taint;df-generated |
-| System.ComponentModel;TypeConverter;ConvertToString;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[this];ReturnValue;taint;df-generated |
+| System.ComponentModel;TypeConverter;ConvertToString;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[1].Property[System.Globalization.CultureInfo.TextInfo].Property[System.Globalization.TextInfo.ListSeparator];ReturnValue;taint;dfc-generated |
 | System.ComponentModel;TypeConverter;ConvertToString;(System.ComponentModel.ITypeDescriptorContext,System.Object);Argument[1];ReturnValue;taint;df-generated |
 | System.ComponentModel;TypeConverter;ConvertToString;(System.ComponentModel.ITypeDescriptorContext,System.Object);Argument[this];ReturnValue;taint;df-generated |
 | System.ComponentModel;TypeConverter;ConvertToString;(System.Object);Argument[0];ReturnValue;taint;df-generated |
@@ -5529,9 +6198,8 @@
 | System.ComponentModel;TypeConverter;GetProperties;(System.ComponentModel.ITypeDescriptorContext,System.Object,System.Attribute[]);Argument[1];ReturnValue;taint;df-generated |
 | System.ComponentModel;TypeConverter;GetProperties;(System.Object);Argument[0];ReturnValue;taint;df-generated |
 | System.ComponentModel;TypeConverter;GetStandardValues;();Argument[this];ReturnValue;taint;df-generated |
-| System.ComponentModel;TypeConverter;GetStandardValues;(System.ComponentModel.ITypeDescriptorContext);Argument[0];ReturnValue;taint;df-generated |
 | System.ComponentModel;TypeConverter;GetStandardValues;(System.ComponentModel.ITypeDescriptorContext);Argument[this];ReturnValue;taint;df-generated |
-| System.ComponentModel;TypeConverter;SortProperties;(System.ComponentModel.PropertyDescriptorCollection,System.String[]);Argument[0].Element;ReturnValue;taint;df-generated |
+| System.ComponentModel;TypeConverter;SortProperties;(System.ComponentModel.PropertyDescriptorCollection,System.String[]);Argument[0];ReturnValue;value;dfc-generated |
 | System.ComponentModel;TypeDescriptionProvider;GetExtendedTypeDescriptor;(System.Object);Argument[0];ReturnValue;taint;df-generated |
 | System.ComponentModel;TypeDescriptionProvider;GetExtendedTypeDescriptor;(System.Object);Argument[this];ReturnValue;taint;df-generated |
 | System.ComponentModel;TypeDescriptionProvider;GetFullComponentName;(System.Object);Argument[0];ReturnValue;taint;df-generated |
@@ -5546,44 +6214,38 @@
 | System.ComponentModel;TypeDescriptor;CreateEvent;(System.Type,System.ComponentModel.EventDescriptor,System.Attribute[]);Argument[1];ReturnValue;taint;df-generated |
 | System.ComponentModel;TypeDescriptor;CreateProperty;(System.Type,System.ComponentModel.PropertyDescriptor,System.Attribute[]);Argument[1];ReturnValue;taint;df-generated |
 | System.ComponentModel;TypeDescriptor;CreateProperty;(System.Type,System.ComponentModel.PropertyDescriptor,System.Attribute[]);Argument[2].Element;ReturnValue;taint;df-generated |
-| System.ComponentModel;TypeDescriptor;GetAssociation;(System.Type,System.Object);Argument[1];ReturnValue;taint;df-generated |
+| System.ComponentModel;TypeDescriptor;GetAssociation;(System.Type,System.Object);Argument[1];ReturnValue;value;dfc-generated |
 | System.ComponentModel;TypeDescriptor;GetFullComponentName;(System.Object);Argument[0];ReturnValue;taint;df-generated |
 | System.ComponentModel;TypeDescriptor;add_Refreshed;(System.ComponentModel.RefreshEventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.ComponentModel;TypeDescriptor;remove_Refreshed;(System.ComponentModel.RefreshEventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
-| System.ComponentModel;TypeListConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[0];ReturnValue;taint;df-generated |
-| System.ComponentModel;TypeListConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue;taint;df-generated |
-| System.ComponentModel;TypeListConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[this];ReturnValue;taint;df-generated |
-| System.ComponentModel;TypeListConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[1];ReturnValue;taint;df-generated |
-| System.ComponentModel;TypeListConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[2];ReturnValue;taint;df-generated |
-| System.ComponentModel;TypeListConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[this];ReturnValue;taint;df-generated |
-| System.ComponentModel;TypeListConverter;GetStandardValues;(System.ComponentModel.ITypeDescriptorContext);Argument[0];ReturnValue;taint;df-generated |
+| System.ComponentModel;TypeListConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue.Element;taint;dfc-generated |
+| System.ComponentModel;TypeListConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue;taint;dfc-generated |
+| System.ComponentModel;TypeListConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue;value;dfc-generated |
+| System.ComponentModel;TypeListConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[2].Element;ReturnValue;taint;dfc-generated |
+| System.ComponentModel;TypeListConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[2];ReturnValue;taint;dfc-generated |
 | System.ComponentModel;TypeListConverter;GetStandardValues;(System.ComponentModel.ITypeDescriptorContext);Argument[this];ReturnValue;taint;df-generated |
 | System.ComponentModel;TypeListConverter;TypeListConverter;(System.Type[]);Argument[0].Element;Argument[this];taint;df-generated |
-| System.ComponentModel;VersionConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[0];ReturnValue;taint;df-generated |
-| System.ComponentModel;VersionConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue;taint;df-generated |
-| System.ComponentModel;VersionConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[this];ReturnValue;taint;df-generated |
-| System.ComponentModel;VersionConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[1];ReturnValue;taint;df-generated |
-| System.ComponentModel;VersionConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[2];ReturnValue;taint;df-generated |
-| System.ComponentModel;VersionConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[this];ReturnValue;taint;df-generated |
+| System.ComponentModel;VersionConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue.Element;taint;dfc-generated |
+| System.ComponentModel;VersionConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue;taint;dfc-generated |
+| System.ComponentModel;VersionConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue;value;dfc-generated |
+| System.ComponentModel;VersionConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[2].Element;ReturnValue;taint;dfc-generated |
+| System.ComponentModel;VersionConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[2];ReturnValue;taint;dfc-generated |
 | System.Configuration.Internal;IConfigErrorInfo;get_Filename;();Argument[this];ReturnValue;taint;df-generated |
 | System.Configuration.Internal;IConfigSystem;Init;(System.Type,System.Object[]);Argument[1].Element;Argument[this];taint;df-generated |
 | System.Configuration.Internal;IConfigSystem;get_Host;();Argument[this];ReturnValue;taint;df-generated |
 | System.Configuration.Internal;IConfigSystem;get_Root;();Argument[this];ReturnValue;taint;df-generated |
 | System.Configuration.Internal;IInternalConfigConfigurationFactory;Create;(System.Type,System.Object[]);Argument[1].Element;ReturnValue;taint;df-generated |
-| System.Configuration.Internal;IInternalConfigConfigurationFactory;NormalizeLocationSubPath;(System.String,System.Configuration.Internal.IConfigErrorInfo);Argument[0];ReturnValue;taint;df-generated |
+| System.Configuration.Internal;IInternalConfigConfigurationFactory;NormalizeLocationSubPath;(System.String,System.Configuration.Internal.IConfigErrorInfo);Argument[0];ReturnValue;value;dfc-generated |
 | System.Configuration.Internal;IInternalConfigHost;GetStreamName;(System.String);Argument[this];ReturnValue;taint;df-generated |
-| System.Configuration.Internal;IInternalConfigHost;GetStreamNameForConfigSource;(System.String,System.String);Argument[0];ReturnValue;taint;df-generated |
-| System.Configuration.Internal;IInternalConfigHost;GetStreamNameForConfigSource;(System.String,System.String);Argument[1];ReturnValue;taint;df-generated |
+| System.Configuration.Internal;IInternalConfigHost;GetStreamNameForConfigSource;(System.String,System.String);Argument[0];ReturnValue;taint;dfc-generated |
+| System.Configuration.Internal;IInternalConfigHost;GetStreamNameForConfigSource;(System.String,System.String);Argument[1];ReturnValue;taint;dfc-generated |
 | System.Configuration.Internal;IInternalConfigHost;Init;(System.Configuration.Internal.IInternalConfigRoot,System.Object[]);Argument[1].Element;Argument[this];taint;df-generated |
-| System.Configuration.Internal;IInternalConfigHost;InitForConfiguration;(System.String,System.String,System.String,System.Configuration.Internal.IInternalConfigRoot,System.Object[]);Argument[4].Element;Argument[this];taint;df-generated |
-| System.Configuration.Internal;IInternalConfigHost;InitForConfiguration;(System.String,System.String,System.String,System.Configuration.Internal.IInternalConfigRoot,System.Object[]);Argument[4].Element;ReturnValue;taint;df-generated |
-| System.Configuration.Internal;IInternalConfigHost;OpenStreamForRead;(System.String);Argument[0];ReturnValue;taint;df-generated |
-| System.Configuration.Internal;IInternalConfigHost;OpenStreamForRead;(System.String);Argument[this];ReturnValue;taint;df-generated |
-| System.Configuration.Internal;IInternalConfigHost;OpenStreamForRead;(System.String,System.Boolean);Argument[0];ReturnValue;taint;df-generated |
-| System.Configuration.Internal;IInternalConfigHost;OpenStreamForWrite;(System.String,System.String,System.Object);Argument[1];ReturnValue;taint;df-generated |
-| System.Configuration.Internal;IInternalConfigHost;OpenStreamForWrite;(System.String,System.String,System.Object);Argument[2];ReturnValue;taint;df-generated |
-| System.Configuration.Internal;IInternalConfigHost;OpenStreamForWrite;(System.String,System.String,System.Object,System.Boolean);Argument[1];ReturnValue;taint;df-generated |
-| System.Configuration.Internal;IInternalConfigHost;OpenStreamForWrite;(System.String,System.String,System.Object,System.Boolean);Argument[2];ReturnValue;taint;df-generated |
+| System.Configuration.Internal;IInternalConfigHost;InitForConfiguration;(System.String,System.String,System.String,System.Configuration.Internal.IInternalConfigRoot,System.Object[]);Argument[0];ReturnValue;value;dfc-generated |
+| System.Configuration.Internal;IInternalConfigHost;InitForConfiguration;(System.String,System.String,System.String,System.Configuration.Internal.IInternalConfigRoot,System.Object[]);Argument[4].Element;ReturnValue;value;dfc-generated |
+| System.Configuration.Internal;IInternalConfigHost;OpenStreamForRead;(System.String);Argument[0];ReturnValue;taint;dfc-generated |
+| System.Configuration.Internal;IInternalConfigHost;OpenStreamForRead;(System.String,System.Boolean);Argument[0];ReturnValue;taint;dfc-generated |
+| System.Configuration.Internal;IInternalConfigHost;OpenStreamForWrite;(System.String,System.String,System.Object);Argument[2];ReturnValue;value;dfc-generated |
+| System.Configuration.Internal;IInternalConfigHost;OpenStreamForWrite;(System.String,System.String,System.Object,System.Boolean);Argument[2];ReturnValue;value;dfc-generated |
 | System.Configuration.Internal;IInternalConfigHost;StartMonitoringStreamForChanges;(System.String,System.Configuration.Internal.StreamChangeCallback);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
 | System.Configuration.Internal;IInternalConfigHost;StopMonitoringStreamForChanges;(System.String,System.Configuration.Internal.StreamChangeCallback);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
 | System.Configuration.Internal;IInternalConfigRecord;GetLkgSection;(System.String);Argument[this];ReturnValue;taint;df-generated |
@@ -5606,55 +6268,88 @@
 | System.Configuration.Internal;IInternalConfigSystem;GetSection;(System.String);Argument[this];ReturnValue;taint;df-generated |
 | System.Configuration.Internal;InternalConfigEventHandler;BeginInvoke;(System.Object,System.Configuration.Internal.InternalConfigEventArgs,System.AsyncCallback,System.Object);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
 | System.Configuration.Internal;StreamChangeCallback;BeginInvoke;(System.String,System.AsyncCallback,System.Object);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
-| System.Configuration.Provider;ProviderBase;Initialize;(System.String,System.Collections.Specialized.NameValueCollection);Argument[0];Argument[this];taint;df-generated |
-| System.Configuration.Provider;ProviderBase;Initialize;(System.String,System.Collections.Specialized.NameValueCollection);Argument[1].Element;Argument[this];taint;df-generated |
-| System.Configuration.Provider;ProviderBase;get_Description;();Argument[this];ReturnValue;taint;df-generated |
-| System.Configuration.Provider;ProviderBase;get_Name;();Argument[this];ReturnValue;taint;df-generated |
+| System.Configuration.Provider;ProviderBase;Initialize;(System.String,System.Collections.Specialized.NameValueCollection);Argument[0];Argument[this].SyntheticField[System.Configuration.Provider.ProviderBase._name];value;dfc-generated |
+| System.Configuration.Provider;ProviderBase;get_Description;();Argument[this].Property[System.Configuration.Provider.ProviderBase.Name];ReturnValue;value;dfc-generated |
+| System.Configuration.Provider;ProviderBase;get_Description;();Argument[this].SyntheticField[System.Configuration.Provider.ProviderBase._name];ReturnValue;value;dfc-generated |
+| System.Configuration.Provider;ProviderBase;get_Name;();Argument[this].SyntheticField[System.Configuration.Provider.ProviderBase._name];ReturnValue;value;dfc-generated |
 | System.Configuration.Provider;ProviderCollection;Clear;();Argument[this].WithoutElement;Argument[this];value;manual |
-| System.Configuration.Provider;ProviderCollection;CopyTo;(System.Configuration.Provider.ProviderBase[],System.Int32);Argument[this];Argument[0].Element;taint;df-generated |
+| System.Configuration.Provider;ProviderCollection;CopyTo;(System.Configuration.Provider.ProviderBase[],System.Int32);Argument[this].Element;Argument[0].Element;value;dfc-generated |
 | System.Configuration.Provider;ProviderCollection;get_Item;(System.String);Argument[this];ReturnValue;taint;df-generated |
 | System.Configuration;AppSettingsReader;GetValue;(System.String,System.Type);Argument[this];ReturnValue;taint;df-generated |
 | System.Configuration;AppSettingsSection;get_Settings;();Argument[this];ReturnValue;taint;df-generated |
 | System.Configuration;ApplicationSettingsBase;ApplicationSettingsBase;(System.ComponentModel.IComponent,System.String);Argument[0];Argument[this];taint;df-generated |
 | System.Configuration;ApplicationSettingsBase;ApplicationSettingsBase;(System.String);Argument[0];Argument[this];taint;df-generated |
+| System.Configuration;ApplicationSettingsBase;OnPropertyChanged;(System.Object,System.ComponentModel.PropertyChangedEventArgs);Argument[1];Argument[this];taint;df-generated |
+| System.Configuration;ApplicationSettingsBase;OnSettingChanging;(System.Object,System.Configuration.SettingChangingEventArgs);Argument[1];Argument[this];taint;df-generated |
+| System.Configuration;ApplicationSettingsBase;OnSettingsLoaded;(System.Object,System.Configuration.SettingsLoadedEventArgs);Argument[1];Argument[this];taint;df-generated |
+| System.Configuration;ApplicationSettingsBase;OnSettingsSaving;(System.Object,System.ComponentModel.CancelEventArgs);Argument[1];Argument[this];taint;df-generated |
 | System.Configuration;ApplicationSettingsBase;add_SettingChanging;(System.Configuration.SettingChangingEventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Configuration;ApplicationSettingsBase;add_SettingsLoaded;(System.Configuration.SettingsLoadedEventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Configuration;ApplicationSettingsBase;add_SettingsSaving;(System.Configuration.SettingsSavingEventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
+| System.Configuration;ApplicationSettingsBase;get_PropertyValues;();Argument[this].Property[System.Configuration.SettingsBase.PropertyValues];ReturnValue;value;df-generated |
+| System.Configuration;ApplicationSettingsBase;get_PropertyValues;();Argument[this].Property[System.Configuration.SettingsBase.PropertyValues];ReturnValue;value;dfc-generated |
 | System.Configuration;ApplicationSettingsBase;remove_SettingChanging;(System.Configuration.SettingChangingEventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Configuration;ApplicationSettingsBase;remove_SettingsLoaded;(System.Configuration.SettingsLoadedEventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Configuration;ApplicationSettingsBase;remove_SettingsSaving;(System.Configuration.SettingsSavingEventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Configuration;CallbackValidator;CallbackValidator;(System.Type,System.Configuration.ValidatorCallback);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
 | System.Configuration;CallbackValidatorAttribute;get_ValidatorInstance;();Argument[this];ReturnValue;taint;df-generated |
 | System.Configuration;ClientSettingsSection;get_Settings;();Argument[this];ReturnValue;taint;df-generated |
-| System.Configuration;CommaDelimitedStringCollection;Add;(System.String);Argument[0];Argument[this];taint;df-generated |
-| System.Configuration;CommaDelimitedStringCollection;AddRange;(System.String[]);Argument[0].Element;Argument[this];taint;df-generated |
+| System.Configuration;CommaDelimitedStringCollection;Add;(System.String);Argument[0];Argument[this].Element;taint;dfc-generated |
+| System.Configuration;CommaDelimitedStringCollection;AddRange;(System.String[]);Argument[0].Element;Argument[this].Element;taint;dfc-generated |
 | System.Configuration;CommaDelimitedStringCollection;Clear;();Argument[this].WithoutElement;Argument[this];value;manual |
-| System.Configuration;CommaDelimitedStringCollection;Clone;();Argument[this];ReturnValue;taint;df-generated |
-| System.Configuration;CommaDelimitedStringCollection;Insert;(System.Int32,System.String);Argument[1];Argument[this];taint;df-generated |
-| System.Configuration;CommaDelimitedStringCollection;ToString;();Argument[this];ReturnValue;taint;df-generated |
-| System.Configuration;CommaDelimitedStringCollection;get_Item;(System.Int32);Argument[this];ReturnValue;taint;df-generated |
-| System.Configuration;CommaDelimitedStringCollection;set_Item;(System.Int32,System.String);Argument[1];Argument[this];taint;df-generated |
-| System.Configuration;CommaDelimitedStringCollectionConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[0];ReturnValue;taint;df-generated |
-| System.Configuration;CommaDelimitedStringCollectionConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue;taint;df-generated |
-| System.Configuration;CommaDelimitedStringCollectionConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[this];ReturnValue;taint;df-generated |
-| System.Configuration;CommaDelimitedStringCollectionConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[1];ReturnValue;taint;df-generated |
-| System.Configuration;CommaDelimitedStringCollectionConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[2];ReturnValue;taint;df-generated |
-| System.Configuration;CommaDelimitedStringCollectionConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[this];ReturnValue;taint;df-generated |
+| System.Configuration;CommaDelimitedStringCollection;Clone;();Argument[this].Element;ReturnValue.Element;taint;dfc-generated |
+| System.Configuration;CommaDelimitedStringCollection;Insert;(System.Int32,System.String);Argument[1];Argument[this].Element;taint;dfc-generated |
+| System.Configuration;CommaDelimitedStringCollection;ToString;();Argument[this].Element;ReturnValue;taint;dfc-generated |
+| System.Configuration;CommaDelimitedStringCollection;get_Item;(System.Int32);Argument[this].Element;ReturnValue;value;dfc-generated |
+| System.Configuration;CommaDelimitedStringCollection;set_Item;(System.Int32,System.String);Argument[1];Argument[this].Element;taint;dfc-generated |
+| System.Configuration;CommaDelimitedStringCollectionConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue.Element;taint;dfc-generated |
+| System.Configuration;CommaDelimitedStringCollectionConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue;taint;dfc-generated |
+| System.Configuration;CommaDelimitedStringCollectionConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue;value;dfc-generated |
+| System.Configuration;CommaDelimitedStringCollectionConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[2].Element;ReturnValue;taint;dfc-generated |
+| System.Configuration;CommaDelimitedStringCollectionConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[2];ReturnValue;taint;dfc-generated |
 | System.Configuration;ConfigXmlDocument;CreateAttribute;(System.String,System.String,System.String);Argument[0];ReturnValue;taint;df-generated |
+| System.Configuration;ConfigXmlDocument;CreateAttribute;(System.String,System.String,System.String);Argument[0];ReturnValue;taint;dfc-generated |
 | System.Configuration;ConfigXmlDocument;CreateAttribute;(System.String,System.String,System.String);Argument[1];ReturnValue;taint;df-generated |
+| System.Configuration;ConfigXmlDocument;CreateAttribute;(System.String,System.String,System.String);Argument[1];ReturnValue;taint;dfc-generated |
 | System.Configuration;ConfigXmlDocument;CreateAttribute;(System.String,System.String,System.String);Argument[2];ReturnValue;taint;df-generated |
+| System.Configuration;ConfigXmlDocument;CreateAttribute;(System.String,System.String,System.String);Argument[2];ReturnValue;taint;dfc-generated |
+| System.Configuration;ConfigXmlDocument;CreateAttribute;(System.String,System.String,System.String);Argument[this].SyntheticField[System.Configuration.ConfigXmlDocument._filename];ReturnValue.SyntheticField[System.Configuration.ConfigXmlAttribute._filename];value;df-generated |
+| System.Configuration;ConfigXmlDocument;CreateAttribute;(System.String,System.String,System.String);Argument[this].SyntheticField[System.Configuration.ConfigXmlDocument._filename];ReturnValue.SyntheticField[System.Configuration.ConfigXmlAttribute._filename];value;dfc-generated |
 | System.Configuration;ConfigXmlDocument;CreateAttribute;(System.String,System.String,System.String);Argument[this];ReturnValue;taint;df-generated |
+| System.Configuration;ConfigXmlDocument;CreateAttribute;(System.String,System.String,System.String);Argument[this];ReturnValue;taint;dfc-generated |
+| System.Configuration;ConfigXmlDocument;CreateCDataSection;(System.String);Argument[this].SyntheticField[System.Configuration.ConfigXmlDocument._filename];ReturnValue.SyntheticField[System.Configuration.ConfigXmlCDataSection._filename];value;df-generated |
+| System.Configuration;ConfigXmlDocument;CreateCDataSection;(System.String);Argument[this].SyntheticField[System.Configuration.ConfigXmlDocument._filename];ReturnValue.SyntheticField[System.Configuration.ConfigXmlCDataSection._filename];value;dfc-generated |
 | System.Configuration;ConfigXmlDocument;CreateCDataSection;(System.String);Argument[this];ReturnValue;taint;df-generated |
+| System.Configuration;ConfigXmlDocument;CreateCDataSection;(System.String);Argument[this];ReturnValue;taint;dfc-generated |
+| System.Configuration;ConfigXmlDocument;CreateComment;(System.String);Argument[this].SyntheticField[System.Configuration.ConfigXmlDocument._filename];ReturnValue.SyntheticField[System.Configuration.ConfigXmlComment._filename];value;df-generated |
+| System.Configuration;ConfigXmlDocument;CreateComment;(System.String);Argument[this].SyntheticField[System.Configuration.ConfigXmlDocument._filename];ReturnValue.SyntheticField[System.Configuration.ConfigXmlComment._filename];value;dfc-generated |
 | System.Configuration;ConfigXmlDocument;CreateComment;(System.String);Argument[this];ReturnValue;taint;df-generated |
+| System.Configuration;ConfigXmlDocument;CreateComment;(System.String);Argument[this];ReturnValue;taint;dfc-generated |
 | System.Configuration;ConfigXmlDocument;CreateElement;(System.String,System.String,System.String);Argument[0];ReturnValue;taint;df-generated |
+| System.Configuration;ConfigXmlDocument;CreateElement;(System.String,System.String,System.String);Argument[0];ReturnValue;taint;dfc-generated |
 | System.Configuration;ConfigXmlDocument;CreateElement;(System.String,System.String,System.String);Argument[1];ReturnValue;taint;df-generated |
+| System.Configuration;ConfigXmlDocument;CreateElement;(System.String,System.String,System.String);Argument[1];ReturnValue;taint;dfc-generated |
 | System.Configuration;ConfigXmlDocument;CreateElement;(System.String,System.String,System.String);Argument[2];ReturnValue;taint;df-generated |
+| System.Configuration;ConfigXmlDocument;CreateElement;(System.String,System.String,System.String);Argument[2];ReturnValue;taint;dfc-generated |
+| System.Configuration;ConfigXmlDocument;CreateElement;(System.String,System.String,System.String);Argument[this].SyntheticField[System.Configuration.ConfigXmlDocument._filename];ReturnValue.SyntheticField[System.Configuration.ConfigXmlElement._filename];value;df-generated |
+| System.Configuration;ConfigXmlDocument;CreateElement;(System.String,System.String,System.String);Argument[this].SyntheticField[System.Configuration.ConfigXmlDocument._filename];ReturnValue.SyntheticField[System.Configuration.ConfigXmlElement._filename];value;dfc-generated |
 | System.Configuration;ConfigXmlDocument;CreateElement;(System.String,System.String,System.String);Argument[this];ReturnValue;taint;df-generated |
+| System.Configuration;ConfigXmlDocument;CreateElement;(System.String,System.String,System.String);Argument[this];ReturnValue;taint;dfc-generated |
+| System.Configuration;ConfigXmlDocument;CreateSignificantWhitespace;(System.String);Argument[this].SyntheticField[System.Configuration.ConfigXmlDocument._filename];ReturnValue.SyntheticField[System.Configuration.ConfigXmlSignificantWhitespace._filename];value;df-generated |
+| System.Configuration;ConfigXmlDocument;CreateSignificantWhitespace;(System.String);Argument[this].SyntheticField[System.Configuration.ConfigXmlDocument._filename];ReturnValue.SyntheticField[System.Configuration.ConfigXmlSignificantWhitespace._filename];value;dfc-generated |
 | System.Configuration;ConfigXmlDocument;CreateSignificantWhitespace;(System.String);Argument[this];ReturnValue;taint;df-generated |
+| System.Configuration;ConfigXmlDocument;CreateSignificantWhitespace;(System.String);Argument[this];ReturnValue;taint;dfc-generated |
+| System.Configuration;ConfigXmlDocument;CreateTextNode;(System.String);Argument[this].SyntheticField[System.Configuration.ConfigXmlDocument._filename];ReturnValue.SyntheticField[System.Configuration.ConfigXmlText._filename];value;df-generated |
+| System.Configuration;ConfigXmlDocument;CreateTextNode;(System.String);Argument[this].SyntheticField[System.Configuration.ConfigXmlDocument._filename];ReturnValue.SyntheticField[System.Configuration.ConfigXmlText._filename];value;dfc-generated |
 | System.Configuration;ConfigXmlDocument;CreateTextNode;(System.String);Argument[this];ReturnValue;taint;df-generated |
+| System.Configuration;ConfigXmlDocument;CreateTextNode;(System.String);Argument[this];ReturnValue;taint;dfc-generated |
+| System.Configuration;ConfigXmlDocument;CreateWhitespace;(System.String);Argument[this].SyntheticField[System.Configuration.ConfigXmlDocument._filename];ReturnValue.SyntheticField[System.Configuration.ConfigXmlWhitespace._filename];value;df-generated |
+| System.Configuration;ConfigXmlDocument;CreateWhitespace;(System.String);Argument[this].SyntheticField[System.Configuration.ConfigXmlDocument._filename];ReturnValue.SyntheticField[System.Configuration.ConfigXmlWhitespace._filename];value;dfc-generated |
 | System.Configuration;ConfigXmlDocument;CreateWhitespace;(System.String);Argument[this];ReturnValue;taint;df-generated |
-| System.Configuration;ConfigXmlDocument;LoadSingleElement;(System.String,System.Xml.XmlTextReader);Argument[0];Argument[this];taint;df-generated |
-| System.Configuration;ConfigXmlDocument;get_Filename;();Argument[this];ReturnValue;taint;df-generated |
+| System.Configuration;ConfigXmlDocument;CreateWhitespace;(System.String);Argument[this];ReturnValue;taint;dfc-generated |
+| System.Configuration;ConfigXmlDocument;LoadSingleElement;(System.String,System.Xml.XmlTextReader);Argument[0];Argument[this].SyntheticField[System.Configuration.ConfigXmlDocument._filename];value;dfc-generated |
+| System.Configuration;ConfigXmlDocument;get_Filename;();Argument[this].SyntheticField[System.Configuration.ConfigXmlDocument._filename];ReturnValue;value;df-generated |
+| System.Configuration;ConfigXmlDocument;get_Filename;();Argument[this].SyntheticField[System.Configuration.ConfigXmlDocument._filename];ReturnValue;value;dfc-generated |
 | System.Configuration;Configuration;GetSection;(System.String);Argument[this];ReturnValue;taint;df-generated |
 | System.Configuration;Configuration;GetSectionGroup;(System.String);Argument[this];ReturnValue;taint;df-generated |
 | System.Configuration;Configuration;get_AppSettings;();Argument[this];ReturnValue;taint;df-generated |
@@ -5666,20 +6361,17 @@
 | System.Configuration;Configuration;set_AssemblyStringTransformer;(System.Func<System.String,System.String>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Configuration;Configuration;set_TypeStringTransformer;(System.Func<System.String,System.String>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Configuration;ConfigurationElement;DeserializeElement;(System.Xml.XmlReader,System.Boolean);Argument[0];Argument[this];taint;df-generated |
-| System.Configuration;ConfigurationElement;DeserializeElement;(System.Xml.XmlReader,System.Boolean);Argument[this];Argument[0];taint;df-generated |
-| System.Configuration;ConfigurationElement;GetTransformedAssemblyString;(System.String);Argument[0];ReturnValue;taint;df-generated |
-| System.Configuration;ConfigurationElement;GetTransformedTypeString;(System.String);Argument[0];ReturnValue;taint;df-generated |
+| System.Configuration;ConfigurationElement;GetTransformedAssemblyString;(System.String);Argument[0];ReturnValue;value;dfc-generated |
+| System.Configuration;ConfigurationElement;GetTransformedTypeString;(System.String);Argument[0];ReturnValue;value;dfc-generated |
 | System.Configuration;ConfigurationElement;Reset;(System.Configuration.ConfigurationElement);Argument[0];Argument[this];taint;df-generated |
 | System.Configuration;ConfigurationElement;SerializeElement;(System.Xml.XmlWriter,System.Boolean);Argument[this];Argument[0];taint;df-generated |
-| System.Configuration;ConfigurationElement;SerializeToXmlElement;(System.Xml.XmlWriter,System.String);Argument[1];Argument[0];taint;df-generated |
 | System.Configuration;ConfigurationElement;SerializeToXmlElement;(System.Xml.XmlWriter,System.String);Argument[this];Argument[0];taint;df-generated |
 | System.Configuration;ConfigurationElement;SetPropertyValue;(System.Configuration.ConfigurationProperty,System.Object,System.Boolean);Argument[this];Argument[1];taint;df-generated |
 | System.Configuration;ConfigurationElement;Unmerge;(System.Configuration.ConfigurationElement,System.Configuration.ConfigurationElement,System.Configuration.ConfigurationSaveMode);Argument[0];Argument[this];taint;df-generated |
 | System.Configuration;ConfigurationElement;get_CurrentConfiguration;();Argument[this];ReturnValue;taint;df-generated |
 | System.Configuration;ConfigurationElement;get_ElementProperty;();Argument[this];ReturnValue;taint;df-generated |
 | System.Configuration;ConfigurationElement;get_EvaluationContext;();Argument[this];ReturnValue;taint;df-generated |
-| System.Configuration;ConfigurationElement;get_Item;(System.Configuration.ConfigurationProperty);Argument[0];ReturnValue;taint;df-generated |
-| System.Configuration;ConfigurationElement;get_Item;(System.Configuration.ConfigurationProperty);Argument[this];ReturnValue;taint;df-generated |
+| System.Configuration;ConfigurationElement;get_Item;(System.Configuration.ConfigurationProperty);Argument[0].Property[System.Configuration.ConfigurationProperty.DefaultValue];ReturnValue;value;dfc-generated |
 | System.Configuration;ConfigurationElement;get_Item;(System.String);Argument[this];ReturnValue;taint;df-generated |
 | System.Configuration;ConfigurationElement;get_Properties;();Argument[this];ReturnValue;taint;df-generated |
 | System.Configuration;ConfigurationElement;set_Item;(System.Configuration.ConfigurationProperty,System.Object);Argument[this];Argument[1];taint;df-generated |
@@ -5692,101 +6384,103 @@
 | System.Configuration;ConfigurationElementCollection;BaseGetAllKeys;();Argument[this];ReturnValue;taint;df-generated |
 | System.Configuration;ConfigurationElementCollection;BaseGetKey;(System.Int32);Argument[this];ReturnValue;taint;df-generated |
 | System.Configuration;ConfigurationElementCollection;ConfigurationElementCollection;(System.Collections.IComparer);Argument[0];Argument[this];taint;df-generated |
-| System.Configuration;ConfigurationElementCollection;CopyTo;(System.Configuration.ConfigurationElement[],System.Int32);Argument[this];Argument[0].Element;taint;df-generated |
+| System.Configuration;ConfigurationElementCollection;CopyTo;(System.Configuration.ConfigurationElement[],System.Int32);Argument[this].Element;Argument[0].Element;value;dfc-generated |
 | System.Configuration;ConfigurationElementCollection;GetElementKey;(System.Configuration.ConfigurationElement);Argument[0];ReturnValue;taint;df-generated |
-| System.Configuration;ConfigurationErrorsException;ConfigurationErrorsException;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);Argument[0];Argument[this];taint;df-generated |
-| System.Configuration;ConfigurationErrorsException;ConfigurationErrorsException;(System.String,System.Exception,System.String,System.Int32);Argument[2];Argument[this];taint;df-generated |
+| System.Configuration;ConfigurationErrorsException;ConfigurationErrorsException;(System.String,System.Exception,System.String,System.Int32);Argument[2];Argument[this].SyntheticField[System.Configuration.ConfigurationErrorsException._firstFilename];value;dfc-generated |
 | System.Configuration;ConfigurationErrorsException;GetFilename;(System.Xml.XmlNode);Argument[0].Element;ReturnValue;taint;df-generated |
-| System.Configuration;ConfigurationErrorsException;GetFilename;(System.Xml.XmlReader);Argument[0];ReturnValue;taint;df-generated |
+| System.Configuration;ConfigurationErrorsException;GetFilename;(System.Xml.XmlReader);Argument[0].Property[System.Configuration.Internal.IConfigErrorInfo.Filename];ReturnValue;value;dfc-generated |
 | System.Configuration;ConfigurationErrorsException;get_Errors;();Argument[this];ReturnValue;taint;df-generated |
-| System.Configuration;ConfigurationErrorsException;get_Filename;();Argument[this];ReturnValue;taint;df-generated |
-| System.Configuration;ConfigurationErrorsException;get_Message;();Argument[this];ReturnValue;taint;df-generated |
-| System.Configuration;ConfigurationException;ConfigurationException;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);Argument[0];Argument[this];taint;df-generated |
-| System.Configuration;ConfigurationException;ConfigurationException;(System.String,System.Exception,System.String,System.Int32);Argument[2];Argument[this];taint;df-generated |
+| System.Configuration;ConfigurationErrorsException;get_Filename;();Argument[this].SyntheticField[System.Configuration.ConfigurationErrorsException._firstFilename];ReturnValue;value;dfc-generated |
+| System.Configuration;ConfigurationErrorsException;get_Filename;();Argument[this].SyntheticField[System.Configuration.ConfigurationException._filename];ReturnValue;value;dfc-generated |
+| System.Configuration;ConfigurationErrorsException;get_Message;();Argument[this].Property[System.Configuration.ConfigurationErrorsException.Filename];ReturnValue;taint;dfc-generated |
+| System.Configuration;ConfigurationErrorsException;get_Message;();Argument[this].Property[System.Configuration.ConfigurationException.BareMessage];ReturnValue;value;dfc-generated |
+| System.Configuration;ConfigurationErrorsException;get_Message;();Argument[this].Property[System.Configuration.ConfigurationException.Filename];ReturnValue;taint;dfc-generated |
+| System.Configuration;ConfigurationErrorsException;get_Message;();Argument[this].SyntheticField[System.Configuration.ConfigurationErrorsException._firstFilename];ReturnValue;taint;dfc-generated |
+| System.Configuration;ConfigurationErrorsException;get_Message;();Argument[this].SyntheticField[System.Exception._message];ReturnValue;value;dfc-generated |
+| System.Configuration;ConfigurationException;ConfigurationException;(System.String,System.Exception,System.String,System.Int32);Argument[2];Argument[this].SyntheticField[System.Configuration.ConfigurationException._filename];value;dfc-generated |
 | System.Configuration;ConfigurationException;GetXmlNodeFilename;(System.Xml.XmlNode);Argument[0].Element;ReturnValue;taint;df-generated |
-| System.Configuration;ConfigurationException;get_BareMessage;();Argument[this];ReturnValue;taint;df-generated |
-| System.Configuration;ConfigurationException;get_Filename;();Argument[this];ReturnValue;taint;df-generated |
-| System.Configuration;ConfigurationException;get_Message;();Argument[this];ReturnValue;taint;df-generated |
+| System.Configuration;ConfigurationException;get_BareMessage;();Argument[this].Property[System.Exception.Message];ReturnValue;value;dfc-generated |
+| System.Configuration;ConfigurationException;get_Filename;();Argument[this].SyntheticField[System.Configuration.ConfigurationException._filename];ReturnValue;value;dfc-generated |
+| System.Configuration;ConfigurationException;get_Message;();Argument[this].Property[System.Configuration.ConfigurationException.BareMessage];ReturnValue;value;dfc-generated |
+| System.Configuration;ConfigurationException;get_Message;();Argument[this].Property[System.Configuration.ConfigurationException.Filename];ReturnValue;taint;dfc-generated |
+| System.Configuration;ConfigurationException;get_Message;();Argument[this].SyntheticField[System.Exception._message];ReturnValue;value;dfc-generated |
 | System.Configuration;ConfigurationLocation;OpenConfiguration;();Argument[this];ReturnValue;taint;df-generated |
-| System.Configuration;ConfigurationLocationCollection;get_Item;(System.Int32);Argument[this];ReturnValue;taint;df-generated |
-| System.Configuration;ConfigurationLockCollection;Add;(System.String);Argument[0];Argument[this];taint;df-generated |
+| System.Configuration;ConfigurationLocationCollection;get_Item;(System.Int32);Argument[this].Property[System.Collections.ReadOnlyCollectionBase.InnerList].Element;ReturnValue;value;dfc-generated |
+| System.Configuration;ConfigurationLockCollection;Add;(System.String);Argument[0];Argument[this].SyntheticField[System.Configuration.ConfigurationLockCollection._internalArraylist].Element;value;dfc-generated |
 | System.Configuration;ConfigurationLockCollection;Clear;();Argument[this].WithoutElement;Argument[this];value;manual |
-| System.Configuration;ConfigurationLockCollection;CopyTo;(System.String[],System.Int32);Argument[this];Argument[0].Element;taint;df-generated |
-| System.Configuration;ConfigurationLockCollection;SetFromList;(System.String);Argument[0];Argument[this];taint;df-generated |
+| System.Configuration;ConfigurationLockCollection;CopyTo;(System.String[],System.Int32);Argument[this].Element;Argument[0].Element;value;dfc-generated |
+| System.Configuration;ConfigurationLockCollection;CopyTo;(System.String[],System.Int32);Argument[this].SyntheticField[System.Configuration.ConfigurationLockCollection._internalArraylist].Element;Argument[0].Element;value;dfc-generated |
+| System.Configuration;ConfigurationLockCollection;SetFromList;(System.String);Argument[0];Argument[this].SyntheticField[System.Configuration.ConfigurationLockCollection._internalArraylist].Element;taint;dfc-generated |
 | System.Configuration;ConfigurationLockCollection;get_AttributeList;();Argument[this];ReturnValue;taint;df-generated |
 | System.Configuration;ConfigurationManager;OpenExeConfiguration;(System.String);Argument[0];ReturnValue;taint;df-generated |
 | System.Configuration;ConfigurationManager;OpenMappedExeConfiguration;(System.Configuration.ExeConfigurationFileMap,System.Configuration.ConfigurationUserLevel);Argument[0];ReturnValue;taint;df-generated |
 | System.Configuration;ConfigurationManager;OpenMappedExeConfiguration;(System.Configuration.ExeConfigurationFileMap,System.Configuration.ConfigurationUserLevel,System.Boolean);Argument[0];ReturnValue;taint;df-generated |
 | System.Configuration;ConfigurationManager;OpenMappedMachineConfiguration;(System.Configuration.ConfigurationFileMap);Argument[0];ReturnValue;taint;df-generated |
 | System.Configuration;ConfigurationProperty;ConfigurationProperty;(System.String,System.Type);Argument[0];Argument[this];taint;df-generated |
-| System.Configuration;ConfigurationProperty;ConfigurationProperty;(System.String,System.Type,System.Object,System.ComponentModel.TypeConverter,System.Configuration.ConfigurationValidatorBase,System.Configuration.ConfigurationPropertyOptions,System.String);Argument[0];Argument[this];taint;df-generated |
-| System.Configuration;ConfigurationProperty;ConfigurationProperty;(System.String,System.Type,System.Object,System.ComponentModel.TypeConverter,System.Configuration.ConfigurationValidatorBase,System.Configuration.ConfigurationPropertyOptions,System.String);Argument[3];Argument[this];taint;df-generated |
-| System.Configuration;ConfigurationProperty;get_Converter;();Argument[this];ReturnValue;taint;df-generated |
-| System.Configuration;ConfigurationPropertyCollection;Add;(System.Configuration.ConfigurationProperty);Argument[0];Argument[this];taint;df-generated |
+| System.Configuration;ConfigurationProperty;ConfigurationProperty;(System.String,System.Type,System.Object,System.ComponentModel.TypeConverter,System.Configuration.ConfigurationValidatorBase,System.Configuration.ConfigurationPropertyOptions,System.String);Argument[3];Argument[this].SyntheticField[System.Configuration.ConfigurationProperty._converter];value;dfc-generated |
+| System.Configuration;ConfigurationProperty;get_Converter;();Argument[this].SyntheticField[System.Configuration.ConfigurationProperty._converter];ReturnValue;value;dfc-generated |
+| System.Configuration;ConfigurationPropertyCollection;Add;(System.Configuration.ConfigurationProperty);Argument[0];Argument[this].SyntheticField[System.Configuration.ConfigurationPropertyCollection._items].Element;value;dfc-generated |
 | System.Configuration;ConfigurationPropertyCollection;Clear;();Argument[this].WithoutElement;Argument[this];value;manual |
-| System.Configuration;ConfigurationPropertyCollection;CopyTo;(System.Configuration.ConfigurationProperty[],System.Int32);Argument[this];Argument[0].Element;taint;df-generated |
-| System.Configuration;ConfigurationPropertyCollection;get_Item;(System.String);Argument[this];ReturnValue;taint;df-generated |
+| System.Configuration;ConfigurationPropertyCollection;CopyTo;(System.Configuration.ConfigurationProperty[],System.Int32);Argument[this].Element;Argument[0].Element;value;dfc-generated |
+| System.Configuration;ConfigurationPropertyCollection;CopyTo;(System.Configuration.ConfigurationProperty[],System.Int32);Argument[this].SyntheticField[System.Configuration.ConfigurationPropertyCollection._items].Element;Argument[0].Element;value;dfc-generated |
+| System.Configuration;ConfigurationPropertyCollection;get_Item;(System.String);Argument[this].SyntheticField[System.Configuration.ConfigurationPropertyCollection._items].Element;ReturnValue;value;dfc-generated |
+| System.Configuration;ConfigurationPropertyCollection;get_SyncRoot;();Argument[this].SyntheticField[System.Configuration.ConfigurationPropertyCollection._items];ReturnValue;value;dfc-generated |
 | System.Configuration;ConfigurationSection;DeserializeSection;(System.Xml.XmlReader);Argument[0];Argument[this];taint;df-generated |
-| System.Configuration;ConfigurationSection;DeserializeSection;(System.Xml.XmlReader);Argument[this];Argument[0];taint;df-generated |
-| System.Configuration;ConfigurationSection;GetRuntimeObject;();Argument[this];ReturnValue;taint;df-generated |
-| System.Configuration;ConfigurationSection;GetRuntimeObject;();Argument[this];ReturnValue;value;df-generated |
+| System.Configuration;ConfigurationSection;GetRuntimeObject;();Argument[this];ReturnValue;value;dfc-generated |
 | System.Configuration;ConfigurationSection;SerializeSection;(System.Configuration.ConfigurationElement,System.String,System.Configuration.ConfigurationSaveMode);Argument[this];ReturnValue;taint;df-generated |
 | System.Configuration;ConfigurationSectionCollection;Add;(System.String,System.Configuration.ConfigurationSection);Argument[0];Argument[1];taint;df-generated |
-| System.Configuration;ConfigurationSectionCollection;Add;(System.String,System.Configuration.ConfigurationSection);Argument[0];Argument[this];taint;df-generated |
 | System.Configuration;ConfigurationSectionCollection;Add;(System.String,System.Configuration.ConfigurationSection);Argument[this];Argument[1];taint;df-generated |
 | System.Configuration;ConfigurationSectionCollection;Clear;();Argument[this].WithoutElement;Argument[this];value;manual |
 | System.Configuration;ConfigurationSectionCollection;Get;(System.Int32);Argument[this];ReturnValue;taint;df-generated |
 | System.Configuration;ConfigurationSectionCollection;Get;(System.String);Argument[this];ReturnValue;taint;df-generated |
-| System.Configuration;ConfigurationSectionCollection;GetKey;(System.Int32);Argument[this];ReturnValue;taint;df-generated |
 | System.Configuration;ConfigurationSectionCollection;get_Item;(System.Int32);Argument[this];ReturnValue;taint;df-generated |
 | System.Configuration;ConfigurationSectionCollection;get_Item;(System.String);Argument[this];ReturnValue;taint;df-generated |
 | System.Configuration;ConfigurationSectionGroup;get_SectionGroups;();Argument[this];ReturnValue;taint;df-generated |
 | System.Configuration;ConfigurationSectionGroup;get_Sections;();Argument[this];ReturnValue;taint;df-generated |
-| System.Configuration;ConfigurationSectionGroupCollection;Add;(System.String,System.Configuration.ConfigurationSectionGroup);Argument[0];Argument[this];taint;df-generated |
 | System.Configuration;ConfigurationSectionGroupCollection;Add;(System.String,System.Configuration.ConfigurationSectionGroup);Argument[this];Argument[1];taint;df-generated |
 | System.Configuration;ConfigurationSectionGroupCollection;Clear;();Argument[this].WithoutElement;Argument[this];value;manual |
 | System.Configuration;ConfigurationSectionGroupCollection;CopyTo;(System.Configuration.ConfigurationSectionGroup[],System.Int32);Argument[this];Argument[0].Element;taint;df-generated |
 | System.Configuration;ConfigurationSectionGroupCollection;Get;(System.Int32);Argument[this];ReturnValue;taint;df-generated |
 | System.Configuration;ConfigurationSectionGroupCollection;Get;(System.String);Argument[this];ReturnValue;taint;df-generated |
-| System.Configuration;ConfigurationSectionGroupCollection;GetKey;(System.Int32);Argument[this];ReturnValue;taint;df-generated |
 | System.Configuration;ConfigurationSectionGroupCollection;get_Item;(System.Int32);Argument[this];ReturnValue;taint;df-generated |
 | System.Configuration;ConfigurationSectionGroupCollection;get_Item;(System.String);Argument[this];ReturnValue;taint;df-generated |
 | System.Configuration;ConfigurationValidatorAttribute;get_ValidatorInstance;();Argument[this];ReturnValue;taint;df-generated |
-| System.Configuration;ConnectionStringSettings;ToString;();Argument[this];ReturnValue;taint;df-generated |
+| System.Configuration;ConfigurationValidatorBase;Validate;(System.Object);Argument[0];Argument[this];taint;df-generated |
+| System.Configuration;ConnectionStringSettings;ToString;();Argument[this].Property[System.Configuration.ConnectionStringSettings.ConnectionString];ReturnValue;value;dfc-generated |
 | System.Configuration;ConnectionStringSettingsCollection;Add;(System.Configuration.ConnectionStringSettings);Argument[this];Argument[0];taint;df-generated |
 | System.Configuration;ConnectionStringSettingsCollection;Clear;();Argument[this].WithoutElement;Argument[this];value;manual |
+| System.Configuration;ConnectionStringSettingsCollection;GetElementKey;(System.Configuration.ConfigurationElement);Argument[0].Property[System.Configuration.ConnectionStringSettings.Name];ReturnValue;value;df-generated |
+| System.Configuration;ConnectionStringSettingsCollection;GetElementKey;(System.Configuration.ConfigurationElement);Argument[0].Property[System.Configuration.ConnectionStringSettings.Name];ReturnValue;value;dfc-generated |
 | System.Configuration;ConnectionStringSettingsCollection;get_Item;(System.Int32);Argument[this];ReturnValue;taint;df-generated |
 | System.Configuration;ConnectionStringSettingsCollection;get_Item;(System.String);Argument[this];ReturnValue;taint;df-generated |
 | System.Configuration;ConnectionStringSettingsCollection;set_Item;(System.Int32,System.Configuration.ConnectionStringSettings);Argument[this];Argument[1];taint;df-generated |
 | System.Configuration;ConnectionStringsSection;get_ConnectionStrings;();Argument[this];ReturnValue;taint;df-generated |
 | System.Configuration;ContextInformation;GetSection;(System.String);Argument[this];ReturnValue;taint;df-generated |
 | System.Configuration;ContextInformation;get_HostingContext;();Argument[this];ReturnValue;taint;df-generated |
-| System.Configuration;DefaultSettingValueAttribute;DefaultSettingValueAttribute;(System.String);Argument[0];Argument[this];taint;df-generated |
-| System.Configuration;DefaultSettingValueAttribute;get_Value;();Argument[this];ReturnValue;taint;df-generated |
-| System.Configuration;GenericEnumConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[0];ReturnValue;taint;df-generated |
-| System.Configuration;GenericEnumConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue;taint;df-generated |
-| System.Configuration;GenericEnumConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[this];ReturnValue;taint;df-generated |
-| System.Configuration;GenericEnumConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[1];ReturnValue;taint;df-generated |
-| System.Configuration;GenericEnumConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[2];ReturnValue;taint;df-generated |
-| System.Configuration;GenericEnumConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[this];ReturnValue;taint;df-generated |
+| System.Configuration;DefaultSettingValueAttribute;DefaultSettingValueAttribute;(System.String);Argument[0];Argument[this].SyntheticField[System.Configuration.DefaultSettingValueAttribute._value];value;dfc-generated |
+| System.Configuration;DefaultSettingValueAttribute;get_Value;();Argument[this].SyntheticField[System.Configuration.DefaultSettingValueAttribute._value];ReturnValue;value;dfc-generated |
+| System.Configuration;GenericEnumConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue.Element;taint;dfc-generated |
+| System.Configuration;GenericEnumConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue;taint;dfc-generated |
+| System.Configuration;GenericEnumConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue;value;dfc-generated |
+| System.Configuration;GenericEnumConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[2].Element;ReturnValue;taint;dfc-generated |
+| System.Configuration;GenericEnumConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[2];ReturnValue;taint;dfc-generated |
 | System.Configuration;IApplicationSettingsProvider;GetPreviousVersion;(System.Configuration.SettingsContext,System.Configuration.SettingsProperty);Argument[this];ReturnValue;taint;df-generated |
-| System.Configuration;IConfigurationSectionHandler;Create;(System.Object,System.Object,System.Xml.XmlNode);Argument[0];ReturnValue;taint;df-generated |
-| System.Configuration;IConfigurationSectionHandler;Create;(System.Object,System.Object,System.Xml.XmlNode);Argument[2].Element;ReturnValue;taint;df-generated |
-| System.Configuration;InfiniteIntConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[0];ReturnValue;taint;df-generated |
-| System.Configuration;InfiniteIntConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue;taint;df-generated |
-| System.Configuration;InfiniteIntConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[this];ReturnValue;taint;df-generated |
-| System.Configuration;InfiniteIntConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[1];ReturnValue;taint;df-generated |
-| System.Configuration;InfiniteIntConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[2];ReturnValue;taint;df-generated |
-| System.Configuration;InfiniteIntConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[this];ReturnValue;taint;df-generated |
-| System.Configuration;InfiniteTimeSpanConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[0];ReturnValue;taint;df-generated |
-| System.Configuration;InfiniteTimeSpanConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue;taint;df-generated |
-| System.Configuration;InfiniteTimeSpanConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[this];ReturnValue;taint;df-generated |
-| System.Configuration;InfiniteTimeSpanConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[1];ReturnValue;taint;df-generated |
-| System.Configuration;InfiniteTimeSpanConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[2];ReturnValue;taint;df-generated |
-| System.Configuration;InfiniteTimeSpanConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[this];ReturnValue;taint;df-generated |
+| System.Configuration;IConfigurationSectionHandler;Create;(System.Object,System.Object,System.Xml.XmlNode);Argument[0].Element;ReturnValue.Element;value;dfc-generated |
+| System.Configuration;InfiniteIntConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue.Element;taint;dfc-generated |
+| System.Configuration;InfiniteIntConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue;taint;dfc-generated |
+| System.Configuration;InfiniteIntConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue;value;dfc-generated |
+| System.Configuration;InfiniteIntConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[2].Element;ReturnValue;taint;dfc-generated |
+| System.Configuration;InfiniteIntConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[2];ReturnValue;taint;dfc-generated |
+| System.Configuration;InfiniteTimeSpanConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue.Element;taint;dfc-generated |
+| System.Configuration;InfiniteTimeSpanConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue;taint;dfc-generated |
+| System.Configuration;InfiniteTimeSpanConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue;value;dfc-generated |
+| System.Configuration;InfiniteTimeSpanConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[2].Element;ReturnValue;taint;dfc-generated |
+| System.Configuration;InfiniteTimeSpanConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[2];ReturnValue;taint;dfc-generated |
 | System.Configuration;IntegerValidatorAttribute;get_ValidatorInstance;();Argument[this];ReturnValue;taint;df-generated |
 | System.Configuration;KeyValueConfigurationCollection;Add;(System.Configuration.KeyValueConfigurationElement);Argument[this];Argument[0];taint;df-generated |
 | System.Configuration;KeyValueConfigurationCollection;Clear;();Argument[this].WithoutElement;Argument[this];value;manual |
+| System.Configuration;KeyValueConfigurationCollection;GetElementKey;(System.Configuration.ConfigurationElement);Argument[0].Property[System.Configuration.KeyValueConfigurationElement.Key];ReturnValue;value;df-generated |
+| System.Configuration;KeyValueConfigurationCollection;GetElementKey;(System.Configuration.ConfigurationElement);Argument[0].Property[System.Configuration.KeyValueConfigurationElement.Key];ReturnValue;value;dfc-generated |
 | System.Configuration;KeyValueConfigurationCollection;get_AllKeys;();Argument[this];ReturnValue;taint;df-generated |
 | System.Configuration;KeyValueConfigurationCollection;get_Item;(System.String);Argument[this];ReturnValue;taint;df-generated |
 | System.Configuration;KeyValueConfigurationElement;KeyValueConfigurationElement;(System.String,System.String);Argument[0];Argument[this];taint;df-generated |
@@ -5795,6 +6489,8 @@
 | System.Configuration;LongValidatorAttribute;get_ValidatorInstance;();Argument[this];ReturnValue;taint;df-generated |
 | System.Configuration;NameValueConfigurationCollection;Add;(System.Configuration.NameValueConfigurationElement);Argument[this];Argument[0];taint;df-generated |
 | System.Configuration;NameValueConfigurationCollection;Clear;();Argument[this].WithoutElement;Argument[this];value;manual |
+| System.Configuration;NameValueConfigurationCollection;GetElementKey;(System.Configuration.ConfigurationElement);Argument[0].Property[System.Configuration.NameValueConfigurationElement.Name];ReturnValue;value;df-generated |
+| System.Configuration;NameValueConfigurationCollection;GetElementKey;(System.Configuration.ConfigurationElement);Argument[0].Property[System.Configuration.NameValueConfigurationElement.Name];ReturnValue;value;dfc-generated |
 | System.Configuration;NameValueConfigurationCollection;get_AllKeys;();Argument[this];ReturnValue;taint;df-generated |
 | System.Configuration;NameValueConfigurationCollection;get_Item;(System.String);Argument[this];ReturnValue;taint;df-generated |
 | System.Configuration;NameValueConfigurationCollection;set_Item;(System.String,System.Configuration.NameValueConfigurationElement);Argument[this];Argument[1];taint;df-generated |
@@ -5804,249 +6500,216 @@
 | System.Configuration;PropertyInformation;get_DefaultValue;();Argument[this];ReturnValue;taint;df-generated |
 | System.Configuration;PropertyInformation;get_Description;();Argument[this];ReturnValue;taint;df-generated |
 | System.Configuration;PropertyInformation;get_Validator;();Argument[this];ReturnValue;taint;df-generated |
-| System.Configuration;PropertyInformationCollection;CopyTo;(System.Configuration.PropertyInformation[],System.Int32);Argument[this];Argument[0].Element;taint;df-generated |
-| System.Configuration;PropertyInformationCollection;get_Item;(System.String);Argument[this];ReturnValue;taint;df-generated |
+| System.Configuration;PropertyInformationCollection;CopyTo;(System.Configuration.PropertyInformation[],System.Int32);Argument[this].Element;Argument[0].Element;value;dfc-generated |
 | System.Configuration;ProtectedConfigurationProviderCollection;get_Item;(System.String);Argument[this];ReturnValue;taint;df-generated |
 | System.Configuration;ProtectedConfigurationSection;get_Providers;();Argument[this];ReturnValue;taint;df-generated |
 | System.Configuration;ProtectedProviderSettings;get_Providers;();Argument[this];ReturnValue;taint;df-generated |
 | System.Configuration;ProviderSettings;get_Parameters;();Argument[this];ReturnValue;taint;df-generated |
 | System.Configuration;ProviderSettingsCollection;Add;(System.Configuration.ProviderSettings);Argument[this];Argument[0];taint;df-generated |
 | System.Configuration;ProviderSettingsCollection;Clear;();Argument[this].WithoutElement;Argument[this];value;manual |
+| System.Configuration;ProviderSettingsCollection;GetElementKey;(System.Configuration.ConfigurationElement);Argument[0].Property[System.Configuration.ProviderSettings.Name];ReturnValue;value;df-generated |
+| System.Configuration;ProviderSettingsCollection;GetElementKey;(System.Configuration.ConfigurationElement);Argument[0].Property[System.Configuration.ProviderSettings.Name];ReturnValue;value;dfc-generated |
 | System.Configuration;ProviderSettingsCollection;get_Item;(System.Int32);Argument[this];ReturnValue;taint;df-generated |
 | System.Configuration;ProviderSettingsCollection;get_Item;(System.String);Argument[this];ReturnValue;taint;df-generated |
 | System.Configuration;ProviderSettingsCollection;set_Item;(System.Int32,System.Configuration.ProviderSettings);Argument[this];Argument[1];taint;df-generated |
 | System.Configuration;RegexStringValidator;RegexStringValidator;(System.String);Argument[0];Argument[this];taint;df-generated |
 | System.Configuration;RegexStringValidatorAttribute;get_ValidatorInstance;();Argument[this];ReturnValue;taint;df-generated |
 | System.Configuration;SchemeSettingElement;get_Name;();Argument[this];ReturnValue;taint;df-generated |
+| System.Configuration;SchemeSettingElementCollection;GetElementKey;(System.Configuration.ConfigurationElement);Argument[0].Property[System.Configuration.SchemeSettingElement.Name];ReturnValue;value;df-generated |
+| System.Configuration;SchemeSettingElementCollection;GetElementKey;(System.Configuration.ConfigurationElement);Argument[0].Property[System.Configuration.SchemeSettingElement.Name];ReturnValue;value;dfc-generated |
 | System.Configuration;SchemeSettingElementCollection;get_Item;(System.Int32);Argument[this];ReturnValue;taint;df-generated |
 | System.Configuration;SchemeSettingElementCollection;get_Item;(System.String);Argument[this];ReturnValue;taint;df-generated |
 | System.Configuration;SectionInformation;GetParentSection;();Argument[this];ReturnValue;taint;df-generated |
-| System.Configuration;SectionInformation;GetRawXml;();Argument[this];ReturnValue;taint;df-generated |
+| System.Configuration;SectionInformation;GetRawXml;();Argument[this].SyntheticField[System.Configuration.SectionInformation.RawXml];ReturnValue;value;dfc-generated |
 | System.Configuration;SectionInformation;ProtectSection;(System.String);Argument[0];Argument[this];taint;df-generated |
-| System.Configuration;SectionInformation;SetRawXml;(System.String);Argument[0];Argument[this];taint;df-generated |
+| System.Configuration;SectionInformation;SetRawXml;(System.String);Argument[0];Argument[this].SyntheticField[System.Configuration.SectionInformation.RawXml];value;dfc-generated |
 | System.Configuration;SectionInformation;get_ProtectionProvider;();Argument[this];ReturnValue;taint;df-generated |
 | System.Configuration;SectionInformation;get_SectionName;();Argument[this];ReturnValue;taint;df-generated |
-| System.Configuration;SettingChangingEventArgs;SettingChangingEventArgs;(System.String,System.String,System.String,System.Object,System.Boolean);Argument[0];Argument[this];taint;df-generated |
-| System.Configuration;SettingChangingEventArgs;SettingChangingEventArgs;(System.String,System.String,System.String,System.Object,System.Boolean);Argument[1];Argument[this];taint;df-generated |
-| System.Configuration;SettingChangingEventArgs;SettingChangingEventArgs;(System.String,System.String,System.String,System.Object,System.Boolean);Argument[2];Argument[this];taint;df-generated |
-| System.Configuration;SettingChangingEventArgs;SettingChangingEventArgs;(System.String,System.String,System.String,System.Object,System.Boolean);Argument[3];Argument[this];taint;df-generated |
-| System.Configuration;SettingChangingEventArgs;get_NewValue;();Argument[this];ReturnValue;taint;df-generated |
-| System.Configuration;SettingChangingEventArgs;get_SettingClass;();Argument[this];ReturnValue;taint;df-generated |
-| System.Configuration;SettingChangingEventArgs;get_SettingKey;();Argument[this];ReturnValue;taint;df-generated |
-| System.Configuration;SettingChangingEventArgs;get_SettingName;();Argument[this];ReturnValue;taint;df-generated |
+| System.Configuration;SettingChangingEventArgs;SettingChangingEventArgs;(System.String,System.String,System.String,System.Object,System.Boolean);Argument[0];Argument[this].SyntheticField[System.Configuration.SettingChangingEventArgs._settingName];value;dfc-generated |
+| System.Configuration;SettingChangingEventArgs;SettingChangingEventArgs;(System.String,System.String,System.String,System.Object,System.Boolean);Argument[1];Argument[this].SyntheticField[System.Configuration.SettingChangingEventArgs._settingClass];value;dfc-generated |
+| System.Configuration;SettingChangingEventArgs;SettingChangingEventArgs;(System.String,System.String,System.String,System.Object,System.Boolean);Argument[2];Argument[this].SyntheticField[System.Configuration.SettingChangingEventArgs._settingKey];value;dfc-generated |
+| System.Configuration;SettingChangingEventArgs;SettingChangingEventArgs;(System.String,System.String,System.String,System.Object,System.Boolean);Argument[3];Argument[this].SyntheticField[System.Configuration.SettingChangingEventArgs._newValue];value;dfc-generated |
+| System.Configuration;SettingChangingEventArgs;get_NewValue;();Argument[this].SyntheticField[System.Configuration.SettingChangingEventArgs._newValue];ReturnValue;value;dfc-generated |
+| System.Configuration;SettingChangingEventArgs;get_SettingClass;();Argument[this].SyntheticField[System.Configuration.SettingChangingEventArgs._settingClass];ReturnValue;value;dfc-generated |
+| System.Configuration;SettingChangingEventArgs;get_SettingKey;();Argument[this].SyntheticField[System.Configuration.SettingChangingEventArgs._settingKey];ReturnValue;value;dfc-generated |
+| System.Configuration;SettingChangingEventArgs;get_SettingName;();Argument[this].SyntheticField[System.Configuration.SettingChangingEventArgs._settingName];ReturnValue;value;dfc-generated |
 | System.Configuration;SettingChangingEventHandler;BeginInvoke;(System.Object,System.Configuration.SettingChangingEventArgs,System.AsyncCallback,System.Object);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
 | System.Configuration;SettingElementCollection;Add;(System.Configuration.SettingElement);Argument[this];Argument[0];taint;df-generated |
 | System.Configuration;SettingElementCollection;Clear;();Argument[this].WithoutElement;Argument[this];value;manual |
 | System.Configuration;SettingElementCollection;Get;(System.String);Argument[this];ReturnValue;taint;df-generated |
-| System.Configuration;SettingsBase;Initialize;(System.Configuration.SettingsContext,System.Configuration.SettingsPropertyCollection,System.Configuration.SettingsProviderCollection);Argument[0].Element;Argument[this];taint;df-generated |
-| System.Configuration;SettingsBase;Initialize;(System.Configuration.SettingsContext,System.Configuration.SettingsPropertyCollection,System.Configuration.SettingsProviderCollection);Argument[1].Element;Argument[this];taint;df-generated |
-| System.Configuration;SettingsBase;Initialize;(System.Configuration.SettingsContext,System.Configuration.SettingsPropertyCollection,System.Configuration.SettingsProviderCollection);Argument[2].Element;Argument[this];taint;df-generated |
-| System.Configuration;SettingsBase;Synchronized;(System.Configuration.SettingsBase);Argument[0];ReturnValue;taint;df-generated |
-| System.Configuration;SettingsBase;get_Context;();Argument[this];ReturnValue;taint;df-generated |
+| System.Configuration;SettingElementCollection;GetElementKey;(System.Configuration.ConfigurationElement);Argument[0].Property[System.Configuration.SettingElement.Name];ReturnValue;value;df-generated |
+| System.Configuration;SettingElementCollection;GetElementKey;(System.Configuration.ConfigurationElement);Argument[0].Property[System.Configuration.SettingElement.Name];ReturnValue;value;dfc-generated |
+| System.Configuration;SettingsBase;Initialize;(System.Configuration.SettingsContext,System.Configuration.SettingsPropertyCollection,System.Configuration.SettingsProviderCollection);Argument[0];Argument[this].SyntheticField[System.Configuration.SettingsBase._context];value;dfc-generated |
+| System.Configuration;SettingsBase;Initialize;(System.Configuration.SettingsContext,System.Configuration.SettingsPropertyCollection,System.Configuration.SettingsProviderCollection);Argument[1];Argument[this].SyntheticField[System.Configuration.SettingsBase._properties];value;dfc-generated |
+| System.Configuration;SettingsBase;Initialize;(System.Configuration.SettingsContext,System.Configuration.SettingsPropertyCollection,System.Configuration.SettingsProviderCollection);Argument[2];Argument[this].SyntheticField[System.Configuration.SettingsBase._providers];value;dfc-generated |
+| System.Configuration;SettingsBase;Synchronized;(System.Configuration.SettingsBase);Argument[0];ReturnValue;value;dfc-generated |
+| System.Configuration;SettingsBase;get_Context;();Argument[this].SyntheticField[System.Configuration.SettingsBase._context];ReturnValue;value;dfc-generated |
 | System.Configuration;SettingsBase;get_Item;(System.String);Argument[this];ReturnValue;taint;df-generated |
-| System.Configuration;SettingsBase;get_Properties;();Argument[this];ReturnValue;taint;df-generated |
+| System.Configuration;SettingsBase;get_Properties;();Argument[this].SyntheticField[System.Configuration.SettingsBase._properties];ReturnValue;value;dfc-generated |
 | System.Configuration;SettingsBase;get_PropertyValues;();Argument[this];ReturnValue;taint;df-generated |
-| System.Configuration;SettingsBase;get_Providers;();Argument[this];ReturnValue;taint;df-generated |
-| System.Configuration;SettingsDescriptionAttribute;SettingsDescriptionAttribute;(System.String);Argument[0];Argument[this];taint;df-generated |
-| System.Configuration;SettingsDescriptionAttribute;get_Description;();Argument[this];ReturnValue;taint;df-generated |
-| System.Configuration;SettingsGroupDescriptionAttribute;SettingsGroupDescriptionAttribute;(System.String);Argument[0];Argument[this];taint;df-generated |
-| System.Configuration;SettingsGroupDescriptionAttribute;get_Description;();Argument[this];ReturnValue;taint;df-generated |
-| System.Configuration;SettingsGroupNameAttribute;SettingsGroupNameAttribute;(System.String);Argument[0];Argument[this];taint;df-generated |
-| System.Configuration;SettingsGroupNameAttribute;get_GroupName;();Argument[this];ReturnValue;taint;df-generated |
-| System.Configuration;SettingsLoadedEventArgs;SettingsLoadedEventArgs;(System.Configuration.SettingsProvider);Argument[0];Argument[this];taint;df-generated |
-| System.Configuration;SettingsLoadedEventArgs;get_Provider;();Argument[this];ReturnValue;taint;df-generated |
+| System.Configuration;SettingsBase;get_Providers;();Argument[this].SyntheticField[System.Configuration.SettingsBase._providers];ReturnValue;value;dfc-generated |
+| System.Configuration;SettingsDescriptionAttribute;SettingsDescriptionAttribute;(System.String);Argument[0];Argument[this].SyntheticField[System.Configuration.SettingsDescriptionAttribute._description];value;dfc-generated |
+| System.Configuration;SettingsDescriptionAttribute;get_Description;();Argument[this].SyntheticField[System.Configuration.SettingsDescriptionAttribute._description];ReturnValue;value;dfc-generated |
+| System.Configuration;SettingsGroupDescriptionAttribute;SettingsGroupDescriptionAttribute;(System.String);Argument[0];Argument[this].SyntheticField[System.Configuration.SettingsGroupDescriptionAttribute._description];value;dfc-generated |
+| System.Configuration;SettingsGroupDescriptionAttribute;get_Description;();Argument[this].SyntheticField[System.Configuration.SettingsGroupDescriptionAttribute._description];ReturnValue;value;dfc-generated |
+| System.Configuration;SettingsGroupNameAttribute;SettingsGroupNameAttribute;(System.String);Argument[0];Argument[this].SyntheticField[System.Configuration.SettingsGroupNameAttribute._groupName];value;dfc-generated |
+| System.Configuration;SettingsGroupNameAttribute;get_GroupName;();Argument[this].SyntheticField[System.Configuration.SettingsGroupNameAttribute._groupName];ReturnValue;value;dfc-generated |
+| System.Configuration;SettingsLoadedEventArgs;SettingsLoadedEventArgs;(System.Configuration.SettingsProvider);Argument[0];Argument[this].SyntheticField[System.Configuration.SettingsLoadedEventArgs._provider];value;dfc-generated |
+| System.Configuration;SettingsLoadedEventArgs;get_Provider;();Argument[this].SyntheticField[System.Configuration.SettingsLoadedEventArgs._provider];ReturnValue;value;dfc-generated |
 | System.Configuration;SettingsLoadedEventHandler;BeginInvoke;(System.Object,System.Configuration.SettingsLoadedEventArgs,System.AsyncCallback,System.Object);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
 | System.Configuration;SettingsPropertyCollection;Clear;();Argument[this].WithoutElement;Argument[this];value;manual |
 | System.Configuration;SettingsPropertyCollection;get_Item;(System.String);Argument[this];ReturnValue;taint;df-generated |
-| System.Configuration;SettingsPropertyValue;get_Name;();Argument[this];ReturnValue;taint;df-generated |
-| System.Configuration;SettingsPropertyValueCollection;Add;(System.Configuration.SettingsPropertyValue);Argument[0];Argument[this];taint;df-generated |
+| System.Configuration;SettingsPropertyValue;get_Name;();Argument[this].Property[System.Configuration.SettingsPropertyValue.Property].Property[System.Configuration.SettingsProperty.Name];ReturnValue;value;dfc-generated |
+| System.Configuration;SettingsPropertyValueCollection;Add;(System.Configuration.SettingsPropertyValue);Argument[0];Argument[this].SyntheticField[System.Configuration.SettingsPropertyValueCollection._values].Element;value;dfc-generated |
 | System.Configuration;SettingsPropertyValueCollection;Clear;();Argument[this].WithoutElement;Argument[this];value;manual |
-| System.Configuration;SettingsPropertyValueCollection;get_Item;(System.String);Argument[this];ReturnValue;taint;df-generated |
-| System.Configuration;SettingsProviderAttribute;SettingsProviderAttribute;(System.String);Argument[0];Argument[this];taint;df-generated |
-| System.Configuration;SettingsProviderAttribute;get_ProviderTypeName;();Argument[this];ReturnValue;taint;df-generated |
+| System.Configuration;SettingsPropertyValueCollection;get_Item;(System.String);Argument[this].SyntheticField[System.Configuration.SettingsPropertyValueCollection._values].Element;ReturnValue;value;dfc-generated |
+| System.Configuration;SettingsProviderAttribute;SettingsProviderAttribute;(System.String);Argument[0];Argument[this].SyntheticField[System.Configuration.SettingsProviderAttribute._providerTypeName];value;dfc-generated |
+| System.Configuration;SettingsProviderAttribute;get_ProviderTypeName;();Argument[this].SyntheticField[System.Configuration.SettingsProviderAttribute._providerTypeName];ReturnValue;value;dfc-generated |
 | System.Configuration;SettingsProviderCollection;get_Item;(System.String);Argument[this];ReturnValue;taint;df-generated |
 | System.Configuration;SettingsSavingEventHandler;BeginInvoke;(System.Object,System.ComponentModel.CancelEventArgs,System.AsyncCallback,System.Object);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
+| System.Configuration;SingleTagSectionHandler;Create;(System.Object,System.Object,System.Xml.XmlNode);Argument[0].Element.Property[System.Collections.Generic.KeyValuePair`2.Key];ReturnValue.Element.Property[System.Collections.Generic.KeyValuePair`2.Key];value;dfc-generated |
+| System.Configuration;SingleTagSectionHandler;Create;(System.Object,System.Object,System.Xml.XmlNode);Argument[0].Element.Property[System.Collections.Generic.KeyValuePair`2.Value];ReturnValue.Element.Property[System.Collections.Generic.KeyValuePair`2.Value];value;dfc-generated |
 | System.Configuration;StringValidator;StringValidator;(System.Int32,System.Int32,System.String);Argument[2];Argument[this];taint;df-generated |
 | System.Configuration;StringValidatorAttribute;get_ValidatorInstance;();Argument[this];ReturnValue;taint;df-generated |
 | System.Configuration;SubclassTypeValidatorAttribute;get_ValidatorInstance;();Argument[this];ReturnValue;taint;df-generated |
-| System.Configuration;TimeSpanMinutesConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[0];ReturnValue;taint;df-generated |
-| System.Configuration;TimeSpanMinutesConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue;taint;df-generated |
-| System.Configuration;TimeSpanMinutesConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[this];ReturnValue;taint;df-generated |
-| System.Configuration;TimeSpanMinutesConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[1];ReturnValue;taint;df-generated |
-| System.Configuration;TimeSpanMinutesConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[2];ReturnValue;taint;df-generated |
-| System.Configuration;TimeSpanMinutesConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[this];ReturnValue;taint;df-generated |
-| System.Configuration;TimeSpanMinutesOrInfiniteConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[0];ReturnValue;taint;df-generated |
-| System.Configuration;TimeSpanMinutesOrInfiniteConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue;taint;df-generated |
-| System.Configuration;TimeSpanMinutesOrInfiniteConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[this];ReturnValue;taint;df-generated |
-| System.Configuration;TimeSpanMinutesOrInfiniteConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[1];ReturnValue;taint;df-generated |
-| System.Configuration;TimeSpanMinutesOrInfiniteConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[2];ReturnValue;taint;df-generated |
-| System.Configuration;TimeSpanMinutesOrInfiniteConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[this];ReturnValue;taint;df-generated |
-| System.Configuration;TimeSpanSecondsConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[0];ReturnValue;taint;df-generated |
-| System.Configuration;TimeSpanSecondsConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue;taint;df-generated |
-| System.Configuration;TimeSpanSecondsConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[this];ReturnValue;taint;df-generated |
-| System.Configuration;TimeSpanSecondsConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[1];ReturnValue;taint;df-generated |
-| System.Configuration;TimeSpanSecondsConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[2];ReturnValue;taint;df-generated |
-| System.Configuration;TimeSpanSecondsConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[this];ReturnValue;taint;df-generated |
-| System.Configuration;TimeSpanSecondsOrInfiniteConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[0];ReturnValue;taint;df-generated |
-| System.Configuration;TimeSpanSecondsOrInfiniteConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue;taint;df-generated |
-| System.Configuration;TimeSpanSecondsOrInfiniteConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[this];ReturnValue;taint;df-generated |
-| System.Configuration;TimeSpanSecondsOrInfiniteConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[1];ReturnValue;taint;df-generated |
-| System.Configuration;TimeSpanSecondsOrInfiniteConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[2];ReturnValue;taint;df-generated |
-| System.Configuration;TimeSpanSecondsOrInfiniteConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[this];ReturnValue;taint;df-generated |
+| System.Configuration;TimeSpanMinutesConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue.Element;taint;dfc-generated |
+| System.Configuration;TimeSpanMinutesConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue;taint;dfc-generated |
+| System.Configuration;TimeSpanMinutesConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue;value;dfc-generated |
+| System.Configuration;TimeSpanMinutesConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[2].Element;ReturnValue;taint;dfc-generated |
+| System.Configuration;TimeSpanMinutesConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[2];ReturnValue;taint;dfc-generated |
+| System.Configuration;TimeSpanMinutesOrInfiniteConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue.Element;taint;dfc-generated |
+| System.Configuration;TimeSpanMinutesOrInfiniteConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue;taint;dfc-generated |
+| System.Configuration;TimeSpanMinutesOrInfiniteConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue;value;dfc-generated |
+| System.Configuration;TimeSpanMinutesOrInfiniteConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[2].Element;ReturnValue;taint;dfc-generated |
+| System.Configuration;TimeSpanMinutesOrInfiniteConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[2];ReturnValue;taint;dfc-generated |
+| System.Configuration;TimeSpanSecondsConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue.Element;taint;dfc-generated |
+| System.Configuration;TimeSpanSecondsConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue;taint;dfc-generated |
+| System.Configuration;TimeSpanSecondsConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue;value;dfc-generated |
+| System.Configuration;TimeSpanSecondsConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[2].Element;ReturnValue;taint;dfc-generated |
+| System.Configuration;TimeSpanSecondsConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[2];ReturnValue;taint;dfc-generated |
+| System.Configuration;TimeSpanSecondsOrInfiniteConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue.Element;taint;dfc-generated |
+| System.Configuration;TimeSpanSecondsOrInfiniteConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue;taint;dfc-generated |
+| System.Configuration;TimeSpanSecondsOrInfiniteConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue;value;dfc-generated |
+| System.Configuration;TimeSpanSecondsOrInfiniteConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[2].Element;ReturnValue;taint;dfc-generated |
+| System.Configuration;TimeSpanSecondsOrInfiniteConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[2];ReturnValue;taint;dfc-generated |
 | System.Configuration;TimeSpanValidator;TimeSpanValidator;(System.TimeSpan,System.TimeSpan,System.Boolean,System.Int64);Argument[0];Argument[this];taint;df-generated |
 | System.Configuration;TimeSpanValidator;TimeSpanValidator;(System.TimeSpan,System.TimeSpan,System.Boolean,System.Int64);Argument[1];Argument[this];taint;df-generated |
 | System.Configuration;TimeSpanValidatorAttribute;get_ValidatorInstance;();Argument[this];ReturnValue;taint;df-generated |
-| System.Configuration;TypeNameConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[0];ReturnValue;taint;df-generated |
-| System.Configuration;TypeNameConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue;taint;df-generated |
-| System.Configuration;TypeNameConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[this];ReturnValue;taint;df-generated |
-| System.Configuration;TypeNameConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[1];ReturnValue;taint;df-generated |
-| System.Configuration;TypeNameConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[2];ReturnValue;taint;df-generated |
-| System.Configuration;TypeNameConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[this];ReturnValue;taint;df-generated |
+| System.Configuration;TypeNameConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue.Element;taint;dfc-generated |
+| System.Configuration;TypeNameConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue;taint;dfc-generated |
+| System.Configuration;TypeNameConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue;value;dfc-generated |
+| System.Configuration;TypeNameConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[2].Element;ReturnValue;taint;dfc-generated |
+| System.Configuration;TypeNameConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[2];ReturnValue;taint;dfc-generated |
 | System.Configuration;UriSection;get_Idn;();Argument[this];ReturnValue;taint;df-generated |
 | System.Configuration;UriSection;get_IriParsing;();Argument[this];ReturnValue;taint;df-generated |
 | System.Configuration;UriSection;get_SchemeSettings;();Argument[this];ReturnValue;taint;df-generated |
 | System.Configuration;ValidatorCallback;BeginInvoke;(System.Object,System.AsyncCallback,System.Object);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
-| System.Configuration;WhiteSpaceTrimStringConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[0];ReturnValue;taint;df-generated |
-| System.Configuration;WhiteSpaceTrimStringConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue;taint;df-generated |
-| System.Configuration;WhiteSpaceTrimStringConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[this];ReturnValue;taint;df-generated |
-| System.Configuration;WhiteSpaceTrimStringConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[1];ReturnValue;taint;df-generated |
-| System.Configuration;WhiteSpaceTrimStringConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[2];ReturnValue;taint;df-generated |
-| System.Configuration;WhiteSpaceTrimStringConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[this];ReturnValue;taint;df-generated |
-| System.Data.Common;DataAdapter;FillSchema;(System.Data.DataTable,System.Data.SchemaType,System.Data.IDataReader);Argument[0];ReturnValue;taint;df-generated |
-| System.Data.Common;DataAdapter;FillSchema;(System.Data.DataTable,System.Data.SchemaType,System.Data.IDataReader);Argument[this];ReturnValue;taint;df-generated |
+| System.Configuration;WhiteSpaceTrimStringConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue.Element;taint;dfc-generated |
+| System.Configuration;WhiteSpaceTrimStringConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue;taint;dfc-generated |
+| System.Configuration;WhiteSpaceTrimStringConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue;value;dfc-generated |
+| System.Configuration;WhiteSpaceTrimStringConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[2].Element;ReturnValue;taint;dfc-generated |
+| System.Configuration;WhiteSpaceTrimStringConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[2];ReturnValue;taint;dfc-generated |
+| System.Data.Common;DataAdapter;FillSchema;(System.Data.DataTable,System.Data.SchemaType,System.Data.IDataReader);Argument[0];ReturnValue.Element;value;dfc-generated |
+| System.Data.Common;DataAdapter;FillSchema;(System.Data.DataTable,System.Data.SchemaType,System.Data.IDataReader);Argument[0];ReturnValue;value;dfc-generated |
 | System.Data.Common;DataAdapter;add_FillError;(System.Data.FillErrorEventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
+| System.Data.Common;DataAdapter;get_TableMappings;();Argument[this].Property[System.Data.Common.DataAdapter.TableMappings];ReturnValue;value;df-generated |
+| System.Data.Common;DataAdapter;get_TableMappings;();Argument[this].Property[System.Data.Common.DataAdapter.TableMappings];ReturnValue;value;dfc-generated |
 | System.Data.Common;DataAdapter;get_TableMappings;();Argument[this];ReturnValue;taint;df-generated |
+| System.Data.Common;DataAdapter;get_TableMappings;();Argument[this];ReturnValue;taint;dfc-generated |
 | System.Data.Common;DataAdapter;remove_FillError;(System.Data.FillErrorEventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
-| System.Data.Common;DataColumnMapping;DataColumnMapping;(System.String,System.String);Argument[0];Argument[this];taint;df-generated |
-| System.Data.Common;DataColumnMapping;DataColumnMapping;(System.String,System.String);Argument[1];Argument[this];taint;df-generated |
+| System.Data.Common;DataColumnMapping;Clone;();Argument[this].SyntheticField[System.Data.Common.DataColumnMapping._sourceColumnName];ReturnValue.SyntheticField[System.Data.Common.DataColumnMapping._sourceColumnName];value;dfc-generated |
+| System.Data.Common;DataColumnMapping;DataColumnMapping;(System.String,System.String);Argument[0];Argument[this].SyntheticField[System.Data.Common.DataColumnMapping._sourceColumnName];value;dfc-generated |
 | System.Data.Common;DataColumnMapping;GetDataColumnBySchemaAction;(System.Data.DataTable,System.Type,System.Data.MissingSchemaAction);Argument[0];ReturnValue;taint;df-generated |
 | System.Data.Common;DataColumnMapping;GetDataColumnBySchemaAction;(System.String,System.String,System.Data.DataTable,System.Type,System.Data.MissingSchemaAction);Argument[2];ReturnValue;taint;df-generated |
-| System.Data.Common;DataColumnMapping;ToString;();Argument[this];ReturnValue;taint;df-generated |
-| System.Data.Common;DataColumnMappingCollection;Add;(System.String,System.String);Argument[0];ReturnValue;taint;df-generated |
-| System.Data.Common;DataColumnMappingCollection;Add;(System.String,System.String);Argument[1];ReturnValue;taint;df-generated |
+| System.Data.Common;DataColumnMapping;ToString;();Argument[this].Property[System.Data.Common.DataColumnMapping.SourceColumn];ReturnValue;value;dfc-generated |
+| System.Data.Common;DataColumnMapping;ToString;();Argument[this].SyntheticField[System.Data.Common.DataColumnMapping._sourceColumnName];ReturnValue;value;dfc-generated |
 | System.Data.Common;DataColumnMappingCollection;Add;(System.String,System.String);Argument[this];ReturnValue;taint;df-generated |
 | System.Data.Common;DataColumnMappingCollection;AddRange;(System.Array);Argument[0].Element;Argument[this].Element;value;manual |
 | System.Data.Common;DataColumnMappingCollection;AddRange;(System.Data.Common.DataColumnMapping[]);Argument[0].Element;Argument[this].Element;value;manual |
 | System.Data.Common;DataColumnMappingCollection;CopyTo;(System.Data.Common.DataColumnMapping[],System.Int32);Argument[this].Element;Argument[0].Element;value;manual |
 | System.Data.Common;DataColumnMappingCollection;GetByDataSetColumn;(System.String);Argument[this];ReturnValue;taint;df-generated |
 | System.Data.Common;DataColumnMappingCollection;GetColumnMappingBySchemaAction;(System.Data.Common.DataColumnMappingCollection,System.String,System.Data.MissingMappingAction);Argument[0].Element;ReturnValue;taint;df-generated |
-| System.Data.Common;DataColumnMappingCollection;GetColumnMappingBySchemaAction;(System.Data.Common.DataColumnMappingCollection,System.String,System.Data.MissingMappingAction);Argument[1];ReturnValue;taint;df-generated |
 | System.Data.Common;DataColumnMappingCollection;GetDataColumn;(System.Data.Common.DataColumnMappingCollection,System.String,System.Type,System.Data.DataTable,System.Data.MissingMappingAction,System.Data.MissingSchemaAction);Argument[3];ReturnValue;taint;df-generated |
 | System.Data.Common;DataColumnMappingCollection;Insert;(System.Int32,System.Data.Common.DataColumnMapping);Argument[1];Argument[this].Element;value;manual |
 | System.Data.Common;DataColumnMappingCollection;get_Item;(System.Int32);Argument[this].Element;ReturnValue;value;manual |
 | System.Data.Common;DataColumnMappingCollection;get_Item;(System.String);Argument[this].Element;ReturnValue;value;manual |
 | System.Data.Common;DataColumnMappingCollection;set_Item;(System.Int32,System.Data.Common.DataColumnMapping);Argument[1];Argument[this].Element;value;manual |
 | System.Data.Common;DataColumnMappingCollection;set_Item;(System.String,System.Data.Common.DataColumnMapping);Argument[1];Argument[this].Element;value;manual |
-| System.Data.Common;DataTableMapping;DataTableMapping;(System.String,System.String);Argument[0];Argument[this];taint;df-generated |
-| System.Data.Common;DataTableMapping;DataTableMapping;(System.String,System.String);Argument[1];Argument[this];taint;df-generated |
-| System.Data.Common;DataTableMapping;DataTableMapping;(System.String,System.String,System.Data.Common.DataColumnMapping[]);Argument[0];Argument[this];taint;df-generated |
-| System.Data.Common;DataTableMapping;DataTableMapping;(System.String,System.String,System.Data.Common.DataColumnMapping[]);Argument[1];Argument[this];taint;df-generated |
-| System.Data.Common;DataTableMapping;DataTableMapping;(System.String,System.String,System.Data.Common.DataColumnMapping[]);Argument[2].Element;Argument[this];taint;df-generated |
-| System.Data.Common;DataTableMapping;GetColumnMappingBySchemaAction;(System.String,System.Data.MissingMappingAction);Argument[0];ReturnValue;taint;df-generated |
+| System.Data.Common;DataTableMapping;Clone;();Argument[this].SyntheticField[System.Data.Common.DataTableMapping._sourceTableName];ReturnValue.SyntheticField[System.Data.Common.DataTableMapping._sourceTableName];value;dfc-generated |
+| System.Data.Common;DataTableMapping;DataTableMapping;(System.String,System.String);Argument[0];Argument[this].SyntheticField[System.Data.Common.DataTableMapping._sourceTableName];value;dfc-generated |
+| System.Data.Common;DataTableMapping;DataTableMapping;(System.String,System.String,System.Data.Common.DataColumnMapping[]);Argument[0];Argument[this].SyntheticField[System.Data.Common.DataTableMapping._sourceTableName];value;dfc-generated |
+| System.Data.Common;DataTableMapping;DataTableMapping;(System.String,System.String,System.Data.Common.DataColumnMapping[]);Argument[2].Element;Argument[this].Property[System.Data.Common.DataTableMapping.ColumnMappings].Element;value;dfc-generated |
+| System.Data.Common;DataTableMapping;DataTableMapping;(System.String,System.String,System.Data.Common.DataColumnMapping[]);Argument[2].Element;Argument[this].SyntheticField[System.Data.Common.DataTableMapping._columnMappings].Element;value;dfc-generated |
 | System.Data.Common;DataTableMapping;GetColumnMappingBySchemaAction;(System.String,System.Data.MissingMappingAction);Argument[this];ReturnValue;taint;df-generated |
 | System.Data.Common;DataTableMapping;GetDataColumn;(System.String,System.Type,System.Data.DataTable,System.Data.MissingMappingAction,System.Data.MissingSchemaAction);Argument[2];ReturnValue;taint;df-generated |
 | System.Data.Common;DataTableMapping;GetDataTableBySchemaAction;(System.Data.DataSet,System.Data.MissingSchemaAction);Argument[0];ReturnValue;taint;df-generated |
 | System.Data.Common;DataTableMapping;GetDataTableBySchemaAction;(System.Data.DataSet,System.Data.MissingSchemaAction);Argument[this];ReturnValue;taint;df-generated |
-| System.Data.Common;DataTableMapping;ToString;();Argument[this];ReturnValue;taint;df-generated |
-| System.Data.Common;DataTableMapping;get_ColumnMappings;();Argument[this];ReturnValue;taint;df-generated |
-| System.Data.Common;DataTableMappingCollection;Add;(System.String,System.String);Argument[0];ReturnValue;taint;df-generated |
-| System.Data.Common;DataTableMappingCollection;Add;(System.String,System.String);Argument[1];ReturnValue;taint;df-generated |
+| System.Data.Common;DataTableMapping;ToString;();Argument[this].Property[System.Data.Common.DataTableMapping.SourceTable];ReturnValue;value;dfc-generated |
+| System.Data.Common;DataTableMapping;ToString;();Argument[this].SyntheticField[System.Data.Common.DataTableMapping._sourceTableName];ReturnValue;value;dfc-generated |
+| System.Data.Common;DataTableMapping;get_ColumnMappings;();Argument[this].Property[System.Data.Common.DataTableMapping.ColumnMappings];ReturnValue;value;dfc-generated |
+| System.Data.Common;DataTableMapping;get_ColumnMappings;();Argument[this].SyntheticField[System.Data.Common.DataTableMapping._columnMappings];ReturnValue;value;dfc-generated |
 | System.Data.Common;DataTableMappingCollection;Add;(System.String,System.String);Argument[this];ReturnValue;taint;df-generated |
 | System.Data.Common;DataTableMappingCollection;AddRange;(System.Array);Argument[0].Element;Argument[this].Element;value;manual |
 | System.Data.Common;DataTableMappingCollection;AddRange;(System.Data.Common.DataTableMapping[]);Argument[0].Element;Argument[this].Element;value;manual |
 | System.Data.Common;DataTableMappingCollection;CopyTo;(System.Data.Common.DataTableMapping[],System.Int32);Argument[this].Element;Argument[0].Element;value;manual |
 | System.Data.Common;DataTableMappingCollection;GetByDataSetTable;(System.String);Argument[this];ReturnValue;taint;df-generated |
 | System.Data.Common;DataTableMappingCollection;GetTableMappingBySchemaAction;(System.Data.Common.DataTableMappingCollection,System.String,System.String,System.Data.MissingMappingAction);Argument[0].Element;ReturnValue;taint;df-generated |
-| System.Data.Common;DataTableMappingCollection;GetTableMappingBySchemaAction;(System.Data.Common.DataTableMappingCollection,System.String,System.String,System.Data.MissingMappingAction);Argument[1];ReturnValue;taint;df-generated |
-| System.Data.Common;DataTableMappingCollection;GetTableMappingBySchemaAction;(System.Data.Common.DataTableMappingCollection,System.String,System.String,System.Data.MissingMappingAction);Argument[2];ReturnValue;taint;df-generated |
 | System.Data.Common;DataTableMappingCollection;Insert;(System.Int32,System.Data.Common.DataTableMapping);Argument[1];Argument[this].Element;value;manual |
 | System.Data.Common;DataTableMappingCollection;get_Item;(System.Int32);Argument[this].Element;ReturnValue;value;manual |
 | System.Data.Common;DataTableMappingCollection;get_Item;(System.String);Argument[this].Element;ReturnValue;value;manual |
 | System.Data.Common;DataTableMappingCollection;set_Item;(System.Int32,System.Data.Common.DataTableMapping);Argument[1];Argument[this].Element;value;manual |
 | System.Data.Common;DataTableMappingCollection;set_Item;(System.String,System.Data.Common.DataTableMapping);Argument[1];Argument[this].Element;value;manual |
-| System.Data.Common;DbBatch;get_BatchCommands;();Argument[this];ReturnValue;taint;df-generated |
+| System.Data.Common;DbBatch;get_BatchCommands;();Argument[this].Property[System.Data.Common.DbBatch.DbBatchCommands];ReturnValue;value;dfc-generated |
 | System.Data.Common;DbBatch;get_DbBatchCommands;();Argument[this];ReturnValue;taint;df-generated |
-| System.Data.Common;DbBatchCommand;get_Parameters;();Argument[this];ReturnValue;taint;df-generated |
+| System.Data.Common;DbBatchCommand;get_Parameters;();Argument[this].Property[System.Data.Common.DbBatchCommand.DbParameterCollection];ReturnValue;value;dfc-generated |
 | System.Data.Common;DbColumn;get_Item;(System.String);Argument[this];ReturnValue;taint;df-generated |
 | System.Data.Common;DbCommand;ExecuteDbDataReader;(System.Data.CommandBehavior);Argument[this];ReturnValue;taint;df-generated |
-| System.Data.Common;DbCommand;ExecuteDbDataReaderAsync;(System.Data.CommandBehavior,System.Threading.CancellationToken);Argument[this];ReturnValue;taint;df-generated |
-| System.Data.Common;DbCommand;ExecuteReader;();Argument[this];ReturnValue;taint;df-generated |
-| System.Data.Common;DbCommand;ExecuteReader;(System.Data.CommandBehavior);Argument[this];ReturnValue;taint;df-generated |
-| System.Data.Common;DbCommand;ExecuteReaderAsync;();Argument[this];ReturnValue;taint;df-generated |
-| System.Data.Common;DbCommand;ExecuteReaderAsync;(System.Data.CommandBehavior);Argument[this];ReturnValue;taint;df-generated |
-| System.Data.Common;DbCommand;ExecuteReaderAsync;(System.Data.CommandBehavior,System.Threading.CancellationToken);Argument[this];ReturnValue;taint;df-generated |
-| System.Data.Common;DbCommand;ExecuteReaderAsync;(System.Threading.CancellationToken);Argument[this];ReturnValue;taint;df-generated |
-| System.Data.Common;DbCommand;ExecuteScalarAsync;();Argument[this];ReturnValue;taint;df-generated |
-| System.Data.Common;DbCommand;ExecuteScalarAsync;(System.Threading.CancellationToken);Argument[this];ReturnValue;taint;df-generated |
-| System.Data.Common;DbCommand;PrepareAsync;(System.Threading.CancellationToken);Argument[0];ReturnValue;taint;df-generated |
 | System.Data.Common;DbCommand;get_DbParameterCollection;();Argument[this];ReturnValue;taint;df-generated |
-| System.Data.Common;DbCommand;get_Parameters;();Argument[this];ReturnValue;taint;df-generated |
+| System.Data.Common;DbCommand;get_Parameters;();Argument[this].Property[System.Data.Common.DbCommand.DbParameterCollection];ReturnValue;value;dfc-generated |
 | System.Data.Common;DbCommandBuilder;GetDeleteCommand;();Argument[this];ReturnValue;taint;df-generated |
 | System.Data.Common;DbCommandBuilder;GetDeleteCommand;(System.Boolean);Argument[this];ReturnValue;taint;df-generated |
 | System.Data.Common;DbCommandBuilder;GetInsertCommand;();Argument[this];ReturnValue;taint;df-generated |
 | System.Data.Common;DbCommandBuilder;GetInsertCommand;(System.Boolean);Argument[this];ReturnValue;taint;df-generated |
-| System.Data.Common;DbCommandBuilder;GetParameterName;(System.String);Argument[0];ReturnValue;taint;df-generated |
+| System.Data.Common;DbCommandBuilder;GetParameterName;(System.String);Argument[0];ReturnValue;value;dfc-generated |
 | System.Data.Common;DbCommandBuilder;GetUpdateCommand;();Argument[this];ReturnValue;taint;df-generated |
 | System.Data.Common;DbCommandBuilder;GetUpdateCommand;(System.Boolean);Argument[this];ReturnValue;taint;df-generated |
-| System.Data.Common;DbCommandBuilder;InitializeCommand;(System.Data.Common.DbCommand);Argument[0];ReturnValue;taint;df-generated |
-| System.Data.Common;DbCommandBuilder;QuoteIdentifier;(System.String);Argument[0];ReturnValue;taint;df-generated |
-| System.Data.Common;DbCommandBuilder;QuoteIdentifier;(System.String);Argument[this];ReturnValue;taint;df-generated |
+| System.Data.Common;DbCommandBuilder;InitializeCommand;(System.Data.Common.DbCommand);Argument[0];ReturnValue;value;dfc-generated |
+| System.Data.Common;DbCommandBuilder;QuoteIdentifier;(System.String);Argument[0];ReturnValue;value;dfc-generated |
 | System.Data.Common;DbCommandBuilder;RowUpdatingHandler;(System.Data.Common.RowUpdatingEventArgs);Argument[this];Argument[0];taint;df-generated |
-| System.Data.Common;DbCommandBuilder;UnquoteIdentifier;(System.String);Argument[0];ReturnValue;taint;df-generated |
-| System.Data.Common;DbCommandBuilder;UnquoteIdentifier;(System.String);Argument[this];ReturnValue;taint;df-generated |
+| System.Data.Common;DbCommandBuilder;UnquoteIdentifier;(System.String);Argument[0];ReturnValue;value;dfc-generated |
 | System.Data.Common;DbConnection;BeginDbTransaction;(System.Data.IsolationLevel);Argument[this];ReturnValue;taint;df-generated |
-| System.Data.Common;DbConnection;BeginDbTransactionAsync;(System.Data.IsolationLevel,System.Threading.CancellationToken);Argument[this];ReturnValue;taint;df-generated |
-| System.Data.Common;DbConnection;BeginTransaction;();Argument[this];ReturnValue;taint;df-generated |
-| System.Data.Common;DbConnection;BeginTransaction;(System.Data.IsolationLevel);Argument[this];ReturnValue;taint;df-generated |
-| System.Data.Common;DbConnection;BeginTransactionAsync;(System.Data.IsolationLevel,System.Threading.CancellationToken);Argument[this];ReturnValue;taint;df-generated |
-| System.Data.Common;DbConnection;BeginTransactionAsync;(System.Threading.CancellationToken);Argument[this];ReturnValue;taint;df-generated |
-| System.Data.Common;DbConnection;ChangeDatabaseAsync;(System.String,System.Threading.CancellationToken);Argument[1];ReturnValue;taint;df-generated |
-| System.Data.Common;DbConnection;CreateCommand;();Argument[this];ReturnValue;taint;df-generated |
-| System.Data.Common;DbConnection;CreateDbCommand;();Argument[this];ReturnValue;taint;df-generated |
-| System.Data.Common;DbConnection;OpenAsync;(System.Threading.CancellationToken);Argument[0];ReturnValue;taint;df-generated |
 | System.Data.Common;DbConnection;add_StateChange;(System.Data.StateChangeEventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Data.Common;DbConnection;get_ServerVersion;();Argument[this];ReturnValue;taint;df-generated |
 | System.Data.Common;DbConnection;remove_StateChange;(System.Data.StateChangeEventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Data.Common;DbConnectionStringBuilder;Add;(System.String,System.Object);Argument[0];Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Key];value;manual |
 | System.Data.Common;DbConnectionStringBuilder;Add;(System.String,System.Object);Argument[1];Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Value];value;manual |
-| System.Data.Common;DbConnectionStringBuilder;AppendKeyValuePair;(System.Text.StringBuilder,System.String,System.String);Argument[1];Argument[0];taint;df-generated |
-| System.Data.Common;DbConnectionStringBuilder;AppendKeyValuePair;(System.Text.StringBuilder,System.String,System.String);Argument[2];Argument[0];taint;df-generated |
-| System.Data.Common;DbConnectionStringBuilder;AppendKeyValuePair;(System.Text.StringBuilder,System.String,System.String,System.Boolean);Argument[1];Argument[0];taint;df-generated |
-| System.Data.Common;DbConnectionStringBuilder;AppendKeyValuePair;(System.Text.StringBuilder,System.String,System.String,System.Boolean);Argument[2];Argument[0];taint;df-generated |
-| System.Data.Common;DbConnectionStringBuilder;GetProperties;(System.Collections.Hashtable);Argument[this];Argument[0].Element;taint;df-generated |
-| System.Data.Common;DbConnectionStringBuilder;ToString;();Argument[this];ReturnValue;taint;df-generated |
+| System.Data.Common;DbConnectionStringBuilder;AppendKeyValuePair;(System.Text.StringBuilder,System.String,System.String);Argument[1];Argument[0];taint;dfc-generated |
+| System.Data.Common;DbConnectionStringBuilder;AppendKeyValuePair;(System.Text.StringBuilder,System.String,System.String);Argument[2];Argument[0];taint;dfc-generated |
+| System.Data.Common;DbConnectionStringBuilder;AppendKeyValuePair;(System.Text.StringBuilder,System.String,System.String,System.Boolean);Argument[1];Argument[0];taint;dfc-generated |
+| System.Data.Common;DbConnectionStringBuilder;AppendKeyValuePair;(System.Text.StringBuilder,System.String,System.String,System.Boolean);Argument[2];Argument[0];taint;dfc-generated |
+| System.Data.Common;DbConnectionStringBuilder;GetProperties;(System.Collections.Hashtable);Argument[this].Property[System.Data.Common.DbConnectionStringBuilder.Keys].Element;Argument[0].Element.Property[System.Collections.Generic.KeyValuePair`2.Key];value;dfc-generated |
+| System.Data.Common;DbConnectionStringBuilder;ToString;();Argument[this].Property[System.Data.Common.DbConnectionStringBuilder.ConnectionString];ReturnValue;value;dfc-generated |
+| System.Data.Common;DbConnectionStringBuilder;ToString;();Argument[this].Property[System.Data.Common.DbConnectionStringBuilder.Keys].Element;ReturnValue;taint;dfc-generated |
 | System.Data.Common;DbConnectionStringBuilder;TryGetValue;(System.String,System.Object);Argument[this];ReturnValue;taint;df-generated |
 | System.Data.Common;DbConnectionStringBuilder;get_Item;(System.String);Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Value];ReturnValue;value;manual |
 | System.Data.Common;DbConnectionStringBuilder;set_Item;(System.String,System.Object);Argument[0];Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Key];value;manual |
 | System.Data.Common;DbConnectionStringBuilder;set_Item;(System.String,System.Object);Argument[1];Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Value];value;manual |
-| System.Data.Common;DbDataAdapter;CreateRowUpdatedEvent;(System.Data.DataRow,System.Data.IDbCommand,System.Data.StatementType,System.Data.Common.DataTableMapping);Argument[0];ReturnValue;taint;df-generated |
-| System.Data.Common;DbDataAdapter;CreateRowUpdatedEvent;(System.Data.DataRow,System.Data.IDbCommand,System.Data.StatementType,System.Data.Common.DataTableMapping);Argument[1];ReturnValue;taint;df-generated |
-| System.Data.Common;DbDataAdapter;CreateRowUpdatedEvent;(System.Data.DataRow,System.Data.IDbCommand,System.Data.StatementType,System.Data.Common.DataTableMapping);Argument[3];ReturnValue;taint;df-generated |
-| System.Data.Common;DbDataAdapter;CreateRowUpdatingEvent;(System.Data.DataRow,System.Data.IDbCommand,System.Data.StatementType,System.Data.Common.DataTableMapping);Argument[0];ReturnValue;taint;df-generated |
-| System.Data.Common;DbDataAdapter;CreateRowUpdatingEvent;(System.Data.DataRow,System.Data.IDbCommand,System.Data.StatementType,System.Data.Common.DataTableMapping);Argument[1];ReturnValue;taint;df-generated |
-| System.Data.Common;DbDataAdapter;CreateRowUpdatingEvent;(System.Data.DataRow,System.Data.IDbCommand,System.Data.StatementType,System.Data.Common.DataTableMapping);Argument[3];ReturnValue;taint;df-generated |
-| System.Data.Common;DbDataAdapter;DbDataAdapter;(System.Data.Common.DbDataAdapter);Argument[0];Argument[this];taint;df-generated |
-| System.Data.Common;DbDataAdapter;FillSchema;(System.Data.DataTable,System.Data.SchemaType);Argument[0];ReturnValue;taint;df-generated |
-| System.Data.Common;DbDataAdapter;FillSchema;(System.Data.DataTable,System.Data.SchemaType);Argument[this];ReturnValue;taint;df-generated |
-| System.Data.Common;DbDataAdapter;FillSchema;(System.Data.DataTable,System.Data.SchemaType,System.Data.IDbCommand,System.Data.CommandBehavior);Argument[0];ReturnValue;taint;df-generated |
-| System.Data.Common;DbDataAdapter;FillSchema;(System.Data.DataTable,System.Data.SchemaType,System.Data.IDbCommand,System.Data.CommandBehavior);Argument[this];ReturnValue;taint;df-generated |
-| System.Data.Common;DbDataReader;GetFieldValue<T>;(System.Int32);Argument[this];ReturnValue;taint;df-generated |
-| System.Data.Common;DbDataReader;GetFieldValueAsync<T>;(System.Int32);Argument[this];ReturnValue;taint;df-generated |
-| System.Data.Common;DbDataReader;GetFieldValueAsync<T>;(System.Int32,System.Threading.CancellationToken);Argument[this];ReturnValue;taint;df-generated |
-| System.Data.Common;DbDataReader;GetProviderSpecificValue;(System.Int32);Argument[this];ReturnValue;taint;df-generated |
-| System.Data.Common;DbDataReader;GetProviderSpecificValues;(System.Object[]);Argument[this];Argument[0].Element;taint;df-generated |
-| System.Data.Common;DbDataReader;GetSchemaTableAsync;(System.Threading.CancellationToken);Argument[this];ReturnValue;taint;df-generated |
-| System.Data.Common;DbDataReader;GetTextReader;(System.Int32);Argument[this];ReturnValue;taint;df-generated |
-| System.Data.Common;DbDataSource;CreateCommand;(System.String);Argument[0];ReturnValue;taint;df-generated |
-| System.Data.Common;DbDataSource;CreateDbCommand;(System.String);Argument[0];ReturnValue;taint;df-generated |
+| System.Data.Common;DbDataAdapter;FillSchema;(System.Data.DataTable,System.Data.SchemaType);Argument[0];ReturnValue.Element;value;dfc-generated |
+| System.Data.Common;DbDataAdapter;FillSchema;(System.Data.DataTable,System.Data.SchemaType);Argument[0];ReturnValue;value;dfc-generated |
+| System.Data.Common;DbDataAdapter;FillSchema;(System.Data.DataTable,System.Data.SchemaType,System.Data.IDbCommand,System.Data.CommandBehavior);Argument[0];ReturnValue.Element;value;dfc-generated |
+| System.Data.Common;DbDataAdapter;FillSchema;(System.Data.DataTable,System.Data.SchemaType,System.Data.IDbCommand,System.Data.CommandBehavior);Argument[0];ReturnValue;value;dfc-generated |
+| System.Data.Common;DbDataReader;GetFieldValue<T>;(System.Int32);Argument[this];ReturnValue;taint;dfc-generated |
+| System.Data.Common;DbDataReader;GetFieldValueAsync<T>;(System.Int32);Argument[this];ReturnValue.Property[System.Threading.Tasks.Task`1.Result];taint;dfc-generated |
+| System.Data.Common;DbDataReader;GetFieldValueAsync<T>;(System.Int32,System.Threading.CancellationToken);Argument[this];ReturnValue.Property[System.Threading.Tasks.Task`1.Result];taint;dfc-generated |
+| System.Data.Common;DbDataReader;GetProviderSpecificValue;(System.Int32);Argument[this];ReturnValue;taint;dfc-generated |
+| System.Data.Common;DbDataReader;GetProviderSpecificValues;(System.Object[]);Argument[this];Argument[0].Element;taint;dfc-generated |
+| System.Data.Common;DbDataReader;GetTextReader;(System.Int32);Argument[this];ReturnValue;taint;dfc-generated |
 | System.Data.Common;DbDataSource;get_ConnectionString;();Argument[this];ReturnValue;taint;df-generated |
 | System.Data.Common;DbEnumerator;DbEnumerator;(System.Data.IDataReader);Argument[0];Argument[this];taint;df-generated |
 | System.Data.Common;DbEnumerator;DbEnumerator;(System.Data.IDataReader,System.Boolean);Argument[0];Argument[this];taint;df-generated |
-| System.Data.Common;DbException;get_BatchCommand;();Argument[this];ReturnValue;taint;df-generated |
+| System.Data.Common;DbException;get_BatchCommand;();Argument[this].Property[System.Data.Common.DbException.DbBatchCommand];ReturnValue;value;dfc-generated |
 | System.Data.Common;DbParameterCollection;Add;(System.Object);Argument[0];Argument[this].Element;value;manual |
 | System.Data.Common;DbParameterCollection;AddRange;(System.Array);Argument[0].Element;Argument[this].Element;value;manual |
-| System.Data.Common;DbParameterCollection;GetParameter;(System.Int32);Argument[this];ReturnValue;taint;df-generated |
-| System.Data.Common;DbParameterCollection;GetParameter;(System.String);Argument[this];ReturnValue;taint;df-generated |
 | System.Data.Common;DbParameterCollection;Insert;(System.Int32,System.Object);Argument[1];Argument[this].Element;value;manual |
 | System.Data.Common;DbParameterCollection;SetParameter;(System.Int32,System.Data.Common.DbParameter);Argument[this];Argument[1];taint;df-generated |
 | System.Data.Common;DbParameterCollection;SetParameter;(System.String,System.Data.Common.DbParameter);Argument[this];Argument[1];taint;df-generated |
@@ -6054,29 +6717,23 @@
 | System.Data.Common;DbParameterCollection;get_Item;(System.String);Argument[this].Element;ReturnValue;value;manual |
 | System.Data.Common;DbParameterCollection;set_Item;(System.Int32,System.Data.Common.DbParameter);Argument[1];Argument[this].Element;value;manual |
 | System.Data.Common;DbParameterCollection;set_Item;(System.String,System.Data.Common.DbParameter);Argument[1];Argument[this].Element;value;manual |
-| System.Data.Common;DbProviderFactories;GetFactory;(System.Data.Common.DbConnection);Argument[0];ReturnValue;taint;df-generated |
-| System.Data.Common;DbProviderFactory;CreateDataSource;(System.String);Argument[0];ReturnValue;taint;df-generated |
-| System.Data.Common;DbProviderFactory;CreateDataSource;(System.String);Argument[this];ReturnValue;taint;df-generated |
-| System.Data.Common;DbTransaction;CommitAsync;(System.Threading.CancellationToken);Argument[0];ReturnValue;taint;df-generated |
-| System.Data.Common;DbTransaction;ReleaseAsync;(System.String,System.Threading.CancellationToken);Argument[1];ReturnValue;taint;df-generated |
-| System.Data.Common;DbTransaction;RollbackAsync;(System.String,System.Threading.CancellationToken);Argument[1];ReturnValue;taint;df-generated |
-| System.Data.Common;DbTransaction;RollbackAsync;(System.Threading.CancellationToken);Argument[0];ReturnValue;taint;df-generated |
-| System.Data.Common;DbTransaction;SaveAsync;(System.String,System.Threading.CancellationToken);Argument[1];ReturnValue;taint;df-generated |
-| System.Data.Common;DbTransaction;get_Connection;();Argument[this];ReturnValue;taint;df-generated |
-| System.Data.Common;DbTransaction;get_DbConnection;();Argument[this];ReturnValue;taint;df-generated |
-| System.Data.Common;RowUpdatedEventArgs;CopyToRows;(System.Data.DataRow[]);Argument[this];Argument[0].Element;taint;df-generated |
-| System.Data.Common;RowUpdatedEventArgs;CopyToRows;(System.Data.DataRow[],System.Int32);Argument[this];Argument[0].Element;taint;df-generated |
-| System.Data.Common;RowUpdatedEventArgs;RowUpdatedEventArgs;(System.Data.DataRow,System.Data.IDbCommand,System.Data.StatementType,System.Data.Common.DataTableMapping);Argument[0];Argument[this];taint;df-generated |
-| System.Data.Common;RowUpdatedEventArgs;RowUpdatedEventArgs;(System.Data.DataRow,System.Data.IDbCommand,System.Data.StatementType,System.Data.Common.DataTableMapping);Argument[1];Argument[this];taint;df-generated |
-| System.Data.Common;RowUpdatedEventArgs;RowUpdatedEventArgs;(System.Data.DataRow,System.Data.IDbCommand,System.Data.StatementType,System.Data.Common.DataTableMapping);Argument[3];Argument[this];taint;df-generated |
-| System.Data.Common;RowUpdatedEventArgs;get_Command;();Argument[this];ReturnValue;taint;df-generated |
-| System.Data.Common;RowUpdatedEventArgs;get_Row;();Argument[this];ReturnValue;taint;df-generated |
-| System.Data.Common;RowUpdatedEventArgs;get_TableMapping;();Argument[this];ReturnValue;taint;df-generated |
-| System.Data.Common;RowUpdatingEventArgs;RowUpdatingEventArgs;(System.Data.DataRow,System.Data.IDbCommand,System.Data.StatementType,System.Data.Common.DataTableMapping);Argument[0];Argument[this];taint;df-generated |
-| System.Data.Common;RowUpdatingEventArgs;RowUpdatingEventArgs;(System.Data.DataRow,System.Data.IDbCommand,System.Data.StatementType,System.Data.Common.DataTableMapping);Argument[1];Argument[this];taint;df-generated |
-| System.Data.Common;RowUpdatingEventArgs;RowUpdatingEventArgs;(System.Data.DataRow,System.Data.IDbCommand,System.Data.StatementType,System.Data.Common.DataTableMapping);Argument[3];Argument[this];taint;df-generated |
-| System.Data.Common;RowUpdatingEventArgs;get_Row;();Argument[this];ReturnValue;taint;df-generated |
-| System.Data.Common;RowUpdatingEventArgs;get_TableMapping;();Argument[this];ReturnValue;taint;df-generated |
+| System.Data.Common;DbProviderFactories;GetFactory;(System.Data.Common.DbConnection);Argument[0].Property[System.Data.Common.DbConnection.DbProviderFactory];ReturnValue;value;dfc-generated |
+| System.Data.Common;DbProviderFactory;CreateDataSource;(System.String);Argument[0];ReturnValue.SyntheticField[System.Data.Common.DefaultDataSource._connectionString];value;dfc-generated |
+| System.Data.Common;DbTransaction;get_Connection;();Argument[this].Property[System.Data.Common.DbTransaction.DbConnection];ReturnValue;value;dfc-generated |
+| System.Data.Common;RowUpdatedEventArgs;CopyToRows;(System.Data.DataRow[]);Argument[this].Property[System.Data.Common.RowUpdatedEventArgs.Row];Argument[0].Element;value;dfc-generated |
+| System.Data.Common;RowUpdatedEventArgs;CopyToRows;(System.Data.DataRow[]);Argument[this].SyntheticField[System.Data.Common.RowUpdatedEventArgs._dataRow];Argument[0].Element;value;dfc-generated |
+| System.Data.Common;RowUpdatedEventArgs;CopyToRows;(System.Data.DataRow[],System.Int32);Argument[this].Property[System.Data.Common.RowUpdatedEventArgs.Row];Argument[0].Element;value;dfc-generated |
+| System.Data.Common;RowUpdatedEventArgs;CopyToRows;(System.Data.DataRow[],System.Int32);Argument[this].SyntheticField[System.Data.Common.RowUpdatedEventArgs._dataRow];Argument[0].Element;value;dfc-generated |
+| System.Data.Common;RowUpdatedEventArgs;RowUpdatedEventArgs;(System.Data.DataRow,System.Data.IDbCommand,System.Data.StatementType,System.Data.Common.DataTableMapping);Argument[0];Argument[this].SyntheticField[System.Data.Common.RowUpdatedEventArgs._dataRow];value;dfc-generated |
+| System.Data.Common;RowUpdatedEventArgs;RowUpdatedEventArgs;(System.Data.DataRow,System.Data.IDbCommand,System.Data.StatementType,System.Data.Common.DataTableMapping);Argument[1];Argument[this].SyntheticField[System.Data.Common.RowUpdatedEventArgs._command];value;dfc-generated |
+| System.Data.Common;RowUpdatedEventArgs;RowUpdatedEventArgs;(System.Data.DataRow,System.Data.IDbCommand,System.Data.StatementType,System.Data.Common.DataTableMapping);Argument[3];Argument[this].SyntheticField[System.Data.Common.RowUpdatedEventArgs._tableMapping];value;dfc-generated |
+| System.Data.Common;RowUpdatedEventArgs;get_Command;();Argument[this].SyntheticField[System.Data.Common.RowUpdatedEventArgs._command];ReturnValue;value;dfc-generated |
+| System.Data.Common;RowUpdatedEventArgs;get_Row;();Argument[this].SyntheticField[System.Data.Common.RowUpdatedEventArgs._dataRow];ReturnValue;value;dfc-generated |
+| System.Data.Common;RowUpdatedEventArgs;get_TableMapping;();Argument[this].SyntheticField[System.Data.Common.RowUpdatedEventArgs._tableMapping];ReturnValue;value;dfc-generated |
+| System.Data.Common;RowUpdatingEventArgs;RowUpdatingEventArgs;(System.Data.DataRow,System.Data.IDbCommand,System.Data.StatementType,System.Data.Common.DataTableMapping);Argument[0];Argument[this].SyntheticField[System.Data.Common.RowUpdatingEventArgs._dataRow];value;dfc-generated |
+| System.Data.Common;RowUpdatingEventArgs;RowUpdatingEventArgs;(System.Data.DataRow,System.Data.IDbCommand,System.Data.StatementType,System.Data.Common.DataTableMapping);Argument[3];Argument[this].SyntheticField[System.Data.Common.RowUpdatingEventArgs._tableMapping];value;dfc-generated |
+| System.Data.Common;RowUpdatingEventArgs;get_Row;();Argument[this].SyntheticField[System.Data.Common.RowUpdatingEventArgs._dataRow];ReturnValue;value;dfc-generated |
+| System.Data.Common;RowUpdatingEventArgs;get_TableMapping;();Argument[this].SyntheticField[System.Data.Common.RowUpdatingEventArgs._tableMapping];ReturnValue;value;dfc-generated |
 | System.Data.Entity.Core.Common.CommandTrees.ExpressionBuilder;DbExpressionBuilder;All;(System.Data.Entity.Core.Common.CommandTrees.DbExpression,System.Func<System.Data.Entity.Core.Common.CommandTrees.DbExpression,System.Data.Entity.Core.Common.CommandTrees.DbExpression>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
 | System.Data.Entity.Core.Common.CommandTrees.ExpressionBuilder;DbExpressionBuilder;Any;(System.Data.Entity.Core.Common.CommandTrees.DbExpression,System.Func<System.Data.Entity.Core.Common.CommandTrees.DbExpression,System.Data.Entity.Core.Common.CommandTrees.DbExpression>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
 | System.Data.Entity.Core.Common.CommandTrees.ExpressionBuilder;DbExpressionBuilder;CrossApply;(System.Data.Entity.Core.Common.CommandTrees.DbExpression,System.Func<System.Data.Entity.Core.Common.CommandTrees.DbExpression,System.Collections.Generic.KeyValuePair<System.String,System.Data.Entity.Core.Common.CommandTrees.DbExpression>>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
@@ -6500,79 +7157,63 @@
 | System.Data.SqlClient;SqlRowUpdatedEventHandler;BeginInvoke;(System.Object,System.Data.SqlClient.SqlRowUpdatedEventArgs,System.AsyncCallback,System.Object);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
 | System.Data.SqlClient;SqlRowUpdatingEventHandler;BeginInvoke;(System.Object,System.Data.SqlClient.SqlRowUpdatingEventArgs,System.AsyncCallback,System.Object);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
 | System.Data.SqlClient;SqlRowsCopiedEventHandler;BeginInvoke;(System.Object,System.Data.SqlClient.SqlRowsCopiedEventArgs,System.AsyncCallback,System.Object);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
-| System.Data.SqlTypes;SqlBinary;Add;(System.Data.SqlTypes.SqlBinary,System.Data.SqlTypes.SqlBinary);Argument[0];ReturnValue;taint;df-generated |
-| System.Data.SqlTypes;SqlBinary;Add;(System.Data.SqlTypes.SqlBinary,System.Data.SqlTypes.SqlBinary);Argument[1];ReturnValue;taint;df-generated |
-| System.Data.SqlTypes;SqlBinary;Concat;(System.Data.SqlTypes.SqlBinary,System.Data.SqlTypes.SqlBinary);Argument[0];ReturnValue;taint;df-generated |
-| System.Data.SqlTypes;SqlBinary;Concat;(System.Data.SqlTypes.SqlBinary,System.Data.SqlTypes.SqlBinary);Argument[1];ReturnValue;taint;df-generated |
-| System.Data.SqlTypes;SqlBinary;SqlBinary;(System.Byte[]);Argument[0].Element;Argument[this];taint;df-generated |
-| System.Data.SqlTypes;SqlBinary;WrapBytes;(System.Byte[]);Argument[0].Element;ReturnValue;taint;df-generated |
-| System.Data.SqlTypes;SqlBinary;get_Value;();Argument[this];ReturnValue;taint;df-generated |
-| System.Data.SqlTypes;SqlBinary;op_Addition;(System.Data.SqlTypes.SqlBinary,System.Data.SqlTypes.SqlBinary);Argument[0];ReturnValue;taint;df-generated |
-| System.Data.SqlTypes;SqlBinary;op_Addition;(System.Data.SqlTypes.SqlBinary,System.Data.SqlTypes.SqlBinary);Argument[1];ReturnValue;taint;df-generated |
+| System.Data.SqlTypes;SqlBinary;SqlBinary;(System.Byte[]);Argument[0].Element;Argument[this].SyntheticField[System.Data.SqlTypes.SqlBinary._value].Element;value;dfc-generated |
+| System.Data.SqlTypes;SqlBinary;WrapBytes;(System.Byte[]);Argument[0];ReturnValue.SyntheticField[System.Data.SqlTypes.SqlBinary._value];value;dfc-generated |
+| System.Data.SqlTypes;SqlBinary;get_Value;();Argument[this].SyntheticField[System.Data.SqlTypes.SqlBinary._value].Element;ReturnValue.Element;value;dfc-generated |
 | System.Data.SqlTypes;SqlBytes;Read;(System.Int64,System.Byte[],System.Int32,System.Int32);Argument[this];Argument[1].Element;taint;df-generated |
-| System.Data.SqlTypes;SqlBytes;SqlBytes;(System.Byte[]);Argument[0].Element;Argument[this];taint;df-generated |
-| System.Data.SqlTypes;SqlBytes;SqlBytes;(System.IO.Stream);Argument[0];Argument[this];taint;df-generated |
-| System.Data.SqlTypes;SqlBytes;ToSqlBinary;();Argument[this];ReturnValue;taint;df-generated |
+| System.Data.SqlTypes;SqlBytes;SqlBytes;(System.Byte[]);Argument[0];Argument[this].SyntheticField[System.Data.SqlTypes.SqlBytes._rgbBuf];value;dfc-generated |
+| System.Data.SqlTypes;SqlBytes;SqlBytes;(System.IO.Stream);Argument[0];Argument[this].SyntheticField[System.Data.SqlTypes.SqlBytes._stream];value;dfc-generated |
 | System.Data.SqlTypes;SqlBytes;Write;(System.Int64,System.Byte[],System.Int32,System.Int32);Argument[1].Element;Argument[this];taint;df-generated |
-| System.Data.SqlTypes;SqlBytes;get_Buffer;();Argument[this];ReturnValue;taint;df-generated |
-| System.Data.SqlTypes;SqlBytes;get_Value;();Argument[this];ReturnValue;taint;df-generated |
-| System.Data.SqlTypes;SqlChars;SqlChars;(System.Char[]);Argument[0].Element;Argument[this];taint;df-generated |
-| System.Data.SqlTypes;SqlChars;get_Buffer;();Argument[this];ReturnValue;taint;df-generated |
-| System.Data.SqlTypes;SqlDecimal;Abs;(System.Data.SqlTypes.SqlDecimal);Argument[0];ReturnValue;taint;df-generated |
-| System.Data.SqlTypes;SqlDecimal;AdjustScale;(System.Data.SqlTypes.SqlDecimal,System.Int32,System.Boolean);Argument[0];ReturnValue;taint;df-generated |
-| System.Data.SqlTypes;SqlDecimal;Ceiling;(System.Data.SqlTypes.SqlDecimal);Argument[0];ReturnValue;taint;df-generated |
-| System.Data.SqlTypes;SqlDecimal;ConvertToPrecScale;(System.Data.SqlTypes.SqlDecimal,System.Int32,System.Int32);Argument[0];ReturnValue;taint;df-generated |
-| System.Data.SqlTypes;SqlDecimal;Floor;(System.Data.SqlTypes.SqlDecimal);Argument[0];ReturnValue;taint;df-generated |
-| System.Data.SqlTypes;SqlDecimal;Round;(System.Data.SqlTypes.SqlDecimal,System.Int32);Argument[0];ReturnValue;taint;df-generated |
-| System.Data.SqlTypes;SqlDecimal;Truncate;(System.Data.SqlTypes.SqlDecimal,System.Int32);Argument[0];ReturnValue;taint;df-generated |
-| System.Data.SqlTypes;SqlDecimal;op_UnaryNegation;(System.Data.SqlTypes.SqlDecimal);Argument[0];ReturnValue;taint;df-generated |
-| System.Data.SqlTypes;SqlGuid;SqlGuid;(System.Guid);Argument[0];Argument[this];taint;df-generated |
-| System.Data.SqlTypes;SqlGuid;get_Value;();Argument[this];ReturnValue;taint;df-generated |
-| System.Data.SqlTypes;SqlString;Add;(System.Data.SqlTypes.SqlString,System.Data.SqlTypes.SqlString);Argument[0];ReturnValue;taint;df-generated |
-| System.Data.SqlTypes;SqlString;Add;(System.Data.SqlTypes.SqlString,System.Data.SqlTypes.SqlString);Argument[1];ReturnValue;taint;df-generated |
-| System.Data.SqlTypes;SqlString;Clone;();Argument[this];ReturnValue;taint;df-generated |
-| System.Data.SqlTypes;SqlString;Concat;(System.Data.SqlTypes.SqlString,System.Data.SqlTypes.SqlString);Argument[0];ReturnValue;taint;df-generated |
-| System.Data.SqlTypes;SqlString;Concat;(System.Data.SqlTypes.SqlString,System.Data.SqlTypes.SqlString);Argument[1];ReturnValue;taint;df-generated |
-| System.Data.SqlTypes;SqlString;GetNonUnicodeBytes;();Argument[this];ReturnValue;taint;df-generated |
-| System.Data.SqlTypes;SqlString;GetUnicodeBytes;();Argument[this];ReturnValue;taint;df-generated |
-| System.Data.SqlTypes;SqlString;SqlString;(System.Int32,System.Data.SqlTypes.SqlCompareOptions,System.Byte[],System.Int32,System.Int32,System.Boolean);Argument[2].Element;Argument[this];taint;df-generated |
-| System.Data.SqlTypes;SqlString;SqlString;(System.String,System.Int32,System.Data.SqlTypes.SqlCompareOptions);Argument[0];Argument[this];taint;df-generated |
-| System.Data.SqlTypes;SqlString;ToString;();Argument[this];ReturnValue;taint;df-generated |
+| System.Data.SqlTypes;SqlBytes;get_Buffer;();Argument[this].SyntheticField[System.Data.SqlTypes.SqlBytes._rgbBuf];ReturnValue;value;dfc-generated |
+| System.Data.SqlTypes;SqlBytes;get_Value;();Argument[this].SyntheticField[System.Data.SqlTypes.SqlBytes._stream];ReturnValue.Element;taint;dfc-generated |
+| System.Data.SqlTypes;SqlChars;SqlChars;(System.Char[]);Argument[0];Argument[this].SyntheticField[System.Data.SqlTypes.SqlChars._rgchBuf];value;dfc-generated |
+| System.Data.SqlTypes;SqlChars;get_Buffer;();Argument[this].SyntheticField[System.Data.SqlTypes.SqlChars._rgchBuf];ReturnValue;value;dfc-generated |
+| System.Data.SqlTypes;SqlDecimal;Abs;(System.Data.SqlTypes.SqlDecimal);Argument[0];ReturnValue;value;dfc-generated |
+| System.Data.SqlTypes;SqlDecimal;AdjustScale;(System.Data.SqlTypes.SqlDecimal,System.Int32,System.Boolean);Argument[0];ReturnValue;value;dfc-generated |
+| System.Data.SqlTypes;SqlDecimal;Ceiling;(System.Data.SqlTypes.SqlDecimal);Argument[0];ReturnValue;value;dfc-generated |
+| System.Data.SqlTypes;SqlDecimal;ConvertToPrecScale;(System.Data.SqlTypes.SqlDecimal,System.Int32,System.Int32);Argument[0];ReturnValue;value;dfc-generated |
+| System.Data.SqlTypes;SqlDecimal;Floor;(System.Data.SqlTypes.SqlDecimal);Argument[0];ReturnValue;value;dfc-generated |
+| System.Data.SqlTypes;SqlDecimal;Round;(System.Data.SqlTypes.SqlDecimal,System.Int32);Argument[0];ReturnValue;value;dfc-generated |
+| System.Data.SqlTypes;SqlDecimal;Truncate;(System.Data.SqlTypes.SqlDecimal,System.Int32);Argument[0];ReturnValue;value;dfc-generated |
+| System.Data.SqlTypes;SqlDecimal;op_UnaryNegation;(System.Data.SqlTypes.SqlDecimal);Argument[0];ReturnValue;value;dfc-generated |
+| System.Data.SqlTypes;SqlGuid;SqlGuid;(System.Guid);Argument[0];Argument[this].SyntheticField[System.Data.SqlTypes.SqlGuid._value];value;dfc-generated |
+| System.Data.SqlTypes;SqlGuid;get_Value;();Argument[this].SyntheticField[System.Data.SqlTypes.SqlGuid._value];ReturnValue;value;dfc-generated |
+| System.Data.SqlTypes;SqlString;Add;(System.Data.SqlTypes.SqlString,System.Data.SqlTypes.SqlString);Argument[0].SyntheticField[System.Data.SqlTypes.SqlString.m_value];ReturnValue.SyntheticField[System.Data.SqlTypes.SqlString.m_value];taint;dfc-generated |
+| System.Data.SqlTypes;SqlString;Add;(System.Data.SqlTypes.SqlString,System.Data.SqlTypes.SqlString);Argument[1].SyntheticField[System.Data.SqlTypes.SqlString.m_value];ReturnValue.SyntheticField[System.Data.SqlTypes.SqlString.m_value];taint;dfc-generated |
+| System.Data.SqlTypes;SqlString;Concat;(System.Data.SqlTypes.SqlString,System.Data.SqlTypes.SqlString);Argument[0].SyntheticField[System.Data.SqlTypes.SqlString.m_value];ReturnValue.SyntheticField[System.Data.SqlTypes.SqlString.m_value];taint;dfc-generated |
+| System.Data.SqlTypes;SqlString;Concat;(System.Data.SqlTypes.SqlString,System.Data.SqlTypes.SqlString);Argument[1].SyntheticField[System.Data.SqlTypes.SqlString.m_value];ReturnValue.SyntheticField[System.Data.SqlTypes.SqlString.m_value];taint;dfc-generated |
+| System.Data.SqlTypes;SqlString;GetNonUnicodeBytes;();Argument[this].SyntheticField[System.Data.SqlTypes.SqlString.m_value];ReturnValue;taint;dfc-generated |
+| System.Data.SqlTypes;SqlString;GetUnicodeBytes;();Argument[this].SyntheticField[System.Data.SqlTypes.SqlString.m_value];ReturnValue;taint;dfc-generated |
+| System.Data.SqlTypes;SqlString;SqlString;(System.Int32,System.Data.SqlTypes.SqlCompareOptions,System.Byte[],System.Int32,System.Int32,System.Boolean);Argument[2].Element;Argument[this].SyntheticField[System.Data.SqlTypes.SqlString.m_value];taint;dfc-generated |
+| System.Data.SqlTypes;SqlString;SqlString;(System.String,System.Int32,System.Data.SqlTypes.SqlCompareOptions);Argument[0];Argument[this].SyntheticField[System.Data.SqlTypes.SqlString.m_value];value;dfc-generated |
+| System.Data.SqlTypes;SqlString;ToString;();Argument[this].SyntheticField[System.Data.SqlTypes.SqlString.m_value];ReturnValue;value;dfc-generated |
 | System.Data.SqlTypes;SqlString;get_CompareInfo;();Argument[this];ReturnValue;taint;df-generated |
-| System.Data.SqlTypes;SqlString;get_Value;();Argument[this];ReturnValue;taint;df-generated |
-| System.Data.SqlTypes;SqlString;op_Addition;(System.Data.SqlTypes.SqlString,System.Data.SqlTypes.SqlString);Argument[0];ReturnValue;taint;df-generated |
-| System.Data.SqlTypes;SqlString;op_Addition;(System.Data.SqlTypes.SqlString,System.Data.SqlTypes.SqlString);Argument[1];ReturnValue;taint;df-generated |
+| System.Data.SqlTypes;SqlString;get_Value;();Argument[this].SyntheticField[System.Data.SqlTypes.SqlString.m_value];ReturnValue;value;dfc-generated |
+| System.Data.SqlTypes;SqlString;op_Addition;(System.Data.SqlTypes.SqlString,System.Data.SqlTypes.SqlString);Argument[0].SyntheticField[System.Data.SqlTypes.SqlString.m_value];ReturnValue.SyntheticField[System.Data.SqlTypes.SqlString.m_value];taint;dfc-generated |
+| System.Data.SqlTypes;SqlString;op_Addition;(System.Data.SqlTypes.SqlString,System.Data.SqlTypes.SqlString);Argument[1].SyntheticField[System.Data.SqlTypes.SqlString.m_value];ReturnValue.SyntheticField[System.Data.SqlTypes.SqlString.m_value];taint;dfc-generated |
 | System.Data.SqlTypes;SqlXml;SqlXml;(System.IO.Stream);Argument[0];Argument[this];taint;df-generated |
-| System.Data;Constraint;SetDataSet;(System.Data.DataSet);Argument[0];Argument[this];taint;df-generated |
-| System.Data;Constraint;ToString;();Argument[this];ReturnValue;taint;df-generated |
+| System.Data;Constraint;SetDataSet;(System.Data.DataSet);Argument[0];Argument[this].SyntheticField[System.Data.Constraint._dataSet];value;dfc-generated |
+| System.Data;Constraint;ToString;();Argument[this].Property[System.Data.Constraint.ConstraintName];ReturnValue;value;dfc-generated |
 | System.Data;Constraint;get_Table;();Argument[this];ReturnValue;taint;df-generated |
-| System.Data;Constraint;get__DataSet;();Argument[this];ReturnValue;taint;df-generated |
+| System.Data;Constraint;get__DataSet;();Argument[this].SyntheticField[System.Data.Constraint._dataSet];ReturnValue;value;dfc-generated |
 | System.Data;ConstraintCollection;Add;(System.Data.Constraint);Argument[0];Argument[this].Element;value;manual |
-| System.Data;ConstraintCollection;Add;(System.String,System.Data.DataColumn,System.Boolean);Argument[0];Argument[this];taint;df-generated |
-| System.Data;ConstraintCollection;Add;(System.String,System.Data.DataColumn,System.Boolean);Argument[0];ReturnValue;taint;df-generated |
-| System.Data;ConstraintCollection;Add;(System.String,System.Data.DataColumn,System.Data.DataColumn);Argument[0];Argument[this];taint;df-generated |
-| System.Data;ConstraintCollection;Add;(System.String,System.Data.DataColumn,System.Data.DataColumn);Argument[0];ReturnValue;taint;df-generated |
-| System.Data;ConstraintCollection;Add;(System.String,System.Data.DataColumn[],System.Boolean);Argument[0];Argument[this];taint;df-generated |
-| System.Data;ConstraintCollection;Add;(System.String,System.Data.DataColumn[],System.Boolean);Argument[0];ReturnValue;taint;df-generated |
 | System.Data;ConstraintCollection;Add;(System.String,System.Data.DataColumn[],System.Boolean);Argument[1].Element;Argument[this];taint;df-generated |
-| System.Data;ConstraintCollection;Add;(System.String,System.Data.DataColumn[],System.Data.DataColumn[]);Argument[0];Argument[this];taint;df-generated |
-| System.Data;ConstraintCollection;Add;(System.String,System.Data.DataColumn[],System.Data.DataColumn[]);Argument[0];ReturnValue;taint;df-generated |
 | System.Data;ConstraintCollection;AddRange;(System.Data.Constraint[]);Argument[0].Element;Argument[this].Element;value;manual |
 | System.Data;ConstraintCollection;Clear;();Argument[this].WithoutElement;Argument[this];value;manual |
 | System.Data;ConstraintCollection;CopyTo;(System.Data.Constraint[],System.Int32);Argument[this].Element;Argument[0].Element;value;manual |
 | System.Data;ConstraintCollection;add_CollectionChanged;(System.ComponentModel.CollectionChangeEventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
-| System.Data;ConstraintCollection;get_Item;(System.Int32);Argument[this];ReturnValue;taint;df-generated |
-| System.Data;ConstraintCollection;get_Item;(System.String);Argument[this];ReturnValue;taint;df-generated |
+| System.Data;ConstraintCollection;get_Item;(System.Int32);Argument[this].Property[System.Data.ConstraintCollection.List].Element;ReturnValue;value;dfc-generated |
+| System.Data;ConstraintCollection;get_Item;(System.String);Argument[this].Property[System.Data.ConstraintCollection.List].Element;ReturnValue;value;dfc-generated |
 | System.Data;ConstraintCollection;get_List;();Argument[this];ReturnValue;taint;df-generated |
 | System.Data;ConstraintCollection;remove_CollectionChanged;(System.ComponentModel.CollectionChangeEventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
-| System.Data;DBConcurrencyException;CopyToRows;(System.Data.DataRow[]);Argument[this];Argument[0].Element;taint;df-generated |
-| System.Data;DBConcurrencyException;CopyToRows;(System.Data.DataRow[],System.Int32);Argument[this];Argument[0].Element;taint;df-generated |
-| System.Data;DBConcurrencyException;DBConcurrencyException;(System.String,System.Exception,System.Data.DataRow[]);Argument[2].Element;Argument[this];taint;df-generated |
+| System.Data;DBConcurrencyException;CopyToRows;(System.Data.DataRow[]);Argument[this].SyntheticField[System.Data.DBConcurrencyException._dataRows].Element;Argument[0].Element;value;dfc-generated |
+| System.Data;DBConcurrencyException;CopyToRows;(System.Data.DataRow[],System.Int32);Argument[this].SyntheticField[System.Data.DBConcurrencyException._dataRows].Element;Argument[0].Element;value;dfc-generated |
+| System.Data;DBConcurrencyException;DBConcurrencyException;(System.String,System.Exception,System.Data.DataRow[]);Argument[2];Argument[this].SyntheticField[System.Data.DBConcurrencyException._dataRows];value;dfc-generated |
 | System.Data;DataColumn;DataColumn;(System.String,System.Type,System.String,System.Data.MappingType);Argument[0];Argument[this];taint;df-generated |
 | System.Data;DataColumn;DataColumn;(System.String,System.Type,System.String,System.Data.MappingType);Argument[2];Argument[this];taint;df-generated |
 | System.Data;DataColumn;get_Table;();Argument[this];ReturnValue;taint;df-generated |
-| System.Data;DataColumnChangeEventArgs;DataColumnChangeEventArgs;(System.Data.DataRow,System.Data.DataColumn,System.Object);Argument[1];Argument[this];taint;df-generated |
-| System.Data;DataColumnChangeEventArgs;get_Column;();Argument[this];ReturnValue;taint;df-generated |
+| System.Data;DataColumnChangeEventArgs;DataColumnChangeEventArgs;(System.Data.DataRow,System.Data.DataColumn,System.Object);Argument[1];Argument[this].SyntheticField[System.Data.DataColumnChangeEventArgs._column];value;dfc-generated |
+| System.Data;DataColumnChangeEventArgs;get_Column;();Argument[this].SyntheticField[System.Data.DataColumnChangeEventArgs._column];ReturnValue;value;dfc-generated |
 | System.Data;DataColumnChangeEventHandler;BeginInvoke;(System.Object,System.Data.DataColumnChangeEventArgs,System.AsyncCallback,System.Object);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
 | System.Data;DataColumnCollection;Add;();Argument[this];ReturnValue;taint;df-generated |
 | System.Data;DataColumnCollection;Add;(System.Data.DataColumn);Argument[0];Argument[this].Element;value;manual |
@@ -6587,28 +7228,19 @@
 | System.Data;DataColumnCollection;get_Item;(System.String);Argument[this];ReturnValue;taint;df-generated |
 | System.Data;DataColumnCollection;get_List;();Argument[this];ReturnValue;taint;df-generated |
 | System.Data;DataColumnCollection;remove_CollectionChanged;(System.ComponentModel.CollectionChangeEventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
-| System.Data;DataReaderExtensions;GetFieldValue<T>;(System.Data.Common.DbDataReader,System.String);Argument[0].Element;ReturnValue;taint;df-generated |
-| System.Data;DataReaderExtensions;GetFieldValueAsync<T>;(System.Data.Common.DbDataReader,System.String,System.Threading.CancellationToken);Argument[0].Element;ReturnValue;taint;df-generated |
+| System.Data;DataReaderExtensions;GetFieldValue<T>;(System.Data.Common.DbDataReader,System.String);Argument[0];ReturnValue;taint;dfc-generated |
+| System.Data;DataReaderExtensions;GetFieldValueAsync<T>;(System.Data.Common.DbDataReader,System.String,System.Threading.CancellationToken);Argument[0];ReturnValue.Property[System.Threading.Tasks.Task`1.Result];taint;dfc-generated |
 | System.Data;DataReaderExtensions;GetGuid;(System.Data.Common.DbDataReader,System.String);Argument[0].Element;ReturnValue;taint;df-generated |
-| System.Data;DataReaderExtensions;GetProviderSpecificValue;(System.Data.Common.DbDataReader,System.String);Argument[0].Element;ReturnValue;taint;df-generated |
-| System.Data;DataReaderExtensions;GetString;(System.Data.Common.DbDataReader,System.String);Argument[0].Element;ReturnValue;taint;df-generated |
-| System.Data;DataReaderExtensions;GetTextReader;(System.Data.Common.DbDataReader,System.String);Argument[0].Element;ReturnValue;taint;df-generated |
-| System.Data;DataReaderExtensions;GetValue;(System.Data.Common.DbDataReader,System.String);Argument[0].Element;ReturnValue;taint;df-generated |
-| System.Data;DataRelation;DataRelation;(System.String,System.Data.DataColumn,System.Data.DataColumn,System.Boolean);Argument[0];Argument[this];taint;df-generated |
-| System.Data;DataRelation;DataRelation;(System.String,System.Data.DataColumn[],System.Data.DataColumn[],System.Boolean);Argument[0];Argument[this];taint;df-generated |
-| System.Data;DataRelation;DataRelation;(System.String,System.String,System.String,System.String,System.String,System.String[],System.String[],System.Boolean);Argument[0];Argument[this];taint;df-generated |
-| System.Data;DataRelation;DataRelation;(System.String,System.String,System.String,System.String,System.String,System.String[],System.String[],System.Boolean);Argument[1];Argument[this];taint;df-generated |
-| System.Data;DataRelation;DataRelation;(System.String,System.String,System.String,System.String,System.String,System.String[],System.String[],System.Boolean);Argument[2];Argument[this];taint;df-generated |
-| System.Data;DataRelation;DataRelation;(System.String,System.String,System.String,System.String,System.String,System.String[],System.String[],System.Boolean);Argument[3];Argument[this];taint;df-generated |
-| System.Data;DataRelation;DataRelation;(System.String,System.String,System.String,System.String,System.String,System.String[],System.String[],System.Boolean);Argument[4];Argument[this];taint;df-generated |
-| System.Data;DataRelation;DataRelation;(System.String,System.String,System.String,System.String,System.String,System.String[],System.String[],System.Boolean);Argument[5].Element;Argument[this];taint;df-generated |
-| System.Data;DataRelation;DataRelation;(System.String,System.String,System.String,System.String,System.String,System.String[],System.String[],System.Boolean);Argument[6].Element;Argument[this];taint;df-generated |
-| System.Data;DataRelation;DataRelation;(System.String,System.String,System.String,System.String[],System.String[],System.Boolean);Argument[0];Argument[this];taint;df-generated |
-| System.Data;DataRelation;DataRelation;(System.String,System.String,System.String,System.String[],System.String[],System.Boolean);Argument[1];Argument[this];taint;df-generated |
-| System.Data;DataRelation;DataRelation;(System.String,System.String,System.String,System.String[],System.String[],System.Boolean);Argument[2];Argument[this];taint;df-generated |
-| System.Data;DataRelation;DataRelation;(System.String,System.String,System.String,System.String[],System.String[],System.Boolean);Argument[3].Element;Argument[this];taint;df-generated |
-| System.Data;DataRelation;DataRelation;(System.String,System.String,System.String,System.String[],System.String[],System.Boolean);Argument[4].Element;Argument[this];taint;df-generated |
-| System.Data;DataRelation;ToString;();Argument[this];ReturnValue;taint;df-generated |
+| System.Data;DataReaderExtensions;GetProviderSpecificValue;(System.Data.Common.DbDataReader,System.String);Argument[0];ReturnValue;taint;dfc-generated |
+| System.Data;DataReaderExtensions;GetString;(System.Data.Common.DbDataReader,System.String);Argument[0];ReturnValue;taint;dfc-generated |
+| System.Data;DataReaderExtensions;GetTextReader;(System.Data.Common.DbDataReader,System.String);Argument[0];ReturnValue;taint;dfc-generated |
+| System.Data;DataReaderExtensions;GetValue;(System.Data.Common.DbDataReader,System.String);Argument[0];ReturnValue;taint;dfc-generated |
+| System.Data;DataRelation;DataRelation;(System.String,System.Data.DataColumn,System.Data.DataColumn,System.Boolean);Argument[0];Argument[this].SyntheticField[System.Data.DataRelation._relationName];value;dfc-generated |
+| System.Data;DataRelation;DataRelation;(System.String,System.Data.DataColumn[],System.Data.DataColumn[],System.Boolean);Argument[0];Argument[this].SyntheticField[System.Data.DataRelation._relationName];value;dfc-generated |
+| System.Data;DataRelation;DataRelation;(System.String,System.String,System.String,System.String,System.String,System.String[],System.String[],System.Boolean);Argument[0];Argument[this].SyntheticField[System.Data.DataRelation._relationName];value;dfc-generated |
+| System.Data;DataRelation;DataRelation;(System.String,System.String,System.String,System.String[],System.String[],System.Boolean);Argument[0];Argument[this].SyntheticField[System.Data.DataRelation._relationName];value;dfc-generated |
+| System.Data;DataRelation;ToString;();Argument[this].Property[System.Data.DataRelation.RelationName];ReturnValue;value;dfc-generated |
+| System.Data;DataRelation;ToString;();Argument[this].SyntheticField[System.Data.DataRelation._relationName];ReturnValue;value;dfc-generated |
 | System.Data;DataRelation;get_ChildColumns;();Argument[this];ReturnValue;taint;df-generated |
 | System.Data;DataRelation;get_ChildKeyConstraint;();Argument[this];ReturnValue;taint;df-generated |
 | System.Data;DataRelation;get_ChildTable;();Argument[this];ReturnValue;taint;df-generated |
@@ -6620,12 +7252,8 @@
 | System.Data;DataRelationCollection;Add;(System.Data.DataColumn[],System.Data.DataColumn[]);Argument[this];ReturnValue;taint;df-generated |
 | System.Data;DataRelationCollection;Add;(System.Data.DataRelation);Argument[0];Argument[this].Element;value;manual |
 | System.Data;DataRelationCollection;Add;(System.String,System.Data.DataColumn,System.Data.DataColumn);Argument[this];ReturnValue;taint;df-generated |
-| System.Data;DataRelationCollection;Add;(System.String,System.Data.DataColumn,System.Data.DataColumn,System.Boolean);Argument[0];Argument[this];taint;df-generated |
-| System.Data;DataRelationCollection;Add;(System.String,System.Data.DataColumn,System.Data.DataColumn,System.Boolean);Argument[0];ReturnValue;taint;df-generated |
 | System.Data;DataRelationCollection;Add;(System.String,System.Data.DataColumn,System.Data.DataColumn,System.Boolean);Argument[this];ReturnValue;taint;df-generated |
 | System.Data;DataRelationCollection;Add;(System.String,System.Data.DataColumn[],System.Data.DataColumn[]);Argument[this];ReturnValue;taint;df-generated |
-| System.Data;DataRelationCollection;Add;(System.String,System.Data.DataColumn[],System.Data.DataColumn[],System.Boolean);Argument[0];Argument[this];taint;df-generated |
-| System.Data;DataRelationCollection;Add;(System.String,System.Data.DataColumn[],System.Data.DataColumn[],System.Boolean);Argument[0];ReturnValue;taint;df-generated |
 | System.Data;DataRelationCollection;Add;(System.String,System.Data.DataColumn[],System.Data.DataColumn[],System.Boolean);Argument[this];ReturnValue;taint;df-generated |
 | System.Data;DataRelationCollection;AddCore;(System.Data.DataRelation);Argument[0];Argument[this];taint;df-generated |
 | System.Data;DataRelationCollection;AddCore;(System.Data.DataRelation);Argument[this];Argument[0];taint;df-generated |
@@ -6633,6 +7261,8 @@
 | System.Data;DataRelationCollection;Clear;();Argument[this].WithoutElement;Argument[this];value;manual |
 | System.Data;DataRelationCollection;CopyTo;(System.Data.DataRelation[],System.Int32);Argument[this].Element;Argument[0].Element;value;manual |
 | System.Data;DataRelationCollection;GetDataSet;();Argument[this];ReturnValue;taint;df-generated |
+| System.Data;DataRelationCollection;OnCollectionChanged;(System.ComponentModel.CollectionChangeEventArgs);Argument[0];Argument[this];taint;df-generated |
+| System.Data;DataRelationCollection;OnCollectionChanging;(System.ComponentModel.CollectionChangeEventArgs);Argument[0];Argument[this];taint;df-generated |
 | System.Data;DataRelationCollection;Remove;(System.Data.DataRelation);Argument[0];Argument[this];taint;df-generated |
 | System.Data;DataRelationCollection;add_CollectionChanged;(System.ComponentModel.CollectionChangeEventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Data;DataRelationCollection;get_Item;(System.Int32);Argument[this];ReturnValue;taint;df-generated |
@@ -6672,15 +7302,13 @@
 | System.Data;DataRowView;CreateChildView;(System.Data.DataRelation,System.Boolean);Argument[this];ReturnValue;taint;df-generated |
 | System.Data;DataRowView;CreateChildView;(System.String);Argument[this];ReturnValue;taint;df-generated |
 | System.Data;DataRowView;CreateChildView;(System.String,System.Boolean);Argument[this];ReturnValue;taint;df-generated |
-| System.Data;DataRowView;get_DataView;();Argument[this];ReturnValue;taint;df-generated |
+| System.Data;DataRowView;get_DataView;();Argument[this].SyntheticField[System.Data.DataRowView._dataView];ReturnValue;value;dfc-generated |
+| System.Data;DataRowView;get_Error;();Argument[this].Property[System.Data.DataRowView.Row].Property[System.Data.DataRow.RowError];ReturnValue;value;dfc-generated |
 | System.Data;DataRowView;get_Item;(System.Int32);Argument[this];ReturnValue;taint;df-generated |
 | System.Data;DataRowView;get_Item;(System.String);Argument[this];ReturnValue;taint;df-generated |
 | System.Data;DataRowView;get_Row;();Argument[this];ReturnValue;taint;df-generated |
 | System.Data;DataSet;Clone;();Argument[this];ReturnValue;taint;df-generated |
 | System.Data;DataSet;Copy;();Argument[this];ReturnValue;taint;df-generated |
-| System.Data;DataSet;CreateDataReader;();Argument[this];ReturnValue;taint;df-generated |
-| System.Data;DataSet;CreateDataReader;(System.Data.DataTable[]);Argument[0].Element;ReturnValue;taint;df-generated |
-| System.Data;DataSet;DataSet;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext,System.Boolean);Argument[0];Argument[this];taint;df-generated |
 | System.Data;DataSet;DataSet;(System.String);Argument[0];Argument[this];taint;df-generated |
 | System.Data;DataSet;GetChanges;();Argument[this];ReturnValue;taint;df-generated |
 | System.Data;DataSet;GetChanges;(System.Data.DataRowState);Argument[this];ReturnValue;taint;df-generated |
@@ -6694,23 +7322,33 @@
 | System.Data;DataSet;get_Relations;();Argument[this];ReturnValue;taint;df-generated |
 | System.Data;DataSet;get_Tables;();Argument[this];ReturnValue;taint;df-generated |
 | System.Data;DataSet;remove_MergeFailed;(System.Data.MergeFailedEventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
-| System.Data;DataSysDescriptionAttribute;get_Description;();Argument[this];ReturnValue;taint;df-generated |
+| System.Data;DataSysDescriptionAttribute;get_Description;();Argument[this].Property[System.ComponentModel.DescriptionAttribute.DescriptionValue];ReturnValue;value;dfc-generated |
+| System.Data;DataSysDescriptionAttribute;get_Description;();Argument[this].Property[System.ComponentModel.DescriptionAttribute.Description];Argument[this].Property[System.ComponentModel.DescriptionAttribute.DescriptionValue];value;dfc-generated |
+| System.Data;DataSysDescriptionAttribute;get_Description;();Argument[this].Property[System.ComponentModel.DescriptionAttribute.Description];ReturnValue;value;dfc-generated |
 | System.Data;DataTable;Clone;();Argument[this];ReturnValue;taint;df-generated |
 | System.Data;DataTable;Copy;();Argument[this];ReturnValue;taint;df-generated |
-| System.Data;DataTable;CreateDataReader;();Argument[this];ReturnValue;taint;df-generated |
-| System.Data;DataTable;DataTable;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);Argument[0];Argument[this];taint;df-generated |
 | System.Data;DataTable;DataTable;(System.String);Argument[0];Argument[this];taint;df-generated |
 | System.Data;DataTable;DataTable;(System.String,System.String);Argument[1];Argument[this];taint;df-generated |
 | System.Data;DataTable;GetChanges;();Argument[this];ReturnValue;taint;df-generated |
 | System.Data;DataTable;GetChanges;(System.Data.DataRowState);Argument[this];ReturnValue;taint;df-generated |
 | System.Data;DataTable;GetErrors;();Argument[this];ReturnValue;taint;df-generated |
+| System.Data;DataTable;GetList;();Argument[this].Property[System.Data.DataTable.DefaultView];ReturnValue;value;df-generated |
+| System.Data;DataTable;GetList;();Argument[this].Property[System.Data.DataTable.DefaultView];ReturnValue;value;dfc-generated |
 | System.Data;DataTable;Load;(System.Data.IDataReader,System.Data.LoadOption,System.Data.FillErrorEventHandler);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
-| System.Data;DataTable;LoadDataRow;(System.Object[],System.Boolean);Argument[0].Element;Argument[this];taint;df-generated |
-| System.Data;DataTable;LoadDataRow;(System.Object[],System.Boolean);Argument[this];ReturnValue;taint;df-generated |
+| System.Data;DataTable;LoadDataRow;(System.Object[],System.Boolean);Argument[0];Argument[this].Property[System.Data.DataTable.Rows].Element;value;dfc-generated |
+| System.Data;DataTable;LoadDataRow;(System.Object[],System.Boolean);Argument[0];Argument[this].SyntheticField[System.Data.DataTable._rowCollection].Element;value;dfc-generated |
 | System.Data;DataTable;LoadDataRow;(System.Object[],System.Data.LoadOption);Argument[this];ReturnValue;taint;df-generated |
-| System.Data;DataTable;NewRow;();Argument[this];ReturnValue;taint;df-generated |
 | System.Data;DataTable;NewRowArray;(System.Int32);Argument[this];ReturnValue;taint;df-generated |
-| System.Data;DataTable;NewRowFromBuilder;(System.Data.DataRowBuilder);Argument[0];ReturnValue;taint;df-generated |
+| System.Data;DataTable;OnColumnChanged;(System.Data.DataColumnChangeEventArgs);Argument[0];Argument[this];taint;df-generated |
+| System.Data;DataTable;OnColumnChanging;(System.Data.DataColumnChangeEventArgs);Argument[0];Argument[this];taint;df-generated |
+| System.Data;DataTable;OnPropertyChanging;(System.ComponentModel.PropertyChangedEventArgs);Argument[0];Argument[this];taint;df-generated |
+| System.Data;DataTable;OnRowChanged;(System.Data.DataRowChangeEventArgs);Argument[0];Argument[this];taint;df-generated |
+| System.Data;DataTable;OnRowChanging;(System.Data.DataRowChangeEventArgs);Argument[0];Argument[this];taint;df-generated |
+| System.Data;DataTable;OnRowDeleted;(System.Data.DataRowChangeEventArgs);Argument[0];Argument[this];taint;df-generated |
+| System.Data;DataTable;OnRowDeleting;(System.Data.DataRowChangeEventArgs);Argument[0];Argument[this];taint;df-generated |
+| System.Data;DataTable;OnTableCleared;(System.Data.DataTableClearEventArgs);Argument[0];Argument[this];taint;df-generated |
+| System.Data;DataTable;OnTableClearing;(System.Data.DataTableClearEventArgs);Argument[0];Argument[this];taint;df-generated |
+| System.Data;DataTable;OnTableNewRow;(System.Data.DataTableNewRowEventArgs);Argument[0];Argument[this];taint;df-generated |
 | System.Data;DataTable;Select;();Argument[this];ReturnValue;taint;df-generated |
 | System.Data;DataTable;Select;(System.String);Argument[this];ReturnValue;taint;df-generated |
 | System.Data;DataTable;Select;(System.String,System.String);Argument[this];ReturnValue;taint;df-generated |
@@ -6728,7 +7366,7 @@
 | System.Data;DataTable;get_Constraints;();Argument[this];ReturnValue;taint;df-generated |
 | System.Data;DataTable;get_DataSet;();Argument[this];ReturnValue;taint;df-generated |
 | System.Data;DataTable;get_DefaultView;();Argument[this];ReturnValue;taint;df-generated |
-| System.Data;DataTable;get_Rows;();Argument[this];ReturnValue;taint;df-generated |
+| System.Data;DataTable;get_Rows;();Argument[this].SyntheticField[System.Data.DataTable._rowCollection];ReturnValue;value;dfc-generated |
 | System.Data;DataTable;remove_ColumnChanged;(System.Data.DataColumnChangeEventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Data;DataTable;remove_ColumnChanging;(System.Data.DataColumnChangeEventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Data;DataTable;remove_RowChanged;(System.Data.DataRowChangeEventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
@@ -6738,8 +7376,8 @@
 | System.Data;DataTable;remove_TableCleared;(System.Data.DataTableClearEventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Data;DataTable;remove_TableClearing;(System.Data.DataTableClearEventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Data;DataTable;remove_TableNewRow;(System.Data.DataTableNewRowEventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
-| System.Data;DataTableClearEventArgs;get_TableName;();Argument[this];ReturnValue;taint;df-generated |
-| System.Data;DataTableClearEventArgs;get_TableNamespace;();Argument[this];ReturnValue;taint;df-generated |
+| System.Data;DataTableClearEventArgs;get_TableName;();Argument[this].Property[System.Data.DataTableClearEventArgs.Table].Property[System.Data.DataTable.TableName];ReturnValue;value;dfc-generated |
+| System.Data;DataTableClearEventArgs;get_TableNamespace;();Argument[this].Property[System.Data.DataTableClearEventArgs.Table].Property[System.Data.DataTable.Namespace];ReturnValue;value;dfc-generated |
 | System.Data;DataTableClearEventHandler;BeginInvoke;(System.Object,System.Data.DataTableClearEventArgs,System.AsyncCallback,System.Object);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
 | System.Data;DataTableCollection;Add;();Argument[this];ReturnValue;taint;df-generated |
 | System.Data;DataTableCollection;Add;(System.Data.DataTable);Argument[0];Argument[this].Element;value;manual |
@@ -6759,38 +7397,44 @@
 | System.Data;DataTableCollection;remove_CollectionChanged;(System.ComponentModel.CollectionChangeEventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Data;DataTableCollection;remove_CollectionChanging;(System.ComponentModel.CollectionChangeEventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Data;DataTableExtensions;AsEnumerable;(System.Data.DataTable);Argument[0];ReturnValue;taint;df-generated |
-| System.Data;DataTableExtensions;CopyToDataTable<T>;(System.Collections.Generic.IEnumerable<T>);Argument[0].Element;ReturnValue;taint;df-generated |
-| System.Data;DataTableExtensions;CopyToDataTable<T>;(System.Collections.Generic.IEnumerable<T>,System.Data.DataTable,System.Data.LoadOption);Argument[0].Element;Argument[1];taint;df-generated |
+| System.Data;DataTableExtensions;CopyToDataTable<T>;(System.Collections.Generic.IEnumerable<T>);Argument[0].Element.Property[System.Data.DataRow.ItemArray];ReturnValue.Property[System.Data.DataTable.Rows].Element;value;dfc-generated |
+| System.Data;DataTableExtensions;CopyToDataTable<T>;(System.Collections.Generic.IEnumerable<T>);Argument[0].Element.Property[System.Data.DataRow.ItemArray];ReturnValue.SyntheticField[System.Data.DataTable._rowCollection].Element;value;dfc-generated |
+| System.Data;DataTableExtensions;CopyToDataTable<T>;(System.Collections.Generic.IEnumerable<T>,System.Data.DataTable,System.Data.LoadOption);Argument[0].Element.Property[System.Data.DataRow.ItemArray];Argument[1].Property[System.Data.DataTable.Rows].Element;value;dfc-generated |
+| System.Data;DataTableExtensions;CopyToDataTable<T>;(System.Collections.Generic.IEnumerable<T>,System.Data.DataTable,System.Data.LoadOption);Argument[0].Element.Property[System.Data.DataRow.ItemArray];Argument[1].SyntheticField[System.Data.DataTable._rowCollection].Element;value;dfc-generated |
+| System.Data;DataTableExtensions;CopyToDataTable<T>;(System.Collections.Generic.IEnumerable<T>,System.Data.DataTable,System.Data.LoadOption,System.Data.FillErrorEventHandler);Argument[0].Element.Property[System.Data.DataRow.ItemArray];Argument[1].Property[System.Data.DataTable.Rows].Element;value;dfc-generated |
+| System.Data;DataTableExtensions;CopyToDataTable<T>;(System.Collections.Generic.IEnumerable<T>,System.Data.DataTable,System.Data.LoadOption,System.Data.FillErrorEventHandler);Argument[0].Element.Property[System.Data.DataRow.ItemArray];Argument[1].Property[System.Data.DataTable.Rows].Element;value;hq-generated |
+| System.Data;DataTableExtensions;CopyToDataTable<T>;(System.Collections.Generic.IEnumerable<T>,System.Data.DataTable,System.Data.LoadOption,System.Data.FillErrorEventHandler);Argument[0].Element.Property[System.Data.DataRow.ItemArray];Argument[1].SyntheticField[System.Data.DataTable._rowCollection].Element;value;dfc-generated |
+| System.Data;DataTableExtensions;CopyToDataTable<T>;(System.Collections.Generic.IEnumerable<T>,System.Data.DataTable,System.Data.LoadOption,System.Data.FillErrorEventHandler);Argument[0].Element.Property[System.Data.DataRow.ItemArray];Argument[1].SyntheticField[System.Data.DataTable._rowCollection].Element;value;hq-generated |
+| System.Data;DataTableExtensions;CopyToDataTable<T>;(System.Collections.Generic.IEnumerable<T>,System.Data.DataTable,System.Data.LoadOption,System.Data.FillErrorEventHandler);Argument[3];Argument[3].Parameter[delegate-self];value;dfc-generated |
 | System.Data;DataTableExtensions;CopyToDataTable<T>;(System.Collections.Generic.IEnumerable<T>,System.Data.DataTable,System.Data.LoadOption,System.Data.FillErrorEventHandler);Argument[3];Argument[3].Parameter[delegate-self];value;hq-generated |
 | System.Data;DataTableNewRowEventHandler;BeginInvoke;(System.Object,System.Data.DataTableNewRowEventArgs,System.AsyncCallback,System.Object);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
 | System.Data;DataTableReader;DataTableReader;(System.Data.DataTable);Argument[0];Argument[this];taint;df-generated |
 | System.Data;DataTableReader;DataTableReader;(System.Data.DataTable[]);Argument[0].Element;Argument[this];taint;df-generated |
-| System.Data;DataView;AddNew;();Argument[this];ReturnValue;taint;df-generated |
-| System.Data;DataView;DataView;(System.Data.DataTable,System.String,System.String,System.Data.DataViewRowState);Argument[0];Argument[this];taint;df-generated |
-| System.Data;DataView;DataView;(System.Data.DataTable,System.String,System.String,System.Data.DataViewRowState);Argument[2];Argument[this];taint;df-generated |
+| System.Data;DataView;AddNew;();Argument[this];ReturnValue.SyntheticField[System.Data.DataRowView._dataView];value;dfc-generated |
+| System.Data;DataView;DataView;(System.Data.DataTable,System.String,System.String,System.Data.DataViewRowState);Argument[0];Argument[this].SyntheticField[System.Data.DataView._table];value;dfc-generated |
 | System.Data;DataView;Find;(System.Object);Argument[this].Element;ReturnValue;value;manual |
 | System.Data;DataView;Find;(System.Object[]);Argument[this].Element;ReturnValue;value;manual |
-| System.Data;DataView;FindRows;(System.Object);Argument[this];ReturnValue;taint;df-generated |
-| System.Data;DataView;FindRows;(System.Object[]);Argument[this];ReturnValue;taint;df-generated |
+| System.Data;DataView;FindRows;(System.Object);Argument[this].Element;ReturnValue.Element;value;dfc-generated |
+| System.Data;DataView;FindRows;(System.Object[]);Argument[this].Element;ReturnValue.Element;value;dfc-generated |
+| System.Data;DataView;GetListName;(System.ComponentModel.PropertyDescriptor[]);Argument[this].SyntheticField[System.Data.DataView._table].Property[System.Data.DataTable.TableName];ReturnValue;value;df-generated |
+| System.Data;DataView;GetListName;(System.ComponentModel.PropertyDescriptor[]);Argument[this].SyntheticField[System.Data.DataView._table].Property[System.Data.DataTable.TableName];ReturnValue;value;dfc-generated |
+| System.Data;DataView;IndexListChanged;(System.Object,System.ComponentModel.ListChangedEventArgs);Argument[1];Argument[this];taint;df-generated |
+| System.Data;DataView;OnListChanged;(System.ComponentModel.ListChangedEventArgs);Argument[0];Argument[this];taint;df-generated |
 | System.Data;DataView;ToTable;();Argument[this];ReturnValue;taint;df-generated |
 | System.Data;DataView;ToTable;(System.Boolean,System.String[]);Argument[this];ReturnValue;taint;df-generated |
-| System.Data;DataView;ToTable;(System.String);Argument[0];ReturnValue;taint;df-generated |
-| System.Data;DataView;ToTable;(System.String);Argument[this];ReturnValue;taint;df-generated |
-| System.Data;DataView;ToTable;(System.String,System.Boolean,System.String[]);Argument[0];ReturnValue;taint;df-generated |
-| System.Data;DataView;ToTable;(System.String,System.Boolean,System.String[]);Argument[this];ReturnValue;taint;df-generated |
-| System.Data;DataView;get_DataViewManager;();Argument[this];ReturnValue;taint;df-generated |
+| System.Data;DataView;ToTable;(System.String);Argument[0];ReturnValue.Property[System.Data.DataTable.TableName];value;dfc-generated |
+| System.Data;DataView;ToTable;(System.String,System.Boolean,System.String[]);Argument[0];ReturnValue.Property[System.Data.DataTable.TableName];value;dfc-generated |
+| System.Data;DataView;get_DataViewManager;();Argument[this].SyntheticField[System.Data.DataView._dataViewManager];ReturnValue;value;dfc-generated |
 | System.Data;DataView;get_Item;(System.Int32);Argument[this].Element;ReturnValue;value;manual |
-| System.Data;DataViewManager;CreateDataView;(System.Data.DataTable);Argument[this];ReturnValue;taint;df-generated |
+| System.Data;DataViewManager;CreateDataView;(System.Data.DataTable);Argument[this];ReturnValue.SyntheticField[System.Data.DataView._dataViewManager];value;dfc-generated |
 | System.Data;DataViewManager;get_DataViewSettings;();Argument[this];ReturnValue;taint;df-generated |
 | System.Data;DataViewSetting;get_DataViewManager;();Argument[this];ReturnValue;taint;df-generated |
-| System.Data;DataViewSetting;get_Table;();Argument[this];ReturnValue;taint;df-generated |
+| System.Data;DataViewSetting;get_Table;();Argument[this].SyntheticField[System.Data.DataViewSetting._table];ReturnValue;value;dfc-generated |
 | System.Data;DataViewSettingCollection;CopyTo;(System.Data.DataViewSetting[],System.Int32);Argument[this].Element;Argument[0].Element;value;manual |
-| System.Data;DataViewSettingCollection;get_Item;(System.Data.DataTable);Argument[0];ReturnValue;taint;df-generated |
-| System.Data;DataViewSettingCollection;get_Item;(System.Data.DataTable);Argument[this];ReturnValue;taint;df-generated |
+| System.Data;DataViewSettingCollection;get_Item;(System.Data.DataTable);Argument[0];ReturnValue.SyntheticField[System.Data.DataViewSetting._table];value;dfc-generated |
 | System.Data;DataViewSettingCollection;get_Item;(System.Int32);Argument[this];ReturnValue;taint;df-generated |
 | System.Data;DataViewSettingCollection;get_Item;(System.String);Argument[this];ReturnValue;taint;df-generated |
-| System.Data;DataViewSettingCollection;set_Item;(System.Data.DataTable,System.Data.DataViewSetting);Argument[0];Argument[1];taint;df-generated |
-| System.Data;DataViewSettingCollection;set_Item;(System.Data.DataTable,System.Data.DataViewSetting);Argument[this];Argument[1];taint;df-generated |
+| System.Data;DataViewSettingCollection;set_Item;(System.Data.DataTable,System.Data.DataViewSetting);Argument[0];Argument[1].SyntheticField[System.Data.DataViewSetting._table];value;dfc-generated |
 | System.Data;DataViewSettingCollection;set_Item;(System.Int32,System.Data.DataViewSetting);Argument[this];Argument[1];taint;df-generated |
 | System.Data;EnumerableRowCollectionExtensions;Cast<TResult>;(System.Data.EnumerableRowCollection);Argument[0].Element;ReturnValue.Element;value;manual |
 | System.Data;EnumerableRowCollectionExtensions;OrderBy<TRow,TKey>;(System.Data.EnumerableRowCollection<TRow>,System.Func<TRow,TKey>);Argument[0].Element;Argument[1].Parameter[0];value;manual |
@@ -6823,10 +7467,10 @@
 | System.Data;EnumerableRowCollectionExtensions;Where<TRow>;(System.Data.EnumerableRowCollection<TRow>,System.Func<TRow,System.Boolean>);Argument[0].Element;Argument[1].Parameter[0];value;manual |
 | System.Data;EnumerableRowCollectionExtensions;Where<TRow>;(System.Data.EnumerableRowCollection<TRow>,System.Func<TRow,System.Boolean>);Argument[0].Element;ReturnValue.Element;value;manual |
 | System.Data;EnumerableRowCollectionExtensions;Where<TRow>;(System.Data.EnumerableRowCollection<TRow>,System.Func<TRow,System.Boolean>);Argument[1];Argument[1].Parameter[delegate-self];value;manual |
-| System.Data;FillErrorEventArgs;FillErrorEventArgs;(System.Data.DataTable,System.Object[]);Argument[0];Argument[this];taint;df-generated |
-| System.Data;FillErrorEventArgs;FillErrorEventArgs;(System.Data.DataTable,System.Object[]);Argument[1].Element;Argument[this];taint;df-generated |
-| System.Data;FillErrorEventArgs;get_DataTable;();Argument[this];ReturnValue;taint;df-generated |
-| System.Data;FillErrorEventArgs;get_Values;();Argument[this];ReturnValue;taint;df-generated |
+| System.Data;FillErrorEventArgs;FillErrorEventArgs;(System.Data.DataTable,System.Object[]);Argument[0];Argument[this].SyntheticField[System.Data.FillErrorEventArgs._dataTable];value;dfc-generated |
+| System.Data;FillErrorEventArgs;FillErrorEventArgs;(System.Data.DataTable,System.Object[]);Argument[1];Argument[this].SyntheticField[System.Data.FillErrorEventArgs._values];value;dfc-generated |
+| System.Data;FillErrorEventArgs;get_DataTable;();Argument[this].SyntheticField[System.Data.FillErrorEventArgs._dataTable];ReturnValue;value;dfc-generated |
+| System.Data;FillErrorEventArgs;get_Values;();Argument[this].SyntheticField[System.Data.FillErrorEventArgs._values].Element;ReturnValue.Element;value;dfc-generated |
 | System.Data;FillErrorEventHandler;BeginInvoke;(System.Object,System.Data.FillErrorEventArgs,System.AsyncCallback,System.Object);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
 | System.Data;ForeignKeyConstraint;ForeignKeyConstraint;(System.String,System.Data.DataColumn,System.Data.DataColumn);Argument[0];Argument[this];taint;df-generated |
 | System.Data;ForeignKeyConstraint;ForeignKeyConstraint;(System.String,System.Data.DataColumn[],System.Data.DataColumn[]);Argument[0];Argument[this];taint;df-generated |
@@ -6842,14 +7486,11 @@
 | System.Data;ForeignKeyConstraint;get_Columns;();Argument[this];ReturnValue;taint;df-generated |
 | System.Data;ForeignKeyConstraint;get_RelatedColumns;();Argument[this];ReturnValue;taint;df-generated |
 | System.Data;ForeignKeyConstraint;get_RelatedTable;();Argument[this];ReturnValue;taint;df-generated |
-| System.Data;IColumnMappingCollection;Add;(System.String,System.String);Argument[0];ReturnValue;taint;df-generated |
-| System.Data;IColumnMappingCollection;Add;(System.String,System.String);Argument[1];ReturnValue;taint;df-generated |
 | System.Data;IColumnMappingCollection;Add;(System.String,System.String);Argument[this];ReturnValue;taint;df-generated |
 | System.Data;IColumnMappingCollection;GetByDataSetColumn;(System.String);Argument[this];ReturnValue;taint;df-generated |
 | System.Data;IColumnMappingCollection;get_Item;(System.String);Argument[this].Element;ReturnValue;value;manual |
 | System.Data;IColumnMappingCollection;set_Item;(System.String,System.Object);Argument[1];Argument[this].Element;value;manual |
 | System.Data;IDataAdapter;GetFillParameters;();Argument[this];ReturnValue;taint;df-generated |
-| System.Data;IDataAdapter;get_TableMappings;();Argument[this];ReturnValue;taint;df-generated |
 | System.Data;IDataParameterCollection;get_Item;(System.String);Argument[this].Element;ReturnValue;value;manual |
 | System.Data;IDataParameterCollection;set_Item;(System.String,System.Object);Argument[1];Argument[this].Element;value;manual |
 | System.Data;IDataReader;GetSchemaTable;();Argument[this];ReturnValue;taint;df-generated |
@@ -6860,14 +7501,6 @@
 | System.Data;IDataRecord;get_Item;(System.String);Argument[this];ReturnValue;taint;manual |
 | System.Data;IDbCommand;ExecuteReader;();Argument[this];ReturnValue;taint;manual |
 | System.Data;IDbCommand;ExecuteScalar;();Argument[this];ReturnValue;taint;df-generated |
-| System.Data;IDbCommand;get_Parameters;();Argument[this];ReturnValue;taint;df-generated |
-| System.Data;IDbConnection;BeginTransaction;();Argument[this];ReturnValue;taint;df-generated |
-| System.Data;IDbConnection;BeginTransaction;(System.Data.IsolationLevel);Argument[this];ReturnValue;taint;df-generated |
-| System.Data;IDbConnection;CreateCommand;();Argument[this];ReturnValue;taint;df-generated |
-| System.Data;IDbTransaction;get_Connection;();Argument[this];ReturnValue;taint;df-generated |
-| System.Data;ITableMapping;get_ColumnMappings;();Argument[this];ReturnValue;taint;df-generated |
-| System.Data;ITableMappingCollection;Add;(System.String,System.String);Argument[0];ReturnValue;taint;df-generated |
-| System.Data;ITableMappingCollection;Add;(System.String,System.String);Argument[1];ReturnValue;taint;df-generated |
 | System.Data;ITableMappingCollection;Add;(System.String,System.String);Argument[this];ReturnValue;taint;df-generated |
 | System.Data;ITableMappingCollection;GetByDataSetTable;(System.String);Argument[this];ReturnValue;taint;df-generated |
 | System.Data;ITableMappingCollection;get_Item;(System.String);Argument[this].Element;ReturnValue;value;manual |
@@ -6906,34 +7539,38 @@
 | System.Data;UniqueConstraint;UniqueConstraint;(System.String,System.String[],System.Boolean);Argument[1].Element;Argument[this];taint;df-generated |
 | System.Data;UniqueConstraint;get_Columns;();Argument[this];ReturnValue;taint;df-generated |
 | System.Diagnostics.Contracts;Contract;Exists;(System.Int32,System.Int32,System.Predicate<System.Int32>);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
+| System.Diagnostics.Contracts;Contract;Exists<T>;(System.Collections.Generic.IEnumerable<T>,System.Predicate<T>);Argument[0].Element;Argument[1].Parameter[0];value;dfc-generated |
+| System.Diagnostics.Contracts;Contract;Exists<T>;(System.Collections.Generic.IEnumerable<T>,System.Predicate<T>);Argument[0].Element;Argument[1].Parameter[0];value;hq-generated |
+| System.Diagnostics.Contracts;Contract;Exists<T>;(System.Collections.Generic.IEnumerable<T>,System.Predicate<T>);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | System.Diagnostics.Contracts;Contract;Exists<T>;(System.Collections.Generic.IEnumerable<T>,System.Predicate<T>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
 | System.Diagnostics.Contracts;Contract;ForAll;(System.Int32,System.Int32,System.Predicate<System.Int32>);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
+| System.Diagnostics.Contracts;Contract;ForAll<T>;(System.Collections.Generic.IEnumerable<T>,System.Predicate<T>);Argument[0].Element;Argument[1].Parameter[0];value;dfc-generated |
+| System.Diagnostics.Contracts;Contract;ForAll<T>;(System.Collections.Generic.IEnumerable<T>,System.Predicate<T>);Argument[0].Element;Argument[1].Parameter[0];value;hq-generated |
+| System.Diagnostics.Contracts;Contract;ForAll<T>;(System.Collections.Generic.IEnumerable<T>,System.Predicate<T>);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | System.Diagnostics.Contracts;Contract;ForAll<T>;(System.Collections.Generic.IEnumerable<T>,System.Predicate<T>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
 | System.Diagnostics.Contracts;Contract;add_ContractFailed;(System.EventHandler<System.Diagnostics.Contracts.ContractFailedEventArgs>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Diagnostics.Contracts;Contract;remove_ContractFailed;(System.EventHandler<System.Diagnostics.Contracts.ContractFailedEventArgs>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
-| System.Diagnostics.Contracts;ContractFailedEventArgs;ContractFailedEventArgs;(System.Diagnostics.Contracts.ContractFailureKind,System.String,System.String,System.Exception);Argument[1];Argument[this];taint;df-generated |
-| System.Diagnostics.Contracts;ContractFailedEventArgs;ContractFailedEventArgs;(System.Diagnostics.Contracts.ContractFailureKind,System.String,System.String,System.Exception);Argument[2];Argument[this];taint;df-generated |
-| System.Diagnostics.Contracts;ContractFailedEventArgs;ContractFailedEventArgs;(System.Diagnostics.Contracts.ContractFailureKind,System.String,System.String,System.Exception);Argument[3];Argument[this];taint;df-generated |
-| System.Diagnostics.Contracts;ContractFailedEventArgs;get_Condition;();Argument[this];ReturnValue;taint;df-generated |
-| System.Diagnostics.Contracts;ContractFailedEventArgs;get_Message;();Argument[this];ReturnValue;taint;df-generated |
-| System.Diagnostics.Contracts;ContractFailedEventArgs;get_OriginalException;();Argument[this];ReturnValue;taint;df-generated |
-| System.Diagnostics.Contracts;ContractOptionAttribute;ContractOptionAttribute;(System.String,System.String,System.Boolean);Argument[0];Argument[this];taint;df-generated |
-| System.Diagnostics.Contracts;ContractOptionAttribute;ContractOptionAttribute;(System.String,System.String,System.Boolean);Argument[1];Argument[this];taint;df-generated |
-| System.Diagnostics.Contracts;ContractOptionAttribute;ContractOptionAttribute;(System.String,System.String,System.String);Argument[0];Argument[this];taint;df-generated |
-| System.Diagnostics.Contracts;ContractOptionAttribute;ContractOptionAttribute;(System.String,System.String,System.String);Argument[1];Argument[this];taint;df-generated |
-| System.Diagnostics.Contracts;ContractOptionAttribute;ContractOptionAttribute;(System.String,System.String,System.String);Argument[2];Argument[this];taint;df-generated |
-| System.Diagnostics.Contracts;ContractOptionAttribute;get_Category;();Argument[this];ReturnValue;taint;df-generated |
-| System.Diagnostics.Contracts;ContractOptionAttribute;get_Setting;();Argument[this];ReturnValue;taint;df-generated |
-| System.Diagnostics.Contracts;ContractOptionAttribute;get_Value;();Argument[this];ReturnValue;taint;df-generated |
-| System.Diagnostics.Contracts;ContractPublicPropertyNameAttribute;ContractPublicPropertyNameAttribute;(System.String);Argument[0];Argument[this];taint;df-generated |
-| System.Diagnostics.Contracts;ContractPublicPropertyNameAttribute;get_Name;();Argument[this];ReturnValue;taint;df-generated |
-| System.Diagnostics.Eventing.Reader;EventLogException;get_Message;();Argument[this];ReturnValue;taint;df-generated |
+| System.Diagnostics.Contracts;ContractFailedEventArgs;ContractFailedEventArgs;(System.Diagnostics.Contracts.ContractFailureKind,System.String,System.String,System.Exception);Argument[1];Argument[this].SyntheticField[System.Diagnostics.Contracts.ContractFailedEventArgs._message];value;dfc-generated |
+| System.Diagnostics.Contracts;ContractFailedEventArgs;ContractFailedEventArgs;(System.Diagnostics.Contracts.ContractFailureKind,System.String,System.String,System.Exception);Argument[2];Argument[this].SyntheticField[System.Diagnostics.Contracts.ContractFailedEventArgs._condition];value;dfc-generated |
+| System.Diagnostics.Contracts;ContractFailedEventArgs;ContractFailedEventArgs;(System.Diagnostics.Contracts.ContractFailureKind,System.String,System.String,System.Exception);Argument[3];Argument[this].SyntheticField[System.Diagnostics.Contracts.ContractFailedEventArgs._originalException];value;dfc-generated |
+| System.Diagnostics.Contracts;ContractFailedEventArgs;get_Condition;();Argument[this].SyntheticField[System.Diagnostics.Contracts.ContractFailedEventArgs._condition];ReturnValue;value;dfc-generated |
+| System.Diagnostics.Contracts;ContractFailedEventArgs;get_Message;();Argument[this].SyntheticField[System.Diagnostics.Contracts.ContractFailedEventArgs._message];ReturnValue;value;dfc-generated |
+| System.Diagnostics.Contracts;ContractFailedEventArgs;get_OriginalException;();Argument[this].SyntheticField[System.Diagnostics.Contracts.ContractFailedEventArgs._originalException];ReturnValue;value;dfc-generated |
+| System.Diagnostics.Contracts;ContractOptionAttribute;ContractOptionAttribute;(System.String,System.String,System.Boolean);Argument[0];Argument[this].SyntheticField[System.Diagnostics.Contracts.ContractOptionAttribute._category];value;dfc-generated |
+| System.Diagnostics.Contracts;ContractOptionAttribute;ContractOptionAttribute;(System.String,System.String,System.Boolean);Argument[1];Argument[this].SyntheticField[System.Diagnostics.Contracts.ContractOptionAttribute._setting];value;dfc-generated |
+| System.Diagnostics.Contracts;ContractOptionAttribute;ContractOptionAttribute;(System.String,System.String,System.String);Argument[0];Argument[this].SyntheticField[System.Diagnostics.Contracts.ContractOptionAttribute._category];value;dfc-generated |
+| System.Diagnostics.Contracts;ContractOptionAttribute;ContractOptionAttribute;(System.String,System.String,System.String);Argument[1];Argument[this].SyntheticField[System.Diagnostics.Contracts.ContractOptionAttribute._setting];value;dfc-generated |
+| System.Diagnostics.Contracts;ContractOptionAttribute;ContractOptionAttribute;(System.String,System.String,System.String);Argument[2];Argument[this].SyntheticField[System.Diagnostics.Contracts.ContractOptionAttribute._value];value;dfc-generated |
+| System.Diagnostics.Contracts;ContractOptionAttribute;get_Category;();Argument[this].SyntheticField[System.Diagnostics.Contracts.ContractOptionAttribute._category];ReturnValue;value;dfc-generated |
+| System.Diagnostics.Contracts;ContractOptionAttribute;get_Setting;();Argument[this].SyntheticField[System.Diagnostics.Contracts.ContractOptionAttribute._setting];ReturnValue;value;dfc-generated |
+| System.Diagnostics.Contracts;ContractOptionAttribute;get_Value;();Argument[this].SyntheticField[System.Diagnostics.Contracts.ContractOptionAttribute._value];ReturnValue;value;dfc-generated |
+| System.Diagnostics.Contracts;ContractPublicPropertyNameAttribute;ContractPublicPropertyNameAttribute;(System.String);Argument[0];Argument[this].SyntheticField[System.Diagnostics.Contracts.ContractPublicPropertyNameAttribute._publicName];value;dfc-generated |
+| System.Diagnostics.Contracts;ContractPublicPropertyNameAttribute;get_Name;();Argument[this].SyntheticField[System.Diagnostics.Contracts.ContractPublicPropertyNameAttribute._publicName];ReturnValue;value;dfc-generated |
+| System.Diagnostics.Eventing.Reader;EventLogException;get_Message;();Argument[this].SyntheticField[System.Exception._message];ReturnValue;value;dfc-generated |
 | System.Diagnostics.Eventing.Reader;EventLogWatcher;add_EventRecordWritten;(System.EventHandler<System.Diagnostics.Eventing.Reader.EventRecordWrittenEventArgs>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Diagnostics.Eventing.Reader;EventLogWatcher;remove_EventRecordWritten;(System.EventHandler<System.Diagnostics.Eventing.Reader.EventRecordWrittenEventArgs>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
-| System.Diagnostics.Metrics;Instrument;Instrument;(System.Diagnostics.Metrics.Meter,System.String,System.String,System.String,System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<System.String,System.Object>>);Argument[4].Element;Argument[this];taint;df-generated |
 | System.Diagnostics.Metrics;Measurement<T>;Measurement;(T,System.Collections.Generic.KeyValuePair<System.String,System.Object>[]);Argument[1].Element;Argument[this];taint;df-generated |
 | System.Diagnostics.Metrics;Measurement<T>;Measurement;(T,System.ReadOnlySpan<System.Collections.Generic.KeyValuePair<System.String,System.Object>>);Argument[1];Argument[this];taint;df-generated |
-| System.Diagnostics.Metrics;Measurement<T>;get_Tags;();Argument[this];ReturnValue;taint;df-generated |
 | System.Diagnostics.Metrics;MeasurementCallback<T>;BeginInvoke;(System.Diagnostics.Metrics.Instrument,T,System.ReadOnlySpan<System.Collections.Generic.KeyValuePair<System.String,System.Object>>,System.Object,System.AsyncCallback,System.Object);Argument[4];Argument[4].Parameter[delegate-self];value;hq-generated |
 | System.Diagnostics.Metrics;Meter;CreateObservableCounter<T>;(System.String,System.Func<System.Collections.Generic.IEnumerable<System.Diagnostics.Metrics.Measurement<T>>>,System.String,System.String);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
 | System.Diagnostics.Metrics;Meter;CreateObservableCounter<T>;(System.String,System.Func<System.Collections.Generic.IEnumerable<System.Diagnostics.Metrics.Measurement<T>>>,System.String,System.String,System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<System.String,System.Object>>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
@@ -6953,66 +7590,84 @@
 | System.Diagnostics.Metrics;Meter;CreateObservableUpDownCounter<T>;(System.String,System.Func<System.Diagnostics.Metrics.Measurement<T>>,System.String,System.String,System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<System.String,System.Object>>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
 | System.Diagnostics.Metrics;Meter;CreateObservableUpDownCounter<T>;(System.String,System.Func<T>,System.String,System.String);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
 | System.Diagnostics.Metrics;Meter;CreateObservableUpDownCounter<T>;(System.String,System.Func<T>,System.String,System.String,System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<System.String,System.Object>>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
+| System.Diagnostics.Metrics;MeterListener;DisableMeasurementEvents;(System.Diagnostics.Metrics.Instrument);Argument[0];Argument[this];taint;df-generated |
+| System.Diagnostics.Metrics;MeterListener;EnableMeasurementEvents;(System.Diagnostics.Metrics.Instrument,System.Object);Argument[0];Argument[this];taint;df-generated |
+| System.Diagnostics.Metrics;MeterListener;EnableMeasurementEvents;(System.Diagnostics.Metrics.Instrument,System.Object);Argument[1];Argument[this];taint;df-generated |
 | System.Diagnostics.Metrics;MeterListener;SetMeasurementEventCallback<T>;(System.Diagnostics.Metrics.MeasurementCallback<T>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Diagnostics.Metrics;MeterListener;set_InstrumentPublished;(System.Action<System.Diagnostics.Metrics.Instrument,System.Diagnostics.Metrics.MeterListener>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Diagnostics.Metrics;MeterListener;set_MeasurementsCompleted;(System.Action<System.Diagnostics.Metrics.Instrument,System.Object>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Diagnostics.Metrics;MeterOptions;MeterOptions;(System.String);Argument[0];Argument[this];taint;df-generated |
-| System.Diagnostics.Tracing;EventCounter;ToString;();Argument[this];ReturnValue;taint;df-generated |
+| System.Diagnostics.Metrics;ObservableCounter<T>;Observe;();Argument[this];ReturnValue;taint;df-generated |
+| System.Diagnostics.Metrics;ObservableGauge<T>;Observe;();Argument[this];ReturnValue;taint;df-generated |
+| System.Diagnostics.Metrics;ObservableUpDownCounter<T>;Observe;();Argument[this];ReturnValue;taint;df-generated |
+| System.Diagnostics.Tracing;EventCounter;ToString;();Argument[this].Property[System.Diagnostics.Tracing.DiagnosticCounter.Name];ReturnValue;taint;dfc-generated |
 | System.Diagnostics.Tracing;EventListener;DisableEvents;(System.Diagnostics.Tracing.EventSource);Argument[this];Argument[0];taint;df-generated |
 | System.Diagnostics.Tracing;EventListener;EnableEvents;(System.Diagnostics.Tracing.EventSource,System.Diagnostics.Tracing.EventLevel);Argument[this];Argument[0];taint;df-generated |
 | System.Diagnostics.Tracing;EventListener;EnableEvents;(System.Diagnostics.Tracing.EventSource,System.Diagnostics.Tracing.EventLevel,System.Diagnostics.Tracing.EventKeywords);Argument[this];Argument[0];taint;df-generated |
 | System.Diagnostics.Tracing;EventListener;EnableEvents;(System.Diagnostics.Tracing.EventSource,System.Diagnostics.Tracing.EventLevel,System.Diagnostics.Tracing.EventKeywords,System.Collections.Generic.IDictionary<System.String,System.String>);Argument[this];Argument[0];taint;df-generated |
+| System.Diagnostics.Tracing;EventListener;add_EventSourceCreated;(System.EventHandler<System.Diagnostics.Tracing.EventSourceCreatedEventArgs>);Argument[0];Argument[0].Parameter[delegate-self];value;dfc-generated |
 | System.Diagnostics.Tracing;EventListener;add_EventSourceCreated;(System.EventHandler<System.Diagnostics.Tracing.EventSourceCreatedEventArgs>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
+| System.Diagnostics.Tracing;EventListener;add_EventSourceCreated;(System.EventHandler<System.Diagnostics.Tracing.EventSourceCreatedEventArgs>);Argument[this];Argument[0].Parameter[0];value;dfc-generated |
+| System.Diagnostics.Tracing;EventListener;add_EventSourceCreated;(System.EventHandler<System.Diagnostics.Tracing.EventSourceCreatedEventArgs>);Argument[this];Argument[0].Parameter[0];value;hq-generated |
 | System.Diagnostics.Tracing;EventListener;add_EventWritten;(System.EventHandler<System.Diagnostics.Tracing.EventWrittenEventArgs>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Diagnostics.Tracing;EventListener;remove_EventSourceCreated;(System.EventHandler<System.Diagnostics.Tracing.EventSourceCreatedEventArgs>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Diagnostics.Tracing;EventListener;remove_EventWritten;(System.EventHandler<System.Diagnostics.Tracing.EventWrittenEventArgs>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
-| System.Diagnostics.Tracing;EventSource;EventSource;(System.Diagnostics.Tracing.EventSourceSettings,System.String[]);Argument[1].Element;Argument[this];taint;df-generated |
+| System.Diagnostics.Tracing;EventSource;EventSource;(System.Diagnostics.Tracing.EventSourceSettings,System.String[]);Argument[1];Argument[this].SyntheticField[System.Diagnostics.Tracing.EventSource.m_traits];value;dfc-generated |
 | System.Diagnostics.Tracing;EventSource;GenerateManifest;(System.Type,System.String);Argument[1];ReturnValue;taint;df-generated |
 | System.Diagnostics.Tracing;EventSource;GenerateManifest;(System.Type,System.String,System.Diagnostics.Tracing.EventManifestOptions);Argument[1];ReturnValue;taint;df-generated |
-| System.Diagnostics.Tracing;EventSource;GetTrait;(System.String);Argument[this];ReturnValue;taint;df-generated |
+| System.Diagnostics.Tracing;EventSource;GetTrait;(System.String);Argument[this].SyntheticField[System.Diagnostics.Tracing.EventSource.m_traits].Element;ReturnValue;value;dfc-generated |
 | System.Diagnostics.Tracing;EventSource;ToString;();Argument[this];ReturnValue;taint;df-generated |
+| System.Diagnostics.Tracing;EventSource;Write<T>;(System.String,System.Diagnostics.Tracing.EventSourceOptions,System.Guid,System.Guid,T);Argument[1];ReturnValue;value;dfc-generated |
+| System.Diagnostics.Tracing;EventSource;Write<T>;(System.String,System.Diagnostics.Tracing.EventSourceOptions,System.Guid,System.Guid,T);Argument[2];ReturnValue;value;dfc-generated |
+| System.Diagnostics.Tracing;EventSource;Write<T>;(System.String,System.Diagnostics.Tracing.EventSourceOptions,System.Guid,System.Guid,T);Argument[3];ReturnValue;value;dfc-generated |
+| System.Diagnostics.Tracing;EventSource;Write<T>;(System.String,System.Diagnostics.Tracing.EventSourceOptions,System.Guid,System.Guid,T);Argument[4];ReturnValue;value;dfc-generated |
+| System.Diagnostics.Tracing;EventSource;Write<T>;(System.String,System.Diagnostics.Tracing.EventSourceOptions,T);Argument[1];ReturnValue;value;dfc-generated |
+| System.Diagnostics.Tracing;EventSource;Write<T>;(System.String,System.Diagnostics.Tracing.EventSourceOptions,T);Argument[2];ReturnValue;value;dfc-generated |
+| System.Diagnostics.Tracing;EventSource;add_EventCommandExecuted;(System.EventHandler<System.Diagnostics.Tracing.EventCommandEventArgs>);Argument[0];Argument[0].Parameter[delegate-self];value;dfc-generated |
 | System.Diagnostics.Tracing;EventSource;add_EventCommandExecuted;(System.EventHandler<System.Diagnostics.Tracing.EventCommandEventArgs>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
+| System.Diagnostics.Tracing;EventSource;add_EventCommandExecuted;(System.EventHandler<System.Diagnostics.Tracing.EventCommandEventArgs>);Argument[this];Argument[0].Parameter[0];value;dfc-generated |
+| System.Diagnostics.Tracing;EventSource;add_EventCommandExecuted;(System.EventHandler<System.Diagnostics.Tracing.EventCommandEventArgs>);Argument[this];Argument[0].Parameter[0];value;hq-generated |
 | System.Diagnostics.Tracing;EventSource;get_ConstructionException;();Argument[this];ReturnValue;taint;df-generated |
 | System.Diagnostics.Tracing;EventSource;get_Guid;();Argument[this];ReturnValue;taint;df-generated |
 | System.Diagnostics.Tracing;EventSource;get_Name;();Argument[this];ReturnValue;taint;df-generated |
 | System.Diagnostics.Tracing;EventSource;remove_EventCommandExecuted;(System.EventHandler<System.Diagnostics.Tracing.EventCommandEventArgs>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Diagnostics.Tracing;EventWrittenEventArgs;get_ActivityId;();Argument[this];ReturnValue;taint;df-generated |
-| System.Diagnostics.Tracing;IncrementingEventCounter;ToString;();Argument[this];ReturnValue;taint;df-generated |
+| System.Diagnostics.Tracing;IncrementingEventCounter;ToString;();Argument[this].Property[System.Diagnostics.Tracing.DiagnosticCounter.Name];ReturnValue;taint;dfc-generated |
 | System.Diagnostics.Tracing;IncrementingPollingCounter;IncrementingPollingCounter;(System.String,System.Diagnostics.Tracing.EventSource,System.Func<System.Double>);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
-| System.Diagnostics.Tracing;IncrementingPollingCounter;ToString;();Argument[this];ReturnValue;taint;df-generated |
+| System.Diagnostics.Tracing;IncrementingPollingCounter;ToString;();Argument[this].Property[System.Diagnostics.Tracing.DiagnosticCounter.Name];ReturnValue;taint;dfc-generated |
 | System.Diagnostics.Tracing;PollingCounter;PollingCounter;(System.String,System.Diagnostics.Tracing.EventSource,System.Func<System.Double>);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
-| System.Diagnostics.Tracing;PollingCounter;ToString;();Argument[this];ReturnValue;taint;df-generated |
-| System.Diagnostics;Activity+Enumerator<T>;GetEnumerator;();Argument[this];ReturnValue;value;df-generated |
-| System.Diagnostics;Activity;AddBaggage;(System.String,System.String);Argument[this];ReturnValue;value;df-generated |
-| System.Diagnostics;Activity;AddEvent;(System.Diagnostics.ActivityEvent);Argument[this];ReturnValue;value;df-generated |
-| System.Diagnostics;Activity;AddTag;(System.String,System.Object);Argument[this];ReturnValue;value;df-generated |
-| System.Diagnostics;Activity;AddTag;(System.String,System.String);Argument[this];ReturnValue;taint;df-generated |
+| System.Diagnostics.Tracing;PollingCounter;ToString;();Argument[this].Property[System.Diagnostics.Tracing.DiagnosticCounter.Name];ReturnValue;taint;dfc-generated |
+| System.Diagnostics;Activity+Enumerator<T>;GetEnumerator;();Argument[this];ReturnValue;value;dfc-generated |
+| System.Diagnostics;Activity;AddBaggage;(System.String,System.String);Argument[this];ReturnValue;value;dfc-generated |
+| System.Diagnostics;Activity;AddEvent;(System.Diagnostics.ActivityEvent);Argument[this];ReturnValue;value;dfc-generated |
+| System.Diagnostics;Activity;AddTag;(System.String,System.Object);Argument[this];ReturnValue;value;dfc-generated |
+| System.Diagnostics;Activity;AddTag;(System.String,System.String);Argument[this];ReturnValue;value;dfc-generated |
 | System.Diagnostics;Activity;EnumerateEvents;();Argument[this];ReturnValue;taint;df-generated |
 | System.Diagnostics;Activity;EnumerateLinks;();Argument[this];ReturnValue;taint;df-generated |
 | System.Diagnostics;Activity;EnumerateTagObjects;();Argument[this];ReturnValue;taint;df-generated |
 | System.Diagnostics;Activity;GetBaggageItem;(System.String);Argument[this];ReturnValue;taint;df-generated |
-| System.Diagnostics;Activity;SetBaggage;(System.String,System.String);Argument[this];ReturnValue;value;df-generated |
-| System.Diagnostics;Activity;SetEndTime;(System.DateTime);Argument[this];ReturnValue;value;df-generated |
-| System.Diagnostics;Activity;SetIdFormat;(System.Diagnostics.ActivityIdFormat);Argument[this];ReturnValue;value;df-generated |
-| System.Diagnostics;Activity;SetParentId;(System.Diagnostics.ActivityTraceId,System.Diagnostics.ActivitySpanId,System.Diagnostics.ActivityTraceFlags);Argument[0];Argument[this];taint;df-generated |
-| System.Diagnostics;Activity;SetParentId;(System.Diagnostics.ActivityTraceId,System.Diagnostics.ActivitySpanId,System.Diagnostics.ActivityTraceFlags);Argument[1];Argument[this];taint;df-generated |
-| System.Diagnostics;Activity;SetParentId;(System.Diagnostics.ActivityTraceId,System.Diagnostics.ActivitySpanId,System.Diagnostics.ActivityTraceFlags);Argument[this];ReturnValue;value;df-generated |
-| System.Diagnostics;Activity;SetParentId;(System.String);Argument[0];Argument[this];taint;df-generated |
-| System.Diagnostics;Activity;SetParentId;(System.String);Argument[this];ReturnValue;value;df-generated |
-| System.Diagnostics;Activity;SetStartTime;(System.DateTime);Argument[this];ReturnValue;value;df-generated |
-| System.Diagnostics;Activity;SetStatus;(System.Diagnostics.ActivityStatusCode,System.String);Argument[1];Argument[this];taint;df-generated |
-| System.Diagnostics;Activity;SetStatus;(System.Diagnostics.ActivityStatusCode,System.String);Argument[this];ReturnValue;value;df-generated |
-| System.Diagnostics;Activity;SetTag;(System.String,System.Object);Argument[this];ReturnValue;value;df-generated |
+| System.Diagnostics;Activity;SetBaggage;(System.String,System.String);Argument[this];ReturnValue;value;dfc-generated |
+| System.Diagnostics;Activity;SetEndTime;(System.DateTime);Argument[this];ReturnValue;value;dfc-generated |
+| System.Diagnostics;Activity;SetIdFormat;(System.Diagnostics.ActivityIdFormat);Argument[this];ReturnValue;value;dfc-generated |
+| System.Diagnostics;Activity;SetParentId;(System.Diagnostics.ActivityTraceId,System.Diagnostics.ActivitySpanId,System.Diagnostics.ActivityTraceFlags);Argument[this];ReturnValue;value;dfc-generated |
+| System.Diagnostics;Activity;SetParentId;(System.String);Argument[0];Argument[this].SyntheticField[System.Diagnostics.Activity._parentId];value;dfc-generated |
+| System.Diagnostics;Activity;SetParentId;(System.String);Argument[0];ReturnValue.SyntheticField[System.Diagnostics.Activity._parentId];value;dfc-generated |
+| System.Diagnostics;Activity;SetParentId;(System.String);Argument[this];ReturnValue;value;dfc-generated |
+| System.Diagnostics;Activity;SetStartTime;(System.DateTime);Argument[this];ReturnValue;value;dfc-generated |
+| System.Diagnostics;Activity;SetStatus;(System.Diagnostics.ActivityStatusCode,System.String);Argument[1];Argument[this].SyntheticField[System.Diagnostics.Activity._statusDescription];value;dfc-generated |
+| System.Diagnostics;Activity;SetStatus;(System.Diagnostics.ActivityStatusCode,System.String);Argument[1];ReturnValue.SyntheticField[System.Diagnostics.Activity._statusDescription];value;dfc-generated |
+| System.Diagnostics;Activity;SetStatus;(System.Diagnostics.ActivityStatusCode,System.String);Argument[this];ReturnValue;value;dfc-generated |
+| System.Diagnostics;Activity;SetTag;(System.String,System.Object);Argument[this];ReturnValue;value;dfc-generated |
 | System.Diagnostics;Activity;Start;();Argument[this];ReturnValue;value;df-generated |
 | System.Diagnostics;Activity;add_CurrentChanged;(System.EventHandler<System.Diagnostics.ActivityChangedEventArgs>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Diagnostics;Activity;get_Events;();Argument[this];ReturnValue;taint;df-generated |
 | System.Diagnostics;Activity;get_Id;();Argument[this];ReturnValue;taint;df-generated |
 | System.Diagnostics;Activity;get_Links;();Argument[this];ReturnValue;taint;df-generated |
-| System.Diagnostics;Activity;get_ParentId;();Argument[this];ReturnValue;taint;df-generated |
+| System.Diagnostics;Activity;get_ParentId;();Argument[this].SyntheticField[System.Diagnostics.Activity._parentId];ReturnValue;value;dfc-generated |
 | System.Diagnostics;Activity;get_ParentSpanId;();Argument[this];ReturnValue;taint;df-generated |
 | System.Diagnostics;Activity;get_RootId;();Argument[this];ReturnValue;taint;df-generated |
 | System.Diagnostics;Activity;get_SpanId;();Argument[this];ReturnValue;taint;df-generated |
-| System.Diagnostics;Activity;get_StatusDescription;();Argument[this];ReturnValue;taint;df-generated |
+| System.Diagnostics;Activity;get_StatusDescription;();Argument[this].SyntheticField[System.Diagnostics.Activity._statusDescription];ReturnValue;value;dfc-generated |
 | System.Diagnostics;Activity;get_TagObjects;();Argument[this];ReturnValue;taint;df-generated |
 | System.Diagnostics;Activity;get_TraceId;();Argument[this];ReturnValue;taint;df-generated |
 | System.Diagnostics;Activity;remove_CurrentChanged;(System.EventHandler<System.Diagnostics.ActivityChangedEventArgs>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
@@ -7029,10 +7684,10 @@
 | System.Diagnostics;ActivityListener;set_SampleUsingParentId;(System.Diagnostics.SampleActivity<System.String>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Diagnostics;ActivityListener;set_ShouldListenTo;(System.Func<System.Diagnostics.ActivitySource,System.Boolean>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Diagnostics;ActivitySource;CreateActivity;(System.String,System.Diagnostics.ActivityKind,System.Diagnostics.ActivityContext,System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<System.String,System.Object>>,System.Collections.Generic.IEnumerable<System.Diagnostics.ActivityLink>,System.Diagnostics.ActivityIdFormat);Argument[2];ReturnValue;taint;df-generated |
-| System.Diagnostics;ActivitySource;CreateActivity;(System.String,System.Diagnostics.ActivityKind,System.String,System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<System.String,System.Object>>,System.Collections.Generic.IEnumerable<System.Diagnostics.ActivityLink>,System.Diagnostics.ActivityIdFormat);Argument[2];ReturnValue;taint;df-generated |
+| System.Diagnostics;ActivitySource;CreateActivity;(System.String,System.Diagnostics.ActivityKind,System.String,System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<System.String,System.Object>>,System.Collections.Generic.IEnumerable<System.Diagnostics.ActivityLink>,System.Diagnostics.ActivityIdFormat);Argument[2];ReturnValue.SyntheticField[System.Diagnostics.Activity._parentId];value;dfc-generated |
 | System.Diagnostics;ActivitySource;StartActivity;(System.Diagnostics.ActivityKind,System.Diagnostics.ActivityContext,System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<System.String,System.Object>>,System.Collections.Generic.IEnumerable<System.Diagnostics.ActivityLink>,System.DateTimeOffset,System.String);Argument[1];ReturnValue;taint;df-generated |
 | System.Diagnostics;ActivitySource;StartActivity;(System.String,System.Diagnostics.ActivityKind,System.Diagnostics.ActivityContext,System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<System.String,System.Object>>,System.Collections.Generic.IEnumerable<System.Diagnostics.ActivityLink>,System.DateTimeOffset);Argument[2];ReturnValue;taint;df-generated |
-| System.Diagnostics;ActivitySource;StartActivity;(System.String,System.Diagnostics.ActivityKind,System.String,System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<System.String,System.Object>>,System.Collections.Generic.IEnumerable<System.Diagnostics.ActivityLink>,System.DateTimeOffset);Argument[2];ReturnValue;taint;df-generated |
+| System.Diagnostics;ActivitySource;StartActivity;(System.String,System.Diagnostics.ActivityKind,System.String,System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<System.String,System.Object>>,System.Collections.Generic.IEnumerable<System.Diagnostics.ActivityLink>,System.DateTimeOffset);Argument[2];ReturnValue.SyntheticField[System.Diagnostics.Activity._parentId];value;dfc-generated |
 | System.Diagnostics;ActivitySpanId;ToHexString;();Argument[this];ReturnValue;taint;df-generated |
 | System.Diagnostics;ActivitySpanId;ToString;();Argument[this];ReturnValue;taint;df-generated |
 | System.Diagnostics;ActivityTagsCollection+Enumerator;get_Current;();Argument[this];ReturnValue;taint;df-generated |
@@ -7047,6 +7702,13 @@
 | System.Diagnostics;CorrelationManager;get_LogicalOperationStack;();Argument[this];ReturnValue;taint;df-generated |
 | System.Diagnostics;DataReceivedEventArgs;get_Data;();Argument[this];ReturnValue;taint;df-generated |
 | System.Diagnostics;DataReceivedEventHandler;BeginInvoke;(System.Object,System.Diagnostics.DataReceivedEventArgs,System.AsyncCallback,System.Object);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
+| System.Diagnostics;Debug;Assert;(System.Boolean,System.Diagnostics.Debug+AssertInterpolatedStringHandler);Argument[1];ReturnValue;value;dfc-generated |
+| System.Diagnostics;Debug;Assert;(System.Boolean,System.Diagnostics.Debug+AssertInterpolatedStringHandler,System.Diagnostics.Debug+AssertInterpolatedStringHandler);Argument[1];ReturnValue;value;dfc-generated |
+| System.Diagnostics;Debug;Assert;(System.Boolean,System.Diagnostics.Debug+AssertInterpolatedStringHandler,System.Diagnostics.Debug+AssertInterpolatedStringHandler);Argument[2];ReturnValue;value;dfc-generated |
+| System.Diagnostics;Debug;WriteIf;(System.Boolean,System.Diagnostics.Debug+WriteIfInterpolatedStringHandler);Argument[1];ReturnValue;value;dfc-generated |
+| System.Diagnostics;Debug;WriteIf;(System.Boolean,System.Diagnostics.Debug+WriteIfInterpolatedStringHandler,System.String);Argument[1];ReturnValue;value;dfc-generated |
+| System.Diagnostics;Debug;WriteLineIf;(System.Boolean,System.Diagnostics.Debug+WriteIfInterpolatedStringHandler);Argument[1];ReturnValue;value;dfc-generated |
+| System.Diagnostics;Debug;WriteLineIf;(System.Boolean,System.Diagnostics.Debug+WriteIfInterpolatedStringHandler,System.String);Argument[1];ReturnValue;value;dfc-generated |
 | System.Diagnostics;DiagnosticListener;Subscribe;(System.IObserver<System.Collections.Generic.KeyValuePair<System.String,System.Object>>);Argument[0];ReturnValue;taint;df-generated |
 | System.Diagnostics;DiagnosticListener;Subscribe;(System.IObserver<System.Collections.Generic.KeyValuePair<System.String,System.Object>>);Argument[this];ReturnValue;taint;df-generated |
 | System.Diagnostics;DiagnosticListener;Subscribe;(System.IObserver<System.Collections.Generic.KeyValuePair<System.String,System.Object>>,System.Func<System.String,System.Object,System.Object,System.Boolean>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
@@ -7054,23 +7716,32 @@
 | System.Diagnostics;DiagnosticListener;Subscribe;(System.IObserver<System.Collections.Generic.KeyValuePair<System.String,System.Object>>,System.Func<System.String,System.Object,System.Object,System.Boolean>,System.Action<System.Diagnostics.Activity,System.Object>,System.Action<System.Diagnostics.Activity,System.Object>);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
 | System.Diagnostics;DiagnosticListener;Subscribe;(System.IObserver<System.Collections.Generic.KeyValuePair<System.String,System.Object>>,System.Func<System.String,System.Object,System.Object,System.Boolean>,System.Action<System.Diagnostics.Activity,System.Object>,System.Action<System.Diagnostics.Activity,System.Object>);Argument[3];Argument[3].Parameter[delegate-self];value;hq-generated |
 | System.Diagnostics;DiagnosticListener;Subscribe;(System.IObserver<System.Collections.Generic.KeyValuePair<System.String,System.Object>>,System.Predicate<System.String>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
-| System.Diagnostics;DiagnosticListener;ToString;();Argument[this];ReturnValue;taint;df-generated |
-| System.Diagnostics;DiagnosticSource;StartActivity;(System.Diagnostics.Activity,System.Object);Argument[0];ReturnValue;taint;df-generated |
-| System.Diagnostics;DiagnosticSource;StartActivity<T>;(System.Diagnostics.Activity,T);Argument[0];ReturnValue;taint;df-generated |
+| System.Diagnostics;DiagnosticListener;ToString;();Argument[this].Property[System.Diagnostics.DiagnosticListener.Name];ReturnValue;value;dfc-generated |
+| System.Diagnostics;DiagnosticSource;StartActivity;(System.Diagnostics.Activity,System.Object);Argument[0];ReturnValue;value;dfc-generated |
+| System.Diagnostics;DiagnosticSource;StartActivity<T>;(System.Diagnostics.Activity,T);Argument[0];ReturnValue;value;dfc-generated |
 | System.Diagnostics;DistributedContextPropagator+PropagatorGetterCallback;BeginInvoke;(System.Object,System.String,System.String,System.Collections.Generic.IEnumerable<System.String>,System.AsyncCallback,System.Object);Argument[4];Argument[4].Parameter[delegate-self];value;hq-generated |
 | System.Diagnostics;DistributedContextPropagator+PropagatorSetterCallback;BeginInvoke;(System.Object,System.String,System.String,System.AsyncCallback,System.Object);Argument[3];Argument[3].Parameter[delegate-self];value;hq-generated |
+| System.Diagnostics;DistributedContextPropagator;ExtractBaggage;(System.Object,System.Diagnostics.DistributedContextPropagator+PropagatorGetterCallback);Argument[0];Argument[1].Parameter[0];value;dfc-generated |
+| System.Diagnostics;DistributedContextPropagator;ExtractBaggage;(System.Object,System.Diagnostics.DistributedContextPropagator+PropagatorGetterCallback);Argument[0];Argument[1].Parameter[0];value;hq-generated |
+| System.Diagnostics;DistributedContextPropagator;ExtractBaggage;(System.Object,System.Diagnostics.DistributedContextPropagator+PropagatorGetterCallback);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | System.Diagnostics;DistributedContextPropagator;ExtractBaggage;(System.Object,System.Diagnostics.DistributedContextPropagator+PropagatorGetterCallback);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
+| System.Diagnostics;DistributedContextPropagator;ExtractTraceIdAndState;(System.Object,System.Diagnostics.DistributedContextPropagator+PropagatorGetterCallback,System.String,System.String);Argument[0];Argument[1].Parameter[0];value;dfc-generated |
+| System.Diagnostics;DistributedContextPropagator;ExtractTraceIdAndState;(System.Object,System.Diagnostics.DistributedContextPropagator+PropagatorGetterCallback,System.String,System.String);Argument[0];Argument[1].Parameter[0];value;hq-generated |
+| System.Diagnostics;DistributedContextPropagator;ExtractTraceIdAndState;(System.Object,System.Diagnostics.DistributedContextPropagator+PropagatorGetterCallback,System.String,System.String);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | System.Diagnostics;DistributedContextPropagator;ExtractTraceIdAndState;(System.Object,System.Diagnostics.DistributedContextPropagator+PropagatorGetterCallback,System.String,System.String);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
+| System.Diagnostics;DistributedContextPropagator;Inject;(System.Diagnostics.Activity,System.Object,System.Diagnostics.DistributedContextPropagator+PropagatorSetterCallback);Argument[1];Argument[2].Parameter[0];value;dfc-generated |
+| System.Diagnostics;DistributedContextPropagator;Inject;(System.Diagnostics.Activity,System.Object,System.Diagnostics.DistributedContextPropagator+PropagatorSetterCallback);Argument[1];Argument[2].Parameter[0];value;hq-generated |
+| System.Diagnostics;DistributedContextPropagator;Inject;(System.Diagnostics.Activity,System.Object,System.Diagnostics.DistributedContextPropagator+PropagatorSetterCallback);Argument[2];Argument[2].Parameter[delegate-self];value;dfc-generated |
 | System.Diagnostics;DistributedContextPropagator;Inject;(System.Diagnostics.Activity,System.Object,System.Diagnostics.DistributedContextPropagator+PropagatorSetterCallback);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
 | System.Diagnostics;EntryWrittenEventHandler;BeginInvoke;(System.Object,System.Diagnostics.EntryWrittenEventArgs,System.AsyncCallback,System.Object);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
 | System.Diagnostics;EventLog;add_EntryWritten;(System.Diagnostics.EntryWrittenEventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Diagnostics;EventLog;remove_EntryWritten;(System.Diagnostics.EntryWrittenEventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
-| System.Diagnostics;FileVersionInfo;GetVersionInfo;(System.String);Argument[0];ReturnValue;taint;df-generated |
+| System.Diagnostics;FileVersionInfo;GetVersionInfo;(System.String);Argument[0];ReturnValue.SyntheticField[System.Diagnostics.FileVersionInfo._fileName];value;dfc-generated |
 | System.Diagnostics;FileVersionInfo;ToString;();Argument[this];ReturnValue;taint;df-generated |
 | System.Diagnostics;FileVersionInfo;get_Comments;();Argument[this];ReturnValue;taint;df-generated |
 | System.Diagnostics;FileVersionInfo;get_CompanyName;();Argument[this];ReturnValue;taint;df-generated |
 | System.Diagnostics;FileVersionInfo;get_FileDescription;();Argument[this];ReturnValue;taint;df-generated |
-| System.Diagnostics;FileVersionInfo;get_FileName;();Argument[this];ReturnValue;taint;df-generated |
+| System.Diagnostics;FileVersionInfo;get_FileName;();Argument[this].SyntheticField[System.Diagnostics.FileVersionInfo._fileName];ReturnValue;value;dfc-generated |
 | System.Diagnostics;FileVersionInfo;get_FileVersion;();Argument[this];ReturnValue;taint;df-generated |
 | System.Diagnostics;FileVersionInfo;get_InternalName;();Argument[this];ReturnValue;taint;df-generated |
 | System.Diagnostics;FileVersionInfo;get_Language;();Argument[this];ReturnValue;taint;df-generated |
@@ -7081,15 +7752,16 @@
 | System.Diagnostics;FileVersionInfo;get_ProductName;();Argument[this];ReturnValue;taint;df-generated |
 | System.Diagnostics;FileVersionInfo;get_ProductVersion;();Argument[this];ReturnValue;taint;df-generated |
 | System.Diagnostics;FileVersionInfo;get_SpecialBuild;();Argument[this];ReturnValue;taint;df-generated |
-| System.Diagnostics;MonitoringDescriptionAttribute;get_Description;();Argument[this];ReturnValue;taint;df-generated |
-| System.Diagnostics;Process;GetProcessById;(System.Int32,System.String);Argument[1];ReturnValue;taint;df-generated |
+| System.Diagnostics;MonitoringDescriptionAttribute;get_Description;();Argument[this].Property[System.ComponentModel.DescriptionAttribute.DescriptionValue];ReturnValue;value;dfc-generated |
+| System.Diagnostics;MonitoringDescriptionAttribute;get_Description;();Argument[this].Property[System.ComponentModel.DescriptionAttribute.Description];Argument[this].Property[System.ComponentModel.DescriptionAttribute.DescriptionValue];value;dfc-generated |
+| System.Diagnostics;MonitoringDescriptionAttribute;get_Description;();Argument[this].Property[System.ComponentModel.DescriptionAttribute.Description];ReturnValue;value;dfc-generated |
+| System.Diagnostics;Process;GetProcessById;(System.Int32,System.String);Argument[1];ReturnValue.SyntheticField[System.Diagnostics.Process._machineName];value;dfc-generated |
 | System.Diagnostics;Process;GetProcesses;(System.String);Argument[0];ReturnValue;taint;df-generated |
 | System.Diagnostics;Process;Start;(System.Diagnostics.ProcessStartInfo);Argument[0];ReturnValue;taint;df-generated |
 | System.Diagnostics;Process;add_ErrorDataReceived;(System.Diagnostics.DataReceivedEventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Diagnostics;Process;add_Exited;(System.EventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Diagnostics;Process;add_OutputDataReceived;(System.Diagnostics.DataReceivedEventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
-| System.Diagnostics;Process;get_Handle;();Argument[this];ReturnValue;taint;df-generated |
-| System.Diagnostics;Process;get_MachineName;();Argument[this];ReturnValue;taint;df-generated |
+| System.Diagnostics;Process;get_MachineName;();Argument[this].SyntheticField[System.Diagnostics.Process._machineName];ReturnValue;value;dfc-generated |
 | System.Diagnostics;Process;get_MainModule;();Argument[this];ReturnValue;taint;df-generated |
 | System.Diagnostics;Process;get_Modules;();Argument[this];ReturnValue;taint;df-generated |
 | System.Diagnostics;Process;get_ProcessName;();Argument[this];ReturnValue;taint;df-generated |
@@ -7101,60 +7773,55 @@
 | System.Diagnostics;Process;remove_ErrorDataReceived;(System.Diagnostics.DataReceivedEventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Diagnostics;Process;remove_Exited;(System.EventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Diagnostics;Process;remove_OutputDataReceived;(System.Diagnostics.DataReceivedEventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
+| System.Diagnostics;ProcessModule;ToString;();Argument[this].Property[System.Diagnostics.ProcessModule.ModuleName];ReturnValue;taint;dfc-generated |
 | System.Diagnostics;ProcessModule;get_FileName;();Argument[this];ReturnValue;taint;df-generated |
 | System.Diagnostics;ProcessModule;get_ModuleName;();Argument[this];ReturnValue;taint;df-generated |
 | System.Diagnostics;ProcessModuleCollection;CopyTo;(System.Diagnostics.ProcessModule[],System.Int32);Argument[this].Element;Argument[0].Element;value;manual |
-| System.Diagnostics;ProcessModuleCollection;ProcessModuleCollection;(System.Diagnostics.ProcessModule[]);Argument[0].Element;Argument[this];taint;df-generated |
-| System.Diagnostics;ProcessModuleCollection;get_Item;(System.Int32);Argument[this];ReturnValue;taint;df-generated |
+| System.Diagnostics;ProcessModuleCollection;ProcessModuleCollection;(System.Diagnostics.ProcessModule[]);Argument[0].Element;Argument[this].Property[System.Collections.ReadOnlyCollectionBase.InnerList].Element;value;dfc-generated |
+| System.Diagnostics;ProcessModuleCollection;get_Item;(System.Int32);Argument[this].Property[System.Collections.ReadOnlyCollectionBase.InnerList].Element;ReturnValue;value;dfc-generated |
 | System.Diagnostics;ProcessStartInfo;ProcessStartInfo;(System.String);Argument[0];Argument[this].Property[System.Diagnostics.ProcessStartInfo.FileName];value;manual |
 | System.Diagnostics;ProcessStartInfo;ProcessStartInfo;(System.String,System.Collections.Generic.IEnumerable<System.String>);Argument[0];Argument[this];taint;df-generated |
 | System.Diagnostics;ProcessStartInfo;ProcessStartInfo;(System.String,System.String);Argument[0];Argument[this].Property[System.Diagnostics.ProcessStartInfo.FileName];value;manual |
 | System.Diagnostics;ProcessStartInfo;ProcessStartInfo;(System.String,System.String);Argument[1];Argument[this].Property[System.Diagnostics.ProcessStartInfo.Arguments];value;manual |
 | System.Diagnostics;ProcessStartInfo;get_Environment;();Argument[this];ReturnValue;taint;df-generated |
-| System.Diagnostics;ProcessStartInfo;get_EnvironmentVariables;();Argument[this];ReturnValue;taint;df-generated |
+| System.Diagnostics;ProcessStartInfo;get_EnvironmentVariables;();Argument[this].Property[System.Diagnostics.ProcessStartInfo.Environment];ReturnValue.SyntheticField[System.Collections.Specialized.StringDictionaryWrapper._contents];value;dfc-generated |
 | System.Diagnostics;ProcessThreadCollection;Add;(System.Diagnostics.ProcessThread);Argument[0];Argument[this].Element;value;manual |
 | System.Diagnostics;ProcessThreadCollection;CopyTo;(System.Diagnostics.ProcessThread[],System.Int32);Argument[this].Element;Argument[0].Element;value;manual |
-| System.Diagnostics;ProcessThreadCollection;Insert;(System.Int32,System.Diagnostics.ProcessThread);Argument[1];Argument[this];taint;df-generated |
-| System.Diagnostics;ProcessThreadCollection;ProcessThreadCollection;(System.Diagnostics.ProcessThread[]);Argument[0].Element;Argument[this];taint;df-generated |
-| System.Diagnostics;ProcessThreadCollection;get_Item;(System.Int32);Argument[this];ReturnValue;taint;df-generated |
+| System.Diagnostics;ProcessThreadCollection;Insert;(System.Int32,System.Diagnostics.ProcessThread);Argument[1];Argument[this].Property[System.Collections.ReadOnlyCollectionBase.InnerList].Element;value;dfc-generated |
+| System.Diagnostics;ProcessThreadCollection;ProcessThreadCollection;(System.Diagnostics.ProcessThread[]);Argument[0].Element;Argument[this].Property[System.Collections.ReadOnlyCollectionBase.InnerList].Element;value;dfc-generated |
+| System.Diagnostics;ProcessThreadCollection;get_Item;(System.Int32);Argument[this].Property[System.Collections.ReadOnlyCollectionBase.InnerList].Element;ReturnValue;value;dfc-generated |
 | System.Diagnostics;SampleActivity<T>;BeginInvoke;(System.Diagnostics.ActivityCreationOptions<T>,System.AsyncCallback,System.Object);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
 | System.Diagnostics;SourceFilter;SourceFilter;(System.String);Argument[0];Argument[this];taint;df-generated |
-| System.Diagnostics;StackFrame;GetFileName;();Argument[this];ReturnValue;taint;df-generated |
+| System.Diagnostics;StackFrame;GetFileName;();Argument[this].SyntheticField[System.Diagnostics.StackFrame._fileName];ReturnValue;value;dfc-generated |
 | System.Diagnostics;StackFrame;GetMethod;();Argument[this];ReturnValue;taint;df-generated |
-| System.Diagnostics;StackFrame;StackFrame;(System.String,System.Int32);Argument[0];Argument[this];taint;df-generated |
-| System.Diagnostics;StackFrame;StackFrame;(System.String,System.Int32,System.Int32);Argument[0];Argument[this];taint;df-generated |
+| System.Diagnostics;StackFrame;StackFrame;(System.String,System.Int32);Argument[0];Argument[this].SyntheticField[System.Diagnostics.StackFrame._fileName];value;dfc-generated |
+| System.Diagnostics;StackFrame;StackFrame;(System.String,System.Int32,System.Int32);Argument[0];Argument[this].SyntheticField[System.Diagnostics.StackFrame._fileName];value;dfc-generated |
 | System.Diagnostics;StackFrame;ToString;();Argument[this];ReturnValue;taint;df-generated |
-| System.Diagnostics;StackTrace;GetFrame;(System.Int32);Argument[this];ReturnValue;taint;df-generated |
-| System.Diagnostics;StackTrace;StackTrace;(System.Diagnostics.StackFrame);Argument[0];Argument[this];taint;df-generated |
+| System.Diagnostics;StackTrace;GetFrame;(System.Int32);Argument[this].SyntheticField[System.Diagnostics.StackTrace._stackFrames].Element;ReturnValue;value;dfc-generated |
+| System.Diagnostics;StackTrace;StackTrace;(System.Diagnostics.StackFrame);Argument[0];Argument[this].SyntheticField[System.Diagnostics.StackTrace._stackFrames].Element;value;dfc-generated |
 | System.Diagnostics;StackTrace;ToString;();Argument[this];ReturnValue;taint;df-generated |
-| System.Diagnostics;Switch;Switch;(System.String,System.String,System.String);Argument[0];Argument[this];taint;df-generated |
-| System.Diagnostics;Switch;Switch;(System.String,System.String,System.String);Argument[1];Argument[this];taint;df-generated |
-| System.Diagnostics;Switch;Switch;(System.String,System.String,System.String);Argument[2];Argument[this];taint;df-generated |
+| System.Diagnostics;Switch;Switch;(System.String,System.String,System.String);Argument[0];Argument[this].SyntheticField[System.Diagnostics.Switch._displayName];value;dfc-generated |
+| System.Diagnostics;Switch;Switch;(System.String,System.String,System.String);Argument[1];Argument[this].SyntheticField[System.Diagnostics.Switch._description];value;dfc-generated |
+| System.Diagnostics;Switch;Switch;(System.String,System.String,System.String);Argument[2];Argument[this].SyntheticField[System.Diagnostics.Switch._defaultValue];value;dfc-generated |
 | System.Diagnostics;Switch;add_Initializing;(System.EventHandler<System.Diagnostics.InitializingSwitchEventArgs>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
-| System.Diagnostics;Switch;get_DefaultValue;();Argument[this];ReturnValue;taint;df-generated |
-| System.Diagnostics;Switch;get_Description;();Argument[this];ReturnValue;taint;df-generated |
-| System.Diagnostics;Switch;get_DisplayName;();Argument[this];ReturnValue;taint;df-generated |
+| System.Diagnostics;Switch;get_DefaultValue;();Argument[this].SyntheticField[System.Diagnostics.Switch._defaultValue];ReturnValue;value;dfc-generated |
+| System.Diagnostics;Switch;get_Description;();Argument[this].SyntheticField[System.Diagnostics.Switch._description];ReturnValue;value;dfc-generated |
+| System.Diagnostics;Switch;get_DisplayName;();Argument[this].SyntheticField[System.Diagnostics.Switch._displayName];ReturnValue;value;dfc-generated |
 | System.Diagnostics;Switch;remove_Initializing;(System.EventHandler<System.Diagnostics.InitializingSwitchEventArgs>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Diagnostics;SwitchAttribute;SwitchAttribute;(System.String,System.Type);Argument[0];Argument[this];taint;df-generated |
 | System.Diagnostics;TagList+Enumerator;get_Current;();Argument[this];ReturnValue;taint;df-generated |
-| System.Diagnostics;TagList;CopyTo;(System.Span<System.Collections.Generic.KeyValuePair<System.String,System.Object>>);Argument[this];Argument[0];taint;df-generated |
 | System.Diagnostics;TagList;TagList;(System.ReadOnlySpan<System.Collections.Generic.KeyValuePair<System.String,System.Object>>);Argument[0];Argument[this];taint;df-generated |
 | System.Diagnostics;TextWriterTraceListener;TextWriterTraceListener;(System.IO.TextWriter,System.String);Argument[0];Argument[this];taint;df-generated |
 | System.Diagnostics;TextWriterTraceListener;TextWriterTraceListener;(System.String);Argument[0];Argument[this];taint;df-generated |
 | System.Diagnostics;TextWriterTraceListener;TextWriterTraceListener;(System.String,System.String);Argument[0];Argument[this];taint;df-generated |
 | System.Diagnostics;Trace;add_Refreshing;(System.EventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Diagnostics;Trace;remove_Refreshing;(System.EventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
-| System.Diagnostics;TraceListener;Fail;(System.String);Argument[0];Argument[this];taint;df-generated |
-| System.Diagnostics;TraceListener;Fail;(System.String,System.String);Argument[0];Argument[this];taint;df-generated |
-| System.Diagnostics;TraceListener;Fail;(System.String,System.String);Argument[1];Argument[this];taint;df-generated |
 | System.Diagnostics;TraceListener;TraceData;(System.Diagnostics.TraceEventCache,System.String,System.Diagnostics.TraceEventType,System.Int32,System.Object);Argument[0];Argument[this];taint;df-generated |
 | System.Diagnostics;TraceListener;TraceData;(System.Diagnostics.TraceEventCache,System.String,System.Diagnostics.TraceEventType,System.Int32,System.Object);Argument[1];Argument[this];taint;df-generated |
 | System.Diagnostics;TraceListener;TraceData;(System.Diagnostics.TraceEventCache,System.String,System.Diagnostics.TraceEventType,System.Int32,System.Object);Argument[4];Argument[this];taint;df-generated |
 | System.Diagnostics;TraceListener;TraceData;(System.Diagnostics.TraceEventCache,System.String,System.Diagnostics.TraceEventType,System.Int32,System.Object[]);Argument[0];Argument[this];taint;df-generated |
 | System.Diagnostics;TraceListener;TraceData;(System.Diagnostics.TraceEventCache,System.String,System.Diagnostics.TraceEventType,System.Int32,System.Object[]);Argument[1];Argument[this];taint;df-generated |
 | System.Diagnostics;TraceListener;TraceData;(System.Diagnostics.TraceEventCache,System.String,System.Diagnostics.TraceEventType,System.Int32,System.Object[]);Argument[4].Element;Argument[this];taint;df-generated |
-| System.Diagnostics;TraceListener;TraceEvent;(System.Diagnostics.TraceEventCache,System.String,System.Diagnostics.TraceEventType,System.Int32);Argument[0];Argument[this];taint;df-generated |
-| System.Diagnostics;TraceListener;TraceEvent;(System.Diagnostics.TraceEventCache,System.String,System.Diagnostics.TraceEventType,System.Int32);Argument[1];Argument[this];taint;df-generated |
 | System.Diagnostics;TraceListener;TraceEvent;(System.Diagnostics.TraceEventCache,System.String,System.Diagnostics.TraceEventType,System.Int32,System.String);Argument[0];Argument[this];taint;df-generated |
 | System.Diagnostics;TraceListener;TraceEvent;(System.Diagnostics.TraceEventCache,System.String,System.Diagnostics.TraceEventType,System.Int32,System.String);Argument[1];Argument[this];taint;df-generated |
 | System.Diagnostics;TraceListener;TraceEvent;(System.Diagnostics.TraceEventCache,System.String,System.Diagnostics.TraceEventType,System.Int32,System.String);Argument[4];Argument[this];taint;df-generated |
@@ -7163,20 +7830,7 @@
 | System.Diagnostics;TraceListener;TraceEvent;(System.Diagnostics.TraceEventCache,System.String,System.Diagnostics.TraceEventType,System.Int32,System.String,System.Object[]);Argument[4];Argument[this];taint;df-generated |
 | System.Diagnostics;TraceListener;TraceEvent;(System.Diagnostics.TraceEventCache,System.String,System.Diagnostics.TraceEventType,System.Int32,System.String,System.Object[]);Argument[5].Element;Argument[this];taint;df-generated |
 | System.Diagnostics;TraceListener;TraceListener;(System.String);Argument[0];Argument[this];taint;df-generated |
-| System.Diagnostics;TraceListener;TraceTransfer;(System.Diagnostics.TraceEventCache,System.String,System.Int32,System.String,System.Guid);Argument[0];Argument[this];taint;df-generated |
-| System.Diagnostics;TraceListener;TraceTransfer;(System.Diagnostics.TraceEventCache,System.String,System.Int32,System.String,System.Guid);Argument[1];Argument[this];taint;df-generated |
-| System.Diagnostics;TraceListener;Write;(System.Object);Argument[0];Argument[this];taint;df-generated |
-| System.Diagnostics;TraceListener;Write;(System.Object,System.String);Argument[0];Argument[this];taint;df-generated |
-| System.Diagnostics;TraceListener;Write;(System.Object,System.String);Argument[1];Argument[this];taint;df-generated |
 | System.Diagnostics;TraceListener;Write;(System.String);Argument[0];Argument[this];taint;df-generated |
-| System.Diagnostics;TraceListener;Write;(System.String,System.String);Argument[0];Argument[this];taint;df-generated |
-| System.Diagnostics;TraceListener;Write;(System.String,System.String);Argument[1];Argument[this];taint;df-generated |
-| System.Diagnostics;TraceListener;WriteLine;(System.Object);Argument[0];Argument[this];taint;df-generated |
-| System.Diagnostics;TraceListener;WriteLine;(System.Object,System.String);Argument[0];Argument[this];taint;df-generated |
-| System.Diagnostics;TraceListener;WriteLine;(System.Object,System.String);Argument[1];Argument[this];taint;df-generated |
-| System.Diagnostics;TraceListener;WriteLine;(System.String);Argument[0];Argument[this];taint;df-generated |
-| System.Diagnostics;TraceListener;WriteLine;(System.String,System.String);Argument[0];Argument[this];taint;df-generated |
-| System.Diagnostics;TraceListener;WriteLine;(System.String,System.String);Argument[1];Argument[this];taint;df-generated |
 | System.Diagnostics;TraceListenerCollection;Add;(System.Diagnostics.TraceListener);Argument[0];Argument[this].Element;value;manual |
 | System.Diagnostics;TraceListenerCollection;AddRange;(System.Diagnostics.TraceListenerCollection);Argument[0].Element;Argument[this].Element;value;manual |
 | System.Diagnostics;TraceListenerCollection;AddRange;(System.Diagnostics.TraceListener[]);Argument[0].Element;Argument[this].Element;value;manual |
@@ -7185,18 +7839,17 @@
 | System.Diagnostics;TraceListenerCollection;get_Item;(System.Int32);Argument[this].Element;ReturnValue;value;manual |
 | System.Diagnostics;TraceListenerCollection;get_Item;(System.String);Argument[this].Element;ReturnValue;value;manual |
 | System.Diagnostics;TraceListenerCollection;set_Item;(System.Int32,System.Diagnostics.TraceListener);Argument[1];Argument[this].Element;value;manual |
-| System.Diagnostics;TraceSource;TraceSource;(System.String,System.Diagnostics.SourceLevels);Argument[0];Argument[this];taint;df-generated |
+| System.Diagnostics;TraceSource;TraceSource;(System.String,System.Diagnostics.SourceLevels);Argument[0];Argument[this].SyntheticField[System.Diagnostics.TraceSource._sourceName];value;dfc-generated |
 | System.Diagnostics;TraceSource;add_Initializing;(System.EventHandler<System.Diagnostics.InitializingTraceSourceEventArgs>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Diagnostics;TraceSource;get_Listeners;();Argument[this];ReturnValue;taint;df-generated |
-| System.Diagnostics;TraceSource;get_Name;();Argument[this];ReturnValue;taint;df-generated |
+| System.Diagnostics;TraceSource;get_Name;();Argument[this].SyntheticField[System.Diagnostics.TraceSource._sourceName];ReturnValue;value;dfc-generated |
 | System.Diagnostics;TraceSource;remove_Initializing;(System.EventHandler<System.Diagnostics.InitializingTraceSourceEventArgs>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Drawing.Imaging;PlayRecordCallback;BeginInvoke;(System.Drawing.Imaging.EmfPlusRecordType,System.Int32,System.Int32,System.IntPtr,System.AsyncCallback,System.Object);Argument[4];Argument[4].Parameter[delegate-self];value;hq-generated |
-| System.Drawing.Printing;MarginsConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[0];ReturnValue;taint;df-generated |
-| System.Drawing.Printing;MarginsConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue;taint;df-generated |
-| System.Drawing.Printing;MarginsConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[this];ReturnValue;taint;df-generated |
-| System.Drawing.Printing;MarginsConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[1];ReturnValue;taint;df-generated |
-| System.Drawing.Printing;MarginsConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[2];ReturnValue;taint;df-generated |
-| System.Drawing.Printing;MarginsConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[this];ReturnValue;taint;df-generated |
+| System.Drawing.Printing;MarginsConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue.Element;taint;dfc-generated |
+| System.Drawing.Printing;MarginsConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue;taint;dfc-generated |
+| System.Drawing.Printing;MarginsConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue;value;dfc-generated |
+| System.Drawing.Printing;MarginsConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[2].Element;ReturnValue;taint;dfc-generated |
+| System.Drawing.Printing;MarginsConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[2];ReturnValue;taint;dfc-generated |
 | System.Drawing.Printing;PrintDocument;add_BeginPrint;(System.Drawing.Printing.PrintEventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Drawing.Printing;PrintDocument;add_EndPrint;(System.Drawing.Printing.PrintEventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Drawing.Printing;PrintDocument;add_PrintPage;(System.Drawing.Printing.PrintPageEventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
@@ -7208,32 +7861,32 @@
 | System.Drawing.Printing;PrintEventHandler;BeginInvoke;(System.Object,System.Drawing.Printing.PrintEventArgs,System.AsyncCallback,System.Object);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
 | System.Drawing.Printing;PrintPageEventHandler;BeginInvoke;(System.Object,System.Drawing.Printing.PrintPageEventArgs,System.AsyncCallback,System.Object);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
 | System.Drawing.Printing;QueryPageSettingsEventHandler;BeginInvoke;(System.Object,System.Drawing.Printing.QueryPageSettingsEventArgs,System.AsyncCallback,System.Object);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
-| System.Drawing;Color;FromName;(System.String);Argument[0];ReturnValue;taint;df-generated |
-| System.Drawing;Color;ToString;();Argument[this];ReturnValue;taint;df-generated |
-| System.Drawing;Color;get_Name;();Argument[this];ReturnValue;taint;df-generated |
-| System.Drawing;ColorConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[0];ReturnValue;taint;df-generated |
-| System.Drawing;ColorConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue;taint;df-generated |
-| System.Drawing;ColorConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[this];ReturnValue;taint;df-generated |
-| System.Drawing;ColorConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[1];ReturnValue;taint;df-generated |
-| System.Drawing;ColorConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[2];ReturnValue;taint;df-generated |
-| System.Drawing;ColorConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[this];ReturnValue;taint;df-generated |
-| System.Drawing;ColorConverter;GetStandardValues;(System.ComponentModel.ITypeDescriptorContext);Argument[0];ReturnValue;taint;df-generated |
+| System.Drawing;Color;FromName;(System.String);Argument[0];ReturnValue.SyntheticField[System.Drawing.Color.name];value;dfc-generated |
+| System.Drawing;Color;ToString;();Argument[this].Property[System.Drawing.Color.Name];ReturnValue;taint;dfc-generated |
+| System.Drawing;Color;ToString;();Argument[this].SyntheticField[System.Drawing.Color.name];ReturnValue;taint;dfc-generated |
+| System.Drawing;Color;get_Name;();Argument[this].SyntheticField[System.Drawing.Color.name];ReturnValue;value;dfc-generated |
+| System.Drawing;ColorConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue.Element;taint;dfc-generated |
+| System.Drawing;ColorConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue;taint;dfc-generated |
+| System.Drawing;ColorConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue;value;dfc-generated |
+| System.Drawing;ColorConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[1].Property[System.Globalization.CultureInfo.TextInfo].Property[System.Globalization.TextInfo.ListSeparator];ReturnValue;taint;dfc-generated |
+| System.Drawing;ColorConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[2].Element;ReturnValue;taint;dfc-generated |
+| System.Drawing;ColorConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[2];ReturnValue;taint;dfc-generated |
 | System.Drawing;ColorConverter;GetStandardValues;(System.ComponentModel.ITypeDescriptorContext);Argument[this];ReturnValue;taint;df-generated |
-| System.Drawing;ColorTranslator;FromHtml;(System.String);Argument[0];ReturnValue;taint;df-generated |
-| System.Drawing;ColorTranslator;ToHtml;(System.Drawing.Color);Argument[0];ReturnValue;taint;df-generated |
-| System.Drawing;FontConverter+FontNameConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[0];ReturnValue;taint;df-generated |
-| System.Drawing;FontConverter+FontNameConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue;taint;df-generated |
-| System.Drawing;FontConverter+FontNameConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[this];ReturnValue;taint;df-generated |
-| System.Drawing;FontConverter+FontNameConverter;GetStandardValues;(System.ComponentModel.ITypeDescriptorContext);Argument[0];ReturnValue;taint;df-generated |
+| System.Drawing;ColorTranslator;ToHtml;(System.Drawing.Color);Argument[0].Property[System.Drawing.Color.Name];ReturnValue;value;dfc-generated |
+| System.Drawing;ColorTranslator;ToHtml;(System.Drawing.Color);Argument[0].SyntheticField[System.Drawing.Color.name];ReturnValue;value;dfc-generated |
+| System.Drawing;FontConverter+FontNameConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue.Element;taint;dfc-generated |
+| System.Drawing;FontConverter+FontNameConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue;taint;dfc-generated |
+| System.Drawing;FontConverter+FontNameConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue;value;dfc-generated |
 | System.Drawing;FontConverter+FontNameConverter;GetStandardValues;(System.ComponentModel.ITypeDescriptorContext);Argument[this];ReturnValue;taint;df-generated |
-| System.Drawing;FontConverter+FontUnitConverter;GetStandardValues;(System.ComponentModel.ITypeDescriptorContext);Argument[0];ReturnValue;taint;df-generated |
+| System.Drawing;FontConverter+FontUnitConverter;GetStandardValues;(System.ComponentModel.ITypeDescriptorContext);Argument[this].Property[System.ComponentModel.EnumConverter.Values];ReturnValue;value;df-generated |
+| System.Drawing;FontConverter+FontUnitConverter;GetStandardValues;(System.ComponentModel.ITypeDescriptorContext);Argument[this].Property[System.ComponentModel.EnumConverter.Values];ReturnValue;value;dfc-generated |
 | System.Drawing;FontConverter+FontUnitConverter;GetStandardValues;(System.ComponentModel.ITypeDescriptorContext);Argument[this];ReturnValue;taint;df-generated |
-| System.Drawing;FontConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[0];ReturnValue;taint;df-generated |
-| System.Drawing;FontConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue;taint;df-generated |
-| System.Drawing;FontConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[this];ReturnValue;taint;df-generated |
-| System.Drawing;FontConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[1];ReturnValue;taint;df-generated |
-| System.Drawing;FontConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[2];ReturnValue;taint;df-generated |
-| System.Drawing;FontConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[this];ReturnValue;taint;df-generated |
+| System.Drawing;FontConverter+FontUnitConverter;GetStandardValues;(System.ComponentModel.ITypeDescriptorContext);Argument[this];ReturnValue;taint;dfc-generated |
+| System.Drawing;FontConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue.Element;taint;dfc-generated |
+| System.Drawing;FontConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue;taint;dfc-generated |
+| System.Drawing;FontConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue;value;dfc-generated |
+| System.Drawing;FontConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[2].Element;ReturnValue;taint;dfc-generated |
+| System.Drawing;FontConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[2];ReturnValue;taint;dfc-generated |
 | System.Drawing;FontConverter;GetProperties;(System.ComponentModel.ITypeDescriptorContext,System.Object,System.Attribute[]);Argument[1];ReturnValue;taint;df-generated |
 | System.Drawing;Graphics+DrawImageAbort;BeginInvoke;(System.IntPtr,System.AsyncCallback,System.Object);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
 | System.Drawing;Graphics+EnumerateMetafileProc;BeginInvoke;(System.Drawing.Imaging.EmfPlusRecordType,System.Int32,System.Int32,System.IntPtr,System.Drawing.Imaging.PlayRecordCallback,System.AsyncCallback,System.Object);Argument[4];Argument[4].Parameter[delegate-self];value;hq-generated |
@@ -7283,141 +7936,114 @@
 | System.Drawing;Graphics;EnumerateMetafile;(System.Drawing.Imaging.Metafile,System.Drawing.RectangleF,System.Drawing.RectangleF,System.Drawing.GraphicsUnit,System.Drawing.Graphics+EnumerateMetafileProc);Argument[4];Argument[4].Parameter[delegate-self];value;hq-generated |
 | System.Drawing;Graphics;EnumerateMetafile;(System.Drawing.Imaging.Metafile,System.Drawing.RectangleF,System.Drawing.RectangleF,System.Drawing.GraphicsUnit,System.Drawing.Graphics+EnumerateMetafileProc,System.IntPtr);Argument[4];Argument[4].Parameter[delegate-self];value;hq-generated |
 | System.Drawing;Graphics;EnumerateMetafile;(System.Drawing.Imaging.Metafile,System.Drawing.RectangleF,System.Drawing.RectangleF,System.Drawing.GraphicsUnit,System.Drawing.Graphics+EnumerateMetafileProc,System.IntPtr,System.Drawing.Imaging.ImageAttributes);Argument[4];Argument[4].Parameter[delegate-self];value;hq-generated |
-| System.Drawing;IconConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[0];ReturnValue;taint;df-generated |
-| System.Drawing;IconConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue;taint;df-generated |
-| System.Drawing;IconConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[this];ReturnValue;taint;df-generated |
-| System.Drawing;IconConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[1];ReturnValue;taint;df-generated |
-| System.Drawing;IconConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[2];ReturnValue;taint;df-generated |
-| System.Drawing;IconConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[this];ReturnValue;taint;df-generated |
+| System.Drawing;IconConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue.Element;taint;dfc-generated |
+| System.Drawing;IconConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue;taint;dfc-generated |
+| System.Drawing;IconConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue;value;dfc-generated |
+| System.Drawing;IconConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[2].Element;ReturnValue;taint;dfc-generated |
+| System.Drawing;IconConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[2];ReturnValue;taint;dfc-generated |
 | System.Drawing;Image+GetThumbnailImageAbort;BeginInvoke;(System.AsyncCallback,System.Object);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Drawing;Image;GetThumbnailImage;(System.Int32,System.Int32,System.Drawing.Image+GetThumbnailImageAbort,System.IntPtr);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
 | System.Drawing;ImageAnimator;Animate;(System.Drawing.Image,System.EventHandler);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
 | System.Drawing;ImageAnimator;StopAnimate;(System.Drawing.Image,System.EventHandler);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
-| System.Drawing;ImageConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[0];ReturnValue;taint;df-generated |
-| System.Drawing;ImageConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue;taint;df-generated |
-| System.Drawing;ImageConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[this];ReturnValue;taint;df-generated |
-| System.Drawing;ImageConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[1];ReturnValue;taint;df-generated |
-| System.Drawing;ImageConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[2];ReturnValue;taint;df-generated |
-| System.Drawing;ImageConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[this];ReturnValue;taint;df-generated |
+| System.Drawing;ImageConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue.Element;taint;dfc-generated |
+| System.Drawing;ImageConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue;taint;dfc-generated |
+| System.Drawing;ImageConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue;value;dfc-generated |
+| System.Drawing;ImageConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[2].Element;ReturnValue;taint;dfc-generated |
+| System.Drawing;ImageConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[2];ReturnValue;taint;dfc-generated |
 | System.Drawing;ImageConverter;GetProperties;(System.ComponentModel.ITypeDescriptorContext,System.Object,System.Attribute[]);Argument[1];ReturnValue;taint;df-generated |
-| System.Drawing;ImageFormatConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[0];ReturnValue;taint;df-generated |
-| System.Drawing;ImageFormatConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue;taint;df-generated |
-| System.Drawing;ImageFormatConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[this];ReturnValue;taint;df-generated |
-| System.Drawing;ImageFormatConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[1];ReturnValue;taint;df-generated |
-| System.Drawing;ImageFormatConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[2];ReturnValue;taint;df-generated |
-| System.Drawing;ImageFormatConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[this];ReturnValue;taint;df-generated |
-| System.Drawing;ImageFormatConverter;GetStandardValues;(System.ComponentModel.ITypeDescriptorContext);Argument[0];ReturnValue;taint;df-generated |
+| System.Drawing;ImageFormatConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue.Element;taint;dfc-generated |
+| System.Drawing;ImageFormatConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue;taint;dfc-generated |
+| System.Drawing;ImageFormatConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue;value;dfc-generated |
+| System.Drawing;ImageFormatConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[2].Element;ReturnValue;taint;dfc-generated |
+| System.Drawing;ImageFormatConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[2];ReturnValue;taint;dfc-generated |
 | System.Drawing;ImageFormatConverter;GetStandardValues;(System.ComponentModel.ITypeDescriptorContext);Argument[this];ReturnValue;taint;df-generated |
-| System.Drawing;PointConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[0];ReturnValue;taint;df-generated |
-| System.Drawing;PointConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue;taint;df-generated |
-| System.Drawing;PointConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[this];ReturnValue;taint;df-generated |
-| System.Drawing;PointConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[1];ReturnValue;taint;df-generated |
-| System.Drawing;PointConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[2];ReturnValue;taint;df-generated |
-| System.Drawing;PointConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[this];ReturnValue;taint;df-generated |
+| System.Drawing;PointConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue.Element;taint;dfc-generated |
+| System.Drawing;PointConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue;taint;dfc-generated |
+| System.Drawing;PointConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue;value;dfc-generated |
+| System.Drawing;PointConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[1].Property[System.Globalization.CultureInfo.TextInfo].Property[System.Globalization.TextInfo.ListSeparator];ReturnValue;taint;dfc-generated |
+| System.Drawing;PointConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[2].Element;ReturnValue;taint;dfc-generated |
+| System.Drawing;PointConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[2];ReturnValue;taint;dfc-generated |
 | System.Drawing;PointConverter;GetProperties;(System.ComponentModel.ITypeDescriptorContext,System.Object,System.Attribute[]);Argument[1];ReturnValue;taint;df-generated |
-| System.Drawing;Rectangle;Inflate;(System.Drawing.Rectangle,System.Int32,System.Int32);Argument[0];ReturnValue;taint;df-generated |
-| System.Drawing;RectangleConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[0];ReturnValue;taint;df-generated |
-| System.Drawing;RectangleConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue;taint;df-generated |
-| System.Drawing;RectangleConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[this];ReturnValue;taint;df-generated |
-| System.Drawing;RectangleConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[1];ReturnValue;taint;df-generated |
-| System.Drawing;RectangleConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[2];ReturnValue;taint;df-generated |
-| System.Drawing;RectangleConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[this];ReturnValue;taint;df-generated |
+| System.Drawing;Rectangle;Inflate;(System.Drawing.Rectangle,System.Int32,System.Int32);Argument[0];ReturnValue;value;dfc-generated |
+| System.Drawing;RectangleConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue.Element;taint;dfc-generated |
+| System.Drawing;RectangleConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue;taint;dfc-generated |
+| System.Drawing;RectangleConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue;value;dfc-generated |
+| System.Drawing;RectangleConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[1].Property[System.Globalization.CultureInfo.TextInfo].Property[System.Globalization.TextInfo.ListSeparator];ReturnValue;taint;dfc-generated |
+| System.Drawing;RectangleConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[2].Element;ReturnValue;taint;dfc-generated |
+| System.Drawing;RectangleConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[2];ReturnValue;taint;dfc-generated |
 | System.Drawing;RectangleConverter;GetProperties;(System.ComponentModel.ITypeDescriptorContext,System.Object,System.Attribute[]);Argument[1];ReturnValue;taint;df-generated |
-| System.Drawing;RectangleF;Inflate;(System.Drawing.RectangleF,System.Single,System.Single);Argument[0];ReturnValue;taint;df-generated |
-| System.Drawing;SizeConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[0];ReturnValue;taint;df-generated |
-| System.Drawing;SizeConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue;taint;df-generated |
-| System.Drawing;SizeConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[this];ReturnValue;taint;df-generated |
-| System.Drawing;SizeConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[1];ReturnValue;taint;df-generated |
-| System.Drawing;SizeConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[2];ReturnValue;taint;df-generated |
-| System.Drawing;SizeConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[this];ReturnValue;taint;df-generated |
+| System.Drawing;RectangleF;Inflate;(System.Drawing.RectangleF,System.Single,System.Single);Argument[0];ReturnValue;value;dfc-generated |
+| System.Drawing;SizeConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue.Element;taint;dfc-generated |
+| System.Drawing;SizeConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue;taint;dfc-generated |
+| System.Drawing;SizeConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue;value;dfc-generated |
+| System.Drawing;SizeConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[1].Property[System.Globalization.CultureInfo.TextInfo].Property[System.Globalization.TextInfo.ListSeparator];ReturnValue;taint;dfc-generated |
+| System.Drawing;SizeConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[2].Element;ReturnValue;taint;dfc-generated |
+| System.Drawing;SizeConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[2];ReturnValue;taint;dfc-generated |
 | System.Drawing;SizeConverter;GetProperties;(System.ComponentModel.ITypeDescriptorContext,System.Object,System.Attribute[]);Argument[1];ReturnValue;taint;df-generated |
-| System.Drawing;SizeFConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[0];ReturnValue;taint;df-generated |
-| System.Drawing;SizeFConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue;taint;df-generated |
-| System.Drawing;SizeFConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[this];ReturnValue;taint;df-generated |
-| System.Drawing;SizeFConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[1];ReturnValue;taint;df-generated |
-| System.Drawing;SizeFConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[2];ReturnValue;taint;df-generated |
-| System.Drawing;SizeFConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[this];ReturnValue;taint;df-generated |
+| System.Drawing;SizeFConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue.Element;taint;dfc-generated |
+| System.Drawing;SizeFConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue;taint;dfc-generated |
+| System.Drawing;SizeFConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue;value;dfc-generated |
+| System.Drawing;SizeFConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[1].Property[System.Globalization.CultureInfo.TextInfo].Property[System.Globalization.TextInfo.ListSeparator];ReturnValue;taint;dfc-generated |
+| System.Drawing;SizeFConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[2].Element;ReturnValue;taint;dfc-generated |
+| System.Drawing;SizeFConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[2];ReturnValue;taint;dfc-generated |
 | System.Drawing;SizeFConverter;GetProperties;(System.ComponentModel.ITypeDescriptorContext,System.Object,System.Attribute[]);Argument[1];ReturnValue;taint;df-generated |
-| System.Dynamic;BinaryOperationBinder;FallbackBinaryOperation;(System.Dynamic.DynamicMetaObject,System.Dynamic.DynamicMetaObject,System.Dynamic.DynamicMetaObject);Argument[2];ReturnValue;taint;df-generated |
+| System.Dynamic;BinaryOperationBinder;FallbackBinaryOperation;(System.Dynamic.DynamicMetaObject,System.Dynamic.DynamicMetaObject,System.Dynamic.DynamicMetaObject);Argument[2];ReturnValue;value;dfc-generated |
 | System.Dynamic;BindingRestrictions;Combine;(System.Collections.Generic.IList<System.Dynamic.DynamicMetaObject>);Argument[0].Element;ReturnValue;taint;df-generated |
 | System.Dynamic;BindingRestrictions;GetExpressionRestriction;(System.Linq.Expressions.Expression);Argument[0];ReturnValue;taint;df-generated |
 | System.Dynamic;BindingRestrictions;GetInstanceRestriction;(System.Linq.Expressions.Expression,System.Object);Argument[0];ReturnValue;taint;df-generated |
 | System.Dynamic;BindingRestrictions;GetInstanceRestriction;(System.Linq.Expressions.Expression,System.Object);Argument[1];ReturnValue;taint;df-generated |
 | System.Dynamic;BindingRestrictions;GetTypeRestriction;(System.Linq.Expressions.Expression,System.Type);Argument[0];ReturnValue;taint;df-generated |
-| System.Dynamic;BindingRestrictions;Merge;(System.Dynamic.BindingRestrictions);Argument[this];ReturnValue;value;df-generated |
+| System.Dynamic;BindingRestrictions;Merge;(System.Dynamic.BindingRestrictions);Argument[0];ReturnValue;value;dfc-generated |
+| System.Dynamic;BindingRestrictions;Merge;(System.Dynamic.BindingRestrictions);Argument[this];ReturnValue;value;dfc-generated |
 | System.Dynamic;BindingRestrictions;ToExpression;();Argument[this];ReturnValue;taint;df-generated |
-| System.Dynamic;ConvertBinder;FallbackConvert;(System.Dynamic.DynamicMetaObject,System.Dynamic.DynamicMetaObject);Argument[1];ReturnValue;taint;df-generated |
-| System.Dynamic;DynamicMetaObject;Create;(System.Object,System.Linq.Expressions.Expression);Argument[0];ReturnValue;taint;df-generated |
-| System.Dynamic;DynamicMetaObject;DynamicMetaObject;(System.Linq.Expressions.Expression,System.Dynamic.BindingRestrictions,System.Object);Argument[2];Argument[this];taint;df-generated |
-| System.Dynamic;DynamicMetaObject;get_Value;();Argument[this];ReturnValue;taint;df-generated |
+| System.Dynamic;ConvertBinder;FallbackConvert;(System.Dynamic.DynamicMetaObject,System.Dynamic.DynamicMetaObject);Argument[1];ReturnValue;value;dfc-generated |
+| System.Dynamic;DynamicMetaObject;Create;(System.Object,System.Linq.Expressions.Expression);Argument[0];ReturnValue.SyntheticField[System.Dynamic.DynamicMetaObject._value];value;dfc-generated |
+| System.Dynamic;DynamicMetaObject;DynamicMetaObject;(System.Linq.Expressions.Expression,System.Dynamic.BindingRestrictions,System.Object);Argument[2];Argument[this].SyntheticField[System.Dynamic.DynamicMetaObject._value];value;dfc-generated |
+| System.Dynamic;DynamicMetaObject;get_Value;();Argument[this].SyntheticField[System.Dynamic.DynamicMetaObject._value];ReturnValue;value;dfc-generated |
 | System.Dynamic;ExpandoObject;Add;(System.Collections.Generic.KeyValuePair<System.String,System.Object>);Argument[0].Property[System.Collections.Generic.KeyValuePair`2.Key];Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Key];value;manual |
 | System.Dynamic;ExpandoObject;Add;(System.Collections.Generic.KeyValuePair<System.String,System.Object>);Argument[0].Property[System.Collections.Generic.KeyValuePair`2.Value];Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Value];value;manual |
 | System.Dynamic;ExpandoObject;TryGetValue;(System.String,System.Object);Argument[this];ReturnValue;taint;df-generated |
-| System.Dynamic;GetIndexBinder;FallbackGetIndex;(System.Dynamic.DynamicMetaObject,System.Dynamic.DynamicMetaObject[],System.Dynamic.DynamicMetaObject);Argument[2];ReturnValue;taint;df-generated |
-| System.Dynamic;GetMemberBinder;FallbackGetMember;(System.Dynamic.DynamicMetaObject,System.Dynamic.DynamicMetaObject);Argument[1];ReturnValue;taint;df-generated |
-| System.Dynamic;InvokeBinder;FallbackInvoke;(System.Dynamic.DynamicMetaObject,System.Dynamic.DynamicMetaObject[],System.Dynamic.DynamicMetaObject);Argument[2];ReturnValue;taint;df-generated |
-| System.Dynamic;InvokeMemberBinder;FallbackInvokeMember;(System.Dynamic.DynamicMetaObject,System.Dynamic.DynamicMetaObject[],System.Dynamic.DynamicMetaObject);Argument[2];ReturnValue;taint;df-generated |
-| System.Dynamic;SetIndexBinder;FallbackSetIndex;(System.Dynamic.DynamicMetaObject,System.Dynamic.DynamicMetaObject[],System.Dynamic.DynamicMetaObject,System.Dynamic.DynamicMetaObject);Argument[3];ReturnValue;taint;df-generated |
-| System.Dynamic;SetMemberBinder;FallbackSetMember;(System.Dynamic.DynamicMetaObject,System.Dynamic.DynamicMetaObject,System.Dynamic.DynamicMetaObject);Argument[2];ReturnValue;taint;df-generated |
-| System.Dynamic;UnaryOperationBinder;FallbackUnaryOperation;(System.Dynamic.DynamicMetaObject,System.Dynamic.DynamicMetaObject);Argument[1];ReturnValue;taint;df-generated |
-| System.Formats.Asn1;AsnDecoder;ReadBitString;(System.ReadOnlySpan<System.Byte>,System.Formats.Asn1.AsnEncodingRules,System.Int32,System.Int32,System.Nullable<System.Formats.Asn1.Asn1Tag>);Argument[0];ReturnValue;taint;df-generated |
-| System.Formats.Asn1;AsnDecoder;ReadEnumeratedBytes;(System.ReadOnlySpan<System.Byte>,System.Formats.Asn1.AsnEncodingRules,System.Int32,System.Nullable<System.Formats.Asn1.Asn1Tag>);Argument[0];ReturnValue;taint;df-generated |
-| System.Formats.Asn1;AsnDecoder;ReadIntegerBytes;(System.ReadOnlySpan<System.Byte>,System.Formats.Asn1.AsnEncodingRules,System.Int32,System.Nullable<System.Formats.Asn1.Asn1Tag>);Argument[0];ReturnValue;taint;df-generated |
-| System.Formats.Asn1;AsnDecoder;ReadOctetString;(System.ReadOnlySpan<System.Byte>,System.Formats.Asn1.AsnEncodingRules,System.Int32,System.Nullable<System.Formats.Asn1.Asn1Tag>);Argument[0];ReturnValue;taint;df-generated |
-| System.Formats.Asn1;AsnDecoder;TryReadBitString;(System.ReadOnlySpan<System.Byte>,System.Span<System.Byte>,System.Formats.Asn1.AsnEncodingRules,System.Int32,System.Int32,System.Int32,System.Nullable<System.Formats.Asn1.Asn1Tag>);Argument[0];Argument[1];taint;df-generated |
-| System.Formats.Asn1;AsnDecoder;TryReadCharacterStringBytes;(System.ReadOnlySpan<System.Byte>,System.Span<System.Byte>,System.Formats.Asn1.AsnEncodingRules,System.Formats.Asn1.Asn1Tag,System.Int32,System.Int32);Argument[0];Argument[1];taint;df-generated |
-| System.Formats.Asn1;AsnDecoder;TryReadOctetString;(System.ReadOnlySpan<System.Byte>,System.Span<System.Byte>,System.Formats.Asn1.AsnEncodingRules,System.Int32,System.Int32,System.Nullable<System.Formats.Asn1.Asn1Tag>);Argument[0];Argument[1];taint;df-generated |
-| System.Formats.Asn1;AsnDecoder;TryReadPrimitiveBitString;(System.ReadOnlySpan<System.Byte>,System.Formats.Asn1.AsnEncodingRules,System.Int32,System.ReadOnlySpan<System.Byte>,System.Int32,System.Nullable<System.Formats.Asn1.Asn1Tag>);Argument[0];ReturnValue;taint;df-generated |
-| System.Formats.Asn1;AsnDecoder;TryReadPrimitiveCharacterStringBytes;(System.ReadOnlySpan<System.Byte>,System.Formats.Asn1.AsnEncodingRules,System.Formats.Asn1.Asn1Tag,System.ReadOnlySpan<System.Byte>,System.Int32);Argument[0];ReturnValue;taint;df-generated |
-| System.Formats.Asn1;AsnDecoder;TryReadPrimitiveOctetString;(System.ReadOnlySpan<System.Byte>,System.Formats.Asn1.AsnEncodingRules,System.ReadOnlySpan<System.Byte>,System.Int32,System.Nullable<System.Formats.Asn1.Asn1Tag>);Argument[0];ReturnValue;taint;df-generated |
+| System.Dynamic;GetIndexBinder;FallbackGetIndex;(System.Dynamic.DynamicMetaObject,System.Dynamic.DynamicMetaObject[],System.Dynamic.DynamicMetaObject);Argument[2];ReturnValue;value;dfc-generated |
+| System.Dynamic;GetMemberBinder;FallbackGetMember;(System.Dynamic.DynamicMetaObject,System.Dynamic.DynamicMetaObject);Argument[1];ReturnValue;value;dfc-generated |
+| System.Dynamic;InvokeBinder;FallbackInvoke;(System.Dynamic.DynamicMetaObject,System.Dynamic.DynamicMetaObject[],System.Dynamic.DynamicMetaObject);Argument[2];ReturnValue;value;dfc-generated |
+| System.Dynamic;InvokeMemberBinder;FallbackInvokeMember;(System.Dynamic.DynamicMetaObject,System.Dynamic.DynamicMetaObject[],System.Dynamic.DynamicMetaObject);Argument[2];ReturnValue;value;dfc-generated |
+| System.Dynamic;SetIndexBinder;FallbackSetIndex;(System.Dynamic.DynamicMetaObject,System.Dynamic.DynamicMetaObject[],System.Dynamic.DynamicMetaObject,System.Dynamic.DynamicMetaObject);Argument[3];ReturnValue;value;dfc-generated |
+| System.Dynamic;SetMemberBinder;FallbackSetMember;(System.Dynamic.DynamicMetaObject,System.Dynamic.DynamicMetaObject,System.Dynamic.DynamicMetaObject);Argument[2];ReturnValue;value;dfc-generated |
+| System.Dynamic;UnaryOperationBinder;FallbackUnaryOperation;(System.Dynamic.DynamicMetaObject,System.Dynamic.DynamicMetaObject);Argument[1];ReturnValue;value;dfc-generated |
+| System.Formats.Asn1;AsnDecoder;ReadBitString;(System.ReadOnlySpan<System.Byte>,System.Formats.Asn1.AsnEncodingRules,System.Int32,System.Int32,System.Nullable<System.Formats.Asn1.Asn1Tag>);Argument[0].Element;ReturnValue.Element;value;dfc-generated |
+| System.Formats.Asn1;AsnDecoder;ReadEnumeratedBytes;(System.ReadOnlySpan<System.Byte>,System.Formats.Asn1.AsnEncodingRules,System.Int32,System.Nullable<System.Formats.Asn1.Asn1Tag>);Argument[0].Element;ReturnValue.Element;value;dfc-generated |
+| System.Formats.Asn1;AsnDecoder;ReadIntegerBytes;(System.ReadOnlySpan<System.Byte>,System.Formats.Asn1.AsnEncodingRules,System.Int32,System.Nullable<System.Formats.Asn1.Asn1Tag>);Argument[0].Element;ReturnValue.Element;value;dfc-generated |
+| System.Formats.Asn1;AsnDecoder;ReadOctetString;(System.ReadOnlySpan<System.Byte>,System.Formats.Asn1.AsnEncodingRules,System.Int32,System.Nullable<System.Formats.Asn1.Asn1Tag>);Argument[0].Element;ReturnValue.Element;value;dfc-generated |
+| System.Formats.Asn1;AsnDecoder;TryReadBitString;(System.ReadOnlySpan<System.Byte>,System.Span<System.Byte>,System.Formats.Asn1.AsnEncodingRules,System.Int32,System.Int32,System.Int32,System.Nullable<System.Formats.Asn1.Asn1Tag>);Argument[0].Element;Argument[1].Element;value;dfc-generated |
+| System.Formats.Asn1;AsnDecoder;TryReadCharacterStringBytes;(System.ReadOnlySpan<System.Byte>,System.Span<System.Byte>,System.Formats.Asn1.AsnEncodingRules,System.Formats.Asn1.Asn1Tag,System.Int32,System.Int32);Argument[0].Element;Argument[1].Element;value;dfc-generated |
+| System.Formats.Asn1;AsnDecoder;TryReadOctetString;(System.ReadOnlySpan<System.Byte>,System.Span<System.Byte>,System.Formats.Asn1.AsnEncodingRules,System.Int32,System.Int32,System.Nullable<System.Formats.Asn1.Asn1Tag>);Argument[0].Element;Argument[1].Element;value;dfc-generated |
+| System.Formats.Asn1;AsnDecoder;TryReadPrimitiveBitString;(System.ReadOnlySpan<System.Byte>,System.Formats.Asn1.AsnEncodingRules,System.Int32,System.ReadOnlySpan<System.Byte>,System.Int32,System.Nullable<System.Formats.Asn1.Asn1Tag>);Argument[0].Element;ReturnValue.Element;value;dfc-generated |
+| System.Formats.Asn1;AsnDecoder;TryReadPrimitiveCharacterStringBytes;(System.ReadOnlySpan<System.Byte>,System.Formats.Asn1.AsnEncodingRules,System.Formats.Asn1.Asn1Tag,System.ReadOnlySpan<System.Byte>,System.Int32);Argument[0].Element;ReturnValue.Element;value;dfc-generated |
+| System.Formats.Asn1;AsnDecoder;TryReadPrimitiveOctetString;(System.ReadOnlySpan<System.Byte>,System.Formats.Asn1.AsnEncodingRules,System.ReadOnlySpan<System.Byte>,System.Int32,System.Nullable<System.Formats.Asn1.Asn1Tag>);Argument[0].Element;ReturnValue.Element;value;dfc-generated |
 | System.Formats.Asn1;AsnReader;AsnReader;(System.ReadOnlyMemory<System.Byte>,System.Formats.Asn1.AsnEncodingRules,System.Formats.Asn1.AsnReaderOptions);Argument[0];Argument[this];taint;df-generated |
 | System.Formats.Asn1;AsnReader;AsnReader;(System.ReadOnlyMemory<System.Byte>,System.Formats.Asn1.AsnEncodingRules,System.Formats.Asn1.AsnReaderOptions);Argument[2];Argument[this];taint;df-generated |
-| System.Formats.Asn1;AsnReader;Clone;();Argument[this];ReturnValue;taint;df-generated |
-| System.Formats.Asn1;AsnReader;PeekContentBytes;();Argument[this];ReturnValue;taint;df-generated |
-| System.Formats.Asn1;AsnReader;PeekEncodedValue;();Argument[this];ReturnValue;taint;df-generated |
 | System.Formats.Asn1;AsnReader;ReadBitString;(System.Int32,System.Nullable<System.Formats.Asn1.Asn1Tag>);Argument[this];ReturnValue;taint;df-generated |
-| System.Formats.Asn1;AsnReader;ReadEncodedValue;();Argument[this];ReturnValue;taint;df-generated |
-| System.Formats.Asn1;AsnReader;ReadEnumeratedBytes;(System.Nullable<System.Formats.Asn1.Asn1Tag>);Argument[this];ReturnValue;taint;df-generated |
-| System.Formats.Asn1;AsnReader;ReadIntegerBytes;(System.Nullable<System.Formats.Asn1.Asn1Tag>);Argument[this];ReturnValue;taint;df-generated |
 | System.Formats.Asn1;AsnReader;ReadOctetString;(System.Nullable<System.Formats.Asn1.Asn1Tag>);Argument[this];ReturnValue;taint;df-generated |
-| System.Formats.Asn1;AsnReader;ReadSequence;(System.Nullable<System.Formats.Asn1.Asn1Tag>);Argument[this];ReturnValue;taint;df-generated |
-| System.Formats.Asn1;AsnReader;ReadSetOf;(System.Boolean,System.Nullable<System.Formats.Asn1.Asn1Tag>);Argument[this];ReturnValue;taint;df-generated |
-| System.Formats.Asn1;AsnReader;ReadSetOf;(System.Nullable<System.Formats.Asn1.Asn1Tag>);Argument[this];ReturnValue;taint;df-generated |
 | System.Formats.Asn1;AsnReader;TryReadBitString;(System.Span<System.Byte>,System.Int32,System.Int32,System.Nullable<System.Formats.Asn1.Asn1Tag>);Argument[this];Argument[0];taint;df-generated |
 | System.Formats.Asn1;AsnReader;TryReadCharacterStringBytes;(System.Span<System.Byte>,System.Formats.Asn1.Asn1Tag,System.Int32);Argument[this];Argument[0];taint;df-generated |
 | System.Formats.Asn1;AsnReader;TryReadOctetString;(System.Span<System.Byte>,System.Int32,System.Nullable<System.Formats.Asn1.Asn1Tag>);Argument[this];Argument[0];taint;df-generated |
-| System.Formats.Asn1;AsnReader;TryReadPrimitiveBitString;(System.Int32,System.ReadOnlyMemory<System.Byte>,System.Nullable<System.Formats.Asn1.Asn1Tag>);Argument[this];ReturnValue;taint;df-generated |
-| System.Formats.Asn1;AsnReader;TryReadPrimitiveCharacterStringBytes;(System.Formats.Asn1.Asn1Tag,System.ReadOnlyMemory<System.Byte>);Argument[this];ReturnValue;taint;df-generated |
-| System.Formats.Asn1;AsnReader;TryReadPrimitiveOctetString;(System.ReadOnlyMemory<System.Byte>,System.Nullable<System.Formats.Asn1.Asn1Tag>);Argument[this];ReturnValue;taint;df-generated |
-| System.Formats.Asn1;AsnWriter;Encode;();Argument[this];ReturnValue;taint;df-generated |
-| System.Formats.Asn1;AsnWriter;Encode;(System.Span<System.Byte>);Argument[this];Argument[0];taint;df-generated |
 | System.Formats.Asn1;AsnWriter;PushOctetString;(System.Nullable<System.Formats.Asn1.Asn1Tag>);Argument[this];ReturnValue;taint;df-generated |
 | System.Formats.Asn1;AsnWriter;PushSequence;(System.Nullable<System.Formats.Asn1.Asn1Tag>);Argument[this];ReturnValue;taint;df-generated |
 | System.Formats.Asn1;AsnWriter;PushSetOf;(System.Nullable<System.Formats.Asn1.Asn1Tag>);Argument[this];ReturnValue;taint;df-generated |
-| System.Formats.Asn1;AsnWriter;TryEncode;(System.Span<System.Byte>,System.Int32);Argument[this];Argument[0];taint;df-generated |
 | System.Formats.Tar;GnuTarEntry;GnuTarEntry;(System.Formats.Tar.TarEntry);Argument[0];Argument[this];taint;df-generated |
 | System.Formats.Tar;PaxTarEntry;PaxTarEntry;(System.Formats.Tar.TarEntry);Argument[0];Argument[this];taint;df-generated |
-| System.Formats.Tar;TarEntry;ExtractToFileAsync;(System.String,System.Boolean,System.Threading.CancellationToken);Argument[2];ReturnValue;taint;df-generated |
-| System.Formats.Tar;TarEntry;ToString;();Argument[this];ReturnValue;taint;df-generated |
-| System.Formats.Tar;TarFile;CreateFromDirectoryAsync;(System.String,System.IO.Stream,System.Boolean,System.Threading.CancellationToken);Argument[3];ReturnValue;taint;df-generated |
-| System.Formats.Tar;TarFile;CreateFromDirectoryAsync;(System.String,System.String,System.Boolean,System.Threading.CancellationToken);Argument[3];ReturnValue;taint;df-generated |
-| System.Formats.Tar;TarFile;ExtractToDirectoryAsync;(System.IO.Stream,System.String,System.Boolean,System.Threading.CancellationToken);Argument[3];ReturnValue;taint;df-generated |
-| System.Formats.Tar;TarFile;ExtractToDirectoryAsync;(System.String,System.String,System.Boolean,System.Threading.CancellationToken);Argument[3];ReturnValue;taint;df-generated |
+| System.Formats.Tar;TarEntry;ToString;();Argument[this].Property[System.Formats.Tar.TarEntry.Name];ReturnValue;value;dfc-generated |
 | System.Formats.Tar;TarReader;TarReader;(System.IO.Stream,System.Boolean);Argument[0];Argument[this];taint;df-generated |
 | System.Formats.Tar;TarWriter;TarWriter;(System.IO.Stream,System.Formats.Tar.TarEntryFormat,System.Boolean);Argument[0];Argument[this];taint;df-generated |
 | System.Formats.Tar;TarWriter;WriteEntry;(System.Formats.Tar.TarEntry);Argument[0];Argument[this];taint;df-generated |
 | System.Formats.Tar;TarWriter;WriteEntry;(System.String,System.String);Argument[0];Argument[this];taint;df-generated |
 | System.Formats.Tar;TarWriter;WriteEntryAsync;(System.Formats.Tar.TarEntry,System.Threading.CancellationToken);Argument[0];Argument[this];taint;df-generated |
-| System.Formats.Tar;TarWriter;WriteEntryAsync;(System.Formats.Tar.TarEntry,System.Threading.CancellationToken);Argument[1];ReturnValue;taint;df-generated |
 | System.Formats.Tar;TarWriter;WriteEntryAsync;(System.String,System.String,System.Threading.CancellationToken);Argument[0];Argument[this];taint;df-generated |
-| System.Formats.Tar;TarWriter;WriteEntryAsync;(System.String,System.String,System.Threading.CancellationToken);Argument[2];ReturnValue;taint;df-generated |
 | System.Formats.Tar;UstarTarEntry;UstarTarEntry;(System.Formats.Tar.TarEntry);Argument[0];Argument[this];taint;df-generated |
-| System.Globalization;Calendar;ReadOnly;(System.Globalization.Calendar);Argument[0];ReturnValue;taint;df-generated |
-| System.Globalization;CompareInfo;GetSortKey;(System.String);Argument[0];ReturnValue;taint;df-generated |
-| System.Globalization;CompareInfo;GetSortKey;(System.String);Argument[this];ReturnValue;taint;df-generated |
-| System.Globalization;CompareInfo;GetSortKey;(System.String,System.Globalization.CompareOptions);Argument[0];ReturnValue;taint;df-generated |
-| System.Globalization;CompareInfo;GetSortKey;(System.String,System.Globalization.CompareOptions);Argument[this];ReturnValue;taint;df-generated |
-| System.Globalization;CompareInfo;ToString;();Argument[this];ReturnValue;taint;df-generated |
+| System.Globalization;Calendar;ReadOnly;(System.Globalization.Calendar);Argument[0];ReturnValue;value;dfc-generated |
+| System.Globalization;CompareInfo;GetSortKey;(System.String);Argument[0];ReturnValue.SyntheticField[System.Globalization.SortKey._string];value;dfc-generated |
+| System.Globalization;CompareInfo;GetSortKey;(System.String,System.Globalization.CompareOptions);Argument[0];ReturnValue.SyntheticField[System.Globalization.SortKey._string];value;dfc-generated |
+| System.Globalization;CompareInfo;ToString;();Argument[this].Property[System.Globalization.CompareInfo.Name];ReturnValue;taint;dfc-generated |
 | System.Globalization;CompareInfo;get_Name;();Argument[this];ReturnValue;taint;df-generated |
 | System.Globalization;CompareInfo;get_Version;();Argument[this];ReturnValue;taint;df-generated |
 | System.Globalization;CultureInfo;CultureInfo;(System.String,System.Boolean);Argument[0];Argument[this];taint;df-generated |
@@ -7432,43 +8058,48 @@
 | System.Globalization;CultureInfo;get_Calendar;();Argument[this];ReturnValue;taint;df-generated |
 | System.Globalization;CultureInfo;get_DisplayName;();Argument[this];ReturnValue;taint;df-generated |
 | System.Globalization;CultureInfo;get_EnglishName;();Argument[this];ReturnValue;taint;df-generated |
-| System.Globalization;CultureInfo;get_IetfLanguageTag;();Argument[this];ReturnValue;taint;df-generated |
+| System.Globalization;CultureInfo;get_IetfLanguageTag;();Argument[this].Property[System.Globalization.CultureInfo.Name];ReturnValue;value;dfc-generated |
 | System.Globalization;CultureInfo;get_NativeName;();Argument[this];ReturnValue;taint;df-generated |
 | System.Globalization;CultureInfo;get_Parent;();Argument[this];ReturnValue;taint;df-generated |
 | System.Globalization;CultureInfo;get_TextInfo;();Argument[this];ReturnValue;taint;df-generated |
 | System.Globalization;CultureInfo;get_ThreeLetterISOLanguageName;();Argument[this];ReturnValue;taint;df-generated |
 | System.Globalization;CultureInfo;get_ThreeLetterWindowsLanguageName;();Argument[this];ReturnValue;taint;df-generated |
 | System.Globalization;CultureInfo;get_TwoLetterISOLanguageName;();Argument[this];ReturnValue;taint;df-generated |
-| System.Globalization;CultureNotFoundException;CultureNotFoundException;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);Argument[0];Argument[this];taint;df-generated |
-| System.Globalization;CultureNotFoundException;CultureNotFoundException;(System.String,System.String,System.Exception);Argument[1];Argument[this];taint;df-generated |
-| System.Globalization;CultureNotFoundException;CultureNotFoundException;(System.String,System.String,System.String);Argument[1];Argument[this];taint;df-generated |
-| System.Globalization;CultureNotFoundException;get_InvalidCultureId;();Argument[this];ReturnValue;taint;df-generated |
-| System.Globalization;CultureNotFoundException;get_InvalidCultureName;();Argument[this];ReturnValue;taint;df-generated |
-| System.Globalization;CultureNotFoundException;get_Message;();Argument[this];ReturnValue;taint;df-generated |
+| System.Globalization;CultureNotFoundException;CultureNotFoundException;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);Argument[0].SyntheticField[System.Runtime.Serialization.SerializationInfo._values].Element;Argument[this].SyntheticField[System.Globalization.CultureNotFoundException._invalidCultureId];value;dfc-generated |
+| System.Globalization;CultureNotFoundException;CultureNotFoundException;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);Argument[0].SyntheticField[System.Runtime.Serialization.SerializationInfo._values].Element;Argument[this].SyntheticField[System.Globalization.CultureNotFoundException._invalidCultureName];value;dfc-generated |
+| System.Globalization;CultureNotFoundException;CultureNotFoundException;(System.String,System.String,System.Exception);Argument[1];Argument[this].SyntheticField[System.Globalization.CultureNotFoundException._invalidCultureName];value;dfc-generated |
+| System.Globalization;CultureNotFoundException;CultureNotFoundException;(System.String,System.String,System.String);Argument[1];Argument[this].SyntheticField[System.Globalization.CultureNotFoundException._invalidCultureName];value;dfc-generated |
+| System.Globalization;CultureNotFoundException;get_InvalidCultureId;();Argument[this].SyntheticField[System.Globalization.CultureNotFoundException._invalidCultureId];ReturnValue;value;dfc-generated |
+| System.Globalization;CultureNotFoundException;get_InvalidCultureName;();Argument[this].SyntheticField[System.Globalization.CultureNotFoundException._invalidCultureName];ReturnValue;value;dfc-generated |
+| System.Globalization;CultureNotFoundException;get_Message;();Argument[this].Property[System.Exception.Message];ReturnValue;value;dfc-generated |
+| System.Globalization;CultureNotFoundException;get_Message;();Argument[this].SyntheticField[System.ArgumentException._paramName];ReturnValue;taint;dfc-generated |
+| System.Globalization;CultureNotFoundException;get_Message;();Argument[this].SyntheticField[System.Exception._message];ReturnValue;value;dfc-generated |
 | System.Globalization;DateTimeFormatInfo;GetAbbreviatedDayName;(System.DayOfWeek);Argument[this];ReturnValue;taint;df-generated |
 | System.Globalization;DateTimeFormatInfo;GetAbbreviatedEraName;(System.Int32);Argument[this];ReturnValue;taint;df-generated |
 | System.Globalization;DateTimeFormatInfo;GetAbbreviatedMonthName;(System.Int32);Argument[this];ReturnValue;taint;df-generated |
 | System.Globalization;DateTimeFormatInfo;GetAllDateTimePatterns;(System.Char);Argument[this];ReturnValue;taint;df-generated |
 | System.Globalization;DateTimeFormatInfo;GetDayName;(System.DayOfWeek);Argument[this];ReturnValue;taint;df-generated |
 | System.Globalization;DateTimeFormatInfo;GetEraName;(System.Int32);Argument[this];ReturnValue;taint;df-generated |
-| System.Globalization;DateTimeFormatInfo;GetInstance;(System.IFormatProvider);Argument[0];ReturnValue;taint;df-generated |
+| System.Globalization;DateTimeFormatInfo;GetInstance;(System.IFormatProvider);Argument[0].Property[System.Globalization.CultureInfo.DateTimeFormat];ReturnValue;value;dfc-generated |
+| System.Globalization;DateTimeFormatInfo;GetInstance;(System.IFormatProvider);Argument[0];ReturnValue;value;dfc-generated |
 | System.Globalization;DateTimeFormatInfo;GetMonthName;(System.Int32);Argument[this];ReturnValue;taint;df-generated |
 | System.Globalization;DateTimeFormatInfo;GetShortestDayName;(System.DayOfWeek);Argument[this];ReturnValue;taint;df-generated |
-| System.Globalization;DateTimeFormatInfo;ReadOnly;(System.Globalization.DateTimeFormatInfo);Argument[0];ReturnValue;taint;df-generated |
+| System.Globalization;DateTimeFormatInfo;ReadOnly;(System.Globalization.DateTimeFormatInfo);Argument[0];ReturnValue;value;dfc-generated |
 | System.Globalization;DateTimeFormatInfo;SetAllDateTimePatterns;(System.String[],System.Char);Argument[0].Element;Argument[this];taint;df-generated |
-| System.Globalization;DaylightTime;DaylightTime;(System.DateTime,System.DateTime,System.TimeSpan);Argument[2];Argument[this];taint;df-generated |
-| System.Globalization;DaylightTime;get_Delta;();Argument[this];ReturnValue;taint;df-generated |
-| System.Globalization;GlobalizationExtensions;GetStringComparer;(System.Globalization.CompareInfo,System.Globalization.CompareOptions);Argument[0];ReturnValue;taint;df-generated |
-| System.Globalization;IdnMapping;GetAscii;(System.String);Argument[0];ReturnValue;taint;df-generated |
-| System.Globalization;IdnMapping;GetAscii;(System.String,System.Int32);Argument[0];ReturnValue;taint;df-generated |
-| System.Globalization;IdnMapping;GetAscii;(System.String,System.Int32,System.Int32);Argument[0];ReturnValue;taint;df-generated |
-| System.Globalization;IdnMapping;GetUnicode;(System.String);Argument[0];ReturnValue;taint;df-generated |
-| System.Globalization;IdnMapping;GetUnicode;(System.String,System.Int32);Argument[0];ReturnValue;taint;df-generated |
-| System.Globalization;IdnMapping;GetUnicode;(System.String,System.Int32,System.Int32);Argument[0];ReturnValue;taint;df-generated |
-| System.Globalization;NumberFormatInfo;GetInstance;(System.IFormatProvider);Argument[0];ReturnValue;taint;df-generated |
-| System.Globalization;NumberFormatInfo;ReadOnly;(System.Globalization.NumberFormatInfo);Argument[0];ReturnValue;taint;df-generated |
+| System.Globalization;DaylightTime;DaylightTime;(System.DateTime,System.DateTime,System.TimeSpan);Argument[2];Argument[this].SyntheticField[System.Globalization.DaylightTime._delta];value;dfc-generated |
+| System.Globalization;DaylightTime;get_Delta;();Argument[this].SyntheticField[System.Globalization.DaylightTime._delta];ReturnValue;value;dfc-generated |
+| System.Globalization;GlobalizationExtensions;GetStringComparer;(System.Globalization.CompareInfo,System.Globalization.CompareOptions);Argument[0];ReturnValue.SyntheticField[System.CultureAwareComparer._compareInfo];value;dfc-generated |
+| System.Globalization;IdnMapping;GetAscii;(System.String);Argument[0];ReturnValue;value;dfc-generated |
+| System.Globalization;IdnMapping;GetAscii;(System.String,System.Int32);Argument[0];ReturnValue;value;dfc-generated |
+| System.Globalization;IdnMapping;GetAscii;(System.String,System.Int32,System.Int32);Argument[0];ReturnValue;value;dfc-generated |
+| System.Globalization;IdnMapping;GetUnicode;(System.String);Argument[0];ReturnValue;value;dfc-generated |
+| System.Globalization;IdnMapping;GetUnicode;(System.String,System.Int32);Argument[0];ReturnValue;value;dfc-generated |
+| System.Globalization;IdnMapping;GetUnicode;(System.String,System.Int32,System.Int32);Argument[0];ReturnValue;value;dfc-generated |
+| System.Globalization;NumberFormatInfo;GetInstance;(System.IFormatProvider);Argument[0].Property[System.Globalization.CultureInfo.NumberFormat];ReturnValue;value;dfc-generated |
+| System.Globalization;NumberFormatInfo;GetInstance;(System.IFormatProvider);Argument[0];ReturnValue;value;dfc-generated |
+| System.Globalization;NumberFormatInfo;ReadOnly;(System.Globalization.NumberFormatInfo);Argument[0];ReturnValue;value;dfc-generated |
 | System.Globalization;RegionInfo;RegionInfo;(System.String);Argument[0];Argument[this];taint;df-generated |
-| System.Globalization;RegionInfo;ToString;();Argument[this];ReturnValue;taint;df-generated |
+| System.Globalization;RegionInfo;ToString;();Argument[this].Property[System.Globalization.RegionInfo.Name];ReturnValue;value;dfc-generated |
 | System.Globalization;RegionInfo;get_CurrencyEnglishName;();Argument[this];ReturnValue;taint;df-generated |
 | System.Globalization;RegionInfo;get_CurrencyNativeName;();Argument[this];ReturnValue;taint;df-generated |
 | System.Globalization;RegionInfo;get_CurrencySymbol;();Argument[this];ReturnValue;taint;df-generated |
@@ -7478,59 +8109,59 @@
 | System.Globalization;RegionInfo;get_Name;();Argument[this];ReturnValue;taint;df-generated |
 | System.Globalization;RegionInfo;get_NativeName;();Argument[this];ReturnValue;taint;df-generated |
 | System.Globalization;RegionInfo;get_ThreeLetterISORegionName;();Argument[this];ReturnValue;taint;df-generated |
-| System.Globalization;RegionInfo;get_ThreeLetterWindowsRegionName;();Argument[this];ReturnValue;taint;df-generated |
+| System.Globalization;RegionInfo;get_ThreeLetterWindowsRegionName;();Argument[this].Property[System.Globalization.RegionInfo.ThreeLetterISORegionName];ReturnValue;value;dfc-generated |
 | System.Globalization;RegionInfo;get_TwoLetterISORegionName;();Argument[this];ReturnValue;taint;df-generated |
 | System.Globalization;SortKey;ToString;();Argument[this];ReturnValue;taint;df-generated |
 | System.Globalization;SortKey;get_KeyData;();Argument[this];ReturnValue;taint;df-generated |
-| System.Globalization;SortKey;get_OriginalString;();Argument[this];ReturnValue;taint;df-generated |
-| System.Globalization;SortVersion;SortVersion;(System.Int32,System.Guid);Argument[1];Argument[this];taint;df-generated |
-| System.Globalization;SortVersion;get_SortId;();Argument[this];ReturnValue;taint;df-generated |
-| System.Globalization;StringInfo;GetNextTextElement;(System.String);Argument[0];ReturnValue;taint;df-generated |
-| System.Globalization;StringInfo;GetNextTextElement;(System.String,System.Int32);Argument[0];ReturnValue;taint;df-generated |
-| System.Globalization;StringInfo;GetTextElementEnumerator;(System.String);Argument[0];ReturnValue;taint;df-generated |
-| System.Globalization;StringInfo;GetTextElementEnumerator;(System.String,System.Int32);Argument[0];ReturnValue;taint;df-generated |
+| System.Globalization;SortKey;get_OriginalString;();Argument[this].SyntheticField[System.Globalization.SortKey._string];ReturnValue;value;dfc-generated |
+| System.Globalization;SortVersion;SortVersion;(System.Int32,System.Guid);Argument[1];Argument[this].SyntheticField[System.Globalization.SortVersion.m_SortId];value;dfc-generated |
+| System.Globalization;SortVersion;get_SortId;();Argument[this].SyntheticField[System.Globalization.SortVersion.m_SortId];ReturnValue;value;dfc-generated |
+| System.Globalization;StringInfo;GetNextTextElement;(System.String);Argument[0];ReturnValue;value;dfc-generated |
+| System.Globalization;StringInfo;GetNextTextElement;(System.String,System.Int32);Argument[0];ReturnValue;value;dfc-generated |
+| System.Globalization;StringInfo;GetTextElementEnumerator;(System.String);Argument[0];ReturnValue.SyntheticField[System.Globalization.TextElementEnumerator._str];value;dfc-generated |
+| System.Globalization;StringInfo;GetTextElementEnumerator;(System.String,System.Int32);Argument[0];ReturnValue.SyntheticField[System.Globalization.TextElementEnumerator._str];value;dfc-generated |
 | System.Globalization;StringInfo;StringInfo;(System.String);Argument[0];Argument[this];taint;df-generated |
 | System.Globalization;StringInfo;SubstringByTextElements;(System.Int32);Argument[this];ReturnValue;taint;df-generated |
 | System.Globalization;StringInfo;SubstringByTextElements;(System.Int32,System.Int32);Argument[this];ReturnValue;taint;df-generated |
-| System.Globalization;TextElementEnumerator;GetTextElement;();Argument[this];ReturnValue;taint;df-generated |
-| System.Globalization;TextInfo;ReadOnly;(System.Globalization.TextInfo);Argument[0];ReturnValue;taint;df-generated |
-| System.Globalization;TextInfo;ToLower;(System.String);Argument[0];ReturnValue;taint;df-generated |
+| System.Globalization;TextElementEnumerator;GetTextElement;();Argument[this].SyntheticField[System.Globalization.TextElementEnumerator._currentTextElementSubstr];ReturnValue;value;dfc-generated |
+| System.Globalization;TextElementEnumerator;GetTextElement;();Argument[this].SyntheticField[System.Globalization.TextElementEnumerator._str];Argument[this].SyntheticField[System.Globalization.TextElementEnumerator._currentTextElementSubstr];value;dfc-generated |
+| System.Globalization;TextElementEnumerator;GetTextElement;();Argument[this].SyntheticField[System.Globalization.TextElementEnumerator._str];ReturnValue;value;dfc-generated |
+| System.Globalization;TextElementEnumerator;get_Current;();Argument[this].SyntheticField[System.Globalization.TextElementEnumerator._currentTextElementSubstr];ReturnValue;value;df-generated |
+| System.Globalization;TextElementEnumerator;get_Current;();Argument[this].SyntheticField[System.Globalization.TextElementEnumerator._currentTextElementSubstr];ReturnValue;value;dfc-generated |
+| System.Globalization;TextElementEnumerator;get_Current;();Argument[this].SyntheticField[System.Globalization.TextElementEnumerator._str];ReturnValue;value;df-generated |
+| System.Globalization;TextElementEnumerator;get_Current;();Argument[this].SyntheticField[System.Globalization.TextElementEnumerator._str];ReturnValue;value;dfc-generated |
+| System.Globalization;TextInfo;ReadOnly;(System.Globalization.TextInfo);Argument[0];ReturnValue;value;dfc-generated |
+| System.Globalization;TextInfo;ToLower;(System.String);Argument[0];ReturnValue;value;dfc-generated |
 | System.Globalization;TextInfo;ToString;();Argument[this];ReturnValue;taint;df-generated |
-| System.Globalization;TextInfo;ToTitleCase;(System.String);Argument[0];ReturnValue;taint;df-generated |
-| System.Globalization;TextInfo;ToUpper;(System.String);Argument[0];ReturnValue;taint;df-generated |
+| System.Globalization;TextInfo;ToTitleCase;(System.String);Argument[0];ReturnValue;value;dfc-generated |
+| System.Globalization;TextInfo;ToUpper;(System.String);Argument[0];ReturnValue;value;dfc-generated |
 | System.Globalization;TextInfo;get_CultureName;();Argument[this];ReturnValue;taint;df-generated |
-| System.IO.Compression;BrotliStream;BrotliStream;(System.IO.Stream,System.IO.Compression.CompressionMode,System.Boolean);Argument[0];Argument[this];taint;df-generated |
-| System.IO.Compression;BrotliStream;get_BaseStream;();Argument[this];ReturnValue;taint;df-generated |
+| System.IO.Compression;BrotliStream;BrotliStream;(System.IO.Stream,System.IO.Compression.CompressionMode,System.Boolean);Argument[0];Argument[this].SyntheticField[System.IO.Compression.BrotliStream._stream];value;dfc-generated |
+| System.IO.Compression;BrotliStream;get_BaseStream;();Argument[this].SyntheticField[System.IO.Compression.BrotliStream._stream];ReturnValue;value;dfc-generated |
 | System.IO.Compression;DeflateStream;DeflateStream;(System.IO.Stream,System.IO.Compression.CompressionLevel);Argument[0];Argument[this];taint;manual |
 | System.IO.Compression;DeflateStream;DeflateStream;(System.IO.Stream,System.IO.Compression.CompressionLevel,System.Boolean);Argument[0];Argument[this];taint;manual |
 | System.IO.Compression;DeflateStream;DeflateStream;(System.IO.Stream,System.IO.Compression.CompressionMode);Argument[0];Argument[this];taint;manual |
 | System.IO.Compression;DeflateStream;DeflateStream;(System.IO.Stream,System.IO.Compression.CompressionMode,System.Boolean);Argument[0];Argument[this];taint;manual |
 | System.IO.Compression;DeflateStream;get_BaseStream;();Argument[this];ReturnValue;taint;df-generated |
-| System.IO.Compression;GZipStream;GZipStream;(System.IO.Stream,System.IO.Compression.CompressionLevel,System.Boolean);Argument[0];Argument[this];taint;df-generated |
-| System.IO.Compression;GZipStream;GZipStream;(System.IO.Stream,System.IO.Compression.CompressionMode,System.Boolean);Argument[0];Argument[this];taint;df-generated |
-| System.IO.Compression;GZipStream;get_BaseStream;();Argument[this];ReturnValue;taint;df-generated |
-| System.IO.Compression;ZLibStream;ZLibStream;(System.IO.Stream,System.IO.Compression.CompressionLevel,System.Boolean);Argument[0];Argument[this];taint;df-generated |
-| System.IO.Compression;ZLibStream;ZLibStream;(System.IO.Stream,System.IO.Compression.CompressionMode,System.Boolean);Argument[0];Argument[this];taint;df-generated |
-| System.IO.Compression;ZLibStream;get_BaseStream;();Argument[this];ReturnValue;taint;df-generated |
-| System.IO.Compression;ZipArchive;CreateEntry;(System.String);Argument[0];ReturnValue;taint;df-generated |
-| System.IO.Compression;ZipArchive;CreateEntry;(System.String);Argument[this];ReturnValue;taint;df-generated |
-| System.IO.Compression;ZipArchive;CreateEntry;(System.String,System.IO.Compression.CompressionLevel);Argument[0];ReturnValue;taint;df-generated |
-| System.IO.Compression;ZipArchive;CreateEntry;(System.String,System.IO.Compression.CompressionLevel);Argument[this];ReturnValue;taint;df-generated |
+| System.IO.Compression;GZipStream;GZipStream;(System.IO.Stream,System.IO.Compression.CompressionLevel,System.Boolean);Argument[0];Argument[this].SyntheticField[System.IO.Compression.GZipStream._deflateStream].SyntheticField[System.IO.Compression.DeflateStream._stream];value;dfc-generated |
+| System.IO.Compression;GZipStream;GZipStream;(System.IO.Stream,System.IO.Compression.CompressionMode,System.Boolean);Argument[0];Argument[this].SyntheticField[System.IO.Compression.GZipStream._deflateStream].SyntheticField[System.IO.Compression.DeflateStream._stream];value;dfc-generated |
+| System.IO.Compression;GZipStream;get_BaseStream;();Argument[this].SyntheticField[System.IO.Compression.GZipStream._deflateStream].SyntheticField[System.IO.Compression.DeflateStream._stream];ReturnValue;value;dfc-generated |
+| System.IO.Compression;ZLibStream;ZLibStream;(System.IO.Stream,System.IO.Compression.CompressionLevel,System.Boolean);Argument[0];Argument[this].SyntheticField[System.IO.Compression.ZLibStream._deflateStream].SyntheticField[System.IO.Compression.DeflateStream._stream];value;dfc-generated |
+| System.IO.Compression;ZLibStream;ZLibStream;(System.IO.Stream,System.IO.Compression.CompressionMode,System.Boolean);Argument[0];Argument[this].SyntheticField[System.IO.Compression.ZLibStream._deflateStream].SyntheticField[System.IO.Compression.DeflateStream._stream];value;dfc-generated |
+| System.IO.Compression;ZLibStream;get_BaseStream;();Argument[this].SyntheticField[System.IO.Compression.ZLibStream._deflateStream].SyntheticField[System.IO.Compression.DeflateStream._stream];ReturnValue;value;dfc-generated |
+| System.IO.Compression;ZipArchive;CreateEntry;(System.String);Argument[0];ReturnValue.SyntheticField[System.IO.Compression.ZipArchiveEntry._storedEntryName];value;dfc-generated |
+| System.IO.Compression;ZipArchive;CreateEntry;(System.String);Argument[this];ReturnValue.SyntheticField[System.IO.Compression.ZipArchiveEntry._archive];value;dfc-generated |
+| System.IO.Compression;ZipArchive;CreateEntry;(System.String,System.IO.Compression.CompressionLevel);Argument[0];ReturnValue.SyntheticField[System.IO.Compression.ZipArchiveEntry._storedEntryName];value;dfc-generated |
+| System.IO.Compression;ZipArchive;CreateEntry;(System.String,System.IO.Compression.CompressionLevel);Argument[this];ReturnValue.SyntheticField[System.IO.Compression.ZipArchiveEntry._archive];value;dfc-generated |
 | System.IO.Compression;ZipArchive;ZipArchive;(System.IO.Stream,System.IO.Compression.ZipArchiveMode,System.Boolean,System.Text.Encoding);Argument[0];Argument[this];taint;df-generated |
 | System.IO.Compression;ZipArchive;ZipArchive;(System.IO.Stream,System.IO.Compression.ZipArchiveMode,System.Boolean,System.Text.Encoding);Argument[3];Argument[this];taint;df-generated |
 | System.IO.Compression;ZipArchive;get_Entries;();Argument[this];ReturnValue;taint;df-generated |
 | System.IO.Compression;ZipArchiveEntry;Open;();Argument[this];ReturnValue;taint;df-generated |
-| System.IO.Compression;ZipArchiveEntry;ToString;();Argument[this];ReturnValue;taint;df-generated |
-| System.IO.Compression;ZipArchiveEntry;get_Archive;();Argument[this];ReturnValue;taint;df-generated |
-| System.IO.Compression;ZipArchiveEntry;get_Name;();Argument[this];ReturnValue;taint;df-generated |
-| System.IO.Compression;ZipFile;Open;(System.String,System.IO.Compression.ZipArchiveMode);Argument[0];ReturnValue;taint;df-generated |
-| System.IO.Compression;ZipFile;Open;(System.String,System.IO.Compression.ZipArchiveMode,System.Text.Encoding);Argument[0];ReturnValue;taint;df-generated |
-| System.IO.Compression;ZipFile;Open;(System.String,System.IO.Compression.ZipArchiveMode,System.Text.Encoding);Argument[2];ReturnValue;taint;df-generated |
-| System.IO.Compression;ZipFile;OpenRead;(System.String);Argument[0];ReturnValue;taint;df-generated |
-| System.IO.Compression;ZipFileExtensions;CreateEntryFromFile;(System.IO.Compression.ZipArchive,System.String,System.String);Argument[0];ReturnValue;taint;df-generated |
-| System.IO.Compression;ZipFileExtensions;CreateEntryFromFile;(System.IO.Compression.ZipArchive,System.String,System.String);Argument[2];ReturnValue;taint;df-generated |
-| System.IO.Compression;ZipFileExtensions;CreateEntryFromFile;(System.IO.Compression.ZipArchive,System.String,System.String,System.IO.Compression.CompressionLevel);Argument[0];ReturnValue;taint;df-generated |
-| System.IO.Compression;ZipFileExtensions;CreateEntryFromFile;(System.IO.Compression.ZipArchive,System.String,System.String,System.IO.Compression.CompressionLevel);Argument[2];ReturnValue;taint;df-generated |
+| System.IO.Compression;ZipArchiveEntry;ToString;();Argument[this].Property[System.IO.Compression.ZipArchiveEntry.FullName];ReturnValue;value;dfc-generated |
+| System.IO.Compression;ZipArchiveEntry;ToString;();Argument[this].SyntheticField[System.IO.Compression.ZipArchiveEntry._storedEntryName];ReturnValue;value;dfc-generated |
+| System.IO.Compression;ZipArchiveEntry;get_Archive;();Argument[this].SyntheticField[System.IO.Compression.ZipArchiveEntry._archive];ReturnValue;value;dfc-generated |
+| System.IO.Compression;ZipArchiveEntry;get_Name;();Argument[this].Property[System.IO.Compression.ZipArchiveEntry.FullName];ReturnValue;value;dfc-generated |
+| System.IO.Compression;ZipArchiveEntry;get_Name;();Argument[this].SyntheticField[System.IO.Compression.ZipArchiveEntry._storedEntryName];ReturnValue;value;dfc-generated |
 | System.IO.Enumeration;FileSystemEntry;ToFileSystemInfo;();Argument[this];ReturnValue;taint;df-generated |
 | System.IO.Enumeration;FileSystemEntry;ToSpecifiedFullPath;();Argument[this];ReturnValue;taint;df-generated |
 | System.IO.Enumeration;FileSystemEntry;get_FileName;();Argument[this];ReturnValue;taint;df-generated |
@@ -7539,95 +8170,82 @@
 | System.IO.Enumeration;FileSystemEnumerable<TResult>;FileSystemEnumerable;(System.String,System.IO.Enumeration.FileSystemEnumerable<TResult>+FindTransform,System.IO.EnumerationOptions);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
 | System.IO.Enumeration;FileSystemEnumerable<TResult>;set_ShouldIncludePredicate;(System.IO.Enumeration.FileSystemEnumerable<TResult>+FindPredicate);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.IO.Enumeration;FileSystemEnumerable<TResult>;set_ShouldRecursePredicate;(System.IO.Enumeration.FileSystemEnumerable<TResult>+FindPredicate);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
+| System.IO.Enumeration;FileSystemEnumerator<TResult>;ShouldIncludeEntry;(System.IO.Enumeration.FileSystemEntry);Argument[0];ReturnValue;value;dfc-generated |
+| System.IO.Enumeration;FileSystemEnumerator<TResult>;ShouldRecurseIntoEntry;(System.IO.Enumeration.FileSystemEntry);Argument[0];ReturnValue;value;dfc-generated |
+| System.IO.Enumeration;FileSystemEnumerator<TResult>;get_Current;();Argument[this].Property[System.IO.Enumeration.FileSystemEnumerator`1.Current];ReturnValue;value;df-generated |
+| System.IO.Enumeration;FileSystemEnumerator<TResult>;get_Current;();Argument[this].Property[System.IO.Enumeration.FileSystemEnumerator`1.Current];ReturnValue;value;dfc-generated |
 | System.IO.Enumeration;FileSystemEnumerator<TResult>;get_Current;();Argument[this];ReturnValue;taint;df-generated |
-| System.IO.Enumeration;FileSystemName;TranslateWin32Expression;(System.String);Argument[0];ReturnValue;taint;df-generated |
+| System.IO.Enumeration;FileSystemEnumerator<TResult>;get_Current;();Argument[this];ReturnValue;taint;dfc-generated |
+| System.IO.Enumeration;FileSystemName;TranslateWin32Expression;(System.String);Argument[0];ReturnValue;value;dfc-generated |
 | System.IO.IsolatedStorage;IsolatedStorage;get_ApplicationIdentity;();Argument[this];ReturnValue;taint;df-generated |
 | System.IO.IsolatedStorage;IsolatedStorage;get_AssemblyIdentity;();Argument[this];ReturnValue;taint;df-generated |
 | System.IO.IsolatedStorage;IsolatedStorage;get_DomainIdentity;();Argument[this];ReturnValue;taint;df-generated |
+| System.IO.IsolatedStorage;IsolatedStorageFileStream;FlushAsync;(System.Threading.CancellationToken);Argument[this].SyntheticField[System.IO.FileStream._strategy].SyntheticField[System.IO.Strategies.DerivedFileStreamStrategy._fileStream];ReturnValue.SyntheticField[System.Threading.Tasks.Task.m_stateObject];value;dfc-generated |
 | System.IO.IsolatedStorage;IsolatedStorageFileStream;get_Handle;();Argument[this];ReturnValue;taint;df-generated |
 | System.IO.IsolatedStorage;IsolatedStorageFileStream;get_SafeFileHandle;();Argument[this];ReturnValue;taint;df-generated |
 | System.IO.MemoryMappedFiles;MemoryMappedFile;CreateFromFile;(Microsoft.Win32.SafeHandles.SafeFileHandle,System.String,System.Int64,System.IO.MemoryMappedFiles.MemoryMappedFileAccess,System.IO.HandleInheritability,System.Boolean);Argument[0];ReturnValue;taint;df-generated |
 | System.IO.MemoryMappedFiles;MemoryMappedFile;CreateFromFile;(System.IO.FileStream,System.String,System.Int64,System.IO.MemoryMappedFiles.MemoryMappedFileAccess,System.IO.HandleInheritability,System.Boolean);Argument[0];ReturnValue;taint;df-generated |
-| System.IO.MemoryMappedFiles;MemoryMappedFile;CreateFromFile;(System.String);Argument[0];ReturnValue;taint;df-generated |
-| System.IO.MemoryMappedFiles;MemoryMappedFile;CreateFromFile;(System.String,System.IO.FileMode);Argument[0];ReturnValue;taint;df-generated |
-| System.IO.MemoryMappedFiles;MemoryMappedFile;CreateFromFile;(System.String,System.IO.FileMode,System.String);Argument[0];ReturnValue;taint;df-generated |
-| System.IO.MemoryMappedFiles;MemoryMappedFile;CreateFromFile;(System.String,System.IO.FileMode,System.String,System.Int64);Argument[0];ReturnValue;taint;df-generated |
-| System.IO.MemoryMappedFiles;MemoryMappedFile;CreateFromFile;(System.String,System.IO.FileMode,System.String,System.Int64,System.IO.MemoryMappedFiles.MemoryMappedFileAccess);Argument[0];ReturnValue;taint;df-generated |
 | System.IO.MemoryMappedFiles;MemoryMappedFile;get_SafeMemoryMappedFileHandle;();Argument[this];ReturnValue;taint;df-generated |
 | System.IO.MemoryMappedFiles;MemoryMappedViewAccessor;get_SafeMemoryMappedViewHandle;();Argument[this];ReturnValue;taint;df-generated |
 | System.IO.MemoryMappedFiles;MemoryMappedViewStream;get_SafeMemoryMappedViewHandle;();Argument[this];ReturnValue;taint;df-generated |
 | System.IO.Pipelines;Pipe;Pipe;(System.IO.Pipelines.PipeOptions);Argument[0];Argument[this];taint;df-generated |
 | System.IO.Pipelines;Pipe;get_Reader;();Argument[this];ReturnValue;taint;df-generated |
 | System.IO.Pipelines;Pipe;get_Writer;();Argument[this];ReturnValue;taint;df-generated |
-| System.IO.Pipelines;PipeReader;AdvanceTo;(System.SequencePosition);Argument[0];Argument[this];taint;df-generated |
-| System.IO.Pipelines;PipeReader;AdvanceTo;(System.SequencePosition,System.SequencePosition);Argument[0];Argument[this];taint;df-generated |
 | System.IO.Pipelines;PipeReader;AsStream;(System.Boolean);Argument[this];ReturnValue;taint;df-generated |
-| System.IO.Pipelines;PipeReader;CompleteAsync;(System.Exception);Argument[this];ReturnValue;taint;df-generated |
-| System.IO.Pipelines;PipeReader;CopyToAsync;(System.IO.Pipelines.PipeWriter,System.Threading.CancellationToken);Argument[1];ReturnValue;taint;df-generated |
-| System.IO.Pipelines;PipeReader;CopyToAsync;(System.IO.Stream,System.Threading.CancellationToken);Argument[1];ReturnValue;taint;df-generated |
 | System.IO.Pipelines;PipeReader;CopyToAsync;(System.IO.Stream,System.Threading.CancellationToken);Argument[this];Argument[0];taint;df-generated |
 | System.IO.Pipelines;PipeReader;Create;(System.Buffers.ReadOnlySequence<System.Byte>);Argument[0];ReturnValue;taint;df-generated |
 | System.IO.Pipelines;PipeReader;Create;(System.IO.Stream,System.IO.Pipelines.StreamPipeReaderOptions);Argument[0];ReturnValue;taint;df-generated |
 | System.IO.Pipelines;PipeReader;Create;(System.IO.Stream,System.IO.Pipelines.StreamPipeReaderOptions);Argument[1];ReturnValue;taint;df-generated |
 | System.IO.Pipelines;PipeReader;OnWriterCompleted;(System.Action<System.Exception,System.Object>,System.Object);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
-| System.IO.Pipelines;PipeReader;ReadAsync;(System.Threading.CancellationToken);Argument[this];ReturnValue;taint;df-generated |
-| System.IO.Pipelines;PipeReader;ReadAtLeastAsync;(System.Int32,System.Threading.CancellationToken);Argument[this];ReturnValue;taint;df-generated |
-| System.IO.Pipelines;PipeReader;ReadAtLeastAsyncCore;(System.Int32,System.Threading.CancellationToken);Argument[this];ReturnValue;taint;df-generated |
-| System.IO.Pipelines;PipeReader;TryRead;(System.IO.Pipelines.ReadResult);Argument[this];ReturnValue;taint;df-generated |
+| System.IO.Pipelines;PipeScheduler;Schedule;(System.Action<System.Object>,System.Object);Argument[0];Argument[0].Parameter[delegate-self];value;dfc-generated |
 | System.IO.Pipelines;PipeScheduler;Schedule;(System.Action<System.Object>,System.Object);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
+| System.IO.Pipelines;PipeScheduler;Schedule;(System.Action<System.Object>,System.Object);Argument[1];Argument[0].Parameter[0];value;dfc-generated |
+| System.IO.Pipelines;PipeScheduler;Schedule;(System.Action<System.Object>,System.Object);Argument[1];Argument[0].Parameter[0];value;hq-generated |
 | System.IO.Pipelines;PipeWriter;AsStream;(System.Boolean);Argument[this];ReturnValue;taint;df-generated |
 | System.IO.Pipelines;PipeWriter;Create;(System.IO.Stream,System.IO.Pipelines.StreamPipeWriterOptions);Argument[0];ReturnValue;taint;df-generated |
 | System.IO.Pipelines;PipeWriter;Create;(System.IO.Stream,System.IO.Pipelines.StreamPipeWriterOptions);Argument[1];ReturnValue;taint;df-generated |
-| System.IO.Pipelines;PipeWriter;FlushAsync;(System.Threading.CancellationToken);Argument[this];ReturnValue;taint;df-generated |
 | System.IO.Pipelines;PipeWriter;GetMemory;(System.Int32);Argument[this];ReturnValue;taint;df-generated |
 | System.IO.Pipelines;PipeWriter;GetSpan;(System.Int32);Argument[this];ReturnValue;taint;df-generated |
 | System.IO.Pipelines;PipeWriter;OnReaderCompleted;(System.Action<System.Exception,System.Object>,System.Object);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
-| System.IO.Pipelines;PipeWriter;WriteAsync;(System.ReadOnlyMemory<System.Byte>,System.Threading.CancellationToken);Argument[this];ReturnValue;taint;df-generated |
-| System.IO.Pipelines;ReadResult;ReadResult;(System.Buffers.ReadOnlySequence<System.Byte>,System.Boolean,System.Boolean);Argument[0];Argument[this];taint;df-generated |
-| System.IO.Pipelines;ReadResult;get_Buffer;();Argument[this];ReturnValue;taint;df-generated |
-| System.IO.Pipelines;StreamPipeExtensions;CopyToAsync;(System.IO.Stream,System.IO.Pipelines.PipeWriter,System.Threading.CancellationToken);Argument[2];ReturnValue;taint;df-generated |
+| System.IO.Pipelines;ReadResult;ReadResult;(System.Buffers.ReadOnlySequence<System.Byte>,System.Boolean,System.Boolean);Argument[0];Argument[this].SyntheticField[System.IO.Pipelines.ReadResult._resultBuffer];value;dfc-generated |
+| System.IO.Pipelines;ReadResult;get_Buffer;();Argument[this].SyntheticField[System.IO.Pipelines.ReadResult._resultBuffer];ReturnValue;value;dfc-generated |
 | System.IO.Pipes;AnonymousPipeClientStream;AnonymousPipeClientStream;(System.IO.Pipes.PipeDirection,Microsoft.Win32.SafeHandles.SafePipeHandle);Argument[1];Argument[this];taint;df-generated |
-| System.IO.Pipes;AnonymousPipeServerStream;AnonymousPipeServerStream;(System.IO.Pipes.PipeDirection,Microsoft.Win32.SafeHandles.SafePipeHandle,Microsoft.Win32.SafeHandles.SafePipeHandle);Argument[1];Argument[this];taint;df-generated |
-| System.IO.Pipes;AnonymousPipeServerStream;AnonymousPipeServerStream;(System.IO.Pipes.PipeDirection,Microsoft.Win32.SafeHandles.SafePipeHandle,Microsoft.Win32.SafeHandles.SafePipeHandle);Argument[2];Argument[this];taint;df-generated |
-| System.IO.Pipes;AnonymousPipeServerStream;get_ClientSafePipeHandle;();Argument[this];ReturnValue;taint;df-generated |
-| System.IO.Pipes;NamedPipeClientStream;ConnectAsync;();Argument[this];ReturnValue;taint;df-generated |
-| System.IO.Pipes;NamedPipeClientStream;ConnectAsync;(System.Int32);Argument[this];ReturnValue;taint;df-generated |
-| System.IO.Pipes;NamedPipeClientStream;ConnectAsync;(System.Int32,System.Threading.CancellationToken);Argument[1];ReturnValue;taint;df-generated |
-| System.IO.Pipes;NamedPipeClientStream;ConnectAsync;(System.Int32,System.Threading.CancellationToken);Argument[this];ReturnValue;taint;df-generated |
-| System.IO.Pipes;NamedPipeClientStream;ConnectAsync;(System.Threading.CancellationToken);Argument[0];ReturnValue;taint;df-generated |
-| System.IO.Pipes;NamedPipeClientStream;ConnectAsync;(System.Threading.CancellationToken);Argument[this];ReturnValue;taint;df-generated |
-| System.IO.Pipes;NamedPipeClientStream;ConnectAsync;(System.TimeSpan,System.Threading.CancellationToken);Argument[1];ReturnValue;taint;df-generated |
-| System.IO.Pipes;NamedPipeClientStream;ConnectAsync;(System.TimeSpan,System.Threading.CancellationToken);Argument[this];ReturnValue;taint;df-generated |
+| System.IO.Pipes;AnonymousPipeServerStream;AnonymousPipeServerStream;(System.IO.Pipes.PipeDirection,Microsoft.Win32.SafeHandles.SafePipeHandle,Microsoft.Win32.SafeHandles.SafePipeHandle);Argument[2];Argument[this].SyntheticField[System.IO.Pipes.AnonymousPipeServerStream._clientHandle];value;dfc-generated |
+| System.IO.Pipes;AnonymousPipeServerStream;get_ClientSafePipeHandle;();Argument[this].SyntheticField[System.IO.Pipes.AnonymousPipeServerStream._clientHandle];ReturnValue;value;dfc-generated |
 | System.IO.Pipes;NamedPipeClientStream;NamedPipeClientStream;(System.IO.Pipes.PipeDirection,System.Boolean,System.Boolean,Microsoft.Win32.SafeHandles.SafePipeHandle);Argument[3];Argument[this];taint;df-generated |
 | System.IO.Pipes;NamedPipeClientStream;NamedPipeClientStream;(System.String,System.String,System.IO.Pipes.PipeDirection,System.IO.Pipes.PipeOptions,System.Security.Principal.TokenImpersonationLevel,System.IO.HandleInheritability);Argument[1];Argument[this];taint;df-generated |
 | System.IO.Pipes;NamedPipeServerStream;BeginWaitForConnection;(System.AsyncCallback,System.Object);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.IO.Pipes;NamedPipeServerStream;NamedPipeServerStream;(System.IO.Pipes.PipeDirection,System.Boolean,System.Boolean,Microsoft.Win32.SafeHandles.SafePipeHandle);Argument[3];Argument[this];taint;df-generated |
 | System.IO.Pipes;NamedPipeServerStream;RunAsClient;(System.IO.Pipes.PipeStreamImpersonationWorker);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
-| System.IO.Pipes;NamedPipeServerStream;WaitForConnectionAsync;(System.Threading.CancellationToken);Argument[0];ReturnValue;taint;df-generated |
-| System.IO.Pipes;PipeStream;InitializeHandle;(Microsoft.Win32.SafeHandles.SafePipeHandle,System.Boolean,System.Boolean);Argument[0];Argument[this];taint;df-generated |
-| System.IO.Pipes;PipeStream;get_SafePipeHandle;();Argument[this];ReturnValue;taint;df-generated |
+| System.IO.Pipes;PipeStream;InitializeHandle;(Microsoft.Win32.SafeHandles.SafePipeHandle,System.Boolean,System.Boolean);Argument[0];Argument[this].SyntheticField[System.IO.Pipes.PipeStream._handle];value;dfc-generated |
+| System.IO.Pipes;PipeStream;get_SafePipeHandle;();Argument[this].SyntheticField[System.IO.Pipes.PipeStream._handle];ReturnValue;value;dfc-generated |
 | System.IO.Pipes;PipeStreamImpersonationWorker;BeginInvoke;(System.AsyncCallback,System.Object);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
-| System.IO;BinaryReader;BinaryReader;(System.IO.Stream,System.Text.Encoding,System.Boolean);Argument[0];Argument[this];taint;df-generated |
-| System.IO;BinaryReader;BinaryReader;(System.IO.Stream,System.Text.Encoding,System.Boolean);Argument[1];Argument[this];taint;df-generated |
+| System.IO;BinaryReader;BinaryReader;(System.IO.Stream,System.Text.Encoding,System.Boolean);Argument[0];Argument[this].SyntheticField[System.IO.BinaryReader._stream];value;dfc-generated |
 | System.IO;BinaryReader;Read;(System.Byte[],System.Int32,System.Int32);Argument[this];Argument[0].Element;taint;df-generated |
 | System.IO;BinaryReader;Read;(System.Span<System.Byte>);Argument[this];Argument[0];taint;df-generated |
 | System.IO;BinaryReader;ReadString;();Argument[this];ReturnValue;taint;df-generated |
-| System.IO;BinaryReader;get_BaseStream;();Argument[this];ReturnValue;taint;df-generated |
-| System.IO;BinaryWriter;BinaryWriter;(System.IO.Stream,System.Text.Encoding,System.Boolean);Argument[0];Argument[this];taint;df-generated |
-| System.IO;BinaryWriter;BinaryWriter;(System.IO.Stream,System.Text.Encoding,System.Boolean);Argument[1];Argument[this];taint;df-generated |
+| System.IO;BinaryReader;get_BaseStream;();Argument[this].SyntheticField[System.IO.BinaryReader._stream];ReturnValue;value;dfc-generated |
+| System.IO;BinaryWriter;BinaryWriter;(System.IO.Stream,System.Text.Encoding,System.Boolean);Argument[0];Argument[this].Field[System.IO.BinaryWriter.OutStream];value;dfc-generated |
 | System.IO;BinaryWriter;Write;(System.Byte[]);Argument[0].Element;Argument[this];taint;df-generated |
 | System.IO;BinaryWriter;Write;(System.Byte[],System.Int32,System.Int32);Argument[0].Element;Argument[this];taint;df-generated |
-| System.IO;BinaryWriter;get_BaseStream;();Argument[this];ReturnValue;taint;df-generated |
+| System.IO;BinaryWriter;get_BaseStream;();Argument[this].Field[System.IO.BinaryWriter.OutStream];ReturnValue;value;dfc-generated |
 | System.IO;BufferedStream;BufferedStream;(System.IO.Stream);Argument[0];Argument[this];taint;manual |
 | System.IO;BufferedStream;BufferedStream;(System.IO.Stream,System.Int32);Argument[0];Argument[this];taint;manual |
 | System.IO;BufferedStream;get_UnderlyingStream;();Argument[this];ReturnValue;taint;df-generated |
-| System.IO;Directory;CreateDirectory;(System.String);Argument[0];ReturnValue;taint;df-generated |
-| System.IO;Directory;CreateDirectory;(System.String,System.IO.UnixFileMode);Argument[0];ReturnValue;taint;df-generated |
-| System.IO;Directory;CreateSymbolicLink;(System.String,System.String);Argument[0];ReturnValue;taint;df-generated |
-| System.IO;Directory;GetParent;(System.String);Argument[0];ReturnValue;taint;df-generated |
-| System.IO;DirectoryInfo;CreateSubdirectory;(System.String);Argument[0];ReturnValue;taint;df-generated |
-| System.IO;DirectoryInfo;CreateSubdirectory;(System.String);Argument[this];ReturnValue;taint;df-generated |
-| System.IO;DirectoryInfo;DirectoryInfo;(System.String);Argument[0];Argument[this];taint;df-generated |
+| System.IO;Directory;CreateDirectory;(System.String);Argument[0];ReturnValue.Field[System.IO.FileSystemInfo.FullPath];value;dfc-generated |
+| System.IO;Directory;CreateDirectory;(System.String);Argument[0];ReturnValue.Field[System.IO.FileSystemInfo.OriginalPath];value;dfc-generated |
+| System.IO;Directory;CreateDirectory;(System.String,System.IO.UnixFileMode);Argument[0];ReturnValue.Field[System.IO.FileSystemInfo.FullPath];value;dfc-generated |
+| System.IO;Directory;CreateDirectory;(System.String,System.IO.UnixFileMode);Argument[0];ReturnValue.Field[System.IO.FileSystemInfo.OriginalPath];value;dfc-generated |
+| System.IO;Directory;CreateSymbolicLink;(System.String,System.String);Argument[0];ReturnValue.Field[System.IO.FileSystemInfo.FullPath];value;dfc-generated |
+| System.IO;Directory;CreateSymbolicLink;(System.String,System.String);Argument[0];ReturnValue.Field[System.IO.FileSystemInfo.OriginalPath];value;dfc-generated |
+| System.IO;Directory;GetParent;(System.String);Argument[0];ReturnValue.Field[System.IO.FileSystemInfo.FullPath];value;dfc-generated |
+| System.IO;Directory;GetParent;(System.String);Argument[0];ReturnValue.Field[System.IO.FileSystemInfo.OriginalPath];value;dfc-generated |
+| System.IO;DirectoryInfo;CreateSubdirectory;(System.String);Argument[0];ReturnValue.Field[System.IO.FileSystemInfo.FullPath];value;dfc-generated |
+| System.IO;DirectoryInfo;CreateSubdirectory;(System.String);Argument[0];ReturnValue.Field[System.IO.FileSystemInfo.OriginalPath];value;dfc-generated |
+| System.IO;DirectoryInfo;CreateSubdirectory;(System.String);Argument[this].Field[System.IO.FileSystemInfo.FullPath];ReturnValue.Field[System.IO.FileSystemInfo.FullPath];value;dfc-generated |
+| System.IO;DirectoryInfo;CreateSubdirectory;(System.String);Argument[this].Field[System.IO.FileSystemInfo.FullPath];ReturnValue.Field[System.IO.FileSystemInfo.OriginalPath];value;dfc-generated |
+| System.IO;DirectoryInfo;DirectoryInfo;(System.String);Argument[0];Argument[this].Field[System.IO.FileSystemInfo.FullPath];value;dfc-generated |
+| System.IO;DirectoryInfo;DirectoryInfo;(System.String);Argument[0];Argument[this].Field[System.IO.FileSystemInfo.OriginalPath];value;dfc-generated |
 | System.IO;DirectoryInfo;EnumerateDirectories;();Argument[this];ReturnValue;taint;df-generated |
 | System.IO;DirectoryInfo;EnumerateDirectories;(System.String);Argument[this];ReturnValue;taint;df-generated |
 | System.IO;DirectoryInfo;EnumerateDirectories;(System.String,System.IO.EnumerationOptions);Argument[1];ReturnValue;taint;df-generated |
@@ -7643,32 +8261,35 @@
 | System.IO;DirectoryInfo;EnumerateFiles;(System.String,System.IO.EnumerationOptions);Argument[1];ReturnValue;taint;df-generated |
 | System.IO;DirectoryInfo;EnumerateFiles;(System.String,System.IO.EnumerationOptions);Argument[this];ReturnValue;taint;df-generated |
 | System.IO;DirectoryInfo;EnumerateFiles;(System.String,System.IO.SearchOption);Argument[this];ReturnValue;taint;df-generated |
-| System.IO;DirectoryInfo;MoveTo;(System.String);Argument[0];Argument[this];taint;df-generated |
-| System.IO;DirectoryInfo;get_Parent;();Argument[this];ReturnValue;taint;df-generated |
-| System.IO;DriveInfo;DriveInfo;(System.String);Argument[0];Argument[this];taint;df-generated |
-| System.IO;DriveInfo;ToString;();Argument[this];ReturnValue;taint;df-generated |
-| System.IO;DriveInfo;get_Name;();Argument[this];ReturnValue;taint;df-generated |
-| System.IO;DriveInfo;get_RootDirectory;();Argument[this];ReturnValue;taint;df-generated |
-| System.IO;ErrorEventArgs;ErrorEventArgs;(System.Exception);Argument[0];Argument[this];taint;df-generated |
-| System.IO;ErrorEventArgs;GetException;();Argument[this];ReturnValue;taint;df-generated |
+| System.IO;DirectoryInfo;MoveTo;(System.String);Argument[0];Argument[this].Field[System.IO.FileSystemInfo.FullPath];value;dfc-generated |
+| System.IO;DirectoryInfo;MoveTo;(System.String);Argument[0];Argument[this].Field[System.IO.FileSystemInfo.OriginalPath];value;dfc-generated |
+| System.IO;DirectoryInfo;get_Parent;();Argument[this].Field[System.IO.FileSystemInfo.FullPath];ReturnValue.Field[System.IO.FileSystemInfo.FullPath];value;dfc-generated |
+| System.IO;DirectoryInfo;get_Parent;();Argument[this].Field[System.IO.FileSystemInfo.FullPath];ReturnValue.Field[System.IO.FileSystemInfo.OriginalPath];value;dfc-generated |
+| System.IO;DriveInfo;DriveInfo;(System.String);Argument[0];Argument[this].SyntheticField[System.IO.DriveInfo._name];value;dfc-generated |
+| System.IO;DriveInfo;ToString;();Argument[this].Property[System.IO.DriveInfo.Name];ReturnValue;value;dfc-generated |
+| System.IO;DriveInfo;ToString;();Argument[this].SyntheticField[System.IO.DriveInfo._name];ReturnValue;value;dfc-generated |
+| System.IO;DriveInfo;get_Name;();Argument[this].SyntheticField[System.IO.DriveInfo._name];ReturnValue;value;dfc-generated |
+| System.IO;ErrorEventArgs;ErrorEventArgs;(System.Exception);Argument[0];Argument[this].SyntheticField[System.IO.ErrorEventArgs._exception];value;dfc-generated |
+| System.IO;ErrorEventArgs;GetException;();Argument[this].SyntheticField[System.IO.ErrorEventArgs._exception];ReturnValue;value;dfc-generated |
 | System.IO;ErrorEventHandler;BeginInvoke;(System.Object,System.IO.ErrorEventArgs,System.AsyncCallback,System.Object);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
 | System.IO;File;AppendAllLinesAsync;(System.String,System.Collections.Generic.IEnumerable<System.String>,System.Text.Encoding,System.Threading.CancellationToken);Argument[3];ReturnValue;taint;df-generated |
 | System.IO;File;AppendAllLinesAsync;(System.String,System.Collections.Generic.IEnumerable<System.String>,System.Threading.CancellationToken);Argument[2];ReturnValue;taint;df-generated |
 | System.IO;File;AppendAllTextAsync;(System.String,System.String,System.Text.Encoding,System.Threading.CancellationToken);Argument[3];ReturnValue;taint;df-generated |
 | System.IO;File;AppendAllTextAsync;(System.String,System.String,System.Threading.CancellationToken);Argument[2];ReturnValue;taint;df-generated |
-| System.IO;File;Create;(System.String);Argument[0];ReturnValue;taint;df-generated |
-| System.IO;File;Create;(System.String,System.Int32);Argument[0];ReturnValue;taint;df-generated |
-| System.IO;File;Create;(System.String,System.Int32,System.IO.FileOptions);Argument[0];ReturnValue;taint;df-generated |
-| System.IO;File;CreateSymbolicLink;(System.String,System.String);Argument[0];ReturnValue;taint;df-generated |
-| System.IO;File;Open;(System.String,System.IO.FileMode);Argument[0];ReturnValue;taint;df-generated |
-| System.IO;File;Open;(System.String,System.IO.FileMode,System.IO.FileAccess);Argument[0];ReturnValue;taint;df-generated |
-| System.IO;File;Open;(System.String,System.IO.FileMode,System.IO.FileAccess,System.IO.FileShare);Argument[0];ReturnValue;taint;df-generated |
+| System.IO;File;Create;(System.String);Argument[0];ReturnValue;taint;dfc-generated |
+| System.IO;File;Create;(System.String,System.Int32);Argument[0];ReturnValue;taint;dfc-generated |
+| System.IO;File;Create;(System.String,System.Int32,System.IO.FileOptions);Argument[0];ReturnValue;taint;dfc-generated |
+| System.IO;File;CreateSymbolicLink;(System.String,System.String);Argument[0];ReturnValue.Field[System.IO.FileSystemInfo.FullPath];value;dfc-generated |
+| System.IO;File;CreateSymbolicLink;(System.String,System.String);Argument[0];ReturnValue.Field[System.IO.FileSystemInfo.OriginalPath];value;dfc-generated |
+| System.IO;File;Open;(System.String,System.IO.FileMode);Argument[0];ReturnValue;taint;dfc-generated |
+| System.IO;File;Open;(System.String,System.IO.FileMode,System.IO.FileAccess);Argument[0];ReturnValue;taint;dfc-generated |
+| System.IO;File;Open;(System.String,System.IO.FileMode,System.IO.FileAccess,System.IO.FileShare);Argument[0];ReturnValue;taint;dfc-generated |
 | System.IO;File;OpenHandle;(System.String,System.IO.FileMode,System.IO.FileAccess,System.IO.FileShare,System.IO.FileOptions,System.Int64);Argument[0];ReturnValue;taint;df-generated |
-| System.IO;File;OpenRead;(System.String);Argument[0];ReturnValue;taint;df-generated |
-| System.IO;File;OpenText;(System.String);Argument[0];ReturnValue;taint;df-generated |
-| System.IO;File;OpenWrite;(System.String);Argument[0];ReturnValue;taint;df-generated |
-| System.IO;File;ReadAllText;(System.String);Argument[0];ReturnValue;taint;df-generated |
-| System.IO;File;ReadAllText;(System.String,System.Text.Encoding);Argument[0];ReturnValue;taint;df-generated |
+| System.IO;File;OpenRead;(System.String);Argument[0];ReturnValue;taint;dfc-generated |
+| System.IO;File;OpenText;(System.String);Argument[0];ReturnValue;taint;dfc-generated |
+| System.IO;File;OpenWrite;(System.String);Argument[0];ReturnValue;taint;dfc-generated |
+| System.IO;File;ReadAllText;(System.String);Argument[0];ReturnValue;taint;dfc-generated |
+| System.IO;File;ReadAllText;(System.String,System.Text.Encoding);Argument[0];ReturnValue;taint;dfc-generated |
 | System.IO;File;ReadLines;(System.String);Argument[0];ReturnValue;taint;df-generated |
 | System.IO;File;ReadLines;(System.String,System.Text.Encoding);Argument[0];ReturnValue;taint;df-generated |
 | System.IO;File;ReadLines;(System.String,System.Text.Encoding);Argument[1];ReturnValue;taint;df-generated |
@@ -7677,49 +8298,62 @@
 | System.IO;File;WriteAllLinesAsync;(System.String,System.Collections.Generic.IEnumerable<System.String>,System.Threading.CancellationToken);Argument[2];ReturnValue;taint;df-generated |
 | System.IO;File;WriteAllTextAsync;(System.String,System.String,System.Text.Encoding,System.Threading.CancellationToken);Argument[3];ReturnValue;taint;df-generated |
 | System.IO;File;WriteAllTextAsync;(System.String,System.String,System.Threading.CancellationToken);Argument[2];ReturnValue;taint;df-generated |
-| System.IO;FileInfo;CopyTo;(System.String);Argument[0];ReturnValue;taint;df-generated |
-| System.IO;FileInfo;CopyTo;(System.String,System.Boolean);Argument[0];ReturnValue;taint;df-generated |
-| System.IO;FileInfo;Create;();Argument[this];ReturnValue;taint;df-generated |
-| System.IO;FileInfo;MoveTo;(System.String);Argument[0];Argument[this];taint;df-generated |
-| System.IO;FileInfo;MoveTo;(System.String,System.Boolean);Argument[0];Argument[this];taint;df-generated |
-| System.IO;FileInfo;Open;(System.IO.FileMode);Argument[this];ReturnValue;taint;df-generated |
-| System.IO;FileInfo;Open;(System.IO.FileMode,System.IO.FileAccess);Argument[this];ReturnValue;taint;df-generated |
-| System.IO;FileInfo;Open;(System.IO.FileMode,System.IO.FileAccess,System.IO.FileShare);Argument[this];ReturnValue;taint;df-generated |
-| System.IO;FileInfo;OpenRead;();Argument[this];ReturnValue;taint;df-generated |
-| System.IO;FileInfo;OpenText;();Argument[this];ReturnValue;taint;df-generated |
-| System.IO;FileInfo;OpenWrite;();Argument[this];ReturnValue;taint;df-generated |
+| System.IO;FileInfo;CopyTo;(System.String);Argument[0];ReturnValue.Field[System.IO.FileSystemInfo.FullPath];value;dfc-generated |
+| System.IO;FileInfo;CopyTo;(System.String);Argument[0];ReturnValue.Field[System.IO.FileSystemInfo.OriginalPath];value;dfc-generated |
+| System.IO;FileInfo;CopyTo;(System.String,System.Boolean);Argument[0];ReturnValue.Field[System.IO.FileSystemInfo.FullPath];value;dfc-generated |
+| System.IO;FileInfo;CopyTo;(System.String,System.Boolean);Argument[0];ReturnValue.Field[System.IO.FileSystemInfo.OriginalPath];value;dfc-generated |
+| System.IO;FileInfo;Create;();Argument[this].Field[System.IO.FileSystemInfo.FullPath];ReturnValue;taint;dfc-generated |
+| System.IO;FileInfo;MoveTo;(System.String);Argument[0];Argument[this].Field[System.IO.FileSystemInfo.FullPath];value;dfc-generated |
+| System.IO;FileInfo;MoveTo;(System.String);Argument[0];Argument[this].Field[System.IO.FileSystemInfo.OriginalPath];value;dfc-generated |
+| System.IO;FileInfo;MoveTo;(System.String,System.Boolean);Argument[0];Argument[this].Field[System.IO.FileSystemInfo.FullPath];value;dfc-generated |
+| System.IO;FileInfo;MoveTo;(System.String,System.Boolean);Argument[0];Argument[this].Field[System.IO.FileSystemInfo.OriginalPath];value;dfc-generated |
+| System.IO;FileInfo;Open;(System.IO.FileMode);Argument[this].Field[System.IO.FileSystemInfo.FullPath];ReturnValue;taint;dfc-generated |
+| System.IO;FileInfo;Open;(System.IO.FileMode,System.IO.FileAccess);Argument[this].Field[System.IO.FileSystemInfo.FullPath];ReturnValue;taint;dfc-generated |
+| System.IO;FileInfo;Open;(System.IO.FileMode,System.IO.FileAccess,System.IO.FileShare);Argument[this].Field[System.IO.FileSystemInfo.FullPath];ReturnValue;taint;dfc-generated |
+| System.IO;FileInfo;OpenRead;();Argument[this].Field[System.IO.FileSystemInfo.FullPath];ReturnValue;taint;dfc-generated |
+| System.IO;FileInfo;OpenText;();Argument[this].Field[System.IO.FileSystemInfo.FullPath];ReturnValue;taint;dfc-generated |
+| System.IO;FileInfo;OpenWrite;();Argument[this].Field[System.IO.FileSystemInfo.FullPath];ReturnValue;taint;dfc-generated |
 | System.IO;FileInfo;get_Directory;();Argument[this];ReturnValue;taint;df-generated |
-| System.IO;FileInfo;get_DirectoryName;();Argument[this];ReturnValue;taint;df-generated |
-| System.IO;FileLoadException;get_Message;();Argument[this];ReturnValue;taint;df-generated |
-| System.IO;FileNotFoundException;get_Message;();Argument[this];ReturnValue;taint;df-generated |
+| System.IO;FileInfo;get_DirectoryName;();Argument[this].Field[System.IO.FileSystemInfo.FullPath];ReturnValue;value;dfc-generated |
+| System.IO;FileLoadException;get_Message;();Argument[this].SyntheticField[System.Exception._message];ReturnValue;value;dfc-generated |
+| System.IO;FileNotFoundException;get_Message;();Argument[this].SyntheticField[System.Exception._message];ReturnValue;value;dfc-generated |
+| System.IO;FileStream;FileStream;(Microsoft.Win32.SafeHandles.SafeFileHandle,System.IO.FileAccess,System.Int32);Argument[this];Argument[this].SyntheticField[System.IO.FileStream._strategy].SyntheticField[System.IO.Strategies.DerivedFileStreamStrategy._fileStream];value;dfc-generated |
+| System.IO;FileStream;FileStream;(Microsoft.Win32.SafeHandles.SafeFileHandle,System.IO.FileAccess,System.Int32,System.Boolean);Argument[this];Argument[this].SyntheticField[System.IO.FileStream._strategy].SyntheticField[System.IO.Strategies.DerivedFileStreamStrategy._fileStream];value;dfc-generated |
+| System.IO;FileStream;FileStream;(System.IntPtr,System.IO.FileAccess,System.Boolean,System.Int32,System.Boolean);Argument[this];Argument[this].SyntheticField[System.IO.FileStream._strategy].SyntheticField[System.IO.Strategies.DerivedFileStreamStrategy._fileStream];value;dfc-generated |
 | System.IO;FileStream;FileStream;(System.String,System.IO.FileMode);Argument[0];Argument[this];taint;manual |
 | System.IO;FileStream;FileStream;(System.String,System.IO.FileMode,System.IO.FileAccess);Argument[0];Argument[this];taint;manual |
 | System.IO;FileStream;FileStream;(System.String,System.IO.FileMode,System.IO.FileAccess,System.IO.FileShare);Argument[0];Argument[this];taint;manual |
 | System.IO;FileStream;FileStream;(System.String,System.IO.FileMode,System.IO.FileAccess,System.IO.FileShare,System.Int32);Argument[0];Argument[this];taint;manual |
 | System.IO;FileStream;FileStream;(System.String,System.IO.FileMode,System.IO.FileAccess,System.IO.FileShare,System.Int32,System.Boolean);Argument[0];Argument[this];taint;manual |
 | System.IO;FileStream;FileStream;(System.String,System.IO.FileMode,System.IO.FileAccess,System.IO.FileShare,System.Int32,System.IO.FileOptions);Argument[0];Argument[this];taint;manual |
+| System.IO;FileStream;FileStream;(System.String,System.IO.FileStreamOptions);Argument[this];Argument[this].SyntheticField[System.IO.FileStream._strategy].SyntheticField[System.IO.Strategies.DerivedFileStreamStrategy._fileStream];value;dfc-generated |
+| System.IO;FileStream;FlushAsync;(System.Threading.CancellationToken);Argument[this].SyntheticField[System.IO.FileStream._strategy].SyntheticField[System.IO.Strategies.DerivedFileStreamStrategy._fileStream];ReturnValue.SyntheticField[System.Threading.Tasks.Task.m_stateObject];value;dfc-generated |
 | System.IO;FileStream;get_Handle;();Argument[this];ReturnValue;taint;df-generated |
 | System.IO;FileStream;get_Name;();Argument[this];ReturnValue;taint;df-generated |
 | System.IO;FileStream;get_SafeFileHandle;();Argument[this];ReturnValue;taint;df-generated |
-| System.IO;FileSystemEventArgs;FileSystemEventArgs;(System.IO.WatcherChangeTypes,System.String,System.String);Argument[1];Argument[this];taint;df-generated |
-| System.IO;FileSystemEventArgs;FileSystemEventArgs;(System.IO.WatcherChangeTypes,System.String,System.String);Argument[2];Argument[this];taint;df-generated |
-| System.IO;FileSystemEventArgs;get_FullPath;();Argument[this];ReturnValue;taint;df-generated |
-| System.IO;FileSystemEventArgs;get_Name;();Argument[this];ReturnValue;taint;df-generated |
+| System.IO;FileSystemEventArgs;FileSystemEventArgs;(System.IO.WatcherChangeTypes,System.String,System.String);Argument[1];Argument[this].SyntheticField[System.IO.FileSystemEventArgs._fullPath];taint;dfc-generated |
+| System.IO;FileSystemEventArgs;FileSystemEventArgs;(System.IO.WatcherChangeTypes,System.String,System.String);Argument[2];Argument[this].SyntheticField[System.IO.FileSystemEventArgs._fullPath];taint;dfc-generated |
+| System.IO;FileSystemEventArgs;FileSystemEventArgs;(System.IO.WatcherChangeTypes,System.String,System.String);Argument[2];Argument[this].SyntheticField[System.IO.FileSystemEventArgs._name];value;dfc-generated |
+| System.IO;FileSystemEventArgs;get_FullPath;();Argument[this].SyntheticField[System.IO.FileSystemEventArgs._fullPath];ReturnValue;value;dfc-generated |
+| System.IO;FileSystemEventArgs;get_Name;();Argument[this].SyntheticField[System.IO.FileSystemEventArgs._name];ReturnValue;value;dfc-generated |
 | System.IO;FileSystemEventHandler;BeginInvoke;(System.Object,System.IO.FileSystemEventArgs,System.AsyncCallback,System.Object);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
-| System.IO;FileSystemInfo;ToString;();Argument[this];ReturnValue;taint;df-generated |
-| System.IO;FileSystemInfo;get_Extension;();Argument[this];ReturnValue;taint;df-generated |
-| System.IO;FileSystemInfo;get_FullName;();Argument[this];ReturnValue;taint;df-generated |
+| System.IO;FileSystemInfo;ToString;();Argument[this].Field[System.IO.FileSystemInfo.OriginalPath];ReturnValue;value;dfc-generated |
+| System.IO;FileSystemInfo;get_Extension;();Argument[this].Field[System.IO.FileSystemInfo.FullPath];ReturnValue;value;dfc-generated |
+| System.IO;FileSystemInfo;get_FullName;();Argument[this].Field[System.IO.FileSystemInfo.FullPath];ReturnValue;value;dfc-generated |
 | System.IO;FileSystemInfo;get_LinkTarget;();Argument[this];ReturnValue;taint;df-generated |
 | System.IO;FileSystemInfo;get_Name;();Argument[this];ReturnValue;taint;df-generated |
 | System.IO;FileSystemWatcher;FileSystemWatcher;(System.String);Argument[0];Argument[this];taint;df-generated |
-| System.IO;FileSystemWatcher;FileSystemWatcher;(System.String,System.String);Argument[0];Argument[this];taint;df-generated |
-| System.IO;FileSystemWatcher;FileSystemWatcher;(System.String,System.String);Argument[1];Argument[this];taint;df-generated |
+| System.IO;FileSystemWatcher;FileSystemWatcher;(System.String,System.String);Argument[1];Argument[this].Property[System.IO.FileSystemWatcher.Filters].Element;value;dfc-generated |
+| System.IO;FileSystemWatcher;FileSystemWatcher;(System.String,System.String);Argument[1];Argument[this].SyntheticField[System.IO.FileSystemWatcher._filters].Element;value;dfc-generated |
+| System.IO;FileSystemWatcher;OnChanged;(System.IO.FileSystemEventArgs);Argument[0];Argument[this];taint;df-generated |
+| System.IO;FileSystemWatcher;OnCreated;(System.IO.FileSystemEventArgs);Argument[0];Argument[this];taint;df-generated |
+| System.IO;FileSystemWatcher;OnDeleted;(System.IO.FileSystemEventArgs);Argument[0];Argument[this];taint;df-generated |
 | System.IO;FileSystemWatcher;add_Changed;(System.IO.FileSystemEventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.IO;FileSystemWatcher;add_Created;(System.IO.FileSystemEventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.IO;FileSystemWatcher;add_Deleted;(System.IO.FileSystemEventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.IO;FileSystemWatcher;add_Error;(System.IO.ErrorEventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.IO;FileSystemWatcher;add_Renamed;(System.IO.RenamedEventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
-| System.IO;FileSystemWatcher;get_Filters;();Argument[this];ReturnValue;taint;df-generated |
+| System.IO;FileSystemWatcher;get_Filters;();Argument[this].SyntheticField[System.IO.FileSystemWatcher._filters];ReturnValue;value;dfc-generated |
 | System.IO;FileSystemWatcher;remove_Changed;(System.IO.FileSystemEventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.IO;FileSystemWatcher;remove_Created;(System.IO.FileSystemEventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.IO;FileSystemWatcher;remove_Deleted;(System.IO.FileSystemEventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
@@ -7734,7 +8368,7 @@
 | System.IO;MemoryStream;ToArray;();Argument[this];ReturnValue;taint;manual |
 | System.IO;MemoryStream;TryGetBuffer;(System.ArraySegment<System.Byte>);Argument[this];ReturnValue;taint;df-generated |
 | System.IO;MemoryStream;WriteTo;(System.IO.Stream);Argument[this];Argument[0];taint;df-generated |
-| System.IO;Path;ChangeExtension;(System.String,System.String);Argument[0];ReturnValue;taint;df-generated |
+| System.IO;Path;ChangeExtension;(System.String,System.String);Argument[0];ReturnValue;value;dfc-generated |
 | System.IO;Path;Combine;(System.String,System.String);Argument[0];ReturnValue;taint;manual |
 | System.IO;Path;Combine;(System.String,System.String);Argument[1];ReturnValue;taint;manual |
 | System.IO;Path;Combine;(System.String,System.String,System.String);Argument[0];ReturnValue;taint;manual |
@@ -7758,29 +8392,30 @@
 | System.IO;Path;GetPathRoot;(System.ReadOnlySpan<System.Char>);Argument[0].Element;ReturnValue;taint;manual |
 | System.IO;Path;GetPathRoot;(System.String);Argument[0];ReturnValue;taint;manual |
 | System.IO;Path;GetRelativePath;(System.String,System.String);Argument[1];ReturnValue;taint;manual |
-| System.IO;Path;Join;(System.ReadOnlySpan<System.Char>,System.ReadOnlySpan<System.Char>);Argument[0];ReturnValue;taint;df-generated |
-| System.IO;Path;Join;(System.ReadOnlySpan<System.Char>,System.ReadOnlySpan<System.Char>);Argument[1];ReturnValue;taint;df-generated |
-| System.IO;Path;Join;(System.ReadOnlySpan<System.Char>,System.ReadOnlySpan<System.Char>,System.ReadOnlySpan<System.Char>);Argument[0];ReturnValue;taint;df-generated |
-| System.IO;Path;Join;(System.ReadOnlySpan<System.Char>,System.ReadOnlySpan<System.Char>,System.ReadOnlySpan<System.Char>);Argument[1];ReturnValue;taint;df-generated |
-| System.IO;Path;Join;(System.ReadOnlySpan<System.Char>,System.ReadOnlySpan<System.Char>,System.ReadOnlySpan<System.Char>);Argument[2];ReturnValue;taint;df-generated |
-| System.IO;Path;Join;(System.ReadOnlySpan<System.Char>,System.ReadOnlySpan<System.Char>,System.ReadOnlySpan<System.Char>,System.ReadOnlySpan<System.Char>);Argument[0];ReturnValue;taint;df-generated |
-| System.IO;Path;Join;(System.ReadOnlySpan<System.Char>,System.ReadOnlySpan<System.Char>,System.ReadOnlySpan<System.Char>,System.ReadOnlySpan<System.Char>);Argument[1];ReturnValue;taint;df-generated |
-| System.IO;Path;Join;(System.ReadOnlySpan<System.Char>,System.ReadOnlySpan<System.Char>,System.ReadOnlySpan<System.Char>,System.ReadOnlySpan<System.Char>);Argument[2];ReturnValue;taint;df-generated |
-| System.IO;Path;Join;(System.ReadOnlySpan<System.Char>,System.ReadOnlySpan<System.Char>,System.ReadOnlySpan<System.Char>,System.ReadOnlySpan<System.Char>);Argument[3];ReturnValue;taint;df-generated |
-| System.IO;Path;Join;(System.String,System.String);Argument[0];ReturnValue;taint;df-generated |
-| System.IO;Path;Join;(System.String,System.String);Argument[1];ReturnValue;taint;df-generated |
-| System.IO;Path;Join;(System.String,System.String,System.String);Argument[0];ReturnValue;taint;df-generated |
-| System.IO;Path;Join;(System.String,System.String,System.String);Argument[1];ReturnValue;taint;df-generated |
-| System.IO;Path;Join;(System.String,System.String,System.String);Argument[2];ReturnValue;taint;df-generated |
-| System.IO;Path;Join;(System.String,System.String,System.String,System.String);Argument[0];ReturnValue;taint;df-generated |
-| System.IO;Path;Join;(System.String,System.String,System.String,System.String);Argument[1];ReturnValue;taint;df-generated |
-| System.IO;Path;Join;(System.String,System.String,System.String,System.String);Argument[2];ReturnValue;taint;df-generated |
-| System.IO;Path;Join;(System.String,System.String,System.String,System.String);Argument[3];ReturnValue;taint;df-generated |
-| System.IO;Path;TrimEndingDirectorySeparator;(System.ReadOnlySpan<System.Char>);Argument[0];ReturnValue;taint;df-generated |
-| System.IO;Path;TrimEndingDirectorySeparator;(System.String);Argument[0];ReturnValue;taint;df-generated |
-| System.IO;Path;TryJoin;(System.ReadOnlySpan<System.Char>,System.ReadOnlySpan<System.Char>,System.ReadOnlySpan<System.Char>,System.Span<System.Char>,System.Int32);Argument[0];Argument[3];taint;df-generated |
-| System.IO;Path;TryJoin;(System.ReadOnlySpan<System.Char>,System.ReadOnlySpan<System.Char>,System.ReadOnlySpan<System.Char>,System.Span<System.Char>,System.Int32);Argument[1];Argument[3];taint;df-generated |
-| System.IO;Path;TryJoin;(System.ReadOnlySpan<System.Char>,System.ReadOnlySpan<System.Char>,System.Span<System.Char>,System.Int32);Argument[0];Argument[2];taint;df-generated |
+| System.IO;Path;Join;(System.ReadOnlySpan<System.Char>,System.ReadOnlySpan<System.Char>);Argument[0].Element;ReturnValue;taint;dfc-generated |
+| System.IO;Path;Join;(System.ReadOnlySpan<System.Char>,System.ReadOnlySpan<System.Char>);Argument[1].Element;ReturnValue;taint;dfc-generated |
+| System.IO;Path;Join;(System.ReadOnlySpan<System.Char>,System.ReadOnlySpan<System.Char>,System.ReadOnlySpan<System.Char>);Argument[0].Element;ReturnValue;taint;dfc-generated |
+| System.IO;Path;Join;(System.ReadOnlySpan<System.Char>,System.ReadOnlySpan<System.Char>,System.ReadOnlySpan<System.Char>);Argument[1].Element;ReturnValue;taint;dfc-generated |
+| System.IO;Path;Join;(System.ReadOnlySpan<System.Char>,System.ReadOnlySpan<System.Char>,System.ReadOnlySpan<System.Char>);Argument[2].Element;ReturnValue;taint;dfc-generated |
+| System.IO;Path;Join;(System.ReadOnlySpan<System.Char>,System.ReadOnlySpan<System.Char>,System.ReadOnlySpan<System.Char>,System.ReadOnlySpan<System.Char>);Argument[0].Element;ReturnValue;taint;dfc-generated |
+| System.IO;Path;Join;(System.ReadOnlySpan<System.Char>,System.ReadOnlySpan<System.Char>,System.ReadOnlySpan<System.Char>,System.ReadOnlySpan<System.Char>);Argument[1].Element;ReturnValue;taint;dfc-generated |
+| System.IO;Path;Join;(System.ReadOnlySpan<System.Char>,System.ReadOnlySpan<System.Char>,System.ReadOnlySpan<System.Char>,System.ReadOnlySpan<System.Char>);Argument[2].Element;ReturnValue;taint;dfc-generated |
+| System.IO;Path;Join;(System.ReadOnlySpan<System.Char>,System.ReadOnlySpan<System.Char>,System.ReadOnlySpan<System.Char>,System.ReadOnlySpan<System.Char>);Argument[3].Element;ReturnValue;taint;dfc-generated |
+| System.IO;Path;Join;(System.String,System.String);Argument[0];ReturnValue;value;dfc-generated |
+| System.IO;Path;Join;(System.String,System.String);Argument[1];ReturnValue;value;dfc-generated |
+| System.IO;Path;Join;(System.String,System.String,System.String);Argument[0];ReturnValue;value;dfc-generated |
+| System.IO;Path;Join;(System.String,System.String,System.String);Argument[1];ReturnValue;value;dfc-generated |
+| System.IO;Path;Join;(System.String,System.String,System.String);Argument[2];ReturnValue;value;dfc-generated |
+| System.IO;Path;Join;(System.String,System.String,System.String,System.String);Argument[0];ReturnValue;value;dfc-generated |
+| System.IO;Path;Join;(System.String,System.String,System.String,System.String);Argument[1];ReturnValue;value;dfc-generated |
+| System.IO;Path;Join;(System.String,System.String,System.String,System.String);Argument[2];ReturnValue;value;dfc-generated |
+| System.IO;Path;Join;(System.String,System.String,System.String,System.String);Argument[3];ReturnValue;value;dfc-generated |
+| System.IO;Path;TrimEndingDirectorySeparator;(System.ReadOnlySpan<System.Char>);Argument[0].Element;ReturnValue.Element;value;dfc-generated |
+| System.IO;Path;TrimEndingDirectorySeparator;(System.ReadOnlySpan<System.Char>);Argument[0];ReturnValue;value;dfc-generated |
+| System.IO;Path;TrimEndingDirectorySeparator;(System.String);Argument[0];ReturnValue;value;dfc-generated |
+| System.IO;Path;TryJoin;(System.ReadOnlySpan<System.Char>,System.ReadOnlySpan<System.Char>,System.ReadOnlySpan<System.Char>,System.Span<System.Char>,System.Int32);Argument[0].Element;Argument[3].Element;value;dfc-generated |
+| System.IO;Path;TryJoin;(System.ReadOnlySpan<System.Char>,System.ReadOnlySpan<System.Char>,System.ReadOnlySpan<System.Char>,System.Span<System.Char>,System.Int32);Argument[1].Element;Argument[3].Element;value;dfc-generated |
+| System.IO;Path;TryJoin;(System.ReadOnlySpan<System.Char>,System.ReadOnlySpan<System.Char>,System.Span<System.Char>,System.Int32);Argument[0].Element;Argument[2].Element;value;dfc-generated |
 | System.IO;RandomAccess;ReadAsync;(Microsoft.Win32.SafeHandles.SafeFileHandle,System.Collections.Generic.IReadOnlyList<System.Memory<System.Byte>>,System.Int64,System.Threading.CancellationToken);Argument[0];ReturnValue;taint;df-generated |
 | System.IO;RandomAccess;ReadAsync;(Microsoft.Win32.SafeHandles.SafeFileHandle,System.Collections.Generic.IReadOnlyList<System.Memory<System.Byte>>,System.Int64,System.Threading.CancellationToken);Argument[1].Element;ReturnValue;taint;df-generated |
 | System.IO;RandomAccess;ReadAsync;(Microsoft.Win32.SafeHandles.SafeFileHandle,System.Collections.Generic.IReadOnlyList<System.Memory<System.Byte>>,System.Int64,System.Threading.CancellationToken);Argument[3];ReturnValue;taint;df-generated |
@@ -7792,10 +8427,11 @@
 | System.IO;RandomAccess;WriteAsync;(Microsoft.Win32.SafeHandles.SafeFileHandle,System.ReadOnlyMemory<System.Byte>,System.Int64,System.Threading.CancellationToken);Argument[0];ReturnValue;taint;df-generated |
 | System.IO;RandomAccess;WriteAsync;(Microsoft.Win32.SafeHandles.SafeFileHandle,System.ReadOnlyMemory<System.Byte>,System.Int64,System.Threading.CancellationToken);Argument[1];ReturnValue;taint;df-generated |
 | System.IO;RandomAccess;WriteAsync;(Microsoft.Win32.SafeHandles.SafeFileHandle,System.ReadOnlyMemory<System.Byte>,System.Int64,System.Threading.CancellationToken);Argument[3];ReturnValue;taint;df-generated |
-| System.IO;RenamedEventArgs;RenamedEventArgs;(System.IO.WatcherChangeTypes,System.String,System.String,System.String);Argument[1];Argument[this];taint;df-generated |
-| System.IO;RenamedEventArgs;RenamedEventArgs;(System.IO.WatcherChangeTypes,System.String,System.String,System.String);Argument[3];Argument[this];taint;df-generated |
-| System.IO;RenamedEventArgs;get_OldFullPath;();Argument[this];ReturnValue;taint;df-generated |
-| System.IO;RenamedEventArgs;get_OldName;();Argument[this];ReturnValue;taint;df-generated |
+| System.IO;RenamedEventArgs;RenamedEventArgs;(System.IO.WatcherChangeTypes,System.String,System.String,System.String);Argument[1];Argument[this].SyntheticField[System.IO.RenamedEventArgs._oldFullPath];taint;dfc-generated |
+| System.IO;RenamedEventArgs;RenamedEventArgs;(System.IO.WatcherChangeTypes,System.String,System.String,System.String);Argument[3];Argument[this].SyntheticField[System.IO.RenamedEventArgs._oldFullPath];taint;dfc-generated |
+| System.IO;RenamedEventArgs;RenamedEventArgs;(System.IO.WatcherChangeTypes,System.String,System.String,System.String);Argument[3];Argument[this].SyntheticField[System.IO.RenamedEventArgs._oldName];value;dfc-generated |
+| System.IO;RenamedEventArgs;get_OldFullPath;();Argument[this].SyntheticField[System.IO.RenamedEventArgs._oldFullPath];ReturnValue;value;dfc-generated |
+| System.IO;RenamedEventArgs;get_OldName;();Argument[this].SyntheticField[System.IO.RenamedEventArgs._oldName];ReturnValue;value;dfc-generated |
 | System.IO;RenamedEventHandler;BeginInvoke;(System.Object,System.IO.RenamedEventArgs,System.AsyncCallback,System.Object);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
 | System.IO;Stream;BeginRead;(System.Byte[],System.Int32,System.Int32,System.AsyncCallback,System.Object);Argument[3];Argument[3].Parameter[delegate-self];value;manual |
 | System.IO;Stream;BeginRead;(System.Byte[],System.Int32,System.Int32,System.AsyncCallback,System.Object);Argument[this];Argument[0].Element;taint;manual |
@@ -7808,8 +8444,7 @@
 | System.IO;Stream;CopyToAsync;(System.IO.Stream,System.Int32,System.Threading.CancellationToken);Argument[this];Argument[0];taint;manual |
 | System.IO;Stream;CopyToAsync;(System.IO.Stream,System.Threading.CancellationToken);Argument[this];Argument[0];taint;manual |
 | System.IO;Stream;FlushAsync;();Argument[this];ReturnValue;taint;df-generated |
-| System.IO;Stream;FlushAsync;(System.Threading.CancellationToken);Argument[0];ReturnValue;taint;df-generated |
-| System.IO;Stream;FlushAsync;(System.Threading.CancellationToken);Argument[this];ReturnValue;taint;df-generated |
+| System.IO;Stream;FlushAsync;(System.Threading.CancellationToken);Argument[this];ReturnValue.SyntheticField[System.Threading.Tasks.Task.m_stateObject];value;dfc-generated |
 | System.IO;Stream;Read;(System.Byte[],System.Int32,System.Int32);Argument[this];Argument[0].Element;taint;manual |
 | System.IO;Stream;Read;(System.Span<System.Byte>);Argument[this];Argument[0].Element;taint;manual |
 | System.IO;Stream;ReadAsync;(System.Byte[],System.Int32,System.Int32);Argument[this];Argument[0].Element;taint;manual |
@@ -7819,7 +8454,7 @@
 | System.IO;Stream;ReadAtLeastAsync;(System.Memory<System.Byte>,System.Int32,System.Boolean,System.Threading.CancellationToken);Argument[this];Argument[0];taint;manual |
 | System.IO;Stream;ReadExactly;(System.Byte[],System.Int32,System.Int32);Argument[this];Argument[0].Element;taint;manual |
 | System.IO;Stream;ReadExactly;(System.Span<System.Byte>);Argument[this];Argument[0].Element;taint;manual |
-| System.IO;Stream;Synchronized;(System.IO.Stream);Argument[0];ReturnValue;taint;df-generated |
+| System.IO;Stream;Synchronized;(System.IO.Stream);Argument[0];ReturnValue;value;dfc-generated |
 | System.IO;Stream;Write;(System.Byte[],System.Int32,System.Int32);Argument[0].Element;Argument[this];taint;manual |
 | System.IO;Stream;WriteAsync;(System.Byte[],System.Int32,System.Int32);Argument[0].Element;Argument[this];taint;manual |
 | System.IO;Stream;WriteAsync;(System.Byte[],System.Int32,System.Int32,System.Threading.CancellationToken);Argument[0].Element;Argument[this];taint;manual |
@@ -7841,13 +8476,12 @@
 | System.IO;StreamReader;StreamReader;(System.String,System.Text.Encoding,System.Boolean,System.Int32);Argument[0];Argument[this];taint;manual |
 | System.IO;StreamReader;get_BaseStream;();Argument[this];ReturnValue;taint;df-generated |
 | System.IO;StreamReader;get_CurrentEncoding;();Argument[this];ReturnValue;taint;df-generated |
-| System.IO;StreamWriter;StreamWriter;(System.IO.Stream,System.Text.Encoding,System.Int32,System.Boolean);Argument[0];Argument[this];taint;df-generated |
-| System.IO;StreamWriter;StreamWriter;(System.IO.Stream,System.Text.Encoding,System.Int32,System.Boolean);Argument[1];Argument[this];taint;df-generated |
-| System.IO;StreamWriter;get_BaseStream;();Argument[this];ReturnValue;taint;df-generated |
+| System.IO;StreamWriter;StreamWriter;(System.IO.Stream,System.Text.Encoding,System.Int32,System.Boolean);Argument[0];Argument[this].SyntheticField[System.IO.StreamWriter._stream];value;dfc-generated |
+| System.IO;StreamWriter;get_BaseStream;();Argument[this].SyntheticField[System.IO.StreamWriter._stream];ReturnValue;value;dfc-generated |
 | System.IO;StringReader;StringReader;(System.String);Argument[0];Argument[this];taint;manual |
-| System.IO;StringWriter;GetStringBuilder;();Argument[this];ReturnValue;taint;df-generated |
-| System.IO;StringWriter;StringWriter;(System.Text.StringBuilder,System.IFormatProvider);Argument[0];Argument[this];taint;df-generated |
-| System.IO;StringWriter;ToString;();Argument[this];ReturnValue;taint;df-generated |
+| System.IO;StringWriter;GetStringBuilder;();Argument[this];ReturnValue;taint;manual |
+| System.IO;StringWriter;StringWriter;(System.Text.StringBuilder,System.IFormatProvider);Argument[0];Argument[this];taint;manual |
+| System.IO;StringWriter;ToString;();Argument[this];ReturnValue;taint;manual |
 | System.IO;TextReader;Read;();Argument[this];ReturnValue;taint;manual |
 | System.IO;TextReader;Read;(System.Char[],System.Int32,System.Int32);Argument[this];Argument[0].Element;taint;manual |
 | System.IO;TextReader;Read;(System.Span<System.Char>);Argument[this];Argument[0].Element;taint;manual |
@@ -7863,12 +8497,11 @@
 | System.IO;TextReader;ReadToEnd;();Argument[this];ReturnValue;taint;manual |
 | System.IO;TextReader;ReadToEndAsync;();Argument[this];ReturnValue;taint;manual |
 | System.IO;TextReader;ReadToEndAsync;(System.Threading.CancellationToken);Argument[this];ReturnValue;taint;df-generated |
-| System.IO;TextReader;Synchronized;(System.IO.TextReader);Argument[0];ReturnValue;taint;df-generated |
-| System.IO;TextWriter;FlushAsync;();Argument[this];ReturnValue;taint;df-generated |
-| System.IO;TextWriter;FlushAsync;(System.Threading.CancellationToken);Argument[0];ReturnValue;taint;df-generated |
-| System.IO;TextWriter;FlushAsync;(System.Threading.CancellationToken);Argument[this];ReturnValue;taint;df-generated |
-| System.IO;TextWriter;Synchronized;(System.IO.TextWriter);Argument[0];ReturnValue;taint;df-generated |
-| System.IO;TextWriter;TextWriter;(System.IFormatProvider);Argument[0];Argument[this];taint;df-generated |
+| System.IO;TextReader;Synchronized;(System.IO.TextReader);Argument[0];ReturnValue;value;dfc-generated |
+| System.IO;TextWriter;FlushAsync;();Argument[this];ReturnValue.SyntheticField[System.Threading.Tasks.Task.m_stateObject];value;dfc-generated |
+| System.IO;TextWriter;FlushAsync;(System.Threading.CancellationToken);Argument[this];ReturnValue.SyntheticField[System.Threading.Tasks.Task.m_stateObject];value;dfc-generated |
+| System.IO;TextWriter;Synchronized;(System.IO.TextWriter);Argument[0];ReturnValue;value;dfc-generated |
+| System.IO;TextWriter;TextWriter;(System.IFormatProvider);Argument[0];Argument[this].SyntheticField[System.IO.TextWriter._internalFormatProvider];value;dfc-generated |
 | System.IO;TextWriter;Write;(System.Char[]);Argument[0].Element;Argument[this];taint;df-generated |
 | System.IO;TextWriter;Write;(System.Char[],System.Int32,System.Int32);Argument[0].Element;Argument[this];taint;df-generated |
 | System.IO;TextWriter;Write;(System.Object);Argument[0];Argument[this];taint;df-generated |
@@ -7889,15 +8522,11 @@
 | System.IO;TextWriter;WriteAsync;(System.Char[]);Argument[0].Element;Argument[this];taint;df-generated |
 | System.IO;TextWriter;WriteAsync;(System.Char[]);Argument[0].Element;ReturnValue;taint;df-generated |
 | System.IO;TextWriter;WriteAsync;(System.Char[]);Argument[this];ReturnValue;taint;df-generated |
-| System.IO;TextWriter;WriteAsync;(System.Char[],System.Int32,System.Int32);Argument[0].Element;Argument[this];taint;df-generated |
-| System.IO;TextWriter;WriteAsync;(System.Char[],System.Int32,System.Int32);Argument[0].Element;ReturnValue;taint;df-generated |
-| System.IO;TextWriter;WriteAsync;(System.Char[],System.Int32,System.Int32);Argument[this];ReturnValue;taint;df-generated |
+| System.IO;TextWriter;WriteAsync;(System.Char[],System.Int32,System.Int32);Argument[0].Element;Argument[this];taint;dfc-generated |
 | System.IO;TextWriter;WriteAsync;(System.ReadOnlyMemory<System.Char>,System.Threading.CancellationToken);Argument[0];ReturnValue;taint;df-generated |
 | System.IO;TextWriter;WriteAsync;(System.ReadOnlyMemory<System.Char>,System.Threading.CancellationToken);Argument[1];ReturnValue;taint;df-generated |
 | System.IO;TextWriter;WriteAsync;(System.ReadOnlyMemory<System.Char>,System.Threading.CancellationToken);Argument[this];ReturnValue;taint;df-generated |
-| System.IO;TextWriter;WriteAsync;(System.String);Argument[0];Argument[this];taint;df-generated |
-| System.IO;TextWriter;WriteAsync;(System.String);Argument[0];ReturnValue;taint;df-generated |
-| System.IO;TextWriter;WriteAsync;(System.String);Argument[this];ReturnValue;taint;df-generated |
+| System.IO;TextWriter;WriteAsync;(System.String);Argument[0];Argument[this];taint;dfc-generated |
 | System.IO;TextWriter;WriteAsync;(System.Text.StringBuilder,System.Threading.CancellationToken);Argument[0];Argument[this];taint;df-generated |
 | System.IO;TextWriter;WriteAsync;(System.Text.StringBuilder,System.Threading.CancellationToken);Argument[1];ReturnValue;taint;df-generated |
 | System.IO;TextWriter;WriteLine;(System.Char[]);Argument[0].Element;Argument[this];taint;df-generated |
@@ -7934,27 +8563,34 @@
 | System.IO;TextWriter;WriteLineAsync;(System.Text.StringBuilder,System.Threading.CancellationToken);Argument[1];ReturnValue;taint;df-generated |
 | System.IO;TextWriter;WriteLineAsync;(System.Text.StringBuilder,System.Threading.CancellationToken);Argument[this];ReturnValue;taint;df-generated |
 | System.IO;TextWriter;get_Encoding;();Argument[this];ReturnValue;taint;df-generated |
-| System.IO;TextWriter;get_FormatProvider;();Argument[this];ReturnValue;taint;df-generated |
+| System.IO;TextWriter;get_FormatProvider;();Argument[this].SyntheticField[System.IO.TextWriter._internalFormatProvider];ReturnValue;value;dfc-generated |
 | System.IO;UnmanagedMemoryAccessor;Initialize;(System.Runtime.InteropServices.SafeBuffer,System.Int64,System.Int64,System.IO.FileAccess);Argument[0];Argument[this];taint;df-generated |
 | System.IO;UnmanagedMemoryAccessor;UnmanagedMemoryAccessor;(System.Runtime.InteropServices.SafeBuffer,System.Int64,System.Int64);Argument[0];Argument[this];taint;df-generated |
 | System.IO;UnmanagedMemoryAccessor;UnmanagedMemoryAccessor;(System.Runtime.InteropServices.SafeBuffer,System.Int64,System.Int64,System.IO.FileAccess);Argument[0];Argument[this];taint;df-generated |
+| System.IO;UnmanagedMemoryAccessor;Write<T>;(System.Int64,T);Argument[1];ReturnValue;value;dfc-generated |
 | System.IO;UnmanagedMemoryStream;Initialize;(System.Byte*,System.Int64,System.Int64,System.IO.FileAccess);Argument[0];Argument[this];taint;df-generated |
 | System.IO;UnmanagedMemoryStream;Initialize;(System.Runtime.InteropServices.SafeBuffer,System.Int64,System.Int64,System.IO.FileAccess);Argument[0];Argument[this];taint;df-generated |
 | System.IO;UnmanagedMemoryStream;UnmanagedMemoryStream;(System.Byte*,System.Int64);Argument[0];Argument[this];taint;df-generated |
 | System.IO;UnmanagedMemoryStream;UnmanagedMemoryStream;(System.Byte*,System.Int64,System.Int64,System.IO.FileAccess);Argument[0];Argument[this];taint;df-generated |
 | System.IO;UnmanagedMemoryStream;UnmanagedMemoryStream;(System.Runtime.InteropServices.SafeBuffer,System.Int64,System.Int64);Argument[0];Argument[this];taint;df-generated |
 | System.IO;UnmanagedMemoryStream;UnmanagedMemoryStream;(System.Runtime.InteropServices.SafeBuffer,System.Int64,System.Int64,System.IO.FileAccess);Argument[0];Argument[this];taint;df-generated |
-| System.Linq.Expressions;BinaryExpression;Update;(System.Linq.Expressions.Expression,System.Linq.Expressions.LambdaExpression,System.Linq.Expressions.Expression);Argument[this];ReturnValue;value;df-generated |
-| System.Linq.Expressions;BinaryExpression;get_Conversion;();Argument[this];ReturnValue;taint;df-generated |
-| System.Linq.Expressions;BinaryExpression;get_Method;();Argument[this];ReturnValue;taint;df-generated |
-| System.Linq.Expressions;BlockExpression;Update;(System.Collections.Generic.IEnumerable<System.Linq.Expressions.ParameterExpression>,System.Collections.Generic.IEnumerable<System.Linq.Expressions.Expression>);Argument[this];ReturnValue;value;df-generated |
+| System.Linq.Expressions;BinaryExpression;Update;(System.Linq.Expressions.Expression,System.Linq.Expressions.LambdaExpression,System.Linq.Expressions.Expression);Argument[1];ReturnValue.SyntheticField[System.Linq.Expressions.CoalesceConversionBinaryExpression._conversion];value;dfc-generated |
+| System.Linq.Expressions;BinaryExpression;Update;(System.Linq.Expressions.Expression,System.Linq.Expressions.LambdaExpression,System.Linq.Expressions.Expression);Argument[1];ReturnValue.SyntheticField[System.Linq.Expressions.OpAssignMethodConversionBinaryExpression._conversion];value;dfc-generated |
+| System.Linq.Expressions;BinaryExpression;Update;(System.Linq.Expressions.Expression,System.Linq.Expressions.LambdaExpression,System.Linq.Expressions.Expression);Argument[this].Property[System.Linq.Expressions.BinaryExpression.Method];ReturnValue.SyntheticField[System.Linq.Expressions.MethodBinaryExpression._method];value;dfc-generated |
+| System.Linq.Expressions;BinaryExpression;Update;(System.Linq.Expressions.Expression,System.Linq.Expressions.LambdaExpression,System.Linq.Expressions.Expression);Argument[this].SyntheticField[System.Linq.Expressions.MethodBinaryExpression._method];ReturnValue.SyntheticField[System.Linq.Expressions.MethodBinaryExpression._method];value;dfc-generated |
+| System.Linq.Expressions;BinaryExpression;Update;(System.Linq.Expressions.Expression,System.Linq.Expressions.LambdaExpression,System.Linq.Expressions.Expression);Argument[this];ReturnValue;value;dfc-generated |
+| System.Linq.Expressions;BinaryExpression;get_Conversion;();Argument[this].SyntheticField[System.Linq.Expressions.CoalesceConversionBinaryExpression._conversion];ReturnValue;value;dfc-generated |
+| System.Linq.Expressions;BinaryExpression;get_Conversion;();Argument[this].SyntheticField[System.Linq.Expressions.OpAssignMethodConversionBinaryExpression._conversion];ReturnValue;value;dfc-generated |
+| System.Linq.Expressions;BinaryExpression;get_Method;();Argument[this].SyntheticField[System.Linq.Expressions.MethodBinaryExpression._method];ReturnValue;value;dfc-generated |
+| System.Linq.Expressions;BlockExpression;Update;(System.Collections.Generic.IEnumerable<System.Linq.Expressions.ParameterExpression>,System.Collections.Generic.IEnumerable<System.Linq.Expressions.Expression>);Argument[this];ReturnValue;value;dfc-generated |
 | System.Linq.Expressions;BlockExpression;get_Expressions;();Argument[this];ReturnValue;taint;df-generated |
 | System.Linq.Expressions;BlockExpression;get_Result;();Argument[this];ReturnValue;taint;df-generated |
 | System.Linq.Expressions;BlockExpression;get_Variables;();Argument[this];ReturnValue;taint;df-generated |
-| System.Linq.Expressions;CatchBlock;ToString;();Argument[this];ReturnValue;taint;df-generated |
-| System.Linq.Expressions;CatchBlock;Update;(System.Linq.Expressions.ParameterExpression,System.Linq.Expressions.Expression,System.Linq.Expressions.Expression);Argument[this];ReturnValue;value;df-generated |
-| System.Linq.Expressions;ConditionalExpression;Update;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Linq.Expressions.Expression);Argument[this];ReturnValue;value;df-generated |
-| System.Linq.Expressions;ConditionalExpression;get_IfFalse;();Argument[this];ReturnValue;taint;df-generated |
+| System.Linq.Expressions;CatchBlock;ToString;();Argument[this].Property[System.Linq.Expressions.CatchBlock.Variable].Property[System.Linq.Expressions.ParameterExpression.Name];ReturnValue;taint;dfc-generated |
+| System.Linq.Expressions;CatchBlock;Update;(System.Linq.Expressions.ParameterExpression,System.Linq.Expressions.Expression,System.Linq.Expressions.Expression);Argument[this];ReturnValue;value;dfc-generated |
+| System.Linq.Expressions;ConditionalExpression;Update;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Linq.Expressions.Expression);Argument[2];ReturnValue.SyntheticField[System.Linq.Expressions.FullConditionalExpression._false];value;dfc-generated |
+| System.Linq.Expressions;ConditionalExpression;Update;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Linq.Expressions.Expression);Argument[this];ReturnValue;value;dfc-generated |
+| System.Linq.Expressions;ConditionalExpression;get_IfFalse;();Argument[this].SyntheticField[System.Linq.Expressions.FullConditionalExpression._false];ReturnValue;value;dfc-generated |
 | System.Linq.Expressions;DynamicExpression;Dynamic;(System.Runtime.CompilerServices.CallSiteBinder,System.Type,System.Collections.Generic.IEnumerable<System.Linq.Expressions.Expression>);Argument[2].Element;ReturnValue;taint;df-generated |
 | System.Linq.Expressions;DynamicExpression;Dynamic;(System.Runtime.CompilerServices.CallSiteBinder,System.Type,System.Linq.Expressions.Expression);Argument[2];ReturnValue;taint;df-generated |
 | System.Linq.Expressions;DynamicExpression;Dynamic;(System.Runtime.CompilerServices.CallSiteBinder,System.Type,System.Linq.Expressions.Expression,System.Linq.Expressions.Expression);Argument[2];ReturnValue;taint;df-generated |
@@ -7977,29 +8613,30 @@
 | System.Linq.Expressions;DynamicExpression;MakeDynamic;(System.Type,System.Runtime.CompilerServices.CallSiteBinder,System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Linq.Expressions.Expression);Argument[3];ReturnValue;taint;df-generated |
 | System.Linq.Expressions;DynamicExpression;MakeDynamic;(System.Type,System.Runtime.CompilerServices.CallSiteBinder,System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Linq.Expressions.Expression);Argument[4];ReturnValue;taint;df-generated |
 | System.Linq.Expressions;DynamicExpression;MakeDynamic;(System.Type,System.Runtime.CompilerServices.CallSiteBinder,System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Linq.Expressions.Expression);Argument[5];ReturnValue;taint;df-generated |
-| System.Linq.Expressions;DynamicExpression;Update;(System.Collections.Generic.IEnumerable<System.Linq.Expressions.Expression>);Argument[this];ReturnValue;value;df-generated |
+| System.Linq.Expressions;DynamicExpression;Update;(System.Collections.Generic.IEnumerable<System.Linq.Expressions.Expression>);Argument[this];ReturnValue;value;dfc-generated |
 | System.Linq.Expressions;DynamicExpression;get_Arguments;();Argument[this];ReturnValue;taint;df-generated |
+| System.Linq.Expressions;ElementInit;GetArgument;(System.Int32);Argument[this].Property[System.Linq.Expressions.ElementInit.Arguments].Element;ReturnValue;value;df-generated |
+| System.Linq.Expressions;ElementInit;GetArgument;(System.Int32);Argument[this].Property[System.Linq.Expressions.ElementInit.Arguments].Element;ReturnValue;value;dfc-generated |
 | System.Linq.Expressions;ElementInit;ToString;();Argument[this];ReturnValue;taint;df-generated |
-| System.Linq.Expressions;ElementInit;Update;(System.Collections.Generic.IEnumerable<System.Linq.Expressions.Expression>);Argument[this];ReturnValue;value;df-generated |
-| System.Linq.Expressions;Expression;Accept;(System.Linq.Expressions.ExpressionVisitor);Argument[this];Argument[0];taint;df-generated |
-| System.Linq.Expressions;Expression;Accept;(System.Linq.Expressions.ExpressionVisitor);Argument[this];ReturnValue;taint;df-generated |
-| System.Linq.Expressions;Expression;Add;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo);Argument[2];ReturnValue;taint;df-generated |
-| System.Linq.Expressions;Expression;AddAssign;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo);Argument[2];ReturnValue;taint;df-generated |
-| System.Linq.Expressions;Expression;AddAssign;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo,System.Linq.Expressions.LambdaExpression);Argument[2];ReturnValue;taint;df-generated |
-| System.Linq.Expressions;Expression;AddAssign;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo,System.Linq.Expressions.LambdaExpression);Argument[3];ReturnValue;taint;df-generated |
-| System.Linq.Expressions;Expression;AddAssignChecked;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo);Argument[2];ReturnValue;taint;df-generated |
-| System.Linq.Expressions;Expression;AddAssignChecked;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo,System.Linq.Expressions.LambdaExpression);Argument[2];ReturnValue;taint;df-generated |
-| System.Linq.Expressions;Expression;AddAssignChecked;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo,System.Linq.Expressions.LambdaExpression);Argument[3];ReturnValue;taint;df-generated |
-| System.Linq.Expressions;Expression;AddChecked;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo);Argument[2];ReturnValue;taint;df-generated |
-| System.Linq.Expressions;Expression;And;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo);Argument[2];ReturnValue;taint;df-generated |
+| System.Linq.Expressions;ElementInit;Update;(System.Collections.Generic.IEnumerable<System.Linq.Expressions.Expression>);Argument[this];ReturnValue;value;dfc-generated |
+| System.Linq.Expressions;Expression;Accept;(System.Linq.Expressions.ExpressionVisitor);Argument[this];ReturnValue;value;dfc-generated |
+| System.Linq.Expressions;Expression;Add;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo);Argument[2];ReturnValue.SyntheticField[System.Linq.Expressions.MethodBinaryExpression._method];value;dfc-generated |
+| System.Linq.Expressions;Expression;AddAssign;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo);Argument[2];ReturnValue.SyntheticField[System.Linq.Expressions.MethodBinaryExpression._method];value;dfc-generated |
+| System.Linq.Expressions;Expression;AddAssign;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo,System.Linq.Expressions.LambdaExpression);Argument[2];ReturnValue.SyntheticField[System.Linq.Expressions.MethodBinaryExpression._method];value;dfc-generated |
+| System.Linq.Expressions;Expression;AddAssign;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo,System.Linq.Expressions.LambdaExpression);Argument[3];ReturnValue.SyntheticField[System.Linq.Expressions.OpAssignMethodConversionBinaryExpression._conversion];value;dfc-generated |
+| System.Linq.Expressions;Expression;AddAssignChecked;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo);Argument[2];ReturnValue.SyntheticField[System.Linq.Expressions.MethodBinaryExpression._method];value;dfc-generated |
+| System.Linq.Expressions;Expression;AddAssignChecked;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo,System.Linq.Expressions.LambdaExpression);Argument[2];ReturnValue.SyntheticField[System.Linq.Expressions.MethodBinaryExpression._method];value;dfc-generated |
+| System.Linq.Expressions;Expression;AddAssignChecked;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo,System.Linq.Expressions.LambdaExpression);Argument[3];ReturnValue.SyntheticField[System.Linq.Expressions.OpAssignMethodConversionBinaryExpression._conversion];value;dfc-generated |
+| System.Linq.Expressions;Expression;AddChecked;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo);Argument[2];ReturnValue.SyntheticField[System.Linq.Expressions.MethodBinaryExpression._method];value;dfc-generated |
+| System.Linq.Expressions;Expression;And;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo);Argument[2];ReturnValue.SyntheticField[System.Linq.Expressions.MethodBinaryExpression._method];value;dfc-generated |
 | System.Linq.Expressions;Expression;AndAlso;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo);Argument[2];ReturnValue;taint;df-generated |
-| System.Linq.Expressions;Expression;AndAssign;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo);Argument[2];ReturnValue;taint;df-generated |
-| System.Linq.Expressions;Expression;AndAssign;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo,System.Linq.Expressions.LambdaExpression);Argument[2];ReturnValue;taint;df-generated |
-| System.Linq.Expressions;Expression;AndAssign;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo,System.Linq.Expressions.LambdaExpression);Argument[3];ReturnValue;taint;df-generated |
-| System.Linq.Expressions;Expression;ArrayAccess;(System.Linq.Expressions.Expression,System.Collections.Generic.IEnumerable<System.Linq.Expressions.Expression>);Argument[1].Element;ReturnValue;taint;df-generated |
+| System.Linq.Expressions;Expression;AndAssign;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo);Argument[2];ReturnValue.SyntheticField[System.Linq.Expressions.MethodBinaryExpression._method];value;dfc-generated |
+| System.Linq.Expressions;Expression;AndAssign;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo,System.Linq.Expressions.LambdaExpression);Argument[2];ReturnValue.SyntheticField[System.Linq.Expressions.MethodBinaryExpression._method];value;dfc-generated |
+| System.Linq.Expressions;Expression;AndAssign;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo,System.Linq.Expressions.LambdaExpression);Argument[3];ReturnValue.SyntheticField[System.Linq.Expressions.OpAssignMethodConversionBinaryExpression._conversion];value;dfc-generated |
+| System.Linq.Expressions;Expression;ArrayAccess;(System.Linq.Expressions.Expression,System.Collections.Generic.IEnumerable<System.Linq.Expressions.Expression>);Argument[1];ReturnValue.SyntheticField[System.Linq.Expressions.IndexExpression._arguments];value;dfc-generated |
 | System.Linq.Expressions;Expression;ArrayIndex;(System.Linq.Expressions.Expression,System.Collections.Generic.IEnumerable<System.Linq.Expressions.Expression>);Argument[1].Element;ReturnValue;taint;df-generated |
-| System.Linq.Expressions;Expression;Bind;(System.Reflection.MemberInfo,System.Linq.Expressions.Expression);Argument[1];ReturnValue;taint;df-generated |
-| System.Linq.Expressions;Expression;Bind;(System.Reflection.MethodInfo,System.Linq.Expressions.Expression);Argument[1];ReturnValue;taint;df-generated |
+| System.Linq.Expressions;Expression;Bind;(System.Reflection.MemberInfo,System.Linq.Expressions.Expression);Argument[1];ReturnValue.SyntheticField[System.Linq.Expressions.MemberAssignment._expression];value;dfc-generated |
+| System.Linq.Expressions;Expression;Bind;(System.Reflection.MethodInfo,System.Linq.Expressions.Expression);Argument[1];ReturnValue.SyntheticField[System.Linq.Expressions.MemberAssignment._expression];value;dfc-generated |
 | System.Linq.Expressions;Expression;Block;(System.Collections.Generic.IEnumerable<System.Linq.Expressions.Expression>);Argument[0].Element;ReturnValue;taint;df-generated |
 | System.Linq.Expressions;Expression;Block;(System.Collections.Generic.IEnumerable<System.Linq.Expressions.ParameterExpression>,System.Collections.Generic.IEnumerable<System.Linq.Expressions.Expression>);Argument[1].Element;ReturnValue;taint;df-generated |
 | System.Linq.Expressions;Expression;Block;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression);Argument[0];ReturnValue;taint;df-generated |
@@ -8019,15 +8656,17 @@
 | System.Linq.Expressions;Expression;Block;(System.Type,System.Collections.Generic.IEnumerable<System.Linq.Expressions.Expression>);Argument[1].Element;ReturnValue;taint;df-generated |
 | System.Linq.Expressions;Expression;Block;(System.Type,System.Collections.Generic.IEnumerable<System.Linq.Expressions.ParameterExpression>,System.Collections.Generic.IEnumerable<System.Linq.Expressions.Expression>);Argument[2].Element;ReturnValue;taint;df-generated |
 | System.Linq.Expressions;Expression;Call;(System.Linq.Expressions.Expression,System.Reflection.MethodInfo,System.Collections.Generic.IEnumerable<System.Linq.Expressions.Expression>);Argument[2].Element;ReturnValue;taint;df-generated |
-| System.Linq.Expressions;Expression;Call;(System.Linq.Expressions.Expression,System.Reflection.MethodInfo,System.Linq.Expressions.Expression,System.Linq.Expressions.Expression);Argument[2];ReturnValue;taint;df-generated |
-| System.Linq.Expressions;Expression;Call;(System.Linq.Expressions.Expression,System.Reflection.MethodInfo,System.Linq.Expressions.Expression,System.Linq.Expressions.Expression);Argument[3];ReturnValue;taint;df-generated |
+| System.Linq.Expressions;Expression;Call;(System.Linq.Expressions.Expression,System.Reflection.MethodInfo,System.Linq.Expressions.Expression,System.Linq.Expressions.Expression);Argument[2];ReturnValue.SyntheticField[System.Linq.Expressions.InstanceMethodCallExpression2._arg0];value;dfc-generated |
+| System.Linq.Expressions;Expression;Call;(System.Linq.Expressions.Expression,System.Reflection.MethodInfo,System.Linq.Expressions.Expression,System.Linq.Expressions.Expression);Argument[2];ReturnValue.SyntheticField[System.Linq.Expressions.MethodCallExpression2._arg0];value;dfc-generated |
+| System.Linq.Expressions;Expression;Call;(System.Linq.Expressions.Expression,System.Reflection.MethodInfo,System.Linq.Expressions.Expression,System.Linq.Expressions.Expression);Argument[3];ReturnValue.SyntheticField[System.Linq.Expressions.InstanceMethodCallExpression2._arg1];value;dfc-generated |
+| System.Linq.Expressions;Expression;Call;(System.Linq.Expressions.Expression,System.Reflection.MethodInfo,System.Linq.Expressions.Expression,System.Linq.Expressions.Expression);Argument[3];ReturnValue.SyntheticField[System.Linq.Expressions.MethodCallExpression2._arg1];value;dfc-generated |
 | System.Linq.Expressions;Expression;Call;(System.Linq.Expressions.Expression,System.Reflection.MethodInfo,System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Linq.Expressions.Expression);Argument[2];ReturnValue;taint;df-generated |
 | System.Linq.Expressions;Expression;Call;(System.Linq.Expressions.Expression,System.Reflection.MethodInfo,System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Linq.Expressions.Expression);Argument[3];ReturnValue;taint;df-generated |
 | System.Linq.Expressions;Expression;Call;(System.Linq.Expressions.Expression,System.Reflection.MethodInfo,System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Linq.Expressions.Expression);Argument[4];ReturnValue;taint;df-generated |
 | System.Linq.Expressions;Expression;Call;(System.Reflection.MethodInfo,System.Collections.Generic.IEnumerable<System.Linq.Expressions.Expression>);Argument[1].Element;ReturnValue;taint;df-generated |
-| System.Linq.Expressions;Expression;Call;(System.Reflection.MethodInfo,System.Linq.Expressions.Expression);Argument[1];ReturnValue;taint;df-generated |
-| System.Linq.Expressions;Expression;Call;(System.Reflection.MethodInfo,System.Linq.Expressions.Expression,System.Linq.Expressions.Expression);Argument[1];ReturnValue;taint;df-generated |
-| System.Linq.Expressions;Expression;Call;(System.Reflection.MethodInfo,System.Linq.Expressions.Expression,System.Linq.Expressions.Expression);Argument[2];ReturnValue;taint;df-generated |
+| System.Linq.Expressions;Expression;Call;(System.Reflection.MethodInfo,System.Linq.Expressions.Expression);Argument[1];ReturnValue.SyntheticField[System.Linq.Expressions.MethodCallExpression1._arg0];value;dfc-generated |
+| System.Linq.Expressions;Expression;Call;(System.Reflection.MethodInfo,System.Linq.Expressions.Expression,System.Linq.Expressions.Expression);Argument[1];ReturnValue.SyntheticField[System.Linq.Expressions.MethodCallExpression2._arg0];value;dfc-generated |
+| System.Linq.Expressions;Expression;Call;(System.Reflection.MethodInfo,System.Linq.Expressions.Expression,System.Linq.Expressions.Expression);Argument[2];ReturnValue.SyntheticField[System.Linq.Expressions.MethodCallExpression2._arg1];value;dfc-generated |
 | System.Linq.Expressions;Expression;Call;(System.Reflection.MethodInfo,System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Linq.Expressions.Expression);Argument[1];ReturnValue;taint;df-generated |
 | System.Linq.Expressions;Expression;Call;(System.Reflection.MethodInfo,System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Linq.Expressions.Expression);Argument[2];ReturnValue;taint;df-generated |
 | System.Linq.Expressions;Expression;Call;(System.Reflection.MethodInfo,System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Linq.Expressions.Expression);Argument[3];ReturnValue;taint;df-generated |
@@ -8041,12 +8680,12 @@
 | System.Linq.Expressions;Expression;Call;(System.Reflection.MethodInfo,System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Linq.Expressions.Expression);Argument[4];ReturnValue;taint;df-generated |
 | System.Linq.Expressions;Expression;Call;(System.Reflection.MethodInfo,System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Linq.Expressions.Expression);Argument[5];ReturnValue;taint;df-generated |
 | System.Linq.Expressions;Expression;Coalesce;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Linq.Expressions.LambdaExpression);Argument[2];ReturnValue;taint;df-generated |
-| System.Linq.Expressions;Expression;Condition;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Linq.Expressions.Expression);Argument[2];ReturnValue;taint;df-generated |
-| System.Linq.Expressions;Expression;Condition;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Type);Argument[2];ReturnValue;taint;df-generated |
-| System.Linq.Expressions;Expression;Divide;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo);Argument[2];ReturnValue;taint;df-generated |
-| System.Linq.Expressions;Expression;DivideAssign;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo);Argument[2];ReturnValue;taint;df-generated |
-| System.Linq.Expressions;Expression;DivideAssign;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo,System.Linq.Expressions.LambdaExpression);Argument[2];ReturnValue;taint;df-generated |
-| System.Linq.Expressions;Expression;DivideAssign;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo,System.Linq.Expressions.LambdaExpression);Argument[3];ReturnValue;taint;df-generated |
+| System.Linq.Expressions;Expression;Condition;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Linq.Expressions.Expression);Argument[2];ReturnValue.SyntheticField[System.Linq.Expressions.FullConditionalExpression._false];value;dfc-generated |
+| System.Linq.Expressions;Expression;Condition;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Type);Argument[2];ReturnValue.SyntheticField[System.Linq.Expressions.FullConditionalExpression._false];value;dfc-generated |
+| System.Linq.Expressions;Expression;Divide;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo);Argument[2];ReturnValue.SyntheticField[System.Linq.Expressions.MethodBinaryExpression._method];value;dfc-generated |
+| System.Linq.Expressions;Expression;DivideAssign;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo);Argument[2];ReturnValue.SyntheticField[System.Linq.Expressions.MethodBinaryExpression._method];value;dfc-generated |
+| System.Linq.Expressions;Expression;DivideAssign;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo,System.Linq.Expressions.LambdaExpression);Argument[2];ReturnValue.SyntheticField[System.Linq.Expressions.MethodBinaryExpression._method];value;dfc-generated |
+| System.Linq.Expressions;Expression;DivideAssign;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo,System.Linq.Expressions.LambdaExpression);Argument[3];ReturnValue.SyntheticField[System.Linq.Expressions.OpAssignMethodConversionBinaryExpression._conversion];value;dfc-generated |
 | System.Linq.Expressions;Expression;Dynamic;(System.Runtime.CompilerServices.CallSiteBinder,System.Type,System.Collections.Generic.IEnumerable<System.Linq.Expressions.Expression>);Argument[2].Element;ReturnValue;taint;df-generated |
 | System.Linq.Expressions;Expression;Dynamic;(System.Runtime.CompilerServices.CallSiteBinder,System.Type,System.Linq.Expressions.Expression);Argument[2];ReturnValue;taint;df-generated |
 | System.Linq.Expressions;Expression;Dynamic;(System.Runtime.CompilerServices.CallSiteBinder,System.Type,System.Linq.Expressions.Expression,System.Linq.Expressions.Expression);Argument[2];ReturnValue;taint;df-generated |
@@ -8058,15 +8697,15 @@
 | System.Linq.Expressions;Expression;Dynamic;(System.Runtime.CompilerServices.CallSiteBinder,System.Type,System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Linq.Expressions.Expression);Argument[3];ReturnValue;taint;df-generated |
 | System.Linq.Expressions;Expression;Dynamic;(System.Runtime.CompilerServices.CallSiteBinder,System.Type,System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Linq.Expressions.Expression);Argument[4];ReturnValue;taint;df-generated |
 | System.Linq.Expressions;Expression;Dynamic;(System.Runtime.CompilerServices.CallSiteBinder,System.Type,System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Linq.Expressions.Expression);Argument[5];ReturnValue;taint;df-generated |
-| System.Linq.Expressions;Expression;Equal;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Boolean,System.Reflection.MethodInfo);Argument[3];ReturnValue;taint;df-generated |
-| System.Linq.Expressions;Expression;ExclusiveOr;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo);Argument[2];ReturnValue;taint;df-generated |
-| System.Linq.Expressions;Expression;ExclusiveOrAssign;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo);Argument[2];ReturnValue;taint;df-generated |
-| System.Linq.Expressions;Expression;ExclusiveOrAssign;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo,System.Linq.Expressions.LambdaExpression);Argument[2];ReturnValue;taint;df-generated |
-| System.Linq.Expressions;Expression;ExclusiveOrAssign;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo,System.Linq.Expressions.LambdaExpression);Argument[3];ReturnValue;taint;df-generated |
+| System.Linq.Expressions;Expression;Equal;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Boolean,System.Reflection.MethodInfo);Argument[3];ReturnValue.SyntheticField[System.Linq.Expressions.MethodBinaryExpression._method];value;dfc-generated |
+| System.Linq.Expressions;Expression;ExclusiveOr;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo);Argument[2];ReturnValue.SyntheticField[System.Linq.Expressions.MethodBinaryExpression._method];value;dfc-generated |
+| System.Linq.Expressions;Expression;ExclusiveOrAssign;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo);Argument[2];ReturnValue.SyntheticField[System.Linq.Expressions.MethodBinaryExpression._method];value;dfc-generated |
+| System.Linq.Expressions;Expression;ExclusiveOrAssign;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo,System.Linq.Expressions.LambdaExpression);Argument[2];ReturnValue.SyntheticField[System.Linq.Expressions.MethodBinaryExpression._method];value;dfc-generated |
+| System.Linq.Expressions;Expression;ExclusiveOrAssign;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo,System.Linq.Expressions.LambdaExpression);Argument[3];ReturnValue.SyntheticField[System.Linq.Expressions.OpAssignMethodConversionBinaryExpression._conversion];value;dfc-generated |
 | System.Linq.Expressions;Expression;Field;(System.Linq.Expressions.Expression,System.Reflection.FieldInfo);Argument[1];ReturnValue;taint;df-generated |
-| System.Linq.Expressions;Expression;GreaterThan;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Boolean,System.Reflection.MethodInfo);Argument[3];ReturnValue;taint;df-generated |
-| System.Linq.Expressions;Expression;GreaterThanOrEqual;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Boolean,System.Reflection.MethodInfo);Argument[3];ReturnValue;taint;df-generated |
-| System.Linq.Expressions;Expression;IfThenElse;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Linq.Expressions.Expression);Argument[2];ReturnValue;taint;df-generated |
+| System.Linq.Expressions;Expression;GreaterThan;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Boolean,System.Reflection.MethodInfo);Argument[3];ReturnValue.SyntheticField[System.Linq.Expressions.MethodBinaryExpression._method];value;dfc-generated |
+| System.Linq.Expressions;Expression;GreaterThanOrEqual;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Boolean,System.Reflection.MethodInfo);Argument[3];ReturnValue.SyntheticField[System.Linq.Expressions.MethodBinaryExpression._method];value;dfc-generated |
+| System.Linq.Expressions;Expression;IfThenElse;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Linq.Expressions.Expression);Argument[2];ReturnValue.SyntheticField[System.Linq.Expressions.FullConditionalExpression._false];value;dfc-generated |
 | System.Linq.Expressions;Expression;Invoke;(System.Linq.Expressions.Expression,System.Collections.Generic.IEnumerable<System.Linq.Expressions.Expression>);Argument[1].Element;ReturnValue;taint;df-generated |
 | System.Linq.Expressions;Expression;Lambda<TDelegate>;(System.Linq.Expressions.Expression,System.Boolean,System.Collections.Generic.IEnumerable<System.Linq.Expressions.ParameterExpression>);Argument[2].Element;ReturnValue;taint;df-generated |
 | System.Linq.Expressions;Expression;Lambda<TDelegate>;(System.Linq.Expressions.Expression,System.Collections.Generic.IEnumerable<System.Linq.Expressions.ParameterExpression>);Argument[1].Element;ReturnValue;taint;df-generated |
@@ -8074,15 +8713,16 @@
 | System.Linq.Expressions;Expression;Lambda<TDelegate>;(System.Linq.Expressions.Expression,System.String,System.Boolean,System.Collections.Generic.IEnumerable<System.Linq.Expressions.ParameterExpression>);Argument[3].Element;ReturnValue;taint;df-generated |
 | System.Linq.Expressions;Expression;Lambda<TDelegate>;(System.Linq.Expressions.Expression,System.String,System.Collections.Generic.IEnumerable<System.Linq.Expressions.ParameterExpression>);Argument[1];ReturnValue;taint;df-generated |
 | System.Linq.Expressions;Expression;Lambda<TDelegate>;(System.Linq.Expressions.Expression,System.String,System.Collections.Generic.IEnumerable<System.Linq.Expressions.ParameterExpression>);Argument[2].Element;ReturnValue;taint;df-generated |
-| System.Linq.Expressions;Expression;LeftShift;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo);Argument[2];ReturnValue;taint;df-generated |
-| System.Linq.Expressions;Expression;LeftShiftAssign;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo);Argument[2];ReturnValue;taint;df-generated |
-| System.Linq.Expressions;Expression;LeftShiftAssign;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo,System.Linq.Expressions.LambdaExpression);Argument[2];ReturnValue;taint;df-generated |
-| System.Linq.Expressions;Expression;LeftShiftAssign;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo,System.Linq.Expressions.LambdaExpression);Argument[3];ReturnValue;taint;df-generated |
-| System.Linq.Expressions;Expression;LessThan;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Boolean,System.Reflection.MethodInfo);Argument[3];ReturnValue;taint;df-generated |
-| System.Linq.Expressions;Expression;LessThanOrEqual;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Boolean,System.Reflection.MethodInfo);Argument[3];ReturnValue;taint;df-generated |
-| System.Linq.Expressions;Expression;MakeBinary;(System.Linq.Expressions.ExpressionType,System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Boolean,System.Reflection.MethodInfo);Argument[4];ReturnValue;taint;df-generated |
-| System.Linq.Expressions;Expression;MakeBinary;(System.Linq.Expressions.ExpressionType,System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Boolean,System.Reflection.MethodInfo,System.Linq.Expressions.LambdaExpression);Argument[4];ReturnValue;taint;df-generated |
-| System.Linq.Expressions;Expression;MakeBinary;(System.Linq.Expressions.ExpressionType,System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Boolean,System.Reflection.MethodInfo,System.Linq.Expressions.LambdaExpression);Argument[5];ReturnValue;taint;df-generated |
+| System.Linq.Expressions;Expression;LeftShift;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo);Argument[2];ReturnValue.SyntheticField[System.Linq.Expressions.MethodBinaryExpression._method];value;dfc-generated |
+| System.Linq.Expressions;Expression;LeftShiftAssign;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo);Argument[2];ReturnValue.SyntheticField[System.Linq.Expressions.MethodBinaryExpression._method];value;dfc-generated |
+| System.Linq.Expressions;Expression;LeftShiftAssign;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo,System.Linq.Expressions.LambdaExpression);Argument[2];ReturnValue.SyntheticField[System.Linq.Expressions.MethodBinaryExpression._method];value;dfc-generated |
+| System.Linq.Expressions;Expression;LeftShiftAssign;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo,System.Linq.Expressions.LambdaExpression);Argument[3];ReturnValue.SyntheticField[System.Linq.Expressions.OpAssignMethodConversionBinaryExpression._conversion];value;dfc-generated |
+| System.Linq.Expressions;Expression;LessThan;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Boolean,System.Reflection.MethodInfo);Argument[3];ReturnValue.SyntheticField[System.Linq.Expressions.MethodBinaryExpression._method];value;dfc-generated |
+| System.Linq.Expressions;Expression;LessThanOrEqual;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Boolean,System.Reflection.MethodInfo);Argument[3];ReturnValue.SyntheticField[System.Linq.Expressions.MethodBinaryExpression._method];value;dfc-generated |
+| System.Linq.Expressions;Expression;MakeBinary;(System.Linq.Expressions.ExpressionType,System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Boolean,System.Reflection.MethodInfo);Argument[4];ReturnValue.SyntheticField[System.Linq.Expressions.MethodBinaryExpression._method];value;dfc-generated |
+| System.Linq.Expressions;Expression;MakeBinary;(System.Linq.Expressions.ExpressionType,System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Boolean,System.Reflection.MethodInfo,System.Linq.Expressions.LambdaExpression);Argument[4];ReturnValue.SyntheticField[System.Linq.Expressions.MethodBinaryExpression._method];value;dfc-generated |
+| System.Linq.Expressions;Expression;MakeBinary;(System.Linq.Expressions.ExpressionType,System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Boolean,System.Reflection.MethodInfo,System.Linq.Expressions.LambdaExpression);Argument[5];ReturnValue.SyntheticField[System.Linq.Expressions.CoalesceConversionBinaryExpression._conversion];value;dfc-generated |
+| System.Linq.Expressions;Expression;MakeBinary;(System.Linq.Expressions.ExpressionType,System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Boolean,System.Reflection.MethodInfo,System.Linq.Expressions.LambdaExpression);Argument[5];ReturnValue.SyntheticField[System.Linq.Expressions.OpAssignMethodConversionBinaryExpression._conversion];value;dfc-generated |
 | System.Linq.Expressions;Expression;MakeDynamic;(System.Type,System.Runtime.CompilerServices.CallSiteBinder,System.Collections.Generic.IEnumerable<System.Linq.Expressions.Expression>);Argument[2].Element;ReturnValue;taint;df-generated |
 | System.Linq.Expressions;Expression;MakeDynamic;(System.Type,System.Runtime.CompilerServices.CallSiteBinder,System.Linq.Expressions.Expression);Argument[2];ReturnValue;taint;df-generated |
 | System.Linq.Expressions;Expression;MakeDynamic;(System.Type,System.Runtime.CompilerServices.CallSiteBinder,System.Linq.Expressions.Expression,System.Linq.Expressions.Expression);Argument[2];ReturnValue;taint;df-generated |
@@ -8094,50 +8734,51 @@
 | System.Linq.Expressions;Expression;MakeDynamic;(System.Type,System.Runtime.CompilerServices.CallSiteBinder,System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Linq.Expressions.Expression);Argument[3];ReturnValue;taint;df-generated |
 | System.Linq.Expressions;Expression;MakeDynamic;(System.Type,System.Runtime.CompilerServices.CallSiteBinder,System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Linq.Expressions.Expression);Argument[4];ReturnValue;taint;df-generated |
 | System.Linq.Expressions;Expression;MakeDynamic;(System.Type,System.Runtime.CompilerServices.CallSiteBinder,System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Linq.Expressions.Expression);Argument[5];ReturnValue;taint;df-generated |
-| System.Linq.Expressions;Expression;MakeIndex;(System.Linq.Expressions.Expression,System.Reflection.PropertyInfo,System.Collections.Generic.IEnumerable<System.Linq.Expressions.Expression>);Argument[2].Element;ReturnValue;taint;df-generated |
-| System.Linq.Expressions;Expression;MakeMemberAccess;(System.Linq.Expressions.Expression,System.Reflection.MemberInfo);Argument[1];ReturnValue;taint;df-generated |
-| System.Linq.Expressions;Expression;Modulo;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo);Argument[2];ReturnValue;taint;df-generated |
-| System.Linq.Expressions;Expression;ModuloAssign;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo);Argument[2];ReturnValue;taint;df-generated |
-| System.Linq.Expressions;Expression;ModuloAssign;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo,System.Linq.Expressions.LambdaExpression);Argument[2];ReturnValue;taint;df-generated |
-| System.Linq.Expressions;Expression;ModuloAssign;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo,System.Linq.Expressions.LambdaExpression);Argument[3];ReturnValue;taint;df-generated |
-| System.Linq.Expressions;Expression;Multiply;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo);Argument[2];ReturnValue;taint;df-generated |
-| System.Linq.Expressions;Expression;MultiplyAssign;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo);Argument[2];ReturnValue;taint;df-generated |
-| System.Linq.Expressions;Expression;MultiplyAssign;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo,System.Linq.Expressions.LambdaExpression);Argument[2];ReturnValue;taint;df-generated |
-| System.Linq.Expressions;Expression;MultiplyAssign;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo,System.Linq.Expressions.LambdaExpression);Argument[3];ReturnValue;taint;df-generated |
-| System.Linq.Expressions;Expression;MultiplyAssignChecked;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo);Argument[2];ReturnValue;taint;df-generated |
-| System.Linq.Expressions;Expression;MultiplyAssignChecked;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo,System.Linq.Expressions.LambdaExpression);Argument[2];ReturnValue;taint;df-generated |
-| System.Linq.Expressions;Expression;MultiplyAssignChecked;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo,System.Linq.Expressions.LambdaExpression);Argument[3];ReturnValue;taint;df-generated |
-| System.Linq.Expressions;Expression;MultiplyChecked;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo);Argument[2];ReturnValue;taint;df-generated |
-| System.Linq.Expressions;Expression;New;(System.Reflection.ConstructorInfo,System.Collections.Generic.IEnumerable<System.Linq.Expressions.Expression>);Argument[1].Element;ReturnValue;taint;df-generated |
-| System.Linq.Expressions;Expression;New;(System.Reflection.ConstructorInfo,System.Collections.Generic.IEnumerable<System.Linq.Expressions.Expression>,System.Collections.Generic.IEnumerable<System.Reflection.MemberInfo>);Argument[1].Element;ReturnValue;taint;df-generated |
-| System.Linq.Expressions;Expression;New;(System.Reflection.ConstructorInfo,System.Collections.Generic.IEnumerable<System.Linq.Expressions.Expression>,System.Reflection.MemberInfo[]);Argument[1].Element;ReturnValue;taint;df-generated |
-| System.Linq.Expressions;Expression;NotEqual;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Boolean,System.Reflection.MethodInfo);Argument[3];ReturnValue;taint;df-generated |
-| System.Linq.Expressions;Expression;Or;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo);Argument[2];ReturnValue;taint;df-generated |
-| System.Linq.Expressions;Expression;OrAssign;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo);Argument[2];ReturnValue;taint;df-generated |
-| System.Linq.Expressions;Expression;OrAssign;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo,System.Linq.Expressions.LambdaExpression);Argument[2];ReturnValue;taint;df-generated |
-| System.Linq.Expressions;Expression;OrAssign;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo,System.Linq.Expressions.LambdaExpression);Argument[3];ReturnValue;taint;df-generated |
+| System.Linq.Expressions;Expression;MakeIndex;(System.Linq.Expressions.Expression,System.Reflection.PropertyInfo,System.Collections.Generic.IEnumerable<System.Linq.Expressions.Expression>);Argument[2];ReturnValue.SyntheticField[System.Linq.Expressions.IndexExpression._arguments];value;dfc-generated |
+| System.Linq.Expressions;Expression;MakeMemberAccess;(System.Linq.Expressions.Expression,System.Reflection.MemberInfo);Argument[1];ReturnValue.SyntheticField[System.Linq.Expressions.FieldExpression._field];value;dfc-generated |
+| System.Linq.Expressions;Expression;MakeMemberAccess;(System.Linq.Expressions.Expression,System.Reflection.MemberInfo);Argument[1];ReturnValue.SyntheticField[System.Linq.Expressions.PropertyExpression._property];value;dfc-generated |
+| System.Linq.Expressions;Expression;Modulo;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo);Argument[2];ReturnValue.SyntheticField[System.Linq.Expressions.MethodBinaryExpression._method];value;dfc-generated |
+| System.Linq.Expressions;Expression;ModuloAssign;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo);Argument[2];ReturnValue.SyntheticField[System.Linq.Expressions.MethodBinaryExpression._method];value;dfc-generated |
+| System.Linq.Expressions;Expression;ModuloAssign;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo,System.Linq.Expressions.LambdaExpression);Argument[2];ReturnValue.SyntheticField[System.Linq.Expressions.MethodBinaryExpression._method];value;dfc-generated |
+| System.Linq.Expressions;Expression;ModuloAssign;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo,System.Linq.Expressions.LambdaExpression);Argument[3];ReturnValue.SyntheticField[System.Linq.Expressions.OpAssignMethodConversionBinaryExpression._conversion];value;dfc-generated |
+| System.Linq.Expressions;Expression;Multiply;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo);Argument[2];ReturnValue.SyntheticField[System.Linq.Expressions.MethodBinaryExpression._method];value;dfc-generated |
+| System.Linq.Expressions;Expression;MultiplyAssign;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo);Argument[2];ReturnValue.SyntheticField[System.Linq.Expressions.MethodBinaryExpression._method];value;dfc-generated |
+| System.Linq.Expressions;Expression;MultiplyAssign;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo,System.Linq.Expressions.LambdaExpression);Argument[2];ReturnValue.SyntheticField[System.Linq.Expressions.MethodBinaryExpression._method];value;dfc-generated |
+| System.Linq.Expressions;Expression;MultiplyAssign;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo,System.Linq.Expressions.LambdaExpression);Argument[3];ReturnValue.SyntheticField[System.Linq.Expressions.OpAssignMethodConversionBinaryExpression._conversion];value;dfc-generated |
+| System.Linq.Expressions;Expression;MultiplyAssignChecked;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo);Argument[2];ReturnValue.SyntheticField[System.Linq.Expressions.MethodBinaryExpression._method];value;dfc-generated |
+| System.Linq.Expressions;Expression;MultiplyAssignChecked;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo,System.Linq.Expressions.LambdaExpression);Argument[2];ReturnValue.SyntheticField[System.Linq.Expressions.MethodBinaryExpression._method];value;dfc-generated |
+| System.Linq.Expressions;Expression;MultiplyAssignChecked;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo,System.Linq.Expressions.LambdaExpression);Argument[3];ReturnValue.SyntheticField[System.Linq.Expressions.OpAssignMethodConversionBinaryExpression._conversion];value;dfc-generated |
+| System.Linq.Expressions;Expression;MultiplyChecked;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo);Argument[2];ReturnValue.SyntheticField[System.Linq.Expressions.MethodBinaryExpression._method];value;dfc-generated |
+| System.Linq.Expressions;Expression;New;(System.Reflection.ConstructorInfo,System.Collections.Generic.IEnumerable<System.Linq.Expressions.Expression>);Argument[1];ReturnValue.SyntheticField[System.Linq.Expressions.NewExpression._arguments];value;dfc-generated |
+| System.Linq.Expressions;Expression;New;(System.Reflection.ConstructorInfo,System.Collections.Generic.IEnumerable<System.Linq.Expressions.Expression>,System.Collections.Generic.IEnumerable<System.Reflection.MemberInfo>);Argument[1];ReturnValue.SyntheticField[System.Linq.Expressions.NewExpression._arguments];value;dfc-generated |
+| System.Linq.Expressions;Expression;New;(System.Reflection.ConstructorInfo,System.Collections.Generic.IEnumerable<System.Linq.Expressions.Expression>,System.Reflection.MemberInfo[]);Argument[1];ReturnValue.SyntheticField[System.Linq.Expressions.NewExpression._arguments];value;dfc-generated |
+| System.Linq.Expressions;Expression;NotEqual;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Boolean,System.Reflection.MethodInfo);Argument[3];ReturnValue.SyntheticField[System.Linq.Expressions.MethodBinaryExpression._method];value;dfc-generated |
+| System.Linq.Expressions;Expression;Or;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo);Argument[2];ReturnValue.SyntheticField[System.Linq.Expressions.MethodBinaryExpression._method];value;dfc-generated |
+| System.Linq.Expressions;Expression;OrAssign;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo);Argument[2];ReturnValue.SyntheticField[System.Linq.Expressions.MethodBinaryExpression._method];value;dfc-generated |
+| System.Linq.Expressions;Expression;OrAssign;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo,System.Linq.Expressions.LambdaExpression);Argument[2];ReturnValue.SyntheticField[System.Linq.Expressions.MethodBinaryExpression._method];value;dfc-generated |
+| System.Linq.Expressions;Expression;OrAssign;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo,System.Linq.Expressions.LambdaExpression);Argument[3];ReturnValue.SyntheticField[System.Linq.Expressions.OpAssignMethodConversionBinaryExpression._conversion];value;dfc-generated |
 | System.Linq.Expressions;Expression;OrElse;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo);Argument[2];ReturnValue;taint;df-generated |
-| System.Linq.Expressions;Expression;Power;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo);Argument[2];ReturnValue;taint;df-generated |
-| System.Linq.Expressions;Expression;PowerAssign;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo);Argument[2];ReturnValue;taint;df-generated |
-| System.Linq.Expressions;Expression;PowerAssign;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo,System.Linq.Expressions.LambdaExpression);Argument[2];ReturnValue;taint;df-generated |
-| System.Linq.Expressions;Expression;PowerAssign;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo,System.Linq.Expressions.LambdaExpression);Argument[3];ReturnValue;taint;df-generated |
+| System.Linq.Expressions;Expression;Power;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo);Argument[2];ReturnValue.SyntheticField[System.Linq.Expressions.MethodBinaryExpression._method];value;dfc-generated |
+| System.Linq.Expressions;Expression;PowerAssign;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo);Argument[2];ReturnValue.SyntheticField[System.Linq.Expressions.MethodBinaryExpression._method];value;dfc-generated |
+| System.Linq.Expressions;Expression;PowerAssign;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo,System.Linq.Expressions.LambdaExpression);Argument[2];ReturnValue.SyntheticField[System.Linq.Expressions.MethodBinaryExpression._method];value;dfc-generated |
+| System.Linq.Expressions;Expression;PowerAssign;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo,System.Linq.Expressions.LambdaExpression);Argument[3];ReturnValue.SyntheticField[System.Linq.Expressions.OpAssignMethodConversionBinaryExpression._conversion];value;dfc-generated |
 | System.Linq.Expressions;Expression;Property;(System.Linq.Expressions.Expression,System.Reflection.PropertyInfo);Argument[1];ReturnValue;taint;df-generated |
-| System.Linq.Expressions;Expression;Property;(System.Linq.Expressions.Expression,System.Reflection.PropertyInfo,System.Collections.Generic.IEnumerable<System.Linq.Expressions.Expression>);Argument[2].Element;ReturnValue;taint;df-generated |
-| System.Linq.Expressions;Expression;Reduce;();Argument[this];ReturnValue;value;df-generated |
-| System.Linq.Expressions;Expression;ReduceAndCheck;();Argument[this];ReturnValue;taint;df-generated |
-| System.Linq.Expressions;Expression;ReduceExtensions;();Argument[this];ReturnValue;taint;df-generated |
-| System.Linq.Expressions;Expression;RightShift;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo);Argument[2];ReturnValue;taint;df-generated |
-| System.Linq.Expressions;Expression;RightShiftAssign;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo);Argument[2];ReturnValue;taint;df-generated |
-| System.Linq.Expressions;Expression;RightShiftAssign;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo,System.Linq.Expressions.LambdaExpression);Argument[2];ReturnValue;taint;df-generated |
-| System.Linq.Expressions;Expression;RightShiftAssign;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo,System.Linq.Expressions.LambdaExpression);Argument[3];ReturnValue;taint;df-generated |
-| System.Linq.Expressions;Expression;Subtract;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo);Argument[2];ReturnValue;taint;df-generated |
-| System.Linq.Expressions;Expression;SubtractAssign;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo);Argument[2];ReturnValue;taint;df-generated |
-| System.Linq.Expressions;Expression;SubtractAssign;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo,System.Linq.Expressions.LambdaExpression);Argument[2];ReturnValue;taint;df-generated |
-| System.Linq.Expressions;Expression;SubtractAssign;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo,System.Linq.Expressions.LambdaExpression);Argument[3];ReturnValue;taint;df-generated |
-| System.Linq.Expressions;Expression;SubtractAssignChecked;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo);Argument[2];ReturnValue;taint;df-generated |
-| System.Linq.Expressions;Expression;SubtractAssignChecked;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo,System.Linq.Expressions.LambdaExpression);Argument[2];ReturnValue;taint;df-generated |
-| System.Linq.Expressions;Expression;SubtractAssignChecked;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo,System.Linq.Expressions.LambdaExpression);Argument[3];ReturnValue;taint;df-generated |
-| System.Linq.Expressions;Expression;SubtractChecked;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo);Argument[2];ReturnValue;taint;df-generated |
+| System.Linq.Expressions;Expression;Property;(System.Linq.Expressions.Expression,System.Reflection.PropertyInfo,System.Collections.Generic.IEnumerable<System.Linq.Expressions.Expression>);Argument[2];ReturnValue.SyntheticField[System.Linq.Expressions.IndexExpression._arguments];value;dfc-generated |
+| System.Linq.Expressions;Expression;Reduce;();Argument[this];ReturnValue;value;dfc-generated |
+| System.Linq.Expressions;Expression;ReduceAndCheck;();Argument[this];ReturnValue;value;dfc-generated |
+| System.Linq.Expressions;Expression;ReduceExtensions;();Argument[this];ReturnValue;value;dfc-generated |
+| System.Linq.Expressions;Expression;RightShift;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo);Argument[2];ReturnValue.SyntheticField[System.Linq.Expressions.MethodBinaryExpression._method];value;dfc-generated |
+| System.Linq.Expressions;Expression;RightShiftAssign;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo);Argument[2];ReturnValue.SyntheticField[System.Linq.Expressions.MethodBinaryExpression._method];value;dfc-generated |
+| System.Linq.Expressions;Expression;RightShiftAssign;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo,System.Linq.Expressions.LambdaExpression);Argument[2];ReturnValue.SyntheticField[System.Linq.Expressions.MethodBinaryExpression._method];value;dfc-generated |
+| System.Linq.Expressions;Expression;RightShiftAssign;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo,System.Linq.Expressions.LambdaExpression);Argument[3];ReturnValue.SyntheticField[System.Linq.Expressions.OpAssignMethodConversionBinaryExpression._conversion];value;dfc-generated |
+| System.Linq.Expressions;Expression;Subtract;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo);Argument[2];ReturnValue.SyntheticField[System.Linq.Expressions.MethodBinaryExpression._method];value;dfc-generated |
+| System.Linq.Expressions;Expression;SubtractAssign;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo);Argument[2];ReturnValue.SyntheticField[System.Linq.Expressions.MethodBinaryExpression._method];value;dfc-generated |
+| System.Linq.Expressions;Expression;SubtractAssign;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo,System.Linq.Expressions.LambdaExpression);Argument[2];ReturnValue.SyntheticField[System.Linq.Expressions.MethodBinaryExpression._method];value;dfc-generated |
+| System.Linq.Expressions;Expression;SubtractAssign;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo,System.Linq.Expressions.LambdaExpression);Argument[3];ReturnValue.SyntheticField[System.Linq.Expressions.OpAssignMethodConversionBinaryExpression._conversion];value;dfc-generated |
+| System.Linq.Expressions;Expression;SubtractAssignChecked;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo);Argument[2];ReturnValue.SyntheticField[System.Linq.Expressions.MethodBinaryExpression._method];value;dfc-generated |
+| System.Linq.Expressions;Expression;SubtractAssignChecked;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo,System.Linq.Expressions.LambdaExpression);Argument[2];ReturnValue.SyntheticField[System.Linq.Expressions.MethodBinaryExpression._method];value;dfc-generated |
+| System.Linq.Expressions;Expression;SubtractAssignChecked;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo,System.Linq.Expressions.LambdaExpression);Argument[3];ReturnValue.SyntheticField[System.Linq.Expressions.OpAssignMethodConversionBinaryExpression._conversion];value;dfc-generated |
+| System.Linq.Expressions;Expression;SubtractChecked;(System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Reflection.MethodInfo);Argument[2];ReturnValue.SyntheticField[System.Linq.Expressions.MethodBinaryExpression._method];value;dfc-generated |
 | System.Linq.Expressions;Expression;SymbolDocument;(System.String,System.Guid);Argument[1];ReturnValue;taint;df-generated |
 | System.Linq.Expressions;Expression;SymbolDocument;(System.String,System.Guid,System.Guid);Argument[1];ReturnValue;taint;df-generated |
 | System.Linq.Expressions;Expression;SymbolDocument;(System.String,System.Guid,System.Guid);Argument[2];ReturnValue;taint;df-generated |
@@ -8150,8 +8791,12 @@
 | System.Linq.Expressions;Expression<TDelegate>;Update;(System.Linq.Expressions.Expression,System.Collections.Generic.IEnumerable<System.Linq.Expressions.ParameterExpression>);Argument[this];ReturnValue;taint;df-generated |
 | System.Linq.Expressions;ExpressionVisitor;Visit;(System.Collections.ObjectModel.ReadOnlyCollection<System.Linq.Expressions.Expression>);Argument[0].Element;Argument[this];taint;df-generated |
 | System.Linq.Expressions;ExpressionVisitor;Visit;(System.Collections.ObjectModel.ReadOnlyCollection<System.Linq.Expressions.Expression>);Argument[0].Element;ReturnValue;taint;df-generated |
-| System.Linq.Expressions;ExpressionVisitor;Visit;(System.Linq.Expressions.Expression);Argument[0];Argument[this];taint;df-generated |
-| System.Linq.Expressions;ExpressionVisitor;Visit;(System.Linq.Expressions.Expression);Argument[0];ReturnValue;taint;df-generated |
+| System.Linq.Expressions;ExpressionVisitor;Visit;(System.Linq.Expressions.Expression);Argument[0];ReturnValue;value;dfc-generated |
+| System.Linq.Expressions;ExpressionVisitor;Visit<T>;(System.Collections.ObjectModel.ReadOnlyCollection<T>,System.Func<T,T>);Argument[0].Element;Argument[1].Parameter[0];value;dfc-generated |
+| System.Linq.Expressions;ExpressionVisitor;Visit<T>;(System.Collections.ObjectModel.ReadOnlyCollection<T>,System.Func<T,T>);Argument[0].Element;Argument[1].Parameter[0];value;hq-generated |
+| System.Linq.Expressions;ExpressionVisitor;Visit<T>;(System.Collections.ObjectModel.ReadOnlyCollection<T>,System.Func<T,T>);Argument[0];ReturnValue;value;dfc-generated |
+| System.Linq.Expressions;ExpressionVisitor;Visit<T>;(System.Collections.ObjectModel.ReadOnlyCollection<T>,System.Func<T,T>);Argument[0];ReturnValue;value;hq-generated |
+| System.Linq.Expressions;ExpressionVisitor;Visit<T>;(System.Collections.ObjectModel.ReadOnlyCollection<T>,System.Func<T,T>);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | System.Linq.Expressions;ExpressionVisitor;Visit<T>;(System.Collections.ObjectModel.ReadOnlyCollection<T>,System.Func<T,T>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
 | System.Linq.Expressions;ExpressionVisitor;VisitAndConvert<T>;(System.Collections.ObjectModel.ReadOnlyCollection<T>,System.String);Argument[0].Element;Argument[this];taint;df-generated |
 | System.Linq.Expressions;ExpressionVisitor;VisitAndConvert<T>;(System.Collections.ObjectModel.ReadOnlyCollection<T>,System.String);Argument[0].Element;ReturnValue;taint;df-generated |
@@ -8159,98 +8804,86 @@
 | System.Linq.Expressions;ExpressionVisitor;VisitAndConvert<T>;(T,System.String);Argument[0];ReturnValue;taint;df-generated |
 | System.Linq.Expressions;ExpressionVisitor;VisitBinary;(System.Linq.Expressions.BinaryExpression);Argument[0];Argument[this];taint;df-generated |
 | System.Linq.Expressions;ExpressionVisitor;VisitBinary;(System.Linq.Expressions.BinaryExpression);Argument[0];ReturnValue;taint;df-generated |
-| System.Linq.Expressions;ExpressionVisitor;VisitBlock;(System.Linq.Expressions.BlockExpression);Argument[0];Argument[this];taint;df-generated |
-| System.Linq.Expressions;ExpressionVisitor;VisitBlock;(System.Linq.Expressions.BlockExpression);Argument[0];ReturnValue;taint;df-generated |
-| System.Linq.Expressions;ExpressionVisitor;VisitCatchBlock;(System.Linq.Expressions.CatchBlock);Argument[0];Argument[this];taint;df-generated |
-| System.Linq.Expressions;ExpressionVisitor;VisitCatchBlock;(System.Linq.Expressions.CatchBlock);Argument[0];ReturnValue;taint;df-generated |
+| System.Linq.Expressions;ExpressionVisitor;VisitBlock;(System.Linq.Expressions.BlockExpression);Argument[0];ReturnValue;value;dfc-generated |
+| System.Linq.Expressions;ExpressionVisitor;VisitCatchBlock;(System.Linq.Expressions.CatchBlock);Argument[0];ReturnValue;value;dfc-generated |
 | System.Linq.Expressions;ExpressionVisitor;VisitConditional;(System.Linq.Expressions.ConditionalExpression);Argument[0];Argument[this];taint;df-generated |
 | System.Linq.Expressions;ExpressionVisitor;VisitConditional;(System.Linq.Expressions.ConditionalExpression);Argument[0];ReturnValue;taint;df-generated |
-| System.Linq.Expressions;ExpressionVisitor;VisitConstant;(System.Linq.Expressions.ConstantExpression);Argument[0];Argument[this];taint;df-generated |
-| System.Linq.Expressions;ExpressionVisitor;VisitConstant;(System.Linq.Expressions.ConstantExpression);Argument[0];ReturnValue;taint;df-generated |
-| System.Linq.Expressions;ExpressionVisitor;VisitDebugInfo;(System.Linq.Expressions.DebugInfoExpression);Argument[0];Argument[this];taint;df-generated |
-| System.Linq.Expressions;ExpressionVisitor;VisitDebugInfo;(System.Linq.Expressions.DebugInfoExpression);Argument[0];ReturnValue;taint;df-generated |
-| System.Linq.Expressions;ExpressionVisitor;VisitDefault;(System.Linq.Expressions.DefaultExpression);Argument[0];ReturnValue;taint;df-generated |
-| System.Linq.Expressions;ExpressionVisitor;VisitDynamic;(System.Linq.Expressions.DynamicExpression);Argument[0];ReturnValue;taint;df-generated |
-| System.Linq.Expressions;ExpressionVisitor;VisitElementInit;(System.Linq.Expressions.ElementInit);Argument[0];Argument[this];taint;df-generated |
-| System.Linq.Expressions;ExpressionVisitor;VisitElementInit;(System.Linq.Expressions.ElementInit);Argument[0];ReturnValue;taint;df-generated |
-| System.Linq.Expressions;ExpressionVisitor;VisitExtension;(System.Linq.Expressions.Expression);Argument[0];Argument[this];taint;df-generated |
-| System.Linq.Expressions;ExpressionVisitor;VisitExtension;(System.Linq.Expressions.Expression);Argument[0];ReturnValue;taint;df-generated |
+| System.Linq.Expressions;ExpressionVisitor;VisitConstant;(System.Linq.Expressions.ConstantExpression);Argument[0];ReturnValue;value;dfc-generated |
+| System.Linq.Expressions;ExpressionVisitor;VisitDebugInfo;(System.Linq.Expressions.DebugInfoExpression);Argument[0];ReturnValue;value;dfc-generated |
+| System.Linq.Expressions;ExpressionVisitor;VisitDefault;(System.Linq.Expressions.DefaultExpression);Argument[0];ReturnValue;value;dfc-generated |
+| System.Linq.Expressions;ExpressionVisitor;VisitDynamic;(System.Linq.Expressions.DynamicExpression);Argument[0];ReturnValue;value;dfc-generated |
+| System.Linq.Expressions;ExpressionVisitor;VisitElementInit;(System.Linq.Expressions.ElementInit);Argument[0];ReturnValue;value;dfc-generated |
+| System.Linq.Expressions;ExpressionVisitor;VisitExtension;(System.Linq.Expressions.Expression);Argument[0];ReturnValue;value;dfc-generated |
 | System.Linq.Expressions;ExpressionVisitor;VisitGoto;(System.Linq.Expressions.GotoExpression);Argument[0];Argument[this];taint;df-generated |
 | System.Linq.Expressions;ExpressionVisitor;VisitGoto;(System.Linq.Expressions.GotoExpression);Argument[0];ReturnValue;taint;df-generated |
 | System.Linq.Expressions;ExpressionVisitor;VisitIndex;(System.Linq.Expressions.IndexExpression);Argument[0];Argument[this];taint;df-generated |
 | System.Linq.Expressions;ExpressionVisitor;VisitIndex;(System.Linq.Expressions.IndexExpression);Argument[0];ReturnValue;taint;df-generated |
 | System.Linq.Expressions;ExpressionVisitor;VisitInvocation;(System.Linq.Expressions.InvocationExpression);Argument[0];Argument[this];taint;df-generated |
 | System.Linq.Expressions;ExpressionVisitor;VisitInvocation;(System.Linq.Expressions.InvocationExpression);Argument[0];ReturnValue;taint;df-generated |
-| System.Linq.Expressions;ExpressionVisitor;VisitLabel;(System.Linq.Expressions.LabelExpression);Argument[0];Argument[this];taint;df-generated |
-| System.Linq.Expressions;ExpressionVisitor;VisitLabel;(System.Linq.Expressions.LabelExpression);Argument[0];ReturnValue;taint;df-generated |
-| System.Linq.Expressions;ExpressionVisitor;VisitLabelTarget;(System.Linq.Expressions.LabelTarget);Argument[0];ReturnValue;taint;df-generated |
-| System.Linq.Expressions;ExpressionVisitor;VisitLambda<T>;(System.Linq.Expressions.Expression<T>);Argument[0];Argument[this];taint;df-generated |
-| System.Linq.Expressions;ExpressionVisitor;VisitLambda<T>;(System.Linq.Expressions.Expression<T>);Argument[0];ReturnValue;taint;df-generated |
-| System.Linq.Expressions;ExpressionVisitor;VisitListInit;(System.Linq.Expressions.ListInitExpression);Argument[0];ReturnValue;taint;df-generated |
-| System.Linq.Expressions;ExpressionVisitor;VisitLoop;(System.Linq.Expressions.LoopExpression);Argument[0];Argument[this];taint;df-generated |
-| System.Linq.Expressions;ExpressionVisitor;VisitLoop;(System.Linq.Expressions.LoopExpression);Argument[0];ReturnValue;taint;df-generated |
+| System.Linq.Expressions;ExpressionVisitor;VisitLabel;(System.Linq.Expressions.LabelExpression);Argument[0];ReturnValue;value;dfc-generated |
+| System.Linq.Expressions;ExpressionVisitor;VisitLabelTarget;(System.Linq.Expressions.LabelTarget);Argument[0];ReturnValue;value;dfc-generated |
+| System.Linq.Expressions;ExpressionVisitor;VisitLambda<T>;(System.Linq.Expressions.Expression<T>);Argument[0];ReturnValue;value;dfc-generated |
+| System.Linq.Expressions;ExpressionVisitor;VisitListInit;(System.Linq.Expressions.ListInitExpression);Argument[0];ReturnValue;value;dfc-generated |
+| System.Linq.Expressions;ExpressionVisitor;VisitLoop;(System.Linq.Expressions.LoopExpression);Argument[0];ReturnValue;value;dfc-generated |
 | System.Linq.Expressions;ExpressionVisitor;VisitMember;(System.Linq.Expressions.MemberExpression);Argument[0];Argument[this];taint;df-generated |
 | System.Linq.Expressions;ExpressionVisitor;VisitMember;(System.Linq.Expressions.MemberExpression);Argument[0];ReturnValue;taint;df-generated |
 | System.Linq.Expressions;ExpressionVisitor;VisitMemberAssignment;(System.Linq.Expressions.MemberAssignment);Argument[0];Argument[this];taint;df-generated |
 | System.Linq.Expressions;ExpressionVisitor;VisitMemberAssignment;(System.Linq.Expressions.MemberAssignment);Argument[0];ReturnValue;taint;df-generated |
 | System.Linq.Expressions;ExpressionVisitor;VisitMemberBinding;(System.Linq.Expressions.MemberBinding);Argument[0];Argument[this];taint;df-generated |
 | System.Linq.Expressions;ExpressionVisitor;VisitMemberBinding;(System.Linq.Expressions.MemberBinding);Argument[0];ReturnValue;taint;df-generated |
-| System.Linq.Expressions;ExpressionVisitor;VisitMemberInit;(System.Linq.Expressions.MemberInitExpression);Argument[0];ReturnValue;taint;df-generated |
-| System.Linq.Expressions;ExpressionVisitor;VisitMemberListBinding;(System.Linq.Expressions.MemberListBinding);Argument[0];Argument[this];taint;df-generated |
-| System.Linq.Expressions;ExpressionVisitor;VisitMemberListBinding;(System.Linq.Expressions.MemberListBinding);Argument[0];ReturnValue;taint;df-generated |
-| System.Linq.Expressions;ExpressionVisitor;VisitMemberMemberBinding;(System.Linq.Expressions.MemberMemberBinding);Argument[0];Argument[this];taint;df-generated |
-| System.Linq.Expressions;ExpressionVisitor;VisitMemberMemberBinding;(System.Linq.Expressions.MemberMemberBinding);Argument[0];ReturnValue;taint;df-generated |
-| System.Linq.Expressions;ExpressionVisitor;VisitMethodCall;(System.Linq.Expressions.MethodCallExpression);Argument[0];Argument[this];taint;df-generated |
-| System.Linq.Expressions;ExpressionVisitor;VisitMethodCall;(System.Linq.Expressions.MethodCallExpression);Argument[0];ReturnValue;taint;df-generated |
-| System.Linq.Expressions;ExpressionVisitor;VisitNew;(System.Linq.Expressions.NewExpression);Argument[0];Argument[this];taint;df-generated |
-| System.Linq.Expressions;ExpressionVisitor;VisitNew;(System.Linq.Expressions.NewExpression);Argument[0];ReturnValue;taint;df-generated |
-| System.Linq.Expressions;ExpressionVisitor;VisitNewArray;(System.Linq.Expressions.NewArrayExpression);Argument[0];Argument[this];taint;df-generated |
-| System.Linq.Expressions;ExpressionVisitor;VisitNewArray;(System.Linq.Expressions.NewArrayExpression);Argument[0];ReturnValue;taint;df-generated |
-| System.Linq.Expressions;ExpressionVisitor;VisitParameter;(System.Linq.Expressions.ParameterExpression);Argument[0];Argument[this];taint;df-generated |
-| System.Linq.Expressions;ExpressionVisitor;VisitParameter;(System.Linq.Expressions.ParameterExpression);Argument[0];ReturnValue;taint;df-generated |
-| System.Linq.Expressions;ExpressionVisitor;VisitRuntimeVariables;(System.Linq.Expressions.RuntimeVariablesExpression);Argument[0];Argument[this];taint;df-generated |
-| System.Linq.Expressions;ExpressionVisitor;VisitRuntimeVariables;(System.Linq.Expressions.RuntimeVariablesExpression);Argument[0];ReturnValue;taint;df-generated |
-| System.Linq.Expressions;ExpressionVisitor;VisitSwitch;(System.Linq.Expressions.SwitchExpression);Argument[0];Argument[this];taint;df-generated |
-| System.Linq.Expressions;ExpressionVisitor;VisitSwitch;(System.Linq.Expressions.SwitchExpression);Argument[0];ReturnValue;taint;df-generated |
-| System.Linq.Expressions;ExpressionVisitor;VisitSwitchCase;(System.Linq.Expressions.SwitchCase);Argument[0];Argument[this];taint;df-generated |
-| System.Linq.Expressions;ExpressionVisitor;VisitSwitchCase;(System.Linq.Expressions.SwitchCase);Argument[0];ReturnValue;taint;df-generated |
-| System.Linq.Expressions;ExpressionVisitor;VisitTry;(System.Linq.Expressions.TryExpression);Argument[0];Argument[this];taint;df-generated |
-| System.Linq.Expressions;ExpressionVisitor;VisitTry;(System.Linq.Expressions.TryExpression);Argument[0];ReturnValue;taint;df-generated |
-| System.Linq.Expressions;ExpressionVisitor;VisitTypeBinary;(System.Linq.Expressions.TypeBinaryExpression);Argument[0];Argument[this];taint;df-generated |
-| System.Linq.Expressions;ExpressionVisitor;VisitTypeBinary;(System.Linq.Expressions.TypeBinaryExpression);Argument[0];ReturnValue;taint;df-generated |
-| System.Linq.Expressions;ExpressionVisitor;VisitUnary;(System.Linq.Expressions.UnaryExpression);Argument[0];Argument[this];taint;df-generated |
-| System.Linq.Expressions;ExpressionVisitor;VisitUnary;(System.Linq.Expressions.UnaryExpression);Argument[0];ReturnValue;taint;df-generated |
-| System.Linq.Expressions;GotoExpression;Update;(System.Linq.Expressions.LabelTarget,System.Linq.Expressions.Expression);Argument[this];ReturnValue;value;df-generated |
+| System.Linq.Expressions;ExpressionVisitor;VisitMemberInit;(System.Linq.Expressions.MemberInitExpression);Argument[0];ReturnValue;value;dfc-generated |
+| System.Linq.Expressions;ExpressionVisitor;VisitMemberListBinding;(System.Linq.Expressions.MemberListBinding);Argument[0];ReturnValue;value;dfc-generated |
+| System.Linq.Expressions;ExpressionVisitor;VisitMemberMemberBinding;(System.Linq.Expressions.MemberMemberBinding);Argument[0];ReturnValue;value;dfc-generated |
+| System.Linq.Expressions;ExpressionVisitor;VisitMethodCall;(System.Linq.Expressions.MethodCallExpression);Argument[0];ReturnValue;value;dfc-generated |
+| System.Linq.Expressions;ExpressionVisitor;VisitNew;(System.Linq.Expressions.NewExpression);Argument[0];ReturnValue;value;dfc-generated |
+| System.Linq.Expressions;ExpressionVisitor;VisitNewArray;(System.Linq.Expressions.NewArrayExpression);Argument[0];ReturnValue;value;dfc-generated |
+| System.Linq.Expressions;ExpressionVisitor;VisitParameter;(System.Linq.Expressions.ParameterExpression);Argument[0];ReturnValue;value;dfc-generated |
+| System.Linq.Expressions;ExpressionVisitor;VisitRuntimeVariables;(System.Linq.Expressions.RuntimeVariablesExpression);Argument[0];ReturnValue;value;dfc-generated |
+| System.Linq.Expressions;ExpressionVisitor;VisitSwitch;(System.Linq.Expressions.SwitchExpression);Argument[0];ReturnValue;value;dfc-generated |
+| System.Linq.Expressions;ExpressionVisitor;VisitSwitchCase;(System.Linq.Expressions.SwitchCase);Argument[0];ReturnValue;value;dfc-generated |
+| System.Linq.Expressions;ExpressionVisitor;VisitTry;(System.Linq.Expressions.TryExpression);Argument[0];ReturnValue;value;dfc-generated |
+| System.Linq.Expressions;ExpressionVisitor;VisitTypeBinary;(System.Linq.Expressions.TypeBinaryExpression);Argument[0];ReturnValue;value;dfc-generated |
+| System.Linq.Expressions;ExpressionVisitor;VisitUnary;(System.Linq.Expressions.UnaryExpression);Argument[0];ReturnValue;value;dfc-generated |
+| System.Linq.Expressions;GotoExpression;Update;(System.Linq.Expressions.LabelTarget,System.Linq.Expressions.Expression);Argument[this];ReturnValue;value;dfc-generated |
 | System.Linq.Expressions;IArgumentProvider;GetArgument;(System.Int32);Argument[this];ReturnValue;taint;df-generated |
-| System.Linq.Expressions;IndexExpression;Update;(System.Linq.Expressions.Expression,System.Collections.Generic.IEnumerable<System.Linq.Expressions.Expression>);Argument[this];ReturnValue;value;df-generated |
-| System.Linq.Expressions;IndexExpression;get_Arguments;();Argument[this];ReturnValue;taint;df-generated |
-| System.Linq.Expressions;InvocationExpression;Update;(System.Linq.Expressions.Expression,System.Collections.Generic.IEnumerable<System.Linq.Expressions.Expression>);Argument[this];ReturnValue;value;df-generated |
-| System.Linq.Expressions;LabelExpression;Update;(System.Linq.Expressions.LabelTarget,System.Linq.Expressions.Expression);Argument[this];ReturnValue;value;df-generated |
-| System.Linq.Expressions;LabelTarget;ToString;();Argument[this];ReturnValue;taint;df-generated |
+| System.Linq.Expressions;IndexExpression;GetArgument;(System.Int32);Argument[this].SyntheticField[System.Linq.Expressions.IndexExpression._arguments].Element;ReturnValue;value;df-generated |
+| System.Linq.Expressions;IndexExpression;GetArgument;(System.Int32);Argument[this].SyntheticField[System.Linq.Expressions.IndexExpression._arguments].Element;ReturnValue;value;dfc-generated |
+| System.Linq.Expressions;IndexExpression;Update;(System.Linq.Expressions.Expression,System.Collections.Generic.IEnumerable<System.Linq.Expressions.Expression>);Argument[1];ReturnValue.SyntheticField[System.Linq.Expressions.IndexExpression._arguments];value;dfc-generated |
+| System.Linq.Expressions;IndexExpression;Update;(System.Linq.Expressions.Expression,System.Collections.Generic.IEnumerable<System.Linq.Expressions.Expression>);Argument[this];ReturnValue;value;dfc-generated |
+| System.Linq.Expressions;IndexExpression;get_Arguments;();Argument[this].SyntheticField[System.Linq.Expressions.IndexExpression._arguments];ReturnValue;value;dfc-generated |
+| System.Linq.Expressions;InvocationExpression;Update;(System.Linq.Expressions.Expression,System.Collections.Generic.IEnumerable<System.Linq.Expressions.Expression>);Argument[this];ReturnValue;value;dfc-generated |
+| System.Linq.Expressions;LabelExpression;Update;(System.Linq.Expressions.LabelTarget,System.Linq.Expressions.Expression);Argument[this];ReturnValue;value;dfc-generated |
+| System.Linq.Expressions;LabelTarget;ToString;();Argument[this].Property[System.Linq.Expressions.LabelTarget.Name];ReturnValue;value;dfc-generated |
 | System.Linq.Expressions;LambdaExpression;get_Body;();Argument[this];ReturnValue;taint;df-generated |
 | System.Linq.Expressions;LambdaExpression;get_Name;();Argument[this];ReturnValue;taint;df-generated |
-| System.Linq.Expressions;ListInitExpression;Update;(System.Linq.Expressions.NewExpression,System.Collections.Generic.IEnumerable<System.Linq.Expressions.ElementInit>);Argument[this];ReturnValue;value;df-generated |
-| System.Linq.Expressions;LoopExpression;Update;(System.Linq.Expressions.LabelTarget,System.Linq.Expressions.LabelTarget,System.Linq.Expressions.Expression);Argument[this];ReturnValue;value;df-generated |
-| System.Linq.Expressions;MemberAssignment;Update;(System.Linq.Expressions.Expression);Argument[this];ReturnValue;value;df-generated |
-| System.Linq.Expressions;MemberAssignment;get_Expression;();Argument[this];ReturnValue;taint;df-generated |
+| System.Linq.Expressions;LambdaExpression;get_Parameters;();Argument[this];ReturnValue;taint;df-generated |
+| System.Linq.Expressions;ListInitExpression;Update;(System.Linq.Expressions.NewExpression,System.Collections.Generic.IEnumerable<System.Linq.Expressions.ElementInit>);Argument[this];ReturnValue;value;dfc-generated |
+| System.Linq.Expressions;LoopExpression;Update;(System.Linq.Expressions.LabelTarget,System.Linq.Expressions.LabelTarget,System.Linq.Expressions.Expression);Argument[this];ReturnValue;value;dfc-generated |
+| System.Linq.Expressions;MemberAssignment;Update;(System.Linq.Expressions.Expression);Argument[0];ReturnValue.SyntheticField[System.Linq.Expressions.MemberAssignment._expression];value;dfc-generated |
+| System.Linq.Expressions;MemberAssignment;Update;(System.Linq.Expressions.Expression);Argument[this];ReturnValue;value;dfc-generated |
+| System.Linq.Expressions;MemberAssignment;get_Expression;();Argument[this].SyntheticField[System.Linq.Expressions.MemberAssignment._expression];ReturnValue;value;dfc-generated |
 | System.Linq.Expressions;MemberBinding;ToString;();Argument[this];ReturnValue;taint;df-generated |
 | System.Linq.Expressions;MemberExpression;Update;(System.Linq.Expressions.Expression);Argument[this];ReturnValue;value;df-generated |
-| System.Linq.Expressions;MemberExpression;get_Member;();Argument[this];ReturnValue;taint;df-generated |
-| System.Linq.Expressions;MemberInitExpression;Update;(System.Linq.Expressions.NewExpression,System.Collections.Generic.IEnumerable<System.Linq.Expressions.MemberBinding>);Argument[this];ReturnValue;value;df-generated |
-| System.Linq.Expressions;MemberListBinding;Update;(System.Collections.Generic.IEnumerable<System.Linq.Expressions.ElementInit>);Argument[this];ReturnValue;value;df-generated |
-| System.Linq.Expressions;MemberMemberBinding;Update;(System.Collections.Generic.IEnumerable<System.Linq.Expressions.MemberBinding>);Argument[this];ReturnValue;value;df-generated |
-| System.Linq.Expressions;MethodCallExpression;Update;(System.Linq.Expressions.Expression,System.Collections.Generic.IEnumerable<System.Linq.Expressions.Expression>);Argument[this];ReturnValue;value;df-generated |
+| System.Linq.Expressions;MemberExpression;get_Member;();Argument[this].SyntheticField[System.Linq.Expressions.FieldExpression._field];ReturnValue;value;dfc-generated |
+| System.Linq.Expressions;MemberExpression;get_Member;();Argument[this].SyntheticField[System.Linq.Expressions.PropertyExpression._property];ReturnValue;value;dfc-generated |
+| System.Linq.Expressions;MemberInitExpression;Update;(System.Linq.Expressions.NewExpression,System.Collections.Generic.IEnumerable<System.Linq.Expressions.MemberBinding>);Argument[this];ReturnValue;value;dfc-generated |
+| System.Linq.Expressions;MemberListBinding;Update;(System.Collections.Generic.IEnumerable<System.Linq.Expressions.ElementInit>);Argument[this];ReturnValue;value;dfc-generated |
+| System.Linq.Expressions;MemberMemberBinding;Update;(System.Collections.Generic.IEnumerable<System.Linq.Expressions.MemberBinding>);Argument[this];ReturnValue;value;dfc-generated |
+| System.Linq.Expressions;MethodCallExpression;Update;(System.Linq.Expressions.Expression,System.Collections.Generic.IEnumerable<System.Linq.Expressions.Expression>);Argument[this];ReturnValue;value;dfc-generated |
 | System.Linq.Expressions;MethodCallExpression;get_Arguments;();Argument[this];ReturnValue;taint;df-generated |
 | System.Linq.Expressions;MethodCallExpression;get_Object;();Argument[this];ReturnValue;taint;df-generated |
-| System.Linq.Expressions;NewArrayExpression;Update;(System.Collections.Generic.IEnumerable<System.Linq.Expressions.Expression>);Argument[this];ReturnValue;value;df-generated |
-| System.Linq.Expressions;NewExpression;Update;(System.Collections.Generic.IEnumerable<System.Linq.Expressions.Expression>);Argument[this];ReturnValue;value;df-generated |
-| System.Linq.Expressions;NewExpression;get_Arguments;();Argument[this];ReturnValue;taint;df-generated |
-| System.Linq.Expressions;RuntimeVariablesExpression;Update;(System.Collections.Generic.IEnumerable<System.Linq.Expressions.ParameterExpression>);Argument[this];ReturnValue;value;df-generated |
-| System.Linq.Expressions;SwitchCase;Update;(System.Collections.Generic.IEnumerable<System.Linq.Expressions.Expression>,System.Linq.Expressions.Expression);Argument[this];ReturnValue;value;df-generated |
-| System.Linq.Expressions;SwitchExpression;Update;(System.Linq.Expressions.Expression,System.Collections.Generic.IEnumerable<System.Linq.Expressions.SwitchCase>,System.Linq.Expressions.Expression);Argument[this];ReturnValue;value;df-generated |
-| System.Linq.Expressions;TryExpression;Update;(System.Linq.Expressions.Expression,System.Collections.Generic.IEnumerable<System.Linq.Expressions.CatchBlock>,System.Linq.Expressions.Expression,System.Linq.Expressions.Expression);Argument[this];ReturnValue;value;df-generated |
-| System.Linq.Expressions;TypeBinaryExpression;Update;(System.Linq.Expressions.Expression);Argument[this];ReturnValue;value;df-generated |
-| System.Linq.Expressions;UnaryExpression;Update;(System.Linq.Expressions.Expression);Argument[this];ReturnValue;value;df-generated |
+| System.Linq.Expressions;NewArrayExpression;Update;(System.Collections.Generic.IEnumerable<System.Linq.Expressions.Expression>);Argument[this];ReturnValue;value;dfc-generated |
+| System.Linq.Expressions;NewExpression;GetArgument;(System.Int32);Argument[this].SyntheticField[System.Linq.Expressions.NewExpression._arguments].Element;ReturnValue;value;df-generated |
+| System.Linq.Expressions;NewExpression;GetArgument;(System.Int32);Argument[this].SyntheticField[System.Linq.Expressions.NewExpression._arguments].Element;ReturnValue;value;dfc-generated |
+| System.Linq.Expressions;NewExpression;Update;(System.Collections.Generic.IEnumerable<System.Linq.Expressions.Expression>);Argument[0];ReturnValue.SyntheticField[System.Linq.Expressions.NewExpression._arguments];value;dfc-generated |
+| System.Linq.Expressions;NewExpression;Update;(System.Collections.Generic.IEnumerable<System.Linq.Expressions.Expression>);Argument[this];ReturnValue;value;dfc-generated |
+| System.Linq.Expressions;NewExpression;get_Arguments;();Argument[this].SyntheticField[System.Linq.Expressions.NewExpression._arguments];ReturnValue;value;dfc-generated |
+| System.Linq.Expressions;RuntimeVariablesExpression;Update;(System.Collections.Generic.IEnumerable<System.Linq.Expressions.ParameterExpression>);Argument[this];ReturnValue;value;dfc-generated |
+| System.Linq.Expressions;SwitchCase;Update;(System.Collections.Generic.IEnumerable<System.Linq.Expressions.Expression>,System.Linq.Expressions.Expression);Argument[this];ReturnValue;value;dfc-generated |
+| System.Linq.Expressions;SwitchExpression;Update;(System.Linq.Expressions.Expression,System.Collections.Generic.IEnumerable<System.Linq.Expressions.SwitchCase>,System.Linq.Expressions.Expression);Argument[this];ReturnValue;value;dfc-generated |
+| System.Linq.Expressions;TryExpression;Update;(System.Linq.Expressions.Expression,System.Collections.Generic.IEnumerable<System.Linq.Expressions.CatchBlock>,System.Linq.Expressions.Expression,System.Linq.Expressions.Expression);Argument[this];ReturnValue;value;dfc-generated |
+| System.Linq.Expressions;TypeBinaryExpression;Update;(System.Linq.Expressions.Expression);Argument[this];ReturnValue;value;dfc-generated |
+| System.Linq.Expressions;UnaryExpression;Update;(System.Linq.Expressions.Expression);Argument[this];ReturnValue;value;dfc-generated |
 | System.Linq;Enumerable;Aggregate<TSource,TAccumulate,TResult>;(System.Collections.Generic.IEnumerable<TSource>,TAccumulate,System.Func<TAccumulate,TSource,TAccumulate>,System.Func<TAccumulate,TResult>);Argument[0].Element;Argument[2].Parameter[1];value;manual |
 | System.Linq;Enumerable;Aggregate<TSource,TAccumulate,TResult>;(System.Collections.Generic.IEnumerable<TSource>,TAccumulate,System.Func<TAccumulate,TSource,TAccumulate>,System.Func<TAccumulate,TResult>);Argument[1];Argument[2].Parameter[0];value;manual |
 | System.Linq;Enumerable;Aggregate<TSource,TAccumulate,TResult>;(System.Collections.Generic.IEnumerable<TSource>,TAccumulate,System.Func<TAccumulate,TSource,TAccumulate>,System.Func<TAccumulate,TResult>);Argument[2].ReturnValue;Argument[3].Parameter[0];value;manual |
@@ -8291,9 +8924,11 @@
 | System.Linq;Enumerable;Average<TSource>;(System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,System.Single>);Argument[0].Element;Argument[1].Parameter[0];value;manual |
 | System.Linq;Enumerable;Average<TSource>;(System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,System.Single>);Argument[1];Argument[1].Parameter[delegate-self];value;manual |
 | System.Linq;Enumerable;Cast<TResult>;(System.Collections.IEnumerable);Argument[0].Element;ReturnValue.Element;value;manual |
-| System.Linq;Enumerable;Chunk<TSource>;(System.Collections.Generic.IEnumerable<TSource>,System.Int32);Argument[0].Element;ReturnValue;taint;df-generated |
+| System.Linq;Enumerable;Chunk<TSource>;(System.Collections.Generic.IEnumerable<TSource>,System.Int32);Argument[0].Element;ReturnValue.Element.Element;value;dfc-generated |
 | System.Linq;Enumerable;Concat<TSource>;(System.Collections.Generic.IEnumerable<TSource>,System.Collections.Generic.IEnumerable<TSource>);Argument[0].Element;ReturnValue.Element;value;manual |
 | System.Linq;Enumerable;Concat<TSource>;(System.Collections.Generic.IEnumerable<TSource>,System.Collections.Generic.IEnumerable<TSource>);Argument[1].Element;ReturnValue.Element;value;manual |
+| System.Linq;Enumerable;Contains<TSource>;(System.Collections.Generic.IEnumerable<TSource>,TSource,System.Collections.Generic.IEqualityComparer<TSource>);Argument[0].Element;Argument[2];taint;df-generated |
+| System.Linq;Enumerable;Contains<TSource>;(System.Collections.Generic.IEnumerable<TSource>,TSource,System.Collections.Generic.IEqualityComparer<TSource>);Argument[1];Argument[2];taint;df-generated |
 | System.Linq;Enumerable;Count<TSource>;(System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,System.Boolean>);Argument[0].Element;Argument[1].Parameter[0];value;manual |
 | System.Linq;Enumerable;Count<TSource>;(System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,System.Boolean>);Argument[1];Argument[1].Parameter[delegate-self];value;manual |
 | System.Linq;Enumerable;DefaultIfEmpty<TSource>;(System.Collections.Generic.IEnumerable<TSource>);Argument[0].Element;ReturnValue.Element;value;manual |
@@ -8301,15 +8936,35 @@
 | System.Linq;Enumerable;DefaultIfEmpty<TSource>;(System.Collections.Generic.IEnumerable<TSource>,TSource);Argument[1];ReturnValue.Element;value;manual |
 | System.Linq;Enumerable;Distinct<TSource>;(System.Collections.Generic.IEnumerable<TSource>);Argument[0].Element;ReturnValue.Element;value;manual |
 | System.Linq;Enumerable;Distinct<TSource>;(System.Collections.Generic.IEnumerable<TSource>,System.Collections.Generic.IEqualityComparer<TSource>);Argument[0].Element;ReturnValue.Element;value;manual |
+| System.Linq;Enumerable;DistinctBy<TSource,TKey>;(System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,TKey>);Argument[0].Element;Argument[1].Parameter[0];value;dfc-generated |
+| System.Linq;Enumerable;DistinctBy<TSource,TKey>;(System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,TKey>);Argument[0].Element;Argument[1].Parameter[0];value;hq-generated |
+| System.Linq;Enumerable;DistinctBy<TSource,TKey>;(System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,TKey>);Argument[0].Element;ReturnValue.Element;value;dfc-generated |
+| System.Linq;Enumerable;DistinctBy<TSource,TKey>;(System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,TKey>);Argument[0].Element;ReturnValue.Element;value;hq-generated |
+| System.Linq;Enumerable;DistinctBy<TSource,TKey>;(System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,TKey>);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | System.Linq;Enumerable;DistinctBy<TSource,TKey>;(System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,TKey>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
+| System.Linq;Enumerable;DistinctBy<TSource,TKey>;(System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,TKey>,System.Collections.Generic.IEqualityComparer<TKey>);Argument[0].Element;Argument[1].Parameter[0];value;dfc-generated |
+| System.Linq;Enumerable;DistinctBy<TSource,TKey>;(System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,TKey>,System.Collections.Generic.IEqualityComparer<TKey>);Argument[0].Element;Argument[1].Parameter[0];value;hq-generated |
+| System.Linq;Enumerable;DistinctBy<TSource,TKey>;(System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,TKey>,System.Collections.Generic.IEqualityComparer<TKey>);Argument[0].Element;ReturnValue.Element;value;dfc-generated |
+| System.Linq;Enumerable;DistinctBy<TSource,TKey>;(System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,TKey>,System.Collections.Generic.IEqualityComparer<TKey>);Argument[0].Element;ReturnValue.Element;value;hq-generated |
+| System.Linq;Enumerable;DistinctBy<TSource,TKey>;(System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,TKey>,System.Collections.Generic.IEqualityComparer<TKey>);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | System.Linq;Enumerable;DistinctBy<TSource,TKey>;(System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,TKey>,System.Collections.Generic.IEqualityComparer<TKey>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
-| System.Linq;Enumerable;ElementAt<TSource>;(System.Collections.Generic.IEnumerable<TSource>,System.Index);Argument[0].Element;ReturnValue;taint;df-generated |
+| System.Linq;Enumerable;ElementAt<TSource>;(System.Collections.Generic.IEnumerable<TSource>,System.Index);Argument[0].Element;ReturnValue;value;dfc-generated |
 | System.Linq;Enumerable;ElementAt<TSource>;(System.Collections.Generic.IEnumerable<TSource>,System.Int32);Argument[0].Element;ReturnValue;value;manual |
-| System.Linq;Enumerable;ElementAtOrDefault<TSource>;(System.Collections.Generic.IEnumerable<TSource>,System.Index);Argument[0].Element;ReturnValue;taint;df-generated |
+| System.Linq;Enumerable;ElementAtOrDefault<TSource>;(System.Collections.Generic.IEnumerable<TSource>,System.Index);Argument[0].Element;ReturnValue;value;dfc-generated |
 | System.Linq;Enumerable;ElementAtOrDefault<TSource>;(System.Collections.Generic.IEnumerable<TSource>,System.Int32);Argument[0].Element;ReturnValue;value;manual |
 | System.Linq;Enumerable;Except<TSource>;(System.Collections.Generic.IEnumerable<TSource>,System.Collections.Generic.IEnumerable<TSource>);Argument[0].Element;ReturnValue.Element;value;manual |
 | System.Linq;Enumerable;Except<TSource>;(System.Collections.Generic.IEnumerable<TSource>,System.Collections.Generic.IEnumerable<TSource>,System.Collections.Generic.IEqualityComparer<TSource>);Argument[0].Element;ReturnValue.Element;value;manual |
+| System.Linq;Enumerable;ExceptBy<TSource,TKey>;(System.Collections.Generic.IEnumerable<TSource>,System.Collections.Generic.IEnumerable<TKey>,System.Func<TSource,TKey>);Argument[0].Element;Argument[2].Parameter[0];value;dfc-generated |
+| System.Linq;Enumerable;ExceptBy<TSource,TKey>;(System.Collections.Generic.IEnumerable<TSource>,System.Collections.Generic.IEnumerable<TKey>,System.Func<TSource,TKey>);Argument[0].Element;Argument[2].Parameter[0];value;hq-generated |
+| System.Linq;Enumerable;ExceptBy<TSource,TKey>;(System.Collections.Generic.IEnumerable<TSource>,System.Collections.Generic.IEnumerable<TKey>,System.Func<TSource,TKey>);Argument[0].Element;ReturnValue.Element;value;dfc-generated |
+| System.Linq;Enumerable;ExceptBy<TSource,TKey>;(System.Collections.Generic.IEnumerable<TSource>,System.Collections.Generic.IEnumerable<TKey>,System.Func<TSource,TKey>);Argument[0].Element;ReturnValue.Element;value;hq-generated |
+| System.Linq;Enumerable;ExceptBy<TSource,TKey>;(System.Collections.Generic.IEnumerable<TSource>,System.Collections.Generic.IEnumerable<TKey>,System.Func<TSource,TKey>);Argument[2];Argument[2].Parameter[delegate-self];value;dfc-generated |
 | System.Linq;Enumerable;ExceptBy<TSource,TKey>;(System.Collections.Generic.IEnumerable<TSource>,System.Collections.Generic.IEnumerable<TKey>,System.Func<TSource,TKey>);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
+| System.Linq;Enumerable;ExceptBy<TSource,TKey>;(System.Collections.Generic.IEnumerable<TSource>,System.Collections.Generic.IEnumerable<TKey>,System.Func<TSource,TKey>,System.Collections.Generic.IEqualityComparer<TKey>);Argument[0].Element;Argument[2].Parameter[0];value;dfc-generated |
+| System.Linq;Enumerable;ExceptBy<TSource,TKey>;(System.Collections.Generic.IEnumerable<TSource>,System.Collections.Generic.IEnumerable<TKey>,System.Func<TSource,TKey>,System.Collections.Generic.IEqualityComparer<TKey>);Argument[0].Element;Argument[2].Parameter[0];value;hq-generated |
+| System.Linq;Enumerable;ExceptBy<TSource,TKey>;(System.Collections.Generic.IEnumerable<TSource>,System.Collections.Generic.IEnumerable<TKey>,System.Func<TSource,TKey>,System.Collections.Generic.IEqualityComparer<TKey>);Argument[0].Element;ReturnValue.Element;value;dfc-generated |
+| System.Linq;Enumerable;ExceptBy<TSource,TKey>;(System.Collections.Generic.IEnumerable<TSource>,System.Collections.Generic.IEnumerable<TKey>,System.Func<TSource,TKey>,System.Collections.Generic.IEqualityComparer<TKey>);Argument[0].Element;ReturnValue.Element;value;hq-generated |
+| System.Linq;Enumerable;ExceptBy<TSource,TKey>;(System.Collections.Generic.IEnumerable<TSource>,System.Collections.Generic.IEnumerable<TKey>,System.Func<TSource,TKey>,System.Collections.Generic.IEqualityComparer<TKey>);Argument[2];Argument[2].Parameter[delegate-self];value;dfc-generated |
 | System.Linq;Enumerable;ExceptBy<TSource,TKey>;(System.Collections.Generic.IEnumerable<TSource>,System.Collections.Generic.IEnumerable<TKey>,System.Func<TSource,TKey>,System.Collections.Generic.IEqualityComparer<TKey>);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
 | System.Linq;Enumerable;First<TSource>;(System.Collections.Generic.IEnumerable<TSource>);Argument[0].Element;ReturnValue;value;manual |
 | System.Linq;Enumerable;First<TSource>;(System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,System.Boolean>);Argument[0].Element;Argument[1].Parameter[0];value;manual |
@@ -8319,9 +8974,16 @@
 | System.Linq;Enumerable;FirstOrDefault<TSource>;(System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,System.Boolean>);Argument[0].Element;Argument[1].Parameter[0];value;manual |
 | System.Linq;Enumerable;FirstOrDefault<TSource>;(System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,System.Boolean>);Argument[0].Element;ReturnValue;value;manual |
 | System.Linq;Enumerable;FirstOrDefault<TSource>;(System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,System.Boolean>);Argument[1];Argument[1].Parameter[delegate-self];value;manual |
+| System.Linq;Enumerable;FirstOrDefault<TSource>;(System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,System.Boolean>,TSource);Argument[0].Element;Argument[1].Parameter[0];value;dfc-generated |
+| System.Linq;Enumerable;FirstOrDefault<TSource>;(System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,System.Boolean>,TSource);Argument[0].Element;Argument[1].Parameter[0];value;hq-generated |
+| System.Linq;Enumerable;FirstOrDefault<TSource>;(System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,System.Boolean>,TSource);Argument[0].Element;ReturnValue;value;dfc-generated |
+| System.Linq;Enumerable;FirstOrDefault<TSource>;(System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,System.Boolean>,TSource);Argument[0].Element;ReturnValue;value;hq-generated |
+| System.Linq;Enumerable;FirstOrDefault<TSource>;(System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,System.Boolean>,TSource);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | System.Linq;Enumerable;FirstOrDefault<TSource>;(System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,System.Boolean>,TSource);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
-| System.Linq;Enumerable;FirstOrDefault<TSource>;(System.Collections.Generic.IEnumerable<TSource>,TSource);Argument[0].Element;ReturnValue;taint;df-generated |
-| System.Linq;Enumerable;FirstOrDefault<TSource>;(System.Collections.Generic.IEnumerable<TSource>,TSource);Argument[1];ReturnValue;taint;df-generated |
+| System.Linq;Enumerable;FirstOrDefault<TSource>;(System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,System.Boolean>,TSource);Argument[2];ReturnValue;value;dfc-generated |
+| System.Linq;Enumerable;FirstOrDefault<TSource>;(System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,System.Boolean>,TSource);Argument[2];ReturnValue;value;hq-generated |
+| System.Linq;Enumerable;FirstOrDefault<TSource>;(System.Collections.Generic.IEnumerable<TSource>,TSource);Argument[0].Element;ReturnValue;value;dfc-generated |
+| System.Linq;Enumerable;FirstOrDefault<TSource>;(System.Collections.Generic.IEnumerable<TSource>,TSource);Argument[1];ReturnValue;value;dfc-generated |
 | System.Linq;Enumerable;GroupBy<TSource,TKey,TElement,TResult>;(System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,TKey>,System.Func<TSource,TElement>,System.Func<TKey,System.Collections.Generic.IEnumerable<TElement>,TResult>);Argument[0].Element;Argument[1].Parameter[0];value;manual |
 | System.Linq;Enumerable;GroupBy<TSource,TKey,TElement,TResult>;(System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,TKey>,System.Func<TSource,TElement>,System.Func<TKey,System.Collections.Generic.IEnumerable<TElement>,TResult>);Argument[0].Element;Argument[2].Parameter[0];value;manual |
 | System.Linq;Enumerable;GroupBy<TSource,TKey,TElement,TResult>;(System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,TKey>,System.Func<TSource,TElement>,System.Func<TKey,System.Collections.Generic.IEnumerable<TElement>,TResult>);Argument[1].ReturnValue;Argument[2].Parameter[0];value;manual |
@@ -8383,7 +9045,17 @@
 | System.Linq;Enumerable;Intersect<TSource>;(System.Collections.Generic.IEnumerable<TSource>,System.Collections.Generic.IEnumerable<TSource>);Argument[1].Element;ReturnValue.Element;value;manual |
 | System.Linq;Enumerable;Intersect<TSource>;(System.Collections.Generic.IEnumerable<TSource>,System.Collections.Generic.IEnumerable<TSource>,System.Collections.Generic.IEqualityComparer<TSource>);Argument[0].Element;ReturnValue.Element;value;manual |
 | System.Linq;Enumerable;Intersect<TSource>;(System.Collections.Generic.IEnumerable<TSource>,System.Collections.Generic.IEnumerable<TSource>,System.Collections.Generic.IEqualityComparer<TSource>);Argument[1].Element;ReturnValue.Element;value;manual |
+| System.Linq;Enumerable;IntersectBy<TSource,TKey>;(System.Collections.Generic.IEnumerable<TSource>,System.Collections.Generic.IEnumerable<TKey>,System.Func<TSource,TKey>);Argument[0].Element;Argument[2].Parameter[0];value;dfc-generated |
+| System.Linq;Enumerable;IntersectBy<TSource,TKey>;(System.Collections.Generic.IEnumerable<TSource>,System.Collections.Generic.IEnumerable<TKey>,System.Func<TSource,TKey>);Argument[0].Element;Argument[2].Parameter[0];value;hq-generated |
+| System.Linq;Enumerable;IntersectBy<TSource,TKey>;(System.Collections.Generic.IEnumerable<TSource>,System.Collections.Generic.IEnumerable<TKey>,System.Func<TSource,TKey>);Argument[0].Element;ReturnValue.Element;value;dfc-generated |
+| System.Linq;Enumerable;IntersectBy<TSource,TKey>;(System.Collections.Generic.IEnumerable<TSource>,System.Collections.Generic.IEnumerable<TKey>,System.Func<TSource,TKey>);Argument[0].Element;ReturnValue.Element;value;hq-generated |
+| System.Linq;Enumerable;IntersectBy<TSource,TKey>;(System.Collections.Generic.IEnumerable<TSource>,System.Collections.Generic.IEnumerable<TKey>,System.Func<TSource,TKey>);Argument[2];Argument[2].Parameter[delegate-self];value;dfc-generated |
 | System.Linq;Enumerable;IntersectBy<TSource,TKey>;(System.Collections.Generic.IEnumerable<TSource>,System.Collections.Generic.IEnumerable<TKey>,System.Func<TSource,TKey>);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
+| System.Linq;Enumerable;IntersectBy<TSource,TKey>;(System.Collections.Generic.IEnumerable<TSource>,System.Collections.Generic.IEnumerable<TKey>,System.Func<TSource,TKey>,System.Collections.Generic.IEqualityComparer<TKey>);Argument[0].Element;Argument[2].Parameter[0];value;dfc-generated |
+| System.Linq;Enumerable;IntersectBy<TSource,TKey>;(System.Collections.Generic.IEnumerable<TSource>,System.Collections.Generic.IEnumerable<TKey>,System.Func<TSource,TKey>,System.Collections.Generic.IEqualityComparer<TKey>);Argument[0].Element;Argument[2].Parameter[0];value;hq-generated |
+| System.Linq;Enumerable;IntersectBy<TSource,TKey>;(System.Collections.Generic.IEnumerable<TSource>,System.Collections.Generic.IEnumerable<TKey>,System.Func<TSource,TKey>,System.Collections.Generic.IEqualityComparer<TKey>);Argument[0].Element;ReturnValue.Element;value;dfc-generated |
+| System.Linq;Enumerable;IntersectBy<TSource,TKey>;(System.Collections.Generic.IEnumerable<TSource>,System.Collections.Generic.IEnumerable<TKey>,System.Func<TSource,TKey>,System.Collections.Generic.IEqualityComparer<TKey>);Argument[0].Element;ReturnValue.Element;value;hq-generated |
+| System.Linq;Enumerable;IntersectBy<TSource,TKey>;(System.Collections.Generic.IEnumerable<TSource>,System.Collections.Generic.IEnumerable<TKey>,System.Func<TSource,TKey>,System.Collections.Generic.IEqualityComparer<TKey>);Argument[2];Argument[2].Parameter[delegate-self];value;dfc-generated |
 | System.Linq;Enumerable;IntersectBy<TSource,TKey>;(System.Collections.Generic.IEnumerable<TSource>,System.Collections.Generic.IEnumerable<TKey>,System.Func<TSource,TKey>,System.Collections.Generic.IEqualityComparer<TKey>);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
 | System.Linq;Enumerable;Join<TOuter,TInner,TKey,TResult>;(System.Collections.Generic.IEnumerable<TOuter>,System.Collections.Generic.IEnumerable<TInner>,System.Func<TOuter,TKey>,System.Func<TInner,TKey>,System.Func<TOuter,TInner,TResult>);Argument[0].Element;Argument[2].Parameter[0];value;manual |
 | System.Linq;Enumerable;Join<TOuter,TInner,TKey,TResult>;(System.Collections.Generic.IEnumerable<TOuter>,System.Collections.Generic.IEnumerable<TInner>,System.Func<TOuter,TKey>,System.Func<TInner,TKey>,System.Func<TOuter,TInner,TResult>);Argument[0].Element;Argument[4].Parameter[0];value;manual |
@@ -8409,15 +9081,18 @@
 | System.Linq;Enumerable;LastOrDefault<TSource>;(System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,System.Boolean>);Argument[0].Element;Argument[1].Parameter[0];value;manual |
 | System.Linq;Enumerable;LastOrDefault<TSource>;(System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,System.Boolean>);Argument[0].Element;ReturnValue;value;manual |
 | System.Linq;Enumerable;LastOrDefault<TSource>;(System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,System.Boolean>);Argument[1];Argument[1].Parameter[delegate-self];value;manual |
+| System.Linq;Enumerable;LastOrDefault<TSource>;(System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,System.Boolean>,TSource);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | System.Linq;Enumerable;LastOrDefault<TSource>;(System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,System.Boolean>,TSource);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
-| System.Linq;Enumerable;LastOrDefault<TSource>;(System.Collections.Generic.IEnumerable<TSource>,TSource);Argument[0].Element;ReturnValue;taint;df-generated |
-| System.Linq;Enumerable;LastOrDefault<TSource>;(System.Collections.Generic.IEnumerable<TSource>,TSource);Argument[1];ReturnValue;taint;df-generated |
+| System.Linq;Enumerable;LastOrDefault<TSource>;(System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,System.Boolean>,TSource);Argument[2];ReturnValue;value;dfc-generated |
+| System.Linq;Enumerable;LastOrDefault<TSource>;(System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,System.Boolean>,TSource);Argument[2];ReturnValue;value;hq-generated |
+| System.Linq;Enumerable;LastOrDefault<TSource>;(System.Collections.Generic.IEnumerable<TSource>,TSource);Argument[0].Element;ReturnValue;value;dfc-generated |
+| System.Linq;Enumerable;LastOrDefault<TSource>;(System.Collections.Generic.IEnumerable<TSource>,TSource);Argument[1];ReturnValue;value;dfc-generated |
 | System.Linq;Enumerable;LongCount<TSource>;(System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,System.Boolean>);Argument[0].Element;Argument[1].Parameter[0];value;manual |
 | System.Linq;Enumerable;LongCount<TSource>;(System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,System.Boolean>);Argument[1];Argument[1].Parameter[delegate-self];value;manual |
-| System.Linq;Enumerable;Max;(System.Collections.Generic.IEnumerable<System.Nullable<System.Double>>);Argument[0].Element;ReturnValue;taint;df-generated |
-| System.Linq;Enumerable;Max;(System.Collections.Generic.IEnumerable<System.Nullable<System.Int32>>);Argument[0].Element;ReturnValue;taint;df-generated |
-| System.Linq;Enumerable;Max;(System.Collections.Generic.IEnumerable<System.Nullable<System.Int64>>);Argument[0].Element;ReturnValue;taint;df-generated |
-| System.Linq;Enumerable;Max;(System.Collections.Generic.IEnumerable<System.Nullable<System.Single>>);Argument[0].Element;ReturnValue;taint;df-generated |
+| System.Linq;Enumerable;Max;(System.Collections.Generic.IEnumerable<System.Nullable<System.Double>>);Argument[0].Element;ReturnValue;value;dfc-generated |
+| System.Linq;Enumerable;Max;(System.Collections.Generic.IEnumerable<System.Nullable<System.Int32>>);Argument[0].Element;ReturnValue;value;dfc-generated |
+| System.Linq;Enumerable;Max;(System.Collections.Generic.IEnumerable<System.Nullable<System.Int64>>);Argument[0].Element;ReturnValue;value;dfc-generated |
+| System.Linq;Enumerable;Max;(System.Collections.Generic.IEnumerable<System.Nullable<System.Single>>);Argument[0].Element;ReturnValue;value;dfc-generated |
 | System.Linq;Enumerable;Max<TSource,TResult>;(System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,TResult>);Argument[0].Element;Argument[1].Parameter[0];value;manual |
 | System.Linq;Enumerable;Max<TSource,TResult>;(System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,TResult>);Argument[1];Argument[1].Parameter[delegate-self];value;manual |
 | System.Linq;Enumerable;Max<TSource>;(System.Collections.Generic.IEnumerable<TSource>);Argument[0].Element;ReturnValue;taint;df-generated |
@@ -8445,10 +9120,10 @@
 | System.Linq;Enumerable;Max<TSource>;(System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,System.Single>);Argument[1];Argument[1].Parameter[delegate-self];value;manual |
 | System.Linq;Enumerable;MaxBy<TSource,TKey>;(System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,TKey>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
 | System.Linq;Enumerable;MaxBy<TSource,TKey>;(System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,TKey>,System.Collections.Generic.IComparer<TKey>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
-| System.Linq;Enumerable;Min;(System.Collections.Generic.IEnumerable<System.Nullable<System.Double>>);Argument[0].Element;ReturnValue;taint;df-generated |
-| System.Linq;Enumerable;Min;(System.Collections.Generic.IEnumerable<System.Nullable<System.Int32>>);Argument[0].Element;ReturnValue;taint;df-generated |
-| System.Linq;Enumerable;Min;(System.Collections.Generic.IEnumerable<System.Nullable<System.Int64>>);Argument[0].Element;ReturnValue;taint;df-generated |
-| System.Linq;Enumerable;Min;(System.Collections.Generic.IEnumerable<System.Nullable<System.Single>>);Argument[0].Element;ReturnValue;taint;df-generated |
+| System.Linq;Enumerable;Min;(System.Collections.Generic.IEnumerable<System.Nullable<System.Double>>);Argument[0].Element;ReturnValue;value;dfc-generated |
+| System.Linq;Enumerable;Min;(System.Collections.Generic.IEnumerable<System.Nullable<System.Int32>>);Argument[0].Element;ReturnValue;value;dfc-generated |
+| System.Linq;Enumerable;Min;(System.Collections.Generic.IEnumerable<System.Nullable<System.Int64>>);Argument[0].Element;ReturnValue;value;dfc-generated |
+| System.Linq;Enumerable;Min;(System.Collections.Generic.IEnumerable<System.Nullable<System.Single>>);Argument[0].Element;ReturnValue;value;dfc-generated |
 | System.Linq;Enumerable;Min<TSource,TResult>;(System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,TResult>);Argument[0].Element;Argument[1].Parameter[0];value;manual |
 | System.Linq;Enumerable;Min<TSource,TResult>;(System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,TResult>);Argument[1];Argument[1].Parameter[delegate-self];value;manual |
 | System.Linq;Enumerable;Min<TSource>;(System.Collections.Generic.IEnumerable<TSource>);Argument[0].Element;ReturnValue;taint;df-generated |
@@ -8477,9 +9152,8 @@
 | System.Linq;Enumerable;MinBy<TSource,TKey>;(System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,TKey>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
 | System.Linq;Enumerable;MinBy<TSource,TKey>;(System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,TKey>,System.Collections.Generic.IComparer<TKey>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
 | System.Linq;Enumerable;OfType<TResult>;(System.Collections.IEnumerable);Argument[0].Element;ReturnValue.Element;value;manual |
-| System.Linq;Enumerable;Order<T>;(System.Collections.Generic.IEnumerable<T>);Argument[0].Element;ReturnValue;taint;df-generated |
-| System.Linq;Enumerable;Order<T>;(System.Collections.Generic.IEnumerable<T>,System.Collections.Generic.IComparer<T>);Argument[0].Element;ReturnValue;taint;df-generated |
-| System.Linq;Enumerable;Order<T>;(System.Collections.Generic.IEnumerable<T>,System.Collections.Generic.IComparer<T>);Argument[1];ReturnValue;taint;df-generated |
+| System.Linq;Enumerable;Order<T>;(System.Collections.Generic.IEnumerable<T>);Argument[0].Element;ReturnValue.Element;value;dfc-generated |
+| System.Linq;Enumerable;Order<T>;(System.Collections.Generic.IEnumerable<T>,System.Collections.Generic.IComparer<T>);Argument[0].Element;ReturnValue.Element;value;dfc-generated |
 | System.Linq;Enumerable;OrderBy<TSource,TKey>;(System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,TKey>);Argument[0].Element;Argument[1].Parameter[0];value;manual |
 | System.Linq;Enumerable;OrderBy<TSource,TKey>;(System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,TKey>);Argument[0].Element;ReturnValue.Element;value;manual |
 | System.Linq;Enumerable;OrderBy<TSource,TKey>;(System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,TKey>);Argument[1];Argument[1].Parameter[delegate-self];value;manual |
@@ -8492,9 +9166,8 @@
 | System.Linq;Enumerable;OrderByDescending<TSource,TKey>;(System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,TKey>,System.Collections.Generic.IComparer<TKey>);Argument[0].Element;Argument[1].Parameter[0];value;manual |
 | System.Linq;Enumerable;OrderByDescending<TSource,TKey>;(System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,TKey>,System.Collections.Generic.IComparer<TKey>);Argument[0].Element;ReturnValue.Element;value;manual |
 | System.Linq;Enumerable;OrderByDescending<TSource,TKey>;(System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,TKey>,System.Collections.Generic.IComparer<TKey>);Argument[1];Argument[1].Parameter[delegate-self];value;manual |
-| System.Linq;Enumerable;OrderDescending<T>;(System.Collections.Generic.IEnumerable<T>);Argument[0].Element;ReturnValue;taint;df-generated |
-| System.Linq;Enumerable;OrderDescending<T>;(System.Collections.Generic.IEnumerable<T>,System.Collections.Generic.IComparer<T>);Argument[0].Element;ReturnValue;taint;df-generated |
-| System.Linq;Enumerable;OrderDescending<T>;(System.Collections.Generic.IEnumerable<T>,System.Collections.Generic.IComparer<T>);Argument[1];ReturnValue;taint;df-generated |
+| System.Linq;Enumerable;OrderDescending<T>;(System.Collections.Generic.IEnumerable<T>);Argument[0].Element;ReturnValue.Element;value;dfc-generated |
+| System.Linq;Enumerable;OrderDescending<T>;(System.Collections.Generic.IEnumerable<T>,System.Collections.Generic.IComparer<T>);Argument[0].Element;ReturnValue.Element;value;dfc-generated |
 | System.Linq;Enumerable;Prepend<TSource>;(System.Collections.Generic.IEnumerable<TSource>,TSource);Argument[1];ReturnValue;taint;df-generated |
 | System.Linq;Enumerable;Repeat<TResult>;(TResult,System.Int32);Argument[0];ReturnValue;taint;df-generated |
 | System.Linq;Enumerable;Reverse<TSource>;(System.Collections.Generic.IEnumerable<TSource>);Argument[0].Element;ReturnValue.Element;value;manual |
@@ -8522,6 +9195,8 @@
 | System.Linq;Enumerable;SelectMany<TSource,TResult>;(System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,System.Int32,System.Collections.Generic.IEnumerable<TResult>>);Argument[0].Element;Argument[1].Parameter[0];value;manual |
 | System.Linq;Enumerable;SelectMany<TSource,TResult>;(System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,System.Int32,System.Collections.Generic.IEnumerable<TResult>>);Argument[1].ReturnValue;ReturnValue.Element;value;manual |
 | System.Linq;Enumerable;SelectMany<TSource,TResult>;(System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,System.Int32,System.Collections.Generic.IEnumerable<TResult>>);Argument[1];Argument[1].Parameter[delegate-self];value;manual |
+| System.Linq;Enumerable;SequenceEqual<TSource>;(System.Collections.Generic.IEnumerable<TSource>,System.Collections.Generic.IEnumerable<TSource>,System.Collections.Generic.IEqualityComparer<TSource>);Argument[0].Element;Argument[2];taint;df-generated |
+| System.Linq;Enumerable;SequenceEqual<TSource>;(System.Collections.Generic.IEnumerable<TSource>,System.Collections.Generic.IEnumerable<TSource>,System.Collections.Generic.IEqualityComparer<TSource>);Argument[1].Element;Argument[2];taint;df-generated |
 | System.Linq;Enumerable;Single<TSource>;(System.Collections.Generic.IEnumerable<TSource>);Argument[0].Element;ReturnValue;value;manual |
 | System.Linq;Enumerable;Single<TSource>;(System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,System.Boolean>);Argument[0].Element;Argument[1].Parameter[0];value;manual |
 | System.Linq;Enumerable;Single<TSource>;(System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,System.Boolean>);Argument[0].Element;ReturnValue;value;manual |
@@ -8530,9 +9205,16 @@
 | System.Linq;Enumerable;SingleOrDefault<TSource>;(System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,System.Boolean>);Argument[0].Element;Argument[1].Parameter[0];value;manual |
 | System.Linq;Enumerable;SingleOrDefault<TSource>;(System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,System.Boolean>);Argument[0].Element;ReturnValue;value;manual |
 | System.Linq;Enumerable;SingleOrDefault<TSource>;(System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,System.Boolean>);Argument[1];Argument[1].Parameter[delegate-self];value;manual |
+| System.Linq;Enumerable;SingleOrDefault<TSource>;(System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,System.Boolean>,TSource);Argument[0].Element;Argument[1].Parameter[0];value;dfc-generated |
+| System.Linq;Enumerable;SingleOrDefault<TSource>;(System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,System.Boolean>,TSource);Argument[0].Element;Argument[1].Parameter[0];value;hq-generated |
+| System.Linq;Enumerable;SingleOrDefault<TSource>;(System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,System.Boolean>,TSource);Argument[0].Element;ReturnValue;value;dfc-generated |
+| System.Linq;Enumerable;SingleOrDefault<TSource>;(System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,System.Boolean>,TSource);Argument[0].Element;ReturnValue;value;hq-generated |
+| System.Linq;Enumerable;SingleOrDefault<TSource>;(System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,System.Boolean>,TSource);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | System.Linq;Enumerable;SingleOrDefault<TSource>;(System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,System.Boolean>,TSource);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
-| System.Linq;Enumerable;SingleOrDefault<TSource>;(System.Collections.Generic.IEnumerable<TSource>,TSource);Argument[0].Element;ReturnValue;taint;df-generated |
-| System.Linq;Enumerable;SingleOrDefault<TSource>;(System.Collections.Generic.IEnumerable<TSource>,TSource);Argument[1];ReturnValue;taint;df-generated |
+| System.Linq;Enumerable;SingleOrDefault<TSource>;(System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,System.Boolean>,TSource);Argument[2];ReturnValue;value;dfc-generated |
+| System.Linq;Enumerable;SingleOrDefault<TSource>;(System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,System.Boolean>,TSource);Argument[2];ReturnValue;value;hq-generated |
+| System.Linq;Enumerable;SingleOrDefault<TSource>;(System.Collections.Generic.IEnumerable<TSource>,TSource);Argument[0].Element;ReturnValue;value;dfc-generated |
+| System.Linq;Enumerable;SingleOrDefault<TSource>;(System.Collections.Generic.IEnumerable<TSource>,TSource);Argument[1];ReturnValue;value;dfc-generated |
 | System.Linq;Enumerable;Skip<TSource>;(System.Collections.Generic.IEnumerable<TSource>,System.Int32);Argument[0].Element;ReturnValue.Element;value;manual |
 | System.Linq;Enumerable;SkipLast<TSource>;(System.Collections.Generic.IEnumerable<TSource>,System.Int32);Argument[0].Element;ReturnValue;taint;df-generated |
 | System.Linq;Enumerable;SkipWhile<TSource>;(System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,System.Boolean>);Argument[0].Element;Argument[1].Parameter[0];value;manual |
@@ -8583,11 +9265,16 @@
 | System.Linq;Enumerable;ThenByDescending<TSource,TKey>;(System.Linq.IOrderedEnumerable<TSource>,System.Func<TSource,TKey>,System.Collections.Generic.IComparer<TKey>);Argument[0].Element;ReturnValue.Element;value;manual |
 | System.Linq;Enumerable;ThenByDescending<TSource,TKey>;(System.Linq.IOrderedEnumerable<TSource>,System.Func<TSource,TKey>,System.Collections.Generic.IComparer<TKey>);Argument[1];Argument[1].Parameter[delegate-self];value;manual |
 | System.Linq;Enumerable;ToArray<TSource>;(System.Collections.Generic.IEnumerable<TSource>);Argument[0].Element;ReturnValue.Element;value;manual |
-| System.Linq;Enumerable;ToDictionary<TKey,TValue>;(System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<TKey,TValue>>);Argument[0].Element;ReturnValue;taint;df-generated |
-| System.Linq;Enumerable;ToDictionary<TKey,TValue>;(System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<TKey,TValue>>,System.Collections.Generic.IEqualityComparer<TKey>);Argument[0].Element;ReturnValue;taint;df-generated |
-| System.Linq;Enumerable;ToDictionary<TKey,TValue>;(System.Collections.Generic.IEnumerable<System.ValueTuple<TKey,TValue>>);Argument[0].Element;ReturnValue;taint;df-generated |
-| System.Linq;Enumerable;ToDictionary<TKey,TValue>;(System.Collections.Generic.IEnumerable<System.ValueTuple<TKey,TValue>>,System.Collections.Generic.IEqualityComparer<TKey>);Argument[0].Element;ReturnValue;taint;df-generated |
-| System.Linq;Enumerable;ToDictionary<TKey,TValue>;(System.Collections.Generic.IEnumerable<System.ValueTuple<TKey,TValue>>,System.Collections.Generic.IEqualityComparer<TKey>);Argument[1];ReturnValue;taint;df-generated |
+| System.Linq;Enumerable;ToDictionary<TKey,TValue>;(System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<TKey,TValue>>);Argument[0].Element.Property[System.Collections.Generic.KeyValuePair`2.Key];ReturnValue.Element.Property[System.Collections.Generic.KeyValuePair`2.Key];value;dfc-generated |
+| System.Linq;Enumerable;ToDictionary<TKey,TValue>;(System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<TKey,TValue>>);Argument[0].Element.Property[System.Collections.Generic.KeyValuePair`2.Value];ReturnValue.Element.Property[System.Collections.Generic.KeyValuePair`2.Value];value;dfc-generated |
+| System.Linq;Enumerable;ToDictionary<TKey,TValue>;(System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<TKey,TValue>>,System.Collections.Generic.IEqualityComparer<TKey>);Argument[0].Element.Property[System.Collections.Generic.KeyValuePair`2.Key];ReturnValue.Element.Property[System.Collections.Generic.KeyValuePair`2.Key];value;dfc-generated |
+| System.Linq;Enumerable;ToDictionary<TKey,TValue>;(System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<TKey,TValue>>,System.Collections.Generic.IEqualityComparer<TKey>);Argument[0].Element.Property[System.Collections.Generic.KeyValuePair`2.Value];ReturnValue.Element.Property[System.Collections.Generic.KeyValuePair`2.Value];value;dfc-generated |
+| System.Linq;Enumerable;ToDictionary<TKey,TValue>;(System.Collections.Generic.IEnumerable<System.ValueTuple<TKey,TValue>>);Argument[0].Element.Field[System.ValueTuple`2.Item1];ReturnValue.Element.Property[System.Collections.Generic.KeyValuePair`2.Key];value;dfc-generated |
+| System.Linq;Enumerable;ToDictionary<TKey,TValue>;(System.Collections.Generic.IEnumerable<System.ValueTuple<TKey,TValue>>);Argument[0].Element.Field[System.ValueTuple`2.Item2];ReturnValue.Element.Property[System.Collections.Generic.KeyValuePair`2.Value];value;dfc-generated |
+| System.Linq;Enumerable;ToDictionary<TKey,TValue>;(System.Collections.Generic.IEnumerable<System.ValueTuple<TKey,TValue>>);Argument[0].Element.Field[System.ValueTuple`2.Item2];ReturnValue.Element;value;dfc-generated |
+| System.Linq;Enumerable;ToDictionary<TKey,TValue>;(System.Collections.Generic.IEnumerable<System.ValueTuple<TKey,TValue>>,System.Collections.Generic.IEqualityComparer<TKey>);Argument[0].Element.Field[System.ValueTuple`2.Item1];ReturnValue.Element.Property[System.Collections.Generic.KeyValuePair`2.Key];value;dfc-generated |
+| System.Linq;Enumerable;ToDictionary<TKey,TValue>;(System.Collections.Generic.IEnumerable<System.ValueTuple<TKey,TValue>>,System.Collections.Generic.IEqualityComparer<TKey>);Argument[0].Element.Field[System.ValueTuple`2.Item2];ReturnValue.Element.Property[System.Collections.Generic.KeyValuePair`2.Value];value;dfc-generated |
+| System.Linq;Enumerable;ToDictionary<TKey,TValue>;(System.Collections.Generic.IEnumerable<System.ValueTuple<TKey,TValue>>,System.Collections.Generic.IEqualityComparer<TKey>);Argument[0].Element.Field[System.ValueTuple`2.Item2];ReturnValue.Element;value;dfc-generated |
 | System.Linq;Enumerable;ToDictionary<TSource,TKey,TElement>;(System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,TKey>,System.Func<TSource,TElement>);Argument[0].Element;Argument[1].Parameter[0];value;manual |
 | System.Linq;Enumerable;ToDictionary<TSource,TKey,TElement>;(System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,TKey>,System.Func<TSource,TElement>);Argument[0].Element;Argument[2].Parameter[0];value;manual |
 | System.Linq;Enumerable;ToDictionary<TSource,TKey,TElement>;(System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,TKey>,System.Func<TSource,TElement>);Argument[1];Argument[1].Parameter[delegate-self];value;manual |
@@ -8604,8 +9291,6 @@
 | System.Linq;Enumerable;ToDictionary<TSource,TKey>;(System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,TKey>,System.Collections.Generic.IEqualityComparer<TKey>);Argument[0].Element;Argument[1].Parameter[0];value;manual |
 | System.Linq;Enumerable;ToDictionary<TSource,TKey>;(System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,TKey>,System.Collections.Generic.IEqualityComparer<TKey>);Argument[0].Element;ReturnValue.Element;value;manual |
 | System.Linq;Enumerable;ToDictionary<TSource,TKey>;(System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,TKey>,System.Collections.Generic.IEqualityComparer<TKey>);Argument[1];Argument[1].Parameter[delegate-self];value;manual |
-| System.Linq;Enumerable;ToHashSet<TSource>;(System.Collections.Generic.IEnumerable<TSource>);Argument[0].Element;ReturnValue;taint;df-generated |
-| System.Linq;Enumerable;ToHashSet<TSource>;(System.Collections.Generic.IEnumerable<TSource>,System.Collections.Generic.IEqualityComparer<TSource>);Argument[0].Element;ReturnValue;taint;df-generated |
 | System.Linq;Enumerable;ToList<TSource>;(System.Collections.Generic.IEnumerable<TSource>);Argument[0].Element;ReturnValue.Element;value;manual |
 | System.Linq;Enumerable;ToLookup<TSource,TKey,TElement>;(System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,TKey>,System.Func<TSource,TElement>);Argument[0].Element;Argument[1].Parameter[0];value;manual |
 | System.Linq;Enumerable;ToLookup<TSource,TKey,TElement>;(System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,TKey>,System.Func<TSource,TElement>);Argument[0].Element;Argument[2].Parameter[0];value;manual |
@@ -8627,7 +9312,25 @@
 | System.Linq;Enumerable;Union<TSource>;(System.Collections.Generic.IEnumerable<TSource>,System.Collections.Generic.IEnumerable<TSource>);Argument[1].Element;ReturnValue.Element;value;manual |
 | System.Linq;Enumerable;Union<TSource>;(System.Collections.Generic.IEnumerable<TSource>,System.Collections.Generic.IEnumerable<TSource>,System.Collections.Generic.IEqualityComparer<TSource>);Argument[0].Element;ReturnValue.Element;value;manual |
 | System.Linq;Enumerable;Union<TSource>;(System.Collections.Generic.IEnumerable<TSource>,System.Collections.Generic.IEnumerable<TSource>,System.Collections.Generic.IEqualityComparer<TSource>);Argument[1].Element;ReturnValue.Element;value;manual |
+| System.Linq;Enumerable;UnionBy<TSource,TKey>;(System.Collections.Generic.IEnumerable<TSource>,System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,TKey>);Argument[0].Element;Argument[2].Parameter[0];value;dfc-generated |
+| System.Linq;Enumerable;UnionBy<TSource,TKey>;(System.Collections.Generic.IEnumerable<TSource>,System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,TKey>);Argument[0].Element;Argument[2].Parameter[0];value;hq-generated |
+| System.Linq;Enumerable;UnionBy<TSource,TKey>;(System.Collections.Generic.IEnumerable<TSource>,System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,TKey>);Argument[0].Element;ReturnValue.Element;value;dfc-generated |
+| System.Linq;Enumerable;UnionBy<TSource,TKey>;(System.Collections.Generic.IEnumerable<TSource>,System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,TKey>);Argument[0].Element;ReturnValue.Element;value;hq-generated |
+| System.Linq;Enumerable;UnionBy<TSource,TKey>;(System.Collections.Generic.IEnumerable<TSource>,System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,TKey>);Argument[1].Element;Argument[2].Parameter[0];value;dfc-generated |
+| System.Linq;Enumerable;UnionBy<TSource,TKey>;(System.Collections.Generic.IEnumerable<TSource>,System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,TKey>);Argument[1].Element;Argument[2].Parameter[0];value;hq-generated |
+| System.Linq;Enumerable;UnionBy<TSource,TKey>;(System.Collections.Generic.IEnumerable<TSource>,System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,TKey>);Argument[1].Element;ReturnValue.Element;value;dfc-generated |
+| System.Linq;Enumerable;UnionBy<TSource,TKey>;(System.Collections.Generic.IEnumerable<TSource>,System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,TKey>);Argument[1].Element;ReturnValue.Element;value;hq-generated |
+| System.Linq;Enumerable;UnionBy<TSource,TKey>;(System.Collections.Generic.IEnumerable<TSource>,System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,TKey>);Argument[2];Argument[2].Parameter[delegate-self];value;dfc-generated |
 | System.Linq;Enumerable;UnionBy<TSource,TKey>;(System.Collections.Generic.IEnumerable<TSource>,System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,TKey>);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
+| System.Linq;Enumerable;UnionBy<TSource,TKey>;(System.Collections.Generic.IEnumerable<TSource>,System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,TKey>,System.Collections.Generic.IEqualityComparer<TKey>);Argument[0].Element;Argument[2].Parameter[0];value;dfc-generated |
+| System.Linq;Enumerable;UnionBy<TSource,TKey>;(System.Collections.Generic.IEnumerable<TSource>,System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,TKey>,System.Collections.Generic.IEqualityComparer<TKey>);Argument[0].Element;Argument[2].Parameter[0];value;hq-generated |
+| System.Linq;Enumerable;UnionBy<TSource,TKey>;(System.Collections.Generic.IEnumerable<TSource>,System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,TKey>,System.Collections.Generic.IEqualityComparer<TKey>);Argument[0].Element;ReturnValue.Element;value;dfc-generated |
+| System.Linq;Enumerable;UnionBy<TSource,TKey>;(System.Collections.Generic.IEnumerable<TSource>,System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,TKey>,System.Collections.Generic.IEqualityComparer<TKey>);Argument[0].Element;ReturnValue.Element;value;hq-generated |
+| System.Linq;Enumerable;UnionBy<TSource,TKey>;(System.Collections.Generic.IEnumerable<TSource>,System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,TKey>,System.Collections.Generic.IEqualityComparer<TKey>);Argument[1].Element;Argument[2].Parameter[0];value;dfc-generated |
+| System.Linq;Enumerable;UnionBy<TSource,TKey>;(System.Collections.Generic.IEnumerable<TSource>,System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,TKey>,System.Collections.Generic.IEqualityComparer<TKey>);Argument[1].Element;Argument[2].Parameter[0];value;hq-generated |
+| System.Linq;Enumerable;UnionBy<TSource,TKey>;(System.Collections.Generic.IEnumerable<TSource>,System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,TKey>,System.Collections.Generic.IEqualityComparer<TKey>);Argument[1].Element;ReturnValue.Element;value;dfc-generated |
+| System.Linq;Enumerable;UnionBy<TSource,TKey>;(System.Collections.Generic.IEnumerable<TSource>,System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,TKey>,System.Collections.Generic.IEqualityComparer<TKey>);Argument[1].Element;ReturnValue.Element;value;hq-generated |
+| System.Linq;Enumerable;UnionBy<TSource,TKey>;(System.Collections.Generic.IEnumerable<TSource>,System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,TKey>,System.Collections.Generic.IEqualityComparer<TKey>);Argument[2];Argument[2].Parameter[delegate-self];value;dfc-generated |
 | System.Linq;Enumerable;UnionBy<TSource,TKey>;(System.Collections.Generic.IEnumerable<TSource>,System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,TKey>,System.Collections.Generic.IEqualityComparer<TKey>);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
 | System.Linq;Enumerable;Where<TSource>;(System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,System.Boolean>);Argument[0].Element;Argument[1].Parameter[0];value;manual |
 | System.Linq;Enumerable;Where<TSource>;(System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,System.Boolean>);Argument[0].Element;ReturnValue.Element;value;manual |
@@ -8639,23 +9342,46 @@
 | System.Linq;Enumerable;Zip<TFirst,TSecond,TResult>;(System.Collections.Generic.IEnumerable<TFirst>,System.Collections.Generic.IEnumerable<TSecond>,System.Func<TFirst,TSecond,TResult>);Argument[1].Element;Argument[2].Parameter[1];value;manual |
 | System.Linq;Enumerable;Zip<TFirst,TSecond,TResult>;(System.Collections.Generic.IEnumerable<TFirst>,System.Collections.Generic.IEnumerable<TSecond>,System.Func<TFirst,TSecond,TResult>);Argument[2].ReturnValue;ReturnValue.Element;value;manual |
 | System.Linq;Enumerable;Zip<TFirst,TSecond,TResult>;(System.Collections.Generic.IEnumerable<TFirst>,System.Collections.Generic.IEnumerable<TSecond>,System.Func<TFirst,TSecond,TResult>);Argument[2];Argument[2].Parameter[delegate-self];value;manual |
-| System.Linq;Enumerable;Zip<TFirst,TSecond,TThird>;(System.Collections.Generic.IEnumerable<TFirst>,System.Collections.Generic.IEnumerable<TSecond>,System.Collections.Generic.IEnumerable<TThird>);Argument[0].Element;ReturnValue;taint;df-generated |
-| System.Linq;Enumerable;Zip<TFirst,TSecond,TThird>;(System.Collections.Generic.IEnumerable<TFirst>,System.Collections.Generic.IEnumerable<TSecond>,System.Collections.Generic.IEnumerable<TThird>);Argument[1].Element;ReturnValue;taint;df-generated |
-| System.Linq;Enumerable;Zip<TFirst,TSecond,TThird>;(System.Collections.Generic.IEnumerable<TFirst>,System.Collections.Generic.IEnumerable<TSecond>,System.Collections.Generic.IEnumerable<TThird>);Argument[2].Element;ReturnValue;taint;df-generated |
-| System.Linq;Enumerable;Zip<TFirst,TSecond>;(System.Collections.Generic.IEnumerable<TFirst>,System.Collections.Generic.IEnumerable<TSecond>);Argument[0].Element;ReturnValue;taint;df-generated |
-| System.Linq;Enumerable;Zip<TFirst,TSecond>;(System.Collections.Generic.IEnumerable<TFirst>,System.Collections.Generic.IEnumerable<TSecond>);Argument[1].Element;ReturnValue;taint;df-generated |
+| System.Linq;Enumerable;Zip<TFirst,TSecond,TThird>;(System.Collections.Generic.IEnumerable<TFirst>,System.Collections.Generic.IEnumerable<TSecond>,System.Collections.Generic.IEnumerable<TThird>);Argument[0].Element;ReturnValue.Element.Field[System.ValueTuple`3.Item1];value;dfc-generated |
+| System.Linq;Enumerable;Zip<TFirst,TSecond,TThird>;(System.Collections.Generic.IEnumerable<TFirst>,System.Collections.Generic.IEnumerable<TSecond>,System.Collections.Generic.IEnumerable<TThird>);Argument[1].Element;ReturnValue.Element.Field[System.ValueTuple`3.Item2];value;dfc-generated |
+| System.Linq;Enumerable;Zip<TFirst,TSecond,TThird>;(System.Collections.Generic.IEnumerable<TFirst>,System.Collections.Generic.IEnumerable<TSecond>,System.Collections.Generic.IEnumerable<TThird>);Argument[2].Element;ReturnValue.Element.Field[System.ValueTuple`3.Item3];value;dfc-generated |
+| System.Linq;Enumerable;Zip<TFirst,TSecond>;(System.Collections.Generic.IEnumerable<TFirst>,System.Collections.Generic.IEnumerable<TSecond>);Argument[0].Element;ReturnValue.Element.Field[System.ValueTuple`2.Item1];value;dfc-generated |
+| System.Linq;Enumerable;Zip<TFirst,TSecond>;(System.Collections.Generic.IEnumerable<TFirst>,System.Collections.Generic.IEnumerable<TSecond>);Argument[1].Element;ReturnValue.Element.Field[System.ValueTuple`2.Item2];value;dfc-generated |
 | System.Linq;EnumerableExecutor<T>;EnumerableExecutor;(System.Linq.Expressions.Expression);Argument[0];Argument[this];taint;df-generated |
 | System.Linq;EnumerableQuery<T>;EnumerableQuery;(System.Collections.Generic.IEnumerable<T>);Argument[0].Element;Argument[this];taint;df-generated |
-| System.Linq;EnumerableQuery<T>;EnumerableQuery;(System.Linq.Expressions.Expression);Argument[0];Argument[this];taint;df-generated |
+| System.Linq;EnumerableQuery<T>;EnumerableQuery;(System.Linq.Expressions.Expression);Argument[0];Argument[this].SyntheticField[System.Linq.EnumerableQuery`1._expression];value;dfc-generated |
 | System.Linq;EnumerableQuery<T>;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.Generic.IEnumerator`1.Current];value;manual |
 | System.Linq;EnumerableQuery<T>;ToString;();Argument[this];ReturnValue;taint;df-generated |
+| System.Linq;EnumerableQuery<T>;get_Expression;();Argument[this].SyntheticField[System.Linq.EnumerableQuery`1._expression];ReturnValue;value;dfc-generated |
 | System.Linq;IOrderedEnumerable<TElement>;CreateOrderedEnumerable<TKey>;(System.Func<TElement,TKey>,System.Collections.Generic.IComparer<TKey>,System.Boolean);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
-| System.Linq;IQueryProvider;CreateQuery<TElement>;(System.Linq.Expressions.Expression);Argument[0];ReturnValue;taint;df-generated |
-| System.Linq;IQueryable;get_Expression;();Argument[this];ReturnValue;taint;df-generated |
-| System.Linq;IQueryable;get_Provider;();Argument[this];ReturnValue;value;df-generated |
+| System.Linq;IQueryable;get_Provider;();Argument[this];ReturnValue;value;dfc-generated |
+| System.Linq;ImmutableArrayExtensions;Aggregate<T>;(System.Collections.Immutable.ImmutableArray<T>,System.Func<T,T,T>);Argument[1].ReturnValue;Argument[1].Parameter[0];value;dfc-generated |
+| System.Linq;ImmutableArrayExtensions;Aggregate<T>;(System.Collections.Immutable.ImmutableArray<T>,System.Func<T,T,T>);Argument[1].ReturnValue;Argument[1].Parameter[0];value;hq-generated |
+| System.Linq;ImmutableArrayExtensions;Aggregate<T>;(System.Collections.Immutable.ImmutableArray<T>,System.Func<T,T,T>);Argument[1].ReturnValue;ReturnValue;value;dfc-generated |
+| System.Linq;ImmutableArrayExtensions;Aggregate<T>;(System.Collections.Immutable.ImmutableArray<T>,System.Func<T,T,T>);Argument[1].ReturnValue;ReturnValue;value;hq-generated |
+| System.Linq;ImmutableArrayExtensions;Aggregate<T>;(System.Collections.Immutable.ImmutableArray<T>,System.Func<T,T,T>);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | System.Linq;ImmutableArrayExtensions;Aggregate<T>;(System.Collections.Immutable.ImmutableArray<T>,System.Func<T,T,T>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
+| System.Linq;ImmutableArrayExtensions;Aggregate<TAccumulate,T>;(System.Collections.Immutable.ImmutableArray<T>,TAccumulate,System.Func<TAccumulate,T,TAccumulate>);Argument[1];Argument[2].Parameter[0];value;dfc-generated |
+| System.Linq;ImmutableArrayExtensions;Aggregate<TAccumulate,T>;(System.Collections.Immutable.ImmutableArray<T>,TAccumulate,System.Func<TAccumulate,T,TAccumulate>);Argument[1];Argument[2].Parameter[0];value;hq-generated |
+| System.Linq;ImmutableArrayExtensions;Aggregate<TAccumulate,T>;(System.Collections.Immutable.ImmutableArray<T>,TAccumulate,System.Func<TAccumulate,T,TAccumulate>);Argument[1];ReturnValue;value;dfc-generated |
+| System.Linq;ImmutableArrayExtensions;Aggregate<TAccumulate,T>;(System.Collections.Immutable.ImmutableArray<T>,TAccumulate,System.Func<TAccumulate,T,TAccumulate>);Argument[1];ReturnValue;value;hq-generated |
+| System.Linq;ImmutableArrayExtensions;Aggregate<TAccumulate,T>;(System.Collections.Immutable.ImmutableArray<T>,TAccumulate,System.Func<TAccumulate,T,TAccumulate>);Argument[2].ReturnValue;Argument[2].Parameter[0];value;dfc-generated |
+| System.Linq;ImmutableArrayExtensions;Aggregate<TAccumulate,T>;(System.Collections.Immutable.ImmutableArray<T>,TAccumulate,System.Func<TAccumulate,T,TAccumulate>);Argument[2].ReturnValue;Argument[2].Parameter[0];value;hq-generated |
+| System.Linq;ImmutableArrayExtensions;Aggregate<TAccumulate,T>;(System.Collections.Immutable.ImmutableArray<T>,TAccumulate,System.Func<TAccumulate,T,TAccumulate>);Argument[2].ReturnValue;ReturnValue;value;dfc-generated |
+| System.Linq;ImmutableArrayExtensions;Aggregate<TAccumulate,T>;(System.Collections.Immutable.ImmutableArray<T>,TAccumulate,System.Func<TAccumulate,T,TAccumulate>);Argument[2].ReturnValue;ReturnValue;value;hq-generated |
+| System.Linq;ImmutableArrayExtensions;Aggregate<TAccumulate,T>;(System.Collections.Immutable.ImmutableArray<T>,TAccumulate,System.Func<TAccumulate,T,TAccumulate>);Argument[2];Argument[2].Parameter[delegate-self];value;dfc-generated |
 | System.Linq;ImmutableArrayExtensions;Aggregate<TAccumulate,T>;(System.Collections.Immutable.ImmutableArray<T>,TAccumulate,System.Func<TAccumulate,T,TAccumulate>);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
+| System.Linq;ImmutableArrayExtensions;Aggregate<TAccumulate,TResult,T>;(System.Collections.Immutable.ImmutableArray<T>,TAccumulate,System.Func<TAccumulate,T,TAccumulate>,System.Func<TAccumulate,TResult>);Argument[1];Argument[2].Parameter[0];value;dfc-generated |
+| System.Linq;ImmutableArrayExtensions;Aggregate<TAccumulate,TResult,T>;(System.Collections.Immutable.ImmutableArray<T>,TAccumulate,System.Func<TAccumulate,T,TAccumulate>,System.Func<TAccumulate,TResult>);Argument[1];Argument[2].Parameter[0];value;hq-generated |
+| System.Linq;ImmutableArrayExtensions;Aggregate<TAccumulate,TResult,T>;(System.Collections.Immutable.ImmutableArray<T>,TAccumulate,System.Func<TAccumulate,T,TAccumulate>,System.Func<TAccumulate,TResult>);Argument[1];Argument[3].Parameter[0];value;dfc-generated |
+| System.Linq;ImmutableArrayExtensions;Aggregate<TAccumulate,TResult,T>;(System.Collections.Immutable.ImmutableArray<T>,TAccumulate,System.Func<TAccumulate,T,TAccumulate>,System.Func<TAccumulate,TResult>);Argument[1];Argument[3].Parameter[0];value;hq-generated |
+| System.Linq;ImmutableArrayExtensions;Aggregate<TAccumulate,TResult,T>;(System.Collections.Immutable.ImmutableArray<T>,TAccumulate,System.Func<TAccumulate,T,TAccumulate>,System.Func<TAccumulate,TResult>);Argument[2].ReturnValue;Argument[3].Parameter[0];value;dfc-generated |
+| System.Linq;ImmutableArrayExtensions;Aggregate<TAccumulate,TResult,T>;(System.Collections.Immutable.ImmutableArray<T>,TAccumulate,System.Func<TAccumulate,T,TAccumulate>,System.Func<TAccumulate,TResult>);Argument[2].ReturnValue;Argument[3].Parameter[0];value;hq-generated |
+| System.Linq;ImmutableArrayExtensions;Aggregate<TAccumulate,TResult,T>;(System.Collections.Immutable.ImmutableArray<T>,TAccumulate,System.Func<TAccumulate,T,TAccumulate>,System.Func<TAccumulate,TResult>);Argument[2];Argument[2].Parameter[delegate-self];value;dfc-generated |
 | System.Linq;ImmutableArrayExtensions;Aggregate<TAccumulate,TResult,T>;(System.Collections.Immutable.ImmutableArray<T>,TAccumulate,System.Func<TAccumulate,T,TAccumulate>,System.Func<TAccumulate,TResult>);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
+| System.Linq;ImmutableArrayExtensions;Aggregate<TAccumulate,TResult,T>;(System.Collections.Immutable.ImmutableArray<T>,TAccumulate,System.Func<TAccumulate,T,TAccumulate>,System.Func<TAccumulate,TResult>);Argument[3].ReturnValue;ReturnValue;value;dfc-generated |
+| System.Linq;ImmutableArrayExtensions;Aggregate<TAccumulate,TResult,T>;(System.Collections.Immutable.ImmutableArray<T>,TAccumulate,System.Func<TAccumulate,T,TAccumulate>,System.Func<TAccumulate,TResult>);Argument[3].ReturnValue;ReturnValue;value;hq-generated |
+| System.Linq;ImmutableArrayExtensions;Aggregate<TAccumulate,TResult,T>;(System.Collections.Immutable.ImmutableArray<T>,TAccumulate,System.Func<TAccumulate,T,TAccumulate>,System.Func<TAccumulate,TResult>);Argument[3];Argument[3].Parameter[delegate-self];value;dfc-generated |
 | System.Linq;ImmutableArrayExtensions;Aggregate<TAccumulate,TResult,T>;(System.Collections.Immutable.ImmutableArray<T>,TAccumulate,System.Func<TAccumulate,T,TAccumulate>,System.Func<TAccumulate,TResult>);Argument[3];Argument[3].Parameter[delegate-self];value;hq-generated |
 | System.Linq;ImmutableArrayExtensions;All<T>;(System.Collections.Immutable.ImmutableArray<T>,System.Func<T,System.Boolean>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
 | System.Linq;ImmutableArrayExtensions;Any<T>;(System.Collections.Immutable.ImmutableArray<T>,System.Func<T,System.Boolean>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
@@ -8673,29 +9399,87 @@
 | System.Linq;ImmutableArrayExtensions;LastOrDefault<T>;(System.Collections.Immutable.ImmutableArray<T>+Builder);Argument[0].Element;ReturnValue;value;manual |
 | System.Linq;ImmutableArrayExtensions;LastOrDefault<T>;(System.Collections.Immutable.ImmutableArray<T>,System.Func<T,System.Boolean>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
 | System.Linq;ImmutableArrayExtensions;Select<T,TResult>;(System.Collections.Immutable.ImmutableArray<T>,System.Func<T,TResult>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
+| System.Linq;ImmutableArrayExtensions;SelectMany<TSource,TCollection,TResult>;(System.Collections.Immutable.ImmutableArray<TSource>,System.Func<TSource,System.Collections.Generic.IEnumerable<TCollection>>,System.Func<TSource,TCollection,TResult>);Argument[1].ReturnValue.Element;Argument[2].Parameter[1];value;dfc-generated |
+| System.Linq;ImmutableArrayExtensions;SelectMany<TSource,TCollection,TResult>;(System.Collections.Immutable.ImmutableArray<TSource>,System.Func<TSource,System.Collections.Generic.IEnumerable<TCollection>>,System.Func<TSource,TCollection,TResult>);Argument[1].ReturnValue.Element;Argument[2].Parameter[1];value;hq-generated |
+| System.Linq;ImmutableArrayExtensions;SelectMany<TSource,TCollection,TResult>;(System.Collections.Immutable.ImmutableArray<TSource>,System.Func<TSource,System.Collections.Generic.IEnumerable<TCollection>>,System.Func<TSource,TCollection,TResult>);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | System.Linq;ImmutableArrayExtensions;SelectMany<TSource,TCollection,TResult>;(System.Collections.Immutable.ImmutableArray<TSource>,System.Func<TSource,System.Collections.Generic.IEnumerable<TCollection>>,System.Func<TSource,TCollection,TResult>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
+| System.Linq;ImmutableArrayExtensions;SelectMany<TSource,TCollection,TResult>;(System.Collections.Immutable.ImmutableArray<TSource>,System.Func<TSource,System.Collections.Generic.IEnumerable<TCollection>>,System.Func<TSource,TCollection,TResult>);Argument[2].ReturnValue;ReturnValue.Element;value;dfc-generated |
+| System.Linq;ImmutableArrayExtensions;SelectMany<TSource,TCollection,TResult>;(System.Collections.Immutable.ImmutableArray<TSource>,System.Func<TSource,System.Collections.Generic.IEnumerable<TCollection>>,System.Func<TSource,TCollection,TResult>);Argument[2].ReturnValue;ReturnValue.Element;value;hq-generated |
+| System.Linq;ImmutableArrayExtensions;SelectMany<TSource,TCollection,TResult>;(System.Collections.Immutable.ImmutableArray<TSource>,System.Func<TSource,System.Collections.Generic.IEnumerable<TCollection>>,System.Func<TSource,TCollection,TResult>);Argument[2];Argument[2].Parameter[delegate-self];value;dfc-generated |
 | System.Linq;ImmutableArrayExtensions;SelectMany<TSource,TCollection,TResult>;(System.Collections.Immutable.ImmutableArray<TSource>,System.Func<TSource,System.Collections.Generic.IEnumerable<TCollection>>,System.Func<TSource,TCollection,TResult>);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
+| System.Linq;ImmutableArrayExtensions;SequenceEqual<TDerived,TBase>;(System.Collections.Immutable.ImmutableArray<TBase>,System.Collections.Generic.IEnumerable<TDerived>,System.Collections.Generic.IEqualityComparer<TBase>);Argument[0].Element;Argument[2];taint;df-generated |
+| System.Linq;ImmutableArrayExtensions;SequenceEqual<TDerived,TBase>;(System.Collections.Immutable.ImmutableArray<TBase>,System.Collections.Generic.IEnumerable<TDerived>,System.Collections.Generic.IEqualityComparer<TBase>);Argument[1].Element;Argument[2];taint;df-generated |
+| System.Linq;ImmutableArrayExtensions;SequenceEqual<TDerived,TBase>;(System.Collections.Immutable.ImmutableArray<TBase>,System.Collections.Immutable.ImmutableArray<TDerived>,System.Collections.Generic.IEqualityComparer<TBase>);Argument[0].Element;Argument[2];taint;df-generated |
+| System.Linq;ImmutableArrayExtensions;SequenceEqual<TDerived,TBase>;(System.Collections.Immutable.ImmutableArray<TBase>,System.Collections.Immutable.ImmutableArray<TDerived>,System.Collections.Generic.IEqualityComparer<TBase>);Argument[1].Element;Argument[2];taint;df-generated |
 | System.Linq;ImmutableArrayExtensions;SequenceEqual<TDerived,TBase>;(System.Collections.Immutable.ImmutableArray<TBase>,System.Collections.Immutable.ImmutableArray<TDerived>,System.Func<TBase,TBase,System.Boolean>);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
 | System.Linq;ImmutableArrayExtensions;Single<T>;(System.Collections.Immutable.ImmutableArray<T>);Argument[0].Element;ReturnValue;taint;df-generated |
 | System.Linq;ImmutableArrayExtensions;Single<T>;(System.Collections.Immutable.ImmutableArray<T>,System.Func<T,System.Boolean>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
 | System.Linq;ImmutableArrayExtensions;SingleOrDefault<T>;(System.Collections.Immutable.ImmutableArray<T>,System.Func<T,System.Boolean>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
 | System.Linq;ImmutableArrayExtensions;ToArray<T>;(System.Collections.Immutable.ImmutableArray<T>);Argument[0].Element;ReturnValue;taint;df-generated |
+| System.Linq;ImmutableArrayExtensions;ToDictionary<TKey,T>;(System.Collections.Immutable.ImmutableArray<T>,System.Func<T,TKey>);Argument[0].Element;Argument[1].Parameter[0];value;dfc-generated |
+| System.Linq;ImmutableArrayExtensions;ToDictionary<TKey,T>;(System.Collections.Immutable.ImmutableArray<T>,System.Func<T,TKey>);Argument[0].Element;Argument[1].Parameter[0];value;hq-generated |
+| System.Linq;ImmutableArrayExtensions;ToDictionary<TKey,T>;(System.Collections.Immutable.ImmutableArray<T>,System.Func<T,TKey>);Argument[0].Element;ReturnValue.Element.Property[System.Collections.Generic.KeyValuePair`2.Value];value;dfc-generated |
+| System.Linq;ImmutableArrayExtensions;ToDictionary<TKey,T>;(System.Collections.Immutable.ImmutableArray<T>,System.Func<T,TKey>);Argument[0].Element;ReturnValue.Element.Property[System.Collections.Generic.KeyValuePair`2.Value];value;hq-generated |
+| System.Linq;ImmutableArrayExtensions;ToDictionary<TKey,T>;(System.Collections.Immutable.ImmutableArray<T>,System.Func<T,TKey>);Argument[1].ReturnValue;ReturnValue.Element.Property[System.Collections.Generic.KeyValuePair`2.Key];value;dfc-generated |
+| System.Linq;ImmutableArrayExtensions;ToDictionary<TKey,T>;(System.Collections.Immutable.ImmutableArray<T>,System.Func<T,TKey>);Argument[1].ReturnValue;ReturnValue.Element.Property[System.Collections.Generic.KeyValuePair`2.Key];value;hq-generated |
+| System.Linq;ImmutableArrayExtensions;ToDictionary<TKey,T>;(System.Collections.Immutable.ImmutableArray<T>,System.Func<T,TKey>);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | System.Linq;ImmutableArrayExtensions;ToDictionary<TKey,T>;(System.Collections.Immutable.ImmutableArray<T>,System.Func<T,TKey>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
+| System.Linq;ImmutableArrayExtensions;ToDictionary<TKey,T>;(System.Collections.Immutable.ImmutableArray<T>,System.Func<T,TKey>,System.Collections.Generic.IEqualityComparer<TKey>);Argument[0].Element;Argument[1].Parameter[0];value;dfc-generated |
+| System.Linq;ImmutableArrayExtensions;ToDictionary<TKey,T>;(System.Collections.Immutable.ImmutableArray<T>,System.Func<T,TKey>,System.Collections.Generic.IEqualityComparer<TKey>);Argument[0].Element;Argument[1].Parameter[0];value;hq-generated |
+| System.Linq;ImmutableArrayExtensions;ToDictionary<TKey,T>;(System.Collections.Immutable.ImmutableArray<T>,System.Func<T,TKey>,System.Collections.Generic.IEqualityComparer<TKey>);Argument[0].Element;ReturnValue.Element.Property[System.Collections.Generic.KeyValuePair`2.Value];value;dfc-generated |
+| System.Linq;ImmutableArrayExtensions;ToDictionary<TKey,T>;(System.Collections.Immutable.ImmutableArray<T>,System.Func<T,TKey>,System.Collections.Generic.IEqualityComparer<TKey>);Argument[0].Element;ReturnValue.Element.Property[System.Collections.Generic.KeyValuePair`2.Value];value;hq-generated |
+| System.Linq;ImmutableArrayExtensions;ToDictionary<TKey,T>;(System.Collections.Immutable.ImmutableArray<T>,System.Func<T,TKey>,System.Collections.Generic.IEqualityComparer<TKey>);Argument[1].ReturnValue;ReturnValue.Element.Property[System.Collections.Generic.KeyValuePair`2.Key];value;dfc-generated |
+| System.Linq;ImmutableArrayExtensions;ToDictionary<TKey,T>;(System.Collections.Immutable.ImmutableArray<T>,System.Func<T,TKey>,System.Collections.Generic.IEqualityComparer<TKey>);Argument[1].ReturnValue;ReturnValue.Element.Property[System.Collections.Generic.KeyValuePair`2.Key];value;hq-generated |
+| System.Linq;ImmutableArrayExtensions;ToDictionary<TKey,T>;(System.Collections.Immutable.ImmutableArray<T>,System.Func<T,TKey>,System.Collections.Generic.IEqualityComparer<TKey>);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | System.Linq;ImmutableArrayExtensions;ToDictionary<TKey,T>;(System.Collections.Immutable.ImmutableArray<T>,System.Func<T,TKey>,System.Collections.Generic.IEqualityComparer<TKey>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
+| System.Linq;ImmutableArrayExtensions;ToDictionary<TKey,TElement,T>;(System.Collections.Immutable.ImmutableArray<T>,System.Func<T,TKey>,System.Func<T,TElement>);Argument[1].ReturnValue;ReturnValue.Element.Property[System.Collections.Generic.KeyValuePair`2.Key];value;dfc-generated |
+| System.Linq;ImmutableArrayExtensions;ToDictionary<TKey,TElement,T>;(System.Collections.Immutable.ImmutableArray<T>,System.Func<T,TKey>,System.Func<T,TElement>);Argument[1].ReturnValue;ReturnValue.Element.Property[System.Collections.Generic.KeyValuePair`2.Key];value;hq-generated |
+| System.Linq;ImmutableArrayExtensions;ToDictionary<TKey,TElement,T>;(System.Collections.Immutable.ImmutableArray<T>,System.Func<T,TKey>,System.Func<T,TElement>);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | System.Linq;ImmutableArrayExtensions;ToDictionary<TKey,TElement,T>;(System.Collections.Immutable.ImmutableArray<T>,System.Func<T,TKey>,System.Func<T,TElement>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
+| System.Linq;ImmutableArrayExtensions;ToDictionary<TKey,TElement,T>;(System.Collections.Immutable.ImmutableArray<T>,System.Func<T,TKey>,System.Func<T,TElement>);Argument[2].ReturnValue;ReturnValue.Element.Property[System.Collections.Generic.KeyValuePair`2.Value];value;dfc-generated |
+| System.Linq;ImmutableArrayExtensions;ToDictionary<TKey,TElement,T>;(System.Collections.Immutable.ImmutableArray<T>,System.Func<T,TKey>,System.Func<T,TElement>);Argument[2].ReturnValue;ReturnValue.Element.Property[System.Collections.Generic.KeyValuePair`2.Value];value;hq-generated |
+| System.Linq;ImmutableArrayExtensions;ToDictionary<TKey,TElement,T>;(System.Collections.Immutable.ImmutableArray<T>,System.Func<T,TKey>,System.Func<T,TElement>);Argument[2];Argument[2].Parameter[delegate-self];value;dfc-generated |
 | System.Linq;ImmutableArrayExtensions;ToDictionary<TKey,TElement,T>;(System.Collections.Immutable.ImmutableArray<T>,System.Func<T,TKey>,System.Func<T,TElement>);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
+| System.Linq;ImmutableArrayExtensions;ToDictionary<TKey,TElement,T>;(System.Collections.Immutable.ImmutableArray<T>,System.Func<T,TKey>,System.Func<T,TElement>,System.Collections.Generic.IEqualityComparer<TKey>);Argument[1].ReturnValue;ReturnValue.Element.Property[System.Collections.Generic.KeyValuePair`2.Key];value;dfc-generated |
+| System.Linq;ImmutableArrayExtensions;ToDictionary<TKey,TElement,T>;(System.Collections.Immutable.ImmutableArray<T>,System.Func<T,TKey>,System.Func<T,TElement>,System.Collections.Generic.IEqualityComparer<TKey>);Argument[1].ReturnValue;ReturnValue.Element.Property[System.Collections.Generic.KeyValuePair`2.Key];value;hq-generated |
+| System.Linq;ImmutableArrayExtensions;ToDictionary<TKey,TElement,T>;(System.Collections.Immutable.ImmutableArray<T>,System.Func<T,TKey>,System.Func<T,TElement>,System.Collections.Generic.IEqualityComparer<TKey>);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | System.Linq;ImmutableArrayExtensions;ToDictionary<TKey,TElement,T>;(System.Collections.Immutable.ImmutableArray<T>,System.Func<T,TKey>,System.Func<T,TElement>,System.Collections.Generic.IEqualityComparer<TKey>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
+| System.Linq;ImmutableArrayExtensions;ToDictionary<TKey,TElement,T>;(System.Collections.Immutable.ImmutableArray<T>,System.Func<T,TKey>,System.Func<T,TElement>,System.Collections.Generic.IEqualityComparer<TKey>);Argument[2].ReturnValue;ReturnValue.Element.Property[System.Collections.Generic.KeyValuePair`2.Value];value;dfc-generated |
+| System.Linq;ImmutableArrayExtensions;ToDictionary<TKey,TElement,T>;(System.Collections.Immutable.ImmutableArray<T>,System.Func<T,TKey>,System.Func<T,TElement>,System.Collections.Generic.IEqualityComparer<TKey>);Argument[2].ReturnValue;ReturnValue.Element.Property[System.Collections.Generic.KeyValuePair`2.Value];value;hq-generated |
+| System.Linq;ImmutableArrayExtensions;ToDictionary<TKey,TElement,T>;(System.Collections.Immutable.ImmutableArray<T>,System.Func<T,TKey>,System.Func<T,TElement>,System.Collections.Generic.IEqualityComparer<TKey>);Argument[2];Argument[2].Parameter[delegate-self];value;dfc-generated |
 | System.Linq;ImmutableArrayExtensions;ToDictionary<TKey,TElement,T>;(System.Collections.Immutable.ImmutableArray<T>,System.Func<T,TKey>,System.Func<T,TElement>,System.Collections.Generic.IEqualityComparer<TKey>);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
 | System.Linq;ImmutableArrayExtensions;Where<T>;(System.Collections.Immutable.ImmutableArray<T>,System.Func<T,System.Boolean>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
+| System.Linq;Lookup<TKey,TElement>;ApplyResultSelector<TResult>;(System.Func<TKey,System.Collections.Generic.IEnumerable<TElement>,TResult>);Argument[0].ReturnValue;ReturnValue.Element;value;dfc-generated |
+| System.Linq;Lookup<TKey,TElement>;ApplyResultSelector<TResult>;(System.Func<TKey,System.Collections.Generic.IEnumerable<TElement>,TResult>);Argument[0].ReturnValue;ReturnValue.Element;value;hq-generated |
+| System.Linq;Lookup<TKey,TElement>;ApplyResultSelector<TResult>;(System.Func<TKey,System.Collections.Generic.IEnumerable<TElement>,TResult>);Argument[0];Argument[0].Parameter[delegate-self];value;dfc-generated |
 | System.Linq;Lookup<TKey,TElement>;ApplyResultSelector<TResult>;(System.Func<TKey,System.Collections.Generic.IEnumerable<TElement>,TResult>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Linq;Lookup<TKey,TElement>;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.Generic.IEnumerator`1.Current];value;manual |
 | System.Linq;Lookup<TKey,TElement>;get_Item;(TKey);Argument[this];ReturnValue;taint;df-generated |
+| System.Linq;ParallelEnumerable;Aggregate<TSource,TAccumulate,TResult>;(System.Linq.ParallelQuery<TSource>,System.Func<TAccumulate>,System.Func<TAccumulate,TSource,TAccumulate>,System.Func<TAccumulate,TAccumulate,TAccumulate>,System.Func<TAccumulate,TResult>);Argument[1].ReturnValue;ReturnValue;value;dfc-generated |
+| System.Linq;ParallelEnumerable;Aggregate<TSource,TAccumulate,TResult>;(System.Linq.ParallelQuery<TSource>,System.Func<TAccumulate>,System.Func<TAccumulate,TSource,TAccumulate>,System.Func<TAccumulate,TAccumulate,TAccumulate>,System.Func<TAccumulate,TResult>);Argument[1].ReturnValue;ReturnValue;value;hq-generated |
+| System.Linq;ParallelEnumerable;Aggregate<TSource,TAccumulate,TResult>;(System.Linq.ParallelQuery<TSource>,System.Func<TAccumulate>,System.Func<TAccumulate,TSource,TAccumulate>,System.Func<TAccumulate,TAccumulate,TAccumulate>,System.Func<TAccumulate,TResult>);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | System.Linq;ParallelEnumerable;Aggregate<TSource,TAccumulate,TResult>;(System.Linq.ParallelQuery<TSource>,System.Func<TAccumulate>,System.Func<TAccumulate,TSource,TAccumulate>,System.Func<TAccumulate,TAccumulate,TAccumulate>,System.Func<TAccumulate,TResult>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
+| System.Linq;ParallelEnumerable;Aggregate<TSource,TAccumulate,TResult>;(System.Linq.ParallelQuery<TSource>,System.Func<TAccumulate>,System.Func<TAccumulate,TSource,TAccumulate>,System.Func<TAccumulate,TAccumulate,TAccumulate>,System.Func<TAccumulate,TResult>);Argument[2];Argument[2].Parameter[delegate-self];value;dfc-generated |
 | System.Linq;ParallelEnumerable;Aggregate<TSource,TAccumulate,TResult>;(System.Linq.ParallelQuery<TSource>,System.Func<TAccumulate>,System.Func<TAccumulate,TSource,TAccumulate>,System.Func<TAccumulate,TAccumulate,TAccumulate>,System.Func<TAccumulate,TResult>);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
+| System.Linq;ParallelEnumerable;Aggregate<TSource,TAccumulate,TResult>;(System.Linq.ParallelQuery<TSource>,System.Func<TAccumulate>,System.Func<TAccumulate,TSource,TAccumulate>,System.Func<TAccumulate,TAccumulate,TAccumulate>,System.Func<TAccumulate,TResult>);Argument[3].ReturnValue;ReturnValue;value;dfc-generated |
+| System.Linq;ParallelEnumerable;Aggregate<TSource,TAccumulate,TResult>;(System.Linq.ParallelQuery<TSource>,System.Func<TAccumulate>,System.Func<TAccumulate,TSource,TAccumulate>,System.Func<TAccumulate,TAccumulate,TAccumulate>,System.Func<TAccumulate,TResult>);Argument[3].ReturnValue;ReturnValue;value;hq-generated |
+| System.Linq;ParallelEnumerable;Aggregate<TSource,TAccumulate,TResult>;(System.Linq.ParallelQuery<TSource>,System.Func<TAccumulate>,System.Func<TAccumulate,TSource,TAccumulate>,System.Func<TAccumulate,TAccumulate,TAccumulate>,System.Func<TAccumulate,TResult>);Argument[3];Argument[3].Parameter[delegate-self];value;dfc-generated |
 | System.Linq;ParallelEnumerable;Aggregate<TSource,TAccumulate,TResult>;(System.Linq.ParallelQuery<TSource>,System.Func<TAccumulate>,System.Func<TAccumulate,TSource,TAccumulate>,System.Func<TAccumulate,TAccumulate,TAccumulate>,System.Func<TAccumulate,TResult>);Argument[3];Argument[3].Parameter[delegate-self];value;hq-generated |
+| System.Linq;ParallelEnumerable;Aggregate<TSource,TAccumulate,TResult>;(System.Linq.ParallelQuery<TSource>,System.Func<TAccumulate>,System.Func<TAccumulate,TSource,TAccumulate>,System.Func<TAccumulate,TAccumulate,TAccumulate>,System.Func<TAccumulate,TResult>);Argument[4].ReturnValue;ReturnValue;value;dfc-generated |
+| System.Linq;ParallelEnumerable;Aggregate<TSource,TAccumulate,TResult>;(System.Linq.ParallelQuery<TSource>,System.Func<TAccumulate>,System.Func<TAccumulate,TSource,TAccumulate>,System.Func<TAccumulate,TAccumulate,TAccumulate>,System.Func<TAccumulate,TResult>);Argument[4].ReturnValue;ReturnValue;value;hq-generated |
+| System.Linq;ParallelEnumerable;Aggregate<TSource,TAccumulate,TResult>;(System.Linq.ParallelQuery<TSource>,System.Func<TAccumulate>,System.Func<TAccumulate,TSource,TAccumulate>,System.Func<TAccumulate,TAccumulate,TAccumulate>,System.Func<TAccumulate,TResult>);Argument[4];Argument[4].Parameter[delegate-self];value;dfc-generated |
 | System.Linq;ParallelEnumerable;Aggregate<TSource,TAccumulate,TResult>;(System.Linq.ParallelQuery<TSource>,System.Func<TAccumulate>,System.Func<TAccumulate,TSource,TAccumulate>,System.Func<TAccumulate,TAccumulate,TAccumulate>,System.Func<TAccumulate,TResult>);Argument[4];Argument[4].Parameter[delegate-self];value;hq-generated |
+| System.Linq;ParallelEnumerable;Aggregate<TSource,TAccumulate,TResult>;(System.Linq.ParallelQuery<TSource>,TAccumulate,System.Func<TAccumulate,TSource,TAccumulate>,System.Func<TAccumulate,TAccumulate,TAccumulate>,System.Func<TAccumulate,TResult>);Argument[1];ReturnValue;value;dfc-generated |
+| System.Linq;ParallelEnumerable;Aggregate<TSource,TAccumulate,TResult>;(System.Linq.ParallelQuery<TSource>,TAccumulate,System.Func<TAccumulate,TSource,TAccumulate>,System.Func<TAccumulate,TAccumulate,TAccumulate>,System.Func<TAccumulate,TResult>);Argument[1];ReturnValue;value;hq-generated |
+| System.Linq;ParallelEnumerable;Aggregate<TSource,TAccumulate,TResult>;(System.Linq.ParallelQuery<TSource>,TAccumulate,System.Func<TAccumulate,TSource,TAccumulate>,System.Func<TAccumulate,TAccumulate,TAccumulate>,System.Func<TAccumulate,TResult>);Argument[2];Argument[2].Parameter[delegate-self];value;dfc-generated |
 | System.Linq;ParallelEnumerable;Aggregate<TSource,TAccumulate,TResult>;(System.Linq.ParallelQuery<TSource>,TAccumulate,System.Func<TAccumulate,TSource,TAccumulate>,System.Func<TAccumulate,TAccumulate,TAccumulate>,System.Func<TAccumulate,TResult>);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
+| System.Linq;ParallelEnumerable;Aggregate<TSource,TAccumulate,TResult>;(System.Linq.ParallelQuery<TSource>,TAccumulate,System.Func<TAccumulate,TSource,TAccumulate>,System.Func<TAccumulate,TAccumulate,TAccumulate>,System.Func<TAccumulate,TResult>);Argument[3].ReturnValue;ReturnValue;value;dfc-generated |
+| System.Linq;ParallelEnumerable;Aggregate<TSource,TAccumulate,TResult>;(System.Linq.ParallelQuery<TSource>,TAccumulate,System.Func<TAccumulate,TSource,TAccumulate>,System.Func<TAccumulate,TAccumulate,TAccumulate>,System.Func<TAccumulate,TResult>);Argument[3].ReturnValue;ReturnValue;value;hq-generated |
+| System.Linq;ParallelEnumerable;Aggregate<TSource,TAccumulate,TResult>;(System.Linq.ParallelQuery<TSource>,TAccumulate,System.Func<TAccumulate,TSource,TAccumulate>,System.Func<TAccumulate,TAccumulate,TAccumulate>,System.Func<TAccumulate,TResult>);Argument[3];Argument[3].Parameter[delegate-self];value;dfc-generated |
 | System.Linq;ParallelEnumerable;Aggregate<TSource,TAccumulate,TResult>;(System.Linq.ParallelQuery<TSource>,TAccumulate,System.Func<TAccumulate,TSource,TAccumulate>,System.Func<TAccumulate,TAccumulate,TAccumulate>,System.Func<TAccumulate,TResult>);Argument[3];Argument[3].Parameter[delegate-self];value;hq-generated |
+| System.Linq;ParallelEnumerable;Aggregate<TSource,TAccumulate,TResult>;(System.Linq.ParallelQuery<TSource>,TAccumulate,System.Func<TAccumulate,TSource,TAccumulate>,System.Func<TAccumulate,TAccumulate,TAccumulate>,System.Func<TAccumulate,TResult>);Argument[4].ReturnValue;ReturnValue;value;dfc-generated |
+| System.Linq;ParallelEnumerable;Aggregate<TSource,TAccumulate,TResult>;(System.Linq.ParallelQuery<TSource>,TAccumulate,System.Func<TAccumulate,TSource,TAccumulate>,System.Func<TAccumulate,TAccumulate,TAccumulate>,System.Func<TAccumulate,TResult>);Argument[4].ReturnValue;ReturnValue;value;hq-generated |
+| System.Linq;ParallelEnumerable;Aggregate<TSource,TAccumulate,TResult>;(System.Linq.ParallelQuery<TSource>,TAccumulate,System.Func<TAccumulate,TSource,TAccumulate>,System.Func<TAccumulate,TAccumulate,TAccumulate>,System.Func<TAccumulate,TResult>);Argument[4];Argument[4].Parameter[delegate-self];value;dfc-generated |
 | System.Linq;ParallelEnumerable;Aggregate<TSource,TAccumulate,TResult>;(System.Linq.ParallelQuery<TSource>,TAccumulate,System.Func<TAccumulate,TSource,TAccumulate>,System.Func<TAccumulate,TAccumulate,TAccumulate>,System.Func<TAccumulate,TResult>);Argument[4];Argument[4].Parameter[delegate-self];value;hq-generated |
 | System.Linq;ParallelEnumerable;Aggregate<TSource,TAccumulate,TResult>;(System.Linq.ParallelQuery<TSource>,TAccumulate,System.Func<TAccumulate,TSource,TAccumulate>,System.Func<TAccumulate,TResult>);Argument[0].Element;Argument[2].Parameter[1];value;manual |
 | System.Linq;ParallelEnumerable;Aggregate<TSource,TAccumulate,TResult>;(System.Linq.ParallelQuery<TSource>,TAccumulate,System.Func<TAccumulate,TSource,TAccumulate>,System.Func<TAccumulate,TResult>);Argument[1];Argument[2].Parameter[0];value;manual |
@@ -8720,7 +9504,7 @@
 | System.Linq;ParallelEnumerable;AsParallel;(System.Collections.IEnumerable);Argument[0].Element;ReturnValue;taint;df-generated |
 | System.Linq;ParallelEnumerable;AsParallel<TSource>;(System.Collections.Concurrent.Partitioner<TSource>);Argument[0];ReturnValue;taint;df-generated |
 | System.Linq;ParallelEnumerable;AsParallel<TSource>;(System.Collections.Generic.IEnumerable<TSource>);Argument[0].Element;ReturnValue;taint;df-generated |
-| System.Linq;ParallelEnumerable;AsSequential<TSource>;(System.Linq.ParallelQuery<TSource>);Argument[0].Element;ReturnValue;taint;df-generated |
+| System.Linq;ParallelEnumerable;AsSequential<TSource>;(System.Linq.ParallelQuery<TSource>);Argument[0];ReturnValue;value;dfc-generated |
 | System.Linq;ParallelEnumerable;AsUnordered<TSource>;(System.Linq.ParallelQuery<TSource>);Argument[0].Element;ReturnValue;taint;df-generated |
 | System.Linq;ParallelEnumerable;Average<TSource>;(System.Linq.ParallelQuery<TSource>,System.Func<TSource,System.Decimal>);Argument[0].Element;Argument[1].Parameter[0];value;manual |
 | System.Linq;ParallelEnumerable;Average<TSource>;(System.Linq.ParallelQuery<TSource>,System.Func<TSource,System.Decimal>);Argument[1];Argument[1].Parameter[delegate-self];value;manual |
@@ -8975,6 +9759,8 @@
 | System.Linq;ParallelEnumerable;SelectMany<TSource,TResult>;(System.Linq.ParallelQuery<TSource>,System.Func<TSource,System.Int32,System.Collections.Generic.IEnumerable<TResult>>);Argument[0].Element;Argument[1].Parameter[0];value;manual |
 | System.Linq;ParallelEnumerable;SelectMany<TSource,TResult>;(System.Linq.ParallelQuery<TSource>,System.Func<TSource,System.Int32,System.Collections.Generic.IEnumerable<TResult>>);Argument[1].ReturnValue;ReturnValue.Element;value;manual |
 | System.Linq;ParallelEnumerable;SelectMany<TSource,TResult>;(System.Linq.ParallelQuery<TSource>,System.Func<TSource,System.Int32,System.Collections.Generic.IEnumerable<TResult>>);Argument[1];Argument[1].Parameter[delegate-self];value;manual |
+| System.Linq;ParallelEnumerable;SequenceEqual<TSource>;(System.Linq.ParallelQuery<TSource>,System.Linq.ParallelQuery<TSource>,System.Collections.Generic.IEqualityComparer<TSource>);Argument[0].Element;Argument[2];taint;df-generated |
+| System.Linq;ParallelEnumerable;SequenceEqual<TSource>;(System.Linq.ParallelQuery<TSource>,System.Linq.ParallelQuery<TSource>,System.Collections.Generic.IEqualityComparer<TSource>);Argument[1].Element;Argument[2];taint;df-generated |
 | System.Linq;ParallelEnumerable;Single<TSource>;(System.Linq.ParallelQuery<TSource>);Argument[0].Element;ReturnValue;value;manual |
 | System.Linq;ParallelEnumerable;Single<TSource>;(System.Linq.ParallelQuery<TSource>,System.Func<TSource,System.Boolean>);Argument[0].Element;Argument[1].Parameter[0];value;manual |
 | System.Linq;ParallelEnumerable;Single<TSource>;(System.Linq.ParallelQuery<TSource>,System.Func<TSource,System.Boolean>);Argument[0].Element;ReturnValue;value;manual |
@@ -9106,7 +9892,6 @@
 | System.Linq;Queryable;All<TSource>;(System.Linq.IQueryable<TSource>,System.Linq.Expressions.Expression<System.Func<TSource,System.Boolean>>);Argument[1];Argument[1].Parameter[delegate-self];value;manual |
 | System.Linq;Queryable;Any<TSource>;(System.Linq.IQueryable<TSource>,System.Linq.Expressions.Expression<System.Func<TSource,System.Boolean>>);Argument[0].Element;Argument[1].Parameter[0];value;manual |
 | System.Linq;Queryable;Any<TSource>;(System.Linq.IQueryable<TSource>,System.Linq.Expressions.Expression<System.Func<TSource,System.Boolean>>);Argument[1];Argument[1].Parameter[delegate-self];value;manual |
-| System.Linq;Queryable;Append<TSource>;(System.Linq.IQueryable<TSource>,TSource);Argument[0].Element;ReturnValue;taint;df-generated |
 | System.Linq;Queryable;AsQueryable;(System.Collections.IEnumerable);Argument[0].Element;ReturnValue.Element;value;manual |
 | System.Linq;Queryable;AsQueryable<TElement>;(System.Collections.Generic.IEnumerable<TElement>);Argument[0].Element;ReturnValue.Element;value;manual |
 | System.Linq;Queryable;Average<TSource>;(System.Linq.IQueryable<TSource>,System.Linq.Expressions.Expression<System.Func<TSource,System.Decimal>>);Argument[0].Element;Argument[1].Parameter[0];value;manual |
@@ -9130,7 +9915,6 @@
 | System.Linq;Queryable;Average<TSource>;(System.Linq.IQueryable<TSource>,System.Linq.Expressions.Expression<System.Func<TSource,System.Single>>);Argument[0].Element;Argument[1].Parameter[0];value;manual |
 | System.Linq;Queryable;Average<TSource>;(System.Linq.IQueryable<TSource>,System.Linq.Expressions.Expression<System.Func<TSource,System.Single>>);Argument[1];Argument[1].Parameter[delegate-self];value;manual |
 | System.Linq;Queryable;Cast<TResult>;(System.Linq.IQueryable);Argument[0].Element;ReturnValue.Element;value;manual |
-| System.Linq;Queryable;Chunk<TSource>;(System.Linq.IQueryable<TSource>,System.Int32);Argument[0].Element;ReturnValue;taint;df-generated |
 | System.Linq;Queryable;Concat<TSource>;(System.Linq.IQueryable<TSource>,System.Collections.Generic.IEnumerable<TSource>);Argument[0].Element;ReturnValue.Element;value;manual |
 | System.Linq;Queryable;Concat<TSource>;(System.Linq.IQueryable<TSource>,System.Collections.Generic.IEnumerable<TSource>);Argument[1].Element;ReturnValue.Element;value;manual |
 | System.Linq;Queryable;Count<TSource>;(System.Linq.IQueryable<TSource>,System.Linq.Expressions.Expression<System.Func<TSource,System.Boolean>>);Argument[0].Element;Argument[1].Parameter[0];value;manual |
@@ -9140,23 +9924,12 @@
 | System.Linq;Queryable;DefaultIfEmpty<TSource>;(System.Linq.IQueryable<TSource>,TSource);Argument[1];ReturnValue.Element;value;manual |
 | System.Linq;Queryable;Distinct<TSource>;(System.Linq.IQueryable<TSource>);Argument[0].Element;ReturnValue.Element;value;manual |
 | System.Linq;Queryable;Distinct<TSource>;(System.Linq.IQueryable<TSource>,System.Collections.Generic.IEqualityComparer<TSource>);Argument[0].Element;ReturnValue.Element;value;manual |
-| System.Linq;Queryable;DistinctBy<TSource,TKey>;(System.Linq.IQueryable<TSource>,System.Linq.Expressions.Expression<System.Func<TSource,TKey>>);Argument[0].Element;ReturnValue;taint;df-generated |
-| System.Linq;Queryable;DistinctBy<TSource,TKey>;(System.Linq.IQueryable<TSource>,System.Linq.Expressions.Expression<System.Func<TSource,TKey>>);Argument[0].Element;ReturnValue;taint;hq-generated |
-| System.Linq;Queryable;DistinctBy<TSource,TKey>;(System.Linq.IQueryable<TSource>,System.Linq.Expressions.Expression<System.Func<TSource,TKey>>);Argument[1];Argument[1].Parameter[delegate-self];value;df-generated |
 | System.Linq;Queryable;DistinctBy<TSource,TKey>;(System.Linq.IQueryable<TSource>,System.Linq.Expressions.Expression<System.Func<TSource,TKey>>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
-| System.Linq;Queryable;DistinctBy<TSource,TKey>;(System.Linq.IQueryable<TSource>,System.Linq.Expressions.Expression<System.Func<TSource,TKey>>,System.Collections.Generic.IEqualityComparer<TKey>);Argument[0].Element;ReturnValue;taint;df-generated |
-| System.Linq;Queryable;DistinctBy<TSource,TKey>;(System.Linq.IQueryable<TSource>,System.Linq.Expressions.Expression<System.Func<TSource,TKey>>,System.Collections.Generic.IEqualityComparer<TKey>);Argument[0].Element;ReturnValue;taint;hq-generated |
-| System.Linq;Queryable;DistinctBy<TSource,TKey>;(System.Linq.IQueryable<TSource>,System.Linq.Expressions.Expression<System.Func<TSource,TKey>>,System.Collections.Generic.IEqualityComparer<TKey>);Argument[1];Argument[1].Parameter[delegate-self];value;df-generated |
 | System.Linq;Queryable;DistinctBy<TSource,TKey>;(System.Linq.IQueryable<TSource>,System.Linq.Expressions.Expression<System.Func<TSource,TKey>>,System.Collections.Generic.IEqualityComparer<TKey>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
 | System.Linq;Queryable;ElementAt<TSource>;(System.Linq.IQueryable<TSource>,System.Int32);Argument[0].Element;ReturnValue;value;manual |
 | System.Linq;Queryable;ElementAtOrDefault<TSource>;(System.Linq.IQueryable<TSource>,System.Int32);Argument[0].Element;ReturnValue;value;manual |
 | System.Linq;Queryable;Except<TSource>;(System.Linq.IQueryable<TSource>,System.Collections.Generic.IEnumerable<TSource>);Argument[0].Element;ReturnValue.Element;value;manual |
 | System.Linq;Queryable;Except<TSource>;(System.Linq.IQueryable<TSource>,System.Collections.Generic.IEnumerable<TSource>,System.Collections.Generic.IEqualityComparer<TSource>);Argument[0].Element;ReturnValue.Element;value;manual |
-| System.Linq;Queryable;ExceptBy<TSource,TKey>;(System.Linq.IQueryable<TSource>,System.Collections.Generic.IEnumerable<TKey>,System.Linq.Expressions.Expression<System.Func<TSource,TKey>>);Argument[0].Element;ReturnValue;taint;df-generated |
-| System.Linq;Queryable;ExceptBy<TSource,TKey>;(System.Linq.IQueryable<TSource>,System.Collections.Generic.IEnumerable<TKey>,System.Linq.Expressions.Expression<System.Func<TSource,TKey>>);Argument[0].Element;ReturnValue;taint;hq-generated |
-| System.Linq;Queryable;ExceptBy<TSource,TKey>;(System.Linq.IQueryable<TSource>,System.Collections.Generic.IEnumerable<TKey>,System.Linq.Expressions.Expression<System.Func<TSource,TKey>>);Argument[1].Element;ReturnValue;taint;df-generated |
-| System.Linq;Queryable;ExceptBy<TSource,TKey>;(System.Linq.IQueryable<TSource>,System.Collections.Generic.IEnumerable<TKey>,System.Linq.Expressions.Expression<System.Func<TSource,TKey>>);Argument[1].Element;ReturnValue;taint;hq-generated |
-| System.Linq;Queryable;ExceptBy<TSource,TKey>;(System.Linq.IQueryable<TSource>,System.Collections.Generic.IEnumerable<TKey>,System.Linq.Expressions.Expression<System.Func<TSource,TKey>>);Argument[2];Argument[2].Parameter[delegate-self];value;df-generated |
 | System.Linq;Queryable;ExceptBy<TSource,TKey>;(System.Linq.IQueryable<TSource>,System.Collections.Generic.IEnumerable<TKey>,System.Linq.Expressions.Expression<System.Func<TSource,TKey>>);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
 | System.Linq;Queryable;ExceptBy<TSource,TKey>;(System.Linq.IQueryable<TSource>,System.Collections.Generic.IEnumerable<TKey>,System.Linq.Expressions.Expression<System.Func<TSource,TKey>>,System.Collections.Generic.IEqualityComparer<TKey>);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
 | System.Linq;Queryable;First<TSource>;(System.Linq.IQueryable<TSource>);Argument[0].Element;ReturnValue;value;manual |
@@ -9226,11 +9999,6 @@
 | System.Linq;Queryable;Intersect<TSource>;(System.Linq.IQueryable<TSource>,System.Collections.Generic.IEnumerable<TSource>);Argument[1].Element;ReturnValue.Element;value;manual |
 | System.Linq;Queryable;Intersect<TSource>;(System.Linq.IQueryable<TSource>,System.Collections.Generic.IEnumerable<TSource>,System.Collections.Generic.IEqualityComparer<TSource>);Argument[0].Element;ReturnValue.Element;value;manual |
 | System.Linq;Queryable;Intersect<TSource>;(System.Linq.IQueryable<TSource>,System.Collections.Generic.IEnumerable<TSource>,System.Collections.Generic.IEqualityComparer<TSource>);Argument[1].Element;ReturnValue.Element;value;manual |
-| System.Linq;Queryable;IntersectBy<TSource,TKey>;(System.Linq.IQueryable<TSource>,System.Collections.Generic.IEnumerable<TKey>,System.Linq.Expressions.Expression<System.Func<TSource,TKey>>);Argument[0].Element;ReturnValue;taint;df-generated |
-| System.Linq;Queryable;IntersectBy<TSource,TKey>;(System.Linq.IQueryable<TSource>,System.Collections.Generic.IEnumerable<TKey>,System.Linq.Expressions.Expression<System.Func<TSource,TKey>>);Argument[0].Element;ReturnValue;taint;hq-generated |
-| System.Linq;Queryable;IntersectBy<TSource,TKey>;(System.Linq.IQueryable<TSource>,System.Collections.Generic.IEnumerable<TKey>,System.Linq.Expressions.Expression<System.Func<TSource,TKey>>);Argument[1].Element;ReturnValue;taint;df-generated |
-| System.Linq;Queryable;IntersectBy<TSource,TKey>;(System.Linq.IQueryable<TSource>,System.Collections.Generic.IEnumerable<TKey>,System.Linq.Expressions.Expression<System.Func<TSource,TKey>>);Argument[1].Element;ReturnValue;taint;hq-generated |
-| System.Linq;Queryable;IntersectBy<TSource,TKey>;(System.Linq.IQueryable<TSource>,System.Collections.Generic.IEnumerable<TKey>,System.Linq.Expressions.Expression<System.Func<TSource,TKey>>);Argument[2];Argument[2].Parameter[delegate-self];value;df-generated |
 | System.Linq;Queryable;IntersectBy<TSource,TKey>;(System.Linq.IQueryable<TSource>,System.Collections.Generic.IEnumerable<TKey>,System.Linq.Expressions.Expression<System.Func<TSource,TKey>>);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
 | System.Linq;Queryable;IntersectBy<TSource,TKey>;(System.Linq.IQueryable<TSource>,System.Collections.Generic.IEnumerable<TKey>,System.Linq.Expressions.Expression<System.Func<TSource,TKey>>,System.Collections.Generic.IEqualityComparer<TKey>);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
 | System.Linq;Queryable;Join<TOuter,TInner,TKey,TResult>;(System.Linq.IQueryable<TOuter>,System.Collections.Generic.IEnumerable<TInner>,System.Linq.Expressions.Expression<System.Func<TOuter,TKey>>,System.Linq.Expressions.Expression<System.Func<TInner,TKey>>,System.Linq.Expressions.Expression<System.Func<TOuter,TInner,TResult>>);Argument[0].Element;Argument[2].Parameter[0];value;manual |
@@ -9269,7 +10037,6 @@
 | System.Linq;Queryable;MinBy<TSource,TKey>;(System.Linq.IQueryable<TSource>,System.Linq.Expressions.Expression<System.Func<TSource,TKey>>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
 | System.Linq;Queryable;MinBy<TSource,TKey>;(System.Linq.IQueryable<TSource>,System.Linq.Expressions.Expression<System.Func<TSource,TKey>>,System.Collections.Generic.IComparer<TSource>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
 | System.Linq;Queryable;OfType<TResult>;(System.Linq.IQueryable);Argument[0].Element;ReturnValue.Element;value;manual |
-| System.Linq;Queryable;Order<T>;(System.Linq.IQueryable<T>,System.Collections.Generic.IComparer<T>);Argument[0].Element;ReturnValue;taint;df-generated |
 | System.Linq;Queryable;OrderBy<TSource,TKey>;(System.Linq.IQueryable<TSource>,System.Linq.Expressions.Expression<System.Func<TSource,TKey>>);Argument[0].Element;Argument[1].Parameter[0];value;manual |
 | System.Linq;Queryable;OrderBy<TSource,TKey>;(System.Linq.IQueryable<TSource>,System.Linq.Expressions.Expression<System.Func<TSource,TKey>>);Argument[0].Element;ReturnValue.Element;value;manual |
 | System.Linq;Queryable;OrderBy<TSource,TKey>;(System.Linq.IQueryable<TSource>,System.Linq.Expressions.Expression<System.Func<TSource,TKey>>);Argument[1];Argument[1].Parameter[delegate-self];value;manual |
@@ -9282,8 +10049,6 @@
 | System.Linq;Queryable;OrderByDescending<TSource,TKey>;(System.Linq.IQueryable<TSource>,System.Linq.Expressions.Expression<System.Func<TSource,TKey>>,System.Collections.Generic.IComparer<TKey>);Argument[0].Element;Argument[1].Parameter[0];value;manual |
 | System.Linq;Queryable;OrderByDescending<TSource,TKey>;(System.Linq.IQueryable<TSource>,System.Linq.Expressions.Expression<System.Func<TSource,TKey>>,System.Collections.Generic.IComparer<TKey>);Argument[0].Element;ReturnValue.Element;value;manual |
 | System.Linq;Queryable;OrderByDescending<TSource,TKey>;(System.Linq.IQueryable<TSource>,System.Linq.Expressions.Expression<System.Func<TSource,TKey>>,System.Collections.Generic.IComparer<TKey>);Argument[1];Argument[1].Parameter[delegate-self];value;manual |
-| System.Linq;Queryable;OrderDescending<T>;(System.Linq.IQueryable<T>,System.Collections.Generic.IComparer<T>);Argument[0].Element;ReturnValue;taint;df-generated |
-| System.Linq;Queryable;Prepend<TSource>;(System.Linq.IQueryable<TSource>,TSource);Argument[0].Element;ReturnValue;taint;df-generated |
 | System.Linq;Queryable;Reverse<TSource>;(System.Linq.IQueryable<TSource>);Argument[0].Element;ReturnValue.Element;value;manual |
 | System.Linq;Queryable;Select<TSource,TResult>;(System.Linq.IQueryable<TSource>,System.Linq.Expressions.Expression<System.Func<TSource,System.Int32,TResult>>);Argument[0].Element;Argument[1].Parameter[0];value;manual |
 | System.Linq;Queryable;Select<TSource,TResult>;(System.Linq.IQueryable<TSource>,System.Linq.Expressions.Expression<System.Func<TSource,System.Int32,TResult>>);Argument[1].ReturnValue;ReturnValue.Element;value;manual |
@@ -9319,7 +10084,6 @@
 | System.Linq;Queryable;SingleOrDefault<TSource>;(System.Linq.IQueryable<TSource>,System.Linq.Expressions.Expression<System.Func<TSource,System.Boolean>>);Argument[1];Argument[1].Parameter[delegate-self];value;manual |
 | System.Linq;Queryable;SingleOrDefault<TSource>;(System.Linq.IQueryable<TSource>,System.Linq.Expressions.Expression<System.Func<TSource,System.Boolean>>,TSource);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
 | System.Linq;Queryable;Skip<TSource>;(System.Linq.IQueryable<TSource>,System.Int32);Argument[0].Element;ReturnValue.Element;value;manual |
-| System.Linq;Queryable;SkipLast<TSource>;(System.Linq.IQueryable<TSource>,System.Int32);Argument[0].Element;ReturnValue;taint;df-generated |
 | System.Linq;Queryable;SkipWhile<TSource>;(System.Linq.IQueryable<TSource>,System.Linq.Expressions.Expression<System.Func<TSource,System.Boolean>>);Argument[0].Element;Argument[1].Parameter[0];value;manual |
 | System.Linq;Queryable;SkipWhile<TSource>;(System.Linq.IQueryable<TSource>,System.Linq.Expressions.Expression<System.Func<TSource,System.Boolean>>);Argument[0].Element;ReturnValue.Element;value;manual |
 | System.Linq;Queryable;SkipWhile<TSource>;(System.Linq.IQueryable<TSource>,System.Linq.Expressions.Expression<System.Func<TSource,System.Boolean>>);Argument[1];Argument[1].Parameter[delegate-self];value;manual |
@@ -9347,8 +10111,6 @@
 | System.Linq;Queryable;Sum<TSource>;(System.Linq.IQueryable<TSource>,System.Linq.Expressions.Expression<System.Func<TSource,System.Single>>);Argument[0].Element;Argument[1].Parameter[0];value;manual |
 | System.Linq;Queryable;Sum<TSource>;(System.Linq.IQueryable<TSource>,System.Linq.Expressions.Expression<System.Func<TSource,System.Single>>);Argument[1];Argument[1].Parameter[delegate-self];value;manual |
 | System.Linq;Queryable;Take<TSource>;(System.Linq.IQueryable<TSource>,System.Int32);Argument[0].Element;ReturnValue.Element;value;manual |
-| System.Linq;Queryable;Take<TSource>;(System.Linq.IQueryable<TSource>,System.Range);Argument[0].Element;ReturnValue;taint;df-generated |
-| System.Linq;Queryable;TakeLast<TSource>;(System.Linq.IQueryable<TSource>,System.Int32);Argument[0].Element;ReturnValue;taint;df-generated |
 | System.Linq;Queryable;TakeWhile<TSource>;(System.Linq.IQueryable<TSource>,System.Linq.Expressions.Expression<System.Func<TSource,System.Boolean>>);Argument[0].Element;Argument[1].Parameter[0];value;manual |
 | System.Linq;Queryable;TakeWhile<TSource>;(System.Linq.IQueryable<TSource>,System.Linq.Expressions.Expression<System.Func<TSource,System.Boolean>>);Argument[0].Element;ReturnValue.Element;value;manual |
 | System.Linq;Queryable;TakeWhile<TSource>;(System.Linq.IQueryable<TSource>,System.Linq.Expressions.Expression<System.Func<TSource,System.Boolean>>);Argument[1];Argument[1].Parameter[delegate-self];value;manual |
@@ -9371,11 +10133,6 @@
 | System.Linq;Queryable;Union<TSource>;(System.Linq.IQueryable<TSource>,System.Collections.Generic.IEnumerable<TSource>);Argument[1].Element;ReturnValue.Element;value;manual |
 | System.Linq;Queryable;Union<TSource>;(System.Linq.IQueryable<TSource>,System.Collections.Generic.IEnumerable<TSource>,System.Collections.Generic.IEqualityComparer<TSource>);Argument[0].Element;ReturnValue.Element;value;manual |
 | System.Linq;Queryable;Union<TSource>;(System.Linq.IQueryable<TSource>,System.Collections.Generic.IEnumerable<TSource>,System.Collections.Generic.IEqualityComparer<TSource>);Argument[1].Element;ReturnValue.Element;value;manual |
-| System.Linq;Queryable;UnionBy<TSource,TKey>;(System.Linq.IQueryable<TSource>,System.Collections.Generic.IEnumerable<TSource>,System.Linq.Expressions.Expression<System.Func<TSource,TKey>>);Argument[0].Element;ReturnValue;taint;df-generated |
-| System.Linq;Queryable;UnionBy<TSource,TKey>;(System.Linq.IQueryable<TSource>,System.Collections.Generic.IEnumerable<TSource>,System.Linq.Expressions.Expression<System.Func<TSource,TKey>>);Argument[0].Element;ReturnValue;taint;hq-generated |
-| System.Linq;Queryable;UnionBy<TSource,TKey>;(System.Linq.IQueryable<TSource>,System.Collections.Generic.IEnumerable<TSource>,System.Linq.Expressions.Expression<System.Func<TSource,TKey>>);Argument[1].Element;ReturnValue;taint;df-generated |
-| System.Linq;Queryable;UnionBy<TSource,TKey>;(System.Linq.IQueryable<TSource>,System.Collections.Generic.IEnumerable<TSource>,System.Linq.Expressions.Expression<System.Func<TSource,TKey>>);Argument[1].Element;ReturnValue;taint;hq-generated |
-| System.Linq;Queryable;UnionBy<TSource,TKey>;(System.Linq.IQueryable<TSource>,System.Collections.Generic.IEnumerable<TSource>,System.Linq.Expressions.Expression<System.Func<TSource,TKey>>);Argument[2];Argument[2].Parameter[delegate-self];value;df-generated |
 | System.Linq;Queryable;UnionBy<TSource,TKey>;(System.Linq.IQueryable<TSource>,System.Collections.Generic.IEnumerable<TSource>,System.Linq.Expressions.Expression<System.Func<TSource,TKey>>);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
 | System.Linq;Queryable;UnionBy<TSource,TKey>;(System.Linq.IQueryable<TSource>,System.Collections.Generic.IEnumerable<TSource>,System.Linq.Expressions.Expression<System.Func<TSource,TKey>>,System.Collections.Generic.IEqualityComparer<TKey>);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
 | System.Linq;Queryable;Where<TSource>;(System.Linq.IQueryable<TSource>,System.Linq.Expressions.Expression<System.Func<TSource,System.Boolean>>);Argument[0].Element;Argument[1].Parameter[0];value;manual |
@@ -9388,36 +10145,41 @@
 | System.Linq;Queryable;Zip<TFirst,TSecond,TResult>;(System.Linq.IQueryable<TFirst>,System.Collections.Generic.IEnumerable<TSecond>,System.Linq.Expressions.Expression<System.Func<TFirst,TSecond,TResult>>);Argument[1].Element;Argument[2].Parameter[1];value;manual |
 | System.Linq;Queryable;Zip<TFirst,TSecond,TResult>;(System.Linq.IQueryable<TFirst>,System.Collections.Generic.IEnumerable<TSecond>,System.Linq.Expressions.Expression<System.Func<TFirst,TSecond,TResult>>);Argument[2].ReturnValue;ReturnValue.Element;value;manual |
 | System.Linq;Queryable;Zip<TFirst,TSecond,TResult>;(System.Linq.IQueryable<TFirst>,System.Collections.Generic.IEnumerable<TSecond>,System.Linq.Expressions.Expression<System.Func<TFirst,TSecond,TResult>>);Argument[2];Argument[2].Parameter[delegate-self];value;manual |
-| System.Linq;Queryable;Zip<TFirst,TSecond,TThird>;(System.Linq.IQueryable<TFirst>,System.Collections.Generic.IEnumerable<TSecond>,System.Collections.Generic.IEnumerable<TThird>);Argument[0].Element;ReturnValue;taint;df-generated |
-| System.Linq;Queryable;Zip<TFirst,TSecond,TThird>;(System.Linq.IQueryable<TFirst>,System.Collections.Generic.IEnumerable<TSecond>,System.Collections.Generic.IEnumerable<TThird>);Argument[1].Element;ReturnValue;taint;df-generated |
-| System.Linq;Queryable;Zip<TFirst,TSecond,TThird>;(System.Linq.IQueryable<TFirst>,System.Collections.Generic.IEnumerable<TSecond>,System.Collections.Generic.IEnumerable<TThird>);Argument[2].Element;ReturnValue;taint;df-generated |
-| System.Linq;Queryable;Zip<TFirst,TSecond>;(System.Linq.IQueryable<TFirst>,System.Collections.Generic.IEnumerable<TSecond>);Argument[0].Element;ReturnValue;taint;df-generated |
-| System.Linq;Queryable;Zip<TFirst,TSecond>;(System.Linq.IQueryable<TFirst>,System.Collections.Generic.IEnumerable<TSecond>);Argument[1].Element;ReturnValue;taint;df-generated |
 | System.Media;SoundPlayer;add_LoadCompleted;(System.ComponentModel.AsyncCompletedEventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Media;SoundPlayer;add_SoundLocationChanged;(System.EventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Media;SoundPlayer;add_StreamChanged;(System.EventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Media;SoundPlayer;remove_LoadCompleted;(System.ComponentModel.AsyncCompletedEventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Media;SoundPlayer;remove_SoundLocationChanged;(System.EventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Media;SoundPlayer;remove_StreamChanged;(System.EventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
-| System.Net.Cache;HttpRequestCachePolicy;HttpRequestCachePolicy;(System.Net.Cache.HttpCacheAgeControl,System.TimeSpan);Argument[1];Argument[this];taint;df-generated |
-| System.Net.Cache;HttpRequestCachePolicy;HttpRequestCachePolicy;(System.Net.Cache.HttpCacheAgeControl,System.TimeSpan,System.TimeSpan);Argument[1];Argument[this];taint;df-generated |
-| System.Net.Cache;HttpRequestCachePolicy;HttpRequestCachePolicy;(System.Net.Cache.HttpCacheAgeControl,System.TimeSpan,System.TimeSpan);Argument[2];Argument[this];taint;df-generated |
-| System.Net.Cache;HttpRequestCachePolicy;get_MaxAge;();Argument[this];ReturnValue;taint;df-generated |
-| System.Net.Cache;HttpRequestCachePolicy;get_MaxStale;();Argument[this];ReturnValue;taint;df-generated |
-| System.Net.Cache;HttpRequestCachePolicy;get_MinFresh;();Argument[this];ReturnValue;taint;df-generated |
-| System.Net.Http.Headers;AuthenticationHeaderValue;AuthenticationHeaderValue;(System.String,System.String);Argument[0];Argument[this];taint;df-generated |
-| System.Net.Http.Headers;AuthenticationHeaderValue;AuthenticationHeaderValue;(System.String,System.String);Argument[1];Argument[this];taint;df-generated |
-| System.Net.Http.Headers;AuthenticationHeaderValue;ToString;();Argument[this];ReturnValue;taint;df-generated |
-| System.Net.Http.Headers;AuthenticationHeaderValue;get_Parameter;();Argument[this];ReturnValue;taint;df-generated |
-| System.Net.Http.Headers;AuthenticationHeaderValue;get_Scheme;();Argument[this];ReturnValue;taint;df-generated |
+| System.Net.Cache;HttpRequestCachePolicy;HttpRequestCachePolicy;(System.Net.Cache.HttpCacheAgeControl,System.TimeSpan);Argument[1];Argument[this].SyntheticField[System.Net.Cache.HttpRequestCachePolicy._maxAge];value;dfc-generated |
+| System.Net.Cache;HttpRequestCachePolicy;HttpRequestCachePolicy;(System.Net.Cache.HttpCacheAgeControl,System.TimeSpan);Argument[1];Argument[this].SyntheticField[System.Net.Cache.HttpRequestCachePolicy._maxStale];value;dfc-generated |
+| System.Net.Cache;HttpRequestCachePolicy;HttpRequestCachePolicy;(System.Net.Cache.HttpCacheAgeControl,System.TimeSpan);Argument[1];Argument[this].SyntheticField[System.Net.Cache.HttpRequestCachePolicy._minFresh];value;dfc-generated |
+| System.Net.Cache;HttpRequestCachePolicy;HttpRequestCachePolicy;(System.Net.Cache.HttpCacheAgeControl,System.TimeSpan,System.TimeSpan);Argument[1];Argument[this].SyntheticField[System.Net.Cache.HttpRequestCachePolicy._maxAge];value;dfc-generated |
+| System.Net.Cache;HttpRequestCachePolicy;HttpRequestCachePolicy;(System.Net.Cache.HttpCacheAgeControl,System.TimeSpan,System.TimeSpan);Argument[2];Argument[this].SyntheticField[System.Net.Cache.HttpRequestCachePolicy._maxStale];value;dfc-generated |
+| System.Net.Cache;HttpRequestCachePolicy;HttpRequestCachePolicy;(System.Net.Cache.HttpCacheAgeControl,System.TimeSpan,System.TimeSpan);Argument[2];Argument[this].SyntheticField[System.Net.Cache.HttpRequestCachePolicy._minFresh];value;dfc-generated |
+| System.Net.Cache;HttpRequestCachePolicy;get_MaxAge;();Argument[this].SyntheticField[System.Net.Cache.HttpRequestCachePolicy._maxAge];ReturnValue;value;dfc-generated |
+| System.Net.Cache;HttpRequestCachePolicy;get_MaxStale;();Argument[this].SyntheticField[System.Net.Cache.HttpRequestCachePolicy._maxStale];ReturnValue;value;dfc-generated |
+| System.Net.Cache;HttpRequestCachePolicy;get_MinFresh;();Argument[this].SyntheticField[System.Net.Cache.HttpRequestCachePolicy._minFresh];ReturnValue;value;dfc-generated |
+| System.Net.Http.Headers;AuthenticationHeaderValue;AuthenticationHeaderValue;(System.String,System.String);Argument[0];Argument[this].SyntheticField[System.Net.Http.Headers.AuthenticationHeaderValue._scheme];value;dfc-generated |
+| System.Net.Http.Headers;AuthenticationHeaderValue;AuthenticationHeaderValue;(System.String,System.String);Argument[1];Argument[this].SyntheticField[System.Net.Http.Headers.AuthenticationHeaderValue._parameter];value;dfc-generated |
+| System.Net.Http.Headers;AuthenticationHeaderValue;Clone;();Argument[this].SyntheticField[System.Net.Http.Headers.AuthenticationHeaderValue._parameter];ReturnValue.SyntheticField[System.Net.Http.Headers.AuthenticationHeaderValue._parameter];value;dfc-generated |
+| System.Net.Http.Headers;AuthenticationHeaderValue;Clone;();Argument[this].SyntheticField[System.Net.Http.Headers.AuthenticationHeaderValue._scheme];ReturnValue.SyntheticField[System.Net.Http.Headers.AuthenticationHeaderValue._scheme];value;dfc-generated |
+| System.Net.Http.Headers;AuthenticationHeaderValue;ToString;();Argument[this].SyntheticField[System.Net.Http.Headers.AuthenticationHeaderValue._parameter];ReturnValue;taint;dfc-generated |
+| System.Net.Http.Headers;AuthenticationHeaderValue;ToString;();Argument[this].SyntheticField[System.Net.Http.Headers.AuthenticationHeaderValue._scheme];ReturnValue;value;dfc-generated |
+| System.Net.Http.Headers;AuthenticationHeaderValue;get_Parameter;();Argument[this].SyntheticField[System.Net.Http.Headers.AuthenticationHeaderValue._parameter];ReturnValue;value;dfc-generated |
+| System.Net.Http.Headers;AuthenticationHeaderValue;get_Scheme;();Argument[this].SyntheticField[System.Net.Http.Headers.AuthenticationHeaderValue._scheme];ReturnValue;value;dfc-generated |
 | System.Net.Http.Headers;CacheControlHeaderValue;ToString;();Argument[this];ReturnValue;taint;df-generated |
-| System.Net.Http.Headers;ContentDispositionHeaderValue;ContentDispositionHeaderValue;(System.Net.Http.Headers.ContentDispositionHeaderValue);Argument[0];Argument[this];taint;df-generated |
-| System.Net.Http.Headers;ContentDispositionHeaderValue;ContentDispositionHeaderValue;(System.String);Argument[0];Argument[this];taint;df-generated |
-| System.Net.Http.Headers;ContentDispositionHeaderValue;ToString;();Argument[this];ReturnValue;taint;df-generated |
-| System.Net.Http.Headers;EntityTagHeaderValue;EntityTagHeaderValue;(System.String,System.Boolean);Argument[0];Argument[this];taint;df-generated |
-| System.Net.Http.Headers;EntityTagHeaderValue;ToString;();Argument[this];ReturnValue;taint;df-generated |
-| System.Net.Http.Headers;EntityTagHeaderValue;get_Tag;();Argument[this];ReturnValue;taint;df-generated |
+| System.Net.Http.Headers;ContentDispositionHeaderValue;ContentDispositionHeaderValue;(System.Net.Http.Headers.ContentDispositionHeaderValue);Argument[0].SyntheticField[System.Net.Http.Headers.ContentDispositionHeaderValue._dispositionType];Argument[this].SyntheticField[System.Net.Http.Headers.ContentDispositionHeaderValue._dispositionType];value;dfc-generated |
+| System.Net.Http.Headers;ContentDispositionHeaderValue;ContentDispositionHeaderValue;(System.String);Argument[0];Argument[this].SyntheticField[System.Net.Http.Headers.ContentDispositionHeaderValue._dispositionType];value;dfc-generated |
+| System.Net.Http.Headers;ContentDispositionHeaderValue;ToString;();Argument[this].SyntheticField[System.Net.Http.Headers.ContentDispositionHeaderValue._dispositionType];ReturnValue;taint;dfc-generated |
+| System.Net.Http.Headers;EntityTagHeaderValue;Clone;();Argument[this].SyntheticField[System.Net.Http.Headers.EntityTagHeaderValue._tag];ReturnValue.SyntheticField[System.Net.Http.Headers.EntityTagHeaderValue._tag];value;dfc-generated |
+| System.Net.Http.Headers;EntityTagHeaderValue;EntityTagHeaderValue;(System.String,System.Boolean);Argument[0];Argument[this].SyntheticField[System.Net.Http.Headers.EntityTagHeaderValue._tag];value;dfc-generated |
+| System.Net.Http.Headers;EntityTagHeaderValue;ToString;();Argument[this].SyntheticField[System.Net.Http.Headers.EntityTagHeaderValue._tag];ReturnValue;value;dfc-generated |
+| System.Net.Http.Headers;EntityTagHeaderValue;get_Tag;();Argument[this].SyntheticField[System.Net.Http.Headers.EntityTagHeaderValue._tag];ReturnValue;value;dfc-generated |
+| System.Net.Http.Headers;HeaderStringValues+Enumerator;get_Current;();Argument[this].Property[System.Net.Http.Headers.HeaderStringValues+Enumerator.Current];ReturnValue;value;df-generated |
+| System.Net.Http.Headers;HeaderStringValues+Enumerator;get_Current;();Argument[this].Property[System.Net.Http.Headers.HeaderStringValues+Enumerator.Current];ReturnValue;value;dfc-generated |
 | System.Net.Http.Headers;HeaderStringValues+Enumerator;get_Current;();Argument[this];ReturnValue;taint;df-generated |
+| System.Net.Http.Headers;HeaderStringValues+Enumerator;get_Current;();Argument[this];ReturnValue;taint;dfc-generated |
 | System.Net.Http.Headers;HeaderStringValues;GetEnumerator;();Argument[this];ReturnValue;taint;df-generated |
 | System.Net.Http.Headers;HeaderStringValues;ToString;();Argument[this];ReturnValue;taint;df-generated |
 | System.Net.Http.Headers;HttpHeaders;Clear;();Argument[this].WithoutElement;Argument[this];value;manual |
@@ -9427,8 +10189,8 @@
 | System.Net.Http.Headers;HttpHeadersNonValidated;TryGetValue;(System.String,System.Net.Http.Headers.HeaderStringValues);Argument[0];ReturnValue;taint;df-generated |
 | System.Net.Http.Headers;HttpHeadersNonValidated;TryGetValues;(System.String,System.Net.Http.Headers.HeaderStringValues);Argument[0];ReturnValue;taint;df-generated |
 | System.Net.Http.Headers;HttpHeadersNonValidated;get_Item;(System.String);Argument[0];ReturnValue;taint;df-generated |
-| System.Net.Http.Headers;HttpHeadersNonValidated;get_Keys;();Argument[this];ReturnValue;taint;df-generated |
-| System.Net.Http.Headers;HttpHeadersNonValidated;get_Values;();Argument[this];ReturnValue;taint;df-generated |
+| System.Net.Http.Headers;HttpHeadersNonValidated;get_Keys;();Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Key];ReturnValue.Element;value;dfc-generated |
+| System.Net.Http.Headers;HttpHeadersNonValidated;get_Values;();Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Value];ReturnValue.Element;value;dfc-generated |
 | System.Net.Http.Headers;HttpRequestHeaders;get_Connection;();Argument[this];ReturnValue;taint;df-generated |
 | System.Net.Http.Headers;HttpRequestHeaders;get_Pragma;();Argument[this];ReturnValue;taint;df-generated |
 | System.Net.Http.Headers;HttpRequestHeaders;get_Trailer;();Argument[this];ReturnValue;taint;df-generated |
@@ -9443,73 +10205,88 @@
 | System.Net.Http.Headers;HttpResponseHeaders;get_Upgrade;();Argument[this];ReturnValue;taint;df-generated |
 | System.Net.Http.Headers;HttpResponseHeaders;get_Via;();Argument[this];ReturnValue;taint;df-generated |
 | System.Net.Http.Headers;HttpResponseHeaders;get_Warning;();Argument[this];ReturnValue;taint;df-generated |
-| System.Net.Http.Headers;MediaTypeHeaderValue;MediaTypeHeaderValue;(System.Net.Http.Headers.MediaTypeHeaderValue);Argument[0];Argument[this];taint;df-generated |
-| System.Net.Http.Headers;MediaTypeHeaderValue;MediaTypeHeaderValue;(System.String,System.String);Argument[0];Argument[this];taint;df-generated |
-| System.Net.Http.Headers;MediaTypeHeaderValue;ToString;();Argument[this];ReturnValue;taint;df-generated |
-| System.Net.Http.Headers;MediaTypeHeaderValue;TryParse;(System.String,System.Net.Http.Headers.MediaTypeHeaderValue);Argument[0];ReturnValue;taint;df-generated |
+| System.Net.Http.Headers;MediaTypeHeaderValue;MediaTypeHeaderValue;(System.Net.Http.Headers.MediaTypeHeaderValue);Argument[0].SyntheticField[System.Net.Http.Headers.MediaTypeHeaderValue._mediaType];Argument[this].SyntheticField[System.Net.Http.Headers.MediaTypeHeaderValue._mediaType];value;dfc-generated |
+| System.Net.Http.Headers;MediaTypeHeaderValue;MediaTypeHeaderValue;(System.String,System.String);Argument[0];Argument[this].SyntheticField[System.Net.Http.Headers.MediaTypeHeaderValue._mediaType];value;dfc-generated |
+| System.Net.Http.Headers;MediaTypeHeaderValue;ToString;();Argument[this].SyntheticField[System.Net.Http.Headers.MediaTypeHeaderValue._mediaType];ReturnValue;value;dfc-generated |
+| System.Net.Http.Headers;MediaTypeHeaderValue;TryParse;(System.String,System.Net.Http.Headers.MediaTypeHeaderValue);Argument[0];ReturnValue.SyntheticField[System.Net.Http.Headers.MediaTypeHeaderValue._mediaType];taint;dfc-generated |
 | System.Net.Http.Headers;MediaTypeWithQualityHeaderValue;TryParse;(System.String,System.Net.Http.Headers.MediaTypeWithQualityHeaderValue);Argument[0];ReturnValue;taint;df-generated |
-| System.Net.Http.Headers;NameValueHeaderValue;NameValueHeaderValue;(System.Net.Http.Headers.NameValueHeaderValue);Argument[0];Argument[this];taint;df-generated |
-| System.Net.Http.Headers;NameValueHeaderValue;NameValueHeaderValue;(System.String,System.String);Argument[0];Argument[this];taint;df-generated |
-| System.Net.Http.Headers;NameValueHeaderValue;NameValueHeaderValue;(System.String,System.String);Argument[1];Argument[this];taint;df-generated |
-| System.Net.Http.Headers;NameValueHeaderValue;ToString;();Argument[this];ReturnValue;taint;df-generated |
-| System.Net.Http.Headers;NameValueHeaderValue;get_Name;();Argument[this];ReturnValue;taint;df-generated |
-| System.Net.Http.Headers;ProductHeaderValue;ProductHeaderValue;(System.String,System.String);Argument[0];Argument[this];taint;df-generated |
-| System.Net.Http.Headers;ProductHeaderValue;ProductHeaderValue;(System.String,System.String);Argument[1];Argument[this];taint;df-generated |
-| System.Net.Http.Headers;ProductHeaderValue;ToString;();Argument[this];ReturnValue;taint;df-generated |
-| System.Net.Http.Headers;ProductHeaderValue;get_Name;();Argument[this];ReturnValue;taint;df-generated |
-| System.Net.Http.Headers;ProductHeaderValue;get_Version;();Argument[this];ReturnValue;taint;df-generated |
-| System.Net.Http.Headers;ProductInfoHeaderValue;Parse;(System.String);Argument[0];ReturnValue;taint;df-generated |
-| System.Net.Http.Headers;ProductInfoHeaderValue;ProductInfoHeaderValue;(System.Net.Http.Headers.ProductHeaderValue);Argument[0];Argument[this];taint;df-generated |
-| System.Net.Http.Headers;ProductInfoHeaderValue;ProductInfoHeaderValue;(System.String);Argument[0];Argument[this];taint;df-generated |
-| System.Net.Http.Headers;ProductInfoHeaderValue;ToString;();Argument[this];ReturnValue;taint;df-generated |
-| System.Net.Http.Headers;ProductInfoHeaderValue;TryParse;(System.String,System.Net.Http.Headers.ProductInfoHeaderValue);Argument[0];ReturnValue;taint;df-generated |
-| System.Net.Http.Headers;ProductInfoHeaderValue;get_Comment;();Argument[this];ReturnValue;taint;df-generated |
-| System.Net.Http.Headers;ProductInfoHeaderValue;get_Product;();Argument[this];ReturnValue;taint;df-generated |
-| System.Net.Http.Headers;RangeConditionHeaderValue;RangeConditionHeaderValue;(System.DateTimeOffset);Argument[0];Argument[this];taint;df-generated |
-| System.Net.Http.Headers;RangeConditionHeaderValue;RangeConditionHeaderValue;(System.Net.Http.Headers.EntityTagHeaderValue);Argument[0];Argument[this];taint;df-generated |
+| System.Net.Http.Headers;NameValueHeaderValue;NameValueHeaderValue;(System.Net.Http.Headers.NameValueHeaderValue);Argument[0].SyntheticField[System.Net.Http.Headers.NameValueHeaderValue._name];Argument[this].SyntheticField[System.Net.Http.Headers.NameValueHeaderValue._name];value;dfc-generated |
+| System.Net.Http.Headers;NameValueHeaderValue;NameValueHeaderValue;(System.Net.Http.Headers.NameValueHeaderValue);Argument[0].SyntheticField[System.Net.Http.Headers.NameValueHeaderValue._value];Argument[this].SyntheticField[System.Net.Http.Headers.NameValueHeaderValue._value];value;dfc-generated |
+| System.Net.Http.Headers;NameValueHeaderValue;NameValueHeaderValue;(System.String,System.String);Argument[0];Argument[this].SyntheticField[System.Net.Http.Headers.NameValueHeaderValue._name];value;dfc-generated |
+| System.Net.Http.Headers;NameValueHeaderValue;NameValueHeaderValue;(System.String,System.String);Argument[1];Argument[this].SyntheticField[System.Net.Http.Headers.NameValueHeaderValue._value];value;dfc-generated |
+| System.Net.Http.Headers;NameValueHeaderValue;ToString;();Argument[this].SyntheticField[System.Net.Http.Headers.NameValueHeaderValue._name];ReturnValue;value;dfc-generated |
+| System.Net.Http.Headers;NameValueHeaderValue;ToString;();Argument[this].SyntheticField[System.Net.Http.Headers.NameValueHeaderValue._value];ReturnValue;taint;dfc-generated |
+| System.Net.Http.Headers;NameValueHeaderValue;get_Name;();Argument[this].SyntheticField[System.Net.Http.Headers.NameValueHeaderValue._name];ReturnValue;value;dfc-generated |
+| System.Net.Http.Headers;ProductHeaderValue;Clone;();Argument[this].SyntheticField[System.Net.Http.Headers.ProductHeaderValue._name];ReturnValue.SyntheticField[System.Net.Http.Headers.ProductHeaderValue._name];value;dfc-generated |
+| System.Net.Http.Headers;ProductHeaderValue;Clone;();Argument[this].SyntheticField[System.Net.Http.Headers.ProductHeaderValue._version];ReturnValue.SyntheticField[System.Net.Http.Headers.ProductHeaderValue._version];value;dfc-generated |
+| System.Net.Http.Headers;ProductHeaderValue;ProductHeaderValue;(System.String,System.String);Argument[0];Argument[this].SyntheticField[System.Net.Http.Headers.ProductHeaderValue._name];value;dfc-generated |
+| System.Net.Http.Headers;ProductHeaderValue;ProductHeaderValue;(System.String,System.String);Argument[1];Argument[this].SyntheticField[System.Net.Http.Headers.ProductHeaderValue._version];value;dfc-generated |
+| System.Net.Http.Headers;ProductHeaderValue;ToString;();Argument[this].SyntheticField[System.Net.Http.Headers.ProductHeaderValue._name];ReturnValue;value;dfc-generated |
+| System.Net.Http.Headers;ProductHeaderValue;ToString;();Argument[this].SyntheticField[System.Net.Http.Headers.ProductHeaderValue._version];ReturnValue;taint;dfc-generated |
+| System.Net.Http.Headers;ProductHeaderValue;get_Name;();Argument[this].SyntheticField[System.Net.Http.Headers.ProductHeaderValue._name];ReturnValue;value;dfc-generated |
+| System.Net.Http.Headers;ProductHeaderValue;get_Version;();Argument[this].SyntheticField[System.Net.Http.Headers.ProductHeaderValue._version];ReturnValue;value;dfc-generated |
+| System.Net.Http.Headers;ProductInfoHeaderValue;Clone;();Argument[this].SyntheticField[System.Net.Http.Headers.ProductInfoHeaderValue._comment];ReturnValue.SyntheticField[System.Net.Http.Headers.ProductInfoHeaderValue._comment];value;dfc-generated |
+| System.Net.Http.Headers;ProductInfoHeaderValue;Clone;();Argument[this].SyntheticField[System.Net.Http.Headers.ProductInfoHeaderValue._product];ReturnValue.SyntheticField[System.Net.Http.Headers.ProductInfoHeaderValue._product];value;dfc-generated |
+| System.Net.Http.Headers;ProductInfoHeaderValue;ProductInfoHeaderValue;(System.Net.Http.Headers.ProductHeaderValue);Argument[0];Argument[this].SyntheticField[System.Net.Http.Headers.ProductInfoHeaderValue._product];value;dfc-generated |
+| System.Net.Http.Headers;ProductInfoHeaderValue;ProductInfoHeaderValue;(System.String);Argument[0];Argument[this].SyntheticField[System.Net.Http.Headers.ProductInfoHeaderValue._comment];value;dfc-generated |
+| System.Net.Http.Headers;ProductInfoHeaderValue;ToString;();Argument[this].SyntheticField[System.Net.Http.Headers.ProductInfoHeaderValue._comment];ReturnValue;value;dfc-generated |
+| System.Net.Http.Headers;ProductInfoHeaderValue;get_Comment;();Argument[this].SyntheticField[System.Net.Http.Headers.ProductInfoHeaderValue._comment];ReturnValue;value;dfc-generated |
+| System.Net.Http.Headers;ProductInfoHeaderValue;get_Product;();Argument[this].SyntheticField[System.Net.Http.Headers.ProductInfoHeaderValue._product];ReturnValue;value;dfc-generated |
+| System.Net.Http.Headers;RangeConditionHeaderValue;Clone;();Argument[this].SyntheticField[System.Net.Http.Headers.RangeConditionHeaderValue._date];ReturnValue.SyntheticField[System.Net.Http.Headers.RangeConditionHeaderValue._date];value;dfc-generated |
+| System.Net.Http.Headers;RangeConditionHeaderValue;Clone;();Argument[this].SyntheticField[System.Net.Http.Headers.RangeConditionHeaderValue._entityTag];ReturnValue.SyntheticField[System.Net.Http.Headers.RangeConditionHeaderValue._entityTag];value;dfc-generated |
+| System.Net.Http.Headers;RangeConditionHeaderValue;RangeConditionHeaderValue;(System.DateTimeOffset);Argument[0];Argument[this].SyntheticField[System.Net.Http.Headers.RangeConditionHeaderValue._date];value;dfc-generated |
+| System.Net.Http.Headers;RangeConditionHeaderValue;RangeConditionHeaderValue;(System.Net.Http.Headers.EntityTagHeaderValue);Argument[0];Argument[this].SyntheticField[System.Net.Http.Headers.RangeConditionHeaderValue._entityTag];value;dfc-generated |
 | System.Net.Http.Headers;RangeConditionHeaderValue;ToString;();Argument[this];ReturnValue;taint;df-generated |
-| System.Net.Http.Headers;RangeConditionHeaderValue;get_Date;();Argument[this];ReturnValue;taint;df-generated |
-| System.Net.Http.Headers;RangeConditionHeaderValue;get_EntityTag;();Argument[this];ReturnValue;taint;df-generated |
-| System.Net.Http.Headers;RetryConditionHeaderValue;RetryConditionHeaderValue;(System.DateTimeOffset);Argument[0];Argument[this];taint;df-generated |
-| System.Net.Http.Headers;RetryConditionHeaderValue;RetryConditionHeaderValue;(System.TimeSpan);Argument[0];Argument[this];taint;df-generated |
-| System.Net.Http.Headers;RetryConditionHeaderValue;get_Date;();Argument[this];ReturnValue;taint;df-generated |
-| System.Net.Http.Headers;RetryConditionHeaderValue;get_Delta;();Argument[this];ReturnValue;taint;df-generated |
-| System.Net.Http.Headers;StringWithQualityHeaderValue;StringWithQualityHeaderValue;(System.String);Argument[0];Argument[this];taint;df-generated |
-| System.Net.Http.Headers;StringWithQualityHeaderValue;StringWithQualityHeaderValue;(System.String,System.Double);Argument[0];Argument[this];taint;df-generated |
-| System.Net.Http.Headers;StringWithQualityHeaderValue;ToString;();Argument[this];ReturnValue;taint;df-generated |
-| System.Net.Http.Headers;StringWithQualityHeaderValue;get_Value;();Argument[this];ReturnValue;taint;df-generated |
-| System.Net.Http.Headers;TransferCodingHeaderValue;ToString;();Argument[this];ReturnValue;taint;df-generated |
-| System.Net.Http.Headers;TransferCodingHeaderValue;TransferCodingHeaderValue;(System.Net.Http.Headers.TransferCodingHeaderValue);Argument[0];Argument[this];taint;df-generated |
-| System.Net.Http.Headers;TransferCodingHeaderValue;TransferCodingHeaderValue;(System.String);Argument[0];Argument[this];taint;df-generated |
-| System.Net.Http.Headers;TransferCodingHeaderValue;TryParse;(System.String,System.Net.Http.Headers.TransferCodingHeaderValue);Argument[0];ReturnValue;taint;df-generated |
-| System.Net.Http.Headers;TransferCodingHeaderValue;get_Value;();Argument[this];ReturnValue;taint;df-generated |
+| System.Net.Http.Headers;RangeConditionHeaderValue;get_Date;();Argument[this].SyntheticField[System.Net.Http.Headers.RangeConditionHeaderValue._date];ReturnValue;value;dfc-generated |
+| System.Net.Http.Headers;RangeConditionHeaderValue;get_EntityTag;();Argument[this].SyntheticField[System.Net.Http.Headers.RangeConditionHeaderValue._entityTag];ReturnValue;value;dfc-generated |
+| System.Net.Http.Headers;RetryConditionHeaderValue;Clone;();Argument[this].SyntheticField[System.Net.Http.Headers.RetryConditionHeaderValue._date];ReturnValue.SyntheticField[System.Net.Http.Headers.RetryConditionHeaderValue._date];value;dfc-generated |
+| System.Net.Http.Headers;RetryConditionHeaderValue;Clone;();Argument[this].SyntheticField[System.Net.Http.Headers.RetryConditionHeaderValue._delta];ReturnValue.SyntheticField[System.Net.Http.Headers.RetryConditionHeaderValue._delta];value;dfc-generated |
+| System.Net.Http.Headers;RetryConditionHeaderValue;RetryConditionHeaderValue;(System.DateTimeOffset);Argument[0];Argument[this].SyntheticField[System.Net.Http.Headers.RetryConditionHeaderValue._date];value;dfc-generated |
+| System.Net.Http.Headers;RetryConditionHeaderValue;RetryConditionHeaderValue;(System.TimeSpan);Argument[0];Argument[this].SyntheticField[System.Net.Http.Headers.RetryConditionHeaderValue._delta];value;dfc-generated |
+| System.Net.Http.Headers;RetryConditionHeaderValue;get_Date;();Argument[this].SyntheticField[System.Net.Http.Headers.RetryConditionHeaderValue._date];ReturnValue;value;dfc-generated |
+| System.Net.Http.Headers;RetryConditionHeaderValue;get_Delta;();Argument[this].SyntheticField[System.Net.Http.Headers.RetryConditionHeaderValue._delta];ReturnValue;value;dfc-generated |
+| System.Net.Http.Headers;StringWithQualityHeaderValue;Clone;();Argument[this].SyntheticField[System.Net.Http.Headers.StringWithQualityHeaderValue._value];ReturnValue.SyntheticField[System.Net.Http.Headers.StringWithQualityHeaderValue._value];value;dfc-generated |
+| System.Net.Http.Headers;StringWithQualityHeaderValue;StringWithQualityHeaderValue;(System.String);Argument[0];Argument[this].SyntheticField[System.Net.Http.Headers.StringWithQualityHeaderValue._value];value;dfc-generated |
+| System.Net.Http.Headers;StringWithQualityHeaderValue;StringWithQualityHeaderValue;(System.String,System.Double);Argument[0];Argument[this].SyntheticField[System.Net.Http.Headers.StringWithQualityHeaderValue._value];value;dfc-generated |
+| System.Net.Http.Headers;StringWithQualityHeaderValue;ToString;();Argument[this].SyntheticField[System.Net.Http.Headers.StringWithQualityHeaderValue._value];ReturnValue;value;dfc-generated |
+| System.Net.Http.Headers;StringWithQualityHeaderValue;get_Value;();Argument[this].SyntheticField[System.Net.Http.Headers.StringWithQualityHeaderValue._value];ReturnValue;value;dfc-generated |
+| System.Net.Http.Headers;TransferCodingHeaderValue;ToString;();Argument[this].SyntheticField[System.Net.Http.Headers.TransferCodingHeaderValue._value];ReturnValue;taint;dfc-generated |
+| System.Net.Http.Headers;TransferCodingHeaderValue;TransferCodingHeaderValue;(System.Net.Http.Headers.TransferCodingHeaderValue);Argument[0].SyntheticField[System.Net.Http.Headers.TransferCodingHeaderValue._value];Argument[this].SyntheticField[System.Net.Http.Headers.TransferCodingHeaderValue._value];value;dfc-generated |
+| System.Net.Http.Headers;TransferCodingHeaderValue;TransferCodingHeaderValue;(System.String);Argument[0];Argument[this].SyntheticField[System.Net.Http.Headers.TransferCodingHeaderValue._value];value;dfc-generated |
+| System.Net.Http.Headers;TransferCodingHeaderValue;TryParse;(System.String,System.Net.Http.Headers.TransferCodingHeaderValue);Argument[0];ReturnValue.SyntheticField[System.Net.Http.Headers.TransferCodingHeaderValue._value];taint;dfc-generated |
+| System.Net.Http.Headers;TransferCodingHeaderValue;get_Value;();Argument[this].SyntheticField[System.Net.Http.Headers.TransferCodingHeaderValue._value];ReturnValue;value;dfc-generated |
 | System.Net.Http.Headers;TransferCodingWithQualityHeaderValue;TryParse;(System.String,System.Net.Http.Headers.TransferCodingWithQualityHeaderValue);Argument[0];ReturnValue;taint;df-generated |
-| System.Net.Http.Headers;ViaHeaderValue;ViaHeaderValue;(System.String,System.String,System.String,System.String);Argument[0];Argument[this];taint;df-generated |
-| System.Net.Http.Headers;ViaHeaderValue;ViaHeaderValue;(System.String,System.String,System.String,System.String);Argument[1];Argument[this];taint;df-generated |
-| System.Net.Http.Headers;ViaHeaderValue;ViaHeaderValue;(System.String,System.String,System.String,System.String);Argument[2];Argument[this];taint;df-generated |
-| System.Net.Http.Headers;ViaHeaderValue;ViaHeaderValue;(System.String,System.String,System.String,System.String);Argument[3];Argument[this];taint;df-generated |
-| System.Net.Http.Headers;ViaHeaderValue;get_Comment;();Argument[this];ReturnValue;taint;df-generated |
-| System.Net.Http.Headers;ViaHeaderValue;get_ProtocolName;();Argument[this];ReturnValue;taint;df-generated |
-| System.Net.Http.Headers;ViaHeaderValue;get_ProtocolVersion;();Argument[this];ReturnValue;taint;df-generated |
-| System.Net.Http.Headers;ViaHeaderValue;get_ReceivedBy;();Argument[this];ReturnValue;taint;df-generated |
-| System.Net.Http.Headers;WarningHeaderValue;WarningHeaderValue;(System.Int32,System.String,System.String);Argument[1];Argument[this];taint;df-generated |
-| System.Net.Http.Headers;WarningHeaderValue;WarningHeaderValue;(System.Int32,System.String,System.String);Argument[2];Argument[this];taint;df-generated |
-| System.Net.Http.Headers;WarningHeaderValue;WarningHeaderValue;(System.Int32,System.String,System.String,System.DateTimeOffset);Argument[1];Argument[this];taint;df-generated |
-| System.Net.Http.Headers;WarningHeaderValue;WarningHeaderValue;(System.Int32,System.String,System.String,System.DateTimeOffset);Argument[2];Argument[this];taint;df-generated |
-| System.Net.Http.Headers;WarningHeaderValue;WarningHeaderValue;(System.Int32,System.String,System.String,System.DateTimeOffset);Argument[3];Argument[this];taint;df-generated |
-| System.Net.Http.Headers;WarningHeaderValue;get_Agent;();Argument[this];ReturnValue;taint;df-generated |
-| System.Net.Http.Headers;WarningHeaderValue;get_Date;();Argument[this];ReturnValue;taint;df-generated |
-| System.Net.Http.Headers;WarningHeaderValue;get_Text;();Argument[this];ReturnValue;taint;df-generated |
+| System.Net.Http.Headers;ViaHeaderValue;ViaHeaderValue;(System.String,System.String,System.String,System.String);Argument[0];Argument[this].SyntheticField[System.Net.Http.Headers.ViaHeaderValue._protocolVersion];value;dfc-generated |
+| System.Net.Http.Headers;ViaHeaderValue;ViaHeaderValue;(System.String,System.String,System.String,System.String);Argument[1];Argument[this].SyntheticField[System.Net.Http.Headers.ViaHeaderValue._receivedBy];value;dfc-generated |
+| System.Net.Http.Headers;ViaHeaderValue;ViaHeaderValue;(System.String,System.String,System.String,System.String);Argument[2];Argument[this].SyntheticField[System.Net.Http.Headers.ViaHeaderValue._protocolName];value;dfc-generated |
+| System.Net.Http.Headers;ViaHeaderValue;ViaHeaderValue;(System.String,System.String,System.String,System.String);Argument[3];Argument[this].SyntheticField[System.Net.Http.Headers.ViaHeaderValue._comment];value;dfc-generated |
+| System.Net.Http.Headers;ViaHeaderValue;get_Comment;();Argument[this].SyntheticField[System.Net.Http.Headers.ViaHeaderValue._comment];ReturnValue;value;dfc-generated |
+| System.Net.Http.Headers;ViaHeaderValue;get_ProtocolName;();Argument[this].SyntheticField[System.Net.Http.Headers.ViaHeaderValue._protocolName];ReturnValue;value;dfc-generated |
+| System.Net.Http.Headers;ViaHeaderValue;get_ProtocolVersion;();Argument[this].SyntheticField[System.Net.Http.Headers.ViaHeaderValue._protocolVersion];ReturnValue;value;dfc-generated |
+| System.Net.Http.Headers;ViaHeaderValue;get_ReceivedBy;();Argument[this].SyntheticField[System.Net.Http.Headers.ViaHeaderValue._receivedBy];ReturnValue;value;dfc-generated |
+| System.Net.Http.Headers;WarningHeaderValue;Clone;();Argument[this].SyntheticField[System.Net.Http.Headers.WarningHeaderValue._agent];ReturnValue.SyntheticField[System.Net.Http.Headers.WarningHeaderValue._agent];value;dfc-generated |
+| System.Net.Http.Headers;WarningHeaderValue;Clone;();Argument[this].SyntheticField[System.Net.Http.Headers.WarningHeaderValue._date];ReturnValue.SyntheticField[System.Net.Http.Headers.WarningHeaderValue._date];value;dfc-generated |
+| System.Net.Http.Headers;WarningHeaderValue;Clone;();Argument[this].SyntheticField[System.Net.Http.Headers.WarningHeaderValue._text];ReturnValue.SyntheticField[System.Net.Http.Headers.WarningHeaderValue._text];value;dfc-generated |
+| System.Net.Http.Headers;WarningHeaderValue;WarningHeaderValue;(System.Int32,System.String,System.String);Argument[1];Argument[this].SyntheticField[System.Net.Http.Headers.WarningHeaderValue._agent];value;dfc-generated |
+| System.Net.Http.Headers;WarningHeaderValue;WarningHeaderValue;(System.Int32,System.String,System.String);Argument[2];Argument[this].SyntheticField[System.Net.Http.Headers.WarningHeaderValue._text];value;dfc-generated |
+| System.Net.Http.Headers;WarningHeaderValue;WarningHeaderValue;(System.Int32,System.String,System.String,System.DateTimeOffset);Argument[1];Argument[this].SyntheticField[System.Net.Http.Headers.WarningHeaderValue._agent];value;dfc-generated |
+| System.Net.Http.Headers;WarningHeaderValue;WarningHeaderValue;(System.Int32,System.String,System.String,System.DateTimeOffset);Argument[2];Argument[this].SyntheticField[System.Net.Http.Headers.WarningHeaderValue._text];value;dfc-generated |
+| System.Net.Http.Headers;WarningHeaderValue;WarningHeaderValue;(System.Int32,System.String,System.String,System.DateTimeOffset);Argument[3];Argument[this].SyntheticField[System.Net.Http.Headers.WarningHeaderValue._date];value;dfc-generated |
+| System.Net.Http.Headers;WarningHeaderValue;get_Agent;();Argument[this].SyntheticField[System.Net.Http.Headers.WarningHeaderValue._agent];ReturnValue;value;dfc-generated |
+| System.Net.Http.Headers;WarningHeaderValue;get_Date;();Argument[this].SyntheticField[System.Net.Http.Headers.WarningHeaderValue._date];ReturnValue;value;dfc-generated |
+| System.Net.Http.Headers;WarningHeaderValue;get_Text;();Argument[this].SyntheticField[System.Net.Http.Headers.WarningHeaderValue._text];ReturnValue;value;dfc-generated |
 | System.Net.Http.Json;JsonContent;Create;(System.Object,System.Text.Json.Serialization.Metadata.JsonTypeInfo,System.Net.Http.Headers.MediaTypeHeaderValue);Argument[1];ReturnValue;taint;df-generated |
-| System.Net.Http.Json;JsonContent;Create;(System.Object,System.Type,System.Net.Http.Headers.MediaTypeHeaderValue,System.Text.Json.JsonSerializerOptions);Argument[3];ReturnValue;taint;df-generated |
-| System.Net.Http.Json;JsonContent;Create<T>;(T,System.Net.Http.Headers.MediaTypeHeaderValue,System.Text.Json.JsonSerializerOptions);Argument[2];ReturnValue;taint;df-generated |
 | System.Net.Http.Json;JsonContent;Create<T>;(T,System.Text.Json.Serialization.Metadata.JsonTypeInfo<T>,System.Net.Http.Headers.MediaTypeHeaderValue);Argument[1];ReturnValue;taint;df-generated |
 | System.Net.Http.Metrics;HttpMetricsEnrichmentContext;AddCallback;(System.Net.Http.HttpRequestMessage,System.Action<System.Net.Http.Metrics.HttpMetricsEnrichmentContext>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
 | System.Net.Http.Metrics;HttpMetricsEnrichmentContext;get_Exception;();Argument[this];ReturnValue;taint;df-generated |
 | System.Net.Http.Metrics;HttpMetricsEnrichmentContext;get_Request;();Argument[this];ReturnValue;taint;df-generated |
 | System.Net.Http.Metrics;HttpMetricsEnrichmentContext;get_Response;();Argument[this];ReturnValue;taint;df-generated |
-| System.Net.Http;ByteArrayContent;ByteArrayContent;(System.Byte[]);Argument[0].Element;Argument[this];taint;df-generated |
-| System.Net.Http;ByteArrayContent;ByteArrayContent;(System.Byte[],System.Int32,System.Int32);Argument[0].Element;Argument[this];taint;df-generated |
+| System.Net.Http;ByteArrayContent;ByteArrayContent;(System.Byte[]);Argument[0];Argument[this].SyntheticField[System.Net.Http.ByteArrayContent._content];value;dfc-generated |
+| System.Net.Http;ByteArrayContent;ByteArrayContent;(System.Byte[],System.Int32,System.Int32);Argument[0];Argument[this].SyntheticField[System.Net.Http.ByteArrayContent._content];value;dfc-generated |
+| System.Net.Http;ByteArrayContent;CreateContentReadStream;(System.Threading.CancellationToken);Argument[this].SyntheticField[System.Net.Http.ByteArrayContent._content].Element;ReturnValue;taint;df-generated |
+| System.Net.Http;ByteArrayContent;CreateContentReadStream;(System.Threading.CancellationToken);Argument[this].SyntheticField[System.Net.Http.ByteArrayContent._content].Element;ReturnValue;taint;dfc-generated |
+| System.Net.Http;ByteArrayContent;CreateContentReadStreamAsync;();Argument[this].SyntheticField[System.Net.Http.ByteArrayContent._content].Element;ReturnValue.Property[System.Threading.Tasks.Task`1.Result];taint;df-generated |
+| System.Net.Http;ByteArrayContent;CreateContentReadStreamAsync;();Argument[this].SyntheticField[System.Net.Http.ByteArrayContent._content].Element;ReturnValue.Property[System.Threading.Tasks.Task`1.Result];taint;dfc-generated |
 | System.Net.Http;DelegatingHandler;DelegatingHandler;(System.Net.Http.HttpMessageHandler);Argument[0];Argument[this];taint;df-generated |
 | System.Net.Http;HeaderEncodingSelector<TContext>;BeginInvoke;(System.String,TContext,System.AsyncCallback,System.Object);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
 | System.Net.Http;HttpClient;Send;(System.Net.Http.HttpRequestMessage);Argument[this];Argument[0];taint;df-generated |
@@ -9519,7 +10296,6 @@
 | System.Net.Http;HttpClient;SendAsync;(System.Net.Http.HttpRequestMessage);Argument[this];Argument[0];taint;df-generated |
 | System.Net.Http;HttpClient;SendAsync;(System.Net.Http.HttpRequestMessage,System.Net.Http.HttpCompletionOption);Argument[this];Argument[0];taint;df-generated |
 | System.Net.Http;HttpClient;SendAsync;(System.Net.Http.HttpRequestMessage,System.Net.Http.HttpCompletionOption,System.Threading.CancellationToken);Argument[this];Argument[0];taint;df-generated |
-| System.Net.Http;HttpClient;SendAsync;(System.Net.Http.HttpRequestMessage,System.Threading.CancellationToken);Argument[1];ReturnValue;taint;df-generated |
 | System.Net.Http;HttpClient;SendAsync;(System.Net.Http.HttpRequestMessage,System.Threading.CancellationToken);Argument[this];Argument[0];taint;df-generated |
 | System.Net.Http;HttpClientHandler;get_Properties;();Argument[this];ReturnValue;taint;df-generated |
 | System.Net.Http;HttpClientHandler;set_ServerCertificateCustomValidationCallback;(System.Func<System.Net.Http.HttpRequestMessage,System.Security.Cryptography.X509Certificates.X509Certificate2,System.Security.Cryptography.X509Certificates.X509Chain,System.Net.Security.SslPolicyErrors,System.Boolean>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
@@ -9537,8 +10313,6 @@
 | System.Net.Http;HttpContent;ReadAsStream;(System.Threading.CancellationToken);Argument[this];ReturnValue;taint;df-generated |
 | System.Net.Http;HttpContent;ReadAsStreamAsync;();Argument[this];ReturnValue;taint;df-generated |
 | System.Net.Http;HttpContent;ReadAsStreamAsync;(System.Threading.CancellationToken);Argument[this];ReturnValue;taint;df-generated |
-| System.Net.Http;HttpContent;ReadAsStringAsync;();Argument[this];ReturnValue;taint;df-generated |
-| System.Net.Http;HttpContent;ReadAsStringAsync;(System.Threading.CancellationToken);Argument[this];ReturnValue;taint;df-generated |
 | System.Net.Http;HttpContent;SerializeToStream;(System.IO.Stream,System.Net.TransportContext,System.Threading.CancellationToken);Argument[this];Argument[0];taint;df-generated |
 | System.Net.Http;HttpContent;SerializeToStreamAsync;(System.IO.Stream,System.Net.TransportContext);Argument[0];ReturnValue;taint;df-generated |
 | System.Net.Http;HttpContent;SerializeToStreamAsync;(System.IO.Stream,System.Net.TransportContext);Argument[this];Argument[0];taint;df-generated |
@@ -9547,32 +10321,31 @@
 | System.Net.Http;HttpContent;SerializeToStreamAsync;(System.IO.Stream,System.Net.TransportContext,System.Threading.CancellationToken);Argument[2];ReturnValue;taint;df-generated |
 | System.Net.Http;HttpContent;SerializeToStreamAsync;(System.IO.Stream,System.Net.TransportContext,System.Threading.CancellationToken);Argument[this];Argument[0];taint;df-generated |
 | System.Net.Http;HttpContent;SerializeToStreamAsync;(System.IO.Stream,System.Net.TransportContext,System.Threading.CancellationToken);Argument[this];ReturnValue;taint;df-generated |
-| System.Net.Http;HttpMessageHandler;SendAsync;(System.Net.Http.HttpRequestMessage,System.Threading.CancellationToken);Argument[1];ReturnValue;taint;df-generated |
 | System.Net.Http;HttpMessageInvoker;HttpMessageInvoker;(System.Net.Http.HttpMessageHandler,System.Boolean);Argument[0];Argument[this];taint;df-generated |
 | System.Net.Http;HttpMessageInvoker;Send;(System.Net.Http.HttpRequestMessage,System.Threading.CancellationToken);Argument[this];Argument[0];taint;df-generated |
-| System.Net.Http;HttpMessageInvoker;SendAsync;(System.Net.Http.HttpRequestMessage,System.Threading.CancellationToken);Argument[1];ReturnValue;taint;df-generated |
 | System.Net.Http;HttpMessageInvoker;SendAsync;(System.Net.Http.HttpRequestMessage,System.Threading.CancellationToken);Argument[this];Argument[0];taint;df-generated |
-| System.Net.Http;HttpMethod;HttpMethod;(System.String);Argument[0];Argument[this];taint;df-generated |
-| System.Net.Http;HttpMethod;ToString;();Argument[this];ReturnValue;taint;df-generated |
-| System.Net.Http;HttpMethod;get_Method;();Argument[this];ReturnValue;taint;df-generated |
+| System.Net.Http;HttpMethod;HttpMethod;(System.String);Argument[0];Argument[this].SyntheticField[System.Net.Http.HttpMethod._method];value;dfc-generated |
+| System.Net.Http;HttpMethod;ToString;();Argument[this].SyntheticField[System.Net.Http.HttpMethod._method];ReturnValue;value;dfc-generated |
+| System.Net.Http;HttpMethod;get_Method;();Argument[this].SyntheticField[System.Net.Http.HttpMethod._method];ReturnValue;value;dfc-generated |
 | System.Net.Http;HttpRequestMessage;HttpRequestMessage;(System.Net.Http.HttpMethod,System.String);Argument[0];Argument[this];taint;manual |
 | System.Net.Http;HttpRequestMessage;HttpRequestMessage;(System.Net.Http.HttpMethod,System.String);Argument[1];Argument[this];taint;manual |
-| System.Net.Http;HttpRequestMessage;HttpRequestMessage;(System.Net.Http.HttpMethod,System.Uri);Argument[0];Argument[this];taint;df-generated |
-| System.Net.Http;HttpRequestMessage;HttpRequestMessage;(System.Net.Http.HttpMethod,System.Uri);Argument[1];Argument[this];taint;df-generated |
-| System.Net.Http;HttpRequestMessage;ToString;();Argument[this];ReturnValue;taint;df-generated |
-| System.Net.Http;HttpRequestMessage;get_Properties;();Argument[this];ReturnValue;taint;df-generated |
+| System.Net.Http;HttpRequestMessage;HttpRequestMessage;(System.Net.Http.HttpMethod,System.Uri);Argument[0];Argument[this].SyntheticField[System.Net.Http.HttpRequestMessage._method];value;dfc-generated |
+| System.Net.Http;HttpRequestMessage;HttpRequestMessage;(System.Net.Http.HttpMethod,System.Uri);Argument[1];Argument[this].SyntheticField[System.Net.Http.HttpRequestMessage._requestUri];value;dfc-generated |
+| System.Net.Http;HttpRequestMessage;ToString;();Argument[this].SyntheticField[System.Net.Http.HttpRequestMessage._method];ReturnValue;taint;dfc-generated |
+| System.Net.Http;HttpRequestMessage;ToString;();Argument[this].SyntheticField[System.Net.Http.HttpRequestMessage._requestUri];ReturnValue;taint;dfc-generated |
+| System.Net.Http;HttpRequestMessage;get_Properties;();Argument[this].Property[System.Net.Http.HttpRequestMessage.Options];ReturnValue;value;dfc-generated |
 | System.Net.Http;HttpRequestOptions;Add;(System.Collections.Generic.KeyValuePair<System.String,System.Object>);Argument[0].Property[System.Collections.Generic.KeyValuePair`2.Key];Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Key];value;manual |
 | System.Net.Http;HttpRequestOptions;Add;(System.Collections.Generic.KeyValuePair<System.String,System.Object>);Argument[0].Property[System.Collections.Generic.KeyValuePair`2.Value];Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Value];value;manual |
 | System.Net.Http;HttpRequestOptions;get_Keys;();Argument[this];ReturnValue;taint;df-generated |
 | System.Net.Http;HttpRequestOptions;get_Values;();Argument[this];ReturnValue;taint;df-generated |
-| System.Net.Http;HttpResponseMessage;EnsureSuccessStatusCode;();Argument[this];ReturnValue;value;df-generated |
-| System.Net.Http;HttpResponseMessage;ToString;();Argument[this];ReturnValue;taint;df-generated |
+| System.Net.Http;HttpResponseMessage;EnsureSuccessStatusCode;();Argument[this];ReturnValue;value;dfc-generated |
+| System.Net.Http;HttpResponseMessage;ToString;();Argument[this].Property[System.Net.Http.HttpResponseMessage.ReasonPhrase];ReturnValue;taint;dfc-generated |
 | System.Net.Http;MultipartContent;Add;(System.Net.Http.HttpContent);Argument[0];Argument[this].Element;value;manual |
 | System.Net.Http;MultipartContent;MultipartContent;(System.String,System.String);Argument[1];Argument[this];taint;df-generated |
 | System.Net.Http;MultipartContent;set_HeaderEncodingSelector;(System.Net.Http.HeaderEncodingSelector<System.Net.Http.HttpContent>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Net.Http;MultipartFormDataContent;Add;(System.Net.Http.HttpContent);Argument[0];Argument[this].Element;value;manual |
-| System.Net.Http;MultipartFormDataContent;Add;(System.Net.Http.HttpContent,System.String);Argument[0];Argument[this];taint;df-generated |
-| System.Net.Http;MultipartFormDataContent;Add;(System.Net.Http.HttpContent,System.String,System.String);Argument[0];Argument[this];taint;df-generated |
+| System.Net.Http;MultipartFormDataContent;Add;(System.Net.Http.HttpContent,System.String);Argument[0];Argument[this].Element;value;dfc-generated |
+| System.Net.Http;MultipartFormDataContent;Add;(System.Net.Http.HttpContent,System.String,System.String);Argument[0];Argument[this].Element;value;dfc-generated |
 | System.Net.Http;ReadOnlyMemoryContent;ReadOnlyMemoryContent;(System.ReadOnlyMemory<System.Byte>);Argument[0];Argument[this];taint;df-generated |
 | System.Net.Http;SocketsHttpConnectionContext;get_DnsEndPoint;();Argument[this];ReturnValue;taint;df-generated |
 | System.Net.Http;SocketsHttpConnectionContext;get_InitialRequestMessage;();Argument[this];ReturnValue;taint;df-generated |
@@ -9589,10 +10362,8 @@
 | System.Net.Mail;AlternateView;CreateAlternateViewFromString;(System.String,System.Net.Mime.ContentType);Argument[0];ReturnValue;taint;df-generated |
 | System.Net.Mail;AlternateView;CreateAlternateViewFromString;(System.String,System.Net.Mime.ContentType);Argument[1];ReturnValue;taint;df-generated |
 | System.Net.Mail;AlternateView;CreateAlternateViewFromString;(System.String,System.Text.Encoding,System.String);Argument[0];ReturnValue;taint;df-generated |
-| System.Net.Mail;AlternateViewCollection;InsertItem;(System.Int32,System.Net.Mail.AlternateView);Argument[1];Argument[this];taint;df-generated |
-| System.Net.Mail;AlternateViewCollection;InsertItem;(System.Int32,System.Net.Mail.AlternateView);Argument[this];Argument[1];taint;df-generated |
+| System.Net.Mail;AlternateViewCollection;InsertItem;(System.Int32,System.Net.Mail.AlternateView);Argument[1];Argument[this].SyntheticField[System.Collections.ObjectModel.Collection`1.items].Element;value;dfc-generated |
 | System.Net.Mail;AlternateViewCollection;SetItem;(System.Int32,System.Net.Mail.AlternateView);Argument[1];Argument[this];taint;df-generated |
-| System.Net.Mail;AlternateViewCollection;SetItem;(System.Int32,System.Net.Mail.AlternateView);Argument[this];Argument[1];taint;df-generated |
 | System.Net.Mail;Attachment;Attachment;(System.IO.Stream,System.Net.Mime.ContentType);Argument[1];Argument[this];taint;df-generated |
 | System.Net.Mail;Attachment;Attachment;(System.IO.Stream,System.String);Argument[1];Argument[this];taint;df-generated |
 | System.Net.Mail;Attachment;Attachment;(System.IO.Stream,System.String,System.String);Argument[1];Argument[this];taint;df-generated |
@@ -9607,47 +10378,46 @@
 | System.Net.Mail;Attachment;CreateAttachmentFromString;(System.String,System.String,System.Text.Encoding,System.String);Argument[0];ReturnValue;taint;df-generated |
 | System.Net.Mail;Attachment;CreateAttachmentFromString;(System.String,System.String,System.Text.Encoding,System.String);Argument[1];ReturnValue;taint;df-generated |
 | System.Net.Mail;Attachment;get_ContentDisposition;();Argument[this];ReturnValue;taint;df-generated |
-| System.Net.Mail;AttachmentBase;AttachmentBase;(System.IO.Stream);Argument[0];Argument[this];taint;df-generated |
-| System.Net.Mail;AttachmentBase;AttachmentBase;(System.IO.Stream,System.Net.Mime.ContentType);Argument[0];Argument[this];taint;df-generated |
-| System.Net.Mail;AttachmentBase;AttachmentBase;(System.IO.Stream,System.Net.Mime.ContentType);Argument[1];Argument[this];taint;df-generated |
-| System.Net.Mail;AttachmentBase;AttachmentBase;(System.IO.Stream,System.String);Argument[0];Argument[this];taint;df-generated |
-| System.Net.Mail;AttachmentBase;AttachmentBase;(System.String);Argument[0];Argument[this];taint;df-generated |
-| System.Net.Mail;AttachmentBase;AttachmentBase;(System.String,System.Net.Mime.ContentType);Argument[0];Argument[this];taint;df-generated |
-| System.Net.Mail;AttachmentBase;AttachmentBase;(System.String,System.Net.Mime.ContentType);Argument[1];Argument[this];taint;df-generated |
-| System.Net.Mail;AttachmentBase;AttachmentBase;(System.String,System.String);Argument[0];Argument[this];taint;df-generated |
-| System.Net.Mail;AttachmentBase;get_ContentStream;();Argument[this];ReturnValue;taint;df-generated |
-| System.Net.Mail;AttachmentCollection;InsertItem;(System.Int32,System.Net.Mail.Attachment);Argument[1];Argument[this];taint;df-generated |
-| System.Net.Mail;AttachmentCollection;InsertItem;(System.Int32,System.Net.Mail.Attachment);Argument[this];Argument[1];taint;df-generated |
+| System.Net.Mail;AttachmentBase;AttachmentBase;(System.IO.Stream);Argument[0];Argument[this].SyntheticField[System.Net.Mail.AttachmentBase._part].SyntheticField[System.Net.Mime.MimePart._stream];value;dfc-generated |
+| System.Net.Mail;AttachmentBase;AttachmentBase;(System.IO.Stream,System.Net.Mime.ContentType);Argument[0];Argument[this].SyntheticField[System.Net.Mail.AttachmentBase._part].SyntheticField[System.Net.Mime.MimePart._stream];value;dfc-generated |
+| System.Net.Mail;AttachmentBase;AttachmentBase;(System.IO.Stream,System.String);Argument[0];Argument[this].SyntheticField[System.Net.Mail.AttachmentBase._part].SyntheticField[System.Net.Mime.MimePart._stream];value;dfc-generated |
+| System.Net.Mail;AttachmentBase;AttachmentBase;(System.String);Argument[0];Argument[this].SyntheticField[System.Net.Mail.AttachmentBase._part].SyntheticField[System.Net.Mime.MimePart._stream];taint;dfc-generated |
+| System.Net.Mail;AttachmentBase;AttachmentBase;(System.String,System.Net.Mime.ContentType);Argument[0];Argument[this].SyntheticField[System.Net.Mail.AttachmentBase._part].SyntheticField[System.Net.Mime.MimePart._stream];taint;dfc-generated |
+| System.Net.Mail;AttachmentBase;AttachmentBase;(System.String,System.String);Argument[0];Argument[this].SyntheticField[System.Net.Mail.AttachmentBase._part].SyntheticField[System.Net.Mime.MimePart._stream];taint;dfc-generated |
+| System.Net.Mail;AttachmentBase;get_ContentStream;();Argument[this].SyntheticField[System.Net.Mail.AttachmentBase._part].SyntheticField[System.Net.Mime.MimePart._stream];ReturnValue;value;dfc-generated |
+| System.Net.Mail;AttachmentCollection;InsertItem;(System.Int32,System.Net.Mail.Attachment);Argument[1];Argument[this].SyntheticField[System.Collections.ObjectModel.Collection`1.items].Element;value;dfc-generated |
 | System.Net.Mail;AttachmentCollection;SetItem;(System.Int32,System.Net.Mail.Attachment);Argument[1];Argument[this];taint;df-generated |
-| System.Net.Mail;AttachmentCollection;SetItem;(System.Int32,System.Net.Mail.Attachment);Argument[this];Argument[1];taint;df-generated |
 | System.Net.Mail;LinkedResource;CreateLinkedResourceFromString;(System.String);Argument[0];ReturnValue;taint;df-generated |
 | System.Net.Mail;LinkedResource;CreateLinkedResourceFromString;(System.String,System.Net.Mime.ContentType);Argument[0];ReturnValue;taint;df-generated |
 | System.Net.Mail;LinkedResource;CreateLinkedResourceFromString;(System.String,System.Net.Mime.ContentType);Argument[1];ReturnValue;taint;df-generated |
 | System.Net.Mail;LinkedResource;CreateLinkedResourceFromString;(System.String,System.Text.Encoding,System.String);Argument[0];ReturnValue;taint;df-generated |
-| System.Net.Mail;LinkedResourceCollection;InsertItem;(System.Int32,System.Net.Mail.LinkedResource);Argument[1];Argument[this];taint;df-generated |
-| System.Net.Mail;LinkedResourceCollection;InsertItem;(System.Int32,System.Net.Mail.LinkedResource);Argument[this];Argument[1];taint;df-generated |
+| System.Net.Mail;LinkedResourceCollection;InsertItem;(System.Int32,System.Net.Mail.LinkedResource);Argument[1];Argument[this].SyntheticField[System.Collections.ObjectModel.Collection`1.items].Element;value;dfc-generated |
 | System.Net.Mail;LinkedResourceCollection;SetItem;(System.Int32,System.Net.Mail.LinkedResource);Argument[1];Argument[this];taint;df-generated |
-| System.Net.Mail;LinkedResourceCollection;SetItem;(System.Int32,System.Net.Mail.LinkedResource);Argument[this];Argument[1];taint;df-generated |
-| System.Net.Mail;MailAddress;MailAddress;(System.String,System.String,System.Text.Encoding);Argument[0];Argument[this];taint;df-generated |
-| System.Net.Mail;MailAddress;MailAddress;(System.String,System.String,System.Text.Encoding);Argument[1];Argument[this];taint;df-generated |
-| System.Net.Mail;MailAddress;MailAddress;(System.String,System.String,System.Text.Encoding);Argument[2];Argument[this];taint;df-generated |
+| System.Net.Mail;MailAddress;MailAddress;(System.String,System.String,System.Text.Encoding);Argument[0];Argument[this].SyntheticField[System.Net.Mail.MailAddress._displayName];taint;dfc-generated |
+| System.Net.Mail;MailAddress;MailAddress;(System.String,System.String,System.Text.Encoding);Argument[0];Argument[this].SyntheticField[System.Net.Mail.MailAddress._host];taint;dfc-generated |
+| System.Net.Mail;MailAddress;MailAddress;(System.String,System.String,System.Text.Encoding);Argument[0];Argument[this].SyntheticField[System.Net.Mail.MailAddress._userName];taint;dfc-generated |
+| System.Net.Mail;MailAddress;MailAddress;(System.String,System.String,System.Text.Encoding);Argument[1];Argument[this].SyntheticField[System.Net.Mail.MailAddress._displayName];value;dfc-generated |
 | System.Net.Mail;MailAddress;ToString;();Argument[this];ReturnValue;taint;df-generated |
-| System.Net.Mail;MailAddress;TryCreate;(System.String,System.Net.Mail.MailAddress);Argument[0];ReturnValue;taint;df-generated |
-| System.Net.Mail;MailAddress;TryCreate;(System.String,System.String,System.Net.Mail.MailAddress);Argument[0];ReturnValue;taint;df-generated |
-| System.Net.Mail;MailAddress;TryCreate;(System.String,System.String,System.Net.Mail.MailAddress);Argument[1];ReturnValue;taint;df-generated |
-| System.Net.Mail;MailAddress;TryCreate;(System.String,System.String,System.Text.Encoding,System.Net.Mail.MailAddress);Argument[0];ReturnValue;taint;df-generated |
-| System.Net.Mail;MailAddress;TryCreate;(System.String,System.String,System.Text.Encoding,System.Net.Mail.MailAddress);Argument[1];ReturnValue;taint;df-generated |
-| System.Net.Mail;MailAddress;TryCreate;(System.String,System.String,System.Text.Encoding,System.Net.Mail.MailAddress);Argument[2];ReturnValue;taint;df-generated |
-| System.Net.Mail;MailAddress;get_Address;();Argument[this];ReturnValue;taint;df-generated |
-| System.Net.Mail;MailAddress;get_DisplayName;();Argument[this];ReturnValue;taint;df-generated |
-| System.Net.Mail;MailAddress;get_Host;();Argument[this];ReturnValue;taint;df-generated |
-| System.Net.Mail;MailAddress;get_User;();Argument[this];ReturnValue;taint;df-generated |
+| System.Net.Mail;MailAddress;TryCreate;(System.String,System.Net.Mail.MailAddress);Argument[0];ReturnValue.SyntheticField[System.Net.Mail.MailAddress._displayName];taint;dfc-generated |
+| System.Net.Mail;MailAddress;TryCreate;(System.String,System.Net.Mail.MailAddress);Argument[0];ReturnValue.SyntheticField[System.Net.Mail.MailAddress._host];taint;dfc-generated |
+| System.Net.Mail;MailAddress;TryCreate;(System.String,System.Net.Mail.MailAddress);Argument[0];ReturnValue.SyntheticField[System.Net.Mail.MailAddress._userName];taint;dfc-generated |
+| System.Net.Mail;MailAddress;TryCreate;(System.String,System.String,System.Net.Mail.MailAddress);Argument[0];ReturnValue.SyntheticField[System.Net.Mail.MailAddress._displayName];taint;dfc-generated |
+| System.Net.Mail;MailAddress;TryCreate;(System.String,System.String,System.Net.Mail.MailAddress);Argument[0];ReturnValue.SyntheticField[System.Net.Mail.MailAddress._host];taint;dfc-generated |
+| System.Net.Mail;MailAddress;TryCreate;(System.String,System.String,System.Net.Mail.MailAddress);Argument[0];ReturnValue.SyntheticField[System.Net.Mail.MailAddress._userName];taint;dfc-generated |
+| System.Net.Mail;MailAddress;TryCreate;(System.String,System.String,System.Net.Mail.MailAddress);Argument[1];ReturnValue.SyntheticField[System.Net.Mail.MailAddress._displayName];value;dfc-generated |
+| System.Net.Mail;MailAddress;TryCreate;(System.String,System.String,System.Text.Encoding,System.Net.Mail.MailAddress);Argument[0];ReturnValue.SyntheticField[System.Net.Mail.MailAddress._displayName];taint;dfc-generated |
+| System.Net.Mail;MailAddress;TryCreate;(System.String,System.String,System.Text.Encoding,System.Net.Mail.MailAddress);Argument[0];ReturnValue.SyntheticField[System.Net.Mail.MailAddress._host];taint;dfc-generated |
+| System.Net.Mail;MailAddress;TryCreate;(System.String,System.String,System.Text.Encoding,System.Net.Mail.MailAddress);Argument[0];ReturnValue.SyntheticField[System.Net.Mail.MailAddress._userName];taint;dfc-generated |
+| System.Net.Mail;MailAddress;TryCreate;(System.String,System.String,System.Text.Encoding,System.Net.Mail.MailAddress);Argument[1];ReturnValue.SyntheticField[System.Net.Mail.MailAddress._displayName];value;dfc-generated |
+| System.Net.Mail;MailAddress;get_Address;();Argument[this].SyntheticField[System.Net.Mail.MailAddress._host];ReturnValue;taint;dfc-generated |
+| System.Net.Mail;MailAddress;get_Address;();Argument[this].SyntheticField[System.Net.Mail.MailAddress._userName];ReturnValue;taint;dfc-generated |
+| System.Net.Mail;MailAddress;get_DisplayName;();Argument[this].SyntheticField[System.Net.Mail.MailAddress._displayName];ReturnValue;value;dfc-generated |
+| System.Net.Mail;MailAddress;get_Host;();Argument[this].SyntheticField[System.Net.Mail.MailAddress._host];ReturnValue;value;dfc-generated |
+| System.Net.Mail;MailAddress;get_User;();Argument[this].SyntheticField[System.Net.Mail.MailAddress._userName];ReturnValue;value;dfc-generated |
 | System.Net.Mail;MailAddressCollection;Add;(System.String);Argument[0];Argument[this].Element;value;manual |
-| System.Net.Mail;MailAddressCollection;InsertItem;(System.Int32,System.Net.Mail.MailAddress);Argument[1];Argument[this];taint;df-generated |
-| System.Net.Mail;MailAddressCollection;InsertItem;(System.Int32,System.Net.Mail.MailAddress);Argument[this];Argument[1];taint;df-generated |
+| System.Net.Mail;MailAddressCollection;InsertItem;(System.Int32,System.Net.Mail.MailAddress);Argument[1];Argument[this].SyntheticField[System.Collections.ObjectModel.Collection`1.items].Element;value;dfc-generated |
 | System.Net.Mail;MailAddressCollection;SetItem;(System.Int32,System.Net.Mail.MailAddress);Argument[1];Argument[this];taint;df-generated |
-| System.Net.Mail;MailAddressCollection;SetItem;(System.Int32,System.Net.Mail.MailAddress);Argument[this];Argument[1];taint;df-generated |
-| System.Net.Mail;MailAddressCollection;ToString;();Argument[this];ReturnValue;taint;df-generated |
+| System.Net.Mail;MailAddressCollection;ToString;();Argument[this].Element;ReturnValue;taint;dfc-generated |
 | System.Net.Mail;MailMessage;MailMessage;(System.Net.Mail.MailAddress,System.Net.Mail.MailAddress);Argument[0];Argument[this];taint;df-generated |
 | System.Net.Mail;MailMessage;MailMessage;(System.String,System.String,System.String,System.String);Argument[2];Argument[this];taint;df-generated |
 | System.Net.Mail;MailMessage;MailMessage;(System.String,System.String,System.String,System.String);Argument[3];Argument[this];taint;df-generated |
@@ -9663,25 +10433,22 @@
 | System.Net.Mail;SmtpClient;SendAsync;(System.String,System.String,System.String,System.String,System.Object);Argument[3];Argument[this];taint;df-generated |
 | System.Net.Mail;SmtpClient;SendMailAsync;(System.Net.Mail.MailMessage);Argument[0];Argument[this];taint;df-generated |
 | System.Net.Mail;SmtpClient;SendMailAsync;(System.Net.Mail.MailMessage,System.Threading.CancellationToken);Argument[0];Argument[this];taint;df-generated |
-| System.Net.Mail;SmtpClient;SendMailAsync;(System.Net.Mail.MailMessage,System.Threading.CancellationToken);Argument[1];ReturnValue;taint;df-generated |
 | System.Net.Mail;SmtpClient;SendMailAsync;(System.String,System.String,System.String,System.String);Argument[3];Argument[this];taint;df-generated |
 | System.Net.Mail;SmtpClient;SendMailAsync;(System.String,System.String,System.String,System.String,System.Threading.CancellationToken);Argument[3];Argument[this];taint;df-generated |
-| System.Net.Mail;SmtpClient;SendMailAsync;(System.String,System.String,System.String,System.String,System.Threading.CancellationToken);Argument[4];ReturnValue;taint;df-generated |
 | System.Net.Mail;SmtpClient;SmtpClient;(System.String);Argument[0];Argument[this];taint;df-generated |
 | System.Net.Mail;SmtpClient;SmtpClient;(System.String,System.Int32);Argument[0];Argument[this];taint;df-generated |
 | System.Net.Mail;SmtpClient;add_SendCompleted;(System.Net.Mail.SendCompletedEventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Net.Mail;SmtpClient;get_ClientCertificates;();Argument[this];ReturnValue;taint;df-generated |
 | System.Net.Mail;SmtpClient;remove_SendCompleted;(System.Net.Mail.SendCompletedEventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
-| System.Net.Mail;SmtpFailedRecipientException;SmtpFailedRecipientException;(System.Net.Mail.SmtpStatusCode,System.String);Argument[1];Argument[this];taint;df-generated |
-| System.Net.Mail;SmtpFailedRecipientException;SmtpFailedRecipientException;(System.Net.Mail.SmtpStatusCode,System.String,System.String);Argument[1];Argument[this];taint;df-generated |
-| System.Net.Mail;SmtpFailedRecipientException;SmtpFailedRecipientException;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);Argument[0];Argument[this];taint;df-generated |
-| System.Net.Mail;SmtpFailedRecipientException;SmtpFailedRecipientException;(System.String,System.String,System.Exception);Argument[1];Argument[this];taint;df-generated |
-| System.Net.Mail;SmtpFailedRecipientException;get_FailedRecipient;();Argument[this];ReturnValue;taint;df-generated |
-| System.Net.Mail;SmtpFailedRecipientsException;SmtpFailedRecipientsException;(System.String,System.Exception);Argument[1];Argument[this];taint;df-generated |
-| System.Net.Mail;SmtpFailedRecipientsException;SmtpFailedRecipientsException;(System.String,System.Net.Mail.SmtpFailedRecipientException[]);Argument[1].Element;Argument[this];taint;df-generated |
-| System.Net.Mail;SmtpFailedRecipientsException;get_InnerExceptions;();Argument[this];ReturnValue;taint;df-generated |
-| System.Net.Mime;ContentDisposition;ContentDisposition;(System.String);Argument[0];Argument[this];taint;df-generated |
-| System.Net.Mime;ContentDisposition;ToString;();Argument[this];ReturnValue;taint;df-generated |
+| System.Net.Mail;SmtpFailedRecipientException;SmtpFailedRecipientException;(System.Net.Mail.SmtpStatusCode,System.String);Argument[1];Argument[this].SyntheticField[System.Net.Mail.SmtpFailedRecipientException._failedRecipient];value;dfc-generated |
+| System.Net.Mail;SmtpFailedRecipientException;SmtpFailedRecipientException;(System.Net.Mail.SmtpStatusCode,System.String,System.String);Argument[1];Argument[this].SyntheticField[System.Net.Mail.SmtpFailedRecipientException._failedRecipient];value;dfc-generated |
+| System.Net.Mail;SmtpFailedRecipientException;SmtpFailedRecipientException;(System.String,System.String,System.Exception);Argument[1];Argument[this].SyntheticField[System.Net.Mail.SmtpFailedRecipientException._failedRecipient];value;dfc-generated |
+| System.Net.Mail;SmtpFailedRecipientException;get_FailedRecipient;();Argument[this].SyntheticField[System.Net.Mail.SmtpFailedRecipientException._failedRecipient];ReturnValue;value;dfc-generated |
+| System.Net.Mail;SmtpFailedRecipientsException;SmtpFailedRecipientsException;(System.String,System.Exception);Argument[1];Argument[this].SyntheticField[System.Net.Mail.SmtpFailedRecipientsException._innerExceptions].Element;value;dfc-generated |
+| System.Net.Mail;SmtpFailedRecipientsException;SmtpFailedRecipientsException;(System.String,System.Net.Mail.SmtpFailedRecipientException[]);Argument[1];Argument[this].SyntheticField[System.Net.Mail.SmtpFailedRecipientsException._innerExceptions];value;dfc-generated |
+| System.Net.Mail;SmtpFailedRecipientsException;get_InnerExceptions;();Argument[this].SyntheticField[System.Net.Mail.SmtpFailedRecipientsException._innerExceptions];ReturnValue;value;dfc-generated |
+| System.Net.Mime;ContentDisposition;ContentDisposition;(System.String);Argument[0];Argument[this].SyntheticField[System.Net.Mime.ContentDisposition._disposition];value;dfc-generated |
+| System.Net.Mime;ContentDisposition;ToString;();Argument[this].SyntheticField[System.Net.Mime.ContentDisposition._disposition];ReturnValue;value;dfc-generated |
 | System.Net.Mime;ContentType;ContentType;(System.String);Argument[0];Argument[this];taint;df-generated |
 | System.Net.Mime;ContentType;ToString;();Argument[this];ReturnValue;taint;df-generated |
 | System.Net.Mime;ContentType;get_Parameters;();Argument[this];ReturnValue;taint;df-generated |
@@ -9710,22 +10477,20 @@
 | System.Net.NetworkInformation;NetworkInterface;get_Description;();Argument[this];ReturnValue;taint;df-generated |
 | System.Net.NetworkInformation;NetworkInterface;get_Id;();Argument[this];ReturnValue;taint;df-generated |
 | System.Net.NetworkInformation;NetworkInterface;get_Name;();Argument[this];ReturnValue;taint;df-generated |
-| System.Net.NetworkInformation;PhysicalAddress;GetAddressBytes;();Argument[this];ReturnValue;taint;df-generated |
-| System.Net.NetworkInformation;PhysicalAddress;PhysicalAddress;(System.Byte[]);Argument[0].Element;Argument[this];taint;df-generated |
+| System.Net.NetworkInformation;PhysicalAddress;GetAddressBytes;();Argument[this].SyntheticField[System.Net.NetworkInformation.PhysicalAddress._address].Element;ReturnValue.Element;value;dfc-generated |
+| System.Net.NetworkInformation;PhysicalAddress;PhysicalAddress;(System.Byte[]);Argument[0];Argument[this].SyntheticField[System.Net.NetworkInformation.PhysicalAddress._address];value;dfc-generated |
 | System.Net.NetworkInformation;Ping;add_PingCompleted;(System.Net.NetworkInformation.PingCompletedEventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Net.NetworkInformation;Ping;remove_PingCompleted;(System.Net.NetworkInformation.PingCompletedEventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Net.NetworkInformation;PingCompletedEventHandler;BeginInvoke;(System.Object,System.Net.NetworkInformation.PingCompletedEventArgs,System.AsyncCallback,System.Object);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
 | System.Net.NetworkInformation;UnicastIPAddressInformationCollection;get_Item;(System.Int32);Argument[this];ReturnValue;taint;df-generated |
-| System.Net.Quic;QuicConnection;CloseAsync;(System.Int64,System.Threading.CancellationToken);Argument[this];ReturnValue;taint;df-generated |
 | System.Net.Quic;QuicConnection;get_LocalEndPoint;();Argument[this];ReturnValue;taint;df-generated |
 | System.Net.Quic;QuicConnection;get_NegotiatedApplicationProtocol;();Argument[this];ReturnValue;taint;df-generated |
 | System.Net.Quic;QuicConnection;get_RemoteCertificate;();Argument[this];ReturnValue;taint;df-generated |
 | System.Net.Quic;QuicConnection;get_RemoteEndPoint;();Argument[this];ReturnValue;taint;df-generated |
 | System.Net.Quic;QuicConnection;get_TargetHostName;();Argument[this];ReturnValue;taint;df-generated |
-| System.Net.Quic;QuicListener;ListenAsync;(System.Net.Quic.QuicListenerOptions,System.Threading.CancellationToken);Argument[0];ReturnValue;taint;df-generated |
 | System.Net.Quic;QuicListenerOptions;set_ConnectionOptionsCallback;(System.Func<System.Net.Quic.QuicConnection,System.Net.Security.SslClientHelloInfo,System.Threading.CancellationToken,System.Threading.Tasks.ValueTask<System.Net.Quic.QuicServerConnectionOptions>>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
-| System.Net.Security;AuthenticatedStream;AuthenticatedStream;(System.IO.Stream,System.Boolean);Argument[0];Argument[this];taint;df-generated |
-| System.Net.Security;AuthenticatedStream;get_InnerStream;();Argument[this];ReturnValue;taint;df-generated |
+| System.Net.Security;AuthenticatedStream;AuthenticatedStream;(System.IO.Stream,System.Boolean);Argument[0];Argument[this].SyntheticField[System.Net.Security.AuthenticatedStream._innerStream];value;dfc-generated |
+| System.Net.Security;AuthenticatedStream;get_InnerStream;();Argument[this].SyntheticField[System.Net.Security.AuthenticatedStream._innerStream];ReturnValue;value;dfc-generated |
 | System.Net.Security;LocalCertificateSelectionCallback;BeginInvoke;(System.Object,System.String,System.Security.Cryptography.X509Certificates.X509CertificateCollection,System.Security.Cryptography.X509Certificates.X509Certificate,System.String[],System.AsyncCallback,System.Object);Argument[5];Argument[5].Parameter[delegate-self];value;hq-generated |
 | System.Net.Security;NegotiateAuthentication;GetOutgoingBlob;(System.ReadOnlySpan<System.Byte>,System.Net.Security.NegotiateAuthenticationStatusCode);Argument[this];ReturnValue;taint;df-generated |
 | System.Net.Security;NegotiateAuthentication;GetOutgoingBlob;(System.String,System.Net.Security.NegotiateAuthenticationStatusCode);Argument[this];ReturnValue;taint;df-generated |
@@ -9752,7 +10517,6 @@
 | System.Net.Security;ServerCertificateSelectionCallback;BeginInvoke;(System.Object,System.String,System.AsyncCallback,System.Object);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
 | System.Net.Security;ServerOptionsSelectionCallback;BeginInvoke;(System.Net.Security.SslStream,System.Net.Security.SslClientHelloInfo,System.Object,System.Threading.CancellationToken,System.AsyncCallback,System.Object);Argument[4];Argument[4].Parameter[delegate-self];value;hq-generated |
 | System.Net.Security;SslApplicationProtocol;ToString;();Argument[this];ReturnValue;taint;df-generated |
-| System.Net.Security;SslApplicationProtocol;get_Protocol;();Argument[this];ReturnValue;taint;df-generated |
 | System.Net.Security;SslCertificateTrust;CreateForX509Collection;(System.Security.Cryptography.X509Certificates.X509Certificate2Collection,System.Boolean);Argument[0].Element;ReturnValue;taint;df-generated |
 | System.Net.Security;SslCertificateTrust;CreateForX509Store;(System.Security.Cryptography.X509Certificates.X509Store,System.Boolean);Argument[0];ReturnValue;taint;df-generated |
 | System.Net.Security;SslClientAuthenticationOptions;set_LocalCertificateSelectionCallback;(System.Net.Security.LocalCertificateSelectionCallback);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
@@ -9761,21 +10525,24 @@
 | System.Net.Security;SslServerAuthenticationOptions;set_ServerCertificateSelectionCallback;(System.Net.Security.ServerCertificateSelectionCallback);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Net.Security;SslStream;AuthenticateAsClient;(System.Net.Security.SslClientAuthenticationOptions);Argument[0];Argument[this];taint;df-generated |
 | System.Net.Security;SslStream;AuthenticateAsClientAsync;(System.Net.Security.SslClientAuthenticationOptions,System.Threading.CancellationToken);Argument[0];Argument[this];taint;df-generated |
+| System.Net.Security;SslStream;AuthenticateAsClientAsync;(System.Net.Security.SslClientAuthenticationOptions,System.Threading.CancellationToken);Argument[1];Argument[this];taint;df-generated |
 | System.Net.Security;SslStream;AuthenticateAsServer;(System.Net.Security.SslServerAuthenticationOptions);Argument[0];Argument[this];taint;df-generated |
 | System.Net.Security;SslStream;AuthenticateAsServerAsync;(System.Net.Security.ServerOptionsSelectionCallback,System.Object,System.Threading.CancellationToken);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Net.Security;SslStream;AuthenticateAsServerAsync;(System.Net.Security.SslServerAuthenticationOptions,System.Threading.CancellationToken);Argument[0];Argument[this];taint;df-generated |
+| System.Net.Security;SslStream;AuthenticateAsServerAsync;(System.Net.Security.SslServerAuthenticationOptions,System.Threading.CancellationToken);Argument[1];Argument[this];taint;df-generated |
 | System.Net.Security;SslStream;BeginAuthenticateAsClient;(System.String,System.AsyncCallback,System.Object);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
 | System.Net.Security;SslStream;BeginAuthenticateAsClient;(System.String,System.Security.Cryptography.X509Certificates.X509CertificateCollection,System.Boolean,System.AsyncCallback,System.Object);Argument[3];Argument[3].Parameter[delegate-self];value;hq-generated |
 | System.Net.Security;SslStream;BeginAuthenticateAsClient;(System.String,System.Security.Cryptography.X509Certificates.X509CertificateCollection,System.Security.Authentication.SslProtocols,System.Boolean,System.AsyncCallback,System.Object);Argument[4];Argument[4].Parameter[delegate-self];value;hq-generated |
 | System.Net.Security;SslStream;BeginAuthenticateAsServer;(System.Security.Cryptography.X509Certificates.X509Certificate,System.AsyncCallback,System.Object);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
 | System.Net.Security;SslStream;BeginAuthenticateAsServer;(System.Security.Cryptography.X509Certificates.X509Certificate,System.Boolean,System.Boolean,System.AsyncCallback,System.Object);Argument[3];Argument[3].Parameter[delegate-self];value;hq-generated |
 | System.Net.Security;SslStream;BeginAuthenticateAsServer;(System.Security.Cryptography.X509Certificates.X509Certificate,System.Boolean,System.Security.Authentication.SslProtocols,System.Boolean,System.AsyncCallback,System.Object);Argument[4];Argument[4].Parameter[delegate-self];value;hq-generated |
+| System.Net.Security;SslStream;NegotiateClientCertificateAsync;(System.Threading.CancellationToken);Argument[0];Argument[this];taint;df-generated |
 | System.Net.Security;SslStream;SslStream;(System.IO.Stream,System.Boolean,System.Net.Security.RemoteCertificateValidationCallback);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
 | System.Net.Security;SslStream;SslStream;(System.IO.Stream,System.Boolean,System.Net.Security.RemoteCertificateValidationCallback,System.Net.Security.LocalCertificateSelectionCallback);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
 | System.Net.Security;SslStream;SslStream;(System.IO.Stream,System.Boolean,System.Net.Security.RemoteCertificateValidationCallback,System.Net.Security.LocalCertificateSelectionCallback);Argument[3];Argument[3].Parameter[delegate-self];value;hq-generated |
 | System.Net.Security;SslStream;SslStream;(System.IO.Stream,System.Boolean,System.Net.Security.RemoteCertificateValidationCallback,System.Net.Security.LocalCertificateSelectionCallback,System.Net.Security.EncryptionPolicy);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
 | System.Net.Security;SslStream;SslStream;(System.IO.Stream,System.Boolean,System.Net.Security.RemoteCertificateValidationCallback,System.Net.Security.LocalCertificateSelectionCallback,System.Net.Security.EncryptionPolicy);Argument[3];Argument[3].Parameter[delegate-self];value;hq-generated |
-| System.Net.Security;SslStream;Write;(System.Byte[]);Argument[0].Element;Argument[this];taint;df-generated |
+| System.Net.Security;SslStream;Write;(System.Byte[]);Argument[0].Element;Argument[this];taint;dfc-generated |
 | System.Net.Security;SslStream;get_LocalCertificate;();Argument[this];ReturnValue;taint;df-generated |
 | System.Net.Security;SslStream;get_NegotiatedApplicationProtocol;();Argument[this];ReturnValue;taint;df-generated |
 | System.Net.Security;SslStream;get_RemoteCertificate;();Argument[this];ReturnValue;taint;df-generated |
@@ -9789,17 +10556,10 @@
 | System.Net.Sockets;MulticastOption;MulticastOption;(System.Net.IPAddress,System.Int32);Argument[0];Argument[this];taint;df-generated |
 | System.Net.Sockets;MulticastOption;MulticastOption;(System.Net.IPAddress,System.Net.IPAddress);Argument[0];Argument[this];taint;df-generated |
 | System.Net.Sockets;MulticastOption;MulticastOption;(System.Net.IPAddress,System.Net.IPAddress);Argument[1];Argument[this];taint;df-generated |
-| System.Net.Sockets;NetworkStream;NetworkStream;(System.Net.Sockets.Socket,System.IO.FileAccess,System.Boolean);Argument[0];Argument[this];taint;df-generated |
-| System.Net.Sockets;NetworkStream;get_Socket;();Argument[this];ReturnValue;taint;df-generated |
-| System.Net.Sockets;SafeSocketHandle;SafeSocketHandle;(System.IntPtr,System.Boolean);Argument[0];Argument[this];taint;df-generated |
+| System.Net.Sockets;NetworkStream;NetworkStream;(System.Net.Sockets.Socket,System.IO.FileAccess,System.Boolean);Argument[0];Argument[this].SyntheticField[System.Net.Sockets.NetworkStream._streamSocket];value;dfc-generated |
+| System.Net.Sockets;NetworkStream;get_Socket;();Argument[this].SyntheticField[System.Net.Sockets.NetworkStream._streamSocket];ReturnValue;value;dfc-generated |
 | System.Net.Sockets;Socket;Accept;();Argument[this];ReturnValue;taint;df-generated |
-| System.Net.Sockets;Socket;AcceptAsync;(System.Net.Sockets.Socket);Argument[0];ReturnValue;taint;df-generated |
-| System.Net.Sockets;Socket;AcceptAsync;(System.Net.Sockets.Socket,System.Threading.CancellationToken);Argument[0];ReturnValue;taint;df-generated |
-| System.Net.Sockets;Socket;AcceptAsync;(System.Net.Sockets.Socket,System.Threading.CancellationToken);Argument[1];ReturnValue;taint;df-generated |
-| System.Net.Sockets;Socket;AcceptAsync;(System.Net.Sockets.Socket,System.Threading.CancellationToken);Argument[this];ReturnValue;taint;df-generated |
 | System.Net.Sockets;Socket;AcceptAsync;(System.Net.Sockets.SocketAsyncEventArgs);Argument[this];Argument[0];taint;df-generated |
-| System.Net.Sockets;Socket;AcceptAsync;(System.Threading.CancellationToken);Argument[0];ReturnValue;taint;df-generated |
-| System.Net.Sockets;Socket;AcceptAsync;(System.Threading.CancellationToken);Argument[this];ReturnValue;taint;df-generated |
 | System.Net.Sockets;Socket;BeginAccept;(System.AsyncCallback,System.Object);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Net.Sockets;Socket;BeginAccept;(System.Int32,System.AsyncCallback,System.Object);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
 | System.Net.Sockets;Socket;BeginAccept;(System.Net.Sockets.Socket,System.Int32,System.AsyncCallback,System.Object);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
@@ -9812,7 +10572,13 @@
 | System.Net.Sockets;Socket;BeginReceive;(System.Byte[],System.Int32,System.Int32,System.Net.Sockets.SocketFlags,System.Net.Sockets.SocketError,System.AsyncCallback,System.Object);Argument[5];Argument[5].Parameter[delegate-self];value;hq-generated |
 | System.Net.Sockets;Socket;BeginReceive;(System.Collections.Generic.IList<System.ArraySegment<System.Byte>>,System.Net.Sockets.SocketFlags,System.AsyncCallback,System.Object);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
 | System.Net.Sockets;Socket;BeginReceive;(System.Collections.Generic.IList<System.ArraySegment<System.Byte>>,System.Net.Sockets.SocketFlags,System.Net.Sockets.SocketError,System.AsyncCallback,System.Object);Argument[3];Argument[3].Parameter[delegate-self];value;hq-generated |
+| System.Net.Sockets;Socket;BeginReceiveFrom;(System.Byte[],System.Int32,System.Int32,System.Net.Sockets.SocketFlags,System.Net.EndPoint,System.AsyncCallback,System.Object);Argument[4];ReturnValue;value;dfc-generated |
+| System.Net.Sockets;Socket;BeginReceiveFrom;(System.Byte[],System.Int32,System.Int32,System.Net.Sockets.SocketFlags,System.Net.EndPoint,System.AsyncCallback,System.Object);Argument[4];ReturnValue;value;hq-generated |
+| System.Net.Sockets;Socket;BeginReceiveFrom;(System.Byte[],System.Int32,System.Int32,System.Net.Sockets.SocketFlags,System.Net.EndPoint,System.AsyncCallback,System.Object);Argument[5];Argument[5].Parameter[delegate-self];value;dfc-generated |
 | System.Net.Sockets;Socket;BeginReceiveFrom;(System.Byte[],System.Int32,System.Int32,System.Net.Sockets.SocketFlags,System.Net.EndPoint,System.AsyncCallback,System.Object);Argument[5];Argument[5].Parameter[delegate-self];value;hq-generated |
+| System.Net.Sockets;Socket;BeginReceiveMessageFrom;(System.Byte[],System.Int32,System.Int32,System.Net.Sockets.SocketFlags,System.Net.EndPoint,System.AsyncCallback,System.Object);Argument[4];ReturnValue;value;dfc-generated |
+| System.Net.Sockets;Socket;BeginReceiveMessageFrom;(System.Byte[],System.Int32,System.Int32,System.Net.Sockets.SocketFlags,System.Net.EndPoint,System.AsyncCallback,System.Object);Argument[4];ReturnValue;value;hq-generated |
+| System.Net.Sockets;Socket;BeginReceiveMessageFrom;(System.Byte[],System.Int32,System.Int32,System.Net.Sockets.SocketFlags,System.Net.EndPoint,System.AsyncCallback,System.Object);Argument[5];Argument[5].Parameter[delegate-self];value;dfc-generated |
 | System.Net.Sockets;Socket;BeginReceiveMessageFrom;(System.Byte[],System.Int32,System.Int32,System.Net.Sockets.SocketFlags,System.Net.EndPoint,System.AsyncCallback,System.Object);Argument[5];Argument[5].Parameter[delegate-self];value;hq-generated |
 | System.Net.Sockets;Socket;BeginSend;(System.Byte[],System.Int32,System.Int32,System.Net.Sockets.SocketFlags,System.AsyncCallback,System.Object);Argument[4];Argument[4].Parameter[delegate-self];value;hq-generated |
 | System.Net.Sockets;Socket;BeginSend;(System.Byte[],System.Int32,System.Int32,System.Net.Sockets.SocketFlags,System.Net.Sockets.SocketError,System.AsyncCallback,System.Object);Argument[5];Argument[5].Parameter[delegate-self];value;hq-generated |
@@ -9823,75 +10589,25 @@
 | System.Net.Sockets;Socket;BeginSendTo;(System.Byte[],System.Int32,System.Int32,System.Net.Sockets.SocketFlags,System.Net.EndPoint,System.AsyncCallback,System.Object);Argument[5];Argument[5].Parameter[delegate-self];value;hq-generated |
 | System.Net.Sockets;Socket;Bind;(System.Net.EndPoint);Argument[0];Argument[this];taint;df-generated |
 | System.Net.Sockets;Socket;Connect;(System.Net.EndPoint);Argument[0];Argument[this];taint;df-generated |
-| System.Net.Sockets;Socket;Connect;(System.Net.IPAddress,System.Int32);Argument[0];Argument[this];taint;df-generated |
-| System.Net.Sockets;Socket;Connect;(System.Net.IPAddress[],System.Int32);Argument[0].Element;Argument[this];taint;df-generated |
 | System.Net.Sockets;Socket;ConnectAsync;(System.Net.EndPoint);Argument[0];Argument[this];taint;df-generated |
 | System.Net.Sockets;Socket;ConnectAsync;(System.Net.EndPoint,System.Threading.CancellationToken);Argument[0];Argument[this];taint;df-generated |
-| System.Net.Sockets;Socket;ConnectAsync;(System.Net.EndPoint,System.Threading.CancellationToken);Argument[0];ReturnValue;taint;df-generated |
-| System.Net.Sockets;Socket;ConnectAsync;(System.Net.EndPoint,System.Threading.CancellationToken);Argument[this];ReturnValue;taint;df-generated |
-| System.Net.Sockets;Socket;ConnectAsync;(System.Net.IPAddress,System.Int32);Argument[0];Argument[this];taint;df-generated |
-| System.Net.Sockets;Socket;ConnectAsync;(System.Net.IPAddress,System.Int32,System.Threading.CancellationToken);Argument[0];Argument[this];taint;df-generated |
-| System.Net.Sockets;Socket;ConnectAsync;(System.Net.IPAddress,System.Int32,System.Threading.CancellationToken);Argument[this];ReturnValue;taint;df-generated |
 | System.Net.Sockets;Socket;ConnectAsync;(System.Net.Sockets.SocketAsyncEventArgs);Argument[0];Argument[this];taint;df-generated |
 | System.Net.Sockets;Socket;ConnectAsync;(System.Net.Sockets.SocketAsyncEventArgs);Argument[this];Argument[0];taint;df-generated |
-| System.Net.Sockets;Socket;ConnectAsync;(System.String,System.Int32,System.Threading.CancellationToken);Argument[this];ReturnValue;taint;df-generated |
-| System.Net.Sockets;Socket;DisconnectAsync;(System.Boolean,System.Threading.CancellationToken);Argument[1];ReturnValue;taint;df-generated |
-| System.Net.Sockets;Socket;DisconnectAsync;(System.Boolean,System.Threading.CancellationToken);Argument[this];ReturnValue;taint;df-generated |
 | System.Net.Sockets;Socket;DisconnectAsync;(System.Net.Sockets.SocketAsyncEventArgs);Argument[this];Argument[0];taint;df-generated |
-| System.Net.Sockets;Socket;ReceiveAsync;(System.Memory<System.Byte>,System.Net.Sockets.SocketFlags,System.Threading.CancellationToken);Argument[0];ReturnValue;taint;df-generated |
-| System.Net.Sockets;Socket;ReceiveAsync;(System.Memory<System.Byte>,System.Net.Sockets.SocketFlags,System.Threading.CancellationToken);Argument[2];ReturnValue;taint;df-generated |
-| System.Net.Sockets;Socket;ReceiveAsync;(System.Memory<System.Byte>,System.Net.Sockets.SocketFlags,System.Threading.CancellationToken);Argument[this];ReturnValue;taint;df-generated |
-| System.Net.Sockets;Socket;ReceiveAsync;(System.Memory<System.Byte>,System.Threading.CancellationToken);Argument[0];ReturnValue;taint;df-generated |
-| System.Net.Sockets;Socket;ReceiveAsync;(System.Memory<System.Byte>,System.Threading.CancellationToken);Argument[1];ReturnValue;taint;df-generated |
-| System.Net.Sockets;Socket;ReceiveAsync;(System.Memory<System.Byte>,System.Threading.CancellationToken);Argument[this];ReturnValue;taint;df-generated |
+| System.Net.Sockets;Socket;EndReceiveFrom;(System.IAsyncResult,System.Net.EndPoint);Argument[1];ReturnValue;value;dfc-generated |
+| System.Net.Sockets;Socket;EndReceiveMessageFrom;(System.IAsyncResult,System.Net.Sockets.SocketFlags,System.Net.EndPoint,System.Net.Sockets.IPPacketInformation);Argument[2];ReturnValue;value;dfc-generated |
 | System.Net.Sockets;Socket;ReceiveAsync;(System.Net.Sockets.SocketAsyncEventArgs);Argument[this];Argument[0];taint;df-generated |
-| System.Net.Sockets;Socket;ReceiveFrom;(System.Byte[],System.Int32,System.Int32,System.Net.Sockets.SocketFlags,System.Net.EndPoint);Argument[4];Argument[this];taint;df-generated |
-| System.Net.Sockets;Socket;ReceiveFrom;(System.Byte[],System.Int32,System.Net.Sockets.SocketFlags,System.Net.EndPoint);Argument[3];Argument[this];taint;df-generated |
-| System.Net.Sockets;Socket;ReceiveFrom;(System.Byte[],System.Int32,System.Net.Sockets.SocketFlags,System.Net.EndPoint);Argument[3];ReturnValue;taint;df-generated |
-| System.Net.Sockets;Socket;ReceiveFrom;(System.Byte[],System.Net.EndPoint);Argument[1];Argument[this];taint;df-generated |
-| System.Net.Sockets;Socket;ReceiveFrom;(System.Byte[],System.Net.EndPoint);Argument[1];ReturnValue;taint;df-generated |
-| System.Net.Sockets;Socket;ReceiveFrom;(System.Byte[],System.Net.Sockets.SocketFlags,System.Net.EndPoint);Argument[2];Argument[this];taint;df-generated |
-| System.Net.Sockets;Socket;ReceiveFrom;(System.Byte[],System.Net.Sockets.SocketFlags,System.Net.EndPoint);Argument[2];ReturnValue;taint;df-generated |
-| System.Net.Sockets;Socket;ReceiveFrom;(System.Span<System.Byte>,System.Net.EndPoint);Argument[1];Argument[this];taint;df-generated |
-| System.Net.Sockets;Socket;ReceiveFrom;(System.Span<System.Byte>,System.Net.EndPoint);Argument[1];ReturnValue;taint;df-generated |
-| System.Net.Sockets;Socket;ReceiveFrom;(System.Span<System.Byte>,System.Net.Sockets.SocketFlags,System.Net.EndPoint);Argument[2];Argument[this];taint;df-generated |
-| System.Net.Sockets;Socket;ReceiveFromAsync;(System.ArraySegment<System.Byte>,System.Net.EndPoint);Argument[1];ReturnValue;taint;df-generated |
-| System.Net.Sockets;Socket;ReceiveFromAsync;(System.ArraySegment<System.Byte>,System.Net.Sockets.SocketFlags,System.Net.EndPoint);Argument[2];ReturnValue;taint;df-generated |
-| System.Net.Sockets;Socket;ReceiveFromAsync;(System.Memory<System.Byte>,System.Net.EndPoint,System.Threading.CancellationToken);Argument[0];ReturnValue;taint;df-generated |
-| System.Net.Sockets;Socket;ReceiveFromAsync;(System.Memory<System.Byte>,System.Net.EndPoint,System.Threading.CancellationToken);Argument[1];ReturnValue;taint;df-generated |
-| System.Net.Sockets;Socket;ReceiveFromAsync;(System.Memory<System.Byte>,System.Net.EndPoint,System.Threading.CancellationToken);Argument[2];ReturnValue;taint;df-generated |
-| System.Net.Sockets;Socket;ReceiveFromAsync;(System.Memory<System.Byte>,System.Net.EndPoint,System.Threading.CancellationToken);Argument[this];ReturnValue;taint;df-generated |
-| System.Net.Sockets;Socket;ReceiveFromAsync;(System.Memory<System.Byte>,System.Net.Sockets.SocketFlags,System.Net.EndPoint,System.Threading.CancellationToken);Argument[0];ReturnValue;taint;df-generated |
-| System.Net.Sockets;Socket;ReceiveFromAsync;(System.Memory<System.Byte>,System.Net.Sockets.SocketFlags,System.Net.EndPoint,System.Threading.CancellationToken);Argument[2];ReturnValue;taint;df-generated |
-| System.Net.Sockets;Socket;ReceiveFromAsync;(System.Memory<System.Byte>,System.Net.Sockets.SocketFlags,System.Net.EndPoint,System.Threading.CancellationToken);Argument[3];ReturnValue;taint;df-generated |
-| System.Net.Sockets;Socket;ReceiveFromAsync;(System.Memory<System.Byte>,System.Net.Sockets.SocketFlags,System.Net.EndPoint,System.Threading.CancellationToken);Argument[this];ReturnValue;taint;df-generated |
-| System.Net.Sockets;Socket;ReceiveFromAsync;(System.Memory<System.Byte>,System.Net.Sockets.SocketFlags,System.Net.SocketAddress,System.Threading.CancellationToken);Argument[0];ReturnValue;taint;df-generated |
-| System.Net.Sockets;Socket;ReceiveFromAsync;(System.Memory<System.Byte>,System.Net.Sockets.SocketFlags,System.Net.SocketAddress,System.Threading.CancellationToken);Argument[2];ReturnValue;taint;df-generated |
-| System.Net.Sockets;Socket;ReceiveFromAsync;(System.Memory<System.Byte>,System.Net.Sockets.SocketFlags,System.Net.SocketAddress,System.Threading.CancellationToken);Argument[3];ReturnValue;taint;df-generated |
-| System.Net.Sockets;Socket;ReceiveFromAsync;(System.Memory<System.Byte>,System.Net.Sockets.SocketFlags,System.Net.SocketAddress,System.Threading.CancellationToken);Argument[this];ReturnValue;taint;df-generated |
+| System.Net.Sockets;Socket;ReceiveFrom;(System.Byte[],System.Int32,System.Int32,System.Net.Sockets.SocketFlags,System.Net.EndPoint);Argument[4];ReturnValue;value;dfc-generated |
+| System.Net.Sockets;Socket;ReceiveFrom;(System.Byte[],System.Int32,System.Net.Sockets.SocketFlags,System.Net.EndPoint);Argument[3];ReturnValue;value;dfc-generated |
+| System.Net.Sockets;Socket;ReceiveFrom;(System.Byte[],System.Net.EndPoint);Argument[1];ReturnValue;value;dfc-generated |
+| System.Net.Sockets;Socket;ReceiveFrom;(System.Byte[],System.Net.Sockets.SocketFlags,System.Net.EndPoint);Argument[2];ReturnValue;value;dfc-generated |
+| System.Net.Sockets;Socket;ReceiveFrom;(System.Span<System.Byte>,System.Net.EndPoint);Argument[1];ReturnValue;value;dfc-generated |
+| System.Net.Sockets;Socket;ReceiveFrom;(System.Span<System.Byte>,System.Net.Sockets.SocketFlags,System.Net.EndPoint);Argument[2];ReturnValue;value;dfc-generated |
 | System.Net.Sockets;Socket;ReceiveFromAsync;(System.Net.Sockets.SocketAsyncEventArgs);Argument[this];Argument[0];taint;df-generated |
-| System.Net.Sockets;Socket;ReceiveMessageFrom;(System.Byte[],System.Int32,System.Int32,System.Net.Sockets.SocketFlags,System.Net.EndPoint,System.Net.Sockets.IPPacketInformation);Argument[4];Argument[this];taint;df-generated |
-| System.Net.Sockets;Socket;ReceiveMessageFrom;(System.Span<System.Byte>,System.Net.Sockets.SocketFlags,System.Net.EndPoint,System.Net.Sockets.IPPacketInformation);Argument[2];Argument[this];taint;df-generated |
-| System.Net.Sockets;Socket;ReceiveMessageFromAsync;(System.ArraySegment<System.Byte>,System.Net.EndPoint);Argument[1];ReturnValue;taint;df-generated |
-| System.Net.Sockets;Socket;ReceiveMessageFromAsync;(System.ArraySegment<System.Byte>,System.Net.Sockets.SocketFlags,System.Net.EndPoint);Argument[2];ReturnValue;taint;df-generated |
-| System.Net.Sockets;Socket;ReceiveMessageFromAsync;(System.Memory<System.Byte>,System.Net.EndPoint,System.Threading.CancellationToken);Argument[0];ReturnValue;taint;df-generated |
-| System.Net.Sockets;Socket;ReceiveMessageFromAsync;(System.Memory<System.Byte>,System.Net.EndPoint,System.Threading.CancellationToken);Argument[1];ReturnValue;taint;df-generated |
-| System.Net.Sockets;Socket;ReceiveMessageFromAsync;(System.Memory<System.Byte>,System.Net.EndPoint,System.Threading.CancellationToken);Argument[2];ReturnValue;taint;df-generated |
-| System.Net.Sockets;Socket;ReceiveMessageFromAsync;(System.Memory<System.Byte>,System.Net.EndPoint,System.Threading.CancellationToken);Argument[this];ReturnValue;taint;df-generated |
-| System.Net.Sockets;Socket;ReceiveMessageFromAsync;(System.Memory<System.Byte>,System.Net.Sockets.SocketFlags,System.Net.EndPoint,System.Threading.CancellationToken);Argument[0];ReturnValue;taint;df-generated |
-| System.Net.Sockets;Socket;ReceiveMessageFromAsync;(System.Memory<System.Byte>,System.Net.Sockets.SocketFlags,System.Net.EndPoint,System.Threading.CancellationToken);Argument[2];ReturnValue;taint;df-generated |
-| System.Net.Sockets;Socket;ReceiveMessageFromAsync;(System.Memory<System.Byte>,System.Net.Sockets.SocketFlags,System.Net.EndPoint,System.Threading.CancellationToken);Argument[3];ReturnValue;taint;df-generated |
-| System.Net.Sockets;Socket;ReceiveMessageFromAsync;(System.Memory<System.Byte>,System.Net.Sockets.SocketFlags,System.Net.EndPoint,System.Threading.CancellationToken);Argument[this];ReturnValue;taint;df-generated |
+| System.Net.Sockets;Socket;ReceiveMessageFrom;(System.Byte[],System.Int32,System.Int32,System.Net.Sockets.SocketFlags,System.Net.EndPoint,System.Net.Sockets.IPPacketInformation);Argument[4];ReturnValue;value;dfc-generated |
+| System.Net.Sockets;Socket;ReceiveMessageFrom;(System.Span<System.Byte>,System.Net.Sockets.SocketFlags,System.Net.EndPoint,System.Net.Sockets.IPPacketInformation);Argument[2];ReturnValue;value;dfc-generated |
 | System.Net.Sockets;Socket;ReceiveMessageFromAsync;(System.Net.Sockets.SocketAsyncEventArgs);Argument[this];Argument[0];taint;df-generated |
 | System.Net.Sockets;Socket;SendAsync;(System.Net.Sockets.SocketAsyncEventArgs);Argument[this];Argument[0];taint;df-generated |
-| System.Net.Sockets;Socket;SendAsync;(System.ReadOnlyMemory<System.Byte>,System.Net.Sockets.SocketFlags,System.Threading.CancellationToken);Argument[2];ReturnValue;taint;df-generated |
-| System.Net.Sockets;Socket;SendAsync;(System.ReadOnlyMemory<System.Byte>,System.Net.Sockets.SocketFlags,System.Threading.CancellationToken);Argument[this];ReturnValue;taint;df-generated |
-| System.Net.Sockets;Socket;SendAsync;(System.ReadOnlyMemory<System.Byte>,System.Threading.CancellationToken);Argument[1];ReturnValue;taint;df-generated |
-| System.Net.Sockets;Socket;SendAsync;(System.ReadOnlyMemory<System.Byte>,System.Threading.CancellationToken);Argument[this];ReturnValue;taint;df-generated |
-| System.Net.Sockets;Socket;SendFileAsync;(System.String,System.ReadOnlyMemory<System.Byte>,System.ReadOnlyMemory<System.Byte>,System.Net.Sockets.TransmitFileOptions,System.Threading.CancellationToken);Argument[4];ReturnValue;taint;df-generated |
-| System.Net.Sockets;Socket;SendFileAsync;(System.String,System.ReadOnlyMemory<System.Byte>,System.ReadOnlyMemory<System.Byte>,System.Net.Sockets.TransmitFileOptions,System.Threading.CancellationToken);Argument[this];ReturnValue;taint;df-generated |
-| System.Net.Sockets;Socket;SendFileAsync;(System.String,System.Threading.CancellationToken);Argument[1];ReturnValue;taint;df-generated |
-| System.Net.Sockets;Socket;SendFileAsync;(System.String,System.Threading.CancellationToken);Argument[this];ReturnValue;taint;df-generated |
 | System.Net.Sockets;Socket;SendPacketsAsync;(System.Net.Sockets.SocketAsyncEventArgs);Argument[this];Argument[0];taint;df-generated |
 | System.Net.Sockets;Socket;SendTo;(System.Byte[],System.Int32,System.Int32,System.Net.Sockets.SocketFlags,System.Net.EndPoint);Argument[4];Argument[this];taint;df-generated |
 | System.Net.Sockets;Socket;SendTo;(System.Byte[],System.Int32,System.Net.Sockets.SocketFlags,System.Net.EndPoint);Argument[3];Argument[this];taint;df-generated |
@@ -9904,45 +10620,21 @@
 | System.Net.Sockets;Socket;SendToAsync;(System.Net.Sockets.SocketAsyncEventArgs);Argument[0];Argument[this];taint;df-generated |
 | System.Net.Sockets;Socket;SendToAsync;(System.Net.Sockets.SocketAsyncEventArgs);Argument[this];Argument[0];taint;df-generated |
 | System.Net.Sockets;Socket;SendToAsync;(System.ReadOnlyMemory<System.Byte>,System.Net.EndPoint,System.Threading.CancellationToken);Argument[1];Argument[this];taint;df-generated |
-| System.Net.Sockets;Socket;SendToAsync;(System.ReadOnlyMemory<System.Byte>,System.Net.EndPoint,System.Threading.CancellationToken);Argument[1];ReturnValue;taint;df-generated |
-| System.Net.Sockets;Socket;SendToAsync;(System.ReadOnlyMemory<System.Byte>,System.Net.EndPoint,System.Threading.CancellationToken);Argument[2];ReturnValue;taint;df-generated |
-| System.Net.Sockets;Socket;SendToAsync;(System.ReadOnlyMemory<System.Byte>,System.Net.EndPoint,System.Threading.CancellationToken);Argument[this];ReturnValue;taint;df-generated |
 | System.Net.Sockets;Socket;SendToAsync;(System.ReadOnlyMemory<System.Byte>,System.Net.Sockets.SocketFlags,System.Net.EndPoint,System.Threading.CancellationToken);Argument[2];Argument[this];taint;df-generated |
-| System.Net.Sockets;Socket;SendToAsync;(System.ReadOnlyMemory<System.Byte>,System.Net.Sockets.SocketFlags,System.Net.EndPoint,System.Threading.CancellationToken);Argument[2];ReturnValue;taint;df-generated |
-| System.Net.Sockets;Socket;SendToAsync;(System.ReadOnlyMemory<System.Byte>,System.Net.Sockets.SocketFlags,System.Net.EndPoint,System.Threading.CancellationToken);Argument[3];ReturnValue;taint;df-generated |
-| System.Net.Sockets;Socket;SendToAsync;(System.ReadOnlyMemory<System.Byte>,System.Net.Sockets.SocketFlags,System.Net.EndPoint,System.Threading.CancellationToken);Argument[this];ReturnValue;taint;df-generated |
-| System.Net.Sockets;Socket;SendToAsync;(System.ReadOnlyMemory<System.Byte>,System.Net.Sockets.SocketFlags,System.Net.SocketAddress,System.Threading.CancellationToken);Argument[2];ReturnValue;taint;df-generated |
-| System.Net.Sockets;Socket;SendToAsync;(System.ReadOnlyMemory<System.Byte>,System.Net.Sockets.SocketFlags,System.Net.SocketAddress,System.Threading.CancellationToken);Argument[3];ReturnValue;taint;df-generated |
-| System.Net.Sockets;Socket;SendToAsync;(System.ReadOnlyMemory<System.Byte>,System.Net.Sockets.SocketFlags,System.Net.SocketAddress,System.Threading.CancellationToken);Argument[this];ReturnValue;taint;df-generated |
-| System.Net.Sockets;Socket;get_Handle;();Argument[this];ReturnValue;taint;df-generated |
 | System.Net.Sockets;Socket;get_LocalEndPoint;();Argument[this];ReturnValue;taint;df-generated |
 | System.Net.Sockets;Socket;get_RemoteEndPoint;();Argument[this];ReturnValue;taint;df-generated |
 | System.Net.Sockets;Socket;get_SafeHandle;();Argument[this];ReturnValue;taint;df-generated |
-| System.Net.Sockets;SocketAsyncEventArgs;SetBuffer;(System.Byte[],System.Int32,System.Int32);Argument[0].Element;Argument[this];taint;df-generated |
-| System.Net.Sockets;SocketAsyncEventArgs;SetBuffer;(System.Memory<System.Byte>);Argument[0];Argument[this];taint;df-generated |
+| System.Net.Sockets;SocketAsyncEventArgs;SetBuffer;(System.Memory<System.Byte>);Argument[0];Argument[this].SyntheticField[System.Net.Sockets.SocketAsyncEventArgs._buffer];value;dfc-generated |
 | System.Net.Sockets;SocketAsyncEventArgs;add_Completed;(System.EventHandler<System.Net.Sockets.SocketAsyncEventArgs>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Net.Sockets;SocketAsyncEventArgs;get_ConnectByNameError;();Argument[this];ReturnValue;taint;df-generated |
 | System.Net.Sockets;SocketAsyncEventArgs;get_ConnectSocket;();Argument[this];ReturnValue;taint;df-generated |
-| System.Net.Sockets;SocketAsyncEventArgs;get_MemoryBuffer;();Argument[this];ReturnValue;taint;df-generated |
+| System.Net.Sockets;SocketAsyncEventArgs;get_MemoryBuffer;();Argument[this].SyntheticField[System.Net.Sockets.SocketAsyncEventArgs._buffer];ReturnValue;value;dfc-generated |
 | System.Net.Sockets;SocketAsyncEventArgs;get_ReceiveMessageFromPacketInfo;();Argument[this];ReturnValue;taint;df-generated |
 | System.Net.Sockets;SocketAsyncEventArgs;remove_Completed;(System.EventHandler<System.Net.Sockets.SocketAsyncEventArgs>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
-| System.Net.Sockets;SocketException;get_Message;();Argument[this];ReturnValue;taint;df-generated |
-| System.Net.Sockets;SocketTaskExtensions;AcceptAsync;(System.Net.Sockets.Socket,System.Net.Sockets.Socket);Argument[1];ReturnValue;taint;df-generated |
+| System.Net.Sockets;SocketException;get_Message;();Argument[this].Property[System.Exception.Message];ReturnValue;value;dfc-generated |
+| System.Net.Sockets;SocketException;get_Message;();Argument[this].SyntheticField[System.Exception._message];ReturnValue;value;dfc-generated |
 | System.Net.Sockets;SocketTaskExtensions;ConnectAsync;(System.Net.Sockets.Socket,System.Net.EndPoint);Argument[1];Argument[0];taint;df-generated |
-| System.Net.Sockets;SocketTaskExtensions;ConnectAsync;(System.Net.Sockets.Socket,System.Net.EndPoint,System.Threading.CancellationToken);Argument[0];ReturnValue;taint;df-generated |
 | System.Net.Sockets;SocketTaskExtensions;ConnectAsync;(System.Net.Sockets.Socket,System.Net.EndPoint,System.Threading.CancellationToken);Argument[1];Argument[0];taint;df-generated |
-| System.Net.Sockets;SocketTaskExtensions;ConnectAsync;(System.Net.Sockets.Socket,System.Net.EndPoint,System.Threading.CancellationToken);Argument[1];ReturnValue;taint;df-generated |
-| System.Net.Sockets;SocketTaskExtensions;ConnectAsync;(System.Net.Sockets.Socket,System.Net.IPAddress,System.Int32);Argument[1];Argument[0];taint;df-generated |
-| System.Net.Sockets;SocketTaskExtensions;ConnectAsync;(System.Net.Sockets.Socket,System.Net.IPAddress,System.Int32,System.Threading.CancellationToken);Argument[0];ReturnValue;taint;df-generated |
-| System.Net.Sockets;SocketTaskExtensions;ConnectAsync;(System.Net.Sockets.Socket,System.Net.IPAddress,System.Int32,System.Threading.CancellationToken);Argument[1];Argument[0];taint;df-generated |
-| System.Net.Sockets;SocketTaskExtensions;ConnectAsync;(System.Net.Sockets.Socket,System.String,System.Int32,System.Threading.CancellationToken);Argument[0];ReturnValue;taint;df-generated |
-| System.Net.Sockets;SocketTaskExtensions;ReceiveAsync;(System.Net.Sockets.Socket,System.Memory<System.Byte>,System.Net.Sockets.SocketFlags,System.Threading.CancellationToken);Argument[0];ReturnValue;taint;df-generated |
-| System.Net.Sockets;SocketTaskExtensions;ReceiveAsync;(System.Net.Sockets.Socket,System.Memory<System.Byte>,System.Net.Sockets.SocketFlags,System.Threading.CancellationToken);Argument[1];ReturnValue;taint;df-generated |
-| System.Net.Sockets;SocketTaskExtensions;ReceiveAsync;(System.Net.Sockets.Socket,System.Memory<System.Byte>,System.Net.Sockets.SocketFlags,System.Threading.CancellationToken);Argument[3];ReturnValue;taint;df-generated |
-| System.Net.Sockets;SocketTaskExtensions;ReceiveFromAsync;(System.Net.Sockets.Socket,System.ArraySegment<System.Byte>,System.Net.Sockets.SocketFlags,System.Net.EndPoint);Argument[3];ReturnValue;taint;df-generated |
-| System.Net.Sockets;SocketTaskExtensions;ReceiveMessageFromAsync;(System.Net.Sockets.Socket,System.ArraySegment<System.Byte>,System.Net.Sockets.SocketFlags,System.Net.EndPoint);Argument[3];ReturnValue;taint;df-generated |
-| System.Net.Sockets;SocketTaskExtensions;SendAsync;(System.Net.Sockets.Socket,System.ReadOnlyMemory<System.Byte>,System.Net.Sockets.SocketFlags,System.Threading.CancellationToken);Argument[0];ReturnValue;taint;df-generated |
-| System.Net.Sockets;SocketTaskExtensions;SendAsync;(System.Net.Sockets.Socket,System.ReadOnlyMemory<System.Byte>,System.Net.Sockets.SocketFlags,System.Threading.CancellationToken);Argument[3];ReturnValue;taint;df-generated |
 | System.Net.Sockets;SocketTaskExtensions;SendToAsync;(System.Net.Sockets.Socket,System.ArraySegment<System.Byte>,System.Net.Sockets.SocketFlags,System.Net.EndPoint);Argument[3];Argument[0];taint;df-generated |
 | System.Net.Sockets;TcpClient;BeginConnect;(System.Net.IPAddress,System.Int32,System.AsyncCallback,System.Object);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
 | System.Net.Sockets;TcpClient;BeginConnect;(System.Net.IPAddress[],System.Int32,System.AsyncCallback,System.Object);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
@@ -9952,14 +10644,11 @@
 | System.Net.Sockets;TcpClient;ConnectAsync;(System.Net.IPEndPoint,System.Threading.CancellationToken);Argument[0];Argument[this];taint;df-generated |
 | System.Net.Sockets;TcpClient;TcpClient;(System.Net.IPEndPoint);Argument[0];Argument[this];taint;df-generated |
 | System.Net.Sockets;TcpListener;AcceptSocket;();Argument[this];ReturnValue;taint;df-generated |
-| System.Net.Sockets;TcpListener;AcceptSocketAsync;(System.Threading.CancellationToken);Argument[0];ReturnValue;taint;df-generated |
-| System.Net.Sockets;TcpListener;AcceptSocketAsync;(System.Threading.CancellationToken);Argument[this];ReturnValue;taint;df-generated |
 | System.Net.Sockets;TcpListener;AcceptTcpClient;();Argument[this];ReturnValue;taint;df-generated |
 | System.Net.Sockets;TcpListener;BeginAcceptSocket;(System.AsyncCallback,System.Object);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Net.Sockets;TcpListener;BeginAcceptTcpClient;(System.AsyncCallback,System.Object);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
-| System.Net.Sockets;TcpListener;TcpListener;(System.Net.IPAddress,System.Int32);Argument[0];Argument[this];taint;df-generated |
-| System.Net.Sockets;TcpListener;TcpListener;(System.Net.IPEndPoint);Argument[0];Argument[this];taint;df-generated |
-| System.Net.Sockets;TcpListener;get_LocalEndpoint;();Argument[this];ReturnValue;taint;df-generated |
+| System.Net.Sockets;TcpListener;TcpListener;(System.Net.IPEndPoint);Argument[0];Argument[this].SyntheticField[System.Net.Sockets.TcpListener._serverSocketEP];value;dfc-generated |
+| System.Net.Sockets;TcpListener;get_LocalEndpoint;();Argument[this].SyntheticField[System.Net.Sockets.TcpListener._serverSocketEP];ReturnValue;value;dfc-generated |
 | System.Net.Sockets;TcpListener;get_Server;();Argument[this];ReturnValue;taint;df-generated |
 | System.Net.Sockets;UdpClient;BeginReceive;(System.AsyncCallback,System.Object);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Net.Sockets;UdpClient;BeginSend;(System.Byte[],System.Int32,System.AsyncCallback,System.Object);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
@@ -9972,28 +10661,16 @@
 | System.Net.Sockets;UdpClient;Send;(System.ReadOnlySpan<System.Byte>,System.Net.IPEndPoint);Argument[1];Argument[this];taint;df-generated |
 | System.Net.Sockets;UdpClient;SendAsync;(System.Byte[],System.Int32,System.Net.IPEndPoint);Argument[2];Argument[this];taint;df-generated |
 | System.Net.Sockets;UdpClient;SendAsync;(System.ReadOnlyMemory<System.Byte>,System.Net.IPEndPoint,System.Threading.CancellationToken);Argument[1];Argument[this];taint;df-generated |
-| System.Net.Sockets;UdpClient;SendAsync;(System.ReadOnlyMemory<System.Byte>,System.Net.IPEndPoint,System.Threading.CancellationToken);Argument[1];ReturnValue;taint;df-generated |
-| System.Net.Sockets;UdpClient;SendAsync;(System.ReadOnlyMemory<System.Byte>,System.Net.IPEndPoint,System.Threading.CancellationToken);Argument[2];ReturnValue;taint;df-generated |
-| System.Net.Sockets;UdpClient;SendAsync;(System.ReadOnlyMemory<System.Byte>,System.Net.IPEndPoint,System.Threading.CancellationToken);Argument[this];ReturnValue;taint;df-generated |
-| System.Net.Sockets;UdpClient;SendAsync;(System.ReadOnlyMemory<System.Byte>,System.String,System.Int32,System.Threading.CancellationToken);Argument[3];ReturnValue;taint;df-generated |
-| System.Net.Sockets;UdpClient;SendAsync;(System.ReadOnlyMemory<System.Byte>,System.String,System.Int32,System.Threading.CancellationToken);Argument[this];ReturnValue;taint;df-generated |
-| System.Net.Sockets;UdpClient;SendAsync;(System.ReadOnlyMemory<System.Byte>,System.Threading.CancellationToken);Argument[1];ReturnValue;taint;df-generated |
-| System.Net.Sockets;UdpClient;SendAsync;(System.ReadOnlyMemory<System.Byte>,System.Threading.CancellationToken);Argument[this];ReturnValue;taint;df-generated |
 | System.Net.Sockets;UdpClient;UdpClient;(System.Net.IPEndPoint);Argument[0];Argument[this];taint;df-generated |
-| System.Net.Sockets;UdpReceiveResult;UdpReceiveResult;(System.Byte[],System.Net.IPEndPoint);Argument[0].Element;Argument[this];taint;df-generated |
-| System.Net.Sockets;UdpReceiveResult;UdpReceiveResult;(System.Byte[],System.Net.IPEndPoint);Argument[1];Argument[this];taint;df-generated |
-| System.Net.Sockets;UdpReceiveResult;get_Buffer;();Argument[this];ReturnValue;taint;df-generated |
-| System.Net.Sockets;UdpReceiveResult;get_RemoteEndPoint;();Argument[this];ReturnValue;taint;df-generated |
+| System.Net.Sockets;UdpReceiveResult;UdpReceiveResult;(System.Byte[],System.Net.IPEndPoint);Argument[0];Argument[this].SyntheticField[System.Net.Sockets.UdpReceiveResult._buffer];value;dfc-generated |
+| System.Net.Sockets;UdpReceiveResult;UdpReceiveResult;(System.Byte[],System.Net.IPEndPoint);Argument[1];Argument[this].SyntheticField[System.Net.Sockets.UdpReceiveResult._remoteEndPoint];value;dfc-generated |
+| System.Net.Sockets;UdpReceiveResult;get_Buffer;();Argument[this].SyntheticField[System.Net.Sockets.UdpReceiveResult._buffer];ReturnValue;value;dfc-generated |
+| System.Net.Sockets;UdpReceiveResult;get_RemoteEndPoint;();Argument[this].SyntheticField[System.Net.Sockets.UdpReceiveResult._remoteEndPoint];ReturnValue;value;dfc-generated |
 | System.Net.Sockets;UnixDomainSocketEndPoint;ToString;();Argument[this];ReturnValue;taint;df-generated |
 | System.Net.WebSockets;ClientWebSocketOptions;SetBuffer;(System.Int32,System.Int32,System.ArraySegment<System.Byte>);Argument[2].Element;Argument[this];taint;df-generated |
 | System.Net.WebSockets;ClientWebSocketOptions;set_RemoteCertificateValidationCallback;(System.Net.Security.RemoteCertificateValidationCallback);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
-| System.Net.WebSockets;WebSocket;CreateClientWebSocket;(System.IO.Stream,System.String,System.Int32,System.Int32,System.TimeSpan,System.Boolean,System.ArraySegment<System.Byte>);Argument[0];ReturnValue;taint;df-generated |
-| System.Net.WebSockets;WebSocket;CreateClientWebSocket;(System.IO.Stream,System.String,System.Int32,System.Int32,System.TimeSpan,System.Boolean,System.ArraySegment<System.Byte>);Argument[1];ReturnValue;taint;df-generated |
-| System.Net.WebSockets;WebSocket;CreateFromStream;(System.IO.Stream,System.Boolean,System.String,System.TimeSpan);Argument[0];ReturnValue;taint;df-generated |
-| System.Net.WebSockets;WebSocket;CreateFromStream;(System.IO.Stream,System.Boolean,System.String,System.TimeSpan);Argument[2];ReturnValue;taint;df-generated |
-| System.Net.WebSockets;WebSocket;SendAsync;(System.ArraySegment<System.Byte>,System.Net.WebSockets.WebSocketMessageType,System.Boolean,System.Threading.CancellationToken);Argument[this];ReturnValue;taint;df-generated |
-| System.Net.WebSockets;WebSocket;SendAsync;(System.ReadOnlyMemory<System.Byte>,System.Net.WebSockets.WebSocketMessageType,System.Boolean,System.Threading.CancellationToken);Argument[this];ReturnValue;taint;df-generated |
-| System.Net.WebSockets;WebSocket;SendAsync;(System.ReadOnlyMemory<System.Byte>,System.Net.WebSockets.WebSocketMessageType,System.Net.WebSockets.WebSocketMessageFlags,System.Threading.CancellationToken);Argument[this];ReturnValue;taint;df-generated |
+| System.Net.WebSockets;WebSocket;CreateClientWebSocket;(System.IO.Stream,System.String,System.Int32,System.Int32,System.TimeSpan,System.Boolean,System.ArraySegment<System.Byte>);Argument[1];ReturnValue.SyntheticField[System.Net.WebSockets.ManagedWebSocket._subprotocol];value;dfc-generated |
+| System.Net.WebSockets;WebSocket;CreateFromStream;(System.IO.Stream,System.Boolean,System.String,System.TimeSpan);Argument[2];ReturnValue.SyntheticField[System.Net.WebSockets.ManagedWebSocket._subprotocol];value;dfc-generated |
 | System.Net.WebSockets;WebSocket;get_CloseStatus;();Argument[this];ReturnValue;taint;df-generated |
 | System.Net.WebSockets;WebSocket;get_CloseStatusDescription;();Argument[this];ReturnValue;taint;df-generated |
 | System.Net.WebSockets;WebSocket;get_SubProtocol;();Argument[this];ReturnValue;taint;df-generated |
@@ -10022,21 +10699,26 @@
 | System.Net;Dns;BeginGetHostEntry;(System.Net.IPAddress,System.AsyncCallback,System.Object);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
 | System.Net;Dns;BeginGetHostEntry;(System.String,System.AsyncCallback,System.Object);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
 | System.Net;Dns;BeginResolve;(System.String,System.AsyncCallback,System.Object);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
-| System.Net;DnsEndPoint;DnsEndPoint;(System.String,System.Int32,System.Net.Sockets.AddressFamily);Argument[0];Argument[this];taint;df-generated |
-| System.Net;DnsEndPoint;ToString;();Argument[this];ReturnValue;taint;df-generated |
-| System.Net;DnsEndPoint;get_Host;();Argument[this];ReturnValue;taint;df-generated |
+| System.Net;DnsEndPoint;DnsEndPoint;(System.String,System.Int32,System.Net.Sockets.AddressFamily);Argument[0];Argument[this].SyntheticField[System.Net.DnsEndPoint._host];value;dfc-generated |
+| System.Net;DnsEndPoint;ToString;();Argument[this].SyntheticField[System.Net.DnsEndPoint._host];ReturnValue;taint;dfc-generated |
+| System.Net;DnsEndPoint;get_Host;();Argument[this].SyntheticField[System.Net.DnsEndPoint._host];ReturnValue;value;dfc-generated |
 | System.Net;DownloadDataCompletedEventArgs;get_Result;();Argument[this];ReturnValue;taint;df-generated |
 | System.Net;DownloadDataCompletedEventHandler;BeginInvoke;(System.Object,System.Net.DownloadDataCompletedEventArgs,System.AsyncCallback,System.Object);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
 | System.Net;DownloadProgressChangedEventHandler;BeginInvoke;(System.Object,System.Net.DownloadProgressChangedEventArgs,System.AsyncCallback,System.Object);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
 | System.Net;DownloadStringCompletedEventArgs;get_Result;();Argument[this];ReturnValue;taint;df-generated |
 | System.Net;DownloadStringCompletedEventHandler;BeginInvoke;(System.Object,System.Net.DownloadStringCompletedEventArgs,System.AsyncCallback,System.Object);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
+| System.Net;FileWebRequest;get_RequestUri;();Argument[this].SyntheticField[System.Net.FileWebRequest._uri];ReturnValue;value;dfc-generated |
+| System.Net;FtpWebRequest;get_RequestUri;();Argument[this].SyntheticField[System.Net.FtpWebRequest._uri];ReturnValue;value;dfc-generated |
 | System.Net;FtpWebResponse;get_BannerMessage;();Argument[this];ReturnValue;taint;df-generated |
 | System.Net;FtpWebResponse;get_ExitMessage;();Argument[this];ReturnValue;taint;df-generated |
 | System.Net;FtpWebResponse;get_StatusDescription;();Argument[this];ReturnValue;taint;df-generated |
 | System.Net;FtpWebResponse;get_WelcomeMessage;();Argument[this];ReturnValue;taint;df-generated |
 | System.Net;HttpContinueDelegate;BeginInvoke;(System.Int32,System.Net.WebHeaderCollection,System.AsyncCallback,System.Object);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
 | System.Net;HttpListener+ExtendedProtectionSelector;BeginInvoke;(System.Net.HttpListenerRequest,System.AsyncCallback,System.Object);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
+| System.Net;HttpListener;BeginGetContext;(System.AsyncCallback,System.Object);Argument[0];Argument[0].Parameter[delegate-self];value;dfc-generated |
 | System.Net;HttpListener;BeginGetContext;(System.AsyncCallback,System.Object);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
+| System.Net;HttpListener;BeginGetContext;(System.AsyncCallback,System.Object);Argument[1];ReturnValue.SyntheticField[System.Net.ListenerAsyncResult._state];value;dfc-generated |
+| System.Net;HttpListener;BeginGetContext;(System.AsyncCallback,System.Object);Argument[1];ReturnValue.SyntheticField[System.Net.ListenerAsyncResult._state];value;hq-generated |
 | System.Net;HttpListener;get_DefaultServiceNames;();Argument[this];ReturnValue;taint;df-generated |
 | System.Net;HttpListener;get_Prefixes;();Argument[this];ReturnValue;taint;df-generated |
 | System.Net;HttpListener;get_TimeoutManager;();Argument[this];ReturnValue;taint;df-generated |
@@ -10059,35 +10741,37 @@
 | System.Net;HttpListenerRequest;get_ProtocolVersion;();Argument[this];ReturnValue;taint;df-generated |
 | System.Net;HttpListenerRequest;get_RawUrl;();Argument[this];ReturnValue;taint;df-generated |
 | System.Net;HttpListenerRequest;get_Url;();Argument[this];ReturnValue;taint;df-generated |
-| System.Net;HttpListenerRequest;get_UrlReferrer;();Argument[this];ReturnValue;taint;df-generated |
 | System.Net;HttpListenerRequest;get_UserAgent;();Argument[this];ReturnValue;taint;df-generated |
 | System.Net;HttpListenerRequest;get_UserHostName;();Argument[this];ReturnValue;taint;df-generated |
-| System.Net;HttpListenerResponse;AppendCookie;(System.Net.Cookie);Argument[0];Argument[this];taint;df-generated |
+| System.Net;HttpListenerResponse;AppendCookie;(System.Net.Cookie);Argument[0];Argument[this].Property[System.Net.HttpListenerResponse.Cookies].Element;value;dfc-generated |
 | System.Net;HttpListenerResponse;Close;(System.Byte[],System.Boolean);Argument[0].Element;Argument[this];taint;df-generated |
 | System.Net;HttpListenerResponse;CopyFrom;(System.Net.HttpListenerResponse);Argument[0];Argument[this];taint;df-generated |
 | System.Net;HttpListenerResponse;get_OutputStream;();Argument[this];ReturnValue;taint;df-generated |
-| System.Net;HttpWebRequest;EndGetRequestStream;(System.IAsyncResult,System.Net.TransportContext);Argument[0];ReturnValue;taint;df-generated |
+| System.Net;HttpWebRequest;EndGetRequestStream;(System.IAsyncResult);Argument[0].Property[System.Threading.Tasks.Task`1.Result];ReturnValue;value;df-generated |
+| System.Net;HttpWebRequest;EndGetRequestStream;(System.IAsyncResult);Argument[0].Property[System.Threading.Tasks.Task`1.Result];ReturnValue;value;dfc-generated |
+| System.Net;HttpWebRequest;EndGetRequestStream;(System.IAsyncResult,System.Net.TransportContext);Argument[0].Property[System.Threading.Tasks.Task`1.Result];ReturnValue;value;dfc-generated |
+| System.Net;HttpWebRequest;EndGetResponse;(System.IAsyncResult);Argument[0].Property[System.Threading.Tasks.Task`1.Result];ReturnValue;value;df-generated |
+| System.Net;HttpWebRequest;EndGetResponse;(System.IAsyncResult);Argument[0].Property[System.Threading.Tasks.Task`1.Result];ReturnValue;value;dfc-generated |
 | System.Net;HttpWebRequest;GetRequestStream;(System.Net.TransportContext);Argument[this];ReturnValue;taint;df-generated |
-| System.Net;HttpWebRequest;get_Address;();Argument[this];ReturnValue;taint;df-generated |
+| System.Net;HttpWebRequest;get_Address;();Argument[this].SyntheticField[System.Net.HttpWebRequest._requestUri];ReturnValue;value;dfc-generated |
+| System.Net;HttpWebRequest;get_RequestUri;();Argument[this].SyntheticField[System.Net.HttpWebRequest._requestUri];ReturnValue;value;dfc-generated |
 | System.Net;HttpWebRequest;set_ContinueDelegate;(System.Net.HttpContinueDelegate);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Net;HttpWebRequest;set_ServerCertificateValidationCallback;(System.Net.Security.RemoteCertificateValidationCallback);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Net;HttpWebResponse;GetResponseHeader;(System.String);Argument[this];ReturnValue;taint;df-generated |
 | System.Net;HttpWebResponse;get_CharacterSet;();Argument[this];ReturnValue;taint;df-generated |
 | System.Net;HttpWebResponse;get_Server;();Argument[this];ReturnValue;taint;df-generated |
 | System.Net;HttpWebResponse;get_StatusDescription;();Argument[this];ReturnValue;taint;df-generated |
-| System.Net;ICredentials;GetCredential;(System.Uri,System.String);Argument[this];ReturnValue;taint;df-generated |
-| System.Net;ICredentials;GetCredential;(System.Uri,System.String);Argument[this];ReturnValue;value;df-generated |
-| System.Net;ICredentialsByHost;GetCredential;(System.String,System.Int32,System.String);Argument[this];ReturnValue;value;df-generated |
-| System.Net;IPAddress;MapToIPv4;();Argument[this];ReturnValue;value;df-generated |
-| System.Net;IPAddress;MapToIPv6;();Argument[this];ReturnValue;value;df-generated |
+| System.Net;ICredentials;GetCredential;(System.Uri,System.String);Argument[this];ReturnValue;value;dfc-generated |
+| System.Net;ICredentialsByHost;GetCredential;(System.String,System.Int32,System.String);Argument[this];ReturnValue;value;dfc-generated |
+| System.Net;IPAddress;MapToIPv4;();Argument[this];ReturnValue;value;dfc-generated |
+| System.Net;IPAddress;MapToIPv6;();Argument[this];ReturnValue;value;dfc-generated |
 | System.Net;IPAddress;ToString;();Argument[this];ReturnValue;taint;df-generated |
 | System.Net;IPEndPoint;IPEndPoint;(System.Net.IPAddress,System.Int32);Argument[0];Argument[this];taint;df-generated |
 | System.Net;IPHostEntry;get_Aliases;();Argument[this];ReturnValue;taint;manual |
 | System.Net;IPHostEntry;get_HostName;();Argument[this];ReturnValue;taint;manual |
-| System.Net;IPNetwork;IPNetwork;(System.Net.IPAddress,System.Int32);Argument[0];Argument[this];taint;df-generated |
-| System.Net;IPNetwork;get_BaseAddress;();Argument[this];ReturnValue;taint;df-generated |
-| System.Net;IWebProxy;GetProxy;(System.Uri);Argument[0];ReturnValue;taint;df-generated |
-| System.Net;IWebProxy;GetProxy;(System.Uri);Argument[this];ReturnValue;taint;df-generated |
+| System.Net;IPNetwork;IPNetwork;(System.Net.IPAddress,System.Int32);Argument[0];Argument[this].SyntheticField[System.Net.IPNetwork._baseAddress];value;dfc-generated |
+| System.Net;IPNetwork;get_BaseAddress;();Argument[this].SyntheticField[System.Net.IPNetwork._baseAddress];ReturnValue;value;dfc-generated |
+| System.Net;IWebProxy;GetProxy;(System.Uri);Argument[0];ReturnValue;value;dfc-generated |
 | System.Net;IWebRequestCreate;Create;(System.Uri);Argument[0];ReturnValue;taint;df-generated |
 | System.Net;NetworkCredential;NetworkCredential;(System.String,System.Security.SecureString,System.String);Argument[0];Argument[this];taint;df-generated |
 | System.Net;NetworkCredential;NetworkCredential;(System.String,System.Security.SecureString,System.String);Argument[2];Argument[this];taint;df-generated |
@@ -10100,7 +10784,6 @@
 | System.Net;OpenWriteCompletedEventHandler;BeginInvoke;(System.Object,System.Net.OpenWriteCompletedEventArgs,System.AsyncCallback,System.Object);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
 | System.Net;ServicePoint;set_BindIPEndPointDelegate;(System.Net.BindIPEndPoint);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Net;ServicePointManager;set_ServerCertificateValidationCallback;(System.Net.Security.RemoteCertificateValidationCallback);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
-| System.Net;SocketAddress;get_Buffer;();Argument[this];ReturnValue;taint;df-generated |
 | System.Net;UploadDataCompletedEventArgs;get_Result;();Argument[this];ReturnValue;taint;df-generated |
 | System.Net;UploadDataCompletedEventHandler;BeginInvoke;(System.Object,System.Net.UploadDataCompletedEventArgs,System.AsyncCallback,System.Object);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
 | System.Net;UploadFileCompletedEventArgs;get_Result;();Argument[this];ReturnValue;taint;df-generated |
@@ -10110,132 +10793,41 @@
 | System.Net;UploadStringCompletedEventHandler;BeginInvoke;(System.Object,System.Net.UploadStringCompletedEventArgs,System.AsyncCallback,System.Object);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
 | System.Net;UploadValuesCompletedEventArgs;get_Result;();Argument[this];ReturnValue;taint;df-generated |
 | System.Net;UploadValuesCompletedEventHandler;BeginInvoke;(System.Object,System.Net.UploadValuesCompletedEventArgs,System.AsyncCallback,System.Object);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
-| System.Net;WebClient;DownloadData;(System.String);Argument[0];Argument[this];taint;df-generated |
-| System.Net;WebClient;DownloadData;(System.Uri);Argument[0];Argument[this];taint;df-generated |
-| System.Net;WebClient;DownloadDataAsync;(System.Uri);Argument[0];Argument[this];taint;df-generated |
-| System.Net;WebClient;DownloadDataAsync;(System.Uri,System.Object);Argument[0];Argument[this];taint;df-generated |
-| System.Net;WebClient;DownloadDataTaskAsync;(System.String);Argument[0];Argument[this];taint;df-generated |
-| System.Net;WebClient;DownloadDataTaskAsync;(System.Uri);Argument[0];Argument[this];taint;df-generated |
-| System.Net;WebClient;DownloadFile;(System.String,System.String);Argument[0];Argument[this];taint;df-generated |
-| System.Net;WebClient;DownloadFile;(System.Uri,System.String);Argument[0];Argument[this];taint;df-generated |
-| System.Net;WebClient;DownloadFileAsync;(System.Uri,System.String);Argument[0];Argument[this];taint;df-generated |
-| System.Net;WebClient;DownloadFileAsync;(System.Uri,System.String,System.Object);Argument[0];Argument[this];taint;df-generated |
-| System.Net;WebClient;DownloadFileTaskAsync;(System.String,System.String);Argument[0];Argument[this];taint;df-generated |
-| System.Net;WebClient;DownloadFileTaskAsync;(System.Uri,System.String);Argument[0];Argument[this];taint;df-generated |
-| System.Net;WebClient;DownloadString;(System.String);Argument[0];Argument[this];taint;df-generated |
-| System.Net;WebClient;DownloadString;(System.Uri);Argument[0];Argument[this];taint;df-generated |
-| System.Net;WebClient;DownloadStringAsync;(System.Uri);Argument[0];Argument[this];taint;df-generated |
-| System.Net;WebClient;DownloadStringAsync;(System.Uri,System.Object);Argument[0];Argument[this];taint;df-generated |
-| System.Net;WebClient;DownloadStringTaskAsync;(System.String);Argument[0];Argument[this];taint;df-generated |
-| System.Net;WebClient;DownloadStringTaskAsync;(System.Uri);Argument[0];Argument[this];taint;df-generated |
-| System.Net;WebClient;GetWebRequest;(System.Uri);Argument[0];ReturnValue;taint;df-generated |
-| System.Net;WebClient;GetWebRequest;(System.Uri);Argument[this];ReturnValue;taint;df-generated |
-| System.Net;WebClient;GetWebResponse;(System.Net.WebRequest);Argument[0];Argument[this];taint;df-generated |
-| System.Net;WebClient;GetWebResponse;(System.Net.WebRequest);Argument[0];ReturnValue;taint;df-generated |
-| System.Net;WebClient;GetWebResponse;(System.Net.WebRequest,System.IAsyncResult);Argument[0];Argument[this];taint;df-generated |
-| System.Net;WebClient;GetWebResponse;(System.Net.WebRequest,System.IAsyncResult);Argument[0];ReturnValue;taint;df-generated |
-| System.Net;WebClient;GetWebResponse;(System.Net.WebRequest,System.IAsyncResult);Argument[1];Argument[this];taint;df-generated |
-| System.Net;WebClient;GetWebResponse;(System.Net.WebRequest,System.IAsyncResult);Argument[1];ReturnValue;taint;df-generated |
-| System.Net;WebClient;OpenRead;(System.String);Argument[0];Argument[this];taint;df-generated |
-| System.Net;WebClient;OpenRead;(System.Uri);Argument[0];Argument[this];taint;df-generated |
-| System.Net;WebClient;OpenReadAsync;(System.Uri);Argument[0];Argument[this];taint;df-generated |
-| System.Net;WebClient;OpenReadAsync;(System.Uri,System.Object);Argument[0];Argument[this];taint;df-generated |
-| System.Net;WebClient;OpenReadTaskAsync;(System.String);Argument[0];Argument[this];taint;df-generated |
-| System.Net;WebClient;OpenReadTaskAsync;(System.Uri);Argument[0];Argument[this];taint;df-generated |
-| System.Net;WebClient;OpenWrite;(System.String);Argument[0];Argument[this];taint;df-generated |
-| System.Net;WebClient;OpenWrite;(System.String);Argument[0];ReturnValue;taint;df-generated |
 | System.Net;WebClient;OpenWrite;(System.String);Argument[this];ReturnValue;taint;df-generated |
-| System.Net;WebClient;OpenWrite;(System.String,System.String);Argument[0];Argument[this];taint;df-generated |
-| System.Net;WebClient;OpenWrite;(System.String,System.String);Argument[0];ReturnValue;taint;df-generated |
 | System.Net;WebClient;OpenWrite;(System.String,System.String);Argument[1];Argument[this];taint;df-generated |
 | System.Net;WebClient;OpenWrite;(System.String,System.String);Argument[1];ReturnValue;taint;df-generated |
 | System.Net;WebClient;OpenWrite;(System.String,System.String);Argument[this];ReturnValue;taint;df-generated |
-| System.Net;WebClient;OpenWrite;(System.Uri);Argument[0];Argument[this];taint;df-generated |
-| System.Net;WebClient;OpenWrite;(System.Uri);Argument[0];ReturnValue;taint;df-generated |
 | System.Net;WebClient;OpenWrite;(System.Uri);Argument[this];ReturnValue;taint;df-generated |
-| System.Net;WebClient;OpenWrite;(System.Uri,System.String);Argument[0];Argument[this];taint;df-generated |
-| System.Net;WebClient;OpenWrite;(System.Uri,System.String);Argument[0];ReturnValue;taint;df-generated |
 | System.Net;WebClient;OpenWrite;(System.Uri,System.String);Argument[1];Argument[this];taint;df-generated |
 | System.Net;WebClient;OpenWrite;(System.Uri,System.String);Argument[1];ReturnValue;taint;df-generated |
 | System.Net;WebClient;OpenWrite;(System.Uri,System.String);Argument[this];ReturnValue;taint;df-generated |
-| System.Net;WebClient;OpenWriteAsync;(System.Uri);Argument[0];Argument[this];taint;df-generated |
-| System.Net;WebClient;OpenWriteAsync;(System.Uri,System.String);Argument[0];Argument[this];taint;df-generated |
 | System.Net;WebClient;OpenWriteAsync;(System.Uri,System.String);Argument[1];Argument[this];taint;df-generated |
-| System.Net;WebClient;OpenWriteAsync;(System.Uri,System.String,System.Object);Argument[0];Argument[this];taint;df-generated |
 | System.Net;WebClient;OpenWriteAsync;(System.Uri,System.String,System.Object);Argument[1];Argument[this];taint;df-generated |
-| System.Net;WebClient;OpenWriteTaskAsync;(System.String);Argument[0];Argument[this];taint;df-generated |
-| System.Net;WebClient;OpenWriteTaskAsync;(System.String,System.String);Argument[0];Argument[this];taint;df-generated |
 | System.Net;WebClient;OpenWriteTaskAsync;(System.String,System.String);Argument[1];Argument[this];taint;df-generated |
-| System.Net;WebClient;OpenWriteTaskAsync;(System.Uri);Argument[0];Argument[this];taint;df-generated |
-| System.Net;WebClient;OpenWriteTaskAsync;(System.Uri,System.String);Argument[0];Argument[this];taint;df-generated |
 | System.Net;WebClient;OpenWriteTaskAsync;(System.Uri,System.String);Argument[1];Argument[this];taint;df-generated |
-| System.Net;WebClient;UploadData;(System.String,System.Byte[]);Argument[0];Argument[this];taint;df-generated |
-| System.Net;WebClient;UploadData;(System.String,System.String,System.Byte[]);Argument[0];Argument[this];taint;df-generated |
 | System.Net;WebClient;UploadData;(System.String,System.String,System.Byte[]);Argument[1];Argument[this];taint;df-generated |
-| System.Net;WebClient;UploadData;(System.Uri,System.Byte[]);Argument[0];Argument[this];taint;df-generated |
-| System.Net;WebClient;UploadData;(System.Uri,System.String,System.Byte[]);Argument[0];Argument[this];taint;df-generated |
 | System.Net;WebClient;UploadData;(System.Uri,System.String,System.Byte[]);Argument[1];Argument[this];taint;df-generated |
-| System.Net;WebClient;UploadDataAsync;(System.Uri,System.Byte[]);Argument[0];Argument[this];taint;df-generated |
-| System.Net;WebClient;UploadDataAsync;(System.Uri,System.String,System.Byte[]);Argument[0];Argument[this];taint;df-generated |
 | System.Net;WebClient;UploadDataAsync;(System.Uri,System.String,System.Byte[]);Argument[1];Argument[this];taint;df-generated |
-| System.Net;WebClient;UploadDataAsync;(System.Uri,System.String,System.Byte[],System.Object);Argument[0];Argument[this];taint;df-generated |
 | System.Net;WebClient;UploadDataAsync;(System.Uri,System.String,System.Byte[],System.Object);Argument[1];Argument[this];taint;df-generated |
-| System.Net;WebClient;UploadDataTaskAsync;(System.String,System.Byte[]);Argument[0];Argument[this];taint;df-generated |
-| System.Net;WebClient;UploadDataTaskAsync;(System.String,System.String,System.Byte[]);Argument[0];Argument[this];taint;df-generated |
 | System.Net;WebClient;UploadDataTaskAsync;(System.String,System.String,System.Byte[]);Argument[1];Argument[this];taint;df-generated |
-| System.Net;WebClient;UploadDataTaskAsync;(System.Uri,System.Byte[]);Argument[0];Argument[this];taint;df-generated |
-| System.Net;WebClient;UploadDataTaskAsync;(System.Uri,System.String,System.Byte[]);Argument[0];Argument[this];taint;df-generated |
 | System.Net;WebClient;UploadDataTaskAsync;(System.Uri,System.String,System.Byte[]);Argument[1];Argument[this];taint;df-generated |
-| System.Net;WebClient;UploadFile;(System.String,System.String);Argument[0];Argument[this];taint;df-generated |
-| System.Net;WebClient;UploadFile;(System.String,System.String,System.String);Argument[0];Argument[this];taint;df-generated |
 | System.Net;WebClient;UploadFile;(System.String,System.String,System.String);Argument[1];Argument[this];taint;df-generated |
-| System.Net;WebClient;UploadFile;(System.Uri,System.String);Argument[0];Argument[this];taint;df-generated |
-| System.Net;WebClient;UploadFile;(System.Uri,System.String,System.String);Argument[0];Argument[this];taint;df-generated |
 | System.Net;WebClient;UploadFile;(System.Uri,System.String,System.String);Argument[1];Argument[this];taint;df-generated |
-| System.Net;WebClient;UploadFileAsync;(System.Uri,System.String);Argument[0];Argument[this];taint;df-generated |
-| System.Net;WebClient;UploadFileAsync;(System.Uri,System.String,System.String);Argument[0];Argument[this];taint;df-generated |
 | System.Net;WebClient;UploadFileAsync;(System.Uri,System.String,System.String);Argument[1];Argument[this];taint;df-generated |
-| System.Net;WebClient;UploadFileAsync;(System.Uri,System.String,System.String,System.Object);Argument[0];Argument[this];taint;df-generated |
 | System.Net;WebClient;UploadFileAsync;(System.Uri,System.String,System.String,System.Object);Argument[1];Argument[this];taint;df-generated |
-| System.Net;WebClient;UploadFileTaskAsync;(System.String,System.String);Argument[0];Argument[this];taint;df-generated |
-| System.Net;WebClient;UploadFileTaskAsync;(System.String,System.String,System.String);Argument[0];Argument[this];taint;df-generated |
 | System.Net;WebClient;UploadFileTaskAsync;(System.String,System.String,System.String);Argument[1];Argument[this];taint;df-generated |
-| System.Net;WebClient;UploadFileTaskAsync;(System.Uri,System.String);Argument[0];Argument[this];taint;df-generated |
-| System.Net;WebClient;UploadFileTaskAsync;(System.Uri,System.String,System.String);Argument[0];Argument[this];taint;df-generated |
 | System.Net;WebClient;UploadFileTaskAsync;(System.Uri,System.String,System.String);Argument[1];Argument[this];taint;df-generated |
-| System.Net;WebClient;UploadString;(System.String,System.String);Argument[0];Argument[this];taint;df-generated |
-| System.Net;WebClient;UploadString;(System.String,System.String,System.String);Argument[0];Argument[this];taint;df-generated |
 | System.Net;WebClient;UploadString;(System.String,System.String,System.String);Argument[1];Argument[this];taint;df-generated |
-| System.Net;WebClient;UploadString;(System.Uri,System.String);Argument[0];Argument[this];taint;df-generated |
-| System.Net;WebClient;UploadString;(System.Uri,System.String,System.String);Argument[0];Argument[this];taint;df-generated |
 | System.Net;WebClient;UploadString;(System.Uri,System.String,System.String);Argument[1];Argument[this];taint;df-generated |
-| System.Net;WebClient;UploadStringAsync;(System.Uri,System.String);Argument[0];Argument[this];taint;df-generated |
-| System.Net;WebClient;UploadStringAsync;(System.Uri,System.String,System.String);Argument[0];Argument[this];taint;df-generated |
 | System.Net;WebClient;UploadStringAsync;(System.Uri,System.String,System.String);Argument[1];Argument[this];taint;df-generated |
-| System.Net;WebClient;UploadStringAsync;(System.Uri,System.String,System.String,System.Object);Argument[0];Argument[this];taint;df-generated |
 | System.Net;WebClient;UploadStringAsync;(System.Uri,System.String,System.String,System.Object);Argument[1];Argument[this];taint;df-generated |
-| System.Net;WebClient;UploadStringTaskAsync;(System.String,System.String);Argument[0];Argument[this];taint;df-generated |
-| System.Net;WebClient;UploadStringTaskAsync;(System.String,System.String,System.String);Argument[0];Argument[this];taint;df-generated |
 | System.Net;WebClient;UploadStringTaskAsync;(System.String,System.String,System.String);Argument[1];Argument[this];taint;df-generated |
-| System.Net;WebClient;UploadStringTaskAsync;(System.Uri,System.String);Argument[0];Argument[this];taint;df-generated |
-| System.Net;WebClient;UploadStringTaskAsync;(System.Uri,System.String,System.String);Argument[0];Argument[this];taint;df-generated |
 | System.Net;WebClient;UploadStringTaskAsync;(System.Uri,System.String,System.String);Argument[1];Argument[this];taint;df-generated |
-| System.Net;WebClient;UploadValues;(System.String,System.Collections.Specialized.NameValueCollection);Argument[0];Argument[this];taint;df-generated |
-| System.Net;WebClient;UploadValues;(System.String,System.String,System.Collections.Specialized.NameValueCollection);Argument[0];Argument[this];taint;df-generated |
 | System.Net;WebClient;UploadValues;(System.String,System.String,System.Collections.Specialized.NameValueCollection);Argument[1];Argument[this];taint;df-generated |
-| System.Net;WebClient;UploadValues;(System.Uri,System.Collections.Specialized.NameValueCollection);Argument[0];Argument[this];taint;df-generated |
-| System.Net;WebClient;UploadValues;(System.Uri,System.String,System.Collections.Specialized.NameValueCollection);Argument[0];Argument[this];taint;df-generated |
 | System.Net;WebClient;UploadValues;(System.Uri,System.String,System.Collections.Specialized.NameValueCollection);Argument[1];Argument[this];taint;df-generated |
-| System.Net;WebClient;UploadValuesAsync;(System.Uri,System.Collections.Specialized.NameValueCollection);Argument[0];Argument[this];taint;df-generated |
-| System.Net;WebClient;UploadValuesAsync;(System.Uri,System.String,System.Collections.Specialized.NameValueCollection);Argument[0];Argument[this];taint;df-generated |
 | System.Net;WebClient;UploadValuesAsync;(System.Uri,System.String,System.Collections.Specialized.NameValueCollection);Argument[1];Argument[this];taint;df-generated |
-| System.Net;WebClient;UploadValuesAsync;(System.Uri,System.String,System.Collections.Specialized.NameValueCollection,System.Object);Argument[0];Argument[this];taint;df-generated |
 | System.Net;WebClient;UploadValuesAsync;(System.Uri,System.String,System.Collections.Specialized.NameValueCollection,System.Object);Argument[1];Argument[this];taint;df-generated |
-| System.Net;WebClient;UploadValuesTaskAsync;(System.String,System.Collections.Specialized.NameValueCollection);Argument[0];Argument[this];taint;df-generated |
-| System.Net;WebClient;UploadValuesTaskAsync;(System.String,System.String,System.Collections.Specialized.NameValueCollection);Argument[0];Argument[this];taint;df-generated |
 | System.Net;WebClient;UploadValuesTaskAsync;(System.String,System.String,System.Collections.Specialized.NameValueCollection);Argument[1];Argument[this];taint;df-generated |
-| System.Net;WebClient;UploadValuesTaskAsync;(System.Uri,System.Collections.Specialized.NameValueCollection);Argument[0];Argument[this];taint;df-generated |
-| System.Net;WebClient;UploadValuesTaskAsync;(System.Uri,System.String,System.Collections.Specialized.NameValueCollection);Argument[0];Argument[this];taint;df-generated |
 | System.Net;WebClient;UploadValuesTaskAsync;(System.Uri,System.String,System.Collections.Specialized.NameValueCollection);Argument[1];Argument[this];taint;df-generated |
 | System.Net;WebClient;add_DownloadDataCompleted;(System.Net.DownloadDataCompletedEventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Net;WebClient;add_DownloadFileCompleted;(System.ComponentModel.AsyncCompletedEventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
@@ -10262,8 +10854,8 @@
 | System.Net;WebClient;remove_UploadStringCompleted;(System.Net.UploadStringCompletedEventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Net;WebClient;remove_UploadValuesCompleted;(System.Net.UploadValuesCompletedEventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Net;WebClient;remove_WriteStreamClosed;(System.Net.WriteStreamClosedEventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
-| System.Net;WebException;WebException;(System.String,System.Exception,System.Net.WebExceptionStatus,System.Net.WebResponse);Argument[3];Argument[this];taint;df-generated |
-| System.Net;WebException;get_Response;();Argument[this];ReturnValue;taint;df-generated |
+| System.Net;WebException;WebException;(System.String,System.Exception,System.Net.WebExceptionStatus,System.Net.WebResponse);Argument[3];Argument[this].SyntheticField[System.Net.WebException._response];value;dfc-generated |
+| System.Net;WebException;get_Response;();Argument[this].SyntheticField[System.Net.WebException._response];ReturnValue;value;dfc-generated |
 | System.Net;WebHeaderCollection;Add;(System.String);Argument[0];Argument[this].Element;value;manual |
 | System.Net;WebHeaderCollection;Add;(System.String,System.String);Argument[0];Argument[this];taint;df-generated |
 | System.Net;WebHeaderCollection;Clear;();Argument[this].WithoutElement;Argument[this];value;manual |
@@ -10276,77 +10868,76 @@
 | System.Net;WebHeaderCollection;get_AllKeys;();Argument[this];ReturnValue;taint;df-generated |
 | System.Net;WebHeaderCollection;get_Item;(System.Net.HttpRequestHeader);Argument[this];ReturnValue;taint;df-generated |
 | System.Net;WebHeaderCollection;get_Item;(System.Net.HttpResponseHeader);Argument[this];ReturnValue;taint;df-generated |
+| System.Net;WebProxy;GetProxy;(System.Uri);Argument[this].Property[System.Net.WebProxy.Address];ReturnValue;value;dfc-generated |
 | System.Net;WebRequest;BeginGetRequestStream;(System.AsyncCallback,System.Object);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Net;WebRequest;BeginGetResponse;(System.AsyncCallback,System.Object);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Net;WebRequest;Create;(System.String);Argument[0];ReturnValue;taint;df-generated |
 | System.Net;WebRequest;Create;(System.Uri);Argument[0];ReturnValue;taint;df-generated |
 | System.Net;WebRequest;CreateDefault;(System.Uri);Argument[0];ReturnValue;taint;df-generated |
-| System.Net;WebRequest;CreateHttp;(System.String);Argument[0];ReturnValue;taint;df-generated |
-| System.Net;WebRequest;CreateHttp;(System.Uri);Argument[0];ReturnValue;taint;df-generated |
-| System.Net;WebRequest;EndGetRequestStream;(System.IAsyncResult);Argument[0];ReturnValue;taint;df-generated |
+| System.Net;WebRequest;CreateHttp;(System.String);Argument[0];ReturnValue.SyntheticField[System.Net.HttpWebRequest._requestUri];taint;dfc-generated |
+| System.Net;WebRequest;CreateHttp;(System.Uri);Argument[0];ReturnValue.SyntheticField[System.Net.HttpWebRequest._requestUri];value;dfc-generated |
 | System.Net;WebRequest;EndGetRequestStream;(System.IAsyncResult);Argument[this];ReturnValue;taint;df-generated |
-| System.Net;WebRequest;EndGetResponse;(System.IAsyncResult);Argument[0];ReturnValue;taint;df-generated |
 | System.Net;WebRequest;EndGetResponse;(System.IAsyncResult);Argument[this];ReturnValue;taint;df-generated |
 | System.Net;WebRequest;GetRequestStream;();Argument[this];ReturnValue;taint;df-generated |
 | System.Net;WebRequest;GetRequestStreamAsync;();Argument[this];ReturnValue;taint;df-generated |
 | System.Net;WebRequest;GetResponse;();Argument[this];ReturnValue;taint;df-generated |
-| System.Net;WebRequest;get_RequestUri;();Argument[this];ReturnValue;taint;df-generated |
 | System.Net;WebResponse;GetResponseStream;();Argument[this];ReturnValue;taint;df-generated |
 | System.Net;WebResponse;get_Headers;();Argument[this];ReturnValue;taint;df-generated |
 | System.Net;WebResponse;get_ResponseUri;();Argument[this];ReturnValue;taint;df-generated |
-| System.Net;WebUtility;HtmlDecode;(System.String);Argument[0];ReturnValue;taint;df-generated |
+| System.Net;WebUtility;HtmlDecode;(System.String);Argument[0];ReturnValue;value;dfc-generated |
 | System.Net;WebUtility;HtmlDecode;(System.String,System.IO.TextWriter);Argument[0];Argument[1];taint;df-generated |
 | System.Net;WebUtility;HtmlEncode;(System.String);Argument[0];ReturnValue;taint;manual |
 | System.Net;WebUtility;HtmlEncode;(System.String,System.IO.TextWriter);Argument[0];ReturnValue;taint;manual |
-| System.Net;WebUtility;UrlDecode;(System.String);Argument[0];ReturnValue;taint;df-generated |
+| System.Net;WebUtility;UrlDecode;(System.String);Argument[0];ReturnValue;value;dfc-generated |
 | System.Net;WebUtility;UrlEncode;(System.String);Argument[0];ReturnValue;taint;manual |
 | System.Net;WriteStreamClosedEventHandler;BeginInvoke;(System.Object,System.Net.WriteStreamClosedEventArgs,System.AsyncCallback,System.Object);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
-| System.Numerics;BigInteger;Abs;(System.Numerics.BigInteger);Argument[0];ReturnValue;taint;df-generated |
-| System.Numerics;BigInteger;DivRem;(System.Numerics.BigInteger,System.Numerics.BigInteger);Argument[0];ReturnValue;taint;df-generated |
-| System.Numerics;BigInteger;DivRem;(System.Numerics.BigInteger,System.Numerics.BigInteger,System.Numerics.BigInteger);Argument[0];ReturnValue;taint;df-generated |
-| System.Numerics;BigInteger;MaxMagnitude;(System.Numerics.BigInteger,System.Numerics.BigInteger);Argument[0];ReturnValue;taint;df-generated |
-| System.Numerics;BigInteger;MaxMagnitude;(System.Numerics.BigInteger,System.Numerics.BigInteger);Argument[1];ReturnValue;taint;df-generated |
-| System.Numerics;BigInteger;MaxMagnitudeNumber;(System.Numerics.BigInteger,System.Numerics.BigInteger);Argument[0];ReturnValue;taint;df-generated |
-| System.Numerics;BigInteger;MaxMagnitudeNumber;(System.Numerics.BigInteger,System.Numerics.BigInteger);Argument[1];ReturnValue;taint;df-generated |
-| System.Numerics;BigInteger;MinMagnitude;(System.Numerics.BigInteger,System.Numerics.BigInteger);Argument[0];ReturnValue;taint;df-generated |
-| System.Numerics;BigInteger;MinMagnitude;(System.Numerics.BigInteger,System.Numerics.BigInteger);Argument[1];ReturnValue;taint;df-generated |
-| System.Numerics;BigInteger;MinMagnitudeNumber;(System.Numerics.BigInteger,System.Numerics.BigInteger);Argument[0];ReturnValue;taint;df-generated |
-| System.Numerics;BigInteger;MinMagnitudeNumber;(System.Numerics.BigInteger,System.Numerics.BigInteger);Argument[1];ReturnValue;taint;df-generated |
-| System.Numerics;BigInteger;Pow;(System.Numerics.BigInteger,System.Int32);Argument[0];ReturnValue;taint;df-generated |
-| System.Numerics;BigInteger;Remainder;(System.Numerics.BigInteger,System.Numerics.BigInteger);Argument[0];ReturnValue;taint;df-generated |
-| System.Numerics;BigInteger;RotateLeft;(System.Numerics.BigInteger,System.Int32);Argument[0];ReturnValue;taint;df-generated |
-| System.Numerics;BigInteger;RotateRight;(System.Numerics.BigInteger,System.Int32);Argument[0];ReturnValue;taint;df-generated |
-| System.Numerics;Complex;MaxMagnitude;(System.Numerics.Complex,System.Numerics.Complex);Argument[0];ReturnValue;taint;df-generated |
-| System.Numerics;Complex;MaxMagnitude;(System.Numerics.Complex,System.Numerics.Complex);Argument[1];ReturnValue;taint;df-generated |
-| System.Numerics;Complex;MaxMagnitudeNumber;(System.Numerics.Complex,System.Numerics.Complex);Argument[0];ReturnValue;taint;df-generated |
-| System.Numerics;Complex;MaxMagnitudeNumber;(System.Numerics.Complex,System.Numerics.Complex);Argument[1];ReturnValue;taint;df-generated |
-| System.Numerics;Complex;MinMagnitude;(System.Numerics.Complex,System.Numerics.Complex);Argument[0];ReturnValue;taint;df-generated |
-| System.Numerics;Complex;MinMagnitude;(System.Numerics.Complex,System.Numerics.Complex);Argument[1];ReturnValue;taint;df-generated |
-| System.Numerics;Complex;MinMagnitudeNumber;(System.Numerics.Complex,System.Numerics.Complex);Argument[0];ReturnValue;taint;df-generated |
-| System.Numerics;Complex;MinMagnitudeNumber;(System.Numerics.Complex,System.Numerics.Complex);Argument[1];ReturnValue;taint;df-generated |
-| System.Numerics;IAdditionOperators<TSelf,TOther,TResult>;op_CheckedAddition;(TSelf,TOther);Argument[0];ReturnValue;taint;df-generated |
-| System.Numerics;IAdditionOperators<TSelf,TOther,TResult>;op_CheckedAddition;(TSelf,TOther);Argument[1];ReturnValue;taint;df-generated |
-| System.Numerics;INumber<TSelf>;Clamp;(TSelf,TSelf,TSelf);Argument[0];ReturnValue;taint;df-generated |
-| System.Numerics;INumber<TSelf>;Clamp;(TSelf,TSelf,TSelf);Argument[1];ReturnValue;taint;df-generated |
-| System.Numerics;INumber<TSelf>;Clamp;(TSelf,TSelf,TSelf);Argument[2];ReturnValue;taint;df-generated |
-| System.Numerics;INumber<TSelf>;CopySign;(TSelf,TSelf);Argument[0];ReturnValue;taint;df-generated |
-| System.Numerics;INumber<TSelf>;Max;(TSelf,TSelf);Argument[0];ReturnValue;taint;df-generated |
-| System.Numerics;INumber<TSelf>;Max;(TSelf,TSelf);Argument[1];ReturnValue;taint;df-generated |
-| System.Numerics;INumber<TSelf>;MaxNumber;(TSelf,TSelf);Argument[0];ReturnValue;taint;df-generated |
-| System.Numerics;INumber<TSelf>;MaxNumber;(TSelf,TSelf);Argument[1];ReturnValue;taint;df-generated |
-| System.Numerics;INumber<TSelf>;Min;(TSelf,TSelf);Argument[0];ReturnValue;taint;df-generated |
-| System.Numerics;INumber<TSelf>;Min;(TSelf,TSelf);Argument[1];ReturnValue;taint;df-generated |
-| System.Numerics;INumber<TSelf>;MinNumber;(TSelf,TSelf);Argument[0];ReturnValue;taint;df-generated |
-| System.Numerics;INumber<TSelf>;MinNumber;(TSelf,TSelf);Argument[1];ReturnValue;taint;df-generated |
-| System.Numerics;INumberBase<TSelf>;CreateChecked<TOther>;(TOther);Argument[0];ReturnValue;taint;df-generated |
-| System.Numerics;INumberBase<TSelf>;CreateSaturating<TOther>;(TOther);Argument[0];ReturnValue;taint;df-generated |
-| System.Numerics;INumberBase<TSelf>;CreateTruncating<TOther>;(TOther);Argument[0];ReturnValue;taint;df-generated |
-| System.Numerics;Plane;Normalize;(System.Numerics.Plane);Argument[0];ReturnValue;taint;df-generated |
-| System.Numerics;Plane;Plane;(System.Numerics.Vector3,System.Single);Argument[0];Argument[this];taint;df-generated |
-| System.Numerics;Plane;ToString;();Argument[this];ReturnValue;taint;df-generated |
-| System.Numerics;Vector;Abs<T>;(System.Numerics.Vector<T>);Argument[0];ReturnValue;taint;df-generated |
-| System.Numerics;Vector;WithElement<T>;(System.Numerics.Vector<T>,System.Int32,T);Argument[0];ReturnValue;taint;df-generated |
-| System.Numerics;Vector<T>;op_UnaryPlus;(System.Numerics.Vector<T>);Argument[0];ReturnValue;taint;df-generated |
+| System.Numerics;BigInteger;Abs;(System.Numerics.BigInteger);Argument[0];ReturnValue;value;dfc-generated |
+| System.Numerics;BigInteger;DivRem;(System.Numerics.BigInteger,System.Numerics.BigInteger);Argument[0];ReturnValue.Field[System.ValueTuple`2.Item2];value;dfc-generated |
+| System.Numerics;BigInteger;DivRem;(System.Numerics.BigInteger,System.Numerics.BigInteger,System.Numerics.BigInteger);Argument[0];ReturnValue;value;dfc-generated |
+| System.Numerics;BigInteger;MaxMagnitude;(System.Numerics.BigInteger,System.Numerics.BigInteger);Argument[0];ReturnValue;value;dfc-generated |
+| System.Numerics;BigInteger;MaxMagnitude;(System.Numerics.BigInteger,System.Numerics.BigInteger);Argument[1];ReturnValue;value;dfc-generated |
+| System.Numerics;BigInteger;MaxMagnitudeNumber;(System.Numerics.BigInteger,System.Numerics.BigInteger);Argument[0];ReturnValue;value;dfc-generated |
+| System.Numerics;BigInteger;MaxMagnitudeNumber;(System.Numerics.BigInteger,System.Numerics.BigInteger);Argument[1];ReturnValue;value;dfc-generated |
+| System.Numerics;BigInteger;MinMagnitude;(System.Numerics.BigInteger,System.Numerics.BigInteger);Argument[0];ReturnValue;value;dfc-generated |
+| System.Numerics;BigInteger;MinMagnitude;(System.Numerics.BigInteger,System.Numerics.BigInteger);Argument[1];ReturnValue;value;dfc-generated |
+| System.Numerics;BigInteger;MinMagnitudeNumber;(System.Numerics.BigInteger,System.Numerics.BigInteger);Argument[0];ReturnValue;value;dfc-generated |
+| System.Numerics;BigInteger;MinMagnitudeNumber;(System.Numerics.BigInteger,System.Numerics.BigInteger);Argument[1];ReturnValue;value;dfc-generated |
+| System.Numerics;BigInteger;Pow;(System.Numerics.BigInteger,System.Int32);Argument[0];ReturnValue;value;dfc-generated |
+| System.Numerics;BigInteger;Remainder;(System.Numerics.BigInteger,System.Numerics.BigInteger);Argument[0];ReturnValue;value;dfc-generated |
+| System.Numerics;BigInteger;RotateLeft;(System.Numerics.BigInteger,System.Int32);Argument[0];ReturnValue;value;dfc-generated |
+| System.Numerics;BigInteger;RotateRight;(System.Numerics.BigInteger,System.Int32);Argument[0];ReturnValue;value;dfc-generated |
+| System.Numerics;Complex;MaxMagnitude;(System.Numerics.Complex,System.Numerics.Complex);Argument[0];ReturnValue;value;dfc-generated |
+| System.Numerics;Complex;MaxMagnitude;(System.Numerics.Complex,System.Numerics.Complex);Argument[1];ReturnValue;value;dfc-generated |
+| System.Numerics;Complex;MaxMagnitudeNumber;(System.Numerics.Complex,System.Numerics.Complex);Argument[0];ReturnValue;value;dfc-generated |
+| System.Numerics;Complex;MaxMagnitudeNumber;(System.Numerics.Complex,System.Numerics.Complex);Argument[1];ReturnValue;value;dfc-generated |
+| System.Numerics;Complex;MinMagnitude;(System.Numerics.Complex,System.Numerics.Complex);Argument[0];ReturnValue;value;dfc-generated |
+| System.Numerics;Complex;MinMagnitude;(System.Numerics.Complex,System.Numerics.Complex);Argument[1];ReturnValue;value;dfc-generated |
+| System.Numerics;Complex;MinMagnitudeNumber;(System.Numerics.Complex,System.Numerics.Complex);Argument[0];ReturnValue;value;dfc-generated |
+| System.Numerics;Complex;MinMagnitudeNumber;(System.Numerics.Complex,System.Numerics.Complex);Argument[1];ReturnValue;value;dfc-generated |
+| System.Numerics;IAdditionOperators<TSelf,TOther,TResult>;op_CheckedAddition;(TSelf,TOther);Argument[0];ReturnValue;taint;dfc-generated |
+| System.Numerics;IAdditionOperators<TSelf,TOther,TResult>;op_CheckedAddition;(TSelf,TOther);Argument[1];ReturnValue;taint;dfc-generated |
+| System.Numerics;INumber<TSelf>;Clamp;(TSelf,TSelf,TSelf);Argument[0];ReturnValue;value;dfc-generated |
+| System.Numerics;INumber<TSelf>;Clamp;(TSelf,TSelf,TSelf);Argument[1];ReturnValue;value;dfc-generated |
+| System.Numerics;INumber<TSelf>;Clamp;(TSelf,TSelf,TSelf);Argument[2];ReturnValue;value;dfc-generated |
+| System.Numerics;INumber<TSelf>;CopySign;(TSelf,TSelf);Argument[0];ReturnValue;value;dfc-generated |
+| System.Numerics;INumber<TSelf>;Max;(TSelf,TSelf);Argument[0];ReturnValue;value;dfc-generated |
+| System.Numerics;INumber<TSelf>;Max;(TSelf,TSelf);Argument[1];ReturnValue;value;dfc-generated |
+| System.Numerics;INumber<TSelf>;MaxNumber;(TSelf,TSelf);Argument[0];ReturnValue;value;dfc-generated |
+| System.Numerics;INumber<TSelf>;MaxNumber;(TSelf,TSelf);Argument[1];ReturnValue;value;dfc-generated |
+| System.Numerics;INumber<TSelf>;Min;(TSelf,TSelf);Argument[0];ReturnValue;value;dfc-generated |
+| System.Numerics;INumber<TSelf>;Min;(TSelf,TSelf);Argument[1];ReturnValue;value;dfc-generated |
+| System.Numerics;INumber<TSelf>;MinNumber;(TSelf,TSelf);Argument[0];ReturnValue;value;dfc-generated |
+| System.Numerics;INumber<TSelf>;MinNumber;(TSelf,TSelf);Argument[1];ReturnValue;value;dfc-generated |
+| System.Numerics;INumberBase<TSelf>;CreateChecked<TOther>;(TOther);Argument[0];ReturnValue;value;dfc-generated |
+| System.Numerics;INumberBase<TSelf>;CreateSaturating<TOther>;(TOther);Argument[0];ReturnValue;value;dfc-generated |
+| System.Numerics;INumberBase<TSelf>;CreateTruncating<TOther>;(TOther);Argument[0];ReturnValue;value;dfc-generated |
+| System.Numerics;Plane;Normalize;(System.Numerics.Plane);Argument[0];ReturnValue;value;dfc-generated |
+| System.Numerics;Plane;Plane;(System.Numerics.Vector3,System.Single);Argument[0];Argument[this].Field[System.Numerics.Plane.Normal];value;dfc-generated |
+| System.Numerics;Plane;ToString;();Argument[this].Field[System.Numerics.Plane.Normal];ReturnValue;taint;dfc-generated |
+| System.Numerics;Vector;Abs<T>;(System.Numerics.Vector<T>);Argument[0];ReturnValue;value;dfc-generated |
+| System.Numerics;Vector;StoreUnsafe<T>;(System.Numerics.Vector<T>,T);Argument[1];ReturnValue;value;dfc-generated |
+| System.Numerics;Vector;WithElement<T>;(System.Numerics.Vector<T>,System.Int32,T);Argument[0];ReturnValue;value;dfc-generated |
+| System.Numerics;Vector<T>;op_UnaryPlus;(System.Numerics.Vector<T>);Argument[0];ReturnValue;value;dfc-generated |
 | System.Reflection.Emit;AssemblyBuilder;DefineDynamicAssembly;(System.Reflection.AssemblyName,System.Reflection.Emit.AssemblyBuilderAccess);Argument[0];ReturnValue;taint;df-generated |
 | System.Reflection.Emit;AssemblyBuilder;DefineDynamicAssembly;(System.Reflection.AssemblyName,System.Reflection.Emit.AssemblyBuilderAccess,System.Collections.Generic.IEnumerable<System.Reflection.Emit.CustomAttributeBuilder>);Argument[0];ReturnValue;taint;df-generated |
 | System.Reflection.Emit;AssemblyBuilder;DefineDynamicModuleCore;(System.String);Argument[0];Argument[this];taint;df-generated |
@@ -10373,18 +10964,26 @@
 | System.Reflection.Emit;CustomAttributeBuilder;CustomAttributeBuilder;(System.Reflection.ConstructorInfo,System.Object[],System.Reflection.PropertyInfo[],System.Object[],System.Reflection.FieldInfo[],System.Object[]);Argument[4].Element;Argument[this];taint;df-generated |
 | System.Reflection.Emit;CustomAttributeBuilder;CustomAttributeBuilder;(System.Reflection.ConstructorInfo,System.Object[],System.Reflection.PropertyInfo[],System.Object[],System.Reflection.FieldInfo[],System.Object[]);Argument[5].Element;Argument[this];taint;df-generated |
 | System.Reflection.Emit;DynamicILInfo;get_DynamicMethod;();Argument[this];ReturnValue;taint;df-generated |
-| System.Reflection.Emit;DynamicMethod;DynamicMethod;(System.String,System.Reflection.MethodAttributes,System.Reflection.CallingConventions,System.Type,System.Type[],System.Reflection.Module,System.Boolean);Argument[0];Argument[this];taint;df-generated |
-| System.Reflection.Emit;DynamicMethod;DynamicMethod;(System.String,System.Reflection.MethodAttributes,System.Reflection.CallingConventions,System.Type,System.Type[],System.Reflection.Module,System.Boolean);Argument[5];Argument[this];taint;df-generated |
-| System.Reflection.Emit;DynamicMethod;DynamicMethod;(System.String,System.Reflection.MethodAttributes,System.Reflection.CallingConventions,System.Type,System.Type[],System.Type,System.Boolean);Argument[0];Argument[this];taint;df-generated |
-| System.Reflection.Emit;DynamicMethod;DynamicMethod;(System.String,System.Type,System.Type[]);Argument[0];Argument[this];taint;df-generated |
-| System.Reflection.Emit;DynamicMethod;DynamicMethod;(System.String,System.Type,System.Type[],System.Boolean);Argument[0];Argument[this];taint;df-generated |
-| System.Reflection.Emit;DynamicMethod;DynamicMethod;(System.String,System.Type,System.Type[],System.Reflection.Module);Argument[0];Argument[this];taint;df-generated |
-| System.Reflection.Emit;DynamicMethod;DynamicMethod;(System.String,System.Type,System.Type[],System.Reflection.Module);Argument[3];Argument[this];taint;df-generated |
-| System.Reflection.Emit;DynamicMethod;DynamicMethod;(System.String,System.Type,System.Type[],System.Reflection.Module,System.Boolean);Argument[0];Argument[this];taint;df-generated |
-| System.Reflection.Emit;DynamicMethod;DynamicMethod;(System.String,System.Type,System.Type[],System.Reflection.Module,System.Boolean);Argument[3];Argument[this];taint;df-generated |
-| System.Reflection.Emit;DynamicMethod;DynamicMethod;(System.String,System.Type,System.Type[],System.Type);Argument[0];Argument[this];taint;df-generated |
-| System.Reflection.Emit;DynamicMethod;DynamicMethod;(System.String,System.Type,System.Type[],System.Type,System.Boolean);Argument[0];Argument[this];taint;df-generated |
-| System.Reflection.Emit;EnumBuilder;get_UnderlyingField;();Argument[this];ReturnValue;taint;df-generated |
+| System.Reflection.Emit;DynamicMethod;DynamicMethod;(System.String,System.Reflection.MethodAttributes,System.Reflection.CallingConventions,System.Type,System.Type[],System.Reflection.Module,System.Boolean);Argument[0];Argument[this].SyntheticField[System.Reflection.Emit.DynamicMethod._name];value;dfc-generated |
+| System.Reflection.Emit;DynamicMethod;DynamicMethod;(System.String,System.Reflection.MethodAttributes,System.Reflection.CallingConventions,System.Type,System.Type[],System.Reflection.Module,System.Boolean);Argument[5];Argument[this].SyntheticField[System.Reflection.Emit.DynamicMethod._module];value;dfc-generated |
+| System.Reflection.Emit;DynamicMethod;DynamicMethod;(System.String,System.Reflection.MethodAttributes,System.Reflection.CallingConventions,System.Type,System.Type[],System.Type,System.Boolean);Argument[0];Argument[this].SyntheticField[System.Reflection.Emit.DynamicMethod._name];value;dfc-generated |
+| System.Reflection.Emit;DynamicMethod;DynamicMethod;(System.String,System.Type,System.Type[]);Argument[0];Argument[this].SyntheticField[System.Reflection.Emit.DynamicMethod._name];value;dfc-generated |
+| System.Reflection.Emit;DynamicMethod;DynamicMethod;(System.String,System.Type,System.Type[],System.Boolean);Argument[0];Argument[this].SyntheticField[System.Reflection.Emit.DynamicMethod._name];value;dfc-generated |
+| System.Reflection.Emit;DynamicMethod;DynamicMethod;(System.String,System.Type,System.Type[],System.Reflection.Module);Argument[0];Argument[this].SyntheticField[System.Reflection.Emit.DynamicMethod._name];value;dfc-generated |
+| System.Reflection.Emit;DynamicMethod;DynamicMethod;(System.String,System.Type,System.Type[],System.Reflection.Module);Argument[3];Argument[this].SyntheticField[System.Reflection.Emit.DynamicMethod._module];value;dfc-generated |
+| System.Reflection.Emit;DynamicMethod;DynamicMethod;(System.String,System.Type,System.Type[],System.Reflection.Module,System.Boolean);Argument[0];Argument[this].SyntheticField[System.Reflection.Emit.DynamicMethod._name];value;dfc-generated |
+| System.Reflection.Emit;DynamicMethod;DynamicMethod;(System.String,System.Type,System.Type[],System.Reflection.Module,System.Boolean);Argument[3];Argument[this].SyntheticField[System.Reflection.Emit.DynamicMethod._module];value;dfc-generated |
+| System.Reflection.Emit;DynamicMethod;DynamicMethod;(System.String,System.Type,System.Type[],System.Type);Argument[0];Argument[this].SyntheticField[System.Reflection.Emit.DynamicMethod._name];value;dfc-generated |
+| System.Reflection.Emit;DynamicMethod;DynamicMethod;(System.String,System.Type,System.Type[],System.Type,System.Boolean);Argument[0];Argument[this].SyntheticField[System.Reflection.Emit.DynamicMethod._name];value;dfc-generated |
+| System.Reflection.Emit;DynamicMethod;GetParameters;();Argument[this];ReturnValue.Element.Field[System.Reflection.ParameterInfo.MemberImpl];value;df-generated |
+| System.Reflection.Emit;DynamicMethod;GetParameters;();Argument[this];ReturnValue.Element.Field[System.Reflection.ParameterInfo.MemberImpl];value;dfc-generated |
+| System.Reflection.Emit;DynamicMethod;get_Module;();Argument[this].SyntheticField[System.Reflection.Emit.DynamicMethod._module];ReturnValue;value;df-generated |
+| System.Reflection.Emit;DynamicMethod;get_Module;();Argument[this].SyntheticField[System.Reflection.Emit.DynamicMethod._module];ReturnValue;value;dfc-generated |
+| System.Reflection.Emit;DynamicMethod;get_Name;();Argument[this].SyntheticField[System.Reflection.Emit.DynamicMethod._name];ReturnValue;value;df-generated |
+| System.Reflection.Emit;DynamicMethod;get_Name;();Argument[this].SyntheticField[System.Reflection.Emit.DynamicMethod._name];ReturnValue;value;dfc-generated |
+| System.Reflection.Emit;DynamicMethod;get_ReturnParameter;();Argument[this];ReturnValue.Field[System.Reflection.ParameterInfo.MemberImpl];value;df-generated |
+| System.Reflection.Emit;DynamicMethod;get_ReturnParameter;();Argument[this];ReturnValue.Field[System.Reflection.ParameterInfo.MemberImpl];value;dfc-generated |
+| System.Reflection.Emit;EnumBuilder;get_UnderlyingField;();Argument[this].Property[System.Reflection.Emit.EnumBuilder.UnderlyingFieldCore];ReturnValue;value;dfc-generated |
 | System.Reflection.Emit;EnumBuilder;get_UnderlyingFieldCore;();Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection.Emit;EventBuilder;AddOtherMethodCore;(System.Reflection.Emit.MethodBuilder);Argument[0];Argument[this];taint;df-generated |
 | System.Reflection.Emit;EventBuilder;SetAddOnMethodCore;(System.Reflection.Emit.MethodBuilder);Argument[0];Argument[this];taint;df-generated |
@@ -10428,9 +11027,11 @@
 | System.Reflection.Emit;ModuleBuilder;DefineType;(System.String,System.Reflection.TypeAttributes,System.Type,System.Type[]);Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection.Emit;ModuleBuilder;DefineTypeCore;(System.String,System.Reflection.TypeAttributes,System.Type,System.Type[],System.Reflection.Emit.PackingSize,System.Int32);Argument[0];ReturnValue;taint;df-generated |
 | System.Reflection.Emit;ModuleBuilder;DefineTypeCore;(System.String,System.Reflection.TypeAttributes,System.Type,System.Type[],System.Reflection.Emit.PackingSize,System.Int32);Argument[this];ReturnValue;taint;df-generated |
+| System.Reflection.Emit;ModuleBuilder;GetArrayMethod;(System.Type,System.String,System.Reflection.CallingConventions,System.Type,System.Type[]);Argument[1];ReturnValue;taint;df-generated |
+| System.Reflection.Emit;ModuleBuilder;GetArrayMethod;(System.Type,System.String,System.Reflection.CallingConventions,System.Type,System.Type[]);Argument[4].Element;ReturnValue;taint;df-generated |
 | System.Reflection.Emit;ModuleBuilder;GetArrayMethodCore;(System.Type,System.String,System.Reflection.CallingConventions,System.Type,System.Type[]);Argument[1];ReturnValue;taint;df-generated |
 | System.Reflection.Emit;ModuleBuilder;GetArrayMethodCore;(System.Type,System.String,System.Reflection.CallingConventions,System.Type,System.Type[]);Argument[4].Element;ReturnValue;taint;df-generated |
-| System.Reflection.Emit;OpCode;ToString;();Argument[this];ReturnValue;taint;df-generated |
+| System.Reflection.Emit;OpCode;ToString;();Argument[this].Property[System.Reflection.Emit.OpCode.Name];ReturnValue;value;dfc-generated |
 | System.Reflection.Emit;ParameterBuilder;SetConstant;(System.Object);Argument[0];Argument[this];taint;df-generated |
 | System.Reflection.Emit;ParameterBuilder;SetCustomAttribute;(System.Reflection.ConstructorInfo,System.Byte[]);Argument[1].Element;Argument[this];taint;df-generated |
 | System.Reflection.Emit;ParameterBuilder;SetCustomAttribute;(System.Reflection.Emit.CustomAttributeBuilder);Argument[0];Argument[this];taint;df-generated |
@@ -10444,7 +11045,7 @@
 | System.Reflection.Emit;SignatureHelper;GetLocalVarSigHelper;(System.Reflection.Module);Argument[0];ReturnValue;taint;df-generated |
 | System.Reflection.Emit;SignatureHelper;GetMethodSigHelper;(System.Reflection.Module,System.Reflection.CallingConventions,System.Type);Argument[0];ReturnValue;taint;df-generated |
 | System.Reflection.Emit;SignatureHelper;GetMethodSigHelper;(System.Reflection.Module,System.Type,System.Type[]);Argument[0];ReturnValue;taint;df-generated |
-| System.Reflection.Emit;TypeBuilder;CreateTypeInfoCore;();Argument[this];ReturnValue;value;df-generated |
+| System.Reflection.Emit;TypeBuilder;CreateTypeInfoCore;();Argument[this];ReturnValue;value;dfc-generated |
 | System.Reflection.Emit;TypeBuilder;DefineConstructorCore;(System.Reflection.MethodAttributes,System.Reflection.CallingConventions,System.Type[],System.Type[][],System.Type[][]);Argument[3].Element;ReturnValue;taint;df-generated |
 | System.Reflection.Emit;TypeBuilder;DefineConstructorCore;(System.Reflection.MethodAttributes,System.Reflection.CallingConventions,System.Type[],System.Type[][],System.Type[][]);Argument[4].Element;ReturnValue;taint;df-generated |
 | System.Reflection.Emit;TypeBuilder;DefineConstructorCore;(System.Reflection.MethodAttributes,System.Reflection.CallingConventions,System.Type[],System.Type[][],System.Type[][]);Argument[this];ReturnValue;taint;df-generated |
@@ -10480,12 +11081,12 @@
 | System.Reflection.Emit;TypeBuilder;GetMethod;(System.Type,System.Reflection.MethodInfo);Argument[1];ReturnValue;taint;df-generated |
 | System.Reflection.Metadata.Ecma335;BlobEncoder;CustomAttributeSignature;(System.Action<System.Reflection.Metadata.Ecma335.FixedArgumentsEncoder>,System.Action<System.Reflection.Metadata.Ecma335.CustomAttributeNamedArgumentsEncoder>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Reflection.Metadata.Ecma335;BlobEncoder;CustomAttributeSignature;(System.Action<System.Reflection.Metadata.Ecma335.FixedArgumentsEncoder>,System.Action<System.Reflection.Metadata.Ecma335.CustomAttributeNamedArgumentsEncoder>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
-| System.Reflection.Metadata.Ecma335;CustomModifiersEncoder;AddModifier;(System.Reflection.Metadata.EntityHandle,System.Boolean);Argument[this];ReturnValue;value;df-generated |
-| System.Reflection.Metadata.Ecma335;ExceptionRegionEncoder;Add;(System.Reflection.Metadata.ExceptionRegionKind,System.Int32,System.Int32,System.Int32,System.Int32,System.Reflection.Metadata.EntityHandle,System.Int32);Argument[this];ReturnValue;value;df-generated |
-| System.Reflection.Metadata.Ecma335;ExceptionRegionEncoder;AddCatch;(System.Int32,System.Int32,System.Int32,System.Int32,System.Reflection.Metadata.EntityHandle);Argument[this];ReturnValue;taint;df-generated |
-| System.Reflection.Metadata.Ecma335;ExceptionRegionEncoder;AddFault;(System.Int32,System.Int32,System.Int32,System.Int32);Argument[this];ReturnValue;taint;df-generated |
-| System.Reflection.Metadata.Ecma335;ExceptionRegionEncoder;AddFilter;(System.Int32,System.Int32,System.Int32,System.Int32,System.Int32);Argument[this];ReturnValue;taint;df-generated |
-| System.Reflection.Metadata.Ecma335;ExceptionRegionEncoder;AddFinally;(System.Int32,System.Int32,System.Int32,System.Int32);Argument[this];ReturnValue;taint;df-generated |
+| System.Reflection.Metadata.Ecma335;CustomModifiersEncoder;AddModifier;(System.Reflection.Metadata.EntityHandle,System.Boolean);Argument[this];ReturnValue;value;dfc-generated |
+| System.Reflection.Metadata.Ecma335;ExceptionRegionEncoder;Add;(System.Reflection.Metadata.ExceptionRegionKind,System.Int32,System.Int32,System.Int32,System.Int32,System.Reflection.Metadata.EntityHandle,System.Int32);Argument[this];ReturnValue;value;dfc-generated |
+| System.Reflection.Metadata.Ecma335;ExceptionRegionEncoder;AddCatch;(System.Int32,System.Int32,System.Int32,System.Int32,System.Reflection.Metadata.EntityHandle);Argument[this];ReturnValue;value;dfc-generated |
+| System.Reflection.Metadata.Ecma335;ExceptionRegionEncoder;AddFault;(System.Int32,System.Int32,System.Int32,System.Int32);Argument[this];ReturnValue;value;dfc-generated |
+| System.Reflection.Metadata.Ecma335;ExceptionRegionEncoder;AddFilter;(System.Int32,System.Int32,System.Int32,System.Int32,System.Int32);Argument[this];ReturnValue;value;dfc-generated |
+| System.Reflection.Metadata.Ecma335;ExceptionRegionEncoder;AddFinally;(System.Int32,System.Int32,System.Int32,System.Int32);Argument[this];ReturnValue;value;dfc-generated |
 | System.Reflection.Metadata.Ecma335;InstructionEncoder;Switch;(System.Int32);Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection.Metadata.Ecma335;LiteralEncoder;TaggedScalar;(System.Action<System.Reflection.Metadata.Ecma335.CustomAttributeElementTypeEncoder>,System.Action<System.Reflection.Metadata.Ecma335.ScalarEncoder>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Reflection.Metadata.Ecma335;LiteralEncoder;TaggedScalar;(System.Action<System.Reflection.Metadata.Ecma335.CustomAttributeElementTypeEncoder>,System.Action<System.Reflection.Metadata.Ecma335.ScalarEncoder>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
@@ -10506,31 +11107,40 @@
 | System.Reflection.Metadata.Ecma335;NamedArgumentsEncoder;AddArgument;(System.Boolean,System.Action<System.Reflection.Metadata.Ecma335.NamedArgumentTypeEncoder>,System.Action<System.Reflection.Metadata.Ecma335.NameEncoder>,System.Action<System.Reflection.Metadata.Ecma335.LiteralEncoder>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
 | System.Reflection.Metadata.Ecma335;NamedArgumentsEncoder;AddArgument;(System.Boolean,System.Action<System.Reflection.Metadata.Ecma335.NamedArgumentTypeEncoder>,System.Action<System.Reflection.Metadata.Ecma335.NameEncoder>,System.Action<System.Reflection.Metadata.Ecma335.LiteralEncoder>);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
 | System.Reflection.Metadata.Ecma335;NamedArgumentsEncoder;AddArgument;(System.Boolean,System.Action<System.Reflection.Metadata.Ecma335.NamedArgumentTypeEncoder>,System.Action<System.Reflection.Metadata.Ecma335.NameEncoder>,System.Action<System.Reflection.Metadata.Ecma335.LiteralEncoder>);Argument[3];Argument[3].Parameter[delegate-self];value;hq-generated |
-| System.Reflection.Metadata.Ecma335;PermissionSetEncoder;AddPermission;(System.String,System.Collections.Immutable.ImmutableArray<System.Byte>);Argument[this];ReturnValue;value;df-generated |
-| System.Reflection.Metadata.Ecma335;PermissionSetEncoder;AddPermission;(System.String,System.Reflection.Metadata.BlobBuilder);Argument[this];ReturnValue;value;df-generated |
+| System.Reflection.Metadata.Ecma335;PermissionSetEncoder;AddPermission;(System.String,System.Collections.Immutable.ImmutableArray<System.Byte>);Argument[this];ReturnValue;value;dfc-generated |
+| System.Reflection.Metadata.Ecma335;PermissionSetEncoder;AddPermission;(System.String,System.Reflection.Metadata.BlobBuilder);Argument[this];ReturnValue;value;dfc-generated |
 | System.Reflection.Metadata.Ecma335;PortablePdbBuilder;PortablePdbBuilder;(System.Reflection.Metadata.Ecma335.MetadataBuilder,System.Collections.Immutable.ImmutableArray<System.Int32>,System.Reflection.Metadata.MethodDefinitionHandle,System.Func<System.Collections.Generic.IEnumerable<System.Reflection.Metadata.Blob>,System.Reflection.Metadata.BlobContentId>);Argument[3];Argument[3].Parameter[delegate-self];value;hq-generated |
 | System.Reflection.Metadata.Ecma335;PortablePdbBuilder;Serialize;(System.Reflection.Metadata.BlobBuilder);Argument[0];Argument[this];taint;df-generated |
-| System.Reflection.Metadata.Ecma335;SignatureDecoder<TType,TGenericContext>;DecodeFieldSignature;(System.Reflection.Metadata.BlobReader);Argument[this];ReturnValue;taint;df-generated |
-| System.Reflection.Metadata.Ecma335;SignatureDecoder<TType,TGenericContext>;DecodeLocalSignature;(System.Reflection.Metadata.BlobReader);Argument[this];ReturnValue;taint;df-generated |
-| System.Reflection.Metadata.Ecma335;SignatureDecoder<TType,TGenericContext>;DecodeMethodSpecificationSignature;(System.Reflection.Metadata.BlobReader);Argument[this];ReturnValue;taint;df-generated |
-| System.Reflection.Metadata.Ecma335;SignatureDecoder<TType,TGenericContext>;DecodeType;(System.Reflection.Metadata.BlobReader,System.Boolean);Argument[this];ReturnValue;taint;df-generated |
+| System.Reflection.Metadata.Ecma335;PortablePdbBuilder;Serialize;(System.Reflection.Metadata.BlobBuilder);Argument[this];ReturnValue;taint;df-generated |
+| System.Reflection.Metadata.Ecma335;SignatureDecoder<TType,TGenericContext>;DecodeFieldSignature;(System.Reflection.Metadata.BlobReader);Argument[0];ReturnValue;value;dfc-generated |
+| System.Reflection.Metadata.Ecma335;SignatureDecoder<TType,TGenericContext>;DecodeLocalSignature;(System.Reflection.Metadata.BlobReader);Argument[0];ReturnValue;value;dfc-generated |
+| System.Reflection.Metadata.Ecma335;SignatureDecoder<TType,TGenericContext>;DecodeMethodSignature;(System.Reflection.Metadata.BlobReader);Argument[0];ReturnValue;value;dfc-generated |
+| System.Reflection.Metadata.Ecma335;SignatureDecoder<TType,TGenericContext>;DecodeMethodSpecificationSignature;(System.Reflection.Metadata.BlobReader);Argument[0];ReturnValue;value;dfc-generated |
+| System.Reflection.Metadata.Ecma335;SignatureDecoder<TType,TGenericContext>;DecodeType;(System.Reflection.Metadata.BlobReader,System.Boolean);Argument[0];ReturnValue;value;dfc-generated |
 | System.Reflection.Metadata.Ecma335;SignatureDecoder<TType,TGenericContext>;SignatureDecoder;(System.Reflection.Metadata.ISignatureTypeProvider<TType,TGenericContext>,System.Reflection.Metadata.MetadataReader,TGenericContext);Argument[0];Argument[this];taint;df-generated |
 | System.Reflection.Metadata.Ecma335;SignatureDecoder<TType,TGenericContext>;SignatureDecoder;(System.Reflection.Metadata.ISignatureTypeProvider<TType,TGenericContext>,System.Reflection.Metadata.MetadataReader,TGenericContext);Argument[1];Argument[this];taint;df-generated |
 | System.Reflection.Metadata.Ecma335;SignatureDecoder<TType,TGenericContext>;SignatureDecoder;(System.Reflection.Metadata.ISignatureTypeProvider<TType,TGenericContext>,System.Reflection.Metadata.MetadataReader,TGenericContext);Argument[2];Argument[this];taint;df-generated |
+| System.Reflection.Metadata.Ecma335;SignatureTypeEncoder;Array;(System.Action<System.Reflection.Metadata.Ecma335.SignatureTypeEncoder>,System.Action<System.Reflection.Metadata.Ecma335.ArrayShapeEncoder>);Argument[0];Argument[0].Parameter[delegate-self];value;dfc-generated |
 | System.Reflection.Metadata.Ecma335;SignatureTypeEncoder;Array;(System.Action<System.Reflection.Metadata.Ecma335.SignatureTypeEncoder>,System.Action<System.Reflection.Metadata.Ecma335.ArrayShapeEncoder>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
+| System.Reflection.Metadata.Ecma335;SignatureTypeEncoder;Array;(System.Action<System.Reflection.Metadata.Ecma335.SignatureTypeEncoder>,System.Action<System.Reflection.Metadata.Ecma335.ArrayShapeEncoder>);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | System.Reflection.Metadata.Ecma335;SignatureTypeEncoder;Array;(System.Action<System.Reflection.Metadata.Ecma335.SignatureTypeEncoder>,System.Action<System.Reflection.Metadata.Ecma335.ArrayShapeEncoder>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
-| System.Reflection.Metadata.Ecma335;SignatureTypeEncoder;Array;(System.Reflection.Metadata.Ecma335.SignatureTypeEncoder,System.Reflection.Metadata.Ecma335.ArrayShapeEncoder);Argument[this];ReturnValue;taint;df-generated |
-| System.Reflection.Metadata.Ecma335;SignatureTypeEncoder;Pointer;();Argument[this];ReturnValue;value;df-generated |
-| System.Reflection.Metadata.Ecma335;SignatureTypeEncoder;SZArray;();Argument[this];ReturnValue;value;df-generated |
-| System.Reflection.Metadata;AssemblyDefinition;GetAssemblyName;();Argument[this];ReturnValue;taint;df-generated |
+| System.Reflection.Metadata.Ecma335;SignatureTypeEncoder;Array;(System.Action<System.Reflection.Metadata.Ecma335.SignatureTypeEncoder>,System.Action<System.Reflection.Metadata.Ecma335.ArrayShapeEncoder>);Argument[this];Argument[0].Parameter[0];value;dfc-generated |
+| System.Reflection.Metadata.Ecma335;SignatureTypeEncoder;Array;(System.Action<System.Reflection.Metadata.Ecma335.SignatureTypeEncoder>,System.Action<System.Reflection.Metadata.Ecma335.ArrayShapeEncoder>);Argument[this];Argument[0].Parameter[0];value;hq-generated |
+| System.Reflection.Metadata.Ecma335;SignatureTypeEncoder;Array;(System.Reflection.Metadata.Ecma335.SignatureTypeEncoder,System.Reflection.Metadata.Ecma335.ArrayShapeEncoder);Argument[this];ReturnValue;value;dfc-generated |
+| System.Reflection.Metadata.Ecma335;SignatureTypeEncoder;Pointer;();Argument[this];ReturnValue;value;dfc-generated |
+| System.Reflection.Metadata.Ecma335;SignatureTypeEncoder;SZArray;();Argument[this];ReturnValue;value;dfc-generated |
 | System.Reflection.Metadata;AssemblyDefinition;GetCustomAttributes;();Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection.Metadata;AssemblyDefinition;GetDeclarativeSecurityAttributes;();Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection.Metadata;AssemblyFile;GetCustomAttributes;();Argument[this];ReturnValue;taint;df-generated |
-| System.Reflection.Metadata;AssemblyReference;GetAssemblyName;();Argument[this];ReturnValue;taint;df-generated |
+| System.Reflection.Metadata;AssemblyFileHandleCollection+Enumerator;get_Current;();Argument[this].Property[System.Reflection.Metadata.AssemblyFileHandleCollection+Enumerator.Current];ReturnValue;value;df-generated |
+| System.Reflection.Metadata;AssemblyFileHandleCollection+Enumerator;get_Current;();Argument[this].Property[System.Reflection.Metadata.AssemblyFileHandleCollection+Enumerator.Current];ReturnValue;value;dfc-generated |
 | System.Reflection.Metadata;AssemblyReference;GetCustomAttributes;();Argument[this];ReturnValue;taint;df-generated |
+| System.Reflection.Metadata;AssemblyReferenceHandleCollection+Enumerator;get_Current;();Argument[this].Property[System.Reflection.Metadata.AssemblyReferenceHandleCollection+Enumerator.Current];ReturnValue;value;df-generated |
+| System.Reflection.Metadata;AssemblyReferenceHandleCollection+Enumerator;get_Current;();Argument[this].Property[System.Reflection.Metadata.AssemblyReferenceHandleCollection+Enumerator.Current];ReturnValue;value;dfc-generated |
 | System.Reflection.Metadata;AssemblyReferenceHandleCollection;GetEnumerator;();Argument[this];ReturnValue;taint;df-generated |
-| System.Reflection.Metadata;Blob;GetBytes;();Argument[this];ReturnValue;taint;df-generated |
-| System.Reflection.Metadata;BlobBuilder+Blobs;GetEnumerator;();Argument[this];ReturnValue;value;df-generated |
+| System.Reflection.Metadata;BlobBuilder+Blobs;GetEnumerator;();Argument[this];ReturnValue;value;dfc-generated |
+| System.Reflection.Metadata;BlobBuilder+Blobs;get_Current;();Argument[this].Property[System.Reflection.Metadata.BlobBuilder+Blobs.Current];ReturnValue;value;df-generated |
+| System.Reflection.Metadata;BlobBuilder+Blobs;get_Current;();Argument[this].Property[System.Reflection.Metadata.BlobBuilder+Blobs.Current];ReturnValue;value;dfc-generated |
 | System.Reflection.Metadata;BlobBuilder;GetBlobs;();Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection.Metadata;BlobBuilder;LinkPrefix;(System.Reflection.Metadata.BlobBuilder);Argument[0];Argument[this];taint;df-generated |
 | System.Reflection.Metadata;BlobBuilder;LinkPrefix;(System.Reflection.Metadata.BlobBuilder);Argument[this];Argument[0];taint;df-generated |
@@ -10538,8 +11148,9 @@
 | System.Reflection.Metadata;BlobBuilder;LinkSuffix;(System.Reflection.Metadata.BlobBuilder);Argument[this];Argument[0];taint;df-generated |
 | System.Reflection.Metadata;BlobBuilder;ReserveBytes;(System.Int32);Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection.Metadata;BlobBuilder;TryWriteBytes;(System.IO.Stream,System.Int32);Argument[0];Argument[this];taint;df-generated |
-| System.Reflection.Metadata;BlobContentId;BlobContentId;(System.Guid,System.UInt32);Argument[0];Argument[this];taint;df-generated |
-| System.Reflection.Metadata;BlobContentId;get_Guid;();Argument[this];ReturnValue;taint;df-generated |
+| System.Reflection.Metadata;BlobBuilder;WriteContentTo;(System.Reflection.Metadata.BlobWriter);Argument[0];ReturnValue;value;dfc-generated |
+| System.Reflection.Metadata;BlobContentId;BlobContentId;(System.Guid,System.UInt32);Argument[0];Argument[this].SyntheticField[System.Reflection.Metadata.BlobContentId._guid];value;dfc-generated |
+| System.Reflection.Metadata;BlobContentId;get_Guid;();Argument[this].SyntheticField[System.Reflection.Metadata.BlobContentId._guid];ReturnValue;value;dfc-generated |
 | System.Reflection.Metadata;BlobReader;ReadConstant;(System.Reflection.Metadata.ConstantTypeCode);Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection.Metadata;BlobReader;ReadSerializedString;();Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection.Metadata;BlobReader;ReadUTF8;(System.Int32);Argument[this];ReturnValue;taint;df-generated |
@@ -10547,39 +11158,67 @@
 | System.Reflection.Metadata;BlobReader;get_CurrentPointer;();Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection.Metadata;BlobReader;get_StartPointer;();Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection.Metadata;BlobWriter;BlobWriter;(System.Byte[],System.Int32,System.Int32);Argument[0].Element;Argument[this];taint;df-generated |
-| System.Reflection.Metadata;BlobWriter;ToArray;();Argument[this];ReturnValue;taint;df-generated |
-| System.Reflection.Metadata;BlobWriter;ToArray;(System.Int32,System.Int32);Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection.Metadata;BlobWriter;WriteBytes;(System.IO.Stream,System.Int32);Argument[0];Argument[this];taint;df-generated |
 | System.Reflection.Metadata;BlobWriter;get_Blob;();Argument[this];ReturnValue;taint;df-generated |
+| System.Reflection.Metadata;CustomAttributeHandleCollection+Enumerator;get_Current;();Argument[this].Property[System.Reflection.Metadata.CustomAttributeHandleCollection+Enumerator.Current];ReturnValue;value;df-generated |
+| System.Reflection.Metadata;CustomAttributeHandleCollection+Enumerator;get_Current;();Argument[this].Property[System.Reflection.Metadata.CustomAttributeHandleCollection+Enumerator.Current];ReturnValue;value;dfc-generated |
 | System.Reflection.Metadata;CustomAttributeHandleCollection;GetEnumerator;();Argument[this];ReturnValue;taint;df-generated |
+| System.Reflection.Metadata;CustomDebugInformationHandleCollection+Enumerator;get_Current;();Argument[this].Property[System.Reflection.Metadata.CustomDebugInformationHandleCollection+Enumerator.Current];ReturnValue;value;df-generated |
+| System.Reflection.Metadata;CustomDebugInformationHandleCollection+Enumerator;get_Current;();Argument[this].Property[System.Reflection.Metadata.CustomDebugInformationHandleCollection+Enumerator.Current];ReturnValue;value;dfc-generated |
 | System.Reflection.Metadata;CustomDebugInformationHandleCollection;GetEnumerator;();Argument[this];ReturnValue;taint;df-generated |
+| System.Reflection.Metadata;DeclarativeSecurityAttributeHandleCollection+Enumerator;get_Current;();Argument[this].Property[System.Reflection.Metadata.DeclarativeSecurityAttributeHandleCollection+Enumerator.Current];ReturnValue;value;df-generated |
+| System.Reflection.Metadata;DeclarativeSecurityAttributeHandleCollection+Enumerator;get_Current;();Argument[this].Property[System.Reflection.Metadata.DeclarativeSecurityAttributeHandleCollection+Enumerator.Current];ReturnValue;value;dfc-generated |
 | System.Reflection.Metadata;DeclarativeSecurityAttributeHandleCollection;GetEnumerator;();Argument[this];ReturnValue;taint;df-generated |
+| System.Reflection.Metadata;DocumentHandleCollection+Enumerator;get_Current;();Argument[this].Property[System.Reflection.Metadata.DocumentHandleCollection+Enumerator.Current];ReturnValue;value;df-generated |
+| System.Reflection.Metadata;DocumentHandleCollection+Enumerator;get_Current;();Argument[this].Property[System.Reflection.Metadata.DocumentHandleCollection+Enumerator.Current];ReturnValue;value;dfc-generated |
 | System.Reflection.Metadata;DocumentHandleCollection;GetEnumerator;();Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection.Metadata;EventAccessors;get_Others;();Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection.Metadata;EventDefinition;GetCustomAttributes;();Argument[this];ReturnValue;taint;df-generated |
+| System.Reflection.Metadata;EventDefinitionHandleCollection+Enumerator;get_Current;();Argument[this].Property[System.Reflection.Metadata.EventDefinitionHandleCollection+Enumerator.Current];ReturnValue;value;df-generated |
+| System.Reflection.Metadata;EventDefinitionHandleCollection+Enumerator;get_Current;();Argument[this].Property[System.Reflection.Metadata.EventDefinitionHandleCollection+Enumerator.Current];ReturnValue;value;dfc-generated |
 | System.Reflection.Metadata;EventDefinitionHandleCollection;GetEnumerator;();Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection.Metadata;ExportedType;GetCustomAttributes;();Argument[this];ReturnValue;taint;df-generated |
-| System.Reflection.Metadata;FieldDefinition;DecodeSignature<TType,TGenericContext>;(System.Reflection.Metadata.ISignatureTypeProvider<TType,TGenericContext>,TGenericContext);Argument[0];ReturnValue;taint;df-generated |
-| System.Reflection.Metadata;FieldDefinition;DecodeSignature<TType,TGenericContext>;(System.Reflection.Metadata.ISignatureTypeProvider<TType,TGenericContext>,TGenericContext);Argument[1];ReturnValue;taint;df-generated |
+| System.Reflection.Metadata;ExportedTypeHandleCollection+Enumerator;get_Current;();Argument[this].Property[System.Reflection.Metadata.ExportedTypeHandleCollection+Enumerator.Current];ReturnValue;value;df-generated |
+| System.Reflection.Metadata;ExportedTypeHandleCollection+Enumerator;get_Current;();Argument[this].Property[System.Reflection.Metadata.ExportedTypeHandleCollection+Enumerator.Current];ReturnValue;value;dfc-generated |
 | System.Reflection.Metadata;FieldDefinition;GetCustomAttributes;();Argument[this];ReturnValue;taint;df-generated |
+| System.Reflection.Metadata;FieldDefinitionHandleCollection+Enumerator;get_Current;();Argument[this].Property[System.Reflection.Metadata.FieldDefinitionHandleCollection+Enumerator.Current];ReturnValue;value;df-generated |
+| System.Reflection.Metadata;FieldDefinitionHandleCollection+Enumerator;get_Current;();Argument[this].Property[System.Reflection.Metadata.FieldDefinitionHandleCollection+Enumerator.Current];ReturnValue;value;dfc-generated |
 | System.Reflection.Metadata;FieldDefinitionHandleCollection;GetEnumerator;();Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection.Metadata;GenericParameter;GetCustomAttributes;();Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection.Metadata;GenericParameterConstraint;GetCustomAttributes;();Argument[this];ReturnValue;taint;df-generated |
+| System.Reflection.Metadata;GenericParameterConstraintHandleCollection+Enumerator;get_Current;();Argument[this].Property[System.Reflection.Metadata.GenericParameterConstraintHandleCollection+Enumerator.Current];ReturnValue;value;df-generated |
+| System.Reflection.Metadata;GenericParameterConstraintHandleCollection+Enumerator;get_Current;();Argument[this].Property[System.Reflection.Metadata.GenericParameterConstraintHandleCollection+Enumerator.Current];ReturnValue;value;dfc-generated |
+| System.Reflection.Metadata;GenericParameterHandleCollection+Enumerator;get_Current;();Argument[this].Property[System.Reflection.Metadata.GenericParameterHandleCollection+Enumerator.Current];ReturnValue;value;df-generated |
+| System.Reflection.Metadata;GenericParameterHandleCollection+Enumerator;get_Current;();Argument[this].Property[System.Reflection.Metadata.GenericParameterHandleCollection+Enumerator.Current];ReturnValue;value;dfc-generated |
 | System.Reflection.Metadata;ImportDefinitionCollection+Enumerator;get_Current;();Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection.Metadata;ImportDefinitionCollection;GetEnumerator;();Argument[this];ReturnValue;taint;df-generated |
+| System.Reflection.Metadata;ImportScopeCollection+Enumerator;get_Current;();Argument[this].Property[System.Reflection.Metadata.ImportScopeCollection+Enumerator.Current];ReturnValue;value;df-generated |
+| System.Reflection.Metadata;ImportScopeCollection+Enumerator;get_Current;();Argument[this].Property[System.Reflection.Metadata.ImportScopeCollection+Enumerator.Current];ReturnValue;value;dfc-generated |
 | System.Reflection.Metadata;ImportScopeCollection;GetEnumerator;();Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection.Metadata;InterfaceImplementation;GetCustomAttributes;();Argument[this];ReturnValue;taint;df-generated |
+| System.Reflection.Metadata;InterfaceImplementationHandleCollection+Enumerator;get_Current;();Argument[this].Property[System.Reflection.Metadata.InterfaceImplementationHandleCollection+Enumerator.Current];ReturnValue;value;df-generated |
+| System.Reflection.Metadata;InterfaceImplementationHandleCollection+Enumerator;get_Current;();Argument[this].Property[System.Reflection.Metadata.InterfaceImplementationHandleCollection+Enumerator.Current];ReturnValue;value;dfc-generated |
 | System.Reflection.Metadata;InterfaceImplementationHandleCollection;GetEnumerator;();Argument[this];ReturnValue;taint;df-generated |
+| System.Reflection.Metadata;LocalConstantHandleCollection+Enumerator;get_Current;();Argument[this].Property[System.Reflection.Metadata.LocalConstantHandleCollection+Enumerator.Current];ReturnValue;value;df-generated |
+| System.Reflection.Metadata;LocalConstantHandleCollection+Enumerator;get_Current;();Argument[this].Property[System.Reflection.Metadata.LocalConstantHandleCollection+Enumerator.Current];ReturnValue;value;dfc-generated |
 | System.Reflection.Metadata;LocalConstantHandleCollection;GetEnumerator;();Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection.Metadata;LocalScope;GetChildren;();Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection.Metadata;LocalScope;GetLocalConstants;();Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection.Metadata;LocalScope;GetLocalVariables;();Argument[this];ReturnValue;taint;df-generated |
+| System.Reflection.Metadata;LocalScopeHandleCollection+ChildrenEnumerator;get_Current;();Argument[this].Property[System.Reflection.Metadata.LocalScopeHandleCollection+ChildrenEnumerator.Current];ReturnValue;value;df-generated |
+| System.Reflection.Metadata;LocalScopeHandleCollection+ChildrenEnumerator;get_Current;();Argument[this].Property[System.Reflection.Metadata.LocalScopeHandleCollection+ChildrenEnumerator.Current];ReturnValue;value;dfc-generated |
+| System.Reflection.Metadata;LocalScopeHandleCollection+Enumerator;get_Current;();Argument[this].Property[System.Reflection.Metadata.LocalScopeHandleCollection+Enumerator.Current];ReturnValue;value;df-generated |
+| System.Reflection.Metadata;LocalScopeHandleCollection+Enumerator;get_Current;();Argument[this].Property[System.Reflection.Metadata.LocalScopeHandleCollection+Enumerator.Current];ReturnValue;value;dfc-generated |
 | System.Reflection.Metadata;LocalScopeHandleCollection;GetEnumerator;();Argument[this];ReturnValue;taint;df-generated |
+| System.Reflection.Metadata;LocalVariableHandleCollection+Enumerator;get_Current;();Argument[this].Property[System.Reflection.Metadata.LocalVariableHandleCollection+Enumerator.Current];ReturnValue;value;df-generated |
+| System.Reflection.Metadata;LocalVariableHandleCollection+Enumerator;get_Current;();Argument[this].Property[System.Reflection.Metadata.LocalVariableHandleCollection+Enumerator.Current];ReturnValue;value;dfc-generated |
 | System.Reflection.Metadata;LocalVariableHandleCollection;GetEnumerator;();Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection.Metadata;ManifestResource;GetCustomAttributes;();Argument[this];ReturnValue;taint;df-generated |
-| System.Reflection.Metadata;MemberReference;DecodeFieldSignature<TType,TGenericContext>;(System.Reflection.Metadata.ISignatureTypeProvider<TType,TGenericContext>,TGenericContext);Argument[0];ReturnValue;taint;df-generated |
-| System.Reflection.Metadata;MemberReference;DecodeFieldSignature<TType,TGenericContext>;(System.Reflection.Metadata.ISignatureTypeProvider<TType,TGenericContext>,TGenericContext);Argument[1];ReturnValue;taint;df-generated |
+| System.Reflection.Metadata;ManifestResourceHandleCollection+Enumerator;get_Current;();Argument[this].Property[System.Reflection.Metadata.ManifestResourceHandleCollection+Enumerator.Current];ReturnValue;value;df-generated |
+| System.Reflection.Metadata;ManifestResourceHandleCollection+Enumerator;get_Current;();Argument[this].Property[System.Reflection.Metadata.ManifestResourceHandleCollection+Enumerator.Current];ReturnValue;value;dfc-generated |
 | System.Reflection.Metadata;MemberReference;GetCustomAttributes;();Argument[this];ReturnValue;taint;df-generated |
+| System.Reflection.Metadata;MemberReferenceHandleCollection+Enumerator;get_Current;();Argument[this].Property[System.Reflection.Metadata.MemberReferenceHandleCollection+Enumerator.Current];ReturnValue;value;df-generated |
+| System.Reflection.Metadata;MemberReferenceHandleCollection+Enumerator;get_Current;();Argument[this].Property[System.Reflection.Metadata.MemberReferenceHandleCollection+Enumerator.Current];ReturnValue;value;dfc-generated |
 | System.Reflection.Metadata;MetadataReader;GetAssemblyDefinition;();Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection.Metadata;MetadataReader;GetAssemblyFile;(System.Reflection.Metadata.AssemblyFileHandle);Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection.Metadata;MetadataReader;GetAssemblyReference;(System.Reflection.Metadata.AssemblyReferenceHandle);Argument[this];ReturnValue;taint;df-generated |
@@ -10643,22 +11282,26 @@
 | System.Reflection.Metadata;MetadataReaderProvider;FromPortablePdbImage;(System.Collections.Immutable.ImmutableArray<System.Byte>);Argument[0].Element;ReturnValue;taint;df-generated |
 | System.Reflection.Metadata;MetadataReaderProvider;FromPortablePdbStream;(System.IO.Stream,System.Reflection.Metadata.MetadataStreamOptions,System.Int32);Argument[0];ReturnValue;taint;df-generated |
 | System.Reflection.Metadata;MetadataReaderProvider;GetMetadataReader;(System.Reflection.Metadata.MetadataReaderOptions,System.Reflection.Metadata.MetadataStringDecoder);Argument[this];ReturnValue;taint;df-generated |
-| System.Reflection.Metadata;MetadataStringDecoder;GetString;(System.Byte*,System.Int32);Argument[0];ReturnValue;taint;df-generated |
-| System.Reflection.Metadata;MetadataStringDecoder;GetString;(System.Byte*,System.Int32);Argument[this];ReturnValue;taint;df-generated |
+| System.Reflection.Metadata;MetadataStringDecoder;GetString;(System.Byte*,System.Int32);Argument[0].Element;ReturnValue;taint;dfc-generated |
 | System.Reflection.Metadata;MethodBodyBlock;Create;(System.Reflection.Metadata.BlobReader);Argument[0];ReturnValue;taint;df-generated |
 | System.Reflection.Metadata;MethodBodyBlock;GetILReader;();Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection.Metadata;MethodBodyBlock;get_ExceptionRegions;();Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection.Metadata;MethodBodyBlock;get_LocalSignature;();Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection.Metadata;MethodDebugInformation;GetSequencePoints;();Argument[this];ReturnValue;taint;df-generated |
+| System.Reflection.Metadata;MethodDebugInformationHandleCollection+Enumerator;get_Current;();Argument[this].Property[System.Reflection.Metadata.MethodDebugInformationHandleCollection+Enumerator.Current];ReturnValue;value;df-generated |
+| System.Reflection.Metadata;MethodDebugInformationHandleCollection+Enumerator;get_Current;();Argument[this].Property[System.Reflection.Metadata.MethodDebugInformationHandleCollection+Enumerator.Current];ReturnValue;value;dfc-generated |
 | System.Reflection.Metadata;MethodDebugInformationHandleCollection;GetEnumerator;();Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection.Metadata;MethodDefinition;GetCustomAttributes;();Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection.Metadata;MethodDefinition;GetDeclarativeSecurityAttributes;();Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection.Metadata;MethodDefinition;GetParameters;();Argument[this];ReturnValue;taint;df-generated |
+| System.Reflection.Metadata;MethodDefinitionHandleCollection+Enumerator;get_Current;();Argument[this].Property[System.Reflection.Metadata.MethodDefinitionHandleCollection+Enumerator.Current];ReturnValue;value;df-generated |
+| System.Reflection.Metadata;MethodDefinitionHandleCollection+Enumerator;get_Current;();Argument[this].Property[System.Reflection.Metadata.MethodDefinitionHandleCollection+Enumerator.Current];ReturnValue;value;dfc-generated |
 | System.Reflection.Metadata;MethodDefinitionHandleCollection;GetEnumerator;();Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection.Metadata;MethodImplementation;GetCustomAttributes;();Argument[this];ReturnValue;taint;df-generated |
+| System.Reflection.Metadata;MethodImplementationHandleCollection+Enumerator;get_Current;();Argument[this].Property[System.Reflection.Metadata.MethodImplementationHandleCollection+Enumerator.Current];ReturnValue;value;df-generated |
+| System.Reflection.Metadata;MethodImplementationHandleCollection+Enumerator;get_Current;();Argument[this].Property[System.Reflection.Metadata.MethodImplementationHandleCollection+Enumerator.Current];ReturnValue;value;dfc-generated |
 | System.Reflection.Metadata;MethodImport;get_Module;();Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection.Metadata;MethodImport;get_Name;();Argument[this];ReturnValue;taint;df-generated |
-| System.Reflection.Metadata;MethodSpecification;DecodeSignature<TType,TGenericContext>;(System.Reflection.Metadata.ISignatureTypeProvider<TType,TGenericContext>,TGenericContext);Argument[1];ReturnValue;taint;df-generated |
 | System.Reflection.Metadata;MethodSpecification;GetCustomAttributes;();Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection.Metadata;ModuleDefinition;GetCustomAttributes;();Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection.Metadata;ModuleReference;GetCustomAttributes;();Argument[this];ReturnValue;taint;df-generated |
@@ -10671,13 +11314,16 @@
 | System.Reflection.Metadata;PEReaderExtensions;GetMetadataReader;(System.Reflection.PortableExecutable.PEReader,System.Reflection.Metadata.MetadataReaderOptions);Argument[0];ReturnValue;taint;df-generated |
 | System.Reflection.Metadata;PEReaderExtensions;GetMetadataReader;(System.Reflection.PortableExecutable.PEReader,System.Reflection.Metadata.MetadataReaderOptions,System.Reflection.Metadata.MetadataStringDecoder);Argument[0];ReturnValue;taint;df-generated |
 | System.Reflection.Metadata;Parameter;GetCustomAttributes;();Argument[this];ReturnValue;taint;df-generated |
+| System.Reflection.Metadata;ParameterHandleCollection+Enumerator;get_Current;();Argument[this].Property[System.Reflection.Metadata.ParameterHandleCollection+Enumerator.Current];ReturnValue;value;df-generated |
+| System.Reflection.Metadata;ParameterHandleCollection+Enumerator;get_Current;();Argument[this].Property[System.Reflection.Metadata.ParameterHandleCollection+Enumerator.Current];ReturnValue;value;dfc-generated |
 | System.Reflection.Metadata;ParameterHandleCollection;GetEnumerator;();Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection.Metadata;PropertyAccessors;get_Others;();Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection.Metadata;PropertyDefinition;GetCustomAttributes;();Argument[this];ReturnValue;taint;df-generated |
+| System.Reflection.Metadata;PropertyDefinitionHandleCollection+Enumerator;get_Current;();Argument[this].Property[System.Reflection.Metadata.PropertyDefinitionHandleCollection+Enumerator.Current];ReturnValue;value;df-generated |
+| System.Reflection.Metadata;PropertyDefinitionHandleCollection+Enumerator;get_Current;();Argument[this].Property[System.Reflection.Metadata.PropertyDefinitionHandleCollection+Enumerator.Current];ReturnValue;value;dfc-generated |
 | System.Reflection.Metadata;PropertyDefinitionHandleCollection;GetEnumerator;();Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection.Metadata;SequencePointCollection+Enumerator;get_Current;();Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection.Metadata;SequencePointCollection;GetEnumerator;();Argument[this];ReturnValue;taint;df-generated |
-| System.Reflection.Metadata;StandaloneSignature;DecodeLocalSignature<TType,TGenericContext>;(System.Reflection.Metadata.ISignatureTypeProvider<TType,TGenericContext>,TGenericContext);Argument[1];ReturnValue;taint;df-generated |
 | System.Reflection.Metadata;StandaloneSignature;GetCustomAttributes;();Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection.Metadata;TypeDefinition;GetCustomAttributes;();Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection.Metadata;TypeDefinition;GetDeclarativeSecurityAttributes;();Argument[this];ReturnValue;taint;df-generated |
@@ -10686,17 +11332,23 @@
 | System.Reflection.Metadata;TypeDefinition;GetInterfaceImplementations;();Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection.Metadata;TypeDefinition;GetMethods;();Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection.Metadata;TypeDefinition;GetProperties;();Argument[this];ReturnValue;taint;df-generated |
-| System.Reflection.Metadata;TypeSpecification;DecodeSignature<TType,TGenericContext>;(System.Reflection.Metadata.ISignatureTypeProvider<TType,TGenericContext>,TGenericContext);Argument[0];ReturnValue;taint;df-generated |
-| System.Reflection.Metadata;TypeSpecification;DecodeSignature<TType,TGenericContext>;(System.Reflection.Metadata.ISignatureTypeProvider<TType,TGenericContext>,TGenericContext);Argument[1];ReturnValue;taint;df-generated |
+| System.Reflection.Metadata;TypeDefinitionHandleCollection+Enumerator;get_Current;();Argument[this].Property[System.Reflection.Metadata.TypeDefinitionHandleCollection+Enumerator.Current];ReturnValue;value;df-generated |
+| System.Reflection.Metadata;TypeDefinitionHandleCollection+Enumerator;get_Current;();Argument[this].Property[System.Reflection.Metadata.TypeDefinitionHandleCollection+Enumerator.Current];ReturnValue;value;dfc-generated |
+| System.Reflection.Metadata;TypeReferenceHandleCollection+Enumerator;get_Current;();Argument[this].Property[System.Reflection.Metadata.TypeReferenceHandleCollection+Enumerator.Current];ReturnValue;value;df-generated |
+| System.Reflection.Metadata;TypeReferenceHandleCollection+Enumerator;get_Current;();Argument[this].Property[System.Reflection.Metadata.TypeReferenceHandleCollection+Enumerator.Current];ReturnValue;value;dfc-generated |
 | System.Reflection.Metadata;TypeSpecification;GetCustomAttributes;();Argument[this];ReturnValue;taint;df-generated |
+| System.Reflection.PortableExecutable;DebugDirectoryBuilder;AddEntry<TData>;(System.Reflection.PortableExecutable.DebugDirectoryEntryType,System.UInt32,System.UInt32,TData,System.Action<System.Reflection.Metadata.BlobBuilder,TData>);Argument[3];Argument[4].Parameter[1];value;dfc-generated |
+| System.Reflection.PortableExecutable;DebugDirectoryBuilder;AddEntry<TData>;(System.Reflection.PortableExecutable.DebugDirectoryEntryType,System.UInt32,System.UInt32,TData,System.Action<System.Reflection.Metadata.BlobBuilder,TData>);Argument[3];Argument[4].Parameter[1];value;hq-generated |
+| System.Reflection.PortableExecutable;DebugDirectoryBuilder;AddEntry<TData>;(System.Reflection.PortableExecutable.DebugDirectoryEntryType,System.UInt32,System.UInt32,TData,System.Action<System.Reflection.Metadata.BlobBuilder,TData>);Argument[4];Argument[4].Parameter[delegate-self];value;dfc-generated |
 | System.Reflection.PortableExecutable;DebugDirectoryBuilder;AddEntry<TData>;(System.Reflection.PortableExecutable.DebugDirectoryEntryType,System.UInt32,System.UInt32,TData,System.Action<System.Reflection.Metadata.BlobBuilder,TData>);Argument[4];Argument[4].Parameter[delegate-self];value;hq-generated |
 | System.Reflection.PortableExecutable;ManagedPEBuilder;ManagedPEBuilder;(System.Reflection.PortableExecutable.PEHeaderBuilder,System.Reflection.Metadata.Ecma335.MetadataRootBuilder,System.Reflection.Metadata.BlobBuilder,System.Reflection.Metadata.BlobBuilder,System.Reflection.Metadata.BlobBuilder,System.Reflection.PortableExecutable.ResourceSectionBuilder,System.Reflection.PortableExecutable.DebugDirectoryBuilder,System.Int32,System.Reflection.Metadata.MethodDefinitionHandle,System.Reflection.PortableExecutable.CorFlags,System.Func<System.Collections.Generic.IEnumerable<System.Reflection.Metadata.Blob>,System.Reflection.Metadata.BlobContentId>);Argument[10];Argument[10].Parameter[delegate-self];value;hq-generated |
 | System.Reflection.PortableExecutable;ManagedPEBuilder;Sign;(System.Reflection.Metadata.BlobBuilder,System.Func<System.Collections.Generic.IEnumerable<System.Reflection.Metadata.Blob>,System.Byte[]>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
-| System.Reflection.PortableExecutable;PEBuilder+Section;Section;(System.String,System.Reflection.PortableExecutable.SectionCharacteristics);Argument[0];Argument[this];taint;df-generated |
+| System.Reflection.PortableExecutable;PEBuilder+Section;Section;(System.String,System.Reflection.PortableExecutable.SectionCharacteristics);Argument[0];Argument[this].Field[System.Reflection.PortableExecutable.PEBuilder+Section.Name];value;dfc-generated |
 | System.Reflection.PortableExecutable;PEBuilder;GetDirectories;();Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection.PortableExecutable;PEBuilder;GetSections;();Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection.PortableExecutable;PEBuilder;PEBuilder;(System.Reflection.PortableExecutable.PEHeaderBuilder,System.Func<System.Collections.Generic.IEnumerable<System.Reflection.Metadata.Blob>,System.Reflection.Metadata.BlobContentId>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
 | System.Reflection.PortableExecutable;PEBuilder;Serialize;(System.Reflection.Metadata.BlobBuilder);Argument[0];Argument[this];taint;df-generated |
+| System.Reflection.PortableExecutable;PEBuilder;Serialize;(System.Reflection.Metadata.BlobBuilder);Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection.PortableExecutable;PEBuilder;SerializeSection;(System.String,System.Reflection.PortableExecutable.SectionLocation);Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection.PortableExecutable;PEHeaders;get_CoffHeader;();Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection.PortableExecutable;PEHeaders;get_CorHeader;();Argument[this];ReturnValue;taint;df-generated |
@@ -10710,10 +11362,15 @@
 | System.Reflection.PortableExecutable;PEReader;PEReader;(System.Byte*,System.Int32,System.Boolean);Argument[0];Argument[this];taint;df-generated |
 | System.Reflection.PortableExecutable;PEReader;PEReader;(System.Collections.Immutable.ImmutableArray<System.Byte>);Argument[0].Element;Argument[this];taint;df-generated |
 | System.Reflection.PortableExecutable;PEReader;PEReader;(System.IO.Stream,System.Reflection.PortableExecutable.PEStreamOptions,System.Int32);Argument[0];Argument[this];taint;df-generated |
+| System.Reflection.PortableExecutable;PEReader;TryOpenAssociatedPortablePdb;(System.String,System.Func<System.String,System.IO.Stream>,System.Reflection.Metadata.MetadataReaderProvider,System.String);Argument[0];Argument[1].Parameter[0];taint;dfc-generated |
+| System.Reflection.PortableExecutable;PEReader;TryOpenAssociatedPortablePdb;(System.String,System.Func<System.String,System.IO.Stream>,System.Reflection.Metadata.MetadataReaderProvider,System.String);Argument[0];Argument[1].Parameter[0];taint;hq-generated |
+| System.Reflection.PortableExecutable;PEReader;TryOpenAssociatedPortablePdb;(System.String,System.Func<System.String,System.IO.Stream>,System.Reflection.Metadata.MetadataReaderProvider,System.String);Argument[0];ReturnValue;taint;dfc-generated |
+| System.Reflection.PortableExecutable;PEReader;TryOpenAssociatedPortablePdb;(System.String,System.Func<System.String,System.IO.Stream>,System.Reflection.Metadata.MetadataReaderProvider,System.String);Argument[0];ReturnValue;taint;hq-generated |
+| System.Reflection.PortableExecutable;PEReader;TryOpenAssociatedPortablePdb;(System.String,System.Func<System.String,System.IO.Stream>,System.Reflection.Metadata.MetadataReaderProvider,System.String);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | System.Reflection.PortableExecutable;PEReader;TryOpenAssociatedPortablePdb;(System.String,System.Func<System.String,System.IO.Stream>,System.Reflection.Metadata.MetadataReaderProvider,System.String);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
 | System.Reflection.PortableExecutable;PEReader;get_PEHeaders;();Argument[this];ReturnValue;taint;df-generated |
-| System.Reflection;Assembly;CreateQualifiedName;(System.String,System.String);Argument[0];ReturnValue;taint;df-generated |
-| System.Reflection;Assembly;CreateQualifiedName;(System.String,System.String);Argument[1];ReturnValue;taint;df-generated |
+| System.Reflection;Assembly;CreateQualifiedName;(System.String,System.String);Argument[0];ReturnValue;taint;dfc-generated |
+| System.Reflection;Assembly;CreateQualifiedName;(System.String,System.String);Argument[1];ReturnValue;taint;dfc-generated |
 | System.Reflection;Assembly;GetFile;(System.String);Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection;Assembly;GetLoadedModules;();Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection;Assembly;GetLoadedModules;(System.Boolean);Argument[this];ReturnValue;taint;df-generated |
@@ -10724,49 +11381,61 @@
 | System.Reflection;Assembly;GetModules;(System.Boolean);Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection;Assembly;GetSatelliteAssembly;(System.Globalization.CultureInfo);Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection;Assembly;GetSatelliteAssembly;(System.Globalization.CultureInfo,System.Version);Argument[this];ReturnValue;taint;df-generated |
-| System.Reflection;Assembly;GetType;(System.String,System.Boolean,System.Boolean);Argument[0];ReturnValue;taint;df-generated |
 | System.Reflection;Assembly;GetType;(System.String,System.Boolean,System.Boolean);Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection;Assembly;LoadModule;(System.String,System.Byte[]);Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection;Assembly;LoadModule;(System.String,System.Byte[],System.Byte[]);Argument[this];ReturnValue;taint;df-generated |
-| System.Reflection;Assembly;ToString;();Argument[this];ReturnValue;taint;df-generated |
+| System.Reflection;Assembly;ToString;();Argument[this].Property[System.Reflection.Assembly.FullName];ReturnValue;value;dfc-generated |
 | System.Reflection;Assembly;add_ModuleResolve;(System.Reflection.ModuleResolveEventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Reflection;Assembly;get_CodeBase;();Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection;Assembly;get_CustomAttributes;();Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection;Assembly;get_EntryPoint;();Argument[this];ReturnValue;taint;df-generated |
-| System.Reflection;Assembly;get_EscapedCodeBase;();Argument[this];ReturnValue;taint;df-generated |
+| System.Reflection;Assembly;get_EscapedCodeBase;();Argument[this].Property[System.Reflection.Assembly.CodeBase];ReturnValue;value;dfc-generated |
 | System.Reflection;Assembly;get_FullName;();Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection;Assembly;get_ImageRuntimeVersion;();Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection;Assembly;get_Location;();Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection;Assembly;get_ManifestModule;();Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection;Assembly;get_Modules;();Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection;Assembly;remove_ModuleResolve;(System.Reflection.ModuleResolveEventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
-| System.Reflection;AssemblyExtensions;GetModules;(System.Reflection.Assembly);Argument[0];ReturnValue;taint;df-generated |
-| System.Reflection;AssemblyName;GetPublicKey;();Argument[this];ReturnValue;taint;df-generated |
-| System.Reflection;AssemblyName;SetPublicKey;(System.Byte[]);Argument[0].Element;Argument[this];taint;df-generated |
+| System.Reflection;AssemblyName;GetPublicKey;();Argument[this].SyntheticField[System.Reflection.AssemblyName._publicKey];ReturnValue;value;dfc-generated |
+| System.Reflection;AssemblyName;SetPublicKey;(System.Byte[]);Argument[0];Argument[this].SyntheticField[System.Reflection.AssemblyName._publicKey];value;dfc-generated |
 | System.Reflection;AssemblyName;SetPublicKeyToken;(System.Byte[]);Argument[0].Element;Argument[this];taint;df-generated |
-| System.Reflection;AssemblyName;ToString;();Argument[this];ReturnValue;taint;df-generated |
+| System.Reflection;AssemblyName;ToString;();Argument[this].Property[System.Reflection.AssemblyName.FullName];ReturnValue;value;dfc-generated |
 | System.Reflection;AssemblyName;get_EscapedCodeBase;();Argument[this];ReturnValue;taint;df-generated |
-| System.Reflection;Binder;BindToField;(System.Reflection.BindingFlags,System.Reflection.FieldInfo[],System.Object,System.Globalization.CultureInfo);Argument[1].Element;ReturnValue;taint;df-generated |
-| System.Reflection;Binder;BindToMethod;(System.Reflection.BindingFlags,System.Reflection.MethodBase[],System.Object[],System.Reflection.ParameterModifier[],System.Globalization.CultureInfo,System.String[],System.Object);Argument[1].Element;ReturnValue;taint;df-generated |
-| System.Reflection;Binder;BindToMethod;(System.Reflection.BindingFlags,System.Reflection.MethodBase[],System.Object[],System.Reflection.ParameterModifier[],System.Globalization.CultureInfo,System.String[],System.Object);Argument[2].Element;ReturnValue;taint;df-generated |
-| System.Reflection;Binder;ReorderArgumentArray;(System.Object[],System.Object);Argument[0].Element;ReturnValue;taint;df-generated |
-| System.Reflection;Binder;SelectMethod;(System.Reflection.BindingFlags,System.Reflection.MethodBase[],System.Type[],System.Reflection.ParameterModifier[]);Argument[1].Element;ReturnValue;taint;df-generated |
-| System.Reflection;Binder;SelectProperty;(System.Reflection.BindingFlags,System.Reflection.PropertyInfo[],System.Type,System.Type[],System.Reflection.ParameterModifier[]);Argument[1].Element;ReturnValue;taint;df-generated |
+| System.Reflection;Binder;BindToField;(System.Reflection.BindingFlags,System.Reflection.FieldInfo[],System.Object,System.Globalization.CultureInfo);Argument[1].Element;ReturnValue;value;dfc-generated |
+| System.Reflection;Binder;BindToMethod;(System.Reflection.BindingFlags,System.Reflection.MethodBase[],System.Object[],System.Reflection.ParameterModifier[],System.Globalization.CultureInfo,System.String[],System.Object);Argument[1].Element;ReturnValue;value;dfc-generated |
+| System.Reflection;Binder;BindToMethod;(System.Reflection.BindingFlags,System.Reflection.MethodBase[],System.Object[],System.Reflection.ParameterModifier[],System.Globalization.CultureInfo,System.String[],System.Object);Argument[2].Element;ReturnValue.Element;value;dfc-generated |
+| System.Reflection;Binder;BindToMethod;(System.Reflection.BindingFlags,System.Reflection.MethodBase[],System.Object[],System.Reflection.ParameterModifier[],System.Globalization.CultureInfo,System.String[],System.Object);Argument[2];ReturnValue;value;dfc-generated |
+| System.Reflection;Binder;ReorderArgumentArray;(System.Object[],System.Object);Argument[0].Element.Element;Argument[0].Element;value;dfc-generated |
+| System.Reflection;Binder;ReorderArgumentArray;(System.Object[],System.Object);Argument[0].Element.Element;ReturnValue.Element;value;dfc-generated |
+| System.Reflection;Binder;ReorderArgumentArray;(System.Object[],System.Object);Argument[0];ReturnValue;value;dfc-generated |
+| System.Reflection;Binder;SelectMethod;(System.Reflection.BindingFlags,System.Reflection.MethodBase[],System.Type[],System.Reflection.ParameterModifier[]);Argument[1].Element;ReturnValue;value;dfc-generated |
+| System.Reflection;Binder;SelectProperty;(System.Reflection.BindingFlags,System.Reflection.PropertyInfo[],System.Type,System.Type[],System.Reflection.ParameterModifier[]);Argument[1].Element;ReturnValue;value;dfc-generated |
+| System.Reflection;ConstructorInvoker;Invoke;(System.Object);Argument[0];Argument[this];taint;df-generated |
+| System.Reflection;ConstructorInvoker;Invoke;(System.Object,System.Object);Argument[0];Argument[this];taint;df-generated |
+| System.Reflection;ConstructorInvoker;Invoke;(System.Object,System.Object);Argument[1];Argument[this];taint;df-generated |
+| System.Reflection;ConstructorInvoker;Invoke;(System.Object,System.Object,System.Object);Argument[0];Argument[this];taint;df-generated |
+| System.Reflection;ConstructorInvoker;Invoke;(System.Object,System.Object,System.Object);Argument[1];Argument[this];taint;df-generated |
+| System.Reflection;ConstructorInvoker;Invoke;(System.Object,System.Object,System.Object);Argument[2];Argument[this];taint;df-generated |
+| System.Reflection;ConstructorInvoker;Invoke;(System.Object,System.Object,System.Object,System.Object);Argument[0];Argument[this];taint;df-generated |
+| System.Reflection;ConstructorInvoker;Invoke;(System.Object,System.Object,System.Object,System.Object);Argument[1];Argument[this];taint;df-generated |
+| System.Reflection;ConstructorInvoker;Invoke;(System.Object,System.Object,System.Object,System.Object);Argument[2];Argument[this];taint;df-generated |
+| System.Reflection;ConstructorInvoker;Invoke;(System.Object,System.Object,System.Object,System.Object);Argument[3];Argument[this];taint;df-generated |
+| System.Reflection;ConstructorInvoker;Invoke;(System.Span<System.Object>);Argument[0];Argument[this];taint;df-generated |
 | System.Reflection;CustomAttributeData;get_Constructor;();Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection;CustomAttributeData;get_ConstructorArguments;();Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection;CustomAttributeData;get_NamedArguments;();Argument[this];ReturnValue;taint;df-generated |
-| System.Reflection;CustomAttributeNamedArgument;CustomAttributeNamedArgument;(System.Reflection.MemberInfo,System.Object);Argument[0];Argument[this];taint;df-generated |
-| System.Reflection;CustomAttributeNamedArgument;CustomAttributeNamedArgument;(System.Reflection.MemberInfo,System.Object);Argument[1];Argument[this];taint;df-generated |
-| System.Reflection;CustomAttributeNamedArgument;CustomAttributeNamedArgument;(System.Reflection.MemberInfo,System.Reflection.CustomAttributeTypedArgument);Argument[0];Argument[this];taint;df-generated |
-| System.Reflection;CustomAttributeNamedArgument;CustomAttributeNamedArgument;(System.Reflection.MemberInfo,System.Reflection.CustomAttributeTypedArgument);Argument[1];Argument[this];taint;df-generated |
+| System.Reflection;CustomAttributeNamedArgument;CustomAttributeNamedArgument;(System.Reflection.MemberInfo,System.Object);Argument[0];Argument[this].SyntheticField[System.Reflection.CustomAttributeNamedArgument._memberInfo];value;dfc-generated |
+| System.Reflection;CustomAttributeNamedArgument;CustomAttributeNamedArgument;(System.Reflection.MemberInfo,System.Reflection.CustomAttributeTypedArgument);Argument[0];Argument[this].SyntheticField[System.Reflection.CustomAttributeNamedArgument._memberInfo];value;dfc-generated |
+| System.Reflection;CustomAttributeNamedArgument;CustomAttributeNamedArgument;(System.Reflection.MemberInfo,System.Reflection.CustomAttributeTypedArgument);Argument[1];Argument[this].SyntheticField[System.Reflection.CustomAttributeNamedArgument._value];value;dfc-generated |
 | System.Reflection;CustomAttributeNamedArgument;ToString;();Argument[this];ReturnValue;taint;df-generated |
-| System.Reflection;CustomAttributeNamedArgument;get_MemberInfo;();Argument[this];ReturnValue;taint;df-generated |
+| System.Reflection;CustomAttributeNamedArgument;get_MemberInfo;();Argument[this].SyntheticField[System.Reflection.CustomAttributeNamedArgument._memberInfo];ReturnValue;value;dfc-generated |
 | System.Reflection;CustomAttributeNamedArgument;get_MemberName;();Argument[this];ReturnValue;taint;df-generated |
-| System.Reflection;CustomAttributeNamedArgument;get_TypedValue;();Argument[this];ReturnValue;taint;df-generated |
-| System.Reflection;CustomAttributeTypedArgument;CustomAttributeTypedArgument;(System.Object);Argument[0];Argument[this];taint;df-generated |
-| System.Reflection;CustomAttributeTypedArgument;CustomAttributeTypedArgument;(System.Type,System.Object);Argument[1];Argument[this];taint;df-generated |
-| System.Reflection;CustomAttributeTypedArgument;ToString;();Argument[this];ReturnValue;taint;df-generated |
-| System.Reflection;CustomAttributeTypedArgument;get_Value;();Argument[this];ReturnValue;taint;df-generated |
+| System.Reflection;CustomAttributeNamedArgument;get_TypedValue;();Argument[this].SyntheticField[System.Reflection.CustomAttributeNamedArgument._value];ReturnValue;value;dfc-generated |
+| System.Reflection;CustomAttributeTypedArgument;CustomAttributeTypedArgument;(System.Object);Argument[0];Argument[this].SyntheticField[System.Reflection.CustomAttributeTypedArgument._value];value;dfc-generated |
+| System.Reflection;CustomAttributeTypedArgument;CustomAttributeTypedArgument;(System.Type,System.Object);Argument[1];Argument[this].SyntheticField[System.Reflection.CustomAttributeTypedArgument._value];value;dfc-generated |
+| System.Reflection;CustomAttributeTypedArgument;ToString;();Argument[this].Property[System.Reflection.CustomAttributeTypedArgument.Value];ReturnValue;taint;dfc-generated |
+| System.Reflection;CustomAttributeTypedArgument;ToString;();Argument[this].SyntheticField[System.Reflection.CustomAttributeTypedArgument._value];ReturnValue;taint;dfc-generated |
+| System.Reflection;CustomAttributeTypedArgument;get_Value;();Argument[this].SyntheticField[System.Reflection.CustomAttributeTypedArgument._value];ReturnValue;value;dfc-generated |
 | System.Reflection;EventInfo;GetAddMethod;();Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection;EventInfo;GetAddMethod;(System.Boolean);Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection;EventInfo;GetRaiseMethod;();Argument[this];ReturnValue;taint;df-generated |
@@ -10777,21 +11446,16 @@
 | System.Reflection;EventInfo;get_EventHandlerType;();Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection;EventInfo;get_RaiseMethod;();Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection;EventInfo;get_RemoveMethod;();Argument[this];ReturnValue;taint;df-generated |
-| System.Reflection;EventInfoExtensions;GetAddMethod;(System.Reflection.EventInfo);Argument[0];ReturnValue;taint;df-generated |
 | System.Reflection;EventInfoExtensions;GetAddMethod;(System.Reflection.EventInfo,System.Boolean);Argument[0];ReturnValue;taint;df-generated |
-| System.Reflection;EventInfoExtensions;GetRaiseMethod;(System.Reflection.EventInfo);Argument[0];ReturnValue;taint;df-generated |
 | System.Reflection;EventInfoExtensions;GetRaiseMethod;(System.Reflection.EventInfo,System.Boolean);Argument[0];ReturnValue;taint;df-generated |
-| System.Reflection;EventInfoExtensions;GetRemoveMethod;(System.Reflection.EventInfo);Argument[0];ReturnValue;taint;df-generated |
 | System.Reflection;EventInfoExtensions;GetRemoveMethod;(System.Reflection.EventInfo,System.Boolean);Argument[0];ReturnValue;taint;df-generated |
 | System.Reflection;ExceptionHandlingClause;get_CatchType;();Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection;FieldInfo;GetModifiedFieldType;();Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection;FieldInfo;get_FieldHandle;();Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection;FieldInfo;get_FieldType;();Argument[this];ReturnValue;taint;df-generated |
-| System.Reflection;ICustomAttributeProvider;GetCustomAttributes;(System.Boolean);Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection;IReflect;GetField;(System.String,System.Reflection.BindingFlags);Argument[this];ReturnValue;taint;df-generated |
-| System.Reflection;IReflect;get_UnderlyingSystemType;();Argument[this];ReturnValue;taint;df-generated |
-| System.Reflection;IReflect;get_UnderlyingSystemType;();Argument[this];ReturnValue;value;df-generated |
-| System.Reflection;IReflectableType;GetTypeInfo;();Argument[this];ReturnValue;value;df-generated |
+| System.Reflection;IReflect;get_UnderlyingSystemType;();Argument[this];ReturnValue;value;dfc-generated |
+| System.Reflection;IReflectableType;GetTypeInfo;();Argument[this];ReturnValue;value;dfc-generated |
 | System.Reflection;LocalVariableInfo;get_LocalType;();Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection;ManifestResourceInfo;get_ReferencedAssembly;();Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection;MemberFilter;BeginInvoke;(System.Reflection.MemberInfo,System.Object,System.AsyncCallback,System.Object);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
@@ -10803,23 +11467,52 @@
 | System.Reflection;MethodBase;GetGenericArguments;();Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection;MethodBase;GetMethodBody;();Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection;MethodBase;GetParameters;();Argument[this];ReturnValue;taint;df-generated |
+| System.Reflection;MethodBase;Invoke;(System.Object,System.Object[]);Argument[0];Argument[this];taint;df-generated |
+| System.Reflection;MethodBase;Invoke;(System.Object,System.Object[]);Argument[1].Element;Argument[this];taint;df-generated |
+| System.Reflection;MethodBase;Invoke;(System.Object,System.Object[]);Argument[this];ReturnValue;taint;df-generated |
+| System.Reflection;MethodBase;Invoke;(System.Object,System.Reflection.BindingFlags,System.Reflection.Binder,System.Object[],System.Globalization.CultureInfo);Argument[0];Argument[this];taint;df-generated |
+| System.Reflection;MethodBase;Invoke;(System.Object,System.Reflection.BindingFlags,System.Reflection.Binder,System.Object[],System.Globalization.CultureInfo);Argument[3].Element;Argument[this];taint;df-generated |
+| System.Reflection;MethodBase;Invoke;(System.Object,System.Reflection.BindingFlags,System.Reflection.Binder,System.Object[],System.Globalization.CultureInfo);Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection;MethodBase;get_MethodHandle;();Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection;MethodBody;GetILAsByteArray;();Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection;MethodBody;get_ExceptionHandlingClauses;();Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection;MethodBody;get_LocalVariables;();Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection;MethodInfo;CreateDelegate;(System.Type);Argument[this];ReturnValue;taint;df-generated |
-| System.Reflection;MethodInfo;CreateDelegate<T>;();Argument[this];ReturnValue;taint;df-generated |
-| System.Reflection;MethodInfo;GetBaseDefinition;();Argument[this];ReturnValue;taint;df-generated |
-| System.Reflection;MethodInfo;GetBaseDefinition;();Argument[this];ReturnValue;value;df-generated |
-| System.Reflection;MethodInfo;GetGenericMethodDefinition;();Argument[this];ReturnValue;taint;df-generated |
-| System.Reflection;MethodInfo;GetGenericMethodDefinition;();Argument[this];ReturnValue;value;df-generated |
+| System.Reflection;MethodInfo;GetBaseDefinition;();Argument[this];ReturnValue;value;dfc-generated |
+| System.Reflection;MethodInfo;GetGenericMethodDefinition;();Argument[this];ReturnValue;value;dfc-generated |
 | System.Reflection;MethodInfo;MakeGenericMethod;(System.Type[]);Argument[0].Element;ReturnValue;taint;df-generated |
 | System.Reflection;MethodInfo;MakeGenericMethod;(System.Type[]);Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection;MethodInfo;get_ReturnParameter;();Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection;MethodInfo;get_ReturnType;();Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection;MethodInfo;get_ReturnTypeCustomAttributes;();Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection;MethodInfoExtensions;GetBaseDefinition;(System.Reflection.MethodInfo);Argument[0];ReturnValue;taint;df-generated |
+| System.Reflection;MethodInvoker;Invoke;(System.Object);Argument[0];Argument[this];taint;df-generated |
+| System.Reflection;MethodInvoker;Invoke;(System.Object);Argument[this];ReturnValue;taint;df-generated |
+| System.Reflection;MethodInvoker;Invoke;(System.Object,System.Object);Argument[0];Argument[this];taint;df-generated |
+| System.Reflection;MethodInvoker;Invoke;(System.Object,System.Object);Argument[1];Argument[this];taint;df-generated |
+| System.Reflection;MethodInvoker;Invoke;(System.Object,System.Object);Argument[this];ReturnValue;taint;df-generated |
+| System.Reflection;MethodInvoker;Invoke;(System.Object,System.Object,System.Object);Argument[0];Argument[this];taint;df-generated |
+| System.Reflection;MethodInvoker;Invoke;(System.Object,System.Object,System.Object);Argument[1];Argument[this];taint;df-generated |
+| System.Reflection;MethodInvoker;Invoke;(System.Object,System.Object,System.Object);Argument[2];Argument[this];taint;df-generated |
+| System.Reflection;MethodInvoker;Invoke;(System.Object,System.Object,System.Object);Argument[this];ReturnValue;taint;df-generated |
+| System.Reflection;MethodInvoker;Invoke;(System.Object,System.Object,System.Object,System.Object);Argument[0];Argument[this];taint;df-generated |
+| System.Reflection;MethodInvoker;Invoke;(System.Object,System.Object,System.Object,System.Object);Argument[1];Argument[this];taint;df-generated |
+| System.Reflection;MethodInvoker;Invoke;(System.Object,System.Object,System.Object,System.Object);Argument[2];Argument[this];taint;df-generated |
+| System.Reflection;MethodInvoker;Invoke;(System.Object,System.Object,System.Object,System.Object);Argument[3];Argument[this];taint;df-generated |
+| System.Reflection;MethodInvoker;Invoke;(System.Object,System.Object,System.Object,System.Object);Argument[this];ReturnValue;taint;df-generated |
+| System.Reflection;MethodInvoker;Invoke;(System.Object,System.Object,System.Object,System.Object,System.Object);Argument[0];Argument[this];taint;df-generated |
+| System.Reflection;MethodInvoker;Invoke;(System.Object,System.Object,System.Object,System.Object,System.Object);Argument[1];Argument[this];taint;df-generated |
+| System.Reflection;MethodInvoker;Invoke;(System.Object,System.Object,System.Object,System.Object,System.Object);Argument[2];Argument[this];taint;df-generated |
+| System.Reflection;MethodInvoker;Invoke;(System.Object,System.Object,System.Object,System.Object,System.Object);Argument[3];Argument[this];taint;df-generated |
+| System.Reflection;MethodInvoker;Invoke;(System.Object,System.Object,System.Object,System.Object,System.Object);Argument[4];Argument[this];taint;df-generated |
+| System.Reflection;MethodInvoker;Invoke;(System.Object,System.Object,System.Object,System.Object,System.Object);Argument[this];ReturnValue;taint;df-generated |
+| System.Reflection;MethodInvoker;Invoke;(System.Object,System.Span<System.Object>);Argument[0];Argument[this];taint;df-generated |
+| System.Reflection;MethodInvoker;Invoke;(System.Object,System.Span<System.Object>);Argument[1];Argument[this];taint;df-generated |
+| System.Reflection;MethodInvoker;Invoke;(System.Object,System.Span<System.Object>);Argument[this];ReturnValue;taint;df-generated |
+| System.Reflection;Module;FindTypes;(System.Reflection.TypeFilter,System.Object);Argument[0];Argument[0].Parameter[delegate-self];value;dfc-generated |
 | System.Reflection;Module;FindTypes;(System.Reflection.TypeFilter,System.Object);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
+| System.Reflection;Module;FindTypes;(System.Reflection.TypeFilter,System.Object);Argument[1];Argument[0].Parameter[1];value;dfc-generated |
+| System.Reflection;Module;FindTypes;(System.Reflection.TypeFilter,System.Object);Argument[1];Argument[0].Parameter[1];value;hq-generated |
 | System.Reflection;Module;GetField;(System.String);Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection;Module;GetField;(System.String,System.Reflection.BindingFlags);Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection;Module;GetMethod;(System.String);Argument[this];ReturnValue;taint;df-generated |
@@ -10842,14 +11535,14 @@
 | System.Reflection;Module;get_ModuleVersionId;();Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection;Module;get_Name;();Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection;Module;get_ScopeName;();Argument[this];ReturnValue;taint;df-generated |
-| System.Reflection;ModuleExtensions;GetModuleVersionId;(System.Reflection.Module);Argument[0];ReturnValue;taint;df-generated |
+| System.Reflection;ModuleExtensions;GetModuleVersionId;(System.Reflection.Module);Argument[0].Property[System.Reflection.Module.ModuleVersionId];ReturnValue;value;dfc-generated |
 | System.Reflection;ModuleResolveEventHandler;BeginInvoke;(System.Object,System.ResolveEventArgs,System.AsyncCallback,System.Object);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
 | System.Reflection;ParameterInfo;GetModifiedParameterType;();Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection;ParameterInfo;ToString;();Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection;ParameterInfo;get_CustomAttributes;();Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection;ParameterInfo;get_DefaultValue;();Argument[this];ReturnValue;taint;df-generated |
-| System.Reflection;ParameterInfo;get_Member;();Argument[this];ReturnValue;taint;df-generated |
-| System.Reflection;ParameterInfo;get_Name;();Argument[this];ReturnValue;taint;df-generated |
+| System.Reflection;ParameterInfo;get_Member;();Argument[this].Field[System.Reflection.ParameterInfo.MemberImpl];ReturnValue;value;dfc-generated |
+| System.Reflection;ParameterInfo;get_Name;();Argument[this].Field[System.Reflection.ParameterInfo.NameImpl];ReturnValue;value;dfc-generated |
 | System.Reflection;ParameterInfo;get_ParameterType;();Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection;ParameterInfo;get_RawDefaultValue;();Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection;Pointer;Box;(System.Void*,System.Type);Argument[0];ReturnValue;taint;df-generated |
@@ -10863,73 +11556,89 @@
 | System.Reflection;PropertyInfo;GetModifiedPropertyType;();Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection;PropertyInfo;GetSetMethod;();Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection;PropertyInfo;GetSetMethod;(System.Boolean);Argument[this];ReturnValue;taint;df-generated |
+| System.Reflection;PropertyInfo;GetValue;(System.Object);Argument[0];Argument[this];taint;df-generated |
+| System.Reflection;PropertyInfo;GetValue;(System.Object);Argument[this];ReturnValue;taint;df-generated |
+| System.Reflection;PropertyInfo;GetValue;(System.Object,System.Object[]);Argument[0];Argument[this];taint;df-generated |
+| System.Reflection;PropertyInfo;GetValue;(System.Object,System.Object[]);Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection;PropertyInfo;get_GetMethod;();Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection;PropertyInfo;get_PropertyType;();Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection;PropertyInfo;get_SetMethod;();Argument[this];ReturnValue;taint;df-generated |
-| System.Reflection;PropertyInfoExtensions;GetAccessors;(System.Reflection.PropertyInfo);Argument[0];ReturnValue;taint;df-generated |
 | System.Reflection;PropertyInfoExtensions;GetAccessors;(System.Reflection.PropertyInfo,System.Boolean);Argument[0];ReturnValue;taint;df-generated |
-| System.Reflection;PropertyInfoExtensions;GetGetMethod;(System.Reflection.PropertyInfo);Argument[0];ReturnValue;taint;df-generated |
 | System.Reflection;PropertyInfoExtensions;GetGetMethod;(System.Reflection.PropertyInfo,System.Boolean);Argument[0];ReturnValue;taint;df-generated |
-| System.Reflection;PropertyInfoExtensions;GetSetMethod;(System.Reflection.PropertyInfo);Argument[0];ReturnValue;taint;df-generated |
 | System.Reflection;PropertyInfoExtensions;GetSetMethod;(System.Reflection.PropertyInfo,System.Boolean);Argument[0];ReturnValue;taint;df-generated |
-| System.Reflection;ReflectionContext;GetTypeForObject;(System.Object);Argument[this];ReturnValue;taint;df-generated |
-| System.Reflection;ReflectionContext;MapAssembly;(System.Reflection.Assembly);Argument[0];ReturnValue;taint;df-generated |
-| System.Reflection;ReflectionContext;MapAssembly;(System.Reflection.Assembly);Argument[this];ReturnValue;taint;df-generated |
-| System.Reflection;ReflectionContext;MapType;(System.Reflection.TypeInfo);Argument[0];ReturnValue;taint;df-generated |
-| System.Reflection;ReflectionContext;MapType;(System.Reflection.TypeInfo);Argument[this];ReturnValue;taint;df-generated |
-| System.Reflection;ReflectionTypeLoadException;get_Message;();Argument[this];ReturnValue;taint;df-generated |
-| System.Reflection;RuntimeReflectionExtensions;GetMethodInfo;(System.Delegate);Argument[0];ReturnValue;taint;df-generated |
+| System.Reflection;ReflectionContext;MapAssembly;(System.Reflection.Assembly);Argument[0];ReturnValue;value;dfc-generated |
+| System.Reflection;ReflectionContext;MapType;(System.Reflection.TypeInfo);Argument[0];ReturnValue;value;dfc-generated |
+| System.Reflection;ReflectionTypeLoadException;get_Message;();Argument[this].Property[System.Exception.Message];ReturnValue;value;dfc-generated |
+| System.Reflection;ReflectionTypeLoadException;get_Message;();Argument[this].SyntheticField[System.Exception._message];ReturnValue;value;dfc-generated |
+| System.Reflection;RuntimeReflectionExtensions;GetMethodInfo;(System.Delegate);Argument[0].Property[System.Delegate.Method];ReturnValue;value;dfc-generated |
 | System.Reflection;RuntimeReflectionExtensions;GetRuntimeBaseDefinition;(System.Reflection.MethodInfo);Argument[0];ReturnValue;taint;df-generated |
 | System.Reflection;TypeFilter;BeginInvoke;(System.Type,System.Object,System.AsyncCallback,System.Object);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
-| System.Reflection;TypeInfo;AsType;();Argument[this];ReturnValue;value;df-generated |
+| System.Reflection;TypeInfo;AsType;();Argument[this];ReturnValue;value;dfc-generated |
 | System.Reflection;TypeInfo;GetDeclaredEvent;(System.String);Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection;TypeInfo;GetDeclaredField;(System.String);Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection;TypeInfo;get_GenericTypeParameters;();Argument[this];ReturnValue;taint;df-generated |
 | System.Reflection;TypeInfo;get_ImplementedInterfaces;();Argument[this];ReturnValue;taint;df-generated |
 | System.Resources;IResourceReader;GetEnumerator;();Argument[this];ReturnValue;taint;df-generated |
-| System.Resources;MissingSatelliteAssemblyException;MissingSatelliteAssemblyException;(System.String,System.String);Argument[1];Argument[this];taint;df-generated |
-| System.Resources;MissingSatelliteAssemblyException;get_CultureName;();Argument[this];ReturnValue;taint;df-generated |
-| System.Resources;ResourceManager;CreateFileBasedResourceManager;(System.String,System.String,System.Type);Argument[0];ReturnValue;taint;df-generated |
-| System.Resources;ResourceManager;CreateFileBasedResourceManager;(System.String,System.String,System.Type);Argument[1];ReturnValue;taint;df-generated |
+| System.Resources;MissingSatelliteAssemblyException;MissingSatelliteAssemblyException;(System.String,System.String);Argument[1];Argument[this].SyntheticField[System.Resources.MissingSatelliteAssemblyException._cultureName];value;dfc-generated |
+| System.Resources;MissingSatelliteAssemblyException;get_CultureName;();Argument[this].SyntheticField[System.Resources.MissingSatelliteAssemblyException._cultureName];ReturnValue;value;dfc-generated |
 | System.Resources;ResourceManager;GetObject;(System.String,System.Globalization.CultureInfo);Argument[1];Argument[this];taint;df-generated |
-| System.Resources;ResourceManager;GetResourceFileName;(System.Globalization.CultureInfo);Argument[0];ReturnValue;taint;df-generated |
-| System.Resources;ResourceManager;GetResourceFileName;(System.Globalization.CultureInfo);Argument[this];ReturnValue;taint;df-generated |
+| System.Resources;ResourceManager;GetResourceFileName;(System.Globalization.CultureInfo);Argument[0].Property[System.Globalization.CultureInfo.Name];ReturnValue;taint;dfc-generated |
 | System.Resources;ResourceManager;GetStream;(System.String,System.Globalization.CultureInfo);Argument[1];Argument[this];taint;df-generated |
 | System.Resources;ResourceManager;GetString;(System.String,System.Globalization.CultureInfo);Argument[1];Argument[this];taint;df-generated |
-| System.Resources;ResourceManager;ResourceManager;(System.String,System.Reflection.Assembly);Argument[0];Argument[this];taint;df-generated |
-| System.Resources;ResourceManager;ResourceManager;(System.String,System.Reflection.Assembly);Argument[1];Argument[this];taint;df-generated |
-| System.Resources;ResourceManager;ResourceManager;(System.String,System.Reflection.Assembly,System.Type);Argument[0];Argument[this];taint;df-generated |
-| System.Resources;ResourceManager;ResourceManager;(System.String,System.Reflection.Assembly,System.Type);Argument[1];Argument[this];taint;df-generated |
-| System.Resources;ResourceManager;get_BaseName;();Argument[this];ReturnValue;taint;df-generated |
+| System.Resources;ResourceManager;ResourceManager;(System.String,System.Reflection.Assembly);Argument[1];Argument[this].Field[System.Resources.ResourceManager.MainAssembly];value;dfc-generated |
+| System.Resources;ResourceManager;ResourceManager;(System.String,System.Reflection.Assembly,System.Type);Argument[1];Argument[this].Field[System.Resources.ResourceManager.MainAssembly];value;dfc-generated |
 | System.Resources;ResourceReader;GetResourceData;(System.String,System.String,System.Byte[]);Argument[this];ReturnValue;taint;df-generated |
 | System.Resources;ResourceReader;ResourceReader;(System.IO.Stream);Argument[0];Argument[this];taint;df-generated |
 | System.Resources;ResourceSet;GetEnumerator;();Argument[this];ReturnValue;taint;df-generated |
 | System.Resources;ResourceSet;GetObject;(System.String);Argument[this];ReturnValue;taint;df-generated |
 | System.Resources;ResourceSet;GetObject;(System.String,System.Boolean);Argument[this];ReturnValue;taint;df-generated |
 | System.Resources;ResourceSet;ResourceSet;(System.IO.Stream);Argument[0];Argument[this];taint;df-generated |
-| System.Resources;ResourceSet;ResourceSet;(System.Resources.IResourceReader);Argument[0].Element;Argument[this];taint;df-generated |
 | System.Resources;ResourceWriter;ResourceWriter;(System.IO.Stream);Argument[0];Argument[this];taint;df-generated |
 | System.Resources;ResourceWriter;ResourceWriter;(System.String);Argument[0];Argument[this];taint;df-generated |
 | System.Resources;ResourceWriter;set_TypeNameConverter;(System.Func<System.Type,System.String>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
-| System.Runtime.CompilerServices;AsyncIteratorMethodBuilder;AwaitOnCompleted<TAwaiter,TStateMachine>;(TAwaiter,TStateMachine);Argument[1];Argument[this];taint;df-generated |
-| System.Runtime.CompilerServices;AsyncIteratorMethodBuilder;AwaitUnsafeOnCompleted<TAwaiter,TStateMachine>;(TAwaiter,TStateMachine);Argument[1];Argument[this];taint;df-generated |
-| System.Runtime.CompilerServices;AsyncTaskMethodBuilder;AwaitOnCompleted<TAwaiter,TStateMachine>;(TAwaiter,TStateMachine);Argument[1];Argument[this];taint;df-generated |
-| System.Runtime.CompilerServices;AsyncTaskMethodBuilder;AwaitUnsafeOnCompleted<TAwaiter,TStateMachine>;(TAwaiter,TStateMachine);Argument[1];Argument[this];taint;df-generated |
+| System.Runtime.CompilerServices;AsyncIteratorMethodBuilder;AwaitOnCompleted<TAwaiter,TStateMachine>;(TAwaiter,TStateMachine);Argument[0];ReturnValue;value;dfc-generated |
+| System.Runtime.CompilerServices;AsyncIteratorMethodBuilder;AwaitOnCompleted<TAwaiter,TStateMachine>;(TAwaiter,TStateMachine);Argument[1];ReturnValue;value;dfc-generated |
+| System.Runtime.CompilerServices;AsyncIteratorMethodBuilder;AwaitUnsafeOnCompleted<TAwaiter,TStateMachine>;(TAwaiter,TStateMachine);Argument[0];ReturnValue;value;dfc-generated |
+| System.Runtime.CompilerServices;AsyncIteratorMethodBuilder;AwaitUnsafeOnCompleted<TAwaiter,TStateMachine>;(TAwaiter,TStateMachine);Argument[1];ReturnValue;value;dfc-generated |
+| System.Runtime.CompilerServices;AsyncIteratorMethodBuilder;MoveNext<TStateMachine>;(TStateMachine);Argument[0];ReturnValue;value;dfc-generated |
+| System.Runtime.CompilerServices;AsyncTaskMethodBuilder;AwaitOnCompleted<TAwaiter,TStateMachine>;(TAwaiter,TStateMachine);Argument[0];ReturnValue;value;dfc-generated |
+| System.Runtime.CompilerServices;AsyncTaskMethodBuilder;AwaitOnCompleted<TAwaiter,TStateMachine>;(TAwaiter,TStateMachine);Argument[1];ReturnValue;value;dfc-generated |
+| System.Runtime.CompilerServices;AsyncTaskMethodBuilder;AwaitUnsafeOnCompleted<TAwaiter,TStateMachine>;(TAwaiter,TStateMachine);Argument[0];ReturnValue;value;dfc-generated |
+| System.Runtime.CompilerServices;AsyncTaskMethodBuilder;AwaitUnsafeOnCompleted<TAwaiter,TStateMachine>;(TAwaiter,TStateMachine);Argument[1];ReturnValue;value;dfc-generated |
+| System.Runtime.CompilerServices;AsyncTaskMethodBuilder;Start<TStateMachine>;(TStateMachine);Argument[0];ReturnValue;value;dfc-generated |
 | System.Runtime.CompilerServices;AsyncTaskMethodBuilder;get_Task;();Argument[this];ReturnValue;taint;df-generated |
-| System.Runtime.CompilerServices;AsyncTaskMethodBuilder<TResult>;AwaitOnCompleted<TAwaiter,TStateMachine>;(TAwaiter,TStateMachine);Argument[1];Argument[this];taint;df-generated |
-| System.Runtime.CompilerServices;AsyncTaskMethodBuilder<TResult>;AwaitUnsafeOnCompleted<TAwaiter,TStateMachine>;(TAwaiter,TStateMachine);Argument[1];Argument[this];taint;df-generated |
-| System.Runtime.CompilerServices;AsyncTaskMethodBuilder<TResult>;SetResult;(TResult);Argument[0];Argument[this];taint;df-generated |
-| System.Runtime.CompilerServices;AsyncTaskMethodBuilder<TResult>;get_Task;();Argument[this];ReturnValue;taint;df-generated |
-| System.Runtime.CompilerServices;AsyncValueTaskMethodBuilder;AwaitOnCompleted<TAwaiter,TStateMachine>;(TAwaiter,TStateMachine);Argument[1];Argument[this];taint;df-generated |
-| System.Runtime.CompilerServices;AsyncValueTaskMethodBuilder;AwaitUnsafeOnCompleted<TAwaiter,TStateMachine>;(TAwaiter,TStateMachine);Argument[1];Argument[this];taint;df-generated |
-| System.Runtime.CompilerServices;AsyncValueTaskMethodBuilder<TResult>;AwaitOnCompleted<TAwaiter,TStateMachine>;(TAwaiter,TStateMachine);Argument[1];Argument[this];taint;df-generated |
-| System.Runtime.CompilerServices;AsyncValueTaskMethodBuilder<TResult>;AwaitUnsafeOnCompleted<TAwaiter,TStateMachine>;(TAwaiter,TStateMachine);Argument[1];Argument[this];taint;df-generated |
+| System.Runtime.CompilerServices;AsyncTaskMethodBuilder<TResult>;AwaitOnCompleted<TAwaiter,TStateMachine>;(TAwaiter,TStateMachine);Argument[0];ReturnValue;value;dfc-generated |
+| System.Runtime.CompilerServices;AsyncTaskMethodBuilder<TResult>;AwaitOnCompleted<TAwaiter,TStateMachine>;(TAwaiter,TStateMachine);Argument[1];ReturnValue;value;dfc-generated |
+| System.Runtime.CompilerServices;AsyncTaskMethodBuilder<TResult>;AwaitUnsafeOnCompleted<TAwaiter,TStateMachine>;(TAwaiter,TStateMachine);Argument[0];ReturnValue;value;dfc-generated |
+| System.Runtime.CompilerServices;AsyncTaskMethodBuilder<TResult>;AwaitUnsafeOnCompleted<TAwaiter,TStateMachine>;(TAwaiter,TStateMachine);Argument[1];ReturnValue;value;dfc-generated |
+| System.Runtime.CompilerServices;AsyncTaskMethodBuilder<TResult>;SetResult;(TResult);Argument[0];Argument[this].SyntheticField[System.Runtime.CompilerServices.AsyncTaskMethodBuilder`1.m_task].Property[System.Threading.Tasks.Task`1.Result];value;dfc-generated |
+| System.Runtime.CompilerServices;AsyncTaskMethodBuilder<TResult>;Start<TStateMachine>;(TStateMachine);Argument[0];ReturnValue;value;dfc-generated |
+| System.Runtime.CompilerServices;AsyncTaskMethodBuilder<TResult>;get_Task;();Argument[this].SyntheticField[System.Runtime.CompilerServices.AsyncTaskMethodBuilder`1.m_task];ReturnValue;value;dfc-generated |
+| System.Runtime.CompilerServices;AsyncValueTaskMethodBuilder;AwaitOnCompleted<TAwaiter,TStateMachine>;(TAwaiter,TStateMachine);Argument[0];ReturnValue;value;dfc-generated |
+| System.Runtime.CompilerServices;AsyncValueTaskMethodBuilder;AwaitOnCompleted<TAwaiter,TStateMachine>;(TAwaiter,TStateMachine);Argument[1];ReturnValue;value;dfc-generated |
+| System.Runtime.CompilerServices;AsyncValueTaskMethodBuilder;AwaitUnsafeOnCompleted<TAwaiter,TStateMachine>;(TAwaiter,TStateMachine);Argument[0];ReturnValue;value;dfc-generated |
+| System.Runtime.CompilerServices;AsyncValueTaskMethodBuilder;AwaitUnsafeOnCompleted<TAwaiter,TStateMachine>;(TAwaiter,TStateMachine);Argument[1];ReturnValue;value;dfc-generated |
+| System.Runtime.CompilerServices;AsyncValueTaskMethodBuilder;Start<TStateMachine>;(TStateMachine);Argument[0];ReturnValue;value;dfc-generated |
+| System.Runtime.CompilerServices;AsyncValueTaskMethodBuilder<TResult>;AwaitOnCompleted<TAwaiter,TStateMachine>;(TAwaiter,TStateMachine);Argument[0];ReturnValue;value;dfc-generated |
+| System.Runtime.CompilerServices;AsyncValueTaskMethodBuilder<TResult>;AwaitOnCompleted<TAwaiter,TStateMachine>;(TAwaiter,TStateMachine);Argument[1];ReturnValue;value;dfc-generated |
+| System.Runtime.CompilerServices;AsyncValueTaskMethodBuilder<TResult>;AwaitUnsafeOnCompleted<TAwaiter,TStateMachine>;(TAwaiter,TStateMachine);Argument[0];ReturnValue;value;dfc-generated |
+| System.Runtime.CompilerServices;AsyncValueTaskMethodBuilder<TResult>;AwaitUnsafeOnCompleted<TAwaiter,TStateMachine>;(TAwaiter,TStateMachine);Argument[1];ReturnValue;value;dfc-generated |
 | System.Runtime.CompilerServices;AsyncValueTaskMethodBuilder<TResult>;SetResult;(TResult);Argument[0];Argument[this];taint;df-generated |
+| System.Runtime.CompilerServices;AsyncValueTaskMethodBuilder<TResult>;Start<TStateMachine>;(TStateMachine);Argument[0];ReturnValue;value;dfc-generated |
 | System.Runtime.CompilerServices;AsyncValueTaskMethodBuilder<TResult>;get_Task;();Argument[this];ReturnValue;taint;df-generated |
+| System.Runtime.CompilerServices;AsyncVoidMethodBuilder;AwaitOnCompleted<TAwaiter,TStateMachine>;(TAwaiter,TStateMachine);Argument[0];ReturnValue;value;dfc-generated |
+| System.Runtime.CompilerServices;AsyncVoidMethodBuilder;AwaitOnCompleted<TAwaiter,TStateMachine>;(TAwaiter,TStateMachine);Argument[1];ReturnValue;value;dfc-generated |
+| System.Runtime.CompilerServices;AsyncVoidMethodBuilder;AwaitUnsafeOnCompleted<TAwaiter,TStateMachine>;(TAwaiter,TStateMachine);Argument[0];ReturnValue;value;dfc-generated |
+| System.Runtime.CompilerServices;AsyncVoidMethodBuilder;AwaitUnsafeOnCompleted<TAwaiter,TStateMachine>;(TAwaiter,TStateMachine);Argument[1];ReturnValue;value;dfc-generated |
+| System.Runtime.CompilerServices;AsyncVoidMethodBuilder;Start<TStateMachine>;(TStateMachine);Argument[0];ReturnValue;value;dfc-generated |
 | System.Runtime.CompilerServices;CallSite;get_Binder;();Argument[this];ReturnValue;taint;df-generated |
 | System.Runtime.CompilerServices;ConditionalWeakTable<TKey,TValue>+CreateValueCallback;BeginInvoke;(TKey,System.AsyncCallback,System.Object);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
 | System.Runtime.CompilerServices;ConditionalWeakTable<TKey,TValue>;Clear;();Argument[this].WithoutElement;Argument[this];value;manual |
-| System.Runtime.CompilerServices;ConditionalWeakTable<TKey,TValue>;GetOrCreateValue;(TKey);Argument[0];ReturnValue;taint;df-generated |
+| System.Runtime.CompilerServices;ConditionalWeakTable<TKey,TValue>;GetValue;(TKey,System.Runtime.CompilerServices.ConditionalWeakTable<TKey,TValue>+CreateValueCallback);Argument[0];Argument[1].Parameter[0];value;dfc-generated |
+| System.Runtime.CompilerServices;ConditionalWeakTable<TKey,TValue>;GetValue;(TKey,System.Runtime.CompilerServices.ConditionalWeakTable<TKey,TValue>+CreateValueCallback);Argument[0];Argument[1].Parameter[0];value;hq-generated |
+| System.Runtime.CompilerServices;ConditionalWeakTable<TKey,TValue>;GetValue;(TKey,System.Runtime.CompilerServices.ConditionalWeakTable<TKey,TValue>+CreateValueCallback);Argument[1].ReturnValue;ReturnValue;value;dfc-generated |
+| System.Runtime.CompilerServices;ConditionalWeakTable<TKey,TValue>;GetValue;(TKey,System.Runtime.CompilerServices.ConditionalWeakTable<TKey,TValue>+CreateValueCallback);Argument[1].ReturnValue;ReturnValue;value;hq-generated |
+| System.Runtime.CompilerServices;ConditionalWeakTable<TKey,TValue>;GetValue;(TKey,System.Runtime.CompilerServices.ConditionalWeakTable<TKey,TValue>+CreateValueCallback);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | System.Runtime.CompilerServices;ConditionalWeakTable<TKey,TValue>;GetValue;(TKey,System.Runtime.CompilerServices.ConditionalWeakTable<TKey,TValue>+CreateValueCallback);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
 | System.Runtime.CompilerServices;ConfiguredCancelableAsyncEnumerable<T>+Enumerator;get_Current;();Argument[this];ReturnValue;taint;df-generated |
 | System.Runtime.CompilerServices;ConfiguredCancelableAsyncEnumerable<T>;ConfigureAwait;(System.Boolean);Argument[this];ReturnValue;taint;df-generated |
@@ -10942,43 +11651,66 @@
 | System.Runtime.CompilerServices;ConfiguredValueTaskAwaitable;GetAwaiter;();Argument[this];ReturnValue;taint;df-generated |
 | System.Runtime.CompilerServices;ConfiguredValueTaskAwaitable<TResult>+ConfiguredValueTaskAwaiter;GetResult;();Argument[this];ReturnValue;taint;df-generated |
 | System.Runtime.CompilerServices;ConfiguredValueTaskAwaitable<TResult>;GetAwaiter;();Argument[this];ReturnValue;taint;df-generated |
-| System.Runtime.CompilerServices;ContractHelper;RaiseContractFailedEvent;(System.Diagnostics.Contracts.ContractFailureKind,System.String,System.String,System.Exception);Argument[1];ReturnValue;taint;df-generated |
-| System.Runtime.CompilerServices;ContractHelper;RaiseContractFailedEvent;(System.Diagnostics.Contracts.ContractFailureKind,System.String,System.String,System.Exception);Argument[2];ReturnValue;taint;df-generated |
+| System.Runtime.CompilerServices;ContractHelper;RaiseContractFailedEvent;(System.Diagnostics.Contracts.ContractFailureKind,System.String,System.String,System.Exception);Argument[1];ReturnValue;taint;dfc-generated |
+| System.Runtime.CompilerServices;ContractHelper;RaiseContractFailedEvent;(System.Diagnostics.Contracts.ContractFailureKind,System.String,System.String,System.Exception);Argument[2];ReturnValue;taint;dfc-generated |
 | System.Runtime.CompilerServices;DefaultInterpolatedStringHandler;DefaultInterpolatedStringHandler;(System.Int32,System.Int32,System.IFormatProvider);Argument[2];Argument[this];taint;df-generated |
 | System.Runtime.CompilerServices;DefaultInterpolatedStringHandler;DefaultInterpolatedStringHandler;(System.Int32,System.Int32,System.IFormatProvider,System.Span<System.Char>);Argument[2];Argument[this];taint;df-generated |
 | System.Runtime.CompilerServices;DefaultInterpolatedStringHandler;DefaultInterpolatedStringHandler;(System.Int32,System.Int32,System.IFormatProvider,System.Span<System.Char>);Argument[3];Argument[this];taint;df-generated |
-| System.Runtime.CompilerServices;FormattableStringFactory;Create;(System.String,System.Object[]);Argument[0];ReturnValue;taint;df-generated |
-| System.Runtime.CompilerServices;FormattableStringFactory;Create;(System.String,System.Object[]);Argument[1].Element;ReturnValue;taint;df-generated |
+| System.Runtime.CompilerServices;FormattableStringFactory;Create;(System.String,System.Object[]);Argument[0];ReturnValue.SyntheticField[System.Runtime.CompilerServices.FormattableStringFactory+ConcreteFormattableString._format];value;dfc-generated |
+| System.Runtime.CompilerServices;FormattableStringFactory;Create;(System.String,System.Object[]);Argument[1];ReturnValue.SyntheticField[System.Runtime.CompilerServices.FormattableStringFactory+ConcreteFormattableString._arguments];value;dfc-generated |
 | System.Runtime.CompilerServices;ICriticalNotifyCompletion;UnsafeOnCompleted;(System.Action);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Runtime.CompilerServices;INotifyCompletion;OnCompleted;(System.Action);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Runtime.CompilerServices;IRuntimeVariables;get_Item;(System.Int32);Argument[this];ReturnValue;taint;df-generated |
 | System.Runtime.CompilerServices;ITuple;get_Item;(System.Int32);Argument[this];ReturnValue;taint;df-generated |
-| System.Runtime.CompilerServices;NullableAttribute;NullableAttribute;(System.Byte[]);Argument[0].Element;Argument[this];taint;df-generated |
-| System.Runtime.CompilerServices;PoolingAsyncValueTaskMethodBuilder;AwaitOnCompleted<TAwaiter,TStateMachine>;(TAwaiter,TStateMachine);Argument[1];Argument[this];taint;df-generated |
-| System.Runtime.CompilerServices;PoolingAsyncValueTaskMethodBuilder;AwaitUnsafeOnCompleted<TAwaiter,TStateMachine>;(TAwaiter,TStateMachine);Argument[1];Argument[this];taint;df-generated |
-| System.Runtime.CompilerServices;PoolingAsyncValueTaskMethodBuilder<TResult>;AwaitOnCompleted<TAwaiter,TStateMachine>;(TAwaiter,TStateMachine);Argument[1];Argument[this];taint;df-generated |
-| System.Runtime.CompilerServices;PoolingAsyncValueTaskMethodBuilder<TResult>;AwaitUnsafeOnCompleted<TAwaiter,TStateMachine>;(TAwaiter,TStateMachine);Argument[1];Argument[this];taint;df-generated |
+| System.Runtime.CompilerServices;NullableAttribute;NullableAttribute;(System.Byte[]);Argument[0];Argument[this].Field[System.Runtime.CompilerServices.NullableAttribute.NullableFlags];value;dfc-generated |
+| System.Runtime.CompilerServices;PoolingAsyncValueTaskMethodBuilder;AwaitOnCompleted<TAwaiter,TStateMachine>;(TAwaiter,TStateMachine);Argument[0];ReturnValue;value;dfc-generated |
+| System.Runtime.CompilerServices;PoolingAsyncValueTaskMethodBuilder;AwaitOnCompleted<TAwaiter,TStateMachine>;(TAwaiter,TStateMachine);Argument[1];ReturnValue;value;dfc-generated |
+| System.Runtime.CompilerServices;PoolingAsyncValueTaskMethodBuilder;AwaitUnsafeOnCompleted<TAwaiter,TStateMachine>;(TAwaiter,TStateMachine);Argument[0];ReturnValue;value;dfc-generated |
+| System.Runtime.CompilerServices;PoolingAsyncValueTaskMethodBuilder;AwaitUnsafeOnCompleted<TAwaiter,TStateMachine>;(TAwaiter,TStateMachine);Argument[1];ReturnValue;value;dfc-generated |
+| System.Runtime.CompilerServices;PoolingAsyncValueTaskMethodBuilder;Start<TStateMachine>;(TStateMachine);Argument[0];ReturnValue;value;dfc-generated |
+| System.Runtime.CompilerServices;PoolingAsyncValueTaskMethodBuilder<TResult>;AwaitOnCompleted<TAwaiter,TStateMachine>;(TAwaiter,TStateMachine);Argument[0];ReturnValue;value;dfc-generated |
+| System.Runtime.CompilerServices;PoolingAsyncValueTaskMethodBuilder<TResult>;AwaitOnCompleted<TAwaiter,TStateMachine>;(TAwaiter,TStateMachine);Argument[1];ReturnValue;value;dfc-generated |
+| System.Runtime.CompilerServices;PoolingAsyncValueTaskMethodBuilder<TResult>;AwaitUnsafeOnCompleted<TAwaiter,TStateMachine>;(TAwaiter,TStateMachine);Argument[0];ReturnValue;value;dfc-generated |
+| System.Runtime.CompilerServices;PoolingAsyncValueTaskMethodBuilder<TResult>;AwaitUnsafeOnCompleted<TAwaiter,TStateMachine>;(TAwaiter,TStateMachine);Argument[1];ReturnValue;value;dfc-generated |
 | System.Runtime.CompilerServices;PoolingAsyncValueTaskMethodBuilder<TResult>;SetResult;(TResult);Argument[0];Argument[this];taint;df-generated |
+| System.Runtime.CompilerServices;PoolingAsyncValueTaskMethodBuilder<TResult>;Start<TStateMachine>;(TStateMachine);Argument[0];ReturnValue;value;dfc-generated |
 | System.Runtime.CompilerServices;PoolingAsyncValueTaskMethodBuilder<TResult>;get_Task;();Argument[this];ReturnValue;taint;df-generated |
 | System.Runtime.CompilerServices;ReadOnlyCollectionBuilder<T>;ReadOnlyCollectionBuilder;(System.Collections.Generic.IEnumerable<T>);Argument[0].Element;Argument[this];taint;df-generated |
 | System.Runtime.CompilerServices;RuntimeHelpers+CleanupCode;BeginInvoke;(System.Object,System.Boolean,System.AsyncCallback,System.Object);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
 | System.Runtime.CompilerServices;RuntimeHelpers+TryCode;BeginInvoke;(System.Object,System.AsyncCallback,System.Object);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
+| System.Runtime.CompilerServices;RuntimeHelpers;ExecuteCodeWithGuaranteedCleanup;(System.Runtime.CompilerServices.RuntimeHelpers+TryCode,System.Runtime.CompilerServices.RuntimeHelpers+CleanupCode,System.Object);Argument[0];Argument[0].Parameter[delegate-self];value;dfc-generated |
 | System.Runtime.CompilerServices;RuntimeHelpers;ExecuteCodeWithGuaranteedCleanup;(System.Runtime.CompilerServices.RuntimeHelpers+TryCode,System.Runtime.CompilerServices.RuntimeHelpers+CleanupCode,System.Object);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
+| System.Runtime.CompilerServices;RuntimeHelpers;ExecuteCodeWithGuaranteedCleanup;(System.Runtime.CompilerServices.RuntimeHelpers+TryCode,System.Runtime.CompilerServices.RuntimeHelpers+CleanupCode,System.Object);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | System.Runtime.CompilerServices;RuntimeHelpers;ExecuteCodeWithGuaranteedCleanup;(System.Runtime.CompilerServices.RuntimeHelpers+TryCode,System.Runtime.CompilerServices.RuntimeHelpers+CleanupCode,System.Object);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
-| System.Runtime.CompilerServices;RuntimeWrappedException;RuntimeWrappedException;(System.Object);Argument[0];Argument[this];taint;df-generated |
-| System.Runtime.CompilerServices;RuntimeWrappedException;get_WrappedException;();Argument[this];ReturnValue;taint;df-generated |
-| System.Runtime.CompilerServices;StrongBox<T>;StrongBox;(T);Argument[0];Argument[this];taint;df-generated |
-| System.Runtime.CompilerServices;SwitchExpressionException;get_Message;();Argument[this];ReturnValue;taint;df-generated |
+| System.Runtime.CompilerServices;RuntimeHelpers;ExecuteCodeWithGuaranteedCleanup;(System.Runtime.CompilerServices.RuntimeHelpers+TryCode,System.Runtime.CompilerServices.RuntimeHelpers+CleanupCode,System.Object);Argument[2];Argument[0].Parameter[0];value;dfc-generated |
+| System.Runtime.CompilerServices;RuntimeHelpers;ExecuteCodeWithGuaranteedCleanup;(System.Runtime.CompilerServices.RuntimeHelpers+TryCode,System.Runtime.CompilerServices.RuntimeHelpers+CleanupCode,System.Object);Argument[2];Argument[0].Parameter[0];value;hq-generated |
+| System.Runtime.CompilerServices;RuntimeHelpers;ExecuteCodeWithGuaranteedCleanup;(System.Runtime.CompilerServices.RuntimeHelpers+TryCode,System.Runtime.CompilerServices.RuntimeHelpers+CleanupCode,System.Object);Argument[2];Argument[1].Parameter[0];value;dfc-generated |
+| System.Runtime.CompilerServices;RuntimeHelpers;ExecuteCodeWithGuaranteedCleanup;(System.Runtime.CompilerServices.RuntimeHelpers+TryCode,System.Runtime.CompilerServices.RuntimeHelpers+CleanupCode,System.Object);Argument[2];Argument[1].Parameter[0];value;hq-generated |
+| System.Runtime.CompilerServices;RuntimeWrappedException;RuntimeWrappedException;(System.Object);Argument[0];Argument[this].SyntheticField[System.Runtime.CompilerServices.RuntimeWrappedException._wrappedException];value;dfc-generated |
+| System.Runtime.CompilerServices;RuntimeWrappedException;get_WrappedException;();Argument[this].SyntheticField[System.Runtime.CompilerServices.RuntimeWrappedException._wrappedException];ReturnValue;value;dfc-generated |
+| System.Runtime.CompilerServices;StrongBox<T>;StrongBox;(T);Argument[0];Argument[this].Field[System.Runtime.CompilerServices.StrongBox`1.Value];value;dfc-generated |
+| System.Runtime.CompilerServices;SwitchExpressionException;get_Message;();Argument[this].Property[System.Exception.Message];ReturnValue;value;dfc-generated |
+| System.Runtime.CompilerServices;SwitchExpressionException;get_Message;();Argument[this].Property[System.Runtime.CompilerServices.SwitchExpressionException.UnmatchedValue];ReturnValue;taint;dfc-generated |
+| System.Runtime.CompilerServices;SwitchExpressionException;get_Message;();Argument[this].SyntheticField[System.Exception._message];ReturnValue;value;dfc-generated |
 | System.Runtime.CompilerServices;TaskAwaiter<TResult>;GetResult;();Argument[this].SyntheticField[m_task_task_awaiter].Property[System.Threading.Tasks.Task`1.Result];ReturnValue;value;manual |
-| System.Runtime.CompilerServices;TupleElementNamesAttribute;TupleElementNamesAttribute;(System.String[]);Argument[0].Element;Argument[this];taint;df-generated |
-| System.Runtime.CompilerServices;TupleElementNamesAttribute;get_TransformNames;();Argument[this];ReturnValue;taint;df-generated |
+| System.Runtime.CompilerServices;TupleElementNamesAttribute;TupleElementNamesAttribute;(System.String[]);Argument[0];Argument[this].SyntheticField[System.Runtime.CompilerServices.TupleElementNamesAttribute._transformNames];value;dfc-generated |
+| System.Runtime.CompilerServices;TupleElementNamesAttribute;get_TransformNames;();Argument[this].SyntheticField[System.Runtime.CompilerServices.TupleElementNamesAttribute._transformNames];ReturnValue;value;dfc-generated |
+| System.Runtime.CompilerServices;Unsafe;Add<T>;(T,System.Int32);Argument[0];ReturnValue;value;dfc-generated |
+| System.Runtime.CompilerServices;Unsafe;Add<T>;(T,System.IntPtr);Argument[0];ReturnValue;value;dfc-generated |
+| System.Runtime.CompilerServices;Unsafe;Add<T>;(T,System.UIntPtr);Argument[0];ReturnValue;value;dfc-generated |
+| System.Runtime.CompilerServices;Unsafe;AddByteOffset<T>;(T,System.UIntPtr);Argument[0];ReturnValue;value;dfc-generated |
+| System.Runtime.CompilerServices;Unsafe;Copy<T>;(T,System.Void*);Argument[0];ReturnValue;value;dfc-generated |
+| System.Runtime.CompilerServices;Unsafe;Subtract<T>;(T,System.Int32);Argument[0];ReturnValue;value;dfc-generated |
+| System.Runtime.CompilerServices;Unsafe;Subtract<T>;(T,System.IntPtr);Argument[0];ReturnValue;value;dfc-generated |
+| System.Runtime.CompilerServices;Unsafe;Subtract<T>;(T,System.UIntPtr);Argument[0];ReturnValue;value;dfc-generated |
+| System.Runtime.CompilerServices;Unsafe;SubtractByteOffset<T>;(T,System.UIntPtr);Argument[0];ReturnValue;value;dfc-generated |
 | System.Runtime.CompilerServices;ValueTaskAwaiter<TResult>;GetResult;();Argument[this];ReturnValue;taint;df-generated |
-| System.Runtime.ExceptionServices;ExceptionDispatchInfo;Capture;(System.Exception);Argument[0];ReturnValue;taint;df-generated |
-| System.Runtime.ExceptionServices;ExceptionDispatchInfo;SetCurrentStackTrace;(System.Exception);Argument[0];ReturnValue;taint;df-generated |
-| System.Runtime.ExceptionServices;ExceptionDispatchInfo;SetRemoteStackTrace;(System.Exception,System.String);Argument[0];ReturnValue;taint;df-generated |
-| System.Runtime.ExceptionServices;ExceptionDispatchInfo;SetRemoteStackTrace;(System.Exception,System.String);Argument[1];Argument[0];taint;df-generated |
-| System.Runtime.ExceptionServices;ExceptionDispatchInfo;SetRemoteStackTrace;(System.Exception,System.String);Argument[1];ReturnValue;taint;df-generated |
-| System.Runtime.ExceptionServices;ExceptionDispatchInfo;get_SourceException;();Argument[this];ReturnValue;taint;df-generated |
+| System.Runtime.ExceptionServices;ExceptionDispatchInfo;Capture;(System.Exception);Argument[0];ReturnValue.SyntheticField[System.Runtime.ExceptionServices.ExceptionDispatchInfo._exception];value;dfc-generated |
+| System.Runtime.ExceptionServices;ExceptionDispatchInfo;SetCurrentStackTrace;(System.Exception);Argument[0];ReturnValue;value;dfc-generated |
+| System.Runtime.ExceptionServices;ExceptionDispatchInfo;SetRemoteStackTrace;(System.Exception,System.String);Argument[0];ReturnValue;value;dfc-generated |
+| System.Runtime.ExceptionServices;ExceptionDispatchInfo;SetRemoteStackTrace;(System.Exception,System.String);Argument[1];Argument[0].SyntheticField[System.Exception._remoteStackTraceString];taint;dfc-generated |
+| System.Runtime.ExceptionServices;ExceptionDispatchInfo;SetRemoteStackTrace;(System.Exception,System.String);Argument[1];ReturnValue.SyntheticField[System.Exception._remoteStackTraceString];taint;dfc-generated |
+| System.Runtime.ExceptionServices;ExceptionDispatchInfo;get_SourceException;();Argument[this].SyntheticField[System.Runtime.ExceptionServices.ExceptionDispatchInfo._exception];ReturnValue;value;dfc-generated |
 | System.Runtime.InteropServices.JavaScript;JSMarshalerArgument+ArgumentToJSCallback<T>;BeginInvoke;(System.Runtime.InteropServices.JavaScript.JSMarshalerArgument,T,System.AsyncCallback,System.Object);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
 | System.Runtime.InteropServices.JavaScript;JSMarshalerArgument+ArgumentToManagedCallback<T>;BeginInvoke;(System.Runtime.InteropServices.JavaScript.JSMarshalerArgument,T,System.AsyncCallback,System.Object);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
 | System.Runtime.InteropServices.JavaScript;JSMarshalerArgument;ToJS;(System.Action);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
@@ -11032,105 +11764,113 @@
 | System.Runtime.InteropServices.JavaScript;JSMarshalerArgument;ToManaged<TResult>;(System.Func<TResult>,System.Runtime.InteropServices.JavaScript.JSMarshalerArgument+ArgumentToManagedCallback<TResult>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Runtime.InteropServices.JavaScript;JSMarshalerArgument;ToManaged<TResult>;(System.Func<TResult>,System.Runtime.InteropServices.JavaScript.JSMarshalerArgument+ArgumentToManagedCallback<TResult>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
 | System.Runtime.InteropServices.Marshalling;AnsiStringMarshaller+ManagedToUnmanagedIn;ToUnmanaged;();Argument[this];ReturnValue;taint;df-generated |
-| System.Runtime.InteropServices.Marshalling;ArrayMarshaller<T,TUnmanagedElement>+ManagedToUnmanagedIn;FromManaged;(T[],System.Span<TUnmanagedElement>);Argument[0].Element;Argument[this];taint;df-generated |
-| System.Runtime.InteropServices.Marshalling;ArrayMarshaller<T,TUnmanagedElement>+ManagedToUnmanagedIn;FromManaged;(T[],System.Span<TUnmanagedElement>);Argument[1];Argument[this];taint;df-generated |
-| System.Runtime.InteropServices.Marshalling;ArrayMarshaller<T,TUnmanagedElement>+ManagedToUnmanagedIn;GetManagedValuesSource;();Argument[this];ReturnValue;taint;df-generated |
+| System.Runtime.InteropServices.Marshalling;ArrayMarshaller<T,TUnmanagedElement>+ManagedToUnmanagedIn;FromManaged;(T[],System.Span<TUnmanagedElement>);Argument[0];Argument[this].SyntheticField[System.Runtime.InteropServices.Marshalling.ArrayMarshaller`2+ManagedToUnmanagedIn._managedArray];value;dfc-generated |
+| System.Runtime.InteropServices.Marshalling;ArrayMarshaller<T,TUnmanagedElement>+ManagedToUnmanagedIn;GetManagedValuesSource;();Argument[this].SyntheticField[System.Runtime.InteropServices.Marshalling.ArrayMarshaller`2+ManagedToUnmanagedIn._managedArray].Element;ReturnValue.Element;value;dfc-generated |
 | System.Runtime.InteropServices.Marshalling;ArrayMarshaller<T,TUnmanagedElement>+ManagedToUnmanagedIn;GetUnmanagedValuesDestination;();Argument[this];ReturnValue;taint;df-generated |
-| System.Runtime.InteropServices.Marshalling;ArrayMarshaller<T,TUnmanagedElement>;GetManagedValuesDestination;(T[]);Argument[0].Element;ReturnValue;taint;df-generated |
-| System.Runtime.InteropServices.Marshalling;ArrayMarshaller<T,TUnmanagedElement>;GetManagedValuesSource;(T[]);Argument[0].Element;ReturnValue;taint;df-generated |
+| System.Runtime.InteropServices.Marshalling;ArrayMarshaller<T,TUnmanagedElement>;GetManagedValuesDestination;(T[]);Argument[0].Element;ReturnValue.Element;value;dfc-generated |
+| System.Runtime.InteropServices.Marshalling;ArrayMarshaller<T,TUnmanagedElement>;GetManagedValuesSource;(T[]);Argument[0].Element;ReturnValue.Element;value;dfc-generated |
 | System.Runtime.InteropServices.Marshalling;BStrStringMarshaller+ManagedToUnmanagedIn;ToUnmanaged;();Argument[this];ReturnValue;taint;df-generated |
-| System.Runtime.InteropServices.Marshalling;IIUnknownStrategy;CreateInstancePointer;(System.Void*);Argument[0];ReturnValue;taint;df-generated |
+| System.Runtime.InteropServices.Marshalling;IIUnknownStrategy;CreateInstancePointer;(System.Void*);Argument[0];ReturnValue;value;dfc-generated |
 | System.Runtime.InteropServices.Marshalling;PointerArrayMarshaller<T,TUnmanagedElement>+ManagedToUnmanagedIn;FromManaged;(T*[],System.Span<TUnmanagedElement>);Argument[0].Element;Argument[this];taint;df-generated |
 | System.Runtime.InteropServices.Marshalling;PointerArrayMarshaller<T,TUnmanagedElement>+ManagedToUnmanagedIn;FromManaged;(T*[],System.Span<TUnmanagedElement>);Argument[1];Argument[this];taint;df-generated |
 | System.Runtime.InteropServices.Marshalling;PointerArrayMarshaller<T,TUnmanagedElement>+ManagedToUnmanagedIn;GetUnmanagedValuesDestination;();Argument[this];ReturnValue;taint;df-generated |
-| System.Runtime.InteropServices.Marshalling;ReadOnlySpanMarshaller<T,TUnmanagedElement>+ManagedToUnmanagedIn;FromManaged;(System.ReadOnlySpan<T>,System.Span<TUnmanagedElement>);Argument[0];Argument[this];taint;df-generated |
-| System.Runtime.InteropServices.Marshalling;ReadOnlySpanMarshaller<T,TUnmanagedElement>+ManagedToUnmanagedIn;FromManaged;(System.ReadOnlySpan<T>,System.Span<TUnmanagedElement>);Argument[1];Argument[this];taint;df-generated |
-| System.Runtime.InteropServices.Marshalling;ReadOnlySpanMarshaller<T,TUnmanagedElement>+ManagedToUnmanagedIn;GetManagedValuesSource;();Argument[this];ReturnValue;taint;df-generated |
+| System.Runtime.InteropServices.Marshalling;ReadOnlySpanMarshaller<T,TUnmanagedElement>+ManagedToUnmanagedIn;FromManaged;(System.ReadOnlySpan<T>,System.Span<TUnmanagedElement>);Argument[0];Argument[this].SyntheticField[System.Runtime.InteropServices.Marshalling.ReadOnlySpanMarshaller`2+ManagedToUnmanagedIn._managedArray];value;dfc-generated |
+| System.Runtime.InteropServices.Marshalling;ReadOnlySpanMarshaller<T,TUnmanagedElement>+ManagedToUnmanagedIn;GetManagedValuesSource;();Argument[this].SyntheticField[System.Runtime.InteropServices.Marshalling.ReadOnlySpanMarshaller`2+ManagedToUnmanagedIn._managedArray];ReturnValue;value;dfc-generated |
 | System.Runtime.InteropServices.Marshalling;ReadOnlySpanMarshaller<T,TUnmanagedElement>+ManagedToUnmanagedIn;GetUnmanagedValuesDestination;();Argument[this];ReturnValue;taint;df-generated |
-| System.Runtime.InteropServices.Marshalling;ReadOnlySpanMarshaller<T,TUnmanagedElement>+UnmanagedToManagedOut;GetManagedValuesSource;(System.ReadOnlySpan<T>);Argument[0];ReturnValue;taint;df-generated |
-| System.Runtime.InteropServices.Marshalling;SafeHandleMarshaller<T>+ManagedToUnmanagedIn;FromManaged;(T);Argument[0];Argument[this];taint;df-generated |
-| System.Runtime.InteropServices.Marshalling;SafeHandleMarshaller<T>+ManagedToUnmanagedIn;ToUnmanaged;();Argument[this];ReturnValue;taint;df-generated |
-| System.Runtime.InteropServices.Marshalling;SafeHandleMarshaller<T>+ManagedToUnmanagedOut;FromUnmanaged;(System.IntPtr);Argument[0];Argument[this];taint;df-generated |
-| System.Runtime.InteropServices.Marshalling;SafeHandleMarshaller<T>+ManagedToUnmanagedOut;ToManaged;();Argument[this];ReturnValue;taint;df-generated |
-| System.Runtime.InteropServices.Marshalling;SafeHandleMarshaller<T>+ManagedToUnmanagedRef;FromManaged;(T);Argument[0];Argument[this];taint;df-generated |
-| System.Runtime.InteropServices.Marshalling;SafeHandleMarshaller<T>+ManagedToUnmanagedRef;FromUnmanaged;(System.IntPtr);Argument[0];Argument[this];taint;df-generated |
-| System.Runtime.InteropServices.Marshalling;SafeHandleMarshaller<T>+ManagedToUnmanagedRef;ToManagedFinally;();Argument[this];ReturnValue;taint;df-generated |
-| System.Runtime.InteropServices.Marshalling;SafeHandleMarshaller<T>+ManagedToUnmanagedRef;ToUnmanaged;();Argument[this];ReturnValue;taint;df-generated |
+| System.Runtime.InteropServices.Marshalling;ReadOnlySpanMarshaller<T,TUnmanagedElement>+UnmanagedToManagedOut;GetManagedValuesSource;(System.ReadOnlySpan<T>);Argument[0];ReturnValue;value;dfc-generated |
+| System.Runtime.InteropServices.Marshalling;SafeHandleMarshaller<T>+ManagedToUnmanagedIn;FromManaged;(T);Argument[0];Argument[this].SyntheticField[System.Runtime.InteropServices.Marshalling.SafeHandleMarshaller`1+ManagedToUnmanagedIn._handle];value;dfc-generated |
+| System.Runtime.InteropServices.Marshalling;SafeHandleMarshaller<T>+ManagedToUnmanagedIn;ToUnmanaged;();Argument[this].SyntheticField[System.Runtime.InteropServices.Marshalling.SafeHandleMarshaller`1+ManagedToUnmanagedIn._handle].Field[System.Runtime.InteropServices.SafeHandle.handle];ReturnValue;value;dfc-generated |
+| System.Runtime.InteropServices.Marshalling;SafeHandleMarshaller<T>+ManagedToUnmanagedOut;FromUnmanaged;(System.IntPtr);Argument[0];Argument[this].SyntheticField[System.Runtime.InteropServices.Marshalling.SafeHandleMarshaller`1+ManagedToUnmanagedOut._newHandle].Field[System.Runtime.InteropServices.SafeHandle.handle];value;dfc-generated |
+| System.Runtime.InteropServices.Marshalling;SafeHandleMarshaller<T>+ManagedToUnmanagedOut;ToManaged;();Argument[this].SyntheticField[System.Runtime.InteropServices.Marshalling.SafeHandleMarshaller`1+ManagedToUnmanagedOut._newHandle];ReturnValue;value;dfc-generated |
+| System.Runtime.InteropServices.Marshalling;SafeHandleMarshaller<T>+ManagedToUnmanagedRef;FromManaged;(T);Argument[0].Field[System.Runtime.InteropServices.SafeHandle.handle];Argument[this].SyntheticField[System.Runtime.InteropServices.Marshalling.SafeHandleMarshaller`1+ManagedToUnmanagedRef._originalHandleValue];value;dfc-generated |
+| System.Runtime.InteropServices.Marshalling;SafeHandleMarshaller<T>+ManagedToUnmanagedRef;FromManaged;(T);Argument[0];Argument[this].SyntheticField[System.Runtime.InteropServices.Marshalling.SafeHandleMarshaller`1+ManagedToUnmanagedRef._handle];value;dfc-generated |
+| System.Runtime.InteropServices.Marshalling;SafeHandleMarshaller<T>+ManagedToUnmanagedRef;FromUnmanaged;(System.IntPtr);Argument[0];Argument[this].SyntheticField[System.Runtime.InteropServices.Marshalling.SafeHandleMarshaller`1+ManagedToUnmanagedRef._handleToReturn].Field[System.Runtime.InteropServices.SafeHandle.handle];value;dfc-generated |
+| System.Runtime.InteropServices.Marshalling;SafeHandleMarshaller<T>+ManagedToUnmanagedRef;FromUnmanaged;(System.IntPtr);Argument[0];Argument[this].SyntheticField[System.Runtime.InteropServices.Marshalling.SafeHandleMarshaller`1+ManagedToUnmanagedRef._newHandle].Field[System.Runtime.InteropServices.SafeHandle.handle];value;dfc-generated |
+| System.Runtime.InteropServices.Marshalling;SafeHandleMarshaller<T>+ManagedToUnmanagedRef;FromUnmanaged;(System.IntPtr);Argument[this].SyntheticField[System.Runtime.InteropServices.Marshalling.SafeHandleMarshaller`1+ManagedToUnmanagedRef._handle];Argument[this].SyntheticField[System.Runtime.InteropServices.Marshalling.SafeHandleMarshaller`1+ManagedToUnmanagedRef._handleToReturn];value;dfc-generated |
+| System.Runtime.InteropServices.Marshalling;SafeHandleMarshaller<T>+ManagedToUnmanagedRef;FromUnmanaged;(System.IntPtr);Argument[this].SyntheticField[System.Runtime.InteropServices.Marshalling.SafeHandleMarshaller`1+ManagedToUnmanagedRef._newHandle];Argument[this].SyntheticField[System.Runtime.InteropServices.Marshalling.SafeHandleMarshaller`1+ManagedToUnmanagedRef._handleToReturn];value;dfc-generated |
+| System.Runtime.InteropServices.Marshalling;SafeHandleMarshaller<T>+ManagedToUnmanagedRef;ToManagedFinally;();Argument[this].SyntheticField[System.Runtime.InteropServices.Marshalling.SafeHandleMarshaller`1+ManagedToUnmanagedRef._handleToReturn];ReturnValue;value;dfc-generated |
+| System.Runtime.InteropServices.Marshalling;SafeHandleMarshaller<T>+ManagedToUnmanagedRef;ToUnmanaged;();Argument[this].SyntheticField[System.Runtime.InteropServices.Marshalling.SafeHandleMarshaller`1+ManagedToUnmanagedRef._originalHandleValue];ReturnValue;value;dfc-generated |
 | System.Runtime.InteropServices.Marshalling;SpanMarshaller<T,TUnmanagedElement>+ManagedToUnmanagedIn;FromManaged;(System.Span<T>,System.Span<TUnmanagedElement>);Argument[0];Argument[this];taint;df-generated |
 | System.Runtime.InteropServices.Marshalling;SpanMarshaller<T,TUnmanagedElement>+ManagedToUnmanagedIn;FromManaged;(System.Span<T>,System.Span<TUnmanagedElement>);Argument[1];Argument[this];taint;df-generated |
 | System.Runtime.InteropServices.Marshalling;SpanMarshaller<T,TUnmanagedElement>+ManagedToUnmanagedIn;GetUnmanagedValuesDestination;();Argument[this];ReturnValue;taint;df-generated |
-| System.Runtime.InteropServices.Marshalling;SpanMarshaller<T,TUnmanagedElement>;GetManagedValuesDestination;(System.Span<T>);Argument[0];ReturnValue;taint;df-generated |
+| System.Runtime.InteropServices.Marshalling;SpanMarshaller<T,TUnmanagedElement>;GetManagedValuesDestination;(System.Span<T>);Argument[0];ReturnValue;value;dfc-generated |
 | System.Runtime.InteropServices.Marshalling;Utf8StringMarshaller+ManagedToUnmanagedIn;ToUnmanaged;();Argument[this];ReturnValue;taint;df-generated |
-| System.Runtime.InteropServices.Marshalling;VirtualMethodTableInfo;Deconstruct;(System.Void*,System.Void**);Argument[this];ReturnValue;taint;df-generated |
+| System.Runtime.InteropServices.Marshalling;VirtualMethodTableInfo;Deconstruct;(System.Void*,System.Void**);Argument[this].Property[System.Runtime.InteropServices.Marshalling.VirtualMethodTableInfo.ThisPointer];ReturnValue;value;dfc-generated |
+| System.Runtime.InteropServices.Marshalling;VirtualMethodTableInfo;Deconstruct;(System.Void*,System.Void**);Argument[this].Property[System.Runtime.InteropServices.Marshalling.VirtualMethodTableInfo.VirtualMethodTable];ReturnValue;value;dfc-generated |
 | System.Runtime.InteropServices.ObjectiveC;ObjectiveCMarshal+UnhandledExceptionPropagationHandler;BeginInvoke;(System.Exception,System.RuntimeMethodHandle,System.IntPtr,System.AsyncCallback,System.Object);Argument[3];Argument[3].Parameter[delegate-self];value;hq-generated |
 | System.Runtime.InteropServices.ObjectiveC;ObjectiveCMarshal;Initialize;(System.Runtime.InteropServices.ObjectiveC.ObjectiveCMarshal+UnhandledExceptionPropagationHandler);Argument[3];Argument[3].Parameter[delegate-self];value;hq-generated |
-| System.Runtime.InteropServices;ArrayWithOffset;ArrayWithOffset;(System.Object,System.Int32);Argument[0];Argument[this];taint;df-generated |
-| System.Runtime.InteropServices;ArrayWithOffset;GetArray;();Argument[this];ReturnValue;taint;df-generated |
-| System.Runtime.InteropServices;CLong;CLong;(System.IntPtr);Argument[0];Argument[this];taint;df-generated |
-| System.Runtime.InteropServices;CLong;get_Value;();Argument[this];ReturnValue;taint;df-generated |
-| System.Runtime.InteropServices;CULong;CULong;(System.UIntPtr);Argument[0];Argument[this];taint;df-generated |
-| System.Runtime.InteropServices;CULong;get_Value;();Argument[this];ReturnValue;taint;df-generated |
+| System.Runtime.InteropServices;ArrayWithOffset;ArrayWithOffset;(System.Object,System.Int32);Argument[0];Argument[this].SyntheticField[System.Runtime.InteropServices.ArrayWithOffset.m_array];value;dfc-generated |
+| System.Runtime.InteropServices;ArrayWithOffset;GetArray;();Argument[this].SyntheticField[System.Runtime.InteropServices.ArrayWithOffset.m_array];ReturnValue;value;dfc-generated |
+| System.Runtime.InteropServices;CLong;CLong;(System.IntPtr);Argument[0];Argument[this].SyntheticField[System.Runtime.InteropServices.CLong._value];value;dfc-generated |
+| System.Runtime.InteropServices;CLong;get_Value;();Argument[this].SyntheticField[System.Runtime.InteropServices.CLong._value];ReturnValue;value;dfc-generated |
+| System.Runtime.InteropServices;CULong;CULong;(System.UIntPtr);Argument[0];Argument[this].SyntheticField[System.Runtime.InteropServices.CULong._value];value;dfc-generated |
+| System.Runtime.InteropServices;CULong;get_Value;();Argument[this].SyntheticField[System.Runtime.InteropServices.CULong._value];ReturnValue;value;dfc-generated |
 | System.Runtime.InteropServices;CollectionsMarshal;AsSpan<T>;(System.Collections.Generic.List<T>);Argument[0].Element;ReturnValue;taint;df-generated |
-| System.Runtime.InteropServices;CriticalHandle;CriticalHandle;(System.IntPtr);Argument[0];Argument[this];taint;df-generated |
-| System.Runtime.InteropServices;CriticalHandle;SetHandle;(System.IntPtr);Argument[0];Argument[this];taint;df-generated |
+| System.Runtime.InteropServices;CriticalHandle;CriticalHandle;(System.IntPtr);Argument[0];Argument[this].Field[System.Runtime.InteropServices.CriticalHandle.handle];value;dfc-generated |
+| System.Runtime.InteropServices;CriticalHandle;SetHandle;(System.IntPtr);Argument[0];Argument[this].Field[System.Runtime.InteropServices.CriticalHandle.handle];value;dfc-generated |
 | System.Runtime.InteropServices;DllImportResolver;BeginInvoke;(System.String,System.Reflection.Assembly,System.Nullable<System.Runtime.InteropServices.DllImportSearchPath>,System.AsyncCallback,System.Object);Argument[3];Argument[3].Parameter[delegate-self];value;hq-generated |
-| System.Runtime.InteropServices;GCHandle;FromIntPtr;(System.IntPtr);Argument[0];ReturnValue;taint;df-generated |
-| System.Runtime.InteropServices;GCHandle;ToIntPtr;(System.Runtime.InteropServices.GCHandle);Argument[0];ReturnValue;taint;df-generated |
-| System.Runtime.InteropServices;HandleRef;HandleRef;(System.Object,System.IntPtr);Argument[0];Argument[this];taint;df-generated |
-| System.Runtime.InteropServices;HandleRef;HandleRef;(System.Object,System.IntPtr);Argument[1];Argument[this];taint;df-generated |
-| System.Runtime.InteropServices;HandleRef;ToIntPtr;(System.Runtime.InteropServices.HandleRef);Argument[0];ReturnValue;taint;df-generated |
-| System.Runtime.InteropServices;HandleRef;get_Handle;();Argument[this];ReturnValue;taint;df-generated |
-| System.Runtime.InteropServices;HandleRef;get_Wrapper;();Argument[this];ReturnValue;taint;df-generated |
+| System.Runtime.InteropServices;GCHandle;FromIntPtr;(System.IntPtr);Argument[0];ReturnValue.SyntheticField[System.Runtime.InteropServices.GCHandle._handle];value;dfc-generated |
+| System.Runtime.InteropServices;GCHandle;ToIntPtr;(System.Runtime.InteropServices.GCHandle);Argument[0].SyntheticField[System.Runtime.InteropServices.GCHandle._handle];ReturnValue;value;dfc-generated |
+| System.Runtime.InteropServices;HandleRef;HandleRef;(System.Object,System.IntPtr);Argument[0];Argument[this].SyntheticField[System.Runtime.InteropServices.HandleRef._wrapper];value;dfc-generated |
+| System.Runtime.InteropServices;HandleRef;HandleRef;(System.Object,System.IntPtr);Argument[1];Argument[this].SyntheticField[System.Runtime.InteropServices.HandleRef._handle];value;dfc-generated |
+| System.Runtime.InteropServices;HandleRef;ToIntPtr;(System.Runtime.InteropServices.HandleRef);Argument[0].SyntheticField[System.Runtime.InteropServices.HandleRef._handle];ReturnValue;value;dfc-generated |
+| System.Runtime.InteropServices;HandleRef;get_Handle;();Argument[this].SyntheticField[System.Runtime.InteropServices.HandleRef._handle];ReturnValue;value;dfc-generated |
+| System.Runtime.InteropServices;HandleRef;get_Wrapper;();Argument[this].SyntheticField[System.Runtime.InteropServices.HandleRef._wrapper];ReturnValue;value;dfc-generated |
 | System.Runtime.InteropServices;ImmutableCollectionsMarshal;AsArray<T>;(System.Collections.Immutable.ImmutableArray<T>);Argument[0].Element;ReturnValue;taint;df-generated |
 | System.Runtime.InteropServices;ImmutableCollectionsMarshal;AsImmutableArray<T>;(T[]);Argument[0].Element;ReturnValue;taint;df-generated |
-| System.Runtime.InteropServices;Marshal;InitHandle;(System.Runtime.InteropServices.SafeHandle,System.IntPtr);Argument[1];Argument[0];taint;df-generated |
+| System.Runtime.InteropServices;Marshal;InitHandle;(System.Runtime.InteropServices.SafeHandle,System.IntPtr);Argument[1];Argument[0].Field[System.Runtime.InteropServices.SafeHandle.handle];value;dfc-generated |
 | System.Runtime.InteropServices;MemoryMarshal;CreateFromPinnedArray<T>;(T[],System.Int32,System.Int32);Argument[0].Element;ReturnValue;taint;df-generated |
-| System.Runtime.InteropServices;MemoryMarshal;ToEnumerable<T>;(System.ReadOnlyMemory<T>);Argument[0];ReturnValue;taint;df-generated |
+| System.Runtime.InteropServices;MemoryMarshal;CreateSpan<T>;(T,System.Int32);Argument[0];ReturnValue;value;dfc-generated |
+| System.Runtime.InteropServices;MemoryMarshal;ToEnumerable<T>;(System.ReadOnlyMemory<T>);Argument[0].Property[System.ReadOnlyMemory`1.Span].Element;ReturnValue.Element;value;dfc-generated |
 | System.Runtime.InteropServices;MemoryMarshal;TryGetMemoryManager<T,TManager>;(System.ReadOnlyMemory<T>,TManager);Argument[0];ReturnValue;taint;df-generated |
 | System.Runtime.InteropServices;MemoryMarshal;TryGetMemoryManager<T,TManager>;(System.ReadOnlyMemory<T>,TManager,System.Int32,System.Int32);Argument[0];ReturnValue;taint;df-generated |
-| System.Runtime.InteropServices;MemoryMarshal;TryGetString;(System.ReadOnlyMemory<System.Char>,System.String,System.Int32,System.Int32);Argument[0];ReturnValue;taint;df-generated |
+| System.Runtime.InteropServices;MemoryMarshal;TryGetString;(System.ReadOnlyMemory<System.Char>,System.String,System.Int32,System.Int32);Argument[0].SyntheticField[System.ReadOnlyMemory`1._object];ReturnValue;value;dfc-generated |
 | System.Runtime.InteropServices;NFloat;ToString;(System.IFormatProvider);Argument[0];ReturnValue;taint;df-generated |
 | System.Runtime.InteropServices;NativeLibrary;SetDllImportResolver;(System.Reflection.Assembly,System.Runtime.InteropServices.DllImportResolver);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
-| System.Runtime.InteropServices;OSPlatform;Create;(System.String);Argument[0];ReturnValue;taint;df-generated |
-| System.Runtime.InteropServices;OSPlatform;ToString;();Argument[this];ReturnValue;taint;df-generated |
+| System.Runtime.InteropServices;OSPlatform;Create;(System.String);Argument[0];ReturnValue.SyntheticField[System.Runtime.InteropServices.OSPlatform.Name];value;dfc-generated |
+| System.Runtime.InteropServices;OSPlatform;ToString;();Argument[this].SyntheticField[System.Runtime.InteropServices.OSPlatform.Name];ReturnValue;value;dfc-generated |
 | System.Runtime.InteropServices;PosixSignalRegistration;Create;(System.Runtime.InteropServices.PosixSignal,System.Action<System.Runtime.InteropServices.PosixSignalContext>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
-| System.Runtime.InteropServices;SafeHandle;DangerousGetHandle;();Argument[this];ReturnValue;taint;df-generated |
-| System.Runtime.InteropServices;SafeHandle;SafeHandle;(System.IntPtr,System.Boolean);Argument[0];Argument[this];taint;df-generated |
-| System.Runtime.InteropServices;SafeHandle;SetHandle;(System.IntPtr);Argument[0];Argument[this];taint;df-generated |
-| System.Runtime.InteropServices;SequenceMarshal;TryGetArray<T>;(System.Buffers.ReadOnlySequence<T>,System.ArraySegment<T>);Argument[0];ReturnValue;taint;df-generated |
-| System.Runtime.InteropServices;SequenceMarshal;TryGetReadOnlyMemory<T>;(System.Buffers.ReadOnlySequence<T>,System.ReadOnlyMemory<T>);Argument[0];ReturnValue;taint;df-generated |
+| System.Runtime.InteropServices;SafeBuffer;AcquirePointer;(System.Byte*);Argument[0];ReturnValue;value;dfc-generated |
+| System.Runtime.InteropServices;SafeHandle;DangerousGetHandle;();Argument[this].Field[System.Runtime.InteropServices.SafeHandle.handle];ReturnValue;value;dfc-generated |
+| System.Runtime.InteropServices;SafeHandle;SafeHandle;(System.IntPtr,System.Boolean);Argument[0];Argument[this].Field[System.Runtime.InteropServices.SafeHandle.handle];value;dfc-generated |
+| System.Runtime.InteropServices;SafeHandle;SetHandle;(System.IntPtr);Argument[0];Argument[this].Field[System.Runtime.InteropServices.SafeHandle.handle];value;dfc-generated |
+| System.Runtime.InteropServices;SequenceMarshal;TryGetReadOnlyMemory<T>;(System.Buffers.ReadOnlySequence<T>,System.ReadOnlyMemory<T>);Argument[0].Property[System.Buffers.ReadOnlySequence`1.First];ReturnValue;value;dfc-generated |
 | System.Runtime.InteropServices;SequenceMarshal;TryGetReadOnlySequenceSegment<T>;(System.Buffers.ReadOnlySequence<T>,System.Buffers.ReadOnlySequenceSegment<T>,System.Int32,System.Buffers.ReadOnlySequenceSegment<T>,System.Int32);Argument[0];ReturnValue;taint;df-generated |
-| System.Runtime.Intrinsics;Vector64;Abs<T>;(System.Runtime.Intrinsics.Vector64<T>);Argument[0];ReturnValue;taint;df-generated |
-| System.Runtime.Intrinsics;Vector64;Ceiling;(System.Runtime.Intrinsics.Vector64<System.Double>);Argument[0];ReturnValue;taint;df-generated |
-| System.Runtime.Intrinsics;Vector64;Ceiling;(System.Runtime.Intrinsics.Vector64<System.Single>);Argument[0];ReturnValue;taint;df-generated |
-| System.Runtime.Intrinsics;Vector64;Floor;(System.Runtime.Intrinsics.Vector64<System.Double>);Argument[0];ReturnValue;taint;df-generated |
-| System.Runtime.Intrinsics;Vector64;Floor;(System.Runtime.Intrinsics.Vector64<System.Single>);Argument[0];ReturnValue;taint;df-generated |
-| System.Runtime.Intrinsics;Vector64;WithElement<T>;(System.Runtime.Intrinsics.Vector64<T>,System.Int32,T);Argument[0];ReturnValue;taint;df-generated |
-| System.Runtime.Intrinsics;Vector64<T>;op_UnaryPlus;(System.Runtime.Intrinsics.Vector64<T>);Argument[0];ReturnValue;taint;df-generated |
+| System.Runtime.InteropServices;SequenceMarshal;TryRead<T>;(System.Buffers.SequenceReader<System.Byte>,T);Argument[0];ReturnValue;value;dfc-generated |
+| System.Runtime.Intrinsics;Vector64;Abs<T>;(System.Runtime.Intrinsics.Vector64<T>);Argument[0];ReturnValue;value;dfc-generated |
+| System.Runtime.Intrinsics;Vector64;Ceiling;(System.Runtime.Intrinsics.Vector64<System.Double>);Argument[0];ReturnValue;value;dfc-generated |
+| System.Runtime.Intrinsics;Vector64;Ceiling;(System.Runtime.Intrinsics.Vector64<System.Single>);Argument[0];ReturnValue;value;dfc-generated |
+| System.Runtime.Intrinsics;Vector64;Floor;(System.Runtime.Intrinsics.Vector64<System.Double>);Argument[0];ReturnValue;value;dfc-generated |
+| System.Runtime.Intrinsics;Vector64;Floor;(System.Runtime.Intrinsics.Vector64<System.Single>);Argument[0];ReturnValue;value;dfc-generated |
+| System.Runtime.Intrinsics;Vector64;StoreUnsafe<T>;(System.Runtime.Intrinsics.Vector64<T>,T);Argument[1];ReturnValue;value;dfc-generated |
+| System.Runtime.Intrinsics;Vector64;WithElement<T>;(System.Runtime.Intrinsics.Vector64<T>,System.Int32,T);Argument[0];ReturnValue;value;dfc-generated |
+| System.Runtime.Intrinsics;Vector64<T>;op_UnaryPlus;(System.Runtime.Intrinsics.Vector64<T>);Argument[0];ReturnValue;value;dfc-generated |
 | System.Runtime.Intrinsics;Vector128;GetLower<T>;(System.Runtime.Intrinsics.Vector128<T>);Argument[0];ReturnValue;taint;df-generated |
 | System.Runtime.Intrinsics;Vector128;GetUpper<T>;(System.Runtime.Intrinsics.Vector128<T>);Argument[0];ReturnValue;taint;df-generated |
-| System.Runtime.Intrinsics;Vector128;WithElement<T>;(System.Runtime.Intrinsics.Vector128<T>,System.Int32,T);Argument[0];ReturnValue;taint;df-generated |
-| System.Runtime.Intrinsics;Vector128;WithLower<T>;(System.Runtime.Intrinsics.Vector128<T>,System.Runtime.Intrinsics.Vector64<T>);Argument[0];ReturnValue;taint;df-generated |
-| System.Runtime.Intrinsics;Vector128;WithUpper<T>;(System.Runtime.Intrinsics.Vector128<T>,System.Runtime.Intrinsics.Vector64<T>);Argument[0];ReturnValue;taint;df-generated |
-| System.Runtime.Intrinsics;Vector128<T>;op_UnaryPlus;(System.Runtime.Intrinsics.Vector128<T>);Argument[0];ReturnValue;taint;df-generated |
+| System.Runtime.Intrinsics;Vector128;StoreUnsafe<T>;(System.Runtime.Intrinsics.Vector128<T>,T);Argument[1];ReturnValue;value;dfc-generated |
+| System.Runtime.Intrinsics;Vector128;WithElement<T>;(System.Runtime.Intrinsics.Vector128<T>,System.Int32,T);Argument[0];ReturnValue;value;dfc-generated |
+| System.Runtime.Intrinsics;Vector128;WithLower<T>;(System.Runtime.Intrinsics.Vector128<T>,System.Runtime.Intrinsics.Vector64<T>);Argument[0];ReturnValue;value;dfc-generated |
+| System.Runtime.Intrinsics;Vector128;WithUpper<T>;(System.Runtime.Intrinsics.Vector128<T>,System.Runtime.Intrinsics.Vector64<T>);Argument[0];ReturnValue;value;dfc-generated |
+| System.Runtime.Intrinsics;Vector128<T>;op_UnaryPlus;(System.Runtime.Intrinsics.Vector128<T>);Argument[0];ReturnValue;value;dfc-generated |
 | System.Runtime.Intrinsics;Vector256;GetLower<T>;(System.Runtime.Intrinsics.Vector256<T>);Argument[0];ReturnValue;taint;df-generated |
 | System.Runtime.Intrinsics;Vector256;GetUpper<T>;(System.Runtime.Intrinsics.Vector256<T>);Argument[0];ReturnValue;taint;df-generated |
-| System.Runtime.Intrinsics;Vector256;WithElement<T>;(System.Runtime.Intrinsics.Vector256<T>,System.Int32,T);Argument[0];ReturnValue;taint;df-generated |
-| System.Runtime.Intrinsics;Vector256;WithLower<T>;(System.Runtime.Intrinsics.Vector256<T>,System.Runtime.Intrinsics.Vector128<T>);Argument[0];ReturnValue;taint;df-generated |
-| System.Runtime.Intrinsics;Vector256;WithUpper<T>;(System.Runtime.Intrinsics.Vector256<T>,System.Runtime.Intrinsics.Vector128<T>);Argument[0];ReturnValue;taint;df-generated |
-| System.Runtime.Intrinsics;Vector256<T>;op_UnaryPlus;(System.Runtime.Intrinsics.Vector256<T>);Argument[0];ReturnValue;taint;df-generated |
+| System.Runtime.Intrinsics;Vector256;StoreUnsafe<T>;(System.Runtime.Intrinsics.Vector256<T>,T);Argument[1];ReturnValue;value;dfc-generated |
+| System.Runtime.Intrinsics;Vector256;WithElement<T>;(System.Runtime.Intrinsics.Vector256<T>,System.Int32,T);Argument[0];ReturnValue;value;dfc-generated |
+| System.Runtime.Intrinsics;Vector256;WithLower<T>;(System.Runtime.Intrinsics.Vector256<T>,System.Runtime.Intrinsics.Vector128<T>);Argument[0];ReturnValue;value;dfc-generated |
+| System.Runtime.Intrinsics;Vector256;WithUpper<T>;(System.Runtime.Intrinsics.Vector256<T>,System.Runtime.Intrinsics.Vector128<T>);Argument[0];ReturnValue;value;dfc-generated |
+| System.Runtime.Intrinsics;Vector256<T>;op_UnaryPlus;(System.Runtime.Intrinsics.Vector256<T>);Argument[0];ReturnValue;value;dfc-generated |
 | System.Runtime.Intrinsics;Vector512;GetLower<T>;(System.Runtime.Intrinsics.Vector512<T>);Argument[0];ReturnValue;taint;df-generated |
 | System.Runtime.Intrinsics;Vector512;GetUpper<T>;(System.Runtime.Intrinsics.Vector512<T>);Argument[0];ReturnValue;taint;df-generated |
-| System.Runtime.Intrinsics;Vector512;WithElement<T>;(System.Runtime.Intrinsics.Vector512<T>,System.Int32,T);Argument[0];ReturnValue;taint;df-generated |
-| System.Runtime.Intrinsics;Vector512;WithLower<T>;(System.Runtime.Intrinsics.Vector512<T>,System.Runtime.Intrinsics.Vector256<T>);Argument[0];ReturnValue;taint;df-generated |
-| System.Runtime.Intrinsics;Vector512;WithUpper<T>;(System.Runtime.Intrinsics.Vector512<T>,System.Runtime.Intrinsics.Vector256<T>);Argument[0];ReturnValue;taint;df-generated |
-| System.Runtime.Intrinsics;Vector512<T>;op_UnaryPlus;(System.Runtime.Intrinsics.Vector512<T>);Argument[0];ReturnValue;taint;df-generated |
+| System.Runtime.Intrinsics;Vector512;StoreUnsafe<T>;(System.Runtime.Intrinsics.Vector512<T>,T);Argument[1];ReturnValue;value;dfc-generated |
+| System.Runtime.Intrinsics;Vector512;WithElement<T>;(System.Runtime.Intrinsics.Vector512<T>,System.Int32,T);Argument[0];ReturnValue;value;dfc-generated |
+| System.Runtime.Intrinsics;Vector512;WithLower<T>;(System.Runtime.Intrinsics.Vector512<T>,System.Runtime.Intrinsics.Vector256<T>);Argument[0];ReturnValue;value;dfc-generated |
+| System.Runtime.Intrinsics;Vector512;WithUpper<T>;(System.Runtime.Intrinsics.Vector512<T>,System.Runtime.Intrinsics.Vector256<T>);Argument[0];ReturnValue;value;dfc-generated |
+| System.Runtime.Intrinsics;Vector512<T>;op_UnaryPlus;(System.Runtime.Intrinsics.Vector512<T>);Argument[0];ReturnValue;value;dfc-generated |
 | System.Runtime.Loader;AssemblyDependencyResolver;ResolveAssemblyToPath;(System.Reflection.AssemblyName);Argument[0];ReturnValue;taint;df-generated |
 | System.Runtime.Loader;AssemblyDependencyResolver;ResolveAssemblyToPath;(System.Reflection.AssemblyName);Argument[this];ReturnValue;taint;df-generated |
-| System.Runtime.Loader;AssemblyDependencyResolver;ResolveUnmanagedDllToPath;(System.String);Argument[0];ReturnValue;taint;df-generated |
-| System.Runtime.Loader;AssemblyDependencyResolver;ResolveUnmanagedDllToPath;(System.String);Argument[this];ReturnValue;taint;df-generated |
+| System.Runtime.Loader;AssemblyDependencyResolver;ResolveUnmanagedDllToPath;(System.String);Argument[0];ReturnValue;taint;dfc-generated |
 | System.Runtime.Loader;AssemblyLoadContext;EnterContextualReflection;();Argument[this];ReturnValue;taint;df-generated |
-| System.Runtime.Loader;AssemblyLoadContext;ToString;();Argument[this];ReturnValue;taint;df-generated |
+| System.Runtime.Loader;AssemblyLoadContext;ToString;();Argument[this].Property[System.Runtime.Loader.AssemblyLoadContext.Name];ReturnValue;taint;dfc-generated |
 | System.Runtime.Loader;AssemblyLoadContext;add_Resolving;(System.Func<System.Runtime.Loader.AssemblyLoadContext,System.Reflection.AssemblyName,System.Reflection.Assembly>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Runtime.Loader;AssemblyLoadContext;add_ResolvingUnmanagedDll;(System.Func<System.Reflection.Assembly,System.String,System.IntPtr>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Runtime.Loader;AssemblyLoadContext;add_Unloading;(System.Action<System.Runtime.Loader.AssemblyLoadContext>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
@@ -11138,30 +11878,26 @@
 | System.Runtime.Loader;AssemblyLoadContext;remove_Resolving;(System.Func<System.Runtime.Loader.AssemblyLoadContext,System.Reflection.AssemblyName,System.Reflection.Assembly>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Runtime.Loader;AssemblyLoadContext;remove_ResolvingUnmanagedDll;(System.Func<System.Reflection.Assembly,System.String,System.IntPtr>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Runtime.Loader;AssemblyLoadContext;remove_Unloading;(System.Action<System.Runtime.Loader.AssemblyLoadContext>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
-| System.Runtime.Remoting;ObjectHandle;ObjectHandle;(System.Object);Argument[0];Argument[this];taint;df-generated |
-| System.Runtime.Remoting;ObjectHandle;Unwrap;();Argument[this];ReturnValue;taint;df-generated |
+| System.Runtime.Remoting;ObjectHandle;ObjectHandle;(System.Object);Argument[0];Argument[this].SyntheticField[System.Runtime.Remoting.ObjectHandle._wrappedObject];value;dfc-generated |
+| System.Runtime.Remoting;ObjectHandle;Unwrap;();Argument[this].SyntheticField[System.Runtime.Remoting.ObjectHandle._wrappedObject];ReturnValue;value;dfc-generated |
 | System.Runtime.Serialization.DataContracts;DataContract;IsDictionaryLike;(System.String,System.String,System.String);Argument[this];ReturnValue;taint;df-generated |
 | System.Runtime.Serialization.DataContracts;DataContract;get_BaseContract;();Argument[this];ReturnValue;taint;df-generated |
 | System.Runtime.Serialization.DataContracts;DataContract;get_DataMembers;();Argument[this];ReturnValue;taint;df-generated |
 | System.Runtime.Serialization.DataContracts;DataContractSet;DataContractSet;(System.Runtime.Serialization.DataContracts.DataContractSet);Argument[0];Argument[this];taint;df-generated |
 | System.Runtime.Serialization.DataContracts;DataContractSet;DataContractSet;(System.Runtime.Serialization.ISerializationSurrogateProvider,System.Collections.Generic.IEnumerable<System.Type>,System.Collections.Generic.IEnumerable<System.Type>);Argument[0];Argument[this];taint;df-generated |
-| System.Runtime.Serialization.DataContracts;DataContractSet;DataContractSet;(System.Runtime.Serialization.ISerializationSurrogateProvider,System.Collections.Generic.IEnumerable<System.Type>,System.Collections.Generic.IEnumerable<System.Type>);Argument[1].Element;Argument[this];taint;df-generated |
-| System.Runtime.Serialization.DataContracts;DataContractSet;DataContractSet;(System.Runtime.Serialization.ISerializationSurrogateProvider,System.Collections.Generic.IEnumerable<System.Type>,System.Collections.Generic.IEnumerable<System.Type>);Argument[2].Element;Argument[this];taint;df-generated |
-| System.Runtime.Serialization.DataContracts;DataContractSet;ImportSchemaSet;(System.Xml.Schema.XmlSchemaSet,System.Collections.Generic.IEnumerable<System.Xml.Schema.XmlSchemaElement>,System.Boolean);Argument[1].Element;ReturnValue;taint;df-generated |
+| System.Runtime.Serialization.DataContracts;DataContractSet;ImportSchemaSet;(System.Xml.Schema.XmlSchemaSet,System.Collections.Generic.IEnumerable<System.Xml.Schema.XmlSchemaElement>,System.Boolean);Argument[1].Element.Property[System.Xml.Schema.XmlSchemaElement.QualifiedName];ReturnValue.Element;value;dfc-generated |
 | System.Runtime.Serialization.DataContracts;DataMember;get_MemberTypeContract;();Argument[this];ReturnValue;taint;df-generated |
 | System.Runtime.Serialization.Formatters.Binary;BinaryFormatter;BinaryFormatter;(System.Runtime.Serialization.ISurrogateSelector,System.Runtime.Serialization.StreamingContext);Argument[0];Argument[this];taint;df-generated |
 | System.Runtime.Serialization.Formatters.Binary;BinaryFormatter;BinaryFormatter;(System.Runtime.Serialization.ISurrogateSelector,System.Runtime.Serialization.StreamingContext);Argument[1];Argument[this];taint;df-generated |
-| System.Runtime.Serialization.Json;DataContractJsonSerializer;DataContractJsonSerializer;(System.Type,System.Runtime.Serialization.Json.DataContractJsonSerializerSettings);Argument[1];Argument[this];taint;df-generated |
-| System.Runtime.Serialization.Json;DataContractJsonSerializer;GetSerializationSurrogateProvider;();Argument[this];ReturnValue;taint;df-generated |
-| System.Runtime.Serialization.Json;DataContractJsonSerializer;SetSerializationSurrogateProvider;(System.Runtime.Serialization.ISerializationSurrogateProvider);Argument[0];Argument[this];taint;df-generated |
-| System.Runtime.Serialization.Json;DataContractJsonSerializer;get_DateTimeFormat;();Argument[this];ReturnValue;taint;df-generated |
+| System.Runtime.Serialization.Json;DataContractJsonSerializer;DataContractJsonSerializer;(System.Type,System.Runtime.Serialization.Json.DataContractJsonSerializerSettings);Argument[1].Property[System.Runtime.Serialization.Json.DataContractJsonSerializerSettings.DateTimeFormat];Argument[this].SyntheticField[System.Runtime.Serialization.Json.DataContractJsonSerializer._dateTimeFormat];value;dfc-generated |
+| System.Runtime.Serialization.Json;DataContractJsonSerializer;GetSerializationSurrogateProvider;();Argument[this].SyntheticField[System.Runtime.Serialization.Json.DataContractJsonSerializer._serializationSurrogateProvider];ReturnValue;value;dfc-generated |
+| System.Runtime.Serialization.Json;DataContractJsonSerializer;SetSerializationSurrogateProvider;(System.Runtime.Serialization.ISerializationSurrogateProvider);Argument[0];Argument[this].SyntheticField[System.Runtime.Serialization.Json.DataContractJsonSerializer._serializationSurrogateProvider];value;dfc-generated |
+| System.Runtime.Serialization.Json;DataContractJsonSerializer;get_DateTimeFormat;();Argument[this].SyntheticField[System.Runtime.Serialization.Json.DataContractJsonSerializer._dateTimeFormat];ReturnValue;value;dfc-generated |
 | System.Runtime.Serialization.Json;IXmlJsonReaderInitializer;SetInput;(System.Byte[],System.Int32,System.Int32,System.Text.Encoding,System.Xml.XmlDictionaryReaderQuotas,System.Xml.OnXmlDictionaryReaderClose);Argument[5];Argument[5].Parameter[delegate-self];value;hq-generated |
 | System.Runtime.Serialization.Json;IXmlJsonReaderInitializer;SetInput;(System.IO.Stream,System.Text.Encoding,System.Xml.XmlDictionaryReaderQuotas,System.Xml.OnXmlDictionaryReaderClose);Argument[3];Argument[3].Parameter[delegate-self];value;hq-generated |
 | System.Runtime.Serialization.Json;IXmlJsonWriterInitializer;SetOutput;(System.IO.Stream,System.Text.Encoding,System.Boolean);Argument[0];Argument[this];taint;df-generated |
 | System.Runtime.Serialization.Json;IXmlJsonWriterInitializer;SetOutput;(System.IO.Stream,System.Text.Encoding,System.Boolean);Argument[1];Argument[this];taint;df-generated |
 | System.Runtime.Serialization.Json;JsonReaderWriterFactory;CreateJsonReader;(System.Byte[],System.Int32,System.Int32,System.Text.Encoding,System.Xml.XmlDictionaryReaderQuotas,System.Xml.OnXmlDictionaryReaderClose);Argument[5];Argument[5].Parameter[delegate-self];value;hq-generated |
-| System.Runtime.Serialization.Json;JsonReaderWriterFactory;CreateJsonReader;(System.Byte[],System.Int32,System.Int32,System.Xml.XmlDictionaryReaderQuotas);Argument[0].Element;ReturnValue;taint;df-generated |
-| System.Runtime.Serialization.Json;JsonReaderWriterFactory;CreateJsonReader;(System.Byte[],System.Xml.XmlDictionaryReaderQuotas);Argument[0].Element;ReturnValue;taint;df-generated |
 | System.Runtime.Serialization.Json;JsonReaderWriterFactory;CreateJsonReader;(System.IO.Stream,System.Text.Encoding,System.Xml.XmlDictionaryReaderQuotas,System.Xml.OnXmlDictionaryReaderClose);Argument[3];Argument[3].Parameter[delegate-self];value;hq-generated |
 | System.Runtime.Serialization.Json;JsonReaderWriterFactory;CreateJsonWriter;(System.IO.Stream);Argument[0];ReturnValue;taint;df-generated |
 | System.Runtime.Serialization.Json;JsonReaderWriterFactory;CreateJsonWriter;(System.IO.Stream,System.Text.Encoding);Argument[0];ReturnValue;taint;df-generated |
@@ -11173,78 +11909,89 @@
 | System.Runtime.Serialization.Json;JsonReaderWriterFactory;CreateJsonWriter;(System.IO.Stream,System.Text.Encoding,System.Boolean,System.Boolean,System.String);Argument[0];ReturnValue;taint;df-generated |
 | System.Runtime.Serialization.Json;JsonReaderWriterFactory;CreateJsonWriter;(System.IO.Stream,System.Text.Encoding,System.Boolean,System.Boolean,System.String);Argument[1];ReturnValue;taint;df-generated |
 | System.Runtime.Serialization.Json;JsonReaderWriterFactory;CreateJsonWriter;(System.IO.Stream,System.Text.Encoding,System.Boolean,System.Boolean,System.String);Argument[4];ReturnValue;taint;df-generated |
-| System.Runtime.Serialization;DataContractSerializer;DataContractSerializer;(System.Type,System.Runtime.Serialization.DataContractSerializerSettings);Argument[1];Argument[this];taint;df-generated |
+| System.Runtime.Serialization;DataContractSerializer;DataContractSerializer;(System.Type,System.Runtime.Serialization.DataContractSerializerSettings);Argument[1].Property[System.Runtime.Serialization.DataContractSerializerSettings.DataContractResolver];Argument[this].SyntheticField[System.Runtime.Serialization.DataContractSerializer._dataContractResolver];value;dfc-generated |
 | System.Runtime.Serialization;DataContractSerializer;DataContractSerializer;(System.Type,System.Xml.XmlDictionaryString,System.Xml.XmlDictionaryString,System.Collections.Generic.IEnumerable<System.Type>);Argument[1];Argument[this];taint;df-generated |
 | System.Runtime.Serialization;DataContractSerializer;DataContractSerializer;(System.Type,System.Xml.XmlDictionaryString,System.Xml.XmlDictionaryString,System.Collections.Generic.IEnumerable<System.Type>);Argument[2];Argument[this];taint;df-generated |
-| System.Runtime.Serialization;DataContractSerializer;get_DataContractResolver;();Argument[this];ReturnValue;taint;df-generated |
-| System.Runtime.Serialization;DataContractSerializerExtensions;GetSerializationSurrogateProvider;(System.Runtime.Serialization.DataContractSerializer);Argument[0];ReturnValue;taint;df-generated |
-| System.Runtime.Serialization;DataContractSerializerExtensions;SetSerializationSurrogateProvider;(System.Runtime.Serialization.DataContractSerializer,System.Runtime.Serialization.ISerializationSurrogateProvider);Argument[1];Argument[0];taint;df-generated |
-| System.Runtime.Serialization;DateTimeFormat;DateTimeFormat;(System.String,System.IFormatProvider);Argument[0];Argument[this];taint;df-generated |
-| System.Runtime.Serialization;DateTimeFormat;DateTimeFormat;(System.String,System.IFormatProvider);Argument[1];Argument[this];taint;df-generated |
-| System.Runtime.Serialization;DateTimeFormat;get_FormatProvider;();Argument[this];ReturnValue;taint;df-generated |
-| System.Runtime.Serialization;DateTimeFormat;get_FormatString;();Argument[this];ReturnValue;taint;df-generated |
+| System.Runtime.Serialization;DataContractSerializer;ReadObject;(System.Xml.XmlDictionaryReader,System.Boolean,System.Runtime.Serialization.DataContractResolver);Argument[this];ReturnValue;taint;df-generated |
+| System.Runtime.Serialization;DataContractSerializer;get_DataContractResolver;();Argument[this].SyntheticField[System.Runtime.Serialization.DataContractSerializer._dataContractResolver];ReturnValue;value;dfc-generated |
+| System.Runtime.Serialization;DataContractSerializerExtensions;GetSerializationSurrogateProvider;(System.Runtime.Serialization.DataContractSerializer);Argument[0].SyntheticField[System.Runtime.Serialization.DataContractSerializer._serializationSurrogateProvider];ReturnValue;value;dfc-generated |
+| System.Runtime.Serialization;DataContractSerializerExtensions;SetSerializationSurrogateProvider;(System.Runtime.Serialization.DataContractSerializer,System.Runtime.Serialization.ISerializationSurrogateProvider);Argument[1];Argument[0].SyntheticField[System.Runtime.Serialization.DataContractSerializer._serializationSurrogateProvider];value;dfc-generated |
+| System.Runtime.Serialization;DateTimeFormat;DateTimeFormat;(System.String,System.IFormatProvider);Argument[0];Argument[this].SyntheticField[System.Runtime.Serialization.DateTimeFormat._formatString];value;dfc-generated |
+| System.Runtime.Serialization;DateTimeFormat;DateTimeFormat;(System.String,System.IFormatProvider);Argument[1];Argument[this].SyntheticField[System.Runtime.Serialization.DateTimeFormat._formatProvider];value;dfc-generated |
+| System.Runtime.Serialization;DateTimeFormat;get_FormatProvider;();Argument[this].SyntheticField[System.Runtime.Serialization.DateTimeFormat._formatProvider];ReturnValue;value;dfc-generated |
+| System.Runtime.Serialization;DateTimeFormat;get_FormatString;();Argument[this].SyntheticField[System.Runtime.Serialization.DateTimeFormat._formatString];ReturnValue;value;dfc-generated |
 | System.Runtime.Serialization;FormatterServices;GetSurrogateForCyclicalReference;(System.Runtime.Serialization.ISerializationSurrogate);Argument[0];ReturnValue;taint;df-generated |
-| System.Runtime.Serialization;FormatterServices;PopulateObjectMembers;(System.Object,System.Reflection.MemberInfo[],System.Object[]);Argument[0];ReturnValue;taint;df-generated |
-| System.Runtime.Serialization;IFormatterConverter;Convert;(System.Object,System.Type);Argument[0];ReturnValue;taint;df-generated |
-| System.Runtime.Serialization;IFormatterConverter;Convert;(System.Object,System.TypeCode);Argument[0];ReturnValue;taint;df-generated |
-| System.Runtime.Serialization;IFormatterConverter;ToString;(System.Object);Argument[0];ReturnValue;taint;df-generated |
+| System.Runtime.Serialization;FormatterServices;PopulateObjectMembers;(System.Object,System.Reflection.MemberInfo[],System.Object[]);Argument[0];ReturnValue;value;dfc-generated |
+| System.Runtime.Serialization;IFormatterConverter;Convert;(System.Object,System.Type);Argument[0];ReturnValue;taint;dfc-generated |
+| System.Runtime.Serialization;IFormatterConverter;Convert;(System.Object,System.TypeCode);Argument[0];ReturnValue;taint;dfc-generated |
+| System.Runtime.Serialization;IFormatterConverter;ToString;(System.Object);Argument[0];ReturnValue;taint;dfc-generated |
 | System.Runtime.Serialization;IObjectReference;GetRealObject;(System.Runtime.Serialization.StreamingContext);Argument[this];ReturnValue;taint;df-generated |
 | System.Runtime.Serialization;ISerializable;GetObjectData;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);Argument[this];Argument[0];taint;df-generated |
-| System.Runtime.Serialization;ISurrogateSelector;ChainSelector;(System.Runtime.Serialization.ISurrogateSelector);Argument[0];Argument[this];taint;df-generated |
-| System.Runtime.Serialization;ISurrogateSelector;ChainSelector;(System.Runtime.Serialization.ISurrogateSelector);Argument[this];Argument[0];taint;df-generated |
-| System.Runtime.Serialization;ISurrogateSelector;GetNextSelector;();Argument[this];ReturnValue;taint;df-generated |
-| System.Runtime.Serialization;ISurrogateSelector;GetSurrogate;(System.Type,System.Runtime.Serialization.StreamingContext,System.Runtime.Serialization.ISurrogateSelector);Argument[this];ReturnValue;taint;df-generated |
+| System.Runtime.Serialization;ISurrogateSelector;GetSurrogate;(System.Type,System.Runtime.Serialization.StreamingContext,System.Runtime.Serialization.ISurrogateSelector);Argument[this];ReturnValue;value;dfc-generated |
 | System.Runtime.Serialization;ObjectIDGenerator;GetId;(System.Object,System.Boolean);Argument[0];Argument[this];taint;df-generated |
 | System.Runtime.Serialization;ObjectManager;GetObject;(System.Int64);Argument[this];ReturnValue;taint;df-generated |
 | System.Runtime.Serialization;ObjectManager;ObjectManager;(System.Runtime.Serialization.ISurrogateSelector,System.Runtime.Serialization.StreamingContext);Argument[0];Argument[this];taint;df-generated |
 | System.Runtime.Serialization;ObjectManager;ObjectManager;(System.Runtime.Serialization.ISurrogateSelector,System.Runtime.Serialization.StreamingContext);Argument[1];Argument[this];taint;df-generated |
-| System.Runtime.Serialization;SerializationEntry;get_Name;();Argument[this];ReturnValue;taint;df-generated |
-| System.Runtime.Serialization;SerializationEntry;get_Value;();Argument[this];ReturnValue;taint;df-generated |
-| System.Runtime.Serialization;SerializationInfo;AddValue;(System.String,System.Boolean);Argument[0];Argument[this];taint;df-generated |
-| System.Runtime.Serialization;SerializationInfo;AddValue;(System.String,System.Byte);Argument[0];Argument[this];taint;df-generated |
-| System.Runtime.Serialization;SerializationInfo;AddValue;(System.String,System.Char);Argument[0];Argument[this];taint;df-generated |
-| System.Runtime.Serialization;SerializationInfo;AddValue;(System.String,System.DateTime);Argument[0];Argument[this];taint;df-generated |
-| System.Runtime.Serialization;SerializationInfo;AddValue;(System.String,System.Decimal);Argument[0];Argument[this];taint;df-generated |
-| System.Runtime.Serialization;SerializationInfo;AddValue;(System.String,System.Double);Argument[0];Argument[this];taint;df-generated |
-| System.Runtime.Serialization;SerializationInfo;AddValue;(System.String,System.Int16);Argument[0];Argument[this];taint;df-generated |
-| System.Runtime.Serialization;SerializationInfo;AddValue;(System.String,System.Int32);Argument[0];Argument[this];taint;df-generated |
-| System.Runtime.Serialization;SerializationInfo;AddValue;(System.String,System.Int64);Argument[0];Argument[this];taint;df-generated |
-| System.Runtime.Serialization;SerializationInfo;AddValue;(System.String,System.Object);Argument[0];Argument[this];taint;df-generated |
-| System.Runtime.Serialization;SerializationInfo;AddValue;(System.String,System.Object);Argument[1];Argument[this];taint;df-generated |
-| System.Runtime.Serialization;SerializationInfo;AddValue;(System.String,System.Object,System.Type);Argument[0];Argument[this];taint;df-generated |
-| System.Runtime.Serialization;SerializationInfo;AddValue;(System.String,System.Object,System.Type);Argument[1];Argument[this];taint;df-generated |
-| System.Runtime.Serialization;SerializationInfo;AddValue;(System.String,System.SByte);Argument[0];Argument[this];taint;df-generated |
-| System.Runtime.Serialization;SerializationInfo;AddValue;(System.String,System.Single);Argument[0];Argument[this];taint;df-generated |
-| System.Runtime.Serialization;SerializationInfo;AddValue;(System.String,System.UInt16);Argument[0];Argument[this];taint;df-generated |
-| System.Runtime.Serialization;SerializationInfo;AddValue;(System.String,System.UInt32);Argument[0];Argument[this];taint;df-generated |
-| System.Runtime.Serialization;SerializationInfo;AddValue;(System.String,System.UInt64);Argument[0];Argument[this];taint;df-generated |
-| System.Runtime.Serialization;SerializationInfo;GetEnumerator;();Argument[this];ReturnValue;taint;df-generated |
-| System.Runtime.Serialization;SerializationInfo;GetString;(System.String);Argument[this];ReturnValue;taint;df-generated |
-| System.Runtime.Serialization;SerializationInfo;GetValue;(System.String,System.Type);Argument[this];ReturnValue;taint;df-generated |
+| System.Runtime.Serialization;SerializationEntry;get_Name;();Argument[this].SyntheticField[System.Runtime.Serialization.SerializationEntry._name];ReturnValue;value;dfc-generated |
+| System.Runtime.Serialization;SerializationEntry;get_Value;();Argument[this].SyntheticField[System.Runtime.Serialization.SerializationEntry._value];ReturnValue;value;dfc-generated |
+| System.Runtime.Serialization;SerializationInfo;AddValue;(System.String,System.Boolean);Argument[0];Argument[this].SyntheticField[System.Runtime.Serialization.SerializationInfo._names].Element;value;dfc-generated |
+| System.Runtime.Serialization;SerializationInfo;AddValue;(System.String,System.Byte);Argument[0];Argument[this].SyntheticField[System.Runtime.Serialization.SerializationInfo._names].Element;value;dfc-generated |
+| System.Runtime.Serialization;SerializationInfo;AddValue;(System.String,System.Char);Argument[0];Argument[this].SyntheticField[System.Runtime.Serialization.SerializationInfo._names].Element;value;dfc-generated |
+| System.Runtime.Serialization;SerializationInfo;AddValue;(System.String,System.DateTime);Argument[0];Argument[this].SyntheticField[System.Runtime.Serialization.SerializationInfo._names].Element;value;dfc-generated |
+| System.Runtime.Serialization;SerializationInfo;AddValue;(System.String,System.Decimal);Argument[0];Argument[this].SyntheticField[System.Runtime.Serialization.SerializationInfo._names].Element;value;dfc-generated |
+| System.Runtime.Serialization;SerializationInfo;AddValue;(System.String,System.Double);Argument[0];Argument[this].SyntheticField[System.Runtime.Serialization.SerializationInfo._names].Element;value;dfc-generated |
+| System.Runtime.Serialization;SerializationInfo;AddValue;(System.String,System.Int16);Argument[0];Argument[this].SyntheticField[System.Runtime.Serialization.SerializationInfo._names].Element;value;dfc-generated |
+| System.Runtime.Serialization;SerializationInfo;AddValue;(System.String,System.Int32);Argument[0];Argument[this].SyntheticField[System.Runtime.Serialization.SerializationInfo._names].Element;value;dfc-generated |
+| System.Runtime.Serialization;SerializationInfo;AddValue;(System.String,System.Int64);Argument[0];Argument[this].SyntheticField[System.Runtime.Serialization.SerializationInfo._names].Element;value;dfc-generated |
+| System.Runtime.Serialization;SerializationInfo;AddValue;(System.String,System.Object);Argument[0];Argument[this].SyntheticField[System.Runtime.Serialization.SerializationInfo._names].Element;value;dfc-generated |
+| System.Runtime.Serialization;SerializationInfo;AddValue;(System.String,System.Object);Argument[1];Argument[this].SyntheticField[System.Runtime.Serialization.SerializationInfo._values].Element;value;dfc-generated |
+| System.Runtime.Serialization;SerializationInfo;AddValue;(System.String,System.Object,System.Type);Argument[0];Argument[this].SyntheticField[System.Runtime.Serialization.SerializationInfo._names].Element;value;dfc-generated |
+| System.Runtime.Serialization;SerializationInfo;AddValue;(System.String,System.Object,System.Type);Argument[1];Argument[this].SyntheticField[System.Runtime.Serialization.SerializationInfo._values].Element;value;dfc-generated |
+| System.Runtime.Serialization;SerializationInfo;AddValue;(System.String,System.SByte);Argument[0];Argument[this].SyntheticField[System.Runtime.Serialization.SerializationInfo._names].Element;value;dfc-generated |
+| System.Runtime.Serialization;SerializationInfo;AddValue;(System.String,System.Single);Argument[0];Argument[this].SyntheticField[System.Runtime.Serialization.SerializationInfo._names].Element;value;dfc-generated |
+| System.Runtime.Serialization;SerializationInfo;AddValue;(System.String,System.UInt16);Argument[0];Argument[this].SyntheticField[System.Runtime.Serialization.SerializationInfo._names].Element;value;dfc-generated |
+| System.Runtime.Serialization;SerializationInfo;AddValue;(System.String,System.UInt32);Argument[0];Argument[this].SyntheticField[System.Runtime.Serialization.SerializationInfo._names].Element;value;dfc-generated |
+| System.Runtime.Serialization;SerializationInfo;AddValue;(System.String,System.UInt64);Argument[0];Argument[this].SyntheticField[System.Runtime.Serialization.SerializationInfo._names].Element;value;dfc-generated |
+| System.Runtime.Serialization;SerializationInfo;GetEnumerator;();Argument[this].SyntheticField[System.Runtime.Serialization.SerializationInfo._names];ReturnValue.SyntheticField[System.Runtime.Serialization.SerializationInfoEnumerator._members];value;dfc-generated |
+| System.Runtime.Serialization;SerializationInfo;GetEnumerator;();Argument[this].SyntheticField[System.Runtime.Serialization.SerializationInfo._values];ReturnValue.SyntheticField[System.Runtime.Serialization.SerializationInfoEnumerator._data];value;dfc-generated |
+| System.Runtime.Serialization;SerializationInfo;GetString;(System.String);Argument[this].SyntheticField[System.Runtime.Serialization.SerializationInfo._values].Element;ReturnValue;value;dfc-generated |
+| System.Runtime.Serialization;SerializationInfo;GetValue;(System.String,System.Type);Argument[this].SyntheticField[System.Runtime.Serialization.SerializationInfo._values].Element;ReturnValue;value;dfc-generated |
 | System.Runtime.Serialization;SerializationInfo;SerializationInfo;(System.Type,System.Runtime.Serialization.IFormatterConverter);Argument[1];Argument[this];taint;df-generated |
-| System.Runtime.Serialization;SerializationInfoEnumerator;get_Current;();Argument[this];ReturnValue;taint;df-generated |
-| System.Runtime.Serialization;SerializationInfoEnumerator;get_Name;();Argument[this];ReturnValue;taint;df-generated |
-| System.Runtime.Serialization;SerializationInfoEnumerator;get_Value;();Argument[this];ReturnValue;taint;df-generated |
+| System.Runtime.Serialization;SerializationInfoEnumerator;get_Current;();Argument[this].Property[System.Runtime.Serialization.SerializationInfoEnumerator.Current];ReturnValue;value;df-generated |
+| System.Runtime.Serialization;SerializationInfoEnumerator;get_Current;();Argument[this].Property[System.Runtime.Serialization.SerializationInfoEnumerator.Current];ReturnValue;value;dfc-generated |
+| System.Runtime.Serialization;SerializationInfoEnumerator;get_Current;();Argument[this].SyntheticField[System.Runtime.Serialization.SerializationInfoEnumerator._data].Element;ReturnValue.SyntheticField[System.Runtime.Serialization.SerializationEntry._value];value;df-generated |
+| System.Runtime.Serialization;SerializationInfoEnumerator;get_Current;();Argument[this].SyntheticField[System.Runtime.Serialization.SerializationInfoEnumerator._data].Element;ReturnValue.SyntheticField[System.Runtime.Serialization.SerializationEntry._value];value;dfc-generated |
+| System.Runtime.Serialization;SerializationInfoEnumerator;get_Current;();Argument[this].SyntheticField[System.Runtime.Serialization.SerializationInfoEnumerator._members].Element;ReturnValue.SyntheticField[System.Runtime.Serialization.SerializationEntry._name];value;df-generated |
+| System.Runtime.Serialization;SerializationInfoEnumerator;get_Current;();Argument[this].SyntheticField[System.Runtime.Serialization.SerializationInfoEnumerator._members].Element;ReturnValue.SyntheticField[System.Runtime.Serialization.SerializationEntry._name];value;dfc-generated |
+| System.Runtime.Serialization;SerializationInfoEnumerator;get_Name;();Argument[this].SyntheticField[System.Runtime.Serialization.SerializationInfoEnumerator._members].Element;ReturnValue;value;dfc-generated |
+| System.Runtime.Serialization;SerializationInfoEnumerator;get_Value;();Argument[this].SyntheticField[System.Runtime.Serialization.SerializationInfoEnumerator._data].Element;ReturnValue;value;dfc-generated |
 | System.Runtime.Serialization;SerializationObjectManager;SerializationObjectManager;(System.Runtime.Serialization.StreamingContext);Argument[0];Argument[this];taint;df-generated |
-| System.Runtime.Serialization;StreamingContext;StreamingContext;(System.Runtime.Serialization.StreamingContextStates,System.Object);Argument[1];Argument[this];taint;df-generated |
-| System.Runtime.Serialization;StreamingContext;get_Context;();Argument[this];ReturnValue;taint;df-generated |
-| System.Runtime.Serialization;XPathQueryGenerator;CreateFromDataContractSerializer;(System.Type,System.Reflection.MemberInfo[],System.Text.StringBuilder,System.Xml.XmlNamespaceManager);Argument[2];ReturnValue;taint;df-generated |
-| System.Runtime.Serialization;XmlSerializableServices;AddDefaultSchema;(System.Xml.Schema.XmlSchemaSet,System.Xml.XmlQualifiedName);Argument[1];Argument[0];taint;df-generated |
+| System.Runtime.Serialization;StreamingContext;StreamingContext;(System.Runtime.Serialization.StreamingContextStates,System.Object);Argument[1];Argument[this].SyntheticField[System.Runtime.Serialization.StreamingContext._additionalContext];value;dfc-generated |
+| System.Runtime.Serialization;StreamingContext;get_Context;();Argument[this].SyntheticField[System.Runtime.Serialization.StreamingContext._additionalContext];ReturnValue;value;dfc-generated |
+| System.Runtime.Serialization;SurrogateSelector;ChainSelector;(System.Runtime.Serialization.ISurrogateSelector);Argument[0];Argument[this].SyntheticField[System.Runtime.Serialization.SurrogateSelector._nextSelector];value;dfc-generated |
+| System.Runtime.Serialization;SurrogateSelector;GetNextSelector;();Argument[this].SyntheticField[System.Runtime.Serialization.SurrogateSelector._nextSelector];ReturnValue;value;dfc-generated |
+| System.Runtime.Serialization;SurrogateSelector;GetSurrogate;(System.Type,System.Runtime.Serialization.StreamingContext,System.Runtime.Serialization.ISurrogateSelector);Argument[this].SyntheticField[System.Runtime.Serialization.SurrogateSelector._nextSelector];ReturnValue;value;dfc-generated |
+| System.Runtime.Serialization;XPathQueryGenerator;CreateFromDataContractSerializer;(System.Type,System.Reflection.MemberInfo[],System.Text.StringBuilder,System.Xml.XmlNamespaceManager);Argument[2];ReturnValue;taint;dfc-generated |
+| System.Runtime.Serialization;XmlObjectSerializer;ReadObject;(System.IO.Stream);Argument[this];ReturnValue;taint;df-generated |
+| System.Runtime.Serialization;XmlObjectSerializer;ReadObject;(System.Xml.XmlDictionaryReader);Argument[this];ReturnValue;taint;df-generated |
+| System.Runtime.Serialization;XmlObjectSerializer;ReadObject;(System.Xml.XmlDictionaryReader,System.Boolean);Argument[this];ReturnValue;taint;df-generated |
+| System.Runtime.Serialization;XmlObjectSerializer;ReadObject;(System.Xml.XmlReader);Argument[this];ReturnValue;taint;df-generated |
+| System.Runtime.Serialization;XmlObjectSerializer;ReadObject;(System.Xml.XmlReader,System.Boolean);Argument[this];ReturnValue;taint;df-generated |
 | System.Runtime.Serialization;XmlSerializableServices;WriteNodes;(System.Xml.XmlWriter,System.Xml.XmlNode[]);Argument[1].Element;Argument[0];taint;df-generated |
-| System.Runtime.Serialization;XsdDataContractExporter;XsdDataContractExporter;(System.Xml.Schema.XmlSchemaSet);Argument[0];Argument[this];taint;df-generated |
-| System.Runtime.Serialization;XsdDataContractExporter;get_Schemas;();Argument[this];ReturnValue;taint;df-generated |
-| System.Runtime.Versioning;FrameworkName;FrameworkName;(System.String,System.Version,System.String);Argument[0];Argument[this];taint;df-generated |
-| System.Runtime.Versioning;FrameworkName;FrameworkName;(System.String,System.Version,System.String);Argument[1];Argument[this];taint;df-generated |
-| System.Runtime.Versioning;FrameworkName;FrameworkName;(System.String,System.Version,System.String);Argument[2];Argument[this];taint;df-generated |
+| System.Runtime.Serialization;XsdDataContractExporter;XsdDataContractExporter;(System.Xml.Schema.XmlSchemaSet);Argument[0];Argument[this].SyntheticField[System.Runtime.Serialization.XsdDataContractExporter._schemas];value;dfc-generated |
+| System.Runtime.Serialization;XsdDataContractExporter;get_Schemas;();Argument[this].SyntheticField[System.Runtime.Serialization.XsdDataContractExporter._schemas];ReturnValue;value;dfc-generated |
+| System.Runtime.Versioning;FrameworkName;FrameworkName;(System.String,System.Version,System.String);Argument[0];Argument[this].SyntheticField[System.Runtime.Versioning.FrameworkName._identifier];value;dfc-generated |
+| System.Runtime.Versioning;FrameworkName;FrameworkName;(System.String,System.Version,System.String);Argument[1];Argument[this].SyntheticField[System.Runtime.Versioning.FrameworkName._version];value;dfc-generated |
+| System.Runtime.Versioning;FrameworkName;FrameworkName;(System.String,System.Version,System.String);Argument[2];Argument[this].SyntheticField[System.Runtime.Versioning.FrameworkName._profile];value;dfc-generated |
 | System.Runtime.Versioning;FrameworkName;ToString;();Argument[this];ReturnValue;taint;df-generated |
 | System.Runtime.Versioning;FrameworkName;get_FullName;();Argument[this];ReturnValue;taint;df-generated |
-| System.Runtime.Versioning;FrameworkName;get_Identifier;();Argument[this];ReturnValue;taint;df-generated |
-| System.Runtime.Versioning;FrameworkName;get_Profile;();Argument[this];ReturnValue;taint;df-generated |
-| System.Runtime.Versioning;FrameworkName;get_Version;();Argument[this];ReturnValue;taint;df-generated |
-| System.Runtime.Versioning;TargetFrameworkAttribute;TargetFrameworkAttribute;(System.String);Argument[0];Argument[this];taint;df-generated |
-| System.Runtime.Versioning;TargetFrameworkAttribute;get_FrameworkName;();Argument[this];ReturnValue;taint;df-generated |
-| System.Runtime.Versioning;VersioningHelper;MakeVersionSafeName;(System.String,System.Runtime.Versioning.ResourceScope,System.Runtime.Versioning.ResourceScope);Argument[0];ReturnValue;taint;df-generated |
-| System.Runtime.Versioning;VersioningHelper;MakeVersionSafeName;(System.String,System.Runtime.Versioning.ResourceScope,System.Runtime.Versioning.ResourceScope,System.Type);Argument[0];ReturnValue;taint;df-generated |
+| System.Runtime.Versioning;FrameworkName;get_Identifier;();Argument[this].SyntheticField[System.Runtime.Versioning.FrameworkName._identifier];ReturnValue;value;dfc-generated |
+| System.Runtime.Versioning;FrameworkName;get_Profile;();Argument[this].SyntheticField[System.Runtime.Versioning.FrameworkName._profile];ReturnValue;value;dfc-generated |
+| System.Runtime.Versioning;FrameworkName;get_Version;();Argument[this].SyntheticField[System.Runtime.Versioning.FrameworkName._version];ReturnValue;value;dfc-generated |
+| System.Runtime.Versioning;TargetFrameworkAttribute;TargetFrameworkAttribute;(System.String);Argument[0];Argument[this].SyntheticField[System.Runtime.Versioning.TargetFrameworkAttribute._frameworkName];value;dfc-generated |
+| System.Runtime.Versioning;TargetFrameworkAttribute;get_FrameworkName;();Argument[this].SyntheticField[System.Runtime.Versioning.TargetFrameworkAttribute._frameworkName];ReturnValue;value;dfc-generated |
+| System.Runtime.Versioning;VersioningHelper;MakeVersionSafeName;(System.String,System.Runtime.Versioning.ResourceScope,System.Runtime.Versioning.ResourceScope);Argument[0];ReturnValue;taint;dfc-generated |
+| System.Runtime.Versioning;VersioningHelper;MakeVersionSafeName;(System.String,System.Runtime.Versioning.ResourceScope,System.Runtime.Versioning.ResourceScope,System.Type);Argument[0];ReturnValue;taint;dfc-generated |
 | System.Runtime;ControlledExecution;Run;(System.Action,System.Threading.CancellationToken);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Runtime;DependentHandle;get_TargetAndDependent;();Argument[this];ReturnValue;taint;df-generated |
 | System.Security.AccessControl;NativeObjectSecurity+ExceptionFromErrorCode;BeginInvoke;(System.Int32,System.String,System.Runtime.InteropServices.SafeHandle,System.Object,System.AsyncCallback,System.Object);Argument[4];Argument[4].Parameter[delegate-self];value;hq-generated |
@@ -11253,68 +12000,64 @@
 | System.Security.AccessControl;NativeObjectSecurity;NativeObjectSecurity;(System.Boolean,System.Security.AccessControl.ResourceType,System.String,System.Security.AccessControl.AccessControlSections,System.Security.AccessControl.NativeObjectSecurity+ExceptionFromErrorCode,System.Object);Argument[4];Argument[4].Parameter[delegate-self];value;hq-generated |
 | System.Security.AccessControl;ObjectSecurity<T>;ObjectSecurity;(System.Boolean,System.Security.AccessControl.ResourceType,System.Runtime.InteropServices.SafeHandle,System.Security.AccessControl.AccessControlSections,System.Security.AccessControl.NativeObjectSecurity+ExceptionFromErrorCode,System.Object);Argument[4];Argument[4].Parameter[delegate-self];value;hq-generated |
 | System.Security.AccessControl;ObjectSecurity<T>;ObjectSecurity;(System.Boolean,System.Security.AccessControl.ResourceType,System.String,System.Security.AccessControl.AccessControlSections,System.Security.AccessControl.NativeObjectSecurity+ExceptionFromErrorCode,System.Object);Argument[4];Argument[4].Parameter[delegate-self];value;hq-generated |
-| System.Security.Authentication.ExtendedProtection;ExtendedProtectionPolicy;ExtendedProtectionPolicy;(System.Security.Authentication.ExtendedProtection.PolicyEnforcement,System.Security.Authentication.ExtendedProtection.ChannelBinding);Argument[1];Argument[this];taint;df-generated |
-| System.Security.Authentication.ExtendedProtection;ExtendedProtectionPolicy;ExtendedProtectionPolicy;(System.Security.Authentication.ExtendedProtection.PolicyEnforcement,System.Security.Authentication.ExtendedProtection.ProtectionScenario,System.Security.Authentication.ExtendedProtection.ServiceNameCollection);Argument[2].Element;Argument[this];taint;df-generated |
-| System.Security.Authentication.ExtendedProtection;ExtendedProtectionPolicy;ToString;();Argument[this];ReturnValue;taint;df-generated |
-| System.Security.Authentication.ExtendedProtection;ExtendedProtectionPolicy;get_CustomChannelBinding;();Argument[this];ReturnValue;taint;df-generated |
-| System.Security.Authentication.ExtendedProtection;ExtendedProtectionPolicy;get_CustomServiceNames;();Argument[this];ReturnValue;taint;df-generated |
-| System.Security.Authentication.ExtendedProtection;ExtendedProtectionPolicyTypeConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[1];ReturnValue;taint;df-generated |
-| System.Security.Authentication.ExtendedProtection;ExtendedProtectionPolicyTypeConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[2];ReturnValue;taint;df-generated |
-| System.Security.Authentication.ExtendedProtection;ExtendedProtectionPolicyTypeConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[this];ReturnValue;taint;df-generated |
-| System.Security.Authentication.ExtendedProtection;ServiceNameCollection;Merge;(System.Collections.IEnumerable);Argument[0].Element;ReturnValue;taint;df-generated |
-| System.Security.Authentication.ExtendedProtection;ServiceNameCollection;Merge;(System.String);Argument[0];ReturnValue;taint;df-generated |
-| System.Security.Authentication.ExtendedProtection;ServiceNameCollection;ServiceNameCollection;(System.Collections.ICollection);Argument[0].Element;Argument[this];taint;df-generated |
-| System.Security.Claims;Claim;Claim;(System.IO.BinaryReader,System.Security.Claims.ClaimsIdentity);Argument[0];Argument[this];taint;df-generated |
+| System.Security.Authentication.ExtendedProtection;ExtendedProtectionPolicy;ExtendedProtectionPolicy;(System.Security.Authentication.ExtendedProtection.PolicyEnforcement,System.Security.Authentication.ExtendedProtection.ChannelBinding);Argument[1];Argument[this].SyntheticField[System.Security.Authentication.ExtendedProtection.ExtendedProtectionPolicy._customChannelBinding];value;dfc-generated |
+| System.Security.Authentication.ExtendedProtection;ExtendedProtectionPolicy;ExtendedProtectionPolicy;(System.Security.Authentication.ExtendedProtection.PolicyEnforcement,System.Security.Authentication.ExtendedProtection.ProtectionScenario,System.Security.Authentication.ExtendedProtection.ServiceNameCollection);Argument[2];Argument[this].SyntheticField[System.Security.Authentication.ExtendedProtection.ExtendedProtectionPolicy._customServiceNames];value;dfc-generated |
+| System.Security.Authentication.ExtendedProtection;ExtendedProtectionPolicy;ToString;();Argument[this].SyntheticField[System.Security.Authentication.ExtendedProtection.ExtendedProtectionPolicy._customServiceNames].Element;ReturnValue;taint;dfc-generated |
+| System.Security.Authentication.ExtendedProtection;ExtendedProtectionPolicy;get_CustomChannelBinding;();Argument[this].SyntheticField[System.Security.Authentication.ExtendedProtection.ExtendedProtectionPolicy._customChannelBinding];ReturnValue;value;dfc-generated |
+| System.Security.Authentication.ExtendedProtection;ExtendedProtectionPolicy;get_CustomServiceNames;();Argument[this].SyntheticField[System.Security.Authentication.ExtendedProtection.ExtendedProtectionPolicy._customServiceNames];ReturnValue;value;dfc-generated |
+| System.Security.Authentication.ExtendedProtection;ExtendedProtectionPolicyTypeConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[2].Element;ReturnValue;taint;dfc-generated |
+| System.Security.Authentication.ExtendedProtection;ExtendedProtectionPolicyTypeConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[2];ReturnValue;taint;dfc-generated |
+| System.Security.Authentication.ExtendedProtection;ServiceNameCollection;Merge;(System.Collections.IEnumerable);Argument[0].Element;ReturnValue.Property[System.Collections.ReadOnlyCollectionBase.InnerList].Element;value;dfc-generated |
+| System.Security.Authentication.ExtendedProtection;ServiceNameCollection;Merge;(System.Collections.IEnumerable);Argument[0].Property[System.Collections.ReadOnlyCollectionBase.InnerList].Element;ReturnValue.Property[System.Collections.ReadOnlyCollectionBase.InnerList].Element;value;dfc-generated |
+| System.Security.Authentication.ExtendedProtection;ServiceNameCollection;Merge;(System.String);Argument[0];ReturnValue.Property[System.Collections.ReadOnlyCollectionBase.InnerList].Element;value;dfc-generated |
+| System.Security.Authentication.ExtendedProtection;ServiceNameCollection;ServiceNameCollection;(System.Collections.ICollection);Argument[0].Element;Argument[this].Property[System.Collections.ReadOnlyCollectionBase.InnerList].Element;value;dfc-generated |
+| System.Security.Authentication.ExtendedProtection;ServiceNameCollection;ServiceNameCollection;(System.Collections.ICollection);Argument[0].Property[System.Collections.ReadOnlyCollectionBase.InnerList].Element;Argument[this].Property[System.Collections.ReadOnlyCollectionBase.InnerList].Element;value;dfc-generated |
 | System.Security.Claims;Claim;Claim;(System.IO.BinaryReader,System.Security.Claims.ClaimsIdentity);Argument[1];Argument[this];taint;df-generated |
 | System.Security.Claims;Claim;Claim;(System.Security.Claims.Claim,System.Security.Claims.ClaimsIdentity);Argument[0];Argument[this];taint;df-generated |
 | System.Security.Claims;Claim;Claim;(System.Security.Claims.Claim,System.Security.Claims.ClaimsIdentity);Argument[1];Argument[this];taint;df-generated |
-| System.Security.Claims;Claim;Clone;();Argument[this];ReturnValue;taint;df-generated |
-| System.Security.Claims;Claim;Clone;(System.Security.Claims.ClaimsIdentity);Argument[0];ReturnValue;taint;df-generated |
-| System.Security.Claims;Claim;Clone;(System.Security.Claims.ClaimsIdentity);Argument[this];ReturnValue;taint;df-generated |
 | System.Security.Claims;Claim;ToString;();Argument[this];ReturnValue;taint;df-generated |
-| System.Security.Claims;Claim;WriteTo;(System.IO.BinaryWriter,System.Byte[]);Argument[1].Element;Argument[0];taint;df-generated |
 | System.Security.Claims;Claim;get_CustomSerializationData;();Argument[this];ReturnValue;taint;df-generated |
 | System.Security.Claims;Claim;get_Issuer;();Argument[this];ReturnValue;taint;df-generated |
 | System.Security.Claims;Claim;get_OriginalIssuer;();Argument[this];ReturnValue;taint;df-generated |
 | System.Security.Claims;Claim;get_Type;();Argument[this];ReturnValue;taint;df-generated |
 | System.Security.Claims;Claim;get_Value;();Argument[this];ReturnValue;taint;df-generated |
 | System.Security.Claims;Claim;get_ValueType;();Argument[this];ReturnValue;taint;df-generated |
-| System.Security.Claims;ClaimsIdentity;AddClaim;(System.Security.Claims.Claim);Argument[0];Argument[this];taint;df-generated |
-| System.Security.Claims;ClaimsIdentity;AddClaims;(System.Collections.Generic.IEnumerable<System.Security.Claims.Claim>);Argument[0].Element;Argument[this];taint;df-generated |
-| System.Security.Claims;ClaimsIdentity;ClaimsIdentity;(System.IO.BinaryReader);Argument[0];Argument[this];taint;df-generated |
+| System.Security.Claims;ClaimsIdentity;AddClaim;(System.Security.Claims.Claim);Argument[0];Argument[this].SyntheticField[System.Security.Claims.ClaimsIdentity._instanceClaims].Element;value;dfc-generated |
+| System.Security.Claims;ClaimsIdentity;AddClaims;(System.Collections.Generic.IEnumerable<System.Security.Claims.Claim>);Argument[0].Element;Argument[this].SyntheticField[System.Security.Claims.ClaimsIdentity._instanceClaims].Element;value;dfc-generated |
 | System.Security.Claims;ClaimsIdentity;ClaimsIdentity;(System.Security.Claims.ClaimsIdentity);Argument[0];Argument[this];taint;df-generated |
-| System.Security.Claims;ClaimsIdentity;ClaimsIdentity;(System.Security.Principal.IIdentity,System.Collections.Generic.IEnumerable<System.Security.Claims.Claim>,System.String,System.String,System.String);Argument[0];Argument[this];taint;df-generated |
-| System.Security.Claims;ClaimsIdentity;ClaimsIdentity;(System.Security.Principal.IIdentity,System.Collections.Generic.IEnumerable<System.Security.Claims.Claim>,System.String,System.String,System.String);Argument[1].Element;Argument[this];taint;df-generated |
-| System.Security.Claims;ClaimsIdentity;ClaimsIdentity;(System.Security.Principal.IIdentity,System.Collections.Generic.IEnumerable<System.Security.Claims.Claim>,System.String,System.String,System.String);Argument[2];Argument[this];taint;df-generated |
-| System.Security.Claims;ClaimsIdentity;ClaimsIdentity;(System.Security.Principal.IIdentity,System.Collections.Generic.IEnumerable<System.Security.Claims.Claim>,System.String,System.String,System.String);Argument[3];Argument[this];taint;df-generated |
-| System.Security.Claims;ClaimsIdentity;ClaimsIdentity;(System.Security.Principal.IIdentity,System.Collections.Generic.IEnumerable<System.Security.Claims.Claim>,System.String,System.String,System.String);Argument[4];Argument[this];taint;df-generated |
-| System.Security.Claims;ClaimsIdentity;Clone;();Argument[this];ReturnValue;taint;df-generated |
-| System.Security.Claims;ClaimsIdentity;CreateClaim;(System.IO.BinaryReader);Argument[0];ReturnValue;taint;df-generated |
-| System.Security.Claims;ClaimsIdentity;CreateClaim;(System.IO.BinaryReader);Argument[this];ReturnValue;taint;df-generated |
+| System.Security.Claims;ClaimsIdentity;ClaimsIdentity;(System.Security.Principal.IIdentity,System.Collections.Generic.IEnumerable<System.Security.Claims.Claim>,System.String,System.String,System.String);Argument[1].Element;Argument[this].SyntheticField[System.Security.Claims.ClaimsIdentity._instanceClaims].Element;value;dfc-generated |
+| System.Security.Claims;ClaimsIdentity;ClaimsIdentity;(System.Security.Principal.IIdentity,System.Collections.Generic.IEnumerable<System.Security.Claims.Claim>,System.String,System.String,System.String);Argument[2];Argument[this].SyntheticField[System.Security.Claims.ClaimsIdentity._authenticationType];value;dfc-generated |
+| System.Security.Claims;ClaimsIdentity;ClaimsIdentity;(System.Security.Principal.IIdentity,System.Collections.Generic.IEnumerable<System.Security.Claims.Claim>,System.String,System.String,System.String);Argument[3];Argument[this].SyntheticField[System.Security.Claims.ClaimsIdentity._nameClaimType];value;dfc-generated |
+| System.Security.Claims;ClaimsIdentity;ClaimsIdentity;(System.Security.Principal.IIdentity,System.Collections.Generic.IEnumerable<System.Security.Claims.Claim>,System.String,System.String,System.String);Argument[4];Argument[this].SyntheticField[System.Security.Claims.ClaimsIdentity._roleClaimType];value;dfc-generated |
 | System.Security.Claims;ClaimsIdentity;FindAll;(System.Predicate<System.Security.Claims.Claim>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Security.Claims;ClaimsIdentity;FindFirst;(System.Predicate<System.Security.Claims.Claim>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
-| System.Security.Claims;ClaimsIdentity;FindFirst;(System.String);Argument[this];ReturnValue;taint;df-generated |
+| System.Security.Claims;ClaimsIdentity;FindFirst;(System.String);Argument[this].Property[System.Security.Claims.ClaimsIdentity.Claims].Element;ReturnValue;value;dfc-generated |
+| System.Security.Claims;ClaimsIdentity;FindFirst;(System.String);Argument[this].SyntheticField[System.Security.Claims.ClaimsIdentity._instanceClaims].Element;ReturnValue;value;dfc-generated |
+| System.Security.Claims;ClaimsIdentity;HasClaim;(System.Predicate<System.Security.Claims.Claim>);Argument[0];Argument[0].Parameter[delegate-self];value;dfc-generated |
 | System.Security.Claims;ClaimsIdentity;HasClaim;(System.Predicate<System.Security.Claims.Claim>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
-| System.Security.Claims;ClaimsIdentity;WriteTo;(System.IO.BinaryWriter,System.Byte[]);Argument[1].Element;Argument[0];taint;df-generated |
-| System.Security.Claims;ClaimsIdentity;get_Claims;();Argument[this];ReturnValue;taint;df-generated |
+| System.Security.Claims;ClaimsIdentity;HasClaim;(System.Predicate<System.Security.Claims.Claim>);Argument[this].Property[System.Security.Claims.ClaimsIdentity.Claims].Element;Argument[0].Parameter[0];value;dfc-generated |
+| System.Security.Claims;ClaimsIdentity;HasClaim;(System.Predicate<System.Security.Claims.Claim>);Argument[this].Property[System.Security.Claims.ClaimsIdentity.Claims].Element;Argument[0].Parameter[0];value;hq-generated |
+| System.Security.Claims;ClaimsIdentity;HasClaim;(System.Predicate<System.Security.Claims.Claim>);Argument[this].SyntheticField[System.Security.Claims.ClaimsIdentity._instanceClaims].Element;Argument[0].Parameter[0];value;dfc-generated |
+| System.Security.Claims;ClaimsIdentity;HasClaim;(System.Predicate<System.Security.Claims.Claim>);Argument[this].SyntheticField[System.Security.Claims.ClaimsIdentity._instanceClaims].Element;Argument[0].Parameter[0];value;hq-generated |
+| System.Security.Claims;ClaimsIdentity;get_AuthenticationType;();Argument[this].SyntheticField[System.Security.Claims.ClaimsIdentity._authenticationType];ReturnValue;value;dfc-generated |
+| System.Security.Claims;ClaimsIdentity;get_Claims;();Argument[this].SyntheticField[System.Security.Claims.ClaimsIdentity._instanceClaims].Element;ReturnValue.Element;value;dfc-generated |
+| System.Security.Claims;ClaimsIdentity;get_Claims;();Argument[this].SyntheticField[System.Security.Claims.ClaimsIdentity._instanceClaims];ReturnValue;value;dfc-generated |
 | System.Security.Claims;ClaimsIdentity;get_CustomSerializationData;();Argument[this];ReturnValue;taint;df-generated |
-| System.Security.Claims;ClaimsIdentity;get_NameClaimType;();Argument[this];ReturnValue;taint;df-generated |
-| System.Security.Claims;ClaimsIdentity;get_RoleClaimType;();Argument[this];ReturnValue;taint;df-generated |
-| System.Security.Claims;ClaimsPrincipal;AddIdentities;(System.Collections.Generic.IEnumerable<System.Security.Claims.ClaimsIdentity>);Argument[0].Element;Argument[this];taint;df-generated |
-| System.Security.Claims;ClaimsPrincipal;AddIdentity;(System.Security.Claims.ClaimsIdentity);Argument[0];Argument[this];taint;df-generated |
-| System.Security.Claims;ClaimsPrincipal;ClaimsPrincipal;(System.Collections.Generic.IEnumerable<System.Security.Claims.ClaimsIdentity>);Argument[0].Element;Argument[this];taint;df-generated |
-| System.Security.Claims;ClaimsPrincipal;ClaimsPrincipal;(System.Security.Principal.IIdentity);Argument[0];Argument[this];taint;df-generated |
-| System.Security.Claims;ClaimsPrincipal;ClaimsPrincipal;(System.Security.Principal.IPrincipal);Argument[0];Argument[this];taint;df-generated |
-| System.Security.Claims;ClaimsPrincipal;Clone;();Argument[this];ReturnValue;taint;df-generated |
-| System.Security.Claims;ClaimsPrincipal;CreateClaimsIdentity;(System.IO.BinaryReader);Argument[0];ReturnValue;taint;df-generated |
+| System.Security.Claims;ClaimsIdentity;get_NameClaimType;();Argument[this].SyntheticField[System.Security.Claims.ClaimsIdentity._nameClaimType];ReturnValue;value;dfc-generated |
+| System.Security.Claims;ClaimsIdentity;get_RoleClaimType;();Argument[this].SyntheticField[System.Security.Claims.ClaimsIdentity._roleClaimType];ReturnValue;value;dfc-generated |
+| System.Security.Claims;ClaimsPrincipal;AddIdentities;(System.Collections.Generic.IEnumerable<System.Security.Claims.ClaimsIdentity>);Argument[0].Element;Argument[this].SyntheticField[System.Security.Claims.ClaimsPrincipal._identities].Element;value;dfc-generated |
+| System.Security.Claims;ClaimsPrincipal;AddIdentity;(System.Security.Claims.ClaimsIdentity);Argument[0];Argument[this].SyntheticField[System.Security.Claims.ClaimsPrincipal._identities].Element;value;dfc-generated |
+| System.Security.Claims;ClaimsPrincipal;ClaimsPrincipal;(System.Collections.Generic.IEnumerable<System.Security.Claims.ClaimsIdentity>);Argument[0].Element;Argument[this].SyntheticField[System.Security.Claims.ClaimsPrincipal._identities].Element;value;dfc-generated |
+| System.Security.Claims;ClaimsPrincipal;ClaimsPrincipal;(System.Security.Principal.IIdentity);Argument[0];Argument[this].SyntheticField[System.Security.Claims.ClaimsPrincipal._identities].Element;value;dfc-generated |
+| System.Security.Claims;ClaimsPrincipal;ClaimsPrincipal;(System.Security.Principal.IPrincipal);Argument[0].Property[System.Security.Claims.ClaimsPrincipal.Identities].Element;Argument[this].SyntheticField[System.Security.Claims.ClaimsPrincipal._identities].Element;value;dfc-generated |
 | System.Security.Claims;ClaimsPrincipal;FindAll;(System.Predicate<System.Security.Claims.Claim>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Security.Claims;ClaimsPrincipal;FindFirst;(System.Predicate<System.Security.Claims.Claim>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Security.Claims;ClaimsPrincipal;FindFirst;(System.String);Argument[this];ReturnValue;taint;df-generated |
 | System.Security.Claims;ClaimsPrincipal;HasClaim;(System.Predicate<System.Security.Claims.Claim>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
-| System.Security.Claims;ClaimsPrincipal;WriteTo;(System.IO.BinaryWriter,System.Byte[]);Argument[1].Element;Argument[0];taint;df-generated |
 | System.Security.Claims;ClaimsPrincipal;get_Claims;();Argument[this];ReturnValue;taint;df-generated |
 | System.Security.Claims;ClaimsPrincipal;get_CustomSerializationData;();Argument[this];ReturnValue;taint;df-generated |
-| System.Security.Claims;ClaimsPrincipal;get_Identities;();Argument[this];ReturnValue;taint;df-generated |
+| System.Security.Claims;ClaimsPrincipal;get_Identities;();Argument[this].SyntheticField[System.Security.Claims.ClaimsPrincipal._identities];ReturnValue;value;dfc-generated |
+| System.Security.Claims;ClaimsPrincipal;get_Identity;();Argument[this].SyntheticField[System.Security.Claims.ClaimsPrincipal._identities].Element;ReturnValue;value;dfc-generated |
 | System.Security.Claims;ClaimsPrincipal;set_ClaimsPrincipalSelector;(System.Func<System.Security.Claims.ClaimsPrincipal>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Security.Claims;ClaimsPrincipal;set_PrimaryIdentitySelector;(System.Func<System.Collections.Generic.IEnumerable<System.Security.Claims.ClaimsIdentity>,System.Security.Claims.ClaimsIdentity>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Security.Cryptography.X509Certificates;CertificateRequest;CertificateRequest;(System.Security.Cryptography.X509Certificates.X500DistinguishedName,System.Security.Cryptography.ECDsa,System.Security.Cryptography.HashAlgorithmName);Argument[1];Argument[this];taint;df-generated |
@@ -11324,40 +12067,41 @@
 | System.Security.Cryptography.X509Certificates;CertificateRequest;CertificateRequest;(System.String,System.Security.Cryptography.ECDsa,System.Security.Cryptography.HashAlgorithmName);Argument[1];Argument[this];taint;df-generated |
 | System.Security.Cryptography.X509Certificates;CertificateRequest;CertificateRequest;(System.String,System.Security.Cryptography.RSA,System.Security.Cryptography.HashAlgorithmName,System.Security.Cryptography.RSASignaturePadding);Argument[1];Argument[this];taint;df-generated |
 | System.Security.Cryptography.X509Certificates;CertificateRequest;CertificateRequest;(System.String,System.Security.Cryptography.RSA,System.Security.Cryptography.HashAlgorithmName,System.Security.Cryptography.RSASignaturePadding);Argument[3];Argument[this];taint;df-generated |
-| System.Security.Cryptography.X509Certificates;CertificateRequest;LoadSigningRequest;(System.Byte[],System.Security.Cryptography.HashAlgorithmName,System.Security.Cryptography.X509Certificates.CertificateRequestLoadOptions,System.Security.Cryptography.RSASignaturePadding);Argument[3];ReturnValue;taint;df-generated |
-| System.Security.Cryptography.X509Certificates;CertificateRequest;LoadSigningRequest;(System.ReadOnlySpan<System.Byte>,System.Security.Cryptography.HashAlgorithmName,System.Int32,System.Security.Cryptography.X509Certificates.CertificateRequestLoadOptions,System.Security.Cryptography.RSASignaturePadding);Argument[4];ReturnValue;taint;df-generated |
-| System.Security.Cryptography.X509Certificates;CertificateRequest;LoadSigningRequestPem;(System.ReadOnlySpan<System.Char>,System.Security.Cryptography.HashAlgorithmName,System.Security.Cryptography.X509Certificates.CertificateRequestLoadOptions,System.Security.Cryptography.RSASignaturePadding);Argument[3];ReturnValue;taint;df-generated |
-| System.Security.Cryptography.X509Certificates;CertificateRequest;LoadSigningRequestPem;(System.String,System.Security.Cryptography.HashAlgorithmName,System.Security.Cryptography.X509Certificates.CertificateRequestLoadOptions,System.Security.Cryptography.RSASignaturePadding);Argument[3];ReturnValue;taint;df-generated |
-| System.Security.Cryptography.X509Certificates;PublicKey;PublicKey;(System.Security.Cryptography.Oid,System.Security.Cryptography.AsnEncodedData,System.Security.Cryptography.AsnEncodedData);Argument[0];Argument[this];taint;df-generated |
+| System.Security.Cryptography.X509Certificates;PublicKey;PublicKey;(System.Security.Cryptography.Oid,System.Security.Cryptography.AsnEncodedData,System.Security.Cryptography.AsnEncodedData);Argument[0];Argument[this].SyntheticField[System.Security.Cryptography.X509Certificates.PublicKey._oid];value;dfc-generated |
 | System.Security.Cryptography.X509Certificates;PublicKey;get_Key;();Argument[this];ReturnValue;taint;df-generated |
-| System.Security.Cryptography.X509Certificates;PublicKey;get_Oid;();Argument[this];ReturnValue;taint;df-generated |
-| System.Security.Cryptography.X509Certificates;X500DistinguishedName;Format;(System.Boolean);Argument[this];ReturnValue;taint;df-generated |
+| System.Security.Cryptography.X509Certificates;PublicKey;get_Oid;();Argument[this].SyntheticField[System.Security.Cryptography.X509Certificates.PublicKey._oid];ReturnValue;value;dfc-generated |
+| System.Security.Cryptography.X509Certificates;X500DistinguishedName;Format;(System.Boolean);Argument[this].SyntheticField[System.Security.Cryptography.AsnEncodedData._rawData].Element;ReturnValue;taint;dfc-generated |
 | System.Security.Cryptography.X509Certificates;X500DistinguishedName;X500DistinguishedName;(System.Security.Cryptography.X509Certificates.X500DistinguishedName);Argument[0];Argument[this];taint;df-generated |
 | System.Security.Cryptography.X509Certificates;X500DistinguishedName;X500DistinguishedName;(System.String,System.Security.Cryptography.X509Certificates.X500DistinguishedNameFlags);Argument[0];Argument[this];taint;df-generated |
 | System.Security.Cryptography.X509Certificates;X500RelativeDistinguishedName;GetSingleElementType;();Argument[this];ReturnValue;taint;df-generated |
-| System.Security.Cryptography.X509Certificates;X509AuthorityInformationAccessExtension;CopyFrom;(System.Security.Cryptography.AsnEncodedData);Argument[0];Argument[this];taint;df-generated |
-| System.Security.Cryptography.X509Certificates;X509AuthorityKeyIdentifierExtension;CopyFrom;(System.Security.Cryptography.AsnEncodedData);Argument[0];Argument[this];taint;df-generated |
+| System.Security.Cryptography.X509Certificates;X509AuthorityInformationAccessExtension;CopyFrom;(System.Security.Cryptography.AsnEncodedData);Argument[0].SyntheticField[System.Security.Cryptography.AsnEncodedData._rawData].Element;Argument[this].SyntheticField[System.Security.Cryptography.AsnEncodedData._rawData].Element;value;dfc-generated |
+| System.Security.Cryptography.X509Certificates;X509AuthorityInformationAccessExtension;CopyFrom;(System.Security.Cryptography.AsnEncodedData);Argument[0].SyntheticField[System.Security.Cryptography.AsnEncodedData._rawData];Argument[this].SyntheticField[System.Security.Cryptography.AsnEncodedData._rawData];value;dfc-generated |
+| System.Security.Cryptography.X509Certificates;X509AuthorityKeyIdentifierExtension;CopyFrom;(System.Security.Cryptography.AsnEncodedData);Argument[0].SyntheticField[System.Security.Cryptography.AsnEncodedData._rawData].Element;Argument[this].SyntheticField[System.Security.Cryptography.AsnEncodedData._rawData].Element;value;dfc-generated |
+| System.Security.Cryptography.X509Certificates;X509AuthorityKeyIdentifierExtension;CopyFrom;(System.Security.Cryptography.AsnEncodedData);Argument[0].SyntheticField[System.Security.Cryptography.AsnEncodedData._rawData];Argument[this].SyntheticField[System.Security.Cryptography.AsnEncodedData._rawData];value;dfc-generated |
 | System.Security.Cryptography.X509Certificates;X509AuthorityKeyIdentifierExtension;get_KeyIdentifier;();Argument[this];ReturnValue;taint;df-generated |
 | System.Security.Cryptography.X509Certificates;X509AuthorityKeyIdentifierExtension;get_NamedIssuer;();Argument[this];ReturnValue;taint;df-generated |
 | System.Security.Cryptography.X509Certificates;X509AuthorityKeyIdentifierExtension;get_RawIssuer;();Argument[this];ReturnValue;taint;df-generated |
 | System.Security.Cryptography.X509Certificates;X509AuthorityKeyIdentifierExtension;get_SerialNumber;();Argument[this];ReturnValue;taint;df-generated |
-| System.Security.Cryptography.X509Certificates;X509BasicConstraintsExtension;CopyFrom;(System.Security.Cryptography.AsnEncodedData);Argument[0];Argument[this];taint;df-generated |
-| System.Security.Cryptography.X509Certificates;X509Certificate2;ToString;(System.Boolean);Argument[this];ReturnValue;taint;df-generated |
+| System.Security.Cryptography.X509Certificates;X509BasicConstraintsExtension;CopyFrom;(System.Security.Cryptography.AsnEncodedData);Argument[0].SyntheticField[System.Security.Cryptography.AsnEncodedData._rawData].Element;Argument[this].SyntheticField[System.Security.Cryptography.AsnEncodedData._rawData].Element;value;dfc-generated |
+| System.Security.Cryptography.X509Certificates;X509BasicConstraintsExtension;CopyFrom;(System.Security.Cryptography.AsnEncodedData);Argument[0].SyntheticField[System.Security.Cryptography.AsnEncodedData._rawData];Argument[this].SyntheticField[System.Security.Cryptography.AsnEncodedData._rawData];value;dfc-generated |
+| System.Security.Cryptography.X509Certificates;X509Certificate2;ToString;();Argument[this].Property[System.Security.Cryptography.X509Certificates.X509Certificate.Issuer];ReturnValue;taint;dfc-generated |
+| System.Security.Cryptography.X509Certificates;X509Certificate2;ToString;();Argument[this].Property[System.Security.Cryptography.X509Certificates.X509Certificate.Subject];ReturnValue;taint;dfc-generated |
+| System.Security.Cryptography.X509Certificates;X509Certificate2;ToString;(System.Boolean);Argument[this].Property[System.Security.Cryptography.X509Certificates.X509Certificate.Issuer];ReturnValue;taint;dfc-generated |
+| System.Security.Cryptography.X509Certificates;X509Certificate2;ToString;(System.Boolean);Argument[this].Property[System.Security.Cryptography.X509Certificates.X509Certificate.Subject];ReturnValue;taint;dfc-generated |
 | System.Security.Cryptography.X509Certificates;X509Certificate2;get_Extensions;();Argument[this];ReturnValue;taint;df-generated |
 | System.Security.Cryptography.X509Certificates;X509Certificate2;get_PublicKey;();Argument[this];ReturnValue;taint;df-generated |
-| System.Security.Cryptography.X509Certificates;X509Certificate2;get_RawData;();Argument[this];ReturnValue;taint;df-generated |
 | System.Security.Cryptography.X509Certificates;X509Certificate2Collection;Add;(System.Security.Cryptography.X509Certificates.X509Certificate2);Argument[0];Argument[this].Element;value;manual |
 | System.Security.Cryptography.X509Certificates;X509Certificate2Collection;AddRange;(System.Security.Cryptography.X509Certificates.X509Certificate2Collection);Argument[0].Element;Argument[this].Element;value;manual |
 | System.Security.Cryptography.X509Certificates;X509Certificate2Collection;AddRange;(System.Security.Cryptography.X509Certificates.X509Certificate2[]);Argument[0].Element;Argument[this].Element;value;manual |
 | System.Security.Cryptography.X509Certificates;X509Certificate2Collection;Find;(System.Security.Cryptography.X509Certificates.X509FindType,System.Object,System.Boolean);Argument[this].Element;ReturnValue;value;manual |
 | System.Security.Cryptography.X509Certificates;X509Certificate2Collection;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Security.Cryptography.X509Certificates.X509Certificate2Enumerator.Current];value;manual |
 | System.Security.Cryptography.X509Certificates;X509Certificate2Collection;Insert;(System.Int32,System.Security.Cryptography.X509Certificates.X509Certificate2);Argument[1];Argument[this].Element;value;manual |
-| System.Security.Cryptography.X509Certificates;X509Certificate2Collection;Remove;(System.Security.Cryptography.X509Certificates.X509Certificate2);Argument[0];Argument[this];taint;df-generated |
 | System.Security.Cryptography.X509Certificates;X509Certificate2Collection;RemoveRange;(System.Security.Cryptography.X509Certificates.X509Certificate2Collection);Argument[0].Element;Argument[this];taint;df-generated |
-| System.Security.Cryptography.X509Certificates;X509Certificate2Collection;RemoveRange;(System.Security.Cryptography.X509Certificates.X509Certificate2[]);Argument[0].Element;Argument[this];taint;df-generated |
-| System.Security.Cryptography.X509Certificates;X509Certificate2Collection;X509Certificate2Collection;(System.Security.Cryptography.X509Certificates.X509Certificate2);Argument[0];Argument[this];taint;df-generated |
+| System.Security.Cryptography.X509Certificates;X509Certificate2Collection;RemoveRange;(System.Security.Cryptography.X509Certificates.X509Certificate2[]);Argument[0].Element;Argument[this].Element;value;dfc-generated |
+| System.Security.Cryptography.X509Certificates;X509Certificate2Collection;RemoveRange;(System.Security.Cryptography.X509Certificates.X509Certificate2[]);Argument[0].Element;Argument[this].Property[System.Collections.CollectionBase.List].Element;value;dfc-generated |
 | System.Security.Cryptography.X509Certificates;X509Certificate2Collection;X509Certificate2Collection;(System.Security.Cryptography.X509Certificates.X509Certificate2Collection);Argument[0].Element;Argument[this];taint;df-generated |
-| System.Security.Cryptography.X509Certificates;X509Certificate2Collection;X509Certificate2Collection;(System.Security.Cryptography.X509Certificates.X509Certificate2[]);Argument[0].Element;Argument[this];taint;df-generated |
+| System.Security.Cryptography.X509Certificates;X509Certificate2Collection;X509Certificate2Collection;(System.Security.Cryptography.X509Certificates.X509Certificate2[]);Argument[0].Element;Argument[this].Element;value;dfc-generated |
+| System.Security.Cryptography.X509Certificates;X509Certificate2Collection;X509Certificate2Collection;(System.Security.Cryptography.X509Certificates.X509Certificate2[]);Argument[0].Element;Argument[this].Property[System.Collections.CollectionBase.List].Element;value;dfc-generated |
 | System.Security.Cryptography.X509Certificates;X509Certificate2Collection;get_Item;(System.Int32);Argument[this].Element;ReturnValue;value;manual |
 | System.Security.Cryptography.X509Certificates;X509Certificate2Collection;set_Item;(System.Int32,System.Security.Cryptography.X509Certificates.X509Certificate2);Argument[1];Argument[this].Element;value;manual |
 | System.Security.Cryptography.X509Certificates;X509Certificate2Enumerator;get_Current;();Argument[this];ReturnValue;taint;df-generated |
@@ -11366,9 +12110,9 @@
 | System.Security.Cryptography.X509Certificates;X509Certificate;GetRawCertData;();Argument[this];ReturnValue;taint;df-generated |
 | System.Security.Cryptography.X509Certificates;X509Certificate;GetRawCertDataString;();Argument[this];ReturnValue;taint;df-generated |
 | System.Security.Cryptography.X509Certificates;X509Certificate;ToString;();Argument[this];ReturnValue;taint;df-generated |
-| System.Security.Cryptography.X509Certificates;X509Certificate;ToString;(System.Boolean);Argument[this];ReturnValue;taint;df-generated |
+| System.Security.Cryptography.X509Certificates;X509Certificate;ToString;(System.Boolean);Argument[this].Property[System.Security.Cryptography.X509Certificates.X509Certificate.Issuer];ReturnValue;taint;dfc-generated |
+| System.Security.Cryptography.X509Certificates;X509Certificate;ToString;(System.Boolean);Argument[this].Property[System.Security.Cryptography.X509Certificates.X509Certificate.Subject];ReturnValue;taint;dfc-generated |
 | System.Security.Cryptography.X509Certificates;X509Certificate;get_Handle;();Argument[this];ReturnValue;taint;df-generated |
-| System.Security.Cryptography.X509Certificates;X509CertificateCollection+X509CertificateEnumerator;X509CertificateEnumerator;(System.Security.Cryptography.X509Certificates.X509CertificateCollection);Argument[0].Element;Argument[this];taint;df-generated |
 | System.Security.Cryptography.X509Certificates;X509CertificateCollection+X509CertificateEnumerator;get_Current;();Argument[this];ReturnValue;taint;df-generated |
 | System.Security.Cryptography.X509Certificates;X509CertificateCollection;Add;(System.Security.Cryptography.X509Certificates.X509Certificate);Argument[0];Argument[this].Element;value;manual |
 | System.Security.Cryptography.X509Certificates;X509CertificateCollection;AddRange;(System.Security.Cryptography.X509Certificates.X509CertificateCollection);Argument[0].Element;Argument[this].Element;value;manual |
@@ -11376,53 +12120,61 @@
 | System.Security.Cryptography.X509Certificates;X509CertificateCollection;CopyTo;(System.Security.Cryptography.X509Certificates.X509Certificate[],System.Int32);Argument[this].Element;Argument[0].Element;value;manual |
 | System.Security.Cryptography.X509Certificates;X509CertificateCollection;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Security.Cryptography.X509Certificates.X509CertificateCollection+X509CertificateEnumerator.Current];value;manual |
 | System.Security.Cryptography.X509Certificates;X509CertificateCollection;Insert;(System.Int32,System.Security.Cryptography.X509Certificates.X509Certificate);Argument[1];Argument[this].Element;value;manual |
-| System.Security.Cryptography.X509Certificates;X509CertificateCollection;Remove;(System.Security.Cryptography.X509Certificates.X509Certificate);Argument[0];Argument[this];taint;df-generated |
 | System.Security.Cryptography.X509Certificates;X509CertificateCollection;X509CertificateCollection;(System.Security.Cryptography.X509Certificates.X509CertificateCollection);Argument[0].Element;Argument[this];taint;df-generated |
-| System.Security.Cryptography.X509Certificates;X509CertificateCollection;X509CertificateCollection;(System.Security.Cryptography.X509Certificates.X509Certificate[]);Argument[0].Element;Argument[this];taint;df-generated |
+| System.Security.Cryptography.X509Certificates;X509CertificateCollection;X509CertificateCollection;(System.Security.Cryptography.X509Certificates.X509Certificate[]);Argument[0].Element;Argument[this].Element;value;dfc-generated |
+| System.Security.Cryptography.X509Certificates;X509CertificateCollection;X509CertificateCollection;(System.Security.Cryptography.X509Certificates.X509Certificate[]);Argument[0].Element;Argument[this].Property[System.Collections.CollectionBase.List].Element;value;dfc-generated |
 | System.Security.Cryptography.X509Certificates;X509CertificateCollection;get_Item;(System.Int32);Argument[this].Element;ReturnValue;value;manual |
 | System.Security.Cryptography.X509Certificates;X509CertificateCollection;set_Item;(System.Int32,System.Security.Cryptography.X509Certificates.X509Certificate);Argument[1];Argument[this].Element;value;manual |
-| System.Security.Cryptography.X509Certificates;X509Chain;Build;(System.Security.Cryptography.X509Certificates.X509Certificate2);Argument[0];Argument[this];taint;df-generated |
-| System.Security.Cryptography.X509Certificates;X509Chain;get_ChainContext;();Argument[this];ReturnValue;taint;df-generated |
 | System.Security.Cryptography.X509Certificates;X509Chain;get_SafeHandle;();Argument[this];ReturnValue;taint;df-generated |
 | System.Security.Cryptography.X509Certificates;X509ChainElementCollection;CopyTo;(System.Security.Cryptography.X509Certificates.X509ChainElement[],System.Int32);Argument[this].Element;Argument[0].Element;value;manual |
 | System.Security.Cryptography.X509Certificates;X509ChainElementCollection;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Security.Cryptography.X509Certificates.X509ChainElementEnumerator.Current];value;manual |
 | System.Security.Cryptography.X509Certificates;X509ChainElementCollection;get_Item;(System.Int32);Argument[this];ReturnValue;taint;df-generated |
+| System.Security.Cryptography.X509Certificates;X509ChainElementEnumerator;get_Current;();Argument[this].Property[System.Security.Cryptography.X509Certificates.X509ChainElementEnumerator.Current];ReturnValue;value;df-generated |
+| System.Security.Cryptography.X509Certificates;X509ChainElementEnumerator;get_Current;();Argument[this].Property[System.Security.Cryptography.X509Certificates.X509ChainElementEnumerator.Current];ReturnValue;value;dfc-generated |
 | System.Security.Cryptography.X509Certificates;X509ChainElementEnumerator;get_Current;();Argument[this];ReturnValue;taint;df-generated |
+| System.Security.Cryptography.X509Certificates;X509ChainElementEnumerator;get_Current;();Argument[this];ReturnValue;taint;dfc-generated |
 | System.Security.Cryptography.X509Certificates;X509ChainPolicy;Clone;();Argument[this];ReturnValue;taint;df-generated |
-| System.Security.Cryptography.X509Certificates;X509EnhancedKeyUsageExtension;CopyFrom;(System.Security.Cryptography.AsnEncodedData);Argument[0];Argument[this];taint;df-generated |
+| System.Security.Cryptography.X509Certificates;X509EnhancedKeyUsageExtension;CopyFrom;(System.Security.Cryptography.AsnEncodedData);Argument[0].SyntheticField[System.Security.Cryptography.AsnEncodedData._rawData].Element;Argument[this].SyntheticField[System.Security.Cryptography.AsnEncodedData._rawData].Element;value;dfc-generated |
+| System.Security.Cryptography.X509Certificates;X509EnhancedKeyUsageExtension;CopyFrom;(System.Security.Cryptography.AsnEncodedData);Argument[0].SyntheticField[System.Security.Cryptography.AsnEncodedData._rawData];Argument[this].SyntheticField[System.Security.Cryptography.AsnEncodedData._rawData];value;dfc-generated |
 | System.Security.Cryptography.X509Certificates;X509EnhancedKeyUsageExtension;get_EnhancedKeyUsages;();Argument[this];ReturnValue;taint;df-generated |
-| System.Security.Cryptography.X509Certificates;X509Extension;CopyFrom;(System.Security.Cryptography.AsnEncodedData);Argument[0];Argument[this];taint;df-generated |
+| System.Security.Cryptography.X509Certificates;X509Extension;CopyFrom;(System.Security.Cryptography.AsnEncodedData);Argument[0].SyntheticField[System.Security.Cryptography.AsnEncodedData._rawData].Element;Argument[this].SyntheticField[System.Security.Cryptography.AsnEncodedData._rawData].Element;value;dfc-generated |
+| System.Security.Cryptography.X509Certificates;X509Extension;CopyFrom;(System.Security.Cryptography.AsnEncodedData);Argument[0].SyntheticField[System.Security.Cryptography.AsnEncodedData._rawData];Argument[this].SyntheticField[System.Security.Cryptography.AsnEncodedData._rawData];value;dfc-generated |
 | System.Security.Cryptography.X509Certificates;X509ExtensionCollection;Add;(System.Security.Cryptography.X509Certificates.X509Extension);Argument[0];Argument[this].Element;value;manual |
 | System.Security.Cryptography.X509Certificates;X509ExtensionCollection;CopyTo;(System.Security.Cryptography.X509Certificates.X509Extension[],System.Int32);Argument[this].Element;Argument[0].Element;value;manual |
 | System.Security.Cryptography.X509Certificates;X509ExtensionCollection;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Security.Cryptography.X509Certificates.X509ExtensionEnumerator.Current];value;manual |
 | System.Security.Cryptography.X509Certificates;X509ExtensionCollection;get_Item;(System.Int32);Argument[this];ReturnValue;taint;df-generated |
 | System.Security.Cryptography.X509Certificates;X509ExtensionCollection;get_Item;(System.String);Argument[this];ReturnValue;taint;df-generated |
+| System.Security.Cryptography.X509Certificates;X509ExtensionEnumerator;get_Current;();Argument[this].Property[System.Security.Cryptography.X509Certificates.X509ExtensionEnumerator.Current];ReturnValue;value;df-generated |
+| System.Security.Cryptography.X509Certificates;X509ExtensionEnumerator;get_Current;();Argument[this].Property[System.Security.Cryptography.X509Certificates.X509ExtensionEnumerator.Current];ReturnValue;value;dfc-generated |
 | System.Security.Cryptography.X509Certificates;X509ExtensionEnumerator;get_Current;();Argument[this];ReturnValue;taint;df-generated |
-| System.Security.Cryptography.X509Certificates;X509KeyUsageExtension;CopyFrom;(System.Security.Cryptography.AsnEncodedData);Argument[0];Argument[this];taint;df-generated |
+| System.Security.Cryptography.X509Certificates;X509ExtensionEnumerator;get_Current;();Argument[this];ReturnValue;taint;dfc-generated |
+| System.Security.Cryptography.X509Certificates;X509KeyUsageExtension;CopyFrom;(System.Security.Cryptography.AsnEncodedData);Argument[0].SyntheticField[System.Security.Cryptography.AsnEncodedData._rawData].Element;Argument[this].SyntheticField[System.Security.Cryptography.AsnEncodedData._rawData].Element;value;dfc-generated |
+| System.Security.Cryptography.X509Certificates;X509KeyUsageExtension;CopyFrom;(System.Security.Cryptography.AsnEncodedData);Argument[0].SyntheticField[System.Security.Cryptography.AsnEncodedData._rawData];Argument[this].SyntheticField[System.Security.Cryptography.AsnEncodedData._rawData];value;dfc-generated |
 | System.Security.Cryptography.X509Certificates;X509SignatureGenerator;CreateForECDsa;(System.Security.Cryptography.ECDsa);Argument[0];ReturnValue;taint;df-generated |
 | System.Security.Cryptography.X509Certificates;X509SignatureGenerator;CreateForRSA;(System.Security.Cryptography.RSA,System.Security.Cryptography.RSASignaturePadding);Argument[0];ReturnValue;taint;df-generated |
 | System.Security.Cryptography.X509Certificates;X509SignatureGenerator;CreateForRSA;(System.Security.Cryptography.RSA,System.Security.Cryptography.RSASignaturePadding);Argument[1];ReturnValue;taint;df-generated |
-| System.Security.Cryptography.X509Certificates;X509SubjectAlternativeNameExtension;CopyFrom;(System.Security.Cryptography.AsnEncodedData);Argument[0];Argument[this];taint;df-generated |
-| System.Security.Cryptography.X509Certificates;X509SubjectKeyIdentifierExtension;CopyFrom;(System.Security.Cryptography.AsnEncodedData);Argument[0];Argument[this];taint;df-generated |
+| System.Security.Cryptography.X509Certificates;X509SubjectAlternativeNameExtension;CopyFrom;(System.Security.Cryptography.AsnEncodedData);Argument[0].SyntheticField[System.Security.Cryptography.AsnEncodedData._rawData].Element;Argument[this].SyntheticField[System.Security.Cryptography.AsnEncodedData._rawData].Element;value;dfc-generated |
+| System.Security.Cryptography.X509Certificates;X509SubjectAlternativeNameExtension;CopyFrom;(System.Security.Cryptography.AsnEncodedData);Argument[0].SyntheticField[System.Security.Cryptography.AsnEncodedData._rawData];Argument[this].SyntheticField[System.Security.Cryptography.AsnEncodedData._rawData];value;dfc-generated |
+| System.Security.Cryptography.X509Certificates;X509SubjectKeyIdentifierExtension;CopyFrom;(System.Security.Cryptography.AsnEncodedData);Argument[0].SyntheticField[System.Security.Cryptography.AsnEncodedData._rawData].Element;Argument[this].SyntheticField[System.Security.Cryptography.AsnEncodedData._rawData].Element;value;dfc-generated |
+| System.Security.Cryptography.X509Certificates;X509SubjectKeyIdentifierExtension;CopyFrom;(System.Security.Cryptography.AsnEncodedData);Argument[0].SyntheticField[System.Security.Cryptography.AsnEncodedData._rawData];Argument[this].SyntheticField[System.Security.Cryptography.AsnEncodedData._rawData];value;dfc-generated |
 | System.Security.Cryptography.X509Certificates;X509SubjectKeyIdentifierExtension;get_SubjectKeyIdentifier;();Argument[this];ReturnValue;taint;df-generated |
-| System.Security.Cryptography.X509Certificates;X509SubjectKeyIdentifierExtension;get_SubjectKeyIdentifierBytes;();Argument[this];ReturnValue;taint;df-generated |
 | System.Security.Cryptography.Xml;CipherData;CipherData;(System.Byte[]);Argument[0].Element;Argument[this];taint;df-generated |
 | System.Security.Cryptography.Xml;CipherData;CipherData;(System.Security.Cryptography.Xml.CipherReference);Argument[0];Argument[this];taint;df-generated |
-| System.Security.Cryptography.Xml;CipherData;GetXml;();Argument[this];ReturnValue;taint;df-generated |
-| System.Security.Cryptography.Xml;CipherData;LoadXml;(System.Xml.XmlElement);Argument[0].Element;Argument[this];taint;df-generated |
+| System.Security.Cryptography.Xml;CipherData;GetXml;();Argument[this].SyntheticField[System.Security.Cryptography.Xml.CipherData._cachedXml];ReturnValue;value;dfc-generated |
+| System.Security.Cryptography.Xml;CipherData;LoadXml;(System.Xml.XmlElement);Argument[0];Argument[this].SyntheticField[System.Security.Cryptography.Xml.CipherData._cachedXml];value;dfc-generated |
 | System.Security.Cryptography.Xml;DSAKeyValue;DSAKeyValue;(System.Security.Cryptography.DSA);Argument[0];Argument[this];taint;df-generated |
 | System.Security.Cryptography.Xml;DataObject;DataObject;(System.String,System.String,System.String,System.Xml.XmlElement);Argument[0];Argument[this];taint;df-generated |
 | System.Security.Cryptography.Xml;DataObject;DataObject;(System.String,System.String,System.String,System.Xml.XmlElement);Argument[1];Argument[this];taint;df-generated |
 | System.Security.Cryptography.Xml;DataObject;DataObject;(System.String,System.String,System.String,System.Xml.XmlElement);Argument[2];Argument[this];taint;df-generated |
 | System.Security.Cryptography.Xml;DataObject;DataObject;(System.String,System.String,System.String,System.Xml.XmlElement);Argument[3].Element;Argument[this];taint;df-generated |
-| System.Security.Cryptography.Xml;DataObject;GetXml;();Argument[this];ReturnValue;taint;df-generated |
-| System.Security.Cryptography.Xml;DataObject;LoadXml;(System.Xml.XmlElement);Argument[0].Element;Argument[this];taint;df-generated |
-| System.Security.Cryptography.Xml;EncryptedKey;AddReference;(System.Security.Cryptography.Xml.DataReference);Argument[0];Argument[this];taint;df-generated |
-| System.Security.Cryptography.Xml;EncryptedKey;AddReference;(System.Security.Cryptography.Xml.KeyReference);Argument[0];Argument[this];taint;df-generated |
+| System.Security.Cryptography.Xml;DataObject;GetXml;();Argument[this].SyntheticField[System.Security.Cryptography.Xml.DataObject._cachedXml];ReturnValue;value;dfc-generated |
+| System.Security.Cryptography.Xml;DataObject;LoadXml;(System.Xml.XmlElement);Argument[0];Argument[this].SyntheticField[System.Security.Cryptography.Xml.DataObject._cachedXml];value;dfc-generated |
+| System.Security.Cryptography.Xml;EncryptedKey;AddReference;(System.Security.Cryptography.Xml.DataReference);Argument[0];Argument[this].Property[System.Security.Cryptography.Xml.EncryptedKey.ReferenceList].Element;value;dfc-generated |
+| System.Security.Cryptography.Xml;EncryptedKey;AddReference;(System.Security.Cryptography.Xml.KeyReference);Argument[0];Argument[this].Property[System.Security.Cryptography.Xml.EncryptedKey.ReferenceList].Element;value;dfc-generated |
 | System.Security.Cryptography.Xml;EncryptedReference;EncryptedReference;(System.String,System.Security.Cryptography.Xml.TransformChain);Argument[0];Argument[this];taint;df-generated |
 | System.Security.Cryptography.Xml;EncryptedReference;EncryptedReference;(System.String,System.Security.Cryptography.Xml.TransformChain);Argument[1];Argument[this];taint;df-generated |
-| System.Security.Cryptography.Xml;EncryptedReference;GetXml;();Argument[this];ReturnValue;taint;df-generated |
-| System.Security.Cryptography.Xml;EncryptedReference;LoadXml;(System.Xml.XmlElement);Argument[0].Element;Argument[this];taint;df-generated |
+| System.Security.Cryptography.Xml;EncryptedReference;GetXml;();Argument[this].SyntheticField[System.Security.Cryptography.Xml.EncryptedReference._cachedXml];ReturnValue;value;dfc-generated |
+| System.Security.Cryptography.Xml;EncryptedReference;LoadXml;(System.Xml.XmlElement);Argument[0];Argument[this].SyntheticField[System.Security.Cryptography.Xml.EncryptedReference._cachedXml];value;dfc-generated |
 | System.Security.Cryptography.Xml;EncryptedType;GetXml;();Argument[this];ReturnValue;taint;df-generated |
 | System.Security.Cryptography.Xml;EncryptedType;LoadXml;(System.Xml.XmlElement);Argument[0].Element;Argument[this];taint;df-generated |
 | System.Security.Cryptography.Xml;EncryptedXml;EncryptedXml;(System.Xml.XmlDocument,System.Security.Policy.Evidence);Argument[0].Element;Argument[this];taint;df-generated |
@@ -11430,99 +12182,112 @@
 | System.Security.Cryptography.Xml;EncryptedXml;GetDecryptionKey;(System.Security.Cryptography.Xml.EncryptedData,System.String);Argument[this];ReturnValue;taint;df-generated |
 | System.Security.Cryptography.Xml;EncryptedXml;GetIdElement;(System.Xml.XmlDocument,System.String);Argument[0].Element;ReturnValue;taint;df-generated |
 | System.Security.Cryptography.Xml;EncryptionMethod;EncryptionMethod;(System.String);Argument[0];Argument[this];taint;df-generated |
-| System.Security.Cryptography.Xml;EncryptionMethod;GetXml;();Argument[this];ReturnValue;taint;df-generated |
-| System.Security.Cryptography.Xml;EncryptionMethod;LoadXml;(System.Xml.XmlElement);Argument[0].Element;Argument[this];taint;df-generated |
+| System.Security.Cryptography.Xml;EncryptionMethod;GetXml;();Argument[this].SyntheticField[System.Security.Cryptography.Xml.EncryptionMethod._cachedXml];ReturnValue;value;dfc-generated |
+| System.Security.Cryptography.Xml;EncryptionMethod;LoadXml;(System.Xml.XmlElement);Argument[0];Argument[this].SyntheticField[System.Security.Cryptography.Xml.EncryptionMethod._cachedXml];value;dfc-generated |
 | System.Security.Cryptography.Xml;EncryptionProperty;EncryptionProperty;(System.Xml.XmlElement);Argument[0].Element;Argument[this];taint;df-generated |
-| System.Security.Cryptography.Xml;EncryptionProperty;GetXml;();Argument[this];ReturnValue;taint;df-generated |
-| System.Security.Cryptography.Xml;EncryptionProperty;LoadXml;(System.Xml.XmlElement);Argument[0].Element;Argument[this];taint;df-generated |
+| System.Security.Cryptography.Xml;EncryptionProperty;GetXml;();Argument[this].SyntheticField[System.Security.Cryptography.Xml.EncryptionProperty._cachedXml];ReturnValue;value;dfc-generated |
+| System.Security.Cryptography.Xml;EncryptionProperty;LoadXml;(System.Xml.XmlElement);Argument[0];Argument[this].SyntheticField[System.Security.Cryptography.Xml.EncryptionProperty._cachedXml];value;dfc-generated |
 | System.Security.Cryptography.Xml;EncryptionProperty;get_Id;();Argument[this];ReturnValue;taint;df-generated |
 | System.Security.Cryptography.Xml;EncryptionProperty;get_Target;();Argument[this];ReturnValue;taint;df-generated |
-| System.Security.Cryptography.Xml;EncryptionPropertyCollection;Add;(System.Security.Cryptography.Xml.EncryptionProperty);Argument[0];Argument[this];taint;df-generated |
-| System.Security.Cryptography.Xml;EncryptionPropertyCollection;CopyTo;(System.Security.Cryptography.Xml.EncryptionProperty[],System.Int32);Argument[this];Argument[0].Element;taint;df-generated |
-| System.Security.Cryptography.Xml;EncryptionPropertyCollection;Insert;(System.Int32,System.Security.Cryptography.Xml.EncryptionProperty);Argument[1];Argument[this];taint;df-generated |
-| System.Security.Cryptography.Xml;EncryptionPropertyCollection;Item;(System.Int32);Argument[this];ReturnValue;taint;df-generated |
-| System.Security.Cryptography.Xml;EncryptionPropertyCollection;get_ItemOf;(System.Int32);Argument[this];ReturnValue;taint;df-generated |
-| System.Security.Cryptography.Xml;EncryptionPropertyCollection;set_ItemOf;(System.Int32,System.Security.Cryptography.Xml.EncryptionProperty);Argument[1];Argument[this];taint;df-generated |
-| System.Security.Cryptography.Xml;KeyInfo;AddClause;(System.Security.Cryptography.Xml.KeyInfoClause);Argument[0];Argument[this];taint;df-generated |
-| System.Security.Cryptography.Xml;KeyInfo;GetEnumerator;(System.Type);Argument[this];ReturnValue;taint;df-generated |
-| System.Security.Cryptography.Xml;KeyInfo;LoadXml;(System.Xml.XmlElement);Argument[0].Element;Argument[this];taint;df-generated |
-| System.Security.Cryptography.Xml;KeyInfoClause;GetXml;();Argument[this];ReturnValue;taint;df-generated |
+| System.Security.Cryptography.Xml;EncryptionPropertyCollection;Add;(System.Security.Cryptography.Xml.EncryptionProperty);Argument[0];Argument[this].SyntheticField[System.Security.Cryptography.Xml.EncryptionPropertyCollection._props].Element;value;dfc-generated |
+| System.Security.Cryptography.Xml;EncryptionPropertyCollection;CopyTo;(System.Security.Cryptography.Xml.EncryptionProperty[],System.Int32);Argument[this].SyntheticField[System.Security.Cryptography.Xml.EncryptionPropertyCollection._props].Element;Argument[0].Element;value;dfc-generated |
+| System.Security.Cryptography.Xml;EncryptionPropertyCollection;Insert;(System.Int32,System.Security.Cryptography.Xml.EncryptionProperty);Argument[1];Argument[this].SyntheticField[System.Security.Cryptography.Xml.EncryptionPropertyCollection._props].Element;value;dfc-generated |
+| System.Security.Cryptography.Xml;EncryptionPropertyCollection;Item;(System.Int32);Argument[this].SyntheticField[System.Security.Cryptography.Xml.EncryptionPropertyCollection._props].Element;ReturnValue;value;dfc-generated |
+| System.Security.Cryptography.Xml;EncryptionPropertyCollection;get_ItemOf;(System.Int32);Argument[this].Element;ReturnValue;value;dfc-generated |
+| System.Security.Cryptography.Xml;EncryptionPropertyCollection;get_ItemOf;(System.Int32);Argument[this].SyntheticField[System.Security.Cryptography.Xml.EncryptionPropertyCollection._props].Element;ReturnValue;value;dfc-generated |
+| System.Security.Cryptography.Xml;EncryptionPropertyCollection;get_SyncRoot;();Argument[this].SyntheticField[System.Security.Cryptography.Xml.EncryptionPropertyCollection._props].Property[System.Collections.ArrayList.SyncRoot];ReturnValue;value;dfc-generated |
+| System.Security.Cryptography.Xml;EncryptionPropertyCollection;set_ItemOf;(System.Int32,System.Security.Cryptography.Xml.EncryptionProperty);Argument[1];Argument[this].Element;value;dfc-generated |
+| System.Security.Cryptography.Xml;EncryptionPropertyCollection;set_ItemOf;(System.Int32,System.Security.Cryptography.Xml.EncryptionProperty);Argument[1];Argument[this].SyntheticField[System.Security.Cryptography.Xml.EncryptionPropertyCollection._props].Element;value;dfc-generated |
+| System.Security.Cryptography.Xml;KeyInfo;AddClause;(System.Security.Cryptography.Xml.KeyInfoClause);Argument[0];Argument[this].SyntheticField[System.Security.Cryptography.Xml.KeyInfo._keyInfoClauses].Element;value;dfc-generated |
+| System.Security.Cryptography.Xml;KeyInfo;GetEnumerator;(System.Type);Argument[this].SyntheticField[System.Security.Cryptography.Xml.KeyInfo._keyInfoClauses].Element;ReturnValue.Property[System.Collections.IEnumerator.Current];value;dfc-generated |
 | System.Security.Cryptography.Xml;KeyInfoClause;LoadXml;(System.Xml.XmlElement);Argument[0].Element;Argument[this];taint;df-generated |
+| System.Security.Cryptography.Xml;KeyInfoEncryptedKey;GetXml;();Argument[this].SyntheticField[System.Security.Cryptography.Xml.KeyInfoEncryptedKey._encryptedKey].SyntheticField[System.Security.Cryptography.Xml.EncryptedType._cachedXml];ReturnValue;value;dfc-generated |
 | System.Security.Cryptography.Xml;KeyInfoEncryptedKey;KeyInfoEncryptedKey;(System.Security.Cryptography.Xml.EncryptedKey);Argument[0];Argument[this];taint;df-generated |
+| System.Security.Cryptography.Xml;KeyInfoEncryptedKey;LoadXml;(System.Xml.XmlElement);Argument[0];Argument[this].SyntheticField[System.Security.Cryptography.Xml.KeyInfoEncryptedKey._encryptedKey].SyntheticField[System.Security.Cryptography.Xml.EncryptedType._cachedXml];value;df-generated |
+| System.Security.Cryptography.Xml;KeyInfoEncryptedKey;LoadXml;(System.Xml.XmlElement);Argument[0];Argument[this].SyntheticField[System.Security.Cryptography.Xml.KeyInfoEncryptedKey._encryptedKey].SyntheticField[System.Security.Cryptography.Xml.EncryptedType._cachedXml];value;dfc-generated |
 | System.Security.Cryptography.Xml;KeyInfoName;KeyInfoName;(System.String);Argument[0];Argument[this];taint;df-generated |
 | System.Security.Cryptography.Xml;KeyInfoNode;KeyInfoNode;(System.Xml.XmlElement);Argument[0].Element;Argument[this];taint;df-generated |
 | System.Security.Cryptography.Xml;KeyInfoRetrievalMethod;KeyInfoRetrievalMethod;(System.String);Argument[0];Argument[this];taint;df-generated |
 | System.Security.Cryptography.Xml;KeyInfoRetrievalMethod;KeyInfoRetrievalMethod;(System.String,System.String);Argument[0];Argument[this];taint;df-generated |
 | System.Security.Cryptography.Xml;KeyInfoRetrievalMethod;KeyInfoRetrievalMethod;(System.String,System.String);Argument[1];Argument[this];taint;df-generated |
-| System.Security.Cryptography.Xml;KeyInfoX509Data;AddSubjectKeyId;(System.Byte[]);Argument[0].Element;Argument[this];taint;df-generated |
-| System.Security.Cryptography.Xml;KeyInfoX509Data;AddSubjectName;(System.String);Argument[0];Argument[this];taint;df-generated |
+| System.Security.Cryptography.Xml;KeyInfoX509Data;AddSubjectKeyId;(System.Byte[]);Argument[0];Argument[this].SyntheticField[System.Security.Cryptography.Xml.KeyInfoX509Data._subjectKeyIds].Element;value;dfc-generated |
+| System.Security.Cryptography.Xml;KeyInfoX509Data;AddSubjectName;(System.String);Argument[0];Argument[this].SyntheticField[System.Security.Cryptography.Xml.KeyInfoX509Data._subjectNames].Element;value;dfc-generated |
 | System.Security.Cryptography.Xml;KeyInfoX509Data;get_Certificates;();Argument[this];ReturnValue;taint;df-generated |
 | System.Security.Cryptography.Xml;KeyInfoX509Data;get_IssuerSerials;();Argument[this];ReturnValue;taint;df-generated |
-| System.Security.Cryptography.Xml;KeyInfoX509Data;get_SubjectKeyIds;();Argument[this];ReturnValue;taint;df-generated |
-| System.Security.Cryptography.Xml;KeyInfoX509Data;get_SubjectNames;();Argument[this];ReturnValue;taint;df-generated |
+| System.Security.Cryptography.Xml;KeyInfoX509Data;get_SubjectKeyIds;();Argument[this].SyntheticField[System.Security.Cryptography.Xml.KeyInfoX509Data._subjectKeyIds];ReturnValue;value;dfc-generated |
+| System.Security.Cryptography.Xml;KeyInfoX509Data;get_SubjectNames;();Argument[this].SyntheticField[System.Security.Cryptography.Xml.KeyInfoX509Data._subjectNames];ReturnValue;value;dfc-generated |
 | System.Security.Cryptography.Xml;RSAKeyValue;RSAKeyValue;(System.Security.Cryptography.RSA);Argument[0];Argument[this];taint;df-generated |
 | System.Security.Cryptography.Xml;Reference;AddTransform;(System.Security.Cryptography.Xml.Transform);Argument[this];Argument[0];taint;df-generated |
-| System.Security.Cryptography.Xml;Reference;GetXml;();Argument[this];ReturnValue;taint;df-generated |
-| System.Security.Cryptography.Xml;Reference;LoadXml;(System.Xml.XmlElement);Argument[0].Element;Argument[this];taint;df-generated |
+| System.Security.Cryptography.Xml;Reference;GetXml;();Argument[this].SyntheticField[System.Security.Cryptography.Xml.Reference._cachedXml];ReturnValue;value;dfc-generated |
+| System.Security.Cryptography.Xml;Reference;LoadXml;(System.Xml.XmlElement);Argument[0];Argument[this].SyntheticField[System.Security.Cryptography.Xml.Reference._cachedXml];value;dfc-generated |
 | System.Security.Cryptography.Xml;Reference;Reference;(System.IO.Stream);Argument[0];Argument[this];taint;df-generated |
 | System.Security.Cryptography.Xml;Reference;Reference;(System.String);Argument[0];Argument[this];taint;df-generated |
-| System.Security.Cryptography.Xml;ReferenceList;Item;(System.Int32);Argument[this];ReturnValue;taint;df-generated |
-| System.Security.Cryptography.Xml;ReferenceList;set_ItemOf;(System.Int32,System.Security.Cryptography.Xml.EncryptedReference);Argument[1];Argument[this];taint;df-generated |
+| System.Security.Cryptography.Xml;ReferenceList;Item;(System.Int32);Argument[this].SyntheticField[System.Security.Cryptography.Xml.ReferenceList._references].Element;ReturnValue;value;dfc-generated |
+| System.Security.Cryptography.Xml;ReferenceList;get_SyncRoot;();Argument[this].SyntheticField[System.Security.Cryptography.Xml.ReferenceList._references].Property[System.Collections.ArrayList.SyncRoot];ReturnValue;value;dfc-generated |
+| System.Security.Cryptography.Xml;ReferenceList;set_ItemOf;(System.Int32,System.Security.Cryptography.Xml.EncryptedReference);Argument[1];Argument[this].Element;value;dfc-generated |
+| System.Security.Cryptography.Xml;ReferenceList;set_ItemOf;(System.Int32,System.Security.Cryptography.Xml.EncryptedReference);Argument[1];Argument[this].SyntheticField[System.Security.Cryptography.Xml.ReferenceList._references].Element;value;dfc-generated |
 | System.Security.Cryptography.Xml;Signature;AddObject;(System.Security.Cryptography.Xml.DataObject);Argument[0];Argument[this];taint;df-generated |
 | System.Security.Cryptography.Xml;Signature;LoadXml;(System.Xml.XmlElement);Argument[0].Element;Argument[this];taint;df-generated |
-| System.Security.Cryptography.Xml;SignedInfo;AddReference;(System.Security.Cryptography.Xml.Reference);Argument[0];Argument[this];taint;df-generated |
-| System.Security.Cryptography.Xml;SignedInfo;AddReference;(System.Security.Cryptography.Xml.Reference);Argument[this];Argument[0];taint;df-generated |
-| System.Security.Cryptography.Xml;SignedInfo;GetXml;();Argument[this];ReturnValue;taint;df-generated |
-| System.Security.Cryptography.Xml;SignedInfo;LoadXml;(System.Xml.XmlElement);Argument[0].Element;Argument[this];taint;df-generated |
+| System.Security.Cryptography.Xml;SignedInfo;AddReference;(System.Security.Cryptography.Xml.Reference);Argument[0];Argument[this].SyntheticField[System.Security.Cryptography.Xml.SignedInfo._references].Element;value;dfc-generated |
+| System.Security.Cryptography.Xml;SignedInfo;GetXml;();Argument[this].SyntheticField[System.Security.Cryptography.Xml.SignedInfo._cachedXml];ReturnValue;value;dfc-generated |
+| System.Security.Cryptography.Xml;SignedInfo;LoadXml;(System.Xml.XmlElement);Argument[0];Argument[this].SyntheticField[System.Security.Cryptography.Xml.SignedInfo._cachedXml];value;dfc-generated |
 | System.Security.Cryptography.Xml;SignedInfo;get_CanonicalizationMethodObject;();Argument[this];ReturnValue;taint;df-generated |
-| System.Security.Cryptography.Xml;SignedInfo;get_References;();Argument[this];ReturnValue;taint;df-generated |
+| System.Security.Cryptography.Xml;SignedInfo;get_References;();Argument[this].SyntheticField[System.Security.Cryptography.Xml.SignedInfo._references];ReturnValue;value;dfc-generated |
 | System.Security.Cryptography.Xml;SignedXml;CheckSignature;(System.Security.Cryptography.KeyedHashAlgorithm);Argument[0];Argument[this];taint;df-generated |
 | System.Security.Cryptography.Xml;SignedXml;CheckSignatureReturningKey;(System.Security.Cryptography.AsymmetricAlgorithm);Argument[this];ReturnValue;taint;df-generated |
 | System.Security.Cryptography.Xml;SignedXml;ComputeSignature;(System.Security.Cryptography.KeyedHashAlgorithm);Argument[0];Argument[this];taint;df-generated |
 | System.Security.Cryptography.Xml;SignedXml;GetIdElement;(System.Xml.XmlDocument,System.String);Argument[0].Element;ReturnValue;taint;df-generated |
 | System.Security.Cryptography.Xml;SignedXml;GetPublicKey;();Argument[this];ReturnValue;taint;df-generated |
-| System.Security.Cryptography.Xml;SignedXml;GetXml;();Argument[this];ReturnValue;taint;df-generated |
 | System.Security.Cryptography.Xml;SignedXml;LoadXml;(System.Xml.XmlElement);Argument[0].Element;Argument[this];taint;df-generated |
 | System.Security.Cryptography.Xml;SignedXml;SignedXml;(System.Xml.XmlDocument);Argument[0].Element;Argument[this];taint;df-generated |
 | System.Security.Cryptography.Xml;SignedXml;SignedXml;(System.Xml.XmlElement);Argument[0].Element;Argument[this];taint;df-generated |
 | System.Security.Cryptography.Xml;SignedXml;get_SafeCanonicalizationMethods;();Argument[this];ReturnValue;taint;df-generated |
-| System.Security.Cryptography.Xml;SignedXml;get_Signature;();Argument[this];ReturnValue;taint;df-generated |
-| System.Security.Cryptography.Xml;SignedXml;get_SignatureValue;();Argument[this];ReturnValue;taint;df-generated |
-| System.Security.Cryptography.Xml;SignedXml;get_SignedInfo;();Argument[this];ReturnValue;taint;df-generated |
+| System.Security.Cryptography.Xml;SignedXml;get_Signature;();Argument[this].Field[System.Security.Cryptography.Xml.SignedXml.m_signature];ReturnValue;value;dfc-generated |
+| System.Security.Cryptography.Xml;SignedXml;get_SignatureValue;();Argument[this].Field[System.Security.Cryptography.Xml.SignedXml.m_signature].Property[System.Security.Cryptography.Xml.Signature.SignatureValue];ReturnValue;value;dfc-generated |
+| System.Security.Cryptography.Xml;SignedXml;get_SignedInfo;();Argument[this].Field[System.Security.Cryptography.Xml.SignedXml.m_signature].Property[System.Security.Cryptography.Xml.Signature.SignedInfo];ReturnValue;value;dfc-generated |
 | System.Security.Cryptography.Xml;SignedXml;set_Resolver;(System.Xml.XmlResolver);Argument[0];Argument[this];taint;df-generated |
 | System.Security.Cryptography.Xml;SignedXml;set_SignatureFormatValidator;(System.Func<System.Security.Cryptography.Xml.SignedXml,System.Boolean>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
-| System.Security.Cryptography.Xml;Transform;GetDigestedOutput;(System.Security.Cryptography.HashAlgorithm);Argument[0];ReturnValue;taint;df-generated |
-| System.Security.Cryptography.Xml;Transform;GetInnerXml;();Argument[this];ReturnValue;taint;df-generated |
 | System.Security.Cryptography.Xml;Transform;GetOutput;();Argument[this];ReturnValue;taint;df-generated |
 | System.Security.Cryptography.Xml;Transform;GetOutput;(System.Type);Argument[this];ReturnValue;taint;df-generated |
-| System.Security.Cryptography.Xml;Transform;GetXml;();Argument[this];ReturnValue;taint;df-generated |
 | System.Security.Cryptography.Xml;Transform;LoadInnerXml;(System.Xml.XmlNodeList);Argument[0].Element;Argument[this];taint;df-generated |
 | System.Security.Cryptography.Xml;Transform;LoadInput;(System.Object);Argument[0];Argument[this];taint;df-generated |
 | System.Security.Cryptography.Xml;Transform;get_InputTypes;();Argument[this];ReturnValue;taint;df-generated |
 | System.Security.Cryptography.Xml;Transform;get_OutputTypes;();Argument[this];ReturnValue;taint;df-generated |
 | System.Security.Cryptography.Xml;Transform;get_PropagatedNamespaces;();Argument[this];ReturnValue;taint;df-generated |
-| System.Security.Cryptography.Xml;TransformChain;Add;(System.Security.Cryptography.Xml.Transform);Argument[0];Argument[this];taint;df-generated |
-| System.Security.Cryptography.Xml;TransformChain;GetEnumerator;();Argument[this];ReturnValue;taint;df-generated |
-| System.Security.Cryptography.Xml;TransformChain;get_Item;(System.Int32);Argument[this];ReturnValue;taint;df-generated |
+| System.Security.Cryptography.Xml;TransformChain;Add;(System.Security.Cryptography.Xml.Transform);Argument[0];Argument[this].SyntheticField[System.Security.Cryptography.Xml.TransformChain._transforms].Element;value;dfc-generated |
+| System.Security.Cryptography.Xml;TransformChain;GetEnumerator;();Argument[this].SyntheticField[System.Security.Cryptography.Xml.TransformChain._transforms].Element;ReturnValue.Property[System.Collections.IEnumerator.Current];value;dfc-generated |
+| System.Security.Cryptography.Xml;TransformChain;get_Item;(System.Int32);Argument[this].SyntheticField[System.Security.Cryptography.Xml.TransformChain._transforms].Element;ReturnValue;value;dfc-generated |
 | System.Security.Cryptography.Xml;XmlDecryptionTransform;AddExceptUri;(System.String);Argument[0];Argument[this];taint;df-generated |
+| System.Security.Cryptography.Xml;XmlDecryptionTransform;GetOutput;();Argument[this].SyntheticField[System.Security.Cryptography.Xml.XmlDecryptionTransform._containingDocument];ReturnValue;value;df-generated |
+| System.Security.Cryptography.Xml;XmlDecryptionTransform;GetOutput;();Argument[this].SyntheticField[System.Security.Cryptography.Xml.XmlDecryptionTransform._containingDocument];ReturnValue;value;dfc-generated |
+| System.Security.Cryptography.Xml;XmlDecryptionTransform;GetOutput;(System.Type);Argument[this].SyntheticField[System.Security.Cryptography.Xml.XmlDecryptionTransform._containingDocument];ReturnValue;value;df-generated |
+| System.Security.Cryptography.Xml;XmlDecryptionTransform;GetOutput;(System.Type);Argument[this].SyntheticField[System.Security.Cryptography.Xml.XmlDecryptionTransform._containingDocument];ReturnValue;value;dfc-generated |
+| System.Security.Cryptography.Xml;XmlDecryptionTransform;LoadInput;(System.Object);Argument[0];Argument[this].SyntheticField[System.Security.Cryptography.Xml.XmlDecryptionTransform._containingDocument];value;df-generated |
+| System.Security.Cryptography.Xml;XmlDecryptionTransform;LoadInput;(System.Object);Argument[0];Argument[this].SyntheticField[System.Security.Cryptography.Xml.XmlDecryptionTransform._containingDocument];value;dfc-generated |
+| System.Security.Cryptography.Xml;XmlDsigC14NTransform;GetDigestedOutput;(System.Security.Cryptography.HashAlgorithm);Argument[0].Property[System.Security.Cryptography.HashAlgorithm.Hash].Element;ReturnValue.Element;value;dfc-generated |
+| System.Security.Cryptography.Xml;XmlDsigExcC14NTransform;GetDigestedOutput;(System.Security.Cryptography.HashAlgorithm);Argument[0].Property[System.Security.Cryptography.HashAlgorithm.Hash].Element;ReturnValue.Element;value;dfc-generated |
 | System.Security.Cryptography.Xml;XmlDsigExcC14NTransform;XmlDsigExcC14NTransform;(System.Boolean,System.String);Argument[1];Argument[this];taint;df-generated |
-| System.Security.Cryptography;AsnEncodedData;AsnEncodedData;(System.Byte[]);Argument[0].Element;Argument[this];taint;df-generated |
-| System.Security.Cryptography;AsnEncodedData;AsnEncodedData;(System.ReadOnlySpan<System.Byte>);Argument[0];Argument[this];taint;df-generated |
-| System.Security.Cryptography;AsnEncodedData;AsnEncodedData;(System.Security.Cryptography.AsnEncodedData);Argument[0];Argument[this];taint;df-generated |
-| System.Security.Cryptography;AsnEncodedData;AsnEncodedData;(System.Security.Cryptography.Oid,System.ReadOnlySpan<System.Byte>);Argument[0];Argument[this];taint;df-generated |
-| System.Security.Cryptography;AsnEncodedData;AsnEncodedData;(System.Security.Cryptography.Oid,System.ReadOnlySpan<System.Byte>);Argument[1];Argument[this];taint;df-generated |
-| System.Security.Cryptography;AsnEncodedData;AsnEncodedData;(System.String,System.ReadOnlySpan<System.Byte>);Argument[0];Argument[this];taint;df-generated |
-| System.Security.Cryptography;AsnEncodedData;AsnEncodedData;(System.String,System.ReadOnlySpan<System.Byte>);Argument[1];Argument[this];taint;df-generated |
-| System.Security.Cryptography;AsnEncodedData;CopyFrom;(System.Security.Cryptography.AsnEncodedData);Argument[0];Argument[this];taint;df-generated |
-| System.Security.Cryptography;AsnEncodedData;Format;(System.Boolean);Argument[this];ReturnValue;taint;df-generated |
+| System.Security.Cryptography.Xml;XmlDsigXsltTransform;GetInnerXml;();Argument[this].SyntheticField[System.Security.Cryptography.Xml.XmlDsigXsltTransform._xslNodes];ReturnValue;value;dfc-generated |
+| System.Security.Cryptography.Xml;XmlDsigXsltTransform;LoadInnerXml;(System.Xml.XmlNodeList);Argument[0];Argument[this].SyntheticField[System.Security.Cryptography.Xml.XmlDsigXsltTransform._xslNodes];value;df-generated |
+| System.Security.Cryptography.Xml;XmlDsigXsltTransform;LoadInnerXml;(System.Xml.XmlNodeList);Argument[0];Argument[this].SyntheticField[System.Security.Cryptography.Xml.XmlDsigXsltTransform._xslNodes];value;dfc-generated |
+| System.Security.Cryptography;AsnEncodedData;AsnEncodedData;(System.Byte[]);Argument[0].Element;Argument[this].SyntheticField[System.Security.Cryptography.AsnEncodedData._rawData].Element;value;dfc-generated |
+| System.Security.Cryptography;AsnEncodedData;AsnEncodedData;(System.Byte[]);Argument[0];Argument[this].SyntheticField[System.Security.Cryptography.AsnEncodedData._rawData];value;dfc-generated |
+| System.Security.Cryptography;AsnEncodedData;AsnEncodedData;(System.ReadOnlySpan<System.Byte>);Argument[0].Element;Argument[this].SyntheticField[System.Security.Cryptography.AsnEncodedData._rawData].Element;value;dfc-generated |
+| System.Security.Cryptography;AsnEncodedData;AsnEncodedData;(System.Security.Cryptography.AsnEncodedData);Argument[0].SyntheticField[System.Security.Cryptography.AsnEncodedData._rawData].Element;Argument[this].SyntheticField[System.Security.Cryptography.AsnEncodedData._rawData].Element;value;dfc-generated |
+| System.Security.Cryptography;AsnEncodedData;AsnEncodedData;(System.Security.Cryptography.AsnEncodedData);Argument[0].SyntheticField[System.Security.Cryptography.AsnEncodedData._rawData];Argument[this].SyntheticField[System.Security.Cryptography.AsnEncodedData._rawData];value;dfc-generated |
+| System.Security.Cryptography;AsnEncodedData;AsnEncodedData;(System.Security.Cryptography.Oid,System.ReadOnlySpan<System.Byte>);Argument[1].Element;Argument[this].SyntheticField[System.Security.Cryptography.AsnEncodedData._rawData].Element;value;dfc-generated |
+| System.Security.Cryptography;AsnEncodedData;AsnEncodedData;(System.String,System.ReadOnlySpan<System.Byte>);Argument[1].Element;Argument[this].SyntheticField[System.Security.Cryptography.AsnEncodedData._rawData].Element;value;dfc-generated |
+| System.Security.Cryptography;AsnEncodedData;CopyFrom;(System.Security.Cryptography.AsnEncodedData);Argument[0].SyntheticField[System.Security.Cryptography.AsnEncodedData._rawData].Element;Argument[this].SyntheticField[System.Security.Cryptography.AsnEncodedData._rawData].Element;value;dfc-generated |
+| System.Security.Cryptography;AsnEncodedData;CopyFrom;(System.Security.Cryptography.AsnEncodedData);Argument[0].SyntheticField[System.Security.Cryptography.AsnEncodedData._rawData];Argument[this].SyntheticField[System.Security.Cryptography.AsnEncodedData._rawData];value;dfc-generated |
+| System.Security.Cryptography;AsnEncodedData;Format;(System.Boolean);Argument[this].SyntheticField[System.Security.Cryptography.AsnEncodedData._rawData].Element;ReturnValue;taint;dfc-generated |
 | System.Security.Cryptography;AsnEncodedDataCollection;Add;(System.Security.Cryptography.AsnEncodedData);Argument[0];Argument[this].Element;value;manual |
-| System.Security.Cryptography;AsnEncodedDataCollection;AsnEncodedDataCollection;(System.Security.Cryptography.AsnEncodedData);Argument[0];Argument[this];taint;df-generated |
+| System.Security.Cryptography;AsnEncodedDataCollection;AsnEncodedDataCollection;(System.Security.Cryptography.AsnEncodedData);Argument[0];Argument[this].SyntheticField[System.Security.Cryptography.AsnEncodedDataCollection._list].Element;value;dfc-generated |
 | System.Security.Cryptography;AsnEncodedDataCollection;CopyTo;(System.Security.Cryptography.AsnEncodedData[],System.Int32);Argument[this].Element;Argument[0].Element;value;manual |
 | System.Security.Cryptography;AsnEncodedDataCollection;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Security.Cryptography.AsnEncodedDataEnumerator.Current];value;manual |
-| System.Security.Cryptography;AsnEncodedDataCollection;get_Item;(System.Int32);Argument[this];ReturnValue;taint;df-generated |
+| System.Security.Cryptography;AsnEncodedDataCollection;get_Item;(System.Int32);Argument[this].SyntheticField[System.Security.Cryptography.AsnEncodedDataCollection._list].Element;ReturnValue;value;dfc-generated |
 | System.Security.Cryptography;AsnEncodedDataEnumerator;get_Current;();Argument[this];ReturnValue;taint;df-generated |
 | System.Security.Cryptography;AsymmetricAlgorithm;get_KeyExchangeAlgorithm;();Argument[this];ReturnValue;taint;df-generated |
-| System.Security.Cryptography;AsymmetricAlgorithm;get_LegalKeySizes;();Argument[this];ReturnValue;taint;df-generated |
+| System.Security.Cryptography;AsymmetricAlgorithm;get_LegalKeySizes;();Argument[this].Field[System.Security.Cryptography.AsymmetricAlgorithm.LegalKeySizesValue].Element;ReturnValue.Element;value;dfc-generated |
 | System.Security.Cryptography;AsymmetricAlgorithm;get_SignatureAlgorithm;();Argument[this];ReturnValue;taint;df-generated |
 | System.Security.Cryptography;AsymmetricKeyExchangeDeformatter;SetKey;(System.Security.Cryptography.AsymmetricAlgorithm);Argument[0];Argument[this];taint;df-generated |
 | System.Security.Cryptography;AsymmetricKeyExchangeFormatter;SetKey;(System.Security.Cryptography.AsymmetricAlgorithm);Argument[0];Argument[this];taint;df-generated |
@@ -11530,47 +12295,73 @@
 | System.Security.Cryptography;AsymmetricSignatureDeformatter;SetKey;(System.Security.Cryptography.AsymmetricAlgorithm);Argument[0];Argument[this];taint;df-generated |
 | System.Security.Cryptography;AsymmetricSignatureFormatter;SetHashAlgorithm;(System.String);Argument[0];Argument[this];taint;df-generated |
 | System.Security.Cryptography;AsymmetricSignatureFormatter;SetKey;(System.Security.Cryptography.AsymmetricAlgorithm);Argument[0];Argument[this];taint;df-generated |
-| System.Security.Cryptography;CngAlgorithm;CngAlgorithm;(System.String);Argument[0];Argument[this];taint;df-generated |
-| System.Security.Cryptography;CngAlgorithm;ToString;();Argument[this];ReturnValue;taint;df-generated |
-| System.Security.Cryptography;CngAlgorithm;get_Algorithm;();Argument[this];ReturnValue;taint;df-generated |
-| System.Security.Cryptography;CngAlgorithmGroup;CngAlgorithmGroup;(System.String);Argument[0];Argument[this];taint;df-generated |
-| System.Security.Cryptography;CngAlgorithmGroup;ToString;();Argument[this];ReturnValue;taint;df-generated |
-| System.Security.Cryptography;CngAlgorithmGroup;get_AlgorithmGroup;();Argument[this];ReturnValue;taint;df-generated |
-| System.Security.Cryptography;CngKeyBlobFormat;CngKeyBlobFormat;(System.String);Argument[0];Argument[this];taint;df-generated |
-| System.Security.Cryptography;CngKeyBlobFormat;ToString;();Argument[this];ReturnValue;taint;df-generated |
-| System.Security.Cryptography;CngKeyBlobFormat;get_Format;();Argument[this];ReturnValue;taint;df-generated |
-| System.Security.Cryptography;CngProperty;CngProperty;(System.String,System.Byte[],System.Security.Cryptography.CngPropertyOptions);Argument[1].Element;Argument[this];taint;df-generated |
-| System.Security.Cryptography;CngProperty;GetValue;();Argument[this];ReturnValue;taint;df-generated |
-| System.Security.Cryptography;CngProvider;CngProvider;(System.String);Argument[0];Argument[this];taint;df-generated |
-| System.Security.Cryptography;CngProvider;ToString;();Argument[this];ReturnValue;taint;df-generated |
-| System.Security.Cryptography;CngProvider;get_Provider;();Argument[this];ReturnValue;taint;df-generated |
+| System.Security.Cryptography;CngAlgorithm;CngAlgorithm;(System.String);Argument[0];Argument[this].SyntheticField[System.Security.Cryptography.CngAlgorithm._algorithm];value;dfc-generated |
+| System.Security.Cryptography;CngAlgorithm;ToString;();Argument[this].SyntheticField[System.Security.Cryptography.CngAlgorithm._algorithm];ReturnValue;value;dfc-generated |
+| System.Security.Cryptography;CngAlgorithm;get_Algorithm;();Argument[this].SyntheticField[System.Security.Cryptography.CngAlgorithm._algorithm];ReturnValue;value;dfc-generated |
+| System.Security.Cryptography;CngAlgorithmGroup;CngAlgorithmGroup;(System.String);Argument[0];Argument[this].SyntheticField[System.Security.Cryptography.CngAlgorithmGroup._algorithmGroup];value;dfc-generated |
+| System.Security.Cryptography;CngAlgorithmGroup;ToString;();Argument[this].SyntheticField[System.Security.Cryptography.CngAlgorithmGroup._algorithmGroup];ReturnValue;value;dfc-generated |
+| System.Security.Cryptography;CngAlgorithmGroup;get_AlgorithmGroup;();Argument[this].SyntheticField[System.Security.Cryptography.CngAlgorithmGroup._algorithmGroup];ReturnValue;value;dfc-generated |
+| System.Security.Cryptography;CngKeyBlobFormat;CngKeyBlobFormat;(System.String);Argument[0];Argument[this].SyntheticField[System.Security.Cryptography.CngKeyBlobFormat._format];value;dfc-generated |
+| System.Security.Cryptography;CngKeyBlobFormat;ToString;();Argument[this].SyntheticField[System.Security.Cryptography.CngKeyBlobFormat._format];ReturnValue;value;dfc-generated |
+| System.Security.Cryptography;CngKeyBlobFormat;get_Format;();Argument[this].SyntheticField[System.Security.Cryptography.CngKeyBlobFormat._format];ReturnValue;value;dfc-generated |
+| System.Security.Cryptography;CngProperty;CngProperty;(System.String,System.Byte[],System.Security.Cryptography.CngPropertyOptions);Argument[1].Element;Argument[this].SyntheticField[System.Security.Cryptography.CngProperty._value].Element;value;dfc-generated |
+| System.Security.Cryptography;CngProperty;CngProperty;(System.String,System.Byte[],System.Security.Cryptography.CngPropertyOptions);Argument[1];Argument[this].SyntheticField[System.Security.Cryptography.CngProperty._value];value;dfc-generated |
+| System.Security.Cryptography;CngProperty;GetValue;();Argument[this].SyntheticField[System.Security.Cryptography.CngProperty._value].Element;ReturnValue.Element;value;dfc-generated |
+| System.Security.Cryptography;CngProperty;GetValue;();Argument[this].SyntheticField[System.Security.Cryptography.CngProperty._value];ReturnValue;value;dfc-generated |
+| System.Security.Cryptography;CngProvider;CngProvider;(System.String);Argument[0];Argument[this].SyntheticField[System.Security.Cryptography.CngProvider._provider];value;dfc-generated |
+| System.Security.Cryptography;CngProvider;ToString;();Argument[this].SyntheticField[System.Security.Cryptography.CngProvider._provider];ReturnValue;value;dfc-generated |
+| System.Security.Cryptography;CngProvider;get_Provider;();Argument[this].SyntheticField[System.Security.Cryptography.CngProvider._provider];ReturnValue;value;dfc-generated |
 | System.Security.Cryptography;CryptoStream;CryptoStream;(System.IO.Stream,System.Security.Cryptography.ICryptoTransform,System.Security.Cryptography.CryptoStreamMode,System.Boolean);Argument[0];Argument[this];taint;df-generated |
 | System.Security.Cryptography;CryptoStream;CryptoStream;(System.IO.Stream,System.Security.Cryptography.ICryptoTransform,System.Security.Cryptography.CryptoStreamMode,System.Boolean);Argument[1];Argument[this];taint;df-generated |
 | System.Security.Cryptography;DSASignatureDeformatter;DSASignatureDeformatter;(System.Security.Cryptography.AsymmetricAlgorithm);Argument[0];Argument[this];taint;df-generated |
 | System.Security.Cryptography;DSASignatureFormatter;DSASignatureFormatter;(System.Security.Cryptography.AsymmetricAlgorithm);Argument[0];Argument[this];taint;df-generated |
 | System.Security.Cryptography;ECDiffieHellman;get_PublicKey;();Argument[this];ReturnValue;taint;df-generated |
-| System.Security.Cryptography;ECDiffieHellmanPublicKey;ECDiffieHellmanPublicKey;(System.Byte[]);Argument[0].Element;Argument[this];taint;df-generated |
-| System.Security.Cryptography;ECDiffieHellmanPublicKey;ToByteArray;();Argument[this];ReturnValue;taint;df-generated |
-| System.Security.Cryptography;HMACMD5;HMACMD5;(System.Byte[]);Argument[0].Element;Argument[this];taint;df-generated |
-| System.Security.Cryptography;HMACSHA1;HMACSHA1;(System.Byte[]);Argument[0].Element;Argument[this];taint;df-generated |
-| System.Security.Cryptography;HMACSHA3_256;HMACSHA3_256;(System.Byte[]);Argument[0].Element;Argument[this];taint;df-generated |
-| System.Security.Cryptography;HMACSHA3_384;HMACSHA3_384;(System.Byte[]);Argument[0].Element;Argument[this];taint;df-generated |
-| System.Security.Cryptography;HMACSHA3_512;HMACSHA3_512;(System.Byte[]);Argument[0].Element;Argument[this];taint;df-generated |
-| System.Security.Cryptography;HMACSHA256;HMACSHA256;(System.Byte[]);Argument[0].Element;Argument[this];taint;df-generated |
-| System.Security.Cryptography;HMACSHA384;HMACSHA384;(System.Byte[]);Argument[0].Element;Argument[this];taint;df-generated |
-| System.Security.Cryptography;HMACSHA512;HMACSHA512;(System.Byte[]);Argument[0].Element;Argument[this];taint;df-generated |
-| System.Security.Cryptography;HashAlgorithm;ComputeHash;(System.Byte[]);Argument[this];ReturnValue;taint;df-generated |
-| System.Security.Cryptography;HashAlgorithm;ComputeHash;(System.Byte[],System.Int32,System.Int32);Argument[this];ReturnValue;taint;df-generated |
-| System.Security.Cryptography;HashAlgorithm;ComputeHash;(System.IO.Stream);Argument[this];ReturnValue;taint;df-generated |
-| System.Security.Cryptography;HashAlgorithm;ComputeHashAsync;(System.IO.Stream,System.Threading.CancellationToken);Argument[this];ReturnValue;taint;df-generated |
-| System.Security.Cryptography;HashAlgorithm;get_Hash;();Argument[this];ReturnValue;taint;df-generated |
-| System.Security.Cryptography;HashAlgorithmName;HashAlgorithmName;(System.String);Argument[0];Argument[this];taint;df-generated |
-| System.Security.Cryptography;HashAlgorithmName;ToString;();Argument[this];ReturnValue;taint;df-generated |
-| System.Security.Cryptography;HashAlgorithmName;get_Name;();Argument[this];ReturnValue;taint;df-generated |
+| System.Security.Cryptography;ECDiffieHellmanPublicKey;ECDiffieHellmanPublicKey;(System.Byte[]);Argument[0].Element;Argument[this].SyntheticField[System.Security.Cryptography.ECDiffieHellmanPublicKey._keyBlob].Element;value;dfc-generated |
+| System.Security.Cryptography;ECDiffieHellmanPublicKey;ToByteArray;();Argument[this].SyntheticField[System.Security.Cryptography.ECDiffieHellmanPublicKey._keyBlob].Element;ReturnValue.Element;value;dfc-generated |
+| System.Security.Cryptography;HMACMD5;HMACMD5;(System.Byte[]);Argument[0].Element;Argument[this].Field[System.Security.Cryptography.KeyedHashAlgorithm.KeyValue].Element;value;dfc-generated |
+| System.Security.Cryptography;HMACMD5;HMACMD5;(System.Byte[]);Argument[0];Argument[this].Field[System.Security.Cryptography.KeyedHashAlgorithm.KeyValue];value;dfc-generated |
+| System.Security.Cryptography;HMACMD5;HMACMD5;(System.Byte[]);Argument[0];Argument[this].SyntheticField[System.Security.Cryptography.HMACMD5._hMacCommon].SyntheticField[System.Security.Cryptography.HMACCommon.ActualKey];value;dfc-generated |
+| System.Security.Cryptography;HMACMD5;HMACMD5;(System.Byte[]);Argument[this].SyntheticField[System.Security.Cryptography.HMACMD5._hMacCommon].SyntheticField[System.Security.Cryptography.HMACCommon.ActualKey];Argument[this].Field[System.Security.Cryptography.KeyedHashAlgorithm.KeyValue];value;dfc-generated |
+| System.Security.Cryptography;HMACSHA1;HMACSHA1;(System.Byte[]);Argument[0].Element;Argument[this].Field[System.Security.Cryptography.KeyedHashAlgorithm.KeyValue].Element;value;dfc-generated |
+| System.Security.Cryptography;HMACSHA1;HMACSHA1;(System.Byte[]);Argument[0];Argument[this].Field[System.Security.Cryptography.KeyedHashAlgorithm.KeyValue];value;dfc-generated |
+| System.Security.Cryptography;HMACSHA1;HMACSHA1;(System.Byte[]);Argument[0];Argument[this].SyntheticField[System.Security.Cryptography.HMACSHA1._hMacCommon].SyntheticField[System.Security.Cryptography.HMACCommon.ActualKey];value;dfc-generated |
+| System.Security.Cryptography;HMACSHA1;HMACSHA1;(System.Byte[]);Argument[this].SyntheticField[System.Security.Cryptography.HMACSHA1._hMacCommon].SyntheticField[System.Security.Cryptography.HMACCommon.ActualKey];Argument[this].Field[System.Security.Cryptography.KeyedHashAlgorithm.KeyValue];value;dfc-generated |
+| System.Security.Cryptography;HMACSHA3_256;HMACSHA3_256;(System.Byte[]);Argument[0].Element;Argument[this].Field[System.Security.Cryptography.KeyedHashAlgorithm.KeyValue].Element;value;dfc-generated |
+| System.Security.Cryptography;HMACSHA3_256;HMACSHA3_256;(System.Byte[]);Argument[0];Argument[this].Field[System.Security.Cryptography.KeyedHashAlgorithm.KeyValue];value;dfc-generated |
+| System.Security.Cryptography;HMACSHA3_256;HMACSHA3_256;(System.Byte[]);Argument[0];Argument[this].SyntheticField[System.Security.Cryptography.HMACSHA3_256._hMacCommon].SyntheticField[System.Security.Cryptography.HMACCommon.ActualKey];value;dfc-generated |
+| System.Security.Cryptography;HMACSHA3_256;HMACSHA3_256;(System.Byte[]);Argument[this].SyntheticField[System.Security.Cryptography.HMACSHA3_256._hMacCommon].SyntheticField[System.Security.Cryptography.HMACCommon.ActualKey];Argument[this].Field[System.Security.Cryptography.KeyedHashAlgorithm.KeyValue];value;dfc-generated |
+| System.Security.Cryptography;HMACSHA3_384;HMACSHA3_384;(System.Byte[]);Argument[0].Element;Argument[this].Field[System.Security.Cryptography.KeyedHashAlgorithm.KeyValue].Element;value;dfc-generated |
+| System.Security.Cryptography;HMACSHA3_384;HMACSHA3_384;(System.Byte[]);Argument[0];Argument[this].Field[System.Security.Cryptography.KeyedHashAlgorithm.KeyValue];value;dfc-generated |
+| System.Security.Cryptography;HMACSHA3_384;HMACSHA3_384;(System.Byte[]);Argument[0];Argument[this].SyntheticField[System.Security.Cryptography.HMACSHA3_384._hMacCommon].SyntheticField[System.Security.Cryptography.HMACCommon.ActualKey];value;dfc-generated |
+| System.Security.Cryptography;HMACSHA3_384;HMACSHA3_384;(System.Byte[]);Argument[this].SyntheticField[System.Security.Cryptography.HMACSHA3_384._hMacCommon].SyntheticField[System.Security.Cryptography.HMACCommon.ActualKey];Argument[this].Field[System.Security.Cryptography.KeyedHashAlgorithm.KeyValue];value;dfc-generated |
+| System.Security.Cryptography;HMACSHA3_512;HMACSHA3_512;(System.Byte[]);Argument[0].Element;Argument[this].Field[System.Security.Cryptography.KeyedHashAlgorithm.KeyValue].Element;value;dfc-generated |
+| System.Security.Cryptography;HMACSHA3_512;HMACSHA3_512;(System.Byte[]);Argument[0];Argument[this].Field[System.Security.Cryptography.KeyedHashAlgorithm.KeyValue];value;dfc-generated |
+| System.Security.Cryptography;HMACSHA3_512;HMACSHA3_512;(System.Byte[]);Argument[0];Argument[this].SyntheticField[System.Security.Cryptography.HMACSHA3_512._hMacCommon].SyntheticField[System.Security.Cryptography.HMACCommon.ActualKey];value;dfc-generated |
+| System.Security.Cryptography;HMACSHA3_512;HMACSHA3_512;(System.Byte[]);Argument[this].SyntheticField[System.Security.Cryptography.HMACSHA3_512._hMacCommon].SyntheticField[System.Security.Cryptography.HMACCommon.ActualKey];Argument[this].Field[System.Security.Cryptography.KeyedHashAlgorithm.KeyValue];value;dfc-generated |
+| System.Security.Cryptography;HMACSHA256;HMACSHA256;(System.Byte[]);Argument[0].Element;Argument[this].Field[System.Security.Cryptography.KeyedHashAlgorithm.KeyValue].Element;value;dfc-generated |
+| System.Security.Cryptography;HMACSHA256;HMACSHA256;(System.Byte[]);Argument[0];Argument[this].Field[System.Security.Cryptography.KeyedHashAlgorithm.KeyValue];value;dfc-generated |
+| System.Security.Cryptography;HMACSHA256;HMACSHA256;(System.Byte[]);Argument[0];Argument[this].SyntheticField[System.Security.Cryptography.HMACSHA256._hMacCommon].SyntheticField[System.Security.Cryptography.HMACCommon.ActualKey];value;dfc-generated |
+| System.Security.Cryptography;HMACSHA256;HMACSHA256;(System.Byte[]);Argument[this].SyntheticField[System.Security.Cryptography.HMACSHA256._hMacCommon].SyntheticField[System.Security.Cryptography.HMACCommon.ActualKey];Argument[this].Field[System.Security.Cryptography.KeyedHashAlgorithm.KeyValue];value;dfc-generated |
+| System.Security.Cryptography;HMACSHA384;HMACSHA384;(System.Byte[]);Argument[0].Element;Argument[this].Field[System.Security.Cryptography.KeyedHashAlgorithm.KeyValue].Element;value;dfc-generated |
+| System.Security.Cryptography;HMACSHA384;HMACSHA384;(System.Byte[]);Argument[0];Argument[this].Field[System.Security.Cryptography.KeyedHashAlgorithm.KeyValue];value;dfc-generated |
+| System.Security.Cryptography;HMACSHA384;HMACSHA384;(System.Byte[]);Argument[0];Argument[this].SyntheticField[System.Security.Cryptography.HMACSHA384._hMacCommon].SyntheticField[System.Security.Cryptography.HMACCommon.ActualKey];value;dfc-generated |
+| System.Security.Cryptography;HMACSHA384;HMACSHA384;(System.Byte[]);Argument[this].SyntheticField[System.Security.Cryptography.HMACSHA384._hMacCommon].SyntheticField[System.Security.Cryptography.HMACCommon.ActualKey];Argument[this].Field[System.Security.Cryptography.KeyedHashAlgorithm.KeyValue];value;dfc-generated |
+| System.Security.Cryptography;HMACSHA512;HMACSHA512;(System.Byte[]);Argument[0].Element;Argument[this].Field[System.Security.Cryptography.KeyedHashAlgorithm.KeyValue].Element;value;dfc-generated |
+| System.Security.Cryptography;HMACSHA512;HMACSHA512;(System.Byte[]);Argument[0];Argument[this].Field[System.Security.Cryptography.KeyedHashAlgorithm.KeyValue];value;dfc-generated |
+| System.Security.Cryptography;HMACSHA512;HMACSHA512;(System.Byte[]);Argument[0];Argument[this].SyntheticField[System.Security.Cryptography.HMACSHA512._hMacCommon].SyntheticField[System.Security.Cryptography.HMACCommon.ActualKey];value;dfc-generated |
+| System.Security.Cryptography;HMACSHA512;HMACSHA512;(System.Byte[]);Argument[this].SyntheticField[System.Security.Cryptography.HMACSHA512._hMacCommon].SyntheticField[System.Security.Cryptography.HMACCommon.ActualKey];Argument[this].Field[System.Security.Cryptography.KeyedHashAlgorithm.KeyValue];value;dfc-generated |
+| System.Security.Cryptography;HashAlgorithm;ComputeHash;(System.Byte[]);Argument[this].Field[System.Security.Cryptography.HashAlgorithm.HashValue].Element;ReturnValue.Element;value;dfc-generated |
+| System.Security.Cryptography;HashAlgorithm;ComputeHash;(System.Byte[],System.Int32,System.Int32);Argument[this].Field[System.Security.Cryptography.HashAlgorithm.HashValue].Element;ReturnValue.Element;value;dfc-generated |
+| System.Security.Cryptography;HashAlgorithm;ComputeHash;(System.IO.Stream);Argument[this].Field[System.Security.Cryptography.HashAlgorithm.HashValue].Element;ReturnValue.Element;value;dfc-generated |
+| System.Security.Cryptography;HashAlgorithm;ComputeHashAsync;(System.IO.Stream,System.Threading.CancellationToken);Argument[this].Field[System.Security.Cryptography.HashAlgorithm.HashValue].Element;ReturnValue.Property[System.Threading.Tasks.Task`1.Result].Element;value;dfc-generated |
+| System.Security.Cryptography;HashAlgorithm;get_Hash;();Argument[this].Field[System.Security.Cryptography.HashAlgorithm.HashValue].Element;ReturnValue.Element;value;dfc-generated |
+| System.Security.Cryptography;HashAlgorithmName;HashAlgorithmName;(System.String);Argument[0];Argument[this].SyntheticField[System.Security.Cryptography.HashAlgorithmName._name];value;dfc-generated |
+| System.Security.Cryptography;HashAlgorithmName;ToString;();Argument[this].SyntheticField[System.Security.Cryptography.HashAlgorithmName._name];ReturnValue;value;dfc-generated |
+| System.Security.Cryptography;HashAlgorithmName;get_Name;();Argument[this].SyntheticField[System.Security.Cryptography.HashAlgorithmName._name];ReturnValue;value;dfc-generated |
 | System.Security.Cryptography;IncrementalHash;CreateHMAC;(System.Security.Cryptography.HashAlgorithmName,System.Byte[]);Argument[0];ReturnValue;taint;df-generated |
 | System.Security.Cryptography;IncrementalHash;CreateHMAC;(System.Security.Cryptography.HashAlgorithmName,System.ReadOnlySpan<System.Byte>);Argument[0];ReturnValue;taint;df-generated |
-| System.Security.Cryptography;IncrementalHash;CreateHash;(System.Security.Cryptography.HashAlgorithmName);Argument[0];ReturnValue;taint;df-generated |
-| System.Security.Cryptography;IncrementalHash;get_AlgorithmName;();Argument[this];ReturnValue;taint;df-generated |
+| System.Security.Cryptography;IncrementalHash;CreateHash;(System.Security.Cryptography.HashAlgorithmName);Argument[0];ReturnValue.SyntheticField[System.Security.Cryptography.IncrementalHash._algorithmName];value;dfc-generated |
+| System.Security.Cryptography;IncrementalHash;get_AlgorithmName;();Argument[this].SyntheticField[System.Security.Cryptography.IncrementalHash._algorithmName];ReturnValue;value;dfc-generated |
 | System.Security.Cryptography;Oid;FromFriendlyName;(System.String,System.Security.Cryptography.OidGroup);Argument[0];ReturnValue;taint;df-generated |
 | System.Security.Cryptography;Oid;FromOidValue;(System.String,System.Security.Cryptography.OidGroup);Argument[0];ReturnValue;taint;df-generated |
 | System.Security.Cryptography;Oid;Oid;(System.Security.Cryptography.Oid);Argument[0];Argument[this];taint;df-generated |
@@ -11582,14 +12373,17 @@
 | System.Security.Cryptography;OidCollection;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Security.Cryptography.OidEnumerator.Current];value;manual |
 | System.Security.Cryptography;OidCollection;get_Item;(System.Int32);Argument[this];ReturnValue;taint;df-generated |
 | System.Security.Cryptography;OidCollection;get_Item;(System.String);Argument[this];ReturnValue;taint;df-generated |
+| System.Security.Cryptography;OidEnumerator;get_Current;();Argument[this].Property[System.Security.Cryptography.OidEnumerator.Current];ReturnValue;value;df-generated |
+| System.Security.Cryptography;OidEnumerator;get_Current;();Argument[this].Property[System.Security.Cryptography.OidEnumerator.Current];ReturnValue;value;dfc-generated |
 | System.Security.Cryptography;OidEnumerator;get_Current;();Argument[this];ReturnValue;taint;df-generated |
+| System.Security.Cryptography;OidEnumerator;get_Current;();Argument[this];ReturnValue;taint;dfc-generated |
 | System.Security.Cryptography;PasswordDeriveBytes;PasswordDeriveBytes;(System.Byte[],System.Byte[],System.String,System.Int32,System.Security.Cryptography.CspParameters);Argument[0].Element;Argument[this];taint;df-generated |
 | System.Security.Cryptography;PasswordDeriveBytes;PasswordDeriveBytes;(System.Byte[],System.Byte[],System.String,System.Int32,System.Security.Cryptography.CspParameters);Argument[1].Element;Argument[this];taint;df-generated |
 | System.Security.Cryptography;PasswordDeriveBytes;PasswordDeriveBytes;(System.Byte[],System.Byte[],System.String,System.Int32,System.Security.Cryptography.CspParameters);Argument[2];Argument[this];taint;df-generated |
 | System.Security.Cryptography;PasswordDeriveBytes;PasswordDeriveBytes;(System.Byte[],System.Byte[],System.String,System.Int32,System.Security.Cryptography.CspParameters);Argument[4];Argument[this];taint;df-generated |
-| System.Security.Cryptography;RSAEncryptionPadding;CreateOaep;(System.Security.Cryptography.HashAlgorithmName);Argument[0];ReturnValue;taint;df-generated |
-| System.Security.Cryptography;RSAEncryptionPadding;ToString;();Argument[this];ReturnValue;taint;df-generated |
-| System.Security.Cryptography;RSAEncryptionPadding;get_OaepHashAlgorithm;();Argument[this];ReturnValue;taint;df-generated |
+| System.Security.Cryptography;RSAEncryptionPadding;CreateOaep;(System.Security.Cryptography.HashAlgorithmName);Argument[0];ReturnValue.SyntheticField[System.Security.Cryptography.RSAEncryptionPadding._oaepHashAlgorithm];value;dfc-generated |
+| System.Security.Cryptography;RSAEncryptionPadding;ToString;();Argument[this].SyntheticField[System.Security.Cryptography.RSAEncryptionPadding._oaepHashAlgorithm].Property[System.Security.Cryptography.HashAlgorithmName.Name];ReturnValue;taint;dfc-generated |
+| System.Security.Cryptography;RSAEncryptionPadding;get_OaepHashAlgorithm;();Argument[this].SyntheticField[System.Security.Cryptography.RSAEncryptionPadding._oaepHashAlgorithm];ReturnValue;value;dfc-generated |
 | System.Security.Cryptography;RSAOAEPKeyExchangeDeformatter;RSAOAEPKeyExchangeDeformatter;(System.Security.Cryptography.AsymmetricAlgorithm);Argument[0];Argument[this];taint;df-generated |
 | System.Security.Cryptography;RSAOAEPKeyExchangeFormatter;RSAOAEPKeyExchangeFormatter;(System.Security.Cryptography.AsymmetricAlgorithm);Argument[0];Argument[this];taint;df-generated |
 | System.Security.Cryptography;RSAPKCS1KeyExchangeDeformatter;RSAPKCS1KeyExchangeDeformatter;(System.Security.Cryptography.AsymmetricAlgorithm);Argument[0];Argument[this];taint;df-generated |
@@ -11598,86 +12392,94 @@
 | System.Security.Cryptography;RSAPKCS1SignatureFormatter;RSAPKCS1SignatureFormatter;(System.Security.Cryptography.AsymmetricAlgorithm);Argument[0];Argument[this];taint;df-generated |
 | System.Security.Cryptography;SP800108HmacCounterKdf;SP800108HmacCounterKdf;(System.Byte[],System.Security.Cryptography.HashAlgorithmName);Argument[1];Argument[this];taint;df-generated |
 | System.Security.Cryptography;SP800108HmacCounterKdf;SP800108HmacCounterKdf;(System.ReadOnlySpan<System.Byte>,System.Security.Cryptography.HashAlgorithmName);Argument[1];Argument[this];taint;df-generated |
-| System.Security.Cryptography;SafeEvpPKeyHandle;DuplicateHandle;();Argument[this];ReturnValue;taint;df-generated |
 | System.Security.Cryptography;SignatureDescription;CreateDeformatter;(System.Security.Cryptography.AsymmetricAlgorithm);Argument[0];ReturnValue;taint;df-generated |
-| System.Security.Cryptography;SignatureDescription;CreateDeformatter;(System.Security.Cryptography.AsymmetricAlgorithm);Argument[this];ReturnValue;taint;df-generated |
 | System.Security.Cryptography;SignatureDescription;CreateFormatter;(System.Security.Cryptography.AsymmetricAlgorithm);Argument[0];ReturnValue;taint;df-generated |
-| System.Security.Cryptography;SignatureDescription;CreateFormatter;(System.Security.Cryptography.AsymmetricAlgorithm);Argument[this];ReturnValue;taint;df-generated |
-| System.Security.Cryptography;SymmetricAlgorithm;EncryptCbc;(System.ReadOnlySpan<System.Byte>,System.ReadOnlySpan<System.Byte>,System.Span<System.Byte>,System.Security.Cryptography.PaddingMode);Argument[0];Argument[2];taint;df-generated |
-| System.Security.Cryptography;SymmetricAlgorithm;EncryptCfb;(System.ReadOnlySpan<System.Byte>,System.ReadOnlySpan<System.Byte>,System.Span<System.Byte>,System.Security.Cryptography.PaddingMode,System.Int32);Argument[0];Argument[2];taint;df-generated |
-| System.Security.Cryptography;SymmetricAlgorithm;EncryptEcb;(System.ReadOnlySpan<System.Byte>,System.Span<System.Byte>,System.Security.Cryptography.PaddingMode);Argument[0];Argument[1];taint;df-generated |
-| System.Security.Cryptography;SymmetricAlgorithm;TryEncryptCbc;(System.ReadOnlySpan<System.Byte>,System.ReadOnlySpan<System.Byte>,System.Span<System.Byte>,System.Int32,System.Security.Cryptography.PaddingMode);Argument[0];Argument[2];taint;df-generated |
-| System.Security.Cryptography;SymmetricAlgorithm;TryEncryptCbcCore;(System.ReadOnlySpan<System.Byte>,System.ReadOnlySpan<System.Byte>,System.Span<System.Byte>,System.Security.Cryptography.PaddingMode,System.Int32);Argument[0];Argument[2];taint;df-generated |
-| System.Security.Cryptography;SymmetricAlgorithm;TryEncryptCfb;(System.ReadOnlySpan<System.Byte>,System.ReadOnlySpan<System.Byte>,System.Span<System.Byte>,System.Int32,System.Security.Cryptography.PaddingMode,System.Int32);Argument[0];Argument[2];taint;df-generated |
-| System.Security.Cryptography;SymmetricAlgorithm;TryEncryptCfbCore;(System.ReadOnlySpan<System.Byte>,System.ReadOnlySpan<System.Byte>,System.Span<System.Byte>,System.Security.Cryptography.PaddingMode,System.Int32,System.Int32);Argument[0];Argument[2];taint;df-generated |
-| System.Security.Cryptography;SymmetricAlgorithm;TryEncryptEcb;(System.ReadOnlySpan<System.Byte>,System.Span<System.Byte>,System.Security.Cryptography.PaddingMode,System.Int32);Argument[0];Argument[1];taint;df-generated |
-| System.Security.Cryptography;SymmetricAlgorithm;TryEncryptEcbCore;(System.ReadOnlySpan<System.Byte>,System.Span<System.Byte>,System.Security.Cryptography.PaddingMode,System.Int32);Argument[0];Argument[1];taint;df-generated |
-| System.Security.Cryptography;SymmetricAlgorithm;get_LegalBlockSizes;();Argument[this];ReturnValue;taint;df-generated |
-| System.Security.Cryptography;SymmetricAlgorithm;get_LegalKeySizes;();Argument[this];ReturnValue;taint;df-generated |
+| System.Security.Cryptography;SymmetricAlgorithm;EncryptCbc;(System.ReadOnlySpan<System.Byte>,System.ReadOnlySpan<System.Byte>,System.Span<System.Byte>,System.Security.Cryptography.PaddingMode);Argument[0].Element;Argument[2].Element;value;dfc-generated |
+| System.Security.Cryptography;SymmetricAlgorithm;EncryptCfb;(System.ReadOnlySpan<System.Byte>,System.ReadOnlySpan<System.Byte>,System.Span<System.Byte>,System.Security.Cryptography.PaddingMode,System.Int32);Argument[0].Element;Argument[2].Element;value;dfc-generated |
+| System.Security.Cryptography;SymmetricAlgorithm;EncryptEcb;(System.ReadOnlySpan<System.Byte>,System.Span<System.Byte>,System.Security.Cryptography.PaddingMode);Argument[0].Element;Argument[1].Element;value;dfc-generated |
+| System.Security.Cryptography;SymmetricAlgorithm;TryEncryptCbc;(System.ReadOnlySpan<System.Byte>,System.ReadOnlySpan<System.Byte>,System.Span<System.Byte>,System.Int32,System.Security.Cryptography.PaddingMode);Argument[0].Element;Argument[2].Element;value;dfc-generated |
+| System.Security.Cryptography;SymmetricAlgorithm;TryEncryptCbcCore;(System.ReadOnlySpan<System.Byte>,System.ReadOnlySpan<System.Byte>,System.Span<System.Byte>,System.Security.Cryptography.PaddingMode,System.Int32);Argument[0].Element;Argument[2].Element;value;dfc-generated |
+| System.Security.Cryptography;SymmetricAlgorithm;TryEncryptCfb;(System.ReadOnlySpan<System.Byte>,System.ReadOnlySpan<System.Byte>,System.Span<System.Byte>,System.Int32,System.Security.Cryptography.PaddingMode,System.Int32);Argument[0].Element;Argument[2].Element;value;dfc-generated |
+| System.Security.Cryptography;SymmetricAlgorithm;TryEncryptCfbCore;(System.ReadOnlySpan<System.Byte>,System.ReadOnlySpan<System.Byte>,System.Span<System.Byte>,System.Security.Cryptography.PaddingMode,System.Int32,System.Int32);Argument[0].Element;Argument[2].Element;value;dfc-generated |
+| System.Security.Cryptography;SymmetricAlgorithm;TryEncryptEcb;(System.ReadOnlySpan<System.Byte>,System.Span<System.Byte>,System.Security.Cryptography.PaddingMode,System.Int32);Argument[0].Element;Argument[1].Element;value;dfc-generated |
+| System.Security.Cryptography;SymmetricAlgorithm;TryEncryptEcbCore;(System.ReadOnlySpan<System.Byte>,System.Span<System.Byte>,System.Security.Cryptography.PaddingMode,System.Int32);Argument[0].Element;Argument[1].Element;value;dfc-generated |
+| System.Security.Cryptography;SymmetricAlgorithm;get_LegalBlockSizes;();Argument[this].Field[System.Security.Cryptography.SymmetricAlgorithm.LegalBlockSizesValue].Element;ReturnValue.Element;value;dfc-generated |
+| System.Security.Cryptography;SymmetricAlgorithm;get_LegalKeySizes;();Argument[this].Field[System.Security.Cryptography.SymmetricAlgorithm.LegalKeySizesValue].Element;ReturnValue.Element;value;dfc-generated |
 | System.Security.Permissions;KeyContainerPermissionAccessEntryCollection;Clear;();Argument[this].WithoutElement;Argument[this];value;manual |
 | System.Security.Policy;ApplicationTrustCollection;Clear;();Argument[this].WithoutElement;Argument[this];value;manual |
 | System.Security.Policy;Evidence;Clear;();Argument[this].WithoutElement;Argument[this];value;manual |
-| System.Security.Policy;IMembershipCondition;Copy;();Argument[this];ReturnValue;value;df-generated |
-| System.Security.Policy;PolicyStatement;Copy;();Argument[this];ReturnValue;value;df-generated |
-| System.Security.Principal;GenericIdentity;Clone;();Argument[this];ReturnValue;taint;df-generated |
-| System.Security.Principal;GenericIdentity;GenericIdentity;(System.Security.Principal.GenericIdentity);Argument[0];Argument[this];taint;df-generated |
-| System.Security.Principal;GenericIdentity;GenericIdentity;(System.String);Argument[0];Argument[this];taint;df-generated |
-| System.Security.Principal;GenericIdentity;GenericIdentity;(System.String,System.String);Argument[0];Argument[this];taint;df-generated |
-| System.Security.Principal;GenericIdentity;GenericIdentity;(System.String,System.String);Argument[1];Argument[this];taint;df-generated |
-| System.Security.Principal;GenericIdentity;get_Claims;();Argument[this];ReturnValue;taint;df-generated |
-| System.Security.Principal;GenericPrincipal;GenericPrincipal;(System.Security.Principal.IIdentity,System.String[]);Argument[0];Argument[this];taint;df-generated |
-| System.Security.Principal;GenericPrincipal;GenericPrincipal;(System.Security.Principal.IIdentity,System.String[]);Argument[1].Element;Argument[this];taint;df-generated |
-| System.Security.Principal;IIdentity;get_AuthenticationType;();Argument[this];ReturnValue;taint;df-generated |
+| System.Security.Policy;IMembershipCondition;Copy;();Argument[this];ReturnValue;value;dfc-generated |
+| System.Security.Policy;PolicyStatement;Copy;();Argument[this];ReturnValue;value;dfc-generated |
+| System.Security.Principal;GenericIdentity;Clone;();Argument[this].SyntheticField[System.Security.Principal.GenericIdentity.m_name];ReturnValue.SyntheticField[System.Security.Principal.GenericIdentity.m_name];value;dfc-generated |
+| System.Security.Principal;GenericIdentity;Clone;();Argument[this].SyntheticField[System.Security.Principal.GenericIdentity.m_type];ReturnValue.SyntheticField[System.Security.Principal.GenericIdentity.m_type];value;dfc-generated |
+| System.Security.Principal;GenericIdentity;GenericIdentity;(System.Security.Principal.GenericIdentity);Argument[0].SyntheticField[System.Security.Principal.GenericIdentity.m_name];Argument[this].SyntheticField[System.Security.Principal.GenericIdentity.m_name];value;dfc-generated |
+| System.Security.Principal;GenericIdentity;GenericIdentity;(System.Security.Principal.GenericIdentity);Argument[0].SyntheticField[System.Security.Principal.GenericIdentity.m_type];Argument[this].SyntheticField[System.Security.Principal.GenericIdentity.m_type];value;dfc-generated |
+| System.Security.Principal;GenericIdentity;GenericIdentity;(System.String);Argument[0];Argument[this].SyntheticField[System.Security.Principal.GenericIdentity.m_name];value;dfc-generated |
+| System.Security.Principal;GenericIdentity;GenericIdentity;(System.String,System.String);Argument[0];Argument[this].SyntheticField[System.Security.Principal.GenericIdentity.m_name];value;dfc-generated |
+| System.Security.Principal;GenericIdentity;GenericIdentity;(System.String,System.String);Argument[1];Argument[this].SyntheticField[System.Security.Principal.GenericIdentity.m_type];value;dfc-generated |
+| System.Security.Principal;GenericIdentity;get_AuthenticationType;();Argument[this].SyntheticField[System.Security.Claims.ClaimsIdentity._authenticationType];ReturnValue;value;dfc-generated |
+| System.Security.Principal;GenericIdentity;get_AuthenticationType;();Argument[this].SyntheticField[System.Security.Principal.GenericIdentity.m_type];ReturnValue;value;dfc-generated |
+| System.Security.Principal;GenericIdentity;get_Claims;();Argument[this].Property[System.Security.Claims.ClaimsIdentity.Claims];ReturnValue;value;dfc-generated |
+| System.Security.Principal;GenericIdentity;get_Claims;();Argument[this].SyntheticField[System.Security.Claims.ClaimsIdentity._instanceClaims].Element;ReturnValue.Element;value;dfc-generated |
+| System.Security.Principal;GenericIdentity;get_Claims;();Argument[this].SyntheticField[System.Security.Claims.ClaimsIdentity._instanceClaims];ReturnValue;value;dfc-generated |
+| System.Security.Principal;GenericIdentity;get_Name;();Argument[this].SyntheticField[System.Security.Principal.GenericIdentity.m_name];ReturnValue;value;df-generated |
+| System.Security.Principal;GenericIdentity;get_Name;();Argument[this].SyntheticField[System.Security.Principal.GenericIdentity.m_name];ReturnValue;value;dfc-generated |
+| System.Security.Principal;GenericPrincipal;GenericPrincipal;(System.Security.Principal.IIdentity,System.String[]);Argument[0];Argument[this].SyntheticField[System.Security.Principal.GenericPrincipal.m_identity];value;dfc-generated |
+| System.Security.Principal;GenericPrincipal;get_Identity;();Argument[this].SyntheticField[System.Security.Claims.ClaimsPrincipal._identities].Element;ReturnValue;value;dfc-generated |
+| System.Security.Principal;GenericPrincipal;get_Identity;();Argument[this].SyntheticField[System.Security.Principal.GenericPrincipal.m_identity];ReturnValue;value;dfc-generated |
 | System.Security.Principal;IIdentity;get_Name;();Argument[this];ReturnValue;taint;df-generated |
-| System.Security.Principal;IPrincipal;get_Identity;();Argument[this];ReturnValue;taint;df-generated |
-| System.Security.Principal;WindowsIdentity;Clone;();Argument[this];ReturnValue;taint;df-generated |
 | System.Security.Principal;WindowsIdentity;RunImpersonated;(Microsoft.Win32.SafeHandles.SafeAccessTokenHandle,System.Action);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
 | System.Security.Principal;WindowsIdentity;RunImpersonated<T>;(Microsoft.Win32.SafeHandles.SafeAccessTokenHandle,System.Func<T>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
 | System.Security.Principal;WindowsIdentity;RunImpersonatedAsync;(Microsoft.Win32.SafeHandles.SafeAccessTokenHandle,System.Func<System.Threading.Tasks.Task>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
 | System.Security.Principal;WindowsIdentity;RunImpersonatedAsync<T>;(Microsoft.Win32.SafeHandles.SafeAccessTokenHandle,System.Func<System.Threading.Tasks.Task<T>>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
-| System.Security.Principal;WindowsIdentity;get_Claims;();Argument[this];ReturnValue;taint;df-generated |
-| System.Security;IPermission;Copy;();Argument[this];ReturnValue;taint;df-generated |
-| System.Security;IPermission;Copy;();Argument[this];ReturnValue;value;df-generated |
-| System.Security;IPermission;Intersect;(System.Security.IPermission);Argument[0];ReturnValue;taint;df-generated |
-| System.Security;IPermission;Intersect;(System.Security.IPermission);Argument[this];ReturnValue;taint;df-generated |
+| System.Security.Principal;WindowsIdentity;get_AuthenticationType;();Argument[this].SyntheticField[System.Security.Claims.ClaimsIdentity._authenticationType];ReturnValue;value;dfc-generated |
+| System.Security.Principal;WindowsIdentity;get_Claims;();Argument[this].SyntheticField[System.Security.Claims.ClaimsIdentity._instanceClaims].Element;ReturnValue.Element;value;dfc-generated |
+| System.Security.Principal;WindowsIdentity;get_Claims;();Argument[this].SyntheticField[System.Security.Claims.ClaimsIdentity._instanceClaims];ReturnValue;value;dfc-generated |
+| System.Security.Principal;WindowsPrincipal;get_Identity;();Argument[this].SyntheticField[System.Security.Claims.ClaimsPrincipal._identities].Element;ReturnValue;value;dfc-generated |
+| System.Security;IPermission;Copy;();Argument[this];ReturnValue;value;dfc-generated |
+| System.Security;IPermission;Intersect;(System.Security.IPermission);Argument[0];ReturnValue;value;dfc-generated |
 | System.Security;IPermission;Union;(System.Security.IPermission);Argument[this];ReturnValue;taint;df-generated |
 | System.Security;SecurityContext;Run;(System.Security.SecurityContext,System.Threading.ContextCallback,System.Object);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
-| System.Security;SecurityElement;AddAttribute;(System.String,System.String);Argument[0];Argument[this];taint;df-generated |
-| System.Security;SecurityElement;AddAttribute;(System.String,System.String);Argument[1];Argument[this];taint;df-generated |
-| System.Security;SecurityElement;AddChild;(System.Security.SecurityElement);Argument[0];Argument[this];taint;df-generated |
-| System.Security;SecurityElement;Attribute;(System.String);Argument[this];ReturnValue;taint;df-generated |
-| System.Security;SecurityElement;Copy;();Argument[this];ReturnValue;taint;df-generated |
-| System.Security;SecurityElement;Escape;(System.String);Argument[0];ReturnValue;taint;df-generated |
-| System.Security;SecurityElement;SearchForChildByTag;(System.String);Argument[this];ReturnValue;taint;df-generated |
-| System.Security;SecurityElement;SearchForTextOfTag;(System.String);Argument[this];ReturnValue;taint;df-generated |
-| System.Security;SecurityElement;SecurityElement;(System.String);Argument[0];Argument[this];taint;df-generated |
-| System.Security;SecurityElement;SecurityElement;(System.String,System.String);Argument[0];Argument[this];taint;df-generated |
-| System.Security;SecurityElement;SecurityElement;(System.String,System.String);Argument[1];Argument[this];taint;df-generated |
-| System.Security;SecurityElement;ToString;();Argument[this];ReturnValue;taint;df-generated |
+| System.Security;SecurityElement;AddAttribute;(System.String,System.String);Argument[0];Argument[this].SyntheticField[System.Security.SecurityElement._attributes].Element;value;dfc-generated |
+| System.Security;SecurityElement;AddAttribute;(System.String,System.String);Argument[1];Argument[this].SyntheticField[System.Security.SecurityElement._attributes].Element;value;dfc-generated |
+| System.Security;SecurityElement;AddChild;(System.Security.SecurityElement);Argument[0];Argument[this].SyntheticField[System.Security.SecurityElement._children].Element;value;dfc-generated |
+| System.Security;SecurityElement;Attribute;(System.String);Argument[this].SyntheticField[System.Security.SecurityElement._attributes].Element;ReturnValue;value;dfc-generated |
+| System.Security;SecurityElement;Copy;();Argument[this].SyntheticField[System.Security.SecurityElement._tag];ReturnValue.SyntheticField[System.Security.SecurityElement._tag];value;dfc-generated |
+| System.Security;SecurityElement;Copy;();Argument[this].SyntheticField[System.Security.SecurityElement._text];ReturnValue.SyntheticField[System.Security.SecurityElement._text];value;dfc-generated |
+| System.Security;SecurityElement;Escape;(System.String);Argument[0];ReturnValue;value;dfc-generated |
+| System.Security;SecurityElement;SearchForChildByTag;(System.String);Argument[this].SyntheticField[System.Security.SecurityElement._children].Element;ReturnValue;value;dfc-generated |
+| System.Security;SecurityElement;SearchForTextOfTag;(System.String);Argument[this].SyntheticField[System.Security.SecurityElement._text];ReturnValue;value;dfc-generated |
+| System.Security;SecurityElement;SecurityElement;(System.String);Argument[0];Argument[this].SyntheticField[System.Security.SecurityElement._tag];value;dfc-generated |
+| System.Security;SecurityElement;SecurityElement;(System.String,System.String);Argument[0];Argument[this].SyntheticField[System.Security.SecurityElement._tag];value;dfc-generated |
+| System.Security;SecurityElement;SecurityElement;(System.String,System.String);Argument[1];Argument[this].SyntheticField[System.Security.SecurityElement._text];value;dfc-generated |
+| System.Security;SecurityElement;ToString;();Argument[this].SyntheticField[System.Security.SecurityElement._attributes].Element;ReturnValue;taint;dfc-generated |
+| System.Security;SecurityElement;ToString;();Argument[this].SyntheticField[System.Security.SecurityElement._tag];ReturnValue;taint;dfc-generated |
+| System.Security;SecurityElement;ToString;();Argument[this].SyntheticField[System.Security.SecurityElement._text];ReturnValue;taint;dfc-generated |
 | System.Text.Encodings.Web;TextEncoder;Encode;(System.IO.TextWriter,System.Char[],System.Int32,System.Int32);Argument[1].Element;Argument[0];taint;df-generated |
 | System.Text.Encodings.Web;TextEncoder;Encode;(System.IO.TextWriter,System.String);Argument[1];Argument[0];taint;df-generated |
 | System.Text.Encodings.Web;TextEncoder;Encode;(System.IO.TextWriter,System.String,System.Int32,System.Int32);Argument[1];Argument[0];taint;df-generated |
-| System.Text.Encodings.Web;TextEncoder;Encode;(System.ReadOnlySpan<System.Char>,System.Span<System.Char>,System.Int32,System.Int32,System.Boolean);Argument[0];Argument[1];taint;df-generated |
-| System.Text.Encodings.Web;TextEncoder;Encode;(System.String);Argument[0];ReturnValue;taint;df-generated |
-| System.Text.Encodings.Web;TextEncoder;EncodeUtf8;(System.ReadOnlySpan<System.Byte>,System.Span<System.Byte>,System.Int32,System.Int32,System.Boolean);Argument[0];Argument[1];taint;df-generated |
+| System.Text.Encodings.Web;TextEncoder;Encode;(System.ReadOnlySpan<System.Char>,System.Span<System.Char>,System.Int32,System.Int32,System.Boolean);Argument[0].Element;Argument[1].Element;value;dfc-generated |
+| System.Text.Encodings.Web;TextEncoder;Encode;(System.String);Argument[0];ReturnValue;value;dfc-generated |
+| System.Text.Encodings.Web;TextEncoder;EncodeUtf8;(System.ReadOnlySpan<System.Byte>,System.Span<System.Byte>,System.Int32,System.Int32,System.Boolean);Argument[0].Element;Argument[1].Element;value;dfc-generated |
 | System.Text.Json.Nodes;JsonArray;Add<T>;(T);Argument[0];Argument[this];taint;df-generated |
 | System.Text.Json.Nodes;JsonArray;Add<T>;(T);Argument[this];Argument[0];taint;df-generated |
 | System.Text.Json.Nodes;JsonArray;Create;(System.Text.Json.JsonElement,System.Nullable<System.Text.Json.Nodes.JsonNodeOptions>);Argument[0];ReturnValue;taint;df-generated |
 | System.Text.Json.Nodes;JsonArray;GetValues<T>;();Argument[this];ReturnValue;taint;df-generated |
 | System.Text.Json.Nodes;JsonArray;JsonArray;(System.Text.Json.Nodes.JsonNodeOptions,System.Text.Json.Nodes.JsonNode[]);Argument[this];Argument[1].Element;taint;df-generated |
 | System.Text.Json.Nodes;JsonArray;JsonArray;(System.Text.Json.Nodes.JsonNode[]);Argument[this];Argument[0].Element;taint;df-generated |
-| System.Text.Json.Nodes;JsonNode;AsArray;();Argument[this];ReturnValue;taint;df-generated |
-| System.Text.Json.Nodes;JsonNode;AsObject;();Argument[this];ReturnValue;taint;df-generated |
-| System.Text.Json.Nodes;JsonNode;AsValue;();Argument[this];ReturnValue;taint;df-generated |
+| System.Text.Json.Nodes;JsonNode;AsArray;();Argument[this];ReturnValue;value;dfc-generated |
+| System.Text.Json.Nodes;JsonNode;AsObject;();Argument[this];ReturnValue;value;dfc-generated |
+| System.Text.Json.Nodes;JsonNode;AsValue;();Argument[this];ReturnValue;value;dfc-generated |
 | System.Text.Json.Nodes;JsonNode;DeepClone;();Argument[this];ReturnValue;taint;df-generated |
 | System.Text.Json.Nodes;JsonNode;GetValue<T>;();Argument[this];ReturnValue;taint;df-generated |
-| System.Text.Json.Nodes;JsonNode;Parse;(System.Text.Json.Utf8JsonReader,System.Nullable<System.Text.Json.Nodes.JsonNodeOptions>);Argument[0];ReturnValue;taint;df-generated |
+| System.Text.Json.Nodes;JsonNode;Parse;(System.Text.Json.Utf8JsonReader,System.Nullable<System.Text.Json.Nodes.JsonNodeOptions>);Argument[0];ReturnValue;value;dfc-generated |
 | System.Text.Json.Nodes;JsonNode;ReplaceWith<T>;(T);Argument[this];Argument[0];taint;df-generated |
 | System.Text.Json.Nodes;JsonNode;ToString;();Argument[this];ReturnValue;taint;df-generated |
 | System.Text.Json.Nodes;JsonNode;get_Options;();Argument[this];ReturnValue;taint;df-generated |
 | System.Text.Json.Nodes;JsonNode;get_Root;();Argument[this];ReturnValue;value;df-generated |
 | System.Text.Json.Nodes;JsonObject;Create;(System.Text.Json.JsonElement,System.Nullable<System.Text.Json.Nodes.JsonNodeOptions>);Argument[0];ReturnValue;taint;df-generated |
-| System.Text.Json.Nodes;JsonObject;JsonObject;(System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<System.String,System.Text.Json.Nodes.JsonNode>>,System.Nullable<System.Text.Json.Nodes.JsonNodeOptions>);Argument[0].Element;Argument[this];taint;df-generated |
+| System.Text.Json.Nodes;JsonObject;JsonObject;(System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<System.String,System.Text.Json.Nodes.JsonNode>>,System.Nullable<System.Text.Json.Nodes.JsonNodeOptions>);Argument[0].Element.Property[System.Collections.Generic.KeyValuePair`2.Key];Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Key];value;dfc-generated |
+| System.Text.Json.Nodes;JsonObject;JsonObject;(System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<System.String,System.Text.Json.Nodes.JsonNode>>,System.Nullable<System.Text.Json.Nodes.JsonNodeOptions>);Argument[0].Element.Property[System.Collections.Generic.KeyValuePair`2.Value];Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Value];value;dfc-generated |
 | System.Text.Json.Nodes;JsonObject;TryGetPropertyValue;(System.String,System.Text.Json.Nodes.JsonNode);Argument[this];ReturnValue;taint;df-generated |
 | System.Text.Json.Nodes;JsonObject;TryGetValue;(System.String,System.Text.Json.Nodes.JsonNode);Argument[this];ReturnValue;taint;df-generated |
 | System.Text.Json.Nodes;JsonValue;Create<T>;(T,System.Text.Json.Serialization.Metadata.JsonTypeInfo<T>,System.Nullable<System.Text.Json.Nodes.JsonNodeOptions>);Argument[1];ReturnValue;taint;df-generated |
@@ -11735,89 +12537,105 @@
 | System.Text.Json.Serialization.Metadata;JsonTypeInfo<T>;set_CreateObject;(System.Func<T>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Text.Json.Serialization.Metadata;JsonTypeInfoResolver;Combine;(System.Text.Json.Serialization.Metadata.IJsonTypeInfoResolver[]);Argument[0].Element;ReturnValue;taint;df-generated |
 | System.Text.Json.Serialization.Metadata;JsonTypeInfoResolver;WithAddedModifier;(System.Text.Json.Serialization.Metadata.IJsonTypeInfoResolver,System.Action<System.Text.Json.Serialization.Metadata.JsonTypeInfo>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
-| System.Text.Json.Serialization;JsonConverter<T>;ReadAsPropertyName;(System.Text.Json.Utf8JsonReader,System.Type,System.Text.Json.JsonSerializerOptions);Argument[0];ReturnValue;taint;df-generated |
+| System.Text.Json.Serialization;JsonConverter<T>;ReadAsPropertyName;(System.Text.Json.Utf8JsonReader,System.Type,System.Text.Json.JsonSerializerOptions);Argument[0];ReturnValue;value;dfc-generated |
 | System.Text.Json.Serialization;JsonConverterFactory;CreateConverter;(System.Type,System.Text.Json.JsonSerializerOptions);Argument[this];ReturnValue;taint;df-generated |
-| System.Text.Json.Serialization;JsonSerializerContext;JsonSerializerContext;(System.Text.Json.JsonSerializerOptions);Argument[0];Argument[this];taint;df-generated |
-| System.Text.Json.Serialization;JsonSerializerContext;JsonSerializerContext;(System.Text.Json.JsonSerializerOptions);Argument[this];Argument[0];taint;df-generated |
-| System.Text.Json.Serialization;JsonSerializerContext;get_Options;();Argument[this];ReturnValue;taint;df-generated |
+| System.Text.Json.Serialization;JsonSerializerContext;JsonSerializerContext;(System.Text.Json.JsonSerializerOptions);Argument[0];Argument[this].SyntheticField[System.Text.Json.Serialization.JsonSerializerContext._options];value;dfc-generated |
+| System.Text.Json.Serialization;JsonSerializerContext;get_Options;();Argument[this].SyntheticField[System.Text.Json.Serialization.JsonSerializerContext._options];ReturnValue;value;dfc-generated |
 | System.Text.Json.Serialization;JsonStringEnumConverter;JsonStringEnumConverter;(System.Text.Json.JsonNamingPolicy,System.Boolean);Argument[0];Argument[this];taint;df-generated |
 | System.Text.Json.Serialization;JsonStringEnumConverter<TEnum>;JsonStringEnumConverter;(System.Text.Json.JsonNamingPolicy,System.Boolean);Argument[0];Argument[this];taint;df-generated |
 | System.Text.Json;JsonDocument;Parse;(System.Buffers.ReadOnlySequence<System.Byte>,System.Text.Json.JsonDocumentOptions);Argument[0];ReturnValue;taint;df-generated |
-| System.Text.Json;JsonDocument;Parse;(System.IO.Stream,System.Text.Json.JsonDocumentOptions);Argument[0];ReturnValue;taint;df-generated |
 | System.Text.Json;JsonDocument;Parse;(System.ReadOnlyMemory<System.Byte>,System.Text.Json.JsonDocumentOptions);Argument[0];ReturnValue;taint;df-generated |
-| System.Text.Json;JsonDocument;ParseValue;(System.Text.Json.Utf8JsonReader);Argument[0];ReturnValue;taint;df-generated |
-| System.Text.Json;JsonDocument;TryParseValue;(System.Text.Json.Utf8JsonReader,System.Text.Json.JsonDocument);Argument[0];ReturnValue;taint;df-generated |
+| System.Text.Json;JsonDocument;ParseValue;(System.Text.Json.Utf8JsonReader);Argument[0];ReturnValue;value;dfc-generated |
+| System.Text.Json;JsonDocument;TryParseValue;(System.Text.Json.Utf8JsonReader,System.Text.Json.JsonDocument);Argument[0];ReturnValue;value;dfc-generated |
 | System.Text.Json;JsonDocument;get_RootElement;();Argument[this];ReturnValue;taint;df-generated |
-| System.Text.Json;JsonElement+ArrayEnumerator;GetEnumerator;();Argument[this];ReturnValue;taint;df-generated |
+| System.Text.Json;JsonElement+ArrayEnumerator;GetEnumerator;();Argument[this];ReturnValue;value;dfc-generated |
+| System.Text.Json;JsonElement+ArrayEnumerator;get_Current;();Argument[this].Property[System.Text.Json.JsonElement+ArrayEnumerator.Current];ReturnValue;value;df-generated |
+| System.Text.Json;JsonElement+ArrayEnumerator;get_Current;();Argument[this].Property[System.Text.Json.JsonElement+ArrayEnumerator.Current];ReturnValue;value;dfc-generated |
 | System.Text.Json;JsonElement+ArrayEnumerator;get_Current;();Argument[this];ReturnValue;taint;df-generated |
-| System.Text.Json;JsonElement+ObjectEnumerator;GetEnumerator;();Argument[this];ReturnValue;taint;df-generated |
-| System.Text.Json;JsonElement;Clone;();Argument[this];ReturnValue;value;df-generated |
+| System.Text.Json;JsonElement+ArrayEnumerator;get_Current;();Argument[this];ReturnValue;taint;dfc-generated |
+| System.Text.Json;JsonElement+ObjectEnumerator;GetEnumerator;();Argument[this];ReturnValue;value;dfc-generated |
+| System.Text.Json;JsonElement+ObjectEnumerator;get_Current;();Argument[this].Property[System.Text.Json.JsonElement+ObjectEnumerator.Current];ReturnValue;value;df-generated |
+| System.Text.Json;JsonElement+ObjectEnumerator;get_Current;();Argument[this].Property[System.Text.Json.JsonElement+ObjectEnumerator.Current];ReturnValue;value;dfc-generated |
+| System.Text.Json;JsonElement;Clone;();Argument[this];ReturnValue;value;dfc-generated |
 | System.Text.Json;JsonElement;EnumerateArray;();Argument[this];ReturnValue;taint;df-generated |
 | System.Text.Json;JsonElement;EnumerateObject;();Argument[this];ReturnValue;taint;df-generated |
 | System.Text.Json;JsonElement;GetProperty;(System.ReadOnlySpan<System.Byte>);Argument[this];ReturnValue;taint;df-generated |
 | System.Text.Json;JsonElement;GetProperty;(System.ReadOnlySpan<System.Char>);Argument[this];ReturnValue;taint;df-generated |
 | System.Text.Json;JsonElement;GetProperty;(System.String);Argument[this];ReturnValue;taint;df-generated |
-| System.Text.Json;JsonElement;ParseValue;(System.Text.Json.Utf8JsonReader);Argument[0];ReturnValue;taint;df-generated |
+| System.Text.Json;JsonElement;ParseValue;(System.Text.Json.Utf8JsonReader);Argument[0];ReturnValue;value;dfc-generated |
 | System.Text.Json;JsonElement;TryGetProperty;(System.ReadOnlySpan<System.Byte>,System.Text.Json.JsonElement);Argument[this];ReturnValue;taint;df-generated |
 | System.Text.Json;JsonElement;TryGetProperty;(System.ReadOnlySpan<System.Char>,System.Text.Json.JsonElement);Argument[this];ReturnValue;taint;df-generated |
 | System.Text.Json;JsonElement;TryGetProperty;(System.String,System.Text.Json.JsonElement);Argument[this];ReturnValue;taint;df-generated |
-| System.Text.Json;JsonElement;TryParseValue;(System.Text.Json.Utf8JsonReader,System.Nullable<System.Text.Json.JsonElement>);Argument[0];ReturnValue;taint;df-generated |
+| System.Text.Json;JsonElement;TryParseValue;(System.Text.Json.Utf8JsonReader,System.Nullable<System.Text.Json.JsonElement>);Argument[0];ReturnValue;value;dfc-generated |
 | System.Text.Json;JsonElement;get_Item;(System.Int32);Argument[this];ReturnValue;taint;df-generated |
 | System.Text.Json;JsonEncodedText;Encode;(System.ReadOnlySpan<System.Byte>,System.Text.Encodings.Web.JavaScriptEncoder);Argument[0];ReturnValue;taint;df-generated |
 | System.Text.Json;JsonEncodedText;ToString;();Argument[this];ReturnValue;taint;df-generated |
-| System.Text.Json;JsonEncodedText;get_EncodedUtf8Bytes;();Argument[this];ReturnValue;taint;df-generated |
 | System.Text.Json;JsonEncodedText;get_Value;();Argument[this];ReturnValue;taint;df-generated |
-| System.Text.Json;JsonException;JsonException;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);Argument[0];Argument[this];taint;df-generated |
-| System.Text.Json;JsonException;JsonException;(System.String);Argument[0];Argument[this];taint;df-generated |
-| System.Text.Json;JsonException;JsonException;(System.String,System.Exception);Argument[0];Argument[this];taint;df-generated |
-| System.Text.Json;JsonException;JsonException;(System.String,System.String,System.Nullable<System.Int64>,System.Nullable<System.Int64>);Argument[0];Argument[this];taint;df-generated |
-| System.Text.Json;JsonException;JsonException;(System.String,System.String,System.Nullable<System.Int64>,System.Nullable<System.Int64>,System.Exception);Argument[0];Argument[this];taint;df-generated |
-| System.Text.Json;JsonException;get_Message;();Argument[this];ReturnValue;taint;df-generated |
-| System.Text.Json;JsonNamingPolicy;ConvertName;(System.String);Argument[0];ReturnValue;taint;df-generated |
+| System.Text.Json;JsonException;JsonException;(System.String);Argument[0];Argument[this].SyntheticField[System.Text.Json.JsonException._message];value;dfc-generated |
+| System.Text.Json;JsonException;JsonException;(System.String,System.Exception);Argument[0];Argument[this].SyntheticField[System.Text.Json.JsonException._message];value;dfc-generated |
+| System.Text.Json;JsonException;JsonException;(System.String,System.String,System.Nullable<System.Int64>,System.Nullable<System.Int64>);Argument[0];Argument[this].SyntheticField[System.Text.Json.JsonException._message];value;dfc-generated |
+| System.Text.Json;JsonException;JsonException;(System.String,System.String,System.Nullable<System.Int64>,System.Nullable<System.Int64>,System.Exception);Argument[0];Argument[this].SyntheticField[System.Text.Json.JsonException._message];value;dfc-generated |
+| System.Text.Json;JsonException;get_Message;();Argument[this].Property[System.Exception.Message];ReturnValue;value;dfc-generated |
+| System.Text.Json;JsonException;get_Message;();Argument[this].SyntheticField[System.Exception._message];ReturnValue;value;dfc-generated |
+| System.Text.Json;JsonException;get_Message;();Argument[this].SyntheticField[System.Text.Json.JsonException._message];ReturnValue;value;dfc-generated |
+| System.Text.Json;JsonNamingPolicy;ConvertName;(System.String);Argument[0];ReturnValue;value;dfc-generated |
 | System.Text.Json;JsonProperty;get_Name;();Argument[this];ReturnValue;taint;df-generated |
-| System.Text.Json;JsonReaderState;JsonReaderState;(System.Text.Json.JsonReaderOptions);Argument[0];Argument[this];taint;df-generated |
-| System.Text.Json;JsonReaderState;get_Options;();Argument[this];ReturnValue;taint;df-generated |
-| System.Text.Json;JsonSerializer;Deserialize;(System.Text.Json.Utf8JsonReader,System.Text.Json.Serialization.Metadata.JsonTypeInfo);Argument[0];ReturnValue;taint;df-generated |
-| System.Text.Json;JsonSerializer;Deserialize;(System.Text.Json.Utf8JsonReader,System.Type,System.Text.Json.JsonSerializerOptions);Argument[0];ReturnValue;taint;df-generated |
-| System.Text.Json;JsonSerializer;Deserialize;(System.Text.Json.Utf8JsonReader,System.Type,System.Text.Json.Serialization.JsonSerializerContext);Argument[0];ReturnValue;taint;df-generated |
-| System.Text.Json;JsonSerializer;Deserialize<TValue>;(System.Text.Json.Utf8JsonReader,System.Text.Json.JsonSerializerOptions);Argument[0];ReturnValue;taint;df-generated |
-| System.Text.Json;JsonSerializer;Deserialize<TValue>;(System.Text.Json.Utf8JsonReader,System.Text.Json.Serialization.Metadata.JsonTypeInfo<TValue>);Argument[0];ReturnValue;taint;df-generated |
+| System.Text.Json;JsonReaderState;JsonReaderState;(System.Text.Json.JsonReaderOptions);Argument[0];Argument[this].SyntheticField[System.Text.Json.JsonReaderState._readerOptions];value;dfc-generated |
+| System.Text.Json;JsonReaderState;get_Options;();Argument[this].SyntheticField[System.Text.Json.JsonReaderState._readerOptions];ReturnValue;value;dfc-generated |
+| System.Text.Json;JsonSerializer;Deserialize;(System.Text.Json.Utf8JsonReader,System.Text.Json.Serialization.Metadata.JsonTypeInfo);Argument[0];ReturnValue;value;dfc-generated |
+| System.Text.Json;JsonSerializer;Deserialize;(System.Text.Json.Utf8JsonReader,System.Type,System.Text.Json.JsonSerializerOptions);Argument[0];ReturnValue;value;dfc-generated |
+| System.Text.Json;JsonSerializer;Deserialize;(System.Text.Json.Utf8JsonReader,System.Type,System.Text.Json.Serialization.JsonSerializerContext);Argument[0];ReturnValue;value;dfc-generated |
+| System.Text.Json;JsonSerializer;Deserialize<TValue>;(System.Text.Json.Utf8JsonReader,System.Text.Json.JsonSerializerOptions);Argument[0];ReturnValue;value;dfc-generated |
+| System.Text.Json;JsonSerializer;Deserialize<TValue>;(System.Text.Json.Utf8JsonReader,System.Text.Json.Serialization.Metadata.JsonTypeInfo<TValue>);Argument[0];ReturnValue;value;dfc-generated |
+| System.Text.Json;JsonSerializer;Serialize;(System.IO.Stream,System.Object,System.Text.Json.Serialization.Metadata.JsonTypeInfo);Argument[1];Argument[2];taint;df-generated |
+| System.Text.Json;JsonSerializer;Serialize;(System.Object,System.Text.Json.Serialization.Metadata.JsonTypeInfo);Argument[0];Argument[1];taint;df-generated |
+| System.Text.Json;JsonSerializer;Serialize;(System.Text.Json.Utf8JsonWriter,System.Object,System.Text.Json.Serialization.Metadata.JsonTypeInfo);Argument[0];Argument[2];taint;df-generated |
+| System.Text.Json;JsonSerializer;Serialize;(System.Text.Json.Utf8JsonWriter,System.Object,System.Text.Json.Serialization.Metadata.JsonTypeInfo);Argument[1];Argument[2];taint;df-generated |
+| System.Text.Json;JsonSerializer;Serialize<TValue>;(System.IO.Stream,TValue,System.Text.Json.Serialization.Metadata.JsonTypeInfo<TValue>);Argument[1];Argument[2];taint;df-generated |
+| System.Text.Json;JsonSerializer;Serialize<TValue>;(System.Text.Json.Utf8JsonWriter,TValue,System.Text.Json.Serialization.Metadata.JsonTypeInfo<TValue>);Argument[0];Argument[2];taint;df-generated |
+| System.Text.Json;JsonSerializer;Serialize<TValue>;(System.Text.Json.Utf8JsonWriter,TValue,System.Text.Json.Serialization.Metadata.JsonTypeInfo<TValue>);Argument[1];Argument[2];taint;df-generated |
+| System.Text.Json;JsonSerializer;Serialize<TValue>;(TValue,System.Text.Json.Serialization.Metadata.JsonTypeInfo<TValue>);Argument[0];Argument[1];taint;df-generated |
+| System.Text.Json;JsonSerializer;SerializeAsync;(System.IO.Stream,System.Object,System.Text.Json.Serialization.Metadata.JsonTypeInfo,System.Threading.CancellationToken);Argument[1];Argument[2];taint;df-generated |
+| System.Text.Json;JsonSerializer;SerializeAsync<TValue>;(System.IO.Stream,TValue,System.Text.Json.Serialization.Metadata.JsonTypeInfo<TValue>,System.Threading.CancellationToken);Argument[1];Argument[2];taint;df-generated |
+| System.Text.Json;JsonSerializer;SerializeToDocument;(System.Object,System.Text.Json.Serialization.Metadata.JsonTypeInfo);Argument[0];Argument[1];taint;df-generated |
+| System.Text.Json;JsonSerializer;SerializeToDocument<TValue>;(TValue,System.Text.Json.Serialization.Metadata.JsonTypeInfo<TValue>);Argument[0];Argument[1];taint;df-generated |
+| System.Text.Json;JsonSerializer;SerializeToElement;(System.Object,System.Text.Json.Serialization.Metadata.JsonTypeInfo);Argument[0];Argument[1];taint;df-generated |
+| System.Text.Json;JsonSerializer;SerializeToElement<TValue>;(TValue,System.Text.Json.Serialization.Metadata.JsonTypeInfo<TValue>);Argument[0];Argument[1];taint;df-generated |
+| System.Text.Json;JsonSerializer;SerializeToNode;(System.Object,System.Text.Json.Serialization.Metadata.JsonTypeInfo);Argument[0];Argument[1];taint;df-generated |
+| System.Text.Json;JsonSerializer;SerializeToNode<TValue>;(TValue,System.Text.Json.Serialization.Metadata.JsonTypeInfo<TValue>);Argument[0];Argument[1];taint;df-generated |
+| System.Text.Json;JsonSerializer;SerializeToUtf8Bytes;(System.Object,System.Text.Json.Serialization.Metadata.JsonTypeInfo);Argument[0];Argument[1];taint;df-generated |
+| System.Text.Json;JsonSerializer;SerializeToUtf8Bytes<TValue>;(TValue,System.Text.Json.Serialization.Metadata.JsonTypeInfo<TValue>);Argument[0];Argument[1];taint;df-generated |
 | System.Text.Json;JsonSerializerOptions;GetConverter;(System.Type);Argument[this];ReturnValue;taint;df-generated |
 | System.Text.Json;JsonSerializerOptions;GetTypeInfo;(System.Type);Argument[this];ReturnValue;taint;df-generated |
 | System.Text.Json;JsonSerializerOptions;JsonSerializerOptions;(System.Text.Json.JsonSerializerOptions);Argument[0];Argument[this];taint;df-generated |
 | System.Text.Json;JsonSerializerOptions;TryGetTypeInfo;(System.Type,System.Text.Json.Serialization.Metadata.JsonTypeInfo);Argument[this];ReturnValue;taint;df-generated |
-| System.Text.Json;Utf8JsonReader;CopyString;(System.Span<System.Byte>);Argument[this];Argument[0];taint;df-generated |
-| System.Text.Json;Utf8JsonReader;GetComment;();Argument[this];ReturnValue;taint;df-generated |
-| System.Text.Json;Utf8JsonReader;GetString;();Argument[this];ReturnValue;taint;df-generated |
-| System.Text.Json;Utf8JsonReader;Utf8JsonReader;(System.Buffers.ReadOnlySequence<System.Byte>,System.Boolean,System.Text.Json.JsonReaderState);Argument[0];Argument[this];taint;df-generated |
-| System.Text.Json;Utf8JsonReader;Utf8JsonReader;(System.Buffers.ReadOnlySequence<System.Byte>,System.Boolean,System.Text.Json.JsonReaderState);Argument[2];Argument[this];taint;df-generated |
-| System.Text.Json;Utf8JsonReader;Utf8JsonReader;(System.ReadOnlySpan<System.Byte>,System.Boolean,System.Text.Json.JsonReaderState);Argument[0];Argument[this];taint;df-generated |
-| System.Text.Json;Utf8JsonReader;Utf8JsonReader;(System.ReadOnlySpan<System.Byte>,System.Boolean,System.Text.Json.JsonReaderState);Argument[2];Argument[this];taint;df-generated |
-| System.Text.Json;Utf8JsonReader;get_CurrentState;();Argument[this];ReturnValue;taint;df-generated |
-| System.Text.Json;Utf8JsonReader;get_Position;();Argument[this];ReturnValue;taint;df-generated |
+| System.Text.Json;Utf8JsonReader;CopyString;(System.Span<System.Byte>);Argument[this].Property[System.Text.Json.Utf8JsonReader.ValueSpan].Element;Argument[0].Element;value;dfc-generated |
+| System.Text.Json;Utf8JsonReader;GetComment;();Argument[this].Property[System.Text.Json.Utf8JsonReader.ValueSpan].Element;ReturnValue;taint;dfc-generated |
+| System.Text.Json;Utf8JsonReader;GetString;();Argument[this].Property[System.Text.Json.Utf8JsonReader.ValueSpan].Element;ReturnValue;taint;dfc-generated |
+| System.Text.Json;Utf8JsonReader;Utf8JsonReader;(System.Buffers.ReadOnlySequence<System.Byte>,System.Boolean,System.Text.Json.JsonReaderState);Argument[2].SyntheticField[System.Text.Json.JsonReaderState._readerOptions];Argument[this].SyntheticField[System.Text.Json.Utf8JsonReader._readerOptions];value;dfc-generated |
+| System.Text.Json;Utf8JsonReader;Utf8JsonReader;(System.ReadOnlySpan<System.Byte>,System.Boolean,System.Text.Json.JsonReaderState);Argument[2].SyntheticField[System.Text.Json.JsonReaderState._readerOptions];Argument[this].SyntheticField[System.Text.Json.Utf8JsonReader._readerOptions];value;dfc-generated |
+| System.Text.Json;Utf8JsonReader;get_CurrentState;();Argument[this].SyntheticField[System.Text.Json.Utf8JsonReader._readerOptions];ReturnValue.SyntheticField[System.Text.Json.JsonReaderState._readerOptions];value;dfc-generated |
 | System.Text.Json;Utf8JsonWriter;Reset;(System.Buffers.IBufferWriter<System.Byte>);Argument[0];Argument[this];taint;df-generated |
 | System.Text.Json;Utf8JsonWriter;Reset;(System.IO.Stream);Argument[0];Argument[this];taint;df-generated |
-| System.Text.Json;Utf8JsonWriter;Utf8JsonWriter;(System.Buffers.IBufferWriter<System.Byte>,System.Text.Json.JsonWriterOptions);Argument[0];Argument[this];taint;df-generated |
-| System.Text.Json;Utf8JsonWriter;Utf8JsonWriter;(System.Buffers.IBufferWriter<System.Byte>,System.Text.Json.JsonWriterOptions);Argument[1];Argument[this];taint;df-generated |
-| System.Text.Json;Utf8JsonWriter;Utf8JsonWriter;(System.IO.Stream,System.Text.Json.JsonWriterOptions);Argument[0];Argument[this];taint;df-generated |
-| System.Text.Json;Utf8JsonWriter;Utf8JsonWriter;(System.IO.Stream,System.Text.Json.JsonWriterOptions);Argument[1];Argument[this];taint;df-generated |
-| System.Text.Json;Utf8JsonWriter;get_Options;();Argument[this];ReturnValue;taint;df-generated |
-| System.Text.RegularExpressions;Capture;ToString;();Argument[this];ReturnValue;taint;df-generated |
+| System.Text.Json;Utf8JsonWriter;Utf8JsonWriter;(System.Buffers.IBufferWriter<System.Byte>,System.Text.Json.JsonWriterOptions);Argument[1];Argument[this].SyntheticField[System.Text.Json.Utf8JsonWriter._options];value;dfc-generated |
+| System.Text.Json;Utf8JsonWriter;Utf8JsonWriter;(System.IO.Stream,System.Text.Json.JsonWriterOptions);Argument[1];Argument[this].SyntheticField[System.Text.Json.Utf8JsonWriter._options];value;dfc-generated |
+| System.Text.Json;Utf8JsonWriter;get_Options;();Argument[this].SyntheticField[System.Text.Json.Utf8JsonWriter._options];ReturnValue;value;dfc-generated |
+| System.Text.RegularExpressions;Capture;ToString;();Argument[this].Property[System.Text.RegularExpressions.Capture.Value];ReturnValue;value;dfc-generated |
 | System.Text.RegularExpressions;Capture;get_Value;();Argument[this];ReturnValue;taint;df-generated |
 | System.Text.RegularExpressions;CaptureCollection;get_Item;(System.Int32);Argument[this].Element;ReturnValue;value;manual |
-| System.Text.RegularExpressions;GeneratedRegexAttribute;GeneratedRegexAttribute;(System.String,System.Text.RegularExpressions.RegexOptions,System.Int32,System.String);Argument[0];Argument[this];taint;df-generated |
-| System.Text.RegularExpressions;GeneratedRegexAttribute;GeneratedRegexAttribute;(System.String,System.Text.RegularExpressions.RegexOptions,System.Int32,System.String);Argument[3];Argument[this];taint;df-generated |
-| System.Text.RegularExpressions;Group;Synchronized;(System.Text.RegularExpressions.Group);Argument[0];ReturnValue;taint;df-generated |
-| System.Text.RegularExpressions;GroupCollection;TryGetValue;(System.String,System.Text.RegularExpressions.Group);Argument[this];ReturnValue;taint;df-generated |
+| System.Text.RegularExpressions;GeneratedRegexAttribute;GeneratedRegexAttribute;(System.String,System.Text.RegularExpressions.RegexOptions,System.Int32,System.String);Argument[0];Argument[this].Property[System.Text.RegularExpressions.GeneratedRegexAttribute.Pattern];value;dfc-generated |
+| System.Text.RegularExpressions;GeneratedRegexAttribute;GeneratedRegexAttribute;(System.String,System.Text.RegularExpressions.RegexOptions,System.Int32,System.String);Argument[3];Argument[this].Property[System.Text.RegularExpressions.GeneratedRegexAttribute.CultureName];value;dfc-generated |
+| System.Text.RegularExpressions;Group;Synchronized;(System.Text.RegularExpressions.Group);Argument[0];ReturnValue;value;dfc-generated |
+| System.Text.RegularExpressions;GroupCollection;TryGetValue;(System.String,System.Text.RegularExpressions.Group);Argument[this].Element;ReturnValue;value;dfc-generated |
 | System.Text.RegularExpressions;GroupCollection;get_Item;(System.Int32);Argument[this].Element;ReturnValue;value;manual |
 | System.Text.RegularExpressions;GroupCollection;get_Item;(System.String);Argument[this].Element;ReturnValue;value;manual |
 | System.Text.RegularExpressions;GroupCollection;get_Keys;();Argument[this];ReturnValue;taint;df-generated |
 | System.Text.RegularExpressions;GroupCollection;get_Values;();Argument[this];ReturnValue;taint;df-generated |
-| System.Text.RegularExpressions;Match;NextMatch;();Argument[this];ReturnValue;taint;df-generated |
-| System.Text.RegularExpressions;Match;Synchronized;(System.Text.RegularExpressions.Match);Argument[0];ReturnValue;taint;df-generated |
+| System.Text.RegularExpressions;Match;NextMatch;();Argument[this];ReturnValue;value;dfc-generated |
+| System.Text.RegularExpressions;Match;Synchronized;(System.Text.RegularExpressions.Match);Argument[0];ReturnValue;value;dfc-generated |
 | System.Text.RegularExpressions;MatchCollection;get_Item;(System.Int32);Argument[this].Element;ReturnValue;value;manual |
 | System.Text.RegularExpressions;MatchEvaluator;BeginInvoke;(System.Text.RegularExpressions.Match,System.AsyncCallback,System.Object);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
-| System.Text.RegularExpressions;Regex+ValueMatchEnumerator;GetEnumerator;();Argument[this];ReturnValue;value;df-generated |
+| System.Text.RegularExpressions;Regex+ValueMatchEnumerator;GetEnumerator;();Argument[this];ReturnValue;value;dfc-generated |
 | System.Text.RegularExpressions;Regex+ValueMatchEnumerator;get_Current;();Argument[this];ReturnValue;taint;df-generated |
 | System.Text.RegularExpressions;Regex;Count;(System.String);Argument[0];Argument[this];taint;df-generated |
 | System.Text.RegularExpressions;Regex;EnumerateMatches;(System.ReadOnlySpan<System.Char>);Argument[0];ReturnValue;taint;df-generated |
@@ -11831,9 +12649,8 @@
 | System.Text.RegularExpressions;Regex;EnumerateMatches;(System.ReadOnlySpan<System.Char>,System.String,System.Text.RegularExpressions.RegexOptions,System.TimeSpan);Argument[0];ReturnValue;taint;df-generated |
 | System.Text.RegularExpressions;Regex;EnumerateMatches;(System.ReadOnlySpan<System.Char>,System.String,System.Text.RegularExpressions.RegexOptions,System.TimeSpan);Argument[1];ReturnValue;taint;df-generated |
 | System.Text.RegularExpressions;Regex;EnumerateMatches;(System.ReadOnlySpan<System.Char>,System.String,System.Text.RegularExpressions.RegexOptions,System.TimeSpan);Argument[3];ReturnValue;taint;df-generated |
-| System.Text.RegularExpressions;Regex;Escape;(System.String);Argument[0];ReturnValue;taint;df-generated |
-| System.Text.RegularExpressions;Regex;GetGroupNames;();Argument[this];ReturnValue;taint;df-generated |
-| System.Text.RegularExpressions;Regex;GroupNameFromNumber;(System.Int32);Argument[this];ReturnValue;taint;df-generated |
+| System.Text.RegularExpressions;Regex;Escape;(System.String);Argument[0];ReturnValue;value;dfc-generated |
+| System.Text.RegularExpressions;Regex;GroupNameFromNumber;(System.Int32);Argument[this].Field[System.Text.RegularExpressions.Regex.capslist].Element;ReturnValue;value;dfc-generated |
 | System.Text.RegularExpressions;Regex;IsMatch;(System.String);Argument[0];Argument[this];taint;df-generated |
 | System.Text.RegularExpressions;Regex;IsMatch;(System.String,System.Int32);Argument[0];Argument[this];taint;df-generated |
 | System.Text.RegularExpressions;Regex;Match;(System.String);Argument[0];Argument[this];taint;df-generated |
@@ -11850,60 +12667,71 @@
 | System.Text.RegularExpressions;Regex;Matches;(System.String,System.String,System.Text.RegularExpressions.RegexOptions,System.TimeSpan);Argument[0];ReturnValue;taint;df-generated |
 | System.Text.RegularExpressions;Regex;Matches;(System.String,System.String,System.Text.RegularExpressions.RegexOptions,System.TimeSpan);Argument[1];ReturnValue;taint;df-generated |
 | System.Text.RegularExpressions;Regex;Matches;(System.String,System.String,System.Text.RegularExpressions.RegexOptions,System.TimeSpan);Argument[3];ReturnValue;taint;df-generated |
-| System.Text.RegularExpressions;Regex;Replace;(System.String,System.String);Argument[0];Argument[this];taint;df-generated |
-| System.Text.RegularExpressions;Regex;Replace;(System.String,System.String);Argument[0];ReturnValue;taint;df-generated |
-| System.Text.RegularExpressions;Regex;Replace;(System.String,System.String,System.Int32);Argument[0];Argument[this];taint;df-generated |
-| System.Text.RegularExpressions;Regex;Replace;(System.String,System.String,System.Int32);Argument[0];ReturnValue;taint;df-generated |
-| System.Text.RegularExpressions;Regex;Replace;(System.String,System.String,System.Int32,System.Int32);Argument[0];Argument[this];taint;df-generated |
-| System.Text.RegularExpressions;Regex;Replace;(System.String,System.String,System.Int32,System.Int32);Argument[0];ReturnValue;taint;df-generated |
-| System.Text.RegularExpressions;Regex;Replace;(System.String,System.String,System.String);Argument[0];ReturnValue;taint;df-generated |
-| System.Text.RegularExpressions;Regex;Replace;(System.String,System.String,System.String,System.Text.RegularExpressions.RegexOptions);Argument[0];ReturnValue;taint;df-generated |
-| System.Text.RegularExpressions;Regex;Replace;(System.String,System.String,System.String,System.Text.RegularExpressions.RegexOptions,System.TimeSpan);Argument[0];ReturnValue;taint;df-generated |
+| System.Text.RegularExpressions;Regex;Replace;(System.String,System.String);Argument[0];ReturnValue;value;dfc-generated |
+| System.Text.RegularExpressions;Regex;Replace;(System.String,System.String,System.Int32);Argument[0];ReturnValue;value;dfc-generated |
+| System.Text.RegularExpressions;Regex;Replace;(System.String,System.String,System.Int32,System.Int32);Argument[0];ReturnValue;value;dfc-generated |
+| System.Text.RegularExpressions;Regex;Replace;(System.String,System.String,System.String);Argument[0];ReturnValue;value;dfc-generated |
+| System.Text.RegularExpressions;Regex;Replace;(System.String,System.String,System.String,System.Text.RegularExpressions.RegexOptions);Argument[0];ReturnValue;value;dfc-generated |
+| System.Text.RegularExpressions;Regex;Replace;(System.String,System.String,System.String,System.Text.RegularExpressions.RegexOptions,System.TimeSpan);Argument[0];ReturnValue;value;dfc-generated |
+| System.Text.RegularExpressions;Regex;Replace;(System.String,System.String,System.Text.RegularExpressions.MatchEvaluator);Argument[0];ReturnValue;value;dfc-generated |
+| System.Text.RegularExpressions;Regex;Replace;(System.String,System.String,System.Text.RegularExpressions.MatchEvaluator);Argument[0];ReturnValue;value;hq-generated |
+| System.Text.RegularExpressions;Regex;Replace;(System.String,System.String,System.Text.RegularExpressions.MatchEvaluator);Argument[2];Argument[2].Parameter[delegate-self];value;dfc-generated |
 | System.Text.RegularExpressions;Regex;Replace;(System.String,System.String,System.Text.RegularExpressions.MatchEvaluator);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
+| System.Text.RegularExpressions;Regex;Replace;(System.String,System.String,System.Text.RegularExpressions.MatchEvaluator,System.Text.RegularExpressions.RegexOptions);Argument[0];ReturnValue;value;dfc-generated |
+| System.Text.RegularExpressions;Regex;Replace;(System.String,System.String,System.Text.RegularExpressions.MatchEvaluator,System.Text.RegularExpressions.RegexOptions);Argument[0];ReturnValue;value;hq-generated |
+| System.Text.RegularExpressions;Regex;Replace;(System.String,System.String,System.Text.RegularExpressions.MatchEvaluator,System.Text.RegularExpressions.RegexOptions);Argument[2];Argument[2].Parameter[delegate-self];value;dfc-generated |
 | System.Text.RegularExpressions;Regex;Replace;(System.String,System.String,System.Text.RegularExpressions.MatchEvaluator,System.Text.RegularExpressions.RegexOptions);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
+| System.Text.RegularExpressions;Regex;Replace;(System.String,System.String,System.Text.RegularExpressions.MatchEvaluator,System.Text.RegularExpressions.RegexOptions,System.TimeSpan);Argument[0];ReturnValue;value;dfc-generated |
+| System.Text.RegularExpressions;Regex;Replace;(System.String,System.String,System.Text.RegularExpressions.MatchEvaluator,System.Text.RegularExpressions.RegexOptions,System.TimeSpan);Argument[0];ReturnValue;value;hq-generated |
+| System.Text.RegularExpressions;Regex;Replace;(System.String,System.String,System.Text.RegularExpressions.MatchEvaluator,System.Text.RegularExpressions.RegexOptions,System.TimeSpan);Argument[2];Argument[2].Parameter[delegate-self];value;dfc-generated |
 | System.Text.RegularExpressions;Regex;Replace;(System.String,System.String,System.Text.RegularExpressions.MatchEvaluator,System.Text.RegularExpressions.RegexOptions,System.TimeSpan);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
+| System.Text.RegularExpressions;Regex;Replace;(System.String,System.Text.RegularExpressions.MatchEvaluator);Argument[0];ReturnValue;value;dfc-generated |
+| System.Text.RegularExpressions;Regex;Replace;(System.String,System.Text.RegularExpressions.MatchEvaluator);Argument[0];ReturnValue;value;hq-generated |
+| System.Text.RegularExpressions;Regex;Replace;(System.String,System.Text.RegularExpressions.MatchEvaluator);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | System.Text.RegularExpressions;Regex;Replace;(System.String,System.Text.RegularExpressions.MatchEvaluator);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
+| System.Text.RegularExpressions;Regex;Replace;(System.String,System.Text.RegularExpressions.MatchEvaluator,System.Int32);Argument[0];ReturnValue;value;dfc-generated |
+| System.Text.RegularExpressions;Regex;Replace;(System.String,System.Text.RegularExpressions.MatchEvaluator,System.Int32);Argument[0];ReturnValue;value;hq-generated |
+| System.Text.RegularExpressions;Regex;Replace;(System.String,System.Text.RegularExpressions.MatchEvaluator,System.Int32);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | System.Text.RegularExpressions;Regex;Replace;(System.String,System.Text.RegularExpressions.MatchEvaluator,System.Int32);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
+| System.Text.RegularExpressions;Regex;Replace;(System.String,System.Text.RegularExpressions.MatchEvaluator,System.Int32,System.Int32);Argument[0];ReturnValue;value;dfc-generated |
+| System.Text.RegularExpressions;Regex;Replace;(System.String,System.Text.RegularExpressions.MatchEvaluator,System.Int32,System.Int32);Argument[0];ReturnValue;value;hq-generated |
+| System.Text.RegularExpressions;Regex;Replace;(System.String,System.Text.RegularExpressions.MatchEvaluator,System.Int32,System.Int32);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | System.Text.RegularExpressions;Regex;Replace;(System.String,System.Text.RegularExpressions.MatchEvaluator,System.Int32,System.Int32);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
-| System.Text.RegularExpressions;Regex;Split;(System.String);Argument[0];Argument[this];taint;df-generated |
-| System.Text.RegularExpressions;Regex;Split;(System.String);Argument[0];ReturnValue;taint;df-generated |
-| System.Text.RegularExpressions;Regex;Split;(System.String,System.Int32);Argument[0];Argument[this];taint;df-generated |
-| System.Text.RegularExpressions;Regex;Split;(System.String,System.Int32);Argument[0];ReturnValue;taint;df-generated |
-| System.Text.RegularExpressions;Regex;Split;(System.String,System.Int32,System.Int32);Argument[0];Argument[this];taint;df-generated |
-| System.Text.RegularExpressions;Regex;Split;(System.String,System.Int32,System.Int32);Argument[0];ReturnValue;taint;df-generated |
-| System.Text.RegularExpressions;Regex;Split;(System.String,System.String);Argument[0];ReturnValue;taint;df-generated |
-| System.Text.RegularExpressions;Regex;Split;(System.String,System.String,System.Text.RegularExpressions.RegexOptions);Argument[0];ReturnValue;taint;df-generated |
-| System.Text.RegularExpressions;Regex;Split;(System.String,System.String,System.Text.RegularExpressions.RegexOptions,System.TimeSpan);Argument[0];ReturnValue;taint;df-generated |
-| System.Text.RegularExpressions;Regex;ToString;();Argument[this];ReturnValue;taint;df-generated |
-| System.Text.RegularExpressions;Regex;Unescape;(System.String);Argument[0];ReturnValue;taint;df-generated |
-| System.Text.RegularExpressions;Regex;get_MatchTimeout;();Argument[this];ReturnValue;taint;df-generated |
+| System.Text.RegularExpressions;Regex;Split;(System.String);Argument[0];ReturnValue.Element;value;dfc-generated |
+| System.Text.RegularExpressions;Regex;Split;(System.String,System.Int32);Argument[0];ReturnValue.Element;value;dfc-generated |
+| System.Text.RegularExpressions;Regex;Split;(System.String,System.Int32,System.Int32);Argument[0];ReturnValue.Element;value;dfc-generated |
+| System.Text.RegularExpressions;Regex;Split;(System.String,System.String);Argument[0];ReturnValue.Element;value;dfc-generated |
+| System.Text.RegularExpressions;Regex;Split;(System.String,System.String,System.Text.RegularExpressions.RegexOptions);Argument[0];ReturnValue.Element;value;dfc-generated |
+| System.Text.RegularExpressions;Regex;Split;(System.String,System.String,System.Text.RegularExpressions.RegexOptions,System.TimeSpan);Argument[0];ReturnValue.Element;value;dfc-generated |
+| System.Text.RegularExpressions;Regex;ToString;();Argument[this].Field[System.Text.RegularExpressions.Regex.pattern];ReturnValue;value;dfc-generated |
+| System.Text.RegularExpressions;Regex;Unescape;(System.String);Argument[0];ReturnValue;value;dfc-generated |
+| System.Text.RegularExpressions;Regex;get_MatchTimeout;();Argument[this].Field[System.Text.RegularExpressions.Regex.internalMatchTimeout];ReturnValue;value;dfc-generated |
 | System.Text.RegularExpressions;RegexCompilationInfo;RegexCompilationInfo;(System.String,System.Text.RegularExpressions.RegexOptions,System.String,System.String,System.Boolean,System.TimeSpan);Argument[0];Argument[this];taint;df-generated |
 | System.Text.RegularExpressions;RegexCompilationInfo;RegexCompilationInfo;(System.String,System.Text.RegularExpressions.RegexOptions,System.String,System.String,System.Boolean,System.TimeSpan);Argument[2];Argument[this];taint;df-generated |
 | System.Text.RegularExpressions;RegexCompilationInfo;RegexCompilationInfo;(System.String,System.Text.RegularExpressions.RegexOptions,System.String,System.String,System.Boolean,System.TimeSpan);Argument[3];Argument[this];taint;df-generated |
 | System.Text.RegularExpressions;RegexCompilationInfo;RegexCompilationInfo;(System.String,System.Text.RegularExpressions.RegexOptions,System.String,System.String,System.Boolean,System.TimeSpan);Argument[5];Argument[this];taint;df-generated |
-| System.Text.RegularExpressions;RegexRunner;Scan;(System.Text.RegularExpressions.Regex,System.String,System.Int32,System.Int32,System.Int32,System.Int32,System.Boolean);Argument[0];Argument[this];taint;df-generated |
-| System.Text.RegularExpressions;RegexRunner;Scan;(System.Text.RegularExpressions.Regex,System.String,System.Int32,System.Int32,System.Int32,System.Int32,System.Boolean);Argument[0];ReturnValue;taint;df-generated |
-| System.Text.RegularExpressions;RegexRunner;Scan;(System.Text.RegularExpressions.Regex,System.String,System.Int32,System.Int32,System.Int32,System.Int32,System.Boolean);Argument[1];Argument[this];taint;df-generated |
-| System.Text.RegularExpressions;RegexRunner;Scan;(System.Text.RegularExpressions.Regex,System.String,System.Int32,System.Int32,System.Int32,System.Int32,System.Boolean);Argument[this];ReturnValue;taint;df-generated |
-| System.Text.RegularExpressions;RegexRunner;Scan;(System.Text.RegularExpressions.Regex,System.String,System.Int32,System.Int32,System.Int32,System.Int32,System.Boolean,System.TimeSpan);Argument[0];Argument[this];taint;df-generated |
-| System.Text.RegularExpressions;RegexRunner;Scan;(System.Text.RegularExpressions.Regex,System.String,System.Int32,System.Int32,System.Int32,System.Int32,System.Boolean,System.TimeSpan);Argument[0];ReturnValue;taint;df-generated |
-| System.Text.RegularExpressions;RegexRunner;Scan;(System.Text.RegularExpressions.Regex,System.String,System.Int32,System.Int32,System.Int32,System.Int32,System.Boolean,System.TimeSpan);Argument[1];Argument[this];taint;df-generated |
-| System.Text.RegularExpressions;RegexRunner;Scan;(System.Text.RegularExpressions.Regex,System.String,System.Int32,System.Int32,System.Int32,System.Int32,System.Boolean,System.TimeSpan);Argument[this];ReturnValue;taint;df-generated |
+| System.Text.RegularExpressions;RegexRunner;Scan;(System.ReadOnlySpan<System.Char>);Argument[0];Argument[this];taint;df-generated |
+| System.Text.RegularExpressions;RegexRunner;Scan;(System.Text.RegularExpressions.Regex,System.String,System.Int32,System.Int32,System.Int32,System.Int32,System.Boolean);Argument[1];Argument[this].Field[System.Text.RegularExpressions.RegexRunner.runtext];value;dfc-generated |
+| System.Text.RegularExpressions;RegexRunner;Scan;(System.Text.RegularExpressions.Regex,System.String,System.Int32,System.Int32,System.Int32,System.Int32,System.Boolean);Argument[this].Field[System.Text.RegularExpressions.RegexRunner.runmatch];ReturnValue;value;dfc-generated |
+| System.Text.RegularExpressions;RegexRunner;Scan;(System.Text.RegularExpressions.Regex,System.String,System.Int32,System.Int32,System.Int32,System.Int32,System.Boolean,System.TimeSpan);Argument[1];Argument[this].Field[System.Text.RegularExpressions.RegexRunner.runtext];value;dfc-generated |
+| System.Text.RegularExpressions;RegexRunner;Scan;(System.Text.RegularExpressions.Regex,System.String,System.Int32,System.Int32,System.Int32,System.Int32,System.Boolean,System.TimeSpan);Argument[this].Field[System.Text.RegularExpressions.RegexRunner.runmatch];ReturnValue;value;dfc-generated |
 | System.Text.RegularExpressions;RegexRunnerFactory;CreateInstance;();Argument[this];ReturnValue;taint;df-generated |
 | System.Text.Unicode;Utf8+TryWriteInterpolatedStringHandler;TryWriteInterpolatedStringHandler;(System.Int32,System.Int32,System.Span<System.Byte>,System.Boolean);Argument[2];Argument[this];taint;df-generated |
 | System.Text.Unicode;Utf8+TryWriteInterpolatedStringHandler;TryWriteInterpolatedStringHandler;(System.Int32,System.Int32,System.Span<System.Byte>,System.IFormatProvider,System.Boolean);Argument[2];Argument[this];taint;df-generated |
 | System.Text.Unicode;Utf8+TryWriteInterpolatedStringHandler;TryWriteInterpolatedStringHandler;(System.Int32,System.Int32,System.Span<System.Byte>,System.IFormatProvider,System.Boolean);Argument[3];Argument[this];taint;df-generated |
+| System.Text.Unicode;Utf8;TryWrite;(System.Span<System.Byte>,System.IFormatProvider,System.Text.Unicode.Utf8+TryWriteInterpolatedStringHandler,System.Int32);Argument[2];ReturnValue;value;dfc-generated |
+| System.Text.Unicode;Utf8;TryWrite;(System.Span<System.Byte>,System.Text.Unicode.Utf8+TryWriteInterpolatedStringHandler,System.Int32);Argument[1];ReturnValue;value;dfc-generated |
 | System.Text;Decoder;get_FallbackBuffer;();Argument[this];ReturnValue;taint;df-generated |
 | System.Text;DecoderFallback;CreateFallbackBuffer;();Argument[this];ReturnValue;taint;df-generated |
-| System.Text;DecoderFallbackException;DecoderFallbackException;(System.String,System.Byte[],System.Int32);Argument[1].Element;Argument[this];taint;df-generated |
-| System.Text;DecoderFallbackException;get_BytesUnknown;();Argument[this];ReturnValue;taint;df-generated |
-| System.Text;DecoderReplacementFallback;DecoderReplacementFallback;(System.String);Argument[0];Argument[this];taint;df-generated |
-| System.Text;DecoderReplacementFallback;get_DefaultString;();Argument[this];ReturnValue;taint;df-generated |
+| System.Text;DecoderFallbackException;DecoderFallbackException;(System.String,System.Byte[],System.Int32);Argument[1];Argument[this].SyntheticField[System.Text.DecoderFallbackException._bytesUnknown];value;dfc-generated |
+| System.Text;DecoderFallbackException;get_BytesUnknown;();Argument[this].SyntheticField[System.Text.DecoderFallbackException._bytesUnknown];ReturnValue;value;dfc-generated |
+| System.Text;DecoderReplacementFallback;DecoderReplacementFallback;(System.String);Argument[0];Argument[this].SyntheticField[System.Text.DecoderReplacementFallback._strDefault];value;dfc-generated |
+| System.Text;DecoderReplacementFallback;get_DefaultString;();Argument[this].SyntheticField[System.Text.DecoderReplacementFallback._strDefault];ReturnValue;value;dfc-generated |
 | System.Text;DecoderReplacementFallbackBuffer;DecoderReplacementFallbackBuffer;(System.Text.DecoderReplacementFallback);Argument[0];Argument[this];taint;df-generated |
 | System.Text;Encoder;get_FallbackBuffer;();Argument[this];ReturnValue;taint;df-generated |
 | System.Text;EncoderFallback;CreateFallbackBuffer;();Argument[this];ReturnValue;taint;df-generated |
-| System.Text;EncoderReplacementFallback;EncoderReplacementFallback;(System.String);Argument[0];Argument[this];taint;df-generated |
-| System.Text;EncoderReplacementFallback;get_DefaultString;();Argument[this];ReturnValue;taint;df-generated |
+| System.Text;EncoderReplacementFallback;EncoderReplacementFallback;(System.String);Argument[0];Argument[this].SyntheticField[System.Text.EncoderReplacementFallback._strDefault];value;dfc-generated |
+| System.Text;EncoderReplacementFallback;get_DefaultString;();Argument[this].SyntheticField[System.Text.EncoderReplacementFallback._strDefault];ReturnValue;value;dfc-generated |
 | System.Text;EncoderReplacementFallbackBuffer;EncoderReplacementFallbackBuffer;(System.Text.EncoderReplacementFallback);Argument[0];Argument[this];taint;df-generated |
 | System.Text;Encoding;Convert;(System.Text.Encoding,System.Text.Encoding,System.Byte[]);Argument[2].Element;ReturnValue;taint;df-generated |
 | System.Text;Encoding;Convert;(System.Text.Encoding,System.Text.Encoding,System.Byte[],System.Int32,System.Int32);Argument[2].Element;ReturnValue;taint;df-generated |
@@ -11939,16 +12767,17 @@
 | System.Text;Encoding;get_EncodingName;();Argument[this];ReturnValue;taint;df-generated |
 | System.Text;Encoding;get_HeaderName;();Argument[this];ReturnValue;taint;df-generated |
 | System.Text;Encoding;get_WebName;();Argument[this];ReturnValue;taint;df-generated |
-| System.Text;EncodingExtensions;GetString;(System.Text.Encoding,System.Buffers.ReadOnlySequence<System.Byte>);Argument[1];ReturnValue;taint;df-generated |
+| System.Text;EncodingExtensions;GetString;(System.Text.Encoding,System.Buffers.ReadOnlySequence<System.Byte>);Argument[1].Property[System.Buffers.ReadOnlySequence`1.FirstSpan].Element;ReturnValue;taint;dfc-generated |
 | System.Text;EncodingInfo;EncodingInfo;(System.Text.EncodingProvider,System.Int32,System.String,System.String);Argument[0];Argument[this];taint;df-generated |
 | System.Text;EncodingProvider;GetEncoding;(System.Int32,System.Text.EncoderFallback,System.Text.DecoderFallback);Argument[1];ReturnValue;taint;df-generated |
 | System.Text;EncodingProvider;GetEncoding;(System.Int32,System.Text.EncoderFallback,System.Text.DecoderFallback);Argument[2];ReturnValue;taint;df-generated |
 | System.Text;EncodingProvider;GetEncoding;(System.String,System.Text.EncoderFallback,System.Text.DecoderFallback);Argument[1];ReturnValue;taint;df-generated |
 | System.Text;EncodingProvider;GetEncoding;(System.String,System.Text.EncoderFallback,System.Text.DecoderFallback);Argument[2];ReturnValue;taint;df-generated |
-| System.Text;EncodingProvider;GetEncodings;();Argument[this];ReturnValue;taint;df-generated |
-| System.Text;SpanLineEnumerator;GetEnumerator;();Argument[this];ReturnValue;value;df-generated |
-| System.Text;SpanLineEnumerator;get_Current;();Argument[this];ReturnValue;taint;df-generated |
-| System.Text;SpanRuneEnumerator;GetEnumerator;();Argument[this];ReturnValue;value;df-generated |
+| System.Text;SpanLineEnumerator;GetEnumerator;();Argument[this];ReturnValue;value;dfc-generated |
+| System.Text;SpanLineEnumerator;MoveNext;();Argument[this].SyntheticField[System.Text.SpanLineEnumerator._remaining].Element;Argument[this].SyntheticField[System.Text.SpanLineEnumerator._current].Element;value;dfc-generated |
+| System.Text;SpanLineEnumerator;MoveNext;();Argument[this].SyntheticField[System.Text.SpanLineEnumerator._remaining];Argument[this].SyntheticField[System.Text.SpanLineEnumerator._current];value;dfc-generated |
+| System.Text;SpanLineEnumerator;get_Current;();Argument[this].SyntheticField[System.Text.SpanLineEnumerator._current];ReturnValue;value;dfc-generated |
+| System.Text;SpanRuneEnumerator;GetEnumerator;();Argument[this];ReturnValue;value;dfc-generated |
 | System.Text;SpanRuneEnumerator;get_Current;();Argument[this];ReturnValue;taint;df-generated |
 | System.Text;StringBuilder+AppendInterpolatedStringHandler;AppendFormatted;(System.String);Argument[0];Argument[this];taint;df-generated |
 | System.Text;StringBuilder+AppendInterpolatedStringHandler;AppendFormatted<T>;(T);Argument[0];Argument[this];taint;df-generated |
@@ -11957,7 +12786,7 @@
 | System.Text;StringBuilder+AppendInterpolatedStringHandler;AppendInterpolatedStringHandler;(System.Int32,System.Int32,System.Text.StringBuilder,System.IFormatProvider);Argument[2];Argument[this];taint;df-generated |
 | System.Text;StringBuilder+AppendInterpolatedStringHandler;AppendInterpolatedStringHandler;(System.Int32,System.Int32,System.Text.StringBuilder,System.IFormatProvider);Argument[3];Argument[this];taint;df-generated |
 | System.Text;StringBuilder+AppendInterpolatedStringHandler;AppendLiteral;(System.String);Argument[0];Argument[this];taint;df-generated |
-| System.Text;StringBuilder+ChunkEnumerator;GetEnumerator;();Argument[this];ReturnValue;value;df-generated |
+| System.Text;StringBuilder+ChunkEnumerator;GetEnumerator;();Argument[this];ReturnValue;value;dfc-generated |
 | System.Text;StringBuilder+ChunkEnumerator;get_Current;();Argument[this];ReturnValue;taint;df-generated |
 | System.Text;StringBuilder;Append;(System.Boolean);Argument[this];ReturnValue;value;manual |
 | System.Text;StringBuilder;Append;(System.Byte);Argument[this];ReturnValue;value;manual |
@@ -12009,12 +12838,8 @@
 | System.Text;StringBuilder;AppendFormat;(System.IFormatProvider,System.String,System.Object[]);Argument[1];Argument[this];taint;manual |
 | System.Text;StringBuilder;AppendFormat;(System.IFormatProvider,System.String,System.Object[]);Argument[2].Element;Argument[this];taint;manual |
 | System.Text;StringBuilder;AppendFormat;(System.IFormatProvider,System.String,System.Object[]);Argument[this];ReturnValue;value;manual |
-| System.Text;StringBuilder;AppendFormat;(System.IFormatProvider,System.Text.CompositeFormat,System.Object[]);Argument[0];Argument[this];taint;df-generated |
-| System.Text;StringBuilder;AppendFormat;(System.IFormatProvider,System.Text.CompositeFormat,System.Object[]);Argument[0];ReturnValue;taint;df-generated |
-| System.Text;StringBuilder;AppendFormat;(System.IFormatProvider,System.Text.CompositeFormat,System.Object[]);Argument[this];ReturnValue;taint;df-generated |
-| System.Text;StringBuilder;AppendFormat;(System.IFormatProvider,System.Text.CompositeFormat,System.ReadOnlySpan<System.Object>);Argument[0];Argument[this];taint;df-generated |
-| System.Text;StringBuilder;AppendFormat;(System.IFormatProvider,System.Text.CompositeFormat,System.ReadOnlySpan<System.Object>);Argument[0];ReturnValue;taint;df-generated |
-| System.Text;StringBuilder;AppendFormat;(System.IFormatProvider,System.Text.CompositeFormat,System.ReadOnlySpan<System.Object>);Argument[this];ReturnValue;taint;df-generated |
+| System.Text;StringBuilder;AppendFormat;(System.IFormatProvider,System.Text.CompositeFormat,System.Object[]);Argument[this];ReturnValue;value;dfc-generated |
+| System.Text;StringBuilder;AppendFormat;(System.IFormatProvider,System.Text.CompositeFormat,System.ReadOnlySpan<System.Object>);Argument[this];ReturnValue;value;dfc-generated |
 | System.Text;StringBuilder;AppendFormat;(System.String,System.Object);Argument[0];Argument[this];taint;manual |
 | System.Text;StringBuilder;AppendFormat;(System.String,System.Object);Argument[1];Argument[this];taint;manual |
 | System.Text;StringBuilder;AppendFormat;(System.String,System.Object);Argument[this];ReturnValue;value;manual |
@@ -12030,15 +12855,9 @@
 | System.Text;StringBuilder;AppendFormat;(System.String,System.Object[]);Argument[0];Argument[this];taint;manual |
 | System.Text;StringBuilder;AppendFormat;(System.String,System.Object[]);Argument[1].Element;Argument[this];taint;manual |
 | System.Text;StringBuilder;AppendFormat;(System.String,System.Object[]);Argument[this];ReturnValue;value;manual |
-| System.Text;StringBuilder;AppendFormat<TArg0,TArg1,TArg2>;(System.IFormatProvider,System.Text.CompositeFormat,TArg0,TArg1,TArg2);Argument[0];Argument[this];taint;df-generated |
-| System.Text;StringBuilder;AppendFormat<TArg0,TArg1,TArg2>;(System.IFormatProvider,System.Text.CompositeFormat,TArg0,TArg1,TArg2);Argument[0];ReturnValue;taint;df-generated |
-| System.Text;StringBuilder;AppendFormat<TArg0,TArg1,TArg2>;(System.IFormatProvider,System.Text.CompositeFormat,TArg0,TArg1,TArg2);Argument[this];ReturnValue;taint;df-generated |
-| System.Text;StringBuilder;AppendFormat<TArg0,TArg1>;(System.IFormatProvider,System.Text.CompositeFormat,TArg0,TArg1);Argument[0];Argument[this];taint;df-generated |
-| System.Text;StringBuilder;AppendFormat<TArg0,TArg1>;(System.IFormatProvider,System.Text.CompositeFormat,TArg0,TArg1);Argument[0];ReturnValue;taint;df-generated |
-| System.Text;StringBuilder;AppendFormat<TArg0,TArg1>;(System.IFormatProvider,System.Text.CompositeFormat,TArg0,TArg1);Argument[this];ReturnValue;taint;df-generated |
-| System.Text;StringBuilder;AppendFormat<TArg0>;(System.IFormatProvider,System.Text.CompositeFormat,TArg0);Argument[0];Argument[this];taint;df-generated |
-| System.Text;StringBuilder;AppendFormat<TArg0>;(System.IFormatProvider,System.Text.CompositeFormat,TArg0);Argument[0];ReturnValue;taint;df-generated |
-| System.Text;StringBuilder;AppendFormat<TArg0>;(System.IFormatProvider,System.Text.CompositeFormat,TArg0);Argument[this];ReturnValue;taint;df-generated |
+| System.Text;StringBuilder;AppendFormat<TArg0,TArg1,TArg2>;(System.IFormatProvider,System.Text.CompositeFormat,TArg0,TArg1,TArg2);Argument[this];ReturnValue;value;dfc-generated |
+| System.Text;StringBuilder;AppendFormat<TArg0,TArg1>;(System.IFormatProvider,System.Text.CompositeFormat,TArg0,TArg1);Argument[this];ReturnValue;value;dfc-generated |
+| System.Text;StringBuilder;AppendFormat<TArg0>;(System.IFormatProvider,System.Text.CompositeFormat,TArg0);Argument[this];ReturnValue;value;dfc-generated |
 | System.Text;StringBuilder;AppendJoin;(System.Char,System.Object[]);Argument[1].Element;Argument[this];taint;manual |
 | System.Text;StringBuilder;AppendJoin;(System.Char,System.Object[]);Argument[this];ReturnValue;value;manual |
 | System.Text;StringBuilder;AppendJoin;(System.Char,System.String[]);Argument[1].Element;Argument[this];taint;manual |
@@ -12061,44 +12880,45 @@
 | System.Text;StringBuilder;AppendLine;(System.String);Argument[this];ReturnValue;value;manual |
 | System.Text;StringBuilder;AppendLine;(System.Text.StringBuilder+AppendInterpolatedStringHandler);Argument[0];Argument[this];taint;manual |
 | System.Text;StringBuilder;AppendLine;(System.Text.StringBuilder+AppendInterpolatedStringHandler);Argument[this];ReturnValue;value;manual |
-| System.Text;StringBuilder;Clear;();Argument[this];ReturnValue;value;df-generated |
+| System.Text;StringBuilder;Clear;();Argument[this];ReturnValue;value;dfc-generated |
 | System.Text;StringBuilder;GetChunks;();Argument[this];ReturnValue;taint;df-generated |
-| System.Text;StringBuilder;Insert;(System.Int32,System.Boolean);Argument[this];ReturnValue;taint;df-generated |
-| System.Text;StringBuilder;Insert;(System.Int32,System.Byte);Argument[this];ReturnValue;taint;df-generated |
-| System.Text;StringBuilder;Insert;(System.Int32,System.Char);Argument[this];ReturnValue;value;df-generated |
-| System.Text;StringBuilder;Insert;(System.Int32,System.Char[]);Argument[this];ReturnValue;value;df-generated |
-| System.Text;StringBuilder;Insert;(System.Int32,System.Char[],System.Int32,System.Int32);Argument[this];ReturnValue;value;df-generated |
-| System.Text;StringBuilder;Insert;(System.Int32,System.Decimal);Argument[this];ReturnValue;taint;df-generated |
-| System.Text;StringBuilder;Insert;(System.Int32,System.Double);Argument[this];ReturnValue;taint;df-generated |
-| System.Text;StringBuilder;Insert;(System.Int32,System.Int16);Argument[this];ReturnValue;taint;df-generated |
-| System.Text;StringBuilder;Insert;(System.Int32,System.Int32);Argument[this];ReturnValue;taint;df-generated |
-| System.Text;StringBuilder;Insert;(System.Int32,System.Int64);Argument[this];ReturnValue;taint;df-generated |
-| System.Text;StringBuilder;Insert;(System.Int32,System.Object);Argument[this];ReturnValue;taint;df-generated |
-| System.Text;StringBuilder;Insert;(System.Int32,System.ReadOnlySpan<System.Char>);Argument[this];ReturnValue;value;df-generated |
-| System.Text;StringBuilder;Insert;(System.Int32,System.SByte);Argument[this];ReturnValue;taint;df-generated |
-| System.Text;StringBuilder;Insert;(System.Int32,System.Single);Argument[this];ReturnValue;taint;df-generated |
-| System.Text;StringBuilder;Insert;(System.Int32,System.String);Argument[this];ReturnValue;value;df-generated |
-| System.Text;StringBuilder;Insert;(System.Int32,System.String,System.Int32);Argument[this];ReturnValue;taint;df-generated |
-| System.Text;StringBuilder;Insert;(System.Int32,System.UInt16);Argument[this];ReturnValue;taint;df-generated |
-| System.Text;StringBuilder;Insert;(System.Int32,System.UInt32);Argument[this];ReturnValue;taint;df-generated |
-| System.Text;StringBuilder;Insert;(System.Int32,System.UInt64);Argument[this];ReturnValue;taint;df-generated |
-| System.Text;StringBuilder;Remove;(System.Int32,System.Int32);Argument[this];ReturnValue;value;df-generated |
-| System.Text;StringBuilder;Replace;(System.Char,System.Char);Argument[this];ReturnValue;taint;df-generated |
-| System.Text;StringBuilder;Replace;(System.Char,System.Char,System.Int32,System.Int32);Argument[this];ReturnValue;value;df-generated |
-| System.Text;StringBuilder;Replace;(System.String,System.String);Argument[this];ReturnValue;taint;df-generated |
-| System.Text;StringBuilder;Replace;(System.String,System.String,System.Int32,System.Int32);Argument[this];ReturnValue;taint;df-generated |
+| System.Text;StringBuilder;GetObjectData;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);Argument[this];Argument[0].SyntheticField[System.Runtime.Serialization.SerializationInfo._values].Element;taint;df-generated |
+| System.Text;StringBuilder;GetObjectData;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);Argument[this];Argument[0].SyntheticField[System.Runtime.Serialization.SerializationInfo._values].Element;taint;dfc-generated |
+| System.Text;StringBuilder;Insert;(System.Int32,System.Boolean);Argument[this];ReturnValue;value;dfc-generated |
+| System.Text;StringBuilder;Insert;(System.Int32,System.Byte);Argument[this];ReturnValue;value;dfc-generated |
+| System.Text;StringBuilder;Insert;(System.Int32,System.Char);Argument[this];ReturnValue;value;dfc-generated |
+| System.Text;StringBuilder;Insert;(System.Int32,System.Char[]);Argument[this];ReturnValue;value;dfc-generated |
+| System.Text;StringBuilder;Insert;(System.Int32,System.Char[],System.Int32,System.Int32);Argument[this];ReturnValue;value;dfc-generated |
+| System.Text;StringBuilder;Insert;(System.Int32,System.Decimal);Argument[this];ReturnValue;value;dfc-generated |
+| System.Text;StringBuilder;Insert;(System.Int32,System.Double);Argument[this];ReturnValue;value;dfc-generated |
+| System.Text;StringBuilder;Insert;(System.Int32,System.Int16);Argument[this];ReturnValue;value;dfc-generated |
+| System.Text;StringBuilder;Insert;(System.Int32,System.Int32);Argument[this];ReturnValue;value;dfc-generated |
+| System.Text;StringBuilder;Insert;(System.Int32,System.Int64);Argument[this];ReturnValue;value;dfc-generated |
+| System.Text;StringBuilder;Insert;(System.Int32,System.Object);Argument[this];ReturnValue;value;dfc-generated |
+| System.Text;StringBuilder;Insert;(System.Int32,System.ReadOnlySpan<System.Char>);Argument[this];ReturnValue;value;dfc-generated |
+| System.Text;StringBuilder;Insert;(System.Int32,System.SByte);Argument[this];ReturnValue;value;dfc-generated |
+| System.Text;StringBuilder;Insert;(System.Int32,System.Single);Argument[this];ReturnValue;value;dfc-generated |
+| System.Text;StringBuilder;Insert;(System.Int32,System.String);Argument[this];ReturnValue;value;dfc-generated |
+| System.Text;StringBuilder;Insert;(System.Int32,System.String,System.Int32);Argument[this];ReturnValue;value;dfc-generated |
+| System.Text;StringBuilder;Insert;(System.Int32,System.UInt16);Argument[this];ReturnValue;value;dfc-generated |
+| System.Text;StringBuilder;Insert;(System.Int32,System.UInt32);Argument[this];ReturnValue;value;dfc-generated |
+| System.Text;StringBuilder;Insert;(System.Int32,System.UInt64);Argument[this];ReturnValue;value;dfc-generated |
+| System.Text;StringBuilder;Remove;(System.Int32,System.Int32);Argument[this];ReturnValue;value;dfc-generated |
+| System.Text;StringBuilder;Replace;(System.Char,System.Char);Argument[this];ReturnValue;value;dfc-generated |
+| System.Text;StringBuilder;Replace;(System.Char,System.Char,System.Int32,System.Int32);Argument[this];ReturnValue;value;dfc-generated |
+| System.Text;StringBuilder;Replace;(System.String,System.String);Argument[this];ReturnValue;value;dfc-generated |
+| System.Text;StringBuilder;Replace;(System.String,System.String,System.Int32,System.Int32);Argument[this];ReturnValue;value;dfc-generated |
 | System.Text;StringBuilder;StringBuilder;(System.String);Argument[0];Argument[this];taint;manual |
 | System.Text;StringBuilder;StringBuilder;(System.String,System.Int32);Argument[0];Argument[this];taint;manual |
 | System.Text;StringBuilder;StringBuilder;(System.String,System.Int32,System.Int32,System.Int32);Argument[0];Argument[this];taint;manual |
 | System.Text;StringBuilder;ToString;();Argument[this];ReturnValue;taint;manual |
 | System.Text;StringBuilder;ToString;(System.Int32,System.Int32);Argument[this];ReturnValue;taint;manual |
-| System.Text;StringRuneEnumerator;GetEnumerator;();Argument[this];ReturnValue;value;df-generated |
+| System.Text;StringRuneEnumerator;GetEnumerator;();Argument[this];ReturnValue;value;dfc-generated |
 | System.Text;StringRuneEnumerator;get_Current;();Argument[this];ReturnValue;taint;df-generated |
 | System.Threading.Channels;Channel;CreateBounded<T>;(System.Threading.Channels.BoundedChannelOptions,System.Action<T>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
-| System.Threading.RateLimiting;MetadataName;Create<T>;(System.String);Argument[0];ReturnValue;taint;df-generated |
-| System.Threading.RateLimiting;MetadataName<T>;MetadataName;(System.String);Argument[0];Argument[this];taint;df-generated |
-| System.Threading.RateLimiting;MetadataName<T>;ToString;();Argument[this];ReturnValue;taint;df-generated |
-| System.Threading.RateLimiting;MetadataName<T>;get_Name;();Argument[this];ReturnValue;taint;df-generated |
+| System.Threading.RateLimiting;MetadataName<T>;MetadataName;(System.String);Argument[0];Argument[this].SyntheticField[System.Threading.RateLimiting.MetadataName`1._name];value;dfc-generated |
+| System.Threading.RateLimiting;MetadataName<T>;ToString;();Argument[this].SyntheticField[System.Threading.RateLimiting.MetadataName`1._name];ReturnValue;value;dfc-generated |
+| System.Threading.RateLimiting;MetadataName<T>;get_Name;();Argument[this].SyntheticField[System.Threading.RateLimiting.MetadataName`1._name];ReturnValue;value;dfc-generated |
 | System.Threading.RateLimiting;PartitionedRateLimiter;Create<TResource,TPartitionKey>;(System.Func<TResource,System.Threading.RateLimiting.RateLimitPartition<TPartitionKey>>,System.Collections.Generic.IEqualityComparer<TPartitionKey>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Threading.RateLimiting;PartitionedRateLimiter;CreateChained<TResource>;(System.Threading.RateLimiting.PartitionedRateLimiter<TResource>[]);Argument[0].Element;ReturnValue;taint;df-generated |
 | System.Threading.RateLimiting;PartitionedRateLimiter<TResource>;WithTranslatedKey<TOuter>;(System.Func<TOuter,TResource>,System.Boolean);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
@@ -12112,8 +12932,6 @@
 | System.Threading.RateLimiting;RateLimitPartition;GetSlidingWindowLimiter<TKey>;(TKey,System.Func<TKey,System.Threading.RateLimiting.SlidingWindowRateLimiterOptions>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
 | System.Threading.RateLimiting;RateLimitPartition;GetTokenBucketLimiter<TKey>;(TKey,System.Func<TKey,System.Threading.RateLimiting.TokenBucketRateLimiterOptions>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
 | System.Threading.RateLimiting;RateLimitPartition<TKey>;RateLimitPartition;(TKey,System.Func<TKey,System.Threading.RateLimiting.RateLimiter>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
-| System.Threading.RateLimiting;RateLimiter;AcquireAsync;(System.Int32,System.Threading.CancellationToken);Argument[this];ReturnValue;taint;df-generated |
-| System.Threading.RateLimiting;RateLimiter;AcquireAsyncCore;(System.Int32,System.Threading.CancellationToken);Argument[this];ReturnValue;taint;df-generated |
 | System.Threading.RateLimiting;RateLimiter;AttemptAcquire;(System.Int32);Argument[this];ReturnValue;taint;df-generated |
 | System.Threading.RateLimiting;RateLimiter;AttemptAcquireCore;(System.Int32);Argument[this];ReturnValue;taint;df-generated |
 | System.Threading.RateLimiting;ReplenishingRateLimiter;get_ReplenishmentPeriod;();Argument[this];ReturnValue;taint;df-generated |
@@ -12149,7 +12967,6 @@
 | System.Threading.Tasks.Dataflow;BufferBlock<T>;LinkTo;(System.Threading.Tasks.Dataflow.ITargetBlock<T>,System.Threading.Tasks.Dataflow.DataflowLinkOptions);Argument[0];ReturnValue;taint;df-generated |
 | System.Threading.Tasks.Dataflow;BufferBlock<T>;LinkTo;(System.Threading.Tasks.Dataflow.ITargetBlock<T>,System.Threading.Tasks.Dataflow.DataflowLinkOptions);Argument[this];ReturnValue;taint;df-generated |
 | System.Threading.Tasks.Dataflow;BufferBlock<T>;ReserveMessage;(System.Threading.Tasks.Dataflow.DataflowMessageHeader,System.Threading.Tasks.Dataflow.ITargetBlock<T>);Argument[1];Argument[this];taint;df-generated |
-| System.Threading.Tasks.Dataflow;DataflowBlock;AsObservable<TOutput>;(System.Threading.Tasks.Dataflow.ISourceBlock<TOutput>);Argument[0];ReturnValue;taint;df-generated |
 | System.Threading.Tasks.Dataflow;DataflowBlock;AsObserver<TInput>;(System.Threading.Tasks.Dataflow.ITargetBlock<TInput>);Argument[0];ReturnValue;taint;df-generated |
 | System.Threading.Tasks.Dataflow;DataflowBlock;Choose<T1,T2,T3>;(System.Threading.Tasks.Dataflow.ISourceBlock<T1>,System.Action<T1>,System.Threading.Tasks.Dataflow.ISourceBlock<T2>,System.Action<T2>,System.Threading.Tasks.Dataflow.ISourceBlock<T3>,System.Action<T3>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
 | System.Threading.Tasks.Dataflow;DataflowBlock;Choose<T1,T2,T3>;(System.Threading.Tasks.Dataflow.ISourceBlock<T1>,System.Action<T1>,System.Threading.Tasks.Dataflow.ISourceBlock<T2>,System.Action<T2>,System.Threading.Tasks.Dataflow.ISourceBlock<T3>,System.Action<T3>);Argument[3];Argument[3].Parameter[delegate-self];value;hq-generated |
@@ -12181,6 +12998,7 @@
 | System.Threading.Tasks.Dataflow;DataflowBlock;SendAsync<TInput>;(System.Threading.Tasks.Dataflow.ITargetBlock<TInput>,TInput);Argument[1];Argument[0];taint;df-generated |
 | System.Threading.Tasks.Dataflow;DataflowBlock;SendAsync<TInput>;(System.Threading.Tasks.Dataflow.ITargetBlock<TInput>,TInput,System.Threading.CancellationToken);Argument[1];Argument[0];taint;df-generated |
 | System.Threading.Tasks.Dataflow;DataflowBlock;TryReceive<TOutput>;(System.Threading.Tasks.Dataflow.IReceivableSourceBlock<TOutput>,TOutput);Argument[0];ReturnValue;taint;df-generated |
+| System.Threading.Tasks.Dataflow;IDataflowBlock;Fault;(System.Exception);Argument[0];Argument[this];taint;df-generated |
 | System.Threading.Tasks.Dataflow;IDataflowBlock;get_Completion;();Argument[this];ReturnValue;taint;df-generated |
 | System.Threading.Tasks.Dataflow;IReceivableSourceBlock<TOutput>;TryReceive;(System.Predicate<TOutput>,TOutput);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Threading.Tasks.Dataflow;JoinBlock<T1,T2,T3>;JoinBlock;(System.Threading.Tasks.Dataflow.GroupingDataflowBlockOptions);Argument[0];Argument[this];taint;df-generated |
@@ -12212,22 +13030,25 @@
 | System.Threading.Tasks.Dataflow;TransformManyBlock<TInput,TOutput>;TransformManyBlock;(System.Func<TInput,System.Collections.Generic.IEnumerable<TOutput>>,System.Threading.Tasks.Dataflow.ExecutionDataflowBlockOptions);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Threading.Tasks.Dataflow;TransformManyBlock<TInput,TOutput>;TransformManyBlock;(System.Func<TInput,System.Threading.Tasks.Task<System.Collections.Generic.IEnumerable<TOutput>>>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Threading.Tasks.Dataflow;TransformManyBlock<TInput,TOutput>;TransformManyBlock;(System.Func<TInput,System.Threading.Tasks.Task<System.Collections.Generic.IEnumerable<TOutput>>>,System.Threading.Tasks.Dataflow.ExecutionDataflowBlockOptions);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
-| System.Threading.Tasks.Dataflow;WriteOnceBlock<T>;ConsumeMessage;(System.Threading.Tasks.Dataflow.DataflowMessageHeader,System.Threading.Tasks.Dataflow.ITargetBlock<T>,System.Boolean);Argument[this];ReturnValue;taint;df-generated |
+| System.Threading.Tasks.Dataflow;WriteOnceBlock<T>;ConsumeMessage;(System.Threading.Tasks.Dataflow.DataflowMessageHeader,System.Threading.Tasks.Dataflow.ITargetBlock<T>,System.Boolean);Argument[this].SyntheticField[System.Threading.Tasks.Dataflow.WriteOnceBlock`1._value];ReturnValue;value;dfc-generated |
 | System.Threading.Tasks.Dataflow;WriteOnceBlock<T>;LinkTo;(System.Threading.Tasks.Dataflow.ITargetBlock<T>,System.Threading.Tasks.Dataflow.DataflowLinkOptions);Argument[0];ReturnValue;taint;df-generated |
 | System.Threading.Tasks.Dataflow;WriteOnceBlock<T>;LinkTo;(System.Threading.Tasks.Dataflow.ITargetBlock<T>,System.Threading.Tasks.Dataflow.DataflowLinkOptions);Argument[this];Argument[0];taint;df-generated |
 | System.Threading.Tasks.Dataflow;WriteOnceBlock<T>;LinkTo;(System.Threading.Tasks.Dataflow.ITargetBlock<T>,System.Threading.Tasks.Dataflow.DataflowLinkOptions);Argument[this];ReturnValue;taint;df-generated |
-| System.Threading.Tasks.Dataflow;WriteOnceBlock<T>;OfferMessage;(System.Threading.Tasks.Dataflow.DataflowMessageHeader,T,System.Threading.Tasks.Dataflow.ISourceBlock<T>,System.Boolean);Argument[1];Argument[this];taint;df-generated |
+| System.Threading.Tasks.Dataflow;WriteOnceBlock<T>;OfferMessage;(System.Threading.Tasks.Dataflow.DataflowMessageHeader,T,System.Threading.Tasks.Dataflow.ISourceBlock<T>,System.Boolean);Argument[1];Argument[this].SyntheticField[System.Threading.Tasks.Dataflow.WriteOnceBlock`1._value];value;dfc-generated |
 | System.Threading.Tasks.Dataflow;WriteOnceBlock<T>;ReleaseReservation;(System.Threading.Tasks.Dataflow.DataflowMessageHeader,System.Threading.Tasks.Dataflow.ITargetBlock<T>);Argument[this];Argument[1];taint;df-generated |
 | System.Threading.Tasks.Dataflow;WriteOnceBlock<T>;ToString;();Argument[this];ReturnValue;taint;df-generated |
-| System.Threading.Tasks.Dataflow;WriteOnceBlock<T>;TryReceiveAll;(System.Collections.Generic.IList<T>);Argument[this];ReturnValue;taint;df-generated |
+| System.Threading.Tasks.Dataflow;WriteOnceBlock<T>;TryReceiveAll;(System.Collections.Generic.IList<T>);Argument[this].SyntheticField[System.Threading.Tasks.Dataflow.WriteOnceBlock`1._value];ReturnValue.Element;value;dfc-generated |
 | System.Threading.Tasks.Dataflow;WriteOnceBlock<T>;WriteOnceBlock;(System.Func<T,T>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
+| System.Threading.Tasks.Dataflow;WriteOnceBlock<T>;WriteOnceBlock;(System.Func<T,T>,System.Threading.Tasks.Dataflow.DataflowBlockOptions);Argument[0];Argument[0].Parameter[delegate-self];value;dfc-generated |
 | System.Threading.Tasks.Dataflow;WriteOnceBlock<T>;WriteOnceBlock;(System.Func<T,T>,System.Threading.Tasks.Dataflow.DataflowBlockOptions);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
+| System.Threading.Tasks.Dataflow;WriteOnceBlock<T>;WriteOnceBlock;(System.Func<T,T>,System.Threading.Tasks.Dataflow.DataflowBlockOptions);Argument[0];Argument[this].SyntheticField[System.Threading.Tasks.Dataflow.WriteOnceBlock`1._cloningFunction];value;dfc-generated |
+| System.Threading.Tasks.Dataflow;WriteOnceBlock<T>;WriteOnceBlock;(System.Func<T,T>,System.Threading.Tasks.Dataflow.DataflowBlockOptions);Argument[0];Argument[this].SyntheticField[System.Threading.Tasks.Dataflow.WriteOnceBlock`1._cloningFunction];value;hq-generated |
 | System.Threading.Tasks.Sources;IValueTaskSource;OnCompleted;(System.Action<System.Object>,System.Object,System.Int16,System.Threading.Tasks.Sources.ValueTaskSourceOnCompletedFlags);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Threading.Tasks.Sources;IValueTaskSource<TResult>;OnCompleted;(System.Action<System.Object>,System.Object,System.Int16,System.Threading.Tasks.Sources.ValueTaskSourceOnCompletedFlags);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
-| System.Threading.Tasks.Sources;ManualResetValueTaskSourceCore<TResult>;GetResult;(System.Int16);Argument[this];ReturnValue;taint;df-generated |
+| System.Threading.Tasks.Sources;ManualResetValueTaskSourceCore<TResult>;GetResult;(System.Int16);Argument[this].SyntheticField[System.Threading.Tasks.Sources.ManualResetValueTaskSourceCore`1._result];ReturnValue;value;dfc-generated |
 | System.Threading.Tasks.Sources;ManualResetValueTaskSourceCore<TResult>;OnCompleted;(System.Action<System.Object>,System.Object,System.Int16,System.Threading.Tasks.Sources.ValueTaskSourceOnCompletedFlags);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Threading.Tasks.Sources;ManualResetValueTaskSourceCore<TResult>;SetException;(System.Exception);Argument[0];Argument[this];taint;df-generated |
-| System.Threading.Tasks.Sources;ManualResetValueTaskSourceCore<TResult>;SetResult;(TResult);Argument[0];Argument[this];taint;df-generated |
+| System.Threading.Tasks.Sources;ManualResetValueTaskSourceCore<TResult>;SetResult;(TResult);Argument[0];Argument[this].SyntheticField[System.Threading.Tasks.Sources.ManualResetValueTaskSourceCore`1._result];value;dfc-generated |
 | System.Threading.Tasks;ConcurrentExclusiveSchedulerPair;ConcurrentExclusiveSchedulerPair;(System.Threading.Tasks.TaskScheduler,System.Int32,System.Int32);Argument[0];Argument[this];taint;df-generated |
 | System.Threading.Tasks;ConcurrentExclusiveSchedulerPair;get_ConcurrentScheduler;();Argument[this];ReturnValue;taint;df-generated |
 | System.Threading.Tasks;ConcurrentExclusiveSchedulerPair;get_ExclusiveScheduler;();Argument[this];ReturnValue;taint;df-generated |
@@ -12381,13 +13202,15 @@
 | System.Threading.Tasks;Task;WhenAll<TResult>;(System.Collections.Generic.IEnumerable<System.Threading.Tasks.Task<TResult>>);Argument[0].Element.Property[System.Threading.Tasks.Task`1.Result];ReturnValue.Property[System.Threading.Tasks.Task`1.Result].Element;value;manual |
 | System.Threading.Tasks;Task;WhenAll<TResult>;(System.Threading.Tasks.Task<TResult>[]);Argument[0].Element.Property[System.Threading.Tasks.Task`1.Result];ReturnValue.Property[System.Threading.Tasks.Task`1.Result].Element;value;manual |
 | System.Threading.Tasks;Task;WhenAny;(System.Collections.Generic.IEnumerable<System.Threading.Tasks.Task>);Argument[0].Element;ReturnValue;taint;df-generated |
-| System.Threading.Tasks;Task;WhenAny;(System.Threading.Tasks.Task,System.Threading.Tasks.Task);Argument[0];ReturnValue;taint;df-generated |
-| System.Threading.Tasks;Task;WhenAny;(System.Threading.Tasks.Task,System.Threading.Tasks.Task);Argument[1];ReturnValue;taint;df-generated |
+| System.Threading.Tasks;Task;WhenAny;(System.Threading.Tasks.Task,System.Threading.Tasks.Task);Argument[0];ReturnValue.Property[System.Threading.Tasks.Task`1.Result];value;dfc-generated |
+| System.Threading.Tasks;Task;WhenAny;(System.Threading.Tasks.Task,System.Threading.Tasks.Task);Argument[1];ReturnValue.Property[System.Threading.Tasks.Task`1.Result];value;dfc-generated |
 | System.Threading.Tasks;Task;WhenAny;(System.Threading.Tasks.Task[]);Argument[0].Element;ReturnValue;taint;df-generated |
 | System.Threading.Tasks;Task;WhenAny<TResult>;(System.Collections.Generic.IEnumerable<System.Threading.Tasks.Task<TResult>>);Argument[0].Element.Property[System.Threading.Tasks.Task`1.Result];ReturnValue.Property[System.Threading.Tasks.Task`1.Result].Element;value;manual |
 | System.Threading.Tasks;Task;WhenAny<TResult>;(System.Threading.Tasks.Task<TResult>,System.Threading.Tasks.Task<TResult>);Argument[0].Element.Property[System.Threading.Tasks.Task`1.Result];ReturnValue.Property[System.Threading.Tasks.Task`1.Result].Element;value;manual |
 | System.Threading.Tasks;Task;WhenAny<TResult>;(System.Threading.Tasks.Task<TResult>,System.Threading.Tasks.Task<TResult>);Argument[1].Element.Property[System.Threading.Tasks.Task`1.Result];ReturnValue.Property[System.Threading.Tasks.Task`1.Result].Element;value;manual |
 | System.Threading.Tasks;Task;WhenAny<TResult>;(System.Threading.Tasks.Task<TResult>[]);Argument[0].Element.Property[System.Threading.Tasks.Task`1.Result];ReturnValue.Property[System.Threading.Tasks.Task`1.Result].Element;value;manual |
+| System.Threading.Tasks;Task;get_AsyncState;();Argument[this].SyntheticField[System.Threading.Tasks.Task.m_stateObject];ReturnValue;value;df-generated |
+| System.Threading.Tasks;Task;get_AsyncState;();Argument[this].SyntheticField[System.Threading.Tasks.Task.m_stateObject];ReturnValue;value;dfc-generated |
 | System.Threading.Tasks;Task<TResult>;ConfigureAwait;(System.Boolean);Argument[this];ReturnValue.SyntheticField[m_configuredTaskAwaiter].SyntheticField[m_task_configured_task_awaitable];value;manual |
 | System.Threading.Tasks;Task<TResult>;ConfigureAwait;(System.Threading.Tasks.ConfigureAwaitOptions);Argument[this];ReturnValue;taint;df-generated |
 | System.Threading.Tasks;Task<TResult>;ContinueWith;(System.Action<System.Threading.Tasks.Task<TResult>,System.Object>,System.Object);Argument[0];Argument[0].Parameter[delegate-self];value;manual |
@@ -12481,8 +13304,8 @@
 | System.Threading.Tasks;TaskAsyncEnumerableExtensions;ConfigureAwait<T>;(System.Collections.Generic.IAsyncEnumerable<T>,System.Boolean);Argument[0];ReturnValue;taint;df-generated |
 | System.Threading.Tasks;TaskAsyncEnumerableExtensions;WithCancellation<T>;(System.Collections.Generic.IAsyncEnumerable<T>,System.Threading.CancellationToken);Argument[0];ReturnValue;taint;df-generated |
 | System.Threading.Tasks;TaskAsyncEnumerableExtensions;WithCancellation<T>;(System.Collections.Generic.IAsyncEnumerable<T>,System.Threading.CancellationToken);Argument[1];ReturnValue;taint;df-generated |
-| System.Threading.Tasks;TaskCanceledException;TaskCanceledException;(System.Threading.Tasks.Task);Argument[0];Argument[this];taint;df-generated |
-| System.Threading.Tasks;TaskCanceledException;get_Task;();Argument[this];ReturnValue;taint;df-generated |
+| System.Threading.Tasks;TaskCanceledException;TaskCanceledException;(System.Threading.Tasks.Task);Argument[0];Argument[this].SyntheticField[System.Threading.Tasks.TaskCanceledException._canceledTask];value;dfc-generated |
+| System.Threading.Tasks;TaskCanceledException;get_Task;();Argument[this].SyntheticField[System.Threading.Tasks.TaskCanceledException._canceledTask];ReturnValue;value;dfc-generated |
 | System.Threading.Tasks;TaskCompletionSource;TaskCompletionSource;(System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[0];Argument[this];taint;df-generated |
 | System.Threading.Tasks;TaskCompletionSource;get_Task;();Argument[this];ReturnValue;taint;df-generated |
 | System.Threading.Tasks;TaskCompletionSource<TResult>;SetResult;(TResult);Argument[0];Argument[this];taint;df-generated |
@@ -12554,41 +13377,185 @@
 | System.Threading.Tasks;TaskFactory;ContinueWhenAny<TResult>;(System.Threading.Tasks.Task[],System.Func<System.Threading.Tasks.Task,TResult>,System.Threading.CancellationToken,System.Threading.Tasks.TaskContinuationOptions,System.Threading.Tasks.TaskScheduler);Argument[1];Argument[1].Parameter[delegate-self];value;manual |
 | System.Threading.Tasks;TaskFactory;ContinueWhenAny<TResult>;(System.Threading.Tasks.Task[],System.Func<System.Threading.Tasks.Task,TResult>,System.Threading.Tasks.TaskContinuationOptions);Argument[1].ReturnValue;ReturnValue.Property[System.Threading.Tasks.Task`1.Result];value;manual |
 | System.Threading.Tasks;TaskFactory;ContinueWhenAny<TResult>;(System.Threading.Tasks.Task[],System.Func<System.Threading.Tasks.Task,TResult>,System.Threading.Tasks.TaskContinuationOptions);Argument[1];Argument[1].Parameter[delegate-self];value;manual |
+| System.Threading.Tasks;TaskFactory;FromAsync;(System.Func<System.AsyncCallback,System.Object,System.IAsyncResult>,System.Action<System.IAsyncResult>,System.Object);Argument[0].ReturnValue;Argument[1].Parameter[0];value;dfc-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync;(System.Func<System.AsyncCallback,System.Object,System.IAsyncResult>,System.Action<System.IAsyncResult>,System.Object);Argument[0].ReturnValue;Argument[1].Parameter[0];value;hq-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync;(System.Func<System.AsyncCallback,System.Object,System.IAsyncResult>,System.Action<System.IAsyncResult>,System.Object);Argument[0];Argument[0].Parameter[delegate-self];value;dfc-generated |
 | System.Threading.Tasks;TaskFactory;FromAsync;(System.Func<System.AsyncCallback,System.Object,System.IAsyncResult>,System.Action<System.IAsyncResult>,System.Object);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync;(System.Func<System.AsyncCallback,System.Object,System.IAsyncResult>,System.Action<System.IAsyncResult>,System.Object);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | System.Threading.Tasks;TaskFactory;FromAsync;(System.Func<System.AsyncCallback,System.Object,System.IAsyncResult>,System.Action<System.IAsyncResult>,System.Object);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync;(System.Func<System.AsyncCallback,System.Object,System.IAsyncResult>,System.Action<System.IAsyncResult>,System.Object);Argument[2];Argument[0].Parameter[1];value;dfc-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync;(System.Func<System.AsyncCallback,System.Object,System.IAsyncResult>,System.Action<System.IAsyncResult>,System.Object);Argument[2];Argument[0].Parameter[1];value;hq-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync;(System.Func<System.AsyncCallback,System.Object,System.IAsyncResult>,System.Action<System.IAsyncResult>,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[0].ReturnValue;Argument[1].Parameter[0];value;dfc-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync;(System.Func<System.AsyncCallback,System.Object,System.IAsyncResult>,System.Action<System.IAsyncResult>,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[0].ReturnValue;Argument[1].Parameter[0];value;hq-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync;(System.Func<System.AsyncCallback,System.Object,System.IAsyncResult>,System.Action<System.IAsyncResult>,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[0];Argument[0].Parameter[delegate-self];value;dfc-generated |
 | System.Threading.Tasks;TaskFactory;FromAsync;(System.Func<System.AsyncCallback,System.Object,System.IAsyncResult>,System.Action<System.IAsyncResult>,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync;(System.Func<System.AsyncCallback,System.Object,System.IAsyncResult>,System.Action<System.IAsyncResult>,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | System.Threading.Tasks;TaskFactory;FromAsync;(System.Func<System.AsyncCallback,System.Object,System.IAsyncResult>,System.Action<System.IAsyncResult>,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync;(System.Func<System.AsyncCallback,System.Object,System.IAsyncResult>,System.Action<System.IAsyncResult>,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[2];Argument[0].Parameter[1];value;dfc-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync;(System.Func<System.AsyncCallback,System.Object,System.IAsyncResult>,System.Action<System.IAsyncResult>,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[2];Argument[0].Parameter[1];value;hq-generated |
 | System.Threading.Tasks;TaskFactory;FromAsync;(System.IAsyncResult,System.Action<System.IAsyncResult>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
 | System.Threading.Tasks;TaskFactory;FromAsync;(System.IAsyncResult,System.Action<System.IAsyncResult>,System.Threading.Tasks.TaskCreationOptions);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
 | System.Threading.Tasks;TaskFactory;FromAsync;(System.IAsyncResult,System.Action<System.IAsyncResult>,System.Threading.Tasks.TaskCreationOptions,System.Threading.Tasks.TaskScheduler);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TArg1,TArg2,TArg3,TResult>;(System.Func<TArg1,TArg2,TArg3,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,TArg2,TArg3,System.Object);Argument[0].ReturnValue;Argument[1].Parameter[0];value;dfc-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TArg1,TArg2,TArg3,TResult>;(System.Func<TArg1,TArg2,TArg3,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,TArg2,TArg3,System.Object);Argument[0].ReturnValue;Argument[1].Parameter[0];value;hq-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TArg1,TArg2,TArg3,TResult>;(System.Func<TArg1,TArg2,TArg3,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,TArg2,TArg3,System.Object);Argument[0];Argument[0].Parameter[delegate-self];value;dfc-generated |
 | System.Threading.Tasks;TaskFactory;FromAsync<TArg1,TArg2,TArg3,TResult>;(System.Func<TArg1,TArg2,TArg3,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,TArg2,TArg3,System.Object);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TArg1,TArg2,TArg3,TResult>;(System.Func<TArg1,TArg2,TArg3,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,TArg2,TArg3,System.Object);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | System.Threading.Tasks;TaskFactory;FromAsync<TArg1,TArg2,TArg3,TResult>;(System.Func<TArg1,TArg2,TArg3,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,TArg2,TArg3,System.Object);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TArg1,TArg2,TArg3,TResult>;(System.Func<TArg1,TArg2,TArg3,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,TArg2,TArg3,System.Object);Argument[2];Argument[0].Parameter[0];value;dfc-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TArg1,TArg2,TArg3,TResult>;(System.Func<TArg1,TArg2,TArg3,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,TArg2,TArg3,System.Object);Argument[2];Argument[0].Parameter[0];value;hq-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TArg1,TArg2,TArg3,TResult>;(System.Func<TArg1,TArg2,TArg3,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,TArg2,TArg3,System.Object);Argument[3];Argument[0].Parameter[1];value;dfc-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TArg1,TArg2,TArg3,TResult>;(System.Func<TArg1,TArg2,TArg3,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,TArg2,TArg3,System.Object);Argument[3];Argument[0].Parameter[1];value;hq-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TArg1,TArg2,TArg3,TResult>;(System.Func<TArg1,TArg2,TArg3,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,TArg2,TArg3,System.Object);Argument[4];Argument[0].Parameter[2];value;dfc-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TArg1,TArg2,TArg3,TResult>;(System.Func<TArg1,TArg2,TArg3,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,TArg2,TArg3,System.Object);Argument[4];Argument[0].Parameter[2];value;hq-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TArg1,TArg2,TArg3,TResult>;(System.Func<TArg1,TArg2,TArg3,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,TArg2,TArg3,System.Object);Argument[5];Argument[0].Parameter[4];value;dfc-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TArg1,TArg2,TArg3,TResult>;(System.Func<TArg1,TArg2,TArg3,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,TArg2,TArg3,System.Object);Argument[5];Argument[0].Parameter[4];value;hq-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TArg1,TArg2,TArg3,TResult>;(System.Func<TArg1,TArg2,TArg3,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,TArg2,TArg3,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[0].ReturnValue;Argument[1].Parameter[0];value;dfc-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TArg1,TArg2,TArg3,TResult>;(System.Func<TArg1,TArg2,TArg3,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,TArg2,TArg3,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[0].ReturnValue;Argument[1].Parameter[0];value;hq-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TArg1,TArg2,TArg3,TResult>;(System.Func<TArg1,TArg2,TArg3,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,TArg2,TArg3,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[0];Argument[0].Parameter[delegate-self];value;dfc-generated |
 | System.Threading.Tasks;TaskFactory;FromAsync<TArg1,TArg2,TArg3,TResult>;(System.Func<TArg1,TArg2,TArg3,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,TArg2,TArg3,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TArg1,TArg2,TArg3,TResult>;(System.Func<TArg1,TArg2,TArg3,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,TArg2,TArg3,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | System.Threading.Tasks;TaskFactory;FromAsync<TArg1,TArg2,TArg3,TResult>;(System.Func<TArg1,TArg2,TArg3,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,TArg2,TArg3,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TArg1,TArg2,TArg3,TResult>;(System.Func<TArg1,TArg2,TArg3,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,TArg2,TArg3,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[2];Argument[0].Parameter[0];value;dfc-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TArg1,TArg2,TArg3,TResult>;(System.Func<TArg1,TArg2,TArg3,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,TArg2,TArg3,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[2];Argument[0].Parameter[0];value;hq-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TArg1,TArg2,TArg3,TResult>;(System.Func<TArg1,TArg2,TArg3,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,TArg2,TArg3,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[3];Argument[0].Parameter[1];value;dfc-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TArg1,TArg2,TArg3,TResult>;(System.Func<TArg1,TArg2,TArg3,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,TArg2,TArg3,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[3];Argument[0].Parameter[1];value;hq-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TArg1,TArg2,TArg3,TResult>;(System.Func<TArg1,TArg2,TArg3,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,TArg2,TArg3,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[4];Argument[0].Parameter[2];value;dfc-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TArg1,TArg2,TArg3,TResult>;(System.Func<TArg1,TArg2,TArg3,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,TArg2,TArg3,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[4];Argument[0].Parameter[2];value;hq-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TArg1,TArg2,TArg3,TResult>;(System.Func<TArg1,TArg2,TArg3,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,TArg2,TArg3,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[5];Argument[0].Parameter[4];value;dfc-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TArg1,TArg2,TArg3,TResult>;(System.Func<TArg1,TArg2,TArg3,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,TArg2,TArg3,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[5];Argument[0].Parameter[4];value;hq-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TArg1,TArg2,TArg3>;(System.Func<TArg1,TArg2,TArg3,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Action<System.IAsyncResult>,TArg1,TArg2,TArg3,System.Object);Argument[0].ReturnValue;Argument[1].Parameter[0];value;dfc-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TArg1,TArg2,TArg3>;(System.Func<TArg1,TArg2,TArg3,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Action<System.IAsyncResult>,TArg1,TArg2,TArg3,System.Object);Argument[0].ReturnValue;Argument[1].Parameter[0];value;hq-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TArg1,TArg2,TArg3>;(System.Func<TArg1,TArg2,TArg3,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Action<System.IAsyncResult>,TArg1,TArg2,TArg3,System.Object);Argument[0];Argument[0].Parameter[delegate-self];value;dfc-generated |
 | System.Threading.Tasks;TaskFactory;FromAsync<TArg1,TArg2,TArg3>;(System.Func<TArg1,TArg2,TArg3,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Action<System.IAsyncResult>,TArg1,TArg2,TArg3,System.Object);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TArg1,TArg2,TArg3>;(System.Func<TArg1,TArg2,TArg3,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Action<System.IAsyncResult>,TArg1,TArg2,TArg3,System.Object);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | System.Threading.Tasks;TaskFactory;FromAsync<TArg1,TArg2,TArg3>;(System.Func<TArg1,TArg2,TArg3,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Action<System.IAsyncResult>,TArg1,TArg2,TArg3,System.Object);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TArg1,TArg2,TArg3>;(System.Func<TArg1,TArg2,TArg3,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Action<System.IAsyncResult>,TArg1,TArg2,TArg3,System.Object);Argument[2];Argument[0].Parameter[0];value;dfc-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TArg1,TArg2,TArg3>;(System.Func<TArg1,TArg2,TArg3,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Action<System.IAsyncResult>,TArg1,TArg2,TArg3,System.Object);Argument[2];Argument[0].Parameter[0];value;hq-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TArg1,TArg2,TArg3>;(System.Func<TArg1,TArg2,TArg3,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Action<System.IAsyncResult>,TArg1,TArg2,TArg3,System.Object);Argument[3];Argument[0].Parameter[1];value;dfc-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TArg1,TArg2,TArg3>;(System.Func<TArg1,TArg2,TArg3,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Action<System.IAsyncResult>,TArg1,TArg2,TArg3,System.Object);Argument[3];Argument[0].Parameter[1];value;hq-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TArg1,TArg2,TArg3>;(System.Func<TArg1,TArg2,TArg3,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Action<System.IAsyncResult>,TArg1,TArg2,TArg3,System.Object);Argument[4];Argument[0].Parameter[2];value;dfc-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TArg1,TArg2,TArg3>;(System.Func<TArg1,TArg2,TArg3,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Action<System.IAsyncResult>,TArg1,TArg2,TArg3,System.Object);Argument[4];Argument[0].Parameter[2];value;hq-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TArg1,TArg2,TArg3>;(System.Func<TArg1,TArg2,TArg3,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Action<System.IAsyncResult>,TArg1,TArg2,TArg3,System.Object);Argument[5];Argument[0].Parameter[4];value;dfc-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TArg1,TArg2,TArg3>;(System.Func<TArg1,TArg2,TArg3,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Action<System.IAsyncResult>,TArg1,TArg2,TArg3,System.Object);Argument[5];Argument[0].Parameter[4];value;hq-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TArg1,TArg2,TArg3>;(System.Func<TArg1,TArg2,TArg3,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Action<System.IAsyncResult>,TArg1,TArg2,TArg3,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[0].ReturnValue;Argument[1].Parameter[0];value;dfc-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TArg1,TArg2,TArg3>;(System.Func<TArg1,TArg2,TArg3,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Action<System.IAsyncResult>,TArg1,TArg2,TArg3,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[0].ReturnValue;Argument[1].Parameter[0];value;hq-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TArg1,TArg2,TArg3>;(System.Func<TArg1,TArg2,TArg3,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Action<System.IAsyncResult>,TArg1,TArg2,TArg3,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[0];Argument[0].Parameter[delegate-self];value;dfc-generated |
 | System.Threading.Tasks;TaskFactory;FromAsync<TArg1,TArg2,TArg3>;(System.Func<TArg1,TArg2,TArg3,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Action<System.IAsyncResult>,TArg1,TArg2,TArg3,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TArg1,TArg2,TArg3>;(System.Func<TArg1,TArg2,TArg3,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Action<System.IAsyncResult>,TArg1,TArg2,TArg3,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | System.Threading.Tasks;TaskFactory;FromAsync<TArg1,TArg2,TArg3>;(System.Func<TArg1,TArg2,TArg3,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Action<System.IAsyncResult>,TArg1,TArg2,TArg3,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TArg1,TArg2,TArg3>;(System.Func<TArg1,TArg2,TArg3,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Action<System.IAsyncResult>,TArg1,TArg2,TArg3,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[2];Argument[0].Parameter[0];value;dfc-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TArg1,TArg2,TArg3>;(System.Func<TArg1,TArg2,TArg3,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Action<System.IAsyncResult>,TArg1,TArg2,TArg3,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[2];Argument[0].Parameter[0];value;hq-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TArg1,TArg2,TArg3>;(System.Func<TArg1,TArg2,TArg3,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Action<System.IAsyncResult>,TArg1,TArg2,TArg3,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[3];Argument[0].Parameter[1];value;dfc-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TArg1,TArg2,TArg3>;(System.Func<TArg1,TArg2,TArg3,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Action<System.IAsyncResult>,TArg1,TArg2,TArg3,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[3];Argument[0].Parameter[1];value;hq-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TArg1,TArg2,TArg3>;(System.Func<TArg1,TArg2,TArg3,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Action<System.IAsyncResult>,TArg1,TArg2,TArg3,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[4];Argument[0].Parameter[2];value;dfc-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TArg1,TArg2,TArg3>;(System.Func<TArg1,TArg2,TArg3,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Action<System.IAsyncResult>,TArg1,TArg2,TArg3,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[4];Argument[0].Parameter[2];value;hq-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TArg1,TArg2,TArg3>;(System.Func<TArg1,TArg2,TArg3,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Action<System.IAsyncResult>,TArg1,TArg2,TArg3,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[5];Argument[0].Parameter[4];value;dfc-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TArg1,TArg2,TArg3>;(System.Func<TArg1,TArg2,TArg3,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Action<System.IAsyncResult>,TArg1,TArg2,TArg3,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[5];Argument[0].Parameter[4];value;hq-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TArg1,TArg2,TResult>;(System.Func<TArg1,TArg2,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,TArg2,System.Object);Argument[0].ReturnValue;Argument[1].Parameter[0];value;dfc-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TArg1,TArg2,TResult>;(System.Func<TArg1,TArg2,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,TArg2,System.Object);Argument[0].ReturnValue;Argument[1].Parameter[0];value;hq-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TArg1,TArg2,TResult>;(System.Func<TArg1,TArg2,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,TArg2,System.Object);Argument[0];Argument[0].Parameter[delegate-self];value;dfc-generated |
 | System.Threading.Tasks;TaskFactory;FromAsync<TArg1,TArg2,TResult>;(System.Func<TArg1,TArg2,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,TArg2,System.Object);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TArg1,TArg2,TResult>;(System.Func<TArg1,TArg2,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,TArg2,System.Object);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | System.Threading.Tasks;TaskFactory;FromAsync<TArg1,TArg2,TResult>;(System.Func<TArg1,TArg2,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,TArg2,System.Object);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TArg1,TArg2,TResult>;(System.Func<TArg1,TArg2,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,TArg2,System.Object);Argument[2];Argument[0].Parameter[0];value;dfc-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TArg1,TArg2,TResult>;(System.Func<TArg1,TArg2,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,TArg2,System.Object);Argument[2];Argument[0].Parameter[0];value;hq-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TArg1,TArg2,TResult>;(System.Func<TArg1,TArg2,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,TArg2,System.Object);Argument[3];Argument[0].Parameter[1];value;dfc-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TArg1,TArg2,TResult>;(System.Func<TArg1,TArg2,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,TArg2,System.Object);Argument[3];Argument[0].Parameter[1];value;hq-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TArg1,TArg2,TResult>;(System.Func<TArg1,TArg2,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,TArg2,System.Object);Argument[4];Argument[0].Parameter[3];value;dfc-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TArg1,TArg2,TResult>;(System.Func<TArg1,TArg2,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,TArg2,System.Object);Argument[4];Argument[0].Parameter[3];value;hq-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TArg1,TArg2,TResult>;(System.Func<TArg1,TArg2,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,TArg2,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[0].ReturnValue;Argument[1].Parameter[0];value;dfc-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TArg1,TArg2,TResult>;(System.Func<TArg1,TArg2,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,TArg2,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[0].ReturnValue;Argument[1].Parameter[0];value;hq-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TArg1,TArg2,TResult>;(System.Func<TArg1,TArg2,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,TArg2,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[0];Argument[0].Parameter[delegate-self];value;dfc-generated |
 | System.Threading.Tasks;TaskFactory;FromAsync<TArg1,TArg2,TResult>;(System.Func<TArg1,TArg2,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,TArg2,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TArg1,TArg2,TResult>;(System.Func<TArg1,TArg2,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,TArg2,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | System.Threading.Tasks;TaskFactory;FromAsync<TArg1,TArg2,TResult>;(System.Func<TArg1,TArg2,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,TArg2,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TArg1,TArg2,TResult>;(System.Func<TArg1,TArg2,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,TArg2,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[2];Argument[0].Parameter[0];value;dfc-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TArg1,TArg2,TResult>;(System.Func<TArg1,TArg2,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,TArg2,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[2];Argument[0].Parameter[0];value;hq-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TArg1,TArg2,TResult>;(System.Func<TArg1,TArg2,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,TArg2,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[3];Argument[0].Parameter[1];value;dfc-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TArg1,TArg2,TResult>;(System.Func<TArg1,TArg2,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,TArg2,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[3];Argument[0].Parameter[1];value;hq-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TArg1,TArg2,TResult>;(System.Func<TArg1,TArg2,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,TArg2,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[4];Argument[0].Parameter[3];value;dfc-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TArg1,TArg2,TResult>;(System.Func<TArg1,TArg2,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,TArg2,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[4];Argument[0].Parameter[3];value;hq-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TArg1,TArg2>;(System.Func<TArg1,TArg2,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Action<System.IAsyncResult>,TArg1,TArg2,System.Object);Argument[0].ReturnValue;Argument[1].Parameter[0];value;dfc-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TArg1,TArg2>;(System.Func<TArg1,TArg2,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Action<System.IAsyncResult>,TArg1,TArg2,System.Object);Argument[0].ReturnValue;Argument[1].Parameter[0];value;hq-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TArg1,TArg2>;(System.Func<TArg1,TArg2,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Action<System.IAsyncResult>,TArg1,TArg2,System.Object);Argument[0];Argument[0].Parameter[delegate-self];value;dfc-generated |
 | System.Threading.Tasks;TaskFactory;FromAsync<TArg1,TArg2>;(System.Func<TArg1,TArg2,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Action<System.IAsyncResult>,TArg1,TArg2,System.Object);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TArg1,TArg2>;(System.Func<TArg1,TArg2,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Action<System.IAsyncResult>,TArg1,TArg2,System.Object);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | System.Threading.Tasks;TaskFactory;FromAsync<TArg1,TArg2>;(System.Func<TArg1,TArg2,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Action<System.IAsyncResult>,TArg1,TArg2,System.Object);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TArg1,TArg2>;(System.Func<TArg1,TArg2,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Action<System.IAsyncResult>,TArg1,TArg2,System.Object);Argument[2];Argument[0].Parameter[0];value;dfc-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TArg1,TArg2>;(System.Func<TArg1,TArg2,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Action<System.IAsyncResult>,TArg1,TArg2,System.Object);Argument[2];Argument[0].Parameter[0];value;hq-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TArg1,TArg2>;(System.Func<TArg1,TArg2,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Action<System.IAsyncResult>,TArg1,TArg2,System.Object);Argument[3];Argument[0].Parameter[1];value;dfc-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TArg1,TArg2>;(System.Func<TArg1,TArg2,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Action<System.IAsyncResult>,TArg1,TArg2,System.Object);Argument[3];Argument[0].Parameter[1];value;hq-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TArg1,TArg2>;(System.Func<TArg1,TArg2,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Action<System.IAsyncResult>,TArg1,TArg2,System.Object);Argument[4];Argument[0].Parameter[3];value;dfc-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TArg1,TArg2>;(System.Func<TArg1,TArg2,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Action<System.IAsyncResult>,TArg1,TArg2,System.Object);Argument[4];Argument[0].Parameter[3];value;hq-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TArg1,TArg2>;(System.Func<TArg1,TArg2,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Action<System.IAsyncResult>,TArg1,TArg2,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[0].ReturnValue;Argument[1].Parameter[0];value;dfc-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TArg1,TArg2>;(System.Func<TArg1,TArg2,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Action<System.IAsyncResult>,TArg1,TArg2,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[0].ReturnValue;Argument[1].Parameter[0];value;hq-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TArg1,TArg2>;(System.Func<TArg1,TArg2,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Action<System.IAsyncResult>,TArg1,TArg2,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[0];Argument[0].Parameter[delegate-self];value;dfc-generated |
 | System.Threading.Tasks;TaskFactory;FromAsync<TArg1,TArg2>;(System.Func<TArg1,TArg2,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Action<System.IAsyncResult>,TArg1,TArg2,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TArg1,TArg2>;(System.Func<TArg1,TArg2,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Action<System.IAsyncResult>,TArg1,TArg2,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | System.Threading.Tasks;TaskFactory;FromAsync<TArg1,TArg2>;(System.Func<TArg1,TArg2,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Action<System.IAsyncResult>,TArg1,TArg2,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TArg1,TArg2>;(System.Func<TArg1,TArg2,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Action<System.IAsyncResult>,TArg1,TArg2,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[2];Argument[0].Parameter[0];value;dfc-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TArg1,TArg2>;(System.Func<TArg1,TArg2,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Action<System.IAsyncResult>,TArg1,TArg2,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[2];Argument[0].Parameter[0];value;hq-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TArg1,TArg2>;(System.Func<TArg1,TArg2,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Action<System.IAsyncResult>,TArg1,TArg2,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[3];Argument[0].Parameter[1];value;dfc-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TArg1,TArg2>;(System.Func<TArg1,TArg2,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Action<System.IAsyncResult>,TArg1,TArg2,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[3];Argument[0].Parameter[1];value;hq-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TArg1,TArg2>;(System.Func<TArg1,TArg2,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Action<System.IAsyncResult>,TArg1,TArg2,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[4];Argument[0].Parameter[3];value;dfc-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TArg1,TArg2>;(System.Func<TArg1,TArg2,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Action<System.IAsyncResult>,TArg1,TArg2,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[4];Argument[0].Parameter[3];value;hq-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TArg1,TResult>;(System.Func<TArg1,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,System.Object);Argument[0].ReturnValue;Argument[1].Parameter[0];value;dfc-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TArg1,TResult>;(System.Func<TArg1,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,System.Object);Argument[0].ReturnValue;Argument[1].Parameter[0];value;hq-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TArg1,TResult>;(System.Func<TArg1,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,System.Object);Argument[0];Argument[0].Parameter[delegate-self];value;dfc-generated |
 | System.Threading.Tasks;TaskFactory;FromAsync<TArg1,TResult>;(System.Func<TArg1,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,System.Object);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TArg1,TResult>;(System.Func<TArg1,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,System.Object);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | System.Threading.Tasks;TaskFactory;FromAsync<TArg1,TResult>;(System.Func<TArg1,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,System.Object);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TArg1,TResult>;(System.Func<TArg1,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,System.Object);Argument[2];Argument[0].Parameter[0];value;dfc-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TArg1,TResult>;(System.Func<TArg1,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,System.Object);Argument[2];Argument[0].Parameter[0];value;hq-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TArg1,TResult>;(System.Func<TArg1,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,System.Object);Argument[3];Argument[0].Parameter[2];value;dfc-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TArg1,TResult>;(System.Func<TArg1,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,System.Object);Argument[3];Argument[0].Parameter[2];value;hq-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TArg1,TResult>;(System.Func<TArg1,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[0].ReturnValue;Argument[1].Parameter[0];value;dfc-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TArg1,TResult>;(System.Func<TArg1,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[0].ReturnValue;Argument[1].Parameter[0];value;hq-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TArg1,TResult>;(System.Func<TArg1,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[0];Argument[0].Parameter[delegate-self];value;dfc-generated |
 | System.Threading.Tasks;TaskFactory;FromAsync<TArg1,TResult>;(System.Func<TArg1,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TArg1,TResult>;(System.Func<TArg1,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | System.Threading.Tasks;TaskFactory;FromAsync<TArg1,TResult>;(System.Func<TArg1,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TArg1,TResult>;(System.Func<TArg1,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[2];Argument[0].Parameter[0];value;dfc-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TArg1,TResult>;(System.Func<TArg1,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[2];Argument[0].Parameter[0];value;hq-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TArg1,TResult>;(System.Func<TArg1,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[3];Argument[0].Parameter[2];value;dfc-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TArg1,TResult>;(System.Func<TArg1,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[3];Argument[0].Parameter[2];value;hq-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TArg1>;(System.Func<TArg1,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Action<System.IAsyncResult>,TArg1,System.Object);Argument[0].ReturnValue;Argument[1].Parameter[0];value;dfc-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TArg1>;(System.Func<TArg1,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Action<System.IAsyncResult>,TArg1,System.Object);Argument[0].ReturnValue;Argument[1].Parameter[0];value;hq-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TArg1>;(System.Func<TArg1,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Action<System.IAsyncResult>,TArg1,System.Object);Argument[0];Argument[0].Parameter[delegate-self];value;dfc-generated |
 | System.Threading.Tasks;TaskFactory;FromAsync<TArg1>;(System.Func<TArg1,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Action<System.IAsyncResult>,TArg1,System.Object);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TArg1>;(System.Func<TArg1,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Action<System.IAsyncResult>,TArg1,System.Object);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | System.Threading.Tasks;TaskFactory;FromAsync<TArg1>;(System.Func<TArg1,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Action<System.IAsyncResult>,TArg1,System.Object);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TArg1>;(System.Func<TArg1,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Action<System.IAsyncResult>,TArg1,System.Object);Argument[2];Argument[0].Parameter[0];value;dfc-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TArg1>;(System.Func<TArg1,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Action<System.IAsyncResult>,TArg1,System.Object);Argument[2];Argument[0].Parameter[0];value;hq-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TArg1>;(System.Func<TArg1,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Action<System.IAsyncResult>,TArg1,System.Object);Argument[3];Argument[0].Parameter[2];value;dfc-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TArg1>;(System.Func<TArg1,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Action<System.IAsyncResult>,TArg1,System.Object);Argument[3];Argument[0].Parameter[2];value;hq-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TArg1>;(System.Func<TArg1,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Action<System.IAsyncResult>,TArg1,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[0].ReturnValue;Argument[1].Parameter[0];value;dfc-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TArg1>;(System.Func<TArg1,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Action<System.IAsyncResult>,TArg1,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[0].ReturnValue;Argument[1].Parameter[0];value;hq-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TArg1>;(System.Func<TArg1,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Action<System.IAsyncResult>,TArg1,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[0];Argument[0].Parameter[delegate-self];value;dfc-generated |
 | System.Threading.Tasks;TaskFactory;FromAsync<TArg1>;(System.Func<TArg1,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Action<System.IAsyncResult>,TArg1,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TArg1>;(System.Func<TArg1,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Action<System.IAsyncResult>,TArg1,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | System.Threading.Tasks;TaskFactory;FromAsync<TArg1>;(System.Func<TArg1,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Action<System.IAsyncResult>,TArg1,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TArg1>;(System.Func<TArg1,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Action<System.IAsyncResult>,TArg1,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[2];Argument[0].Parameter[0];value;dfc-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TArg1>;(System.Func<TArg1,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Action<System.IAsyncResult>,TArg1,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[2];Argument[0].Parameter[0];value;hq-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TArg1>;(System.Func<TArg1,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Action<System.IAsyncResult>,TArg1,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[3];Argument[0].Parameter[2];value;dfc-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TArg1>;(System.Func<TArg1,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Action<System.IAsyncResult>,TArg1,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[3];Argument[0].Parameter[2];value;hq-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TResult>;(System.Func<System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,System.Object);Argument[0].ReturnValue;Argument[1].Parameter[0];value;dfc-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TResult>;(System.Func<System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,System.Object);Argument[0].ReturnValue;Argument[1].Parameter[0];value;hq-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TResult>;(System.Func<System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,System.Object);Argument[0];Argument[0].Parameter[delegate-self];value;dfc-generated |
 | System.Threading.Tasks;TaskFactory;FromAsync<TResult>;(System.Func<System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,System.Object);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TResult>;(System.Func<System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,System.Object);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | System.Threading.Tasks;TaskFactory;FromAsync<TResult>;(System.Func<System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,System.Object);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TResult>;(System.Func<System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,System.Object);Argument[2];Argument[0].Parameter[1];value;dfc-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TResult>;(System.Func<System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,System.Object);Argument[2];Argument[0].Parameter[1];value;hq-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TResult>;(System.Func<System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[0].ReturnValue;Argument[1].Parameter[0];value;dfc-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TResult>;(System.Func<System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[0].ReturnValue;Argument[1].Parameter[0];value;hq-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TResult>;(System.Func<System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[0];Argument[0].Parameter[delegate-self];value;dfc-generated |
 | System.Threading.Tasks;TaskFactory;FromAsync<TResult>;(System.Func<System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TResult>;(System.Func<System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | System.Threading.Tasks;TaskFactory;FromAsync<TResult>;(System.Func<System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TResult>;(System.Func<System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[2];Argument[0].Parameter[1];value;dfc-generated |
+| System.Threading.Tasks;TaskFactory;FromAsync<TResult>;(System.Func<System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[2];Argument[0].Parameter[1];value;hq-generated |
 | System.Threading.Tasks;TaskFactory;FromAsync<TResult>;(System.IAsyncResult,System.Func<System.IAsyncResult,TResult>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
 | System.Threading.Tasks;TaskFactory;FromAsync<TResult>;(System.IAsyncResult,System.Func<System.IAsyncResult,TResult>,System.Threading.Tasks.TaskCreationOptions);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
 | System.Threading.Tasks;TaskFactory;FromAsync<TResult>;(System.IAsyncResult,System.Func<System.IAsyncResult,TResult>,System.Threading.Tasks.TaskCreationOptions,System.Threading.Tasks.TaskScheduler);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
@@ -12624,12 +13591,12 @@
 | System.Threading.Tasks;TaskFactory;StartNew<TResult>;(System.Func<TResult>,System.Threading.CancellationToken,System.Threading.Tasks.TaskCreationOptions,System.Threading.Tasks.TaskScheduler);Argument[0];Argument[0].Parameter[delegate-self];value;manual |
 | System.Threading.Tasks;TaskFactory;StartNew<TResult>;(System.Func<TResult>,System.Threading.Tasks.TaskCreationOptions);Argument[0].ReturnValue;ReturnValue.Property[System.Threading.Tasks.Task`1.Result];value;manual |
 | System.Threading.Tasks;TaskFactory;StartNew<TResult>;(System.Func<TResult>,System.Threading.Tasks.TaskCreationOptions);Argument[0];Argument[0].Parameter[delegate-self];value;manual |
-| System.Threading.Tasks;TaskFactory;TaskFactory;(System.Threading.CancellationToken);Argument[0];Argument[this];taint;df-generated |
-| System.Threading.Tasks;TaskFactory;TaskFactory;(System.Threading.CancellationToken,System.Threading.Tasks.TaskCreationOptions,System.Threading.Tasks.TaskContinuationOptions,System.Threading.Tasks.TaskScheduler);Argument[0];Argument[this];taint;df-generated |
-| System.Threading.Tasks;TaskFactory;TaskFactory;(System.Threading.CancellationToken,System.Threading.Tasks.TaskCreationOptions,System.Threading.Tasks.TaskContinuationOptions,System.Threading.Tasks.TaskScheduler);Argument[3];Argument[this];taint;df-generated |
-| System.Threading.Tasks;TaskFactory;TaskFactory;(System.Threading.Tasks.TaskScheduler);Argument[0];Argument[this];taint;df-generated |
-| System.Threading.Tasks;TaskFactory;get_CancellationToken;();Argument[this];ReturnValue;taint;df-generated |
-| System.Threading.Tasks;TaskFactory;get_Scheduler;();Argument[this];ReturnValue;taint;df-generated |
+| System.Threading.Tasks;TaskFactory;TaskFactory;(System.Threading.CancellationToken);Argument[0];Argument[this].SyntheticField[System.Threading.Tasks.TaskFactory.m_defaultCancellationToken];value;dfc-generated |
+| System.Threading.Tasks;TaskFactory;TaskFactory;(System.Threading.CancellationToken,System.Threading.Tasks.TaskCreationOptions,System.Threading.Tasks.TaskContinuationOptions,System.Threading.Tasks.TaskScheduler);Argument[0];Argument[this].SyntheticField[System.Threading.Tasks.TaskFactory.m_defaultCancellationToken];value;dfc-generated |
+| System.Threading.Tasks;TaskFactory;TaskFactory;(System.Threading.CancellationToken,System.Threading.Tasks.TaskCreationOptions,System.Threading.Tasks.TaskContinuationOptions,System.Threading.Tasks.TaskScheduler);Argument[3];Argument[this].SyntheticField[System.Threading.Tasks.TaskFactory.m_defaultScheduler];value;dfc-generated |
+| System.Threading.Tasks;TaskFactory;TaskFactory;(System.Threading.Tasks.TaskScheduler);Argument[0];Argument[this].SyntheticField[System.Threading.Tasks.TaskFactory.m_defaultScheduler];value;dfc-generated |
+| System.Threading.Tasks;TaskFactory;get_CancellationToken;();Argument[this].SyntheticField[System.Threading.Tasks.TaskFactory.m_defaultCancellationToken];ReturnValue;value;dfc-generated |
+| System.Threading.Tasks;TaskFactory;get_Scheduler;();Argument[this].SyntheticField[System.Threading.Tasks.TaskFactory.m_defaultScheduler];ReturnValue;value;dfc-generated |
 | System.Threading.Tasks;TaskFactory<TResult>;ContinueWhenAll;(System.Threading.Tasks.Task[],System.Func<System.Threading.Tasks.Task[],TResult>);Argument[1].ReturnValue;ReturnValue.Property[System.Threading.Tasks.Task`1.Result];value;manual |
 | System.Threading.Tasks;TaskFactory<TResult>;ContinueWhenAll;(System.Threading.Tasks.Task[],System.Func<System.Threading.Tasks.Task[],TResult>);Argument[1];Argument[1].Parameter[delegate-self];value;manual |
 | System.Threading.Tasks;TaskFactory<TResult>;ContinueWhenAll;(System.Threading.Tasks.Task[],System.Func<System.Threading.Tasks.Task[],TResult>,System.Threading.CancellationToken);Argument[1].ReturnValue;ReturnValue.Property[System.Threading.Tasks.Task`1.Result];value;manual |
@@ -12670,25 +13637,97 @@
 | System.Threading.Tasks;TaskFactory<TResult>;ContinueWhenAny<TAntecedentResult>;(System.Threading.Tasks.Task<TAntecedentResult>[],System.Func<System.Threading.Tasks.Task<TAntecedentResult>,TResult>,System.Threading.Tasks.TaskContinuationOptions);Argument[0];Argument[1].Parameter[0];value;manual |
 | System.Threading.Tasks;TaskFactory<TResult>;ContinueWhenAny<TAntecedentResult>;(System.Threading.Tasks.Task<TAntecedentResult>[],System.Func<System.Threading.Tasks.Task<TAntecedentResult>,TResult>,System.Threading.Tasks.TaskContinuationOptions);Argument[1].ReturnValue;ReturnValue.Property[System.Threading.Tasks.Task`1.Result];value;manual |
 | System.Threading.Tasks;TaskFactory<TResult>;ContinueWhenAny<TAntecedentResult>;(System.Threading.Tasks.Task<TAntecedentResult>[],System.Func<System.Threading.Tasks.Task<TAntecedentResult>,TResult>,System.Threading.Tasks.TaskContinuationOptions);Argument[1];Argument[1].Parameter[delegate-self];value;manual |
+| System.Threading.Tasks;TaskFactory<TResult>;FromAsync;(System.Func<System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,System.Object);Argument[0].ReturnValue;Argument[1].Parameter[0];value;dfc-generated |
+| System.Threading.Tasks;TaskFactory<TResult>;FromAsync;(System.Func<System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,System.Object);Argument[0].ReturnValue;Argument[1].Parameter[0];value;hq-generated |
+| System.Threading.Tasks;TaskFactory<TResult>;FromAsync;(System.Func<System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,System.Object);Argument[0];Argument[0].Parameter[delegate-self];value;dfc-generated |
 | System.Threading.Tasks;TaskFactory<TResult>;FromAsync;(System.Func<System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,System.Object);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
+| System.Threading.Tasks;TaskFactory<TResult>;FromAsync;(System.Func<System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,System.Object);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | System.Threading.Tasks;TaskFactory<TResult>;FromAsync;(System.Func<System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,System.Object);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
+| System.Threading.Tasks;TaskFactory<TResult>;FromAsync;(System.Func<System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,System.Object);Argument[2];Argument[0].Parameter[1];value;dfc-generated |
+| System.Threading.Tasks;TaskFactory<TResult>;FromAsync;(System.Func<System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,System.Object);Argument[2];Argument[0].Parameter[1];value;hq-generated |
+| System.Threading.Tasks;TaskFactory<TResult>;FromAsync;(System.Func<System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[0].ReturnValue;Argument[1].Parameter[0];value;dfc-generated |
+| System.Threading.Tasks;TaskFactory<TResult>;FromAsync;(System.Func<System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[0].ReturnValue;Argument[1].Parameter[0];value;hq-generated |
+| System.Threading.Tasks;TaskFactory<TResult>;FromAsync;(System.Func<System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[0];Argument[0].Parameter[delegate-self];value;dfc-generated |
 | System.Threading.Tasks;TaskFactory<TResult>;FromAsync;(System.Func<System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
+| System.Threading.Tasks;TaskFactory<TResult>;FromAsync;(System.Func<System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | System.Threading.Tasks;TaskFactory<TResult>;FromAsync;(System.Func<System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
+| System.Threading.Tasks;TaskFactory<TResult>;FromAsync;(System.Func<System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[2];Argument[0].Parameter[1];value;dfc-generated |
+| System.Threading.Tasks;TaskFactory<TResult>;FromAsync;(System.Func<System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[2];Argument[0].Parameter[1];value;hq-generated |
 | System.Threading.Tasks;TaskFactory<TResult>;FromAsync;(System.IAsyncResult,System.Func<System.IAsyncResult,TResult>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
 | System.Threading.Tasks;TaskFactory<TResult>;FromAsync;(System.IAsyncResult,System.Func<System.IAsyncResult,TResult>,System.Threading.Tasks.TaskCreationOptions);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
 | System.Threading.Tasks;TaskFactory<TResult>;FromAsync;(System.IAsyncResult,System.Func<System.IAsyncResult,TResult>,System.Threading.Tasks.TaskCreationOptions,System.Threading.Tasks.TaskScheduler);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
+| System.Threading.Tasks;TaskFactory<TResult>;FromAsync<TArg1,TArg2,TArg3>;(System.Func<TArg1,TArg2,TArg3,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,TArg2,TArg3,System.Object);Argument[0].ReturnValue;Argument[1].Parameter[0];value;dfc-generated |
+| System.Threading.Tasks;TaskFactory<TResult>;FromAsync<TArg1,TArg2,TArg3>;(System.Func<TArg1,TArg2,TArg3,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,TArg2,TArg3,System.Object);Argument[0].ReturnValue;Argument[1].Parameter[0];value;hq-generated |
+| System.Threading.Tasks;TaskFactory<TResult>;FromAsync<TArg1,TArg2,TArg3>;(System.Func<TArg1,TArg2,TArg3,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,TArg2,TArg3,System.Object);Argument[0];Argument[0].Parameter[delegate-self];value;dfc-generated |
 | System.Threading.Tasks;TaskFactory<TResult>;FromAsync<TArg1,TArg2,TArg3>;(System.Func<TArg1,TArg2,TArg3,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,TArg2,TArg3,System.Object);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
+| System.Threading.Tasks;TaskFactory<TResult>;FromAsync<TArg1,TArg2,TArg3>;(System.Func<TArg1,TArg2,TArg3,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,TArg2,TArg3,System.Object);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | System.Threading.Tasks;TaskFactory<TResult>;FromAsync<TArg1,TArg2,TArg3>;(System.Func<TArg1,TArg2,TArg3,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,TArg2,TArg3,System.Object);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
+| System.Threading.Tasks;TaskFactory<TResult>;FromAsync<TArg1,TArg2,TArg3>;(System.Func<TArg1,TArg2,TArg3,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,TArg2,TArg3,System.Object);Argument[2];Argument[0].Parameter[0];value;dfc-generated |
+| System.Threading.Tasks;TaskFactory<TResult>;FromAsync<TArg1,TArg2,TArg3>;(System.Func<TArg1,TArg2,TArg3,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,TArg2,TArg3,System.Object);Argument[2];Argument[0].Parameter[0];value;hq-generated |
+| System.Threading.Tasks;TaskFactory<TResult>;FromAsync<TArg1,TArg2,TArg3>;(System.Func<TArg1,TArg2,TArg3,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,TArg2,TArg3,System.Object);Argument[3];Argument[0].Parameter[1];value;dfc-generated |
+| System.Threading.Tasks;TaskFactory<TResult>;FromAsync<TArg1,TArg2,TArg3>;(System.Func<TArg1,TArg2,TArg3,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,TArg2,TArg3,System.Object);Argument[3];Argument[0].Parameter[1];value;hq-generated |
+| System.Threading.Tasks;TaskFactory<TResult>;FromAsync<TArg1,TArg2,TArg3>;(System.Func<TArg1,TArg2,TArg3,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,TArg2,TArg3,System.Object);Argument[4];Argument[0].Parameter[2];value;dfc-generated |
+| System.Threading.Tasks;TaskFactory<TResult>;FromAsync<TArg1,TArg2,TArg3>;(System.Func<TArg1,TArg2,TArg3,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,TArg2,TArg3,System.Object);Argument[4];Argument[0].Parameter[2];value;hq-generated |
+| System.Threading.Tasks;TaskFactory<TResult>;FromAsync<TArg1,TArg2,TArg3>;(System.Func<TArg1,TArg2,TArg3,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,TArg2,TArg3,System.Object);Argument[5];Argument[0].Parameter[4];value;dfc-generated |
+| System.Threading.Tasks;TaskFactory<TResult>;FromAsync<TArg1,TArg2,TArg3>;(System.Func<TArg1,TArg2,TArg3,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,TArg2,TArg3,System.Object);Argument[5];Argument[0].Parameter[4];value;hq-generated |
+| System.Threading.Tasks;TaskFactory<TResult>;FromAsync<TArg1,TArg2,TArg3>;(System.Func<TArg1,TArg2,TArg3,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,TArg2,TArg3,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[0].ReturnValue;Argument[1].Parameter[0];value;dfc-generated |
+| System.Threading.Tasks;TaskFactory<TResult>;FromAsync<TArg1,TArg2,TArg3>;(System.Func<TArg1,TArg2,TArg3,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,TArg2,TArg3,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[0].ReturnValue;Argument[1].Parameter[0];value;hq-generated |
+| System.Threading.Tasks;TaskFactory<TResult>;FromAsync<TArg1,TArg2,TArg3>;(System.Func<TArg1,TArg2,TArg3,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,TArg2,TArg3,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[0];Argument[0].Parameter[delegate-self];value;dfc-generated |
 | System.Threading.Tasks;TaskFactory<TResult>;FromAsync<TArg1,TArg2,TArg3>;(System.Func<TArg1,TArg2,TArg3,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,TArg2,TArg3,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
+| System.Threading.Tasks;TaskFactory<TResult>;FromAsync<TArg1,TArg2,TArg3>;(System.Func<TArg1,TArg2,TArg3,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,TArg2,TArg3,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | System.Threading.Tasks;TaskFactory<TResult>;FromAsync<TArg1,TArg2,TArg3>;(System.Func<TArg1,TArg2,TArg3,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,TArg2,TArg3,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
+| System.Threading.Tasks;TaskFactory<TResult>;FromAsync<TArg1,TArg2,TArg3>;(System.Func<TArg1,TArg2,TArg3,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,TArg2,TArg3,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[2];Argument[0].Parameter[0];value;dfc-generated |
+| System.Threading.Tasks;TaskFactory<TResult>;FromAsync<TArg1,TArg2,TArg3>;(System.Func<TArg1,TArg2,TArg3,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,TArg2,TArg3,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[2];Argument[0].Parameter[0];value;hq-generated |
+| System.Threading.Tasks;TaskFactory<TResult>;FromAsync<TArg1,TArg2,TArg3>;(System.Func<TArg1,TArg2,TArg3,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,TArg2,TArg3,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[3];Argument[0].Parameter[1];value;dfc-generated |
+| System.Threading.Tasks;TaskFactory<TResult>;FromAsync<TArg1,TArg2,TArg3>;(System.Func<TArg1,TArg2,TArg3,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,TArg2,TArg3,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[3];Argument[0].Parameter[1];value;hq-generated |
+| System.Threading.Tasks;TaskFactory<TResult>;FromAsync<TArg1,TArg2,TArg3>;(System.Func<TArg1,TArg2,TArg3,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,TArg2,TArg3,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[4];Argument[0].Parameter[2];value;dfc-generated |
+| System.Threading.Tasks;TaskFactory<TResult>;FromAsync<TArg1,TArg2,TArg3>;(System.Func<TArg1,TArg2,TArg3,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,TArg2,TArg3,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[4];Argument[0].Parameter[2];value;hq-generated |
+| System.Threading.Tasks;TaskFactory<TResult>;FromAsync<TArg1,TArg2,TArg3>;(System.Func<TArg1,TArg2,TArg3,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,TArg2,TArg3,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[5];Argument[0].Parameter[4];value;dfc-generated |
+| System.Threading.Tasks;TaskFactory<TResult>;FromAsync<TArg1,TArg2,TArg3>;(System.Func<TArg1,TArg2,TArg3,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,TArg2,TArg3,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[5];Argument[0].Parameter[4];value;hq-generated |
+| System.Threading.Tasks;TaskFactory<TResult>;FromAsync<TArg1,TArg2>;(System.Func<TArg1,TArg2,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,TArg2,System.Object);Argument[0].ReturnValue;Argument[1].Parameter[0];value;dfc-generated |
+| System.Threading.Tasks;TaskFactory<TResult>;FromAsync<TArg1,TArg2>;(System.Func<TArg1,TArg2,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,TArg2,System.Object);Argument[0].ReturnValue;Argument[1].Parameter[0];value;hq-generated |
+| System.Threading.Tasks;TaskFactory<TResult>;FromAsync<TArg1,TArg2>;(System.Func<TArg1,TArg2,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,TArg2,System.Object);Argument[0];Argument[0].Parameter[delegate-self];value;dfc-generated |
 | System.Threading.Tasks;TaskFactory<TResult>;FromAsync<TArg1,TArg2>;(System.Func<TArg1,TArg2,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,TArg2,System.Object);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
+| System.Threading.Tasks;TaskFactory<TResult>;FromAsync<TArg1,TArg2>;(System.Func<TArg1,TArg2,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,TArg2,System.Object);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | System.Threading.Tasks;TaskFactory<TResult>;FromAsync<TArg1,TArg2>;(System.Func<TArg1,TArg2,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,TArg2,System.Object);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
+| System.Threading.Tasks;TaskFactory<TResult>;FromAsync<TArg1,TArg2>;(System.Func<TArg1,TArg2,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,TArg2,System.Object);Argument[2];Argument[0].Parameter[0];value;dfc-generated |
+| System.Threading.Tasks;TaskFactory<TResult>;FromAsync<TArg1,TArg2>;(System.Func<TArg1,TArg2,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,TArg2,System.Object);Argument[2];Argument[0].Parameter[0];value;hq-generated |
+| System.Threading.Tasks;TaskFactory<TResult>;FromAsync<TArg1,TArg2>;(System.Func<TArg1,TArg2,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,TArg2,System.Object);Argument[3];Argument[0].Parameter[1];value;dfc-generated |
+| System.Threading.Tasks;TaskFactory<TResult>;FromAsync<TArg1,TArg2>;(System.Func<TArg1,TArg2,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,TArg2,System.Object);Argument[3];Argument[0].Parameter[1];value;hq-generated |
+| System.Threading.Tasks;TaskFactory<TResult>;FromAsync<TArg1,TArg2>;(System.Func<TArg1,TArg2,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,TArg2,System.Object);Argument[4];Argument[0].Parameter[3];value;dfc-generated |
+| System.Threading.Tasks;TaskFactory<TResult>;FromAsync<TArg1,TArg2>;(System.Func<TArg1,TArg2,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,TArg2,System.Object);Argument[4];Argument[0].Parameter[3];value;hq-generated |
+| System.Threading.Tasks;TaskFactory<TResult>;FromAsync<TArg1,TArg2>;(System.Func<TArg1,TArg2,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,TArg2,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[0].ReturnValue;Argument[1].Parameter[0];value;dfc-generated |
+| System.Threading.Tasks;TaskFactory<TResult>;FromAsync<TArg1,TArg2>;(System.Func<TArg1,TArg2,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,TArg2,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[0].ReturnValue;Argument[1].Parameter[0];value;hq-generated |
+| System.Threading.Tasks;TaskFactory<TResult>;FromAsync<TArg1,TArg2>;(System.Func<TArg1,TArg2,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,TArg2,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[0];Argument[0].Parameter[delegate-self];value;dfc-generated |
 | System.Threading.Tasks;TaskFactory<TResult>;FromAsync<TArg1,TArg2>;(System.Func<TArg1,TArg2,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,TArg2,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
+| System.Threading.Tasks;TaskFactory<TResult>;FromAsync<TArg1,TArg2>;(System.Func<TArg1,TArg2,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,TArg2,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | System.Threading.Tasks;TaskFactory<TResult>;FromAsync<TArg1,TArg2>;(System.Func<TArg1,TArg2,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,TArg2,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
+| System.Threading.Tasks;TaskFactory<TResult>;FromAsync<TArg1,TArg2>;(System.Func<TArg1,TArg2,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,TArg2,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[2];Argument[0].Parameter[0];value;dfc-generated |
+| System.Threading.Tasks;TaskFactory<TResult>;FromAsync<TArg1,TArg2>;(System.Func<TArg1,TArg2,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,TArg2,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[2];Argument[0].Parameter[0];value;hq-generated |
+| System.Threading.Tasks;TaskFactory<TResult>;FromAsync<TArg1,TArg2>;(System.Func<TArg1,TArg2,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,TArg2,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[3];Argument[0].Parameter[1];value;dfc-generated |
+| System.Threading.Tasks;TaskFactory<TResult>;FromAsync<TArg1,TArg2>;(System.Func<TArg1,TArg2,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,TArg2,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[3];Argument[0].Parameter[1];value;hq-generated |
+| System.Threading.Tasks;TaskFactory<TResult>;FromAsync<TArg1,TArg2>;(System.Func<TArg1,TArg2,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,TArg2,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[4];Argument[0].Parameter[3];value;dfc-generated |
+| System.Threading.Tasks;TaskFactory<TResult>;FromAsync<TArg1,TArg2>;(System.Func<TArg1,TArg2,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,TArg2,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[4];Argument[0].Parameter[3];value;hq-generated |
+| System.Threading.Tasks;TaskFactory<TResult>;FromAsync<TArg1>;(System.Func<TArg1,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,System.Object);Argument[0].ReturnValue;Argument[1].Parameter[0];value;dfc-generated |
+| System.Threading.Tasks;TaskFactory<TResult>;FromAsync<TArg1>;(System.Func<TArg1,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,System.Object);Argument[0].ReturnValue;Argument[1].Parameter[0];value;hq-generated |
+| System.Threading.Tasks;TaskFactory<TResult>;FromAsync<TArg1>;(System.Func<TArg1,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,System.Object);Argument[0];Argument[0].Parameter[delegate-self];value;dfc-generated |
 | System.Threading.Tasks;TaskFactory<TResult>;FromAsync<TArg1>;(System.Func<TArg1,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,System.Object);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
+| System.Threading.Tasks;TaskFactory<TResult>;FromAsync<TArg1>;(System.Func<TArg1,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,System.Object);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | System.Threading.Tasks;TaskFactory<TResult>;FromAsync<TArg1>;(System.Func<TArg1,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,System.Object);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
+| System.Threading.Tasks;TaskFactory<TResult>;FromAsync<TArg1>;(System.Func<TArg1,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,System.Object);Argument[2];Argument[0].Parameter[0];value;dfc-generated |
+| System.Threading.Tasks;TaskFactory<TResult>;FromAsync<TArg1>;(System.Func<TArg1,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,System.Object);Argument[2];Argument[0].Parameter[0];value;hq-generated |
+| System.Threading.Tasks;TaskFactory<TResult>;FromAsync<TArg1>;(System.Func<TArg1,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,System.Object);Argument[3];Argument[0].Parameter[2];value;dfc-generated |
+| System.Threading.Tasks;TaskFactory<TResult>;FromAsync<TArg1>;(System.Func<TArg1,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,System.Object);Argument[3];Argument[0].Parameter[2];value;hq-generated |
+| System.Threading.Tasks;TaskFactory<TResult>;FromAsync<TArg1>;(System.Func<TArg1,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[0].ReturnValue;Argument[1].Parameter[0];value;dfc-generated |
+| System.Threading.Tasks;TaskFactory<TResult>;FromAsync<TArg1>;(System.Func<TArg1,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[0].ReturnValue;Argument[1].Parameter[0];value;hq-generated |
+| System.Threading.Tasks;TaskFactory<TResult>;FromAsync<TArg1>;(System.Func<TArg1,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[0];Argument[0].Parameter[delegate-self];value;dfc-generated |
 | System.Threading.Tasks;TaskFactory<TResult>;FromAsync<TArg1>;(System.Func<TArg1,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
+| System.Threading.Tasks;TaskFactory<TResult>;FromAsync<TArg1>;(System.Func<TArg1,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | System.Threading.Tasks;TaskFactory<TResult>;FromAsync<TArg1>;(System.Func<TArg1,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
+| System.Threading.Tasks;TaskFactory<TResult>;FromAsync<TArg1>;(System.Func<TArg1,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[2];Argument[0].Parameter[0];value;dfc-generated |
+| System.Threading.Tasks;TaskFactory<TResult>;FromAsync<TArg1>;(System.Func<TArg1,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[2];Argument[0].Parameter[0];value;hq-generated |
+| System.Threading.Tasks;TaskFactory<TResult>;FromAsync<TArg1>;(System.Func<TArg1,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[3];Argument[0].Parameter[2];value;dfc-generated |
+| System.Threading.Tasks;TaskFactory<TResult>;FromAsync<TArg1>;(System.Func<TArg1,System.AsyncCallback,System.Object,System.IAsyncResult>,System.Func<System.IAsyncResult,TResult>,TArg1,System.Object,System.Threading.Tasks.TaskCreationOptions);Argument[3];Argument[0].Parameter[2];value;hq-generated |
 | System.Threading.Tasks;TaskFactory<TResult>;StartNew;(System.Func<System.Object,TResult>,System.Object);Argument[0].ReturnValue;ReturnValue.Property[System.Threading.Tasks.Task`1.Result];value;manual |
 | System.Threading.Tasks;TaskFactory<TResult>;StartNew;(System.Func<System.Object,TResult>,System.Object);Argument[0];Argument[0].Parameter[delegate-self];value;manual |
 | System.Threading.Tasks;TaskFactory<TResult>;StartNew;(System.Func<System.Object,TResult>,System.Object);Argument[1];Argument[0].Parameter[0];value;manual |
@@ -12709,65 +13748,113 @@
 | System.Threading.Tasks;TaskFactory<TResult>;StartNew;(System.Func<TResult>,System.Threading.CancellationToken,System.Threading.Tasks.TaskCreationOptions,System.Threading.Tasks.TaskScheduler);Argument[0];Argument[0].Parameter[delegate-self];value;manual |
 | System.Threading.Tasks;TaskFactory<TResult>;StartNew;(System.Func<TResult>,System.Threading.Tasks.TaskCreationOptions);Argument[0].ReturnValue;ReturnValue.Property[System.Threading.Tasks.Task`1.Result];value;manual |
 | System.Threading.Tasks;TaskFactory<TResult>;StartNew;(System.Func<TResult>,System.Threading.Tasks.TaskCreationOptions);Argument[0];Argument[0].Parameter[delegate-self];value;manual |
-| System.Threading.Tasks;TaskFactory<TResult>;TaskFactory;(System.Threading.CancellationToken);Argument[0];Argument[this];taint;df-generated |
-| System.Threading.Tasks;TaskFactory<TResult>;TaskFactory;(System.Threading.CancellationToken,System.Threading.Tasks.TaskCreationOptions,System.Threading.Tasks.TaskContinuationOptions,System.Threading.Tasks.TaskScheduler);Argument[0];Argument[this];taint;df-generated |
-| System.Threading.Tasks;TaskFactory<TResult>;TaskFactory;(System.Threading.CancellationToken,System.Threading.Tasks.TaskCreationOptions,System.Threading.Tasks.TaskContinuationOptions,System.Threading.Tasks.TaskScheduler);Argument[3];Argument[this];taint;df-generated |
-| System.Threading.Tasks;TaskFactory<TResult>;TaskFactory;(System.Threading.Tasks.TaskScheduler);Argument[0];Argument[this];taint;df-generated |
-| System.Threading.Tasks;TaskFactory<TResult>;get_CancellationToken;();Argument[this];ReturnValue;taint;df-generated |
-| System.Threading.Tasks;TaskFactory<TResult>;get_Scheduler;();Argument[this];ReturnValue;taint;df-generated |
+| System.Threading.Tasks;TaskFactory<TResult>;TaskFactory;(System.Threading.CancellationToken);Argument[0];Argument[this].SyntheticField[System.Threading.Tasks.TaskFactory`1.m_defaultCancellationToken];value;dfc-generated |
+| System.Threading.Tasks;TaskFactory<TResult>;TaskFactory;(System.Threading.CancellationToken,System.Threading.Tasks.TaskCreationOptions,System.Threading.Tasks.TaskContinuationOptions,System.Threading.Tasks.TaskScheduler);Argument[0];Argument[this].SyntheticField[System.Threading.Tasks.TaskFactory`1.m_defaultCancellationToken];value;dfc-generated |
+| System.Threading.Tasks;TaskFactory<TResult>;TaskFactory;(System.Threading.CancellationToken,System.Threading.Tasks.TaskCreationOptions,System.Threading.Tasks.TaskContinuationOptions,System.Threading.Tasks.TaskScheduler);Argument[3];Argument[this].SyntheticField[System.Threading.Tasks.TaskFactory`1.m_defaultScheduler];value;dfc-generated |
+| System.Threading.Tasks;TaskFactory<TResult>;TaskFactory;(System.Threading.Tasks.TaskScheduler);Argument[0];Argument[this].SyntheticField[System.Threading.Tasks.TaskFactory`1.m_defaultScheduler];value;dfc-generated |
+| System.Threading.Tasks;TaskFactory<TResult>;get_CancellationToken;();Argument[this].SyntheticField[System.Threading.Tasks.TaskFactory`1.m_defaultCancellationToken];ReturnValue;value;dfc-generated |
+| System.Threading.Tasks;TaskFactory<TResult>;get_Scheduler;();Argument[this].SyntheticField[System.Threading.Tasks.TaskFactory`1.m_defaultScheduler];ReturnValue;value;dfc-generated |
 | System.Threading.Tasks;TaskScheduler;GetScheduledTasks;();Argument[this];ReturnValue;taint;df-generated |
 | System.Threading.Tasks;TaskScheduler;add_UnobservedTaskException;(System.EventHandler<System.Threading.Tasks.UnobservedTaskExceptionEventArgs>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Threading.Tasks;TaskScheduler;remove_UnobservedTaskException;(System.EventHandler<System.Threading.Tasks.UnobservedTaskExceptionEventArgs>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
+| System.Threading.Tasks;TaskToAsyncResult;Begin;(System.Threading.Tasks.Task,System.AsyncCallback,System.Object);Argument[0];ReturnValue.SyntheticField[System.Threading.Tasks.TaskToAsyncResult+TaskAsyncResult._task];value;dfc-generated |
+| System.Threading.Tasks;TaskToAsyncResult;Begin;(System.Threading.Tasks.Task,System.AsyncCallback,System.Object);Argument[0];ReturnValue.SyntheticField[System.Threading.Tasks.TaskToAsyncResult+TaskAsyncResult._task];value;hq-generated |
+| System.Threading.Tasks;TaskToAsyncResult;Begin;(System.Threading.Tasks.Task,System.AsyncCallback,System.Object);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | System.Threading.Tasks;TaskToAsyncResult;Begin;(System.Threading.Tasks.Task,System.AsyncCallback,System.Object);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
-| System.Threading.Tasks;UnobservedTaskExceptionEventArgs;UnobservedTaskExceptionEventArgs;(System.AggregateException);Argument[0];Argument[this];taint;df-generated |
-| System.Threading.Tasks;UnobservedTaskExceptionEventArgs;get_Exception;();Argument[this];ReturnValue;taint;df-generated |
-| System.Threading.Tasks;ValueTask;AsTask;();Argument[this];ReturnValue;taint;df-generated |
+| System.Threading.Tasks;UnobservedTaskExceptionEventArgs;UnobservedTaskExceptionEventArgs;(System.AggregateException);Argument[0];Argument[this].SyntheticField[System.Threading.Tasks.UnobservedTaskExceptionEventArgs.m_exception];value;dfc-generated |
+| System.Threading.Tasks;UnobservedTaskExceptionEventArgs;get_Exception;();Argument[this].SyntheticField[System.Threading.Tasks.UnobservedTaskExceptionEventArgs.m_exception];ReturnValue;value;dfc-generated |
+| System.Threading.Tasks;ValueTask;AsTask;();Argument[this].SyntheticField[System.Threading.Tasks.ValueTask._obj];ReturnValue;value;dfc-generated |
 | System.Threading.Tasks;ValueTask;ConfigureAwait;(System.Boolean);Argument[this];ReturnValue;taint;df-generated |
 | System.Threading.Tasks;ValueTask;FromResult<TResult>;(TResult);Argument[0];ReturnValue;taint;df-generated |
 | System.Threading.Tasks;ValueTask;GetAwaiter;();Argument[this];ReturnValue;taint;df-generated |
-| System.Threading.Tasks;ValueTask;Preserve;();Argument[this];ReturnValue;taint;df-generated |
-| System.Threading.Tasks;ValueTask;ValueTask;(System.Threading.Tasks.Sources.IValueTaskSource,System.Int16);Argument[0];Argument[this];taint;df-generated |
-| System.Threading.Tasks;ValueTask;ValueTask;(System.Threading.Tasks.Task);Argument[0];Argument[this];taint;df-generated |
-| System.Threading.Tasks;ValueTask<TResult>;AsTask;();Argument[this];ReturnValue;taint;df-generated |
+| System.Threading.Tasks;ValueTask;Preserve;();Argument[this].SyntheticField[System.Threading.Tasks.ValueTask._obj];ReturnValue.SyntheticField[System.Threading.Tasks.ValueTask._obj];value;dfc-generated |
+| System.Threading.Tasks;ValueTask;Preserve;();Argument[this];ReturnValue;value;dfc-generated |
+| System.Threading.Tasks;ValueTask;ValueTask;(System.Threading.Tasks.Sources.IValueTaskSource,System.Int16);Argument[0];Argument[this].SyntheticField[System.Threading.Tasks.ValueTask._obj];value;dfc-generated |
+| System.Threading.Tasks;ValueTask;ValueTask;(System.Threading.Tasks.Task);Argument[0];Argument[this].SyntheticField[System.Threading.Tasks.ValueTask._obj];value;dfc-generated |
+| System.Threading.Tasks;ValueTask<TResult>;AsTask;();Argument[this].SyntheticField[System.Threading.Tasks.ValueTask`1._obj];ReturnValue;value;dfc-generated |
+| System.Threading.Tasks;ValueTask<TResult>;AsTask;();Argument[this].SyntheticField[System.Threading.Tasks.ValueTask`1._result];ReturnValue.Property[System.Threading.Tasks.Task`1.Result];value;dfc-generated |
 | System.Threading.Tasks;ValueTask<TResult>;ConfigureAwait;(System.Boolean);Argument[this];ReturnValue;taint;df-generated |
 | System.Threading.Tasks;ValueTask<TResult>;GetAwaiter;();Argument[this];ReturnValue;taint;df-generated |
 | System.Threading.Tasks;ValueTask<TResult>;Preserve;();Argument[this];ReturnValue;taint;df-generated |
 | System.Threading.Tasks;ValueTask<TResult>;ToString;();Argument[this];ReturnValue;taint;df-generated |
-| System.Threading.Tasks;ValueTask<TResult>;ValueTask;(System.Threading.Tasks.Sources.IValueTaskSource<TResult>,System.Int16);Argument[0];Argument[this];taint;df-generated |
-| System.Threading.Tasks;ValueTask<TResult>;ValueTask;(System.Threading.Tasks.Task<TResult>);Argument[0];Argument[this];taint;df-generated |
-| System.Threading.Tasks;ValueTask<TResult>;ValueTask;(TResult);Argument[0];Argument[this];taint;df-generated |
-| System.Threading.Tasks;ValueTask<TResult>;get_Result;();Argument[this];ReturnValue;taint;df-generated |
-| System.Threading;AbandonedMutexException;AbandonedMutexException;(System.Int32,System.Threading.WaitHandle);Argument[1];Argument[this];taint;df-generated |
-| System.Threading;AbandonedMutexException;AbandonedMutexException;(System.String,System.Exception,System.Int32,System.Threading.WaitHandle);Argument[3];Argument[this];taint;df-generated |
-| System.Threading;AbandonedMutexException;AbandonedMutexException;(System.String,System.Int32,System.Threading.WaitHandle);Argument[2];Argument[this];taint;df-generated |
-| System.Threading;AbandonedMutexException;get_Mutex;();Argument[this];ReturnValue;taint;df-generated |
+| System.Threading.Tasks;ValueTask<TResult>;ValueTask;(System.Threading.Tasks.Sources.IValueTaskSource<TResult>,System.Int16);Argument[0];Argument[this].SyntheticField[System.Threading.Tasks.ValueTask`1._obj];value;dfc-generated |
+| System.Threading.Tasks;ValueTask<TResult>;ValueTask;(System.Threading.Tasks.Task<TResult>);Argument[0];Argument[this].SyntheticField[System.Threading.Tasks.ValueTask`1._obj];value;dfc-generated |
+| System.Threading.Tasks;ValueTask<TResult>;ValueTask;(TResult);Argument[0];Argument[this].SyntheticField[System.Threading.Tasks.ValueTask`1._result];value;dfc-generated |
+| System.Threading.Tasks;ValueTask<TResult>;get_Result;();Argument[this].SyntheticField[System.Threading.Tasks.ValueTask`1._result];ReturnValue;value;dfc-generated |
+| System.Threading;AbandonedMutexException;AbandonedMutexException;(System.Int32,System.Threading.WaitHandle);Argument[1];Argument[this].SyntheticField[System.Threading.AbandonedMutexException._mutex];value;dfc-generated |
+| System.Threading;AbandonedMutexException;AbandonedMutexException;(System.String,System.Exception,System.Int32,System.Threading.WaitHandle);Argument[3];Argument[this].SyntheticField[System.Threading.AbandonedMutexException._mutex];value;dfc-generated |
+| System.Threading;AbandonedMutexException;AbandonedMutexException;(System.String,System.Int32,System.Threading.WaitHandle);Argument[2];Argument[this].SyntheticField[System.Threading.AbandonedMutexException._mutex];value;dfc-generated |
+| System.Threading;AbandonedMutexException;get_Mutex;();Argument[this].SyntheticField[System.Threading.AbandonedMutexException._mutex];ReturnValue;value;dfc-generated |
 | System.Threading;AsyncLocal<T>;AsyncLocal;(System.Action<System.Threading.AsyncLocalValueChangedArgs<T>>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Threading;Barrier;Barrier;(System.Int32,System.Action<System.Threading.Barrier>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
 | System.Threading;CancellationToken;Register;(System.Action);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Threading;CancellationToken;Register;(System.Action,System.Boolean);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
+| System.Threading;CancellationToken;Register;(System.Action<System.Object,System.Threading.CancellationToken>,System.Object);Argument[0];Argument[0].Parameter[delegate-self];value;dfc-generated |
 | System.Threading;CancellationToken;Register;(System.Action<System.Object,System.Threading.CancellationToken>,System.Object);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
+| System.Threading;CancellationToken;Register;(System.Action<System.Object,System.Threading.CancellationToken>,System.Object);Argument[1];Argument[0].Parameter[0];value;dfc-generated |
+| System.Threading;CancellationToken;Register;(System.Action<System.Object,System.Threading.CancellationToken>,System.Object);Argument[1];Argument[0].Parameter[0];value;hq-generated |
+| System.Threading;CancellationToken;Register;(System.Action<System.Object>,System.Object);Argument[0];Argument[0].Parameter[delegate-self];value;dfc-generated |
 | System.Threading;CancellationToken;Register;(System.Action<System.Object>,System.Object);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
+| System.Threading;CancellationToken;Register;(System.Action<System.Object>,System.Object);Argument[1];Argument[0].Parameter[0];value;dfc-generated |
+| System.Threading;CancellationToken;Register;(System.Action<System.Object>,System.Object);Argument[1];Argument[0].Parameter[0];value;hq-generated |
+| System.Threading;CancellationToken;Register;(System.Action<System.Object>,System.Object,System.Boolean);Argument[0];Argument[0].Parameter[delegate-self];value;dfc-generated |
 | System.Threading;CancellationToken;Register;(System.Action<System.Object>,System.Object,System.Boolean);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
+| System.Threading;CancellationToken;Register;(System.Action<System.Object>,System.Object,System.Boolean);Argument[1];Argument[0].Parameter[0];value;dfc-generated |
+| System.Threading;CancellationToken;Register;(System.Action<System.Object>,System.Object,System.Boolean);Argument[1];Argument[0].Parameter[0];value;hq-generated |
+| System.Threading;CancellationToken;UnsafeRegister;(System.Action<System.Object,System.Threading.CancellationToken>,System.Object);Argument[0];Argument[0].Parameter[delegate-self];value;dfc-generated |
 | System.Threading;CancellationToken;UnsafeRegister;(System.Action<System.Object,System.Threading.CancellationToken>,System.Object);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
+| System.Threading;CancellationToken;UnsafeRegister;(System.Action<System.Object,System.Threading.CancellationToken>,System.Object);Argument[1];Argument[0].Parameter[0];value;dfc-generated |
+| System.Threading;CancellationToken;UnsafeRegister;(System.Action<System.Object,System.Threading.CancellationToken>,System.Object);Argument[1];Argument[0].Parameter[0];value;hq-generated |
+| System.Threading;CancellationToken;UnsafeRegister;(System.Action<System.Object>,System.Object);Argument[0];Argument[0].Parameter[delegate-self];value;dfc-generated |
 | System.Threading;CancellationToken;UnsafeRegister;(System.Action<System.Object>,System.Object);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
+| System.Threading;CancellationToken;UnsafeRegister;(System.Action<System.Object>,System.Object);Argument[1];Argument[0].Parameter[0];value;dfc-generated |
+| System.Threading;CancellationToken;UnsafeRegister;(System.Action<System.Object>,System.Object);Argument[1];Argument[0].Parameter[0];value;hq-generated |
 | System.Threading;CancellationToken;get_WaitHandle;();Argument[this];ReturnValue;taint;df-generated |
-| System.Threading;CancellationTokenSource;CancelAsync;();Argument[this];ReturnValue;taint;df-generated |
+| System.Threading;CancellationTokenSource;CancelAsync;();Argument[this];ReturnValue.SyntheticField[System.Threading.Tasks.Task.m_stateObject];value;dfc-generated |
 | System.Threading;CancellationTokenSource;get_Token;();Argument[this];ReturnValue;taint;df-generated |
-| System.Threading;CompressedStack;CreateCopy;();Argument[this];ReturnValue;value;df-generated |
+| System.Threading;CompressedStack;CreateCopy;();Argument[this];ReturnValue;value;dfc-generated |
+| System.Threading;CompressedStack;Run;(System.Threading.CompressedStack,System.Threading.ContextCallback,System.Object);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | System.Threading;CompressedStack;Run;(System.Threading.CompressedStack,System.Threading.ContextCallback,System.Object);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
+| System.Threading;CompressedStack;Run;(System.Threading.CompressedStack,System.Threading.ContextCallback,System.Object);Argument[2];Argument[1].Parameter[0];value;dfc-generated |
+| System.Threading;CompressedStack;Run;(System.Threading.CompressedStack,System.Threading.ContextCallback,System.Object);Argument[2];Argument[1].Parameter[0];value;hq-generated |
 | System.Threading;ContextCallback;BeginInvoke;(System.Object,System.AsyncCallback,System.Object);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
 | System.Threading;CountdownEvent;get_WaitHandle;();Argument[this];ReturnValue;taint;df-generated |
-| System.Threading;ExecutionContext;CreateCopy;();Argument[this];ReturnValue;value;df-generated |
+| System.Threading;ExecutionContext;CreateCopy;();Argument[this];ReturnValue;value;dfc-generated |
+| System.Threading;ExecutionContext;Run;(System.Threading.ExecutionContext,System.Threading.ContextCallback,System.Object);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | System.Threading;ExecutionContext;Run;(System.Threading.ExecutionContext,System.Threading.ContextCallback,System.Object);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
+| System.Threading;ExecutionContext;Run;(System.Threading.ExecutionContext,System.Threading.ContextCallback,System.Object);Argument[2];Argument[1].Parameter[0];value;dfc-generated |
+| System.Threading;ExecutionContext;Run;(System.Threading.ExecutionContext,System.Threading.ContextCallback,System.Object);Argument[2];Argument[1].Parameter[0];value;hq-generated |
 | System.Threading;HostExecutionContextManager;SetHostExecutionContext;(System.Threading.HostExecutionContext);Argument[0];ReturnValue;taint;df-generated |
 | System.Threading;IOCompletionCallback;BeginInvoke;(System.UInt32,System.UInt32,System.Threading.NativeOverlapped*,System.AsyncCallback,System.Object);Argument[3];Argument[3].Parameter[delegate-self];value;hq-generated |
-| System.Threading;LazyInitializer;EnsureInitialized<T>;(T);Argument[0];ReturnValue;taint;df-generated |
-| System.Threading;LazyInitializer;EnsureInitialized<T>;(T,System.Boolean,System.Object);Argument[0];ReturnValue;taint;df-generated |
-| System.Threading;LazyInitializer;EnsureInitialized<T>;(T,System.Boolean,System.Object);Argument[2];ReturnValue;taint;df-generated |
+| System.Threading;Interlocked;CompareExchange;(System.IntPtr,System.IntPtr,System.IntPtr);Argument[0];ReturnValue;value;dfc-generated |
+| System.Threading;Interlocked;CompareExchange;(System.UIntPtr,System.UIntPtr,System.UIntPtr);Argument[0];ReturnValue;value;dfc-generated |
+| System.Threading;Interlocked;CompareExchange<T>;(T,T,T);Argument[0];ReturnValue;value;dfc-generated |
+| System.Threading;Interlocked;Exchange;(System.IntPtr,System.IntPtr);Argument[0];ReturnValue;value;dfc-generated |
+| System.Threading;Interlocked;Exchange;(System.UIntPtr,System.UIntPtr);Argument[0];ReturnValue;value;dfc-generated |
+| System.Threading;Interlocked;Exchange<T>;(T,T);Argument[0];ReturnValue;value;dfc-generated |
+| System.Threading;LazyInitializer;EnsureInitialized<T>;(T);Argument[0];ReturnValue;value;dfc-generated |
+| System.Threading;LazyInitializer;EnsureInitialized<T>;(T,System.Boolean,System.Object);Argument[0];ReturnValue;value;dfc-generated |
+| System.Threading;LazyInitializer;EnsureInitialized<T>;(T,System.Boolean,System.Object);Argument[2];ReturnValue;value;dfc-generated |
+| System.Threading;LazyInitializer;EnsureInitialized<T>;(T,System.Boolean,System.Object,System.Func<T>);Argument[0];ReturnValue;value;dfc-generated |
+| System.Threading;LazyInitializer;EnsureInitialized<T>;(T,System.Boolean,System.Object,System.Func<T>);Argument[0];ReturnValue;value;hq-generated |
+| System.Threading;LazyInitializer;EnsureInitialized<T>;(T,System.Boolean,System.Object,System.Func<T>);Argument[2];ReturnValue;value;dfc-generated |
+| System.Threading;LazyInitializer;EnsureInitialized<T>;(T,System.Boolean,System.Object,System.Func<T>);Argument[2];ReturnValue;value;hq-generated |
+| System.Threading;LazyInitializer;EnsureInitialized<T>;(T,System.Boolean,System.Object,System.Func<T>);Argument[3].ReturnValue;ReturnValue;value;dfc-generated |
+| System.Threading;LazyInitializer;EnsureInitialized<T>;(T,System.Boolean,System.Object,System.Func<T>);Argument[3].ReturnValue;ReturnValue;value;hq-generated |
+| System.Threading;LazyInitializer;EnsureInitialized<T>;(T,System.Boolean,System.Object,System.Func<T>);Argument[3];Argument[3].Parameter[delegate-self];value;dfc-generated |
 | System.Threading;LazyInitializer;EnsureInitialized<T>;(T,System.Boolean,System.Object,System.Func<T>);Argument[3];Argument[3].Parameter[delegate-self];value;hq-generated |
+| System.Threading;LazyInitializer;EnsureInitialized<T>;(T,System.Func<T>);Argument[0];ReturnValue;value;dfc-generated |
+| System.Threading;LazyInitializer;EnsureInitialized<T>;(T,System.Func<T>);Argument[0];ReturnValue;value;hq-generated |
+| System.Threading;LazyInitializer;EnsureInitialized<T>;(T,System.Func<T>);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | System.Threading;LazyInitializer;EnsureInitialized<T>;(T,System.Func<T>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
+| System.Threading;LazyInitializer;EnsureInitialized<T>;(T,System.Object,System.Func<T>);Argument[0];ReturnValue;value;dfc-generated |
+| System.Threading;LazyInitializer;EnsureInitialized<T>;(T,System.Object,System.Func<T>);Argument[0];ReturnValue;value;hq-generated |
+| System.Threading;LazyInitializer;EnsureInitialized<T>;(T,System.Object,System.Func<T>);Argument[1];ReturnValue;value;dfc-generated |
+| System.Threading;LazyInitializer;EnsureInitialized<T>;(T,System.Object,System.Func<T>);Argument[1];ReturnValue;value;hq-generated |
+| System.Threading;LazyInitializer;EnsureInitialized<T>;(T,System.Object,System.Func<T>);Argument[2];Argument[2].Parameter[delegate-self];value;dfc-generated |
 | System.Threading;LazyInitializer;EnsureInitialized<T>;(T,System.Object,System.Func<T>);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
 | System.Threading;ManualResetEventSlim;get_WaitHandle;();Argument[this];ReturnValue;taint;df-generated |
+| System.Threading;Mutex;TryOpenExisting;(System.String,System.Threading.Mutex);Argument[1];ReturnValue;value;dfc-generated |
 | System.Threading;Overlapped;Overlapped;(System.Int32,System.Int32,System.IntPtr,System.IAsyncResult);Argument[2];Argument[this];taint;df-generated |
 | System.Threading;Overlapped;Overlapped;(System.Int32,System.Int32,System.IntPtr,System.IAsyncResult);Argument[3];Argument[this];taint;df-generated |
 | System.Threading;Overlapped;Pack;(System.Threading.IOCompletionCallback);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
@@ -12780,6 +13867,8 @@
 | System.Threading;PeriodicTimer;WaitForNextTickAsync;(System.Threading.CancellationToken);Argument[this];ReturnValue;taint;df-generated |
 | System.Threading;PreAllocatedOverlapped;PreAllocatedOverlapped;(System.Threading.IOCompletionCallback,System.Object,System.Object);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Threading;PreAllocatedOverlapped;UnsafeCreate;(System.Threading.IOCompletionCallback,System.Object,System.Object);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
+| System.Threading;ReaderWriterLock;DowngradeFromWriterLock;(System.Threading.LockCookie);Argument[0];ReturnValue;value;dfc-generated |
+| System.Threading;ReaderWriterLock;RestoreLock;(System.Threading.LockCookie);Argument[0];ReturnValue;value;dfc-generated |
 | System.Threading;RegisteredWaitHandle;Unregister;(System.Threading.WaitHandle);Argument[0];Argument[this];taint;df-generated |
 | System.Threading;SemaphoreSlim;WaitAsync;();Argument[this];ReturnValue;taint;df-generated |
 | System.Threading;SemaphoreSlim;WaitAsync;(System.Int32);Argument[this];ReturnValue;taint;df-generated |
@@ -12793,15 +13882,24 @@
 | System.Threading;SpinWait;SpinUntil;(System.Func<System.Boolean>,System.Int32);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Threading;SpinWait;SpinUntil;(System.Func<System.Boolean>,System.TimeSpan);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Threading;SynchronizationContext;Post;(System.Threading.SendOrPostCallback,System.Object);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
+| System.Threading;SynchronizationContext;Send;(System.Threading.SendOrPostCallback,System.Object);Argument[0];Argument[0].Parameter[delegate-self];value;dfc-generated |
 | System.Threading;SynchronizationContext;Send;(System.Threading.SendOrPostCallback,System.Object);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
-| System.Threading;Thread;GetData;(System.LocalDataStoreSlot);Argument[0];ReturnValue;taint;df-generated |
-| System.Threading;Thread;SetData;(System.LocalDataStoreSlot,System.Object);Argument[1];Argument[0];taint;df-generated |
+| System.Threading;SynchronizationContext;Send;(System.Threading.SendOrPostCallback,System.Object);Argument[1];Argument[0].Parameter[0];value;dfc-generated |
+| System.Threading;SynchronizationContext;Send;(System.Threading.SendOrPostCallback,System.Object);Argument[1];Argument[0].Parameter[0];value;hq-generated |
+| System.Threading;Thread;GetData;(System.LocalDataStoreSlot);Argument[0].SyntheticField[System.LocalDataStoreSlot.Data].Property[System.Threading.ThreadLocal`1.Value];ReturnValue;value;dfc-generated |
+| System.Threading;Thread;SetData;(System.LocalDataStoreSlot,System.Object);Argument[1];Argument[0].SyntheticField[System.LocalDataStoreSlot.Data].Property[System.Threading.ThreadLocal`1.Value];value;dfc-generated |
 | System.Threading;Thread;Thread;(System.Threading.ParameterizedThreadStart);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Threading;Thread;Thread;(System.Threading.ParameterizedThreadStart,System.Int32);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Threading;Thread;Thread;(System.Threading.ThreadStart);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Threading;Thread;Thread;(System.Threading.ThreadStart,System.Int32);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
-| System.Threading;ThreadExceptionEventArgs;ThreadExceptionEventArgs;(System.Exception);Argument[0];Argument[this];taint;df-generated |
-| System.Threading;ThreadExceptionEventArgs;get_Exception;();Argument[this];ReturnValue;taint;df-generated |
+| System.Threading;Thread;VolatileRead;(System.IntPtr);Argument[0];ReturnValue;value;dfc-generated |
+| System.Threading;Thread;VolatileRead;(System.Object);Argument[0];ReturnValue;value;dfc-generated |
+| System.Threading;Thread;VolatileRead;(System.UIntPtr);Argument[0];ReturnValue;value;dfc-generated |
+| System.Threading;Thread;VolatileWrite;(System.IntPtr,System.IntPtr);Argument[0];ReturnValue;value;dfc-generated |
+| System.Threading;Thread;VolatileWrite;(System.Object,System.Object);Argument[0];ReturnValue;value;dfc-generated |
+| System.Threading;Thread;VolatileWrite;(System.UIntPtr,System.UIntPtr);Argument[0];ReturnValue;value;dfc-generated |
+| System.Threading;ThreadExceptionEventArgs;ThreadExceptionEventArgs;(System.Exception);Argument[0];Argument[this].SyntheticField[System.Threading.ThreadExceptionEventArgs.m_exception];value;dfc-generated |
+| System.Threading;ThreadExceptionEventArgs;get_Exception;();Argument[this].SyntheticField[System.Threading.ThreadExceptionEventArgs.m_exception];ReturnValue;value;dfc-generated |
 | System.Threading;ThreadExceptionEventHandler;BeginInvoke;(System.Object,System.Threading.ThreadExceptionEventArgs,System.AsyncCallback,System.Object);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
 | System.Threading;ThreadLocal<T>;ThreadLocal;(System.Func<T>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Threading;ThreadLocal<T>;ThreadLocal;(System.Func<T>,System.Boolean);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
@@ -12830,21 +13928,32 @@
 | System.Threading;Timer;Timer;(System.Threading.TimerCallback,System.Object,System.TimeSpan,System.TimeSpan);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Threading;Timer;Timer;(System.Threading.TimerCallback,System.Object,System.UInt32,System.UInt32);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Threading;TimerCallback;BeginInvoke;(System.Object,System.AsyncCallback,System.Object);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
+| System.Threading;Volatile;Write;(System.IntPtr,System.IntPtr);Argument[0];ReturnValue;value;dfc-generated |
+| System.Threading;Volatile;Write;(System.UIntPtr,System.UIntPtr);Argument[0];ReturnValue;value;dfc-generated |
+| System.Threading;Volatile;Write<T>;(T,T);Argument[0];ReturnValue;value;dfc-generated |
 | System.Threading;WaitCallback;BeginInvoke;(System.Object,System.AsyncCallback,System.Object);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
-| System.Threading;WaitHandleExtensions;GetSafeWaitHandle;(System.Threading.WaitHandle);Argument[0];ReturnValue;taint;df-generated |
+| System.Threading;WaitHandleExtensions;GetSafeWaitHandle;(System.Threading.WaitHandle);Argument[0].Property[System.Threading.WaitHandle.SafeWaitHandle];ReturnValue;value;dfc-generated |
 | System.Threading;WaitHandleExtensions;SetSafeWaitHandle;(System.Threading.WaitHandle,Microsoft.Win32.SafeHandles.SafeWaitHandle);Argument[1];Argument[0];taint;df-generated |
 | System.Threading;WaitOrTimerCallback;BeginInvoke;(System.Object,System.Boolean,System.AsyncCallback,System.Object);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
 | System.Timers;ElapsedEventHandler;BeginInvoke;(System.Object,System.Timers.ElapsedEventArgs,System.AsyncCallback,System.Object);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
 | System.Timers;Timer;add_Elapsed;(System.Timers.ElapsedEventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Timers;Timer;remove_Elapsed;(System.Timers.ElapsedEventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
-| System.Timers;TimersDescriptionAttribute;get_Description;();Argument[this];ReturnValue;taint;df-generated |
+| System.Timers;TimersDescriptionAttribute;get_Description;();Argument[this].Property[System.ComponentModel.DescriptionAttribute.DescriptionValue];ReturnValue;value;dfc-generated |
+| System.Timers;TimersDescriptionAttribute;get_Description;();Argument[this].Property[System.ComponentModel.DescriptionAttribute.Description];Argument[this].Property[System.ComponentModel.DescriptionAttribute.DescriptionValue];taint;dfc-generated |
+| System.Timers;TimersDescriptionAttribute;get_Description;();Argument[this].Property[System.ComponentModel.DescriptionAttribute.Description];ReturnValue;value;dfc-generated |
+| System.Transactions;CommittableTransaction;BeginCommit;(System.AsyncCallback,System.Object);Argument[0];Argument[0].Parameter[delegate-self];value;dfc-generated |
 | System.Transactions;CommittableTransaction;BeginCommit;(System.AsyncCallback,System.Object);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
+| System.Transactions;CommittableTransaction;BeginCommit;(System.AsyncCallback,System.Object);Argument[1];ReturnValue.SyntheticField[System.Transactions.Transaction._internalTransaction].SyntheticField[System.Transactions.InternalTransaction._asyncState];value;dfc-generated |
+| System.Transactions;CommittableTransaction;BeginCommit;(System.AsyncCallback,System.Object);Argument[1];ReturnValue.SyntheticField[System.Transactions.Transaction._internalTransaction].SyntheticField[System.Transactions.InternalTransaction._asyncState];value;hq-generated |
+| System.Transactions;CommittableTransaction;BeginCommit;(System.AsyncCallback,System.Object);Argument[this];ReturnValue;value;dfc-generated |
+| System.Transactions;CommittableTransaction;BeginCommit;(System.AsyncCallback,System.Object);Argument[this];ReturnValue;value;hq-generated |
+| System.Transactions;CommittableTransaction;get_AsyncState;();Argument[this].SyntheticField[System.Transactions.Transaction._internalTransaction].SyntheticField[System.Transactions.InternalTransaction._asyncState];ReturnValue;value;df-generated |
+| System.Transactions;CommittableTransaction;get_AsyncState;();Argument[this].SyntheticField[System.Transactions.Transaction._internalTransaction].SyntheticField[System.Transactions.InternalTransaction._asyncState];ReturnValue;value;dfc-generated |
 | System.Transactions;HostCurrentTransactionCallback;BeginInvoke;(System.AsyncCallback,System.Object);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Transactions;Transaction;Clone;();Argument[this];ReturnValue;taint;df-generated |
 | System.Transactions;Transaction;EnlistDurable;(System.Guid,System.Transactions.ISinglePhaseNotification,System.Transactions.EnlistmentOptions);Argument[0];ReturnValue;taint;df-generated |
 | System.Transactions;Transaction;EnlistPromotableSinglePhase;(System.Transactions.IPromotableSinglePhaseNotification);Argument[0];Argument[this];taint;df-generated |
-| System.Transactions;Transaction;EnlistPromotableSinglePhase;(System.Transactions.IPromotableSinglePhaseNotification,System.Guid);Argument[0];Argument[this];taint;df-generated |
-| System.Transactions;Transaction;EnlistPromotableSinglePhase;(System.Transactions.IPromotableSinglePhaseNotification,System.Guid);Argument[1];Argument[this];taint;df-generated |
+| System.Transactions;Transaction;EnlistPromotableSinglePhase;(System.Transactions.IPromotableSinglePhaseNotification,System.Guid);Argument[1];Argument[this].SyntheticField[System.Transactions.Transaction._internalTransaction].SyntheticField[System.Transactions.InternalTransaction._promoterType];value;dfc-generated |
 | System.Transactions;Transaction;EnlistVolatile;(System.Transactions.IEnlistmentNotification,System.Transactions.EnlistmentOptions);Argument[0];ReturnValue;taint;df-generated |
 | System.Transactions;Transaction;EnlistVolatile;(System.Transactions.IEnlistmentNotification,System.Transactions.EnlistmentOptions);Argument[this];ReturnValue;taint;df-generated |
 | System.Transactions;Transaction;EnlistVolatile;(System.Transactions.ISinglePhaseNotification,System.Transactions.EnlistmentOptions);Argument[0];ReturnValue;taint;df-generated |
@@ -12853,7 +13962,7 @@
 | System.Transactions;Transaction;Rollback;(System.Exception);Argument[0];Argument[this];taint;df-generated |
 | System.Transactions;Transaction;SetDistributedTransactionIdentifier;(System.Transactions.IPromotableSinglePhaseNotification,System.Guid);Argument[1];Argument[this];taint;df-generated |
 | System.Transactions;Transaction;add_TransactionCompleted;(System.Transactions.TransactionCompletedEventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
-| System.Transactions;Transaction;get_PromoterType;();Argument[this];ReturnValue;taint;df-generated |
+| System.Transactions;Transaction;get_PromoterType;();Argument[this].SyntheticField[System.Transactions.Transaction._internalTransaction].SyntheticField[System.Transactions.InternalTransaction._promoterType];ReturnValue;value;dfc-generated |
 | System.Transactions;Transaction;get_TransactionInformation;();Argument[this];ReturnValue;taint;df-generated |
 | System.Transactions;Transaction;remove_TransactionCompleted;(System.Transactions.TransactionCompletedEventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Transactions;TransactionCompletedEventHandler;BeginInvoke;(System.Object,System.Transactions.TransactionEventArgs,System.AsyncCallback,System.Object);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
@@ -12873,8 +13982,7 @@
 | System.Web;HttpServerUtility;UrlEncode;(System.String);Argument[0];ReturnValue;taint;manual |
 | System.Web;HttpUtility;HtmlAttributeEncode;(System.String);Argument[0];ReturnValue;taint;manual |
 | System.Web;HttpUtility;HtmlAttributeEncode;(System.String,System.IO.TextWriter);Argument[0];ReturnValue;taint;manual |
-| System.Web;HttpUtility;HtmlDecode;(System.String);Argument[0];ReturnValue;taint;df-generated |
-| System.Web;HttpUtility;HtmlDecode;(System.String,System.IO.TextWriter);Argument[0];Argument[1];taint;df-generated |
+| System.Web;HttpUtility;HtmlDecode;(System.String);Argument[0];ReturnValue;value;dfc-generated |
 | System.Web;HttpUtility;HtmlEncode;(System.Object);Argument[0];ReturnValue;taint;manual |
 | System.Web;HttpUtility;HtmlEncode;(System.String);Argument[0];ReturnValue;taint;manual |
 | System.Web;HttpUtility;HtmlEncode;(System.String,System.IO.TextWriter);Argument[0];ReturnValue;taint;manual |
@@ -12884,36 +13992,38 @@
 | System.Web;HttpUtility;UrlEncode;(System.Byte[],System.Int32,System.Int32);Argument[0];ReturnValue;taint;manual |
 | System.Web;HttpUtility;UrlEncode;(System.String);Argument[0];ReturnValue;taint;manual |
 | System.Web;HttpUtility;UrlEncode;(System.String,System.Text.Encoding);Argument[0];ReturnValue;taint;manual |
-| System.Web;HttpUtility;UrlEncodeToBytes;(System.Byte[]);Argument[0].Element;ReturnValue;taint;df-generated |
-| System.Web;HttpUtility;UrlEncodeToBytes;(System.Byte[],System.Int32,System.Int32);Argument[0].Element;ReturnValue;taint;df-generated |
-| System.Web;HttpUtility;UrlEncodeToBytes;(System.String);Argument[0];ReturnValue;taint;df-generated |
-| System.Web;HttpUtility;UrlEncodeToBytes;(System.String,System.Text.Encoding);Argument[0];ReturnValue;taint;df-generated |
-| System.Web;HttpUtility;UrlPathEncode;(System.String);Argument[0];ReturnValue;taint;df-generated |
+| System.Web;HttpUtility;UrlEncodeToBytes;(System.Byte[]);Argument[0].Element;ReturnValue.Element;value;dfc-generated |
+| System.Web;HttpUtility;UrlEncodeToBytes;(System.Byte[]);Argument[0];ReturnValue;value;dfc-generated |
+| System.Web;HttpUtility;UrlEncodeToBytes;(System.Byte[],System.Int32,System.Int32);Argument[0].Element;ReturnValue.Element;value;dfc-generated |
+| System.Web;HttpUtility;UrlEncodeToBytes;(System.Byte[],System.Int32,System.Int32);Argument[0];ReturnValue;value;dfc-generated |
+| System.Web;HttpUtility;UrlEncodeToBytes;(System.String);Argument[0];ReturnValue;taint;dfc-generated |
+| System.Web;HttpUtility;UrlEncodeToBytes;(System.String,System.Text.Encoding);Argument[0];ReturnValue;taint;dfc-generated |
+| System.Web;HttpUtility;UrlPathEncode;(System.String);Argument[0];ReturnValue;value;dfc-generated |
 | System.Windows.Input;ICommand;add_CanExecuteChanged;(System.EventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Windows.Input;ICommand;remove_CanExecuteChanged;(System.EventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
-| System.Windows.Markup;ValueSerializerAttribute;ValueSerializerAttribute;(System.String);Argument[0];Argument[this];taint;df-generated |
-| System.Windows.Markup;ValueSerializerAttribute;get_ValueSerializerTypeName;();Argument[this];ReturnValue;taint;df-generated |
+| System.Windows.Markup;ValueSerializerAttribute;ValueSerializerAttribute;(System.String);Argument[0];Argument[this].SyntheticField[System.Windows.Markup.ValueSerializerAttribute._valueSerializerTypeName];value;dfc-generated |
+| System.Windows.Markup;ValueSerializerAttribute;get_ValueSerializerTypeName;();Argument[this].SyntheticField[System.Windows.Markup.ValueSerializerAttribute._valueSerializerTypeName];ReturnValue;value;dfc-generated |
 | System.Xml.Linq;Extensions;Ancestors<T>;(System.Collections.Generic.IEnumerable<T>);Argument[0].Element;ReturnValue;taint;df-generated |
 | System.Xml.Linq;Extensions;Ancestors<T>;(System.Collections.Generic.IEnumerable<T>,System.Xml.Linq.XName);Argument[0].Element;ReturnValue;taint;df-generated |
-| System.Xml.Linq;Extensions;AncestorsAndSelf;(System.Collections.Generic.IEnumerable<System.Xml.Linq.XElement>);Argument[0].Element;ReturnValue;taint;df-generated |
-| System.Xml.Linq;Extensions;AncestorsAndSelf;(System.Collections.Generic.IEnumerable<System.Xml.Linq.XElement>,System.Xml.Linq.XName);Argument[0].Element;ReturnValue;taint;df-generated |
+| System.Xml.Linq;Extensions;AncestorsAndSelf;(System.Collections.Generic.IEnumerable<System.Xml.Linq.XElement>);Argument[0].Element;ReturnValue.Element;value;dfc-generated |
+| System.Xml.Linq;Extensions;AncestorsAndSelf;(System.Collections.Generic.IEnumerable<System.Xml.Linq.XElement>,System.Xml.Linq.XName);Argument[0].Element;ReturnValue.Element;value;dfc-generated |
 | System.Xml.Linq;Extensions;Attributes;(System.Collections.Generic.IEnumerable<System.Xml.Linq.XElement>);Argument[0].Element;ReturnValue;taint;df-generated |
 | System.Xml.Linq;Extensions;Attributes;(System.Collections.Generic.IEnumerable<System.Xml.Linq.XElement>,System.Xml.Linq.XName);Argument[0].Element;ReturnValue;taint;df-generated |
-| System.Xml.Linq;Extensions;DescendantNodes<T>;(System.Collections.Generic.IEnumerable<T>);Argument[0].Element;ReturnValue;taint;df-generated |
-| System.Xml.Linq;Extensions;DescendantNodesAndSelf;(System.Collections.Generic.IEnumerable<System.Xml.Linq.XElement>);Argument[0].Element;ReturnValue;taint;df-generated |
+| System.Xml.Linq;Extensions;DescendantNodes<T>;(System.Collections.Generic.IEnumerable<T>);Argument[0].Element.Property[System.Xml.Linq.XContainer.FirstNode];ReturnValue.Element;value;dfc-generated |
+| System.Xml.Linq;Extensions;DescendantNodesAndSelf;(System.Collections.Generic.IEnumerable<System.Xml.Linq.XElement>);Argument[0].Element.Property[System.Xml.Linq.XContainer.FirstNode];ReturnValue.Element;value;dfc-generated |
+| System.Xml.Linq;Extensions;DescendantNodesAndSelf;(System.Collections.Generic.IEnumerable<System.Xml.Linq.XElement>);Argument[0].Element;ReturnValue.Element;value;dfc-generated |
 | System.Xml.Linq;Extensions;Descendants<T>;(System.Collections.Generic.IEnumerable<T>);Argument[0].Element;ReturnValue;taint;df-generated |
 | System.Xml.Linq;Extensions;Descendants<T>;(System.Collections.Generic.IEnumerable<T>,System.Xml.Linq.XName);Argument[0].Element;ReturnValue;taint;df-generated |
-| System.Xml.Linq;Extensions;DescendantsAndSelf;(System.Collections.Generic.IEnumerable<System.Xml.Linq.XElement>);Argument[0].Element;ReturnValue;taint;df-generated |
-| System.Xml.Linq;Extensions;DescendantsAndSelf;(System.Collections.Generic.IEnumerable<System.Xml.Linq.XElement>,System.Xml.Linq.XName);Argument[0].Element;ReturnValue;taint;df-generated |
+| System.Xml.Linq;Extensions;DescendantsAndSelf;(System.Collections.Generic.IEnumerable<System.Xml.Linq.XElement>);Argument[0].Element;ReturnValue.Element;value;dfc-generated |
+| System.Xml.Linq;Extensions;DescendantsAndSelf;(System.Collections.Generic.IEnumerable<System.Xml.Linq.XElement>,System.Xml.Linq.XName);Argument[0].Element;ReturnValue.Element;value;dfc-generated |
 | System.Xml.Linq;Extensions;Elements<T>;(System.Collections.Generic.IEnumerable<T>);Argument[0].Element;ReturnValue;taint;df-generated |
 | System.Xml.Linq;Extensions;Elements<T>;(System.Collections.Generic.IEnumerable<T>,System.Xml.Linq.XName);Argument[0].Element;ReturnValue;taint;df-generated |
-| System.Xml.Linq;Extensions;InDocumentOrder<T>;(System.Collections.Generic.IEnumerable<T>);Argument[0].Element;ReturnValue;taint;df-generated |
+| System.Xml.Linq;Extensions;InDocumentOrder<T>;(System.Collections.Generic.IEnumerable<T>);Argument[0].Element;ReturnValue.Element;value;dfc-generated |
 | System.Xml.Linq;Extensions;Nodes<T>;(System.Collections.Generic.IEnumerable<T>);Argument[0].Element;ReturnValue;taint;df-generated |
 | System.Xml.Linq;XAttribute;SetValue;(System.Object);Argument[0];Argument[this];taint;df-generated |
-| System.Xml.Linq;XAttribute;XAttribute;(System.Xml.Linq.XAttribute);Argument[0];Argument[this];taint;df-generated |
-| System.Xml.Linq;XAttribute;XAttribute;(System.Xml.Linq.XName,System.Object);Argument[0];Argument[this];taint;df-generated |
-| System.Xml.Linq;XAttribute;XAttribute;(System.Xml.Linq.XName,System.Object);Argument[1];Argument[this];taint;df-generated |
-| System.Xml.Linq;XAttribute;get_Name;();Argument[this];ReturnValue;taint;df-generated |
+| System.Xml.Linq;XAttribute;XAttribute;(System.Xml.Linq.XAttribute);Argument[0].SyntheticField[System.Xml.Linq.XAttribute.name];Argument[this].SyntheticField[System.Xml.Linq.XAttribute.name];value;dfc-generated |
+| System.Xml.Linq;XAttribute;XAttribute;(System.Xml.Linq.XName,System.Object);Argument[0];Argument[this].SyntheticField[System.Xml.Linq.XAttribute.name];value;dfc-generated |
+| System.Xml.Linq;XAttribute;get_Name;();Argument[this].SyntheticField[System.Xml.Linq.XAttribute.name];ReturnValue;value;dfc-generated |
 | System.Xml.Linq;XAttribute;get_NextAttribute;();Argument[this];ReturnValue;taint;df-generated |
 | System.Xml.Linq;XAttribute;get_PreviousAttribute;();Argument[this];ReturnValue;taint;df-generated |
 | System.Xml.Linq;XComment;XComment;(System.String);Argument[0];Argument[this];taint;df-generated |
@@ -12922,7 +14032,6 @@
 | System.Xml.Linq;XContainer;Add;(System.Object);Argument[this];Argument[0];taint;df-generated |
 | System.Xml.Linq;XContainer;Add;(System.Object[]);Argument[0].Element;Argument[this];taint;df-generated |
 | System.Xml.Linq;XContainer;AddFirst;(System.Object);Argument[this];Argument[0];taint;df-generated |
-| System.Xml.Linq;XContainer;CreateWriter;();Argument[this];ReturnValue;taint;df-generated |
 | System.Xml.Linq;XContainer;DescendantNodes;();Argument[this];ReturnValue;taint;df-generated |
 | System.Xml.Linq;XContainer;Descendants;();Argument[this];ReturnValue;taint;df-generated |
 | System.Xml.Linq;XContainer;Descendants;(System.Xml.Linq.XName);Argument[this];ReturnValue;taint;df-generated |
@@ -12935,11 +14044,15 @@
 | System.Xml.Linq;XContainer;ReplaceNodes;(System.Object[]);Argument[0].Element;Argument[this];taint;df-generated |
 | System.Xml.Linq;XContainer;get_FirstNode;();Argument[this];ReturnValue;taint;df-generated |
 | System.Xml.Linq;XContainer;get_LastNode;();Argument[this];ReturnValue;taint;df-generated |
-| System.Xml.Linq;XDeclaration;ToString;();Argument[this];ReturnValue;taint;df-generated |
-| System.Xml.Linq;XDeclaration;XDeclaration;(System.String,System.String,System.String);Argument[0];Argument[this];taint;df-generated |
-| System.Xml.Linq;XDeclaration;XDeclaration;(System.String,System.String,System.String);Argument[1];Argument[this];taint;df-generated |
-| System.Xml.Linq;XDeclaration;XDeclaration;(System.String,System.String,System.String);Argument[2];Argument[this];taint;df-generated |
-| System.Xml.Linq;XDeclaration;XDeclaration;(System.Xml.Linq.XDeclaration);Argument[0];Argument[this];taint;df-generated |
+| System.Xml.Linq;XDeclaration;ToString;();Argument[this].SyntheticField[System.Xml.Linq.XDeclaration._encoding];ReturnValue;taint;dfc-generated |
+| System.Xml.Linq;XDeclaration;ToString;();Argument[this].SyntheticField[System.Xml.Linq.XDeclaration._standalone];ReturnValue;taint;dfc-generated |
+| System.Xml.Linq;XDeclaration;ToString;();Argument[this].SyntheticField[System.Xml.Linq.XDeclaration._version];ReturnValue;taint;dfc-generated |
+| System.Xml.Linq;XDeclaration;XDeclaration;(System.String,System.String,System.String);Argument[0];Argument[this].SyntheticField[System.Xml.Linq.XDeclaration._version];value;dfc-generated |
+| System.Xml.Linq;XDeclaration;XDeclaration;(System.String,System.String,System.String);Argument[1];Argument[this].SyntheticField[System.Xml.Linq.XDeclaration._encoding];value;dfc-generated |
+| System.Xml.Linq;XDeclaration;XDeclaration;(System.String,System.String,System.String);Argument[2];Argument[this].SyntheticField[System.Xml.Linq.XDeclaration._standalone];value;dfc-generated |
+| System.Xml.Linq;XDeclaration;XDeclaration;(System.Xml.Linq.XDeclaration);Argument[0].SyntheticField[System.Xml.Linq.XDeclaration._encoding];Argument[this].SyntheticField[System.Xml.Linq.XDeclaration._encoding];value;dfc-generated |
+| System.Xml.Linq;XDeclaration;XDeclaration;(System.Xml.Linq.XDeclaration);Argument[0].SyntheticField[System.Xml.Linq.XDeclaration._standalone];Argument[this].SyntheticField[System.Xml.Linq.XDeclaration._standalone];value;dfc-generated |
+| System.Xml.Linq;XDeclaration;XDeclaration;(System.Xml.Linq.XDeclaration);Argument[0].SyntheticField[System.Xml.Linq.XDeclaration._version];Argument[this].SyntheticField[System.Xml.Linq.XDeclaration._version];value;dfc-generated |
 | System.Xml.Linq;XDocument;Load;(System.IO.Stream);Argument[0];ReturnValue;taint;df-generated |
 | System.Xml.Linq;XDocument;Load;(System.IO.Stream,System.Xml.Linq.LoadOptions);Argument[0];ReturnValue;taint;df-generated |
 | System.Xml.Linq;XDocument;Load;(System.IO.TextReader);Argument[0];ReturnValue;taint;df-generated |
@@ -12951,20 +14064,18 @@
 | System.Xml.Linq;XDocument;Parse;(System.String);Argument[0];ReturnValue;taint;df-generated |
 | System.Xml.Linq;XDocument;Parse;(System.String,System.Xml.Linq.LoadOptions);Argument[0];ReturnValue;taint;df-generated |
 | System.Xml.Linq;XDocument;Save;(System.Xml.XmlWriter);Argument[this];Argument[0];taint;df-generated |
-| System.Xml.Linq;XDocument;SaveAsync;(System.Xml.XmlWriter,System.Threading.CancellationToken);Argument[1];ReturnValue;taint;df-generated |
 | System.Xml.Linq;XDocument;SaveAsync;(System.Xml.XmlWriter,System.Threading.CancellationToken);Argument[this];Argument[0];taint;df-generated |
 | System.Xml.Linq;XDocument;XDocument;(System.Object[]);Argument[0].Element;Argument[this];taint;df-generated |
 | System.Xml.Linq;XDocument;XDocument;(System.Xml.Linq.XDeclaration,System.Object[]);Argument[0];Argument[this];taint;df-generated |
 | System.Xml.Linq;XDocument;XDocument;(System.Xml.Linq.XDocument);Argument[0];Argument[this];taint;df-generated |
 | System.Xml.Linq;XDocument;get_DocumentType;();Argument[this];ReturnValue;taint;df-generated |
 | System.Xml.Linq;XDocument;get_Root;();Argument[this];ReturnValue;taint;df-generated |
-| System.Xml.Linq;XDocumentType;XDocumentType;(System.String,System.String,System.String,System.String);Argument[0];Argument[this];taint;df-generated |
 | System.Xml.Linq;XDocumentType;XDocumentType;(System.String,System.String,System.String,System.String);Argument[1];Argument[this];taint;df-generated |
 | System.Xml.Linq;XDocumentType;XDocumentType;(System.String,System.String,System.String,System.String);Argument[2];Argument[this];taint;df-generated |
 | System.Xml.Linq;XDocumentType;XDocumentType;(System.String,System.String,System.String,System.String);Argument[3];Argument[this];taint;df-generated |
 | System.Xml.Linq;XDocumentType;XDocumentType;(System.Xml.Linq.XDocumentType);Argument[0];Argument[this];taint;df-generated |
-| System.Xml.Linq;XElement;AncestorsAndSelf;();Argument[this];ReturnValue;taint;df-generated |
-| System.Xml.Linq;XElement;AncestorsAndSelf;(System.Xml.Linq.XName);Argument[this];ReturnValue;taint;df-generated |
+| System.Xml.Linq;XElement;AncestorsAndSelf;();Argument[this];ReturnValue.Element;value;dfc-generated |
+| System.Xml.Linq;XElement;AncestorsAndSelf;(System.Xml.Linq.XName);Argument[this];ReturnValue.Element;value;dfc-generated |
 | System.Xml.Linq;XElement;Attribute;(System.Xml.Linq.XName);Argument[this];ReturnValue;taint;df-generated |
 | System.Xml.Linq;XElement;Attributes;();Argument[this];ReturnValue;taint;df-generated |
 | System.Xml.Linq;XElement;Attributes;(System.Xml.Linq.XName);Argument[this];ReturnValue;taint;df-generated |
@@ -12987,7 +14098,6 @@
 | System.Xml.Linq;XElement;ReplaceAttributes;(System.Object);Argument[0];Argument[this];taint;df-generated |
 | System.Xml.Linq;XElement;ReplaceAttributes;(System.Object);Argument[this];Argument[0];taint;df-generated |
 | System.Xml.Linq;XElement;ReplaceAttributes;(System.Object[]);Argument[0].Element;Argument[this];taint;df-generated |
-| System.Xml.Linq;XElement;SaveAsync;(System.Xml.XmlWriter,System.Threading.CancellationToken);Argument[1];ReturnValue;taint;df-generated |
 | System.Xml.Linq;XElement;SetAttributeValue;(System.Xml.Linq.XName,System.Object);Argument[0];Argument[this];taint;df-generated |
 | System.Xml.Linq;XElement;SetAttributeValue;(System.Xml.Linq.XName,System.Object);Argument[1];Argument[this];taint;df-generated |
 | System.Xml.Linq;XElement;SetElementValue;(System.Xml.Linq.XName,System.Object);Argument[1];Argument[this];taint;df-generated |
@@ -13000,23 +14110,19 @@
 | System.Xml.Linq;XElement;XElement;(System.Xml.Linq.XStreamingElement);Argument[this];Argument[0];taint;df-generated |
 | System.Xml.Linq;XElement;get_FirstAttribute;();Argument[this];ReturnValue;taint;df-generated |
 | System.Xml.Linq;XElement;get_LastAttribute;();Argument[this];ReturnValue;taint;df-generated |
-| System.Xml.Linq;XName;Get;(System.String);Argument[0];ReturnValue;taint;df-generated |
-| System.Xml.Linq;XName;Get;(System.String,System.String);Argument[0];ReturnValue;taint;df-generated |
-| System.Xml.Linq;XName;ToString;();Argument[this];ReturnValue;taint;df-generated |
+| System.Xml.Linq;XName;ToString;();Argument[this].SyntheticField[System.Xml.Linq.XName._ns].Property[System.Xml.Linq.XNamespace.NamespaceName];ReturnValue;taint;dfc-generated |
 | System.Xml.Linq;XName;get_LocalName;();Argument[this];ReturnValue;taint;df-generated |
-| System.Xml.Linq;XName;get_Namespace;();Argument[this];ReturnValue;taint;df-generated |
-| System.Xml.Linq;XName;get_NamespaceName;();Argument[this];ReturnValue;taint;df-generated |
-| System.Xml.Linq;XNamespace;GetName;(System.String);Argument[0];ReturnValue;taint;df-generated |
-| System.Xml.Linq;XNamespace;GetName;(System.String);Argument[this];ReturnValue;taint;df-generated |
+| System.Xml.Linq;XName;get_Namespace;();Argument[this].SyntheticField[System.Xml.Linq.XName._ns];ReturnValue;value;dfc-generated |
+| System.Xml.Linq;XName;get_NamespaceName;();Argument[this].SyntheticField[System.Xml.Linq.XName._ns].Property[System.Xml.Linq.XNamespace.NamespaceName];ReturnValue;value;dfc-generated |
+| System.Xml.Linq;XNamespace;GetName;(System.String);Argument[this];ReturnValue.SyntheticField[System.Xml.Linq.XName._ns];value;dfc-generated |
 | System.Xml.Linq;XNamespace;ToString;();Argument[this];ReturnValue;taint;df-generated |
 | System.Xml.Linq;XNamespace;get_NamespaceName;();Argument[this];ReturnValue;taint;df-generated |
-| System.Xml.Linq;XNamespace;op_Addition;(System.Xml.Linq.XNamespace,System.String);Argument[0];ReturnValue;taint;df-generated |
-| System.Xml.Linq;XNamespace;op_Addition;(System.Xml.Linq.XNamespace,System.String);Argument[1];ReturnValue;taint;df-generated |
+| System.Xml.Linq;XNamespace;op_Addition;(System.Xml.Linq.XNamespace,System.String);Argument[0];ReturnValue.SyntheticField[System.Xml.Linq.XName._ns];value;dfc-generated |
 | System.Xml.Linq;XNode;AddAfterSelf;(System.Object);Argument[this];Argument[0];taint;df-generated |
 | System.Xml.Linq;XNode;AddBeforeSelf;(System.Object);Argument[this];Argument[0];taint;df-generated |
 | System.Xml.Linq;XNode;Ancestors;();Argument[this];ReturnValue;taint;df-generated |
 | System.Xml.Linq;XNode;Ancestors;(System.Xml.Linq.XName);Argument[this];ReturnValue;taint;df-generated |
-| System.Xml.Linq;XNode;CreateReader;(System.Xml.Linq.ReaderOptions);Argument[this];ReturnValue;taint;df-generated |
+| System.Xml.Linq;XNode;CreateReader;(System.Xml.Linq.ReaderOptions);Argument[this];ReturnValue.SyntheticField[System.Xml.Linq.XNodeReader._source];value;dfc-generated |
 | System.Xml.Linq;XNode;ElementsAfterSelf;();Argument[this];ReturnValue;taint;df-generated |
 | System.Xml.Linq;XNode;ElementsAfterSelf;(System.Xml.Linq.XName);Argument[this];ReturnValue;taint;df-generated |
 | System.Xml.Linq;XNode;NodesAfterSelf;();Argument[this];ReturnValue;taint;df-generated |
@@ -13024,18 +14130,23 @@
 | System.Xml.Linq;XNode;ReadFromAsync;(System.Xml.XmlReader,System.Threading.CancellationToken);Argument[0];ReturnValue;taint;df-generated |
 | System.Xml.Linq;XNode;ReplaceWith;(System.Object);Argument[this];Argument[0];taint;df-generated |
 | System.Xml.Linq;XNode;WriteTo;(System.Xml.XmlWriter);Argument[this];Argument[0];taint;df-generated |
-| System.Xml.Linq;XNode;WriteToAsync;(System.Xml.XmlWriter,System.Threading.CancellationToken);Argument[1];ReturnValue;taint;df-generated |
 | System.Xml.Linq;XNode;WriteToAsync;(System.Xml.XmlWriter,System.Threading.CancellationToken);Argument[this];Argument[0];taint;df-generated |
 | System.Xml.Linq;XNode;get_NextNode;();Argument[this];ReturnValue;taint;df-generated |
-| System.Xml.Linq;XObject;AddAnnotation;(System.Object);Argument[0];Argument[this];taint;df-generated |
-| System.Xml.Linq;XObject;Annotation;(System.Type);Argument[this];ReturnValue;taint;df-generated |
-| System.Xml.Linq;XObject;Annotation<T>;();Argument[this];ReturnValue;taint;df-generated |
-| System.Xml.Linq;XObject;Annotations;(System.Type);Argument[this];ReturnValue;taint;df-generated |
-| System.Xml.Linq;XObject;Annotations<T>;();Argument[this];ReturnValue;taint;df-generated |
+| System.Xml.Linq;XObject;AddAnnotation;(System.Object);Argument[0];Argument[this].SyntheticField[System.Xml.Linq.XObject.annotations].Element;value;dfc-generated |
+| System.Xml.Linq;XObject;AddAnnotation;(System.Object);Argument[0];Argument[this].SyntheticField[System.Xml.Linq.XObject.annotations];value;dfc-generated |
+| System.Xml.Linq;XObject;AddAnnotation;(System.Object);Argument[this].SyntheticField[System.Xml.Linq.XObject.annotations];Argument[this].SyntheticField[System.Xml.Linq.XObject.annotations].Element;value;dfc-generated |
+| System.Xml.Linq;XObject;Annotation;(System.Type);Argument[this].SyntheticField[System.Xml.Linq.XObject.annotations].Element;ReturnValue;value;dfc-generated |
+| System.Xml.Linq;XObject;Annotation;(System.Type);Argument[this].SyntheticField[System.Xml.Linq.XObject.annotations];ReturnValue;value;dfc-generated |
+| System.Xml.Linq;XObject;Annotation<T>;();Argument[this].SyntheticField[System.Xml.Linq.XObject.annotations].Element;ReturnValue;value;dfc-generated |
+| System.Xml.Linq;XObject;Annotation<T>;();Argument[this].SyntheticField[System.Xml.Linq.XObject.annotations];ReturnValue;value;dfc-generated |
+| System.Xml.Linq;XObject;Annotations;(System.Type);Argument[this].SyntheticField[System.Xml.Linq.XObject.annotations].Element;ReturnValue.Element;value;dfc-generated |
+| System.Xml.Linq;XObject;Annotations;(System.Type);Argument[this].SyntheticField[System.Xml.Linq.XObject.annotations];ReturnValue.Element;value;dfc-generated |
+| System.Xml.Linq;XObject;Annotations<T>;();Argument[this].SyntheticField[System.Xml.Linq.XObject.annotations].Element;ReturnValue.Element;value;dfc-generated |
+| System.Xml.Linq;XObject;Annotations<T>;();Argument[this].SyntheticField[System.Xml.Linq.XObject.annotations];ReturnValue.Element;value;dfc-generated |
 | System.Xml.Linq;XObject;add_Changed;(System.EventHandler<System.Xml.Linq.XObjectChangeEventArgs>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Xml.Linq;XObject;add_Changing;(System.EventHandler<System.Xml.Linq.XObjectChangeEventArgs>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Xml.Linq;XObject;get_BaseUri;();Argument[this];ReturnValue;taint;df-generated |
-| System.Xml.Linq;XObject;get_Document;();Argument[this];ReturnValue;taint;df-generated |
+| System.Xml.Linq;XObject;get_Document;();Argument[this];ReturnValue;value;dfc-generated |
 | System.Xml.Linq;XObject;get_Parent;();Argument[this];ReturnValue;taint;df-generated |
 | System.Xml.Linq;XObject;remove_Changed;(System.EventHandler<System.Xml.Linq.XObjectChangeEventArgs>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Xml.Linq;XObject;remove_Changing;(System.EventHandler<System.Xml.Linq.XObjectChangeEventArgs>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
@@ -13047,8 +14158,11 @@
 | System.Xml.Linq;XStreamingElement;XStreamingElement;(System.Xml.Linq.XName,System.Object[]);Argument[1].Element;Argument[this];taint;df-generated |
 | System.Xml.Linq;XText;XText;(System.String);Argument[0];Argument[this];taint;df-generated |
 | System.Xml.Linq;XText;XText;(System.Xml.Linq.XText);Argument[0];Argument[this];taint;df-generated |
+| System.Xml.Resolvers;XmlPreloadedResolver;GetEntity;(System.Uri,System.String,System.Type);Argument[0].Property[System.Uri.LocalPath];ReturnValue;taint;df-generated |
+| System.Xml.Resolvers;XmlPreloadedResolver;GetEntity;(System.Uri,System.String,System.Type);Argument[0].Property[System.Uri.LocalPath];ReturnValue;taint;dfc-generated |
+| System.Xml.Resolvers;XmlPreloadedResolver;GetEntityAsync;(System.Uri,System.String,System.Type);Argument[0].Property[System.Uri.LocalPath];ReturnValue.Property[System.Threading.Tasks.Task`1.Result];taint;df-generated |
+| System.Xml.Resolvers;XmlPreloadedResolver;GetEntityAsync;(System.Uri,System.String,System.Type);Argument[0].Property[System.Uri.LocalPath];ReturnValue.Property[System.Threading.Tasks.Task`1.Result];taint;dfc-generated |
 | System.Xml.Resolvers;XmlPreloadedResolver;XmlPreloadedResolver;(System.Xml.XmlResolver,System.Xml.Resolvers.XmlKnownDtds,System.Collections.Generic.IEqualityComparer<System.Uri>);Argument[0];Argument[this];taint;df-generated |
-| System.Xml.Resolvers;XmlPreloadedResolver;XmlPreloadedResolver;(System.Xml.XmlResolver,System.Xml.Resolvers.XmlKnownDtds,System.Collections.Generic.IEqualityComparer<System.Uri>);Argument[2];Argument[this];taint;df-generated |
 | System.Xml.Resolvers;XmlPreloadedResolver;get_PreloadedUris;();Argument[this];ReturnValue;taint;df-generated |
 | System.Xml.Schema;Extensions;GetSchemaInfo;(System.Xml.Linq.XAttribute);Argument[0];ReturnValue;taint;df-generated |
 | System.Xml.Schema;Extensions;GetSchemaInfo;(System.Xml.Linq.XElement);Argument[0];ReturnValue;taint;df-generated |
@@ -13065,7 +14179,7 @@
 | System.Xml.Schema;ValidationEventArgs;get_Exception;();Argument[this];ReturnValue;taint;df-generated |
 | System.Xml.Schema;ValidationEventArgs;get_Message;();Argument[this];ReturnValue;taint;df-generated |
 | System.Xml.Schema;ValidationEventHandler;BeginInvoke;(System.Object,System.Xml.Schema.ValidationEventArgs,System.AsyncCallback,System.Object);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
-| System.Xml.Schema;XmlAtomicValue;Clone;();Argument[this];ReturnValue;value;df-generated |
+| System.Xml.Schema;XmlAtomicValue;Clone;();Argument[this];ReturnValue;value;dfc-generated |
 | System.Xml.Schema;XmlAtomicValue;ToString;();Argument[this];ReturnValue;taint;df-generated |
 | System.Xml.Schema;XmlSchema;Compile;(System.Xml.Schema.ValidationEventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Xml.Schema;XmlSchema;Compile;(System.Xml.Schema.ValidationEventHandler,System.Xml.XmlResolver);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
@@ -13086,31 +14200,35 @@
 | System.Xml.Schema;XmlSchemaCollection;Add;(System.String,System.Xml.XmlReader);Argument[1];ReturnValue;taint;df-generated |
 | System.Xml.Schema;XmlSchemaCollection;Add;(System.String,System.Xml.XmlReader,System.Xml.XmlResolver);Argument[1];ReturnValue;taint;df-generated |
 | System.Xml.Schema;XmlSchemaCollection;Add;(System.Xml.Schema.XmlSchema);Argument[0];Argument[this].Element;value;manual |
-| System.Xml.Schema;XmlSchemaCollection;Add;(System.Xml.Schema.XmlSchema,System.Xml.XmlResolver);Argument[0];ReturnValue;taint;df-generated |
+| System.Xml.Schema;XmlSchemaCollection;Add;(System.Xml.Schema.XmlSchema,System.Xml.XmlResolver);Argument[0];ReturnValue;value;dfc-generated |
 | System.Xml.Schema;XmlSchemaCollection;Add;(System.Xml.Schema.XmlSchemaCollection);Argument[0];Argument[this].Element;value;manual |
 | System.Xml.Schema;XmlSchemaCollection;CopyTo;(System.Xml.Schema.XmlSchema[],System.Int32);Argument[this].Element;Argument[0].Element;value;manual |
 | System.Xml.Schema;XmlSchemaCollection;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Xml.Schema.XmlSchemaCollectionEnumerator.Current];value;manual |
-| System.Xml.Schema;XmlSchemaCollection;XmlSchemaCollection;(System.Xml.XmlNameTable);Argument[0];Argument[this];taint;df-generated |
+| System.Xml.Schema;XmlSchemaCollection;XmlSchemaCollection;(System.Xml.XmlNameTable);Argument[0];Argument[this].SyntheticField[System.Xml.Schema.XmlSchemaCollection._nameTable];value;dfc-generated |
 | System.Xml.Schema;XmlSchemaCollection;add_ValidationEventHandler;(System.Xml.Schema.ValidationEventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Xml.Schema;XmlSchemaCollection;get_Item;(System.String);Argument[this];ReturnValue;taint;df-generated |
-| System.Xml.Schema;XmlSchemaCollection;get_NameTable;();Argument[this];ReturnValue;taint;df-generated |
+| System.Xml.Schema;XmlSchemaCollection;get_NameTable;();Argument[this].SyntheticField[System.Xml.Schema.XmlSchemaCollection._nameTable];ReturnValue;value;dfc-generated |
 | System.Xml.Schema;XmlSchemaCollection;remove_ValidationEventHandler;(System.Xml.Schema.ValidationEventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
+| System.Xml.Schema;XmlSchemaCollectionEnumerator;get_Current;();Argument[this].Property[System.Xml.Schema.XmlSchemaCollectionEnumerator.Current];ReturnValue;value;df-generated |
+| System.Xml.Schema;XmlSchemaCollectionEnumerator;get_Current;();Argument[this].Property[System.Xml.Schema.XmlSchemaCollectionEnumerator.Current];ReturnValue;value;dfc-generated |
 | System.Xml.Schema;XmlSchemaComplexContentExtension;get_Attributes;();Argument[this];ReturnValue;taint;df-generated |
 | System.Xml.Schema;XmlSchemaComplexContentRestriction;get_Attributes;();Argument[this];ReturnValue;taint;df-generated |
 | System.Xml.Schema;XmlSchemaComplexType;get_AttributeWildcard;();Argument[this];ReturnValue;taint;df-generated |
 | System.Xml.Schema;XmlSchemaComplexType;get_ContentTypeParticle;();Argument[this];ReturnValue;taint;df-generated |
 | System.Xml.Schema;XmlSchemaDatatype;ChangeType;(System.Object,System.Type);Argument[0];ReturnValue;taint;df-generated |
 | System.Xml.Schema;XmlSchemaDatatype;ChangeType;(System.Object,System.Type);Argument[this];ReturnValue;taint;df-generated |
+| System.Xml.Schema;XmlSchemaDatatype;ChangeType;(System.Object,System.Type,System.Xml.IXmlNamespaceResolver);Argument[0];Argument[2];taint;df-generated |
 | System.Xml.Schema;XmlSchemaDatatype;ChangeType;(System.Object,System.Type,System.Xml.IXmlNamespaceResolver);Argument[0];ReturnValue;taint;df-generated |
 | System.Xml.Schema;XmlSchemaDatatype;ChangeType;(System.Object,System.Type,System.Xml.IXmlNamespaceResolver);Argument[2];ReturnValue;taint;df-generated |
 | System.Xml.Schema;XmlSchemaDatatype;ChangeType;(System.Object,System.Type,System.Xml.IXmlNamespaceResolver);Argument[this];ReturnValue;taint;df-generated |
+| System.Xml.Schema;XmlSchemaDatatype;ParseValue;(System.String,System.Xml.XmlNameTable,System.Xml.IXmlNamespaceResolver);Argument[0];Argument[2];taint;df-generated |
 | System.Xml.Schema;XmlSchemaDatatype;ParseValue;(System.String,System.Xml.XmlNameTable,System.Xml.IXmlNamespaceResolver);Argument[0];ReturnValue;taint;df-generated |
 | System.Xml.Schema;XmlSchemaDatatype;ParseValue;(System.String,System.Xml.XmlNameTable,System.Xml.IXmlNamespaceResolver);Argument[this];ReturnValue;taint;df-generated |
 | System.Xml.Schema;XmlSchemaElement;get_ElementSchemaType;();Argument[this];ReturnValue;taint;df-generated |
 | System.Xml.Schema;XmlSchemaElement;get_ElementType;();Argument[this];ReturnValue;taint;df-generated |
 | System.Xml.Schema;XmlSchemaElement;get_QualifiedName;();Argument[this];ReturnValue;taint;df-generated |
-| System.Xml.Schema;XmlSchemaException;XmlSchemaException;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);Argument[0];Argument[this];taint;df-generated |
-| System.Xml.Schema;XmlSchemaException;get_Message;();Argument[this];ReturnValue;taint;df-generated |
+| System.Xml.Schema;XmlSchemaException;get_Message;();Argument[this].Property[System.Exception.Message];ReturnValue;value;dfc-generated |
+| System.Xml.Schema;XmlSchemaException;get_Message;();Argument[this].SyntheticField[System.Exception._message];ReturnValue;value;dfc-generated |
 | System.Xml.Schema;XmlSchemaException;get_SourceSchemaObject;();Argument[this];ReturnValue;taint;df-generated |
 | System.Xml.Schema;XmlSchemaException;get_SourceUri;();Argument[this];ReturnValue;taint;df-generated |
 | System.Xml.Schema;XmlSchemaGroup;get_QualifiedName;();Argument[this];ReturnValue;taint;df-generated |
@@ -13121,18 +14239,11 @@
 | System.Xml.Schema;XmlSchemaInference;InferSchema;(System.Xml.XmlReader);Argument[0];Argument[this];taint;df-generated |
 | System.Xml.Schema;XmlSchemaInference;InferSchema;(System.Xml.XmlReader);Argument[0];ReturnValue;taint;df-generated |
 | System.Xml.Schema;XmlSchemaInference;InferSchema;(System.Xml.XmlReader);Argument[this];ReturnValue;taint;df-generated |
-| System.Xml.Schema;XmlSchemaInference;InferSchema;(System.Xml.XmlReader,System.Xml.Schema.XmlSchemaSet);Argument[0];Argument[1];taint;df-generated |
-| System.Xml.Schema;XmlSchemaInference;InferSchema;(System.Xml.XmlReader,System.Xml.Schema.XmlSchemaSet);Argument[0];Argument[this];taint;df-generated |
-| System.Xml.Schema;XmlSchemaInference;InferSchema;(System.Xml.XmlReader,System.Xml.Schema.XmlSchemaSet);Argument[0];ReturnValue;taint;df-generated |
-| System.Xml.Schema;XmlSchemaInference;InferSchema;(System.Xml.XmlReader,System.Xml.Schema.XmlSchemaSet);Argument[1];Argument[this];taint;df-generated |
-| System.Xml.Schema;XmlSchemaInference;InferSchema;(System.Xml.XmlReader,System.Xml.Schema.XmlSchemaSet);Argument[1];ReturnValue;taint;df-generated |
-| System.Xml.Schema;XmlSchemaInference;InferSchema;(System.Xml.XmlReader,System.Xml.Schema.XmlSchemaSet);Argument[this];Argument[1];taint;df-generated |
-| System.Xml.Schema;XmlSchemaInference;InferSchema;(System.Xml.XmlReader,System.Xml.Schema.XmlSchemaSet);Argument[this];ReturnValue;taint;df-generated |
+| System.Xml.Schema;XmlSchemaInference;InferSchema;(System.Xml.XmlReader,System.Xml.Schema.XmlSchemaSet);Argument[1];ReturnValue;value;dfc-generated |
 | System.Xml.Schema;XmlSchemaObjectCollection;Add;(System.Xml.Schema.XmlSchemaObject);Argument[0];Argument[this].Element;value;manual |
 | System.Xml.Schema;XmlSchemaObjectCollection;CopyTo;(System.Xml.Schema.XmlSchemaObject[],System.Int32);Argument[this].Element;Argument[0].Element;value;manual |
 | System.Xml.Schema;XmlSchemaObjectCollection;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Xml.Schema.XmlSchemaObjectEnumerator.Current];value;manual |
 | System.Xml.Schema;XmlSchemaObjectCollection;Insert;(System.Int32,System.Xml.Schema.XmlSchemaObject);Argument[1];Argument[this].Element;value;manual |
-| System.Xml.Schema;XmlSchemaObjectCollection;Remove;(System.Xml.Schema.XmlSchemaObject);Argument[0];Argument[this];taint;df-generated |
 | System.Xml.Schema;XmlSchemaObjectCollection;XmlSchemaObjectCollection;(System.Xml.Schema.XmlSchemaObject);Argument[0];Argument[this];taint;df-generated |
 | System.Xml.Schema;XmlSchemaObjectCollection;get_Item;(System.Int32);Argument[this].Element;ReturnValue;value;manual |
 | System.Xml.Schema;XmlSchemaObjectCollection;set_Item;(System.Int32,System.Xml.Schema.XmlSchemaObject);Argument[1];Argument[this].Element;value;manual |
@@ -13157,13 +14268,13 @@
 | System.Xml.Schema;XmlSchemaSet;Add;(System.Xml.Schema.XmlSchema);Argument[0];ReturnValue;taint;df-generated |
 | System.Xml.Schema;XmlSchemaSet;Add;(System.Xml.Schema.XmlSchemaSet);Argument[0];Argument[this];taint;df-generated |
 | System.Xml.Schema;XmlSchemaSet;CopyTo;(System.Xml.Schema.XmlSchema[],System.Int32);Argument[this];Argument[0].Element;taint;df-generated |
-| System.Xml.Schema;XmlSchemaSet;Remove;(System.Xml.Schema.XmlSchema);Argument[0];ReturnValue;taint;df-generated |
+| System.Xml.Schema;XmlSchemaSet;Remove;(System.Xml.Schema.XmlSchema);Argument[0];ReturnValue;value;dfc-generated |
 | System.Xml.Schema;XmlSchemaSet;Reprocess;(System.Xml.Schema.XmlSchema);Argument[0];Argument[this];taint;df-generated |
 | System.Xml.Schema;XmlSchemaSet;Reprocess;(System.Xml.Schema.XmlSchema);Argument[0];ReturnValue;taint;df-generated |
 | System.Xml.Schema;XmlSchemaSet;Schemas;();Argument[this];ReturnValue;taint;df-generated |
-| System.Xml.Schema;XmlSchemaSet;XmlSchemaSet;(System.Xml.XmlNameTable);Argument[0];Argument[this];taint;df-generated |
+| System.Xml.Schema;XmlSchemaSet;XmlSchemaSet;(System.Xml.XmlNameTable);Argument[0];Argument[this].SyntheticField[System.Xml.Schema.XmlSchemaSet._nameTable];value;dfc-generated |
 | System.Xml.Schema;XmlSchemaSet;add_ValidationEventHandler;(System.Xml.Schema.ValidationEventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
-| System.Xml.Schema;XmlSchemaSet;get_NameTable;();Argument[this];ReturnValue;taint;df-generated |
+| System.Xml.Schema;XmlSchemaSet;get_NameTable;();Argument[this].SyntheticField[System.Xml.Schema.XmlSchemaSet._nameTable];ReturnValue;value;dfc-generated |
 | System.Xml.Schema;XmlSchemaSet;remove_ValidationEventHandler;(System.Xml.Schema.ValidationEventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Xml.Schema;XmlSchemaSet;set_XmlResolver;(System.Xml.XmlResolver);Argument[0];Argument[this];taint;df-generated |
 | System.Xml.Schema;XmlSchemaSimpleContentExtension;get_Attributes;();Argument[this];ReturnValue;taint;df-generated |
@@ -13176,12 +14287,12 @@
 | System.Xml.Schema;XmlSchemaType;get_BaseXmlSchemaType;();Argument[this];ReturnValue;taint;df-generated |
 | System.Xml.Schema;XmlSchemaType;get_Datatype;();Argument[this];ReturnValue;taint;df-generated |
 | System.Xml.Schema;XmlSchemaType;get_QualifiedName;();Argument[this];ReturnValue;taint;df-generated |
-| System.Xml.Schema;XmlSchemaValidationException;SetSourceObject;(System.Object);Argument[0];Argument[this];taint;df-generated |
-| System.Xml.Schema;XmlSchemaValidationException;get_SourceObject;();Argument[this];ReturnValue;taint;df-generated |
+| System.Xml.Schema;XmlSchemaValidationException;SetSourceObject;(System.Object);Argument[0];Argument[this].SyntheticField[System.Xml.Schema.XmlSchemaValidationException._sourceNodeObject];value;dfc-generated |
+| System.Xml.Schema;XmlSchemaValidationException;get_SourceObject;();Argument[this].SyntheticField[System.Xml.Schema.XmlSchemaValidationException._sourceNodeObject];ReturnValue;value;dfc-generated |
 | System.Xml.Schema;XmlSchemaValidator;AddSchema;(System.Xml.Schema.XmlSchema);Argument[0];Argument[this];taint;df-generated |
-| System.Xml.Schema;XmlSchemaValidator;GetExpectedAttributes;();Argument[this];ReturnValue;taint;df-generated |
-| System.Xml.Schema;XmlSchemaValidator;GetExpectedParticles;();Argument[this];ReturnValue;taint;df-generated |
-| System.Xml.Schema;XmlSchemaValidator;Initialize;(System.Xml.Schema.XmlSchemaObject);Argument[0];Argument[this];taint;df-generated |
+| System.Xml.Schema;XmlSchemaValidator;GetExpectedAttributes;();Argument[this].SyntheticField[System.Xml.Schema.XmlSchemaValidator._partialValidationType];ReturnValue.Element;value;dfc-generated |
+| System.Xml.Schema;XmlSchemaValidator;GetExpectedParticles;();Argument[this].SyntheticField[System.Xml.Schema.XmlSchemaValidator._partialValidationType];ReturnValue.Element;value;dfc-generated |
+| System.Xml.Schema;XmlSchemaValidator;Initialize;(System.Xml.Schema.XmlSchemaObject);Argument[0];Argument[this].SyntheticField[System.Xml.Schema.XmlSchemaValidator._partialValidationType];value;dfc-generated |
 | System.Xml.Schema;XmlSchemaValidator;SkipToEndElement;(System.Xml.Schema.XmlSchemaInfo);Argument[this];Argument[0];taint;df-generated |
 | System.Xml.Schema;XmlSchemaValidator;ValidateAttribute;(System.String,System.String,System.String,System.Xml.Schema.XmlSchemaInfo);Argument[2];Argument[this];taint;df-generated |
 | System.Xml.Schema;XmlSchemaValidator;ValidateAttribute;(System.String,System.String,System.String,System.Xml.Schema.XmlSchemaInfo);Argument[2];ReturnValue;taint;df-generated |
@@ -13196,9 +14307,7 @@
 | System.Xml.Schema;XmlSchemaValidator;ValidateEndElement;(System.Xml.Schema.XmlSchemaInfo,System.Object);Argument[1];ReturnValue;taint;df-generated |
 | System.Xml.Schema;XmlSchemaValidator;ValidateEndElement;(System.Xml.Schema.XmlSchemaInfo,System.Object);Argument[this];Argument[0];taint;df-generated |
 | System.Xml.Schema;XmlSchemaValidator;ValidateEndElement;(System.Xml.Schema.XmlSchemaInfo,System.Object);Argument[this];ReturnValue;taint;df-generated |
-| System.Xml.Schema;XmlSchemaValidator;ValidateText;(System.String);Argument[0];Argument[this];taint;df-generated |
 | System.Xml.Schema;XmlSchemaValidator;ValidateText;(System.Xml.Schema.XmlValueGetter);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
-| System.Xml.Schema;XmlSchemaValidator;ValidateWhitespace;(System.String);Argument[0];Argument[this];taint;df-generated |
 | System.Xml.Schema;XmlSchemaValidator;ValidateWhitespace;(System.Xml.Schema.XmlValueGetter);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Xml.Schema;XmlSchemaValidator;XmlSchemaValidator;(System.Xml.XmlNameTable,System.Xml.Schema.XmlSchemaSet,System.Xml.IXmlNamespaceResolver,System.Xml.Schema.XmlSchemaValidationFlags);Argument[0];Argument[this];taint;df-generated |
 | System.Xml.Schema;XmlSchemaValidator;XmlSchemaValidator;(System.Xml.XmlNameTable,System.Xml.Schema.XmlSchemaSet,System.Xml.IXmlNamespaceResolver,System.Xml.Schema.XmlSchemaValidationFlags);Argument[1];Argument[this];taint;df-generated |
@@ -13207,13 +14316,11 @@
 | System.Xml.Schema;XmlSchemaValidator;remove_ValidationEventHandler;(System.Xml.Schema.ValidationEventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Xml.Schema;XmlSchemaValidator;set_XmlResolver;(System.Xml.XmlResolver);Argument[0];Argument[this];taint;df-generated |
 | System.Xml.Schema;XmlValueGetter;BeginInvoke;(System.AsyncCallback,System.Object);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
-| System.Xml.Serialization;CodeIdentifiers;Add;(System.String,System.Object);Argument[1];Argument[this];taint;df-generated |
-| System.Xml.Serialization;CodeIdentifiers;Add;(System.String,System.Object);Argument[this];Argument[1];taint;df-generated |
-| System.Xml.Serialization;CodeIdentifiers;AddUnique;(System.String,System.Object);Argument[0];ReturnValue;taint;df-generated |
-| System.Xml.Serialization;CodeIdentifiers;AddUnique;(System.String,System.Object);Argument[1];Argument[this];taint;df-generated |
-| System.Xml.Serialization;CodeIdentifiers;AddUnique;(System.String,System.Object);Argument[this];Argument[1];taint;df-generated |
-| System.Xml.Serialization;CodeIdentifiers;MakeUnique;(System.String);Argument[0];ReturnValue;taint;df-generated |
-| System.Xml.Serialization;CodeIdentifiers;ToArray;(System.Type);Argument[this];ReturnValue;taint;df-generated |
+| System.Xml.Serialization;CodeIdentifiers;Add;(System.String,System.Object);Argument[1];Argument[this].SyntheticField[System.Xml.Serialization.CodeIdentifiers._list].Element;value;dfc-generated |
+| System.Xml.Serialization;CodeIdentifiers;AddUnique;(System.String,System.Object);Argument[0];ReturnValue;value;dfc-generated |
+| System.Xml.Serialization;CodeIdentifiers;AddUnique;(System.String,System.Object);Argument[1];Argument[this].SyntheticField[System.Xml.Serialization.CodeIdentifiers._list].Element;value;dfc-generated |
+| System.Xml.Serialization;CodeIdentifiers;MakeUnique;(System.String);Argument[0];ReturnValue;value;dfc-generated |
+| System.Xml.Serialization;CodeIdentifiers;ToArray;(System.Type);Argument[this].SyntheticField[System.Xml.Serialization.CodeIdentifiers._list].Element;ReturnValue.Element;value;dfc-generated |
 | System.Xml.Serialization;IXmlSerializable;ReadXml;(System.Xml.XmlReader);Argument[0];Argument[this];taint;df-generated |
 | System.Xml.Serialization;IXmlSerializable;WriteXml;(System.Xml.XmlWriter);Argument[this];Argument[0];taint;df-generated |
 | System.Xml.Serialization;ImportContext;ImportContext;(System.Xml.Serialization.CodeIdentifiers,System.Boolean);Argument[0];Argument[this];taint;df-generated |
@@ -13221,7 +14328,6 @@
 | System.Xml.Serialization;SoapAttributeAttribute;SoapAttributeAttribute;(System.String);Argument[0];Argument[this];taint;df-generated |
 | System.Xml.Serialization;SoapAttributeOverrides;get_Item;(System.Type);Argument[this];ReturnValue;taint;df-generated |
 | System.Xml.Serialization;SoapAttributeOverrides;get_Item;(System.Type,System.String);Argument[this];ReturnValue;taint;df-generated |
-| System.Xml.Serialization;SoapAttributes;SoapAttributes;(System.Reflection.ICustomAttributeProvider);Argument[0];Argument[this];taint;df-generated |
 | System.Xml.Serialization;SoapElementAttribute;SoapElementAttribute;(System.String);Argument[0];Argument[this];taint;df-generated |
 | System.Xml.Serialization;SoapEnumAttribute;SoapEnumAttribute;(System.String);Argument[0];Argument[this];taint;df-generated |
 | System.Xml.Serialization;SoapReflectionImporter;ImportTypeMapping;(System.Type,System.String);Argument[1];ReturnValue;taint;df-generated |
@@ -13230,10 +14336,10 @@
 | System.Xml.Serialization;SoapTypeAttribute;SoapTypeAttribute;(System.String);Argument[0];Argument[this];taint;df-generated |
 | System.Xml.Serialization;SoapTypeAttribute;SoapTypeAttribute;(System.String,System.String);Argument[0];Argument[this];taint;df-generated |
 | System.Xml.Serialization;SoapTypeAttribute;SoapTypeAttribute;(System.String,System.String);Argument[1];Argument[this];taint;df-generated |
-| System.Xml.Serialization;UnreferencedObjectEventArgs;UnreferencedObjectEventArgs;(System.Object,System.String);Argument[0];Argument[this];taint;df-generated |
-| System.Xml.Serialization;UnreferencedObjectEventArgs;UnreferencedObjectEventArgs;(System.Object,System.String);Argument[1];Argument[this];taint;df-generated |
-| System.Xml.Serialization;UnreferencedObjectEventArgs;get_UnreferencedId;();Argument[this];ReturnValue;taint;df-generated |
-| System.Xml.Serialization;UnreferencedObjectEventArgs;get_UnreferencedObject;();Argument[this];ReturnValue;taint;df-generated |
+| System.Xml.Serialization;UnreferencedObjectEventArgs;UnreferencedObjectEventArgs;(System.Object,System.String);Argument[0];Argument[this].SyntheticField[System.Xml.Serialization.UnreferencedObjectEventArgs._o];value;dfc-generated |
+| System.Xml.Serialization;UnreferencedObjectEventArgs;UnreferencedObjectEventArgs;(System.Object,System.String);Argument[1];Argument[this].SyntheticField[System.Xml.Serialization.UnreferencedObjectEventArgs._id];value;dfc-generated |
+| System.Xml.Serialization;UnreferencedObjectEventArgs;get_UnreferencedId;();Argument[this].SyntheticField[System.Xml.Serialization.UnreferencedObjectEventArgs._id];ReturnValue;value;dfc-generated |
+| System.Xml.Serialization;UnreferencedObjectEventArgs;get_UnreferencedObject;();Argument[this].SyntheticField[System.Xml.Serialization.UnreferencedObjectEventArgs._o];ReturnValue;value;dfc-generated |
 | System.Xml.Serialization;UnreferencedObjectEventHandler;BeginInvoke;(System.Object,System.Xml.Serialization.UnreferencedObjectEventArgs,System.AsyncCallback,System.Object);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
 | System.Xml.Serialization;XmlAnyElementAttribute;XmlAnyElementAttribute;(System.String);Argument[0];Argument[this];taint;df-generated |
 | System.Xml.Serialization;XmlAnyElementAttribute;XmlAnyElementAttribute;(System.String,System.String);Argument[0];Argument[this];taint;df-generated |
@@ -13241,7 +14347,6 @@
 | System.Xml.Serialization;XmlAnyElementAttributes;Add;(System.Xml.Serialization.XmlAnyElementAttribute);Argument[0];Argument[this].Element;value;manual |
 | System.Xml.Serialization;XmlAnyElementAttributes;CopyTo;(System.Xml.Serialization.XmlAnyElementAttribute[],System.Int32);Argument[this].Element;Argument[0].Element;value;manual |
 | System.Xml.Serialization;XmlAnyElementAttributes;Insert;(System.Int32,System.Xml.Serialization.XmlAnyElementAttribute);Argument[1];Argument[this].Element;value;manual |
-| System.Xml.Serialization;XmlAnyElementAttributes;Remove;(System.Xml.Serialization.XmlAnyElementAttribute);Argument[0];Argument[this];taint;df-generated |
 | System.Xml.Serialization;XmlAnyElementAttributes;get_Item;(System.Int32);Argument[this].Element;ReturnValue;value;manual |
 | System.Xml.Serialization;XmlAnyElementAttributes;set_Item;(System.Int32,System.Xml.Serialization.XmlAnyElementAttribute);Argument[1];Argument[this].Element;value;manual |
 | System.Xml.Serialization;XmlArrayAttribute;XmlArrayAttribute;(System.String);Argument[0];Argument[this];taint;df-generated |
@@ -13250,7 +14355,6 @@
 | System.Xml.Serialization;XmlArrayItemAttributes;Add;(System.Xml.Serialization.XmlArrayItemAttribute);Argument[0];Argument[this].Element;value;manual |
 | System.Xml.Serialization;XmlArrayItemAttributes;CopyTo;(System.Xml.Serialization.XmlArrayItemAttribute[],System.Int32);Argument[this].Element;Argument[0].Element;value;manual |
 | System.Xml.Serialization;XmlArrayItemAttributes;Insert;(System.Int32,System.Xml.Serialization.XmlArrayItemAttribute);Argument[1];Argument[this].Element;value;manual |
-| System.Xml.Serialization;XmlArrayItemAttributes;Remove;(System.Xml.Serialization.XmlArrayItemAttribute);Argument[0];Argument[this];taint;df-generated |
 | System.Xml.Serialization;XmlArrayItemAttributes;get_Item;(System.Int32);Argument[this].Element;ReturnValue;value;manual |
 | System.Xml.Serialization;XmlArrayItemAttributes;set_Item;(System.Int32,System.Xml.Serialization.XmlArrayItemAttribute);Argument[1];Argument[this].Element;value;manual |
 | System.Xml.Serialization;XmlAttributeAttribute;XmlAttributeAttribute;(System.String);Argument[0];Argument[this];taint;df-generated |
@@ -13260,7 +14364,6 @@
 | System.Xml.Serialization;XmlAttributeEventArgs;get_ObjectBeingDeserialized;();Argument[this];ReturnValue;taint;df-generated |
 | System.Xml.Serialization;XmlAttributeEventHandler;BeginInvoke;(System.Object,System.Xml.Serialization.XmlAttributeEventArgs,System.AsyncCallback,System.Object);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
 | System.Xml.Serialization;XmlAttributeOverrides;get_Item;(System.Type);Argument[this];ReturnValue;taint;df-generated |
-| System.Xml.Serialization;XmlAttributes;XmlAttributes;(System.Reflection.ICustomAttributeProvider);Argument[0];Argument[this];taint;df-generated |
 | System.Xml.Serialization;XmlAttributes;get_XmlAnyElements;();Argument[this];ReturnValue;taint;df-generated |
 | System.Xml.Serialization;XmlAttributes;get_XmlArrayItems;();Argument[this];ReturnValue;taint;df-generated |
 | System.Xml.Serialization;XmlAttributes;get_XmlChoiceIdentifier;();Argument[this];ReturnValue;taint;df-generated |
@@ -13275,7 +14378,6 @@
 | System.Xml.Serialization;XmlElementAttributes;Add;(System.Xml.Serialization.XmlElementAttribute);Argument[0];Argument[this].Element;value;manual |
 | System.Xml.Serialization;XmlElementAttributes;CopyTo;(System.Xml.Serialization.XmlElementAttribute[],System.Int32);Argument[this].Element;Argument[0].Element;value;manual |
 | System.Xml.Serialization;XmlElementAttributes;Insert;(System.Int32,System.Xml.Serialization.XmlElementAttribute);Argument[1];Argument[this].Element;value;manual |
-| System.Xml.Serialization;XmlElementAttributes;Remove;(System.Xml.Serialization.XmlElementAttribute);Argument[0];Argument[this];taint;df-generated |
 | System.Xml.Serialization;XmlElementAttributes;get_Item;(System.Int32);Argument[this].Element;ReturnValue;value;manual |
 | System.Xml.Serialization;XmlElementAttributes;set_Item;(System.Int32,System.Xml.Serialization.XmlElementAttribute);Argument[1];Argument[this].Element;value;manual |
 | System.Xml.Serialization;XmlElementEventArgs;get_Element;();Argument[this];ReturnValue;taint;df-generated |
@@ -13317,46 +14419,55 @@
 | System.Xml.Serialization;XmlReflectionImporter;XmlReflectionImporter;(System.Xml.Serialization.XmlAttributeOverrides,System.String);Argument[0];Argument[this];taint;df-generated |
 | System.Xml.Serialization;XmlReflectionImporter;XmlReflectionImporter;(System.Xml.Serialization.XmlAttributeOverrides,System.String);Argument[1];Argument[this];taint;df-generated |
 | System.Xml.Serialization;XmlRootAttribute;XmlRootAttribute;(System.String);Argument[0];Argument[this];taint;df-generated |
-| System.Xml.Serialization;XmlSchemaEnumerator;XmlSchemaEnumerator;(System.Xml.Serialization.XmlSchemas);Argument[0].Element;Argument[this];taint;df-generated |
-| System.Xml.Serialization;XmlSchemaEnumerator;get_Current;();Argument[this];ReturnValue;taint;df-generated |
+| System.Xml.Serialization;XmlSchemaEnumerator;XmlSchemaEnumerator;(System.Xml.Serialization.XmlSchemas);Argument[0];Argument[this].SyntheticField[System.Xml.Serialization.XmlSchemaEnumerator._list];value;dfc-generated |
+| System.Xml.Serialization;XmlSchemaEnumerator;get_Current;();Argument[this].SyntheticField[System.Xml.Serialization.XmlSchemaEnumerator._list].Element;ReturnValue;value;df-generated |
+| System.Xml.Serialization;XmlSchemaEnumerator;get_Current;();Argument[this].SyntheticField[System.Xml.Serialization.XmlSchemaEnumerator._list].Element;ReturnValue;value;dfc-generated |
 | System.Xml.Serialization;XmlSchemaExporter;ExportMembersMapping;(System.Xml.Serialization.XmlMembersMapping);Argument[0];Argument[this];taint;df-generated |
 | System.Xml.Serialization;XmlSchemaExporter;ExportMembersMapping;(System.Xml.Serialization.XmlMembersMapping,System.Boolean);Argument[0];Argument[this];taint;df-generated |
 | System.Xml.Serialization;XmlSchemaExporter;ExportTypeMapping;(System.Xml.Serialization.XmlMembersMapping);Argument[0];Argument[this];taint;df-generated |
 | System.Xml.Serialization;XmlSchemaExporter;ExportTypeMapping;(System.Xml.Serialization.XmlTypeMapping);Argument[0];Argument[this];taint;df-generated |
 | System.Xml.Serialization;XmlSchemaExporter;XmlSchemaExporter;(System.Xml.Serialization.XmlSchemas);Argument[0].Element;Argument[this];taint;df-generated |
-| System.Xml.Serialization;XmlSchemaProviderAttribute;XmlSchemaProviderAttribute;(System.String);Argument[0];Argument[this];taint;df-generated |
-| System.Xml.Serialization;XmlSchemaProviderAttribute;get_MethodName;();Argument[this];ReturnValue;taint;df-generated |
+| System.Xml.Serialization;XmlSchemaProviderAttribute;XmlSchemaProviderAttribute;(System.String);Argument[0];Argument[this].SyntheticField[System.Xml.Serialization.XmlSchemaProviderAttribute._methodName];value;dfc-generated |
+| System.Xml.Serialization;XmlSchemaProviderAttribute;get_MethodName;();Argument[this].SyntheticField[System.Xml.Serialization.XmlSchemaProviderAttribute._methodName];ReturnValue;value;dfc-generated |
 | System.Xml.Serialization;XmlSchemas;Add;(System.Xml.Schema.XmlSchema);Argument[0];Argument[this].Element;value;manual |
-| System.Xml.Serialization;XmlSchemas;Add;(System.Xml.Schema.XmlSchema,System.Uri);Argument[0];Argument[this];taint;df-generated |
-| System.Xml.Serialization;XmlSchemas;Add;(System.Xml.Schema.XmlSchema,System.Uri);Argument[1];Argument[0];taint;df-generated |
-| System.Xml.Serialization;XmlSchemas;Add;(System.Xml.Schema.XmlSchema,System.Uri);Argument[1];Argument[this];taint;df-generated |
+| System.Xml.Serialization;XmlSchemas;Add;(System.Xml.Schema.XmlSchema,System.Uri);Argument[0];Argument[this].Property[System.Collections.CollectionBase.List].Element;value;dfc-generated |
 | System.Xml.Serialization;XmlSchemas;Add;(System.Xml.Serialization.XmlSchemas);Argument[0];Argument[this].Element;value;manual |
 | System.Xml.Serialization;XmlSchemas;Compile;(System.Xml.Schema.ValidationEventHandler,System.Boolean);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Xml.Serialization;XmlSchemas;CopyTo;(System.Xml.Schema.XmlSchema[],System.Int32);Argument[this].Element;Argument[0].Element;value;manual |
 | System.Xml.Serialization;XmlSchemas;Find;(System.Xml.XmlQualifiedName,System.Type);Argument[this].Element;ReturnValue;value;manual |
 | System.Xml.Serialization;XmlSchemas;Insert;(System.Int32,System.Xml.Schema.XmlSchema);Argument[1];Argument[this].Element;value;manual |
-| System.Xml.Serialization;XmlSchemas;Remove;(System.Xml.Schema.XmlSchema);Argument[0];Argument[this];taint;df-generated |
 | System.Xml.Serialization;XmlSchemas;get_Item;(System.Int32);Argument[this].Element;ReturnValue;value;manual |
 | System.Xml.Serialization;XmlSchemas;get_Item;(System.String);Argument[this].Element;ReturnValue;value;manual |
 | System.Xml.Serialization;XmlSchemas;set_Item;(System.Int32,System.Xml.Schema.XmlSchema);Argument[1];Argument[this].Element;value;manual |
 | System.Xml.Serialization;XmlSerializationCollectionFixupCallback;BeginInvoke;(System.Object,System.Object,System.AsyncCallback,System.Object);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
 | System.Xml.Serialization;XmlSerializationFixupCallback;BeginInvoke;(System.Object,System.AsyncCallback,System.Object);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
 | System.Xml.Serialization;XmlSerializationReadCallback;BeginInvoke;(System.AsyncCallback,System.Object);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
+| System.Xml.Serialization;XmlSerializationReader+CollectionFixup;CollectionFixup;(System.Object,System.Xml.Serialization.XmlSerializationCollectionFixupCallback,System.Object);Argument[0];Argument[this].SyntheticField[System.Xml.Serialization.XmlSerializationReader+CollectionFixup._collection];value;dfc-generated |
+| System.Xml.Serialization;XmlSerializationReader+CollectionFixup;CollectionFixup;(System.Object,System.Xml.Serialization.XmlSerializationCollectionFixupCallback,System.Object);Argument[0];Argument[this].SyntheticField[System.Xml.Serialization.XmlSerializationReader+CollectionFixup._collection];value;hq-generated |
+| System.Xml.Serialization;XmlSerializationReader+CollectionFixup;CollectionFixup;(System.Object,System.Xml.Serialization.XmlSerializationCollectionFixupCallback,System.Object);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | System.Xml.Serialization;XmlSerializationReader+CollectionFixup;CollectionFixup;(System.Object,System.Xml.Serialization.XmlSerializationCollectionFixupCallback,System.Object);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
-| System.Xml.Serialization;XmlSerializationReader+CollectionFixup;get_Callback;();Argument[this];ReturnValue;taint;df-generated |
-| System.Xml.Serialization;XmlSerializationReader+CollectionFixup;get_Collection;();Argument[this];ReturnValue;taint;df-generated |
-| System.Xml.Serialization;XmlSerializationReader+CollectionFixup;get_CollectionItems;();Argument[this];ReturnValue;taint;df-generated |
+| System.Xml.Serialization;XmlSerializationReader+CollectionFixup;CollectionFixup;(System.Object,System.Xml.Serialization.XmlSerializationCollectionFixupCallback,System.Object);Argument[1];Argument[this].SyntheticField[System.Xml.Serialization.XmlSerializationReader+CollectionFixup._callback];value;dfc-generated |
+| System.Xml.Serialization;XmlSerializationReader+CollectionFixup;CollectionFixup;(System.Object,System.Xml.Serialization.XmlSerializationCollectionFixupCallback,System.Object);Argument[1];Argument[this].SyntheticField[System.Xml.Serialization.XmlSerializationReader+CollectionFixup._callback];value;hq-generated |
+| System.Xml.Serialization;XmlSerializationReader+CollectionFixup;CollectionFixup;(System.Object,System.Xml.Serialization.XmlSerializationCollectionFixupCallback,System.Object);Argument[2];Argument[this].SyntheticField[System.Xml.Serialization.XmlSerializationReader+CollectionFixup._collectionItems];value;dfc-generated |
+| System.Xml.Serialization;XmlSerializationReader+CollectionFixup;CollectionFixup;(System.Object,System.Xml.Serialization.XmlSerializationCollectionFixupCallback,System.Object);Argument[2];Argument[this].SyntheticField[System.Xml.Serialization.XmlSerializationReader+CollectionFixup._collectionItems];value;hq-generated |
+| System.Xml.Serialization;XmlSerializationReader+CollectionFixup;get_Callback;();Argument[this].SyntheticField[System.Xml.Serialization.XmlSerializationReader+CollectionFixup._callback];ReturnValue;value;dfc-generated |
+| System.Xml.Serialization;XmlSerializationReader+CollectionFixup;get_Collection;();Argument[this].SyntheticField[System.Xml.Serialization.XmlSerializationReader+CollectionFixup._collection];ReturnValue;value;dfc-generated |
+| System.Xml.Serialization;XmlSerializationReader+CollectionFixup;get_CollectionItems;();Argument[this].SyntheticField[System.Xml.Serialization.XmlSerializationReader+CollectionFixup._collectionItems];ReturnValue;value;dfc-generated |
 | System.Xml.Serialization;XmlSerializationReader+Fixup;Fixup;(System.Object,System.Xml.Serialization.XmlSerializationFixupCallback,System.Int32);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
+| System.Xml.Serialization;XmlSerializationReader+Fixup;Fixup;(System.Object,System.Xml.Serialization.XmlSerializationFixupCallback,System.String[]);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | System.Xml.Serialization;XmlSerializationReader+Fixup;Fixup;(System.Object,System.Xml.Serialization.XmlSerializationFixupCallback,System.String[]);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
-| System.Xml.Serialization;XmlSerializationReader+Fixup;get_Callback;();Argument[this];ReturnValue;taint;df-generated |
-| System.Xml.Serialization;XmlSerializationReader+Fixup;get_Ids;();Argument[this];ReturnValue;taint;df-generated |
+| System.Xml.Serialization;XmlSerializationReader+Fixup;Fixup;(System.Object,System.Xml.Serialization.XmlSerializationFixupCallback,System.String[]);Argument[1];Argument[this].SyntheticField[System.Xml.Serialization.XmlSerializationReader+Fixup._callback];value;dfc-generated |
+| System.Xml.Serialization;XmlSerializationReader+Fixup;Fixup;(System.Object,System.Xml.Serialization.XmlSerializationFixupCallback,System.String[]);Argument[1];Argument[this].SyntheticField[System.Xml.Serialization.XmlSerializationReader+Fixup._callback];value;hq-generated |
+| System.Xml.Serialization;XmlSerializationReader+Fixup;Fixup;(System.Object,System.Xml.Serialization.XmlSerializationFixupCallback,System.String[]);Argument[2];Argument[this].SyntheticField[System.Xml.Serialization.XmlSerializationReader+Fixup._ids];value;dfc-generated |
+| System.Xml.Serialization;XmlSerializationReader+Fixup;Fixup;(System.Object,System.Xml.Serialization.XmlSerializationFixupCallback,System.String[]);Argument[2];Argument[this].SyntheticField[System.Xml.Serialization.XmlSerializationReader+Fixup._ids];value;hq-generated |
+| System.Xml.Serialization;XmlSerializationReader+Fixup;get_Callback;();Argument[this].SyntheticField[System.Xml.Serialization.XmlSerializationReader+Fixup._callback];ReturnValue;value;dfc-generated |
+| System.Xml.Serialization;XmlSerializationReader+Fixup;get_Ids;();Argument[this].SyntheticField[System.Xml.Serialization.XmlSerializationReader+Fixup._ids];ReturnValue;value;dfc-generated |
 | System.Xml.Serialization;XmlSerializationReader;AddFixup;(System.Xml.Serialization.XmlSerializationReader+CollectionFixup);Argument[0];Argument[this];taint;df-generated |
 | System.Xml.Serialization;XmlSerializationReader;AddFixup;(System.Xml.Serialization.XmlSerializationReader+Fixup);Argument[0];Argument[this];taint;df-generated |
 | System.Xml.Serialization;XmlSerializationReader;AddReadCallback;(System.String,System.String,System.Type,System.Xml.Serialization.XmlSerializationReadCallback);Argument[3];Argument[3].Parameter[delegate-self];value;hq-generated |
 | System.Xml.Serialization;XmlSerializationReader;AddTarget;(System.String,System.Object);Argument[1];Argument[this];taint;df-generated |
-| System.Xml.Serialization;XmlSerializationReader;AddTarget;(System.String,System.Object);Argument[this];Argument[1];taint;df-generated |
-| System.Xml.Serialization;XmlSerializationReader;CollapseWhitespace;(System.String);Argument[0];ReturnValue;taint;df-generated |
-| System.Xml.Serialization;XmlSerializationReader;EnsureArrayIndex;(System.Array,System.Int32,System.Type);Argument[0].Element;ReturnValue;taint;df-generated |
+| System.Xml.Serialization;XmlSerializationReader;CollapseWhitespace;(System.String);Argument[0];ReturnValue;taint;dfc-generated |
+| System.Xml.Serialization;XmlSerializationReader;EnsureArrayIndex;(System.Array,System.Int32,System.Type);Argument[0];ReturnValue;value;dfc-generated |
 | System.Xml.Serialization;XmlSerializationReader;GetTarget;(System.String);Argument[this];ReturnValue;taint;df-generated |
 | System.Xml.Serialization;XmlSerializationReader;ReadNullableString;();Argument[this];ReturnValue;taint;df-generated |
 | System.Xml.Serialization;XmlSerializationReader;ReadReference;(System.String);Argument[this];ReturnValue;taint;df-generated |
@@ -13365,35 +14476,29 @@
 | System.Xml.Serialization;XmlSerializationReader;ReadReferencingElement;(System.String);Argument[this];ReturnValue;taint;df-generated |
 | System.Xml.Serialization;XmlSerializationReader;ReadReferencingElement;(System.String,System.String,System.Boolean,System.String);Argument[this];ReturnValue;taint;df-generated |
 | System.Xml.Serialization;XmlSerializationReader;ReadReferencingElement;(System.String,System.String,System.String);Argument[this];ReturnValue;taint;df-generated |
-| System.Xml.Serialization;XmlSerializationReader;ReadSerializable;(System.Xml.Serialization.IXmlSerializable);Argument[0];ReturnValue;taint;df-generated |
-| System.Xml.Serialization;XmlSerializationReader;ReadSerializable;(System.Xml.Serialization.IXmlSerializable);Argument[this];Argument[0];taint;df-generated |
-| System.Xml.Serialization;XmlSerializationReader;ReadSerializable;(System.Xml.Serialization.IXmlSerializable);Argument[this];ReturnValue;taint;df-generated |
-| System.Xml.Serialization;XmlSerializationReader;ReadSerializable;(System.Xml.Serialization.IXmlSerializable,System.Boolean);Argument[0];ReturnValue;taint;df-generated |
-| System.Xml.Serialization;XmlSerializationReader;ReadSerializable;(System.Xml.Serialization.IXmlSerializable,System.Boolean);Argument[this];Argument[0];taint;df-generated |
-| System.Xml.Serialization;XmlSerializationReader;ReadSerializable;(System.Xml.Serialization.IXmlSerializable,System.Boolean);Argument[this];ReturnValue;taint;df-generated |
-| System.Xml.Serialization;XmlSerializationReader;ReadString;(System.String);Argument[0];ReturnValue;taint;df-generated |
-| System.Xml.Serialization;XmlSerializationReader;ReadString;(System.String);Argument[this];ReturnValue;taint;df-generated |
-| System.Xml.Serialization;XmlSerializationReader;ReadString;(System.String,System.Boolean);Argument[0];ReturnValue;taint;df-generated |
-| System.Xml.Serialization;XmlSerializationReader;ReadString;(System.String,System.Boolean);Argument[this];ReturnValue;taint;df-generated |
+| System.Xml.Serialization;XmlSerializationReader;ReadSerializable;(System.Xml.Serialization.IXmlSerializable);Argument[0];ReturnValue;value;dfc-generated |
+| System.Xml.Serialization;XmlSerializationReader;ReadSerializable;(System.Xml.Serialization.IXmlSerializable,System.Boolean);Argument[0];ReturnValue;value;dfc-generated |
+| System.Xml.Serialization;XmlSerializationReader;ReadString;(System.String);Argument[0];ReturnValue;taint;dfc-generated |
+| System.Xml.Serialization;XmlSerializationReader;ReadString;(System.String,System.Boolean);Argument[0];ReturnValue;taint;dfc-generated |
 | System.Xml.Serialization;XmlSerializationReader;ReadTypedPrimitive;(System.Xml.XmlQualifiedName);Argument[this];ReturnValue;taint;df-generated |
-| System.Xml.Serialization;XmlSerializationReader;ShrinkArray;(System.Array,System.Int32,System.Type,System.Boolean);Argument[0].Element;ReturnValue;taint;df-generated |
-| System.Xml.Serialization;XmlSerializationReader;ToByteArrayBase64;(System.String);Argument[0];ReturnValue;taint;df-generated |
-| System.Xml.Serialization;XmlSerializationReader;ToXmlNCName;(System.String);Argument[0];ReturnValue;taint;df-generated |
-| System.Xml.Serialization;XmlSerializationReader;ToXmlName;(System.String);Argument[0];ReturnValue;taint;df-generated |
-| System.Xml.Serialization;XmlSerializationReader;ToXmlNmToken;(System.String);Argument[0];ReturnValue;taint;df-generated |
-| System.Xml.Serialization;XmlSerializationReader;ToXmlNmTokens;(System.String);Argument[0];ReturnValue;taint;df-generated |
+| System.Xml.Serialization;XmlSerializationReader;ShrinkArray;(System.Array,System.Int32,System.Type,System.Boolean);Argument[0];ReturnValue;value;dfc-generated |
+| System.Xml.Serialization;XmlSerializationReader;ToByteArrayBase64;(System.String);Argument[0];ReturnValue.Element;taint;dfc-generated |
+| System.Xml.Serialization;XmlSerializationReader;ToXmlNCName;(System.String);Argument[0];ReturnValue;taint;dfc-generated |
+| System.Xml.Serialization;XmlSerializationReader;ToXmlName;(System.String);Argument[0];ReturnValue;taint;dfc-generated |
+| System.Xml.Serialization;XmlSerializationReader;ToXmlNmToken;(System.String);Argument[0];ReturnValue;taint;dfc-generated |
+| System.Xml.Serialization;XmlSerializationReader;ToXmlNmTokens;(System.String);Argument[0];ReturnValue;taint;dfc-generated |
 | System.Xml.Serialization;XmlSerializationReader;get_Document;();Argument[this];ReturnValue;taint;df-generated |
 | System.Xml.Serialization;XmlSerializationReader;get_Reader;();Argument[this];ReturnValue;taint;df-generated |
 | System.Xml.Serialization;XmlSerializationWriteCallback;BeginInvoke;(System.Object,System.AsyncCallback,System.Object);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
 | System.Xml.Serialization;XmlSerializationWriter;AddWriteCallback;(System.Type,System.String,System.String,System.Xml.Serialization.XmlSerializationWriteCallback);Argument[3];Argument[3].Parameter[delegate-self];value;hq-generated |
-| System.Xml.Serialization;XmlSerializationWriter;FromByteArrayBase64;(System.Byte[]);Argument[0].Element;ReturnValue;taint;df-generated |
-| System.Xml.Serialization;XmlSerializationWriter;FromByteArrayHex;(System.Byte[]);Argument[0].Element;ReturnValue;taint;df-generated |
-| System.Xml.Serialization;XmlSerializationWriter;FromEnum;(System.Int64,System.String[],System.Int64[]);Argument[1].Element;ReturnValue;taint;df-generated |
-| System.Xml.Serialization;XmlSerializationWriter;FromEnum;(System.Int64,System.String[],System.Int64[],System.String);Argument[1].Element;ReturnValue;taint;df-generated |
-| System.Xml.Serialization;XmlSerializationWriter;FromXmlNCName;(System.String);Argument[0];ReturnValue;taint;df-generated |
-| System.Xml.Serialization;XmlSerializationWriter;FromXmlName;(System.String);Argument[0];ReturnValue;taint;df-generated |
-| System.Xml.Serialization;XmlSerializationWriter;FromXmlNmToken;(System.String);Argument[0];ReturnValue;taint;df-generated |
-| System.Xml.Serialization;XmlSerializationWriter;FromXmlNmTokens;(System.String);Argument[0];ReturnValue;taint;df-generated |
+| System.Xml.Serialization;XmlSerializationWriter;FromByteArrayBase64;(System.Byte[]);Argument[0];ReturnValue;value;dfc-generated |
+| System.Xml.Serialization;XmlSerializationWriter;FromByteArrayHex;(System.Byte[]);Argument[0].Element;ReturnValue;taint;dfc-generated |
+| System.Xml.Serialization;XmlSerializationWriter;FromEnum;(System.Int64,System.String[],System.Int64[]);Argument[1].Element;ReturnValue;taint;dfc-generated |
+| System.Xml.Serialization;XmlSerializationWriter;FromEnum;(System.Int64,System.String[],System.Int64[],System.String);Argument[1].Element;ReturnValue;taint;dfc-generated |
+| System.Xml.Serialization;XmlSerializationWriter;FromXmlNCName;(System.String);Argument[0];ReturnValue;value;dfc-generated |
+| System.Xml.Serialization;XmlSerializationWriter;FromXmlName;(System.String);Argument[0];ReturnValue;value;dfc-generated |
+| System.Xml.Serialization;XmlSerializationWriter;FromXmlNmToken;(System.String);Argument[0];ReturnValue;value;dfc-generated |
+| System.Xml.Serialization;XmlSerializationWriter;FromXmlNmTokens;(System.String);Argument[0];ReturnValue;value;dfc-generated |
 | System.Xml.Serialization;XmlSerializationWriter;FromXmlQualifiedName;(System.Xml.XmlQualifiedName);Argument[0];Argument[this];taint;df-generated |
 | System.Xml.Serialization;XmlSerializationWriter;FromXmlQualifiedName;(System.Xml.XmlQualifiedName);Argument[0];ReturnValue;taint;df-generated |
 | System.Xml.Serialization;XmlSerializationWriter;FromXmlQualifiedName;(System.Xml.XmlQualifiedName);Argument[this];ReturnValue;taint;df-generated |
@@ -13408,64 +14513,103 @@
 | System.Xml.Serialization;XmlSerializationWriter;WriteAttribute;(System.String,System.String,System.Byte[]);Argument[2].Element;Argument[this];taint;df-generated |
 | System.Xml.Serialization;XmlSerializationWriter;WriteAttribute;(System.String,System.String,System.String);Argument[0];Argument[this];taint;df-generated |
 | System.Xml.Serialization;XmlSerializationWriter;WriteAttribute;(System.String,System.String,System.String);Argument[2];Argument[this];taint;df-generated |
+| System.Xml.Serialization;XmlSerializationWriter;WriteAttribute;(System.String,System.String,System.String,System.String);Argument[0];Argument[this];taint;df-generated |
 | System.Xml.Serialization;XmlSerializationWriter;WriteAttribute;(System.String,System.String,System.String,System.String);Argument[1];Argument[this];taint;df-generated |
 | System.Xml.Serialization;XmlSerializationWriter;WriteAttribute;(System.String,System.String,System.String,System.String);Argument[3];Argument[this];taint;df-generated |
 | System.Xml.Serialization;XmlSerializationWriter;WriteElementEncoded;(System.Xml.XmlNode,System.String,System.String,System.Boolean,System.Boolean);Argument[0].Element;Argument[this];taint;df-generated |
+| System.Xml.Serialization;XmlSerializationWriter;WriteElementEncoded;(System.Xml.XmlNode,System.String,System.String,System.Boolean,System.Boolean);Argument[1];Argument[this];taint;df-generated |
 | System.Xml.Serialization;XmlSerializationWriter;WriteElementLiteral;(System.Xml.XmlNode,System.String,System.String,System.Boolean,System.Boolean);Argument[0].Element;Argument[this];taint;df-generated |
+| System.Xml.Serialization;XmlSerializationWriter;WriteElementLiteral;(System.Xml.XmlNode,System.String,System.String,System.Boolean,System.Boolean);Argument[1];Argument[this];taint;df-generated |
+| System.Xml.Serialization;XmlSerializationWriter;WriteElementQualifiedName;(System.String,System.String,System.Xml.XmlQualifiedName);Argument[0];Argument[this];taint;df-generated |
 | System.Xml.Serialization;XmlSerializationWriter;WriteElementQualifiedName;(System.String,System.String,System.Xml.XmlQualifiedName);Argument[2];Argument[this];taint;df-generated |
+| System.Xml.Serialization;XmlSerializationWriter;WriteElementQualifiedName;(System.String,System.String,System.Xml.XmlQualifiedName,System.Xml.XmlQualifiedName);Argument[0];Argument[this];taint;df-generated |
 | System.Xml.Serialization;XmlSerializationWriter;WriteElementQualifiedName;(System.String,System.String,System.Xml.XmlQualifiedName,System.Xml.XmlQualifiedName);Argument[2];Argument[this];taint;df-generated |
 | System.Xml.Serialization;XmlSerializationWriter;WriteElementQualifiedName;(System.String,System.String,System.Xml.XmlQualifiedName,System.Xml.XmlQualifiedName);Argument[3];Argument[this];taint;df-generated |
+| System.Xml.Serialization;XmlSerializationWriter;WriteElementQualifiedName;(System.String,System.Xml.XmlQualifiedName);Argument[0];Argument[this];taint;df-generated |
 | System.Xml.Serialization;XmlSerializationWriter;WriteElementQualifiedName;(System.String,System.Xml.XmlQualifiedName);Argument[1];Argument[this];taint;df-generated |
+| System.Xml.Serialization;XmlSerializationWriter;WriteElementQualifiedName;(System.String,System.Xml.XmlQualifiedName,System.Xml.XmlQualifiedName);Argument[0];Argument[this];taint;df-generated |
 | System.Xml.Serialization;XmlSerializationWriter;WriteElementQualifiedName;(System.String,System.Xml.XmlQualifiedName,System.Xml.XmlQualifiedName);Argument[1];Argument[this];taint;df-generated |
 | System.Xml.Serialization;XmlSerializationWriter;WriteElementQualifiedName;(System.String,System.Xml.XmlQualifiedName,System.Xml.XmlQualifiedName);Argument[2];Argument[this];taint;df-generated |
+| System.Xml.Serialization;XmlSerializationWriter;WriteElementString;(System.String,System.String);Argument[0];Argument[this];taint;df-generated |
 | System.Xml.Serialization;XmlSerializationWriter;WriteElementString;(System.String,System.String);Argument[1];Argument[this];taint;df-generated |
+| System.Xml.Serialization;XmlSerializationWriter;WriteElementString;(System.String,System.String,System.String);Argument[0];Argument[this];taint;df-generated |
 | System.Xml.Serialization;XmlSerializationWriter;WriteElementString;(System.String,System.String,System.String);Argument[2];Argument[this];taint;df-generated |
+| System.Xml.Serialization;XmlSerializationWriter;WriteElementString;(System.String,System.String,System.String,System.Xml.XmlQualifiedName);Argument[0];Argument[this];taint;df-generated |
 | System.Xml.Serialization;XmlSerializationWriter;WriteElementString;(System.String,System.String,System.String,System.Xml.XmlQualifiedName);Argument[2];Argument[this];taint;df-generated |
 | System.Xml.Serialization;XmlSerializationWriter;WriteElementString;(System.String,System.String,System.String,System.Xml.XmlQualifiedName);Argument[3];Argument[this];taint;df-generated |
+| System.Xml.Serialization;XmlSerializationWriter;WriteElementString;(System.String,System.String,System.Xml.XmlQualifiedName);Argument[0];Argument[this];taint;df-generated |
 | System.Xml.Serialization;XmlSerializationWriter;WriteElementString;(System.String,System.String,System.Xml.XmlQualifiedName);Argument[1];Argument[this];taint;df-generated |
 | System.Xml.Serialization;XmlSerializationWriter;WriteElementString;(System.String,System.String,System.Xml.XmlQualifiedName);Argument[2];Argument[this];taint;df-generated |
+| System.Xml.Serialization;XmlSerializationWriter;WriteElementStringRaw;(System.String,System.Byte[]);Argument[0];Argument[this];taint;df-generated |
 | System.Xml.Serialization;XmlSerializationWriter;WriteElementStringRaw;(System.String,System.Byte[]);Argument[1].Element;Argument[this];taint;df-generated |
+| System.Xml.Serialization;XmlSerializationWriter;WriteElementStringRaw;(System.String,System.Byte[],System.Xml.XmlQualifiedName);Argument[0];Argument[this];taint;df-generated |
 | System.Xml.Serialization;XmlSerializationWriter;WriteElementStringRaw;(System.String,System.Byte[],System.Xml.XmlQualifiedName);Argument[1].Element;Argument[this];taint;df-generated |
 | System.Xml.Serialization;XmlSerializationWriter;WriteElementStringRaw;(System.String,System.Byte[],System.Xml.XmlQualifiedName);Argument[2];Argument[this];taint;df-generated |
+| System.Xml.Serialization;XmlSerializationWriter;WriteElementStringRaw;(System.String,System.String);Argument[0];Argument[this];taint;df-generated |
 | System.Xml.Serialization;XmlSerializationWriter;WriteElementStringRaw;(System.String,System.String);Argument[1];Argument[this];taint;df-generated |
+| System.Xml.Serialization;XmlSerializationWriter;WriteElementStringRaw;(System.String,System.String,System.Byte[]);Argument[0];Argument[this];taint;df-generated |
 | System.Xml.Serialization;XmlSerializationWriter;WriteElementStringRaw;(System.String,System.String,System.Byte[]);Argument[2].Element;Argument[this];taint;df-generated |
+| System.Xml.Serialization;XmlSerializationWriter;WriteElementStringRaw;(System.String,System.String,System.Byte[],System.Xml.XmlQualifiedName);Argument[0];Argument[this];taint;df-generated |
 | System.Xml.Serialization;XmlSerializationWriter;WriteElementStringRaw;(System.String,System.String,System.Byte[],System.Xml.XmlQualifiedName);Argument[2].Element;Argument[this];taint;df-generated |
 | System.Xml.Serialization;XmlSerializationWriter;WriteElementStringRaw;(System.String,System.String,System.Byte[],System.Xml.XmlQualifiedName);Argument[3];Argument[this];taint;df-generated |
+| System.Xml.Serialization;XmlSerializationWriter;WriteElementStringRaw;(System.String,System.String,System.String);Argument[0];Argument[this];taint;df-generated |
 | System.Xml.Serialization;XmlSerializationWriter;WriteElementStringRaw;(System.String,System.String,System.String);Argument[2];Argument[this];taint;df-generated |
+| System.Xml.Serialization;XmlSerializationWriter;WriteElementStringRaw;(System.String,System.String,System.String,System.Xml.XmlQualifiedName);Argument[0];Argument[this];taint;df-generated |
 | System.Xml.Serialization;XmlSerializationWriter;WriteElementStringRaw;(System.String,System.String,System.String,System.Xml.XmlQualifiedName);Argument[2];Argument[this];taint;df-generated |
 | System.Xml.Serialization;XmlSerializationWriter;WriteElementStringRaw;(System.String,System.String,System.String,System.Xml.XmlQualifiedName);Argument[3];Argument[this];taint;df-generated |
+| System.Xml.Serialization;XmlSerializationWriter;WriteElementStringRaw;(System.String,System.String,System.Xml.XmlQualifiedName);Argument[0];Argument[this];taint;df-generated |
 | System.Xml.Serialization;XmlSerializationWriter;WriteElementStringRaw;(System.String,System.String,System.Xml.XmlQualifiedName);Argument[1];Argument[this];taint;df-generated |
 | System.Xml.Serialization;XmlSerializationWriter;WriteElementStringRaw;(System.String,System.String,System.Xml.XmlQualifiedName);Argument[2];Argument[this];taint;df-generated |
+| System.Xml.Serialization;XmlSerializationWriter;WriteEmptyTag;(System.String);Argument[0];Argument[this];taint;df-generated |
+| System.Xml.Serialization;XmlSerializationWriter;WriteEmptyTag;(System.String,System.String);Argument[0];Argument[this];taint;df-generated |
 | System.Xml.Serialization;XmlSerializationWriter;WriteId;(System.Object);Argument[0];Argument[this];taint;df-generated |
-| System.Xml.Serialization;XmlSerializationWriter;WriteId;(System.Object);Argument[this];Argument[0];taint;df-generated |
 | System.Xml.Serialization;XmlSerializationWriter;WriteNamespaceDeclarations;(System.Xml.Serialization.XmlSerializerNamespaces);Argument[0];Argument[this];taint;df-generated |
+| System.Xml.Serialization;XmlSerializationWriter;WriteNullTagEncoded;(System.String);Argument[0];Argument[this];taint;df-generated |
+| System.Xml.Serialization;XmlSerializationWriter;WriteNullTagEncoded;(System.String,System.String);Argument[0];Argument[this];taint;df-generated |
+| System.Xml.Serialization;XmlSerializationWriter;WriteNullTagLiteral;(System.String);Argument[0];Argument[this];taint;df-generated |
+| System.Xml.Serialization;XmlSerializationWriter;WriteNullTagLiteral;(System.String,System.String);Argument[0];Argument[this];taint;df-generated |
+| System.Xml.Serialization;XmlSerializationWriter;WriteNullableQualifiedNameEncoded;(System.String,System.String,System.Xml.XmlQualifiedName,System.Xml.XmlQualifiedName);Argument[0];Argument[this];taint;df-generated |
 | System.Xml.Serialization;XmlSerializationWriter;WriteNullableQualifiedNameEncoded;(System.String,System.String,System.Xml.XmlQualifiedName,System.Xml.XmlQualifiedName);Argument[2];Argument[this];taint;df-generated |
 | System.Xml.Serialization;XmlSerializationWriter;WriteNullableQualifiedNameEncoded;(System.String,System.String,System.Xml.XmlQualifiedName,System.Xml.XmlQualifiedName);Argument[3];Argument[this];taint;df-generated |
+| System.Xml.Serialization;XmlSerializationWriter;WriteNullableQualifiedNameLiteral;(System.String,System.String,System.Xml.XmlQualifiedName);Argument[0];Argument[this];taint;df-generated |
 | System.Xml.Serialization;XmlSerializationWriter;WriteNullableQualifiedNameLiteral;(System.String,System.String,System.Xml.XmlQualifiedName);Argument[2];Argument[this];taint;df-generated |
+| System.Xml.Serialization;XmlSerializationWriter;WriteNullableStringEncoded;(System.String,System.String,System.String,System.Xml.XmlQualifiedName);Argument[0];Argument[this];taint;df-generated |
 | System.Xml.Serialization;XmlSerializationWriter;WriteNullableStringEncoded;(System.String,System.String,System.String,System.Xml.XmlQualifiedName);Argument[2];Argument[this];taint;df-generated |
 | System.Xml.Serialization;XmlSerializationWriter;WriteNullableStringEncoded;(System.String,System.String,System.String,System.Xml.XmlQualifiedName);Argument[3];Argument[this];taint;df-generated |
+| System.Xml.Serialization;XmlSerializationWriter;WriteNullableStringEncodedRaw;(System.String,System.String,System.Byte[],System.Xml.XmlQualifiedName);Argument[0];Argument[this];taint;df-generated |
 | System.Xml.Serialization;XmlSerializationWriter;WriteNullableStringEncodedRaw;(System.String,System.String,System.Byte[],System.Xml.XmlQualifiedName);Argument[2].Element;Argument[this];taint;df-generated |
 | System.Xml.Serialization;XmlSerializationWriter;WriteNullableStringEncodedRaw;(System.String,System.String,System.Byte[],System.Xml.XmlQualifiedName);Argument[3];Argument[this];taint;df-generated |
+| System.Xml.Serialization;XmlSerializationWriter;WriteNullableStringEncodedRaw;(System.String,System.String,System.String,System.Xml.XmlQualifiedName);Argument[0];Argument[this];taint;df-generated |
 | System.Xml.Serialization;XmlSerializationWriter;WriteNullableStringEncodedRaw;(System.String,System.String,System.String,System.Xml.XmlQualifiedName);Argument[2];Argument[this];taint;df-generated |
 | System.Xml.Serialization;XmlSerializationWriter;WriteNullableStringEncodedRaw;(System.String,System.String,System.String,System.Xml.XmlQualifiedName);Argument[3];Argument[this];taint;df-generated |
+| System.Xml.Serialization;XmlSerializationWriter;WriteNullableStringLiteral;(System.String,System.String,System.String);Argument[0];Argument[this];taint;df-generated |
 | System.Xml.Serialization;XmlSerializationWriter;WriteNullableStringLiteral;(System.String,System.String,System.String);Argument[2];Argument[this];taint;df-generated |
+| System.Xml.Serialization;XmlSerializationWriter;WriteNullableStringLiteralRaw;(System.String,System.String,System.Byte[]);Argument[0];Argument[this];taint;df-generated |
 | System.Xml.Serialization;XmlSerializationWriter;WriteNullableStringLiteralRaw;(System.String,System.String,System.Byte[]);Argument[2].Element;Argument[this];taint;df-generated |
+| System.Xml.Serialization;XmlSerializationWriter;WriteNullableStringLiteralRaw;(System.String,System.String,System.String);Argument[0];Argument[this];taint;df-generated |
 | System.Xml.Serialization;XmlSerializationWriter;WriteNullableStringLiteralRaw;(System.String,System.String,System.String);Argument[2];Argument[this];taint;df-generated |
+| System.Xml.Serialization;XmlSerializationWriter;WritePotentiallyReferencingElement;(System.String,System.String,System.Object);Argument[0];Argument[this];taint;df-generated |
 | System.Xml.Serialization;XmlSerializationWriter;WritePotentiallyReferencingElement;(System.String,System.String,System.Object);Argument[2];Argument[this];taint;df-generated |
-| System.Xml.Serialization;XmlSerializationWriter;WritePotentiallyReferencingElement;(System.String,System.String,System.Object);Argument[this];Argument[2];taint;df-generated |
+| System.Xml.Serialization;XmlSerializationWriter;WritePotentiallyReferencingElement;(System.String,System.String,System.Object,System.Type);Argument[0];Argument[this];taint;df-generated |
 | System.Xml.Serialization;XmlSerializationWriter;WritePotentiallyReferencingElement;(System.String,System.String,System.Object,System.Type);Argument[2];Argument[this];taint;df-generated |
-| System.Xml.Serialization;XmlSerializationWriter;WritePotentiallyReferencingElement;(System.String,System.String,System.Object,System.Type);Argument[this];Argument[2];taint;df-generated |
+| System.Xml.Serialization;XmlSerializationWriter;WritePotentiallyReferencingElement;(System.String,System.String,System.Object,System.Type,System.Boolean);Argument[0];Argument[this];taint;df-generated |
 | System.Xml.Serialization;XmlSerializationWriter;WritePotentiallyReferencingElement;(System.String,System.String,System.Object,System.Type,System.Boolean);Argument[2];Argument[this];taint;df-generated |
-| System.Xml.Serialization;XmlSerializationWriter;WritePotentiallyReferencingElement;(System.String,System.String,System.Object,System.Type,System.Boolean);Argument[this];Argument[2];taint;df-generated |
+| System.Xml.Serialization;XmlSerializationWriter;WritePotentiallyReferencingElement;(System.String,System.String,System.Object,System.Type,System.Boolean,System.Boolean);Argument[0];Argument[this];taint;df-generated |
 | System.Xml.Serialization;XmlSerializationWriter;WritePotentiallyReferencingElement;(System.String,System.String,System.Object,System.Type,System.Boolean,System.Boolean);Argument[2];Argument[this];taint;df-generated |
-| System.Xml.Serialization;XmlSerializationWriter;WritePotentiallyReferencingElement;(System.String,System.String,System.Object,System.Type,System.Boolean,System.Boolean);Argument[this];Argument[2];taint;df-generated |
+| System.Xml.Serialization;XmlSerializationWriter;WriteReferencingElement;(System.String,System.String,System.Object);Argument[0];Argument[this];taint;df-generated |
 | System.Xml.Serialization;XmlSerializationWriter;WriteReferencingElement;(System.String,System.String,System.Object);Argument[2];Argument[this];taint;df-generated |
-| System.Xml.Serialization;XmlSerializationWriter;WriteReferencingElement;(System.String,System.String,System.Object);Argument[this];Argument[2];taint;df-generated |
+| System.Xml.Serialization;XmlSerializationWriter;WriteReferencingElement;(System.String,System.String,System.Object,System.Boolean);Argument[0];Argument[this];taint;df-generated |
 | System.Xml.Serialization;XmlSerializationWriter;WriteReferencingElement;(System.String,System.String,System.Object,System.Boolean);Argument[2];Argument[this];taint;df-generated |
-| System.Xml.Serialization;XmlSerializationWriter;WriteReferencingElement;(System.String,System.String,System.Object,System.Boolean);Argument[this];Argument[2];taint;df-generated |
-| System.Xml.Serialization;XmlSerializationWriter;WriteSerializable;(System.Xml.Serialization.IXmlSerializable,System.String,System.String,System.Boolean);Argument[0];Argument[this];taint;df-generated |
-| System.Xml.Serialization;XmlSerializationWriter;WriteSerializable;(System.Xml.Serialization.IXmlSerializable,System.String,System.String,System.Boolean,System.Boolean);Argument[0];Argument[this];taint;df-generated |
+| System.Xml.Serialization;XmlSerializationWriter;WriteSerializable;(System.Xml.Serialization.IXmlSerializable,System.String,System.String,System.Boolean);Argument[1];Argument[this];taint;df-generated |
+| System.Xml.Serialization;XmlSerializationWriter;WriteSerializable;(System.Xml.Serialization.IXmlSerializable,System.String,System.String,System.Boolean,System.Boolean);Argument[1];Argument[this];taint;df-generated |
+| System.Xml.Serialization;XmlSerializationWriter;WriteStartElement;(System.String);Argument[0];Argument[this];taint;df-generated |
+| System.Xml.Serialization;XmlSerializationWriter;WriteStartElement;(System.String,System.String);Argument[0];Argument[this];taint;df-generated |
+| System.Xml.Serialization;XmlSerializationWriter;WriteStartElement;(System.String,System.String,System.Boolean);Argument[0];Argument[this];taint;df-generated |
+| System.Xml.Serialization;XmlSerializationWriter;WriteStartElement;(System.String,System.String,System.Object);Argument[0];Argument[this];taint;df-generated |
+| System.Xml.Serialization;XmlSerializationWriter;WriteStartElement;(System.String,System.String,System.Object,System.Boolean);Argument[0];Argument[this];taint;df-generated |
+| System.Xml.Serialization;XmlSerializationWriter;WriteStartElement;(System.String,System.String,System.Object,System.Boolean,System.Xml.Serialization.XmlSerializerNamespaces);Argument[0];Argument[this];taint;df-generated |
 | System.Xml.Serialization;XmlSerializationWriter;WriteStartElement;(System.String,System.String,System.Object,System.Boolean,System.Xml.Serialization.XmlSerializerNamespaces);Argument[4];Argument[this];taint;df-generated |
+| System.Xml.Serialization;XmlSerializationWriter;WriteTypedPrimitive;(System.String,System.String,System.Object,System.Boolean);Argument[0];Argument[this];taint;df-generated |
 | System.Xml.Serialization;XmlSerializationWriter;WriteTypedPrimitive;(System.String,System.String,System.Object,System.Boolean);Argument[2];Argument[this];taint;df-generated |
 | System.Xml.Serialization;XmlSerializationWriter;WriteValue;(System.Byte[]);Argument[0].Element;Argument[this];taint;df-generated |
 | System.Xml.Serialization;XmlSerializationWriter;WriteValue;(System.String);Argument[0];Argument[this];taint;df-generated |
@@ -13506,24 +14650,23 @@
 | System.Xml.Serialization;XmlTypeAttribute;XmlTypeAttribute;(System.String);Argument[0];Argument[this];taint;df-generated |
 | System.Xml.Serialization;XmlTypeMapping;get_XsdTypeName;();Argument[this];ReturnValue;taint;df-generated |
 | System.Xml.Serialization;XmlTypeMapping;get_XsdTypeNamespace;();Argument[this];ReturnValue;taint;df-generated |
-| System.Xml.XPath;Extensions;CreateNavigator;(System.Xml.Linq.XNode);Argument[0];ReturnValue;taint;df-generated |
-| System.Xml.XPath;Extensions;CreateNavigator;(System.Xml.Linq.XNode,System.Xml.XmlNameTable);Argument[0];ReturnValue;taint;df-generated |
-| System.Xml.XPath;Extensions;CreateNavigator;(System.Xml.Linq.XNode,System.Xml.XmlNameTable);Argument[1];ReturnValue;taint;df-generated |
+| System.Xml.XPath;Extensions;CreateNavigator;(System.Xml.Linq.XNode);Argument[0];ReturnValue.SyntheticField[System.Xml.XPath.XNodeNavigator._source];value;dfc-generated |
+| System.Xml.XPath;Extensions;CreateNavigator;(System.Xml.Linq.XNode,System.Xml.XmlNameTable);Argument[0];ReturnValue.SyntheticField[System.Xml.XPath.XNodeNavigator._source];value;dfc-generated |
+| System.Xml.XPath;Extensions;CreateNavigator;(System.Xml.Linq.XNode,System.Xml.XmlNameTable);Argument[1];ReturnValue.SyntheticField[System.Xml.XPath.XNodeNavigator._nameTable];value;dfc-generated |
 | System.Xml.XPath;IXPathNavigable;CreateNavigator;();Argument[this];ReturnValue;taint;df-generated |
 | System.Xml.XPath;XDocumentExtensions;ToXPathNavigable;(System.Xml.Linq.XNode);Argument[0];ReturnValue;taint;df-generated |
 | System.Xml.XPath;XPathDocument;XPathDocument;(System.Xml.XmlReader,System.Xml.XmlSpace);Argument[0];Argument[this];taint;df-generated |
-| System.Xml.XPath;XPathException;XPathException;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);Argument[0];Argument[this];taint;df-generated |
-| System.Xml.XPath;XPathException;get_Message;();Argument[this];ReturnValue;taint;df-generated |
-| System.Xml.XPath;XPathExpression;Clone;();Argument[this];ReturnValue;taint;df-generated |
-| System.Xml.XPath;XPathExpression;Clone;();Argument[this];ReturnValue;value;df-generated |
+| System.Xml.XPath;XPathException;get_Message;();Argument[this].Property[System.Exception.Message];ReturnValue;value;dfc-generated |
+| System.Xml.XPath;XPathException;get_Message;();Argument[this].SyntheticField[System.Exception._message];ReturnValue;value;dfc-generated |
+| System.Xml.XPath;XPathExpression;Clone;();Argument[this];ReturnValue;value;dfc-generated |
 | System.Xml.XPath;XPathExpression;Compile;(System.String);Argument[0];ReturnValue;taint;df-generated |
-| System.Xml.XPath;XPathExpression;Compile;(System.String,System.Xml.IXmlNamespaceResolver);Argument[0];ReturnValue;taint;df-generated |
-| System.Xml.XPath;XPathExpression;Compile;(System.String,System.Xml.IXmlNamespaceResolver);Argument[1];ReturnValue;taint;df-generated |
+| System.Xml.XPath;XPathExpression;Compile;(System.String,System.Xml.IXmlNamespaceResolver);Argument[0];ReturnValue.SyntheticField[MS.Internal.Xml.XPath.CompiledXpathExpr._expr];value;dfc-generated |
 | System.Xml.XPath;XPathExpression;SetContext;(System.Xml.IXmlNamespaceResolver);Argument[0];Argument[this];taint;df-generated |
 | System.Xml.XPath;XPathExpression;SetContext;(System.Xml.XmlNamespaceManager);Argument[0].Element;Argument[this];taint;df-generated |
 | System.Xml.XPath;XPathExpression;get_Expression;();Argument[this];ReturnValue;taint;df-generated |
 | System.Xml.XPath;XPathItem;ValueAs;(System.Type);Argument[this];ReturnValue;taint;df-generated |
 | System.Xml.XPath;XPathItem;ValueAs;(System.Type,System.Xml.IXmlNamespaceResolver);Argument[1];ReturnValue;taint;df-generated |
+| System.Xml.XPath;XPathItem;ValueAs;(System.Type,System.Xml.IXmlNamespaceResolver);Argument[this];Argument[1];taint;df-generated |
 | System.Xml.XPath;XPathItem;ValueAs;(System.Type,System.Xml.IXmlNamespaceResolver);Argument[this];ReturnValue;taint;df-generated |
 | System.Xml.XPath;XPathItem;ValueAs;(System.Type,System.Xml.IXmlNamespaceResolver);Argument[this];ReturnValue;value;df-generated |
 | System.Xml.XPath;XPathItem;get_TypedValue;();Argument[this];ReturnValue;taint;df-generated |
@@ -13531,8 +14674,7 @@
 | System.Xml.XPath;XPathItem;get_XmlType;();Argument[this];ReturnValue;taint;df-generated |
 | System.Xml.XPath;XPathNavigator;AppendChild;();Argument[this];ReturnValue;taint;df-generated |
 | System.Xml.XPath;XPathNavigator;CheckValidity;(System.Xml.Schema.XmlSchemaSet,System.Xml.Schema.ValidationEventHandler);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
-| System.Xml.XPath;XPathNavigator;Clone;();Argument[this];ReturnValue;taint;df-generated |
-| System.Xml.XPath;XPathNavigator;Clone;();Argument[this];ReturnValue;value;df-generated |
+| System.Xml.XPath;XPathNavigator;Clone;();Argument[this];ReturnValue;value;dfc-generated |
 | System.Xml.XPath;XPathNavigator;Compile;(System.String);Argument[0];ReturnValue;taint;df-generated |
 | System.Xml.XPath;XPathNavigator;CreateAttributes;();Argument[this];ReturnValue;taint;df-generated |
 | System.Xml.XPath;XPathNavigator;Evaluate;(System.Xml.XPath.XPathExpression);Argument[0];ReturnValue;taint;df-generated |
@@ -13542,6 +14684,8 @@
 | System.Xml.XPath;XPathNavigator;GetNamespace;(System.String);Argument[this];ReturnValue;taint;df-generated |
 | System.Xml.XPath;XPathNavigator;InsertAfter;();Argument[this];ReturnValue;taint;df-generated |
 | System.Xml.XPath;XPathNavigator;InsertBefore;();Argument[this];ReturnValue;taint;df-generated |
+| System.Xml.XPath;XPathNavigator;LookupPrefix;(System.String);Argument[this].Property[System.Xml.XPath.XPathNavigator.LocalName];ReturnValue;value;df-generated |
+| System.Xml.XPath;XPathNavigator;LookupPrefix;(System.String);Argument[this].Property[System.Xml.XPath.XPathNavigator.LocalName];ReturnValue;value;dfc-generated |
 | System.Xml.XPath;XPathNavigator;MoveTo;(System.Xml.XPath.XPathNavigator);Argument[0];Argument[this];taint;df-generated |
 | System.Xml.XPath;XPathNavigator;PrependChild;();Argument[this];ReturnValue;taint;df-generated |
 | System.Xml.XPath;XPathNavigator;ReadSubtree;();Argument[this];ReturnValue;taint;df-generated |
@@ -13563,15 +14707,13 @@
 | System.Xml.XPath;XPathNavigator;get_Prefix;();Argument[this];ReturnValue;taint;df-generated |
 | System.Xml.XPath;XPathNavigator;get_SchemaInfo;();Argument[this];ReturnValue;taint;df-generated |
 | System.Xml.XPath;XPathNavigator;get_UnderlyingObject;();Argument[this];ReturnValue;taint;df-generated |
-| System.Xml.XPath;XPathNavigator;get_XmlLang;();Argument[this];ReturnValue;taint;df-generated |
-| System.Xml.XPath;XPathNodeIterator;Clone;();Argument[this];ReturnValue;taint;df-generated |
-| System.Xml.XPath;XPathNodeIterator;Clone;();Argument[this];ReturnValue;value;df-generated |
+| System.Xml.XPath;XPathNavigator;get_XmlLang;();Argument[this].Property[System.Xml.XPath.XPathItem.Value];ReturnValue;value;dfc-generated |
+| System.Xml.XPath;XPathNodeIterator;Clone;();Argument[this];ReturnValue;value;dfc-generated |
 | System.Xml.XPath;XPathNodeIterator;get_Current;();Argument[this];ReturnValue;taint;df-generated |
 | System.Xml.Xsl;IXsltContextFunction;Invoke;(System.Xml.Xsl.XsltContext,System.Object[],System.Xml.XPath.XPathNavigator);Argument[0].Element;ReturnValue;taint;df-generated |
 | System.Xml.Xsl;IXsltContextFunction;Invoke;(System.Xml.Xsl.XsltContext,System.Object[],System.Xml.XPath.XPathNavigator);Argument[1].Element;ReturnValue;taint;df-generated |
 | System.Xml.Xsl;IXsltContextFunction;Invoke;(System.Xml.Xsl.XsltContext,System.Object[],System.Xml.XPath.XPathNavigator);Argument[2];ReturnValue;taint;df-generated |
 | System.Xml.Xsl;IXsltContextFunction;get_ArgTypes;();Argument[this];ReturnValue;taint;df-generated |
-| System.Xml.Xsl;XslCompiledTransform;Load;(System.Reflection.MethodInfo,System.Byte[],System.Type[]);Argument[0];Argument[this];taint;df-generated |
 | System.Xml.Xsl;XslTransform;Transform;(System.Xml.XPath.IXPathNavigable,System.Xml.Xsl.XsltArgumentList);Argument[1];ReturnValue;taint;df-generated |
 | System.Xml.Xsl;XslTransform;Transform;(System.Xml.XPath.IXPathNavigable,System.Xml.Xsl.XsltArgumentList);Argument[this];ReturnValue;taint;df-generated |
 | System.Xml.Xsl;XslTransform;Transform;(System.Xml.XPath.IXPathNavigable,System.Xml.Xsl.XsltArgumentList,System.Xml.XmlResolver);Argument[1];ReturnValue;taint;df-generated |
@@ -13592,8 +14734,8 @@
 | System.Xml.Xsl;XsltArgumentList;add_XsltMessageEncountered;(System.Xml.Xsl.XsltMessageEncounteredEventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Xml.Xsl;XsltArgumentList;remove_XsltMessageEncountered;(System.Xml.Xsl.XsltMessageEncounteredEventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Xml.Xsl;XsltContext;ResolveFunction;(System.String,System.String,System.Xml.XPath.XPathResultType[]);Argument[this];ReturnValue;taint;df-generated |
-| System.Xml.Xsl;XsltException;XsltException;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);Argument[0];Argument[this];taint;df-generated |
-| System.Xml.Xsl;XsltException;get_Message;();Argument[this];ReturnValue;taint;df-generated |
+| System.Xml.Xsl;XsltException;get_Message;();Argument[this].Property[System.Exception.Message];ReturnValue;value;dfc-generated |
+| System.Xml.Xsl;XsltException;get_Message;();Argument[this].SyntheticField[System.Exception._message];ReturnValue;value;dfc-generated |
 | System.Xml.Xsl;XsltException;get_SourceUri;();Argument[this];ReturnValue;taint;df-generated |
 | System.Xml.Xsl;XsltMessageEncounteredEventArgs;get_Message;();Argument[this];ReturnValue;taint;df-generated |
 | System.Xml.Xsl;XsltMessageEncounteredEventHandler;BeginInvoke;(System.Object,System.Xml.Xsl.XsltMessageEncounteredEventArgs,System.AsyncCallback,System.Object);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
@@ -13607,10 +14749,9 @@
 | System.Xml;IXmlBinaryWriterInitializer;SetOutput;(System.IO.Stream,System.Xml.IXmlDictionary,System.Xml.XmlBinaryWriterSession,System.Boolean);Argument[2];Argument[this];taint;df-generated |
 | System.Xml;IXmlDictionary;TryLookup;(System.Int32,System.Xml.XmlDictionaryString);Argument[this];ReturnValue;taint;df-generated |
 | System.Xml;IXmlDictionary;TryLookup;(System.String,System.Xml.XmlDictionaryString);Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;IXmlDictionary;TryLookup;(System.Xml.XmlDictionaryString,System.Xml.XmlDictionaryString);Argument[0];ReturnValue;taint;df-generated |
+| System.Xml;IXmlDictionary;TryLookup;(System.Xml.XmlDictionaryString,System.Xml.XmlDictionaryString);Argument[0];ReturnValue;value;dfc-generated |
 | System.Xml;IXmlNamespaceResolver;GetNamespacesInScope;(System.Xml.XmlNamespaceScope);Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;IXmlNamespaceResolver;LookupNamespace;(System.String);Argument[0];ReturnValue;taint;df-generated |
-| System.Xml;IXmlNamespaceResolver;LookupNamespace;(System.String);Argument[this];ReturnValue;taint;df-generated |
+| System.Xml;IXmlNamespaceResolver;LookupNamespace;(System.String);Argument[0];ReturnValue;value;dfc-generated |
 | System.Xml;IXmlNamespaceResolver;LookupPrefix;(System.String);Argument[this];ReturnValue;taint;df-generated |
 | System.Xml;IXmlTextReaderInitializer;SetInput;(System.Byte[],System.Int32,System.Int32,System.Text.Encoding,System.Xml.XmlDictionaryReaderQuotas,System.Xml.OnXmlDictionaryReaderClose);Argument[5];Argument[5].Parameter[delegate-self];value;hq-generated |
 | System.Xml;IXmlTextReaderInitializer;SetInput;(System.IO.Stream,System.Text.Encoding,System.Xml.XmlDictionaryReaderQuotas,System.Xml.OnXmlDictionaryReaderClose);Argument[3];Argument[3].Parameter[delegate-self];value;hq-generated |
@@ -13620,61 +14761,51 @@
 | System.Xml;UniqueId;UniqueId;(System.Char[],System.Int32,System.Int32);Argument[0].Element;Argument[this];taint;df-generated |
 | System.Xml;UniqueId;UniqueId;(System.String);Argument[0];Argument[this];taint;df-generated |
 | System.Xml;XmlAttribute;get_OwnerElement;();Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlAttributeCollection;Append;(System.Xml.XmlAttribute);Argument[0].Element;ReturnValue;taint;df-generated |
-| System.Xml;XmlAttributeCollection;Append;(System.Xml.XmlAttribute);Argument[this];Argument[0].Element;taint;df-generated |
-| System.Xml;XmlAttributeCollection;Append;(System.Xml.XmlAttribute);Argument[this];ReturnValue;taint;df-generated |
+| System.Xml;XmlAttributeCollection;Append;(System.Xml.XmlAttribute);Argument[0];ReturnValue;value;dfc-generated |
 | System.Xml;XmlAttributeCollection;CopyTo;(System.Xml.XmlAttribute[],System.Int32);Argument[this].Element;Argument[0].Element;value;manual |
-| System.Xml;XmlAttributeCollection;InsertAfter;(System.Xml.XmlAttribute,System.Xml.XmlAttribute);Argument[0].Element;ReturnValue;taint;df-generated |
-| System.Xml;XmlAttributeCollection;InsertAfter;(System.Xml.XmlAttribute,System.Xml.XmlAttribute);Argument[this];Argument[0].Element;taint;df-generated |
-| System.Xml;XmlAttributeCollection;InsertAfter;(System.Xml.XmlAttribute,System.Xml.XmlAttribute);Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlAttributeCollection;InsertBefore;(System.Xml.XmlAttribute,System.Xml.XmlAttribute);Argument[0].Element;ReturnValue;taint;df-generated |
-| System.Xml;XmlAttributeCollection;InsertBefore;(System.Xml.XmlAttribute,System.Xml.XmlAttribute);Argument[this];Argument[0].Element;taint;df-generated |
-| System.Xml;XmlAttributeCollection;InsertBefore;(System.Xml.XmlAttribute,System.Xml.XmlAttribute);Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlAttributeCollection;Prepend;(System.Xml.XmlAttribute);Argument[0].Element;ReturnValue;taint;df-generated |
-| System.Xml;XmlAttributeCollection;Prepend;(System.Xml.XmlAttribute);Argument[this];Argument[0].Element;taint;df-generated |
-| System.Xml;XmlAttributeCollection;Prepend;(System.Xml.XmlAttribute);Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlAttributeCollection;Remove;(System.Xml.XmlAttribute);Argument[0].Element;ReturnValue;taint;df-generated |
+| System.Xml;XmlAttributeCollection;InsertAfter;(System.Xml.XmlAttribute,System.Xml.XmlAttribute);Argument[0];ReturnValue;value;dfc-generated |
+| System.Xml;XmlAttributeCollection;InsertBefore;(System.Xml.XmlAttribute,System.Xml.XmlAttribute);Argument[0];ReturnValue;value;dfc-generated |
+| System.Xml;XmlAttributeCollection;Prepend;(System.Xml.XmlAttribute);Argument[0];ReturnValue;value;dfc-generated |
+| System.Xml;XmlAttributeCollection;Remove;(System.Xml.XmlAttribute);Argument[0];ReturnValue;value;dfc-generated |
 | System.Xml;XmlAttributeCollection;RemoveAt;(System.Int32);Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlAttributeCollection;SetNamedItem;(System.Xml.XmlNode);Argument[0].Element;ReturnValue;taint;df-generated |
-| System.Xml;XmlAttributeCollection;SetNamedItem;(System.Xml.XmlNode);Argument[this];Argument[0].Element;taint;df-generated |
-| System.Xml;XmlAttributeCollection;SetNamedItem;(System.Xml.XmlNode);Argument[this];ReturnValue;taint;df-generated |
+| System.Xml;XmlAttributeCollection;SetNamedItem;(System.Xml.XmlNode);Argument[0];ReturnValue;value;dfc-generated |
 | System.Xml;XmlAttributeCollection;get_ItemOf;(System.Int32);Argument[this];ReturnValue;taint;df-generated |
 | System.Xml;XmlAttributeCollection;get_ItemOf;(System.String);Argument[this];ReturnValue;taint;df-generated |
 | System.Xml;XmlAttributeCollection;get_ItemOf;(System.String,System.String);Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlBinaryReaderSession;Add;(System.Int32,System.String);Argument[1];ReturnValue;taint;df-generated |
-| System.Xml;XmlBinaryReaderSession;Add;(System.Int32,System.String);Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlCharacterData;AppendData;(System.String);Argument[0];Argument[this];taint;df-generated |
-| System.Xml;XmlCharacterData;Substring;(System.Int32,System.Int32);Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlCharacterData;XmlCharacterData;(System.String,System.Xml.XmlDocument);Argument[0];Argument[this];taint;df-generated |
-| System.Xml;XmlConvert;DecodeName;(System.String);Argument[0];ReturnValue;taint;df-generated |
-| System.Xml;XmlConvert;EncodeLocalName;(System.String);Argument[0];ReturnValue;taint;df-generated |
-| System.Xml;XmlConvert;EncodeName;(System.String);Argument[0];ReturnValue;taint;df-generated |
-| System.Xml;XmlConvert;EncodeNmToken;(System.String);Argument[0];ReturnValue;taint;df-generated |
-| System.Xml;XmlConvert;VerifyNCName;(System.String);Argument[0];ReturnValue;taint;df-generated |
-| System.Xml;XmlConvert;VerifyNMTOKEN;(System.String);Argument[0];ReturnValue;taint;df-generated |
-| System.Xml;XmlConvert;VerifyName;(System.String);Argument[0];ReturnValue;taint;df-generated |
-| System.Xml;XmlConvert;VerifyPublicId;(System.String);Argument[0];ReturnValue;taint;df-generated |
-| System.Xml;XmlConvert;VerifyTOKEN;(System.String);Argument[0];ReturnValue;taint;df-generated |
-| System.Xml;XmlConvert;VerifyWhitespace;(System.String);Argument[0];ReturnValue;taint;df-generated |
-| System.Xml;XmlConvert;VerifyXmlChars;(System.String);Argument[0];ReturnValue;taint;df-generated |
+| System.Xml;XmlBinaryReaderSession;Add;(System.Int32,System.String);Argument[1];ReturnValue.SyntheticField[System.Xml.XmlDictionaryString._value];value;dfc-generated |
+| System.Xml;XmlBinaryReaderSession;Add;(System.Int32,System.String);Argument[this];ReturnValue.SyntheticField[System.Xml.XmlDictionaryString._dictionary];value;dfc-generated |
+| System.Xml;XmlCharacterData;AppendData;(System.String);Argument[0];Argument[this].SyntheticField[System.Xml.XmlCharacterData._data];taint;dfc-generated |
+| System.Xml;XmlCharacterData;Substring;(System.Int32,System.Int32);Argument[this].SyntheticField[System.Xml.XmlCharacterData._data];ReturnValue;taint;dfc-generated |
+| System.Xml;XmlCharacterData;XmlCharacterData;(System.String,System.Xml.XmlDocument);Argument[0];Argument[this].SyntheticField[System.Xml.XmlCharacterData._data];value;dfc-generated |
+| System.Xml;XmlConvert;DecodeName;(System.String);Argument[0];ReturnValue;value;dfc-generated |
+| System.Xml;XmlConvert;EncodeLocalName;(System.String);Argument[0];ReturnValue;value;dfc-generated |
+| System.Xml;XmlConvert;EncodeName;(System.String);Argument[0];ReturnValue;value;dfc-generated |
+| System.Xml;XmlConvert;EncodeNmToken;(System.String);Argument[0];ReturnValue;value;dfc-generated |
+| System.Xml;XmlConvert;VerifyNCName;(System.String);Argument[0];ReturnValue;value;dfc-generated |
+| System.Xml;XmlConvert;VerifyNMTOKEN;(System.String);Argument[0];ReturnValue;value;dfc-generated |
+| System.Xml;XmlConvert;VerifyName;(System.String);Argument[0];ReturnValue;value;dfc-generated |
+| System.Xml;XmlConvert;VerifyPublicId;(System.String);Argument[0];ReturnValue;value;dfc-generated |
+| System.Xml;XmlConvert;VerifyTOKEN;(System.String);Argument[0];ReturnValue;value;dfc-generated |
+| System.Xml;XmlConvert;VerifyWhitespace;(System.String);Argument[0];ReturnValue;value;dfc-generated |
+| System.Xml;XmlConvert;VerifyXmlChars;(System.String);Argument[0];ReturnValue;value;dfc-generated |
 | System.Xml;XmlDataDocument;CreateElement;(System.String,System.String,System.String);Argument[0];ReturnValue;taint;df-generated |
 | System.Xml;XmlDataDocument;CreateElement;(System.String,System.String,System.String);Argument[1];ReturnValue;taint;df-generated |
 | System.Xml;XmlDataDocument;CreateElement;(System.String,System.String,System.String);Argument[2];ReturnValue;taint;df-generated |
 | System.Xml;XmlDataDocument;CreateElement;(System.String,System.String,System.String);Argument[this];ReturnValue;taint;df-generated |
 | System.Xml;XmlDataDocument;CreateEntityReference;(System.String);Argument[0];ReturnValue;taint;df-generated |
-| System.Xml;XmlDataDocument;CreateNavigator;(System.Xml.XmlNode);Argument[0].Element;ReturnValue;taint;df-generated |
-| System.Xml;XmlDataDocument;CreateNavigator;(System.Xml.XmlNode);Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlDataDocument;GetElementById;(System.String);Argument[this];ReturnValue;taint;df-generated |
+| System.Xml;XmlDataDocument;CreateNavigator;(System.Xml.XmlNode);Argument[0];ReturnValue.SyntheticField[System.Xml.DocumentXPathNavigator._source];value;dfc-generated |
+| System.Xml;XmlDataDocument;CreateNavigator;(System.Xml.XmlNode);Argument[this];ReturnValue.SyntheticField[System.Xml.DataDocumentXPathNavigator._doc];value;dfc-generated |
+| System.Xml;XmlDataDocument;CreateNavigator;(System.Xml.XmlNode);Argument[this];ReturnValue.SyntheticField[System.Xml.DocumentXPathNavigator._document];value;dfc-generated |
 | System.Xml;XmlDataDocument;GetElementFromRow;(System.Data.DataRow);Argument[0];ReturnValue;taint;df-generated |
 | System.Xml;XmlDataDocument;GetElementsByTagName;(System.String);Argument[0];ReturnValue;taint;df-generated |
 | System.Xml;XmlDataDocument;GetRowFromElement;(System.Xml.XmlElement);Argument[0].Element;ReturnValue;taint;df-generated |
-| System.Xml;XmlDataDocument;XmlDataDocument;(System.Data.DataSet);Argument[0];Argument[this];taint;df-generated |
-| System.Xml;XmlDataDocument;get_DataSet;();Argument[this];ReturnValue;taint;df-generated |
+| System.Xml;XmlDataDocument;XmlDataDocument;(System.Data.DataSet);Argument[0];Argument[this].SyntheticField[System.Xml.XmlDataDocument._dataSet];value;dfc-generated |
+| System.Xml;XmlDataDocument;get_DataSet;();Argument[this].SyntheticField[System.Xml.XmlDataDocument._dataSet];ReturnValue;value;dfc-generated |
 | System.Xml;XmlDeclaration;XmlDeclaration;(System.String,System.String,System.String,System.Xml.XmlDocument);Argument[0];Argument[this];taint;df-generated |
 | System.Xml;XmlDeclaration;XmlDeclaration;(System.String,System.String,System.String,System.Xml.XmlDocument);Argument[1];Argument[this];taint;df-generated |
 | System.Xml;XmlDeclaration;XmlDeclaration;(System.String,System.String,System.String,System.Xml.XmlDocument);Argument[2];Argument[this];taint;df-generated |
-| System.Xml;XmlDictionary;Add;(System.String);Argument[0];ReturnValue;taint;df-generated |
-| System.Xml;XmlDictionary;Add;(System.String);Argument[this];ReturnValue;taint;df-generated |
+| System.Xml;XmlDictionary;Add;(System.String);Argument[0];ReturnValue.SyntheticField[System.Xml.XmlDictionaryString._value];value;dfc-generated |
+| System.Xml;XmlDictionary;Add;(System.String);Argument[this];ReturnValue.SyntheticField[System.Xml.XmlDictionaryString._dictionary];value;dfc-generated |
 | System.Xml;XmlDictionaryReader;CreateBinaryReader;(System.Byte[],System.Int32,System.Int32,System.Xml.IXmlDictionary,System.Xml.XmlDictionaryReaderQuotas);Argument[0].Element;ReturnValue;taint;df-generated |
 | System.Xml;XmlDictionaryReader;CreateBinaryReader;(System.Byte[],System.Int32,System.Int32,System.Xml.IXmlDictionary,System.Xml.XmlDictionaryReaderQuotas);Argument[3];ReturnValue;taint;df-generated |
 | System.Xml;XmlDictionaryReader;CreateBinaryReader;(System.Byte[],System.Int32,System.Int32,System.Xml.IXmlDictionary,System.Xml.XmlDictionaryReaderQuotas,System.Xml.XmlBinaryReaderSession);Argument[0].Element;ReturnValue;taint;df-generated |
@@ -13690,30 +14821,26 @@
 | System.Xml;XmlDictionaryReader;CreateBinaryReader;(System.IO.Stream,System.Xml.IXmlDictionary,System.Xml.XmlDictionaryReaderQuotas,System.Xml.XmlBinaryReaderSession);Argument[3];ReturnValue;taint;df-generated |
 | System.Xml;XmlDictionaryReader;CreateBinaryReader;(System.IO.Stream,System.Xml.IXmlDictionary,System.Xml.XmlDictionaryReaderQuotas,System.Xml.XmlBinaryReaderSession,System.Xml.OnXmlDictionaryReaderClose);Argument[4];Argument[4].Parameter[delegate-self];value;hq-generated |
 | System.Xml;XmlDictionaryReader;CreateBinaryReader;(System.IO.Stream,System.Xml.XmlDictionaryReaderQuotas);Argument[0];ReturnValue;taint;df-generated |
-| System.Xml;XmlDictionaryReader;CreateDictionaryReader;(System.Xml.XmlReader);Argument[0];ReturnValue;taint;df-generated |
+| System.Xml;XmlDictionaryReader;CreateDictionaryReader;(System.Xml.XmlReader);Argument[0];ReturnValue;value;dfc-generated |
 | System.Xml;XmlDictionaryReader;CreateMtomReader;(System.Byte[],System.Int32,System.Int32,System.Text.Encoding[],System.String,System.Xml.XmlDictionaryReaderQuotas,System.Int32,System.Xml.OnXmlDictionaryReaderClose);Argument[7];Argument[7].Parameter[delegate-self];value;hq-generated |
 | System.Xml;XmlDictionaryReader;CreateMtomReader;(System.IO.Stream,System.Text.Encoding[],System.String,System.Xml.XmlDictionaryReaderQuotas,System.Int32,System.Xml.OnXmlDictionaryReaderClose);Argument[5];Argument[5].Parameter[delegate-self];value;hq-generated |
 | System.Xml;XmlDictionaryReader;CreateTextReader;(System.Byte[],System.Int32,System.Int32,System.Text.Encoding,System.Xml.XmlDictionaryReaderQuotas,System.Xml.OnXmlDictionaryReaderClose);Argument[5];Argument[5].Parameter[delegate-self];value;hq-generated |
-| System.Xml;XmlDictionaryReader;CreateTextReader;(System.Byte[],System.Int32,System.Int32,System.Xml.XmlDictionaryReaderQuotas);Argument[0].Element;ReturnValue;taint;df-generated |
-| System.Xml;XmlDictionaryReader;CreateTextReader;(System.Byte[],System.Xml.XmlDictionaryReaderQuotas);Argument[0].Element;ReturnValue;taint;df-generated |
 | System.Xml;XmlDictionaryReader;CreateTextReader;(System.IO.Stream,System.Text.Encoding,System.Xml.XmlDictionaryReaderQuotas,System.Xml.OnXmlDictionaryReaderClose);Argument[3];Argument[3].Parameter[delegate-self];value;hq-generated |
 | System.Xml;XmlDictionaryReader;GetAttribute;(System.Xml.XmlDictionaryString,System.Xml.XmlDictionaryString);Argument[this];ReturnValue;taint;df-generated |
 | System.Xml;XmlDictionaryReader;GetNonAtomizedNames;(System.String,System.String);Argument[this];ReturnValue;taint;df-generated |
 | System.Xml;XmlDictionaryReader;ReadContentAsQualifiedName;(System.String,System.String);Argument[this];ReturnValue;taint;df-generated |
 | System.Xml;XmlDictionaryReader;ReadContentAsString;(System.Int32);Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlDictionaryReader;ReadContentAsString;(System.String[],System.Int32);Argument[0].Element;ReturnValue;taint;df-generated |
-| System.Xml;XmlDictionaryReader;ReadContentAsString;(System.String[],System.Int32);Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlDictionaryReader;ReadContentAsString;(System.Xml.XmlDictionaryString[],System.Int32);Argument[0].Element;ReturnValue;taint;df-generated |
-| System.Xml;XmlDictionaryReader;ReadContentAsString;(System.Xml.XmlDictionaryString[],System.Int32);Argument[this];ReturnValue;taint;df-generated |
+| System.Xml;XmlDictionaryReader;ReadContentAsString;(System.String[],System.Int32);Argument[0].Element;ReturnValue;value;dfc-generated |
+| System.Xml;XmlDictionaryReader;ReadContentAsString;(System.Xml.XmlDictionaryString[],System.Int32);Argument[0].Element.Property[System.Xml.XmlDictionaryString.Value];ReturnValue;value;dfc-generated |
 | System.Xml;XmlDictionaryReader;ReadContentAsUniqueId;();Argument[this];ReturnValue;taint;df-generated |
 | System.Xml;XmlDictionaryReader;ReadElementContentAsUniqueId;();Argument[this];ReturnValue;taint;df-generated |
 | System.Xml;XmlDictionaryReader;ReadString;(System.Int32);Argument[this];ReturnValue;taint;df-generated |
 | System.Xml;XmlDictionaryReader;get_Quotas;();Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlDictionaryString;ToString;();Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlDictionaryString;XmlDictionaryString;(System.Xml.IXmlDictionary,System.String,System.Int32);Argument[0];Argument[this];taint;df-generated |
-| System.Xml;XmlDictionaryString;XmlDictionaryString;(System.Xml.IXmlDictionary,System.String,System.Int32);Argument[1];Argument[this];taint;df-generated |
-| System.Xml;XmlDictionaryString;get_Dictionary;();Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlDictionaryString;get_Value;();Argument[this];ReturnValue;taint;df-generated |
+| System.Xml;XmlDictionaryString;ToString;();Argument[this].SyntheticField[System.Xml.XmlDictionaryString._value];ReturnValue;value;dfc-generated |
+| System.Xml;XmlDictionaryString;XmlDictionaryString;(System.Xml.IXmlDictionary,System.String,System.Int32);Argument[0];Argument[this].SyntheticField[System.Xml.XmlDictionaryString._dictionary];value;dfc-generated |
+| System.Xml;XmlDictionaryString;XmlDictionaryString;(System.Xml.IXmlDictionary,System.String,System.Int32);Argument[1];Argument[this].SyntheticField[System.Xml.XmlDictionaryString._value];value;dfc-generated |
+| System.Xml;XmlDictionaryString;get_Dictionary;();Argument[this].SyntheticField[System.Xml.XmlDictionaryString._dictionary];ReturnValue;value;dfc-generated |
+| System.Xml;XmlDictionaryString;get_Value;();Argument[this].SyntheticField[System.Xml.XmlDictionaryString._value];ReturnValue;value;dfc-generated |
 | System.Xml;XmlDictionaryWriter;CreateBinaryWriter;(System.IO.Stream);Argument[0];ReturnValue;taint;df-generated |
 | System.Xml;XmlDictionaryWriter;CreateBinaryWriter;(System.IO.Stream,System.Xml.IXmlDictionary);Argument[0];ReturnValue;taint;df-generated |
 | System.Xml;XmlDictionaryWriter;CreateBinaryWriter;(System.IO.Stream,System.Xml.IXmlDictionary);Argument[1];ReturnValue;taint;df-generated |
@@ -13723,29 +14850,69 @@
 | System.Xml;XmlDictionaryWriter;CreateBinaryWriter;(System.IO.Stream,System.Xml.IXmlDictionary,System.Xml.XmlBinaryWriterSession,System.Boolean);Argument[0];ReturnValue;taint;df-generated |
 | System.Xml;XmlDictionaryWriter;CreateBinaryWriter;(System.IO.Stream,System.Xml.IXmlDictionary,System.Xml.XmlBinaryWriterSession,System.Boolean);Argument[1];ReturnValue;taint;df-generated |
 | System.Xml;XmlDictionaryWriter;CreateBinaryWriter;(System.IO.Stream,System.Xml.IXmlDictionary,System.Xml.XmlBinaryWriterSession,System.Boolean);Argument[2];ReturnValue;taint;df-generated |
-| System.Xml;XmlDictionaryWriter;CreateDictionaryWriter;(System.Xml.XmlWriter);Argument[0];ReturnValue;taint;df-generated |
+| System.Xml;XmlDictionaryWriter;CreateDictionaryWriter;(System.Xml.XmlWriter);Argument[0];ReturnValue;value;dfc-generated |
+| System.Xml;XmlDictionaryWriter;WriteArray;(System.String,System.String,System.String,System.Boolean[],System.Int32,System.Int32);Argument[0];Argument[this];taint;df-generated |
+| System.Xml;XmlDictionaryWriter;WriteArray;(System.String,System.String,System.String,System.Boolean[],System.Int32,System.Int32);Argument[1];Argument[this];taint;df-generated |
+| System.Xml;XmlDictionaryWriter;WriteArray;(System.String,System.String,System.String,System.DateTime[],System.Int32,System.Int32);Argument[0];Argument[this];taint;df-generated |
+| System.Xml;XmlDictionaryWriter;WriteArray;(System.String,System.String,System.String,System.DateTime[],System.Int32,System.Int32);Argument[1];Argument[this];taint;df-generated |
+| System.Xml;XmlDictionaryWriter;WriteArray;(System.String,System.String,System.String,System.Decimal[],System.Int32,System.Int32);Argument[0];Argument[this];taint;df-generated |
+| System.Xml;XmlDictionaryWriter;WriteArray;(System.String,System.String,System.String,System.Decimal[],System.Int32,System.Int32);Argument[1];Argument[this];taint;df-generated |
+| System.Xml;XmlDictionaryWriter;WriteArray;(System.String,System.String,System.String,System.Double[],System.Int32,System.Int32);Argument[0];Argument[this];taint;df-generated |
+| System.Xml;XmlDictionaryWriter;WriteArray;(System.String,System.String,System.String,System.Double[],System.Int32,System.Int32);Argument[1];Argument[this];taint;df-generated |
+| System.Xml;XmlDictionaryWriter;WriteArray;(System.String,System.String,System.String,System.Guid[],System.Int32,System.Int32);Argument[0];Argument[this];taint;df-generated |
+| System.Xml;XmlDictionaryWriter;WriteArray;(System.String,System.String,System.String,System.Guid[],System.Int32,System.Int32);Argument[1];Argument[this];taint;df-generated |
+| System.Xml;XmlDictionaryWriter;WriteArray;(System.String,System.String,System.String,System.Int16[],System.Int32,System.Int32);Argument[0];Argument[this];taint;df-generated |
+| System.Xml;XmlDictionaryWriter;WriteArray;(System.String,System.String,System.String,System.Int16[],System.Int32,System.Int32);Argument[1];Argument[this];taint;df-generated |
+| System.Xml;XmlDictionaryWriter;WriteArray;(System.String,System.String,System.String,System.Int32[],System.Int32,System.Int32);Argument[0];Argument[this];taint;df-generated |
+| System.Xml;XmlDictionaryWriter;WriteArray;(System.String,System.String,System.String,System.Int32[],System.Int32,System.Int32);Argument[1];Argument[this];taint;df-generated |
+| System.Xml;XmlDictionaryWriter;WriteArray;(System.String,System.String,System.String,System.Int64[],System.Int32,System.Int32);Argument[0];Argument[this];taint;df-generated |
+| System.Xml;XmlDictionaryWriter;WriteArray;(System.String,System.String,System.String,System.Int64[],System.Int32,System.Int32);Argument[1];Argument[this];taint;df-generated |
+| System.Xml;XmlDictionaryWriter;WriteArray;(System.String,System.String,System.String,System.Single[],System.Int32,System.Int32);Argument[0];Argument[this];taint;df-generated |
+| System.Xml;XmlDictionaryWriter;WriteArray;(System.String,System.String,System.String,System.Single[],System.Int32,System.Int32);Argument[1];Argument[this];taint;df-generated |
+| System.Xml;XmlDictionaryWriter;WriteArray;(System.String,System.String,System.String,System.TimeSpan[],System.Int32,System.Int32);Argument[0];Argument[this];taint;df-generated |
+| System.Xml;XmlDictionaryWriter;WriteArray;(System.String,System.String,System.String,System.TimeSpan[],System.Int32,System.Int32);Argument[1];Argument[this];taint;df-generated |
+| System.Xml;XmlDictionaryWriter;WriteArray;(System.String,System.Xml.XmlDictionaryString,System.Xml.XmlDictionaryString,System.Boolean[],System.Int32,System.Int32);Argument[0];Argument[this];taint;df-generated |
+| System.Xml;XmlDictionaryWriter;WriteArray;(System.String,System.Xml.XmlDictionaryString,System.Xml.XmlDictionaryString,System.Boolean[],System.Int32,System.Int32);Argument[1];Argument[this];taint;df-generated |
+| System.Xml;XmlDictionaryWriter;WriteArray;(System.String,System.Xml.XmlDictionaryString,System.Xml.XmlDictionaryString,System.DateTime[],System.Int32,System.Int32);Argument[0];Argument[this];taint;df-generated |
+| System.Xml;XmlDictionaryWriter;WriteArray;(System.String,System.Xml.XmlDictionaryString,System.Xml.XmlDictionaryString,System.DateTime[],System.Int32,System.Int32);Argument[1];Argument[this];taint;df-generated |
+| System.Xml;XmlDictionaryWriter;WriteArray;(System.String,System.Xml.XmlDictionaryString,System.Xml.XmlDictionaryString,System.Decimal[],System.Int32,System.Int32);Argument[0];Argument[this];taint;df-generated |
+| System.Xml;XmlDictionaryWriter;WriteArray;(System.String,System.Xml.XmlDictionaryString,System.Xml.XmlDictionaryString,System.Decimal[],System.Int32,System.Int32);Argument[1];Argument[this];taint;df-generated |
+| System.Xml;XmlDictionaryWriter;WriteArray;(System.String,System.Xml.XmlDictionaryString,System.Xml.XmlDictionaryString,System.Double[],System.Int32,System.Int32);Argument[0];Argument[this];taint;df-generated |
+| System.Xml;XmlDictionaryWriter;WriteArray;(System.String,System.Xml.XmlDictionaryString,System.Xml.XmlDictionaryString,System.Double[],System.Int32,System.Int32);Argument[1];Argument[this];taint;df-generated |
+| System.Xml;XmlDictionaryWriter;WriteArray;(System.String,System.Xml.XmlDictionaryString,System.Xml.XmlDictionaryString,System.Guid[],System.Int32,System.Int32);Argument[0];Argument[this];taint;df-generated |
+| System.Xml;XmlDictionaryWriter;WriteArray;(System.String,System.Xml.XmlDictionaryString,System.Xml.XmlDictionaryString,System.Guid[],System.Int32,System.Int32);Argument[1];Argument[this];taint;df-generated |
+| System.Xml;XmlDictionaryWriter;WriteArray;(System.String,System.Xml.XmlDictionaryString,System.Xml.XmlDictionaryString,System.Int16[],System.Int32,System.Int32);Argument[0];Argument[this];taint;df-generated |
+| System.Xml;XmlDictionaryWriter;WriteArray;(System.String,System.Xml.XmlDictionaryString,System.Xml.XmlDictionaryString,System.Int16[],System.Int32,System.Int32);Argument[1];Argument[this];taint;df-generated |
+| System.Xml;XmlDictionaryWriter;WriteArray;(System.String,System.Xml.XmlDictionaryString,System.Xml.XmlDictionaryString,System.Int32[],System.Int32,System.Int32);Argument[0];Argument[this];taint;df-generated |
+| System.Xml;XmlDictionaryWriter;WriteArray;(System.String,System.Xml.XmlDictionaryString,System.Xml.XmlDictionaryString,System.Int32[],System.Int32,System.Int32);Argument[1];Argument[this];taint;df-generated |
+| System.Xml;XmlDictionaryWriter;WriteArray;(System.String,System.Xml.XmlDictionaryString,System.Xml.XmlDictionaryString,System.Int64[],System.Int32,System.Int32);Argument[0];Argument[this];taint;df-generated |
+| System.Xml;XmlDictionaryWriter;WriteArray;(System.String,System.Xml.XmlDictionaryString,System.Xml.XmlDictionaryString,System.Int64[],System.Int32,System.Int32);Argument[1];Argument[this];taint;df-generated |
+| System.Xml;XmlDictionaryWriter;WriteArray;(System.String,System.Xml.XmlDictionaryString,System.Xml.XmlDictionaryString,System.Single[],System.Int32,System.Int32);Argument[0];Argument[this];taint;df-generated |
+| System.Xml;XmlDictionaryWriter;WriteArray;(System.String,System.Xml.XmlDictionaryString,System.Xml.XmlDictionaryString,System.Single[],System.Int32,System.Int32);Argument[1];Argument[this];taint;df-generated |
+| System.Xml;XmlDictionaryWriter;WriteArray;(System.String,System.Xml.XmlDictionaryString,System.Xml.XmlDictionaryString,System.TimeSpan[],System.Int32,System.Int32);Argument[0];Argument[this];taint;df-generated |
+| System.Xml;XmlDictionaryWriter;WriteArray;(System.String,System.Xml.XmlDictionaryString,System.Xml.XmlDictionaryString,System.TimeSpan[],System.Int32,System.Int32);Argument[1];Argument[this];taint;df-generated |
+| System.Xml;XmlDictionaryWriter;WriteAttributeString;(System.String,System.Xml.XmlDictionaryString,System.Xml.XmlDictionaryString,System.String);Argument[0];Argument[this];taint;df-generated |
 | System.Xml;XmlDictionaryWriter;WriteAttributeString;(System.String,System.Xml.XmlDictionaryString,System.Xml.XmlDictionaryString,System.String);Argument[1];Argument[this];taint;df-generated |
 | System.Xml;XmlDictionaryWriter;WriteAttributeString;(System.String,System.Xml.XmlDictionaryString,System.Xml.XmlDictionaryString,System.String);Argument[3];Argument[this];taint;df-generated |
 | System.Xml;XmlDictionaryWriter;WriteAttributeString;(System.Xml.XmlDictionaryString,System.Xml.XmlDictionaryString,System.String);Argument[0];Argument[this];taint;df-generated |
 | System.Xml;XmlDictionaryWriter;WriteAttributeString;(System.Xml.XmlDictionaryString,System.Xml.XmlDictionaryString,System.String);Argument[2];Argument[this];taint;df-generated |
+| System.Xml;XmlDictionaryWriter;WriteElementString;(System.String,System.Xml.XmlDictionaryString,System.Xml.XmlDictionaryString,System.String);Argument[0];Argument[this];taint;df-generated |
+| System.Xml;XmlDictionaryWriter;WriteElementString;(System.String,System.Xml.XmlDictionaryString,System.Xml.XmlDictionaryString,System.String);Argument[1];Argument[this];taint;df-generated |
 | System.Xml;XmlDictionaryWriter;WriteElementString;(System.String,System.Xml.XmlDictionaryString,System.Xml.XmlDictionaryString,System.String);Argument[3];Argument[this];taint;df-generated |
+| System.Xml;XmlDictionaryWriter;WriteElementString;(System.Xml.XmlDictionaryString,System.Xml.XmlDictionaryString,System.String);Argument[0];Argument[this];taint;df-generated |
 | System.Xml;XmlDictionaryWriter;WriteElementString;(System.Xml.XmlDictionaryString,System.Xml.XmlDictionaryString,System.String);Argument[2];Argument[this];taint;df-generated |
 | System.Xml;XmlDictionaryWriter;WriteNode;(System.Xml.XmlDictionaryReader,System.Boolean);Argument[0];Argument[this];taint;df-generated |
 | System.Xml;XmlDictionaryWriter;WriteQualifiedName;(System.Xml.XmlDictionaryString,System.Xml.XmlDictionaryString);Argument[0];Argument[this];taint;df-generated |
 | System.Xml;XmlDictionaryWriter;WriteQualifiedName;(System.Xml.XmlDictionaryString,System.Xml.XmlDictionaryString);Argument[1];Argument[this];taint;df-generated |
+| System.Xml;XmlDictionaryWriter;WriteStartAttribute;(System.String,System.Xml.XmlDictionaryString,System.Xml.XmlDictionaryString);Argument[0];Argument[this];taint;df-generated |
 | System.Xml;XmlDictionaryWriter;WriteStartAttribute;(System.String,System.Xml.XmlDictionaryString,System.Xml.XmlDictionaryString);Argument[1];Argument[this];taint;df-generated |
 | System.Xml;XmlDictionaryWriter;WriteStartAttribute;(System.Xml.XmlDictionaryString,System.Xml.XmlDictionaryString);Argument[0];Argument[this];taint;df-generated |
+| System.Xml;XmlDictionaryWriter;WriteStartElement;(System.String,System.Xml.XmlDictionaryString,System.Xml.XmlDictionaryString);Argument[0];Argument[this];taint;df-generated |
+| System.Xml;XmlDictionaryWriter;WriteStartElement;(System.String,System.Xml.XmlDictionaryString,System.Xml.XmlDictionaryString);Argument[1];Argument[this];taint;df-generated |
+| System.Xml;XmlDictionaryWriter;WriteStartElement;(System.Xml.XmlDictionaryString,System.Xml.XmlDictionaryString);Argument[0];Argument[this];taint;df-generated |
 | System.Xml;XmlDictionaryWriter;WriteString;(System.Xml.XmlDictionaryString);Argument[0];Argument[this];taint;df-generated |
 | System.Xml;XmlDictionaryWriter;WriteTextNode;(System.Xml.XmlDictionaryReader,System.Boolean);Argument[0];Argument[this];taint;df-generated |
 | System.Xml;XmlDictionaryWriter;WriteValue;(System.Xml.XmlDictionaryString);Argument[0];Argument[this];taint;df-generated |
-| System.Xml;XmlDictionaryWriter;WriteXmlAttribute;(System.String,System.String);Argument[0];Argument[this];taint;df-generated |
-| System.Xml;XmlDictionaryWriter;WriteXmlAttribute;(System.String,System.String);Argument[1];Argument[this];taint;df-generated |
-| System.Xml;XmlDictionaryWriter;WriteXmlAttribute;(System.Xml.XmlDictionaryString,System.Xml.XmlDictionaryString);Argument[0];Argument[this];taint;df-generated |
-| System.Xml;XmlDictionaryWriter;WriteXmlAttribute;(System.Xml.XmlDictionaryString,System.Xml.XmlDictionaryString);Argument[1];Argument[this];taint;df-generated |
-| System.Xml;XmlDictionaryWriter;WriteXmlnsAttribute;(System.String,System.String);Argument[0];Argument[this];taint;df-generated |
-| System.Xml;XmlDictionaryWriter;WriteXmlnsAttribute;(System.String,System.String);Argument[1];Argument[this];taint;df-generated |
-| System.Xml;XmlDictionaryWriter;WriteXmlnsAttribute;(System.String,System.Xml.XmlDictionaryString);Argument[0];Argument[this];taint;df-generated |
-| System.Xml;XmlDictionaryWriter;WriteXmlnsAttribute;(System.String,System.Xml.XmlDictionaryString);Argument[1];Argument[this];taint;df-generated |
 | System.Xml;XmlDocument;CreateAttribute;(System.String);Argument[0];ReturnValue;taint;df-generated |
 | System.Xml;XmlDocument;CreateAttribute;(System.String);Argument[this];ReturnValue;taint;df-generated |
 | System.Xml;XmlDocument;CreateAttribute;(System.String,System.String);Argument[0];ReturnValue;taint;df-generated |
@@ -13757,15 +14924,10 @@
 | System.Xml;XmlDocument;CreateAttribute;(System.String,System.String,System.String);Argument[this];ReturnValue;taint;df-generated |
 | System.Xml;XmlDocument;CreateCDataSection;(System.String);Argument[this];ReturnValue;taint;df-generated |
 | System.Xml;XmlDocument;CreateComment;(System.String);Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlDocument;CreateDefaultAttribute;(System.String,System.String,System.String);Argument[0];ReturnValue;taint;df-generated |
-| System.Xml;XmlDocument;CreateDefaultAttribute;(System.String,System.String,System.String);Argument[1];ReturnValue;taint;df-generated |
-| System.Xml;XmlDocument;CreateDefaultAttribute;(System.String,System.String,System.String);Argument[2];ReturnValue;taint;df-generated |
-| System.Xml;XmlDocument;CreateDefaultAttribute;(System.String,System.String,System.String);Argument[this];ReturnValue;taint;df-generated |
 | System.Xml;XmlDocument;CreateDocumentFragment;();Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlDocument;CreateDocumentType;(System.String,System.String,System.String,System.String);Argument[0];ReturnValue;taint;df-generated |
-| System.Xml;XmlDocument;CreateDocumentType;(System.String,System.String,System.String,System.String);Argument[1];ReturnValue;taint;df-generated |
-| System.Xml;XmlDocument;CreateDocumentType;(System.String,System.String,System.String,System.String);Argument[2];ReturnValue;taint;df-generated |
-| System.Xml;XmlDocument;CreateDocumentType;(System.String,System.String,System.String,System.String);Argument[3];ReturnValue;taint;df-generated |
+| System.Xml;XmlDocument;CreateDocumentType;(System.String,System.String,System.String,System.String);Argument[1];ReturnValue.SyntheticField[System.Xml.XmlDocumentType._publicId];value;dfc-generated |
+| System.Xml;XmlDocument;CreateDocumentType;(System.String,System.String,System.String,System.String);Argument[2];ReturnValue.SyntheticField[System.Xml.XmlDocumentType._systemId];value;dfc-generated |
+| System.Xml;XmlDocument;CreateDocumentType;(System.String,System.String,System.String,System.String);Argument[3];ReturnValue.SyntheticField[System.Xml.XmlDocumentType._internalSubset];value;dfc-generated |
 | System.Xml;XmlDocument;CreateElement;(System.String);Argument[0];ReturnValue;taint;df-generated |
 | System.Xml;XmlDocument;CreateElement;(System.String);Argument[this];ReturnValue;taint;df-generated |
 | System.Xml;XmlDocument;CreateElement;(System.String,System.String);Argument[0];ReturnValue;taint;df-generated |
@@ -13776,8 +14938,10 @@
 | System.Xml;XmlDocument;CreateElement;(System.String,System.String,System.String);Argument[2];ReturnValue;taint;df-generated |
 | System.Xml;XmlDocument;CreateElement;(System.String,System.String,System.String);Argument[this];ReturnValue;taint;df-generated |
 | System.Xml;XmlDocument;CreateEntityReference;(System.String);Argument[0];ReturnValue;taint;df-generated |
-| System.Xml;XmlDocument;CreateNavigator;(System.Xml.XmlNode);Argument[0].Element;ReturnValue;taint;df-generated |
-| System.Xml;XmlDocument;CreateNavigator;(System.Xml.XmlNode);Argument[this];ReturnValue;taint;df-generated |
+| System.Xml;XmlDocument;CreateNavigator;();Argument[this];ReturnValue.SyntheticField[System.Xml.DocumentXPathNavigator._source];value;df-generated |
+| System.Xml;XmlDocument;CreateNavigator;();Argument[this];ReturnValue.SyntheticField[System.Xml.DocumentXPathNavigator._source];value;dfc-generated |
+| System.Xml;XmlDocument;CreateNavigator;(System.Xml.XmlNode);Argument[0];ReturnValue.SyntheticField[System.Xml.DocumentXPathNavigator._source];value;dfc-generated |
+| System.Xml;XmlDocument;CreateNavigator;(System.Xml.XmlNode);Argument[this];ReturnValue.SyntheticField[System.Xml.DocumentXPathNavigator._document];value;dfc-generated |
 | System.Xml;XmlDocument;CreateNode;(System.String,System.String,System.String);Argument[1];ReturnValue;taint;df-generated |
 | System.Xml;XmlDocument;CreateNode;(System.String,System.String,System.String);Argument[2];ReturnValue;taint;df-generated |
 | System.Xml;XmlDocument;CreateNode;(System.String,System.String,System.String);Argument[this];ReturnValue;taint;df-generated |
@@ -13788,15 +14952,13 @@
 | System.Xml;XmlDocument;CreateNode;(System.Xml.XmlNodeType,System.String,System.String,System.String);Argument[2];ReturnValue;taint;df-generated |
 | System.Xml;XmlDocument;CreateNode;(System.Xml.XmlNodeType,System.String,System.String,System.String);Argument[3];ReturnValue;taint;df-generated |
 | System.Xml;XmlDocument;CreateNode;(System.Xml.XmlNodeType,System.String,System.String,System.String);Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlDocument;CreateProcessingInstruction;(System.String,System.String);Argument[0];ReturnValue;taint;df-generated |
-| System.Xml;XmlDocument;CreateProcessingInstruction;(System.String,System.String);Argument[1];ReturnValue;taint;df-generated |
+| System.Xml;XmlDocument;CreateProcessingInstruction;(System.String,System.String);Argument[0];ReturnValue.SyntheticField[System.Xml.XmlProcessingInstruction._target];value;dfc-generated |
 | System.Xml;XmlDocument;CreateSignificantWhitespace;(System.String);Argument[this];ReturnValue;taint;df-generated |
 | System.Xml;XmlDocument;CreateTextNode;(System.String);Argument[this];ReturnValue;taint;df-generated |
 | System.Xml;XmlDocument;CreateWhitespace;(System.String);Argument[this];ReturnValue;taint;df-generated |
 | System.Xml;XmlDocument;CreateXmlDeclaration;(System.String,System.String,System.String);Argument[0];ReturnValue;taint;df-generated |
 | System.Xml;XmlDocument;CreateXmlDeclaration;(System.String,System.String,System.String);Argument[1];ReturnValue;taint;df-generated |
 | System.Xml;XmlDocument;CreateXmlDeclaration;(System.String,System.String,System.String);Argument[2];ReturnValue;taint;df-generated |
-| System.Xml;XmlDocument;GetElementById;(System.String);Argument[this];ReturnValue;taint;df-generated |
 | System.Xml;XmlDocument;GetElementsByTagName;(System.String);Argument[0];ReturnValue;taint;df-generated |
 | System.Xml;XmlDocument;GetElementsByTagName;(System.String,System.String);Argument[0];ReturnValue;taint;df-generated |
 | System.Xml;XmlDocument;GetElementsByTagName;(System.String,System.String);Argument[1];ReturnValue;taint;df-generated |
@@ -13828,13 +14990,12 @@
 | System.Xml;XmlDocument;remove_NodeRemoving;(System.Xml.XmlNodeChangedEventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Xml;XmlDocument;set_XmlResolver;(System.Xml.XmlResolver);Argument[0];Argument[this];taint;df-generated |
 | System.Xml;XmlDocumentFragment;XmlDocumentFragment;(System.Xml.XmlDocument);Argument[0].Element;Argument[this];taint;df-generated |
-| System.Xml;XmlDocumentType;XmlDocumentType;(System.String,System.String,System.String,System.String,System.Xml.XmlDocument);Argument[0];Argument[this];taint;df-generated |
-| System.Xml;XmlDocumentType;XmlDocumentType;(System.String,System.String,System.String,System.String,System.Xml.XmlDocument);Argument[1];Argument[this];taint;df-generated |
-| System.Xml;XmlDocumentType;XmlDocumentType;(System.String,System.String,System.String,System.String,System.Xml.XmlDocument);Argument[2];Argument[this];taint;df-generated |
-| System.Xml;XmlDocumentType;XmlDocumentType;(System.String,System.String,System.String,System.String,System.Xml.XmlDocument);Argument[3];Argument[this];taint;df-generated |
-| System.Xml;XmlDocumentType;get_InternalSubset;();Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlDocumentType;get_PublicId;();Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlDocumentType;get_SystemId;();Argument[this];ReturnValue;taint;df-generated |
+| System.Xml;XmlDocumentType;XmlDocumentType;(System.String,System.String,System.String,System.String,System.Xml.XmlDocument);Argument[1];Argument[this].SyntheticField[System.Xml.XmlDocumentType._publicId];value;dfc-generated |
+| System.Xml;XmlDocumentType;XmlDocumentType;(System.String,System.String,System.String,System.String,System.Xml.XmlDocument);Argument[2];Argument[this].SyntheticField[System.Xml.XmlDocumentType._systemId];value;dfc-generated |
+| System.Xml;XmlDocumentType;XmlDocumentType;(System.String,System.String,System.String,System.String,System.Xml.XmlDocument);Argument[3];Argument[this].SyntheticField[System.Xml.XmlDocumentType._internalSubset];value;dfc-generated |
+| System.Xml;XmlDocumentType;get_InternalSubset;();Argument[this].SyntheticField[System.Xml.XmlDocumentType._internalSubset];ReturnValue;value;dfc-generated |
+| System.Xml;XmlDocumentType;get_PublicId;();Argument[this].SyntheticField[System.Xml.XmlDocumentType._publicId];ReturnValue;value;dfc-generated |
+| System.Xml;XmlDocumentType;get_SystemId;();Argument[this].SyntheticField[System.Xml.XmlDocumentType._systemId];ReturnValue;value;dfc-generated |
 | System.Xml;XmlElement;GetAttribute;(System.String);Argument[this];ReturnValue;taint;df-generated |
 | System.Xml;XmlElement;GetAttribute;(System.String,System.String);Argument[this];ReturnValue;taint;df-generated |
 | System.Xml;XmlElement;GetAttributeNode;(System.String);Argument[this];ReturnValue;taint;df-generated |
@@ -13844,27 +15005,24 @@
 | System.Xml;XmlElement;GetElementsByTagName;(System.String,System.String);Argument[1];ReturnValue;taint;df-generated |
 | System.Xml;XmlElement;RemoveAttributeAt;(System.Int32);Argument[this];ReturnValue;taint;df-generated |
 | System.Xml;XmlElement;RemoveAttributeNode;(System.String,System.String);Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlElement;RemoveAttributeNode;(System.Xml.XmlAttribute);Argument[0].Element;ReturnValue;taint;df-generated |
-| System.Xml;XmlElement;SetAttribute;(System.String,System.String,System.String);Argument[2];ReturnValue;taint;df-generated |
+| System.Xml;XmlElement;RemoveAttributeNode;(System.Xml.XmlAttribute);Argument[0];ReturnValue;value;dfc-generated |
+| System.Xml;XmlElement;SetAttribute;(System.String,System.String,System.String);Argument[2];ReturnValue;value;dfc-generated |
 | System.Xml;XmlElement;SetAttributeNode;(System.String,System.String);Argument[0];ReturnValue;taint;df-generated |
 | System.Xml;XmlElement;SetAttributeNode;(System.String,System.String);Argument[1];ReturnValue;taint;df-generated |
 | System.Xml;XmlElement;SetAttributeNode;(System.String,System.String);Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlElement;SetAttributeNode;(System.Xml.XmlAttribute);Argument[0].Element;ReturnValue;taint;df-generated |
-| System.Xml;XmlElement;SetAttributeNode;(System.Xml.XmlAttribute);Argument[this];Argument[0].Element;taint;df-generated |
-| System.Xml;XmlElement;SetAttributeNode;(System.Xml.XmlAttribute);Argument[this];ReturnValue;taint;df-generated |
+| System.Xml;XmlElement;SetAttributeNode;(System.Xml.XmlAttribute);Argument[0];ReturnValue;value;dfc-generated |
 | System.Xml;XmlEntity;get_NotationName;();Argument[this];ReturnValue;taint;df-generated |
 | System.Xml;XmlEntity;get_PublicId;();Argument[this];ReturnValue;taint;df-generated |
 | System.Xml;XmlEntity;get_SystemId;();Argument[this];ReturnValue;taint;df-generated |
 | System.Xml;XmlEntityReference;XmlEntityReference;(System.String,System.Xml.XmlDocument);Argument[0];Argument[this];taint;df-generated |
-| System.Xml;XmlException;XmlException;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);Argument[0];Argument[this];taint;df-generated |
-| System.Xml;XmlException;get_Message;();Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlException;get_SourceUri;();Argument[this];ReturnValue;taint;df-generated |
+| System.Xml;XmlException;XmlException;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);Argument[0].Element.Property[System.Runtime.Serialization.SerializationEntry.Value];Argument[this].SyntheticField[System.Xml.XmlException._sourceUri];value;dfc-generated |
+| System.Xml;XmlException;get_Message;();Argument[this].Property[System.Exception.Message];ReturnValue;value;dfc-generated |
+| System.Xml;XmlException;get_Message;();Argument[this].SyntheticField[System.Exception._message];ReturnValue;value;dfc-generated |
+| System.Xml;XmlException;get_SourceUri;();Argument[this].SyntheticField[System.Xml.XmlException._sourceUri];ReturnValue;value;dfc-generated |
 | System.Xml;XmlImplementation;CreateDocument;();Argument[this];ReturnValue;taint;df-generated |
 | System.Xml;XmlImplementation;XmlImplementation;(System.Xml.XmlNameTable);Argument[0];Argument[this];taint;df-generated |
-| System.Xml;XmlNameTable;Add;(System.Char[],System.Int32,System.Int32);Argument[0].Element;ReturnValue;taint;df-generated |
-| System.Xml;XmlNameTable;Add;(System.Char[],System.Int32,System.Int32);Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlNameTable;Add;(System.String);Argument[0];ReturnValue;taint;df-generated |
-| System.Xml;XmlNameTable;Add;(System.String);Argument[this];ReturnValue;taint;df-generated |
+| System.Xml;XmlNameTable;Add;(System.Char[],System.Int32,System.Int32);Argument[0].Element;ReturnValue;taint;dfc-generated |
+| System.Xml;XmlNameTable;Add;(System.String);Argument[0];ReturnValue;value;dfc-generated |
 | System.Xml;XmlNameTable;Get;(System.Char[],System.Int32,System.Int32);Argument[this];ReturnValue;taint;df-generated |
 | System.Xml;XmlNameTable;Get;(System.String);Argument[this];ReturnValue;taint;df-generated |
 | System.Xml;XmlNamedNodeMap;GetNamedItem;(System.String);Argument[this];ReturnValue;value;manual |
@@ -13872,17 +15030,16 @@
 | System.Xml;XmlNamedNodeMap;Item;(System.Int32);Argument[this];ReturnValue;taint;df-generated |
 | System.Xml;XmlNamedNodeMap;RemoveNamedItem;(System.String);Argument[this];ReturnValue;taint;df-generated |
 | System.Xml;XmlNamedNodeMap;RemoveNamedItem;(System.String,System.String);Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlNamedNodeMap;SetNamedItem;(System.Xml.XmlNode);Argument[0].Element;ReturnValue;taint;df-generated |
-| System.Xml;XmlNamedNodeMap;SetNamedItem;(System.Xml.XmlNode);Argument[this];Argument[0].Element;taint;df-generated |
-| System.Xml;XmlNamedNodeMap;SetNamedItem;(System.Xml.XmlNode);Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlNamespaceManager;XmlNamespaceManager;(System.Xml.XmlNameTable);Argument[0];Argument[this];taint;df-generated |
+| System.Xml;XmlNamedNodeMap;SetNamedItem;(System.Xml.XmlNode);Argument[0];ReturnValue;value;dfc-generated |
+| System.Xml;XmlNamespaceManager;XmlNamespaceManager;(System.Xml.XmlNameTable);Argument[0];Argument[this].SyntheticField[System.Xml.XmlNamespaceManager._nameTable];value;dfc-generated |
 | System.Xml;XmlNamespaceManager;get_DefaultNamespace;();Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlNamespaceManager;get_NameTable;();Argument[this];ReturnValue;taint;df-generated |
+| System.Xml;XmlNamespaceManager;get_NameTable;();Argument[this].SyntheticField[System.Xml.XmlNamespaceManager._nameTable];ReturnValue;value;dfc-generated |
 | System.Xml;XmlNode;AppendChild;(System.Xml.XmlNode);Argument[0].Element;Argument[this];taint;df-generated |
 | System.Xml;XmlNode;AppendChild;(System.Xml.XmlNode);Argument[0].Element;ReturnValue;taint;df-generated |
 | System.Xml;XmlNode;AppendChild;(System.Xml.XmlNode);Argument[this];Argument[0].Element;taint;df-generated |
 | System.Xml;XmlNode;AppendChild;(System.Xml.XmlNode);Argument[this];ReturnValue;taint;df-generated |
 | System.Xml;XmlNode;Clone;();Argument[this];ReturnValue;taint;df-generated |
+| System.Xml;XmlNode;Clone;();Argument[this];ReturnValue;taint;dfc-generated |
 | System.Xml;XmlNode;CloneNode;(System.Boolean);Argument[this];ReturnValue;taint;df-generated |
 | System.Xml;XmlNode;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.IEnumerator.Current];value;manual |
 | System.Xml;XmlNode;GetNamespaceOfPrefix;(System.String);Argument[this];ReturnValue;taint;df-generated |
@@ -13907,8 +15064,7 @@
 | System.Xml;XmlNode;PrependChild;(System.Xml.XmlNode);Argument[0].Element;ReturnValue;taint;df-generated |
 | System.Xml;XmlNode;PrependChild;(System.Xml.XmlNode);Argument[this];Argument[0].Element;taint;df-generated |
 | System.Xml;XmlNode;PrependChild;(System.Xml.XmlNode);Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlNode;RemoveChild;(System.Xml.XmlNode);Argument[0].Element;Argument[this];taint;df-generated |
-| System.Xml;XmlNode;RemoveChild;(System.Xml.XmlNode);Argument[0].Element;ReturnValue;taint;df-generated |
+| System.Xml;XmlNode;RemoveChild;(System.Xml.XmlNode);Argument[0];ReturnValue;value;dfc-generated |
 | System.Xml;XmlNode;ReplaceChild;(System.Xml.XmlNode,System.Xml.XmlNode);Argument[0].Element;Argument[this];taint;df-generated |
 | System.Xml;XmlNode;ReplaceChild;(System.Xml.XmlNode,System.Xml.XmlNode);Argument[1].Element;Argument[0].Element;taint;df-generated |
 | System.Xml;XmlNode;ReplaceChild;(System.Xml.XmlNode,System.Xml.XmlNode);Argument[1].Element;Argument[this];taint;df-generated |
@@ -13944,19 +15100,21 @@
 | System.Xml;XmlNode;get_PreviousText;();Argument[this];ReturnValue;taint;manual |
 | System.Xml;XmlNode;get_SchemaInfo;();Argument[this];ReturnValue;taint;manual |
 | System.Xml;XmlNode;get_Value;();Argument[this];ReturnValue;taint;manual |
-| System.Xml;XmlNodeChangedEventArgs;XmlNodeChangedEventArgs;(System.Xml.XmlNode,System.Xml.XmlNode,System.Xml.XmlNode,System.String,System.String,System.Xml.XmlNodeChangedAction);Argument[0].Element;Argument[this];taint;df-generated |
-| System.Xml;XmlNodeChangedEventArgs;XmlNodeChangedEventArgs;(System.Xml.XmlNode,System.Xml.XmlNode,System.Xml.XmlNode,System.String,System.String,System.Xml.XmlNodeChangedAction);Argument[1].Element;Argument[this];taint;df-generated |
-| System.Xml;XmlNodeChangedEventArgs;XmlNodeChangedEventArgs;(System.Xml.XmlNode,System.Xml.XmlNode,System.Xml.XmlNode,System.String,System.String,System.Xml.XmlNodeChangedAction);Argument[2].Element;Argument[this];taint;df-generated |
-| System.Xml;XmlNodeChangedEventArgs;XmlNodeChangedEventArgs;(System.Xml.XmlNode,System.Xml.XmlNode,System.Xml.XmlNode,System.String,System.String,System.Xml.XmlNodeChangedAction);Argument[3];Argument[this];taint;df-generated |
-| System.Xml;XmlNodeChangedEventArgs;XmlNodeChangedEventArgs;(System.Xml.XmlNode,System.Xml.XmlNode,System.Xml.XmlNode,System.String,System.String,System.Xml.XmlNodeChangedAction);Argument[4];Argument[this];taint;df-generated |
-| System.Xml;XmlNodeChangedEventArgs;get_NewParent;();Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlNodeChangedEventArgs;get_NewValue;();Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlNodeChangedEventArgs;get_Node;();Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlNodeChangedEventArgs;get_OldParent;();Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlNodeChangedEventArgs;get_OldValue;();Argument[this];ReturnValue;taint;df-generated |
+| System.Xml;XmlNodeChangedEventArgs;XmlNodeChangedEventArgs;(System.Xml.XmlNode,System.Xml.XmlNode,System.Xml.XmlNode,System.String,System.String,System.Xml.XmlNodeChangedAction);Argument[0];Argument[this].SyntheticField[System.Xml.XmlNodeChangedEventArgs._node];value;dfc-generated |
+| System.Xml;XmlNodeChangedEventArgs;XmlNodeChangedEventArgs;(System.Xml.XmlNode,System.Xml.XmlNode,System.Xml.XmlNode,System.String,System.String,System.Xml.XmlNodeChangedAction);Argument[1];Argument[this].SyntheticField[System.Xml.XmlNodeChangedEventArgs._oldParent];value;dfc-generated |
+| System.Xml;XmlNodeChangedEventArgs;XmlNodeChangedEventArgs;(System.Xml.XmlNode,System.Xml.XmlNode,System.Xml.XmlNode,System.String,System.String,System.Xml.XmlNodeChangedAction);Argument[2];Argument[this].SyntheticField[System.Xml.XmlNodeChangedEventArgs._newParent];value;dfc-generated |
+| System.Xml;XmlNodeChangedEventArgs;XmlNodeChangedEventArgs;(System.Xml.XmlNode,System.Xml.XmlNode,System.Xml.XmlNode,System.String,System.String,System.Xml.XmlNodeChangedAction);Argument[3];Argument[this].SyntheticField[System.Xml.XmlNodeChangedEventArgs._oldValue];value;dfc-generated |
+| System.Xml;XmlNodeChangedEventArgs;XmlNodeChangedEventArgs;(System.Xml.XmlNode,System.Xml.XmlNode,System.Xml.XmlNode,System.String,System.String,System.Xml.XmlNodeChangedAction);Argument[4];Argument[this].SyntheticField[System.Xml.XmlNodeChangedEventArgs._newValue];value;dfc-generated |
+| System.Xml;XmlNodeChangedEventArgs;get_NewParent;();Argument[this].SyntheticField[System.Xml.XmlNodeChangedEventArgs._newParent];ReturnValue;value;dfc-generated |
+| System.Xml;XmlNodeChangedEventArgs;get_NewValue;();Argument[this].SyntheticField[System.Xml.XmlNodeChangedEventArgs._newValue];ReturnValue;value;dfc-generated |
+| System.Xml;XmlNodeChangedEventArgs;get_Node;();Argument[this].SyntheticField[System.Xml.XmlNodeChangedEventArgs._node];ReturnValue;value;dfc-generated |
+| System.Xml;XmlNodeChangedEventArgs;get_OldParent;();Argument[this].SyntheticField[System.Xml.XmlNodeChangedEventArgs._oldParent];ReturnValue;value;dfc-generated |
+| System.Xml;XmlNodeChangedEventArgs;get_OldValue;();Argument[this].SyntheticField[System.Xml.XmlNodeChangedEventArgs._oldValue];ReturnValue;value;dfc-generated |
 | System.Xml;XmlNodeChangedEventHandler;BeginInvoke;(System.Object,System.Xml.XmlNodeChangedEventArgs,System.AsyncCallback,System.Object);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
 | System.Xml;XmlNodeList;Item;(System.Int32);Argument[this];ReturnValue;taint;df-generated |
 | System.Xml;XmlNodeList;get_ItemOf;(System.Int32);Argument[this];ReturnValue;taint;df-generated |
+| System.Xml;XmlNodeReader;ReadString;();Argument[this].Property[System.Xml.XmlReader.Value];ReturnValue;taint;df-generated |
+| System.Xml;XmlNodeReader;ReadString;();Argument[this].Property[System.Xml.XmlReader.Value];ReturnValue;taint;dfc-generated |
 | System.Xml;XmlNodeReader;XmlNodeReader;(System.Xml.XmlNode);Argument[0].Element;Argument[this];taint;df-generated |
 | System.Xml;XmlNotation;get_PublicId;();Argument[this];ReturnValue;taint;df-generated |
 | System.Xml;XmlNotation;get_SystemId;();Argument[this];ReturnValue;taint;df-generated |
@@ -13969,12 +15127,14 @@
 | System.Xml;XmlParserContext;XmlParserContext;(System.Xml.XmlNameTable,System.Xml.XmlNamespaceManager,System.String,System.String,System.String,System.String,System.String,System.String,System.Xml.XmlSpace,System.Text.Encoding);Argument[6];Argument[this];taint;df-generated |
 | System.Xml;XmlParserContext;XmlParserContext;(System.Xml.XmlNameTable,System.Xml.XmlNamespaceManager,System.String,System.String,System.String,System.String,System.String,System.String,System.Xml.XmlSpace,System.Text.Encoding);Argument[7];Argument[this];taint;df-generated |
 | System.Xml;XmlParserContext;XmlParserContext;(System.Xml.XmlNameTable,System.Xml.XmlNamespaceManager,System.String,System.String,System.String,System.String,System.String,System.String,System.Xml.XmlSpace,System.Text.Encoding);Argument[9];Argument[this];taint;df-generated |
-| System.Xml;XmlProcessingInstruction;XmlProcessingInstruction;(System.String,System.String,System.Xml.XmlDocument);Argument[0];Argument[this];taint;df-generated |
-| System.Xml;XmlProcessingInstruction;XmlProcessingInstruction;(System.String,System.String,System.Xml.XmlDocument);Argument[1];Argument[this];taint;df-generated |
-| System.Xml;XmlProcessingInstruction;get_Target;();Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlQualifiedName;ToString;();Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlQualifiedName;ToString;(System.String,System.String);Argument[0];ReturnValue;taint;df-generated |
-| System.Xml;XmlQualifiedName;ToString;(System.String,System.String);Argument[1];ReturnValue;taint;df-generated |
+| System.Xml;XmlProcessingInstruction;CloneNode;(System.Boolean);Argument[this].SyntheticField[System.Xml.XmlProcessingInstruction._target];ReturnValue.SyntheticField[System.Xml.XmlProcessingInstruction._target];value;df-generated |
+| System.Xml;XmlProcessingInstruction;CloneNode;(System.Boolean);Argument[this].SyntheticField[System.Xml.XmlProcessingInstruction._target];ReturnValue.SyntheticField[System.Xml.XmlProcessingInstruction._target];value;dfc-generated |
+| System.Xml;XmlProcessingInstruction;XmlProcessingInstruction;(System.String,System.String,System.Xml.XmlDocument);Argument[0];Argument[this].SyntheticField[System.Xml.XmlProcessingInstruction._target];value;dfc-generated |
+| System.Xml;XmlProcessingInstruction;get_Target;();Argument[this].SyntheticField[System.Xml.XmlProcessingInstruction._target];ReturnValue;value;dfc-generated |
+| System.Xml;XmlQualifiedName;ToString;();Argument[this].Property[System.Xml.XmlQualifiedName.Name];ReturnValue;value;dfc-generated |
+| System.Xml;XmlQualifiedName;ToString;();Argument[this].Property[System.Xml.XmlQualifiedName.Namespace];ReturnValue;taint;dfc-generated |
+| System.Xml;XmlQualifiedName;ToString;(System.String,System.String);Argument[0];ReturnValue;value;dfc-generated |
+| System.Xml;XmlQualifiedName;ToString;(System.String,System.String);Argument[1];ReturnValue;taint;dfc-generated |
 | System.Xml;XmlReader;Create;(System.IO.Stream);Argument[0];ReturnValue;taint;manual |
 | System.Xml;XmlReader;Create;(System.IO.Stream,System.Xml.XmlReaderSettings);Argument[0];ReturnValue;taint;manual |
 | System.Xml;XmlReader;Create;(System.IO.Stream,System.Xml.XmlReaderSettings,System.String);Argument[0];ReturnValue;taint;manual |
@@ -13991,9 +15151,10 @@
 | System.Xml;XmlReader;GetAttribute;(System.String);Argument[this];ReturnValue;taint;df-generated |
 | System.Xml;XmlReader;GetAttribute;(System.String,System.String);Argument[this];ReturnValue;taint;df-generated |
 | System.Xml;XmlReader;GetValueAsync;();Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlReader;LookupNamespace;(System.String);Argument[0];ReturnValue;taint;df-generated |
-| System.Xml;XmlReader;LookupNamespace;(System.String);Argument[this];ReturnValue;taint;df-generated |
+| System.Xml;XmlReader;LookupNamespace;(System.String);Argument[0];ReturnValue;value;dfc-generated |
+| System.Xml;XmlReader;MoveToAttribute;(System.String);Argument[0];Argument[this];taint;df-generated |
 | System.Xml;XmlReader;ReadContentAs;(System.Type,System.Xml.IXmlNamespaceResolver);Argument[1];ReturnValue;taint;df-generated |
+| System.Xml;XmlReader;ReadContentAs;(System.Type,System.Xml.IXmlNamespaceResolver);Argument[this];Argument[1];taint;df-generated |
 | System.Xml;XmlReader;ReadContentAs;(System.Type,System.Xml.IXmlNamespaceResolver);Argument[this];ReturnValue;taint;df-generated |
 | System.Xml;XmlReader;ReadContentAsAsync;(System.Type,System.Xml.IXmlNamespaceResolver);Argument[1];Argument[this];taint;df-generated |
 | System.Xml;XmlReader;ReadContentAsAsync;(System.Type,System.Xml.IXmlNamespaceResolver);Argument[1];ReturnValue;taint;df-generated |
@@ -14006,8 +15167,10 @@
 | System.Xml;XmlReader;ReadContentAsString;();Argument[this];ReturnValue;taint;df-generated |
 | System.Xml;XmlReader;ReadContentAsStringAsync;();Argument[this];ReturnValue;taint;df-generated |
 | System.Xml;XmlReader;ReadElementContentAs;(System.Type,System.Xml.IXmlNamespaceResolver);Argument[1];ReturnValue;taint;df-generated |
+| System.Xml;XmlReader;ReadElementContentAs;(System.Type,System.Xml.IXmlNamespaceResolver);Argument[this];Argument[1];taint;df-generated |
 | System.Xml;XmlReader;ReadElementContentAs;(System.Type,System.Xml.IXmlNamespaceResolver);Argument[this];ReturnValue;taint;df-generated |
 | System.Xml;XmlReader;ReadElementContentAs;(System.Type,System.Xml.IXmlNamespaceResolver,System.String,System.String);Argument[1];ReturnValue;taint;df-generated |
+| System.Xml;XmlReader;ReadElementContentAs;(System.Type,System.Xml.IXmlNamespaceResolver,System.String,System.String);Argument[this];Argument[1];taint;df-generated |
 | System.Xml;XmlReader;ReadElementContentAs;(System.Type,System.Xml.IXmlNamespaceResolver,System.String,System.String);Argument[this];ReturnValue;taint;df-generated |
 | System.Xml;XmlReader;ReadElementContentAsAsync;(System.Type,System.Xml.IXmlNamespaceResolver);Argument[1];Argument[this];taint;df-generated |
 | System.Xml;XmlReader;ReadElementContentAsAsync;(System.Type,System.Xml.IXmlNamespaceResolver);Argument[1];ReturnValue;taint;df-generated |
@@ -14035,7 +15198,7 @@
 | System.Xml;XmlReader;get_NameTable;();Argument[this];ReturnValue;taint;df-generated |
 | System.Xml;XmlReader;get_NamespaceURI;();Argument[this];ReturnValue;taint;df-generated |
 | System.Xml;XmlReader;get_Prefix;();Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlReader;get_SchemaInfo;();Argument[this];ReturnValue;taint;df-generated |
+| System.Xml;XmlReader;get_SchemaInfo;();Argument[this];ReturnValue;value;dfc-generated |
 | System.Xml;XmlReader;get_Settings;();Argument[this];ReturnValue;taint;df-generated |
 | System.Xml;XmlReader;get_Value;();Argument[this];ReturnValue;taint;df-generated |
 | System.Xml;XmlReader;get_XmlLang;();Argument[this];ReturnValue;taint;df-generated |
@@ -14044,24 +15207,62 @@
 | System.Xml;XmlReaderSettings;set_XmlResolver;(System.Xml.XmlResolver);Argument[0];Argument[this];taint;df-generated |
 | System.Xml;XmlResolver;GetEntity;(System.Uri,System.String,System.Type);Argument[0];ReturnValue;taint;df-generated |
 | System.Xml;XmlResolver;GetEntityAsync;(System.Uri,System.String,System.Type);Argument[0];ReturnValue;taint;df-generated |
-| System.Xml;XmlResolver;ResolveUri;(System.Uri,System.String);Argument[0];ReturnValue;taint;df-generated |
-| System.Xml;XmlResolver;ResolveUri;(System.Uri,System.String);Argument[1];ReturnValue;taint;df-generated |
+| System.Xml;XmlResolver;ResolveUri;(System.Uri,System.String);Argument[0];ReturnValue;value;dfc-generated |
+| System.Xml;XmlResolver;ResolveUri;(System.Uri,System.String);Argument[1];ReturnValue;taint;dfc-generated |
 | System.Xml;XmlResolver;set_Credentials;(System.Net.ICredentials);Argument[0];Argument[this];taint;df-generated |
+| System.Xml;XmlSecureResolver;GetEntity;(System.Uri,System.String,System.Type);Argument[0].Property[System.Uri.LocalPath];ReturnValue;taint;df-generated |
+| System.Xml;XmlSecureResolver;GetEntity;(System.Uri,System.String,System.Type);Argument[0].Property[System.Uri.LocalPath];ReturnValue;taint;dfc-generated |
+| System.Xml;XmlSecureResolver;GetEntityAsync;(System.Uri,System.String,System.Type);Argument[0].Property[System.Uri.LocalPath];ReturnValue.Property[System.Threading.Tasks.Task`1.Result];taint;df-generated |
+| System.Xml;XmlSecureResolver;GetEntityAsync;(System.Uri,System.String,System.Type);Argument[0].Property[System.Uri.LocalPath];ReturnValue.Property[System.Threading.Tasks.Task`1.Result];taint;dfc-generated |
 | System.Xml;XmlText;SplitText;(System.Int32);Argument[this];ReturnValue;taint;df-generated |
 | System.Xml;XmlTextReader;GetRemainder;();Argument[this];ReturnValue;taint;df-generated |
+| System.Xml;XmlTextReader;ReadString;();Argument[this].Property[System.Xml.XmlReader.Value];ReturnValue;taint;df-generated |
+| System.Xml;XmlTextReader;ReadString;();Argument[this].Property[System.Xml.XmlReader.Value];ReturnValue;taint;dfc-generated |
 | System.Xml;XmlTextReader;XmlTextReader;(System.IO.Stream,System.Xml.XmlNodeType,System.Xml.XmlParserContext);Argument[2];Argument[this];taint;df-generated |
-| System.Xml;XmlTextReader;XmlTextReader;(System.String);Argument[0];Argument[this];taint;df-generated |
-| System.Xml;XmlTextReader;XmlTextReader;(System.String,System.IO.Stream,System.Xml.XmlNameTable);Argument[0];Argument[this];taint;df-generated |
-| System.Xml;XmlTextReader;XmlTextReader;(System.String,System.IO.TextReader,System.Xml.XmlNameTable);Argument[0];Argument[this];taint;df-generated |
-| System.Xml;XmlTextReader;XmlTextReader;(System.String,System.Xml.XmlNameTable);Argument[0];Argument[this];taint;df-generated |
+| System.Xml;XmlTextReader;XmlTextReader;(System.String);Argument[0];Argument[this].SyntheticField[System.Xml.XmlTextReader._impl].SyntheticField[System.Xml.XmlTextReaderImpl._reportedBaseUri];taint;dfc-generated |
+| System.Xml;XmlTextReader;XmlTextReader;(System.String,System.IO.Stream,System.Xml.XmlNameTable);Argument[0];Argument[this].SyntheticField[System.Xml.XmlTextReader._impl].SyntheticField[System.Xml.XmlTextReaderImpl._reportedBaseUri];value;dfc-generated |
+| System.Xml;XmlTextReader;XmlTextReader;(System.String,System.IO.TextReader,System.Xml.XmlNameTable);Argument[0];Argument[this].SyntheticField[System.Xml.XmlTextReader._impl].SyntheticField[System.Xml.XmlTextReaderImpl._reportedBaseUri];value;dfc-generated |
+| System.Xml;XmlTextReader;XmlTextReader;(System.String,System.Xml.XmlNameTable);Argument[0];Argument[this].SyntheticField[System.Xml.XmlTextReader._impl].SyntheticField[System.Xml.XmlTextReaderImpl._reportedBaseUri];taint;dfc-generated |
 | System.Xml;XmlTextReader;XmlTextReader;(System.String,System.Xml.XmlNodeType,System.Xml.XmlParserContext);Argument[2];Argument[this];taint;df-generated |
-| System.Xml;XmlTextReader;XmlTextReader;(System.Xml.XmlNameTable);Argument[0];Argument[this];taint;df-generated |
+| System.Xml;XmlTextReader;XmlTextReader;(System.Xml.XmlNameTable);Argument[0];Argument[this].SyntheticField[System.Xml.XmlTextReader._impl].SyntheticField[System.Xml.XmlTextReaderImpl._nameTable];value;dfc-generated |
+| System.Xml;XmlTextReader;get_BaseURI;();Argument[this].SyntheticField[System.Xml.XmlTextReader._impl].SyntheticField[System.Xml.XmlTextReaderImpl._reportedBaseUri];ReturnValue;value;df-generated |
+| System.Xml;XmlTextReader;get_BaseURI;();Argument[this].SyntheticField[System.Xml.XmlTextReader._impl].SyntheticField[System.Xml.XmlTextReaderImpl._reportedBaseUri];ReturnValue;value;dfc-generated |
 | System.Xml;XmlTextReader;get_Encoding;();Argument[this];ReturnValue;taint;df-generated |
+| System.Xml;XmlTextReader;get_NameTable;();Argument[this].SyntheticField[System.Xml.XmlTextReader._impl].SyntheticField[System.Xml.XmlTextReaderImpl._nameTable];ReturnValue;value;df-generated |
+| System.Xml;XmlTextReader;get_NameTable;();Argument[this].SyntheticField[System.Xml.XmlTextReader._impl].SyntheticField[System.Xml.XmlTextReaderImpl._nameTable];ReturnValue;value;dfc-generated |
 | System.Xml;XmlTextReader;set_XmlResolver;(System.Xml.XmlResolver);Argument[0];Argument[this];taint;df-generated |
+| System.Xml;XmlTextWriter;WriteDocType;(System.String,System.String,System.String,System.String);Argument[0];Argument[this].SyntheticField[System.Xml.XmlTextWriter._textWriter];taint;df-generated |
+| System.Xml;XmlTextWriter;WriteDocType;(System.String,System.String,System.String,System.String);Argument[0];Argument[this].SyntheticField[System.Xml.XmlTextWriter._textWriter];taint;dfc-generated |
+| System.Xml;XmlTextWriter;WriteDocType;(System.String,System.String,System.String,System.String);Argument[1];Argument[this].SyntheticField[System.Xml.XmlTextWriter._textWriter];taint;df-generated |
+| System.Xml;XmlTextWriter;WriteDocType;(System.String,System.String,System.String,System.String);Argument[1];Argument[this].SyntheticField[System.Xml.XmlTextWriter._textWriter];taint;dfc-generated |
+| System.Xml;XmlTextWriter;WriteDocType;(System.String,System.String,System.String,System.String);Argument[2];Argument[this].SyntheticField[System.Xml.XmlTextWriter._textWriter];taint;df-generated |
+| System.Xml;XmlTextWriter;WriteDocType;(System.String,System.String,System.String,System.String);Argument[2];Argument[this].SyntheticField[System.Xml.XmlTextWriter._textWriter];taint;dfc-generated |
+| System.Xml;XmlTextWriter;WriteDocType;(System.String,System.String,System.String,System.String);Argument[3];Argument[this].SyntheticField[System.Xml.XmlTextWriter._textWriter];taint;df-generated |
+| System.Xml;XmlTextWriter;WriteDocType;(System.String,System.String,System.String,System.String);Argument[3];Argument[this].SyntheticField[System.Xml.XmlTextWriter._textWriter];taint;dfc-generated |
+| System.Xml;XmlTextWriter;WriteName;(System.String);Argument[0];Argument[this].SyntheticField[System.Xml.XmlTextWriter._textWriter];taint;df-generated |
+| System.Xml;XmlTextWriter;WriteName;(System.String);Argument[0];Argument[this].SyntheticField[System.Xml.XmlTextWriter._textWriter];taint;dfc-generated |
+| System.Xml;XmlTextWriter;WriteNmToken;(System.String);Argument[0];Argument[this].SyntheticField[System.Xml.XmlTextWriter._textWriter];taint;df-generated |
+| System.Xml;XmlTextWriter;WriteNmToken;(System.String);Argument[0];Argument[this].SyntheticField[System.Xml.XmlTextWriter._textWriter];taint;dfc-generated |
+| System.Xml;XmlTextWriter;WriteProcessingInstruction;(System.String,System.String);Argument[0];Argument[this].SyntheticField[System.Xml.XmlTextWriter._textWriter];taint;df-generated |
+| System.Xml;XmlTextWriter;WriteProcessingInstruction;(System.String,System.String);Argument[0];Argument[this].SyntheticField[System.Xml.XmlTextWriter._textWriter];taint;dfc-generated |
+| System.Xml;XmlTextWriter;WriteQualifiedName;(System.String,System.String);Argument[0];Argument[this].SyntheticField[System.Xml.XmlTextWriter._textWriter];taint;df-generated |
+| System.Xml;XmlTextWriter;WriteQualifiedName;(System.String,System.String);Argument[0];Argument[this].SyntheticField[System.Xml.XmlTextWriter._textWriter];taint;dfc-generated |
+| System.Xml;XmlTextWriter;WriteStartAttribute;(System.String,System.String,System.String);Argument[0];Argument[this].SyntheticField[System.Xml.XmlTextWriter._textWriter];taint;df-generated |
+| System.Xml;XmlTextWriter;WriteStartAttribute;(System.String,System.String,System.String);Argument[0];Argument[this].SyntheticField[System.Xml.XmlTextWriter._textWriter];taint;dfc-generated |
+| System.Xml;XmlTextWriter;WriteStartAttribute;(System.String,System.String,System.String);Argument[1];Argument[this].SyntheticField[System.Xml.XmlTextWriter._textWriter];taint;df-generated |
+| System.Xml;XmlTextWriter;WriteStartAttribute;(System.String,System.String,System.String);Argument[1];Argument[this].SyntheticField[System.Xml.XmlTextWriter._textWriter];taint;dfc-generated |
+| System.Xml;XmlTextWriter;WriteStartElement;(System.String,System.String,System.String);Argument[0];Argument[this].SyntheticField[System.Xml.XmlTextWriter._textWriter];taint;df-generated |
+| System.Xml;XmlTextWriter;WriteStartElement;(System.String,System.String,System.String);Argument[0];Argument[this].SyntheticField[System.Xml.XmlTextWriter._textWriter];taint;dfc-generated |
+| System.Xml;XmlTextWriter;WriteStartElement;(System.String,System.String,System.String);Argument[1];Argument[this].SyntheticField[System.Xml.XmlTextWriter._textWriter];taint;df-generated |
+| System.Xml;XmlTextWriter;WriteStartElement;(System.String,System.String,System.String);Argument[1];Argument[this].SyntheticField[System.Xml.XmlTextWriter._textWriter];taint;dfc-generated |
 | System.Xml;XmlTextWriter;XmlTextWriter;(System.IO.Stream,System.Text.Encoding);Argument[1];Argument[this];taint;df-generated |
 | System.Xml;XmlTextWriter;XmlTextWriter;(System.IO.TextWriter);Argument[0];Argument[this];taint;df-generated |
-| System.Xml;XmlTextWriter;get_BaseStream;();Argument[this];ReturnValue;taint;df-generated |
+| System.Xml;XmlTextWriter;get_BaseStream;();Argument[this].SyntheticField[System.Xml.XmlTextWriter._textWriter].Property[System.IO.StreamWriter.BaseStream];ReturnValue;value;dfc-generated |
+| System.Xml;XmlUrlResolver;GetEntity;(System.Uri,System.String,System.Type);Argument[0].Property[System.Uri.LocalPath];ReturnValue;taint;df-generated |
+| System.Xml;XmlUrlResolver;GetEntity;(System.Uri,System.String,System.Type);Argument[0].Property[System.Uri.LocalPath];ReturnValue;taint;dfc-generated |
 | System.Xml;XmlUrlResolver;set_Proxy;(System.Net.IWebProxy);Argument[0];Argument[this];taint;df-generated |
+| System.Xml;XmlValidatingReader;ReadString;();Argument[this].Property[System.Xml.XmlReader.Value];ReturnValue;taint;df-generated |
+| System.Xml;XmlValidatingReader;ReadString;();Argument[this].Property[System.Xml.XmlReader.Value];ReturnValue;taint;dfc-generated |
 | System.Xml;XmlValidatingReader;ReadTypedValue;();Argument[this];ReturnValue;taint;df-generated |
 | System.Xml;XmlValidatingReader;XmlValidatingReader;(System.IO.Stream,System.Xml.XmlNodeType,System.Xml.XmlParserContext);Argument[2];Argument[this];taint;df-generated |
 | System.Xml;XmlValidatingReader;XmlValidatingReader;(System.String,System.Xml.XmlNodeType,System.Xml.XmlParserContext);Argument[2];Argument[this];taint;df-generated |
@@ -14081,6 +15282,8 @@
 | System.Xml;XmlWriter;Create;(System.String);Argument[0];ReturnValue;taint;df-generated |
 | System.Xml;XmlWriter;Create;(System.String,System.Xml.XmlWriterSettings);Argument[0];ReturnValue;taint;df-generated |
 | System.Xml;XmlWriter;Create;(System.String,System.Xml.XmlWriterSettings);Argument[1];ReturnValue;taint;df-generated |
+| System.Xml;XmlWriter;Create;(System.Text.StringBuilder);Argument[0];ReturnValue;taint;df-generated |
+| System.Xml;XmlWriter;Create;(System.Text.StringBuilder,System.Xml.XmlWriterSettings);Argument[0];ReturnValue;taint;df-generated |
 | System.Xml;XmlWriter;Create;(System.Text.StringBuilder,System.Xml.XmlWriterSettings);Argument[1];ReturnValue;taint;df-generated |
 | System.Xml;XmlWriter;Create;(System.Xml.XmlWriter);Argument[0];ReturnValue;taint;df-generated |
 | System.Xml;XmlWriter;Create;(System.Xml.XmlWriter,System.Xml.XmlWriterSettings);Argument[0];ReturnValue;taint;df-generated |
@@ -14125,7 +15328,6 @@
 | System.Xml;XmlWriter;WriteNode;(System.Xml.XmlReader,System.Boolean);Argument[0];Argument[this];taint;df-generated |
 | System.Xml;XmlWriter;WriteNodeAsync;(System.Xml.XmlReader,System.Boolean);Argument[0];Argument[this];taint;df-generated |
 | System.Xml;XmlWriter;WriteProcessingInstruction;(System.String,System.String);Argument[0];Argument[this];taint;df-generated |
-| System.Xml;XmlWriter;WriteProcessingInstruction;(System.String,System.String);Argument[1];Argument[this];taint;df-generated |
 | System.Xml;XmlWriter;WriteQualifiedName;(System.String,System.String);Argument[0];Argument[this];taint;df-generated |
 | System.Xml;XmlWriter;WriteQualifiedNameAsync;(System.String,System.String);Argument[0];Argument[this];taint;df-generated |
 | System.Xml;XmlWriter;WriteRaw;(System.Char[],System.Int32,System.Int32);Argument[0].Element;Argument[this];taint;df-generated |
@@ -14166,13 +15368,17 @@
 | System;Action<T1,T2,T3>;BeginInvoke;(T1,T2,T3,System.AsyncCallback,System.Object);Argument[3];Argument[3].Parameter[delegate-self];value;hq-generated |
 | System;Action<T1,T2>;BeginInvoke;(T1,T2,System.AsyncCallback,System.Object);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
 | System;Action<T>;BeginInvoke;(T,System.AsyncCallback,System.Object);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
-| System;AggregateException;AggregateException;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);Argument[0];Argument[this];taint;df-generated |
-| System;AggregateException;AggregateException;(System.String,System.Exception);Argument[1];Argument[this];taint;df-generated |
+| System;AggregateException;AggregateException;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);Argument[0].SyntheticField[System.Runtime.Serialization.SerializationInfo._values].Element;Argument[this].SyntheticField[System.AggregateException._innerExceptions];value;dfc-generated |
+| System;AggregateException;AggregateException;(System.String,System.Exception);Argument[1];Argument[this].SyntheticField[System.AggregateException._innerExceptions].Element;value;dfc-generated |
 | System;AggregateException;GetBaseException;();Argument[this];ReturnValue;taint;df-generated |
+| System;AggregateException;Handle;(System.Func<System.Exception,System.Boolean>);Argument[0];Argument[0].Parameter[delegate-self];value;dfc-generated |
 | System;AggregateException;Handle;(System.Func<System.Exception,System.Boolean>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
-| System;AggregateException;get_Message;();Argument[this];ReturnValue;taint;df-generated |
-| System;AppDomain;ApplyPolicy;(System.String);Argument[0];ReturnValue;taint;df-generated |
-| System;AppDomain;ToString;();Argument[this];ReturnValue;taint;df-generated |
+| System;AggregateException;Handle;(System.Func<System.Exception,System.Boolean>);Argument[this].SyntheticField[System.AggregateException._innerExceptions].Element;Argument[0].Parameter[0];value;dfc-generated |
+| System;AggregateException;Handle;(System.Func<System.Exception,System.Boolean>);Argument[this].SyntheticField[System.AggregateException._innerExceptions].Element;Argument[0].Parameter[0];value;hq-generated |
+| System;AggregateException;get_Message;();Argument[this].Property[System.Exception.Message];ReturnValue;value;dfc-generated |
+| System;AggregateException;get_Message;();Argument[this].SyntheticField[System.Exception._message];ReturnValue;value;dfc-generated |
+| System;AppDomain;ApplyPolicy;(System.String);Argument[0];ReturnValue;value;dfc-generated |
+| System;AppDomain;ToString;();Argument[this].Property[System.AppDomain.FriendlyName];ReturnValue;taint;dfc-generated |
 | System;AppDomain;add_AssemblyLoad;(System.AssemblyLoadEventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System;AppDomain;add_AssemblyResolve;(System.ResolveEventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System;AppDomain;add_DomainUnload;(System.EventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
@@ -14191,66 +15397,108 @@
 | System;AppDomain;remove_ResourceResolve;(System.ResolveEventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System;AppDomain;remove_TypeResolve;(System.ResolveEventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System;AppDomain;remove_UnhandledException;(System.UnhandledExceptionEventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
-| System;ApplicationId;ApplicationId;(System.Byte[],System.String,System.Version,System.String,System.String);Argument[0].Element;Argument[this];taint;df-generated |
-| System;ApplicationId;Copy;();Argument[this];ReturnValue;taint;df-generated |
-| System;ApplicationId;get_PublicKeyToken;();Argument[this];ReturnValue;taint;df-generated |
-| System;ArgumentException;ArgumentException;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);Argument[0];Argument[this];taint;df-generated |
-| System;ArgumentException;ArgumentException;(System.String,System.String);Argument[1];Argument[this];taint;df-generated |
-| System;ArgumentException;ArgumentException;(System.String,System.String,System.Exception);Argument[1];Argument[this];taint;df-generated |
-| System;ArgumentException;get_Message;();Argument[this];ReturnValue;taint;df-generated |
-| System;ArgumentException;get_ParamName;();Argument[this];ReturnValue;taint;df-generated |
-| System;ArgumentOutOfRangeException;ArgumentOutOfRangeException;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);Argument[0];Argument[this];taint;df-generated |
-| System;ArgumentOutOfRangeException;ArgumentOutOfRangeException;(System.String,System.Object,System.String);Argument[1];Argument[this];taint;df-generated |
-| System;ArgumentOutOfRangeException;get_ActualValue;();Argument[this];ReturnValue;taint;df-generated |
-| System;ArgumentOutOfRangeException;get_Message;();Argument[this];ReturnValue;taint;df-generated |
+| System;ApplicationId;ApplicationId;(System.Byte[],System.String,System.Version,System.String,System.String);Argument[0].Element;Argument[this].SyntheticField[System.ApplicationId._publicKeyToken].Element;value;dfc-generated |
+| System;ApplicationId;Copy;();Argument[this].SyntheticField[System.ApplicationId._publicKeyToken].Element;ReturnValue.SyntheticField[System.ApplicationId._publicKeyToken].Element;value;dfc-generated |
+| System;ApplicationId;get_PublicKeyToken;();Argument[this].SyntheticField[System.ApplicationId._publicKeyToken].Element;ReturnValue.Element;value;dfc-generated |
+| System;ArgumentException;ArgumentException;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);Argument[0].SyntheticField[System.Runtime.Serialization.SerializationInfo._values].Element;Argument[this].SyntheticField[System.ArgumentException._paramName];value;dfc-generated |
+| System;ArgumentException;ArgumentException;(System.String,System.String);Argument[1];Argument[this].SyntheticField[System.ArgumentException._paramName];value;dfc-generated |
+| System;ArgumentException;ArgumentException;(System.String,System.String,System.Exception);Argument[1];Argument[this].SyntheticField[System.ArgumentException._paramName];value;dfc-generated |
+| System;ArgumentException;get_Message;();Argument[this].Property[System.Exception.Message];ReturnValue;value;dfc-generated |
+| System;ArgumentException;get_Message;();Argument[this].SyntheticField[System.ArgumentException._paramName];ReturnValue;taint;dfc-generated |
+| System;ArgumentException;get_Message;();Argument[this].SyntheticField[System.Exception._message];ReturnValue;value;dfc-generated |
+| System;ArgumentException;get_ParamName;();Argument[this].SyntheticField[System.ArgumentException._paramName];ReturnValue;value;dfc-generated |
+| System;ArgumentOutOfRangeException;ArgumentOutOfRangeException;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);Argument[0].SyntheticField[System.Runtime.Serialization.SerializationInfo._values].Element;Argument[this].SyntheticField[System.ArgumentOutOfRangeException._actualValue];value;dfc-generated |
+| System;ArgumentOutOfRangeException;ArgumentOutOfRangeException;(System.String,System.Object,System.String);Argument[1];Argument[this].SyntheticField[System.ArgumentOutOfRangeException._actualValue];value;dfc-generated |
+| System;ArgumentOutOfRangeException;get_ActualValue;();Argument[this].SyntheticField[System.ArgumentOutOfRangeException._actualValue];ReturnValue;value;dfc-generated |
+| System;ArgumentOutOfRangeException;get_Message;();Argument[this].Property[System.Exception.Message];ReturnValue;value;dfc-generated |
+| System;ArgumentOutOfRangeException;get_Message;();Argument[this].SyntheticField[System.ArgumentException._paramName];ReturnValue;taint;dfc-generated |
+| System;ArgumentOutOfRangeException;get_Message;();Argument[this].SyntheticField[System.Exception._message];ReturnValue;value;dfc-generated |
 | System;Array;AsReadOnly<T>;(T[]);Argument[0].Element;ReturnValue.Element;value;manual |
 | System;Array;Clear;(System.Array);Argument[0].WithoutElement;Argument[0];value;manual |
 | System;Array;Clear;(System.Array,System.Int32,System.Int32);Argument[0].WithoutElement;Argument[0];value;manual |
 | System;Array;Clone;();Argument[this].Element;ReturnValue.Element;value;manual |
+| System;Array;ConvertAll<TInput,TOutput>;(TInput[],System.Converter<TInput,TOutput>);Argument[0].Element;Argument[1].Parameter[0];value;dfc-generated |
+| System;Array;ConvertAll<TInput,TOutput>;(TInput[],System.Converter<TInput,TOutput>);Argument[0].Element;Argument[1].Parameter[0];value;hq-generated |
+| System;Array;ConvertAll<TInput,TOutput>;(TInput[],System.Converter<TInput,TOutput>);Argument[1].ReturnValue;ReturnValue.Element;value;dfc-generated |
+| System;Array;ConvertAll<TInput,TOutput>;(TInput[],System.Converter<TInput,TOutput>);Argument[1].ReturnValue;ReturnValue.Element;value;hq-generated |
+| System;Array;ConvertAll<TInput,TOutput>;(TInput[],System.Converter<TInput,TOutput>);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | System;Array;ConvertAll<TInput,TOutput>;(TInput[],System.Converter<TInput,TOutput>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
 | System;Array;CopyTo;(System.Array,System.Int64);Argument[this].Element;Argument[0].Element;value;manual |
+| System;Array;Exists<T>;(T[],System.Predicate<T>);Argument[0].Element;Argument[1].Parameter[0];value;dfc-generated |
+| System;Array;Exists<T>;(T[],System.Predicate<T>);Argument[0].Element;Argument[1].Parameter[0];value;hq-generated |
+| System;Array;Exists<T>;(T[],System.Predicate<T>);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | System;Array;Exists<T>;(T[],System.Predicate<T>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
-| System;Array;Fill<T>;(T[],T);Argument[1];Argument[0].Element;taint;df-generated |
-| System;Array;Fill<T>;(T[],T,System.Int32,System.Int32);Argument[1];Argument[0].Element;taint;df-generated |
+| System;Array;Fill<T>;(T[],T);Argument[1];Argument[0].Element;value;dfc-generated |
+| System;Array;Fill<T>;(T[],T,System.Int32,System.Int32);Argument[1];Argument[0].Element;value;dfc-generated |
 | System;Array;Find<T>;(T[],System.Predicate<T>);Argument[0].Element;Argument[1].Parameter[0];value;manual |
 | System;Array;Find<T>;(T[],System.Predicate<T>);Argument[0].Element;ReturnValue;value;manual |
 | System;Array;Find<T>;(T[],System.Predicate<T>);Argument[1];Argument[1].Parameter[delegate-self];value;manual |
 | System;Array;FindAll<T>;(T[],System.Predicate<T>);Argument[0].Element;Argument[1].Parameter[0];value;manual |
 | System;Array;FindAll<T>;(T[],System.Predicate<T>);Argument[0].Element;ReturnValue;value;manual |
 | System;Array;FindAll<T>;(T[],System.Predicate<T>);Argument[1];Argument[1].Parameter[delegate-self];value;manual |
+| System;Array;FindIndex<T>;(T[],System.Int32,System.Int32,System.Predicate<T>);Argument[0].Element;Argument[3].Parameter[0];value;dfc-generated |
+| System;Array;FindIndex<T>;(T[],System.Int32,System.Int32,System.Predicate<T>);Argument[0].Element;Argument[3].Parameter[0];value;hq-generated |
+| System;Array;FindIndex<T>;(T[],System.Int32,System.Int32,System.Predicate<T>);Argument[3];Argument[3].Parameter[delegate-self];value;dfc-generated |
 | System;Array;FindIndex<T>;(T[],System.Int32,System.Int32,System.Predicate<T>);Argument[3];Argument[3].Parameter[delegate-self];value;hq-generated |
+| System;Array;FindIndex<T>;(T[],System.Int32,System.Predicate<T>);Argument[0].Element;Argument[2].Parameter[0];value;dfc-generated |
+| System;Array;FindIndex<T>;(T[],System.Int32,System.Predicate<T>);Argument[0].Element;Argument[2].Parameter[0];value;hq-generated |
+| System;Array;FindIndex<T>;(T[],System.Int32,System.Predicate<T>);Argument[2];Argument[2].Parameter[delegate-self];value;dfc-generated |
 | System;Array;FindIndex<T>;(T[],System.Int32,System.Predicate<T>);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
+| System;Array;FindIndex<T>;(T[],System.Predicate<T>);Argument[0].Element;Argument[1].Parameter[0];value;dfc-generated |
+| System;Array;FindIndex<T>;(T[],System.Predicate<T>);Argument[0].Element;Argument[1].Parameter[0];value;hq-generated |
+| System;Array;FindIndex<T>;(T[],System.Predicate<T>);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | System;Array;FindIndex<T>;(T[],System.Predicate<T>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
 | System;Array;FindLast<T>;(T[],System.Predicate<T>);Argument[0].Element;Argument[1].Parameter[0];value;manual |
 | System;Array;FindLast<T>;(T[],System.Predicate<T>);Argument[0].Element;ReturnValue;value;manual |
 | System;Array;FindLast<T>;(T[],System.Predicate<T>);Argument[1];Argument[1].Parameter[delegate-self];value;manual |
+| System;Array;FindLastIndex<T>;(T[],System.Int32,System.Int32,System.Predicate<T>);Argument[0].Element;Argument[3].Parameter[0];value;dfc-generated |
+| System;Array;FindLastIndex<T>;(T[],System.Int32,System.Int32,System.Predicate<T>);Argument[0].Element;Argument[3].Parameter[0];value;hq-generated |
+| System;Array;FindLastIndex<T>;(T[],System.Int32,System.Int32,System.Predicate<T>);Argument[3];Argument[3].Parameter[delegate-self];value;dfc-generated |
 | System;Array;FindLastIndex<T>;(T[],System.Int32,System.Int32,System.Predicate<T>);Argument[3];Argument[3].Parameter[delegate-self];value;hq-generated |
+| System;Array;FindLastIndex<T>;(T[],System.Int32,System.Predicate<T>);Argument[0].Element;Argument[2].Parameter[0];value;dfc-generated |
+| System;Array;FindLastIndex<T>;(T[],System.Int32,System.Predicate<T>);Argument[0].Element;Argument[2].Parameter[0];value;hq-generated |
+| System;Array;FindLastIndex<T>;(T[],System.Int32,System.Predicate<T>);Argument[2];Argument[2].Parameter[delegate-self];value;dfc-generated |
 | System;Array;FindLastIndex<T>;(T[],System.Int32,System.Predicate<T>);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
+| System;Array;FindLastIndex<T>;(T[],System.Predicate<T>);Argument[0].Element;Argument[1].Parameter[0];value;dfc-generated |
+| System;Array;FindLastIndex<T>;(T[],System.Predicate<T>);Argument[0].Element;Argument[1].Parameter[0];value;hq-generated |
+| System;Array;FindLastIndex<T>;(T[],System.Predicate<T>);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | System;Array;FindLastIndex<T>;(T[],System.Predicate<T>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
+| System;Array;ForEach<T>;(T[],System.Action<T>);Argument[0].Element;Argument[1].Parameter[0];value;dfc-generated |
+| System;Array;ForEach<T>;(T[],System.Action<T>);Argument[0].Element;Argument[1].Parameter[0];value;hq-generated |
+| System;Array;ForEach<T>;(T[],System.Action<T>);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | System;Array;ForEach<T>;(T[],System.Action<T>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
+| System;Array;Resize<T>;(T[],System.Int32);Argument[0];ReturnValue;value;dfc-generated |
 | System;Array;Reverse;(System.Array);Argument[0].Element;ReturnValue.Element;value;manual |
 | System;Array;Reverse;(System.Array,System.Int32,System.Int32);Argument[0].Element;ReturnValue.Element;value;manual |
 | System;Array;Reverse<T>;(T[]);Argument[0].Element;ReturnValue.Element;value;manual |
 | System;Array;Reverse<T>;(T[],System.Int32,System.Int32);Argument[0].Element;ReturnValue.Element;value;manual |
 | System;Array;Sort<T>;(T[],System.Comparison<T>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
+| System;Array;TrueForAll<T>;(T[],System.Predicate<T>);Argument[0].Element;Argument[1].Parameter[0];value;dfc-generated |
+| System;Array;TrueForAll<T>;(T[],System.Predicate<T>);Argument[0].Element;Argument[1].Parameter[0];value;hq-generated |
+| System;Array;TrueForAll<T>;(T[],System.Predicate<T>);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | System;Array;TrueForAll<T>;(T[],System.Predicate<T>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
-| System;ArraySegment<T>+Enumerator;get_Current;();Argument[this];ReturnValue;taint;df-generated |
-| System;ArraySegment<T>;ArraySegment;(T[]);Argument[0].Element;Argument[this];taint;df-generated |
-| System;ArraySegment<T>;ArraySegment;(T[],System.Int32,System.Int32);Argument[0].Element;Argument[this];taint;df-generated |
-| System;ArraySegment<T>;GetEnumerator;();Argument[this];ReturnValue;taint;df-generated |
-| System;ArraySegment<T>;Slice;(System.Int32);Argument[this];ReturnValue;taint;df-generated |
-| System;ArraySegment<T>;Slice;(System.Int32,System.Int32);Argument[this];ReturnValue;taint;df-generated |
-| System;ArraySegment<T>;get_Array;();Argument[this];ReturnValue;taint;df-generated |
-| System;ArraySegment<T>;get_Item;(System.Int32);Argument[this];ReturnValue;taint;df-generated |
+| System;ArraySegment<T>+Enumerator;get_Current;();Argument[this].Property[System.ArraySegment`1+Enumerator.Current];ReturnValue;value;df-generated |
+| System;ArraySegment<T>+Enumerator;get_Current;();Argument[this].Property[System.ArraySegment`1+Enumerator.Current];ReturnValue;value;dfc-generated |
+| System;ArraySegment<T>+Enumerator;get_Current;();Argument[this].SyntheticField[System.ArraySegment`1+Enumerator._array].Element;ReturnValue;value;df-generated |
+| System;ArraySegment<T>+Enumerator;get_Current;();Argument[this].SyntheticField[System.ArraySegment`1+Enumerator._array].Element;ReturnValue;value;dfc-generated |
+| System;ArraySegment<T>;ArraySegment;(T[]);Argument[0];Argument[this].SyntheticField[System.ArraySegment`1._array];value;dfc-generated |
+| System;ArraySegment<T>;ArraySegment;(T[],System.Int32,System.Int32);Argument[0];Argument[this].SyntheticField[System.ArraySegment`1._array];value;dfc-generated |
+| System;ArraySegment<T>;GetEnumerator;();Argument[this].Property[System.ArraySegment`1.Array];ReturnValue.SyntheticField[System.ArraySegment`1+Enumerator._array];value;dfc-generated |
+| System;ArraySegment<T>;GetEnumerator;();Argument[this].SyntheticField[System.ArraySegment`1._array];ReturnValue.SyntheticField[System.ArraySegment`1+Enumerator._array];value;dfc-generated |
+| System;ArraySegment<T>;Slice;(System.Int32);Argument[this].SyntheticField[System.ArraySegment`1._array];ReturnValue.SyntheticField[System.ArraySegment`1._array];value;dfc-generated |
+| System;ArraySegment<T>;Slice;(System.Int32,System.Int32);Argument[this].SyntheticField[System.ArraySegment`1._array];ReturnValue.SyntheticField[System.ArraySegment`1._array];value;dfc-generated |
+| System;ArraySegment<T>;get_Array;();Argument[this].SyntheticField[System.ArraySegment`1._array];ReturnValue;value;dfc-generated |
+| System;ArraySegment<T>;get_Item;(System.Int32);Argument[this].SyntheticField[System.ArraySegment`1._array].Element;ReturnValue;value;dfc-generated |
 | System;AssemblyLoadEventHandler;BeginInvoke;(System.Object,System.AssemblyLoadEventArgs,System.AsyncCallback,System.Object);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
 | System;AsyncCallback;BeginInvoke;(System.IAsyncResult,System.AsyncCallback,System.Object);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
 | System;Attribute;get_TypeId;();Argument[this];ReturnValue;taint;df-generated |
-| System;BadImageFormatException;BadImageFormatException;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);Argument[0];Argument[this];taint;df-generated |
-| System;BadImageFormatException;BadImageFormatException;(System.String,System.String);Argument[1];Argument[this];taint;df-generated |
-| System;BadImageFormatException;BadImageFormatException;(System.String,System.String,System.Exception);Argument[1];Argument[this];taint;df-generated |
-| System;BadImageFormatException;get_FileName;();Argument[this];ReturnValue;taint;df-generated |
-| System;BadImageFormatException;get_FusionLog;();Argument[this];ReturnValue;taint;df-generated |
-| System;BadImageFormatException;get_Message;();Argument[this];ReturnValue;taint;df-generated |
+| System;BadImageFormatException;BadImageFormatException;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);Argument[0].SyntheticField[System.Runtime.Serialization.SerializationInfo._values].Element;Argument[this].SyntheticField[System.BadImageFormatException._fileName];value;dfc-generated |
+| System;BadImageFormatException;BadImageFormatException;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);Argument[0].SyntheticField[System.Runtime.Serialization.SerializationInfo._values].Element;Argument[this].SyntheticField[System.BadImageFormatException._fusionLog];value;dfc-generated |
+| System;BadImageFormatException;BadImageFormatException;(System.String,System.String);Argument[1];Argument[this].SyntheticField[System.BadImageFormatException._fileName];value;dfc-generated |
+| System;BadImageFormatException;BadImageFormatException;(System.String,System.String,System.Exception);Argument[1];Argument[this].SyntheticField[System.BadImageFormatException._fileName];value;dfc-generated |
+| System;BadImageFormatException;get_FileName;();Argument[this].SyntheticField[System.BadImageFormatException._fileName];ReturnValue;value;dfc-generated |
+| System;BadImageFormatException;get_FusionLog;();Argument[this].SyntheticField[System.BadImageFormatException._fusionLog];ReturnValue;value;dfc-generated |
+| System;BadImageFormatException;get_Message;();Argument[this].SyntheticField[System.Exception._message];ReturnValue;value;dfc-generated |
 | System;Boolean;Parse;(System.String);Argument[0];ReturnValue;taint;manual |
 | System;Boolean;TryParse;(System.ReadOnlySpan<System.Char>,System.Boolean);Argument[0].Element;Argument[1];taint;manual |
 | System;Boolean;TryParse;(System.ReadOnlySpan<System.Char>,System.Boolean);Argument[0].Element;ReturnValue;taint;manual |
@@ -14589,39 +15837,34 @@
 | System;Convert;TryToBase64Chars;(System.ReadOnlySpan<System.Byte>,System.Span<System.Char>,System.Int32,System.Base64FormattingOptions);Argument[0].Element;ReturnValue;taint;manual |
 | System;Converter<TInput,TOutput>;BeginInvoke;(TInput,System.AsyncCallback,System.Object);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
 | System;DateTime;ToLocalTime;();Argument[this];ReturnValue;value;df-generated |
-| System;DateTimeOffset;Deconstruct;(System.DateOnly,System.TimeOnly,System.TimeSpan);Argument[this];ReturnValue;taint;df-generated |
-| System;Delegate;Combine;(System.Delegate,System.Delegate);Argument[0];ReturnValue;taint;df-generated |
-| System;Delegate;Combine;(System.Delegate,System.Delegate);Argument[1];ReturnValue;taint;df-generated |
-| System;Delegate;Combine;(System.Delegate[]);Argument[0].Element;ReturnValue;taint;df-generated |
-| System;Delegate;CombineImpl;(System.Delegate);Argument[this];ReturnValue;value;df-generated |
+| System;DateTimeOffset;Deconstruct;(System.DateOnly,System.TimeOnly,System.TimeSpan);Argument[this].Property[System.DateTimeOffset.Offset];ReturnValue;value;dfc-generated |
+| System;Delegate;Combine;(System.Delegate,System.Delegate);Argument[1];ReturnValue;value;dfc-generated |
+| System;Delegate;Combine;(System.Delegate[]);Argument[0].Element;ReturnValue;value;dfc-generated |
+| System;Delegate;CombineImpl;(System.Delegate);Argument[this];ReturnValue;value;dfc-generated |
 | System;Delegate;CreateDelegate;(System.Type,System.Reflection.MethodInfo,System.Boolean);Argument[1];ReturnValue;taint;df-generated |
-| System;Delegate;Delegate;(System.Object,System.String);Argument[0];Argument[this];taint;df-generated |
-| System;Delegate;Delegate;(System.Object,System.String);Argument[1];Argument[this];taint;df-generated |
+| System;Delegate;Delegate;(System.Object,System.String);Argument[0];Argument[this].SyntheticField[System.Delegate._target];value;dfc-generated |
 | System;Delegate;Delegate;(System.Type,System.String);Argument[1];Argument[this];taint;df-generated |
-| System;Delegate;DynamicInvoke;(System.Object[]);Argument[this];Argument[0].Element;taint;df-generated |
-| System;Delegate;DynamicInvokeImpl;(System.Object[]);Argument[this];Argument[0].Element;taint;df-generated |
-| System;Delegate;GetInvocationList;();Argument[this];ReturnValue;taint;df-generated |
+| System;Delegate;DynamicInvoke;(System.Object[]);Argument[this].SyntheticField[System.Delegate._target];Argument[0].Element;value;dfc-generated |
+| System;Delegate;DynamicInvokeImpl;(System.Object[]);Argument[this].SyntheticField[System.Delegate._target];Argument[0].Element;value;dfc-generated |
+| System;Delegate;GetInvocationList;();Argument[this];ReturnValue.Element;value;dfc-generated |
 | System;Delegate;GetMethodImpl;();Argument[this];ReturnValue;taint;df-generated |
-| System;Delegate;Remove;(System.Delegate,System.Delegate);Argument[0];ReturnValue;taint;df-generated |
-| System;Delegate;RemoveAll;(System.Delegate,System.Delegate);Argument[0];ReturnValue;taint;df-generated |
-| System;Delegate;RemoveImpl;(System.Delegate);Argument[this];ReturnValue;taint;df-generated |
-| System;Delegate;RemoveImpl;(System.Delegate);Argument[this];ReturnValue;value;df-generated |
-| System;Delegate;get_Method;();Argument[this];ReturnValue;taint;df-generated |
-| System;Delegate;get_Target;();Argument[this];ReturnValue;taint;df-generated |
-| System;Environment;ExpandEnvironmentVariables;(System.String);Argument[0];ReturnValue;taint;df-generated |
+| System;Delegate;Remove;(System.Delegate,System.Delegate);Argument[0];ReturnValue;value;dfc-generated |
+| System;Delegate;RemoveAll;(System.Delegate,System.Delegate);Argument[0];ReturnValue;value;dfc-generated |
+| System;Delegate;RemoveImpl;(System.Delegate);Argument[this];ReturnValue;value;dfc-generated |
+| System;Delegate;get_Target;();Argument[this].SyntheticField[System.Delegate._target];ReturnValue;value;dfc-generated |
+| System;Environment;ExpandEnvironmentVariables;(System.String);Argument[0];ReturnValue;value;dfc-generated |
 | System;EventHandler;BeginInvoke;(System.Object,System.EventArgs,System.AsyncCallback,System.Object);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
 | System;EventHandler<TEventArgs>;BeginInvoke;(System.Object,TEventArgs,System.AsyncCallback,System.Object);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
 | System;Exception;Exception;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);Argument[0];Argument[this];taint;df-generated |
-| System;Exception;Exception;(System.String);Argument[0];Argument[this];taint;df-generated |
-| System;Exception;Exception;(System.String,System.Exception);Argument[0];Argument[this];taint;df-generated |
-| System;Exception;Exception;(System.String,System.Exception);Argument[1];Argument[this];taint;df-generated |
+| System;Exception;Exception;(System.String);Argument[0];Argument[this].SyntheticField[System.Exception._message];value;dfc-generated |
+| System;Exception;Exception;(System.String,System.Exception);Argument[0];Argument[this].SyntheticField[System.Exception._message];value;dfc-generated |
+| System;Exception;Exception;(System.String,System.Exception);Argument[1];Argument[this].SyntheticField[System.Exception._innerException];value;dfc-generated |
 | System;Exception;GetBaseException;();Argument[this];ReturnValue;taint;df-generated |
 | System;Exception;ToString;();Argument[this];ReturnValue;taint;df-generated |
 | System;Exception;add_SerializeObjectState;(System.EventHandler<System.Runtime.Serialization.SafeSerializationEventArgs>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
-| System;Exception;get_InnerException;();Argument[this];ReturnValue;taint;df-generated |
-| System;Exception;get_Message;();Argument[this];ReturnValue;taint;df-generated |
-| System;Exception;get_StackTrace;();Argument[this];ReturnValue;taint;df-generated |
-| System;Exception;get_TargetSite;();Argument[this];ReturnValue;taint;df-generated |
+| System;Exception;get_InnerException;();Argument[this].SyntheticField[System.Exception._innerException];ReturnValue;value;dfc-generated |
+| System;Exception;get_Message;();Argument[this].SyntheticField[System.Exception._message];ReturnValue;value;dfc-generated |
+| System;Exception;get_StackTrace;();Argument[this].SyntheticField[System.Exception._remoteStackTraceString];ReturnValue;value;dfc-generated |
 | System;Exception;remove_SerializeObjectState;(System.EventHandler<System.Runtime.Serialization.SafeSerializationEventArgs>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System;FormattableString;CurrentCulture;(System.FormattableString);Argument[0];ReturnValue;taint;df-generated |
 | System;FormattableString;GetArgument;(System.Int32);Argument[this];ReturnValue;taint;df-generated |
@@ -14650,28 +15893,25 @@
 | System;GC;RegisterNoGCRegionCallback;(System.Int64,System.Action);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
 | System;GCMemoryInfo;get_GenerationInfo;();Argument[this];ReturnValue;taint;df-generated |
 | System;GCMemoryInfo;get_PauseDurations;();Argument[this];ReturnValue;taint;df-generated |
-| System;Half;BitDecrement;(System.Half);Argument[0];ReturnValue;taint;df-generated |
-| System;Half;BitIncrement;(System.Half);Argument[0];ReturnValue;taint;df-generated |
-| System;Half;MaxMagnitudeNumber;(System.Half,System.Half);Argument[0];ReturnValue;taint;df-generated |
-| System;Half;MaxMagnitudeNumber;(System.Half,System.Half);Argument[1];ReturnValue;taint;df-generated |
-| System;Half;MinMagnitudeNumber;(System.Half,System.Half);Argument[0];ReturnValue;taint;df-generated |
-| System;Half;MinMagnitudeNumber;(System.Half,System.Half);Argument[1];ReturnValue;taint;df-generated |
+| System;Half;BitDecrement;(System.Half);Argument[0];ReturnValue;value;dfc-generated |
+| System;Half;BitIncrement;(System.Half);Argument[0];ReturnValue;value;dfc-generated |
+| System;Half;MaxMagnitudeNumber;(System.Half,System.Half);Argument[0];ReturnValue;value;dfc-generated |
+| System;Half;MaxMagnitudeNumber;(System.Half,System.Half);Argument[1];ReturnValue;value;dfc-generated |
+| System;Half;MinMagnitudeNumber;(System.Half,System.Half);Argument[0];ReturnValue;value;dfc-generated |
+| System;Half;MinMagnitudeNumber;(System.Half,System.Half);Argument[1];ReturnValue;value;dfc-generated |
 | System;Half;ToString;(System.IFormatProvider);Argument[0];ReturnValue;taint;df-generated |
+| System;HashCode;Add<T>;(T,System.Collections.Generic.IEqualityComparer<T>);Argument[0];Argument[1];taint;df-generated |
 | System;IAsyncDisposable;DisposeAsync;();Argument[this];ReturnValue;taint;df-generated |
 | System;IAsyncResult;get_AsyncState;();Argument[this];ReturnValue;taint;df-generated |
 | System;IAsyncResult;get_AsyncWaitHandle;();Argument[this];ReturnValue;taint;df-generated |
-| System;ICloneable;Clone;();Argument[this];ReturnValue;taint;df-generated |
-| System;ICloneable;Clone;();Argument[this];ReturnValue;value;df-generated |
+| System;ICloneable;Clone;();Argument[this];ReturnValue;value;dfc-generated |
 | System;IConvertible;ToDateTime;(System.IFormatProvider);Argument[this];ReturnValue;value;df-generated |
 | System;IConvertible;ToDecimal;(System.IFormatProvider);Argument[this];ReturnValue;value;df-generated |
-| System;IConvertible;ToString;(System.IFormatProvider);Argument[0];ReturnValue;taint;df-generated |
-| System;IConvertible;ToString;(System.IFormatProvider);Argument[this];ReturnValue;value;df-generated |
-| System;IConvertible;ToType;(System.Type,System.IFormatProvider);Argument[1];ReturnValue;taint;df-generated |
-| System;IConvertible;ToType;(System.Type,System.IFormatProvider);Argument[this];ReturnValue;taint;df-generated |
-| System;IFormatProvider;GetFormat;(System.Type);Argument[this];ReturnValue;taint;df-generated |
-| System;IFormattable;ToString;(System.String,System.IFormatProvider);Argument[1];ReturnValue;taint;df-generated |
-| System;IFormattable;ToString;(System.String,System.IFormatProvider);Argument[this];ReturnValue;taint;df-generated |
-| System;IServiceProvider;GetService;(System.Type);Argument[this];ReturnValue;taint;df-generated |
+| System;IConvertible;ToString;(System.IFormatProvider);Argument[this];ReturnValue;value;dfc-generated |
+| System;IConvertible;ToType;(System.Type,System.IFormatProvider);Argument[this];ReturnValue;value;dfc-generated |
+| System;IFormatProvider;GetFormat;(System.Type);Argument[this];ReturnValue;value;dfc-generated |
+| System;IFormattable;ToString;(System.String,System.IFormatProvider);Argument[this];ReturnValue;taint;dfc-generated |
+| System;IServiceProvider;GetService;(System.Type);Argument[this];ReturnValue;value;dfc-generated |
 | System;Int32;Parse;(System.ReadOnlySpan<System.Char>,System.Globalization.NumberStyles,System.IFormatProvider);Argument[0].Element;ReturnValue;taint;manual |
 | System;Int32;Parse;(System.String);Argument[0];ReturnValue;taint;manual |
 | System;Int32;Parse;(System.String,System.Globalization.NumberStyles);Argument[0];ReturnValue;taint;manual |
@@ -14685,35 +15925,44 @@
 | System;Int32;TryParse;(System.String,System.Globalization.NumberStyles,System.IFormatProvider,System.Int32);Argument[0];ReturnValue;taint;manual |
 | System;Int32;TryParse;(System.String,System.Int32);Argument[0];Argument[1];taint;manual |
 | System;Int32;TryParse;(System.String,System.Int32);Argument[0];ReturnValue;taint;manual |
-| System;Int128;Abs;(System.Int128);Argument[0];ReturnValue;taint;df-generated |
-| System;Int128;MaxMagnitude;(System.Int128,System.Int128);Argument[0];ReturnValue;taint;df-generated |
-| System;Int128;MaxMagnitude;(System.Int128,System.Int128);Argument[1];ReturnValue;taint;df-generated |
-| System;Int128;MaxMagnitudeNumber;(System.Int128,System.Int128);Argument[0];ReturnValue;taint;df-generated |
-| System;Int128;MaxMagnitudeNumber;(System.Int128,System.Int128);Argument[1];ReturnValue;taint;df-generated |
-| System;Int128;MinMagnitude;(System.Int128,System.Int128);Argument[0];ReturnValue;taint;df-generated |
-| System;Int128;MinMagnitude;(System.Int128,System.Int128);Argument[1];ReturnValue;taint;df-generated |
-| System;Int128;MinMagnitudeNumber;(System.Int128,System.Int128);Argument[0];ReturnValue;taint;df-generated |
-| System;Int128;MinMagnitudeNumber;(System.Int128,System.Int128);Argument[1];ReturnValue;taint;df-generated |
-| System;IntPtr;Abs;(System.IntPtr);Argument[0];ReturnValue;taint;df-generated |
-| System;IntPtr;Add;(System.IntPtr,System.Int32);Argument[0];ReturnValue;taint;df-generated |
-| System;IntPtr;MaxMagnitude;(System.IntPtr,System.IntPtr);Argument[0];ReturnValue;taint;df-generated |
-| System;IntPtr;MaxMagnitude;(System.IntPtr,System.IntPtr);Argument[1];ReturnValue;taint;df-generated |
-| System;IntPtr;MaxMagnitudeNumber;(System.IntPtr,System.IntPtr);Argument[0];ReturnValue;taint;df-generated |
-| System;IntPtr;MaxMagnitudeNumber;(System.IntPtr,System.IntPtr);Argument[1];ReturnValue;taint;df-generated |
-| System;IntPtr;MinMagnitude;(System.IntPtr,System.IntPtr);Argument[0];ReturnValue;taint;df-generated |
-| System;IntPtr;MinMagnitude;(System.IntPtr,System.IntPtr);Argument[1];ReturnValue;taint;df-generated |
-| System;IntPtr;MinMagnitudeNumber;(System.IntPtr,System.IntPtr);Argument[0];ReturnValue;taint;df-generated |
-| System;IntPtr;MinMagnitudeNumber;(System.IntPtr,System.IntPtr);Argument[1];ReturnValue;taint;df-generated |
-| System;IntPtr;System.Numerics.IAdditionOperators<nint,nint,nint>.op_Addition;(System.IntPtr,System.IntPtr);Argument[0];ReturnValue;taint;df-generated |
-| System;IntPtr;System.Numerics.IAdditionOperators<nint,nint,nint>.op_Addition;(System.IntPtr,System.IntPtr);Argument[1];ReturnValue;taint;df-generated |
-| System;IntPtr;op_Addition;(System.IntPtr,System.Int32);Argument[0];ReturnValue;taint;df-generated |
+| System;Int128;Abs;(System.Int128);Argument[0];ReturnValue;value;dfc-generated |
+| System;Int128;MaxMagnitude;(System.Int128,System.Int128);Argument[0];ReturnValue;value;dfc-generated |
+| System;Int128;MaxMagnitude;(System.Int128,System.Int128);Argument[1];ReturnValue;value;dfc-generated |
+| System;Int128;MaxMagnitudeNumber;(System.Int128,System.Int128);Argument[0];ReturnValue;value;dfc-generated |
+| System;Int128;MaxMagnitudeNumber;(System.Int128,System.Int128);Argument[1];ReturnValue;value;dfc-generated |
+| System;Int128;MinMagnitude;(System.Int128,System.Int128);Argument[0];ReturnValue;value;dfc-generated |
+| System;Int128;MinMagnitude;(System.Int128,System.Int128);Argument[1];ReturnValue;value;dfc-generated |
+| System;Int128;MinMagnitudeNumber;(System.Int128,System.Int128);Argument[0];ReturnValue;value;dfc-generated |
+| System;Int128;MinMagnitudeNumber;(System.Int128,System.Int128);Argument[1];ReturnValue;value;dfc-generated |
+| System;IntPtr;Abs;(System.IntPtr);Argument[0];ReturnValue;value;dfc-generated |
+| System;IntPtr;Add;(System.IntPtr,System.Int32);Argument[0];ReturnValue;taint;dfc-generated |
+| System;IntPtr;MaxMagnitude;(System.IntPtr,System.IntPtr);Argument[0];ReturnValue;value;dfc-generated |
+| System;IntPtr;MaxMagnitude;(System.IntPtr,System.IntPtr);Argument[1];ReturnValue;value;dfc-generated |
+| System;IntPtr;MaxMagnitudeNumber;(System.IntPtr,System.IntPtr);Argument[0];ReturnValue;value;dfc-generated |
+| System;IntPtr;MaxMagnitudeNumber;(System.IntPtr,System.IntPtr);Argument[1];ReturnValue;value;dfc-generated |
+| System;IntPtr;MinMagnitude;(System.IntPtr,System.IntPtr);Argument[0];ReturnValue;value;dfc-generated |
+| System;IntPtr;MinMagnitude;(System.IntPtr,System.IntPtr);Argument[1];ReturnValue;value;dfc-generated |
+| System;IntPtr;MinMagnitudeNumber;(System.IntPtr,System.IntPtr);Argument[0];ReturnValue;value;dfc-generated |
+| System;IntPtr;MinMagnitudeNumber;(System.IntPtr,System.IntPtr);Argument[1];ReturnValue;value;dfc-generated |
+| System;IntPtr;System.Numerics.IAdditionOperators<nint,nint,nint>.op_Addition;(System.IntPtr,System.IntPtr);Argument[0];ReturnValue;taint;dfc-generated |
+| System;IntPtr;System.Numerics.IAdditionOperators<nint,nint,nint>.op_Addition;(System.IntPtr,System.IntPtr);Argument[1];ReturnValue;taint;dfc-generated |
+| System;IntPtr;op_Addition;(System.IntPtr,System.Int32);Argument[0];ReturnValue;taint;dfc-generated |
+| System;Lazy<T,TMetadata>;Lazy;(System.Func<T>,TMetadata);Argument[0];Argument[0].Parameter[delegate-self];value;dfc-generated |
 | System;Lazy<T,TMetadata>;Lazy;(System.Func<T>,TMetadata);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
+| System;Lazy<T,TMetadata>;Lazy;(System.Func<T>,TMetadata);Argument[1];Argument[this].SyntheticField[System.Lazy`2._metadata];value;dfc-generated |
+| System;Lazy<T,TMetadata>;Lazy;(System.Func<T>,TMetadata);Argument[1];Argument[this].SyntheticField[System.Lazy`2._metadata];value;hq-generated |
+| System;Lazy<T,TMetadata>;Lazy;(System.Func<T>,TMetadata,System.Boolean);Argument[0];Argument[0].Parameter[delegate-self];value;dfc-generated |
 | System;Lazy<T,TMetadata>;Lazy;(System.Func<T>,TMetadata,System.Boolean);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
+| System;Lazy<T,TMetadata>;Lazy;(System.Func<T>,TMetadata,System.Boolean);Argument[1];Argument[this].SyntheticField[System.Lazy`2._metadata];value;dfc-generated |
+| System;Lazy<T,TMetadata>;Lazy;(System.Func<T>,TMetadata,System.Boolean);Argument[1];Argument[this].SyntheticField[System.Lazy`2._metadata];value;hq-generated |
+| System;Lazy<T,TMetadata>;Lazy;(System.Func<T>,TMetadata,System.Threading.LazyThreadSafetyMode);Argument[0];Argument[0].Parameter[delegate-self];value;dfc-generated |
 | System;Lazy<T,TMetadata>;Lazy;(System.Func<T>,TMetadata,System.Threading.LazyThreadSafetyMode);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
-| System;Lazy<T,TMetadata>;Lazy;(TMetadata);Argument[0];Argument[this];taint;df-generated |
-| System;Lazy<T,TMetadata>;Lazy;(TMetadata,System.Boolean);Argument[0];Argument[this];taint;df-generated |
-| System;Lazy<T,TMetadata>;Lazy;(TMetadata,System.Threading.LazyThreadSafetyMode);Argument[0];Argument[this];taint;df-generated |
-| System;Lazy<T,TMetadata>;get_Metadata;();Argument[this];ReturnValue;taint;df-generated |
+| System;Lazy<T,TMetadata>;Lazy;(System.Func<T>,TMetadata,System.Threading.LazyThreadSafetyMode);Argument[1];Argument[this].SyntheticField[System.Lazy`2._metadata];value;dfc-generated |
+| System;Lazy<T,TMetadata>;Lazy;(System.Func<T>,TMetadata,System.Threading.LazyThreadSafetyMode);Argument[1];Argument[this].SyntheticField[System.Lazy`2._metadata];value;hq-generated |
+| System;Lazy<T,TMetadata>;Lazy;(TMetadata);Argument[0];Argument[this].SyntheticField[System.Lazy`2._metadata];value;dfc-generated |
+| System;Lazy<T,TMetadata>;Lazy;(TMetadata,System.Boolean);Argument[0];Argument[this].SyntheticField[System.Lazy`2._metadata];value;dfc-generated |
+| System;Lazy<T,TMetadata>;Lazy;(TMetadata,System.Threading.LazyThreadSafetyMode);Argument[0];Argument[this].SyntheticField[System.Lazy`2._metadata];value;dfc-generated |
+| System;Lazy<T,TMetadata>;get_Metadata;();Argument[this].SyntheticField[System.Lazy`2._metadata];ReturnValue;value;dfc-generated |
 | System;Lazy<T>;Lazy;(System.Func<T>);Argument[0].ReturnValue;Argument[this].Property[System.Lazy`1.Value];value;manual |
 | System;Lazy<T>;Lazy;(System.Func<T>);Argument[0];Argument[0].Parameter[delegate-self];value;manual |
 | System;Lazy<T>;Lazy;(System.Func<T>,System.Boolean);Argument[0].ReturnValue;Argument[this].Property[System.Lazy`1.Value];value;manual |
@@ -14723,37 +15972,37 @@
 | System;Lazy<T>;Lazy;(T);Argument[0];Argument[this];taint;df-generated |
 | System;Lazy<T>;ToString;();Argument[this];ReturnValue;taint;df-generated |
 | System;Lazy<T>;get_Value;();Argument[this];ReturnValue;taint;manual |
-| System;Math;Abs;(System.IntPtr);Argument[0];ReturnValue;taint;df-generated |
-| System;Math;Clamp;(System.IntPtr,System.IntPtr,System.IntPtr);Argument[0];ReturnValue;taint;df-generated |
-| System;Math;Clamp;(System.IntPtr,System.IntPtr,System.IntPtr);Argument[1];ReturnValue;taint;df-generated |
-| System;Math;Clamp;(System.IntPtr,System.IntPtr,System.IntPtr);Argument[2];ReturnValue;taint;df-generated |
-| System;Math;Clamp;(System.UIntPtr,System.UIntPtr,System.UIntPtr);Argument[0];ReturnValue;taint;df-generated |
-| System;Math;Clamp;(System.UIntPtr,System.UIntPtr,System.UIntPtr);Argument[1];ReturnValue;taint;df-generated |
-| System;Math;Clamp;(System.UIntPtr,System.UIntPtr,System.UIntPtr);Argument[2];ReturnValue;taint;df-generated |
-| System;Math;Max;(System.IntPtr,System.IntPtr);Argument[0];ReturnValue;taint;df-generated |
-| System;Math;Max;(System.IntPtr,System.IntPtr);Argument[1];ReturnValue;taint;df-generated |
-| System;Math;Max;(System.UIntPtr,System.UIntPtr);Argument[0];ReturnValue;taint;df-generated |
-| System;Math;Max;(System.UIntPtr,System.UIntPtr);Argument[1];ReturnValue;taint;df-generated |
-| System;Math;Min;(System.IntPtr,System.IntPtr);Argument[0];ReturnValue;taint;df-generated |
-| System;Math;Min;(System.IntPtr,System.IntPtr);Argument[1];ReturnValue;taint;df-generated |
-| System;Math;Min;(System.UIntPtr,System.UIntPtr);Argument[0];ReturnValue;taint;df-generated |
-| System;Math;Min;(System.UIntPtr,System.UIntPtr);Argument[1];ReturnValue;taint;df-generated |
-| System;Memory<T>;CopyTo;(System.Memory<T>);Argument[this];Argument[0];taint;df-generated |
-| System;Memory<T>;Memory;(T[]);Argument[0].Element;Argument[this];taint;df-generated |
-| System;Memory<T>;Memory;(T[],System.Int32,System.Int32);Argument[0].Element;Argument[this];taint;df-generated |
-| System;Memory<T>;Slice;(System.Int32);Argument[this];ReturnValue;taint;df-generated |
-| System;Memory<T>;Slice;(System.Int32,System.Int32);Argument[this];ReturnValue;taint;df-generated |
-| System;Memory<T>;ToArray;();Argument[this];ReturnValue;taint;df-generated |
-| System;Memory<T>;ToString;();Argument[this];ReturnValue;taint;df-generated |
-| System;Memory<T>;TryCopyTo;(System.Memory<T>);Argument[this];Argument[0];taint;df-generated |
+| System;Math;Abs;(System.IntPtr);Argument[0];ReturnValue;value;dfc-generated |
+| System;Math;Clamp;(System.IntPtr,System.IntPtr,System.IntPtr);Argument[0];ReturnValue;value;dfc-generated |
+| System;Math;Clamp;(System.IntPtr,System.IntPtr,System.IntPtr);Argument[1];ReturnValue;value;dfc-generated |
+| System;Math;Clamp;(System.IntPtr,System.IntPtr,System.IntPtr);Argument[2];ReturnValue;value;dfc-generated |
+| System;Math;Clamp;(System.UIntPtr,System.UIntPtr,System.UIntPtr);Argument[0];ReturnValue;value;dfc-generated |
+| System;Math;Clamp;(System.UIntPtr,System.UIntPtr,System.UIntPtr);Argument[1];ReturnValue;value;dfc-generated |
+| System;Math;Clamp;(System.UIntPtr,System.UIntPtr,System.UIntPtr);Argument[2];ReturnValue;value;dfc-generated |
+| System;Math;Max;(System.IntPtr,System.IntPtr);Argument[0];ReturnValue;value;dfc-generated |
+| System;Math;Max;(System.IntPtr,System.IntPtr);Argument[1];ReturnValue;value;dfc-generated |
+| System;Math;Max;(System.UIntPtr,System.UIntPtr);Argument[0];ReturnValue;value;dfc-generated |
+| System;Math;Max;(System.UIntPtr,System.UIntPtr);Argument[1];ReturnValue;value;dfc-generated |
+| System;Math;Min;(System.IntPtr,System.IntPtr);Argument[0];ReturnValue;value;dfc-generated |
+| System;Math;Min;(System.IntPtr,System.IntPtr);Argument[1];ReturnValue;value;dfc-generated |
+| System;Math;Min;(System.UIntPtr,System.UIntPtr);Argument[0];ReturnValue;value;dfc-generated |
+| System;Math;Min;(System.UIntPtr,System.UIntPtr);Argument[1];ReturnValue;value;dfc-generated |
+| System;Memory<T>;CopyTo;(System.Memory<T>);Argument[this].Property[System.Memory`1.Span].Element;Argument[0].Property[System.Memory`1.Span].Element;value;dfc-generated |
+| System;Memory<T>;Memory;(T[]);Argument[0];Argument[this].SyntheticField[System.Memory`1._object];value;dfc-generated |
+| System;Memory<T>;Memory;(T[],System.Int32,System.Int32);Argument[0];Argument[this].SyntheticField[System.Memory`1._object];value;dfc-generated |
+| System;Memory<T>;Slice;(System.Int32);Argument[this].SyntheticField[System.Memory`1._object];ReturnValue.SyntheticField[System.Memory`1._object];value;dfc-generated |
+| System;Memory<T>;Slice;(System.Int32,System.Int32);Argument[this].SyntheticField[System.Memory`1._object];ReturnValue.SyntheticField[System.Memory`1._object];value;dfc-generated |
+| System;Memory<T>;ToArray;();Argument[this].Property[System.Memory`1.Span].Element;ReturnValue.Element;value;dfc-generated |
+| System;Memory<T>;ToString;();Argument[this].SyntheticField[System.Memory`1._object];ReturnValue;value;dfc-generated |
+| System;Memory<T>;TryCopyTo;(System.Memory<T>);Argument[this].Property[System.Memory`1.Span].Element;Argument[0].Property[System.Memory`1.Span].Element;value;dfc-generated |
 | System;MemoryExtensions+TryWriteInterpolatedStringHandler;TryWriteInterpolatedStringHandler;(System.Int32,System.Int32,System.Span<System.Char>,System.Boolean);Argument[2];Argument[this];taint;df-generated |
 | System;MemoryExtensions+TryWriteInterpolatedStringHandler;TryWriteInterpolatedStringHandler;(System.Int32,System.Int32,System.Span<System.Char>,System.IFormatProvider,System.Boolean);Argument[2];Argument[this];taint;df-generated |
 | System;MemoryExtensions+TryWriteInterpolatedStringHandler;TryWriteInterpolatedStringHandler;(System.Int32,System.Int32,System.Span<System.Char>,System.IFormatProvider,System.Boolean);Argument[3];Argument[this];taint;df-generated |
-| System;MemoryExtensions;AsMemory;(System.String);Argument[0];ReturnValue;taint;df-generated |
-| System;MemoryExtensions;AsMemory;(System.String,System.Index);Argument[0];ReturnValue;taint;df-generated |
-| System;MemoryExtensions;AsMemory;(System.String,System.Int32);Argument[0];ReturnValue;taint;df-generated |
-| System;MemoryExtensions;AsMemory;(System.String,System.Int32,System.Int32);Argument[0];ReturnValue;taint;df-generated |
-| System;MemoryExtensions;AsMemory;(System.String,System.Range);Argument[0];ReturnValue;taint;df-generated |
+| System;MemoryExtensions;AsMemory;(System.String);Argument[0];ReturnValue.SyntheticField[System.ReadOnlyMemory`1._object];value;dfc-generated |
+| System;MemoryExtensions;AsMemory;(System.String,System.Index);Argument[0];ReturnValue.SyntheticField[System.ReadOnlyMemory`1._object];value;dfc-generated |
+| System;MemoryExtensions;AsMemory;(System.String,System.Int32);Argument[0];ReturnValue.SyntheticField[System.ReadOnlyMemory`1._object];value;dfc-generated |
+| System;MemoryExtensions;AsMemory;(System.String,System.Int32,System.Int32);Argument[0];ReturnValue.SyntheticField[System.ReadOnlyMemory`1._object];value;dfc-generated |
+| System;MemoryExtensions;AsMemory;(System.String,System.Range);Argument[0];ReturnValue.SyntheticField[System.ReadOnlyMemory`1._object];value;dfc-generated |
 | System;MemoryExtensions;AsMemory<T>;(System.ArraySegment<T>);Argument[0].Element;ReturnValue;taint;df-generated |
 | System;MemoryExtensions;AsMemory<T>;(System.ArraySegment<T>,System.Int32);Argument[0].Element;ReturnValue;taint;df-generated |
 | System;MemoryExtensions;AsMemory<T>;(System.ArraySegment<T>,System.Int32,System.Int32);Argument[0].Element;ReturnValue;taint;df-generated |
@@ -14762,74 +16011,101 @@
 | System;MemoryExtensions;AsMemory<T>;(T[],System.Int32);Argument[0].Element;ReturnValue;taint;df-generated |
 | System;MemoryExtensions;AsMemory<T>;(T[],System.Int32,System.Int32);Argument[0].Element;ReturnValue;taint;df-generated |
 | System;MemoryExtensions;AsMemory<T>;(T[],System.Range);Argument[0].Element;ReturnValue;taint;df-generated |
-| System;MemoryExtensions;AsSpan<T>;(System.ArraySegment<T>);Argument[0].Element;ReturnValue;taint;df-generated |
-| System;MemoryExtensions;AsSpan<T>;(System.ArraySegment<T>,System.Index);Argument[0].Element;ReturnValue;taint;df-generated |
-| System;MemoryExtensions;AsSpan<T>;(System.ArraySegment<T>,System.Int32);Argument[0].Element;ReturnValue;taint;df-generated |
-| System;MemoryExtensions;AsSpan<T>;(System.ArraySegment<T>,System.Int32,System.Int32);Argument[0].Element;ReturnValue;taint;df-generated |
-| System;MemoryExtensions;AsSpan<T>;(System.ArraySegment<T>,System.Range);Argument[0].Element;ReturnValue;taint;df-generated |
-| System;MemoryExtensions;AsSpan<T>;(T[]);Argument[0].Element;ReturnValue;taint;df-generated |
-| System;MemoryExtensions;AsSpan<T>;(T[],System.Int32,System.Int32);Argument[0].Element;ReturnValue;taint;df-generated |
-| System;MemoryExtensions;CopyTo<T>;(T[],System.Memory<T>);Argument[0].Element;Argument[1];taint;df-generated |
-| System;MemoryExtensions;CopyTo<T>;(T[],System.Span<T>);Argument[0].Element;Argument[1];taint;df-generated |
-| System;MemoryExtensions;EnumerateLines;(System.ReadOnlySpan<System.Char>);Argument[0];ReturnValue;taint;df-generated |
+| System;MemoryExtensions;AsSpan<T>;(System.ArraySegment<T>);Argument[0].Property[System.ArraySegment`1.Array].Element;ReturnValue.Element;value;dfc-generated |
+| System;MemoryExtensions;AsSpan<T>;(System.ArraySegment<T>,System.Index);Argument[0].Property[System.ArraySegment`1.Array].Element;ReturnValue.Element;value;dfc-generated |
+| System;MemoryExtensions;AsSpan<T>;(System.ArraySegment<T>,System.Int32);Argument[0].Property[System.ArraySegment`1.Array].Element;ReturnValue.Element;value;dfc-generated |
+| System;MemoryExtensions;AsSpan<T>;(System.ArraySegment<T>,System.Int32,System.Int32);Argument[0].Property[System.ArraySegment`1.Array].Element;ReturnValue.Element;value;dfc-generated |
+| System;MemoryExtensions;AsSpan<T>;(System.ArraySegment<T>,System.Range);Argument[0].Property[System.ArraySegment`1.Array].Element;ReturnValue.Element;value;dfc-generated |
+| System;MemoryExtensions;AsSpan<T>;(T[]);Argument[0].Element;ReturnValue.Element;value;dfc-generated |
+| System;MemoryExtensions;AsSpan<T>;(T[],System.Int32,System.Int32);Argument[0].Element;ReturnValue.Element;value;dfc-generated |
+| System;MemoryExtensions;CommonPrefixLength<T>;(System.ReadOnlySpan<T>,System.ReadOnlySpan<T>,System.Collections.Generic.IEqualityComparer<T>);Argument[0];Argument[2];taint;df-generated |
+| System;MemoryExtensions;CommonPrefixLength<T>;(System.ReadOnlySpan<T>,System.ReadOnlySpan<T>,System.Collections.Generic.IEqualityComparer<T>);Argument[1];Argument[2];taint;df-generated |
+| System;MemoryExtensions;CommonPrefixLength<T>;(System.Span<T>,System.ReadOnlySpan<T>,System.Collections.Generic.IEqualityComparer<T>);Argument[1];Argument[2];taint;df-generated |
+| System;MemoryExtensions;CopyTo<T>;(T[],System.Memory<T>);Argument[0].Element;Argument[1].Property[System.Memory`1.Span].Element;value;dfc-generated |
+| System;MemoryExtensions;CopyTo<T>;(T[],System.Span<T>);Argument[0].Element;Argument[1].Element;value;dfc-generated |
+| System;MemoryExtensions;EnumerateLines;(System.ReadOnlySpan<System.Char>);Argument[0];ReturnValue.SyntheticField[System.Text.SpanLineEnumerator._remaining];value;dfc-generated |
 | System;MemoryExtensions;EnumerateRunes;(System.ReadOnlySpan<System.Char>);Argument[0];ReturnValue;taint;df-generated |
 | System;MemoryExtensions;Replace<T>;(System.ReadOnlySpan<T>,System.Span<T>,T,T);Argument[0].Element;Argument[1].Element;value;manual |
 | System;MemoryExtensions;Replace<T>;(System.ReadOnlySpan<T>,System.Span<T>,T,T);Argument[3];Argument[1].Element;value;manual |
 | System;MemoryExtensions;Replace<T>;(System.Span<T>,T,T);Argument[2];Argument[0].Element;value;manual |
+| System;MemoryExtensions;SequenceEqual<T>;(System.ReadOnlySpan<T>,System.ReadOnlySpan<T>,System.Collections.Generic.IEqualityComparer<T>);Argument[0];Argument[2];taint;df-generated |
+| System;MemoryExtensions;SequenceEqual<T>;(System.ReadOnlySpan<T>,System.ReadOnlySpan<T>,System.Collections.Generic.IEqualityComparer<T>);Argument[1];Argument[2];taint;df-generated |
+| System;MemoryExtensions;SequenceEqual<T>;(System.Span<T>,System.ReadOnlySpan<T>,System.Collections.Generic.IEqualityComparer<T>);Argument[1];Argument[2];taint;df-generated |
+| System;MemoryExtensions;Sort<T>;(System.Span<T>,System.Comparison<T>);Argument[0].Element;Argument[1].Parameter[0];value;dfc-generated |
+| System;MemoryExtensions;Sort<T>;(System.Span<T>,System.Comparison<T>);Argument[0].Element;Argument[1].Parameter[0];value;hq-generated |
+| System;MemoryExtensions;Sort<T>;(System.Span<T>,System.Comparison<T>);Argument[0].Element;Argument[1].Parameter[1];value;dfc-generated |
+| System;MemoryExtensions;Sort<T>;(System.Span<T>,System.Comparison<T>);Argument[0].Element;Argument[1].Parameter[1];value;hq-generated |
+| System;MemoryExtensions;Sort<T>;(System.Span<T>,System.Comparison<T>);Argument[1];Argument[1].Parameter[delegate-self];value;dfc-generated |
 | System;MemoryExtensions;Sort<T>;(System.Span<T>,System.Comparison<T>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
 | System;MemoryExtensions;Sort<TKey,TValue>;(System.Span<TKey>,System.Span<TValue>,System.Comparison<TKey>);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
 | System;MemoryExtensions;Trim;(System.Memory<System.Char>);Argument[0];ReturnValue;taint;df-generated |
-| System;MemoryExtensions;Trim;(System.ReadOnlyMemory<System.Char>);Argument[0];ReturnValue;taint;df-generated |
-| System;MemoryExtensions;Trim;(System.ReadOnlySpan<System.Char>);Argument[0];ReturnValue;taint;df-generated |
-| System;MemoryExtensions;Trim;(System.ReadOnlySpan<System.Char>,System.Char);Argument[0];ReturnValue;taint;df-generated |
-| System;MemoryExtensions;Trim;(System.ReadOnlySpan<System.Char>,System.ReadOnlySpan<System.Char>);Argument[0];ReturnValue;taint;df-generated |
-| System;MemoryExtensions;Trim;(System.Span<System.Char>);Argument[0];ReturnValue;taint;df-generated |
-| System;MemoryExtensions;Trim<T>;(System.Memory<T>,System.ReadOnlySpan<T>);Argument[0];ReturnValue;taint;df-generated |
+| System;MemoryExtensions;Trim;(System.ReadOnlyMemory<System.Char>);Argument[0].SyntheticField[System.ReadOnlyMemory`1._object];ReturnValue.SyntheticField[System.ReadOnlyMemory`1._object];value;dfc-generated |
+| System;MemoryExtensions;Trim;(System.ReadOnlySpan<System.Char>);Argument[0].Element;ReturnValue.Element;value;dfc-generated |
+| System;MemoryExtensions;Trim;(System.ReadOnlySpan<System.Char>);Argument[0];ReturnValue;value;dfc-generated |
+| System;MemoryExtensions;Trim;(System.ReadOnlySpan<System.Char>,System.Char);Argument[0].Element;ReturnValue.Element;value;dfc-generated |
+| System;MemoryExtensions;Trim;(System.ReadOnlySpan<System.Char>,System.ReadOnlySpan<System.Char>);Argument[0].Element;ReturnValue.Element;value;dfc-generated |
+| System;MemoryExtensions;Trim;(System.Span<System.Char>);Argument[0].Element;ReturnValue.Element;value;dfc-generated |
+| System;MemoryExtensions;Trim;(System.Span<System.Char>);Argument[0];ReturnValue;value;dfc-generated |
+| System;MemoryExtensions;Trim<T>;(System.Memory<T>,System.ReadOnlySpan<T>);Argument[0];ReturnValue;value;dfc-generated |
 | System;MemoryExtensions;Trim<T>;(System.Memory<T>,T);Argument[0];ReturnValue;taint;df-generated |
-| System;MemoryExtensions;Trim<T>;(System.ReadOnlyMemory<T>,System.ReadOnlySpan<T>);Argument[0];ReturnValue;taint;df-generated |
+| System;MemoryExtensions;Trim<T>;(System.ReadOnlyMemory<T>,System.ReadOnlySpan<T>);Argument[0];ReturnValue;value;dfc-generated |
 | System;MemoryExtensions;Trim<T>;(System.ReadOnlyMemory<T>,T);Argument[0];ReturnValue;taint;df-generated |
-| System;MemoryExtensions;Trim<T>;(System.ReadOnlySpan<T>,System.ReadOnlySpan<T>);Argument[0];ReturnValue;taint;df-generated |
-| System;MemoryExtensions;Trim<T>;(System.ReadOnlySpan<T>,T);Argument[0];ReturnValue;taint;df-generated |
-| System;MemoryExtensions;Trim<T>;(System.Span<T>,System.ReadOnlySpan<T>);Argument[0];ReturnValue;taint;df-generated |
-| System;MemoryExtensions;Trim<T>;(System.Span<T>,T);Argument[0];ReturnValue;taint;df-generated |
+| System;MemoryExtensions;Trim<T>;(System.ReadOnlySpan<T>,System.ReadOnlySpan<T>);Argument[0].Element;ReturnValue.Element;value;dfc-generated |
+| System;MemoryExtensions;Trim<T>;(System.ReadOnlySpan<T>,System.ReadOnlySpan<T>);Argument[0];ReturnValue;value;dfc-generated |
+| System;MemoryExtensions;Trim<T>;(System.ReadOnlySpan<T>,T);Argument[0].Element;ReturnValue.Element;value;dfc-generated |
+| System;MemoryExtensions;Trim<T>;(System.Span<T>,System.ReadOnlySpan<T>);Argument[0].Element;ReturnValue.Element;value;dfc-generated |
+| System;MemoryExtensions;Trim<T>;(System.Span<T>,System.ReadOnlySpan<T>);Argument[0];ReturnValue;value;dfc-generated |
+| System;MemoryExtensions;Trim<T>;(System.Span<T>,T);Argument[0].Element;ReturnValue.Element;value;dfc-generated |
 | System;MemoryExtensions;TrimEnd;(System.Memory<System.Char>);Argument[0];ReturnValue;taint;df-generated |
-| System;MemoryExtensions;TrimEnd;(System.ReadOnlyMemory<System.Char>);Argument[0];ReturnValue;taint;df-generated |
-| System;MemoryExtensions;TrimEnd;(System.ReadOnlySpan<System.Char>);Argument[0];ReturnValue;taint;df-generated |
-| System;MemoryExtensions;TrimEnd;(System.ReadOnlySpan<System.Char>,System.Char);Argument[0];ReturnValue;taint;df-generated |
-| System;MemoryExtensions;TrimEnd;(System.ReadOnlySpan<System.Char>,System.ReadOnlySpan<System.Char>);Argument[0];ReturnValue;taint;df-generated |
-| System;MemoryExtensions;TrimEnd;(System.Span<System.Char>);Argument[0];ReturnValue;taint;df-generated |
-| System;MemoryExtensions;TrimEnd<T>;(System.Memory<T>,System.ReadOnlySpan<T>);Argument[0];ReturnValue;taint;df-generated |
+| System;MemoryExtensions;TrimEnd;(System.ReadOnlyMemory<System.Char>);Argument[0].SyntheticField[System.ReadOnlyMemory`1._object];ReturnValue.SyntheticField[System.ReadOnlyMemory`1._object];value;dfc-generated |
+| System;MemoryExtensions;TrimEnd;(System.ReadOnlySpan<System.Char>);Argument[0].Element;ReturnValue.Element;value;dfc-generated |
+| System;MemoryExtensions;TrimEnd;(System.ReadOnlySpan<System.Char>,System.Char);Argument[0].Element;ReturnValue.Element;value;dfc-generated |
+| System;MemoryExtensions;TrimEnd;(System.ReadOnlySpan<System.Char>,System.ReadOnlySpan<System.Char>);Argument[0].Element;ReturnValue.Element;value;dfc-generated |
+| System;MemoryExtensions;TrimEnd;(System.Span<System.Char>);Argument[0].Element;ReturnValue.Element;value;dfc-generated |
+| System;MemoryExtensions;TrimEnd<T>;(System.Memory<T>,System.ReadOnlySpan<T>);Argument[0];ReturnValue;value;dfc-generated |
 | System;MemoryExtensions;TrimEnd<T>;(System.Memory<T>,T);Argument[0];ReturnValue;taint;df-generated |
-| System;MemoryExtensions;TrimEnd<T>;(System.ReadOnlyMemory<T>,System.ReadOnlySpan<T>);Argument[0];ReturnValue;taint;df-generated |
+| System;MemoryExtensions;TrimEnd<T>;(System.ReadOnlyMemory<T>,System.ReadOnlySpan<T>);Argument[0];ReturnValue;value;dfc-generated |
 | System;MemoryExtensions;TrimEnd<T>;(System.ReadOnlyMemory<T>,T);Argument[0];ReturnValue;taint;df-generated |
-| System;MemoryExtensions;TrimEnd<T>;(System.ReadOnlySpan<T>,System.ReadOnlySpan<T>);Argument[0];ReturnValue;taint;df-generated |
-| System;MemoryExtensions;TrimEnd<T>;(System.ReadOnlySpan<T>,T);Argument[0];ReturnValue;taint;df-generated |
-| System;MemoryExtensions;TrimEnd<T>;(System.Span<T>,System.ReadOnlySpan<T>);Argument[0];ReturnValue;taint;df-generated |
-| System;MemoryExtensions;TrimEnd<T>;(System.Span<T>,T);Argument[0];ReturnValue;taint;df-generated |
+| System;MemoryExtensions;TrimEnd<T>;(System.ReadOnlySpan<T>,System.ReadOnlySpan<T>);Argument[0].Element;ReturnValue.Element;value;dfc-generated |
+| System;MemoryExtensions;TrimEnd<T>;(System.ReadOnlySpan<T>,System.ReadOnlySpan<T>);Argument[0];ReturnValue;value;dfc-generated |
+| System;MemoryExtensions;TrimEnd<T>;(System.ReadOnlySpan<T>,T);Argument[0].Element;ReturnValue.Element;value;dfc-generated |
+| System;MemoryExtensions;TrimEnd<T>;(System.Span<T>,System.ReadOnlySpan<T>);Argument[0].Element;ReturnValue.Element;value;dfc-generated |
+| System;MemoryExtensions;TrimEnd<T>;(System.Span<T>,System.ReadOnlySpan<T>);Argument[0];ReturnValue;value;dfc-generated |
+| System;MemoryExtensions;TrimEnd<T>;(System.Span<T>,T);Argument[0].Element;ReturnValue.Element;value;dfc-generated |
 | System;MemoryExtensions;TrimStart;(System.Memory<System.Char>);Argument[0];ReturnValue;taint;df-generated |
-| System;MemoryExtensions;TrimStart;(System.ReadOnlyMemory<System.Char>);Argument[0];ReturnValue;taint;df-generated |
-| System;MemoryExtensions;TrimStart;(System.ReadOnlySpan<System.Char>);Argument[0];ReturnValue;taint;df-generated |
-| System;MemoryExtensions;TrimStart;(System.ReadOnlySpan<System.Char>,System.Char);Argument[0];ReturnValue;taint;df-generated |
-| System;MemoryExtensions;TrimStart;(System.ReadOnlySpan<System.Char>,System.ReadOnlySpan<System.Char>);Argument[0];ReturnValue;taint;df-generated |
-| System;MemoryExtensions;TrimStart;(System.Span<System.Char>);Argument[0];ReturnValue;taint;df-generated |
-| System;MemoryExtensions;TrimStart<T>;(System.Memory<T>,System.ReadOnlySpan<T>);Argument[0];ReturnValue;taint;df-generated |
+| System;MemoryExtensions;TrimStart;(System.ReadOnlyMemory<System.Char>);Argument[0].SyntheticField[System.ReadOnlyMemory`1._object];ReturnValue.SyntheticField[System.ReadOnlyMemory`1._object];value;dfc-generated |
+| System;MemoryExtensions;TrimStart;(System.ReadOnlySpan<System.Char>);Argument[0].Element;ReturnValue.Element;value;dfc-generated |
+| System;MemoryExtensions;TrimStart;(System.ReadOnlySpan<System.Char>,System.Char);Argument[0].Element;ReturnValue.Element;value;dfc-generated |
+| System;MemoryExtensions;TrimStart;(System.ReadOnlySpan<System.Char>,System.ReadOnlySpan<System.Char>);Argument[0].Element;ReturnValue.Element;value;dfc-generated |
+| System;MemoryExtensions;TrimStart;(System.Span<System.Char>);Argument[0].Element;ReturnValue.Element;value;dfc-generated |
+| System;MemoryExtensions;TrimStart<T>;(System.Memory<T>,System.ReadOnlySpan<T>);Argument[0];ReturnValue;value;dfc-generated |
 | System;MemoryExtensions;TrimStart<T>;(System.Memory<T>,T);Argument[0];ReturnValue;taint;df-generated |
-| System;MemoryExtensions;TrimStart<T>;(System.ReadOnlyMemory<T>,System.ReadOnlySpan<T>);Argument[0];ReturnValue;taint;df-generated |
+| System;MemoryExtensions;TrimStart<T>;(System.ReadOnlyMemory<T>,System.ReadOnlySpan<T>);Argument[0];ReturnValue;value;dfc-generated |
 | System;MemoryExtensions;TrimStart<T>;(System.ReadOnlyMemory<T>,T);Argument[0];ReturnValue;taint;df-generated |
-| System;MemoryExtensions;TrimStart<T>;(System.ReadOnlySpan<T>,System.ReadOnlySpan<T>);Argument[0];ReturnValue;taint;df-generated |
-| System;MemoryExtensions;TrimStart<T>;(System.ReadOnlySpan<T>,T);Argument[0];ReturnValue;taint;df-generated |
-| System;MemoryExtensions;TrimStart<T>;(System.Span<T>,System.ReadOnlySpan<T>);Argument[0];ReturnValue;taint;df-generated |
-| System;MemoryExtensions;TrimStart<T>;(System.Span<T>,T);Argument[0];ReturnValue;taint;df-generated |
-| System;MissingFieldException;MissingFieldException;(System.String,System.String);Argument[0];Argument[this];taint;df-generated |
-| System;MissingFieldException;MissingFieldException;(System.String,System.String);Argument[1];Argument[this];taint;df-generated |
-| System;MissingFieldException;get_Message;();Argument[this];ReturnValue;taint;df-generated |
-| System;MissingMemberException;MissingMemberException;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);Argument[0];Argument[this];taint;df-generated |
-| System;MissingMemberException;MissingMemberException;(System.String,System.String);Argument[0];Argument[this];taint;df-generated |
-| System;MissingMemberException;MissingMemberException;(System.String,System.String);Argument[1];Argument[this];taint;df-generated |
-| System;MissingMemberException;get_Message;();Argument[this];ReturnValue;taint;df-generated |
-| System;MissingMethodException;MissingMethodException;(System.String,System.String);Argument[0];Argument[this];taint;df-generated |
-| System;MissingMethodException;MissingMethodException;(System.String,System.String);Argument[1];Argument[this];taint;df-generated |
-| System;MissingMethodException;get_Message;();Argument[this];ReturnValue;taint;df-generated |
+| System;MemoryExtensions;TrimStart<T>;(System.ReadOnlySpan<T>,System.ReadOnlySpan<T>);Argument[0].Element;ReturnValue.Element;value;dfc-generated |
+| System;MemoryExtensions;TrimStart<T>;(System.ReadOnlySpan<T>,System.ReadOnlySpan<T>);Argument[0];ReturnValue;value;dfc-generated |
+| System;MemoryExtensions;TrimStart<T>;(System.ReadOnlySpan<T>,T);Argument[0].Element;ReturnValue.Element;value;dfc-generated |
+| System;MemoryExtensions;TrimStart<T>;(System.Span<T>,System.ReadOnlySpan<T>);Argument[0].Element;ReturnValue.Element;value;dfc-generated |
+| System;MemoryExtensions;TrimStart<T>;(System.Span<T>,System.ReadOnlySpan<T>);Argument[0];ReturnValue;value;dfc-generated |
+| System;MemoryExtensions;TrimStart<T>;(System.Span<T>,T);Argument[0].Element;ReturnValue.Element;value;dfc-generated |
+| System;MemoryExtensions;TryWrite;(System.Span<System.Char>,System.IFormatProvider,System.MemoryExtensions+TryWriteInterpolatedStringHandler,System.Int32);Argument[2];ReturnValue;value;dfc-generated |
+| System;MemoryExtensions;TryWrite;(System.Span<System.Char>,System.MemoryExtensions+TryWriteInterpolatedStringHandler,System.Int32);Argument[1];ReturnValue;value;dfc-generated |
+| System;MissingFieldException;MissingFieldException;(System.String,System.String);Argument[0];Argument[this].Field[System.MissingMemberException.ClassName];value;dfc-generated |
+| System;MissingFieldException;MissingFieldException;(System.String,System.String);Argument[1];Argument[this].Field[System.MissingMemberException.MemberName];value;dfc-generated |
+| System;MissingFieldException;get_Message;();Argument[this].SyntheticField[System.Exception._message];ReturnValue;value;dfc-generated |
+| System;MissingMemberException;MissingMemberException;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);Argument[0].SyntheticField[System.Runtime.Serialization.SerializationInfo._values].Element;Argument[this].Field[System.MissingMemberException.ClassName];value;dfc-generated |
+| System;MissingMemberException;MissingMemberException;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);Argument[0].SyntheticField[System.Runtime.Serialization.SerializationInfo._values].Element;Argument[this].Field[System.MissingMemberException.MemberName];value;dfc-generated |
+| System;MissingMemberException;MissingMemberException;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);Argument[0].SyntheticField[System.Runtime.Serialization.SerializationInfo._values].Element;Argument[this].Field[System.MissingMemberException.Signature];value;dfc-generated |
+| System;MissingMemberException;MissingMemberException;(System.String,System.String);Argument[0];Argument[this].Field[System.MissingMemberException.ClassName];value;dfc-generated |
+| System;MissingMemberException;MissingMemberException;(System.String,System.String);Argument[1];Argument[this].Field[System.MissingMemberException.MemberName];value;dfc-generated |
+| System;MissingMemberException;get_Message;();Argument[this].SyntheticField[System.Exception._message];ReturnValue;value;dfc-generated |
+| System;MissingMethodException;MissingMethodException;(System.String,System.String);Argument[0];Argument[this].Field[System.MissingMemberException.ClassName];value;dfc-generated |
+| System;MissingMethodException;MissingMethodException;(System.String,System.String);Argument[1];Argument[this].Field[System.MissingMemberException.MemberName];value;dfc-generated |
+| System;MissingMethodException;get_Message;();Argument[this].SyntheticField[System.Exception._message];ReturnValue;value;dfc-generated |
+| System;MulticastDelegate;CombineImpl;(System.Delegate);Argument[0];ReturnValue.SyntheticField[System.MulticastDelegate.delegates].Element;value;dfc-generated |
+| System;MulticastDelegate;CombineImpl;(System.Delegate);Argument[this];ReturnValue.SyntheticField[System.MulticastDelegate.delegates].Element;value;dfc-generated |
+| System;MulticastDelegate;GetInvocationList;();Argument[this].SyntheticField[System.MulticastDelegate.delegates].Element;ReturnValue.Element;value;dfc-generated |
+| System;MulticastDelegate;RemoveImpl;(System.Delegate);Argument[this].SyntheticField[System.MulticastDelegate.delegates].Element;ReturnValue;value;dfc-generated |
 | System;Nullable<T>;GetValueOrDefault;();Argument[this].Property[System.Nullable`1.Value];ReturnValue;value;manual |
 | System;Nullable<T>;GetValueOrDefault;(T);Argument[0];ReturnValue;value;manual |
 | System;Nullable<T>;GetValueOrDefault;(T);Argument[this].Property[System.Nullable`1.Value];ReturnValue;value;manual |
@@ -14837,11 +16113,11 @@
 | System;Nullable<T>;ToString;();Argument[this];ReturnValue;taint;df-generated |
 | System;Nullable<T>;get_HasValue;();Argument[this].Property[System.Nullable`1.Value];ReturnValue;taint;manual |
 | System;Nullable<T>;get_Value;();Argument[this];ReturnValue;taint;manual |
-| System;ObjectDisposedException;ObjectDisposedException;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);Argument[0];Argument[this];taint;df-generated |
-| System;ObjectDisposedException;ObjectDisposedException;(System.String,System.String);Argument[0];Argument[this];taint;df-generated |
-| System;ObjectDisposedException;get_Message;();Argument[this];ReturnValue;taint;df-generated |
-| System;ObjectDisposedException;get_ObjectName;();Argument[this];ReturnValue;taint;df-generated |
-| System;OperatingSystem;ToString;();Argument[this];ReturnValue;taint;df-generated |
+| System;ObjectDisposedException;ObjectDisposedException;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);Argument[0].SyntheticField[System.Runtime.Serialization.SerializationInfo._values].Element;Argument[this].SyntheticField[System.ObjectDisposedException._objectName];value;dfc-generated |
+| System;ObjectDisposedException;ObjectDisposedException;(System.String,System.String);Argument[0];Argument[this].SyntheticField[System.ObjectDisposedException._objectName];value;dfc-generated |
+| System;ObjectDisposedException;get_Message;();Argument[this].SyntheticField[System.Exception._message];ReturnValue;value;dfc-generated |
+| System;ObjectDisposedException;get_ObjectName;();Argument[this].SyntheticField[System.ObjectDisposedException._objectName];ReturnValue;value;dfc-generated |
+| System;OperatingSystem;ToString;();Argument[this].Property[System.OperatingSystem.VersionString];ReturnValue;value;dfc-generated |
 | System;OperatingSystem;get_ServicePack;();Argument[this];ReturnValue;taint;df-generated |
 | System;OperatingSystem;get_Version;();Argument[this];ReturnValue;taint;df-generated |
 | System;OperatingSystem;get_VersionString;();Argument[this];ReturnValue;taint;df-generated |
@@ -14852,14 +16128,14 @@
 | System;Progress<T>;Progress;(System.Action<T>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System;Progress<T>;add_ProgressChanged;(System.EventHandler<T>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System;Progress<T>;remove_ProgressChanged;(System.EventHandler<T>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
-| System;ReadOnlyMemory<T>;CopyTo;(System.Memory<T>);Argument[this];Argument[0];taint;df-generated |
-| System;ReadOnlyMemory<T>;ReadOnlyMemory;(T[]);Argument[0].Element;Argument[this];taint;df-generated |
-| System;ReadOnlyMemory<T>;ReadOnlyMemory;(T[],System.Int32,System.Int32);Argument[0].Element;Argument[this];taint;df-generated |
-| System;ReadOnlyMemory<T>;Slice;(System.Int32);Argument[this];ReturnValue;taint;df-generated |
-| System;ReadOnlyMemory<T>;Slice;(System.Int32,System.Int32);Argument[this];ReturnValue;taint;df-generated |
-| System;ReadOnlyMemory<T>;ToArray;();Argument[this];ReturnValue;taint;df-generated |
-| System;ReadOnlyMemory<T>;ToString;();Argument[this];ReturnValue;taint;df-generated |
-| System;ReadOnlyMemory<T>;TryCopyTo;(System.Memory<T>);Argument[this];Argument[0];taint;df-generated |
+| System;ReadOnlyMemory<T>;CopyTo;(System.Memory<T>);Argument[this].Property[System.ReadOnlyMemory`1.Span].Element;Argument[0].Property[System.Memory`1.Span].Element;value;dfc-generated |
+| System;ReadOnlyMemory<T>;ReadOnlyMemory;(T[]);Argument[0];Argument[this].SyntheticField[System.ReadOnlyMemory`1._object];value;dfc-generated |
+| System;ReadOnlyMemory<T>;ReadOnlyMemory;(T[],System.Int32,System.Int32);Argument[0];Argument[this].SyntheticField[System.ReadOnlyMemory`1._object];value;dfc-generated |
+| System;ReadOnlyMemory<T>;Slice;(System.Int32);Argument[this].SyntheticField[System.ReadOnlyMemory`1._object];ReturnValue.SyntheticField[System.ReadOnlyMemory`1._object];value;dfc-generated |
+| System;ReadOnlyMemory<T>;Slice;(System.Int32,System.Int32);Argument[this].SyntheticField[System.ReadOnlyMemory`1._object];ReturnValue.SyntheticField[System.ReadOnlyMemory`1._object];value;dfc-generated |
+| System;ReadOnlyMemory<T>;ToArray;();Argument[this].Property[System.ReadOnlyMemory`1.Span].Element;ReturnValue.Element;value;dfc-generated |
+| System;ReadOnlyMemory<T>;ToString;();Argument[this].SyntheticField[System.ReadOnlyMemory`1._object];ReturnValue;value;dfc-generated |
+| System;ReadOnlyMemory<T>;TryCopyTo;(System.Memory<T>);Argument[this].Property[System.ReadOnlyMemory`1.Span].Element;Argument[0].Property[System.Memory`1.Span].Element;value;dfc-generated |
 | System;ReadOnlySpan<T>;CopyTo;(System.Span<T>);Argument[this].Element;Argument[0].Element;value;manual |
 | System;ReadOnlySpan<T>;GetEnumerator;();Argument[this];ReturnValue;taint;df-generated |
 | System;ReadOnlySpan<T>;GetPinnableReference;();Argument[this].Element;ReturnValue;value;manual |
@@ -14872,17 +16148,20 @@
 | System;ReadOnlySpan<T>;TryCopyTo;(System.Span<T>);Argument[this].Element;Argument[0].Element;value;manual |
 | System;ReadOnlySpan<T>;get_Item;(System.Int32);Argument[this].Element;ReturnValue;value;manual |
 | System;ResolveEventHandler;BeginInvoke;(System.Object,System.ResolveEventArgs,System.AsyncCallback,System.Object);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
-| System;RuntimeFieldHandle;FromIntPtr;(System.IntPtr);Argument[0];ReturnValue;taint;df-generated |
-| System;RuntimeFieldHandle;ToIntPtr;(System.RuntimeFieldHandle);Argument[0];ReturnValue;taint;df-generated |
-| System;RuntimeFieldHandle;get_Value;();Argument[this];ReturnValue;taint;df-generated |
-| System;RuntimeMethodHandle;FromIntPtr;(System.IntPtr);Argument[0];ReturnValue;taint;df-generated |
-| System;RuntimeMethodHandle;ToIntPtr;(System.RuntimeMethodHandle);Argument[0];ReturnValue;taint;df-generated |
-| System;RuntimeMethodHandle;get_Value;();Argument[this];ReturnValue;taint;df-generated |
-| System;RuntimeTypeHandle;FromIntPtr;(System.IntPtr);Argument[0];ReturnValue;taint;df-generated |
-| System;RuntimeTypeHandle;ToIntPtr;(System.RuntimeTypeHandle);Argument[0];ReturnValue;taint;df-generated |
-| System;RuntimeTypeHandle;get_Value;();Argument[this];ReturnValue;taint;df-generated |
-| System;SequencePosition;GetObject;();Argument[this];ReturnValue;taint;df-generated |
-| System;SequencePosition;SequencePosition;(System.Object,System.Int32);Argument[0];Argument[this];taint;df-generated |
+| System;RuntimeFieldHandle;FromIntPtr;(System.IntPtr);Argument[0];ReturnValue.SyntheticField[System.RuntimeFieldHandle.value];value;dfc-generated |
+| System;RuntimeFieldHandle;ToIntPtr;(System.RuntimeFieldHandle);Argument[0].Property[System.RuntimeFieldHandle.Value];ReturnValue;value;dfc-generated |
+| System;RuntimeFieldHandle;ToIntPtr;(System.RuntimeFieldHandle);Argument[0].SyntheticField[System.RuntimeFieldHandle.value];ReturnValue;value;dfc-generated |
+| System;RuntimeFieldHandle;get_Value;();Argument[this].SyntheticField[System.RuntimeFieldHandle.value];ReturnValue;value;dfc-generated |
+| System;RuntimeMethodHandle;FromIntPtr;(System.IntPtr);Argument[0];ReturnValue.SyntheticField[System.RuntimeMethodHandle.value];value;dfc-generated |
+| System;RuntimeMethodHandle;ToIntPtr;(System.RuntimeMethodHandle);Argument[0].Property[System.RuntimeMethodHandle.Value];ReturnValue;value;dfc-generated |
+| System;RuntimeMethodHandle;ToIntPtr;(System.RuntimeMethodHandle);Argument[0].SyntheticField[System.RuntimeMethodHandle.value];ReturnValue;value;dfc-generated |
+| System;RuntimeMethodHandle;get_Value;();Argument[this].SyntheticField[System.RuntimeMethodHandle.value];ReturnValue;value;dfc-generated |
+| System;RuntimeTypeHandle;FromIntPtr;(System.IntPtr);Argument[0];ReturnValue.SyntheticField[System.RuntimeTypeHandle.value];value;dfc-generated |
+| System;RuntimeTypeHandle;ToIntPtr;(System.RuntimeTypeHandle);Argument[0].Property[System.RuntimeTypeHandle.Value];ReturnValue;value;dfc-generated |
+| System;RuntimeTypeHandle;ToIntPtr;(System.RuntimeTypeHandle);Argument[0].SyntheticField[System.RuntimeTypeHandle.value];ReturnValue;value;dfc-generated |
+| System;RuntimeTypeHandle;get_Value;();Argument[this].SyntheticField[System.RuntimeTypeHandle.value];ReturnValue;value;dfc-generated |
+| System;SequencePosition;GetObject;();Argument[this].SyntheticField[System.SequencePosition._object];ReturnValue;value;dfc-generated |
+| System;SequencePosition;SequencePosition;(System.Object,System.Int32);Argument[0];Argument[this].SyntheticField[System.SequencePosition._object];value;dfc-generated |
 | System;Span<T>;Clear;();Argument[this].WithoutElement;Argument[this];value;manual |
 | System;Span<T>;CopyTo;(System.Span<T>);Argument[this].Element;Argument[0].Element;value;manual |
 | System;Span<T>;Fill;(T);Argument[0];Argument[this].Element;value;manual |
@@ -14925,6 +16204,11 @@
 | System;String;Concat;(System.String[]);Argument[0].Element;ReturnValue;taint;manual |
 | System;String;Concat<T>;(System.Collections.Generic.IEnumerable<T>);Argument[0].Element;ReturnValue;taint;manual |
 | System;String;Copy;(System.String);Argument[0];ReturnValue;value;manual |
+| System;String;Create;(System.IFormatProvider,System.Runtime.CompilerServices.DefaultInterpolatedStringHandler);Argument[1];ReturnValue;value;dfc-generated |
+| System;String;Create;(System.IFormatProvider,System.Span<System.Char>,System.Runtime.CompilerServices.DefaultInterpolatedStringHandler);Argument[2];ReturnValue;value;dfc-generated |
+| System;String;Create<TState>;(System.Int32,TState,System.Buffers.SpanAction<System.Char,TState>);Argument[1];Argument[2].Parameter[1];value;dfc-generated |
+| System;String;Create<TState>;(System.Int32,TState,System.Buffers.SpanAction<System.Char,TState>);Argument[1];Argument[2].Parameter[1];value;hq-generated |
+| System;String;Create<TState>;(System.Int32,TState,System.Buffers.SpanAction<System.Char,TState>);Argument[2];Argument[2].Parameter[delegate-self];value;dfc-generated |
 | System;String;Create<TState>;(System.Int32,TState,System.Buffers.SpanAction<System.Char,TState>);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
 | System;String;EnumerateRunes;();Argument[this];ReturnValue;taint;df-generated |
 | System;String;Format;(System.IFormatProvider,System.String,System.Object);Argument[1];ReturnValue;taint;manual |
@@ -14938,8 +16222,8 @@
 | System;String;Format;(System.IFormatProvider,System.String,System.Object,System.Object,System.Object);Argument[4];ReturnValue;taint;manual |
 | System;String;Format;(System.IFormatProvider,System.String,System.Object[]);Argument[1];ReturnValue;taint;manual |
 | System;String;Format;(System.IFormatProvider,System.String,System.Object[]);Argument[2].Element;ReturnValue;taint;manual |
-| System;String;Format;(System.IFormatProvider,System.Text.CompositeFormat,System.Object[]);Argument[1];ReturnValue;taint;df-generated |
-| System;String;Format;(System.IFormatProvider,System.Text.CompositeFormat,System.ReadOnlySpan<System.Object>);Argument[1];ReturnValue;taint;df-generated |
+| System;String;Format;(System.IFormatProvider,System.Text.CompositeFormat,System.Object[]);Argument[1].Property[System.Text.CompositeFormat.Format];ReturnValue;value;dfc-generated |
+| System;String;Format;(System.IFormatProvider,System.Text.CompositeFormat,System.ReadOnlySpan<System.Object>);Argument[1].Property[System.Text.CompositeFormat.Format];ReturnValue;value;dfc-generated |
 | System;String;Format;(System.String,System.Object);Argument[0];ReturnValue;taint;manual |
 | System;String;Format;(System.String,System.Object);Argument[1];ReturnValue;taint;manual |
 | System;String;Format;(System.String,System.Object,System.Object);Argument[0];ReturnValue;taint;manual |
@@ -14951,9 +16235,9 @@
 | System;String;Format;(System.String,System.Object,System.Object,System.Object);Argument[3];ReturnValue;taint;manual |
 | System;String;Format;(System.String,System.Object[]);Argument[0];ReturnValue;taint;manual |
 | System;String;Format;(System.String,System.Object[]);Argument[1].Element;ReturnValue;taint;manual |
-| System;String;Format<TArg0,TArg1,TArg2>;(System.IFormatProvider,System.Text.CompositeFormat,TArg0,TArg1,TArg2);Argument[1];ReturnValue;taint;df-generated |
-| System;String;Format<TArg0,TArg1>;(System.IFormatProvider,System.Text.CompositeFormat,TArg0,TArg1);Argument[1];ReturnValue;taint;df-generated |
-| System;String;Format<TArg0>;(System.IFormatProvider,System.Text.CompositeFormat,TArg0);Argument[1];ReturnValue;taint;df-generated |
+| System;String;Format<TArg0,TArg1,TArg2>;(System.IFormatProvider,System.Text.CompositeFormat,TArg0,TArg1,TArg2);Argument[1].Property[System.Text.CompositeFormat.Format];ReturnValue;value;dfc-generated |
+| System;String;Format<TArg0,TArg1>;(System.IFormatProvider,System.Text.CompositeFormat,TArg0,TArg1);Argument[1].Property[System.Text.CompositeFormat.Format];ReturnValue;value;dfc-generated |
+| System;String;Format<TArg0>;(System.IFormatProvider,System.Text.CompositeFormat,TArg0);Argument[1].Property[System.Text.CompositeFormat.Format];ReturnValue;value;dfc-generated |
 | System;String;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.CharEnumerator.Current];value;manual |
 | System;String;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.Generic.IEnumerator`1.Current];value;manual |
 | System;String;Insert;(System.Int32,System.String);Argument[1];ReturnValue;taint;manual |
@@ -14982,18 +16266,18 @@
 | System;String;PadLeft;(System.Int32,System.Char);Argument[this];ReturnValue;taint;manual |
 | System;String;PadRight;(System.Int32);Argument[this];ReturnValue;taint;manual |
 | System;String;PadRight;(System.Int32,System.Char);Argument[this];ReturnValue;taint;manual |
-| System;String;Parse;(System.String,System.IFormatProvider);Argument[0];ReturnValue;taint;df-generated |
+| System;String;Parse;(System.String,System.IFormatProvider);Argument[0];ReturnValue;value;dfc-generated |
 | System;String;Remove;(System.Int32);Argument[this];ReturnValue;taint;manual |
 | System;String;Remove;(System.Int32,System.Int32);Argument[this];ReturnValue;taint;manual |
 | System;String;Replace;(System.Char,System.Char);Argument[1];ReturnValue;taint;manual |
 | System;String;Replace;(System.Char,System.Char);Argument[this];ReturnValue;taint;manual |
 | System;String;Replace;(System.String,System.String);Argument[1];ReturnValue;taint;manual |
 | System;String;Replace;(System.String,System.String);Argument[this];ReturnValue;taint;manual |
-| System;String;Replace;(System.String,System.String,System.Boolean,System.Globalization.CultureInfo);Argument[this];ReturnValue;taint;df-generated |
-| System;String;Replace;(System.String,System.String,System.StringComparison);Argument[1];ReturnValue;taint;df-generated |
-| System;String;Replace;(System.String,System.String,System.StringComparison);Argument[this];ReturnValue;taint;df-generated |
-| System;String;ReplaceLineEndings;();Argument[this];ReturnValue;taint;df-generated |
-| System;String;ReplaceLineEndings;(System.String);Argument[this];ReturnValue;taint;df-generated |
+| System;String;Replace;(System.String,System.String,System.Boolean,System.Globalization.CultureInfo);Argument[this];ReturnValue;value;dfc-generated |
+| System;String;Replace;(System.String,System.String,System.StringComparison);Argument[1];ReturnValue;taint;dfc-generated |
+| System;String;Replace;(System.String,System.String,System.StringComparison);Argument[this];ReturnValue;value;dfc-generated |
+| System;String;ReplaceLineEndings;();Argument[this];ReturnValue;value;dfc-generated |
+| System;String;ReplaceLineEndings;(System.String);Argument[this];ReturnValue;value;dfc-generated |
 | System;String;Split;(System.Char,System.Int32,System.StringSplitOptions);Argument[this];ReturnValue.Element;taint;manual |
 | System;String;Split;(System.Char,System.StringSplitOptions);Argument[this];ReturnValue.Element;taint;manual |
 | System;String;Split;(System.Char[]);Argument[this];ReturnValue.Element;taint;manual |
@@ -15024,51 +16308,53 @@
 | System;String;TrimStart;();Argument[this];ReturnValue;taint;manual |
 | System;String;TrimStart;(System.Char);Argument[this];ReturnValue;taint;manual |
 | System;String;TrimStart;(System.Char[]);Argument[this];ReturnValue;taint;manual |
-| System;String;TryParse;(System.String,System.IFormatProvider,System.String);Argument[0];ReturnValue;taint;df-generated |
-| System;StringNormalizationExtensions;Normalize;(System.String);Argument[0];ReturnValue;taint;df-generated |
-| System;StringNormalizationExtensions;Normalize;(System.String,System.Text.NormalizationForm);Argument[0];ReturnValue;taint;df-generated |
+| System;String;TryParse;(System.String,System.IFormatProvider,System.String);Argument[0];ReturnValue;value;dfc-generated |
+| System;StringNormalizationExtensions;Normalize;(System.String);Argument[0];ReturnValue;value;dfc-generated |
+| System;StringNormalizationExtensions;Normalize;(System.String,System.Text.NormalizationForm);Argument[0];ReturnValue;value;dfc-generated |
 | System;TimeProvider;CreateTimer;(System.Threading.TimerCallback,System.Object,System.TimeSpan,System.TimeSpan);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
-| System;TimeSpan;op_UnaryPlus;(System.TimeSpan);Argument[0];ReturnValue;taint;df-generated |
+| System;TimeSpan;op_UnaryPlus;(System.TimeSpan);Argument[0];ReturnValue;value;dfc-generated |
 | System;TimeZone;GetDaylightChanges;(System.Int32);Argument[this];ReturnValue;taint;df-generated |
 | System;TimeZone;get_DaylightName;();Argument[this];ReturnValue;taint;df-generated |
 | System;TimeZone;get_StandardName;();Argument[this];ReturnValue;taint;df-generated |
-| System;TimeZoneInfo+AdjustmentRule;CreateAdjustmentRule;(System.DateTime,System.DateTime,System.TimeSpan,System.TimeZoneInfo+TransitionTime,System.TimeZoneInfo+TransitionTime);Argument[2];ReturnValue;taint;df-generated |
-| System;TimeZoneInfo+AdjustmentRule;CreateAdjustmentRule;(System.DateTime,System.DateTime,System.TimeSpan,System.TimeZoneInfo+TransitionTime,System.TimeZoneInfo+TransitionTime);Argument[3];ReturnValue;taint;df-generated |
-| System;TimeZoneInfo+AdjustmentRule;CreateAdjustmentRule;(System.DateTime,System.DateTime,System.TimeSpan,System.TimeZoneInfo+TransitionTime,System.TimeZoneInfo+TransitionTime);Argument[4];ReturnValue;taint;df-generated |
-| System;TimeZoneInfo+AdjustmentRule;CreateAdjustmentRule;(System.DateTime,System.DateTime,System.TimeSpan,System.TimeZoneInfo+TransitionTime,System.TimeZoneInfo+TransitionTime,System.TimeSpan);Argument[2];ReturnValue;taint;df-generated |
-| System;TimeZoneInfo+AdjustmentRule;CreateAdjustmentRule;(System.DateTime,System.DateTime,System.TimeSpan,System.TimeZoneInfo+TransitionTime,System.TimeZoneInfo+TransitionTime,System.TimeSpan);Argument[3];ReturnValue;taint;df-generated |
-| System;TimeZoneInfo+AdjustmentRule;CreateAdjustmentRule;(System.DateTime,System.DateTime,System.TimeSpan,System.TimeZoneInfo+TransitionTime,System.TimeZoneInfo+TransitionTime,System.TimeSpan);Argument[4];ReturnValue;taint;df-generated |
-| System;TimeZoneInfo+AdjustmentRule;CreateAdjustmentRule;(System.DateTime,System.DateTime,System.TimeSpan,System.TimeZoneInfo+TransitionTime,System.TimeZoneInfo+TransitionTime,System.TimeSpan);Argument[5];ReturnValue;taint;df-generated |
-| System;TimeZoneInfo+AdjustmentRule;get_BaseUtcOffsetDelta;();Argument[this];ReturnValue;taint;df-generated |
-| System;TimeZoneInfo+AdjustmentRule;get_DaylightDelta;();Argument[this];ReturnValue;taint;df-generated |
-| System;TimeZoneInfo+AdjustmentRule;get_DaylightTransitionEnd;();Argument[this];ReturnValue;taint;df-generated |
-| System;TimeZoneInfo+AdjustmentRule;get_DaylightTransitionStart;();Argument[this];ReturnValue;taint;df-generated |
-| System;TimeZoneInfo;CreateCustomTimeZone;(System.String,System.TimeSpan,System.String,System.String);Argument[0];ReturnValue;taint;df-generated |
-| System;TimeZoneInfo;CreateCustomTimeZone;(System.String,System.TimeSpan,System.String,System.String);Argument[1];ReturnValue;taint;df-generated |
-| System;TimeZoneInfo;CreateCustomTimeZone;(System.String,System.TimeSpan,System.String,System.String);Argument[2];ReturnValue;taint;df-generated |
-| System;TimeZoneInfo;CreateCustomTimeZone;(System.String,System.TimeSpan,System.String,System.String);Argument[3];ReturnValue;taint;df-generated |
-| System;TimeZoneInfo;CreateCustomTimeZone;(System.String,System.TimeSpan,System.String,System.String,System.String,System.TimeZoneInfo+AdjustmentRule[]);Argument[0];ReturnValue;taint;df-generated |
-| System;TimeZoneInfo;CreateCustomTimeZone;(System.String,System.TimeSpan,System.String,System.String,System.String,System.TimeZoneInfo+AdjustmentRule[]);Argument[1];ReturnValue;taint;df-generated |
-| System;TimeZoneInfo;CreateCustomTimeZone;(System.String,System.TimeSpan,System.String,System.String,System.String,System.TimeZoneInfo+AdjustmentRule[]);Argument[2];ReturnValue;taint;df-generated |
-| System;TimeZoneInfo;CreateCustomTimeZone;(System.String,System.TimeSpan,System.String,System.String,System.String,System.TimeZoneInfo+AdjustmentRule[]);Argument[3];ReturnValue;taint;df-generated |
-| System;TimeZoneInfo;CreateCustomTimeZone;(System.String,System.TimeSpan,System.String,System.String,System.String,System.TimeZoneInfo+AdjustmentRule[]);Argument[4];ReturnValue;taint;df-generated |
-| System;TimeZoneInfo;CreateCustomTimeZone;(System.String,System.TimeSpan,System.String,System.String,System.String,System.TimeZoneInfo+AdjustmentRule[]);Argument[5].Element;ReturnValue;taint;df-generated |
-| System;TimeZoneInfo;CreateCustomTimeZone;(System.String,System.TimeSpan,System.String,System.String,System.String,System.TimeZoneInfo+AdjustmentRule[],System.Boolean);Argument[0];ReturnValue;taint;df-generated |
-| System;TimeZoneInfo;CreateCustomTimeZone;(System.String,System.TimeSpan,System.String,System.String,System.String,System.TimeZoneInfo+AdjustmentRule[],System.Boolean);Argument[1];ReturnValue;taint;df-generated |
-| System;TimeZoneInfo;CreateCustomTimeZone;(System.String,System.TimeSpan,System.String,System.String,System.String,System.TimeZoneInfo+AdjustmentRule[],System.Boolean);Argument[2];ReturnValue;taint;df-generated |
-| System;TimeZoneInfo;CreateCustomTimeZone;(System.String,System.TimeSpan,System.String,System.String,System.String,System.TimeZoneInfo+AdjustmentRule[],System.Boolean);Argument[3];ReturnValue;taint;df-generated |
-| System;TimeZoneInfo;CreateCustomTimeZone;(System.String,System.TimeSpan,System.String,System.String,System.String,System.TimeZoneInfo+AdjustmentRule[],System.Boolean);Argument[4];ReturnValue;taint;df-generated |
-| System;TimeZoneInfo;CreateCustomTimeZone;(System.String,System.TimeSpan,System.String,System.String,System.String,System.TimeZoneInfo+AdjustmentRule[],System.Boolean);Argument[5].Element;ReturnValue;taint;df-generated |
-| System;TimeZoneInfo;FindSystemTimeZoneById;(System.String);Argument[0];ReturnValue;taint;df-generated |
-| System;TimeZoneInfo;GetUtcOffset;(System.DateTime);Argument[this];ReturnValue;taint;df-generated |
-| System;TimeZoneInfo;GetUtcOffset;(System.DateTimeOffset);Argument[this];ReturnValue;taint;df-generated |
-| System;TimeZoneInfo;ToString;();Argument[this];ReturnValue;taint;df-generated |
-| System;TimeZoneInfo;TryFindSystemTimeZoneById;(System.String,System.TimeZoneInfo);Argument[0];ReturnValue;taint;df-generated |
-| System;TimeZoneInfo;get_BaseUtcOffset;();Argument[this];ReturnValue;taint;df-generated |
-| System;TimeZoneInfo;get_DaylightName;();Argument[this];ReturnValue;taint;df-generated |
-| System;TimeZoneInfo;get_DisplayName;();Argument[this];ReturnValue;taint;df-generated |
-| System;TimeZoneInfo;get_Id;();Argument[this];ReturnValue;taint;df-generated |
-| System;TimeZoneInfo;get_StandardName;();Argument[this];ReturnValue;taint;df-generated |
+| System;TimeZoneInfo+AdjustmentRule;CreateAdjustmentRule;(System.DateTime,System.DateTime,System.TimeSpan,System.TimeZoneInfo+TransitionTime,System.TimeZoneInfo+TransitionTime);Argument[2];ReturnValue.SyntheticField[System.TimeZoneInfo+AdjustmentRule._daylightDelta];value;dfc-generated |
+| System;TimeZoneInfo+AdjustmentRule;CreateAdjustmentRule;(System.DateTime,System.DateTime,System.TimeSpan,System.TimeZoneInfo+TransitionTime,System.TimeZoneInfo+TransitionTime);Argument[3];ReturnValue.SyntheticField[System.TimeZoneInfo+AdjustmentRule._daylightTransitionStart];value;dfc-generated |
+| System;TimeZoneInfo+AdjustmentRule;CreateAdjustmentRule;(System.DateTime,System.DateTime,System.TimeSpan,System.TimeZoneInfo+TransitionTime,System.TimeZoneInfo+TransitionTime);Argument[4];ReturnValue.SyntheticField[System.TimeZoneInfo+AdjustmentRule._daylightTransitionEnd];value;dfc-generated |
+| System;TimeZoneInfo+AdjustmentRule;CreateAdjustmentRule;(System.DateTime,System.DateTime,System.TimeSpan,System.TimeZoneInfo+TransitionTime,System.TimeZoneInfo+TransitionTime,System.TimeSpan);Argument[2];ReturnValue.SyntheticField[System.TimeZoneInfo+AdjustmentRule._daylightDelta];value;dfc-generated |
+| System;TimeZoneInfo+AdjustmentRule;CreateAdjustmentRule;(System.DateTime,System.DateTime,System.TimeSpan,System.TimeZoneInfo+TransitionTime,System.TimeZoneInfo+TransitionTime,System.TimeSpan);Argument[3];ReturnValue.SyntheticField[System.TimeZoneInfo+AdjustmentRule._daylightTransitionStart];value;dfc-generated |
+| System;TimeZoneInfo+AdjustmentRule;CreateAdjustmentRule;(System.DateTime,System.DateTime,System.TimeSpan,System.TimeZoneInfo+TransitionTime,System.TimeZoneInfo+TransitionTime,System.TimeSpan);Argument[4];ReturnValue.SyntheticField[System.TimeZoneInfo+AdjustmentRule._daylightTransitionEnd];value;dfc-generated |
+| System;TimeZoneInfo+AdjustmentRule;CreateAdjustmentRule;(System.DateTime,System.DateTime,System.TimeSpan,System.TimeZoneInfo+TransitionTime,System.TimeZoneInfo+TransitionTime,System.TimeSpan);Argument[5];ReturnValue.SyntheticField[System.TimeZoneInfo+AdjustmentRule._baseUtcOffsetDelta];value;dfc-generated |
+| System;TimeZoneInfo+AdjustmentRule;get_BaseUtcOffsetDelta;();Argument[this].SyntheticField[System.TimeZoneInfo+AdjustmentRule._baseUtcOffsetDelta];ReturnValue;value;dfc-generated |
+| System;TimeZoneInfo+AdjustmentRule;get_DaylightDelta;();Argument[this].SyntheticField[System.TimeZoneInfo+AdjustmentRule._daylightDelta];ReturnValue;value;dfc-generated |
+| System;TimeZoneInfo+AdjustmentRule;get_DaylightTransitionEnd;();Argument[this].SyntheticField[System.TimeZoneInfo+AdjustmentRule._daylightTransitionEnd];ReturnValue;value;dfc-generated |
+| System;TimeZoneInfo+AdjustmentRule;get_DaylightTransitionStart;();Argument[this].SyntheticField[System.TimeZoneInfo+AdjustmentRule._daylightTransitionStart];ReturnValue;value;dfc-generated |
+| System;TimeZoneInfo;CreateCustomTimeZone;(System.String,System.TimeSpan,System.String,System.String);Argument[0];ReturnValue.SyntheticField[System.TimeZoneInfo._id];value;dfc-generated |
+| System;TimeZoneInfo;CreateCustomTimeZone;(System.String,System.TimeSpan,System.String,System.String);Argument[1];ReturnValue.SyntheticField[System.TimeZoneInfo._baseUtcOffset];value;dfc-generated |
+| System;TimeZoneInfo;CreateCustomTimeZone;(System.String,System.TimeSpan,System.String,System.String);Argument[2];ReturnValue.SyntheticField[System.TimeZoneInfo._displayName];value;dfc-generated |
+| System;TimeZoneInfo;CreateCustomTimeZone;(System.String,System.TimeSpan,System.String,System.String);Argument[3];ReturnValue.SyntheticField[System.TimeZoneInfo._daylightDisplayName];value;dfc-generated |
+| System;TimeZoneInfo;CreateCustomTimeZone;(System.String,System.TimeSpan,System.String,System.String);Argument[3];ReturnValue.SyntheticField[System.TimeZoneInfo._standardDisplayName];value;dfc-generated |
+| System;TimeZoneInfo;CreateCustomTimeZone;(System.String,System.TimeSpan,System.String,System.String,System.String,System.TimeZoneInfo+AdjustmentRule[]);Argument[0];ReturnValue.SyntheticField[System.TimeZoneInfo._id];value;dfc-generated |
+| System;TimeZoneInfo;CreateCustomTimeZone;(System.String,System.TimeSpan,System.String,System.String,System.String,System.TimeZoneInfo+AdjustmentRule[]);Argument[1];ReturnValue.SyntheticField[System.TimeZoneInfo._baseUtcOffset];value;dfc-generated |
+| System;TimeZoneInfo;CreateCustomTimeZone;(System.String,System.TimeSpan,System.String,System.String,System.String,System.TimeZoneInfo+AdjustmentRule[]);Argument[2];ReturnValue.SyntheticField[System.TimeZoneInfo._displayName];value;dfc-generated |
+| System;TimeZoneInfo;CreateCustomTimeZone;(System.String,System.TimeSpan,System.String,System.String,System.String,System.TimeZoneInfo+AdjustmentRule[]);Argument[3];ReturnValue.SyntheticField[System.TimeZoneInfo._standardDisplayName];value;dfc-generated |
+| System;TimeZoneInfo;CreateCustomTimeZone;(System.String,System.TimeSpan,System.String,System.String,System.String,System.TimeZoneInfo+AdjustmentRule[]);Argument[4];ReturnValue.SyntheticField[System.TimeZoneInfo._daylightDisplayName];value;dfc-generated |
+| System;TimeZoneInfo;CreateCustomTimeZone;(System.String,System.TimeSpan,System.String,System.String,System.String,System.TimeZoneInfo+AdjustmentRule[],System.Boolean);Argument[0];ReturnValue.SyntheticField[System.TimeZoneInfo._id];value;dfc-generated |
+| System;TimeZoneInfo;CreateCustomTimeZone;(System.String,System.TimeSpan,System.String,System.String,System.String,System.TimeZoneInfo+AdjustmentRule[],System.Boolean);Argument[1];ReturnValue.SyntheticField[System.TimeZoneInfo._baseUtcOffset];value;dfc-generated |
+| System;TimeZoneInfo;CreateCustomTimeZone;(System.String,System.TimeSpan,System.String,System.String,System.String,System.TimeZoneInfo+AdjustmentRule[],System.Boolean);Argument[2];ReturnValue.SyntheticField[System.TimeZoneInfo._displayName];value;dfc-generated |
+| System;TimeZoneInfo;CreateCustomTimeZone;(System.String,System.TimeSpan,System.String,System.String,System.String,System.TimeZoneInfo+AdjustmentRule[],System.Boolean);Argument[3];ReturnValue.SyntheticField[System.TimeZoneInfo._standardDisplayName];value;dfc-generated |
+| System;TimeZoneInfo;CreateCustomTimeZone;(System.String,System.TimeSpan,System.String,System.String,System.String,System.TimeZoneInfo+AdjustmentRule[],System.Boolean);Argument[4];ReturnValue.SyntheticField[System.TimeZoneInfo._daylightDisplayName];value;dfc-generated |
+| System;TimeZoneInfo;FindSystemTimeZoneById;(System.String);Argument[0];ReturnValue.SyntheticField[System.TimeZoneInfo._id];value;dfc-generated |
+| System;TimeZoneInfo;GetUtcOffset;(System.DateTime);Argument[this].Property[System.TimeZoneInfo.BaseUtcOffset];ReturnValue;value;dfc-generated |
+| System;TimeZoneInfo;GetUtcOffset;(System.DateTime);Argument[this].SyntheticField[System.TimeZoneInfo._baseUtcOffset];ReturnValue;value;dfc-generated |
+| System;TimeZoneInfo;GetUtcOffset;(System.DateTimeOffset);Argument[this].Property[System.TimeZoneInfo.BaseUtcOffset];ReturnValue;value;dfc-generated |
+| System;TimeZoneInfo;GetUtcOffset;(System.DateTimeOffset);Argument[this].SyntheticField[System.TimeZoneInfo._baseUtcOffset];ReturnValue;value;dfc-generated |
+| System;TimeZoneInfo;ToString;();Argument[this].Property[System.TimeZoneInfo.DisplayName];ReturnValue;value;dfc-generated |
+| System;TimeZoneInfo;ToString;();Argument[this].SyntheticField[System.TimeZoneInfo._displayName];ReturnValue;value;dfc-generated |
+| System;TimeZoneInfo;TryFindSystemTimeZoneById;(System.String,System.TimeZoneInfo);Argument[0];ReturnValue.SyntheticField[System.TimeZoneInfo._id];value;dfc-generated |
+| System;TimeZoneInfo;get_BaseUtcOffset;();Argument[this].SyntheticField[System.TimeZoneInfo._baseUtcOffset];ReturnValue;value;dfc-generated |
+| System;TimeZoneInfo;get_DaylightName;();Argument[this].SyntheticField[System.TimeZoneInfo._daylightDisplayName];ReturnValue;value;dfc-generated |
+| System;TimeZoneInfo;get_DisplayName;();Argument[this].SyntheticField[System.TimeZoneInfo._displayName];ReturnValue;value;dfc-generated |
+| System;TimeZoneInfo;get_Id;();Argument[this].SyntheticField[System.TimeZoneInfo._id];ReturnValue;value;dfc-generated |
+| System;TimeZoneInfo;get_StandardName;();Argument[this].SyntheticField[System.TimeZoneInfo._standardDisplayName];ReturnValue;value;dfc-generated |
 | System;Tuple;Create<T1,T2,T3,T4,T5,T6,T7,T8>;(T1,T2,T3,T4,T5,T6,T7,T8);Argument[0];ReturnValue.Property[System.Tuple`8.Item1];value;manual |
 | System;Tuple;Create<T1,T2,T3,T4,T5,T6,T7,T8>;(T1,T2,T3,T4,T5,T6,T7,T8);Argument[1];ReturnValue.Property[System.Tuple`8.Item2];value;manual |
 | System;Tuple;Create<T1,T2,T3,T4,T5,T6,T7,T8>;(T1,T2,T3,T4,T5,T6,T7,T8);Argument[2];ReturnValue.Property[System.Tuple`8.Item3];value;manual |
@@ -15364,7 +16650,7 @@
 | System;TupleExtensions;ToTuple<T1,T2,T3,T4>;(System.ValueTuple<T1,T2,T3,T4>);Argument[0];ReturnValue;taint;df-generated |
 | System;TupleExtensions;ToTuple<T1,T2,T3>;(System.ValueTuple<T1,T2,T3>);Argument[0];ReturnValue;taint;df-generated |
 | System;TupleExtensions;ToTuple<T1,T2>;(System.ValueTuple<T1,T2>);Argument[0];ReturnValue;taint;df-generated |
-| System;TupleExtensions;ToTuple<T1>;(System.ValueTuple<T1>);Argument[0];ReturnValue;taint;df-generated |
+| System;TupleExtensions;ToTuple<T1>;(System.ValueTuple<T1>);Argument[0].Field[System.ValueTuple`1.Item1];ReturnValue.Property[System.Tuple`1.Item1];value;dfc-generated |
 | System;TupleExtensions;ToValueTuple<T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,T18,T19,T20,T21>;(System.Tuple<T1,T2,T3,T4,T5,T6,T7,System.Tuple<T8,T9,T10,T11,T12,T13,T14,System.Tuple<T15,T16,T17,T18,T19,T20,T21>>>);Argument[0];ReturnValue;taint;df-generated |
 | System;TupleExtensions;ToValueTuple<T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,T18,T19,T20>;(System.Tuple<T1,T2,T3,T4,T5,T6,T7,System.Tuple<T8,T9,T10,T11,T12,T13,T14,System.Tuple<T15,T16,T17,T18,T19,T20>>>);Argument[0];ReturnValue;taint;df-generated |
 | System;TupleExtensions;ToValueTuple<T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,T18,T19>;(System.Tuple<T1,T2,T3,T4,T5,T6,T7,System.Tuple<T8,T9,T10,T11,T12,T13,T14,System.Tuple<T15,T16,T17,T18,T19>>>);Argument[0];ReturnValue;taint;df-generated |
@@ -15385,9 +16671,15 @@
 | System;TupleExtensions;ToValueTuple<T1,T2,T3,T4>;(System.Tuple<T1,T2,T3,T4>);Argument[0];ReturnValue;taint;df-generated |
 | System;TupleExtensions;ToValueTuple<T1,T2,T3>;(System.Tuple<T1,T2,T3>);Argument[0];ReturnValue;taint;df-generated |
 | System;TupleExtensions;ToValueTuple<T1,T2>;(System.Tuple<T1,T2>);Argument[0];ReturnValue;taint;df-generated |
-| System;TupleExtensions;ToValueTuple<T1>;(System.Tuple<T1>);Argument[0];ReturnValue;taint;df-generated |
+| System;TupleExtensions;ToValueTuple<T1>;(System.Tuple<T1>);Argument[0].Property[System.Tuple`1.Item1];ReturnValue.Field[System.ValueTuple`1.Item1];value;dfc-generated |
+| System;Type;FindInterfaces;(System.Reflection.TypeFilter,System.Object);Argument[0];Argument[0].Parameter[delegate-self];value;dfc-generated |
 | System;Type;FindInterfaces;(System.Reflection.TypeFilter,System.Object);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
+| System;Type;FindInterfaces;(System.Reflection.TypeFilter,System.Object);Argument[1];Argument[0].Parameter[1];value;dfc-generated |
+| System;Type;FindInterfaces;(System.Reflection.TypeFilter,System.Object);Argument[1];Argument[0].Parameter[1];value;hq-generated |
+| System;Type;FindMembers;(System.Reflection.MemberTypes,System.Reflection.BindingFlags,System.Reflection.MemberFilter,System.Object);Argument[2];Argument[2].Parameter[delegate-self];value;dfc-generated |
 | System;Type;FindMembers;(System.Reflection.MemberTypes,System.Reflection.BindingFlags,System.Reflection.MemberFilter,System.Object);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
+| System;Type;FindMembers;(System.Reflection.MemberTypes,System.Reflection.BindingFlags,System.Reflection.MemberFilter,System.Object);Argument[3];Argument[2].Parameter[1];value;dfc-generated |
+| System;Type;FindMembers;(System.Reflection.MemberTypes,System.Reflection.BindingFlags,System.Reflection.MemberFilter,System.Object);Argument[3];Argument[2].Parameter[1];value;hq-generated |
 | System;Type;GetConstructorImpl;(System.Reflection.BindingFlags,System.Reflection.Binder,System.Reflection.CallingConventions,System.Type[],System.Reflection.ParameterModifier[]);Argument[this];ReturnValue;taint;df-generated |
 | System;Type;GetElementType;();Argument[this];ReturnValue;taint;df-generated |
 | System;Type;GetEnumUnderlyingType;();Argument[this];ReturnValue;taint;df-generated |
@@ -15395,8 +16687,7 @@
 | System;Type;GetFunctionPointerParameterTypes;();Argument[this];ReturnValue;taint;df-generated |
 | System;Type;GetFunctionPointerReturnType;();Argument[this];ReturnValue;taint;df-generated |
 | System;Type;GetGenericArguments;();Argument[this];ReturnValue;taint;df-generated |
-| System;Type;GetGenericTypeDefinition;();Argument[this];ReturnValue;taint;df-generated |
-| System;Type;GetGenericTypeDefinition;();Argument[this];ReturnValue;value;df-generated |
+| System;Type;GetGenericTypeDefinition;();Argument[this];ReturnValue;value;dfc-generated |
 | System;Type;GetInterface;(System.String,System.Boolean);Argument[this];ReturnValue;taint;df-generated |
 | System;Type;GetInterfaces;();Argument[this];ReturnValue;taint;df-generated |
 | System;Type;GetMethodImpl;(System.String,System.Int32,System.Reflection.BindingFlags,System.Reflection.Binder,System.Reflection.CallingConventions,System.Type[],System.Reflection.ParameterModifier[]);Argument[this];ReturnValue;taint;df-generated |
@@ -15412,7 +16703,7 @@
 | System;Type;MakeArrayType;();Argument[this];ReturnValue;taint;df-generated |
 | System;Type;MakeArrayType;(System.Int32);Argument[this];ReturnValue;taint;df-generated |
 | System;Type;MakeByRefType;();Argument[this];ReturnValue;taint;df-generated |
-| System;Type;MakeGenericSignatureType;(System.Type,System.Type[]);Argument[1].Element;ReturnValue;taint;df-generated |
+| System;Type;MakeGenericSignatureType;(System.Type,System.Type[]);Argument[1].Element;ReturnValue.SyntheticField[System.Reflection.SignatureConstructedGenericType._genericTypeArguments].Element;value;dfc-generated |
 | System;Type;MakeGenericType;(System.Type[]);Argument[this];ReturnValue;taint;df-generated |
 | System;Type;MakePointerType;();Argument[this];ReturnValue;taint;df-generated |
 | System;Type;ToString;();Argument[this];ReturnValue;taint;df-generated |
@@ -15428,90 +16719,87 @@
 | System;Type;get_StructLayoutAttribute;();Argument[this];ReturnValue;taint;df-generated |
 | System;Type;get_TypeHandle;();Argument[this];ReturnValue;taint;df-generated |
 | System;TypeInitializationException;get_TypeName;();Argument[this];ReturnValue;taint;df-generated |
-| System;TypeLoadException;TypeLoadException;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);Argument[0];Argument[this];taint;df-generated |
-| System;TypeLoadException;get_Message;();Argument[this];ReturnValue;taint;df-generated |
-| System;TypeLoadException;get_TypeName;();Argument[this];ReturnValue;taint;df-generated |
-| System;UInt128;Abs;(System.UInt128);Argument[0];ReturnValue;taint;df-generated |
-| System;UInt128;MaxMagnitude;(System.UInt128,System.UInt128);Argument[0];ReturnValue;taint;df-generated |
-| System;UInt128;MaxMagnitude;(System.UInt128,System.UInt128);Argument[1];ReturnValue;taint;df-generated |
-| System;UInt128;MaxMagnitudeNumber;(System.UInt128,System.UInt128);Argument[0];ReturnValue;taint;df-generated |
-| System;UInt128;MaxMagnitudeNumber;(System.UInt128,System.UInt128);Argument[1];ReturnValue;taint;df-generated |
-| System;UInt128;MinMagnitude;(System.UInt128,System.UInt128);Argument[0];ReturnValue;taint;df-generated |
-| System;UInt128;MinMagnitude;(System.UInt128,System.UInt128);Argument[1];ReturnValue;taint;df-generated |
-| System;UInt128;MinMagnitudeNumber;(System.UInt128,System.UInt128);Argument[0];ReturnValue;taint;df-generated |
-| System;UInt128;MinMagnitudeNumber;(System.UInt128,System.UInt128);Argument[1];ReturnValue;taint;df-generated |
-| System;UIntPtr;Abs;(System.UIntPtr);Argument[0];ReturnValue;taint;df-generated |
-| System;UIntPtr;Add;(System.UIntPtr,System.Int32);Argument[0];ReturnValue;taint;df-generated |
-| System;UIntPtr;MaxMagnitude;(System.UIntPtr,System.UIntPtr);Argument[0];ReturnValue;taint;df-generated |
-| System;UIntPtr;MaxMagnitude;(System.UIntPtr,System.UIntPtr);Argument[1];ReturnValue;taint;df-generated |
-| System;UIntPtr;MaxMagnitudeNumber;(System.UIntPtr,System.UIntPtr);Argument[0];ReturnValue;taint;df-generated |
-| System;UIntPtr;MaxMagnitudeNumber;(System.UIntPtr,System.UIntPtr);Argument[1];ReturnValue;taint;df-generated |
-| System;UIntPtr;MinMagnitude;(System.UIntPtr,System.UIntPtr);Argument[0];ReturnValue;taint;df-generated |
-| System;UIntPtr;MinMagnitude;(System.UIntPtr,System.UIntPtr);Argument[1];ReturnValue;taint;df-generated |
-| System;UIntPtr;MinMagnitudeNumber;(System.UIntPtr,System.UIntPtr);Argument[0];ReturnValue;taint;df-generated |
-| System;UIntPtr;MinMagnitudeNumber;(System.UIntPtr,System.UIntPtr);Argument[1];ReturnValue;taint;df-generated |
-| System;UIntPtr;System.Numerics.IAdditionOperators<nuint,nuint,nuint>.op_Addition;(System.UIntPtr,System.UIntPtr);Argument[0];ReturnValue;taint;df-generated |
-| System;UIntPtr;System.Numerics.IAdditionOperators<nuint,nuint,nuint>.op_Addition;(System.UIntPtr,System.UIntPtr);Argument[1];ReturnValue;taint;df-generated |
-| System;UIntPtr;op_Addition;(System.UIntPtr,System.Int32);Argument[0];ReturnValue;taint;df-generated |
-| System;UnhandledExceptionEventArgs;UnhandledExceptionEventArgs;(System.Object,System.Boolean);Argument[0];Argument[this];taint;df-generated |
-| System;UnhandledExceptionEventArgs;get_ExceptionObject;();Argument[this];ReturnValue;taint;df-generated |
+| System;TypeLoadException;TypeLoadException;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);Argument[0].SyntheticField[System.Runtime.Serialization.SerializationInfo._values].Element;Argument[this].SyntheticField[System.TypeLoadException._className];value;dfc-generated |
+| System;TypeLoadException;get_Message;();Argument[this].SyntheticField[System.Exception._message];ReturnValue;value;dfc-generated |
+| System;TypeLoadException;get_TypeName;();Argument[this].SyntheticField[System.TypeLoadException._className];ReturnValue;value;dfc-generated |
+| System;UInt128;Abs;(System.UInt128);Argument[0];ReturnValue;value;dfc-generated |
+| System;UInt128;MaxMagnitude;(System.UInt128,System.UInt128);Argument[0];ReturnValue;value;dfc-generated |
+| System;UInt128;MaxMagnitude;(System.UInt128,System.UInt128);Argument[1];ReturnValue;value;dfc-generated |
+| System;UInt128;MaxMagnitudeNumber;(System.UInt128,System.UInt128);Argument[0];ReturnValue;value;dfc-generated |
+| System;UInt128;MaxMagnitudeNumber;(System.UInt128,System.UInt128);Argument[1];ReturnValue;value;dfc-generated |
+| System;UInt128;MinMagnitude;(System.UInt128,System.UInt128);Argument[0];ReturnValue;value;dfc-generated |
+| System;UInt128;MinMagnitude;(System.UInt128,System.UInt128);Argument[1];ReturnValue;value;dfc-generated |
+| System;UInt128;MinMagnitudeNumber;(System.UInt128,System.UInt128);Argument[0];ReturnValue;value;dfc-generated |
+| System;UInt128;MinMagnitudeNumber;(System.UInt128,System.UInt128);Argument[1];ReturnValue;value;dfc-generated |
+| System;UIntPtr;Abs;(System.UIntPtr);Argument[0];ReturnValue;value;dfc-generated |
+| System;UIntPtr;Add;(System.UIntPtr,System.Int32);Argument[0];ReturnValue;taint;dfc-generated |
+| System;UIntPtr;MaxMagnitude;(System.UIntPtr,System.UIntPtr);Argument[0];ReturnValue;value;dfc-generated |
+| System;UIntPtr;MaxMagnitude;(System.UIntPtr,System.UIntPtr);Argument[1];ReturnValue;value;dfc-generated |
+| System;UIntPtr;MaxMagnitudeNumber;(System.UIntPtr,System.UIntPtr);Argument[0];ReturnValue;value;dfc-generated |
+| System;UIntPtr;MaxMagnitudeNumber;(System.UIntPtr,System.UIntPtr);Argument[1];ReturnValue;value;dfc-generated |
+| System;UIntPtr;MinMagnitude;(System.UIntPtr,System.UIntPtr);Argument[0];ReturnValue;value;dfc-generated |
+| System;UIntPtr;MinMagnitude;(System.UIntPtr,System.UIntPtr);Argument[1];ReturnValue;value;dfc-generated |
+| System;UIntPtr;MinMagnitudeNumber;(System.UIntPtr,System.UIntPtr);Argument[0];ReturnValue;value;dfc-generated |
+| System;UIntPtr;MinMagnitudeNumber;(System.UIntPtr,System.UIntPtr);Argument[1];ReturnValue;value;dfc-generated |
+| System;UIntPtr;System.Numerics.IAdditionOperators<nuint,nuint,nuint>.op_Addition;(System.UIntPtr,System.UIntPtr);Argument[0];ReturnValue;taint;dfc-generated |
+| System;UIntPtr;System.Numerics.IAdditionOperators<nuint,nuint,nuint>.op_Addition;(System.UIntPtr,System.UIntPtr);Argument[1];ReturnValue;taint;dfc-generated |
+| System;UIntPtr;op_Addition;(System.UIntPtr,System.Int32);Argument[0];ReturnValue;taint;dfc-generated |
+| System;UnhandledExceptionEventArgs;UnhandledExceptionEventArgs;(System.Object,System.Boolean);Argument[0];Argument[this].SyntheticField[System.UnhandledExceptionEventArgs._exception];value;dfc-generated |
+| System;UnhandledExceptionEventArgs;get_ExceptionObject;();Argument[this].SyntheticField[System.UnhandledExceptionEventArgs._exception];ReturnValue;value;dfc-generated |
 | System;UnhandledExceptionEventHandler;BeginInvoke;(System.Object,System.UnhandledExceptionEventArgs,System.AsyncCallback,System.Object);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
-| System;Uri;EscapeDataString;(System.String);Argument[0];ReturnValue;taint;df-generated |
-| System;Uri;EscapeString;(System.String);Argument[0];ReturnValue;taint;df-generated |
-| System;Uri;EscapeUriString;(System.String);Argument[0];ReturnValue;taint;df-generated |
+| System;Uri;EscapeDataString;(System.String);Argument[0];ReturnValue;value;dfc-generated |
+| System;Uri;EscapeString;(System.String);Argument[0];ReturnValue;value;dfc-generated |
+| System;Uri;EscapeUriString;(System.String);Argument[0];ReturnValue;value;dfc-generated |
 | System;Uri;GetComponents;(System.UriComponents,System.UriFormat);Argument[this];ReturnValue;taint;df-generated |
 | System;Uri;GetLeftPart;(System.UriPartial);Argument[this];ReturnValue;taint;df-generated |
-| System;Uri;GetObjectData;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);Argument[this];Argument[0];taint;df-generated |
 | System;Uri;MakeRelative;(System.Uri);Argument[0];ReturnValue;taint;df-generated |
 | System;Uri;MakeRelativeUri;(System.Uri);Argument[0];ReturnValue;taint;df-generated |
 | System;Uri;ToString;();Argument[this];ReturnValue;taint;manual |
-| System;Uri;TryCreate;(System.String,System.UriCreationOptions,System.Uri);Argument[0];ReturnValue;taint;df-generated |
-| System;Uri;TryCreate;(System.String,System.UriKind,System.Uri);Argument[0];ReturnValue;taint;df-generated |
-| System;Uri;TryCreate;(System.Uri,System.String,System.Uri);Argument[0];ReturnValue;taint;df-generated |
-| System;Uri;TryCreate;(System.Uri,System.String,System.Uri);Argument[1];ReturnValue;taint;df-generated |
+| System;Uri;ToString;(System.String,System.IFormatProvider);Argument[this].SyntheticField[System.Uri._string];ReturnValue;value;dfc-generated |
+| System;Uri;TryCreate;(System.String,System.UriCreationOptions,System.Uri);Argument[0];ReturnValue.SyntheticField[System.Uri._string];value;dfc-generated |
+| System;Uri;TryCreate;(System.String,System.UriKind,System.Uri);Argument[0];ReturnValue.SyntheticField[System.Uri._string];value;dfc-generated |
+| System;Uri;TryCreate;(System.Uri,System.String,System.Uri);Argument[1];ReturnValue.SyntheticField[System.Uri._string];value;dfc-generated |
 | System;Uri;TryCreate;(System.Uri,System.Uri,System.Uri);Argument[0];ReturnValue;taint;df-generated |
 | System;Uri;TryCreate;(System.Uri,System.Uri,System.Uri);Argument[1];ReturnValue;taint;df-generated |
-| System;Uri;UnescapeDataString;(System.String);Argument[0];ReturnValue;taint;df-generated |
-| System;Uri;Uri;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);Argument[0];Argument[this];taint;df-generated |
+| System;Uri;UnescapeDataString;(System.String);Argument[0];ReturnValue;value;dfc-generated |
 | System;Uri;Uri;(System.String);Argument[0];Argument[this];taint;manual |
 | System;Uri;Uri;(System.String,System.Boolean);Argument[0];Argument[this];taint;manual |
-| System;Uri;Uri;(System.String,System.UriCreationOptions);Argument[0];Argument[this];taint;df-generated |
+| System;Uri;Uri;(System.String,System.UriCreationOptions);Argument[0];Argument[this].SyntheticField[System.Uri._string];value;dfc-generated |
 | System;Uri;Uri;(System.String,System.UriKind);Argument[0];Argument[this];taint;manual |
-| System;Uri;Uri;(System.Uri,System.String);Argument[0];Argument[this];taint;df-generated |
-| System;Uri;Uri;(System.Uri,System.String);Argument[1];Argument[this];taint;df-generated |
-| System;Uri;Uri;(System.Uri,System.String,System.Boolean);Argument[0];Argument[this];taint;df-generated |
-| System;Uri;Uri;(System.Uri,System.String,System.Boolean);Argument[1];Argument[this];taint;df-generated |
+| System;Uri;Uri;(System.Uri,System.String);Argument[1];Argument[this].SyntheticField[System.Uri._string];value;dfc-generated |
+| System;Uri;Uri;(System.Uri,System.String,System.Boolean);Argument[1];Argument[this].SyntheticField[System.Uri._string];value;dfc-generated |
 | System;Uri;Uri;(System.Uri,System.Uri);Argument[0];Argument[this];taint;df-generated |
 | System;Uri;Uri;(System.Uri,System.Uri);Argument[1];Argument[this];taint;df-generated |
 | System;Uri;get_AbsolutePath;();Argument[this];ReturnValue;taint;df-generated |
 | System;Uri;get_Authority;();Argument[this];ReturnValue;taint;df-generated |
-| System;Uri;get_DnsSafeHost;();Argument[this];ReturnValue;taint;df-generated |
+| System;Uri;get_DnsSafeHost;();Argument[this].Property[System.Uri.IdnHost];ReturnValue;value;dfc-generated |
 | System;Uri;get_Host;();Argument[this];ReturnValue;taint;df-generated |
 | System;Uri;get_IdnHost;();Argument[this];ReturnValue;taint;df-generated |
-| System;Uri;get_LocalPath;();Argument[this];ReturnValue;taint;df-generated |
+| System;Uri;get_LocalPath;();Argument[this].SyntheticField[System.Uri._string];ReturnValue;value;dfc-generated |
 | System;Uri;get_OriginalString;();Argument[this];ReturnValue;taint;manual |
 | System;Uri;get_PathAndQuery;();Argument[this];ReturnValue;taint;manual |
 | System;Uri;get_Query;();Argument[this];ReturnValue;taint;manual |
 | System;Uri;get_Scheme;();Argument[this];ReturnValue;taint;df-generated |
 | System;Uri;get_UserInfo;();Argument[this];ReturnValue;taint;df-generated |
-| System;UriBuilder;UriBuilder;(System.String);Argument[0];Argument[this];taint;df-generated |
+| System;UriBuilder;UriBuilder;(System.String);Argument[0];Argument[this].SyntheticField[System.UriBuilder._uri];taint;dfc-generated |
 | System;UriBuilder;UriBuilder;(System.String,System.String);Argument[0];Argument[this];taint;df-generated |
 | System;UriBuilder;UriBuilder;(System.String,System.String);Argument[1];Argument[this];taint;df-generated |
 | System;UriBuilder;UriBuilder;(System.String,System.String,System.Int32,System.String);Argument[3];Argument[this];taint;df-generated |
 | System;UriBuilder;UriBuilder;(System.String,System.String,System.Int32,System.String,System.String);Argument[4];Argument[this];taint;df-generated |
-| System;UriBuilder;UriBuilder;(System.Uri);Argument[0];Argument[this];taint;df-generated |
-| System;UriBuilder;get_Uri;();Argument[this];ReturnValue;taint;df-generated |
+| System;UriBuilder;UriBuilder;(System.Uri);Argument[0];Argument[this].SyntheticField[System.UriBuilder._uri];value;dfc-generated |
+| System;UriBuilder;get_Uri;();Argument[this].SyntheticField[System.UriBuilder._uri];ReturnValue;value;dfc-generated |
 | System;UriParser;GetComponents;(System.Uri,System.UriComponents,System.UriFormat);Argument[0];ReturnValue;taint;df-generated |
-| System;UriParser;OnNewUri;();Argument[this];ReturnValue;value;df-generated |
+| System;UriParser;OnNewUri;();Argument[this];ReturnValue;value;dfc-generated |
 | System;UriParser;Register;(System.UriParser,System.String,System.Int32);Argument[1];Argument[0];taint;df-generated |
 | System;UriParser;Resolve;(System.Uri,System.Uri,System.UriFormatException);Argument[0];ReturnValue;taint;df-generated |
 | System;UriParser;Resolve;(System.Uri,System.Uri,System.UriFormatException);Argument[1];ReturnValue;taint;df-generated |
-| System;UriTypeConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[0];ReturnValue;taint;df-generated |
-| System;UriTypeConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue;taint;df-generated |
-| System;UriTypeConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[this];ReturnValue;taint;df-generated |
-| System;UriTypeConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[1];ReturnValue;taint;df-generated |
-| System;UriTypeConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[2];ReturnValue;taint;df-generated |
-| System;UriTypeConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[this];ReturnValue;taint;df-generated |
+| System;UriTypeConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2].Property[System.Uri.OriginalString];ReturnValue;taint;dfc-generated |
+| System;UriTypeConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue.Element;taint;dfc-generated |
+| System;UriTypeConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue;taint;dfc-generated |
+| System;UriTypeConverter;ConvertFrom;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object);Argument[2];ReturnValue;value;dfc-generated |
+| System;UriTypeConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[2].Element;ReturnValue;taint;dfc-generated |
+| System;UriTypeConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[2].Property[System.Uri.OriginalString];ReturnValue;value;dfc-generated |
+| System;UriTypeConverter;ConvertTo;(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type);Argument[2];ReturnValue;taint;dfc-generated |
 | System;ValueTuple;Create<T1,T2,T3,T4,T5,T6,T7,T8>;(T1,T2,T3,T4,T5,T6,T7,T8);Argument[0];ReturnValue.Field[System.ValueTuple`8.Item1];value;manual |
 | System;ValueTuple;Create<T1,T2,T3,T4,T5,T6,T7,T8>;(T1,T2,T3,T4,T5,T6,T7,T8);Argument[1];ReturnValue.Field[System.ValueTuple`8.Item2];value;manual |
 | System;ValueTuple;Create<T1,T2,T3,T4,T5,T6,T7,T8>;(T1,T2,T3,T4,T5,T6,T7,T8);Argument[2];ReturnValue.Field[System.ValueTuple`8.Item3];value;manual |
@@ -15625,4 +16913,6 @@
 | System;ValueTuple<T1>;ToString;();Argument[this];ReturnValue;taint;df-generated |
 | System;ValueTuple<T1>;ValueTuple;(T1);Argument[0];Argument[this].Field[System.ValueTuple`1.Item1];value;manual |
 | System;ValueTuple<T1>;get_Item;(System.Int32);Argument[this].Field[System.ValueTuple`1.Item1];ReturnValue;value;manual |
+| System;WeakReference;GetObjectData;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);Argument[this].Property[System.WeakReference.Target];Argument[0].SyntheticField[System.Runtime.Serialization.SerializationInfo._values].Element;value;df-generated |
+| System;WeakReference;GetObjectData;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);Argument[this].Property[System.WeakReference.Target];Argument[0].SyntheticField[System.Runtime.Serialization.SerializationInfo._values].Element;value;dfc-generated |
 | System;WeakReference<T>;TryGetTarget;(T);Argument[this];ReturnValue;taint;df-generated |
diff --git a/csharp/ql/test/library-tests/dataflow/threat-models/Test.qll b/csharp/ql/test/library-tests/dataflow/threat-models/Test.qll
index c2e200fd304..3f702d4b019 100644
--- a/csharp/ql/test/library-tests/dataflow/threat-models/Test.qll
+++ b/csharp/ql/test/library-tests/dataflow/threat-models/Test.qll
@@ -4,7 +4,7 @@ private import semmle.code.csharp.dataflow.internal.ExternalFlow
 private import semmle.code.csharp.security.dataflow.flowsources.FlowSources
 
 private module ThreatModelConfig implements DataFlow::ConfigSig {
-  predicate isSource(DataFlow::Node source) { source instanceof ThreatModelFlowSource }
+  predicate isSource(DataFlow::Node source) { source instanceof ActiveThreatModelSource }
 
   predicate isSink(DataFlow::Node sink) { sinkNode(sink, _) }
 }
diff --git a/csharp/ql/test/library-tests/dataflow/threat-models/threat-models-flowtest1.expected b/csharp/ql/test/library-tests/dataflow/threat-models/threat-models-flowtest1.expected
index c592767b4ba..a3850dd73eb 100644
--- a/csharp/ql/test/library-tests/dataflow/threat-models/threat-models-flowtest1.expected
+++ b/csharp/ql/test/library-tests/dataflow/threat-models/threat-models-flowtest1.expected
@@ -1,16 +1,16 @@
 models
 | 1 | Sink: System.Data.SqlClient; SqlCommand; false; SqlCommand; (System.String,System.Data.SqlClient.SqlConnection); ; Argument[0]; sql-injection; manual |
-| 2 | Summary: System.IO; Stream; true; Read; (System.Byte[],System.Int32,System.Int32); ; Argument[this]; Argument[0].Element; taint; manual |
-| 3 | Source: System.Net.Sockets; TcpClient; false; GetStream; ; ; ReturnValue; remote; manual |
+| 2 | Source: System.Net.Sockets; TcpClient; false; GetStream; ; ; ReturnValue; remote; manual |
+| 3 | Summary: System.IO; Stream; true; Read; (System.Byte[],System.Int32,System.Int32); ; Argument[this]; Argument[0].Element; taint; manual |
 | 4 | Summary: System.Text; Encoding; true; GetString; (System.Byte[]); ; Argument[0].Element; ReturnValue; taint; manual |
 edges
 | Test.cs:12:45:12:49 | bytes : Byte[] [element] : Object | Test.cs:15:56:15:60 | access to parameter bytes : Byte[] [element] : Object | provenance |  |
 | Test.cs:15:56:15:60 | access to parameter bytes : Byte[] [element] : Object | Test.cs:15:20:15:61 | call to method GetString : String | provenance | MaD:4 |
 | Test.cs:23:33:23:38 | access to local variable stream : NetworkStream | Test.cs:25:29:25:34 | access to local variable stream : NetworkStream | provenance |  |
-| Test.cs:23:42:23:59 | call to method GetStream : NetworkStream | Test.cs:23:33:23:38 | access to local variable stream : NetworkStream | provenance | Src:MaD:3  |
-| Test.cs:25:29:25:34 | access to local variable stream : NetworkStream | Test.cs:25:41:25:46 | [post] access to local variable buffer : Byte[] [element] : Object | provenance | MaD:2 |
+| Test.cs:23:42:23:59 | call to method GetStream : NetworkStream | Test.cs:23:33:23:38 | access to local variable stream : NetworkStream | provenance | Src:MaD:2  |
+| Test.cs:25:29:25:34 | access to local variable stream : NetworkStream | Test.cs:25:41:25:46 | [post] access to local variable buffer : Byte[] [element] : Object | provenance | MaD:3 |
 | Test.cs:25:41:25:46 | [post] access to local variable buffer : Byte[] [element] : Object | Test.cs:28:99:28:104 | access to local variable buffer : Byte[] [element] : Object | provenance |  |
-| Test.cs:28:85:28:105 | call to method BytesToString : String | Test.cs:28:42:28:111 | ... + ... | provenance |  Sink:MaD:1 |
+| Test.cs:28:85:28:105 | call to method BytesToString : String | Test.cs:28:42:28:111 | ... + ... | provenance | Sink:MaD:1 |
 | Test.cs:28:99:28:104 | access to local variable buffer : Byte[] [element] : Object | Test.cs:12:45:12:49 | bytes : Byte[] [element] : Object | provenance |  |
 | Test.cs:28:99:28:104 | access to local variable buffer : Byte[] [element] : Object | Test.cs:28:85:28:105 | call to method BytesToString : String | provenance | MaD:4 |
 nodes
diff --git a/csharp/ql/test/library-tests/dataflow/threat-models/threat-models-flowtest2.expected b/csharp/ql/test/library-tests/dataflow/threat-models/threat-models-flowtest2.expected
index 62e00fb6976..9b1b32b57fd 100644
--- a/csharp/ql/test/library-tests/dataflow/threat-models/threat-models-flowtest2.expected
+++ b/csharp/ql/test/library-tests/dataflow/threat-models/threat-models-flowtest2.expected
@@ -1,21 +1,21 @@
 models
 | 1 | Sink: System.Data.SqlClient; SqlCommand; false; SqlCommand; (System.String,System.Data.SqlClient.SqlConnection); ; Argument[0]; sql-injection; manual |
-| 2 | Summary: System.IO; Stream; true; Read; (System.Byte[],System.Int32,System.Int32); ; Argument[this]; Argument[0].Element; taint; manual |
+| 2 | Source: My.Qltest; TestSources; false; ExecuteQuery; (System.String); ; ReturnValue; database; manual |
 | 3 | Source: System.Net.Sockets; TcpClient; false; GetStream; ; ; ReturnValue; remote; manual |
-| 4 | Summary: System.Text; Encoding; true; GetString; (System.Byte[]); ; Argument[0].Element; ReturnValue; taint; manual |
-| 5 | Source: My.Qltest; TestSources; false; ExecuteQuery; (System.String); ; ReturnValue; database; manual |
+| 4 | Summary: System.IO; Stream; true; Read; (System.Byte[],System.Int32,System.Int32); ; Argument[this]; Argument[0].Element; taint; manual |
+| 5 | Summary: System.Text; Encoding; true; GetString; (System.Byte[]); ; Argument[0].Element; ReturnValue; taint; manual |
 edges
 | Test.cs:12:45:12:49 | bytes : Byte[] [element] : Object | Test.cs:15:56:15:60 | access to parameter bytes : Byte[] [element] : Object | provenance |  |
-| Test.cs:15:56:15:60 | access to parameter bytes : Byte[] [element] : Object | Test.cs:15:20:15:61 | call to method GetString : String | provenance | MaD:4 |
+| Test.cs:15:56:15:60 | access to parameter bytes : Byte[] [element] : Object | Test.cs:15:20:15:61 | call to method GetString : String | provenance | MaD:5 |
 | Test.cs:23:33:23:38 | access to local variable stream : NetworkStream | Test.cs:25:29:25:34 | access to local variable stream : NetworkStream | provenance |  |
 | Test.cs:23:42:23:59 | call to method GetStream : NetworkStream | Test.cs:23:33:23:38 | access to local variable stream : NetworkStream | provenance | Src:MaD:3  |
-| Test.cs:25:29:25:34 | access to local variable stream : NetworkStream | Test.cs:25:41:25:46 | [post] access to local variable buffer : Byte[] [element] : Object | provenance | MaD:2 |
+| Test.cs:25:29:25:34 | access to local variable stream : NetworkStream | Test.cs:25:41:25:46 | [post] access to local variable buffer : Byte[] [element] : Object | provenance | MaD:4 |
 | Test.cs:25:41:25:46 | [post] access to local variable buffer : Byte[] [element] : Object | Test.cs:28:99:28:104 | access to local variable buffer : Byte[] [element] : Object | provenance |  |
-| Test.cs:28:85:28:105 | call to method BytesToString : String | Test.cs:28:42:28:111 | ... + ... | provenance |  Sink:MaD:1 |
+| Test.cs:28:85:28:105 | call to method BytesToString : String | Test.cs:28:42:28:111 | ... + ... | provenance | Sink:MaD:1 |
 | Test.cs:28:99:28:104 | access to local variable buffer : Byte[] [element] : Object | Test.cs:12:45:12:49 | bytes : Byte[] [element] : Object | provenance |  |
-| Test.cs:28:99:28:104 | access to local variable buffer : Byte[] [element] : Object | Test.cs:28:85:28:105 | call to method BytesToString : String | provenance | MaD:4 |
-| Test.cs:34:20:34:25 | access to local variable result : String | Test.cs:37:42:37:96 | ... + ... | provenance |  Sink:MaD:1 |
-| Test.cs:34:29:34:69 | call to method ExecuteQuery : String | Test.cs:34:20:34:25 | access to local variable result : String | provenance | Src:MaD:5  |
+| Test.cs:28:99:28:104 | access to local variable buffer : Byte[] [element] : Object | Test.cs:28:85:28:105 | call to method BytesToString : String | provenance | MaD:5 |
+| Test.cs:34:20:34:25 | access to local variable result : String | Test.cs:37:42:37:96 | ... + ... | provenance | Sink:MaD:1 |
+| Test.cs:34:29:34:69 | call to method ExecuteQuery : String | Test.cs:34:20:34:25 | access to local variable result : String | provenance | Src:MaD:2  |
 nodes
 | Test.cs:12:45:12:49 | bytes : Byte[] [element] : Object | semmle.label | bytes : Byte[] [element] : Object |
 | Test.cs:15:20:15:61 | call to method GetString : String | semmle.label | call to method GetString : String |
diff --git a/csharp/ql/test/library-tests/dataflow/threat-models/threat-models-flowtest3.expected b/csharp/ql/test/library-tests/dataflow/threat-models/threat-models-flowtest3.expected
index d6477b5923e..ee8d0615b2d 100644
--- a/csharp/ql/test/library-tests/dataflow/threat-models/threat-models-flowtest3.expected
+++ b/csharp/ql/test/library-tests/dataflow/threat-models/threat-models-flowtest3.expected
@@ -1,27 +1,27 @@
 models
 | 1 | Sink: System.Data.SqlClient; SqlCommand; false; SqlCommand; (System.String,System.Data.SqlClient.SqlConnection); ; Argument[0]; sql-injection; manual |
-| 2 | Summary: System.IO; Stream; true; Read; (System.Byte[],System.Int32,System.Int32); ; Argument[this]; Argument[0].Element; taint; manual |
-| 3 | Source: System.Net.Sockets; TcpClient; false; GetStream; ; ; ReturnValue; remote; manual |
-| 4 | Summary: System.Text; Encoding; true; GetString; (System.Byte[]); ; Argument[0].Element; ReturnValue; taint; manual |
-| 5 | Source: My.Qltest; TestSources; false; ExecuteQuery; (System.String); ; ReturnValue; database; manual |
-| 6 | Source: My.Qltest; TestSources; false; ReadEnv; (System.String); ; ReturnValue; environment; manual |
-| 7 | Source: My.Qltest; TestSources; false; GetCliArg; (System.Int32); ; ReturnValue; commandargs; manual |
+| 2 | Source: My.Qltest; TestSources; false; ExecuteQuery; (System.String); ; ReturnValue; database; manual |
+| 3 | Source: My.Qltest; TestSources; false; GetCliArg; (System.Int32); ; ReturnValue; commandargs; manual |
+| 4 | Source: My.Qltest; TestSources; false; ReadEnv; (System.String); ; ReturnValue; environment; manual |
+| 5 | Source: System.Net.Sockets; TcpClient; false; GetStream; ; ; ReturnValue; remote; manual |
+| 6 | Summary: System.IO; Stream; true; Read; (System.Byte[],System.Int32,System.Int32); ; Argument[this]; Argument[0].Element; taint; manual |
+| 7 | Summary: System.Text; Encoding; true; GetString; (System.Byte[]); ; Argument[0].Element; ReturnValue; taint; manual |
 edges
 | Test.cs:12:45:12:49 | bytes : Byte[] [element] : Object | Test.cs:15:56:15:60 | access to parameter bytes : Byte[] [element] : Object | provenance |  |
-| Test.cs:15:56:15:60 | access to parameter bytes : Byte[] [element] : Object | Test.cs:15:20:15:61 | call to method GetString : String | provenance | MaD:4 |
+| Test.cs:15:56:15:60 | access to parameter bytes : Byte[] [element] : Object | Test.cs:15:20:15:61 | call to method GetString : String | provenance | MaD:7 |
 | Test.cs:23:33:23:38 | access to local variable stream : NetworkStream | Test.cs:25:29:25:34 | access to local variable stream : NetworkStream | provenance |  |
-| Test.cs:23:42:23:59 | call to method GetStream : NetworkStream | Test.cs:23:33:23:38 | access to local variable stream : NetworkStream | provenance | Src:MaD:3  |
-| Test.cs:25:29:25:34 | access to local variable stream : NetworkStream | Test.cs:25:41:25:46 | [post] access to local variable buffer : Byte[] [element] : Object | provenance | MaD:2 |
+| Test.cs:23:42:23:59 | call to method GetStream : NetworkStream | Test.cs:23:33:23:38 | access to local variable stream : NetworkStream | provenance | Src:MaD:5  |
+| Test.cs:25:29:25:34 | access to local variable stream : NetworkStream | Test.cs:25:41:25:46 | [post] access to local variable buffer : Byte[] [element] : Object | provenance | MaD:6 |
 | Test.cs:25:41:25:46 | [post] access to local variable buffer : Byte[] [element] : Object | Test.cs:28:99:28:104 | access to local variable buffer : Byte[] [element] : Object | provenance |  |
-| Test.cs:28:85:28:105 | call to method BytesToString : String | Test.cs:28:42:28:111 | ... + ... | provenance |  Sink:MaD:1 |
+| Test.cs:28:85:28:105 | call to method BytesToString : String | Test.cs:28:42:28:111 | ... + ... | provenance | Sink:MaD:1 |
 | Test.cs:28:99:28:104 | access to local variable buffer : Byte[] [element] : Object | Test.cs:12:45:12:49 | bytes : Byte[] [element] : Object | provenance |  |
-| Test.cs:28:99:28:104 | access to local variable buffer : Byte[] [element] : Object | Test.cs:28:85:28:105 | call to method BytesToString : String | provenance | MaD:4 |
-| Test.cs:34:20:34:25 | access to local variable result : String | Test.cs:37:42:37:96 | ... + ... | provenance |  Sink:MaD:1 |
-| Test.cs:34:29:34:69 | call to method ExecuteQuery : String | Test.cs:34:20:34:25 | access to local variable result : String | provenance | Src:MaD:5  |
-| Test.cs:43:20:43:25 | access to local variable result : String | Test.cs:46:42:46:96 | ... + ... | provenance |  Sink:MaD:1 |
-| Test.cs:43:29:43:50 | call to method ReadEnv : String | Test.cs:43:20:43:25 | access to local variable result : String | provenance | Src:MaD:6  |
-| Test.cs:62:20:62:25 | access to local variable result : String | Test.cs:65:42:65:96 | ... + ... | provenance |  Sink:MaD:1 |
-| Test.cs:62:29:62:48 | call to method GetCliArg : String | Test.cs:62:20:62:25 | access to local variable result : String | provenance | Src:MaD:7  |
+| Test.cs:28:99:28:104 | access to local variable buffer : Byte[] [element] : Object | Test.cs:28:85:28:105 | call to method BytesToString : String | provenance | MaD:7 |
+| Test.cs:34:20:34:25 | access to local variable result : String | Test.cs:37:42:37:96 | ... + ... | provenance | Sink:MaD:1 |
+| Test.cs:34:29:34:69 | call to method ExecuteQuery : String | Test.cs:34:20:34:25 | access to local variable result : String | provenance | Src:MaD:2  |
+| Test.cs:43:20:43:25 | access to local variable result : String | Test.cs:46:42:46:96 | ... + ... | provenance | Sink:MaD:1 |
+| Test.cs:43:29:43:50 | call to method ReadEnv : String | Test.cs:43:20:43:25 | access to local variable result : String | provenance | Src:MaD:4  |
+| Test.cs:62:20:62:25 | access to local variable result : String | Test.cs:65:42:65:96 | ... + ... | provenance | Sink:MaD:1 |
+| Test.cs:62:29:62:48 | call to method GetCliArg : String | Test.cs:62:20:62:25 | access to local variable result : String | provenance | Src:MaD:3  |
 nodes
 | Test.cs:12:45:12:49 | bytes : Byte[] [element] : Object | semmle.label | bytes : Byte[] [element] : Object |
 | Test.cs:15:20:15:61 | call to method GetString : String | semmle.label | call to method GetString : String |
diff --git a/csharp/ql/test/library-tests/dataflow/threat-models/threat-models-flowtest4.expected b/csharp/ql/test/library-tests/dataflow/threat-models/threat-models-flowtest4.expected
index 877d75bbd71..cac7f178b40 100644
--- a/csharp/ql/test/library-tests/dataflow/threat-models/threat-models-flowtest4.expected
+++ b/csharp/ql/test/library-tests/dataflow/threat-models/threat-models-flowtest4.expected
@@ -1,30 +1,30 @@
 models
 | 1 | Sink: System.Data.SqlClient; SqlCommand; false; SqlCommand; (System.String,System.Data.SqlClient.SqlConnection); ; Argument[0]; sql-injection; manual |
-| 2 | Summary: System.IO; Stream; true; Read; (System.Byte[],System.Int32,System.Int32); ; Argument[this]; Argument[0].Element; taint; manual |
-| 3 | Source: System.Net.Sockets; TcpClient; false; GetStream; ; ; ReturnValue; remote; manual |
-| 4 | Summary: System.Text; Encoding; true; GetString; (System.Byte[]); ; Argument[0].Element; ReturnValue; taint; manual |
-| 5 | Source: My.Qltest; TestSources; false; ExecuteQuery; (System.String); ; ReturnValue; database; manual |
-| 6 | Source: My.Qltest; TestSources; false; ReadEnv; (System.String); ; ReturnValue; environment; manual |
-| 7 | Source: My.Qltest; TestSources; false; GetCustom; (System.String); ; ReturnValue; custom; manual |
-| 8 | Source: My.Qltest; TestSources; false; GetCliArg; (System.Int32); ; ReturnValue; commandargs; manual |
+| 2 | Source: My.Qltest; TestSources; false; ExecuteQuery; (System.String); ; ReturnValue; database; manual |
+| 3 | Source: My.Qltest; TestSources; false; GetCliArg; (System.Int32); ; ReturnValue; commandargs; manual |
+| 4 | Source: My.Qltest; TestSources; false; GetCustom; (System.String); ; ReturnValue; custom; manual |
+| 5 | Source: My.Qltest; TestSources; false; ReadEnv; (System.String); ; ReturnValue; environment; manual |
+| 6 | Source: System.Net.Sockets; TcpClient; false; GetStream; ; ; ReturnValue; remote; manual |
+| 7 | Summary: System.IO; Stream; true; Read; (System.Byte[],System.Int32,System.Int32); ; Argument[this]; Argument[0].Element; taint; manual |
+| 8 | Summary: System.Text; Encoding; true; GetString; (System.Byte[]); ; Argument[0].Element; ReturnValue; taint; manual |
 edges
 | Test.cs:12:45:12:49 | bytes : Byte[] [element] : Object | Test.cs:15:56:15:60 | access to parameter bytes : Byte[] [element] : Object | provenance |  |
-| Test.cs:15:56:15:60 | access to parameter bytes : Byte[] [element] : Object | Test.cs:15:20:15:61 | call to method GetString : String | provenance | MaD:4 |
+| Test.cs:15:56:15:60 | access to parameter bytes : Byte[] [element] : Object | Test.cs:15:20:15:61 | call to method GetString : String | provenance | MaD:8 |
 | Test.cs:23:33:23:38 | access to local variable stream : NetworkStream | Test.cs:25:29:25:34 | access to local variable stream : NetworkStream | provenance |  |
-| Test.cs:23:42:23:59 | call to method GetStream : NetworkStream | Test.cs:23:33:23:38 | access to local variable stream : NetworkStream | provenance | Src:MaD:3  |
-| Test.cs:25:29:25:34 | access to local variable stream : NetworkStream | Test.cs:25:41:25:46 | [post] access to local variable buffer : Byte[] [element] : Object | provenance | MaD:2 |
+| Test.cs:23:42:23:59 | call to method GetStream : NetworkStream | Test.cs:23:33:23:38 | access to local variable stream : NetworkStream | provenance | Src:MaD:6  |
+| Test.cs:25:29:25:34 | access to local variable stream : NetworkStream | Test.cs:25:41:25:46 | [post] access to local variable buffer : Byte[] [element] : Object | provenance | MaD:7 |
 | Test.cs:25:41:25:46 | [post] access to local variable buffer : Byte[] [element] : Object | Test.cs:28:99:28:104 | access to local variable buffer : Byte[] [element] : Object | provenance |  |
-| Test.cs:28:85:28:105 | call to method BytesToString : String | Test.cs:28:42:28:111 | ... + ... | provenance |  Sink:MaD:1 |
+| Test.cs:28:85:28:105 | call to method BytesToString : String | Test.cs:28:42:28:111 | ... + ... | provenance | Sink:MaD:1 |
 | Test.cs:28:99:28:104 | access to local variable buffer : Byte[] [element] : Object | Test.cs:12:45:12:49 | bytes : Byte[] [element] : Object | provenance |  |
-| Test.cs:28:99:28:104 | access to local variable buffer : Byte[] [element] : Object | Test.cs:28:85:28:105 | call to method BytesToString : String | provenance | MaD:4 |
-| Test.cs:34:20:34:25 | access to local variable result : String | Test.cs:37:42:37:96 | ... + ... | provenance |  Sink:MaD:1 |
-| Test.cs:34:29:34:69 | call to method ExecuteQuery : String | Test.cs:34:20:34:25 | access to local variable result : String | provenance | Src:MaD:5  |
-| Test.cs:43:20:43:25 | access to local variable result : String | Test.cs:46:42:46:96 | ... + ... | provenance |  Sink:MaD:1 |
-| Test.cs:43:29:43:50 | call to method ReadEnv : String | Test.cs:43:20:43:25 | access to local variable result : String | provenance | Src:MaD:6  |
-| Test.cs:53:20:53:25 | access to local variable result : String | Test.cs:56:42:56:96 | ... + ... | provenance |  Sink:MaD:1 |
-| Test.cs:53:29:53:52 | call to method GetCustom : String | Test.cs:53:20:53:25 | access to local variable result : String | provenance | Src:MaD:7  |
-| Test.cs:62:20:62:25 | access to local variable result : String | Test.cs:65:42:65:96 | ... + ... | provenance |  Sink:MaD:1 |
-| Test.cs:62:29:62:48 | call to method GetCliArg : String | Test.cs:62:20:62:25 | access to local variable result : String | provenance | Src:MaD:8  |
+| Test.cs:28:99:28:104 | access to local variable buffer : Byte[] [element] : Object | Test.cs:28:85:28:105 | call to method BytesToString : String | provenance | MaD:8 |
+| Test.cs:34:20:34:25 | access to local variable result : String | Test.cs:37:42:37:96 | ... + ... | provenance | Sink:MaD:1 |
+| Test.cs:34:29:34:69 | call to method ExecuteQuery : String | Test.cs:34:20:34:25 | access to local variable result : String | provenance | Src:MaD:2  |
+| Test.cs:43:20:43:25 | access to local variable result : String | Test.cs:46:42:46:96 | ... + ... | provenance | Sink:MaD:1 |
+| Test.cs:43:29:43:50 | call to method ReadEnv : String | Test.cs:43:20:43:25 | access to local variable result : String | provenance | Src:MaD:5  |
+| Test.cs:53:20:53:25 | access to local variable result : String | Test.cs:56:42:56:96 | ... + ... | provenance | Sink:MaD:1 |
+| Test.cs:53:29:53:52 | call to method GetCustom : String | Test.cs:53:20:53:25 | access to local variable result : String | provenance | Src:MaD:4  |
+| Test.cs:62:20:62:25 | access to local variable result : String | Test.cs:65:42:65:96 | ... + ... | provenance | Sink:MaD:1 |
+| Test.cs:62:29:62:48 | call to method GetCliArg : String | Test.cs:62:20:62:25 | access to local variable result : String | provenance | Src:MaD:3  |
 nodes
 | Test.cs:12:45:12:49 | bytes : Byte[] [element] : Object | semmle.label | bytes : Byte[] [element] : Object |
 | Test.cs:15:20:15:61 | call to method GetString : String | semmle.label | call to method GetString : String |
diff --git a/csharp/ql/test/library-tests/dataflow/threat-models/threat-models-flowtest5.expected b/csharp/ql/test/library-tests/dataflow/threat-models/threat-models-flowtest5.expected
index 9251f7fd4b7..b0e7142693f 100644
--- a/csharp/ql/test/library-tests/dataflow/threat-models/threat-models-flowtest5.expected
+++ b/csharp/ql/test/library-tests/dataflow/threat-models/threat-models-flowtest5.expected
@@ -1,24 +1,24 @@
 models
 | 1 | Sink: System.Data.SqlClient; SqlCommand; false; SqlCommand; (System.String,System.Data.SqlClient.SqlConnection); ; Argument[0]; sql-injection; manual |
-| 2 | Summary: System.IO; Stream; true; Read; (System.Byte[],System.Int32,System.Int32); ; Argument[this]; Argument[0].Element; taint; manual |
-| 3 | Source: System.Net.Sockets; TcpClient; false; GetStream; ; ; ReturnValue; remote; manual |
-| 4 | Summary: System.Text; Encoding; true; GetString; (System.Byte[]); ; Argument[0].Element; ReturnValue; taint; manual |
-| 5 | Source: My.Qltest; TestSources; false; ReadEnv; (System.String); ; ReturnValue; environment; manual |
-| 6 | Source: My.Qltest; TestSources; false; GetCliArg; (System.Int32); ; ReturnValue; commandargs; manual |
+| 2 | Source: My.Qltest; TestSources; false; GetCliArg; (System.Int32); ; ReturnValue; commandargs; manual |
+| 3 | Source: My.Qltest; TestSources; false; ReadEnv; (System.String); ; ReturnValue; environment; manual |
+| 4 | Source: System.Net.Sockets; TcpClient; false; GetStream; ; ; ReturnValue; remote; manual |
+| 5 | Summary: System.IO; Stream; true; Read; (System.Byte[],System.Int32,System.Int32); ; Argument[this]; Argument[0].Element; taint; manual |
+| 6 | Summary: System.Text; Encoding; true; GetString; (System.Byte[]); ; Argument[0].Element; ReturnValue; taint; manual |
 edges
 | Test.cs:12:45:12:49 | bytes : Byte[] [element] : Object | Test.cs:15:56:15:60 | access to parameter bytes : Byte[] [element] : Object | provenance |  |
-| Test.cs:15:56:15:60 | access to parameter bytes : Byte[] [element] : Object | Test.cs:15:20:15:61 | call to method GetString : String | provenance | MaD:4 |
+| Test.cs:15:56:15:60 | access to parameter bytes : Byte[] [element] : Object | Test.cs:15:20:15:61 | call to method GetString : String | provenance | MaD:6 |
 | Test.cs:23:33:23:38 | access to local variable stream : NetworkStream | Test.cs:25:29:25:34 | access to local variable stream : NetworkStream | provenance |  |
-| Test.cs:23:42:23:59 | call to method GetStream : NetworkStream | Test.cs:23:33:23:38 | access to local variable stream : NetworkStream | provenance | Src:MaD:3  |
-| Test.cs:25:29:25:34 | access to local variable stream : NetworkStream | Test.cs:25:41:25:46 | [post] access to local variable buffer : Byte[] [element] : Object | provenance | MaD:2 |
+| Test.cs:23:42:23:59 | call to method GetStream : NetworkStream | Test.cs:23:33:23:38 | access to local variable stream : NetworkStream | provenance | Src:MaD:4  |
+| Test.cs:25:29:25:34 | access to local variable stream : NetworkStream | Test.cs:25:41:25:46 | [post] access to local variable buffer : Byte[] [element] : Object | provenance | MaD:5 |
 | Test.cs:25:41:25:46 | [post] access to local variable buffer : Byte[] [element] : Object | Test.cs:28:99:28:104 | access to local variable buffer : Byte[] [element] : Object | provenance |  |
-| Test.cs:28:85:28:105 | call to method BytesToString : String | Test.cs:28:42:28:111 | ... + ... | provenance |  Sink:MaD:1 |
+| Test.cs:28:85:28:105 | call to method BytesToString : String | Test.cs:28:42:28:111 | ... + ... | provenance | Sink:MaD:1 |
 | Test.cs:28:99:28:104 | access to local variable buffer : Byte[] [element] : Object | Test.cs:12:45:12:49 | bytes : Byte[] [element] : Object | provenance |  |
-| Test.cs:28:99:28:104 | access to local variable buffer : Byte[] [element] : Object | Test.cs:28:85:28:105 | call to method BytesToString : String | provenance | MaD:4 |
-| Test.cs:43:20:43:25 | access to local variable result : String | Test.cs:46:42:46:96 | ... + ... | provenance |  Sink:MaD:1 |
-| Test.cs:43:29:43:50 | call to method ReadEnv : String | Test.cs:43:20:43:25 | access to local variable result : String | provenance | Src:MaD:5  |
-| Test.cs:62:20:62:25 | access to local variable result : String | Test.cs:65:42:65:96 | ... + ... | provenance |  Sink:MaD:1 |
-| Test.cs:62:29:62:48 | call to method GetCliArg : String | Test.cs:62:20:62:25 | access to local variable result : String | provenance | Src:MaD:6  |
+| Test.cs:28:99:28:104 | access to local variable buffer : Byte[] [element] : Object | Test.cs:28:85:28:105 | call to method BytesToString : String | provenance | MaD:6 |
+| Test.cs:43:20:43:25 | access to local variable result : String | Test.cs:46:42:46:96 | ... + ... | provenance | Sink:MaD:1 |
+| Test.cs:43:29:43:50 | call to method ReadEnv : String | Test.cs:43:20:43:25 | access to local variable result : String | provenance | Src:MaD:3  |
+| Test.cs:62:20:62:25 | access to local variable result : String | Test.cs:65:42:65:96 | ... + ... | provenance | Sink:MaD:1 |
+| Test.cs:62:29:62:48 | call to method GetCliArg : String | Test.cs:62:20:62:25 | access to local variable result : String | provenance | Src:MaD:2  |
 nodes
 | Test.cs:12:45:12:49 | bytes : Byte[] [element] : Object | semmle.label | bytes : Byte[] [element] : Object |
 | Test.cs:15:20:15:61 | call to method GetString : String | semmle.label | call to method GetString : String |
diff --git a/csharp/ql/test/library-tests/dataflow/threat-models/threat-models-flowtest6.expected b/csharp/ql/test/library-tests/dataflow/threat-models/threat-models-flowtest6.expected
index 8be2901ea9e..ae9fccfab80 100644
--- a/csharp/ql/test/library-tests/dataflow/threat-models/threat-models-flowtest6.expected
+++ b/csharp/ql/test/library-tests/dataflow/threat-models/threat-models-flowtest6.expected
@@ -1,24 +1,24 @@
 models
 | 1 | Sink: System.Data.SqlClient; SqlCommand; false; SqlCommand; (System.String,System.Data.SqlClient.SqlConnection); ; Argument[0]; sql-injection; manual |
-| 2 | Summary: System.IO; Stream; true; Read; (System.Byte[],System.Int32,System.Int32); ; Argument[this]; Argument[0].Element; taint; manual |
-| 3 | Source: System.Net.Sockets; TcpClient; false; GetStream; ; ; ReturnValue; remote; manual |
-| 4 | Summary: System.Text; Encoding; true; GetString; (System.Byte[]); ; Argument[0].Element; ReturnValue; taint; manual |
-| 5 | Source: My.Qltest; TestSources; false; ExecuteQuery; (System.String); ; ReturnValue; database; manual |
-| 6 | Source: My.Qltest; TestSources; false; GetCliArg; (System.Int32); ; ReturnValue; commandargs; manual |
+| 2 | Source: My.Qltest; TestSources; false; ExecuteQuery; (System.String); ; ReturnValue; database; manual |
+| 3 | Source: My.Qltest; TestSources; false; GetCliArg; (System.Int32); ; ReturnValue; commandargs; manual |
+| 4 | Source: System.Net.Sockets; TcpClient; false; GetStream; ; ; ReturnValue; remote; manual |
+| 5 | Summary: System.IO; Stream; true; Read; (System.Byte[],System.Int32,System.Int32); ; Argument[this]; Argument[0].Element; taint; manual |
+| 6 | Summary: System.Text; Encoding; true; GetString; (System.Byte[]); ; Argument[0].Element; ReturnValue; taint; manual |
 edges
 | Test.cs:12:45:12:49 | bytes : Byte[] [element] : Object | Test.cs:15:56:15:60 | access to parameter bytes : Byte[] [element] : Object | provenance |  |
-| Test.cs:15:56:15:60 | access to parameter bytes : Byte[] [element] : Object | Test.cs:15:20:15:61 | call to method GetString : String | provenance | MaD:4 |
+| Test.cs:15:56:15:60 | access to parameter bytes : Byte[] [element] : Object | Test.cs:15:20:15:61 | call to method GetString : String | provenance | MaD:6 |
 | Test.cs:23:33:23:38 | access to local variable stream : NetworkStream | Test.cs:25:29:25:34 | access to local variable stream : NetworkStream | provenance |  |
-| Test.cs:23:42:23:59 | call to method GetStream : NetworkStream | Test.cs:23:33:23:38 | access to local variable stream : NetworkStream | provenance | Src:MaD:3  |
-| Test.cs:25:29:25:34 | access to local variable stream : NetworkStream | Test.cs:25:41:25:46 | [post] access to local variable buffer : Byte[] [element] : Object | provenance | MaD:2 |
+| Test.cs:23:42:23:59 | call to method GetStream : NetworkStream | Test.cs:23:33:23:38 | access to local variable stream : NetworkStream | provenance | Src:MaD:4  |
+| Test.cs:25:29:25:34 | access to local variable stream : NetworkStream | Test.cs:25:41:25:46 | [post] access to local variable buffer : Byte[] [element] : Object | provenance | MaD:5 |
 | Test.cs:25:41:25:46 | [post] access to local variable buffer : Byte[] [element] : Object | Test.cs:28:99:28:104 | access to local variable buffer : Byte[] [element] : Object | provenance |  |
-| Test.cs:28:85:28:105 | call to method BytesToString : String | Test.cs:28:42:28:111 | ... + ... | provenance |  Sink:MaD:1 |
+| Test.cs:28:85:28:105 | call to method BytesToString : String | Test.cs:28:42:28:111 | ... + ... | provenance | Sink:MaD:1 |
 | Test.cs:28:99:28:104 | access to local variable buffer : Byte[] [element] : Object | Test.cs:12:45:12:49 | bytes : Byte[] [element] : Object | provenance |  |
-| Test.cs:28:99:28:104 | access to local variable buffer : Byte[] [element] : Object | Test.cs:28:85:28:105 | call to method BytesToString : String | provenance | MaD:4 |
-| Test.cs:34:20:34:25 | access to local variable result : String | Test.cs:37:42:37:96 | ... + ... | provenance |  Sink:MaD:1 |
-| Test.cs:34:29:34:69 | call to method ExecuteQuery : String | Test.cs:34:20:34:25 | access to local variable result : String | provenance | Src:MaD:5  |
-| Test.cs:62:20:62:25 | access to local variable result : String | Test.cs:65:42:65:96 | ... + ... | provenance |  Sink:MaD:1 |
-| Test.cs:62:29:62:48 | call to method GetCliArg : String | Test.cs:62:20:62:25 | access to local variable result : String | provenance | Src:MaD:6  |
+| Test.cs:28:99:28:104 | access to local variable buffer : Byte[] [element] : Object | Test.cs:28:85:28:105 | call to method BytesToString : String | provenance | MaD:6 |
+| Test.cs:34:20:34:25 | access to local variable result : String | Test.cs:37:42:37:96 | ... + ... | provenance | Sink:MaD:1 |
+| Test.cs:34:29:34:69 | call to method ExecuteQuery : String | Test.cs:34:20:34:25 | access to local variable result : String | provenance | Src:MaD:2  |
+| Test.cs:62:20:62:25 | access to local variable result : String | Test.cs:65:42:65:96 | ... + ... | provenance | Sink:MaD:1 |
+| Test.cs:62:29:62:48 | call to method GetCliArg : String | Test.cs:62:20:62:25 | access to local variable result : String | provenance | Src:MaD:3  |
 nodes
 | Test.cs:12:45:12:49 | bytes : Byte[] [element] : Object | semmle.label | bytes : Byte[] [element] : Object |
 | Test.cs:15:20:15:61 | call to method GetString : String | semmle.label | call to method GetString : String |
diff --git a/csharp/ql/test/query-tests/Security Features/CWE-020/UntrustedDataToExternalAPI.expected b/csharp/ql/test/query-tests/Security Features/CWE-020/UntrustedDataToExternalAPI.expected
index 098313cc323..bef499f0335 100644
--- a/csharp/ql/test/query-tests/Security Features/CWE-020/UntrustedDataToExternalAPI.expected	
+++ b/csharp/ql/test/query-tests/Security Features/CWE-020/UntrustedDataToExternalAPI.expected	
@@ -2,7 +2,7 @@
 | UntrustedData.cs:9:20:9:30 | access to property Request | UntrustedData.cs:9:20:9:30 | access to property Request | UntrustedData.cs:9:20:9:30 | access to property Request | Call to System.Web.HttpRequest.get_QueryString with untrusted data from $@. | UntrustedData.cs:9:20:9:30 | access to property Request | access to property Request |
 | UntrustedData.cs:13:28:13:31 | access to local variable name | UntrustedData.cs:9:20:9:42 | access to property QueryString : NameValueCollection | UntrustedData.cs:13:28:13:31 | access to local variable name | Call to System.Web.HttpResponse.Write with untrusted data from $@. | UntrustedData.cs:9:20:9:42 | access to property QueryString : NameValueCollection | access to property QueryString : NameValueCollection |
 edges
-| UntrustedData.cs:9:13:9:16 | access to local variable name : String | UntrustedData.cs:13:28:13:31 | access to local variable name | provenance |  Sink:MaD:1 |
+| UntrustedData.cs:9:13:9:16 | access to local variable name : String | UntrustedData.cs:13:28:13:31 | access to local variable name | provenance | Sink:MaD:1 |
 | UntrustedData.cs:9:20:9:42 | access to property QueryString : NameValueCollection | UntrustedData.cs:9:13:9:16 | access to local variable name : String | provenance |  |
 | UntrustedData.cs:9:20:9:42 | access to property QueryString : NameValueCollection | UntrustedData.cs:9:20:9:50 | access to indexer : String | provenance | MaD:2 |
 | UntrustedData.cs:9:20:9:50 | access to indexer : String | UntrustedData.cs:9:13:9:16 | access to local variable name : String | provenance |  |
diff --git a/csharp/ql/test/query-tests/Security Features/CWE-079/StoredXSS/StoredXSS.expected b/csharp/ql/test/query-tests/Security Features/CWE-079/StoredXSS/StoredXSS.expected
index 3835007973e..8304e8a6e69 100644
--- a/csharp/ql/test/query-tests/Security Features/CWE-079/StoredXSS/StoredXSS.expected	
+++ b/csharp/ql/test/query-tests/Security Features/CWE-079/StoredXSS/StoredXSS.expected	
@@ -3,11 +3,11 @@
 edges
 | StoredXSS.cs:17:31:17:44 | access to local variable customerReader : SqlDataReader | StoredXSS.cs:22:60:22:73 | access to local variable customerReader : SqlDataReader | provenance |  |
 | StoredXSS.cs:17:48:17:78 | call to method ExecuteReader : SqlDataReader | StoredXSS.cs:17:31:17:44 | access to local variable customerReader : SqlDataReader | provenance |  |
-| StoredXSS.cs:22:60:22:73 | access to local variable customerReader : SqlDataReader | StoredXSS.cs:22:60:22:86 | call to method GetString : String | provenance | MaD:1 |
-| StoredXSS.cs:22:60:22:86 | call to method GetString : String | StoredXSS.cs:22:44:22:86 | ... + ... | provenance |  Sink:MaD:2 |
+| StoredXSS.cs:22:60:22:73 | access to local variable customerReader : SqlDataReader | StoredXSS.cs:22:60:22:86 | call to method GetString : String | provenance | MaD:2 |
+| StoredXSS.cs:22:60:22:86 | call to method GetString : String | StoredXSS.cs:22:44:22:86 | ... + ... | provenance | Sink:MaD:1 |
 models
-| 1 | Summary: System.Data; IDataRecord; true; GetString; (System.Int32); ; Argument[this]; ReturnValue; taint; manual |
-| 2 | Sink: System.Web; HttpResponse; false; Write; ; ; Argument[0]; html-injection; manual |
+| 1 | Sink: System.Web; HttpResponse; false; Write; ; ; Argument[0]; html-injection; manual |
+| 2 | Summary: System.Data; IDataRecord; true; GetString; (System.Int32); ; Argument[this]; ReturnValue; taint; manual |
 nodes
 | StoredXSS.cs:17:31:17:44 | access to local variable customerReader : SqlDataReader | semmle.label | access to local variable customerReader : SqlDataReader |
 | StoredXSS.cs:17:48:17:78 | call to method ExecuteReader : SqlDataReader | semmle.label | call to method ExecuteReader : SqlDataReader |
diff --git a/csharp/ql/test/query-tests/Security Features/CWE-079/XSS/Index.cshtml.g.cs b/csharp/ql/test/query-tests/Security Features/CWE-079/XSS/Index.cshtml.g.cs
index bbd3b9a66ff..ea5285c596d 100644
--- a/csharp/ql/test/query-tests/Security Features/CWE-079/XSS/Index.cshtml.g.cs	
+++ b/csharp/ql/test/query-tests/Security Features/CWE-079/XSS/Index.cshtml.g.cs	
@@ -30,7 +30,7 @@ using dotnetweb;
 #line 3 "Index.cshtml"
   
     ViewData["Title"] = "ASP.NET Core";
-    var message = Request.Query["m"];
+    var message = Request.Query["m"]; // $ Source=message
 
 #line default
 #line hidden
@@ -38,7 +38,7 @@ using dotnetweb;
             WriteLiteral("<div class=\"cli\">\n    <div class=\"cli-example\">        \n");
 #nullable restore
 #line 14 "Index.cshtml"
-Write(Html.Raw(message)); // BAD
+Write(Html.Raw(message)); // $ Alert=message
 
 #line default
 #line hidden
diff --git a/csharp/ql/test/query-tests/Security Features/CWE-079/XSS/XSS.expected b/csharp/ql/test/query-tests/Security Features/CWE-079/XSS/XSS.expected
index 371917cd02f..fe184fdff75 100644
--- a/csharp/ql/test/query-tests/Security Features/CWE-079/XSS/XSS.expected	
+++ b/csharp/ql/test/query-tests/Security Features/CWE-079/XSS/XSS.expected	
@@ -2,14 +2,14 @@
 | Index.cshtml:14:16:14:22 | call to operator implicit conversion | Index.cshtml:5:19:5:31 | access to property Query : IQueryCollection | Index.cshtml:14:16:14:22 | call to operator implicit conversion | $@ flows to here and is written to HTML or JavaScript: Microsoft.AspNetCore.Mvc.ViewFeatures.HtmlHelper.Raw() method. | Index.cshtml:5:19:5:31 | access to property Query : IQueryCollection | User-provided value |
 | XSSAspNet.cs:26:30:26:34 | access to local variable sayHi | XSSAspNet.cs:19:25:19:43 | access to property QueryString : NameValueCollection | XSSAspNet.cs:26:30:26:34 | access to local variable sayHi | $@ flows to here and is written to HTML or JavaScript: System.Web.WebPages.WebPage.WriteLiteral() method. | XSSAspNet.cs:19:25:19:43 | access to property QueryString : NameValueCollection | User-provided value |
 | XSSAspNet.cs:36:40:36:44 | access to local variable sayHi | XSSAspNet.cs:19:25:19:43 | access to property QueryString : NameValueCollection | XSSAspNet.cs:36:40:36:44 | access to local variable sayHi | $@ flows to here and is written to HTML or JavaScript: System.Web.WebPages.WebPage.WriteLiteralTo() method. | XSSAspNet.cs:19:25:19:43 | access to property QueryString : NameValueCollection | User-provided value |
-| XSSAspNet.cs:43:28:43:55 | access to indexer | XSSAspNet.cs:43:28:43:46 | access to property QueryString : NameValueCollection | XSSAspNet.cs:43:28:43:55 | access to indexer | $@ flows to here and is written to HTML or JavaScript. | XSSAspNet.cs:43:28:43:46 | access to property QueryString : NameValueCollection | User-provided value |
-| XSSAspNetCore.cs:21:52:21:76 | call to operator implicit conversion | XSSAspNetCore.cs:21:52:21:64 | access to property Query : IQueryCollection | XSSAspNetCore.cs:21:52:21:76 | call to operator implicit conversion | $@ flows to here and is written to HTML or JavaScript. | XSSAspNetCore.cs:21:52:21:64 | access to property Query : IQueryCollection | User-provided value |
-| XSSAspNetCore.cs:44:51:44:53 | access to parameter foo | XSSAspNetCore.cs:40:56:40:58 | foo : String | XSSAspNetCore.cs:44:51:44:53 | access to parameter foo | $@ flows to here and is written to HTML or JavaScript. | XSSAspNetCore.cs:40:56:40:58 | foo : String | User-provided value |
-| XSSAspNetCore.cs:51:43:51:67 | access to property Value | XSSAspNetCore.cs:51:43:51:67 | access to property Value | XSSAspNetCore.cs:51:43:51:67 | access to property Value | $@ flows to here and is written to HTML or JavaScript. | XSSAspNetCore.cs:51:43:51:67 | access to property Value | User-provided value |
-| XSSAspNetCore.cs:58:43:58:73 | call to method ToString | XSSAspNetCore.cs:58:43:58:55 | access to property Query : IQueryCollection | XSSAspNetCore.cs:58:43:58:73 | call to method ToString | $@ flows to here and is written to HTML or JavaScript. | XSSAspNetCore.cs:58:43:58:55 | access to property Query : IQueryCollection | User-provided value |
-| XSSAspNetCore.cs:61:44:61:66 | access to indexer | XSSAspNetCore.cs:61:44:61:56 | access to property Query : IQueryCollection | XSSAspNetCore.cs:61:44:61:66 | access to indexer | $@ flows to here and is written to HTML or JavaScript. | XSSAspNetCore.cs:61:44:61:56 | access to property Query : IQueryCollection | User-provided value |
-| XSSAspNetCore.cs:69:43:69:61 | access to property ContentType | XSSAspNetCore.cs:69:43:69:61 | access to property ContentType | XSSAspNetCore.cs:69:43:69:61 | access to property ContentType | $@ flows to here and is written to HTML or JavaScript. | XSSAspNetCore.cs:69:43:69:61 | access to property ContentType | User-provided value |
-| XSSAspNetCore.cs:72:51:72:72 | call to operator implicit conversion | XSSAspNetCore.cs:72:51:72:65 | access to property Headers : IHeaderDictionary | XSSAspNetCore.cs:72:51:72:72 | call to operator implicit conversion | $@ flows to here and is written to HTML or JavaScript. | XSSAspNetCore.cs:72:51:72:65 | access to property Headers : IHeaderDictionary | User-provided value |
+| XSSAspNet.cs:44:28:44:33 | access to local variable sayHi2 | XSSAspNet.cs:43:26:43:44 | access to property QueryString : NameValueCollection | XSSAspNet.cs:44:28:44:33 | access to local variable sayHi2 | $@ flows to here and is written to HTML or JavaScript. | XSSAspNet.cs:43:26:43:44 | access to property QueryString : NameValueCollection | User-provided value |
+| XSSAspNetCore.cs:22:52:22:57 | call to operator implicit conversion | XSSAspNetCore.cs:21:26:21:38 | access to property Query : IQueryCollection | XSSAspNetCore.cs:22:52:22:57 | call to operator implicit conversion | $@ flows to here and is written to HTML or JavaScript. | XSSAspNetCore.cs:21:26:21:38 | access to property Query : IQueryCollection | User-provided value |
+| XSSAspNetCore.cs:45:51:45:53 | access to parameter foo | XSSAspNetCore.cs:41:56:41:58 | foo : String | XSSAspNetCore.cs:45:51:45:53 | access to parameter foo | $@ flows to here and is written to HTML or JavaScript. | XSSAspNetCore.cs:41:56:41:58 | foo : String | User-provided value |
+| XSSAspNetCore.cs:53:43:53:46 | access to local variable req2 | XSSAspNetCore.cs:52:24:52:48 | access to property Value : String | XSSAspNetCore.cs:53:43:53:46 | access to local variable req2 | $@ flows to here and is written to HTML or JavaScript. | XSSAspNetCore.cs:52:24:52:48 | access to property Value : String | User-provided value |
+| XSSAspNetCore.cs:61:43:61:46 | access to local variable req3 | XSSAspNetCore.cs:60:24:60:36 | access to property Query : IQueryCollection | XSSAspNetCore.cs:61:43:61:46 | access to local variable req3 | $@ flows to here and is written to HTML or JavaScript. | XSSAspNetCore.cs:60:24:60:36 | access to property Query : IQueryCollection | User-provided value |
+| XSSAspNetCore.cs:65:44:65:47 | access to local variable req4 | XSSAspNetCore.cs:64:24:64:36 | access to property Query : IQueryCollection | XSSAspNetCore.cs:65:44:65:47 | access to local variable req4 | $@ flows to here and is written to HTML or JavaScript. | XSSAspNetCore.cs:64:24:64:36 | access to property Query : IQueryCollection | User-provided value |
+| XSSAspNetCore.cs:74:43:74:44 | access to local variable ct | XSSAspNetCore.cs:73:22:73:40 | access to property ContentType : String | XSSAspNetCore.cs:74:43:74:44 | access to local variable ct | $@ flows to here and is written to HTML or JavaScript. | XSSAspNetCore.cs:73:22:73:40 | access to property ContentType : String | User-provided value |
+| XSSAspNetCore.cs:78:51:78:56 | call to operator implicit conversion | XSSAspNetCore.cs:77:26:77:40 | access to property Headers : IHeaderDictionary | XSSAspNetCore.cs:78:51:78:56 | call to operator implicit conversion | $@ flows to here and is written to HTML or JavaScript. | XSSAspNetCore.cs:77:26:77:40 | access to property Headers : IHeaderDictionary | User-provided value |
 edges
 | Index.cshtml:5:9:5:15 | access to local variable message : StringValues | Index.cshtml:14:16:14:22 | call to operator implicit conversion | provenance |  |
 | Index.cshtml:5:19:5:31 | access to property Query : IQueryCollection | Index.cshtml:5:9:5:15 | access to local variable message : StringValues | provenance |  |
@@ -18,17 +18,29 @@ edges
 | XSSAspNet.cs:19:25:19:43 | access to property QueryString : NameValueCollection | XSSAspNet.cs:19:17:19:21 | access to local variable sayHi : String | provenance |  |
 | XSSAspNet.cs:19:25:19:43 | access to property QueryString : NameValueCollection | XSSAspNet.cs:19:25:19:52 | access to indexer : String | provenance | MaD:3 |
 | XSSAspNet.cs:19:25:19:52 | access to indexer : String | XSSAspNet.cs:19:17:19:21 | access to local variable sayHi : String | provenance |  |
-| XSSAspNet.cs:43:28:43:46 | access to property QueryString : NameValueCollection | XSSAspNet.cs:43:28:43:55 | access to indexer | provenance |  |
-| XSSAspNet.cs:43:28:43:46 | access to property QueryString : NameValueCollection | XSSAspNet.cs:43:28:43:55 | access to indexer | provenance | MaD:3 |
-| XSSAspNetCore.cs:21:52:21:64 | access to property Query : IQueryCollection | XSSAspNetCore.cs:21:52:21:76 | call to operator implicit conversion | provenance |  |
-| XSSAspNetCore.cs:40:56:40:58 | foo : String | XSSAspNetCore.cs:44:51:44:53 | access to parameter foo | provenance |  |
-| XSSAspNetCore.cs:58:43:58:55 | access to property Query : IQueryCollection | XSSAspNetCore.cs:58:43:58:62 | access to indexer : StringValues | provenance |  |
-| XSSAspNetCore.cs:58:43:58:62 | access to indexer : StringValues | XSSAspNetCore.cs:58:43:58:73 | call to method ToString | provenance | MaD:1 |
-| XSSAspNetCore.cs:61:44:61:56 | access to property Query : IQueryCollection | XSSAspNetCore.cs:61:44:61:63 | access to indexer : StringValues | provenance |  |
-| XSSAspNetCore.cs:61:44:61:56 | access to property Query : IQueryCollection | XSSAspNetCore.cs:61:44:61:66 | access to indexer | provenance |  |
-| XSSAspNetCore.cs:61:44:61:63 | access to indexer : StringValues | XSSAspNetCore.cs:61:44:61:66 | access to indexer | provenance |  |
-| XSSAspNetCore.cs:61:44:61:63 | access to indexer : StringValues | XSSAspNetCore.cs:61:44:61:66 | access to indexer | provenance | MaD:2 |
-| XSSAspNetCore.cs:72:51:72:65 | access to property Headers : IHeaderDictionary | XSSAspNetCore.cs:72:51:72:72 | call to operator implicit conversion | provenance |  |
+| XSSAspNet.cs:43:17:43:22 | access to local variable sayHi2 : String | XSSAspNet.cs:44:28:44:33 | access to local variable sayHi2 | provenance |  |
+| XSSAspNet.cs:43:26:43:44 | access to property QueryString : NameValueCollection | XSSAspNet.cs:43:17:43:22 | access to local variable sayHi2 : String | provenance |  |
+| XSSAspNet.cs:43:26:43:44 | access to property QueryString : NameValueCollection | XSSAspNet.cs:43:26:43:53 | access to indexer : String | provenance | MaD:3 |
+| XSSAspNet.cs:43:26:43:53 | access to indexer : String | XSSAspNet.cs:43:17:43:22 | access to local variable sayHi2 : String | provenance |  |
+| XSSAspNetCore.cs:21:17:21:22 | access to local variable source : StringValues | XSSAspNetCore.cs:22:52:22:57 | call to operator implicit conversion | provenance |  |
+| XSSAspNetCore.cs:21:26:21:38 | access to property Query : IQueryCollection | XSSAspNetCore.cs:21:17:21:22 | access to local variable source : StringValues | provenance |  |
+| XSSAspNetCore.cs:41:56:41:58 | foo : String | XSSAspNetCore.cs:45:51:45:53 | access to parameter foo | provenance |  |
+| XSSAspNetCore.cs:52:17:52:20 | access to local variable req2 : String | XSSAspNetCore.cs:53:43:53:46 | access to local variable req2 | provenance |  |
+| XSSAspNetCore.cs:52:24:52:48 | access to property Value : String | XSSAspNetCore.cs:52:17:52:20 | access to local variable req2 : String | provenance |  |
+| XSSAspNetCore.cs:60:17:60:20 | access to local variable req3 : String | XSSAspNetCore.cs:61:43:61:46 | access to local variable req3 | provenance |  |
+| XSSAspNetCore.cs:60:24:60:36 | access to property Query : IQueryCollection | XSSAspNetCore.cs:60:24:60:43 | access to indexer : StringValues | provenance |  |
+| XSSAspNetCore.cs:60:24:60:43 | access to indexer : StringValues | XSSAspNetCore.cs:60:24:60:54 | call to method ToString : String | provenance | MaD:1 |
+| XSSAspNetCore.cs:60:24:60:54 | call to method ToString : String | XSSAspNetCore.cs:60:17:60:20 | access to local variable req3 : String | provenance |  |
+| XSSAspNetCore.cs:64:17:64:20 | access to local variable req4 : String | XSSAspNetCore.cs:65:44:65:47 | access to local variable req4 | provenance |  |
+| XSSAspNetCore.cs:64:24:64:36 | access to property Query : IQueryCollection | XSSAspNetCore.cs:64:17:64:20 | access to local variable req4 : String | provenance |  |
+| XSSAspNetCore.cs:64:24:64:36 | access to property Query : IQueryCollection | XSSAspNetCore.cs:64:24:64:43 | access to indexer : StringValues | provenance |  |
+| XSSAspNetCore.cs:64:24:64:43 | access to indexer : StringValues | XSSAspNetCore.cs:64:17:64:20 | access to local variable req4 : String | provenance |  |
+| XSSAspNetCore.cs:64:24:64:43 | access to indexer : StringValues | XSSAspNetCore.cs:64:24:64:46 | access to indexer : String | provenance | MaD:2 |
+| XSSAspNetCore.cs:64:24:64:46 | access to indexer : String | XSSAspNetCore.cs:64:17:64:20 | access to local variable req4 : String | provenance |  |
+| XSSAspNetCore.cs:73:17:73:18 | access to local variable ct : String | XSSAspNetCore.cs:74:43:74:44 | access to local variable ct | provenance |  |
+| XSSAspNetCore.cs:73:22:73:40 | access to property ContentType : String | XSSAspNetCore.cs:73:17:73:18 | access to local variable ct : String | provenance |  |
+| XSSAspNetCore.cs:77:17:77:22 | access to local variable header : StringValues | XSSAspNetCore.cs:78:51:78:56 | call to operator implicit conversion | provenance |  |
+| XSSAspNetCore.cs:77:26:77:40 | access to property Headers : IHeaderDictionary | XSSAspNetCore.cs:77:17:77:22 | access to local variable header : StringValues | provenance |  |
 models
 | 1 | Summary: Microsoft.Extensions.Primitives; StringValues; false; ToString; (); ; Argument[this]; ReturnValue; taint; manual |
 | 2 | Summary: Microsoft.Extensions.Primitives; StringValues; false; get_Item; (System.Int32); ; Argument[this]; ReturnValue; taint; manual |
@@ -42,20 +54,32 @@ nodes
 | XSSAspNet.cs:19:25:19:52 | access to indexer : String | semmle.label | access to indexer : String |
 | XSSAspNet.cs:26:30:26:34 | access to local variable sayHi | semmle.label | access to local variable sayHi |
 | XSSAspNet.cs:36:40:36:44 | access to local variable sayHi | semmle.label | access to local variable sayHi |
-| XSSAspNet.cs:43:28:43:46 | access to property QueryString : NameValueCollection | semmle.label | access to property QueryString : NameValueCollection |
-| XSSAspNet.cs:43:28:43:55 | access to indexer | semmle.label | access to indexer |
-| XSSAspNetCore.cs:21:52:21:64 | access to property Query : IQueryCollection | semmle.label | access to property Query : IQueryCollection |
-| XSSAspNetCore.cs:21:52:21:76 | call to operator implicit conversion | semmle.label | call to operator implicit conversion |
-| XSSAspNetCore.cs:40:56:40:58 | foo : String | semmle.label | foo : String |
-| XSSAspNetCore.cs:44:51:44:53 | access to parameter foo | semmle.label | access to parameter foo |
-| XSSAspNetCore.cs:51:43:51:67 | access to property Value | semmle.label | access to property Value |
-| XSSAspNetCore.cs:58:43:58:55 | access to property Query : IQueryCollection | semmle.label | access to property Query : IQueryCollection |
-| XSSAspNetCore.cs:58:43:58:62 | access to indexer : StringValues | semmle.label | access to indexer : StringValues |
-| XSSAspNetCore.cs:58:43:58:73 | call to method ToString | semmle.label | call to method ToString |
-| XSSAspNetCore.cs:61:44:61:56 | access to property Query : IQueryCollection | semmle.label | access to property Query : IQueryCollection |
-| XSSAspNetCore.cs:61:44:61:63 | access to indexer : StringValues | semmle.label | access to indexer : StringValues |
-| XSSAspNetCore.cs:61:44:61:66 | access to indexer | semmle.label | access to indexer |
-| XSSAspNetCore.cs:69:43:69:61 | access to property ContentType | semmle.label | access to property ContentType |
-| XSSAspNetCore.cs:72:51:72:65 | access to property Headers : IHeaderDictionary | semmle.label | access to property Headers : IHeaderDictionary |
-| XSSAspNetCore.cs:72:51:72:72 | call to operator implicit conversion | semmle.label | call to operator implicit conversion |
+| XSSAspNet.cs:43:17:43:22 | access to local variable sayHi2 : String | semmle.label | access to local variable sayHi2 : String |
+| XSSAspNet.cs:43:26:43:44 | access to property QueryString : NameValueCollection | semmle.label | access to property QueryString : NameValueCollection |
+| XSSAspNet.cs:43:26:43:53 | access to indexer : String | semmle.label | access to indexer : String |
+| XSSAspNet.cs:44:28:44:33 | access to local variable sayHi2 | semmle.label | access to local variable sayHi2 |
+| XSSAspNetCore.cs:21:17:21:22 | access to local variable source : StringValues | semmle.label | access to local variable source : StringValues |
+| XSSAspNetCore.cs:21:26:21:38 | access to property Query : IQueryCollection | semmle.label | access to property Query : IQueryCollection |
+| XSSAspNetCore.cs:22:52:22:57 | call to operator implicit conversion | semmle.label | call to operator implicit conversion |
+| XSSAspNetCore.cs:41:56:41:58 | foo : String | semmle.label | foo : String |
+| XSSAspNetCore.cs:45:51:45:53 | access to parameter foo | semmle.label | access to parameter foo |
+| XSSAspNetCore.cs:52:17:52:20 | access to local variable req2 : String | semmle.label | access to local variable req2 : String |
+| XSSAspNetCore.cs:52:24:52:48 | access to property Value : String | semmle.label | access to property Value : String |
+| XSSAspNetCore.cs:53:43:53:46 | access to local variable req2 | semmle.label | access to local variable req2 |
+| XSSAspNetCore.cs:60:17:60:20 | access to local variable req3 : String | semmle.label | access to local variable req3 : String |
+| XSSAspNetCore.cs:60:24:60:36 | access to property Query : IQueryCollection | semmle.label | access to property Query : IQueryCollection |
+| XSSAspNetCore.cs:60:24:60:43 | access to indexer : StringValues | semmle.label | access to indexer : StringValues |
+| XSSAspNetCore.cs:60:24:60:54 | call to method ToString : String | semmle.label | call to method ToString : String |
+| XSSAspNetCore.cs:61:43:61:46 | access to local variable req3 | semmle.label | access to local variable req3 |
+| XSSAspNetCore.cs:64:17:64:20 | access to local variable req4 : String | semmle.label | access to local variable req4 : String |
+| XSSAspNetCore.cs:64:24:64:36 | access to property Query : IQueryCollection | semmle.label | access to property Query : IQueryCollection |
+| XSSAspNetCore.cs:64:24:64:43 | access to indexer : StringValues | semmle.label | access to indexer : StringValues |
+| XSSAspNetCore.cs:64:24:64:46 | access to indexer : String | semmle.label | access to indexer : String |
+| XSSAspNetCore.cs:65:44:65:47 | access to local variable req4 | semmle.label | access to local variable req4 |
+| XSSAspNetCore.cs:73:17:73:18 | access to local variable ct : String | semmle.label | access to local variable ct : String |
+| XSSAspNetCore.cs:73:22:73:40 | access to property ContentType : String | semmle.label | access to property ContentType : String |
+| XSSAspNetCore.cs:74:43:74:44 | access to local variable ct | semmle.label | access to local variable ct |
+| XSSAspNetCore.cs:77:17:77:22 | access to local variable header : StringValues | semmle.label | access to local variable header : StringValues |
+| XSSAspNetCore.cs:77:26:77:40 | access to property Headers : IHeaderDictionary | semmle.label | access to property Headers : IHeaderDictionary |
+| XSSAspNetCore.cs:78:51:78:56 | call to operator implicit conversion | semmle.label | call to operator implicit conversion |
 subpaths
diff --git a/csharp/ql/test/query-tests/Security Features/CWE-079/XSS/XSS.qlref b/csharp/ql/test/query-tests/Security Features/CWE-079/XSS/XSS.qlref
index 15face9de9c..df73539b55c 100644
--- a/csharp/ql/test/query-tests/Security Features/CWE-079/XSS/XSS.qlref	
+++ b/csharp/ql/test/query-tests/Security Features/CWE-079/XSS/XSS.qlref	
@@ -1,2 +1,4 @@
 query: Security Features/CWE-079/XSS.ql
-postprocess: TestUtilities/PrettyPrintModels.ql
+postprocess:
+  - TestUtilities/PrettyPrintModels.ql
+  - TestUtilities/InlineExpectationsTestQuery.ql
\ No newline at end of file
diff --git a/csharp/ql/test/query-tests/Security Features/CWE-079/XSS/XSSAspNet.cs b/csharp/ql/test/query-tests/Security Features/CWE-079/XSS/XSSAspNet.cs
index c9779db5bc6..2046aa4f309 100644
--- a/csharp/ql/test/query-tests/Security Features/CWE-079/XSS/XSSAspNet.cs	
+++ b/csharp/ql/test/query-tests/Security Features/CWE-079/XSS/XSSAspNet.cs	
@@ -16,14 +16,14 @@ namespace ASP
         {
             Layout = "~/_SiteLayout.cshtml";
             Page.Title = "Contact";
-            var sayHi = Request.QueryString["sayHi"];
+            var sayHi = Request.QueryString["sayHi"]; // $ Source=sayHi
             if (sayHi.IsEmpty())
             {
                 WriteLiteral("<script>alert(\"XSS via WriteLiteral\")</script>"); // GOOD: hard-coded, not user input
             }
             else
             {
-                WriteLiteral(sayHi); // BAD: user input flows to HTML unencoded
+                WriteLiteral(sayHi); // $ Alert=sayHi
                 WriteLiteral(HttpUtility.HtmlEncode(sayHi)); // Good: user input is encoded before it flows to HTML
             }
 
@@ -33,15 +33,16 @@ namespace ASP
             }
             else
             {
-                WriteLiteralTo(Output, sayHi); // BAD: user input flows to HTML unencoded
+                WriteLiteralTo(Output, sayHi); // $ Alert=sayHi
                 WriteLiteralTo(Output, Html.Encode(sayHi)); // Good: user input is encoded before it flows to HTML
             }
 
             BeginContext("~/Views/Home/Contact.cshtml", 288, 32, false);
 
             Write(Html.Raw("<script>alert(\"XSS via Html.Raw()\")</script>")); // GOOD: hard-coded, not user input
-            Write(Html.Raw(Request.QueryString["sayHi"])); // BAD: user input flows to HTML unencoded
-            Write(Html.Raw(HttpContext.Current.Server.HtmlEncode(Request.QueryString["sayHi"]))); // Good: user input is encoded before it flows to HTML
+            var sayHi2 = Request.QueryString["sayHi"]; // $ Source=sayHi2
+            Write(Html.Raw(sayHi2)); // $ Alert=sayHi2
+            Write(Html.Raw(HttpContext.Current.Server.HtmlEncode(sayHi2))); // Good: user input is encoded before it flows to HTML
             EndContext("~/Views/Home/Contact.cshtml", 288, 32, false);
         }
     }
diff --git a/csharp/ql/test/query-tests/Security Features/CWE-079/XSS/XSSAspNetCore.cs b/csharp/ql/test/query-tests/Security Features/CWE-079/XSS/XSSAspNetCore.cs
index 89d7ca98f96..2f1902d103b 100644
--- a/csharp/ql/test/query-tests/Security Features/CWE-079/XSS/XSSAspNetCore.cs	
+++ b/csharp/ql/test/query-tests/Security Features/CWE-079/XSS/XSSAspNetCore.cs	
@@ -18,7 +18,8 @@ namespace Testing.Controllers
         {
             // BAD: flow of content type to.
             var v = new ViewResult();
-            v.ViewData["BadData"] = new HtmlString(Request.Query["Bad data"]);
+            var source = Request.Query["Bad data"]; // $ Source=req1
+            v.ViewData["BadData"] = new HtmlString(source); // $ Alert=req1
 
             StringValues vOut;
             Request.Query.TryGetValue("Foo", out vOut);
@@ -37,28 +38,31 @@ namespace Testing.Controllers
 
         [HttpPost("Test")]
         [ValidateAntiForgeryToken]
-        public IActionResult Submit([FromQuery] string foo)
+        public IActionResult Submit([FromQuery] string foo) // $ Source=foo
         {
             var view = new ViewResult();
             //BAD: flow of submitted value to view in HtmlString.
-            view.ViewData["FOO"] = new HtmlString(foo);
+            view.ViewData["FOO"] = new HtmlString(foo); // $ Alert=foo
             return view;
         }
 
         public IActionResult IndexToModel()
         {
             //BAD: flow of submitted value to view in HtmlString.
-            HtmlString v = new HtmlString(Request.QueryString.Value);
+            var req2 = Request.QueryString.Value; // $ Source=req2
+            HtmlString v = new HtmlString(req2); // $ Alert=req2
             return View(new HomeViewModel() { Message = "Message from Index", Description = v });
         }
 
         public IActionResult About()
         {
             //BAD: flow of submitted value to view in HtmlString.
-            HtmlString v = new HtmlString(Request.Query["Foo"].ToString());
+            var req3 = Request.Query["Foo"].ToString(); // $ Source=req3
+            HtmlString v = new HtmlString(req3); // $ Alert=req3
 
             //BAD: flow of submitted value to view in HtmlString.
-            HtmlString v1 = new HtmlString(Request.Query["Foo"][0]);
+            var req4 = Request.Query["Foo"][0]; // $ Source=req4
+            HtmlString v1 = new HtmlString(req4); // $ Alert=req4
 
             return View(new HomeViewModel() { Message = "Message from About", Description = v });
         }
@@ -66,10 +70,12 @@ namespace Testing.Controllers
         public IActionResult Contact()
         {
             //BAD: flow of user content type to view in HtmlString.
-            HtmlString v = new HtmlString(Request.ContentType);
+            var ct = Request.ContentType; // $ Source=ct
+            HtmlString v = new HtmlString(ct); // $ Alert=ct
 
             //BAD: flow of headers to view in HtmlString.
-            HtmlString v1 = new HtmlString(value: Request.Headers["Foo"]);
+            var header = Request.Headers["Foo"]; // $ Source=header
+            HtmlString v1 = new HtmlString(value: header); // $ Alert=header
 
             return View(new HomeViewModel() { Message = "Message from Contact", Description = v });
         }
diff --git a/csharp/ql/test/query-tests/Security Features/CWE-079/XSSAsp/AspInline.expected b/csharp/ql/test/query-tests/Security Features/CWE-079/XSSAsp/AspInline.expected
index 66468b41a68..08f9aded553 100644
--- a/csharp/ql/test/query-tests/Security Features/CWE-079/XSSAsp/AspInline.expected	
+++ b/csharp/ql/test/query-tests/Security Features/CWE-079/XSSAsp/AspInline.expected	
@@ -1,5 +1,5 @@
-| script.aspx:4:1:4:23 | <%= ... %> | XSS.cs:115:16:115:29 | someJavascript |
-| script.aspx:8:1:8:12 | <%= ... %> | XSS.cs:122:24:122:28 | Field |
+| script.aspx:4:1:4:23 | <%= ... %> | XSS.cs:120:16:120:29 | someJavascript |
+| script.aspx:8:1:8:12 | <%= ... %> | XSS.cs:127:24:127:28 | Field |
 | script.aspx:12:1:12:14 | <%= ... %> | <outside test directory> | Request |
 | script.aspx:16:1:16:34 | <%= ... %> | <outside test directory> | QueryString |
 | script.aspx:20:1:20:41 | <%= ... %> | <outside test directory> | QueryString |
diff --git a/csharp/ql/test/query-tests/Security Features/CWE-079/XSSAsp/XSS.cs b/csharp/ql/test/query-tests/Security Features/CWE-079/XSSAsp/XSS.cs
index 1fc8a99e61b..eba40b891d5 100644
--- a/csharp/ql/test/query-tests/Security Features/CWE-079/XSSAsp/XSS.cs	
+++ b/csharp/ql/test/query-tests/Security Features/CWE-079/XSSAsp/XSS.cs	
@@ -17,6 +17,7 @@ namespace Test
         Table table;
         Label label;
         string connectionString;
+        public Button button;
 
         public void WebUIXSS()
         {
@@ -100,6 +101,10 @@ namespace Test
             // GOOD: HTML encoding
             string name = context.Request.QueryString["name"];
             new StringContent(HttpUtility.HtmlEncode(name));
+
+            // GOOD: Implicit HTML encoding
+            string html = context.Request.QueryString["html"];
+            button.Attributes.Add("data-href", html);
         }
 
         public void UrlEncoded(HttpContextBase context)
diff --git a/csharp/ql/test/query-tests/Security Features/CWE-079/XSSAsp/XSS.expected b/csharp/ql/test/query-tests/Security Features/CWE-079/XSSAsp/XSS.expected
index a5919f23fa8..b89708b8f03 100644
--- a/csharp/ql/test/query-tests/Security Features/CWE-079/XSSAsp/XSS.expected	
+++ b/csharp/ql/test/query-tests/Security Features/CWE-079/XSSAsp/XSS.expected	
@@ -1,95 +1,95 @@
 #select
-| XSS.cs:26:32:26:51 | call to method ToString | XSS.cs:25:48:25:62 | access to field categoryTextBox : TextBox | XSS.cs:26:32:26:51 | call to method ToString | $@ flows to here and is written to HTML or JavaScript. | XSS.cs:25:48:25:62 | access to field categoryTextBox : TextBox | User-provided value |
-| XSS.cs:27:29:27:48 | call to method ToString | XSS.cs:25:48:25:62 | access to field categoryTextBox : TextBox | XSS.cs:27:29:27:48 | call to method ToString | $@ flows to here and is written to HTML or JavaScript. | XSS.cs:25:48:25:62 | access to field categoryTextBox : TextBox | User-provided value |
-| XSS.cs:28:26:28:45 | call to method ToString | XSS.cs:25:48:25:62 | access to field categoryTextBox : TextBox | XSS.cs:28:26:28:45 | call to method ToString | $@ flows to here and is written to HTML or JavaScript. | XSS.cs:25:48:25:62 | access to field categoryTextBox : TextBox | User-provided value |
-| XSS.cs:38:36:38:39 | access to local variable name | XSS.cs:37:27:37:53 | access to property QueryString : NameValueCollection | XSS.cs:38:36:38:39 | access to local variable name | $@ flows to here and is written to HTML or JavaScript. | XSS.cs:37:27:37:53 | access to property QueryString : NameValueCollection | User-provided value |
-| XSS.cs:59:22:59:25 | access to local variable name | XSS.cs:57:27:57:65 | access to property QueryString : NameValueCollection | XSS.cs:59:22:59:25 | access to local variable name | $@ flows to here and is written to HTML or JavaScript. | XSS.cs:57:27:57:65 | access to property QueryString : NameValueCollection | User-provided value |
-| XSS.cs:76:36:76:39 | access to local variable name | XSS.cs:75:27:75:53 | access to property QueryString : NameValueCollection | XSS.cs:76:36:76:39 | access to local variable name | $@ flows to here and is written to HTML or JavaScript. | XSS.cs:75:27:75:53 | access to property QueryString : NameValueCollection | User-provided value |
-| XSS.cs:79:36:79:40 | access to local variable name2 | XSS.cs:78:28:78:42 | access to property Request : HttpRequestBase | XSS.cs:79:36:79:40 | access to local variable name2 | $@ flows to here and is written to HTML or JavaScript. | XSS.cs:78:28:78:42 | access to property Request : HttpRequestBase | User-provided value |
-| XSS.cs:86:28:86:31 | access to local variable name | XSS.cs:85:27:85:53 | access to property QueryString : NameValueCollection | XSS.cs:86:28:86:31 | access to local variable name | $@ flows to here and is written to HTML or JavaScript. | XSS.cs:85:27:85:53 | access to property QueryString : NameValueCollection | User-provided value |
-| XSS.cs:87:31:87:34 | access to local variable name | XSS.cs:85:27:85:53 | access to property QueryString : NameValueCollection | XSS.cs:87:31:87:34 | access to local variable name | $@ flows to here and is written to HTML or JavaScript. | XSS.cs:85:27:85:53 | access to property QueryString : NameValueCollection | User-provided value |
-| XSS.cs:95:31:95:34 | access to local variable name | XSS.cs:94:27:94:53 | access to property QueryString : NameValueCollection | XSS.cs:95:31:95:34 | access to local variable name | $@ flows to here and is written to HTML or JavaScript. | XSS.cs:94:27:94:53 | access to property QueryString : NameValueCollection | User-provided value |
-| XSS.cs:135:20:135:33 | access to property RawUrl | XSS.cs:135:20:135:33 | access to property RawUrl | XSS.cs:135:20:135:33 | access to property RawUrl | $@ flows to here and is written to HTML or JavaScript. | XSS.cs:135:20:135:33 | access to property RawUrl | User-provided value |
+| XSS.cs:27:32:27:51 | call to method ToString | XSS.cs:26:48:26:62 | access to field categoryTextBox : TextBox | XSS.cs:27:32:27:51 | call to method ToString | $@ flows to here and is written to HTML or JavaScript. | XSS.cs:26:48:26:62 | access to field categoryTextBox : TextBox | User-provided value |
+| XSS.cs:28:29:28:48 | call to method ToString | XSS.cs:26:48:26:62 | access to field categoryTextBox : TextBox | XSS.cs:28:29:28:48 | call to method ToString | $@ flows to here and is written to HTML or JavaScript. | XSS.cs:26:48:26:62 | access to field categoryTextBox : TextBox | User-provided value |
+| XSS.cs:29:26:29:45 | call to method ToString | XSS.cs:26:48:26:62 | access to field categoryTextBox : TextBox | XSS.cs:29:26:29:45 | call to method ToString | $@ flows to here and is written to HTML or JavaScript. | XSS.cs:26:48:26:62 | access to field categoryTextBox : TextBox | User-provided value |
+| XSS.cs:39:36:39:39 | access to local variable name | XSS.cs:38:27:38:53 | access to property QueryString : NameValueCollection | XSS.cs:39:36:39:39 | access to local variable name | $@ flows to here and is written to HTML or JavaScript. | XSS.cs:38:27:38:53 | access to property QueryString : NameValueCollection | User-provided value |
+| XSS.cs:60:22:60:25 | access to local variable name | XSS.cs:58:27:58:65 | access to property QueryString : NameValueCollection | XSS.cs:60:22:60:25 | access to local variable name | $@ flows to here and is written to HTML or JavaScript. | XSS.cs:58:27:58:65 | access to property QueryString : NameValueCollection | User-provided value |
+| XSS.cs:77:36:77:39 | access to local variable name | XSS.cs:76:27:76:53 | access to property QueryString : NameValueCollection | XSS.cs:77:36:77:39 | access to local variable name | $@ flows to here and is written to HTML or JavaScript. | XSS.cs:76:27:76:53 | access to property QueryString : NameValueCollection | User-provided value |
+| XSS.cs:80:36:80:40 | access to local variable name2 | XSS.cs:79:28:79:42 | access to property Request : HttpRequestBase | XSS.cs:80:36:80:40 | access to local variable name2 | $@ flows to here and is written to HTML or JavaScript. | XSS.cs:79:28:79:42 | access to property Request : HttpRequestBase | User-provided value |
+| XSS.cs:87:28:87:31 | access to local variable name | XSS.cs:86:27:86:53 | access to property QueryString : NameValueCollection | XSS.cs:87:28:87:31 | access to local variable name | $@ flows to here and is written to HTML or JavaScript. | XSS.cs:86:27:86:53 | access to property QueryString : NameValueCollection | User-provided value |
+| XSS.cs:88:31:88:34 | access to local variable name | XSS.cs:86:27:86:53 | access to property QueryString : NameValueCollection | XSS.cs:88:31:88:34 | access to local variable name | $@ flows to here and is written to HTML or JavaScript. | XSS.cs:86:27:86:53 | access to property QueryString : NameValueCollection | User-provided value |
+| XSS.cs:96:31:96:34 | access to local variable name | XSS.cs:95:27:95:53 | access to property QueryString : NameValueCollection | XSS.cs:96:31:96:34 | access to local variable name | $@ flows to here and is written to HTML or JavaScript. | XSS.cs:95:27:95:53 | access to property QueryString : NameValueCollection | User-provided value |
+| XSS.cs:140:20:140:33 | access to property RawUrl | XSS.cs:140:20:140:33 | access to property RawUrl | XSS.cs:140:20:140:33 | access to property RawUrl | $@ flows to here and is written to HTML or JavaScript. | XSS.cs:140:20:140:33 | access to property RawUrl | User-provided value |
 | script.aspx:12:1:12:14 | <%= ... %> | script.aspx:12:1:12:14 | <%= ... %> | script.aspx:12:1:12:14 | <%= ... %> | $@ flows to here and is a remote source accessed inline in an ASPX page. | script.aspx:12:1:12:14 | <%= ... %> | User-provided value |
 | script.aspx:16:1:16:34 | <%= ... %> | script.aspx:16:1:16:34 | <%= ... %> | script.aspx:16:1:16:34 | <%= ... %> | $@ flows to here and is a remote source accessed inline in an ASPX page. | script.aspx:16:1:16:34 | <%= ... %> | User-provided value |
 | script.aspx:20:1:20:41 | <%= ... %> | script.aspx:20:1:20:41 | <%= ... %> | script.aspx:20:1:20:41 | <%= ... %> | $@ flows to here and is a remote source accessed inline in an ASPX page. | script.aspx:20:1:20:41 | <%= ... %> | User-provided value |
 edges
-| XSS.cs:25:13:25:21 | [post] access to local variable userInput : StringBuilder | XSS.cs:26:32:26:40 | access to local variable userInput : StringBuilder | provenance |  |
-| XSS.cs:25:13:25:21 | [post] access to local variable userInput : StringBuilder | XSS.cs:27:29:27:37 | access to local variable userInput : StringBuilder | provenance |  |
-| XSS.cs:25:13:25:21 | [post] access to local variable userInput : StringBuilder | XSS.cs:28:26:28:34 | access to local variable userInput : StringBuilder | provenance |  |
-| XSS.cs:25:48:25:62 | access to field categoryTextBox : TextBox | XSS.cs:25:48:25:67 | access to property Text : String | provenance | MaD:4 |
-| XSS.cs:25:48:25:67 | access to property Text : String | XSS.cs:25:13:25:21 | [post] access to local variable userInput : StringBuilder | provenance | MaD:2 |
-| XSS.cs:26:32:26:40 | access to local variable userInput : StringBuilder | XSS.cs:26:32:26:51 | call to method ToString | provenance | MaD:3 |
-| XSS.cs:27:29:27:37 | access to local variable userInput : StringBuilder | XSS.cs:27:29:27:48 | call to method ToString | provenance | MaD:3 |
-| XSS.cs:28:26:28:34 | access to local variable userInput : StringBuilder | XSS.cs:28:26:28:45 | call to method ToString | provenance | MaD:3 |
-| XSS.cs:37:20:37:23 | access to local variable name : String | XSS.cs:38:36:38:39 | access to local variable name | provenance |  Sink:MaD:5 |
-| XSS.cs:37:27:37:53 | access to property QueryString : NameValueCollection | XSS.cs:37:20:37:23 | access to local variable name : String | provenance |  |
-| XSS.cs:37:27:37:53 | access to property QueryString : NameValueCollection | XSS.cs:37:27:37:61 | access to indexer : String | provenance | MaD:6 |
-| XSS.cs:37:27:37:61 | access to indexer : String | XSS.cs:37:20:37:23 | access to local variable name : String | provenance |  |
-| XSS.cs:57:20:57:23 | access to local variable name : String | XSS.cs:59:22:59:25 | access to local variable name | provenance |  |
-| XSS.cs:57:27:57:65 | access to property QueryString : NameValueCollection | XSS.cs:57:20:57:23 | access to local variable name : String | provenance |  |
-| XSS.cs:57:27:57:65 | access to property QueryString : NameValueCollection | XSS.cs:57:27:57:73 | access to indexer : String | provenance | MaD:6 |
-| XSS.cs:57:27:57:73 | access to indexer : String | XSS.cs:57:20:57:23 | access to local variable name : String | provenance |  |
-| XSS.cs:75:20:75:23 | access to local variable name : String | XSS.cs:76:36:76:39 | access to local variable name | provenance |  |
-| XSS.cs:75:27:75:53 | access to property QueryString : NameValueCollection | XSS.cs:75:20:75:23 | access to local variable name : String | provenance |  |
-| XSS.cs:75:27:75:53 | access to property QueryString : NameValueCollection | XSS.cs:75:27:75:61 | access to indexer : String | provenance | MaD:6 |
-| XSS.cs:75:27:75:61 | access to indexer : String | XSS.cs:75:20:75:23 | access to local variable name : String | provenance |  |
-| XSS.cs:78:20:78:24 | access to local variable name2 : String | XSS.cs:79:36:79:40 | access to local variable name2 | provenance |  |
-| XSS.cs:78:28:78:42 | access to property Request : HttpRequestBase | XSS.cs:78:20:78:24 | access to local variable name2 : String | provenance |  |
-| XSS.cs:85:20:85:23 | access to local variable name : String | XSS.cs:86:28:86:31 | access to local variable name | provenance |  |
-| XSS.cs:85:20:85:23 | access to local variable name : String | XSS.cs:87:31:87:34 | access to local variable name | provenance |  |
-| XSS.cs:85:27:85:53 | access to property QueryString : NameValueCollection | XSS.cs:85:20:85:23 | access to local variable name : String | provenance |  |
-| XSS.cs:85:27:85:53 | access to property QueryString : NameValueCollection | XSS.cs:85:27:85:61 | access to indexer : String | provenance | MaD:6 |
-| XSS.cs:85:27:85:61 | access to indexer : String | XSS.cs:85:20:85:23 | access to local variable name : String | provenance |  |
-| XSS.cs:94:20:94:23 | access to local variable name : String | XSS.cs:95:31:95:34 | access to local variable name | provenance |  Sink:MaD:1 |
-| XSS.cs:94:27:94:53 | access to property QueryString : NameValueCollection | XSS.cs:94:20:94:23 | access to local variable name : String | provenance |  |
-| XSS.cs:94:27:94:53 | access to property QueryString : NameValueCollection | XSS.cs:94:27:94:61 | access to indexer : String | provenance | MaD:6 |
-| XSS.cs:94:27:94:61 | access to indexer : String | XSS.cs:94:20:94:23 | access to local variable name : String | provenance |  |
+| XSS.cs:26:13:26:21 | [post] access to local variable userInput : StringBuilder | XSS.cs:27:32:27:40 | access to local variable userInput : StringBuilder | provenance |  |
+| XSS.cs:26:13:26:21 | [post] access to local variable userInput : StringBuilder | XSS.cs:28:29:28:37 | access to local variable userInput : StringBuilder | provenance |  |
+| XSS.cs:26:13:26:21 | [post] access to local variable userInput : StringBuilder | XSS.cs:29:26:29:34 | access to local variable userInput : StringBuilder | provenance |  |
+| XSS.cs:26:48:26:62 | access to field categoryTextBox : TextBox | XSS.cs:26:48:26:67 | access to property Text : String | provenance | MaD:6 |
+| XSS.cs:26:48:26:67 | access to property Text : String | XSS.cs:26:13:26:21 | [post] access to local variable userInput : StringBuilder | provenance | MaD:4 |
+| XSS.cs:27:32:27:40 | access to local variable userInput : StringBuilder | XSS.cs:27:32:27:51 | call to method ToString | provenance | MaD:5 |
+| XSS.cs:28:29:28:37 | access to local variable userInput : StringBuilder | XSS.cs:28:29:28:48 | call to method ToString | provenance | MaD:5 |
+| XSS.cs:29:26:29:34 | access to local variable userInput : StringBuilder | XSS.cs:29:26:29:45 | call to method ToString | provenance | MaD:5 |
+| XSS.cs:38:20:38:23 | access to local variable name : String | XSS.cs:39:36:39:39 | access to local variable name | provenance | Sink:MaD:2 |
+| XSS.cs:38:27:38:53 | access to property QueryString : NameValueCollection | XSS.cs:38:20:38:23 | access to local variable name : String | provenance |  |
+| XSS.cs:38:27:38:53 | access to property QueryString : NameValueCollection | XSS.cs:38:27:38:61 | access to indexer : String | provenance | MaD:3 |
+| XSS.cs:38:27:38:61 | access to indexer : String | XSS.cs:38:20:38:23 | access to local variable name : String | provenance |  |
+| XSS.cs:58:20:58:23 | access to local variable name : String | XSS.cs:60:22:60:25 | access to local variable name | provenance |  |
+| XSS.cs:58:27:58:65 | access to property QueryString : NameValueCollection | XSS.cs:58:20:58:23 | access to local variable name : String | provenance |  |
+| XSS.cs:58:27:58:65 | access to property QueryString : NameValueCollection | XSS.cs:58:27:58:73 | access to indexer : String | provenance | MaD:3 |
+| XSS.cs:58:27:58:73 | access to indexer : String | XSS.cs:58:20:58:23 | access to local variable name : String | provenance |  |
+| XSS.cs:76:20:76:23 | access to local variable name : String | XSS.cs:77:36:77:39 | access to local variable name | provenance |  |
+| XSS.cs:76:27:76:53 | access to property QueryString : NameValueCollection | XSS.cs:76:20:76:23 | access to local variable name : String | provenance |  |
+| XSS.cs:76:27:76:53 | access to property QueryString : NameValueCollection | XSS.cs:76:27:76:61 | access to indexer : String | provenance | MaD:3 |
+| XSS.cs:76:27:76:61 | access to indexer : String | XSS.cs:76:20:76:23 | access to local variable name : String | provenance |  |
+| XSS.cs:79:20:79:24 | access to local variable name2 : String | XSS.cs:80:36:80:40 | access to local variable name2 | provenance |  |
+| XSS.cs:79:28:79:42 | access to property Request : HttpRequestBase | XSS.cs:79:20:79:24 | access to local variable name2 : String | provenance |  |
+| XSS.cs:86:20:86:23 | access to local variable name : String | XSS.cs:87:28:87:31 | access to local variable name | provenance |  |
+| XSS.cs:86:20:86:23 | access to local variable name : String | XSS.cs:88:31:88:34 | access to local variable name | provenance |  |
+| XSS.cs:86:27:86:53 | access to property QueryString : NameValueCollection | XSS.cs:86:20:86:23 | access to local variable name : String | provenance |  |
+| XSS.cs:86:27:86:53 | access to property QueryString : NameValueCollection | XSS.cs:86:27:86:61 | access to indexer : String | provenance | MaD:3 |
+| XSS.cs:86:27:86:61 | access to indexer : String | XSS.cs:86:20:86:23 | access to local variable name : String | provenance |  |
+| XSS.cs:95:20:95:23 | access to local variable name : String | XSS.cs:96:31:96:34 | access to local variable name | provenance | Sink:MaD:1 |
+| XSS.cs:95:27:95:53 | access to property QueryString : NameValueCollection | XSS.cs:95:20:95:23 | access to local variable name : String | provenance |  |
+| XSS.cs:95:27:95:53 | access to property QueryString : NameValueCollection | XSS.cs:95:27:95:61 | access to indexer : String | provenance | MaD:3 |
+| XSS.cs:95:27:95:61 | access to indexer : String | XSS.cs:95:20:95:23 | access to local variable name : String | provenance |  |
 | script.aspx:12:1:12:14 | <%= ... %> | script.aspx:12:1:12:14 | <%= ... %> | provenance |  |
 | script.aspx:16:1:16:34 | <%= ... %> | script.aspx:16:1:16:34 | <%= ... %> | provenance |  |
 | script.aspx:20:1:20:41 | <%= ... %> | script.aspx:20:1:20:41 | <%= ... %> | provenance |  |
 models
 | 1 | Sink: System.Net.Http; StringContent; false; StringContent; ; ; Argument[0]; js-injection; manual |
-| 2 | Summary: System.Text; StringBuilder; false; AppendFormat; (System.String,System.Object); ; Argument[1]; Argument[this]; taint; manual |
-| 3 | Summary: System.Text; StringBuilder; false; ToString; (); ; Argument[this]; ReturnValue; taint; manual |
-| 4 | Summary: System.Web.UI.WebControls; TextBox; false; get_Text; (); ; Argument[this]; ReturnValue; taint; manual |
-| 5 | Sink: System.Web; HttpResponse; false; Write; ; ; Argument[0]; html-injection; manual |
-| 6 | Summary: System.Collections.Specialized; NameValueCollection; false; get_Item; (System.String); ; Argument[this]; ReturnValue; taint; df-generated |
+| 2 | Sink: System.Web; HttpResponse; false; Write; ; ; Argument[0]; html-injection; manual |
+| 3 | Summary: System.Collections.Specialized; NameValueCollection; false; get_Item; (System.String); ; Argument[this]; ReturnValue; taint; df-generated |
+| 4 | Summary: System.Text; StringBuilder; false; AppendFormat; (System.String,System.Object); ; Argument[1]; Argument[this]; taint; manual |
+| 5 | Summary: System.Text; StringBuilder; false; ToString; (); ; Argument[this]; ReturnValue; taint; manual |
+| 6 | Summary: System.Web.UI.WebControls; TextBox; false; get_Text; (); ; Argument[this]; ReturnValue; taint; manual |
 nodes
-| XSS.cs:25:13:25:21 | [post] access to local variable userInput : StringBuilder | semmle.label | [post] access to local variable userInput : StringBuilder |
-| XSS.cs:25:48:25:62 | access to field categoryTextBox : TextBox | semmle.label | access to field categoryTextBox : TextBox |
-| XSS.cs:25:48:25:67 | access to property Text : String | semmle.label | access to property Text : String |
-| XSS.cs:26:32:26:40 | access to local variable userInput : StringBuilder | semmle.label | access to local variable userInput : StringBuilder |
-| XSS.cs:26:32:26:51 | call to method ToString | semmle.label | call to method ToString |
-| XSS.cs:27:29:27:37 | access to local variable userInput : StringBuilder | semmle.label | access to local variable userInput : StringBuilder |
-| XSS.cs:27:29:27:48 | call to method ToString | semmle.label | call to method ToString |
-| XSS.cs:28:26:28:34 | access to local variable userInput : StringBuilder | semmle.label | access to local variable userInput : StringBuilder |
-| XSS.cs:28:26:28:45 | call to method ToString | semmle.label | call to method ToString |
-| XSS.cs:37:20:37:23 | access to local variable name : String | semmle.label | access to local variable name : String |
-| XSS.cs:37:27:37:53 | access to property QueryString : NameValueCollection | semmle.label | access to property QueryString : NameValueCollection |
-| XSS.cs:37:27:37:61 | access to indexer : String | semmle.label | access to indexer : String |
-| XSS.cs:38:36:38:39 | access to local variable name | semmle.label | access to local variable name |
-| XSS.cs:57:20:57:23 | access to local variable name : String | semmle.label | access to local variable name : String |
-| XSS.cs:57:27:57:65 | access to property QueryString : NameValueCollection | semmle.label | access to property QueryString : NameValueCollection |
-| XSS.cs:57:27:57:73 | access to indexer : String | semmle.label | access to indexer : String |
-| XSS.cs:59:22:59:25 | access to local variable name | semmle.label | access to local variable name |
-| XSS.cs:75:20:75:23 | access to local variable name : String | semmle.label | access to local variable name : String |
-| XSS.cs:75:27:75:53 | access to property QueryString : NameValueCollection | semmle.label | access to property QueryString : NameValueCollection |
-| XSS.cs:75:27:75:61 | access to indexer : String | semmle.label | access to indexer : String |
-| XSS.cs:76:36:76:39 | access to local variable name | semmle.label | access to local variable name |
-| XSS.cs:78:20:78:24 | access to local variable name2 : String | semmle.label | access to local variable name2 : String |
-| XSS.cs:78:28:78:42 | access to property Request : HttpRequestBase | semmle.label | access to property Request : HttpRequestBase |
-| XSS.cs:79:36:79:40 | access to local variable name2 | semmle.label | access to local variable name2 |
-| XSS.cs:85:20:85:23 | access to local variable name : String | semmle.label | access to local variable name : String |
-| XSS.cs:85:27:85:53 | access to property QueryString : NameValueCollection | semmle.label | access to property QueryString : NameValueCollection |
-| XSS.cs:85:27:85:61 | access to indexer : String | semmle.label | access to indexer : String |
-| XSS.cs:86:28:86:31 | access to local variable name | semmle.label | access to local variable name |
-| XSS.cs:87:31:87:34 | access to local variable name | semmle.label | access to local variable name |
-| XSS.cs:94:20:94:23 | access to local variable name : String | semmle.label | access to local variable name : String |
-| XSS.cs:94:27:94:53 | access to property QueryString : NameValueCollection | semmle.label | access to property QueryString : NameValueCollection |
-| XSS.cs:94:27:94:61 | access to indexer : String | semmle.label | access to indexer : String |
-| XSS.cs:95:31:95:34 | access to local variable name | semmle.label | access to local variable name |
-| XSS.cs:135:20:135:33 | access to property RawUrl | semmle.label | access to property RawUrl |
+| XSS.cs:26:13:26:21 | [post] access to local variable userInput : StringBuilder | semmle.label | [post] access to local variable userInput : StringBuilder |
+| XSS.cs:26:48:26:62 | access to field categoryTextBox : TextBox | semmle.label | access to field categoryTextBox : TextBox |
+| XSS.cs:26:48:26:67 | access to property Text : String | semmle.label | access to property Text : String |
+| XSS.cs:27:32:27:40 | access to local variable userInput : StringBuilder | semmle.label | access to local variable userInput : StringBuilder |
+| XSS.cs:27:32:27:51 | call to method ToString | semmle.label | call to method ToString |
+| XSS.cs:28:29:28:37 | access to local variable userInput : StringBuilder | semmle.label | access to local variable userInput : StringBuilder |
+| XSS.cs:28:29:28:48 | call to method ToString | semmle.label | call to method ToString |
+| XSS.cs:29:26:29:34 | access to local variable userInput : StringBuilder | semmle.label | access to local variable userInput : StringBuilder |
+| XSS.cs:29:26:29:45 | call to method ToString | semmle.label | call to method ToString |
+| XSS.cs:38:20:38:23 | access to local variable name : String | semmle.label | access to local variable name : String |
+| XSS.cs:38:27:38:53 | access to property QueryString : NameValueCollection | semmle.label | access to property QueryString : NameValueCollection |
+| XSS.cs:38:27:38:61 | access to indexer : String | semmle.label | access to indexer : String |
+| XSS.cs:39:36:39:39 | access to local variable name | semmle.label | access to local variable name |
+| XSS.cs:58:20:58:23 | access to local variable name : String | semmle.label | access to local variable name : String |
+| XSS.cs:58:27:58:65 | access to property QueryString : NameValueCollection | semmle.label | access to property QueryString : NameValueCollection |
+| XSS.cs:58:27:58:73 | access to indexer : String | semmle.label | access to indexer : String |
+| XSS.cs:60:22:60:25 | access to local variable name | semmle.label | access to local variable name |
+| XSS.cs:76:20:76:23 | access to local variable name : String | semmle.label | access to local variable name : String |
+| XSS.cs:76:27:76:53 | access to property QueryString : NameValueCollection | semmle.label | access to property QueryString : NameValueCollection |
+| XSS.cs:76:27:76:61 | access to indexer : String | semmle.label | access to indexer : String |
+| XSS.cs:77:36:77:39 | access to local variable name | semmle.label | access to local variable name |
+| XSS.cs:79:20:79:24 | access to local variable name2 : String | semmle.label | access to local variable name2 : String |
+| XSS.cs:79:28:79:42 | access to property Request : HttpRequestBase | semmle.label | access to property Request : HttpRequestBase |
+| XSS.cs:80:36:80:40 | access to local variable name2 | semmle.label | access to local variable name2 |
+| XSS.cs:86:20:86:23 | access to local variable name : String | semmle.label | access to local variable name : String |
+| XSS.cs:86:27:86:53 | access to property QueryString : NameValueCollection | semmle.label | access to property QueryString : NameValueCollection |
+| XSS.cs:86:27:86:61 | access to indexer : String | semmle.label | access to indexer : String |
+| XSS.cs:87:28:87:31 | access to local variable name | semmle.label | access to local variable name |
+| XSS.cs:88:31:88:34 | access to local variable name | semmle.label | access to local variable name |
+| XSS.cs:95:20:95:23 | access to local variable name : String | semmle.label | access to local variable name : String |
+| XSS.cs:95:27:95:53 | access to property QueryString : NameValueCollection | semmle.label | access to property QueryString : NameValueCollection |
+| XSS.cs:95:27:95:61 | access to indexer : String | semmle.label | access to indexer : String |
+| XSS.cs:96:31:96:34 | access to local variable name | semmle.label | access to local variable name |
+| XSS.cs:140:20:140:33 | access to property RawUrl | semmle.label | access to property RawUrl |
 | script.aspx:12:1:12:14 | <%= ... %> | semmle.label | <%= ... %> |
 | script.aspx:16:1:16:34 | <%= ... %> | semmle.label | <%= ... %> |
 | script.aspx:20:1:20:41 | <%= ... %> | semmle.label | <%= ... %> |
diff --git a/csharp/ql/test/query-tests/Security Features/CWE-089/SqlInjection.expected b/csharp/ql/test/query-tests/Security Features/CWE-089/SqlInjection.expected
index 7a0e0fad181..238cbd0bc3b 100644
--- a/csharp/ql/test/query-tests/Security Features/CWE-089/SqlInjection.expected	
+++ b/csharp/ql/test/query-tests/Security Features/CWE-089/SqlInjection.expected	
@@ -27,77 +27,77 @@
 edges
 | SecondOrderSqlInjection.cs:20:31:20:44 | access to local variable customerReader : SqlDataReader | SecondOrderSqlInjection.cs:25:119:25:132 | access to local variable customerReader : SqlDataReader | provenance |  |
 | SecondOrderSqlInjection.cs:20:48:20:78 | call to method ExecuteReader : SqlDataReader | SecondOrderSqlInjection.cs:20:31:20:44 | access to local variable customerReader : SqlDataReader | provenance |  |
-| SecondOrderSqlInjection.cs:25:119:25:132 | access to local variable customerReader : SqlDataReader | SecondOrderSqlInjection.cs:25:119:25:145 | call to method GetString : String | provenance | MaD:20 |
-| SecondOrderSqlInjection.cs:25:119:25:145 | call to method GetString : String | SecondOrderSqlInjection.cs:25:71:25:145 | ... + ... | provenance |  Sink:MaD:16 |
+| SecondOrderSqlInjection.cs:25:119:25:132 | access to local variable customerReader : SqlDataReader | SecondOrderSqlInjection.cs:25:119:25:145 | call to method GetString : String | provenance | MaD:23 |
+| SecondOrderSqlInjection.cs:25:119:25:145 | call to method GetString : String | SecondOrderSqlInjection.cs:25:71:25:145 | ... + ... | provenance | Sink:MaD:15 |
 | SecondOrderSqlInjection.cs:33:31:33:32 | access to local variable fs : FileStream | SecondOrderSqlInjection.cs:35:59:35:60 | access to local variable fs : FileStream | provenance |  |
-| SecondOrderSqlInjection.cs:33:36:33:78 | object creation of type FileStream : FileStream | SecondOrderSqlInjection.cs:33:31:33:32 | access to local variable fs : FileStream | provenance | Src:MaD:21  |
-| SecondOrderSqlInjection.cs:33:36:33:78 | object creation of type FileStream : FileStream | SecondOrderSqlInjection.cs:33:31:33:32 | access to local variable fs : FileStream | provenance | Src:MaD:22  |
+| SecondOrderSqlInjection.cs:33:36:33:78 | object creation of type FileStream : FileStream | SecondOrderSqlInjection.cs:33:31:33:32 | access to local variable fs : FileStream | provenance | Src:MaD:19  |
+| SecondOrderSqlInjection.cs:33:36:33:78 | object creation of type FileStream : FileStream | SecondOrderSqlInjection.cs:33:31:33:32 | access to local variable fs : FileStream | provenance | Src:MaD:18  |
 | SecondOrderSqlInjection.cs:35:37:35:38 | access to local variable sr : StreamReader | SecondOrderSqlInjection.cs:38:35:38:36 | access to local variable sr : StreamReader | provenance |  |
 | SecondOrderSqlInjection.cs:35:42:35:76 | object creation of type StreamReader : StreamReader | SecondOrderSqlInjection.cs:35:37:35:38 | access to local variable sr : StreamReader | provenance |  |
-| SecondOrderSqlInjection.cs:35:59:35:60 | access to local variable fs : FileStream | SecondOrderSqlInjection.cs:35:42:35:76 | object creation of type StreamReader : StreamReader | provenance | MaD:24 |
+| SecondOrderSqlInjection.cs:35:59:35:60 | access to local variable fs : FileStream | SecondOrderSqlInjection.cs:35:42:35:76 | object creation of type StreamReader : StreamReader | provenance | MaD:25 |
 | SecondOrderSqlInjection.cs:38:29:38:31 | access to local variable sql : String | SecondOrderSqlInjection.cs:40:31:40:33 | access to local variable sql : String | provenance |  |
-| SecondOrderSqlInjection.cs:38:35:38:36 | access to local variable sr : StreamReader | SecondOrderSqlInjection.cs:38:35:38:47 | call to method ReadLine : String | provenance | MaD:25 |
+| SecondOrderSqlInjection.cs:38:35:38:36 | access to local variable sr : StreamReader | SecondOrderSqlInjection.cs:38:35:38:47 | call to method ReadLine : String | provenance | MaD:26 |
 | SecondOrderSqlInjection.cs:38:35:38:47 | call to method ReadLine : String | SecondOrderSqlInjection.cs:38:29:38:31 | access to local variable sql : String | provenance |  |
-| SecondOrderSqlInjection.cs:40:25:40:27 | access to local variable sql : String | SecondOrderSqlInjection.cs:45:57:45:59 | access to local variable sql | provenance |  Sink:MaD:10 |
+| SecondOrderSqlInjection.cs:40:25:40:27 | access to local variable sql : String | SecondOrderSqlInjection.cs:45:57:45:59 | access to local variable sql | provenance | Sink:MaD:10 |
 | SecondOrderSqlInjection.cs:40:31:40:33 | access to local variable sql : String | SecondOrderSqlInjection.cs:40:31:40:40 | call to method Trim : String | provenance | MaD:28 |
 | SecondOrderSqlInjection.cs:40:31:40:40 | call to method Trim : String | SecondOrderSqlInjection.cs:40:25:40:27 | access to local variable sql : String | provenance |  |
-| SqlInjection.cs:37:21:37:26 | access to local variable query1 : String | SqlInjection.cs:39:50:39:55 | access to local variable query1 | provenance |  Sink:MaD:18 |
-| SqlInjection.cs:38:21:38:35 | access to field categoryTextBox : TextBox | SqlInjection.cs:38:21:38:40 | access to property Text : String | provenance | MaD:26 |
+| SqlInjection.cs:37:21:37:26 | access to local variable query1 : String | SqlInjection.cs:39:50:39:55 | access to local variable query1 | provenance | Sink:MaD:17 |
+| SqlInjection.cs:38:21:38:35 | access to field categoryTextBox : TextBox | SqlInjection.cs:38:21:38:40 | access to property Text : String | provenance | MaD:27 |
 | SqlInjection.cs:38:21:38:40 | access to property Text : String | SqlInjection.cs:37:21:37:26 | access to local variable query1 : String | provenance |  |
-| SqlInjection.cs:72:25:72:30 | access to local variable query1 : String | SqlInjection.cs:74:56:74:61 | access to local variable query1 | provenance |  Sink:MaD:7 |
-| SqlInjection.cs:72:25:72:30 | access to local variable query1 : String | SqlInjection.cs:75:55:75:60 | access to local variable query1 | provenance |  Sink:MaD:8 |
-| SqlInjection.cs:73:33:73:47 | access to field categoryTextBox : TextBox | SqlInjection.cs:73:33:73:52 | access to property Text : String | provenance | MaD:26 |
+| SqlInjection.cs:72:25:72:30 | access to local variable query1 : String | SqlInjection.cs:74:56:74:61 | access to local variable query1 | provenance | Sink:MaD:7 |
+| SqlInjection.cs:72:25:72:30 | access to local variable query1 : String | SqlInjection.cs:75:55:75:60 | access to local variable query1 | provenance | Sink:MaD:8 |
+| SqlInjection.cs:73:33:73:47 | access to field categoryTextBox : TextBox | SqlInjection.cs:73:33:73:52 | access to property Text : String | provenance | MaD:27 |
 | SqlInjection.cs:73:33:73:52 | access to property Text : String | SqlInjection.cs:72:25:72:30 | access to local variable query1 : String | provenance |  |
-| SqlInjection.cs:86:21:86:26 | access to local variable query1 : String | SqlInjection.cs:88:50:88:55 | access to local variable query1 | provenance |  Sink:MaD:18 |
+| SqlInjection.cs:86:21:86:26 | access to local variable query1 : String | SqlInjection.cs:88:50:88:55 | access to local variable query1 | provenance | Sink:MaD:17 |
 | SqlInjection.cs:87:21:87:29 | access to property Text : String | SqlInjection.cs:86:21:86:26 | access to local variable query1 : String | provenance |  |
-| SqlInjection.cs:96:21:96:31 | access to local variable queryString : String | SqlInjection.cs:98:42:98:52 | access to local variable queryString | provenance |  Sink:MaD:15 |
+| SqlInjection.cs:96:21:96:31 | access to local variable queryString : String | SqlInjection.cs:98:42:98:52 | access to local variable queryString | provenance | Sink:MaD:14 |
 | SqlInjection.cs:96:21:96:31 | access to local variable queryString : String | SqlInjection.cs:98:42:98:52 | access to local variable queryString : String | provenance |  |
 | SqlInjection.cs:97:21:97:29 | access to property Text : String | SqlInjection.cs:96:21:96:31 | access to local variable queryString : String | provenance |  |
-| SqlInjection.cs:98:21:98:23 | access to local variable cmd : SqlCommand | SqlInjection.cs:99:50:99:52 | access to local variable cmd | provenance |  Sink:MaD:17 |
+| SqlInjection.cs:98:21:98:23 | access to local variable cmd : SqlCommand | SqlInjection.cs:99:50:99:52 | access to local variable cmd | provenance | Sink:MaD:16 |
 | SqlInjection.cs:98:27:98:53 | object creation of type SqlCommand : SqlCommand | SqlInjection.cs:98:21:98:23 | access to local variable cmd : SqlCommand | provenance |  |
-| SqlInjection.cs:98:42:98:52 | access to local variable queryString : String | SqlInjection.cs:98:27:98:53 | object creation of type SqlCommand : SqlCommand | provenance | MaD:19 |
-| SqlInjection.cs:107:21:107:31 | access to local variable queryString : String | SqlInjection.cs:109:42:109:52 | access to local variable queryString | provenance |  Sink:MaD:15 |
+| SqlInjection.cs:98:42:98:52 | access to local variable queryString : String | SqlInjection.cs:98:27:98:53 | object creation of type SqlCommand : SqlCommand | provenance | MaD:22 |
+| SqlInjection.cs:107:21:107:31 | access to local variable queryString : String | SqlInjection.cs:109:42:109:52 | access to local variable queryString | provenance | Sink:MaD:14 |
 | SqlInjection.cs:107:21:107:31 | access to local variable queryString : String | SqlInjection.cs:109:42:109:52 | access to local variable queryString : String | provenance |  |
-| SqlInjection.cs:108:21:108:38 | call to method ReadLine : String | SqlInjection.cs:107:21:107:31 | access to local variable queryString : String | provenance | Src:MaD:27  |
-| SqlInjection.cs:109:21:109:23 | access to local variable cmd : SqlCommand | SqlInjection.cs:110:50:110:52 | access to local variable cmd | provenance |  Sink:MaD:17 |
+| SqlInjection.cs:108:21:108:38 | call to method ReadLine : String | SqlInjection.cs:107:21:107:31 | access to local variable queryString : String | provenance | Src:MaD:20  |
+| SqlInjection.cs:109:21:109:23 | access to local variable cmd : SqlCommand | SqlInjection.cs:110:50:110:52 | access to local variable cmd | provenance | Sink:MaD:16 |
 | SqlInjection.cs:109:27:109:53 | object creation of type SqlCommand : SqlCommand | SqlInjection.cs:109:21:109:23 | access to local variable cmd : SqlCommand | provenance |  |
-| SqlInjection.cs:109:42:109:52 | access to local variable queryString : String | SqlInjection.cs:109:27:109:53 | object creation of type SqlCommand : SqlCommand | provenance | MaD:19 |
+| SqlInjection.cs:109:42:109:52 | access to local variable queryString : String | SqlInjection.cs:109:27:109:53 | object creation of type SqlCommand : SqlCommand | provenance | MaD:22 |
 | SqlInjection.cs:122:73:122:78 | userId : String | SqlInjection.cs:125:20:125:24 | access to local variable query : String | provenance |  |
-| SqlInjection.cs:125:20:125:24 | access to local variable query : String | SqlInjection.cs:129:53:129:57 | access to local variable query | provenance |  Sink:MaD:16 |
-| SqlInjectionDapper.cs:20:21:20:25 | access to local variable query : String | SqlInjectionDapper.cs:21:55:21:59 | access to local variable query | provenance |  Sink:MaD:4 |
+| SqlInjection.cs:125:20:125:24 | access to local variable query : String | SqlInjection.cs:129:53:129:57 | access to local variable query | provenance | Sink:MaD:15 |
+| SqlInjectionDapper.cs:20:21:20:25 | access to local variable query : String | SqlInjectionDapper.cs:21:55:21:59 | access to local variable query | provenance | Sink:MaD:4 |
 | SqlInjectionDapper.cs:20:86:20:94 | access to property Text : String | SqlInjectionDapper.cs:20:21:20:25 | access to local variable query : String | provenance |  |
-| SqlInjectionDapper.cs:29:21:29:25 | access to local variable query : String | SqlInjectionDapper.cs:30:66:30:70 | access to local variable query | provenance |  Sink:MaD:5 |
+| SqlInjectionDapper.cs:29:21:29:25 | access to local variable query : String | SqlInjectionDapper.cs:30:66:30:70 | access to local variable query | provenance | Sink:MaD:5 |
 | SqlInjectionDapper.cs:29:86:29:94 | access to property Text : String | SqlInjectionDapper.cs:29:21:29:25 | access to local variable query : String | provenance |  |
-| SqlInjectionDapper.cs:38:21:38:25 | access to local variable query : String | SqlInjectionDapper.cs:39:63:39:67 | access to local variable query | provenance |  Sink:MaD:6 |
+| SqlInjectionDapper.cs:38:21:38:25 | access to local variable query : String | SqlInjectionDapper.cs:39:63:39:67 | access to local variable query | provenance | Sink:MaD:6 |
 | SqlInjectionDapper.cs:38:86:38:94 | access to property Text : String | SqlInjectionDapper.cs:38:21:38:25 | access to local variable query : String | provenance |  |
-| SqlInjectionDapper.cs:47:21:47:25 | access to local variable query : String | SqlInjectionDapper.cs:49:47:49:51 | access to local variable query | provenance |  Sink:MaD:1 |
+| SqlInjectionDapper.cs:47:21:47:25 | access to local variable query : String | SqlInjectionDapper.cs:49:47:49:51 | access to local variable query | provenance | Sink:MaD:1 |
 | SqlInjectionDapper.cs:47:86:47:94 | access to property Text : String | SqlInjectionDapper.cs:47:21:47:25 | access to local variable query : String | provenance |  |
-| SqlInjectionDapper.cs:57:21:57:25 | access to local variable query : String | SqlInjectionDapper.cs:58:42:58:46 | access to local variable query | provenance |  Sink:MaD:3 |
+| SqlInjectionDapper.cs:57:21:57:25 | access to local variable query : String | SqlInjectionDapper.cs:58:42:58:46 | access to local variable query | provenance | Sink:MaD:3 |
 | SqlInjectionDapper.cs:57:86:57:94 | access to property Text : String | SqlInjectionDapper.cs:57:21:57:25 | access to local variable query : String | provenance |  |
-| SqlInjectionDapper.cs:66:21:66:25 | access to local variable query : String | SqlInjectionDapper.cs:67:42:67:46 | access to local variable query | provenance |  Sink:MaD:2 |
+| SqlInjectionDapper.cs:66:21:66:25 | access to local variable query : String | SqlInjectionDapper.cs:67:42:67:46 | access to local variable query | provenance | Sink:MaD:2 |
 | SqlInjectionDapper.cs:66:86:66:94 | access to property Text : String | SqlInjectionDapper.cs:66:21:66:25 | access to local variable query : String | provenance |  |
 | SqlInjectionDapper.cs:75:21:75:25 | access to local variable query : String | SqlInjectionDapper.cs:77:52:77:56 | access to local variable query | provenance |  |
 | SqlInjectionDapper.cs:75:86:75:94 | access to property Text : String | SqlInjectionDapper.cs:75:21:75:25 | access to local variable query : String | provenance |  |
-| SqlInjectionSqlite.cs:19:51:19:63 | access to field untrustedData : TextBox | SqlInjectionSqlite.cs:19:51:19:68 | access to property Text | provenance | MaD:26 Sink:MaD:9 |
-| SqlInjectionSqlite.cs:24:17:24:19 | access to local variable cmd : SQLiteCommand | SqlInjectionSqlite.cs:44:45:44:47 | access to local variable cmd | provenance |  Sink:MaD:11 |
+| SqlInjectionSqlite.cs:19:51:19:63 | access to field untrustedData : TextBox | SqlInjectionSqlite.cs:19:51:19:68 | access to property Text | provenance | MaD:27 Sink:MaD:9 |
+| SqlInjectionSqlite.cs:24:17:24:19 | access to local variable cmd : SQLiteCommand | SqlInjectionSqlite.cs:44:45:44:47 | access to local variable cmd | provenance | Sink:MaD:11 |
 | SqlInjectionSqlite.cs:24:23:24:71 | object creation of type SQLiteCommand : SQLiteCommand | SqlInjectionSqlite.cs:24:17:24:19 | access to local variable cmd : SQLiteCommand | provenance |  |
-| SqlInjectionSqlite.cs:24:41:24:53 | access to field untrustedData : TextBox | SqlInjectionSqlite.cs:24:41:24:58 | access to property Text | provenance | MaD:26 Sink:MaD:10 |
-| SqlInjectionSqlite.cs:24:41:24:53 | access to field untrustedData : TextBox | SqlInjectionSqlite.cs:24:41:24:58 | access to property Text : String | provenance | MaD:26 |
-| SqlInjectionSqlite.cs:24:41:24:58 | access to property Text : String | SqlInjectionSqlite.cs:24:23:24:71 | object creation of type SQLiteCommand : SQLiteCommand | provenance | MaD:14 |
-| SqlInjectionSqlite.cs:33:49:33:61 | access to field untrustedData : TextBox | SqlInjectionSqlite.cs:33:49:33:66 | access to property Text | provenance | MaD:26 Sink:MaD:12 |
-| SqlInjectionSqlite.cs:39:45:39:57 | access to field untrustedData : TextBox | SqlInjectionSqlite.cs:39:45:39:62 | access to property Text | provenance | MaD:26 Sink:MaD:13 |
+| SqlInjectionSqlite.cs:24:41:24:53 | access to field untrustedData : TextBox | SqlInjectionSqlite.cs:24:41:24:58 | access to property Text | provenance | MaD:27 Sink:MaD:10 |
+| SqlInjectionSqlite.cs:24:41:24:53 | access to field untrustedData : TextBox | SqlInjectionSqlite.cs:24:41:24:58 | access to property Text : String | provenance | MaD:27 |
+| SqlInjectionSqlite.cs:24:41:24:58 | access to property Text : String | SqlInjectionSqlite.cs:24:23:24:71 | object creation of type SQLiteCommand : SQLiteCommand | provenance | MaD:21 |
+| SqlInjectionSqlite.cs:33:49:33:61 | access to field untrustedData : TextBox | SqlInjectionSqlite.cs:33:49:33:66 | access to property Text | provenance | MaD:27 Sink:MaD:12 |
+| SqlInjectionSqlite.cs:39:45:39:57 | access to field untrustedData : TextBox | SqlInjectionSqlite.cs:39:45:39:62 | access to property Text | provenance | MaD:27 Sink:MaD:13 |
 | SqlInjectionSqlite.cs:49:31:49:32 | access to local variable fs : FileStream | SqlInjectionSqlite.cs:51:59:51:60 | access to local variable fs : FileStream | provenance |  |
-| SqlInjectionSqlite.cs:49:36:49:84 | object creation of type FileStream : FileStream | SqlInjectionSqlite.cs:49:31:49:32 | access to local variable fs : FileStream | provenance | Src:MaD:21  |
-| SqlInjectionSqlite.cs:49:36:49:84 | object creation of type FileStream : FileStream | SqlInjectionSqlite.cs:49:31:49:32 | access to local variable fs : FileStream | provenance | Src:MaD:22  |
-| SqlInjectionSqlite.cs:49:51:49:63 | access to field untrustedData : TextBox | SqlInjectionSqlite.cs:49:51:49:68 | access to property Text : String | provenance | MaD:26 |
-| SqlInjectionSqlite.cs:49:51:49:68 | access to property Text : String | SqlInjectionSqlite.cs:49:36:49:84 | object creation of type FileStream : FileStream | provenance | MaD:23 |
+| SqlInjectionSqlite.cs:49:36:49:84 | object creation of type FileStream : FileStream | SqlInjectionSqlite.cs:49:31:49:32 | access to local variable fs : FileStream | provenance | Src:MaD:19  |
+| SqlInjectionSqlite.cs:49:36:49:84 | object creation of type FileStream : FileStream | SqlInjectionSqlite.cs:49:31:49:32 | access to local variable fs : FileStream | provenance | Src:MaD:18  |
+| SqlInjectionSqlite.cs:49:51:49:63 | access to field untrustedData : TextBox | SqlInjectionSqlite.cs:49:51:49:68 | access to property Text : String | provenance | MaD:27 |
+| SqlInjectionSqlite.cs:49:51:49:68 | access to property Text : String | SqlInjectionSqlite.cs:49:36:49:84 | object creation of type FileStream : FileStream | provenance | MaD:24 |
 | SqlInjectionSqlite.cs:51:37:51:38 | access to local variable sr : StreamReader | SqlInjectionSqlite.cs:54:35:54:36 | access to local variable sr : StreamReader | provenance |  |
 | SqlInjectionSqlite.cs:51:42:51:76 | object creation of type StreamReader : StreamReader | SqlInjectionSqlite.cs:51:37:51:38 | access to local variable sr : StreamReader | provenance |  |
-| SqlInjectionSqlite.cs:51:59:51:60 | access to local variable fs : FileStream | SqlInjectionSqlite.cs:51:42:51:76 | object creation of type StreamReader : StreamReader | provenance | MaD:24 |
+| SqlInjectionSqlite.cs:51:59:51:60 | access to local variable fs : FileStream | SqlInjectionSqlite.cs:51:42:51:76 | object creation of type StreamReader : StreamReader | provenance | MaD:25 |
 | SqlInjectionSqlite.cs:54:29:54:31 | access to local variable sql : String | SqlInjectionSqlite.cs:56:31:56:33 | access to local variable sql : String | provenance |  |
-| SqlInjectionSqlite.cs:54:35:54:36 | access to local variable sr : StreamReader | SqlInjectionSqlite.cs:54:35:54:47 | call to method ReadLine : String | provenance | MaD:25 |
+| SqlInjectionSqlite.cs:54:35:54:36 | access to local variable sr : StreamReader | SqlInjectionSqlite.cs:54:35:54:47 | call to method ReadLine : String | provenance | MaD:26 |
 | SqlInjectionSqlite.cs:54:35:54:47 | call to method ReadLine : String | SqlInjectionSqlite.cs:54:29:54:31 | access to local variable sql : String | provenance |  |
-| SqlInjectionSqlite.cs:56:25:56:27 | access to local variable sql : String | SqlInjectionSqlite.cs:61:53:61:55 | access to local variable sql | provenance |  Sink:MaD:10 |
+| SqlInjectionSqlite.cs:56:25:56:27 | access to local variable sql : String | SqlInjectionSqlite.cs:61:53:61:55 | access to local variable sql | provenance | Sink:MaD:10 |
 | SqlInjectionSqlite.cs:56:31:56:33 | access to local variable sql : String | SqlInjectionSqlite.cs:56:31:56:40 | call to method Trim : String | provenance | MaD:28 |
 | SqlInjectionSqlite.cs:56:31:56:40 | call to method Trim : String | SqlInjectionSqlite.cs:56:25:56:27 | access to local variable sql : String | provenance |  |
 models
@@ -114,20 +114,20 @@ models
 | 11 | Sink: System.Data.SQLite; SQLiteDataAdapter; false; SQLiteDataAdapter; (System.Data.SQLite.SQLiteCommand); ; Argument[0]; sql-injection; manual |
 | 12 | Sink: System.Data.SQLite; SQLiteDataAdapter; false; SQLiteDataAdapter; (System.String,System.Data.SQLite.SQLiteConnection); ; Argument[0]; sql-injection; manual |
 | 13 | Sink: System.Data.SQLite; SQLiteDataAdapter; false; SQLiteDataAdapter; (System.String,System.String); ; Argument[0]; sql-injection; manual |
-| 14 | Summary: System.Data.SQLite; SQLiteCommand; false; SQLiteCommand; (System.String,System.Data.SQLite.SQLiteConnection); ; Argument[0]; Argument[this]; taint; manual |
-| 15 | Sink: System.Data.SqlClient; SqlCommand; false; SqlCommand; (System.String); ; Argument[0]; sql-injection; manual |
-| 16 | Sink: System.Data.SqlClient; SqlCommand; false; SqlCommand; (System.String,System.Data.SqlClient.SqlConnection); ; Argument[0]; sql-injection; manual |
-| 17 | Sink: System.Data.SqlClient; SqlDataAdapter; false; SqlDataAdapter; (System.Data.SqlClient.SqlCommand); ; Argument[0]; sql-injection; manual |
-| 18 | Sink: System.Data.SqlClient; SqlDataAdapter; false; SqlDataAdapter; (System.String,System.Data.SqlClient.SqlConnection); ; Argument[0]; sql-injection; manual |
-| 19 | Summary: System.Data.SqlClient; SqlCommand; false; SqlCommand; (System.String); ; Argument[0]; Argument[this]; taint; manual |
-| 20 | Summary: System.Data; IDataRecord; true; GetString; (System.Int32); ; Argument[this]; ReturnValue; taint; manual |
-| 21 | Source: System.IO; FileStream; false; FileStream; ; ; Argument[this]; file; manual |
-| 22 | Source: System.IO; FileStream; false; FileStream; ; ; Argument[this]; file-write; manual |
-| 23 | Summary: System.IO; FileStream; false; FileStream; (System.String,System.IO.FileMode); ; Argument[0]; Argument[this]; taint; manual |
-| 24 | Summary: System.IO; StreamReader; false; StreamReader; (System.IO.Stream,System.Text.Encoding); ; Argument[0]; Argument[this]; taint; manual |
-| 25 | Summary: System.IO; TextReader; true; ReadLine; (); ; Argument[this]; ReturnValue; taint; manual |
-| 26 | Summary: System.Web.UI.WebControls; TextBox; false; get_Text; (); ; Argument[this]; ReturnValue; taint; manual |
-| 27 | Source: System; Console; false; ReadLine; ; ; ReturnValue; stdin; manual |
+| 14 | Sink: System.Data.SqlClient; SqlCommand; false; SqlCommand; (System.String); ; Argument[0]; sql-injection; manual |
+| 15 | Sink: System.Data.SqlClient; SqlCommand; false; SqlCommand; (System.String,System.Data.SqlClient.SqlConnection); ; Argument[0]; sql-injection; manual |
+| 16 | Sink: System.Data.SqlClient; SqlDataAdapter; false; SqlDataAdapter; (System.Data.SqlClient.SqlCommand); ; Argument[0]; sql-injection; manual |
+| 17 | Sink: System.Data.SqlClient; SqlDataAdapter; false; SqlDataAdapter; (System.String,System.Data.SqlClient.SqlConnection); ; Argument[0]; sql-injection; manual |
+| 18 | Source: System.IO; FileStream; false; FileStream; ; ; Argument[this]; file-write; manual |
+| 19 | Source: System.IO; FileStream; false; FileStream; ; ; Argument[this]; file; manual |
+| 20 | Source: System; Console; false; ReadLine; ; ; ReturnValue; stdin; manual |
+| 21 | Summary: System.Data.SQLite; SQLiteCommand; false; SQLiteCommand; (System.String,System.Data.SQLite.SQLiteConnection); ; Argument[0]; Argument[this]; taint; manual |
+| 22 | Summary: System.Data.SqlClient; SqlCommand; false; SqlCommand; (System.String); ; Argument[0]; Argument[this]; taint; manual |
+| 23 | Summary: System.Data; IDataRecord; true; GetString; (System.Int32); ; Argument[this]; ReturnValue; taint; manual |
+| 24 | Summary: System.IO; FileStream; false; FileStream; (System.String,System.IO.FileMode); ; Argument[0]; Argument[this]; taint; manual |
+| 25 | Summary: System.IO; StreamReader; false; StreamReader; (System.IO.Stream,System.Text.Encoding); ; Argument[0]; Argument[this]; taint; manual |
+| 26 | Summary: System.IO; TextReader; true; ReadLine; (); ; Argument[this]; ReturnValue; taint; manual |
+| 27 | Summary: System.Web.UI.WebControls; TextBox; false; get_Text; (); ; Argument[this]; ReturnValue; taint; manual |
 | 28 | Summary: System; String; false; Trim; (); ; Argument[this]; ReturnValue; taint; manual |
 nodes
 | SecondOrderSqlInjection.cs:20:31:20:44 | access to local variable customerReader : SqlDataReader | semmle.label | access to local variable customerReader : SqlDataReader |
diff --git a/csharp/ql/test/query-tests/Security Features/CWE-090/LDAPInjection.expected b/csharp/ql/test/query-tests/Security Features/CWE-090/LDAPInjection.expected
index c283f5a22f8..2cb812051c6 100644
--- a/csharp/ql/test/query-tests/Security Features/CWE-090/LDAPInjection.expected	
+++ b/csharp/ql/test/query-tests/Security Features/CWE-090/LDAPInjection.expected	
@@ -14,15 +14,15 @@ edges
 | LDAPInjection.cs:12:16:12:23 | access to local variable userName : String | LDAPInjection.cs:28:48:28:70 | ... + ... | provenance |  |
 | LDAPInjection.cs:12:16:12:23 | access to local variable userName : String | LDAPInjection.cs:30:20:30:42 | ... + ... | provenance |  |
 | LDAPInjection.cs:12:27:12:49 | access to property QueryString : NameValueCollection | LDAPInjection.cs:12:16:12:23 | access to local variable userName : String | provenance |  |
-| LDAPInjection.cs:12:27:12:49 | access to property QueryString : NameValueCollection | LDAPInjection.cs:12:27:12:61 | access to indexer : String | provenance | MaD:2 |
+| LDAPInjection.cs:12:27:12:49 | access to property QueryString : NameValueCollection | LDAPInjection.cs:12:27:12:61 | access to indexer : String | provenance | MaD:1 |
 | LDAPInjection.cs:12:27:12:61 | access to indexer : String | LDAPInjection.cs:12:16:12:23 | access to local variable userName : String | provenance |  |
 | LDAPInjection.cs:36:27:36:40 | access to local variable customerReader : SqlDataReader | LDAPInjection.cs:41:80:41:93 | access to local variable customerReader : SqlDataReader | provenance |  |
 | LDAPInjection.cs:36:44:36:74 | call to method ExecuteReader : SqlDataReader | LDAPInjection.cs:36:27:36:40 | access to local variable customerReader : SqlDataReader | provenance |  |
-| LDAPInjection.cs:41:80:41:93 | access to local variable customerReader : SqlDataReader | LDAPInjection.cs:41:80:41:106 | call to method GetString : String | provenance | MaD:1 |
+| LDAPInjection.cs:41:80:41:93 | access to local variable customerReader : SqlDataReader | LDAPInjection.cs:41:80:41:106 | call to method GetString : String | provenance | MaD:2 |
 | LDAPInjection.cs:41:80:41:106 | call to method GetString : String | LDAPInjection.cs:41:63:41:106 | ... + ... | provenance |  |
 models
-| 1 | Summary: System.Data; IDataRecord; true; GetString; (System.Int32); ; Argument[this]; ReturnValue; taint; manual |
-| 2 | Summary: System.Collections.Specialized; NameValueCollection; false; get_Item; (System.String); ; Argument[this]; ReturnValue; taint; df-generated |
+| 1 | Summary: System.Collections.Specialized; NameValueCollection; false; get_Item; (System.String); ; Argument[this]; ReturnValue; taint; df-generated |
+| 2 | Summary: System.Data; IDataRecord; true; GetString; (System.Int32); ; Argument[this]; ReturnValue; taint; manual |
 nodes
 | LDAPInjection.cs:12:16:12:23 | access to local variable userName : String | semmle.label | access to local variable userName : String |
 | LDAPInjection.cs:12:27:12:49 | access to property QueryString : NameValueCollection | semmle.label | access to property QueryString : NameValueCollection |
diff --git a/csharp/ql/test/query-tests/Security Features/CWE-112/MissingXMLValidation.expected b/csharp/ql/test/query-tests/Security Features/CWE-112/MissingXMLValidation.expected
index 60054bcaec2..2477cd600e0 100644
--- a/csharp/ql/test/query-tests/Security Features/CWE-112/MissingXMLValidation.expected	
+++ b/csharp/ql/test/query-tests/Security Features/CWE-112/MissingXMLValidation.expected	
@@ -10,15 +10,15 @@ edges
 | MissingXMLValidation.cs:12:16:12:30 | access to local variable userProvidedXml : String | MissingXMLValidation.cs:27:43:27:57 | access to local variable userProvidedXml : String | provenance |  |
 | MissingXMLValidation.cs:12:16:12:30 | access to local variable userProvidedXml : String | MissingXMLValidation.cs:45:43:45:57 | access to local variable userProvidedXml : String | provenance |  |
 | MissingXMLValidation.cs:12:34:12:56 | access to property QueryString : NameValueCollection | MissingXMLValidation.cs:12:16:12:30 | access to local variable userProvidedXml : String | provenance |  |
-| MissingXMLValidation.cs:12:34:12:56 | access to property QueryString : NameValueCollection | MissingXMLValidation.cs:12:34:12:75 | access to indexer : String | provenance | MaD:2 |
+| MissingXMLValidation.cs:12:34:12:56 | access to property QueryString : NameValueCollection | MissingXMLValidation.cs:12:34:12:75 | access to indexer : String | provenance | MaD:1 |
 | MissingXMLValidation.cs:12:34:12:75 | access to indexer : String | MissingXMLValidation.cs:12:16:12:30 | access to local variable userProvidedXml : String | provenance |  |
-| MissingXMLValidation.cs:16:43:16:57 | access to local variable userProvidedXml : String | MissingXMLValidation.cs:16:26:16:58 | object creation of type StringReader | provenance | MaD:1 |
-| MissingXMLValidation.cs:21:43:21:57 | access to local variable userProvidedXml : String | MissingXMLValidation.cs:21:26:21:58 | object creation of type StringReader | provenance | MaD:1 |
-| MissingXMLValidation.cs:27:43:27:57 | access to local variable userProvidedXml : String | MissingXMLValidation.cs:27:26:27:58 | object creation of type StringReader | provenance | MaD:1 |
-| MissingXMLValidation.cs:45:43:45:57 | access to local variable userProvidedXml : String | MissingXMLValidation.cs:45:26:45:58 | object creation of type StringReader | provenance | MaD:1 |
+| MissingXMLValidation.cs:16:43:16:57 | access to local variable userProvidedXml : String | MissingXMLValidation.cs:16:26:16:58 | object creation of type StringReader | provenance | MaD:2 |
+| MissingXMLValidation.cs:21:43:21:57 | access to local variable userProvidedXml : String | MissingXMLValidation.cs:21:26:21:58 | object creation of type StringReader | provenance | MaD:2 |
+| MissingXMLValidation.cs:27:43:27:57 | access to local variable userProvidedXml : String | MissingXMLValidation.cs:27:26:27:58 | object creation of type StringReader | provenance | MaD:2 |
+| MissingXMLValidation.cs:45:43:45:57 | access to local variable userProvidedXml : String | MissingXMLValidation.cs:45:26:45:58 | object creation of type StringReader | provenance | MaD:2 |
 models
-| 1 | Summary: System.IO; StringReader; false; StringReader; (System.String); ; Argument[0]; Argument[this]; taint; manual |
-| 2 | Summary: System.Collections.Specialized; NameValueCollection; false; get_Item; (System.String); ; Argument[this]; ReturnValue; taint; df-generated |
+| 1 | Summary: System.Collections.Specialized; NameValueCollection; false; get_Item; (System.String); ; Argument[this]; ReturnValue; taint; df-generated |
+| 2 | Summary: System.IO; StringReader; false; StringReader; (System.String); ; Argument[0]; Argument[this]; taint; manual |
 nodes
 | MissingXMLValidation.cs:12:16:12:30 | access to local variable userProvidedXml : String | semmle.label | access to local variable userProvidedXml : String |
 | MissingXMLValidation.cs:12:34:12:56 | access to property QueryString : NameValueCollection | semmle.label | access to property QueryString : NameValueCollection |
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 9b829775463..691d98f986e 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	
@@ -23,6 +23,8 @@ public class LogForgingHandler : IHttpHandler
         logger.Warn(username.Replace(Environment.NewLine, "") + " logged in");
         // GOOD: New-lines removed
         logger.Warn(username.Replace(Environment.NewLine, "", StringComparison.InvariantCultureIgnoreCase) + " logged in");
+        // GOOD: New-lines replaced
+        logger.Warn(username.ReplaceLineEndings("") + " logged in");
         // GOOD: Html encoded
         logger.Warn(WebUtility.HtmlEncode(username) + " logged in");
         // BAD: Logged as-is to TraceSource
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 4d1c27c4843..f817ebd27b0 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	
@@ -1,12 +1,12 @@
 #select
 | 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:29:50:29:72 | ... + ... | LogForging.cs:18:27:18:49 | access to property QueryString : NameValueCollection | LogForging.cs:29:50:29:72 | ... + ... | This log entry depends on a $@. | LogForging.cs:18:27:18:49 | access to property QueryString | user-provided value |
-| LogForging.cs:33:26:33:33 | access to local variable username | LogForging.cs:18:27:18:49 | access to property QueryString : NameValueCollection | LogForging.cs:33:26:33: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: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 |
 | LogForgingAsp.cs:12:21:12:43 | ... + ... | LogForgingAsp.cs:8:32:8:39 | username : String | LogForgingAsp.cs:12:21:12:43 | ... + ... | This log entry depends on a $@. | LogForgingAsp.cs:8:32:8: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:29:50:29:72 | ... + ... | provenance |  |
-| LogForging.cs:18:16:18:23 | access to local variable username : String | LogForging.cs:33:26:33:33 | access to local variable username | 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: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 |  |
@@ -18,8 +18,8 @@ nodes
 | LogForging.cs:18:27:18:49 | access to property QueryString : NameValueCollection | semmle.label | access to property QueryString : NameValueCollection |
 | LogForging.cs:18:27:18:61 | access to indexer : String | semmle.label | access to indexer : String |
 | LogForging.cs:21:21:21:43 | ... + ... | semmle.label | ... + ... |
-| LogForging.cs:29:50:29:72 | ... + ... | semmle.label | ... + ... |
-| LogForging.cs:33:26:33:33 | access to local variable username | semmle.label | access to local variable username |
+| 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 |
 | LogForgingAsp.cs:8:32:8:39 | username : String | semmle.label | username : String |
 | LogForgingAsp.cs:12:21:12:43 | ... + ... | semmle.label | ... + ... |
 subpaths
diff --git a/csharp/ql/test/query-tests/Security Features/CWE-201/ExposureInTransmittedData/ExposureInTransmittedData.expected b/csharp/ql/test/query-tests/Security Features/CWE-201/ExposureInTransmittedData/ExposureInTransmittedData.expected
index 29b1d19c01f..f6fedad600a 100644
--- a/csharp/ql/test/query-tests/Security Features/CWE-201/ExposureInTransmittedData/ExposureInTransmittedData.expected	
+++ b/csharp/ql/test/query-tests/Security Features/CWE-201/ExposureInTransmittedData/ExposureInTransmittedData.expected	
@@ -9,16 +9,16 @@
 | ExposureInTransmittedData.cs:32:24:32:52 | ... + ... | ExposureInTransmittedData.cs:30:17:30:36 | call to method GetField : String | ExposureInTransmittedData.cs:32:24:32:52 | ... + ... | This data transmitted to the user depends on $@. | ExposureInTransmittedData.cs:30:17:30:36 | call to method GetField | sensitive information |
 | ExposureInTransmittedData.cs:33:27:33:27 | access to local variable p | ExposureInTransmittedData.cs:30:17:30:36 | call to method GetField : String | ExposureInTransmittedData.cs:33:27:33:27 | access to local variable p | This data transmitted to the user depends on $@. | ExposureInTransmittedData.cs:30:17:30:36 | call to method GetField | sensitive information |
 edges
-| ExposureInTransmittedData.cs:24:32:24:38 | access to property Data : IDictionary | ExposureInTransmittedData.cs:24:32:24:50 | access to indexer | provenance |  Sink:MaD:2 |
-| ExposureInTransmittedData.cs:24:32:24:38 | access to property Data : IDictionary | ExposureInTransmittedData.cs:24:32:24:50 | access to indexer | provenance | MaD:1 Sink:MaD:2 |
+| ExposureInTransmittedData.cs:24:32:24:38 | access to property Data : IDictionary | ExposureInTransmittedData.cs:24:32:24:50 | access to indexer | provenance | MaD:2 Sink:MaD:1 |
+| ExposureInTransmittedData.cs:24:32:24:38 | access to property Data : IDictionary | ExposureInTransmittedData.cs:24:32:24:50 | access to indexer | provenance | Sink:MaD:1 |
 | ExposureInTransmittedData.cs:30:13:30:13 | access to local variable p : String | ExposureInTransmittedData.cs:31:53:31:53 | access to local variable p | provenance |  |
 | ExposureInTransmittedData.cs:30:13:30:13 | access to local variable p : String | ExposureInTransmittedData.cs:31:56:31:56 | access to local variable p | provenance |  |
 | ExposureInTransmittedData.cs:30:13:30:13 | access to local variable p : String | ExposureInTransmittedData.cs:32:24:32:52 | ... + ... | provenance |  |
 | ExposureInTransmittedData.cs:30:13:30:13 | access to local variable p : String | ExposureInTransmittedData.cs:33:27:33:27 | access to local variable p | provenance |  |
 | ExposureInTransmittedData.cs:30:17:30:36 | call to method GetField : String | ExposureInTransmittedData.cs:30:13:30:13 | access to local variable p : String | provenance |  |
 models
-| 1 | Summary: System.ComponentModel; PropertyDescriptorCollection; false; get_Item; (System.Object); ; Argument[this].Element; ReturnValue; value; manual |
-| 2 | Sink: System.Web; HttpResponse; false; Write; ; ; Argument[0]; html-injection; manual |
+| 1 | Sink: System.Web; HttpResponse; false; Write; ; ; Argument[0]; html-injection; manual |
+| 2 | Summary: System.ComponentModel; PropertyDescriptorCollection; false; get_Item; (System.Object); ; Argument[this].Element; ReturnValue; value; manual |
 nodes
 | ExposureInTransmittedData.cs:14:32:14:39 | access to local variable password | semmle.label | access to local variable password |
 | ExposureInTransmittedData.cs:18:32:18:44 | call to method ToString | semmle.label | call to method ToString |
diff --git a/csharp/ql/test/query-tests/Security Features/CWE-209/ExceptionInformationExposure.expected b/csharp/ql/test/query-tests/Security Features/CWE-209/ExceptionInformationExposure.expected
index 9f8e7037e6c..f7015f6e9ba 100644
--- a/csharp/ql/test/query-tests/Security Features/CWE-209/ExceptionInformationExposure.expected	
+++ b/csharp/ql/test/query-tests/Security Features/CWE-209/ExceptionInformationExposure.expected	
@@ -1,17 +1,14 @@
 #select
 | ExceptionInformationExposure.cs:19:32:19:44 | call to method ToString | ExceptionInformationExposure.cs:19:32:19:33 | access to local variable ex : Exception | ExceptionInformationExposure.cs:19:32:19:44 | call to method ToString | This information exposed to the user depends on $@. | ExceptionInformationExposure.cs:19:32:19:33 | access to local variable ex | exception information |
 | ExceptionInformationExposure.cs:21:32:21:33 | access to local variable ex | ExceptionInformationExposure.cs:21:32:21:33 | access to local variable ex | ExceptionInformationExposure.cs:21:32:21:33 | access to local variable ex | This information exposed to the user depends on $@. | ExceptionInformationExposure.cs:21:32:21:33 | access to local variable ex | exception information |
-| ExceptionInformationExposure.cs:23:32:23:44 | access to property StackTrace | ExceptionInformationExposure.cs:23:32:23:33 | access to local variable ex : Exception | ExceptionInformationExposure.cs:23:32:23:44 | access to property StackTrace | This information exposed to the user depends on $@. | ExceptionInformationExposure.cs:23:32:23:33 | access to local variable ex | exception information |
-| ExceptionInformationExposure.cs:39:28:39:55 | access to property StackTrace | ExceptionInformationExposure.cs:39:28:39:44 | access to property InnerException : Exception | ExceptionInformationExposure.cs:39:28:39:55 | access to property StackTrace | This information exposed to the user depends on $@. | ExceptionInformationExposure.cs:39:28:39:44 | access to property InnerException | exception information |
-| ExceptionInformationExposure.cs:40:28:40:40 | access to property StackTrace | ExceptionInformationExposure.cs:40:28:40:29 | access to local variable ex : Exception | ExceptionInformationExposure.cs:40:28:40:40 | access to property StackTrace | This information exposed to the user depends on $@. | ExceptionInformationExposure.cs:40:28:40:29 | access to local variable ex | exception information |
+| ExceptionInformationExposure.cs:23:32:23:44 | access to property StackTrace | ExceptionInformationExposure.cs:23:32:23:44 | access to property StackTrace | ExceptionInformationExposure.cs:23:32:23:44 | access to property StackTrace | This information exposed to the user depends on $@. | ExceptionInformationExposure.cs:23:32:23:44 | access to property StackTrace | exception information |
+| ExceptionInformationExposure.cs:39:28:39:55 | access to property StackTrace | ExceptionInformationExposure.cs:39:28:39:55 | access to property StackTrace | ExceptionInformationExposure.cs:39:28:39:55 | access to property StackTrace | This information exposed to the user depends on $@. | ExceptionInformationExposure.cs:39:28:39:55 | access to property StackTrace | exception information |
+| ExceptionInformationExposure.cs:40:28:40:40 | access to property StackTrace | ExceptionInformationExposure.cs:40:28:40:40 | access to property StackTrace | ExceptionInformationExposure.cs:40:28:40:40 | access to property StackTrace | This information exposed to the user depends on $@. | ExceptionInformationExposure.cs:40:28:40:40 | access to property StackTrace | exception information |
 | ExceptionInformationExposure.cs:41:28:41:40 | call to method ToString | ExceptionInformationExposure.cs:41:28:41:29 | access to local variable ex : Exception | ExceptionInformationExposure.cs:41:28:41:40 | call to method ToString | This information exposed to the user depends on $@. | ExceptionInformationExposure.cs:41:28:41:29 | access to local variable ex | exception information |
 | ExceptionInformationExposure.cs:47:28:47:55 | call to method ToString | ExceptionInformationExposure.cs:47:28:47:44 | object creation of type MyException : MyException | ExceptionInformationExposure.cs:47:28:47:55 | call to method ToString | This information exposed to the user depends on $@. | ExceptionInformationExposure.cs:47:28:47:44 | object creation of type MyException | exception information |
 edges
 | ExceptionInformationExposure.cs:19:32:19:33 | access to local variable ex : Exception | ExceptionInformationExposure.cs:19:32:19:44 | call to method ToString | provenance | Config Sink:MaD:1 |
 | ExceptionInformationExposure.cs:19:32:19:33 | access to local variable ex : Exception | ExceptionInformationExposure.cs:19:32:19:44 | call to method ToString | provenance | MaD:2 Sink:MaD:1 |
-| ExceptionInformationExposure.cs:23:32:23:33 | access to local variable ex : Exception | ExceptionInformationExposure.cs:23:32:23:44 | access to property StackTrace | provenance | MaD:3 Sink:MaD:1 |
-| ExceptionInformationExposure.cs:39:28:39:44 | access to property InnerException : Exception | ExceptionInformationExposure.cs:39:28:39:55 | access to property StackTrace | provenance | MaD:3 |
-| ExceptionInformationExposure.cs:40:28:40:29 | access to local variable ex : Exception | ExceptionInformationExposure.cs:40:28:40:40 | access to property StackTrace | provenance | MaD:3 |
 | ExceptionInformationExposure.cs:41:28:41:29 | access to local variable ex : Exception | ExceptionInformationExposure.cs:41:28:41:40 | call to method ToString | provenance | Config |
 | ExceptionInformationExposure.cs:41:28:41:29 | access to local variable ex : Exception | ExceptionInformationExposure.cs:41:28:41:40 | call to method ToString | provenance | MaD:2 |
 | ExceptionInformationExposure.cs:47:28:47:44 | object creation of type MyException : MyException | ExceptionInformationExposure.cs:47:28:47:55 | call to method ToString | provenance | Config Sink:MaD:1 |
@@ -19,16 +16,12 @@ edges
 models
 | 1 | Sink: System.Web; HttpResponse; false; Write; ; ; Argument[0]; html-injection; manual |
 | 2 | Summary: System; Exception; false; ToString; (); ; Argument[this]; ReturnValue; taint; df-generated |
-| 3 | Summary: System; Exception; true; get_StackTrace; (); ; Argument[this]; ReturnValue; taint; df-generated |
 nodes
 | ExceptionInformationExposure.cs:19:32:19:33 | access to local variable ex : Exception | semmle.label | access to local variable ex : Exception |
 | ExceptionInformationExposure.cs:19:32:19:44 | call to method ToString | semmle.label | call to method ToString |
 | ExceptionInformationExposure.cs:21:32:21:33 | access to local variable ex | semmle.label | access to local variable ex |
-| ExceptionInformationExposure.cs:23:32:23:33 | access to local variable ex : Exception | semmle.label | access to local variable ex : Exception |
 | ExceptionInformationExposure.cs:23:32:23:44 | access to property StackTrace | semmle.label | access to property StackTrace |
-| ExceptionInformationExposure.cs:39:28:39:44 | access to property InnerException : Exception | semmle.label | access to property InnerException : Exception |
 | ExceptionInformationExposure.cs:39:28:39:55 | access to property StackTrace | semmle.label | access to property StackTrace |
-| ExceptionInformationExposure.cs:40:28:40:29 | access to local variable ex : Exception | semmle.label | access to local variable ex : Exception |
 | ExceptionInformationExposure.cs:40:28:40:40 | access to property StackTrace | semmle.label | access to property StackTrace |
 | ExceptionInformationExposure.cs:41:28:41:29 | access to local variable ex : Exception | semmle.label | access to local variable ex : Exception |
 | ExceptionInformationExposure.cs:41:28:41:40 | call to method ToString | semmle.label | call to method ToString |
diff --git a/csharp/ql/test/query-tests/Security Features/CWE-321/HardcodedSymmetricEncryptionKey/HardcodedSymmetricEncryptionKey.expected b/csharp/ql/test/query-tests/Security Features/CWE-321/HardcodedSymmetricEncryptionKey/HardcodedSymmetricEncryptionKey.expected
index a2f05e6ff5b..1b381628328 100644
--- a/csharp/ql/test/query-tests/Security Features/CWE-321/HardcodedSymmetricEncryptionKey/HardcodedSymmetricEncryptionKey.expected	
+++ b/csharp/ql/test/query-tests/Security Features/CWE-321/HardcodedSymmetricEncryptionKey/HardcodedSymmetricEncryptionKey.expected	
@@ -11,7 +11,7 @@ edges
 | HardcodedSymmetricEncryptionKey.cs:25:17:25:17 | access to local variable c : Byte[] | HardcodedSymmetricEncryptionKey.cs:41:50:41:50 | access to local variable c : Byte[] | provenance |  |
 | HardcodedSymmetricEncryptionKey.cs:25:17:25:17 | access to local variable c : Byte[] | HardcodedSymmetricEncryptionKey.cs:50:35:50:35 | access to local variable c : Byte[] | provenance |  |
 | HardcodedSymmetricEncryptionKey.cs:25:21:25:97 | array creation of type Byte[] : Byte[] | HardcodedSymmetricEncryptionKey.cs:25:17:25:17 | access to local variable c : Byte[] | provenance |  |
-| HardcodedSymmetricEncryptionKey.cs:26:17:26:17 | access to local variable d : Byte[] | HardcodedSymmetricEncryptionKey.cs:31:21:31:21 | access to local variable d | provenance |  Sink:MaD:3 |
+| HardcodedSymmetricEncryptionKey.cs:26:17:26:17 | access to local variable d : Byte[] | HardcodedSymmetricEncryptionKey.cs:31:21:31:21 | access to local variable d | provenance | Sink:MaD:3 |
 | HardcodedSymmetricEncryptionKey.cs:26:17:26:17 | access to local variable d : Byte[] | HardcodedSymmetricEncryptionKey.cs:36:37:36:37 | access to local variable d : Byte[] | provenance |  |
 | HardcodedSymmetricEncryptionKey.cs:28:17:28:35 | access to local variable byteArrayFromString : Byte[] | HardcodedSymmetricEncryptionKey.cs:44:51:44:69 | access to local variable byteArrayFromString : Byte[] | provenance |  |
 | HardcodedSymmetricEncryptionKey.cs:28:39:28:116 | call to method GetBytes : Byte[] | HardcodedSymmetricEncryptionKey.cs:28:17:28:35 | access to local variable byteArrayFromString : Byte[] | provenance |  |
@@ -20,9 +20,9 @@ edges
 | HardcodedSymmetricEncryptionKey.cs:41:50:41:50 | access to local variable c : Byte[] | HardcodedSymmetricEncryptionKey.cs:112:63:112:65 | key : Byte[] | provenance |  |
 | HardcodedSymmetricEncryptionKey.cs:44:51:44:69 | access to local variable byteArrayFromString : Byte[] | HardcodedSymmetricEncryptionKey.cs:112:63:112:65 | key : Byte[] | provenance |  |
 | HardcodedSymmetricEncryptionKey.cs:50:35:50:35 | access to local variable c : Byte[] | HardcodedSymmetricEncryptionKey.cs:59:64:59:71 | password : Byte[] | provenance |  |
-| HardcodedSymmetricEncryptionKey.cs:59:64:59:71 | password : Byte[] | HardcodedSymmetricEncryptionKey.cs:68:87:68:94 | access to parameter password | provenance |  Sink:MaD:1 |
-| HardcodedSymmetricEncryptionKey.cs:103:57:103:59 | key : Byte[] | HardcodedSymmetricEncryptionKey.cs:108:23:108:25 | access to parameter key | provenance |  Sink:MaD:3 |
-| HardcodedSymmetricEncryptionKey.cs:112:63:112:65 | key : Byte[] | HardcodedSymmetricEncryptionKey.cs:121:87:121:89 | access to parameter key | provenance |  Sink:MaD:2 |
+| HardcodedSymmetricEncryptionKey.cs:59:64:59:71 | password : Byte[] | HardcodedSymmetricEncryptionKey.cs:68:87:68:94 | access to parameter password | provenance | Sink:MaD:1 |
+| HardcodedSymmetricEncryptionKey.cs:103:57:103:59 | key : Byte[] | HardcodedSymmetricEncryptionKey.cs:108:23:108:25 | access to parameter key | provenance | Sink:MaD:3 |
+| HardcodedSymmetricEncryptionKey.cs:112:63:112:65 | key : Byte[] | HardcodedSymmetricEncryptionKey.cs:121:87:121:89 | access to parameter key | provenance | Sink:MaD:2 |
 models
 | 1 | Sink: System.Security.Cryptography; SymmetricAlgorithm; true; CreateDecryptor; (System.Byte[],System.Byte[]); ; Argument[0]; encryption-decryptor; manual |
 | 2 | Sink: System.Security.Cryptography; SymmetricAlgorithm; true; CreateEncryptor; (System.Byte[],System.Byte[]); ; Argument[0]; encryption-encryptor; manual |
diff --git a/csharp/ql/test/query-tests/Security Features/CWE-601/UrlRedirect/UrlRedirect.expected b/csharp/ql/test/query-tests/Security Features/CWE-601/UrlRedirect/UrlRedirect.expected
index 0aa72ccb64a..e7fced7fde3 100644
--- a/csharp/ql/test/query-tests/Security Features/CWE-601/UrlRedirect/UrlRedirect.expected	
+++ b/csharp/ql/test/query-tests/Security Features/CWE-601/UrlRedirect/UrlRedirect.expected	
@@ -19,24 +19,24 @@
 | UrlRedirectCore.cs:56:31:56:35 | access to parameter value | UrlRedirectCore.cs:45:51:45:55 | value : String | UrlRedirectCore.cs:56:31:56:35 | access to parameter value | Untrusted URL redirection due to $@. | UrlRedirectCore.cs:45:51:45:55 | value | user-provided value |
 edges
 | UrlRedirect2.cs:14:31:14:53 | access to property QueryString : NameValueCollection | UrlRedirect2.cs:14:31:14:61 | access to indexer | provenance |  |
-| UrlRedirect2.cs:14:31:14:53 | access to property QueryString : NameValueCollection | UrlRedirect2.cs:14:31:14:61 | access to indexer | provenance | MaD:5 |
+| UrlRedirect2.cs:14:31:14:53 | access to property QueryString : NameValueCollection | UrlRedirect2.cs:14:31:14:61 | access to indexer | provenance | MaD:1 |
 | UrlRedirect.cs:13:31:13:53 | access to property QueryString : NameValueCollection | UrlRedirect.cs:13:31:13:61 | access to indexer | provenance |  |
-| UrlRedirect.cs:13:31:13:53 | access to property QueryString : NameValueCollection | UrlRedirect.cs:13:31:13:61 | access to indexer | provenance | MaD:5 |
+| UrlRedirect.cs:13:31:13:53 | access to property QueryString : NameValueCollection | UrlRedirect.cs:13:31:13:61 | access to indexer | provenance | MaD:1 |
 | UrlRedirect.cs:23:16:23:18 | access to local variable url : String | UrlRedirect.cs:48:29:48:31 | access to local variable url | provenance |  |
 | UrlRedirect.cs:23:16:23:18 | access to local variable url : String | UrlRedirect.cs:64:31:64:52 | $"..." | provenance |  |
 | UrlRedirect.cs:23:16:23:18 | access to local variable url : String | UrlRedirect.cs:70:66:70:68 | access to local variable url : String | provenance |  |
 | UrlRedirect.cs:23:16:23:18 | access to local variable url : String | UrlRedirect.cs:76:69:76:71 | access to local variable url : String | provenance |  |
 | UrlRedirect.cs:23:16:23:18 | access to local variable url : String | UrlRedirect.cs:76:74:76:76 | access to local variable url : String | provenance |  |
 | UrlRedirect.cs:23:22:23:44 | access to property QueryString : NameValueCollection | UrlRedirect.cs:23:16:23:18 | access to local variable url : String | provenance |  |
-| UrlRedirect.cs:23:22:23:44 | access to property QueryString : NameValueCollection | UrlRedirect.cs:23:22:23:52 | access to indexer : String | provenance | MaD:5 |
+| UrlRedirect.cs:23:22:23:44 | access to property QueryString : NameValueCollection | UrlRedirect.cs:23:22:23:52 | access to indexer : String | provenance | MaD:1 |
 | UrlRedirect.cs:23:22:23:52 | access to indexer : String | UrlRedirect.cs:23:16:23:18 | access to local variable url : String | provenance |  |
 | UrlRedirect.cs:38:44:38:66 | access to property QueryString : NameValueCollection | UrlRedirect.cs:38:44:38:74 | access to indexer | provenance |  |
-| UrlRedirect.cs:38:44:38:66 | access to property QueryString : NameValueCollection | UrlRedirect.cs:38:44:38:74 | access to indexer | provenance | MaD:5 |
+| UrlRedirect.cs:38:44:38:66 | access to property QueryString : NameValueCollection | UrlRedirect.cs:38:44:38:74 | access to indexer | provenance | MaD:1 |
 | UrlRedirect.cs:39:47:39:69 | access to property QueryString : NameValueCollection | UrlRedirect.cs:39:47:39:77 | access to indexer | provenance |  |
-| UrlRedirect.cs:39:47:39:69 | access to property QueryString : NameValueCollection | UrlRedirect.cs:39:47:39:77 | access to indexer | provenance | MaD:5 |
-| UrlRedirect.cs:70:66:70:68 | access to local variable url : String | UrlRedirect.cs:70:31:70:69 | call to method Format | provenance | MaD:1 |
-| UrlRedirect.cs:76:69:76:71 | access to local variable url : String | UrlRedirect.cs:76:31:76:77 | call to method Format | provenance | MaD:2 |
-| UrlRedirect.cs:76:74:76:76 | access to local variable url : String | UrlRedirect.cs:76:31:76:77 | call to method Format | provenance | MaD:3 |
+| UrlRedirect.cs:39:47:39:69 | access to property QueryString : NameValueCollection | UrlRedirect.cs:39:47:39:77 | access to indexer | provenance | MaD:1 |
+| UrlRedirect.cs:70:66:70:68 | access to local variable url : String | UrlRedirect.cs:70:31:70:69 | call to method Format | provenance | MaD:2 |
+| UrlRedirect.cs:76:69:76:71 | access to local variable url : String | UrlRedirect.cs:76:31:76:77 | call to method Format | provenance | MaD:3 |
+| UrlRedirect.cs:76:74:76:76 | access to local variable url : String | UrlRedirect.cs:76:31:76:77 | call to method Format | provenance | MaD:4 |
 | UrlRedirectCore.cs:13:44:13:48 | value : String | UrlRedirectCore.cs:16:22:16:26 | access to parameter value | provenance |  |
 | UrlRedirectCore.cs:13:44:13:48 | value : String | UrlRedirectCore.cs:19:44:19:48 | call to operator implicit conversion | provenance |  |
 | UrlRedirectCore.cs:13:44:13:48 | value : String | UrlRedirectCore.cs:25:46:25:50 | call to operator implicit conversion | provenance |  |
@@ -47,13 +47,13 @@ edges
 | UrlRedirectCore.cs:45:51:45:55 | value : String | UrlRedirectCore.cs:48:28:48:32 | access to parameter value | provenance |  |
 | UrlRedirectCore.cs:45:51:45:55 | value : String | UrlRedirectCore.cs:53:40:53:44 | access to parameter value : String | provenance |  |
 | UrlRedirectCore.cs:45:51:45:55 | value : String | UrlRedirectCore.cs:56:31:56:35 | access to parameter value | provenance |  |
-| UrlRedirectCore.cs:53:40:53:44 | access to parameter value : String | UrlRedirectCore.cs:53:32:53:45 | object creation of type Uri | provenance | MaD:4 |
+| UrlRedirectCore.cs:53:40:53:44 | access to parameter value : String | UrlRedirectCore.cs:53:32:53:45 | object creation of type Uri | provenance | MaD:5 |
 models
-| 1 | Summary: System; String; false; Format; (System.String,System.Object); ; Argument[1]; ReturnValue; taint; manual |
-| 2 | Summary: System; String; false; Format; (System.String,System.Object,System.Object); ; Argument[1]; ReturnValue; taint; manual |
-| 3 | Summary: System; String; false; Format; (System.String,System.Object,System.Object); ; Argument[2]; ReturnValue; taint; manual |
-| 4 | Summary: System; Uri; false; Uri; (System.String); ; Argument[0]; Argument[this]; taint; manual |
-| 5 | Summary: System.Collections.Specialized; NameValueCollection; false; get_Item; (System.String); ; Argument[this]; ReturnValue; taint; df-generated |
+| 1 | Summary: System.Collections.Specialized; NameValueCollection; false; get_Item; (System.String); ; Argument[this]; ReturnValue; taint; df-generated |
+| 2 | Summary: System; String; false; Format; (System.String,System.Object); ; Argument[1]; ReturnValue; taint; manual |
+| 3 | Summary: System; String; false; Format; (System.String,System.Object,System.Object); ; Argument[1]; ReturnValue; taint; manual |
+| 4 | Summary: System; String; false; Format; (System.String,System.Object,System.Object); ; Argument[2]; ReturnValue; taint; manual |
+| 5 | Summary: System; Uri; false; Uri; (System.String); ; Argument[0]; Argument[this]; taint; manual |
 nodes
 | UrlRedirect2.cs:14:31:14:53 | access to property QueryString : NameValueCollection | semmle.label | access to property QueryString : NameValueCollection |
 | UrlRedirect2.cs:14:31:14:61 | access to indexer | semmle.label | access to indexer |
diff --git a/csharp/ql/test/query-tests/Security Features/CWE-611/UntrustedDataInsecureXml.expected b/csharp/ql/test/query-tests/Security Features/CWE-611/UntrustedDataInsecureXml.expected
index 266b33174a8..22a96ba9dbe 100644
--- a/csharp/ql/test/query-tests/Security Features/CWE-611/UntrustedDataInsecureXml.expected	
+++ b/csharp/ql/test/query-tests/Security Features/CWE-611/UntrustedDataInsecureXml.expected	
@@ -1,9 +1,11 @@
+#select
+| Test.cs:11:50:11:84 | access to indexer | Test.cs:11:50:11:72 | access to property QueryString : NameValueCollection | Test.cs:11:50:11:84 | access to indexer | This insecure XML processing depends on a $@ (DTD processing is enabled with an insecure resolver). | Test.cs:11:50:11:72 | access to property QueryString | user-provided value |
 edges
 | Test.cs:11:50:11:72 | access to property QueryString : NameValueCollection | Test.cs:11:50:11:84 | access to indexer | provenance |  |
-| Test.cs:11:50:11:72 | access to property QueryString : NameValueCollection | Test.cs:11:50:11:84 | access to indexer | provenance | MaD:11555 |
+| Test.cs:11:50:11:72 | access to property QueryString : NameValueCollection | Test.cs:11:50:11:84 | access to indexer | provenance | MaD:1 |
+models
+| 1 | Summary: System.Collections.Specialized; NameValueCollection; false; get_Item; (System.String); ; Argument[this]; ReturnValue; taint; df-generated |
 nodes
 | Test.cs:11:50:11:72 | access to property QueryString : NameValueCollection | semmle.label | access to property QueryString : NameValueCollection |
 | Test.cs:11:50:11:84 | access to indexer | semmle.label | access to indexer |
 subpaths
-#select
-| Test.cs:11:50:11:84 | access to indexer | Test.cs:11:50:11:72 | access to property QueryString : NameValueCollection | Test.cs:11:50:11:84 | access to indexer | This insecure XML processing depends on a $@ (DTD processing is enabled with an insecure resolver). | Test.cs:11:50:11:72 | access to property QueryString | user-provided value |
diff --git a/csharp/ql/test/query-tests/Security Features/CWE-611/UntrustedDataInsecureXml.qlref b/csharp/ql/test/query-tests/Security Features/CWE-611/UntrustedDataInsecureXml.qlref
index 301fcf7ad85..967c6ca922e 100644
--- a/csharp/ql/test/query-tests/Security Features/CWE-611/UntrustedDataInsecureXml.qlref	
+++ b/csharp/ql/test/query-tests/Security Features/CWE-611/UntrustedDataInsecureXml.qlref	
@@ -1 +1,2 @@
-Security Features/CWE-611/UntrustedDataInsecureXml.ql
+query: Security Features/CWE-611/UntrustedDataInsecureXml.ql
+postprocess: TestUtilities/PrettyPrintModels.ql
diff --git a/csharp/ql/test/query-tests/Security Features/CWE-643/XPathInjection.expected b/csharp/ql/test/query-tests/Security Features/CWE-643/XPathInjection.expected
index cbfabcb7880..6e302ea05c8 100644
--- a/csharp/ql/test/query-tests/Security Features/CWE-643/XPathInjection.expected	
+++ b/csharp/ql/test/query-tests/Security Features/CWE-643/XPathInjection.expected	
@@ -18,11 +18,11 @@
 edges
 | XPathInjection.cs:11:16:11:23 | access to local variable userName : String | XPathInjection.cs:14:13:14:13 | access to local variable s : String | provenance |  |
 | XPathInjection.cs:11:27:11:49 | access to property QueryString : NameValueCollection | XPathInjection.cs:11:16:11:23 | access to local variable userName : String | provenance |  |
-| XPathInjection.cs:11:27:11:49 | access to property QueryString : NameValueCollection | XPathInjection.cs:11:27:11:61 | access to indexer : String | provenance | MaD:2 |
+| XPathInjection.cs:11:27:11:49 | access to property QueryString : NameValueCollection | XPathInjection.cs:11:27:11:61 | access to indexer : String | provenance | MaD:1 |
 | XPathInjection.cs:11:27:11:61 | access to indexer : String | XPathInjection.cs:11:16:11:23 | access to local variable userName : String | provenance |  |
 | XPathInjection.cs:12:16:12:23 | access to local variable password : String | XPathInjection.cs:14:13:14:13 | access to local variable s : String | provenance |  |
 | XPathInjection.cs:12:27:12:49 | access to property QueryString : NameValueCollection | XPathInjection.cs:12:16:12:23 | access to local variable password : String | provenance |  |
-| XPathInjection.cs:12:27:12:49 | access to property QueryString : NameValueCollection | XPathInjection.cs:12:27:12:61 | access to indexer : String | provenance | MaD:2 |
+| XPathInjection.cs:12:27:12:49 | access to property QueryString : NameValueCollection | XPathInjection.cs:12:27:12:61 | access to indexer : String | provenance | MaD:1 |
 | XPathInjection.cs:12:27:12:61 | access to indexer : String | XPathInjection.cs:12:16:12:23 | access to local variable password : String | provenance |  |
 | XPathInjection.cs:14:13:14:13 | access to local variable s : String | XPathInjection.cs:17:33:17:33 | access to local variable s | provenance |  |
 | XPathInjection.cs:14:13:14:13 | access to local variable s : String | XPathInjection.cs:20:29:20:29 | access to local variable s | provenance |  |
@@ -36,15 +36,15 @@ edges
 | XPathInjection.cs:74:44:74:74 | call to method ExecuteReader : SqlDataReader | XPathInjection.cs:74:27:74:40 | access to local variable customerReader : SqlDataReader | provenance |  |
 | XPathInjection.cs:78:24:78:31 | access to local variable userName : String | XPathInjection.cs:81:41:81:144 | ... + ... | provenance |  |
 | XPathInjection.cs:78:24:78:31 | access to local variable userName : String | XPathInjection.cs:84:37:84:140 | ... + ... | provenance |  |
-| XPathInjection.cs:78:35:78:48 | access to local variable customerReader : SqlDataReader | XPathInjection.cs:78:35:78:61 | call to method GetString : String | provenance | MaD:1 |
+| XPathInjection.cs:78:35:78:48 | access to local variable customerReader : SqlDataReader | XPathInjection.cs:78:35:78:61 | call to method GetString : String | provenance | MaD:2 |
 | XPathInjection.cs:78:35:78:61 | call to method GetString : String | XPathInjection.cs:78:24:78:31 | access to local variable userName : String | provenance |  |
 | XPathInjection.cs:79:24:79:31 | access to local variable password : String | XPathInjection.cs:81:41:81:144 | ... + ... | provenance |  |
 | XPathInjection.cs:79:24:79:31 | access to local variable password : String | XPathInjection.cs:84:37:84:140 | ... + ... | provenance |  |
-| XPathInjection.cs:79:35:79:48 | access to local variable customerReader : SqlDataReader | XPathInjection.cs:79:35:79:61 | call to method GetString : String | provenance | MaD:1 |
+| XPathInjection.cs:79:35:79:48 | access to local variable customerReader : SqlDataReader | XPathInjection.cs:79:35:79:61 | call to method GetString : String | provenance | MaD:2 |
 | XPathInjection.cs:79:35:79:61 | call to method GetString : String | XPathInjection.cs:79:24:79:31 | access to local variable password : String | provenance |  |
 models
-| 1 | Summary: System.Data; IDataRecord; true; GetString; (System.Int32); ; Argument[this]; ReturnValue; taint; manual |
-| 2 | Summary: System.Collections.Specialized; NameValueCollection; false; get_Item; (System.String); ; Argument[this]; ReturnValue; taint; df-generated |
+| 1 | Summary: System.Collections.Specialized; NameValueCollection; false; get_Item; (System.String); ; Argument[this]; ReturnValue; taint; df-generated |
+| 2 | Summary: System.Data; IDataRecord; true; GetString; (System.Int32); ; Argument[this]; ReturnValue; taint; manual |
 nodes
 | XPathInjection.cs:11:16:11:23 | access to local variable userName : String | semmle.label | access to local variable userName : String |
 | XPathInjection.cs:11:27:11:49 | access to property QueryString : NameValueCollection | semmle.label | access to property QueryString : NameValueCollection |
diff --git a/csharp/ql/test/query-tests/Security Features/CWE-807/ConditionalBypass.expected b/csharp/ql/test/query-tests/Security Features/CWE-807/ConditionalBypass.expected
index c18fc63ff28..6890fb686a0 100644
--- a/csharp/ql/test/query-tests/Security Features/CWE-807/ConditionalBypass.expected	
+++ b/csharp/ql/test/query-tests/Security Features/CWE-807/ConditionalBypass.expected	
@@ -1,33 +1,42 @@
-models
-| 1 | Summary: System.Net; IPHostEntry; false; get_HostName; (); ; Argument[this]; ReturnValue; taint; manual |
-| 2 | Summary: System.Web; HttpCookie; false; get_Value; (); ; Argument[this]; ReturnValue; taint; manual |
-| 3 | Summary: System.Collections.Specialized; NameValueCollection; false; get_Item; (System.String); ; Argument[this]; ReturnValue; taint; df-generated |
+#select
+| ConditionalBypass.cs:16:13:16:30 | ... == ... | ConditionalBypass.cs:12:26:12:48 | access to property QueryString : NameValueCollection | ConditionalBypass.cs:16:13:16:30 | ... == ... | This condition guards a sensitive $@, but a $@ controls it. | ConditionalBypass.cs:17:13:17:33 | call to method login | action | ConditionalBypass.cs:12:26:12:48 | access to property QueryString | user-provided value |
+| ConditionalBypass.cs:22:13:22:45 | call to method Equals | ConditionalBypass.cs:19:34:19:52 | access to property Cookies : HttpCookieCollection | ConditionalBypass.cs:22:13:22:45 | call to method Equals | This condition guards a sensitive $@, but a $@ controls it. | ConditionalBypass.cs:23:13:23:33 | call to method login | action | ConditionalBypass.cs:19:34:19:52 | access to property Cookies | user-provided value |
+| ConditionalBypass.cs:27:13:27:40 | ... == ... | ConditionalBypass.cs:19:34:19:52 | access to property Cookies : HttpCookieCollection | ConditionalBypass.cs:27:13:27:40 | ... == ... | This condition guards a sensitive $@, but a $@ controls it. | ConditionalBypass.cs:29:13:29:33 | call to method login | action | ConditionalBypass.cs:19:34:19:52 | access to property Cookies | user-provided value |
+| ConditionalBypass.cs:27:13:27:40 | ... == ... | ConditionalBypass.cs:19:34:19:52 | access to property Cookies : HttpCookieCollection | ConditionalBypass.cs:27:13:27:40 | ... == ... | This condition guards a sensitive $@, but a $@ controls it. | ConditionalBypass.cs:33:13:33:39 | call to method reCheckAuth | action | ConditionalBypass.cs:19:34:19:52 | access to property Cookies | user-provided value |
+| ConditionalBypass.cs:44:13:44:46 | ... == ... | ConditionalBypass.cs:42:32:42:66 | call to method GetHostByAddress : IPHostEntry | ConditionalBypass.cs:44:13:44:46 | ... == ... | This condition guards a sensitive $@, but a $@ controls it. | ConditionalBypass.cs:46:13:46:33 | call to method login | action | ConditionalBypass.cs:42:32:42:66 | call to method GetHostByAddress | user-provided value |
+| ConditionalBypass.cs:49:13:49:29 | access to property HostName | ConditionalBypass.cs:42:32:42:66 | call to method GetHostByAddress : IPHostEntry | ConditionalBypass.cs:49:13:49:29 | access to property HostName | This condition guards a sensitive $@, but a $@ controls it. | ConditionalBypass.cs:51:13:51:33 | call to method login | action | ConditionalBypass.cs:42:32:42:66 | call to method GetHostByAddress | user-provided value |
+| ConditionalBypass.cs:72:13:72:40 | ... == ... | ConditionalBypass.cs:70:34:70:52 | access to property Cookies : HttpCookieCollection | ConditionalBypass.cs:72:13:72:40 | ... == ... | This condition guards a sensitive $@, but a $@ controls it. | ConditionalBypass.cs:73:13:73:33 | call to method login | action | ConditionalBypass.cs:70:34:70:52 | access to property Cookies | user-provided value |
+| ConditionalBypass.cs:84:13:84:40 | ... == ... | ConditionalBypass.cs:83:34:83:52 | access to property Cookies : HttpCookieCollection | ConditionalBypass.cs:84:13:84:40 | ... == ... | This condition guards a sensitive $@, but a $@ controls it. | ConditionalBypass.cs:85:13:85:33 | call to method login | action | ConditionalBypass.cs:83:34:83:52 | access to property Cookies | user-provided value |
 edges
 | ConditionalBypass.cs:12:16:12:22 | access to local variable isAdmin : String | ConditionalBypass.cs:16:13:16:30 | ... == ... | provenance |  |
 | ConditionalBypass.cs:12:26:12:48 | access to property QueryString : NameValueCollection | ConditionalBypass.cs:12:16:12:22 | access to local variable isAdmin : String | provenance |  |
-| ConditionalBypass.cs:12:26:12:48 | access to property QueryString : NameValueCollection | ConditionalBypass.cs:12:26:12:59 | access to indexer : String | provenance | MaD:3 |
+| ConditionalBypass.cs:12:26:12:48 | access to property QueryString : NameValueCollection | ConditionalBypass.cs:12:26:12:59 | access to indexer : String | provenance | MaD:1 |
 | ConditionalBypass.cs:12:26:12:59 | access to indexer : String | ConditionalBypass.cs:12:16:12:22 | access to local variable isAdmin : String | provenance |  |
 | ConditionalBypass.cs:19:20:19:30 | access to local variable adminCookie : HttpCookie | ConditionalBypass.cs:22:13:22:23 | access to local variable adminCookie : HttpCookie | provenance |  |
 | ConditionalBypass.cs:19:20:19:30 | access to local variable adminCookie : HttpCookie | ConditionalBypass.cs:27:13:27:23 | access to local variable adminCookie : HttpCookie | provenance |  |
 | ConditionalBypass.cs:19:34:19:52 | access to property Cookies : HttpCookieCollection | ConditionalBypass.cs:19:20:19:30 | access to local variable adminCookie : HttpCookie | provenance |  |
-| ConditionalBypass.cs:22:13:22:23 | access to local variable adminCookie : HttpCookie | ConditionalBypass.cs:22:13:22:29 | access to property Value : String | provenance | MaD:2 |
+| ConditionalBypass.cs:22:13:22:23 | access to local variable adminCookie : HttpCookie | ConditionalBypass.cs:22:13:22:29 | access to property Value : String | provenance | MaD:3 |
 | ConditionalBypass.cs:22:13:22:29 | access to property Value : String | ConditionalBypass.cs:22:13:22:45 | call to method Equals | provenance |  |
-| ConditionalBypass.cs:27:13:27:23 | access to local variable adminCookie : HttpCookie | ConditionalBypass.cs:27:13:27:29 | access to property Value : String | provenance | MaD:2 |
+| ConditionalBypass.cs:27:13:27:23 | access to local variable adminCookie : HttpCookie | ConditionalBypass.cs:27:13:27:29 | access to property Value : String | provenance | MaD:3 |
 | ConditionalBypass.cs:27:13:27:29 | access to property Value : String | ConditionalBypass.cs:27:13:27:40 | ... == ... | provenance |  |
 | ConditionalBypass.cs:42:21:42:28 | access to local variable hostInfo : IPHostEntry | ConditionalBypass.cs:44:13:44:20 | access to local variable hostInfo : IPHostEntry | provenance |  |
 | ConditionalBypass.cs:42:21:42:28 | access to local variable hostInfo : IPHostEntry | ConditionalBypass.cs:49:13:49:20 | access to local variable hostInfo : IPHostEntry | provenance |  |
 | ConditionalBypass.cs:42:32:42:66 | call to method GetHostByAddress : IPHostEntry | ConditionalBypass.cs:42:21:42:28 | access to local variable hostInfo : IPHostEntry | provenance |  |
-| ConditionalBypass.cs:44:13:44:20 | access to local variable hostInfo : IPHostEntry | ConditionalBypass.cs:44:13:44:29 | access to property HostName : String | provenance | MaD:1 |
+| ConditionalBypass.cs:44:13:44:20 | access to local variable hostInfo : IPHostEntry | ConditionalBypass.cs:44:13:44:29 | access to property HostName : String | provenance | MaD:2 |
 | ConditionalBypass.cs:44:13:44:29 | access to property HostName : String | ConditionalBypass.cs:44:13:44:46 | ... == ... | provenance |  |
-| ConditionalBypass.cs:49:13:49:20 | access to local variable hostInfo : IPHostEntry | ConditionalBypass.cs:49:13:49:29 | access to property HostName | provenance | MaD:1 |
+| ConditionalBypass.cs:49:13:49:20 | access to local variable hostInfo : IPHostEntry | ConditionalBypass.cs:49:13:49:29 | access to property HostName | provenance | MaD:2 |
 | ConditionalBypass.cs:70:20:70:30 | access to local variable adminCookie : HttpCookie | ConditionalBypass.cs:72:13:72:23 | access to local variable adminCookie : HttpCookie | provenance |  |
 | ConditionalBypass.cs:70:34:70:52 | access to property Cookies : HttpCookieCollection | ConditionalBypass.cs:70:20:70:30 | access to local variable adminCookie : HttpCookie | provenance |  |
-| ConditionalBypass.cs:72:13:72:23 | access to local variable adminCookie : HttpCookie | ConditionalBypass.cs:72:13:72:29 | access to property Value : String | provenance | MaD:2 |
+| ConditionalBypass.cs:72:13:72:23 | access to local variable adminCookie : HttpCookie | ConditionalBypass.cs:72:13:72:29 | access to property Value : String | provenance | MaD:3 |
 | ConditionalBypass.cs:72:13:72:29 | access to property Value : String | ConditionalBypass.cs:72:13:72:40 | ... == ... | provenance |  |
 | ConditionalBypass.cs:83:20:83:30 | access to local variable adminCookie : HttpCookie | ConditionalBypass.cs:84:13:84:23 | access to local variable adminCookie : HttpCookie | provenance |  |
 | ConditionalBypass.cs:83:34:83:52 | access to property Cookies : HttpCookieCollection | ConditionalBypass.cs:83:20:83:30 | access to local variable adminCookie : HttpCookie | provenance |  |
-| ConditionalBypass.cs:84:13:84:23 | access to local variable adminCookie : HttpCookie | ConditionalBypass.cs:84:13:84:29 | access to property Value : String | provenance | MaD:2 |
+| ConditionalBypass.cs:84:13:84:23 | access to local variable adminCookie : HttpCookie | ConditionalBypass.cs:84:13:84:29 | access to property Value : String | provenance | MaD:3 |
 | ConditionalBypass.cs:84:13:84:29 | access to property Value : String | ConditionalBypass.cs:84:13:84:40 | ... == ... | provenance |  |
+models
+| 1 | Summary: System.Collections.Specialized; NameValueCollection; false; get_Item; (System.String); ; Argument[this]; ReturnValue; taint; df-generated |
+| 2 | Summary: System.Net; IPHostEntry; false; get_HostName; (); ; Argument[this]; ReturnValue; taint; manual |
+| 3 | Summary: System.Web; HttpCookie; false; get_Value; (); ; Argument[this]; ReturnValue; taint; manual |
 nodes
 | ConditionalBypass.cs:12:16:12:22 | access to local variable isAdmin : String | semmle.label | access to local variable isAdmin : String |
 | ConditionalBypass.cs:12:26:12:48 | access to property QueryString : NameValueCollection | semmle.label | access to property QueryString : NameValueCollection |
@@ -59,12 +68,3 @@ nodes
 | ConditionalBypass.cs:84:13:84:29 | access to property Value : String | semmle.label | access to property Value : String |
 | ConditionalBypass.cs:84:13:84:40 | ... == ... | semmle.label | ... == ... |
 subpaths
-#select
-| ConditionalBypass.cs:16:13:16:30 | ... == ... | ConditionalBypass.cs:12:26:12:48 | access to property QueryString : NameValueCollection | ConditionalBypass.cs:16:13:16:30 | ... == ... | This condition guards a sensitive $@, but a $@ controls it. | ConditionalBypass.cs:17:13:17:33 | call to method login | action | ConditionalBypass.cs:12:26:12:48 | access to property QueryString | user-provided value |
-| ConditionalBypass.cs:22:13:22:45 | call to method Equals | ConditionalBypass.cs:19:34:19:52 | access to property Cookies : HttpCookieCollection | ConditionalBypass.cs:22:13:22:45 | call to method Equals | This condition guards a sensitive $@, but a $@ controls it. | ConditionalBypass.cs:23:13:23:33 | call to method login | action | ConditionalBypass.cs:19:34:19:52 | access to property Cookies | user-provided value |
-| ConditionalBypass.cs:27:13:27:40 | ... == ... | ConditionalBypass.cs:19:34:19:52 | access to property Cookies : HttpCookieCollection | ConditionalBypass.cs:27:13:27:40 | ... == ... | This condition guards a sensitive $@, but a $@ controls it. | ConditionalBypass.cs:29:13:29:33 | call to method login | action | ConditionalBypass.cs:19:34:19:52 | access to property Cookies | user-provided value |
-| ConditionalBypass.cs:27:13:27:40 | ... == ... | ConditionalBypass.cs:19:34:19:52 | access to property Cookies : HttpCookieCollection | ConditionalBypass.cs:27:13:27:40 | ... == ... | This condition guards a sensitive $@, but a $@ controls it. | ConditionalBypass.cs:33:13:33:39 | call to method reCheckAuth | action | ConditionalBypass.cs:19:34:19:52 | access to property Cookies | user-provided value |
-| ConditionalBypass.cs:44:13:44:46 | ... == ... | ConditionalBypass.cs:42:32:42:66 | call to method GetHostByAddress : IPHostEntry | ConditionalBypass.cs:44:13:44:46 | ... == ... | This condition guards a sensitive $@, but a $@ controls it. | ConditionalBypass.cs:46:13:46:33 | call to method login | action | ConditionalBypass.cs:42:32:42:66 | call to method GetHostByAddress | user-provided value |
-| ConditionalBypass.cs:49:13:49:29 | access to property HostName | ConditionalBypass.cs:42:32:42:66 | call to method GetHostByAddress : IPHostEntry | ConditionalBypass.cs:49:13:49:29 | access to property HostName | This condition guards a sensitive $@, but a $@ controls it. | ConditionalBypass.cs:51:13:51:33 | call to method login | action | ConditionalBypass.cs:42:32:42:66 | call to method GetHostByAddress | user-provided value |
-| ConditionalBypass.cs:72:13:72:40 | ... == ... | ConditionalBypass.cs:70:34:70:52 | access to property Cookies : HttpCookieCollection | ConditionalBypass.cs:72:13:72:40 | ... == ... | This condition guards a sensitive $@, but a $@ controls it. | ConditionalBypass.cs:73:13:73:33 | call to method login | action | ConditionalBypass.cs:70:34:70:52 | access to property Cookies | user-provided value |
-| ConditionalBypass.cs:84:13:84:40 | ... == ... | ConditionalBypass.cs:83:34:83:52 | access to property Cookies : HttpCookieCollection | ConditionalBypass.cs:84:13:84:40 | ... == ... | This condition guards a sensitive $@, but a $@ controls it. | ConditionalBypass.cs:85:13:85:33 | call to method login | action | ConditionalBypass.cs:83:34:83:52 | access to property Cookies | user-provided value |
diff --git a/csharp/ql/test/query-tests/Security Features/CWE-838/InappropriateEncoding.expected b/csharp/ql/test/query-tests/Security Features/CWE-838/InappropriateEncoding.expected
index 65d2173beee..391c513ed0f 100644
--- a/csharp/ql/test/query-tests/Security Features/CWE-838/InappropriateEncoding.expected	
+++ b/csharp/ql/test/query-tests/Security Features/CWE-838/InappropriateEncoding.expected	
@@ -12,10 +12,10 @@
 | SqlEncode.cs:15:46:15:50 | access to local variable query | SqlEncode.cs:14:62:14:87 | call to method Replace : String | SqlEncode.cs:15:46:15:50 | access to local variable query | This SQL expression may include data from a $@. | SqlEncode.cs:14:62:14:87 | call to method Replace | possibly inappropriately encoded value |
 | UrlEncode.cs:10:31:10:69 | ... + ... | UrlEncode.cs:10:43:10:69 | call to method HtmlEncode : String | UrlEncode.cs:10:31:10:69 | ... + ... | This URL expression may include data from a $@. | UrlEncode.cs:10:43:10:69 | call to method HtmlEncode | possibly inappropriately encoded value |
 edges
-| HtmlEncode.cs:10:40:10:65 | call to method UrlEncode : String | HtmlEncode.cs:10:28:10:65 | ... + ... | provenance |  Sink:MaD:2 |
+| HtmlEncode.cs:10:40:10:65 | call to method UrlEncode : String | HtmlEncode.cs:10:28:10:65 | ... + ... | provenance | Sink:MaD:2 |
 | InappropriateEncoding.cs:13:13:13:24 | access to local variable encodedValue : String | InappropriateEncoding.cs:16:17:16:22 | access to local variable query1 : String | provenance |  |
 | InappropriateEncoding.cs:13:28:13:40 | call to method Encode : String | InappropriateEncoding.cs:13:13:13:24 | access to local variable encodedValue : String | provenance |  |
-| InappropriateEncoding.cs:16:17:16:22 | access to local variable query1 : String | InappropriateEncoding.cs:18:46:18:51 | access to local variable query1 | provenance |  Sink:MaD:1 |
+| InappropriateEncoding.cs:16:17:16:22 | access to local variable query1 : String | InappropriateEncoding.cs:18:46:18:51 | access to local variable query1 | provenance | Sink:MaD:1 |
 | InappropriateEncoding.cs:34:13:34:24 | access to local variable encodedValue : String | InappropriateEncoding.cs:35:32:35:43 | access to local variable encodedValue | provenance |  |
 | InappropriateEncoding.cs:34:13:34:24 | access to local variable encodedValue : String | InappropriateEncoding.cs:36:22:36:59 | ... + ... | provenance |  |
 | InappropriateEncoding.cs:34:13:34:24 | access to local variable encodedValue : String | InappropriateEncoding.cs:37:59:37:70 | access to local variable encodedValue : String | provenance |  |
@@ -24,7 +24,7 @@ edges
 | InappropriateEncoding.cs:55:13:55:24 | access to local variable encodedValue : String | InappropriateEncoding.cs:56:31:56:42 | access to local variable encodedValue | provenance |  |
 | InappropriateEncoding.cs:55:28:55:56 | call to method HtmlEncode : String | InappropriateEncoding.cs:55:13:55:24 | access to local variable encodedValue : String | provenance |  |
 | InappropriateEncoding.cs:66:16:66:42 | call to method Replace : String | InappropriateEncoding.cs:13:28:13:40 | call to method Encode : String | provenance |  |
-| SqlEncode.cs:14:17:14:21 | access to local variable query : String | SqlEncode.cs:15:46:15:50 | access to local variable query | provenance |  Sink:MaD:1 |
+| SqlEncode.cs:14:17:14:21 | access to local variable query : String | SqlEncode.cs:15:46:15:50 | access to local variable query | provenance | Sink:MaD:1 |
 | SqlEncode.cs:14:62:14:87 | call to method Replace : String | SqlEncode.cs:14:17:14:21 | access to local variable query : String | provenance |  |
 | UrlEncode.cs:10:43:10:69 | call to method HtmlEncode : String | UrlEncode.cs:10:31:10:69 | ... + ... | provenance |  |
 models
diff --git a/csharp/ql/test/query-tests/Useless Code/UnusedLabel/UnusedLabel.cs b/csharp/ql/test/query-tests/Useless Code/UnusedLabel/UnusedLabel.cs
index 15f36fde150..96e3dde2c3a 100644
--- a/csharp/ql/test/query-tests/Useless Code/UnusedLabel/UnusedLabel.cs	
+++ b/csharp/ql/test/query-tests/Useless Code/UnusedLabel/UnusedLabel.cs	
@@ -3,13 +3,13 @@ class UnusedLabelTest
     void F1()
     {
         goto a;
-        a:  // GOOD
+    a:  // GOOD
         ;
     }
 
     void F2()
     {
-        a:  // BAD
+    a:  // $ Alert
         ;
     }
 }
diff --git a/csharp/ql/test/query-tests/Useless Code/UnusedLabel/UnusedLabel.expected b/csharp/ql/test/query-tests/Useless Code/UnusedLabel/UnusedLabel.expected
index d203e9837c8..5cab2be7ccb 100644
--- a/csharp/ql/test/query-tests/Useless Code/UnusedLabel/UnusedLabel.expected	
+++ b/csharp/ql/test/query-tests/Useless Code/UnusedLabel/UnusedLabel.expected	
@@ -1 +1 @@
-| UnusedLabel.cs:12:9:12:9 | a: | This label is not used. |
+| UnusedLabel.cs:12:5:12:5 | a: | This label is not used. |
diff --git a/csharp/ql/test/query-tests/Useless Code/UnusedLabel/UnusedLabel.qlref b/csharp/ql/test/query-tests/Useless Code/UnusedLabel/UnusedLabel.qlref
index 45ab96cef50..bbf7012c6ee 100644
--- a/csharp/ql/test/query-tests/Useless Code/UnusedLabel/UnusedLabel.qlref	
+++ b/csharp/ql/test/query-tests/Useless Code/UnusedLabel/UnusedLabel.qlref	
@@ -1 +1,2 @@
-Useless code/UnusedLabel.ql
\ No newline at end of file
+query: Useless code/UnusedLabel.ql
+postprocess: TestUtilities/InlineExpectationsTestQuery.ql
\ No newline at end of file
diff --git a/csharp/ql/test/resources/stubs/Amazon.Lambda.APIGatewayEvents/2.7.0/Amazon.Lambda.APIGatewayEvents.csproj b/csharp/ql/test/resources/stubs/Amazon.Lambda.APIGatewayEvents/2.7.0/Amazon.Lambda.APIGatewayEvents.csproj
index 61622bc5296..c7646fbae20 100644
--- a/csharp/ql/test/resources/stubs/Amazon.Lambda.APIGatewayEvents/2.7.0/Amazon.Lambda.APIGatewayEvents.csproj
+++ b/csharp/ql/test/resources/stubs/Amazon.Lambda.APIGatewayEvents/2.7.0/Amazon.Lambda.APIGatewayEvents.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <OutputPath>bin\</OutputPath>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
diff --git a/csharp/ql/test/resources/stubs/Amazon.Lambda.Core/2.2.0/Amazon.Lambda.Core.csproj b/csharp/ql/test/resources/stubs/Amazon.Lambda.Core/2.2.0/Amazon.Lambda.Core.csproj
index 61622bc5296..c7646fbae20 100644
--- a/csharp/ql/test/resources/stubs/Amazon.Lambda.Core/2.2.0/Amazon.Lambda.Core.csproj
+++ b/csharp/ql/test/resources/stubs/Amazon.Lambda.Core/2.2.0/Amazon.Lambda.Core.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <OutputPath>bin\</OutputPath>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
diff --git a/csharp/ql/test/resources/stubs/Antlr3.Runtime/3.5.1/Antlr3.Runtime.csproj b/csharp/ql/test/resources/stubs/Antlr3.Runtime/3.5.1/Antlr3.Runtime.csproj
index bb22225f8f5..38998301525 100644
--- a/csharp/ql/test/resources/stubs/Antlr3.Runtime/3.5.1/Antlr3.Runtime.csproj
+++ b/csharp/ql/test/resources/stubs/Antlr3.Runtime/3.5.1/Antlr3.Runtime.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <OutputPath>bin\</OutputPath>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
diff --git a/csharp/ql/test/resources/stubs/Dapper/2.1.24/Dapper.csproj b/csharp/ql/test/resources/stubs/Dapper/2.1.24/Dapper.csproj
index 61622bc5296..c7646fbae20 100644
--- a/csharp/ql/test/resources/stubs/Dapper/2.1.24/Dapper.csproj
+++ b/csharp/ql/test/resources/stubs/Dapper/2.1.24/Dapper.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <OutputPath>bin\</OutputPath>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
diff --git a/csharp/ql/test/resources/stubs/EntityFramework/6.4.4/EntityFramework.csproj b/csharp/ql/test/resources/stubs/EntityFramework/6.4.4/EntityFramework.csproj
index 359b400bb10..9666926fafd 100644
--- a/csharp/ql/test/resources/stubs/EntityFramework/6.4.4/EntityFramework.csproj
+++ b/csharp/ql/test/resources/stubs/EntityFramework/6.4.4/EntityFramework.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <OutputPath>bin\</OutputPath>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
diff --git a/csharp/ql/test/resources/stubs/Iesi.Collections/4.0.4/Iesi.Collections.csproj b/csharp/ql/test/resources/stubs/Iesi.Collections/4.0.4/Iesi.Collections.csproj
index a1c8b50b3eb..eedd49158a1 100644
--- a/csharp/ql/test/resources/stubs/Iesi.Collections/4.0.4/Iesi.Collections.csproj
+++ b/csharp/ql/test/resources/stubs/Iesi.Collections/4.0.4/Iesi.Collections.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <OutputPath>bin\</OutputPath>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
diff --git a/csharp/ql/test/resources/stubs/Microsoft.CSharp/4.7.0/Microsoft.CSharp.csproj b/csharp/ql/test/resources/stubs/Microsoft.CSharp/4.7.0/Microsoft.CSharp.csproj
index 61622bc5296..c7646fbae20 100644
--- a/csharp/ql/test/resources/stubs/Microsoft.CSharp/4.7.0/Microsoft.CSharp.csproj
+++ b/csharp/ql/test/resources/stubs/Microsoft.CSharp/4.7.0/Microsoft.CSharp.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <OutputPath>bin\</OutputPath>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
diff --git a/csharp/ql/test/resources/stubs/Microsoft.Extensions.DependencyInjection.Abstractions/6.0.0/Microsoft.Extensions.DependencyInjection.Abstractions.csproj b/csharp/ql/test/resources/stubs/Microsoft.Extensions.DependencyInjection.Abstractions/6.0.0/Microsoft.Extensions.DependencyInjection.Abstractions.csproj
index 61622bc5296..c7646fbae20 100644
--- a/csharp/ql/test/resources/stubs/Microsoft.Extensions.DependencyInjection.Abstractions/6.0.0/Microsoft.Extensions.DependencyInjection.Abstractions.csproj
+++ b/csharp/ql/test/resources/stubs/Microsoft.Extensions.DependencyInjection.Abstractions/6.0.0/Microsoft.Extensions.DependencyInjection.Abstractions.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <OutputPath>bin\</OutputPath>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
diff --git a/csharp/ql/test/resources/stubs/Microsoft.Extensions.DependencyInjection/6.0.0/Microsoft.Extensions.DependencyInjection.csproj b/csharp/ql/test/resources/stubs/Microsoft.Extensions.DependencyInjection/6.0.0/Microsoft.Extensions.DependencyInjection.csproj
index e5c735afcc1..44f64ecc433 100644
--- a/csharp/ql/test/resources/stubs/Microsoft.Extensions.DependencyInjection/6.0.0/Microsoft.Extensions.DependencyInjection.csproj
+++ b/csharp/ql/test/resources/stubs/Microsoft.Extensions.DependencyInjection/6.0.0/Microsoft.Extensions.DependencyInjection.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <OutputPath>bin\</OutputPath>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
diff --git a/csharp/ql/test/resources/stubs/Microsoft.Extensions.Http/6.0.0/Microsoft.Extensions.Http.csproj b/csharp/ql/test/resources/stubs/Microsoft.Extensions.Http/6.0.0/Microsoft.Extensions.Http.csproj
index e09b1f57def..5f64ad1ae51 100644
--- a/csharp/ql/test/resources/stubs/Microsoft.Extensions.Http/6.0.0/Microsoft.Extensions.Http.csproj
+++ b/csharp/ql/test/resources/stubs/Microsoft.Extensions.Http/6.0.0/Microsoft.Extensions.Http.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <OutputPath>bin\</OutputPath>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
diff --git a/csharp/ql/test/resources/stubs/Microsoft.Extensions.Logging.Abstractions/6.0.0/Microsoft.Extensions.Logging.Abstractions.csproj b/csharp/ql/test/resources/stubs/Microsoft.Extensions.Logging.Abstractions/6.0.0/Microsoft.Extensions.Logging.Abstractions.csproj
index 61622bc5296..c7646fbae20 100644
--- a/csharp/ql/test/resources/stubs/Microsoft.Extensions.Logging.Abstractions/6.0.0/Microsoft.Extensions.Logging.Abstractions.csproj
+++ b/csharp/ql/test/resources/stubs/Microsoft.Extensions.Logging.Abstractions/6.0.0/Microsoft.Extensions.Logging.Abstractions.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <OutputPath>bin\</OutputPath>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
diff --git a/csharp/ql/test/resources/stubs/Microsoft.Extensions.Logging/6.0.0/Microsoft.Extensions.Logging.csproj b/csharp/ql/test/resources/stubs/Microsoft.Extensions.Logging/6.0.0/Microsoft.Extensions.Logging.csproj
index 9f413987cb3..976e4f24817 100644
--- a/csharp/ql/test/resources/stubs/Microsoft.Extensions.Logging/6.0.0/Microsoft.Extensions.Logging.csproj
+++ b/csharp/ql/test/resources/stubs/Microsoft.Extensions.Logging/6.0.0/Microsoft.Extensions.Logging.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <OutputPath>bin\</OutputPath>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
diff --git a/csharp/ql/test/resources/stubs/Microsoft.Extensions.Options/6.0.0/Microsoft.Extensions.Options.csproj b/csharp/ql/test/resources/stubs/Microsoft.Extensions.Options/6.0.0/Microsoft.Extensions.Options.csproj
index c8f4cdbdb3a..df60e16932c 100644
--- a/csharp/ql/test/resources/stubs/Microsoft.Extensions.Options/6.0.0/Microsoft.Extensions.Options.csproj
+++ b/csharp/ql/test/resources/stubs/Microsoft.Extensions.Options/6.0.0/Microsoft.Extensions.Options.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <OutputPath>bin\</OutputPath>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
diff --git a/csharp/ql/test/resources/stubs/Microsoft.Extensions.Primitives/6.0.0/Microsoft.Extensions.Primitives.csproj b/csharp/ql/test/resources/stubs/Microsoft.Extensions.Primitives/6.0.0/Microsoft.Extensions.Primitives.csproj
index 105b29a4077..44f3b6c98d1 100644
--- a/csharp/ql/test/resources/stubs/Microsoft.Extensions.Primitives/6.0.0/Microsoft.Extensions.Primitives.csproj
+++ b/csharp/ql/test/resources/stubs/Microsoft.Extensions.Primitives/6.0.0/Microsoft.Extensions.Primitives.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <OutputPath>bin\</OutputPath>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
diff --git a/csharp/ql/test/resources/stubs/Microsoft.NETCore.Platforms/1.1.0/Microsoft.NETCore.Platforms.csproj b/csharp/ql/test/resources/stubs/Microsoft.NETCore.Platforms/1.1.0/Microsoft.NETCore.Platforms.csproj
index 61622bc5296..c7646fbae20 100644
--- a/csharp/ql/test/resources/stubs/Microsoft.NETCore.Platforms/1.1.0/Microsoft.NETCore.Platforms.csproj
+++ b/csharp/ql/test/resources/stubs/Microsoft.NETCore.Platforms/1.1.0/Microsoft.NETCore.Platforms.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <OutputPath>bin\</OutputPath>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
diff --git a/csharp/ql/test/resources/stubs/Microsoft.NETCore.Platforms/3.1.0/Microsoft.NETCore.Platforms.csproj b/csharp/ql/test/resources/stubs/Microsoft.NETCore.Platforms/3.1.0/Microsoft.NETCore.Platforms.csproj
index 61622bc5296..c7646fbae20 100644
--- a/csharp/ql/test/resources/stubs/Microsoft.NETCore.Platforms/3.1.0/Microsoft.NETCore.Platforms.csproj
+++ b/csharp/ql/test/resources/stubs/Microsoft.NETCore.Platforms/3.1.0/Microsoft.NETCore.Platforms.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <OutputPath>bin\</OutputPath>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
diff --git a/csharp/ql/test/resources/stubs/Microsoft.NETCore.Targets/1.1.0/Microsoft.NETCore.Targets.csproj b/csharp/ql/test/resources/stubs/Microsoft.NETCore.Targets/1.1.0/Microsoft.NETCore.Targets.csproj
index 61622bc5296..c7646fbae20 100644
--- a/csharp/ql/test/resources/stubs/Microsoft.NETCore.Targets/1.1.0/Microsoft.NETCore.Targets.csproj
+++ b/csharp/ql/test/resources/stubs/Microsoft.NETCore.Targets/1.1.0/Microsoft.NETCore.Targets.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <OutputPath>bin\</OutputPath>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
diff --git a/csharp/ql/test/resources/stubs/Microsoft.Win32.Primitives/4.3.0/Microsoft.Win32.Primitives.csproj b/csharp/ql/test/resources/stubs/Microsoft.Win32.Primitives/4.3.0/Microsoft.Win32.Primitives.csproj
index 3f330ea92b9..db450608bc5 100644
--- a/csharp/ql/test/resources/stubs/Microsoft.Win32.Primitives/4.3.0/Microsoft.Win32.Primitives.csproj
+++ b/csharp/ql/test/resources/stubs/Microsoft.Win32.Primitives/4.3.0/Microsoft.Win32.Primitives.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <OutputPath>bin\</OutputPath>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
diff --git a/csharp/ql/test/resources/stubs/Microsoft.Win32.Registry/4.7.0/Microsoft.Win32.Registry.csproj b/csharp/ql/test/resources/stubs/Microsoft.Win32.Registry/4.7.0/Microsoft.Win32.Registry.csproj
index 16712452bb5..d1c554af8c1 100644
--- a/csharp/ql/test/resources/stubs/Microsoft.Win32.Registry/4.7.0/Microsoft.Win32.Registry.csproj
+++ b/csharp/ql/test/resources/stubs/Microsoft.Win32.Registry/4.7.0/Microsoft.Win32.Registry.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <OutputPath>bin\</OutputPath>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
diff --git a/csharp/ql/test/resources/stubs/Microsoft.Win32.SystemEvents/6.0.0/Microsoft.Win32.SystemEvents.csproj b/csharp/ql/test/resources/stubs/Microsoft.Win32.SystemEvents/6.0.0/Microsoft.Win32.SystemEvents.csproj
index 61622bc5296..c7646fbae20 100644
--- a/csharp/ql/test/resources/stubs/Microsoft.Win32.SystemEvents/6.0.0/Microsoft.Win32.SystemEvents.csproj
+++ b/csharp/ql/test/resources/stubs/Microsoft.Win32.SystemEvents/6.0.0/Microsoft.Win32.SystemEvents.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <OutputPath>bin\</OutputPath>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
diff --git a/csharp/ql/test/resources/stubs/NETStandard.Library/1.6.1/NETStandard.Library.csproj b/csharp/ql/test/resources/stubs/NETStandard.Library/1.6.1/NETStandard.Library.csproj
index 28cc59552fb..8e22b3ef071 100644
--- a/csharp/ql/test/resources/stubs/NETStandard.Library/1.6.1/NETStandard.Library.csproj
+++ b/csharp/ql/test/resources/stubs/NETStandard.Library/1.6.1/NETStandard.Library.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <OutputPath>bin\</OutputPath>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
diff --git a/csharp/ql/test/resources/stubs/NHibernate/5.4.7/NHibernate.csproj b/csharp/ql/test/resources/stubs/NHibernate/5.4.7/NHibernate.csproj
index a8ea6c51033..ecb2dae082b 100644
--- a/csharp/ql/test/resources/stubs/NHibernate/5.4.7/NHibernate.csproj
+++ b/csharp/ql/test/resources/stubs/NHibernate/5.4.7/NHibernate.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <OutputPath>bin\</OutputPath>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
diff --git a/csharp/ql/test/resources/stubs/Newtonsoft.Json/13.0.3/Newtonsoft.Json.csproj b/csharp/ql/test/resources/stubs/Newtonsoft.Json/13.0.3/Newtonsoft.Json.csproj
index 61622bc5296..c7646fbae20 100644
--- a/csharp/ql/test/resources/stubs/Newtonsoft.Json/13.0.3/Newtonsoft.Json.csproj
+++ b/csharp/ql/test/resources/stubs/Newtonsoft.Json/13.0.3/Newtonsoft.Json.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <OutputPath>bin\</OutputPath>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
diff --git a/csharp/ql/test/resources/stubs/Remotion.Linq.EagerFetching/2.2.0/Remotion.Linq.EagerFetching.csproj b/csharp/ql/test/resources/stubs/Remotion.Linq.EagerFetching/2.2.0/Remotion.Linq.EagerFetching.csproj
index 47626505cb9..c1ed1379cbd 100644
--- a/csharp/ql/test/resources/stubs/Remotion.Linq.EagerFetching/2.2.0/Remotion.Linq.EagerFetching.csproj
+++ b/csharp/ql/test/resources/stubs/Remotion.Linq.EagerFetching/2.2.0/Remotion.Linq.EagerFetching.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <OutputPath>bin\</OutputPath>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
diff --git a/csharp/ql/test/resources/stubs/Remotion.Linq/2.2.0/Remotion.Linq.csproj b/csharp/ql/test/resources/stubs/Remotion.Linq/2.2.0/Remotion.Linq.csproj
index 7804bd3e552..d6c4929252c 100644
--- a/csharp/ql/test/resources/stubs/Remotion.Linq/2.2.0/Remotion.Linq.csproj
+++ b/csharp/ql/test/resources/stubs/Remotion.Linq/2.2.0/Remotion.Linq.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <OutputPath>bin\</OutputPath>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
diff --git a/csharp/ql/test/resources/stubs/ServiceStack.Client/8.0.0/ServiceStack.Client.csproj b/csharp/ql/test/resources/stubs/ServiceStack.Client/8.0.0/ServiceStack.Client.csproj
index 87757811bc5..cfcee25916a 100644
--- a/csharp/ql/test/resources/stubs/ServiceStack.Client/8.0.0/ServiceStack.Client.csproj
+++ b/csharp/ql/test/resources/stubs/ServiceStack.Client/8.0.0/ServiceStack.Client.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <OutputPath>bin\</OutputPath>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
diff --git a/csharp/ql/test/resources/stubs/ServiceStack.Common/8.0.0/ServiceStack.Common.csproj b/csharp/ql/test/resources/stubs/ServiceStack.Common/8.0.0/ServiceStack.Common.csproj
index 31cd858c123..9528c1b201a 100644
--- a/csharp/ql/test/resources/stubs/ServiceStack.Common/8.0.0/ServiceStack.Common.csproj
+++ b/csharp/ql/test/resources/stubs/ServiceStack.Common/8.0.0/ServiceStack.Common.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <OutputPath>bin\</OutputPath>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
diff --git a/csharp/ql/test/resources/stubs/ServiceStack.Interfaces/8.0.0/ServiceStack.Interfaces.csproj b/csharp/ql/test/resources/stubs/ServiceStack.Interfaces/8.0.0/ServiceStack.Interfaces.csproj
index 61622bc5296..c7646fbae20 100644
--- a/csharp/ql/test/resources/stubs/ServiceStack.Interfaces/8.0.0/ServiceStack.Interfaces.csproj
+++ b/csharp/ql/test/resources/stubs/ServiceStack.Interfaces/8.0.0/ServiceStack.Interfaces.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <OutputPath>bin\</OutputPath>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
diff --git a/csharp/ql/test/resources/stubs/ServiceStack.OrmLite.SqlServer/8.0.0/ServiceStack.OrmLite.SqlServer.csproj b/csharp/ql/test/resources/stubs/ServiceStack.OrmLite.SqlServer/8.0.0/ServiceStack.OrmLite.SqlServer.csproj
index e41f3957573..fd266ab8530 100644
--- a/csharp/ql/test/resources/stubs/ServiceStack.OrmLite.SqlServer/8.0.0/ServiceStack.OrmLite.SqlServer.csproj
+++ b/csharp/ql/test/resources/stubs/ServiceStack.OrmLite.SqlServer/8.0.0/ServiceStack.OrmLite.SqlServer.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <OutputPath>bin\</OutputPath>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
diff --git a/csharp/ql/test/resources/stubs/ServiceStack.OrmLite/8.0.0/ServiceStack.OrmLite.csproj b/csharp/ql/test/resources/stubs/ServiceStack.OrmLite/8.0.0/ServiceStack.OrmLite.csproj
index 9e2be7e1342..612c11986e5 100644
--- a/csharp/ql/test/resources/stubs/ServiceStack.OrmLite/8.0.0/ServiceStack.OrmLite.csproj
+++ b/csharp/ql/test/resources/stubs/ServiceStack.OrmLite/8.0.0/ServiceStack.OrmLite.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <OutputPath>bin\</OutputPath>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
diff --git a/csharp/ql/test/resources/stubs/ServiceStack.Text/8.0.0/ServiceStack.Text.csproj b/csharp/ql/test/resources/stubs/ServiceStack.Text/8.0.0/ServiceStack.Text.csproj
index d52b8950187..f47ae39c2dd 100644
--- a/csharp/ql/test/resources/stubs/ServiceStack.Text/8.0.0/ServiceStack.Text.csproj
+++ b/csharp/ql/test/resources/stubs/ServiceStack.Text/8.0.0/ServiceStack.Text.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <OutputPath>bin\</OutputPath>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
diff --git a/csharp/ql/test/resources/stubs/ServiceStack/8.0.0/ServiceStack.csproj b/csharp/ql/test/resources/stubs/ServiceStack/8.0.0/ServiceStack.csproj
index 48a94bf1c5c..b3a2b6df735 100644
--- a/csharp/ql/test/resources/stubs/ServiceStack/8.0.0/ServiceStack.csproj
+++ b/csharp/ql/test/resources/stubs/ServiceStack/8.0.0/ServiceStack.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <OutputPath>bin\</OutputPath>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
diff --git a/csharp/ql/test/resources/stubs/Stub.System.Data.SQLite.Core.NetStandard/1.0.118/Stub.System.Data.SQLite.Core.NetStandard.csproj b/csharp/ql/test/resources/stubs/Stub.System.Data.SQLite.Core.NetStandard/1.0.118/Stub.System.Data.SQLite.Core.NetStandard.csproj
index 61622bc5296..c7646fbae20 100644
--- a/csharp/ql/test/resources/stubs/Stub.System.Data.SQLite.Core.NetStandard/1.0.118/Stub.System.Data.SQLite.Core.NetStandard.csproj
+++ b/csharp/ql/test/resources/stubs/Stub.System.Data.SQLite.Core.NetStandard/1.0.118/Stub.System.Data.SQLite.Core.NetStandard.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <OutputPath>bin\</OutputPath>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
diff --git a/csharp/ql/test/resources/stubs/System.AppContext/4.3.0/System.AppContext.csproj b/csharp/ql/test/resources/stubs/System.AppContext/4.3.0/System.AppContext.csproj
index eedea2ceb3c..05ae99d36ae 100644
--- a/csharp/ql/test/resources/stubs/System.AppContext/4.3.0/System.AppContext.csproj
+++ b/csharp/ql/test/resources/stubs/System.AppContext/4.3.0/System.AppContext.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <OutputPath>bin\</OutputPath>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
diff --git a/csharp/ql/test/resources/stubs/System.Buffers/4.3.0/System.Buffers.csproj b/csharp/ql/test/resources/stubs/System.Buffers/4.3.0/System.Buffers.csproj
index 3de5fd5d2fb..461a9c76cd8 100644
--- a/csharp/ql/test/resources/stubs/System.Buffers/4.3.0/System.Buffers.csproj
+++ b/csharp/ql/test/resources/stubs/System.Buffers/4.3.0/System.Buffers.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <OutputPath>bin\</OutputPath>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
diff --git a/csharp/ql/test/resources/stubs/System.CodeDom/4.7.0/System.CodeDom.csproj b/csharp/ql/test/resources/stubs/System.CodeDom/4.7.0/System.CodeDom.csproj
index 61622bc5296..c7646fbae20 100644
--- a/csharp/ql/test/resources/stubs/System.CodeDom/4.7.0/System.CodeDom.csproj
+++ b/csharp/ql/test/resources/stubs/System.CodeDom/4.7.0/System.CodeDom.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <OutputPath>bin\</OutputPath>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
diff --git a/csharp/ql/test/resources/stubs/System.Collections.Concurrent/4.3.0/System.Collections.Concurrent.csproj b/csharp/ql/test/resources/stubs/System.Collections.Concurrent/4.3.0/System.Collections.Concurrent.csproj
index 43202c09387..e14050e856c 100644
--- a/csharp/ql/test/resources/stubs/System.Collections.Concurrent/4.3.0/System.Collections.Concurrent.csproj
+++ b/csharp/ql/test/resources/stubs/System.Collections.Concurrent/4.3.0/System.Collections.Concurrent.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <OutputPath>bin\</OutputPath>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
diff --git a/csharp/ql/test/resources/stubs/System.Collections.NonGeneric/4.3.0/System.Collections.NonGeneric.csproj b/csharp/ql/test/resources/stubs/System.Collections.NonGeneric/4.3.0/System.Collections.NonGeneric.csproj
index 9405dc7c712..c90f517b0d7 100644
--- a/csharp/ql/test/resources/stubs/System.Collections.NonGeneric/4.3.0/System.Collections.NonGeneric.csproj
+++ b/csharp/ql/test/resources/stubs/System.Collections.NonGeneric/4.3.0/System.Collections.NonGeneric.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <OutputPath>bin\</OutputPath>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
diff --git a/csharp/ql/test/resources/stubs/System.Collections/4.3.0/System.Collections.csproj b/csharp/ql/test/resources/stubs/System.Collections/4.3.0/System.Collections.csproj
index 3f330ea92b9..db450608bc5 100644
--- a/csharp/ql/test/resources/stubs/System.Collections/4.3.0/System.Collections.csproj
+++ b/csharp/ql/test/resources/stubs/System.Collections/4.3.0/System.Collections.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <OutputPath>bin\</OutputPath>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
diff --git a/csharp/ql/test/resources/stubs/System.ComponentModel.Annotations/5.0.0/System.ComponentModel.Annotations.csproj b/csharp/ql/test/resources/stubs/System.ComponentModel.Annotations/5.0.0/System.ComponentModel.Annotations.csproj
index 61622bc5296..c7646fbae20 100644
--- a/csharp/ql/test/resources/stubs/System.ComponentModel.Annotations/5.0.0/System.ComponentModel.Annotations.csproj
+++ b/csharp/ql/test/resources/stubs/System.ComponentModel.Annotations/5.0.0/System.ComponentModel.Annotations.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <OutputPath>bin\</OutputPath>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
diff --git a/csharp/ql/test/resources/stubs/System.ComponentModel.Primitives/4.3.0/System.ComponentModel.Primitives.csproj b/csharp/ql/test/resources/stubs/System.ComponentModel.Primitives/4.3.0/System.ComponentModel.Primitives.csproj
index 49b42f6256e..a3f8fc48b0c 100644
--- a/csharp/ql/test/resources/stubs/System.ComponentModel.Primitives/4.3.0/System.ComponentModel.Primitives.csproj
+++ b/csharp/ql/test/resources/stubs/System.ComponentModel.Primitives/4.3.0/System.ComponentModel.Primitives.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <OutputPath>bin\</OutputPath>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
diff --git a/csharp/ql/test/resources/stubs/System.ComponentModel/4.3.0/System.ComponentModel.csproj b/csharp/ql/test/resources/stubs/System.ComponentModel/4.3.0/System.ComponentModel.csproj
index eedea2ceb3c..05ae99d36ae 100644
--- a/csharp/ql/test/resources/stubs/System.ComponentModel/4.3.0/System.ComponentModel.csproj
+++ b/csharp/ql/test/resources/stubs/System.ComponentModel/4.3.0/System.ComponentModel.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <OutputPath>bin\</OutputPath>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
diff --git a/csharp/ql/test/resources/stubs/System.Configuration.ConfigurationManager/6.0.0/System.Configuration.ConfigurationManager.csproj b/csharp/ql/test/resources/stubs/System.Configuration.ConfigurationManager/6.0.0/System.Configuration.ConfigurationManager.csproj
index f4d8c459feb..0fb5c831ef4 100644
--- a/csharp/ql/test/resources/stubs/System.Configuration.ConfigurationManager/6.0.0/System.Configuration.ConfigurationManager.csproj
+++ b/csharp/ql/test/resources/stubs/System.Configuration.ConfigurationManager/6.0.0/System.Configuration.ConfigurationManager.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <OutputPath>bin\</OutputPath>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
diff --git a/csharp/ql/test/resources/stubs/System.Configuration.ConfigurationManager/8.0.0/System.Configuration.ConfigurationManager.csproj b/csharp/ql/test/resources/stubs/System.Configuration.ConfigurationManager/8.0.0/System.Configuration.ConfigurationManager.csproj
index aca3cc90fda..667751f24f8 100644
--- a/csharp/ql/test/resources/stubs/System.Configuration.ConfigurationManager/8.0.0/System.Configuration.ConfigurationManager.csproj
+++ b/csharp/ql/test/resources/stubs/System.Configuration.ConfigurationManager/8.0.0/System.Configuration.ConfigurationManager.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <OutputPath>bin\</OutputPath>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
diff --git a/csharp/ql/test/resources/stubs/System.Console/4.3.0/System.Console.csproj b/csharp/ql/test/resources/stubs/System.Console/4.3.0/System.Console.csproj
index 56d50420a3b..f7904b15ea9 100644
--- a/csharp/ql/test/resources/stubs/System.Console/4.3.0/System.Console.csproj
+++ b/csharp/ql/test/resources/stubs/System.Console/4.3.0/System.Console.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <OutputPath>bin\</OutputPath>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
diff --git a/csharp/ql/test/resources/stubs/System.Data.OleDb/8.0.0/System.Data.OleDb.csproj b/csharp/ql/test/resources/stubs/System.Data.OleDb/8.0.0/System.Data.OleDb.csproj
index 5d32dddf523..2d971f7e28d 100644
--- a/csharp/ql/test/resources/stubs/System.Data.OleDb/8.0.0/System.Data.OleDb.csproj
+++ b/csharp/ql/test/resources/stubs/System.Data.OleDb/8.0.0/System.Data.OleDb.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <OutputPath>bin\</OutputPath>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
diff --git a/csharp/ql/test/resources/stubs/System.Data.SQLite.Core/1.0.118/System.Data.SQLite.Core.csproj b/csharp/ql/test/resources/stubs/System.Data.SQLite.Core/1.0.118/System.Data.SQLite.Core.csproj
index 6261e40e6e1..ef421dea523 100644
--- a/csharp/ql/test/resources/stubs/System.Data.SQLite.Core/1.0.118/System.Data.SQLite.Core.csproj
+++ b/csharp/ql/test/resources/stubs/System.Data.SQLite.Core/1.0.118/System.Data.SQLite.Core.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <OutputPath>bin\</OutputPath>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
diff --git a/csharp/ql/test/resources/stubs/System.Data.SQLite.EF6/1.0.118/System.Data.SQLite.EF6.csproj b/csharp/ql/test/resources/stubs/System.Data.SQLite.EF6/1.0.118/System.Data.SQLite.EF6.csproj
index 103dc686e35..7c63e4386ae 100644
--- a/csharp/ql/test/resources/stubs/System.Data.SQLite.EF6/1.0.118/System.Data.SQLite.EF6.csproj
+++ b/csharp/ql/test/resources/stubs/System.Data.SQLite.EF6/1.0.118/System.Data.SQLite.EF6.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <OutputPath>bin\</OutputPath>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
diff --git a/csharp/ql/test/resources/stubs/System.Data.SQLite/1.0.118/System.Data.SQLite.csproj b/csharp/ql/test/resources/stubs/System.Data.SQLite/1.0.118/System.Data.SQLite.csproj
index 6597dafaab7..51f6a87e102 100644
--- a/csharp/ql/test/resources/stubs/System.Data.SQLite/1.0.118/System.Data.SQLite.csproj
+++ b/csharp/ql/test/resources/stubs/System.Data.SQLite/1.0.118/System.Data.SQLite.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <OutputPath>bin\</OutputPath>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
diff --git a/csharp/ql/test/resources/stubs/System.Data.SqlClient/4.8.5/System.Data.SqlClient.csproj b/csharp/ql/test/resources/stubs/System.Data.SqlClient/4.8.5/System.Data.SqlClient.csproj
index 771049ea640..14d16d202ed 100644
--- a/csharp/ql/test/resources/stubs/System.Data.SqlClient/4.8.5/System.Data.SqlClient.csproj
+++ b/csharp/ql/test/resources/stubs/System.Data.SqlClient/4.8.5/System.Data.SqlClient.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <OutputPath>bin\</OutputPath>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
diff --git a/csharp/ql/test/resources/stubs/System.Diagnostics.Debug/4.3.0/System.Diagnostics.Debug.csproj b/csharp/ql/test/resources/stubs/System.Diagnostics.Debug/4.3.0/System.Diagnostics.Debug.csproj
index 3f330ea92b9..db450608bc5 100644
--- a/csharp/ql/test/resources/stubs/System.Diagnostics.Debug/4.3.0/System.Diagnostics.Debug.csproj
+++ b/csharp/ql/test/resources/stubs/System.Diagnostics.Debug/4.3.0/System.Diagnostics.Debug.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <OutputPath>bin\</OutputPath>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
diff --git a/csharp/ql/test/resources/stubs/System.Diagnostics.DiagnosticSource/6.0.0/System.Diagnostics.DiagnosticSource.csproj b/csharp/ql/test/resources/stubs/System.Diagnostics.DiagnosticSource/6.0.0/System.Diagnostics.DiagnosticSource.csproj
index 105b29a4077..44f3b6c98d1 100644
--- a/csharp/ql/test/resources/stubs/System.Diagnostics.DiagnosticSource/6.0.0/System.Diagnostics.DiagnosticSource.csproj
+++ b/csharp/ql/test/resources/stubs/System.Diagnostics.DiagnosticSource/6.0.0/System.Diagnostics.DiagnosticSource.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <OutputPath>bin\</OutputPath>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
diff --git a/csharp/ql/test/resources/stubs/System.Diagnostics.EventLog/8.0.0/System.Diagnostics.EventLog.csproj b/csharp/ql/test/resources/stubs/System.Diagnostics.EventLog/8.0.0/System.Diagnostics.EventLog.csproj
index 61622bc5296..c7646fbae20 100644
--- a/csharp/ql/test/resources/stubs/System.Diagnostics.EventLog/8.0.0/System.Diagnostics.EventLog.csproj
+++ b/csharp/ql/test/resources/stubs/System.Diagnostics.EventLog/8.0.0/System.Diagnostics.EventLog.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <OutputPath>bin\</OutputPath>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
diff --git a/csharp/ql/test/resources/stubs/System.Diagnostics.PerformanceCounter/8.0.0/System.Diagnostics.PerformanceCounter.csproj b/csharp/ql/test/resources/stubs/System.Diagnostics.PerformanceCounter/8.0.0/System.Diagnostics.PerformanceCounter.csproj
index 6ea89ebc26b..940cf37d405 100644
--- a/csharp/ql/test/resources/stubs/System.Diagnostics.PerformanceCounter/8.0.0/System.Diagnostics.PerformanceCounter.csproj
+++ b/csharp/ql/test/resources/stubs/System.Diagnostics.PerformanceCounter/8.0.0/System.Diagnostics.PerformanceCounter.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <OutputPath>bin\</OutputPath>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
diff --git a/csharp/ql/test/resources/stubs/System.Diagnostics.Tools/4.3.0/System.Diagnostics.Tools.csproj b/csharp/ql/test/resources/stubs/System.Diagnostics.Tools/4.3.0/System.Diagnostics.Tools.csproj
index 3f330ea92b9..db450608bc5 100644
--- a/csharp/ql/test/resources/stubs/System.Diagnostics.Tools/4.3.0/System.Diagnostics.Tools.csproj
+++ b/csharp/ql/test/resources/stubs/System.Diagnostics.Tools/4.3.0/System.Diagnostics.Tools.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <OutputPath>bin\</OutputPath>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
diff --git a/csharp/ql/test/resources/stubs/System.Diagnostics.Tracing/4.3.0/System.Diagnostics.Tracing.csproj b/csharp/ql/test/resources/stubs/System.Diagnostics.Tracing/4.3.0/System.Diagnostics.Tracing.csproj
index 3f330ea92b9..db450608bc5 100644
--- a/csharp/ql/test/resources/stubs/System.Diagnostics.Tracing/4.3.0/System.Diagnostics.Tracing.csproj
+++ b/csharp/ql/test/resources/stubs/System.Diagnostics.Tracing/4.3.0/System.Diagnostics.Tracing.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <OutputPath>bin\</OutputPath>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
diff --git a/csharp/ql/test/resources/stubs/System.Drawing.Common/6.0.0/System.Drawing.Common.csproj b/csharp/ql/test/resources/stubs/System.Drawing.Common/6.0.0/System.Drawing.Common.csproj
index 2867bcd7ddf..e98953c444a 100644
--- a/csharp/ql/test/resources/stubs/System.Drawing.Common/6.0.0/System.Drawing.Common.csproj
+++ b/csharp/ql/test/resources/stubs/System.Drawing.Common/6.0.0/System.Drawing.Common.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <OutputPath>bin\</OutputPath>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
diff --git a/csharp/ql/test/resources/stubs/System.Dynamic.Runtime/4.3.0/System.Dynamic.Runtime.csproj b/csharp/ql/test/resources/stubs/System.Dynamic.Runtime/4.3.0/System.Dynamic.Runtime.csproj
index b2092da3e55..d22ce2d8ece 100644
--- a/csharp/ql/test/resources/stubs/System.Dynamic.Runtime/4.3.0/System.Dynamic.Runtime.csproj
+++ b/csharp/ql/test/resources/stubs/System.Dynamic.Runtime/4.3.0/System.Dynamic.Runtime.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <OutputPath>bin\</OutputPath>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
diff --git a/csharp/ql/test/resources/stubs/System.Globalization.Calendars/4.3.0/System.Globalization.Calendars.csproj b/csharp/ql/test/resources/stubs/System.Globalization.Calendars/4.3.0/System.Globalization.Calendars.csproj
index ada9cced7e8..4ae99ff61b1 100644
--- a/csharp/ql/test/resources/stubs/System.Globalization.Calendars/4.3.0/System.Globalization.Calendars.csproj
+++ b/csharp/ql/test/resources/stubs/System.Globalization.Calendars/4.3.0/System.Globalization.Calendars.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <OutputPath>bin\</OutputPath>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
diff --git a/csharp/ql/test/resources/stubs/System.Globalization.Extensions/4.3.0/System.Globalization.Extensions.csproj b/csharp/ql/test/resources/stubs/System.Globalization.Extensions/4.3.0/System.Globalization.Extensions.csproj
index eae80e84494..a0326b9978e 100644
--- a/csharp/ql/test/resources/stubs/System.Globalization.Extensions/4.3.0/System.Globalization.Extensions.csproj
+++ b/csharp/ql/test/resources/stubs/System.Globalization.Extensions/4.3.0/System.Globalization.Extensions.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <OutputPath>bin\</OutputPath>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
diff --git a/csharp/ql/test/resources/stubs/System.Globalization/4.3.0/System.Globalization.csproj b/csharp/ql/test/resources/stubs/System.Globalization/4.3.0/System.Globalization.csproj
index 3f330ea92b9..db450608bc5 100644
--- a/csharp/ql/test/resources/stubs/System.Globalization/4.3.0/System.Globalization.csproj
+++ b/csharp/ql/test/resources/stubs/System.Globalization/4.3.0/System.Globalization.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <OutputPath>bin\</OutputPath>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
diff --git a/csharp/ql/test/resources/stubs/System.IO.Compression.ZipFile/4.3.0/System.IO.Compression.ZipFile.csproj b/csharp/ql/test/resources/stubs/System.IO.Compression.ZipFile/4.3.0/System.IO.Compression.ZipFile.csproj
index 9ea0cb694d3..aa49337117c 100644
--- a/csharp/ql/test/resources/stubs/System.IO.Compression.ZipFile/4.3.0/System.IO.Compression.ZipFile.csproj
+++ b/csharp/ql/test/resources/stubs/System.IO.Compression.ZipFile/4.3.0/System.IO.Compression.ZipFile.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <OutputPath>bin\</OutputPath>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
diff --git a/csharp/ql/test/resources/stubs/System.IO.Compression/4.3.0/System.IO.Compression.csproj b/csharp/ql/test/resources/stubs/System.IO.Compression/4.3.0/System.IO.Compression.csproj
index 571ca8ac702..3cba3792b5c 100644
--- a/csharp/ql/test/resources/stubs/System.IO.Compression/4.3.0/System.IO.Compression.csproj
+++ b/csharp/ql/test/resources/stubs/System.IO.Compression/4.3.0/System.IO.Compression.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <OutputPath>bin\</OutputPath>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
diff --git a/csharp/ql/test/resources/stubs/System.IO.FileSystem.Primitives/4.3.0/System.IO.FileSystem.Primitives.csproj b/csharp/ql/test/resources/stubs/System.IO.FileSystem.Primitives/4.3.0/System.IO.FileSystem.Primitives.csproj
index eedea2ceb3c..05ae99d36ae 100644
--- a/csharp/ql/test/resources/stubs/System.IO.FileSystem.Primitives/4.3.0/System.IO.FileSystem.Primitives.csproj
+++ b/csharp/ql/test/resources/stubs/System.IO.FileSystem.Primitives/4.3.0/System.IO.FileSystem.Primitives.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <OutputPath>bin\</OutputPath>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
diff --git a/csharp/ql/test/resources/stubs/System.IO.FileSystem/4.3.0/System.IO.FileSystem.csproj b/csharp/ql/test/resources/stubs/System.IO.FileSystem/4.3.0/System.IO.FileSystem.csproj
index 29f8407694c..1a793bec207 100644
--- a/csharp/ql/test/resources/stubs/System.IO.FileSystem/4.3.0/System.IO.FileSystem.csproj
+++ b/csharp/ql/test/resources/stubs/System.IO.FileSystem/4.3.0/System.IO.FileSystem.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <OutputPath>bin\</OutputPath>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
diff --git a/csharp/ql/test/resources/stubs/System.IO/4.3.0/System.IO.csproj b/csharp/ql/test/resources/stubs/System.IO/4.3.0/System.IO.csproj
index 5f5c9da5ddd..6d81c1f3f9e 100644
--- a/csharp/ql/test/resources/stubs/System.IO/4.3.0/System.IO.csproj
+++ b/csharp/ql/test/resources/stubs/System.IO/4.3.0/System.IO.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <OutputPath>bin\</OutputPath>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
diff --git a/csharp/ql/test/resources/stubs/System.Linq.Expressions/4.3.0/System.Linq.Expressions.csproj b/csharp/ql/test/resources/stubs/System.Linq.Expressions/4.3.0/System.Linq.Expressions.csproj
index 0af3dc685d2..2942048df30 100644
--- a/csharp/ql/test/resources/stubs/System.Linq.Expressions/4.3.0/System.Linq.Expressions.csproj
+++ b/csharp/ql/test/resources/stubs/System.Linq.Expressions/4.3.0/System.Linq.Expressions.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <OutputPath>bin\</OutputPath>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
diff --git a/csharp/ql/test/resources/stubs/System.Linq.Queryable/4.0.1/System.Linq.Queryable.csproj b/csharp/ql/test/resources/stubs/System.Linq.Queryable/4.0.1/System.Linq.Queryable.csproj
index 2f932907bcd..1b9179010ea 100644
--- a/csharp/ql/test/resources/stubs/System.Linq.Queryable/4.0.1/System.Linq.Queryable.csproj
+++ b/csharp/ql/test/resources/stubs/System.Linq.Queryable/4.0.1/System.Linq.Queryable.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <OutputPath>bin\</OutputPath>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
diff --git a/csharp/ql/test/resources/stubs/System.Linq/4.3.0/System.Linq.csproj b/csharp/ql/test/resources/stubs/System.Linq/4.3.0/System.Linq.csproj
index 8e5bc7596e3..df71d560e13 100644
--- a/csharp/ql/test/resources/stubs/System.Linq/4.3.0/System.Linq.csproj
+++ b/csharp/ql/test/resources/stubs/System.Linq/4.3.0/System.Linq.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <OutputPath>bin\</OutputPath>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
diff --git a/csharp/ql/test/resources/stubs/System.Memory/4.5.5/System.Memory.csproj b/csharp/ql/test/resources/stubs/System.Memory/4.5.5/System.Memory.csproj
index 61622bc5296..c7646fbae20 100644
--- a/csharp/ql/test/resources/stubs/System.Memory/4.5.5/System.Memory.csproj
+++ b/csharp/ql/test/resources/stubs/System.Memory/4.5.5/System.Memory.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <OutputPath>bin\</OutputPath>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
diff --git a/csharp/ql/test/resources/stubs/System.Net.Http/4.3.0/System.Net.Http.csproj b/csharp/ql/test/resources/stubs/System.Net.Http/4.3.0/System.Net.Http.csproj
index 8f34cf08128..c1ae5bf6743 100644
--- a/csharp/ql/test/resources/stubs/System.Net.Http/4.3.0/System.Net.Http.csproj
+++ b/csharp/ql/test/resources/stubs/System.Net.Http/4.3.0/System.Net.Http.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <OutputPath>bin\</OutputPath>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
diff --git a/csharp/ql/test/resources/stubs/System.Net.Primitives/4.3.0/System.Net.Primitives.csproj b/csharp/ql/test/resources/stubs/System.Net.Primitives/4.3.0/System.Net.Primitives.csproj
index 6a8c1133b6a..e9dd3007c6e 100644
--- a/csharp/ql/test/resources/stubs/System.Net.Primitives/4.3.0/System.Net.Primitives.csproj
+++ b/csharp/ql/test/resources/stubs/System.Net.Primitives/4.3.0/System.Net.Primitives.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <OutputPath>bin\</OutputPath>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
diff --git a/csharp/ql/test/resources/stubs/System.Net.Sockets/4.3.0/System.Net.Sockets.csproj b/csharp/ql/test/resources/stubs/System.Net.Sockets/4.3.0/System.Net.Sockets.csproj
index 5448cc1e8d4..6f404cfd263 100644
--- a/csharp/ql/test/resources/stubs/System.Net.Sockets/4.3.0/System.Net.Sockets.csproj
+++ b/csharp/ql/test/resources/stubs/System.Net.Sockets/4.3.0/System.Net.Sockets.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <OutputPath>bin\</OutputPath>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
diff --git a/csharp/ql/test/resources/stubs/System.ObjectModel/4.3.0/System.ObjectModel.csproj b/csharp/ql/test/resources/stubs/System.ObjectModel/4.3.0/System.ObjectModel.csproj
index f7895d929a1..6aa1406d634 100644
--- a/csharp/ql/test/resources/stubs/System.ObjectModel/4.3.0/System.ObjectModel.csproj
+++ b/csharp/ql/test/resources/stubs/System.ObjectModel/4.3.0/System.ObjectModel.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <OutputPath>bin\</OutputPath>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
diff --git a/csharp/ql/test/resources/stubs/System.Reflection.Emit.ILGeneration/4.3.0/System.Reflection.Emit.ILGeneration.csproj b/csharp/ql/test/resources/stubs/System.Reflection.Emit.ILGeneration/4.3.0/System.Reflection.Emit.ILGeneration.csproj
index 168e2690d6e..80dffb6c91a 100644
--- a/csharp/ql/test/resources/stubs/System.Reflection.Emit.ILGeneration/4.3.0/System.Reflection.Emit.ILGeneration.csproj
+++ b/csharp/ql/test/resources/stubs/System.Reflection.Emit.ILGeneration/4.3.0/System.Reflection.Emit.ILGeneration.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <OutputPath>bin\</OutputPath>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
diff --git a/csharp/ql/test/resources/stubs/System.Reflection.Emit.Lightweight/4.7.0/System.Reflection.Emit.Lightweight.csproj b/csharp/ql/test/resources/stubs/System.Reflection.Emit.Lightweight/4.7.0/System.Reflection.Emit.Lightweight.csproj
index 61622bc5296..c7646fbae20 100644
--- a/csharp/ql/test/resources/stubs/System.Reflection.Emit.Lightweight/4.7.0/System.Reflection.Emit.Lightweight.csproj
+++ b/csharp/ql/test/resources/stubs/System.Reflection.Emit.Lightweight/4.7.0/System.Reflection.Emit.Lightweight.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <OutputPath>bin\</OutputPath>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
diff --git a/csharp/ql/test/resources/stubs/System.Reflection.Emit/4.7.0/System.Reflection.Emit.csproj b/csharp/ql/test/resources/stubs/System.Reflection.Emit/4.7.0/System.Reflection.Emit.csproj
index 61622bc5296..c7646fbae20 100644
--- a/csharp/ql/test/resources/stubs/System.Reflection.Emit/4.7.0/System.Reflection.Emit.csproj
+++ b/csharp/ql/test/resources/stubs/System.Reflection.Emit/4.7.0/System.Reflection.Emit.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <OutputPath>bin\</OutputPath>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
diff --git a/csharp/ql/test/resources/stubs/System.Reflection.Extensions/4.3.0/System.Reflection.Extensions.csproj b/csharp/ql/test/resources/stubs/System.Reflection.Extensions/4.3.0/System.Reflection.Extensions.csproj
index 04f8570acc5..28562e7f81a 100644
--- a/csharp/ql/test/resources/stubs/System.Reflection.Extensions/4.3.0/System.Reflection.Extensions.csproj
+++ b/csharp/ql/test/resources/stubs/System.Reflection.Extensions/4.3.0/System.Reflection.Extensions.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <OutputPath>bin\</OutputPath>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
diff --git a/csharp/ql/test/resources/stubs/System.Reflection.Primitives/4.3.0/System.Reflection.Primitives.csproj b/csharp/ql/test/resources/stubs/System.Reflection.Primitives/4.3.0/System.Reflection.Primitives.csproj
index 3f330ea92b9..db450608bc5 100644
--- a/csharp/ql/test/resources/stubs/System.Reflection.Primitives/4.3.0/System.Reflection.Primitives.csproj
+++ b/csharp/ql/test/resources/stubs/System.Reflection.Primitives/4.3.0/System.Reflection.Primitives.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <OutputPath>bin\</OutputPath>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
diff --git a/csharp/ql/test/resources/stubs/System.Reflection.TypeExtensions/4.7.0/System.Reflection.TypeExtensions.csproj b/csharp/ql/test/resources/stubs/System.Reflection.TypeExtensions/4.7.0/System.Reflection.TypeExtensions.csproj
index 61622bc5296..c7646fbae20 100644
--- a/csharp/ql/test/resources/stubs/System.Reflection.TypeExtensions/4.7.0/System.Reflection.TypeExtensions.csproj
+++ b/csharp/ql/test/resources/stubs/System.Reflection.TypeExtensions/4.7.0/System.Reflection.TypeExtensions.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <OutputPath>bin\</OutputPath>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
diff --git a/csharp/ql/test/resources/stubs/System.Reflection/4.3.0/System.Reflection.csproj b/csharp/ql/test/resources/stubs/System.Reflection/4.3.0/System.Reflection.csproj
index 4c9aaa8917a..2979d196c84 100644
--- a/csharp/ql/test/resources/stubs/System.Reflection/4.3.0/System.Reflection.csproj
+++ b/csharp/ql/test/resources/stubs/System.Reflection/4.3.0/System.Reflection.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <OutputPath>bin\</OutputPath>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
diff --git a/csharp/ql/test/resources/stubs/System.Resources.ResourceManager/4.3.0/System.Resources.ResourceManager.csproj b/csharp/ql/test/resources/stubs/System.Resources.ResourceManager/4.3.0/System.Resources.ResourceManager.csproj
index 244dbe7b4f2..f13388a0b79 100644
--- a/csharp/ql/test/resources/stubs/System.Resources.ResourceManager/4.3.0/System.Resources.ResourceManager.csproj
+++ b/csharp/ql/test/resources/stubs/System.Resources.ResourceManager/4.3.0/System.Resources.ResourceManager.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <OutputPath>bin\</OutputPath>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
diff --git a/csharp/ql/test/resources/stubs/System.Runtime.CompilerServices.Unsafe/6.0.0/System.Runtime.CompilerServices.Unsafe.csproj b/csharp/ql/test/resources/stubs/System.Runtime.CompilerServices.Unsafe/6.0.0/System.Runtime.CompilerServices.Unsafe.csproj
index 61622bc5296..c7646fbae20 100644
--- a/csharp/ql/test/resources/stubs/System.Runtime.CompilerServices.Unsafe/6.0.0/System.Runtime.CompilerServices.Unsafe.csproj
+++ b/csharp/ql/test/resources/stubs/System.Runtime.CompilerServices.Unsafe/6.0.0/System.Runtime.CompilerServices.Unsafe.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <OutputPath>bin\</OutputPath>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
diff --git a/csharp/ql/test/resources/stubs/System.Runtime.Extensions/4.3.0/System.Runtime.Extensions.csproj b/csharp/ql/test/resources/stubs/System.Runtime.Extensions/4.3.0/System.Runtime.Extensions.csproj
index 3f330ea92b9..db450608bc5 100644
--- a/csharp/ql/test/resources/stubs/System.Runtime.Extensions/4.3.0/System.Runtime.Extensions.csproj
+++ b/csharp/ql/test/resources/stubs/System.Runtime.Extensions/4.3.0/System.Runtime.Extensions.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <OutputPath>bin\</OutputPath>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
diff --git a/csharp/ql/test/resources/stubs/System.Runtime.Handles/4.3.0/System.Runtime.Handles.csproj b/csharp/ql/test/resources/stubs/System.Runtime.Handles/4.3.0/System.Runtime.Handles.csproj
index 3f330ea92b9..db450608bc5 100644
--- a/csharp/ql/test/resources/stubs/System.Runtime.Handles/4.3.0/System.Runtime.Handles.csproj
+++ b/csharp/ql/test/resources/stubs/System.Runtime.Handles/4.3.0/System.Runtime.Handles.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <OutputPath>bin\</OutputPath>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
diff --git a/csharp/ql/test/resources/stubs/System.Runtime.InteropServices.RuntimeInformation/4.3.0/System.Runtime.InteropServices.RuntimeInformation.csproj b/csharp/ql/test/resources/stubs/System.Runtime.InteropServices.RuntimeInformation/4.3.0/System.Runtime.InteropServices.RuntimeInformation.csproj
index 2b9d6db8e7d..6f9c25eb744 100644
--- a/csharp/ql/test/resources/stubs/System.Runtime.InteropServices.RuntimeInformation/4.3.0/System.Runtime.InteropServices.RuntimeInformation.csproj
+++ b/csharp/ql/test/resources/stubs/System.Runtime.InteropServices.RuntimeInformation/4.3.0/System.Runtime.InteropServices.RuntimeInformation.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <OutputPath>bin\</OutputPath>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
diff --git a/csharp/ql/test/resources/stubs/System.Runtime.InteropServices/4.3.0/System.Runtime.InteropServices.csproj b/csharp/ql/test/resources/stubs/System.Runtime.InteropServices/4.3.0/System.Runtime.InteropServices.csproj
index 662d4b0211b..0750843c2df 100644
--- a/csharp/ql/test/resources/stubs/System.Runtime.InteropServices/4.3.0/System.Runtime.InteropServices.csproj
+++ b/csharp/ql/test/resources/stubs/System.Runtime.InteropServices/4.3.0/System.Runtime.InteropServices.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <OutputPath>bin\</OutputPath>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
diff --git a/csharp/ql/test/resources/stubs/System.Runtime.Numerics/4.3.0/System.Runtime.Numerics.csproj b/csharp/ql/test/resources/stubs/System.Runtime.Numerics/4.3.0/System.Runtime.Numerics.csproj
index 06b8a11a3a0..57754ba8a4e 100644
--- a/csharp/ql/test/resources/stubs/System.Runtime.Numerics/4.3.0/System.Runtime.Numerics.csproj
+++ b/csharp/ql/test/resources/stubs/System.Runtime.Numerics/4.3.0/System.Runtime.Numerics.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <OutputPath>bin\</OutputPath>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
diff --git a/csharp/ql/test/resources/stubs/System.Runtime.Serialization.Formatters/4.3.0/System.Runtime.Serialization.Formatters.csproj b/csharp/ql/test/resources/stubs/System.Runtime.Serialization.Formatters/4.3.0/System.Runtime.Serialization.Formatters.csproj
index 688fbf926e3..969789e7005 100644
--- a/csharp/ql/test/resources/stubs/System.Runtime.Serialization.Formatters/4.3.0/System.Runtime.Serialization.Formatters.csproj
+++ b/csharp/ql/test/resources/stubs/System.Runtime.Serialization.Formatters/4.3.0/System.Runtime.Serialization.Formatters.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <OutputPath>bin\</OutputPath>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
diff --git a/csharp/ql/test/resources/stubs/System.Runtime.Serialization.Primitives/4.3.0/System.Runtime.Serialization.Primitives.csproj b/csharp/ql/test/resources/stubs/System.Runtime.Serialization.Primitives/4.3.0/System.Runtime.Serialization.Primitives.csproj
index e5981041968..296b55a60a8 100644
--- a/csharp/ql/test/resources/stubs/System.Runtime.Serialization.Primitives/4.3.0/System.Runtime.Serialization.Primitives.csproj
+++ b/csharp/ql/test/resources/stubs/System.Runtime.Serialization.Primitives/4.3.0/System.Runtime.Serialization.Primitives.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <OutputPath>bin\</OutputPath>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
diff --git a/csharp/ql/test/resources/stubs/System.Runtime/4.3.0/System.Runtime.csproj b/csharp/ql/test/resources/stubs/System.Runtime/4.3.0/System.Runtime.csproj
index 2753de6e2e9..02dc0eedbee 100644
--- a/csharp/ql/test/resources/stubs/System.Runtime/4.3.0/System.Runtime.csproj
+++ b/csharp/ql/test/resources/stubs/System.Runtime/4.3.0/System.Runtime.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <OutputPath>bin\</OutputPath>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
diff --git a/csharp/ql/test/resources/stubs/System.Security.AccessControl/4.7.0/System.Security.AccessControl.csproj b/csharp/ql/test/resources/stubs/System.Security.AccessControl/4.7.0/System.Security.AccessControl.csproj
index d602f3967ef..8f1adeb2573 100644
--- a/csharp/ql/test/resources/stubs/System.Security.AccessControl/4.7.0/System.Security.AccessControl.csproj
+++ b/csharp/ql/test/resources/stubs/System.Security.AccessControl/4.7.0/System.Security.AccessControl.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <OutputPath>bin\</OutputPath>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
diff --git a/csharp/ql/test/resources/stubs/System.Security.AccessControl/6.0.0/System.Security.AccessControl.csproj b/csharp/ql/test/resources/stubs/System.Security.AccessControl/6.0.0/System.Security.AccessControl.csproj
index 61622bc5296..c7646fbae20 100644
--- a/csharp/ql/test/resources/stubs/System.Security.AccessControl/6.0.0/System.Security.AccessControl.csproj
+++ b/csharp/ql/test/resources/stubs/System.Security.AccessControl/6.0.0/System.Security.AccessControl.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <OutputPath>bin\</OutputPath>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
diff --git a/csharp/ql/test/resources/stubs/System.Security.Cryptography.Algorithms/4.3.0/System.Security.Cryptography.Algorithms.csproj b/csharp/ql/test/resources/stubs/System.Security.Cryptography.Algorithms/4.3.0/System.Security.Cryptography.Algorithms.csproj
index c02ec388dcf..2612829411e 100644
--- a/csharp/ql/test/resources/stubs/System.Security.Cryptography.Algorithms/4.3.0/System.Security.Cryptography.Algorithms.csproj
+++ b/csharp/ql/test/resources/stubs/System.Security.Cryptography.Algorithms/4.3.0/System.Security.Cryptography.Algorithms.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <OutputPath>bin\</OutputPath>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
diff --git a/csharp/ql/test/resources/stubs/System.Security.Cryptography.Cng/4.3.0/System.Security.Cryptography.Cng.csproj b/csharp/ql/test/resources/stubs/System.Security.Cryptography.Cng/4.3.0/System.Security.Cryptography.Cng.csproj
index 8b6bdc45f57..ad94b10cd1a 100644
--- a/csharp/ql/test/resources/stubs/System.Security.Cryptography.Cng/4.3.0/System.Security.Cryptography.Cng.csproj
+++ b/csharp/ql/test/resources/stubs/System.Security.Cryptography.Cng/4.3.0/System.Security.Cryptography.Cng.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <OutputPath>bin\</OutputPath>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
diff --git a/csharp/ql/test/resources/stubs/System.Security.Cryptography.Csp/4.3.0/System.Security.Cryptography.Csp.csproj b/csharp/ql/test/resources/stubs/System.Security.Cryptography.Csp/4.3.0/System.Security.Cryptography.Csp.csproj
index 18435c50e8e..c4c48bc1cf7 100644
--- a/csharp/ql/test/resources/stubs/System.Security.Cryptography.Csp/4.3.0/System.Security.Cryptography.Csp.csproj
+++ b/csharp/ql/test/resources/stubs/System.Security.Cryptography.Csp/4.3.0/System.Security.Cryptography.Csp.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <OutputPath>bin\</OutputPath>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
diff --git a/csharp/ql/test/resources/stubs/System.Security.Cryptography.Encoding/4.3.0/System.Security.Cryptography.Encoding.csproj b/csharp/ql/test/resources/stubs/System.Security.Cryptography.Encoding/4.3.0/System.Security.Cryptography.Encoding.csproj
index f203f16da16..fe25f9a8940 100644
--- a/csharp/ql/test/resources/stubs/System.Security.Cryptography.Encoding/4.3.0/System.Security.Cryptography.Encoding.csproj
+++ b/csharp/ql/test/resources/stubs/System.Security.Cryptography.Encoding/4.3.0/System.Security.Cryptography.Encoding.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <OutputPath>bin\</OutputPath>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
diff --git a/csharp/ql/test/resources/stubs/System.Security.Cryptography.OpenSsl/4.3.0/System.Security.Cryptography.OpenSsl.csproj b/csharp/ql/test/resources/stubs/System.Security.Cryptography.OpenSsl/4.3.0/System.Security.Cryptography.OpenSsl.csproj
index 98989a1a958..8ba6c5da32d 100644
--- a/csharp/ql/test/resources/stubs/System.Security.Cryptography.OpenSsl/4.3.0/System.Security.Cryptography.OpenSsl.csproj
+++ b/csharp/ql/test/resources/stubs/System.Security.Cryptography.OpenSsl/4.3.0/System.Security.Cryptography.OpenSsl.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <OutputPath>bin\</OutputPath>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
diff --git a/csharp/ql/test/resources/stubs/System.Security.Cryptography.Primitives/4.3.0/System.Security.Cryptography.Primitives.csproj b/csharp/ql/test/resources/stubs/System.Security.Cryptography.Primitives/4.3.0/System.Security.Cryptography.Primitives.csproj
index 01dc9200b71..4ea09d97c5c 100644
--- a/csharp/ql/test/resources/stubs/System.Security.Cryptography.Primitives/4.3.0/System.Security.Cryptography.Primitives.csproj
+++ b/csharp/ql/test/resources/stubs/System.Security.Cryptography.Primitives/4.3.0/System.Security.Cryptography.Primitives.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <OutputPath>bin\</OutputPath>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
diff --git a/csharp/ql/test/resources/stubs/System.Security.Cryptography.ProtectedData/6.0.0/System.Security.Cryptography.ProtectedData.csproj b/csharp/ql/test/resources/stubs/System.Security.Cryptography.ProtectedData/6.0.0/System.Security.Cryptography.ProtectedData.csproj
index 61622bc5296..c7646fbae20 100644
--- a/csharp/ql/test/resources/stubs/System.Security.Cryptography.ProtectedData/6.0.0/System.Security.Cryptography.ProtectedData.csproj
+++ b/csharp/ql/test/resources/stubs/System.Security.Cryptography.ProtectedData/6.0.0/System.Security.Cryptography.ProtectedData.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <OutputPath>bin\</OutputPath>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
diff --git a/csharp/ql/test/resources/stubs/System.Security.Cryptography.ProtectedData/8.0.0/System.Security.Cryptography.ProtectedData.csproj b/csharp/ql/test/resources/stubs/System.Security.Cryptography.ProtectedData/8.0.0/System.Security.Cryptography.ProtectedData.csproj
index 61622bc5296..c7646fbae20 100644
--- a/csharp/ql/test/resources/stubs/System.Security.Cryptography.ProtectedData/8.0.0/System.Security.Cryptography.ProtectedData.csproj
+++ b/csharp/ql/test/resources/stubs/System.Security.Cryptography.ProtectedData/8.0.0/System.Security.Cryptography.ProtectedData.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <OutputPath>bin\</OutputPath>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
diff --git a/csharp/ql/test/resources/stubs/System.Security.Cryptography.X509Certificates/4.3.0/System.Security.Cryptography.X509Certificates.csproj b/csharp/ql/test/resources/stubs/System.Security.Cryptography.X509Certificates/4.3.0/System.Security.Cryptography.X509Certificates.csproj
index 58db72aeedd..43161445311 100644
--- a/csharp/ql/test/resources/stubs/System.Security.Cryptography.X509Certificates/4.3.0/System.Security.Cryptography.X509Certificates.csproj
+++ b/csharp/ql/test/resources/stubs/System.Security.Cryptography.X509Certificates/4.3.0/System.Security.Cryptography.X509Certificates.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <OutputPath>bin\</OutputPath>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
diff --git a/csharp/ql/test/resources/stubs/System.Security.Permissions/6.0.0/System.Security.Permissions.csproj b/csharp/ql/test/resources/stubs/System.Security.Permissions/6.0.0/System.Security.Permissions.csproj
index 6eee91e4a0d..17c156f764f 100644
--- a/csharp/ql/test/resources/stubs/System.Security.Permissions/6.0.0/System.Security.Permissions.csproj
+++ b/csharp/ql/test/resources/stubs/System.Security.Permissions/6.0.0/System.Security.Permissions.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <OutputPath>bin\</OutputPath>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
diff --git a/csharp/ql/test/resources/stubs/System.Security.Principal.Windows/4.7.0/System.Security.Principal.Windows.csproj b/csharp/ql/test/resources/stubs/System.Security.Principal.Windows/4.7.0/System.Security.Principal.Windows.csproj
index 61622bc5296..c7646fbae20 100644
--- a/csharp/ql/test/resources/stubs/System.Security.Principal.Windows/4.7.0/System.Security.Principal.Windows.csproj
+++ b/csharp/ql/test/resources/stubs/System.Security.Principal.Windows/4.7.0/System.Security.Principal.Windows.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <OutputPath>bin\</OutputPath>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
diff --git a/csharp/ql/test/resources/stubs/System.Text.Encoding.Extensions/4.3.0/System.Text.Encoding.Extensions.csproj b/csharp/ql/test/resources/stubs/System.Text.Encoding.Extensions/4.3.0/System.Text.Encoding.Extensions.csproj
index a5763e7e929..001908d1726 100644
--- a/csharp/ql/test/resources/stubs/System.Text.Encoding.Extensions/4.3.0/System.Text.Encoding.Extensions.csproj
+++ b/csharp/ql/test/resources/stubs/System.Text.Encoding.Extensions/4.3.0/System.Text.Encoding.Extensions.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <OutputPath>bin\</OutputPath>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
diff --git a/csharp/ql/test/resources/stubs/System.Text.Encoding/4.3.0/System.Text.Encoding.csproj b/csharp/ql/test/resources/stubs/System.Text.Encoding/4.3.0/System.Text.Encoding.csproj
index 3f330ea92b9..db450608bc5 100644
--- a/csharp/ql/test/resources/stubs/System.Text.Encoding/4.3.0/System.Text.Encoding.csproj
+++ b/csharp/ql/test/resources/stubs/System.Text.Encoding/4.3.0/System.Text.Encoding.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <OutputPath>bin\</OutputPath>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
diff --git a/csharp/ql/test/resources/stubs/System.Text.RegularExpressions/4.3.0/System.Text.RegularExpressions.csproj b/csharp/ql/test/resources/stubs/System.Text.RegularExpressions/4.3.0/System.Text.RegularExpressions.csproj
index eedea2ceb3c..05ae99d36ae 100644
--- a/csharp/ql/test/resources/stubs/System.Text.RegularExpressions/4.3.0/System.Text.RegularExpressions.csproj
+++ b/csharp/ql/test/resources/stubs/System.Text.RegularExpressions/4.3.0/System.Text.RegularExpressions.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <OutputPath>bin\</OutputPath>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
diff --git a/csharp/ql/test/resources/stubs/System.Threading.Tasks.Extensions/4.3.0/System.Threading.Tasks.Extensions.csproj b/csharp/ql/test/resources/stubs/System.Threading.Tasks.Extensions/4.3.0/System.Threading.Tasks.Extensions.csproj
index 238a9e8005c..9719080f314 100644
--- a/csharp/ql/test/resources/stubs/System.Threading.Tasks.Extensions/4.3.0/System.Threading.Tasks.Extensions.csproj
+++ b/csharp/ql/test/resources/stubs/System.Threading.Tasks.Extensions/4.3.0/System.Threading.Tasks.Extensions.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <OutputPath>bin\</OutputPath>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
diff --git a/csharp/ql/test/resources/stubs/System.Threading.Tasks/4.3.0/System.Threading.Tasks.csproj b/csharp/ql/test/resources/stubs/System.Threading.Tasks/4.3.0/System.Threading.Tasks.csproj
index 3f330ea92b9..db450608bc5 100644
--- a/csharp/ql/test/resources/stubs/System.Threading.Tasks/4.3.0/System.Threading.Tasks.csproj
+++ b/csharp/ql/test/resources/stubs/System.Threading.Tasks/4.3.0/System.Threading.Tasks.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <OutputPath>bin\</OutputPath>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
diff --git a/csharp/ql/test/resources/stubs/System.Threading.Timer/4.3.0/System.Threading.Timer.csproj b/csharp/ql/test/resources/stubs/System.Threading.Timer/4.3.0/System.Threading.Timer.csproj
index 3f330ea92b9..db450608bc5 100644
--- a/csharp/ql/test/resources/stubs/System.Threading.Timer/4.3.0/System.Threading.Timer.csproj
+++ b/csharp/ql/test/resources/stubs/System.Threading.Timer/4.3.0/System.Threading.Timer.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <OutputPath>bin\</OutputPath>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
diff --git a/csharp/ql/test/resources/stubs/System.Threading/4.3.0/System.Threading.csproj b/csharp/ql/test/resources/stubs/System.Threading/4.3.0/System.Threading.csproj
index e20b1bd0021..a52b105bcb7 100644
--- a/csharp/ql/test/resources/stubs/System.Threading/4.3.0/System.Threading.csproj
+++ b/csharp/ql/test/resources/stubs/System.Threading/4.3.0/System.Threading.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <OutputPath>bin\</OutputPath>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
diff --git a/csharp/ql/test/resources/stubs/System.Windows.Extensions/6.0.0/System.Windows.Extensions.csproj b/csharp/ql/test/resources/stubs/System.Windows.Extensions/6.0.0/System.Windows.Extensions.csproj
index 6ccc9797b28..50999e71d78 100644
--- a/csharp/ql/test/resources/stubs/System.Windows.Extensions/6.0.0/System.Windows.Extensions.csproj
+++ b/csharp/ql/test/resources/stubs/System.Windows.Extensions/6.0.0/System.Windows.Extensions.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <OutputPath>bin\</OutputPath>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
diff --git a/csharp/ql/test/resources/stubs/System.Xml.ReaderWriter/4.3.0/System.Xml.ReaderWriter.csproj b/csharp/ql/test/resources/stubs/System.Xml.ReaderWriter/4.3.0/System.Xml.ReaderWriter.csproj
index 4f6ef393595..57b27b200a4 100644
--- a/csharp/ql/test/resources/stubs/System.Xml.ReaderWriter/4.3.0/System.Xml.ReaderWriter.csproj
+++ b/csharp/ql/test/resources/stubs/System.Xml.ReaderWriter/4.3.0/System.Xml.ReaderWriter.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <OutputPath>bin\</OutputPath>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
diff --git a/csharp/ql/test/resources/stubs/System.Xml.XDocument/4.3.0/System.Xml.XDocument.csproj b/csharp/ql/test/resources/stubs/System.Xml.XDocument/4.3.0/System.Xml.XDocument.csproj
index 089c431ca07..d594a8ea0f4 100644
--- a/csharp/ql/test/resources/stubs/System.Xml.XDocument/4.3.0/System.Xml.XDocument.csproj
+++ b/csharp/ql/test/resources/stubs/System.Xml.XDocument/4.3.0/System.Xml.XDocument.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <OutputPath>bin\</OutputPath>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
diff --git a/csharp/ql/test/resources/stubs/System.Xml.XmlDocument/4.3.0/System.Xml.XmlDocument.csproj b/csharp/ql/test/resources/stubs/System.Xml.XmlDocument/4.3.0/System.Xml.XmlDocument.csproj
index 39ff4e0fa12..bc19ef9507f 100644
--- a/csharp/ql/test/resources/stubs/System.Xml.XmlDocument/4.3.0/System.Xml.XmlDocument.csproj
+++ b/csharp/ql/test/resources/stubs/System.Xml.XmlDocument/4.3.0/System.Xml.XmlDocument.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <OutputPath>bin\</OutputPath>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
diff --git a/csharp/ql/test/resources/stubs/_frameworks/Microsoft.AspNetCore.App/Microsoft.AspNetCore.App.csproj b/csharp/ql/test/resources/stubs/_frameworks/Microsoft.AspNetCore.App/Microsoft.AspNetCore.App.csproj
index 77d84a43bbf..adf087e7314 100644
--- a/csharp/ql/test/resources/stubs/_frameworks/Microsoft.AspNetCore.App/Microsoft.AspNetCore.App.csproj
+++ b/csharp/ql/test/resources/stubs/_frameworks/Microsoft.AspNetCore.App/Microsoft.AspNetCore.App.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <OutputPath>bin\</OutputPath>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
diff --git a/csharp/ql/test/resources/stubs/_frameworks/Microsoft.NETCore.App/Microsoft.NETCore.App.csproj b/csharp/ql/test/resources/stubs/_frameworks/Microsoft.NETCore.App/Microsoft.NETCore.App.csproj
index 65a95d1b8b0..396498c8261 100644
--- a/csharp/ql/test/resources/stubs/_frameworks/Microsoft.NETCore.App/Microsoft.NETCore.App.csproj
+++ b/csharp/ql/test/resources/stubs/_frameworks/Microsoft.NETCore.App/Microsoft.NETCore.App.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <OutputPath>bin\</OutputPath>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
diff --git a/csharp/ql/test/resources/stubs/runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl/4.3.0/runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl.csproj b/csharp/ql/test/resources/stubs/runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl/4.3.0/runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl.csproj
index 61622bc5296..c7646fbae20 100644
--- a/csharp/ql/test/resources/stubs/runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl/4.3.0/runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl.csproj
+++ b/csharp/ql/test/resources/stubs/runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl/4.3.0/runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <OutputPath>bin\</OutputPath>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
diff --git a/csharp/ql/test/resources/stubs/runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl/4.3.0/runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl.csproj b/csharp/ql/test/resources/stubs/runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl/4.3.0/runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl.csproj
index 61622bc5296..c7646fbae20 100644
--- a/csharp/ql/test/resources/stubs/runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl/4.3.0/runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl.csproj
+++ b/csharp/ql/test/resources/stubs/runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl/4.3.0/runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <OutputPath>bin\</OutputPath>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
diff --git a/csharp/ql/test/resources/stubs/runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl/4.3.0/runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl.csproj b/csharp/ql/test/resources/stubs/runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl/4.3.0/runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl.csproj
index 61622bc5296..c7646fbae20 100644
--- a/csharp/ql/test/resources/stubs/runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl/4.3.0/runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl.csproj
+++ b/csharp/ql/test/resources/stubs/runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl/4.3.0/runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <OutputPath>bin\</OutputPath>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
diff --git a/csharp/ql/test/resources/stubs/runtime.native.System.Data.SqlClient.sni/4.7.0/runtime.native.System.Data.SqlClient.sni.csproj b/csharp/ql/test/resources/stubs/runtime.native.System.Data.SqlClient.sni/4.7.0/runtime.native.System.Data.SqlClient.sni.csproj
index 7df8df7fe38..db0fe00833e 100644
--- a/csharp/ql/test/resources/stubs/runtime.native.System.Data.SqlClient.sni/4.7.0/runtime.native.System.Data.SqlClient.sni.csproj
+++ b/csharp/ql/test/resources/stubs/runtime.native.System.Data.SqlClient.sni/4.7.0/runtime.native.System.Data.SqlClient.sni.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <OutputPath>bin\</OutputPath>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
diff --git a/csharp/ql/test/resources/stubs/runtime.native.System.IO.Compression/4.3.0/runtime.native.System.IO.Compression.csproj b/csharp/ql/test/resources/stubs/runtime.native.System.IO.Compression/4.3.0/runtime.native.System.IO.Compression.csproj
index 2753de6e2e9..02dc0eedbee 100644
--- a/csharp/ql/test/resources/stubs/runtime.native.System.IO.Compression/4.3.0/runtime.native.System.IO.Compression.csproj
+++ b/csharp/ql/test/resources/stubs/runtime.native.System.IO.Compression/4.3.0/runtime.native.System.IO.Compression.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <OutputPath>bin\</OutputPath>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
diff --git a/csharp/ql/test/resources/stubs/runtime.native.System.Net.Http/4.3.0/runtime.native.System.Net.Http.csproj b/csharp/ql/test/resources/stubs/runtime.native.System.Net.Http/4.3.0/runtime.native.System.Net.Http.csproj
index 2753de6e2e9..02dc0eedbee 100644
--- a/csharp/ql/test/resources/stubs/runtime.native.System.Net.Http/4.3.0/runtime.native.System.Net.Http.csproj
+++ b/csharp/ql/test/resources/stubs/runtime.native.System.Net.Http/4.3.0/runtime.native.System.Net.Http.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <OutputPath>bin\</OutputPath>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
diff --git a/csharp/ql/test/resources/stubs/runtime.native.System.Security.Cryptography.Apple/4.3.0/runtime.native.System.Security.Cryptography.Apple.csproj b/csharp/ql/test/resources/stubs/runtime.native.System.Security.Cryptography.Apple/4.3.0/runtime.native.System.Security.Cryptography.Apple.csproj
index ebf01486104..27e7adb1b75 100644
--- a/csharp/ql/test/resources/stubs/runtime.native.System.Security.Cryptography.Apple/4.3.0/runtime.native.System.Security.Cryptography.Apple.csproj
+++ b/csharp/ql/test/resources/stubs/runtime.native.System.Security.Cryptography.Apple/4.3.0/runtime.native.System.Security.Cryptography.Apple.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <OutputPath>bin\</OutputPath>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
diff --git a/csharp/ql/test/resources/stubs/runtime.native.System.Security.Cryptography.OpenSsl/4.3.0/runtime.native.System.Security.Cryptography.OpenSsl.csproj b/csharp/ql/test/resources/stubs/runtime.native.System.Security.Cryptography.OpenSsl/4.3.0/runtime.native.System.Security.Cryptography.OpenSsl.csproj
index a9b70c91ccd..a864639497f 100644
--- a/csharp/ql/test/resources/stubs/runtime.native.System.Security.Cryptography.OpenSsl/4.3.0/runtime.native.System.Security.Cryptography.OpenSsl.csproj
+++ b/csharp/ql/test/resources/stubs/runtime.native.System.Security.Cryptography.OpenSsl/4.3.0/runtime.native.System.Security.Cryptography.OpenSsl.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <OutputPath>bin\</OutputPath>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
diff --git a/csharp/ql/test/resources/stubs/runtime.native.System/4.3.0/runtime.native.System.csproj b/csharp/ql/test/resources/stubs/runtime.native.System/4.3.0/runtime.native.System.csproj
index 2753de6e2e9..02dc0eedbee 100644
--- a/csharp/ql/test/resources/stubs/runtime.native.System/4.3.0/runtime.native.System.csproj
+++ b/csharp/ql/test/resources/stubs/runtime.native.System/4.3.0/runtime.native.System.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <OutputPath>bin\</OutputPath>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
diff --git a/csharp/ql/test/resources/stubs/runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl/4.3.0/runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl.csproj b/csharp/ql/test/resources/stubs/runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl/4.3.0/runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl.csproj
index 61622bc5296..c7646fbae20 100644
--- a/csharp/ql/test/resources/stubs/runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl/4.3.0/runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl.csproj
+++ b/csharp/ql/test/resources/stubs/runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl/4.3.0/runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <OutputPath>bin\</OutputPath>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
diff --git a/csharp/ql/test/resources/stubs/runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl/4.3.0/runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl.csproj b/csharp/ql/test/resources/stubs/runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl/4.3.0/runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl.csproj
index 61622bc5296..c7646fbae20 100644
--- a/csharp/ql/test/resources/stubs/runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl/4.3.0/runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl.csproj
+++ b/csharp/ql/test/resources/stubs/runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl/4.3.0/runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <OutputPath>bin\</OutputPath>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
diff --git a/csharp/ql/test/resources/stubs/runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.Apple/4.3.0/runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.Apple.csproj b/csharp/ql/test/resources/stubs/runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.Apple/4.3.0/runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.Apple.csproj
index 61622bc5296..c7646fbae20 100644
--- a/csharp/ql/test/resources/stubs/runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.Apple/4.3.0/runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.Apple.csproj
+++ b/csharp/ql/test/resources/stubs/runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.Apple/4.3.0/runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.Apple.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <OutputPath>bin\</OutputPath>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
diff --git a/csharp/ql/test/resources/stubs/runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl/4.3.0/runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl.csproj b/csharp/ql/test/resources/stubs/runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl/4.3.0/runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl.csproj
index 61622bc5296..c7646fbae20 100644
--- a/csharp/ql/test/resources/stubs/runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl/4.3.0/runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl.csproj
+++ b/csharp/ql/test/resources/stubs/runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl/4.3.0/runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <OutputPath>bin\</OutputPath>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
diff --git a/csharp/ql/test/resources/stubs/runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl/4.3.0/runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl.csproj b/csharp/ql/test/resources/stubs/runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl/4.3.0/runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl.csproj
index 61622bc5296..c7646fbae20 100644
--- a/csharp/ql/test/resources/stubs/runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl/4.3.0/runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl.csproj
+++ b/csharp/ql/test/resources/stubs/runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl/4.3.0/runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <OutputPath>bin\</OutputPath>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
diff --git a/csharp/ql/test/resources/stubs/runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl/4.3.0/runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl.csproj b/csharp/ql/test/resources/stubs/runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl/4.3.0/runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl.csproj
index 61622bc5296..c7646fbae20 100644
--- a/csharp/ql/test/resources/stubs/runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl/4.3.0/runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl.csproj
+++ b/csharp/ql/test/resources/stubs/runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl/4.3.0/runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <OutputPath>bin\</OutputPath>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
diff --git a/csharp/ql/test/resources/stubs/runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl/4.3.0/runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl.csproj b/csharp/ql/test/resources/stubs/runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl/4.3.0/runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl.csproj
index 61622bc5296..c7646fbae20 100644
--- a/csharp/ql/test/resources/stubs/runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl/4.3.0/runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl.csproj
+++ b/csharp/ql/test/resources/stubs/runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl/4.3.0/runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <OutputPath>bin\</OutputPath>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
diff --git a/csharp/ql/test/resources/stubs/runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl/4.3.0/runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl.csproj b/csharp/ql/test/resources/stubs/runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl/4.3.0/runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl.csproj
index 61622bc5296..c7646fbae20 100644
--- a/csharp/ql/test/resources/stubs/runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl/4.3.0/runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl.csproj
+++ b/csharp/ql/test/resources/stubs/runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl/4.3.0/runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <OutputPath>bin\</OutputPath>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
diff --git a/csharp/ql/test/resources/stubs/runtime.win-arm64.runtime.native.System.Data.SqlClient.sni/4.4.0/runtime.win-arm64.runtime.native.System.Data.SqlClient.sni.csproj b/csharp/ql/test/resources/stubs/runtime.win-arm64.runtime.native.System.Data.SqlClient.sni/4.4.0/runtime.win-arm64.runtime.native.System.Data.SqlClient.sni.csproj
index 61622bc5296..c7646fbae20 100644
--- a/csharp/ql/test/resources/stubs/runtime.win-arm64.runtime.native.System.Data.SqlClient.sni/4.4.0/runtime.win-arm64.runtime.native.System.Data.SqlClient.sni.csproj
+++ b/csharp/ql/test/resources/stubs/runtime.win-arm64.runtime.native.System.Data.SqlClient.sni/4.4.0/runtime.win-arm64.runtime.native.System.Data.SqlClient.sni.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <OutputPath>bin\</OutputPath>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
diff --git a/csharp/ql/test/resources/stubs/runtime.win-x64.runtime.native.System.Data.SqlClient.sni/4.4.0/runtime.win-x64.runtime.native.System.Data.SqlClient.sni.csproj b/csharp/ql/test/resources/stubs/runtime.win-x64.runtime.native.System.Data.SqlClient.sni/4.4.0/runtime.win-x64.runtime.native.System.Data.SqlClient.sni.csproj
index 61622bc5296..c7646fbae20 100644
--- a/csharp/ql/test/resources/stubs/runtime.win-x64.runtime.native.System.Data.SqlClient.sni/4.4.0/runtime.win-x64.runtime.native.System.Data.SqlClient.sni.csproj
+++ b/csharp/ql/test/resources/stubs/runtime.win-x64.runtime.native.System.Data.SqlClient.sni/4.4.0/runtime.win-x64.runtime.native.System.Data.SqlClient.sni.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <OutputPath>bin\</OutputPath>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
diff --git a/csharp/ql/test/resources/stubs/runtime.win-x86.runtime.native.System.Data.SqlClient.sni/4.4.0/runtime.win-x86.runtime.native.System.Data.SqlClient.sni.csproj b/csharp/ql/test/resources/stubs/runtime.win-x86.runtime.native.System.Data.SqlClient.sni/4.4.0/runtime.win-x86.runtime.native.System.Data.SqlClient.sni.csproj
index 61622bc5296..c7646fbae20 100644
--- a/csharp/ql/test/resources/stubs/runtime.win-x86.runtime.native.System.Data.SqlClient.sni/4.4.0/runtime.win-x86.runtime.native.System.Data.SqlClient.sni.csproj
+++ b/csharp/ql/test/resources/stubs/runtime.win-x86.runtime.native.System.Data.SqlClient.sni/4.4.0/runtime.win-x86.runtime.native.System.Data.SqlClient.sni.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <OutputPath>bin\</OutputPath>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
diff --git a/csharp/ql/test/utils/modelgenerator/dataflow/CaptureContentSummaryModels.ql b/csharp/ql/test/utils/modelgenerator/dataflow/CaptureContentSummaryModels.ql
index f5d8593a32a..bed1f3ec094 100644
--- a/csharp/ql/test/utils/modelgenerator/dataflow/CaptureContentSummaryModels.ql
+++ b/csharp/ql/test/utils/modelgenerator/dataflow/CaptureContentSummaryModels.ql
@@ -3,7 +3,7 @@ import utils.modelgenerator.internal.CaptureModels
 import TestUtilities.InlineMadTest
 
 module InlineMadTestConfig implements InlineMadTestConfigSig {
-  string getCapturedModel(Callable c) { result = captureContentFlow(c) }
+  string getCapturedModel(Callable c) { result = ContentSensitive::captureFlow(c, _) }
 
   string getKind() { result = "contentbased-summary" }
 }
diff --git a/csharp/ql/test/utils/modelgenerator/dataflow/CaptureNeutralModels.ql b/csharp/ql/test/utils/modelgenerator/dataflow/CaptureNeutralModels.ql
index c9fd2c2655d..922588049d2 100644
--- a/csharp/ql/test/utils/modelgenerator/dataflow/CaptureNeutralModels.ql
+++ b/csharp/ql/test/utils/modelgenerator/dataflow/CaptureNeutralModels.ql
@@ -1,5 +1,5 @@
 import csharp
-import utils.modelgenerator.internal.CaptureSummaryFlowQuery
+import utils.modelgenerator.internal.CaptureModels
 import TestUtilities.InlineMadTest
 
 module InlineMadTestConfig implements InlineMadTestConfigSig {
diff --git a/csharp/ql/test/utils/modelgenerator/dataflow/CaptureSummaryModels.ql b/csharp/ql/test/utils/modelgenerator/dataflow/CaptureSummaryModels.ql
index 5e4a67bcf0c..29cb8f7fb87 100644
--- a/csharp/ql/test/utils/modelgenerator/dataflow/CaptureSummaryModels.ql
+++ b/csharp/ql/test/utils/modelgenerator/dataflow/CaptureSummaryModels.ql
@@ -1,5 +1,5 @@
 import csharp
-import utils.modelgenerator.internal.CaptureSummaryFlowQuery
+import utils.modelgenerator.internal.CaptureModels
 import TestUtilities.InlineMadTest
 
 module InlineMadTestConfig implements InlineMadTestConfigSig {
diff --git a/csharp/ql/test/utils/modelgenerator/dataflow/Summaries.cs b/csharp/ql/test/utils/modelgenerator/dataflow/Summaries.cs
index 994eaf7c378..2d8bbc8912b 100644
--- a/csharp/ql/test/utils/modelgenerator/dataflow/Summaries.cs
+++ b/csharp/ql/test/utils/modelgenerator/dataflow/Summaries.cs
@@ -13,21 +13,21 @@ public class BasicFlow
     private string tainted;
 
     // summary=Models;BasicFlow;false;ReturnThis;(System.Object);;Argument[this];ReturnValue;value;df-generated
-    // contentbased-summary=Models;BasicFlow;false;ReturnThis;(System.Object);;Argument[this];ReturnValue;value;df-generated
+    // contentbased-summary=Models;BasicFlow;false;ReturnThis;(System.Object);;Argument[this];ReturnValue;value;dfc-generated
     public BasicFlow ReturnThis(object input)
     {
         return this;
     }
 
     // summary=Models;BasicFlow;false;ReturnParam0;(System.String,System.Object);;Argument[0];ReturnValue;taint;df-generated
-    // contentbased-summary=Models;BasicFlow;false;ReturnParam0;(System.String,System.Object);;Argument[0];ReturnValue;value;df-generated
+    // contentbased-summary=Models;BasicFlow;false;ReturnParam0;(System.String,System.Object);;Argument[0];ReturnValue;value;dfc-generated
     public string ReturnParam0(string input0, object input1)
     {
         return input0;
     }
 
     // summary=Models;BasicFlow;false;ReturnParam1;(System.String,System.Object);;Argument[1];ReturnValue;taint;df-generated
-    // contentbased-summary=Models;BasicFlow;false;ReturnParam1;(System.String,System.Object);;Argument[1];ReturnValue;value;df-generated
+    // contentbased-summary=Models;BasicFlow;false;ReturnParam1;(System.String,System.Object);;Argument[1];ReturnValue;value;dfc-generated
     public object ReturnParam1(string input0, object input1)
     {
         return input1;
@@ -35,118 +35,134 @@ public class BasicFlow
 
     // summary=Models;BasicFlow;false;ReturnParamMultiple;(System.Object,System.Object);;Argument[0];ReturnValue;taint;df-generated
     // summary=Models;BasicFlow;false;ReturnParamMultiple;(System.Object,System.Object);;Argument[1];ReturnValue;taint;df-generated
-    // contentbased-summary=Models;BasicFlow;false;ReturnParamMultiple;(System.Object,System.Object);;Argument[0];ReturnValue;value;df-generated
-    // contentbased-summary=Models;BasicFlow;false;ReturnParamMultiple;(System.Object,System.Object);;Argument[1];ReturnValue;value;df-generated
+    // contentbased-summary=Models;BasicFlow;false;ReturnParamMultiple;(System.Object,System.Object);;Argument[0];ReturnValue;value;dfc-generated
+    // contentbased-summary=Models;BasicFlow;false;ReturnParamMultiple;(System.Object,System.Object);;Argument[1];ReturnValue;value;dfc-generated
     public object ReturnParamMultiple(object input0, object input1)
     {
         return (System.DateTime.Now.DayOfWeek == System.DayOfWeek.Monday) ? input0 : input1;
     }
 
     // summary=Models;BasicFlow;false;ReturnSubstring;(System.String);;Argument[0];ReturnValue;taint;df-generated
-    // contentbased-summary=Models;BasicFlow;false;ReturnSubstring;(System.String);;Argument[0];ReturnValue;taint;df-generated
+    // contentbased-summary=Models;BasicFlow;false;ReturnSubstring;(System.String);;Argument[0];ReturnValue;taint;dfc-generated
     public string ReturnSubstring(string s)
     {
         return s.Substring(0, 1);
     }
 
     // summary=Models;BasicFlow;false;SetField;(System.String);;Argument[0];Argument[this];taint;df-generated
-    // contentbased-summary=Models;BasicFlow;false;SetField;(System.String);;Argument[0];Argument[this].SyntheticField[Models.BasicFlow.tainted];value;df-generated
+    // contentbased-summary=Models;BasicFlow;false;SetField;(System.String);;Argument[0];Argument[this].SyntheticField[Models.BasicFlow.tainted];value;dfc-generated
     public void SetField(string s)
     {
         tainted = s;
     }
 
     // summary=Models;BasicFlow;false;ReturnField;();;Argument[this];ReturnValue;taint;df-generated
-    // contentbased-summary=Models;BasicFlow;false;ReturnField;();;Argument[this].SyntheticField[Models.BasicFlow.tainted];ReturnValue;value;df-generated
+    // contentbased-summary=Models;BasicFlow;false;ReturnField;();;Argument[this].SyntheticField[Models.BasicFlow.tainted];ReturnValue;value;dfc-generated
     public string ReturnField()
     {
         return tainted;
     }
+
+    public Func<object, object> MyFunction;
+    // summary=Models;BasicFlow;false;ApplyMyFunction;(System.Object);;Argument[0];Argument[this];taint;df-generated
+    // summary=Models;BasicFlow;false;ApplyMyFunction;(System.Object);;Argument[this];ReturnValue;taint;df-generated
+    // No content based flow as MaD doesn't support callback logic in fields and properties.
+    public object ApplyMyFunction(object o)
+    {
+        return MyFunction(o);
+    }
 }
 
 public class CollectionFlow
 {
-    private string tainted;
+    private readonly string tainted;
+
+    // summary=Models;CollectionFlow;false;CollectionFlow;(System.String);;Argument[0];Argument[this];taint;df-generated
+    // contentbased-summary=Models;CollectionFlow;false;CollectionFlow;(System.String);;Argument[0];Argument[this].SyntheticField[Models.CollectionFlow.tainted];value;dfc-generated
+    public CollectionFlow(string s)
+    {
+        tainted = s;
+    }
 
     // summary=Models;CollectionFlow;false;ReturnArrayElement;(System.Object[]);;Argument[0].Element;ReturnValue;taint;df-generated
-    // contentbased-summary=Models;CollectionFlow;false;ReturnArrayElement;(System.Object[]);;Argument[0].Element;ReturnValue;value;df-generated
+    // contentbased-summary=Models;CollectionFlow;false;ReturnArrayElement;(System.Object[]);;Argument[0].Element;ReturnValue;value;dfc-generated
     public object ReturnArrayElement(object[] input)
     {
         return input[0];
     }
 
     // summary=Models;CollectionFlow;false;AssignToArray;(System.Object,System.Object[]);;Argument[0];Argument[1].Element;taint;df-generated
-    // contentbased-summary=Models;CollectionFlow;false;AssignToArray;(System.Object,System.Object[]);;Argument[0];Argument[1].Element;value;df-generated
+    // contentbased-summary=Models;CollectionFlow;false;AssignToArray;(System.Object,System.Object[]);;Argument[0];Argument[1].Element;value;dfc-generated
     public void AssignToArray(object data, object[] target)
     {
         target[0] = data;
     }
 
     // summary=Models;CollectionFlow;false;AssignFieldToArray;(System.Object[]);;Argument[this];Argument[0].Element;taint;df-generated
-    // contentbased-summary=Models;CollectionFlow;false;AssignFieldToArray;(System.Object[]);;Argument[this].SyntheticField[Models.CollectionFlow.tainted];Argument[0].Element;value;df-generated
+    // contentbased-summary=Models;CollectionFlow;false;AssignFieldToArray;(System.Object[]);;Argument[this].SyntheticField[Models.CollectionFlow.tainted];Argument[0].Element;value;dfc-generated
     public void AssignFieldToArray(object[] target)
     {
         target[0] = tainted;
     }
 
     // summary=Models;CollectionFlow;false;ReturnListElement;(System.Collections.Generic.List<System.Object>);;Argument[0].Element;ReturnValue;taint;df-generated
-    // contentbased-summary=Models;CollectionFlow;false;ReturnListElement;(System.Collections.Generic.List<System.Object>);;Argument[0].Element;ReturnValue;value;df-generated
+    // contentbased-summary=Models;CollectionFlow;false;ReturnListElement;(System.Collections.Generic.List<System.Object>);;Argument[0].Element;ReturnValue;value;dfc-generated
     public object ReturnListElement(List<object> input)
     {
         return input[0];
     }
 
     // summary=Models;CollectionFlow;false;AddToList;(System.Collections.Generic.List<System.Object>,System.Object);;Argument[1];Argument[0].Element;taint;df-generated
-    // contentbased-summary=Models;CollectionFlow;false;AddToList;(System.Collections.Generic.List<System.Object>,System.Object);;Argument[1];Argument[0].Element;value;df-generated
+    // contentbased-summary=Models;CollectionFlow;false;AddToList;(System.Collections.Generic.List<System.Object>,System.Object);;Argument[1];Argument[0].Element;value;dfc-generated
     public void AddToList(List<object> input, object data)
     {
         input.Add(data);
     }
 
     // summary=Models;CollectionFlow;false;AddFieldToList;(System.Collections.Generic.List<System.String>);;Argument[this];Argument[0].Element;taint;df-generated
-    // contentbased-summary=Models;CollectionFlow;false;AddFieldToList;(System.Collections.Generic.List<System.String>);;Argument[this].SyntheticField[Models.CollectionFlow.tainted];Argument[0].Element;value;df-generated
+    // contentbased-summary=Models;CollectionFlow;false;AddFieldToList;(System.Collections.Generic.List<System.String>);;Argument[this].SyntheticField[Models.CollectionFlow.tainted];Argument[0].Element;value;dfc-generated
     public void AddFieldToList(List<string> input)
     {
         input.Add(tainted);
     }
 
     // summary=Models;CollectionFlow;false;ReturnFieldInAList;();;Argument[this];ReturnValue;taint;df-generated
-    // contentbased-summary=Models;CollectionFlow;false;ReturnFieldInAList;();;Argument[this].SyntheticField[Models.CollectionFlow.tainted];ReturnValue.Element;value;df-generated
+    // contentbased-summary=Models;CollectionFlow;false;ReturnFieldInAList;();;Argument[this].SyntheticField[Models.CollectionFlow.tainted];ReturnValue.Element;value;dfc-generated
     public List<string> ReturnFieldInAList()
     {
         return new List<string> { tainted };
     }
 
     // SPURIOUS-summary=Models;CollectionFlow;false;ReturnComplexTypeArray;(System.String[]);;Argument[0].Element;ReturnValue;taint;df-generated
-    // contentbased-summary=Models;CollectionFlow;false;ReturnComplexTypeArray;(System.String[]);;Argument[0];ReturnValue;value;df-generated
+    // contentbased-summary=Models;CollectionFlow;false;ReturnComplexTypeArray;(System.String[]);;Argument[0];ReturnValue;value;dfc-generated
     public string[] ReturnComplexTypeArray(string[] a)
     {
         return a;
     }
 
     // SPURIOUS-summary=Models;CollectionFlow;false;ReturnBulkTypeList;(System.Collections.Generic.List<System.Byte>);;Argument[0].Element;ReturnValue;taint;df-generated
-    // contentbased-summary=Models;CollectionFlow;false;ReturnBulkTypeList;(System.Collections.Generic.List<System.Byte>);;Argument[0];ReturnValue;value;df-generated
+    // contentbased-summary=Models;CollectionFlow;false;ReturnBulkTypeList;(System.Collections.Generic.List<System.Byte>);;Argument[0];ReturnValue;value;dfc-generated
     public List<byte> ReturnBulkTypeList(List<byte> a)
     {
         return a;
     }
 
     // SPURIOUS-summary=Models;CollectionFlow;false;ReturnComplexTypeDictionary;(System.Collections.Generic.Dictionary<System.Int32,System.String>);;Argument[0].Element;ReturnValue;taint;df-generated
-    // contentbased-summary=Models;CollectionFlow;false;ReturnComplexTypeDictionary;(System.Collections.Generic.Dictionary<System.Int32,System.String>);;Argument[0];ReturnValue;value;df-generated
+    // contentbased-summary=Models;CollectionFlow;false;ReturnComplexTypeDictionary;(System.Collections.Generic.Dictionary<System.Int32,System.String>);;Argument[0];ReturnValue;value;dfc-generated
     public Dictionary<int, string> ReturnComplexTypeDictionary(Dictionary<int, string> a)
     {
         return a;
     }
 
     // SPURIOUS-summary=Models;CollectionFlow;false;ReturnUntypedArray;(System.Array);;Argument[0].Element;ReturnValue;taint;df-generated
-    // contentbased-summary=Models;CollectionFlow;false;ReturnUntypedArray;(System.Array);;Argument[0];ReturnValue;value;df-generated
+    // contentbased-summary=Models;CollectionFlow;false;ReturnUntypedArray;(System.Array);;Argument[0];ReturnValue;value;dfc-generated
     public Array ReturnUntypedArray(Array a)
     {
         return a;
     }
 
     // SPURIOUS-summary=Models;CollectionFlow;false;ReturnUntypedList;(System.Collections.IList);;Argument[0].Element;ReturnValue;taint;df-generated
-    // contentbased-summary=Models;CollectionFlow;false;ReturnUntypedList;(System.Collections.IList);;Argument[0];ReturnValue;value;df-generated
+    // contentbased-summary=Models;CollectionFlow;false;ReturnUntypedList;(System.Collections.IList);;Argument[0];ReturnValue;value;dfc-generated
     public IList ReturnUntypedList(IList a)
     {
         return a;
@@ -177,24 +193,31 @@ public class CollectionFlow
 
 public class IEnumerableFlow
 {
-    private string tainted;
+    private readonly string tainted;
+
+    // summary=Models;IEnumerableFlow;false;IEnumerableFlow;(System.String);;Argument[0];Argument[this];taint;df-generated
+    // contentbased-summary=Models;IEnumerableFlow;false;IEnumerableFlow;(System.String);;Argument[0];Argument[this].SyntheticField[Models.IEnumerableFlow.tainted];value;dfc-generated
+    public IEnumerableFlow(string s)
+    {
+        tainted = s;
+    }
 
     // SPURIOUS-summary=Models;IEnumerableFlow;false;ReturnIEnumerable;(System.Collections.Generic.IEnumerable<System.String>);;Argument[0].Element;ReturnValue;taint;df-generated
-    // contentbased-summary=Models;IEnumerableFlow;false;ReturnIEnumerable;(System.Collections.Generic.IEnumerable<System.String>);;Argument[0];ReturnValue;value;df-generated
+    // contentbased-summary=Models;IEnumerableFlow;false;ReturnIEnumerable;(System.Collections.Generic.IEnumerable<System.String>);;Argument[0];ReturnValue;value;dfc-generated
     public IEnumerable<string> ReturnIEnumerable(IEnumerable<string> input)
     {
         return input;
     }
 
     // summary=Models;IEnumerableFlow;false;ReturnIEnumerableElement;(System.Collections.Generic.IEnumerable<System.Object>);;Argument[0].Element;ReturnValue;taint;df-generated
-    // contentbased-summary=Models;IEnumerableFlow;false;ReturnIEnumerableElement;(System.Collections.Generic.IEnumerable<System.Object>);;Argument[0].Element;ReturnValue;value;df-generated
+    // contentbased-summary=Models;IEnumerableFlow;false;ReturnIEnumerableElement;(System.Collections.Generic.IEnumerable<System.Object>);;Argument[0].Element;ReturnValue;value;dfc-generated
     public object ReturnIEnumerableElement(IEnumerable<object> input)
     {
         return input.First();
     }
 
     // summary=Models;IEnumerableFlow;false;ReturnFieldInIEnumerable;();;Argument[this];ReturnValue;taint;df-generated
-    // contentbased-summary=Models;IEnumerableFlow;false;ReturnFieldInIEnumerable;();;Argument[this].SyntheticField[Models.IEnumerableFlow.tainted];ReturnValue.Element;value;df-generated
+    // contentbased-summary=Models;IEnumerableFlow;false;ReturnFieldInIEnumerable;();;Argument[this].SyntheticField[Models.IEnumerableFlow.tainted];ReturnValue.Element;value;dfc-generated
     public IEnumerable<string> ReturnFieldInIEnumerable()
     {
         return new List<string> { tainted };
@@ -206,49 +229,49 @@ public class GenericFlow<T>
     private T tainted;
 
     // summary=Models;GenericFlow<T>;false;SetGenericField;(T);;Argument[0];Argument[this];taint;df-generated
-    // contentbased-summary=Models;GenericFlow<T>;false;SetGenericField;(T);;Argument[0];Argument[this].SyntheticField[Models.GenericFlow`1.tainted];value;df-generated
+    // contentbased-summary=Models;GenericFlow<T>;false;SetGenericField;(T);;Argument[0];Argument[this].SyntheticField[Models.GenericFlow`1.tainted];value;dfc-generated
     public void SetGenericField(T t)
     {
         tainted = t;
     }
 
     // summary=Models;GenericFlow<T>;false;ReturnGenericField;();;Argument[this];ReturnValue;taint;df-generated
-    // contentbased-summary=Models;GenericFlow<T>;false;ReturnGenericField;();;Argument[this].SyntheticField[Models.GenericFlow`1.tainted];ReturnValue;value;df-generated
+    // contentbased-summary=Models;GenericFlow<T>;false;ReturnGenericField;();;Argument[this].SyntheticField[Models.GenericFlow`1.tainted];ReturnValue;value;dfc-generated
     public T ReturnGenericField()
     {
         return tainted;
     }
 
     // summary=Models;GenericFlow<T>;false;AddFieldToGenericList;(System.Collections.Generic.List<T>);;Argument[this];Argument[0].Element;taint;df-generated
-    // contentbased-summary=Models;GenericFlow<T>;false;AddFieldToGenericList;(System.Collections.Generic.List<T>);;Argument[this].SyntheticField[Models.GenericFlow`1.tainted];Argument[0].Element;value;df-generated
+    // contentbased-summary=Models;GenericFlow<T>;false;AddFieldToGenericList;(System.Collections.Generic.List<T>);;Argument[this].SyntheticField[Models.GenericFlow`1.tainted];Argument[0].Element;value;dfc-generated
     public void AddFieldToGenericList(List<T> input)
     {
         input.Add(tainted);
     }
 
     // summary=Models;GenericFlow<T>;false;ReturnFieldInGenericList;();;Argument[this];ReturnValue;taint;df-generated
-    // contentbased-summary=Models;GenericFlow<T>;false;ReturnFieldInGenericList;();;Argument[this].SyntheticField[Models.GenericFlow`1.tainted];ReturnValue.Element;value;df-generated
+    // contentbased-summary=Models;GenericFlow<T>;false;ReturnFieldInGenericList;();;Argument[this].SyntheticField[Models.GenericFlow`1.tainted];ReturnValue.Element;value;dfc-generated
     public List<T> ReturnFieldInGenericList()
     {
         return new List<T> { tainted };
     }
 
     // summary=Models;GenericFlow<T>;false;ReturnGenericParam<S>;(S);;Argument[0];ReturnValue;taint;df-generated
-    // contentbased-summary=Models;GenericFlow<T>;false;ReturnGenericParam<S>;(S);;Argument[0];ReturnValue;value;df-generated
+    // contentbased-summary=Models;GenericFlow<T>;false;ReturnGenericParam<S>;(S);;Argument[0];ReturnValue;value;dfc-generated
     public S ReturnGenericParam<S>(S input)
     {
         return input;
     }
 
     // summary=Models;GenericFlow<T>;false;ReturnGenericElement<S>;(System.Collections.Generic.List<S>);;Argument[0].Element;ReturnValue;taint;df-generated
-    // contentbased-summary=Models;GenericFlow<T>;false;ReturnGenericElement<S>;(System.Collections.Generic.List<S>);;Argument[0].Element;ReturnValue;value;df-generated
+    // contentbased-summary=Models;GenericFlow<T>;false;ReturnGenericElement<S>;(System.Collections.Generic.List<S>);;Argument[0].Element;ReturnValue;value;dfc-generated
     public S ReturnGenericElement<S>(List<S> input)
     {
         return input[0];
     }
 
     // summary=Models;GenericFlow<T>;false;AddToGenericList<S>;(System.Collections.Generic.List<S>,S);;Argument[1];Argument[0].Element;taint;df-generated
-    // contentbased-summary=Models;GenericFlow<T>;false;AddToGenericList<S>;(System.Collections.Generic.List<S>,S);;Argument[1];Argument[0].Element;value;df-generated
+    // contentbased-summary=Models;GenericFlow<T>;false;AddToGenericList<S>;(System.Collections.Generic.List<S>,S);;Argument[1];Argument[0].Element;value;dfc-generated
     public void AddToGenericList<S>(List<S> input, S data)
     {
         input.Add(data);
@@ -258,7 +281,7 @@ public class GenericFlow<T>
 public abstract class BaseClassFlow
 {
     // summary=Models;BaseClassFlow;true;ReturnParam;(System.Object);;Argument[0];ReturnValue;taint;df-generated
-    // contentbased-summary=Models;BaseClassFlow;true;ReturnParam;(System.Object);;Argument[0];ReturnValue;value;df-generated
+    // contentbased-summary=Models;BaseClassFlow;true;ReturnParam;(System.Object);;Argument[0];ReturnValue;value;dfc-generated
     public virtual object ReturnParam(object input)
     {
         return input;
@@ -268,7 +291,7 @@ public abstract class BaseClassFlow
 public class DerivedClass1Flow : BaseClassFlow
 {
     // summary=Models;DerivedClass1Flow;false;ReturnParam1;(System.String,System.String);;Argument[1];ReturnValue;taint;df-generated
-    // contentbased-summary=Models;DerivedClass1Flow;false;ReturnParam1;(System.String,System.String);;Argument[1];ReturnValue;value;df-generated
+    // contentbased-summary=Models;DerivedClass1Flow;false;ReturnParam1;(System.String,System.String);;Argument[1];ReturnValue;value;dfc-generated
     public string ReturnParam1(string input0, string input1)
     {
         return input1;
@@ -278,14 +301,14 @@ public class DerivedClass1Flow : BaseClassFlow
 public class DerivedClass2Flow : BaseClassFlow
 {
     // summary=Models;BaseClassFlow;true;ReturnParam;(System.Object);;Argument[0];ReturnValue;taint;df-generated
-    // contentbased-summary=Models;BaseClassFlow;true;ReturnParam;(System.Object);;Argument[0];ReturnValue;value;df-generated
+    // contentbased-summary=Models;BaseClassFlow;true;ReturnParam;(System.Object);;Argument[0];ReturnValue;value;dfc-generated
     public override object ReturnParam(object input)
     {
         return input;
     }
 
     // summary=Models;DerivedClass2Flow;false;ReturnParam0;(System.String,System.Int32);;Argument[0];ReturnValue;taint;df-generated
-    // contentbased-summary=Models;DerivedClass2Flow;false;ReturnParam0;(System.String,System.Int32);;Argument[0];ReturnValue;value;df-generated
+    // contentbased-summary=Models;DerivedClass2Flow;false;ReturnParam0;(System.String,System.Int32);;Argument[0];ReturnValue;value;dfc-generated
     public string ReturnParam0(string input0, int input1)
     {
         return input0;
@@ -297,7 +320,7 @@ public class OperatorFlow
     public readonly object Field;
 
     // summary=Models;OperatorFlow;false;OperatorFlow;(System.Object);;Argument[0];Argument[this];taint;df-generated
-    // contentbased-summary=Models;OperatorFlow;false;OperatorFlow;(System.Object);;Argument[0];Argument[this].Field[Models.OperatorFlow.Field];value;df-generated
+    // contentbased-summary=Models;OperatorFlow;false;OperatorFlow;(System.Object);;Argument[0];Argument[this].Field[Models.OperatorFlow.Field];value;dfc-generated
     public OperatorFlow(object o)
     {
         Field = o;
@@ -305,7 +328,7 @@ public class OperatorFlow
 
     // Flow Summary.
     // summary=Models;OperatorFlow;false;op_Addition;(Models.OperatorFlow,Models.OperatorFlow);;Argument[0];ReturnValue;taint;df-generated
-    // contentbased-summary=Models;OperatorFlow;false;op_Addition;(Models.OperatorFlow,Models.OperatorFlow);;Argument[0];ReturnValue;value;df-generated
+    // contentbased-summary=Models;OperatorFlow;false;op_Addition;(Models.OperatorFlow,Models.OperatorFlow);;Argument[0];ReturnValue;value;dfc-generated
     public static OperatorFlow operator +(OperatorFlow a, OperatorFlow b)
     {
         return a;
@@ -346,7 +369,7 @@ public class EqualsGetHashCodeNoFlow
     }
 
     // summary=Models;EqualsGetHashCodeNoFlow;false;Equals;(System.String);;Argument[0];ReturnValue;taint;df-generated
-    // contentbased-summary=Models;EqualsGetHashCodeNoFlow;false;Equals;(System.String);;Argument[0];ReturnValue;value;df-generated
+    // contentbased-summary=Models;EqualsGetHashCodeNoFlow;false;Equals;(System.String);;Argument[0];ReturnValue;value;dfc-generated
     public string Equals(string s)
     {
         return s;
@@ -364,14 +387,14 @@ public class Properties
     private string tainted;
 
     // summary=Models;Properties;false;get_Prop1;();;Argument[this];ReturnValue;taint;df-generated
-    // contentbased-summary=Models;Properties;false;get_Prop1;();;Argument[this].SyntheticField[Models.Properties.tainted];ReturnValue;value;df-generated
+    // contentbased-summary=Models;Properties;false;get_Prop1;();;Argument[this].SyntheticField[Models.Properties.tainted];ReturnValue;value;dfc-generated
     public string Prop1
     {
         get { return tainted; }
     }
 
     // summary=Models;Properties;false;set_Prop2;(System.String);;Argument[0];Argument[this];taint;df-generated
-    // contentbased-summary=Models;Properties;false;set_Prop2;(System.String);;Argument[0];Argument[this].SyntheticField[Models.Properties.tainted];value;df-generated
+    // contentbased-summary=Models;Properties;false;set_Prop2;(System.String);;Argument[0];Argument[this].SyntheticField[Models.Properties.tainted];value;dfc-generated
     public string Prop2
     {
         set { tainted = value; }
@@ -483,18 +506,55 @@ public class SimpleTypes
     }
 }
 
-// No models as higher order methods are excluded
-// from model generation.
+// Methods in this class are "neutral" with respect to the heuristic model generation, but
+// the content based model generation is able to produce flow summaries for them.
 public class HigherOrderParameters
 {
+    // neutral=Models;HigherOrderParameters;M1;(System.String,System.Func<System.String,System.String>);summary;df-generated
+    // contentbased-summary=Models;HigherOrderParameters;false;M1;(System.String,System.Func<System.String,System.String>);;Argument[0];ReturnValue;value;dfc-generated
     public string M1(string s, Func<string, string> map)
     {
         return s;
     }
 
-    public object M2(Func<object, object> map, object o)
+    // neutral=Models;HigherOrderParameters;Apply;(System.Func<System.Object,System.Object>,System.Object);summary;df-generated
+    // contentbased-summary=Models;HigherOrderParameters;false;Apply;(System.Func<System.Object,System.Object>,System.Object);;Argument[1];Argument[0].Parameter[0];value;dfc-generated
+    // contentbased-summary=Models;HigherOrderParameters;false;Apply;(System.Func<System.Object,System.Object>,System.Object);;Argument[0].ReturnValue;ReturnValue;value;dfc-generated
+    public object Apply(Func<object, object> f, object o)
     {
-        return map(o);
+        return f(o);
+    }
+
+    // neutral=Models;HigherOrderParameters;Apply2;(System.Object,System.Func<System.Object,System.Object,System.Object>);summary;df-generated
+    // contentbased-summary=Models;HigherOrderParameters;false;Apply2;(System.Object,System.Func<System.Object,System.Object,System.Object>);;Argument[0];Argument[1].Parameter[1];value;dfc-generated
+    // contentbased-summary=Models;HigherOrderParameters;false;Apply2;(System.Object,System.Func<System.Object,System.Object,System.Object>);;Argument[1].ReturnValue;ReturnValue;value;dfc-generated
+    public object Apply2(object o, Func<object, object, object> f)
+    {
+        var x = f(null, o);
+        return x;
+    }
+
+    // neutral=Models;HigherOrderParameters;Apply;(System.Action<System.Object>,System.Object);summary;df-generated
+    // contentbased-summary=Models;HigherOrderParameters;false;Apply;(System.Action<System.Object>,System.Object);;Argument[1];Argument[0].Parameter[0];value;dfc-generated
+    public void Apply(Action<object> a, object o)
+    {
+        a(o);
+    }
+}
+
+public static class HigherOrderExtensionMethods
+{
+    // neutral=Models;HigherOrderExtensionMethods;Select<TSource,TResult>;(System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,TResult>);summary;df-generated
+    // contentbased-summary=Models;HigherOrderExtensionMethods;false;Select<TSource,TResult>;(System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,TResult>);;Argument[0].Element;Argument[1].Parameter[0];value;dfc-generated
+    // contentbased-summary=Models;HigherOrderExtensionMethods;false;Select<TSource,TResult>;(System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,TResult>);;Argument[1].ReturnValue;ReturnValue.Element;value;dfc-generated
+    public static IEnumerable<TResult> Select<TSource, TResult>(
+            this IEnumerable<TSource> source,
+            Func<TSource, TResult> selector)
+    {
+        foreach (var item in source)
+        {
+            yield return selector(item);
+        }
     }
 }
 
@@ -552,7 +612,7 @@ public class Inheritance
     public class AImplBasePublic : BasePublic
     {
         // summary=Models;Inheritance+BasePublic;true;Id;(System.String);;Argument[0];ReturnValue;taint;df-generated
-        // contentbased-summary=Models;Inheritance+BasePublic;true;Id;(System.String);;Argument[0];ReturnValue;value;df-generated
+        // contentbased-summary=Models;Inheritance+BasePublic;true;Id;(System.String);;Argument[0];ReturnValue;value;dfc-generated
         public override string Id(string x)
         {
             return x;
@@ -582,7 +642,7 @@ public class Inheritance
     public class BImpl : B
     {
         // summary=Models;Inheritance+IPublic1;true;Id;(System.String);;Argument[0];ReturnValue;taint;df-generated
-        // contentbased-summary=Models;Inheritance+IPublic1;true;Id;(System.String);;Argument[0];ReturnValue;value;df-generated
+        // contentbased-summary=Models;Inheritance+IPublic1;true;Id;(System.String);;Argument[0];ReturnValue;value;dfc-generated
         public override string Id(string x)
         {
             return x;
@@ -592,7 +652,7 @@ public class Inheritance
     private class CImpl : C
     {
         // summary=Models;Inheritance+IPublic2;true;Id;(System.String);;Argument[0];ReturnValue;taint;df-generated
-        // contentbased-summary=Models;Inheritance+IPublic2;true;Id;(System.String);;Argument[0];ReturnValue;value;df-generated
+        // contentbased-summary=Models;Inheritance+IPublic2;true;Id;(System.String);;Argument[0];ReturnValue;value;dfc-generated
         public override string Id(string x)
         {
             return x;
@@ -611,12 +671,43 @@ public class Inheritance
 
     public class DImpl : D
     {
-        private string tainted;
+        private readonly string tainted;
+
+        // summary=Models;Inheritance+DImpl;false;DImpl;(System.String);;Argument[0];Argument[this];taint;df-generated
+        // contentbased-summary=Models;Inheritance+DImpl;false;DImpl;(System.String);;Argument[0];Argument[this].SyntheticField[Models.Inheritance+DImpl.tainted];value;dfc-generated
+        public DImpl(string s)
+        {
+            tainted = s;
+        }
 
         // summary=Models;Inheritance+IPublic3;true;get_Prop;();;Argument[this];ReturnValue;taint;df-generated
-        // contentbased-summary=Models;Inheritance+IPublic3;true;get_Prop;();;Argument[this].SyntheticField[Models.Inheritance+DImpl.tainted];ReturnValue;value;df-generated
+        // contentbased-summary=Models;Inheritance+DImpl;true;get_Prop;();;Argument[this].SyntheticField[Models.Inheritance+DImpl.tainted];ReturnValue;value;dfc-generated
         public override string Prop { get { return tainted; } }
     }
+
+    public abstract class BaseContent
+    {
+        public abstract object GetValue();
+
+        public abstract void SetValue(object o);
+    }
+
+    private class Content1 : BaseContent
+    {
+        private object field;
+
+        // summary=Models;Inheritance+BaseContent;true;GetValue;();;Argument[this];ReturnValue;taint;df-generated
+        public override object GetValue()
+        {
+            return field;
+        }
+
+        // summary=Models;Inheritance+BaseContent;true;SetValue;(System.Object);;Argument[0];Argument[this];taint;df-generated
+        public override void SetValue(object o)
+        {
+            field = o;
+        }
+    }
 }
 
 public class MemberFlow
@@ -629,14 +720,14 @@ public class MemberFlow
     }
 
     // summary=Models;MemberFlow;false;M1;(Models.MemberFlow+C);;Argument[0];ReturnValue;taint;df-generated
-    // contentbased-summary=Models;MemberFlow;false;M1;(Models.MemberFlow+C);;Argument[0].Property[Models.MemberFlow+C.Prop];ReturnValue;value;df-generated
+    // contentbased-summary=Models;MemberFlow;false;M1;(Models.MemberFlow+C);;Argument[0].Property[Models.MemberFlow+C.Prop];ReturnValue;value;dfc-generated
     public string M1(C c)
     {
         return c.Prop;
     }
 
     // summary=Models;MemberFlow;false;M2;(Models.MemberFlow+C);;Argument[0];ReturnValue;taint;df-generated
-    // contentbased-summary=Models;MemberFlow;false;M2;(Models.MemberFlow+C);;Argument[0].Field[Models.MemberFlow+C.Field];ReturnValue;value;df-generated
+    // contentbased-summary=Models;MemberFlow;false;M2;(Models.MemberFlow+C);;Argument[0].Field[Models.MemberFlow+C.Field];ReturnValue;value;dfc-generated
     public string M2(C c)
     {
         return c.Field;
@@ -646,7 +737,7 @@ public class MemberFlow
 public class IDictionaryFlow
 {
     // summary=Models;IDictionaryFlow;false;ReturnIDictionaryValue;(System.Collections.Generic.IDictionary<System.Object,System.Object>,System.Object);;Argument[0].Element;ReturnValue;taint;df-generated
-    // contentbased-summary=Models;IDictionaryFlow;false;ReturnIDictionaryValue;(System.Collections.Generic.IDictionary<System.Object,System.Object>,System.Object);;Argument[0].Element.Property[System.Collections.Generic.KeyValuePair`2.Value];ReturnValue;value;df-generated
+    // contentbased-summary=Models;IDictionaryFlow;false;ReturnIDictionaryValue;(System.Collections.Generic.IDictionary<System.Object,System.Object>,System.Object);;Argument[0].Element.Property[System.Collections.Generic.KeyValuePair`2.Value];ReturnValue;value;dfc-generated
     public object ReturnIDictionaryValue(IDictionary<object, object> input, object key)
     {
         return input[key];
@@ -659,24 +750,287 @@ public class NestedFieldFlow
     public NestedFieldFlow FieldB;
 
     // summary=Models;NestedFieldFlow;false;Move;();;Argument[this];ReturnValue;taint;df-generated
-    // contentbased-summary=Models;NestedFieldFlow;false;Move;();;Argument[this].Field[Models.NestedFieldFlow.FieldA];ReturnValue.Field[Models.NestedFieldFlow.FieldB];value;df-generated
+    // contentbased-summary=Models;NestedFieldFlow;false;Move;();;Argument[this].Field[Models.NestedFieldFlow.FieldA];ReturnValue.Field[Models.NestedFieldFlow.FieldB];value;dfc-generated
     public NestedFieldFlow Move()
     {
         return new NestedFieldFlow() { FieldB = this.FieldA };
     }
 
     // summary=Models;NestedFieldFlow;false;MoveNested;();;Argument[this];ReturnValue;taint;df-generated
-    // contentbased-summary=Models;NestedFieldFlow;false;MoveNested;();;Argument[this].Field[Models.NestedFieldFlow.FieldB].Field[Models.NestedFieldFlow.FieldA];ReturnValue.Field[Models.NestedFieldFlow.FieldA].Field[Models.NestedFieldFlow.FieldB];value;df-generated
+    // contentbased-summary=Models;NestedFieldFlow;false;MoveNested;();;Argument[this].Field[Models.NestedFieldFlow.FieldB].Field[Models.NestedFieldFlow.FieldA];ReturnValue.Field[Models.NestedFieldFlow.FieldA].Field[Models.NestedFieldFlow.FieldB];value;dfc-generated
     public NestedFieldFlow MoveNested()
     {
         return new NestedFieldFlow() { FieldA = FieldB.Move() };
     }
 
     // summary=Models;NestedFieldFlow;false;ReverseFields;();;Argument[this];ReturnValue;taint;df-generated
-    // contentbased-summary=Models;NestedFieldFlow;false;ReverseFields;();;Argument[this].Field[Models.NestedFieldFlow.FieldA].Field[Models.NestedFieldFlow.FieldB];ReturnValue.Field[Models.NestedFieldFlow.FieldA].Field[Models.NestedFieldFlow.FieldB];value;df-generated
+    // contentbased-summary=Models;NestedFieldFlow;false;ReverseFields;();;Argument[this].Field[Models.NestedFieldFlow.FieldA].Field[Models.NestedFieldFlow.FieldB];ReturnValue.Field[Models.NestedFieldFlow.FieldA].Field[Models.NestedFieldFlow.FieldB];value;dfc-generated
     public NestedFieldFlow ReverseFields()
     {
         var x = new NestedFieldFlow() { FieldB = this.FieldA.FieldB };
         return new NestedFieldFlow() { FieldA = x };
     }
 }
+
+public class SyntheticFields
+{
+    private string value1;
+    private string value2;
+    private string value3;
+
+    private string chainBegin;
+    private string chainEnd;
+
+    private string brokenChainBegin;
+    private string brokenChainEnd;
+
+    // summary=Models;SyntheticFields;false;SyntheticFields;(System.String);;Argument[0];Argument[this];taint;df-generated
+    // contentbased-summary=Models;SyntheticFields;false;SyntheticFields;(System.String);;Argument[0];Argument[this].SyntheticField[Models.SyntheticFields.value1];value;dfc-generated
+    public SyntheticFields(string v1)
+    {
+        value1 = v1;
+    }
+
+    // summary=Models;SyntheticFields;false;GetValue1;();;Argument[this];ReturnValue;taint;df-generated
+    // contentbased-summary=Models;SyntheticFields;false;GetValue1;();;Argument[this].SyntheticField[Models.SyntheticFields.value1];ReturnValue;value;dfc-generated
+    public string GetValue1()
+    {
+        return value1;
+    }
+
+    // summary=Models;SyntheticFields;false;GetValue2;();;Argument[this];ReturnValue;taint;df-generated
+    // contentbased-summary=Models;SyntheticFields;false;GetValue2;();;Argument[this].SyntheticField[Models.SyntheticFields.value2];ReturnValue;value;dfc-generated
+    public string GetValue2()
+    {
+        return value2;
+    }
+
+    // summary=Models;SyntheticFields;false;SetValue2;(System.String);;Argument[0];Argument[this];taint;df-generated
+    // contentbased-summary=Models;SyntheticFields;false;SetValue2;(System.String);;Argument[0];Argument[this].SyntheticField[Models.SyntheticFields.value2];value;dfc-generated
+    public void SetValue2(string v2)
+    {
+        value2 = v2;
+    }
+
+    // summary=Models;SyntheticFields;false;SetValue3;(System.String);;Argument[0];Argument[this];taint;df-generated
+    // No content based summary as value3 is a dead synthetic field.
+    public void SetValue3(string v3)
+    {
+        value3 = v3;
+    }
+
+    // summary=Models;SyntheticFields;false;SetChainBegin;(System.String);;Argument[0];Argument[this];taint;df-generated
+    // contentbased-summary=Models;SyntheticFields;false;SetChainBegin;(System.String);;Argument[0];Argument[this].SyntheticField[Models.SyntheticFields.chainBegin];value;dfc-generated
+    public void SetChainBegin(string v)
+    {
+        chainBegin = v;
+    }
+
+    // neutral=Models;SyntheticFields;CopyChainValue;();summary;df-generated
+    // contentbased-summary=Models;SyntheticFields;false;CopyChainValue;();;Argument[this].SyntheticField[Models.SyntheticFields.chainBegin];Argument[this].SyntheticField[Models.SyntheticFields.chainEnd];value;dfc-generated
+    public void CopyChainValue()
+    {
+        chainEnd = chainBegin;
+    }
+
+    // summary=Models;SyntheticFields;false;GetChainEnd;();;Argument[this];ReturnValue;taint;df-generated
+    // contentbased-summary=Models;SyntheticFields;false;GetChainEnd;();;Argument[this].SyntheticField[Models.SyntheticFields.chainEnd];ReturnValue;value;dfc-generated
+    public string GetChainEnd()
+    {
+        return chainEnd;
+    }
+
+    // summary=Models;SyntheticFields;false;SetBrokenChainBegin;(System.String);;Argument[0];Argument[this];taint;df-generated
+    // No content based summary as brokenChainBegin is a dead synthetic field.
+    public void SetBrokenChainBegin(string v)
+    {
+        brokenChainBegin = v;
+    }
+
+    // summary=Models;SyntheticFields;false;GetBrokenChainEnd;();;Argument[this];ReturnValue;taint;df-generated
+    // No content based summary as brokenChainEnd is a dead synthetic field.
+    public string GetBrokenChainEnd()
+    {
+        return brokenChainEnd;
+    }
+
+    public class InnerSyntheticFields
+    {
+        private readonly string value;
+
+        // summary=Models;SyntheticFields+InnerSyntheticFields;false;InnerSyntheticFields;(System.String);;Argument[0];Argument[this];taint;df-generated
+        // contentbased-summary=Models;SyntheticFields+InnerSyntheticFields;false;InnerSyntheticFields;(System.String);;Argument[0];Argument[this].SyntheticField[Models.SyntheticFields+InnerSyntheticFields.value];value;dfc-generated
+        public InnerSyntheticFields(string v)
+        {
+            value = v;
+        }
+
+        // summary=Models;SyntheticFields+InnerSyntheticFields;false;GetValue;();;Argument[this];ReturnValue;taint;df-generated
+        // contentbased-summary=Models;SyntheticFields+InnerSyntheticFields;false;GetValue;();;Argument[this].SyntheticField[Models.SyntheticFields+InnerSyntheticFields.value];ReturnValue;value;dfc-generated
+        public string GetValue()
+        {
+            return value;
+        }
+    }
+
+    // summary=Models;SyntheticFields;false;MakeInner;(System.String);;Argument[0];ReturnValue;taint;df-generated
+    // contentbased-summary=Models;SyntheticFields;false;MakeInner;(System.String);;Argument[0];ReturnValue.SyntheticField[Models.SyntheticFields+InnerSyntheticFields.value];value;dfc-generated
+    public InnerSyntheticFields MakeInner(string v)
+    {
+        return new InnerSyntheticFields(v);
+    }
+}
+
+public class SyntheticProperties
+{
+    private string Prop1 { get; set; }
+
+    private string Prop2 { get; set; }
+
+    // summary=Models;SyntheticProperties;false;SyntheticProperties;(System.String);;Argument[0];Argument[this];taint;df-generated
+    // contentbased-summary=Models;SyntheticProperties;false;SyntheticProperties;(System.String);;Argument[0];Argument[this].SyntheticField[Models.SyntheticProperties.Prop1];value;dfc-generated
+    public SyntheticProperties(string v1)
+    {
+        Prop1 = v1;
+    }
+
+    // summary=Models;SyntheticProperties;false;GetProp1;();;Argument[this];ReturnValue;taint;df-generated
+    // contentbased-summary=Models;SyntheticProperties;false;GetProp1;();;Argument[this].SyntheticField[Models.SyntheticProperties.Prop1];ReturnValue;value;dfc-generated
+    public string GetProp1()
+    {
+        return Prop1;
+    }
+
+    // summary=Models;SyntheticProperties;false;SetProp2;(System.String);;Argument[0];Argument[this];taint;df-generated
+    // No content based summary as Prop2 is a dead synthetic field.
+    public void SetProp2(string v)
+    {
+        Prop2 = v;
+    }
+}
+
+public class SyntheticCollections
+{
+    private object[] array;
+
+    // summary=Models;SyntheticCollections;false;SyntheticCollections;(System.Object[]);;Argument[0].Element;Argument[this];taint;df-generated
+    // contentbased-summary=Models;SyntheticCollections;false;SyntheticCollections;(System.Object[]);;Argument[0];Argument[this].SyntheticField[Models.SyntheticCollections.array];value;dfc-generated
+    public SyntheticCollections(object[] array)
+    {
+        this.array = array;
+    }
+
+    // summary=Models;SyntheticCollections;false;GetElement;(System.Int32);;Argument[this];ReturnValue;taint;df-generated
+    // contentbased-summary=Models;SyntheticCollections;false;GetElement;(System.Int32);;Argument[this].SyntheticField[Models.SyntheticCollections.array].Element;ReturnValue;value;dfc-generated
+    public object GetElement(int index)
+    {
+        return array[index];
+    }
+}
+
+public class Fanout
+{
+
+    public abstract class Base1
+    {
+        public abstract string GetValue();
+    }
+
+    public abstract class Base2 : Base1 { }
+
+    public class Impl1 : Base1
+    {
+        public string Prop { get; set; }
+
+        // summary=Models;Fanout+Base1;true;GetValue;();;Argument[this];ReturnValue;taint;df-generated
+        // contentbased-summary=Models;Fanout+Impl1;true;GetValue;();;Argument[this].Property[Models.Fanout+Impl1.Prop];ReturnValue;value;dfc-generated
+        public override string GetValue()
+        {
+            return Prop;
+        }
+    }
+
+    public class Impl2 : Base2
+    {
+        public string Prop { get; set; }
+
+        // summary=Models;Fanout+Base1;true;GetValue;();;Argument[this];ReturnValue;taint;df-generated
+        // contentbased-summary=Models;Fanout+Impl2;true;GetValue;();;Argument[this].Property[Models.Fanout+Impl2.Prop];ReturnValue;value;dfc-generated
+        public override string GetValue()
+        {
+            return Prop;
+        }
+    }
+
+    public class Impl3 : Base2
+    {
+        public string Prop { get; set; }
+
+        // summary=Models;Fanout+Base1;true;GetValue;();;Argument[this];ReturnValue;taint;df-generated
+        // contentbased-summary=Models;Fanout+Impl3;true;GetValue;();;Argument[this].Property[Models.Fanout+Impl3.Prop];ReturnValue;value;dfc-generated
+        public override string GetValue()
+        {
+            return Prop;
+        }
+    }
+
+    public class Impl4 : Base2
+    {
+        public string Prop { get; set; }
+
+        // summary=Models;Fanout+Base1;true;GetValue;();;Argument[this];ReturnValue;taint;df-generated
+        // contentbased-summary=Models;Fanout+Impl4;true;GetValue;();;Argument[this].Property[Models.Fanout+Impl4.Prop];ReturnValue;value;dfc-generated
+        public override string GetValue()
+        {
+            return Prop;
+        }
+    }
+
+    // summary=Models;Fanout;false;ConcatValueOnBase1;(System.String,Models.Fanout+Base1);;Argument[0];ReturnValue;taint;df-generated
+    // summary=Models;Fanout;false;ConcatValueOnBase1;(System.String,Models.Fanout+Base1);;Argument[1];ReturnValue;taint;df-generated
+    // No content based summaries are expected for this method on parameter `b1`
+    // as the fanout (number of content flows) exceeds the limit of 3.
+    // contentbased-summary=Models;Fanout;false;ConcatValueOnBase1;(System.String,Models.Fanout+Base1);;Argument[0];ReturnValue;taint;dfc-generated
+    public string ConcatValueOnBase1(string other, Base1 b1)
+    {
+        return other + b1.GetValue();
+    }
+
+    // summary=Models;Fanout;false;ConcatValueOnBase2;(System.String,Models.Fanout+Base2);;Argument[0];ReturnValue;taint;df-generated
+    // summary=Models;Fanout;false;ConcatValueOnBase2;(System.String,Models.Fanout+Base2);;Argument[1];ReturnValue;taint;df-generated
+    // contentbased-summary=Models;Fanout;false;ConcatValueOnBase2;(System.String,Models.Fanout+Base2);;Argument[0];ReturnValue;taint;dfc-generated
+    // contentbased-summary=Models;Fanout;false;ConcatValueOnBase2;(System.String,Models.Fanout+Base2);;Argument[1].Property[Models.Fanout+Impl2.Prop];ReturnValue;taint;dfc-generated
+    // contentbased-summary=Models;Fanout;false;ConcatValueOnBase2;(System.String,Models.Fanout+Base2);;Argument[1].Property[Models.Fanout+Impl3.Prop];ReturnValue;taint;dfc-generated
+    // contentbased-summary=Models;Fanout;false;ConcatValueOnBase2;(System.String,Models.Fanout+Base2);;Argument[1].Property[Models.Fanout+Impl4.Prop];ReturnValue;taint;dfc-generated
+    public string ConcatValueOnBase2(string other, Base2 b2)
+    {
+        return other + b2.GetValue();
+    }
+}
+
+public class AvoidDuplicateLifted
+{
+    public class A
+    {
+        public object Prop { get; set; }
+
+        // contentbased-summary=Models;AvoidDuplicateLifted+A;true;GetValue;();;Argument[this].Property[Models.AvoidDuplicateLifted+A.Prop];ReturnValue;value;dfc-generated
+        // summary=Models;AvoidDuplicateLifted+A;true;GetValue;();;Argument[this];ReturnValue;taint;df-generated
+        public virtual object GetValue()
+        {
+            return Prop;
+        }
+    }
+
+    public class B : A
+    {
+        private object field;
+
+        // No content based summary as field is a dead synthetic field.
+        // summary=Models;AvoidDuplicateLifted+A;true;GetValue;();;Argument[this];ReturnValue;taint;df-generated
+        public override object GetValue()
+        {
+            return field;
+        }
+    }
+}
diff --git a/csharp/scripts/create-extractor-pack.sh b/csharp/scripts/create-extractor-pack.sh
index 7eb2b753471..c3e6090a635 100755
--- a/csharp/scripts/create-extractor-pack.sh
+++ b/csharp/scripts/create-extractor-pack.sh
@@ -21,7 +21,7 @@ mkdir -p extractor-pack
 mkdir -p extractor-pack/tools/${platform}
 
 function dotnet_publish {
-  dotnet publish --self-contained --configuration Release --runtime ${dotnet_platform} -p:RuntimeFrameworkVersion=8.0.1 $1 --output extractor-pack/tools/${platform}
+  dotnet publish --self-contained --configuration Release --runtime ${dotnet_platform} -p:RuntimeFrameworkVersion=9.0.0 $1 --output extractor-pack/tools/${platform}
 }
 
 dotnet tool restore
diff --git a/csharp/scripts/gen-assembly-info.py b/csharp/scripts/gen-assembly-info.py
index fe24524eb10..ca88f5e1683 100644
--- a/csharp/scripts/gen-assembly-info.py
+++ b/csharp/scripts/gen-assembly-info.py
@@ -28,7 +28,7 @@ using System.Reflection;
 [assembly: AssemblyCompany("GitHub")]
 [assembly: AssemblyCopyright("Copyright © 2024 GitHub")]
 
-[assembly: System.Runtime.Versioning.TargetFramework(".NETCoreApp,Version=v8.0", FrameworkDisplayName = ".NET 8.0")]
+[assembly: System.Runtime.Versioning.TargetFramework(".NETCoreApp,Version=v9.0", FrameworkDisplayName = ".NET 9.0")]
 
 """
 output_file.write_text(output_file_contents)
diff --git a/csharp/scripts/stubs/helpers.py b/csharp/scripts/stubs/helpers.py
index 33b8f2663f8..d1f3bdb59c2 100644
--- a/csharp/scripts/stubs/helpers.py
+++ b/csharp/scripts/stubs/helpers.py
@@ -56,7 +56,7 @@ def remove_files(path, ext):
 def write_csproj_prefix(ioWrapper):
     ioWrapper.write('<Project Sdk="Microsoft.NET.Sdk">\n')
     ioWrapper.write('  <PropertyGroup>\n')
-    ioWrapper.write('    <TargetFramework>net8.0</TargetFramework>\n')
+    ioWrapper.write('    <TargetFramework>net9.0</TargetFramework>\n')
     ioWrapper.write('    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>\n')
     ioWrapper.write('    <OutputPath>bin\</OutputPath>\n')
     ioWrapper.write(
@@ -73,7 +73,7 @@ class Generator:
         self.projectDirIn = os.path.join(self.workDir, self.projectNameIn)
         self.template = template
         print("\n* Creating new input project")
-        self.run_cmd(['dotnet', 'new', self.template, "-f", "net8.0", "--language", "C#", '--name',
+        self.run_cmd(['dotnet', 'new', self.template, "-f", "net9.0", "--language", "C#", '--name',
                          self.projectNameIn, '--output', self.projectDirIn])
         remove_files(self.projectDirIn, '.cs')
 
@@ -118,7 +118,7 @@ class Generator:
         bqrsFile = os.path.join(rawOutputDir, outputName + '.bqrs')
         jsonFile = os.path.join(rawOutputDir, outputName + '.json')
 
-        sdk_version = '8.0.101'
+        sdk_version = '9.0.100'
         print("\n* Creating new global.json file and setting SDK to " + sdk_version)
         self.run_cmd(['dotnet', 'new', 'globaljson', '--force', '--sdk-version', sdk_version, '--output', self.workDir])
 
diff --git a/docs/codeql/_templates/layout.html b/docs/codeql/_templates/layout.html
index 779c99cfe9f..5b234423b67 100644
--- a/docs/codeql/_templates/layout.html
+++ b/docs/codeql/_templates/layout.html
@@ -60,22 +60,22 @@
                 <div class="dropdown-caret"></div>
             </summary>
             <ul class="dropdown-menu dropdown-menu-se dropdown-menu-dark">
-                <li><a class="dropdown-item" href="codeql-overview">CodeQL overview</a></li>
+                <li><a class="dropdown-item" href="https://codeql.github.com/docs/codeql-overview">CodeQL overview</a></li>
                 <li class="dropdown-divider" role="separator"></li>
                 <div class="dropdown-header">
                     CodeQL guides
                 </div>
-                <li><a class="dropdown-item" href="writing-codeql-queries">Writing CodeQL queries</a></li>
-                <li><a class="dropdown-item" href="codeql-language-guides">CodeQL language guides</a>
+                <li><a class="dropdown-item" href="https://codeql.github.com/docs/writing-codeql-queries">Writing CodeQL queries</a></li>
+                <li><a class="dropdown-item" href="https://codeql.github.com/docs/codeql-language-guides">CodeQL language guides</a>
                 <li class="dropdown-divider" role="separator"></li>
                 <div class="dropdown-header">
                     Reference docs
                 </div>
-                <li><a class="dropdown-item" href="ql-language-reference/">QL language
+                <li><a class="dropdown-item" href="https://codeql.github.com/docs/ql-language-reference/">QL language
                         reference</a>
-                <li><a class="dropdown-item" href="../codeql-standard-libraries">CodeQL
+                <li><a class="dropdown-item" href="https://codeql.github.com/codeql-standard-libraries">CodeQL
                         standard-libraries</a>
-                <li><a class="dropdown-item" href="../codeql-query-help">CodeQL
+                <li><a class="dropdown-item" href="https://codeql.github.com/codeql-query-help">CodeQL
                         query help</a>
                 <li class="dropdown-divider" role="separator"></li>
                 <div class="dropdown-header">
@@ -86,7 +86,7 @@
                 <div class="dropdown-header">
                     Academic
                 </div>
-                <li><a class="dropdown-item" href="../publications">QL publications</a>
+                <li><a class="dropdown-item" href="https://codeql.github.com/publications">QL publications</a>
             </ul>
         </details>
 
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 b062c66bcca..b4a3446e942 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
@@ -506,7 +506,7 @@ Kinds
 Source kinds
 ~~~~~~~~~~~~
 
-- **remote**: A generic source of remote flow. Most taint-tracking queries will use such a source. Currently this is the only supported source kind.
+See documentation below for :ref:`Threat models <threat-models-javascript>`.
 
 Sink kinds
 ~~~~~~~~~~
@@ -529,3 +529,10 @@ Summary kinds
 
 - **taint**: A summary that propagates taint. This means the output is not necessarily equal to the input, but it was derived from the input in an unrestrictive way. An attacker who controls the input will have significant control over the output as well.
 - **value**: A summary that preserves the value of the input or creates a copy of the input such that all of its object properties are preserved.
+
+.. _threat-models-javascript:
+
+Threat models
+-------------
+
+.. include:: ../reusables/threat-model-description.rst
diff --git a/docs/codeql/codeql-language-guides/customizing-library-models-for-python.rst b/docs/codeql/codeql-language-guides/customizing-library-models-for-python.rst
index a244bd00f54..30888f7b609 100644
--- a/docs/codeql/codeql-language-guides/customizing-library-models-for-python.rst
+++ b/docs/codeql/codeql-language-guides/customizing-library-models-for-python.rst
@@ -427,7 +427,7 @@ Kinds
 Source kinds
 ~~~~~~~~~~~~
 
-- **remote**: A generic source of remote flow. Most taint-tracking queries will use such a source. Currently this is the only supported source kind.
+See documentation below for :ref:`Threat models <threat-models-python>`.
 
 Sink kinds
 ~~~~~~~~~~
@@ -449,3 +449,10 @@ Summary kinds
 
 - **taint**: A summary that propagates taint. This means the output is not necessarily equal to the input, but it was derived from the input in an unrestrictive way. An attacker who controls the input will have significant control over the output as well.
 - **value**: A summary that preserves the value of the input or creates a copy of the input such that all of its object properties are preserved.
+
+.. _threat-models-python:
+
+Threat models
+-------------
+
+.. include:: ../reusables/threat-model-description.rst
diff --git a/docs/codeql/codeql-language-guides/extensible-predicates.rst b/docs/codeql/codeql-language-guides/extensible-predicates.rst
index 7b00f09785e..7d5f6d8c9cc 100644
--- a/docs/codeql/codeql-language-guides/extensible-predicates.rst
+++ b/docs/codeql/codeql-language-guides/extensible-predicates.rst
@@ -27,8 +27,8 @@ This example of an extensible predicate for a source is taken from the core Java
 .. code-block:: ql
 
     extensible predicate sourceModel(
-      string package, string type, boolean subtypes, string name, 
-      string signature, string ext, string output, string kind, 
+      string package, string type, boolean subtypes, string name,
+      string signature, string ext, string output, string kind,
       string provenance
     );
 
@@ -36,7 +36,7 @@ An extensible predicate is a CodeQL predicate with the following restrictions:
 
 - It uses the ``extensible`` keyword.
 - It has no body.
-- All predicate parameters have primitive types.
+- All predicate parameters have type ``string``, ``int``, ``float``, ``boolean``, or ``date``.
 - It is not in a module.
 
 Columns shared by all extensible predicates
diff --git a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.19.0.rst b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.19.0.rst
new file mode 100644
index 00000000000..0184b811817
--- /dev/null
+++ b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.19.0.rst
@@ -0,0 +1,197 @@
+.. _codeql-cli-2.19.0:
+
+==========================
+CodeQL 2.19.0 (2024-09-18)
+==========================
+
+.. contents:: Contents
+   :depth: 2
+   :local:
+   :backlinks: none
+
+This is an overview of changes in the CodeQL CLI and relevant CodeQL query and library packs. For additional updates on changes to the CodeQL code scanning experience, check out the `code scanning section on the GitHub blog <https://github.blog/tag/code-scanning/>`__, `relevant GitHub Changelog updates <https://github.blog/changelog/label/code-scanning/>`__, `changes in the CodeQL extension for Visual Studio Code <https://marketplace.visualstudio.com/items/GitHub.vscode-codeql/changelog>`__, and the `CodeQL Action changelog <https://github.com/github/codeql-action/blob/main/CHANGELOG.md>`__.
+
+Security Coverage
+-----------------
+
+CodeQL 2.19.0 runs a total of 426 security queries when configured with the Default suite (covering 164 CWE). The Extended suite enables an additional 128 queries (covering 34 more CWE). 1 security query has been added with this release.
+
+CodeQL CLI
+----------
+
+Improvements
+~~~~~~~~~~~~
+
+*   :code:`codeql database analyze` and :code:`codeql database interpret-results` now support the :code:`--sarif-run-property` option. You can provide this option when using a SARIF output format to add a key-value pair to the property bag of the run object.
+
+Miscellaneous
+~~~~~~~~~~~~~
+
+*   The build of Eclipse Temurin OpenJDK that is used to run the CodeQL CLI has been updated to version 21.0.4.
+
+Query Packs
+-----------
+
+Major Analysis Improvements
+~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+JavaScript/TypeScript
+"""""""""""""""""""""
+
+*   Added a new query (:code:`js/actions/actions-artifact-leak`) to detect GitHub Actions artifacts that may leak the GITHUB_TOKEN token.
+
+Minor Analysis Improvements
+~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+C/C++
+"""""
+
+*   Removed false positives caused by buffer accesses in unreachable code
+*   Removed false positives caused by inconsistent type checking
+*   Add modeling of C functions that don't throw, thereby increasing the precision of the :code:`cpp/incorrect-allocation-error-handling` ("Incorrect allocation-error handling") query. The query now produces additional true positives.
+
+Python
+""""""
+
+*   The :code:`py/clear-text-logging-sensitive-data` and :code:`py/clear-text-storage-sensitive-data` queries have been updated to exclude the :code:`certificate` classification of sensitive sources, which often do not contain sensitive data.
+
+Language Libraries
+------------------
+
+Bug Fixes
+~~~~~~~~~
+
+Golang
+""""""
+
+*   Golang vendor directories not at the root of a repository are now correctly excluded from the baseline Go file count. This means code coverage information will be more accurate.
+
+Breaking Changes
+~~~~~~~~~~~~~~~~
+
+C/C++
+"""""
+
+*   Deleted many deprecated taint-tracking configurations based on :code:`TaintTracking::Configuration`.
+*   Deleted many deprecated dataflow configurations based on :code:`DataFlow::Configuration`.
+*   Deleted the deprecated :code:`hasQualifiedName` and :code:`isDefined` predicates from the :code:`Declaration` class, use :code:`hasGlobalName` and :code:`hasDefinition` respectively instead.
+*   Deleted the :code:`getFullSignature` predicate from the :code:`Function` class, use :code:`getIdentityString(Declaration)` from :code:`semmle.code.cpp.Print` instead.
+*   Deleted the deprecated :code:`freeCall` predicate from :code:`Alloc.qll`. Use :code:`DeallocationExpr` instead.
+*   Deleted the deprecated :code:`explorationLimit` predicate from :code:`DataFlow::Configuration`, use :code:`FlowExploration<explorationLimit>` instead.
+*   Deleted the deprecated :code:`getFieldExpr` predicate from :code:`ClassAggregateLiteral`, use :code:`getAFieldExpr` instead.
+*   Deleted the deprecated :code:`getElementExpr` predicate from :code:`ArrayOrVectorAggregateLiteral`, use :code:`getAnElementExpr` instead.
+
+C#
+""
+
+*   Deleted many deprecated taint-tracking configurations based on :code:`TaintTracking::Configuration`.
+*   Deleted many deprecated dataflow configurations based on :code:`DataFlow::Configuration`.
+*   Deleted the deprecated :code:`explorationLimit` predicate from :code:`DataFlow::Configuration`, use :code:`FlowExploration<explorationLimit>` instead.
+
+Golang
+""""""
+
+*   Deleted many deprecated taint-tracking configurations based on :code:`TaintTracking::Configuration`.
+*   Deleted the deprecated :code:`explorationLimit` predicate from :code:`DataFlow::Configuration`, use :code:`FlowExploration<explorationLimit>` instead.
+
+Java/Kotlin
+"""""""""""
+
+*   Deleted the deprecated :code:`ProcessBuilderConstructor`, :code:`MethodProcessBuilderCommand`, and :code:`MethodRuntimeExec` from :code:`JDK.qll`.
+*   Deleted the deprecated :code:`explorationLimit` predicate from :code:`DataFlow::Configuration`, use :code:`FlowExploration<explorationLimit>` instead.
+*   Deleted many deprecated taint-tracking configurations based on :code:`TaintTracking::Configuration`.
+*   Deleted the deprecated :code:`getURI` predicate from :code:`CamelJavaDslToDecl` and :code:`SpringCamelXmlToElement`, use :code:`getUri` instead.
+*   Deleted the deprecated :code:`ExecCallable` class from :code:`ExternalProcess.qll`.
+*   Deleted many deprecated dataflow configurations based on :code:`DataFlow::Configuration`.
+*   Deleted the deprecated :code:`PathCreation.qll` file.
+*   Deleted the deprecated :code:`WebviewDubuggingEnabledQuery.qll` file.
+
+JavaScript/TypeScript
+"""""""""""""""""""""
+
+*   Deleted the deprecated :code:`isHTMLElement` and :code:`getDOMName` predicates from the JSX library, use :code:`isHtmlElement` and :code:`getDomName` respectively instead.
+*   Deleted the deprecated :code:`getPackageJSON` predicate from the :code:`SourceMappingComment` class, use :code:`SourceMappingComment` instead.
+*   Deleted many deprecated directives from the :code:`Stmt.qll` file, use the :code:`Directive::` module instead.
+*   Deleted the deprecated :code:`YAMLNode`, :code:`YAMLValue`, and :code:`YAMLScalar` classes from the YAML libraries, use :code:`YamlNode`, :code:`YamlValue`, and :code:`YamlScalar` respectively instead.
+*   Deleted the deprecated :code:`getARouteHandlerExpr` predicate from :code:`Connect.qll`, use :code:`getARouteHandlerNode` instead.
+*   Deleted the deprecated :code:`getGWTVersion` predicate from :code:`GWT.qll`, use :code:`getGwtVersion` instead.
+*   Deleted the deprecated :code:`getOwnOptionsObject` predicate from  :code:`Vue.qll`, use :code:`getOwnOptions().getASink()` instead.
+
+Python
+""""""
+
+*   Deleted the deprecated :code:`explorationLimit` predicate from :code:`DataFlow::Configuration`, use :code:`FlowExploration<explorationLimit>` instead.
+*   Deleted the deprecated :code:`semmle.python.RegexTreeView` module, use :code:`semmle.python.regexp.RegexTreeView` instead.
+*   Deleted the deprecated :code:`RegexString` class from  :code:`regex.qll`.
+*   Deleted the deprecated :code:`Regex` class, use :code:`RegExp` instead.
+*   Deleted the deprecated :code:`semmle/python/security/SQL.qll` file.
+*   Deleted the deprecated :code:`useSSL` predicates from the LDAP libraries, use :code:`useSsl` instead.
+
+Ruby
+""""
+
+*   Deleted the deprecated :code:`getURL` predicate the :code:`Http::Request` class, use :code:`getAUrlPart` instead.
+*   Deleted the deprecated :code:`getNode` predicate from the :code:`CfgNode` class, use :code:`getAstNode` instead.
+*   Deleted the deprecated :code:`explorationLimit` predicate from :code:`DataFlow::Configuration`, use :code:`FlowExploration<explorationLimit>` instead.
+*   Deleted many deprecated dataflow configurations based on :code:`DataFlow::Configuration`.
+*   Deleted many deprecated taint-tracking configurations based on :code:`TaintTracking::Configuration`.
+
+Swift
+"""""
+
+*   Deleted the deprecated :code:`explorationLimit` predicate from :code:`DataFlow::Configuration`, use :code:`FlowExploration<explorationLimit>` instead.
+*   Deleted the deprecated :code:`getDerivedTypeDecl` predicate from the :code:`TypeDecl` class, use :code:`getADerivedTypeDecl` or :code:`getABaseTypeDecl` instead.
+
+Major Analysis Improvements
+~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Java/Kotlin
+"""""""""""
+
+*   A generated (Models as Data) summary model is no longer used, if there exists a source code alternative. This primarily affects the analysis, when the analysis includes generated models for the source code being analysed.
+
+JavaScript/TypeScript
+"""""""""""""""""""""
+
+*   Added support for TypeScript 5.6.
+
+Minor Analysis Improvements
+~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+C/C++
+"""""
+
+*   Added a data flow model for :code:`swap` member functions, which were previously modeled as taint tracking functions. This change improves the precision of queries where flow through :code:`swap` member functions might affect the results.
+*   Added a data flow model for :code:`realloc`\ -like functions, which were previously modeled as a taint tracking functions. This change improves the precision of queries where flow through :code:`realloc`\ -like functions might affect the results.
+
+C#
+""
+
+*   Parameters of public methods in abstract controller-like classes are now considered remote flow sources.
+*   The reported location of :code:`partial` methods has been changed from the definition to the implementation part.
+
+Golang
+""""""
+
+*   When a function or type has more than one anonymous type parameters, they were mistakenly being treated as the same type parameter. This has now been fixed.
+*   Local source models for reading and parsing environment variables have been added for the following libraries:
+
+    *   os
+    *   syscall
+    *   github.com/caarlos0/env
+    *   github.com/gobuffalo/envy
+    *   github.com/hashicorp/go-envparse
+    *   github.com/joho/godotenv
+    *   github.com/kelseyhightower/envconfig
+    
+*   Local source models have been added for the APIs which open files in the :code:`io/fs`, :code:`io/ioutil` and :code:`os` packages in the Go standard library. You can optionally include threat models as appropriate when using the CodeQL CLI and in GitHub code scanning. For more information, see `Analyzing your code with CodeQL queries <https://docs.github.com/code-security/codeql-cli/getting-started-with-the-codeql-cli/analyzing-your-code-with-codeql-queries#including-model-packs-to-add-potential-sources-of-tainted-data%3E>`__ and `Customizing your advanced setup for code scanning <https://docs.github.com/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/customizing-your-advanced-setup-for-code-scanning#extending-codeql-coverage-with-threat-models>`__.
+
+New Features
+~~~~~~~~~~~~
+
+C/C++
+"""""
+
+*   Added a class :code:`C11GenericExpr` to represent C11 generic selection expressions. The generic selection is represented as a :code:`Conversion` on the expression that will be selected.
+*   Added subclasses of :code:`BuiltInOperations` for the :code:`__is_scoped_enum`, :code:`__is_trivially_equality_comparable`, and :code:`__is_trivially_relocatable` builtin operations.
+*   Added a subclass of :code:`Expr` for :code:`__datasizeof` expressions.
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
new file mode 100644
index 00000000000..352a229a422
--- /dev/null
+++ b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.19.1.rst
@@ -0,0 +1,137 @@
+.. _codeql-cli-2.19.1:
+
+==========================
+CodeQL 2.19.1 (2024-10-04)
+==========================
+
+.. contents:: Contents
+   :depth: 2
+   :local:
+   :backlinks: none
+
+This is an overview of changes in the CodeQL CLI and relevant CodeQL query and library packs. For additional updates on changes to the CodeQL code scanning experience, check out the `code scanning section on the GitHub blog <https://github.blog/tag/code-scanning/>`__, `relevant GitHub Changelog updates <https://github.blog/changelog/label/code-scanning/>`__, `changes in the CodeQL extension for Visual Studio Code <https://marketplace.visualstudio.com/items/GitHub.vscode-codeql/changelog>`__, and the `CodeQL Action changelog <https://github.com/github/codeql-action/blob/main/CHANGELOG.md>`__.
+
+Security Coverage
+-----------------
+
+CodeQL 2.19.1 runs a total of 426 security queries when configured with the Default suite (covering 164 CWE). The Extended suite enables an additional 128 queries (covering 34 more CWE).
+
+CodeQL CLI
+----------
+
+New Features
+~~~~~~~~~~~~
+
+*   The command :code:`codeql generate query-help` now supports Markdown help files.
+    The Markdown help format is commonly used in custom CodeQL query packs. This new feature allows us to generate SARIF reporting descriptors for CodeQL queries that include Markdown help directly from a query Markdown help file.
+    
+*   Added a new command, :code:`codeql resolve packs`. This command shows each step in the pack search process, including what packs were found in each step. With the
+    :code:`--show-hidden-packs` option, it can also show details on which packs were hidden by packs found earlier in the search sequence. :code:`codeql resolve packs` is intended as a replacement for most uses of :code:`codeql resolve qlpacks`, whose output is both less detailed and less accurate.
+
+Query Packs
+-----------
+
+Minor Analysis Improvements
+~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+C/C++
+"""""
+
+*   Fixed false positives in the :code:`cpp/wrong-number-format-arguments` ("Too few arguments to formatting function") query when the formatting function has been declared implicitly.
+
+C#
+""
+
+*   C#: The indexer and :code:`Add` method on :code:`System.Web.UI.AttributeCollection` is no longer considered an HTML sink.
+
+Java/Kotlin
+"""""""""""
+
+*   Added taint summary model for :code:`org.springframework.core.io.InputStreamSource#getInputStream()`.
+
+New Queries
+~~~~~~~~~~~
+
+Python
+""""""
+
+*   The experimental :code:`py/cors-misconfiguration-with-credentials` query, which finds insecure CORS middleware configurations.
+
+Query Metadata Changes
+~~~~~~~~~~~~~~~~~~~~~~
+
+Golang
+""""""
+
+*   The precision of the :code:`go/incorrect-integer-conversion-query` query was decreased from :code:`very-high` to :code:`high`, since there is at least one known class of false positives involving dynamic bounds checking.
+
+Language Libraries
+------------------
+
+Breaking Changes
+~~~~~~~~~~~~~~~~
+
+C#
+""
+
+*   C#: Add support for MaD directly on properties and indexers using *attributes*. Using :code:`Attribute.Getter` or :code:`Attribute.Setter` in the model :code:`ext` field applies the model to the getter or setter for properties and indexers. Prior to this change :code:`Attribute` models unintentionally worked for property setters (if the property is decorated with the matching attribute). That is, a model that uses the :code:`Attribute` feature directly on a property for a property setter needs to be changed to :code:`Attribute.Setter`.
+*   C#: Remove all CIL tables and related QL library functionality.
+
+Minor Analysis Improvements
+~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+C#
+""
+
+*   :code:`DataFlow::Node` instances are no longer created for library methods and fields that are not callable (either statically or dynamically) or otherwise referred to from source code. This may affect third-party queries that use these nodes to identify library methods or fields that are present in DLL files where those methods or fields are unreferenced. If this presents a problem, consider using :code:`Callable` and other non-dataflow classes to identify such library entities.
+*   C#: Add extractor support for attributes on indexers.
+
+Golang
+""""""
+
+*   A method in the method set of an embedded field of a struct should not be promoted to the method set of the struct if the struct has a method with the same name. This was not being enforced, which meant that there were two methods with the same qualified name, and models were sometimes being applied when they shouldn't have been. This has now been fixed.
+
+Python
+""""""
+
+*   The common sanitizer guard :code:`StringConstCompareBarrier` has been renamed to :code:`ConstCompareBarrier` and expanded to cover comparisons with other constant values such as :code:`None`. This may result in fewer false positive results for several queries.
+
+Swift
+"""""
+
+*   All AST classes in :code:`codeql.swift.elements` are now :code:`final`, which means that it is no longer possible to :code:`override` predicates defined in those classes (it is, however, still possible to :code:`extend` the classes).
+
+Deprecated APIs
+~~~~~~~~~~~~~~~
+
+C#
+""
+
+*   The class :code:`ThreatModelFlowSource` has been renamed to :code:`ActiveThreatModelSource` to more clearly reflect it only contains the currently active threat model sources. :code:`ThreatModelFlowSource` has been marked as deprecated.
+
+Golang
+""""""
+
+*   The class :code:`ThreatModelFlowSource` has been renamed to :code:`ActiveThreatModelSource` to more clearly reflect it only contains the currently active threat model sources. :code:`ThreatModelFlowSource` has been marked as deprecated.
+
+Java/Kotlin
+"""""""""""
+
+*   The :code:`Field.getSourceDeclaration()` predicate has been deprecated. The result was always the original field, so calls to it can simply be removed.
+*   The :code:`Field.isSourceDeclaration()` predicate has been deprecated. It always holds.
+*   The :code:`RefType.nestedName()` predicate has been deprecated, and :code:`RefType.getNestedName()` added to replace it.
+*   The class :code:`ThreatModelFlowSource` has been renamed to :code:`ActiveThreatModelSource` to more clearly reflect it only contains the currently active threat model sources. :code:`ThreatModelFlowSource` has been marked as deprecated.
+
+New Features
+~~~~~~~~~~~~
+
+Java/Kotlin
+"""""""""""
+
+*   The Java extractor and QL libraries now support Java 23.
+*   Kotlin versions up to 2.1.0\ *x* are now supported.
+
+Python
+""""""
+
+*   Added support for custom threat-models, which can be used in most of our taint-tracking queries, see our `documentation <https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/customizing-your-advanced-setup-for-code-scanning#extending-codeql-coverage-with-threat-models>`__ for more details.
diff --git a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.19.2.rst b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.19.2.rst
new file mode 100644
index 00000000000..88370866a5f
--- /dev/null
+++ b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.19.2.rst
@@ -0,0 +1,90 @@
+.. _codeql-cli-2.19.2:
+
+==========================
+CodeQL 2.19.2 (2024-10-21)
+==========================
+
+.. contents:: Contents
+   :depth: 2
+   :local:
+   :backlinks: none
+
+This is an overview of changes in the CodeQL CLI and relevant CodeQL query and library packs. For additional updates on changes to the CodeQL code scanning experience, check out the `code scanning section on the GitHub blog <https://github.blog/tag/code-scanning/>`__, `relevant GitHub Changelog updates <https://github.blog/changelog/label/code-scanning/>`__, `changes in the CodeQL extension for Visual Studio Code <https://marketplace.visualstudio.com/items/GitHub.vscode-codeql/changelog>`__, and the `CodeQL Action changelog <https://github.com/github/codeql-action/blob/main/CHANGELOG.md>`__.
+
+Security Coverage
+-----------------
+
+CodeQL 2.19.2 runs a total of 427 security queries when configured with the Default suite (covering 164 CWE). The Extended suite enables an additional 128 queries (covering 34 more CWE). 1 security query has been added with this release.
+
+CodeQL CLI
+----------
+
+Potentially Breaking Changes
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+*   The Python extractor will no longer extract the standard library by default, relying instead on models of the standard library. This should result in significantly faster extraction and analysis times, while the effect on alerts should be minimal. It will for a while be possible to force extraction of the standard library by setting the environment variable :code:`CODEQL_EXTRACTOR_PYTHON_EXTRACT_STDLIB` to :code:`1`.
+
+Bug Fixes
+~~~~~~~~~
+
+*   The 2.19.1 release contained a bug in the query evaluator that under rare conditions could lead to wrong alerts or resource exhaustion. Although we have never seen the problem outside of internal testing, we encourage users on 2.19.1 to upgrade to 2.19.2.
+
+Miscellaneous
+~~~~~~~~~~~~~
+
+*   The database relation :code:`sourceLocationPrefix` is changed for databases created with
+    :code:`codeql test run`. Instead of containing the path of the enclosing qlpack, it now contains the actual path of the test, similar to if one had run :code:`codeql database create` on the test folder. For example, for a test such as
+    :code:`<checkout>/cpp/ql/test/query-tests/Security/CWE/CWE-611/XXE.qlref` we now populate
+    :code:`sourceLocationPrefix` with :code:`<checkout>/cpp/ql/test/query-tests/Security/CWE/CWE-611/` instead of :code:`<checkout>/cpp/ql/test/`. This change typically impacts calls to
+    :code:`File.getRelativePath()`, and may as a result change the expected test output.
+
+Query Packs
+-----------
+
+Minor Analysis Improvements
+~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+C/C++
+"""""
+
+*   The :code:`cpp/unclear-array-index-validation` ("Unclear validation of array index") query has been improved to reduce false positives and increase true positives.
+*   Fixed false positives in the :code:`cpp/uninitialized-local` ("Potentially uninitialized local variable") query if there are extraction errors in the function.
+*   The :code:`cpp/incorrect-string-type-conversion` query now produces fewer false positives caused by failure to detect byte arrays.
+*   The :code:`cpp/incorrect-string-type-conversion` query now produces fewer false positives caused by failure to recognize dynamic checks prior to possible dangerous widening.
+
+Ruby
+""""
+
+*   The :code:`rb/diagnostics/extraction-errors` diagnostic query has been split into :code:`rb/diagnostics/extraction-errors` and :code:`rb/diagnostics/extraction-warnings`, counting extraction errors and warnings respectively.
+
+Language Libraries
+------------------
+
+Minor Analysis Improvements
+~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+C/C++
+"""""
+
+*   Added taint flow model for :code:`fopen` and related functions.
+*   The :code:`SimpleRangeAnalysis` library (:code:`semmle.code.cpp.rangeanalysis.SimpleRangeAnalysis`) now generates more precise ranges for calls to :code:`fgetc` and :code:`getc`.
+
+Golang
+""""""
+
+*   Added member predicates :code:`StructTag.hasOwnFieldWithTag` and :code:`Field.getTag`, which enable CodeQL queries to examine struct field tags.
+*   Added member predicate :code:`InterfaceType.hasPrivateMethodWithQualifiedName`, which enables CodeQL queries to distinguish interfaces with matching non-exported method names that are declared in different packages, and are therefore incompatible.
+
+Python
+""""""
+
+*   Modelled that :code:`re.finditer` returns an iterable of :code:`re.Match` objects. This is now understood by the API graph in many cases.
+*   Type tracking, and hence the API graph, is now able to correctly trace through comprehensions.
+*   More precise modelling of the dataflow through comprehensions. In particular, captured variables are now handled correctly.
+*   Dataflow out of yield is added, allowing proper tracing through generators.
+*   Added several models of standard library functions and classes, in anticipation of no longer extracting the standard library in a future release.
+
+Ruby
+""""
+
+*   The :code:`ExtractionError` class has been split into :code:`ExtractionError` and :code:`ExtractionWarning`, reporting extraction errors and warnings respectively.
diff --git a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.19.3.rst b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.19.3.rst
new file mode 100644
index 00000000000..c078993aa3f
--- /dev/null
+++ b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.19.3.rst
@@ -0,0 +1,122 @@
+.. _codeql-cli-2.19.3:
+
+==========================
+CodeQL 2.19.3 (2024-11-07)
+==========================
+
+.. contents:: Contents
+   :depth: 2
+   :local:
+   :backlinks: none
+
+This is an overview of changes in the CodeQL CLI and relevant CodeQL query and library packs. For additional updates on changes to the CodeQL code scanning experience, check out the `code scanning section on the GitHub blog <https://github.blog/tag/code-scanning/>`__, `relevant GitHub Changelog updates <https://github.blog/changelog/label/code-scanning/>`__, `changes in the CodeQL extension for Visual Studio Code <https://marketplace.visualstudio.com/items/GitHub.vscode-codeql/changelog>`__, and the `CodeQL Action changelog <https://github.com/github/codeql-action/blob/main/CHANGELOG.md>`__.
+
+Security Coverage
+-----------------
+
+CodeQL 2.19.3 runs a total of 427 security queries when configured with the Default suite (covering 164 CWE). The Extended suite enables an additional 128 queries (covering 34 more CWE).
+
+CodeQL CLI
+----------
+
+Bug Fixes
+~~~~~~~~~
+
+*   Fixed a bug where using :code:`codeql database import` to combine multiple non-empty databases may produce a corrupted database. (The bug does not affect using
+    :code:`codeql database finalize --additional-dbs` to combine multiple databases.)
+    
+*   Fixed a bug where uses of a :code:`QlBuiltins::ExtensionId` variable that was not bound to a value could be incorrectly accepted in some cases. In many cases,
+    this would result in a crash.
+    
+*   CodeQL would sometimes refuse to run with more than around 1,500 GB of RAM available, complaining that having so much memory was "unrealistic". The amount of memory CodeQL is able to make any meaningful use of still tops out at about that value, but it will now gracefully accept that so large computers do in fact exist.
+    
+*   Fixed a bug in command-line parsing where a misspelled option could sometimes be misinterpreted as, e.g., the name of a query to run. Now every command-line argument that begins with a dash is assumed to be intended as an option
+    (unless it comes after the :code:`--` separator), and an appropriate error is emitted if that is not a recognized one.
+    
+    The build command in :code:`codeql database trace-command` is exempted from this for historical reasons, but we strongly recommend putting a :code:`--` before the entire build command there, in case a future :code:`codeql` version starts recognizing options that you intended to be part of the build command.
+
+Miscellaneous
+~~~~~~~~~~~~~
+
+*   The CodeQL Bundle is now available as an artifact that is compressed using
+    \ `Zstandard <https://en.wikipedia.org/wiki/Zstd>`__. This artifact is smaller and faster to decompress than the original, gzip-compressed bundle. The CodeQL bundle is a tar archive containing tools, scripts, and various CodeQL-specific files.
+    
+    If you are currently using the CodeQL Bundle, you may want to consider switching to the Zstandard variant of the bundle. You can download the new form of the CodeQL Bundle from the
+    \ `codeql-action releases page <https://github.com/github/codeql-action/releases/tag/codeql-bundle-v2.19.3>`__ by selecting the appropriate bundle with the :code:`.zst` extension. The gzip-compressed bundles will continue to be available for backwards compatibility.
+
+Query Packs
+-----------
+
+Minor Analysis Improvements
+~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+C/C++
+"""""
+
+*   Remove results from the :code:`cpp/wrong-type-format-argument` ("Wrong type of arguments to formatting function") query if the argument is the return value of an implicitly declared function.
+
+C#
+""
+
+*   C#: The method :code:`string.ReplaceLineEndings(string)` is now considered a sanitizer for the :code:`cs/log-forging` query.
+
+Python
+""""""
+
+*   Improved modelling for the :code:`pycurl` framework.
+
+Language Libraries
+------------------
+
+Major Analysis Improvements
+~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+C#
+""
+
+*   The generated .NET 8 runtime models have been updated.
+
+Java/Kotlin
+"""""""""""
+
+*   Java: The generated JDK 17 models have been updated.
+
+Minor Analysis Improvements
+~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+C/C++
+"""""
+
+*   The function call target resolution algorithm has been improved to resolve more calls through function pointers. As a result, dataflow queries may have more results.
+
+Golang
+""""""
+
+*   The AST viewer now shows type parameter declarations in the correct place in the AST.
+
+Java/Kotlin
+"""""""""""
+
+*   Java :code:`build-mode=none` extraction now packages the Maven plugin used to examine project dependencies. This means that dependency identification is more likely to succeed, and therefore analysis quality may rise, in scenarios where Maven Central is not reachable.
+
+Python
+""""""
+
+*   Added partial support for the :code:`copy.replace` method, `added <https://docs.python.org/3.13/library/copy.html#copy.replace>`__ in Python 3.13.
+*   Added support for type parameter defaults, as specified in `PEP-696 <https://peps.python.org/pep-0696/>`__.
+
+New Features
+~~~~~~~~~~~~
+
+C/C++
+"""""
+
+*   Added a new predicate :code:`DataFlow::getARuntimeTarget` for getting a function that may be invoked by a :code:`Call` expression. Unlike :code:`Call.getTarget` this new predicate may also resolve function pointers.
+*   Added the predicate :code:`mayBeFromImplicitlyDeclaredFunction()` to the :code:`Call` class to represent calls that may be the return value of an implicitly declared C function.
+*   Added the predicate :code:`getAnExplicitDeclarationEntry()` to the :code:`Function` class to get a :code:`FunctionDeclarationEntry` that is not implicit.
+*   Added classes :code:`RequiresExpr`, :code:`SimpleRequirementExpr`, :code:`TypeRequirementExpr`, :code:`CompoundRequirementExpr`, and :code:`NestedRequirementExpr` to represent C++20 requires expressions and the simple, type, compound, and nested requirements that can occur in :code:`requires` expressions.
+
+JavaScript/TypeScript
+"""""""""""""""""""""
+
+*   Added support for custom threat-models, which can be used in most of our taint-tracking queries, see our `documentation <https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/customizing-your-advanced-setup-for-code-scanning#extending-codeql-coverage-with-threat-models>`__ for more details.
diff --git a/docs/codeql/codeql-overview/codeql-changelog/index.rst b/docs/codeql/codeql-overview/codeql-changelog/index.rst
index 67722290b36..62c13d66ac7 100644
--- a/docs/codeql/codeql-overview/codeql-changelog/index.rst
+++ b/docs/codeql/codeql-overview/codeql-changelog/index.rst
@@ -11,6 +11,10 @@ A list of queries for each suite and language `is available here <https://docs.g
 .. toctree::
    :maxdepth: 1
 
+   codeql-cli-2.19.3
+   codeql-cli-2.19.2
+   codeql-cli-2.19.1
+   codeql-cli-2.19.0
    codeql-cli-2.18.4
    codeql-cli-2.18.3
    codeql-cli-2.18.2
diff --git a/docs/codeql/index.html b/docs/codeql/index.html
index fff024c8d84..981599627bd 100644
--- a/docs/codeql/index.html
+++ b/docs/codeql/index.html
@@ -88,7 +88,7 @@
                             latest release of CodeQL...</div>
                     </div>
                     <div class="Subhead border-0">
-                        <a href="codeql-overview/about-codeql">
+                        <a href="codeql-overview/codeql-changelog/">
                             <div class="Subhead-heading f4 text-center">Change logs</div>
                         </a>
                         <div class="Subhead-description">Read about the improvements to the queries, libraries, and tooling in each release...</div>
@@ -101,8 +101,8 @@
                             latest version of CodeQL...</div>
                     </div>
                     <div class="Subhead border-0">
-                        <a href="codeql-overview/supported-languages-and-frameworks/">
-                            <div class="Subhead-heading f4 text-center">CodeQL cverage of CWEs</div>
+                        <a href="../codeql-query-help/codeql-cwe-coverage/">
+                            <div class="Subhead-heading f4 text-center">CodeQL coverage of CWEs</div>
                         </a>
                         <div class="Subhead-description">Detailed information on the coverage of Common Weakness Enumerations (CWEs) in the latest release...</div>
                     </div>
diff --git a/docs/codeql/ql-language-reference/modules.rst b/docs/codeql/ql-language-reference/modules.rst
index 7b2b16f3b7b..75b61667246 100644
--- a/docs/codeql/ql-language-reference/modules.rst
+++ b/docs/codeql/ql-language-reference/modules.rst
@@ -4,10 +4,10 @@
 
 Modules
 #######
-   
-Modules provide a way of organizing QL code by grouping together related types, predicates, and other modules. 
 
-You can import modules into other files, which avoids duplication, and helps 
+Modules provide a way of organizing QL code by grouping together related types, predicates, and other modules.
+
+You can import modules into other files, which avoids duplication, and helps
 structure your code into more manageable pieces.
 
 .. _defining-module:
@@ -16,7 +16,7 @@ Defining a module
 *****************
 
 There are various ways to define modules—here is an example of the simplest way, declaring an
-:ref:`explicit module  <explicit-modules>` named ``Example`` containing 
+:ref:`explicit module  <explicit-modules>` named ``Example`` containing
 a class ``OneTwoThree``:
 
 .. code-block:: ql
@@ -27,17 +27,17 @@ a class ``OneTwoThree``:
           this = 1 or this = 2 or this = 3
         }
       }
-    } 
+    }
 
 The name of a module can be any `identifier <https://codeql.github.com/docs/ql-language-reference/ql-language-specification/#identifiers>`_
-that starts with an uppercase or lowercase letter. 
+that starts with an uppercase or lowercase letter.
 
 ``.ql`` or ``.qll`` files also implicitly define modules.
 For more information, see ":ref:`kinds-of-modules`."
 
 You can also annotate a module. For more information, see of ":ref:`annotations-overview`."
 
-Note that you can only annotate :ref:`explicit modules <explicit-modules>`. 
+Note that you can only annotate :ref:`explicit modules <explicit-modules>`.
 File modules cannot be annotated.
 
 .. _kinds-of-modules:
@@ -48,7 +48,7 @@ Kinds of modules
 File modules
 ============
 
-Each query file (extension ``.ql``) and library file (extension ``.qll``) implicitly defines 
+Each query file (extension ``.ql``) and library file (extension ``.qll``) implicitly defines
 a module. The module has the same name as the file, but any spaces in the file name are replaced
 by underscores (``_``). The contents of the file form the :ref:`body of the module <module-bodies>`.
 
@@ -57,7 +57,7 @@ by underscores (``_``). The contents of the file form the :ref:`body of the modu
 Library modules
 ---------------
 
-A library module is defined by a ``.qll`` file. It can contain any of the 
+A library module is defined by a ``.qll`` file. It can contain any of the
 elements listed in :ref:`module-bodies` below, apart from select clauses.
 
 For example, consider the following QL library:
@@ -75,19 +75,19 @@ For example, consider the following QL library:
 This file defines a library module named ``OneTwoThreeLib``. The body of this module
 defines the class ``OneTwoThree``.
 
-.. _query-modules: 
+.. _query-modules:
 
 Query modules
 -------------
 
-A query module is defined by a ``.ql`` file. It can contain any of the elements listed 
-in :ref:`module-bodies` below. 
+A query module is defined by a ``.ql`` file. It can contain any of the elements listed
+in :ref:`module-bodies` below.
 
 Query modules are slightly different from other modules:
 
 - A query module can't be imported.
-- A query module must have at least one query in its 
-  :ref:`namespace <namespaces>`. This is usually a :ref:`select clause <select-clauses>`, 
+- A query module must have at least one query in its
+  :ref:`namespace <namespaces>`. This is usually a :ref:`select clause <select-clauses>`,
   but can also be a :ref:`query predicate <query-predicates>`.
 
 For example:
@@ -97,7 +97,7 @@ For example:
 .. code-block:: ql
 
     import OneTwoThreeLib
-    
+
     from OneTwoThree ott
     where ott = 1 or ott = 2
     select ott
@@ -110,13 +110,13 @@ This file defines a query module named ``OneTwoQuery``. The body of this module
 Explicit modules
 ================
 
-You can also define a module within another module. This is an explicit module definition. 
+You can also define a module within another module. This is an explicit module definition.
 
-An explicit module is defined with the keyword ``module`` followed by 
-the module name, and then the module body enclosed in braces. It can contain any 
-of the elements listed in ":ref:`module-bodies`" below, apart from select clauses. 
+An explicit module is defined with the keyword ``module`` followed by
+the module name, and then the module body enclosed in braces. It can contain any
+of the elements listed in ":ref:`module-bodies`" below, apart from select clauses.
 
-For example, you could add the following QL snippet to the library file **OneTwoThreeLib.qll** 
+For example, you could add the following QL snippet to the library file **OneTwoThreeLib.qll**
 defined :ref:`above <library-modules>`:
 
 .. code-block:: ql
@@ -129,7 +129,7 @@ defined :ref:`above <library-modules>`:
         }
       }
     }
-    
+
 This defines an explicit module named ``M``. The body of this module defines
 the class ``OneTwo``.
 
@@ -226,7 +226,7 @@ Module bodies
 *************
 
 The body of a module is the code inside the module definition, for example
-the class ``OneTwo`` in the :ref:`explicit module <explicit-modules>` ``M``. 
+the class ``OneTwo`` in the :ref:`explicit module <explicit-modules>` ``M``.
 
 In general, the body of a module can contain the following constructs:
 
@@ -243,11 +243,11 @@ In general, the body of a module can contain the following constructs:
 Importing modules
 *****************
 
-The main benefit of storing code in a module is that you can reuse it in other modules. 
-To access the contents of an external module, you can import the module using an 
+The main benefit of storing code in a module is that you can reuse it in other modules.
+To access the contents of an external module, you can import the module using an
 :ref:`import statement <import-statements>`.
 
-When you import a module this brings all the names in its namespace, apart from :ref:`private` names, 
+When you import a module this brings all the names in its namespace, apart from :ref:`private` names,
 into the :ref:`namespace <namespaces>` of the current module.
 
 .. _import-statements:
@@ -263,7 +263,7 @@ Import statements are used for importing modules. They are of the form:
     import <module_expression2>
 
 Import statements are usually listed at the beginning of the module. Each
-import statement imports one module. You can import multiple modules by 
+import statement imports one module. You can import multiple modules by
 including multiple import statements (one for each module you want to import).
 
 An import statement can also be :ref:`annotated <annotations-overview>` with
@@ -272,14 +272,14 @@ An import statement can also be :ref:`annotated <annotations-overview>` with
 only reachable through deprecated imports in a given context then usage of the
 name in that context will generate deprecation warnings.
 
-You can import a module under a different name using the ``as`` keyword, 
+You can import a module under a different name using the ``as`` keyword,
 for example ``import javascript as js``.
 
 The ``<module_expression>`` itself can be a module name, a selection, or a qualified
 reference. For more information, see ":ref:`name-resolution`."
 
 For information about how import statements are looked up, see "`Module resolution <https://codeql.github.com/docs/ql-language-reference/ql-language-specification/#module-resolution>`__"
-in the QL language specification. 
+in the QL language specification.
 
 Built-in modules
 ****************
@@ -353,7 +353,7 @@ Sets
 
 The built-in ``InternSets`` module is parameterized by ``Key`` and ``Value`` types
 and a ``Value getAValue(Key key)`` relation. The module groups the ``Value``
-column by ``Key`` and creates a set for each group of values related by a key. 
+column by ``Key`` and creates a set for each group of values related by a key.
 
 The ``InternSets`` module exports a functional ``Set getSet(Key key)`` relation
 that relates keys with the set of value related to the given key by
@@ -424,3 +424,30 @@ The above query therefore evalutes to:
 +----+----+
 | 4  | 4  |
 +----+----+
+
+.. index:: BigInt
+.. _bigint:
+
+BigInt
+======
+
+The built-in ``QlBuiltins`` module provides an **experimental** type ``BigInt`` of arbitrary-precision integers.
+
+This type is not available in the CodeQL CLI by default, but you can enable it by passing the ``--allow-experimental=bigint``
+option to the CodeQL CLI. Consequently, BigInts are currently disallowed in query results and dbscheme columns.
+
+Unlike ``int`` and ``float``, there is no automatic conversion between ``BigInt`` and other numeric types.
+Instead, big integers can be constructed using the ``.toBigInt()`` methods of ``int`` and ``string``.
+
+The other built-in operations are:
+
+*   comparisons between ``BigInt``\s: ``=``, ``!=``, ``<``, ``<=``, ``>``, ``>=``,
+*   conversions from ``BigInt``\s to strings or integers (if within range): ``.toString()``, ``.toInt()``,
+*   ``BigInt`` arithmetic: binary ``+``, ``-``, ``*``, ``/``, ``%``, unary ``-``,
+*   bitwise operations: ``.bitAnd(BigInt)``, ``.bitOr(BigInt)``,
+    ``.bitXor(BigInt)``, ``.bitShiftLeft(int)``, ``.bitShiftRightSigned(int)``,
+    ``.bitNot()``,
+*   aggregates: ``min``, ``max``, (``strict``)\ ``sum``, (``strict``)\ ``count``, ``avg``,
+    ``rank``, ``unique``, ``any``.
+*   other: ``.pow(int)``, ``.abs()``, ``.gcd(BigInt)``, ``.minimum(BigInt)``,
+    ``.maximum(BigInt)``.
diff --git a/docs/codeql/ql-language-reference/ql-language-specification.rst b/docs/codeql/ql-language-reference/ql-language-specification.rst
index ae0057d3cf6..60e5ece7330 100644
--- a/docs/codeql/ql-language-reference/ql-language-specification.rst
+++ b/docs/codeql/ql-language-reference/ql-language-specification.rst
@@ -359,7 +359,7 @@ Kinds of types
 
 Types in QL are either *primitive* types, *database* types, *class* types, *character* types, *class domain* types, type *parameters*, or *instantiation-nested* types.
 
-The primitive types are ``boolean``, ``date``, ``float``, ``int``, and ``string``.
+The primitive types are ``boolean``, ``date``, ``float``, ``int``, ``string``, and ``QlBuiltins::BigInt``.
 
 Database types are supplied as part of the database. Each database type has a *name*, which is an identifier starting with an at sign (``@``, U+0040) followed by lower-case letter. Database types have some number of *base types*, which are other database types. In a valid database, the base types relation is non-cyclic.
 
@@ -433,7 +433,7 @@ Values are the fundamental data that QL programs compute over. This section spec
 Kinds of values
 ~~~~~~~~~~~~~~~
 
-There are six kinds of values in QL: one kind for each of the five primitive types, and *entities*. Each value has a type.
+There are seven kinds of values in QL: one kind for each of the six primitive types, and *entities*. Each value has a type.
 
 A boolean value is of type ``boolean``, and may have one of two distinct values: ``true`` or ``false``.
 
@@ -445,6 +445,8 @@ An integer value is of type ``int``. Each value is a 32-bit two's complement int
 
 A string is a finite sequence of 16-bit characters. The characters are interpreted as Unicode code points.
 
+A :ref:`big integer <bigint>` value is of type ``QlBuiltins::BigInt``. Each value is a signed arbitrary-precision integer.
+
 The database includes a number of opaque entity values. Each such value has a type that is one of the database types, and an identifying integer. An entity value is written as the name of its database type followed by its identifying integer in parentheses. For example, ``@tree(12)``, ``@person(16)``, and ``@location(38132)`` are entity values. The identifying integers are left opaque to programmers in this specification, so an implementation of QL is free to use some other set of countable labels to identify its entities.
 
 Ordering
@@ -458,7 +460,7 @@ For dates, the ordering is chronological.
 
 For floats, the ordering is as specified in IEEE 754 when one exists, except that NaN is considered equal to itself and is ordered after all other floats, and negative zero is considered to be strictly less than positive zero.
 
-For integers, the ordering is as for two's complement integers.
+For integers (and :ref:`big integers <bigint>`), the ordering is numerical.
 
 For strings, the ordering is lexicographic.
 
diff --git a/docs/codeql/ql-language-reference/types.rst b/docs/codeql/ql-language-reference/types.rst
index 12aadc7213a..e14f542dcf8 100644
--- a/docs/codeql/ql-language-reference/types.rst
+++ b/docs/codeql/ql-language-reference/types.rst
@@ -10,12 +10,12 @@ Types
 QL is a statically typed language, so each variable must have a declared type.
 
 A type is a set of values.
-For example, the type ``int`` is the set of integers. 
-Note that a value can belong to more than one of these sets, which means that it can have more 
+For example, the type ``int`` is the set of integers.
+Note that a value can belong to more than one of these sets, which means that it can have more
 than one type.
 
 The kinds of types in QL are :ref:`primitive types <primitive-types>`, :ref:`classes <classes>`,
-:ref:`character types <character-types>`, :ref:`class domain types <domain-types>`, 
+:ref:`character types <character-types>`, :ref:`class domain types <domain-types>`,
 :ref:`algebraic datatypes <algebraic-datatypes>`, :ref:`type unions <type-unions>`,
 and :ref:`database types <database-types>`.
 
@@ -31,27 +31,29 @@ independent of the database that you are querying.
    .. _boolean:
 
 #. **boolean**: This type contains the values ``true`` and ``false``.
-    
+
    .. _float:
 
 #. **float**: This type contains 64-bit floating point numbers, such as ``6.28`` and ``-0.618``.
-    
+
    .. _int:
 
 #. **int**: This type contains 32-bit `two's complement <https://en.wikipedia.org/wiki/Two%27s_complement>`_ integers, such as ``-1`` and ``42``.
-    
+
    .. _string:
 
 #. **string**: This type contains finite strings of 16-bit characters.
-    
+
    .. _date:
 
-#. **date**: This type contains dates (and optionally times). 
-    
+#. **date**: This type contains dates (and optionally times).
+
 
 QL has a range of built-in operations defined on primitive types. These are available by using dispatch on expressions of the appropriate type. For example, ``1.toString()`` is the string representation of the integer constant ``1``. For a full list of built-in operations available in QL, see the
 section on `built-ins <https://codeql.github.com/docs/ql-language-reference/ql-language-specification/#built-ins>`__ in the QL language specification.
 
+Additionally, there is an experimental arbitrary-precision integer primitive type at :ref:`QlBuiltins::BigInt <bigint>`. This type is not available in the CodeQL CLI by default, but you can enable it by passing the ``--allow-experimental=bigint`` option to the CodeQL CLI.
+
 .. index:: class
 .. _classes:
 
@@ -65,7 +67,7 @@ Classes provide an easy way to reuse and structure code. For example, you can:
   - Define :ref:`member predicates <member-predicates>` on those values.
   - Define subclasses that :ref:`override member predicates <overriding-member-predicates>`.
 
-A class in QL doesn't "create" a new object, it just represents a logical property. A value is 
+A class in QL doesn't "create" a new object, it just represents a logical property. A value is
 in a particular class if it satisfies that logical property.
 
 .. _defining-a-class:
@@ -75,8 +77,8 @@ Defining a class
 
 To define a class, you write:
 
-#. The keyword ``class``. 
-#. The name of the class. This is an `identifier <https://codeql.github.com/docs/ql-language-reference/ql-language-specification/#identifiers>`_ 
+#. The keyword ``class``.
+#. The name of the class. This is an `identifier <https://codeql.github.com/docs/ql-language-reference/ql-language-specification/#identifiers>`_
    starting with an uppercase letter.
 #. The supertypes that the class is derived from via `extends` and/or `instanceof`
 #. The :ref:`body of the class <class-bodies>`, enclosed in braces.
@@ -89,11 +91,11 @@ For example:
       OneTwoThree() { // characteristic predicate
         this = 1 or this = 2 or this = 3
       }
- 
+
       string getAString() { // member predicate
         result = "One, two or three: " + this.toString()
       }
-    
+
       predicate isEven() { // member predicate
         this = 2
       }
@@ -101,7 +103,7 @@ For example:
 
 This defines a class ``OneTwoThree``, which contains the values ``1``, ``2``, and ``3``. The
 :ref:`characteristic predicate <characteristic-predicates>` captures the logical property of
-"being one of the integers 1, 2, or 3." 
+"being one of the integers 1, 2, or 3."
 
 .. index:: extends
 
@@ -132,12 +134,12 @@ Class bodies
 The body of a class can contain:
   -  A :ref:`characteristic predicate <characteristic-predicates>` declaration.
   -  Any number of :ref:`member predicate <member-predicates>` declarations.
-  -  Any number of :ref:`field <fields>` declarations. 
+  -  Any number of :ref:`field <fields>` declarations.
 
 When you define a class, that class also inherits all non-:ref:`private` member predicates and
 fields from its supertypes.
 
-Depending on whether they are final, you can :ref:`override <overriding-member-predicates>` or 
+Depending on whether they are final, you can :ref:`override <overriding-member-predicates>` or
 :ref:`shadow <final-extensions>` those predicates and fields to give them a more specific definition.
 
 .. _characteristic-predicates:
@@ -181,22 +183,22 @@ This call returns ``"ONE, TWO OR THREE: 1"``.
 
 .. pull-quote:: Note
 
-    Characteristic predicates and member predicates often use the variable ``this``. 
-    This variable always refers to a member of the class—in this case a value belonging to the 
+    Characteristic predicates and member predicates often use the variable ``this``.
+    This variable always refers to a member of the class—in this case a value belonging to the
     class ``OneTwoThree``.
-    In the :ref:`characteristic predicate <characteristic-predicates>`, the variable ``this`` 
+    In the :ref:`characteristic predicate <characteristic-predicates>`, the variable ``this``
     constrains the values that are in the class.
-    In a :ref:`member predicate <member-predicates>`, ``this`` acts in the same way as any 
+    In a :ref:`member predicate <member-predicates>`, ``this`` acts in the same way as any
     other argument to the predicate.
 
 .. index:: field
-.. _fields: 
+.. _fields:
 
 Fields
 ------
 
 These are variables declared in the body of a class. A class can have any number of field
-declarations (that is, variable declarations) within its body. You can use these variables in 
+declarations (that is, variable declarations) within its body. You can use these variables in
 predicate declarations inside the class. Much like the :ref:`variable <this>` ``this``, fields
 must be constrained in the :ref:`characteristic predicate <characteristic-predicates>`.
 
@@ -207,21 +209,21 @@ For example:
     class SmallInt extends int {
       SmallInt() { this = [1 .. 10] }
     }
-    
+
     class DivisibleInt extends SmallInt {
       SmallInt divisor;   // declaration of the field `divisor`
       DivisibleInt() { this % divisor = 0 }
-    	
+
       SmallInt getADivisor() { result = divisor }
     }
-    
+
     from DivisibleInt i
     select i, i.getADivisor()
 
 In this example, the declaration ``SmallInt divisor`` introduces a field ``divisor``, constrains
 it in the characteristic predicate, and then uses it in the declaration of the member predicate
 ``getADivisor``. This is similar to introducing variables in a :ref:`select clause <select-clauses>`
-by declaring them in the ``from`` part. 
+by declaring them in the ``from`` part.
 
 You can also annotate predicates and fields. See the list of :ref:`annotations <annotations-overview>`
 that are available.
@@ -231,7 +233,7 @@ that are available.
 Concrete classes
 ================
 
-The classes in the above examples are all **concrete** classes. They are defined by 
+The classes in the above examples are all **concrete** classes. They are defined by
 restricting the values in a larger type. The values in a concrete class are precisely those
 values in the intersection of the supertypes that also satisfy the
 :ref:`characteristic predicate <characteristic-predicates>` of the class.
@@ -241,32 +243,32 @@ values in the intersection of the supertypes that also satisfy the
 Abstract classes
 ================
 
-A class :ref:`annotated <abstract>` with ``abstract``, known as an **abstract** class, is also a restriction of 
-the values in a larger type. However, an abstract class is defined as the union of its 
-subclasses. In particular, for a value to be in an abstract class, it must satisfy the 
+A class :ref:`annotated <abstract>` with ``abstract``, known as an **abstract** class, is also a restriction of
+the values in a larger type. However, an abstract class is defined as the union of its
+subclasses. In particular, for a value to be in an abstract class, it must satisfy the
 characteristic predicate of the class itself **and** the characteristic predicate of a subclass.
 Note that final extensions are not considered subclasses in this context.
 
-An abstract class is useful if you want to group multiple existing classes together 
-under a common name. You can then define member predicates on all those classes. You can also 
-extend predefined abstract classes: for example, if you import a library that contains an 
+An abstract class is useful if you want to group multiple existing classes together
+under a common name. You can then define member predicates on all those classes. You can also
+extend predefined abstract classes: for example, if you import a library that contains an
 abstract class, you can add more subclasses to it.
 
 **Example**
 
-If you are writing a security query, you may be interested in identifying 
-all expressions that can be interpreted as SQL queries. 
+If you are writing a security query, you may be interested in identifying
+all expressions that can be interpreted as SQL queries.
 You can use the following abstract class to describe these expressions:
 
 .. code-block:: ql
 
     abstract class SqlExpr extends Expr {
-      ... 
+      ...
     }
 
 Now define various subclasses—one for each kind of database management system. For example, you
-can define a subclass ``class PostgresSqlExpr extends SqlExpr``, which contains expressions 
-passed to some Postgres API that performs a database query. 
+can define a subclass ``class PostgresSqlExpr extends SqlExpr``, which contains expressions
+passed to some Postgres API that performs a database query.
 You can define similar subclasses for MySQL and other database management systems.
 
 The abstract class ``SqlExpr`` refers to all of those different expressions. If you want to add
@@ -278,7 +280,7 @@ there is no need to update the queries that rely on it.
 
    You must take care when you add a new subclass to an existing abstract class. Adding a subclass
    is not an isolated change, it also extends the abstract class since that is a union of its
-   subclasses. 
+   subclasses.
 
 .. _overriding-member-predicates:
 
@@ -288,7 +290,7 @@ Overriding member predicates
 If a class inherits a member predicate from a non-final supertype, you can **override** the
 inherited definition. You do this by defining a member predicate with the same name and arity
 as the inherited predicate, and by adding the ``override`` :ref:`annotation <override>`.
-This is useful if you want to refine the predicate to give a more specific result for the 
+This is useful if you want to refine the predicate to give a more specific result for the
 values in the subclass.
 
 For example, extending the class from the :ref:`first example <defining-a-class>`:
@@ -299,7 +301,7 @@ For example, extending the class from the :ref:`first example <defining-a-class>
       OneTwo() {
         this = 1 or this = 2
       }
-    
+
       override string getAString() {
         result = "One or two: " + this.toString()
       }
@@ -328,7 +330,7 @@ look like this:
 | 3 | One, two or three: 3    |
 +---+-------------------------+
 
-In QL, unlike other object-oriented languages, different subtypes of the same types don't need to be 
+In QL, unlike other object-oriented languages, different subtypes of the same types don't need to be
 disjoint. For example, you could define another subclass of ``OneTwoThree``, which overlaps
 with ``OneTwo``:
 
@@ -338,14 +340,14 @@ with ``OneTwo``:
       TwoThree() {
         this = 2 or this = 3
       }
-    
+
       override string getAString() {
         result = "Two or three: " + this.toString()
       }
     }
 
-Now the value 2 is included in both class types ``OneTwo`` and ``TwoThree``. Both of these classes 
-override the original definition of ``getAString()``. There are two new "most specific" definitions, 
+Now the value 2 is included in both class types ``OneTwo`` and ``TwoThree``. Both of these classes
+override the original definition of ``getAString()``. There are two new "most specific" definitions,
 so running the above query gives the following results:
 
 +---+-------------------------+
@@ -373,7 +375,7 @@ For example, using the definitions from the above section:
 
     class Two extends OneTwo, TwoThree {}
 
-Any value in the class ``Two`` must satisfy the logical property represented by ``OneTwo``, 
+Any value in the class ``Two`` must satisfy the logical property represented by ``OneTwo``,
 **and** the logical property represented by ``TwoThree``. Here the class ``Two`` contains one
 value, namely 2.
 
@@ -401,12 +403,12 @@ For example, extending the class from the :ref:`first example <defining-a-class>
 .. code-block:: ql
 
     final class FinalOneTwoThree = OneTwoThree;
-    
+
     class OneTwoFinalExtension extends FinalOneTwoThree {
       OneTwoFinalExtension() {
         this = 1 or this = 2
       }
-    
+
       string getAString() {
         result = "One or two: " + this.toString()
       }
@@ -507,19 +509,19 @@ Had ``Bar`` been defined as ``extends Foo``, then ``select any(Foo f).foo()`` wo
 Character types and class domain types
 **************************************
 
-You can't refer to these types directly, but each class in QL implicitly defines a character 
-type and a class domain type. (These are rather more subtle concepts and don't appear very 
+You can't refer to these types directly, but each class in QL implicitly defines a character
+type and a class domain type. (These are rather more subtle concepts and don't appear very
 often in practical query writing.)
 
-The **character type** of a QL class is the set of values satisfying the :ref:`characteristic 
-predicate <characteristic-predicates>` of the class. 
-It is a subset of the domain type. For concrete classes, a value belongs to 
-the class if, and only if, it is in the character type. For :ref:`abstract classes 
+The **character type** of a QL class is the set of values satisfying the :ref:`characteristic
+predicate <characteristic-predicates>` of the class.
+It is a subset of the domain type. For concrete classes, a value belongs to
+the class if, and only if, it is in the character type. For :ref:`abstract classes
 <abstract-classes>`, a value must also belong to at least one of the subclasses, in addition to
-being in the character type. 
+being in the character type.
 
 The **domain type** of a QL class is the intersection of the character types of all its supertypes, that is, a value
-belongs to the domain type if it belongs to every supertype. It occurs as the type of ``this`` 
+belongs to the domain type if it belongs to every supertype. It occurs as the type of ``this``
 in the characteristic predicate of a class.
 
 .. index:: newtype
@@ -570,13 +572,13 @@ The branch definitions have the following form:
 
     <BranchName>(<arguments>) { <body> }
 
-- The type name and the branch names must be `identifiers <https://codeql.github.com/docs/ql-language-reference/ql-language-specification/#identifiers>`_ 
+- The type name and the branch names must be `identifiers <https://codeql.github.com/docs/ql-language-reference/ql-language-specification/#identifiers>`_
   starting with an uppercase letter. Conventionally, they start with ``T``.
 - The different branches of an algebraic datatype are separated by ``or``.
 - The arguments to a branch, if any, are :ref:`variable declarations <variable-declarations>`
   separated by commas.
 - The body of a branch is a :ref:`predicate <predicates>` body. You can omit the branch body, in which case
-  it defaults to ``any()``. 
+  it defaults to ``any()``.
   Note that branch bodies are evaluated fully, so they must be finite. They should be kept small
   for good performance.
 
@@ -586,28 +588,28 @@ For example, the following algebraic datatype has three branches:
 
     newtype T =
       Type1(A a, B b) { body(a, b) }
-      or 
+      or
       Type2(C c)
-      or 
+      or
       Type3()
 
 Standard pattern for using algebraic datatypes
 ==============================================
 
-Algebraic datatypes are different from :ref:`classes <classes>`. In particular, algebraic datatypes don't have a 
+Algebraic datatypes are different from :ref:`classes <classes>`. In particular, algebraic datatypes don't have a
 ``toString()`` member predicate, so you can't use them in a :ref:`select clause <select-clauses>`.
 
-Classes are often used to extend algebraic datatypes (and to provide a ``toString()`` predicate). 
+Classes are often used to extend algebraic datatypes (and to provide a ``toString()`` predicate).
 In the standard QL language libraries, this is usually done as follows:
 
 - Define a class ``A`` that extends the algebraic datatype and optionally declares :ref:`abstract`
   predicates.
-- For each branch type, define a class ``B`` that extends both ``A`` and the branch type, 
+- For each branch type, define a class ``B`` that extends both ``A`` and the branch type,
   and provide a definition for any abstract predicates from ``A``.
 - Annotate the algebraic datatype with :ref:`private`, and leave the classes public.
 
 For example, the following code snippet from the CodeQL data-flow library for C# defines classes
-for dealing with tainted or untainted values. In this case, it doesn't make sense for 
+for dealing with tainted or untainted values. In this case, it doesn't make sense for
 ``TaintType`` to extend a database type. It is part of the taint analysis, not the underlying
 program, so it's helpful to extend a new type (namely ``TTaintType``):
 
@@ -617,24 +619,24 @@ program, so it's helpful to extend a new type (namely ``TTaintType``):
       TExactValue()
       or
       TTaintedValue()
-    
+
     /** Describes how data is tainted. */
     class TaintType extends TTaintType {
       string toString() {
         this = TExactValue() and result = "exact"
-        or 
+        or
         this = TTaintedValue() and result = "tainted"
       }
     }
-    
+
     /** A taint type where the data is untainted. */
     class Untainted extends TaintType, TExactValue {
     }
-    
+
     /** A taint type where the data is tainted. */
     class Tainted extends TaintType, TTaintedValue {
     }
-    
+
 .. _type-unions:
 
 Type unions
@@ -672,7 +674,7 @@ If we had implemented ``DefiniteInitialization`` as a class extension instead, i
 
 .. code-block:: ql
 
-    // THIS WON'T WORK: The implicit type check for InitialValueSource involves an illegal recursion 
+    // THIS WON'T WORK: The implicit type check for InitialValueSource involves an illegal recursion
     // DefiniteInitialization -> InitialValueSource -> UnknownInitialGarbage -> ¬DefiniteInitialization!
     class DefiniteInitialization extends InitialValueSource {
       DefiniteInitialization() {
@@ -692,7 +694,7 @@ Database types are defined in the database schema. This means that they depend o
 that you are querying, and vary according to the data you are analyzing.
 
 For example, if you are querying a CodeQL database for a Java project, the database types may
-include ``@ifstmt``, representing an if statement in the Java code, and ``@variable``, 
+include ``@ifstmt``, representing an if statement in the Java code, and ``@variable``,
 representing a variable.
 
 .. _type-compatibility:
diff --git a/docs/codeql/reusables/beta-note-threat-models.rst b/docs/codeql/reusables/beta-note-threat-models.rst
index 80c97d93376..a9fdf66589b 100644
--- a/docs/codeql/reusables/beta-note-threat-models.rst
+++ b/docs/codeql/reusables/beta-note-threat-models.rst
@@ -2,4 +2,4 @@
 
     Note
 
-    Threat models are currently in beta and subject to change. During the beta, threat models are supported only by Java and C# analysis.
+    Threat models are currently in beta and subject to change. During the beta, threat models are supported only by Java, C#, Python and JavaScript/TypeScript analysis.
diff --git a/docs/codeql/reusables/supported-platforms.rst b/docs/codeql/reusables/supported-platforms.rst
index 02dccb61c7e..78a8215bffc 100644
--- a/docs/codeql/reusables/supported-platforms.rst
+++ b/docs/codeql/reusables/supported-platforms.rst
@@ -12,15 +12,9 @@
    Windows,"Windows 10 / Windows Server 2019
 
    Windows 11 / Windows Server 2022","x86-64"
-   macOS,"macOS 12 Monterey
+   macOS,"macOS 13 Ventura
 
-   macOS 13 Ventura
-
-   macOS 14 Sonoma","x86-64, arm64 (Apple Silicon)
-
-   x86-64, arm64 (Apple Silicon)
-
-   x86-64, arm64 (Apple Silicon) [1]_"
+   macOS 14 Sonoma","x86-64, arm64 (Apple Silicon) [1]_"
 
 .. container:: footnote-group
 
diff --git a/docs/codeql/reusables/supported-versions-compilers.rst b/docs/codeql/reusables/supported-versions-compilers.rst
index 4b941c7d17f..4cdb97ace1b 100644
--- a/docs/codeql/reusables/supported-versions-compilers.rst
+++ b/docs/codeql/reusables/supported-versions-compilers.rst
@@ -20,9 +20,9 @@
    Java,"Java 7 to 22 [5]_","javac (OpenJDK and Oracle JDK),
 
    Eclipse compiler for Java (ECJ) [6]_",``.java``
-   Kotlin,"Kotlin 1.5.0 to 2.0.2\ *x*","kotlinc",``.kt``
+   Kotlin,"Kotlin 1.5.0 to 2.1.0\ *x*","kotlinc",``.kt``
    JavaScript,ECMAScript 2022 or lower,Not applicable,"``.js``, ``.jsx``, ``.mjs``, ``.es``, ``.es6``, ``.htm``, ``.html``, ``.xhtm``, ``.xhtml``, ``.vue``, ``.hbs``, ``.ejs``, ``.njk``, ``.json``, ``.yaml``, ``.yml``, ``.raml``, ``.xml`` [7]_"
-   Python [8]_,"2.7, 3.5, 3.6, 3.7, 3.8, 3.9, 3.10, 3.11, 3.12",Not applicable,``.py``
+   Python [8]_,"2.7, 3.5, 3.6, 3.7, 3.8, 3.9, 3.10, 3.11, 3.12, 3.13",Not applicable,``.py``
    Ruby [9]_,"up to 3.3",Not applicable,"``.rb``, ``.erb``, ``.gemspec``, ``Gemfile``"
    Swift [10]_,"Swift 5.4-5.10","Swift compiler","``.swift``"
    TypeScript [11]_,"2.6-5.6",Standard TypeScript compiler,"``.ts``, ``.tsx``, ``.mts``, ``.cts``"
diff --git a/go/Makefile b/go/Makefile
index bc4bc25e5da..4597245594e 100644
--- a/go/Makefile
+++ b/go/Makefile
@@ -1,3 +1,10 @@
+# On Windows, make's path resolution algorithm is incorrect. It picks up a bazel.exe in PATH that's
+# after a bazel binary. In particular, on actions, the non-exe binary is a bazelisk instance, whereas
+# bazel.exe is a bazel installation.
+# This means we pick up the wrong bazel version, and if the differences between the bazel we want
+# and that we actually get are too big, the build fails on CI.
+BAZEL := $(shell bash -c "which bazel")
+
 all: gen extractor
 
 EXTRACTOR_PACK_OUT = extractor-pack
@@ -28,10 +35,10 @@ qhelp-to-markdown:
 	scripts/qhelp-to-markdown.sh ql/src "$(QHELP_OUT_DIR)"
 
 extractor:
-	bazel run :go-installer
+	$(BAZEL) run :go-installer
 
 gen:
-	bazel run :gen
+	$(BAZEL) run :gen
 
 build/stats/src.stamp:
 	mkdir -p $(@D)/src
@@ -48,7 +55,7 @@ test: all build/testdb/check-upgrade-path
 	codeql test run -j0 ql/test --search-path .. --consistency-queries ql/test/consistency --compilation-cache=$(cache)
 #	use GOOS=linux because GOOS=darwin GOARCH=386 is no longer supported
 	env GOOS=linux GOARCH=386 codeql$(EXE) test run -j0 ql/test/query-tests/Security/CWE-681 --search-path .. --consistency-queries ql/test/consistency --compilation-cache=$(cache)
-	cd extractor; bazel test ...
+	cd extractor; $(BAZEL) test ...
 	bash extractor-smoke-test/test.sh || (echo "Extractor smoke test FAILED"; exit 1)
 
 .PHONY: build/testdb/check-upgrade-path
diff --git a/go/codeql-extractor.yml b/go/codeql-extractor.yml
index 20cfe987ef3..49c8c75232f 100644
--- a/go/codeql-extractor.yml
+++ b/go/codeql-extractor.yml
@@ -19,3 +19,18 @@ file_types:
     extensions:
       - .go
 legacy_qltest_extraction: true
+options:
+  extract_tests:
+    title: Whether to include Go test files in the CodeQL database.
+    description: >
+      A value indicating whether Go test files should be included in the CodeQL database.
+      The default is 'false'.
+    type: string
+    pattern: "^(false|true)$"
+  extract_vendor_dirs:
+    title: Whether to include Go vendor directories in the CodeQL database.
+    description: >
+      A value indicating whether Go vendor directories should be included in the CodeQL database.
+      The default is 'false'.
+    type: string
+    pattern: "^(false|true)$"
diff --git a/go/downgrades/4bd57e093275e5e892dfb16b55ed4bd76ea662be/go.dbscheme b/go/downgrades/4bd57e093275e5e892dfb16b55ed4bd76ea662be/go.dbscheme
new file mode 100644
index 00000000000..a58b81b1b4c
--- /dev/null
+++ b/go/downgrades/4bd57e093275e5e892dfb16b55ed4bd76ea662be/go.dbscheme
@@ -0,0 +1,546 @@
+/** Auto-generated dbscheme; do not edit. */
+
+
+/** Duplicate code **/
+
+duplicateCode(
+  unique int id : @duplication,
+  varchar(900) relativePath : string ref,
+  int equivClass : int ref);
+
+similarCode(
+  unique int id : @similarity,
+  varchar(900) relativePath : string ref,
+  int equivClass : int ref);
+
+@duplication_or_similarity = @duplication | @similarity;
+
+tokens(
+  int id : @duplication_or_similarity ref,
+  int offset : int ref,
+  int beginLine : int ref,
+  int beginColumn : int ref,
+  int endLine : int ref,
+  int endColumn : int ref);
+
+/** External data **/
+
+externalData(
+  int id : @externalDataElement,
+  varchar(900) path : string ref,
+  int column: int ref,
+  varchar(900) value : string ref
+);
+
+snapshotDate(unique date snapshotDate : date ref);
+
+sourceLocationPrefix(varchar(900) prefix : 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;
+
+compilations(unique int id: @compilation, string cwd: string ref);
+
+#keyset[id, num]
+compilation_args(int id: @compilation ref, int num: int ref, string arg: string ref);
+
+#keyset[id, num, kind]
+compilation_time(int id: @compilation ref, int num: int ref, int kind: int ref, float secs: float ref);
+
+diagnostic_for(unique int diagnostic: @diagnostic ref, int compilation: @compilation ref, int file_number: int ref, int file_number_diagnostic_number: int ref);
+
+compilation_finished(unique int id: @compilation ref, float cpu_seconds: float ref, float elapsed_seconds: float ref);
+
+#keyset[id, num]
+compilation_compiling_files(int id: @compilation ref, int num: int ref, int file: @file 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);
+
+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);
+
+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);
+
+containerparent(int parent: @container ref, unique int child: @container ref);
+
+has_location(unique int locatable: @locatable ref, int location: @location ref);
+
+#keyset[parent, idx]
+comment_groups(unique int id: @comment_group, int parent: @file ref, int idx: int ref);
+
+comments(unique int id: @comment, int kind: int ref, int parent: @comment_group ref, int idx: int ref, string text: string ref);
+
+doc_comments(unique int node: @documentable ref, int comment: @comment_group ref);
+
+#keyset[parent, idx]
+exprs(unique int id: @expr, int kind: int ref, int parent: @exprparent ref, int idx: int ref);
+
+literals(unique int expr: @expr ref, string value: string ref, string raw: string ref);
+
+constvalues(unique int expr: @expr ref, string value: string ref, string exact: string ref);
+
+fields(unique int id: @field, int parent: @fieldparent ref, int idx: int ref);
+
+typeparamdecls(unique int id: @typeparamdecl, int parent: @typeparamdeclparent ref, int idx: int ref);
+
+#keyset[parent, idx]
+stmts(unique int id: @stmt, int kind: int ref, int parent: @stmtparent ref, int idx: int ref);
+
+#keyset[parent, idx]
+decls(unique int id: @decl, int kind: int ref, int parent: @declparent ref, int idx: int ref);
+
+#keyset[parent, idx]
+specs(unique int id: @spec, int kind: int ref, int parent: @gendecl ref, int idx: int ref);
+
+scopes(unique int id: @scope, int kind: int ref);
+
+scopenesting(unique int inner: @scope ref, int outer: @scope ref);
+
+scopenodes(unique int node: @scopenode ref, int scope: @localscope ref);
+
+objects(unique int id: @object, int kind: int ref, string name: string ref);
+
+objectscopes(unique int object: @object ref, int scope: @scope ref);
+
+objecttypes(unique int object: @object ref, int tp: @type ref);
+
+methodreceivers(unique int method: @object ref, int receiver: @object ref);
+
+fieldstructs(unique int field: @object ref, int struct: @structtype ref);
+
+methodhosts(int method: @object ref, int host: @namedtype ref);
+
+defs(int ident: @ident ref, int object: @object ref);
+
+uses(int ident: @ident ref, int object: @object ref);
+
+types(unique int id: @type, int kind: int ref);
+
+type_of(unique int expr: @expr ref, int tp: @type ref);
+
+typename(unique int tp: @type ref, string name: string ref);
+
+key_type(unique int map: @maptype ref, int tp: @type ref);
+
+element_type(unique int container: @containertype ref, int tp: @type ref);
+
+base_type(unique int ptr: @pointertype ref, int tp: @type ref);
+
+underlying_type(unique int named: @namedtype ref, int tp: @type ref);
+
+#keyset[parent, index]
+component_types(int parent: @compositetype ref, int index: int ref, string name: string ref, int tp: @type ref);
+
+array_length(unique int tp: @arraytype ref, string len: string ref);
+
+type_objects(unique int tp: @type ref, int object: @object ref);
+
+packages(unique int id: @package, string name: string ref, string path: string ref, int scope: @packagescope ref);
+
+#keyset[parent, idx]
+modexprs(unique int id: @modexpr, int kind: int ref, int parent: @modexprparent ref, int idx: int ref);
+
+#keyset[parent, idx]
+modtokens(string token: string ref, int parent: @modexpr ref, int idx: int ref);
+
+#keyset[package, idx]
+errors(unique int id: @error, int kind: int ref, string msg: string ref, string rawpos: string ref,
+       string file: string ref, int line: int ref, int col: int ref, int package: @package ref, int idx: int ref);
+
+has_ellipsis(int id: @callorconversionexpr ref);
+
+variadic(int id: @signaturetype ref);
+
+#keyset[parent, idx]
+typeparam(unique int tp: @typeparamtype ref, string name: string ref, int bound: @compositetype ref,
+          int parent: @typeparamparentobject ref, int idx: int ref);
+
+@container = @file | @folder;
+
+@locatable = @xmllocatable | @node | @localscope;
+
+@node = @documentable | @exprparent | @modexprparent | @fieldparent | @stmtparent | @declparent | @typeparamdeclparent
+      | @scopenode | @comment_group | @comment;
+
+@documentable = @file | @field | @typeparamdecl | @spec | @gendecl | @funcdecl | @modexpr;
+
+@exprparent = @funcdef | @file | @expr | @field | @stmt | @decl | @typeparamdecl | @spec;
+
+@modexprparent = @file | @modexpr;
+
+@fieldparent = @decl | @structtypeexpr | @functypeexpr | @interfacetypeexpr;
+
+@stmtparent = @funcdef | @stmt | @decl;
+
+@declparent = @file | @declstmt;
+
+@typeparamdeclparent = @funcdecl | @typespec;
+
+@funcdef = @funclit | @funcdecl;
+
+@scopenode = @file | @functypeexpr | @blockstmt | @ifstmt | @caseclause | @switchstmt | @commclause | @loopstmt;
+
+@location = @location_default;
+
+@sourceline = @locatable;
+
+case @comment.kind of
+  0 = @slashslashcomment
+| 1 = @slashstarcomment;
+
+case @expr.kind of
+  0 = @badexpr
+| 1 = @ident
+| 2 = @ellipsis
+| 3 = @intlit
+| 4 = @floatlit
+| 5 = @imaglit
+| 6 = @charlit
+| 7 = @stringlit
+| 8 = @funclit
+| 9 = @compositelit
+| 10 = @parenexpr
+| 11 = @selectorexpr
+| 12 = @indexexpr
+| 13 = @genericfunctioninstantiationexpr
+| 14 = @generictypeinstantiationexpr
+| 15 = @sliceexpr
+| 16 = @typeassertexpr
+| 17 = @callorconversionexpr
+| 18 = @starexpr
+| 19 = @keyvalueexpr
+| 20 = @arraytypeexpr
+| 21 = @structtypeexpr
+| 22 = @functypeexpr
+| 23 = @interfacetypeexpr
+| 24 = @maptypeexpr
+| 25 = @typesetliteralexpr
+| 26 = @plusexpr
+| 27 = @minusexpr
+| 28 = @notexpr
+| 29 = @complementexpr
+| 30 = @derefexpr
+| 31 = @addressexpr
+| 32 = @arrowexpr
+| 33 = @lorexpr
+| 34 = @landexpr
+| 35 = @eqlexpr
+| 36 = @neqexpr
+| 37 = @lssexpr
+| 38 = @leqexpr
+| 39 = @gtrexpr
+| 40 = @geqexpr
+| 41 = @addexpr
+| 42 = @subexpr
+| 43 = @orexpr
+| 44 = @xorexpr
+| 45 = @mulexpr
+| 46 = @quoexpr
+| 47 = @remexpr
+| 48 = @shlexpr
+| 49 = @shrexpr
+| 50 = @andexpr
+| 51 = @andnotexpr
+| 52 = @sendchantypeexpr
+| 53 = @recvchantypeexpr
+| 54 = @sendrcvchantypeexpr;
+
+@basiclit = @intlit | @floatlit | @imaglit | @charlit | @stringlit;
+
+@operatorexpr = @logicalexpr | @arithmeticexpr | @bitwiseexpr | @unaryexpr | @binaryexpr;
+
+@logicalexpr = @logicalunaryexpr | @logicalbinaryexpr;
+
+@arithmeticexpr = @arithmeticunaryexpr | @arithmeticbinaryexpr;
+
+@bitwiseexpr = @bitwiseunaryexpr | @bitwisebinaryexpr;
+
+@unaryexpr = @logicalunaryexpr | @bitwiseunaryexpr | @arithmeticunaryexpr | @derefexpr | @addressexpr | @arrowexpr;
+
+@logicalunaryexpr = @notexpr;
+
+@bitwiseunaryexpr = @complementexpr;
+
+@arithmeticunaryexpr = @plusexpr | @minusexpr;
+
+@binaryexpr = @logicalbinaryexpr | @bitwisebinaryexpr | @arithmeticbinaryexpr | @comparison;
+
+@logicalbinaryexpr = @lorexpr | @landexpr;
+
+@bitwisebinaryexpr = @shiftexpr | @orexpr | @xorexpr | @andexpr | @andnotexpr;
+
+@arithmeticbinaryexpr = @addexpr | @subexpr | @mulexpr | @quoexpr | @remexpr;
+
+@shiftexpr = @shlexpr | @shrexpr;
+
+@comparison = @equalitytest | @relationalcomparison;
+
+@equalitytest = @eqlexpr | @neqexpr;
+
+@relationalcomparison = @lssexpr | @leqexpr | @gtrexpr | @geqexpr;
+
+@chantypeexpr = @sendchantypeexpr | @recvchantypeexpr | @sendrcvchantypeexpr;
+
+case @stmt.kind of
+  0 = @badstmt
+| 1 = @declstmt
+| 2 = @emptystmt
+| 3 = @labeledstmt
+| 4 = @exprstmt
+| 5 = @sendstmt
+| 6 = @incstmt
+| 7 = @decstmt
+| 8 = @gostmt
+| 9 = @deferstmt
+| 10 = @returnstmt
+| 11 = @breakstmt
+| 12 = @continuestmt
+| 13 = @gotostmt
+| 14 = @fallthroughstmt
+| 15 = @blockstmt
+| 16 = @ifstmt
+| 17 = @caseclause
+| 18 = @exprswitchstmt
+| 19 = @typeswitchstmt
+| 20 = @commclause
+| 21 = @selectstmt
+| 22 = @forstmt
+| 23 = @rangestmt
+| 24 = @assignstmt
+| 25 = @definestmt
+| 26 = @addassignstmt
+| 27 = @subassignstmt
+| 28 = @mulassignstmt
+| 29 = @quoassignstmt
+| 30 = @remassignstmt
+| 31 = @andassignstmt
+| 32 = @orassignstmt
+| 33 = @xorassignstmt
+| 34 = @shlassignstmt
+| 35 = @shrassignstmt
+| 36 = @andnotassignstmt;
+
+@incdecstmt = @incstmt | @decstmt;
+
+@assignment = @simpleassignstmt | @compoundassignstmt;
+
+@simpleassignstmt = @assignstmt | @definestmt;
+
+@compoundassignstmt = @addassignstmt | @subassignstmt | @mulassignstmt | @quoassignstmt | @remassignstmt
+                    | @andassignstmt | @orassignstmt | @xorassignstmt | @shlassignstmt | @shrassignstmt | @andnotassignstmt;
+
+@branchstmt = @breakstmt | @continuestmt | @gotostmt | @fallthroughstmt;
+
+@switchstmt = @exprswitchstmt | @typeswitchstmt;
+
+@loopstmt = @forstmt | @rangestmt;
+
+case @decl.kind of
+  0 = @baddecl
+| 1 = @importdecl
+| 2 = @constdecl
+| 3 = @typedecl
+| 4 = @vardecl
+| 5 = @funcdecl;
+
+@gendecl = @importdecl | @constdecl | @typedecl | @vardecl;
+
+case @spec.kind of
+  0 = @importspec
+| 1 = @valuespec
+| 2 = @typedefspec
+| 3 = @aliasspec;
+
+@typespec = @typedefspec | @aliasspec;
+
+case @object.kind of
+  0 = @pkgobject
+| 1 = @decltypeobject
+| 2 = @builtintypeobject
+| 3 = @declconstobject
+| 4 = @builtinconstobject
+| 5 = @declvarobject
+| 6 = @declfunctionobject
+| 7 = @builtinfunctionobject
+| 8 = @labelobject;
+
+@typeparamparentobject = @decltypeobject | @declfunctionobject;
+
+@declobject = @decltypeobject | @declconstobject | @declvarobject | @declfunctionobject;
+
+@builtinobject = @builtintypeobject | @builtinconstobject | @builtinfunctionobject;
+
+@typeobject = @decltypeobject | @builtintypeobject;
+
+@valueobject = @constobject | @varobject | @functionobject;
+
+@constobject = @declconstobject | @builtinconstobject;
+
+@varobject = @declvarobject;
+
+@functionobject = @declfunctionobject | @builtinfunctionobject;
+
+case @scope.kind of
+  0 = @universescope
+| 1 = @packagescope
+| 2 = @localscope;
+
+case @type.kind of
+  0 = @invalidtype
+| 1 = @boolexprtype
+| 2 = @inttype
+| 3 = @int8type
+| 4 = @int16type
+| 5 = @int32type
+| 6 = @int64type
+| 7 = @uinttype
+| 8 = @uint8type
+| 9 = @uint16type
+| 10 = @uint32type
+| 11 = @uint64type
+| 12 = @uintptrtype
+| 13 = @float32type
+| 14 = @float64type
+| 15 = @complex64type
+| 16 = @complex128type
+| 17 = @stringexprtype
+| 18 = @unsafepointertype
+| 19 = @boolliteraltype
+| 20 = @intliteraltype
+| 21 = @runeliteraltype
+| 22 = @floatliteraltype
+| 23 = @complexliteraltype
+| 24 = @stringliteraltype
+| 25 = @nilliteraltype
+| 26 = @typeparamtype
+| 27 = @arraytype
+| 28 = @slicetype
+| 29 = @structtype
+| 30 = @pointertype
+| 31 = @interfacetype
+| 32 = @tupletype
+| 33 = @signaturetype
+| 34 = @maptype
+| 35 = @sendchantype
+| 36 = @recvchantype
+| 37 = @sendrcvchantype
+| 38 = @namedtype
+| 39 = @typesetliteraltype;
+
+@basictype = @booltype | @numerictype | @stringtype | @literaltype | @invalidtype | @unsafepointertype;
+
+@booltype = @boolexprtype | @boolliteraltype;
+
+@numerictype = @integertype | @floattype | @complextype;
+
+@integertype = @signedintegertype | @unsignedintegertype;
+
+@signedintegertype = @inttype | @int8type | @int16type | @int32type | @int64type | @intliteraltype | @runeliteraltype;
+
+@unsignedintegertype = @uinttype | @uint8type | @uint16type | @uint32type | @uint64type | @uintptrtype;
+
+@floattype = @float32type | @float64type | @floatliteraltype;
+
+@complextype = @complex64type | @complex128type | @complexliteraltype;
+
+@stringtype = @stringexprtype | @stringliteraltype;
+
+@literaltype = @boolliteraltype | @intliteraltype | @runeliteraltype | @floatliteraltype | @complexliteraltype
+             | @stringliteraltype | @nilliteraltype;
+
+@compositetype = @typeparamtype | @containertype | @structtype | @pointertype | @interfacetype | @tupletype
+               | @signaturetype | @namedtype | @typesetliteraltype;
+
+@containertype = @arraytype | @slicetype | @maptype | @chantype;
+
+@chantype = @sendchantype | @recvchantype | @sendrcvchantype;
+
+case @modexpr.kind of
+  0 = @modcommentblock
+| 1 = @modline
+| 2 = @modlineblock
+| 3 = @modlparen
+| 4 = @modrparen;
+
+case @error.kind of
+  0 = @unknownerror
+| 1 = @listerror
+| 2 = @parseerror
+| 3 = @typeerror;
+
diff --git a/go/downgrades/4bd57e093275e5e892dfb16b55ed4bd76ea662be/old.dbscheme b/go/downgrades/4bd57e093275e5e892dfb16b55ed4bd76ea662be/old.dbscheme
new file mode 100644
index 00000000000..4bd57e09327
--- /dev/null
+++ b/go/downgrades/4bd57e093275e5e892dfb16b55ed4bd76ea662be/old.dbscheme
@@ -0,0 +1,552 @@
+/** Auto-generated dbscheme; do not edit. Run `make gen` in directory `go/` to regenerate. */
+
+
+/** Duplicate code **/
+
+duplicateCode(
+  unique int id : @duplication,
+  varchar(900) relativePath : string ref,
+  int equivClass : int ref);
+
+similarCode(
+  unique int id : @similarity,
+  varchar(900) relativePath : string ref,
+  int equivClass : int ref);
+
+@duplication_or_similarity = @duplication | @similarity;
+
+tokens(
+  int id : @duplication_or_similarity ref,
+  int offset : int ref,
+  int beginLine : int ref,
+  int beginColumn : int ref,
+  int endLine : int ref,
+  int endColumn : int ref);
+
+/** External data **/
+
+externalData(
+  int id : @externalDataElement,
+  varchar(900) path : string ref,
+  int column: int ref,
+  varchar(900) value : string ref
+);
+
+snapshotDate(unique date snapshotDate : date ref);
+
+sourceLocationPrefix(varchar(900) prefix : 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;
+
+compilations(unique int id: @compilation, string cwd: string ref);
+
+#keyset[id, num]
+compilation_args(int id: @compilation ref, int num: int ref, string arg: string ref);
+
+#keyset[id, num, kind]
+compilation_time(int id: @compilation ref, int num: int ref, int kind: int ref, float secs: float ref);
+
+diagnostic_for(unique int diagnostic: @diagnostic ref, int compilation: @compilation ref, int file_number: int ref, int file_number_diagnostic_number: int ref);
+
+compilation_finished(unique int id: @compilation ref, float cpu_seconds: float ref, float elapsed_seconds: float ref);
+
+#keyset[id, num]
+compilation_compiling_files(int id: @compilation ref, int num: int ref, int file: @file 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);
+
+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);
+
+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);
+
+containerparent(int parent: @container ref, unique int child: @container ref);
+
+has_location(unique int locatable: @locatable ref, int location: @location ref);
+
+#keyset[parent, idx]
+comment_groups(unique int id: @comment_group, int parent: @file ref, int idx: int ref);
+
+comments(unique int id: @comment, int kind: int ref, int parent: @comment_group ref, int idx: int ref, string text: string ref);
+
+doc_comments(unique int node: @documentable ref, int comment: @comment_group ref);
+
+#keyset[parent, idx]
+exprs(unique int id: @expr, int kind: int ref, int parent: @exprparent ref, int idx: int ref);
+
+literals(unique int expr: @expr ref, string value: string ref, string raw: string ref);
+
+constvalues(unique int expr: @expr ref, string value: string ref, string exact: string ref);
+
+fields(unique int id: @field, int parent: @fieldparent ref, int idx: int ref);
+
+typeparamdecls(unique int id: @typeparamdecl, int parent: @typeparamdeclparent ref, int idx: int ref);
+
+#keyset[parent, idx]
+stmts(unique int id: @stmt, int kind: int ref, int parent: @stmtparent ref, int idx: int ref);
+
+#keyset[parent, idx]
+decls(unique int id: @decl, int kind: int ref, int parent: @declparent ref, int idx: int ref);
+
+#keyset[parent, idx]
+specs(unique int id: @spec, int kind: int ref, int parent: @gendecl ref, int idx: int ref);
+
+scopes(unique int id: @scope, int kind: int ref);
+
+scopenesting(unique int inner: @scope ref, int outer: @scope ref);
+
+scopenodes(unique int node: @scopenode ref, int scope: @localscope ref);
+
+objects(unique int id: @object, int kind: int ref, string name: string ref);
+
+objectscopes(unique int object: @object ref, int scope: @scope ref);
+
+objecttypes(unique int object: @object ref, int tp: @type ref);
+
+methodreceivers(unique int method: @object ref, int receiver: @object ref);
+
+fieldstructs(unique int field: @object ref, int struct: @structtype ref);
+
+methodhosts(int method: @object ref, int host: @namedtype ref);
+
+defs(int ident: @ident ref, int object: @object ref);
+
+uses(int ident: @ident ref, int object: @object ref);
+
+types(unique int id: @type, int kind: int ref);
+
+type_of(unique int expr: @expr ref, int tp: @type ref);
+
+typename(unique int tp: @type ref, string name: string ref);
+
+key_type(unique int map: @maptype ref, int tp: @type ref);
+
+element_type(unique int container: @containertype ref, int tp: @type ref);
+
+base_type(unique int ptr: @pointertype ref, int tp: @type ref);
+
+underlying_type(unique int named: @namedtype ref, int tp: @type ref);
+
+#keyset[parent, index]
+component_types(int parent: @compositetype ref, int index: int ref, string name: string ref, int tp: @type ref);
+
+#keyset[parent, index]
+struct_tags(int parent: @structtype ref, int index: int ref, string tag: string ref);
+
+#keyset[interface, index]
+interface_private_method_ids(int interface: @interfacetype ref, int index: int ref, string id: string ref);
+
+array_length(unique int tp: @arraytype ref, string len: string ref);
+
+type_objects(unique int tp: @type ref, int object: @object ref);
+
+packages(unique int id: @package, string name: string ref, string path: string ref, int scope: @packagescope ref);
+
+#keyset[parent, idx]
+modexprs(unique int id: @modexpr, int kind: int ref, int parent: @modexprparent ref, int idx: int ref);
+
+#keyset[parent, idx]
+modtokens(string token: string ref, int parent: @modexpr ref, int idx: int ref);
+
+#keyset[package, idx]
+errors(unique int id: @error, int kind: int ref, string msg: string ref, string rawpos: string ref,
+       string file: string ref, int line: int ref, int col: int ref, int package: @package ref, int idx: int ref);
+
+has_ellipsis(int id: @callorconversionexpr ref);
+
+variadic(int id: @signaturetype ref);
+
+#keyset[parent, idx]
+typeparam(unique int tp: @typeparamtype ref, string name: string ref, int bound: @compositetype ref,
+          int parent: @typeparamparentobject ref, int idx: int ref);
+
+@container = @file | @folder;
+
+@locatable = @xmllocatable | @node | @localscope;
+
+@node = @documentable | @exprparent | @modexprparent | @fieldparent | @stmtparent | @declparent | @typeparamdeclparent
+      | @scopenode | @comment_group | @comment;
+
+@documentable = @file | @field | @typeparamdecl | @spec | @gendecl | @funcdecl | @modexpr;
+
+@exprparent = @funcdef | @file | @expr | @field | @stmt | @decl | @typeparamdecl | @spec;
+
+@modexprparent = @file | @modexpr;
+
+@fieldparent = @decl | @structtypeexpr | @functypeexpr | @interfacetypeexpr;
+
+@stmtparent = @funcdef | @stmt | @decl;
+
+@declparent = @file | @declstmt;
+
+@typeparamdeclparent = @funcdecl | @typespec;
+
+@funcdef = @funclit | @funcdecl;
+
+@scopenode = @file | @functypeexpr | @blockstmt | @ifstmt | @caseclause | @switchstmt | @commclause | @loopstmt;
+
+@location = @location_default;
+
+@sourceline = @locatable;
+
+case @comment.kind of
+  0 = @slashslashcomment
+| 1 = @slashstarcomment;
+
+case @expr.kind of
+  0 = @badexpr
+| 1 = @ident
+| 2 = @ellipsis
+| 3 = @intlit
+| 4 = @floatlit
+| 5 = @imaglit
+| 6 = @charlit
+| 7 = @stringlit
+| 8 = @funclit
+| 9 = @compositelit
+| 10 = @parenexpr
+| 11 = @selectorexpr
+| 12 = @indexexpr
+| 13 = @genericfunctioninstantiationexpr
+| 14 = @generictypeinstantiationexpr
+| 15 = @sliceexpr
+| 16 = @typeassertexpr
+| 17 = @callorconversionexpr
+| 18 = @starexpr
+| 19 = @keyvalueexpr
+| 20 = @arraytypeexpr
+| 21 = @structtypeexpr
+| 22 = @functypeexpr
+| 23 = @interfacetypeexpr
+| 24 = @maptypeexpr
+| 25 = @typesetliteralexpr
+| 26 = @plusexpr
+| 27 = @minusexpr
+| 28 = @notexpr
+| 29 = @complementexpr
+| 30 = @derefexpr
+| 31 = @addressexpr
+| 32 = @arrowexpr
+| 33 = @lorexpr
+| 34 = @landexpr
+| 35 = @eqlexpr
+| 36 = @neqexpr
+| 37 = @lssexpr
+| 38 = @leqexpr
+| 39 = @gtrexpr
+| 40 = @geqexpr
+| 41 = @addexpr
+| 42 = @subexpr
+| 43 = @orexpr
+| 44 = @xorexpr
+| 45 = @mulexpr
+| 46 = @quoexpr
+| 47 = @remexpr
+| 48 = @shlexpr
+| 49 = @shrexpr
+| 50 = @andexpr
+| 51 = @andnotexpr
+| 52 = @sendchantypeexpr
+| 53 = @recvchantypeexpr
+| 54 = @sendrcvchantypeexpr;
+
+@basiclit = @intlit | @floatlit | @imaglit | @charlit | @stringlit;
+
+@operatorexpr = @logicalexpr | @arithmeticexpr | @bitwiseexpr | @unaryexpr | @binaryexpr;
+
+@logicalexpr = @logicalunaryexpr | @logicalbinaryexpr;
+
+@arithmeticexpr = @arithmeticunaryexpr | @arithmeticbinaryexpr;
+
+@bitwiseexpr = @bitwiseunaryexpr | @bitwisebinaryexpr;
+
+@unaryexpr = @logicalunaryexpr | @bitwiseunaryexpr | @arithmeticunaryexpr | @derefexpr | @addressexpr | @arrowexpr;
+
+@logicalunaryexpr = @notexpr;
+
+@bitwiseunaryexpr = @complementexpr;
+
+@arithmeticunaryexpr = @plusexpr | @minusexpr;
+
+@binaryexpr = @logicalbinaryexpr | @bitwisebinaryexpr | @arithmeticbinaryexpr | @comparison;
+
+@logicalbinaryexpr = @lorexpr | @landexpr;
+
+@bitwisebinaryexpr = @shiftexpr | @orexpr | @xorexpr | @andexpr | @andnotexpr;
+
+@arithmeticbinaryexpr = @addexpr | @subexpr | @mulexpr | @quoexpr | @remexpr;
+
+@shiftexpr = @shlexpr | @shrexpr;
+
+@comparison = @equalitytest | @relationalcomparison;
+
+@equalitytest = @eqlexpr | @neqexpr;
+
+@relationalcomparison = @lssexpr | @leqexpr | @gtrexpr | @geqexpr;
+
+@chantypeexpr = @sendchantypeexpr | @recvchantypeexpr | @sendrcvchantypeexpr;
+
+case @stmt.kind of
+  0 = @badstmt
+| 1 = @declstmt
+| 2 = @emptystmt
+| 3 = @labeledstmt
+| 4 = @exprstmt
+| 5 = @sendstmt
+| 6 = @incstmt
+| 7 = @decstmt
+| 8 = @gostmt
+| 9 = @deferstmt
+| 10 = @returnstmt
+| 11 = @breakstmt
+| 12 = @continuestmt
+| 13 = @gotostmt
+| 14 = @fallthroughstmt
+| 15 = @blockstmt
+| 16 = @ifstmt
+| 17 = @caseclause
+| 18 = @exprswitchstmt
+| 19 = @typeswitchstmt
+| 20 = @commclause
+| 21 = @selectstmt
+| 22 = @forstmt
+| 23 = @rangestmt
+| 24 = @assignstmt
+| 25 = @definestmt
+| 26 = @addassignstmt
+| 27 = @subassignstmt
+| 28 = @mulassignstmt
+| 29 = @quoassignstmt
+| 30 = @remassignstmt
+| 31 = @andassignstmt
+| 32 = @orassignstmt
+| 33 = @xorassignstmt
+| 34 = @shlassignstmt
+| 35 = @shrassignstmt
+| 36 = @andnotassignstmt;
+
+@incdecstmt = @incstmt | @decstmt;
+
+@assignment = @simpleassignstmt | @compoundassignstmt;
+
+@simpleassignstmt = @assignstmt | @definestmt;
+
+@compoundassignstmt = @addassignstmt | @subassignstmt | @mulassignstmt | @quoassignstmt | @remassignstmt
+                    | @andassignstmt | @orassignstmt | @xorassignstmt | @shlassignstmt | @shrassignstmt | @andnotassignstmt;
+
+@branchstmt = @breakstmt | @continuestmt | @gotostmt | @fallthroughstmt;
+
+@switchstmt = @exprswitchstmt | @typeswitchstmt;
+
+@loopstmt = @forstmt | @rangestmt;
+
+case @decl.kind of
+  0 = @baddecl
+| 1 = @importdecl
+| 2 = @constdecl
+| 3 = @typedecl
+| 4 = @vardecl
+| 5 = @funcdecl;
+
+@gendecl = @importdecl | @constdecl | @typedecl | @vardecl;
+
+case @spec.kind of
+  0 = @importspec
+| 1 = @valuespec
+| 2 = @typedefspec
+| 3 = @aliasspec;
+
+@typespec = @typedefspec | @aliasspec;
+
+case @object.kind of
+  0 = @pkgobject
+| 1 = @decltypeobject
+| 2 = @builtintypeobject
+| 3 = @declconstobject
+| 4 = @builtinconstobject
+| 5 = @declvarobject
+| 6 = @declfunctionobject
+| 7 = @builtinfunctionobject
+| 8 = @labelobject;
+
+@typeparamparentobject = @decltypeobject | @declfunctionobject;
+
+@declobject = @decltypeobject | @declconstobject | @declvarobject | @declfunctionobject;
+
+@builtinobject = @builtintypeobject | @builtinconstobject | @builtinfunctionobject;
+
+@typeobject = @decltypeobject | @builtintypeobject;
+
+@valueobject = @constobject | @varobject | @functionobject;
+
+@constobject = @declconstobject | @builtinconstobject;
+
+@varobject = @declvarobject;
+
+@functionobject = @declfunctionobject | @builtinfunctionobject;
+
+case @scope.kind of
+  0 = @universescope
+| 1 = @packagescope
+| 2 = @localscope;
+
+case @type.kind of
+  0 = @invalidtype
+| 1 = @boolexprtype
+| 2 = @inttype
+| 3 = @int8type
+| 4 = @int16type
+| 5 = @int32type
+| 6 = @int64type
+| 7 = @uinttype
+| 8 = @uint8type
+| 9 = @uint16type
+| 10 = @uint32type
+| 11 = @uint64type
+| 12 = @uintptrtype
+| 13 = @float32type
+| 14 = @float64type
+| 15 = @complex64type
+| 16 = @complex128type
+| 17 = @stringexprtype
+| 18 = @unsafepointertype
+| 19 = @boolliteraltype
+| 20 = @intliteraltype
+| 21 = @runeliteraltype
+| 22 = @floatliteraltype
+| 23 = @complexliteraltype
+| 24 = @stringliteraltype
+| 25 = @nilliteraltype
+| 26 = @typeparamtype
+| 27 = @arraytype
+| 28 = @slicetype
+| 29 = @structtype
+| 30 = @pointertype
+| 31 = @interfacetype
+| 32 = @tupletype
+| 33 = @signaturetype
+| 34 = @maptype
+| 35 = @sendchantype
+| 36 = @recvchantype
+| 37 = @sendrcvchantype
+| 38 = @namedtype
+| 39 = @typesetliteraltype;
+
+@basictype = @booltype | @numerictype | @stringtype | @literaltype | @invalidtype | @unsafepointertype;
+
+@booltype = @boolexprtype | @boolliteraltype;
+
+@numerictype = @integertype | @floattype | @complextype;
+
+@integertype = @signedintegertype | @unsignedintegertype;
+
+@signedintegertype = @inttype | @int8type | @int16type | @int32type | @int64type | @intliteraltype | @runeliteraltype;
+
+@unsignedintegertype = @uinttype | @uint8type | @uint16type | @uint32type | @uint64type | @uintptrtype;
+
+@floattype = @float32type | @float64type | @floatliteraltype;
+
+@complextype = @complex64type | @complex128type | @complexliteraltype;
+
+@stringtype = @stringexprtype | @stringliteraltype;
+
+@literaltype = @boolliteraltype | @intliteraltype | @runeliteraltype | @floatliteraltype | @complexliteraltype
+             | @stringliteraltype | @nilliteraltype;
+
+@compositetype = @typeparamtype | @containertype | @structtype | @pointertype | @interfacetype | @tupletype
+               | @signaturetype | @namedtype | @typesetliteraltype;
+
+@containertype = @arraytype | @slicetype | @maptype | @chantype;
+
+@chantype = @sendchantype | @recvchantype | @sendrcvchantype;
+
+case @modexpr.kind of
+  0 = @modcommentblock
+| 1 = @modline
+| 2 = @modlineblock
+| 3 = @modlparen
+| 4 = @modrparen;
+
+case @error.kind of
+  0 = @unknownerror
+| 1 = @listerror
+| 2 = @parseerror
+| 3 = @typeerror;
+
diff --git a/go/downgrades/4bd57e093275e5e892dfb16b55ed4bd76ea662be/upgrade.properties b/go/downgrades/4bd57e093275e5e892dfb16b55ed4bd76ea662be/upgrade.properties
new file mode 100644
index 00000000000..0cda1e3644f
--- /dev/null
+++ b/go/downgrades/4bd57e093275e5e892dfb16b55ed4bd76ea662be/upgrade.properties
@@ -0,0 +1,5 @@
+description: Remove component-tags and interface-method-id tables
+compatibility: full
+
+struct_tags.rel: delete
+interface_private_method_ids.rel: delete
diff --git a/go/extractor/cli/go-extractor/go-extractor.go b/go/extractor/cli/go-extractor/go-extractor.go
index 00d3c8e7de1..425af6cd55d 100644
--- a/go/extractor/cli/go-extractor/go-extractor.go
+++ b/go/extractor/cli/go-extractor/go-extractor.go
@@ -21,7 +21,9 @@ func usage() {
 	fmt.Fprintf(os.Stderr, "--help                Print this help.\n")
 }
 
-func parseFlags(args []string, mimic bool) ([]string, []string) {
+// extractTests is set (a) if we were manually commanded to extract tests via the relevant
+// environment variable / extractor option, or (b) we're mimicking a `go test` command.
+func parseFlags(args []string, mimic bool, extractTests bool) ([]string, []string, bool) {
 	i := 0
 	buildFlags := []string{}
 	for ; i < len(args) && strings.HasPrefix(args[i], "-"); i++ {
@@ -44,9 +46,9 @@ func parseFlags(args []string, mimic bool) ([]string, []string) {
 					if i+1 < len(args) {
 						i++
 						command := args[i]
-						if command == "build" || command == "install" || command == "run" {
-							log.Printf("Intercepting build")
-							return parseFlags(args[i+1:], true)
+						if command == "build" || command == "install" || command == "run" || command == "test" {
+							log.Printf("Intercepting build for %s command", command)
+							return parseFlags(args[i+1:], true, command == "test")
 						} else {
 							log.Printf("Non-build command '%s'; skipping", strings.Join(args[1:], " "))
 							os.Exit(0)
@@ -63,12 +65,12 @@ func parseFlags(args []string, mimic bool) ([]string, []string) {
 
 		// parse go build flags
 		switch args[i] {
-		// skip `-o output` and `-i`, if applicable
+		// skip `-o output`, `-i` and `-c`, if applicable
 		case "-o":
 			if i+1 < len(args) {
 				i++
 			}
-		case "-i":
+		case "-i", "-c":
 		case "-p", "-asmflags", "-buildmode", "-compiler", "-gccgoflags", "-gcflags", "-installsuffix",
 			"-ldflags", "-mod", "-modfile", "-pkgdir", "-tags", "-toolexec", "-overlay":
 			if i+1 < len(args) {
@@ -90,11 +92,12 @@ func parseFlags(args []string, mimic bool) ([]string, []string) {
 	cpuprofile = os.Getenv("CODEQL_EXTRACTOR_GO_CPU_PROFILE")
 	memprofile = os.Getenv("CODEQL_EXTRACTOR_GO_MEM_PROFILE")
 
-	return buildFlags, args[i:]
+	return buildFlags, args[i:], extractTests
 }
 
 func main() {
-	buildFlags, patterns := parseFlags(os.Args[1:], false)
+	extractTestsDefault := os.Getenv("CODEQL_EXTRACTOR_GO_OPTION_EXTRACT_TESTS") == "true"
+	buildFlags, patterns, extractTests := parseFlags(os.Args[1:], false, extractTestsDefault)
 
 	if cpuprofile != "" {
 		f, err := os.Create(cpuprofile)
@@ -114,7 +117,7 @@ func main() {
 	}
 
 	log.Printf("Build flags: '%s'; patterns: '%s'\n", strings.Join(buildFlags, " "), strings.Join(patterns, " "))
-	err := extractor.ExtractWithFlags(buildFlags, patterns)
+	err := extractor.ExtractWithFlags(buildFlags, patterns, extractTests)
 	if err != nil {
 		errString := err.Error()
 		if strings.Contains(errString, "unexpected directory layout:") {
diff --git a/go/extractor/configurebaseline/configurebaseline.go b/go/extractor/configurebaseline/configurebaseline.go
index f8e2c998f8c..04037d61425 100644
--- a/go/extractor/configurebaseline/configurebaseline.go
+++ b/go/extractor/configurebaseline/configurebaseline.go
@@ -28,7 +28,8 @@ type BaselineConfig struct {
 func GetConfigBaselineAsJSON(rootDir string) ([]byte, error) {
 	vendorDirs := make([]string, 0)
 
-	if util.IsVendorDirExtractionEnabled() {
+	extractVendorDirs, _ := util.IsVendorDirExtractionEnabled()
+	if extractVendorDirs {
 		// The user wants vendor directories scanned; emit an empty report.
 	} else {
 		filepath.WalkDir(rootDir, func(dirPath string, d fs.DirEntry, err error) error {
diff --git a/go/extractor/dbscheme/dbscheme.go b/go/extractor/dbscheme/dbscheme.go
index 923fda859db..550c7920c71 100644
--- a/go/extractor/dbscheme/dbscheme.go
+++ b/go/extractor/dbscheme/dbscheme.go
@@ -410,7 +410,7 @@ func AddDefaultSnippet(snippet string) bool {
 
 // PrintDbScheme prints the schema of this database to the writer `w`
 func PrintDbScheme(w io.Writer) {
-	fmt.Fprintf(w, "/** Auto-generated dbscheme; do not edit. */\n\n")
+	fmt.Fprintf(w, "/** Auto-generated dbscheme; do not edit. Run `make gen` in directory `go/` to regenerate. */\n\n")
 	for _, snippet := range defaultSnippets {
 		fmt.Fprintf(w, "%s\n", snippet)
 	}
diff --git a/go/extractor/dbscheme/tables.go b/go/extractor/dbscheme/tables.go
index e987cb402ae..aa44c624842 100644
--- a/go/extractor/dbscheme/tables.go
+++ b/go/extractor/dbscheme/tables.go
@@ -1150,6 +1150,20 @@ var ComponentTypesTable = NewTable("component_types",
 	EntityColumn(TypeType, "tp"),
 ).KeySet("parent", "index")
 
+// StructTagsTable is the table associating struct types with their component types' tags
+var StructTagsTable = NewTable("struct_tags",
+	EntityColumn(StructType, "parent"),
+	IntColumn("index"),
+	StringColumn("tag"),
+).KeySet("parent", "index")
+
+// InterfacePrivateMethodIdsTable is the table associating interface types with the indices and ids of their private methods.
+var InterfacePrivateMethodIdsTable = NewTable("interface_private_method_ids",
+	EntityColumn(InterfaceType, "interface"),
+	IntColumn("index"),
+	StringColumn("id"),
+).KeySet("interface", "index")
+
 // ArrayLengthTable is the table associating array types with their length (represented as a string
 // since Go array lengths are 64-bit and hence do not always fit into a QL integer)
 var ArrayLengthTable = NewTable("array_length",
diff --git a/go/extractor/extractor.go b/go/extractor/extractor.go
index 31fa2ceb413..c0eef233ba5 100644
--- a/go/extractor/extractor.go
+++ b/go/extractor/extractor.go
@@ -59,11 +59,11 @@ func init() {
 
 // Extract extracts the packages specified by the given patterns
 func Extract(patterns []string) error {
-	return ExtractWithFlags(nil, patterns)
+	return ExtractWithFlags(nil, patterns, false)
 }
 
 // ExtractWithFlags extracts the packages specified by the given patterns and build flags
-func ExtractWithFlags(buildFlags []string, patterns []string) error {
+func ExtractWithFlags(buildFlags []string, patterns []string, extractTests bool) error {
 	startTime := time.Now()
 
 	extraction := NewExtraction(buildFlags, patterns)
@@ -81,7 +81,30 @@ func ExtractWithFlags(buildFlags []string, patterns []string) error {
 		}
 	}
 
-	log.Println("Running packages.Load.")
+	// If CODEQL_EXTRACTOR_GO_[OPTION_]EXTRACT_VENDOR_DIRS is "true", we extract `vendor` directories;
+	// otherwise (the default) is to exclude them from extraction
+	includeVendor, oldOptionUsed := util.IsVendorDirExtractionEnabled()
+
+	if oldOptionUsed {
+		log.Println("Warning: obsolete option \"CODEQL_EXTRACTOR_GO_EXTRACT_VENDOR_DIRS\" was set. Use \"CODEQL_EXTRACTOR_GO_OPTION_EXTRACT_VENDOR_DIRS\" or pass `--extractor-option extract_vendor_dirs=true` instead.")
+	}
+
+	modeNotifications := make([]string, 0, 2)
+	if extractTests {
+		modeNotifications = append(modeNotifications, "test extraction enabled")
+	}
+	if includeVendor {
+		modeNotifications = append(modeNotifications, "extracting vendor directories")
+	}
+
+	modeMessage := strings.Join(modeNotifications, ", ")
+	if modeMessage != "" {
+		modeMessage = " (" + modeMessage + ")"
+	}
+	log.Printf("Running packages.Load%s.", modeMessage)
+
+	// This includes test packages if either we're tracing a `go test` command,
+	// or if CODEQL_EXTRACTOR_GO_OPTION_EXTRACT_TESTS is set to "true".
 	cfg := &packages.Config{
 		Mode: packages.NeedName | packages.NeedFiles |
 			packages.NeedCompiledGoFiles |
@@ -89,6 +112,7 @@ func ExtractWithFlags(buildFlags []string, patterns []string) error {
 			packages.NeedTypes | packages.NeedTypesSizes |
 			packages.NeedTypesInfo | packages.NeedSyntax,
 		BuildFlags: buildFlags,
+		Tests:      extractTests,
 	}
 	pkgs, err := packages.Load(cfg, patterns...)
 	if err != nil {
@@ -123,7 +147,7 @@ func ExtractWithFlags(buildFlags []string, patterns []string) error {
 	if os.Getenv("CODEQL_EXTRACTOR_GO_FAST_PACKAGE_INFO") != "false" {
 		log.Printf("Running go list to resolve package and module directories.")
 		// get all packages information
-		pkgInfos, err = toolchain.GetPkgsInfo(patterns, true, modFlags...)
+		pkgInfos, err = toolchain.GetPkgsInfo(patterns, true, extractTests, modFlags...)
 		if err != nil {
 			log.Fatalf("Error getting dependency package or module directories: %v.", err)
 		}
@@ -132,8 +156,36 @@ func ExtractWithFlags(buildFlags []string, patterns []string) error {
 
 	pkgsNotFound := make([]string, 0, len(pkgs))
 
+	// Build a map from package paths to their longest IDs--
+	// in the context of a `go test -c` compilation, we will see the same package more than
+	// once, with IDs like "abc.com/pkgname [abc.com/pkgname.test]" to distinguish the version
+	// that contains and is used by test code.
+	// For our purposes it is simplest to just ignore the non-test version, since the test
+	// version seems to be a superset of it.
+	longestPackageIds := make(map[string]string)
+	packages.Visit(pkgs, nil, func(pkg *packages.Package) {
+		if longestIDSoFar, present := longestPackageIds[pkg.PkgPath]; present {
+			if len(pkg.ID) > len(longestIDSoFar) {
+				longestPackageIds[pkg.PkgPath] = pkg.ID
+			}
+		} else {
+			longestPackageIds[pkg.PkgPath] = pkg.ID
+		}
+	})
+
 	// Do a post-order traversal and extract the package scope of each package
 	packages.Visit(pkgs, nil, func(pkg *packages.Package) {
+		// Note that if test extraction is enabled, we will encounter a package twice here:
+		// once as the main package, and once as the test package (with a package ID like
+		// "abc.com/pkgname [abc.com/pkgname.test]").
+		//
+		// We will extract it both times however, because we need to visit the packages
+		// in the right order in order to visit used types before their users, and the
+		// ordering determined by packages.Visit for the main and the test package may differ.
+		//
+		// This should only cause some wasted time and not inconsistency because the names for
+		// objects seen in this process should be the same each time.
+
 		log.Printf("Processing package %s.", pkg.PkgPath)
 
 		if _, ok := pkgInfos[pkg.PkgPath]; !ok {
@@ -197,9 +249,6 @@ func ExtractWithFlags(buildFlags []string, patterns []string) error {
 	// Construct a list of directory segments to exclude from extraction, starting with ".."
 	excludedDirs := []string{`\.\.`}
 
-	// If CODEQL_EXTRACTOR_GO_EXTRACT_VENDOR_DIRS is "true", we extract `vendor` directories;
-	// otherwise (the default) is to exclude them from extraction
-	includeVendor := util.IsVendorDirExtractionEnabled()
 	if !includeVendor {
 		excludedDirs = append(excludedDirs, "vendor")
 	}
@@ -210,6 +259,19 @@ func ExtractWithFlags(buildFlags []string, patterns []string) error {
 
 	// extract AST information for all packages
 	packages.Visit(pkgs, nil, func(pkg *packages.Package) {
+
+		// If this is a variant of a package that also occurs with a longer ID, skip it;
+		// otherwise we would extract the same file more than once including extracting the
+		// body of methods twice, causing database inconsistencies.
+		//
+		// We prefer the version with the longest ID because that is (so far as I know) always
+		// the version that defines more entities -- the only case I'm aware of being a test
+		// variant of a package, which includes test-only functions in addition to the complete
+		// contents of the main variant.
+		if pkg.ID != longestPackageIds[pkg.PkgPath] {
+			return
+		}
+
 		for root := range wantedRoots {
 			pkgInfo := pkgInfos[pkg.PkgPath]
 			relDir, err := filepath.Rel(root, pkgInfo.PkgDir)
@@ -456,6 +518,7 @@ func extractMethod(tw *trap.Writer, meth *types.Func) trap.Label {
 // For more information on objects, see:
 // https://github.com/golang/example/blob/master/gotypes/README.md#objects
 func extractObject(tw *trap.Writer, obj types.Object, lbl trap.Label) {
+	checkObjectNotSpecialized(obj)
 	name := obj.Name()
 	isBuiltin := obj.Parent() == types.Universe
 	var kind int
@@ -1545,7 +1608,7 @@ func extractType(tw *trap.Writer, tp types.Type) trap.Label {
 		case *types.Struct:
 			kind = dbscheme.StructType.Index()
 			for i := 0; i < tp.NumFields(); i++ {
-				field := tp.Field(i)
+				field := tp.Field(i).Origin()
 
 				// ensure the field is associated with a label - note that
 				// struct fields do not have a parent scope, so they are not
@@ -1562,6 +1625,9 @@ func extractType(tw *trap.Writer, tp types.Type) trap.Label {
 					name = ""
 				}
 				extractComponentType(tw, lbl, i, name, field.Type())
+				if tp.Tag(i) != "" {
+					dbscheme.StructTagsTable.Emit(tw, lbl, i, tp.Tag(i))
+				}
 			}
 		case *types.Pointer:
 			kind = dbscheme.PointerType.Index()
@@ -1569,13 +1635,20 @@ func extractType(tw *trap.Writer, tp types.Type) trap.Label {
 		case *types.Interface:
 			kind = dbscheme.InterfaceType.Index()
 			for i := 0; i < tp.NumMethods(); i++ {
-				meth := tp.Method(i)
+				// Note that methods coming from embedded interfaces can be
+				// accessed through `Method(i)`, so there is no need to
+				// deal with them separately.
+				meth := tp.Method(i).Origin()
 
 				// Note that methods do not have a parent scope, so they are
 				// not dealt with by `extractScopes`
 				extractMethod(tw, meth)
 
 				extractComponentType(tw, lbl, i, meth.Name(), meth.Type())
+
+				if !meth.Exported() {
+					dbscheme.InterfacePrivateMethodIdsTable.Emit(tw, lbl, i, meth.Id())
+				}
 			}
 			for i := 0; i < tp.NumEmbeddeds(); i++ {
 				component := tp.EmbeddedType(i)
@@ -1635,18 +1708,29 @@ func extractType(tw *trap.Writer, tp types.Type) trap.Label {
 			// ensure all methods have labels - note that methods do not have a
 			// parent scope, so they are not dealt with by `extractScopes`
 			for i := 0; i < origintp.NumMethods(); i++ {
-				meth := origintp.Method(i)
+				meth := origintp.Method(i).Origin()
 
 				extractMethod(tw, meth)
 			}
 
+			underlyingInterface, underlyingIsInterface := underlying.(*types.Interface)
+			_, underlyingIsPointer := underlying.(*types.Pointer)
+
 			// associate all methods of underlying interface with this type
-			if underlyingInterface, ok := underlying.(*types.Interface); ok {
+			if underlyingIsInterface {
 				for i := 0; i < underlyingInterface.NumMethods(); i++ {
-					methlbl := extractMethod(tw, underlyingInterface.Method(i))
+					methlbl := extractMethod(tw, underlyingInterface.Method(i).Origin())
 					dbscheme.MethodHostsTable.Emit(tw, methlbl, lbl)
 				}
 			}
+
+			// If `underlying` is not a pointer or interface then methods can
+			// be defined on `origintp`. In this case we must ensure that
+			// `*origintp` is in the database, so that Method.hasQualifiedName
+			// correctly includes methods with receiver type `*origintp`.
+			if !underlyingIsInterface && !underlyingIsPointer {
+				extractType(tw, types.NewPointer(origintp))
+			}
 		case *types.TypeParam:
 			kind = dbscheme.TypeParamType.Index()
 			parentlbl := getTypeParamParentLabel(tw, tp)
@@ -1715,7 +1799,7 @@ func getTypeLabel(tw *trap.Writer, tp types.Type) (trap.Label, bool) {
 		case *types.Interface:
 			var b strings.Builder
 			for i := 0; i < tp.NumMethods(); i++ {
-				meth := tp.Method(i)
+				meth := tp.Method(i).Origin()
 				methLbl := extractType(tw, meth.Type())
 				if i > 0 {
 					b.WriteString(",")
@@ -2071,3 +2155,20 @@ func skipExtractingValueForLeftOperand(tw *trap.Writer, be *ast.BinaryExpr) bool
 	}
 	return true
 }
+
+// checkObjectNotSpecialized exits the program if `obj` is specialized. Note
+// that specialization is only possible for function objects and variable
+// objects.
+func checkObjectNotSpecialized(obj types.Object) {
+	if funcObj, ok := obj.(*types.Func); ok && funcObj != funcObj.Origin() {
+		log.Fatalf("Encountered unexpected specialization %s of generic function object %s", funcObj.FullName(), funcObj.Origin().FullName())
+	}
+	if varObj, ok := obj.(*types.Var); ok && varObj != varObj.Origin() {
+		log.Fatalf("Encountered unexpected specialization %s of generic variable object %s", varObj.String(), varObj.Origin().String())
+	}
+	if typeNameObj, ok := obj.(*types.TypeName); ok {
+		if namedType, ok := typeNameObj.Type().(*types.Named); ok && namedType != namedType.Origin() {
+			log.Fatalf("Encountered type object for specialization %s of named type %s", namedType.String(), namedType.Origin().String())
+		}
+	}
+}
diff --git a/go/extractor/go.mod b/go/extractor/go.mod
index 9c0c3ce3204..c5e1ecf09ff 100644
--- a/go/extractor/go.mod
+++ b/go/extractor/go.mod
@@ -9,8 +9,8 @@ toolchain go1.23.1
 // when adding or removing dependencies, run
 //    bazel mod tidy
 require (
-	golang.org/x/mod v0.21.0
-	golang.org/x/tools v0.24.0
+	golang.org/x/mod v0.22.0
+	golang.org/x/tools v0.27.0
 )
 
-require golang.org/x/sync v0.8.0 // indirect
+require golang.org/x/sync v0.9.0 // indirect
diff --git a/go/extractor/go.sum b/go/extractor/go.sum
index c062882a5a6..a10e428fcbc 100644
--- a/go/extractor/go.sum
+++ b/go/extractor/go.sum
@@ -1,6 +1,6 @@
-golang.org/x/mod v0.21.0 h1:vvrHzRwRfVKSiLrG+d4FMl/Qi4ukBCE6kZlTUkDYRT0=
-golang.org/x/mod v0.21.0/go.mod h1:6SkKJ3Xj0I0BrPOZoBy3bdMptDDU9oJrpohJ3eWZ1fY=
-golang.org/x/sync v0.8.0 h1:3NFvSEYkUoMifnESzZl15y791HH1qU2xm6eCJU5ZPXQ=
-golang.org/x/sync v0.8.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
-golang.org/x/tools v0.24.0 h1:J1shsA93PJUEVaUSaay7UXAyE8aimq3GW0pjlolpa24=
-golang.org/x/tools v0.24.0/go.mod h1:YhNqVBIfWHdzvTLs0d8LCuMhkKUgSUKldakyV7W/WDQ=
+golang.org/x/mod v0.22.0 h1:D4nJWe9zXqHOmWqj4VMOJhvzj7bEZg4wEYa759z1pH4=
+golang.org/x/mod v0.22.0/go.mod h1:6SkKJ3Xj0I0BrPOZoBy3bdMptDDU9oJrpohJ3eWZ1fY=
+golang.org/x/sync v0.9.0 h1:fEo0HyrW1GIgZdpbhCRO0PkJajUS5H9IFUztCgEo2jQ=
+golang.org/x/sync v0.9.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
+golang.org/x/tools v0.27.0 h1:qEKojBykQkQ4EynWy4S8Weg69NumxKdn40Fce3uc/8o=
+golang.org/x/tools v0.27.0/go.mod h1:sUi0ZgbwW9ZPAq26Ekut+weQPR5eIM6GQLQ1Yjm1H0Q=
diff --git a/go/extractor/toolchain/toolchain.go b/go/extractor/toolchain/toolchain.go
index 02939043237..119e3782f6f 100644
--- a/go/extractor/toolchain/toolchain.go
+++ b/go/extractor/toolchain/toolchain.go
@@ -223,7 +223,7 @@ type PkgInfo struct {
 // GetPkgsInfo gets the absolute module and package root directories for the packages matched by the
 // patterns `patterns`. It passes to `go list` the flags specified by `flags`.  If `includingDeps`
 // is true, all dependencies will also be included.
-func GetPkgsInfo(patterns []string, includingDeps bool, flags ...string) (map[string]PkgInfo, error) {
+func GetPkgsInfo(patterns []string, includingDeps bool, extractTests bool, flags ...string) (map[string]PkgInfo, error) {
 	// enable module mode so that we can find a module root if it exists, even if go module support is
 	// disabled by a build
 	if includingDeps {
@@ -231,6 +231,11 @@ func GetPkgsInfo(patterns []string, includingDeps bool, flags ...string) (map[st
 		flags = append(flags, "-deps")
 	}
 
+	if extractTests {
+		// Without the `-test` flag, test packages would be omitted from the `go list` output.
+		flags = append(flags, "-test")
+	}
+
 	// using -json overrides -f format
 	output, err := RunList("", patterns, append(flags, "-json")...)
 	if err != nil {
@@ -272,6 +277,12 @@ func GetPkgsInfo(patterns []string, includingDeps bool, flags ...string) (map[st
 			PkgDir: pkgAbsDir,
 			ModDir: modAbsDir,
 		}
+
+		if extractTests && strings.Contains(pkgInfo.ImportPath, " [") {
+			// Assume " [" is the start of a qualifier, and index the package by its base name
+			baseImportPath := strings.Split(pkgInfo.ImportPath, " [")[0]
+			pkgInfoMapping[baseImportPath] = pkgInfoMapping[pkgInfo.ImportPath]
+		}
 	}
 	return pkgInfoMapping, nil
 }
diff --git a/go/extractor/util/extractvendordirs.go b/go/extractor/util/extractvendordirs.go
index 778d5120cf2..adeb2461f89 100644
--- a/go/extractor/util/extractvendordirs.go
+++ b/go/extractor/util/extractvendordirs.go
@@ -4,6 +4,8 @@ import (
 	"os"
 )
 
-func IsVendorDirExtractionEnabled() bool {
-	return os.Getenv("CODEQL_EXTRACTOR_GO_EXTRACT_VENDOR_DIRS") == "true"
+func IsVendorDirExtractionEnabled() (bool, bool) {
+	oldOptionVal := os.Getenv("CODEQL_EXTRACTOR_GO_EXTRACT_VENDOR_DIRS")
+	return (oldOptionVal == "true" ||
+		os.Getenv("CODEQL_EXTRACTOR_GO_OPTION_EXTRACT_VENDOR_DIRS") == "true"), oldOptionVal != ""
 }
diff --git a/go/ql/consistency-queries/CHANGELOG.md b/go/ql/consistency-queries/CHANGELOG.md
index 7e87aa46357..1c514d078a2 100644
--- a/go/ql/consistency-queries/CHANGELOG.md
+++ b/go/ql/consistency-queries/CHANGELOG.md
@@ -1,3 +1,15 @@
+## 1.0.11
+
+No user-facing changes.
+
+## 1.0.10
+
+No user-facing changes.
+
+## 1.0.9
+
+No user-facing changes.
+
 ## 1.0.8
 
 No user-facing changes.
diff --git a/go/ql/consistency-queries/change-notes/released/1.0.10.md b/go/ql/consistency-queries/change-notes/released/1.0.10.md
new file mode 100644
index 00000000000..b601d878453
--- /dev/null
+++ b/go/ql/consistency-queries/change-notes/released/1.0.10.md
@@ -0,0 +1,3 @@
+## 1.0.10
+
+No user-facing changes.
diff --git a/go/ql/consistency-queries/change-notes/released/1.0.11.md b/go/ql/consistency-queries/change-notes/released/1.0.11.md
new file mode 100644
index 00000000000..245e0812108
--- /dev/null
+++ b/go/ql/consistency-queries/change-notes/released/1.0.11.md
@@ -0,0 +1,3 @@
+## 1.0.11
+
+No user-facing changes.
diff --git a/go/ql/consistency-queries/change-notes/released/1.0.9.md b/go/ql/consistency-queries/change-notes/released/1.0.9.md
new file mode 100644
index 00000000000..ee073f7ec16
--- /dev/null
+++ b/go/ql/consistency-queries/change-notes/released/1.0.9.md
@@ -0,0 +1,3 @@
+## 1.0.9
+
+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 5c55fbd52ed..56a2fb38872 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.8
+lastReleaseVersion: 1.0.11
diff --git a/go/ql/consistency-queries/qlpack.yml b/go/ql/consistency-queries/qlpack.yml
index b7a6550ede1..b7c67080f46 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.9-dev
+version: 1.0.12-dev
 groups:
   - go
   - queries
diff --git a/go/ql/integration-tests/extract-vendor/test.py b/go/ql/integration-tests/extract-vendor/test.py
index 04dfd61c38f..ff28cc6fe9a 100644
--- a/go/ql/integration-tests/extract-vendor/test.py
+++ b/go/ql/integration-tests/extract-vendor/test.py
@@ -4,3 +4,6 @@ import os
 def test(codeql, go):
     os.environ["CODEQL_EXTRACTOR_GO_EXTRACT_VENDOR_DIRS"] = "true"
     codeql.database.create(source_root="src")
+
+def test_extractor_option(codeql, go):
+    codeql.database.create(source_root="src", extractor_option = "extract_vendor_dirs=true")
diff --git a/go/ql/integration-tests/go-mod-sample/src/blackbox_test.go b/go/ql/integration-tests/go-mod-sample/src/blackbox_test.go
new file mode 100644
index 00000000000..c3f434a7aa1
--- /dev/null
+++ b/go/ql/integration-tests/go-mod-sample/src/blackbox_test.go
@@ -0,0 +1,16 @@
+package makesample_test
+
+import (
+	"makesample"
+	"testing"
+)
+
+// Note because this is a test we do NOT expect this to be extracted.
+func TestTestMe(t *testing.T) {
+
+	publicResult := makesample.PublicFunction()
+	if publicResult != 1 {
+		t.Errorf("Expected 1, got %d", publicResult)
+	}
+
+}
diff --git a/go/ql/integration-tests/go-mod-sample/src/test.go b/go/ql/integration-tests/go-mod-sample/src/test.go
index 824c0b04c72..c3f0f284d4a 100644
--- a/go/ql/integration-tests/go-mod-sample/src/test.go
+++ b/go/ql/integration-tests/go-mod-sample/src/test.go
@@ -10,3 +10,7 @@ func test() {
 	header.Version = 4
 
 }
+
+func PublicFunction() int {
+	return 1
+}
diff --git a/go/ql/integration-tests/go-mod-sample/src/test_test.go b/go/ql/integration-tests/go-mod-sample/src/test_test.go
new file mode 100644
index 00000000000..6693a016350
--- /dev/null
+++ b/go/ql/integration-tests/go-mod-sample/src/test_test.go
@@ -0,0 +1,15 @@
+package makesample
+
+import (
+	"testing"
+)
+
+func TestTestMe(t *testing.T) {
+
+	// Note because this is a test we do NOT expect this to be extracted.
+	publicResult := PublicFunction()
+	if publicResult != 1 {
+		t.Errorf("Expected 1, got %d", publicResult)
+	}
+
+}
diff --git a/go/ql/integration-tests/test-extraction/src/Makefile b/go/ql/integration-tests/test-extraction/src/Makefile
new file mode 100644
index 00000000000..266e0287788
--- /dev/null
+++ b/go/ql/integration-tests/test-extraction/src/Makefile
@@ -0,0 +1,2 @@
+all:
+	go get
diff --git a/go/ql/integration-tests/test-extraction/src/go.mod b/go/ql/integration-tests/test-extraction/src/go.mod
new file mode 100644
index 00000000000..dae010718cf
--- /dev/null
+++ b/go/ql/integration-tests/test-extraction/src/go.mod
@@ -0,0 +1,3 @@
+go 1.18
+
+module testsample
diff --git a/go/ql/integration-tests/test-extraction/src/go.sum b/go/ql/integration-tests/test-extraction/src/go.sum
new file mode 100644
index 00000000000..a8e1b59ae4b
--- /dev/null
+++ b/go/ql/integration-tests/test-extraction/src/go.sum
@@ -0,0 +1,45 @@
+github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
+golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
+golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
+golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU=
+golang.org/x/crypto v0.21.0/go.mod h1:0BP7YvVV9gBbVKyeTG0Gyn+gZm94bibOW5BjDEYAOMs=
+golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
+golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
+golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
+golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
+golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
+golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg=
+golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44=
+golang.org/x/net v0.23.0 h1:7EYJ93RZ9vYSZAIb2x3lnuvqO5zneoD6IvWjuhfxjTs=
+golang.org/x/net v0.23.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg=
+golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4=
+golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
+golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
+golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
+golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo=
+golang.org/x/term v0.17.0/go.mod h1:lLRBjIVuehSbZlaOtGMbcMncT+aqLLLmKrsjNrUguwk=
+golang.org/x/term v0.18.0/go.mod h1:ILwASektA3OnRv7amZ1xhE/KTR+u50pbXfZ03+6Nx58=
+golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
+golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
+golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
+golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
+golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
+golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
+golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
+golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
diff --git a/go/ql/integration-tests/test-extraction/src/pkg1/def.go b/go/ql/integration-tests/test-extraction/src/pkg1/def.go
new file mode 100644
index 00000000000..e768e81b89d
--- /dev/null
+++ b/go/ql/integration-tests/test-extraction/src/pkg1/def.go
@@ -0,0 +1,7 @@
+package pkg1
+
+type Generic[T any] struct {
+	element T
+}
+
+func TestMe() {}
diff --git a/go/ql/integration-tests/test-extraction/src/pkg1/def_blackbox_test.go b/go/ql/integration-tests/test-extraction/src/pkg1/def_blackbox_test.go
new file mode 100644
index 00000000000..09c9474567a
--- /dev/null
+++ b/go/ql/integration-tests/test-extraction/src/pkg1/def_blackbox_test.go
@@ -0,0 +1,9 @@
+package pkg1_test
+
+import (
+	"testsample/pkg1"
+)
+
+func UsePkg1() {
+	pkg1.TestMe()
+}
diff --git a/go/ql/integration-tests/test-extraction/src/pkg1/def_test.go b/go/ql/integration-tests/test-extraction/src/pkg1/def_test.go
new file mode 100644
index 00000000000..f321ab577c9
--- /dev/null
+++ b/go/ql/integration-tests/test-extraction/src/pkg1/def_test.go
@@ -0,0 +1,5 @@
+package pkg1
+
+func UsePkg1() {
+	TestMe()
+}
diff --git a/go/ql/integration-tests/test-extraction/src/pkg2/use.go b/go/ql/integration-tests/test-extraction/src/pkg2/use.go
new file mode 100644
index 00000000000..8caabc3847e
--- /dev/null
+++ b/go/ql/integration-tests/test-extraction/src/pkg2/use.go
@@ -0,0 +1,12 @@
+package pkg2
+
+import (
+	"testsample/pkg1"
+)
+
+// This tests the case of cross-package generic type references
+// in the presence of test extraction. We need to make sure we
+// extract packages, including test variants, in the right order
+// such that we've seen pkg1.Generic before we try to use it here.
+
+type Specialised = pkg1.Generic[string]
diff --git a/go/ql/integration-tests/test-extraction/src/testme.go b/go/ql/integration-tests/test-extraction/src/testme.go
new file mode 100644
index 00000000000..e24138553ce
--- /dev/null
+++ b/go/ql/integration-tests/test-extraction/src/testme.go
@@ -0,0 +1,5 @@
+package testsample
+
+func PublicFunction() int { return 1 }
+
+func privateFunction() int { return 2 }
diff --git a/go/ql/integration-tests/test-extraction/src/testme_blackbox_test.go b/go/ql/integration-tests/test-extraction/src/testme_blackbox_test.go
new file mode 100644
index 00000000000..18a507b5aa3
--- /dev/null
+++ b/go/ql/integration-tests/test-extraction/src/testme_blackbox_test.go
@@ -0,0 +1,15 @@
+package testsample_test
+
+import (
+	"testing"
+	"testsample"
+)
+
+func TestTestMe(t *testing.T) {
+
+	publicResult := testsample.PublicFunction()
+	if publicResult != 1 {
+		t.Errorf("Expected 1, got %d", publicResult)
+	}
+
+}
diff --git a/go/ql/integration-tests/test-extraction/src/testme_test.go b/go/ql/integration-tests/test-extraction/src/testme_test.go
new file mode 100644
index 00000000000..183d7cd3dff
--- /dev/null
+++ b/go/ql/integration-tests/test-extraction/src/testme_test.go
@@ -0,0 +1,19 @@
+package testsample
+
+import (
+	"testing"
+)
+
+func TestTestMe(t *testing.T) {
+
+	publicResult := PublicFunction()
+	if publicResult != 1 {
+		t.Errorf("Expected 1, got %d", publicResult)
+	}
+
+	privateResult := privateFunction()
+	if privateResult != 2 {
+		t.Errorf("Expected 2, got %d", privateResult)
+	}
+
+}
diff --git a/go/ql/integration-tests/test-extraction/test.expected b/go/ql/integration-tests/test-extraction/test.expected
new file mode 100644
index 00000000000..77983c44807
--- /dev/null
+++ b/go/ql/integration-tests/test-extraction/test.expected
@@ -0,0 +1,15 @@
+#select
+| src/pkg1/def.go:0:0:0:0 | src/pkg1/def.go |
+| src/pkg1/def_blackbox_test.go:0:0:0:0 | src/pkg1/def_blackbox_test.go |
+| src/pkg1/def_test.go:0:0:0:0 | src/pkg1/def_test.go |
+| src/pkg2/use.go:0:0:0:0 | src/pkg2/use.go |
+| src/testme.go:0:0:0:0 | src/testme.go |
+| src/testme_blackbox_test.go:0:0:0:0 | src/testme_blackbox_test.go |
+| src/testme_test.go:0:0:0:0 | src/testme_test.go |
+calls
+| src/pkg1/def_blackbox_test.go:8:2:8:14 | call to TestMe | src/pkg1/def.go:7:1:7:16 | function declaration |
+| src/pkg1/def_test.go:4:2:4:9 | call to TestMe | src/pkg1/def.go:7:1:7:16 | function declaration |
+| src/testme_blackbox_test.go:10:18:10:44 | call to PublicFunction | src/testme.go:3:1:3:38 | function declaration |
+| src/testme_test.go:9:18:9:33 | call to PublicFunction | src/testme.go:3:1:3:38 | function declaration |
+| src/testme_test.go:14:19:14:35 | call to privateFunction | src/testme.go:5:1:5:39 | function declaration |
+extractionErrors
diff --git a/go/ql/integration-tests/test-extraction/test.py b/go/ql/integration-tests/test-extraction/test.py
new file mode 100644
index 00000000000..e25b4680114
--- /dev/null
+++ b/go/ql/integration-tests/test-extraction/test.py
@@ -0,0 +1,7 @@
+import os
+
+def test_traced(codeql, go):
+    codeql.database.create(source_root="src", command="go test -c ./...")
+
+def test_autobuild(codeql, go):
+    codeql.database.create(source_root="src", extractor_option = ["extract_tests=true"])
diff --git a/go/ql/integration-tests/test-extraction/test.ql b/go/ql/integration-tests/test-extraction/test.ql
new file mode 100644
index 00000000000..15eae895986
--- /dev/null
+++ b/go/ql/integration-tests/test-extraction/test.ql
@@ -0,0 +1,9 @@
+import go
+import semmle.go.DiagnosticsReporting
+
+from GoFile f
+select f
+
+query predicate calls(CallExpr ce, FuncDecl f) { f = ce.getTarget().getFuncDecl() }
+
+query predicate extractionErrors(string msg, int sev) { reportableDiagnostics(_, msg, sev) }
diff --git a/go/ql/integration-tests/traced-extraction/src/Makefile b/go/ql/integration-tests/traced-extraction/src/Makefile
new file mode 100644
index 00000000000..266e0287788
--- /dev/null
+++ b/go/ql/integration-tests/traced-extraction/src/Makefile
@@ -0,0 +1,2 @@
+all:
+	go get
diff --git a/go/ql/integration-tests/traced-extraction/src/go.mod b/go/ql/integration-tests/traced-extraction/src/go.mod
new file mode 100644
index 00000000000..c4a9f55df6c
--- /dev/null
+++ b/go/ql/integration-tests/traced-extraction/src/go.mod
@@ -0,0 +1,3 @@
+go 1.14
+
+module testsample
diff --git a/go/ql/integration-tests/traced-extraction/src/go.sum b/go/ql/integration-tests/traced-extraction/src/go.sum
new file mode 100644
index 00000000000..a8e1b59ae4b
--- /dev/null
+++ b/go/ql/integration-tests/traced-extraction/src/go.sum
@@ -0,0 +1,45 @@
+github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
+golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
+golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
+golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU=
+golang.org/x/crypto v0.21.0/go.mod h1:0BP7YvVV9gBbVKyeTG0Gyn+gZm94bibOW5BjDEYAOMs=
+golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
+golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
+golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
+golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
+golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
+golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg=
+golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44=
+golang.org/x/net v0.23.0 h1:7EYJ93RZ9vYSZAIb2x3lnuvqO5zneoD6IvWjuhfxjTs=
+golang.org/x/net v0.23.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg=
+golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4=
+golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
+golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
+golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
+golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo=
+golang.org/x/term v0.17.0/go.mod h1:lLRBjIVuehSbZlaOtGMbcMncT+aqLLLmKrsjNrUguwk=
+golang.org/x/term v0.18.0/go.mod h1:ILwASektA3OnRv7amZ1xhE/KTR+u50pbXfZ03+6Nx58=
+golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
+golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
+golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
+golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
+golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
+golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
+golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
+golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
diff --git a/go/ql/integration-tests/traced-extraction/src/testme.go b/go/ql/integration-tests/traced-extraction/src/testme.go
new file mode 100644
index 00000000000..e24138553ce
--- /dev/null
+++ b/go/ql/integration-tests/traced-extraction/src/testme.go
@@ -0,0 +1,5 @@
+package testsample
+
+func PublicFunction() int { return 1 }
+
+func privateFunction() int { return 2 }
diff --git a/go/ql/integration-tests/traced-extraction/src/testme_blackbox_test.go b/go/ql/integration-tests/traced-extraction/src/testme_blackbox_test.go
new file mode 100644
index 00000000000..728cc651d7a
--- /dev/null
+++ b/go/ql/integration-tests/traced-extraction/src/testme_blackbox_test.go
@@ -0,0 +1,16 @@
+package testsample_test
+
+import (
+	"testing"
+	"testsample"
+)
+
+func TestTestMe(t *testing.T) {
+
+	// Note because this is a test we do NOT expect it to be extracted
+	publicResult := testsample.PublicFunction()
+	if publicResult != 1 {
+		t.Errorf("Expected 1, got %d", publicResult)
+	}
+
+}
diff --git a/go/ql/integration-tests/traced-extraction/src/testme_test.go b/go/ql/integration-tests/traced-extraction/src/testme_test.go
new file mode 100644
index 00000000000..cc77c9dd37f
--- /dev/null
+++ b/go/ql/integration-tests/traced-extraction/src/testme_test.go
@@ -0,0 +1,20 @@
+package testsample
+
+import (
+	"testing"
+)
+
+func TestTestMe(t *testing.T) {
+
+	// Note because this is a test we do NOT expect it to be extracted
+	publicResult := PublicFunction()
+	if publicResult != 1 {
+		t.Errorf("Expected 1, got %d", publicResult)
+	}
+
+	privateResult := privateFunction()
+	if privateResult != 2 {
+		t.Errorf("Expected 2, got %d", privateResult)
+	}
+
+}
diff --git a/go/ql/integration-tests/traced-extraction/test.expected b/go/ql/integration-tests/traced-extraction/test.expected
new file mode 100644
index 00000000000..7b62d6d9298
--- /dev/null
+++ b/go/ql/integration-tests/traced-extraction/test.expected
@@ -0,0 +1,4 @@
+#select
+| src/testme.go:0:0:0:0 | src/testme.go |
+calls
+extractionErrors
diff --git a/go/ql/integration-tests/traced-extraction/test.py b/go/ql/integration-tests/traced-extraction/test.py
new file mode 100644
index 00000000000..fbb3f6a6d6c
--- /dev/null
+++ b/go/ql/integration-tests/traced-extraction/test.py
@@ -0,0 +1,4 @@
+import os
+
+def test(codeql, go):
+    codeql.database.create(source_root="src", command="go build")
diff --git a/go/ql/integration-tests/traced-extraction/test.ql b/go/ql/integration-tests/traced-extraction/test.ql
new file mode 100644
index 00000000000..15eae895986
--- /dev/null
+++ b/go/ql/integration-tests/traced-extraction/test.ql
@@ -0,0 +1,9 @@
+import go
+import semmle.go.DiagnosticsReporting
+
+from GoFile f
+select f
+
+query predicate calls(CallExpr ce, FuncDecl f) { f = ce.getTarget().getFuncDecl() }
+
+query predicate extractionErrors(string msg, int sev) { reportableDiagnostics(_, msg, sev) }
diff --git a/go/ql/lib/CHANGELOG.md b/go/ql/lib/CHANGELOG.md
index 6fe67e276c3..37f83fa8dda 100644
--- a/go/ql/lib/CHANGELOG.md
+++ b/go/ql/lib/CHANGELOG.md
@@ -1,3 +1,27 @@
+## 2.1.2
+
+### Minor Analysis Improvements
+
+* The AST viewer now shows type parameter declarations in the correct place in the AST.
+
+## 2.1.1
+
+### Minor Analysis Improvements
+
+* Added member predicates `StructTag.hasOwnFieldWithTag` and `Field.getTag`, which enable CodeQL queries to examine struct field tags.
+* Added member predicate `InterfaceType.hasPrivateMethodWithQualifiedName`, which enables CodeQL queries to distinguish interfaces with matching non-exported method names that are declared in different packages, and are therefore incompatible.
+* Local source models with the `stdin` source kind have been added for the variable `os.Stdin` and the functions `fmt.Scan`, `fmt.Scanf` and `fmt.Scanln`. You can optionally include threat models as appropriate when using the CodeQL CLI and in GitHub code scanning. For more information, see [Analyzing your code with CodeQL queries](https://docs.github.com/code-security/codeql-cli/getting-started-with-the-codeql-cli/analyzing-your-code-with-codeql-queries#including-model-packs-to-add-potential-sources-of-tainted-data>) and [Customizing your advanced setup for code scanning](https://docs.github.com/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/customizing-your-advanced-setup-for-code-scanning#extending-codeql-coverage-with-threat-models).
+
+## 2.1.0
+
+### Deprecated APIs
+
+* The class `ThreatModelFlowSource` has been renamed to `ActiveThreatModelSource` to more clearly reflect it only contains the currently active threat model sources. `ThreatModelFlowSource` has been marked as deprecated.
+
+### Minor Analysis Improvements
+
+* A method in the method set of an embedded field of a struct should not be promoted to the method set of the struct if the struct has a method with the same name. This was not being enforced, which meant that there were two methods with the same qualified name, and models were sometimes being applied when they shouldn't have been. This has now been fixed.
+
 ## 2.0.0
 
 ### Breaking Changes
@@ -9,13 +33,13 @@
 
 * When a function or type has more than one anonymous type parameters, they were mistakenly being treated as the same type parameter. This has now been fixed.
 * Local source models for reading and parsing environment variables have been added for the following libraries:
-  * `os`
-  * `syscall`
-  * `github.com/caarlos0/env`
-  * `github.com/gobuffalo/envy`
-  * `github.com/hashicorp/go-envparse`
-  * `github.com/joho/godotenv`
-  * `github.com/kelseyhightower/envconfig`
+  * os
+  * syscall
+  * github.com/caarlos0/env
+  * github.com/gobuffalo/envy
+  * github.com/hashicorp/go-envparse
+  * github.com/joho/godotenv
+  * github.com/kelseyhightower/envconfig
 * Local source models have been added for the APIs which open files in the `io/fs`, `io/ioutil` and `os` packages in the Go standard library. You can optionally include threat models as appropriate when using the CodeQL CLI and in GitHub code scanning. For more information, see [Analyzing your code with CodeQL queries](https://docs.github.com/code-security/codeql-cli/getting-started-with-the-codeql-cli/analyzing-your-code-with-codeql-queries#including-model-packs-to-add-potential-sources-of-tainted-data>) and [Customizing your advanced setup for code scanning](https://docs.github.com/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/customizing-your-advanced-setup-for-code-scanning#extending-codeql-coverage-with-threat-models).
 
 ### Bug Fixes
diff --git a/go/ql/lib/change-notes/2024-11-07-fix-missing-qualified-names-for-methods.md b/go/ql/lib/change-notes/2024-11-07-fix-missing-qualified-names-for-methods.md
new file mode 100644
index 00000000000..cd2dbb6c974
--- /dev/null
+++ b/go/ql/lib/change-notes/2024-11-07-fix-missing-qualified-names-for-methods.md
@@ -0,0 +1,4 @@
+---
+category: fix
+---
+* Fixed a bug which meant that some qualified names for promoted methods were not being recognised in some very specific circumstances.
diff --git a/go/ql/lib/change-notes/2024-11-11-models-as-data-subtypes-column.md b/go/ql/lib/change-notes/2024-11-11-models-as-data-subtypes-column.md
new file mode 100644
index 00000000000..25115f74d71
--- /dev/null
+++ b/go/ql/lib/change-notes/2024-11-11-models-as-data-subtypes-column.md
@@ -0,0 +1,4 @@
+---
+category: fix
+---
+* The behaviour of the `subtypes` column in models-as-data now matches other languages more closely.
diff --git a/go/ql/lib/change-notes/2024-11-12-models-as-data-subtypes-true.md b/go/ql/lib/change-notes/2024-11-12-models-as-data-subtypes-true.md
new file mode 100644
index 00000000000..b1c78815ea3
--- /dev/null
+++ b/go/ql/lib/change-notes/2024-11-12-models-as-data-subtypes-true.md
@@ -0,0 +1,4 @@
+---
+category: minorAnalysis
+---
+* The `subtypes` column has been set to true in all models-as-data models except some tests. This means that existing models will apply in some cases where they didn't before, which may lead to more alerts.
diff --git a/go/ql/lib/change-notes/released/2.1.0.md b/go/ql/lib/change-notes/released/2.1.0.md
new file mode 100644
index 00000000000..2feedfb0c15
--- /dev/null
+++ b/go/ql/lib/change-notes/released/2.1.0.md
@@ -0,0 +1,9 @@
+## 2.1.0
+
+### Deprecated APIs
+
+* The class `ThreatModelFlowSource` has been renamed to `ActiveThreatModelSource` to more clearly reflect it only contains the currently active threat model sources. `ThreatModelFlowSource` has been marked as deprecated.
+
+### Minor Analysis Improvements
+
+* A method in the method set of an embedded field of a struct should not be promoted to the method set of the struct if the struct has a method with the same name. This was not being enforced, which meant that there were two methods with the same qualified name, and models were sometimes being applied when they shouldn't have been. This has now been fixed.
diff --git a/go/ql/lib/change-notes/released/2.1.1.md b/go/ql/lib/change-notes/released/2.1.1.md
new file mode 100644
index 00000000000..7319120fd3c
--- /dev/null
+++ b/go/ql/lib/change-notes/released/2.1.1.md
@@ -0,0 +1,7 @@
+## 2.1.1
+
+### Minor Analysis Improvements
+
+* Added member predicates `StructTag.hasOwnFieldWithTag` and `Field.getTag`, which enable CodeQL queries to examine struct field tags.
+* Added member predicate `InterfaceType.hasPrivateMethodWithQualifiedName`, which enables CodeQL queries to distinguish interfaces with matching non-exported method names that are declared in different packages, and are therefore incompatible.
+* Local source models with the `stdin` source kind have been added for the variable `os.Stdin` and the functions `fmt.Scan`, `fmt.Scanf` and `fmt.Scanln`. You can optionally include threat models as appropriate when using the CodeQL CLI and in GitHub code scanning. For more information, see [Analyzing your code with CodeQL queries](https://docs.github.com/code-security/codeql-cli/getting-started-with-the-codeql-cli/analyzing-your-code-with-codeql-queries#including-model-packs-to-add-potential-sources-of-tainted-data>) and [Customizing your advanced setup for code scanning](https://docs.github.com/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/customizing-your-advanced-setup-for-code-scanning#extending-codeql-coverage-with-threat-models).
diff --git a/go/ql/lib/change-notes/released/2.1.2.md b/go/ql/lib/change-notes/released/2.1.2.md
new file mode 100644
index 00000000000..393a70101fd
--- /dev/null
+++ b/go/ql/lib/change-notes/released/2.1.2.md
@@ -0,0 +1,5 @@
+## 2.1.2
+
+### Minor Analysis Improvements
+
+* The AST viewer now shows type parameter declarations in the correct place in the AST.
diff --git a/go/ql/lib/codeql-pack.release.yml b/go/ql/lib/codeql-pack.release.yml
index 0abe6ccede0..1a4e53e8772 100644
--- a/go/ql/lib/codeql-pack.release.yml
+++ b/go/ql/lib/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 2.0.0
+lastReleaseVersion: 2.1.2
diff --git a/go/ql/lib/ext/fmt.model.yml b/go/ql/lib/ext/fmt.model.yml
index 5234b509933..cad64ce0fdf 100644
--- a/go/ql/lib/ext/fmt.model.yml
+++ b/go/ql/lib/ext/fmt.model.yml
@@ -8,14 +8,14 @@ extensions:
       - ["fmt", "ScanState", True, "Token", "", "", "Argument[receiver]", "ReturnValue[0]", "taint", "manual"]
       - ["fmt", "State", True, "Write", "", "", "Argument[0]", "Argument[receiver]", "taint", "manual"]
       - ["fmt", "Stringer", True, "String", "", "", "Argument[receiver]", "ReturnValue", "taint", "manual"]
-      - ["fmt", "", True, "Append", "", "", "Argument[0]", "ReturnValue", "taint", "manual"]
-      - ["fmt", "", True, "Append", "", "", "Argument[1].ArrayElement", "ReturnValue", "taint", "manual"]
-      - ["fmt", "", True, "Appendf", "", "", "Argument[0]", "ReturnValue", "taint", "manual"]
-      - ["fmt", "", True, "Appendf", "", "", "Argument[1]", "ReturnValue", "taint", "manual"]
-      - ["fmt", "", True, "Appendf", "", "", "Argument[2].ArrayElement", "ReturnValue", "taint", "manual"]
-      - ["fmt", "", True, "Appendln", "", "", "Argument[0]", "ReturnValue", "taint", "manual"]
-      - ["fmt", "", True, "Appendln", "", "", "Argument[1].ArrayElement", "ReturnValue", "taint", "manual"]
-      - ["fmt", "", True, "Sprint", "", "", "Argument[0].ArrayElement", "ReturnValue", "taint", "manual"]
-      - ["fmt", "", True, "Sprintf", "", "", "Argument[0]", "ReturnValue", "taint", "manual"]
-      - ["fmt", "", True, "Sprintf", "", "", "Argument[1].ArrayElement", "ReturnValue", "taint", "manual"]
-      - ["fmt", "", True, "Sprintln", "", "", "Argument[0].ArrayElement", "ReturnValue", "taint", "manual"]
+      - ["fmt", "", False, "Append", "", "", "Argument[0]", "ReturnValue", "taint", "manual"]
+      - ["fmt", "", False, "Append", "", "", "Argument[1].ArrayElement", "ReturnValue", "taint", "manual"]
+      - ["fmt", "", False, "Appendf", "", "", "Argument[0]", "ReturnValue", "taint", "manual"]
+      - ["fmt", "", False, "Appendf", "", "", "Argument[1]", "ReturnValue", "taint", "manual"]
+      - ["fmt", "", False, "Appendf", "", "", "Argument[2].ArrayElement", "ReturnValue", "taint", "manual"]
+      - ["fmt", "", False, "Appendln", "", "", "Argument[0]", "ReturnValue", "taint", "manual"]
+      - ["fmt", "", False, "Appendln", "", "", "Argument[1].ArrayElement", "ReturnValue", "taint", "manual"]
+      - ["fmt", "", False, "Sprint", "", "", "Argument[0].ArrayElement", "ReturnValue", "taint", "manual"]
+      - ["fmt", "", False, "Sprintf", "", "", "Argument[0]", "ReturnValue", "taint", "manual"]
+      - ["fmt", "", False, "Sprintf", "", "", "Argument[1].ArrayElement", "ReturnValue", "taint", "manual"]
+      - ["fmt", "", False, "Sprintln", "", "", "Argument[0].ArrayElement", "ReturnValue", "taint", "manual"]
diff --git a/go/ql/lib/ext/github.com.antchfx.htmlquery.model.yml b/go/ql/lib/ext/github.com.antchfx.htmlquery.model.yml
index f8481e58cb9..14402f65a8c 100644
--- a/go/ql/lib/ext/github.com.antchfx.htmlquery.model.yml
+++ b/go/ql/lib/ext/github.com.antchfx.htmlquery.model.yml
@@ -3,7 +3,7 @@ extensions:
       pack: codeql/go-all
       extensible: sinkModel
     data:
-      - ["github.com/antchfx/htmlquery", "", True, "Find", "", "", "Argument[1]", "xpath-injection", "manual"]
-      - ["github.com/antchfx/htmlquery", "", True, "FindOne", "", "", "Argument[1]", "xpath-injection", "manual"]
-      - ["github.com/antchfx/htmlquery", "", True, "Query", "", "", "Argument[1]", "xpath-injection", "manual"]
-      - ["github.com/antchfx/htmlquery", "", True, "QueryAll", "", "", "Argument[1]", "xpath-injection", "manual"]
+      - ["github.com/antchfx/htmlquery", "", False, "Find", "", "", "Argument[1]", "xpath-injection", "manual"]
+      - ["github.com/antchfx/htmlquery", "", False, "FindOne", "", "", "Argument[1]", "xpath-injection", "manual"]
+      - ["github.com/antchfx/htmlquery", "", False, "Query", "", "", "Argument[1]", "xpath-injection", "manual"]
+      - ["github.com/antchfx/htmlquery", "", False, "QueryAll", "", "", "Argument[1]", "xpath-injection", "manual"]
diff --git a/go/ql/lib/ext/github.com.antchfx.jsonquery.model.yml b/go/ql/lib/ext/github.com.antchfx.jsonquery.model.yml
index 436867a8ab5..f50bbff2ff4 100644
--- a/go/ql/lib/ext/github.com.antchfx.jsonquery.model.yml
+++ b/go/ql/lib/ext/github.com.antchfx.jsonquery.model.yml
@@ -3,7 +3,7 @@ extensions:
       pack: codeql/go-all
       extensible: sinkModel
     data:
-      - ["github.com/antchfx/jsonquery", "", True, "Find", "", "", "Argument[1]", "xpath-injection", "manual"]
-      - ["github.com/antchfx/jsonquery", "", True, "FindOne", "", "", "Argument[1]", "xpath-injection", "manual"]
-      - ["github.com/antchfx/jsonquery", "", True, "Query", "", "", "Argument[1]", "xpath-injection", "manual"]
-      - ["github.com/antchfx/jsonquery", "", True, "QueryAll", "", "", "Argument[1]", "xpath-injection", "manual"]
+      - ["github.com/antchfx/jsonquery", "", False, "Find", "", "", "Argument[1]", "xpath-injection", "manual"]
+      - ["github.com/antchfx/jsonquery", "", False, "FindOne", "", "", "Argument[1]", "xpath-injection", "manual"]
+      - ["github.com/antchfx/jsonquery", "", False, "Query", "", "", "Argument[1]", "xpath-injection", "manual"]
+      - ["github.com/antchfx/jsonquery", "", False, "QueryAll", "", "", "Argument[1]", "xpath-injection", "manual"]
diff --git a/go/ql/lib/ext/github.com.antchfx.xmlquery.model.yml b/go/ql/lib/ext/github.com.antchfx.xmlquery.model.yml
index 6da9327681d..5a9eec5af7e 100644
--- a/go/ql/lib/ext/github.com.antchfx.xmlquery.model.yml
+++ b/go/ql/lib/ext/github.com.antchfx.xmlquery.model.yml
@@ -3,11 +3,11 @@ extensions:
       pack: codeql/go-all
       extensible: sinkModel
     data:
-      - ["github.com/antchfx/xmlquery", "", True, "Find", "", "", "Argument[1]", "xpath-injection", "manual"]
-      - ["github.com/antchfx/xmlquery", "", True, "FindOne", "", "", "Argument[1]", "xpath-injection", "manual"]
-      - ["github.com/antchfx/xmlquery", "", True, "FindEach", "", "", "Argument[1]", "xpath-injection", "manual"]
-      - ["github.com/antchfx/xmlquery", "", True, "FindEachWithBreak", "", "", "Argument[1]", "xpath-injection", "manual"]
-      - ["github.com/antchfx/xmlquery", "", True, "Query", "", "", "Argument[1]", "xpath-injection", "manual"]
-      - ["github.com/antchfx/xmlquery", "", True, "QueryAll", "", "", "Argument[1]", "xpath-injection", "manual"]
+      - ["github.com/antchfx/xmlquery", "", False, "Find", "", "", "Argument[1]", "xpath-injection", "manual"]
+      - ["github.com/antchfx/xmlquery", "", False, "FindOne", "", "", "Argument[1]", "xpath-injection", "manual"]
+      - ["github.com/antchfx/xmlquery", "", False, "FindEach", "", "", "Argument[1]", "xpath-injection", "manual"]
+      - ["github.com/antchfx/xmlquery", "", False, "FindEachWithBreak", "", "", "Argument[1]", "xpath-injection", "manual"]
+      - ["github.com/antchfx/xmlquery", "", False, "Query", "", "", "Argument[1]", "xpath-injection", "manual"]
+      - ["github.com/antchfx/xmlquery", "", False, "QueryAll", "", "", "Argument[1]", "xpath-injection", "manual"]
       - ["github.com/antchfx/xmlquery", "Node", True, "SelectElement", "", "", "Argument[0]", "xpath-injection", "manual"]
       - ["github.com/antchfx/xmlquery", "Node", True, "SelectElements", "", "", "Argument[0]", "xpath-injection", "manual"]
diff --git a/go/ql/lib/ext/github.com.antchfx.xpath.model.yml b/go/ql/lib/ext/github.com.antchfx.xpath.model.yml
index dada694552f..bb087f381ad 100644
--- a/go/ql/lib/ext/github.com.antchfx.xpath.model.yml
+++ b/go/ql/lib/ext/github.com.antchfx.xpath.model.yml
@@ -3,7 +3,7 @@ extensions:
       pack: codeql/go-all
       extensible: sinkModel
     data:
-      - ["github.com/antchfx/xpath", "", True, "Compile", "", "", "Argument[0]", "xpath-injection", "manual"]
-      - ["github.com/antchfx/xpath", "", True, "CompileWithNS", "", "", "Argument[0]", "xpath-injection", "manual"]
-      - ["github.com/antchfx/xpath", "", True, "MustCompile", "", "", "Argument[0]", "xpath-injection", "manual"]
-      - ["github.com/antchfx/xpath", "", True, "Select", "", "", "Argument[1]", "xpath-injection", "manual"]
+      - ["github.com/antchfx/xpath", "", False, "Compile", "", "", "Argument[0]", "xpath-injection", "manual"]
+      - ["github.com/antchfx/xpath", "", False, "CompileWithNS", "", "", "Argument[0]", "xpath-injection", "manual"]
+      - ["github.com/antchfx/xpath", "", False, "MustCompile", "", "", "Argument[0]", "xpath-injection", "manual"]
+      - ["github.com/antchfx/xpath", "", False, "Select", "", "", "Argument[1]", "xpath-injection", "manual"]
diff --git a/go/ql/lib/ext/github.com.beego.beego.server.web.context.model.yml b/go/ql/lib/ext/github.com.beego.beego.server.web.context.model.yml
index e2c856af7e5..da59cc203df 100644
--- a/go/ql/lib/ext/github.com.beego.beego.server.web.context.model.yml
+++ b/go/ql/lib/ext/github.com.beego.beego.server.web.context.model.yml
@@ -11,7 +11,7 @@ extensions:
       extensible: sinkModel
     data:
       # path-injection
-      - ["group:beego-context", "BeegoOutput", False, "Download", "", "", "Argument[0]", "path-injection", "manual"]
+      - ["group:beego-context", "BeegoOutput", True, "Download", "", "", "Argument[0]", "path-injection", "manual"]
       # url-redirection
       - ["group:beego-context", "Context", True, "Redirect", "", "", "Argument[1]", "url-redirection", "manual"]
   - addsTo:
diff --git a/go/ql/lib/ext/github.com.beego.beego.server.web.model.yml b/go/ql/lib/ext/github.com.beego.beego.server.web.model.yml
index 8a11da7ad83..963000fffcc 100644
--- a/go/ql/lib/ext/github.com.beego.beego.server.web.model.yml
+++ b/go/ql/lib/ext/github.com.beego.beego.server.web.model.yml
@@ -12,9 +12,9 @@ extensions:
     data:
       # path-injection
       - ["group:beego", "", False, "Walk", "", "", "Argument[1]", "path-injection", "manual"]
-      - ["group:beego", "Controller", False, "SaveToFile", "", "", "Argument[1]", "path-injection", "manual"]
-      - ["group:beego", "Controller", False, "SaveToFileWithBuffer", "", "", "Argument[1]", "path-injection", "manual"] # only exists in v2
-      - ["group:beego", "FileSystem", False, "Open", "", "", "Argument[0]", "path-injection", "manual"]
+      - ["group:beego", "Controller", True, "SaveToFile", "", "", "Argument[1]", "path-injection", "manual"]
+      - ["group:beego", "Controller", True, "SaveToFileWithBuffer", "", "", "Argument[1]", "path-injection", "manual"] # only exists in v2
+      - ["group:beego", "FileSystem", True, "Open", "", "", "Argument[0]", "path-injection", "manual"]
       # url-redirection
       - ["group:beego", "Controller", True, "Redirect", "", "", "Argument[0]", "url-redirection", "manual"]
   - addsTo:
diff --git a/go/ql/lib/ext/github.com.christrenkamp.goxpath.model.yml b/go/ql/lib/ext/github.com.christrenkamp.goxpath.model.yml
index 6e527dd5d68..f5a4aeefb13 100644
--- a/go/ql/lib/ext/github.com.christrenkamp.goxpath.model.yml
+++ b/go/ql/lib/ext/github.com.christrenkamp.goxpath.model.yml
@@ -3,6 +3,6 @@ extensions:
       pack: codeql/go-all
       extensible: sinkModel
     data:
-      - ["github.com/ChrisTrenkamp/goxpath", "", True, "MustParse", "", "", "Argument[0]", "xpath-injection", "manual"]
-      - ["github.com/ChrisTrenkamp/goxpath", "", True, "Parse", "", "", "Argument[0]", "xpath-injection", "manual"]
-      - ["github.com/ChrisTrenkamp/goxpath", "", True, "ParseExec", "", "", "Argument[0]", "xpath-injection", "manual"]
+      - ["github.com/ChrisTrenkamp/goxpath", "", False, "MustParse", "", "", "Argument[0]", "xpath-injection", "manual"]
+      - ["github.com/ChrisTrenkamp/goxpath", "", False, "Parse", "", "", "Argument[0]", "xpath-injection", "manual"]
+      - ["github.com/ChrisTrenkamp/goxpath", "", False, "ParseExec", "", "", "Argument[0]", "xpath-injection", "manual"]
diff --git a/go/ql/lib/ext/github.com.codeskyblue.go-sh.model.yml b/go/ql/lib/ext/github.com.codeskyblue.go-sh.model.yml
index d1e5c590af6..fab0d5915ae 100644
--- a/go/ql/lib/ext/github.com.codeskyblue.go-sh.model.yml
+++ b/go/ql/lib/ext/github.com.codeskyblue.go-sh.model.yml
@@ -4,6 +4,6 @@ extensions:
       extensible: sinkModel
     data:
       - ["github.com/codeskyblue/go-sh", "", False, "Command", "", "", "Argument[0]", "command-injection", "manual"]
-      - ["github.com/codeskyblue/go-sh", "Session", False, "Call", "", "", "Argument[0]", "command-injection", "manual"]
-      - ["github.com/codeskyblue/go-sh", "Session", False, "Command", "", "", "Argument[0]", "command-injection", "manual"]
-      - ["github.com/codeskyblue/go-sh", "Session", False, "Exec", "", "", "Argument[0]", "command-injection", "manual"]
+      - ["github.com/codeskyblue/go-sh", "Session", True, "Call", "", "", "Argument[0]", "command-injection", "manual"]
+      - ["github.com/codeskyblue/go-sh", "Session", True, "Command", "", "", "Argument[0]", "command-injection", "manual"]
+      - ["github.com/codeskyblue/go-sh", "Session", True, "Exec", "", "", "Argument[0]", "command-injection", "manual"]
diff --git a/go/ql/lib/ext/github.com.cristalhq.jwt.model.yml b/go/ql/lib/ext/github.com.cristalhq.jwt.model.yml
index b4d2d3299a4..cdf84d23292 100644
--- a/go/ql/lib/ext/github.com.cristalhq.jwt.model.yml
+++ b/go/ql/lib/ext/github.com.cristalhq.jwt.model.yml
@@ -3,4 +3,4 @@ extensions:
       pack: codeql/go-all
       extensible: sinkModel
     data:
-      - ["github.com/cristalhq/jwt", "", True, "NewSignerHS", "", "", "Argument[1]", "credentials-key", "manual"]
+      - ["github.com/cristalhq/jwt", "", False, "NewSignerHS", "", "", "Argument[1]", "credentials-key", "manual"]
diff --git a/go/ql/lib/ext/github.com.dgrijalva.jwt-go.model.yml b/go/ql/lib/ext/github.com.dgrijalva.jwt-go.model.yml
index 04db1290669..90b62a800db 100644
--- a/go/ql/lib/ext/github.com.dgrijalva.jwt-go.model.yml
+++ b/go/ql/lib/ext/github.com.dgrijalva.jwt-go.model.yml
@@ -10,12 +10,12 @@ extensions:
       pack: codeql/go-all
       extensible: summaryModel
     data:
-      - ["github.com/dgrijalva/jwt-go", "", True, "Parse", "", "", "Argument[0]", "ReturnValue[0]", "taint", "manual"]
+      - ["github.com/dgrijalva/jwt-go", "", False, "Parse", "", "", "Argument[0]", "ReturnValue[0]", "taint", "manual"]
       - ["github.com/dgrijalva/jwt-go", "Parser", True, "Parse", "", "", "Argument[0]", "ReturnValue[0]", "taint", "manual"]
-      - ["github.com/dgrijalva/jwt-go", "", True, "ParseWithClaims", "", "", "Argument[0]", "ReturnValue[0]", "taint", "manual"]
+      - ["github.com/dgrijalva/jwt-go", "", False, "ParseWithClaims", "", "", "Argument[0]", "ReturnValue[0]", "taint", "manual"]
       - ["github.com/dgrijalva/jwt-go", "Parser", True, "ParseWithClaims", "", "", "Argument[0]", "ReturnValue[0]", "taint", "manual"]
-      - ["github.com/dgrijalva/jwt-go", "", True, "ParseECPrivateKeyFromPEM", "", "", "Argument[0]", "ReturnValue[0]", "taint", "manual"]
-      - ["github.com/dgrijalva/jwt-go", "", True, "ParseECPublicKeyFromPEM", "", "", "Argument[0]", "ReturnValue[0]", "taint", "manual"]
-      - ["github.com/dgrijalva/jwt-go", "", True, "ParseRSAPrivateKeyFromPEM", "", "", "Argument[0]", "ReturnValue[0]", "taint", "manual"]
-      - ["github.com/dgrijalva/jwt-go", "", True, "ParseRSAPrivateKeyFromPEMWithPassword", "", "", "Argument[0]", "ReturnValue[0]", "taint", "manual"]
-      - ["github.com/dgrijalva/jwt-go", "", True, "ParseRSAPublicKeyFromPEM", "", "", "Argument[0]", "ReturnValue[0]", "taint", "manual"]
+      - ["github.com/dgrijalva/jwt-go", "", False, "ParseECPrivateKeyFromPEM", "", "", "Argument[0]", "ReturnValue[0]", "taint", "manual"]
+      - ["github.com/dgrijalva/jwt-go", "", False, "ParseECPublicKeyFromPEM", "", "", "Argument[0]", "ReturnValue[0]", "taint", "manual"]
+      - ["github.com/dgrijalva/jwt-go", "", False, "ParseRSAPrivateKeyFromPEM", "", "", "Argument[0]", "ReturnValue[0]", "taint", "manual"]
+      - ["github.com/dgrijalva/jwt-go", "", False, "ParseRSAPrivateKeyFromPEMWithPassword", "", "", "Argument[0]", "ReturnValue[0]", "taint", "manual"]
+      - ["github.com/dgrijalva/jwt-go", "", False, "ParseRSAPublicKeyFromPEM", "", "", "Argument[0]", "ReturnValue[0]", "taint", "manual"]
diff --git a/go/ql/lib/ext/github.com.gin-gonic.gin.model.yml b/go/ql/lib/ext/github.com.gin-gonic.gin.model.yml
index bd228fc0ec3..92b1c757ac7 100644
--- a/go/ql/lib/ext/github.com.gin-gonic.gin.model.yml
+++ b/go/ql/lib/ext/github.com.gin-gonic.gin.model.yml
@@ -3,9 +3,9 @@ extensions:
       pack: codeql/go-all
       extensible: sinkModel
     data:
-      - ["github.com/gin-gonic/gin", "Context", False, "File", "", "", "Argument[0]", "path-injection", "manual"]
-      - ["github.com/gin-gonic/gin", "Context", False, "FileAttachment", "", "", "Argument[0]", "path-injection", "manual"]
-      - ["github.com/gin-gonic/gin", "Context", False, "SaveUploadedFile", "", "", "Argument[1]", "path-injection", "manual"]
+      - ["github.com/gin-gonic/gin", "Context", True, "File", "", "", "Argument[0]", "path-injection", "manual"]
+      - ["github.com/gin-gonic/gin", "Context", True, "FileAttachment", "", "", "Argument[0]", "path-injection", "manual"]
+      - ["github.com/gin-gonic/gin", "Context", True, "SaveUploadedFile", "", "", "Argument[1]", "path-injection", "manual"]
   - addsTo:
       pack: codeql/go-all
       extensible: summaryModel
diff --git a/go/ql/lib/ext/github.com.go-chi.chi.model.yml b/go/ql/lib/ext/github.com.go-chi.chi.model.yml
index 10cb0333aff..c24e7ab2b4a 100644
--- a/go/ql/lib/ext/github.com.go-chi.chi.model.yml
+++ b/go/ql/lib/ext/github.com.go-chi.chi.model.yml
@@ -3,6 +3,6 @@ extensions:
       pack: codeql/go-all
       extensible: sourceModel
     data:
-      - ["github.com/go-chi/chi", "", True, "URLParam", "", "", "ReturnValue", "remote", "manual"]
-      - ["github.com/go-chi/chi", "", True, "URLParamFromCtx", "", "", "ReturnValue", "remote", "manual"]
+      - ["github.com/go-chi/chi", "", False, "URLParam", "", "", "ReturnValue", "remote", "manual"]
+      - ["github.com/go-chi/chi", "", False, "URLParamFromCtx", "", "", "ReturnValue", "remote", "manual"]
       - ["github.com/go-chi/chi", "Context", True, "URLParam", "", "", "ReturnValue", "remote", "manual"]
diff --git a/go/ql/lib/ext/github.com.go-chi.jwtauth.model.yml b/go/ql/lib/ext/github.com.go-chi.jwtauth.model.yml
index eb9e54f171c..7cfb1ff80f5 100644
--- a/go/ql/lib/ext/github.com.go-chi.jwtauth.model.yml
+++ b/go/ql/lib/ext/github.com.go-chi.jwtauth.model.yml
@@ -3,4 +3,4 @@ extensions:
       pack: codeql/go-all
       extensible: sinkModel
     data:
-      - ["github.com/go-chi/jwtauth", "", True, "New", "", "", "Argument[1]", "credentials-key", "manual"]
+      - ["github.com/go-chi/jwtauth", "", False, "New", "", "", "Argument[1]", "credentials-key", "manual"]
diff --git a/go/ql/lib/ext/github.com.go-jose.go-jose.jwt.model.yml b/go/ql/lib/ext/github.com.go-jose.go-jose.jwt.model.yml
index 33c9957a66b..ba06d21a93e 100644
--- a/go/ql/lib/ext/github.com.go-jose.go-jose.jwt.model.yml
+++ b/go/ql/lib/ext/github.com.go-jose.go-jose.jwt.model.yml
@@ -16,7 +16,7 @@ extensions:
       pack: codeql/go-all
       extensible: summaryModel
     data:
-      - ["group:go-jose/jwt", "", True, "ParseEncrypted", "", "", "Argument[0]", "ReturnValue[0]", "taint", "manual"]
-      - ["group:go-jose/jwt", "", True, "ParseSigned", "", "", "Argument[0]", "ReturnValue[0]", "taint", "manual"]
+      - ["group:go-jose/jwt", "", False, "ParseEncrypted", "", "", "Argument[0]", "ReturnValue[0]", "taint", "manual"]
+      - ["group:go-jose/jwt", "", False, "ParseSigned", "", "", "Argument[0]", "ReturnValue[0]", "taint", "manual"]
       - ["group:go-jose/jwt", "NestedJSONWebToken", True, "ParseSignedAndEncrypted", "", "", "Argument[0]", "ReturnValue[0]", "taint", "manual"]
       - ["group:go-jose/jwt", "NestedJSONWebToken", True, "Decrypt", "", "", "Argument[receiver]", "ReturnValue[0]", "taint", "manual"]
diff --git a/go/ql/lib/ext/github.com.go-kit.kit.auth.jwt.model.yml b/go/ql/lib/ext/github.com.go-kit.kit.auth.jwt.model.yml
index 9ed0791dc54..7a9da5bd4b0 100644
--- a/go/ql/lib/ext/github.com.go-kit.kit.auth.jwt.model.yml
+++ b/go/ql/lib/ext/github.com.go-kit.kit.auth.jwt.model.yml
@@ -3,4 +3,4 @@ extensions:
       pack: codeql/go-all
       extensible: sinkModel
     data:
-      - ["github.com/go-kit/kit/auth/jwt", "", True, "NewSigner", "", "", "Argument[1]", "credentials-key", "manual"]
+      - ["github.com/go-kit/kit/auth/jwt", "", False, "NewSigner", "", "", "Argument[1]", "credentials-key", "manual"]
diff --git a/go/ql/lib/ext/github.com.go-xmlpath.xmlpath.model.yml b/go/ql/lib/ext/github.com.go-xmlpath.xmlpath.model.yml
index bd002dd25c9..931e65f1832 100644
--- a/go/ql/lib/ext/github.com.go-xmlpath.xmlpath.model.yml
+++ b/go/ql/lib/ext/github.com.go-xmlpath.xmlpath.model.yml
@@ -14,5 +14,5 @@ extensions:
       pack: codeql/go-all
       extensible: sinkModel
     data:
-      - ["group:xmlpath", "", True, "Compile", "", "", "Argument[0]", "xpath-injection", "manual"]
-      - ["group:xmlpath", "", True, "MustCompile", "", "", "Argument[0]", "xpath-injection", "manual"]
+      - ["group:xmlpath", "", False, "Compile", "", "", "Argument[0]", "xpath-injection", "manual"]
+      - ["group:xmlpath", "", False, "MustCompile", "", "", "Argument[0]", "xpath-injection", "manual"]
diff --git a/go/ql/lib/ext/github.com.gobwas.ws.model.yml b/go/ql/lib/ext/github.com.gobwas.ws.model.yml
index bb03c8220c8..fcaaee08d91 100644
--- a/go/ql/lib/ext/github.com.gobwas.ws.model.yml
+++ b/go/ql/lib/ext/github.com.gobwas.ws.model.yml
@@ -3,5 +3,5 @@ extensions:
       pack: codeql/go-all
       extensible: sourceModel
     data:
-      - ["github.com/gobwas/ws", "", True, "ReadFrame", "", "", "ReturnValue[0]", "remote", "manual"]
-      - ["github.com/gobwas/ws", "", True, "ReadHeader", "", "", "ReturnValue[0]", "remote", "manual"]
+      - ["github.com/gobwas/ws", "", False, "ReadFrame", "", "", "ReturnValue[0]", "remote", "manual"]
+      - ["github.com/gobwas/ws", "", False, "ReadHeader", "", "", "ReturnValue[0]", "remote", "manual"]
diff --git a/go/ql/lib/ext/github.com.gofiber.fiber.model.yml b/go/ql/lib/ext/github.com.gofiber.fiber.model.yml
index 7e553b2156d..c959d137301 100644
--- a/go/ql/lib/ext/github.com.gofiber.fiber.model.yml
+++ b/go/ql/lib/ext/github.com.gofiber.fiber.model.yml
@@ -4,9 +4,9 @@ extensions:
       extensible: sinkModel
     data:
       # path-injection
-      - ["github.com/gofiber/fiber", "Ctx", False, "SendFile", "", "", "Argument[0]", "path-injection", "manual"]
-      - ["github.com/gofiber/fiber", "Ctx", False, "Download", "", "", "Argument[0]", "path-injection", "manual"]
-      - ["github.com/gofiber/fiber", "Ctx", False, "SaveFile", "", "", "Argument[1]", "path-injection", "manual"]
-      - ["github.com/gofiber/fiber", "Ctx", False, "SaveFileToStorage", "", "", "Argument[1]", "path-injection", "manual"] # does not exist in v1
+      - ["github.com/gofiber/fiber", "Ctx", True, "SendFile", "", "", "Argument[0]", "path-injection", "manual"]
+      - ["github.com/gofiber/fiber", "Ctx", True, "Download", "", "", "Argument[0]", "path-injection", "manual"]
+      - ["github.com/gofiber/fiber", "Ctx", True, "SaveFile", "", "", "Argument[1]", "path-injection", "manual"]
+      - ["github.com/gofiber/fiber", "Ctx", True, "SaveFileToStorage", "", "", "Argument[1]", "path-injection", "manual"] # does not exist in v1
       # url-redirection
       - ["github.com/gofiber/fiber", "Ctx", True, "Redirect", "", "", "Argument[0]", "url-redirection[receiver]", "manual"]
diff --git a/go/ql/lib/ext/github.com.golang-jwt.jwt.model.yml b/go/ql/lib/ext/github.com.golang-jwt.jwt.model.yml
index 3f6eaac89b6..494c9470999 100644
--- a/go/ql/lib/ext/github.com.golang-jwt.jwt.model.yml
+++ b/go/ql/lib/ext/github.com.golang-jwt.jwt.model.yml
@@ -10,14 +10,14 @@ extensions:
       pack: codeql/go-all
       extensible: summaryModel
     data:
-      - ["github.com/golang-jwt/jwt", "", True, "Parse", "", "", "Argument[0]", "ReturnValue[0]", "taint", "manual"]
+      - ["github.com/golang-jwt/jwt", "", False, "Parse", "", "", "Argument[0]", "ReturnValue[0]", "taint", "manual"]
       - ["github.com/golang-jwt/jwt", "Parser", True, "Parse", "", "", "Argument[0]", "ReturnValue[0]", "taint", "manual"]
-      - ["github.com/golang-jwt/jwt", "", True, "ParseWithClaims", "", "", "Argument[0]", "ReturnValue[0]", "taint", "manual"]
+      - ["github.com/golang-jwt/jwt", "", False, "ParseWithClaims", "", "", "Argument[0]", "ReturnValue[0]", "taint", "manual"]
       - ["github.com/golang-jwt/jwt", "Parser", True, "ParseWithClaims", "", "", "Argument[0]", "ReturnValue[0]", "taint", "manual"]
-      - ["github.com/golang-jwt/jwt", "", True, "ParseECPrivateKeyFromPEM", "", "", "Argument[0]", "ReturnValue[0]", "taint", "manual"]
-      - ["github.com/golang-jwt/jwt", "", True, "ParseECPublicKeyFromPEM", "", "", "Argument[0]", "ReturnValue[0]", "taint", "manual"]
-      - ["github.com/golang-jwt/jwt", "", True, "ParseEdPrivateKeyFromPEM", "", "", "Argument[0]", "ReturnValue[0]", "taint", "manual"]
-      - ["github.com/golang-jwt/jwt", "", True, "ParseEdPublicKeyFromPEM", "", "", "Argument[0]", "ReturnValue[0]", "taint", "manual"]
-      - ["github.com/golang-jwt/jwt", "", True, "ParseRSAPrivateKeyFromPEM", "", "", "Argument[0]", "ReturnValue[0]", "taint", "manual"]
-      - ["github.com/golang-jwt/jwt", "", True, "ParseRSAPublicKeyFromPEM", "", "", "Argument[0]", "ReturnValue[0]", "taint", "manual"]
-      - ["github.com/golang-jwt/jwt", "", True, "RegisterSigningMethod", "", "", "Argument[0]", "ReturnValue[0]", "taint", "manual"]
+      - ["github.com/golang-jwt/jwt", "", False, "ParseECPrivateKeyFromPEM", "", "", "Argument[0]", "ReturnValue[0]", "taint", "manual"]
+      - ["github.com/golang-jwt/jwt", "", False, "ParseECPublicKeyFromPEM", "", "", "Argument[0]", "ReturnValue[0]", "taint", "manual"]
+      - ["github.com/golang-jwt/jwt", "", False, "ParseEdPrivateKeyFromPEM", "", "", "Argument[0]", "ReturnValue[0]", "taint", "manual"]
+      - ["github.com/golang-jwt/jwt", "", False, "ParseEdPublicKeyFromPEM", "", "", "Argument[0]", "ReturnValue[0]", "taint", "manual"]
+      - ["github.com/golang-jwt/jwt", "", False, "ParseRSAPrivateKeyFromPEM", "", "", "Argument[0]", "ReturnValue[0]", "taint", "manual"]
+      - ["github.com/golang-jwt/jwt", "", False, "ParseRSAPublicKeyFromPEM", "", "", "Argument[0]", "ReturnValue[0]", "taint", "manual"]
+      - ["github.com/golang-jwt/jwt", "", False, "RegisterSigningMethod", "", "", "Argument[0]", "ReturnValue[0]", "taint", "manual"]
diff --git a/go/ql/lib/ext/github.com.gorilla.mux.model.yml b/go/ql/lib/ext/github.com.gorilla.mux.model.yml
index 438abdf559a..b97fc4d2c1d 100644
--- a/go/ql/lib/ext/github.com.gorilla.mux.model.yml
+++ b/go/ql/lib/ext/github.com.gorilla.mux.model.yml
@@ -3,4 +3,4 @@ extensions:
       pack: codeql/go-all
       extensible: sourceModel
     data:
-      - ["github.com/gorilla/mux", "", True, "Vars", "", "", "ReturnValue", "remote", "manual"] # TODO: when sources can have access paths, use .MapValue (and .MapKey?)
+      - ["github.com/gorilla/mux", "", False, "Vars", "", "", "ReturnValue", "remote", "manual"] # TODO: when sources can have access paths, use .MapValue (and .MapKey?)
diff --git a/go/ql/lib/ext/github.com.gorilla.websocket.model.yml b/go/ql/lib/ext/github.com.gorilla.websocket.model.yml
index a4dafa18b0b..3f03bba8a48 100644
--- a/go/ql/lib/ext/github.com.gorilla.websocket.model.yml
+++ b/go/ql/lib/ext/github.com.gorilla.websocket.model.yml
@@ -3,6 +3,6 @@ extensions:
       pack: codeql/go-all
       extensible: sourceModel
     data:
-      - ["github.com/gorilla/websocket", "", True, "ReadJSON", "", "", "Argument[1]", "remote", "manual"]
+      - ["github.com/gorilla/websocket", "", False, "ReadJSON", "", "", "Argument[1]", "remote", "manual"]
       - ["github.com/gorilla/websocket", "Conn", True, "ReadJSON", "", "", "Argument[0]", "remote", "manual"]
       - ["github.com/gorilla/websocket", "Conn", True, "ReadMessage", "", "", "ReturnValue[1]", "remote", "manual"]
diff --git a/go/ql/lib/ext/github.com.kataras.iris.middleware.jwt.model.yml b/go/ql/lib/ext/github.com.kataras.iris.middleware.jwt.model.yml
index 52e7beacaab..5bcce412fd4 100644
--- a/go/ql/lib/ext/github.com.kataras.iris.middleware.jwt.model.yml
+++ b/go/ql/lib/ext/github.com.kataras.iris.middleware.jwt.model.yml
@@ -3,5 +3,5 @@ extensions:
       pack: codeql/go-all
       extensible: sinkModel
     data:
-      - ["github.com/kataras/iris/middleware/jwt", "", True, "NewSigner", "", "", "Argument[1]", "credentials-key", "manual"]
+      - ["github.com/kataras/iris/middleware/jwt", "", False, "NewSigner", "", "", "Argument[1]", "credentials-key", "manual"]
       - ["github.com/kataras/iris/middleware/jwt", "Signer", True, "Key", "", "", "", "credentials-key", "manual"]
diff --git a/go/ql/lib/ext/github.com.kataras.jwt.model.yml b/go/ql/lib/ext/github.com.kataras.jwt.model.yml
index ab87a747175..3ecb1e0e577 100644
--- a/go/ql/lib/ext/github.com.kataras.jwt.model.yml
+++ b/go/ql/lib/ext/github.com.kataras.jwt.model.yml
@@ -4,7 +4,7 @@ extensions:
       extensible: sinkModel
     data:
       - ["github.com/kataras/jwt", "Keys", True, "Register", "", "", "Argument[3]", "credentials-key", "manual"]
-      - ["github.com/kataras/jwt", "", True, "Sign", "", "", "Argument[1]", "credentials-key", "manual"]
-      - ["github.com/kataras/jwt", "", True, "SignEncrypted", "", "", "Argument[1]", "credentials-key", "manual"]
-      - ["github.com/kataras/jwt", "", True, "SignEncryptedWithHeader", "", "", "Argument[1]", "credentials-key", "manual"]
-      - ["github.com/kataras/jwt", "", True, "SignWithHeader", "", "", "Argument[1]", "credentials-key", "manual"]
+      - ["github.com/kataras/jwt", "", False, "Sign", "", "", "Argument[1]", "credentials-key", "manual"]
+      - ["github.com/kataras/jwt", "", False, "SignEncrypted", "", "", "Argument[1]", "credentials-key", "manual"]
+      - ["github.com/kataras/jwt", "", False, "SignEncryptedWithHeader", "", "", "Argument[1]", "credentials-key", "manual"]
+      - ["github.com/kataras/jwt", "", False, "SignWithHeader", "", "", "Argument[1]", "credentials-key", "manual"]
diff --git a/go/ql/lib/ext/github.com.kelseyhightower.envconfig.model.yml b/go/ql/lib/ext/github.com.kelseyhightower.envconfig.model.yml
index 71d032a18e1..3b1ba531849 100644
--- a/go/ql/lib/ext/github.com.kelseyhightower.envconfig.model.yml
+++ b/go/ql/lib/ext/github.com.kelseyhightower.envconfig.model.yml
@@ -8,4 +8,4 @@ extensions:
       - ["github.com/kelseyhightower/envconfig", "", False, "Process", "", "", "Argument[1]", "environment", "manual"]
       - ["github.com/kelseyhightower/envconfig", "", False, "Usage", "", "", "Argument[1]", "environment", "manual"]
       - ["github.com/kelseyhightower/envconfig", "", False, "Usagef", "", "", "Argument[1]", "environment", "manual"]
-      - ["github.com/kelseyhightower/envconfig", "", False, "Usaget", "", "", "Argument[1]", "environment", "manual"]
\ No newline at end of file
+      - ["github.com/kelseyhightower/envconfig", "", False, "Usaget", "", "", "Argument[1]", "environment", "manual"]
diff --git a/go/ql/lib/ext/github.com.labstack.echo.model.yml b/go/ql/lib/ext/github.com.labstack.echo.model.yml
index b497cc13391..830360bbdb2 100644
--- a/go/ql/lib/ext/github.com.labstack.echo.model.yml
+++ b/go/ql/lib/ext/github.com.labstack.echo.model.yml
@@ -4,8 +4,8 @@ extensions:
       extensible: sinkModel
     data:
       # path-injection
-      - ["github.com/labstack/echo", "Context", False, "Attachment", "", "", "Argument[0]", "path-injection", "manual"]
-      - ["github.com/labstack/echo", "Context", False, "File", "", "", "Argument[0]", "path-injection", "manual"]
+      - ["github.com/labstack/echo", "Context", True, "Attachment", "", "", "Argument[0]", "path-injection", "manual"]
+      - ["github.com/labstack/echo", "Context", True, "File", "", "", "Argument[0]", "path-injection", "manual"]
       # url-redirection
       - ["github.com/labstack/echo", "Context", True, "Redirect", "", "", "Argument[1]", "url-redirection", "manual"]
   - addsTo:
diff --git a/go/ql/lib/ext/github.com.lestrrat-go.jwx.jwk.model.yml b/go/ql/lib/ext/github.com.lestrrat-go.jwx.jwk.model.yml
index c395430db40..ed2b3f31053 100644
--- a/go/ql/lib/ext/github.com.lestrrat-go.jwx.jwk.model.yml
+++ b/go/ql/lib/ext/github.com.lestrrat-go.jwx.jwk.model.yml
@@ -3,4 +3,4 @@ extensions:
       pack: codeql/go-all
       extensible: sinkModel
     data:
-      - ["github.com/lestrrat-go/jwx/jwk", "", True, "New", "", "", "Argument[0]", "credentials-key", "manual"]
+      - ["github.com/lestrrat-go/jwx/jwk", "", False, "New", "", "", "Argument[0]", "credentials-key", "manual"]
diff --git a/go/ql/lib/ext/github.com.lestrrat-go.jwx.model.yml b/go/ql/lib/ext/github.com.lestrrat-go.jwx.model.yml
index 14a5cdd7482..78162bf4855 100644
--- a/go/ql/lib/ext/github.com.lestrrat-go.jwx.model.yml
+++ b/go/ql/lib/ext/github.com.lestrrat-go.jwx.model.yml
@@ -3,4 +3,4 @@ extensions:
       pack: codeql/go-all
       extensible: sinkModel
     data:
-      - ["github.com/lestrrat-go/jwx", "", True, "New", "", "", "Argument[0]", "credentials-key", "manual"]
+      - ["github.com/lestrrat-go/jwx", "", False, "New", "", "", "Argument[0]", "credentials-key", "manual"]
diff --git a/go/ql/lib/ext/github.com.lestrrat.go-jwx.jwk.model.yml b/go/ql/lib/ext/github.com.lestrrat.go-jwx.jwk.model.yml
index f194e1ec93c..e4d7fe43de6 100644
--- a/go/ql/lib/ext/github.com.lestrrat.go-jwx.jwk.model.yml
+++ b/go/ql/lib/ext/github.com.lestrrat.go-jwx.jwk.model.yml
@@ -3,4 +3,4 @@ extensions:
       pack: codeql/go-all
       extensible: sinkModel
     data:
-      - ["github.com/lestrrat/go-jwx/jwk", "", True, "New", "", "", "Argument[0]", "credentials-key", "manual"]
+      - ["github.com/lestrrat/go-jwx/jwk", "", False, "New", "", "", "Argument[0]", "credentials-key", "manual"]
diff --git a/go/ql/lib/ext/github.com.moovweb.gokogiri.xpath.model.yml b/go/ql/lib/ext/github.com.moovweb.gokogiri.xpath.model.yml
index 4bac7eb1c18..144f34e9dfc 100644
--- a/go/ql/lib/ext/github.com.moovweb.gokogiri.xpath.model.yml
+++ b/go/ql/lib/ext/github.com.moovweb.gokogiri.xpath.model.yml
@@ -9,4 +9,4 @@ extensions:
       pack: codeql/go-all
       extensible: sinkModel
     data:
-      - ["group:gokogiri/xpath", "", True, "Compile", "", "", "Argument[0]", "xpath-injection", "manual"]
+      - ["group:gokogiri/xpath", "", False, "Compile", "", "", "Argument[0]", "xpath-injection", "manual"]
diff --git a/go/ql/lib/ext/github.com.santhosh-tekuri.xpathparser.model.yml b/go/ql/lib/ext/github.com.santhosh-tekuri.xpathparser.model.yml
index 8ac0e02cedf..b99bedf38cc 100644
--- a/go/ql/lib/ext/github.com.santhosh-tekuri.xpathparser.model.yml
+++ b/go/ql/lib/ext/github.com.santhosh-tekuri.xpathparser.model.yml
@@ -3,5 +3,5 @@ extensions:
       pack: codeql/go-all
       extensible: sinkModel
     data:
-      - ["github.com/santhosh-tekuri/xpathparser", "", True, "Parse", "", "", "Argument[0]", "xpath-injection", "manual"]
-      - ["github.com/santhosh-tekuri/xpathparser", "", True, "MustParse", "", "", "Argument[0]", "xpath-injection", "manual"]
+      - ["github.com/santhosh-tekuri/xpathparser", "", False, "Parse", "", "", "Argument[0]", "xpath-injection", "manual"]
+      - ["github.com/santhosh-tekuri/xpathparser", "", False, "MustParse", "", "", "Argument[0]", "xpath-injection", "manual"]
diff --git a/go/ql/lib/ext/github.com.spf13.afero.model.yml b/go/ql/lib/ext/github.com.spf13.afero.model.yml
index 94879539233..2ddab6ef43b 100644
--- a/go/ql/lib/ext/github.com.spf13.afero.model.yml
+++ b/go/ql/lib/ext/github.com.spf13.afero.model.yml
@@ -3,37 +3,37 @@ extensions:
       pack: codeql/go-all
       extensible: sinkModel
     data:
-      - ["github.com/spf13/afero", "HttpFs", False, "Create", "", "", "Argument[0]", "path-injection", "manual"]
-      - ["github.com/spf13/afero", "HttpFs", False, "Open", "", "", "Argument[0]", "path-injection", "manual"]
-      - ["github.com/spf13/afero", "HttpFs", False, "OpenFile", "", "", "Argument[0]", "path-injection", "manual"]
-      - ["github.com/spf13/afero", "HttpFs", False, "Remove", "", "", "Argument[0]", "path-injection", "manual"]
-      - ["github.com/spf13/afero", "HttpFs", False, "RemoveAll", "", "", "Argument[0]", "path-injection", "manual"]
-      - ["github.com/spf13/afero", "MemMapFs", False, "Create", "", "", "Argument[0]", "path-injection", "manual"]
-      - ["github.com/spf13/afero", "MemMapFs", False, "Open", "", "", "Argument[0]", "path-injection", "manual"]
-      - ["github.com/spf13/afero", "MemMapFs", False, "OpenFile", "", "", "Argument[0]", "path-injection", "manual"]
-      - ["github.com/spf13/afero", "MemMapFs", False, "Remove", "", "", "Argument[0]", "path-injection", "manual"]
-      - ["github.com/spf13/afero", "MemMapFs", False, "RemoveAll", "", "", "Argument[0]", "path-injection", "manual"]
-      - ["github.com/spf13/afero", "MemMapFs", False, "Mkdir", "", "", "Argument[0]", "path-injection", "manual"]
-      - ["github.com/spf13/afero", "MemMapFs", False, "MkdirAll", "", "", "Argument[0]", "path-injection", "manual"]
-      - ["github.com/spf13/afero", "OsFs", False, "Create", "", "", "Argument[0]", "path-injection", "manual"]
-      - ["github.com/spf13/afero", "OsFs", False, "Open", "", "", "Argument[0]", "path-injection", "manual"]
-      - ["github.com/spf13/afero", "OsFs", False, "OpenFile", "", "", "Argument[0]", "path-injection", "manual"]
-      - ["github.com/spf13/afero", "OsFs", False, "ReadlinkIfPossible", "", "", "Argument[0]", "path-injection", "manual"]
-      - ["github.com/spf13/afero", "OsFs", False, "Remove", "", "", "Argument[0]", "path-injection", "manual"]
-      - ["github.com/spf13/afero", "OsFs", False, "RemoveAll", "", "", "Argument[0]", "path-injection", "manual"]
-      - ["github.com/spf13/afero", "OsFs", False, "Mkdir", "", "", "Argument[0]", "path-injection", "manual"]
-      - ["github.com/spf13/afero", "OsFs", False, "MkdirAll", "", "", "Argument[0]", "path-injection", "manual"]
-      - ["github.com/spf13/afero", "ReadOnlyFs", False, "Create", "", "", "Argument[0]", "path-injection", "manual"]
-      - ["github.com/spf13/afero", "ReadOnlyFs", False, "Open", "", "", "Argument[0]", "path-injection", "manual"]
-      - ["github.com/spf13/afero", "ReadOnlyFs", False, "OpenFile", "", "", "Argument[0]", "path-injection", "manual"]
-      - ["github.com/spf13/afero", "ReadOnlyFs", False, "ReadDir", "", "", "Argument[0]", "path-injection", "manual"]
-      - ["github.com/spf13/afero", "ReadOnlyFs", False, "ReadlinkIfPossible", "", "", "Argument[0]", "path-injection", "manual"]
-      - ["github.com/spf13/afero", "ReadOnlyFs", False, "Mkdir", "", "", "Argument[0]", "path-injection", "manual"]
-      - ["github.com/spf13/afero", "ReadOnlyFs", False, "MkdirAll", "", "", "Argument[0]", "path-injection", "manual"]
-      - ["github.com/spf13/afero", "RegexpFs", False, "Create", "", "", "Argument[0]", "path-injection", "manual"]
-      - ["github.com/spf13/afero", "RegexpFs", False, "Open", "", "", "Argument[0]", "path-injection", "manual"]
-      - ["github.com/spf13/afero", "RegexpFs", False, "OpenFile", "", "", "Argument[0]", "path-injection", "manual"]
-      - ["github.com/spf13/afero", "RegexpFs", False, "Remove", "", "", "Argument[0]", "path-injection", "manual"]
-      - ["github.com/spf13/afero", "RegexpFs", False, "RemoveAll", "", "", "Argument[0]", "path-injection", "manual"]
-      - ["github.com/spf13/afero", "RegexpFs", False, "Mkdir", "", "", "Argument[0]", "path-injection", "manual"]
-      - ["github.com/spf13/afero", "RegexpFs", False, "MkdirAll", "", "", "Argument[0]", "path-injection", "manual"]
+      - ["github.com/spf13/afero", "HttpFs", True, "Create", "", "", "Argument[0]", "path-injection", "manual"]
+      - ["github.com/spf13/afero", "HttpFs", True, "Open", "", "", "Argument[0]", "path-injection", "manual"]
+      - ["github.com/spf13/afero", "HttpFs", True, "OpenFile", "", "", "Argument[0]", "path-injection", "manual"]
+      - ["github.com/spf13/afero", "HttpFs", True, "Remove", "", "", "Argument[0]", "path-injection", "manual"]
+      - ["github.com/spf13/afero", "HttpFs", True, "RemoveAll", "", "", "Argument[0]", "path-injection", "manual"]
+      - ["github.com/spf13/afero", "MemMapFs", True, "Create", "", "", "Argument[0]", "path-injection", "manual"]
+      - ["github.com/spf13/afero", "MemMapFs", True, "Open", "", "", "Argument[0]", "path-injection", "manual"]
+      - ["github.com/spf13/afero", "MemMapFs", True, "OpenFile", "", "", "Argument[0]", "path-injection", "manual"]
+      - ["github.com/spf13/afero", "MemMapFs", True, "Remove", "", "", "Argument[0]", "path-injection", "manual"]
+      - ["github.com/spf13/afero", "MemMapFs", True, "RemoveAll", "", "", "Argument[0]", "path-injection", "manual"]
+      - ["github.com/spf13/afero", "MemMapFs", True, "Mkdir", "", "", "Argument[0]", "path-injection", "manual"]
+      - ["github.com/spf13/afero", "MemMapFs", True, "MkdirAll", "", "", "Argument[0]", "path-injection", "manual"]
+      - ["github.com/spf13/afero", "OsFs", True, "Create", "", "", "Argument[0]", "path-injection", "manual"]
+      - ["github.com/spf13/afero", "OsFs", True, "Open", "", "", "Argument[0]", "path-injection", "manual"]
+      - ["github.com/spf13/afero", "OsFs", True, "OpenFile", "", "", "Argument[0]", "path-injection", "manual"]
+      - ["github.com/spf13/afero", "OsFs", True, "ReadlinkIfPossible", "", "", "Argument[0]", "path-injection", "manual"]
+      - ["github.com/spf13/afero", "OsFs", True, "Remove", "", "", "Argument[0]", "path-injection", "manual"]
+      - ["github.com/spf13/afero", "OsFs", True, "RemoveAll", "", "", "Argument[0]", "path-injection", "manual"]
+      - ["github.com/spf13/afero", "OsFs", True, "Mkdir", "", "", "Argument[0]", "path-injection", "manual"]
+      - ["github.com/spf13/afero", "OsFs", True, "MkdirAll", "", "", "Argument[0]", "path-injection", "manual"]
+      - ["github.com/spf13/afero", "ReadOnlyFs", True, "Create", "", "", "Argument[0]", "path-injection", "manual"]
+      - ["github.com/spf13/afero", "ReadOnlyFs", True, "Open", "", "", "Argument[0]", "path-injection", "manual"]
+      - ["github.com/spf13/afero", "ReadOnlyFs", True, "OpenFile", "", "", "Argument[0]", "path-injection", "manual"]
+      - ["github.com/spf13/afero", "ReadOnlyFs", True, "ReadDir", "", "", "Argument[0]", "path-injection", "manual"]
+      - ["github.com/spf13/afero", "ReadOnlyFs", True, "ReadlinkIfPossible", "", "", "Argument[0]", "path-injection", "manual"]
+      - ["github.com/spf13/afero", "ReadOnlyFs", True, "Mkdir", "", "", "Argument[0]", "path-injection", "manual"]
+      - ["github.com/spf13/afero", "ReadOnlyFs", True, "MkdirAll", "", "", "Argument[0]", "path-injection", "manual"]
+      - ["github.com/spf13/afero", "RegexpFs", True, "Create", "", "", "Argument[0]", "path-injection", "manual"]
+      - ["github.com/spf13/afero", "RegexpFs", True, "Open", "", "", "Argument[0]", "path-injection", "manual"]
+      - ["github.com/spf13/afero", "RegexpFs", True, "OpenFile", "", "", "Argument[0]", "path-injection", "manual"]
+      - ["github.com/spf13/afero", "RegexpFs", True, "Remove", "", "", "Argument[0]", "path-injection", "manual"]
+      - ["github.com/spf13/afero", "RegexpFs", True, "RemoveAll", "", "", "Argument[0]", "path-injection", "manual"]
+      - ["github.com/spf13/afero", "RegexpFs", True, "Mkdir", "", "", "Argument[0]", "path-injection", "manual"]
+      - ["github.com/spf13/afero", "RegexpFs", True, "MkdirAll", "", "", "Argument[0]", "path-injection", "manual"]
diff --git a/go/ql/lib/ext/github.com.valyala.fasthttp.model.yml b/go/ql/lib/ext/github.com.valyala.fasthttp.model.yml
index feafceb364d..57382527628 100644
--- a/go/ql/lib/ext/github.com.valyala.fasthttp.model.yml
+++ b/go/ql/lib/ext/github.com.valyala.fasthttp.model.yml
@@ -4,14 +4,14 @@ extensions:
       extensible: sinkModel
     data:
       # request-forgery
-      - ["github.com/valyala/fasthttp", "", True, "Get", "", "", "Argument[1]", "request-forgery", "manual"]
-      - ["github.com/valyala/fasthttp", "", True, "GetDeadline", "", "", "Argument[1]", "request-forgery", "manual"]
-      - ["github.com/valyala/fasthttp", "", True, "GetTimeout", "", "", "Argument[1]", "request-forgery", "manual"]
-      - ["github.com/valyala/fasthttp", "", True, "Post", "", "", "Argument[1]", "request-forgery", "manual"]
-      - ["github.com/valyala/fasthttp", "", True, "Dial", "", "", "Argument[0]", "request-forgery[TCP Addr + Port]", "manual"]
-      - ["github.com/valyala/fasthttp", "", True, "DialDualStack", "", "", "Argument[0]", "request-forgery[TCP Addr + Port]", "manual"]
-      - ["github.com/valyala/fasthttp", "", True, "DialDualStackTimeout", "", "", "Argument[0]", "request-forgery[TCP Addr + Port]", "manual"]
-      - ["github.com/valyala/fasthttp", "", True, "DialTimeout", "", "", "Argument[0]", "request-forgery[TCP Addr + Port]", "manual"]
+      - ["github.com/valyala/fasthttp", "", False, "Get", "", "", "Argument[1]", "request-forgery", "manual"]
+      - ["github.com/valyala/fasthttp", "", False, "GetDeadline", "", "", "Argument[1]", "request-forgery", "manual"]
+      - ["github.com/valyala/fasthttp", "", False, "GetTimeout", "", "", "Argument[1]", "request-forgery", "manual"]
+      - ["github.com/valyala/fasthttp", "", False, "Post", "", "", "Argument[1]", "request-forgery", "manual"]
+      - ["github.com/valyala/fasthttp", "", False, "Dial", "", "", "Argument[0]", "request-forgery[TCP Addr + Port]", "manual"]
+      - ["github.com/valyala/fasthttp", "", False, "DialDualStack", "", "", "Argument[0]", "request-forgery[TCP Addr + Port]", "manual"]
+      - ["github.com/valyala/fasthttp", "", False, "DialDualStackTimeout", "", "", "Argument[0]", "request-forgery[TCP Addr + Port]", "manual"]
+      - ["github.com/valyala/fasthttp", "", False, "DialTimeout", "", "", "Argument[0]", "request-forgery[TCP Addr + Port]", "manual"]
       - ["github.com/valyala/fasthttp", "Client", True, "Get", "", "", "Argument[1]", "request-forgery", "manual"]
       - ["github.com/valyala/fasthttp", "Client", True, "GetDeadline", "", "", "Argument[1]", "request-forgery", "manual"]
       - ["github.com/valyala/fasthttp", "Client", True, "GetTimeout", "", "", "Argument[1]", "request-forgery", "manual"]
@@ -35,9 +35,9 @@ extensions:
       - ["github.com/valyala/fasthttp", "", False, "ServeFileBytes", "", "", "Argument[1]", "path-injection", "manual"]
       - ["github.com/valyala/fasthttp", "", False, "ServeFileBytesUncompressed", "", "", "Argument[1]", "path-injection", "manual"]
       - ["github.com/valyala/fasthttp", "", False, "ServeFileUncompressed", "", "", "Argument[1]", "path-injection", "manual"]
-      - ["github.com/valyala/fasthttp", "RequestCtx", False, "SendFile", "", "", "Argument[0]", "path-injection", "manual"]
-      - ["github.com/valyala/fasthttp", "RequestCtx", False, "SendFileBytes", "", "", "Argument[0]", "path-injection", "manual"]
-      - ["github.com/valyala/fasthttp", "Response", False, "SendFile", "", "", "Argument[0]", "path-injection", "manual"]
+      - ["github.com/valyala/fasthttp", "RequestCtx", True, "SendFile", "", "", "Argument[0]", "path-injection", "manual"]
+      - ["github.com/valyala/fasthttp", "RequestCtx", True, "SendFileBytes", "", "", "Argument[0]", "path-injection", "manual"]
+      - ["github.com/valyala/fasthttp", "Response", True, "SendFile", "", "", "Argument[0]", "path-injection", "manual"]
       # url-redirection
       - ["github.com/valyala/fasthttp", "RequestCtx", True, "Redirect", "", "", "Argument[0]", "url-redirection", "manual"]
       - ["github.com/valyala/fasthttp", "RequestCtx", True, "RedirectBytes", "", "", "Argument[0]", "url-redirection", "manual"]
@@ -45,11 +45,11 @@ extensions:
       pack: codeql/go-all
       extensible: summaryModel
     data:
-      - ["github.com/valyala/fasthttp", "URI", False, "SetHost", "", "", "Argument[0]", "Argument[receiver]", "taint", "manual"]
-      - ["github.com/valyala/fasthttp", "URI", False, "SetHostBytes", "", "", "Argument[0]", "Argument[receiver]", "taint", "manual"]
-      - ["github.com/valyala/fasthttp", "URI", False, "Update", "", "", "Argument[0]", "Argument[receiver]", "taint", "manual"]
-      - ["github.com/valyala/fasthttp", "URI", False, "UpdateBytes", "", "", "Argument[0]", "Argument[receiver]", "taint", "manual"]
-      - ["github.com/valyala/fasthttp", "URI", False, "Parse", "", "", "Argument[0..1]", "Argument[receiver]", "taint", "manual"]
+      - ["github.com/valyala/fasthttp", "URI", True, "SetHost", "", "", "Argument[0]", "Argument[receiver]", "taint", "manual"]
+      - ["github.com/valyala/fasthttp", "URI", True, "SetHostBytes", "", "", "Argument[0]", "Argument[receiver]", "taint", "manual"]
+      - ["github.com/valyala/fasthttp", "URI", True, "Update", "", "", "Argument[0]", "Argument[receiver]", "taint", "manual"]
+      - ["github.com/valyala/fasthttp", "URI", True, "UpdateBytes", "", "", "Argument[0]", "Argument[receiver]", "taint", "manual"]
+      - ["github.com/valyala/fasthttp", "URI", True, "Parse", "", "", "Argument[0..1]", "Argument[receiver]", "taint", "manual"]
   - addsTo:
       pack: codeql/go-all
       extensible: sourceModel
diff --git a/go/ql/lib/ext/golang.org.x.crypto.ssh.model.yml b/go/ql/lib/ext/golang.org.x.crypto.ssh.model.yml
index 8419737a2f2..205a2a1dcb5 100644
--- a/go/ql/lib/ext/golang.org.x.crypto.ssh.model.yml
+++ b/go/ql/lib/ext/golang.org.x.crypto.ssh.model.yml
@@ -3,7 +3,7 @@ extensions:
       pack: codeql/go-all
       extensible: sinkModel
     data:
-      - ["golang.org/x/crypto/ssh", "Session", False, "CombinedOutput", "", "", "Argument[0]", "command-injection", "manual"]
-      - ["golang.org/x/crypto/ssh", "Session", False, "Output", "", "", "Argument[0]", "command-injection", "manual"]
-      - ["golang.org/x/crypto/ssh", "Session", False, "Run", "", "", "Argument[0]", "command-injection", "manual"]
-      - ["golang.org/x/crypto/ssh", "Session", False, "Start", "", "", "Argument[0]", "command-injection", "manual"]
+      - ["golang.org/x/crypto/ssh", "Session", True, "CombinedOutput", "", "", "Argument[0]", "command-injection", "manual"]
+      - ["golang.org/x/crypto/ssh", "Session", True, "Output", "", "", "Argument[0]", "command-injection", "manual"]
+      - ["golang.org/x/crypto/ssh", "Session", True, "Run", "", "", "Argument[0]", "command-injection", "manual"]
+      - ["golang.org/x/crypto/ssh", "Session", True, "Start", "", "", "Argument[0]", "command-injection", "manual"]
diff --git a/go/ql/lib/ext/io.fs.model.yml b/go/ql/lib/ext/io.fs.model.yml
index ac709c939b6..1b9be01aba9 100644
--- a/go/ql/lib/ext/io.fs.model.yml
+++ b/go/ql/lib/ext/io.fs.model.yml
@@ -22,4 +22,4 @@ extensions:
     data:
       - ["io/fs", "", False, "ReadFile", "", "", "ReturnValue[0]", "file", "manual"]
       - ["io/fs", "ReadFileFS", True, "ReadFile", "", "", "ReturnValue[0]", "file", "manual"]
-      - ["io/fs", "FS", True, "Open", "", "", "ReturnValue[0]", "file", "manual"]
\ No newline at end of file
+      - ["io/fs", "FS", True, "Open", "", "", "ReturnValue[0]", "file", "manual"]
diff --git a/go/ql/lib/ext/io.ioutil.model.yml b/go/ql/lib/ext/io.ioutil.model.yml
index dda811c97bf..d5fae77c1d4 100644
--- a/go/ql/lib/ext/io.ioutil.model.yml
+++ b/go/ql/lib/ext/io.ioutil.model.yml
@@ -18,4 +18,4 @@ extensions:
       pack: codeql/go-all
       extensible: sourceModel
     data:
-      - ["io/ioutil", "", False, "ReadFile", "", "", "ReturnValue[0]", "file", "manual"]
\ No newline at end of file
+      - ["io/ioutil", "", False, "ReadFile", "", "", "ReturnValue[0]", "file", "manual"]
diff --git a/go/ql/lib/ext/math.big.model.yml b/go/ql/lib/ext/math.big.model.yml
index 2e320251b2d..dc09561897c 100644
--- a/go/ql/lib/ext/math.big.model.yml
+++ b/go/ql/lib/ext/math.big.model.yml
@@ -3,4 +3,4 @@ extensions:
       pack: codeql/go-all
       extensible: summaryModel
     data:
-      - ["math/big", "Int", False, "Int64", "", "", "Argument[receiver]", "ReturnValue[0]", "taint", "manual"]
+      - ["math/big", "Int", True, "Int64", "", "", "Argument[receiver]", "ReturnValue[0]", "taint", "manual"]
diff --git a/go/ql/lib/ext/net.http.model.yml b/go/ql/lib/ext/net.http.model.yml
index f67ed795c4c..2bf417cf8f3 100644
--- a/go/ql/lib/ext/net.http.model.yml
+++ b/go/ql/lib/ext/net.http.model.yml
@@ -6,7 +6,7 @@ extensions:
       # path-injection
       - ["net/http", "", False, "ServeFile", "", "", "Argument[2]", "path-injection", "manual"]
       # url-redirection
-      - ["net/http", "", True, "Redirect", "", "", "Argument[2]", "url-redirection[0]", "manual"]
+      - ["net/http", "", False, "Redirect", "", "", "Argument[2]", "url-redirection[0]", "manual"]
   - addsTo:
       pack: codeql/go-all
       extensible: summaryModel
diff --git a/go/ql/lib/ext/os.model.yml b/go/ql/lib/ext/os.model.yml
index 3d87eefe43f..2c1c64db93a 100644
--- a/go/ql/lib/ext/os.model.yml
+++ b/go/ql/lib/ext/os.model.yml
@@ -53,6 +53,7 @@ extensions:
       - ["os", "", False, "Open", "", "", "ReturnValue[0]", "file", "manual"]
       - ["os", "", False, "OpenFile", "", "", "ReturnValue[0]", "file", "manual"]
       - ["os", "", False, "ReadFile", "", "", "ReturnValue[0]", "file", "manual"]
+      - ["os", "", False, "Stdin", "", "", "", "stdin", "manual"]
       - ["os", "", False, "UserCacheDir", "", "", "ReturnValue[0]", "environment", "manual"]
       - ["os", "", False, "UserConfigDir", "", "", "ReturnValue[0]", "environment", "manual"]
       - ["os", "", False, "UserHomeDir", "", "", "ReturnValue[0]", "environment", "manual"]
diff --git a/go/ql/lib/ext/regexp.model.yml b/go/ql/lib/ext/regexp.model.yml
index ffb6205657a..427d708b12e 100644
--- a/go/ql/lib/ext/regexp.model.yml
+++ b/go/ql/lib/ext/regexp.model.yml
@@ -3,13 +3,13 @@ extensions:
       pack: codeql/go-all
       extensible: sinkModel
     data:
-      - ["regexp", "", True, "Compile", "", "", "Argument[0]", "regex-use[c]", "manual"]
-      - ["regexp", "", True, "CompilePOSIX", "", "", "Argument[0]", "regex-use[c]", "manual"]
-      - ["regexp", "", True, "MustCompile", "", "", "Argument[0]", "regex-use[c]", "manual"]
-      - ["regexp", "", True, "MustCompilePOSIX", "", "", "Argument[0]", "regex-use[c]", "manual"]
-      - ["regexp", "", True, "Match", "", "", "Argument[0]", "regex-use[1]", "manual"]
-      - ["regexp", "", True, "MatchReader", "", "", "Argument[0]", "regex-use[1]", "manual"]
-      - ["regexp", "", True, "MatchString", "", "", "Argument[0]", "regex-use[1]", "manual"]
+      - ["regexp", "", False, "Compile", "", "", "Argument[0]", "regex-use[c]", "manual"]
+      - ["regexp", "", False, "CompilePOSIX", "", "", "Argument[0]", "regex-use[c]", "manual"]
+      - ["regexp", "", False, "MustCompile", "", "", "Argument[0]", "regex-use[c]", "manual"]
+      - ["regexp", "", False, "MustCompilePOSIX", "", "", "Argument[0]", "regex-use[c]", "manual"]
+      - ["regexp", "", False, "Match", "", "", "Argument[0]", "regex-use[1]", "manual"]
+      - ["regexp", "", False, "MatchReader", "", "", "Argument[0]", "regex-use[1]", "manual"]
+      - ["regexp", "", False, "MatchString", "", "", "Argument[0]", "regex-use[1]", "manual"]
       - ["regexp", "Regexp", True, "Match", "", "", "Argument[receiver]", "regex-use[0]", "manual"]
       - ["regexp", "Regexp", True, "MatchReader", "", "", "Argument[receiver]", "regex-use[0]", "manual"]
       - ["regexp", "Regexp", True, "MatchString", "", "", "Argument[receiver]", "regex-use[0]", "manual"]
diff --git a/go/ql/lib/ext/syscall.model.yml b/go/ql/lib/ext/syscall.model.yml
index 9d65f2bedbd..948cca3e298 100644
--- a/go/ql/lib/ext/syscall.model.yml
+++ b/go/ql/lib/ext/syscall.model.yml
@@ -25,4 +25,4 @@ extensions:
       extensible: sourceModel
     data:
       - ["syscall", "", False, "Environ", "", "", "ReturnValue", "environment", "manual"]
-      - ["syscall", "", False, "Getenv", "", "", "ReturnValue[0]", "environment", "manual"]
\ No newline at end of file
+      - ["syscall", "", False, "Getenv", "", "", "ReturnValue[0]", "environment", "manual"]
diff --git a/go/ql/lib/go.dbscheme b/go/ql/lib/go.dbscheme
index a58b81b1b4c..4bd57e09327 100644
--- a/go/ql/lib/go.dbscheme
+++ b/go/ql/lib/go.dbscheme
@@ -1,4 +1,4 @@
-/** Auto-generated dbscheme; do not edit. */
+/** Auto-generated dbscheme; do not edit. Run `make gen` in directory `go/` to regenerate. */
 
 
 /** Duplicate code **/
@@ -207,6 +207,12 @@ underlying_type(unique int named: @namedtype ref, int tp: @type ref);
 #keyset[parent, index]
 component_types(int parent: @compositetype ref, int index: int ref, string name: string ref, int tp: @type ref);
 
+#keyset[parent, index]
+struct_tags(int parent: @structtype ref, int index: int ref, string tag: string ref);
+
+#keyset[interface, index]
+interface_private_method_ids(int interface: @interfacetype ref, int index: int ref, string id: string ref);
+
 array_length(unique int tp: @arraytype ref, string len: string ref);
 
 type_objects(unique int tp: @type ref, int object: @object ref);
diff --git a/go/ql/lib/go.dbscheme.stats b/go/ql/lib/go.dbscheme.stats
index b18e8556fb2..a602a143ee0 100644
--- a/go/ql/lib/go.dbscheme.stats
+++ b/go/ql/lib/go.dbscheme.stats
@@ -1,11 +1,15 @@
 <dbstats>
     <typesizes>
         <e>
-            <k>@similarity</k>
+            <k>@duplication</k>
             <v>0</v>
         </e>
         <e>
-            <k>@duplication</k>
+            <k>@externalDataElement</k>
+            <v>0</v>
+        </e>
+        <e>
+            <k>@similarity</k>
             <v>0</v>
         </e>
         <e>
@@ -14,15 +18,11 @@
         </e>
         <e>
             <k>@xmlelement</k>
-            <v>504</v>
+            <v>8655540</v>
         </e>
         <e>
             <k>@xmlattribute</k>
-            <v>408</v>
-        </e>
-        <e>
-            <k>@externalDataElement</k>
-            <v>0</v>
+            <v>3762921</v>
         </e>
         <e>
             <k>@xmlnamespace</k>
@@ -30,387 +30,359 @@
         </e>
         <e>
             <k>@xmlcomment</k>
-            <v>30</v>
+            <v>131455</v>
         </e>
         <e>
             <k>@xmlcharacters</k>
-            <v>869</v>
+            <v>13383839</v>
         </e>
         <e>
             <k>@compilation</k>
-            <v>1</v>
+            <v>31407</v>
         </e>
         <e>
             <k>@diagnostic</k>
-            <v>0</v>
+            <v>233782</v>
         </e>
         <e>
             <k>@file</k>
-            <v>529</v>
+            <v>146783</v>
         </e>
         <e>
             <k>@folder</k>
-            <v>210</v>
+            <v>98591</v>
         </e>
         <e>
             <k>@comment_group</k>
-            <v>12083</v>
+            <v>2493839</v>
         </e>
         <e>
             <k>@slashslashcomment</k>
-            <v>24878</v>
+            <v>2514613</v>
         </e>
         <e>
             <k>@slashstarcomment</k>
-            <v>846</v>
+            <v>77689</v>
+        </e>
+        <e>
+            <k>@location_default</k>
+            <v>37058201</v>
         </e>
         <e>
             <k>@ident</k>
-            <v>237316</v>
+            <v>5500549</v>
         </e>
         <e>
             <k>@ellipsis</k>
-            <v>141</v>
+            <v>42416</v>
         </e>
         <e>
             <k>@intlit</k>
-            <v>7683</v>
-        </e>
-        <e>
-            <k>@floatlit</k>
-            <v>27</v>
+            <v>8029312</v>
         </e>
         <e>
             <k>@charlit</k>
-            <v>838</v>
+            <v>44853</v>
         </e>
         <e>
             <k>@stringlit</k>
-            <v>24892</v>
+            <v>936836</v>
         </e>
         <e>
             <k>@funclit</k>
-            <v>678</v>
+            <v>145208</v>
         </e>
         <e>
             <k>@compositelit</k>
-            <v>2704</v>
+            <v>638762</v>
         </e>
         <e>
             <k>@parenexpr</k>
-            <v>343</v>
+            <v>44180</v>
         </e>
         <e>
             <k>@selectorexpr</k>
-            <v>54353</v>
+            <v>1563876</v>
         </e>
         <e>
             <k>@indexexpr</k>
-            <v>4581</v>
+            <v>1269900</v>
         </e>
         <e>
             <k>@sliceexpr</k>
-            <v>836</v>
+            <v>26235</v>
         </e>
         <e>
             <k>@typeassertexpr</k>
-            <v>2127</v>
+            <v>86701</v>
         </e>
         <e>
             <k>@callorconversionexpr</k>
-            <v>32041</v>
+            <v>1123396</v>
         </e>
         <e>
             <k>@starexpr</k>
-            <v>10360</v>
+            <v>401599</v>
         </e>
         <e>
             <k>@keyvalueexpr</k>
-            <v>5616</v>
+            <v>2321152</v>
         </e>
         <e>
             <k>@arraytypeexpr</k>
-            <v>3465</v>
+            <v>172175</v>
         </e>
         <e>
             <k>@structtypeexpr</k>
-            <v>1207</v>
+            <v>126802</v>
         </e>
         <e>
             <k>@functypeexpr</k>
-            <v>6015</v>
+            <v>302047</v>
         </e>
         <e>
             <k>@interfacetypeexpr</k>
-            <v>509</v>
+            <v>154636</v>
         </e>
         <e>
             <k>@maptypeexpr</k>
-            <v>1013</v>
+            <v>71689</v>
         </e>
         <e>
             <k>@minusexpr</k>
-            <v>270</v>
+            <v>183167</v>
         </e>
         <e>
             <k>@notexpr</k>
-            <v>1190</v>
-        </e>
-        <e>
-            <k>@complementexpr</k>
-            <v>21</v>
+            <v>36971</v>
         </e>
         <e>
             <k>@addressexpr</k>
-            <v>1739</v>
+            <v>112784</v>
         </e>
         <e>
             <k>@arrowexpr</k>
-            <v>92</v>
+            <v>27351</v>
         </e>
         <e>
             <k>@lorexpr</k>
-            <v>612</v>
+            <v>27296</v>
         </e>
         <e>
             <k>@landexpr</k>
-            <v>1234</v>
+            <v>99629</v>
         </e>
         <e>
             <k>@eqlexpr</k>
-            <v>3244</v>
+            <v>91950</v>
         </e>
         <e>
             <k>@neqexpr</k>
-            <v>4103</v>
-        </e>
-        <e>
-            <k>@lssexpr</k>
-            <v>785</v>
-        </e>
-        <e>
-            <k>@leqexpr</k>
-            <v>248</v>
+            <v>326490</v>
         </e>
         <e>
             <k>@gtrexpr</k>
-            <v>619</v>
+            <v>38816</v>
         </e>
         <e>
             <k>@geqexpr</k>
-            <v>270</v>
+            <v>21923</v>
         </e>
         <e>
             <k>@addexpr</k>
-            <v>1272</v>
+            <v>194589</v>
         </e>
         <e>
             <k>@subexpr</k>
-            <v>557</v>
-        </e>
-        <e>
-            <k>@orexpr</k>
-            <v>146</v>
-        </e>
-        <e>
-            <k>@xorexpr</k>
-            <v>14</v>
+            <v>222492</v>
         </e>
         <e>
             <k>@mulexpr</k>
-            <v>207</v>
-        </e>
-        <e>
-            <k>@quoexpr</k>
-            <v>53</v>
-        </e>
-        <e>
-            <k>@remexpr</k>
-            <v>24</v>
-        </e>
-        <e>
-            <k>@shlexpr</k>
-            <v>164</v>
-        </e>
-        <e>
-            <k>@shrexpr</k>
-            <v>57</v>
-        </e>
-        <e>
-            <k>@andexpr</k>
-            <v>235</v>
-        </e>
-        <e>
-            <k>@andnotexpr</k>
-            <v>19</v>
+            <v>32053</v>
         </e>
         <e>
             <k>@sendchantypeexpr</k>
-            <v>7</v>
+            <v>22312</v>
         </e>
         <e>
             <k>@recvchantypeexpr</k>
-            <v>9</v>
+            <v>9117</v>
         </e>
         <e>
             <k>@sendrcvchantypeexpr</k>
-            <v>101</v>
+            <v>25432</v>
         </e>
         <e>
             <k>@badexpr</k>
-            <v>0</v>
+            <v>2</v>
+        </e>
+        <e>
+            <k>@floatlit</k>
+            <v>393088</v>
         </e>
         <e>
             <k>@imaglit</k>
-            <v>0</v>
+            <v>1233</v>
+        </e>
+        <e>
+            <k>@genericfunctioninstantiationexpr</k>
+            <v>9823</v>
+        </e>
+        <e>
+            <k>@generictypeinstantiationexpr</k>
+            <v>4188</v>
+        </e>
+        <e>
+            <k>@typesetliteralexpr</k>
+            <v>1171</v>
         </e>
         <e>
             <k>@plusexpr</k>
-            <v>0</v>
+            <v>370</v>
+        </e>
+        <e>
+            <k>@complementexpr</k>
+            <v>3979</v>
         </e>
         <e>
             <k>@derefexpr</k>
             <v>0</v>
         </e>
         <e>
-            <k>@field</k>
-            <v>19974</v>
+            <k>@lssexpr</k>
+            <v>32125</v>
         </e>
         <e>
-            <k>@location_default</k>
-            <v>539178</v>
+            <k>@leqexpr</k>
+            <v>9262</v>
+        </e>
+        <e>
+            <k>@orexpr</k>
+            <v>81746</v>
+        </e>
+        <e>
+            <k>@xorexpr</k>
+            <v>1753</v>
+        </e>
+        <e>
+            <k>@quoexpr</k>
+            <v>61619</v>
+        </e>
+        <e>
+            <k>@remexpr</k>
+            <v>2999</v>
+        </e>
+        <e>
+            <k>@shlexpr</k>
+            <v>82494</v>
+        </e>
+        <e>
+            <k>@shrexpr</k>
+            <v>7813</v>
+        </e>
+        <e>
+            <k>@andexpr</k>
+            <v>11860</v>
+        </e>
+        <e>
+            <k>@andnotexpr</k>
+            <v>396</v>
+        </e>
+        <e>
+            <k>@field</k>
+            <v>995459</v>
+        </e>
+        <e>
+            <k>@typeparamdecl</k>
+            <v>9798</v>
         </e>
         <e>
             <k>@declstmt</k>
-            <v>1454</v>
-        </e>
-        <e>
-            <k>@labeledstmt</k>
-            <v>49</v>
+            <v>74013</v>
         </e>
         <e>
             <k>@exprstmt</k>
-            <v>7605</v>
+            <v>460278</v>
         </e>
         <e>
             <k>@sendstmt</k>
-            <v>69</v>
+            <v>16794</v>
         </e>
         <e>
             <k>@incstmt</k>
-            <v>614</v>
+            <v>15889</v>
         </e>
         <e>
             <k>@decstmt</k>
-            <v>71</v>
+            <v>9601</v>
         </e>
         <e>
             <k>@gostmt</k>
-            <v>72</v>
+            <v>20539</v>
         </e>
         <e>
             <k>@deferstmt</k>
-            <v>358</v>
+            <v>98332</v>
         </e>
         <e>
             <k>@returnstmt</k>
-            <v>9225</v>
+            <v>355294</v>
         </e>
         <e>
             <k>@breakstmt</k>
-            <v>301</v>
+            <v>14232</v>
         </e>
         <e>
             <k>@continuestmt</k>
-            <v>606</v>
-        </e>
-        <e>
-            <k>@gotostmt</k>
-            <v>8</v>
-        </e>
-        <e>
-            <k>@fallthroughstmt</k>
-            <v>7</v>
+            <v>45187</v>
         </e>
         <e>
             <k>@blockstmt</k>
-            <v>19358</v>
+            <v>539596</v>
         </e>
         <e>
             <k>@ifstmt</k>
-            <v>9728</v>
+            <v>313551</v>
         </e>
         <e>
             <k>@caseclause</k>
-            <v>3476</v>
+            <v>79016</v>
         </e>
         <e>
             <k>@exprswitchstmt</k>
-            <v>378</v>
+            <v>17092</v>
         </e>
         <e>
             <k>@typeswitchstmt</k>
-            <v>400</v>
+            <v>9269</v>
         </e>
         <e>
             <k>@commclause</k>
-            <v>72</v>
+            <v>25912</v>
         </e>
         <e>
             <k>@selectstmt</k>
-            <v>35</v>
+            <v>11996</v>
         </e>
         <e>
             <k>@forstmt</k>
-            <v>654</v>
+            <v>25752</v>
         </e>
         <e>
             <k>@rangestmt</k>
-            <v>2135</v>
+            <v>64694</v>
         </e>
         <e>
             <k>@assignstmt</k>
-            <v>7478</v>
+            <v>641512</v>
         </e>
         <e>
             <k>@definestmt</k>
-            <v>9514</v>
+            <v>433774</v>
         </e>
         <e>
             <k>@addassignstmt</k>
-            <v>223</v>
-        </e>
-        <e>
-            <k>@subassignstmt</k>
-            <v>18</v>
-        </e>
-        <e>
-            <k>@mulassignstmt</k>
-            <v>5</v>
-        </e>
-        <e>
-            <k>@quoassignstmt</k>
-            <v>3</v>
-        </e>
-        <e>
-            <k>@orassignstmt</k>
-            <v>63</v>
-        </e>
-        <e>
-            <k>@xorassignstmt</k>
-            <v>3</v>
-        </e>
-        <e>
-            <k>@shlassignstmt</k>
-            <v>2</v>
-        </e>
-        <e>
-            <k>@shrassignstmt</k>
-            <v>3</v>
-        </e>
-        <e>
-            <k>@andnotassignstmt</k>
-            <v>3</v>
+            <v>21683</v>
         </e>
         <e>
             <k>@badstmt</k>
@@ -418,279 +390,335 @@
         </e>
         <e>
             <k>@emptystmt</k>
-            <v>0</v>
+            <v>181</v>
+        </e>
+        <e>
+            <k>@labeledstmt</k>
+            <v>4273</v>
+        </e>
+        <e>
+            <k>@gotostmt</k>
+            <v>4431</v>
+        </e>
+        <e>
+            <k>@fallthroughstmt</k>
+            <v>11233</v>
+        </e>
+        <e>
+            <k>@subassignstmt</k>
+            <v>6675</v>
+        </e>
+        <e>
+            <k>@mulassignstmt</k>
+            <v>470</v>
+        </e>
+        <e>
+            <k>@quoassignstmt</k>
+            <v>556</v>
         </e>
         <e>
             <k>@remassignstmt</k>
-            <v>0</v>
+            <v>171</v>
         </e>
         <e>
             <k>@andassignstmt</k>
-            <v>0</v>
+            <v>279</v>
+        </e>
+        <e>
+            <k>@orassignstmt</k>
+            <v>9913</v>
+        </e>
+        <e>
+            <k>@xorassignstmt</k>
+            <v>2562</v>
+        </e>
+        <e>
+            <k>@shlassignstmt</k>
+            <v>367</v>
+        </e>
+        <e>
+            <k>@shrassignstmt</k>
+            <v>429</v>
+        </e>
+        <e>
+            <k>@andnotassignstmt</k>
+            <v>279</v>
         </e>
         <e>
             <k>@importdecl</k>
-            <v>479</v>
+            <v>83355</v>
         </e>
         <e>
             <k>@constdecl</k>
-            <v>280</v>
+            <v>54489</v>
         </e>
         <e>
             <k>@typedecl</k>
-            <v>1349</v>
+            <v>100497</v>
         </e>
         <e>
             <k>@vardecl</k>
-            <v>1769</v>
+            <v>118650</v>
         </e>
         <e>
             <k>@funcdecl</k>
-            <v>4813</v>
+            <v>283367</v>
         </e>
         <e>
             <k>@baddecl</k>
-            <v>0</v>
+            <v>214</v>
         </e>
         <e>
             <k>@importspec</k>
-            <v>3468</v>
+            <v>247378</v>
         </e>
         <e>
             <k>@valuespec</k>
-            <v>3056</v>
+            <v>152556</v>
         </e>
         <e>
             <k>@typedefspec</k>
-            <v>1349</v>
+            <v>101666</v>
         </e>
         <e>
             <k>@aliasspec</k>
-            <v>16</v>
+            <v>17497</v>
         </e>
         <e>
             <k>@universescope</k>
-            <v>1</v>
+            <v>5401</v>
         </e>
         <e>
             <k>@packagescope</k>
-            <v>346</v>
+            <v>924779</v>
         </e>
         <e>
             <k>@localscope</k>
-            <v>36428</v>
+            <v>919952</v>
         </e>
         <e>
             <k>@pkgobject</k>
-            <v>3468</v>
+            <v>247378</v>
         </e>
         <e>
             <k>@decltypeobject</k>
-            <v>3602</v>
+            <v>13124885</v>
         </e>
         <e>
             <k>@builtintypeobject</k>
-            <v>20</v>
+            <v>118831</v>
         </e>
         <e>
             <k>@declconstobject</k>
-            <v>8857</v>
+            <v>80430386</v>
         </e>
         <e>
             <k>@builtinconstobject</k>
-            <v>4</v>
+            <v>21605</v>
         </e>
         <e>
             <k>@declvarobject</k>
-            <v>51098</v>
+            <v>118985930</v>
         </e>
         <e>
             <k>@declfunctionobject</k>
-            <v>17793</v>
+            <v>93191570</v>
         </e>
         <e>
             <k>@builtinfunctionobject</k>
-            <v>18</v>
+            <v>140437</v>
         </e>
         <e>
             <k>@labelobject</k>
-            <v>49</v>
+            <v>4273</v>
         </e>
         <e>
             <k>@invalidtype</k>
-            <v>1</v>
+            <v>5401</v>
         </e>
         <e>
             <k>@boolexprtype</k>
-            <v>1</v>
+            <v>5401</v>
         </e>
         <e>
             <k>@inttype</k>
-            <v>1</v>
+            <v>5401</v>
         </e>
         <e>
             <k>@int8type</k>
-            <v>1</v>
+            <v>5401</v>
         </e>
         <e>
             <k>@int16type</k>
-            <v>1</v>
+            <v>5401</v>
         </e>
         <e>
             <k>@int32type</k>
-            <v>1</v>
+            <v>5401</v>
         </e>
         <e>
             <k>@int64type</k>
-            <v>1</v>
+            <v>5401</v>
         </e>
         <e>
             <k>@uinttype</k>
-            <v>1</v>
+            <v>5401</v>
         </e>
         <e>
             <k>@uint8type</k>
-            <v>1</v>
+            <v>5401</v>
         </e>
         <e>
             <k>@uint16type</k>
-            <v>1</v>
+            <v>5401</v>
         </e>
         <e>
             <k>@uint32type</k>
-            <v>1</v>
+            <v>5401</v>
         </e>
         <e>
             <k>@uint64type</k>
-            <v>1</v>
+            <v>5401</v>
         </e>
         <e>
             <k>@uintptrtype</k>
-            <v>1</v>
+            <v>5401</v>
         </e>
         <e>
             <k>@float32type</k>
-            <v>1</v>
+            <v>5401</v>
         </e>
         <e>
             <k>@float64type</k>
-            <v>1</v>
+            <v>5401</v>
         </e>
         <e>
             <k>@complex64type</k>
-            <v>1</v>
+            <v>4107</v>
         </e>
         <e>
             <k>@complex128type</k>
-            <v>1</v>
+            <v>5401</v>
         </e>
         <e>
             <k>@stringexprtype</k>
-            <v>1</v>
+            <v>5401</v>
         </e>
         <e>
             <k>@unsafepointertype</k>
-            <v>1</v>
+            <v>5401</v>
         </e>
         <e>
             <k>@boolliteraltype</k>
-            <v>1</v>
+            <v>5401</v>
         </e>
         <e>
             <k>@intliteraltype</k>
-            <v>1</v>
+            <v>5401</v>
         </e>
         <e>
             <k>@runeliteraltype</k>
-            <v>1</v>
+            <v>5401</v>
         </e>
         <e>
             <k>@floatliteraltype</k>
-            <v>1</v>
+            <v>5401</v>
         </e>
         <e>
             <k>@stringliteraltype</k>
-            <v>1</v>
+            <v>5401</v>
         </e>
         <e>
             <k>@nilliteraltype</k>
-            <v>1</v>
+            <v>5401</v>
+        </e>
+        <e>
+            <k>@typeparamtype</k>
+            <v>331358</v>
         </e>
         <e>
             <k>@arraytype</k>
-            <v>293</v>
+            <v>1528173</v>
         </e>
         <e>
             <k>@slicetype</k>
-            <v>637</v>
+            <v>2313692</v>
         </e>
         <e>
             <k>@structtype</k>
-            <v>2409</v>
+            <v>8070007</v>
         </e>
         <e>
             <k>@pointertype</k>
-            <v>1903</v>
+            <v>8158995</v>
         </e>
         <e>
             <k>@interfacetype</k>
-            <v>247</v>
+            <v>1636684</v>
         </e>
         <e>
             <k>@tupletype</k>
-            <v>559</v>
+            <v>69835</v>
         </e>
         <e>
             <k>@signaturetype</k>
-            <v>8010</v>
+            <v>28950823</v>
         </e>
         <e>
             <k>@maptype</k>
-            <v>430</v>
+            <v>866786</v>
         </e>
         <e>
             <k>@sendchantype</k>
-            <v>13</v>
+            <v>32408</v>
         </e>
         <e>
             <k>@recvchantype</k>
-            <v>10</v>
+            <v>48612</v>
         </e>
         <e>
             <k>@sendrcvchantype</k>
-            <v>29</v>
+            <v>101202</v>
         </e>
         <e>
             <k>@namedtype</k>
-            <v>3567</v>
+            <v>12852686</v>
+        </e>
+        <e>
+            <k>@typesetliteraltype</k>
+            <v>59325</v>
+        </e>
+        <e>
+            <k>@typealias</k>
+            <v>660784</v>
         </e>
         <e>
             <k>@complexliteraltype</k>
-            <v>0</v>
+            <v>88</v>
         </e>
         <e>
             <k>@package</k>
-            <v>346</v>
+            <v>924779</v>
         </e>
         <e>
             <k>@modline</k>
-            <v>6</v>
+            <v>191935</v>
         </e>
         <e>
             <k>@modlineblock</k>
-            <v>1</v>
+            <v>22683</v>
         </e>
         <e>
             <k>@modlparen</k>
-            <v>1</v>
+            <v>22683</v>
         </e>
         <e>
             <k>@modrparen</k>
-            <v>1</v>
+            <v>22683</v>
         </e>
         <e>
             <k>@modcommentblock</k>
-            <v>0</v>
+            <v>431</v>
         </e>
         <e>
             <k>@unknownerror</k>
@@ -698,15 +726,15 @@
         </e>
         <e>
             <k>@listerror</k>
-            <v>0</v>
+            <v>22275</v>
         </e>
         <e>
             <k>@parseerror</k>
-            <v>0</v>
+            <v>3428</v>
         </e>
         <e>
             <k>@typeerror</k>
-            <v>0</v>
+            <v>219425</v>
         </e>
     </typesizes>
     <stats>
@@ -738,7 +766,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1</v>
+                                    <v>403</v>
                                 </b>
                             </bs>
                         </hist>
@@ -754,7 +782,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1</v>
+                                    <v>403</v>
                                 </b>
                             </bs>
                         </hist>
@@ -830,7 +858,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1</v>
+                                    <v>403</v>
                                 </b>
                             </bs>
                         </hist>
@@ -846,7 +874,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1</v>
+                                    <v>403</v>
                                 </b>
                             </bs>
                         </hist>
@@ -1383,11 +1411,11 @@
         </relation>
         <relation>
             <name>sourceLocationPrefix</name>
-            <cardinality>1</cardinality>
+            <cardinality>5401</cardinality>
             <columnsizes>
                 <e>
                     <k>prefix</k>
-                    <v>1</v>
+                    <v>5401</v>
                 </e>
             </columnsizes>
             <dependencies/>
@@ -1416,7 +1444,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1</v>
+                                    <v>403</v>
                                 </b>
                             </bs>
                         </hist>
@@ -1470,7 +1498,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1</v>
+                                    <v>403</v>
                                 </b>
                             </bs>
                         </hist>
@@ -1486,7 +1514,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1</v>
+                                    <v>403</v>
                                 </b>
                             </bs>
                         </hist>
@@ -1502,7 +1530,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1</v>
+                                    <v>403</v>
                                 </b>
                             </bs>
                         </hist>
@@ -1518,7 +1546,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1</v>
+                                    <v>403</v>
                                 </b>
                             </bs>
                         </hist>
@@ -1688,27 +1716,27 @@
         </relation>
         <relation>
             <name>xmlElements</name>
-            <cardinality>504</cardinality>
+            <cardinality>8655540</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>504</v>
+                    <v>8655540</v>
                 </e>
                 <e>
                     <k>name</k>
-                    <v>38</v>
+                    <v>160211</v>
                 </e>
                 <e>
                     <k>parentid</k>
-                    <v>199</v>
+                    <v>2961862</v>
                 </e>
                 <e>
                     <k>idx</k>
-                    <v>86</v>
+                    <v>1302233</v>
                 </e>
                 <e>
                     <k>fileid</k>
-                    <v>14</v>
+                    <v>90375</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -1722,7 +1750,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>504</v>
+                                    <v>8655540</v>
                                 </b>
                             </bs>
                         </hist>
@@ -1738,7 +1766,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>504</v>
+                                    <v>8655540</v>
                                 </b>
                             </bs>
                         </hist>
@@ -1754,7 +1782,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>504</v>
+                                    <v>8655540</v>
                                 </b>
                             </bs>
                         </hist>
@@ -1770,7 +1798,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>504</v>
+                                    <v>8655540</v>
                                 </b>
                             </bs>
                         </hist>
@@ -1786,52 +1814,199 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>11</v>
+                                    <v>24647</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>3</v>
+                                    <v>8215</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>4</v>
+                                    <v>8215</v>
                                 </b>
                                 <b>
                                     <a>4</a>
+                                    <b>5</b>
+                                    <v>12323</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
                                     <b>6</b>
-                                    <v>3</v>
+                                    <v>4107</v>
+                                </b>
+                                <b>
+                                    <a>8</a>
+                                    <b>9</b>
+                                    <v>12323</v>
+                                </b>
+                                <b>
+                                    <a>13</a>
+                                    <b>14</b>
+                                    <v>8215</v>
+                                </b>
+                                <b>
+                                    <a>18</a>
+                                    <b>22</b>
+                                    <v>12323</v>
+                                </b>
+                                <b>
+                                    <a>22</a>
+                                    <b>30</b>
+                                    <v>12323</v>
+                                </b>
+                                <b>
+                                    <a>30</a>
+                                    <b>40</b>
+                                    <v>12323</v>
+                                </b>
+                                <b>
+                                    <a>49</a>
+                                    <b>52</b>
+                                    <v>12323</v>
+                                </b>
+                                <b>
+                                    <a>52</a>
+                                    <b>58</b>
+                                    <v>8215</v>
+                                </b>
+                                <b>
+                                    <a>135</a>
+                                    <b>200</b>
+                                    <v>12323</v>
+                                </b>
+                                <b>
+                                    <a>233</a>
+                                    <b>570</b>
+                                    <v>12323</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>name</src>
+                    <trg>parentid</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>49295</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>8215</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>5</b>
+                                    <v>20539</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
+                                    <b>11</b>
+                                    <v>8215</v>
+                                </b>
+                                <b>
+                                    <a>11</a>
+                                    <b>12</b>
+                                    <v>8215</v>
+                                </b>
+                                <b>
+                                    <a>13</a>
+                                    <b>19</b>
+                                    <v>12323</v>
+                                </b>
+                                <b>
+                                    <a>19</a>
+                                    <b>22</b>
+                                    <v>12323</v>
+                                </b>
+                                <b>
+                                    <a>22</a>
+                                    <b>30</b>
+                                    <v>12323</v>
+                                </b>
+                                <b>
+                                    <a>33</a>
+                                    <b>53</b>
+                                    <v>12323</v>
+                                </b>
+                                <b>
+                                    <a>72</a>
+                                    <b>132</b>
+                                    <v>12323</v>
+                                </b>
+                                <b>
+                                    <a>302</a>
+                                    <b>303</b>
+                                    <v>4107</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>name</src>
+                    <trg>idx</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>41079</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>28755</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>12323</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>5</b>
+                                    <v>12323</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
+                                    <b>6</b>
+                                    <v>12323</v>
                                 </b>
                                 <b>
                                     <a>7</a>
-                                    <b>12</b>
-                                    <v>3</v>
+                                    <b>10</b>
+                                    <v>12323</v>
                                 </b>
                                 <b>
-                                    <a>12</a>
+                                    <a>11</a>
                                     <b>14</b>
-                                    <v>2</v>
+                                    <v>12323</v>
                                 </b>
                                 <b>
                                     <a>14</a>
                                     <b>16</b>
-                                    <v>3</v>
+                                    <v>12323</v>
                                 </b>
                                 <b>
-                                    <a>16</a>
-                                    <b>22</b>
-                                    <v>3</v>
+                                    <a>33</a>
+                                    <b>50</b>
+                                    <v>12323</v>
                                 </b>
                                 <b>
-                                    <a>27</a>
-                                    <b>40</b>
-                                    <v>3</v>
-                                </b>
-                                <b>
-                                    <a>55</a>
-                                    <b>101</b>
-                                    <v>3</v>
+                                    <a>212</a>
+                                    <b>213</b>
+                                    <v>4107</v>
                                 </b>
                             </bs>
                         </hist>
@@ -1839,7 +2014,7 @@
                 </dep>
                 <dep>
                     <src>name</src>
-                    <trg>parentid</trg>
+                    <trg>fileid</trg>
                     <val>
                         <hist>
                             <budget>12</budget>
@@ -1847,503 +2022,316 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>15</v>
+                                    <v>86267</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>4</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>4</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>5</b>
-                                    <v>3</v>
-                                </b>
-                                <b>
-                                    <a>5</a>
-                                    <b>6</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>6</a>
-                                    <b>7</b>
-                                    <v>3</v>
-                                </b>
-                                <b>
-                                    <a>7</a>
-                                    <b>18</b>
-                                    <v>3</v>
-                                </b>
-                                <b>
-                                    <a>18</a>
-                                    <b>22</b>
-                                    <v>3</v>
-                                </b>
-                                <b>
-                                    <a>29</a>
-                                    <b>76</b>
-                                    <v>2</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>name</src>
-                    <trg>idx</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>4</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>5</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>5</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>5</a>
-                                    <b>6</b>
-                                    <v>3</v>
-                                </b>
-                                <b>
-                                    <a>6</a>
-                                    <b>9</b>
-                                    <v>3</v>
+                                    <v>12323</v>
                                 </b>
                                 <b>
                                     <a>10</a>
                                     <b>11</b>
-                                    <v>2</v>
+                                    <v>24647</v>
                                 </b>
                                 <b>
                                     <a>13</a>
-                                    <b>15</b>
-                                    <v>3</v>
-                                </b>
-                                <b>
-                                    <a>15</a>
-                                    <b>17</b>
-                                    <v>3</v>
-                                </b>
-                                <b>
-                                    <a>17</a>
-                                    <b>41</b>
-                                    <v>2</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>name</src>
-                    <trg>fileid</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>18</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>7</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>3</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>5</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>5</a>
-                                    <b>6</b>
-                                    <v>4</v>
-                                </b>
-                                <b>
-                                    <a>7</a>
-                                    <b>11</b>
-                                    <v>3</v>
-                                </b>
-                                <b>
-                                    <a>11</a>
-                                    <b>14</b>
-                                    <v>2</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>parentid</src>
-                    <trg>id</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>116</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>37</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>22</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>8</b>
-                                    <v>15</v>
-                                </b>
-                                <b>
-                                    <a>8</a>
-                                    <b>61</b>
-                                    <v>9</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>parentid</src>
-                    <trg>name</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>23</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>8</b>
-                                    <v>16</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>parentid</src>
-                    <trg>idx</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>116</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>37</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>22</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>8</b>
-                                    <v>15</v>
-                                </b>
-                                <b>
-                                    <a>8</a>
-                                    <b>61</b>
-                                    <v>9</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>parentid</src>
-                    <trg>fileid</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>199</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>idx</src>
-                    <trg>id</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>54</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>4</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>11</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>6</b>
-                                    <v>6</v>
-                                </b>
-                                <b>
-                                    <a>6</a>
-                                    <b>21</b>
-                                    <v>7</v>
-                                </b>
-                                <b>
-                                    <a>40</a>
-                                    <b>141</b>
-                                    <v>4</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>idx</src>
-                    <trg>name</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>54</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>5</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>11</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>5</b>
-                                    <v>6</v>
-                                </b>
-                                <b>
-                                    <a>5</a>
-                                    <b>12</b>
-                                    <v>7</v>
-                                </b>
-                                <b>
-                                    <a>14</a>
-                                    <b>26</b>
-                                    <v>3</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>idx</src>
-                    <trg>parentid</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>54</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>4</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>11</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>6</b>
-                                    <v>6</v>
-                                </b>
-                                <b>
-                                    <a>6</a>
-                                    <b>21</b>
-                                    <v>7</v>
-                                </b>
-                                <b>
-                                    <a>40</a>
-                                    <b>141</b>
-                                    <v>4</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>idx</src>
-                    <trg>fileid</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>54</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>4</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>11</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>5</b>
-                                    <v>8</v>
-                                </b>
-                                <b>
-                                    <a>5</a>
-                                    <b>13</b>
-                                    <v>7</v>
-                                </b>
-                                <b>
-                                    <a>13</a>
-                                    <b>15</b>
-                                    <v>2</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>fileid</src>
-                    <trg>id</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>7</a>
-                                    <b>8</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>8</a>
-                                    <b>9</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>10</a>
-                                    <b>11</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>16</a>
-                                    <b>17</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>18</a>
                                     <b>19</b>
-                                    <v>1</v>
+                                    <v>8215</v>
                                 </b>
                                 <b>
-                                    <a>20</a>
+                                    <a>19</a>
                                     <b>21</b>
-                                    <v>1</v>
+                                    <v>12323</v>
                                 </b>
                                 <b>
                                     <a>21</a>
                                     <b>22</b>
-                                    <v>2</v>
+                                    <v>8215</v>
                                 </b>
                                 <b>
-                                    <a>58</a>
-                                    <b>59</b>
-                                    <v>1</v>
+                                    <a>22</a>
+                                    <b>23</b>
+                                    <v>8215</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>parentid</src>
+                    <trg>id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>1429581</v>
                                 </b>
                                 <b>
-                                    <a>100</a>
-                                    <b>101</b>
-                                    <v>1</v>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>788734</v>
                                 </b>
                                 <b>
-                                    <a>107</a>
-                                    <b>108</b>
-                                    <v>1</v>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>172535</v>
                                 </b>
                                 <b>
-                                    <a>108</a>
-                                    <b>109</b>
-                                    <v>1</v>
+                                    <a>4</a>
+                                    <b>5</b>
+                                    <v>168427</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
+                                    <b>7</b>
+                                    <v>267019</v>
+                                </b>
+                                <b>
+                                    <a>7</a>
+                                    <b>311</b>
+                                    <v>135563</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>parentid</src>
+                    <trg>name</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>2185452</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>636738</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>10</b>
+                                    <v>139671</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>parentid</src>
+                    <trg>idx</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>1429581</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>788734</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>172535</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>5</b>
+                                    <v>168427</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
+                                    <b>7</b>
+                                    <v>267019</v>
+                                </b>
+                                <b>
+                                    <a>7</a>
+                                    <b>311</b>
+                                    <v>135563</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>parentid</src>
+                    <trg>fileid</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>2961862</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>idx</src>
+                    <trg>id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>1125589</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>6</b>
+                                    <v>110915</v>
+                                </b>
+                                <b>
+                                    <a>6</a>
+                                    <b>404</b>
+                                    <v>65727</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>idx</src>
+                    <trg>name</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>1125589</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>106807</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>26</b>
+                                    <v>69835</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>idx</src>
+                    <trg>parentid</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>1125589</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>6</b>
+                                    <v>110915</v>
+                                </b>
+                                <b>
+                                    <a>6</a>
+                                    <b>404</b>
+                                    <v>65727</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>idx</src>
+                    <trg>fileid</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>1236505</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>23</b>
+                                    <v>65727</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>fileid</src>
+                    <trg>id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>6</a>
+                                    <b>7</b>
+                                    <v>4107</v>
+                                </b>
+                                <b>
+                                    <a>8</a>
+                                    <b>9</b>
+                                    <v>8215</v>
+                                </b>
+                                <b>
+                                    <a>9</a>
+                                    <b>10</b>
+                                    <v>12323</v>
+                                </b>
+                                <b>
+                                    <a>10</a>
+                                    <b>11</b>
+                                    <v>8215</v>
+                                </b>
+                                <b>
+                                    <a>13</a>
+                                    <b>16</b>
+                                    <v>8215</v>
+                                </b>
+                                <b>
+                                    <a>19</a>
+                                    <b>39</b>
+                                    <v>8215</v>
+                                </b>
+                                <b>
+                                    <a>40</a>
+                                    <b>41</b>
+                                    <v>4107</v>
+                                </b>
+                                <b>
+                                    <a>41</a>
+                                    <b>42</b>
+                                    <v>28755</v>
+                                </b>
+                                <b>
+                                    <a>67</a>
+                                    <b>1560</b>
+                                    <v>8215</v>
                                 </b>
                             </bs>
                         </hist>
@@ -2356,55 +2344,35 @@
                         <hist>
                             <budget>12</budget>
                             <bs>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>5</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>5</a>
-                                    <b>6</b>
-                                    <v>2</v>
-                                </b>
                                 <b>
                                     <a>6</a>
                                     <b>7</b>
-                                    <v>2</v>
+                                    <v>8215</v>
+                                </b>
+                                <b>
+                                    <a>7</a>
+                                    <b>8</b>
+                                    <v>12323</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>9</b>
-                                    <v>2</v>
+                                    <v>20539</v>
                                 </b>
                                 <b>
-                                    <a>11</a>
-                                    <b>12</b>
-                                    <v>1</v>
+                                    <a>9</a>
+                                    <b>15</b>
+                                    <v>8215</v>
                                 </b>
                                 <b>
-                                    <a>16</a>
-                                    <b>17</b>
-                                    <v>1</v>
+                                    <a>15</a>
+                                    <b>16</b>
+                                    <v>36971</v>
                                 </b>
                                 <b>
-                                    <a>17</a>
-                                    <b>18</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>19</a>
-                                    <b>20</b>
-                                    <v>1</v>
+                                    <a>31</a>
+                                    <b>32</b>
+                                    <v>4107</v>
                                 </b>
                             </bs>
                         </hist>
@@ -2418,54 +2386,29 @@
                             <budget>12</budget>
                             <bs>
                                 <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>2</v>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>4107</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>1</v>
+                                    <v>32863</v>
                                 </b>
                                 <b>
-                                    <a>6</a>
-                                    <b>7</b>
-                                    <v>2</v>
+                                    <a>5</a>
+                                    <b>6</b>
+                                    <v>8215</v>
                                 </b>
                                 <b>
-                                    <a>7</a>
-                                    <b>8</b>
-                                    <v>3</v>
+                                    <a>13</a>
+                                    <b>14</b>
+                                    <v>36971</v>
                                 </b>
                                 <b>
-                                    <a>9</a>
-                                    <b>10</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>10</a>
-                                    <b>11</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>20</a>
-                                    <b>21</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>23</a>
-                                    <b>24</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>47</a>
-                                    <b>48</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>49</a>
-                                    <b>50</b>
-                                    <v>1</v>
+                                    <a>38</a>
+                                    <b>522</b>
+                                    <v>8215</v>
                                 </b>
                             </bs>
                         </hist>
@@ -2479,59 +2422,39 @@
                             <budget>12</budget>
                             <bs>
                                 <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>1</v>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>4107</v>
                                 </b>
                                 <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>2</v>
+                                    <a>5</a>
+                                    <b>6</b>
+                                    <v>24647</v>
                                 </b>
                                 <b>
-                                    <a>4</a>
-                                    <b>5</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>7</a>
+                                    <a>6</a>
                                     <b>8</b>
-                                    <v>3</v>
+                                    <v>8215</v>
                                 </b>
                                 <b>
-                                    <a>8</a>
-                                    <b>9</b>
-                                    <v>1</v>
+                                    <a>11</a>
+                                    <b>13</b>
+                                    <v>8215</v>
                                 </b>
                                 <b>
                                     <a>13</a>
                                     <b>14</b>
-                                    <v>1</v>
+                                    <v>12323</v>
                                 </b>
                                 <b>
                                     <a>14</a>
                                     <b>15</b>
-                                    <v>1</v>
+                                    <v>24647</v>
                                 </b>
                                 <b>
                                     <a>16</a>
-                                    <b>17</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>30</a>
-                                    <b>31</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>34</a>
-                                    <b>35</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>67</a>
-                                    <b>68</b>
-                                    <v>1</v>
+                                    <b>314</b>
+                                    <v>8215</v>
                                 </b>
                             </bs>
                         </hist>
@@ -2541,31 +2464,31 @@
         </relation>
         <relation>
             <name>xmlAttrs</name>
-            <cardinality>408</cardinality>
+            <cardinality>3762921</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>408</v>
+                    <v>3762921</v>
                 </e>
                 <e>
                     <k>elementid</k>
-                    <v>288</v>
+                    <v>2744139</v>
                 </e>
                 <e>
                     <k>name</k>
-                    <v>28</v>
+                    <v>180751</v>
                 </e>
                 <e>
                     <k>value</k>
-                    <v>235</v>
+                    <v>1713032</v>
                 </e>
                 <e>
                     <k>idx</k>
-                    <v>6</v>
+                    <v>20539</v>
                 </e>
                 <e>
                     <k>fileid</k>
-                    <v>14</v>
+                    <v>90375</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -2579,7 +2502,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>408</v>
+                                    <v>3762921</v>
                                 </b>
                             </bs>
                         </hist>
@@ -2595,7 +2518,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>408</v>
+                                    <v>3762921</v>
                                 </b>
                             </bs>
                         </hist>
@@ -2611,7 +2534,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>408</v>
+                                    <v>3762921</v>
                                 </b>
                             </bs>
                         </hist>
@@ -2627,7 +2550,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>408</v>
+                                    <v>3762921</v>
                                 </b>
                             </bs>
                         </hist>
@@ -2643,7 +2566,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>408</v>
+                                    <v>3762921</v>
                                 </b>
                             </bs>
                         </hist>
@@ -2659,22 +2582,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>195</v>
+                                    <v>1963620</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>69</v>
+                                    <v>579226</v>
                                 </b>
                                 <b>
                                     <a>3</a>
-                                    <b>4</b>
-                                    <v>23</v>
-                                </b>
-                                <b>
-                                    <a>6</a>
-                                    <b>7</b>
-                                    <v>1</v>
+                                    <b>6</b>
+                                    <v>201291</v>
                                 </b>
                             </bs>
                         </hist>
@@ -2690,22 +2608,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>195</v>
+                                    <v>1963620</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>69</v>
+                                    <v>579226</v>
                                 </b>
                                 <b>
                                     <a>3</a>
-                                    <b>4</b>
-                                    <v>23</v>
-                                </b>
-                                <b>
-                                    <a>6</a>
-                                    <b>7</b>
-                                    <v>1</v>
+                                    <b>6</b>
+                                    <v>201291</v>
                                 </b>
                             </bs>
                         </hist>
@@ -2721,22 +2634,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>195</v>
+                                    <v>1963620</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>70</v>
+                                    <v>579226</v>
                                 </b>
                                 <b>
                                     <a>3</a>
-                                    <b>4</b>
-                                    <v>22</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>5</b>
-                                    <v>1</v>
+                                    <b>6</b>
+                                    <v>201291</v>
                                 </b>
                             </bs>
                         </hist>
@@ -2752,22 +2660,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>195</v>
+                                    <v>1963620</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>69</v>
+                                    <v>579226</v>
                                 </b>
                                 <b>
                                     <a>3</a>
-                                    <b>4</b>
-                                    <v>23</v>
-                                </b>
-                                <b>
-                                    <a>6</a>
-                                    <b>7</b>
-                                    <v>1</v>
+                                    <b>6</b>
+                                    <v>201291</v>
                                 </b>
                             </bs>
                         </hist>
@@ -2783,7 +2686,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>288</v>
+                                    <v>2744139</v>
                                 </b>
                             </bs>
                         </hist>
@@ -2799,436 +2702,100 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>12</v>
+                                    <v>65727</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>3</v>
+                                    <v>8215</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>4</v>
-                                </b>
-                                <b>
-                                    <a>5</a>
-                                    <b>15</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>21</a>
-                                    <b>22</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>22</a>
-                                    <b>23</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>45</a>
-                                    <b>97</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>132</a>
-                                    <b>133</b>
-                                    <v>1</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>name</src>
-                    <trg>elementid</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>3</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>4</v>
-                                </b>
-                                <b>
-                                    <a>5</a>
-                                    <b>15</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>21</a>
-                                    <b>22</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>22</a>
-                                    <b>23</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>45</a>
-                                    <b>97</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>132</a>
-                                    <b>133</b>
-                                    <v>1</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>16</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>3</v>
-                                </b>
-                                <b>
-                                    <a>11</a>
-                                    <b>12</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>15</a>
-                                    <b>16</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>21</a>
-                                    <b>36</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>41</a>
-                                    <b>75</b>
-                                    <v>2</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>name</src>
-                    <trg>idx</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>19</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>5</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>4</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>name</src>
-                    <trg>fileid</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>18</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>2</v>
+                                    <v>24647</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>10</a>
-                                    <b>11</b>
-                                    <v>3</v>
-                                </b>
-                                <b>
-                                    <a>13</a>
-                                    <b>14</b>
-                                    <v>1</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>171</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>32</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>5</b>
-                                    <v>18</v>
-                                </b>
-                                <b>
-                                    <a>5</a>
-                                    <b>13</b>
-                                    <v>14</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>value</src>
-                    <trg>elementid</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>174</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>29</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>5</b>
-                                    <v>18</v>
-                                </b>
-                                <b>
-                                    <a>5</a>
-                                    <b>13</b>
-                                    <v>14</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>230</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>4</b>
-                                    <v>5</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>value</src>
-                    <trg>idx</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>224</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>4</b>
-                                    <v>11</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>value</src>
-                    <trg>fileid</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>193</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>32</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>7</b>
-                                    <v>10</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>idx</src>
-                    <trg>id</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>3</v>
-                                </b>
-                                <b>
-                                    <a>24</a>
-                                    <b>25</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>93</a>
-                                    <b>94</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>288</a>
-                                    <b>289</b>
-                                    <v>1</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>idx</src>
-                    <trg>elementid</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>3</v>
-                                </b>
-                                <b>
-                                    <a>24</a>
-                                    <b>25</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>93</a>
-                                    <b>94</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>288</a>
-                                    <b>289</b>
-                                    <v>1</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>idx</src>
-                    <trg>name</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>3</v>
+                                    <v>16431</v>
                                 </b>
                                 <b>
                                     <a>8</a>
-                                    <b>9</b>
-                                    <v>1</v>
+                                    <b>12</b>
+                                    <v>16431</v>
                                 </b>
                                 <b>
-                                    <a>14</a>
-                                    <b>15</b>
-                                    <v>1</v>
+                                    <a>17</a>
+                                    <b>30</b>
+                                    <v>16431</v>
                                 </b>
                                 <b>
-                                    <a>16</a>
-                                    <b>17</b>
-                                    <v>1</v>
+                                    <a>30</a>
+                                    <b>50</b>
+                                    <v>16431</v>
+                                </b>
+                                <b>
+                                    <a>50</a>
+                                    <b>250</b>
+                                    <v>16431</v>
                                 </b>
                             </bs>
                         </hist>
                     </val>
                 </dep>
                 <dep>
-                    <src>idx</src>
+                    <src>name</src>
+                    <trg>elementid</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>65727</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>8215</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>24647</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>6</b>
+                                    <v>16431</v>
+                                </b>
+                                <b>
+                                    <a>8</a>
+                                    <b>12</b>
+                                    <v>16431</v>
+                                </b>
+                                <b>
+                                    <a>17</a>
+                                    <b>30</b>
+                                    <v>16431</v>
+                                </b>
+                                <b>
+                                    <a>30</a>
+                                    <b>50</b>
+                                    <v>16431</v>
+                                </b>
+                                <b>
+                                    <a>50</a>
+                                    <b>250</b>
+                                    <v>16431</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>name</src>
                     <trg>value</trg>
                     <val>
                         <hist>
@@ -3237,29 +2804,65 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3</v>
+                                    <v>94483</v>
                                 </b>
                                 <b>
-                                    <a>23</a>
-                                    <b>24</b>
-                                    <v>1</v>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>20539</v>
                                 </b>
                                 <b>
-                                    <a>64</a>
-                                    <b>65</b>
-                                    <v>1</v>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>20539</v>
                                 </b>
                                 <b>
-                                    <a>157</a>
-                                    <b>158</b>
-                                    <v>1</v>
+                                    <a>4</a>
+                                    <b>5</b>
+                                    <v>12323</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
+                                    <b>14</b>
+                                    <v>16431</v>
+                                </b>
+                                <b>
+                                    <a>30</a>
+                                    <b>178</b>
+                                    <v>16431</v>
                                 </b>
                             </bs>
                         </hist>
                     </val>
                 </dep>
                 <dep>
-                    <src>idx</src>
+                    <src>name</src>
+                    <trg>idx</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>135563</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>28755</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>5</b>
+                                    <v>16431</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>name</src>
                     <trg>fileid</trg>
                     <val>
                         <hist>
@@ -3268,93 +2871,408 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3</v>
+                                    <v>102699</v>
                                 </b>
-                                <b>
-                                    <a>6</a>
-                                    <b>7</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>12</a>
-                                    <b>13</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>14</a>
-                                    <b>15</b>
-                                    <v>1</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>fileid</src>
-                    <trg>id</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>1</v>
+                                    <v>12323</v>
                                 </b>
                                 <b>
-                                    <a>4</a>
-                                    <b>5</b>
-                                    <v>1</v>
+                                    <a>3</a>
+                                    <b>8</b>
+                                    <v>16431</v>
                                 </b>
                                 <b>
-                                    <a>10</a>
-                                    <b>11</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>11</a>
+                                    <a>9</a>
                                     <b>12</b>
-                                    <v>1</v>
+                                    <v>16431</v>
                                 </b>
                                 <b>
-                                    <a>12</a>
-                                    <b>13</b>
-                                    <v>1</v>
+                                    <a>14</a>
+                                    <b>17</b>
+                                    <v>12323</v>
                                 </b>
                                 <b>
                                     <a>17</a>
                                     <b>18</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>18</a>
-                                    <b>19</b>
-                                    <v>1</v>
+                                    <v>12323</v>
                                 </b>
                                 <b>
                                     <a>19</a>
                                     <b>20</b>
-                                    <v>1</v>
+                                    <v>8215</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>1294017</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>127347</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>5</b>
+                                    <v>139671</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
+                                    <b>17</b>
+                                    <v>131455</v>
+                                </b>
+                                <b>
+                                    <a>19</a>
+                                    <b>31</b>
+                                    <v>20539</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>value</src>
+                    <trg>elementid</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>1298125</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>127347</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>5</b>
+                                    <v>135563</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
+                                    <b>17</b>
+                                    <v>131455</v>
+                                </b>
+                                <b>
+                                    <a>19</a>
+                                    <b>31</b>
+                                    <v>20539</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>1688384</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>4</b>
+                                    <v>24647</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>value</src>
+                    <trg>idx</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>1671952</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>4</b>
+                                    <v>41079</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>value</src>
+                    <trg>fileid</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>1474769</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>6</b>
+                                    <v>127347</v>
+                                </b>
+                                <b>
+                                    <a>9</a>
+                                    <b>20</b>
+                                    <v>110915</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>idx</src>
+                    <trg>id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>4107</v>
+                                </b>
+                                <b>
+                                    <a>6</a>
+                                    <b>7</b>
+                                    <v>4107</v>
+                                </b>
+                                <b>
+                                    <a>49</a>
+                                    <b>50</b>
+                                    <v>4107</v>
+                                </b>
+                                <b>
+                                    <a>190</a>
+                                    <b>191</b>
+                                    <v>4107</v>
+                                </b>
+                                <b>
+                                    <a>668</a>
+                                    <b>669</b>
+                                    <v>4107</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>idx</src>
+                    <trg>elementid</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>4107</v>
+                                </b>
+                                <b>
+                                    <a>6</a>
+                                    <b>7</b>
+                                    <v>4107</v>
+                                </b>
+                                <b>
+                                    <a>49</a>
+                                    <b>50</b>
+                                    <v>4107</v>
+                                </b>
+                                <b>
+                                    <a>190</a>
+                                    <b>191</b>
+                                    <v>4107</v>
+                                </b>
+                                <b>
+                                    <a>668</a>
+                                    <b>669</b>
+                                    <v>4107</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>idx</src>
+                    <trg>name</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>4107</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>5</b>
+                                    <v>4107</v>
+                                </b>
+                                <b>
+                                    <a>9</a>
+                                    <b>10</b>
+                                    <v>4107</v>
+                                </b>
+                                <b>
+                                    <a>21</a>
+                                    <b>22</b>
+                                    <v>4107</v>
+                                </b>
+                                <b>
+                                    <a>25</a>
+                                    <b>26</b>
+                                    <v>4107</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>idx</src>
+                    <trg>value</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>4107</v>
+                                </b>
+                                <b>
+                                    <a>6</a>
+                                    <b>7</b>
+                                    <v>4107</v>
+                                </b>
+                                <b>
+                                    <a>21</a>
+                                    <b>22</b>
+                                    <v>4107</v>
+                                </b>
+                                <b>
+                                    <a>72</a>
+                                    <b>73</b>
+                                    <v>4107</v>
+                                </b>
+                                <b>
+                                    <a>326</a>
+                                    <b>327</b>
+                                    <v>4107</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>idx</src>
+                    <trg>fileid</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>8215</v>
+                                </b>
+                                <b>
+                                    <a>14</a>
+                                    <b>15</b>
+                                    <v>4107</v>
                                 </b>
                                 <b>
                                     <a>22</a>
                                     <b>23</b>
-                                    <v>1</v>
+                                    <v>8215</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>fileid</src>
+                    <trg>id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>4107</v>
                                 </b>
                                 <b>
-                                    <a>48</a>
-                                    <b>49</b>
-                                    <v>1</v>
+                                    <a>4</a>
+                                    <b>5</b>
+                                    <v>8215</v>
                                 </b>
                                 <b>
-                                    <a>73</a>
-                                    <b>74</b>
-                                    <v>2</v>
+                                    <a>9</a>
+                                    <b>10</b>
+                                    <v>4107</v>
                                 </b>
                                 <b>
-                                    <a>89</a>
-                                    <b>90</b>
-                                    <v>1</v>
+                                    <a>11</a>
+                                    <b>12</b>
+                                    <v>12323</v>
+                                </b>
+                                <b>
+                                    <a>12</a>
+                                    <b>14</b>
+                                    <v>8215</v>
+                                </b>
+                                <b>
+                                    <a>18</a>
+                                    <b>38</b>
+                                    <v>8215</v>
+                                </b>
+                                <b>
+                                    <a>39</a>
+                                    <b>40</b>
+                                    <v>12323</v>
+                                </b>
+                                <b>
+                                    <a>40</a>
+                                    <b>41</b>
+                                    <v>12323</v>
+                                </b>
+                                <b>
+                                    <a>41</a>
+                                    <b>42</b>
+                                    <v>12323</v>
+                                </b>
+                                <b>
+                                    <a>91</a>
+                                    <b>333</b>
+                                    <v>8215</v>
                                 </b>
                             </bs>
                         </hist>
@@ -3368,64 +3286,49 @@
                             <budget>12</budget>
                             <bs>
                                 <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>1</v>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>4107</v>
                                 </b>
                                 <b>
-                                    <a>4</a>
-                                    <b>5</b>
-                                    <v>1</v>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>8215</v>
                                 </b>
                                 <b>
-                                    <a>8</a>
-                                    <b>9</b>
-                                    <v>2</v>
+                                    <a>5</a>
+                                    <b>7</b>
+                                    <v>8215</v>
+                                </b>
+                                <b>
+                                    <a>7</a>
+                                    <b>8</b>
+                                    <v>12323</v>
                                 </b>
                                 <b>
                                     <a>9</a>
-                                    <b>10</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>11</a>
                                     <b>12</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>12</a>
-                                    <b>13</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>16</a>
-                                    <b>17</b>
-                                    <v>1</v>
+                                    <v>8215</v>
                                 </b>
                                 <b>
                                     <a>17</a>
                                     <b>18</b>
-                                    <v>1</v>
+                                    <v>4107</v>
                                 </b>
                                 <b>
-                                    <a>18</a>
-                                    <b>19</b>
-                                    <v>1</v>
+                                    <a>25</a>
+                                    <b>26</b>
+                                    <v>12323</v>
                                 </b>
                                 <b>
-                                    <a>42</a>
-                                    <b>43</b>
-                                    <v>1</v>
+                                    <a>26</a>
+                                    <b>27</b>
+                                    <v>24647</v>
                                 </b>
                                 <b>
-                                    <a>63</a>
-                                    <b>64</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>67</a>
-                                    <b>68</b>
-                                    <v>1</v>
+                                    <a>58</a>
+                                    <b>303</b>
+                                    <v>8215</v>
                                 </b>
                             </bs>
                         </hist>
@@ -3438,40 +3341,55 @@
                         <hist>
                             <budget>12</budget>
                             <bs>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>2</v>
-                                </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>2</v>
+                                    <v>4107</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>4</v>
+                                    <v>8215</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>1</v>
+                                    <v>4107</v>
                                 </b>
                                 <b>
-                                    <a>6</a>
-                                    <b>7</b>
-                                    <v>2</v>
+                                    <a>8</a>
+                                    <b>9</b>
+                                    <v>8215</v>
                                 </b>
                                 <b>
-                                    <a>7</a>
-                                    <b>8</b>
-                                    <v>2</v>
+                                    <a>9</a>
+                                    <b>10</b>
+                                    <v>12323</v>
                                 </b>
                                 <b>
-                                    <a>23</a>
-                                    <b>24</b>
-                                    <v>1</v>
+                                    <a>10</a>
+                                    <b>11</b>
+                                    <v>4107</v>
+                                </b>
+                                <b>
+                                    <a>11</a>
+                                    <b>12</b>
+                                    <v>12323</v>
+                                </b>
+                                <b>
+                                    <a>12</a>
+                                    <b>13</b>
+                                    <v>24647</v>
+                                </b>
+                                <b>
+                                    <a>13</a>
+                                    <b>17</b>
+                                    <v>8215</v>
+                                </b>
+                                <b>
+                                    <a>20</a>
+                                    <b>21</b>
+                                    <v>4107</v>
                                 </b>
                             </bs>
                         </hist>
@@ -3484,70 +3402,50 @@
                         <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>
+                                    <v>4107</v>
                                 </b>
                                 <b>
-                                    <a>6</a>
-                                    <b>7</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>8</a>
-                                    <b>9</b>
-                                    <v>2</v>
+                                    <a>4</a>
+                                    <b>5</b>
+                                    <v>8215</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>10</b>
-                                    <v>1</v>
+                                    <v>4107</v>
                                 </b>
                                 <b>
-                                    <a>10</a>
-                                    <b>11</b>
-                                    <v>1</v>
+                                    <a>11</a>
+                                    <b>12</b>
+                                    <v>20539</v>
                                 </b>
                                 <b>
-                                    <a>13</a>
-                                    <b>14</b>
-                                    <v>1</v>
+                                    <a>17</a>
+                                    <b>27</b>
+                                    <v>8215</v>
                                 </b>
                                 <b>
-                                    <a>14</a>
-                                    <b>15</b>
-                                    <v>1</v>
+                                    <a>33</a>
+                                    <b>34</b>
+                                    <v>12323</v>
                                 </b>
                                 <b>
-                                    <a>18</a>
-                                    <b>19</b>
-                                    <v>1</v>
+                                    <a>34</a>
+                                    <b>35</b>
+                                    <v>12323</v>
                                 </b>
                                 <b>
-                                    <a>32</a>
-                                    <b>33</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>54</a>
-                                    <b>55</b>
-                                    <v>1</v>
+                                    <a>35</a>
+                                    <b>36</b>
+                                    <v>12323</v>
                                 </b>
                                 <b>
                                     <a>60</a>
-                                    <b>61</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>61</a>
-                                    <b>62</b>
-                                    <v>1</v>
+                                    <b>244</b>
+                                    <v>8215</v>
                                 </b>
                             </bs>
                         </hist>
@@ -3560,25 +3458,20 @@
                         <hist>
                             <budget>12</budget>
                             <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>2</v>
-                                </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>6</v>
+                                    <v>32863</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>5</v>
+                                    <v>45187</v>
                                 </b>
                                 <b>
-                                    <a>6</a>
-                                    <b>7</b>
-                                    <v>1</v>
+                                    <a>5</a>
+                                    <b>6</b>
+                                    <v>12323</v>
                                 </b>
                             </bs>
                         </hist>
@@ -3812,23 +3705,23 @@
         </relation>
         <relation>
             <name>xmlComments</name>
-            <cardinality>30</cardinality>
+            <cardinality>131455</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>30</v>
+                    <v>131455</v>
                 </e>
                 <e>
                     <k>text</k>
-                    <v>18</v>
+                    <v>98591</v>
                 </e>
                 <e>
                     <k>parentid</k>
-                    <v>20</v>
+                    <v>115023</v>
                 </e>
                 <e>
                     <k>fileid</k>
-                    <v>10</v>
+                    <v>49295</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -3842,7 +3735,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>30</v>
+                                    <v>131455</v>
                                 </b>
                             </bs>
                         </hist>
@@ -3858,7 +3751,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>30</v>
+                                    <v>131455</v>
                                 </b>
                             </bs>
                         </hist>
@@ -3874,7 +3767,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>30</v>
+                                    <v>131455</v>
                                 </b>
                             </bs>
                         </hist>
@@ -3890,22 +3783,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>13</v>
+                                    <v>86267</v>
                                 </b>
                                 <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>3</v>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>4107</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>7</a>
-                                    <b>8</b>
-                                    <v>1</v>
+                                    <v>8215</v>
                                 </b>
                             </bs>
                         </hist>
@@ -3921,22 +3809,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>14</v>
+                                    <v>86267</v>
                                 </b>
                                 <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>2</v>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>4107</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>7</a>
-                                    <b>8</b>
-                                    <v>1</v>
+                                    <v>8215</v>
                                 </b>
                             </bs>
                         </hist>
@@ -3952,17 +3835,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>15</v>
+                                    <v>86267</v>
                                 </b>
                                 <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>2</v>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>4107</v>
                                 </b>
                                 <b>
-                                    <a>7</a>
-                                    <b>8</b>
-                                    <v>1</v>
+                                    <a>4</a>
+                                    <b>5</b>
+                                    <v>8215</v>
                                 </b>
                             </bs>
                         </hist>
@@ -3978,22 +3861,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>15</v>
+                                    <v>98591</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>3</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>5</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>5</a>
-                                    <b>6</b>
-                                    <v>1</v>
+                                    <v>16431</v>
                                 </b>
                             </bs>
                         </hist>
@@ -4009,22 +3882,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>15</v>
+                                    <v>98591</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>5</a>
-                                    <b>6</b>
-                                    <v>1</v>
+                                    <v>16431</v>
                                 </b>
                             </bs>
                         </hist>
@@ -4040,7 +3903,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>20</v>
+                                    <v>115023</v>
                                 </b>
                             </bs>
                         </hist>
@@ -4056,27 +3919,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6</v>
+                                    <v>28755</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>1</v>
+                                    <v>12323</v>
                                 </b>
                                 <b>
-                                    <a>4</a>
-                                    <b>5</b>
-                                    <v>1</v>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>4107</v>
                                 </b>
                                 <b>
-                                    <a>8</a>
-                                    <b>9</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>10</a>
-                                    <b>11</b>
-                                    <v>1</v>
+                                    <a>16</a>
+                                    <b>17</b>
+                                    <v>4107</v>
                                 </b>
                             </bs>
                         </hist>
@@ -4092,27 +3950,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6</v>
+                                    <v>28755</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>1</v>
+                                    <v>12323</v>
                                 </b>
                                 <b>
-                                    <a>4</a>
-                                    <b>5</b>
-                                    <v>1</v>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>4107</v>
                                 </b>
                                 <b>
-                                    <a>5</a>
-                                    <b>6</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>9</a>
-                                    <b>10</b>
-                                    <v>1</v>
+                                    <a>16</a>
+                                    <b>17</b>
+                                    <v>4107</v>
                                 </b>
                             </bs>
                         </hist>
@@ -4128,17 +3981,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7</v>
+                                    <v>41079</v>
                                 </b>
                                 <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>1</v>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>4107</v>
                                 </b>
                                 <b>
-                                    <a>5</a>
-                                    <b>6</b>
-                                    <v>2</v>
+                                    <a>16</a>
+                                    <b>17</b>
+                                    <v>4107</v>
                                 </b>
                             </bs>
                         </hist>
@@ -4148,31 +4001,31 @@
         </relation>
         <relation>
             <name>xmlChars</name>
-            <cardinality>869</cardinality>
+            <cardinality>13383839</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>869</v>
+                    <v>13383839</v>
                 </e>
                 <e>
                     <k>text</k>
-                    <v>427</v>
+                    <v>5862105</v>
                 </e>
                 <e>
                     <k>parentid</k>
-                    <v>432</v>
+                    <v>6926075</v>
                 </e>
                 <e>
                     <k>idx</k>
-                    <v>87</v>
+                    <v>1281693</v>
                 </e>
                 <e>
                     <k>isCDATA</k>
-                    <v>1</v>
+                    <v>4107</v>
                 </e>
                 <e>
                     <k>fileid</k>
-                    <v>14</v>
+                    <v>94483</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -4186,7 +4039,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>869</v>
+                                    <v>13383839</v>
                                 </b>
                             </bs>
                         </hist>
@@ -4202,7 +4055,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>869</v>
+                                    <v>13383839</v>
                                 </b>
                             </bs>
                         </hist>
@@ -4218,7 +4071,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>869</v>
+                                    <v>13383839</v>
                                 </b>
                             </bs>
                         </hist>
@@ -4234,7 +4087,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>869</v>
+                                    <v>13383839</v>
                                 </b>
                             </bs>
                         </hist>
@@ -4250,7 +4103,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>869</v>
+                                    <v>13383839</v>
                                 </b>
                             </bs>
                         </hist>
@@ -4266,22 +4119,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>339</v>
+                                    <v>5081586</v>
                                 </b>
                                 <b>
                                     <a>2</a>
-                                    <b>3</b>
-                                    <v>53</v>
+                                    <b>4</b>
+                                    <v>480635</v>
                                 </b>
                                 <b>
-                                    <a>3</a>
-                                    <b>49</b>
-                                    <v>33</v>
-                                </b>
-                                <b>
-                                    <a>68</a>
-                                    <b>90</b>
-                                    <v>2</v>
+                                    <a>4</a>
+                                    <b>567</b>
+                                    <v>299883</v>
                                 </b>
                             </bs>
                         </hist>
@@ -4297,22 +4145,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>342</v>
+                                    <v>5098018</v>
                                 </b>
                                 <b>
                                     <a>2</a>
-                                    <b>3</b>
-                                    <v>50</v>
+                                    <b>4</b>
+                                    <v>484743</v>
                                 </b>
                                 <b>
-                                    <a>3</a>
-                                    <b>28</b>
-                                    <v>33</v>
-                                </b>
-                                <b>
-                                    <a>28</a>
-                                    <b>32</b>
-                                    <v>2</v>
+                                    <a>4</a>
+                                    <b>179</b>
+                                    <v>279343</v>
                                 </b>
                             </bs>
                         </hist>
@@ -4328,12 +4171,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>400</v>
+                                    <v>5701893</v>
                                 </b>
                                 <b>
                                     <a>2</a>
-                                    <b>58</b>
-                                    <v>27</v>
+                                    <b>298</b>
+                                    <v>160211</v>
                                 </b>
                             </bs>
                         </hist>
@@ -4349,7 +4192,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>427</v>
+                                    <v>5862105</v>
                                 </b>
                             </bs>
                         </hist>
@@ -4365,17 +4208,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>380</v>
+                                    <v>5710109</v>
                                 </b>
                                 <b>
                                     <a>2</a>
-                                    <b>4</b>
-                                    <v>36</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>11</b>
-                                    <v>11</v>
+                                    <b>22</b>
+                                    <v>151995</v>
                                 </b>
                             </bs>
                         </hist>
@@ -4391,58 +4229,53 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>302</v>
+                                    <v>5328066</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>53</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>28</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>7</b>
-                                    <v>34</v>
-                                </b>
-                                <b>
-                                    <a>7</a>
-                                    <b>60</b>
-                                    <v>15</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>parentid</src>
-                    <trg>text</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>314</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>67</v>
+                                    <v>583334</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>37</v>
+                                    <v>521715</v>
                                 </b>
                                 <b>
                                     <a>5</a>
-                                    <b>26</b>
-                                    <v>14</v>
+                                    <b>308</b>
+                                    <v>492959</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>parentid</src>
+                    <trg>text</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>5664921</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>558686</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>7</b>
+                                    <v>595658</v>
+                                </b>
+                                <b>
+                                    <a>7</a>
+                                    <b>14</b>
+                                    <v>106807</v>
                                 </b>
                             </bs>
                         </hist>
@@ -4458,395 +4291,249 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>302</v>
+                                    <v>5328066</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>53</v>
+                                    <v>583334</v>
                                 </b>
                                 <b>
                                     <a>3</a>
-                                    <b>4</b>
-                                    <v>28</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>7</b>
-                                    <v>34</v>
-                                </b>
-                                <b>
-                                    <a>7</a>
-                                    <b>60</b>
-                                    <v>15</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>parentid</src>
-                    <trg>isCDATA</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>432</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>parentid</src>
-                    <trg>fileid</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>432</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>idx</src>
-                    <trg>id</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>55</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>3</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>11</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>7</b>
-                                    <v>7</v>
-                                </b>
-                                <b>
-                                    <a>8</a>
-                                    <b>28</b>
-                                    <v>7</v>
-                                </b>
-                                <b>
-                                    <a>41</a>
-                                    <b>408</b>
-                                    <v>4</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>idx</src>
-                    <trg>text</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>55</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>7</b>
-                                    <v>7</v>
-                                </b>
-                                <b>
-                                    <a>7</a>
-                                    <b>28</b>
-                                    <v>7</v>
-                                </b>
-                                <b>
-                                    <a>44</a>
-                                    <b>251</b>
-                                    <v>3</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>idx</src>
-                    <trg>parentid</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>55</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>3</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>11</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>7</b>
-                                    <v>7</v>
-                                </b>
-                                <b>
-                                    <a>8</a>
-                                    <b>28</b>
-                                    <v>7</v>
-                                </b>
-                                <b>
-                                    <a>41</a>
-                                    <b>408</b>
-                                    <v>4</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>idx</src>
-                    <trg>isCDATA</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>87</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>idx</src>
-                    <trg>fileid</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>55</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>5</b>
-                                    <v>7</v>
+                                    <v>521715</v>
                                 </b>
                                 <b>
                                     <a>5</a>
-                                    <b>12</b>
-                                    <v>7</v>
-                                </b>
-                                <b>
-                                    <a>13</a>
-                                    <b>15</b>
-                                    <v>3</v>
+                                    <b>308</b>
+                                    <v>492959</v>
                                 </b>
                             </bs>
                         </hist>
                     </val>
                 </dep>
                 <dep>
-                    <src>isCDATA</src>
-                    <trg>id</trg>
+                    <src>parentid</src>
+                    <trg>isCDATA</trg>
                     <val>
                         <hist>
                             <budget>12</budget>
                             <bs>
                                 <b>
-                                    <a>869</a>
-                                    <b>870</b>
-                                    <v>1</v>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>6926075</v>
                                 </b>
                             </bs>
                         </hist>
                     </val>
                 </dep>
                 <dep>
-                    <src>isCDATA</src>
-                    <trg>text</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>427</a>
-                                    <b>428</b>
-                                    <v>1</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>isCDATA</src>
-                    <trg>parentid</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>432</a>
-                                    <b>433</b>
-                                    <v>1</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>isCDATA</src>
-                    <trg>idx</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>87</a>
-                                    <b>88</b>
-                                    <v>1</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>isCDATA</src>
+                    <src>parentid</src>
                     <trg>fileid</trg>
                     <val>
                         <hist>
                             <budget>12</budget>
                             <bs>
                                 <b>
-                                    <a>14</a>
-                                    <b>15</b>
-                                    <v>1</v>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>6926075</v>
                                 </b>
                             </bs>
                         </hist>
                     </val>
                 </dep>
                 <dep>
-                    <src>fileid</src>
+                    <src>idx</src>
                     <trg>id</trg>
                     <val>
                         <hist>
                             <budget>12</budget>
                             <bs>
                                 <b>
-                                    <a>5</a>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>1105050</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
                                     <b>6</b>
-                                    <v>1</v>
+                                    <v>110915</v>
                                 </b>
                                 <b>
-                                    <a>13</a>
-                                    <b>14</b>
-                                    <v>1</v>
+                                    <a>6</a>
+                                    <b>1550</b>
+                                    <v>65727</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>idx</src>
+                    <trg>text</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>1105050</v>
                                 </b>
                                 <b>
-                                    <a>14</a>
-                                    <b>15</b>
-                                    <v>2</v>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>102699</v>
                                 </b>
                                 <b>
-                                    <a>17</a>
-                                    <b>18</b>
-                                    <v>1</v>
+                                    <a>3</a>
+                                    <b>923</b>
+                                    <v>73943</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>idx</src>
+                    <trg>parentid</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>1105050</v>
                                 </b>
                                 <b>
-                                    <a>28</a>
-                                    <b>29</b>
-                                    <v>1</v>
+                                    <a>3</a>
+                                    <b>6</b>
+                                    <v>110915</v>
                                 </b>
                                 <b>
-                                    <a>30</a>
-                                    <b>31</b>
-                                    <v>1</v>
+                                    <a>6</a>
+                                    <b>1550</b>
+                                    <v>65727</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>idx</src>
+                    <trg>isCDATA</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>1281693</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>idx</src>
+                    <trg>fileid</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>1215965</v>
                                 </b>
                                 <b>
-                                    <a>34</a>
-                                    <b>35</b>
-                                    <v>1</v>
+                                    <a>4</a>
+                                    <b>24</b>
+                                    <v>65727</v>
                                 </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>isCDATA</src>
+                    <trg>id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
                                 <b>
-                                    <a>35</a>
-                                    <b>36</b>
-                                    <v>1</v>
+                                    <a>3258</a>
+                                    <b>3259</b>
+                                    <v>4107</v>
                                 </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>isCDATA</src>
+                    <trg>text</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
                                 <b>
-                                    <a>36</a>
-                                    <b>37</b>
-                                    <v>1</v>
+                                    <a>1427</a>
+                                    <b>1428</b>
+                                    <v>4107</v>
                                 </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>isCDATA</src>
+                    <trg>parentid</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
                                 <b>
-                                    <a>80</a>
-                                    <b>81</b>
-                                    <v>1</v>
+                                    <a>1686</a>
+                                    <b>1687</b>
+                                    <v>4107</v>
                                 </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>isCDATA</src>
+                    <trg>idx</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
                                 <b>
-                                    <a>177</a>
-                                    <b>178</b>
-                                    <v>1</v>
+                                    <a>312</a>
+                                    <b>313</b>
+                                    <v>4107</v>
                                 </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>isCDATA</src>
+                    <trg>fileid</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
                                 <b>
-                                    <a>191</a>
-                                    <b>192</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>195</a>
-                                    <b>196</b>
-                                    <v>1</v>
+                                    <a>23</a>
+                                    <b>24</b>
+                                    <v>4107</v>
                                 </b>
                             </bs>
                         </hist>
@@ -4854,75 +4541,121 @@
                 </dep>
                 <dep>
                     <src>fileid</src>
-                    <trg>text</trg>
+                    <trg>id</trg>
                     <val>
                         <hist>
                             <budget>12</budget>
                             <bs>
                                 <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>7</a>
-                                    <b>8</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>9</a>
+                                    <a>1</a>
                                     <b>10</b>
-                                    <v>1</v>
+                                    <v>8215</v>
+                                </b>
+                                <b>
+                                    <a>11</a>
+                                    <b>13</b>
+                                    <v>8215</v>
                                 </b>
                                 <b>
                                     <a>13</a>
-                                    <b>14</b>
-                                    <v>1</v>
+                                    <b>15</b>
+                                    <v>8215</v>
                                 </b>
                                 <b>
                                     <a>15</a>
                                     <b>16</b>
-                                    <v>1</v>
+                                    <v>4107</v>
+                                </b>
+                                <b>
+                                    <a>16</a>
+                                    <b>17</b>
+                                    <v>8215</v>
                                 </b>
                                 <b>
                                     <a>18</a>
-                                    <b>19</b>
-                                    <v>1</v>
+                                    <b>21</b>
+                                    <v>8215</v>
                                 </b>
                                 <b>
-                                    <a>24</a>
-                                    <b>25</b>
-                                    <v>1</v>
+                                    <a>23</a>
+                                    <b>49</b>
+                                    <v>8215</v>
                                 </b>
                                 <b>
-                                    <a>25</a>
-                                    <b>26</b>
-                                    <v>1</v>
+                                    <a>51</a>
+                                    <b>52</b>
+                                    <v>4107</v>
+                                </b>
+                                <b>
+                                    <a>52</a>
+                                    <b>53</b>
+                                    <v>28755</v>
+                                </b>
+                                <b>
+                                    <a>118</a>
+                                    <b>2510</b>
+                                    <v>8215</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>fileid</src>
+                    <trg>text</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>4107</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>5</b>
+                                    <v>16431</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
+                                    <b>6</b>
+                                    <v>4107</v>
+                                </b>
+                                <b>
+                                    <a>6</a>
+                                    <b>7</b>
+                                    <v>12323</v>
+                                </b>
+                                <b>
+                                    <a>7</a>
+                                    <b>8</b>
+                                    <v>4107</v>
+                                </b>
+                                <b>
+                                    <a>8</a>
+                                    <b>9</b>
+                                    <v>8215</v>
+                                </b>
+                                <b>
+                                    <a>23</a>
+                                    <b>24</b>
+                                    <v>4107</v>
                                 </b>
                                 <b>
                                     <a>26</a>
                                     <b>27</b>
-                                    <v>1</v>
+                                    <v>28755</v>
                                 </b>
                                 <b>
-                                    <a>49</a>
-                                    <b>50</b>
-                                    <v>1</v>
+                                    <a>27</a>
+                                    <b>37</b>
+                                    <v>8215</v>
                                 </b>
                                 <b>
-                                    <a>100</a>
-                                    <b>101</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>105</a>
-                                    <b>106</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>118</a>
-                                    <b>119</b>
-                                    <v>1</v>
+                                    <a>1314</a>
+                                    <b>1315</b>
+                                    <v>4107</v>
                                 </b>
                             </bs>
                         </hist>
@@ -4936,64 +4669,44 @@
                             <budget>12</budget>
                             <bs>
                                 <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>1</v>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>4107</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
+                                    <b>6</b>
+                                    <v>28755</v>
+                                </b>
+                                <b>
+                                    <a>6</a>
+                                    <b>7</b>
+                                    <v>8215</v>
                                 </b>
                                 <b>
                                     <a>7</a>
-                                    <b>8</b>
-                                    <v>1</v>
+                                    <b>9</b>
+                                    <v>8215</v>
                                 </b>
                                 <b>
-                                    <a>9</a>
-                                    <b>10</b>
-                                    <v>2</v>
+                                    <a>23</a>
+                                    <b>24</b>
+                                    <v>4107</v>
                                 </b>
                                 <b>
-                                    <a>10</a>
-                                    <b>11</b>
-                                    <v>1</v>
+                                    <a>26</a>
+                                    <b>27</b>
+                                    <v>28755</v>
                                 </b>
                                 <b>
-                                    <a>14</a>
-                                    <b>15</b>
-                                    <v>1</v>
+                                    <a>27</a>
+                                    <b>55</b>
+                                    <v>8215</v>
                                 </b>
                                 <b>
-                                    <a>15</a>
-                                    <b>16</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>18</a>
-                                    <b>19</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>20</a>
-                                    <b>21</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>33</a>
-                                    <b>34</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>88</a>
-                                    <b>89</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>95</a>
-                                    <b>96</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>96</a>
-                                    <b>97</b>
-                                    <v>1</v>
+                                    <a>1337</a>
+                                    <b>1338</b>
+                                    <v>4107</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5007,54 +4720,49 @@
                             <budget>12</budget>
                             <bs>
                                 <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>1</v>
+                                    <a>1</a>
+                                    <b>4</b>
+                                    <v>8215</v>
                                 </b>
                                 <b>
-                                    <a>4</a>
-                                    <b>5</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>5</a>
-                                    <b>6</b>
-                                    <v>1</v>
+                                    <a>6</a>
+                                    <b>7</b>
+                                    <v>8215</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>8</b>
-                                    <v>3</v>
+                                    <v>20539</v>
                                 </b>
                                 <b>
-                                    <a>9</a>
-                                    <b>10</b>
-                                    <v>1</v>
+                                    <a>8</a>
+                                    <b>9</b>
+                                    <v>8215</v>
+                                </b>
+                                <b>
+                                    <a>11</a>
+                                    <b>12</b>
+                                    <v>4107</v>
+                                </b>
+                                <b>
+                                    <a>12</a>
+                                    <b>13</b>
+                                    <v>8215</v>
                                 </b>
                                 <b>
                                     <a>13</a>
                                     <b>14</b>
-                                    <v>1</v>
+                                    <v>8215</v>
                                 </b>
                                 <b>
-                                    <a>15</a>
-                                    <b>16</b>
-                                    <v>2</v>
+                                    <a>14</a>
+                                    <b>15</b>
+                                    <v>24647</v>
                                 </b>
                                 <b>
-                                    <a>32</a>
-                                    <b>33</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>35</a>
-                                    <b>36</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>65</a>
-                                    <b>66</b>
-                                    <v>1</v>
+                                    <a>310</a>
+                                    <b>311</b>
+                                    <v>4107</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5070,7 +4778,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>14</v>
+                                    <v>94483</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5080,15 +4788,15 @@
         </relation>
         <relation>
             <name>xmllocations</name>
-            <cardinality>1825</cardinality>
+            <cardinality>26028241</cardinality>
             <columnsizes>
                 <e>
                     <k>xmlElement</k>
-                    <v>1825</v>
+                    <v>26028241</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>1825</v>
+                    <v>26028241</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -5102,7 +4810,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1825</v>
+                                    <v>26028241</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5118,7 +4826,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1825</v>
+                                    <v>26028241</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5128,15 +4836,15 @@
         </relation>
         <relation>
             <name>compilations</name>
-            <cardinality>1</cardinality>
+            <cardinality>31407</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1</v>
+                    <v>31407</v>
                 </e>
                 <e>
                     <k>cwd</k>
-                    <v>1</v>
+                    <v>31407</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -5150,7 +4858,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1</v>
+                                    <v>31407</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5166,7 +4874,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1</v>
+                                    <v>31407</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5176,19 +4884,19 @@
         </relation>
         <relation>
             <name>compilation_args</name>
-            <cardinality>3</cardinality>
+            <cardinality>94222</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1</v>
+                    <v>31407</v>
                 </e>
                 <e>
                     <k>num</k>
-                    <v>3</v>
+                    <v>5234</v>
                 </e>
                 <e>
                     <k>arg</k>
-                    <v>3</v>
+                    <v>5234</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -5202,7 +4910,7 @@
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>1</v>
+                                    <v>31407</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5218,7 +4926,7 @@
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>1</v>
+                                    <v>31407</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5232,9 +4940,9 @@
                             <budget>12</budget>
                             <bs>
                                 <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>3</v>
+                                    <a>18</a>
+                                    <b>19</b>
+                                    <v>5234</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5250,7 +4958,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3</v>
+                                    <v>5234</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5264,9 +4972,9 @@
                             <budget>12</budget>
                             <bs>
                                 <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>3</v>
+                                    <a>18</a>
+                                    <b>19</b>
+                                    <v>5234</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5282,7 +4990,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3</v>
+                                    <v>5234</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5436,23 +5144,23 @@
         </relation>
         <relation>
             <name>diagnostic_for</name>
-            <cardinality>0</cardinality>
+            <cardinality>233782</cardinality>
             <columnsizes>
                 <e>
                     <k>diagnostic</k>
-                    <v>0</v>
+                    <v>233782</v>
                 </e>
                 <e>
                     <k>compilation</k>
-                    <v>0</v>
+                    <v>214</v>
                 </e>
                 <e>
                     <k>file_number</k>
-                    <v>0</v>
+                    <v>56356</v>
                 </e>
                 <e>
                     <k>file_number_diagnostic_number</k>
-                    <v>0</v>
+                    <v>19713</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -5466,7 +5174,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1</v>
+                                    <v>233782</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5482,7 +5190,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1</v>
+                                    <v>233782</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5498,7 +5206,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1</v>
+                                    <v>233782</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5510,7 +5218,13 @@
                     <val>
                         <hist>
                             <budget>12</budget>
-                            <bs/>
+                            <bs>
+                                <b>
+                                    <a>1091</a>
+                                    <b>1092</b>
+                                    <v>214</v>
+                                </b>
+                            </bs>
                         </hist>
                     </val>
                 </dep>
@@ -5520,7 +5234,13 @@
                     <val>
                         <hist>
                             <budget>12</budget>
-                            <bs/>
+                            <bs>
+                                <b>
+                                    <a>263</a>
+                                    <b>264</b>
+                                    <v>214</v>
+                                </b>
+                            </bs>
                         </hist>
                     </val>
                 </dep>
@@ -5530,7 +5250,13 @@
                     <val>
                         <hist>
                             <budget>12</budget>
-                            <bs/>
+                            <bs>
+                                <b>
+                                    <a>92</a>
+                                    <b>93</b>
+                                    <v>214</v>
+                                </b>
+                            </bs>
                         </hist>
                     </val>
                 </dep>
@@ -5540,7 +5266,43 @@
                     <val>
                         <hist>
                             <budget>12</budget>
-                            <bs/>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>26999</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>8142</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>5785</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>6</b>
+                                    <v>4928</v>
+                                </b>
+                                <b>
+                                    <a>6</a>
+                                    <b>11</b>
+                                    <v>4714</v>
+                                </b>
+                                <b>
+                                    <a>11</a>
+                                    <b>18</b>
+                                    <v>4285</v>
+                                </b>
+                                <b>
+                                    <a>18</a>
+                                    <b>93</b>
+                                    <v>1499</v>
+                                </b>
+                            </bs>
                         </hist>
                     </val>
                 </dep>
@@ -5550,7 +5312,13 @@
                     <val>
                         <hist>
                             <budget>12</budget>
-                            <bs/>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>56356</v>
+                                </b>
+                            </bs>
                         </hist>
                     </val>
                 </dep>
@@ -5560,7 +5328,43 @@
                     <val>
                         <hist>
                             <budget>12</budget>
-                            <bs/>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>26999</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>8142</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>5785</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>6</b>
+                                    <v>4928</v>
+                                </b>
+                                <b>
+                                    <a>6</a>
+                                    <b>11</b>
+                                    <v>4714</v>
+                                </b>
+                                <b>
+                                    <a>11</a>
+                                    <b>18</b>
+                                    <v>4285</v>
+                                </b>
+                                <b>
+                                    <a>18</a>
+                                    <b>93</b>
+                                    <v>1499</v>
+                                </b>
+                            </bs>
                         </hist>
                     </val>
                 </dep>
@@ -5570,7 +5374,43 @@
                     <val>
                         <hist>
                             <budget>12</budget>
-                            <bs/>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>6642</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>4714</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>3428</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>10</b>
+                                    <v>1499</v>
+                                </b>
+                                <b>
+                                    <a>10</a>
+                                    <b>33</b>
+                                    <v>1499</v>
+                                </b>
+                                <b>
+                                    <a>33</a>
+                                    <b>100</b>
+                                    <v>1499</v>
+                                </b>
+                                <b>
+                                    <a>137</a>
+                                    <b>264</b>
+                                    <v>428</v>
+                                </b>
+                            </bs>
                         </hist>
                     </val>
                 </dep>
@@ -5580,7 +5420,13 @@
                     <val>
                         <hist>
                             <budget>12</budget>
-                            <bs/>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>19713</v>
+                                </b>
+                            </bs>
                         </hist>
                     </val>
                 </dep>
@@ -5590,7 +5436,43 @@
                     <val>
                         <hist>
                             <budget>12</budget>
-                            <bs/>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>6642</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>4714</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>3428</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>10</b>
+                                    <v>1499</v>
+                                </b>
+                                <b>
+                                    <a>10</a>
+                                    <b>33</b>
+                                    <v>1499</v>
+                                </b>
+                                <b>
+                                    <a>33</a>
+                                    <b>100</b>
+                                    <v>1499</v>
+                                </b>
+                                <b>
+                                    <a>137</a>
+                                    <b>264</b>
+                                    <v>428</v>
+                                </b>
+                            </bs>
                         </hist>
                     </val>
                 </dep>
@@ -5598,19 +5480,19 @@
         </relation>
         <relation>
             <name>compilation_finished</name>
-            <cardinality>1</cardinality>
+            <cardinality>31407</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1</v>
+                    <v>31407</v>
                 </e>
                 <e>
                     <k>cpu_seconds</k>
-                    <v>1</v>
+                    <v>1744</v>
                 </e>
                 <e>
                     <k>elapsed_seconds</k>
-                    <v>1</v>
+                    <v>31407</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -5624,7 +5506,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1</v>
+                                    <v>31407</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5640,7 +5522,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1</v>
+                                    <v>31407</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5654,9 +5536,9 @@
                             <budget>12</budget>
                             <bs>
                                 <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>1</v>
+                                    <a>18</a>
+                                    <b>19</b>
+                                    <v>1744</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5670,9 +5552,9 @@
                             <budget>12</budget>
                             <bs>
                                 <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>1</v>
+                                    <a>18</a>
+                                    <b>19</b>
+                                    <v>1744</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5688,7 +5570,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1</v>
+                                    <v>31407</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5704,7 +5586,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1</v>
+                                    <v>31407</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5714,19 +5596,19 @@
         </relation>
         <relation>
             <name>compilation_compiling_files</name>
-            <cardinality>515</cardinality>
+            <cardinality>82070</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1</v>
+                    <v>214</v>
                 </e>
                 <e>
                     <k>num</k>
-                    <v>515</v>
+                    <v>82070</v>
                 </e>
                 <e>
                     <k>file</k>
-                    <v>515</v>
+                    <v>82070</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -5738,9 +5620,9 @@
                             <budget>12</budget>
                             <bs>
                                 <b>
-                                    <a>515</a>
-                                    <b>516</b>
-                                    <v>1</v>
+                                    <a>383</a>
+                                    <b>384</b>
+                                    <v>214</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5754,9 +5636,9 @@
                             <budget>12</budget>
                             <bs>
                                 <b>
-                                    <a>515</a>
-                                    <b>516</b>
-                                    <v>1</v>
+                                    <a>383</a>
+                                    <b>384</b>
+                                    <v>214</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5772,7 +5654,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>515</v>
+                                    <v>82070</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5788,7 +5670,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>515</v>
+                                    <v>82070</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5804,7 +5686,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>515</v>
+                                    <v>82070</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5820,7 +5702,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>515</v>
+                                    <v>82070</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5830,31 +5712,31 @@
         </relation>
         <relation>
             <name>diagnostics</name>
-            <cardinality>0</cardinality>
+            <cardinality>233782</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>0</v>
+                    <v>233782</v>
                 </e>
                 <e>
                     <k>severity</k>
-                    <v>0</v>
+                    <v>214</v>
                 </e>
                 <e>
                     <k>error_tag</k>
-                    <v>0</v>
+                    <v>642</v>
                 </e>
                 <e>
                     <k>error_message</k>
-                    <v>0</v>
+                    <v>56999</v>
                 </e>
                 <e>
                     <k>full_error_message</k>
-                    <v>0</v>
+                    <v>56999</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>0</v>
+                    <v>149140</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -5868,7 +5750,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1</v>
+                                    <v>233782</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5884,7 +5766,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1</v>
+                                    <v>233782</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5900,7 +5782,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1</v>
+                                    <v>233782</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5916,7 +5798,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1</v>
+                                    <v>233782</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5932,7 +5814,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1</v>
+                                    <v>233782</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5944,7 +5826,13 @@
                     <val>
                         <hist>
                             <budget>12</budget>
-                            <bs/>
+                            <bs>
+                                <b>
+                                    <a>1091</a>
+                                    <b>1092</b>
+                                    <v>214</v>
+                                </b>
+                            </bs>
                         </hist>
                     </val>
                 </dep>
@@ -5954,7 +5842,13 @@
                     <val>
                         <hist>
                             <budget>12</budget>
-                            <bs/>
+                            <bs>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>214</v>
+                                </b>
+                            </bs>
                         </hist>
                     </val>
                 </dep>
@@ -5964,7 +5858,13 @@
                     <val>
                         <hist>
                             <budget>12</budget>
-                            <bs/>
+                            <bs>
+                                <b>
+                                    <a>266</a>
+                                    <b>267</b>
+                                    <v>214</v>
+                                </b>
+                            </bs>
                         </hist>
                     </val>
                 </dep>
@@ -5974,7 +5874,13 @@
                     <val>
                         <hist>
                             <budget>12</budget>
-                            <bs/>
+                            <bs>
+                                <b>
+                                    <a>266</a>
+                                    <b>267</b>
+                                    <v>214</v>
+                                </b>
+                            </bs>
                         </hist>
                     </val>
                 </dep>
@@ -5984,7 +5890,13 @@
                     <val>
                         <hist>
                             <budget>12</budget>
-                            <bs/>
+                            <bs>
+                                <b>
+                                    <a>696</a>
+                                    <b>697</b>
+                                    <v>214</v>
+                                </b>
+                            </bs>
                         </hist>
                     </val>
                 </dep>
@@ -5994,7 +5906,23 @@
                     <val>
                         <hist>
                             <budget>12</budget>
-                            <bs/>
+                            <bs>
+                                <b>
+                                    <a>16</a>
+                                    <b>17</b>
+                                    <v>214</v>
+                                </b>
+                                <b>
+                                    <a>51</a>
+                                    <b>52</b>
+                                    <v>214</v>
+                                </b>
+                                <b>
+                                    <a>1024</a>
+                                    <b>1025</b>
+                                    <v>214</v>
+                                </b>
+                            </bs>
                         </hist>
                     </val>
                 </dep>
@@ -6004,7 +5932,13 @@
                     <val>
                         <hist>
                             <budget>12</budget>
-                            <bs/>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>642</v>
+                                </b>
+                            </bs>
                         </hist>
                     </val>
                 </dep>
@@ -6014,7 +5948,23 @@
                     <val>
                         <hist>
                             <budget>12</budget>
-                            <bs/>
+                            <bs>
+                                <b>
+                                    <a>10</a>
+                                    <b>11</b>
+                                    <v>214</v>
+                                </b>
+                                <b>
+                                    <a>47</a>
+                                    <b>48</b>
+                                    <v>214</v>
+                                </b>
+                                <b>
+                                    <a>210</a>
+                                    <b>211</b>
+                                    <v>214</v>
+                                </b>
+                            </bs>
                         </hist>
                     </val>
                 </dep>
@@ -6024,7 +5974,23 @@
                     <val>
                         <hist>
                             <budget>12</budget>
-                            <bs/>
+                            <bs>
+                                <b>
+                                    <a>10</a>
+                                    <b>11</b>
+                                    <v>214</v>
+                                </b>
+                                <b>
+                                    <a>47</a>
+                                    <b>48</b>
+                                    <v>214</v>
+                                </b>
+                                <b>
+                                    <a>210</a>
+                                    <b>211</b>
+                                    <v>214</v>
+                                </b>
+                            </bs>
                         </hist>
                     </val>
                 </dep>
@@ -6034,7 +6000,23 @@
                     <val>
                         <hist>
                             <budget>12</budget>
-                            <bs/>
+                            <bs>
+                                <b>
+                                    <a>9</a>
+                                    <b>10</b>
+                                    <v>214</v>
+                                </b>
+                                <b>
+                                    <a>39</a>
+                                    <b>40</b>
+                                    <v>214</v>
+                                </b>
+                                <b>
+                                    <a>680</a>
+                                    <b>681</b>
+                                    <v>214</v>
+                                </b>
+                            </bs>
                         </hist>
                     </val>
                 </dep>
@@ -6044,7 +6026,38 @@
                     <val>
                         <hist>
                             <budget>12</budget>
-                            <bs/>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>32142</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>8357</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>6428</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>7</b>
+                                    <v>4928</v>
+                                </b>
+                                <b>
+                                    <a>7</a>
+                                    <b>17</b>
+                                    <v>4285</v>
+                                </b>
+                                <b>
+                                    <a>20</a>
+                                    <b>214</b>
+                                    <v>857</v>
+                                </b>
+                            </bs>
                         </hist>
                     </val>
                 </dep>
@@ -6054,7 +6067,13 @@
                     <val>
                         <hist>
                             <budget>12</budget>
-                            <bs/>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>56999</v>
+                                </b>
+                            </bs>
                         </hist>
                     </val>
                 </dep>
@@ -6064,7 +6083,18 @@
                     <val>
                         <hist>
                             <budget>12</budget>
-                            <bs/>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>56784</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>214</v>
+                                </b>
+                            </bs>
                         </hist>
                     </val>
                 </dep>
@@ -6074,7 +6104,13 @@
                     <val>
                         <hist>
                             <budget>12</budget>
-                            <bs/>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>56999</v>
+                                </b>
+                            </bs>
                         </hist>
                     </val>
                 </dep>
@@ -6084,7 +6120,33 @@
                     <val>
                         <hist>
                             <budget>12</budget>
-                            <bs/>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>39642</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>6214</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>4071</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>8</b>
+                                    <v>4499</v>
+                                </b>
+                                <b>
+                                    <a>8</a>
+                                    <b>214</b>
+                                    <v>2571</v>
+                                </b>
+                            </bs>
                         </hist>
                     </val>
                 </dep>
@@ -6094,7 +6156,38 @@
                     <val>
                         <hist>
                             <budget>12</budget>
-                            <bs/>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>32142</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>8357</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>6428</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>7</b>
+                                    <v>4928</v>
+                                </b>
+                                <b>
+                                    <a>7</a>
+                                    <b>17</b>
+                                    <v>4285</v>
+                                </b>
+                                <b>
+                                    <a>20</a>
+                                    <b>214</b>
+                                    <v>857</v>
+                                </b>
+                            </bs>
                         </hist>
                     </val>
                 </dep>
@@ -6104,7 +6197,13 @@
                     <val>
                         <hist>
                             <budget>12</budget>
-                            <bs/>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>56999</v>
+                                </b>
+                            </bs>
                         </hist>
                     </val>
                 </dep>
@@ -6114,7 +6213,18 @@
                     <val>
                         <hist>
                             <budget>12</budget>
-                            <bs/>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>56784</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>214</v>
+                                </b>
+                            </bs>
                         </hist>
                     </val>
                 </dep>
@@ -6124,7 +6234,13 @@
                     <val>
                         <hist>
                             <budget>12</budget>
-                            <bs/>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>56999</v>
+                                </b>
+                            </bs>
                         </hist>
                     </val>
                 </dep>
@@ -6134,7 +6250,33 @@
                     <val>
                         <hist>
                             <budget>12</budget>
-                            <bs/>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>39642</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>6214</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>4071</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>8</b>
+                                    <v>4499</v>
+                                </b>
+                                <b>
+                                    <a>8</a>
+                                    <b>214</b>
+                                    <v>2571</v>
+                                </b>
+                            </bs>
                         </hist>
                     </val>
                 </dep>
@@ -6144,7 +6286,23 @@
                     <val>
                         <hist>
                             <budget>12</budget>
-                            <bs/>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>133069</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>4</b>
+                                    <v>11571</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>93</b>
+                                    <v>4499</v>
+                                </b>
+                            </bs>
                         </hist>
                     </val>
                 </dep>
@@ -6154,7 +6312,13 @@
                     <val>
                         <hist>
                             <budget>12</budget>
-                            <bs/>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>149140</v>
+                                </b>
+                            </bs>
                         </hist>
                     </val>
                 </dep>
@@ -6164,7 +6328,18 @@
                     <val>
                         <hist>
                             <budget>12</budget>
-                            <bs/>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>142283</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>6857</v>
+                                </b>
+                            </bs>
                         </hist>
                     </val>
                 </dep>
@@ -6174,7 +6349,18 @@
                     <val>
                         <hist>
                             <budget>12</budget>
-                            <bs/>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>142069</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>15</b>
+                                    <v>7071</v>
+                                </b>
+                            </bs>
                         </hist>
                     </val>
                 </dep>
@@ -6184,7 +6370,18 @@
                     <val>
                         <hist>
                             <budget>12</budget>
-                            <bs/>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>142069</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>15</b>
+                                    <v>7071</v>
+                                </b>
+                            </bs>
                         </hist>
                     </val>
                 </dep>
@@ -6192,31 +6389,31 @@
         </relation>
         <relation>
             <name>locations_default</name>
-            <cardinality>539178</cardinality>
+            <cardinality>37058201</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>539178</v>
+                    <v>37058201</v>
                 </e>
                 <e>
                     <k>file</k>
-                    <v>529</v>
+                    <v>115023</v>
                 </e>
                 <e>
                     <k>beginLine</k>
-                    <v>10312</v>
+                    <v>6174312</v>
                 </e>
                 <e>
                     <k>beginColumn</k>
-                    <v>211</v>
+                    <v>1026998</v>
                 </e>
                 <e>
                     <k>endLine</k>
-                    <v>10378</v>
+                    <v>7357414</v>
                 </e>
                 <e>
                     <k>endColumn</k>
-                    <v>274</v>
+                    <v>1154345</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -6230,7 +6427,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>539178</v>
+                                    <v>37058201</v>
                                 </b>
                             </bs>
                         </hist>
@@ -6246,7 +6443,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>539178</v>
+                                    <v>37058201</v>
                                 </b>
                             </bs>
                         </hist>
@@ -6262,7 +6459,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>539178</v>
+                                    <v>37058201</v>
                                 </b>
                             </bs>
                         </hist>
@@ -6278,7 +6475,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>539178</v>
+                                    <v>37058201</v>
                                 </b>
                             </bs>
                         </hist>
@@ -6294,7 +6491,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>539178</v>
+                                    <v>37058201</v>
                                 </b>
                             </bs>
                         </hist>
@@ -6307,956 +6504,401 @@
                         <hist>
                             <budget>12</budget>
                             <bs>
-                                <b>
-                                    <a>4</a>
-                                    <b>39</b>
-                                    <v>41</v>
-                                </b>
-                                <b>
-                                    <a>39</a>
-                                    <b>120</b>
-                                    <v>40</v>
-                                </b>
-                                <b>
-                                    <a>120</a>
-                                    <b>208</b>
-                                    <v>40</v>
-                                </b>
-                                <b>
-                                    <a>210</a>
-                                    <b>290</b>
-                                    <v>40</v>
-                                </b>
-                                <b>
-                                    <a>291</a>
-                                    <b>372</b>
-                                    <v>40</v>
-                                </b>
-                                <b>
-                                    <a>372</a>
-                                    <b>453</b>
-                                    <v>41</v>
-                                </b>
-                                <b>
-                                    <a>456</a>
-                                    <b>563</b>
-                                    <v>40</v>
-                                </b>
-                                <b>
-                                    <a>565</a>
-                                    <b>769</b>
-                                    <v>40</v>
-                                </b>
-                                <b>
-                                    <a>774</a>
-                                    <b>1007</b>
-                                    <v>40</v>
-                                </b>
-                                <b>
-                                    <a>1012</a>
-                                    <b>1339</b>
-                                    <v>42</v>
-                                </b>
-                                <b>
-                                    <a>1347</a>
-                                    <b>1700</b>
-                                    <v>40</v>
-                                </b>
-                                <b>
-                                    <a>1701</a>
-                                    <b>2804</b>
-                                    <v>40</v>
-                                </b>
-                                <b>
-                                    <a>2873</a>
-                                    <b>6918</b>
-                                    <v>40</v>
-                                </b>
-                                <b>
-                                    <a>8171</a>
-                                    <b>11207</b>
-                                    <v>5</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>file</src>
-                    <trg>beginLine</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>3</a>
-                                    <b>15</b>
-                                    <v>44</v>
-                                </b>
-                                <b>
-                                    <a>15</a>
-                                    <b>27</b>
-                                    <v>42</v>
-                                </b>
-                                <b>
-                                    <a>27</a>
-                                    <b>46</b>
-                                    <v>40</v>
-                                </b>
-                                <b>
-                                    <a>46</a>
-                                    <b>63</b>
-                                    <v>43</v>
-                                </b>
-                                <b>
-                                    <a>63</a>
-                                    <b>78</b>
-                                    <v>40</v>
-                                </b>
-                                <b>
-                                    <a>78</a>
-                                    <b>94</b>
-                                    <v>41</v>
-                                </b>
-                                <b>
-                                    <a>95</a>
-                                    <b>120</b>
-                                    <v>40</v>
-                                </b>
-                                <b>
-                                    <a>120</a>
-                                    <b>152</b>
-                                    <v>41</v>
-                                </b>
-                                <b>
-                                    <a>152</a>
-                                    <b>188</b>
-                                    <v>40</v>
-                                </b>
-                                <b>
-                                    <a>189</a>
-                                    <b>247</b>
-                                    <v>41</v>
-                                </b>
-                                <b>
-                                    <a>249</a>
-                                    <b>325</b>
-                                    <v>40</v>
-                                </b>
-                                <b>
-                                    <a>336</a>
-                                    <b>544</b>
-                                    <v>40</v>
-                                </b>
-                                <b>
-                                    <a>554</a>
-                                    <b>10233</b>
-                                    <v>37</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>file</src>
-                    <trg>beginColumn</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>3</a>
-                                    <b>16</b>
-                                    <v>40</v>
-                                </b>
-                                <b>
-                                    <a>16</a>
-                                    <b>34</b>
-                                    <v>40</v>
-                                </b>
-                                <b>
-                                    <a>34</a>
-                                    <b>44</b>
-                                    <v>40</v>
-                                </b>
-                                <b>
-                                    <a>45</a>
-                                    <b>51</b>
-                                    <v>44</v>
-                                </b>
-                                <b>
-                                    <a>51</a>
-                                    <b>58</b>
-                                    <v>41</v>
-                                </b>
-                                <b>
-                                    <a>58</a>
-                                    <b>63</b>
-                                    <v>47</v>
-                                </b>
-                                <b>
-                                    <a>63</a>
-                                    <b>68</b>
-                                    <v>44</v>
-                                </b>
-                                <b>
-                                    <a>68</a>
-                                    <b>73</b>
-                                    <v>43</v>
-                                </b>
-                                <b>
-                                    <a>73</a>
-                                    <b>80</b>
-                                    <v>47</v>
-                                </b>
-                                <b>
-                                    <a>80</a>
-                                    <b>86</b>
-                                    <v>43</v>
-                                </b>
-                                <b>
-                                    <a>86</a>
-                                    <b>98</b>
-                                    <v>42</v>
-                                </b>
-                                <b>
-                                    <a>98</a>
-                                    <b>115</b>
-                                    <v>42</v>
-                                </b>
-                                <b>
-                                    <a>115</a>
-                                    <b>157</b>
-                                    <v>16</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>file</src>
-                    <trg>endLine</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>3</a>
-                                    <b>16</b>
-                                    <v>41</v>
-                                </b>
-                                <b>
-                                    <a>16</a>
-                                    <b>31</b>
-                                    <v>40</v>
-                                </b>
-                                <b>
-                                    <a>31</a>
-                                    <b>52</b>
-                                    <v>40</v>
-                                </b>
-                                <b>
-                                    <a>52</a>
-                                    <b>73</b>
-                                    <v>43</v>
-                                </b>
-                                <b>
-                                    <a>73</a>
-                                    <b>92</b>
-                                    <v>42</v>
-                                </b>
-                                <b>
-                                    <a>92</a>
-                                    <b>111</b>
-                                    <v>40</v>
-                                </b>
-                                <b>
-                                    <a>111</a>
-                                    <b>139</b>
-                                    <v>40</v>
-                                </b>
-                                <b>
-                                    <a>139</a>
-                                    <b>180</b>
-                                    <v>40</v>
-                                </b>
-                                <b>
-                                    <a>180</a>
-                                    <b>219</b>
-                                    <v>40</v>
-                                </b>
-                                <b>
-                                    <a>223</a>
-                                    <b>293</b>
-                                    <v>40</v>
-                                </b>
-                                <b>
-                                    <a>294</a>
-                                    <b>370</b>
-                                    <v>40</v>
-                                </b>
-                                <b>
-                                    <a>373</a>
-                                    <b>616</b>
-                                    <v>40</v>
-                                </b>
-                                <b>
-                                    <a>617</a>
-                                    <b>1835</b>
-                                    <v>40</v>
-                                </b>
-                                <b>
-                                    <a>2166</a>
-                                    <b>10377</b>
-                                    <v>3</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>file</src>
-                    <trg>endColumn</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>4</a>
-                                    <b>21</b>
-                                    <v>42</v>
-                                </b>
-                                <b>
-                                    <a>22</a>
-                                    <b>45</b>
-                                    <v>41</v>
-                                </b>
-                                <b>
-                                    <a>46</a>
-                                    <b>59</b>
-                                    <v>43</v>
-                                </b>
-                                <b>
-                                    <a>59</a>
-                                    <b>65</b>
-                                    <v>40</v>
-                                </b>
-                                <b>
-                                    <a>65</a>
-                                    <b>71</b>
-                                    <v>42</v>
-                                </b>
-                                <b>
-                                    <a>71</a>
-                                    <b>76</b>
-                                    <v>47</v>
-                                </b>
-                                <b>
-                                    <a>76</a>
-                                    <b>81</b>
-                                    <v>40</v>
-                                </b>
-                                <b>
-                                    <a>81</a>
-                                    <b>85</b>
-                                    <v>48</v>
-                                </b>
-                                <b>
-                                    <a>85</a>
-                                    <b>91</b>
-                                    <v>41</v>
-                                </b>
-                                <b>
-                                    <a>91</a>
-                                    <b>97</b>
-                                    <v>42</v>
-                                </b>
-                                <b>
-                                    <a>97</a>
-                                    <b>105</b>
-                                    <v>41</v>
-                                </b>
-                                <b>
-                                    <a>105</a>
-                                    <b>119</b>
-                                    <v>42</v>
-                                </b>
-                                <b>
-                                    <a>119</a>
-                                    <b>166</b>
-                                    <v>20</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>6869</v>
-                                </b>
                                 <b>
                                     <a>2</a>
-                                    <b>7</b>
-                                    <v>843</v>
-                                </b>
-                                <b>
-                                    <a>7</a>
-                                    <b>20</b>
-                                    <v>796</v>
-                                </b>
-                                <b>
-                                    <a>20</a>
-                                    <b>80</b>
-                                    <v>780</v>
-                                </b>
-                                <b>
-                                    <a>80</a>
-                                    <b>698</b>
-                                    <v>774</v>
-                                </b>
-                                <b>
-                                    <a>699</a>
-                                    <b>1775</b>
-                                    <v>250</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>6947</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>868</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>6</b>
-                                    <v>899</v>
-                                </b>
-                                <b>
-                                    <a>6</a>
                                     <b>24</b>
-                                    <v>774</v>
-                                </b>
-                                <b>
-                                    <a>24</a>
-                                    <b>304</b>
-                                    <v>774</v>
-                                </b>
-                                <b>
-                                    <a>305</a>
-                                    <b>530</b>
-                                    <v>50</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>6894</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>5</b>
-                                    <v>789</v>
-                                </b>
-                                <b>
-                                    <a>5</a>
-                                    <b>11</b>
-                                    <v>780</v>
-                                </b>
-                                <b>
-                                    <a>11</a>
-                                    <b>30</b>
-                                    <v>796</v>
-                                </b>
-                                <b>
-                                    <a>30</a>
-                                    <b>72</b>
-                                    <v>779</v>
-                                </b>
-                                <b>
-                                    <a>72</a>
-                                    <b>115</b>
-                                    <v>274</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>7630</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>1017</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>6</b>
-                                    <v>779</v>
-                                </b>
-                                <b>
-                                    <a>6</a>
-                                    <b>21</b>
-                                    <v>792</v>
-                                </b>
-                                <b>
-                                    <a>21</a>
-                                    <b>315</b>
-                                    <v>94</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>6871</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>5</b>
-                                    <v>793</v>
-                                </b>
-                                <b>
-                                    <a>5</a>
-                                    <b>12</b>
-                                    <v>789</v>
-                                </b>
-                                <b>
-                                    <a>12</a>
-                                    <b>33</b>
-                                    <v>778</v>
-                                </b>
-                                <b>
-                                    <a>33</a>
-                                    <b>81</b>
-                                    <v>781</v>
-                                </b>
-                                <b>
-                                    <a>81</a>
-                                    <b>127</b>
-                                    <v>300</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>29</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>4</b>
-                                    <v>19</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>9</b>
-                                    <v>16</v>
-                                </b>
-                                <b>
-                                    <a>10</a>
-                                    <b>22</b>
-                                    <v>16</v>
-                                </b>
-                                <b>
-                                    <a>22</a>
-                                    <b>62</b>
-                                    <v>16</v>
-                                </b>
-                                <b>
-                                    <a>62</a>
-                                    <b>141</b>
-                                    <v>16</v>
-                                </b>
-                                <b>
-                                    <a>144</a>
-                                    <b>330</b>
-                                    <v>16</v>
-                                </b>
-                                <b>
-                                    <a>330</a>
-                                    <b>759</b>
-                                    <v>16</v>
-                                </b>
-                                <b>
-                                    <a>781</a>
-                                    <b>1804</b>
-                                    <v>16</v>
-                                </b>
-                                <b>
-                                    <a>1846</a>
-                                    <b>3757</b>
-                                    <v>16</v>
-                                </b>
-                                <b>
-                                    <a>4042</a>
-                                    <b>8613</b>
-                                    <v>16</v>
-                                </b>
-                                <b>
-                                    <a>8764</a>
-                                    <b>22092</b>
-                                    <v>16</v>
-                                </b>
-                                <b>
-                                    <a>28067</a>
-                                    <b>55590</b>
-                                    <v>3</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>36</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>4</b>
-                                    <v>14</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>10</b>
-                                    <v>18</v>
-                                </b>
-                                <b>
-                                    <a>10</a>
-                                    <b>22</b>
-                                    <v>17</v>
-                                </b>
-                                <b>
-                                    <a>22</a>
-                                    <b>48</b>
-                                    <v>17</v>
-                                </b>
-                                <b>
-                                    <a>49</a>
-                                    <b>96</b>
-                                    <v>17</v>
-                                </b>
-                                <b>
-                                    <a>96</a>
-                                    <b>180</b>
-                                    <v>16</v>
-                                </b>
-                                <b>
-                                    <a>180</a>
-                                    <b>292</b>
-                                    <v>16</v>
-                                </b>
-                                <b>
-                                    <a>297</a>
-                                    <b>382</b>
-                                    <v>16</v>
-                                </b>
-                                <b>
-                                    <a>383</a>
-                                    <b>430</b>
-                                    <v>16</v>
-                                </b>
-                                <b>
-                                    <a>431</a>
-                                    <b>463</b>
-                                    <v>16</v>
-                                </b>
-                                <b>
-                                    <a>463</a>
-                                    <b>530</b>
-                                    <v>12</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>36</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>4</b>
-                                    <v>13</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>9</b>
-                                    <v>16</v>
-                                </b>
-                                <b>
-                                    <a>9</a>
-                                    <b>20</b>
-                                    <v>16</v>
-                                </b>
-                                <b>
-                                    <a>20</a>
-                                    <b>53</b>
-                                    <v>16</v>
-                                </b>
-                                <b>
-                                    <a>55</a>
-                                    <b>103</b>
-                                    <v>16</v>
-                                </b>
-                                <b>
-                                    <a>107</a>
-                                    <b>209</b>
-                                    <v>16</v>
-                                </b>
-                                <b>
-                                    <a>221</a>
-                                    <b>412</b>
-                                    <v>16</v>
-                                </b>
-                                <b>
-                                    <a>422</a>
-                                    <b>682</b>
-                                    <v>16</v>
-                                </b>
-                                <b>
-                                    <a>706</a>
-                                    <b>975</b>
-                                    <v>16</v>
-                                </b>
-                                <b>
-                                    <a>977</a>
-                                    <b>1410</b>
-                                    <v>16</v>
-                                </b>
-                                <b>
-                                    <a>1417</a>
-                                    <b>1983</b>
-                                    <v>16</v>
-                                </b>
-                                <b>
-                                    <a>2809</a>
-                                    <b>10184</b>
-                                    <v>2</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>36</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>4</b>
-                                    <v>13</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>9</b>
-                                    <v>16</v>
-                                </b>
-                                <b>
-                                    <a>9</a>
-                                    <b>21</b>
-                                    <v>19</v>
-                                </b>
-                                <b>
-                                    <a>24</a>
-                                    <b>55</b>
-                                    <v>16</v>
-                                </b>
-                                <b>
-                                    <a>58</a>
-                                    <b>128</b>
-                                    <v>16</v>
-                                </b>
-                                <b>
-                                    <a>131</a>
-                                    <b>226</b>
-                                    <v>16</v>
-                                </b>
-                                <b>
-                                    <a>231</a>
-                                    <b>453</b>
-                                    <v>16</v>
-                                </b>
-                                <b>
-                                    <a>480</a>
-                                    <b>769</b>
-                                    <v>16</v>
-                                </b>
-                                <b>
-                                    <a>783</a>
-                                    <b>1037</b>
-                                    <v>16</v>
-                                </b>
-                                <b>
-                                    <a>1057</a>
-                                    <b>1521</b>
-                                    <v>16</v>
-                                </b>
-                                <b>
-                                    <a>1526</a>
-                                    <b>10180</b>
-                                    <v>15</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>31</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>16</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>6</b>
-                                    <v>17</v>
-                                </b>
-                                <b>
-                                    <a>6</a>
-                                    <b>12</b>
-                                    <v>17</v>
-                                </b>
-                                <b>
-                                    <a>12</a>
-                                    <b>21</b>
-                                    <v>16</v>
-                                </b>
-                                <b>
-                                    <a>21</a>
-                                    <b>28</b>
-                                    <v>16</v>
+                                    <v>8215</v>
                                 </b>
                                 <b>
                                     <a>28</a>
-                                    <b>35</b>
-                                    <v>17</v>
+                                    <b>30</b>
+                                    <v>8215</v>
                                 </b>
                                 <b>
-                                    <a>35</a>
-                                    <b>45</b>
-                                    <v>16</v>
+                                    <a>33</a>
+                                    <b>38</b>
+                                    <v>8215</v>
                                 </b>
                                 <b>
-                                    <a>46</a>
-                                    <b>56</b>
-                                    <v>16</v>
+                                    <a>38</a>
+                                    <b>39</b>
+                                    <v>8215</v>
                                 </b>
                                 <b>
-                                    <a>56</a>
-                                    <b>77</b>
-                                    <v>17</v>
+                                    <a>44</a>
+                                    <b>48</b>
+                                    <v>8215</v>
                                 </b>
                                 <b>
-                                    <a>77</a>
-                                    <b>101</b>
-                                    <v>17</v>
+                                    <a>58</a>
+                                    <b>68</b>
+                                    <v>8215</v>
                                 </b>
                                 <b>
-                                    <a>101</a>
-                                    <b>201</b>
-                                    <v>15</v>
+                                    <a>72</a>
+                                    <b>86</b>
+                                    <v>8215</v>
+                                </b>
+                                <b>
+                                    <a>126</a>
+                                    <b>132</b>
+                                    <v>8215</v>
+                                </b>
+                                <b>
+                                    <a>133</a>
+                                    <b>134</b>
+                                    <v>4107</v>
+                                </b>
+                                <b>
+                                    <a>134</a>
+                                    <b>135</b>
+                                    <v>12323</v>
+                                </b>
+                                <b>
+                                    <a>135</a>
+                                    <b>136</b>
+                                    <v>12323</v>
+                                </b>
+                                <b>
+                                    <a>211</a>
+                                    <b>279</b>
+                                    <v>8215</v>
+                                </b>
+                                <b>
+                                    <a>1057</a>
+                                    <b>1261</b>
+                                    <v>8215</v>
+                                </b>
+                                <b>
+                                    <a>4417</a>
+                                    <b>4418</b>
+                                    <v>4107</v>
                                 </b>
                             </bs>
                         </hist>
                     </val>
                 </dep>
                 <dep>
-                    <src>endLine</src>
+                    <src>file</src>
+                    <trg>beginLine</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>2</a>
+                                    <b>11</b>
+                                    <v>8215</v>
+                                </b>
+                                <b>
+                                    <a>12</a>
+                                    <b>14</b>
+                                    <v>8215</v>
+                                </b>
+                                <b>
+                                    <a>14</a>
+                                    <b>16</b>
+                                    <v>8215</v>
+                                </b>
+                                <b>
+                                    <a>16</a>
+                                    <b>17</b>
+                                    <v>4107</v>
+                                </b>
+                                <b>
+                                    <a>17</a>
+                                    <b>18</b>
+                                    <v>8215</v>
+                                </b>
+                                <b>
+                                    <a>20</a>
+                                    <b>21</b>
+                                    <v>8215</v>
+                                </b>
+                                <b>
+                                    <a>21</a>
+                                    <b>24</b>
+                                    <v>8215</v>
+                                </b>
+                                <b>
+                                    <a>28</a>
+                                    <b>34</b>
+                                    <v>8215</v>
+                                </b>
+                                <b>
+                                    <a>34</a>
+                                    <b>35</b>
+                                    <v>32863</v>
+                                </b>
+                                <b>
+                                    <a>40</a>
+                                    <b>109</b>
+                                    <v>8215</v>
+                                </b>
+                                <b>
+                                    <a>168</a>
+                                    <b>228</b>
+                                    <v>8215</v>
+                                </b>
+                                <b>
+                                    <a>1355</a>
+                                    <b>1356</b>
+                                    <v>4107</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>file</src>
+                    <trg>beginColumn</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>2</a>
+                                    <b>18</b>
+                                    <v>8215</v>
+                                </b>
+                                <b>
+                                    <a>19</a>
+                                    <b>20</b>
+                                    <v>8215</v>
+                                </b>
+                                <b>
+                                    <a>21</a>
+                                    <b>22</b>
+                                    <v>8215</v>
+                                </b>
+                                <b>
+                                    <a>22</a>
+                                    <b>23</b>
+                                    <v>8215</v>
+                                </b>
+                                <b>
+                                    <a>23</a>
+                                    <b>24</b>
+                                    <v>8215</v>
+                                </b>
+                                <b>
+                                    <a>25</a>
+                                    <b>27</b>
+                                    <v>8215</v>
+                                </b>
+                                <b>
+                                    <a>32</a>
+                                    <b>59</b>
+                                    <v>8215</v>
+                                </b>
+                                <b>
+                                    <a>60</a>
+                                    <b>65</b>
+                                    <v>8215</v>
+                                </b>
+                                <b>
+                                    <a>65</a>
+                                    <b>67</b>
+                                    <v>8215</v>
+                                </b>
+                                <b>
+                                    <a>67</a>
+                                    <b>68</b>
+                                    <v>4107</v>
+                                </b>
+                                <b>
+                                    <a>68</a>
+                                    <b>69</b>
+                                    <v>8215</v>
+                                </b>
+                                <b>
+                                    <a>69</a>
+                                    <b>70</b>
+                                    <v>4107</v>
+                                </b>
+                                <b>
+                                    <a>70</a>
+                                    <b>71</b>
+                                    <v>8215</v>
+                                </b>
+                                <b>
+                                    <a>80</a>
+                                    <b>93</b>
+                                    <v>8215</v>
+                                </b>
+                                <b>
+                                    <a>101</a>
+                                    <b>132</b>
+                                    <v>8215</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>file</src>
+                    <trg>endLine</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>2</a>
+                                    <b>12</b>
+                                    <v>8215</v>
+                                </b>
+                                <b>
+                                    <a>12</a>
+                                    <b>14</b>
+                                    <v>8215</v>
+                                </b>
+                                <b>
+                                    <a>14</a>
+                                    <b>15</b>
+                                    <v>4107</v>
+                                </b>
+                                <b>
+                                    <a>15</a>
+                                    <b>16</b>
+                                    <v>8215</v>
+                                </b>
+                                <b>
+                                    <a>16</a>
+                                    <b>17</b>
+                                    <v>8215</v>
+                                </b>
+                                <b>
+                                    <a>19</a>
+                                    <b>20</b>
+                                    <v>8215</v>
+                                </b>
+                                <b>
+                                    <a>26</a>
+                                    <b>29</b>
+                                    <v>8215</v>
+                                </b>
+                                <b>
+                                    <a>30</a>
+                                    <b>38</b>
+                                    <v>8215</v>
+                                </b>
+                                <b>
+                                    <a>38</a>
+                                    <b>39</b>
+                                    <v>20539</v>
+                                </b>
+                                <b>
+                                    <a>39</a>
+                                    <b>40</b>
+                                    <v>12323</v>
+                                </b>
+                                <b>
+                                    <a>40</a>
+                                    <b>110</b>
+                                    <v>8215</v>
+                                </b>
+                                <b>
+                                    <a>202</a>
+                                    <b>266</b>
+                                    <v>8215</v>
+                                </b>
+                                <b>
+                                    <a>1676</a>
+                                    <b>1677</b>
+                                    <v>4107</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>file</src>
+                    <trg>endColumn</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>2</a>
+                                    <b>17</b>
+                                    <v>8215</v>
+                                </b>
+                                <b>
+                                    <a>18</a>
+                                    <b>20</b>
+                                    <v>8215</v>
+                                </b>
+                                <b>
+                                    <a>23</a>
+                                    <b>25</b>
+                                    <v>8215</v>
+                                </b>
+                                <b>
+                                    <a>25</a>
+                                    <b>26</b>
+                                    <v>8215</v>
+                                </b>
+                                <b>
+                                    <a>26</a>
+                                    <b>31</b>
+                                    <v>8215</v>
+                                </b>
+                                <b>
+                                    <a>33</a>
+                                    <b>41</b>
+                                    <v>8215</v>
+                                </b>
+                                <b>
+                                    <a>42</a>
+                                    <b>61</b>
+                                    <v>8215</v>
+                                </b>
+                                <b>
+                                    <a>71</a>
+                                    <b>72</b>
+                                    <v>4107</v>
+                                </b>
+                                <b>
+                                    <a>85</a>
+                                    <b>86</b>
+                                    <v>8215</v>
+                                </b>
+                                <b>
+                                    <a>86</a>
+                                    <b>87</b>
+                                    <v>4107</v>
+                                </b>
+                                <b>
+                                    <a>88</a>
+                                    <b>89</b>
+                                    <v>8215</v>
+                                </b>
+                                <b>
+                                    <a>89</a>
+                                    <b>91</b>
+                                    <v>8215</v>
+                                </b>
+                                <b>
+                                    <a>91</a>
+                                    <b>92</b>
+                                    <v>8215</v>
+                                </b>
+                                <b>
+                                    <a>92</a>
+                                    <b>102</b>
+                                    <v>8215</v>
+                                </b>
+                                <b>
+                                    <a>125</a>
+                                    <b>149</b>
+                                    <v>8215</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>beginLine</src>
                     <trg>id</trg>
                     <val>
                         <hist>
@@ -7265,39 +6907,54 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6731</v>
+                                    <v>1142021</v>
                                 </b>
                                 <b>
                                     <a>2</a>
+                                    <b>3</b>
+                                    <v>1092726</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>1039322</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>5</b>
+                                    <v>603874</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
                                     <b>6</b>
-                                    <v>903</v>
+                                    <v>612090</v>
                                 </b>
                                 <b>
                                     <a>6</a>
-                                    <b>16</b>
-                                    <v>817</v>
+                                    <b>7</b>
+                                    <v>390259</v>
                                 </b>
                                 <b>
-                                    <a>16</a>
-                                    <b>58</b>
-                                    <v>785</v>
+                                    <a>7</a>
+                                    <b>9</b>
+                                    <v>546363</v>
                                 </b>
                                 <b>
-                                    <a>58</a>
-                                    <b>457</b>
-                                    <v>779</v>
+                                    <a>9</a>
+                                    <b>21</b>
+                                    <v>484743</v>
                                 </b>
                                 <b>
-                                    <a>458</a>
-                                    <b>1734</b>
-                                    <v>363</v>
+                                    <a>21</a>
+                                    <b>179</b>
+                                    <v>262911</v>
                                 </b>
                             </bs>
                         </hist>
                     </val>
                 </dep>
                 <dep>
-                    <src>endLine</src>
+                    <src>beginLine</src>
                     <trg>file</trg>
                     <val>
                         <hist>
@@ -7306,32 +6963,527 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6847</v>
+                                    <v>5311634</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>810</v>
+                                    <v>353287</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>22</b>
+                                    <v>464203</v>
+                                </b>
+                                <b>
+                                    <a>22</a>
+                                    <b>29</b>
+                                    <v>45187</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>1146129</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>1121481</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>1051646</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>5</b>
+                                    <v>665494</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
+                                    <b>6</b>
+                                    <v>624414</v>
+                                </b>
+                                <b>
+                                    <a>6</a>
+                                    <b>7</b>
+                                    <v>402583</v>
+                                </b>
+                                <b>
+                                    <a>7</a>
+                                    <b>8</b>
+                                    <v>517607</v>
+                                </b>
+                                <b>
+                                    <a>8</a>
+                                    <b>17</b>
+                                    <v>497067</v>
+                                </b>
+                                <b>
+                                    <a>17</a>
+                                    <b>57</b>
+                                    <v>147887</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>2690735</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>3031698</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>14</b>
+                                    <v>451879</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>1630873</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>624414</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>1063970</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>5</b>
+                                    <v>636738</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
+                                    <b>6</b>
+                                    <v>644954</v>
+                                </b>
+                                <b>
+                                    <a>6</a>
+                                    <b>7</b>
+                                    <v>480635</v>
+                                </b>
+                                <b>
+                                    <a>7</a>
+                                    <b>9</b>
+                                    <v>464203</v>
+                                </b>
+                                <b>
+                                    <a>9</a>
+                                    <b>19</b>
+                                    <v>476527</v>
+                                </b>
+                                <b>
+                                    <a>19</a>
+                                    <b>65</b>
+                                    <v>151995</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>308099</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>127347</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>787</v>
+                                    <v>94483</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
+                                    <b>8</b>
+                                    <v>90375</v>
+                                </b>
+                                <b>
+                                    <a>9</a>
+                                    <b>16</b>
+                                    <v>82159</v>
+                                </b>
+                                <b>
+                                    <a>16</a>
+                                    <b>35</b>
+                                    <v>78051</v>
+                                </b>
+                                <b>
+                                    <a>35</a>
+                                    <b>66</b>
+                                    <v>78051</v>
+                                </b>
+                                <b>
+                                    <a>72</a>
+                                    <b>105</b>
+                                    <v>78051</v>
+                                </b>
+                                <b>
+                                    <a>105</a>
+                                    <b>408</b>
+                                    <v>78051</v>
+                                </b>
+                                <b>
+                                    <a>500</a>
+                                    <b>1007</b>
+                                    <v>12323</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>320423</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>151995</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>53403</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>5</b>
+                                    <v>90375</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
+                                    <b>6</b>
+                                    <v>98591</v>
+                                </b>
+                                <b>
+                                    <a>6</a>
+                                    <b>9</b>
+                                    <v>82159</v>
+                                </b>
+                                <b>
+                                    <a>9</a>
+                                    <b>13</b>
+                                    <v>69835</v>
+                                </b>
+                                <b>
+                                    <a>13</a>
+                                    <b>17</b>
+                                    <v>78051</v>
+                                </b>
+                                <b>
+                                    <a>17</a>
+                                    <b>29</b>
+                                    <v>82159</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>394367</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>143779</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>5</b>
+                                    <v>86267</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>14</b>
-                                    <v>802</v>
+                                    <v>78051</v>
                                 </b>
                                 <b>
                                     <a>14</a>
-                                    <b>104</b>
-                                    <v>780</v>
+                                    <b>32</b>
+                                    <v>82159</v>
                                 </b>
                                 <b>
-                                    <a>105</a>
-                                    <b>530</b>
-                                    <v>352</v>
+                                    <a>32</a>
+                                    <b>58</b>
+                                    <v>78051</v>
+                                </b>
+                                <b>
+                                    <a>61</a>
+                                    <b>82</b>
+                                    <v>82159</v>
+                                </b>
+                                <b>
+                                    <a>83</a>
+                                    <b>623</b>
+                                    <v>78051</v>
+                                </b>
+                                <b>
+                                    <a>752</a>
+                                    <b>753</b>
+                                    <v>4107</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>394367</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>143779</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>5</b>
+                                    <v>86267</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
+                                    <b>14</b>
+                                    <v>78051</v>
+                                </b>
+                                <b>
+                                    <a>14</a>
+                                    <b>31</b>
+                                    <v>78051</v>
+                                </b>
+                                <b>
+                                    <a>31</a>
+                                    <b>56</b>
+                                    <v>78051</v>
+                                </b>
+                                <b>
+                                    <a>57</a>
+                                    <b>80</b>
+                                    <v>82159</v>
+                                </b>
+                                <b>
+                                    <a>81</a>
+                                    <b>412</b>
+                                    <v>78051</v>
+                                </b>
+                                <b>
+                                    <a>627</a>
+                                    <b>773</b>
+                                    <v>8215</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>468311</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>94483</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>5</b>
+                                    <v>78051</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
+                                    <b>13</b>
+                                    <v>78051</v>
+                                </b>
+                                <b>
+                                    <a>13</a>
+                                    <b>23</b>
+                                    <v>90375</v>
+                                </b>
+                                <b>
+                                    <a>25</a>
+                                    <b>34</b>
+                                    <v>82159</v>
+                                </b>
+                                <b>
+                                    <a>34</a>
+                                    <b>41</b>
+                                    <v>82159</v>
+                                </b>
+                                <b>
+                                    <a>41</a>
+                                    <b>106</b>
+                                    <v>53403</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>endLine</src>
+                    <trg>id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>3093318</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>505283</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>796950</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>5</b>
+                                    <v>801058</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
+                                    <b>6</b>
+                                    <v>443663</v>
+                                </b>
+                                <b>
+                                    <a>6</a>
+                                    <b>7</b>
+                                    <v>303991</v>
+                                </b>
+                                <b>
+                                    <a>7</a>
+                                    <b>8</b>
+                                    <v>579226</v>
+                                </b>
+                                <b>
+                                    <a>8</a>
+                                    <b>21</b>
+                                    <v>562794</v>
+                                </b>
+                                <b>
+                                    <a>21</a>
+                                    <b>174</b>
+                                    <v>271127</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>6318092</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>382043</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>16</b>
+                                    <v>554578</v>
+                                </b>
+                                <b>
+                                    <a>16</a>
+                                    <b>29</b>
+                                    <v>102699</v>
                                 </b>
                             </bs>
                         </hist>
@@ -7347,27 +7499,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7766</v>
+                                    <v>4962455</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>956</v>
+                                    <v>1934864</v>
                                 </b>
                                 <b>
                                     <a>3</a>
-                                    <b>7</b>
-                                    <v>860</v>
-                                </b>
-                                <b>
-                                    <a>7</a>
-                                    <b>27</b>
-                                    <v>785</v>
-                                </b>
-                                <b>
-                                    <a>27</a>
-                                    <b>31</b>
-                                    <v>11</v>
+                                    <b>8</b>
+                                    <v>460095</v>
                                 </b>
                             </bs>
                         </hist>
@@ -7383,32 +7525,47 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6749</v>
+                                    <v>3101534</v>
                                 </b>
                                 <b>
                                     <a>2</a>
+                                    <b>3</b>
+                                    <v>521715</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
                                     <b>4</b>
-                                    <v>616</v>
+                                    <v>813382</v>
                                 </b>
                                 <b>
                                     <a>4</a>
+                                    <b>5</b>
+                                    <v>870894</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
+                                    <b>6</b>
+                                    <v>468311</v>
+                                </b>
+                                <b>
+                                    <a>6</a>
+                                    <b>7</b>
+                                    <v>308099</v>
+                                </b>
+                                <b>
+                                    <a>7</a>
                                     <b>8</b>
-                                    <v>878</v>
+                                    <v>640846</v>
                                 </b>
                                 <b>
                                     <a>8</a>
-                                    <b>21</b>
-                                    <v>799</v>
+                                    <b>24</b>
+                                    <v>562794</v>
                                 </b>
                                 <b>
-                                    <a>21</a>
-                                    <b>53</b>
-                                    <v>779</v>
-                                </b>
-                                <b>
-                                    <a>53</a>
-                                    <b>113</b>
-                                    <v>557</v>
+                                    <a>24</a>
+                                    <b>54</b>
+                                    <v>69835</v>
                                 </b>
                             </bs>
                         </hist>
@@ -7424,32 +7581,47 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6792</v>
+                                    <v>3130290</v>
                                 </b>
                                 <b>
                                     <a>2</a>
+                                    <b>3</b>
+                                    <v>529931</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>796950</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
                                     <b>5</b>
-                                    <v>936</v>
+                                    <v>854462</v>
                                 </b>
                                 <b>
                                     <a>5</a>
-                                    <b>12</b>
-                                    <v>801</v>
+                                    <b>6</b>
+                                    <v>443663</v>
                                 </b>
                                 <b>
-                                    <a>12</a>
-                                    <b>34</b>
-                                    <v>791</v>
+                                    <a>6</a>
+                                    <b>7</b>
+                                    <v>414907</v>
                                 </b>
                                 <b>
-                                    <a>34</a>
-                                    <b>83</b>
-                                    <v>787</v>
+                                    <a>7</a>
+                                    <b>9</b>
+                                    <v>583334</v>
                                 </b>
                                 <b>
-                                    <a>83</a>
-                                    <b>127</b>
-                                    <v>271</v>
+                                    <a>9</a>
+                                    <b>32</b>
+                                    <v>554578</v>
+                                </b>
+                                <b>
+                                    <a>33</a>
+                                    <b>66</b>
+                                    <v>49295</v>
                                 </b>
                             </bs>
                         </hist>
@@ -7465,57 +7637,57 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>33</v>
+                                    <v>262911</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>60</v>
+                                    <v>180751</v>
                                 </b>
                                 <b>
                                     <a>3</a>
-                                    <b>9</b>
-                                    <v>23</v>
+                                    <b>4</b>
+                                    <v>32863</v>
                                 </b>
                                 <b>
-                                    <a>9</a>
-                                    <b>40</b>
-                                    <v>21</v>
+                                    <a>4</a>
+                                    <b>5</b>
+                                    <v>98591</v>
                                 </b>
                                 <b>
-                                    <a>43</a>
-                                    <b>111</b>
-                                    <v>21</v>
+                                    <a>5</a>
+                                    <b>7</b>
+                                    <v>90375</v>
                                 </b>
                                 <b>
-                                    <a>121</a>
-                                    <b>347</b>
-                                    <v>21</v>
+                                    <a>7</a>
+                                    <b>15</b>
+                                    <v>90375</v>
                                 </b>
                                 <b>
-                                    <a>369</a>
-                                    <b>1229</b>
-                                    <v>21</v>
+                                    <a>15</a>
+                                    <b>37</b>
+                                    <v>90375</v>
                                 </b>
                                 <b>
-                                    <a>1267</a>
-                                    <b>3311</b>
-                                    <v>21</v>
+                                    <a>40</a>
+                                    <b>71</b>
+                                    <v>90375</v>
                                 </b>
                                 <b>
-                                    <a>3642</a>
-                                    <b>7560</b>
-                                    <v>21</v>
+                                    <a>71</a>
+                                    <b>101</b>
+                                    <v>90375</v>
                                 </b>
                                 <b>
-                                    <a>7682</a>
-                                    <b>12716</b>
-                                    <v>21</v>
+                                    <a>101</a>
+                                    <b>144</b>
+                                    <v>90375</v>
                                 </b>
                                 <b>
-                                    <a>12740</a>
-                                    <b>20483</b>
-                                    <v>11</v>
+                                    <a>146</a>
+                                    <b>448</b>
+                                    <v>36971</v>
                                 </b>
                             </bs>
                         </hist>
@@ -7531,52 +7703,52 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>94</v>
+                                    <v>312207</v>
                                 </b>
                                 <b>
                                     <a>2</a>
+                                    <b>3</b>
+                                    <v>156103</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>53403</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>5</b>
+                                    <v>119131</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
                                     <b>6</b>
-                                    <v>19</v>
+                                    <v>94483</v>
                                 </b>
                                 <b>
                                     <a>6</a>
-                                    <b>16</b>
-                                    <v>21</v>
+                                    <b>9</b>
+                                    <v>102699</v>
                                 </b>
                                 <b>
-                                    <a>16</a>
-                                    <b>45</b>
-                                    <v>21</v>
+                                    <a>9</a>
+                                    <b>12</b>
+                                    <v>90375</v>
                                 </b>
                                 <b>
-                                    <a>45</a>
-                                    <b>110</b>
-                                    <v>21</v>
+                                    <a>12</a>
+                                    <b>15</b>
+                                    <v>82159</v>
                                 </b>
                                 <b>
-                                    <a>123</a>
-                                    <b>281</b>
-                                    <v>21</v>
+                                    <a>15</a>
+                                    <b>19</b>
+                                    <v>94483</v>
                                 </b>
                                 <b>
-                                    <a>290</a>
-                                    <b>393</b>
-                                    <v>21</v>
-                                </b>
-                                <b>
-                                    <a>395</a>
-                                    <b>445</b>
-                                    <v>21</v>
-                                </b>
-                                <b>
-                                    <a>446</a>
-                                    <b>468</b>
-                                    <v>21</v>
-                                </b>
-                                <b>
-                                    <a>470</a>
-                                    <b>530</b>
-                                    <v>14</v>
+                                    <a>19</a>
+                                    <b>29</b>
+                                    <v>49295</v>
                                 </b>
                             </bs>
                         </hist>
@@ -7592,52 +7764,47 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>94</v>
+                                    <v>414907</v>
                                 </b>
                                 <b>
                                     <a>2</a>
-                                    <b>6</b>
-                                    <v>19</v>
+                                    <b>3</b>
+                                    <v>160211</v>
                                 </b>
                                 <b>
-                                    <a>6</a>
-                                    <b>21</b>
-                                    <v>21</v>
+                                    <a>3</a>
+                                    <b>5</b>
+                                    <v>102699</v>
                                 </b>
                                 <b>
-                                    <a>21</a>
-                                    <b>52</b>
-                                    <v>21</v>
+                                    <a>5</a>
+                                    <b>11</b>
+                                    <v>94483</v>
                                 </b>
                                 <b>
-                                    <a>54</a>
-                                    <b>154</b>
-                                    <v>21</v>
+                                    <a>11</a>
+                                    <b>38</b>
+                                    <v>90375</v>
                                 </b>
                                 <b>
-                                    <a>157</a>
-                                    <b>449</b>
-                                    <v>21</v>
+                                    <a>40</a>
+                                    <b>66</b>
+                                    <v>90375</v>
                                 </b>
                                 <b>
-                                    <a>455</a>
-                                    <b>808</b>
-                                    <v>21</v>
+                                    <a>67</a>
+                                    <b>86</b>
+                                    <v>90375</v>
                                 </b>
                                 <b>
-                                    <a>814</a>
-                                    <b>1132</b>
-                                    <v>21</v>
+                                    <a>86</a>
+                                    <b>126</b>
+                                    <v>94483</v>
                                 </b>
                                 <b>
-                                    <a>1145</a>
-                                    <b>1769</b>
-                                    <v>21</v>
-                                </b>
-                                <b>
-                                    <a>1792</a>
-                                    <b>2365</b>
-                                    <v>14</v>
+                                    <a>126</a>
+                                    <b>352</b>
+                                    <v>16431</v>
                                 </b>
                             </bs>
                         </hist>
@@ -7653,57 +7820,47 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>39</v>
+                                    <v>460095</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>56</v>
+                                    <v>102699</v>
                                 </b>
                                 <b>
                                     <a>3</a>
-                                    <b>7</b>
-                                    <v>23</v>
+                                    <b>4</b>
+                                    <v>69835</v>
                                 </b>
                                 <b>
-                                    <a>7</a>
-                                    <b>18</b>
-                                    <v>21</v>
+                                    <a>4</a>
+                                    <b>8</b>
+                                    <v>106807</v>
                                 </b>
                                 <b>
-                                    <a>18</a>
-                                    <b>27</b>
-                                    <v>24</v>
+                                    <a>8</a>
+                                    <b>16</b>
+                                    <v>94483</v>
                                 </b>
                                 <b>
-                                    <a>27</a>
-                                    <b>37</b>
-                                    <v>22</v>
+                                    <a>16</a>
+                                    <b>26</b>
+                                    <v>94483</v>
                                 </b>
                                 <b>
-                                    <a>37</a>
-                                    <b>49</b>
-                                    <v>23</v>
+                                    <a>26</a>
+                                    <b>31</b>
+                                    <v>86267</v>
                                 </b>
                                 <b>
-                                    <a>49</a>
-                                    <b>63</b>
-                                    <v>22</v>
+                                    <a>31</a>
+                                    <b>35</b>
+                                    <v>94483</v>
                                 </b>
                                 <b>
-                                    <a>63</a>
-                                    <b>74</b>
-                                    <v>20</v>
-                                </b>
-                                <b>
-                                    <a>74</a>
-                                    <b>102</b>
-                                    <v>21</v>
-                                </b>
-                                <b>
-                                    <a>103</a>
-                                    <b>172</b>
-                                    <v>3</v>
+                                    <a>35</a>
+                                    <b>58</b>
+                                    <v>45187</v>
                                 </b>
                             </bs>
                         </hist>
@@ -7719,52 +7876,47 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>94</v>
+                                    <v>414907</v>
                                 </b>
                                 <b>
                                     <a>2</a>
-                                    <b>6</b>
-                                    <v>19</v>
+                                    <b>3</b>
+                                    <v>160211</v>
                                 </b>
                                 <b>
-                                    <a>6</a>
-                                    <b>21</b>
-                                    <v>21</v>
+                                    <a>3</a>
+                                    <b>5</b>
+                                    <v>102699</v>
                                 </b>
                                 <b>
-                                    <a>21</a>
-                                    <b>52</b>
-                                    <v>21</v>
+                                    <a>5</a>
+                                    <b>11</b>
+                                    <v>94483</v>
                                 </b>
                                 <b>
-                                    <a>53</a>
-                                    <b>153</b>
-                                    <v>21</v>
+                                    <a>11</a>
+                                    <b>38</b>
+                                    <v>90375</v>
                                 </b>
                                 <b>
-                                    <a>156</a>
-                                    <b>444</b>
-                                    <v>21</v>
+                                    <a>40</a>
+                                    <b>67</b>
+                                    <v>94483</v>
                                 </b>
                                 <b>
-                                    <a>446</a>
-                                    <b>789</b>
-                                    <v>21</v>
+                                    <a>68</a>
+                                    <b>87</b>
+                                    <v>90375</v>
                                 </b>
                                 <b>
-                                    <a>806</a>
-                                    <b>1121</b>
-                                    <v>21</v>
+                                    <a>87</a>
+                                    <b>127</b>
+                                    <v>90375</v>
                                 </b>
                                 <b>
-                                    <a>1138</a>
-                                    <b>1726</b>
-                                    <v>21</v>
-                                </b>
-                                <b>
-                                    <a>1787</a>
-                                    <b>2357</b>
-                                    <v>14</v>
+                                    <a>131</a>
+                                    <b>394</b>
+                                    <v>16431</v>
                                 </b>
                             </bs>
                         </hist>
@@ -7774,23 +7926,23 @@
         </relation>
         <relation>
             <name>numlines</name>
-            <cardinality>514</cardinality>
+            <cardinality>81641</cardinality>
             <columnsizes>
                 <e>
                     <k>element_id</k>
-                    <v>514</v>
+                    <v>81641</v>
                 </e>
                 <e>
                     <k>num_lines</k>
-                    <v>309</v>
+                    <v>22071</v>
                 </e>
                 <e>
                     <k>num_code</k>
-                    <v>350</v>
+                    <v>17999</v>
                 </e>
                 <e>
                     <k>num_comment</k>
-                    <v>150</v>
+                    <v>10928</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -7804,7 +7956,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>514</v>
+                                    <v>81641</v>
                                 </b>
                             </bs>
                         </hist>
@@ -7820,7 +7972,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>514</v>
+                                    <v>81641</v>
                                 </b>
                             </bs>
                         </hist>
@@ -7836,7 +7988,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>514</v>
+                                    <v>81641</v>
                                 </b>
                             </bs>
                         </hist>
@@ -7852,22 +8004,47 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>183</v>
+                                    <v>7285</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>74</v>
+                                    <v>3857</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>32</v>
+                                    <v>1285</v>
                                 </b>
                                 <b>
                                     <a>4</a>
+                                    <b>5</b>
+                                    <v>2142</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
+                                    <b>6</b>
+                                    <v>1928</v>
+                                </b>
+                                <b>
+                                    <a>6</a>
                                     <b>7</b>
-                                    <v>20</v>
+                                    <v>1928</v>
+                                </b>
+                                <b>
+                                    <a>7</a>
+                                    <b>9</b>
+                                    <v>1285</v>
+                                </b>
+                                <b>
+                                    <a>9</a>
+                                    <b>11</b>
+                                    <v>1285</v>
+                                </b>
+                                <b>
+                                    <a>11</a>
+                                    <b>12</b>
+                                    <v>1071</v>
                                 </b>
                             </bs>
                         </hist>
@@ -7883,22 +8060,37 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>187</v>
+                                    <v>8357</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>82</v>
+                                    <v>3642</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>23</v>
+                                    <v>2142</v>
                                 </b>
                                 <b>
                                     <a>4</a>
-                                    <b>7</b>
-                                    <v>17</v>
+                                    <b>5</b>
+                                    <v>2357</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
+                                    <b>6</b>
+                                    <v>2785</v>
+                                </b>
+                                <b>
+                                    <a>6</a>
+                                    <b>8</b>
+                                    <v>1928</v>
+                                </b>
+                                <b>
+                                    <a>8</a>
+                                    <b>10</b>
+                                    <v>857</v>
                                 </b>
                             </bs>
                         </hist>
@@ -7914,22 +8106,37 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>188</v>
+                                    <v>8785</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>79</v>
+                                    <v>3857</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>28</v>
+                                    <v>2357</v>
                                 </b>
                                 <b>
                                     <a>4</a>
+                                    <b>5</b>
+                                    <v>2357</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
+                                    <b>6</b>
+                                    <v>1928</v>
+                                </b>
+                                <b>
+                                    <a>6</a>
                                     <b>7</b>
-                                    <v>14</v>
+                                    <v>1285</v>
+                                </b>
+                                <b>
+                                    <a>7</a>
+                                    <b>10</b>
+                                    <v>1499</v>
                                 </b>
                             </bs>
                         </hist>
@@ -7945,22 +8152,37 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>252</v>
+                                    <v>6214</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>65</v>
+                                    <v>4071</v>
                                 </b>
                                 <b>
                                     <a>3</a>
-                                    <b>5</b>
-                                    <v>28</v>
+                                    <b>4</b>
+                                    <v>2142</v>
                                 </b>
                                 <b>
-                                    <a>6</a>
-                                    <b>18</b>
-                                    <v>5</v>
+                                    <a>5</a>
+                                    <b>8</b>
+                                    <v>1285</v>
+                                </b>
+                                <b>
+                                    <a>8</a>
+                                    <b>10</b>
+                                    <v>1285</v>
+                                </b>
+                                <b>
+                                    <a>10</a>
+                                    <b>13</b>
+                                    <v>1499</v>
+                                </b>
+                                <b>
+                                    <a>14</a>
+                                    <b>22</b>
+                                    <v>1499</v>
                                 </b>
                             </bs>
                         </hist>
@@ -7976,48 +8198,88 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>256</v>
+                                    <v>7071</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>67</v>
+                                    <v>3428</v>
                                 </b>
                                 <b>
                                     <a>3</a>
-                                    <b>18</b>
-                                    <v>27</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>num_code</src>
-                    <trg>num_comment</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>259</v>
+                                    <b>4</b>
+                                    <v>2142</v>
                                 </b>
                                 <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>63</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
+                                    <a>4</a>
                                     <b>7</b>
-                                    <v>27</v>
+                                    <v>1499</v>
+                                </b>
+                                <b>
+                                    <a>7</a>
+                                    <b>9</b>
+                                    <v>1285</v>
+                                </b>
+                                <b>
+                                    <a>9</a>
+                                    <b>10</b>
+                                    <v>857</v>
+                                </b>
+                                <b>
+                                    <a>10</a>
+                                    <b>15</b>
+                                    <v>1499</v>
                                 </b>
                                 <b>
                                     <a>17</a>
                                     <b>18</b>
-                                    <v>1</v>
+                                    <v>214</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>num_code</src>
+                    <trg>num_comment</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>7071</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>3428</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>2142</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>6</b>
+                                    <v>857</v>
+                                </b>
+                                <b>
+                                    <a>6</a>
+                                    <b>7</b>
+                                    <v>1714</v>
+                                </b>
+                                <b>
+                                    <a>7</a>
+                                    <b>9</b>
+                                    <v>1499</v>
+                                </b>
+                                <b>
+                                    <a>9</a>
+                                    <b>16</b>
+                                    <v>1285</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8033,37 +8295,47 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>65</v>
+                                    <v>3214</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>27</v>
+                                    <v>2142</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>17</v>
+                                    <v>1285</v>
                                 </b>
                                 <b>
                                     <a>4</a>
-                                    <b>5</b>
-                                    <v>7</v>
+                                    <b>7</b>
+                                    <v>642</v>
                                 </b>
                                 <b>
-                                    <a>5</a>
-                                    <b>6</b>
-                                    <v>10</v>
+                                    <a>7</a>
+                                    <b>8</b>
+                                    <v>428</v>
                                 </b>
                                 <b>
-                                    <a>6</a>
-                                    <b>10</b>
-                                    <v>12</v>
+                                    <a>8</a>
+                                    <b>9</b>
+                                    <v>1071</v>
                                 </b>
                                 <b>
-                                    <a>10</a>
-                                    <b>31</b>
-                                    <v>12</v>
+                                    <a>11</a>
+                                    <b>18</b>
+                                    <v>857</v>
+                                </b>
+                                <b>
+                                    <a>18</a>
+                                    <b>28</b>
+                                    <v>857</v>
+                                </b>
+                                <b>
+                                    <a>37</a>
+                                    <b>84</b>
+                                    <v>428</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8079,37 +8351,47 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>65</v>
+                                    <v>3214</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>27</v>
+                                    <v>2357</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>18</v>
+                                    <v>1285</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>7</v>
-                                </b>
-                                <b>
-                                    <a>5</a>
-                                    <b>6</b>
-                                    <v>10</v>
+                                    <v>214</v>
                                 </b>
                                 <b>
                                     <a>6</a>
-                                    <b>10</b>
-                                    <v>13</v>
+                                    <b>7</b>
+                                    <v>857</v>
+                                </b>
+                                <b>
+                                    <a>7</a>
+                                    <b>9</b>
+                                    <v>857</v>
                                 </b>
                                 <b>
                                     <a>10</a>
-                                    <b>25</b>
-                                    <v>10</v>
+                                    <b>13</b>
+                                    <v>642</v>
+                                </b>
+                                <b>
+                                    <a>14</a>
+                                    <b>16</b>
+                                    <v>857</v>
+                                </b>
+                                <b>
+                                    <a>22</a>
+                                    <b>39</b>
+                                    <v>642</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8125,37 +8407,47 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>66</v>
+                                    <v>3214</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>27</v>
+                                    <v>2357</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>17</v>
+                                    <v>1285</v>
                                 </b>
                                 <b>
                                     <a>4</a>
-                                    <b>5</b>
-                                    <v>6</v>
-                                </b>
-                                <b>
-                                    <a>5</a>
                                     <b>6</b>
-                                    <v>10</v>
+                                    <v>642</v>
                                 </b>
                                 <b>
                                     <a>6</a>
-                                    <b>9</b>
-                                    <v>12</v>
+                                    <b>8</b>
+                                    <v>642</v>
                                 </b>
                                 <b>
-                                    <a>9</a>
-                                    <b>24</b>
-                                    <v>12</v>
+                                    <a>8</a>
+                                    <b>10</b>
+                                    <v>857</v>
+                                </b>
+                                <b>
+                                    <a>10</a>
+                                    <b>14</b>
+                                    <v>857</v>
+                                </b>
+                                <b>
+                                    <a>14</a>
+                                    <b>26</b>
+                                    <v>857</v>
+                                </b>
+                                <b>
+                                    <a>33</a>
+                                    <b>34</b>
+                                    <v>214</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8165,15 +8457,15 @@
         </relation>
         <relation>
             <name>files</name>
-            <cardinality>529</cardinality>
+            <cardinality>146783</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>529</v>
+                    <v>146783</v>
                 </e>
                 <e>
                     <k>name</k>
-                    <v>529</v>
+                    <v>146783</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -8187,7 +8479,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>529</v>
+                                    <v>146783</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8203,7 +8495,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>529</v>
+                                    <v>146783</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8213,15 +8505,15 @@
         </relation>
         <relation>
             <name>folders</name>
-            <cardinality>210</cardinality>
+            <cardinality>98591</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>210</v>
+                    <v>98591</v>
                 </e>
                 <e>
                     <k>name</k>
-                    <v>210</v>
+                    <v>98591</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -8235,7 +8527,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>210</v>
+                                    <v>98591</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8251,7 +8543,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>210</v>
+                                    <v>98591</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8261,15 +8553,15 @@
         </relation>
         <relation>
             <name>containerparent</name>
-            <cardinality>738</cardinality>
+            <cardinality>243853</cardinality>
             <columnsizes>
                 <e>
                     <k>parent</k>
-                    <v>210</v>
+                    <v>97284</v>
                 </e>
                 <e>
                     <k>child</k>
-                    <v>738</v>
+                    <v>243853</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -8283,32 +8575,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>115</v>
+                                    <v>56142</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>32</v>
+                                    <v>21856</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>12</v>
+                                    <v>6214</v>
                                 </b>
                                 <b>
                                     <a>4</a>
-                                    <b>6</b>
-                                    <v>19</v>
+                                    <b>7</b>
+                                    <v>8357</v>
                                 </b>
                                 <b>
-                                    <a>6</a>
-                                    <b>12</b>
-                                    <v>16</v>
-                                </b>
-                                <b>
-                                    <a>13</a>
-                                    <b>38</b>
-                                    <v>16</v>
+                                    <a>7</a>
+                                    <b>95</b>
+                                    <v>4714</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8324,7 +8611,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>738</v>
+                                    <v>243853</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8334,15 +8621,15 @@
         </relation>
         <relation>
             <name>has_location</name>
-            <cardinality>599339</cardinality>
+            <cardinality>14587326</cardinality>
             <columnsizes>
                 <e>
                     <k>locatable</k>
-                    <v>599339</v>
+                    <v>14587326</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>537353</v>
+                    <v>11868805</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -8356,7 +8643,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>599339</v>
+                                    <v>14587326</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8372,17 +8659,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>475682</v>
+                                    <v>9150285</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>61627</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>75</b>
-                                    <v>44</v>
+                                    <v>2718520</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8392,19 +8674,19 @@
         </relation>
         <relation>
             <name>comment_groups</name>
-            <cardinality>12083</cardinality>
+            <cardinality>2493839</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>12083</v>
+                    <v>2493839</v>
                 </e>
                 <e>
                     <k>parent</k>
-                    <v>509</v>
+                    <v>3187</v>
                 </e>
                 <e>
                     <k>idx</k>
-                    <v>720</v>
+                    <v>846614</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -8418,7 +8700,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>12083</v>
+                                    <v>2493839</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8434,7 +8716,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>12083</v>
+                                    <v>2493839</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8450,67 +8732,52 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>44</v>
+                                    <v>691</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>45</v>
+                                    <v>384</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>32</v>
+                                    <v>230</v>
                                 </b>
                                 <b>
                                     <a>4</a>
-                                    <b>5</b>
-                                    <v>27</v>
+                                    <b>6</b>
+                                    <v>268</v>
                                 </b>
                                 <b>
-                                    <a>5</a>
-                                    <b>7</b>
-                                    <v>38</v>
+                                    <a>6</a>
+                                    <b>12</b>
+                                    <v>268</v>
                                 </b>
                                 <b>
-                                    <a>7</a>
-                                    <b>10</b>
-                                    <v>47</v>
+                                    <a>12</a>
+                                    <b>18</b>
+                                    <v>230</v>
                                 </b>
                                 <b>
-                                    <a>10</a>
-                                    <b>13</b>
-                                    <v>34</v>
+                                    <a>18</a>
+                                    <b>24</b>
+                                    <v>268</v>
                                 </b>
                                 <b>
-                                    <a>13</a>
-                                    <b>17</b>
-                                    <v>47</v>
+                                    <a>34</a>
+                                    <b>110</b>
+                                    <v>230</v>
                                 </b>
                                 <b>
-                                    <a>17</a>
-                                    <b>23</b>
-                                    <v>40</v>
+                                    <a>256</a>
+                                    <b>257</b>
+                                    <v>460</v>
                                 </b>
                                 <b>
-                                    <a>23</a>
-                                    <b>29</b>
-                                    <v>40</v>
-                                </b>
-                                <b>
-                                    <a>29</a>
-                                    <b>38</b>
-                                    <v>39</v>
-                                </b>
-                                <b>
-                                    <a>38</a>
-                                    <b>70</b>
-                                    <v>39</v>
-                                </b>
-                                <b>
-                                    <a>70</a>
-                                    <b>721</b>
-                                    <v>37</v>
+                                    <a>7980</a>
+                                    <b>22048</b>
+                                    <v>153</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8526,67 +8793,52 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>44</v>
+                                    <v>691</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>45</v>
+                                    <v>384</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>32</v>
+                                    <v>230</v>
                                 </b>
                                 <b>
                                     <a>4</a>
-                                    <b>5</b>
-                                    <v>27</v>
+                                    <b>6</b>
+                                    <v>268</v>
                                 </b>
                                 <b>
-                                    <a>5</a>
-                                    <b>7</b>
-                                    <v>38</v>
+                                    <a>6</a>
+                                    <b>12</b>
+                                    <v>268</v>
                                 </b>
                                 <b>
-                                    <a>7</a>
-                                    <b>10</b>
-                                    <v>47</v>
+                                    <a>12</a>
+                                    <b>18</b>
+                                    <v>230</v>
                                 </b>
                                 <b>
-                                    <a>10</a>
-                                    <b>13</b>
-                                    <v>34</v>
+                                    <a>18</a>
+                                    <b>24</b>
+                                    <v>268</v>
                                 </b>
                                 <b>
-                                    <a>13</a>
-                                    <b>17</b>
-                                    <v>47</v>
+                                    <a>34</a>
+                                    <b>110</b>
+                                    <v>230</v>
                                 </b>
                                 <b>
-                                    <a>17</a>
-                                    <b>23</b>
-                                    <v>40</v>
+                                    <a>256</a>
+                                    <b>257</b>
+                                    <v>460</v>
                                 </b>
                                 <b>
-                                    <a>23</a>
-                                    <b>29</b>
-                                    <v>40</v>
-                                </b>
-                                <b>
-                                    <a>29</a>
-                                    <b>38</b>
-                                    <v>39</v>
-                                </b>
-                                <b>
-                                    <a>38</a>
-                                    <b>70</b>
-                                    <v>39</v>
-                                </b>
-                                <b>
-                                    <a>70</a>
-                                    <b>721</b>
-                                    <v>37</v>
+                                    <a>7980</a>
+                                    <b>22048</b>
+                                    <v>153</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8602,37 +8854,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>429</v>
+                                    <v>182133</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>53</v>
+                                    <v>136129</v>
                                 </b>
                                 <b>
                                     <a>3</a>
-                                    <b>8</b>
-                                    <v>66</v>
+                                    <b>4</b>
+                                    <v>221916</v>
                                 </b>
                                 <b>
-                                    <a>8</a>
-                                    <b>16</b>
-                                    <v>57</v>
+                                    <a>4</a>
+                                    <b>5</b>
+                                    <v>296604</v>
                                 </b>
                                 <b>
                                     <a>16</a>
-                                    <b>44</b>
-                                    <v>54</v>
-                                </b>
-                                <b>
-                                    <a>44</a>
-                                    <b>311</b>
-                                    <v>54</v>
-                                </b>
-                                <b>
-                                    <a>323</a>
-                                    <b>510</b>
-                                    <v>7</v>
+                                    <b>84</b>
+                                    <v>9830</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8648,37 +8890,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>429</v>
+                                    <v>182133</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>53</v>
+                                    <v>136129</v>
                                 </b>
                                 <b>
                                     <a>3</a>
-                                    <b>8</b>
-                                    <v>66</v>
+                                    <b>4</b>
+                                    <v>221916</v>
                                 </b>
                                 <b>
-                                    <a>8</a>
-                                    <b>16</b>
-                                    <v>57</v>
+                                    <a>4</a>
+                                    <b>5</b>
+                                    <v>296604</v>
                                 </b>
                                 <b>
                                     <a>16</a>
-                                    <b>44</b>
-                                    <v>54</v>
-                                </b>
-                                <b>
-                                    <a>44</a>
-                                    <b>311</b>
-                                    <v>54</v>
-                                </b>
-                                <b>
-                                    <a>323</a>
-                                    <b>510</b>
-                                    <v>7</v>
+                                    <b>84</b>
+                                    <v>9830</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8688,27 +8920,27 @@
         </relation>
         <relation>
             <name>comments</name>
-            <cardinality>25724</cardinality>
+            <cardinality>2514805</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>25724</v>
+                    <v>2514805</v>
                 </e>
                 <e>
                     <k>kind</k>
-                    <v>2</v>
+                    <v>76</v>
                 </e>
                 <e>
                     <k>parent</k>
-                    <v>12083</v>
+                    <v>2493839</v>
                 </e>
                 <e>
                     <k>idx</k>
-                    <v>156</v>
+                    <v>1728</v>
                 </e>
                 <e>
                     <k>text</k>
-                    <v>20683</v>
+                    <v>541522</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -8722,7 +8954,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>25724</v>
+                                    <v>2514805</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8738,7 +8970,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>25724</v>
+                                    <v>2514805</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8754,7 +8986,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>25724</v>
+                                    <v>2514805</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8770,7 +9002,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>25724</v>
+                                    <v>2514805</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8784,14 +9016,14 @@
                             <budget>12</budget>
                             <bs>
                                 <b>
-                                    <a>846</a>
-                                    <b>847</b>
-                                    <v>1</v>
+                                    <a>5</a>
+                                    <b>6</b>
+                                    <v>38</v>
                                 </b>
                                 <b>
-                                    <a>24878</a>
-                                    <b>24879</b>
-                                    <v>1</v>
+                                    <a>65484</a>
+                                    <b>65485</b>
+                                    <v>38</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8805,14 +9037,14 @@
                             <budget>12</budget>
                             <bs>
                                 <b>
-                                    <a>846</a>
-                                    <b>847</b>
-                                    <v>1</v>
+                                    <a>5</a>
+                                    <b>6</b>
+                                    <v>38</v>
                                 </b>
                                 <b>
-                                    <a>11239</a>
-                                    <b>11240</b>
-                                    <v>1</v>
+                                    <a>64938</a>
+                                    <b>64939</b>
+                                    <v>38</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8826,14 +9058,14 @@
                             <budget>12</budget>
                             <bs>
                                 <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>1</v>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>38</v>
                                 </b>
                                 <b>
-                                    <a>156</a>
-                                    <b>157</b>
-                                    <v>1</v>
+                                    <a>45</a>
+                                    <b>46</b>
+                                    <v>38</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8847,14 +9079,14 @@
                             <budget>12</budget>
                             <bs>
                                 <b>
-                                    <a>690</a>
-                                    <b>691</b>
-                                    <v>1</v>
+                                    <a>5</a>
+                                    <b>6</b>
+                                    <v>38</v>
                                 </b>
                                 <b>
-                                    <a>19993</a>
-                                    <b>19994</b>
-                                    <v>1</v>
+                                    <a>14097</a>
+                                    <b>14098</b>
+                                    <v>38</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8870,27 +9102,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7828</v>
+                                    <v>2484930</v>
                                 </b>
                                 <b>
                                     <a>2</a>
-                                    <b>3</b>
-                                    <v>1787</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>1289</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>11</b>
-                                    <v>937</v>
-                                </b>
-                                <b>
-                                    <a>11</a>
-                                    <b>157</b>
-                                    <v>242</v>
+                                    <b>46</b>
+                                    <v>8908</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8906,12 +9123,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>12081</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>2</v>
+                                    <v>2493839</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8927,27 +9139,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7828</v>
+                                    <v>2484930</v>
                                 </b>
                                 <b>
                                     <a>2</a>
-                                    <b>3</b>
-                                    <v>1787</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>1289</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>11</b>
-                                    <v>937</v>
-                                </b>
-                                <b>
-                                    <a>11</a>
-                                    <b>157</b>
-                                    <v>242</v>
+                                    <b>46</b>
+                                    <v>8908</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8963,93 +9160,53 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7828</v>
+                                    <v>2484930</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>33</b>
+                                    <v>8908</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>idx</src>
+                    <trg>id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>921</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>1817</v>
+                                    <v>307</v>
                                 </b>
                                 <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>1275</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
+                                    <a>5</a>
                                     <b>10</b>
-                                    <v>937</v>
+                                    <v>153</v>
                                 </b>
                                 <b>
-                                    <a>10</a>
-                                    <b>131</b>
-                                    <v>226</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>idx</src>
-                    <trg>id</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>36</v>
+                                    <a>11</a>
+                                    <b>20</b>
+                                    <v>153</v>
                                 </b>
                                 <b>
-                                    <a>2</a>
-                                    <b>4</b>
-                                    <v>13</v>
+                                    <a>34</a>
+                                    <b>233</b>
+                                    <v>153</v>
                                 </b>
                                 <b>
-                                    <a>4</a>
-                                    <b>5</b>
-                                    <v>16</v>
-                                </b>
-                                <b>
-                                    <a>5</a>
-                                    <b>7</b>
-                                    <v>12</v>
-                                </b>
-                                <b>
-                                    <a>7</a>
-                                    <b>9</b>
-                                    <v>12</v>
-                                </b>
-                                <b>
-                                    <a>9</a>
-                                    <b>11</b>
-                                    <v>6</v>
-                                </b>
-                                <b>
-                                    <a>12</a>
-                                    <b>14</b>
-                                    <v>13</v>
-                                </b>
-                                <b>
-                                    <a>14</a>
-                                    <b>24</b>
-                                    <v>13</v>
-                                </b>
-                                <b>
-                                    <a>26</a>
-                                    <b>52</b>
-                                    <v>12</v>
-                                </b>
-                                <b>
-                                    <a>59</a>
-                                    <b>218</b>
-                                    <v>12</v>
-                                </b>
-                                <b>
-                                    <a>242</a>
-                                    <b>12084</b>
-                                    <v>11</v>
+                                    <a>64943</a>
+                                    <b>64944</b>
+                                    <v>38</v>
                                 </b>
                             </bs>
                         </hist>
@@ -9065,12 +9222,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>154</v>
+                                    <v>1689</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>2</v>
+                                    <v>38</v>
                                 </b>
                             </bs>
                         </hist>
@@ -9086,57 +9243,32 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>36</v>
+                                    <v>921</v>
                                 </b>
                                 <b>
                                     <a>2</a>
-                                    <b>4</b>
-                                    <v>13</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>5</b>
-                                    <v>16</v>
+                                    <b>3</b>
+                                    <v>307</v>
                                 </b>
                                 <b>
                                     <a>5</a>
-                                    <b>7</b>
-                                    <v>12</v>
+                                    <b>10</b>
+                                    <v>153</v>
                                 </b>
                                 <b>
-                                    <a>7</a>
-                                    <b>9</b>
-                                    <v>12</v>
+                                    <a>11</a>
+                                    <b>20</b>
+                                    <v>153</v>
                                 </b>
                                 <b>
-                                    <a>9</a>
-                                    <b>11</b>
-                                    <v>6</v>
+                                    <a>34</a>
+                                    <b>233</b>
+                                    <v>153</v>
                                 </b>
                                 <b>
-                                    <a>12</a>
-                                    <b>14</b>
-                                    <v>13</v>
-                                </b>
-                                <b>
-                                    <a>14</a>
-                                    <b>24</b>
-                                    <v>13</v>
-                                </b>
-                                <b>
-                                    <a>26</a>
-                                    <b>52</b>
-                                    <v>12</v>
-                                </b>
-                                <b>
-                                    <a>59</a>
-                                    <b>218</b>
-                                    <v>12</v>
-                                </b>
-                                <b>
-                                    <a>242</a>
-                                    <b>12084</b>
-                                    <v>11</v>
+                                    <a>64943</a>
+                                    <b>64944</b>
+                                    <v>38</v>
                                 </b>
                             </bs>
                         </hist>
@@ -9152,52 +9284,32 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>36</v>
+                                    <v>960</v>
                                 </b>
                                 <b>
                                     <a>2</a>
-                                    <b>4</b>
-                                    <v>14</v>
+                                    <b>3</b>
+                                    <v>268</v>
                                 </b>
                                 <b>
                                     <a>4</a>
-                                    <b>5</b>
-                                    <v>18</v>
+                                    <b>8</b>
+                                    <v>153</v>
                                 </b>
                                 <b>
-                                    <a>5</a>
-                                    <b>7</b>
-                                    <v>14</v>
+                                    <a>8</a>
+                                    <b>15</b>
+                                    <v>153</v>
                                 </b>
                                 <b>
-                                    <a>7</a>
-                                    <b>9</b>
-                                    <v>11</v>
+                                    <a>29</a>
+                                    <b>188</b>
+                                    <v>153</v>
                                 </b>
                                 <b>
-                                    <a>9</a>
-                                    <b>12</b>
-                                    <v>14</v>
-                                </b>
-                                <b>
-                                    <a>12</a>
-                                    <b>17</b>
-                                    <v>12</v>
-                                </b>
-                                <b>
-                                    <a>19</a>
-                                    <b>36</b>
-                                    <v>13</v>
-                                </b>
-                                <b>
-                                    <a>39</a>
-                                    <b>128</b>
-                                    <v>12</v>
-                                </b>
-                                <b>
-                                    <a>165</a>
-                                    <b>10500</b>
-                                    <v>12</v>
+                                    <a>13716</a>
+                                    <b>13717</b>
+                                    <v>38</v>
                                 </b>
                             </bs>
                         </hist>
@@ -9213,12 +9325,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>19550</v>
+                                    <v>494827</v>
                                 </b>
                                 <b>
                                     <a>2</a>
-                                    <b>1935</b>
-                                    <v>1133</v>
+                                    <b>12</b>
+                                    <v>40819</v>
+                                </b>
+                                <b>
+                                    <a>12</a>
+                                    <b>45601</b>
+                                    <v>5875</v>
                                 </b>
                             </bs>
                         </hist>
@@ -9234,7 +9351,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>20683</v>
+                                    <v>541522</v>
                                 </b>
                             </bs>
                         </hist>
@@ -9250,12 +9367,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>19575</v>
+                                    <v>494904</v>
                                 </b>
                                 <b>
                                     <a>2</a>
-                                    <b>828</b>
-                                    <v>1108</v>
+                                    <b>12</b>
+                                    <v>40742</v>
+                                </b>
+                                <b>
+                                    <a>12</a>
+                                    <b>45601</b>
+                                    <v>5875</v>
                                 </b>
                             </bs>
                         </hist>
@@ -9271,12 +9393,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>20523</v>
+                                    <v>540255</v>
                                 </b>
                                 <b>
                                     <a>2</a>
-                                    <b>107</b>
-                                    <v>160</v>
+                                    <b>18</b>
+                                    <v>1267</v>
                                 </b>
                             </bs>
                         </hist>
@@ -9286,15 +9408,15 @@
         </relation>
         <relation>
             <name>doc_comments</name>
-            <cardinality>4330</cardinality>
+            <cardinality>273911</cardinality>
             <columnsizes>
                 <e>
                     <k>node</k>
-                    <v>4330</v>
+                    <v>273911</v>
                 </e>
                 <e>
                     <k>comment</k>
-                    <v>4330</v>
+                    <v>273911</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -9308,7 +9430,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4330</v>
+                                    <v>273911</v>
                                 </b>
                             </bs>
                         </hist>
@@ -9324,7 +9446,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4330</v>
+                                    <v>273911</v>
                                 </b>
                             </bs>
                         </hist>
@@ -9334,23 +9456,23 @@
         </relation>
         <relation>
             <name>exprs</name>
-            <cardinality>414037</cardinality>
+            <cardinality>8869156</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>414037</v>
+                    <v>8869156</v>
                 </e>
                 <e>
                     <k>kind</k>
-                    <v>48</v>
+                    <v>14536</v>
                 </e>
                 <e>
                     <k>parent</k>
-                    <v>219324</v>
+                    <v>4516748</v>
                 </e>
                 <e>
                     <k>idx</k>
-                    <v>5163</v>
+                    <v>258019</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -9364,7 +9486,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>414037</v>
+                                    <v>8869156</v>
                                 </b>
                             </bs>
                         </hist>
@@ -9380,7 +9502,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>414037</v>
+                                    <v>8869156</v>
                                 </b>
                             </bs>
                         </hist>
@@ -9396,7 +9518,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>414037</v>
+                                    <v>8869156</v>
                                 </b>
                             </bs>
                         </hist>
@@ -9410,64 +9532,64 @@
                             <budget>12</budget>
                             <bs>
                                 <b>
-                                    <a>7</a>
-                                    <b>20</b>
-                                    <v>4</v>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>1211</v>
                                 </b>
                                 <b>
-                                    <a>21</a>
-                                    <b>54</b>
-                                    <v>4</v>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>1615</v>
                                 </b>
                                 <b>
-                                    <a>57</a>
-                                    <b>142</b>
-                                    <v>4</v>
+                                    <a>5</a>
+                                    <b>10</b>
+                                    <v>1211</v>
                                 </b>
                                 <b>
-                                    <a>146</a>
-                                    <b>236</b>
-                                    <v>4</v>
+                                    <a>11</a>
+                                    <b>13</b>
+                                    <v>1211</v>
                                 </b>
                                 <b>
-                                    <a>248</a>
-                                    <b>344</b>
-                                    <v>4</v>
+                                    <a>13</a>
+                                    <b>16</b>
+                                    <v>1211</v>
                                 </b>
                                 <b>
-                                    <a>509</a>
-                                    <b>620</b>
-                                    <v>4</v>
+                                    <a>17</a>
+                                    <b>36</b>
+                                    <v>1211</v>
                                 </b>
                                 <b>
-                                    <a>678</a>
-                                    <b>839</b>
-                                    <v>4</v>
+                                    <a>37</a>
+                                    <b>44</b>
+                                    <v>1211</v>
                                 </b>
                                 <b>
-                                    <a>1013</a>
-                                    <b>1235</b>
-                                    <v>4</v>
+                                    <a>49</a>
+                                    <b>120</b>
+                                    <v>1211</v>
                                 </b>
                                 <b>
-                                    <a>1272</a>
-                                    <b>2705</b>
-                                    <v>4</v>
+                                    <a>193</a>
+                                    <b>250</b>
+                                    <v>1211</v>
                                 </b>
                                 <b>
-                                    <a>3244</a>
-                                    <b>4582</b>
-                                    <v>4</v>
+                                    <a>322</a>
+                                    <b>516</b>
+                                    <v>1211</v>
                                 </b>
                                 <b>
-                                    <a>5616</a>
-                                    <b>10361</b>
-                                    <v>4</v>
+                                    <a>752</a>
+                                    <b>1581</b>
+                                    <v>1211</v>
                                 </b>
                                 <b>
-                                    <a>24892</a>
-                                    <b>237317</b>
-                                    <v>4</v>
+                                    <a>3202</a>
+                                    <b>12977</b>
+                                    <v>807</v>
                                 </b>
                             </bs>
                         </hist>
@@ -9481,64 +9603,64 @@
                             <budget>12</budget>
                             <bs>
                                 <b>
-                                    <a>7</a>
-                                    <b>20</b>
-                                    <v>4</v>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>1211</v>
                                 </b>
                                 <b>
-                                    <a>21</a>
-                                    <b>54</b>
-                                    <v>4</v>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>1615</v>
                                 </b>
                                 <b>
-                                    <a>57</a>
-                                    <b>142</b>
-                                    <v>4</v>
+                                    <a>5</a>
+                                    <b>10</b>
+                                    <v>1211</v>
                                 </b>
                                 <b>
-                                    <a>144</a>
-                                    <b>207</b>
-                                    <v>4</v>
+                                    <a>11</a>
+                                    <b>13</b>
+                                    <v>1211</v>
                                 </b>
                                 <b>
-                                    <a>233</a>
-                                    <b>324</b>
-                                    <v>4</v>
+                                    <a>13</a>
+                                    <b>16</b>
+                                    <v>1211</v>
                                 </b>
                                 <b>
-                                    <a>509</a>
-                                    <b>613</b>
-                                    <v>4</v>
+                                    <a>17</a>
+                                    <b>36</b>
+                                    <v>1211</v>
                                 </b>
                                 <b>
-                                    <a>676</a>
-                                    <b>790</b>
-                                    <v>4</v>
+                                    <a>37</a>
+                                    <b>39</b>
+                                    <v>1211</v>
                                 </b>
                                 <b>
-                                    <a>1013</a>
-                                    <b>1226</b>
-                                    <v>4</v>
+                                    <a>49</a>
+                                    <b>107</b>
+                                    <v>1211</v>
                                 </b>
                                 <b>
-                                    <a>1239</a>
-                                    <b>1949</b>
-                                    <v>4</v>
+                                    <a>119</a>
+                                    <b>177</b>
+                                    <v>1211</v>
                                 </b>
                                 <b>
-                                    <a>2582</a>
-                                    <b>3985</b>
-                                    <v>4</v>
+                                    <a>245</a>
+                                    <b>323</b>
+                                    <v>1211</v>
                                 </b>
                                 <b>
-                                    <a>4252</a>
-                                    <b>10115</b>
-                                    <v>4</v>
+                                    <a>414</a>
+                                    <b>1535</b>
+                                    <v>1211</v>
                                 </b>
                                 <b>
-                                    <a>14086</a>
-                                    <b>154744</b>
-                                    <v>4</v>
+                                    <a>2864</a>
+                                    <b>8533</b>
+                                    <v>807</v>
                                 </b>
                             </bs>
                         </hist>
@@ -9554,52 +9676,32 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3</v>
+                                    <v>4441</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>8</v>
+                                    <v>4845</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>10</v>
+                                    <v>1615</v>
                                 </b>
                                 <b>
                                     <a>4</a>
-                                    <b>5</b>
-                                    <v>6</v>
+                                    <b>11</b>
+                                    <v>1211</v>
                                 </b>
                                 <b>
-                                    <a>5</a>
-                                    <b>7</b>
-                                    <v>4</v>
+                                    <a>11</a>
+                                    <b>13</b>
+                                    <v>1211</v>
                                 </b>
                                 <b>
-                                    <a>7</a>
-                                    <b>8</b>
-                                    <v>4</v>
-                                </b>
-                                <b>
-                                    <a>8</a>
-                                    <b>14</b>
-                                    <v>3</v>
-                                </b>
-                                <b>
-                                    <a>15</a>
-                                    <b>22</b>
-                                    <v>4</v>
-                                </b>
-                                <b>
-                                    <a>23</a>
-                                    <b>34</b>
-                                    <v>4</v>
-                                </b>
-                                <b>
-                                    <a>1057</a>
-                                    <b>5164</b>
-                                    <v>2</v>
+                                    <a>14</a>
+                                    <b>638</b>
+                                    <v>1211</v>
                                 </b>
                             </bs>
                         </hist>
@@ -9615,22 +9717,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>65804</v>
+                                    <v>1170575</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>133334</v>
+                                    <v>2867283</v>
                                 </b>
                                 <b>
                                     <a>3</a>
-                                    <b>5</b>
-                                    <v>17889</v>
+                                    <b>4</b>
+                                    <v>315760</v>
                                 </b>
                                 <b>
-                                    <a>5</a>
-                                    <b>5144</b>
-                                    <v>2297</v>
+                                    <a>4</a>
+                                    <b>637</b>
+                                    <v>163129</v>
                                 </b>
                             </bs>
                         </hist>
@@ -9646,17 +9748,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>137263</v>
+                                    <v>2711018</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>75813</v>
+                                    <v>1642197</v>
                                 </b>
                                 <b>
                                     <a>3</a>
-                                    <b>7</b>
-                                    <v>6248</v>
+                                    <b>5</b>
+                                    <v>163533</v>
                                 </b>
                             </bs>
                         </hist>
@@ -9672,22 +9774,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>65804</v>
+                                    <v>1170575</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>133334</v>
+                                    <v>2867283</v>
                                 </b>
                                 <b>
                                     <a>3</a>
-                                    <b>5</b>
-                                    <v>17889</v>
+                                    <b>4</b>
+                                    <v>315760</v>
                                 </b>
                                 <b>
-                                    <a>5</a>
-                                    <b>5144</b>
-                                    <v>2297</v>
+                                    <a>4</a>
+                                    <b>637</b>
+                                    <v>163129</v>
                                 </b>
                             </bs>
                         </hist>
@@ -9703,22 +9805,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3910</v>
+                                    <v>249943</v>
                                 </b>
                                 <b>
                                     <a>2</a>
-                                    <b>3</b>
-                                    <v>183</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>782</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>180006</b>
-                                    <v>288</v>
+                                    <b>9640</b>
+                                    <v>8075</v>
                                 </b>
                             </bs>
                         </hist>
@@ -9734,17 +9826,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4087</v>
+                                    <v>250347</v>
                                 </b>
                                 <b>
                                     <a>2</a>
-                                    <b>3</b>
-                                    <v>1033</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>48</b>
-                                    <v>43</v>
+                                    <b>33</b>
+                                    <v>7671</v>
                                 </b>
                             </bs>
                         </hist>
@@ -9760,22 +9847,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3910</v>
+                                    <v>249943</v>
                                 </b>
                                 <b>
                                     <a>2</a>
-                                    <b>3</b>
-                                    <v>183</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>782</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>180006</b>
-                                    <v>288</v>
+                                    <b>9640</b>
+                                    <v>8075</v>
                                 </b>
                             </bs>
                         </hist>
@@ -9785,19 +9862,19 @@
         </relation>
         <relation>
             <name>literals</name>
-            <cardinality>270756</cardinality>
+            <cardinality>8555361</cardinality>
             <columnsizes>
                 <e>
                     <k>expr</k>
-                    <v>270756</v>
+                    <v>8555361</v>
                 </e>
                 <e>
                     <k>value</k>
-                    <v>25795</v>
+                    <v>75495</v>
                 </e>
                 <e>
                     <k>raw</k>
-                    <v>27594</v>
+                    <v>77891</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -9811,7 +9888,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>270756</v>
+                                    <v>8555361</v>
                                 </b>
                             </bs>
                         </hist>
@@ -9827,7 +9904,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>270756</v>
+                                    <v>8555361</v>
                                 </b>
                             </bs>
                         </hist>
@@ -9843,37 +9920,42 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>14635</v>
+                                    <v>27811</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>3291</v>
+                                    <v>12538</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>1783</v>
+                                    <v>6753</v>
                                 </b>
                                 <b>
                                     <a>4</a>
-                                    <b>6</b>
-                                    <v>1931</v>
+                                    <b>5</b>
+                                    <v>5276</v>
                                 </b>
                                 <b>
-                                    <a>6</a>
-                                    <b>12</b>
-                                    <v>1968</v>
+                                    <a>5</a>
+                                    <b>8</b>
+                                    <v>6269</v>
                                 </b>
                                 <b>
-                                    <a>12</a>
-                                    <b>139</b>
-                                    <v>1935</v>
+                                    <a>8</a>
+                                    <b>17</b>
+                                    <v>5809</v>
                                 </b>
                                 <b>
-                                    <a>139</a>
-                                    <b>6840</b>
-                                    <v>252</v>
+                                    <a>17</a>
+                                    <b>1233</b>
+                                    <v>5663</v>
+                                </b>
+                                <b>
+                                    <a>1234</a>
+                                    <b>3959</b>
+                                    <v>5373</v>
                                 </b>
                             </bs>
                         </hist>
@@ -9889,12 +9971,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>24051</v>
+                                    <v>73171</v>
                                 </b>
                                 <b>
                                     <a>2</a>
-                                    <b>5</b>
-                                    <v>1744</v>
+                                    <b>4</b>
+                                    <v>2323</v>
                                 </b>
                             </bs>
                         </hist>
@@ -9910,32 +9992,42 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>16038</v>
+                                    <v>29191</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>3521</v>
+                                    <v>13046</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>1869</v>
+                                    <v>6777</v>
                                 </b>
                                 <b>
                                     <a>4</a>
-                                    <b>7</b>
-                                    <v>2553</v>
+                                    <b>5</b>
+                                    <v>5276</v>
                                 </b>
                                 <b>
-                                    <a>7</a>
-                                    <b>18</b>
-                                    <v>2129</v>
+                                    <a>5</a>
+                                    <b>8</b>
+                                    <v>6632</v>
                                 </b>
                                 <b>
-                                    <a>18</a>
-                                    <b>6833</b>
-                                    <v>1484</v>
+                                    <a>8</a>
+                                    <b>17</b>
+                                    <v>5857</v>
+                                </b>
+                                <b>
+                                    <a>17</a>
+                                    <b>1239</b>
+                                    <v>5857</v>
+                                </b>
+                                <b>
+                                    <a>1240</a>
+                                    <b>3937</b>
+                                    <v>5252</v>
                                 </b>
                             </bs>
                         </hist>
@@ -9951,7 +10043,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>27594</v>
+                                    <v>77891</v>
                                 </b>
                             </bs>
                         </hist>
@@ -9961,19 +10053,19 @@
         </relation>
         <relation>
             <name>constvalues</name>
-            <cardinality>43931</cardinality>
+            <cardinality>8093673</cardinality>
             <columnsizes>
                 <e>
                     <k>expr</k>
-                    <v>43931</v>
+                    <v>8093673</v>
                 </e>
                 <e>
                     <k>value</k>
-                    <v>16896</v>
+                    <v>27230</v>
                 </e>
                 <e>
                     <k>exact</k>
-                    <v>16897</v>
+                    <v>27230</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -9987,7 +10079,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>43931</v>
+                                    <v>8093673</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10003,7 +10095,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>43931</v>
+                                    <v>8093673</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10019,17 +10111,37 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>14932</v>
+                                    <v>15539</v>
                                 </b>
                                 <b>
                                     <a>2</a>
-                                    <b>4</b>
-                                    <v>1388</v>
+                                    <b>3</b>
+                                    <v>2420</v>
                                 </b>
                                 <b>
-                                    <a>4</a>
-                                    <b>6766</b>
-                                    <v>576</v>
+                                    <a>3</a>
+                                    <b>6</b>
+                                    <v>2130</v>
+                                </b>
+                                <b>
+                                    <a>6</a>
+                                    <b>1243</b>
+                                    <v>2105</v>
+                                </b>
+                                <b>
+                                    <a>1243</a>
+                                    <b>1281</b>
+                                    <v>2105</v>
+                                </b>
+                                <b>
+                                    <a>1281</a>
+                                    <b>1340</b>
+                                    <v>2057</v>
+                                </b>
+                                <b>
+                                    <a>1340</a>
+                                    <b>3974</b>
+                                    <v>871</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10045,12 +10157,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>16895</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>1</v>
+                                    <v>27230</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10066,17 +10173,37 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>14933</v>
+                                    <v>15539</v>
                                 </b>
                                 <b>
                                     <a>2</a>
-                                    <b>4</b>
-                                    <v>1388</v>
+                                    <b>3</b>
+                                    <v>2420</v>
                                 </b>
                                 <b>
-                                    <a>4</a>
-                                    <b>6766</b>
-                                    <v>576</v>
+                                    <a>3</a>
+                                    <b>6</b>
+                                    <v>2130</v>
+                                </b>
+                                <b>
+                                    <a>6</a>
+                                    <b>1243</b>
+                                    <v>2105</v>
+                                </b>
+                                <b>
+                                    <a>1243</a>
+                                    <b>1281</b>
+                                    <v>2105</v>
+                                </b>
+                                <b>
+                                    <a>1281</a>
+                                    <b>1340</b>
+                                    <v>2057</v>
+                                </b>
+                                <b>
+                                    <a>1340</a>
+                                    <b>3974</b>
+                                    <v>871</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10092,7 +10219,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>16897</v>
+                                    <v>27230</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10102,19 +10229,19 @@
         </relation>
         <relation>
             <name>fields</name>
-            <cardinality>19974</cardinality>
+            <cardinality>995459</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>19974</v>
+                    <v>995459</v>
                 </e>
                 <e>
                     <k>parent</k>
-                    <v>9600</v>
+                    <v>346065</v>
                 </e>
                 <e>
                     <k>idx</k>
-                    <v>57</v>
+                    <v>48913</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -10128,7 +10255,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>19974</v>
+                                    <v>995459</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10144,7 +10271,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>19974</v>
+                                    <v>995459</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10160,27 +10287,32 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4790</v>
+                                    <v>141898</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>2214</v>
+                                    <v>76625</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>1363</v>
+                                    <v>45908</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>653</v>
+                                    <v>32219</v>
                                 </b>
                                 <b>
                                     <a>5</a>
-                                    <b>53</b>
-                                    <v>580</v>
+                                    <b>7</b>
+                                    <v>29548</v>
+                                </b>
+                                <b>
+                                    <a>7</a>
+                                    <b>290</b>
+                                    <v>19865</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10196,27 +10328,32 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4790</v>
+                                    <v>141898</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>2214</v>
+                                    <v>76625</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>1363</v>
+                                    <v>45908</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>653</v>
+                                    <v>32219</v>
                                 </b>
                                 <b>
                                     <a>5</a>
-                                    <b>53</b>
-                                    <v>580</v>
+                                    <b>7</b>
+                                    <v>29548</v>
+                                </b>
+                                <b>
+                                    <a>7</a>
+                                    <b>290</b>
+                                    <v>19865</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10232,47 +10369,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>14</v>
+                                    <v>38729</v>
                                 </b>
                                 <b>
                                     <a>2</a>
-                                    <b>3</b>
-                                    <v>8</v>
+                                    <b>4</b>
+                                    <v>1836</v>
                                 </b>
                                 <b>
-                                    <a>3</a>
-                                    <b>6</b>
-                                    <v>5</v>
-                                </b>
-                                <b>
-                                    <a>6</a>
-                                    <b>11</b>
-                                    <v>5</v>
+                                    <a>4</a>
+                                    <b>12</b>
+                                    <v>3672</v>
                                 </b>
                                 <b>
                                     <a>12</a>
-                                    <b>18</b>
-                                    <v>5</v>
+                                    <b>185</b>
+                                    <v>3672</v>
                                 </b>
                                 <b>
-                                    <a>19</a>
-                                    <b>31</b>
-                                    <v>5</v>
-                                </b>
-                                <b>
-                                    <a>46</a>
-                                    <b>105</b>
-                                    <v>5</v>
-                                </b>
-                                <b>
-                                    <a>115</a>
-                                    <b>633</b>
-                                    <v>5</v>
-                                </b>
-                                <b>
-                                    <a>914</a>
-                                    <b>7063</b>
-                                    <v>5</v>
+                                    <a>269</a>
+                                    <b>1368</b>
+                                    <v>1001</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10288,47 +10405,163 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>14</v>
+                                    <v>38729</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>4</b>
+                                    <v>1836</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>12</b>
+                                    <v>3672</v>
+                                </b>
+                                <b>
+                                    <a>12</a>
+                                    <b>185</b>
+                                    <v>3672</v>
+                                </b>
+                                <b>
+                                    <a>269</a>
+                                    <b>1368</b>
+                                    <v>1001</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+            </dependencies>
+        </relation>
+        <relation>
+            <name>typeparamdecls</name>
+            <cardinality>9798</cardinality>
+            <columnsizes>
+                <e>
+                    <k>id</k>
+                    <v>9798</v>
+                </e>
+                <e>
+                    <k>parent</k>
+                    <v>8398</v>
+                </e>
+                <e>
+                    <k>idx</k>
+                    <v>1399</v>
+                </e>
+            </columnsizes>
+            <dependencies>
+                <dep>
+                    <src>id</src>
+                    <trg>parent</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>9798</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>9798</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>parent</src>
+                    <trg>id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>6999</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>8</v>
+                                    <v>1399</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>parent</src>
+                    <trg>idx</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>6999</v>
                                 </b>
                                 <b>
-                                    <a>3</a>
-                                    <b>6</b>
-                                    <v>5</v>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>1399</v>
                                 </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>idx</src>
+                    <trg>id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
                                 <b>
-                                    <a>6</a>
-                                    <b>11</b>
-                                    <v>5</v>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>699</v>
                                 </b>
                                 <b>
                                     <a>12</a>
-                                    <b>18</b>
-                                    <v>5</v>
+                                    <b>13</b>
+                                    <v>699</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>idx</src>
+                    <trg>parent</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>699</v>
                                 </b>
                                 <b>
-                                    <a>19</a>
-                                    <b>31</b>
-                                    <v>5</v>
-                                </b>
-                                <b>
-                                    <a>46</a>
-                                    <b>105</b>
-                                    <v>5</v>
-                                </b>
-                                <b>
-                                    <a>115</a>
-                                    <b>633</b>
-                                    <v>5</v>
-                                </b>
-                                <b>
-                                    <a>914</a>
-                                    <b>7063</b>
-                                    <v>5</v>
+                                    <a>12</a>
+                                    <b>13</b>
+                                    <v>699</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10338,23 +10571,23 @@
         </relation>
         <relation>
             <name>stmts</name>
-            <cardinality>73990</cardinality>
+            <cardinality>1915917</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>73990</v>
+                    <v>1915917</v>
                 </e>
                 <e>
                     <k>kind</k>
-                    <v>33</v>
+                    <v>30538</v>
                 </e>
                 <e>
                     <k>parent</k>
-                    <v>41543</v>
+                    <v>935456</v>
                 </e>
                 <e>
                     <k>idx</k>
-                    <v>81</v>
+                    <v>33753</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -10368,7 +10601,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>73990</v>
+                                    <v>1915917</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10384,7 +10617,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>73990</v>
+                                    <v>1915917</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10400,7 +10633,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>73990</v>
+                                    <v>1915917</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10414,421 +10647,521 @@
                             <budget>12</budget>
                             <bs>
                                 <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>1</v>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>1607</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>4</v>
+                                    <v>1607</v>
                                 </b>
                                 <b>
-                                    <a>5</a>
-                                    <b>9</b>
-                                    <v>3</v>
-                                </b>
-                                <b>
-                                    <a>18</a>
-                                    <b>50</b>
-                                    <v>3</v>
-                                </b>
-                                <b>
-                                    <a>63</a>
-                                    <b>72</b>
-                                    <v>3</v>
-                                </b>
-                                <b>
-                                    <a>72</a>
-                                    <b>224</b>
-                                    <v>3</v>
-                                </b>
-                                <b>
-                                    <a>301</a>
-                                    <b>379</b>
-                                    <v>3</v>
-                                </b>
-                                <b>
-                                    <a>400</a>
-                                    <b>615</b>
-                                    <v>3</v>
-                                </b>
-                                <b>
-                                    <a>654</a>
-                                    <b>2136</b>
-                                    <v>3</v>
-                                </b>
-                                <b>
-                                    <a>3476</a>
-                                    <b>7606</b>
-                                    <v>3</v>
-                                </b>
-                                <b>
-                                    <a>9225</a>
-                                    <b>9729</b>
-                                    <v>3</v>
-                                </b>
-                                <b>
-                                    <a>19358</a>
-                                    <b>19359</b>
-                                    <v>1</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>kind</src>
-                    <trg>parent</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>4</v>
-                                </b>
-                                <b>
-                                    <a>5</a>
-                                    <b>9</b>
-                                    <v>3</v>
-                                </b>
-                                <b>
-                                    <a>17</a>
-                                    <b>35</b>
-                                    <v>3</v>
-                                </b>
-                                <b>
-                                    <a>47</a>
-                                    <b>69</b>
-                                    <v>3</v>
-                                </b>
-                                <b>
-                                    <a>69</a>
-                                    <b>205</b>
-                                    <v>3</v>
-                                </b>
-                                <b>
-                                    <a>301</a>
-                                    <b>367</b>
-                                    <v>3</v>
-                                </b>
-                                <b>
-                                    <a>385</a>
-                                    <b>586</b>
-                                    <v>3</v>
-                                </b>
-                                <b>
-                                    <a>606</a>
-                                    <b>1154</b>
-                                    <v>3</v>
-                                </b>
-                                <b>
-                                    <a>1719</a>
-                                    <b>5672</b>
-                                    <v>3</v>
-                                </b>
-                                <b>
-                                    <a>5912</a>
-                                    <b>9226</b>
-                                    <v>3</v>
-                                </b>
-                                <b>
-                                    <a>18820</a>
-                                    <b>18821</b>
-                                    <v>1</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>kind</src>
-                    <trg>idx</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>5</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
+                                    <a>4</a>
                                     <b>5</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>5</a>
-                                    <b>8</b>
-                                    <v>3</v>
-                                </b>
-                                <b>
-                                    <a>8</a>
-                                    <b>9</b>
-                                    <v>3</v>
-                                </b>
-                                <b>
-                                    <a>9</a>
-                                    <b>13</b>
-                                    <v>3</v>
-                                </b>
-                                <b>
-                                    <a>13</a>
-                                    <b>16</b>
-                                    <v>3</v>
-                                </b>
-                                <b>
-                                    <a>16</a>
-                                    <b>17</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>17</a>
-                                    <b>27</b>
-                                    <v>3</v>
-                                </b>
-                                <b>
-                                    <a>27</a>
-                                    <b>33</b>
-                                    <v>3</v>
-                                </b>
-                                <b>
-                                    <a>44</a>
-                                    <b>47</b>
-                                    <v>3</v>
-                                </b>
-                                <b>
-                                    <a>55</a>
-                                    <b>82</b>
-                                    <v>2</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>parent</src>
-                    <trg>id</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>29362</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>6137</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>5</b>
-                                    <v>3650</v>
-                                </b>
-                                <b>
-                                    <a>5</a>
-                                    <b>82</b>
-                                    <v>2394</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>parent</src>
-                    <trg>kind</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>31418</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>5760</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>5</b>
-                                    <v>3597</v>
-                                </b>
-                                <b>
-                                    <a>5</a>
-                                    <b>11</b>
-                                    <v>768</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>parent</src>
-                    <trg>idx</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>29362</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>6137</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>5</b>
-                                    <v>3650</v>
-                                </b>
-                                <b>
-                                    <a>5</a>
-                                    <b>82</b>
-                                    <v>2394</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>idx</src>
-                    <trg>id</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>6</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>20</v>
+                                    <v>3214</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>3</v>
-                                </b>
-                                <b>
-                                    <a>7</a>
-                                    <b>8</b>
-                                    <v>11</v>
-                                </b>
-                                <b>
-                                    <a>10</a>
-                                    <b>15</b>
-                                    <v>7</v>
-                                </b>
-                                <b>
-                                    <a>15</a>
-                                    <b>27</b>
-                                    <v>7</v>
-                                </b>
-                                <b>
-                                    <a>27</a>
-                                    <b>70</b>
-                                    <v>7</v>
-                                </b>
-                                <b>
-                                    <a>85</a>
-                                    <b>262</b>
-                                    <v>7</v>
-                                </b>
-                                <b>
-                                    <a>314</a>
-                                    <b>1279</b>
-                                    <v>7</v>
-                                </b>
-                                <b>
-                                    <a>1720</a>
-                                    <b>24879</b>
-                                    <v>6</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>idx</src>
-                    <trg>kind</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>22</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>5</b>
-                                    <v>7</v>
-                                </b>
-                                <b>
-                                    <a>5</a>
-                                    <b>6</b>
-                                    <v>6</v>
+                                    <v>1607</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>7</b>
-                                    <v>4</v>
+                                    <v>1607</v>
                                 </b>
                                 <b>
                                     <a>7</a>
-                                    <b>9</b>
-                                    <v>7</v>
+                                    <b>8</b>
+                                    <v>1607</v>
                                 </b>
                                 <b>
-                                    <a>9</a>
-                                    <b>13</b>
-                                    <v>7</v>
+                                    <a>8</a>
+                                    <b>9</b>
+                                    <v>1607</v>
+                                </b>
+                                <b>
+                                    <a>11</a>
+                                    <b>12</b>
+                                    <v>1607</v>
                                 </b>
                                 <b>
                                     <a>13</a>
+                                    <b>14</b>
+                                    <v>1607</v>
+                                </b>
+                                <b>
+                                    <a>14</a>
+                                    <b>15</b>
+                                    <v>1607</v>
+                                </b>
+                                <b>
+                                    <a>17</a>
                                     <b>18</b>
-                                    <v>7</v>
+                                    <v>1607</v>
+                                </b>
+                                <b>
+                                    <a>33</a>
+                                    <b>34</b>
+                                    <v>1607</v>
+                                </b>
+                                <b>
+                                    <a>95</a>
+                                    <b>96</b>
+                                    <v>1607</v>
+                                </b>
+                                <b>
+                                    <a>106</a>
+                                    <b>107</b>
+                                    <v>1607</v>
+                                </b>
+                                <b>
+                                    <a>177</a>
+                                    <b>178</b>
+                                    <v>1607</v>
+                                </b>
+                                <b>
+                                    <a>191</a>
+                                    <b>192</b>
+                                    <v>1607</v>
+                                </b>
+                                <b>
+                                    <a>208</a>
+                                    <b>209</b>
+                                    <v>1607</v>
+                                </b>
+                                <b>
+                                    <a>289</a>
+                                    <b>290</b>
+                                    <v>1607</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>kind</src>
+                    <trg>parent</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>1607</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>1607</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>1607</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>5</b>
+                                    <v>4821</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
+                                    <b>6</b>
+                                    <v>1607</v>
+                                </b>
+                                <b>
+                                    <a>6</a>
+                                    <b>7</b>
+                                    <v>1607</v>
+                                </b>
+                                <b>
+                                    <a>7</a>
+                                    <b>8</b>
+                                    <v>1607</v>
+                                </b>
+                                <b>
+                                    <a>12</a>
+                                    <b>13</b>
+                                    <v>1607</v>
+                                </b>
+                                <b>
+                                    <a>13</a>
+                                    <b>14</b>
+                                    <v>1607</v>
+                                </b>
+                                <b>
+                                    <a>15</a>
+                                    <b>16</b>
+                                    <v>1607</v>
+                                </b>
+                                <b>
+                                    <a>17</a>
+                                    <b>18</b>
+                                    <v>1607</v>
+                                </b>
+                                <b>
+                                    <a>75</a>
+                                    <b>76</b>
+                                    <v>1607</v>
+                                </b>
+                                <b>
+                                    <a>88</a>
+                                    <b>89</b>
+                                    <v>1607</v>
+                                </b>
+                                <b>
+                                    <a>92</a>
+                                    <b>93</b>
+                                    <v>1607</v>
+                                </b>
+                                <b>
+                                    <a>106</a>
+                                    <b>107</b>
+                                    <v>1607</v>
+                                </b>
+                                <b>
+                                    <a>154</a>
+                                    <b>155</b>
+                                    <v>1607</v>
+                                </b>
+                                <b>
+                                    <a>274</a>
+                                    <b>275</b>
+                                    <v>1607</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>kind</src>
+                    <trg>idx</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>3214</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>1607</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>9643</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>5</b>
+                                    <v>3214</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
+                                    <b>6</b>
+                                    <v>1607</v>
+                                </b>
+                                <b>
+                                    <a>9</a>
+                                    <b>10</b>
+                                    <v>1607</v>
+                                </b>
+                                <b>
+                                    <a>12</a>
+                                    <b>13</b>
+                                    <v>1607</v>
+                                </b>
+                                <b>
+                                    <a>13</a>
+                                    <b>14</b>
+                                    <v>1607</v>
+                                </b>
+                                <b>
+                                    <a>15</a>
+                                    <b>16</b>
+                                    <v>3214</v>
+                                </b>
+                                <b>
+                                    <a>16</a>
+                                    <b>17</b>
+                                    <v>1607</v>
                                 </b>
                                 <b>
                                     <a>20</a>
-                                    <b>28</b>
-                                    <v>6</v>
+                                    <b>21</b>
+                                    <v>1607</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>parent</src>
+                    <trg>id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>622030</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>162338</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>5</b>
+                                    <v>85187</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
+                                    <b>22</b>
+                                    <v>65899</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>parent</src>
+                    <trg>kind</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>683108</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>155909</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>6</b>
+                                    <v>72329</v>
+                                </b>
+                                <b>
+                                    <a>6</a>
+                                    <b>8</b>
+                                    <v>24109</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>parent</src>
+                    <trg>idx</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>622030</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>162338</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>5</b>
+                                    <v>85187</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
+                                    <b>22</b>
+                                    <v>65899</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>idx</src>
+                    <trg>id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>1607</v>
+                                </b>
+                                <b>
+                                    <a>6</a>
+                                    <b>7</b>
+                                    <v>4821</v>
+                                </b>
+                                <b>
+                                    <a>7</a>
+                                    <b>8</b>
+                                    <v>3214</v>
+                                </b>
+                                <b>
+                                    <a>8</a>
+                                    <b>9</b>
+                                    <v>1607</v>
+                                </b>
+                                <b>
+                                    <a>10</a>
+                                    <b>11</b>
+                                    <v>1607</v>
+                                </b>
+                                <b>
+                                    <a>11</a>
+                                    <b>12</b>
+                                    <v>3214</v>
+                                </b>
+                                <b>
+                                    <a>17</a>
+                                    <b>18</b>
+                                    <v>1607</v>
+                                </b>
+                                <b>
+                                    <a>19</a>
+                                    <b>20</b>
+                                    <v>1607</v>
+                                </b>
+                                <b>
+                                    <a>20</a>
+                                    <b>21</b>
+                                    <v>1607</v>
+                                </b>
+                                <b>
+                                    <a>25</a>
+                                    <b>26</b>
+                                    <v>1607</v>
                                 </b>
                                 <b>
                                     <a>29</a>
-                                    <b>34</b>
-                                    <v>3</v>
+                                    <b>30</b>
+                                    <v>1607</v>
+                                </b>
+                                <b>
+                                    <a>37</a>
+                                    <b>38</b>
+                                    <v>1607</v>
+                                </b>
+                                <b>
+                                    <a>41</a>
+                                    <b>42</b>
+                                    <v>1607</v>
+                                </b>
+                                <b>
+                                    <a>98</a>
+                                    <b>99</b>
+                                    <v>1607</v>
+                                </b>
+                                <b>
+                                    <a>167</a>
+                                    <b>168</b>
+                                    <v>1607</v>
+                                </b>
+                                <b>
+                                    <a>331</a>
+                                    <b>332</b>
+                                    <v>1607</v>
+                                </b>
+                                <b>
+                                    <a>335</a>
+                                    <b>336</b>
+                                    <v>1607</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>idx</src>
+                    <trg>kind</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>3214</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>1607</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>3214</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>5</b>
+                                    <v>4821</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
+                                    <b>6</b>
+                                    <v>4821</v>
+                                </b>
+                                <b>
+                                    <a>6</a>
+                                    <b>7</b>
+                                    <v>1607</v>
+                                </b>
+                                <b>
+                                    <a>7</a>
+                                    <b>8</b>
+                                    <v>3214</v>
+                                </b>
+                                <b>
+                                    <a>8</a>
+                                    <b>9</b>
+                                    <v>1607</v>
+                                </b>
+                                <b>
+                                    <a>9</a>
+                                    <b>10</b>
+                                    <v>3214</v>
+                                </b>
+                                <b>
+                                    <a>10</a>
+                                    <b>11</b>
+                                    <v>1607</v>
+                                </b>
+                                <b>
+                                    <a>12</a>
+                                    <b>13</b>
+                                    <v>1607</v>
+                                </b>
+                                <b>
+                                    <a>14</a>
+                                    <b>15</b>
+                                    <v>1607</v>
+                                </b>
+                                <b>
+                                    <a>16</a>
+                                    <b>17</b>
+                                    <v>1607</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10844,52 +11177,87 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6</v>
+                                    <v>1607</v>
                                 </b>
                                 <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>20</v>
-                                </b>
-                                <b>
-                                    <a>5</a>
-                                    <b>6</b>
-                                    <v>3</v>
+                                    <a>6</a>
+                                    <b>7</b>
+                                    <v>4821</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>8</b>
-                                    <v>11</v>
+                                    <v>3214</v>
+                                </b>
+                                <b>
+                                    <a>8</a>
+                                    <b>9</b>
+                                    <v>1607</v>
                                 </b>
                                 <b>
                                     <a>10</a>
-                                    <b>15</b>
-                                    <v>7</v>
+                                    <b>11</b>
+                                    <v>1607</v>
                                 </b>
                                 <b>
-                                    <a>15</a>
-                                    <b>27</b>
-                                    <v>7</v>
+                                    <a>11</a>
+                                    <b>12</b>
+                                    <v>3214</v>
                                 </b>
                                 <b>
-                                    <a>27</a>
-                                    <b>70</b>
-                                    <v>7</v>
+                                    <a>17</a>
+                                    <b>18</b>
+                                    <v>1607</v>
                                 </b>
                                 <b>
-                                    <a>85</a>
-                                    <b>262</b>
-                                    <v>7</v>
+                                    <a>19</a>
+                                    <b>20</b>
+                                    <v>1607</v>
                                 </b>
                                 <b>
-                                    <a>314</a>
-                                    <b>1279</b>
-                                    <v>7</v>
+                                    <a>20</a>
+                                    <b>21</b>
+                                    <v>1607</v>
                                 </b>
                                 <b>
-                                    <a>1720</a>
-                                    <b>24879</b>
-                                    <v>6</v>
+                                    <a>25</a>
+                                    <b>26</b>
+                                    <v>1607</v>
+                                </b>
+                                <b>
+                                    <a>29</a>
+                                    <b>30</b>
+                                    <v>1607</v>
+                                </b>
+                                <b>
+                                    <a>37</a>
+                                    <b>38</b>
+                                    <v>1607</v>
+                                </b>
+                                <b>
+                                    <a>41</a>
+                                    <b>42</b>
+                                    <v>1607</v>
+                                </b>
+                                <b>
+                                    <a>98</a>
+                                    <b>99</b>
+                                    <v>1607</v>
+                                </b>
+                                <b>
+                                    <a>167</a>
+                                    <b>168</b>
+                                    <v>1607</v>
+                                </b>
+                                <b>
+                                    <a>331</a>
+                                    <b>332</b>
+                                    <v>1607</v>
+                                </b>
+                                <b>
+                                    <a>335</a>
+                                    <b>336</b>
+                                    <v>1607</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10899,23 +11267,23 @@
         </relation>
         <relation>
             <name>decls</name>
-            <cardinality>8690</cardinality>
+            <cardinality>443378</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>8690</v>
+                    <v>443378</v>
                 </e>
                 <e>
                     <k>kind</k>
-                    <v>5</v>
+                    <v>528</v>
                 </e>
                 <e>
                     <k>parent</k>
-                    <v>1951</v>
+                    <v>123356</v>
                 </e>
                 <e>
                     <k>idx</k>
-                    <v>226</v>
+                    <v>59475</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -10929,7 +11297,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>8690</v>
+                                    <v>443378</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10945,7 +11313,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>8690</v>
+                                    <v>443378</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10961,7 +11329,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>8690</v>
+                                    <v>443378</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10975,29 +11343,34 @@
                             <budget>12</budget>
                             <bs>
                                 <b>
-                                    <a>280</a>
-                                    <b>281</b>
-                                    <v>1</v>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>88</v>
                                 </b>
                                 <b>
-                                    <a>479</a>
-                                    <b>480</b>
-                                    <v>1</v>
+                                    <a>45</a>
+                                    <b>46</b>
+                                    <v>88</v>
                                 </b>
                                 <b>
-                                    <a>1349</a>
-                                    <b>1350</b>
-                                    <v>1</v>
+                                    <a>208</a>
+                                    <b>209</b>
+                                    <v>88</v>
                                 </b>
                                 <b>
-                                    <a>1769</a>
-                                    <b>1770</b>
-                                    <v>1</v>
+                                    <a>421</a>
+                                    <b>422</b>
+                                    <v>88</v>
                                 </b>
                                 <b>
-                                    <a>4813</a>
-                                    <b>4814</b>
-                                    <v>1</v>
+                                    <a>1140</a>
+                                    <b>1141</b>
+                                    <v>88</v>
+                                </b>
+                                <b>
+                                    <a>3216</a>
+                                    <b>3217</b>
+                                    <v>88</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11011,29 +11384,34 @@
                             <budget>12</budget>
                             <bs>
                                 <b>
-                                    <a>196</a>
-                                    <b>197</b>
-                                    <v>1</v>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>88</v>
                                 </b>
                                 <b>
-                                    <a>336</a>
-                                    <b>337</b>
-                                    <v>1</v>
+                                    <a>34</a>
+                                    <b>35</b>
+                                    <v>88</v>
                                 </b>
                                 <b>
-                                    <a>478</a>
-                                    <b>479</b>
-                                    <v>1</v>
+                                    <a>100</a>
+                                    <b>101</b>
+                                    <v>88</v>
                                 </b>
                                 <b>
-                                    <a>483</a>
-                                    <b>484</b>
-                                    <v>1</v>
+                                    <a>421</a>
+                                    <b>422</b>
+                                    <v>88</v>
                                 </b>
                                 <b>
-                                    <a>1566</a>
-                                    <b>1567</b>
-                                    <v>1</v>
+                                    <a>547</a>
+                                    <b>548</b>
+                                    <v>88</v>
+                                </b>
+                                <b>
+                                    <a>882</a>
+                                    <b>883</b>
+                                    <v>88</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11047,29 +11425,29 @@
                             <budget>12</budget>
                             <bs>
                                 <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>1</v>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>176</v>
                                 </b>
                                 <b>
-                                    <a>39</a>
-                                    <b>40</b>
-                                    <v>1</v>
+                                    <a>15</a>
+                                    <b>16</b>
+                                    <v>88</v>
                                 </b>
                                 <b>
-                                    <a>105</a>
-                                    <b>106</b>
-                                    <v>1</v>
+                                    <a>26</a>
+                                    <b>27</b>
+                                    <v>88</v>
                                 </b>
                                 <b>
-                                    <a>219</a>
-                                    <b>220</b>
-                                    <v>1</v>
+                                    <a>237</a>
+                                    <b>238</b>
+                                    <v>88</v>
                                 </b>
                                 <b>
-                                    <a>225</a>
-                                    <b>226</b>
-                                    <v>1</v>
+                                    <a>675</a>
+                                    <b>676</b>
+                                    <v>88</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11085,27 +11463,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1460</v>
+                                    <v>80886</v>
                                 </b>
                                 <b>
                                     <a>2</a>
-                                    <b>6</b>
-                                    <v>149</v>
+                                    <b>3</b>
+                                    <v>16476</v>
                                 </b>
                                 <b>
-                                    <a>6</a>
+                                    <a>3</a>
+                                    <b>5</b>
+                                    <v>9956</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
                                     <b>12</b>
-                                    <v>155</v>
+                                    <v>9956</v>
                                 </b>
                                 <b>
                                     <a>12</a>
-                                    <b>36</b>
-                                    <v>147</v>
-                                </b>
-                                <b>
-                                    <a>36</a>
-                                    <b>227</b>
-                                    <v>40</v>
+                                    <b>676</b>
+                                    <v>6079</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11121,27 +11499,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1463</v>
+                                    <v>83089</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>111</v>
+                                    <v>31632</v>
                                 </b>
                                 <b>
                                     <a>3</a>
-                                    <b>4</b>
-                                    <v>185</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>5</b>
-                                    <v>141</v>
-                                </b>
-                                <b>
-                                    <a>5</a>
                                     <b>6</b>
-                                    <v>51</v>
+                                    <v>8634</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11157,27 +11525,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1460</v>
+                                    <v>80886</v>
                                 </b>
                                 <b>
                                     <a>2</a>
-                                    <b>6</b>
-                                    <v>149</v>
+                                    <b>3</b>
+                                    <v>16476</v>
                                 </b>
                                 <b>
-                                    <a>6</a>
+                                    <a>3</a>
+                                    <b>5</b>
+                                    <v>9956</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
                                     <b>12</b>
-                                    <v>155</v>
+                                    <v>9956</v>
                                 </b>
                                 <b>
                                     <a>12</a>
-                                    <b>36</b>
-                                    <v>147</v>
-                                </b>
-                                <b>
-                                    <a>36</a>
-                                    <b>227</b>
-                                    <v>40</v>
+                                    <b>676</b>
+                                    <v>6079</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11193,57 +11561,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4</v>
+                                    <v>38592</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>30</v>
+                                    <v>13833</v>
                                 </b>
                                 <b>
                                     <a>3</a>
-                                    <b>4</b>
-                                    <v>18</v>
+                                    <b>17</b>
+                                    <v>4581</v>
                                 </b>
                                 <b>
-                                    <a>4</a>
-                                    <b>5</b>
-                                    <v>66</v>
-                                </b>
-                                <b>
-                                    <a>5</a>
-                                    <b>6</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>6</a>
-                                    <b>7</b>
-                                    <v>31</v>
-                                </b>
-                                <b>
-                                    <a>7</a>
-                                    <b>11</b>
-                                    <v>17</v>
-                                </b>
-                                <b>
-                                    <a>11</a>
-                                    <b>31</b>
-                                    <v>17</v>
-                                </b>
-                                <b>
-                                    <a>31</a>
-                                    <b>65</b>
-                                    <v>17</v>
-                                </b>
-                                <b>
-                                    <a>67</a>
-                                    <b>275</b>
-                                    <v>17</v>
-                                </b>
-                                <b>
-                                    <a>323</a>
-                                    <b>1952</b>
-                                    <v>7</v>
+                                    <a>19</a>
+                                    <b>1401</b>
+                                    <v>2467</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11259,27 +11592,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7</v>
+                                    <v>38592</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>113</v>
+                                    <v>18503</v>
                                 </b>
                                 <b>
                                     <a>3</a>
-                                    <b>4</b>
-                                    <v>69</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>5</b>
-                                    <v>35</v>
-                                </b>
-                                <b>
-                                    <a>5</a>
-                                    <b>6</b>
-                                    <v>2</v>
+                                    <b>7</b>
+                                    <v>2379</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11295,57 +11618,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4</v>
+                                    <v>38592</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>30</v>
+                                    <v>13833</v>
                                 </b>
                                 <b>
                                     <a>3</a>
-                                    <b>4</b>
-                                    <v>18</v>
+                                    <b>17</b>
+                                    <v>4581</v>
                                 </b>
                                 <b>
-                                    <a>4</a>
-                                    <b>5</b>
-                                    <v>66</v>
-                                </b>
-                                <b>
-                                    <a>5</a>
-                                    <b>6</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>6</a>
-                                    <b>7</b>
-                                    <v>31</v>
-                                </b>
-                                <b>
-                                    <a>7</a>
-                                    <b>11</b>
-                                    <v>17</v>
-                                </b>
-                                <b>
-                                    <a>11</a>
-                                    <b>31</b>
-                                    <v>17</v>
-                                </b>
-                                <b>
-                                    <a>31</a>
-                                    <b>65</b>
-                                    <v>17</v>
-                                </b>
-                                <b>
-                                    <a>67</a>
-                                    <b>275</b>
-                                    <v>17</v>
-                                </b>
-                                <b>
-                                    <a>323</a>
-                                    <b>1952</b>
-                                    <v>7</v>
+                                    <a>19</a>
+                                    <b>1401</b>
+                                    <v>2467</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11355,23 +11643,23 @@
         </relation>
         <relation>
             <name>specs</name>
-            <cardinality>7889</cardinality>
+            <cardinality>397829</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>7889</v>
+                    <v>397829</v>
                 </e>
                 <e>
                     <k>kind</k>
-                    <v>4</v>
+                    <v>5234</v>
                 </e>
                 <e>
                     <k>parent</k>
-                    <v>3877</v>
+                    <v>193680</v>
                 </e>
                 <e>
                     <k>idx</k>
-                    <v>108</v>
+                    <v>31407</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -11385,7 +11673,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7889</v>
+                                    <v>397829</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11401,7 +11689,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7889</v>
+                                    <v>397829</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11417,7 +11705,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7889</v>
+                                    <v>397829</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11431,24 +11719,19 @@
                             <budget>12</budget>
                             <bs>
                                 <b>
-                                    <a>16</a>
-                                    <b>17</b>
-                                    <v>1</v>
+                                    <a>18</a>
+                                    <b>19</b>
+                                    <v>1744</v>
                                 </b>
                                 <b>
-                                    <a>1349</a>
-                                    <b>1350</b>
-                                    <v>1</v>
+                                    <a>70</a>
+                                    <b>71</b>
+                                    <v>1744</v>
                                 </b>
                                 <b>
-                                    <a>3056</a>
-                                    <b>3057</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>3468</a>
-                                    <b>3469</b>
-                                    <v>1</v>
+                                    <a>140</a>
+                                    <b>141</b>
+                                    <v>1744</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11462,24 +11745,19 @@
                             <budget>12</budget>
                             <bs>
                                 <b>
-                                    <a>16</a>
-                                    <b>17</b>
-                                    <v>1</v>
+                                    <a>18</a>
+                                    <b>19</b>
+                                    <v>1744</v>
                                 </b>
                                 <b>
-                                    <a>479</a>
-                                    <b>480</b>
-                                    <v>1</v>
+                                    <a>23</a>
+                                    <b>24</b>
+                                    <v>1744</v>
                                 </b>
                                 <b>
-                                    <a>1333</a>
-                                    <b>1334</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>2049</a>
-                                    <b>2050</b>
-                                    <v>1</v>
+                                    <a>70</a>
+                                    <b>71</b>
+                                    <v>1744</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11495,53 +11773,43 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1</v>
+                                    <v>3489</v>
+                                </b>
+                                <b>
+                                    <a>18</a>
+                                    <b>19</b>
+                                    <v>1744</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>parent</src>
+                    <trg>id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>157037</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>5</b>
+                                    <v>15703</v>
+                                </b>
+                                <b>
+                                    <a>6</a>
+                                    <b>11</b>
+                                    <v>15703</v>
                                 </b>
                                 <b>
                                     <a>14</a>
-                                    <b>15</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>36</a>
-                                    <b>37</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>108</a>
-                                    <b>109</b>
-                                    <v>1</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>parent</src>
-                    <trg>id</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>3206</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>6</b>
-                                    <v>343</v>
-                                </b>
-                                <b>
-                                    <a>6</a>
-                                    <b>18</b>
-                                    <v>298</v>
-                                </b>
-                                <b>
-                                    <a>18</a>
-                                    <b>109</b>
-                                    <v>30</v>
+                                    <b>19</b>
+                                    <v>5234</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11557,7 +11825,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3877</v>
+                                    <v>193680</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11573,22 +11841,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3206</v>
+                                    <v>157037</v>
                                 </b>
                                 <b>
                                     <a>2</a>
-                                    <b>6</b>
-                                    <v>343</v>
+                                    <b>5</b>
+                                    <v>15703</v>
                                 </b>
                                 <b>
                                     <a>6</a>
-                                    <b>18</b>
-                                    <v>298</v>
+                                    <b>11</b>
+                                    <v>15703</v>
                                 </b>
                                 <b>
-                                    <a>18</a>
-                                    <b>109</b>
-                                    <v>30</v>
+                                    <a>14</a>
+                                    <b>19</b>
+                                    <v>5234</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11604,63 +11872,68 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>53</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>19</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>6</b>
-                                    <v>9</v>
-                                </b>
-                                <b>
-                                    <a>6</a>
-                                    <b>28</b>
-                                    <v>9</v>
-                                </b>
-                                <b>
-                                    <a>30</a>
-                                    <b>156</b>
-                                    <v>9</v>
-                                </b>
-                                <b>
-                                    <a>188</a>
-                                    <b>3878</b>
-                                    <v>9</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>idx</src>
-                    <trg>kind</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>72</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>22</v>
+                                    <v>6979</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>13</v>
+                                    <v>6979</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>1</v>
+                                    <v>3489</v>
+                                </b>
+                                <b>
+                                    <a>9</a>
+                                    <b>10</b>
+                                    <v>3489</v>
+                                </b>
+                                <b>
+                                    <a>12</a>
+                                    <b>13</b>
+                                    <v>3489</v>
+                                </b>
+                                <b>
+                                    <a>14</a>
+                                    <b>15</b>
+                                    <v>1744</v>
+                                </b>
+                                <b>
+                                    <a>16</a>
+                                    <b>17</b>
+                                    <v>1744</v>
+                                </b>
+                                <b>
+                                    <a>21</a>
+                                    <b>22</b>
+                                    <v>1744</v>
+                                </b>
+                                <b>
+                                    <a>111</a>
+                                    <b>112</b>
+                                    <v>1744</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>idx</src>
+                    <trg>kind</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>29662</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>1744</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11676,32 +11949,47 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>53</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>19</v>
+                                    <v>6979</v>
                                 </b>
                                 <b>
                                     <a>3</a>
-                                    <b>6</b>
-                                    <v>9</v>
+                                    <b>4</b>
+                                    <v>6979</v>
                                 </b>
                                 <b>
-                                    <a>6</a>
-                                    <b>28</b>
-                                    <v>9</v>
+                                    <a>4</a>
+                                    <b>5</b>
+                                    <v>3489</v>
                                 </b>
                                 <b>
-                                    <a>30</a>
-                                    <b>156</b>
-                                    <v>9</v>
+                                    <a>9</a>
+                                    <b>10</b>
+                                    <v>3489</v>
                                 </b>
                                 <b>
-                                    <a>188</a>
-                                    <b>3878</b>
-                                    <v>9</v>
+                                    <a>12</a>
+                                    <b>13</b>
+                                    <v>3489</v>
+                                </b>
+                                <b>
+                                    <a>14</a>
+                                    <b>15</b>
+                                    <v>1744</v>
+                                </b>
+                                <b>
+                                    <a>16</a>
+                                    <b>17</b>
+                                    <v>1744</v>
+                                </b>
+                                <b>
+                                    <a>21</a>
+                                    <b>22</b>
+                                    <v>1744</v>
+                                </b>
+                                <b>
+                                    <a>111</a>
+                                    <b>112</b>
+                                    <v>1744</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11711,15 +11999,15 @@
         </relation>
         <relation>
             <name>scopes</name>
-            <cardinality>36775</cardinality>
+            <cardinality>1519778</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>36775</v>
+                    <v>1519778</v>
                 </e>
                 <e>
                     <k>kind</k>
-                    <v>3</v>
+                    <v>5234</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -11733,7 +12021,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>36775</v>
+                                    <v>1519778</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11749,17 +12037,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1</v>
+                                    <v>1744</v>
                                 </b>
                                 <b>
-                                    <a>346</a>
-                                    <b>347</b>
-                                    <v>1</v>
+                                    <a>340</a>
+                                    <b>341</b>
+                                    <v>1744</v>
                                 </b>
                                 <b>
-                                    <a>36428</a>
-                                    <b>36429</b>
-                                    <v>1</v>
+                                    <a>530</a>
+                                    <b>531</b>
+                                    <v>1744</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11769,15 +12057,15 @@
         </relation>
         <relation>
             <name>scopenesting</name>
-            <cardinality>36774</cardinality>
+            <cardinality>1518033</cardinality>
             <columnsizes>
                 <e>
                     <k>inner</k>
-                    <v>36774</v>
+                    <v>1518033</v>
                 </e>
                 <e>
                     <k>outer</k>
-                    <v>21713</v>
+                    <v>397829</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -11791,7 +12079,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>36774</v>
+                                    <v>1518033</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11807,22 +12095,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>16964</v>
+                                    <v>280923</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>2474</v>
+                                    <v>71539</v>
                                 </b>
                                 <b>
                                     <a>3</a>
-                                    <b>7</b>
-                                    <v>1759</v>
+                                    <b>5</b>
+                                    <v>34897</v>
                                 </b>
                                 <b>
-                                    <a>7</a>
-                                    <b>347</b>
-                                    <v>516</v>
+                                    <a>5</a>
+                                    <b>531</b>
+                                    <v>10469</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11832,15 +12120,15 @@
         </relation>
         <relation>
             <name>scopenodes</name>
-            <cardinality>36428</cardinality>
+            <cardinality>919952</cardinality>
             <columnsizes>
                 <e>
                     <k>node</k>
-                    <v>36428</v>
+                    <v>919952</v>
                 </e>
                 <e>
                     <k>scope</k>
-                    <v>36428</v>
+                    <v>919952</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -11854,7 +12142,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>36428</v>
+                                    <v>919952</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11870,7 +12158,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>36428</v>
+                                    <v>919952</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11880,19 +12168,19 @@
         </relation>
         <relation>
             <name>objects</name>
-            <cardinality>84909</cardinality>
+            <cardinality>260849313</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>84909</v>
+                    <v>260849313</v>
                 </e>
                 <e>
                     <k>kind</k>
-                    <v>9</v>
+                    <v>32863</v>
                 </e>
                 <e>
                     <k>name</k>
-                    <v>30576</v>
+                    <v>153297959</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -11906,7 +12194,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>84909</v>
+                                    <v>260849313</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11922,7 +12210,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>84909</v>
+                                    <v>260849313</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11938,47 +12226,42 @@
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>1</v>
+                                    <v>4107</v>
                                 </b>
                                 <b>
-                                    <a>18</a>
-                                    <b>19</b>
-                                    <v>1</v>
+                                    <a>22</a>
+                                    <b>23</b>
+                                    <v>4107</v>
                                 </b>
                                 <b>
-                                    <a>20</a>
-                                    <b>21</b>
-                                    <v>1</v>
+                                    <a>26</a>
+                                    <b>27</b>
+                                    <v>4107</v>
                                 </b>
                                 <b>
-                                    <a>49</a>
-                                    <b>50</b>
-                                    <v>1</v>
+                                    <a>33</a>
+                                    <b>34</b>
+                                    <v>4107</v>
                                 </b>
                                 <b>
-                                    <a>3468</a>
-                                    <b>3469</b>
-                                    <v>1</v>
+                                    <a>3147</a>
+                                    <b>3148</b>
+                                    <v>4107</v>
                                 </b>
                                 <b>
-                                    <a>3602</a>
-                                    <b>3603</b>
-                                    <v>1</v>
+                                    <a>17646</a>
+                                    <b>17647</b>
+                                    <v>4107</v>
                                 </b>
                                 <b>
-                                    <a>8857</a>
-                                    <b>8858</b>
-                                    <v>1</v>
+                                    <a>19579</a>
+                                    <b>19580</b>
+                                    <v>4107</v>
                                 </b>
                                 <b>
-                                    <a>17793</a>
-                                    <b>17794</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>51098</a>
-                                    <b>51099</b>
-                                    <v>1</v>
+                                    <a>23041</a>
+                                    <b>23042</b>
+                                    <v>4107</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11994,47 +12277,42 @@
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>1</v>
+                                    <v>4107</v>
                                 </b>
                                 <b>
-                                    <a>18</a>
-                                    <b>19</b>
-                                    <v>1</v>
+                                    <a>22</a>
+                                    <b>23</b>
+                                    <v>4107</v>
                                 </b>
                                 <b>
-                                    <a>20</a>
-                                    <b>21</b>
-                                    <v>1</v>
+                                    <a>23</a>
+                                    <b>24</b>
+                                    <v>4107</v>
                                 </b>
                                 <b>
-                                    <a>38</a>
-                                    <b>39</b>
-                                    <v>1</v>
+                                    <a>26</a>
+                                    <b>27</b>
+                                    <v>4107</v>
                                 </b>
                                 <b>
-                                    <a>203</a>
-                                    <b>204</b>
-                                    <v>1</v>
+                                    <a>2654</a>
+                                    <b>2655</b>
+                                    <v>4107</v>
                                 </b>
                                 <b>
-                                    <a>3004</a>
-                                    <b>3005</b>
-                                    <v>1</v>
+                                    <a>7829</a>
+                                    <b>7830</b>
+                                    <v>4107</v>
                                 </b>
                                 <b>
-                                    <a>8418</a>
-                                    <b>8419</b>
-                                    <v>1</v>
+                                    <a>10951</a>
+                                    <b>10952</b>
+                                    <v>4107</v>
                                 </b>
                                 <b>
-                                    <a>10132</a>
-                                    <b>10133</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>10913</a>
-                                    <b>10914</b>
-                                    <v>1</v>
+                                    <a>17127</a>
+                                    <b>17128</b>
+                                    <v>4107</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12050,22 +12328,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>25286</v>
+                                    <v>124595415</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>2613</v>
+                                    <v>20954870</v>
                                 </b>
                                 <b>
                                     <a>3</a>
-                                    <b>20</b>
-                                    <v>2304</v>
-                                </b>
-                                <b>
-                                    <a>20</a>
-                                    <b>2222</b>
-                                    <v>373</v>
+                                    <b>1189</b>
+                                    <v>7747674</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12081,12 +12354,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>28809</v>
+                                    <v>148692899</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>6</b>
-                                    <v>1767</v>
+                                    <v>4605059</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12096,15 +12369,15 @@
         </relation>
         <relation>
             <name>objectscopes</name>
-            <cardinality>54774</cardinality>
+            <cardinality>140464590</cardinality>
             <columnsizes>
                 <e>
                     <k>object</k>
-                    <v>54774</v>
+                    <v>140464590</v>
                 </e>
                 <e>
                     <k>scope</k>
-                    <v>13947</v>
+                    <v>1068078</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -12118,7 +12391,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>54774</v>
+                                    <v>140464590</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12134,32 +12407,72 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7112</v>
+                                    <v>73943</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>2972</v>
+                                    <v>57511</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>1274</v>
+                                    <v>69835</v>
                                 </b>
                                 <b>
                                     <a>4</a>
-                                    <b>6</b>
-                                    <v>1264</v>
+                                    <b>7</b>
+                                    <v>86267</v>
                                 </b>
                                 <b>
-                                    <a>6</a>
-                                    <b>15</b>
-                                    <v>1055</v>
+                                    <a>7</a>
+                                    <b>13</b>
+                                    <v>82159</v>
                                 </b>
                                 <b>
-                                    <a>15</a>
-                                    <b>2694</b>
-                                    <v>270</v>
+                                    <a>13</a>
+                                    <b>18</b>
+                                    <v>86267</v>
+                                </b>
+                                <b>
+                                    <a>18</a>
+                                    <b>24</b>
+                                    <v>86267</v>
+                                </b>
+                                <b>
+                                    <a>24</a>
+                                    <b>35</b>
+                                    <v>86267</v>
+                                </b>
+                                <b>
+                                    <a>35</a>
+                                    <b>48</b>
+                                    <v>82159</v>
+                                </b>
+                                <b>
+                                    <a>48</a>
+                                    <b>62</b>
+                                    <v>82159</v>
+                                </b>
+                                <b>
+                                    <a>63</a>
+                                    <b>106</b>
+                                    <v>82159</v>
+                                </b>
+                                <b>
+                                    <a>108</a>
+                                    <b>186</b>
+                                    <v>82159</v>
+                                </b>
+                                <b>
+                                    <a>206</a>
+                                    <b>689</b>
+                                    <v>82159</v>
+                                </b>
+                                <b>
+                                    <a>711</a>
+                                    <b>10035</b>
+                                    <v>28755</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12169,15 +12482,15 @@
         </relation>
         <relation>
             <name>objecttypes</name>
-            <cardinality>84907</cardinality>
+            <cardinality>258988392</cardinality>
             <columnsizes>
                 <e>
                     <k>object</k>
-                    <v>84907</v>
+                    <v>258988392</v>
                 </e>
                 <e>
                     <k>tp</k>
-                    <v>13462</v>
+                    <v>47738981</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -12191,7 +12504,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>84907</v>
+                                    <v>258988392</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12207,32 +12520,32 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7893</v>
+                                    <v>29216043</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>2114</v>
+                                    <v>7813401</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>892</v>
+                                    <v>3039914</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>7</b>
-                                    <v>1190</v>
+                                    <v>3730057</v>
                                 </b>
                                 <b>
                                     <a>7</a>
-                                    <b>25</b>
-                                    <v>1011</v>
+                                    <b>53</b>
+                                    <v>3582169</v>
                                 </b>
                                 <b>
-                                    <a>25</a>
-                                    <b>4267</b>
-                                    <v>362</v>
+                                    <a>53</a>
+                                    <b>13253</b>
+                                    <v>357395</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12242,15 +12555,15 @@
         </relation>
         <relation>
             <name>methodreceivers</name>
-            <cardinality>9873</cardinality>
+            <cardinality>70035448</cardinality>
             <columnsizes>
                 <e>
                     <k>method</k>
-                    <v>9873</v>
+                    <v>70035448</v>
                 </e>
                 <e>
                     <k>receiver</k>
-                    <v>9873</v>
+                    <v>70035448</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -12264,7 +12577,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9873</v>
+                                    <v>70035448</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12280,7 +12593,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9873</v>
+                                    <v>70035448</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12290,15 +12603,15 @@
         </relation>
         <relation>
             <name>fieldstructs</name>
-            <cardinality>10934</cardinality>
+            <cardinality>41038845</cardinality>
             <columnsizes>
                 <e>
                     <k>field</k>
-                    <v>10934</v>
+                    <v>41038845</v>
                 </e>
                 <e>
                     <k>struct</k>
-                    <v>2408</v>
+                    <v>8035233</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -12312,7 +12625,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>10934</v>
+                                    <v>41038845</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12328,42 +12641,42 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>260</v>
+                                    <v>936622</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>677</v>
+                                    <v>2033456</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>468</v>
+                                    <v>1425473</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>292</v>
+                                    <v>1031106</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>194</v>
+                                    <v>640846</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>8</b>
-                                    <v>208</v>
+                                    <v>694250</v>
                                 </b>
                                 <b>
                                     <a>8</a>
-                                    <b>13</b>
-                                    <v>199</v>
+                                    <b>12</b>
+                                    <v>681926</v>
                                 </b>
                                 <b>
-                                    <a>13</a>
-                                    <b>65</b>
-                                    <v>110</v>
+                                    <a>12</a>
+                                    <b>80</b>
+                                    <v>591550</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12373,15 +12686,15 @@
         </relation>
         <relation>
             <name>methodhosts</name>
-            <cardinality>838</cardinality>
+            <cardinality>8181678</cardinality>
             <columnsizes>
                 <e>
                     <k>method</k>
-                    <v>699</v>
+                    <v>5569613</v>
                 </e>
                 <e>
                     <k>host</k>
-                    <v>258</v>
+                    <v>1579104</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -12395,17 +12708,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>625</v>
+                                    <v>4430215</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>56</v>
+                                    <v>509500</v>
                                 </b>
                                 <b>
                                     <a>3</a>
-                                    <b>16</b>
-                                    <v>18</v>
+                                    <b>4</b>
+                                    <v>122140</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>5</b>
+                                    <v>439706</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
+                                    <b>28</b>
+                                    <v>68049</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12421,37 +12744,42 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>99</v>
+                                    <v>645600</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>56</v>
+                                    <v>272199</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>37</v>
+                                    <v>158782</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>20</v>
+                                    <v>90733</v>
                                 </b>
                                 <b>
                                     <a>5</a>
-                                    <b>6</b>
-                                    <v>15</v>
+                                    <b>8</b>
+                                    <v>130864</v>
                                 </b>
                                 <b>
-                                    <a>6</a>
+                                    <a>8</a>
                                     <b>11</b>
-                                    <v>21</v>
+                                    <v>123885</v>
                                 </b>
                                 <b>
                                     <a>11</a>
-                                    <b>53</b>
-                                    <v>10</v>
+                                    <b>19</b>
+                                    <v>118650</v>
+                                </b>
+                                <b>
+                                    <a>19</a>
+                                    <b>293</b>
+                                    <v>38387</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12461,15 +12789,15 @@
         </relation>
         <relation>
             <name>defs</name>
-            <cardinality>40703</cardinality>
+            <cardinality>1417649</cardinality>
             <columnsizes>
                 <e>
                     <k>ident</k>
-                    <v>40703</v>
+                    <v>1417649</v>
                 </e>
                 <e>
                     <k>object</k>
-                    <v>40490</v>
+                    <v>1388768</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -12483,7 +12811,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>40703</v>
+                                    <v>1417649</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12499,12 +12827,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>40383</v>
+                                    <v>1370071</v>
                                 </b>
                                 <b>
                                     <a>2</a>
-                                    <b>15</b>
-                                    <v>107</v>
+                                    <b>7</b>
+                                    <v>18697</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12514,15 +12842,15 @@
         </relation>
         <relation>
             <name>uses</name>
-            <cardinality>195902</cardinality>
+            <cardinality>4531459</cardinality>
             <columnsizes>
                 <e>
                     <k>ident</k>
-                    <v>195902</v>
+                    <v>4531459</v>
                 </e>
                 <e>
                     <k>object</k>
-                    <v>41616</v>
+                    <v>802598</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -12536,7 +12864,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>195902</v>
+                                    <v>4531459</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12552,37 +12880,37 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>15493</v>
+                                    <v>294651</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>9727</v>
+                                    <v>231900</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>5056</v>
+                                    <v>77848</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>2974</v>
+                                    <v>50873</v>
                                 </b>
                                 <b>
                                     <a>5</a>
-                                    <b>7</b>
-                                    <v>3203</v>
+                                    <b>8</b>
+                                    <v>68403</v>
                                 </b>
                                 <b>
-                                    <a>7</a>
-                                    <b>14</b>
-                                    <v>3336</v>
+                                    <a>8</a>
+                                    <b>21</b>
+                                    <v>60890</v>
                                 </b>
                                 <b>
-                                    <a>14</a>
-                                    <b>6833</b>
-                                    <v>1827</v>
+                                    <a>21</a>
+                                    <b>3870</b>
+                                    <v>18031</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12592,15 +12920,15 @@
         </relation>
         <relation>
             <name>types</name>
-            <cardinality>18132</cardinality>
+            <cardinality>64230277</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>18132</v>
+                    <v>64230277</v>
                 </e>
                 <e>
                     <k>kind</k>
-                    <v>37</v>
+                    <v>68049</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -12614,7 +12942,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>18132</v>
+                                    <v>64230277</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12630,27 +12958,32 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>25</v>
+                                    <v>41876</v>
                                 </b>
                                 <b>
-                                    <a>10</a>
-                                    <b>30</b>
-                                    <v>3</v>
+                                    <a>12</a>
+                                    <b>25</b>
+                                    <v>5234</v>
                                 </b>
                                 <b>
-                                    <a>247</a>
-                                    <b>431</b>
-                                    <v>3</v>
+                                    <a>34</a>
+                                    <b>143</b>
+                                    <v>5234</v>
                                 </b>
                                 <b>
-                                    <a>559</a>
-                                    <b>1904</b>
-                                    <v>3</v>
+                                    <a>158</a>
+                                    <b>413</b>
+                                    <v>5234</v>
                                 </b>
                                 <b>
-                                    <a>2409</a>
-                                    <b>8011</b>
-                                    <v>3</v>
+                                    <a>938</a>
+                                    <b>4626</b>
+                                    <v>5234</v>
+                                </b>
+                                <b>
+                                    <a>4676</a>
+                                    <b>16593</b>
+                                    <v>5234</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12660,15 +12993,15 @@
         </relation>
         <relation>
             <name>type_of</name>
-            <cardinality>397965</cardinality>
+            <cardinality>8829217</cardinality>
             <columnsizes>
                 <e>
                     <k>expr</k>
-                    <v>397965</v>
+                    <v>8829217</v>
                 </e>
                 <e>
                     <k>tp</k>
-                    <v>8687</v>
+                    <v>26916</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -12682,7 +13015,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>397965</v>
+                                    <v>8829217</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12698,57 +13031,52 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2019</v>
+                                    <v>4744</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>967</v>
+                                    <v>5567</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>711</v>
+                                    <v>2154</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>388</v>
+                                    <v>2444</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>7</b>
-                                    <v>780</v>
+                                    <v>2420</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>10</b>
-                                    <v>772</v>
+                                    <v>2105</v>
                                 </b>
                                 <b>
                                     <a>10</a>
                                     <b>15</b>
-                                    <v>734</v>
+                                    <v>2033</v>
                                 </b>
                                 <b>
                                     <a>15</a>
-                                    <b>23</b>
-                                    <v>700</v>
+                                    <b>26</b>
+                                    <v>2105</v>
                                 </b>
                                 <b>
-                                    <a>23</a>
-                                    <b>43</b>
-                                    <v>652</v>
+                                    <a>26</a>
+                                    <b>90</b>
+                                    <v>2081</v>
                                 </b>
                                 <b>
-                                    <a>43</a>
-                                    <b>143</b>
-                                    <v>652</v>
-                                </b>
-                                <b>
-                                    <a>143</a>
-                                    <b>46949</b>
-                                    <v>312</v>
+                                    <a>90</a>
+                                    <b>331257</b>
+                                    <v>1258</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12758,15 +13086,15 @@
         </relation>
         <relation>
             <name>typename</name>
-            <cardinality>3567</cardinality>
+            <cardinality>13128374</cardinality>
             <columnsizes>
                 <e>
                     <k>tp</k>
-                    <v>3567</v>
+                    <v>13128374</v>
                 </e>
                 <e>
                     <k>name</k>
-                    <v>2983</v>
+                    <v>10010298</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -12780,7 +13108,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3567</v>
+                                    <v>13128374</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12796,17 +13124,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2660</v>
+                                    <v>8108394</v>
                                 </b>
                                 <b>
                                     <a>2</a>
-                                    <b>4</b>
-                                    <v>267</v>
+                                    <b>3</b>
+                                    <v>1210937</v>
                                 </b>
                                 <b>
-                                    <a>4</a>
-                                    <b>17</b>
-                                    <v>56</v>
+                                    <a>3</a>
+                                    <b>26</b>
+                                    <v>690967</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12816,15 +13144,15 @@
         </relation>
         <relation>
             <name>key_type</name>
-            <cardinality>430</cardinality>
+            <cardinality>866786</cardinality>
             <columnsizes>
                 <e>
                     <k>map</k>
-                    <v>430</v>
+                    <v>866786</v>
                 </e>
                 <e>
                     <k>tp</k>
-                    <v>149</v>
+                    <v>283451</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -12838,7 +13166,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>430</v>
+                                    <v>866786</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12854,27 +13182,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>106</v>
+                                    <v>201291</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>17</v>
+                                    <v>28755</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>6</b>
-                                    <v>12</v>
+                                    <v>24647</v>
                                 </b>
                                 <b>
-                                    <a>6</a>
+                                    <a>9</a>
                                     <b>13</b>
-                                    <v>12</v>
+                                    <v>24647</v>
                                 </b>
                                 <b>
-                                    <a>20</a>
-                                    <b>136</b>
-                                    <v>2</v>
+                                    <a>65</a>
+                                    <b>66</b>
+                                    <v>4107</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12884,15 +13212,15 @@
         </relation>
         <relation>
             <name>element_type</name>
-            <cardinality>1412</cardinality>
+            <cardinality>4132640</cardinality>
             <columnsizes>
                 <e>
                     <k>container</k>
-                    <v>1412</v>
+                    <v>4132640</v>
                 </e>
                 <e>
                     <k>tp</k>
-                    <v>916</v>
+                    <v>2382635</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -12906,7 +13234,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1412</v>
+                                    <v>4132640</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12922,17 +13250,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>773</v>
+                                    <v>2008808</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>94</v>
+                                    <v>250587</v>
                                 </b>
                                 <b>
                                     <a>3</a>
-                                    <b>68</b>
-                                    <v>49</v>
+                                    <b>78</b>
+                                    <v>123239</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12942,15 +13270,15 @@
         </relation>
         <relation>
             <name>base_type</name>
-            <cardinality>1903</cardinality>
+            <cardinality>8158995</cardinality>
             <columnsizes>
                 <e>
                     <k>ptr</k>
-                    <v>1903</v>
+                    <v>8158995</v>
                 </e>
                 <e>
                     <k>tp</k>
-                    <v>1903</v>
+                    <v>8158995</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -12964,7 +13292,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1903</v>
+                                    <v>8158995</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12980,7 +13308,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1903</v>
+                                    <v>8158995</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12990,15 +13318,15 @@
         </relation>
         <relation>
             <name>underlying_type</name>
-            <cardinality>3567</cardinality>
+            <cardinality>12852686</cardinality>
             <columnsizes>
                 <e>
                     <k>named</k>
-                    <v>3567</v>
+                    <v>12852686</v>
                 </e>
                 <e>
                     <k>tp</k>
-                    <v>2755</v>
+                    <v>9731120</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -13012,7 +13340,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3567</v>
+                                    <v>12852686</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13028,12 +13356,75 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2582</v>
+                                    <v>8959889</v>
                                 </b>
                                 <b>
                                     <a>2</a>
-                                    <b>154</b>
-                                    <v>173</v>
+                                    <b>9</b>
+                                    <v>732843</v>
+                                </b>
+                                <b>
+                                    <a>9</a>
+                                    <b>252</b>
+                                    <v>38387</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+            </dependencies>
+        </relation>
+        <relation>
+            <name>alias_rhs</name>
+            <cardinality>660784</cardinality>
+            <columnsizes>
+                <e>
+                    <k>alias</k>
+                    <v>660784</v>
+                </e>
+                <e>
+                    <k>tp</k>
+                    <v>320067</v>
+                </e>
+            </columnsizes>
+            <dependencies>
+                <dep>
+                    <src>alias</src>
+                    <trg>tp</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>660784</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>tp</src>
+                    <trg>alias</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>284886</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>4</b>
+                                    <v>28679</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>348</b>
+                                    <v>6500</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13043,23 +13434,23 @@
         </relation>
         <relation>
             <name>component_types</name>
-            <cardinality>36474</cardinality>
+            <cardinality>130391792</cardinality>
             <columnsizes>
                 <e>
                     <k>parent</k>
-                    <v>11221</v>
+                    <v>37395056</v>
                 </e>
                 <e>
                     <k>index</k>
-                    <v>74</v>
+                    <v>361503</v>
                 </e>
                 <e>
                     <k>name</k>
-                    <v>5540</v>
+                    <v>21435505</v>
                 </e>
                 <e>
                     <k>tp</k>
-                    <v>4295</v>
+                    <v>15006496</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -13073,37 +13464,37 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1198</v>
+                                    <v>4761163</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>3864</v>
+                                    <v>10956016</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>2953</v>
+                                    <v>9378547</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>1446</v>
+                                    <v>5356822</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>780</v>
+                                    <v>3076886</v>
                                 </b>
                                 <b>
                                     <a>6</a>
-                                    <b>13</b>
-                                    <v>860</v>
+                                    <b>11</b>
+                                    <v>2982402</v>
                                 </b>
                                 <b>
-                                    <a>13</a>
-                                    <b>65</b>
-                                    <v>120</v>
+                                    <a>11</a>
+                                    <b>80</b>
+                                    <v>883218</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13119,22 +13510,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>8936</v>
+                                    <v>29495386</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>733</v>
+                                    <v>2230639</v>
                                 </b>
                                 <b>
                                     <a>3</a>
-                                    <b>6</b>
-                                    <v>1008</v>
+                                    <b>5</b>
+                                    <v>2768787</v>
                                 </b>
                                 <b>
-                                    <a>6</a>
-                                    <b>64</b>
-                                    <v>544</v>
+                                    <a>5</a>
+                                    <b>39</b>
+                                    <v>2805758</v>
+                                </b>
+                                <b>
+                                    <a>39</a>
+                                    <b>80</b>
+                                    <v>94483</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13150,32 +13546,32 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2194</v>
+                                    <v>6646732</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>4537</v>
+                                    <v>13724803</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>2475</v>
+                                    <v>9657890</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>1110</v>
+                                    <v>4284636</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>12</b>
-                                    <v>848</v>
+                                    <v>2818082</v>
                                 </b>
                                 <b>
                                     <a>12</a>
-                                    <b>52</b>
-                                    <v>57</v>
+                                    <b>34</b>
+                                    <v>262911</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13191,62 +13587,62 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>15</v>
+                                    <v>65727</v>
                                 </b>
                                 <b>
                                     <a>2</a>
-                                    <b>4</b>
-                                    <v>6</v>
+                                    <b>3</b>
+                                    <v>32863</v>
                                 </b>
                                 <b>
-                                    <a>4</a>
-                                    <b>7</b>
-                                    <v>4</v>
+                                    <a>3</a>
+                                    <b>5</b>
+                                    <v>28755</v>
                                 </b>
                                 <b>
-                                    <a>8</a>
-                                    <b>13</b>
-                                    <v>6</v>
+                                    <a>5</a>
+                                    <b>11</b>
+                                    <v>28755</v>
                                 </b>
                                 <b>
-                                    <a>13</a>
-                                    <b>18</b>
-                                    <v>6</v>
+                                    <a>12</a>
+                                    <b>23</b>
+                                    <v>28755</v>
                                 </b>
                                 <b>
-                                    <a>18</a>
-                                    <b>28</b>
-                                    <v>6</v>
+                                    <a>23</a>
+                                    <b>31</b>
+                                    <v>28755</v>
                                 </b>
                                 <b>
-                                    <a>29</a>
-                                    <b>49</b>
-                                    <v>6</v>
+                                    <a>34</a>
+                                    <b>50</b>
+                                    <v>28755</v>
                                 </b>
                                 <b>
-                                    <a>52</a>
-                                    <b>82</b>
-                                    <v>6</v>
+                                    <a>51</a>
+                                    <b>75</b>
+                                    <v>28755</v>
                                 </b>
                                 <b>
-                                    <a>89</a>
-                                    <b>193</b>
-                                    <v>6</v>
+                                    <a>79</a>
+                                    <b>149</b>
+                                    <v>28755</v>
                                 </b>
                                 <b>
-                                    <a>232</a>
-                                    <b>824</b>
-                                    <v>6</v>
+                                    <a>169</a>
+                                    <b>511</b>
+                                    <v>28755</v>
                                 </b>
                                 <b>
-                                    <a>1505</a>
-                                    <b>6458</b>
-                                    <v>6</v>
+                                    <a>778</a>
+                                    <b>5506</b>
+                                    <v>28755</v>
                                 </b>
                                 <b>
-                                    <a>10274</a>
-                                    <b>10275</b>
-                                    <v>1</v>
+                                    <a>8121</a>
+                                    <b>8122</b>
+                                    <v>4107</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13262,52 +13658,52 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>22</v>
+                                    <v>94483</v>
                                 </b>
                                 <b>
                                     <a>2</a>
+                                    <b>3</b>
+                                    <v>32863</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
                                     <b>6</b>
-                                    <v>6</v>
+                                    <v>28755</v>
                                 </b>
                                 <b>
                                     <a>6</a>
-                                    <b>9</b>
-                                    <v>6</v>
+                                    <b>14</b>
+                                    <v>32863</v>
                                 </b>
                                 <b>
-                                    <a>9</a>
-                                    <b>16</b>
-                                    <v>4</v>
+                                    <a>17</a>
+                                    <b>22</b>
+                                    <v>28755</v>
                                 </b>
                                 <b>
-                                    <a>16</a>
-                                    <b>24</b>
-                                    <v>6</v>
+                                    <a>22</a>
+                                    <b>34</b>
+                                    <v>28755</v>
                                 </b>
                                 <b>
-                                    <a>24</a>
-                                    <b>37</b>
-                                    <v>6</v>
+                                    <a>35</a>
+                                    <b>55</b>
+                                    <v>28755</v>
                                 </b>
                                 <b>
-                                    <a>39</a>
-                                    <b>61</b>
-                                    <v>6</v>
+                                    <a>58</a>
+                                    <b>102</b>
+                                    <v>28755</v>
                                 </b>
                                 <b>
-                                    <a>69</a>
-                                    <b>116</b>
-                                    <v>6</v>
+                                    <a>110</a>
+                                    <b>277</b>
+                                    <v>28755</v>
                                 </b>
                                 <b>
-                                    <a>153</a>
-                                    <b>379</b>
-                                    <v>6</v>
-                                </b>
-                                <b>
-                                    <a>475</a>
-                                    <b>1260</b>
-                                    <v>6</v>
+                                    <a>331</a>
+                                    <b>1018</b>
+                                    <v>28755</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13323,62 +13719,62 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>15</v>
+                                    <v>65727</v>
                                 </b>
                                 <b>
                                     <a>2</a>
-                                    <b>4</b>
-                                    <v>6</v>
+                                    <b>3</b>
+                                    <v>32863</v>
                                 </b>
                                 <b>
-                                    <a>4</a>
+                                    <a>3</a>
+                                    <b>5</b>
+                                    <v>32863</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
                                     <b>7</b>
-                                    <v>6</v>
+                                    <v>24647</v>
                                 </b>
                                 <b>
-                                    <a>7</a>
-                                    <b>11</b>
-                                    <v>5</v>
-                                </b>
-                                <b>
-                                    <a>11</a>
-                                    <b>14</b>
-                                    <v>5</v>
+                                    <a>9</a>
+                                    <b>15</b>
+                                    <v>28755</v>
                                 </b>
                                 <b>
                                     <a>15</a>
                                     <b>19</b>
-                                    <v>6</v>
+                                    <v>28755</v>
                                 </b>
                                 <b>
                                     <a>20</a>
-                                    <b>27</b>
-                                    <v>5</v>
+                                    <b>25</b>
+                                    <v>28755</v>
                                 </b>
                                 <b>
-                                    <a>29</a>
-                                    <b>44</b>
-                                    <v>6</v>
+                                    <a>25</a>
+                                    <b>37</b>
+                                    <v>28755</v>
                                 </b>
                                 <b>
-                                    <a>45</a>
-                                    <b>72</b>
-                                    <v>6</v>
+                                    <a>38</a>
+                                    <b>59</b>
+                                    <v>28755</v>
                                 </b>
                                 <b>
-                                    <a>86</a>
-                                    <b>161</b>
-                                    <v>6</v>
+                                    <a>67</a>
+                                    <b>149</b>
+                                    <v>28755</v>
                                 </b>
                                 <b>
-                                    <a>224</a>
-                                    <b>1436</b>
-                                    <v>6</v>
+                                    <a>179</a>
+                                    <b>1225</b>
+                                    <v>28755</v>
                                 </b>
                                 <b>
-                                    <a>1878</a>
-                                    <b>2153</b>
-                                    <v>2</v>
+                                    <a>1559</a>
+                                    <b>1560</b>
+                                    <v>4107</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13394,22 +13790,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3941</v>
+                                    <v>13843935</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>851</v>
+                                    <v>4633815</v>
                                 </b>
                                 <b>
                                     <a>3</a>
-                                    <b>6</b>
-                                    <v>484</v>
+                                    <b>5</b>
+                                    <v>1733572</v>
                                 </b>
                                 <b>
-                                    <a>6</a>
-                                    <b>8917</b>
-                                    <v>264</v>
+                                    <a>5</a>
+                                    <b>7182</b>
+                                    <v>1224181</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13425,22 +13821,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4284</v>
+                                    <v>16793473</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>737</v>
+                                    <v>2998834</v>
                                 </b>
                                 <b>
                                     <a>3</a>
-                                    <b>6</b>
-                                    <v>440</v>
+                                    <b>12</b>
+                                    <v>1618549</v>
                                 </b>
                                 <b>
-                                    <a>6</a>
-                                    <b>28</b>
-                                    <v>79</v>
+                                    <a>12</a>
+                                    <b>31</b>
+                                    <v>24647</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13456,22 +13852,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4599</v>
+                                    <v>18029979</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>518</v>
+                                    <v>2099184</v>
                                 </b>
                                 <b>
                                     <a>3</a>
-                                    <b>21</b>
-                                    <v>416</v>
-                                </b>
-                                <b>
-                                    <a>21</a>
-                                    <b>3014</b>
-                                    <v>7</v>
+                                    <b>2295</b>
+                                    <v>1306341</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13487,32 +13878,32 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2055</v>
+                                    <v>7665514</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>812</v>
+                                    <v>2748247</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>408</v>
+                                    <v>1207749</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>394</v>
+                                    <v>1277585</v>
                                 </b>
                                 <b>
                                     <a>6</a>
-                                    <b>11</b>
-                                    <v>342</v>
+                                    <b>12</b>
+                                    <v>1199533</v>
                                 </b>
                                 <b>
-                                    <a>11</a>
-                                    <b>2187</b>
-                                    <v>284</v>
+                                    <a>12</a>
+                                    <b>2060</b>
+                                    <v>907866</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13528,32 +13919,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2111</v>
+                                    <v>8893803</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>859</v>
+                                    <v>2863270</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>580</v>
+                                    <v>1409041</v>
                                 </b>
                                 <b>
                                     <a>4</a>
-                                    <b>5</b>
-                                    <v>352</v>
+                                    <b>6</b>
+                                    <v>1146129</v>
                                 </b>
                                 <b>
-                                    <a>5</a>
-                                    <b>10</b>
-                                    <v>328</v>
-                                </b>
-                                <b>
-                                    <a>10</a>
-                                    <b>51</b>
-                                    <v>65</v>
+                                    <a>6</a>
+                                    <b>68</b>
+                                    <v>694250</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13569,22 +13955,509 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2897</v>
+                                    <v>11165523</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>865</v>
+                                    <v>2193668</v>
                                 </b>
                                 <b>
                                     <a>3</a>
+                                    <b>6</b>
+                                    <v>1187209</v>
+                                </b>
+                                <b>
+                                    <a>6</a>
+                                    <b>719</b>
+                                    <v>460095</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+            </dependencies>
+        </relation>
+        <relation>
+            <name>struct_tags</name>
+            <cardinality>41038845</cardinality>
+            <columnsizes>
+                <e>
+                    <k>parent</k>
+                    <v>8035233</v>
+                </e>
+                <e>
+                    <k>index</k>
+                    <v>324531</v>
+                </e>
+                <e>
+                    <k>tag</k>
+                    <v>747654</v>
+                </e>
+            </columnsizes>
+            <dependencies>
+                <dep>
+                    <src>parent</src>
+                    <trg>index</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>936622</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>2033456</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>1425473</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
                                     <b>5</b>
-                                    <v>343</v>
+                                    <v>1031106</v>
                                 </b>
                                 <b>
                                     <a>5</a>
-                                    <b>738</b>
-                                    <v>190</v>
+                                    <b>6</b>
+                                    <v>640846</v>
+                                </b>
+                                <b>
+                                    <a>6</a>
+                                    <b>8</b>
+                                    <v>694250</v>
+                                </b>
+                                <b>
+                                    <a>8</a>
+                                    <b>12</b>
+                                    <v>681926</v>
+                                </b>
+                                <b>
+                                    <a>12</a>
+                                    <b>80</b>
+                                    <v>591550</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>parent</src>
+                    <trg>tag</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>7891453</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>36</b>
+                                    <v>143779</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>index</src>
+                    <trg>parent</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>57511</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>32863</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>5</b>
+                                    <v>24647</v>
+                                </b>
+                                <b>
+                                    <a>6</a>
+                                    <b>11</b>
+                                    <v>24647</v>
+                                </b>
+                                <b>
+                                    <a>12</a>
+                                    <b>22</b>
+                                    <v>24647</v>
+                                </b>
+                                <b>
+                                    <a>22</a>
+                                    <b>25</b>
+                                    <v>24647</v>
+                                </b>
+                                <b>
+                                    <a>26</a>
+                                    <b>36</b>
+                                    <v>24647</v>
+                                </b>
+                                <b>
+                                    <a>39</a>
+                                    <b>55</b>
+                                    <v>24647</v>
+                                </b>
+                                <b>
+                                    <a>58</a>
+                                    <b>93</b>
+                                    <v>24647</v>
+                                </b>
+                                <b>
+                                    <a>105</a>
+                                    <b>220</b>
+                                    <v>24647</v>
+                                </b>
+                                <b>
+                                    <a>252</a>
+                                    <b>887</b>
+                                    <v>24647</v>
+                                </b>
+                                <b>
+                                    <a>1233</a>
+                                    <b>1957</b>
+                                    <v>12323</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>index</src>
+                    <trg>tag</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>180751</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>73943</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>7</b>
+                                    <v>24647</v>
+                                </b>
+                                <b>
+                                    <a>9</a>
+                                    <b>15</b>
+                                    <v>24647</v>
+                                </b>
+                                <b>
+                                    <a>15</a>
+                                    <b>29</b>
+                                    <v>20539</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>tag</src>
+                    <trg>parent</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>673710</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>4</b>
+                                    <v>61619</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>1931</b>
+                                    <v>12323</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>tag</src>
+                    <trg>index</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>690142</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>80</b>
+                                    <v>57511</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+            </dependencies>
+        </relation>
+        <relation>
+            <name>interface_private_method_ids</name>
+            <cardinality>439555</cardinality>
+            <columnsizes>
+                <e>
+                    <k>interface</k>
+                    <v>156103</v>
+                </e>
+                <e>
+                    <k>index</k>
+                    <v>94483</v>
+                </e>
+                <e>
+                    <k>id</k>
+                    <v>386151</v>
+                </e>
+            </columnsizes>
+            <dependencies>
+                <dep>
+                    <src>interface</src>
+                    <trg>index</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>53403</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>53403</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>12323</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>5</b>
+                                    <v>8215</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
+                                    <b>6</b>
+                                    <v>12323</v>
+                                </b>
+                                <b>
+                                    <a>7</a>
+                                    <b>10</b>
+                                    <v>12323</v>
+                                </b>
+                                <b>
+                                    <a>12</a>
+                                    <b>13</b>
+                                    <v>4107</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>interface</src>
+                    <trg>id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>53403</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>53403</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>12323</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>5</b>
+                                    <v>8215</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
+                                    <b>6</b>
+                                    <v>12323</v>
+                                </b>
+                                <b>
+                                    <a>7</a>
+                                    <b>10</b>
+                                    <v>12323</v>
+                                </b>
+                                <b>
+                                    <a>12</a>
+                                    <b>13</b>
+                                    <v>4107</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>index</src>
+                    <trg>interface</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>24647</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>28755</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>16431</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
+                                    <b>10</b>
+                                    <v>8215</v>
+                                </b>
+                                <b>
+                                    <a>10</a>
+                                    <b>14</b>
+                                    <v>8215</v>
+                                </b>
+                                <b>
+                                    <a>18</a>
+                                    <b>21</b>
+                                    <v>8215</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>index</src>
+                    <trg>id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>32863</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>28755</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>8215</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
+                                    <b>10</b>
+                                    <v>8215</v>
+                                </b>
+                                <b>
+                                    <a>10</a>
+                                    <b>14</b>
+                                    <v>8215</v>
+                                </b>
+                                <b>
+                                    <a>18</a>
+                                    <b>21</b>
+                                    <v>8215</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>id</src>
+                    <trg>interface</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>345071</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>28755</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>12323</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>id</src>
+                    <trg>index</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>361503</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>4</b>
+                                    <v>24647</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13594,15 +14467,15 @@
         </relation>
         <relation>
             <name>array_length</name>
-            <cardinality>293</cardinality>
+            <cardinality>1528173</cardinality>
             <columnsizes>
                 <e>
                     <k>tp</k>
-                    <v>293</v>
+                    <v>1528173</v>
                 </e>
                 <e>
                     <k>len</k>
-                    <v>103</v>
+                    <v>488851</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -13616,7 +14489,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>293</v>
+                                    <v>1528173</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13632,32 +14505,37 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>62</v>
+                                    <v>258803</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>15</v>
+                                    <v>90375</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>7</v>
+                                    <v>24647</v>
                                 </b>
                                 <b>
                                     <a>4</a>
+                                    <b>5</b>
+                                    <v>24647</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
                                     <b>7</b>
-                                    <v>8</v>
+                                    <v>41079</v>
                                 </b>
                                 <b>
-                                    <a>7</a>
+                                    <a>8</a>
                                     <b>15</b>
-                                    <v>7</v>
+                                    <v>36971</v>
                                 </b>
                                 <b>
-                                    <a>15</a>
-                                    <b>26</b>
-                                    <v>4</v>
+                                    <a>16</a>
+                                    <b>28</b>
+                                    <v>12323</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13667,15 +14545,15 @@
         </relation>
         <relation>
             <name>type_objects</name>
-            <cardinality>3567</cardinality>
+            <cardinality>13128374</cardinality>
             <columnsizes>
                 <e>
                     <k>tp</k>
-                    <v>3567</v>
+                    <v>13128374</v>
                 </e>
                 <e>
                     <k>object</k>
-                    <v>3567</v>
+                    <v>13128374</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -13689,7 +14567,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3567</v>
+                                    <v>13128374</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13705,7 +14583,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3567</v>
+                                    <v>13128374</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13715,23 +14593,23 @@
         </relation>
         <relation>
             <name>packages</name>
-            <cardinality>346</cardinality>
+            <cardinality>924779</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>346</v>
+                    <v>924779</v>
                 </e>
                 <e>
                     <k>name</k>
-                    <v>281</v>
+                    <v>570571</v>
                 </e>
                 <e>
                     <k>path</k>
-                    <v>346</v>
+                    <v>924779</v>
                 </e>
                 <e>
                     <k>scope</k>
-                    <v>346</v>
+                    <v>924779</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -13745,7 +14623,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>346</v>
+                                    <v>924779</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13761,7 +14639,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>346</v>
+                                    <v>924779</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13777,7 +14655,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>346</v>
+                                    <v>924779</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13793,17 +14671,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>255</v>
+                                    <v>479838</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>23</v>
+                                    <v>57580</v>
                                 </b>
                                 <b>
                                     <a>3</a>
-                                    <b>40</b>
-                                    <v>3</v>
+                                    <b>53</b>
+                                    <v>33152</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13819,17 +14697,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>255</v>
+                                    <v>479838</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>23</v>
+                                    <v>57580</v>
                                 </b>
                                 <b>
                                     <a>3</a>
-                                    <b>40</b>
-                                    <v>3</v>
+                                    <b>53</b>
+                                    <v>33152</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13845,17 +14723,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>255</v>
+                                    <v>479838</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>23</v>
+                                    <v>57580</v>
                                 </b>
                                 <b>
                                     <a>3</a>
-                                    <b>40</b>
-                                    <v>3</v>
+                                    <b>53</b>
+                                    <v>33152</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13871,7 +14749,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>346</v>
+                                    <v>924779</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13887,7 +14765,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>346</v>
+                                    <v>924779</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13903,7 +14781,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>346</v>
+                                    <v>924779</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13919,7 +14797,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>346</v>
+                                    <v>924779</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13935,7 +14813,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>346</v>
+                                    <v>924779</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13951,7 +14829,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>346</v>
+                                    <v>924779</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13961,23 +14839,23 @@
         </relation>
         <relation>
             <name>modexprs</name>
-            <cardinality>9</cardinality>
+            <cardinality>259985</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>9</v>
+                    <v>259985</v>
                 </e>
                 <e>
                     <k>kind</k>
-                    <v>4</v>
+                    <v>6979</v>
                 </e>
                 <e>
                     <k>parent</k>
-                    <v>2</v>
+                    <v>54090</v>
                 </e>
                 <e>
                     <k>idx</k>
-                    <v>6</v>
+                    <v>24428</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -13991,7 +14869,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9</v>
+                                    <v>259985</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14007,7 +14885,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9</v>
+                                    <v>259985</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14023,7 +14901,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9</v>
+                                    <v>259985</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14037,14 +14915,14 @@
                             <budget>12</budget>
                             <bs>
                                 <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>3</v>
+                                    <a>13</a>
+                                    <b>14</b>
+                                    <v>5234</v>
                                 </b>
                                 <b>
-                                    <a>6</a>
-                                    <b>7</b>
-                                    <v>1</v>
+                                    <a>110</a>
+                                    <b>111</b>
+                                    <v>1744</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14058,14 +14936,19 @@
                             <budget>12</budget>
                             <bs>
                                 <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>3</v>
+                                    <a>12</a>
+                                    <b>13</b>
+                                    <v>1744</v>
                                 </b>
                                 <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>1</v>
+                                    <a>13</a>
+                                    <b>14</b>
+                                    <v>3489</v>
+                                </b>
+                                <b>
+                                    <a>31</a>
+                                    <b>32</b>
+                                    <v>1744</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14081,12 +14964,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3</v>
+                                    <v>1744</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>1744</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>1</v>
+                                    <v>1744</v>
+                                </b>
+                                <b>
+                                    <a>13</a>
+                                    <b>14</b>
+                                    <v>1744</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14100,14 +14993,34 @@
                             <budget>12</budget>
                             <bs>
                                 <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>1</v>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>8724</v>
                                 </b>
                                 <b>
-                                    <a>6</a>
-                                    <b>7</b>
-                                    <v>1</v>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>19193</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>5</b>
+                                    <v>6979</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
+                                    <b>6</b>
+                                    <v>10469</v>
+                                </b>
+                                <b>
+                                    <a>11</a>
+                                    <b>12</b>
+                                    <v>5234</v>
+                                </b>
+                                <b>
+                                    <a>13</a>
+                                    <b>15</b>
+                                    <v>3489</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14120,15 +15033,20 @@
                         <hist>
                             <budget>12</budget>
                             <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>10469</v>
+                                </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>1</v>
+                                    <v>20938</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>1</v>
+                                    <v>22683</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14142,14 +15060,34 @@
                             <budget>12</budget>
                             <bs>
                                 <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>1</v>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>8724</v>
                                 </b>
                                 <b>
-                                    <a>6</a>
-                                    <b>7</b>
-                                    <v>1</v>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>19193</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>5</b>
+                                    <v>6979</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
+                                    <b>6</b>
+                                    <v>10469</v>
+                                </b>
+                                <b>
+                                    <a>11</a>
+                                    <b>12</b>
+                                    <v>5234</v>
+                                </b>
+                                <b>
+                                    <a>13</a>
+                                    <b>15</b>
+                                    <v>3489</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14165,12 +15103,37 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3</v>
+                                    <v>1744</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>3</v>
+                                    <v>3489</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
+                                    <b>6</b>
+                                    <v>10469</v>
+                                </b>
+                                <b>
+                                    <a>11</a>
+                                    <b>12</b>
+                                    <v>1744</v>
+                                </b>
+                                <b>
+                                    <a>15</a>
+                                    <b>16</b>
+                                    <v>1744</v>
+                                </b>
+                                <b>
+                                    <a>26</a>
+                                    <b>27</b>
+                                    <v>1744</v>
+                                </b>
+                                <b>
+                                    <a>31</a>
+                                    <b>32</b>
+                                    <v>3489</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14186,12 +15149,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4</v>
+                                    <v>13958</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>2</v>
+                                    <v>8724</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>1744</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14207,12 +15175,37 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3</v>
+                                    <v>1744</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>3</v>
+                                    <v>3489</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
+                                    <b>6</b>
+                                    <v>10469</v>
+                                </b>
+                                <b>
+                                    <a>11</a>
+                                    <b>12</b>
+                                    <v>1744</v>
+                                </b>
+                                <b>
+                                    <a>15</a>
+                                    <b>16</b>
+                                    <v>1744</v>
+                                </b>
+                                <b>
+                                    <a>26</a>
+                                    <b>27</b>
+                                    <v>1744</v>
+                                </b>
+                                <b>
+                                    <a>31</a>
+                                    <b>32</b>
+                                    <v>3489</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14222,19 +15215,19 @@
         </relation>
         <relation>
             <name>modtokens</name>
-            <cardinality>13</cardinality>
+            <cardinality>410043</cardinality>
             <columnsizes>
                 <e>
                     <k>token</k>
-                    <v>13</v>
+                    <v>164017</v>
                 </e>
                 <e>
                     <k>parent</k>
-                    <v>7</v>
+                    <v>214618</v>
                 </e>
                 <e>
                     <k>idx</k>
-                    <v>2</v>
+                    <v>5234</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -14248,7 +15241,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>13</v>
+                                    <v>76774</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>54090</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>5</b>
+                                    <v>13958</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
+                                    <b>9</b>
+                                    <v>13958</v>
+                                </b>
+                                <b>
+                                    <a>15</a>
+                                    <b>19</b>
+                                    <v>5234</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14264,7 +15277,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>13</v>
+                                    <v>162272</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>1744</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14280,12 +15298,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1</v>
+                                    <v>22683</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>6</v>
+                                    <v>188445</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>3489</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14301,12 +15324,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1</v>
+                                    <v>22683</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>6</v>
+                                    <v>188445</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>3489</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14320,14 +15348,19 @@
                             <budget>12</budget>
                             <bs>
                                 <b>
-                                    <a>6</a>
-                                    <b>7</b>
-                                    <v>1</v>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>1744</v>
                                 </b>
                                 <b>
-                                    <a>7</a>
-                                    <b>8</b>
-                                    <v>1</v>
+                                    <a>40</a>
+                                    <b>41</b>
+                                    <v>1744</v>
+                                </b>
+                                <b>
+                                    <a>53</a>
+                                    <b>54</b>
+                                    <v>1744</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14341,14 +15374,19 @@
                             <budget>12</budget>
                             <bs>
                                 <b>
-                                    <a>6</a>
-                                    <b>7</b>
-                                    <v>1</v>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>1744</v>
                                 </b>
                                 <b>
-                                    <a>7</a>
-                                    <b>8</b>
-                                    <v>1</v>
+                                    <a>110</a>
+                                    <b>111</b>
+                                    <v>1744</v>
+                                </b>
+                                <b>
+                                    <a>123</a>
+                                    <b>124</b>
+                                    <v>1744</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14358,43 +15396,43 @@
         </relation>
         <relation>
             <name>errors</name>
-            <cardinality>0</cardinality>
+            <cardinality>232496</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>0</v>
+                    <v>232496</v>
                 </e>
                 <e>
                     <k>kind</k>
-                    <v>0</v>
+                    <v>642</v>
                 </e>
                 <e>
                     <k>msg</k>
-                    <v>0</v>
+                    <v>55713</v>
                 </e>
                 <e>
                     <k>rawpos</k>
-                    <v>0</v>
+                    <v>155997</v>
                 </e>
                 <e>
                     <k>file</k>
-                    <v>0</v>
+                    <v>56356</v>
                 </e>
                 <e>
                     <k>line</k>
-                    <v>0</v>
+                    <v>21856</v>
                 </e>
                 <e>
                     <k>col</k>
-                    <v>0</v>
+                    <v>10071</v>
                 </e>
                 <e>
                     <k>package</k>
-                    <v>0</v>
+                    <v>16928</v>
                 </e>
                 <e>
                     <k>idx</k>
-                    <v>0</v>
+                    <v>89355</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -14408,7 +15446,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1</v>
+                                    <v>232496</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14424,7 +15462,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1</v>
+                                    <v>232496</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14440,7 +15478,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1</v>
+                                    <v>232496</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14456,7 +15494,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1</v>
+                                    <v>232496</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14472,7 +15510,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1</v>
+                                    <v>232496</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14488,7 +15526,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1</v>
+                                    <v>232496</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14504,7 +15542,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1</v>
+                                    <v>232496</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14520,7 +15558,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1</v>
+                                    <v>232496</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14532,7 +15570,23 @@
                     <val>
                         <hist>
                             <budget>12</budget>
-                            <bs/>
+                            <bs>
+                                <b>
+                                    <a>16</a>
+                                    <b>17</b>
+                                    <v>214</v>
+                                </b>
+                                <b>
+                                    <a>45</a>
+                                    <b>46</b>
+                                    <v>214</v>
+                                </b>
+                                <b>
+                                    <a>1024</a>
+                                    <b>1025</b>
+                                    <v>214</v>
+                                </b>
+                            </bs>
                         </hist>
                     </val>
                 </dep>
@@ -14542,7 +15596,23 @@
                     <val>
                         <hist>
                             <budget>12</budget>
-                            <bs/>
+                            <bs>
+                                <b>
+                                    <a>10</a>
+                                    <b>11</b>
+                                    <v>214</v>
+                                </b>
+                                <b>
+                                    <a>41</a>
+                                    <b>42</b>
+                                    <v>214</v>
+                                </b>
+                                <b>
+                                    <a>210</a>
+                                    <b>211</b>
+                                    <v>214</v>
+                                </b>
+                            </bs>
                         </hist>
                     </val>
                 </dep>
@@ -14552,7 +15622,23 @@
                     <val>
                         <hist>
                             <budget>12</budget>
-                            <bs/>
+                            <bs>
+                                <b>
+                                    <a>9</a>
+                                    <b>10</b>
+                                    <v>214</v>
+                                </b>
+                                <b>
+                                    <a>39</a>
+                                    <b>40</b>
+                                    <v>214</v>
+                                </b>
+                                <b>
+                                    <a>680</a>
+                                    <b>681</b>
+                                    <v>214</v>
+                                </b>
+                            </bs>
                         </hist>
                     </val>
                 </dep>
@@ -14562,7 +15648,23 @@
                     <val>
                         <hist>
                             <budget>12</budget>
-                            <bs/>
+                            <bs>
+                                <b>
+                                    <a>4</a>
+                                    <b>5</b>
+                                    <v>214</v>
+                                </b>
+                                <b>
+                                    <a>26</a>
+                                    <b>27</b>
+                                    <v>214</v>
+                                </b>
+                                <b>
+                                    <a>262</a>
+                                    <b>263</b>
+                                    <v>214</v>
+                                </b>
+                            </bs>
                         </hist>
                     </val>
                 </dep>
@@ -14572,7 +15674,23 @@
                     <val>
                         <hist>
                             <budget>12</budget>
-                            <bs/>
+                            <bs>
+                                <b>
+                                    <a>6</a>
+                                    <b>7</b>
+                                    <v>214</v>
+                                </b>
+                                <b>
+                                    <a>16</a>
+                                    <b>17</b>
+                                    <v>214</v>
+                                </b>
+                                <b>
+                                    <a>102</a>
+                                    <b>103</b>
+                                    <v>214</v>
+                                </b>
+                            </bs>
                         </hist>
                     </val>
                 </dep>
@@ -14582,7 +15700,23 @@
                     <val>
                         <hist>
                             <budget>12</budget>
-                            <bs/>
+                            <bs>
+                                <b>
+                                    <a>6</a>
+                                    <b>7</b>
+                                    <v>214</v>
+                                </b>
+                                <b>
+                                    <a>8</a>
+                                    <b>9</b>
+                                    <v>214</v>
+                                </b>
+                                <b>
+                                    <a>42</a>
+                                    <b>43</b>
+                                    <v>214</v>
+                                </b>
+                            </bs>
                         </hist>
                     </val>
                 </dep>
@@ -14592,7 +15726,23 @@
                     <val>
                         <hist>
                             <budget>12</budget>
-                            <bs/>
+                            <bs>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>214</v>
+                                </b>
+                                <b>
+                                    <a>36</a>
+                                    <b>37</b>
+                                    <v>214</v>
+                                </b>
+                                <b>
+                                    <a>45</a>
+                                    <b>46</b>
+                                    <v>214</v>
+                                </b>
+                            </bs>
                         </hist>
                     </val>
                 </dep>
@@ -14602,7 +15752,23 @@
                     <val>
                         <hist>
                             <budget>12</budget>
-                            <bs/>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>214</v>
+                                </b>
+                                <b>
+                                    <a>13</a>
+                                    <b>14</b>
+                                    <v>214</v>
+                                </b>
+                                <b>
+                                    <a>417</a>
+                                    <b>418</b>
+                                    <v>214</v>
+                                </b>
+                            </bs>
                         </hist>
                     </val>
                 </dep>
@@ -14612,7 +15778,38 @@
                     <val>
                         <hist>
                             <budget>12</budget>
-                            <bs/>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>30856</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>8357</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>6428</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>7</b>
+                                    <v>4928</v>
+                                </b>
+                                <b>
+                                    <a>7</a>
+                                    <b>17</b>
+                                    <v>4285</v>
+                                </b>
+                                <b>
+                                    <a>20</a>
+                                    <b>214</b>
+                                    <v>857</v>
+                                </b>
+                            </bs>
                         </hist>
                     </val>
                 </dep>
@@ -14622,7 +15819,18 @@
                     <val>
                         <hist>
                             <budget>12</budget>
-                            <bs/>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>55499</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>214</v>
+                                </b>
+                            </bs>
                         </hist>
                     </val>
                 </dep>
@@ -14632,7 +15840,33 @@
                     <val>
                         <hist>
                             <budget>12</budget>
-                            <bs/>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>38142</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>6428</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>4071</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>8</b>
+                                    <v>4499</v>
+                                </b>
+                                <b>
+                                    <a>8</a>
+                                    <b>214</b>
+                                    <v>2571</v>
+                                </b>
+                            </bs>
                         </hist>
                     </val>
                 </dep>
@@ -14642,7 +15876,33 @@
                     <val>
                         <hist>
                             <budget>12</budget>
-                            <bs/>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>39642</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>6857</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>5</b>
+                                    <v>4499</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
+                                    <b>17</b>
+                                    <v>4285</v>
+                                </b>
+                                <b>
+                                    <a>20</a>
+                                    <b>214</b>
+                                    <v>428</v>
+                                </b>
+                            </bs>
                         </hist>
                     </val>
                 </dep>
@@ -14652,7 +15912,28 @@
                     <val>
                         <hist>
                             <budget>12</budget>
-                            <bs/>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>42213</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>5999</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>5</b>
+                                    <v>4285</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
+                                    <b>52</b>
+                                    <v>3214</v>
+                                </b>
+                            </bs>
                         </hist>
                     </val>
                 </dep>
@@ -14662,7 +15943,18 @@
                     <val>
                         <hist>
                             <budget>12</budget>
-                            <bs/>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>51856</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>5</b>
+                                    <v>3857</v>
+                                </b>
+                            </bs>
                         </hist>
                     </val>
                 </dep>
@@ -14672,7 +15964,23 @@
                     <val>
                         <hist>
                             <budget>12</budget>
-                            <bs/>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>49499</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>5</b>
+                                    <v>4714</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
+                                    <b>10</b>
+                                    <v>1499</v>
+                                </b>
+                            </bs>
                         </hist>
                     </val>
                 </dep>
@@ -14682,7 +15990,33 @@
                     <val>
                         <hist>
                             <budget>12</budget>
-                            <bs/>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>33213</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>7928</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>5999</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>8</b>
+                                    <v>4285</v>
+                                </b>
+                                <b>
+                                    <a>8</a>
+                                    <b>163</b>
+                                    <v>4285</v>
+                                </b>
+                            </bs>
                         </hist>
                     </val>
                 </dep>
@@ -14692,7 +16026,18 @@
                     <val>
                         <hist>
                             <budget>12</budget>
-                            <bs/>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>146355</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>93</b>
+                                    <v>9642</v>
+                                </b>
+                            </bs>
                         </hist>
                     </val>
                 </dep>
@@ -14702,7 +16047,13 @@
                     <val>
                         <hist>
                             <budget>12</budget>
-                            <bs/>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>155997</v>
+                                </b>
+                            </bs>
                         </hist>
                     </val>
                 </dep>
@@ -14712,7 +16063,18 @@
                     <val>
                         <hist>
                             <budget>12</budget>
-                            <bs/>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>155354</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>8</b>
+                                    <v>642</v>
+                                </b>
+                            </bs>
                         </hist>
                     </val>
                 </dep>
@@ -14722,7 +16084,13 @@
                     <val>
                         <hist>
                             <budget>12</budget>
-                            <bs/>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>155997</v>
+                                </b>
+                            </bs>
                         </hist>
                     </val>
                 </dep>
@@ -14732,7 +16100,13 @@
                     <val>
                         <hist>
                             <budget>12</budget>
-                            <bs/>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>155997</v>
+                                </b>
+                            </bs>
                         </hist>
                     </val>
                 </dep>
@@ -14742,7 +16116,13 @@
                     <val>
                         <hist>
                             <budget>12</budget>
-                            <bs/>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>155997</v>
+                                </b>
+                            </bs>
                         </hist>
                     </val>
                 </dep>
@@ -14752,7 +16132,18 @@
                     <val>
                         <hist>
                             <budget>12</budget>
-                            <bs/>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>155783</v>
+                                </b>
+                                <b>
+                                    <a>7</a>
+                                    <b>8</b>
+                                    <v>214</v>
+                                </b>
+                            </bs>
                         </hist>
                     </val>
                 </dep>
@@ -14762,7 +16153,18 @@
                     <val>
                         <hist>
                             <budget>12</budget>
-                            <bs/>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>146569</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>93</b>
+                                    <v>9428</v>
+                                </b>
+                            </bs>
                         </hist>
                     </val>
                 </dep>
@@ -14772,7 +16174,43 @@
                     <val>
                         <hist>
                             <budget>12</budget>
-                            <bs/>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>26999</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>8142</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>5785</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>6</b>
+                                    <v>4928</v>
+                                </b>
+                                <b>
+                                    <a>6</a>
+                                    <b>11</b>
+                                    <v>4928</v>
+                                </b>
+                                <b>
+                                    <a>11</a>
+                                    <b>19</b>
+                                    <v>4285</v>
+                                </b>
+                                <b>
+                                    <a>19</a>
+                                    <b>93</b>
+                                    <v>1285</v>
+                                </b>
+                            </bs>
                         </hist>
                     </val>
                 </dep>
@@ -14782,7 +16220,23 @@
                     <val>
                         <hist>
                             <budget>12</budget>
-                            <bs/>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>50570</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>5357</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>428</v>
+                                </b>
+                            </bs>
                         </hist>
                     </val>
                 </dep>
@@ -14792,7 +16246,38 @@
                     <val>
                         <hist>
                             <budget>12</budget>
-                            <bs/>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>28071</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>9856</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>7071</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>6</b>
+                                    <v>4499</v>
+                                </b>
+                                <b>
+                                    <a>6</a>
+                                    <b>11</b>
+                                    <v>5142</v>
+                                </b>
+                                <b>
+                                    <a>11</a>
+                                    <b>17</b>
+                                    <v>1714</v>
+                                </b>
+                            </bs>
                         </hist>
                     </val>
                 </dep>
@@ -14802,7 +16287,38 @@
                     <val>
                         <hist>
                             <budget>12</budget>
-                            <bs/>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>28071</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>10071</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>6642</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>6</b>
+                                    <v>4071</v>
+                                </b>
+                                <b>
+                                    <a>6</a>
+                                    <b>11</b>
+                                    <v>4928</v>
+                                </b>
+                                <b>
+                                    <a>11</a>
+                                    <b>18</b>
+                                    <v>2571</v>
+                                </b>
+                            </bs>
                         </hist>
                     </val>
                 </dep>
@@ -14812,7 +16328,38 @@
                     <val>
                         <hist>
                             <budget>12</budget>
-                            <bs/>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>29999</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>9214</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>5999</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>6</b>
+                                    <v>5142</v>
+                                </b>
+                                <b>
+                                    <a>6</a>
+                                    <b>12</b>
+                                    <v>5142</v>
+                                </b>
+                                <b>
+                                    <a>12</a>
+                                    <b>16</b>
+                                    <v>857</v>
+                                </b>
+                            </bs>
                         </hist>
                     </val>
                 </dep>
@@ -14822,7 +16369,28 @@
                     <val>
                         <hist>
                             <budget>12</budget>
-                            <bs/>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>43499</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>5785</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>5</b>
+                                    <v>5142</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
+                                    <b>9</b>
+                                    <v>1928</v>
+                                </b>
+                            </bs>
                         </hist>
                     </val>
                 </dep>
@@ -14832,7 +16400,23 @@
                     <val>
                         <hist>
                             <budget>12</budget>
-                            <bs/>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>50999</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>4</b>
+                                    <v>4285</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>9</b>
+                                    <v>1071</v>
+                                </b>
+                            </bs>
                         </hist>
                     </val>
                 </dep>
@@ -14842,7 +16426,43 @@
                     <val>
                         <hist>
                             <budget>12</budget>
-                            <bs/>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>28285</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>7499</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>5785</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>5</b>
+                                    <v>2571</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
+                                    <b>8</b>
+                                    <v>4499</v>
+                                </b>
+                                <b>
+                                    <a>8</a>
+                                    <b>13</b>
+                                    <v>4499</v>
+                                </b>
+                                <b>
+                                    <a>13</a>
+                                    <b>93</b>
+                                    <v>3214</v>
+                                </b>
+                            </bs>
                         </hist>
                     </val>
                 </dep>
@@ -14852,7 +16472,58 @@
                     <val>
                         <hist>
                             <budget>12</budget>
-                            <bs/>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>6642</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>3642</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>1499</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>5</b>
+                                    <v>1071</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
+                                    <b>6</b>
+                                    <v>1071</v>
+                                </b>
+                                <b>
+                                    <a>6</a>
+                                    <b>7</b>
+                                    <v>2142</v>
+                                </b>
+                                <b>
+                                    <a>7</a>
+                                    <b>13</b>
+                                    <v>1714</v>
+                                </b>
+                                <b>
+                                    <a>14</a>
+                                    <b>31</b>
+                                    <v>1714</v>
+                                </b>
+                                <b>
+                                    <a>31</a>
+                                    <b>50</b>
+                                    <v>1714</v>
+                                </b>
+                                <b>
+                                    <a>53</a>
+                                    <b>208</b>
+                                    <v>642</v>
+                                </b>
+                            </bs>
                         </hist>
                     </val>
                 </dep>
@@ -14862,7 +16533,23 @@
                     <val>
                         <hist>
                             <budget>12</budget>
-                            <bs/>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>17999</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>2999</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>857</v>
+                                </b>
+                            </bs>
                         </hist>
                     </val>
                 </dep>
@@ -14872,7 +16559,48 @@
                     <val>
                         <hist>
                             <budget>12</budget>
-                            <bs/>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>7714</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>3214</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>2571</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>5</b>
+                                    <v>1928</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
+                                    <b>6</b>
+                                    <v>1499</v>
+                                </b>
+                                <b>
+                                    <a>6</a>
+                                    <b>10</b>
+                                    <v>1714</v>
+                                </b>
+                                <b>
+                                    <a>10</a>
+                                    <b>16</b>
+                                    <v>1714</v>
+                                </b>
+                                <b>
+                                    <a>16</a>
+                                    <b>23</b>
+                                    <v>1499</v>
+                                </b>
+                            </bs>
                         </hist>
                     </val>
                 </dep>
@@ -14882,7 +16610,53 @@
                     <val>
                         <hist>
                             <budget>12</budget>
-                            <bs/>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>6857</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>3642</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>2142</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>5</b>
+                                    <v>1285</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
+                                    <b>6</b>
+                                    <v>1499</v>
+                                </b>
+                                <b>
+                                    <a>6</a>
+                                    <b>7</b>
+                                    <v>1714</v>
+                                </b>
+                                <b>
+                                    <a>7</a>
+                                    <b>19</b>
+                                    <v>1928</v>
+                                </b>
+                                <b>
+                                    <a>20</a>
+                                    <b>32</b>
+                                    <v>1714</v>
+                                </b>
+                                <b>
+                                    <a>32</a>
+                                    <b>87</b>
+                                    <v>1071</v>
+                                </b>
+                            </bs>
                         </hist>
                     </val>
                 </dep>
@@ -14892,7 +16666,53 @@
                     <val>
                         <hist>
                             <budget>12</budget>
-                            <bs/>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>7071</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>4071</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>1928</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>5</b>
+                                    <v>1714</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
+                                    <b>6</b>
+                                    <v>857</v>
+                                </b>
+                                <b>
+                                    <a>6</a>
+                                    <b>7</b>
+                                    <v>1928</v>
+                                </b>
+                                <b>
+                                    <a>7</a>
+                                    <b>18</b>
+                                    <v>1499</v>
+                                </b>
+                                <b>
+                                    <a>18</a>
+                                    <b>27</b>
+                                    <v>1714</v>
+                                </b>
+                                <b>
+                                    <a>29</a>
+                                    <b>86</b>
+                                    <v>1071</v>
+                                </b>
+                            </bs>
                         </hist>
                     </val>
                 </dep>
@@ -14902,7 +16722,38 @@
                     <val>
                         <hist>
                             <budget>12</budget>
-                            <bs/>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>10499</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>3857</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>2571</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>5</b>
+                                    <v>2785</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
+                                    <b>9</b>
+                                    <v>1928</v>
+                                </b>
+                                <b>
+                                    <a>10</a>
+                                    <b>11</b>
+                                    <v>214</v>
+                                </b>
+                            </bs>
                         </hist>
                     </val>
                 </dep>
@@ -14912,7 +16763,43 @@
                     <val>
                         <hist>
                             <budget>12</budget>
-                            <bs/>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>8142</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>5571</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>2571</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>6</b>
+                                    <v>1714</v>
+                                </b>
+                                <b>
+                                    <a>7</a>
+                                    <b>10</b>
+                                    <v>1928</v>
+                                </b>
+                                <b>
+                                    <a>10</a>
+                                    <b>19</b>
+                                    <v>1714</v>
+                                </b>
+                                <b>
+                                    <a>21</a>
+                                    <b>22</b>
+                                    <v>214</v>
+                                </b>
+                            </bs>
                         </hist>
                     </val>
                 </dep>
@@ -14922,7 +16809,53 @@
                     <val>
                         <hist>
                             <budget>12</budget>
-                            <bs/>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>7071</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>3642</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>1714</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>6</b>
+                                    <v>1928</v>
+                                </b>
+                                <b>
+                                    <a>6</a>
+                                    <b>7</b>
+                                    <v>2142</v>
+                                </b>
+                                <b>
+                                    <a>7</a>
+                                    <b>14</b>
+                                    <v>1714</v>
+                                </b>
+                                <b>
+                                    <a>15</a>
+                                    <b>30</b>
+                                    <v>1714</v>
+                                </b>
+                                <b>
+                                    <a>30</a>
+                                    <b>77</b>
+                                    <v>1714</v>
+                                </b>
+                                <b>
+                                    <a>187</a>
+                                    <b>188</b>
+                                    <v>214</v>
+                                </b>
+                            </bs>
                         </hist>
                     </val>
                 </dep>
@@ -14932,7 +16865,48 @@
                     <val>
                         <hist>
                             <budget>12</budget>
-                            <bs/>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>3428</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>2142</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>1071</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>7</b>
+                                    <v>642</v>
+                                </b>
+                                <b>
+                                    <a>7</a>
+                                    <b>10</b>
+                                    <v>857</v>
+                                </b>
+                                <b>
+                                    <a>10</a>
+                                    <b>14</b>
+                                    <v>642</v>
+                                </b>
+                                <b>
+                                    <a>17</a>
+                                    <b>24</b>
+                                    <v>857</v>
+                                </b>
+                                <b>
+                                    <a>107</a>
+                                    <b>768</b>
+                                    <v>428</v>
+                                </b>
+                            </bs>
                         </hist>
                     </val>
                 </dep>
@@ -14942,7 +16916,18 @@
                     <val>
                         <hist>
                             <budget>12</budget>
-                            <bs/>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>8142</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>1928</v>
+                                </b>
+                            </bs>
                         </hist>
                     </val>
                 </dep>
@@ -14952,7 +16937,38 @@
                     <val>
                         <hist>
                             <budget>12</budget>
-                            <bs/>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>4499</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>2357</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>6</b>
+                                    <v>857</v>
+                                </b>
+                                <b>
+                                    <a>6</a>
+                                    <b>9</b>
+                                    <v>857</v>
+                                </b>
+                                <b>
+                                    <a>9</a>
+                                    <b>12</b>
+                                    <v>642</v>
+                                </b>
+                                <b>
+                                    <a>13</a>
+                                    <b>84</b>
+                                    <v>857</v>
+                                </b>
+                            </bs>
                         </hist>
                     </val>
                 </dep>
@@ -14962,7 +16978,43 @@
                     <val>
                         <hist>
                             <budget>12</budget>
-                            <bs/>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>3428</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>2571</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>1071</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>8</b>
+                                    <v>857</v>
+                                </b>
+                                <b>
+                                    <a>8</a>
+                                    <b>14</b>
+                                    <v>857</v>
+                                </b>
+                                <b>
+                                    <a>17</a>
+                                    <b>22</b>
+                                    <v>857</v>
+                                </b>
+                                <b>
+                                    <a>100</a>
+                                    <b>436</b>
+                                    <v>428</v>
+                                </b>
+                            </bs>
                         </hist>
                     </val>
                 </dep>
@@ -14972,7 +17024,38 @@
                     <val>
                         <hist>
                             <budget>12</budget>
-                            <bs/>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>4714</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>2357</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>7</b>
+                                    <v>857</v>
+                                </b>
+                                <b>
+                                    <a>7</a>
+                                    <b>8</b>
+                                    <v>428</v>
+                                </b>
+                                <b>
+                                    <a>9</a>
+                                    <b>11</b>
+                                    <v>857</v>
+                                </b>
+                                <b>
+                                    <a>15</a>
+                                    <b>223</b>
+                                    <v>857</v>
+                                </b>
+                            </bs>
                         </hist>
                     </val>
                 </dep>
@@ -14982,7 +17065,43 @@
                     <val>
                         <hist>
                             <budget>12</budget>
-                            <bs/>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>4285</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>2357</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>857</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>7</b>
+                                    <v>857</v>
+                                </b>
+                                <b>
+                                    <a>7</a>
+                                    <b>12</b>
+                                    <v>642</v>
+                                </b>
+                                <b>
+                                    <a>13</a>
+                                    <b>19</b>
+                                    <v>857</v>
+                                </b>
+                                <b>
+                                    <a>80</a>
+                                    <b>81</b>
+                                    <v>214</v>
+                                </b>
+                            </bs>
                         </hist>
                     </val>
                 </dep>
@@ -14992,7 +17111,33 @@
                     <val>
                         <hist>
                             <budget>12</budget>
-                            <bs/>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>5785</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>2142</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>5</b>
+                                    <v>857</v>
+                                </b>
+                                <b>
+                                    <a>8</a>
+                                    <b>13</b>
+                                    <v>857</v>
+                                </b>
+                                <b>
+                                    <a>14</a>
+                                    <b>45</b>
+                                    <v>428</v>
+                                </b>
+                            </bs>
                         </hist>
                     </val>
                 </dep>
@@ -15002,7 +17147,43 @@
                     <val>
                         <hist>
                             <budget>12</budget>
-                            <bs/>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>3642</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>2142</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>1071</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>7</b>
+                                    <v>642</v>
+                                </b>
+                                <b>
+                                    <a>7</a>
+                                    <b>9</b>
+                                    <v>857</v>
+                                </b>
+                                <b>
+                                    <a>9</a>
+                                    <b>14</b>
+                                    <v>857</v>
+                                </b>
+                                <b>
+                                    <a>17</a>
+                                    <b>358</b>
+                                    <v>857</v>
+                                </b>
+                            </bs>
                         </hist>
                     </val>
                 </dep>
@@ -15012,7 +17193,38 @@
                     <val>
                         <hist>
                             <budget>12</budget>
-                            <bs/>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>11571</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>1285</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>5</b>
+                                    <v>1285</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
+                                    <b>10</b>
+                                    <v>1285</v>
+                                </b>
+                                <b>
+                                    <a>15</a>
+                                    <b>204</b>
+                                    <v>1285</v>
+                                </b>
+                                <b>
+                                    <a>417</a>
+                                    <b>418</b>
+                                    <v>214</v>
+                                </b>
+                            </bs>
                         </hist>
                     </val>
                 </dep>
@@ -15022,7 +17234,18 @@
                     <val>
                         <hist>
                             <budget>12</budget>
-                            <bs/>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>16285</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>4</b>
+                                    <v>642</v>
+                                </b>
+                            </bs>
                         </hist>
                     </val>
                 </dep>
@@ -15032,7 +17255,33 @@
                     <val>
                         <hist>
                             <budget>12</budget>
-                            <bs/>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>11571</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>1714</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>1285</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>15</b>
+                                    <v>1499</v>
+                                </b>
+                                <b>
+                                    <a>25</a>
+                                    <b>71</b>
+                                    <v>857</v>
+                                </b>
+                            </bs>
                         </hist>
                     </val>
                 </dep>
@@ -15042,7 +17291,38 @@
                     <val>
                         <hist>
                             <budget>12</budget>
-                            <bs/>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>11571</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>1285</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>1285</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
+                                    <b>10</b>
+                                    <v>1285</v>
+                                </b>
+                                <b>
+                                    <a>15</a>
+                                    <b>128</b>
+                                    <v>1285</v>
+                                </b>
+                                <b>
+                                    <a>258</a>
+                                    <b>259</b>
+                                    <v>214</v>
+                                </b>
+                            </bs>
                         </hist>
                     </val>
                 </dep>
@@ -15052,7 +17332,23 @@
                     <val>
                         <hist>
                             <budget>12</budget>
-                            <bs/>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>14356</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>4</b>
+                                    <v>1285</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>95</b>
+                                    <v>1285</v>
+                                </b>
+                            </bs>
                         </hist>
                     </val>
                 </dep>
@@ -15062,7 +17358,33 @@
                     <val>
                         <hist>
                             <budget>12</budget>
-                            <bs/>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>11785</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>1285</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>5</b>
+                                    <v>1285</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
+                                    <b>15</b>
+                                    <v>1285</v>
+                                </b>
+                                <b>
+                                    <a>15</a>
+                                    <b>68</b>
+                                    <v>1285</v>
+                                </b>
+                            </bs>
                         </hist>
                     </val>
                 </dep>
@@ -15072,7 +17394,28 @@
                     <val>
                         <hist>
                             <budget>12</budget>
-                            <bs/>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>14142</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>5</b>
+                                    <v>1285</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
+                                    <b>23</b>
+                                    <v>1285</v>
+                                </b>
+                                <b>
+                                    <a>23</a>
+                                    <b>24</b>
+                                    <v>214</v>
+                                </b>
+                            </bs>
                         </hist>
                     </val>
                 </dep>
@@ -15082,7 +17425,38 @@
                     <val>
                         <hist>
                             <budget>12</budget>
-                            <bs/>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>11571</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>1285</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>5</b>
+                                    <v>1285</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
+                                    <b>10</b>
+                                    <v>1285</v>
+                                </b>
+                                <b>
+                                    <a>15</a>
+                                    <b>204</b>
+                                    <v>1285</v>
+                                </b>
+                                <b>
+                                    <a>417</a>
+                                    <b>418</b>
+                                    <v>214</v>
+                                </b>
+                            </bs>
                         </hist>
                     </val>
                 </dep>
@@ -15092,7 +17466,38 @@
                     <val>
                         <hist>
                             <budget>12</budget>
-                            <bs/>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>45856</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>9642</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>8357</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>5</b>
+                                    <v>18428</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
+                                    <b>26</b>
+                                    <v>6857</v>
+                                </b>
+                                <b>
+                                    <a>79</a>
+                                    <b>80</b>
+                                    <v>214</v>
+                                </b>
+                            </bs>
                         </hist>
                     </val>
                 </dep>
@@ -15102,7 +17507,18 @@
                     <val>
                         <hist>
                             <budget>12</budget>
-                            <bs/>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>86570</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>4</b>
+                                    <v>2785</v>
+                                </b>
+                            </bs>
                         </hist>
                     </val>
                 </dep>
@@ -15112,7 +17528,33 @@
                     <val>
                         <hist>
                             <budget>12</budget>
-                            <bs/>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>45856</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>11999</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>14356</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>5</b>
+                                    <v>14785</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
+                                    <b>60</b>
+                                    <v>2357</v>
+                                </b>
+                            </bs>
                         </hist>
                     </val>
                 </dep>
@@ -15122,7 +17564,38 @@
                     <val>
                         <hist>
                             <budget>12</budget>
-                            <bs/>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>45856</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>9642</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>8357</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>5</b>
+                                    <v>18428</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
+                                    <b>26</b>
+                                    <v>6857</v>
+                                </b>
+                                <b>
+                                    <a>73</a>
+                                    <b>74</b>
+                                    <v>214</v>
+                                </b>
+                            </bs>
                         </hist>
                     </val>
                 </dep>
@@ -15132,7 +17605,38 @@
                     <val>
                         <hist>
                             <budget>12</budget>
-                            <bs/>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>45856</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>9642</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>8357</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>5</b>
+                                    <v>18428</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
+                                    <b>26</b>
+                                    <v>6857</v>
+                                </b>
+                                <b>
+                                    <a>44</a>
+                                    <b>45</b>
+                                    <v>214</v>
+                                </b>
+                            </bs>
                         </hist>
                     </val>
                 </dep>
@@ -15142,7 +17646,33 @@
                     <val>
                         <hist>
                             <budget>12</budget>
-                            <bs/>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>45856</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>10285</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>10071</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>5</b>
+                                    <v>18214</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
+                                    <b>19</b>
+                                    <v>4928</v>
+                                </b>
+                            </bs>
                         </hist>
                     </val>
                 </dep>
@@ -15152,7 +17682,23 @@
                     <val>
                         <hist>
                             <budget>12</budget>
-                            <bs/>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>66856</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>17999</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>9</b>
+                                    <v>4499</v>
+                                </b>
+                            </bs>
                         </hist>
                     </val>
                 </dep>
@@ -15162,7 +17708,38 @@
                     <val>
                         <hist>
                             <budget>12</budget>
-                            <bs/>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>45856</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>9642</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>8357</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>5</b>
+                                    <v>18428</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
+                                    <b>26</b>
+                                    <v>6857</v>
+                                </b>
+                                <b>
+                                    <a>79</a>
+                                    <b>80</b>
+                                    <v>214</v>
+                                </b>
+                            </bs>
                         </hist>
                     </val>
                 </dep>
@@ -15170,14 +17747,653 @@
         </relation>
         <relation>
             <name>has_ellipsis</name>
-            <cardinality>268</cardinality>
+            <cardinality>45900</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>268</v>
+                    <v>45900</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
+        <relation>
+            <name>variadic</name>
+            <cardinality>2105580</cardinality>
+            <columnsizes>
+                <e>
+                    <k>id</k>
+                    <v>2105580</v>
+                </e>
+            </columnsizes>
+            <dependencies/>
+        </relation>
+        <relation>
+            <name>typeparam</name>
+            <cardinality>331358</cardinality>
+            <columnsizes>
+                <e>
+                    <k>tp</k>
+                    <v>331358</v>
+                </e>
+                <e>
+                    <k>name</k>
+                    <v>19381</v>
+                </e>
+                <e>
+                    <k>bound</k>
+                    <v>42513</v>
+                </e>
+                <e>
+                    <k>parent</k>
+                    <v>249456</v>
+                </e>
+                <e>
+                    <k>idx</k>
+                    <v>3126</v>
+                </e>
+            </columnsizes>
+            <dependencies>
+                <dep>
+                    <src>tp</src>
+                    <trg>name</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>331358</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>tp</src>
+                    <trg>bound</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>331358</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>tp</src>
+                    <trg>parent</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>331358</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>tp</src>
+                    <trg>idx</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>331358</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>name</src>
+                    <trg>tp</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>6877</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>2500</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>2500</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>6</b>
+                                    <v>1250</v>
+                                </b>
+                                <b>
+                                    <a>6</a>
+                                    <b>9</b>
+                                    <v>1250</v>
+                                </b>
+                                <b>
+                                    <a>10</a>
+                                    <b>12</b>
+                                    <v>1250</v>
+                                </b>
+                                <b>
+                                    <a>27</a>
+                                    <b>34</b>
+                                    <v>1250</v>
+                                </b>
+                                <b>
+                                    <a>69</a>
+                                    <b>74</b>
+                                    <v>1250</v>
+                                </b>
+                                <b>
+                                    <a>109</a>
+                                    <b>145</b>
+                                    <v>1250</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>name</src>
+                    <trg>bound</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>12504</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>1875</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>2500</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>12</b>
+                                    <v>1250</v>
+                                </b>
+                                <b>
+                                    <a>12</a>
+                                    <b>32</b>
+                                    <v>1250</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>name</src>
+                    <trg>parent</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>6877</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>2500</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>2500</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>6</b>
+                                    <v>1250</v>
+                                </b>
+                                <b>
+                                    <a>6</a>
+                                    <b>9</b>
+                                    <v>1250</v>
+                                </b>
+                                <b>
+                                    <a>10</a>
+                                    <b>12</b>
+                                    <v>1250</v>
+                                </b>
+                                <b>
+                                    <a>27</a>
+                                    <b>34</b>
+                                    <v>1250</v>
+                                </b>
+                                <b>
+                                    <a>69</a>
+                                    <b>74</b>
+                                    <v>1250</v>
+                                </b>
+                                <b>
+                                    <a>109</a>
+                                    <b>145</b>
+                                    <v>1250</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>name</src>
+                    <trg>idx</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>14379</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>3126</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>1250</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>5</b>
+                                    <v>625</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>bound</src>
+                    <trg>tp</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>32510</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>4</b>
+                                    <v>3126</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>7</b>
+                                    <v>3751</v>
+                                </b>
+                                <b>
+                                    <a>15</a>
+                                    <b>271</b>
+                                    <v>3126</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>bound</src>
+                    <trg>name</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>36887</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>3751</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>18</b>
+                                    <v>1875</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>bound</src>
+                    <trg>parent</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>33761</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>4</b>
+                                    <v>1875</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>7</b>
+                                    <v>3751</v>
+                                </b>
+                                <b>
+                                    <a>15</a>
+                                    <b>260</b>
+                                    <v>3126</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>bound</src>
+                    <trg>idx</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>38762</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>6</b>
+                                    <v>3751</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>parent</src>
+                    <trg>tp</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>183185</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>55018</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>6</b>
+                                    <v>11253</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>parent</src>
+                    <trg>name</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>183185</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>55018</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>6</b>
+                                    <v>11253</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>parent</src>
+                    <trg>bound</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>187561</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>51892</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>5</b>
+                                    <v>10003</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>parent</src>
+                    <trg>idx</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>183185</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>55018</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>6</b>
+                                    <v>11253</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>idx</src>
+                    <trg>tp</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>625</v>
+                                </b>
+                                <b>
+                                    <a>6</a>
+                                    <b>7</b>
+                                    <v>625</v>
+                                </b>
+                                <b>
+                                    <a>18</a>
+                                    <b>19</b>
+                                    <v>625</v>
+                                </b>
+                                <b>
+                                    <a>110</a>
+                                    <b>111</b>
+                                    <v>625</v>
+                                </b>
+                                <b>
+                                    <a>395</a>
+                                    <b>396</b>
+                                    <v>625</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>idx</src>
+                    <trg>name</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>625</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>5</b>
+                                    <v>625</v>
+                                </b>
+                                <b>
+                                    <a>6</a>
+                                    <b>7</b>
+                                    <v>625</v>
+                                </b>
+                                <b>
+                                    <a>13</a>
+                                    <b>14</b>
+                                    <v>625</v>
+                                </b>
+                                <b>
+                                    <a>19</a>
+                                    <b>20</b>
+                                    <v>625</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>idx</src>
+                    <trg>bound</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>625</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>625</v>
+                                </b>
+                                <b>
+                                    <a>9</a>
+                                    <b>10</b>
+                                    <v>625</v>
+                                </b>
+                                <b>
+                                    <a>11</a>
+                                    <b>12</b>
+                                    <v>625</v>
+                                </b>
+                                <b>
+                                    <a>57</a>
+                                    <b>58</b>
+                                    <v>625</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>idx</src>
+                    <trg>parent</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>625</v>
+                                </b>
+                                <b>
+                                    <a>6</a>
+                                    <b>7</b>
+                                    <v>625</v>
+                                </b>
+                                <b>
+                                    <a>18</a>
+                                    <b>19</b>
+                                    <v>625</v>
+                                </b>
+                                <b>
+                                    <a>110</a>
+                                    <b>111</b>
+                                    <v>625</v>
+                                </b>
+                                <b>
+                                    <a>395</a>
+                                    <b>396</b>
+                                    <v>625</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+            </dependencies>
+        </relation>
     </stats>
 </dbstats>
diff --git a/go/ql/lib/qlpack.yml b/go/ql/lib/qlpack.yml
index d86c9a07eed..f9660516373 100644
--- a/go/ql/lib/qlpack.yml
+++ b/go/ql/lib/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/go-all
-version: 2.0.1-dev
+version: 2.1.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 92bf9dc2cb8..c5e388ba000 100644
--- a/go/ql/lib/semmle/go/AST.qll
+++ b/go/ql/lib/semmle/go/AST.qll
@@ -55,6 +55,8 @@ class AstNode extends @node, Locatable {
     kind = "commentgroup" and result = this.(File).getCommentGroup(i)
     or
     kind = "comment" and result = this.(CommentGroup).getComment(i)
+    or
+    kind = "typeparamdecl" and result = this.(TypeParamDeclParent).getTypeParameterDecl(i)
   }
 
   /**
@@ -79,6 +81,7 @@ class AstNode extends @node, Locatable {
   }
 
   /** Gets the innermost function definition to which this AST node belongs, if any. */
+  pragma[nomagic]
   FuncDef getEnclosingFunction() { result = this.getParent().parentInSameFunction*() }
 
   /**
diff --git a/go/ql/lib/semmle/go/Decls.qll b/go/ql/lib/semmle/go/Decls.qll
index 8e3df22cc80..6c66b085575 100644
--- a/go/ql/lib/semmle/go/Decls.qll
+++ b/go/ql/lib/semmle/go/Decls.qll
@@ -212,10 +212,7 @@ class MethodDecl extends FuncDecl {
    *
    * is `Rectangle`.
    */
-  NamedType getReceiverBaseType() {
-    result = this.getReceiverType() or
-    result = this.getReceiverType().(PointerType).getBaseType()
-  }
+  NamedType getReceiverBaseType() { result = lookThroughPointerType(this.getReceiverType()) }
 
   /**
    * Gets the receiver variable of this method.
diff --git a/go/ql/lib/semmle/go/Expr.qll b/go/ql/lib/semmle/go/Expr.qll
index b1e1a169784..4a4ab00f053 100644
--- a/go/ql/lib/semmle/go/Expr.qll
+++ b/go/ql/lib/semmle/go/Expr.qll
@@ -2098,6 +2098,7 @@ class LabelName extends Name {
  * 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.
  */
+pragma[nomagic]
 private predicate isTypeExprBottomUp(Expr e) {
   e instanceof TypeName
   or
@@ -2136,6 +2137,7 @@ private predicate isTypeExprBottomUp(Expr e) {
  * 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) {
   e = any(CompositeLit cl).getTypeExpr()
   or
diff --git a/go/ql/lib/semmle/go/Scopes.qll b/go/ql/lib/semmle/go/Scopes.qll
index 7386b81868f..f9b9e3a26b9 100644
--- a/go/ql/lib/semmle/go/Scopes.qll
+++ b/go/ql/lib/semmle/go/Scopes.qll
@@ -385,6 +385,11 @@ class Field extends Variable {
       this = base.getField(f)
     )
   }
+
+  /**
+   * Gets the tag associated with this field, or the empty string if this field has no tag.
+   */
+  string getTag() { declaringType.hasOwnFieldWithTag(_, this.getName(), this.getType(), _, result) }
 }
 
 /**
@@ -474,6 +479,13 @@ class Function extends ValueEntity, @functionobject {
   ResultVariable getAResult() { result = this.getResult(_) }
 }
 
+bindingset[m]
+pragma[inline_late]
+private Type implementsIncludingInterfaceMethodsCand(Method m, string mname) {
+  result.implements(m.getReceiverType().getUnderlyingType()) and
+  mname = m.getName()
+}
+
 /**
  * A method, that is, a function with a receiver variable, or a function declared in an interface.
  *
@@ -507,13 +519,7 @@ class Method extends Function {
    * Gets the receiver base type of this method, that is, either the base type of the receiver type
    * if it is a pointer type, or the receiver type itself if it is not a pointer type.
    */
-  Type getReceiverBaseType() {
-    exists(Type recv | recv = this.getReceiverType() |
-      if recv instanceof PointerType
-      then result = recv.(PointerType).getBaseType()
-      else result = recv
-    )
-  }
+  Type getReceiverBaseType() { result = lookThroughPointerType(this.getReceiverType()) }
 
   /** Holds if this method has name `m` and belongs to the method set of type `tp` or `*tp`. */
   private predicate isIn(NamedType tp, string m) {
@@ -575,9 +581,9 @@ class Method extends Function {
   predicate implementsIncludingInterfaceMethods(Method m) {
     this = m
     or
-    exists(Type t |
-      this = t.getMethod(m.getName()) and
-      t.implements(m.getReceiverType().getUnderlyingType())
+    exists(Type t, string mname |
+      t = implementsIncludingInterfaceMethodsCand(m, mname) and
+      this = t.getMethod(mname)
     )
   }
 
diff --git a/go/ql/lib/semmle/go/Types.qll b/go/ql/lib/semmle/go/Types.qll
index 645f0e3fe67..1b09ea466cc 100644
--- a/go/ql/lib/semmle/go/Types.qll
+++ b/go/ql/lib/semmle/go/Types.qll
@@ -69,6 +69,7 @@ class Type extends @type {
    * is contained in the method set of this type and any type restrictions are
    * satisfied.
    */
+  pragma[nomagic]
   predicate implements(InterfaceType i) {
     if i = any(ComparableType comparable).getUnderlyingType()
     then this.implementsComparable()
@@ -445,11 +446,7 @@ class StructType extends @structtype, CompositeType {
       if n = ""
       then (
         isEmbedded = true and
-        (
-          name = tp.(NamedType).getName()
-          or
-          name = tp.(PointerType).getBaseType().(NamedType).getName()
-        )
+        name = lookThroughPointerType(tp).(NamedType).getName()
       ) else (
         isEmbedded = false and
         name = n
@@ -457,6 +454,21 @@ class StructType extends @structtype, CompositeType {
     )
   }
 
+  /**
+   * Holds if this struct contains a field `name` with type `tp` and tag `tag`;
+   * `isEmbedded` is true if the field is embedded.
+   *
+   * Note that this predicate does not take promoted fields into account.
+   */
+  predicate hasOwnFieldWithTag(int i, string name, Type tp, boolean isEmbedded, string tag) {
+    this.hasOwnField(i, name, tp, isEmbedded) and
+    (
+      struct_tags(this, i, tag)
+      or
+      not struct_tags(this, i, _) and tag = ""
+    )
+  }
+
   /**
    * Get a field with the name `name`; `isEmbedded` is true if the field is embedded.
    *
@@ -502,9 +514,7 @@ class StructType extends @structtype, CompositeType {
     this.hasFieldCand(_, embeddedParent, depth - 1, true) and
     result.getName() = name and
     (
-      result.getReceiverBaseType() = embeddedParent.getType()
-      or
-      result.getReceiverBaseType() = embeddedParent.getType().(PointerType).getBaseType()
+      result.getReceiverBaseType() = lookThroughPointerType(embeddedParent.getType())
       or
       methodhosts(result, embeddedParent.getType())
     )
@@ -575,10 +585,15 @@ class StructType extends @structtype, CompositeType {
   override string pp() {
     result =
       "struct { " +
-        concat(int i, string name, Type tp |
-          component_types(this, i, name, tp)
+        concat(int i, string name, Type tp, string tagToPrint |
+          component_types(this, i, name, tp) and
+          (
+            tagToPrint = " `" + any(string tag | struct_tags(this, i, tag)) + "`"
+            or
+            tagToPrint = "" and not struct_tags(this, i, _)
+          )
         |
-          name + " " + tp.pp(), "; " order by i
+          name + " " + tp.pp() + tagToPrint, "; " order by i
         ) + " }"
   }
 
@@ -623,6 +638,16 @@ class PointerType extends @pointertype, CompositeType {
   override string toString() { result = "pointer type" }
 }
 
+/**
+ * Gets the base type if `t` is a pointer type, otherwise `t` itself.
+ */
+Type lookThroughPointerType(Type t) {
+  not t instanceof PointerType and
+  result = t
+  or
+  result = t.(PointerType).getBaseType()
+}
+
 private newtype TTypeSetTerm =
   MkTypeSetTerm(TypeSetLiteralType tslit, int index) { component_types(tslit, index, _, _) }
 
@@ -742,10 +767,22 @@ class InterfaceType extends @interfacetype, CompositeType {
   /** Gets the type of method `name` of this interface type. */
   Type getMethodType(string name) {
     // Note that negative indices correspond to embedded interfaces and type
-    // set literals.
+    // set literals. Note also that methods coming from embedded interfaces
+    // have already been included in `component_types`.
     exists(int i | i >= 0 | component_types(this, i, name, result))
   }
 
+  /**
+   * Holds if this interface type has a private method `name`,
+   * with qualified name `qname` and type `type`.
+   */
+  predicate hasPrivateMethodWithQualifiedName(string name, string qname, Type type) {
+    exists(int i | i >= 0 |
+      component_types(this, i, name, type) and
+      interface_private_method_ids(this, i, qname)
+    )
+  }
+
   override predicate hasMethod(string m, SignatureType t) { t = this.getMethodType(m) }
 
   /**
@@ -922,8 +959,19 @@ class SignatureType extends @signaturetype, CompositeType {
   language[monotonicAggregates]
   override string pp() {
     result =
-      "func(" + concat(int i, Type tp | tp = this.getParameterType(i) | tp.pp(), ", " order by i) +
-        ") " + concat(int i, Type tp | tp = this.getResultType(i) | tp.pp(), ", " order by i)
+      "func(" +
+        concat(int i, Type tp, string prefix |
+          if i = this.getNumParameter() - 1 and this.isVariadic()
+          then
+            tp = this.getParameterType(i).(SliceType).getElementType() and
+            prefix = "..."
+          else (
+            tp = this.getParameterType(i) and
+            prefix = ""
+          )
+        |
+          prefix + tp.pp(), ", " order by i
+        ) + ") " + concat(int i, Type tp | tp = this.getResultType(i) | tp.pp(), ", " order by i)
   }
 
   override string toString() { result = "signature type" }
@@ -1000,7 +1048,7 @@ class NamedType extends @namedtype, CompositeType {
       s.hasOwnField(_, _, embedded, true) and
       // ensure `m` can be promoted
       not s.hasOwnField(_, m, _, _) and
-      not exists(Method m2 | m2.getReceiverType() = this and m2.getName() = m)
+      not exists(Method m2 | m2.getReceiverBaseType() = this and m2.getName() = m)
     |
       // If S contains an embedded field T, the method set of S includes promoted methods with receiver T
       result = embedded.getMethod(m)
@@ -1020,10 +1068,19 @@ class ErrorType extends Type {
   ErrorType() { this.implements(Builtin::error().getType().getUnderlyingType()) }
 }
 
+/**
+ * Gets the number of types with method `name`.
+ */
+bindingset[name]
+int numberOfTypesWithMethodName(string name) { result = count(Type t | t.hasMethod(name, _)) }
+
 /**
  * Gets the name of a method in the method set of `i`.
  *
  * This is used to restrict the set of interfaces to consider in the definition of `implements`,
- * so it does not matter which method name is chosen (we use the lexicographically least).
+ * so it does not matter which method name is chosen (we use the most unusual name the interface
+ * requires; this is the most discriminating and so shrinks the search space the most).
  */
-private string getExampleMethodName(InterfaceType i) { result = min(string m | i.hasMethod(m, _)) }
+private string getExampleMethodName(InterfaceType i) {
+  result = min(string m | i.hasMethod(m, _) | m order by numberOfTypesWithMethodName(m))
+}
diff --git a/go/ql/lib/semmle/go/controlflow/IR.qll b/go/ql/lib/semmle/go/controlflow/IR.qll
index d337f526cde..addd85a36c4 100644
--- a/go/ql/lib/semmle/go/controlflow/IR.qll
+++ b/go/ql/lib/semmle/go/controlflow/IR.qll
@@ -358,11 +358,7 @@ module IR {
 
     override predicate reads(ValueEntity v) { v = field }
 
-    override Type getResultType() {
-      if field.getType() instanceof PointerType
-      then result = field.getType().(PointerType).getBaseType()
-      else result = field.getType()
-    }
+    override Type getResultType() { result = lookThroughPointerType(field.getType()) }
 
     override ControlFlow::Root getRoot() { result.isRootOf(e) }
 
@@ -501,10 +497,11 @@ module IR {
     override StructLit lit;
 
     /** Gets the name of the initialized field. */
+    pragma[nomagic]
     string getFieldName() {
       if elt instanceof KeyValueExpr
       then result = elt.(KeyValueExpr).getKey().(Ident).getName()
-      else lit.getStructType().hasOwnField(i, result, _, _)
+      else pragma[only_bind_out](lit.getStructType()).hasOwnField(i, result, _, _)
     }
 
     /** Gets the initialized field. */
@@ -1480,7 +1477,7 @@ module IR {
 
     override predicate refersTo(ValueEntity e) {
       this instanceof MkLhs and
-      loc = e.getAReference()
+      pragma[only_bind_out](loc) = e.getAReference()
       or
       exists(WriteResultInstruction wr | this = MkResultWriteTarget(wr) |
         e = wr.getResultVariable()
diff --git a/go/ql/lib/semmle/go/dataflow/ExternalFlow.qll b/go/ql/lib/semmle/go/dataflow/ExternalFlow.qll
index d905201fd45..5ae7b6a7f0d 100644
--- a/go/ql/lib/semmle/go/dataflow/ExternalFlow.qll
+++ b/go/ql/lib/semmle/go/dataflow/ExternalFlow.qll
@@ -25,8 +25,12 @@
  *    packages in the group `<groupname>` according to the `packageGrouping`
  *    predicate.
  * 2. The `type` column selects a type within that package.
- * 3. The `subtypes` is a boolean that indicates whether to jump to an
- *    arbitrary subtype of that type.
+ * 3. The `subtypes` column is a boolean that controls what restrictions we
+ *    place on the type `t` of the selector base when accessing a field or
+ *    calling a method. When it is false, `t` must be the exact type specified
+ *    by this row. When it is true, `t` may be a type which embeds the specified
+ *    type, and for interface methods `t` may be a type which implements the
+ *    interface.
  * 4. The `name` column optionally selects a specific named member of the type.
  * 5. The `signature` column is always empty.
  * 6. The `ext` column is always empty.
@@ -34,7 +38,8 @@
  *    first 6 columns, and the `output` column specifies how data leaves the
  *    element selected by the first 6 columns. An `input` can be either "",
  *    "Argument[n]", or "Argument[n1..n2]":
- *    - "": Selects a write to the selected element in case this is a field.
+ *    - "": Selects a write to the selected element in case this is a field or
+ *      package-level variable.
  *    - "Argument[n]": Selects an argument in a call to the selected element.
  *      The arguments are zero-indexed, and `receiver` specifies the receiver.
  *    - "Argument[n1..n2]": Similar to "Argument[n]" but selects any argument
@@ -43,7 +48,7 @@
  *    An `output` can be either "", "Argument[n]", "Argument[n1..n2]", "Parameter",
  *    "Parameter[n]", "Parameter[n1..n2]", , "ReturnValue", "ReturnValue[n]", or
  *    "ReturnValue[n1..n2]":
- *    - "": Selects a read of a selected field.
+ *    - "": Selects a read of a selected field or package-level variable.
  *    - "Argument[n]": Selects the post-update value of an argument in a call to the
  *      selected element. That is, the value of the argument after the call returns.
  *      The arguments are zero-indexed, and `receiver` specifies the receiver.
@@ -470,17 +475,24 @@ SourceSinkInterpretationInput::SourceOrSinkElement interpretElement(
   elementSpec(pkg, type, subtypes, name, signature, ext) and
   // Go does not need to distinguish functions with signature
   signature = "" and
-  (
-    exists(Field f | f.hasQualifiedName(interpretPackage(pkg), type, name) | result.asEntity() = f)
+  exists(string p | p = interpretPackage(pkg) |
+    exists(Entity e | result.hasFullInfo(e, p, type, subtypes) |
+      e.(Field).hasQualifiedName(p, type, name) or
+      e.(Method).hasQualifiedName(p, type, name)
+    )
     or
-    exists(Method m | m.hasQualifiedName(interpretPackage(pkg), type, name) |
-      result.asEntity() = m
-      or
-      subtypes = true and result.asEntity().(Method).implementsIncludingInterfaceMethods(m)
+    subtypes = true and
+    // p.type is an interface and we include types which implement it
+    exists(Method m2, string pkg2, string type2 |
+      m2.getReceiverType().implements(p, type) and
+      m2.getName() = name and
+      m2.getReceiverBaseType().hasQualifiedName(pkg2, type2)
+    |
+      result.hasFullInfo(m2, pkg2, type2, subtypes)
     )
     or
     type = "" and
-    exists(Entity e | e.hasQualifiedName(interpretPackage(pkg), name) | result.asEntity() = e)
+    exists(Entity e | e.hasQualifiedName(p, name) | result.asOtherEntity() = e)
   )
 }
 
diff --git a/go/ql/lib/semmle/go/dataflow/internal/DataFlowDispatch.qll b/go/ql/lib/semmle/go/dataflow/internal/DataFlowDispatch.qll
index b045d6dc552..a06edad0be2 100644
--- a/go/ql/lib/semmle/go/dataflow/internal/DataFlowDispatch.qll
+++ b/go/ql/lib/semmle/go/dataflow/internal/DataFlowDispatch.qll
@@ -8,9 +8,9 @@ private import DataFlowPrivate
 private predicate isInterfaceCallReceiver(
   DataFlow::CallNode call, DataFlow::Node recv, InterfaceType tp, string m
 ) {
-  call.getReceiver() = recv and
+  pragma[only_bind_out](call).getReceiver() = recv and
   recv.getType().getUnderlyingType() = tp and
-  m = call.getACalleeIncludingExternals().asFunction().getName()
+  m = pragma[only_bind_out](call).getACalleeIncludingExternals().asFunction().getName()
 }
 
 /** Gets a data-flow node that may flow into the receiver value of `call`, which is an interface value. */
diff --git a/go/ql/lib/semmle/go/dataflow/internal/DataFlowImpl1.qll b/go/ql/lib/semmle/go/dataflow/internal/DataFlowImpl1.qll
index 359fa71744b..17def0c431d 100644
--- a/go/ql/lib/semmle/go/dataflow/internal/DataFlowImpl1.qll
+++ b/go/ql/lib/semmle/go/dataflow/internal/DataFlowImpl1.qll
@@ -261,13 +261,17 @@ deprecated private module Config implements FullStateConfigSig {
     model = ""
   }
 
-  predicate isAdditionalFlowStep(Node node1, FlowState state1, Node node2, FlowState state2) {
+  predicate isAdditionalFlowStep(
+    Node node1, FlowState state1, Node node2, FlowState state2, string model
+  ) {
     getConfig(state1).isAdditionalFlowStep(node1, getState(state1), node2, getState(state2)) and
-    getConfig(state2) = getConfig(state1)
+    getConfig(state2) = getConfig(state1) and
+    model = ""
     or
     not singleConfiguration() and
     getConfig(state1).isAdditionalFlowStep(node1, node2) and
-    state2 = state1
+    state2 = state1 and
+    model = ""
   }
 
   predicate allowImplicitRead(Node node, ContentSet c) {
@@ -283,6 +287,8 @@ deprecated private module Config implements FullStateConfigSig {
   FlowFeature getAFeature() { result = any(Configuration config).getAFeature() }
 
   predicate includeHiddenNodes() { any(Configuration config).includeHiddenNodes() }
+
+  predicate observeDiffInformedIncrementalMode() { none() }
 }
 
 deprecated private import Impl<Config> as I
diff --git a/go/ql/lib/semmle/go/dataflow/internal/DataFlowImpl2.qll b/go/ql/lib/semmle/go/dataflow/internal/DataFlowImpl2.qll
index 359fa71744b..17def0c431d 100644
--- a/go/ql/lib/semmle/go/dataflow/internal/DataFlowImpl2.qll
+++ b/go/ql/lib/semmle/go/dataflow/internal/DataFlowImpl2.qll
@@ -261,13 +261,17 @@ deprecated private module Config implements FullStateConfigSig {
     model = ""
   }
 
-  predicate isAdditionalFlowStep(Node node1, FlowState state1, Node node2, FlowState state2) {
+  predicate isAdditionalFlowStep(
+    Node node1, FlowState state1, Node node2, FlowState state2, string model
+  ) {
     getConfig(state1).isAdditionalFlowStep(node1, getState(state1), node2, getState(state2)) and
-    getConfig(state2) = getConfig(state1)
+    getConfig(state2) = getConfig(state1) and
+    model = ""
     or
     not singleConfiguration() and
     getConfig(state1).isAdditionalFlowStep(node1, node2) and
-    state2 = state1
+    state2 = state1 and
+    model = ""
   }
 
   predicate allowImplicitRead(Node node, ContentSet c) {
@@ -283,6 +287,8 @@ deprecated private module Config implements FullStateConfigSig {
   FlowFeature getAFeature() { result = any(Configuration config).getAFeature() }
 
   predicate includeHiddenNodes() { any(Configuration config).includeHiddenNodes() }
+
+  predicate observeDiffInformedIncrementalMode() { none() }
 }
 
 deprecated private import Impl<Config> as I
diff --git a/go/ql/lib/semmle/go/dataflow/internal/DataFlowNodes.qll b/go/ql/lib/semmle/go/dataflow/internal/DataFlowNodes.qll
index 6b088f44e73..cc353ab64df 100644
--- a/go/ql/lib/semmle/go/dataflow/internal/DataFlowNodes.qll
+++ b/go/ql/lib/semmle/go/dataflow/internal/DataFlowNodes.qll
@@ -525,6 +525,7 @@ module Public {
      * As `getACalleeIncludingExternals`, except excluding external functions (those for which
      * we lack a definition, such as standard library functions).
      */
+    pragma[nomagic]
     FuncDef getACallee() { result = this.getACalleeIncludingExternals().getFuncDef() }
 
     /**
@@ -726,7 +727,10 @@ module Public {
     override string getNodeKind() { result = "external parameter node" }
 
     override Type getType() {
-      result = this.getSummarizedCallable().getType().getParameterType(this.getPos())
+      result =
+        this.getSummarizedCallable()
+            .getType()
+            .getParameterType(pragma[only_bind_into](this.getPos()))
       or
       this.getPos() = -1 and
       result = this.getSummarizedCallable().asFunction().(Method).getReceiverType()
diff --git a/go/ql/lib/semmle/go/dataflow/internal/DataFlowUtil.qll b/go/ql/lib/semmle/go/dataflow/internal/DataFlowUtil.qll
index 9f76e7c7c95..68ffe57f5f5 100644
--- a/go/ql/lib/semmle/go/dataflow/internal/DataFlowUtil.qll
+++ b/go/ql/lib/semmle/go/dataflow/internal/DataFlowUtil.qll
@@ -284,9 +284,11 @@ signature predicate guardChecksSig(Node g, Expr e, boolean branch);
 module BarrierGuard<guardChecksSig/3 guardChecks> {
   /** Gets a node that is safely guarded by the given guard check. */
   Node getABarrierNode() {
-    exists(ControlFlow::ConditionGuardNode guard, SsaWithFields var | result = var.getAUse() |
+    exists(ControlFlow::ConditionGuardNode guard, SsaWithFields var |
+      result = pragma[only_bind_out](var).getAUse()
+    |
       guards(_, guard, _, var) and
-      guard.dominates(result.getBasicBlock())
+      pragma[only_bind_out](guard).dominates(result.getBasicBlock())
     )
   }
 
@@ -339,6 +341,21 @@ module BarrierGuard<guardChecksSig/3 guardChecks> {
     localFlow(pragma[only_bind_out](outp.getNode(c)), resNode)
   }
 
+  private predicate onlyPossibleReturnSatisfyingProperty(
+    FuncDecl fd, FunctionOutput outp, Node ret, DataFlow::Property p
+  ) {
+    exists(boolean b |
+      onlyPossibleReturnOfBool(fd, outp, ret, b) and
+      p.isBoolean(b)
+    )
+    or
+    onlyPossibleReturnOfNonNil(fd, outp, ret) and
+    p.isNonNil()
+    or
+    onlyPossibleReturnOfNil(fd, outp, ret) and
+    p.isNil()
+  }
+
   /**
    * Holds if whenever `p` holds of output `outp` of function `f`, this node
    * is known to validate the input `inp` of `f`.
@@ -353,24 +370,14 @@ module BarrierGuard<guardChecksSig/3 guardChecks> {
   ) {
     exists(FuncDecl fd, Node arg, Node ret |
       fd.getFunction() = f and
-      localFlow(inp.getExitNode(fd), arg) and
-      ret = outp.getEntryNode(fd) and
+      localFlow(inp.getExitNode(fd), pragma[only_bind_out](arg)) and
       (
         // Case: a function like "if someBarrierGuard(arg) { return true } else { return false }"
         exists(ControlFlow::ConditionGuardNode guard |
-          guards(g, guard, arg) and
-          guard.dominates(ret.getBasicBlock())
+          guards(g, pragma[only_bind_out](guard), arg) and
+          guard.dominates(pragma[only_bind_out](ret).getBasicBlock())
         |
-          exists(boolean b |
-            onlyPossibleReturnOfBool(fd, outp, ret, b) and
-            p.isBoolean(b)
-          )
-          or
-          onlyPossibleReturnOfNonNil(fd, outp, ret) and
-          p.isNonNil()
-          or
-          onlyPossibleReturnOfNil(fd, outp, ret) and
-          p.isNil()
+          onlyPossibleReturnSatisfyingProperty(fd, outp, ret, p)
         )
         or
         // Case: a function like "return someBarrierGuard(arg)"
diff --git a/go/ql/lib/semmle/go/dataflow/internal/FlowSummaryImpl.qll b/go/ql/lib/semmle/go/dataflow/internal/FlowSummaryImpl.qll
index 211974f75a5..40c68ceb900 100644
--- a/go/ql/lib/semmle/go/dataflow/internal/FlowSummaryImpl.qll
+++ b/go/ql/lib/semmle/go/dataflow/internal/FlowSummaryImpl.qll
@@ -149,21 +149,63 @@ module SourceSinkInterpretationInput implements
     )
   }
 
+  // Note that due to embedding, which is currently implemented via some
+  // Methods having multiple qualified names, a given Method is liable to have
+  // more than one SourceOrSinkElement, one for each of the names it claims.
   private newtype TSourceOrSinkElement =
-    TEntityElement(Entity e) or
+    TMethodEntityElement(Method m, string pkg, string type, boolean subtypes) {
+      m.hasQualifiedName(pkg, type, _) and
+      subtypes = [true, false]
+    } or
+    TFieldEntityElement(Field f, string pkg, string type, boolean subtypes) {
+      f.hasQualifiedName(pkg, type, _) and
+      subtypes = [true, false]
+    } or
+    TOtherEntityElement(Entity e) {
+      not e instanceof Method and
+      not e instanceof Field
+    } or
     TAstElement(AstNode n)
 
   /** An element representable by CSV modeling. */
   class SourceOrSinkElement extends TSourceOrSinkElement {
     /** Gets this source or sink element as an entity, if it is one. */
-    Entity asEntity() { this = TEntityElement(result) }
+    Entity asEntity() {
+      result = [this.asMethodEntity(), this.asFieldEntity(), this.asOtherEntity()]
+    }
+
+    /** Gets this source or sink element as a method, if it is one. */
+    Method asMethodEntity() { this = TMethodEntityElement(result, _, _, _) }
+
+    /** Gets this source or sink element as a field, if it is one. */
+    Field asFieldEntity() { this = TFieldEntityElement(result, _, _, _) }
+
+    /** Gets this source or sink element as an entity which isn't a field or method, if it is one. */
+    Entity asOtherEntity() { this = TOtherEntityElement(result) }
 
     /** Gets this source or sink element as an AST node, if it is one. */
     AstNode asAstNode() { this = TAstElement(result) }
 
+    /**
+     * Holds if this source or sink element is a method or field that was specified
+     * with the given values for `e`, `pkg`, `type` and `subtypes`.
+     */
+    predicate hasFullInfo(Entity e, string pkg, string type, boolean subtypes) {
+      this = TMethodEntityElement(e, pkg, type, subtypes) or
+      this = TFieldEntityElement(e, pkg, type, subtypes)
+    }
+
     /** Gets a textual representation of this source or sink element. */
     string toString() {
+      (this instanceof TOtherEntityElement or this instanceof TAstElement) and
       result = "element representing " + [this.asEntity().toString(), this.asAstNode().toString()]
+      or
+      exists(Entity e, string pkg, string name, boolean subtypes |
+        this.hasFullInfo(e, pkg, name, subtypes) and
+        result =
+          "element representing " + e.toString() + " with receiver type " + pkg + "." + name +
+            " and subtypes=" + subtypes
+      )
     }
 
     /** Gets the location of this element. */
@@ -203,7 +245,17 @@ module SourceSinkInterpretationInput implements
 
     /** Gets the target of this call, if any. */
     SourceOrSinkElement getCallTarget() {
-      result.asEntity() = this.asCall().getNode().(DataFlow::CallNode).getTarget()
+      exists(DataFlow::CallNode cn, Function callTarget |
+        cn = this.asCall().getNode() and
+        callTarget = cn.getTarget()
+      |
+        (
+          result.asOtherEntity() = callTarget
+          or
+          callTarget instanceof Method and
+          result = getElementWithQualifier(callTarget, cn.getReceiver())
+        )
+      )
     }
 
     /** Gets a textual representation of this node. */
@@ -228,6 +280,105 @@ module SourceSinkInterpretationInput implements
     }
   }
 
+  /**
+   * Gets a method or field spec for `e` which applies in the context of
+   * qualifier `qual`.
+   *
+   * Note that naively checking `e`'s qualified name is not correct, because
+   * `Method`s and `Field`s may have multiple qualified names due to embedding.
+   * We must instead check that the package and type name given by
+   * `result.hasFullInfo` refer to either `qual`'s type or to a type it embeds.
+   */
+  bindingset[e, qual]
+  pragma[inline_late]
+  private SourceOrSinkElement getElementWithQualifier(Entity e, DataFlow::Node qual) {
+    exists(boolean subtypes, Type syntacticQualBaseType, Type targetType |
+      syntacticQualBaseType = getSyntacticQualifierBaseType(qual) and
+      result = constructElement(e, targetType, subtypes)
+    |
+      subtypes = [true, false] and
+      syntacticQualBaseType = targetType
+      or
+      subtypes = true and
+      (
+        // `syntacticQualBaseType`'s underlying type might be an interface type and `sse`
+        // might refer to a method defined on an interface embedded within it.
+        targetType =
+          syntacticQualBaseType.getUnderlyingType().(InterfaceType).getAnEmbeddedInterface()
+        or
+        // `syntacticQualBaseType`'s underlying type might be a struct type and `sse`
+        // might be a promoted method or field in it.
+        targetType = getAnIntermediateEmbeddedType(e, syntacticQualBaseType.getUnderlyingType())
+      )
+    )
+  }
+
+  bindingset[e, targetType, subtypes]
+  pragma[inline_late]
+  private SourceOrSinkElement constructElement(Entity e, Type targetType, boolean subtypes) {
+    exists(string pkg, string typename |
+      targetType.hasQualifiedName(pkg, typename) and
+      result.hasFullInfo(e, pkg, typename, subtypes)
+    )
+  }
+
+  /**
+   * Gets the type of an embedded field of `st` which is on the path to `e`,
+   * which is a promoted method or field of `st`, or its base type if it's a
+   * pointer type.
+   */
+  private Type getAnIntermediateEmbeddedType(Entity e, StructType st) {
+    exists(Field field1, Field field2, int depth1, int depth2, Type t2 |
+      field1 = st.getFieldAtDepth(_, depth1) and
+      field2 = st.getFieldAtDepth(_, depth2) and
+      result = lookThroughPointerType(field1.getType()) and
+      t2 = lookThroughPointerType(field2.getType()) and
+      (
+        field1 = field2
+        or
+        field2 = result.getUnderlyingType().(StructType).getFieldAtDepth(_, depth2 - depth1 - 1)
+      )
+    |
+      e.(Method).getReceiverBaseType() = t2
+      or
+      e.(Field).getDeclaringType() = t2.getUnderlyingType()
+    )
+  }
+
+  /**
+   * Gets the base type of `underlying`, where `n` is of the form
+   * `implicitDeref?(underlying.implicitFieldRead1.implicitFieldRead2...)`
+   *
+   * For Go syntax like `qualifier.method()` or `qualifier.field`, this is the type of `qualifier`, before any
+   * implicit dereference is interposed because `qualifier` is of pointer type, or implicit field accesses
+   * navigate to any embedded struct types that truly host `field`.
+   */
+  private Type getSyntacticQualifierBaseType(DataFlow::Node n) {
+    exists(DataFlow::Node n2 |
+      // look through implicit dereference, if there is one
+      not exists(n.asInstruction().(IR::EvalImplicitDerefInstruction).getOperand()) and
+      n2 = n
+      or
+      n2.asExpr() = n.asInstruction().(IR::EvalImplicitDerefInstruction).getOperand()
+    |
+      result = lookThroughPointerType(skipImplicitFieldReads(n2).getType())
+    )
+  }
+
+  private DataFlow::Node skipImplicitFieldReads(DataFlow::Node n) {
+    not exists(lookThroughImplicitFieldRead(n)) and result = n
+    or
+    result = skipImplicitFieldReads(lookThroughImplicitFieldRead(n))
+  }
+
+  private DataFlow::Node lookThroughImplicitFieldRead(DataFlow::Node n) {
+    result.asInstruction() =
+      n.(DataFlow::InstructionNode)
+          .asInstruction()
+          .(IR::ImplicitFieldReadInstruction)
+          .getBaseInstruction()
+  }
+
   /** Provides additional sink specification logic. */
   bindingset[c]
   predicate interpretOutput(string c, InterpretNode mid, InterpretNode node) {
@@ -242,10 +393,19 @@ module SourceSinkInterpretationInput implements
       e = mid.asElement()
     |
       (c = "Parameter" or c = "") and
-      node.asNode().asParameter() = e.asEntity()
+      n.asParameter() = pragma[only_bind_into](e).asEntity()
       or
-      c = "" and
-      n.(DataFlow::FieldReadNode).getField() = e.asEntity()
+      exists(DataFlow::FieldReadNode frn | frn = n |
+        c = "" and
+        pragma[only_bind_into](e) = getElementWithQualifier(frn.getField(), frn.getBase())
+      )
+      or
+      // A package-scope (or universe-scope) variable
+      exists(Variable v | not v instanceof Field |
+        c = "" and
+        n.(DataFlow::ReadNode).reads(v) and
+        pragma[only_bind_into](e).asEntity() = v
+      )
     )
   }
 
@@ -259,10 +419,24 @@ module SourceSinkInterpretationInput implements
       mid.asCallable() = getNodeEnclosingCallable(ret)
     )
     or
-    exists(DataFlow::Write fw, Field f |
+    exists(SourceOrSinkElement e, DataFlow::Write fw, DataFlow::Node base, Field f |
+      e = mid.asElement() and
+      f = e.asFieldEntity()
+    |
       c = "" and
-      f = mid.asElement().asEntity() and
-      fw.writesField(_, f, node.asNode())
+      fw.writesField(base, f, node.asNode()) and
+      pragma[only_bind_into](e) = getElementWithQualifier(f, base)
+    )
+    or
+    // A package-scope (or universe-scope) variable
+    exists(Node n, SourceOrSinkElement e, DataFlow::Write w, Variable v |
+      n = node.asNode() and
+      e = mid.asElement() and
+      not v instanceof Field
+    |
+      c = "" and
+      w.writes(v, n) and
+      pragma[only_bind_into](e).asEntity() = v
     )
   }
 }
diff --git a/go/ql/lib/semmle/go/dataflow/internal/TaintTrackingUtil.qll b/go/ql/lib/semmle/go/dataflow/internal/TaintTrackingUtil.qll
index 1b521d89d98..5365228e231 100644
--- a/go/ql/lib/semmle/go/dataflow/internal/TaintTrackingUtil.qll
+++ b/go/ql/lib/semmle/go/dataflow/internal/TaintTrackingUtil.qll
@@ -190,6 +190,7 @@ predicate sliceStep(DataFlow::Node pred, DataFlow::Node succ) {
  */
 abstract class FunctionModel extends Function {
   /** Holds if taint propagates through this function from `input` to `output`. */
+  pragma[nomagic]
   abstract predicate hasTaintFlow(FunctionInput input, FunctionOutput output);
 
   /** Gets an input node for this model for the call `c`. */
@@ -202,8 +203,8 @@ abstract class FunctionModel extends Function {
   predicate taintStepForCall(DataFlow::Node pred, DataFlow::Node succ, DataFlow::CallNode c) {
     c = this.getACall() and
     exists(FunctionInput inp, FunctionOutput outp | this.hasTaintFlow(inp, outp) |
-      pred = inp.getNode(c) and
-      succ = outp.getNode(c)
+      pred = pragma[only_bind_out](inp).getNode(c) and
+      succ = pragma[only_bind_out](outp).getNode(c)
     )
   }
 
@@ -382,9 +383,9 @@ predicate inputIsConstantIfOutputHasProperty(
 ) {
   exists(Function f, FunctionInput inp, FunctionOutput outp, DataFlow::CallNode call |
     functionEnsuresInputIsConstant(f, inp, outp, p) and
-    call = f.getACall() and
-    inputNode = inp.getNode(call) and
-    DataFlow::localFlow(outp.getNode(call), outputNode)
+    call = pragma[only_bind_out](f).getACall() and
+    inputNode = pragma[only_bind_out](inp).getNode(call) and
+    DataFlow::localFlow(pragma[only_bind_out](outp).getNode(call), outputNode)
   )
 }
 
@@ -427,3 +428,29 @@ private class ClearSanitizer extends DefaultTaintSanitizer {
     )
   }
 }
+
+import SpeculativeTaintFlow
+
+private module SpeculativeTaintFlow {
+  private import semmle.go.dataflow.internal.DataFlowDispatch as DataFlowDispatch
+
+  /**
+   * Holds if the additional step from `src` to `sink` should be considered in
+   * speculative taint flow exploration.
+   */
+  predicate speculativeTaintStep(DataFlow::Node src, DataFlow::Node sink) {
+    exists(DataFlowPrivate::DataFlowCall call, DataFlowDispatch::ArgumentPosition argpos |
+      // TODO: exclude neutrals and anything that has QL modeling.
+      not exists(DataFlowDispatch::viableCallable(call)) and
+      src.(DataFlow::ArgumentNode).argumentOf(call, argpos)
+    |
+      argpos != -1 and
+      sink.(DataFlow::PostUpdateNode)
+          .getPreUpdateNode()
+          .(DataFlow::ArgumentNode)
+          .argumentOf(call, -1)
+      or
+      sink.(DataFlowPrivate::OutNode).getCall() = call
+    )
+  }
+}
diff --git a/go/ql/lib/semmle/go/frameworks/Afero.qll b/go/ql/lib/semmle/go/frameworks/Afero.qll
index 598036de22b..c03bf611433 100644
--- a/go/ql/lib/semmle/go/frameworks/Afero.qll
+++ b/go/ql/lib/semmle/go/frameworks/Afero.qll
@@ -65,7 +65,7 @@ module Afero {
       exists(Function f |
         f.hasQualifiedName(aferoPackage(),
           ["WriteReader", "SafeWriteReader", "WriteFile", "ReadFile", "ReadDir"]) and
-        this = f.getACall() and
+        this = pragma[only_bind_out](f.getACall()) and
         pathArg = 1 and
         not aferoSanitizer(this.getArgument(0))
       )
@@ -73,7 +73,7 @@ module Afero {
       exists(Method m |
         m.hasQualifiedName(aferoPackage(), "Afero",
           ["WriteReader", "SafeWriteReader", "WriteFile", "ReadFile", "ReadDir"]) and
-        this = m.getACall() and
+        this = pragma[only_bind_out](m.getACall()) and
         pathArg = 0 and
         not aferoSanitizer(this.getReceiver())
       )
diff --git a/go/ql/lib/semmle/go/frameworks/GoMicro.qll b/go/ql/lib/semmle/go/frameworks/GoMicro.qll
index 55f5bded627..116ebee030e 100644
--- a/go/ql/lib/semmle/go/frameworks/GoMicro.qll
+++ b/go/ql/lib/semmle/go/frameworks/GoMicro.qll
@@ -98,6 +98,12 @@ module GoMicro {
     }
   }
 
+  bindingset[m]
+  pragma[inline_late]
+  private predicate implementsServiceType(Method m) {
+    m.implements(any(ServiceInterfaceType i).getNamedType().getMethod(_))
+  }
+
   /**
    * A service handler.
    */
@@ -106,7 +112,7 @@ module GoMicro {
       exists(DataFlow::CallNode call |
         call.getTarget() instanceof ServiceRegisterHandler and
         this = call.getArgument(1).getType().getMethod(_) and
-        this.implements(any(ServiceInterfaceType i).getNamedType().getMethod(_))
+        implementsServiceType(this)
       )
     }
   }
diff --git a/go/ql/lib/semmle/go/frameworks/Twirp.qll b/go/ql/lib/semmle/go/frameworks/Twirp.qll
index 3efd91eee4d..7f338816b38 100644
--- a/go/ql/lib/semmle/go/frameworks/Twirp.qll
+++ b/go/ql/lib/semmle/go/frameworks/Twirp.qll
@@ -118,13 +118,19 @@ module Twirp {
     override string getKind() { result = "URL" }
   }
 
+  bindingset[m]
+  pragma[inline_late]
+  private predicate implementsServiceType(Method m) {
+    m.implements(any(ServiceInterfaceType i).getNamedType().getMethod(_))
+  }
+
   /** A service handler. */
   class ServiceHandler extends Method {
     ServiceHandler() {
       exists(DataFlow::CallNode call |
         call.getTarget() instanceof ServerConstructor and
         this = call.getArgument(0).getType().getMethod(_) and
-        this.implements(any(ServiceInterfaceType i).getNamedType().getMethod(_))
+        implementsServiceType(this)
       )
     }
   }
diff --git a/go/ql/lib/semmle/go/frameworks/stdlib/Fmt.qll b/go/ql/lib/semmle/go/frameworks/stdlib/Fmt.qll
index 950b67483f0..54794ea21c9 100644
--- a/go/ql/lib/semmle/go/frameworks/stdlib/Fmt.qll
+++ b/go/ql/lib/semmle/go/frameworks/stdlib/Fmt.qll
@@ -112,6 +112,15 @@ module Fmt {
     Scanner() { this.hasQualifiedName("fmt", ["Scan", "Scanf", "Scanln"]) }
   }
 
+  private class ScannerSource extends SourceNode {
+    ScannerSource() {
+      // All of the arguments which are sources are varargs.
+      this.asExpr() = any(Scanner s).getACall().getAnImplicitVarargsArgument().asExpr()
+    }
+
+    override string getThreatModel() { result = "stdin" }
+  }
+
   /**
    * The `Fscan` function or one of its variants,
    * all of which read from a specified `io.Reader`.
diff --git a/go/ql/lib/semmle/go/security/CommandInjectionCustomizations.qll b/go/ql/lib/semmle/go/security/CommandInjectionCustomizations.qll
index 6fec1b5d98c..c2874d7cdac 100644
--- a/go/ql/lib/semmle/go/security/CommandInjectionCustomizations.qll
+++ b/go/ql/lib/semmle/go/security/CommandInjectionCustomizations.qll
@@ -31,12 +31,12 @@ module CommandInjection {
   abstract class Sanitizer extends DataFlow::Node { }
 
   /**
-   * DEPRECATED: Use `ThreatModelFlowSource` or `Source` instead.
+   * DEPRECATED: Use `ActiveThreatModelSource` or `Source` instead.
    */
   deprecated class UntrustedFlowAsSource = ThreatModelFlowAsSource;
 
   /** A source of untrusted data, considered as a taint source for command injection. */
-  private class ThreatModelFlowAsSource extends Source instanceof ThreatModelFlowSource { }
+  private class ThreatModelFlowAsSource extends Source instanceof ActiveThreatModelSource { }
 
   /** A command name, considered as a taint sink for command injection. */
   class CommandNameAsSink extends Sink {
diff --git a/go/ql/lib/semmle/go/security/ExternalAPIs.qll b/go/ql/lib/semmle/go/security/ExternalAPIs.qll
index 5eb41dd2579..6799099b999 100644
--- a/go/ql/lib/semmle/go/security/ExternalAPIs.qll
+++ b/go/ql/lib/semmle/go/security/ExternalAPIs.qll
@@ -183,24 +183,24 @@ class UnknownExternalApiDataNode extends ExternalApiDataNode {
 }
 
 private module UntrustedDataConfig implements DataFlow::ConfigSig {
-  predicate isSource(DataFlow::Node source) { source instanceof ThreatModelFlowSource }
+  predicate isSource(DataFlow::Node source) { source instanceof ActiveThreatModelSource }
 
   predicate isSink(DataFlow::Node sink) { sink instanceof ExternalApiDataNode }
 }
 
 /**
- * Tracks data flow from `ThreatModelFlowSource`s to `ExternalApiDataNode`s.
+ * Tracks data flow from `ActiveThreatModelSource`s to `ExternalApiDataNode`s.
  */
 module UntrustedDataToExternalApiFlow = DataFlow::Global<UntrustedDataConfig>;
 
 private module UntrustedDataToUnknownExternalApiConfig implements DataFlow::ConfigSig {
-  predicate isSource(DataFlow::Node source) { source instanceof ThreatModelFlowSource }
+  predicate isSource(DataFlow::Node source) { source instanceof ActiveThreatModelSource }
 
   predicate isSink(DataFlow::Node sink) { sink instanceof UnknownExternalApiDataNode }
 }
 
 /**
- * Tracks data flow from `ThreatModelFlowSource`s to `UnknownExternalApiDataNode`s.
+ * Tracks data flow from `ActiveThreatModelSource`s to `UnknownExternalApiDataNode`s.
  */
 module UntrustedDataToUnknownExternalApiFlow =
   DataFlow::Global<UntrustedDataToUnknownExternalApiConfig>;
diff --git a/go/ql/lib/semmle/go/security/FlowSources.qll b/go/ql/lib/semmle/go/security/FlowSources.qll
index f982419f7c8..258f924b6fb 100644
--- a/go/ql/lib/semmle/go/security/FlowSources.qll
+++ b/go/ql/lib/semmle/go/security/FlowSources.qll
@@ -55,11 +55,18 @@ abstract class SourceNode extends DataFlow::Node {
 }
 
 /**
+ * DEPRECATED: Use `ActiveThreatModelSource` instead.
+ *
  * A class of data flow sources that respects the
  * current threat model configuration.
  */
-class ThreatModelFlowSource extends DataFlow::Node {
-  ThreatModelFlowSource() {
+deprecated class ThreatModelFlowSource = ActiveThreatModelSource;
+
+/**
+ * A data flow source that is enabled in the current threat model configuration.
+ */
+class ActiveThreatModelSource extends DataFlow::Node {
+  ActiveThreatModelSource() {
     exists(string kind |
       // Specific threat model.
       currentThreatModel(kind) and
diff --git a/go/ql/lib/semmle/go/security/LogInjectionCustomizations.qll b/go/ql/lib/semmle/go/security/LogInjectionCustomizations.qll
index 6d93dfa2e5a..188256f9643 100644
--- a/go/ql/lib/semmle/go/security/LogInjectionCustomizations.qll
+++ b/go/ql/lib/semmle/go/security/LogInjectionCustomizations.qll
@@ -26,12 +26,12 @@ module LogInjection {
   abstract class Sanitizer extends DataFlow::Node { }
 
   /**
-   * DEPRECATED: Use `ThreatModelFlowSource` or `Source` instead.
+   * DEPRECATED: Use `ActiveThreatModelSource` or `Source` instead.
    */
   deprecated class UntrustedFlowAsSource = ThreatModelFlowAsSource;
 
   /** A source of untrusted data, considered as a taint source for log injection. */
-  private class ThreatModelFlowAsSource extends Source instanceof ThreatModelFlowSource { }
+  private class ThreatModelFlowAsSource extends Source instanceof ActiveThreatModelSource { }
 
   /** An argument to a logging mechanism. */
   class LoggerSink extends Sink {
diff --git a/go/ql/lib/semmle/go/security/MissingJwtSignatureCheckCustomizations.qll b/go/ql/lib/semmle/go/security/MissingJwtSignatureCheckCustomizations.qll
index e86b20d67e8..e1b153da24a 100644
--- a/go/ql/lib/semmle/go/security/MissingJwtSignatureCheckCustomizations.qll
+++ b/go/ql/lib/semmle/go/security/MissingJwtSignatureCheckCustomizations.qll
@@ -49,7 +49,7 @@ module MissingJwtSignatureCheck {
     }
   }
 
-  private class DefaultSource extends Source instanceof ThreatModelFlowSource { }
+  private class DefaultSource extends Source instanceof ActiveThreatModelSource { }
 
   private class DefaultSink extends Sink {
     DefaultSink() { sinkNode(this, "jwt") }
diff --git a/go/ql/lib/semmle/go/security/OpenUrlRedirectCustomizations.qll b/go/ql/lib/semmle/go/security/OpenUrlRedirectCustomizations.qll
index 8e72b53087a..870edeee962 100644
--- a/go/ql/lib/semmle/go/security/OpenUrlRedirectCustomizations.qll
+++ b/go/ql/lib/semmle/go/security/OpenUrlRedirectCustomizations.qll
@@ -43,14 +43,14 @@ module OpenUrlRedirect {
   }
 
   /**
-   * DEPRECATED: Use `ThreatModelFlowSource` or `Source` instead.
+   * DEPRECATED: Use `ActiveThreatModelSource` or `Source` instead.
    */
   deprecated class UntrustedFlowAsSource = ThreatModelFlowAsSource;
 
   /**
    * A source of third-party user input, considered as a flow source for URL redirects.
    */
-  private class ThreatModelFlowAsSource extends Source instanceof ThreatModelFlowSource {
+  private class ThreatModelFlowAsSource extends Source instanceof ActiveThreatModelSource {
     ThreatModelFlowAsSource() {
       // exclude some fields and methods of URLs that are generally not attacker-controllable for
       // open redirect exploits
@@ -75,6 +75,13 @@ module OpenUrlRedirect {
     }
   }
 
+  bindingset[var, w]
+  pragma[inline_late]
+  private predicate useIsDominated(SsaWithFields var, Write w, DataFlow::ReadNode sanitizedRead) {
+    w.dominatesNode(sanitizedRead.asInstruction()) and
+    sanitizedRead = var.getAUse()
+  }
+
   /**
    * An access to a variable that is preceded by an assignment to its `Path` field.
    *
@@ -83,13 +90,10 @@ module OpenUrlRedirect {
    */
   class PathAssignmentBarrier extends Barrier, Read {
     PathAssignmentBarrier() {
-      exists(Write w, Field f, SsaWithFields var |
-        f.getName() = "Path" and
+      exists(Write w, SsaWithFields var |
         hasHostnameSanitizingSubstring(w.getRhs()) and
-        this = var.getAUse()
-      |
-        w.writesField(var.getAUse(), f, _) and
-        w.dominatesNode(insn)
+        w.writesField(var.getAUse(), any(Field f | f.getName() = "Path"), _) and
+        useIsDominated(var, w, this)
       )
     }
   }
diff --git a/go/ql/lib/semmle/go/security/ReflectedXssCustomizations.qll b/go/ql/lib/semmle/go/security/ReflectedXssCustomizations.qll
index 0d376b9f7da..47e82370830 100644
--- a/go/ql/lib/semmle/go/security/ReflectedXssCustomizations.qll
+++ b/go/ql/lib/semmle/go/security/ReflectedXssCustomizations.qll
@@ -35,14 +35,14 @@ module ReflectedXss {
   }
 
   /**
-   * DEPRECATED: Use `ThreatModelFlowSource` or `Source` instead.
+   * DEPRECATED: Use `ActiveThreatModelSource` or `Source` instead.
    */
   deprecated class UntrustedFlowAsSource = ThreatModelFlowAsSource;
 
   /**
    * A third-party controllable input, considered as a flow source for reflected XSS.
    */
-  private class ThreatModelFlowAsSource extends Source instanceof ThreatModelFlowSource { }
+  private class ThreatModelFlowAsSource extends Source instanceof ActiveThreatModelSource { }
 
   /** An arbitrary XSS sink, considered as a flow sink for stored XSS. */
   private class AnySink extends Sink instanceof SharedXss::Sink { }
diff --git a/go/ql/lib/semmle/go/security/RequestForgeryCustomizations.qll b/go/ql/lib/semmle/go/security/RequestForgeryCustomizations.qll
index b56395cceed..2449ffe488c 100644
--- a/go/ql/lib/semmle/go/security/RequestForgeryCustomizations.qll
+++ b/go/ql/lib/semmle/go/security/RequestForgeryCustomizations.qll
@@ -34,14 +34,14 @@ module RequestForgery {
   abstract class SanitizerEdge extends DataFlow::Node { }
 
   /**
-   * DEPRECATED: Use `ThreatModelFlowSource` or `Source` instead.
+   * DEPRECATED: Use `ActiveThreatModelSource` or `Source` instead.
    */
   deprecated class UntrustedFlowAsSource = ThreatModelFlowAsSource;
 
   /**
    * A third-party controllable input, considered as a flow source for request forgery.
    */
-  private class ThreatModelFlowAsSource extends Source instanceof ThreatModelFlowSource { }
+  private class ThreatModelFlowAsSource extends Source instanceof ActiveThreatModelSource { }
 
   private class DefaultRequestForgerySink extends Sink {
     string kind;
diff --git a/go/ql/lib/semmle/go/security/SqlInjectionCustomizations.qll b/go/ql/lib/semmle/go/security/SqlInjectionCustomizations.qll
index 9d813469ee7..0b2f96a9283 100644
--- a/go/ql/lib/semmle/go/security/SqlInjectionCustomizations.qll
+++ b/go/ql/lib/semmle/go/security/SqlInjectionCustomizations.qll
@@ -26,12 +26,12 @@ module SqlInjection {
   abstract class Sanitizer extends DataFlow::Node { }
 
   /**
-   * DEPRECATED: Use `ThreatModelFlowSource` or `Source` instead.
+   * DEPRECATED: Use `ActiveThreatModelSource` or `Source` instead.
    */
   deprecated class UntrustedFlowAsSource = ThreatModelFlowAsSource;
 
   /** A source of untrusted data, considered as a taint source for SQL injection. */
-  private class ThreatModelFlowAsSource extends Source instanceof ThreatModelFlowSource { }
+  private class ThreatModelFlowAsSource extends Source instanceof ActiveThreatModelSource { }
 
   /** An SQL string, considered as a taint sink for SQL injection. */
   class SqlQueryAsSink extends Sink instanceof SQL::QueryString { }
diff --git a/go/ql/lib/semmle/go/security/TaintedPathCustomizations.qll b/go/ql/lib/semmle/go/security/TaintedPathCustomizations.qll
index 31f8b3ad391..953d9810d53 100644
--- a/go/ql/lib/semmle/go/security/TaintedPathCustomizations.qll
+++ b/go/ql/lib/semmle/go/security/TaintedPathCustomizations.qll
@@ -45,12 +45,12 @@ module TaintedPath {
   }
 
   /**
-   * DEPRECATED: Use `ThreatModelFlowSource` or `Source` instead.
+   * DEPRECATED: Use `ActiveThreatModelSource` or `Source` instead.
    */
   deprecated class UntrustedFlowAsSource = ThreatModelFlowAsSource;
 
   /** A source of untrusted data, considered as a taint source for path traversal. */
-  private class ThreatModelFlowAsSource extends Source instanceof ThreatModelFlowSource { }
+  private class ThreatModelFlowAsSource extends Source instanceof ActiveThreatModelSource { }
 
   /** A path expression, considered as a taint sink for path traversal. */
   class PathAsSink extends Sink {
diff --git a/go/ql/lib/semmle/go/security/UncontrolledAllocationSizeCustomizations.qll b/go/ql/lib/semmle/go/security/UncontrolledAllocationSizeCustomizations.qll
index 7ee4edb0c72..460c95fe3cd 100644
--- a/go/ql/lib/semmle/go/security/UncontrolledAllocationSizeCustomizations.qll
+++ b/go/ql/lib/semmle/go/security/UncontrolledAllocationSizeCustomizations.qll
@@ -21,7 +21,7 @@ module UncontrolledAllocationSize {
   abstract class Sanitizer extends DataFlow::Node { }
 
   /** A source of untrusted data, considered as a taint source for uncontrolled size allocation vulnerabilities. */
-  private class ThreatModelFlowAsSource extends Source instanceof ThreatModelFlowSource { }
+  private class ThreatModelFlowAsSource extends Source instanceof ActiveThreatModelSource { }
 
   /** The size argument of a memory allocation function. */
   private class AllocationSizeAsSink extends Sink instanceof AllocationSizeOverflow::AllocationSize {
diff --git a/go/ql/lib/semmle/go/security/XPathInjectionCustomizations.qll b/go/ql/lib/semmle/go/security/XPathInjectionCustomizations.qll
index 6e99fbf00f5..472ed041ea1 100644
--- a/go/ql/lib/semmle/go/security/XPathInjectionCustomizations.qll
+++ b/go/ql/lib/semmle/go/security/XPathInjectionCustomizations.qll
@@ -25,12 +25,12 @@ module XPathInjection {
   abstract class Sanitizer extends DataFlow::ExprNode { }
 
   /**
-   * DEPRECATED: Use `ThreatModelFlowSource` or `Source` instead.
+   * DEPRECATED: Use `ActiveThreatModelSource` or `Source` instead.
    */
   deprecated class UntrustedFlowAsSource = ThreatModelFlowAsSource;
 
   /** A source of untrusted data, used in an XPath expression. */
-  private class ThreatModelFlowAsSource extends Source instanceof ThreatModelFlowSource { }
+  private class ThreatModelFlowAsSource extends Source instanceof ActiveThreatModelSource { }
 
   /** An XPath expression string, considered as a taint sink for XPath injection. */
   class XPathExpressionStringAsSink extends Sink instanceof XPath::XPathExpressionString { }
diff --git a/go/ql/lib/upgrades/a58b81b1b4c4cccc8ca11731c1db86622f33af57/go.dbscheme b/go/ql/lib/upgrades/a58b81b1b4c4cccc8ca11731c1db86622f33af57/go.dbscheme
new file mode 100644
index 00000000000..4bd57e09327
--- /dev/null
+++ b/go/ql/lib/upgrades/a58b81b1b4c4cccc8ca11731c1db86622f33af57/go.dbscheme
@@ -0,0 +1,552 @@
+/** Auto-generated dbscheme; do not edit. Run `make gen` in directory `go/` to regenerate. */
+
+
+/** Duplicate code **/
+
+duplicateCode(
+  unique int id : @duplication,
+  varchar(900) relativePath : string ref,
+  int equivClass : int ref);
+
+similarCode(
+  unique int id : @similarity,
+  varchar(900) relativePath : string ref,
+  int equivClass : int ref);
+
+@duplication_or_similarity = @duplication | @similarity;
+
+tokens(
+  int id : @duplication_or_similarity ref,
+  int offset : int ref,
+  int beginLine : int ref,
+  int beginColumn : int ref,
+  int endLine : int ref,
+  int endColumn : int ref);
+
+/** External data **/
+
+externalData(
+  int id : @externalDataElement,
+  varchar(900) path : string ref,
+  int column: int ref,
+  varchar(900) value : string ref
+);
+
+snapshotDate(unique date snapshotDate : date ref);
+
+sourceLocationPrefix(varchar(900) prefix : 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;
+
+compilations(unique int id: @compilation, string cwd: string ref);
+
+#keyset[id, num]
+compilation_args(int id: @compilation ref, int num: int ref, string arg: string ref);
+
+#keyset[id, num, kind]
+compilation_time(int id: @compilation ref, int num: int ref, int kind: int ref, float secs: float ref);
+
+diagnostic_for(unique int diagnostic: @diagnostic ref, int compilation: @compilation ref, int file_number: int ref, int file_number_diagnostic_number: int ref);
+
+compilation_finished(unique int id: @compilation ref, float cpu_seconds: float ref, float elapsed_seconds: float ref);
+
+#keyset[id, num]
+compilation_compiling_files(int id: @compilation ref, int num: int ref, int file: @file 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);
+
+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);
+
+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);
+
+containerparent(int parent: @container ref, unique int child: @container ref);
+
+has_location(unique int locatable: @locatable ref, int location: @location ref);
+
+#keyset[parent, idx]
+comment_groups(unique int id: @comment_group, int parent: @file ref, int idx: int ref);
+
+comments(unique int id: @comment, int kind: int ref, int parent: @comment_group ref, int idx: int ref, string text: string ref);
+
+doc_comments(unique int node: @documentable ref, int comment: @comment_group ref);
+
+#keyset[parent, idx]
+exprs(unique int id: @expr, int kind: int ref, int parent: @exprparent ref, int idx: int ref);
+
+literals(unique int expr: @expr ref, string value: string ref, string raw: string ref);
+
+constvalues(unique int expr: @expr ref, string value: string ref, string exact: string ref);
+
+fields(unique int id: @field, int parent: @fieldparent ref, int idx: int ref);
+
+typeparamdecls(unique int id: @typeparamdecl, int parent: @typeparamdeclparent ref, int idx: int ref);
+
+#keyset[parent, idx]
+stmts(unique int id: @stmt, int kind: int ref, int parent: @stmtparent ref, int idx: int ref);
+
+#keyset[parent, idx]
+decls(unique int id: @decl, int kind: int ref, int parent: @declparent ref, int idx: int ref);
+
+#keyset[parent, idx]
+specs(unique int id: @spec, int kind: int ref, int parent: @gendecl ref, int idx: int ref);
+
+scopes(unique int id: @scope, int kind: int ref);
+
+scopenesting(unique int inner: @scope ref, int outer: @scope ref);
+
+scopenodes(unique int node: @scopenode ref, int scope: @localscope ref);
+
+objects(unique int id: @object, int kind: int ref, string name: string ref);
+
+objectscopes(unique int object: @object ref, int scope: @scope ref);
+
+objecttypes(unique int object: @object ref, int tp: @type ref);
+
+methodreceivers(unique int method: @object ref, int receiver: @object ref);
+
+fieldstructs(unique int field: @object ref, int struct: @structtype ref);
+
+methodhosts(int method: @object ref, int host: @namedtype ref);
+
+defs(int ident: @ident ref, int object: @object ref);
+
+uses(int ident: @ident ref, int object: @object ref);
+
+types(unique int id: @type, int kind: int ref);
+
+type_of(unique int expr: @expr ref, int tp: @type ref);
+
+typename(unique int tp: @type ref, string name: string ref);
+
+key_type(unique int map: @maptype ref, int tp: @type ref);
+
+element_type(unique int container: @containertype ref, int tp: @type ref);
+
+base_type(unique int ptr: @pointertype ref, int tp: @type ref);
+
+underlying_type(unique int named: @namedtype ref, int tp: @type ref);
+
+#keyset[parent, index]
+component_types(int parent: @compositetype ref, int index: int ref, string name: string ref, int tp: @type ref);
+
+#keyset[parent, index]
+struct_tags(int parent: @structtype ref, int index: int ref, string tag: string ref);
+
+#keyset[interface, index]
+interface_private_method_ids(int interface: @interfacetype ref, int index: int ref, string id: string ref);
+
+array_length(unique int tp: @arraytype ref, string len: string ref);
+
+type_objects(unique int tp: @type ref, int object: @object ref);
+
+packages(unique int id: @package, string name: string ref, string path: string ref, int scope: @packagescope ref);
+
+#keyset[parent, idx]
+modexprs(unique int id: @modexpr, int kind: int ref, int parent: @modexprparent ref, int idx: int ref);
+
+#keyset[parent, idx]
+modtokens(string token: string ref, int parent: @modexpr ref, int idx: int ref);
+
+#keyset[package, idx]
+errors(unique int id: @error, int kind: int ref, string msg: string ref, string rawpos: string ref,
+       string file: string ref, int line: int ref, int col: int ref, int package: @package ref, int idx: int ref);
+
+has_ellipsis(int id: @callorconversionexpr ref);
+
+variadic(int id: @signaturetype ref);
+
+#keyset[parent, idx]
+typeparam(unique int tp: @typeparamtype ref, string name: string ref, int bound: @compositetype ref,
+          int parent: @typeparamparentobject ref, int idx: int ref);
+
+@container = @file | @folder;
+
+@locatable = @xmllocatable | @node | @localscope;
+
+@node = @documentable | @exprparent | @modexprparent | @fieldparent | @stmtparent | @declparent | @typeparamdeclparent
+      | @scopenode | @comment_group | @comment;
+
+@documentable = @file | @field | @typeparamdecl | @spec | @gendecl | @funcdecl | @modexpr;
+
+@exprparent = @funcdef | @file | @expr | @field | @stmt | @decl | @typeparamdecl | @spec;
+
+@modexprparent = @file | @modexpr;
+
+@fieldparent = @decl | @structtypeexpr | @functypeexpr | @interfacetypeexpr;
+
+@stmtparent = @funcdef | @stmt | @decl;
+
+@declparent = @file | @declstmt;
+
+@typeparamdeclparent = @funcdecl | @typespec;
+
+@funcdef = @funclit | @funcdecl;
+
+@scopenode = @file | @functypeexpr | @blockstmt | @ifstmt | @caseclause | @switchstmt | @commclause | @loopstmt;
+
+@location = @location_default;
+
+@sourceline = @locatable;
+
+case @comment.kind of
+  0 = @slashslashcomment
+| 1 = @slashstarcomment;
+
+case @expr.kind of
+  0 = @badexpr
+| 1 = @ident
+| 2 = @ellipsis
+| 3 = @intlit
+| 4 = @floatlit
+| 5 = @imaglit
+| 6 = @charlit
+| 7 = @stringlit
+| 8 = @funclit
+| 9 = @compositelit
+| 10 = @parenexpr
+| 11 = @selectorexpr
+| 12 = @indexexpr
+| 13 = @genericfunctioninstantiationexpr
+| 14 = @generictypeinstantiationexpr
+| 15 = @sliceexpr
+| 16 = @typeassertexpr
+| 17 = @callorconversionexpr
+| 18 = @starexpr
+| 19 = @keyvalueexpr
+| 20 = @arraytypeexpr
+| 21 = @structtypeexpr
+| 22 = @functypeexpr
+| 23 = @interfacetypeexpr
+| 24 = @maptypeexpr
+| 25 = @typesetliteralexpr
+| 26 = @plusexpr
+| 27 = @minusexpr
+| 28 = @notexpr
+| 29 = @complementexpr
+| 30 = @derefexpr
+| 31 = @addressexpr
+| 32 = @arrowexpr
+| 33 = @lorexpr
+| 34 = @landexpr
+| 35 = @eqlexpr
+| 36 = @neqexpr
+| 37 = @lssexpr
+| 38 = @leqexpr
+| 39 = @gtrexpr
+| 40 = @geqexpr
+| 41 = @addexpr
+| 42 = @subexpr
+| 43 = @orexpr
+| 44 = @xorexpr
+| 45 = @mulexpr
+| 46 = @quoexpr
+| 47 = @remexpr
+| 48 = @shlexpr
+| 49 = @shrexpr
+| 50 = @andexpr
+| 51 = @andnotexpr
+| 52 = @sendchantypeexpr
+| 53 = @recvchantypeexpr
+| 54 = @sendrcvchantypeexpr;
+
+@basiclit = @intlit | @floatlit | @imaglit | @charlit | @stringlit;
+
+@operatorexpr = @logicalexpr | @arithmeticexpr | @bitwiseexpr | @unaryexpr | @binaryexpr;
+
+@logicalexpr = @logicalunaryexpr | @logicalbinaryexpr;
+
+@arithmeticexpr = @arithmeticunaryexpr | @arithmeticbinaryexpr;
+
+@bitwiseexpr = @bitwiseunaryexpr | @bitwisebinaryexpr;
+
+@unaryexpr = @logicalunaryexpr | @bitwiseunaryexpr | @arithmeticunaryexpr | @derefexpr | @addressexpr | @arrowexpr;
+
+@logicalunaryexpr = @notexpr;
+
+@bitwiseunaryexpr = @complementexpr;
+
+@arithmeticunaryexpr = @plusexpr | @minusexpr;
+
+@binaryexpr = @logicalbinaryexpr | @bitwisebinaryexpr | @arithmeticbinaryexpr | @comparison;
+
+@logicalbinaryexpr = @lorexpr | @landexpr;
+
+@bitwisebinaryexpr = @shiftexpr | @orexpr | @xorexpr | @andexpr | @andnotexpr;
+
+@arithmeticbinaryexpr = @addexpr | @subexpr | @mulexpr | @quoexpr | @remexpr;
+
+@shiftexpr = @shlexpr | @shrexpr;
+
+@comparison = @equalitytest | @relationalcomparison;
+
+@equalitytest = @eqlexpr | @neqexpr;
+
+@relationalcomparison = @lssexpr | @leqexpr | @gtrexpr | @geqexpr;
+
+@chantypeexpr = @sendchantypeexpr | @recvchantypeexpr | @sendrcvchantypeexpr;
+
+case @stmt.kind of
+  0 = @badstmt
+| 1 = @declstmt
+| 2 = @emptystmt
+| 3 = @labeledstmt
+| 4 = @exprstmt
+| 5 = @sendstmt
+| 6 = @incstmt
+| 7 = @decstmt
+| 8 = @gostmt
+| 9 = @deferstmt
+| 10 = @returnstmt
+| 11 = @breakstmt
+| 12 = @continuestmt
+| 13 = @gotostmt
+| 14 = @fallthroughstmt
+| 15 = @blockstmt
+| 16 = @ifstmt
+| 17 = @caseclause
+| 18 = @exprswitchstmt
+| 19 = @typeswitchstmt
+| 20 = @commclause
+| 21 = @selectstmt
+| 22 = @forstmt
+| 23 = @rangestmt
+| 24 = @assignstmt
+| 25 = @definestmt
+| 26 = @addassignstmt
+| 27 = @subassignstmt
+| 28 = @mulassignstmt
+| 29 = @quoassignstmt
+| 30 = @remassignstmt
+| 31 = @andassignstmt
+| 32 = @orassignstmt
+| 33 = @xorassignstmt
+| 34 = @shlassignstmt
+| 35 = @shrassignstmt
+| 36 = @andnotassignstmt;
+
+@incdecstmt = @incstmt | @decstmt;
+
+@assignment = @simpleassignstmt | @compoundassignstmt;
+
+@simpleassignstmt = @assignstmt | @definestmt;
+
+@compoundassignstmt = @addassignstmt | @subassignstmt | @mulassignstmt | @quoassignstmt | @remassignstmt
+                    | @andassignstmt | @orassignstmt | @xorassignstmt | @shlassignstmt | @shrassignstmt | @andnotassignstmt;
+
+@branchstmt = @breakstmt | @continuestmt | @gotostmt | @fallthroughstmt;
+
+@switchstmt = @exprswitchstmt | @typeswitchstmt;
+
+@loopstmt = @forstmt | @rangestmt;
+
+case @decl.kind of
+  0 = @baddecl
+| 1 = @importdecl
+| 2 = @constdecl
+| 3 = @typedecl
+| 4 = @vardecl
+| 5 = @funcdecl;
+
+@gendecl = @importdecl | @constdecl | @typedecl | @vardecl;
+
+case @spec.kind of
+  0 = @importspec
+| 1 = @valuespec
+| 2 = @typedefspec
+| 3 = @aliasspec;
+
+@typespec = @typedefspec | @aliasspec;
+
+case @object.kind of
+  0 = @pkgobject
+| 1 = @decltypeobject
+| 2 = @builtintypeobject
+| 3 = @declconstobject
+| 4 = @builtinconstobject
+| 5 = @declvarobject
+| 6 = @declfunctionobject
+| 7 = @builtinfunctionobject
+| 8 = @labelobject;
+
+@typeparamparentobject = @decltypeobject | @declfunctionobject;
+
+@declobject = @decltypeobject | @declconstobject | @declvarobject | @declfunctionobject;
+
+@builtinobject = @builtintypeobject | @builtinconstobject | @builtinfunctionobject;
+
+@typeobject = @decltypeobject | @builtintypeobject;
+
+@valueobject = @constobject | @varobject | @functionobject;
+
+@constobject = @declconstobject | @builtinconstobject;
+
+@varobject = @declvarobject;
+
+@functionobject = @declfunctionobject | @builtinfunctionobject;
+
+case @scope.kind of
+  0 = @universescope
+| 1 = @packagescope
+| 2 = @localscope;
+
+case @type.kind of
+  0 = @invalidtype
+| 1 = @boolexprtype
+| 2 = @inttype
+| 3 = @int8type
+| 4 = @int16type
+| 5 = @int32type
+| 6 = @int64type
+| 7 = @uinttype
+| 8 = @uint8type
+| 9 = @uint16type
+| 10 = @uint32type
+| 11 = @uint64type
+| 12 = @uintptrtype
+| 13 = @float32type
+| 14 = @float64type
+| 15 = @complex64type
+| 16 = @complex128type
+| 17 = @stringexprtype
+| 18 = @unsafepointertype
+| 19 = @boolliteraltype
+| 20 = @intliteraltype
+| 21 = @runeliteraltype
+| 22 = @floatliteraltype
+| 23 = @complexliteraltype
+| 24 = @stringliteraltype
+| 25 = @nilliteraltype
+| 26 = @typeparamtype
+| 27 = @arraytype
+| 28 = @slicetype
+| 29 = @structtype
+| 30 = @pointertype
+| 31 = @interfacetype
+| 32 = @tupletype
+| 33 = @signaturetype
+| 34 = @maptype
+| 35 = @sendchantype
+| 36 = @recvchantype
+| 37 = @sendrcvchantype
+| 38 = @namedtype
+| 39 = @typesetliteraltype;
+
+@basictype = @booltype | @numerictype | @stringtype | @literaltype | @invalidtype | @unsafepointertype;
+
+@booltype = @boolexprtype | @boolliteraltype;
+
+@numerictype = @integertype | @floattype | @complextype;
+
+@integertype = @signedintegertype | @unsignedintegertype;
+
+@signedintegertype = @inttype | @int8type | @int16type | @int32type | @int64type | @intliteraltype | @runeliteraltype;
+
+@unsignedintegertype = @uinttype | @uint8type | @uint16type | @uint32type | @uint64type | @uintptrtype;
+
+@floattype = @float32type | @float64type | @floatliteraltype;
+
+@complextype = @complex64type | @complex128type | @complexliteraltype;
+
+@stringtype = @stringexprtype | @stringliteraltype;
+
+@literaltype = @boolliteraltype | @intliteraltype | @runeliteraltype | @floatliteraltype | @complexliteraltype
+             | @stringliteraltype | @nilliteraltype;
+
+@compositetype = @typeparamtype | @containertype | @structtype | @pointertype | @interfacetype | @tupletype
+               | @signaturetype | @namedtype | @typesetliteraltype;
+
+@containertype = @arraytype | @slicetype | @maptype | @chantype;
+
+@chantype = @sendchantype | @recvchantype | @sendrcvchantype;
+
+case @modexpr.kind of
+  0 = @modcommentblock
+| 1 = @modline
+| 2 = @modlineblock
+| 3 = @modlparen
+| 4 = @modrparen;
+
+case @error.kind of
+  0 = @unknownerror
+| 1 = @listerror
+| 2 = @parseerror
+| 3 = @typeerror;
+
diff --git a/go/ql/lib/upgrades/a58b81b1b4c4cccc8ca11731c1db86622f33af57/old.dbscheme b/go/ql/lib/upgrades/a58b81b1b4c4cccc8ca11731c1db86622f33af57/old.dbscheme
new file mode 100644
index 00000000000..a58b81b1b4c
--- /dev/null
+++ b/go/ql/lib/upgrades/a58b81b1b4c4cccc8ca11731c1db86622f33af57/old.dbscheme
@@ -0,0 +1,546 @@
+/** Auto-generated dbscheme; do not edit. */
+
+
+/** Duplicate code **/
+
+duplicateCode(
+  unique int id : @duplication,
+  varchar(900) relativePath : string ref,
+  int equivClass : int ref);
+
+similarCode(
+  unique int id : @similarity,
+  varchar(900) relativePath : string ref,
+  int equivClass : int ref);
+
+@duplication_or_similarity = @duplication | @similarity;
+
+tokens(
+  int id : @duplication_or_similarity ref,
+  int offset : int ref,
+  int beginLine : int ref,
+  int beginColumn : int ref,
+  int endLine : int ref,
+  int endColumn : int ref);
+
+/** External data **/
+
+externalData(
+  int id : @externalDataElement,
+  varchar(900) path : string ref,
+  int column: int ref,
+  varchar(900) value : string ref
+);
+
+snapshotDate(unique date snapshotDate : date ref);
+
+sourceLocationPrefix(varchar(900) prefix : 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;
+
+compilations(unique int id: @compilation, string cwd: string ref);
+
+#keyset[id, num]
+compilation_args(int id: @compilation ref, int num: int ref, string arg: string ref);
+
+#keyset[id, num, kind]
+compilation_time(int id: @compilation ref, int num: int ref, int kind: int ref, float secs: float ref);
+
+diagnostic_for(unique int diagnostic: @diagnostic ref, int compilation: @compilation ref, int file_number: int ref, int file_number_diagnostic_number: int ref);
+
+compilation_finished(unique int id: @compilation ref, float cpu_seconds: float ref, float elapsed_seconds: float ref);
+
+#keyset[id, num]
+compilation_compiling_files(int id: @compilation ref, int num: int ref, int file: @file 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);
+
+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);
+
+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);
+
+containerparent(int parent: @container ref, unique int child: @container ref);
+
+has_location(unique int locatable: @locatable ref, int location: @location ref);
+
+#keyset[parent, idx]
+comment_groups(unique int id: @comment_group, int parent: @file ref, int idx: int ref);
+
+comments(unique int id: @comment, int kind: int ref, int parent: @comment_group ref, int idx: int ref, string text: string ref);
+
+doc_comments(unique int node: @documentable ref, int comment: @comment_group ref);
+
+#keyset[parent, idx]
+exprs(unique int id: @expr, int kind: int ref, int parent: @exprparent ref, int idx: int ref);
+
+literals(unique int expr: @expr ref, string value: string ref, string raw: string ref);
+
+constvalues(unique int expr: @expr ref, string value: string ref, string exact: string ref);
+
+fields(unique int id: @field, int parent: @fieldparent ref, int idx: int ref);
+
+typeparamdecls(unique int id: @typeparamdecl, int parent: @typeparamdeclparent ref, int idx: int ref);
+
+#keyset[parent, idx]
+stmts(unique int id: @stmt, int kind: int ref, int parent: @stmtparent ref, int idx: int ref);
+
+#keyset[parent, idx]
+decls(unique int id: @decl, int kind: int ref, int parent: @declparent ref, int idx: int ref);
+
+#keyset[parent, idx]
+specs(unique int id: @spec, int kind: int ref, int parent: @gendecl ref, int idx: int ref);
+
+scopes(unique int id: @scope, int kind: int ref);
+
+scopenesting(unique int inner: @scope ref, int outer: @scope ref);
+
+scopenodes(unique int node: @scopenode ref, int scope: @localscope ref);
+
+objects(unique int id: @object, int kind: int ref, string name: string ref);
+
+objectscopes(unique int object: @object ref, int scope: @scope ref);
+
+objecttypes(unique int object: @object ref, int tp: @type ref);
+
+methodreceivers(unique int method: @object ref, int receiver: @object ref);
+
+fieldstructs(unique int field: @object ref, int struct: @structtype ref);
+
+methodhosts(int method: @object ref, int host: @namedtype ref);
+
+defs(int ident: @ident ref, int object: @object ref);
+
+uses(int ident: @ident ref, int object: @object ref);
+
+types(unique int id: @type, int kind: int ref);
+
+type_of(unique int expr: @expr ref, int tp: @type ref);
+
+typename(unique int tp: @type ref, string name: string ref);
+
+key_type(unique int map: @maptype ref, int tp: @type ref);
+
+element_type(unique int container: @containertype ref, int tp: @type ref);
+
+base_type(unique int ptr: @pointertype ref, int tp: @type ref);
+
+underlying_type(unique int named: @namedtype ref, int tp: @type ref);
+
+#keyset[parent, index]
+component_types(int parent: @compositetype ref, int index: int ref, string name: string ref, int tp: @type ref);
+
+array_length(unique int tp: @arraytype ref, string len: string ref);
+
+type_objects(unique int tp: @type ref, int object: @object ref);
+
+packages(unique int id: @package, string name: string ref, string path: string ref, int scope: @packagescope ref);
+
+#keyset[parent, idx]
+modexprs(unique int id: @modexpr, int kind: int ref, int parent: @modexprparent ref, int idx: int ref);
+
+#keyset[parent, idx]
+modtokens(string token: string ref, int parent: @modexpr ref, int idx: int ref);
+
+#keyset[package, idx]
+errors(unique int id: @error, int kind: int ref, string msg: string ref, string rawpos: string ref,
+       string file: string ref, int line: int ref, int col: int ref, int package: @package ref, int idx: int ref);
+
+has_ellipsis(int id: @callorconversionexpr ref);
+
+variadic(int id: @signaturetype ref);
+
+#keyset[parent, idx]
+typeparam(unique int tp: @typeparamtype ref, string name: string ref, int bound: @compositetype ref,
+          int parent: @typeparamparentobject ref, int idx: int ref);
+
+@container = @file | @folder;
+
+@locatable = @xmllocatable | @node | @localscope;
+
+@node = @documentable | @exprparent | @modexprparent | @fieldparent | @stmtparent | @declparent | @typeparamdeclparent
+      | @scopenode | @comment_group | @comment;
+
+@documentable = @file | @field | @typeparamdecl | @spec | @gendecl | @funcdecl | @modexpr;
+
+@exprparent = @funcdef | @file | @expr | @field | @stmt | @decl | @typeparamdecl | @spec;
+
+@modexprparent = @file | @modexpr;
+
+@fieldparent = @decl | @structtypeexpr | @functypeexpr | @interfacetypeexpr;
+
+@stmtparent = @funcdef | @stmt | @decl;
+
+@declparent = @file | @declstmt;
+
+@typeparamdeclparent = @funcdecl | @typespec;
+
+@funcdef = @funclit | @funcdecl;
+
+@scopenode = @file | @functypeexpr | @blockstmt | @ifstmt | @caseclause | @switchstmt | @commclause | @loopstmt;
+
+@location = @location_default;
+
+@sourceline = @locatable;
+
+case @comment.kind of
+  0 = @slashslashcomment
+| 1 = @slashstarcomment;
+
+case @expr.kind of
+  0 = @badexpr
+| 1 = @ident
+| 2 = @ellipsis
+| 3 = @intlit
+| 4 = @floatlit
+| 5 = @imaglit
+| 6 = @charlit
+| 7 = @stringlit
+| 8 = @funclit
+| 9 = @compositelit
+| 10 = @parenexpr
+| 11 = @selectorexpr
+| 12 = @indexexpr
+| 13 = @genericfunctioninstantiationexpr
+| 14 = @generictypeinstantiationexpr
+| 15 = @sliceexpr
+| 16 = @typeassertexpr
+| 17 = @callorconversionexpr
+| 18 = @starexpr
+| 19 = @keyvalueexpr
+| 20 = @arraytypeexpr
+| 21 = @structtypeexpr
+| 22 = @functypeexpr
+| 23 = @interfacetypeexpr
+| 24 = @maptypeexpr
+| 25 = @typesetliteralexpr
+| 26 = @plusexpr
+| 27 = @minusexpr
+| 28 = @notexpr
+| 29 = @complementexpr
+| 30 = @derefexpr
+| 31 = @addressexpr
+| 32 = @arrowexpr
+| 33 = @lorexpr
+| 34 = @landexpr
+| 35 = @eqlexpr
+| 36 = @neqexpr
+| 37 = @lssexpr
+| 38 = @leqexpr
+| 39 = @gtrexpr
+| 40 = @geqexpr
+| 41 = @addexpr
+| 42 = @subexpr
+| 43 = @orexpr
+| 44 = @xorexpr
+| 45 = @mulexpr
+| 46 = @quoexpr
+| 47 = @remexpr
+| 48 = @shlexpr
+| 49 = @shrexpr
+| 50 = @andexpr
+| 51 = @andnotexpr
+| 52 = @sendchantypeexpr
+| 53 = @recvchantypeexpr
+| 54 = @sendrcvchantypeexpr;
+
+@basiclit = @intlit | @floatlit | @imaglit | @charlit | @stringlit;
+
+@operatorexpr = @logicalexpr | @arithmeticexpr | @bitwiseexpr | @unaryexpr | @binaryexpr;
+
+@logicalexpr = @logicalunaryexpr | @logicalbinaryexpr;
+
+@arithmeticexpr = @arithmeticunaryexpr | @arithmeticbinaryexpr;
+
+@bitwiseexpr = @bitwiseunaryexpr | @bitwisebinaryexpr;
+
+@unaryexpr = @logicalunaryexpr | @bitwiseunaryexpr | @arithmeticunaryexpr | @derefexpr | @addressexpr | @arrowexpr;
+
+@logicalunaryexpr = @notexpr;
+
+@bitwiseunaryexpr = @complementexpr;
+
+@arithmeticunaryexpr = @plusexpr | @minusexpr;
+
+@binaryexpr = @logicalbinaryexpr | @bitwisebinaryexpr | @arithmeticbinaryexpr | @comparison;
+
+@logicalbinaryexpr = @lorexpr | @landexpr;
+
+@bitwisebinaryexpr = @shiftexpr | @orexpr | @xorexpr | @andexpr | @andnotexpr;
+
+@arithmeticbinaryexpr = @addexpr | @subexpr | @mulexpr | @quoexpr | @remexpr;
+
+@shiftexpr = @shlexpr | @shrexpr;
+
+@comparison = @equalitytest | @relationalcomparison;
+
+@equalitytest = @eqlexpr | @neqexpr;
+
+@relationalcomparison = @lssexpr | @leqexpr | @gtrexpr | @geqexpr;
+
+@chantypeexpr = @sendchantypeexpr | @recvchantypeexpr | @sendrcvchantypeexpr;
+
+case @stmt.kind of
+  0 = @badstmt
+| 1 = @declstmt
+| 2 = @emptystmt
+| 3 = @labeledstmt
+| 4 = @exprstmt
+| 5 = @sendstmt
+| 6 = @incstmt
+| 7 = @decstmt
+| 8 = @gostmt
+| 9 = @deferstmt
+| 10 = @returnstmt
+| 11 = @breakstmt
+| 12 = @continuestmt
+| 13 = @gotostmt
+| 14 = @fallthroughstmt
+| 15 = @blockstmt
+| 16 = @ifstmt
+| 17 = @caseclause
+| 18 = @exprswitchstmt
+| 19 = @typeswitchstmt
+| 20 = @commclause
+| 21 = @selectstmt
+| 22 = @forstmt
+| 23 = @rangestmt
+| 24 = @assignstmt
+| 25 = @definestmt
+| 26 = @addassignstmt
+| 27 = @subassignstmt
+| 28 = @mulassignstmt
+| 29 = @quoassignstmt
+| 30 = @remassignstmt
+| 31 = @andassignstmt
+| 32 = @orassignstmt
+| 33 = @xorassignstmt
+| 34 = @shlassignstmt
+| 35 = @shrassignstmt
+| 36 = @andnotassignstmt;
+
+@incdecstmt = @incstmt | @decstmt;
+
+@assignment = @simpleassignstmt | @compoundassignstmt;
+
+@simpleassignstmt = @assignstmt | @definestmt;
+
+@compoundassignstmt = @addassignstmt | @subassignstmt | @mulassignstmt | @quoassignstmt | @remassignstmt
+                    | @andassignstmt | @orassignstmt | @xorassignstmt | @shlassignstmt | @shrassignstmt | @andnotassignstmt;
+
+@branchstmt = @breakstmt | @continuestmt | @gotostmt | @fallthroughstmt;
+
+@switchstmt = @exprswitchstmt | @typeswitchstmt;
+
+@loopstmt = @forstmt | @rangestmt;
+
+case @decl.kind of
+  0 = @baddecl
+| 1 = @importdecl
+| 2 = @constdecl
+| 3 = @typedecl
+| 4 = @vardecl
+| 5 = @funcdecl;
+
+@gendecl = @importdecl | @constdecl | @typedecl | @vardecl;
+
+case @spec.kind of
+  0 = @importspec
+| 1 = @valuespec
+| 2 = @typedefspec
+| 3 = @aliasspec;
+
+@typespec = @typedefspec | @aliasspec;
+
+case @object.kind of
+  0 = @pkgobject
+| 1 = @decltypeobject
+| 2 = @builtintypeobject
+| 3 = @declconstobject
+| 4 = @builtinconstobject
+| 5 = @declvarobject
+| 6 = @declfunctionobject
+| 7 = @builtinfunctionobject
+| 8 = @labelobject;
+
+@typeparamparentobject = @decltypeobject | @declfunctionobject;
+
+@declobject = @decltypeobject | @declconstobject | @declvarobject | @declfunctionobject;
+
+@builtinobject = @builtintypeobject | @builtinconstobject | @builtinfunctionobject;
+
+@typeobject = @decltypeobject | @builtintypeobject;
+
+@valueobject = @constobject | @varobject | @functionobject;
+
+@constobject = @declconstobject | @builtinconstobject;
+
+@varobject = @declvarobject;
+
+@functionobject = @declfunctionobject | @builtinfunctionobject;
+
+case @scope.kind of
+  0 = @universescope
+| 1 = @packagescope
+| 2 = @localscope;
+
+case @type.kind of
+  0 = @invalidtype
+| 1 = @boolexprtype
+| 2 = @inttype
+| 3 = @int8type
+| 4 = @int16type
+| 5 = @int32type
+| 6 = @int64type
+| 7 = @uinttype
+| 8 = @uint8type
+| 9 = @uint16type
+| 10 = @uint32type
+| 11 = @uint64type
+| 12 = @uintptrtype
+| 13 = @float32type
+| 14 = @float64type
+| 15 = @complex64type
+| 16 = @complex128type
+| 17 = @stringexprtype
+| 18 = @unsafepointertype
+| 19 = @boolliteraltype
+| 20 = @intliteraltype
+| 21 = @runeliteraltype
+| 22 = @floatliteraltype
+| 23 = @complexliteraltype
+| 24 = @stringliteraltype
+| 25 = @nilliteraltype
+| 26 = @typeparamtype
+| 27 = @arraytype
+| 28 = @slicetype
+| 29 = @structtype
+| 30 = @pointertype
+| 31 = @interfacetype
+| 32 = @tupletype
+| 33 = @signaturetype
+| 34 = @maptype
+| 35 = @sendchantype
+| 36 = @recvchantype
+| 37 = @sendrcvchantype
+| 38 = @namedtype
+| 39 = @typesetliteraltype;
+
+@basictype = @booltype | @numerictype | @stringtype | @literaltype | @invalidtype | @unsafepointertype;
+
+@booltype = @boolexprtype | @boolliteraltype;
+
+@numerictype = @integertype | @floattype | @complextype;
+
+@integertype = @signedintegertype | @unsignedintegertype;
+
+@signedintegertype = @inttype | @int8type | @int16type | @int32type | @int64type | @intliteraltype | @runeliteraltype;
+
+@unsignedintegertype = @uinttype | @uint8type | @uint16type | @uint32type | @uint64type | @uintptrtype;
+
+@floattype = @float32type | @float64type | @floatliteraltype;
+
+@complextype = @complex64type | @complex128type | @complexliteraltype;
+
+@stringtype = @stringexprtype | @stringliteraltype;
+
+@literaltype = @boolliteraltype | @intliteraltype | @runeliteraltype | @floatliteraltype | @complexliteraltype
+             | @stringliteraltype | @nilliteraltype;
+
+@compositetype = @typeparamtype | @containertype | @structtype | @pointertype | @interfacetype | @tupletype
+               | @signaturetype | @namedtype | @typesetliteraltype;
+
+@containertype = @arraytype | @slicetype | @maptype | @chantype;
+
+@chantype = @sendchantype | @recvchantype | @sendrcvchantype;
+
+case @modexpr.kind of
+  0 = @modcommentblock
+| 1 = @modline
+| 2 = @modlineblock
+| 3 = @modlparen
+| 4 = @modrparen;
+
+case @error.kind of
+  0 = @unknownerror
+| 1 = @listerror
+| 2 = @parseerror
+| 3 = @typeerror;
+
diff --git a/go/ql/lib/upgrades/a58b81b1b4c4cccc8ca11731c1db86622f33af57/upgrade.properties b/go/ql/lib/upgrades/a58b81b1b4c4cccc8ca11731c1db86622f33af57/upgrade.properties
new file mode 100644
index 00000000000..68a09f8148c
--- /dev/null
+++ b/go/ql/lib/upgrades/a58b81b1b4c4cccc8ca11731c1db86622f33af57/upgrade.properties
@@ -0,0 +1,2 @@
+description: Add tables for struct tags and interface method IDs
+compatibility: full
diff --git a/go/ql/src/CHANGELOG.md b/go/ql/src/CHANGELOG.md
index cf6d235f496..0e276fda741 100644
--- a/go/ql/src/CHANGELOG.md
+++ b/go/ql/src/CHANGELOG.md
@@ -1,3 +1,17 @@
+## 1.1.2
+
+No user-facing changes.
+
+## 1.1.1
+
+No user-facing changes.
+
+## 1.1.0
+
+### Query Metadata Changes
+
+* The precision of the `go/incorrect-integer-conversion-query` query was decreased from `very-high` to `high`, since there is at least one known class of false positives involving dynamic bounds checking.
+
 ## 1.0.8
 
 No user-facing changes.
diff --git a/go/ql/src/InconsistentCode/LengthComparisonOffByOne.ql b/go/ql/src/InconsistentCode/LengthComparisonOffByOne.ql
index 39c951f0150..fbb1965c5f6 100644
--- a/go/ql/src/InconsistentCode/LengthComparisonOffByOne.ql
+++ b/go/ql/src/InconsistentCode/LengthComparisonOffByOne.ql
@@ -73,7 +73,7 @@ predicate isRegexpMethodCall(DataFlow::MethodCallNode c) {
   exists(NamedType regexp, Type recvtp |
     regexp.getName() = "Regexp" and recvtp = c.getReceiver().getType()
   |
-    recvtp = regexp or recvtp.(PointerType).getBaseType() = regexp
+    lookThroughPointerType(recvtp) = regexp
   )
 }
 
diff --git a/go/ql/src/RedundantCode/RedundantExpr.ql b/go/ql/src/RedundantCode/RedundantExpr.ql
index eaf3d5be3d2..c4b0ea912f5 100644
--- a/go/ql/src/RedundantCode/RedundantExpr.ql
+++ b/go/ql/src/RedundantCode/RedundantExpr.ql
@@ -71,10 +71,6 @@ class AverageExpr extends PotentiallyRedundantExpr, AddExpr {
       this.getLeftOperand().getKind() = this.getRightOperand().getKind()
     )
   }
-
-  override predicate operands(Expr left, Expr right) {
-    left = this.getLeftOperand() and right = this.getRightOperand()
-  }
 }
 
 /** Gets the hash of `nd`, which is the `i`th operand of `red`. */
diff --git a/go/ql/src/Security/CWE-640/EmailInjectionCustomizations.qll b/go/ql/src/Security/CWE-640/EmailInjectionCustomizations.qll
index ca3609bf2a3..92ae2bc9209 100644
--- a/go/ql/src/Security/CWE-640/EmailInjectionCustomizations.qll
+++ b/go/ql/src/Security/CWE-640/EmailInjectionCustomizations.qll
@@ -17,12 +17,12 @@ module EmailInjection {
   abstract class Sink extends DataFlow::Node { }
 
   /**
-   * DEPRECATED: Use `ThreatModelFlowSource` or `Source` instead.
+   * DEPRECATED: Use `ActiveThreatModelSource` or `Source` instead.
    */
   deprecated class UntrustedFlowSourceAsSource = ThreatModelFlowAsSource;
 
   /** A source of untrusted data, considered as a taint source for email injection. */
-  private class ThreatModelFlowAsSource extends Source instanceof ThreatModelFlowSource { }
+  private class ThreatModelFlowAsSource extends Source instanceof ActiveThreatModelSource { }
 
   /**
    * A data-flow node that becomes part of an email considered as a taint sink for email injection.
diff --git a/go/ql/src/Security/CWE-681/IncorrectIntegerConversionQuery.qhelp b/go/ql/src/Security/CWE-681/IncorrectIntegerConversionQuery.qhelp
index 41e338446ed..946c65febf5 100644
--- a/go/ql/src/Security/CWE-681/IncorrectIntegerConversionQuery.qhelp
+++ b/go/ql/src/Security/CWE-681/IncorrectIntegerConversionQuery.qhelp
@@ -27,6 +27,11 @@ the bit size you specified when parsing the number.
 If this is not possible, then add upper (and lower) bound checks specific to each type and
 bit size (you can find the minimum and maximum value for each type in the <code>math</code> package).
 </p>
+<p>
+Note that CodeQL is only able to identify bounds checks that compare against a constant value. When a variable
+is used in the comparison, CodeQL is unable to determine the value of the variable at runtime and will not
+recognize the bounds check.
+</p>
 </recommendation>
 
 <example>
diff --git a/go/ql/src/Security/CWE-681/IncorrectIntegerConversionQuery.ql b/go/ql/src/Security/CWE-681/IncorrectIntegerConversionQuery.ql
index 4497ffe7c4a..a310f024a2d 100644
--- a/go/ql/src/Security/CWE-681/IncorrectIntegerConversionQuery.ql
+++ b/go/ql/src/Security/CWE-681/IncorrectIntegerConversionQuery.ql
@@ -10,7 +10,7 @@
  * @tags security
  *       external/cwe/cwe-190
  *       external/cwe/cwe-681
- * @precision very-high
+ * @precision high
  */
 
 import go
diff --git a/go/ql/src/Security/CWE-798/HardcodedCredentials.ql b/go/ql/src/Security/CWE-798/HardcodedCredentials.ql
index 6dd422413f7..37ebbad8f68 100644
--- a/go/ql/src/Security/CWE-798/HardcodedCredentials.ql
+++ b/go/ql/src/Security/CWE-798/HardcodedCredentials.ql
@@ -23,8 +23,8 @@ import semmle.go.security.SensitiveActions
  */
 predicate isSensitive(DataFlow::Node sink, SensitiveExpr::Classification type) {
   exists(Write write, string name |
-    write.getRhs() = sink and
-    name = write.getLhs().getName() and
+    pragma[only_bind_out](write).getRhs() = sink and
+    name = pragma[only_bind_out](write).getLhs().getName() and
     // allow obvious test password variables
     not name.regexpMatch(HeuristicNames::notSensitive())
   |
diff --git a/go/ql/src/change-notes/released/1.1.0.md b/go/ql/src/change-notes/released/1.1.0.md
new file mode 100644
index 00000000000..b29676add16
--- /dev/null
+++ b/go/ql/src/change-notes/released/1.1.0.md
@@ -0,0 +1,5 @@
+## 1.1.0
+
+### Query Metadata Changes
+
+* The precision of the `go/incorrect-integer-conversion-query` query was decreased from `very-high` to `high`, since there is at least one known class of false positives involving dynamic bounds checking.
diff --git a/go/ql/src/change-notes/released/1.1.1.md b/go/ql/src/change-notes/released/1.1.1.md
new file mode 100644
index 00000000000..7fb56d36610
--- /dev/null
+++ b/go/ql/src/change-notes/released/1.1.1.md
@@ -0,0 +1,3 @@
+## 1.1.1
+
+No user-facing changes.
diff --git a/go/ql/src/change-notes/released/1.1.2.md b/go/ql/src/change-notes/released/1.1.2.md
new file mode 100644
index 00000000000..ce8d2c1a4f3
--- /dev/null
+++ b/go/ql/src/change-notes/released/1.1.2.md
@@ -0,0 +1,3 @@
+## 1.1.2
+
+No user-facing changes.
diff --git a/go/ql/src/codeql-pack.release.yml b/go/ql/src/codeql-pack.release.yml
index 5c55fbd52ed..53ab127707f 100644
--- a/go/ql/src/codeql-pack.release.yml
+++ b/go/ql/src/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.0.8
+lastReleaseVersion: 1.1.2
diff --git a/go/ql/src/experimental/CWE-090/LDAPInjection.qll b/go/ql/src/experimental/CWE-090/LDAPInjection.qll
index a63d7b2e783..4e0a6e290da 100644
--- a/go/ql/src/experimental/CWE-090/LDAPInjection.qll
+++ b/go/ql/src/experimental/CWE-090/LDAPInjection.qll
@@ -98,13 +98,13 @@ private class LdapClientDNSink extends LdapSink {
 /**
  * DEPRECATED: Use `LdapInjectionFlow` instead.
  *
- * A taint-tracking configuration for reasoning about when a `ThreatModelFlowSource`
+ * A taint-tracking configuration for reasoning about when a `ActiveThreatModelSource`
  * flows into an argument or field that is vulnerable to LDAP injection.
  */
 deprecated class LdapInjectionConfiguration extends TaintTracking::Configuration {
   LdapInjectionConfiguration() { this = "Ldap injection" }
 
-  override predicate isSource(DataFlow::Node source) { source instanceof ThreatModelFlowSource }
+  override predicate isSource(DataFlow::Node source) { source instanceof ActiveThreatModelSource }
 
   override predicate isSink(DataFlow::Node sink) { sink instanceof LdapSink }
 
@@ -112,7 +112,7 @@ deprecated class LdapInjectionConfiguration extends TaintTracking::Configuration
 }
 
 private module LdapInjectionConfig implements DataFlow::ConfigSig {
-  predicate isSource(DataFlow::Node source) { source instanceof ThreatModelFlowSource }
+  predicate isSource(DataFlow::Node source) { source instanceof ActiveThreatModelSource }
 
   predicate isSink(DataFlow::Node sink) { sink instanceof LdapSink }
 
@@ -120,7 +120,7 @@ private module LdapInjectionConfig implements DataFlow::ConfigSig {
 }
 
 /**
- * Tracks taint flow for reasoning about when a `ThreatModelFlowSource` flows
+ * Tracks taint flow for reasoning about when a `ActiveThreatModelSource` flows
  * into an argument or field that is vulnerable to LDAP injection.
  */
 module LdapInjectionFlow = TaintTracking::Global<LdapInjectionConfig>;
diff --git a/go/ql/src/experimental/CWE-203/Timing.ql b/go/ql/src/experimental/CWE-203/Timing.ql
index 12f75b74e44..ab0b50a657a 100644
--- a/go/ql/src/experimental/CWE-203/Timing.ql
+++ b/go/ql/src/experimental/CWE-203/Timing.ql
@@ -98,7 +98,7 @@ private class SensitiveStringSink extends Sink {
 
 module Config implements DataFlow::ConfigSig {
   predicate isSource(DataFlow::Node source) {
-    source instanceof ThreatModelFlowSource and not isBadResult(source)
+    source instanceof ActiveThreatModelSource and not isBadResult(source)
   }
 
   predicate isSink(DataFlow::Node sink) { sink instanceof Sink and not isBadResult(sink) }
diff --git a/go/ql/src/experimental/CWE-287/ImproperLdapAuthCustomizations.qll b/go/ql/src/experimental/CWE-287/ImproperLdapAuthCustomizations.qll
index a3016f65372..7a62041a774 100644
--- a/go/ql/src/experimental/CWE-287/ImproperLdapAuthCustomizations.qll
+++ b/go/ql/src/experimental/CWE-287/ImproperLdapAuthCustomizations.qll
@@ -68,7 +68,7 @@ module ImproperLdapAuth {
 
   private module Config implements DataFlow::ConfigSig {
     predicate isSource(DataFlow::Node source) {
-      source instanceof ThreatModelFlowSource or source instanceof EmptyString
+      source instanceof ActiveThreatModelSource or source instanceof EmptyString
     }
 
     predicate isSink(DataFlow::Node sink) { sink instanceof LdapAuthSink }
diff --git a/go/ql/src/experimental/CWE-369/DivideByZero.ql b/go/ql/src/experimental/CWE-369/DivideByZero.ql
index 956a2d55300..b6709b97d71 100644
--- a/go/ql/src/experimental/CWE-369/DivideByZero.ql
+++ b/go/ql/src/experimental/CWE-369/DivideByZero.ql
@@ -28,7 +28,7 @@ predicate divideByZeroSanitizerGuard(DataFlow::Node g, Expr e, boolean branch) {
 }
 
 module Config implements DataFlow::ConfigSig {
-  predicate isSource(DataFlow::Node source) { source instanceof ThreatModelFlowSource }
+  predicate isSource(DataFlow::Node source) { source instanceof ActiveThreatModelSource }
 
   predicate isAdditionalFlowStep(DataFlow::Node node1, DataFlow::Node node2) {
     exists(Function f, DataFlow::CallNode cn | cn = f.getACall() |
diff --git a/go/ql/src/experimental/CWE-74/DsnInjection.ql b/go/ql/src/experimental/CWE-74/DsnInjection.ql
index 76ce22344b4..2b2ee0a62e4 100644
--- a/go/ql/src/experimental/CWE-74/DsnInjection.ql
+++ b/go/ql/src/experimental/CWE-74/DsnInjection.ql
@@ -14,7 +14,7 @@ import DsnInjectionCustomizations
 import DsnInjectionFlow::PathGraph
 
 /** A remote flow source taken as a source for the `DsnInjection` taint-flow configuration. */
-private class ThreatModelFlowAsSource extends Source instanceof ThreatModelFlowSource { }
+private class ThreatModelFlowAsSource extends Source instanceof ActiveThreatModelSource { }
 
 from DsnInjectionFlow::PathNode source, DsnInjectionFlow::PathNode sink
 where DsnInjectionFlow::flowPath(source, sink)
diff --git a/go/ql/src/experimental/CWE-79/HTMLTemplateEscapingPassthrough.ql b/go/ql/src/experimental/CWE-79/HTMLTemplateEscapingPassthrough.ql
index 7918b9694ea..0aff713f26b 100644
--- a/go/ql/src/experimental/CWE-79/HTMLTemplateEscapingPassthrough.ql
+++ b/go/ql/src/experimental/CWE-79/HTMLTemplateEscapingPassthrough.ql
@@ -36,7 +36,7 @@ class PassthroughTypeName extends string {
 }
 
 module UntrustedToPassthroughTypeConversionConfig implements DataFlow::ConfigSig {
-  predicate isSource(DataFlow::Node source) { source instanceof ThreatModelFlowSource }
+  predicate isSource(DataFlow::Node source) { source instanceof ActiveThreatModelSource }
 
   additional predicate isSinkToPassthroughType(DataFlow::TypeCastNode sink, PassthroughTypeName name) {
     exists(Type typ |
@@ -53,7 +53,7 @@ module UntrustedToPassthroughTypeConversionConfig implements DataFlow::ConfigSig
 }
 
 /**
- * Tracks taint flow for reasoning about when a `ThreatModelFlowSource` is
+ * Tracks taint flow for reasoning about when a `ActiveThreatModelSource` is
  * converted into a special "passthrough" type which will not be escaped by the
  * template generator; this allows the injection of arbitrary content (html,
  * css, js) into the generated output of the templates.
@@ -109,13 +109,13 @@ predicate isSinkToTemplateExec(DataFlow::Node sink, DataFlow::CallNode call) {
 }
 
 module FromUntrustedToTemplateExecutionCallConfig implements DataFlow::ConfigSig {
-  predicate isSource(DataFlow::Node source) { source instanceof ThreatModelFlowSource }
+  predicate isSource(DataFlow::Node source) { source instanceof ActiveThreatModelSource }
 
   predicate isSink(DataFlow::Node sink) { isSinkToTemplateExec(sink, _) }
 }
 
 /**
- * Tracks taint flow from a `ThreatModelFlowSource` into a template executor
+ * Tracks taint flow from a `ActiveThreatModelSource` into a template executor
  * call.
  */
 module FromUntrustedToTemplateExecutionCallFlow =
diff --git a/go/ql/src/experimental/CWE-807/SensitiveConditionBypass.qll b/go/ql/src/experimental/CWE-807/SensitiveConditionBypass.qll
index b0dde22c22c..0d4bdfb1dd0 100644
--- a/go/ql/src/experimental/CWE-807/SensitiveConditionBypass.qll
+++ b/go/ql/src/experimental/CWE-807/SensitiveConditionBypass.qll
@@ -52,7 +52,7 @@ deprecated class Configuration extends TaintTracking::Configuration {
   Configuration() { this = "Condtional Expression Check Bypass" }
 
   override predicate isSource(DataFlow::Node source) {
-    source instanceof ThreatModelFlowSource
+    source instanceof ActiveThreatModelSource
     or
     exists(DataFlow::FieldReadNode f |
       f.getField().hasQualifiedName("net/http", "Request", "Host")
@@ -71,7 +71,7 @@ deprecated class Configuration extends TaintTracking::Configuration {
 
 private module Config implements DataFlow::ConfigSig {
   predicate isSource(DataFlow::Node source) {
-    source instanceof ThreatModelFlowSource
+    source instanceof ActiveThreatModelSource
     or
     exists(DataFlow::FieldReadNode f |
       f.getField().hasQualifiedName("net/http", "Request", "Host")
diff --git a/go/ql/src/experimental/CWE-840/ConditionalBypass.ql b/go/ql/src/experimental/CWE-840/ConditionalBypass.ql
index 3ecb323d04b..b70be1ff42d 100644
--- a/go/ql/src/experimental/CWE-840/ConditionalBypass.ql
+++ b/go/ql/src/experimental/CWE-840/ConditionalBypass.ql
@@ -14,7 +14,7 @@ import go
 
 module Config implements DataFlow::ConfigSig {
   predicate isSource(DataFlow::Node source) {
-    source instanceof ThreatModelFlowSource
+    source instanceof ActiveThreatModelSource
     or
     source = any(Field f | f.hasQualifiedName("net/http", "Request", "Host")).getARead()
   }
diff --git a/go/ql/src/experimental/CWE-918/SSRF.qll b/go/ql/src/experimental/CWE-918/SSRF.qll
index dd5eebc8b10..42b017ac487 100644
--- a/go/ql/src/experimental/CWE-918/SSRF.qll
+++ b/go/ql/src/experimental/CWE-918/SSRF.qll
@@ -87,14 +87,14 @@ module ServerSideRequestForgery {
   abstract class SanitizerEdge extends DataFlow::Node { }
 
   /**
-   * DEPRECATED: Use `ThreatModelFlowSource` or `Source` instead.
+   * DEPRECATED: Use `ActiveThreatModelSource` or `Source` instead.
    */
   deprecated class UntrustedFlowAsSource = ThreatModelFlowAsSource;
 
   /**
    * An user controlled input, considered as a flow source for request forgery.
    */
-  private class ThreatModelFlowAsSource extends Source instanceof ThreatModelFlowSource { }
+  private class ThreatModelFlowAsSource extends Source instanceof ActiveThreatModelSource { }
 
   /**
    * The URL of an HTTP request, viewed as a sink for request forgery.
diff --git a/go/ql/src/experimental/CWE-942/CorsMisconfiguration.ql b/go/ql/src/experimental/CWE-942/CorsMisconfiguration.ql
index 11dae56fde9..7a1ff256be1 100644
--- a/go/ql/src/experimental/CWE-942/CorsMisconfiguration.ql
+++ b/go/ql/src/experimental/CWE-942/CorsMisconfiguration.ql
@@ -52,7 +52,7 @@ class AllowCredentialsHeaderWrite extends Http::HeaderWrite {
 }
 
 module UntrustedToAllowOriginHeaderConfig implements DataFlow::ConfigSig {
-  predicate isSource(DataFlow::Node source) { source instanceof ThreatModelFlowSource }
+  predicate isSource(DataFlow::Node source) { source instanceof ActiveThreatModelSource }
 
   additional predicate isSinkHW(DataFlow::Node sink, AllowOriginHeaderWrite hw) {
     sink = hw.getValue()
@@ -70,7 +70,7 @@ module UntrustedToAllowOriginHeaderConfig implements DataFlow::ConfigSig {
 }
 
 module UntrustedToAllowOriginConfigConfig implements DataFlow::ConfigSig {
-  predicate isSource(DataFlow::Node source) { source instanceof ThreatModelFlowSource }
+  predicate isSource(DataFlow::Node source) { source instanceof ActiveThreatModelSource }
 
   additional predicate isSinkWrite(DataFlow::Node sink, GinCors::AllowOriginsWrite w) { sink = w }
 
@@ -78,13 +78,13 @@ module UntrustedToAllowOriginConfigConfig implements DataFlow::ConfigSig {
 }
 
 /**
- * Tracks taint flowfor reasoning about when a `ThreatModelFlowSource` flows to
+ * Tracks taint flowfor reasoning about when a `ActiveThreatModelSource` flows to
  * a `HeaderWrite` that writes an `Access-Control-Allow-Origin` header's value.
  */
 module UntrustedToAllowOriginHeaderFlow = TaintTracking::Global<UntrustedToAllowOriginHeaderConfig>;
 
 /**
- * Tracks taint flowfor reasoning about when a `ThreatModelFlowSource` flows to
+ * Tracks taint flowfor reasoning about when a `ActiveThreatModelSource` flows to
  * a `AllowOriginsWrite` that writes an `Access-Control-Allow-Origin` header's value.
  */
 module UntrustedToAllowOriginConfigFlow = TaintTracking::Global<UntrustedToAllowOriginConfigConfig>;
@@ -121,7 +121,7 @@ predicate allowCredentialsIsSetToTrue(DataFlow::ExprNode allowOriginHW) {
 
 /**
  * Holds if the provided `allowOriginHW` HeaderWrite's value is set using an
- * ThreatModelFlowSource.
+ * ActiveThreatModelSource.
  * The `message` parameter is populated with the warning message to be returned by the query.
  */
 predicate flowsFromUntrustedToAllowOrigin(DataFlow::ExprNode allowOriginHW, string message) {
@@ -169,7 +169,7 @@ class MapRead extends DataFlow::ElementReadNode {
 }
 
 module FromUntrustedConfig implements DataFlow::ConfigSig {
-  predicate isSource(DataFlow::Node source) { source instanceof ThreatModelFlowSource }
+  predicate isSource(DataFlow::Node source) { source instanceof ActiveThreatModelSource }
 
   predicate isSink(DataFlow::Node sink) { isSinkCgn(sink, _) }
 
@@ -208,13 +208,13 @@ module FromUntrustedConfig implements DataFlow::ConfigSig {
 }
 
 /**
- * Tracks taint flow for reasoning about when a `ThreatModelFlowSource` flows
+ * Tracks taint flow for reasoning about when a `ActiveThreatModelSource` flows
  * somewhere.
  */
 module FromUntrustedFlow = TaintTracking::Global<FromUntrustedConfig>;
 
 /**
- * Holds if the provided `allowOriginHW` is also destination of a `ThreatModelFlowSource`.
+ * Holds if the provided `allowOriginHW` is also destination of a `ActiveThreatModelSource`.
  */
 predicate flowsToGuardedByCheckOnUntrusted(DataFlow::ExprNode allowOriginHW) {
   exists(DataFlow::Node sink, ControlFlow::ConditionGuardNode cgn |
diff --git a/go/ql/src/experimental/frameworks/DecompressionBombs.qll b/go/ql/src/experimental/frameworks/DecompressionBombs.qll
index 90df91245bf..5828cd60e52 100644
--- a/go/ql/src/experimental/frameworks/DecompressionBombs.qll
+++ b/go/ql/src/experimental/frameworks/DecompressionBombs.qll
@@ -29,7 +29,7 @@ module DecompressionBomb {
     class FlowState = DecompressionBombs::FlowState;
 
     predicate isSource(DataFlow::Node source, FlowState state) {
-      source instanceof ThreatModelFlowSource and
+      source instanceof ActiveThreatModelSource and
       state = ""
     }
 
diff --git a/go/ql/src/qlpack.yml b/go/ql/src/qlpack.yml
index cd5903f6d7f..68bac4cf1a9 100644
--- a/go/ql/src/qlpack.yml
+++ b/go/ql/src/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/go-queries
-version: 1.0.9-dev
+version: 1.1.3-dev
 groups:
   - go
   - queries
diff --git a/go/ql/test/TestUtilities/InlineExpectationsTestQuery.ql b/go/ql/test/TestUtilities/InlineExpectationsTestQuery.ql
new file mode 100644
index 00000000000..1cf2f5ea1d9
--- /dev/null
+++ b/go/ql/test/TestUtilities/InlineExpectationsTestQuery.ql
@@ -0,0 +1,21 @@
+/**
+ * @kind test-postprocess
+ */
+
+private import go
+private import codeql.util.test.InlineExpectationsTest as T
+private import internal.InlineExpectationsTestImpl
+import T::TestPostProcessing
+import T::TestPostProcessing::Make<Impl, Input>
+
+private module Input implements T::TestPostProcessing::InputSig<Impl> {
+  string getRelativeUrl(Location location) {
+    exists(File f, int startline, int startcolumn, int endline, int endcolumn |
+      location.hasLocationInfo(_, startline, startcolumn, endline, endcolumn) and
+      f = location.getFile()
+    |
+      result =
+        f.getRelativePath() + ":" + startline + ":" + startcolumn + ":" + endline + ":" + endcolumn
+    )
+  }
+}
diff --git a/go/ql/test/TestUtilities/PrettyPrintModels.ql b/go/ql/test/TestUtilities/PrettyPrintModels.ql
index e49f38b2b75..2981d8cb0d6 100644
--- a/go/ql/test/TestUtilities/PrettyPrintModels.ql
+++ b/go/ql/test/TestUtilities/PrettyPrintModels.ql
@@ -4,7 +4,3 @@
 
 import semmle.go.dataflow.ExternalFlow
 import codeql.dataflow.test.ProvenancePathGraph::TestPostProcessing::TranslateProvenanceResults<interpretModelForTest/2>
-
-from string relation, int row, int column, string data
-where results(relation, row, column, data)
-select relation, row, column, data
diff --git a/go/ql/test/experimental/CWE-090/LDAPInjection.expected b/go/ql/test/experimental/CWE-090/LDAPInjection.expected
index f7f3bdedd4b..aeaeda6741c 100644
--- a/go/ql/test/experimental/CWE-090/LDAPInjection.expected
+++ b/go/ql/test/experimental/CWE-090/LDAPInjection.expected
@@ -25,12 +25,9 @@ edges
 | LDAPInjection.go:57:15:57:29 | call to UserAgent | LDAPInjection.go:76:24:76:32 | untrusted | provenance | Src:MaD:1  |
 | LDAPInjection.go:57:15:57:29 | call to UserAgent | LDAPInjection.go:80:22:80:30 | untrusted | provenance | Src:MaD:1  |
 | LDAPInjection.go:57:15:57:29 | call to UserAgent | LDAPInjection.go:81:25:81:33 | untrusted | provenance | Src:MaD:1  |
-| LDAPInjection.go:62:3:62:33 | slice literal [array] | LDAPInjection.go:62:3:62:33 | slice literal | provenance |  |
-| LDAPInjection.go:62:24:62:32 | untrusted | LDAPInjection.go:62:3:62:33 | slice literal [array] | provenance |  |
-| LDAPInjection.go:69:3:69:33 | slice literal [array] | LDAPInjection.go:69:3:69:33 | slice literal | provenance |  |
-| LDAPInjection.go:69:24:69:32 | untrusted | LDAPInjection.go:69:3:69:33 | slice literal [array] | provenance |  |
-| LDAPInjection.go:76:3:76:33 | slice literal [array] | LDAPInjection.go:76:3:76:33 | slice literal | provenance |  |
-| LDAPInjection.go:76:24:76:32 | untrusted | LDAPInjection.go:76:3:76:33 | slice literal [array] | provenance |  |
+| LDAPInjection.go:62:24:62:32 | untrusted | LDAPInjection.go:62:3:62:33 | slice literal | provenance |  |
+| LDAPInjection.go:69:24:69:32 | untrusted | LDAPInjection.go:69:3:69:33 | slice literal | provenance |  |
+| LDAPInjection.go:76:24:76:32 | untrusted | LDAPInjection.go:76:3:76:33 | slice literal | provenance |  |
 models
 | 1 | Source: net/http; Request; true; UserAgent; ; ; ReturnValue; remote; manual |
 nodes
@@ -38,17 +35,14 @@ nodes
 | LDAPInjection.go:59:3:59:11 | untrusted | semmle.label | untrusted |
 | LDAPInjection.go:61:3:61:51 | ...+... | semmle.label | ...+... |
 | LDAPInjection.go:62:3:62:33 | slice literal | semmle.label | slice literal |
-| LDAPInjection.go:62:3:62:33 | slice literal [array] | semmle.label | slice literal [array] |
 | LDAPInjection.go:62:24:62:32 | untrusted | semmle.label | untrusted |
 | LDAPInjection.go:66:3:66:11 | untrusted | semmle.label | untrusted |
 | LDAPInjection.go:68:3:68:51 | ...+... | semmle.label | ...+... |
 | LDAPInjection.go:69:3:69:33 | slice literal | semmle.label | slice literal |
-| LDAPInjection.go:69:3:69:33 | slice literal [array] | semmle.label | slice literal [array] |
 | LDAPInjection.go:69:24:69:32 | untrusted | semmle.label | untrusted |
 | LDAPInjection.go:73:3:73:11 | untrusted | semmle.label | untrusted |
 | LDAPInjection.go:75:3:75:51 | ...+... | semmle.label | ...+... |
 | LDAPInjection.go:76:3:76:33 | slice literal | semmle.label | slice literal |
-| LDAPInjection.go:76:3:76:33 | slice literal [array] | semmle.label | slice literal [array] |
 | LDAPInjection.go:76:24:76:32 | untrusted | semmle.label | untrusted |
 | LDAPInjection.go:80:22:80:30 | untrusted | semmle.label | untrusted |
 | LDAPInjection.go:81:25:81:33 | untrusted | semmle.label | untrusted |
diff --git a/go/ql/test/experimental/CWE-1004/CookieWithoutHttpOnly.expected b/go/ql/test/experimental/CWE-1004/CookieWithoutHttpOnly.expected
index 467f08e74e6..5c7bef1155e 100644
--- a/go/ql/test/experimental/CWE-1004/CookieWithoutHttpOnly.expected
+++ b/go/ql/test/experimental/CWE-1004/CookieWithoutHttpOnly.expected
@@ -7,6 +7,7 @@ edges
 | CookieWithoutHttpOnly.go:15:20:15:21 | &... [pointer] | CookieWithoutHttpOnly.go:15:20:15:21 | &... | provenance |  |
 | CookieWithoutHttpOnly.go:15:20:15:21 | &... [pointer] | CookieWithoutHttpOnly.go:15:20:15:21 | &... | provenance |  |
 | CookieWithoutHttpOnly.go:15:20:15:21 | &... [pointer] | CookieWithoutHttpOnly.go:15:21:15:21 | c | provenance |  |
+| CookieWithoutHttpOnly.go:15:21:15:21 | c | CookieWithoutHttpOnly.go:15:20:15:21 | &... | provenance |  |
 | CookieWithoutHttpOnly.go:15:21:15:21 | c | CookieWithoutHttpOnly.go:15:20:15:21 | &... [pointer] | provenance |  |
 | CookieWithoutHttpOnly.go:19:7:23:2 | struct literal | CookieWithoutHttpOnly.go:24:20:24:21 | &... | provenance |  |
 | CookieWithoutHttpOnly.go:19:7:23:2 | struct literal | CookieWithoutHttpOnly.go:24:20:24:21 | &... | provenance |  |
@@ -24,6 +25,8 @@ edges
 | CookieWithoutHttpOnly.go:24:20:24:21 | &... [pointer] | CookieWithoutHttpOnly.go:24:20:24:21 | &... | provenance |  |
 | CookieWithoutHttpOnly.go:24:20:24:21 | &... [pointer] | CookieWithoutHttpOnly.go:24:21:24:21 | c | provenance |  |
 | CookieWithoutHttpOnly.go:24:20:24:21 | &... [pointer] | CookieWithoutHttpOnly.go:24:21:24:21 | c | provenance |  |
+| CookieWithoutHttpOnly.go:24:21:24:21 | c | CookieWithoutHttpOnly.go:24:20:24:21 | &... | provenance |  |
+| CookieWithoutHttpOnly.go:24:21:24:21 | c | CookieWithoutHttpOnly.go:24:20:24:21 | &... | provenance |  |
 | CookieWithoutHttpOnly.go:24:21:24:21 | c | CookieWithoutHttpOnly.go:24:20:24:21 | &... [pointer] | provenance |  |
 | CookieWithoutHttpOnly.go:24:21:24:21 | c | CookieWithoutHttpOnly.go:24:20:24:21 | &... [pointer] | provenance |  |
 | CookieWithoutHttpOnly.go:28:7:32:2 | struct literal | CookieWithoutHttpOnly.go:33:20:33:21 | &... | provenance |  |
@@ -42,6 +45,8 @@ edges
 | CookieWithoutHttpOnly.go:33:20:33:21 | &... [pointer] | CookieWithoutHttpOnly.go:33:20:33:21 | &... | provenance |  |
 | CookieWithoutHttpOnly.go:33:20:33:21 | &... [pointer] | CookieWithoutHttpOnly.go:33:21:33:21 | c | provenance |  |
 | CookieWithoutHttpOnly.go:33:20:33:21 | &... [pointer] | CookieWithoutHttpOnly.go:33:21:33:21 | c | provenance |  |
+| CookieWithoutHttpOnly.go:33:21:33:21 | c | CookieWithoutHttpOnly.go:33:20:33:21 | &... | provenance |  |
+| CookieWithoutHttpOnly.go:33:21:33:21 | c | CookieWithoutHttpOnly.go:33:20:33:21 | &... | provenance |  |
 | CookieWithoutHttpOnly.go:33:21:33:21 | c | CookieWithoutHttpOnly.go:33:20:33:21 | &... [pointer] | provenance |  |
 | CookieWithoutHttpOnly.go:33:21:33:21 | c | CookieWithoutHttpOnly.go:33:20:33:21 | &... [pointer] | provenance |  |
 | CookieWithoutHttpOnly.go:37:7:40:2 | struct literal | CookieWithoutHttpOnly.go:42:20:42:21 | &... | provenance |  |
@@ -60,6 +65,8 @@ edges
 | CookieWithoutHttpOnly.go:42:20:42:21 | &... [pointer] | CookieWithoutHttpOnly.go:42:20:42:21 | &... | provenance |  |
 | CookieWithoutHttpOnly.go:42:20:42:21 | &... [pointer] | CookieWithoutHttpOnly.go:42:21:42:21 | c | provenance |  |
 | CookieWithoutHttpOnly.go:42:20:42:21 | &... [pointer] | CookieWithoutHttpOnly.go:42:21:42:21 | c | provenance |  |
+| CookieWithoutHttpOnly.go:42:21:42:21 | c | CookieWithoutHttpOnly.go:42:20:42:21 | &... | provenance |  |
+| CookieWithoutHttpOnly.go:42:21:42:21 | c | CookieWithoutHttpOnly.go:42:20:42:21 | &... | provenance |  |
 | CookieWithoutHttpOnly.go:42:21:42:21 | c | CookieWithoutHttpOnly.go:42:20:42:21 | &... [pointer] | provenance |  |
 | CookieWithoutHttpOnly.go:42:21:42:21 | c | CookieWithoutHttpOnly.go:42:20:42:21 | &... [pointer] | provenance |  |
 | CookieWithoutHttpOnly.go:46:7:49:2 | struct literal | CookieWithoutHttpOnly.go:51:20:51:21 | &... | provenance |  |
@@ -78,6 +85,8 @@ edges
 | CookieWithoutHttpOnly.go:51:20:51:21 | &... [pointer] | CookieWithoutHttpOnly.go:51:20:51:21 | &... | provenance |  |
 | CookieWithoutHttpOnly.go:51:20:51:21 | &... [pointer] | CookieWithoutHttpOnly.go:51:21:51:21 | c | provenance |  |
 | CookieWithoutHttpOnly.go:51:20:51:21 | &... [pointer] | CookieWithoutHttpOnly.go:51:21:51:21 | c | provenance |  |
+| CookieWithoutHttpOnly.go:51:21:51:21 | c | CookieWithoutHttpOnly.go:51:20:51:21 | &... | provenance |  |
+| CookieWithoutHttpOnly.go:51:21:51:21 | c | CookieWithoutHttpOnly.go:51:20:51:21 | &... | provenance |  |
 | CookieWithoutHttpOnly.go:51:21:51:21 | c | CookieWithoutHttpOnly.go:51:20:51:21 | &... [pointer] | provenance |  |
 | CookieWithoutHttpOnly.go:51:21:51:21 | c | CookieWithoutHttpOnly.go:51:20:51:21 | &... [pointer] | provenance |  |
 | CookieWithoutHttpOnly.go:55:2:55:4 | definition of val | CookieWithoutHttpOnly.go:59:13:59:15 | val | provenance |  |
@@ -98,6 +107,8 @@ edges
 | CookieWithoutHttpOnly.go:61:20:61:21 | &... [pointer] | CookieWithoutHttpOnly.go:61:20:61:21 | &... | provenance |  |
 | CookieWithoutHttpOnly.go:61:20:61:21 | &... [pointer] | CookieWithoutHttpOnly.go:61:21:61:21 | c | provenance |  |
 | CookieWithoutHttpOnly.go:61:20:61:21 | &... [pointer] | CookieWithoutHttpOnly.go:61:21:61:21 | c | provenance |  |
+| CookieWithoutHttpOnly.go:61:21:61:21 | c | CookieWithoutHttpOnly.go:61:20:61:21 | &... | provenance |  |
+| CookieWithoutHttpOnly.go:61:21:61:21 | c | CookieWithoutHttpOnly.go:61:20:61:21 | &... | provenance |  |
 | CookieWithoutHttpOnly.go:61:21:61:21 | c | CookieWithoutHttpOnly.go:61:20:61:21 | &... [pointer] | provenance |  |
 | CookieWithoutHttpOnly.go:61:21:61:21 | c | CookieWithoutHttpOnly.go:61:20:61:21 | &... [pointer] | provenance |  |
 | CookieWithoutHttpOnly.go:65:2:65:4 | definition of val | CookieWithoutHttpOnly.go:69:13:69:15 | val | provenance |  |
@@ -118,6 +129,8 @@ edges
 | CookieWithoutHttpOnly.go:71:20:71:21 | &... [pointer] | CookieWithoutHttpOnly.go:71:20:71:21 | &... | provenance |  |
 | CookieWithoutHttpOnly.go:71:20:71:21 | &... [pointer] | CookieWithoutHttpOnly.go:71:21:71:21 | c | provenance |  |
 | CookieWithoutHttpOnly.go:71:20:71:21 | &... [pointer] | CookieWithoutHttpOnly.go:71:21:71:21 | c | provenance |  |
+| CookieWithoutHttpOnly.go:71:21:71:21 | c | CookieWithoutHttpOnly.go:71:20:71:21 | &... | provenance |  |
+| CookieWithoutHttpOnly.go:71:21:71:21 | c | CookieWithoutHttpOnly.go:71:20:71:21 | &... | provenance |  |
 | CookieWithoutHttpOnly.go:71:21:71:21 | c | CookieWithoutHttpOnly.go:71:20:71:21 | &... [pointer] | provenance |  |
 | CookieWithoutHttpOnly.go:71:21:71:21 | c | CookieWithoutHttpOnly.go:71:20:71:21 | &... [pointer] | provenance |  |
 | CookieWithoutHttpOnly.go:75:2:75:4 | definition of val | CookieWithoutHttpOnly.go:80:15:80:17 | val | provenance |  |
@@ -138,6 +151,8 @@ edges
 | CookieWithoutHttpOnly.go:81:20:81:21 | &... [pointer] | CookieWithoutHttpOnly.go:81:20:81:21 | &... | provenance |  |
 | CookieWithoutHttpOnly.go:81:20:81:21 | &... [pointer] | CookieWithoutHttpOnly.go:81:21:81:21 | c | provenance |  |
 | CookieWithoutHttpOnly.go:81:20:81:21 | &... [pointer] | CookieWithoutHttpOnly.go:81:21:81:21 | c | provenance |  |
+| CookieWithoutHttpOnly.go:81:21:81:21 | c | CookieWithoutHttpOnly.go:81:20:81:21 | &... | provenance |  |
+| CookieWithoutHttpOnly.go:81:21:81:21 | c | CookieWithoutHttpOnly.go:81:20:81:21 | &... | provenance |  |
 | CookieWithoutHttpOnly.go:81:21:81:21 | c | CookieWithoutHttpOnly.go:81:20:81:21 | &... [pointer] | provenance |  |
 | CookieWithoutHttpOnly.go:81:21:81:21 | c | CookieWithoutHttpOnly.go:81:20:81:21 | &... [pointer] | provenance |  |
 | CookieWithoutHttpOnly.go:85:2:85:4 | definition of val | CookieWithoutHttpOnly.go:90:15:90:17 | val | provenance |  |
@@ -158,6 +173,8 @@ edges
 | CookieWithoutHttpOnly.go:91:20:91:21 | &... [pointer] | CookieWithoutHttpOnly.go:91:20:91:21 | &... | provenance |  |
 | CookieWithoutHttpOnly.go:91:20:91:21 | &... [pointer] | CookieWithoutHttpOnly.go:91:21:91:21 | c | provenance |  |
 | CookieWithoutHttpOnly.go:91:20:91:21 | &... [pointer] | CookieWithoutHttpOnly.go:91:21:91:21 | c | provenance |  |
+| CookieWithoutHttpOnly.go:91:21:91:21 | c | CookieWithoutHttpOnly.go:91:20:91:21 | &... | provenance |  |
+| CookieWithoutHttpOnly.go:91:21:91:21 | c | CookieWithoutHttpOnly.go:91:20:91:21 | &... | provenance |  |
 | CookieWithoutHttpOnly.go:91:21:91:21 | c | CookieWithoutHttpOnly.go:91:20:91:21 | &... [pointer] | provenance |  |
 | CookieWithoutHttpOnly.go:91:21:91:21 | c | CookieWithoutHttpOnly.go:91:20:91:21 | &... [pointer] | provenance |  |
 | CookieWithoutHttpOnly.go:95:7:98:2 | struct literal | CookieWithoutHttpOnly.go:100:20:100:21 | &... | provenance |  |
@@ -168,6 +185,7 @@ edges
 | CookieWithoutHttpOnly.go:100:20:100:21 | &... [pointer] | CookieWithoutHttpOnly.go:100:20:100:21 | &... | provenance |  |
 | CookieWithoutHttpOnly.go:100:20:100:21 | &... [pointer] | CookieWithoutHttpOnly.go:100:20:100:21 | &... | provenance |  |
 | CookieWithoutHttpOnly.go:100:20:100:21 | &... [pointer] | CookieWithoutHttpOnly.go:100:21:100:21 | c | provenance |  |
+| CookieWithoutHttpOnly.go:100:21:100:21 | c | CookieWithoutHttpOnly.go:100:20:100:21 | &... | provenance |  |
 | CookieWithoutHttpOnly.go:100:21:100:21 | c | CookieWithoutHttpOnly.go:100:20:100:21 | &... [pointer] | provenance |  |
 | CookieWithoutHttpOnly.go:104:10:104:18 | "session" | CookieWithoutHttpOnly.go:106:10:106:13 | name | provenance |  |
 | CookieWithoutHttpOnly.go:105:7:108:2 | struct literal | CookieWithoutHttpOnly.go:110:20:110:21 | &... | provenance |  |
@@ -186,6 +204,8 @@ edges
 | CookieWithoutHttpOnly.go:110:20:110:21 | &... [pointer] | CookieWithoutHttpOnly.go:110:20:110:21 | &... | provenance |  |
 | CookieWithoutHttpOnly.go:110:20:110:21 | &... [pointer] | CookieWithoutHttpOnly.go:110:21:110:21 | c | provenance |  |
 | CookieWithoutHttpOnly.go:110:20:110:21 | &... [pointer] | CookieWithoutHttpOnly.go:110:21:110:21 | c | provenance |  |
+| CookieWithoutHttpOnly.go:110:21:110:21 | c | CookieWithoutHttpOnly.go:110:20:110:21 | &... | provenance |  |
+| CookieWithoutHttpOnly.go:110:21:110:21 | c | CookieWithoutHttpOnly.go:110:20:110:21 | &... | provenance |  |
 | CookieWithoutHttpOnly.go:110:21:110:21 | c | CookieWithoutHttpOnly.go:110:20:110:21 | &... [pointer] | provenance |  |
 | CookieWithoutHttpOnly.go:110:21:110:21 | c | CookieWithoutHttpOnly.go:110:20:110:21 | &... [pointer] | provenance |  |
 | CookieWithoutHttpOnly.go:114:13:114:24 | "login_name" | CookieWithoutHttpOnly.go:116:10:116:16 | session | provenance |  |
@@ -205,6 +225,8 @@ edges
 | CookieWithoutHttpOnly.go:120:20:120:21 | &... [pointer] | CookieWithoutHttpOnly.go:120:20:120:21 | &... | provenance |  |
 | CookieWithoutHttpOnly.go:120:20:120:21 | &... [pointer] | CookieWithoutHttpOnly.go:120:21:120:21 | c | provenance |  |
 | CookieWithoutHttpOnly.go:120:20:120:21 | &... [pointer] | CookieWithoutHttpOnly.go:120:21:120:21 | c | provenance |  |
+| CookieWithoutHttpOnly.go:120:21:120:21 | c | CookieWithoutHttpOnly.go:120:20:120:21 | &... | provenance |  |
+| CookieWithoutHttpOnly.go:120:21:120:21 | c | CookieWithoutHttpOnly.go:120:20:120:21 | &... | provenance |  |
 | CookieWithoutHttpOnly.go:120:21:120:21 | c | CookieWithoutHttpOnly.go:120:20:120:21 | &... [pointer] | provenance |  |
 | CookieWithoutHttpOnly.go:120:21:120:21 | c | CookieWithoutHttpOnly.go:120:20:120:21 | &... [pointer] | provenance |  |
 | CookieWithoutHttpOnly.go:123:13:123:49 | call to NewCookieStore | CookieWithoutHttpOnly.go:126:16:126:20 | store | provenance |  |
diff --git a/go/ql/test/experimental/CWE-203/Timing.expected b/go/ql/test/experimental/CWE-203/Timing.expected
index ab2c7ef931c..3da518e95ff 100644
--- a/go/ql/test/experimental/CWE-203/Timing.expected
+++ b/go/ql/test/experimental/CWE-203/Timing.expected
@@ -3,15 +3,15 @@
 | timing.go:30:47:30:58 | headerSecret | timing.go:28:18:28:27 | selection of Header | timing.go:30:47:30:58 | headerSecret | $@ may be vulnerable to timing attacks. | timing.go:28:18:28:27 | selection of Header | Hardcoded String |
 | timing.go:42:25:42:36 | headerSecret | timing.go:41:18:41:27 | selection of Header | timing.go:42:25:42:36 | headerSecret | $@ may be vulnerable to timing attacks. | timing.go:41:18:41:27 | selection of Header | Hardcoded String |
 edges
-| timing.go:15:18:15:27 | selection of Header | timing.go:15:18:15:45 | call to Get | provenance | Src:MaD:2 MaD:1 |
+| timing.go:15:18:15:27 | selection of Header | timing.go:15:18:15:45 | call to Get | provenance | Src:MaD:1 MaD:2 |
 | timing.go:15:18:15:45 | call to Get | timing.go:17:31:17:42 | headerSecret | provenance |  |
-| timing.go:28:18:28:27 | selection of Header | timing.go:28:18:28:45 | call to Get | provenance | Src:MaD:2 MaD:1 |
+| timing.go:28:18:28:27 | selection of Header | timing.go:28:18:28:45 | call to Get | provenance | Src:MaD:1 MaD:2 |
 | timing.go:28:18:28:45 | call to Get | timing.go:30:47:30:58 | headerSecret | provenance |  |
-| timing.go:41:18:41:27 | selection of Header | timing.go:41:18:41:45 | call to Get | provenance | Src:MaD:2 MaD:1 |
+| timing.go:41:18:41:27 | selection of Header | timing.go:41:18:41:45 | call to Get | provenance | Src:MaD:1 MaD:2 |
 | timing.go:41:18:41:45 | call to Get | timing.go:42:25:42:36 | headerSecret | provenance |  |
 models
-| 1 | Summary: net/http; Header; true; Get; ; ; Argument[receiver]; ReturnValue; taint; manual |
-| 2 | Source: net/http; Request; true; Header; ; ; ; remote; manual |
+| 1 | Source: net/http; Request; true; Header; ; ; ; remote; manual |
+| 2 | Summary: net/http; Header; true; Get; ; ; Argument[receiver]; ReturnValue; taint; manual |
 nodes
 | timing.go:15:18:15:27 | selection of Header | semmle.label | selection of Header |
 | timing.go:15:18:15:45 | call to Get | semmle.label | call to Get |
diff --git a/go/ql/test/experimental/CWE-522-DecompressionBombs/DecompressionBombs.expected b/go/ql/test/experimental/CWE-522-DecompressionBombs/DecompressionBombs.expected
index 38b638f5674..34703cdeef4 100644
--- a/go/ql/test/experimental/CWE-522-DecompressionBombs/DecompressionBombs.expected
+++ b/go/ql/test/experimental/CWE-522-DecompressionBombs/DecompressionBombs.expected
@@ -47,50 +47,50 @@
 | test.go:621:25:621:31 | tarRead | test.go:93:5:93:16 | selection of Body | test.go:621:25:621:31 | tarRead | This decompression is $@. | test.go:93:5:93:16 | selection of Body | decompressing compressed data without managing output size |
 | test.go:629:2:629:8 | tarRead | test.go:93:5:93:16 | selection of Body | test.go:629:2:629:8 | tarRead | This decompression is $@. | test.go:93:5:93:16 | selection of Body | decompressing compressed data without managing output size |
 edges
-| test.go:59:16:59:44 | call to FormValue | test.go:128:20:128:27 | definition of filename | provenance | Src:MaD:5  |
-| test.go:60:15:60:26 | selection of Body | test.go:158:19:158:22 | definition of file | provenance | Src:MaD:6  |
-| test.go:61:24:61:35 | selection of Body | test.go:169:28:169:31 | definition of file | provenance | Src:MaD:6  |
-| test.go:62:13:62:24 | selection of Body | test.go:181:17:181:20 | definition of file | provenance | Src:MaD:6  |
-| test.go:64:8:64:19 | selection of Body | test.go:208:12:208:15 | definition of file | provenance | Src:MaD:6  |
-| test.go:66:8:66:19 | selection of Body | test.go:233:12:233:15 | definition of file | provenance | Src:MaD:6  |
-| test.go:68:17:68:28 | selection of Body | test.go:258:21:258:24 | definition of file | provenance | Src:MaD:6  |
-| test.go:70:13:70:24 | selection of Body | test.go:283:17:283:20 | definition of file | provenance | Src:MaD:6  |
-| test.go:72:16:72:27 | selection of Body | test.go:308:20:308:23 | definition of file | provenance | Src:MaD:6  |
-| test.go:74:7:74:18 | selection of Body | test.go:333:11:333:14 | definition of file | provenance | Src:MaD:6  |
-| test.go:76:9:76:20 | selection of Body | test.go:358:13:358:16 | definition of file | provenance | Src:MaD:6  |
-| test.go:78:18:78:29 | selection of Body | test.go:384:22:384:25 | definition of file | provenance | Src:MaD:6  |
-| test.go:80:5:80:16 | selection of Body | test.go:412:9:412:12 | definition of file | provenance | Src:MaD:6  |
-| test.go:82:7:82:18 | selection of Body | test.go:447:11:447:14 | definition of file | provenance | Src:MaD:6  |
-| test.go:84:15:84:26 | selection of Body | test.go:440:19:440:21 | definition of src | provenance | Src:MaD:6  |
-| test.go:85:16:85:27 | selection of Body | test.go:472:20:472:23 | definition of file | provenance | Src:MaD:6  |
-| test.go:87:16:87:27 | selection of Body | test.go:499:20:499:23 | definition of file | provenance | Src:MaD:6  |
-| test.go:89:17:89:28 | selection of Body | test.go:526:21:526:24 | definition of file | provenance | Src:MaD:6  |
-| test.go:91:15:91:26 | selection of Body | test.go:555:19:555:22 | definition of file | provenance | Src:MaD:6  |
-| test.go:93:5:93:16 | selection of Body | test.go:580:9:580:12 | definition of file | provenance | Src:MaD:6  |
+| test.go:59:16:59:44 | call to FormValue | test.go:128:20:128:27 | definition of filename | provenance | Src:MaD:2  |
+| test.go:60:15:60:26 | selection of Body | test.go:158:19:158:22 | definition of file | provenance | Src:MaD:1  |
+| test.go:61:24:61:35 | selection of Body | test.go:169:28:169:31 | definition of file | provenance | Src:MaD:1  |
+| test.go:62:13:62:24 | selection of Body | test.go:181:17:181:20 | definition of file | provenance | Src:MaD:1  |
+| test.go:64:8:64:19 | selection of Body | test.go:208:12:208:15 | definition of file | provenance | Src:MaD:1  |
+| test.go:66:8:66:19 | selection of Body | test.go:233:12:233:15 | definition of file | provenance | Src:MaD:1  |
+| test.go:68:17:68:28 | selection of Body | test.go:258:21:258:24 | definition of file | provenance | Src:MaD:1  |
+| test.go:70:13:70:24 | selection of Body | test.go:283:17:283:20 | definition of file | provenance | Src:MaD:1  |
+| test.go:72:16:72:27 | selection of Body | test.go:308:20:308:23 | definition of file | provenance | Src:MaD:1  |
+| test.go:74:7:74:18 | selection of Body | test.go:333:11:333:14 | definition of file | provenance | Src:MaD:1  |
+| test.go:76:9:76:20 | selection of Body | test.go:358:13:358:16 | definition of file | provenance | Src:MaD:1  |
+| test.go:78:18:78:29 | selection of Body | test.go:384:22:384:25 | definition of file | provenance | Src:MaD:1  |
+| test.go:80:5:80:16 | selection of Body | test.go:412:9:412:12 | definition of file | provenance | Src:MaD:1  |
+| test.go:82:7:82:18 | selection of Body | test.go:447:11:447:14 | definition of file | provenance | Src:MaD:1  |
+| test.go:84:15:84:26 | selection of Body | test.go:440:19:440:21 | definition of src | provenance | Src:MaD:1  |
+| test.go:85:16:85:27 | selection of Body | test.go:472:20:472:23 | definition of file | provenance | Src:MaD:1  |
+| test.go:87:16:87:27 | selection of Body | test.go:499:20:499:23 | definition of file | provenance | Src:MaD:1  |
+| test.go:89:17:89:28 | selection of Body | test.go:526:21:526:24 | definition of file | provenance | Src:MaD:1  |
+| test.go:91:15:91:26 | selection of Body | test.go:555:19:555:22 | definition of file | provenance | Src:MaD:1  |
+| test.go:93:5:93:16 | selection of Body | test.go:580:9:580:12 | definition of file | provenance | Src:MaD:1  |
 | test.go:128:20:128:27 | definition of filename | test.go:130:33:130:40 | filename | provenance |  |
 | test.go:128:20:128:27 | definition of filename | test.go:143:51:143:58 | filename | provenance |  |
 | test.go:130:2:130:41 | ... := ...[0] | test.go:132:12:132:12 | f | provenance |  |
 | test.go:130:33:130:40 | filename | test.go:130:2:130:41 | ... := ...[0] | provenance | Config |
 | test.go:132:3:132:19 | ... := ...[0] | test.go:134:37:134:38 | rc | provenance |  |
-| test.go:132:12:132:12 | f | test.go:132:3:132:19 | ... := ...[0] | provenance | MaD:2 |
+| test.go:132:12:132:12 | f | test.go:132:3:132:19 | ... := ...[0] | provenance | MaD:4 |
 | test.go:143:2:143:59 | ... := ...[0] | test.go:145:12:145:12 | f | provenance |  |
 | test.go:143:51:143:58 | filename | test.go:143:2:143:59 | ... := ...[0] | provenance | Config |
 | test.go:145:12:145:12 | f | test.go:145:12:145:19 | call to Open | provenance | Config |
 | test.go:145:12:145:19 | call to Open | test.go:147:37:147:38 | rc | provenance |  |
 | test.go:158:19:158:22 | definition of file | test.go:159:25:159:28 | file | provenance |  |
 | test.go:159:2:159:29 | ... := ...[0] | test.go:160:48:160:52 | file1 | provenance |  |
-| test.go:159:25:159:28 | file | test.go:159:2:159:29 | ... := ...[0] | provenance | MaD:4 |
+| test.go:159:25:159:28 | file | test.go:159:2:159:29 | ... := ...[0] | provenance | MaD:6 |
 | test.go:160:2:160:69 | ... := ...[0] | test.go:163:26:163:29 | file | provenance |  |
 | test.go:160:32:160:53 | call to NewReader | test.go:160:2:160:69 | ... := ...[0] | provenance | Config |
-| test.go:160:48:160:52 | file1 | test.go:160:32:160:53 | call to NewReader | provenance | MaD:3 |
+| test.go:160:48:160:52 | file1 | test.go:160:32:160:53 | call to NewReader | provenance | MaD:5 |
 | test.go:163:3:163:36 | ... := ...[0] | test.go:164:36:164:51 | fileReaderCloser | provenance |  |
-| test.go:163:26:163:29 | file | test.go:163:3:163:36 | ... := ...[0] | provenance | MaD:2 |
+| test.go:163:26:163:29 | file | test.go:163:3:163:36 | ... := ...[0] | provenance | MaD:4 |
 | test.go:169:28:169:31 | definition of file | test.go:170:25:170:28 | file | provenance |  |
 | test.go:170:2:170:29 | ... := ...[0] | test.go:171:57:171:61 | file2 | provenance |  |
-| test.go:170:25:170:28 | file | test.go:170:2:170:29 | ... := ...[0] | provenance | MaD:4 |
+| test.go:170:25:170:28 | file | test.go:170:2:170:29 | ... := ...[0] | provenance | MaD:6 |
 | test.go:171:2:171:78 | ... := ...[0] | test.go:175:26:175:29 | file | provenance |  |
 | test.go:171:41:171:62 | call to NewReader | test.go:171:2:171:78 | ... := ...[0] | provenance | Config |
-| test.go:171:57:171:61 | file2 | test.go:171:41:171:62 | call to NewReader | provenance | MaD:3 |
+| test.go:171:57:171:61 | file2 | test.go:171:41:171:62 | call to NewReader | provenance | MaD:5 |
 | test.go:175:26:175:29 | file | test.go:175:26:175:36 | call to Open | provenance | Config |
 | test.go:175:26:175:36 | call to Open | test.go:176:36:176:51 | fileReaderCloser | provenance |  |
 | test.go:181:17:181:20 | definition of file | test.go:184:41:184:44 | file | provenance |  |
@@ -98,49 +98,49 @@ edges
 | test.go:184:2:184:73 | ... := ...[0] | test.go:187:26:187:36 | bzip2Reader | provenance |  |
 | test.go:184:41:184:44 | file | test.go:184:2:184:73 | ... := ...[0] | provenance | Config |
 | test.go:187:12:187:37 | call to NewReader | test.go:189:18:189:24 | tarRead | provenance |  |
-| test.go:187:26:187:36 | bzip2Reader | test.go:187:12:187:37 | call to NewReader | provenance | MaD:1 |
+| test.go:187:26:187:36 | bzip2Reader | test.go:187:12:187:37 | call to NewReader | provenance | MaD:3 |
 | test.go:189:18:189:24 | tarRead | test.go:611:22:611:28 | definition of tarRead | provenance |  |
 | test.go:208:12:208:15 | definition of file | test.go:211:33:211:36 | file | provenance |  |
 | test.go:211:17:211:37 | call to NewReader | test.go:213:2:213:12 | bzip2Reader | provenance |  |
 | test.go:211:17:211:37 | call to NewReader | test.go:214:26:214:36 | bzip2Reader | provenance |  |
 | test.go:211:33:211:36 | file | test.go:211:17:211:37 | call to NewReader | provenance | Config |
 | test.go:214:12:214:37 | call to NewReader | test.go:216:18:216:24 | tarRead | provenance |  |
-| test.go:214:26:214:36 | bzip2Reader | test.go:214:12:214:37 | call to NewReader | provenance | MaD:1 |
+| test.go:214:26:214:36 | bzip2Reader | test.go:214:12:214:37 | call to NewReader | provenance | MaD:3 |
 | test.go:216:18:216:24 | tarRead | test.go:611:22:611:28 | definition of tarRead | provenance |  |
 | test.go:233:12:233:15 | definition of file | test.go:236:33:236:36 | file | provenance |  |
 | test.go:236:17:236:37 | call to NewReader | test.go:238:2:238:12 | flateReader | provenance |  |
 | test.go:236:17:236:37 | call to NewReader | test.go:239:26:239:36 | flateReader | provenance |  |
 | test.go:236:33:236:36 | file | test.go:236:17:236:37 | call to NewReader | provenance | Config |
 | test.go:239:12:239:37 | call to NewReader | test.go:241:18:241:24 | tarRead | provenance |  |
-| test.go:239:26:239:36 | flateReader | test.go:239:12:239:37 | call to NewReader | provenance | MaD:1 |
+| test.go:239:26:239:36 | flateReader | test.go:239:12:239:37 | call to NewReader | provenance | MaD:3 |
 | test.go:241:18:241:24 | tarRead | test.go:611:22:611:28 | definition of tarRead | provenance |  |
 | test.go:258:21:258:24 | definition of file | test.go:261:42:261:45 | file | provenance |  |
 | test.go:261:17:261:46 | call to NewReader | test.go:263:2:263:12 | flateReader | provenance |  |
 | test.go:261:17:261:46 | call to NewReader | test.go:264:26:264:36 | flateReader | provenance |  |
 | test.go:261:42:261:45 | file | test.go:261:17:261:46 | call to NewReader | provenance | Config |
 | test.go:264:12:264:37 | call to NewReader | test.go:266:18:266:24 | tarRead | provenance |  |
-| test.go:264:26:264:36 | flateReader | test.go:264:12:264:37 | call to NewReader | provenance | MaD:1 |
+| test.go:264:26:264:36 | flateReader | test.go:264:12:264:37 | call to NewReader | provenance | MaD:3 |
 | test.go:266:18:266:24 | tarRead | test.go:611:22:611:28 | definition of tarRead | provenance |  |
 | test.go:283:17:283:20 | definition of file | test.go:286:41:286:44 | file | provenance |  |
 | test.go:286:2:286:73 | ... := ...[0] | test.go:288:2:288:12 | flateReader | provenance |  |
 | test.go:286:2:286:73 | ... := ...[0] | test.go:289:26:289:36 | flateReader | provenance |  |
 | test.go:286:41:286:44 | file | test.go:286:2:286:73 | ... := ...[0] | provenance | Config |
 | test.go:289:12:289:37 | call to NewReader | test.go:291:18:291:24 | tarRead | provenance |  |
-| test.go:289:26:289:36 | flateReader | test.go:289:12:289:37 | call to NewReader | provenance | MaD:1 |
+| test.go:289:26:289:36 | flateReader | test.go:289:12:289:37 | call to NewReader | provenance | MaD:3 |
 | test.go:291:18:291:24 | tarRead | test.go:611:22:611:28 | definition of tarRead | provenance |  |
 | test.go:308:20:308:23 | definition of file | test.go:311:43:311:46 | file | provenance |  |
 | test.go:311:2:311:47 | ... := ...[0] | test.go:313:2:313:11 | zlibReader | provenance |  |
 | test.go:311:2:311:47 | ... := ...[0] | test.go:314:26:314:35 | zlibReader | provenance |  |
 | test.go:311:43:311:46 | file | test.go:311:2:311:47 | ... := ...[0] | provenance | Config |
 | test.go:314:12:314:36 | call to NewReader | test.go:316:18:316:24 | tarRead | provenance |  |
-| test.go:314:26:314:35 | zlibReader | test.go:314:12:314:36 | call to NewReader | provenance | MaD:1 |
+| test.go:314:26:314:35 | zlibReader | test.go:314:12:314:36 | call to NewReader | provenance | MaD:3 |
 | test.go:316:18:316:24 | tarRead | test.go:611:22:611:28 | definition of tarRead | provenance |  |
 | test.go:333:11:333:14 | definition of file | test.go:336:34:336:37 | file | provenance |  |
 | test.go:336:2:336:38 | ... := ...[0] | test.go:338:2:338:11 | zlibReader | provenance |  |
 | test.go:336:2:336:38 | ... := ...[0] | test.go:339:26:339:35 | zlibReader | provenance |  |
 | test.go:336:34:336:37 | file | test.go:336:2:336:38 | ... := ...[0] | provenance | Config |
 | test.go:339:12:339:36 | call to NewReader | test.go:341:18:341:24 | tarRead | provenance |  |
-| test.go:339:26:339:35 | zlibReader | test.go:339:12:339:36 | call to NewReader | provenance | MaD:1 |
+| test.go:339:26:339:35 | zlibReader | test.go:339:12:339:36 | call to NewReader | provenance | MaD:3 |
 | test.go:341:18:341:24 | tarRead | test.go:611:22:611:28 | definition of tarRead | provenance |  |
 | test.go:358:13:358:16 | definition of file | test.go:361:35:361:38 | file | provenance |  |
 | test.go:361:18:361:39 | call to NewReader | test.go:363:2:363:13 | snappyReader | provenance |  |
@@ -148,7 +148,7 @@ edges
 | test.go:361:18:361:39 | call to NewReader | test.go:365:26:365:37 | snappyReader | provenance |  |
 | test.go:361:35:361:38 | file | test.go:361:18:361:39 | call to NewReader | provenance | Config |
 | test.go:365:12:365:38 | call to NewReader | test.go:367:18:367:24 | tarRead | provenance |  |
-| test.go:365:26:365:37 | snappyReader | test.go:365:12:365:38 | call to NewReader | provenance | MaD:1 |
+| test.go:365:26:365:37 | snappyReader | test.go:365:12:365:38 | call to NewReader | provenance | MaD:3 |
 | test.go:367:18:367:24 | tarRead | test.go:611:22:611:28 | definition of tarRead | provenance |  |
 | test.go:384:22:384:25 | definition of file | test.go:387:44:387:47 | file | provenance |  |
 | test.go:387:18:387:48 | call to NewReader | test.go:389:2:389:13 | snappyReader | provenance |  |
@@ -157,7 +157,7 @@ edges
 | test.go:387:18:387:48 | call to NewReader | test.go:393:26:393:37 | snappyReader | provenance |  |
 | test.go:387:44:387:47 | file | test.go:387:18:387:48 | call to NewReader | provenance | Config |
 | test.go:393:12:393:38 | call to NewReader | test.go:395:18:395:24 | tarRead | provenance |  |
-| test.go:393:26:393:37 | snappyReader | test.go:393:12:393:38 | call to NewReader | provenance | MaD:1 |
+| test.go:393:26:393:37 | snappyReader | test.go:393:12:393:38 | call to NewReader | provenance | MaD:3 |
 | test.go:395:18:395:24 | tarRead | test.go:611:22:611:28 | definition of tarRead | provenance |  |
 | test.go:412:9:412:12 | definition of file | test.go:415:27:415:30 | file | provenance |  |
 | test.go:415:14:415:31 | call to NewReader | test.go:417:2:417:9 | s2Reader | provenance |  |
@@ -166,7 +166,7 @@ edges
 | test.go:415:14:415:31 | call to NewReader | test.go:421:26:421:33 | s2Reader | provenance |  |
 | test.go:415:27:415:30 | file | test.go:415:14:415:31 | call to NewReader | provenance | Config |
 | test.go:421:12:421:34 | call to NewReader | test.go:423:18:423:24 | tarRead | provenance |  |
-| test.go:421:26:421:33 | s2Reader | test.go:421:12:421:34 | call to NewReader | provenance | MaD:1 |
+| test.go:421:26:421:33 | s2Reader | test.go:421:12:421:34 | call to NewReader | provenance | MaD:3 |
 | test.go:423:18:423:24 | tarRead | test.go:611:22:611:28 | definition of tarRead | provenance |  |
 | test.go:440:19:440:21 | definition of src | test.go:441:34:441:36 | src | provenance |  |
 | test.go:441:2:441:37 | ... := ...[0] | test.go:444:12:444:32 | type conversion | provenance |  |
@@ -177,7 +177,7 @@ edges
 | test.go:450:2:450:38 | ... := ...[0] | test.go:453:26:453:35 | gzipReader | provenance |  |
 | test.go:450:34:450:37 | file | test.go:450:2:450:38 | ... := ...[0] | provenance | Config |
 | test.go:453:12:453:36 | call to NewReader | test.go:455:18:455:24 | tarRead | provenance |  |
-| test.go:453:26:453:35 | gzipReader | test.go:453:12:453:36 | call to NewReader | provenance | MaD:1 |
+| test.go:453:26:453:35 | gzipReader | test.go:453:12:453:36 | call to NewReader | provenance | MaD:3 |
 | test.go:455:18:455:24 | tarRead | test.go:611:22:611:28 | definition of tarRead | provenance |  |
 | test.go:472:20:472:23 | definition of file | test.go:475:43:475:46 | file | provenance |  |
 | test.go:475:2:475:47 | ... := ...[0] | test.go:477:2:477:11 | gzipReader | provenance |  |
@@ -185,7 +185,7 @@ edges
 | test.go:475:2:475:47 | ... := ...[0] | test.go:480:26:480:35 | gzipReader | provenance |  |
 | test.go:475:43:475:46 | file | test.go:475:2:475:47 | ... := ...[0] | provenance | Config |
 | test.go:480:12:480:36 | call to NewReader | test.go:482:18:482:24 | tarRead | provenance |  |
-| test.go:480:26:480:35 | gzipReader | test.go:480:12:480:36 | call to NewReader | provenance | MaD:1 |
+| test.go:480:26:480:35 | gzipReader | test.go:480:12:480:36 | call to NewReader | provenance | MaD:3 |
 | test.go:482:18:482:24 | tarRead | test.go:611:22:611:28 | definition of tarRead | provenance |  |
 | test.go:499:20:499:23 | definition of file | test.go:502:45:502:48 | file | provenance |  |
 | test.go:502:2:502:49 | ... := ...[0] | test.go:504:2:504:12 | pgzipReader | provenance |  |
@@ -193,7 +193,7 @@ edges
 | test.go:502:2:502:49 | ... := ...[0] | test.go:507:26:507:36 | pgzipReader | provenance |  |
 | test.go:502:45:502:48 | file | test.go:502:2:502:49 | ... := ...[0] | provenance | Config |
 | test.go:507:12:507:37 | call to NewReader | test.go:509:18:509:24 | tarRead | provenance |  |
-| test.go:507:26:507:36 | pgzipReader | test.go:507:12:507:37 | call to NewReader | provenance | MaD:1 |
+| test.go:507:26:507:36 | pgzipReader | test.go:507:12:507:37 | call to NewReader | provenance | MaD:3 |
 | test.go:509:18:509:24 | tarRead | test.go:611:22:611:28 | definition of tarRead | provenance |  |
 | test.go:526:21:526:24 | definition of file | test.go:529:43:529:46 | file | provenance |  |
 | test.go:529:2:529:47 | ... := ...[0] | test.go:531:2:531:11 | zstdReader | provenance |  |
@@ -202,14 +202,14 @@ edges
 | test.go:529:2:529:47 | ... := ...[0] | test.go:536:26:536:35 | zstdReader | provenance |  |
 | test.go:529:43:529:46 | file | test.go:529:2:529:47 | ... := ...[0] | provenance | Config |
 | test.go:536:12:536:36 | call to NewReader | test.go:538:18:538:24 | tarRead | provenance |  |
-| test.go:536:26:536:35 | zstdReader | test.go:536:12:536:36 | call to NewReader | provenance | MaD:1 |
+| test.go:536:26:536:35 | zstdReader | test.go:536:12:536:36 | call to NewReader | provenance | MaD:3 |
 | test.go:538:18:538:24 | tarRead | test.go:611:22:611:28 | definition of tarRead | provenance |  |
 | test.go:555:19:555:22 | definition of file | test.go:558:38:558:41 | file | provenance |  |
 | test.go:558:16:558:42 | call to NewReader | test.go:560:2:560:11 | zstdReader | provenance |  |
 | test.go:558:16:558:42 | call to NewReader | test.go:561:26:561:35 | zstdReader | provenance |  |
 | test.go:558:38:558:41 | file | test.go:558:16:558:42 | call to NewReader | provenance | Config |
 | test.go:561:12:561:36 | call to NewReader | test.go:563:18:563:24 | tarRead | provenance |  |
-| test.go:561:26:561:35 | zstdReader | test.go:561:12:561:36 | call to NewReader | provenance | MaD:1 |
+| test.go:561:26:561:35 | zstdReader | test.go:561:12:561:36 | call to NewReader | provenance | MaD:3 |
 | test.go:563:18:563:24 | tarRead | test.go:611:22:611:28 | definition of tarRead | provenance |  |
 | test.go:580:9:580:12 | definition of file | test.go:583:30:583:33 | file | provenance |  |
 | test.go:583:2:583:34 | ... := ...[0] | test.go:585:2:585:9 | xzReader | provenance |  |
@@ -217,7 +217,7 @@ edges
 | test.go:583:30:583:33 | file | test.go:583:2:583:34 | ... := ...[0] | provenance | Config |
 | test.go:586:12:586:34 | call to NewReader | test.go:589:18:589:24 | tarRead | provenance |  |
 | test.go:586:12:586:34 | call to NewReader | test.go:590:19:590:25 | tarRead | provenance |  |
-| test.go:586:26:586:33 | xzReader | test.go:586:12:586:34 | call to NewReader | provenance | MaD:1 |
+| test.go:586:26:586:33 | xzReader | test.go:586:12:586:34 | call to NewReader | provenance | MaD:3 |
 | test.go:589:18:589:24 | tarRead | test.go:611:22:611:28 | definition of tarRead | provenance |  |
 | test.go:590:19:590:25 | tarRead | test.go:627:23:627:29 | definition of tarRead | provenance |  |
 | test.go:611:22:611:28 | definition of tarRead | test.go:621:25:621:31 | tarRead | provenance |  |
@@ -231,12 +231,12 @@ edges
 | test.go:611:22:611:28 | definition of tarRead | test.go:621:25:621:31 | tarRead | provenance |  |
 | test.go:627:23:627:29 | definition of tarRead | test.go:629:2:629:8 | tarRead | provenance |  |
 models
-| 1 | Summary: archive/tar; ; false; NewReader; ; ; Argument[0]; ReturnValue; taint; manual |
-| 2 | Summary: archive/zip; File; true; Open; ; ; Argument[receiver]; ReturnValue[0]; taint; manual |
-| 3 | Summary: bytes; ; false; NewReader; ; ; Argument[0]; ReturnValue; taint; manual |
-| 4 | Summary: io; ; false; ReadAll; ; ; Argument[0]; ReturnValue[0]; taint; manual |
-| 5 | Source: net/http; Request; true; FormValue; ; ; ReturnValue; remote; manual |
-| 6 | Source: net/http; Request; true; Body; ; ; ; remote; manual |
+| 1 | Source: net/http; Request; true; Body; ; ; ; remote; manual |
+| 2 | Source: net/http; Request; true; FormValue; ; ; ReturnValue; remote; manual |
+| 3 | Summary: archive/tar; ; false; NewReader; ; ; Argument[0]; ReturnValue; taint; manual |
+| 4 | Summary: archive/zip; File; true; Open; ; ; Argument[receiver]; ReturnValue[0]; taint; manual |
+| 5 | Summary: bytes; ; false; NewReader; ; ; Argument[0]; ReturnValue; taint; manual |
+| 6 | Summary: io; ; false; ReadAll; ; ; Argument[0]; ReturnValue[0]; taint; manual |
 nodes
 | test.go:59:16:59:44 | call to FormValue | semmle.label | call to FormValue |
 | test.go:60:15:60:26 | selection of Body | semmle.label | selection of Body |
diff --git a/go/ql/test/experimental/CWE-74/DsnInjection.expected b/go/ql/test/experimental/CWE-74/DsnInjection.expected
index a1ab6644873..e1f66aa1413 100644
--- a/go/ql/test/experimental/CWE-74/DsnInjection.expected
+++ b/go/ql/test/experimental/CWE-74/DsnInjection.expected
@@ -1,14 +1,14 @@
 #select
 | Dsn.go:50:29:50:33 | dbDSN | Dsn.go:47:10:47:30 | call to FormValue | Dsn.go:50:29:50:33 | dbDSN | Data-Source Name is built using $@. | Dsn.go:47:10:47:30 | call to FormValue | untrusted user input |
 edges
-| Dsn.go:47:10:47:30 | call to FormValue | Dsn.go:49:102:49:105 | name | provenance | Src:MaD:2  |
-| Dsn.go:49:11:49:106 | []type{args} [array] | Dsn.go:49:11:49:106 | call to Sprintf | provenance | MaD:1 |
+| Dsn.go:47:10:47:30 | call to FormValue | Dsn.go:49:102:49:105 | name | provenance | Src:MaD:1  |
+| Dsn.go:49:11:49:106 | []type{args} [array] | Dsn.go:49:11:49:106 | call to Sprintf | provenance | MaD:2 |
 | Dsn.go:49:11:49:106 | call to Sprintf | Dsn.go:50:29:50:33 | dbDSN | provenance |  |
 | Dsn.go:49:102:49:105 | name | Dsn.go:49:11:49:106 | []type{args} [array] | provenance |  |
 | Dsn.go:49:102:49:105 | name | Dsn.go:49:11:49:106 | call to Sprintf | provenance | FunctionModel |
 models
-| 1 | Summary: fmt; ; true; Sprintf; ; ; Argument[1].ArrayElement; ReturnValue; taint; manual |
-| 2 | Source: net/http; Request; true; FormValue; ; ; ReturnValue; remote; manual |
+| 1 | Source: net/http; Request; true; FormValue; ; ; ReturnValue; remote; manual |
+| 2 | Summary: fmt; ; false; Sprintf; ; ; Argument[1].ArrayElement; ReturnValue; taint; manual |
 nodes
 | Dsn.go:47:10:47:30 | call to FormValue | semmle.label | call to FormValue |
 | Dsn.go:49:11:49:106 | []type{args} [array] | semmle.label | []type{args} [array] |
diff --git a/go/ql/test/experimental/CWE-74/DsnInjectionLocal.expected b/go/ql/test/experimental/CWE-74/DsnInjectionLocal.expected
index 7b433794a6c..ff83f06ebb2 100644
--- a/go/ql/test/experimental/CWE-74/DsnInjectionLocal.expected
+++ b/go/ql/test/experimental/CWE-74/DsnInjectionLocal.expected
@@ -22,7 +22,7 @@ edges
 | Dsn.go:67:102:67:108 | selection of dsn | Dsn.go:67:11:67:109 | []type{args} [array] | provenance |  |
 | Dsn.go:67:102:67:108 | selection of dsn | Dsn.go:67:11:67:109 | call to Sprintf | provenance | FunctionModel |
 models
-| 1 | Summary: fmt; ; true; Sprintf; ; ; Argument[1].ArrayElement; ReturnValue; taint; manual |
+| 1 | Summary: fmt; ; false; Sprintf; ; ; Argument[1].ArrayElement; ReturnValue; taint; manual |
 nodes
 | Dsn.go:26:11:26:17 | selection of Args | semmle.label | selection of Args |
 | Dsn.go:28:11:28:110 | []type{args} [array] | semmle.label | []type{args} [array] |
diff --git a/go/ql/test/experimental/CWE-79/HTMLTemplateEscapingPassthrough.expected b/go/ql/test/experimental/CWE-79/HTMLTemplateEscapingPassthrough.expected
index 897a8d573c0..c91fe813e9f 100644
--- a/go/ql/test/experimental/CWE-79/HTMLTemplateEscapingPassthrough.expected
+++ b/go/ql/test/experimental/CWE-79/HTMLTemplateEscapingPassthrough.expected
@@ -10,32 +10,32 @@
 | HTMLTemplateEscapingPassthrough.go:67:38:67:38 | g | HTMLTemplateEscapingPassthrough.go:66:24:66:38 | call to UserAgent | HTMLTemplateEscapingPassthrough.go:67:38:67:38 | g | Data from an $@ will not be auto-escaped because it was $@ to template.URL | HTMLTemplateEscapingPassthrough.go:66:24:66:38 | call to UserAgent | untrusted source | HTMLTemplateEscapingPassthrough.go:66:11:66:39 | type conversion | converted |
 edges
 | HTMLTemplateEscapingPassthrough.go:29:12:29:41 | type conversion | HTMLTemplateEscapingPassthrough.go:30:39:30:39 | a | provenance |  |
-| HTMLTemplateEscapingPassthrough.go:29:26:29:40 | call to UserAgent | HTMLTemplateEscapingPassthrough.go:29:12:29:41 | type conversion | provenance | Src:MaD:2  |
+| HTMLTemplateEscapingPassthrough.go:29:26:29:40 | call to UserAgent | HTMLTemplateEscapingPassthrough.go:29:12:29:41 | type conversion | provenance | Src:MaD:1  |
 | HTMLTemplateEscapingPassthrough.go:35:9:35:38 | type conversion | HTMLTemplateEscapingPassthrough.go:36:40:36:40 | a | provenance |  |
-| HTMLTemplateEscapingPassthrough.go:35:23:35:37 | call to UserAgent | HTMLTemplateEscapingPassthrough.go:35:9:35:38 | type conversion | provenance | Src:MaD:2  |
+| HTMLTemplateEscapingPassthrough.go:35:23:35:37 | call to UserAgent | HTMLTemplateEscapingPassthrough.go:35:9:35:38 | type conversion | provenance | Src:MaD:1  |
 | HTMLTemplateEscapingPassthrough.go:40:9:40:34 | type conversion | HTMLTemplateEscapingPassthrough.go:41:40:41:40 | a | provenance |  |
-| HTMLTemplateEscapingPassthrough.go:40:19:40:33 | call to UserAgent | HTMLTemplateEscapingPassthrough.go:40:9:40:34 | type conversion | provenance | Src:MaD:2  |
+| HTMLTemplateEscapingPassthrough.go:40:19:40:33 | call to UserAgent | HTMLTemplateEscapingPassthrough.go:40:9:40:34 | type conversion | provenance | Src:MaD:1  |
 | HTMLTemplateEscapingPassthrough.go:46:11:46:44 | type conversion | HTMLTemplateEscapingPassthrough.go:47:41:47:41 | c | provenance |  |
-| HTMLTemplateEscapingPassthrough.go:46:29:46:43 | call to UserAgent | HTMLTemplateEscapingPassthrough.go:46:11:46:44 | type conversion | provenance | Src:MaD:2  |
+| HTMLTemplateEscapingPassthrough.go:46:29:46:43 | call to UserAgent | HTMLTemplateEscapingPassthrough.go:46:11:46:44 | type conversion | provenance | Src:MaD:1  |
 | HTMLTemplateEscapingPassthrough.go:50:11:50:38 | type conversion | HTMLTemplateEscapingPassthrough.go:51:44:51:44 | d | provenance |  |
-| HTMLTemplateEscapingPassthrough.go:50:23:50:37 | call to UserAgent | HTMLTemplateEscapingPassthrough.go:50:11:50:38 | type conversion | provenance | Src:MaD:2  |
+| HTMLTemplateEscapingPassthrough.go:50:23:50:37 | call to UserAgent | HTMLTemplateEscapingPassthrough.go:50:11:50:38 | type conversion | provenance | Src:MaD:1  |
 | HTMLTemplateEscapingPassthrough.go:54:11:54:41 | type conversion | HTMLTemplateEscapingPassthrough.go:55:44:55:44 | e | provenance |  |
-| HTMLTemplateEscapingPassthrough.go:54:26:54:40 | call to UserAgent | HTMLTemplateEscapingPassthrough.go:54:11:54:41 | type conversion | provenance | Src:MaD:2  |
+| HTMLTemplateEscapingPassthrough.go:54:26:54:40 | call to UserAgent | HTMLTemplateEscapingPassthrough.go:54:11:54:41 | type conversion | provenance | Src:MaD:1  |
 | HTMLTemplateEscapingPassthrough.go:58:11:58:39 | type conversion | HTMLTemplateEscapingPassthrough.go:59:38:59:38 | b | provenance |  |
-| HTMLTemplateEscapingPassthrough.go:58:24:58:38 | call to UserAgent | HTMLTemplateEscapingPassthrough.go:58:11:58:39 | type conversion | provenance | Src:MaD:2  |
+| HTMLTemplateEscapingPassthrough.go:58:24:58:38 | call to UserAgent | HTMLTemplateEscapingPassthrough.go:58:11:58:39 | type conversion | provenance | Src:MaD:1  |
 | HTMLTemplateEscapingPassthrough.go:62:11:62:42 | type conversion | HTMLTemplateEscapingPassthrough.go:63:44:63:44 | f | provenance |  |
-| HTMLTemplateEscapingPassthrough.go:62:27:62:41 | call to UserAgent | HTMLTemplateEscapingPassthrough.go:62:11:62:42 | type conversion | provenance | Src:MaD:2  |
+| HTMLTemplateEscapingPassthrough.go:62:27:62:41 | call to UserAgent | HTMLTemplateEscapingPassthrough.go:62:11:62:42 | type conversion | provenance | Src:MaD:1  |
 | HTMLTemplateEscapingPassthrough.go:66:11:66:39 | type conversion | HTMLTemplateEscapingPassthrough.go:67:38:67:38 | g | provenance |  |
-| HTMLTemplateEscapingPassthrough.go:66:24:66:38 | call to UserAgent | HTMLTemplateEscapingPassthrough.go:66:11:66:39 | type conversion | provenance | Src:MaD:2  |
-| HTMLTemplateEscapingPassthrough.go:75:17:75:31 | call to UserAgent | HTMLTemplateEscapingPassthrough.go:76:38:76:44 | escaped | provenance | Src:MaD:2  |
-| HTMLTemplateEscapingPassthrough.go:81:10:81:24 | call to UserAgent | HTMLTemplateEscapingPassthrough.go:84:38:84:40 | src | provenance | Src:MaD:2  |
-| HTMLTemplateEscapingPassthrough.go:89:10:89:24 | call to UserAgent | HTMLTemplateEscapingPassthrough.go:91:64:91:66 | src | provenance | Src:MaD:2  |
+| HTMLTemplateEscapingPassthrough.go:66:24:66:38 | call to UserAgent | HTMLTemplateEscapingPassthrough.go:66:11:66:39 | type conversion | provenance | Src:MaD:1  |
+| HTMLTemplateEscapingPassthrough.go:75:17:75:31 | call to UserAgent | HTMLTemplateEscapingPassthrough.go:76:38:76:44 | escaped | provenance | Src:MaD:1  |
+| HTMLTemplateEscapingPassthrough.go:81:10:81:24 | call to UserAgent | HTMLTemplateEscapingPassthrough.go:84:38:84:40 | src | provenance | Src:MaD:1  |
+| HTMLTemplateEscapingPassthrough.go:89:10:89:24 | call to UserAgent | HTMLTemplateEscapingPassthrough.go:91:64:91:66 | src | provenance | Src:MaD:1  |
 | HTMLTemplateEscapingPassthrough.go:91:16:91:77 | type conversion | HTMLTemplateEscapingPassthrough.go:92:38:92:46 | converted | provenance |  |
 | HTMLTemplateEscapingPassthrough.go:91:38:91:67 | call to HTMLEscapeString | HTMLTemplateEscapingPassthrough.go:91:16:91:77 | type conversion | provenance |  |
-| HTMLTemplateEscapingPassthrough.go:91:64:91:66 | src | HTMLTemplateEscapingPassthrough.go:91:38:91:67 | call to HTMLEscapeString | provenance | MaD:1 |
+| HTMLTemplateEscapingPassthrough.go:91:64:91:66 | src | HTMLTemplateEscapingPassthrough.go:91:38:91:67 | call to HTMLEscapeString | provenance | MaD:2 |
 models
-| 1 | Summary: html/template; ; false; HTMLEscapeString; ; ; Argument[0]; ReturnValue; taint; manual |
-| 2 | Source: net/http; Request; true; UserAgent; ; ; ReturnValue; remote; manual |
+| 1 | Source: net/http; Request; true; UserAgent; ; ; ReturnValue; remote; manual |
+| 2 | Summary: html/template; ; false; HTMLEscapeString; ; ; Argument[0]; ReturnValue; taint; manual |
 nodes
 | HTMLTemplateEscapingPassthrough.go:29:12:29:41 | type conversion | semmle.label | type conversion |
 | HTMLTemplateEscapingPassthrough.go:29:26:29:40 | call to UserAgent | semmle.label | call to UserAgent |
diff --git a/go/ql/test/experimental/CWE-918/SSRF.expected b/go/ql/test/experimental/CWE-918/SSRF.expected
index f6c234044b7..87780085a54 100644
--- a/go/ql/test/experimental/CWE-918/SSRF.expected
+++ b/go/ql/test/experimental/CWE-918/SSRF.expected
@@ -17,61 +17,61 @@
 | new-tests.go:88:2:88:47 | call to Get | new-tests.go:86:10:86:20 | call to Vars | new-tests.go:88:11:88:46 | ...+... | The URL of this request depends on a user-provided value. |
 | new-tests.go:96:2:96:47 | call to Get | new-tests.go:95:18:95:45 | call to URLParam | new-tests.go:96:11:96:46 | ...+... | The URL of this request depends on a user-provided value. |
 edges
-| builtin.go:19:12:19:34 | call to FormValue | builtin.go:22:21:22:62 | ...+... | provenance | Src:MaD:9  |
-| builtin.go:83:21:83:31 | call to Referer | builtin.go:88:27:88:40 | untrustedInput | provenance | Src:MaD:10  |
-| builtin.go:97:21:97:31 | call to Referer | builtin.go:101:36:101:49 | untrustedInput | provenance | Src:MaD:10  |
-| builtin.go:111:21:111:31 | call to Referer | builtin.go:114:15:114:28 | untrustedInput | provenance | Src:MaD:10  |
-| builtin.go:129:21:129:31 | call to Referer | builtin.go:132:38:132:51 | untrustedInput | provenance | Src:MaD:10  |
-| new-tests.go:26:26:26:30 | &... | new-tests.go:31:48:31:56 | selection of word | provenance | Src:MaD:5  |
-| new-tests.go:26:26:26:30 | &... | new-tests.go:32:48:32:56 | selection of safe | provenance | Src:MaD:5  |
-| new-tests.go:26:26:26:30 | &... | new-tests.go:35:49:35:57 | selection of word | provenance | Src:MaD:5  |
-| new-tests.go:31:11:31:57 | []type{args} [array] | new-tests.go:31:11:31:57 | call to Sprintf | provenance | MaD:2 |
+| builtin.go:19:12:19:34 | call to FormValue | builtin.go:22:21:22:62 | ...+... | provenance | Src:MaD:7  |
+| builtin.go:83:21:83:31 | call to Referer | builtin.go:88:27:88:40 | untrustedInput | provenance | Src:MaD:8  |
+| builtin.go:97:21:97:31 | call to Referer | builtin.go:101:36:101:49 | untrustedInput | provenance | Src:MaD:8  |
+| builtin.go:111:21:111:31 | call to Referer | builtin.go:114:15:114:28 | untrustedInput | provenance | Src:MaD:8  |
+| builtin.go:129:21:129:31 | call to Referer | builtin.go:132:38:132:51 | untrustedInput | provenance | Src:MaD:8  |
+| new-tests.go:26:26:26:30 | &... | new-tests.go:31:48:31:56 | selection of word | provenance | Src:MaD:3  |
+| new-tests.go:26:26:26:30 | &... | new-tests.go:32:48:32:56 | selection of safe | provenance | Src:MaD:3  |
+| new-tests.go:26:26:26:30 | &... | new-tests.go:35:49:35:57 | selection of word | provenance | Src:MaD:3  |
+| new-tests.go:31:11:31:57 | []type{args} [array] | new-tests.go:31:11:31:57 | call to Sprintf | provenance | MaD:11 |
 | new-tests.go:31:48:31:56 | selection of word | new-tests.go:31:11:31:57 | []type{args} [array] | provenance |  |
 | new-tests.go:31:48:31:56 | selection of word | new-tests.go:31:11:31:57 | call to Sprintf | provenance | FunctionModel |
-| new-tests.go:32:11:32:57 | []type{args} [array] | new-tests.go:32:11:32:57 | call to Sprintf | provenance | MaD:2 |
+| new-tests.go:32:11:32:57 | []type{args} [array] | new-tests.go:32:11:32:57 | call to Sprintf | provenance | MaD:11 |
 | new-tests.go:32:48:32:56 | selection of safe | new-tests.go:32:11:32:57 | []type{args} [array] | provenance |  |
 | new-tests.go:32:48:32:56 | selection of safe | new-tests.go:32:11:32:57 | call to Sprintf | provenance | FunctionModel |
-| new-tests.go:35:12:35:58 | []type{args} [array] | new-tests.go:35:12:35:58 | call to Sprintf | provenance | MaD:2 |
+| new-tests.go:35:12:35:58 | []type{args} [array] | new-tests.go:35:12:35:58 | call to Sprintf | provenance | MaD:11 |
 | new-tests.go:35:49:35:57 | selection of word | new-tests.go:35:12:35:58 | []type{args} [array] | provenance |  |
 | new-tests.go:35:49:35:57 | selection of word | new-tests.go:35:12:35:58 | call to Sprintf | provenance | FunctionModel |
-| new-tests.go:39:18:39:30 | call to Param | new-tests.go:47:11:47:46 | ...+... | provenance | Src:MaD:3  |
-| new-tests.go:49:18:49:30 | call to Query | new-tests.go:50:11:50:46 | ...+... | provenance | Src:MaD:4  |
+| new-tests.go:39:18:39:30 | call to Param | new-tests.go:47:11:47:46 | ...+... | provenance | Src:MaD:1  |
+| new-tests.go:49:18:49:30 | call to Query | new-tests.go:50:11:50:46 | ...+... | provenance | Src:MaD:2  |
 | new-tests.go:62:2:62:39 | ... := ...[0] | new-tests.go:63:17:63:23 | reqBody | provenance |  |
-| new-tests.go:62:31:62:38 | selection of Body | new-tests.go:62:2:62:39 | ... := ...[0] | provenance | Src:MaD:11 MaD:8 |
-| new-tests.go:63:17:63:23 | reqBody | new-tests.go:63:26:63:30 | &... | provenance | MaD:1 |
+| new-tests.go:62:31:62:38 | selection of Body | new-tests.go:62:2:62:39 | ... := ...[0] | provenance | Src:MaD:6 MaD:12 |
+| new-tests.go:63:17:63:23 | reqBody | new-tests.go:63:26:63:30 | &... | provenance | MaD:10 |
 | new-tests.go:63:26:63:30 | &... | new-tests.go:68:48:68:56 | selection of word | provenance |  |
 | new-tests.go:63:26:63:30 | &... | new-tests.go:69:48:69:56 | selection of safe | provenance |  |
 | new-tests.go:63:26:63:30 | &... | new-tests.go:74:49:74:57 | selection of word | provenance |  |
-| new-tests.go:68:11:68:57 | []type{args} [array] | new-tests.go:68:11:68:57 | call to Sprintf | provenance | MaD:2 |
+| new-tests.go:68:11:68:57 | []type{args} [array] | new-tests.go:68:11:68:57 | call to Sprintf | provenance | MaD:11 |
 | new-tests.go:68:48:68:56 | selection of word | new-tests.go:68:11:68:57 | []type{args} [array] | provenance |  |
 | new-tests.go:68:48:68:56 | selection of word | new-tests.go:68:11:68:57 | call to Sprintf | provenance | FunctionModel |
-| new-tests.go:69:11:69:57 | []type{args} [array] | new-tests.go:69:11:69:57 | call to Sprintf | provenance | MaD:2 |
+| new-tests.go:69:11:69:57 | []type{args} [array] | new-tests.go:69:11:69:57 | call to Sprintf | provenance | MaD:11 |
 | new-tests.go:69:48:69:56 | selection of safe | new-tests.go:69:11:69:57 | []type{args} [array] | provenance |  |
 | new-tests.go:69:48:69:56 | selection of safe | new-tests.go:69:11:69:57 | call to Sprintf | provenance | FunctionModel |
-| new-tests.go:74:12:74:58 | []type{args} [array] | new-tests.go:74:12:74:58 | call to Sprintf | provenance | MaD:2 |
+| new-tests.go:74:12:74:58 | []type{args} [array] | new-tests.go:74:12:74:58 | call to Sprintf | provenance | MaD:11 |
 | new-tests.go:74:49:74:57 | selection of word | new-tests.go:74:12:74:58 | []type{args} [array] | provenance |  |
 | new-tests.go:74:49:74:57 | selection of word | new-tests.go:74:12:74:58 | call to Sprintf | provenance | FunctionModel |
-| new-tests.go:78:18:78:24 | selection of URL | new-tests.go:78:18:78:32 | call to Query | provenance | Src:MaD:12 MaD:13 |
+| new-tests.go:78:18:78:24 | selection of URL | new-tests.go:78:18:78:32 | call to Query | provenance | Src:MaD:9 MaD:13 |
 | new-tests.go:78:18:78:32 | call to Query | new-tests.go:78:18:78:46 | call to Get | provenance | MaD:14 |
 | new-tests.go:78:18:78:46 | call to Get | new-tests.go:79:11:79:46 | ...+... | provenance |  |
 | new-tests.go:81:18:81:67 | call to TrimPrefix | new-tests.go:82:11:82:46 | ...+... | provenance |  |
-| new-tests.go:81:37:81:43 | selection of URL | new-tests.go:81:37:81:48 | selection of Path | provenance | Src:MaD:12  |
+| new-tests.go:81:37:81:43 | selection of URL | new-tests.go:81:37:81:48 | selection of Path | provenance | Src:MaD:9  |
 | new-tests.go:81:37:81:48 | selection of Path | new-tests.go:81:18:81:67 | call to TrimPrefix | provenance | MaD:15 |
-| new-tests.go:86:10:86:20 | call to Vars | new-tests.go:88:11:88:46 | ...+... | provenance | Src:MaD:7  |
-| new-tests.go:95:18:95:45 | call to URLParam | new-tests.go:96:11:96:46 | ...+... | provenance | Src:MaD:6  |
+| new-tests.go:86:10:86:20 | call to Vars | new-tests.go:88:11:88:46 | ...+... | provenance | Src:MaD:5  |
+| new-tests.go:95:18:95:45 | call to URLParam | new-tests.go:96:11:96:46 | ...+... | provenance | Src:MaD:4  |
 models
-| 1 | Summary: encoding/json; ; false; Unmarshal; ; ; Argument[0]; Argument[1]; taint; manual |
-| 2 | Summary: fmt; ; true; Sprintf; ; ; Argument[1].ArrayElement; ReturnValue; taint; manual |
-| 3 | Source: github.com/gin-gonic/gin; Context; true; Param; ; ; ReturnValue; remote; manual |
-| 4 | Source: github.com/gin-gonic/gin; Context; true; Query; ; ; ReturnValue; remote; manual |
-| 5 | Source: github.com/gin-gonic/gin; Context; true; ShouldBindJSON; ; ; Argument[0]; remote; manual |
-| 6 | Source: github.com/go-chi/chi; ; true; URLParam; ; ; ReturnValue; remote; manual |
-| 7 | Source: github.com/gorilla/mux; ; true; Vars; ; ; ReturnValue; remote; manual |
-| 8 | Summary: io/ioutil; ; false; ReadAll; ; ; Argument[0]; ReturnValue[0]; taint; manual |
-| 9 | Source: net/http; Request; true; FormValue; ; ; ReturnValue; remote; manual |
-| 10 | Source: net/http; Request; true; Referer; ; ; ReturnValue; remote; manual |
-| 11 | Source: net/http; Request; true; Body; ; ; ; remote; manual |
-| 12 | Source: net/http; Request; true; URL; ; ; ; remote; manual |
+| 1 | Source: github.com/gin-gonic/gin; Context; true; Param; ; ; ReturnValue; remote; manual |
+| 2 | Source: github.com/gin-gonic/gin; Context; true; Query; ; ; ReturnValue; remote; manual |
+| 3 | Source: github.com/gin-gonic/gin; Context; true; ShouldBindJSON; ; ; Argument[0]; remote; manual |
+| 4 | Source: github.com/go-chi/chi; ; false; URLParam; ; ; ReturnValue; remote; manual |
+| 5 | Source: github.com/gorilla/mux; ; false; Vars; ; ; ReturnValue; remote; manual |
+| 6 | Source: net/http; Request; true; Body; ; ; ; remote; manual |
+| 7 | Source: net/http; Request; true; FormValue; ; ; ReturnValue; remote; manual |
+| 8 | Source: net/http; Request; true; Referer; ; ; ReturnValue; remote; manual |
+| 9 | Source: net/http; Request; true; URL; ; ; ; remote; manual |
+| 10 | Summary: encoding/json; ; false; Unmarshal; ; ; Argument[0]; Argument[1]; taint; manual |
+| 11 | Summary: fmt; ; false; Sprintf; ; ; Argument[1].ArrayElement; ReturnValue; taint; manual |
+| 12 | Summary: io/ioutil; ; false; ReadAll; ; ; Argument[0]; ReturnValue[0]; taint; manual |
 | 13 | Summary: net/url; URL; true; Query; ; ; Argument[receiver]; ReturnValue; taint; manual |
 | 14 | Summary: net/url; Values; true; Get; ; ; Argument[receiver]; ReturnValue; taint; manual |
 | 15 | Summary: strings; ; false; TrimPrefix; ; ; Argument[0]; ReturnValue; taint; manual |
diff --git a/go/ql/test/library-tests/semmle/go/PrintAst/PrintAst.expected b/go/ql/test/library-tests/semmle/go/PrintAst/PrintAst.expected
index e2424aa4575..66aa2643063 100644
--- a/go/ql/test/library-tests/semmle/go/PrintAst/PrintAst.expected
+++ b/go/ql/test/library-tests/semmle/go/PrintAst/PrintAst.expected
@@ -1,9 +1,9 @@
 go.mod:
-#    0| [GoModFile] library-tests/semmle/go/PrintAst/go.mod
+#    0| [GoModFile] go.mod
 #    1|   0: [GoModModuleLine] go.mod module line
 #    3|   1: [GoModGoLine] go.mod go line
 input.go:
-#    0| [GoFile] library-tests/semmle/go/PrintAst/input.go
+#    0| [GoFile] input.go
 #    1|   package: [Ident] main
 #    5|   1: [CommentGroup] comment group
 #    5|     0: [SlashSlashComment] comment
@@ -53,10 +53,10 @@ input.go:
 #   20|         0: [CallExpr] call to Println
 #   20|             Type = (int, error)
 #   20|           0: [FunctionName, SelectorExpr] selection of Println
-#   20|               Type = func([]interface { }) int, error
+#   20|               Type = func(...interface { }) int, error
 #   20|             0: [Ident, PackageName] fmt
 #   20|             1: [FunctionName, Ident] Println
-#   20|                 Type = func([]interface { }) int, error
+#   20|                 Type = func(...interface { }) int, error
 #   20|           1: [StringLit] "Hi"
 #   20|               Type = string
 #   20|               Value = [StringLit] Hi
@@ -203,10 +203,10 @@ input.go:
 #   52|               0: [CallExpr] call to Println
 #   52|                   Type = (int, error)
 #   52|                 0: [FunctionName, SelectorExpr] selection of Println
-#   52|                     Type = func([]interface { }) int, error
+#   52|                     Type = func(...interface { }) int, error
 #   52|                   0: [Ident, PackageName] fmt
 #   52|                   1: [FunctionName, Ident] Println
-#   52|                       Type = func([]interface { }) int, error
+#   52|                       Type = func(...interface { }) int, error
 #   52|                 1: [StringLit] "Heard from ch1"
 #   52|                     Type = string
 #   52|                     Value = [StringLit] Heard from ch1
@@ -229,20 +229,20 @@ input.go:
 #   54|               0: [CallExpr] call to Println
 #   54|                   Type = (int, error)
 #   54|                 0: [FunctionName, SelectorExpr] selection of Println
-#   54|                     Type = func([]interface { }) int, error
+#   54|                     Type = func(...interface { }) int, error
 #   54|                   0: [Ident, PackageName] fmt
 #   54|                   1: [FunctionName, Ident] Println
-#   54|                       Type = func([]interface { }) int, error
+#   54|                       Type = func(...interface { }) int, error
 #   54|                 1: [Ident, VariableName] a
 #   54|                     Type = [1]float32
 #   55|             2: [ExprStmt] expression statement
 #   55|               0: [CallExpr] call to Println
 #   55|                   Type = (int, error)
 #   55|                 0: [FunctionName, SelectorExpr] selection of Println
-#   55|                     Type = func([]interface { }) int, error
+#   55|                     Type = func(...interface { }) int, error
 #   55|                   0: [Ident, PackageName] fmt
 #   55|                   1: [FunctionName, Ident] Println
-#   55|                       Type = func([]interface { }) int, error
+#   55|                       Type = func(...interface { }) int, error
 #   55|                 1: [Ident, VariableName] w
 #   55|                     Type = bool
 #   56|           2: [CommClause] comm clause
@@ -250,10 +250,10 @@ input.go:
 #   57|               0: [CallExpr] call to Println
 #   57|                   Type = (int, error)
 #   57|                 0: [FunctionName, SelectorExpr] selection of Println
-#   57|                     Type = func([]interface { }) int, error
+#   57|                     Type = func(...interface { }) int, error
 #   57|                   0: [Ident, PackageName] fmt
 #   57|                   1: [FunctionName, Ident] Println
-#   57|                       Type = func([]interface { }) int, error
+#   57|                       Type = func(...interface { }) int, error
 #   58|           3: [CommClause] comm clause
 #   58|             0: [SendStmt] send statement
 #   58|               0: [Ident, VariableName] ch1
@@ -297,10 +297,10 @@ input.go:
 #   67|                     0: [CallExpr] call to Println
 #   67|                         Type = (int, error)
 #   67|                       0: [FunctionName, SelectorExpr] selection of Println
-#   67|                           Type = func([]interface { }) int, error
+#   67|                           Type = func(...interface { }) int, error
 #   67|                         0: [Ident, PackageName] fmt
 #   67|                         1: [FunctionName, Ident] Println
-#   67|                             Type = func([]interface { }) int, error
+#   67|                             Type = func(...interface { }) int, error
 #   67|                       1: [Ident, VariableName] x
 #   67|                           Type = int
 #   68|         2: [BlockStmt] block statement
@@ -316,10 +316,10 @@ input.go:
 #   69|                     0: [CallExpr] call to Println
 #   69|                         Type = (int, error)
 #   69|                       0: [FunctionName, SelectorExpr] selection of Println
-#   69|                           Type = func([]interface { }) int, error
+#   69|                           Type = func(...interface { }) int, error
 #   69|                         0: [Ident, PackageName] fmt
 #   69|                         1: [FunctionName, Ident] Println
-#   69|                             Type = func([]interface { }) int, error
+#   69|                             Type = func(...interface { }) int, error
 #   69|                       1: [MinusExpr] -...
 #   69|                           Type = int
 #   69|                         0: [Ident, VariableName] x
@@ -474,10 +474,10 @@ input.go:
 #  115|               0: [CallExpr] call to Println
 #  115|                   Type = (int, error)
 #  115|                 0: [FunctionName, SelectorExpr] selection of Println
-#  115|                     Type = func([]interface { }) int, error
+#  115|                     Type = func(...interface { }) int, error
 #  115|                   0: [Ident, PackageName] fmt
 #  115|                   1: [FunctionName, Ident] Println
-#  115|                       Type = func([]interface { }) int, error
+#  115|                       Type = func(...interface { }) int, error
 #  115|                 1: [Ident, VariableName] y
 #  115|                     Type = interface { }
 #  116|           1: [CaseClause] case clause
@@ -566,10 +566,10 @@ input.go:
 #  138|             0: [CallExpr] call to Print
 #  138|                 Type = (int, error)
 #  138|               0: [FunctionName, SelectorExpr] selection of Print
-#  138|                   Type = func([]interface { }) int, error
+#  138|                   Type = func(...interface { }) int, error
 #  138|                 0: [Ident, PackageName] fmt
 #  138|                 1: [FunctionName, Ident] Print
-#  138|                     Type = func([]interface { }) int, error
+#  138|                     Type = func(...interface { }) int, error
 #  138|               1: [Ident, VariableName] x
 #  138|                   Type = int
 #  141|       1: [RangeStmt] range statement
@@ -584,10 +584,10 @@ input.go:
 #  142|             0: [CallExpr] call to Print
 #  142|                 Type = (int, error)
 #  142|               0: [FunctionName, SelectorExpr] selection of Print
-#  142|                   Type = func([]interface { }) int, error
+#  142|                   Type = func(...interface { }) int, error
 #  142|                 0: [Ident, PackageName] fmt
 #  142|                 1: [FunctionName, Ident] Print
-#  142|                     Type = func([]interface { }) int, error
+#  142|                     Type = func(...interface { }) int, error
 #  142|               1: [Ident, VariableName] i
 #  142|                   Type = int
 #  142|               2: [Ident, VariableName] v
@@ -597,7 +597,7 @@ input.go:
 #  145|             Type = []int
 #  145|         1: [BlockStmt] block statement
 other.go:
-#    0| [GoFile] library-tests/semmle/go/PrintAst/other.go
+#    0| [GoFile] other.go
 #    1|   package: [Ident] main
 #    3|   1: [FuncDecl] function declaration
 #    3|     0: [FunctionName, Ident] main
@@ -639,6 +639,11 @@ other.go:
 #   11|             Type = int
 #   11|           0: [Ident, VariableName] myNested
 #   11|               Type = func() int
+#    8|     3: [TypeParamDecl] type parameter declaration
+#    8|       0: [Ident, TypeName] int
+#    8|           Type = int
+#    8|       1: [Ident, TypeName] U
+#    8|           Type = U
 #   15|   5: [VarDecl] variable declaration
 #   15|     0: [ValueSpec] value declaration specifier
 #   15|       0: [Ident, VariableName] x
@@ -648,3 +653,32 @@ other.go:
 #   15|       2: [IntLit] 0
 #   15|           Type = int
 #   15|           Value = [IntLit] 0
+#   17|   6: [TypeDecl] type declaration
+#   17|     0: [TypeSpec] type declaration specifier
+#   17|       0: [Ident, TypeName] myType
+#   17|           Type = myType
+#   17|       1: [ArrayTypeExpr] array type
+#   17|           Type = []T
+#   17|         0: [Ident, TypeName] T
+#   17|             Type = T
+#   17|       2: [TypeParamDecl] type parameter declaration
+#   17|         0: [TypeSetLiteralExpr] type set literal
+#   17|             Type = ~string
+#   17|           0: [Ident, TypeName] string
+#   17|               Type = string
+#   17|         1: [Ident, TypeName] T
+#   17|             Type = T
+#   19|   7: [MethodDecl] function declaration
+#   19|     0: [FunctionName, Ident] f
+#   19|         Type = func() 
+#   19|     1: [FuncTypeExpr] function type
+#   19|     2: [ReceiverDecl] receiver declaration
+#   19|       0: [GenericTypeInstantiationExpr] generic type instantiation expression
+#   19|           Type = myType
+#   19|         0: [Ident, TypeName] myType
+#   19|             Type = myType
+#   19|         1: [Ident, TypeName] U
+#   19|             Type = U
+#   19|       1: [Ident, VariableName] m
+#   19|           Type = myType
+#   19|     3: [BlockStmt] block statement
diff --git a/go/ql/test/library-tests/semmle/go/PrintAst/PrintAstExcludeComments.expected b/go/ql/test/library-tests/semmle/go/PrintAst/PrintAstExcludeComments.expected
index 57fbeb881a5..099aa4e6144 100644
--- a/go/ql/test/library-tests/semmle/go/PrintAst/PrintAstExcludeComments.expected
+++ b/go/ql/test/library-tests/semmle/go/PrintAst/PrintAstExcludeComments.expected
@@ -1,9 +1,9 @@
 go.mod:
-#    0| [GoModFile] library-tests/semmle/go/PrintAst/go.mod
+#    0| [GoModFile] go.mod
 #    1|   0: [GoModModuleLine] go.mod module line
 #    3|   1: [GoModGoLine] go.mod go line
 input.go:
-#    0| [GoFile] library-tests/semmle/go/PrintAst/input.go
+#    0| [GoFile] input.go
 #    1|   package: [Ident] main
 #    3|   1: [ImportDecl] import declaration
 #    3|     0: [ImportSpec] import specifier
@@ -33,10 +33,10 @@ input.go:
 #   20|         0: [CallExpr] call to Println
 #   20|             Type = (int, error)
 #   20|           0: [FunctionName, SelectorExpr] selection of Println
-#   20|               Type = func([]interface { }) int, error
+#   20|               Type = func(...interface { }) int, error
 #   20|             0: [Ident, PackageName] fmt
 #   20|             1: [FunctionName, Ident] Println
-#   20|                 Type = func([]interface { }) int, error
+#   20|                 Type = func(...interface { }) int, error
 #   20|           1: [StringLit] "Hi"
 #   20|               Type = string
 #   20|               Value = [StringLit] Hi
@@ -183,10 +183,10 @@ input.go:
 #   52|               0: [CallExpr] call to Println
 #   52|                   Type = (int, error)
 #   52|                 0: [FunctionName, SelectorExpr] selection of Println
-#   52|                     Type = func([]interface { }) int, error
+#   52|                     Type = func(...interface { }) int, error
 #   52|                   0: [Ident, PackageName] fmt
 #   52|                   1: [FunctionName, Ident] Println
-#   52|                       Type = func([]interface { }) int, error
+#   52|                       Type = func(...interface { }) int, error
 #   52|                 1: [StringLit] "Heard from ch1"
 #   52|                     Type = string
 #   52|                     Value = [StringLit] Heard from ch1
@@ -209,20 +209,20 @@ input.go:
 #   54|               0: [CallExpr] call to Println
 #   54|                   Type = (int, error)
 #   54|                 0: [FunctionName, SelectorExpr] selection of Println
-#   54|                     Type = func([]interface { }) int, error
+#   54|                     Type = func(...interface { }) int, error
 #   54|                   0: [Ident, PackageName] fmt
 #   54|                   1: [FunctionName, Ident] Println
-#   54|                       Type = func([]interface { }) int, error
+#   54|                       Type = func(...interface { }) int, error
 #   54|                 1: [Ident, VariableName] a
 #   54|                     Type = [1]float32
 #   55|             2: [ExprStmt] expression statement
 #   55|               0: [CallExpr] call to Println
 #   55|                   Type = (int, error)
 #   55|                 0: [FunctionName, SelectorExpr] selection of Println
-#   55|                     Type = func([]interface { }) int, error
+#   55|                     Type = func(...interface { }) int, error
 #   55|                   0: [Ident, PackageName] fmt
 #   55|                   1: [FunctionName, Ident] Println
-#   55|                       Type = func([]interface { }) int, error
+#   55|                       Type = func(...interface { }) int, error
 #   55|                 1: [Ident, VariableName] w
 #   55|                     Type = bool
 #   56|           2: [CommClause] comm clause
@@ -230,10 +230,10 @@ input.go:
 #   57|               0: [CallExpr] call to Println
 #   57|                   Type = (int, error)
 #   57|                 0: [FunctionName, SelectorExpr] selection of Println
-#   57|                     Type = func([]interface { }) int, error
+#   57|                     Type = func(...interface { }) int, error
 #   57|                   0: [Ident, PackageName] fmt
 #   57|                   1: [FunctionName, Ident] Println
-#   57|                       Type = func([]interface { }) int, error
+#   57|                       Type = func(...interface { }) int, error
 #   58|           3: [CommClause] comm clause
 #   58|             0: [SendStmt] send statement
 #   58|               0: [Ident, VariableName] ch1
@@ -277,10 +277,10 @@ input.go:
 #   67|                     0: [CallExpr] call to Println
 #   67|                         Type = (int, error)
 #   67|                       0: [FunctionName, SelectorExpr] selection of Println
-#   67|                           Type = func([]interface { }) int, error
+#   67|                           Type = func(...interface { }) int, error
 #   67|                         0: [Ident, PackageName] fmt
 #   67|                         1: [FunctionName, Ident] Println
-#   67|                             Type = func([]interface { }) int, error
+#   67|                             Type = func(...interface { }) int, error
 #   67|                       1: [Ident, VariableName] x
 #   67|                           Type = int
 #   68|         2: [BlockStmt] block statement
@@ -296,10 +296,10 @@ input.go:
 #   69|                     0: [CallExpr] call to Println
 #   69|                         Type = (int, error)
 #   69|                       0: [FunctionName, SelectorExpr] selection of Println
-#   69|                           Type = func([]interface { }) int, error
+#   69|                           Type = func(...interface { }) int, error
 #   69|                         0: [Ident, PackageName] fmt
 #   69|                         1: [FunctionName, Ident] Println
-#   69|                             Type = func([]interface { }) int, error
+#   69|                             Type = func(...interface { }) int, error
 #   69|                       1: [MinusExpr] -...
 #   69|                           Type = int
 #   69|                         0: [Ident, VariableName] x
@@ -454,10 +454,10 @@ input.go:
 #  115|               0: [CallExpr] call to Println
 #  115|                   Type = (int, error)
 #  115|                 0: [FunctionName, SelectorExpr] selection of Println
-#  115|                     Type = func([]interface { }) int, error
+#  115|                     Type = func(...interface { }) int, error
 #  115|                   0: [Ident, PackageName] fmt
 #  115|                   1: [FunctionName, Ident] Println
-#  115|                       Type = func([]interface { }) int, error
+#  115|                       Type = func(...interface { }) int, error
 #  115|                 1: [Ident, VariableName] y
 #  115|                     Type = interface { }
 #  116|           1: [CaseClause] case clause
@@ -546,10 +546,10 @@ input.go:
 #  138|             0: [CallExpr] call to Print
 #  138|                 Type = (int, error)
 #  138|               0: [FunctionName, SelectorExpr] selection of Print
-#  138|                   Type = func([]interface { }) int, error
+#  138|                   Type = func(...interface { }) int, error
 #  138|                 0: [Ident, PackageName] fmt
 #  138|                 1: [FunctionName, Ident] Print
-#  138|                     Type = func([]interface { }) int, error
+#  138|                     Type = func(...interface { }) int, error
 #  138|               1: [Ident, VariableName] x
 #  138|                   Type = int
 #  141|       1: [RangeStmt] range statement
@@ -564,10 +564,10 @@ input.go:
 #  142|             0: [CallExpr] call to Print
 #  142|                 Type = (int, error)
 #  142|               0: [FunctionName, SelectorExpr] selection of Print
-#  142|                   Type = func([]interface { }) int, error
+#  142|                   Type = func(...interface { }) int, error
 #  142|                 0: [Ident, PackageName] fmt
 #  142|                 1: [FunctionName, Ident] Print
-#  142|                     Type = func([]interface { }) int, error
+#  142|                     Type = func(...interface { }) int, error
 #  142|               1: [Ident, VariableName] i
 #  142|                   Type = int
 #  142|               2: [Ident, VariableName] v
@@ -577,7 +577,7 @@ input.go:
 #  145|             Type = []int
 #  145|         1: [BlockStmt] block statement
 other.go:
-#    0| [GoFile] library-tests/semmle/go/PrintAst/other.go
+#    0| [GoFile] other.go
 #    1|   package: [Ident] main
 #    3|   1: [FuncDecl] function declaration
 #    3|     0: [FunctionName, Ident] main
@@ -619,6 +619,11 @@ other.go:
 #   11|             Type = int
 #   11|           0: [Ident, VariableName] myNested
 #   11|               Type = func() int
+#    8|     3: [TypeParamDecl] type parameter declaration
+#    8|       0: [Ident, TypeName] int
+#    8|           Type = int
+#    8|       1: [Ident, TypeName] U
+#    8|           Type = U
 #   15|   5: [VarDecl] variable declaration
 #   15|     0: [ValueSpec] value declaration specifier
 #   15|       0: [Ident, VariableName] x
@@ -628,3 +633,32 @@ other.go:
 #   15|       2: [IntLit] 0
 #   15|           Type = int
 #   15|           Value = [IntLit] 0
+#   17|   6: [TypeDecl] type declaration
+#   17|     0: [TypeSpec] type declaration specifier
+#   17|       0: [Ident, TypeName] myType
+#   17|           Type = myType
+#   17|       1: [ArrayTypeExpr] array type
+#   17|           Type = []T
+#   17|         0: [Ident, TypeName] T
+#   17|             Type = T
+#   17|       2: [TypeParamDecl] type parameter declaration
+#   17|         0: [TypeSetLiteralExpr] type set literal
+#   17|             Type = ~string
+#   17|           0: [Ident, TypeName] string
+#   17|               Type = string
+#   17|         1: [Ident, TypeName] T
+#   17|             Type = T
+#   19|   7: [MethodDecl] function declaration
+#   19|     0: [FunctionName, Ident] f
+#   19|         Type = func() 
+#   19|     1: [FuncTypeExpr] function type
+#   19|     2: [ReceiverDecl] receiver declaration
+#   19|       0: [GenericTypeInstantiationExpr] generic type instantiation expression
+#   19|           Type = myType
+#   19|         0: [Ident, TypeName] myType
+#   19|             Type = myType
+#   19|         1: [Ident, TypeName] U
+#   19|             Type = U
+#   19|       1: [Ident, VariableName] m
+#   19|           Type = myType
+#   19|     3: [BlockStmt] block statement
diff --git a/go/ql/test/library-tests/semmle/go/PrintAst/PrintAstNestedFunction.expected b/go/ql/test/library-tests/semmle/go/PrintAst/PrintAstNestedFunction.expected
index 7a04ffd637c..9be02352b2b 100644
--- a/go/ql/test/library-tests/semmle/go/PrintAst/PrintAstNestedFunction.expected
+++ b/go/ql/test/library-tests/semmle/go/PrintAst/PrintAstNestedFunction.expected
@@ -1,9 +1,9 @@
 go.mod:
-#    0| [GoModFile] library-tests/semmle/go/PrintAst/go.mod
+#    0| [GoModFile] go.mod
 #    1|   0: [GoModModuleLine] go.mod module line
 #    3|   1: [GoModGoLine] go.mod go line
 input.go:
-#    0| [GoFile] library-tests/semmle/go/PrintAst/input.go
+#    0| [GoFile] input.go
 #    1|   package: [Ident] main
 #    5|   1: [CommentGroup] comment group
 #    5|     0: [SlashSlashComment] comment
@@ -29,7 +29,7 @@ input.go:
 #    3|     0: [ImportSpec] import specifier
 #    3|       0: [StringLit] "fmt"
 other.go:
-#    0| [GoFile] library-tests/semmle/go/PrintAst/other.go
+#    0| [GoFile] other.go
 #    1|   package: [Ident] main
 #    8|   1: [FuncDecl] function declaration
 #    8|     0: [FunctionName, Ident] hasNested
@@ -56,6 +56,11 @@ other.go:
 #   11|             Type = int
 #   11|           0: [Ident, VariableName] myNested
 #   11|               Type = func() int
+#    8|     3: [TypeParamDecl] type parameter declaration
+#    8|       0: [Ident, TypeName] int
+#    8|           Type = int
+#    8|       1: [Ident, TypeName] U
+#    8|           Type = U
 #   15|   2: [VarDecl] variable declaration
 #   15|     0: [ValueSpec] value declaration specifier
 #   15|       0: [Ident, VariableName] x
@@ -65,3 +70,18 @@ other.go:
 #   15|       2: [IntLit] 0
 #   15|           Type = int
 #   15|           Value = [IntLit] 0
+#   17|   3: [TypeDecl] type declaration
+#   17|     0: [TypeSpec] type declaration specifier
+#   17|       0: [Ident, TypeName] myType
+#   17|           Type = myType
+#   17|       1: [ArrayTypeExpr] array type
+#   17|           Type = []T
+#   17|         0: [Ident, TypeName] T
+#   17|             Type = T
+#   17|       2: [TypeParamDecl] type parameter declaration
+#   17|         0: [TypeSetLiteralExpr] type set literal
+#   17|             Type = ~string
+#   17|           0: [Ident, TypeName] string
+#   17|               Type = string
+#   17|         1: [Ident, TypeName] T
+#   17|             Type = T
diff --git a/go/ql/test/library-tests/semmle/go/PrintAst/PrintAstRestrictFile.expected b/go/ql/test/library-tests/semmle/go/PrintAst/PrintAstRestrictFile.expected
index 3df7749557d..45e6789e013 100644
--- a/go/ql/test/library-tests/semmle/go/PrintAst/PrintAstRestrictFile.expected
+++ b/go/ql/test/library-tests/semmle/go/PrintAst/PrintAstRestrictFile.expected
@@ -1,5 +1,5 @@
 other.go:
-#    0| [GoFile] library-tests/semmle/go/PrintAst/other.go
+#    0| [GoFile] other.go
 #    1|   package: [Ident] main
 #    3|   1: [FuncDecl] function declaration
 #    3|     0: [FunctionName, Ident] main
@@ -41,6 +41,11 @@ other.go:
 #   11|             Type = int
 #   11|           0: [Ident, VariableName] myNested
 #   11|               Type = func() int
+#    8|     3: [TypeParamDecl] type parameter declaration
+#    8|       0: [Ident, TypeName] int
+#    8|           Type = int
+#    8|       1: [Ident, TypeName] U
+#    8|           Type = U
 #   15|   5: [VarDecl] variable declaration
 #   15|     0: [ValueSpec] value declaration specifier
 #   15|       0: [Ident, VariableName] x
@@ -50,3 +55,32 @@ other.go:
 #   15|       2: [IntLit] 0
 #   15|           Type = int
 #   15|           Value = [IntLit] 0
+#   17|   6: [TypeDecl] type declaration
+#   17|     0: [TypeSpec] type declaration specifier
+#   17|       0: [Ident, TypeName] myType
+#   17|           Type = myType
+#   17|       1: [ArrayTypeExpr] array type
+#   17|           Type = []T
+#   17|         0: [Ident, TypeName] T
+#   17|             Type = T
+#   17|       2: [TypeParamDecl] type parameter declaration
+#   17|         0: [TypeSetLiteralExpr] type set literal
+#   17|             Type = ~string
+#   17|           0: [Ident, TypeName] string
+#   17|               Type = string
+#   17|         1: [Ident, TypeName] T
+#   17|             Type = T
+#   19|   7: [MethodDecl] function declaration
+#   19|     0: [FunctionName, Ident] f
+#   19|         Type = func() 
+#   19|     1: [FuncTypeExpr] function type
+#   19|     2: [ReceiverDecl] receiver declaration
+#   19|       0: [GenericTypeInstantiationExpr] generic type instantiation expression
+#   19|           Type = myType
+#   19|         0: [Ident, TypeName] myType
+#   19|             Type = myType
+#   19|         1: [Ident, TypeName] U
+#   19|             Type = U
+#   19|       1: [Ident, VariableName] m
+#   19|           Type = myType
+#   19|     3: [BlockStmt] block statement
diff --git a/go/ql/test/library-tests/semmle/go/PrintAst/PrintAstRestrictFunction.expected b/go/ql/test/library-tests/semmle/go/PrintAst/PrintAstRestrictFunction.expected
index 85f2335d5b0..3073a43383a 100644
--- a/go/ql/test/library-tests/semmle/go/PrintAst/PrintAstRestrictFunction.expected
+++ b/go/ql/test/library-tests/semmle/go/PrintAst/PrintAstRestrictFunction.expected
@@ -1,9 +1,15 @@
+other.go:
+#    8| [TypeParamDecl] type parameter declaration
+#    8|   0: [Ident, TypeName] int
+#    8|       Type = int
+#    8|   1: [Ident, TypeName] U
+#    8|       Type = U
 go.mod:
-#    0| [GoModFile] library-tests/semmle/go/PrintAst/go.mod
+#    0| [GoModFile] go.mod
 #    1|   0: [GoModModuleLine] go.mod module line
 #    3|   1: [GoModGoLine] go.mod go line
 input.go:
-#    0| [GoFile] library-tests/semmle/go/PrintAst/input.go
+#    0| [GoFile] input.go
 #    1|   package: [Ident] main
 #    5|   1: [CommentGroup] comment group
 #    5|     0: [SlashSlashComment] comment
@@ -29,7 +35,7 @@ input.go:
 #    3|     0: [ImportSpec] import specifier
 #    3|       0: [StringLit] "fmt"
 other.go:
-#    0| [GoFile] library-tests/semmle/go/PrintAst/other.go
+#    0| [GoFile] other.go
 #    1|   package: [Ident] main
 #    6|   1: [FuncDecl] function declaration
 #    6|     0: [FunctionName, Ident] g
@@ -45,3 +51,18 @@ other.go:
 #   15|       2: [IntLit] 0
 #   15|           Type = int
 #   15|           Value = [IntLit] 0
+#   17|   3: [TypeDecl] type declaration
+#   17|     0: [TypeSpec] type declaration specifier
+#   17|       0: [Ident, TypeName] myType
+#   17|           Type = myType
+#   17|       1: [ArrayTypeExpr] array type
+#   17|           Type = []T
+#   17|         0: [Ident, TypeName] T
+#   17|             Type = T
+#   17|       2: [TypeParamDecl] type parameter declaration
+#   17|         0: [TypeSetLiteralExpr] type set literal
+#   17|             Type = ~string
+#   17|           0: [Ident, TypeName] string
+#   17|               Type = string
+#   17|         1: [Ident, TypeName] T
+#   17|             Type = T
diff --git a/go/ql/test/library-tests/semmle/go/PrintAst/go.mod b/go/ql/test/library-tests/semmle/go/PrintAst/go.mod
index c3149650c4c..a443fbece39 100644
--- a/go/ql/test/library-tests/semmle/go/PrintAst/go.mod
+++ b/go/ql/test/library-tests/semmle/go/PrintAst/go.mod
@@ -1,4 +1,3 @@
 module codeql-go-tests/printast
 
-go 1.14
-
+go 1.18
diff --git a/go/ql/test/library-tests/semmle/go/PrintAst/other.go b/go/ql/test/library-tests/semmle/go/PrintAst/other.go
index 9d60eff98bd..caf66812d60 100644
--- a/go/ql/test/library-tests/semmle/go/PrintAst/other.go
+++ b/go/ql/test/library-tests/semmle/go/PrintAst/other.go
@@ -5,7 +5,7 @@ func main() {}
 func f() {}
 func g() {}
 
-func hasNested() {
+func hasNested[U int]() {
 
 	myNested := func() int { return 1 }
 	myNested()
@@ -13,3 +13,7 @@ func hasNested() {
 }
 
 var x int = 0
+
+type myType[T ~string] []T
+
+func (m myType[U]) f() {}
diff --git a/go/ql/test/library-tests/semmle/go/Types/Field_getPackage.expected b/go/ql/test/library-tests/semmle/go/Types/Field_getPackage.expected
index 758199c6352..485a42b185e 100644
--- a/go/ql/test/library-tests/semmle/go/Types/Field_getPackage.expected
+++ b/go/ql/test/library-tests/semmle/go/Types/Field_getPackage.expected
@@ -32,6 +32,10 @@
 | pkg1/embedding.go:28:24:28:31 | embedder | package github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1 |
 | pkg1/embedding.go:36:2:36:5 | base | package github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1 |
 | pkg1/embedding.go:37:2:37:2 | f | package github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1 |
+| pkg1/promotedStructs.go:5:2:5:7 | SField | package github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1 |
+| pkg1/promotedStructs.go:14:2:14:7 | PField | package github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1 |
+| pkg1/promotedStructs.go:22:22:22:22 | S | package github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1 |
+| pkg1/promotedStructs.go:25:22:25:22 | P | package github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1 |
 | pkg1/tst.go:4:2:4:2 | f | package github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1 |
 | pkg1/tst.go:5:2:5:4 | Foo | package github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1 |
 | pkg1/tst.go:6:2:6:4 | Bar | package github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1 |
@@ -46,3 +50,7 @@
 | pkg1/tst.go:30:2:30:5 | flag | package github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1 |
 | pkg2/tst.go:4:2:4:2 | g | package github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg2 |
 | pkg2/tst.go:8:2:8:2 | g | package github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg2 |
+| struct_tags.go:4:2:4:7 | field1 | package github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types |
+| struct_tags.go:5:2:5:7 | field2 | package github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types |
+| struct_tags.go:9:2:9:7 | field1 | package github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types |
+| struct_tags.go:10:2:10:7 | field2 | package github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types |
diff --git a/go/ql/test/library-tests/semmle/go/Types/Field_hasQualifiedName2.expected b/go/ql/test/library-tests/semmle/go/Types/Field_hasQualifiedName2.expected
index 4c69f36880b..c8575332f6f 100644
--- a/go/ql/test/library-tests/semmle/go/Types/Field_hasQualifiedName2.expected
+++ b/go/ql/test/library-tests/semmle/go/Types/Field_hasQualifiedName2.expected
@@ -43,6 +43,12 @@
 | pkg1/embedding.go:28:24:28:31 | embedder | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1.embedder3 | embedder |
 | pkg1/embedding.go:36:2:36:5 | base | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1.embedder4 | base |
 | pkg1/embedding.go:37:2:37:2 | f | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1.embedder4 | f |
+| pkg1/promotedStructs.go:5:2:5:7 | SField | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1.S | SField |
+| pkg1/promotedStructs.go:5:2:5:7 | SField | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1.SEmbedS | SField |
+| pkg1/promotedStructs.go:14:2:14:7 | PField | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1.P | PField |
+| pkg1/promotedStructs.go:14:2:14:7 | PField | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1.SEmbedP | PField |
+| pkg1/promotedStructs.go:22:22:22:22 | S | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1.SEmbedS | S |
+| pkg1/promotedStructs.go:25:22:25:22 | P | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1.SEmbedP | P |
 | pkg1/tst.go:4:2:4:2 | f | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1.T | f |
 | pkg1/tst.go:5:2:5:4 | Foo | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1.T | Foo |
 | pkg1/tst.go:6:2:6:4 | Bar | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1.T | Bar |
@@ -64,3 +70,7 @@
 | pkg2/tst.go:4:2:4:2 | g | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg2.T | g |
 | pkg2/tst.go:8:2:8:2 | g | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg2.G | g |
 | pkg2/tst.go:8:2:8:2 | g | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg2.T | g |
+| struct_tags.go:4:2:4:7 | field1 | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types.S1 | field1 |
+| struct_tags.go:5:2:5:7 | field2 | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types.S1 | field2 |
+| struct_tags.go:9:2:9:7 | field1 | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types.S2 | field1 |
+| struct_tags.go:10:2:10:7 | field2 | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types.S2 | field2 |
diff --git a/go/ql/test/library-tests/semmle/go/Types/Field_hasQualifiedName3.expected b/go/ql/test/library-tests/semmle/go/Types/Field_hasQualifiedName3.expected
index 4fe8aee19f4..56176082d9a 100644
--- a/go/ql/test/library-tests/semmle/go/Types/Field_hasQualifiedName3.expected
+++ b/go/ql/test/library-tests/semmle/go/Types/Field_hasQualifiedName3.expected
@@ -43,6 +43,12 @@
 | pkg1/embedding.go:28:24:28:31 | embedder | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1 | embedder3 | embedder |
 | pkg1/embedding.go:36:2:36:5 | base | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1 | embedder4 | base |
 | pkg1/embedding.go:37:2:37:2 | f | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1 | embedder4 | f |
+| pkg1/promotedStructs.go:5:2:5:7 | SField | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1 | S | SField |
+| pkg1/promotedStructs.go:5:2:5:7 | SField | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1 | SEmbedS | SField |
+| pkg1/promotedStructs.go:14:2:14:7 | PField | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1 | P | PField |
+| pkg1/promotedStructs.go:14:2:14:7 | PField | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1 | SEmbedP | PField |
+| pkg1/promotedStructs.go:22:22:22:22 | S | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1 | SEmbedS | S |
+| pkg1/promotedStructs.go:25:22:25:22 | P | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1 | SEmbedP | P |
 | pkg1/tst.go:4:2:4:2 | f | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1 | T | f |
 | pkg1/tst.go:5:2:5:4 | Foo | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1 | T | Foo |
 | pkg1/tst.go:6:2:6:4 | Bar | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1 | T | Bar |
@@ -64,3 +70,7 @@
 | pkg2/tst.go:4:2:4:2 | g | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg2 | T | g |
 | pkg2/tst.go:8:2:8:2 | g | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg2 | G | g |
 | pkg2/tst.go:8:2:8:2 | g | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg2 | T | g |
+| struct_tags.go:4:2:4:7 | field1 | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types | S1 | field1 |
+| struct_tags.go:5:2:5:7 | field2 | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types | S1 | field2 |
+| struct_tags.go:9:2:9:7 | field1 | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types | S2 | field1 |
+| struct_tags.go:10:2:10:7 | field2 | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types | S2 | field2 |
diff --git a/go/ql/test/library-tests/semmle/go/Types/InterfaceMethodIds.expected b/go/ql/test/library-tests/semmle/go/Types/InterfaceMethodIds.expected
new file mode 100644
index 00000000000..9bcfcde1db9
--- /dev/null
+++ b/go/ql/test/library-tests/semmle/go/Types/InterfaceMethodIds.expected
@@ -0,0 +1,3 @@
+| interface { Exported func() ; notExported func()  } | func()  | Exported |
+| interface { Exported func() ; notExported func()  } | func()  | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1.notExported |
+| interface { Exported func() ; notExported func()  } | func()  | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg2.notExported |
diff --git a/go/ql/test/library-tests/semmle/go/Types/InterfaceMethodIds.ql b/go/ql/test/library-tests/semmle/go/Types/InterfaceMethodIds.ql
new file mode 100644
index 00000000000..356bc85c931
--- /dev/null
+++ b/go/ql/test/library-tests/semmle/go/Types/InterfaceMethodIds.ql
@@ -0,0 +1,12 @@
+import go
+
+from NamedType nt, InterfaceType it, Type methodType, string id
+where
+  nt.getName() = "MixedExportedAndNot" and
+  it = nt.getUnderlyingType() and
+  (
+    it.hasPrivateMethodWithQualifiedName(_, id, methodType)
+    or
+    it.hasMethod(id, methodType) and not it.hasPrivateMethodWithQualifiedName(id, _, _)
+  )
+select it.pp(), methodType.pp(), id
diff --git a/go/ql/test/library-tests/semmle/go/Types/MethodCount.expected b/go/ql/test/library-tests/semmle/go/Types/MethodCount.expected
index 2b6dc32cada..9d576b0f4f6 100644
--- a/go/ql/test/library-tests/semmle/go/Types/MethodCount.expected
+++ b/go/ql/test/library-tests/semmle/go/Types/MethodCount.expected
@@ -1,4 +1,11 @@
 | * Foo | 1 |
+| * P | 1 |
+| * S | 1 |
+| * SEmbedP | 1 |
+| * SEmbedS | 1 |
+| * T | 1 |
+| * T3 | 1 |
+| * T4 | 1 |
 | * base | 2 |
 | * embedder | 2 |
 | * embedder2 | 2 |
@@ -14,7 +21,10 @@
 | C | 2 |
 | Foo | 1 |
 | GenericInterface | 1 |
+| MixedExportedAndNot | 2 |
 | MyInterface | 17 |
+| S | 1 |
+| SEmbedS | 1 |
 | T | 1 |
 | T3 | 1 |
 | T4 | 1 |
diff --git a/go/ql/test/library-tests/semmle/go/Types/MethodTypes.expected b/go/ql/test/library-tests/semmle/go/Types/MethodTypes.expected
index da2e9c1eb30..326debd2f80 100644
--- a/go/ql/test/library-tests/semmle/go/Types/MethodTypes.expected
+++ b/go/ql/test/library-tests/semmle/go/Types/MethodTypes.expected
@@ -48,6 +48,11 @@
 | pkg1/interfaces.go:26:6:26:14 | AExtended | m | func()  |
 | pkg1/interfaces.go:26:6:26:14 | AExtended | n | func()  |
 | pkg1/interfaces.go:31:6:31:7 | A2 | m | func()  |
+| pkg1/interfaces.go:35:6:35:24 | MixedExportedAndNot | Exported | func()  |
+| pkg1/interfaces.go:35:6:35:24 | MixedExportedAndNot | notExported | func()  |
+| pkg1/promotedStructs.go:22:6:22:12 | SEmbedS | SMethod | func() interface { } |
 | pkg1/tst.go:3:6:3:6 | T | half | func() Foo |
 | pkg1/tst.go:14:6:14:7 | T3 | half | func() Foo |
 | pkg1/tst.go:19:6:19:7 | T4 | half | func() Foo |
+| pkg2/tst.go:11:6:11:24 | MixedExportedAndNot | Exported | func()  |
+| pkg2/tst.go:11:6:11:24 | MixedExportedAndNot | notExported | func()  |
diff --git a/go/ql/test/library-tests/semmle/go/Types/Method_hasQualifiedName2.expected b/go/ql/test/library-tests/semmle/go/Types/Method_hasQualifiedName2.expected
index bf1bd76aa33..1f893728e30 100644
--- a/go/ql/test/library-tests/semmle/go/Types/Method_hasQualifiedName2.expected
+++ b/go/ql/test/library-tests/semmle/go/Types/Method_hasQualifiedName2.expected
@@ -53,7 +53,15 @@
 | pkg1/interfaces.go:14:2:14:2 | o | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1.C | o |
 | pkg1/interfaces.go:28:2:28:2 | n | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1.AExtended | n |
 | pkg1/interfaces.go:32:2:32:2 | m | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1.A2 | m |
+| pkg1/interfaces.go:36:2:36:9 | Exported | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1.MixedExportedAndNot | Exported |
+| pkg1/interfaces.go:37:2:37:12 | notExported | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1.MixedExportedAndNot | notExported |
+| pkg1/promotedStructs.go:8:12:8:18 | SMethod | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1.S | SMethod |
+| pkg1/promotedStructs.go:8:12:8:18 | SMethod | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1.SEmbedS | SMethod |
+| pkg1/promotedStructs.go:17:13:17:19 | PMethod | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1.P | PMethod |
+| pkg1/promotedStructs.go:17:13:17:19 | PMethod | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1.SEmbedP | PMethod |
 | pkg1/tst.go:33:16:33:19 | half | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1.Foo | half |
 | pkg1/tst.go:33:16:33:19 | half | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1.T | half |
 | pkg1/tst.go:33:16:33:19 | half | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1.T3 | half |
 | pkg1/tst.go:33:16:33:19 | half | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1.T4 | half |
+| pkg2/tst.go:12:2:12:9 | Exported | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg2.MixedExportedAndNot | Exported |
+| pkg2/tst.go:13:2:13:12 | notExported | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg2.MixedExportedAndNot | notExported |
diff --git a/go/ql/test/library-tests/semmle/go/Types/Method_hasQualifiedName3.expected b/go/ql/test/library-tests/semmle/go/Types/Method_hasQualifiedName3.expected
index 24eac7cebc1..59a298e4b5f 100644
--- a/go/ql/test/library-tests/semmle/go/Types/Method_hasQualifiedName3.expected
+++ b/go/ql/test/library-tests/semmle/go/Types/Method_hasQualifiedName3.expected
@@ -53,7 +53,15 @@
 | pkg1/interfaces.go:14:2:14:2 | o | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1 | C | o |
 | pkg1/interfaces.go:28:2:28:2 | n | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1 | AExtended | n |
 | pkg1/interfaces.go:32:2:32:2 | m | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1 | A2 | m |
+| pkg1/interfaces.go:36:2:36:9 | Exported | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1 | MixedExportedAndNot | Exported |
+| pkg1/interfaces.go:37:2:37:12 | notExported | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1 | MixedExportedAndNot | notExported |
+| pkg1/promotedStructs.go:8:12:8:18 | SMethod | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1 | S | SMethod |
+| pkg1/promotedStructs.go:8:12:8:18 | SMethod | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1 | SEmbedS | SMethod |
+| pkg1/promotedStructs.go:17:13:17:19 | PMethod | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1 | P | PMethod |
+| pkg1/promotedStructs.go:17:13:17:19 | PMethod | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1 | SEmbedP | PMethod |
 | pkg1/tst.go:33:16:33:19 | half | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1 | Foo | half |
 | pkg1/tst.go:33:16:33:19 | half | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1 | T | half |
 | pkg1/tst.go:33:16:33:19 | half | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1 | T3 | half |
 | pkg1/tst.go:33:16:33:19 | half | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1 | T4 | half |
+| pkg2/tst.go:12:2:12:9 | Exported | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg2 | MixedExportedAndNot | Exported |
+| pkg2/tst.go:13:2:13:12 | notExported | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg2 | MixedExportedAndNot | notExported |
diff --git a/go/ql/test/library-tests/semmle/go/Types/Methods.expected b/go/ql/test/library-tests/semmle/go/Types/Methods.expected
index 8b2406ec858..2c17013c186 100644
--- a/go/ql/test/library-tests/semmle/go/Types/Methods.expected
+++ b/go/ql/test/library-tests/semmle/go/Types/Methods.expected
@@ -1,4 +1,11 @@
 | * Foo | half | pkg1/tst.go:33:16:33:19 | half |
+| * P | PMethod | pkg1/promotedStructs.go:17:13:17:19 | PMethod |
+| * S | SMethod | pkg1/promotedStructs.go:8:12:8:18 | SMethod |
+| * SEmbedP | PMethod | pkg1/promotedStructs.go:17:13:17:19 | PMethod |
+| * SEmbedS | SMethod | pkg1/promotedStructs.go:8:12:8:18 | SMethod |
+| * T | half | pkg1/tst.go:33:16:33:19 | half |
+| * T3 | half | pkg1/tst.go:33:16:33:19 | half |
+| * T4 | half | pkg1/tst.go:33:16:33:19 | half |
 | * base | f | pkg1/embedding.go:10:13:10:13 | f |
 | * base | g | pkg1/embedding.go:14:14:14:14 | g |
 | * embedder | f | pkg1/embedding.go:10:13:10:13 | f |
@@ -24,6 +31,10 @@
 | C | o | pkg1/interfaces.go:14:2:14:2 | o |
 | Foo | half | pkg1/tst.go:33:16:33:19 | half |
 | GenericInterface | GetT | generic.go:33:2:33:5 | GetT |
+| MixedExportedAndNot | Exported | pkg1/interfaces.go:36:2:36:9 | Exported |
+| MixedExportedAndNot | Exported | pkg2/tst.go:12:2:12:9 | Exported |
+| MixedExportedAndNot | notExported | pkg1/interfaces.go:37:2:37:12 | notExported |
+| MixedExportedAndNot | notExported | pkg2/tst.go:13:2:13:12 | notExported |
 | MyInterface | clone | generic.go:48:2:48:6 | clone |
 | MyInterface | dummy1 | generic.go:49:2:49:7 | dummy1 |
 | MyInterface | dummy2 | generic.go:50:2:50:7 | dummy2 |
@@ -41,6 +52,8 @@
 | MyInterface | dummy18 | generic.go:62:2:62:8 | dummy18 |
 | MyInterface | dummy19 | generic.go:63:2:63:8 | dummy19 |
 | MyInterface | dummy20 | generic.go:64:2:64:8 | dummy20 |
+| S | SMethod | pkg1/promotedStructs.go:8:12:8:18 | SMethod |
+| SEmbedS | SMethod | pkg1/promotedStructs.go:8:12:8:18 | SMethod |
 | T | half | pkg1/tst.go:33:16:33:19 | half |
 | T3 | half | pkg1/tst.go:33:16:33:19 | half |
 | T4 | half | pkg1/tst.go:33:16:33:19 | half |
diff --git a/go/ql/test/library-tests/semmle/go/Types/QualifiedNames.expected b/go/ql/test/library-tests/semmle/go/Types/QualifiedNames.expected
index bedfbc5fa00..660209effbb 100644
--- a/go/ql/test/library-tests/semmle/go/Types/QualifiedNames.expected
+++ b/go/ql/test/library-tests/semmle/go/Types/QualifiedNames.expected
@@ -90,6 +90,11 @@
 | pkg1/interfaces.go:21:6:21:7 | AC | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1.AC |
 | pkg1/interfaces.go:26:6:26:14 | AExtended | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1.AExtended |
 | pkg1/interfaces.go:31:6:31:7 | A2 | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1.A2 |
+| pkg1/interfaces.go:35:6:35:24 | MixedExportedAndNot | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1.MixedExportedAndNot |
+| pkg1/promotedStructs.go:4:6:4:6 | S | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1.S |
+| pkg1/promotedStructs.go:13:6:13:6 | P | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1.P |
+| pkg1/promotedStructs.go:22:6:22:12 | SEmbedS | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1.SEmbedS |
+| pkg1/promotedStructs.go:25:6:25:12 | SEmbedP | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1.SEmbedP |
 | pkg1/tst.go:3:6:3:6 | T | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1.T |
 | pkg1/tst.go:9:6:9:7 | T2 | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1.T2 |
 | pkg1/tst.go:14:6:14:7 | T3 | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1.T3 |
@@ -98,3 +103,6 @@
 | pkg1/tst.go:29:6:29:8 | Bar | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1.Bar |
 | pkg2/tst.go:3:6:3:6 | T | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg2.T |
 | pkg2/tst.go:7:6:7:6 | G | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg2.G |
+| pkg2/tst.go:11:6:11:24 | MixedExportedAndNot | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg2.MixedExportedAndNot |
+| struct_tags.go:3:6:3:7 | S1 | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types.S1 |
+| struct_tags.go:8:6:8:7 | S2 | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types.S2 |
diff --git a/go/ql/test/library-tests/semmle/go/Types/SignatureType_getNumParameter.expected b/go/ql/test/library-tests/semmle/go/Types/SignatureType_getNumParameter.expected
index 6742adf837f..faedd5aa0de 100644
--- a/go/ql/test/library-tests/semmle/go/Types/SignatureType_getNumParameter.expected
+++ b/go/ql/test/library-tests/semmle/go/Types/SignatureType_getNumParameter.expected
@@ -11,9 +11,15 @@
 | pkg1/embedding.go:14:1:16:1 | function declaration | 0 |
 | pkg1/embedding.go:30:1:32:1 | function declaration | 0 |
 | pkg1/embedding.go:40:1:61:1 | function declaration | 0 |
+| pkg1/promotedStructs.go:8:1:10:1 | function declaration | 0 |
+| pkg1/promotedStructs.go:17:1:19:1 | function declaration | 0 |
 | pkg1/tst.go:33:1:35:1 | function declaration | 0 |
 | pkg1/tst.go:37:1:37:26 | function declaration | 1 |
 | pkg1/tst.go:39:1:57:1 | function declaration | 2 |
+| promoted.go:7:1:10:1 | function declaration | 1 |
+| promoted.go:12:1:15:1 | function declaration | 1 |
+| promoted.go:17:1:20:1 | function declaration | 1 |
+| promoted.go:22:1:25:1 | function declaration | 1 |
 | unknownFunction.go:8:1:12:1 | function declaration | 0 |
 | variadicFunctions.go:5:1:8:1 | function declaration | 0 |
 | variadicFunctions.go:10:1:18:1 | function declaration | 1 |
diff --git a/go/ql/test/library-tests/semmle/go/Types/SignatureType_getNumResult.expected b/go/ql/test/library-tests/semmle/go/Types/SignatureType_getNumResult.expected
index c6b20f54830..513ad56bd3c 100644
--- a/go/ql/test/library-tests/semmle/go/Types/SignatureType_getNumResult.expected
+++ b/go/ql/test/library-tests/semmle/go/Types/SignatureType_getNumResult.expected
@@ -11,9 +11,15 @@
 | pkg1/embedding.go:14:1:16:1 | function declaration | 1 |
 | pkg1/embedding.go:30:1:32:1 | function declaration | 1 |
 | pkg1/embedding.go:40:1:61:1 | function declaration | 0 |
+| pkg1/promotedStructs.go:8:1:10:1 | function declaration | 1 |
+| pkg1/promotedStructs.go:17:1:19:1 | function declaration | 1 |
 | pkg1/tst.go:33:1:35:1 | function declaration | 1 |
 | pkg1/tst.go:37:1:37:26 | function declaration | 0 |
 | pkg1/tst.go:39:1:57:1 | function declaration | 0 |
+| promoted.go:7:1:10:1 | function declaration | 0 |
+| promoted.go:12:1:15:1 | function declaration | 0 |
+| promoted.go:17:1:20:1 | function declaration | 0 |
+| promoted.go:22:1:25:1 | function declaration | 0 |
 | unknownFunction.go:8:1:12:1 | function declaration | 0 |
 | variadicFunctions.go:5:1:8:1 | function declaration | 0 |
 | variadicFunctions.go:10:1:18:1 | function declaration | 1 |
diff --git a/go/ql/test/library-tests/semmle/go/Types/StructFields.expected b/go/ql/test/library-tests/semmle/go/Types/StructFields.expected
index 5bce8e1d7df..502b4fa07ad 100644
--- a/go/ql/test/library-tests/semmle/go/Types/StructFields.expected
+++ b/go/ql/test/library-tests/semmle/go/Types/StructFields.expected
@@ -45,6 +45,12 @@
 | pkg1/embedding.go:28:6:28:14 | embedder3 | pkg1/embedding.go:28:16:28:33 | struct type | embedder | embedder |
 | pkg1/embedding.go:35:6:35:14 | embedder4 | pkg1/embedding.go:35:16:38:1 | struct type | base | base |
 | pkg1/embedding.go:35:6:35:14 | embedder4 | pkg1/embedding.go:35:16:38:1 | struct type | f | int |
+| pkg1/promotedStructs.go:4:6:4:6 | S | pkg1/promotedStructs.go:4:8:6:1 | struct type | SField | string |
+| pkg1/promotedStructs.go:13:6:13:6 | P | pkg1/promotedStructs.go:13:8:15:1 | struct type | PField | string |
+| pkg1/promotedStructs.go:22:6:22:12 | SEmbedS | pkg1/promotedStructs.go:22:14:22:24 | struct type | S | S |
+| pkg1/promotedStructs.go:22:6:22:12 | SEmbedS | pkg1/promotedStructs.go:22:14:22:24 | struct type | SField | string |
+| pkg1/promotedStructs.go:25:6:25:12 | SEmbedP | pkg1/promotedStructs.go:25:14:25:24 | struct type | P | P |
+| pkg1/promotedStructs.go:25:6:25:12 | SEmbedP | pkg1/promotedStructs.go:25:14:25:24 | struct type | PField | string |
 | pkg1/tst.go:3:6:3:6 | T | pkg1/tst.go:3:8:7:1 | struct type | Bar | Bar |
 | pkg1/tst.go:3:6:3:6 | T | pkg1/tst.go:3:8:7:1 | struct type | Foo | Foo |
 | pkg1/tst.go:3:6:3:6 | T | pkg1/tst.go:3:8:7:1 | struct type | f | int |
@@ -66,3 +72,7 @@
 | pkg2/tst.go:3:6:3:6 | T | pkg2/tst.go:7:8:9:1 | struct type | g | int |
 | pkg2/tst.go:7:6:7:6 | G | pkg2/tst.go:3:8:5:1 | struct type | g | int |
 | pkg2/tst.go:7:6:7:6 | G | pkg2/tst.go:7:8:9:1 | struct type | g | int |
+| struct_tags.go:3:6:3:7 | S1 | struct_tags.go:3:9:6:1 | struct type | field1 | int |
+| struct_tags.go:3:6:3:7 | S1 | struct_tags.go:3:9:6:1 | struct type | field2 | int |
+| struct_tags.go:8:6:8:7 | S2 | struct_tags.go:8:9:11:1 | struct type | field1 | int |
+| struct_tags.go:8:6:8:7 | S2 | struct_tags.go:8:9:11:1 | struct type | field2 | int |
diff --git a/go/ql/test/library-tests/semmle/go/Types/Types.expected b/go/ql/test/library-tests/semmle/go/Types/Types.expected
index 3801769db02..9c04442d7aa 100644
--- a/go/ql/test/library-tests/semmle/go/Types/Types.expected
+++ b/go/ql/test/library-tests/semmle/go/Types/Types.expected
@@ -90,6 +90,11 @@
 | pkg1/interfaces.go:21:6:21:7 | AC | AC |
 | pkg1/interfaces.go:26:6:26:14 | AExtended | AExtended |
 | pkg1/interfaces.go:31:6:31:7 | A2 | A2 |
+| pkg1/interfaces.go:35:6:35:24 | MixedExportedAndNot | MixedExportedAndNot |
+| pkg1/promotedStructs.go:4:6:4:6 | S | S |
+| pkg1/promotedStructs.go:13:6:13:6 | P | P |
+| pkg1/promotedStructs.go:22:6:22:12 | SEmbedS | SEmbedS |
+| pkg1/promotedStructs.go:25:6:25:12 | SEmbedP | SEmbedP |
 | pkg1/tst.go:3:6:3:6 | T | T |
 | pkg1/tst.go:9:6:9:7 | T2 | T2 |
 | pkg1/tst.go:14:6:14:7 | T3 | T3 |
@@ -98,3 +103,6 @@
 | pkg1/tst.go:29:6:29:8 | Bar | Bar |
 | pkg2/tst.go:3:6:3:6 | T | T |
 | pkg2/tst.go:7:6:7:6 | G | G |
+| pkg2/tst.go:11:6:11:24 | MixedExportedAndNot | MixedExportedAndNot |
+| struct_tags.go:3:6:3:7 | S1 | S1 |
+| struct_tags.go:8:6:8:7 | S2 | S2 |
diff --git a/go/ql/test/library-tests/semmle/go/Types/pkg1/interfaces.go b/go/ql/test/library-tests/semmle/go/Types/pkg1/interfaces.go
index caeb62ea40c..81a5e585407 100644
--- a/go/ql/test/library-tests/semmle/go/Types/pkg1/interfaces.go
+++ b/go/ql/test/library-tests/semmle/go/Types/pkg1/interfaces.go
@@ -31,3 +31,8 @@ type AExtended interface {
 type A2 interface {
 	m()
 }
+
+type MixedExportedAndNot interface {
+	Exported()
+	notExported()
+}
diff --git a/go/ql/test/library-tests/semmle/go/Types/pkg1/promotedStructs.go b/go/ql/test/library-tests/semmle/go/Types/pkg1/promotedStructs.go
new file mode 100644
index 00000000000..faccad82467
--- /dev/null
+++ b/go/ql/test/library-tests/semmle/go/Types/pkg1/promotedStructs.go
@@ -0,0 +1,25 @@
+package pkg1
+
+// A struct type with methods defined on it
+type S struct {
+	SField string
+}
+
+func (t S) SMethod() interface{} {
+	return nil
+}
+
+// A struct type with methods defined on its pointer type
+type P struct {
+	PField string
+}
+
+func (t *P) PMethod() interface{} {
+	return nil
+}
+
+// A struct type embedding S
+type SEmbedS struct{ S }
+
+// A struct type embedding P
+type SEmbedP struct{ P }
diff --git a/go/ql/test/library-tests/semmle/go/Types/pkg2/tst.go b/go/ql/test/library-tests/semmle/go/Types/pkg2/tst.go
index 7f6f7f2d287..af91e514b77 100644
--- a/go/ql/test/library-tests/semmle/go/Types/pkg2/tst.go
+++ b/go/ql/test/library-tests/semmle/go/Types/pkg2/tst.go
@@ -7,3 +7,8 @@ type T struct {
 type G struct {
 	g int
 }
+
+type MixedExportedAndNot interface {
+	Exported()
+	notExported()
+}
diff --git a/go/ql/test/library-tests/semmle/go/Types/promoted.go b/go/ql/test/library-tests/semmle/go/Types/promoted.go
new file mode 100644
index 00000000000..326b81084a7
--- /dev/null
+++ b/go/ql/test/library-tests/semmle/go/Types/promoted.go
@@ -0,0 +1,25 @@
+package main
+
+import "github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1"
+
+// IMPORTANT: Make sure that *pkg1.SEmbedP is not referenced.
+
+func testS(t pkg1.S) {
+	_ = t.SMethod()
+	_ = t.SField
+}
+
+func testP(t pkg1.P) {
+	_ = t.PMethod()
+	_ = t.PField
+}
+
+func testSEmbedS(t pkg1.SEmbedS) {
+	_ = t.SMethod()
+	_ = t.SField
+}
+
+func testSEmbedP(t pkg1.SEmbedP) {
+	_ = t.PMethod()
+	_ = t.PField
+}
diff --git a/go/ql/test/library-tests/semmle/go/Types/struct_tags.expected b/go/ql/test/library-tests/semmle/go/Types/struct_tags.expected
new file mode 100644
index 00000000000..33c7afd80ec
--- /dev/null
+++ b/go/ql/test/library-tests/semmle/go/Types/struct_tags.expected
@@ -0,0 +1,4 @@
+| struct { field1 int `tag1a`; field2 int `tag2a` } | struct_tags.go:4:2:4:7 | field1 | tag1a |
+| struct { field1 int `tag1a`; field2 int `tag2a` } | struct_tags.go:5:2:5:7 | field2 | tag2a |
+| struct { field1 int `tag1b`; field2 int `tag2b` } | struct_tags.go:9:2:9:7 | field1 | tag1b |
+| struct { field1 int `tag1b`; field2 int `tag2b` } | struct_tags.go:10:2:10:7 | field2 | tag2b |
diff --git a/go/ql/test/library-tests/semmle/go/Types/struct_tags.go b/go/ql/test/library-tests/semmle/go/Types/struct_tags.go
new file mode 100644
index 00000000000..c06f8395135
--- /dev/null
+++ b/go/ql/test/library-tests/semmle/go/Types/struct_tags.go
@@ -0,0 +1,11 @@
+package main
+
+type S1 struct {
+	field1 int `tag1a`
+	field2 int `tag2a`
+}
+
+type S2 struct {
+	field1 int `tag1b`
+	field2 int `tag2b`
+}
diff --git a/go/ql/test/library-tests/semmle/go/Types/struct_tags.ql b/go/ql/test/library-tests/semmle/go/Types/struct_tags.ql
new file mode 100644
index 00000000000..05ce098aed4
--- /dev/null
+++ b/go/ql/test/library-tests/semmle/go/Types/struct_tags.ql
@@ -0,0 +1,8 @@
+import go
+
+from StructType s, Field f, string tag
+where
+  f = s.getOwnField(_, _) and
+  tag = f.getTag() and
+  tag != ""
+select s.pp(), f, tag
diff --git a/go/ql/test/library-tests/semmle/go/aliases/InterfaceImpls/test.expected b/go/ql/test/library-tests/semmle/go/aliases/InterfaceImpls/test.expected
index c39b58ab620..01635aaf19d 100644
--- a/go/ql/test/library-tests/semmle/go/aliases/InterfaceImpls/test.expected
+++ b/go/ql/test/library-tests/semmle/go/aliases/InterfaceImpls/test.expected
@@ -13,10 +13,16 @@ callTargets
 | test.go:57:2:57:29 | call to ImplementMe | test.go:46:1:46:87 | function declaration | ImplementMe |
 | test.go:57:2:57:29 | call to ImplementMe | test.go:53:1:53:85 | function declaration | ImplementMe |
 #select
-| file://:0:0:0:0 | basic interface type | file://:0:0:0:0 | basic interface type |
-| file://:0:0:0:0 | basic interface type | test.go:18:6:18:10 | Impl1 |
-| file://:0:0:0:0 | basic interface type | test.go:23:6:23:10 | Impl2 |
-| file://:0:0:0:0 | basic interface type | test.go:28:6:28:10 | Impl3 |
-| file://:0:0:0:0 | basic interface type | test.go:35:6:35:10 | Impl4 |
-| file://:0:0:0:0 | basic interface type | test.go:42:6:42:10 | Impl5 |
-| file://:0:0:0:0 | basic interface type | test.go:49:6:49:10 | Impl6 |
+| file://:0:0:0:0 | basic interface type | * Impl1 |
+| file://:0:0:0:0 | basic interface type | * Impl2 |
+| file://:0:0:0:0 | basic interface type | * Impl3 |
+| file://:0:0:0:0 | basic interface type | * Impl4 |
+| file://:0:0:0:0 | basic interface type | * Impl5 |
+| file://:0:0:0:0 | basic interface type | * Impl6 |
+| file://:0:0:0:0 | basic interface type | Impl1 |
+| file://:0:0:0:0 | basic interface type | Impl2 |
+| file://:0:0:0:0 | basic interface type | Impl3 |
+| file://:0:0:0:0 | basic interface type | Impl4 |
+| file://:0:0:0:0 | basic interface type | Impl5 |
+| file://:0:0:0:0 | basic interface type | Impl6 |
+| file://:0:0:0:0 | basic interface type | interface { ImplementMe func(func(struct { x int }) )  } |
diff --git a/go/ql/test/library-tests/semmle/go/aliases/InterfaceImpls/test.ql b/go/ql/test/library-tests/semmle/go/aliases/InterfaceImpls/test.ql
index ae0df68d38d..88b6f63a5d5 100644
--- a/go/ql/test/library-tests/semmle/go/aliases/InterfaceImpls/test.ql
+++ b/go/ql/test/library-tests/semmle/go/aliases/InterfaceImpls/test.ql
@@ -8,4 +8,4 @@ from InterfaceType i, Type impl
 where
   i.hasMethod("ImplementMe", _) and
   impl.implements(i)
-select i, impl
+select i, impl.pp()
diff --git a/go/ql/test/library-tests/semmle/go/dataflow/DefaultTaintSanitizer/DefaultSanitizer.expected b/go/ql/test/library-tests/semmle/go/dataflow/DefaultTaintSanitizer/DefaultSanitizer.expected
index 2bc14e8d62e..b198361df04 100644
--- a/go/ql/test/library-tests/semmle/go/dataflow/DefaultTaintSanitizer/DefaultSanitizer.expected
+++ b/go/ql/test/library-tests/semmle/go/dataflow/DefaultTaintSanitizer/DefaultSanitizer.expected
@@ -1,21 +1,21 @@
 models
-| 1 | Summary: io/fs; File; true; Read; ; ; Argument[receiver]; Argument[0]; taint; manual |
-| 2 | Summary: io; Reader; true; Read; ; ; Argument[receiver]; Argument[0]; taint; manual |
-| 3 | Source: net/http; Request; true; Body; ; ; ; remote; manual |
+| 1 | Source: net/http; Request; true; Body; ; ; ; remote; manual |
+| 2 | Summary: io/fs; File; true; Read; ; ; Argument[receiver]; Argument[0]; taint; manual |
+| 3 | Summary: io; Reader; true; Read; ; ; Argument[receiver]; Argument[0]; taint; manual |
 | 4 | Summary: os; File; true; Read; ; ; Argument[receiver]; Argument[0]; taint; manual |
 edges
 | Builtin.go:6:2:6:2 | definition of b | Builtin.go:8:9:8:17 | type conversion | provenance |  |
-| Builtin.go:7:2:7:15 | selection of Body | Builtin.go:6:2:6:2 | definition of b | provenance | Src:MaD:3 MaD:1 |
-| Builtin.go:7:2:7:15 | selection of Body | Builtin.go:6:2:6:2 | definition of b | provenance | Src:MaD:3 MaD:2 |
-| Builtin.go:7:2:7:15 | selection of Body | Builtin.go:6:2:6:2 | definition of b | provenance | Src:MaD:3 MaD:4 |
+| Builtin.go:7:2:7:15 | selection of Body | Builtin.go:6:2:6:2 | definition of b | provenance | Src:MaD:1 MaD:2 |
+| Builtin.go:7:2:7:15 | selection of Body | Builtin.go:6:2:6:2 | definition of b | provenance | Src:MaD:1 MaD:3 |
+| Builtin.go:7:2:7:15 | selection of Body | Builtin.go:6:2:6:2 | definition of b | provenance | Src:MaD:1 MaD:4 |
 | Builtin.go:12:2:12:2 | definition of b | Builtin.go:17:9:17:17 | type conversion | provenance |  |
-| Builtin.go:13:2:13:15 | selection of Body | Builtin.go:12:2:12:2 | definition of b | provenance | Src:MaD:3 MaD:1 |
-| Builtin.go:13:2:13:15 | selection of Body | Builtin.go:12:2:12:2 | definition of b | provenance | Src:MaD:3 MaD:2 |
-| Builtin.go:13:2:13:15 | selection of Body | Builtin.go:12:2:12:2 | definition of b | provenance | Src:MaD:3 MaD:4 |
+| Builtin.go:13:2:13:15 | selection of Body | Builtin.go:12:2:12:2 | definition of b | provenance | Src:MaD:1 MaD:2 |
+| Builtin.go:13:2:13:15 | selection of Body | Builtin.go:12:2:12:2 | definition of b | provenance | Src:MaD:1 MaD:3 |
+| Builtin.go:13:2:13:15 | selection of Body | Builtin.go:12:2:12:2 | definition of b | provenance | Src:MaD:1 MaD:4 |
 | Builtin.go:21:2:21:2 | definition of b | Builtin.go:24:10:24:18 | type conversion | provenance |  |
-| Builtin.go:22:2:22:15 | selection of Body | Builtin.go:21:2:21:2 | definition of b | provenance | Src:MaD:3 MaD:1 |
-| Builtin.go:22:2:22:15 | selection of Body | Builtin.go:21:2:21:2 | definition of b | provenance | Src:MaD:3 MaD:2 |
-| Builtin.go:22:2:22:15 | selection of Body | Builtin.go:21:2:21:2 | definition of b | provenance | Src:MaD:3 MaD:4 |
+| Builtin.go:22:2:22:15 | selection of Body | Builtin.go:21:2:21:2 | definition of b | provenance | Src:MaD:1 MaD:2 |
+| Builtin.go:22:2:22:15 | selection of Body | Builtin.go:21:2:21:2 | definition of b | provenance | Src:MaD:1 MaD:3 |
+| Builtin.go:22:2:22:15 | selection of Body | Builtin.go:21:2:21:2 | definition of b | provenance | Src:MaD:1 MaD:4 |
 nodes
 | Builtin.go:6:2:6:2 | definition of b | semmle.label | definition of b |
 | Builtin.go:7:2:7:15 | selection of Body | semmle.label | selection of Body |
diff --git a/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/go.mod b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/go.mod
new file mode 100644
index 00000000000..57813acac55
--- /dev/null
+++ b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/go.mod
@@ -0,0 +1,5 @@
+module semmle.go.Packages
+
+go 1.21
+
+require github.com/nonexistent/test v0.0.0-20200203000000-0000000000000
diff --git a/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_I1_subtypes_false.expected b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_I1_subtypes_false.expected
new file mode 100644
index 00000000000..db33d6d2504
--- /dev/null
+++ b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_I1_subtypes_false.expected
@@ -0,0 +1,3 @@
+testFailures
+invalidModelRow
+failures
diff --git a/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_I1_subtypes_false.ext.yml b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_I1_subtypes_false.ext.yml
new file mode 100644
index 00000000000..a50fb9449a3
--- /dev/null
+++ b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_I1_subtypes_false.ext.yml
@@ -0,0 +1,16 @@
+extensions:
+  - addsTo:
+      pack: codeql/go-all
+      extensible: sourceModel
+    data:
+      - ["github.com/nonexistent/test", "I1", False, "Source", "", "", "ReturnValue", "qltest", "manual"]
+  - addsTo:
+      pack: codeql/go-all
+      extensible: summaryModel
+    data:
+      - ["github.com/nonexistent/test", "I1", False, "Step", "", "", "Argument[0]", "ReturnValue", "value", "manual"]
+  - addsTo:
+      pack: codeql/go-all
+      extensible: sinkModel
+    data:
+      - ["github.com/nonexistent/test", "I1", False, "Sink", "", "", "Argument[0]", "qltest", "manual"]
diff --git a/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_I1_subtypes_false.ql b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_I1_subtypes_false.ql
new file mode 100644
index 00000000000..3915c20b92b
--- /dev/null
+++ b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_I1_subtypes_false.ql
@@ -0,0 +1,26 @@
+import go
+import ModelValidation
+import TestUtilities.InlineExpectationsTest
+import MakeTest<FlowTest>
+
+module Config implements DataFlow::ConfigSig {
+  predicate isSource(DataFlow::Node source) { sourceNode(source, "qltest") }
+
+  predicate isSink(DataFlow::Node sink) { sinkNode(sink, "qltest") }
+}
+
+module Flow = TaintTracking::Global<Config>;
+
+module FlowTest implements TestSig {
+  string getARelevantTag() { result = "I1[f]" }
+
+  predicate hasActualResult(Location location, string element, string tag, string value) {
+    tag = "I1[f]" and
+    exists(DataFlow::Node sink | Flow::flowTo(sink) |
+      sink.hasLocationInfo(location.getFile().getAbsolutePath(), location.getStartLine(),
+        location.getStartColumn(), location.getEndLine(), location.getEndColumn()) and
+      element = sink.toString() and
+      value = ""
+    )
+  }
+}
diff --git a/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_I1_subtypes_true.expected b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_I1_subtypes_true.expected
new file mode 100644
index 00000000000..db33d6d2504
--- /dev/null
+++ b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_I1_subtypes_true.expected
@@ -0,0 +1,3 @@
+testFailures
+invalidModelRow
+failures
diff --git a/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_I1_subtypes_true.ext.yml b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_I1_subtypes_true.ext.yml
new file mode 100644
index 00000000000..4b59e9a255f
--- /dev/null
+++ b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_I1_subtypes_true.ext.yml
@@ -0,0 +1,16 @@
+extensions:
+  - addsTo:
+      pack: codeql/go-all
+      extensible: sourceModel
+    data:
+      - ["github.com/nonexistent/test", "I1", True, "Source", "", "", "ReturnValue", "qltest", "manual"]
+  - addsTo:
+      pack: codeql/go-all
+      extensible: summaryModel
+    data:
+      - ["github.com/nonexistent/test", "I1", True, "Step", "", "", "Argument[0]", "ReturnValue", "value", "manual"]
+  - addsTo:
+      pack: codeql/go-all
+      extensible: sinkModel
+    data:
+      - ["github.com/nonexistent/test", "I1", True, "Sink", "", "", "Argument[0]", "qltest", "manual"]
diff --git a/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_I1_subtypes_true.ql b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_I1_subtypes_true.ql
new file mode 100644
index 00000000000..2db01e3a76f
--- /dev/null
+++ b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_I1_subtypes_true.ql
@@ -0,0 +1,26 @@
+import go
+import ModelValidation
+import TestUtilities.InlineExpectationsTest
+import MakeTest<FlowTest>
+
+module Config implements DataFlow::ConfigSig {
+  predicate isSource(DataFlow::Node source) { sourceNode(source, "qltest") }
+
+  predicate isSink(DataFlow::Node sink) { sinkNode(sink, "qltest") }
+}
+
+module Flow = TaintTracking::Global<Config>;
+
+module FlowTest implements TestSig {
+  string getARelevantTag() { result = "I1[t]" }
+
+  predicate hasActualResult(Location location, string element, string tag, string value) {
+    tag = "I1[t]" and
+    exists(DataFlow::Node sink | Flow::flowTo(sink) |
+      sink.hasLocationInfo(location.getFile().getAbsolutePath(), location.getStartLine(),
+        location.getStartColumn(), location.getEndLine(), location.getEndColumn()) and
+      element = sink.toString() and
+      value = ""
+    )
+  }
+}
diff --git a/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_I2_subtypes_false.expected b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_I2_subtypes_false.expected
new file mode 100644
index 00000000000..db33d6d2504
--- /dev/null
+++ b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_I2_subtypes_false.expected
@@ -0,0 +1,3 @@
+testFailures
+invalidModelRow
+failures
diff --git a/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_I2_subtypes_false.ext.yml b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_I2_subtypes_false.ext.yml
new file mode 100644
index 00000000000..660eb326eaa
--- /dev/null
+++ b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_I2_subtypes_false.ext.yml
@@ -0,0 +1,16 @@
+extensions:
+  - addsTo:
+      pack: codeql/go-all
+      extensible: sourceModel
+    data:
+      - ["github.com/nonexistent/test", "I2", False, "Source", "", "", "ReturnValue", "qltest", "manual"]
+  - addsTo:
+      pack: codeql/go-all
+      extensible: summaryModel
+    data:
+      - ["github.com/nonexistent/test", "I2", False, "Step", "", "", "Argument[0]", "ReturnValue", "value", "manual"]
+  - addsTo:
+      pack: codeql/go-all
+      extensible: sinkModel
+    data:
+      - ["github.com/nonexistent/test", "I2", False, "Sink", "", "", "Argument[0]", "qltest", "manual"]
diff --git a/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_I2_subtypes_false.ql b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_I2_subtypes_false.ql
new file mode 100644
index 00000000000..9cff9e92009
--- /dev/null
+++ b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_I2_subtypes_false.ql
@@ -0,0 +1,26 @@
+import go
+import ModelValidation
+import TestUtilities.InlineExpectationsTest
+import MakeTest<FlowTest>
+
+module Config implements DataFlow::ConfigSig {
+  predicate isSource(DataFlow::Node source) { sourceNode(source, "qltest") }
+
+  predicate isSink(DataFlow::Node sink) { sinkNode(sink, "qltest") }
+}
+
+module Flow = TaintTracking::Global<Config>;
+
+module FlowTest implements TestSig {
+  string getARelevantTag() { result = "I2[f]" }
+
+  predicate hasActualResult(Location location, string element, string tag, string value) {
+    tag = "I2[f]" and
+    exists(DataFlow::Node sink | Flow::flowTo(sink) |
+      sink.hasLocationInfo(location.getFile().getAbsolutePath(), location.getStartLine(),
+        location.getStartColumn(), location.getEndLine(), location.getEndColumn()) and
+      element = sink.toString() and
+      value = ""
+    )
+  }
+}
diff --git a/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_I2_subtypes_true.expected b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_I2_subtypes_true.expected
new file mode 100644
index 00000000000..db33d6d2504
--- /dev/null
+++ b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_I2_subtypes_true.expected
@@ -0,0 +1,3 @@
+testFailures
+invalidModelRow
+failures
diff --git a/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_I2_subtypes_true.ext.yml b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_I2_subtypes_true.ext.yml
new file mode 100644
index 00000000000..8d2c2ff522f
--- /dev/null
+++ b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_I2_subtypes_true.ext.yml
@@ -0,0 +1,16 @@
+extensions:
+  - addsTo:
+      pack: codeql/go-all
+      extensible: sourceModel
+    data:
+      - ["github.com/nonexistent/test", "I2", True, "Source", "", "", "ReturnValue", "qltest", "manual"]
+  - addsTo:
+      pack: codeql/go-all
+      extensible: summaryModel
+    data:
+      - ["github.com/nonexistent/test", "I2", True, "Step", "", "", "Argument[0]", "ReturnValue", "value", "manual"]
+  - addsTo:
+      pack: codeql/go-all
+      extensible: sinkModel
+    data:
+      - ["github.com/nonexistent/test", "I2", True, "Sink", "", "", "Argument[0]", "qltest", "manual"]
diff --git a/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_I2_subtypes_true.ql b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_I2_subtypes_true.ql
new file mode 100644
index 00000000000..79220e979c0
--- /dev/null
+++ b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_I2_subtypes_true.ql
@@ -0,0 +1,26 @@
+import go
+import ModelValidation
+import TestUtilities.InlineExpectationsTest
+import MakeTest<FlowTest>
+
+module Config implements DataFlow::ConfigSig {
+  predicate isSource(DataFlow::Node source) { sourceNode(source, "qltest") }
+
+  predicate isSink(DataFlow::Node sink) { sinkNode(sink, "qltest") }
+}
+
+module Flow = TaintTracking::Global<Config>;
+
+module FlowTest implements TestSig {
+  string getARelevantTag() { result = "I2[t]" }
+
+  predicate hasActualResult(Location location, string element, string tag, string value) {
+    tag = "I2[t]" and
+    exists(DataFlow::Node sink | Flow::flowTo(sink) |
+      sink.hasLocationInfo(location.getFile().getAbsolutePath(), location.getStartLine(),
+        location.getStartColumn(), location.getEndLine(), location.getEndColumn()) and
+      element = sink.toString() and
+      value = ""
+    )
+  }
+}
diff --git a/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_IEmbedI1_subtypes_true.expected b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_IEmbedI1_subtypes_true.expected
new file mode 100644
index 00000000000..db33d6d2504
--- /dev/null
+++ b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_IEmbedI1_subtypes_true.expected
@@ -0,0 +1,3 @@
+testFailures
+invalidModelRow
+failures
diff --git a/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_IEmbedI1_subtypes_true.ext.yml b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_IEmbedI1_subtypes_true.ext.yml
new file mode 100644
index 00000000000..faf2e6ba606
--- /dev/null
+++ b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_IEmbedI1_subtypes_true.ext.yml
@@ -0,0 +1,16 @@
+extensions:
+  - addsTo:
+      pack: codeql/go-all
+      extensible: sourceModel
+    data:
+      - ["github.com/nonexistent/test", "IEmbedI1", True, "Source", "", "", "ReturnValue", "qltest", "manual"]
+  - addsTo:
+      pack: codeql/go-all
+      extensible: summaryModel
+    data:
+      - ["github.com/nonexistent/test", "IEmbedI1", True, "Step", "", "", "Argument[0]", "ReturnValue", "value", "manual"]
+  - addsTo:
+      pack: codeql/go-all
+      extensible: sinkModel
+    data:
+      - ["github.com/nonexistent/test", "IEmbedI1", True, "Sink", "", "", "Argument[0]", "qltest", "manual"]
diff --git a/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_IEmbedI1_subtypes_true.ql b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_IEmbedI1_subtypes_true.ql
new file mode 100644
index 00000000000..e4d35a2d183
--- /dev/null
+++ b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_IEmbedI1_subtypes_true.ql
@@ -0,0 +1,26 @@
+import go
+import ModelValidation
+import TestUtilities.InlineExpectationsTest
+import MakeTest<FlowTest>
+
+module Config implements DataFlow::ConfigSig {
+  predicate isSource(DataFlow::Node source) { sourceNode(source, "qltest") }
+
+  predicate isSink(DataFlow::Node sink) { sinkNode(sink, "qltest") }
+}
+
+module Flow = TaintTracking::Global<Config>;
+
+module FlowTest implements TestSig {
+  string getARelevantTag() { result = "IEmbedI1[t]" }
+
+  predicate hasActualResult(Location location, string element, string tag, string value) {
+    tag = "IEmbedI1[t]" and
+    exists(DataFlow::Node sink | Flow::flowTo(sink) |
+      sink.hasLocationInfo(location.getFile().getAbsolutePath(), location.getStartLine(),
+        location.getStartColumn(), location.getEndLine(), location.getEndColumn()) and
+      element = sink.toString() and
+      value = ""
+    )
+  }
+}
diff --git a/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_IEmbedI2_subtypes_true.expected b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_IEmbedI2_subtypes_true.expected
new file mode 100644
index 00000000000..db33d6d2504
--- /dev/null
+++ b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_IEmbedI2_subtypes_true.expected
@@ -0,0 +1,3 @@
+testFailures
+invalidModelRow
+failures
diff --git a/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_IEmbedI2_subtypes_true.ext.yml b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_IEmbedI2_subtypes_true.ext.yml
new file mode 100644
index 00000000000..066e1846fbf
--- /dev/null
+++ b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_IEmbedI2_subtypes_true.ext.yml
@@ -0,0 +1,16 @@
+extensions:
+  - addsTo:
+      pack: codeql/go-all
+      extensible: sourceModel
+    data:
+      - ["github.com/nonexistent/test", "IEmbedI2", True, "Source", "", "", "ReturnValue", "qltest", "manual"]
+  - addsTo:
+      pack: codeql/go-all
+      extensible: summaryModel
+    data:
+      - ["github.com/nonexistent/test", "IEmbedI2", True, "Step", "", "", "Argument[0]", "ReturnValue", "value", "manual"]
+  - addsTo:
+      pack: codeql/go-all
+      extensible: sinkModel
+    data:
+      - ["github.com/nonexistent/test", "IEmbedI2", True, "Sink", "", "", "Argument[0]", "qltest", "manual"]
diff --git a/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_IEmbedI2_subtypes_true.ql b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_IEmbedI2_subtypes_true.ql
new file mode 100644
index 00000000000..18e46135789
--- /dev/null
+++ b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_IEmbedI2_subtypes_true.ql
@@ -0,0 +1,26 @@
+import go
+import ModelValidation
+import TestUtilities.InlineExpectationsTest
+import MakeTest<FlowTest>
+
+module Config implements DataFlow::ConfigSig {
+  predicate isSource(DataFlow::Node source) { sourceNode(source, "qltest") }
+
+  predicate isSink(DataFlow::Node sink) { sinkNode(sink, "qltest") }
+}
+
+module Flow = TaintTracking::Global<Config>;
+
+module FlowTest implements TestSig {
+  string getARelevantTag() { result = "IEmbedI2[t]" }
+
+  predicate hasActualResult(Location location, string element, string tag, string value) {
+    tag = "IEmbedI2[t]" and
+    exists(DataFlow::Node sink | Flow::flowTo(sink) |
+      sink.hasLocationInfo(location.getFile().getAbsolutePath(), location.getStartLine(),
+        location.getStartColumn(), location.getEndLine(), location.getEndColumn()) and
+      element = sink.toString() and
+      value = ""
+    )
+  }
+}
diff --git a/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_PImplEmbedI1_subtypes_true.expected b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_PImplEmbedI1_subtypes_true.expected
new file mode 100644
index 00000000000..db33d6d2504
--- /dev/null
+++ b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_PImplEmbedI1_subtypes_true.expected
@@ -0,0 +1,3 @@
+testFailures
+invalidModelRow
+failures
diff --git a/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_PImplEmbedI1_subtypes_true.ext.yml b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_PImplEmbedI1_subtypes_true.ext.yml
new file mode 100644
index 00000000000..b7a7badf097
--- /dev/null
+++ b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_PImplEmbedI1_subtypes_true.ext.yml
@@ -0,0 +1,18 @@
+extensions:
+  - addsTo:
+      pack: codeql/go-all
+      extensible: sourceModel
+    data:
+      - ["github.com/nonexistent/test", "PImplEmbedI1", True, "Source", "", "", "ReturnValue", "qltest", "manual"]
+      - ["github.com/nonexistent/test", "PImplEmbedI1", True, "SourceField", "", "", "", "qltest", "manual"]
+  - addsTo:
+      pack: codeql/go-all
+      extensible: summaryModel
+    data:
+      - ["github.com/nonexistent/test", "PImplEmbedI1", True, "Step", "", "", "Argument[0]", "ReturnValue", "value", "manual"]
+  - addsTo:
+      pack: codeql/go-all
+      extensible: sinkModel
+    data:
+      - ["github.com/nonexistent/test", "PImplEmbedI1", True, "Sink", "", "", "Argument[0]", "qltest", "manual"]
+      - ["github.com/nonexistent/test", "PImplEmbedI1", True, "SinkField", "", "", "", "qltest", "manual"]
diff --git a/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_PImplEmbedI1_subtypes_true.ql b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_PImplEmbedI1_subtypes_true.ql
new file mode 100644
index 00000000000..6e84bbe2ffb
--- /dev/null
+++ b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_PImplEmbedI1_subtypes_true.ql
@@ -0,0 +1,26 @@
+import go
+import ModelValidation
+import TestUtilities.InlineExpectationsTest
+import MakeTest<FlowTest>
+
+module Config implements DataFlow::ConfigSig {
+  predicate isSource(DataFlow::Node source) { sourceNode(source, "qltest") }
+
+  predicate isSink(DataFlow::Node sink) { sinkNode(sink, "qltest") }
+}
+
+module Flow = TaintTracking::Global<Config>;
+
+module FlowTest implements TestSig {
+  string getARelevantTag() { result = "PImplEmbedI1[t]" }
+
+  predicate hasActualResult(Location location, string element, string tag, string value) {
+    tag = "PImplEmbedI1[t]" and
+    exists(DataFlow::Node sink | Flow::flowTo(sink) |
+      sink.hasLocationInfo(location.getFile().getAbsolutePath(), location.getStartLine(),
+        location.getStartColumn(), location.getEndLine(), location.getEndColumn()) and
+      element = sink.toString() and
+      value = ""
+    )
+  }
+}
diff --git a/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_PImplEmbedI2_subtypes_true.expected b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_PImplEmbedI2_subtypes_true.expected
new file mode 100644
index 00000000000..db33d6d2504
--- /dev/null
+++ b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_PImplEmbedI2_subtypes_true.expected
@@ -0,0 +1,3 @@
+testFailures
+invalidModelRow
+failures
diff --git a/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_PImplEmbedI2_subtypes_true.ext.yml b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_PImplEmbedI2_subtypes_true.ext.yml
new file mode 100644
index 00000000000..2a10c84a20f
--- /dev/null
+++ b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_PImplEmbedI2_subtypes_true.ext.yml
@@ -0,0 +1,16 @@
+extensions:
+  - addsTo:
+      pack: codeql/go-all
+      extensible: sourceModel
+    data:
+      - ["github.com/nonexistent/test", "PImplEmbedI2", True, "Source", "", "", "ReturnValue", "qltest", "manual"]
+  - addsTo:
+      pack: codeql/go-all
+      extensible: summaryModel
+    data:
+      - ["github.com/nonexistent/test", "PImplEmbedI2", True, "Step", "", "", "Argument[0]", "ReturnValue", "value", "manual"]
+  - addsTo:
+      pack: codeql/go-all
+      extensible: sinkModel
+    data:
+      - ["github.com/nonexistent/test", "PImplEmbedI2", True, "Sink", "", "", "Argument[0]", "qltest", "manual"]
diff --git a/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_PImplEmbedI2_subtypes_true.ql b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_PImplEmbedI2_subtypes_true.ql
new file mode 100644
index 00000000000..63a829d1ac4
--- /dev/null
+++ b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_PImplEmbedI2_subtypes_true.ql
@@ -0,0 +1,26 @@
+import go
+import ModelValidation
+import TestUtilities.InlineExpectationsTest
+import MakeTest<FlowTest>
+
+module Config implements DataFlow::ConfigSig {
+  predicate isSource(DataFlow::Node source) { sourceNode(source, "qltest") }
+
+  predicate isSink(DataFlow::Node sink) { sinkNode(sink, "qltest") }
+}
+
+module Flow = TaintTracking::Global<Config>;
+
+module FlowTest implements TestSig {
+  string getARelevantTag() { result = "PImplEmbedI2[t]" }
+
+  predicate hasActualResult(Location location, string element, string tag, string value) {
+    tag = "PImplEmbedI2[t]" and
+    exists(DataFlow::Node sink | Flow::flowTo(sink) |
+      sink.hasLocationInfo(location.getFile().getAbsolutePath(), location.getStartLine(),
+        location.getStartColumn(), location.getEndLine(), location.getEndColumn()) and
+      element = sink.toString() and
+      value = ""
+    )
+  }
+}
diff --git a/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_S1_subtypes_false.expected b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_S1_subtypes_false.expected
new file mode 100644
index 00000000000..db33d6d2504
--- /dev/null
+++ b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_S1_subtypes_false.expected
@@ -0,0 +1,3 @@
+testFailures
+invalidModelRow
+failures
diff --git a/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_S1_subtypes_false.ext.yml b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_S1_subtypes_false.ext.yml
new file mode 100644
index 00000000000..804a920b324
--- /dev/null
+++ b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_S1_subtypes_false.ext.yml
@@ -0,0 +1,18 @@
+extensions:
+  - addsTo:
+      pack: codeql/go-all
+      extensible: sourceModel
+    data:
+      - ["github.com/nonexistent/test", "S1", False, "Source", "", "", "ReturnValue", "qltest", "manual"]
+      - ["github.com/nonexistent/test", "S1", False, "SourceField", "", "", "", "qltest", "manual"]
+  - addsTo:
+      pack: codeql/go-all
+      extensible: summaryModel
+    data:
+      - ["github.com/nonexistent/test", "S1", False, "Step", "", "", "Argument[0]", "ReturnValue", "value", "manual"]
+  - addsTo:
+      pack: codeql/go-all
+      extensible: sinkModel
+    data:
+      - ["github.com/nonexistent/test", "S1", False, "Sink", "", "", "Argument[0]", "qltest", "manual"]
+      - ["github.com/nonexistent/test", "S1", False, "SinkField", "", "", "", "qltest", "manual"]
diff --git a/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_S1_subtypes_false.ql b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_S1_subtypes_false.ql
new file mode 100644
index 00000000000..c5754d1ded7
--- /dev/null
+++ b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_S1_subtypes_false.ql
@@ -0,0 +1,26 @@
+import go
+import ModelValidation
+import TestUtilities.InlineExpectationsTest
+import MakeTest<FlowTest>
+
+module Config implements DataFlow::ConfigSig {
+  predicate isSource(DataFlow::Node source) { sourceNode(source, "qltest") }
+
+  predicate isSink(DataFlow::Node sink) { sinkNode(sink, "qltest") }
+}
+
+module Flow = TaintTracking::Global<Config>;
+
+module FlowTest implements TestSig {
+  string getARelevantTag() { result = "S1[f]" }
+
+  predicate hasActualResult(Location location, string element, string tag, string value) {
+    tag = "S1[f]" and
+    exists(DataFlow::Node sink | Flow::flowTo(sink) |
+      sink.hasLocationInfo(location.getFile().getAbsolutePath(), location.getStartLine(),
+        location.getStartColumn(), location.getEndLine(), location.getEndColumn()) and
+      element = sink.toString() and
+      value = ""
+    )
+  }
+}
diff --git a/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_S1_subtypes_true.expected b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_S1_subtypes_true.expected
new file mode 100644
index 00000000000..db33d6d2504
--- /dev/null
+++ b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_S1_subtypes_true.expected
@@ -0,0 +1,3 @@
+testFailures
+invalidModelRow
+failures
diff --git a/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_S1_subtypes_true.ext.yml b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_S1_subtypes_true.ext.yml
new file mode 100644
index 00000000000..14f2914b942
--- /dev/null
+++ b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_S1_subtypes_true.ext.yml
@@ -0,0 +1,18 @@
+extensions:
+  - addsTo:
+      pack: codeql/go-all
+      extensible: sourceModel
+    data:
+      - ["github.com/nonexistent/test", "S1", True, "Source", "", "", "ReturnValue", "qltest", "manual"]
+      - ["github.com/nonexistent/test", "S1", True, "SourceField", "", "", "", "qltest", "manual"]
+  - addsTo:
+      pack: codeql/go-all
+      extensible: summaryModel
+    data:
+      - ["github.com/nonexistent/test", "S1", True, "Step", "", "", "Argument[0]", "ReturnValue", "value", "manual"]
+  - addsTo:
+      pack: codeql/go-all
+      extensible: sinkModel
+    data:
+      - ["github.com/nonexistent/test", "S1", True, "Sink", "", "", "Argument[0]", "qltest", "manual"]
+      - ["github.com/nonexistent/test", "S1", True, "SinkField", "", "", "", "qltest", "manual"]
diff --git a/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_S1_subtypes_true.ql b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_S1_subtypes_true.ql
new file mode 100644
index 00000000000..92c895b61a3
--- /dev/null
+++ b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_S1_subtypes_true.ql
@@ -0,0 +1,26 @@
+import go
+import ModelValidation
+import TestUtilities.InlineExpectationsTest
+import MakeTest<FlowTest>
+
+module Config implements DataFlow::ConfigSig {
+  predicate isSource(DataFlow::Node source) { sourceNode(source, "qltest") }
+
+  predicate isSink(DataFlow::Node sink) { sinkNode(sink, "qltest") }
+}
+
+module Flow = TaintTracking::Global<Config>;
+
+module FlowTest implements TestSig {
+  string getARelevantTag() { result = "S1[t]" }
+
+  predicate hasActualResult(Location location, string element, string tag, string value) {
+    tag = "S1[t]" and
+    exists(DataFlow::Node sink | Flow::flowTo(sink) |
+      sink.hasLocationInfo(location.getFile().getAbsolutePath(), location.getStartLine(),
+        location.getStartColumn(), location.getEndLine(), location.getEndColumn()) and
+      element = sink.toString() and
+      value = ""
+    )
+  }
+}
diff --git a/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_SEmbedI1_subtypes_true.expected b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_SEmbedI1_subtypes_true.expected
new file mode 100644
index 00000000000..db33d6d2504
--- /dev/null
+++ b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_SEmbedI1_subtypes_true.expected
@@ -0,0 +1,3 @@
+testFailures
+invalidModelRow
+failures
diff --git a/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_SEmbedI1_subtypes_true.ext.yml b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_SEmbedI1_subtypes_true.ext.yml
new file mode 100644
index 00000000000..a210d421326
--- /dev/null
+++ b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_SEmbedI1_subtypes_true.ext.yml
@@ -0,0 +1,18 @@
+extensions:
+  - addsTo:
+      pack: codeql/go-all
+      extensible: sourceModel
+    data:
+      - ["github.com/nonexistent/test", "SEmbedI1", True, "Source", "", "", "ReturnValue", "qltest", "manual"]
+      - ["github.com/nonexistent/test", "SEmbedI1", True, "SourceField", "", "", "", "qltest", "manual"]
+  - addsTo:
+      pack: codeql/go-all
+      extensible: summaryModel
+    data:
+      - ["github.com/nonexistent/test", "SEmbedI1", True, "Step", "", "", "Argument[0]", "ReturnValue", "value", "manual"]
+  - addsTo:
+      pack: codeql/go-all
+      extensible: sinkModel
+    data:
+      - ["github.com/nonexistent/test", "SEmbedI1", True, "Sink", "", "", "Argument[0]", "qltest", "manual"]
+      - ["github.com/nonexistent/test", "SEmbedI1", True, "SinkField", "", "", "", "qltest", "manual"]
diff --git a/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_SEmbedI1_subtypes_true.ql b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_SEmbedI1_subtypes_true.ql
new file mode 100644
index 00000000000..f401e958315
--- /dev/null
+++ b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_SEmbedI1_subtypes_true.ql
@@ -0,0 +1,26 @@
+import go
+import ModelValidation
+import TestUtilities.InlineExpectationsTest
+import MakeTest<FlowTest>
+
+module Config implements DataFlow::ConfigSig {
+  predicate isSource(DataFlow::Node source) { sourceNode(source, "qltest") }
+
+  predicate isSink(DataFlow::Node sink) { sinkNode(sink, "qltest") }
+}
+
+module Flow = TaintTracking::Global<Config>;
+
+module FlowTest implements TestSig {
+  string getARelevantTag() { result = "SEmbedI1[t]" }
+
+  predicate hasActualResult(Location location, string element, string tag, string value) {
+    tag = "SEmbedI1[t]" and
+    exists(DataFlow::Node sink | Flow::flowTo(sink) |
+      sink.hasLocationInfo(location.getFile().getAbsolutePath(), location.getStartLine(),
+        location.getStartColumn(), location.getEndLine(), location.getEndColumn()) and
+      element = sink.toString() and
+      value = ""
+    )
+  }
+}
diff --git a/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_SEmbedI2_subtypes_true.expected b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_SEmbedI2_subtypes_true.expected
new file mode 100644
index 00000000000..db33d6d2504
--- /dev/null
+++ b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_SEmbedI2_subtypes_true.expected
@@ -0,0 +1,3 @@
+testFailures
+invalidModelRow
+failures
diff --git a/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_SEmbedI2_subtypes_true.ext.yml b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_SEmbedI2_subtypes_true.ext.yml
new file mode 100644
index 00000000000..f1378ba6fa2
--- /dev/null
+++ b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_SEmbedI2_subtypes_true.ext.yml
@@ -0,0 +1,16 @@
+extensions:
+  - addsTo:
+      pack: codeql/go-all
+      extensible: sourceModel
+    data:
+      - ["github.com/nonexistent/test", "SEmbedI2", True, "Source", "", "", "ReturnValue", "qltest", "manual"]
+  - addsTo:
+      pack: codeql/go-all
+      extensible: summaryModel
+    data:
+      - ["github.com/nonexistent/test", "SEmbedI2", True, "Step", "", "", "Argument[0]", "ReturnValue", "value", "manual"]
+  - addsTo:
+      pack: codeql/go-all
+      extensible: sinkModel
+    data:
+      - ["github.com/nonexistent/test", "SEmbedI2", True, "Sink", "", "", "Argument[0]", "qltest", "manual"]
diff --git a/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_SEmbedI2_subtypes_true.ql b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_SEmbedI2_subtypes_true.ql
new file mode 100644
index 00000000000..0d7169c93cf
--- /dev/null
+++ b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_SEmbedI2_subtypes_true.ql
@@ -0,0 +1,26 @@
+import go
+import ModelValidation
+import TestUtilities.InlineExpectationsTest
+import MakeTest<FlowTest>
+
+module Config implements DataFlow::ConfigSig {
+  predicate isSource(DataFlow::Node source) { sourceNode(source, "qltest") }
+
+  predicate isSink(DataFlow::Node sink) { sinkNode(sink, "qltest") }
+}
+
+module Flow = TaintTracking::Global<Config>;
+
+module FlowTest implements TestSig {
+  string getARelevantTag() { result = "SEmbedI2[t]" }
+
+  predicate hasActualResult(Location location, string element, string tag, string value) {
+    tag = "SEmbedI2[t]" and
+    exists(DataFlow::Node sink | Flow::flowTo(sink) |
+      sink.hasLocationInfo(location.getFile().getAbsolutePath(), location.getStartLine(),
+        location.getStartColumn(), location.getEndLine(), location.getEndColumn()) and
+      element = sink.toString() and
+      value = ""
+    )
+  }
+}
diff --git a/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_SEmbedP1_subtypes_true.expected b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_SEmbedP1_subtypes_true.expected
new file mode 100644
index 00000000000..db33d6d2504
--- /dev/null
+++ b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_SEmbedP1_subtypes_true.expected
@@ -0,0 +1,3 @@
+testFailures
+invalidModelRow
+failures
diff --git a/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_SEmbedP1_subtypes_true.ext.yml b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_SEmbedP1_subtypes_true.ext.yml
new file mode 100644
index 00000000000..8a927bde1ad
--- /dev/null
+++ b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_SEmbedP1_subtypes_true.ext.yml
@@ -0,0 +1,18 @@
+extensions:
+  - addsTo:
+      pack: codeql/go-all
+      extensible: sourceModel
+    data:
+      - ["github.com/nonexistent/test", "SEmbedP1", True, "Source", "", "", "ReturnValue", "qltest", "manual"]
+      - ["github.com/nonexistent/test", "SEmbedP1", True, "SourceField", "", "", "", "qltest", "manual"]
+  - addsTo:
+      pack: codeql/go-all
+      extensible: summaryModel
+    data:
+      - ["github.com/nonexistent/test", "SEmbedP1", True, "Step", "", "", "Argument[0]", "ReturnValue", "value", "manual"]
+  - addsTo:
+      pack: codeql/go-all
+      extensible: sinkModel
+    data:
+      - ["github.com/nonexistent/test", "SEmbedP1", True, "Sink", "", "", "Argument[0]", "qltest", "manual"]
+      - ["github.com/nonexistent/test", "SEmbedP1", True, "SinkField", "", "", "", "qltest", "manual"]
diff --git a/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_SEmbedP1_subtypes_true.ql b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_SEmbedP1_subtypes_true.ql
new file mode 100644
index 00000000000..35c780f603d
--- /dev/null
+++ b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_SEmbedP1_subtypes_true.ql
@@ -0,0 +1,26 @@
+import go
+import ModelValidation
+import TestUtilities.InlineExpectationsTest
+import MakeTest<FlowTest>
+
+module Config implements DataFlow::ConfigSig {
+  predicate isSource(DataFlow::Node source) { sourceNode(source, "qltest") }
+
+  predicate isSink(DataFlow::Node sink) { sinkNode(sink, "qltest") }
+}
+
+module Flow = TaintTracking::Global<Config>;
+
+module FlowTest implements TestSig {
+  string getARelevantTag() { result = "SEmbedP1[t]" }
+
+  predicate hasActualResult(Location location, string element, string tag, string value) {
+    tag = "SEmbedP1[t]" and
+    exists(DataFlow::Node sink | Flow::flowTo(sink) |
+      sink.hasLocationInfo(location.getFile().getAbsolutePath(), location.getStartLine(),
+        location.getStartColumn(), location.getEndLine(), location.getEndColumn()) and
+      element = sink.toString() and
+      value = ""
+    )
+  }
+}
diff --git a/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_SEmbedP2_subtypes_true.expected b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_SEmbedP2_subtypes_true.expected
new file mode 100644
index 00000000000..db33d6d2504
--- /dev/null
+++ b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_SEmbedP2_subtypes_true.expected
@@ -0,0 +1,3 @@
+testFailures
+invalidModelRow
+failures
diff --git a/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_SEmbedP2_subtypes_true.ext.yml b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_SEmbedP2_subtypes_true.ext.yml
new file mode 100644
index 00000000000..6357f141b11
--- /dev/null
+++ b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_SEmbedP2_subtypes_true.ext.yml
@@ -0,0 +1,16 @@
+extensions:
+  - addsTo:
+      pack: codeql/go-all
+      extensible: sourceModel
+    data:
+      - ["github.com/nonexistent/test", "SEmbedP2", True, "Source", "", "", "ReturnValue", "qltest", "manual"]
+  - addsTo:
+      pack: codeql/go-all
+      extensible: summaryModel
+    data:
+      - ["github.com/nonexistent/test", "SEmbedP2", True, "Step", "", "", "Argument[0]", "ReturnValue", "value", "manual"]
+  - addsTo:
+      pack: codeql/go-all
+      extensible: sinkModel
+    data:
+      - ["github.com/nonexistent/test", "SEmbedP2", True, "Sink", "", "", "Argument[0]", "qltest", "manual"]
diff --git a/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_SEmbedP2_subtypes_true.ql b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_SEmbedP2_subtypes_true.ql
new file mode 100644
index 00000000000..6b5cad78d8b
--- /dev/null
+++ b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_SEmbedP2_subtypes_true.ql
@@ -0,0 +1,26 @@
+import go
+import ModelValidation
+import TestUtilities.InlineExpectationsTest
+import MakeTest<FlowTest>
+
+module Config implements DataFlow::ConfigSig {
+  predicate isSource(DataFlow::Node source) { sourceNode(source, "qltest") }
+
+  predicate isSink(DataFlow::Node sink) { sinkNode(sink, "qltest") }
+}
+
+module Flow = TaintTracking::Global<Config>;
+
+module FlowTest implements TestSig {
+  string getARelevantTag() { result = "SEmbedP2[t]" }
+
+  predicate hasActualResult(Location location, string element, string tag, string value) {
+    tag = "SEmbedP2[t]" and
+    exists(DataFlow::Node sink | Flow::flowTo(sink) |
+      sink.hasLocationInfo(location.getFile().getAbsolutePath(), location.getStartLine(),
+        location.getStartColumn(), location.getEndLine(), location.getEndColumn()) and
+      element = sink.toString() and
+      value = ""
+    )
+  }
+}
diff --git a/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_SEmbedPtrP1_subtypes_true.expected b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_SEmbedPtrP1_subtypes_true.expected
new file mode 100644
index 00000000000..db33d6d2504
--- /dev/null
+++ b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_SEmbedPtrP1_subtypes_true.expected
@@ -0,0 +1,3 @@
+testFailures
+invalidModelRow
+failures
diff --git a/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_SEmbedPtrP1_subtypes_true.ext.yml b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_SEmbedPtrP1_subtypes_true.ext.yml
new file mode 100644
index 00000000000..e34aa2af535
--- /dev/null
+++ b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_SEmbedPtrP1_subtypes_true.ext.yml
@@ -0,0 +1,18 @@
+extensions:
+  - addsTo:
+      pack: codeql/go-all
+      extensible: sourceModel
+    data:
+      - ["github.com/nonexistent/test", "SEmbedPtrP1", True, "Source", "", "", "ReturnValue", "qltest", "manual"]
+      - ["github.com/nonexistent/test", "SEmbedPtrP1", True, "SourceField", "", "", "", "qltest", "manual"]
+  - addsTo:
+      pack: codeql/go-all
+      extensible: summaryModel
+    data:
+      - ["github.com/nonexistent/test", "SEmbedPtrP1", True, "Step", "", "", "Argument[0]", "ReturnValue", "value", "manual"]
+  - addsTo:
+      pack: codeql/go-all
+      extensible: sinkModel
+    data:
+      - ["github.com/nonexistent/test", "SEmbedPtrP1", True, "Sink", "", "", "Argument[0]", "qltest", "manual"]
+      - ["github.com/nonexistent/test", "SEmbedPtrP1", True, "SinkField", "", "", "", "qltest", "manual"]
diff --git a/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_SEmbedPtrP1_subtypes_true.ql b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_SEmbedPtrP1_subtypes_true.ql
new file mode 100644
index 00000000000..344dc37e41a
--- /dev/null
+++ b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_SEmbedPtrP1_subtypes_true.ql
@@ -0,0 +1,26 @@
+import go
+import ModelValidation
+import TestUtilities.InlineExpectationsTest
+import MakeTest<FlowTest>
+
+module Config implements DataFlow::ConfigSig {
+  predicate isSource(DataFlow::Node source) { sourceNode(source, "qltest") }
+
+  predicate isSink(DataFlow::Node sink) { sinkNode(sink, "qltest") }
+}
+
+module Flow = TaintTracking::Global<Config>;
+
+module FlowTest implements TestSig {
+  string getARelevantTag() { result = "SEmbedPtrP1[t]" }
+
+  predicate hasActualResult(Location location, string element, string tag, string value) {
+    tag = "SEmbedPtrP1[t]" and
+    exists(DataFlow::Node sink | Flow::flowTo(sink) |
+      sink.hasLocationInfo(location.getFile().getAbsolutePath(), location.getStartLine(),
+        location.getStartColumn(), location.getEndLine(), location.getEndColumn()) and
+      element = sink.toString() and
+      value = ""
+    )
+  }
+}
diff --git a/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_SEmbedPtrP2_subtypes_true.expected b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_SEmbedPtrP2_subtypes_true.expected
new file mode 100644
index 00000000000..db33d6d2504
--- /dev/null
+++ b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_SEmbedPtrP2_subtypes_true.expected
@@ -0,0 +1,3 @@
+testFailures
+invalidModelRow
+failures
diff --git a/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_SEmbedPtrP2_subtypes_true.ext.yml b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_SEmbedPtrP2_subtypes_true.ext.yml
new file mode 100644
index 00000000000..7c03fc22bcb
--- /dev/null
+++ b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_SEmbedPtrP2_subtypes_true.ext.yml
@@ -0,0 +1,16 @@
+extensions:
+  - addsTo:
+      pack: codeql/go-all
+      extensible: sourceModel
+    data:
+      - ["github.com/nonexistent/test", "SEmbedPtrP2", True, "Source", "", "", "ReturnValue", "qltest", "manual"]
+  - addsTo:
+      pack: codeql/go-all
+      extensible: summaryModel
+    data:
+      - ["github.com/nonexistent/test", "SEmbedPtrP2", True, "Step", "", "", "Argument[0]", "ReturnValue", "value", "manual"]
+  - addsTo:
+      pack: codeql/go-all
+      extensible: sinkModel
+    data:
+      - ["github.com/nonexistent/test", "SEmbedPtrP2", True, "Sink", "", "", "Argument[0]", "qltest", "manual"]
diff --git a/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_SEmbedPtrP2_subtypes_true.ql b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_SEmbedPtrP2_subtypes_true.ql
new file mode 100644
index 00000000000..a7c2e497f55
--- /dev/null
+++ b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_SEmbedPtrP2_subtypes_true.ql
@@ -0,0 +1,26 @@
+import go
+import ModelValidation
+import TestUtilities.InlineExpectationsTest
+import MakeTest<FlowTest>
+
+module Config implements DataFlow::ConfigSig {
+  predicate isSource(DataFlow::Node source) { sourceNode(source, "qltest") }
+
+  predicate isSink(DataFlow::Node sink) { sinkNode(sink, "qltest") }
+}
+
+module Flow = TaintTracking::Global<Config>;
+
+module FlowTest implements TestSig {
+  string getARelevantTag() { result = "SEmbedPtrP2[t]" }
+
+  predicate hasActualResult(Location location, string element, string tag, string value) {
+    tag = "SEmbedPtrP2[t]" and
+    exists(DataFlow::Node sink | Flow::flowTo(sink) |
+      sink.hasLocationInfo(location.getFile().getAbsolutePath(), location.getStartLine(),
+        location.getStartColumn(), location.getEndLine(), location.getEndColumn()) and
+      element = sink.toString() and
+      value = ""
+    )
+  }
+}
diff --git a/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_SEmbedPtrS1_subtypes_true.expected b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_SEmbedPtrS1_subtypes_true.expected
new file mode 100644
index 00000000000..db33d6d2504
--- /dev/null
+++ b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_SEmbedPtrS1_subtypes_true.expected
@@ -0,0 +1,3 @@
+testFailures
+invalidModelRow
+failures
diff --git a/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_SEmbedPtrS1_subtypes_true.ext.yml b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_SEmbedPtrS1_subtypes_true.ext.yml
new file mode 100644
index 00000000000..81a3500562d
--- /dev/null
+++ b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_SEmbedPtrS1_subtypes_true.ext.yml
@@ -0,0 +1,18 @@
+extensions:
+  - addsTo:
+      pack: codeql/go-all
+      extensible: sourceModel
+    data:
+      - ["github.com/nonexistent/test", "SEmbedPtrS1", True, "Source", "", "", "ReturnValue", "qltest", "manual"]
+      - ["github.com/nonexistent/test", "SEmbedPtrS1", True, "SourceField", "", "", "", "qltest", "manual"]
+  - addsTo:
+      pack: codeql/go-all
+      extensible: summaryModel
+    data:
+      - ["github.com/nonexistent/test", "SEmbedPtrS1", True, "Step", "", "", "Argument[0]", "ReturnValue", "value", "manual"]
+  - addsTo:
+      pack: codeql/go-all
+      extensible: sinkModel
+    data:
+      - ["github.com/nonexistent/test", "SEmbedPtrS1", True, "Sink", "", "", "Argument[0]", "qltest", "manual"]
+      - ["github.com/nonexistent/test", "SEmbedPtrS1", True, "SinkField", "", "", "", "qltest", "manual"]
diff --git a/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_SEmbedPtrS1_subtypes_true.ql b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_SEmbedPtrS1_subtypes_true.ql
new file mode 100644
index 00000000000..cf847c781bc
--- /dev/null
+++ b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_SEmbedPtrS1_subtypes_true.ql
@@ -0,0 +1,26 @@
+import go
+import ModelValidation
+import TestUtilities.InlineExpectationsTest
+import MakeTest<FlowTest>
+
+module Config implements DataFlow::ConfigSig {
+  predicate isSource(DataFlow::Node source) { sourceNode(source, "qltest") }
+
+  predicate isSink(DataFlow::Node sink) { sinkNode(sink, "qltest") }
+}
+
+module Flow = TaintTracking::Global<Config>;
+
+module FlowTest implements TestSig {
+  string getARelevantTag() { result = "SEmbedPtrS1[t]" }
+
+  predicate hasActualResult(Location location, string element, string tag, string value) {
+    tag = "SEmbedPtrS1[t]" and
+    exists(DataFlow::Node sink | Flow::flowTo(sink) |
+      sink.hasLocationInfo(location.getFile().getAbsolutePath(), location.getStartLine(),
+        location.getStartColumn(), location.getEndLine(), location.getEndColumn()) and
+      element = sink.toString() and
+      value = ""
+    )
+  }
+}
diff --git a/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_SEmbedPtrS2_subtypes_true.expected b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_SEmbedPtrS2_subtypes_true.expected
new file mode 100644
index 00000000000..db33d6d2504
--- /dev/null
+++ b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_SEmbedPtrS2_subtypes_true.expected
@@ -0,0 +1,3 @@
+testFailures
+invalidModelRow
+failures
diff --git a/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_SEmbedPtrS2_subtypes_true.ext.yml b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_SEmbedPtrS2_subtypes_true.ext.yml
new file mode 100644
index 00000000000..50c72d96ce1
--- /dev/null
+++ b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_SEmbedPtrS2_subtypes_true.ext.yml
@@ -0,0 +1,16 @@
+extensions:
+  - addsTo:
+      pack: codeql/go-all
+      extensible: sourceModel
+    data:
+      - ["github.com/nonexistent/test", "SEmbedPtrS2", True, "Source", "", "", "ReturnValue", "qltest", "manual"]
+  - addsTo:
+      pack: codeql/go-all
+      extensible: summaryModel
+    data:
+      - ["github.com/nonexistent/test", "SEmbedPtrS2", True, "Step", "", "", "Argument[0]", "ReturnValue", "value", "manual"]
+  - addsTo:
+      pack: codeql/go-all
+      extensible: sinkModel
+    data:
+      - ["github.com/nonexistent/test", "SEmbedPtrS2", True, "Sink", "", "", "Argument[0]", "qltest", "manual"]
diff --git a/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_SEmbedPtrS2_subtypes_true.ql b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_SEmbedPtrS2_subtypes_true.ql
new file mode 100644
index 00000000000..0c7b05dd3ff
--- /dev/null
+++ b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_SEmbedPtrS2_subtypes_true.ql
@@ -0,0 +1,26 @@
+import go
+import ModelValidation
+import TestUtilities.InlineExpectationsTest
+import MakeTest<FlowTest>
+
+module Config implements DataFlow::ConfigSig {
+  predicate isSource(DataFlow::Node source) { sourceNode(source, "qltest") }
+
+  predicate isSink(DataFlow::Node sink) { sinkNode(sink, "qltest") }
+}
+
+module Flow = TaintTracking::Global<Config>;
+
+module FlowTest implements TestSig {
+  string getARelevantTag() { result = "SEmbedPtrS2[t]" }
+
+  predicate hasActualResult(Location location, string element, string tag, string value) {
+    tag = "SEmbedPtrS2[t]" and
+    exists(DataFlow::Node sink | Flow::flowTo(sink) |
+      sink.hasLocationInfo(location.getFile().getAbsolutePath(), location.getStartLine(),
+        location.getStartColumn(), location.getEndLine(), location.getEndColumn()) and
+      element = sink.toString() and
+      value = ""
+    )
+  }
+}
diff --git a/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_SEmbedS1_subtypes_true.expected b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_SEmbedS1_subtypes_true.expected
new file mode 100644
index 00000000000..db33d6d2504
--- /dev/null
+++ b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_SEmbedS1_subtypes_true.expected
@@ -0,0 +1,3 @@
+testFailures
+invalidModelRow
+failures
diff --git a/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_SEmbedS1_subtypes_true.ext.yml b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_SEmbedS1_subtypes_true.ext.yml
new file mode 100644
index 00000000000..35baccbe09f
--- /dev/null
+++ b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_SEmbedS1_subtypes_true.ext.yml
@@ -0,0 +1,18 @@
+extensions:
+  - addsTo:
+      pack: codeql/go-all
+      extensible: sourceModel
+    data:
+      - ["github.com/nonexistent/test", "SEmbedS1", True, "Source", "", "", "ReturnValue", "qltest", "manual"]
+      - ["github.com/nonexistent/test", "SEmbedS1", True, "SourceField", "", "", "", "qltest", "manual"]
+  - addsTo:
+      pack: codeql/go-all
+      extensible: summaryModel
+    data:
+      - ["github.com/nonexistent/test", "SEmbedS1", True, "Step", "", "", "Argument[0]", "ReturnValue", "value", "manual"]
+  - addsTo:
+      pack: codeql/go-all
+      extensible: sinkModel
+    data:
+      - ["github.com/nonexistent/test", "SEmbedS1", True, "Sink", "", "", "Argument[0]", "qltest", "manual"]
+      - ["github.com/nonexistent/test", "SEmbedS1", True, "SinkField", "", "", "", "qltest", "manual"]
diff --git a/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_SEmbedS1_subtypes_true.ql b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_SEmbedS1_subtypes_true.ql
new file mode 100644
index 00000000000..f58fd32770a
--- /dev/null
+++ b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_SEmbedS1_subtypes_true.ql
@@ -0,0 +1,26 @@
+import go
+import ModelValidation
+import TestUtilities.InlineExpectationsTest
+import MakeTest<FlowTest>
+
+module Config implements DataFlow::ConfigSig {
+  predicate isSource(DataFlow::Node source) { sourceNode(source, "qltest") }
+
+  predicate isSink(DataFlow::Node sink) { sinkNode(sink, "qltest") }
+}
+
+module Flow = TaintTracking::Global<Config>;
+
+module FlowTest implements TestSig {
+  string getARelevantTag() { result = "SEmbedS1[t]" }
+
+  predicate hasActualResult(Location location, string element, string tag, string value) {
+    tag = "SEmbedS1[t]" and
+    exists(DataFlow::Node sink | Flow::flowTo(sink) |
+      sink.hasLocationInfo(location.getFile().getAbsolutePath(), location.getStartLine(),
+        location.getStartColumn(), location.getEndLine(), location.getEndColumn()) and
+      element = sink.toString() and
+      value = ""
+    )
+  }
+}
diff --git a/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_SEmbedS2_subtypes_true.expected b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_SEmbedS2_subtypes_true.expected
new file mode 100644
index 00000000000..db33d6d2504
--- /dev/null
+++ b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_SEmbedS2_subtypes_true.expected
@@ -0,0 +1,3 @@
+testFailures
+invalidModelRow
+failures
diff --git a/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_SEmbedS2_subtypes_true.ext.yml b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_SEmbedS2_subtypes_true.ext.yml
new file mode 100644
index 00000000000..4772c9de698
--- /dev/null
+++ b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_SEmbedS2_subtypes_true.ext.yml
@@ -0,0 +1,16 @@
+extensions:
+  - addsTo:
+      pack: codeql/go-all
+      extensible: sourceModel
+    data:
+      - ["github.com/nonexistent/test", "SEmbedS2", True, "Source", "", "", "ReturnValue", "qltest", "manual"]
+  - addsTo:
+      pack: codeql/go-all
+      extensible: summaryModel
+    data:
+      - ["github.com/nonexistent/test", "SEmbedS2", True, "Step", "", "", "Argument[0]", "ReturnValue", "value", "manual"]
+  - addsTo:
+      pack: codeql/go-all
+      extensible: sinkModel
+    data:
+      - ["github.com/nonexistent/test", "SEmbedS2", True, "Sink", "", "", "Argument[0]", "qltest", "manual"]
diff --git a/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_SEmbedS2_subtypes_true.ql b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_SEmbedS2_subtypes_true.ql
new file mode 100644
index 00000000000..db9d98e06d2
--- /dev/null
+++ b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_SEmbedS2_subtypes_true.ql
@@ -0,0 +1,26 @@
+import go
+import ModelValidation
+import TestUtilities.InlineExpectationsTest
+import MakeTest<FlowTest>
+
+module Config implements DataFlow::ConfigSig {
+  predicate isSource(DataFlow::Node source) { sourceNode(source, "qltest") }
+
+  predicate isSink(DataFlow::Node sink) { sinkNode(sink, "qltest") }
+}
+
+module Flow = TaintTracking::Global<Config>;
+
+module FlowTest implements TestSig {
+  string getARelevantTag() { result = "SEmbedS2[t]" }
+
+  predicate hasActualResult(Location location, string element, string tag, string value) {
+    tag = "SEmbedS2[t]" and
+    exists(DataFlow::Node sink | Flow::flowTo(sink) |
+      sink.hasLocationInfo(location.getFile().getAbsolutePath(), location.getStartLine(),
+        location.getStartColumn(), location.getEndLine(), location.getEndColumn()) and
+      element = sink.toString() and
+      value = ""
+    )
+  }
+}
diff --git a/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_SImplEmbedI1_subtypes_true.expected b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_SImplEmbedI1_subtypes_true.expected
new file mode 100644
index 00000000000..db33d6d2504
--- /dev/null
+++ b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_SImplEmbedI1_subtypes_true.expected
@@ -0,0 +1,3 @@
+testFailures
+invalidModelRow
+failures
diff --git a/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_SImplEmbedI1_subtypes_true.ext.yml b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_SImplEmbedI1_subtypes_true.ext.yml
new file mode 100644
index 00000000000..f75fc2f7652
--- /dev/null
+++ b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_SImplEmbedI1_subtypes_true.ext.yml
@@ -0,0 +1,18 @@
+extensions:
+  - addsTo:
+      pack: codeql/go-all
+      extensible: sourceModel
+    data:
+      - ["github.com/nonexistent/test", "SImplEmbedI1", True, "Source", "", "", "ReturnValue", "qltest", "manual"]
+      - ["github.com/nonexistent/test", "SImplEmbedI1", True, "SourceField", "", "", "", "qltest", "manual"]
+  - addsTo:
+      pack: codeql/go-all
+      extensible: summaryModel
+    data:
+      - ["github.com/nonexistent/test", "SImplEmbedI1", True, "Step", "", "", "Argument[0]", "ReturnValue", "value", "manual"]
+  - addsTo:
+      pack: codeql/go-all
+      extensible: sinkModel
+    data:
+      - ["github.com/nonexistent/test", "SImplEmbedI1", True, "Sink", "", "", "Argument[0]", "qltest", "manual"]
+      - ["github.com/nonexistent/test", "SImplEmbedI1", True, "SinkField", "", "", "", "qltest", "manual"]
diff --git a/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_SImplEmbedI1_subtypes_true.ql b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_SImplEmbedI1_subtypes_true.ql
new file mode 100644
index 00000000000..c4e8afd1fbf
--- /dev/null
+++ b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_SImplEmbedI1_subtypes_true.ql
@@ -0,0 +1,26 @@
+import go
+import ModelValidation
+import TestUtilities.InlineExpectationsTest
+import MakeTest<FlowTest>
+
+module Config implements DataFlow::ConfigSig {
+  predicate isSource(DataFlow::Node source) { sourceNode(source, "qltest") }
+
+  predicate isSink(DataFlow::Node sink) { sinkNode(sink, "qltest") }
+}
+
+module Flow = TaintTracking::Global<Config>;
+
+module FlowTest implements TestSig {
+  string getARelevantTag() { result = "SImplEmbedI1[t]" }
+
+  predicate hasActualResult(Location location, string element, string tag, string value) {
+    tag = "SImplEmbedI1[t]" and
+    exists(DataFlow::Node sink | Flow::flowTo(sink) |
+      sink.hasLocationInfo(location.getFile().getAbsolutePath(), location.getStartLine(),
+        location.getStartColumn(), location.getEndLine(), location.getEndColumn()) and
+      element = sink.toString() and
+      value = ""
+    )
+  }
+}
diff --git a/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_SImplEmbedI2_subtypes_true.expected b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_SImplEmbedI2_subtypes_true.expected
new file mode 100644
index 00000000000..db33d6d2504
--- /dev/null
+++ b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_SImplEmbedI2_subtypes_true.expected
@@ -0,0 +1,3 @@
+testFailures
+invalidModelRow
+failures
diff --git a/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_SImplEmbedI2_subtypes_true.ext.yml b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_SImplEmbedI2_subtypes_true.ext.yml
new file mode 100644
index 00000000000..65cba778250
--- /dev/null
+++ b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_SImplEmbedI2_subtypes_true.ext.yml
@@ -0,0 +1,16 @@
+extensions:
+  - addsTo:
+      pack: codeql/go-all
+      extensible: sourceModel
+    data:
+      - ["github.com/nonexistent/test", "SImplEmbedI2", True, "Source", "", "", "ReturnValue", "qltest", "manual"]
+  - addsTo:
+      pack: codeql/go-all
+      extensible: summaryModel
+    data:
+      - ["github.com/nonexistent/test", "SImplEmbedI2", True, "Step", "", "", "Argument[0]", "ReturnValue", "value", "manual"]
+  - addsTo:
+      pack: codeql/go-all
+      extensible: sinkModel
+    data:
+      - ["github.com/nonexistent/test", "SImplEmbedI2", True, "Sink", "", "", "Argument[0]", "qltest", "manual"]
diff --git a/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_SImplEmbedI2_subtypes_true.ql b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_SImplEmbedI2_subtypes_true.ql
new file mode 100644
index 00000000000..b8ebb68ecdb
--- /dev/null
+++ b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_SImplEmbedI2_subtypes_true.ql
@@ -0,0 +1,26 @@
+import go
+import ModelValidation
+import TestUtilities.InlineExpectationsTest
+import MakeTest<FlowTest>
+
+module Config implements DataFlow::ConfigSig {
+  predicate isSource(DataFlow::Node source) { sourceNode(source, "qltest") }
+
+  predicate isSink(DataFlow::Node sink) { sinkNode(sink, "qltest") }
+}
+
+module Flow = TaintTracking::Global<Config>;
+
+module FlowTest implements TestSig {
+  string getARelevantTag() { result = "SImplEmbedI2[t]" }
+
+  predicate hasActualResult(Location location, string element, string tag, string value) {
+    tag = "SImplEmbedI2[t]" and
+    exists(DataFlow::Node sink | Flow::flowTo(sink) |
+      sink.hasLocationInfo(location.getFile().getAbsolutePath(), location.getStartLine(),
+        location.getStartColumn(), location.getEndLine(), location.getEndColumn()) and
+      element = sink.toString() and
+      value = ""
+    )
+  }
+}
diff --git a/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_SImplEmbedS1_subtypes_true.expected b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_SImplEmbedS1_subtypes_true.expected
new file mode 100644
index 00000000000..db33d6d2504
--- /dev/null
+++ b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_SImplEmbedS1_subtypes_true.expected
@@ -0,0 +1,3 @@
+testFailures
+invalidModelRow
+failures
diff --git a/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_SImplEmbedS1_subtypes_true.ext.yml b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_SImplEmbedS1_subtypes_true.ext.yml
new file mode 100644
index 00000000000..30d240d4a2e
--- /dev/null
+++ b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_SImplEmbedS1_subtypes_true.ext.yml
@@ -0,0 +1,18 @@
+extensions:
+  - addsTo:
+      pack: codeql/go-all
+      extensible: sourceModel
+    data:
+      - ["github.com/nonexistent/test", "SImplEmbedS1", True, "Source", "", "", "ReturnValue", "qltest", "manual"]
+      - ["github.com/nonexistent/test", "SImplEmbedS1", True, "SourceField", "", "", "", "qltest", "manual"]
+  - addsTo:
+      pack: codeql/go-all
+      extensible: summaryModel
+    data:
+      - ["github.com/nonexistent/test", "SImplEmbedS1", True, "Step", "", "", "Argument[0]", "ReturnValue", "value", "manual"]
+  - addsTo:
+      pack: codeql/go-all
+      extensible: sinkModel
+    data:
+      - ["github.com/nonexistent/test", "SImplEmbedS1", True, "Sink", "", "", "Argument[0]", "qltest", "manual"]
+      - ["github.com/nonexistent/test", "SImplEmbedS1", True, "SinkField", "", "", "", "qltest", "manual"]
diff --git a/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_SImplEmbedS1_subtypes_true.ql b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_SImplEmbedS1_subtypes_true.ql
new file mode 100644
index 00000000000..10e9fb96d4c
--- /dev/null
+++ b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_SImplEmbedS1_subtypes_true.ql
@@ -0,0 +1,26 @@
+import go
+import ModelValidation
+import TestUtilities.InlineExpectationsTest
+import MakeTest<FlowTest>
+
+module Config implements DataFlow::ConfigSig {
+  predicate isSource(DataFlow::Node source) { sourceNode(source, "qltest") }
+
+  predicate isSink(DataFlow::Node sink) { sinkNode(sink, "qltest") }
+}
+
+module Flow = TaintTracking::Global<Config>;
+
+module FlowTest implements TestSig {
+  string getARelevantTag() { result = "SImplEmbedS1[t]" }
+
+  predicate hasActualResult(Location location, string element, string tag, string value) {
+    tag = "SImplEmbedS1[t]" and
+    exists(DataFlow::Node sink | Flow::flowTo(sink) |
+      sink.hasLocationInfo(location.getFile().getAbsolutePath(), location.getStartLine(),
+        location.getStartColumn(), location.getEndLine(), location.getEndColumn()) and
+      element = sink.toString() and
+      value = ""
+    )
+  }
+}
diff --git a/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_SImplEmbedS2_subtypes_true.expected b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_SImplEmbedS2_subtypes_true.expected
new file mode 100644
index 00000000000..db33d6d2504
--- /dev/null
+++ b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_SImplEmbedS2_subtypes_true.expected
@@ -0,0 +1,3 @@
+testFailures
+invalidModelRow
+failures
diff --git a/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_SImplEmbedS2_subtypes_true.ext.yml b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_SImplEmbedS2_subtypes_true.ext.yml
new file mode 100644
index 00000000000..6873efc4258
--- /dev/null
+++ b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_SImplEmbedS2_subtypes_true.ext.yml
@@ -0,0 +1,16 @@
+extensions:
+  - addsTo:
+      pack: codeql/go-all
+      extensible: sourceModel
+    data:
+      - ["github.com/nonexistent/test", "SImplEmbedS2", True, "Source", "", "", "ReturnValue", "qltest", "manual"]
+  - addsTo:
+      pack: codeql/go-all
+      extensible: summaryModel
+    data:
+      - ["github.com/nonexistent/test", "SImplEmbedS2", True, "Step", "", "", "Argument[0]", "ReturnValue", "value", "manual"]
+  - addsTo:
+      pack: codeql/go-all
+      extensible: sinkModel
+    data:
+      - ["github.com/nonexistent/test", "SImplEmbedS2", True, "Sink", "", "", "Argument[0]", "qltest", "manual"]
diff --git a/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_SImplEmbedS2_subtypes_true.ql b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_SImplEmbedS2_subtypes_true.ql
new file mode 100644
index 00000000000..403b6238b4f
--- /dev/null
+++ b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_SImplEmbedS2_subtypes_true.ql
@@ -0,0 +1,26 @@
+import go
+import ModelValidation
+import TestUtilities.InlineExpectationsTest
+import MakeTest<FlowTest>
+
+module Config implements DataFlow::ConfigSig {
+  predicate isSource(DataFlow::Node source) { sourceNode(source, "qltest") }
+
+  predicate isSink(DataFlow::Node sink) { sinkNode(sink, "qltest") }
+}
+
+module Flow = TaintTracking::Global<Config>;
+
+module FlowTest implements TestSig {
+  string getARelevantTag() { result = "SImplEmbedS2[t]" }
+
+  predicate hasActualResult(Location location, string element, string tag, string value) {
+    tag = "SImplEmbedS2[t]" and
+    exists(DataFlow::Node sink | Flow::flowTo(sink) |
+      sink.hasLocationInfo(location.getFile().getAbsolutePath(), location.getStartLine(),
+        location.getStartColumn(), location.getEndLine(), location.getEndColumn()) and
+      element = sink.toString() and
+      value = ""
+    )
+  }
+}
diff --git a/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/ql_I1.expected b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/ql_I1.expected
new file mode 100644
index 00000000000..db33d6d2504
--- /dev/null
+++ b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/ql_I1.expected
@@ -0,0 +1,3 @@
+testFailures
+invalidModelRow
+failures
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
new file mode 100644
index 00000000000..f4beb7ea28d
--- /dev/null
+++ b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/ql_I1.ql
@@ -0,0 +1,44 @@
+import go
+import ModelValidation
+import TestUtilities.InlineExpectationsTest
+import MakeTest<FlowTest>
+
+module Config implements DataFlow::ConfigSig {
+  predicate isSource(DataFlow::Node source) {
+    exists(Method m |
+      m.hasQualifiedName("github.com/nonexistent/test", "I1", "Source") and
+      source = m.getACall().getResult()
+    )
+  }
+
+  predicate isSink(DataFlow::Node sink) {
+    exists(Method m |
+      m.hasQualifiedName("github.com/nonexistent/test", "I1", "Sink") and
+      sink = m.getACall().getArgument(0)
+    )
+  }
+}
+
+module Flow = TaintTracking::Global<Config>;
+
+module FlowTest implements TestSig {
+  string getARelevantTag() { result = "ql_I1" }
+
+  predicate hasActualResult(Location location, string element, string tag, string value) {
+    tag = "ql_I1" and
+    exists(DataFlow::Node sink | Flow::flowTo(sink) |
+      sink.hasLocationInfo(location.getFile().getAbsolutePath(), location.getStartLine(),
+        location.getStartColumn(), location.getEndLine(), location.getEndColumn()) and
+      element = sink.toString() and
+      value = ""
+    )
+  }
+}
+
+class MyStep extends DataFlow::FunctionModel, Method {
+  MyStep() { this.hasQualifiedName("github.com/nonexistent/test", "I1", "Step") }
+
+  override predicate hasDataFlow(FunctionInput input, FunctionOutput output) {
+    input.isParameter(0) and output.isResult()
+  }
+}
diff --git a/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/ql_P1.expected b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/ql_P1.expected
new file mode 100644
index 00000000000..db33d6d2504
--- /dev/null
+++ b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/ql_P1.expected
@@ -0,0 +1,3 @@
+testFailures
+invalidModelRow
+failures
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
new file mode 100644
index 00000000000..3022e13ff74
--- /dev/null
+++ b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/ql_P1.ql
@@ -0,0 +1,54 @@
+import go
+import ModelValidation
+import TestUtilities.InlineExpectationsTest
+import MakeTest<FlowTest>
+
+module Config implements DataFlow::ConfigSig {
+  predicate isSource(DataFlow::Node source) {
+    exists(Method m |
+      m.hasQualifiedName("github.com/nonexistent/test", "P1", "Source") and
+      source = m.getACall().getResult()
+    )
+    or
+    exists(Field f |
+      f.hasQualifiedName("github.com/nonexistent/test", "P1", "SourceField") and
+      source = f.getARead()
+    )
+  }
+
+  predicate isSink(DataFlow::Node sink) {
+    exists(Method m |
+      m.hasQualifiedName("github.com/nonexistent/test", "P1", "Sink") and
+      sink = m.getACall().getArgument(0)
+    )
+    or
+    exists(Field f |
+      f.hasQualifiedName("github.com/nonexistent/test", "P1", "SinkField") and
+      any(DataFlow::Write w).writesField(_, f, sink)
+    )
+  }
+}
+
+module Flow = TaintTracking::Global<Config>;
+
+module FlowTest implements TestSig {
+  string getARelevantTag() { result = "ql_P1" }
+
+  predicate hasActualResult(Location location, string element, string tag, string value) {
+    tag = "ql_P1" and
+    exists(DataFlow::Node sink | Flow::flowTo(sink) |
+      sink.hasLocationInfo(location.getFile().getAbsolutePath(), location.getStartLine(),
+        location.getStartColumn(), location.getEndLine(), location.getEndColumn()) and
+      element = sink.toString() and
+      value = ""
+    )
+  }
+}
+
+class MyStep extends DataFlow::FunctionModel, Method {
+  MyStep() { this.hasQualifiedName("github.com/nonexistent/test", "P1", "Step") }
+
+  override predicate hasDataFlow(FunctionInput input, FunctionOutput output) {
+    input.isParameter(0) and output.isResult()
+  }
+}
diff --git a/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/ql_S1.expected b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/ql_S1.expected
new file mode 100644
index 00000000000..db33d6d2504
--- /dev/null
+++ b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/ql_S1.expected
@@ -0,0 +1,3 @@
+testFailures
+invalidModelRow
+failures
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
new file mode 100644
index 00000000000..49113c53ed7
--- /dev/null
+++ b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/ql_S1.ql
@@ -0,0 +1,54 @@
+import go
+import ModelValidation
+import TestUtilities.InlineExpectationsTest
+import MakeTest<FlowTest>
+
+module Config implements DataFlow::ConfigSig {
+  predicate isSource(DataFlow::Node source) {
+    exists(Method m |
+      m.hasQualifiedName("github.com/nonexistent/test", "S1", "Source") and
+      source = m.getACall().getResult()
+    )
+    or
+    exists(Field f |
+      f.hasQualifiedName("github.com/nonexistent/test", "S1", "SourceField") and
+      source = f.getARead()
+    )
+  }
+
+  predicate isSink(DataFlow::Node sink) {
+    exists(Method m |
+      m.hasQualifiedName("github.com/nonexistent/test", "S1", "Sink") and
+      sink = m.getACall().getArgument(0)
+    )
+    or
+    exists(Field f |
+      f.hasQualifiedName("github.com/nonexistent/test", "S1", "SinkField") and
+      any(DataFlow::Write w).writesField(_, f, sink)
+    )
+  }
+}
+
+module Flow = TaintTracking::Global<Config>;
+
+module FlowTest implements TestSig {
+  string getARelevantTag() { result = "ql_S1" }
+
+  predicate hasActualResult(Location location, string element, string tag, string value) {
+    tag = "ql_S1" and
+    exists(DataFlow::Node sink | Flow::flowTo(sink) |
+      sink.hasLocationInfo(location.getFile().getAbsolutePath(), location.getStartLine(),
+        location.getStartColumn(), location.getEndLine(), location.getEndColumn()) and
+      element = sink.toString() and
+      value = ""
+    )
+  }
+}
+
+class MyStep extends DataFlow::FunctionModel, Method {
+  MyStep() { this.hasQualifiedName("github.com/nonexistent/test", "S1", "Step") }
+
+  override predicate hasDataFlow(FunctionInput input, FunctionOutput output) {
+    input.isParameter(0) and output.isResult()
+  }
+}
diff --git a/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/test_fields.go b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/test_fields.go
new file mode 100644
index 00000000000..86d5828ce12
--- /dev/null
+++ b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/test_fields.go
@@ -0,0 +1,85 @@
+package main
+
+import (
+	"github.com/nonexistent/test"
+)
+
+func TestFieldsP1(t test.P1) {
+	a := t.SourceField
+	t.SinkField = a // $ P1[f] P1[t] ql_P1 SPURIOUS: ql_S1
+}
+
+func TestFieldsS1(t test.S1) {
+	a := t.SourceField
+	t.SinkField = a // $ S1[f] S1[t] ql_S1 SPURIOUS: ql_P1
+}
+
+func TestFieldsSEmbedI1(t test.SEmbedI1) {
+	a := t.SourceField
+	t.SinkField = a // $ SEmbedI1[t]
+}
+
+func TestFieldsSImplEmbedI1(t test.SImplEmbedI1) {
+	a := t.SourceField
+	t.SinkField = a // $ SImplEmbedI1[t]
+}
+
+func TestFieldsPImplEmbedI1(t test.PImplEmbedI1) {
+	a := t.SourceField
+	t.SinkField = a // $ PImplEmbedI1[t]
+}
+
+func TestFieldsSEmbedP1(t test.SEmbedP1) {
+	a := t.SourceField
+	t.SinkField = a // $ P1[t] SEmbedP1[t] ql_P1 SPURIOUS: ql_S1
+}
+
+func TestFieldsSEmbedS1(t test.SEmbedS1) {
+	a := t.SourceField
+	t.SinkField = a // $ S1[t] SEmbedS1[t] ql_S1 SPURIOUS: ql_P1
+}
+
+func TestFieldsSEmbedPtrP1(t test.SEmbedPtrP1) {
+	a := t.SourceField
+	t.SinkField = a // $ P1[t] SEmbedPtrP1[t] ql_P1 SPURIOUS: ql_S1
+}
+
+func TestFieldsSEmbedPtrS1(t test.SEmbedPtrS1) {
+	a := t.SourceField
+	t.SinkField = a // $ S1[t] SEmbedPtrS1[t] ql_S1 SPURIOUS: ql_P1
+}
+
+func TestFieldsSImplEmbedS1(t test.SImplEmbedS1) {
+	a := t.SourceField
+	t.SinkField = a // $ SImplEmbedS1[t]
+}
+
+func TestFieldsSEmbedSEmbedI1(t test.SEmbedSEmbedI1) {
+	a := t.SourceField
+	t.SinkField = a
+}
+
+func TestFieldsSEmbedSEmbedS1(t test.SEmbedSEmbedS1) {
+	a := t.SourceField
+	t.SinkField = a // $ S1[t] SEmbedS1[t] ql_S1 SPURIOUS: ql_P1
+}
+
+func TestFieldsSEmbedSEmbedPtrS1(t test.SEmbedSEmbedPtrS1) {
+	a := t.SourceField
+	t.SinkField = a // $ S1[t] SEmbedPtrS1[t] ql_S1 SPURIOUS: ql_P1
+}
+
+func TestFieldsSEmbedPtrSEmbedS1(t test.SEmbedPtrSEmbedS1) {
+	a := t.SourceField
+	t.SinkField = a // $ S1[t] SEmbedS1[t] ql_S1 SPURIOUS: ql_P1
+}
+
+func TestFieldsSEmbedPtrSEmbedPtrS1(t test.SEmbedPtrSEmbedPtrS1) {
+	a := t.SourceField
+	t.SinkField = a // $ S1[t] SEmbedPtrS1[t] ql_S1 SPURIOUS: ql_P1
+}
+
+func TestFieldsSEmbedS1AndSEmbedS1(t test.SEmbedS1AndSEmbedS1) {
+	a := t.SourceField
+	t.SinkField = a // $ S1[t] ql_S1 SPURIOUS: ql_P1
+}
diff --git a/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/test_methods.go b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/test_methods.go
new file mode 100644
index 00000000000..8d4c592e0cd
--- /dev/null
+++ b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/test_methods.go
@@ -0,0 +1,173 @@
+package main
+
+import (
+	"github.com/nonexistent/test"
+)
+
+func TestMethodsI1(t test.I1) {
+	x := t.Source()
+	y := t.Step(x)
+	t.Sink(y) // $ I1[f] I1[t] ql_I1 SPURIOUS: ql_P1 ql_S1
+}
+
+func TestMethodsI2(t test.I2) {
+	x := t.Source()
+	y := t.Step(x)
+	t.Sink(y) // $ I1[t] I2[f] I2[t]
+}
+
+func TestMethodsS1(t test.S1) {
+	x := t.Source()
+	y := t.Step(x)
+	t.Sink(y) // $ I1[t] S1[f] S1[t] ql_S1
+}
+
+func TestMethodsP1(t test.P1) {
+	x := t.Source()
+	y := t.Step(x)
+	t.Sink(y) // $ I1[t] P1[f] P1[t] ql_P1
+}
+
+func TestMethodsS2(t test.S2) {
+	x := t.Source()
+	y := t.Step(x)
+	t.Sink(y) // $ I1[t] I2[t]
+}
+
+func TestMethodsP2(t test.P2) {
+	x := t.Source()
+	y := t.Step(x)
+	t.Sink(y) // $ I1[t] I2[t]
+}
+
+func TestMethodsSEmbedI1(t test.SEmbedI1) {
+	x := t.Source()
+	y := t.Step(x)
+	t.Sink(y) // $ I1[t] SEmbedI1[t] ql_I1 SPURIOUS: ql_P1 ql_S1
+}
+
+func TestMethodsSEmbedI2(t test.SEmbedI2) {
+	x := t.Source()
+	y := t.Step(x)
+	t.Sink(y) // $ I1[t] I2[t] SEmbedI2[t]
+}
+
+func TestMethodsIEmbedI1(t test.IEmbedI1) {
+	x := t.Source()
+	y := t.Step(x)
+	t.Sink(y) // $ I1[t] IEmbedI1[t] ql_I1 SPURIOUS: ql_P1 ql_S1
+}
+
+func TestMethodsIEmbedI2(t test.IEmbedI2) {
+	x := t.Source()
+	y := t.Step(x)
+	t.Sink(y) // $ I1[t] I2[t] IEmbedI2[t]
+}
+
+func TestMethodsSImplEmbedI1(t test.SImplEmbedI1) {
+	x := t.Source()
+	y := t.Step(x)
+	t.Sink(y) // $ I1[t] SImplEmbedI1[t]
+}
+
+func TestMethodsSImplEmbedI2(t test.SImplEmbedI2) {
+	x := t.Source()
+	y := t.Step(x)
+	t.Sink(y) // $ I1[t] I2[t] SImplEmbedI2[t]
+}
+
+func TestMethodsPImplEmbedI1(t test.PImplEmbedI1) {
+	x := t.Source()
+	y := t.Step(x)
+	t.Sink(y) // $ I1[t] PImplEmbedI1[t]
+}
+
+func TestMethodsPImplEmbedI2(t test.PImplEmbedI2) {
+	x := t.Source()
+	y := t.Step(x)
+	t.Sink(y) // $ I1[t] I2[t] PImplEmbedI2[t]
+}
+
+func TestMethodsSEmbedS1(t test.SEmbedS1) {
+	x := t.Source()
+	y := t.Step(x)
+	t.Sink(y) // $ I1[t] S1[t] SEmbedS1[t] ql_S1
+}
+
+func TestMethodsSEmbedS2(t test.SEmbedS2) {
+	x := t.Source()
+	y := t.Step(x)
+	t.Sink(y) // $ I1[t] I2[t] SEmbedS2[t]
+}
+
+func TestMethodsSEmbedPtrS1(t test.SEmbedPtrS1) {
+	x := t.Source()
+	y := t.Step(x)
+	t.Sink(y) // $ I1[t] S1[t] SEmbedPtrS1[t] ql_S1
+}
+
+func TestMethodsSEmbedPtrS2(t test.SEmbedPtrS2) {
+	x := t.Source()
+	y := t.Step(x)
+	t.Sink(y) // $ I1[t] I2[t] SEmbedPtrS2[t]
+}
+
+func TestMethodsSEmbedP1(t *test.SEmbedP1) {
+	x := t.Source()
+	y := t.Step(x)
+	t.Sink(y) // $ I1[t] P1[t] SEmbedP1[t] ql_P1
+}
+
+func TestMethodsSEmbedP2(t *test.SEmbedP2) {
+	x := t.Source()
+	y := t.Step(x)
+	t.Sink(y) // $ I1[t] I2[t] SEmbedP2[t]
+}
+
+func TestMethodsSImplEmbedS1(t test.SImplEmbedS1) {
+	x := t.Source()
+	y := t.Step(x)
+	t.Sink(y) // $ I1[t] SImplEmbedS1[t]
+}
+
+func TestMethodsSImplEmbedS2(t test.SImplEmbedS2) {
+	x := t.Source()
+	y := t.Step(x)
+	t.Sink(y) // $ I1[t] I2[t] SImplEmbedS2[t]
+}
+
+func TestMethodsSEmbedSEmbedI1(t test.SEmbedSEmbedI1) {
+	x := t.Source()
+	y := t.Step(x)
+	t.Sink(y) // $ I1[t] SEmbedI1[t] ql_I1 SPURIOUS: ql_P1 ql_S1
+}
+
+func TestMethodsSEmbedSEmbedS1(t test.SEmbedSEmbedS1) {
+	x := t.Source()
+	y := t.Step(x)
+	t.Sink(y) // $ I1[t] S1[t] SEmbedS1[t] ql_S1
+}
+
+func TestMethodsSEmbedSEmbedPtrS1(t test.SEmbedSEmbedPtrS1) {
+	x := t.Source()
+	y := t.Step(x)
+	t.Sink(y) // $ I1[t] S1[t] SEmbedPtrS1[t] ql_S1
+}
+
+func TestMethodsSEmbedPtrSEmbedS1(t test.SEmbedPtrSEmbedS1) {
+	x := t.Source()
+	y := t.Step(x)
+	t.Sink(y) // $ I1[t] S1[t] SEmbedS1[t] ql_S1
+}
+
+func TestMethodsSEmbedPtrSEmbedPtrS1(t test.SEmbedPtrSEmbedPtrS1) {
+	x := t.Source()
+	y := t.Step(x)
+	t.Sink(y) // $ I1[t] S1[t] SEmbedPtrS1[t] ql_S1
+}
+
+func TestMethodsSEmbedS1AndSEmbedS1(t test.SEmbedS1AndSEmbedS1) {
+	x := t.Source()
+	y := t.Step(x)
+	t.Sink(y) // $ I1[t] S1[t] ql_S1
+}
diff --git a/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/vendor/github.com/nonexistent/test/stub.go b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/vendor/github.com/nonexistent/test/stub.go
new file mode 100644
index 00000000000..093c24eab9d
--- /dev/null
+++ b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/vendor/github.com/nonexistent/test/stub.go
@@ -0,0 +1,251 @@
+package test
+
+// An interface
+type I1 interface {
+	Source() interface{}
+	Step(interface{}) interface{}
+	Sink(interface{})
+}
+
+// An interface which is a subtype of I1
+type I2 interface {
+	Source() interface{}
+	Step(interface{}) interface{}
+	Sink(interface{})
+	ExtraMethodI2()
+}
+
+// A struct type implementing I1
+type S1 struct {
+	SourceField string
+	SinkField   string
+}
+
+func (t S1) Source() interface{} {
+	return nil
+}
+
+func (t S1) Sink(interface{}) {}
+
+func (t S1) Step(val interface{}) interface{} {
+	return val
+}
+
+// A struct type whose pointer type implements I1
+type P1 struct {
+	SourceField string
+	SinkField   string
+}
+
+func (t *P1) Source() interface{} {
+	return nil
+}
+
+func (t *P1) Sink(interface{}) {}
+
+func (t *P1) Step(val interface{}) interface{} {
+	return val
+}
+
+// A struct type implementing I2
+type S2 struct{}
+
+func (t S2) Source() interface{} {
+	return nil
+}
+
+func (t S2) Sink(interface{}) {}
+
+func (t S2) Step(val interface{}) interface{} {
+	return val
+}
+
+func (t S2) ExtraMethodI2() {}
+
+// A struct type whose pointer type implements I2
+type P2 struct{}
+
+func (t *P2) Source() interface{} {
+	return nil
+}
+
+func (t *P2) Sink(interface{}) {}
+
+func (t *P2) Step(val interface{}) interface{} {
+	return val
+}
+
+func (t *P2) ExtraMethodI2() {}
+
+// A struct type embedding I1
+type SEmbedI1 struct {
+	I1
+	SourceField string
+	SinkField   string
+}
+
+// A struct type embedding I2
+type SEmbedI2 struct{ I2 }
+
+// An interface type embedding I1
+type IEmbedI1 interface {
+	I1
+	ExtraMethodIEmbedI1()
+}
+
+// An interface type embedding I2
+type IEmbedI2 interface {
+	I2
+	ExtraMethodIEmbedI2()
+}
+
+// A struct type embedding I1 and separately implementing its methods, so the
+// methods of the embedded field are not promoted.
+type SImplEmbedI1 struct {
+	I1
+	SourceField string
+	SinkField   string
+}
+
+func (t SImplEmbedI1) Source() interface{} {
+	return nil
+}
+
+func (t SImplEmbedI1) Sink(interface{}) {}
+
+func (t SImplEmbedI1) Step(val interface{}) interface{} {
+	return val
+}
+
+// A struct type embedding I2 and separately implementing its methods, so the
+// methods of the embedded field are not promoted.
+type SImplEmbedI2 struct{ I2 }
+
+func (t SImplEmbedI2) Source() interface{} {
+	return nil
+}
+
+func (t SImplEmbedI2) Sink(interface{}) {}
+
+func (t SImplEmbedI2) Step(val interface{}) interface{} {
+	return val
+}
+
+func (t SImplEmbedI2) ExtraMethodI2() {}
+
+// A struct type embedding I1 and separately implementing its methods on its
+// pointer type, so the methods of the embedded field are not promoted.
+type PImplEmbedI1 struct {
+	I1
+	SourceField string
+	SinkField   string
+}
+
+func (t *PImplEmbedI1) Source() interface{} {
+	return nil
+}
+
+func (t *PImplEmbedI1) Sink(interface{}) {}
+
+func (t *PImplEmbedI1) Step(val interface{}) interface{} {
+	return val
+}
+
+// A struct type embedding I2 and separately implementing its methods, so the
+// methods of the embedded field are not promoted.
+type PImplEmbedI2 struct{ I2 }
+
+func (t *PImplEmbedI2) Source() interface{} {
+	return nil
+}
+
+func (t *PImplEmbedI2) Sink(interface{}) {}
+
+func (t *PImplEmbedI2) Step(val interface{}) interface{} {
+	return val
+}
+
+func (t *PImplEmbedI2) ExtraMethodI2() {}
+
+// A struct type embedding S1
+type SEmbedS1 struct{ S1 }
+
+// A struct type embedding S2
+type SEmbedS2 struct{ S2 }
+
+// A struct type embedding P1
+type SEmbedP1 struct{ P1 }
+
+// A struct type embedding P2
+type SEmbedP2 struct{ P2 }
+
+// A struct type embedding *S1
+type SEmbedPtrS1 struct{ *S1 }
+
+// A struct type embedding *S2
+type SEmbedPtrS2 struct{ *S2 }
+
+// A struct type embedding *P1
+type SEmbedPtrP1 struct{ *P1 }
+
+// A struct type embedding *P2
+type SEmbedPtrP2 struct{ *P2 }
+
+// A struct type embedding S1 and separately implementing I1's methods and
+// fields, so the methods and fields of the embedded field are not promoted.
+type SImplEmbedS1 struct {
+	S1
+	SourceField string
+	SinkField   string
+}
+
+func (t *SImplEmbedS1) Source() interface{} {
+	return nil
+}
+
+func (t *SImplEmbedS1) Sink(interface{}) {}
+
+func (t *SImplEmbedS1) Step(val interface{}) interface{} {
+	return val
+}
+
+// A struct type embedding S2 and separately implementing I2's methods, so the
+// methods of the embedded field are not promoted.
+type SImplEmbedS2 struct{ S2 }
+
+func (t *SImplEmbedS2) Source() interface{} {
+	return nil
+}
+
+func (t *SImplEmbedS2) Sink(interface{}) {}
+
+func (t *SImplEmbedS2) Step(val interface{}) interface{} {
+	return val
+}
+
+func (t *SImplEmbedS2) ExtraMethodI2() {}
+
+// A struct type embedding SEmbedI1
+type SEmbedSEmbedI1 struct {
+	SEmbedI1
+	SourceField string
+	SinkField   string
+}
+
+// A struct type embedding SEmbedS1
+type SEmbedSEmbedS1 struct{ SEmbedS1 }
+
+// A struct type embedding SEmbedPtrS1
+type SEmbedSEmbedPtrS1 struct{ SEmbedPtrS1 }
+
+// A struct type embedding SEmbedS1
+type SEmbedPtrSEmbedS1 struct{ *SEmbedS1 }
+
+// A struct type embedding SEmbedPtrS1
+type SEmbedPtrSEmbedPtrS1 struct{ *SEmbedPtrS1 }
+
+// A struct type embedding S1 and SEmbedS1
+type SEmbedS1AndSEmbedS1 struct {
+	S1
+	SEmbedS1
+}
diff --git a/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/vendor/modules.txt b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/vendor/modules.txt
new file mode 100644
index 00000000000..b62dbf8819b
--- /dev/null
+++ b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/vendor/modules.txt
@@ -0,0 +1,3 @@
+# github.com/nonexistent/test v0.0.0-20200203000000-0000000000000
+## explicit
+github.com/nonexistent/test
diff --git a/go/ql/test/library-tests/semmle/go/dataflow/ExternalTaintFlow/completetest.ext.yml b/go/ql/test/library-tests/semmle/go/dataflow/ExternalTaintFlow/completetest.ext.yml
index 79bf9128ef5..d89a9e04e16 100644
--- a/go/ql/test/library-tests/semmle/go/dataflow/ExternalTaintFlow/completetest.ext.yml
+++ b/go/ql/test/library-tests/semmle/go/dataflow/ExternalTaintFlow/completetest.ext.yml
@@ -35,10 +35,12 @@ extensions:
       pack: codeql/go-all
       extensible: sourceModel
     data:
+      - ["github.com/nonexistent/test", "", False, "SourceVariable", "", "", "", "qltest", "manual"]
       - ["github.com/nonexistent/test", "A", False, "Src1", "", "", "ReturnValue", "qltest", "manual"]
   - addsTo:
       pack: codeql/go-all
       extensible: sinkModel
     data:
+      - ["github.com/nonexistent/test", "", False, "SinkVariable", "", "", "", "qltest", "manual"]
       - ["github.com/nonexistent/test", "B", False, "Sink1", "", "", "Argument[0]", "qltest", "manual"]
       - ["github.com/nonexistent/test", "B", False, "SinkManyArgs", "", "", "Argument[0..2]", "qltest", "manual"]
diff --git a/go/ql/test/library-tests/semmle/go/dataflow/ExternalTaintFlow/sinks.expected b/go/ql/test/library-tests/semmle/go/dataflow/ExternalTaintFlow/sinks.expected
index fc9adff8942..755c3f82279 100644
--- a/go/ql/test/library-tests/semmle/go/dataflow/ExternalTaintFlow/sinks.expected
+++ b/go/ql/test/library-tests/semmle/go/dataflow/ExternalTaintFlow/sinks.expected
@@ -43,3 +43,4 @@ invalidModelRow
 | test.go:199:17:199:20 | arg1 | qltest |
 | test.go:199:23:199:26 | arg2 | qltest |
 | test.go:199:29:199:32 | arg3 | qltest |
+| test.go:202:22:202:25 | temp | qltest |
diff --git a/go/ql/test/library-tests/semmle/go/dataflow/ExternalTaintFlow/sinks.ext.yml b/go/ql/test/library-tests/semmle/go/dataflow/ExternalTaintFlow/sinks.ext.yml
index 426e094c00c..ec19b822a8c 100644
--- a/go/ql/test/library-tests/semmle/go/dataflow/ExternalTaintFlow/sinks.ext.yml
+++ b/go/ql/test/library-tests/semmle/go/dataflow/ExternalTaintFlow/sinks.ext.yml
@@ -3,6 +3,7 @@ extensions:
       pack: codeql/go-all
       extensible: sinkModel
     data:
+      - ["github.com/nonexistent/test", "", False, "SinkVariable", "", "", "", "qltest", "manual"]
       - ["github.com/nonexistent/test", "B", False, "Sink1", "", "", "Argument[0]", "qltest", "manual"]
       - ["github.com/nonexistent/test", "B", False, "SinkMethod", "", "", "Argument[receiver]", "qltest", "manual"]
       - ["github.com/nonexistent/test", "B", False, "SinkManyArgs", "", "", "Argument[0..2]", "qltest", "manual"]
diff --git a/go/ql/test/library-tests/semmle/go/dataflow/ExternalTaintFlow/srcs.expected b/go/ql/test/library-tests/semmle/go/dataflow/ExternalTaintFlow/srcs.expected
index d63fedba3fd..bd1525a984b 100644
--- a/go/ql/test/library-tests/semmle/go/dataflow/ExternalTaintFlow/srcs.expected
+++ b/go/ql/test/library-tests/semmle/go/dataflow/ExternalTaintFlow/srcs.expected
@@ -21,3 +21,4 @@ invalidModelRow
 | test.go:183:17:183:24 | call to Src1 | qltest |
 | test.go:187:24:187:31 | call to Src1 | qltest |
 | test.go:191:24:191:31 | call to Src1 | qltest |
+| test.go:201:10:201:28 | selection of SourceVariable | qltest |
diff --git a/go/ql/test/library-tests/semmle/go/dataflow/ExternalTaintFlow/srcs.ext.yml b/go/ql/test/library-tests/semmle/go/dataflow/ExternalTaintFlow/srcs.ext.yml
index 5493650132c..cda2183894c 100644
--- a/go/ql/test/library-tests/semmle/go/dataflow/ExternalTaintFlow/srcs.ext.yml
+++ b/go/ql/test/library-tests/semmle/go/dataflow/ExternalTaintFlow/srcs.ext.yml
@@ -3,9 +3,10 @@ extensions:
       pack: codeql/go-all
       extensible: sourceModel
     data:
+      - ["github.com/nonexistent/test", "", False, "SourceVariable", "", "", "", "qltest", "manual"]
       - ["github.com/nonexistent/test", "A", False, "Src1", "", "", "ReturnValue", "qltest", "manual"]
       - ["github.com/nonexistent/test", "A", False, "Src2", "", "", "ReturnValue", "qltest", "manual"]
       - ["github.com/nonexistent/test", "A", True, "Src2", "", "", "ReturnValue", "qltest-w-subtypes", "manual"]
       - ["github.com/nonexistent/test", "A", False, "SrcArg", "", "", "Argument[0]", "qltest-arg", "manual"]
       - ["github.com/nonexistent/test", "A", False, "Src3", "", "", "ReturnValue[0]", "qltest", "manual"]
-      - ["github.com/nonexistent/test", "A", True, "Src3", "", "", "ReturnValue[1]", "qltest-w-subtypes", "manual"]
\ No newline at end of file
+      - ["github.com/nonexistent/test", "A", True, "Src3", "", "", "ReturnValue[1]", "qltest-w-subtypes", "manual"]
diff --git a/go/ql/test/library-tests/semmle/go/dataflow/ExternalTaintFlow/test.go b/go/ql/test/library-tests/semmle/go/dataflow/ExternalTaintFlow/test.go
index 33e980dac99..29ed066cd50 100644
--- a/go/ql/test/library-tests/semmle/go/dataflow/ExternalTaintFlow/test.go
+++ b/go/ql/test/library-tests/semmle/go/dataflow/ExternalTaintFlow/test.go
@@ -197,6 +197,9 @@ func simpleflow() {
 	arg3 := src
 	arg4 := src
 	b.SinkManyArgs(arg1, arg2, arg3, arg4) // $ hasTaintFlow="arg1" hasTaintFlow="arg2" hasTaintFlow="arg3"
+
+	temp := test.SourceVariable
+	test.SinkVariable = temp // $ hasTaintFlow="temp"
 }
 
 type mapstringstringtype map[string]string
diff --git a/go/ql/test/library-tests/semmle/go/dataflow/ExternalTaintFlow/vendor/github.com/nonexistent/test/stub.go b/go/ql/test/library-tests/semmle/go/dataflow/ExternalTaintFlow/vendor/github.com/nonexistent/test/stub.go
index 05a5f741d76..72681cf7238 100644
--- a/go/ql/test/library-tests/semmle/go/dataflow/ExternalTaintFlow/vendor/github.com/nonexistent/test/stub.go
+++ b/go/ql/test/library-tests/semmle/go/dataflow/ExternalTaintFlow/vendor/github.com/nonexistent/test/stub.go
@@ -72,3 +72,6 @@ func (c C) Get() string  { return "" }
 
 func (c *C) SetThroughPointer(f string) {}
 func (c *C) GetThroughPointer() string  { return "" }
+
+var SourceVariable string
+var SinkVariable string
diff --git a/go/ql/test/library-tests/semmle/go/dataflow/ExternalValueFlow/completetest.ext.yml b/go/ql/test/library-tests/semmle/go/dataflow/ExternalValueFlow/completetest.ext.yml
index 8fbc26ff6cd..924e19a8a73 100644
--- a/go/ql/test/library-tests/semmle/go/dataflow/ExternalValueFlow/completetest.ext.yml
+++ b/go/ql/test/library-tests/semmle/go/dataflow/ExternalValueFlow/completetest.ext.yml
@@ -35,10 +35,12 @@ extensions:
       pack: codeql/go-all
       extensible: sourceModel
     data:
+      - ["github.com/nonexistent/test", "", False, "SourceVariable", "", "", "", "qltest", "manual"]
       - ["github.com/nonexistent/test", "A", False, "Src1", "", "", "ReturnValue", "qltest", "manual"]
   - addsTo:
       pack: codeql/go-all
       extensible: sinkModel
     data:
+      - ["github.com/nonexistent/test", "", False, "SinkVariable", "", "", "", "qltest", "manual"]
       - ["github.com/nonexistent/test", "B", False, "Sink1", "", "", "Argument[0]", "qltest", "manual"]
       - ["github.com/nonexistent/test", "B", False, "SinkManyArgs", "", "", "Argument[0..2]", "qltest", "manual"]
diff --git a/go/ql/test/library-tests/semmle/go/dataflow/ExternalValueFlow/sinks.expected b/go/ql/test/library-tests/semmle/go/dataflow/ExternalValueFlow/sinks.expected
index 0fe3a614e11..c9940e181c8 100644
--- a/go/ql/test/library-tests/semmle/go/dataflow/ExternalValueFlow/sinks.expected
+++ b/go/ql/test/library-tests/semmle/go/dataflow/ExternalValueFlow/sinks.expected
@@ -49,3 +49,4 @@ invalidModelRow
 | test.go:205:10:205:26 | call to min | qltest |
 | test.go:206:10:206:26 | call to min | qltest |
 | test.go:207:10:207:26 | call to min | qltest |
+| test.go:210:22:210:25 | temp | qltest |
diff --git a/go/ql/test/library-tests/semmle/go/dataflow/ExternalValueFlow/sinks.ext.yml b/go/ql/test/library-tests/semmle/go/dataflow/ExternalValueFlow/sinks.ext.yml
index 426e094c00c..ec19b822a8c 100644
--- a/go/ql/test/library-tests/semmle/go/dataflow/ExternalValueFlow/sinks.ext.yml
+++ b/go/ql/test/library-tests/semmle/go/dataflow/ExternalValueFlow/sinks.ext.yml
@@ -3,6 +3,7 @@ extensions:
       pack: codeql/go-all
       extensible: sinkModel
     data:
+      - ["github.com/nonexistent/test", "", False, "SinkVariable", "", "", "", "qltest", "manual"]
       - ["github.com/nonexistent/test", "B", False, "Sink1", "", "", "Argument[0]", "qltest", "manual"]
       - ["github.com/nonexistent/test", "B", False, "SinkMethod", "", "", "Argument[receiver]", "qltest", "manual"]
       - ["github.com/nonexistent/test", "B", False, "SinkManyArgs", "", "", "Argument[0..2]", "qltest", "manual"]
diff --git a/go/ql/test/library-tests/semmle/go/dataflow/ExternalValueFlow/srcs.expected b/go/ql/test/library-tests/semmle/go/dataflow/ExternalValueFlow/srcs.expected
index d63fedba3fd..6fcfcc2a3bc 100644
--- a/go/ql/test/library-tests/semmle/go/dataflow/ExternalValueFlow/srcs.expected
+++ b/go/ql/test/library-tests/semmle/go/dataflow/ExternalValueFlow/srcs.expected
@@ -21,3 +21,4 @@ invalidModelRow
 | test.go:183:17:183:24 | call to Src1 | qltest |
 | test.go:187:24:187:31 | call to Src1 | qltest |
 | test.go:191:24:191:31 | call to Src1 | qltest |
+| test.go:209:10:209:28 | selection of SourceVariable | qltest |
diff --git a/go/ql/test/library-tests/semmle/go/dataflow/ExternalValueFlow/srcs.ext.yml b/go/ql/test/library-tests/semmle/go/dataflow/ExternalValueFlow/srcs.ext.yml
index 5493650132c..cda2183894c 100644
--- a/go/ql/test/library-tests/semmle/go/dataflow/ExternalValueFlow/srcs.ext.yml
+++ b/go/ql/test/library-tests/semmle/go/dataflow/ExternalValueFlow/srcs.ext.yml
@@ -3,9 +3,10 @@ extensions:
       pack: codeql/go-all
       extensible: sourceModel
     data:
+      - ["github.com/nonexistent/test", "", False, "SourceVariable", "", "", "", "qltest", "manual"]
       - ["github.com/nonexistent/test", "A", False, "Src1", "", "", "ReturnValue", "qltest", "manual"]
       - ["github.com/nonexistent/test", "A", False, "Src2", "", "", "ReturnValue", "qltest", "manual"]
       - ["github.com/nonexistent/test", "A", True, "Src2", "", "", "ReturnValue", "qltest-w-subtypes", "manual"]
       - ["github.com/nonexistent/test", "A", False, "SrcArg", "", "", "Argument[0]", "qltest-arg", "manual"]
       - ["github.com/nonexistent/test", "A", False, "Src3", "", "", "ReturnValue[0]", "qltest", "manual"]
-      - ["github.com/nonexistent/test", "A", True, "Src3", "", "", "ReturnValue[1]", "qltest-w-subtypes", "manual"]
\ No newline at end of file
+      - ["github.com/nonexistent/test", "A", True, "Src3", "", "", "ReturnValue[1]", "qltest-w-subtypes", "manual"]
diff --git a/go/ql/test/library-tests/semmle/go/dataflow/ExternalValueFlow/test.go b/go/ql/test/library-tests/semmle/go/dataflow/ExternalValueFlow/test.go
index 82419ae7d59..72c4db35248 100644
--- a/go/ql/test/library-tests/semmle/go/dataflow/ExternalValueFlow/test.go
+++ b/go/ql/test/library-tests/semmle/go/dataflow/ExternalValueFlow/test.go
@@ -205,6 +205,9 @@ func simpleflow() {
 	b.Sink1(min(srcInt, 0, 1)) // $ hasValueFlow="call to min"
 	b.Sink1(min(0, srcInt, 1)) // $ hasValueFlow="call to min"
 	b.Sink1(min(0, 1, srcInt)) // $ hasValueFlow="call to min"
+
+	temp := test.SourceVariable
+	test.SinkVariable = temp // $ hasValueFlow="temp"
 }
 
 type mapstringstringtype map[string]string
diff --git a/go/ql/test/library-tests/semmle/go/dataflow/ExternalValueFlow/vendor/github.com/nonexistent/test/stub.go b/go/ql/test/library-tests/semmle/go/dataflow/ExternalValueFlow/vendor/github.com/nonexistent/test/stub.go
index 05a5f741d76..72681cf7238 100644
--- a/go/ql/test/library-tests/semmle/go/dataflow/ExternalValueFlow/vendor/github.com/nonexistent/test/stub.go
+++ b/go/ql/test/library-tests/semmle/go/dataflow/ExternalValueFlow/vendor/github.com/nonexistent/test/stub.go
@@ -72,3 +72,6 @@ func (c C) Get() string  { return "" }
 
 func (c *C) SetThroughPointer(f string) {}
 func (c *C) GetThroughPointer() string  { return "" }
+
+var SourceVariable string
+var SinkVariable string
diff --git a/go/ql/test/library-tests/semmle/go/dataflow/ThreatModels/Test.qll b/go/ql/test/library-tests/semmle/go/dataflow/ThreatModels/Test.qll
index 856c748af7f..794793a6a0a 100644
--- a/go/ql/test/library-tests/semmle/go/dataflow/ThreatModels/Test.qll
+++ b/go/ql/test/library-tests/semmle/go/dataflow/ThreatModels/Test.qll
@@ -4,7 +4,7 @@ private import semmle.go.dataflow.ExternalFlow
 private import semmle.go.dataflow.DataFlow
 
 private module ThreatModelConfig implements DataFlow::ConfigSig {
-  predicate isSource(DataFlow::Node source) { source instanceof ThreatModelFlowSource }
+  predicate isSource(DataFlow::Node source) { source instanceof ActiveThreatModelSource }
 
   predicate isSink(DataFlow::Node sink) {
     sink = any(DataFlow::CallNode c | c.getTarget().getName() = "sink").getAnArgument()
diff --git a/go/ql/test/library-tests/semmle/go/dataflow/ThreatModels/threat-models-flowtest2.expected b/go/ql/test/library-tests/semmle/go/dataflow/ThreatModels/threat-models-flowtest2.expected
index b2e051de42c..cf59efbb6ac 100644
--- a/go/ql/test/library-tests/semmle/go/dataflow/ThreatModels/threat-models-flowtest2.expected
+++ b/go/ql/test/library-tests/semmle/go/dataflow/ThreatModels/threat-models-flowtest2.expected
@@ -1,12 +1,12 @@
 models
-| 1 | Source: net/http; Request; true; URL; ; ; ; remote; manual |
-| 2 | Summary: net/url; URL; true; Query; ; ; Argument[receiver]; ReturnValue; taint; manual |
-| 3 | Summary: net/url; Values; true; Get; ; ; Argument[receiver]; ReturnValue; taint; manual |
-| 4 | Source: github.com/nonexistent/sources; ; false; ExecuteQuery; ; ; ReturnValue; database; manual |
+| 1 | Source: github.com/nonexistent/sources; ; false; ExecuteQuery; ; ; ReturnValue; database; manual |
+| 2 | Source: net/http; Request; true; URL; ; ; ; remote; manual |
+| 3 | Summary: net/url; URL; true; Query; ; ; Argument[receiver]; ReturnValue; taint; manual |
+| 4 | Summary: net/url; Values; true; Get; ; ; Argument[receiver]; ReturnValue; taint; manual |
 edges
-| test.go:27:11:27:63 | call to ExecuteQuery | test.go:28:7:28:11 | query | provenance | Src:MaD:4  |
-| test.go:32:11:32:15 | selection of URL | test.go:32:11:32:23 | call to Query | provenance | Src:MaD:1 MaD:2 |
-| test.go:32:11:32:23 | call to Query | test.go:32:11:32:36 | call to Get | provenance | MaD:3 |
+| test.go:27:11:27:63 | call to ExecuteQuery | test.go:28:7:28:11 | query | provenance | Src:MaD:1  |
+| test.go:32:11:32:15 | selection of URL | test.go:32:11:32:23 | call to Query | provenance | Src:MaD:2 MaD:3 |
+| test.go:32:11:32:23 | call to Query | test.go:32:11:32:36 | call to Get | provenance | MaD:4 |
 | test.go:32:11:32:36 | call to Get | test.go:34:7:34:30 | ...+... | provenance |  |
 nodes
 | test.go:27:11:27:63 | call to ExecuteQuery | semmle.label | call to ExecuteQuery |
diff --git a/go/ql/test/library-tests/semmle/go/dataflow/ThreatModels/threat-models-flowtest3.expected b/go/ql/test/library-tests/semmle/go/dataflow/ThreatModels/threat-models-flowtest3.expected
index 1937b4151ca..c3138596ac2 100644
--- a/go/ql/test/library-tests/semmle/go/dataflow/ThreatModels/threat-models-flowtest3.expected
+++ b/go/ql/test/library-tests/semmle/go/dataflow/ThreatModels/threat-models-flowtest3.expected
@@ -1,16 +1,16 @@
 models
-| 1 | Source: net/http; Request; true; URL; ; ; ; remote; manual |
-| 2 | Summary: net/url; URL; true; Query; ; ; Argument[receiver]; ReturnValue; taint; manual |
-| 3 | Summary: net/url; Values; true; Get; ; ; Argument[receiver]; ReturnValue; taint; manual |
-| 4 | Source: github.com/nonexistent/sources; ; false; ExecuteQuery; ; ; ReturnValue; database; manual |
-| 5 | Source: github.com/nonexistent/sources; ; false; ReadEnvironment; ; ; ReturnValue; environment; manual |
-| 6 | Source: github.com/nonexistent/sources; ; false; GetCliArg; ; ; ReturnValue; commandargs; manual |
+| 1 | Source: github.com/nonexistent/sources; ; false; ExecuteQuery; ; ; ReturnValue; database; manual |
+| 2 | Source: github.com/nonexistent/sources; ; false; GetCliArg; ; ; ReturnValue; commandargs; manual |
+| 3 | Source: github.com/nonexistent/sources; ; false; ReadEnvironment; ; ; ReturnValue; environment; manual |
+| 4 | Source: net/http; Request; true; URL; ; ; ; remote; manual |
+| 5 | Summary: net/url; URL; true; Query; ; ; Argument[receiver]; ReturnValue; taint; manual |
+| 6 | Summary: net/url; Values; true; Get; ; ; Argument[receiver]; ReturnValue; taint; manual |
 edges
-| test.go:9:10:9:40 | call to ReadEnvironment | test.go:11:7:11:29 | ...+... | provenance | Src:MaD:5  |
-| test.go:15:9:15:32 | call to GetCliArg | test.go:17:7:17:28 | ...+... | provenance | Src:MaD:6  |
-| test.go:27:11:27:63 | call to ExecuteQuery | test.go:28:7:28:11 | query | provenance | Src:MaD:4  |
-| test.go:32:11:32:15 | selection of URL | test.go:32:11:32:23 | call to Query | provenance | Src:MaD:1 MaD:2 |
-| test.go:32:11:32:23 | call to Query | test.go:32:11:32:36 | call to Get | provenance | MaD:3 |
+| test.go:9:10:9:40 | call to ReadEnvironment | test.go:11:7:11:29 | ...+... | provenance | Src:MaD:3  |
+| test.go:15:9:15:32 | call to GetCliArg | test.go:17:7:17:28 | ...+... | provenance | Src:MaD:2  |
+| test.go:27:11:27:63 | call to ExecuteQuery | test.go:28:7:28:11 | query | provenance | Src:MaD:1  |
+| test.go:32:11:32:15 | selection of URL | test.go:32:11:32:23 | call to Query | provenance | Src:MaD:4 MaD:5 |
+| test.go:32:11:32:23 | call to Query | test.go:32:11:32:36 | call to Get | provenance | MaD:6 |
 | test.go:32:11:32:36 | call to Get | test.go:34:7:34:30 | ...+... | provenance |  |
 nodes
 | test.go:9:10:9:40 | call to ReadEnvironment | semmle.label | call to ReadEnvironment |
diff --git a/go/ql/test/library-tests/semmle/go/dataflow/ThreatModels/threat-models-flowtest3.ext.yml b/go/ql/test/library-tests/semmle/go/dataflow/ThreatModels/threat-models-flowtest3.ext.yml
index 2c8e9d2530f..bb7762a5467 100644
--- a/go/ql/test/library-tests/semmle/go/dataflow/ThreatModels/threat-models-flowtest3.ext.yml
+++ b/go/ql/test/library-tests/semmle/go/dataflow/ThreatModels/threat-models-flowtest3.ext.yml
@@ -14,4 +14,3 @@ extensions:
       - ["github.com/nonexistent/sources", "", False, "ReadEnvironment", "", "", "ReturnValue", "environment", "manual"]
       - ["github.com/nonexistent/sources", "", False, "GetCustom", "", "", "ReturnValue", "custom", "manual"]
       - ["github.com/nonexistent/sources", "", False, "GetCliArg", "", "", "ReturnValue", "commandargs", "manual"]
-
diff --git a/go/ql/test/library-tests/semmle/go/dataflow/ThreatModels/threat-models-flowtest4.expected b/go/ql/test/library-tests/semmle/go/dataflow/ThreatModels/threat-models-flowtest4.expected
index a1fc6350c64..37db602757c 100644
--- a/go/ql/test/library-tests/semmle/go/dataflow/ThreatModels/threat-models-flowtest4.expected
+++ b/go/ql/test/library-tests/semmle/go/dataflow/ThreatModels/threat-models-flowtest4.expected
@@ -1,18 +1,18 @@
 models
-| 1 | Source: net/http; Request; true; URL; ; ; ; remote; manual |
-| 2 | Summary: net/url; URL; true; Query; ; ; Argument[receiver]; ReturnValue; taint; manual |
-| 3 | Summary: net/url; Values; true; Get; ; ; Argument[receiver]; ReturnValue; taint; manual |
-| 4 | Source: github.com/nonexistent/sources; ; false; ExecuteQuery; ; ; ReturnValue; database; manual |
-| 5 | Source: github.com/nonexistent/sources; ; false; ReadEnvironment; ; ; ReturnValue; environment; manual |
-| 6 | Source: github.com/nonexistent/sources; ; false; GetCustom; ; ; ReturnValue; custom; manual |
-| 7 | Source: github.com/nonexistent/sources; ; false; GetCliArg; ; ; ReturnValue; commandargs; manual |
+| 1 | Source: github.com/nonexistent/sources; ; false; ExecuteQuery; ; ; ReturnValue; database; manual |
+| 2 | Source: github.com/nonexistent/sources; ; false; GetCliArg; ; ; ReturnValue; commandargs; manual |
+| 3 | Source: github.com/nonexistent/sources; ; false; GetCustom; ; ; ReturnValue; custom; manual |
+| 4 | Source: github.com/nonexistent/sources; ; false; ReadEnvironment; ; ; ReturnValue; environment; manual |
+| 5 | Source: net/http; Request; true; URL; ; ; ; remote; manual |
+| 6 | Summary: net/url; URL; true; Query; ; ; Argument[receiver]; ReturnValue; taint; manual |
+| 7 | Summary: net/url; Values; true; Get; ; ; Argument[receiver]; ReturnValue; taint; manual |
 edges
-| test.go:9:10:9:40 | call to ReadEnvironment | test.go:11:7:11:29 | ...+... | provenance | Src:MaD:5  |
-| test.go:15:9:15:32 | call to GetCliArg | test.go:17:7:17:28 | ...+... | provenance | Src:MaD:7  |
-| test.go:21:11:21:36 | call to GetCustom | test.go:23:7:23:30 | ...+... | provenance | Src:MaD:6  |
-| test.go:27:11:27:63 | call to ExecuteQuery | test.go:28:7:28:11 | query | provenance | Src:MaD:4  |
-| test.go:32:11:32:15 | selection of URL | test.go:32:11:32:23 | call to Query | provenance | Src:MaD:1 MaD:2 |
-| test.go:32:11:32:23 | call to Query | test.go:32:11:32:36 | call to Get | provenance | MaD:3 |
+| test.go:9:10:9:40 | call to ReadEnvironment | test.go:11:7:11:29 | ...+... | provenance | Src:MaD:4  |
+| test.go:15:9:15:32 | call to GetCliArg | test.go:17:7:17:28 | ...+... | provenance | Src:MaD:2  |
+| test.go:21:11:21:36 | call to GetCustom | test.go:23:7:23:30 | ...+... | provenance | Src:MaD:3  |
+| test.go:27:11:27:63 | call to ExecuteQuery | test.go:28:7:28:11 | query | provenance | Src:MaD:1  |
+| test.go:32:11:32:15 | selection of URL | test.go:32:11:32:23 | call to Query | provenance | Src:MaD:5 MaD:6 |
+| test.go:32:11:32:23 | call to Query | test.go:32:11:32:36 | call to Get | provenance | MaD:7 |
 | test.go:32:11:32:36 | call to Get | test.go:34:7:34:30 | ...+... | provenance |  |
 nodes
 | test.go:9:10:9:40 | call to ReadEnvironment | semmle.label | call to ReadEnvironment |
diff --git a/go/ql/test/library-tests/semmle/go/dataflow/ThreatModels/threat-models-flowtest4.ext.yml b/go/ql/test/library-tests/semmle/go/dataflow/ThreatModels/threat-models-flowtest4.ext.yml
index acac1a4e4f0..4754b0ef1f5 100644
--- a/go/ql/test/library-tests/semmle/go/dataflow/ThreatModels/threat-models-flowtest4.ext.yml
+++ b/go/ql/test/library-tests/semmle/go/dataflow/ThreatModels/threat-models-flowtest4.ext.yml
@@ -14,4 +14,3 @@ extensions:
       - ["github.com/nonexistent/sources", "", False, "ReadEnvironment", "", "", "ReturnValue", "environment", "manual"]
       - ["github.com/nonexistent/sources", "", False, "GetCustom", "", "", "ReturnValue", "custom", "manual"]
       - ["github.com/nonexistent/sources", "", False, "GetCliArg", "", "", "ReturnValue", "commandargs", "manual"]
-
diff --git a/go/ql/test/library-tests/semmle/go/dataflow/ThreatModels/threat-models-flowtest5.expected b/go/ql/test/library-tests/semmle/go/dataflow/ThreatModels/threat-models-flowtest5.expected
index 6566430af63..92b35dc609b 100644
--- a/go/ql/test/library-tests/semmle/go/dataflow/ThreatModels/threat-models-flowtest5.expected
+++ b/go/ql/test/library-tests/semmle/go/dataflow/ThreatModels/threat-models-flowtest5.expected
@@ -1,14 +1,14 @@
 models
-| 1 | Source: net/http; Request; true; URL; ; ; ; remote; manual |
-| 2 | Summary: net/url; URL; true; Query; ; ; Argument[receiver]; ReturnValue; taint; manual |
-| 3 | Summary: net/url; Values; true; Get; ; ; Argument[receiver]; ReturnValue; taint; manual |
-| 4 | Source: github.com/nonexistent/sources; ; false; ReadEnvironment; ; ; ReturnValue; environment; manual |
-| 5 | Source: github.com/nonexistent/sources; ; false; GetCliArg; ; ; ReturnValue; commandargs; manual |
+| 1 | Source: github.com/nonexistent/sources; ; false; GetCliArg; ; ; ReturnValue; commandargs; manual |
+| 2 | Source: github.com/nonexistent/sources; ; false; ReadEnvironment; ; ; ReturnValue; environment; manual |
+| 3 | Source: net/http; Request; true; URL; ; ; ; remote; manual |
+| 4 | Summary: net/url; URL; true; Query; ; ; Argument[receiver]; ReturnValue; taint; manual |
+| 5 | Summary: net/url; Values; true; Get; ; ; Argument[receiver]; ReturnValue; taint; manual |
 edges
-| test.go:9:10:9:40 | call to ReadEnvironment | test.go:11:7:11:29 | ...+... | provenance | Src:MaD:4  |
-| test.go:15:9:15:32 | call to GetCliArg | test.go:17:7:17:28 | ...+... | provenance | Src:MaD:5  |
-| test.go:32:11:32:15 | selection of URL | test.go:32:11:32:23 | call to Query | provenance | Src:MaD:1 MaD:2 |
-| test.go:32:11:32:23 | call to Query | test.go:32:11:32:36 | call to Get | provenance | MaD:3 |
+| test.go:9:10:9:40 | call to ReadEnvironment | test.go:11:7:11:29 | ...+... | provenance | Src:MaD:2  |
+| test.go:15:9:15:32 | call to GetCliArg | test.go:17:7:17:28 | ...+... | provenance | Src:MaD:1  |
+| test.go:32:11:32:15 | selection of URL | test.go:32:11:32:23 | call to Query | provenance | Src:MaD:3 MaD:4 |
+| test.go:32:11:32:23 | call to Query | test.go:32:11:32:36 | call to Get | provenance | MaD:5 |
 | test.go:32:11:32:36 | call to Get | test.go:34:7:34:30 | ...+... | provenance |  |
 nodes
 | test.go:9:10:9:40 | call to ReadEnvironment | semmle.label | call to ReadEnvironment |
diff --git a/go/ql/test/library-tests/semmle/go/dataflow/ThreatModels/threat-models-flowtest5.ext.yml b/go/ql/test/library-tests/semmle/go/dataflow/ThreatModels/threat-models-flowtest5.ext.yml
index c61a23e0e64..713491d492e 100644
--- a/go/ql/test/library-tests/semmle/go/dataflow/ThreatModels/threat-models-flowtest5.ext.yml
+++ b/go/ql/test/library-tests/semmle/go/dataflow/ThreatModels/threat-models-flowtest5.ext.yml
@@ -15,4 +15,3 @@ extensions:
       - ["github.com/nonexistent/sources", "", False, "ReadEnvironment", "", "", "ReturnValue", "environment", "manual"]
       - ["github.com/nonexistent/sources", "", False, "GetCustom", "", "", "ReturnValue", "custom", "manual"]
       - ["github.com/nonexistent/sources", "", False, "GetCliArg", "", "", "ReturnValue", "commandargs", "manual"]
-
diff --git a/go/ql/test/library-tests/semmle/go/dataflow/ThreatModels/threat-models-flowtest6.expected b/go/ql/test/library-tests/semmle/go/dataflow/ThreatModels/threat-models-flowtest6.expected
index 19a8eb77b6b..a5a23bd0725 100644
--- a/go/ql/test/library-tests/semmle/go/dataflow/ThreatModels/threat-models-flowtest6.expected
+++ b/go/ql/test/library-tests/semmle/go/dataflow/ThreatModels/threat-models-flowtest6.expected
@@ -1,14 +1,14 @@
 models
-| 1 | Source: net/http; Request; true; URL; ; ; ; remote; manual |
-| 2 | Summary: net/url; URL; true; Query; ; ; Argument[receiver]; ReturnValue; taint; manual |
-| 3 | Summary: net/url; Values; true; Get; ; ; Argument[receiver]; ReturnValue; taint; manual |
-| 4 | Source: github.com/nonexistent/sources; ; false; ExecuteQuery; ; ; ReturnValue; database; manual |
-| 5 | Source: github.com/nonexistent/sources; ; false; GetCliArg; ; ; ReturnValue; commandargs; manual |
+| 1 | Source: github.com/nonexistent/sources; ; false; ExecuteQuery; ; ; ReturnValue; database; manual |
+| 2 | Source: github.com/nonexistent/sources; ; false; GetCliArg; ; ; ReturnValue; commandargs; manual |
+| 3 | Source: net/http; Request; true; URL; ; ; ; remote; manual |
+| 4 | Summary: net/url; URL; true; Query; ; ; Argument[receiver]; ReturnValue; taint; manual |
+| 5 | Summary: net/url; Values; true; Get; ; ; Argument[receiver]; ReturnValue; taint; manual |
 edges
-| test.go:15:9:15:32 | call to GetCliArg | test.go:17:7:17:28 | ...+... | provenance | Src:MaD:5  |
-| test.go:27:11:27:63 | call to ExecuteQuery | test.go:28:7:28:11 | query | provenance | Src:MaD:4  |
-| test.go:32:11:32:15 | selection of URL | test.go:32:11:32:23 | call to Query | provenance | Src:MaD:1 MaD:2 |
-| test.go:32:11:32:23 | call to Query | test.go:32:11:32:36 | call to Get | provenance | MaD:3 |
+| test.go:15:9:15:32 | call to GetCliArg | test.go:17:7:17:28 | ...+... | provenance | Src:MaD:2  |
+| test.go:27:11:27:63 | call to ExecuteQuery | test.go:28:7:28:11 | query | provenance | Src:MaD:1  |
+| test.go:32:11:32:15 | selection of URL | test.go:32:11:32:23 | call to Query | provenance | Src:MaD:3 MaD:4 |
+| test.go:32:11:32:23 | call to Query | test.go:32:11:32:36 | call to Get | provenance | MaD:5 |
 | test.go:32:11:32:36 | call to Get | test.go:34:7:34:30 | ...+... | provenance |  |
 nodes
 | test.go:15:9:15:32 | call to GetCliArg | semmle.label | call to GetCliArg |
diff --git a/go/ql/test/library-tests/semmle/go/dataflow/flowsources/local/environment/test.ql b/go/ql/test/library-tests/semmle/go/dataflow/flowsources/local/environment/test.ql
index db6bbb1a2d1..eb7ba46508e 100644
--- a/go/ql/test/library-tests/semmle/go/dataflow/flowsources/local/environment/test.ql
+++ b/go/ql/test/library-tests/semmle/go/dataflow/flowsources/local/environment/test.ql
@@ -6,7 +6,7 @@ module SourceTest implements TestSig {
   string getARelevantTag() { result = "source" }
 
   predicate hasActualResult(Location location, string element, string tag, string value) {
-    exists(ThreatModelFlowSource s |
+    exists(ActiveThreatModelSource s |
       s.hasLocationInfo(location.getFile().getAbsolutePath(), location.getStartLine(),
         location.getStartColumn(), location.getEndLine(), location.getEndColumn()) and
       element = s.toString() and
diff --git a/go/ql/test/library-tests/semmle/go/dataflow/flowsources/local/file/test.ql b/go/ql/test/library-tests/semmle/go/dataflow/flowsources/local/file/test.ql
index db6bbb1a2d1..eb7ba46508e 100644
--- a/go/ql/test/library-tests/semmle/go/dataflow/flowsources/local/file/test.ql
+++ b/go/ql/test/library-tests/semmle/go/dataflow/flowsources/local/file/test.ql
@@ -6,7 +6,7 @@ module SourceTest implements TestSig {
   string getARelevantTag() { result = "source" }
 
   predicate hasActualResult(Location location, string element, string tag, string value) {
-    exists(ThreatModelFlowSource s |
+    exists(ActiveThreatModelSource s |
       s.hasLocationInfo(location.getFile().getAbsolutePath(), location.getStartLine(),
         location.getStartColumn(), location.getEndLine(), location.getEndColumn()) and
       element = s.toString() and
diff --git a/go/ql/test/library-tests/semmle/go/dataflow/flowsources/local/stdin/go.mod b/go/ql/test/library-tests/semmle/go/dataflow/flowsources/local/stdin/go.mod
new file mode 100644
index 00000000000..2334541a2f0
--- /dev/null
+++ b/go/ql/test/library-tests/semmle/go/dataflow/flowsources/local/stdin/go.mod
@@ -0,0 +1,3 @@
+module test
+
+go 1.22.6
diff --git a/go/ql/test/library-tests/semmle/go/dataflow/flowsources/local/stdin/source.expected b/go/ql/test/library-tests/semmle/go/dataflow/flowsources/local/stdin/source.expected
new file mode 100644
index 00000000000..db33d6d2504
--- /dev/null
+++ b/go/ql/test/library-tests/semmle/go/dataflow/flowsources/local/stdin/source.expected
@@ -0,0 +1,3 @@
+testFailures
+invalidModelRow
+failures
diff --git a/go/ql/test/library-tests/semmle/go/dataflow/flowsources/local/stdin/source.ext.yml b/go/ql/test/library-tests/semmle/go/dataflow/flowsources/local/stdin/source.ext.yml
new file mode 100644
index 00000000000..92156e87f40
--- /dev/null
+++ b/go/ql/test/library-tests/semmle/go/dataflow/flowsources/local/stdin/source.ext.yml
@@ -0,0 +1,7 @@
+extensions:
+
+  - addsTo:
+      pack: codeql/threat-models
+      extensible: threatModelConfiguration
+    data:
+      - ["stdin", true, 0]
diff --git a/go/ql/test/library-tests/semmle/go/dataflow/flowsources/local/stdin/source.ql b/go/ql/test/library-tests/semmle/go/dataflow/flowsources/local/stdin/source.ql
new file mode 100644
index 00000000000..eb7ba46508e
--- /dev/null
+++ b/go/ql/test/library-tests/semmle/go/dataflow/flowsources/local/stdin/source.ql
@@ -0,0 +1,19 @@
+import go
+import ModelValidation
+import TestUtilities.InlineExpectationsTest
+
+module SourceTest implements TestSig {
+  string getARelevantTag() { result = "source" }
+
+  predicate hasActualResult(Location location, string element, string tag, string value) {
+    exists(ActiveThreatModelSource s |
+      s.hasLocationInfo(location.getFile().getAbsolutePath(), location.getStartLine(),
+        location.getStartColumn(), location.getEndLine(), location.getEndColumn()) and
+      element = s.toString() and
+      value = "" and
+      tag = "source"
+    )
+  }
+}
+
+import MakeTest<SourceTest>
diff --git a/go/ql/test/library-tests/semmle/go/dataflow/flowsources/local/stdin/test.expected b/go/ql/test/library-tests/semmle/go/dataflow/flowsources/local/stdin/test.expected
new file mode 100644
index 00000000000..55e9aed2e93
--- /dev/null
+++ b/go/ql/test/library-tests/semmle/go/dataflow/flowsources/local/stdin/test.expected
@@ -0,0 +1,2 @@
+testFailures
+invalidModelRow
diff --git a/go/ql/test/library-tests/semmle/go/dataflow/flowsources/local/stdin/test.ext.yml b/go/ql/test/library-tests/semmle/go/dataflow/flowsources/local/stdin/test.ext.yml
new file mode 100644
index 00000000000..92156e87f40
--- /dev/null
+++ b/go/ql/test/library-tests/semmle/go/dataflow/flowsources/local/stdin/test.ext.yml
@@ -0,0 +1,7 @@
+extensions:
+
+  - addsTo:
+      pack: codeql/threat-models
+      extensible: threatModelConfiguration
+    data:
+      - ["stdin", true, 0]
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
new file mode 100644
index 00000000000..4166dc4000b
--- /dev/null
+++ b/go/ql/test/library-tests/semmle/go/dataflow/flowsources/local/stdin/test.go
@@ -0,0 +1,48 @@
+package test
+
+import (
+	"bufio"
+	"fmt"
+	"os"
+)
+
+func sink(string) {
+
+}
+
+func readStdinBuffer() {
+	buf := make([]byte, 1024)
+	n, err := os.Stdin.Read(buf) // $source
+	if err != nil {
+		return
+	}
+	sink(string(buf[:n])) // $hasTaintFlow="type conversion"
+}
+
+func readStdinBuffReader() {
+	buf := make([]byte, 1024)
+	r := bufio.NewReader(os.Stdin) // $source
+	n, err := r.Read(buf)
+	if err != nil {
+		return
+	}
+	sink(string(buf[:n])) // $hasTaintFlow="type conversion"
+}
+
+func scan() {
+	var username, email string
+	fmt.Scan(&username, &email) // $source
+	sink(username)              // $hasTaintFlow="username"
+}
+
+func scanf() {
+	var s string
+	fmt.Scanf("%s", &s) // $source
+	sink(s)             // $hasTaintFlow="s"
+}
+
+func scanl() {
+	var s string
+	fmt.Scanln(&s) // $source
+	sink(s)        // $hasTaintFlow="s"
+}
diff --git a/go/ql/test/library-tests/semmle/go/dataflow/flowsources/local/stdin/test.ql b/go/ql/test/library-tests/semmle/go/dataflow/flowsources/local/stdin/test.ql
new file mode 100644
index 00000000000..5cdebdbc6c9
--- /dev/null
+++ b/go/ql/test/library-tests/semmle/go/dataflow/flowsources/local/stdin/test.ql
@@ -0,0 +1,15 @@
+import go
+import semmle.go.dataflow.ExternalFlow
+import ModelValidation
+import experimental.frameworks.CleverGo
+import TestUtilities.InlineFlowTest
+
+module Config implements DataFlow::ConfigSig {
+  predicate isSource(DataFlow::Node source) { source instanceof ActiveThreatModelSource }
+
+  predicate isSink(DataFlow::Node sink) {
+    sink.asExpr() = any(CallExpr c | c.getTarget().getName() = "sink").getArgument(0)
+  }
+}
+
+import TaintFlowTest<Config>
diff --git a/go/ql/test/library-tests/semmle/go/frameworks/Beego/ReflectedXss.expected b/go/ql/test/library-tests/semmle/go/frameworks/Beego/ReflectedXss.expected
index be6bc68e877..aa0345f221e 100644
--- a/go/ql/test/library-tests/semmle/go/frameworks/Beego/ReflectedXss.expected
+++ b/go/ql/test/library-tests/semmle/go/frameworks/Beego/ReflectedXss.expected
@@ -53,149 +53,149 @@
 | test.go:311:21:311:48 | type assertion | test.go:309:15:309:36 | call to GetString | test.go:311:21:311:48 | type assertion | Cross-site scripting vulnerability due to $@. | test.go:309:15:309:36 | call to GetString | user-provided value | test.go:0:0:0:0 | test.go |  |
 | test.go:312:21:312:52 | type assertion | test.go:309:15:309:36 | call to GetString | test.go:312:21:312:52 | type assertion | Cross-site scripting vulnerability due to $@. | test.go:309:15:309:36 | call to GetString | user-provided value | test.go:0:0:0:0 | test.go |  |
 edges
-| test.go:33:6:33:10 | definition of bound | test.go:35:13:35:30 | type conversion | provenance | Src:MaD:14  |
-| test.go:33:6:33:10 | definition of bound | test.go:36:13:36:27 | type conversion | provenance | Src:MaD:14  |
-| test.go:33:6:33:10 | definition of bound | test.go:37:13:37:29 | type conversion | provenance | Src:MaD:14  |
-| test.go:42:20:42:42 | call to Cookie | test.go:42:13:42:43 | type conversion | provenance | Src:MaD:15  |
-| test.go:47:20:47:31 | call to Data | test.go:47:13:47:52 | type conversion | provenance | Src:MaD:16  |
-| test.go:52:20:52:43 | call to GetData | test.go:52:13:52:53 | type conversion | provenance | Src:MaD:17  |
-| test.go:57:20:57:42 | call to Header | test.go:57:13:57:43 | type conversion | provenance | Src:MaD:18  |
-| test.go:62:20:62:41 | call to Param | test.go:62:13:62:42 | type conversion | provenance | Src:MaD:19  |
-| test.go:67:20:67:33 | call to Params | test.go:67:13:67:45 | type conversion | provenance | Src:MaD:20  |
-| test.go:72:20:72:41 | call to Query | test.go:72:13:72:42 | type conversion | provenance | Src:MaD:21  |
-| test.go:77:20:77:32 | call to Refer | test.go:77:13:77:33 | type conversion | provenance | Src:MaD:22  |
-| test.go:82:20:82:34 | call to Referer | test.go:82:13:82:35 | type conversion | provenance | Src:MaD:23  |
-| test.go:87:20:87:30 | call to URI | test.go:87:13:87:31 | type conversion | provenance | Src:MaD:24  |
-| test.go:92:20:92:30 | call to URL | test.go:92:13:92:31 | type conversion | provenance | Src:MaD:25  |
-| test.go:97:20:97:36 | call to UserAgent | test.go:97:13:97:37 | type conversion | provenance | Src:MaD:26  |
-| test.go:102:14:102:25 | call to Data | test.go:102:14:102:45 | type assertion | provenance | Src:MaD:16  |
-| test.go:114:14:114:25 | call to Data | test.go:114:14:114:45 | type assertion | provenance | Src:MaD:16  |
-| test.go:126:14:126:25 | call to Data | test.go:126:14:126:45 | type assertion | provenance | Src:MaD:16  |
-| test.go:143:23:143:42 | call to Data | test.go:143:23:143:62 | type assertion | provenance | Src:MaD:16  |
-| test.go:199:15:199:26 | call to Data | test.go:200:36:200:53 | type assertion | provenance | Src:MaD:16  |
-| test.go:199:15:199:26 | call to Data | test.go:201:39:201:56 | type assertion | provenance | Src:MaD:16  |
-| test.go:199:15:199:26 | call to Data | test.go:202:28:202:56 | type assertion | provenance | Src:MaD:16  |
-| test.go:199:15:199:26 | call to Data | test.go:204:36:204:53 | type assertion | provenance | Src:MaD:16  |
-| test.go:199:15:199:26 | call to Data | test.go:205:34:205:51 | type assertion | provenance | Src:MaD:16  |
+| test.go:33:6:33:10 | definition of bound | test.go:35:13:35:30 | type conversion | provenance | Src:MaD:1  |
+| test.go:33:6:33:10 | definition of bound | test.go:36:13:36:27 | type conversion | provenance | Src:MaD:1  |
+| test.go:33:6:33:10 | definition of bound | test.go:37:13:37:29 | type conversion | provenance | Src:MaD:1  |
+| test.go:42:20:42:42 | call to Cookie | test.go:42:13:42:43 | type conversion | provenance | Src:MaD:2  |
+| test.go:47:20:47:31 | call to Data | test.go:47:13:47:52 | type conversion | provenance | Src:MaD:3  |
+| test.go:52:20:52:43 | call to GetData | test.go:52:13:52:53 | type conversion | provenance | Src:MaD:4  |
+| test.go:57:20:57:42 | call to Header | test.go:57:13:57:43 | type conversion | provenance | Src:MaD:5  |
+| test.go:62:20:62:41 | call to Param | test.go:62:13:62:42 | type conversion | provenance | Src:MaD:6  |
+| test.go:67:20:67:33 | call to Params | test.go:67:13:67:45 | type conversion | provenance | Src:MaD:7  |
+| test.go:72:20:72:41 | call to Query | test.go:72:13:72:42 | type conversion | provenance | Src:MaD:8  |
+| test.go:77:20:77:32 | call to Refer | test.go:77:13:77:33 | type conversion | provenance | Src:MaD:9  |
+| test.go:82:20:82:34 | call to Referer | test.go:82:13:82:35 | type conversion | provenance | Src:MaD:10  |
+| test.go:87:20:87:30 | call to URI | test.go:87:13:87:31 | type conversion | provenance | Src:MaD:11  |
+| test.go:92:20:92:30 | call to URL | test.go:92:13:92:31 | type conversion | provenance | Src:MaD:12  |
+| test.go:97:20:97:36 | call to UserAgent | test.go:97:13:97:37 | type conversion | provenance | Src:MaD:13  |
+| test.go:102:14:102:25 | call to Data | test.go:102:14:102:45 | type assertion | provenance | Src:MaD:3  |
+| test.go:114:14:114:25 | call to Data | test.go:114:14:114:45 | type assertion | provenance | Src:MaD:3  |
+| test.go:126:14:126:25 | call to Data | test.go:126:14:126:45 | type assertion | provenance | Src:MaD:3  |
+| test.go:143:23:143:42 | call to Data | test.go:143:23:143:62 | type assertion | provenance | Src:MaD:3  |
+| test.go:199:15:199:26 | call to Data | test.go:200:36:200:53 | type assertion | provenance | Src:MaD:3  |
+| test.go:199:15:199:26 | call to Data | test.go:201:39:201:56 | type assertion | provenance | Src:MaD:3  |
+| test.go:199:15:199:26 | call to Data | test.go:202:28:202:56 | type assertion | provenance | Src:MaD:3  |
+| test.go:199:15:199:26 | call to Data | test.go:204:36:204:53 | type assertion | provenance | Src:MaD:3  |
+| test.go:199:15:199:26 | call to Data | test.go:205:34:205:51 | type assertion | provenance | Src:MaD:3  |
 | test.go:200:21:200:54 | call to HTML2str | test.go:200:14:200:55 | type conversion | provenance |  |
-| test.go:200:36:200:53 | type assertion | test.go:200:21:200:54 | call to HTML2str | provenance | MaD:28 |
+| test.go:200:36:200:53 | type assertion | test.go:200:21:200:54 | call to HTML2str | provenance | MaD:35 |
 | test.go:201:21:201:57 | call to Htmlunquote | test.go:201:14:201:58 | type conversion | provenance |  |
-| test.go:201:39:201:56 | type assertion | test.go:201:21:201:57 | call to Htmlunquote | provenance | MaD:29 |
+| test.go:201:39:201:56 | type assertion | test.go:201:21:201:57 | call to Htmlunquote | provenance | MaD:36 |
 | test.go:202:2:202:68 | ... := ...[0] | test.go:203:14:203:28 | type assertion | provenance |  |
-| test.go:202:28:202:56 | type assertion | test.go:202:2:202:68 | ... := ...[0] | provenance | MaD:30 |
+| test.go:202:28:202:56 | type assertion | test.go:202:2:202:68 | ... := ...[0] | provenance | MaD:37 |
 | test.go:204:21:204:54 | call to Str2html | test.go:204:14:204:55 | type conversion | provenance |  |
-| test.go:204:36:204:53 | type assertion | test.go:204:21:204:54 | call to Str2html | provenance | MaD:32 |
+| test.go:204:36:204:53 | type assertion | test.go:204:21:204:54 | call to Str2html | provenance | MaD:39 |
 | test.go:205:21:205:58 | call to Substr | test.go:205:14:205:59 | type conversion | provenance |  |
-| test.go:205:34:205:51 | type assertion | test.go:205:21:205:58 | call to Substr | provenance | MaD:33 |
+| test.go:205:34:205:51 | type assertion | test.go:205:21:205:58 | call to Substr | provenance | MaD:40 |
 | test.go:207:6:207:6 | definition of s | test.go:209:14:209:28 | type conversion | provenance |  |
-| test.go:208:18:208:33 | selection of Form | test.go:207:6:207:6 | definition of s | provenance | Src:MaD:41 MaD:31 |
-| test.go:223:2:223:34 | ... := ...[0] | test.go:225:31:225:31 | f | provenance | Src:MaD:35  |
-| test.go:223:2:223:34 | ... := ...[1] | test.go:224:14:224:32 | type conversion | provenance | Src:MaD:35  |
+| test.go:208:18:208:33 | selection of Form | test.go:207:6:207:6 | definition of s | provenance | Src:MaD:21 MaD:38 |
+| test.go:223:2:223:34 | ... := ...[0] | test.go:225:31:225:31 | f | provenance | Src:MaD:15  |
+| test.go:223:2:223:34 | ... := ...[1] | test.go:224:14:224:32 | type conversion | provenance | Src:MaD:15  |
 | test.go:225:2:225:32 | ... := ...[0] | test.go:226:14:226:20 | content | provenance |  |
-| test.go:225:31:225:31 | f | test.go:225:2:225:32 | ... := ...[0] | provenance | MaD:40 |
-| test.go:228:2:228:40 | ... := ...[0] | test.go:229:14:229:38 | type conversion | provenance | Src:MaD:36  |
-| test.go:231:7:231:28 | call to GetString | test.go:232:14:232:22 | type conversion | provenance | Src:MaD:37  |
-| test.go:234:8:234:35 | call to GetStrings | test.go:235:14:235:26 | type conversion | provenance | Src:MaD:38  |
-| test.go:237:9:237:17 | call to Input | test.go:238:14:238:27 | type conversion | provenance | Src:MaD:39  |
-| test.go:240:6:240:8 | definition of str | test.go:242:14:242:30 | type conversion | provenance | Src:MaD:34  |
-| test.go:246:15:246:36 | call to GetString | test.go:249:21:249:29 | untrusted | provenance | Src:MaD:37  |
-| test.go:259:23:259:44 | call to GetCookie | test.go:259:16:259:45 | type conversion | provenance | Src:MaD:27  |
-| test.go:270:62:270:83 | call to GetCookie | test.go:270:55:270:84 | type conversion | provenance | Src:MaD:27  |
-| test.go:275:2:275:40 | ... := ...[0] | test.go:278:21:278:28 | index expression | provenance | Src:MaD:36  |
-| test.go:275:2:275:40 | ... := ...[0] | test.go:283:44:283:60 | selection of Filename | provenance | Src:MaD:36  |
-| test.go:275:2:275:40 | ... := ...[0] | test.go:284:38:284:49 | genericFiles | provenance | Src:MaD:36  |
-| test.go:275:2:275:40 | ... := ...[0] | test.go:285:37:285:48 | genericFiles | provenance | Src:MaD:36  |
-| test.go:275:2:275:40 | ... := ...[0] | test.go:291:4:291:15 | genericFiles | provenance | Src:MaD:36  |
-| test.go:275:2:275:40 | ... := ...[0] | test.go:293:42:293:53 | genericFiles | provenance | Src:MaD:36  |
-| test.go:275:2:275:40 | ... := ...[0] | test.go:294:53:294:64 | genericFiles | provenance | Src:MaD:36  |
-| test.go:275:2:275:40 | ... := ...[0] | test.go:295:38:295:49 | genericFiles | provenance | Src:MaD:36  |
-| test.go:275:2:275:40 | ... := ...[0] | test.go:296:49:296:60 | genericFiles | provenance | Src:MaD:36  |
-| test.go:275:2:275:40 | ... := ...[0] | test.go:297:51:297:65 | index expression | provenance | Src:MaD:36  |
-| test.go:275:2:275:40 | ... := ...[0] | test.go:298:36:298:47 | genericFiles | provenance | Src:MaD:36  |
-| test.go:275:2:275:40 | ... := ...[0] | test.go:299:37:299:48 | genericFiles | provenance | Src:MaD:36  |
-| test.go:275:2:275:40 | ... := ...[0] | test.go:301:39:301:50 | genericFiles | provenance | Src:MaD:36  |
-| test.go:275:2:275:40 | ... := ...[0] | test.go:302:40:302:51 | genericFiles | provenance | Src:MaD:36  |
-| test.go:275:2:275:40 | ... := ...[0] | test.go:303:39:303:50 | genericFiles | provenance | Src:MaD:36  |
+| test.go:225:31:225:31 | f | test.go:225:2:225:32 | ... := ...[0] | provenance | MaD:41 |
+| test.go:228:2:228:40 | ... := ...[0] | test.go:229:14:229:38 | type conversion | provenance | Src:MaD:16  |
+| test.go:231:7:231:28 | call to GetString | test.go:232:14:232:22 | type conversion | provenance | Src:MaD:17  |
+| test.go:234:8:234:35 | call to GetStrings | test.go:235:14:235:26 | type conversion | provenance | Src:MaD:18  |
+| test.go:237:9:237:17 | call to Input | test.go:238:14:238:27 | type conversion | provenance | Src:MaD:19  |
+| test.go:240:6:240:8 | definition of str | test.go:242:14:242:30 | type conversion | provenance | Src:MaD:20  |
+| test.go:246:15:246:36 | call to GetString | test.go:249:21:249:29 | untrusted | provenance | Src:MaD:17  |
+| test.go:259:23:259:44 | call to GetCookie | test.go:259:16:259:45 | type conversion | provenance | Src:MaD:14  |
+| test.go:270:62:270:83 | call to GetCookie | test.go:270:55:270:84 | type conversion | provenance | Src:MaD:14  |
+| test.go:275:2:275:40 | ... := ...[0] | test.go:278:21:278:28 | index expression | provenance | Src:MaD:16  |
+| test.go:275:2:275:40 | ... := ...[0] | test.go:283:44:283:60 | selection of Filename | provenance | Src:MaD:16  |
+| test.go:275:2:275:40 | ... := ...[0] | test.go:284:38:284:49 | genericFiles | provenance | Src:MaD:16  |
+| test.go:275:2:275:40 | ... := ...[0] | test.go:285:37:285:48 | genericFiles | provenance | Src:MaD:16  |
+| test.go:275:2:275:40 | ... := ...[0] | test.go:291:4:291:15 | genericFiles | provenance | Src:MaD:16  |
+| test.go:275:2:275:40 | ... := ...[0] | test.go:293:42:293:53 | genericFiles | provenance | Src:MaD:16  |
+| test.go:275:2:275:40 | ... := ...[0] | test.go:294:53:294:64 | genericFiles | provenance | Src:MaD:16  |
+| test.go:275:2:275:40 | ... := ...[0] | test.go:295:38:295:49 | genericFiles | provenance | Src:MaD:16  |
+| test.go:275:2:275:40 | ... := ...[0] | test.go:296:49:296:60 | genericFiles | provenance | Src:MaD:16  |
+| test.go:275:2:275:40 | ... := ...[0] | test.go:297:51:297:65 | index expression | provenance | Src:MaD:16  |
+| test.go:275:2:275:40 | ... := ...[0] | test.go:298:36:298:47 | genericFiles | provenance | Src:MaD:16  |
+| test.go:275:2:275:40 | ... := ...[0] | test.go:299:37:299:48 | genericFiles | provenance | Src:MaD:16  |
+| test.go:275:2:275:40 | ... := ...[0] | test.go:301:39:301:50 | genericFiles | provenance | Src:MaD:16  |
+| test.go:275:2:275:40 | ... := ...[0] | test.go:302:40:302:51 | genericFiles | provenance | Src:MaD:16  |
+| test.go:275:2:275:40 | ... := ...[0] | test.go:303:39:303:50 | genericFiles | provenance | Src:MaD:16  |
 | test.go:276:2:276:13 | definition of genericFiles [array] | test.go:297:51:297:62 | genericFiles [array] | provenance |  |
 | test.go:278:21:278:28 | index expression | test.go:276:2:276:13 | definition of genericFiles [array] | provenance |  |
 | test.go:283:44:283:60 | selection of Filename | test.go:283:21:283:61 | call to GetDisplayString | provenance | FunctionModel |
 | test.go:284:21:284:53 | call to SliceChunk | test.go:284:21:284:92 | selection of Filename | provenance |  |
-| test.go:284:38:284:49 | genericFiles | test.go:284:21:284:53 | call to SliceChunk | provenance | MaD:1 |
+| test.go:284:38:284:49 | genericFiles | test.go:284:21:284:53 | call to SliceChunk | provenance | MaD:22 |
 | test.go:285:21:285:60 | call to SliceDiff | test.go:285:21:285:96 | selection of Filename | provenance |  |
-| test.go:285:37:285:48 | genericFiles | test.go:285:21:285:60 | call to SliceDiff | provenance | MaD:2 |
+| test.go:285:37:285:48 | genericFiles | test.go:285:21:285:60 | call to SliceDiff | provenance | MaD:23 |
 | test.go:290:3:292:44 | call to SliceFilter | test.go:290:3:292:80 | selection of Filename | provenance |  |
-| test.go:291:4:291:15 | genericFiles | test.go:290:3:292:44 | call to SliceFilter | provenance | MaD:3 |
+| test.go:291:4:291:15 | genericFiles | test.go:290:3:292:44 | call to SliceFilter | provenance | MaD:24 |
 | test.go:293:21:293:65 | call to SliceIntersect | test.go:293:21:293:101 | selection of Filename | provenance |  |
-| test.go:293:42:293:53 | genericFiles | test.go:293:21:293:65 | call to SliceIntersect | provenance | MaD:4 |
+| test.go:293:42:293:53 | genericFiles | test.go:293:21:293:65 | call to SliceIntersect | provenance | MaD:25 |
 | test.go:294:21:294:65 | call to SliceIntersect | test.go:294:21:294:101 | selection of Filename | provenance |  |
-| test.go:294:53:294:64 | genericFiles | test.go:294:21:294:65 | call to SliceIntersect | provenance | MaD:4 |
+| test.go:294:53:294:64 | genericFiles | test.go:294:21:294:65 | call to SliceIntersect | provenance | MaD:25 |
 | test.go:295:21:295:61 | call to SliceMerge | test.go:295:21:295:97 | selection of Filename | provenance |  |
-| test.go:295:38:295:49 | genericFiles | test.go:295:21:295:61 | call to SliceMerge | provenance | MaD:5 |
+| test.go:295:38:295:49 | genericFiles | test.go:295:21:295:61 | call to SliceMerge | provenance | MaD:26 |
 | test.go:296:21:296:61 | call to SliceMerge | test.go:296:21:296:97 | selection of Filename | provenance |  |
-| test.go:296:49:296:60 | genericFiles | test.go:296:21:296:61 | call to SliceMerge | provenance | MaD:5 |
+| test.go:296:49:296:60 | genericFiles | test.go:296:21:296:61 | call to SliceMerge | provenance | MaD:26 |
 | test.go:297:21:297:66 | call to SlicePad | test.go:297:21:297:102 | selection of Filename | provenance |  |
 | test.go:297:51:297:62 | genericFiles [array] | test.go:297:51:297:65 | index expression | provenance |  |
-| test.go:297:51:297:65 | index expression | test.go:297:21:297:66 | call to SlicePad | provenance | MaD:6 |
+| test.go:297:51:297:65 | index expression | test.go:297:21:297:66 | call to SlicePad | provenance | MaD:27 |
 | test.go:298:21:298:66 | call to SlicePad | test.go:298:21:298:102 | selection of Filename | provenance |  |
-| test.go:298:36:298:47 | genericFiles | test.go:298:21:298:66 | call to SlicePad | provenance | MaD:6 |
+| test.go:298:36:298:47 | genericFiles | test.go:298:21:298:66 | call to SlicePad | provenance | MaD:27 |
 | test.go:299:21:299:49 | call to SliceRand | test.go:299:21:299:82 | selection of Filename | provenance |  |
-| test.go:299:37:299:48 | genericFiles | test.go:299:21:299:49 | call to SliceRand | provenance | MaD:7 |
+| test.go:299:37:299:48 | genericFiles | test.go:299:21:299:49 | call to SliceRand | provenance | MaD:28 |
 | test.go:301:21:301:97 | call to SliceReduce | test.go:301:21:301:133 | selection of Filename | provenance |  |
-| test.go:301:39:301:50 | genericFiles | test.go:301:21:301:97 | call to SliceReduce | provenance | MaD:8 |
+| test.go:301:39:301:50 | genericFiles | test.go:301:21:301:97 | call to SliceReduce | provenance | MaD:29 |
 | test.go:302:21:302:52 | call to SliceShuffle | test.go:302:21:302:88 | selection of Filename | provenance |  |
-| test.go:302:40:302:51 | genericFiles | test.go:302:21:302:52 | call to SliceShuffle | provenance | MaD:9 |
+| test.go:302:40:302:51 | genericFiles | test.go:302:21:302:52 | call to SliceShuffle | provenance | MaD:30 |
 | test.go:303:21:303:51 | call to SliceUnique | test.go:303:21:303:87 | selection of Filename | provenance |  |
-| test.go:303:39:303:50 | genericFiles | test.go:303:21:303:51 | call to SliceUnique | provenance | MaD:10 |
+| test.go:303:39:303:50 | genericFiles | test.go:303:21:303:51 | call to SliceUnique | provenance | MaD:31 |
 | test.go:308:2:308:5 | definition of bMap | test.go:311:21:311:24 | bMap | provenance |  |
 | test.go:308:2:308:5 | definition of bMap | test.go:312:21:312:24 | bMap | provenance |  |
-| test.go:309:15:309:36 | call to GetString | test.go:310:22:310:30 | untrusted | provenance | Src:MaD:37  |
-| test.go:310:22:310:30 | untrusted | test.go:308:2:308:5 | definition of bMap | provenance | MaD:13 |
-| test.go:311:21:311:24 | bMap | test.go:311:21:311:39 | call to Get | provenance | MaD:11 |
+| test.go:309:15:309:36 | call to GetString | test.go:310:22:310:30 | untrusted | provenance | Src:MaD:17  |
+| test.go:310:22:310:30 | untrusted | test.go:308:2:308:5 | definition of bMap | provenance | MaD:34 |
+| test.go:311:21:311:24 | bMap | test.go:311:21:311:39 | call to Get | provenance | MaD:32 |
 | test.go:311:21:311:39 | call to Get | test.go:311:21:311:48 | type assertion | provenance |  |
-| test.go:312:21:312:24 | bMap | test.go:312:21:312:32 | call to Items | provenance | MaD:12 |
+| test.go:312:21:312:24 | bMap | test.go:312:21:312:32 | call to Items | provenance | MaD:33 |
 | test.go:312:21:312:32 | call to Items | test.go:312:21:312:52 | type assertion | provenance |  |
 models
-| 1 | Summary: group:beego-utils; ; false; SliceChunk; ; ; Argument[0]; ReturnValue; taint; manual |
-| 2 | Summary: group:beego-utils; ; false; SliceDiff; ; ; Argument[0]; ReturnValue; taint; manual |
-| 3 | Summary: group:beego-utils; ; false; SliceFilter; ; ; Argument[0]; ReturnValue; taint; manual |
-| 4 | Summary: group:beego-utils; ; false; SliceIntersect; ; ; Argument[0..1]; ReturnValue; taint; manual |
-| 5 | Summary: group:beego-utils; ; false; SliceMerge; ; ; Argument[0..1]; ReturnValue; taint; manual |
-| 6 | Summary: group:beego-utils; ; false; SlicePad; ; ; Argument[0..2]; ReturnValue; taint; manual |
-| 7 | Summary: group:beego-utils; ; false; SliceRand; ; ; Argument[0]; ReturnValue; taint; manual |
-| 8 | Summary: group:beego-utils; ; false; SliceReduce; ; ; Argument[0]; ReturnValue; taint; manual |
-| 9 | Summary: group:beego-utils; ; false; SliceShuffle; ; ; Argument[0]; ReturnValue; taint; manual |
-| 10 | Summary: group:beego-utils; ; false; SliceUnique; ; ; Argument[0]; ReturnValue; taint; manual |
-| 11 | Summary: group:beego-utils; BeeMap; true; Get; ; ; Argument[receiver]; ReturnValue; taint; manual |
-| 12 | Summary: group:beego-utils; BeeMap; true; Items; ; ; Argument[receiver]; ReturnValue; taint; manual |
-| 13 | Summary: group:beego-utils; BeeMap; true; Set; ; ; Argument[1]; Argument[receiver]; taint; manual |
-| 14 | Source: group:beego-context; BeegoInput; true; Bind; ; ; Argument[0]; remote; manual |
-| 15 | Source: group:beego-context; BeegoInput; true; Cookie; ; ; ReturnValue[0]; remote; manual |
-| 16 | Source: group:beego-context; BeegoInput; true; Data; ; ; ReturnValue[0]; remote; manual |
-| 17 | Source: group:beego-context; BeegoInput; true; GetData; ; ; ReturnValue[0]; remote; manual |
-| 18 | Source: group:beego-context; BeegoInput; true; Header; ; ; ReturnValue[0]; remote; manual |
-| 19 | Source: group:beego-context; BeegoInput; true; Param; ; ; ReturnValue[0]; remote; manual |
-| 20 | Source: group:beego-context; BeegoInput; true; Params; ; ; ReturnValue[0]; remote; manual |
-| 21 | Source: group:beego-context; BeegoInput; true; Query; ; ; ReturnValue[0]; remote; manual |
-| 22 | Source: group:beego-context; BeegoInput; true; Refer; ; ; ReturnValue[0]; remote; manual |
-| 23 | Source: group:beego-context; BeegoInput; true; Referer; ; ; ReturnValue[0]; remote; manual |
-| 24 | Source: group:beego-context; BeegoInput; true; URI; ; ; ReturnValue[0]; remote; manual |
-| 25 | Source: group:beego-context; BeegoInput; true; URL; ; ; ReturnValue[0]; remote; manual |
-| 26 | Source: group:beego-context; BeegoInput; true; UserAgent; ; ; ReturnValue[0]; remote; manual |
-| 27 | Source: group:beego-context; Context; true; GetCookie; ; ; ReturnValue; remote; manual |
-| 28 | Summary: group:beego; ; false; HTML2str; ; ; Argument[0]; ReturnValue; taint; manual |
-| 29 | Summary: group:beego; ; false; Htmlunquote; ; ; Argument[0]; ReturnValue; taint; manual |
-| 30 | Summary: group:beego; ; false; MapGet; ; ; Argument[0]; ReturnValue[0]; taint; manual |
-| 31 | Summary: group:beego; ; false; ParseForm; ; ; Argument[0]; Argument[1]; taint; manual |
-| 32 | Summary: group:beego; ; false; Str2html; ; ; Argument[0]; ReturnValue; taint; manual |
-| 33 | Summary: group:beego; ; false; Substr; ; ; Argument[0]; ReturnValue; taint; manual |
-| 34 | Source: group:beego; Controller; true; ParseForm; ; ; Argument[0]; remote; manual |
-| 35 | Source: group:beego; Controller; true; GetFile; ; ; ReturnValue[0..1]; remote; manual |
-| 36 | Source: group:beego; Controller; true; GetFiles; ; ; ReturnValue[0]; remote; manual |
-| 37 | Source: group:beego; Controller; true; GetString; ; ; ReturnValue[0]; remote; manual |
-| 38 | Source: group:beego; Controller; true; GetStrings; ; ; ReturnValue[0]; remote; manual |
-| 39 | Source: group:beego; Controller; true; Input; ; ; ReturnValue[0]; remote; manual |
-| 40 | Summary: io/ioutil; ; false; ReadAll; ; ; Argument[0]; ReturnValue[0]; taint; manual |
-| 41 | Source: net/http; Request; true; Form; ; ; ; remote; manual |
+| 1 | Source: group:beego-context; BeegoInput; true; Bind; ; ; Argument[0]; remote; manual |
+| 2 | Source: group:beego-context; BeegoInput; true; Cookie; ; ; ReturnValue[0]; remote; manual |
+| 3 | Source: group:beego-context; BeegoInput; true; Data; ; ; ReturnValue[0]; remote; manual |
+| 4 | Source: group:beego-context; BeegoInput; true; GetData; ; ; ReturnValue[0]; remote; manual |
+| 5 | Source: group:beego-context; BeegoInput; true; Header; ; ; ReturnValue[0]; remote; manual |
+| 6 | Source: group:beego-context; BeegoInput; true; Param; ; ; ReturnValue[0]; remote; manual |
+| 7 | Source: group:beego-context; BeegoInput; true; Params; ; ; ReturnValue[0]; remote; manual |
+| 8 | Source: group:beego-context; BeegoInput; true; Query; ; ; ReturnValue[0]; remote; manual |
+| 9 | Source: group:beego-context; BeegoInput; true; Refer; ; ; ReturnValue[0]; remote; manual |
+| 10 | Source: group:beego-context; BeegoInput; true; Referer; ; ; ReturnValue[0]; remote; manual |
+| 11 | Source: group:beego-context; BeegoInput; true; URI; ; ; ReturnValue[0]; remote; manual |
+| 12 | Source: group:beego-context; BeegoInput; true; URL; ; ; ReturnValue[0]; remote; manual |
+| 13 | Source: group:beego-context; BeegoInput; true; UserAgent; ; ; ReturnValue[0]; remote; manual |
+| 14 | Source: group:beego-context; Context; true; GetCookie; ; ; ReturnValue; remote; manual |
+| 15 | Source: group:beego; Controller; true; GetFile; ; ; ReturnValue[0..1]; remote; manual |
+| 16 | Source: group:beego; Controller; true; GetFiles; ; ; ReturnValue[0]; remote; manual |
+| 17 | Source: group:beego; Controller; true; GetString; ; ; ReturnValue[0]; remote; manual |
+| 18 | Source: group:beego; Controller; true; GetStrings; ; ; ReturnValue[0]; remote; manual |
+| 19 | Source: group:beego; Controller; true; Input; ; ; ReturnValue[0]; remote; manual |
+| 20 | Source: group:beego; Controller; true; ParseForm; ; ; Argument[0]; remote; manual |
+| 21 | Source: net/http; Request; true; Form; ; ; ; remote; manual |
+| 22 | Summary: group:beego-utils; ; false; SliceChunk; ; ; Argument[0]; ReturnValue; taint; manual |
+| 23 | Summary: group:beego-utils; ; false; SliceDiff; ; ; Argument[0]; ReturnValue; taint; manual |
+| 24 | Summary: group:beego-utils; ; false; SliceFilter; ; ; Argument[0]; ReturnValue; taint; manual |
+| 25 | Summary: group:beego-utils; ; false; SliceIntersect; ; ; Argument[0..1]; ReturnValue; taint; manual |
+| 26 | Summary: group:beego-utils; ; false; SliceMerge; ; ; Argument[0..1]; ReturnValue; taint; manual |
+| 27 | Summary: group:beego-utils; ; false; SlicePad; ; ; Argument[0..2]; ReturnValue; taint; manual |
+| 28 | Summary: group:beego-utils; ; false; SliceRand; ; ; Argument[0]; ReturnValue; taint; manual |
+| 29 | Summary: group:beego-utils; ; false; SliceReduce; ; ; Argument[0]; ReturnValue; taint; manual |
+| 30 | Summary: group:beego-utils; ; false; SliceShuffle; ; ; Argument[0]; ReturnValue; taint; manual |
+| 31 | Summary: group:beego-utils; ; false; SliceUnique; ; ; Argument[0]; ReturnValue; taint; manual |
+| 32 | Summary: group:beego-utils; BeeMap; true; Get; ; ; Argument[receiver]; ReturnValue; taint; manual |
+| 33 | Summary: group:beego-utils; BeeMap; true; Items; ; ; Argument[receiver]; ReturnValue; taint; manual |
+| 34 | Summary: group:beego-utils; BeeMap; true; Set; ; ; Argument[1]; Argument[receiver]; taint; manual |
+| 35 | Summary: group:beego; ; false; HTML2str; ; ; Argument[0]; ReturnValue; taint; manual |
+| 36 | Summary: group:beego; ; false; Htmlunquote; ; ; Argument[0]; ReturnValue; taint; manual |
+| 37 | Summary: group:beego; ; false; MapGet; ; ; Argument[0]; ReturnValue[0]; taint; manual |
+| 38 | Summary: group:beego; ; false; ParseForm; ; ; Argument[0]; Argument[1]; taint; manual |
+| 39 | Summary: group:beego; ; false; Str2html; ; ; Argument[0]; ReturnValue; taint; manual |
+| 40 | Summary: group:beego; ; false; Substr; ; ; Argument[0]; ReturnValue; taint; manual |
+| 41 | Summary: io/ioutil; ; false; ReadAll; ; ; Argument[0]; ReturnValue[0]; taint; manual |
 nodes
 | test.go:33:6:33:10 | definition of bound | semmle.label | definition of bound |
 | test.go:35:13:35:30 | type conversion | semmle.label | type conversion |
diff --git a/go/ql/test/library-tests/semmle/go/frameworks/Beego/TaintedPath.expected b/go/ql/test/library-tests/semmle/go/frameworks/Beego/TaintedPath.expected
index d5717b91edc..98b536aac65 100644
--- a/go/ql/test/library-tests/semmle/go/frameworks/Beego/TaintedPath.expected
+++ b/go/ql/test/library-tests/semmle/go/frameworks/Beego/TaintedPath.expected
@@ -7,23 +7,23 @@
 | test.go:342:53:342:61 | untrusted | test.go:340:15:340:26 | call to Data | test.go:342:53:342:61 | untrusted | This path depends on a $@. | test.go:340:15:340:26 | call to Data | user-provided value |
 | test.go:344:23:344:31 | untrusted | test.go:340:15:340:26 | call to Data | test.go:344:23:344:31 | untrusted | This path depends on a $@. | test.go:340:15:340:26 | call to Data | user-provided value |
 edges
-| test.go:215:15:215:26 | call to Data | test.go:216:18:216:26 | untrusted | provenance | Src:MaD:3  Sink:MaD:5 |
-| test.go:215:15:215:26 | call to Data | test.go:217:10:217:18 | untrusted | provenance | Src:MaD:3  Sink:MaD:8 |
-| test.go:215:15:215:26 | call to Data | test.go:218:35:218:43 | untrusted | provenance | Src:MaD:3  Sink:MaD:6 |
-| test.go:324:17:324:37 | selection of RequestBody | test.go:324:40:324:43 | &... | provenance | Src:MaD:4 MaD:1 |
-| test.go:324:40:324:43 | &... | test.go:326:35:326:43 | untrusted | provenance |  Sink:MaD:6 |
-| test.go:332:15:332:26 | call to Data | test.go:334:23:334:31 | untrusted | provenance | Src:MaD:3  Sink:MaD:2 |
-| test.go:340:15:340:26 | call to Data | test.go:342:53:342:61 | untrusted | provenance | Src:MaD:3  Sink:MaD:7 |
-| test.go:340:15:340:26 | call to Data | test.go:344:23:344:31 | untrusted | provenance | Src:MaD:3  Sink:MaD:2 |
+| test.go:215:15:215:26 | call to Data | test.go:216:18:216:26 | untrusted | provenance | Src:MaD:6 Sink:MaD:2 |
+| test.go:215:15:215:26 | call to Data | test.go:217:10:217:18 | untrusted | provenance | Src:MaD:6 Sink:MaD:5 |
+| test.go:215:15:215:26 | call to Data | test.go:218:35:218:43 | untrusted | provenance | Src:MaD:6 Sink:MaD:3 |
+| test.go:324:17:324:37 | selection of RequestBody | test.go:324:40:324:43 | &... | provenance | Src:MaD:7 MaD:8 |
+| test.go:324:40:324:43 | &... | test.go:326:35:326:43 | untrusted | provenance | Sink:MaD:3 |
+| test.go:332:15:332:26 | call to Data | test.go:334:23:334:31 | untrusted | provenance | Src:MaD:6 Sink:MaD:1 |
+| test.go:340:15:340:26 | call to Data | test.go:342:53:342:61 | untrusted | provenance | Src:MaD:6 Sink:MaD:4 |
+| test.go:340:15:340:26 | call to Data | test.go:344:23:344:31 | untrusted | provenance | Src:MaD:6 Sink:MaD:1 |
 models
-| 1 | Summary: encoding/json; ; false; Unmarshal; ; ; Argument[0]; Argument[1]; taint; manual |
-| 2 | Sink: group:beego-context; BeegoOutput; false; Download; ; ; Argument[0]; path-injection; manual |
-| 3 | Source: group:beego-context; BeegoInput; true; Data; ; ; ReturnValue[0]; remote; manual |
-| 4 | Source: group:beego-context; BeegoInput; true; RequestBody; ; ; ; remote; manual |
-| 5 | Sink: group:beego; ; false; Walk; ; ; Argument[1]; path-injection; manual |
-| 6 | Sink: group:beego; Controller; false; SaveToFile; ; ; Argument[1]; path-injection; manual |
-| 7 | Sink: group:beego; Controller; false; SaveToFileWithBuffer; ; ; Argument[1]; path-injection; manual |
-| 8 | Sink: group:beego; FileSystem; false; Open; ; ; Argument[0]; path-injection; manual |
+| 1 | Sink: group:beego-context; BeegoOutput; true; Download; ; ; Argument[0]; path-injection; manual |
+| 2 | Sink: group:beego; ; false; Walk; ; ; Argument[1]; path-injection; manual |
+| 3 | Sink: group:beego; Controller; true; SaveToFile; ; ; Argument[1]; path-injection; manual |
+| 4 | Sink: group:beego; Controller; true; SaveToFileWithBuffer; ; ; Argument[1]; path-injection; manual |
+| 5 | Sink: group:beego; FileSystem; true; Open; ; ; Argument[0]; path-injection; manual |
+| 6 | Source: group:beego-context; BeegoInput; true; Data; ; ; ReturnValue[0]; remote; manual |
+| 7 | Source: group:beego-context; BeegoInput; true; RequestBody; ; ; ; remote; manual |
+| 8 | Summary: encoding/json; ; false; Unmarshal; ; ; Argument[0]; Argument[1]; taint; manual |
 nodes
 | test.go:215:15:215:26 | call to Data | semmle.label | call to Data |
 | test.go:216:18:216:26 | untrusted | semmle.label | untrusted |
diff --git a/go/ql/test/library-tests/semmle/go/frameworks/Chi/ReflectedXss.expected b/go/ql/test/library-tests/semmle/go/frameworks/Chi/ReflectedXss.expected
index 654cff9463c..56bbc4ed605 100644
--- a/go/ql/test/library-tests/semmle/go/frameworks/Chi/ReflectedXss.expected
+++ b/go/ql/test/library-tests/semmle/go/frameworks/Chi/ReflectedXss.expected
@@ -11,8 +11,8 @@ edges
 | test.go:23:18:23:60 | call to URLParamFromCtx | test.go:23:11:23:61 | type conversion | provenance | Src:MaD:2  |
 | test.go:24:18:24:71 | call to URLParam | test.go:24:11:24:72 | type conversion | provenance | Src:MaD:3  |
 models
-| 1 | Source: github.com/go-chi/chi; ; true; URLParam; ; ; ReturnValue; remote; manual |
-| 2 | Source: github.com/go-chi/chi; ; true; URLParamFromCtx; ; ; ReturnValue; remote; manual |
+| 1 | Source: github.com/go-chi/chi; ; false; URLParam; ; ; ReturnValue; remote; manual |
+| 2 | Source: github.com/go-chi/chi; ; false; URLParamFromCtx; ; ; ReturnValue; remote; manual |
 | 3 | Source: github.com/go-chi/chi; Context; true; URLParam; ; ; ReturnValue; remote; manual |
 | 4 | Source: net/http; Request; true; URL; ; ; ; remote; manual |
 nodes
diff --git a/go/ql/test/library-tests/semmle/go/frameworks/Echo/OpenRedirect.expected b/go/ql/test/library-tests/semmle/go/frameworks/Echo/OpenRedirect.expected
index 13ed51b6bd1..4b38e6e8c47 100644
--- a/go/ql/test/library-tests/semmle/go/frameworks/Echo/OpenRedirect.expected
+++ b/go/ql/test/library-tests/semmle/go/frameworks/Echo/OpenRedirect.expected
@@ -2,7 +2,7 @@
 | test.go:173:20:173:24 | param | test.go:172:11:172:32 | call to Param | test.go:173:20:173:24 | param | This path to an untrusted URL redirection depends on a $@. | test.go:172:11:172:32 | call to Param | user-provided value |
 | test.go:182:20:182:28 | ...+... | test.go:178:11:178:32 | call to Param | test.go:182:20:182:28 | ...+... | This path to an untrusted URL redirection depends on a $@. | test.go:178:11:178:32 | call to Param | user-provided value |
 edges
-| test.go:172:11:172:32 | call to Param | test.go:173:20:173:24 | param | provenance | Src:MaD:2  Sink:MaD:1 |
+| test.go:172:11:172:32 | call to Param | test.go:173:20:173:24 | param | provenance | Src:MaD:2 Sink:MaD:1 |
 | test.go:178:11:178:32 | call to Param | test.go:182:24:182:28 | param | provenance | Src:MaD:2  |
 | test.go:182:24:182:28 | param | test.go:182:20:182:28 | ...+... | provenance | Config Sink:MaD:1 |
 | test.go:190:9:190:26 | star expression | test.go:190:10:190:26 | selection of URL | provenance | Config |
diff --git a/go/ql/test/library-tests/semmle/go/frameworks/Echo/ReflectedXss.expected b/go/ql/test/library-tests/semmle/go/frameworks/Echo/ReflectedXss.expected
index ea320848ca5..61b8706f4e0 100644
--- a/go/ql/test/library-tests/semmle/go/frameworks/Echo/ReflectedXss.expected
+++ b/go/ql/test/library-tests/semmle/go/frameworks/Echo/ReflectedXss.expected
@@ -19,57 +19,57 @@
 | test.go:150:31:150:36 | reader | test.go:148:11:148:32 | call to Param | test.go:150:31:150:36 | reader | Cross-site scripting vulnerability due to $@. | test.go:148:11:148:32 | call to Param | user-provided value | test.go:0:0:0:0 | test.go |  |
 | test.go:165:23:165:35 | type conversion | test.go:164:11:164:32 | call to Param | test.go:165:23:165:35 | type conversion | Cross-site scripting vulnerability due to $@. | test.go:164:11:164:32 | call to Param | user-provided value | test.go:0:0:0:0 | test.go |  |
 edges
-| test.go:15:11:15:32 | call to Param | test.go:16:16:16:20 | param | provenance | Src:MaD:4  |
-| test.go:21:11:21:27 | call to ParamValues | test.go:22:16:22:20 | param | provenance | Src:MaD:5  |
-| test.go:27:11:27:37 | call to QueryParam | test.go:28:16:28:20 | param | provenance | Src:MaD:6  |
-| test.go:33:11:33:27 | call to QueryParams | test.go:34:16:34:20 | param | provenance | Src:MaD:7  |
-| test.go:39:10:39:26 | call to QueryString | test.go:40:16:40:19 | qstr | provenance | Src:MaD:8  |
-| test.go:45:9:45:34 | call to FormValue | test.go:46:16:46:18 | val | provenance | Src:MaD:9  |
-| test.go:51:2:51:30 | ... := ...[0] | test.go:52:16:52:37 | index expression | provenance | Src:MaD:10  |
-| test.go:57:2:57:46 | ... := ...[0] | test.go:58:13:58:22 | fileHeader | provenance | Src:MaD:11  |
+| test.go:15:11:15:32 | call to Param | test.go:16:16:16:20 | param | provenance | Src:MaD:8  |
+| test.go:21:11:21:27 | call to ParamValues | test.go:22:16:22:20 | param | provenance | Src:MaD:9  |
+| test.go:27:11:27:37 | call to QueryParam | test.go:28:16:28:20 | param | provenance | Src:MaD:10  |
+| test.go:33:11:33:27 | call to QueryParams | test.go:34:16:34:20 | param | provenance | Src:MaD:11  |
+| test.go:39:10:39:26 | call to QueryString | test.go:40:16:40:19 | qstr | provenance | Src:MaD:12  |
+| test.go:45:9:45:34 | call to FormValue | test.go:46:16:46:18 | val | provenance | Src:MaD:6  |
+| test.go:51:2:51:30 | ... := ...[0] | test.go:52:16:52:37 | index expression | provenance | Src:MaD:5  |
+| test.go:57:2:57:46 | ... := ...[0] | test.go:58:13:58:22 | fileHeader | provenance | Src:MaD:4  |
 | test.go:58:2:58:29 | ... := ...[0] | test.go:60:2:60:5 | file | provenance |  |
 | test.go:58:13:58:22 | fileHeader | test.go:58:2:58:29 | ... := ...[0] | provenance | MaD:17 |
 | test.go:59:2:59:7 | definition of buffer | test.go:61:20:61:25 | buffer | provenance |  |
 | test.go:60:2:60:5 | file | test.go:59:2:59:7 | definition of buffer | provenance | MaD:15 |
 | test.go:60:2:60:5 | file | test.go:59:2:59:7 | definition of buffer | provenance | MaD:16 |
 | test.go:60:2:60:5 | file | test.go:59:2:59:7 | definition of buffer | provenance | MaD:18 |
-| test.go:66:2:66:31 | ... := ...[0] | test.go:67:16:67:41 | index expression | provenance | Src:MaD:12  |
-| test.go:72:2:72:31 | ... := ...[0] | test.go:74:13:74:22 | fileHeader | provenance | Src:MaD:12  |
+| test.go:66:2:66:31 | ... := ...[0] | test.go:67:16:67:41 | index expression | provenance | Src:MaD:7  |
+| test.go:72:2:72:31 | ... := ...[0] | test.go:74:13:74:22 | fileHeader | provenance | Src:MaD:7  |
 | test.go:74:2:74:29 | ... := ...[0] | test.go:76:2:76:5 | file | provenance |  |
 | test.go:74:13:74:22 | fileHeader | test.go:74:2:74:29 | ... := ...[0] | provenance | MaD:17 |
 | test.go:75:2:75:7 | definition of buffer | test.go:77:20:77:25 | buffer | provenance |  |
 | test.go:76:2:76:5 | file | test.go:75:2:75:7 | definition of buffer | provenance | MaD:15 |
 | test.go:76:2:76:5 | file | test.go:75:2:75:7 | definition of buffer | provenance | MaD:16 |
 | test.go:76:2:76:5 | file | test.go:75:2:75:7 | definition of buffer | provenance | MaD:18 |
-| test.go:82:2:82:32 | ... := ...[0] | test.go:83:16:83:24 | selection of Value | provenance | Src:MaD:13  |
-| test.go:88:13:88:25 | call to Cookies | test.go:89:16:89:31 | selection of Value | provenance | Src:MaD:14  |
-| test.go:99:11:99:15 | &... | test.go:100:16:100:21 | selection of s | provenance | Src:MaD:3  |
+| test.go:82:2:82:32 | ... := ...[0] | test.go:83:16:83:24 | selection of Value | provenance | Src:MaD:2  |
+| test.go:88:13:88:25 | call to Cookies | test.go:89:16:89:31 | selection of Value | provenance | Src:MaD:3  |
+| test.go:99:11:99:15 | &... | test.go:100:16:100:21 | selection of s | provenance | Src:MaD:1  |
 | test.go:112:17:112:19 | definition of ctx | test.go:114:16:114:18 | ctx | provenance |  |
-| test.go:113:21:113:42 | call to Param | test.go:112:17:112:19 | definition of ctx | provenance | Src:MaD:4 MaD:2 |
-| test.go:114:16:114:18 | ctx | test.go:114:16:114:33 | call to Get | provenance | MaD:1 |
+| test.go:113:21:113:42 | call to Param | test.go:112:17:112:19 | definition of ctx | provenance | Src:MaD:8 MaD:14 |
+| test.go:114:16:114:18 | ctx | test.go:114:16:114:33 | call to Get | provenance | MaD:13 |
 | test.go:114:16:114:33 | call to Get | test.go:114:16:114:42 | type assertion | provenance |  |
-| test.go:124:11:124:32 | call to Param | test.go:125:16:125:20 | param | provenance | Src:MaD:4  |
-| test.go:130:11:130:32 | call to Param | test.go:131:20:131:32 | type conversion | provenance | Src:MaD:4  |
-| test.go:136:11:136:32 | call to Param | test.go:137:29:137:41 | type conversion | provenance | Src:MaD:4  |
-| test.go:148:11:148:32 | call to Param | test.go:149:30:149:34 | param | provenance | Src:MaD:4  |
+| test.go:124:11:124:32 | call to Param | test.go:125:16:125:20 | param | provenance | Src:MaD:8  |
+| test.go:130:11:130:32 | call to Param | test.go:131:20:131:32 | type conversion | provenance | Src:MaD:8  |
+| test.go:136:11:136:32 | call to Param | test.go:137:29:137:41 | type conversion | provenance | Src:MaD:8  |
+| test.go:148:11:148:32 | call to Param | test.go:149:30:149:34 | param | provenance | Src:MaD:8  |
 | test.go:149:12:149:35 | call to NewReader | test.go:150:31:150:36 | reader | provenance |  |
 | test.go:149:30:149:34 | param | test.go:149:12:149:35 | call to NewReader | provenance | MaD:19 |
-| test.go:164:11:164:32 | call to Param | test.go:165:23:165:35 | type conversion | provenance | Src:MaD:4  |
+| test.go:164:11:164:32 | call to Param | test.go:165:23:165:35 | type conversion | provenance | Src:MaD:8  |
 models
-| 1 | Summary: github.com/labstack/echo; Context; true; Get; ; ; Argument[receiver]; ReturnValue; taint; manual |
-| 2 | Summary: github.com/labstack/echo; Context; true; Set; ; ; Argument[1]; Argument[receiver]; taint; manual |
-| 3 | Source: github.com/labstack/echo; Context; true; Bind; ; ; Argument[0]; remote; manual |
-| 4 | Source: github.com/labstack/echo; Context; true; Param; ; ; ReturnValue[0]; remote; manual |
-| 5 | Source: github.com/labstack/echo; Context; true; ParamValues; ; ; ReturnValue[0]; remote; manual |
-| 6 | Source: github.com/labstack/echo; Context; true; QueryParam; ; ; ReturnValue[0]; remote; manual |
-| 7 | Source: github.com/labstack/echo; Context; true; QueryParams; ; ; ReturnValue[0]; remote; manual |
-| 8 | Source: github.com/labstack/echo; Context; true; QueryString; ; ; ReturnValue[0]; remote; manual |
-| 9 | Source: github.com/labstack/echo; Context; true; FormValue; ; ; ReturnValue[0]; remote; manual |
-| 10 | Source: github.com/labstack/echo; Context; true; FormParams; ; ; ReturnValue[0]; remote; manual |
-| 11 | Source: github.com/labstack/echo; Context; true; FormFile; ; ; ReturnValue[0]; remote; manual |
-| 12 | Source: github.com/labstack/echo; Context; true; MultipartForm; ; ; ReturnValue[0]; remote; manual |
-| 13 | Source: github.com/labstack/echo; Context; true; Cookie; ; ; ReturnValue[0]; remote; manual |
-| 14 | Source: github.com/labstack/echo; Context; true; Cookies; ; ; ReturnValue[0]; remote; manual |
+| 1 | Source: github.com/labstack/echo; Context; true; Bind; ; ; Argument[0]; remote; manual |
+| 2 | Source: github.com/labstack/echo; Context; true; Cookie; ; ; ReturnValue[0]; remote; manual |
+| 3 | Source: github.com/labstack/echo; Context; true; Cookies; ; ; ReturnValue[0]; remote; manual |
+| 4 | Source: github.com/labstack/echo; Context; true; FormFile; ; ; ReturnValue[0]; remote; manual |
+| 5 | Source: github.com/labstack/echo; Context; true; FormParams; ; ; ReturnValue[0]; remote; manual |
+| 6 | Source: github.com/labstack/echo; Context; true; FormValue; ; ; ReturnValue[0]; remote; manual |
+| 7 | Source: github.com/labstack/echo; Context; true; MultipartForm; ; ; ReturnValue[0]; remote; manual |
+| 8 | Source: github.com/labstack/echo; Context; true; Param; ; ; ReturnValue[0]; remote; manual |
+| 9 | Source: github.com/labstack/echo; Context; true; ParamValues; ; ; ReturnValue[0]; remote; manual |
+| 10 | Source: github.com/labstack/echo; Context; true; QueryParam; ; ; ReturnValue[0]; remote; manual |
+| 11 | Source: github.com/labstack/echo; Context; true; QueryParams; ; ; ReturnValue[0]; remote; manual |
+| 12 | Source: github.com/labstack/echo; Context; true; QueryString; ; ; ReturnValue[0]; remote; manual |
+| 13 | Summary: github.com/labstack/echo; Context; true; Get; ; ; Argument[receiver]; ReturnValue; taint; manual |
+| 14 | Summary: github.com/labstack/echo; Context; true; Set; ; ; Argument[1]; Argument[receiver]; taint; manual |
 | 15 | Summary: io/fs; File; true; Read; ; ; Argument[receiver]; Argument[0]; taint; manual |
 | 16 | Summary: io; Reader; true; Read; ; ; Argument[receiver]; Argument[0]; taint; manual |
 | 17 | Summary: mime/multipart; FileHeader; true; Open; ; ; Argument[receiver]; ReturnValue[0]; taint; manual |
diff --git a/go/ql/test/library-tests/semmle/go/frameworks/Echo/TaintedPath.expected b/go/ql/test/library-tests/semmle/go/frameworks/Echo/TaintedPath.expected
index d4fe5876609..c579c480fb3 100644
--- a/go/ql/test/library-tests/semmle/go/frameworks/Echo/TaintedPath.expected
+++ b/go/ql/test/library-tests/semmle/go/frameworks/Echo/TaintedPath.expected
@@ -2,11 +2,11 @@
 | test.go:222:17:222:24 | filepath | test.go:221:15:221:38 | call to QueryParam | test.go:222:17:222:24 | filepath | This path depends on a $@. | test.go:221:15:221:38 | call to QueryParam | user-provided value |
 | test.go:226:23:226:30 | filepath | test.go:225:15:225:38 | call to QueryParam | test.go:226:23:226:30 | filepath | This path depends on a $@. | test.go:225:15:225:38 | call to QueryParam | user-provided value |
 edges
-| test.go:221:15:221:38 | call to QueryParam | test.go:222:17:222:24 | filepath | provenance | Src:MaD:3  Sink:MaD:2 |
-| test.go:225:15:225:38 | call to QueryParam | test.go:226:23:226:30 | filepath | provenance | Src:MaD:3  Sink:MaD:1 |
+| test.go:221:15:221:38 | call to QueryParam | test.go:222:17:222:24 | filepath | provenance | Src:MaD:3 Sink:MaD:2 |
+| test.go:225:15:225:38 | call to QueryParam | test.go:226:23:226:30 | filepath | provenance | Src:MaD:3 Sink:MaD:1 |
 models
-| 1 | Sink: github.com/labstack/echo; Context; false; Attachment; ; ; Argument[0]; path-injection; manual |
-| 2 | Sink: github.com/labstack/echo; Context; false; File; ; ; Argument[0]; path-injection; manual |
+| 1 | Sink: github.com/labstack/echo; Context; true; Attachment; ; ; Argument[0]; path-injection; manual |
+| 2 | Sink: github.com/labstack/echo; Context; true; File; ; ; Argument[0]; path-injection; manual |
 | 3 | Source: github.com/labstack/echo; Context; true; QueryParam; ; ; ReturnValue[0]; remote; manual |
 nodes
 | test.go:221:15:221:38 | call to QueryParam | semmle.label | call to QueryParam |
diff --git a/go/ql/test/library-tests/semmle/go/frameworks/Encoding/jsoniter.expected b/go/ql/test/library-tests/semmle/go/frameworks/Encoding/jsoniter.expected
index 222d0ce4a70..0e79c3135b0 100644
--- a/go/ql/test/library-tests/semmle/go/frameworks/Encoding/jsoniter.expected
+++ b/go/ql/test/library-tests/semmle/go/frameworks/Encoding/jsoniter.expected
@@ -1,22 +1,22 @@
 models
-| 1 | Summary: github.com/json-iterator/go; ; false; Unmarshal; ; ; Argument[0]; Argument[1]; taint; manual |
-| 2 | Summary: github.com/json-iterator/go; ; false; UnmarshalFromString; ; ; Argument[0]; Argument[1]; taint; manual |
-| 3 | Summary: github.com/json-iterator/go; API; true; Unmarshal; ; ; Argument[0]; Argument[1]; taint; manual |
-| 4 | Summary: github.com/json-iterator/go; API; true; UnmarshalFromString; ; ; Argument[0]; Argument[1]; taint; manual |
-| 5 | Sink: os/exec; ; false; Command; ; ; Argument[0]; command-injection; manual |
+| 1 | Sink: os/exec; ; false; Command; ; ; Argument[0]; command-injection; manual |
+| 2 | Summary: github.com/json-iterator/go; ; false; Unmarshal; ; ; Argument[0]; Argument[1]; taint; manual |
+| 3 | Summary: github.com/json-iterator/go; ; false; UnmarshalFromString; ; ; Argument[0]; Argument[1]; taint; manual |
+| 4 | Summary: github.com/json-iterator/go; API; true; Unmarshal; ; ; Argument[0]; Argument[1]; taint; manual |
+| 5 | Summary: github.com/json-iterator/go; API; true; UnmarshalFromString; ; ; Argument[0]; Argument[1]; taint; manual |
 edges
 | jsoniter.go:23:20:23:38 | call to getUntrustedBytes | jsoniter.go:27:17:27:30 | untrustedInput | provenance |  |
 | jsoniter.go:23:20:23:38 | call to getUntrustedBytes | jsoniter.go:31:21:31:34 | untrustedInput | provenance |  |
 | jsoniter.go:24:21:24:40 | call to getUntrustedString | jsoniter.go:35:27:35:41 | untrustedString | provenance |  |
 | jsoniter.go:24:21:24:40 | call to getUntrustedString | jsoniter.go:39:31:39:45 | untrustedString | provenance |  |
-| jsoniter.go:27:17:27:30 | untrustedInput | jsoniter.go:27:33:27:37 | &... | provenance | MaD:3 |
-| jsoniter.go:27:33:27:37 | &... | jsoniter.go:28:15:28:24 | selection of field | provenance |  Sink:MaD:5 |
-| jsoniter.go:31:21:31:34 | untrustedInput | jsoniter.go:31:37:31:42 | &... | provenance | MaD:1 |
-| jsoniter.go:31:37:31:42 | &... | jsoniter.go:32:15:32:25 | selection of field | provenance |  Sink:MaD:5 |
-| jsoniter.go:35:27:35:41 | untrustedString | jsoniter.go:35:44:35:49 | &... | provenance | MaD:4 |
-| jsoniter.go:35:44:35:49 | &... | jsoniter.go:36:15:36:25 | selection of field | provenance |  Sink:MaD:5 |
-| jsoniter.go:39:31:39:45 | untrustedString | jsoniter.go:39:48:39:53 | &... | provenance | MaD:2 |
-| jsoniter.go:39:48:39:53 | &... | jsoniter.go:40:15:40:25 | selection of field | provenance |  Sink:MaD:5 |
+| jsoniter.go:27:17:27:30 | untrustedInput | jsoniter.go:27:33:27:37 | &... | provenance | MaD:4 |
+| jsoniter.go:27:33:27:37 | &... | jsoniter.go:28:15:28:24 | selection of field | provenance | Sink:MaD:1 |
+| jsoniter.go:31:21:31:34 | untrustedInput | jsoniter.go:31:37:31:42 | &... | provenance | MaD:2 |
+| jsoniter.go:31:37:31:42 | &... | jsoniter.go:32:15:32:25 | selection of field | provenance | Sink:MaD:1 |
+| jsoniter.go:35:27:35:41 | untrustedString | jsoniter.go:35:44:35:49 | &... | provenance | MaD:5 |
+| jsoniter.go:35:44:35:49 | &... | jsoniter.go:36:15:36:25 | selection of field | provenance | Sink:MaD:1 |
+| jsoniter.go:39:31:39:45 | untrustedString | jsoniter.go:39:48:39:53 | &... | provenance | MaD:3 |
+| jsoniter.go:39:48:39:53 | &... | jsoniter.go:40:15:40:25 | selection of field | provenance | Sink:MaD:1 |
 nodes
 | jsoniter.go:23:20:23:38 | call to getUntrustedBytes | semmle.label | call to getUntrustedBytes |
 | jsoniter.go:24:21:24:40 | call to getUntrustedString | semmle.label | call to getUntrustedString |
diff --git a/go/ql/test/library-tests/semmle/go/frameworks/Gin/Gin.go b/go/ql/test/library-tests/semmle/go/frameworks/Gin/Gin.go
index 33e826d5f47..ba8544bf51d 100644
--- a/go/ql/test/library-tests/semmle/go/frameworks/Gin/Gin.go
+++ b/go/ql/test/library-tests/semmle/go/frameworks/Gin/Gin.go
@@ -21,12 +21,12 @@ type Person struct {
 func FileSystemAccess() {
 	router := gin.Default()
 	router.POST("/FormUploads", func(c *gin.Context) {
-		filepath := c.Query("filepath")
-		c.File(filepath)                                    // $ FileSystemAccess=filepath
-		http.ServeFile(c.Writer, c.Request, filepath)       // $ FileSystemAccess=filepath
-		c.FileAttachment(filepath, "file name in response") // $ FileSystemAccess=filepath
+		filepath := c.Query("filepath")                     // $ Source=filepath
+		c.File(filepath)                                    // $ Alert=filepath $ FileSystemAccess=filepath
+		http.ServeFile(c.Writer, c.Request, filepath)       // $ Alert=filepath $ FileSystemAccess=filepath
+		c.FileAttachment(filepath, "file name in response") // $ Alert=filepath $ FileSystemAccess=filepath
 		file, _ := c.FormFile("afile")
-		_ = c.SaveUploadedFile(file, filepath) // $ FileSystemAccess=filepath
+		_ = c.SaveUploadedFile(file, filepath) // $ Alert=filepath $ FileSystemAccess=filepath
 	})
 	_ = router.Run()
 }
diff --git a/go/ql/test/library-tests/semmle/go/frameworks/Gin/TaintedPath.expected b/go/ql/test/library-tests/semmle/go/frameworks/Gin/TaintedPath.expected
index b0f1baba28a..4cb6f63a829 100644
--- a/go/ql/test/library-tests/semmle/go/frameworks/Gin/TaintedPath.expected
+++ b/go/ql/test/library-tests/semmle/go/frameworks/Gin/TaintedPath.expected
@@ -4,16 +4,16 @@
 | Gin.go:27:20:27:27 | filepath | Gin.go:24:15:24:33 | call to Query | Gin.go:27:20:27:27 | filepath | This path depends on a $@. | Gin.go:24:15:24:33 | call to Query | user-provided value |
 | Gin.go:29:32:29:39 | filepath | Gin.go:24:15:24:33 | call to Query | Gin.go:29:32:29:39 | filepath | This path depends on a $@. | Gin.go:24:15:24:33 | call to Query | user-provided value |
 edges
-| Gin.go:24:15:24:33 | call to Query | Gin.go:25:10:25:17 | filepath | provenance | Src:MaD:4  Sink:MaD:1 |
-| Gin.go:24:15:24:33 | call to Query | Gin.go:26:39:26:46 | filepath | provenance | Src:MaD:4  Sink:MaD:5 |
-| Gin.go:24:15:24:33 | call to Query | Gin.go:27:20:27:27 | filepath | provenance | Src:MaD:4  Sink:MaD:2 |
-| Gin.go:24:15:24:33 | call to Query | Gin.go:29:32:29:39 | filepath | provenance | Src:MaD:4  Sink:MaD:3 |
+| Gin.go:24:15:24:33 | call to Query | Gin.go:25:10:25:17 | filepath | provenance | Src:MaD:5 Sink:MaD:1 |
+| Gin.go:24:15:24:33 | call to Query | Gin.go:26:39:26:46 | filepath | provenance | Src:MaD:5 Sink:MaD:4 |
+| Gin.go:24:15:24:33 | call to Query | Gin.go:27:20:27:27 | filepath | provenance | Src:MaD:5 Sink:MaD:2 |
+| Gin.go:24:15:24:33 | call to Query | Gin.go:29:32:29:39 | filepath | provenance | Src:MaD:5 Sink:MaD:3 |
 models
-| 1 | Sink: github.com/gin-gonic/gin; Context; false; File; ; ; Argument[0]; path-injection; manual |
-| 2 | Sink: github.com/gin-gonic/gin; Context; false; FileAttachment; ; ; Argument[0]; path-injection; manual |
-| 3 | Sink: github.com/gin-gonic/gin; Context; false; SaveUploadedFile; ; ; Argument[1]; path-injection; manual |
-| 4 | Source: github.com/gin-gonic/gin; Context; true; Query; ; ; ReturnValue; remote; manual |
-| 5 | Sink: net/http; ; false; ServeFile; ; ; Argument[2]; path-injection; manual |
+| 1 | Sink: github.com/gin-gonic/gin; Context; true; File; ; ; Argument[0]; path-injection; manual |
+| 2 | Sink: github.com/gin-gonic/gin; Context; true; FileAttachment; ; ; Argument[0]; path-injection; manual |
+| 3 | Sink: github.com/gin-gonic/gin; Context; true; SaveUploadedFile; ; ; Argument[1]; path-injection; manual |
+| 4 | Sink: net/http; ; false; ServeFile; ; ; Argument[2]; path-injection; manual |
+| 5 | Source: github.com/gin-gonic/gin; Context; true; Query; ; ; ReturnValue; remote; manual |
 nodes
 | Gin.go:24:15:24:33 | call to Query | semmle.label | call to Query |
 | Gin.go:25:10:25:17 | filepath | semmle.label | filepath |
diff --git a/go/ql/test/library-tests/semmle/go/frameworks/Gin/TaintedPath.qlref b/go/ql/test/library-tests/semmle/go/frameworks/Gin/TaintedPath.qlref
index a9087948972..fffd4b2e8bf 100644
--- a/go/ql/test/library-tests/semmle/go/frameworks/Gin/TaintedPath.qlref
+++ b/go/ql/test/library-tests/semmle/go/frameworks/Gin/TaintedPath.qlref
@@ -1,2 +1,4 @@
 query: Security/CWE-022/TaintedPath.ql
-postprocess: TestUtilities/PrettyPrintModels.ql
+postprocess:
+  - TestUtilities/PrettyPrintModels.ql
+  - TestUtilities/InlineExpectationsTestQuery.ql
diff --git a/go/ql/test/library-tests/semmle/go/frameworks/Gorestful/gorestful.expected b/go/ql/test/library-tests/semmle/go/frameworks/Gorestful/gorestful.expected
index b20fb2b555c..4cdacabe873 100644
--- a/go/ql/test/library-tests/semmle/go/frameworks/Gorestful/gorestful.expected
+++ b/go/ql/test/library-tests/semmle/go/frameworks/Gorestful/gorestful.expected
@@ -1,18 +1,18 @@
 models
-| 1 | Source: github.com/emicklei/go-restful; Request; true; QueryParameters; ; ; ReturnValue; remote; manual |
+| 1 | Sink: os/exec; ; false; Command; ; ; Argument[0]; command-injection; manual |
 | 2 | Source: github.com/emicklei/go-restful; Request; true; BodyParameter; ; ; ReturnValue[0]; remote; manual |
 | 3 | Source: github.com/emicklei/go-restful; Request; true; PathParameters; ; ; ReturnValue; remote; manual |
-| 4 | Source: github.com/emicklei/go-restful; Request; true; ReadEntity; ; ; Argument[0]; remote; manual |
-| 5 | Sink: os/exec; ; false; Command; ; ; Argument[0]; command-injection; manual |
+| 4 | Source: github.com/emicklei/go-restful; Request; true; QueryParameters; ; ; ReturnValue; remote; manual |
+| 5 | Source: github.com/emicklei/go-restful; Request; true; ReadEntity; ; ; Argument[0]; remote; manual |
 edges
-| gorestful.go:15:15:15:44 | call to QueryParameters | gorestful.go:15:15:15:47 | index expression | provenance | Src:MaD:1  Sink:MaD:5 |
-| gorestful.go:17:2:17:39 | ... := ...[0] | gorestful.go:18:15:18:17 | val | provenance | Src:MaD:2  Sink:MaD:5 |
-| gorestful.go:21:15:21:38 | call to PathParameters | gorestful.go:21:15:21:45 | index expression | provenance | Src:MaD:3  Sink:MaD:5 |
-| gorestful.go:23:21:23:24 | &... | gorestful.go:24:15:24:21 | selection of cmd | provenance | Src:MaD:4  Sink:MaD:5 |
-| gorestful_v2.go:15:15:15:44 | call to QueryParameters | gorestful_v2.go:15:15:15:47 | index expression | provenance | Src:MaD:1  Sink:MaD:5 |
-| gorestful_v2.go:17:2:17:39 | ... := ...[0] | gorestful_v2.go:18:15:18:17 | val | provenance | Src:MaD:2  Sink:MaD:5 |
-| gorestful_v2.go:21:15:21:38 | call to PathParameters | gorestful_v2.go:21:15:21:45 | index expression | provenance | Src:MaD:3  Sink:MaD:5 |
-| gorestful_v2.go:23:21:23:24 | &... | gorestful_v2.go:24:15:24:21 | selection of cmd | provenance | Src:MaD:4  Sink:MaD:5 |
+| gorestful.go:15:15:15:44 | call to QueryParameters | gorestful.go:15:15:15:47 | index expression | provenance | Src:MaD:4 Sink:MaD:1 |
+| gorestful.go:17:2:17:39 | ... := ...[0] | gorestful.go:18:15:18:17 | val | provenance | Src:MaD:2 Sink:MaD:1 |
+| gorestful.go:21:15:21:38 | call to PathParameters | gorestful.go:21:15:21:45 | index expression | provenance | Src:MaD:3 Sink:MaD:1 |
+| gorestful.go:23:21:23:24 | &... | gorestful.go:24:15:24:21 | selection of cmd | provenance | Src:MaD:5 Sink:MaD:1 |
+| gorestful_v2.go:15:15:15:44 | call to QueryParameters | gorestful_v2.go:15:15:15:47 | index expression | provenance | Src:MaD:4 Sink:MaD:1 |
+| gorestful_v2.go:17:2:17:39 | ... := ...[0] | gorestful_v2.go:18:15:18:17 | val | provenance | Src:MaD:2 Sink:MaD:1 |
+| gorestful_v2.go:21:15:21:38 | call to PathParameters | gorestful_v2.go:21:15:21:45 | index expression | provenance | Src:MaD:3 Sink:MaD:1 |
+| gorestful_v2.go:23:21:23:24 | &... | gorestful_v2.go:24:15:24:21 | selection of cmd | provenance | Src:MaD:5 Sink:MaD:1 |
 nodes
 | gorestful.go:15:15:15:44 | call to QueryParameters | semmle.label | call to QueryParameters |
 | gorestful.go:15:15:15:47 | index expression | semmle.label | index expression |
diff --git a/go/ql/test/library-tests/semmle/go/frameworks/Revel/ReflectedXss.expected b/go/ql/test/library-tests/semmle/go/frameworks/Revel/ReflectedXss.expected
index a53d2914fd1..9d45f1e2996 100644
--- a/go/ql/test/library-tests/semmle/go/frameworks/Revel/ReflectedXss.expected
+++ b/go/ql/test/library-tests/semmle/go/frameworks/Revel/ReflectedXss.expected
@@ -8,16 +8,16 @@ edges
 | EndToEnd.go:35:2:35:4 | definition of buf | EndToEnd.go:37:24:37:26 | buf | provenance |  |
 | EndToEnd.go:36:18:36:25 | selection of Params | EndToEnd.go:36:18:36:30 | selection of Form | provenance | Src:MaD:1  |
 | EndToEnd.go:36:18:36:30 | selection of Form | EndToEnd.go:36:18:36:47 | call to Get | provenance | MaD:4 |
-| EndToEnd.go:36:18:36:47 | call to Get | EndToEnd.go:35:2:35:4 | definition of buf | provenance | MaD:2 |
+| EndToEnd.go:36:18:36:47 | call to Get | EndToEnd.go:35:2:35:4 | definition of buf | provenance | MaD:3 |
 | EndToEnd.go:69:22:69:29 | selection of Params | EndToEnd.go:69:22:69:34 | selection of Form | provenance | Src:MaD:1  |
 | EndToEnd.go:69:22:69:34 | selection of Form | EndToEnd.go:69:22:69:51 | call to Get | provenance | MaD:4 |
 | Revel.go:70:22:70:29 | selection of Params | Revel.go:70:22:70:35 | selection of Query | provenance | Src:MaD:1  |
-| examples/booking/app/init.go:36:44:36:48 | selection of URL | examples/booking/app/init.go:36:44:36:53 | selection of Path | provenance | Src:MaD:3  |
-| examples/booking/app/init.go:40:49:40:53 | selection of URL | examples/booking/app/init.go:40:49:40:58 | selection of Path | provenance | Src:MaD:3  |
+| examples/booking/app/init.go:36:44:36:48 | selection of URL | examples/booking/app/init.go:36:44:36:53 | selection of Path | provenance | Src:MaD:2  |
+| examples/booking/app/init.go:40:49:40:53 | selection of URL | examples/booking/app/init.go:40:49:40:58 | selection of Path | provenance | Src:MaD:2  |
 models
 | 1 | Source: group:revel; Controller; true; Params; ; ; ; remote; manual |
-| 2 | Summary: io; StringWriter; true; WriteString; ; ; Argument[0]; Argument[receiver]; taint; manual |
-| 3 | Source: net/http; Request; true; URL; ; ; ; remote; manual |
+| 2 | Source: net/http; Request; true; URL; ; ; ; remote; manual |
+| 3 | Summary: io; StringWriter; true; WriteString; ; ; Argument[0]; Argument[receiver]; taint; manual |
 | 4 | Summary: net/url; Values; true; Get; ; ; Argument[receiver]; ReturnValue; taint; manual |
 nodes
 | EndToEnd.go:35:2:35:4 | definition of buf | semmle.label | definition of buf |
diff --git a/go/ql/test/library-tests/semmle/go/frameworks/Revel/TaintedPath.expected b/go/ql/test/library-tests/semmle/go/frameworks/Revel/TaintedPath.expected
index 33d8bb8ae17..7337f636c47 100644
--- a/go/ql/test/library-tests/semmle/go/frameworks/Revel/TaintedPath.expected
+++ b/go/ql/test/library-tests/semmle/go/frameworks/Revel/TaintedPath.expected
@@ -2,15 +2,15 @@
 | EndToEnd.go:58:18:58:47 | call to Get | EndToEnd.go:58:18:58:25 | selection of Params | EndToEnd.go:58:18:58:47 | call to Get | This path depends on a $@. | EndToEnd.go:58:18:58:25 | selection of Params | user-provided value |
 | EndToEnd.go:64:26:64:55 | call to Get | EndToEnd.go:64:26:64:33 | selection of Params | EndToEnd.go:64:26:64:55 | call to Get | This path depends on a $@. | EndToEnd.go:64:26:64:33 | selection of Params | user-provided value |
 edges
-| EndToEnd.go:58:18:58:25 | selection of Params | EndToEnd.go:58:18:58:30 | selection of Form | provenance | Src:MaD:1  |
-| EndToEnd.go:58:18:58:30 | selection of Form | EndToEnd.go:58:18:58:47 | call to Get | provenance | MaD:3 Sink:MaD:4 |
-| EndToEnd.go:64:26:64:33 | selection of Params | EndToEnd.go:64:26:64:38 | selection of Form | provenance | Src:MaD:1  |
-| EndToEnd.go:64:26:64:38 | selection of Form | EndToEnd.go:64:26:64:55 | call to Get | provenance | MaD:3 Sink:MaD:2 |
+| EndToEnd.go:58:18:58:25 | selection of Params | EndToEnd.go:58:18:58:30 | selection of Form | provenance | Src:MaD:3  |
+| EndToEnd.go:58:18:58:30 | selection of Form | EndToEnd.go:58:18:58:47 | call to Get | provenance | MaD:4 Sink:MaD:2 |
+| EndToEnd.go:64:26:64:33 | selection of Params | EndToEnd.go:64:26:64:38 | selection of Form | provenance | Src:MaD:3  |
+| EndToEnd.go:64:26:64:38 | selection of Form | EndToEnd.go:64:26:64:55 | call to Get | provenance | MaD:4 Sink:MaD:1 |
 models
-| 1 | Source: group:revel; Controller; true; Params; ; ; ; remote; manual |
-| 2 | Sink: group:revel; Controller; true; RenderFileName; ; ; Argument[0]; path-injection; manual |
-| 3 | Summary: net/url; Values; true; Get; ; ; Argument[receiver]; ReturnValue; taint; manual |
-| 4 | Sink: os; ; false; Open; ; ; Argument[0]; path-injection; manual |
+| 1 | Sink: group:revel; Controller; true; RenderFileName; ; ; Argument[0]; path-injection; manual |
+| 2 | Sink: os; ; false; Open; ; ; Argument[0]; path-injection; manual |
+| 3 | Source: group:revel; Controller; true; Params; ; ; ; remote; manual |
+| 4 | Summary: net/url; Values; true; Get; ; ; Argument[receiver]; ReturnValue; taint; manual |
 nodes
 | EndToEnd.go:58:18:58:25 | selection of Params | semmle.label | selection of Params |
 | EndToEnd.go:58:18:58:30 | selection of Form | semmle.label | selection of Form |
diff --git a/go/ql/test/library-tests/semmle/go/frameworks/Twirp/RequestForgery.expected b/go/ql/test/library-tests/semmle/go/frameworks/Twirp/RequestForgery.expected
index 93ad219ccfc..82c4c950c6e 100644
--- a/go/ql/test/library-tests/semmle/go/frameworks/Twirp/RequestForgery.expected
+++ b/go/ql/test/library-tests/semmle/go/frameworks/Twirp/RequestForgery.expected
@@ -8,9 +8,9 @@ edges
 | rpc/notes/service.twirp.go:493:2:493:2 | capture variable reqContent | rpc/notes/service.twirp.go:495:35:495:44 | reqContent | provenance |  |
 | rpc/notes/service.twirp.go:495:35:495:44 | reqContent | server/main.go:19:56:19:61 | definition of params | provenance |  |
 | rpc/notes/service.twirp.go:538:2:538:33 | ... := ...[0] | rpc/notes/service.twirp.go:544:27:544:29 | buf | provenance |  |
-| rpc/notes/service.twirp.go:538:25:538:32 | selection of Body | rpc/notes/service.twirp.go:538:2:538:33 | ... := ...[0] | provenance | Src:MaD:3 MaD:2 |
+| rpc/notes/service.twirp.go:538:25:538:32 | selection of Body | rpc/notes/service.twirp.go:538:2:538:33 | ... := ...[0] | provenance | Src:MaD:1 MaD:3 |
 | rpc/notes/service.twirp.go:543:2:543:11 | definition of reqContent | rpc/notes/service.twirp.go:574:2:574:2 | capture variable reqContent | provenance |  |
-| rpc/notes/service.twirp.go:544:27:544:29 | buf | rpc/notes/service.twirp.go:543:2:543:11 | definition of reqContent | provenance | MaD:1 |
+| rpc/notes/service.twirp.go:544:27:544:29 | buf | rpc/notes/service.twirp.go:543:2:543:11 | definition of reqContent | provenance | MaD:2 |
 | rpc/notes/service.twirp.go:554:6:554:13 | definition of typedReq | rpc/notes/service.twirp.go:558:44:558:51 | typedReq | provenance |  |
 | rpc/notes/service.twirp.go:558:44:558:51 | typedReq | server/main.go:19:56:19:61 | definition of params | provenance |  |
 | rpc/notes/service.twirp.go:574:2:574:2 | capture variable reqContent | rpc/notes/service.twirp.go:576:35:576:44 | reqContent | provenance |  |
@@ -24,9 +24,9 @@ edges
 | server/main.go:19:56:19:61 | definition of params [Return] | rpc/notes/service.twirp.go:554:6:554:13 | definition of typedReq | provenance |  |
 | server/main.go:19:56:19:61 | definition of params [Return] | rpc/notes/service.twirp.go:574:2:574:2 | capture variable reqContent | provenance |  |
 models
-| 1 | Summary: google.golang.org/protobuf/proto; ; false; Unmarshal; ; ; Argument[0]; Argument[1]; taint; manual |
-| 2 | Summary: io; ; false; ReadAll; ; ; Argument[0]; ReturnValue[0]; taint; manual |
-| 3 | Source: net/http; Request; true; Body; ; ; ; remote; manual |
+| 1 | Source: net/http; Request; true; Body; ; ; ; remote; manual |
+| 2 | Summary: google.golang.org/protobuf/proto; ; false; Unmarshal; ; ; Argument[0]; Argument[1]; taint; manual |
+| 3 | Summary: io; ; false; ReadAll; ; ; Argument[0]; ReturnValue[0]; taint; manual |
 nodes
 | client/main.go:16:35:16:78 | &... | semmle.label | &... |
 | rpc/notes/service.twirp.go:473:6:473:13 | definition of typedReq | semmle.label | definition of typedReq |
diff --git a/go/ql/test/library-tests/semmle/go/frameworks/XNetHtml/ReflectedXss.expected b/go/ql/test/library-tests/semmle/go/frameworks/XNetHtml/ReflectedXss.expected
index 7cd78374940..b94733d5054 100644
--- a/go/ql/test/library-tests/semmle/go/frameworks/XNetHtml/ReflectedXss.expected
+++ b/go/ql/test/library-tests/semmle/go/frameworks/XNetHtml/ReflectedXss.expected
@@ -14,75 +14,77 @@
 | test.go:45:22:45:31 | &... | test.go:43:31:43:42 | selection of Body | test.go:45:22:45:31 | &... | Cross-site scripting vulnerability due to $@. | test.go:43:31:43:42 | selection of Body | user-provided value | test.go:0:0:0:0 | test.go |  |
 | test.go:50:22:50:32 | &... | test.go:48:32:48:43 | selection of Body | test.go:50:22:50:32 | &... | Cross-site scripting vulnerability due to $@. | test.go:48:32:48:43 | selection of Body | user-provided value | test.go:0:0:0:0 | test.go |  |
 edges
-| test.go:12:12:12:22 | selection of URL | test.go:12:12:12:30 | call to Query | provenance | Src:MaD:16 MaD:17 |
+| test.go:12:12:12:22 | selection of URL | test.go:12:12:12:30 | call to Query | provenance | Src:MaD:2 MaD:17 |
 | test.go:12:12:12:30 | call to Query | test.go:12:12:12:44 | call to Get | provenance | MaD:18 |
 | test.go:12:12:12:44 | call to Get | test.go:15:42:15:47 | param1 | provenance |  |
 | test.go:15:22:15:48 | call to UnescapeString | test.go:15:15:15:49 | type conversion | provenance |  |
-| test.go:15:42:15:47 | param1 | test.go:15:22:15:48 | call to UnescapeString | provenance | MaD:7 |
+| test.go:15:42:15:47 | param1 | test.go:15:22:15:48 | call to UnescapeString | provenance | MaD:9 |
 | test.go:17:2:17:36 | ... := ...[0] | test.go:18:15:18:31 | type conversion | provenance |  |
 | test.go:17:2:17:36 | ... := ...[0] | test.go:29:22:29:25 | node | provenance |  |
-| test.go:17:24:17:35 | selection of Body | test.go:17:2:17:36 | ... := ...[0] | provenance | Src:MaD:15 MaD:3 |
+| test.go:17:24:17:35 | selection of Body | test.go:17:2:17:36 | ... := ...[0] | provenance | Src:MaD:1 MaD:5 |
 | test.go:20:2:20:48 | ... := ...[0] | test.go:21:15:21:32 | type conversion | provenance |  |
-| test.go:20:36:20:47 | selection of Body | test.go:20:2:20:48 | ... := ...[0] | provenance | Src:MaD:15 MaD:6 |
+| test.go:20:36:20:47 | selection of Body | test.go:20:2:20:48 | ... := ...[0] | provenance | Src:MaD:1 MaD:8 |
 | test.go:23:2:23:50 | ... := ...[0] | test.go:24:15:24:35 | type conversion | provenance |  |
-| test.go:23:33:23:44 | selection of Body | test.go:23:2:23:50 | ... := ...[0] | provenance | Src:MaD:15 MaD:4 |
+| test.go:23:33:23:44 | selection of Body | test.go:23:2:23:50 | ... := ...[0] | provenance | Src:MaD:1 MaD:6 |
 | test.go:26:2:26:62 | ... := ...[0] | test.go:27:15:27:36 | type conversion | provenance |  |
-| test.go:26:45:26:56 | selection of Body | test.go:26:2:26:62 | ... := ...[0] | provenance | Src:MaD:15 MaD:5 |
+| test.go:26:45:26:56 | selection of Body | test.go:26:2:26:62 | ... := ...[0] | provenance | Src:MaD:1 MaD:7 |
 | test.go:31:15:31:45 | call to NewTokenizer | test.go:32:15:32:23 | tokenizer | provenance |  |
 | test.go:31:15:31:45 | call to NewTokenizer | test.go:33:15:33:23 | tokenizer | provenance |  |
 | test.go:31:15:31:45 | call to NewTokenizer | test.go:34:17:34:25 | tokenizer | provenance |  |
 | test.go:31:15:31:45 | call to NewTokenizer | test.go:36:15:36:23 | tokenizer | provenance |  |
 | test.go:31:15:31:45 | call to NewTokenizer | test.go:37:22:37:30 | tokenizer | provenance |  |
-| test.go:31:33:31:44 | selection of Body | test.go:31:15:31:45 | call to NewTokenizer | provenance | Src:MaD:15 MaD:1 |
-| test.go:32:15:32:23 | tokenizer | test.go:32:15:32:34 | call to Buffered | provenance | MaD:10 |
-| test.go:33:15:33:23 | tokenizer | test.go:33:15:33:29 | call to Raw | provenance | MaD:11 |
+| test.go:31:33:31:44 | selection of Body | test.go:31:15:31:45 | call to NewTokenizer | provenance | Src:MaD:1 MaD:3 |
+| test.go:32:15:32:23 | tokenizer | test.go:32:15:32:34 | call to Buffered | provenance | MaD:12 |
+| test.go:33:15:33:23 | tokenizer | test.go:33:15:33:29 | call to Raw | provenance | MaD:13 |
 | test.go:34:2:34:35 | ... := ...[1] | test.go:35:15:35:19 | value | provenance |  |
-| test.go:34:17:34:25 | tokenizer | test.go:34:2:34:35 | ... := ...[1] | provenance | MaD:12 |
-| test.go:36:15:36:23 | tokenizer | test.go:36:15:36:30 | call to Text | provenance | MaD:13 |
-| test.go:37:22:37:30 | tokenizer | test.go:37:22:37:38 | call to Token | provenance | MaD:14 |
+| test.go:34:17:34:25 | tokenizer | test.go:34:2:34:35 | ... := ...[1] | provenance | MaD:14 |
+| test.go:36:15:36:23 | tokenizer | test.go:36:15:36:30 | call to Text | provenance | MaD:15 |
+| test.go:37:22:37:30 | tokenizer | test.go:37:22:37:38 | call to Token | provenance | MaD:16 |
 | test.go:37:22:37:38 | call to Token | test.go:37:15:37:44 | type conversion | provenance |  |
 | test.go:39:23:39:77 | call to NewTokenizerFragment | test.go:40:15:40:31 | tokenizerFragment | provenance |  |
-| test.go:39:49:39:60 | selection of Body | test.go:39:23:39:77 | call to NewTokenizerFragment | provenance | Src:MaD:15 MaD:2 |
-| test.go:40:15:40:31 | tokenizerFragment | test.go:40:15:40:42 | call to Buffered | provenance | MaD:10 |
+| test.go:39:49:39:60 | selection of Body | test.go:39:23:39:77 | call to NewTokenizerFragment | provenance | Src:MaD:1 MaD:4 |
+| test.go:40:15:40:31 | tokenizerFragment | test.go:40:15:40:42 | call to Buffered | provenance | MaD:12 |
 | test.go:42:6:42:14 | definition of cleanNode | test.go:45:22:45:31 | &... | provenance |  |
 | test.go:42:6:42:14 | definition of cleanNode | test.go:45:22:45:31 | &... | provenance |  |
 | test.go:42:6:42:14 | definition of cleanNode | test.go:45:23:45:31 | cleanNode | provenance |  |
 | test.go:43:2:43:43 | ... := ...[0] | test.go:44:24:44:34 | taintedNode | provenance |  |
-| test.go:43:31:43:42 | selection of Body | test.go:43:2:43:43 | ... := ...[0] | provenance | Src:MaD:15 MaD:3 |
-| test.go:44:24:44:34 | taintedNode | test.go:42:6:42:14 | definition of cleanNode | provenance | MaD:8 |
+| test.go:43:31:43:42 | selection of Body | test.go:43:2:43:43 | ... := ...[0] | provenance | Src:MaD:1 MaD:5 |
+| test.go:44:24:44:34 | taintedNode | test.go:42:6:42:14 | definition of cleanNode | provenance | MaD:10 |
 | test.go:45:22:45:31 | &... | test.go:45:23:45:31 | cleanNode | provenance |  |
 | test.go:45:22:45:31 | &... [pointer] | test.go:45:22:45:31 | &... | provenance |  |
 | test.go:45:22:45:31 | &... [pointer] | test.go:45:22:45:31 | &... | provenance |  |
 | test.go:45:22:45:31 | &... [pointer] | test.go:45:23:45:31 | cleanNode | provenance |  |
+| test.go:45:23:45:31 | cleanNode | test.go:45:22:45:31 | &... | provenance |  |
 | test.go:45:23:45:31 | cleanNode | test.go:45:22:45:31 | &... [pointer] | provenance |  |
 | test.go:47:6:47:15 | definition of cleanNode2 | test.go:50:22:50:32 | &... | provenance |  |
 | test.go:47:6:47:15 | definition of cleanNode2 | test.go:50:22:50:32 | &... | provenance |  |
 | test.go:47:6:47:15 | definition of cleanNode2 | test.go:50:23:50:32 | cleanNode2 | provenance |  |
 | test.go:48:2:48:44 | ... := ...[0] | test.go:49:26:49:37 | taintedNode2 | provenance |  |
-| test.go:48:32:48:43 | selection of Body | test.go:48:2:48:44 | ... := ...[0] | provenance | Src:MaD:15 MaD:3 |
-| test.go:49:26:49:37 | taintedNode2 | test.go:47:6:47:15 | definition of cleanNode2 | provenance | MaD:9 |
+| test.go:48:32:48:43 | selection of Body | test.go:48:2:48:44 | ... := ...[0] | provenance | Src:MaD:1 MaD:5 |
+| test.go:49:26:49:37 | taintedNode2 | test.go:47:6:47:15 | definition of cleanNode2 | provenance | MaD:11 |
 | test.go:50:22:50:32 | &... | test.go:50:23:50:32 | cleanNode2 | provenance |  |
 | test.go:50:22:50:32 | &... [pointer] | test.go:50:22:50:32 | &... | provenance |  |
 | test.go:50:22:50:32 | &... [pointer] | test.go:50:22:50:32 | &... | provenance |  |
 | test.go:50:22:50:32 | &... [pointer] | test.go:50:23:50:32 | cleanNode2 | provenance |  |
+| test.go:50:23:50:32 | cleanNode2 | test.go:50:22:50:32 | &... | provenance |  |
 | test.go:50:23:50:32 | cleanNode2 | test.go:50:22:50:32 | &... [pointer] | provenance |  |
 models
-| 1 | Summary: golang.org/x/net/html; ; false; NewTokenizer; ; ; Argument[0]; ReturnValue; taint; manual |
-| 2 | Summary: golang.org/x/net/html; ; false; NewTokenizerFragment; ; ; Argument[0]; ReturnValue; taint; manual |
-| 3 | Summary: golang.org/x/net/html; ; false; Parse; ; ; Argument[0]; ReturnValue[0]; taint; manual |
-| 4 | Summary: golang.org/x/net/html; ; false; ParseFragment; ; ; Argument[0]; ReturnValue[0]; taint; manual |
-| 5 | Summary: golang.org/x/net/html; ; false; ParseFragmentWithOptions; ; ; Argument[0]; ReturnValue[0]; taint; manual |
-| 6 | Summary: golang.org/x/net/html; ; false; ParseWithOptions; ; ; Argument[0]; ReturnValue[0]; taint; manual |
-| 7 | Summary: golang.org/x/net/html; ; false; UnescapeString; ; ; Argument[0]; ReturnValue; taint; manual |
-| 8 | Summary: golang.org/x/net/html; Node; true; AppendChild; ; ; Argument[0]; Argument[receiver]; taint; manual |
-| 9 | Summary: golang.org/x/net/html; Node; true; InsertBefore; ; ; Argument[0]; Argument[receiver]; taint; manual |
-| 10 | Summary: golang.org/x/net/html; Tokenizer; true; Buffered; ; ; Argument[receiver]; ReturnValue; taint; manual |
-| 11 | Summary: golang.org/x/net/html; Tokenizer; true; Raw; ; ; Argument[receiver]; ReturnValue; taint; manual |
-| 12 | Summary: golang.org/x/net/html; Tokenizer; true; TagAttr; ; ; Argument[receiver]; ReturnValue[1]; taint; manual |
-| 13 | Summary: golang.org/x/net/html; Tokenizer; true; Text; ; ; Argument[receiver]; ReturnValue; taint; manual |
-| 14 | Summary: golang.org/x/net/html; Tokenizer; true; Token; ; ; Argument[receiver]; ReturnValue; taint; manual |
-| 15 | Source: net/http; Request; true; Body; ; ; ; remote; manual |
-| 16 | Source: net/http; Request; true; URL; ; ; ; remote; manual |
+| 1 | Source: net/http; Request; true; Body; ; ; ; remote; manual |
+| 2 | Source: net/http; Request; true; URL; ; ; ; remote; manual |
+| 3 | Summary: golang.org/x/net/html; ; false; NewTokenizer; ; ; Argument[0]; ReturnValue; taint; manual |
+| 4 | Summary: golang.org/x/net/html; ; false; NewTokenizerFragment; ; ; Argument[0]; ReturnValue; taint; manual |
+| 5 | Summary: golang.org/x/net/html; ; false; Parse; ; ; Argument[0]; ReturnValue[0]; taint; manual |
+| 6 | Summary: golang.org/x/net/html; ; false; ParseFragment; ; ; Argument[0]; ReturnValue[0]; taint; manual |
+| 7 | Summary: golang.org/x/net/html; ; false; ParseFragmentWithOptions; ; ; Argument[0]; ReturnValue[0]; taint; manual |
+| 8 | Summary: golang.org/x/net/html; ; false; ParseWithOptions; ; ; Argument[0]; ReturnValue[0]; taint; manual |
+| 9 | Summary: golang.org/x/net/html; ; false; UnescapeString; ; ; Argument[0]; ReturnValue; taint; manual |
+| 10 | Summary: golang.org/x/net/html; Node; true; AppendChild; ; ; Argument[0]; Argument[receiver]; taint; manual |
+| 11 | Summary: golang.org/x/net/html; Node; true; InsertBefore; ; ; Argument[0]; Argument[receiver]; taint; manual |
+| 12 | Summary: golang.org/x/net/html; Tokenizer; true; Buffered; ; ; Argument[receiver]; ReturnValue; taint; manual |
+| 13 | Summary: golang.org/x/net/html; Tokenizer; true; Raw; ; ; Argument[receiver]; ReturnValue; taint; manual |
+| 14 | Summary: golang.org/x/net/html; Tokenizer; true; TagAttr; ; ; Argument[receiver]; ReturnValue[1]; taint; manual |
+| 15 | Summary: golang.org/x/net/html; Tokenizer; true; Text; ; ; Argument[receiver]; ReturnValue; taint; manual |
+| 16 | Summary: golang.org/x/net/html; Tokenizer; true; Token; ; ; Argument[receiver]; ReturnValue; taint; manual |
 | 17 | Summary: net/url; URL; true; Query; ; ; Argument[receiver]; ReturnValue; taint; manual |
 | 18 | Summary: net/url; Values; true; Get; ; ; Argument[receiver]; ReturnValue; taint; manual |
 nodes
diff --git a/go/ql/test/library-tests/semmle/go/frameworks/XNetHtml/SqlInjection.expected b/go/ql/test/library-tests/semmle/go/frameworks/XNetHtml/SqlInjection.expected
index 446695b259b..c28b1058e7c 100644
--- a/go/ql/test/library-tests/semmle/go/frameworks/XNetHtml/SqlInjection.expected
+++ b/go/ql/test/library-tests/semmle/go/frameworks/XNetHtml/SqlInjection.expected
@@ -1,11 +1,11 @@
 #select
 | test.go:57:11:57:41 | call to EscapeString | test.go:56:2:56:42 | ... := ...[0] | test.go:57:11:57:41 | call to EscapeString | This query depends on a $@. | test.go:56:2:56:42 | ... := ...[0] | user-provided value |
 edges
-| test.go:56:2:56:42 | ... := ...[0] | test.go:57:29:57:40 | selection of Value | provenance | Src:MaD:2  |
-| test.go:57:29:57:40 | selection of Value | test.go:57:11:57:41 | call to EscapeString | provenance | MaD:1 |
+| test.go:56:2:56:42 | ... := ...[0] | test.go:57:29:57:40 | selection of Value | provenance | Src:MaD:1  |
+| test.go:57:29:57:40 | selection of Value | test.go:57:11:57:41 | call to EscapeString | provenance | MaD:2 |
 models
-| 1 | Summary: golang.org/x/net/html; ; false; EscapeString; ; ; Argument[0]; ReturnValue; taint; manual |
-| 2 | Source: net/http; Request; true; Cookie; ; ; ReturnValue[0]; remote; manual |
+| 1 | Source: net/http; Request; true; Cookie; ; ; ReturnValue[0]; remote; manual |
+| 2 | Summary: golang.org/x/net/html; ; false; EscapeString; ; ; Argument[0]; ReturnValue; taint; manual |
 nodes
 | test.go:56:2:56:42 | ... := ...[0] | semmle.label | ... := ...[0] |
 | test.go:57:11:57:41 | call to EscapeString | semmle.label | call to EscapeString |
diff --git a/go/ql/test/query-tests/Diagnostics/ExtractionErrors.expected b/go/ql/test/query-tests/Diagnostics/ExtractionErrors.expected
index b3a9e8631f0..c5afba4d05d 100644
--- a/go/ql/test/query-tests/Diagnostics/ExtractionErrors.expected
+++ b/go/ql/test/query-tests/Diagnostics/ExtractionErrors.expected
@@ -1,5 +1,5 @@
-| Extraction failed in query-tests/Diagnostics/badimport.go with error invalid import path (invalid character U+007B '{') | 2 |
-| Extraction failed in query-tests/Diagnostics/type.go with error cannot use v (variable of type V) as T value in argument to takesT | 2 |
+| Extraction failed in badimport.go with error invalid import path (invalid character U+007B '{') | 2 |
+| Extraction failed in type.go with error cannot use v (variable of type V) as T value in argument to takesT | 2 |
 | Extraction failed with error expected ';', found wnvwun | 2 |
 | Extraction failed with error expected 'IDENT', found newline | 2 |
 | Extraction failed with error expected 'package', found avvu | 2 |
diff --git a/go/ql/test/query-tests/Diagnostics/SuccessfullyExtractedFiles.expected b/go/ql/test/query-tests/Diagnostics/SuccessfullyExtractedFiles.expected
index f038c938c6d..999b4a4eb4f 100644
--- a/go/ql/test/query-tests/Diagnostics/SuccessfullyExtractedFiles.expected
+++ b/go/ql/test/query-tests/Diagnostics/SuccessfullyExtractedFiles.expected
@@ -1,4 +1,3 @@
-| ../../go.mod:0:0:0:0 | ../../go.mod |  |
 | badimport.go:0:0:0:0 | badimport.go |  |
 | type.go:0:0:0:0 | type.go |  |
 | util.go:0:0:0:0 | util.go |  |
diff --git a/go/ql/test/query-tests/Security/CWE-020/IncompleteHostnameRegexp/IncompleteHostnameRegexp.expected b/go/ql/test/query-tests/Security/CWE-020/IncompleteHostnameRegexp/IncompleteHostnameRegexp.expected
index 650fb67ad95..1b984aeedee 100644
--- a/go/ql/test/query-tests/Security/CWE-020/IncompleteHostnameRegexp/IncompleteHostnameRegexp.expected
+++ b/go/ql/test/query-tests/Security/CWE-020/IncompleteHostnameRegexp/IncompleteHostnameRegexp.expected
@@ -6,12 +6,12 @@
 | main.go:56:15:56:34 | ...+... | main.go:56:15:56:34 | ...+... | main.go:56:15:56:34 | ...+... | This regular expression has an unescaped dot before 'example.com', so it might match more hosts than expected when $@. | main.go:56:15:56:34 | ...+... | the regular expression is used |
 | main.go:58:15:58:42 | ...+... | main.go:58:15:58:42 | ...+... | main.go:58:15:58:42 | ...+... | This regular expression has an unescaped dot before 'example.com', so it might match more hosts than expected when $@. | main.go:58:15:58:42 | ...+... | the regular expression is used |
 edges
-| IncompleteHostnameRegexp.go:11:8:11:36 | "^((www\|beta).)?example.com/" | IncompleteHostnameRegexp.go:12:38:12:39 | re | provenance |  Sink:MaD:2 |
+| IncompleteHostnameRegexp.go:11:8:11:36 | "^((www\|beta).)?example.com/" | IncompleteHostnameRegexp.go:12:38:12:39 | re | provenance | Sink:MaD:2 |
 | main.go:49:21:49:45 | `https://www.example.com` | main.go:62:15:62:25 | sourceConst | provenance |  |
-| main.go:62:15:62:25 | sourceConst | main.go:65:15:65:23 | localVar3 | provenance |  Sink:MaD:1 |
+| main.go:62:15:62:25 | sourceConst | main.go:65:15:65:23 | localVar3 | provenance | Sink:MaD:1 |
 models
-| 1 | Sink: regexp; ; true; Match; ; ; Argument[0]; regex-use[1]; manual |
-| 2 | Sink: regexp; ; true; MatchString; ; ; Argument[0]; regex-use[1]; manual |
+| 1 | Sink: regexp; ; false; Match; ; ; Argument[0]; regex-use[1]; manual |
+| 2 | Sink: regexp; ; false; MatchString; ; ; Argument[0]; regex-use[1]; manual |
 nodes
 | IncompleteHostnameRegexp.go:11:8:11:36 | "^((www\|beta).)?example.com/" | semmle.label | "^((www\|beta).)?example.com/" |
 | IncompleteHostnameRegexp.go:12:38:12:39 | re | semmle.label | re |
diff --git a/go/ql/test/query-tests/Security/CWE-022/TaintedPath.expected b/go/ql/test/query-tests/Security/CWE-022/TaintedPath.expected
index b64fea5197d..839d35f663c 100644
--- a/go/ql/test/query-tests/Security/CWE-022/TaintedPath.expected
+++ b/go/ql/test/query-tests/Security/CWE-022/TaintedPath.expected
@@ -4,7 +4,7 @@
 | TaintedPath.go:68:28:68:57 | call to Clean | TaintedPath.go:14:18:14:22 | selection of URL | TaintedPath.go:68:28:68:57 | call to Clean | This path depends on a $@. | TaintedPath.go:14:18:14:22 | selection of URL | user-provided value |
 edges
 | TaintedPath.go:14:18:14:22 | selection of URL | TaintedPath.go:14:18:14:30 | call to Query | provenance | Src:MaD:2 MaD:3 |
-| TaintedPath.go:14:18:14:30 | call to Query | TaintedPath.go:17:29:17:40 | tainted_path | provenance |  Sink:MaD:1 |
+| TaintedPath.go:14:18:14:30 | call to Query | TaintedPath.go:17:29:17:40 | tainted_path | provenance | Sink:MaD:1 |
 | TaintedPath.go:14:18:14:30 | call to Query | TaintedPath.go:21:57:21:68 | tainted_path | provenance |  |
 | TaintedPath.go:14:18:14:30 | call to Query | TaintedPath.go:68:39:68:56 | ...+... | provenance |  |
 | TaintedPath.go:21:57:21:68 | tainted_path | TaintedPath.go:21:28:21:69 | call to Join | provenance | FunctionModel Sink:MaD:1 |
diff --git a/go/ql/test/query-tests/Security/CWE-022/UnsafeUnzipSymlink.expected b/go/ql/test/query-tests/Security/CWE-022/UnsafeUnzipSymlink.expected
index 98bde83cdf8..3276c077109 100644
--- a/go/ql/test/query-tests/Security/CWE-022/UnsafeUnzipSymlink.expected
+++ b/go/ql/test/query-tests/Security/CWE-022/UnsafeUnzipSymlink.expected
@@ -5,8 +5,8 @@
 | UnsafeUnzipSymlink.go:126:17:126:31 | selection of Linkname | UnsafeUnzipSymlink.go:126:17:126:31 | selection of Linkname | UnsafeUnzipSymlink.go:112:13:112:20 | linkName | Unresolved path from an archive header, which may point outside the archive root, is used in $@. | UnsafeUnzipSymlink.go:112:13:112:20 | linkName | symlink creation |
 | UnsafeUnzipSymlink.go:126:34:126:44 | selection of Name | UnsafeUnzipSymlink.go:126:34:126:44 | selection of Name | UnsafeUnzipSymlink.go:112:23:112:30 | fileName | Unresolved path from an archive header, which may point outside the archive root, is used in $@. | UnsafeUnzipSymlink.go:112:23:112:30 | fileName | symlink creation |
 edges
-| UnsafeUnzipSymlink.go:111:19:111:26 | definition of linkName | UnsafeUnzipSymlink.go:112:13:112:20 | linkName | provenance |  Sink:MaD:1 |
-| UnsafeUnzipSymlink.go:111:29:111:36 | definition of fileName | UnsafeUnzipSymlink.go:112:23:112:30 | fileName | provenance |  Sink:MaD:1 |
+| UnsafeUnzipSymlink.go:111:19:111:26 | definition of linkName | UnsafeUnzipSymlink.go:112:13:112:20 | linkName | provenance | Sink:MaD:1 |
+| UnsafeUnzipSymlink.go:111:29:111:36 | definition of fileName | UnsafeUnzipSymlink.go:112:23:112:30 | fileName | provenance | Sink:MaD:1 |
 | UnsafeUnzipSymlink.go:126:17:126:31 | selection of Linkname | UnsafeUnzipSymlink.go:111:19:111:26 | definition of linkName | provenance |  |
 | UnsafeUnzipSymlink.go:126:34:126:44 | selection of Name | UnsafeUnzipSymlink.go:111:29:111:36 | definition of fileName | provenance |  |
 models
diff --git a/go/ql/test/query-tests/Security/CWE-022/ZipSlip.expected b/go/ql/test/query-tests/Security/CWE-022/ZipSlip.expected
index 7f19c98ab06..7cb981667da 100644
--- a/go/ql/test/query-tests/Security/CWE-022/ZipSlip.expected
+++ b/go/ql/test/query-tests/Security/CWE-022/ZipSlip.expected
@@ -11,11 +11,11 @@ edges
 | UnsafeUnzipSymlinkGood.go:76:24:76:38 | selection of Linkname | UnsafeUnzipSymlinkGood.go:52:24:52:32 | definition of candidate | provenance |  |
 | UnsafeUnzipSymlinkGood.go:76:70:76:80 | selection of Name | UnsafeUnzipSymlinkGood.go:52:24:52:32 | definition of candidate | provenance |  |
 | ZipSlip.go:11:2:15:2 | range statement[1] | ZipSlip.go:12:24:12:29 | selection of Name | provenance |  |
-| ZipSlip.go:12:3:12:30 | ... := ...[0] | ZipSlip.go:14:20:14:20 | p | provenance |  Sink:MaD:1 |
+| ZipSlip.go:12:3:12:30 | ... := ...[0] | ZipSlip.go:14:20:14:20 | p | provenance | Sink:MaD:1 |
 | ZipSlip.go:12:24:12:29 | selection of Name | ZipSlip.go:12:3:12:30 | ... := ...[0] | provenance | MaD:4 |
 | tarslip.go:15:2:15:30 | ... := ...[0] | tarslip.go:16:23:16:33 | selection of Name | provenance |  |
 | tarslip.go:16:23:16:33 | selection of Name | tarslip.go:16:14:16:34 | call to Dir | provenance | MaD:5 Sink:MaD:2 |
-| tst.go:23:2:43:2 | range statement[1] | tst.go:29:20:29:23 | path | provenance |  Sink:MaD:1 |
+| tst.go:23:2:43:2 | range statement[1] | tst.go:29:20:29:23 | path | provenance | Sink:MaD:1 |
 models
 | 1 | Sink: io/ioutil; ; false; WriteFile; ; ; Argument[0]; path-injection; manual |
 | 2 | Sink: os; ; false; MkdirAll; ; ; Argument[0]; path-injection; manual |
diff --git a/go/ql/test/query-tests/Security/CWE-078/CommandInjection.expected b/go/ql/test/query-tests/Security/CWE-078/CommandInjection.expected
index 85e1a2e53f6..dff32df4e1f 100644
--- a/go/ql/test/query-tests/Security/CWE-078/CommandInjection.expected
+++ b/go/ql/test/query-tests/Security/CWE-078/CommandInjection.expected
@@ -26,29 +26,29 @@
 | SanitizingDoubleDash.go:148:30:148:36 | tainted | SanitizingDoubleDash.go:92:13:92:19 | selection of URL | SanitizingDoubleDash.go:148:30:148:36 | tainted | This command depends on a $@. | SanitizingDoubleDash.go:92:13:92:19 | selection of URL | user-provided value |
 | SanitizingDoubleDash.go:152:24:152:30 | tainted | SanitizingDoubleDash.go:92:13:92:19 | selection of URL | SanitizingDoubleDash.go:152:24:152:30 | tainted | This command depends on a $@. | SanitizingDoubleDash.go:92:13:92:19 | selection of URL | user-provided value |
 edges
-| ArgumentInjection.go:9:10:9:16 | selection of URL | ArgumentInjection.go:9:10:9:24 | call to Query | provenance | Src:MaD:5 MaD:6 |
+| ArgumentInjection.go:9:10:9:16 | selection of URL | ArgumentInjection.go:9:10:9:24 | call to Query | provenance | Src:MaD:2 MaD:7 |
 | ArgumentInjection.go:9:10:9:24 | call to Query | ArgumentInjection.go:10:31:10:34 | path | provenance |  |
-| CommandInjection2.go:13:15:13:21 | selection of URL | CommandInjection2.go:13:15:13:29 | call to Query | provenance | Src:MaD:5 MaD:6 |
+| CommandInjection2.go:13:15:13:21 | selection of URL | CommandInjection2.go:13:15:13:29 | call to Query | provenance | Src:MaD:2 MaD:7 |
 | CommandInjection2.go:13:15:13:29 | call to Query | CommandInjection2.go:15:67:15:75 | imageName | provenance |  |
-| CommandInjection2.go:15:34:15:88 | []type{args} [array] | CommandInjection2.go:15:34:15:88 | call to Sprintf | provenance | MaD:4 |
+| CommandInjection2.go:15:34:15:88 | []type{args} [array] | CommandInjection2.go:15:34:15:88 | call to Sprintf | provenance | MaD:6 |
 | CommandInjection2.go:15:67:15:75 | imageName | CommandInjection2.go:15:34:15:88 | []type{args} [array] | provenance |  |
 | CommandInjection2.go:15:67:15:75 | imageName | CommandInjection2.go:15:34:15:88 | call to Sprintf | provenance | FunctionModel |
-| CommandInjection2.go:41:15:41:21 | selection of URL | CommandInjection2.go:41:15:41:29 | call to Query | provenance | Src:MaD:5 MaD:6 |
+| CommandInjection2.go:41:15:41:21 | selection of URL | CommandInjection2.go:41:15:41:29 | call to Query | provenance | Src:MaD:2 MaD:7 |
 | CommandInjection2.go:41:15:41:29 | call to Query | CommandInjection2.go:44:67:44:75 | imageName | provenance |  |
-| CommandInjection2.go:44:34:44:88 | []type{args} [array] | CommandInjection2.go:44:34:44:88 | call to Sprintf | provenance | MaD:4 |
+| CommandInjection2.go:44:34:44:88 | []type{args} [array] | CommandInjection2.go:44:34:44:88 | call to Sprintf | provenance | MaD:6 |
 | CommandInjection2.go:44:67:44:75 | imageName | CommandInjection2.go:44:34:44:88 | []type{args} [array] | provenance |  |
 | CommandInjection2.go:44:67:44:75 | imageName | CommandInjection2.go:44:34:44:88 | call to Sprintf | provenance | FunctionModel |
-| CommandInjection.go:9:13:9:19 | selection of URL | CommandInjection.go:9:13:9:27 | call to Query | provenance | Src:MaD:5 MaD:6 |
-| CommandInjection.go:9:13:9:27 | call to Query | CommandInjection.go:10:22:10:28 | cmdName | provenance |  Sink:MaD:7 |
-| GitSubcommands.go:11:13:11:19 | selection of URL | GitSubcommands.go:11:13:11:27 | call to Query | provenance | Src:MaD:5 MaD:6 |
+| CommandInjection.go:9:13:9:19 | selection of URL | CommandInjection.go:9:13:9:27 | call to Query | provenance | Src:MaD:2 MaD:7 |
+| CommandInjection.go:9:13:9:27 | call to Query | CommandInjection.go:10:22:10:28 | cmdName | provenance | Sink:MaD:1 |
+| GitSubcommands.go:11:13:11:19 | selection of URL | GitSubcommands.go:11:13:11:27 | call to Query | provenance | Src:MaD:2 MaD:7 |
 | GitSubcommands.go:11:13:11:27 | call to Query | GitSubcommands.go:13:31:13:37 | tainted | provenance |  |
 | GitSubcommands.go:11:13:11:27 | call to Query | GitSubcommands.go:14:31:14:37 | tainted | provenance |  |
 | GitSubcommands.go:11:13:11:27 | call to Query | GitSubcommands.go:15:30:15:36 | tainted | provenance |  |
 | GitSubcommands.go:11:13:11:27 | call to Query | GitSubcommands.go:16:35:16:41 | tainted | provenance |  |
 | GitSubcommands.go:11:13:11:27 | call to Query | GitSubcommands.go:17:36:17:42 | tainted | provenance |  |
-| GitSubcommands.go:33:13:33:19 | selection of URL | GitSubcommands.go:33:13:33:27 | call to Query | provenance | Src:MaD:5 MaD:6 |
+| GitSubcommands.go:33:13:33:19 | selection of URL | GitSubcommands.go:33:13:33:27 | call to Query | provenance | Src:MaD:2 MaD:7 |
 | GitSubcommands.go:33:13:33:27 | call to Query | GitSubcommands.go:38:32:38:38 | tainted | provenance |  |
-| SanitizingDoubleDash.go:9:13:9:19 | selection of URL | SanitizingDoubleDash.go:9:13:9:27 | call to Query | provenance | Src:MaD:5 MaD:6 |
+| SanitizingDoubleDash.go:9:13:9:19 | selection of URL | SanitizingDoubleDash.go:9:13:9:27 | call to Query | provenance | Src:MaD:2 MaD:7 |
 | SanitizingDoubleDash.go:9:13:9:27 | call to Query | SanitizingDoubleDash.go:13:25:13:31 | tainted | provenance |  |
 | SanitizingDoubleDash.go:9:13:9:27 | call to Query | SanitizingDoubleDash.go:14:23:14:33 | slice expression | provenance |  |
 | SanitizingDoubleDash.go:9:13:9:27 | call to Query | SanitizingDoubleDash.go:39:31:39:37 | tainted | provenance |  |
@@ -59,10 +59,9 @@ edges
 | SanitizingDoubleDash.go:13:15:13:32 | array literal [array] | SanitizingDoubleDash.go:14:23:14:30 | arrayLit [array] | provenance |  |
 | SanitizingDoubleDash.go:13:25:13:31 | tainted | SanitizingDoubleDash.go:13:15:13:32 | array literal [array] | provenance |  |
 | SanitizingDoubleDash.go:14:23:14:30 | arrayLit [array] | SanitizingDoubleDash.go:14:23:14:33 | slice element node | provenance |  |
-| SanitizingDoubleDash.go:14:23:14:33 | slice element node | SanitizingDoubleDash.go:14:23:14:33 | slice expression [array] | provenance |  |
-| SanitizingDoubleDash.go:14:23:14:33 | slice expression [array] | SanitizingDoubleDash.go:14:23:14:33 | slice expression | provenance |  |
-| SanitizingDoubleDash.go:39:14:39:44 | []type{args} [array] | SanitizingDoubleDash.go:39:14:39:44 | call to append | provenance | MaD:3 |
-| SanitizingDoubleDash.go:39:14:39:44 | []type{args} [array] | SanitizingDoubleDash.go:39:14:39:44 | call to append [array] | provenance | MaD:3 |
+| SanitizingDoubleDash.go:14:23:14:33 | slice element node | SanitizingDoubleDash.go:14:23:14:33 | slice expression | provenance |  |
+| SanitizingDoubleDash.go:39:14:39:44 | []type{args} [array] | SanitizingDoubleDash.go:39:14:39:44 | call to append | provenance | MaD:5 |
+| SanitizingDoubleDash.go:39:14:39:44 | []type{args} [array] | SanitizingDoubleDash.go:39:14:39:44 | call to append [array] | provenance | MaD:5 |
 | SanitizingDoubleDash.go:39:14:39:44 | call to append | SanitizingDoubleDash.go:40:23:40:30 | arrayLit | provenance |  |
 | SanitizingDoubleDash.go:39:14:39:44 | call to append [array] | SanitizingDoubleDash.go:40:23:40:30 | arrayLit | provenance |  |
 | SanitizingDoubleDash.go:39:31:39:37 | tainted | SanitizingDoubleDash.go:39:14:39:44 | []type{args} [array] | provenance |  |
@@ -70,20 +69,20 @@ edges
 | SanitizingDoubleDash.go:52:24:52:30 | tainted | SanitizingDoubleDash.go:52:15:52:31 | slice literal [array] | provenance |  |
 | SanitizingDoubleDash.go:53:14:53:35 | call to append | SanitizingDoubleDash.go:54:23:54:30 | arrayLit | provenance |  |
 | SanitizingDoubleDash.go:53:14:53:35 | call to append [array] | SanitizingDoubleDash.go:54:23:54:30 | arrayLit | provenance |  |
-| SanitizingDoubleDash.go:53:21:53:28 | arrayLit | SanitizingDoubleDash.go:53:14:53:35 | call to append | provenance | MaD:1 |
-| SanitizingDoubleDash.go:53:21:53:28 | arrayLit [array] | SanitizingDoubleDash.go:53:14:53:35 | call to append | provenance | MaD:2 |
-| SanitizingDoubleDash.go:53:21:53:28 | arrayLit [array] | SanitizingDoubleDash.go:53:14:53:35 | call to append [array] | provenance | MaD:2 |
-| SanitizingDoubleDash.go:68:14:68:38 | []type{args} [array] | SanitizingDoubleDash.go:68:14:68:38 | call to append | provenance | MaD:3 |
-| SanitizingDoubleDash.go:68:14:68:38 | []type{args} [array] | SanitizingDoubleDash.go:68:14:68:38 | call to append [array] | provenance | MaD:3 |
+| SanitizingDoubleDash.go:53:21:53:28 | arrayLit | SanitizingDoubleDash.go:53:14:53:35 | call to append | provenance | MaD:4 |
+| SanitizingDoubleDash.go:53:21:53:28 | arrayLit [array] | SanitizingDoubleDash.go:53:14:53:35 | call to append | provenance | MaD:3 |
+| SanitizingDoubleDash.go:53:21:53:28 | arrayLit [array] | SanitizingDoubleDash.go:53:14:53:35 | call to append [array] | provenance | MaD:3 |
+| SanitizingDoubleDash.go:68:14:68:38 | []type{args} [array] | SanitizingDoubleDash.go:68:14:68:38 | call to append | provenance | MaD:5 |
+| SanitizingDoubleDash.go:68:14:68:38 | []type{args} [array] | SanitizingDoubleDash.go:68:14:68:38 | call to append [array] | provenance | MaD:5 |
 | SanitizingDoubleDash.go:68:14:68:38 | call to append | SanitizingDoubleDash.go:69:21:69:28 | arrayLit | provenance |  |
 | SanitizingDoubleDash.go:68:14:68:38 | call to append [array] | SanitizingDoubleDash.go:69:21:69:28 | arrayLit [array] | provenance |  |
 | SanitizingDoubleDash.go:68:31:68:37 | tainted | SanitizingDoubleDash.go:68:14:68:38 | []type{args} [array] | provenance |  |
 | SanitizingDoubleDash.go:69:14:69:35 | call to append | SanitizingDoubleDash.go:70:23:70:30 | arrayLit | provenance |  |
 | SanitizingDoubleDash.go:69:14:69:35 | call to append [array] | SanitizingDoubleDash.go:70:23:70:30 | arrayLit | provenance |  |
-| SanitizingDoubleDash.go:69:21:69:28 | arrayLit | SanitizingDoubleDash.go:69:14:69:35 | call to append | provenance | MaD:1 |
-| SanitizingDoubleDash.go:69:21:69:28 | arrayLit [array] | SanitizingDoubleDash.go:69:14:69:35 | call to append | provenance | MaD:2 |
-| SanitizingDoubleDash.go:69:21:69:28 | arrayLit [array] | SanitizingDoubleDash.go:69:14:69:35 | call to append [array] | provenance | MaD:2 |
-| SanitizingDoubleDash.go:92:13:92:19 | selection of URL | SanitizingDoubleDash.go:92:13:92:27 | call to Query | provenance | Src:MaD:5 MaD:6 |
+| SanitizingDoubleDash.go:69:21:69:28 | arrayLit | SanitizingDoubleDash.go:69:14:69:35 | call to append | provenance | MaD:4 |
+| SanitizingDoubleDash.go:69:21:69:28 | arrayLit [array] | SanitizingDoubleDash.go:69:14:69:35 | call to append | provenance | MaD:3 |
+| SanitizingDoubleDash.go:69:21:69:28 | arrayLit [array] | SanitizingDoubleDash.go:69:14:69:35 | call to append [array] | provenance | MaD:3 |
+| SanitizingDoubleDash.go:92:13:92:19 | selection of URL | SanitizingDoubleDash.go:92:13:92:27 | call to Query | provenance | Src:MaD:2 MaD:7 |
 | SanitizingDoubleDash.go:92:13:92:27 | call to Query | SanitizingDoubleDash.go:95:25:95:31 | tainted | provenance |  |
 | SanitizingDoubleDash.go:92:13:92:27 | call to Query | SanitizingDoubleDash.go:96:24:96:34 | slice expression | provenance |  |
 | SanitizingDoubleDash.go:92:13:92:27 | call to Query | SanitizingDoubleDash.go:100:31:100:37 | tainted | provenance |  |
@@ -102,27 +101,25 @@ edges
 | SanitizingDoubleDash.go:95:15:95:32 | array literal [array] | SanitizingDoubleDash.go:96:24:96:31 | arrayLit [array] | provenance |  |
 | SanitizingDoubleDash.go:95:25:95:31 | tainted | SanitizingDoubleDash.go:95:15:95:32 | array literal [array] | provenance |  |
 | SanitizingDoubleDash.go:96:24:96:31 | arrayLit [array] | SanitizingDoubleDash.go:96:24:96:34 | slice element node | provenance |  |
-| SanitizingDoubleDash.go:96:24:96:34 | slice element node | SanitizingDoubleDash.go:96:24:96:34 | slice expression [array] | provenance |  |
-| SanitizingDoubleDash.go:96:24:96:34 | slice expression [array] | SanitizingDoubleDash.go:96:24:96:34 | slice expression | provenance |  |
+| SanitizingDoubleDash.go:96:24:96:34 | slice element node | SanitizingDoubleDash.go:96:24:96:34 | slice expression | provenance |  |
 | SanitizingDoubleDash.go:100:15:100:38 | array literal [array] | SanitizingDoubleDash.go:101:24:101:31 | arrayLit [array] | provenance |  |
 | SanitizingDoubleDash.go:100:31:100:37 | tainted | SanitizingDoubleDash.go:100:15:100:38 | array literal [array] | provenance |  |
 | SanitizingDoubleDash.go:101:24:101:31 | arrayLit [array] | SanitizingDoubleDash.go:101:24:101:34 | slice element node | provenance |  |
-| SanitizingDoubleDash.go:101:24:101:34 | slice element node | SanitizingDoubleDash.go:101:24:101:34 | slice expression [array] | provenance |  |
-| SanitizingDoubleDash.go:101:24:101:34 | slice expression [array] | SanitizingDoubleDash.go:101:24:101:34 | slice expression | provenance |  |
+| SanitizingDoubleDash.go:101:24:101:34 | slice element node | SanitizingDoubleDash.go:101:24:101:34 | slice expression | provenance |  |
 | SanitizingDoubleDash.go:105:15:105:37 | slice literal [array] | SanitizingDoubleDash.go:106:24:106:31 | arrayLit | provenance |  |
 | SanitizingDoubleDash.go:105:30:105:36 | tainted | SanitizingDoubleDash.go:105:15:105:37 | slice literal [array] | provenance |  |
-| SanitizingDoubleDash.go:111:14:111:44 | []type{args} [array] | SanitizingDoubleDash.go:111:14:111:44 | call to append | provenance | MaD:3 |
-| SanitizingDoubleDash.go:111:14:111:44 | []type{args} [array] | SanitizingDoubleDash.go:111:14:111:44 | call to append [array] | provenance | MaD:3 |
+| SanitizingDoubleDash.go:111:14:111:44 | []type{args} [array] | SanitizingDoubleDash.go:111:14:111:44 | call to append | provenance | MaD:5 |
+| SanitizingDoubleDash.go:111:14:111:44 | []type{args} [array] | SanitizingDoubleDash.go:111:14:111:44 | call to append [array] | provenance | MaD:5 |
 | SanitizingDoubleDash.go:111:14:111:44 | call to append | SanitizingDoubleDash.go:112:24:112:31 | arrayLit | provenance |  |
 | SanitizingDoubleDash.go:111:14:111:44 | call to append [array] | SanitizingDoubleDash.go:112:24:112:31 | arrayLit | provenance |  |
 | SanitizingDoubleDash.go:111:37:111:43 | tainted | SanitizingDoubleDash.go:111:14:111:44 | []type{args} [array] | provenance |  |
-| SanitizingDoubleDash.go:117:14:117:44 | []type{args} [array] | SanitizingDoubleDash.go:117:14:117:44 | call to append | provenance | MaD:3 |
-| SanitizingDoubleDash.go:117:14:117:44 | []type{args} [array] | SanitizingDoubleDash.go:117:14:117:44 | call to append [array] | provenance | MaD:3 |
+| SanitizingDoubleDash.go:117:14:117:44 | []type{args} [array] | SanitizingDoubleDash.go:117:14:117:44 | call to append | provenance | MaD:5 |
+| SanitizingDoubleDash.go:117:14:117:44 | []type{args} [array] | SanitizingDoubleDash.go:117:14:117:44 | call to append [array] | provenance | MaD:5 |
 | SanitizingDoubleDash.go:117:14:117:44 | call to append | SanitizingDoubleDash.go:118:24:118:31 | arrayLit | provenance |  |
 | SanitizingDoubleDash.go:117:14:117:44 | call to append [array] | SanitizingDoubleDash.go:118:24:118:31 | arrayLit | provenance |  |
 | SanitizingDoubleDash.go:117:31:117:37 | tainted | SanitizingDoubleDash.go:117:14:117:44 | []type{args} [array] | provenance |  |
-| SanitizingDoubleDash.go:123:14:123:38 | []type{args} [array] | SanitizingDoubleDash.go:123:14:123:38 | call to append | provenance | MaD:3 |
-| SanitizingDoubleDash.go:123:14:123:38 | []type{args} [array] | SanitizingDoubleDash.go:123:14:123:38 | call to append [array] | provenance | MaD:3 |
+| SanitizingDoubleDash.go:123:14:123:38 | []type{args} [array] | SanitizingDoubleDash.go:123:14:123:38 | call to append | provenance | MaD:5 |
+| SanitizingDoubleDash.go:123:14:123:38 | []type{args} [array] | SanitizingDoubleDash.go:123:14:123:38 | call to append [array] | provenance | MaD:5 |
 | SanitizingDoubleDash.go:123:14:123:38 | call to append | SanitizingDoubleDash.go:124:24:124:31 | arrayLit | provenance |  |
 | SanitizingDoubleDash.go:123:14:123:38 | call to append [array] | SanitizingDoubleDash.go:124:24:124:31 | arrayLit | provenance |  |
 | SanitizingDoubleDash.go:123:31:123:37 | tainted | SanitizingDoubleDash.go:123:14:123:38 | []type{args} [array] | provenance |  |
@@ -130,32 +127,32 @@ edges
 | SanitizingDoubleDash.go:128:24:128:30 | tainted | SanitizingDoubleDash.go:128:15:128:31 | slice literal [array] | provenance |  |
 | SanitizingDoubleDash.go:129:14:129:35 | call to append | SanitizingDoubleDash.go:130:24:130:31 | arrayLit | provenance |  |
 | SanitizingDoubleDash.go:129:14:129:35 | call to append [array] | SanitizingDoubleDash.go:130:24:130:31 | arrayLit | provenance |  |
-| SanitizingDoubleDash.go:129:21:129:28 | arrayLit | SanitizingDoubleDash.go:129:14:129:35 | call to append | provenance | MaD:1 |
-| SanitizingDoubleDash.go:129:21:129:28 | arrayLit [array] | SanitizingDoubleDash.go:129:14:129:35 | call to append | provenance | MaD:2 |
-| SanitizingDoubleDash.go:129:21:129:28 | arrayLit [array] | SanitizingDoubleDash.go:129:14:129:35 | call to append [array] | provenance | MaD:2 |
-| SanitizingDoubleDash.go:136:14:136:38 | []type{args} [array] | SanitizingDoubleDash.go:136:14:136:38 | call to append | provenance | MaD:3 |
-| SanitizingDoubleDash.go:136:14:136:38 | []type{args} [array] | SanitizingDoubleDash.go:136:14:136:38 | call to append [array] | provenance | MaD:3 |
+| SanitizingDoubleDash.go:129:21:129:28 | arrayLit | SanitizingDoubleDash.go:129:14:129:35 | call to append | provenance | MaD:4 |
+| SanitizingDoubleDash.go:129:21:129:28 | arrayLit [array] | SanitizingDoubleDash.go:129:14:129:35 | call to append | provenance | MaD:3 |
+| SanitizingDoubleDash.go:129:21:129:28 | arrayLit [array] | SanitizingDoubleDash.go:129:14:129:35 | call to append [array] | provenance | MaD:3 |
+| SanitizingDoubleDash.go:136:14:136:38 | []type{args} [array] | SanitizingDoubleDash.go:136:14:136:38 | call to append | provenance | MaD:5 |
+| SanitizingDoubleDash.go:136:14:136:38 | []type{args} [array] | SanitizingDoubleDash.go:136:14:136:38 | call to append [array] | provenance | MaD:5 |
 | SanitizingDoubleDash.go:136:14:136:38 | call to append | SanitizingDoubleDash.go:137:24:137:31 | arrayLit | provenance |  |
 | SanitizingDoubleDash.go:136:14:136:38 | call to append [array] | SanitizingDoubleDash.go:137:24:137:31 | arrayLit | provenance |  |
 | SanitizingDoubleDash.go:136:31:136:37 | tainted | SanitizingDoubleDash.go:136:14:136:38 | []type{args} [array] | provenance |  |
-| SanitizingDoubleDash.go:142:14:142:38 | []type{args} [array] | SanitizingDoubleDash.go:142:14:142:38 | call to append | provenance | MaD:3 |
-| SanitizingDoubleDash.go:142:14:142:38 | []type{args} [array] | SanitizingDoubleDash.go:142:14:142:38 | call to append [array] | provenance | MaD:3 |
+| SanitizingDoubleDash.go:142:14:142:38 | []type{args} [array] | SanitizingDoubleDash.go:142:14:142:38 | call to append | provenance | MaD:5 |
+| SanitizingDoubleDash.go:142:14:142:38 | []type{args} [array] | SanitizingDoubleDash.go:142:14:142:38 | call to append [array] | provenance | MaD:5 |
 | SanitizingDoubleDash.go:142:14:142:38 | call to append | SanitizingDoubleDash.go:143:21:143:28 | arrayLit | provenance |  |
 | SanitizingDoubleDash.go:142:14:142:38 | call to append [array] | SanitizingDoubleDash.go:143:21:143:28 | arrayLit [array] | provenance |  |
 | SanitizingDoubleDash.go:142:31:142:37 | tainted | SanitizingDoubleDash.go:142:14:142:38 | []type{args} [array] | provenance |  |
 | SanitizingDoubleDash.go:143:14:143:35 | call to append | SanitizingDoubleDash.go:144:24:144:31 | arrayLit | provenance |  |
 | SanitizingDoubleDash.go:143:14:143:35 | call to append [array] | SanitizingDoubleDash.go:144:24:144:31 | arrayLit | provenance |  |
-| SanitizingDoubleDash.go:143:21:143:28 | arrayLit | SanitizingDoubleDash.go:143:14:143:35 | call to append | provenance | MaD:1 |
-| SanitizingDoubleDash.go:143:21:143:28 | arrayLit [array] | SanitizingDoubleDash.go:143:14:143:35 | call to append | provenance | MaD:2 |
-| SanitizingDoubleDash.go:143:21:143:28 | arrayLit [array] | SanitizingDoubleDash.go:143:14:143:35 | call to append [array] | provenance | MaD:2 |
+| SanitizingDoubleDash.go:143:21:143:28 | arrayLit | SanitizingDoubleDash.go:143:14:143:35 | call to append | provenance | MaD:4 |
+| SanitizingDoubleDash.go:143:21:143:28 | arrayLit [array] | SanitizingDoubleDash.go:143:14:143:35 | call to append | provenance | MaD:3 |
+| SanitizingDoubleDash.go:143:21:143:28 | arrayLit [array] | SanitizingDoubleDash.go:143:14:143:35 | call to append [array] | provenance | MaD:3 |
 models
-| 1 | Summary: ; ; false; append; ; ; Argument[0]; ReturnValue; taint; manual |
-| 2 | Summary: ; ; false; append; ; ; Argument[0].ArrayElement; ReturnValue.ArrayElement; value; manual |
-| 3 | Summary: ; ; false; append; ; ; Argument[1].ArrayElement; ReturnValue.ArrayElement; value; manual |
-| 4 | Summary: fmt; ; true; Sprintf; ; ; Argument[1].ArrayElement; ReturnValue; taint; manual |
-| 5 | Source: net/http; Request; true; URL; ; ; ; remote; manual |
-| 6 | Summary: net/url; URL; true; Query; ; ; Argument[receiver]; ReturnValue; taint; manual |
-| 7 | Sink: os/exec; ; false; Command; ; ; Argument[0]; command-injection; manual |
+| 1 | Sink: os/exec; ; false; Command; ; ; Argument[0]; command-injection; manual |
+| 2 | Source: net/http; Request; true; URL; ; ; ; remote; manual |
+| 3 | Summary: ; ; false; append; ; ; Argument[0].ArrayElement; ReturnValue.ArrayElement; value; manual |
+| 4 | Summary: ; ; false; append; ; ; Argument[0]; ReturnValue; taint; manual |
+| 5 | Summary: ; ; false; append; ; ; Argument[1].ArrayElement; ReturnValue.ArrayElement; value; manual |
+| 6 | Summary: fmt; ; false; Sprintf; ; ; Argument[1].ArrayElement; ReturnValue; taint; manual |
+| 7 | Summary: net/url; URL; true; Query; ; ; Argument[receiver]; ReturnValue; taint; manual |
 nodes
 | ArgumentInjection.go:9:10:9:16 | selection of URL | semmle.label | selection of URL |
 | ArgumentInjection.go:9:10:9:24 | call to Query | semmle.label | call to Query |
@@ -190,7 +187,6 @@ nodes
 | SanitizingDoubleDash.go:14:23:14:30 | arrayLit [array] | semmle.label | arrayLit [array] |
 | SanitizingDoubleDash.go:14:23:14:33 | slice element node | semmle.label | slice element node |
 | SanitizingDoubleDash.go:14:23:14:33 | slice expression | semmle.label | slice expression |
-| SanitizingDoubleDash.go:14:23:14:33 | slice expression [array] | semmle.label | slice expression [array] |
 | SanitizingDoubleDash.go:39:14:39:44 | []type{args} [array] | semmle.label | []type{args} [array] |
 | SanitizingDoubleDash.go:39:14:39:44 | call to append | semmle.label | call to append |
 | SanitizingDoubleDash.go:39:14:39:44 | call to append [array] | semmle.label | call to append [array] |
@@ -220,13 +216,11 @@ nodes
 | SanitizingDoubleDash.go:96:24:96:31 | arrayLit [array] | semmle.label | arrayLit [array] |
 | SanitizingDoubleDash.go:96:24:96:34 | slice element node | semmle.label | slice element node |
 | SanitizingDoubleDash.go:96:24:96:34 | slice expression | semmle.label | slice expression |
-| SanitizingDoubleDash.go:96:24:96:34 | slice expression [array] | semmle.label | slice expression [array] |
 | SanitizingDoubleDash.go:100:15:100:38 | array literal [array] | semmle.label | array literal [array] |
 | SanitizingDoubleDash.go:100:31:100:37 | tainted | semmle.label | tainted |
 | SanitizingDoubleDash.go:101:24:101:31 | arrayLit [array] | semmle.label | arrayLit [array] |
 | SanitizingDoubleDash.go:101:24:101:34 | slice element node | semmle.label | slice element node |
 | SanitizingDoubleDash.go:101:24:101:34 | slice expression | semmle.label | slice expression |
-| SanitizingDoubleDash.go:101:24:101:34 | slice expression [array] | semmle.label | slice expression [array] |
 | SanitizingDoubleDash.go:105:15:105:37 | slice literal [array] | semmle.label | slice literal [array] |
 | SanitizingDoubleDash.go:105:30:105:36 | tainted | semmle.label | tainted |
 | SanitizingDoubleDash.go:106:24:106:31 | arrayLit | semmle.label | arrayLit |
diff --git a/go/ql/test/query-tests/Security/CWE-078/StoredCommand.expected b/go/ql/test/query-tests/Security/CWE-078/StoredCommand.expected
index faba4f42251..12be518a98b 100644
--- a/go/ql/test/query-tests/Security/CWE-078/StoredCommand.expected
+++ b/go/ql/test/query-tests/Security/CWE-078/StoredCommand.expected
@@ -3,7 +3,7 @@
 edges
 | StoredCommand.go:11:2:11:27 | ... := ...[0] | StoredCommand.go:13:2:13:5 | rows | provenance |  |
 | StoredCommand.go:13:2:13:5 | rows | StoredCommand.go:13:12:13:19 | &... | provenance | FunctionModel |
-| StoredCommand.go:13:12:13:19 | &... | StoredCommand.go:14:22:14:28 | cmdName | provenance |  Sink:MaD:1 |
+| StoredCommand.go:13:12:13:19 | &... | StoredCommand.go:14:22:14:28 | cmdName | provenance | Sink:MaD:1 |
 models
 | 1 | Sink: os/exec; ; false; Command; ; ; Argument[0]; command-injection; manual |
 nodes
diff --git a/go/ql/test/query-tests/Security/CWE-079/ReflectedXss.expected b/go/ql/test/query-tests/Security/CWE-079/ReflectedXss.expected
index 70143f77d9c..647113f3c6b 100644
--- a/go/ql/test/query-tests/Security/CWE-079/ReflectedXss.expected
+++ b/go/ql/test/query-tests/Security/CWE-079/ReflectedXss.expected
@@ -20,73 +20,73 @@
 | websocketXss.go:52:24:52:31 | gorilla2 | websocketXss.go:50:3:50:10 | definition of gorilla2 | websocketXss.go:52:24:52:31 | gorilla2 | Cross-site scripting vulnerability due to $@. | websocketXss.go:50:3:50:10 | definition of gorilla2 | user-provided value | websocketXss.go:0:0:0:0 | websocketXss.go |  |
 | websocketXss.go:55:24:55:31 | gorilla3 | websocketXss.go:54:3:54:38 | ... := ...[1] | websocketXss.go:55:24:55:31 | gorilla3 | Cross-site scripting vulnerability due to $@. | websocketXss.go:54:3:54:38 | ... := ...[1] | user-provided value | websocketXss.go:0:0:0:0 | websocketXss.go |  |
 edges
-| ReflectedXss.go:11:15:11:20 | selection of Form | ReflectedXss.go:11:15:11:36 | call to Get | provenance | Src:MaD:14 MaD:17 |
+| ReflectedXss.go:11:15:11:20 | selection of Form | ReflectedXss.go:11:15:11:36 | call to Get | provenance | Src:MaD:6 MaD:18 |
 | ReflectedXss.go:11:15:11:36 | call to Get | ReflectedXss.go:14:44:14:51 | username | provenance |  |
-| contenttype.go:11:11:11:16 | selection of Form | contenttype.go:11:11:11:28 | call to Get | provenance | Src:MaD:14 MaD:17 |
+| contenttype.go:11:11:11:16 | selection of Form | contenttype.go:11:11:11:28 | call to Get | provenance | Src:MaD:6 MaD:18 |
 | contenttype.go:11:11:11:28 | call to Get | contenttype.go:17:11:17:22 | type conversion | provenance |  |
-| contenttype.go:49:11:49:16 | selection of Form | contenttype.go:49:11:49:28 | call to Get | provenance | Src:MaD:14 MaD:17 |
+| contenttype.go:49:11:49:16 | selection of Form | contenttype.go:49:11:49:28 | call to Get | provenance | Src:MaD:6 MaD:18 |
 | contenttype.go:49:11:49:28 | call to Get | contenttype.go:53:34:53:37 | data | provenance |  |
-| contenttype.go:63:10:63:28 | call to FormValue | contenttype.go:64:52:64:55 | data | provenance | Src:MaD:12  |
-| contenttype.go:73:10:73:28 | call to FormValue | contenttype.go:79:11:79:14 | data | provenance | Src:MaD:12  |
-| contenttype.go:88:10:88:28 | call to FormValue | contenttype.go:91:4:91:7 | data | provenance | Src:MaD:12  |
-| contenttype.go:113:10:113:28 | call to FormValue | contenttype.go:114:50:114:53 | data | provenance | Src:MaD:12  |
-| reflectedxsstest.go:31:2:31:44 | ... := ...[0] | reflectedxsstest.go:32:34:32:37 | file | provenance | Src:MaD:11  |
-| reflectedxsstest.go:31:2:31:44 | ... := ...[1] | reflectedxsstest.go:34:46:34:60 | selection of Filename | provenance | Src:MaD:11  |
+| contenttype.go:63:10:63:28 | call to FormValue | contenttype.go:64:52:64:55 | data | provenance | Src:MaD:8  |
+| contenttype.go:73:10:73:28 | call to FormValue | contenttype.go:79:11:79:14 | data | provenance | Src:MaD:8  |
+| contenttype.go:88:10:88:28 | call to FormValue | contenttype.go:91:4:91:7 | data | provenance | Src:MaD:8  |
+| contenttype.go:113:10:113:28 | call to FormValue | contenttype.go:114:50:114:53 | data | provenance | Src:MaD:8  |
+| reflectedxsstest.go:31:2:31:44 | ... := ...[0] | reflectedxsstest.go:32:34:32:37 | file | provenance | Src:MaD:7  |
+| reflectedxsstest.go:31:2:31:44 | ... := ...[1] | reflectedxsstest.go:34:46:34:60 | selection of Filename | provenance | Src:MaD:7  |
 | reflectedxsstest.go:32:2:32:38 | ... := ...[0] | reflectedxsstest.go:33:49:33:55 | content | provenance |  |
-| reflectedxsstest.go:32:34:32:37 | file | reflectedxsstest.go:32:2:32:38 | ... := ...[0] | provenance | MaD:7 |
-| reflectedxsstest.go:33:17:33:56 | []type{args} [array] | reflectedxsstest.go:33:17:33:56 | call to Sprintf | provenance | MaD:1 |
+| reflectedxsstest.go:32:34:32:37 | file | reflectedxsstest.go:32:2:32:38 | ... := ...[0] | provenance | MaD:13 |
+| reflectedxsstest.go:33:17:33:56 | []type{args} [array] | reflectedxsstest.go:33:17:33:56 | call to Sprintf | provenance | MaD:12 |
 | reflectedxsstest.go:33:17:33:56 | call to Sprintf | reflectedxsstest.go:33:10:33:57 | type conversion | provenance |  |
 | reflectedxsstest.go:33:49:33:55 | content | reflectedxsstest.go:33:17:33:56 | []type{args} [array] | provenance |  |
 | reflectedxsstest.go:33:49:33:55 | content | reflectedxsstest.go:33:17:33:56 | call to Sprintf | provenance | FunctionModel |
-| reflectedxsstest.go:34:17:34:61 | []type{args} [array] | reflectedxsstest.go:34:17:34:61 | call to Sprintf | provenance | MaD:1 |
+| reflectedxsstest.go:34:17:34:61 | []type{args} [array] | reflectedxsstest.go:34:17:34:61 | call to Sprintf | provenance | MaD:12 |
 | reflectedxsstest.go:34:17:34:61 | call to Sprintf | reflectedxsstest.go:34:10:34:62 | type conversion | provenance |  |
 | reflectedxsstest.go:34:46:34:60 | selection of Filename | reflectedxsstest.go:34:17:34:61 | []type{args} [array] | provenance |  |
 | reflectedxsstest.go:34:46:34:60 | selection of Filename | reflectedxsstest.go:34:17:34:61 | call to Sprintf | provenance | FunctionModel |
-| reflectedxsstest.go:38:2:38:35 | ... := ...[0] | reflectedxsstest.go:39:16:39:21 | reader | provenance | Src:MaD:13  |
+| reflectedxsstest.go:38:2:38:35 | ... := ...[0] | reflectedxsstest.go:39:16:39:21 | reader | provenance | Src:MaD:9  |
 | reflectedxsstest.go:39:2:39:32 | ... := ...[0] | reflectedxsstest.go:40:14:40:17 | part | provenance |  |
 | reflectedxsstest.go:39:2:39:32 | ... := ...[0] | reflectedxsstest.go:42:2:42:5 | part | provenance |  |
-| reflectedxsstest.go:39:16:39:21 | reader | reflectedxsstest.go:39:2:39:32 | ... := ...[0] | provenance | MaD:10 |
-| reflectedxsstest.go:40:14:40:17 | part | reflectedxsstest.go:40:14:40:28 | call to FileName | provenance | MaD:9 |
+| reflectedxsstest.go:39:16:39:21 | reader | reflectedxsstest.go:39:2:39:32 | ... := ...[0] | provenance | MaD:16 |
+| reflectedxsstest.go:40:14:40:17 | part | reflectedxsstest.go:40:14:40:28 | call to FileName | provenance | MaD:15 |
 | reflectedxsstest.go:40:14:40:28 | call to FileName | reflectedxsstest.go:44:46:44:53 | partName | provenance |  |
 | reflectedxsstest.go:41:2:41:10 | definition of byteSlice | reflectedxsstest.go:45:10:45:18 | byteSlice | provenance |  |
-| reflectedxsstest.go:42:2:42:5 | part | reflectedxsstest.go:41:2:41:10 | definition of byteSlice | provenance | MaD:8 |
-| reflectedxsstest.go:44:17:44:54 | []type{args} [array] | reflectedxsstest.go:44:17:44:54 | call to Sprintf | provenance | MaD:1 |
+| reflectedxsstest.go:42:2:42:5 | part | reflectedxsstest.go:41:2:41:10 | definition of byteSlice | provenance | MaD:14 |
+| reflectedxsstest.go:44:17:44:54 | []type{args} [array] | reflectedxsstest.go:44:17:44:54 | call to Sprintf | provenance | MaD:12 |
 | reflectedxsstest.go:44:17:44:54 | call to Sprintf | reflectedxsstest.go:44:10:44:55 | type conversion | provenance |  |
 | reflectedxsstest.go:44:46:44:53 | partName | reflectedxsstest.go:44:17:44:54 | []type{args} [array] | provenance |  |
 | reflectedxsstest.go:44:46:44:53 | partName | reflectedxsstest.go:44:17:44:54 | call to Sprintf | provenance | FunctionModel |
-| reflectedxsstest.go:51:14:51:18 | selection of URL | reflectedxsstest.go:51:14:51:26 | call to Query | provenance | Src:MaD:15 MaD:16 |
+| reflectedxsstest.go:51:14:51:18 | selection of URL | reflectedxsstest.go:51:14:51:26 | call to Query | provenance | Src:MaD:10 MaD:17 |
 | reflectedxsstest.go:51:14:51:26 | call to Query | reflectedxsstest.go:54:11:54:21 | type conversion | provenance |  |
-| tst.go:14:15:14:20 | selection of Form | tst.go:14:15:14:36 | call to Get | provenance | Src:MaD:14 MaD:17 |
+| tst.go:14:15:14:20 | selection of Form | tst.go:14:15:14:36 | call to Get | provenance | Src:MaD:6 MaD:18 |
 | tst.go:14:15:14:36 | call to Get | tst.go:18:32:18:32 | a | provenance |  |
 | tst.go:18:19:18:38 | call to Join | tst.go:18:12:18:39 | type conversion | provenance |  |
 | tst.go:18:32:18:32 | a | tst.go:18:19:18:38 | call to Join | provenance | MaD:19 |
-| tst.go:48:14:48:19 | selection of Form | tst.go:48:14:48:34 | call to Get | provenance | Src:MaD:14 MaD:17 |
+| tst.go:48:14:48:19 | selection of Form | tst.go:48:14:48:34 | call to Get | provenance | Src:MaD:6 MaD:18 |
 | tst.go:48:14:48:34 | call to Get | tst.go:53:12:53:26 | type conversion | provenance |  |
-| websocketXss.go:30:7:30:10 | definition of xnet | websocketXss.go:32:24:32:27 | xnet | provenance | Src:MaD:6  |
-| websocketXss.go:34:3:34:7 | definition of xnet2 | websocketXss.go:36:24:36:28 | xnet2 | provenance | Src:MaD:5  |
-| websocketXss.go:40:3:40:40 | ... := ...[1] | websocketXss.go:41:24:41:29 | nhooyr | provenance | Src:MaD:18  |
-| websocketXss.go:46:7:46:16 | definition of gorillaMsg | websocketXss.go:48:24:48:33 | gorillaMsg | provenance | Src:MaD:2  |
-| websocketXss.go:50:3:50:10 | definition of gorilla2 | websocketXss.go:52:24:52:31 | gorilla2 | provenance | Src:MaD:3  |
-| websocketXss.go:54:3:54:38 | ... := ...[1] | websocketXss.go:55:24:55:31 | gorilla3 | provenance | Src:MaD:4  |
+| websocketXss.go:30:7:30:10 | definition of xnet | websocketXss.go:32:24:32:27 | xnet | provenance | Src:MaD:5  |
+| websocketXss.go:34:3:34:7 | definition of xnet2 | websocketXss.go:36:24:36:28 | xnet2 | provenance | Src:MaD:4  |
+| websocketXss.go:40:3:40:40 | ... := ...[1] | websocketXss.go:41:24:41:29 | nhooyr | provenance | Src:MaD:11  |
+| websocketXss.go:46:7:46:16 | definition of gorillaMsg | websocketXss.go:48:24:48:33 | gorillaMsg | provenance | Src:MaD:1  |
+| websocketXss.go:50:3:50:10 | definition of gorilla2 | websocketXss.go:52:24:52:31 | gorilla2 | provenance | Src:MaD:2  |
+| websocketXss.go:54:3:54:38 | ... := ...[1] | websocketXss.go:55:24:55:31 | gorilla3 | provenance | Src:MaD:3  |
 models
-| 1 | Summary: fmt; ; true; Sprintf; ; ; Argument[1].ArrayElement; ReturnValue; taint; manual |
-| 2 | Source: github.com/gorilla/websocket; ; true; ReadJSON; ; ; Argument[1]; remote; manual |
-| 3 | Source: github.com/gorilla/websocket; Conn; true; ReadJSON; ; ; Argument[0]; remote; manual |
-| 4 | Source: github.com/gorilla/websocket; Conn; true; ReadMessage; ; ; ReturnValue[1]; remote; manual |
-| 5 | Source: golang.org/x/net/websocket; Codec; true; Receive; ; ; Argument[1]; remote; manual |
-| 6 | Source: golang.org/x/net/websocket; Conn; true; Read; ; ; Argument[0]; remote; manual |
-| 7 | Summary: io/ioutil; ; false; ReadAll; ; ; Argument[0]; ReturnValue[0]; taint; manual |
-| 8 | Summary: io; Reader; true; Read; ; ; Argument[receiver]; Argument[0]; taint; manual |
-| 9 | Summary: mime/multipart; Part; true; FileName; ; ; Argument[receiver]; ReturnValue; taint; manual |
-| 10 | Summary: mime/multipart; Reader; true; NextPart; ; ; Argument[receiver]; ReturnValue[0]; taint; manual |
-| 11 | Source: net/http; Request; true; FormFile; ; ; ReturnValue[0..1]; remote; manual |
-| 12 | Source: net/http; Request; true; FormValue; ; ; ReturnValue; remote; manual |
-| 13 | Source: net/http; Request; true; MultipartReader; ; ; ReturnValue[0]; remote; manual |
-| 14 | Source: net/http; Request; true; Form; ; ; ; remote; manual |
-| 15 | Source: net/http; Request; true; URL; ; ; ; remote; manual |
-| 16 | Summary: net/url; URL; true; Query; ; ; Argument[receiver]; ReturnValue; taint; manual |
-| 17 | Summary: net/url; Values; true; Get; ; ; Argument[receiver]; ReturnValue; taint; manual |
-| 18 | Source: nhooyr.io/websocket; Conn; true; Read; ; ; ReturnValue[1]; remote; manual |
+| 1 | Source: github.com/gorilla/websocket; ; false; ReadJSON; ; ; Argument[1]; remote; manual |
+| 2 | Source: github.com/gorilla/websocket; Conn; true; ReadJSON; ; ; Argument[0]; remote; manual |
+| 3 | Source: github.com/gorilla/websocket; Conn; true; ReadMessage; ; ; ReturnValue[1]; remote; manual |
+| 4 | Source: golang.org/x/net/websocket; Codec; true; Receive; ; ; Argument[1]; remote; manual |
+| 5 | Source: golang.org/x/net/websocket; Conn; true; Read; ; ; Argument[0]; remote; manual |
+| 6 | Source: net/http; Request; true; Form; ; ; ; remote; manual |
+| 7 | Source: net/http; Request; true; FormFile; ; ; ReturnValue[0..1]; remote; manual |
+| 8 | Source: net/http; Request; true; FormValue; ; ; ReturnValue; remote; manual |
+| 9 | Source: net/http; Request; true; MultipartReader; ; ; ReturnValue[0]; remote; manual |
+| 10 | Source: net/http; Request; true; URL; ; ; ; remote; manual |
+| 11 | Source: nhooyr.io/websocket; Conn; true; Read; ; ; ReturnValue[1]; remote; manual |
+| 12 | Summary: fmt; ; false; Sprintf; ; ; Argument[1].ArrayElement; ReturnValue; taint; manual |
+| 13 | Summary: io/ioutil; ; false; ReadAll; ; ; Argument[0]; ReturnValue[0]; taint; manual |
+| 14 | Summary: io; Reader; true; Read; ; ; Argument[receiver]; Argument[0]; taint; manual |
+| 15 | Summary: mime/multipart; Part; true; FileName; ; ; Argument[receiver]; ReturnValue; taint; manual |
+| 16 | Summary: mime/multipart; Reader; true; NextPart; ; ; Argument[receiver]; ReturnValue[0]; taint; manual |
+| 17 | Summary: net/url; URL; true; Query; ; ; Argument[receiver]; ReturnValue; taint; manual |
+| 18 | Summary: net/url; Values; true; Get; ; ; Argument[receiver]; ReturnValue; taint; manual |
 | 19 | Summary: strings; ; false; Join; ; ; Argument[0..1]; ReturnValue; taint; manual |
 nodes
 | ReflectedXss.go:11:15:11:20 | selection of Form | semmle.label | selection of Form |
diff --git a/go/ql/test/query-tests/Security/CWE-089/SqlInjection.expected b/go/ql/test/query-tests/Security/CWE-089/SqlInjection.expected
index 0da4f893d87..79d8809e19f 100644
--- a/go/ql/test/query-tests/Security/CWE-089/SqlInjection.expected
+++ b/go/ql/test/query-tests/Security/CWE-089/SqlInjection.expected
@@ -25,52 +25,52 @@
 | mongoDB.go:80:22:80:27 | filter | mongoDB.go:40:20:40:30 | call to Referer | mongoDB.go:80:22:80:27 | filter | This query depends on a $@. | mongoDB.go:40:20:40:30 | call to Referer | user-provided value |
 | mongoDB.go:81:18:81:25 | pipeline | mongoDB.go:40:20:40:30 | call to Referer | mongoDB.go:81:18:81:25 | pipeline | This query depends on a $@. | mongoDB.go:40:20:40:30 | call to Referer | user-provided value |
 edges
-| SqlInjection.go:10:7:11:30 | []type{args} [array] | SqlInjection.go:10:7:11:30 | call to Sprintf | provenance | MaD:2 |
+| SqlInjection.go:10:7:11:30 | []type{args} [array] | SqlInjection.go:10:7:11:30 | call to Sprintf | provenance | MaD:7 |
 | SqlInjection.go:10:7:11:30 | call to Sprintf | SqlInjection.go:12:11:12:11 | q | provenance |  |
-| SqlInjection.go:11:3:11:9 | selection of URL | SqlInjection.go:11:3:11:17 | call to Query | provenance | Src:MaD:9 MaD:10 |
+| SqlInjection.go:11:3:11:9 | selection of URL | SqlInjection.go:11:3:11:17 | call to Query | provenance | Src:MaD:5 MaD:10 |
 | SqlInjection.go:11:3:11:17 | call to Query | SqlInjection.go:11:3:11:29 | index expression | provenance |  |
 | SqlInjection.go:11:3:11:29 | index expression | SqlInjection.go:10:7:11:30 | []type{args} [array] | provenance |  |
 | SqlInjection.go:11:3:11:29 | index expression | SqlInjection.go:10:7:11:30 | call to Sprintf | provenance | FunctionModel |
 | issue48.go:17:2:17:33 | ... := ...[0] | issue48.go:18:17:18:17 | b | provenance |  |
-| issue48.go:17:25:17:32 | selection of Body | issue48.go:17:2:17:33 | ... := ...[0] | provenance | Src:MaD:6 MaD:3 |
-| issue48.go:18:17:18:17 | b | issue48.go:18:20:18:39 | &... | provenance | MaD:1 |
+| issue48.go:17:25:17:32 | selection of Body | issue48.go:17:2:17:33 | ... := ...[0] | provenance | Src:MaD:1 MaD:8 |
+| issue48.go:18:17:18:17 | b | issue48.go:18:20:18:39 | &... | provenance | MaD:6 |
 | issue48.go:18:20:18:39 | &... | issue48.go:21:3:21:33 | index expression | provenance |  |
-| issue48.go:20:8:21:34 | []type{args} [array] | issue48.go:20:8:21:34 | call to Sprintf | provenance | MaD:2 |
+| issue48.go:20:8:21:34 | []type{args} [array] | issue48.go:20:8:21:34 | call to Sprintf | provenance | MaD:7 |
 | issue48.go:20:8:21:34 | call to Sprintf | issue48.go:22:11:22:12 | q3 | provenance |  |
 | issue48.go:21:3:21:33 | index expression | issue48.go:20:8:21:34 | []type{args} [array] | provenance |  |
 | issue48.go:21:3:21:33 | index expression | issue48.go:20:8:21:34 | call to Sprintf | provenance | FunctionModel |
 | issue48.go:27:2:27:34 | ... := ...[0] | issue48.go:28:17:28:18 | b2 | provenance |  |
-| issue48.go:27:26:27:33 | selection of Body | issue48.go:27:2:27:34 | ... := ...[0] | provenance | Src:MaD:6 MaD:3 |
-| issue48.go:28:17:28:18 | b2 | issue48.go:28:21:28:41 | &... | provenance | MaD:1 |
+| issue48.go:27:26:27:33 | selection of Body | issue48.go:27:2:27:34 | ... := ...[0] | provenance | Src:MaD:1 MaD:8 |
+| issue48.go:28:17:28:18 | b2 | issue48.go:28:21:28:41 | &... | provenance | MaD:6 |
 | issue48.go:28:21:28:41 | &... | issue48.go:31:3:31:31 | selection of Category | provenance |  |
-| issue48.go:30:8:31:32 | []type{args} [array] | issue48.go:30:8:31:32 | call to Sprintf | provenance | MaD:2 |
+| issue48.go:30:8:31:32 | []type{args} [array] | issue48.go:30:8:31:32 | call to Sprintf | provenance | MaD:7 |
 | issue48.go:30:8:31:32 | call to Sprintf | issue48.go:32:11:32:12 | q4 | provenance |  |
 | issue48.go:31:3:31:31 | selection of Category | issue48.go:30:8:31:32 | []type{args} [array] | provenance |  |
 | issue48.go:31:3:31:31 | selection of Category | issue48.go:30:8:31:32 | call to Sprintf | provenance | FunctionModel |
-| issue48.go:37:17:37:50 | type conversion | issue48.go:37:53:37:73 | &... | provenance | MaD:1 |
-| issue48.go:37:24:37:30 | selection of URL | issue48.go:37:24:37:38 | call to Query | provenance | Src:MaD:9 MaD:10 |
+| issue48.go:37:17:37:50 | type conversion | issue48.go:37:53:37:73 | &... | provenance | MaD:6 |
+| issue48.go:37:24:37:30 | selection of URL | issue48.go:37:24:37:38 | call to Query | provenance | Src:MaD:5 MaD:10 |
 | issue48.go:37:24:37:38 | call to Query | issue48.go:37:17:37:50 | type conversion | provenance |  |
 | issue48.go:37:53:37:73 | &... | issue48.go:40:3:40:31 | selection of Category | provenance |  |
-| issue48.go:39:8:40:32 | []type{args} [array] | issue48.go:39:8:40:32 | call to Sprintf | provenance | MaD:2 |
+| issue48.go:39:8:40:32 | []type{args} [array] | issue48.go:39:8:40:32 | call to Sprintf | provenance | MaD:7 |
 | issue48.go:39:8:40:32 | call to Sprintf | issue48.go:41:11:41:12 | q5 | provenance |  |
 | issue48.go:40:3:40:31 | selection of Category | issue48.go:39:8:40:32 | []type{args} [array] | provenance |  |
 | issue48.go:40:3:40:31 | selection of Category | issue48.go:39:8:40:32 | call to Sprintf | provenance | FunctionModel |
-| main.go:11:11:11:16 | selection of Form | main.go:11:11:11:28 | index expression | provenance | Src:MaD:7  |
-| main.go:15:11:15:84 | []type{args} [array] | main.go:15:11:15:84 | call to Sprintf | provenance | MaD:2 |
-| main.go:15:63:15:67 | selection of URL | main.go:15:63:15:75 | call to Query | provenance | Src:MaD:9 MaD:10 |
+| main.go:11:11:11:16 | selection of Form | main.go:11:11:11:28 | index expression | provenance | Src:MaD:2  |
+| main.go:15:11:15:84 | []type{args} [array] | main.go:15:11:15:84 | call to Sprintf | provenance | MaD:7 |
+| main.go:15:63:15:67 | selection of URL | main.go:15:63:15:75 | call to Query | provenance | Src:MaD:5 MaD:10 |
 | main.go:15:63:15:75 | call to Query | main.go:15:63:15:83 | index expression | provenance |  |
 | main.go:15:63:15:83 | index expression | main.go:15:11:15:84 | []type{args} [array] | provenance |  |
 | main.go:15:63:15:83 | index expression | main.go:15:11:15:84 | call to Sprintf | provenance | FunctionModel |
-| main.go:16:11:16:85 | []type{args} [array] | main.go:16:11:16:85 | call to Sprintf | provenance | MaD:2 |
-| main.go:16:63:16:70 | selection of Header | main.go:16:63:16:84 | call to Get | provenance | Src:MaD:8 MaD:4 |
+| main.go:16:11:16:85 | []type{args} [array] | main.go:16:11:16:85 | call to Sprintf | provenance | MaD:7 |
+| main.go:16:63:16:70 | selection of Header | main.go:16:63:16:84 | call to Get | provenance | Src:MaD:3 MaD:9 |
 | main.go:16:63:16:84 | call to Get | main.go:16:11:16:85 | []type{args} [array] | provenance |  |
 | main.go:16:63:16:84 | call to Get | main.go:16:11:16:85 | call to Sprintf | provenance | FunctionModel |
 | main.go:28:17:31:2 | &... [pointer, Category] | main.go:34:3:34:13 | RequestData [pointer, Category] | provenance |  |
 | main.go:28:18:31:2 | struct literal [Category] | main.go:28:17:31:2 | &... [pointer, Category] | provenance |  |
-| main.go:30:13:30:19 | selection of URL | main.go:30:13:30:27 | call to Query | provenance | Src:MaD:9 MaD:10 |
+| main.go:30:13:30:19 | selection of URL | main.go:30:13:30:27 | call to Query | provenance | Src:MaD:5 MaD:10 |
 | main.go:30:13:30:27 | call to Query | main.go:30:13:30:39 | index expression | provenance |  |
 | main.go:30:13:30:39 | index expression | main.go:28:18:31:2 | struct literal [Category] | provenance |  |
-| main.go:33:7:34:23 | []type{args} [array] | main.go:33:7:34:23 | call to Sprintf | provenance | MaD:2 |
+| main.go:33:7:34:23 | []type{args} [array] | main.go:33:7:34:23 | call to Sprintf | provenance | MaD:7 |
 | main.go:33:7:34:23 | call to Sprintf | main.go:35:11:35:11 | q | provenance |  |
 | main.go:34:3:34:13 | RequestData [pointer, Category] | main.go:34:3:34:13 | implicit dereference [Category] | provenance |  |
 | main.go:34:3:34:13 | implicit dereference [Category] | main.go:34:3:34:22 | selection of Category | provenance |  |
@@ -80,10 +80,10 @@ edges
 | main.go:39:2:39:12 | definition of RequestData [pointer, Category] | main.go:43:3:43:13 | RequestData [pointer, Category] | provenance |  |
 | main.go:40:2:40:12 | RequestData [pointer, Category] | main.go:40:2:40:12 | implicit dereference [Category] | provenance |  |
 | main.go:40:2:40:12 | implicit dereference [Category] | main.go:39:2:39:12 | definition of RequestData [pointer, Category] | provenance |  |
-| main.go:40:25:40:31 | selection of URL | main.go:40:25:40:39 | call to Query | provenance | Src:MaD:9 MaD:10 |
+| main.go:40:25:40:31 | selection of URL | main.go:40:25:40:39 | call to Query | provenance | Src:MaD:5 MaD:10 |
 | main.go:40:25:40:39 | call to Query | main.go:40:25:40:51 | index expression | provenance |  |
 | main.go:40:25:40:51 | index expression | main.go:40:2:40:12 | implicit dereference [Category] | provenance |  |
-| main.go:42:7:43:23 | []type{args} [array] | main.go:42:7:43:23 | call to Sprintf | provenance | MaD:2 |
+| main.go:42:7:43:23 | []type{args} [array] | main.go:42:7:43:23 | call to Sprintf | provenance | MaD:7 |
 | main.go:42:7:43:23 | call to Sprintf | main.go:44:11:44:11 | q | provenance |  |
 | main.go:43:3:43:13 | RequestData [pointer, Category] | main.go:43:3:43:13 | implicit dereference [Category] | provenance |  |
 | main.go:43:3:43:13 | implicit dereference [Category] | main.go:43:3:43:22 | selection of Category | provenance |  |
@@ -93,10 +93,10 @@ edges
 | main.go:48:2:48:12 | definition of RequestData [pointer, Category] | main.go:52:3:52:13 | RequestData [pointer, Category] | provenance |  |
 | main.go:49:3:49:14 | star expression [Category] | main.go:48:2:48:12 | definition of RequestData [pointer, Category] | provenance |  |
 | main.go:49:4:49:14 | RequestData [pointer, Category] | main.go:49:3:49:14 | star expression [Category] | provenance |  |
-| main.go:49:28:49:34 | selection of URL | main.go:49:28:49:42 | call to Query | provenance | Src:MaD:9 MaD:10 |
+| main.go:49:28:49:34 | selection of URL | main.go:49:28:49:42 | call to Query | provenance | Src:MaD:5 MaD:10 |
 | main.go:49:28:49:42 | call to Query | main.go:49:28:49:54 | index expression | provenance |  |
 | main.go:49:28:49:54 | index expression | main.go:49:3:49:14 | star expression [Category] | provenance |  |
-| main.go:51:7:52:23 | []type{args} [array] | main.go:51:7:52:23 | call to Sprintf | provenance | MaD:2 |
+| main.go:51:7:52:23 | []type{args} [array] | main.go:51:7:52:23 | call to Sprintf | provenance | MaD:7 |
 | main.go:51:7:52:23 | call to Sprintf | main.go:53:11:53:11 | q | provenance |  |
 | main.go:52:3:52:13 | RequestData [pointer, Category] | main.go:52:3:52:13 | implicit dereference [Category] | provenance |  |
 | main.go:52:3:52:13 | implicit dereference [Category] | main.go:52:3:52:22 | selection of Category | provenance |  |
@@ -106,16 +106,16 @@ edges
 | main.go:57:2:57:12 | definition of RequestData [pointer, Category] | main.go:61:5:61:15 | RequestData [pointer, Category] | provenance |  |
 | main.go:58:3:58:14 | star expression [Category] | main.go:57:2:57:12 | definition of RequestData [pointer, Category] | provenance |  |
 | main.go:58:4:58:14 | RequestData [pointer, Category] | main.go:58:3:58:14 | star expression [Category] | provenance |  |
-| main.go:58:28:58:34 | selection of URL | main.go:58:28:58:42 | call to Query | provenance | Src:MaD:9 MaD:10 |
+| main.go:58:28:58:34 | selection of URL | main.go:58:28:58:42 | call to Query | provenance | Src:MaD:5 MaD:10 |
 | main.go:58:28:58:42 | call to Query | main.go:58:28:58:54 | index expression | provenance |  |
 | main.go:58:28:58:54 | index expression | main.go:58:3:58:14 | star expression [Category] | provenance |  |
-| main.go:60:7:61:26 | []type{args} [array] | main.go:60:7:61:26 | call to Sprintf | provenance | MaD:2 |
+| main.go:60:7:61:26 | []type{args} [array] | main.go:60:7:61:26 | call to Sprintf | provenance | MaD:7 |
 | main.go:60:7:61:26 | call to Sprintf | main.go:62:11:62:11 | q | provenance |  |
 | main.go:61:3:61:25 | selection of Category | main.go:60:7:61:26 | []type{args} [array] | provenance |  |
 | main.go:61:3:61:25 | selection of Category | main.go:60:7:61:26 | call to Sprintf | provenance | FunctionModel |
 | main.go:61:4:61:15 | star expression [Category] | main.go:61:3:61:25 | selection of Category | provenance |  |
 | main.go:61:5:61:15 | RequestData [pointer, Category] | main.go:61:4:61:15 | star expression [Category] | provenance |  |
-| mongoDB.go:40:20:40:30 | call to Referer | mongoDB.go:42:28:42:41 | untrustedInput | provenance | Src:MaD:5  |
+| mongoDB.go:40:20:40:30 | call to Referer | mongoDB.go:42:28:42:41 | untrustedInput | provenance | Src:MaD:4  |
 | mongoDB.go:42:19:42:42 | struct literal | mongoDB.go:50:34:50:39 | filter | provenance |  |
 | mongoDB.go:42:19:42:42 | struct literal | mongoDB.go:61:27:61:32 | filter | provenance |  |
 | mongoDB.go:42:19:42:42 | struct literal | mongoDB.go:63:23:63:28 | filter | provenance |  |
@@ -134,15 +134,15 @@ edges
 | mongoDB.go:50:23:50:40 | struct literal | mongoDB.go:81:18:81:25 | pipeline | provenance |  |
 | mongoDB.go:50:34:50:39 | filter | mongoDB.go:50:23:50:40 | struct literal | provenance | Config |
 models
-| 1 | Summary: encoding/json; ; false; Unmarshal; ; ; Argument[0]; Argument[1]; taint; manual |
-| 2 | Summary: fmt; ; true; Sprintf; ; ; Argument[1].ArrayElement; ReturnValue; taint; manual |
-| 3 | Summary: io/ioutil; ; false; ReadAll; ; ; Argument[0]; ReturnValue[0]; taint; manual |
-| 4 | Summary: net/http; Header; true; Get; ; ; Argument[receiver]; ReturnValue; taint; manual |
-| 5 | Source: net/http; Request; true; Referer; ; ; ReturnValue; remote; manual |
-| 6 | Source: net/http; Request; true; Body; ; ; ; remote; manual |
-| 7 | Source: net/http; Request; true; Form; ; ; ; remote; manual |
-| 8 | Source: net/http; Request; true; Header; ; ; ; remote; manual |
-| 9 | Source: net/http; Request; true; URL; ; ; ; remote; manual |
+| 1 | Source: net/http; Request; true; Body; ; ; ; remote; manual |
+| 2 | Source: net/http; Request; true; Form; ; ; ; remote; manual |
+| 3 | Source: net/http; Request; true; Header; ; ; ; remote; manual |
+| 4 | Source: net/http; Request; true; Referer; ; ; ReturnValue; remote; manual |
+| 5 | Source: net/http; Request; true; URL; ; ; ; remote; manual |
+| 6 | Summary: encoding/json; ; false; Unmarshal; ; ; Argument[0]; Argument[1]; taint; manual |
+| 7 | Summary: fmt; ; false; Sprintf; ; ; Argument[1].ArrayElement; ReturnValue; taint; manual |
+| 8 | Summary: io/ioutil; ; false; ReadAll; ; ; Argument[0]; ReturnValue[0]; taint; manual |
+| 9 | Summary: net/http; Header; true; Get; ; ; Argument[receiver]; ReturnValue; taint; manual |
 | 10 | Summary: net/url; URL; true; Query; ; ; Argument[receiver]; ReturnValue; taint; manual |
 nodes
 | SqlInjection.go:10:7:11:30 | []type{args} [array] | semmle.label | []type{args} [array] |
diff --git a/go/ql/test/query-tests/Security/CWE-327/UnsafeTLS.expected b/go/ql/test/query-tests/Security/CWE-327/UnsafeTLS.expected
index d957365f972..539e1070af8 100644
--- a/go/ql/test/query-tests/Security/CWE-327/UnsafeTLS.expected
+++ b/go/ql/test/query-tests/Security/CWE-327/UnsafeTLS.expected
@@ -59,9 +59,9 @@ edges
 | UnsafeTLS.go:344:19:344:44 | call to append | UnsafeTLS.go:344:26:344:37 | cipherSuites | provenance |  |
 | UnsafeTLS.go:344:19:344:44 | call to append | UnsafeTLS.go:346:25:346:36 | cipherSuites | provenance |  |
 | UnsafeTLS.go:344:19:344:44 | call to append [array] | UnsafeTLS.go:344:26:344:37 | cipherSuites [array] | provenance |  |
-| UnsafeTLS.go:344:26:344:37 | cipherSuites | UnsafeTLS.go:344:19:344:44 | call to append | provenance | MaD:1 |
-| UnsafeTLS.go:344:26:344:37 | cipherSuites [array] | UnsafeTLS.go:344:19:344:44 | call to append | provenance | MaD:2 |
-| UnsafeTLS.go:344:26:344:37 | cipherSuites [array] | UnsafeTLS.go:344:19:344:44 | call to append [array] | provenance | MaD:2 |
+| UnsafeTLS.go:344:26:344:37 | cipherSuites | UnsafeTLS.go:344:19:344:44 | call to append | provenance | MaD:2 |
+| UnsafeTLS.go:344:26:344:37 | cipherSuites [array] | UnsafeTLS.go:344:19:344:44 | call to append | provenance | MaD:1 |
+| UnsafeTLS.go:344:26:344:37 | cipherSuites [array] | UnsafeTLS.go:344:19:344:44 | call to append [array] | provenance | MaD:1 |
 | UnsafeTLS.go:344:40:344:43 | selection of ID | UnsafeTLS.go:344:19:344:44 | []type{args} [array] | provenance |  |
 | UnsafeTLS.go:351:13:351:38 | call to InsecureCipherSuites | UnsafeTLS.go:353:40:353:51 | selection of ID | provenance |  |
 | UnsafeTLS.go:353:19:353:52 | []type{args} [array] | UnsafeTLS.go:353:19:353:52 | call to append | provenance | MaD:3 |
@@ -69,9 +69,9 @@ edges
 | UnsafeTLS.go:353:19:353:52 | call to append | UnsafeTLS.go:353:26:353:37 | cipherSuites | provenance |  |
 | UnsafeTLS.go:353:19:353:52 | call to append | UnsafeTLS.go:355:25:355:36 | cipherSuites | provenance |  |
 | UnsafeTLS.go:353:19:353:52 | call to append [array] | UnsafeTLS.go:353:26:353:37 | cipherSuites [array] | provenance |  |
-| UnsafeTLS.go:353:26:353:37 | cipherSuites | UnsafeTLS.go:353:19:353:52 | call to append | provenance | MaD:1 |
-| UnsafeTLS.go:353:26:353:37 | cipherSuites [array] | UnsafeTLS.go:353:19:353:52 | call to append | provenance | MaD:2 |
-| UnsafeTLS.go:353:26:353:37 | cipherSuites [array] | UnsafeTLS.go:353:19:353:52 | call to append [array] | provenance | MaD:2 |
+| UnsafeTLS.go:353:26:353:37 | cipherSuites | UnsafeTLS.go:353:19:353:52 | call to append | provenance | MaD:2 |
+| UnsafeTLS.go:353:26:353:37 | cipherSuites [array] | UnsafeTLS.go:353:19:353:52 | call to append | provenance | MaD:1 |
+| UnsafeTLS.go:353:26:353:37 | cipherSuites [array] | UnsafeTLS.go:353:19:353:52 | call to append [array] | provenance | MaD:1 |
 | UnsafeTLS.go:353:40:353:51 | selection of ID | UnsafeTLS.go:353:19:353:52 | []type{args} [array] | provenance |  |
 | UnsafeTLS.go:363:5:363:47 | selection of TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA256 | UnsafeTLS.go:362:18:364:4 | slice literal | provenance |  |
 | UnsafeTLS.go:371:5:371:47 | selection of TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA256 | UnsafeTLS.go:370:18:372:4 | slice literal | provenance |  |
@@ -87,8 +87,8 @@ edges
 | UnsafeTLS.go:450:6:450:48 | selection of TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA256 | UnsafeTLS.go:449:19:451:5 | slice literal | provenance |  |
 | UnsafeTLS.go:457:6:457:48 | selection of TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA256 | UnsafeTLS.go:456:19:458:5 | slice literal | provenance |  |
 models
-| 1 | Summary: ; ; false; append; ; ; Argument[0]; ReturnValue; taint; manual |
-| 2 | Summary: ; ; false; append; ; ; Argument[0].ArrayElement; ReturnValue.ArrayElement; value; manual |
+| 1 | Summary: ; ; false; append; ; ; Argument[0].ArrayElement; ReturnValue.ArrayElement; value; manual |
+| 2 | Summary: ; ; false; append; ; ; Argument[0]; ReturnValue; taint; manual |
 | 3 | Summary: ; ; false; append; ; ; Argument[1].ArrayElement; ReturnValue.ArrayElement; value; manual |
 nodes
 | UnsafeTLS.go:21:23:21:23 | 0 | semmle.label | 0 |
diff --git a/go/ql/test/query-tests/Security/CWE-338/InsecureRandomness/InsecureRandomness.expected b/go/ql/test/query-tests/Security/CWE-338/InsecureRandomness/InsecureRandomness.expected
index cf5b484716c..b2659fffde7 100644
--- a/go/ql/test/query-tests/Security/CWE-338/InsecureRandomness/InsecureRandomness.expected
+++ b/go/ql/test/query-tests/Security/CWE-338/InsecureRandomness/InsecureRandomness.expected
@@ -22,7 +22,7 @@ edges
 | sample.go:56:18:56:39 | index expression | sample.go:56:11:56:40 | type conversion | provenance |  |
 | sample.go:56:29:56:38 | randNumber | sample.go:56:18:56:39 | index expression | provenance | Config |
 models
-| 1 | Summary: fmt; ; true; Sprintf; ; ; Argument[1].ArrayElement; ReturnValue; taint; manual |
+| 1 | Summary: fmt; ; false; Sprintf; ; ; Argument[1].ArrayElement; ReturnValue; taint; manual |
 | 2 | Summary: io; ; false; ReadFull; ; ; Argument[0]; Argument[1]; taint; manual |
 nodes
 | InsecureRandomness.go:12:18:12:40 | call to Intn | semmle.label | call to Intn |
diff --git a/go/ql/test/query-tests/Security/CWE-347/MissingJwtSignatureCheck.expected b/go/ql/test/query-tests/Security/CWE-347/MissingJwtSignatureCheck.expected
index 3d3321f0947..2bfca2aa643 100644
--- a/go/ql/test/query-tests/Security/CWE-347/MissingJwtSignatureCheck.expected
+++ b/go/ql/test/query-tests/Security/CWE-347/MissingJwtSignatureCheck.expected
@@ -2,23 +2,23 @@
 | go-jose.v3.go:33:12:33:23 | DecodedToken | go-jose.v3.go:25:16:25:20 | selection of URL | go-jose.v3.go:33:12:33:23 | DecodedToken | This JWT is parsed without verification and received from $@. | go-jose.v3.go:25:16:25:20 | selection of URL | this user-controlled source |
 | golang-jwt-v5.go:34:58:34:68 | signedToken | golang-jwt-v5.go:28:16:28:20 | selection of URL | golang-jwt-v5.go:34:58:34:68 | signedToken | This JWT is parsed without verification and received from $@. | golang-jwt-v5.go:28:16:28:20 | selection of URL | this user-controlled source |
 edges
-| go-jose.v3.go:25:16:25:20 | selection of URL | go-jose.v3.go:25:16:25:28 | call to Query | provenance | Src:MaD:4 MaD:5 |
+| go-jose.v3.go:25:16:25:20 | selection of URL | go-jose.v3.go:25:16:25:28 | call to Query | provenance | Src:MaD:3 MaD:5 |
 | go-jose.v3.go:25:16:25:28 | call to Query | go-jose.v3.go:25:16:25:47 | call to Get | provenance | MaD:6 |
 | go-jose.v3.go:25:16:25:47 | call to Get | go-jose.v3.go:26:15:26:25 | signedToken | provenance |  |
 | go-jose.v3.go:26:15:26:25 | signedToken | go-jose.v3.go:29:19:29:29 | definition of signedToken | provenance |  |
 | go-jose.v3.go:29:19:29:29 | definition of signedToken | go-jose.v3.go:31:37:31:47 | signedToken | provenance |  |
-| go-jose.v3.go:31:2:31:48 | ... := ...[0] | go-jose.v3.go:33:12:33:23 | DecodedToken | provenance |  Sink:MaD:1 |
-| go-jose.v3.go:31:37:31:47 | signedToken | go-jose.v3.go:31:2:31:48 | ... := ...[0] | provenance | MaD:2 |
-| golang-jwt-v5.go:28:16:28:20 | selection of URL | golang-jwt-v5.go:28:16:28:28 | call to Query | provenance | Src:MaD:4 MaD:5 |
+| go-jose.v3.go:31:2:31:48 | ... := ...[0] | go-jose.v3.go:33:12:33:23 | DecodedToken | provenance | Sink:MaD:2 |
+| go-jose.v3.go:31:37:31:47 | signedToken | go-jose.v3.go:31:2:31:48 | ... := ...[0] | provenance | MaD:4 |
+| golang-jwt-v5.go:28:16:28:20 | selection of URL | golang-jwt-v5.go:28:16:28:28 | call to Query | provenance | Src:MaD:3 MaD:5 |
 | golang-jwt-v5.go:28:16:28:28 | call to Query | golang-jwt-v5.go:28:16:28:47 | call to Get | provenance | MaD:6 |
 | golang-jwt-v5.go:28:16:28:47 | call to Get | golang-jwt-v5.go:29:25:29:35 | signedToken | provenance |  |
 | golang-jwt-v5.go:29:25:29:35 | signedToken | golang-jwt-v5.go:32:29:32:39 | definition of signedToken | provenance |  |
-| golang-jwt-v5.go:32:29:32:39 | definition of signedToken | golang-jwt-v5.go:34:58:34:68 | signedToken | provenance |  Sink:MaD:3 |
+| golang-jwt-v5.go:32:29:32:39 | definition of signedToken | golang-jwt-v5.go:34:58:34:68 | signedToken | provenance | Sink:MaD:1 |
 models
-| 1 | Sink: group:go-jose/jwt; JSONWebToken; true; UnsafeClaimsWithoutVerification; ; ; Argument[receiver]; jwt; manual |
-| 2 | Summary: group:go-jose/jwt; ; true; ParseSigned; ; ; Argument[0]; ReturnValue[0]; taint; manual |
-| 3 | Sink: github.com/golang-jwt/jwt; Parser; true; ParseUnverified; ; ; Argument[0]; jwt; manual |
-| 4 | Source: net/http; Request; true; URL; ; ; ; remote; manual |
+| 1 | Sink: github.com/golang-jwt/jwt; Parser; true; ParseUnverified; ; ; Argument[0]; jwt; manual |
+| 2 | Sink: group:go-jose/jwt; JSONWebToken; true; UnsafeClaimsWithoutVerification; ; ; Argument[receiver]; jwt; manual |
+| 3 | Source: net/http; Request; true; URL; ; ; ; remote; manual |
+| 4 | Summary: group:go-jose/jwt; ; false; ParseSigned; ; ; Argument[0]; ReturnValue[0]; taint; manual |
 | 5 | Summary: net/url; URL; true; Query; ; ; Argument[receiver]; ReturnValue; taint; manual |
 | 6 | Summary: net/url; Values; true; Get; ; ; Argument[receiver]; ReturnValue; taint; manual |
 nodes
diff --git a/go/ql/test/query-tests/Security/CWE-601/BadRedirectCheck/BadRedirectCheck.expected b/go/ql/test/query-tests/Security/CWE-601/BadRedirectCheck/BadRedirectCheck.expected
index b82496d5e38..8d4aaba1446 100644
--- a/go/ql/test/query-tests/Security/CWE-601/BadRedirectCheck/BadRedirectCheck.expected
+++ b/go/ql/test/query-tests/Security/CWE-601/BadRedirectCheck/BadRedirectCheck.expected
@@ -11,25 +11,25 @@
 edges
 | BadRedirectCheck.go:3:18:3:22 | argument corresponding to redir | BadRedirectCheck.go:5:10:5:14 | redir | provenance |  |
 | BadRedirectCheck.go:3:18:3:22 | definition of redir | BadRedirectCheck.go:5:10:5:14 | redir | provenance |  |
-| BadRedirectCheck.go:5:10:5:14 | redir | main.go:11:25:11:45 | call to sanitizeUrl | provenance |  Sink:MaD:1 |
-| cves.go:14:23:14:25 | argument corresponding to url | cves.go:16:26:16:28 | url | provenance |  Sink:MaD:1 |
-| cves.go:33:14:33:34 | call to Get | cves.go:37:25:37:32 | redirect | provenance |  Sink:MaD:1 |
-| cves.go:41:14:41:34 | call to Get | cves.go:45:25:45:32 | redirect | provenance |  Sink:MaD:1 |
+| BadRedirectCheck.go:5:10:5:14 | redir | main.go:11:25:11:45 | call to sanitizeUrl | provenance | Sink:MaD:1 |
+| cves.go:14:23:14:25 | argument corresponding to url | cves.go:16:26:16:28 | url | provenance | Sink:MaD:1 |
+| cves.go:33:14:33:34 | call to Get | cves.go:37:25:37:32 | redirect | provenance | Sink:MaD:1 |
+| cves.go:41:14:41:34 | call to Get | cves.go:45:25:45:32 | redirect | provenance | Sink:MaD:1 |
 | main.go:10:18:10:25 | argument corresponding to redirect | main.go:11:37:11:44 | redirect | provenance |  |
 | main.go:11:37:11:44 | redirect | BadRedirectCheck.go:3:18:3:22 | definition of redir | provenance |  |
-| main.go:11:37:11:44 | redirect | main.go:11:25:11:45 | call to sanitizeUrl | provenance |  Sink:MaD:1 |
-| main.go:32:24:32:26 | argument corresponding to url | main.go:34:26:34:28 | url | provenance |  Sink:MaD:1 |
+| main.go:11:37:11:44 | redirect | main.go:11:25:11:45 | call to sanitizeUrl | provenance | Sink:MaD:1 |
+| main.go:32:24:32:26 | argument corresponding to url | main.go:34:26:34:28 | url | provenance | Sink:MaD:1 |
 | main.go:68:17:68:24 | argument corresponding to redirect | main.go:73:20:73:27 | redirect | provenance |  |
 | main.go:68:17:68:24 | definition of redirect | main.go:73:20:73:27 | redirect | provenance |  |
-| main.go:73:9:73:28 | call to Clean | main.go:77:25:77:39 | call to getTarget1 | provenance |  Sink:MaD:1 |
+| main.go:73:9:73:28 | call to Clean | main.go:77:25:77:39 | call to getTarget1 | provenance | Sink:MaD:1 |
 | main.go:73:20:73:27 | redirect | main.go:73:9:73:28 | call to Clean | provenance | MaD:2 |
 | main.go:73:20:73:27 | redirect | main.go:73:9:73:28 | call to Clean | provenance | MaD:2 |
 | main.go:76:19:76:21 | argument corresponding to url | main.go:77:36:77:38 | url | provenance |  |
 | main.go:77:36:77:38 | url | main.go:68:17:68:24 | definition of redirect | provenance |  |
 | main.go:77:36:77:38 | url | main.go:77:25:77:39 | call to getTarget1 | provenance | MaD:2 Sink:MaD:1 |
-| main.go:87:9:87:14 | selection of Path | main.go:91:25:91:39 | call to getTarget2 | provenance |  Sink:MaD:1 |
+| main.go:87:9:87:14 | selection of Path | main.go:91:25:91:39 | call to getTarget2 | provenance | Sink:MaD:1 |
 models
-| 1 | Sink: net/http; ; true; Redirect; ; ; Argument[2]; url-redirection[0]; manual |
+| 1 | Sink: net/http; ; false; Redirect; ; ; Argument[2]; url-redirection[0]; manual |
 | 2 | Summary: path; ; false; Clean; ; ; Argument[0]; ReturnValue; taint; manual |
 nodes
 | BadRedirectCheck.go:3:18:3:22 | argument corresponding to redir | semmle.label | argument corresponding to redir |
diff --git a/go/ql/test/query-tests/Security/CWE-601/OpenUrlRedirect/OpenUrlRedirect.expected b/go/ql/test/query-tests/Security/CWE-601/OpenUrlRedirect/OpenUrlRedirect.expected
index 7c7acaa3f85..f8d193348ba 100644
--- a/go/ql/test/query-tests/Security/CWE-601/OpenUrlRedirect/OpenUrlRedirect.expected
+++ b/go/ql/test/query-tests/Security/CWE-601/OpenUrlRedirect/OpenUrlRedirect.expected
@@ -11,24 +11,24 @@
 | stdlib.go:192:23:192:33 | selection of Path | stdlib.go:190:36:190:56 | call to FormValue | stdlib.go:192:23:192:33 | selection of Path | This path to an untrusted URL redirection depends on a $@. | stdlib.go:190:36:190:56 | call to FormValue | user-provided value |
 | stdlib.go:194:23:194:42 | call to EscapedPath | stdlib.go:190:36:190:56 | call to FormValue | stdlib.go:194:23:194:42 | call to EscapedPath | This path to an untrusted URL redirection depends on a $@. | stdlib.go:190:36:190:56 | call to FormValue | user-provided value |
 edges
-| OpenUrlRedirect.go:10:23:10:28 | selection of Form | OpenUrlRedirect.go:10:23:10:42 | call to Get | provenance | Src:MaD:3 Config Sink:MaD:1 |
-| stdlib.go:13:13:13:18 | selection of Form | stdlib.go:13:13:13:32 | call to Get | provenance | Src:MaD:3 Config |
+| OpenUrlRedirect.go:10:23:10:28 | selection of Form | OpenUrlRedirect.go:10:23:10:42 | call to Get | provenance | Src:MaD:2 Config Sink:MaD:1 |
+| stdlib.go:13:13:13:18 | selection of Form | stdlib.go:13:13:13:32 | call to Get | provenance | Src:MaD:2 Config |
 | stdlib.go:13:13:13:32 | call to Get | stdlib.go:15:30:15:35 | target | provenance |  |
-| stdlib.go:22:13:22:18 | selection of Form | stdlib.go:22:13:22:32 | call to Get | provenance | Src:MaD:3 Config |
+| stdlib.go:22:13:22:18 | selection of Form | stdlib.go:22:13:22:32 | call to Get | provenance | Src:MaD:2 Config |
 | stdlib.go:22:13:22:32 | call to Get | stdlib.go:24:30:24:35 | target | provenance |  |
-| stdlib.go:31:13:31:18 | selection of Form | stdlib.go:31:13:31:32 | call to Get | provenance | Src:MaD:3 Config |
+| stdlib.go:31:13:31:18 | selection of Form | stdlib.go:31:13:31:32 | call to Get | provenance | Src:MaD:2 Config |
 | stdlib.go:31:13:31:32 | call to Get | stdlib.go:35:34:35:39 | target | provenance |  |
 | stdlib.go:35:34:35:39 | target | stdlib.go:35:30:35:39 | ...+... | provenance | Config |
-| stdlib.go:44:13:44:18 | selection of Form | stdlib.go:44:13:44:32 | call to Get | provenance | Src:MaD:3 Config |
-| stdlib.go:44:13:44:32 | call to Get | stdlib.go:46:23:46:28 | target | provenance |  Sink:MaD:1 |
-| stdlib.go:64:13:64:18 | selection of Form | stdlib.go:64:13:64:32 | call to Get | provenance | Src:MaD:3 Config |
+| stdlib.go:44:13:44:18 | selection of Form | stdlib.go:44:13:44:32 | call to Get | provenance | Src:MaD:2 Config |
+| stdlib.go:44:13:44:32 | call to Get | stdlib.go:46:23:46:28 | target | provenance | Sink:MaD:1 |
+| stdlib.go:64:13:64:18 | selection of Form | stdlib.go:64:13:64:32 | call to Get | provenance | Src:MaD:2 Config |
 | stdlib.go:64:13:64:32 | call to Get | stdlib.go:67:23:67:28 | target | provenance |  |
 | stdlib.go:67:23:67:28 | target | stdlib.go:67:23:67:37 | ...+... | provenance | Config |
 | stdlib.go:67:23:67:37 | ...+... | stdlib.go:67:23:67:40 | ...+... | provenance | Config Sink:MaD:1 |
-| stdlib.go:89:13:89:18 | selection of Form | stdlib.go:89:13:89:32 | call to Get | provenance | Src:MaD:3 Config |
+| stdlib.go:89:13:89:18 | selection of Form | stdlib.go:89:13:89:32 | call to Get | provenance | Src:MaD:2 Config |
 | stdlib.go:89:13:89:32 | call to Get | stdlib.go:90:3:90:8 | target | provenance |  |
 | stdlib.go:90:3:90:8 | target | stdlib.go:90:3:90:25 | ... += ... | provenance | Config |
-| stdlib.go:90:3:90:25 | ... += ... | stdlib.go:92:23:92:28 | target | provenance |  Sink:MaD:1 |
+| stdlib.go:90:3:90:25 | ... += ... | stdlib.go:92:23:92:28 | target | provenance | Sink:MaD:1 |
 | stdlib.go:107:54:107:54 | definition of r [pointer, URL, pointer] | stdlib.go:112:4:112:4 | r [pointer, URL, pointer] | provenance |  |
 | stdlib.go:107:54:107:54 | definition of r [pointer, URL] | stdlib.go:112:4:112:4 | r [pointer, URL] | provenance |  |
 | stdlib.go:107:54:107:54 | definition of r [pointer, URL] | stdlib.go:113:24:113:24 | r [pointer, URL] | provenance |  |
@@ -47,28 +47,28 @@ edges
 | stdlib.go:113:24:113:24 | implicit dereference [URL] | stdlib.go:113:24:113:28 | selection of URL | provenance |  |
 | stdlib.go:113:24:113:24 | r [pointer, URL] | stdlib.go:113:24:113:24 | implicit dereference [URL] | provenance |  |
 | stdlib.go:113:24:113:28 | selection of URL | stdlib.go:113:24:113:37 | call to String | provenance | Src:MaD:4 Config Sink:MaD:1 |
-| stdlib.go:146:13:146:18 | selection of Form | stdlib.go:146:13:146:32 | call to Get | provenance | Src:MaD:3 Config |
-| stdlib.go:146:13:146:32 | call to Get | stdlib.go:152:23:152:28 | target | provenance |  Sink:MaD:1 |
+| stdlib.go:146:13:146:18 | selection of Form | stdlib.go:146:13:146:32 | call to Get | provenance | Src:MaD:2 Config |
+| stdlib.go:146:13:146:32 | call to Get | stdlib.go:152:23:152:28 | target | provenance | Sink:MaD:1 |
 | stdlib.go:159:10:159:15 | star expression | stdlib.go:159:11:159:15 | selection of URL | provenance | Config |
 | stdlib.go:159:10:159:15 | star expression | stdlib.go:162:24:162:26 | url | provenance |  |
 | stdlib.go:159:11:159:15 | selection of URL | stdlib.go:159:10:159:15 | star expression | provenance | Src:MaD:4 Config |
 | stdlib.go:162:24:162:26 | url | stdlib.go:162:24:162:35 | call to String | provenance | Config Sink:MaD:1 |
 | stdlib.go:173:35:173:39 | selection of URL | stdlib.go:173:35:173:52 | call to RequestURI | provenance | Src:MaD:4 Config |
 | stdlib.go:173:35:173:52 | call to RequestURI | stdlib.go:173:24:173:52 | ...+... | provenance | Config Sink:MaD:1 |
-| stdlib.go:182:13:182:33 | call to FormValue | stdlib.go:184:23:184:28 | target | provenance | Src:MaD:2  Sink:MaD:1 |
+| stdlib.go:182:13:182:33 | call to FormValue | stdlib.go:184:23:184:28 | target | provenance | Src:MaD:3 Sink:MaD:1 |
 | stdlib.go:190:3:190:8 | definition of target | stdlib.go:192:23:192:28 | target | provenance |  |
 | stdlib.go:190:3:190:8 | definition of target | stdlib.go:194:23:194:28 | target | provenance |  |
 | stdlib.go:190:3:190:57 | ... := ...[0] | stdlib.go:190:3:190:8 | definition of target | provenance |  |
-| stdlib.go:190:36:190:56 | call to FormValue | stdlib.go:190:3:190:57 | ... := ...[0] | provenance | Src:MaD:2 Config |
+| stdlib.go:190:36:190:56 | call to FormValue | stdlib.go:190:3:190:57 | ... := ...[0] | provenance | Src:MaD:3 Config |
 | stdlib.go:192:23:192:28 | implicit dereference | stdlib.go:190:3:190:8 | definition of target | provenance | Config |
 | stdlib.go:192:23:192:28 | implicit dereference | stdlib.go:192:23:192:33 | selection of Path | provenance | Config Sink:MaD:1 |
 | stdlib.go:192:23:192:28 | target | stdlib.go:192:23:192:28 | implicit dereference | provenance | Config |
 | stdlib.go:192:23:192:28 | target | stdlib.go:192:23:192:33 | selection of Path | provenance | Config Sink:MaD:1 |
 | stdlib.go:194:23:194:28 | target | stdlib.go:194:23:194:42 | call to EscapedPath | provenance | Config Sink:MaD:1 |
 models
-| 1 | Sink: net/http; ; true; Redirect; ; ; Argument[2]; url-redirection[0]; manual |
-| 2 | Source: net/http; Request; true; FormValue; ; ; ReturnValue; remote; manual |
-| 3 | Source: net/http; Request; true; Form; ; ; ; remote; manual |
+| 1 | Sink: net/http; ; false; Redirect; ; ; Argument[2]; url-redirection[0]; manual |
+| 2 | Source: net/http; Request; true; Form; ; ; ; remote; manual |
+| 3 | Source: net/http; Request; true; FormValue; ; ; ReturnValue; remote; manual |
 | 4 | Source: net/http; Request; true; URL; ; ; ; remote; manual |
 nodes
 | OpenUrlRedirect.go:10:23:10:28 | selection of Form | semmle.label | selection of Form |
diff --git a/go/ql/test/query-tests/Security/CWE-640/EmailInjection.expected b/go/ql/test/query-tests/Security/CWE-640/EmailInjection.expected
index e968318c808..ac5985f110d 100644
--- a/go/ql/test/query-tests/Security/CWE-640/EmailInjection.expected
+++ b/go/ql/test/query-tests/Security/CWE-640/EmailInjection.expected
@@ -11,31 +11,31 @@
 | main.go:89:37:89:50 | untrustedInput | main.go:82:21:82:31 | call to Referer | main.go:89:37:89:50 | untrustedInput | Email content may contain $@. | main.go:82:21:82:31 | call to Referer | untrusted input |
 | main.go:93:16:93:23 | content2 | main.go:82:21:82:31 | call to Referer | main.go:93:16:93:23 | content2 | Email content may contain $@. | main.go:82:21:82:31 | call to Referer | untrusted input |
 edges
-| EmailBad.go:9:10:9:17 | selection of Header | EmailBad.go:9:10:9:29 | call to Get | provenance | Src:MaD:5 MaD:3 |
+| EmailBad.go:9:10:9:17 | selection of Header | EmailBad.go:9:10:9:29 | call to Get | provenance | Src:MaD:1 MaD:5 |
 | EmailBad.go:9:10:9:29 | call to Get | EmailBad.go:12:56:12:67 | type conversion | provenance |  |
-| main.go:29:21:29:31 | call to Referer | main.go:31:57:31:78 | type conversion | provenance | Src:MaD:4  |
-| main.go:37:21:37:31 | call to Referer | main.go:41:25:41:38 | untrustedInput | provenance | Src:MaD:4  |
-| main.go:41:25:41:38 | untrustedInput | main.go:40:3:40:7 | definition of write | provenance | MaD:2 |
-| main.go:46:21:46:31 | call to Referer | main.go:52:46:52:59 | untrustedInput | provenance | Src:MaD:4  |
-| main.go:46:21:46:31 | call to Referer | main.go:53:52:53:65 | untrustedInput | provenance | Src:MaD:4  |
-| main.go:58:21:58:31 | call to Referer | main.go:60:47:60:60 | untrustedInput | provenance | Src:MaD:4  |
+| main.go:29:21:29:31 | call to Referer | main.go:31:57:31:78 | type conversion | provenance | Src:MaD:2  |
+| main.go:37:21:37:31 | call to Referer | main.go:41:25:41:38 | untrustedInput | provenance | Src:MaD:2  |
+| main.go:41:25:41:38 | untrustedInput | main.go:40:3:40:7 | definition of write | provenance | MaD:4 |
+| main.go:46:21:46:31 | call to Referer | main.go:52:46:52:59 | untrustedInput | provenance | Src:MaD:2  |
+| main.go:46:21:46:31 | call to Referer | main.go:53:52:53:65 | untrustedInput | provenance | Src:MaD:2  |
+| main.go:58:21:58:31 | call to Referer | main.go:60:47:60:60 | untrustedInput | provenance | Src:MaD:2  |
 | main.go:60:14:60:61 | call to NewContent | main.go:63:16:63:22 | content | provenance |  |
-| main.go:60:47:60:60 | untrustedInput | main.go:60:14:60:61 | call to NewContent | provenance | MaD:1 |
-| main.go:68:21:68:31 | call to Referer | main.go:74:47:74:60 | untrustedInput | provenance | Src:MaD:4  |
+| main.go:60:47:60:60 | untrustedInput | main.go:60:14:60:61 | call to NewContent | provenance | MaD:3 |
+| main.go:68:21:68:31 | call to Referer | main.go:74:47:74:60 | untrustedInput | provenance | Src:MaD:2  |
 | main.go:74:14:74:61 | call to NewContent | main.go:76:50:76:56 | content | provenance |  |
 | main.go:74:14:74:61 | call to NewContent | main.go:76:59:76:65 | content | provenance |  |
 | main.go:74:14:74:61 | call to NewContent | main.go:77:16:77:22 | content | provenance |  |
-| main.go:74:47:74:60 | untrustedInput | main.go:74:14:74:61 | call to NewContent | provenance | MaD:1 |
-| main.go:82:21:82:31 | call to Referer | main.go:89:37:89:50 | untrustedInput | provenance | Src:MaD:4  |
-| main.go:82:21:82:31 | call to Referer | main.go:91:48:91:61 | untrustedInput | provenance | Src:MaD:4  |
+| main.go:74:47:74:60 | untrustedInput | main.go:74:14:74:61 | call to NewContent | provenance | MaD:3 |
+| main.go:82:21:82:31 | call to Referer | main.go:89:37:89:50 | untrustedInput | provenance | Src:MaD:2  |
+| main.go:82:21:82:31 | call to Referer | main.go:91:48:91:61 | untrustedInput | provenance | Src:MaD:2  |
 | main.go:91:15:91:62 | call to NewContent | main.go:93:16:93:23 | content2 | provenance |  |
-| main.go:91:48:91:61 | untrustedInput | main.go:91:15:91:62 | call to NewContent | provenance | MaD:1 |
+| main.go:91:48:91:61 | untrustedInput | main.go:91:15:91:62 | call to NewContent | provenance | MaD:3 |
 models
-| 1 | Summary: github.com/sendgrid/sendgrid-go/helpers/mail; ; false; NewContent; ; ; Argument[1]; ReturnValue; taint; manual |
-| 2 | Summary: io; ; false; WriteString; ; ; Argument[1]; Argument[0]; taint; manual |
-| 3 | Summary: net/http; Header; true; Get; ; ; Argument[receiver]; ReturnValue; taint; manual |
-| 4 | Source: net/http; Request; true; Referer; ; ; ReturnValue; remote; manual |
-| 5 | Source: net/http; Request; true; Header; ; ; ; remote; manual |
+| 1 | Source: net/http; Request; true; Header; ; ; ; remote; manual |
+| 2 | Source: net/http; Request; true; Referer; ; ; ReturnValue; remote; manual |
+| 3 | Summary: github.com/sendgrid/sendgrid-go/helpers/mail; ; false; NewContent; ; ; Argument[1]; ReturnValue; taint; manual |
+| 4 | Summary: io; ; false; WriteString; ; ; Argument[1]; Argument[0]; taint; manual |
+| 5 | Summary: net/http; Header; true; Get; ; ; Argument[receiver]; ReturnValue; taint; manual |
 nodes
 | EmailBad.go:9:10:9:17 | selection of Header | semmle.label | selection of Header |
 | EmailBad.go:9:10:9:29 | call to Get | semmle.label | call to Get |
diff --git a/go/ql/test/query-tests/Security/CWE-643/XPathInjection.expected b/go/ql/test/query-tests/Security/CWE-643/XPathInjection.expected
index ae3c205ead6..0d492788c51 100644
--- a/go/ql/test/query-tests/Security/CWE-643/XPathInjection.expected
+++ b/go/ql/test/query-tests/Security/CWE-643/XPathInjection.expected
@@ -44,98 +44,98 @@
 | tst.go:146:23:146:85 | ...+... | tst.go:139:14:139:19 | selection of Form | tst.go:146:23:146:85 | ...+... | XPath expression depends on a $@. | tst.go:139:14:139:19 | selection of Form | user-provided value |
 edges
 | XPathInjection.go:13:14:13:19 | selection of Form | XPathInjection.go:13:14:13:35 | call to Get | provenance | Src:MaD:36 MaD:37 |
-| XPathInjection.go:13:14:13:35 | call to Get | XPathInjection.go:16:29:16:91 | ...+... | provenance |  Sink:MaD:21 |
+| XPathInjection.go:13:14:13:35 | call to Get | XPathInjection.go:16:29:16:91 | ...+... | provenance | Sink:MaD:1 |
 | tst.go:35:14:35:19 | selection of Form | tst.go:35:14:35:35 | call to Get | provenance | Src:MaD:36 MaD:37 |
-| tst.go:35:14:35:35 | call to Get | tst.go:38:23:38:85 | ...+... | provenance |  Sink:MaD:17 |
-| tst.go:35:14:35:35 | call to Get | tst.go:39:29:39:87 | ...+... | provenance |  Sink:MaD:18 |
-| tst.go:35:14:35:35 | call to Get | tst.go:40:24:40:86 | ...+... | provenance |  Sink:MaD:19 |
-| tst.go:35:14:35:35 | call to Get | tst.go:41:24:41:82 | ...+... | provenance |  Sink:MaD:20 |
+| tst.go:35:14:35:35 | call to Get | tst.go:38:23:38:85 | ...+... | provenance | Sink:MaD:20 |
+| tst.go:35:14:35:35 | call to Get | tst.go:39:29:39:87 | ...+... | provenance | Sink:MaD:21 |
+| tst.go:35:14:35:35 | call to Get | tst.go:40:24:40:86 | ...+... | provenance | Sink:MaD:22 |
+| tst.go:35:14:35:35 | call to Get | tst.go:41:24:41:82 | ...+... | provenance | Sink:MaD:23 |
 | tst.go:46:14:46:19 | selection of Form | tst.go:46:14:46:35 | call to Get | provenance | Src:MaD:36 MaD:37 |
-| tst.go:46:14:46:35 | call to Get | tst.go:49:26:49:84 | ...+... | provenance |  Sink:MaD:1 |
-| tst.go:46:14:46:35 | call to Get | tst.go:50:29:50:87 | ...+... | provenance |  Sink:MaD:2 |
-| tst.go:46:14:46:35 | call to Get | tst.go:51:30:51:88 | ...+... | provenance |  Sink:MaD:3 |
-| tst.go:46:14:46:35 | call to Get | tst.go:52:33:52:91 | ...+... | provenance |  Sink:MaD:4 |
+| tst.go:46:14:46:35 | call to Get | tst.go:49:26:49:84 | ...+... | provenance | Sink:MaD:4 |
+| tst.go:46:14:46:35 | call to Get | tst.go:50:29:50:87 | ...+... | provenance | Sink:MaD:5 |
+| tst.go:46:14:46:35 | call to Get | tst.go:51:30:51:88 | ...+... | provenance | Sink:MaD:6 |
+| tst.go:46:14:46:35 | call to Get | tst.go:52:33:52:91 | ...+... | provenance | Sink:MaD:7 |
 | tst.go:57:14:57:19 | selection of Form | tst.go:57:14:57:35 | call to Get | provenance | Src:MaD:36 MaD:37 |
-| tst.go:57:14:57:35 | call to Get | tst.go:60:25:60:83 | ...+... | provenance |  Sink:MaD:9 |
-| tst.go:57:14:57:35 | call to Get | tst.go:61:28:61:86 | ...+... | provenance |  Sink:MaD:10 |
-| tst.go:57:14:57:35 | call to Get | tst.go:62:25:62:83 | ...+... | provenance |  Sink:MaD:11 |
-| tst.go:57:14:57:35 | call to Get | tst.go:63:34:63:92 | ...+... | provenance |  Sink:MaD:12 |
-| tst.go:57:14:57:35 | call to Get | tst.go:64:29:64:87 | ...+... | provenance |  Sink:MaD:13 |
-| tst.go:57:14:57:35 | call to Get | tst.go:65:32:65:90 | ...+... | provenance |  Sink:MaD:14 |
-| tst.go:57:14:57:35 | call to Get | tst.go:66:23:66:85 | ...+... | provenance |  Sink:MaD:16 |
-| tst.go:57:14:57:35 | call to Get | tst.go:67:22:67:84 | ...+... | provenance |  Sink:MaD:15 |
+| tst.go:57:14:57:35 | call to Get | tst.go:60:25:60:83 | ...+... | provenance | Sink:MaD:12 |
+| tst.go:57:14:57:35 | call to Get | tst.go:61:28:61:86 | ...+... | provenance | Sink:MaD:15 |
+| tst.go:57:14:57:35 | call to Get | tst.go:62:25:62:83 | ...+... | provenance | Sink:MaD:13 |
+| tst.go:57:14:57:35 | call to Get | tst.go:63:34:63:92 | ...+... | provenance | Sink:MaD:14 |
+| tst.go:57:14:57:35 | call to Get | tst.go:64:29:64:87 | ...+... | provenance | Sink:MaD:16 |
+| tst.go:57:14:57:35 | call to Get | tst.go:65:32:65:90 | ...+... | provenance | Sink:MaD:17 |
+| tst.go:57:14:57:35 | call to Get | tst.go:66:23:66:85 | ...+... | provenance | Sink:MaD:19 |
+| tst.go:57:14:57:35 | call to Get | tst.go:67:22:67:84 | ...+... | provenance | Sink:MaD:18 |
 | tst.go:72:14:72:19 | selection of Form | tst.go:72:14:72:35 | call to Get | provenance | Src:MaD:36 MaD:37 |
-| tst.go:72:14:72:35 | call to Get | tst.go:75:26:75:84 | ...+... | provenance |  Sink:MaD:5 |
-| tst.go:72:14:72:35 | call to Get | tst.go:76:29:76:87 | ...+... | provenance |  Sink:MaD:6 |
-| tst.go:72:14:72:35 | call to Get | tst.go:77:30:77:88 | ...+... | provenance |  Sink:MaD:7 |
-| tst.go:72:14:72:35 | call to Get | tst.go:78:33:78:91 | ...+... | provenance |  Sink:MaD:8 |
+| tst.go:72:14:72:35 | call to Get | tst.go:75:26:75:84 | ...+... | provenance | Sink:MaD:8 |
+| tst.go:72:14:72:35 | call to Get | tst.go:76:29:76:87 | ...+... | provenance | Sink:MaD:9 |
+| tst.go:72:14:72:35 | call to Get | tst.go:77:30:77:88 | ...+... | provenance | Sink:MaD:10 |
+| tst.go:72:14:72:35 | call to Get | tst.go:78:33:78:91 | ...+... | provenance | Sink:MaD:11 |
 | tst.go:83:14:83:19 | selection of Form | tst.go:83:14:83:35 | call to Get | provenance | Src:MaD:36 MaD:37 |
-| tst.go:83:14:83:35 | call to Get | tst.go:86:25:86:87 | ...+... | provenance |  Sink:MaD:24 |
-| tst.go:83:14:83:35 | call to Get | tst.go:87:26:87:88 | ...+... | provenance |  Sink:MaD:25 |
+| tst.go:83:14:83:35 | call to Get | tst.go:86:25:86:87 | ...+... | provenance | Sink:MaD:34 |
+| tst.go:83:14:83:35 | call to Get | tst.go:87:26:87:88 | ...+... | provenance | Sink:MaD:35 |
 | tst.go:92:14:92:19 | selection of Form | tst.go:92:14:92:35 | call to Get | provenance | Src:MaD:36 MaD:37 |
-| tst.go:92:14:92:35 | call to Get | tst.go:96:23:96:126 | ...+... | provenance |  Sink:MaD:22 |
-| tst.go:92:14:92:35 | call to Get | tst.go:97:24:97:127 | ...+... | provenance |  Sink:MaD:21 |
-| tst.go:92:14:92:35 | call to Get | tst.go:98:27:98:122 | ...+... | provenance |  Sink:MaD:23 |
+| tst.go:92:14:92:35 | call to Get | tst.go:96:23:96:126 | ...+... | provenance | Sink:MaD:2 |
+| tst.go:92:14:92:35 | call to Get | tst.go:97:24:97:127 | ...+... | provenance | Sink:MaD:1 |
+| tst.go:92:14:92:35 | call to Get | tst.go:98:27:98:122 | ...+... | provenance | Sink:MaD:3 |
 | tst.go:93:14:93:19 | selection of Form | tst.go:93:14:93:35 | call to Get | provenance | Src:MaD:36 MaD:37 |
-| tst.go:93:14:93:35 | call to Get | tst.go:96:23:96:126 | ...+... | provenance |  Sink:MaD:22 |
-| tst.go:93:14:93:35 | call to Get | tst.go:97:24:97:127 | ...+... | provenance |  Sink:MaD:21 |
-| tst.go:93:14:93:35 | call to Get | tst.go:98:27:98:122 | ...+... | provenance |  Sink:MaD:23 |
+| tst.go:93:14:93:35 | call to Get | tst.go:96:23:96:126 | ...+... | provenance | Sink:MaD:2 |
+| tst.go:93:14:93:35 | call to Get | tst.go:97:24:97:127 | ...+... | provenance | Sink:MaD:1 |
+| tst.go:93:14:93:35 | call to Get | tst.go:98:27:98:122 | ...+... | provenance | Sink:MaD:3 |
 | tst.go:106:14:106:19 | selection of Form | tst.go:106:14:106:35 | call to Get | provenance | Src:MaD:36 MaD:37 |
-| tst.go:106:14:106:35 | call to Get | tst.go:109:27:109:89 | ...+... | provenance |  Sink:MaD:34 |
-| tst.go:106:14:106:35 | call to Get | tst.go:110:28:110:90 | ...+... | provenance |  Sink:MaD:35 |
+| tst.go:106:14:106:35 | call to Get | tst.go:109:27:109:89 | ...+... | provenance | Sink:MaD:28 |
+| tst.go:106:14:106:35 | call to Get | tst.go:110:28:110:90 | ...+... | provenance | Sink:MaD:27 |
 | tst.go:115:14:115:19 | selection of Form | tst.go:115:14:115:35 | call to Get | provenance | Src:MaD:36 MaD:37 |
-| tst.go:115:14:115:35 | call to Get | tst.go:119:33:119:136 | ...+... | provenance |  Sink:MaD:33 |
-| tst.go:115:14:115:35 | call to Get | tst.go:120:18:120:121 | ...+... | provenance |  Sink:MaD:29 |
-| tst.go:115:14:115:35 | call to Get | tst.go:121:31:121:126 | ...+... | provenance |  Sink:MaD:30 |
-| tst.go:115:14:115:35 | call to Get | tst.go:122:21:122:116 | ...+... | provenance |  Sink:MaD:31 |
-| tst.go:115:14:115:35 | call to Get | tst.go:123:27:123:122 | ...+... | provenance |  Sink:MaD:32 |
+| tst.go:115:14:115:35 | call to Get | tst.go:119:33:119:136 | ...+... | provenance | Sink:MaD:33 |
+| tst.go:115:14:115:35 | call to Get | tst.go:120:18:120:121 | ...+... | provenance | Sink:MaD:31 |
+| tst.go:115:14:115:35 | call to Get | tst.go:121:31:121:126 | ...+... | provenance | Sink:MaD:32 |
+| tst.go:115:14:115:35 | call to Get | tst.go:122:21:122:116 | ...+... | provenance | Sink:MaD:29 |
+| tst.go:115:14:115:35 | call to Get | tst.go:123:27:123:122 | ...+... | provenance | Sink:MaD:30 |
 | tst.go:116:14:116:19 | selection of Form | tst.go:116:14:116:35 | call to Get | provenance | Src:MaD:36 MaD:37 |
-| tst.go:116:14:116:35 | call to Get | tst.go:119:33:119:136 | ...+... | provenance |  Sink:MaD:33 |
-| tst.go:116:14:116:35 | call to Get | tst.go:120:18:120:121 | ...+... | provenance |  Sink:MaD:29 |
-| tst.go:116:14:116:35 | call to Get | tst.go:121:31:121:126 | ...+... | provenance |  Sink:MaD:30 |
-| tst.go:116:14:116:35 | call to Get | tst.go:122:21:122:116 | ...+... | provenance |  Sink:MaD:31 |
-| tst.go:116:14:116:35 | call to Get | tst.go:123:27:123:122 | ...+... | provenance |  Sink:MaD:32 |
+| tst.go:116:14:116:35 | call to Get | tst.go:119:33:119:136 | ...+... | provenance | Sink:MaD:33 |
+| tst.go:116:14:116:35 | call to Get | tst.go:120:18:120:121 | ...+... | provenance | Sink:MaD:31 |
+| tst.go:116:14:116:35 | call to Get | tst.go:121:31:121:126 | ...+... | provenance | Sink:MaD:32 |
+| tst.go:116:14:116:35 | call to Get | tst.go:122:21:122:116 | ...+... | provenance | Sink:MaD:29 |
+| tst.go:116:14:116:35 | call to Get | tst.go:123:27:123:122 | ...+... | provenance | Sink:MaD:30 |
 | tst.go:139:14:139:19 | selection of Form | tst.go:139:14:139:35 | call to Get | provenance | Src:MaD:36 MaD:37 |
-| tst.go:139:14:139:35 | call to Get | tst.go:144:17:144:87 | type conversion | provenance |  Sink:MaD:26 |
+| tst.go:139:14:139:35 | call to Get | tst.go:144:17:144:87 | type conversion | provenance | Sink:MaD:24 |
 | tst.go:139:14:139:35 | call to Get | tst.go:145:41:145:103 | ...+... | provenance |  |
-| tst.go:139:14:139:35 | call to Get | tst.go:146:23:146:85 | ...+... | provenance |  Sink:MaD:28 |
-| tst.go:145:41:145:103 | ...+... | tst.go:145:23:145:104 | call to NewReader | provenance | MaD:38 Sink:MaD:27 |
+| tst.go:139:14:139:35 | call to Get | tst.go:146:23:146:85 | ...+... | provenance | Sink:MaD:26 |
+| tst.go:145:41:145:103 | ...+... | tst.go:145:23:145:104 | call to NewReader | provenance | MaD:38 Sink:MaD:25 |
 models
-| 1 | Sink: github.com/antchfx/htmlquery; ; true; Find; ; ; Argument[1]; xpath-injection; manual |
-| 2 | Sink: github.com/antchfx/htmlquery; ; true; FindOne; ; ; Argument[1]; xpath-injection; manual |
-| 3 | Sink: github.com/antchfx/htmlquery; ; true; Query; ; ; Argument[1]; xpath-injection; manual |
-| 4 | Sink: github.com/antchfx/htmlquery; ; true; QueryAll; ; ; Argument[1]; xpath-injection; manual |
-| 5 | Sink: github.com/antchfx/jsonquery; ; true; Find; ; ; Argument[1]; xpath-injection; manual |
-| 6 | Sink: github.com/antchfx/jsonquery; ; true; FindOne; ; ; Argument[1]; xpath-injection; manual |
-| 7 | Sink: github.com/antchfx/jsonquery; ; true; Query; ; ; Argument[1]; xpath-injection; manual |
-| 8 | Sink: github.com/antchfx/jsonquery; ; true; QueryAll; ; ; Argument[1]; xpath-injection; manual |
-| 9 | Sink: github.com/antchfx/xmlquery; ; true; Find; ; ; Argument[1]; xpath-injection; manual |
-| 10 | Sink: github.com/antchfx/xmlquery; ; true; FindOne; ; ; Argument[1]; xpath-injection; manual |
-| 11 | Sink: github.com/antchfx/xmlquery; ; true; FindEach; ; ; Argument[1]; xpath-injection; manual |
-| 12 | Sink: github.com/antchfx/xmlquery; ; true; FindEachWithBreak; ; ; Argument[1]; xpath-injection; manual |
-| 13 | Sink: github.com/antchfx/xmlquery; ; true; Query; ; ; Argument[1]; xpath-injection; manual |
-| 14 | Sink: github.com/antchfx/xmlquery; ; true; QueryAll; ; ; Argument[1]; xpath-injection; manual |
-| 15 | Sink: github.com/antchfx/xmlquery; Node; true; SelectElement; ; ; Argument[0]; xpath-injection; manual |
-| 16 | Sink: github.com/antchfx/xmlquery; Node; true; SelectElements; ; ; Argument[0]; xpath-injection; manual |
-| 17 | Sink: github.com/antchfx/xpath; ; true; Compile; ; ; Argument[0]; xpath-injection; manual |
-| 18 | Sink: github.com/antchfx/xpath; ; true; CompileWithNS; ; ; Argument[0]; xpath-injection; manual |
-| 19 | Sink: github.com/antchfx/xpath; ; true; MustCompile; ; ; Argument[0]; xpath-injection; manual |
-| 20 | Sink: github.com/antchfx/xpath; ; true; Select; ; ; Argument[1]; xpath-injection; manual |
-| 21 | Sink: github.com/ChrisTrenkamp/goxpath; ; true; MustParse; ; ; Argument[0]; xpath-injection; manual |
-| 22 | Sink: github.com/ChrisTrenkamp/goxpath; ; true; Parse; ; ; Argument[0]; xpath-injection; manual |
-| 23 | Sink: github.com/ChrisTrenkamp/goxpath; ; true; ParseExec; ; ; Argument[0]; xpath-injection; manual |
-| 24 | Sink: group:xmlpath; ; true; Compile; ; ; Argument[0]; xpath-injection; manual |
-| 25 | Sink: group:xmlpath; ; true; MustCompile; ; ; Argument[0]; xpath-injection; manual |
-| 26 | Sink: github.com/lestrrat-go/libxml2/parser; Parser; true; Parse; ; ; Argument[0]; xpath-injection; manual |
-| 27 | Sink: github.com/lestrrat-go/libxml2/parser; Parser; true; ParseReader; ; ; Argument[0]; xpath-injection; manual |
-| 28 | Sink: github.com/lestrrat-go/libxml2/parser; Parser; true; ParseString; ; ; Argument[0]; xpath-injection; manual |
-| 29 | Sink: group:gokogiri/xml; Node; true; Search; ; ; Argument[0]; xpath-injection; manual |
-| 30 | Sink: group:gokogiri/xml; Node; true; SearchWithVariables; ; ; Argument[0]; xpath-injection; manual |
-| 31 | Sink: group:gokogiri/xml; Node; true; EvalXPath; ; ; Argument[0]; xpath-injection; manual |
-| 32 | Sink: group:gokogiri/xml; Node; true; EvalXPathAsBoolean; ; ; Argument[0]; xpath-injection; manual |
-| 33 | Sink: group:gokogiri/xpath; ; true; Compile; ; ; Argument[0]; xpath-injection; manual |
-| 34 | Sink: github.com/santhosh-tekuri/xpathparser; ; true; Parse; ; ; Argument[0]; xpath-injection; manual |
-| 35 | Sink: github.com/santhosh-tekuri/xpathparser; ; true; MustParse; ; ; Argument[0]; xpath-injection; manual |
+| 1 | Sink: github.com/ChrisTrenkamp/goxpath; ; false; MustParse; ; ; Argument[0]; xpath-injection; manual |
+| 2 | Sink: github.com/ChrisTrenkamp/goxpath; ; false; Parse; ; ; Argument[0]; xpath-injection; manual |
+| 3 | Sink: github.com/ChrisTrenkamp/goxpath; ; false; ParseExec; ; ; Argument[0]; xpath-injection; manual |
+| 4 | Sink: github.com/antchfx/htmlquery; ; false; Find; ; ; Argument[1]; xpath-injection; manual |
+| 5 | Sink: github.com/antchfx/htmlquery; ; false; FindOne; ; ; Argument[1]; xpath-injection; manual |
+| 6 | Sink: github.com/antchfx/htmlquery; ; false; Query; ; ; Argument[1]; xpath-injection; manual |
+| 7 | Sink: github.com/antchfx/htmlquery; ; false; QueryAll; ; ; Argument[1]; xpath-injection; manual |
+| 8 | Sink: github.com/antchfx/jsonquery; ; false; Find; ; ; Argument[1]; xpath-injection; manual |
+| 9 | Sink: github.com/antchfx/jsonquery; ; false; FindOne; ; ; Argument[1]; xpath-injection; manual |
+| 10 | Sink: github.com/antchfx/jsonquery; ; false; Query; ; ; Argument[1]; xpath-injection; manual |
+| 11 | Sink: github.com/antchfx/jsonquery; ; false; QueryAll; ; ; Argument[1]; xpath-injection; manual |
+| 12 | Sink: github.com/antchfx/xmlquery; ; false; Find; ; ; Argument[1]; xpath-injection; manual |
+| 13 | Sink: github.com/antchfx/xmlquery; ; false; FindEach; ; ; Argument[1]; xpath-injection; manual |
+| 14 | Sink: github.com/antchfx/xmlquery; ; false; FindEachWithBreak; ; ; Argument[1]; xpath-injection; manual |
+| 15 | Sink: github.com/antchfx/xmlquery; ; false; FindOne; ; ; Argument[1]; xpath-injection; manual |
+| 16 | Sink: github.com/antchfx/xmlquery; ; false; Query; ; ; Argument[1]; xpath-injection; manual |
+| 17 | Sink: github.com/antchfx/xmlquery; ; false; QueryAll; ; ; Argument[1]; xpath-injection; manual |
+| 18 | Sink: github.com/antchfx/xmlquery; Node; true; SelectElement; ; ; Argument[0]; xpath-injection; manual |
+| 19 | Sink: github.com/antchfx/xmlquery; Node; true; SelectElements; ; ; Argument[0]; xpath-injection; manual |
+| 20 | Sink: github.com/antchfx/xpath; ; false; Compile; ; ; Argument[0]; xpath-injection; manual |
+| 21 | Sink: github.com/antchfx/xpath; ; false; CompileWithNS; ; ; Argument[0]; xpath-injection; manual |
+| 22 | Sink: github.com/antchfx/xpath; ; false; MustCompile; ; ; Argument[0]; xpath-injection; manual |
+| 23 | Sink: github.com/antchfx/xpath; ; false; Select; ; ; Argument[1]; xpath-injection; manual |
+| 24 | Sink: github.com/lestrrat-go/libxml2/parser; Parser; true; Parse; ; ; Argument[0]; xpath-injection; manual |
+| 25 | Sink: github.com/lestrrat-go/libxml2/parser; Parser; true; ParseReader; ; ; Argument[0]; xpath-injection; manual |
+| 26 | Sink: github.com/lestrrat-go/libxml2/parser; Parser; true; ParseString; ; ; Argument[0]; xpath-injection; manual |
+| 27 | Sink: github.com/santhosh-tekuri/xpathparser; ; false; MustParse; ; ; Argument[0]; xpath-injection; manual |
+| 28 | Sink: github.com/santhosh-tekuri/xpathparser; ; false; Parse; ; ; Argument[0]; xpath-injection; manual |
+| 29 | Sink: group:gokogiri/xml; Node; true; EvalXPath; ; ; Argument[0]; xpath-injection; manual |
+| 30 | Sink: group:gokogiri/xml; Node; true; EvalXPathAsBoolean; ; ; Argument[0]; xpath-injection; manual |
+| 31 | Sink: group:gokogiri/xml; Node; true; Search; ; ; Argument[0]; xpath-injection; manual |
+| 32 | Sink: group:gokogiri/xml; Node; true; SearchWithVariables; ; ; Argument[0]; xpath-injection; manual |
+| 33 | Sink: group:gokogiri/xpath; ; false; Compile; ; ; Argument[0]; xpath-injection; manual |
+| 34 | Sink: group:xmlpath; ; false; Compile; ; ; Argument[0]; xpath-injection; manual |
+| 35 | Sink: group:xmlpath; ; false; MustCompile; ; ; Argument[0]; xpath-injection; manual |
 | 36 | Source: net/http; Request; true; Form; ; ; ; remote; manual |
 | 37 | Summary: net/url; Values; true; Get; ; ; Argument[receiver]; ReturnValue; taint; manual |
 | 38 | Summary: strings; ; false; NewReader; ; ; Argument[0]; ReturnValue; taint; manual |
diff --git a/go/ql/test/query-tests/Security/CWE-918/RequestForgery.expected b/go/ql/test/query-tests/Security/CWE-918/RequestForgery.expected
index 7090a5fa76e..76097b7a5c0 100644
--- a/go/ql/test/query-tests/Security/CWE-918/RequestForgery.expected
+++ b/go/ql/test/query-tests/Security/CWE-918/RequestForgery.expected
@@ -17,38 +17,37 @@
 | websocket.go:197:3:197:32 | call to BuildProxy | websocket.go:195:21:195:31 | call to Referer | websocket.go:197:18:197:31 | untrustedInput | The $@ of this request depends on a $@. | websocket.go:197:18:197:31 | untrustedInput | WebSocket URL | websocket.go:195:21:195:31 | call to Referer | user-provided value |
 | websocket.go:204:3:204:25 | call to New | websocket.go:202:21:202:31 | call to Referer | websocket.go:204:11:204:24 | untrustedInput | The $@ of this request depends on a $@. | websocket.go:204:11:204:24 | untrustedInput | WebSocket URL | websocket.go:202:21:202:31 | call to Referer | user-provided value |
 edges
-| RequestForgery.go:8:12:8:34 | call to FormValue | RequestForgery.go:11:24:11:65 | ...+... | provenance | Src:MaD:2  |
-| tst.go:10:13:10:35 | call to FormValue | tst.go:14:11:14:17 | tainted | provenance | Src:MaD:2  |
-| tst.go:10:13:10:35 | call to FormValue | tst.go:18:12:18:18 | tainted | provenance | Src:MaD:2  |
-| tst.go:10:13:10:35 | call to FormValue | tst.go:21:34:21:40 | tainted | provenance | Src:MaD:2  |
-| tst.go:10:13:10:35 | call to FormValue | tst.go:24:66:24:72 | tainted | provenance | Src:MaD:2  |
-| tst.go:10:13:10:35 | call to FormValue | tst.go:27:11:27:29 | ...+... | provenance | Src:MaD:2  |
-| tst.go:10:13:10:35 | call to FormValue | tst.go:29:11:29:40 | ...+... | provenance | Src:MaD:2  |
-| tst.go:10:13:10:35 | call to FormValue | tst.go:36:11:36:17 | tainted | provenance | Src:MaD:2  |
+| RequestForgery.go:8:12:8:34 | call to FormValue | RequestForgery.go:11:24:11:65 | ...+... | provenance | Src:MaD:1  |
+| tst.go:10:13:10:35 | call to FormValue | tst.go:14:11:14:17 | tainted | provenance | Src:MaD:1  |
+| tst.go:10:13:10:35 | call to FormValue | tst.go:18:12:18:18 | tainted | provenance | Src:MaD:1  |
+| tst.go:10:13:10:35 | call to FormValue | tst.go:21:34:21:40 | tainted | provenance | Src:MaD:1  |
+| tst.go:10:13:10:35 | call to FormValue | tst.go:24:66:24:72 | tainted | provenance | Src:MaD:1  |
+| tst.go:10:13:10:35 | call to FormValue | tst.go:27:11:27:29 | ...+... | provenance | Src:MaD:1  |
+| tst.go:10:13:10:35 | call to FormValue | tst.go:29:11:29:40 | ...+... | provenance | Src:MaD:1  |
+| tst.go:10:13:10:35 | call to FormValue | tst.go:36:11:36:17 | tainted | provenance | Src:MaD:1  |
 | tst.go:35:2:35:2 | definition of u [pointer] | tst.go:36:2:36:2 | u [pointer] | provenance |  |
 | tst.go:36:2:36:2 | implicit dereference | tst.go:35:2:35:2 | definition of u [pointer] | provenance |  |
 | tst.go:36:2:36:2 | implicit dereference | tst.go:36:2:36:2 | u | provenance |  |
 | tst.go:36:2:36:2 | implicit dereference | tst.go:37:11:37:11 | u | provenance |  |
 | tst.go:36:2:36:2 | u | tst.go:36:2:36:2 | implicit dereference | provenance |  |
-| tst.go:36:2:36:2 | u | tst.go:36:2:36:2 | u | provenance |  |
 | tst.go:36:2:36:2 | u | tst.go:37:11:37:11 | u | provenance |  |
 | tst.go:36:2:36:2 | u [pointer] | tst.go:36:2:36:2 | implicit dereference | provenance |  |
 | tst.go:36:11:36:17 | tainted | tst.go:36:2:36:2 | u | provenance | Config |
 | tst.go:36:11:36:17 | tainted | tst.go:37:11:37:11 | u | provenance | Config |
-| tst.go:37:11:37:11 | u | tst.go:37:11:37:20 | call to String | provenance | MaD:1 |
-| websocket.go:60:21:60:31 | call to Referer | websocket.go:65:27:65:40 | untrustedInput | provenance | Src:MaD:3  |
-| websocket.go:74:21:74:31 | call to Referer | websocket.go:78:36:78:49 | untrustedInput | provenance | Src:MaD:3  |
-| websocket.go:88:21:88:31 | call to Referer | websocket.go:91:31:91:44 | untrustedInput | provenance | Src:MaD:3  |
-| websocket.go:107:21:107:31 | call to Referer | websocket.go:110:15:110:28 | untrustedInput | provenance | Src:MaD:3  |
-| websocket.go:126:21:126:31 | call to Referer | websocket.go:129:38:129:51 | untrustedInput | provenance | Src:MaD:3  |
-| websocket.go:154:21:154:31 | call to Referer | websocket.go:155:31:155:44 | untrustedInput | provenance | Src:MaD:3  |
-| websocket.go:160:21:160:31 | call to Referer | websocket.go:162:31:162:44 | untrustedInput | provenance | Src:MaD:3  |
-| websocket.go:195:21:195:31 | call to Referer | websocket.go:197:18:197:31 | untrustedInput | provenance | Src:MaD:3  |
-| websocket.go:202:21:202:31 | call to Referer | websocket.go:204:11:204:24 | untrustedInput | provenance | Src:MaD:3  |
+| tst.go:37:11:37:11 | u | tst.go:37:11:37:20 | call to String | provenance | MaD:3 |
+| websocket.go:60:21:60:31 | call to Referer | websocket.go:65:27:65:40 | untrustedInput | provenance | Src:MaD:2  |
+| websocket.go:74:21:74:31 | call to Referer | websocket.go:78:36:78:49 | untrustedInput | provenance | Src:MaD:2  |
+| websocket.go:88:21:88:31 | call to Referer | websocket.go:91:31:91:44 | untrustedInput | provenance | Src:MaD:2  |
+| websocket.go:107:21:107:31 | call to Referer | websocket.go:110:15:110:28 | untrustedInput | provenance | Src:MaD:2  |
+| websocket.go:126:21:126:31 | call to Referer | websocket.go:129:38:129:51 | untrustedInput | provenance | Src:MaD:2  |
+| websocket.go:154:21:154:31 | call to Referer | websocket.go:155:31:155:44 | untrustedInput | provenance | Src:MaD:2  |
+| websocket.go:160:21:160:31 | call to Referer | websocket.go:162:31:162:44 | untrustedInput | provenance | Src:MaD:2  |
+| websocket.go:195:21:195:31 | call to Referer | websocket.go:197:18:197:31 | untrustedInput | provenance | Src:MaD:2  |
+| websocket.go:202:21:202:31 | call to Referer | websocket.go:204:11:204:24 | untrustedInput | provenance | Src:MaD:2  |
 models
-| 1 | Summary: fmt; Stringer; true; String; ; ; Argument[receiver]; ReturnValue; taint; manual |
-| 2 | Source: net/http; Request; true; FormValue; ; ; ReturnValue; remote; manual |
-| 3 | Source: net/http; Request; true; Referer; ; ; ReturnValue; remote; manual |
+| 1 | Source: net/http; Request; true; FormValue; ; ; ReturnValue; remote; manual |
+| 2 | Source: net/http; Request; true; Referer; ; ; ReturnValue; remote; manual |
+| 3 | Summary: fmt; Stringer; true; String; ; ; Argument[receiver]; ReturnValue; taint; manual |
 nodes
 | RequestForgery.go:8:12:8:34 | call to FormValue | semmle.label | call to FormValue |
 | RequestForgery.go:11:24:11:65 | ...+... | semmle.label | ...+... |
diff --git a/java/documentation/library-coverage/coverage.csv b/java/documentation/library-coverage/coverage.csv
index d9c920f443c..2f320721865 100644
--- a/java/documentation/library-coverage/coverage.csv
+++ b/java/documentation/library-coverage/coverage.csv
@@ -76,63 +76,61 @@ jakarta.ws.rs.client,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,,,,,,,
 jakarta.ws.rs.container,,9,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,9,,
 jakarta.ws.rs.core,2,,149,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,2,,,,,,,,,94,55
 jakarta.xml.bind.attachment,,2,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,2,,
-java.applet,,,14,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,14,
-java.awt,1,,5,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,,,,,,,,,2,3
-java.beans,,,193,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,193,
-java.io,66,1,256,,,,,,,,,22,,,,,,,,,,,,,,,44,,,,,,,,,,,,,,,,,,,,,,1,,249,7
-java.lang,38,3,756,,13,,,,,,1,,,,,,,,,,,,8,,,,11,,,4,,,1,,,,,,,,,,,,,,,3,,,681,75
+java.applet,,,11,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,11,
+java.awt,1,,3,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,3
+java.beans,,,177,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,82,95
+java.io,66,1,226,,,,,,,,,22,,,,,,,,,,,,,,,44,,,,,,,,,,,,,,,,,,,,,,1,,203,23
+java.lang,38,3,783,,13,,,,,,1,,,,,,,,,,,,8,,,,11,,,4,,,1,,,,,,,,,,,,,,,3,,,506,277
 java.math,,,9,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,9
-java.net,23,3,279,,,,1,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,21,,,,,,,,,,,,,,3,275,4
-java.nio,47,,373,,,,,,,,,5,,,,,,,,,,,,,,,41,,,,,,,,,1,,,,,,,,,,,,,,,267,106
-java.rmi,,,71,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,71,
-java.security,21,,547,,,11,10,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,543,4
-java.sql,15,1,303,,,,1,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,4,,9,,,,,,,,,1,,,,303,
-java.text,,,134,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,134,
-java.time,,,123,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,35,88
-java.util,48,2,1221,,,,,,,,,1,,,,,,,,,,,34,,,,3,,,,5,2,,1,2,,,,,,,,,,,,,2,,,705,516
+java.net,23,3,347,,,,1,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,21,,,,,,,,,,,,,,3,248,99
+java.nio,47,,499,,,,,,,,,5,,,,,,,,,,,,,,,41,,,,,,,,,1,,,,,,,,,,,,,,,302,197
+java.rmi,,,68,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,45,23
+java.security,21,,583,,,11,10,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,285,298
+java.sql,15,1,292,,,,1,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,4,,9,,,,,,,,,1,,,,274,18
+java.text,,,154,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,72,82
+java.time,,,131,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,27,104
+java.util,48,2,1339,,,,,,,,,1,,,,,,,,,,,34,,,,3,,,,5,2,,1,2,,,,,,,,,,,,,2,,,558,781
 javafx.scene.web,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,,,,,,,
-javax.accessibility,,,31,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,31,
+javax.accessibility,,,63,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,28,35
 javax.activation,2,,7,,,,,,,,,,,,,,,,,,,,,,,,1,,,,,,,,,1,,,,,,,,,,,,,,,7,
-javax.annotation.processing,,,9,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,9,
-javax.crypto,19,,128,,,12,3,,2,2,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,128,
+javax.annotation.processing,,,28,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,25,3
+javax.crypto,19,,114,,,12,3,,2,2,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,61,53
 javax.faces.context,4,7,,,,,,,,,,,,,,2,,,,,,,,,,,2,,,,,,,,,,,,,,,,,,,,,,,7,,
-javax.imageio,1,,261,,,,,,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,,,,,,,,,,,,,,,261,
+javax.imageio,1,,304,,,,,,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,,,,,,,,,,,,,,,138,166
 javax.jms,,9,57,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,9,57,
 javax.json,,,123,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,100,23
-javax.lang.model.element,,,17,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,17,
-javax.lang.model.type,,,9,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,9,
-javax.lang.model.util,,,68,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,68,
-javax.management,2,,802,,,,,,,,,,,,,,,,,2,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,801,1
-javax.naming,7,,324,,,,,,,,,,,,,,,,,6,,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,318,6
-javax.net,4,,86,,,,2,,,,,,,,2,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,86,
-javax.portlet,1,,61,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,61,
-javax.print,2,,100,,,,,2,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,100,
-javax.rmi.ssl,,,7,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,7,
-javax.script,1,,42,,,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,,,,,,,,,,,,,,,,,,42,
-javax.security.auth,7,,137,,,4,3,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,137,
+javax.lang.model,,,277,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,217,60
+javax.management,2,,766,,,,,,,,,,,,,,,,,2,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,363,403
+javax.naming,7,,341,,,,,,,,,,,,,,,,,6,,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,191,150
+javax.net,4,,136,,,,2,,,,,,,,2,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,87,49
+javax.portlet,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,,
+javax.print,2,,133,,,,,2,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,102,31
+javax.rmi.ssl,,,6,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,6
+javax.script,1,,50,,,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,,,,,,,,,,,,,,,,,,14,36
+javax.security.auth,7,,147,,,4,3,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,50,97
 javax.security.cert,,,5,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,5,
-javax.security.sasl,,,28,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,28,
+javax.security.sasl,,,49,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,42,7
 javax.servlet,10,22,3,,,,,,,,,,,,,,1,,,,,,,,,,2,,,,,,,,,,3,,,2,2,,,,,,,,,22,3,
-javax.smartcardio,,,30,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,30,
-javax.sound.midi,,,29,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,29,
-javax.sound.sampled,,,66,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,66,
-javax.sql,7,,63,,,,4,3,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,63,
-javax.tools,,,31,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,31,
+javax.smartcardio,,,34,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,24,10
+javax.sound.midi,,,60,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,51,9
+javax.sound.sampled,,,90,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,53,37
+javax.sql,7,,126,,,,4,3,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,68,58
+javax.tools,,,66,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,62,4
 javax.transaction.xa,,,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,
 javax.validation,1,1,,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,,
 javax.ws.rs.client,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,,,,,,,
 javax.ws.rs.container,,9,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,9,,
 javax.ws.rs.core,3,,149,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,,,,,2,,,,,,,,,94,55
 javax.xml.bind.attachment,,2,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,2,,
-javax.xml.catalog,,,11,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,10,1
-javax.xml.crypto,,,126,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,126,
-javax.xml.datatype,,,4,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,4,
-javax.xml.namespace,,,10,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,10,
-javax.xml.parsers,,,18,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,18,
-javax.xml.stream,,,36,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,36,
-javax.xml.transform,2,,89,,,,,,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,,,,,,,,1,,,,,,,89,
-javax.xml.validation,,,5,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,5,
-javax.xml.xpath,3,,12,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,3,,,,,,,,12,
+javax.xml.catalog,,,12,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,11,1
+javax.xml.crypto,,,269,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,172,97
+javax.xml.datatype,,,6,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,5,1
+javax.xml.namespace,,,15,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,5,10
+javax.xml.parsers,,,37,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,35,2
+javax.xml.stream,,,221,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,201,20
+javax.xml.transform,2,,134,,,,,,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,,,,,,,,1,,,,,,,72,62
+javax.xml.validation,,,29,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,29,
+javax.xml.xpath,3,,26,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,3,,,,,,,,26,
 jenkins,,,523,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,500,23
 jodd.json,,,10,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,10
 kotlin,16,,1849,,,,,,,,,,,,,,,,,,,,,,,,14,,,,,,,,,2,,,,,,,,,,,,,,,1836,13
@@ -233,7 +231,7 @@ org.springframework.beans,,,30,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,3
 org.springframework.boot.jdbc,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,,,,,,,
 org.springframework.cache,,,13,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,13
 org.springframework.context,,,3,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,3,
-org.springframework.core.io,17,,5,,,,,,,,,,,,,,,,,,,,,,,,16,,,,,,,,,1,,,,,,,,,,,,,,,5,
+org.springframework.core.io,17,,6,,,,,,,,,,,,,,,,,,,,,,,,16,,,,,,,,,1,,,,,,,,,,,,,,,6,
 org.springframework.data.repository,,,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1
 org.springframework.http,14,,77,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,14,,,,,,,,,,,,,,,67,10
 org.springframework.jdbc.core,19,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,19,,,,,,,,,,,,,,
@@ -248,14 +246,13 @@ org.springframework.util,10,,142,,,,,,,,,,,,,,,,,,,,,,,,10,,,,,,,,,,,,,,,,,,,,,,
 org.springframework.validation,,,13,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,13,
 org.springframework.web.client,13,3,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,13,,,,,,,,,,,,,,3,,
 org.springframework.web.context.request,,8,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,8,,
-org.springframework.web.multipart,,12,13,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,12,13,
+org.springframework.web.multipart,,12,12,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,12,12,
 org.springframework.web.portlet,2,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,2,,,,,,,,,,,
 org.springframework.web.reactive.function.client,2,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,2,,,,,,,,,,,,,,,,
 org.springframework.web.servlet,2,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,2,,,,,,,,,,,
 org.springframework.web.util,,9,157,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,9,132,25
 org.thymeleaf,2,,2,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,2,,,,,,,,,,,,2,
-org.w3c.dom,,,57,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,56,1
-org.xml.sax,,,4,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,4,
+org.xml.sax,,,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,
 org.xmlpull.v1,,3,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,3,,
 org.yaml.snakeyaml,,,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,
 play.libs.ws,2,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,2,,,,,,,,,,,,,,,,
@@ -271,21 +268,17 @@ ratpack.http,,10,10,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,10,10,
 ratpack.util,,,35,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,35
 retrofit2,1,,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,,,,,,1,
 software.amazon.awssdk.transfer.s3.model,8,,,,,,,,,,,,,,,,,,,,,,,,,,8,,,,,,,,,,,,,,,,,,,,,,,,,
-sun.awt,,,5,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,5,
 sun.jvmstat.perfdata.monitor.protocol.local,3,,,,,,,3,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
 sun.jvmstat.perfdata.monitor.protocol.rmi,1,,,,,,,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-sun.management.spi,,,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,
 sun.misc,3,,,,,,,3,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
 sun.net.ftp,5,,,,,,2,3,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
 sun.net.www.protocol.http,3,,,,,,2,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-sun.nio.ch,,,2,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,2,
 sun.security.acl,1,,,,,,,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
 sun.security.jgss.krb5,2,,,,,2,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-sun.security.krb5,9,,7,,,3,6,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,7,
+sun.security.krb5,9,,,,,3,6,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
 sun.security.pkcs,4,,,,,4,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
 sun.security.pkcs11,3,,,,,1,2,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
 sun.security.provider,2,,,,,,2,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
 sun.security.ssl,3,,,,,,3,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
 sun.security.x509,1,,,,,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
 sun.tools.jconsole,28,,,,,,13,15,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-sun.util.logging.internal,,,3,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,3,
diff --git a/java/documentation/library-coverage/coverage.rst b/java/documentation/library-coverage/coverage.rst
index cea3d438ee2..89f4700e987 100644
--- a/java/documentation/library-coverage/coverage.rst
+++ b/java/documentation/library-coverage/coverage.rst
@@ -18,10 +18,10 @@ Java framework & library support
    `Google Guava <https://guava.dev/>`_,``com.google.common.*``,,730,43,9,,,,,
    JBoss Logging,``org.jboss.logging``,,,324,,,,,,
    `JSON-java <https://github.com/stleary/JSON-java>`_,``org.json``,,236,,,,,,,
-   Java Standard Library,``java.*``,10,4284,259,99,,9,,,26
-   Java extensions,"``javax.*``, ``jakarta.*``",69,3260,90,10,4,2,1,1,4
+   Java Standard Library,``java.*``,10,4622,259,99,,9,,,26
+   Java extensions,"``javax.*``, ``jakarta.*``",69,4159,90,10,4,2,1,1,4
    Kotlin Standard Library,``kotlin*``,,1849,16,14,,,,,2
    `Spring <https://spring.io/>`_,``org.springframework.*``,38,486,143,26,,28,14,,35
-   Others,"``actions.osgi``, ``antlr``, ``ch.ethz.ssh2``, ``cn.hutool.core.codec``, ``com.alibaba.druid.sql``, ``com.alibaba.fastjson2``, ``com.amazonaws.auth``, ``com.auth0.jwt.algorithms``, ``com.azure.identity``, ``com.esotericsoftware.kryo.io``, ``com.esotericsoftware.kryo5.io``, ``com.fasterxml.jackson.core``, ``com.fasterxml.jackson.databind``, ``com.google.gson``, ``com.hubspot.jinjava``, ``com.jcraft.jsch``, ``com.microsoft.sqlserver.jdbc``, ``com.mitchellbosecke.pebble``, ``com.mongodb``, ``com.opensymphony.xwork2``, ``com.rabbitmq.client``, ``com.sshtools.j2ssh.authentication``, ``com.sun.crypto.provider``, ``com.sun.jndi.ldap``, ``com.sun.net.httpserver``, ``com.sun.net.ssl``, ``com.sun.rowset``, ``com.sun.security.auth.module``, ``com.sun.security.ntlm``, ``com.sun.security.sasl.digest``, ``com.thoughtworks.xstream``, ``com.trilead.ssh2``, ``com.unboundid.ldap.sdk``, ``com.zaxxer.hikari``, ``flexjson``, ``freemarker.cache``, ``freemarker.template``, ``groovy.lang``, ``groovy.text``, ``groovy.util``, ``hudson``, ``io.jsonwebtoken``, ``io.netty.bootstrap``, ``io.netty.buffer``, ``io.netty.channel``, ``io.netty.handler.codec``, ``io.netty.handler.ssl``, ``io.netty.handler.stream``, ``io.netty.resolver``, ``io.netty.util``, ``io.undertow.server.handlers.resource``, ``javafx.scene.web``, ``jenkins``, ``jodd.json``, ``liquibase.database.jvm``, ``liquibase.statement.core``, ``net.lingala.zip4j``, ``net.schmizz.sshj``, ``net.sf.json``, ``net.sf.saxon.s9api``, ``ognl``, ``okhttp3``, ``org.acegisecurity``, ``org.antlr.runtime``, ``org.apache.commons.codec``, ``org.apache.commons.compress.archivers.tar``, ``org.apache.commons.exec``, ``org.apache.commons.httpclient.util``, ``org.apache.commons.jelly``, ``org.apache.commons.jexl2``, ``org.apache.commons.jexl3``, ``org.apache.commons.lang``, ``org.apache.commons.logging``, ``org.apache.commons.net``, ``org.apache.commons.ognl``, ``org.apache.cxf.catalog``, ``org.apache.cxf.common.classloader``, ``org.apache.cxf.common.jaxb``, ``org.apache.cxf.common.logging``, ``org.apache.cxf.configuration.jsse``, ``org.apache.cxf.helpers``, ``org.apache.cxf.resource``, ``org.apache.cxf.staxutils``, ``org.apache.cxf.tools.corba.utils``, ``org.apache.cxf.tools.util``, ``org.apache.cxf.transform``, ``org.apache.directory.ldap.client.api``, ``org.apache.hadoop.fs``, ``org.apache.hadoop.hive.metastore``, ``org.apache.hadoop.hive.ql.exec``, ``org.apache.hadoop.hive.ql.metadata``, ``org.apache.hc.client5.http.async.methods``, ``org.apache.hc.client5.http.classic.methods``, ``org.apache.hc.client5.http.fluent``, ``org.apache.hive.hcatalog.templeton``, ``org.apache.ibatis.jdbc``, ``org.apache.ibatis.mapping``, ``org.apache.log4j``, ``org.apache.shiro.authc``, ``org.apache.shiro.codec``, ``org.apache.shiro.jndi``, ``org.apache.shiro.mgt``, ``org.apache.sshd.client.session``, ``org.apache.struts.beanvalidation.validation.interceptor``, ``org.apache.struts2``, ``org.apache.tools.ant``, ``org.apache.tools.zip``, ``org.apache.velocity.app``, ``org.apache.velocity.runtime``, ``org.codehaus.cargo.container.installer``, ``org.codehaus.groovy.control``, ``org.dom4j``, ``org.eclipse.jetty.client``, ``org.fusesource.leveldbjni``, ``org.geogebra.web.full.main``, ``org.gradle.api.file``, ``org.hibernate``, ``org.influxdb``, ``org.jboss.vfs``, ``org.jdbi.v3.core``, ``org.jenkins.ui.icon``, ``org.jenkins.ui.symbol``, ``org.jooq``, ``org.keycloak.models.map.storage``, ``org.kohsuke.stapler``, ``org.lastaflute.web``, ``org.mvel2``, ``org.openjdk.jmh.runner.options``, ``org.owasp.esapi``, ``org.pac4j.jwt.config.encryption``, ``org.pac4j.jwt.config.signature``, ``org.scijava.log``, ``org.slf4j``, ``org.thymeleaf``, ``org.w3c.dom``, ``org.xml.sax``, ``org.xmlpull.v1``, ``org.yaml.snakeyaml``, ``play.libs.ws``, ``play.mvc``, ``ratpack.core.form``, ``ratpack.core.handling``, ``ratpack.core.http``, ``ratpack.exec``, ``ratpack.form``, ``ratpack.func``, ``ratpack.handling``, ``ratpack.http``, ``ratpack.util``, ``retrofit2``, ``software.amazon.awssdk.transfer.s3.model``, ``sun.awt``, ``sun.jvmstat.perfdata.monitor.protocol.local``, ``sun.jvmstat.perfdata.monitor.protocol.rmi``, ``sun.management.spi``, ``sun.misc``, ``sun.net.ftp``, ``sun.net.www.protocol.http``, ``sun.nio.ch``, ``sun.security.acl``, ``sun.security.jgss.krb5``, ``sun.security.krb5``, ``sun.security.pkcs``, ``sun.security.pkcs11``, ``sun.security.provider``, ``sun.security.ssl``, ``sun.security.x509``, ``sun.tools.jconsole``, ``sun.util.logging.internal``",133,10603,908,140,6,22,18,,208
-   Totals,,312,25170,2635,404,16,128,33,1,409
+   Others,"``actions.osgi``, ``antlr``, ``ch.ethz.ssh2``, ``cn.hutool.core.codec``, ``com.alibaba.druid.sql``, ``com.alibaba.fastjson2``, ``com.amazonaws.auth``, ``com.auth0.jwt.algorithms``, ``com.azure.identity``, ``com.esotericsoftware.kryo.io``, ``com.esotericsoftware.kryo5.io``, ``com.fasterxml.jackson.core``, ``com.fasterxml.jackson.databind``, ``com.google.gson``, ``com.hubspot.jinjava``, ``com.jcraft.jsch``, ``com.microsoft.sqlserver.jdbc``, ``com.mitchellbosecke.pebble``, ``com.mongodb``, ``com.opensymphony.xwork2``, ``com.rabbitmq.client``, ``com.sshtools.j2ssh.authentication``, ``com.sun.crypto.provider``, ``com.sun.jndi.ldap``, ``com.sun.net.httpserver``, ``com.sun.net.ssl``, ``com.sun.rowset``, ``com.sun.security.auth.module``, ``com.sun.security.ntlm``, ``com.sun.security.sasl.digest``, ``com.thoughtworks.xstream``, ``com.trilead.ssh2``, ``com.unboundid.ldap.sdk``, ``com.zaxxer.hikari``, ``flexjson``, ``freemarker.cache``, ``freemarker.template``, ``groovy.lang``, ``groovy.text``, ``groovy.util``, ``hudson``, ``io.jsonwebtoken``, ``io.netty.bootstrap``, ``io.netty.buffer``, ``io.netty.channel``, ``io.netty.handler.codec``, ``io.netty.handler.ssl``, ``io.netty.handler.stream``, ``io.netty.resolver``, ``io.netty.util``, ``io.undertow.server.handlers.resource``, ``javafx.scene.web``, ``jenkins``, ``jodd.json``, ``liquibase.database.jvm``, ``liquibase.statement.core``, ``net.lingala.zip4j``, ``net.schmizz.sshj``, ``net.sf.json``, ``net.sf.saxon.s9api``, ``ognl``, ``okhttp3``, ``org.acegisecurity``, ``org.antlr.runtime``, ``org.apache.commons.codec``, ``org.apache.commons.compress.archivers.tar``, ``org.apache.commons.exec``, ``org.apache.commons.httpclient.util``, ``org.apache.commons.jelly``, ``org.apache.commons.jexl2``, ``org.apache.commons.jexl3``, ``org.apache.commons.lang``, ``org.apache.commons.logging``, ``org.apache.commons.net``, ``org.apache.commons.ognl``, ``org.apache.cxf.catalog``, ``org.apache.cxf.common.classloader``, ``org.apache.cxf.common.jaxb``, ``org.apache.cxf.common.logging``, ``org.apache.cxf.configuration.jsse``, ``org.apache.cxf.helpers``, ``org.apache.cxf.resource``, ``org.apache.cxf.staxutils``, ``org.apache.cxf.tools.corba.utils``, ``org.apache.cxf.tools.util``, ``org.apache.cxf.transform``, ``org.apache.directory.ldap.client.api``, ``org.apache.hadoop.fs``, ``org.apache.hadoop.hive.metastore``, ``org.apache.hadoop.hive.ql.exec``, ``org.apache.hadoop.hive.ql.metadata``, ``org.apache.hc.client5.http.async.methods``, ``org.apache.hc.client5.http.classic.methods``, ``org.apache.hc.client5.http.fluent``, ``org.apache.hive.hcatalog.templeton``, ``org.apache.ibatis.jdbc``, ``org.apache.ibatis.mapping``, ``org.apache.log4j``, ``org.apache.shiro.authc``, ``org.apache.shiro.codec``, ``org.apache.shiro.jndi``, ``org.apache.shiro.mgt``, ``org.apache.sshd.client.session``, ``org.apache.struts.beanvalidation.validation.interceptor``, ``org.apache.struts2``, ``org.apache.tools.ant``, ``org.apache.tools.zip``, ``org.apache.velocity.app``, ``org.apache.velocity.runtime``, ``org.codehaus.cargo.container.installer``, ``org.codehaus.groovy.control``, ``org.dom4j``, ``org.eclipse.jetty.client``, ``org.fusesource.leveldbjni``, ``org.geogebra.web.full.main``, ``org.gradle.api.file``, ``org.hibernate``, ``org.influxdb``, ``org.jboss.vfs``, ``org.jdbi.v3.core``, ``org.jenkins.ui.icon``, ``org.jenkins.ui.symbol``, ``org.jooq``, ``org.keycloak.models.map.storage``, ``org.kohsuke.stapler``, ``org.lastaflute.web``, ``org.mvel2``, ``org.openjdk.jmh.runner.options``, ``org.owasp.esapi``, ``org.pac4j.jwt.config.encryption``, ``org.pac4j.jwt.config.signature``, ``org.scijava.log``, ``org.slf4j``, ``org.thymeleaf``, ``org.xml.sax``, ``org.xmlpull.v1``, ``org.yaml.snakeyaml``, ``play.libs.ws``, ``play.mvc``, ``ratpack.core.form``, ``ratpack.core.handling``, ``ratpack.core.http``, ``ratpack.exec``, ``ratpack.form``, ``ratpack.func``, ``ratpack.handling``, ``ratpack.http``, ``ratpack.util``, ``retrofit2``, ``software.amazon.awssdk.transfer.s3.model``, ``sun.jvmstat.perfdata.monitor.protocol.local``, ``sun.jvmstat.perfdata.monitor.protocol.rmi``, ``sun.misc``, ``sun.net.ftp``, ``sun.net.www.protocol.http``, ``sun.security.acl``, ``sun.security.jgss.krb5``, ``sun.security.krb5``, ``sun.security.pkcs``, ``sun.security.pkcs11``, ``sun.security.provider``, ``sun.security.ssl``, ``sun.security.x509``, ``sun.tools.jconsole``",133,10525,908,140,6,22,18,,208
+   Totals,,312,26329,2635,404,16,128,33,1,409
 
diff --git a/java/downgrades/1fd1afa7862b82955785edd29820054ab6c9ec81/erasure.ql b/java/downgrades/1fd1afa7862b82955785edd29820054ab6c9ec81/erasure.ql
new file mode 100644
index 00000000000..3ceef2d45de
--- /dev/null
+++ b/java/downgrades/1fd1afa7862b82955785edd29820054ab6c9ec81/erasure.ql
@@ -0,0 +1,9 @@
+class ClassOrInterface extends @classorinterface {
+  string toString() { none() }
+}
+
+from ClassOrInterface x, ClassOrInterface y
+where
+  classes_or_interfaces(x, _, _, y) and
+  x != y
+select x, y
diff --git a/java/downgrades/1fd1afa7862b82955785edd29820054ab6c9ec81/old.dbscheme b/java/downgrades/1fd1afa7862b82955785edd29820054ab6c9ec81/old.dbscheme
new file mode 100644
index 00000000000..1fd1afa7862
--- /dev/null
+++ b/java/downgrades/1fd1afa7862b82955785edd29820054ab6c9ec81/old.dbscheme
@@ -0,0 +1,1227 @@
+/**
+ * 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
+);
+
+/*
+ * 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
+);
+
+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/1fd1afa7862b82955785edd29820054ab6c9ec81/semmlecode.dbscheme b/java/downgrades/1fd1afa7862b82955785edd29820054ab6c9ec81/semmlecode.dbscheme
new file mode 100644
index 00000000000..876cabc76c5
--- /dev/null
+++ b/java/downgrades/1fd1afa7862b82955785edd29820054ab6c9ec81/semmlecode.dbscheme
@@ -0,0 +1,1232 @@
+/**
+ * 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
+);
+
+/*
+ * 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
+);
+
+erasure(
+  unique int memberid: @member ref,
+  int erasureid: @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
+);
+
+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/1fd1afa7862b82955785edd29820054ab6c9ec81/upgrade.properties b/java/downgrades/1fd1afa7862b82955785edd29820054ab6c9ec81/upgrade.properties
new file mode 100644
index 00000000000..771000565ae
--- /dev/null
+++ b/java/downgrades/1fd1afa7862b82955785edd29820054ab6c9ec81/upgrade.properties
@@ -0,0 +1,3 @@
+description: Remove erasure
+compatibility: full
+erasure.rel: run erasure.qlo
diff --git a/java/downgrades/876cabc76c5c83912271db331481f8cba2749643/fields.ql b/java/downgrades/876cabc76c5c83912271db331481f8cba2749643/fields.ql
new file mode 100644
index 00000000000..614cb9b4afe
--- /dev/null
+++ b/java/downgrades/876cabc76c5c83912271db331481f8cba2749643/fields.ql
@@ -0,0 +1,15 @@
+class Field extends @field {
+  string toString() { none() }
+}
+
+class Type extends @type {
+  string toString() { none() }
+}
+
+class RefType extends @reftype {
+  string toString() { none() }
+}
+
+from Field f, string name, Type t, RefType parent
+where fields(f, name, t, parent)
+select f, name, t, parent, f
diff --git a/java/downgrades/876cabc76c5c83912271db331481f8cba2749643/old.dbscheme b/java/downgrades/876cabc76c5c83912271db331481f8cba2749643/old.dbscheme
new file mode 100644
index 00000000000..876cabc76c5
--- /dev/null
+++ b/java/downgrades/876cabc76c5c83912271db331481f8cba2749643/old.dbscheme
@@ -0,0 +1,1232 @@
+/**
+ * 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
+);
+
+/*
+ * 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
+);
+
+erasure(
+  unique int memberid: @member ref,
+  int erasureid: @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
+);
+
+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/876cabc76c5c83912271db331481f8cba2749643/semmlecode.dbscheme b/java/downgrades/876cabc76c5c83912271db331481f8cba2749643/semmlecode.dbscheme
new file mode 100644
index 00000000000..376ce7dad79
--- /dev/null
+++ b/java/downgrades/876cabc76c5c83912271db331481f8cba2749643/semmlecode.dbscheme
@@ -0,0 +1,1233 @@
+/**
+ * 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
+);
+
+/*
+ * 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,
+  int sourceid: @field 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
+);
+
+erasure(
+  unique int memberid: @member ref,
+  int erasureid: @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
+);
+
+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/876cabc76c5c83912271db331481f8cba2749643/upgrade.properties b/java/downgrades/876cabc76c5c83912271db331481f8cba2749643/upgrade.properties
new file mode 100644
index 00000000000..64fe711dd70
--- /dev/null
+++ b/java/downgrades/876cabc76c5c83912271db331481f8cba2749643/upgrade.properties
@@ -0,0 +1,3 @@
+description: Remove fields.sourceid
+compatibility: full
+fields.rel: run fields.qlo
diff --git a/java/kotlin-extractor/deps.bzl b/java/kotlin-extractor/deps.bzl
index 6e55969f251..bee713f8c46 100644
--- a/java/kotlin-extractor/deps.bzl
+++ b/java/kotlin-extractor/deps.bzl
@@ -17,7 +17,7 @@ def _get_dep(repository_ctx, name):
     return repository_ctx.path(Label("//java/kotlin-extractor/deps:%s" % name))
 
 def _kotlin_dep_impl(repository_ctx):
-    _, _, name = repository_ctx.name.rpartition("~")
+    _, _, name = repository_ctx.name.rpartition("+")
     lfs_smudge(repository_ctx, [_get_dep(repository_ctx, name + ".jar")])
 
     # for some reason rules_kotlin warns about these jars missing, this is to silence those warnings
diff --git a/java/kotlin-extractor/deps/kotlin-compiler-2.1.0-Beta1.jar b/java/kotlin-extractor/deps/kotlin-compiler-2.1.0-Beta1.jar
new file mode 100644
index 00000000000..6d94bcd231b
--- /dev/null
+++ b/java/kotlin-extractor/deps/kotlin-compiler-2.1.0-Beta1.jar
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2ec66b3523c69b3436b8c9777707db4da86d680d6652aeda539fff7d5a84aeab
+size 59837198
diff --git a/java/kotlin-extractor/deps/kotlin-compiler-embeddable-2.1.0-Beta1.jar b/java/kotlin-extractor/deps/kotlin-compiler-embeddable-2.1.0-Beta1.jar
new file mode 100644
index 00000000000..b3abb08ad6e
--- /dev/null
+++ b/java/kotlin-extractor/deps/kotlin-compiler-embeddable-2.1.0-Beta1.jar
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9b4581ffe576a33322fe51435a1b5ea4f4717bb6f7ce18b68106df63056e385c
+size 58409745
diff --git a/java/kotlin-extractor/deps/kotlin-stdlib-2.1.0-Beta1.jar b/java/kotlin-extractor/deps/kotlin-stdlib-2.1.0-Beta1.jar
new file mode 100644
index 00000000000..b517f360e21
--- /dev/null
+++ b/java/kotlin-extractor/deps/kotlin-stdlib-2.1.0-Beta1.jar
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7ef9c5c246cd2e7d06cd5741995753c0b697107efae40657af3010c6c6311ab2
+size 1688722
diff --git a/java/kotlin-extractor/src/main/kotlin/KotlinExtractorExtension.kt b/java/kotlin-extractor/src/main/kotlin/KotlinExtractorExtension.kt
index 3850d690a61..1fc8ee37fc0 100644
--- a/java/kotlin-extractor/src/main/kotlin/KotlinExtractorExtension.kt
+++ b/java/kotlin-extractor/src/main/kotlin/KotlinExtractorExtension.kt
@@ -140,6 +140,7 @@ class KotlinExtractorExtension(
             val logger = Logger(loggerBase, tw)
             logger.info("Extraction started")
             logger.flush()
+            logger.infoVerbosity()
             logger.info("Extraction for invocation TRAP file $invocationTrapFile")
             logger.flush()
             logger.info("Kotlin version ${KotlinCompilerVersion.getVersion()}")
diff --git a/java/kotlin-extractor/src/main/kotlin/KotlinFileExtractor.kt b/java/kotlin-extractor/src/main/kotlin/KotlinFileExtractor.kt
index 0ca8cb4af09..42617078ff5 100644
--- a/java/kotlin-extractor/src/main/kotlin/KotlinFileExtractor.kt
+++ b/java/kotlin-extractor/src/main/kotlin/KotlinFileExtractor.kt
@@ -27,30 +27,7 @@ import org.jetbrains.kotlin.ir.expressions.impl.*
 import org.jetbrains.kotlin.ir.symbols.*
 import org.jetbrains.kotlin.ir.types.*
 import org.jetbrains.kotlin.ir.types.impl.makeTypeProjection
-import org.jetbrains.kotlin.ir.util.companionObject
-import org.jetbrains.kotlin.ir.util.constructors
-import org.jetbrains.kotlin.ir.util.fqNameWhenAvailable
-import org.jetbrains.kotlin.ir.util.hasAnnotation
-import org.jetbrains.kotlin.ir.util.hasInterfaceParent
-import org.jetbrains.kotlin.ir.util.isAnnotationClass
-import org.jetbrains.kotlin.ir.util.isAnonymousObject
-import org.jetbrains.kotlin.ir.util.isFakeOverride
-import org.jetbrains.kotlin.ir.util.isFunctionOrKFunction
-import org.jetbrains.kotlin.ir.util.isInterface
-import org.jetbrains.kotlin.ir.util.isLocal
-import org.jetbrains.kotlin.ir.util.isNonCompanionObject
-import org.jetbrains.kotlin.ir.util.isObject
-import org.jetbrains.kotlin.ir.util.isSuspend
-import org.jetbrains.kotlin.ir.util.isSuspendFunctionOrKFunction
-import org.jetbrains.kotlin.ir.util.isVararg
-import org.jetbrains.kotlin.ir.util.kotlinFqName
-import org.jetbrains.kotlin.ir.util.packageFqName
-import org.jetbrains.kotlin.ir.util.parentAsClass
-import org.jetbrains.kotlin.ir.util.parentClassOrNull
-import org.jetbrains.kotlin.ir.util.parents
-import org.jetbrains.kotlin.ir.util.primaryConstructor
-import org.jetbrains.kotlin.ir.util.render
-import org.jetbrains.kotlin.ir.util.target
+import org.jetbrains.kotlin.ir.util.*
 import org.jetbrains.kotlin.load.java.JvmAnnotationNames
 import org.jetbrains.kotlin.load.java.NOT_NULL_ANNOTATIONS
 import org.jetbrains.kotlin.load.java.NULLABLE_ANNOTATIONS
@@ -192,11 +169,17 @@ open class KotlinFileExtractor(
         }
 
     private fun FunctionDescriptor.tryIsHiddenToOvercomeSignatureClash(d: IrFunction): Boolean {
+        // `org.jetbrains.kotlin.ir.descriptors.IrBasedClassConstructorDescriptor.isHiddenToOvercomeSignatureClash`
+        // throws one exception or other in Kotlin 2, depending on the version.
+        // TODO: We need a replacement for this for Kotlin 2
         try {
             return this.isHiddenToOvercomeSignatureClash
         } catch (e: NotImplementedError) {
-            // `org.jetbrains.kotlin.ir.descriptors.IrBasedClassConstructorDescriptor.isHiddenToOvercomeSignatureClash` throws the exception
-            // TODO: We need a replacement for this for Kotlin 2
+            if (!usesK2) {
+                logger.warnElement("Couldn't query if element is fake, deciding it's not.", d, e)
+            }
+            return false
+        } catch (e: IllegalStateException) {
             if (!usesK2) {
                 logger.warnElement("Couldn't query if element is fake, deciding it's not.", d, e)
             }
@@ -501,8 +484,6 @@ open class KotlinFileExtractor(
                 tw.writeIsRaw(id)
             }
 
-            val unbound = useClassSource(c)
-            tw.writeErasure(id, unbound)
             extractClassModifiers(c, id)
             extractClassSupertypes(
                 c,
@@ -826,7 +807,7 @@ open class KotlinFileExtractor(
         fun exprId() = tw.getLabelFor<DbExpr>("@\"annotationExpr;{$parent};$idx\"")
 
         return when (v) {
-            is IrConst<*> -> {
+            is CodeQLIrConst<*> -> {
                 extractConstant(v, parent, idx, null, null, overrideId = exprId())
             }
             is IrGetEnumValue -> {
@@ -1020,7 +1001,7 @@ open class KotlinFileExtractor(
                     // here.
                     val instance = useObjectClassInstance(c)
                     val type = useSimpleTypeClass(c, emptyList(), false)
-                    tw.writeFields(instance.id, instance.name, type.javaResult.id, id, instance.id)
+                    tw.writeFields(instance.id, instance.name, type.javaResult.id, id)
                     tw.writeFieldsKotlinType(instance.id, type.kotlinResult.id)
                     tw.writeHasLocation(instance.id, locId)
                     addModifiers(instance.id, "public", "static", "final")
@@ -1237,8 +1218,7 @@ open class KotlinFileExtractor(
                                 instance.id,
                                 instance.name,
                                 type.javaResult.id,
-                                parentId,
-                                instance.id
+                                parentId
                             )
                             tw.writeFieldsKotlinType(instance.id, type.kotlinResult.id)
                             tw.writeHasLocation(instance.id, innerLocId)
@@ -2600,7 +2580,7 @@ open class KotlinFileExtractor(
         isStatic: Boolean
     ): Label<out DbField> {
         val t = useType(type)
-        tw.writeFields(id, name, t.javaResult.id, parentId, id)
+        tw.writeFields(id, name, t.javaResult.id, parentId)
         tw.writeFieldsKotlinType(id, t.kotlinResult.id)
         tw.writeHasLocation(id, locId)
 
@@ -2757,7 +2737,7 @@ open class KotlinFileExtractor(
             DeclarationStackAdjuster(ee).use {
                 val id = useEnumEntry(ee)
                 val type = getEnumEntryType(ee) ?: return
-                tw.writeFields(id, ee.name.asString(), type.javaResult.id, parentId, id)
+                tw.writeFields(id, ee.name.asString(), type.javaResult.id, parentId)
                 tw.writeFieldsKotlinType(id, type.kotlinResult.id)
                 val locId = tw.getLocation(ee)
                 tw.writeHasLocation(id, locId)
@@ -5765,7 +5745,14 @@ open class KotlinFileExtractor(
     ) =
         exprIdOrFresh<DbNullliteral>(overrideId).also {
             val type = useType(t)
-            tw.writeExprs_nullliteral(it, type.javaResult.id, parent, idx)
+            // Match Java by using a special <nulltype> for nulls, rather than Kotlin's view of this which is
+            // kotlin.Nothing?, the type that can only contain null.
+            val nullTypeName = "<nulltype>"
+            val javaNullType = tw.getLabelFor<DbPrimitive>(
+                "@\"type;$nullTypeName\"",
+                { tw.writePrimitives(it, nullTypeName) }
+            )
+            tw.writeExprs_nullliteral(it, javaNullType, parent, idx)
             tw.writeExprsKotlinType(it, type.kotlinResult.id)
             extractExprContext(it, locId, callable, enclosingStmt)
         }
@@ -5999,7 +5986,7 @@ open class KotlinFileExtractor(
                         extractExpressionExpr(a, callable, id, i, exprParent.enclosingStmt)
                     }
                 }
-                is IrConst<*> -> {
+                is CodeQLIrConst<*> -> {
                     val exprParent = parent.expr(e, callable)
                     extractConstant(
                         e,
@@ -6211,9 +6198,9 @@ open class KotlinFileExtractor(
                     if (
                         (isAndAnd || isOrOr) &&
                             e.branches.size == 2 &&
-                            (e.branches[1].condition as? IrConst<*>)?.value == true &&
+                            (e.branches[1].condition as? CodeQLIrConst<*>)?.value == true &&
                             (e.branches[if (e.origin == IrStatementOrigin.ANDAND) 1 else 0].result
-                                    as? IrConst<*>)
+                                    as? CodeQLIrConst<*>)
                                 ?.value == isOrOr
                     ) {
 
@@ -6869,7 +6856,7 @@ open class KotlinFileExtractor(
         }
 
     private fun extractConstant(
-        e: IrConst<*>,
+        e: CodeQLIrConst<*>,
         parent: Label<out DbExprparent>,
         idx: Int,
         enclosingCallable: Label<out DbCallable>?,
@@ -9041,7 +9028,7 @@ open class KotlinFileExtractor(
         tw.writeHasLocation(id, locId)
 
         // Extract constructor
-        val unitType = useType(pluginContext.irBuiltIns.unitType)
+        val unitType = useType(pluginContext.irBuiltIns.unitType, TypeContext.RETURN)
         tw.writeConstrs(ids.constructor, "", "", unitType.javaResult.id, id, ids.constructor)
         tw.writeConstrsKotlinType(ids.constructor, unitType.kotlinResult.id)
         tw.writeHasLocation(ids.constructor, locId)
diff --git a/java/kotlin-extractor/src/main/kotlin/KotlinUsesExtractor.kt b/java/kotlin-extractor/src/main/kotlin/KotlinUsesExtractor.kt
index 3be94d65690..03b74db19fa 100644
--- a/java/kotlin-extractor/src/main/kotlin/KotlinUsesExtractor.kt
+++ b/java/kotlin-extractor/src/main/kotlin/KotlinUsesExtractor.kt
@@ -5,7 +5,7 @@ import com.github.codeql.utils.versions.*
 import com.semmle.extractor.java.OdasaOutput
 import org.jetbrains.kotlin.backend.common.extensions.IrPluginContext
 import org.jetbrains.kotlin.backend.common.ir.*
-import org.jetbrains.kotlin.backend.jvm.ir.propertyIfAccessor
+import org.jetbrains.kotlin.backend.jvm.ir.*
 import org.jetbrains.kotlin.codegen.JvmCodegenUtil
 import org.jetbrains.kotlin.descriptors.*
 import org.jetbrains.kotlin.ir.ObsoleteDescriptorBasedAPI
@@ -24,6 +24,7 @@ import org.jetbrains.kotlin.load.kotlin.getJvmModuleNameForDeserializedDescripto
 import org.jetbrains.kotlin.name.FqName
 import org.jetbrains.kotlin.name.NameUtils
 import org.jetbrains.kotlin.name.SpecialNames
+import org.jetbrains.kotlin.resolve.descriptorUtil.propertyIfAccessor
 import org.jetbrains.kotlin.types.Variance
 import org.jetbrains.kotlin.util.OperatorNameConventions
 
@@ -84,7 +85,7 @@ open class KotlinUsesExtractor(
     }
 
     private fun extractFileClass(fqName: FqName): Label<out DbClassorinterface> {
-        val pkg = if (fqName.isRoot()) "" else fqName.parent().asString()
+        val pkg = if (fqName.codeQlIsRoot()) "" else fqName.parent().asString()
         val jvmName = fqName.shortName().asString()
         return extractFileClass(pkg, jvmName)
     }
@@ -779,7 +780,7 @@ open class KotlinUsesExtractor(
                 // array.length
                 val length = tw.getLabelFor<DbField>("@\"field;{$it};length\"")
                 val intTypeIds = useType(pluginContext.irBuiltIns.intType)
-                tw.writeFields(length, "length", intTypeIds.javaResult.id, it, length)
+                tw.writeFields(length, "length", intTypeIds.javaResult.id, it)
                 tw.writeFieldsKotlinType(length, intTypeIds.kotlinResult.id)
                 addModifiers(length, "public", "final")
 
@@ -906,7 +907,7 @@ open class KotlinUsesExtractor(
                 return arrayInfo.componentTypeResults
             }
             owner is IrClass -> {
-                val args = if (s.isRawType()) null else s.arguments
+                val args = if (s.codeQlIsRawType()) null else s.arguments
 
                 return useSimpleTypeClass(owner, args, s.isNullable())
             }
@@ -1232,9 +1233,10 @@ open class KotlinUsesExtractor(
     // false if it has `@JvmSuppressWildcards(false)`,
     // and null if the annotation is not present.
     @Suppress("UNCHECKED_CAST")
-    private fun getWildcardSuppressionDirective(t: IrAnnotationContainer) =
+    private fun getWildcardSuppressionDirective(t: IrAnnotationContainer): Boolean? =
         t.getAnnotation(jvmWildcardSuppressionAnnotation)?.let {
-            (it.getValueArgument(0) as? IrConst<Boolean>)?.value ?: true
+            @Suppress("USELESS_CAST") // `as? Boolean` is not needed for Kotlin < 2.1
+            (it.getValueArgument(0) as? CodeQLIrConst<Boolean>)?.value as? Boolean ?: true
         }
 
     private fun addJavaLoweringArgumentWildcards(
diff --git a/java/kotlin-extractor/src/main/kotlin/MetaAnnotationSupport.kt b/java/kotlin-extractor/src/main/kotlin/MetaAnnotationSupport.kt
index 2dc7382bf16..e591eed3eca 100644
--- a/java/kotlin-extractor/src/main/kotlin/MetaAnnotationSupport.kt
+++ b/java/kotlin-extractor/src/main/kotlin/MetaAnnotationSupport.kt
@@ -27,13 +27,7 @@ import org.jetbrains.kotlin.ir.expressions.IrClassReference
 import org.jetbrains.kotlin.ir.expressions.IrConstructorCall
 import org.jetbrains.kotlin.ir.expressions.IrGetEnumValue
 import org.jetbrains.kotlin.ir.expressions.IrVararg
-import org.jetbrains.kotlin.ir.expressions.impl.IrClassReferenceImpl
-import org.jetbrains.kotlin.ir.expressions.impl.IrConstructorCallImpl
-import org.jetbrains.kotlin.ir.expressions.impl.IrGetEnumValueImpl
-import org.jetbrains.kotlin.ir.expressions.impl.IrGetFieldImpl
-import org.jetbrains.kotlin.ir.expressions.impl.IrGetValueImpl
-import org.jetbrains.kotlin.ir.expressions.impl.IrReturnImpl
-import org.jetbrains.kotlin.ir.expressions.impl.IrVarargImpl
+import org.jetbrains.kotlin.ir.expressions.impl.*
 import org.jetbrains.kotlin.ir.symbols.IrClassSymbol
 import org.jetbrains.kotlin.ir.types.typeWith
 import org.jetbrains.kotlin.ir.util.constructedClass
diff --git a/java/kotlin-extractor/src/main/kotlin/utils/JvmNames.kt b/java/kotlin-extractor/src/main/kotlin/utils/JvmNames.kt
index b6b51fde543..ec7c17b39fc 100644
--- a/java/kotlin-extractor/src/main/kotlin/utils/JvmNames.kt
+++ b/java/kotlin-extractor/src/main/kotlin/utils/JvmNames.kt
@@ -1,12 +1,12 @@
 package com.github.codeql.utils
 
 import com.github.codeql.utils.versions.allOverriddenIncludingSelf
+import com.github.codeql.utils.versions.CodeQLIrConst
 import org.jetbrains.kotlin.builtins.StandardNames
 import org.jetbrains.kotlin.ir.declarations.IrAnnotationContainer
 import org.jetbrains.kotlin.ir.declarations.IrClass
 import org.jetbrains.kotlin.ir.declarations.IrFunction
 import org.jetbrains.kotlin.ir.declarations.IrSimpleFunction
-import org.jetbrains.kotlin.ir.expressions.IrConst
 import org.jetbrains.kotlin.ir.expressions.IrConstructorCall
 import org.jetbrains.kotlin.ir.types.IrSimpleType
 import org.jetbrains.kotlin.ir.util.fqNameWhenAvailable
@@ -82,7 +82,7 @@ fun getJvmName(container: IrAnnotationContainer): String? {
             if (owner is IrClass) {
                 val aPkg = owner.packageFqName?.asString()
                 val name = owner.name.asString()
-                if (aPkg == "kotlin.jvm" && name == "JvmName" && v is IrConst<*>) {
+                if (aPkg == "kotlin.jvm" && name == "JvmName" && v is CodeQLIrConst<*>) {
                     val value = v.value
                     if (value is String) {
                         return value
diff --git a/java/kotlin-extractor/src/main/kotlin/utils/Logger.kt b/java/kotlin-extractor/src/main/kotlin/utils/Logger.kt
index 1eda875be2f..dfbb5fdf8e2 100644
--- a/java/kotlin-extractor/src/main/kotlin/utils/Logger.kt
+++ b/java/kotlin-extractor/src/main/kotlin/utils/Logger.kt
@@ -244,6 +244,10 @@ open class LoggerBase(val logCounter: LogCounter) {
         }
     }
 
+    fun infoVerbosity(dtw: DiagnosticTrapWriter) {
+        info(dtw, "Kotlin extractor verbosity is " + verbosity.toString())
+    }
+
     fun warn(dtw: DiagnosticTrapWriter, msg: String, extraInfo: String?) {
         if (verbosity >= 2) {
             diagnostic(dtw, Severity.Warn, msg, extraInfo)
@@ -301,6 +305,10 @@ open class Logger(val loggerBase: LoggerBase, val dtw: DiagnosticTrapWriter) {
         loggerBase.info(dtw, msg)
     }
 
+    fun infoVerbosity() {
+        loggerBase.infoVerbosity(dtw)
+    }
+
     private fun warn(msg: String, extraInfo: String?) {
         loggerBase.warn(dtw, msg, extraInfo)
     }
diff --git a/java/kotlin-extractor/src/main/kotlin/utils/TypeSubstitution.kt b/java/kotlin-extractor/src/main/kotlin/utils/TypeSubstitution.kt
index 91cd5ec9f13..6f8d0d33f37 100644
--- a/java/kotlin-extractor/src/main/kotlin/utils/TypeSubstitution.kt
+++ b/java/kotlin-extractor/src/main/kotlin/utils/TypeSubstitution.kt
@@ -15,7 +15,7 @@ import org.jetbrains.kotlin.ir.declarations.IrTypeParametersContainer
 import org.jetbrains.kotlin.ir.declarations.impl.IrExternalPackageFragmentImpl
 import org.jetbrains.kotlin.ir.declarations.impl.IrFactoryImpl
 import org.jetbrains.kotlin.ir.expressions.IrConstructorCall
-import org.jetbrains.kotlin.ir.expressions.impl.IrConstructorCallImpl
+import org.jetbrains.kotlin.ir.expressions.impl.*
 import org.jetbrains.kotlin.ir.symbols.IrTypeParameterSymbol
 import org.jetbrains.kotlin.ir.symbols.impl.DescriptorlessExternalPackageFragmentSymbol
 import org.jetbrains.kotlin.ir.types.*
diff --git a/java/kotlin-extractor/src/main/kotlin/utils/versions/v_1_5_0/CodeQLIrConst.kt b/java/kotlin-extractor/src/main/kotlin/utils/versions/v_1_5_0/CodeQLIrConst.kt
new file mode 100644
index 00000000000..0f8f6bda71a
--- /dev/null
+++ b/java/kotlin-extractor/src/main/kotlin/utils/versions/v_1_5_0/CodeQLIrConst.kt
@@ -0,0 +1,5 @@
+package com.github.codeql.utils.versions
+
+import org.jetbrains.kotlin.ir.expressions.IrConst
+
+typealias CodeQLIrConst<T> = IrConst<T>
diff --git a/java/kotlin-extractor/src/main/kotlin/utils/versions/v_1_5_0/CodeQLIsRoot.kt b/java/kotlin-extractor/src/main/kotlin/utils/versions/v_1_5_0/CodeQLIsRoot.kt
new file mode 100644
index 00000000000..bf523ca8821
--- /dev/null
+++ b/java/kotlin-extractor/src/main/kotlin/utils/versions/v_1_5_0/CodeQLIsRoot.kt
@@ -0,0 +1,5 @@
+package com.github.codeql.utils.versions
+
+import org.jetbrains.kotlin.name.FqName
+
+fun FqName.codeQlIsRoot() = this.isRoot()
diff --git a/java/kotlin-extractor/src/main/kotlin/utils/versions/v_1_5_0/Types.kt b/java/kotlin-extractor/src/main/kotlin/utils/versions/v_1_5_0/Types.kt
index 630d649907c..61a580e2a27 100644
--- a/java/kotlin-extractor/src/main/kotlin/utils/versions/v_1_5_0/Types.kt
+++ b/java/kotlin-extractor/src/main/kotlin/utils/versions/v_1_5_0/Types.kt
@@ -3,4 +3,4 @@ package com.github.codeql.utils.versions
 import org.jetbrains.kotlin.backend.jvm.codegen.isRawType
 import org.jetbrains.kotlin.ir.types.IrSimpleType
 
-fun IrSimpleType.isRawType() = this.isRawType()
+fun IrSimpleType.codeQlIsRawType() = this.isRawType()
diff --git a/java/kotlin-extractor/src/main/kotlin/utils/versions/v_1_6_20/Types.kt b/java/kotlin-extractor/src/main/kotlin/utils/versions/v_1_6_20/Types.kt
index d44e4407400..7db5d520b29 100644
--- a/java/kotlin-extractor/src/main/kotlin/utils/versions/v_1_6_20/Types.kt
+++ b/java/kotlin-extractor/src/main/kotlin/utils/versions/v_1_6_20/Types.kt
@@ -3,4 +3,4 @@ package com.github.codeql.utils.versions
 import org.jetbrains.kotlin.backend.jvm.ir.isRawType
 import org.jetbrains.kotlin.ir.types.IrSimpleType
 
-fun IrSimpleType.isRawType() = this.isRawType()
+fun IrSimpleType.codeQlIsRawType() = this.isRawType()
diff --git a/java/kotlin-extractor/src/main/kotlin/utils/versions/v_2_1_0-Beta1/CodeQLIrConst.kt b/java/kotlin-extractor/src/main/kotlin/utils/versions/v_2_1_0-Beta1/CodeQLIrConst.kt
new file mode 100644
index 00000000000..60ff588cd97
--- /dev/null
+++ b/java/kotlin-extractor/src/main/kotlin/utils/versions/v_2_1_0-Beta1/CodeQLIrConst.kt
@@ -0,0 +1,5 @@
+package com.github.codeql.utils.versions
+
+import org.jetbrains.kotlin.ir.expressions.IrConst
+
+typealias CodeQLIrConst<T> = IrConst
diff --git a/java/kotlin-extractor/src/main/kotlin/utils/versions/v_2_1_0-Beta1/CodeQLIsRoot.kt b/java/kotlin-extractor/src/main/kotlin/utils/versions/v_2_1_0-Beta1/CodeQLIsRoot.kt
new file mode 100644
index 00000000000..e8eff805f21
--- /dev/null
+++ b/java/kotlin-extractor/src/main/kotlin/utils/versions/v_2_1_0-Beta1/CodeQLIsRoot.kt
@@ -0,0 +1,5 @@
+package com.github.codeql.utils.versions
+
+import org.jetbrains.kotlin.name.FqName
+
+fun FqName.codeQlIsRoot() = this.isRoot
diff --git a/java/kotlin-extractor/versions.bzl b/java/kotlin-extractor/versions.bzl
index e124d6e150a..aecb170b630 100644
--- a/java/kotlin-extractor/versions.bzl
+++ b/java/kotlin-extractor/versions.bzl
@@ -13,6 +13,7 @@ VERSIONS = [
     "1.9.20-Beta",
     "2.0.0-RC1",
     "2.0.20-Beta2",
+    "2.1.0-Beta1",
 ]
 
 def _version_to_tuple(v):
diff --git a/java/ql/automodel/src/CHANGELOG.md b/java/ql/automodel/src/CHANGELOG.md
index 0a51a608913..148791b5923 100644
--- a/java/ql/automodel/src/CHANGELOG.md
+++ b/java/ql/automodel/src/CHANGELOG.md
@@ -1,3 +1,15 @@
+## 1.0.11
+
+No user-facing changes.
+
+## 1.0.10
+
+No user-facing changes.
+
+## 1.0.9
+
+No user-facing changes.
+
 ## 1.0.8
 
 No user-facing changes.
diff --git a/java/ql/automodel/src/change-notes/released/1.0.10.md b/java/ql/automodel/src/change-notes/released/1.0.10.md
new file mode 100644
index 00000000000..b601d878453
--- /dev/null
+++ b/java/ql/automodel/src/change-notes/released/1.0.10.md
@@ -0,0 +1,3 @@
+## 1.0.10
+
+No user-facing changes.
diff --git a/java/ql/automodel/src/change-notes/released/1.0.11.md b/java/ql/automodel/src/change-notes/released/1.0.11.md
new file mode 100644
index 00000000000..245e0812108
--- /dev/null
+++ b/java/ql/automodel/src/change-notes/released/1.0.11.md
@@ -0,0 +1,3 @@
+## 1.0.11
+
+No user-facing changes.
diff --git a/java/ql/automodel/src/change-notes/released/1.0.9.md b/java/ql/automodel/src/change-notes/released/1.0.9.md
new file mode 100644
index 00000000000..ee073f7ec16
--- /dev/null
+++ b/java/ql/automodel/src/change-notes/released/1.0.9.md
@@ -0,0 +1,3 @@
+## 1.0.9
+
+No user-facing changes.
diff --git a/java/ql/automodel/src/codeql-pack.release.yml b/java/ql/automodel/src/codeql-pack.release.yml
index 5c55fbd52ed..56a2fb38872 100644
--- a/java/ql/automodel/src/codeql-pack.release.yml
+++ b/java/ql/automodel/src/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.0.8
+lastReleaseVersion: 1.0.11
diff --git a/java/ql/automodel/src/qlpack.yml b/java/ql/automodel/src/qlpack.yml
index 8e4863f23b8..4acf2219db3 100644
--- a/java/ql/automodel/src/qlpack.yml
+++ b/java/ql/automodel/src/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/java-automodel-queries
-version: 1.0.9-dev
+version: 1.0.12-dev
 groups:
     - java
     - automodel
diff --git a/java/ql/integration-tests/java/buildless-maven-executable-war/source_archive.expected b/java/ql/integration-tests/java/buildless-maven-executable-war/source_archive.expected
index c6f2f49cf7d..cdb0dca9421 100644
--- a/java/ql/integration-tests/java/buildless-maven-executable-war/source_archive.expected
+++ b/java/ql/integration-tests/java/buildless-maven-executable-war/source_archive.expected
@@ -5,3 +5,4 @@ src/main/resources/page.xml
 src/main/resources/struts.xml
 src/test/java/com/example/AppTest.java
 test-db/log/ext/javac.properties
+test-db/working/settings.xml
diff --git a/java/ql/integration-tests/java/buildless-maven-existing-settings-xml/buildless-fetches.expected b/java/ql/integration-tests/java/buildless-maven-existing-settings-xml/buildless-fetches.expected
new file mode 100644
index 00000000000..49120865e8d
--- /dev/null
+++ b/java/ql/integration-tests/java/buildless-maven-existing-settings-xml/buildless-fetches.expected
@@ -0,0 +1,26 @@
+https://repo.maven.apache.org/maven2/com/feiniaojin/naaf/naaf-graceful-response-example/1.0/naaf-graceful-response-example-1.0.jar
+https://repo.maven.apache.org/maven2/com/github/MoebiusSolutions/avro-registry-in-source/avro-registry-in-source-tests/1.8/avro-registry-in-source-tests-1.8.jar
+https://repo.maven.apache.org/maven2/com/github/MoebiusSolutions/avro-registry-in-source/example-project/1.5/example-project-1.5.jar
+https://repo.maven.apache.org/maven2/com/intuit/benten/benten-examples/0.1.5/benten-examples-0.1.5.jar
+https://repo.maven.apache.org/maven2/com/jakewharton/twirl/sample-runtime/1.2.0/sample-runtime-1.2.0.jar
+https://repo.maven.apache.org/maven2/com/mattunderscore/code/generation/specky/plugin-example/0.8.0/plugin-example-0.8.0.jar
+https://repo.maven.apache.org/maven2/com/microsoft/tang/tang-test-jarAB/0.9/tang-test-jarAB-0.9.jar
+https://repo.maven.apache.org/maven2/de/knutwalker/rx-redis-example_2.11/0.1.2/rx-redis-example_2.11-0.1.2.jar
+https://repo.maven.apache.org/maven2/de/knutwalker/rx-redis-java-example_2.11/0.1.2/rx-redis-java-example_2.11-0.1.2.jar
+https://repo.maven.apache.org/maven2/io/github/scrollsyou/example-spring-boot-starter/1.0.0/example-spring-boot-starter-1.0.0.jar
+https://repo.maven.apache.org/maven2/io/streamnative/com/example/maven-central-template/server/3.0.0/server-3.0.0.jar
+https://repo.maven.apache.org/maven2/junit/junit/4.11/junit-4.11.jar
+https://repo.maven.apache.org/maven2/no/nav/security/token-validation-ktor-demo/3.1.0/token-validation-ktor-demo-3.1.0.jar
+https://repo.maven.apache.org/maven2/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar
+https://repo.maven.apache.org/maven2/org/minijax/minijax-example-fileupload/0.5.10/minijax-example-fileupload-0.5.10.jar
+https://repo.maven.apache.org/maven2/org/minijax/minijax-example-inject/0.5.10/minijax-example-inject-0.5.10.jar
+https://repo.maven.apache.org/maven2/org/minijax/minijax-example-json/0.5.10/minijax-example-json-0.5.10.jar
+https://repo.maven.apache.org/maven2/org/minijax/minijax-example-mustache/0.5.10/minijax-example-mustache-0.5.10.jar
+https://repo.maven.apache.org/maven2/org/minijax/minijax-example-petclinic/0.5.10/minijax-example-petclinic-0.5.10.jar
+https://repo.maven.apache.org/maven2/org/minijax/minijax-example-security/0.5.10/minijax-example-security-0.5.10.jar
+https://repo.maven.apache.org/maven2/org/minijax/minijax-example-ssl/0.5.10/minijax-example-ssl-0.5.10.jar
+https://repo.maven.apache.org/maven2/org/minijax/minijax-example-todo-backend/0.5.10/minijax-example-todo-backend-0.5.10.jar
+https://repo.maven.apache.org/maven2/org/minijax/minijax-example-websocket/0.5.10/minijax-example-websocket-0.5.10.jar
+https://repo.maven.apache.org/maven2/org/scalamock/scalamock-examples_2.10/3.6.0/scalamock-examples_2.10-3.6.0.jar
+https://repo.maven.apache.org/maven2/org/somda/sdc/glue-examples/4.0.0/glue-examples-4.0.0.jar
+https://repo.maven.apache.org/maven2/us/fatehi/schemacrawler-examplecode/16.20.2/schemacrawler-examplecode-16.20.2.jar
diff --git a/java/ql/integration-tests/java/buildless-maven-existing-settings-xml/diagnostics.expected b/java/ql/integration-tests/java/buildless-maven-existing-settings-xml/diagnostics.expected
new file mode 100644
index 00000000000..f3c89bb842a
--- /dev/null
+++ b/java/ql/integration-tests/java/buildless-maven-existing-settings-xml/diagnostics.expected
@@ -0,0 +1,70 @@
+{
+  "markdownMessage": "Java analysis used build tool Maven to pick a JDK version and/or to recommend external dependencies.",
+  "severity": "unknown",
+  "source": {
+    "extractorName": "java",
+    "id": "java/autobuilder/buildless/using-build-tool-advice",
+    "name": "Java analysis used build tool Maven to pick a JDK version and/or to recommend external dependencies"
+  },
+  "visibility": {
+    "cliSummaryTable": true,
+    "statusPage": false,
+    "telemetry": true
+  }
+}
+{
+  "markdownMessage": "Java analysis used the system default JDK.",
+  "severity": "unknown",
+  "source": {
+    "extractorName": "java",
+    "id": "java/autobuilder/buildless/jdk-system-default",
+    "name": "Java analysis used the system default JDK"
+  },
+  "visibility": {
+    "cliSummaryTable": true,
+    "statusPage": false,
+    "telemetry": true
+  }
+}
+{
+  "markdownMessage": "Java analysis with build-mode 'none' completed.",
+  "severity": "unknown",
+  "source": {
+    "extractorName": "java",
+    "id": "java/autobuilder/buildless/complete",
+    "name": "Java analysis with build-mode 'none' completed"
+  },
+  "visibility": {
+    "cliSummaryTable": true,
+    "statusPage": false,
+    "telemetry": true
+  }
+}
+{
+  "markdownMessage": "Java was extracted with build-mode set to 'none'. This means that all Java source in the working directory will be scanned, with build tools such as Maven and Gradle only contributing information about external dependencies.",
+  "severity": "note",
+  "source": {
+    "extractorName": "java",
+    "id": "java/autobuilder/buildless/mode-active",
+    "name": "Java was extracted with build-mode set to 'none'"
+  },
+  "visibility": {
+    "cliSummaryTable": true,
+    "statusPage": true,
+    "telemetry": true
+  }
+}
+{
+  "markdownMessage": "Reading the dependency graph from build files provided 2 classpath entries",
+  "severity": "unknown",
+  "source": {
+    "extractorName": "java",
+    "id": "java/autobuilder/buildless/depgraph-provided-by-maven",
+    "name": "Java analysis extracted precise dependency graph information from tool Maven"
+  },
+  "visibility": {
+    "cliSummaryTable": true,
+    "statusPage": false,
+    "telemetry": true
+  }
+}
diff --git a/java/ql/integration-tests/java/buildless-maven-existing-settings-xml/home-dir-with-maven-settings/.m2/settings.xml b/java/ql/integration-tests/java/buildless-maven-existing-settings-xml/home-dir-with-maven-settings/.m2/settings.xml
new file mode 100644
index 00000000000..5200a15410e
--- /dev/null
+++ b/java/ql/integration-tests/java/buildless-maven-existing-settings-xml/home-dir-with-maven-settings/.m2/settings.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<settings>
+    <profiles>
+        <profile>
+            <id>preexisting-profile</id>
+            <pluginRepositories>
+                <pluginRepository>
+                    <id>preexisting-repository</id>
+                    <name>A pre-existing repository</name>
+                    <url>https://nonesuch.example</url>
+                </pluginRepository>
+            </pluginRepositories>
+        </profile>
+    </profiles>
+    <activeProfiles>
+        <activeProfile>preexisting-profile</activeProfile>
+    </activeProfiles>
+</settings>
diff --git a/java/ql/integration-tests/java/buildless-maven-existing-settings-xml/maven-fetches.expected b/java/ql/integration-tests/java/buildless-maven-existing-settings-xml/maven-fetches.expected
new file mode 100644
index 00000000000..e4bddddc3e5
--- /dev/null
+++ b/java/ql/integration-tests/java/buildless-maven-existing-settings-xml/maven-fetches.expected
@@ -0,0 +1,77 @@
+Downloaded from central: https://repo.maven.apache.org/maven2/junit/junit/4.11/junit-4.11.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/hamcrest/hamcrest-parent/1.3/hamcrest-parent-1.3.pom
+Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/com/fasterxml/jackson/core/jackson-annotations/2.14.1/jackson-annotations-2.14.1.jar
+Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/com/fasterxml/jackson/core/jackson-annotations/2.14.1/jackson-annotations-2.14.1.pom
+Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/com/fasterxml/jackson/core/jackson-core/2.14.1/jackson-core-2.14.1.jar
+Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/com/fasterxml/jackson/core/jackson-core/2.14.1/jackson-core-2.14.1.pom
+Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/com/fasterxml/jackson/core/jackson-databind/2.14.1/jackson-databind-2.14.1.jar
+Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/com/fasterxml/jackson/core/jackson-databind/2.14.1/jackson-databind-2.14.1.pom
+Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/com/fasterxml/jackson/jackson-base/2.14.1/jackson-base-2.14.1.pom
+Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/com/fasterxml/jackson/jackson-bom/2.14.1/jackson-bom-2.14.1.pom
+Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/com/fasterxml/jackson/jackson-parent/2.14/jackson-parent-2.14.pom
+Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/com/fasterxml/oss-parent/48/oss-parent-48.pom
+Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/com/github/ferstl/depgraph-maven-plugin/4.0.3/depgraph-maven-plugin-4.0.3.jar
+Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/com/github/ferstl/depgraph-maven-plugin/4.0.3/depgraph-maven-plugin-4.0.3.pom
+Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/com/google/code/findbugs/jsr305/3.0.2/jsr305-3.0.2.jar
+Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/com/google/code/findbugs/jsr305/3.0.2/jsr305-3.0.2.pom
+Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/com/google/errorprone/error_prone_annotations/2.11.0/error_prone_annotations-2.11.0.jar
+Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/com/google/errorprone/error_prone_annotations/2.11.0/error_prone_annotations-2.11.0.pom
+Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/com/google/errorprone/error_prone_parent/2.11.0/error_prone_parent-2.11.0.pom
+Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/com/google/guava/failureaccess/1.0.1/failureaccess-1.0.1.jar
+Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/com/google/guava/failureaccess/1.0.1/failureaccess-1.0.1.pom
+Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/com/google/guava/guava-parent/26.0-android/guava-parent-26.0-android.pom
+Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/com/google/guava/guava-parent/31.1-jre/guava-parent-31.1-jre.pom
+Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/com/google/guava/guava/31.1-jre/guava-31.1-jre.jar
+Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/com/google/guava/guava/31.1-jre/guava-31.1-jre.pom
+Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/com/google/guava/listenablefuture/9999.0-empty-to-avoid-conflict-with-guava/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar
+Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/com/google/guava/listenablefuture/9999.0-empty-to-avoid-conflict-with-guava/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.pom
+Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/com/google/j2objc/j2objc-annotations/1.3/j2objc-annotations-1.3.jar
+Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/com/google/j2objc/j2objc-annotations/1.3/j2objc-annotations-1.3.pom
+Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/javax/annotation/javax.annotation-api/1.2/javax.annotation-api-1.2.jar
+Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/javax/annotation/javax.annotation-api/1.2/javax.annotation-api-1.2.pom
+Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/net/java/jvnet-parent/3/jvnet-parent-3.pom
+Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/org/apache/apache/19/apache-19.pom
+Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/org/apache/apache/25/apache-25.pom
+Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/org/apache/apache/27/apache-27.pom
+Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/org/apache/commons/commons-lang3/3.8.1/commons-lang3-3.8.1.jar
+Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/org/apache/commons/commons-lang3/3.8.1/commons-lang3-3.8.1.pom
+Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/org/apache/commons/commons-parent/47/commons-parent-47.pom
+Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/org/apache/maven/maven-artifact/3.8.6/maven-artifact-3.8.6.jar
+Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/org/apache/maven/maven-artifact/3.8.6/maven-artifact-3.8.6.pom
+Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/org/apache/maven/maven-model/3.8.6/maven-model-3.8.6.jar
+Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/org/apache/maven/maven-model/3.8.6/maven-model-3.8.6.pom
+Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/org/apache/maven/maven-parent/35/maven-parent-35.pom
+Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/org/apache/maven/maven-parent/37/maven-parent-37.pom
+Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/org/apache/maven/maven-plugin-api/3.8.6/maven-plugin-api-3.8.6.jar
+Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/org/apache/maven/maven-plugin-api/3.8.6/maven-plugin-api-3.8.6.pom
+Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/org/apache/maven/maven/3.8.6/maven-3.8.6.pom
+Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/org/apache/maven/shared/maven-common-artifact-filters/3.3.2/maven-common-artifact-filters-3.3.2.jar
+Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/org/apache/maven/shared/maven-common-artifact-filters/3.3.2/maven-common-artifact-filters-3.3.2.pom
+Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/org/apache/maven/shared/maven-shared-components/37/maven-shared-components-37.pom
+Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/org/checkerframework/checker-qual/3.12.0/checker-qual-3.12.0.jar
+Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/org/checkerframework/checker-qual/3.12.0/checker-qual-3.12.0.pom
+Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/org/codehaus/plexus/plexus-classworlds/2.5.2/plexus-classworlds-2.5.2.pom
+Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/org/codehaus/plexus/plexus-classworlds/2.6.0/plexus-classworlds-2.6.0.jar
+Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/org/codehaus/plexus/plexus-classworlds/2.6.0/plexus-classworlds-2.6.0.pom
+Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/org/codehaus/plexus/plexus-component-annotations/1.5.5/plexus-component-annotations-1.5.5.jar
+Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/org/codehaus/plexus/plexus-component-annotations/1.5.5/plexus-component-annotations-1.5.5.pom
+Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/org/codehaus/plexus/plexus-containers/1.5.5/plexus-containers-1.5.5.pom
+Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/org/codehaus/plexus/plexus-utils/3.0.24/plexus-utils-3.0.24.pom
+Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/org/codehaus/plexus/plexus-utils/3.3.1/plexus-utils-3.3.1.jar
+Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/org/codehaus/plexus/plexus-utils/3.3.1/plexus-utils-3.3.1.pom
+Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/org/codehaus/plexus/plexus/2.0.7/plexus-2.0.7.pom
+Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/org/codehaus/plexus/plexus/3.3.1/plexus-3.3.1.pom
+Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/org/codehaus/plexus/plexus/4.0/plexus-4.0.pom
+Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/org/codehaus/plexus/plexus/5.1/plexus-5.1.pom
+Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/org/eclipse/sisu/org.eclipse.sisu.inject/0.3.5/org.eclipse.sisu.inject-0.3.5.jar
+Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/org/eclipse/sisu/org.eclipse.sisu.inject/0.3.5/org.eclipse.sisu.inject-0.3.5.pom
+Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/org/eclipse/sisu/org.eclipse.sisu.plexus/0.3.5/org.eclipse.sisu.plexus-0.3.5.jar
+Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/org/eclipse/sisu/org.eclipse.sisu.plexus/0.3.5/org.eclipse.sisu.plexus-0.3.5.pom
+Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/org/eclipse/sisu/sisu-inject/0.3.5/sisu-inject-0.3.5.pom
+Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/org/eclipse/sisu/sisu-plexus/0.3.5/sisu-plexus-0.3.5.pom
+Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/org/junit/junit-bom/5.9.1/junit-bom-5.9.1.pom
+Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/org/sonatype/forge/forge-parent/10/forge-parent-10.pom
+Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/org/sonatype/oss/oss-parent/7/oss-parent-7.pom
+Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/org/sonatype/oss/oss-parent/9/oss-parent-9.pom
+Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/org/sonatype/spice/spice-parent/17/spice-parent-17.pom
diff --git a/java/ql/integration-tests/java/buildless-maven-existing-settings-xml/pom.xml b/java/ql/integration-tests/java/buildless-maven-existing-settings-xml/pom.xml
new file mode 100644
index 00000000000..ec4aaf128c1
--- /dev/null
+++ b/java/ql/integration-tests/java/buildless-maven-existing-settings-xml/pom.xml
@@ -0,0 +1,114 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <groupId>com.example</groupId>
+  <artifactId>maven-sample</artifactId>
+  <version>1.0-SNAPSHOT</version>
+
+  <name>maven-sample</name>
+  <!-- FIXME change it to the project's website -->
+  <url>http://www.example.com</url>
+
+  <properties>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    <maven.compiler.source>1.7</maven.compiler.source>
+    <maven.compiler.target>1.7</maven.compiler.target>
+  </properties>
+
+  <dependencies>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.11</version>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <plugins>
+      <plugin>
+        <artifactId>exec-maven-plugin</artifactId>
+        <groupId>org.codehaus.mojo</groupId>
+        <version>1.1.1</version>
+        <executions>
+          <execution>
+            <id>check-maven-version</id>
+            <phase>package</phase>
+            <goals>
+              <goal>java</goal>
+            </goals>
+          </execution>
+        </executions>
+        <configuration>
+          <mainClass>com.example.App</mainClass>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>com.diffplug.spotless</groupId>
+        <artifactId>spotless-maven-plugin</artifactId>
+        <version>2.19.1</version>
+        <executions>
+          <execution>
+            <goals>
+              <goal>check</goal>
+            </goals>
+            <phase>compile</phase>
+          </execution>
+        </executions>
+        <configuration>
+          <java>
+            <licenseHeader>
+              <content>/* FAIL ME */</content>
+            </licenseHeader>
+          </java>
+        </configuration>
+      </plugin>
+    </plugins>
+    <pluginManagement>
+      <!-- lock down plugins versions to avoid using Maven defaults (may be moved to parent pom) -->
+      <plugins>
+        <!-- clean lifecycle, see https://maven.apache.org/ref/current/maven-core/lifecycles.html#clean_Lifecycle -->
+        <plugin>
+          <artifactId>maven-clean-plugin</artifactId>
+          <version>3.1.0</version>
+        </plugin>
+        <!-- default lifecycle, jar packaging: see https://maven.apache.org/ref/current/maven-core/default-bindings.html#Plugin_bindings_for_jar_packaging -->
+        <plugin>
+          <artifactId>maven-resources-plugin</artifactId>
+          <version>3.0.2</version>
+        </plugin>
+        <plugin>
+          <artifactId>maven-compiler-plugin</artifactId>
+          <version>3.8.0</version>
+        </plugin>
+        <plugin>
+          <artifactId>maven-surefire-plugin</artifactId>
+          <version>2.22.1</version>
+        </plugin>
+        <plugin>
+          <artifactId>maven-jar-plugin</artifactId>
+          <version>3.0.2</version>
+        </plugin>
+        <plugin>
+          <artifactId>maven-install-plugin</artifactId>
+          <version>2.5.2</version>
+        </plugin>
+        <plugin>
+          <artifactId>maven-deploy-plugin</artifactId>
+          <version>2.8.2</version>
+        </plugin>
+        <!-- site lifecycle, see https://maven.apache.org/ref/current/maven-core/lifecycles.html#site_Lifecycle -->
+        <plugin>
+          <artifactId>maven-site-plugin</artifactId>
+          <version>3.7.1</version>
+        </plugin>
+        <plugin>
+          <artifactId>maven-project-info-reports-plugin</artifactId>
+          <version>3.0.0</version>
+        </plugin>
+      </plugins>
+    </pluginManagement>
+  </build>
+</project>
\ No newline at end of file
diff --git a/java/ql/integration-tests/java/buildless-maven-existing-settings-xml/settings-xml.expected b/java/ql/integration-tests/java/buildless-maven-existing-settings-xml/settings-xml.expected
new file mode 100644
index 00000000000..96c3675dc5f
--- /dev/null
+++ b/java/ql/integration-tests/java/buildless-maven-existing-settings-xml/settings-xml.expected
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<settings>
+        
+    <profiles>
+                
+        <profile>
+                        
+            <id>preexisting-profile</id>
+                        
+            <pluginRepositories>
+                                
+                <pluginRepository>
+                                        
+                    <id>preexisting-repository</id>
+                                        
+                    <name>A pre-existing repository</name>
+                                        
+                    <url>https://nonesuch.example</url>
+                                    
+                </pluginRepository>
+                            
+            </pluginRepositories>
+                    
+        </profile>
+            
+        <profile>
+            <id>codeql-depgraph-plugin-repo</id>
+            <pluginRepositories>
+                <pluginRepository>
+                    <id>codeql-depgraph-plugin-repo</id>
+                    <name>CodeQL Dependency Graph Plugin Repository</name>
+                    <url>file://[dist-root]/java/tools/ferstl-depgraph-dependencies/</url>
+                </pluginRepository>
+            </pluginRepositories>
+        </profile>
+    </profiles>
+        
+    <activeProfiles>
+                
+        <activeProfile>preexisting-profile</activeProfile>
+            
+        <activeProfile>codeql-depgraph-plugin-repo</activeProfile>
+    </activeProfiles>
+    
+</settings>
diff --git a/java/ql/integration-tests/java/buildless-maven-existing-settings-xml/source_archive.expected b/java/ql/integration-tests/java/buildless-maven-existing-settings-xml/source_archive.expected
new file mode 100644
index 00000000000..ea42987308b
--- /dev/null
+++ b/java/ql/integration-tests/java/buildless-maven-existing-settings-xml/source_archive.expected
@@ -0,0 +1,9 @@
+home-dir-with-maven-settings/.m2/settings.xml
+pom.xml
+src/main/java/com/example/App.java
+src/main/resources/my-app.properties
+src/main/resources/page.xml
+src/main/resources/struts.xml
+src/test/java/com/example/AppTest.java
+test-db/log/ext/javac.properties
+test-db/working/settings.xml
diff --git a/java/ql/integration-tests/java/buildless-maven-existing-settings-xml/src/main/java/com/example/App.java b/java/ql/integration-tests/java/buildless-maven-existing-settings-xml/src/main/java/com/example/App.java
new file mode 100644
index 00000000000..c9eec918587
--- /dev/null
+++ b/java/ql/integration-tests/java/buildless-maven-existing-settings-xml/src/main/java/com/example/App.java
@@ -0,0 +1,30 @@
+package com.example;
+
+import java.util.regex.Pattern;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+
+/**
+ * Hello world!
+ *
+ */
+public class App 
+{
+    public static void main( String[] args )
+    {
+        System.out.println( "Hello World!" );
+        String expectedVersion = System.getenv("EXPECT_MAVEN");
+        Path mavenHome = Paths.get(System.getProperty("maven.home")).normalize();
+        String observedVersion = mavenHome.getFileName().toString();
+        if (expectedVersion != null && !expectedVersion.equals(observedVersion)) {
+                System.err.println("Wrong maven version, expected '" + expectedVersion + "' but got '" + observedVersion + "'" + mavenHome);
+                System.exit(1);
+        }
+        String commandMatcher = System.getenv("EXPECT_COMMAND_REGEX");
+        String command = System.getProperty("sun.java.command");
+        if (commandMatcher != null && !Pattern.matches(commandMatcher, command)) {
+                System.err.println("Wrong command line, '" + command + "' does not match '" + commandMatcher + "'");
+                System.exit(1);
+        }
+    }
+}
diff --git a/java/ql/integration-tests/java/buildless-maven-existing-settings-xml/src/main/resources/my-app.properties b/java/ql/integration-tests/java/buildless-maven-existing-settings-xml/src/main/resources/my-app.properties
new file mode 100644
index 00000000000..e566b49a29a
--- /dev/null
+++ b/java/ql/integration-tests/java/buildless-maven-existing-settings-xml/src/main/resources/my-app.properties
@@ -0,0 +1 @@
+version=1.0
diff --git a/java/ql/integration-tests/java/buildless-maven-existing-settings-xml/src/main/resources/page.xml b/java/ql/integration-tests/java/buildless-maven-existing-settings-xml/src/main/resources/page.xml
new file mode 100644
index 00000000000..2bab459cb03
--- /dev/null
+++ b/java/ql/integration-tests/java/buildless-maven-existing-settings-xml/src/main/resources/page.xml
@@ -0,0 +1,8 @@
+<html>
+<head>
+<title>A sample</title>
+</head>
+<body>
+<p>Hello world!</p>
+</body>
+</html>
diff --git a/java/ql/integration-tests/java/buildless-maven-existing-settings-xml/src/main/resources/struts.xml b/java/ql/integration-tests/java/buildless-maven-existing-settings-xml/src/main/resources/struts.xml
new file mode 100644
index 00000000000..73fc0c6b9cb
--- /dev/null
+++ b/java/ql/integration-tests/java/buildless-maven-existing-settings-xml/src/main/resources/struts.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<struts>
+This is a sample file
+</struts>
diff --git a/java/ql/integration-tests/java/buildless-maven-existing-settings-xml/src/test/java/com/example/AppTest.java b/java/ql/integration-tests/java/buildless-maven-existing-settings-xml/src/test/java/com/example/AppTest.java
new file mode 100644
index 00000000000..22a94ca6f01
--- /dev/null
+++ b/java/ql/integration-tests/java/buildless-maven-existing-settings-xml/src/test/java/com/example/AppTest.java
@@ -0,0 +1,20 @@
+package com.example;
+
+import static org.junit.Assert.assertTrue;
+
+import org.junit.Test;
+
+/**
+ * Unit test for simple App.
+ */
+public class AppTest 
+{
+    /**
+     * Rigorous Test :-)
+     */
+    @Test
+    public void shouldAnswerWithTrue()
+    {
+        assertTrue( true );
+    }
+}
diff --git a/java/ql/integration-tests/java/buildless-maven-existing-settings-xml/test.py b/java/ql/integration-tests/java/buildless-maven-existing-settings-xml/test.py
new file mode 100644
index 00000000000..fc10b066d0b
--- /dev/null
+++ b/java/ql/integration-tests/java/buildless-maven-existing-settings-xml/test.py
@@ -0,0 +1,9 @@
+import os
+import os.path
+
+def test(codeql, java):
+    codeql.database.create(build_mode = "none",
+        _env={
+            "_JAVA_OPTIONS": "-Duser.home=" + os.path.join(os.getcwd(), "home-dir-with-maven-settings")
+        }
+    )
diff --git a/java/ql/integration-tests/java/buildless-maven-multimodule/source_archive.expected b/java/ql/integration-tests/java/buildless-maven-multimodule/source_archive.expected
index 06978379cfb..ab5cf6e4ba1 100644
--- a/java/ql/integration-tests/java/buildless-maven-multimodule/source_archive.expected
+++ b/java/ql/integration-tests/java/buildless-maven-multimodule/source_archive.expected
@@ -12,3 +12,4 @@ submod2/src/main/resources/page.xml
 submod2/src/main/resources/struts.xml
 submod2/src/test/java/com/example/AppTest2.java
 test-db/log/ext/javac.properties
+test-db/working/settings.xml
diff --git a/java/ql/integration-tests/java/buildless-maven-timeout/diagnostics.expected b/java/ql/integration-tests/java/buildless-maven-timeout/diagnostics.expected
index 1d347c16acb..7a8f76b3eee 100644
--- a/java/ql/integration-tests/java/buildless-maven-timeout/diagnostics.expected
+++ b/java/ql/integration-tests/java/buildless-maven-timeout/diagnostics.expected
@@ -83,7 +83,7 @@
   }
 }
 {
-  "markdownMessage": "Running the Maven plugin `com.github.ferstl:depgraph-maven-plugin:4.0.2:graph` failed. This means precise dependency information will be unavailable, and so dependencies will be guessed based on Java package names. Consider investigating why this plugin fails to run.",
+  "markdownMessage": "Running the Maven plugin `com.github.ferstl:depgraph-maven-plugin:4.0.3:graph` failed. This means precise dependency information will be unavailable, and so dependencies will be guessed based on Java package names. Consider investigating why this plugin fails to run.",
   "severity": "note",
   "source": {
     "extractorName": "java",
diff --git a/java/ql/integration-tests/java/buildless-maven-timeout/source_archive.expected b/java/ql/integration-tests/java/buildless-maven-timeout/source_archive.expected
index f73dc023c39..77ca5e58c40 100644
--- a/java/ql/integration-tests/java/buildless-maven-timeout/source_archive.expected
+++ b/java/ql/integration-tests/java/buildless-maven-timeout/source_archive.expected
@@ -6,3 +6,4 @@ src/main/resources/page.xml
 src/main/resources/struts.xml
 src/test/java/com/example/AppTest.java
 test-db/log/ext/javac.properties
+test-db/working/settings.xml
diff --git a/java/ql/integration-tests/java/buildless-maven-tolerate-unavailable-dependency/diagnostics.expected b/java/ql/integration-tests/java/buildless-maven-tolerate-unavailable-dependency/diagnostics.expected
index 7cd6795d441..1d60d08fcf5 100644
--- a/java/ql/integration-tests/java/buildless-maven-tolerate-unavailable-dependency/diagnostics.expected
+++ b/java/ql/integration-tests/java/buildless-maven-tolerate-unavailable-dependency/diagnostics.expected
@@ -97,7 +97,7 @@
   }
 }
 {
-  "markdownMessage": "Running the Maven plugin `com.github.ferstl:depgraph-maven-plugin:4.0.2:graph` yielded an artifact transfer exception. This means some dependency information will be unavailable, and so some dependencies will be guessed based on Java package names. Consider investigating why this plugin encountered errors retrieving dependencies.",
+  "markdownMessage": "Running the Maven plugin `com.github.ferstl:depgraph-maven-plugin:4.0.3:graph` yielded an artifact transfer exception. This means some dependency information will be unavailable, and so some dependencies will be guessed based on Java package names. Consider investigating why this plugin encountered errors retrieving dependencies.",
   "severity": "note",
   "source": {
     "extractorName": "java",
diff --git a/java/ql/integration-tests/java/buildless-maven/maven-fetches.expected b/java/ql/integration-tests/java/buildless-maven/maven-fetches.expected
new file mode 100644
index 00000000000..e4bddddc3e5
--- /dev/null
+++ b/java/ql/integration-tests/java/buildless-maven/maven-fetches.expected
@@ -0,0 +1,77 @@
+Downloaded from central: https://repo.maven.apache.org/maven2/junit/junit/4.11/junit-4.11.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/hamcrest/hamcrest-parent/1.3/hamcrest-parent-1.3.pom
+Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/com/fasterxml/jackson/core/jackson-annotations/2.14.1/jackson-annotations-2.14.1.jar
+Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/com/fasterxml/jackson/core/jackson-annotations/2.14.1/jackson-annotations-2.14.1.pom
+Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/com/fasterxml/jackson/core/jackson-core/2.14.1/jackson-core-2.14.1.jar
+Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/com/fasterxml/jackson/core/jackson-core/2.14.1/jackson-core-2.14.1.pom
+Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/com/fasterxml/jackson/core/jackson-databind/2.14.1/jackson-databind-2.14.1.jar
+Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/com/fasterxml/jackson/core/jackson-databind/2.14.1/jackson-databind-2.14.1.pom
+Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/com/fasterxml/jackson/jackson-base/2.14.1/jackson-base-2.14.1.pom
+Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/com/fasterxml/jackson/jackson-bom/2.14.1/jackson-bom-2.14.1.pom
+Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/com/fasterxml/jackson/jackson-parent/2.14/jackson-parent-2.14.pom
+Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/com/fasterxml/oss-parent/48/oss-parent-48.pom
+Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/com/github/ferstl/depgraph-maven-plugin/4.0.3/depgraph-maven-plugin-4.0.3.jar
+Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/com/github/ferstl/depgraph-maven-plugin/4.0.3/depgraph-maven-plugin-4.0.3.pom
+Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/com/google/code/findbugs/jsr305/3.0.2/jsr305-3.0.2.jar
+Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/com/google/code/findbugs/jsr305/3.0.2/jsr305-3.0.2.pom
+Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/com/google/errorprone/error_prone_annotations/2.11.0/error_prone_annotations-2.11.0.jar
+Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/com/google/errorprone/error_prone_annotations/2.11.0/error_prone_annotations-2.11.0.pom
+Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/com/google/errorprone/error_prone_parent/2.11.0/error_prone_parent-2.11.0.pom
+Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/com/google/guava/failureaccess/1.0.1/failureaccess-1.0.1.jar
+Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/com/google/guava/failureaccess/1.0.1/failureaccess-1.0.1.pom
+Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/com/google/guava/guava-parent/26.0-android/guava-parent-26.0-android.pom
+Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/com/google/guava/guava-parent/31.1-jre/guava-parent-31.1-jre.pom
+Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/com/google/guava/guava/31.1-jre/guava-31.1-jre.jar
+Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/com/google/guava/guava/31.1-jre/guava-31.1-jre.pom
+Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/com/google/guava/listenablefuture/9999.0-empty-to-avoid-conflict-with-guava/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar
+Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/com/google/guava/listenablefuture/9999.0-empty-to-avoid-conflict-with-guava/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.pom
+Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/com/google/j2objc/j2objc-annotations/1.3/j2objc-annotations-1.3.jar
+Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/com/google/j2objc/j2objc-annotations/1.3/j2objc-annotations-1.3.pom
+Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/javax/annotation/javax.annotation-api/1.2/javax.annotation-api-1.2.jar
+Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/javax/annotation/javax.annotation-api/1.2/javax.annotation-api-1.2.pom
+Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/net/java/jvnet-parent/3/jvnet-parent-3.pom
+Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/org/apache/apache/19/apache-19.pom
+Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/org/apache/apache/25/apache-25.pom
+Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/org/apache/apache/27/apache-27.pom
+Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/org/apache/commons/commons-lang3/3.8.1/commons-lang3-3.8.1.jar
+Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/org/apache/commons/commons-lang3/3.8.1/commons-lang3-3.8.1.pom
+Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/org/apache/commons/commons-parent/47/commons-parent-47.pom
+Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/org/apache/maven/maven-artifact/3.8.6/maven-artifact-3.8.6.jar
+Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/org/apache/maven/maven-artifact/3.8.6/maven-artifact-3.8.6.pom
+Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/org/apache/maven/maven-model/3.8.6/maven-model-3.8.6.jar
+Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/org/apache/maven/maven-model/3.8.6/maven-model-3.8.6.pom
+Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/org/apache/maven/maven-parent/35/maven-parent-35.pom
+Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/org/apache/maven/maven-parent/37/maven-parent-37.pom
+Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/org/apache/maven/maven-plugin-api/3.8.6/maven-plugin-api-3.8.6.jar
+Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/org/apache/maven/maven-plugin-api/3.8.6/maven-plugin-api-3.8.6.pom
+Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/org/apache/maven/maven/3.8.6/maven-3.8.6.pom
+Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/org/apache/maven/shared/maven-common-artifact-filters/3.3.2/maven-common-artifact-filters-3.3.2.jar
+Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/org/apache/maven/shared/maven-common-artifact-filters/3.3.2/maven-common-artifact-filters-3.3.2.pom
+Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/org/apache/maven/shared/maven-shared-components/37/maven-shared-components-37.pom
+Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/org/checkerframework/checker-qual/3.12.0/checker-qual-3.12.0.jar
+Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/org/checkerframework/checker-qual/3.12.0/checker-qual-3.12.0.pom
+Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/org/codehaus/plexus/plexus-classworlds/2.5.2/plexus-classworlds-2.5.2.pom
+Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/org/codehaus/plexus/plexus-classworlds/2.6.0/plexus-classworlds-2.6.0.jar
+Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/org/codehaus/plexus/plexus-classworlds/2.6.0/plexus-classworlds-2.6.0.pom
+Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/org/codehaus/plexus/plexus-component-annotations/1.5.5/plexus-component-annotations-1.5.5.jar
+Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/org/codehaus/plexus/plexus-component-annotations/1.5.5/plexus-component-annotations-1.5.5.pom
+Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/org/codehaus/plexus/plexus-containers/1.5.5/plexus-containers-1.5.5.pom
+Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/org/codehaus/plexus/plexus-utils/3.0.24/plexus-utils-3.0.24.pom
+Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/org/codehaus/plexus/plexus-utils/3.3.1/plexus-utils-3.3.1.jar
+Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/org/codehaus/plexus/plexus-utils/3.3.1/plexus-utils-3.3.1.pom
+Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/org/codehaus/plexus/plexus/2.0.7/plexus-2.0.7.pom
+Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/org/codehaus/plexus/plexus/3.3.1/plexus-3.3.1.pom
+Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/org/codehaus/plexus/plexus/4.0/plexus-4.0.pom
+Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/org/codehaus/plexus/plexus/5.1/plexus-5.1.pom
+Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/org/eclipse/sisu/org.eclipse.sisu.inject/0.3.5/org.eclipse.sisu.inject-0.3.5.jar
+Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/org/eclipse/sisu/org.eclipse.sisu.inject/0.3.5/org.eclipse.sisu.inject-0.3.5.pom
+Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/org/eclipse/sisu/org.eclipse.sisu.plexus/0.3.5/org.eclipse.sisu.plexus-0.3.5.jar
+Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/org/eclipse/sisu/org.eclipse.sisu.plexus/0.3.5/org.eclipse.sisu.plexus-0.3.5.pom
+Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/org/eclipse/sisu/sisu-inject/0.3.5/sisu-inject-0.3.5.pom
+Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/org/eclipse/sisu/sisu-plexus/0.3.5/sisu-plexus-0.3.5.pom
+Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/org/junit/junit-bom/5.9.1/junit-bom-5.9.1.pom
+Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/org/sonatype/forge/forge-parent/10/forge-parent-10.pom
+Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/org/sonatype/oss/oss-parent/7/oss-parent-7.pom
+Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/org/sonatype/oss/oss-parent/9/oss-parent-9.pom
+Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/org/sonatype/spice/spice-parent/17/spice-parent-17.pom
diff --git a/java/ql/integration-tests/java/buildless-maven/settings-xml.expected b/java/ql/integration-tests/java/buildless-maven/settings-xml.expected
new file mode 100644
index 00000000000..348be0fbb96
--- /dev/null
+++ b/java/ql/integration-tests/java/buildless-maven/settings-xml.expected
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<settings>
+    <profiles>
+        <profile>
+            <id>codeql-depgraph-plugin-repo</id>
+            <pluginRepositories>
+                <pluginRepository>
+                    <id>codeql-depgraph-plugin-repo</id>
+                    <name>CodeQL Dependency Graph Plugin Repository</name>
+                    <url>file://[dist-root]/java/tools/ferstl-depgraph-dependencies/</url>
+                </pluginRepository>
+            </pluginRepositories>
+        </profile>
+    </profiles>
+    <activeProfiles>
+        <activeProfile>codeql-depgraph-plugin-repo</activeProfile>
+    </activeProfiles>
+</settings>
diff --git a/java/ql/integration-tests/java/buildless-maven/source_archive.expected b/java/ql/integration-tests/java/buildless-maven/source_archive.expected
index c6f2f49cf7d..cdb0dca9421 100644
--- a/java/ql/integration-tests/java/buildless-maven/source_archive.expected
+++ b/java/ql/integration-tests/java/buildless-maven/source_archive.expected
@@ -5,3 +5,4 @@ src/main/resources/page.xml
 src/main/resources/struts.xml
 src/test/java/com/example/AppTest.java
 test-db/log/ext/javac.properties
+test-db/working/settings.xml
diff --git a/java/ql/integration-tests/java/buildless-maven/test.py b/java/ql/integration-tests/java/buildless-maven/test.py
index a92ac46584c..958eddca2c7 100644
--- a/java/ql/integration-tests/java/buildless-maven/test.py
+++ b/java/ql/integration-tests/java/buildless-maven/test.py
@@ -1,7 +1,9 @@
+import os
+import os.path
+
 def test(codeql, java):
-    codeql.database.create(
+    codeql.database.create(build_mode = "none",
         _env={
-            "CODEQL_EXTRACTOR_JAVA_OPTION_BUILDLESS": "true",
-            "CODEQL_EXTRACTOR_JAVA_OPTION_BUILDLESS_CLASSPATH_FROM_BUILD_FILES": "true",
+            "_JAVA_OPTIONS": "-Duser.home=" + os.path.join(os.getcwd(), "empty-home")
         }
     )
diff --git a/java/ql/integration-tests/java/buildless-sibling-projects/source_archive.expected b/java/ql/integration-tests/java/buildless-sibling-projects/source_archive.expected
index d0e6787e268..790a13864ee 100644
--- a/java/ql/integration-tests/java/buildless-sibling-projects/source_archive.expected
+++ b/java/ql/integration-tests/java/buildless-sibling-projects/source_archive.expected
@@ -27,3 +27,4 @@ maven-project-2/src/main/resources/page.xml
 maven-project-2/src/main/resources/struts.xml
 maven-project-2/src/test/java/com/example/AppTest4.java
 test-db/log/ext/javac.properties
+test-db/working/settings.xml
diff --git a/java/ql/integration-tests/java/java-web-jsp/pom.xml b/java/ql/integration-tests/java/java-web-jsp/pom.xml
index e9f33c05907..5f72b64a8b0 100644
--- a/java/ql/integration-tests/java/java-web-jsp/pom.xml
+++ b/java/ql/integration-tests/java/java-web-jsp/pom.xml
@@ -54,30 +54,6 @@
             <type>pom</type>
         </dependency>
 
-
-        <!-- Spring Web MVC (Include Tag Lib) -->
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-webmvc</artifactId>
-            <version>${spring.version}</version>
-            <type>jar</type>
-        </dependency>
-
-
-        <!-- OWASP Java Encoder -->
-
-        <dependency>
-            <groupId>org.owasp.encoder</groupId>
-            <artifactId>encoder</artifactId>
-            <version>1.2</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.owasp.encoder</groupId>
-            <artifactId>encoder-jsp</artifactId>
-            <version>1.2</version>
-        </dependency>
-
     </dependencies>
 
     <profiles>
diff --git a/java/ql/integration-tests/java/java-web-jsp/src/main/webapp/WEB-INF/secret.jsp b/java/ql/integration-tests/java/java-web-jsp/src/main/webapp/WEB-INF/secret.jsp
deleted file mode 100644
index 9f66d62135b..00000000000
--- a/java/ql/integration-tests/java/java-web-jsp/src/main/webapp/WEB-INF/secret.jsp
+++ /dev/null
@@ -1 +0,0 @@
-This page should be private.
\ No newline at end of file
diff --git a/java/ql/integration-tests/java/java-web-jsp/src/main/webapp/include/jsp_include_2_safe.jsp b/java/ql/integration-tests/java/java-web-jsp/src/main/webapp/include/jsp_include_2_safe.jsp
deleted file mode 100644
index 87e1475c58e..00000000000
--- a/java/ql/integration-tests/java/java-web-jsp/src/main/webapp/include/jsp_include_2_safe.jsp
+++ /dev/null
@@ -1,6 +0,0 @@
-<i>Psst <a href="?secret_param=../WEB-INF/secret.jsp">click me</a> or <a href="?secret_param=../WEB-INF/web.xml">click me</a>!</i>
-<br/><br/>
-
-
-<%@include file="${param.secret_param}.jsp"%> <!-- Safe will be evaluate as literal -->
-<%-- This line doesn't compile in weblogic --%>
\ No newline at end of file
diff --git a/java/ql/integration-tests/java/java-web-jsp/src/main/webapp/include/jsp_include_3.jsp b/java/ql/integration-tests/java/java-web-jsp/src/main/webapp/include/jsp_include_3.jsp
deleted file mode 100644
index a804db07f7a..00000000000
--- a/java/ql/integration-tests/java/java-web-jsp/src/main/webapp/include/jsp_include_3.jsp
+++ /dev/null
@@ -1,9 +0,0 @@
-<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
-
-<i>Psst <a href="?secret_param=../WEB-INF/secret.jsp">click me</a> or <a href="?secret_param=../WEB-INF/web.xml">click me</a>!</i>
-<br/><br/>
-
-
-<c:if test="${param.secret_param != null}">
-<c:import url="${param.secret_param}" />
-</c:if>
\ No newline at end of file
diff --git a/java/ql/integration-tests/java/java-web-jsp/src/main/webapp/index.jsp b/java/ql/integration-tests/java/java-web-jsp/src/main/webapp/index.jsp
deleted file mode 100644
index dda2310a037..00000000000
--- a/java/ql/integration-tests/java/java-web-jsp/src/main/webapp/index.jsp
+++ /dev/null
@@ -1,45 +0,0 @@
-<html>
-<head>
-  <title>Embedded Jetty: JSP Examples</title>
-</head>
-<body>
-  <h1>Vulnerable JSP pages</h1>
-
-  <h2>XSS</h2>
-  <ul>
-  <li><a href="/xss/xss0.jsp">XSS 0</a></li>
-  <li><a href="/xss/xss1.jsp">XSS 1</a></li>
-  <li><a href="/xss/xss2.jsp">XSS 2</a></li>
-  <li><a href="/xss/xss3.jsp">XSS 3</a></li>
-  <li><a href="/xss/xss4.jsp">XSS 4</a></li>
-  <li><a href="/xss/xss5.jsp">XSS 5</a></li>
-  </ul>
-
-  <h2>XML parsing</h2>
-  <ul>
-  <li><a href="/xml/xml1.jsp?xml=<stock><symbol>TKM%3C%2Fsymbol>%3C%2Fstock>">XML 1</a></li>
-  <li><a href="/xml/xml2.jsp">XML 2</a></li>
-  </ul>
-
-  <h2>XSLT</h2>
-  <ul>
-  <li><a href='/xsl/xsl1.jsp?xml=<stock><symbol>TKM%3C%2Fsymbol>%3C%2Fstock>&xslt=%3Cxsl%3Astylesheet%20version%3D"1.0"%0A%20xmlns%3Axsl%3D"http%3A%2F%2Fwww.w3.org%2F1999%2FXSL%2FTransform"%20%20%20%20%20%20%20%20%20%0A%20xmlns%3Art%3D"http%3A%2F%2Fxml.apache.org%2Fxalan%2Fjava%2Fjava.lang.Runtime"%0A%20exclude-result-prefixes%3D"date">%0A%20%20%20%20%20%20%20%20%3Cxsl%3Aoutput%20method%3D"text"%2F>%0A%20%20%20%20%20%20%20%20%3Cxsl%3Atemplate%20match%3D"%2F">%0A%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%3Cxsl%3Atext>Quote%20requested%20for%3A%20%3C%2Fxsl%3Atext>%3Cblink>%3Cxsl%3Avalue-of%20select%3D"stock%2Fsymbol"%2F>%3C%2Fblink>%0A%20%20%20%20%20%20%20%20%3C%2Fxsl%3Atemplate>%0A%3C%2Fxsl%3Astylesheet>'>XSL 1</a></li>
-  <li><a href='/xsl/xsl2.jsp?xslt=%3Cxsl%3Astylesheet%20version%3D"1.0"%0A%20xmlns%3Axsl%3D"http%3A%2F%2Fwww.w3.org%2F1999%2FXSL%2FTransform"%20%20%20%20%20%20%20%20%20%0A%20xmlns%3Art%3D"http%3A%2F%2Fxml.apache.org%2Fxalan%2Fjava%2Fjava.lang.Runtime"%0A%20exclude-result-prefixes%3D"date">%0A%20%20%20%20%20%20%20%20%3Cxsl%3Aoutput%20method%3D"text"%2F>%0A%20%20%20%20%20%20%20%20%3Cxsl%3Atemplate%20match%3D"%2F">%0A%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%3Cxsl%3Atext>Quote%20requested%20for%3A%20%3C%2Fxsl%3Atext>%3Cblink>%3Cxsl%3Avalue-of%20select%3D"stock%2Fsymbol"%2F>%3C%2Fblink>%0A%20%20%20%20%20%20%20%20%3C%2Fxsl%3Atemplate>%0A%3C%2Fxsl%3Astylesheet>'>XSL 2</a></li>
-  <li><a href='/xsl/xsl3.jsp?xml=<stock><symbol>TKM%3C%2Fsymbol>%3C%2Fstock>'>XSL 3</a></li>
-  <li><a href='/xsl/xsl4.jsp'>XSL 4</a></li>
-  </ul>
-
-  <h2>Various JSP samples </h2>
-  <ul>
-    <li><a href="test/dump.jsp">JSP 1.2 embedded java</a></li>
-    <li><a href="test/bean1.jsp">JSP 1.2 Bean demo</a></li>
-    <li><a href="test/tag.jsp">JSP 1.2 BodyTag demo</a></li>
-    <li><a href="test/tag2.jsp">JSP 2.0 SimpleTag demo</a></li>
-    <li><a href="test/tagfile.jsp">JSP 2.0 Tag File demo</a></li>
-    <li><a href="test/expr.jsp?A=1">JSP 2.0 Tag Expression</a></li>
-    <li><a href="test/jstl.jsp">JSTL Expression</a></li>
-    <li><a href="test/foo/">Mapping to &lt;jsp-file&gt;</a></li>
-    <li><a href="date/">Servlet Forwarding to JSP demo</a></li>
-  </ul>
-</body>
-</html>
\ No newline at end of file
diff --git a/java/ql/integration-tests/java/java-web-jsp/src/main/webapp/jstl/jstl_escape_2.jsp b/java/ql/integration-tests/java/java-web-jsp/src/main/webapp/jstl/jstl_escape_2.jsp
deleted file mode 100644
index 8d859f2cc94..00000000000
--- a/java/ql/integration-tests/java/java-web-jsp/src/main/webapp/jstl/jstl_escape_2.jsp
+++ /dev/null
@@ -1,3 +0,0 @@
-<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
-
-<c:out value="${param.test_param}" escapeXml="true"/>
\ No newline at end of file
diff --git a/java/ql/integration-tests/java/java-web-jsp/src/main/webapp/jstl/jstl_escape_3.jsp b/java/ql/integration-tests/java/java-web-jsp/src/main/webapp/jstl/jstl_escape_3.jsp
deleted file mode 100644
index fde15587eba..00000000000
--- a/java/ql/integration-tests/java/java-web-jsp/src/main/webapp/jstl/jstl_escape_3.jsp
+++ /dev/null
@@ -1,3 +0,0 @@
-<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
-
-<c:out value="${param.test_param}" escapeXml="false"/>
\ No newline at end of file
diff --git a/java/ql/integration-tests/java/java-web-jsp/src/main/webapp/spring/spring_eval_1.jsp b/java/ql/integration-tests/java/java-web-jsp/src/main/webapp/spring/spring_eval_1.jsp
deleted file mode 100644
index a38662dcedf..00000000000
--- a/java/ql/integration-tests/java/java-web-jsp/src/main/webapp/spring/spring_eval_1.jsp
+++ /dev/null
@@ -1,20 +0,0 @@
-<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %>
-<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
-
-
-<form method="get" action="">
-<input type="text" name="expression" value="1+1"> <input type="submit" value="test">
-</form>
-
-
-<c:set var="expression" value="${param.expression}" scope="request"  />
-Evaluating ("&#36;{expression}") : <c:out value="${expression}" /><br/>
-<br/>
-
-<c:if test="${expression != null}">
-Output:
-<pre style="background-color:#CCC">
-<spring:eval expression="${expression}" var="results" />
-<c:out value="${results}" />
-</pre>
-</c:if>
\ No newline at end of file
diff --git a/java/ql/integration-tests/java/java-web-jsp/src/main/webapp/spring/spring_eval_2.jsp b/java/ql/integration-tests/java/java-web-jsp/src/main/webapp/spring/spring_eval_2.jsp
deleted file mode 100644
index 3ee0946bed9..00000000000
--- a/java/ql/integration-tests/java/java-web-jsp/src/main/webapp/spring/spring_eval_2.jsp
+++ /dev/null
@@ -1,20 +0,0 @@
-<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %>
-<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
-
-
-Change the language:
-<form method="get" action="">
-<input type="text" name="lang" value="1+1"> <input type="submit" value="test">
-</form>
-
-Evaluating ("&#36;{param.lang}") : <c:out value="${param.lang}" /><br/>
-<br/>
-
-
-<c:if test="${param.lang != null}">
-Output:
-<pre style="background-color:#CCC">
-<spring:eval expression="${param.lang}" var="results" />
-<c:out value="${results}" />
-</pre>
-</c:if>
\ No newline at end of file
diff --git a/java/ql/integration-tests/java/java-web-jsp/src/main/webapp/spring/spring_eval_3.jsp b/java/ql/integration-tests/java/java-web-jsp/src/main/webapp/spring/spring_eval_3.jsp
deleted file mode 100644
index 25c8910c682..00000000000
--- a/java/ql/integration-tests/java/java-web-jsp/src/main/webapp/spring/spring_eval_3.jsp
+++ /dev/null
@@ -1,20 +0,0 @@
-<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %>
-<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
-
-
-Value is YOLO ?:
-<form method="get" action="">
-<input type="text" name="value" value="1+1"> <input type="submit" value="test">
-</form>
-
-Evaluating ("'&#36;{param.value}'=='YOLO'") : <c:out value="${param.value}" /><br/>
-<br/>
-
-
-<c:if test="${param.value != null}">
-Output:
-<pre style="background-color:#CCC">
-<spring:eval expression="'${param.value}'=='YOLO'" var="results" />
-<c:out value="${results}" />
-</pre>
-</c:if>
\ No newline at end of file
diff --git a/java/ql/integration-tests/java/java-web-jsp/src/main/webapp/spring/spring_eval_4_safe.jsp b/java/ql/integration-tests/java/java-web-jsp/src/main/webapp/spring/spring_eval_4_safe.jsp
deleted file mode 100644
index 108883c0707..00000000000
--- a/java/ql/integration-tests/java/java-web-jsp/src/main/webapp/spring/spring_eval_4_safe.jsp
+++ /dev/null
@@ -1,20 +0,0 @@
-<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %>
-<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
-
-
-Set some value :
-<form method="get" action="">
-<input type="text" name="value" value="1+1"> <input type="submit" value="test">
-</form>
-
-Evaluating ("param.value") : <c:out value="${param.value}" /><br/>
-<br/>
-
-
-<c:if test="${param.value != null}">
-Output:
-<pre style="background-color:#CCC">
-<spring:eval expression="param.value" var="results" />
-<c:out value="${results}" />
-</pre>
-</c:if>
\ No newline at end of file
diff --git a/java/ql/integration-tests/java/java-web-jsp/src/main/webapp/test/bean1.jsp b/java/ql/integration-tests/java/java-web-jsp/src/main/webapp/test/bean1.jsp
deleted file mode 100644
index 0c15da2ca4e..00000000000
--- a/java/ql/integration-tests/java/java-web-jsp/src/main/webapp/test/bean1.jsp
+++ /dev/null
@@ -1,15 +0,0 @@
-<html>
-<%@ page session="true"%>
-<body>
-<jsp:useBean id='counter' scope='session' class='com.acme.Counter' type="com.acme.Counter" />
-
-<h1>JSP1.2 Beans: 1</h1>
-
-Counter accessed <jsp:getProperty name="counter" property="count"/> times.<br/>
-Counter last accessed by <jsp:getProperty name="counter" property="last"/><br/>
-<jsp:setProperty name="counter" property="last" value="<%= request.getRequestURI()%>"/>
-
-<a href="bean2.jsp">Goto bean2.jsp</a>
-
-</body>
-</html>
diff --git a/java/ql/integration-tests/java/java-web-jsp/src/main/webapp/test/bean2.jsp b/java/ql/integration-tests/java/java-web-jsp/src/main/webapp/test/bean2.jsp
deleted file mode 100644
index 624dc2e59d4..00000000000
--- a/java/ql/integration-tests/java/java-web-jsp/src/main/webapp/test/bean2.jsp
+++ /dev/null
@@ -1,15 +0,0 @@
-<html>
-<%@ page session="true"%>
-<body>
-<jsp:useBean id='counter' scope='session' class='com.acme.Counter' type="com.acme.Counter" />
-
-<h1>JSP1.2 Beans: 2</h1>
-
-Counter accessed <jsp:getProperty name="counter" property="count"/> times.<br/>
-Counter last accessed by <jsp:getProperty name="counter" property="last"/><br/>
-<jsp:setProperty name="counter" property="last" value="<%= request.getRequestURI()%>"/>
-
-<a href="bean1.jsp">Goto bean1.jsp</a>
-
-</body>
-</html>
diff --git a/java/ql/integration-tests/java/java-web-jsp/src/main/webapp/test/dump.jsp b/java/ql/integration-tests/java/java-web-jsp/src/main/webapp/test/dump.jsp
deleted file mode 100644
index fb73b0b0002..00000000000
--- a/java/ql/integration-tests/java/java-web-jsp/src/main/webapp/test/dump.jsp
+++ /dev/null
@@ -1,23 +0,0 @@
-<html><head>
-<%@ page import="java.util.Enumeration" %>
-</head><body>
-<h1>JSP Dump</h1>
-
-<table border="1">
-<tr><th>Request URI:</th><td><%= request.getRequestURI() %></td></tr>
-<tr><th>ServletPath:</th><td><%= request.getServletPath() %></td></tr>
-<tr><th>PathInfo:</th><td><%= request.getPathInfo() %></td></tr>
-
-<%
-   Enumeration e =request.getParameterNames();
-   while(e.hasMoreElements())
-   {
-       String name = (String)e.nextElement();
-%>
-<tr>
-  <th>getParameter("<%= name %>")</th>
-  <td><%= request.getParameter(name) %></td></tr>
-<% } %>
-
-</table>
-</body></html>
diff --git a/java/ql/integration-tests/java/java-web-jsp/src/main/webapp/test/expr.jsp b/java/ql/integration-tests/java/java-web-jsp/src/main/webapp/test/expr.jsp
deleted file mode 100644
index e0b25e20203..00000000000
--- a/java/ql/integration-tests/java/java-web-jsp/src/main/webapp/test/expr.jsp
+++ /dev/null
@@ -1,23 +0,0 @@
-<html>
-<h1>JSP2.0 Expressions</h1>
-
-<table border="1">
-  <tr><th>Expression</th><th>Result</th></tr>      
-  <tr>
-    <td>\${param["A"]}</td>
-    <td>${param["A"]}&nbsp;</td>
-  </tr><tr>
-    <td>\${header["host"]}</td>
-    <td>${header["host"]}</td>
-  </tr><tr>
-    <td>\${header["user-agent"]}</td>
-    <td>${header["user-agent"]}</td>
-  </tr><tr>
-    <td>\${1+1}</td>
-    <td>${1+1}</td>
-  </tr><tr>
-    <td>\${param["A"] * 2}</td>
-    <td>${param["A"] * 2}&nbsp;</td>
-  </tr>
-</table>
-</html>
diff --git a/java/ql/integration-tests/java/java-web-jsp/src/main/webapp/test/foo/foo.jsp b/java/ql/integration-tests/java/java-web-jsp/src/main/webapp/test/foo/foo.jsp
deleted file mode 100644
index 7ec8955932d..00000000000
--- a/java/ql/integration-tests/java/java-web-jsp/src/main/webapp/test/foo/foo.jsp
+++ /dev/null
@@ -1,15 +0,0 @@
-<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> 
-<html>
-  <head>
-  </head>
-  <body>
-    <h1>FOO Example</h1>
-    <hr>
-    <p>A trivial FOO example
-    <hr>
-    <c:forEach var="i" begin="1" end="10" step="1">
-      <c:out value="${i}" />
-      <br />
-    </c:forEach>
-  </body>
-</html>
diff --git a/java/ql/integration-tests/java/java-web-jsp/src/main/webapp/test/jstl.jsp b/java/ql/integration-tests/java/java-web-jsp/src/main/webapp/test/jstl.jsp
deleted file mode 100644
index 9fa7b57e96c..00000000000
--- a/java/ql/integration-tests/java/java-web-jsp/src/main/webapp/test/jstl.jsp
+++ /dev/null
@@ -1,15 +0,0 @@
-<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> 
-<html>
-  <head>
-  </head>
-  <body>
-    <h1>JSTL Example</h1>
-    <hr>
-    <p>A trivial jstl example
-    <hr>
-    <c:forEach var="i" begin="1" end="10" step="1">
-      <c:out value="${i}" />
-      <br />
-    </c:forEach>
-  </body>
-</html>
diff --git a/java/ql/integration-tests/java/java-web-jsp/src/main/webapp/test/tag.jsp b/java/ql/integration-tests/java/java-web-jsp/src/main/webapp/test/tag.jsp
deleted file mode 100644
index 069d8c67b17..00000000000
--- a/java/ql/integration-tests/java/java-web-jsp/src/main/webapp/test/tag.jsp
+++ /dev/null
@@ -1,16 +0,0 @@
-<html>
-<body>
-
-<%@ taglib uri="http://www.acme.com/taglib" prefix="acme" %>
-
-<small>&lt;acme:date tz="GMT"&gt;EEE, dd/MMM/yyyy HH:mm:ss ZZZ&lt;/acme:date&gt;
-==&gt;</small>
-<acme:date tz="GMT">EEE, dd/MMM/yyyy HH:mm:ss ZZZ</acme:date>
-<br/>
-<small>&lt;acme:date tz="EST"&gt;EEE, dd-MMM-yyyy HH:mm:ss ZZZ&lt;/acme:date&gt;
-==&gt;</small>
-<acme:date tz="EST">EEE, dd-MMM-yyyy HH:mm:ss ZZZ</acme:date>
-<br/>
-
-</body>
-</html>
diff --git a/java/ql/integration-tests/java/java-web-jsp/src/main/webapp/test/tag2.jsp b/java/ql/integration-tests/java/java-web-jsp/src/main/webapp/test/tag2.jsp
deleted file mode 100644
index 8071927562a..00000000000
--- a/java/ql/integration-tests/java/java-web-jsp/src/main/webapp/test/tag2.jsp
+++ /dev/null
@@ -1,19 +0,0 @@
-<html>
-<body>
-
-<%@ taglib uri="http://www.acme.com/taglib2" prefix="acme" %>
-
-<acme:date2 format="long">
-  On ${day} of ${month} in the year ${year}
-</acme:date2>
-
-<br/>
-
-<acme:date2 format="short">
-  ${day} - ${month} - ${year}
-</acme:date2>
-
-<br/>
-
-</body>
-</html>
diff --git a/java/ql/integration-tests/java/java-web-jsp/src/main/webapp/test/tagfile.jsp b/java/ql/integration-tests/java/java-web-jsp/src/main/webapp/test/tagfile.jsp
deleted file mode 100644
index 67299f0229c..00000000000
--- a/java/ql/integration-tests/java/java-web-jsp/src/main/webapp/test/tagfile.jsp
+++ /dev/null
@@ -1,37 +0,0 @@
-<%@ taglib prefix="acme" tagdir="/WEB-INF/tags" %>
-<html>
-  <head>
-  </head>
-  <body>
-    <h1>JSP 2.0 Tag File Example</h1>
-    <hr>
-    <p>Panel tag created from JSP fragment file in WEB-INF/tags
-    <hr>
-    <table border="0">
-      <tr valign="top">
-        <td>
-          <acme:panel color="#ff8080" bgcolor="#ffc0c0" title="Panel 1">
-            First panel.<br/>
-          </acme:panel>
-        </td>
-        <td>
-          <acme:panel color="#80ff80" bgcolor="#c0ffc0" title="Panel 2">
-            Second panel.<br/>
-            Second panel.<br/>
-            Second panel.<br/>
-            Second panel.<br/>
-          </acme:panel>
-        </td>
-        <td>
-          <acme:panel color="#8080ff" bgcolor="#c0c0ff" title="Panel 3">
-            Third panel.<br/>
-            <acme:panel color="#ff80ff" bgcolor="#ffc0ff" title="Inner">
-              A panel in a panel.
-            </acme:panel>
-            Third panel.<br/>
-          </acme:panel>
-        </td>
-      </tr>
-    </table>
-  </body>
-</html>
diff --git a/java/ql/integration-tests/java/java-web-jsp/src/main/webapp/various.jsp b/java/ql/integration-tests/java/java-web-jsp/src/main/webapp/various.jsp
deleted file mode 100644
index a9822453427..00000000000
--- a/java/ql/integration-tests/java/java-web-jsp/src/main/webapp/various.jsp
+++ /dev/null
@@ -1,21 +0,0 @@
-<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
-<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %>
-
-JSTL
-
-<c:out value="${param.test_param1}"/>
-
-<c:out value="${param.test_param2}" escapeXml="true"/>
-
-<c:out value="${param.test_param3}" escapeXml="false"/>
-
-JSP include
-
-<%@include file="index.jsp"%>
-
-<c:import url="${param.secret_param}" />
-
-Spring eval
-
-<spring:eval expression="${param.lang}" var="results" />
-<c:out value="${results}" />
\ No newline at end of file
diff --git a/java/ql/integration-tests/java/java-web-jsp/src/main/webapp/xml/xml1.jsp b/java/ql/integration-tests/java/java-web-jsp/src/main/webapp/xml/xml1.jsp
deleted file mode 100644
index ae6c9dbbc1a..00000000000
--- a/java/ql/integration-tests/java/java-web-jsp/src/main/webapp/xml/xml1.jsp
+++ /dev/null
@@ -1,3 +0,0 @@
-<%@ taglib prefix="x" uri="http://java.sun.com/jsp/jstl/xml" %>
-<x:parse var="doc" xml="${param.xml}" />
-You requested a quote for: <x:out select="$doc/stock/symbol" />
\ No newline at end of file
diff --git a/java/ql/integration-tests/java/java-web-jsp/src/main/webapp/xml/xml2.jsp b/java/ql/integration-tests/java/java-web-jsp/src/main/webapp/xml/xml2.jsp
deleted file mode 100644
index 7dd49631a82..00000000000
--- a/java/ql/integration-tests/java/java-web-jsp/src/main/webapp/xml/xml2.jsp
+++ /dev/null
@@ -1,3 +0,0 @@
-<%@ taglib prefix="x" uri="http://java.sun.com/jsp/jstl/xml" %>
-<x:parse var="doc" xml="<stock><symbol>TKM</symbol></stock>" />
-You requested a quote for: <x:out select="$doc/stock/symbol" />
\ No newline at end of file
diff --git a/java/ql/integration-tests/java/java-web-jsp/src/main/webapp/xsl/xsl1.jsp b/java/ql/integration-tests/java/java-web-jsp/src/main/webapp/xsl/xsl1.jsp
deleted file mode 100644
index 0a9a411120f..00000000000
--- a/java/ql/integration-tests/java/java-web-jsp/src/main/webapp/xsl/xsl1.jsp
+++ /dev/null
@@ -1,2 +0,0 @@
-<%@ taglib prefix="x" uri="http://java.sun.com/jsp/jstl/xml" %>
-<x:transform xml="${param.xml}" xslt="${param.xslt}" />
diff --git a/java/ql/integration-tests/java/java-web-jsp/src/main/webapp/xsl/xsl2.jsp b/java/ql/integration-tests/java/java-web-jsp/src/main/webapp/xsl/xsl2.jsp
deleted file mode 100644
index 782b038587d..00000000000
--- a/java/ql/integration-tests/java/java-web-jsp/src/main/webapp/xsl/xsl2.jsp
+++ /dev/null
@@ -1,2 +0,0 @@
-<%@ taglib prefix="x" uri="http://java.sun.com/jsp/jstl/xml" %>
-<x:transform xml="<stock><symbol>TKM</symbol></stock>" xslt="${param.xslt}" />
diff --git a/java/ql/integration-tests/java/java-web-jsp/src/main/webapp/xsl/xsl3.jsp b/java/ql/integration-tests/java/java-web-jsp/src/main/webapp/xsl/xsl3.jsp
deleted file mode 100644
index 0814455288e..00000000000
--- a/java/ql/integration-tests/java/java-web-jsp/src/main/webapp/xsl/xsl3.jsp
+++ /dev/null
@@ -1,2 +0,0 @@
-<%@ taglib prefix="x" uri="http://java.sun.com/jsp/jstl/xml" %>
-<x:transform xml="${param.xml}" xslt='<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" exclude-result-prefixes="date"></xsl:stylesheet>' />
diff --git a/java/ql/integration-tests/java/java-web-jsp/src/main/webapp/xsl/xsl4.jsp b/java/ql/integration-tests/java/java-web-jsp/src/main/webapp/xsl/xsl4.jsp
deleted file mode 100644
index 3cc111d4809..00000000000
--- a/java/ql/integration-tests/java/java-web-jsp/src/main/webapp/xsl/xsl4.jsp
+++ /dev/null
@@ -1,2 +0,0 @@
-<%@ taglib prefix="x" uri="http://java.sun.com/jsp/jstl/xml" %>
-<x:transform xml="<static>SAFE</static>" xslt='<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" exclude-result-prefixes="date"></xsl:stylesheet>' />
\ No newline at end of file
diff --git a/java/ql/integration-tests/java/java-web-jsp/src/main/webapp/xss/xss0.jsp b/java/ql/integration-tests/java/java-web-jsp/src/main/webapp/xss/xss0.jsp
deleted file mode 100644
index cd4546d4396..00000000000
--- a/java/ql/integration-tests/java/java-web-jsp/src/main/webapp/xss/xss0.jsp
+++ /dev/null
@@ -1,6 +0,0 @@
-<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
-
-<p>
-Client message:<br/>
-<c:out value="${param.test}" escapeXml="false"/>
-</p>
\ No newline at end of file
diff --git a/java/ql/integration-tests/java/java-web-jsp/src/main/webapp/xss/xss1.jsp b/java/ql/integration-tests/java/java-web-jsp/src/main/webapp/xss/xss1.jsp
deleted file mode 100644
index 558bcd62749..00000000000
--- a/java/ql/integration-tests/java/java-web-jsp/src/main/webapp/xss/xss1.jsp
+++ /dev/null
@@ -1,4 +0,0 @@
-<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
-<script>
-    var test = ${param.test};
-</script>
\ No newline at end of file
diff --git a/java/ql/integration-tests/java/java-web-jsp/src/main/webapp/xss/xss2.jsp b/java/ql/integration-tests/java/java-web-jsp/src/main/webapp/xss/xss2.jsp
deleted file mode 100644
index 99c205fb280..00000000000
--- a/java/ql/integration-tests/java/java-web-jsp/src/main/webapp/xss/xss2.jsp
+++ /dev/null
@@ -1,4 +0,0 @@
-
-Contact form:<br/>
-
-<textarea>${param.message}</textarea>
\ No newline at end of file
diff --git a/java/ql/integration-tests/java/java-web-jsp/src/main/webapp/xss/xss3.jsp b/java/ql/integration-tests/java/java-web-jsp/src/main/webapp/xss/xss3.jsp
deleted file mode 100644
index 9dd9dd3f3f7..00000000000
--- a/java/ql/integration-tests/java/java-web-jsp/src/main/webapp/xss/xss3.jsp
+++ /dev/null
@@ -1,3 +0,0 @@
-<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
-
-Hello <c:out value="${param.test}"/>!
\ No newline at end of file
diff --git a/java/ql/integration-tests/java/java-web-jsp/src/main/webapp/xss/xss4.jsp b/java/ql/integration-tests/java/java-web-jsp/src/main/webapp/xss/xss4.jsp
deleted file mode 100644
index 91179dc1df8..00000000000
--- a/java/ql/integration-tests/java/java-web-jsp/src/main/webapp/xss/xss4.jsp
+++ /dev/null
@@ -1,7 +0,0 @@
-<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
-<script>
-    function hello(param1,param2) {
-        console.info(param1+" "+param2);
-    }
-    var test = hello('<c:out value="${param.test1}"/>','<c:out value="${param.test2}"/>');
-</script>
\ No newline at end of file
diff --git a/java/ql/integration-tests/java/java-web-jsp/src/main/webapp/xss/xss5.jsp b/java/ql/integration-tests/java/java-web-jsp/src/main/webapp/xss/xss5.jsp
deleted file mode 100644
index cc96ed91d20..00000000000
--- a/java/ql/integration-tests/java/java-web-jsp/src/main/webapp/xss/xss5.jsp
+++ /dev/null
@@ -1,11 +0,0 @@
-<%@taglib prefix="e" uri="https://www.owasp.org/index.php/OWASP_Java_Encoder_Project" %>
-
-
-<h1>${e:forHtml(param.test1)}</h1>
-
-<script>
-    function hello(param1,param2) {
-        console.info(param1+" "+param2);
-    }
-    var test = hello('${e:forJavaScript(param.test1)}','${e:forJavaScript(param.test2)}');
-</script>
diff --git a/java/ql/integration-tests/java/java-web-jsp/test.expected b/java/ql/integration-tests/java/java-web-jsp/test.expected
index dd923089166..490e552943e 100644
--- a/java/ql/integration-tests/java/java-web-jsp/test.expected
+++ b/java/ql/integration-tests/java/java-web-jsp/test.expected
@@ -7,43 +7,10 @@
 | src/main/java/org/eclipse/jetty/demo/LoggingUtil.java:0:0:0:0 | LoggingUtil |
 | src/main/java/org/eclipse/jetty/demo/Main.java:0:0:0:0 | Main |
 | src/main/java/org/eclipse/jetty/demo/SystemOutHandler.java:0:0:0:0 | SystemOutHandler |
-| target/classes/jsp/WEB_002dINF/secret_jsp.java:0:0:0:0 | secret_jsp |
 | target/classes/jsp/include/$_007bparam_secret_005fparam_007d_jsp.java:0:0:0:0 | $_007bparam_secret_005fparam_007d_jsp |
 | target/classes/jsp/include/jsp_005finclude_005f1_jsp.java:0:0:0:0 | jsp_005finclude_005f1_jsp |
-| target/classes/jsp/include/jsp_005finclude_005f2_005fsafe_jsp.java:0:0:0:0 | jsp_005finclude_005f2_005fsafe_jsp |
-| target/classes/jsp/include/jsp_005finclude_005f3_jsp.java:0:0:0:0 | jsp_005finclude_005f3_jsp |
-| target/classes/jsp/index_jsp.java:0:0:0:0 | index_jsp |
 | target/classes/jsp/jstl/jstl_005fescape_005f1_jsp.java:0:0:0:0 | jstl_005fescape_005f1_jsp |
-| target/classes/jsp/jstl/jstl_005fescape_005f2_jsp.java:0:0:0:0 | jstl_005fescape_005f2_jsp |
-| target/classes/jsp/jstl/jstl_005fescape_005f3_jsp.java:0:0:0:0 | jstl_005fescape_005f3_jsp |
 | target/classes/jsp/random_jsp.java:0:0:0:0 | random_jsp |
-| target/classes/jsp/spring/spring_005feval_005f1_jsp.java:0:0:0:0 | spring_005feval_005f1_jsp |
-| target/classes/jsp/spring/spring_005feval_005f2_jsp.java:0:0:0:0 | spring_005feval_005f2_jsp |
-| target/classes/jsp/spring/spring_005feval_005f3_jsp.java:0:0:0:0 | spring_005feval_005f3_jsp |
-| target/classes/jsp/spring/spring_005feval_005f4_005fsafe_jsp.java:0:0:0:0 | spring_005feval_005f4_005fsafe_jsp |
-| target/classes/jsp/test/bean1_jsp.java:0:0:0:0 | bean1_jsp |
-| target/classes/jsp/test/bean2_jsp.java:0:0:0:0 | bean2_jsp |
-| target/classes/jsp/test/dump_jsp.java:0:0:0:0 | dump_jsp |
-| target/classes/jsp/test/expr_jsp.java:0:0:0:0 | expr_jsp |
-| target/classes/jsp/test/foo/foo_jsp.java:0:0:0:0 | foo_jsp |
-| target/classes/jsp/test/jstl_jsp.java:0:0:0:0 | jstl_jsp |
-| target/classes/jsp/test/tag2_jsp.java:0:0:0:0 | tag2_jsp |
-| target/classes/jsp/test/tag_jsp.java:0:0:0:0 | tag_jsp |
-| target/classes/jsp/test/tagfile_jsp.java:0:0:0:0 | tagfile_jsp |
-| target/classes/jsp/various_jsp.java:0:0:0:0 | various_jsp |
-| target/classes/jsp/xml/xml1_jsp.java:0:0:0:0 | xml1_jsp |
-| target/classes/jsp/xml/xml2_jsp.java:0:0:0:0 | xml2_jsp |
-| target/classes/jsp/xsl/xsl1_jsp.java:0:0:0:0 | xsl1_jsp |
-| target/classes/jsp/xsl/xsl2_jsp.java:0:0:0:0 | xsl2_jsp |
-| target/classes/jsp/xsl/xsl3_jsp.java:0:0:0:0 | xsl3_jsp |
-| target/classes/jsp/xsl/xsl4_jsp.java:0:0:0:0 | xsl4_jsp |
-| target/classes/jsp/xss/xss0_jsp.java:0:0:0:0 | xss0_jsp |
-| target/classes/jsp/xss/xss1_jsp.java:0:0:0:0 | xss1_jsp |
-| target/classes/jsp/xss/xss2_jsp.java:0:0:0:0 | xss2_jsp |
-| target/classes/jsp/xss/xss3_jsp.java:0:0:0:0 | xss3_jsp |
-| target/classes/jsp/xss/xss4_jsp.java:0:0:0:0 | xss4_jsp |
-| target/classes/jsp/xss/xss5_jsp.java:0:0:0:0 | xss5_jsp |
-| target/classes/org/apache/jsp/tag/web/panel_tag.java:0:0:0:0 | panel_tag |
 xmlFiles
 | pom.xml:0:0:0:0 | pom.xml |
 | spotbugs-security-exclude.xml:0:0:0:0 | spotbugs-security-exclude.xml |
diff --git a/java/ql/integration-tests/kotlin/all-platforms/diagnostics/kotlin-version-too-new/diagnostics.expected b/java/ql/integration-tests/kotlin/all-platforms/diagnostics/kotlin-version-too-new/diagnostics.expected
index 4f7b421d600..401eaa6ee9d 100644
--- a/java/ql/integration-tests/kotlin/all-platforms/diagnostics/kotlin-version-too-new/diagnostics.expected
+++ b/java/ql/integration-tests/kotlin/all-platforms/diagnostics/kotlin-version-too-new/diagnostics.expected
@@ -1,5 +1,5 @@
 {
-  "markdownMessage": "The Kotlin version installed (`999.999.999`) is too recent for this version of CodeQL. Install a version lower than 2.0.30.",
+  "markdownMessage": "The Kotlin version installed (`999.999.999`) is too recent for this version of CodeQL. Install a version lower than 2.1.10.",
   "severity": "error",
   "source": {
     "extractorName": "java",
diff --git a/java/ql/integration-tests/kotlin/all-platforms/logs/logs.expected b/java/ql/integration-tests/kotlin/all-platforms/logs/logs.expected
index 5fc4366688e..b7f2d0a0b37 100644
--- a/java/ql/integration-tests/kotlin/all-platforms/logs/logs.expected
+++ b/java/ql/integration-tests/kotlin/all-platforms/logs/logs.expected
@@ -1,5 +1,6 @@
 Log file 1
 {"origin": "CodeQL Kotlin extractor", "kind": "INFO", "message": "Extraction started"}
+{"origin": "CodeQL Kotlin extractor", "kind": "INFO", "message": "Kotlin extractor verbosity is 3"}
 {"origin": "CodeQL Kotlin extractor", "kind": "INFO", "message": "Extraction for invocation TRAP file <FILENAME>"}
 {"origin": "CodeQL Kotlin extractor", "kind": "INFO", "message": "Kotlin version <VERSION>"}
 {"origin": "CodeQL Kotlin extractor", "kind": "INFO", "message": "Extracting file test.kt"}
diff --git a/java/ql/lib/CHANGELOG.md b/java/ql/lib/CHANGELOG.md
index 41804317176..cddb86232c4 100644
--- a/java/ql/lib/CHANGELOG.md
+++ b/java/ql/lib/CHANGELOG.md
@@ -1,3 +1,31 @@
+## 4.2.0
+
+### Major Analysis Improvements
+
+* Java: The generated JDK 17 models have been updated.
+
+### Minor Analysis Improvements
+
+* Java `build-mode=none` extraction now packages the Maven plugin used to examine project dependencies. This means that dependency identification is more likely to succeed, and therefore analysis quality may rise, in scenarios where Maven Central is not reachable.
+
+## 4.1.1
+
+No user-facing changes.
+
+## 4.1.0
+
+### Deprecated APIs
+
+* The `Field.getSourceDeclaration()` predicate has been deprecated. The result was always the original field, so calls to it can simply be removed.
+* The `Field.isSourceDeclaration()` predicate has been deprecated. It always holds.
+* The `RefType.nestedName()` predicate has been deprecated, and `RefType.getNestedName()` added to replace it.
+* The class `ThreatModelFlowSource` has been renamed to `ActiveThreatModelSource` to more clearly reflect it only contains the currently active threat model sources. `ThreatModelFlowSource` has been marked as deprecated.
+
+### New Features
+
+* The Java extractor and QL libraries now support Java 23.
+* Kotlin versions up to 2.1.0\ *x* are now supported.
+
 ## 4.0.0
 
 ### Breaking Changes
@@ -13,7 +41,7 @@
 
 ### Major Analysis Improvements
 
-* When a method exists as source code, we will no longer use a models-as-data (MaD) model of that method. This primarily affects query results when the analysis includes generated models for the source code being analysed.
+* A generated (Models as Data) summary model is no longer used, if there exists a source code alternative. This primarily affects the analysis, when the analysis includes generated models for the source code being analysed.
 
 ## 3.0.2
 
diff --git a/java/ql/lib/change-notes/2024-09-16-nestedName.md b/java/ql/lib/change-notes/2024-09-16-nestedName.md
deleted file mode 100644
index 26e384e99da..00000000000
--- a/java/ql/lib/change-notes/2024-09-16-nestedName.md
+++ /dev/null
@@ -1,4 +0,0 @@
----
-category: deprecated
----
-* The `RefType.nestedName()` predicate has been deprecated, and `RefType.getNestedName()` added to replace it.
diff --git a/java/ql/lib/change-notes/2024-11-14-unreachable-basic-block-in-constant-switch-statement.md b/java/ql/lib/change-notes/2024-11-14-unreachable-basic-block-in-constant-switch-statement.md
new file mode 100644
index 00000000000..50df55a4c1a
--- /dev/null
+++ b/java/ql/lib/change-notes/2024-11-14-unreachable-basic-block-in-constant-switch-statement.md
@@ -0,0 +1,4 @@
+---
+category: minorAnalysis
+---
+* In a switch statement with a constant switch expression, all non-matching cases were being marked as unreachable, including those that can be reached by falling through from the matching case. This has now been fixed.
diff --git a/java/ql/lib/change-notes/released/4.1.0.md b/java/ql/lib/change-notes/released/4.1.0.md
new file mode 100644
index 00000000000..579567e1edd
--- /dev/null
+++ b/java/ql/lib/change-notes/released/4.1.0.md
@@ -0,0 +1,13 @@
+## 4.1.0
+
+### Deprecated APIs
+
+* The `Field.getSourceDeclaration()` predicate has been deprecated. The result was always the original field, so calls to it can simply be removed.
+* The `Field.isSourceDeclaration()` predicate has been deprecated. It always holds.
+* The `RefType.nestedName()` predicate has been deprecated, and `RefType.getNestedName()` added to replace it.
+* The class `ThreatModelFlowSource` has been renamed to `ActiveThreatModelSource` to more clearly reflect it only contains the currently active threat model sources. `ThreatModelFlowSource` has been marked as deprecated.
+
+### New Features
+
+* The Java extractor and QL libraries now support Java 23.
+* Kotlin versions up to 2.1.0\ *x* are now supported.
diff --git a/java/ql/lib/change-notes/released/4.1.1.md b/java/ql/lib/change-notes/released/4.1.1.md
new file mode 100644
index 00000000000..23583cbad73
--- /dev/null
+++ b/java/ql/lib/change-notes/released/4.1.1.md
@@ -0,0 +1,3 @@
+## 4.1.1
+
+No user-facing changes.
diff --git a/java/ql/lib/change-notes/released/4.2.0.md b/java/ql/lib/change-notes/released/4.2.0.md
new file mode 100644
index 00000000000..3d07a20e46c
--- /dev/null
+++ b/java/ql/lib/change-notes/released/4.2.0.md
@@ -0,0 +1,9 @@
+## 4.2.0
+
+### Major Analysis Improvements
+
+* Java: The generated JDK 17 models have been updated.
+
+### Minor Analysis Improvements
+
+* Java `build-mode=none` extraction now packages the Maven plugin used to examine project dependencies. This means that dependency identification is more likely to succeed, and therefore analysis quality may rise, in scenarios where Maven Central is not reachable.
diff --git a/java/ql/lib/codeql-pack.release.yml b/java/ql/lib/codeql-pack.release.yml
index 49fe3eef697..9fc6933b429 100644
--- a/java/ql/lib/codeql-pack.release.yml
+++ b/java/ql/lib/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 4.0.0
+lastReleaseVersion: 4.2.0
diff --git a/java/ql/lib/config/semmlecode.dbscheme b/java/ql/lib/config/semmlecode.dbscheme
index 376ce7dad79..1fd1afa7862 100644
--- a/java/ql/lib/config/semmlecode.dbscheme
+++ b/java/ql/lib/config/semmlecode.dbscheme
@@ -392,8 +392,7 @@ fields(
   unique int id: @field,
   string nodeName: string ref,
   int typeid: @type ref,
-  int parentid: @reftype ref,
-  int sourceid: @field ref
+  int parentid: @reftype ref
 );
 
 fieldsKotlinType(
@@ -517,11 +516,6 @@ isRaw(
   int memberid: @member ref
 );
 
-erasure(
-  unique int memberid: @member ref,
-  int erasureid: @member ref
-);
-
 #keyset[classid] #keyset[parent]
 isAnonymClass(
   int classid: @classorinterface ref,
diff --git a/java/ql/lib/config/semmlecode.dbscheme.stats b/java/ql/lib/config/semmlecode.dbscheme.stats
index 0a89bd2d1ec..a6b93ae7405 100644
--- a/java/ql/lib/config/semmlecode.dbscheme.stats
+++ b/java/ql/lib/config/semmlecode.dbscheme.stats
@@ -9197,10 +9197,6 @@
                     <k>parentid</k>
                     <v>249278</v>
                 </e>
-                <e>
-                    <k>sourceid</k>
-                    <v>2886451</v>
-                </e>
             </columnsizes>
             <dependencies>
                 <dep>
@@ -9251,22 +9247,6 @@
                         </hist>
                     </val>
                 </dep>
-                <dep>
-                    <src>id</src>
-                    <trg>sourceid</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>2886451</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
                 <dep>
                     <src>nodeName</src>
                     <trg>id</trg>
@@ -9330,27 +9310,6 @@
                         </hist>
                     </val>
                 </dep>
-                <dep>
-                    <src>nodeName</src>
-                    <trg>sourceid</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>2356342</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>302</b>
-                                    <v>152116</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
                 <dep>
                     <src>typeid</src>
                     <trg>id</trg>
@@ -9449,42 +9408,6 @@
                         </hist>
                     </val>
                 </dep>
-                <dep>
-                    <src>typeid</src>
-                    <trg>sourceid</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>124952</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>21104</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>10447</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>8</b>
-                                    <v>14835</v>
-                                </b>
-                                <b>
-                                    <a>8</a>
-                                    <b>9650</b>
-                                    <v>11283</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
                 <dep>
                     <src>parentid</src>
                     <trg>id</trg>
@@ -9633,126 +9556,6 @@
                         </hist>
                     </val>
                 </dep>
-                <dep>
-                    <src>parentid</src>
-                    <trg>sourceid</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>115132</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>25074</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>20477</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>5</b>
-                                    <v>15253</v>
-                                </b>
-                                <b>
-                                    <a>5</a>
-                                    <b>6</b>
-                                    <v>12328</v>
-                                </b>
-                                <b>
-                                    <a>6</a>
-                                    <b>8</b>
-                                    <v>18387</v>
-                                </b>
-                                <b>
-                                    <a>8</a>
-                                    <b>14</b>
-                                    <v>19641</v>
-                                </b>
-                                <b>
-                                    <a>14</a>
-                                    <b>93</b>
-                                    <v>18805</v>
-                                </b>
-                                <b>
-                                    <a>95</a>
-                                    <b>1772</b>
-                                    <v>4179</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>sourceid</src>
-                    <trg>id</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>2886451</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>sourceid</src>
-                    <trg>nodeName</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>2886451</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>sourceid</src>
-                    <trg>typeid</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>2886451</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>sourceid</src>
-                    <trg>parentid</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>2886451</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
             </dependencies>
         </relation>
         <relation>
@@ -14040,99 +13843,6 @@
             </columnsizes>
             <dependencies/>
         </relation>
-        <relation>
-            <name>erasure</name>
-            <cardinality>22246872</cardinality>
-            <columnsizes>
-                <e>
-                    <k>memberid</k>
-                    <v>22246872</v>
-                </e>
-                <e>
-                    <k>erasureid</k>
-                    <v>2976</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>memberid</src>
-                    <trg>erasureid</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>22246872</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>erasureid</src>
-                    <trg>memberid</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>184</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>456</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>5</b>
-                                    <v>260</v>
-                                </b>
-                                <b>
-                                    <a>5</a>
-                                    <b>6</b>
-                                    <v>734</v>
-                                </b>
-                                <b>
-                                    <a>6</a>
-                                    <b>9</b>
-                                    <v>236</v>
-                                </b>
-                                <b>
-                                    <a>9</a>
-                                    <b>23</b>
-                                    <v>254</v>
-                                </b>
-                                <b>
-                                    <a>23</a>
-                                    <b>98</b>
-                                    <v>225</v>
-                                </b>
-                                <b>
-                                    <a>101</a>
-                                    <b>288</b>
-                                    <v>225</v>
-                                </b>
-                                <b>
-                                    <a>345</a>
-                                    <b>2541</b>
-                                    <v>225</v>
-                                </b>
-                                <b>
-                                    <a>2940</a>
-                                    <b>448198</b>
-                                    <v>173</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
         <relation>
             <name>isAnonymClass</name>
             <cardinality>157916</cardinality>
diff --git a/java/ql/lib/definitions.qll b/java/ql/lib/definitions.qll
index e4b93f6f7e1..aa5de3eb401 100644
--- a/java/ql/lib/definitions.qll
+++ b/java/ql/lib/definitions.qll
@@ -159,7 +159,7 @@ private Element definition(Element e, string kind) {
   e.(TypeAccess).getType().(RefType).getSourceDeclaration() = result and kind = "T"
   or
   exists(Variable v | v = e.(VarAccess).getVariable() |
-    result = v.(Field).getSourceDeclaration() or
+    result = v.(Field) or
     result = v.(Parameter).getSourceDeclaration() or
     result = v.(LocalVariableDecl)
   ) and
diff --git a/java/ql/lib/ext/experimental/java.nio.model.yml b/java/ql/lib/ext/experimental/java.nio.model.yml
deleted file mode 100644
index 6d6af865a39..00000000000
--- a/java/ql/lib/ext/experimental/java.nio.model.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-extensions:
-  - addsTo:
-      pack: codeql/java-all
-      extensible: sinkModel
-    data:
-      - ["java.nio.file","FileSystems",true,"getFileSystem","(URI)","","Argument[0]","path-injection","manual"]
-      - ["java.nio.channels","AsynchronousFileChannel",true,"open","(Path,OpenOption[])","","Argument[0]","path-injection","manual"]
-      - ["java.nio.channels","AsynchronousFileChannel",true,"open","(Path,Set,ExecutorService,FileAttribute[])","","Argument[0]","path-injection","manual"]
\ No newline at end of file
diff --git a/java/ql/lib/ext/experimental/java.util.zip.model.yml b/java/ql/lib/ext/experimental/java.util.zip.model.yml
deleted file mode 100644
index fb7b8f6671b..00000000000
--- a/java/ql/lib/ext/experimental/java.util.zip.model.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-extensions:
-  - addsTo:
-      pack: codeql/java-all
-      extensible: sinkModel
-    data:
-      - ["java.util.zip","ZipFile",true,"ZipFile","(String)","","Argument[0]","path-injection","manual"]
\ No newline at end of file
diff --git a/java/ql/lib/ext/experimental/org.apache.shiro.authc.model.yml b/java/ql/lib/ext/experimental/org.apache.shiro.authc.model.yml
deleted file mode 100644
index 6602a9caf7c..00000000000
--- a/java/ql/lib/ext/experimental/org.apache.shiro.authc.model.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-extensions:
-  - addsTo:
-      pack: codeql/java-all
-      extensible: sourceModel
-    data:
-      - ["org.apache.shiro.authc","AuthenticationToken",true,"getCredentials","()","","ReturnValue","remote","manual"]
\ No newline at end of file
diff --git a/java/ql/lib/ext/experimental/s3-transfer-manager.model.yml b/java/ql/lib/ext/experimental/s3-transfer-manager.model.yml
deleted file mode 100644
index bd3a385ac04..00000000000
--- a/java/ql/lib/ext/experimental/s3-transfer-manager.model.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-extensions:
-  - addsTo:
-      pack: codeql/java-all
-      extensible: sinkModel
-    data:
-      - ["software.amazon.awssdk.transfer.s3.model","ResumableFileUpload",true,"serializeToFile","(Path)","","Argument[0]","path-injection","manual"]
-      - ["software.amazon.awssdk.transfer.s3.model","DownloadFileRequest$Builder",true,"destination","(Path)","","Argument[0]","path-injection","manual"]
-      - ["software.amazon.awssdk.transfer.s3.model","UploadFileRequest$Builder",true,"source","(Path)","","Argument[0]","path-injection","manual"]
-      - ["software.amazon.awssdk.transfer.s3.model","DownloadDirectoryRequest$Builder",true,"destination","(Path)","","Argument[0]","path-injection","manual"]
-      - ["software.amazon.awssdk.transfer.s3.model","ResumableFileDownload",true,"fromFile","(Path)","","Argument[0]","path-injection","manual"]
-      - ["software.amazon.awssdk.transfer.s3.model","ResumableFileDownload",true,"serializeToFile","(Path)","","Argument[0]","path-injection","manual"]
-      - ["software.amazon.awssdk.transfer.s3.model","ResumableFileUpload",true,"fromFile","(Path)","","Argument[0]","path-injection","manual"]
-      - ["software.amazon.awssdk.transfer.s3.model","UploadDirectoryRequest$Builder",true,"source","(Path)","","Argument[0]","path-injection","manual"]
diff --git a/java/ql/lib/ext/experimental/spring-core.model.yml b/java/ql/lib/ext/experimental/spring-core.model.yml
deleted file mode 100644
index a4348650472..00000000000
--- a/java/ql/lib/ext/experimental/spring-core.model.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-extensions:
-  - addsTo:
-      pack: codeql/java-all
-      extensible: sinkModel
-    data:
-      - ["org.springframework.core.io","FileSystemResource",true,"FileSystemResource","(FileSystem,String)","","Argument[1]","path-injection","manual"]
-      - ["org.springframework.core.io","FileSystemResource",true,"FileSystemResource","(File)","","Argument[0]","path-injection","manual"]
-      - ["org.springframework.core.io","FileSystemResource",true,"FileSystemResource","(Path)","","Argument[0]","path-injection","manual"]
-      - ["org.springframework.core.io","FileSystemResource",true,"FileSystemResource","(String)","","Argument[0]","path-injection","manual"]
-      - ["org.springframework.core.io","FileUrlResource",true,"FileUrlResource","(String)","","Argument[0]","path-injection","manual"]
-      - ["org.springframework.core.io","FileUrlResource",true,"FileUrlResource","(URL)","","Argument[0]","path-injection","manual"]
-      - ["org.springframework.core.io","PathResource",true,"PathResource","(Path)","","Argument[0]","path-injection","manual"]
-      - ["org.springframework.core.io","PathResource",true,"PathResource","(String)","","Argument[0]","path-injection","manual"]
-      - ["org.springframework.core.io","PathResource",true,"PathResource","(URI)","","Argument[0]","path-injection","manual"]
-      - ["org.springframework.core.io","UrlResource",true,"UrlResource","(String,String,String)","","Argument[1]","path-injection","manual"]
-      - ["org.springframework.core.io","UrlResource",true,"UrlResource","(String,String)","","Argument[1]","path-injection","manual"]
-      - ["org.springframework.core.io","UrlResource",true,"UrlResource","(String)","","Argument[0]","path-injection","manual"]
-      - ["org.springframework.core.io","UrlResource",true,"UrlResource","(URI)","","Argument[0]","path-injection","manual"]
-      - ["org.springframework.core.io","UrlResource",true,"UrlResource","(URL)","","Argument[0]","path-injection","manual"]
-      - ["org.springframework.util","FileSystemUtils",true,"copyRecursively","(Path,Path)","","Argument[0]","path-injection","manual"]
-      - ["org.springframework.util","FileSystemUtils",true,"copyRecursively","(Path,Path)","","Argument[1]","path-injection","manual"]
-      - ["org.springframework.util","FileSystemUtils",true,"deleteRecursively","(File)","","Argument[0]","path-injection","manual"]
-      - ["org.springframework.util","FileSystemUtils",true,"deleteRecursively","(Path)","","Argument[0]","path-injection","manual"]
-      - ["org.springframework.util","ResourceUtils",true,"getFile","(String)","","Argument[0]","path-injection","manual"]
-      - ["org.springframework.util","FileCopyUtils",true,"copyToByteArray","(File)","","Argument[0]","path-injection","manual"]
-      - ["org.springframework.util","FileSystemUtils",true,"copyRecursively","(File,File)","","Argument[0]","path-injection","manual"]
diff --git a/java/ql/lib/ext/generated/com.sun.jmx.remote.internal.model.yml b/java/ql/lib/ext/generated/com.sun.jmx.remote.internal.model.yml
deleted file mode 100644
index c67869a4253..00000000000
--- a/java/ql/lib/ext/generated/com.sun.jmx.remote.internal.model.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-# THIS FILE IS AN AUTO-GENERATED MODELS AS DATA FILE. DO NOT EDIT.
-extensions:
-  - addsTo:
-      pack: codeql/java-all
-      extensible: neutralModel
-    data:
-      - ["com.sun.jmx.remote.internal", "ClientCommunicatorAdmin", "gotIOException", "(IOException)", "summary", "df-generated"]
diff --git a/java/ql/lib/ext/generated/java.applet.model.yml b/java/ql/lib/ext/generated/java.applet.model.yml
index adcf20a8c6e..91c694694d3 100644
--- a/java/ql/lib/ext/generated/java.applet.model.yml
+++ b/java/ql/lib/ext/generated/java.applet.model.yml
@@ -7,13 +7,10 @@ extensions:
       - ["java.applet", "Applet", True, "getAppletContext", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.applet", "Applet", True, "getCodeBase", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.applet", "Applet", True, "getDocumentBase", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.applet", "Applet", True, "getImage", "(URL)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["java.applet", "Applet", True, "getImage", "(URL,String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["java.applet", "Applet", True, "getImage", "(URL,String)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["java.applet", "Applet", True, "getLocale", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.applet", "Applet", True, "setStub", "(AppletStub)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.applet", "AppletContext", True, "getApplets", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.applet", "AppletContext", True, "getImage", "(URL)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.applet", "AppletContext", True, "getImage", "(URL)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["java.applet", "AppletContext", True, "getImage", "(URL)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.applet", "AppletStub", True, "getAppletContext", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.applet", "AppletStub", True, "getCodeBase", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
@@ -26,24 +23,18 @@ extensions:
       - ["java.applet", "Applet", "getAppletInfo", "()", "summary", "df-generated"]
       - ["java.applet", "Applet", "getAudioClip", "(URL)", "summary", "df-generated"]
       - ["java.applet", "Applet", "getAudioClip", "(URL,String)", "summary", "df-generated"]
+      - ["java.applet", "Applet", "getImage", "(URL)", "summary", "df-generated"]
+      - ["java.applet", "Applet", "getImage", "(URL,String)", "summary", "df-generated"]
       - ["java.applet", "Applet", "getParameter", "(String)", "summary", "df-generated"]
       - ["java.applet", "Applet", "getParameterInfo", "()", "summary", "df-generated"]
       - ["java.applet", "Applet", "init", "()", "summary", "df-generated"]
       - ["java.applet", "Applet", "isActive", "()", "summary", "df-generated"]
+      - ["java.applet", "Applet", "isValidateRoot", "()", "summary", "df-generated"]
       - ["java.applet", "Applet", "newAudioClip", "(URL)", "summary", "df-generated"]
       - ["java.applet", "Applet", "play", "(URL)", "summary", "df-generated"]
       - ["java.applet", "Applet", "play", "(URL,String)", "summary", "df-generated"]
+      - ["java.applet", "Applet", "resize", "(Dimension)", "summary", "df-generated"]
+      - ["java.applet", "Applet", "resize", "(int,int)", "summary", "df-generated"]
       - ["java.applet", "Applet", "showStatus", "(String)", "summary", "df-generated"]
       - ["java.applet", "Applet", "start", "()", "summary", "df-generated"]
       - ["java.applet", "Applet", "stop", "()", "summary", "df-generated"]
-      - ["java.applet", "AppletContext", "getApplet", "(String)", "summary", "df-generated"]
-      - ["java.applet", "AppletContext", "getAudioClip", "(URL)", "summary", "df-generated"]
-      - ["java.applet", "AppletContext", "getStream", "(String)", "summary", "df-generated"]
-      - ["java.applet", "AppletContext", "getStreamKeys", "()", "summary", "df-generated"]
-      - ["java.applet", "AppletContext", "setStream", "(String,InputStream)", "summary", "df-generated"]
-      - ["java.applet", "AppletContext", "showDocument", "(URL)", "summary", "df-generated"]
-      - ["java.applet", "AppletContext", "showDocument", "(URL,String)", "summary", "df-generated"]
-      - ["java.applet", "AppletContext", "showStatus", "(String)", "summary", "df-generated"]
-      - ["java.applet", "AppletStub", "appletResize", "(int,int)", "summary", "df-generated"]
-      - ["java.applet", "AppletStub", "getParameter", "(String)", "summary", "df-generated"]
-      - ["java.applet", "AppletStub", "isActive", "()", "summary", "df-generated"]
diff --git a/java/ql/lib/ext/generated/java.awt.model.yml b/java/ql/lib/ext/generated/java.awt.model.yml
deleted file mode 100644
index 63ac56c4b3a..00000000000
--- a/java/ql/lib/ext/generated/java.awt.model.yml
+++ /dev/null
@@ -1,15 +0,0 @@
-# THIS FILE IS AN AUTO-GENERATED MODELS AS DATA FILE. DO NOT EDIT.
-extensions:
-  - addsTo:
-      pack: codeql/java-all
-      extensible: summaryModel
-    data:
-      - ["java.awt", "Component", True, "getAccessibleContext", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.awt", "Component", True, "getLocale", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-  - addsTo:
-      pack: codeql/java-all
-      extensible: neutralModel
-    data:
-      - ["java.awt", "Component", "resize", "(Dimension)", "summary", "df-generated"]
-      - ["java.awt", "Component", "resize", "(int,int)", "summary", "df-generated"]
-      - ["java.awt", "Container", "isValidateRoot", "()", "summary", "df-generated"]
diff --git a/java/ql/lib/ext/generated/java.beans.beancontext.model.yml b/java/ql/lib/ext/generated/java.beans.beancontext.model.yml
index 4a096488b80..6f4e8e549ae 100644
--- a/java/ql/lib/ext/generated/java.beans.beancontext.model.yml
+++ b/java/ql/lib/ext/generated/java.beans.beancontext.model.yml
@@ -5,81 +5,85 @@ extensions:
       extensible: summaryModel
     data:
       - ["java.beans.beancontext", "BeanContext", True, "addBeanContextMembershipListener", "(BeanContextMembershipListener)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.beans.beancontext", "BeanContext", True, "getResource", "(String,BeanContextChild)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.beans.beancontext", "BeanContext", True, "getResource", "(String,BeanContextChild)", "", "Argument[0]", "ReturnValue", "taint", "dfc-generated"]
       - ["java.beans.beancontext", "BeanContext", True, "instantiateChild", "(String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.beans.beancontext", "BeanContextChild", True, "getBeanContext", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.beans.beancontext", "BeanContextChild", True, "setBeanContext", "(BeanContext)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["java.beans.beancontext", "BeanContextChildSupport", True, "BeanContextChildSupport", "(BeanContextChild)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.beans.beancontext", "BeanContextChildSupport", True, "getBeanContextChildPeer", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.beans.beancontext", "BeanContextChildSupport", True, "BeanContextChildSupport", "(BeanContextChild)", "", "Argument[0]", "Argument[this].Field[java.beans.beancontext.BeanContextChildSupport.beanContextChildPeer]", "value", "dfc-generated"]
+      - ["java.beans.beancontext", "BeanContextChildSupport", True, "getBeanContext", "()", "", "Argument[this].SyntheticField[java.beans.beancontext.BeanContextChildSupport.beanContext]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.beans.beancontext", "BeanContextChildSupport", True, "getBeanContextChildPeer", "()", "", "Argument[this].Field[java.beans.beancontext.BeanContextChildSupport.beanContextChildPeer]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.beans.beancontext", "BeanContextChildSupport", True, "setBeanContext", "(BeanContext)", "", "Argument[0]", "Argument[this].SyntheticField[java.beans.beancontext.BeanContextChildSupport.beanContext]", "value", "dfc-generated"]
       - ["java.beans.beancontext", "BeanContextEvent", True, "getBeanContext", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.beans.beancontext", "BeanContextEvent", True, "getPropagatedFrom", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.beans.beancontext", "BeanContextEvent", True, "setPropagatedFrom", "(BeanContext)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["java.beans.beancontext", "BeanContextMembershipEvent", True, "BeanContextMembershipEvent", "(BeanContext,Collection)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["java.beans.beancontext", "BeanContextMembershipEvent", True, "BeanContextMembershipEvent", "(BeanContext,Collection)", "", "Argument[1].Element", "Argument[this]", "taint", "df-generated"]
-      - ["java.beans.beancontext", "BeanContextMembershipEvent", True, "BeanContextMembershipEvent", "(BeanContext,Object[])", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["java.beans.beancontext", "BeanContextMembershipEvent", True, "BeanContextMembershipEvent", "(BeanContext,Object[])", "", "Argument[1].ArrayElement", "Argument[this]", "taint", "df-generated"]
-      - ["java.beans.beancontext", "BeanContextMembershipEvent", True, "iterator", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.beans.beancontext", "BeanContextMembershipEvent", True, "toArray", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.beans.beancontext", "BeanContextServiceAvailableEvent", True, "BeanContextServiceAvailableEvent", "(BeanContextServices,Class)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["java.beans.beancontext", "BeanContextServiceAvailableEvent", True, "getSourceAsBeanContextServices", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.beans.beancontext", "BeanContextServiceRevokedEvent", True, "BeanContextServiceRevokedEvent", "(BeanContextServices,Class,boolean)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["java.beans.beancontext", "BeanContextServiceRevokedEvent", True, "getSourceAsBeanContextServices", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.beans.beancontext", "BeanContextEvent", True, "getPropagatedFrom", "()", "", "Argument[this].SyntheticField[java.beans.beancontext.BeanContextEvent.propagatedFrom]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.beans.beancontext", "BeanContextEvent", True, "setPropagatedFrom", "(BeanContext)", "", "Argument[0]", "Argument[this].SyntheticField[java.beans.beancontext.BeanContextEvent.propagatedFrom]", "value", "dfc-generated"]
+      - ["java.beans.beancontext", "BeanContextMembershipEvent", True, "BeanContextMembershipEvent", "(BeanContext,Collection)", "", "Argument[1]", "Argument[this].SyntheticField[java.beans.beancontext.BeanContextMembershipEvent.children]", "value", "dfc-generated"]
+      - ["java.beans.beancontext", "BeanContextMembershipEvent", True, "BeanContextMembershipEvent", "(BeanContext,Object[])", "", "Argument[1].ArrayElement", "Argument[this].SyntheticField[java.beans.beancontext.BeanContextMembershipEvent.children].Element", "value", "dfc-generated"]
+      - ["java.beans.beancontext", "BeanContextMembershipEvent", True, "iterator", "()", "", "Argument[this].SyntheticField[java.beans.beancontext.BeanContextMembershipEvent.children].Element", "ReturnValue.Element", "value", "dfc-generated"]
+      - ["java.beans.beancontext", "BeanContextMembershipEvent", True, "toArray", "()", "", "Argument[this].SyntheticField[java.beans.beancontext.BeanContextMembershipEvent.children].Element", "ReturnValue.ArrayElement", "value", "dfc-generated"]
+      - ["java.beans.beancontext", "BeanContextServiceAvailableEvent", True, "BeanContextServiceAvailableEvent", "(BeanContextServices,Class)", "", "Argument[0]", "Argument[this].SyntheticField[java.util.EventObject.source]", "value", "dfc-generated"]
+      - ["java.beans.beancontext", "BeanContextServiceAvailableEvent", True, "getSourceAsBeanContextServices", "()", "", "Argument[this].SyntheticField[java.util.EventObject.source]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.beans.beancontext", "BeanContextServiceRevokedEvent", True, "BeanContextServiceRevokedEvent", "(BeanContextServices,Class,boolean)", "", "Argument[0]", "Argument[this].SyntheticField[java.util.EventObject.source]", "value", "dfc-generated"]
+      - ["java.beans.beancontext", "BeanContextServiceRevokedEvent", True, "getSourceAsBeanContextServices", "()", "", "Argument[this].SyntheticField[java.util.EventObject.source]", "ReturnValue", "value", "dfc-generated"]
       - ["java.beans.beancontext", "BeanContextServices", True, "addBeanContextServicesListener", "(BeanContextServicesListener)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.beans.beancontext", "BeanContextServices", True, "getCurrentServiceClasses", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.beans.beancontext", "BeanContextServicesSupport", True, "BeanContextServicesSupport", "(BeanContextServices)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["java.beans.beancontext", "BeanContextServicesSupport", True, "BeanContextServicesSupport", "(BeanContextServices,Locale)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["java.beans.beancontext", "BeanContextServicesSupport", True, "BeanContextServicesSupport", "(BeanContextServices,Locale)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["java.beans.beancontext", "BeanContextServicesSupport", True, "BeanContextServicesSupport", "(BeanContextServices,Locale,boolean)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["java.beans.beancontext", "BeanContextServicesSupport", True, "BeanContextServicesSupport", "(BeanContextServices,Locale,boolean)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["java.beans.beancontext", "BeanContextServicesSupport", True, "BeanContextServicesSupport", "(BeanContextServices,Locale,boolean,boolean)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["java.beans.beancontext", "BeanContextServicesSupport", True, "BeanContextServicesSupport", "(BeanContextServices,Locale,boolean,boolean)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["java.beans.beancontext", "BeanContextServicesSupport", True, "getBeanContextServicesPeer", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.beans.beancontext", "BeanContextSupport", True, "BeanContextSupport", "(BeanContext)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["java.beans.beancontext", "BeanContextSupport", True, "BeanContextSupport", "(BeanContext,Locale)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["java.beans.beancontext", "BeanContextSupport", True, "BeanContextSupport", "(BeanContext,Locale)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["java.beans.beancontext", "BeanContextSupport", True, "BeanContextSupport", "(BeanContext,Locale,boolean)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["java.beans.beancontext", "BeanContextSupport", True, "BeanContextSupport", "(BeanContext,Locale,boolean)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["java.beans.beancontext", "BeanContextSupport", True, "BeanContextSupport", "(BeanContext,Locale,boolean,boolean)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["java.beans.beancontext", "BeanContextSupport", True, "BeanContextSupport", "(BeanContext,Locale,boolean,boolean)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["java.beans.beancontext", "BeanContextSupport", True, "getBeanContextPeer", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.beans.beancontext", "BeanContextSupport", True, "getLocale", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.beans.beancontext", "BeanContextServicesSupport", True, "BeanContextServicesSupport", "(BeanContextServices)", "", "Argument[0]", "Argument[this].Field[java.beans.beancontext.BeanContextChildSupport.beanContextChildPeer]", "value", "dfc-generated"]
+      - ["java.beans.beancontext", "BeanContextServicesSupport", True, "BeanContextServicesSupport", "(BeanContextServices,Locale)", "", "Argument[0]", "Argument[this].Field[java.beans.beancontext.BeanContextChildSupport.beanContextChildPeer]", "value", "dfc-generated"]
+      - ["java.beans.beancontext", "BeanContextServicesSupport", True, "BeanContextServicesSupport", "(BeanContextServices,Locale,boolean)", "", "Argument[0]", "Argument[this].Field[java.beans.beancontext.BeanContextChildSupport.beanContextChildPeer]", "value", "dfc-generated"]
+      - ["java.beans.beancontext", "BeanContextServicesSupport", True, "BeanContextServicesSupport", "(BeanContextServices,Locale,boolean,boolean)", "", "Argument[0]", "Argument[this].Field[java.beans.beancontext.BeanContextChildSupport.beanContextChildPeer]", "value", "dfc-generated"]
+      - ["java.beans.beancontext", "BeanContextServicesSupport", True, "getBeanContextServicesPeer", "()", "", "Argument[this].Field[java.beans.beancontext.BeanContextChildSupport.beanContextChildPeer]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.beans.beancontext", "BeanContextSupport", True, "BeanContextSupport", "(BeanContext)", "", "Argument[0]", "Argument[this].Field[java.beans.beancontext.BeanContextChildSupport.beanContextChildPeer]", "value", "dfc-generated"]
+      - ["java.beans.beancontext", "BeanContextSupport", True, "BeanContextSupport", "(BeanContext,Locale)", "", "Argument[0]", "Argument[this].Field[java.beans.beancontext.BeanContextChildSupport.beanContextChildPeer]", "value", "dfc-generated"]
+      - ["java.beans.beancontext", "BeanContextSupport", True, "BeanContextSupport", "(BeanContext,Locale)", "", "Argument[1]", "Argument[this].SyntheticField[java.beans.beancontext.BeanContextSupport.locale]", "value", "dfc-generated"]
+      - ["java.beans.beancontext", "BeanContextSupport", True, "BeanContextSupport", "(BeanContext,Locale,boolean)", "", "Argument[0]", "Argument[this].Field[java.beans.beancontext.BeanContextChildSupport.beanContextChildPeer]", "value", "dfc-generated"]
+      - ["java.beans.beancontext", "BeanContextSupport", True, "BeanContextSupport", "(BeanContext,Locale,boolean)", "", "Argument[1]", "Argument[this].SyntheticField[java.beans.beancontext.BeanContextSupport.locale]", "value", "dfc-generated"]
+      - ["java.beans.beancontext", "BeanContextSupport", True, "BeanContextSupport", "(BeanContext,Locale,boolean,boolean)", "", "Argument[0]", "Argument[this].Field[java.beans.beancontext.BeanContextChildSupport.beanContextChildPeer]", "value", "dfc-generated"]
+      - ["java.beans.beancontext", "BeanContextSupport", True, "BeanContextSupport", "(BeanContext,Locale,boolean,boolean)", "", "Argument[1]", "Argument[this].SyntheticField[java.beans.beancontext.BeanContextSupport.locale]", "value", "dfc-generated"]
+      - ["java.beans.beancontext", "BeanContextSupport", True, "getBeanContextPeer", "()", "", "Argument[this].Field[java.beans.beancontext.BeanContextChildSupport.beanContextChildPeer]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.beans.beancontext", "BeanContextSupport", True, "getLocale", "()", "", "Argument[this].SyntheticField[java.beans.beancontext.BeanContextSupport.locale]", "ReturnValue", "value", "dfc-generated"]
       - ["java.beans.beancontext", "BeanContextSupport", True, "readChildren", "(ObjectInputStream)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.beans.beancontext", "BeanContextSupport", True, "setLocale", "(Locale)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.beans.beancontext", "BeanContextSupport", True, "setLocale", "(Locale)", "", "Argument[0]", "Argument[this].SyntheticField[java.beans.beancontext.BeanContextSupport.locale]", "value", "dfc-generated"]
       - ["java.beans.beancontext", "BeanContextSupport", True, "writeChildren", "(ObjectOutputStream)", "", "Argument[this]", "Argument[0]", "taint", "df-generated"]
   - addsTo:
       pack: codeql/java-all
       extensible: neutralModel
     data:
-      - ["java.beans.beancontext", "BeanContext", "getResourceAsStream", "(String,BeanContextChild)", "summary", "df-generated"]
-      - ["java.beans.beancontext", "BeanContext", "removeBeanContextMembershipListener", "(BeanContextMembershipListener)", "summary", "df-generated"]
-      - ["java.beans.beancontext", "BeanContextChild", "addPropertyChangeListener", "(String,PropertyChangeListener)", "summary", "df-generated"]
-      - ["java.beans.beancontext", "BeanContextChild", "addVetoableChangeListener", "(String,VetoableChangeListener)", "summary", "df-generated"]
-      - ["java.beans.beancontext", "BeanContextChild", "removePropertyChangeListener", "(String,PropertyChangeListener)", "summary", "df-generated"]
-      - ["java.beans.beancontext", "BeanContextChild", "removeVetoableChangeListener", "(String,VetoableChangeListener)", "summary", "df-generated"]
+      - ["java.beans.beancontext", "BeanContextChildSupport", "addPropertyChangeListener", "(String,PropertyChangeListener)", "summary", "df-generated"]
+      - ["java.beans.beancontext", "BeanContextChildSupport", "addVetoableChangeListener", "(String,VetoableChangeListener)", "summary", "df-generated"]
       - ["java.beans.beancontext", "BeanContextChildSupport", "firePropertyChange", "(String,Object,Object)", "summary", "df-generated"]
       - ["java.beans.beancontext", "BeanContextChildSupport", "fireVetoableChange", "(String,Object,Object)", "summary", "df-generated"]
       - ["java.beans.beancontext", "BeanContextChildSupport", "isDelegated", "()", "summary", "df-generated"]
+      - ["java.beans.beancontext", "BeanContextChildSupport", "removePropertyChangeListener", "(String,PropertyChangeListener)", "summary", "df-generated"]
+      - ["java.beans.beancontext", "BeanContextChildSupport", "removeVetoableChangeListener", "(String,VetoableChangeListener)", "summary", "df-generated"]
+      - ["java.beans.beancontext", "BeanContextChildSupport", "serviceAvailable", "(BeanContextServiceAvailableEvent)", "summary", "df-generated"]
+      - ["java.beans.beancontext", "BeanContextChildSupport", "serviceRevoked", "(BeanContextServiceRevokedEvent)", "summary", "df-generated"]
       - ["java.beans.beancontext", "BeanContextChildSupport", "validatePendingSetBeanContext", "(BeanContext)", "summary", "df-generated"]
       - ["java.beans.beancontext", "BeanContextEvent", "isPropagated", "()", "summary", "df-generated"]
       - ["java.beans.beancontext", "BeanContextMembershipEvent", "contains", "(Object)", "summary", "df-generated"]
       - ["java.beans.beancontext", "BeanContextMembershipEvent", "size", "()", "summary", "df-generated"]
       - ["java.beans.beancontext", "BeanContextServiceAvailableEvent", "getCurrentServiceSelectors", "()", "summary", "df-generated"]
       - ["java.beans.beancontext", "BeanContextServiceAvailableEvent", "getServiceClass", "()", "summary", "df-generated"]
-      - ["java.beans.beancontext", "BeanContextServiceProvider", "getCurrentServiceSelectors", "(BeanContextServices,Class)", "summary", "df-generated"]
-      - ["java.beans.beancontext", "BeanContextServiceProvider", "getService", "(BeanContextServices,Object,Class,Object)", "summary", "df-generated"]
-      - ["java.beans.beancontext", "BeanContextServiceProvider", "releaseService", "(BeanContextServices,Object,Object)", "summary", "df-generated"]
       - ["java.beans.beancontext", "BeanContextServiceRevokedEvent", "getServiceClass", "()", "summary", "df-generated"]
       - ["java.beans.beancontext", "BeanContextServiceRevokedEvent", "isCurrentServiceInvalidNow", "()", "summary", "df-generated"]
       - ["java.beans.beancontext", "BeanContextServiceRevokedEvent", "isServiceClass", "(Class)", "summary", "df-generated"]
-      - ["java.beans.beancontext", "BeanContextServiceRevokedListener", "serviceRevoked", "(BeanContextServiceRevokedEvent)", "summary", "df-generated"]
-      - ["java.beans.beancontext", "BeanContextServices", "addService", "(Class,BeanContextServiceProvider)", "summary", "df-generated"]
-      - ["java.beans.beancontext", "BeanContextServices", "getCurrentServiceSelectors", "(Class)", "summary", "df-generated"]
-      - ["java.beans.beancontext", "BeanContextServices", "getService", "(BeanContextChild,Object,Class,Object,BeanContextServiceRevokedListener)", "summary", "df-generated"]
-      - ["java.beans.beancontext", "BeanContextServices", "hasService", "(Class)", "summary", "df-generated"]
-      - ["java.beans.beancontext", "BeanContextServices", "releaseService", "(BeanContextChild,Object,Object)", "summary", "df-generated"]
-      - ["java.beans.beancontext", "BeanContextServices", "removeBeanContextServicesListener", "(BeanContextServicesListener)", "summary", "df-generated"]
-      - ["java.beans.beancontext", "BeanContextServices", "revokeService", "(Class,BeanContextServiceProvider,boolean)", "summary", "df-generated"]
-      - ["java.beans.beancontext", "BeanContextServicesListener", "serviceAvailable", "(BeanContextServiceAvailableEvent)", "summary", "df-generated"]
+      - ["java.beans.beancontext", "BeanContextServicesSupport", "addService", "(Class,BeanContextServiceProvider)", "summary", "df-generated"]
+      - ["java.beans.beancontext", "BeanContextServicesSupport", "getCurrentServiceSelectors", "(Class)", "summary", "df-generated"]
+      - ["java.beans.beancontext", "BeanContextServicesSupport", "getService", "(BeanContextChild,Object,Class,Object,BeanContextServiceRevokedListener)", "summary", "df-generated"]
+      - ["java.beans.beancontext", "BeanContextServicesSupport", "hasService", "(Class)", "summary", "df-generated"]
+      - ["java.beans.beancontext", "BeanContextServicesSupport", "initialize", "()", "summary", "df-generated"]
+      - ["java.beans.beancontext", "BeanContextServicesSupport", "releaseService", "(BeanContextChild,Object,Object)", "summary", "df-generated"]
+      - ["java.beans.beancontext", "BeanContextServicesSupport", "removeBeanContextServicesListener", "(BeanContextServicesListener)", "summary", "df-generated"]
+      - ["java.beans.beancontext", "BeanContextServicesSupport", "revokeService", "(Class,BeanContextServiceProvider,boolean)", "summary", "df-generated"]
+      - ["java.beans.beancontext", "BeanContextServicesSupport", "serviceAvailable", "(BeanContextServiceAvailableEvent)", "summary", "df-generated"]
+      - ["java.beans.beancontext", "BeanContextServicesSupport", "serviceRevoked", "(BeanContextServiceRevokedEvent)", "summary", "df-generated"]
+      - ["java.beans.beancontext", "BeanContextSupport", "avoidingGui", "()", "summary", "df-generated"]
+      - ["java.beans.beancontext", "BeanContextSupport", "clear", "()", "summary", "df-generated"]
       - ["java.beans.beancontext", "BeanContextSupport", "containsKey", "(Object)", "summary", "df-generated"]
-      - ["java.beans.beancontext", "BeanContextSupport", "initialize", "()", "summary", "df-generated"]
+      - ["java.beans.beancontext", "BeanContextSupport", "dontUseGui", "()", "summary", "df-generated"]
+      - ["java.beans.beancontext", "BeanContextSupport", "getResourceAsStream", "(String,BeanContextChild)", "summary", "df-generated"]
+      - ["java.beans.beancontext", "BeanContextSupport", "isDesignTime", "()", "summary", "df-generated"]
       - ["java.beans.beancontext", "BeanContextSupport", "isSerializing", "()", "summary", "df-generated"]
+      - ["java.beans.beancontext", "BeanContextSupport", "needsGui", "()", "summary", "df-generated"]
+      - ["java.beans.beancontext", "BeanContextSupport", "okToUseGui", "()", "summary", "df-generated"]
+      - ["java.beans.beancontext", "BeanContextSupport", "removeAll", "(Collection)", "summary", "df-generated"]
+      - ["java.beans.beancontext", "BeanContextSupport", "removeBeanContextMembershipListener", "(BeanContextMembershipListener)", "summary", "df-generated"]
+      - ["java.beans.beancontext", "BeanContextSupport", "retainAll", "(Collection)", "summary", "df-generated"]
+      - ["java.beans.beancontext", "BeanContextSupport", "setDesignTime", "(boolean)", "summary", "df-generated"]
+      - ["java.beans.beancontext", "BeanContextSupport", "vetoableChange", "(PropertyChangeEvent)", "summary", "df-generated"]
diff --git a/java/ql/lib/ext/generated/java.beans.model.yml b/java/ql/lib/ext/generated/java.beans.model.yml
index 2767fb30102..38d26829362 100644
--- a/java/ql/lib/ext/generated/java.beans.model.yml
+++ b/java/ql/lib/ext/generated/java.beans.model.yml
@@ -8,7 +8,7 @@ extensions:
       - ["java.beans", "BeanInfo", True, "getEventSetDescriptors", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.beans", "BeanInfo", True, "getMethodDescriptors", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.beans", "BeanInfo", True, "getPropertyDescriptors", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.beans", "Beans", True, "getInstanceOf", "(Object,Class)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.beans", "Beans", True, "getInstanceOf", "(Object,Class)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
       - ["java.beans", "Beans", True, "instantiate", "(ClassLoader,String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["java.beans", "Beans", True, "instantiate", "(ClassLoader,String,BeanContext)", "", "Argument[0]", "Argument[2].Element", "taint", "df-generated"]
       - ["java.beans", "Beans", True, "instantiate", "(ClassLoader,String,BeanContext)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
@@ -17,60 +17,48 @@ extensions:
       - ["java.beans", "Beans", True, "instantiate", "(ClassLoader,String,BeanContext,AppletInitializer)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["java.beans", "Beans", True, "instantiate", "(ClassLoader,String,BeanContext,AppletInitializer)", "", "Argument[2].Element", "ReturnValue", "taint", "df-generated"]
       - ["java.beans", "DefaultPersistenceDelegate", True, "DefaultPersistenceDelegate", "(String[])", "", "Argument[0].ArrayElement", "Argument[this]", "taint", "df-generated"]
-      - ["java.beans", "Encoder", True, "get", "(Object)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["java.beans", "Encoder", True, "get", "(Object)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.beans", "Encoder", True, "getExceptionListener", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.beans", "Encoder", True, "get", "(Object)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.beans", "Encoder", True, "getExceptionListener", "()", "", "Argument[this].SyntheticField[java.beans.Encoder.exceptionListener]", "ReturnValue", "value", "dfc-generated"]
       - ["java.beans", "Encoder", True, "getPersistenceDelegate", "(Class)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.beans", "Encoder", True, "remove", "(Object)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.beans", "Encoder", True, "setExceptionListener", "(ExceptionListener)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.beans", "Encoder", True, "setExceptionListener", "(ExceptionListener)", "", "Argument[0]", "Argument[this].SyntheticField[java.beans.Encoder.exceptionListener]", "value", "dfc-generated"]
       - ["java.beans", "Encoder", True, "writeExpression", "(Expression)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.beans", "Encoder", True, "writeObject", "(Object)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.beans", "Encoder", True, "writeStatement", "(Statement)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.beans", "EventHandler", True, "EventHandler", "(Object,String,String,String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.beans", "EventHandler", True, "EventHandler", "(Object,String,String,String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["java.beans", "EventHandler", True, "EventHandler", "(Object,String,String,String)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
-      - ["java.beans", "EventHandler", True, "EventHandler", "(Object,String,String,String)", "", "Argument[3]", "Argument[this]", "taint", "df-generated"]
-      - ["java.beans", "EventHandler", True, "getAction", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.beans", "EventHandler", True, "getEventPropertyName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.beans", "EventHandler", True, "getListenerMethodName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.beans", "EventHandler", True, "getTarget", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.beans", "EventHandler", True, "EventHandler", "(Object,String,String,String)", "", "Argument[0]", "Argument[this].SyntheticField[java.beans.EventHandler.target]", "value", "dfc-generated"]
+      - ["java.beans", "EventHandler", True, "EventHandler", "(Object,String,String,String)", "", "Argument[1]", "Argument[this].SyntheticField[java.beans.EventHandler.action]", "value", "dfc-generated"]
+      - ["java.beans", "EventHandler", True, "EventHandler", "(Object,String,String,String)", "", "Argument[2]", "Argument[this].SyntheticField[java.beans.EventHandler.eventPropertyName]", "value", "dfc-generated"]
+      - ["java.beans", "EventHandler", True, "EventHandler", "(Object,String,String,String)", "", "Argument[3]", "Argument[this].SyntheticField[java.beans.EventHandler.listenerMethodName]", "value", "dfc-generated"]
+      - ["java.beans", "EventHandler", True, "getAction", "()", "", "Argument[this].SyntheticField[java.beans.EventHandler.action]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.beans", "EventHandler", True, "getEventPropertyName", "()", "", "Argument[this].SyntheticField[java.beans.EventHandler.eventPropertyName]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.beans", "EventHandler", True, "getListenerMethodName", "()", "", "Argument[this].SyntheticField[java.beans.EventHandler.listenerMethodName]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.beans", "EventHandler", True, "getTarget", "()", "", "Argument[this].SyntheticField[java.beans.EventHandler.target]", "ReturnValue", "value", "dfc-generated"]
       - ["java.beans", "EventSetDescriptor", True, "EventSetDescriptor", "(Class,String,Class,String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
       - ["java.beans", "EventSetDescriptor", True, "EventSetDescriptor", "(Class,String,Class,String[],String,String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
       - ["java.beans", "EventSetDescriptor", True, "EventSetDescriptor", "(Class,String,Class,String[],String,String,String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["java.beans", "EventSetDescriptor", True, "EventSetDescriptor", "(String,Class,MethodDescriptor[],Method,Method)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.beans", "EventSetDescriptor", True, "EventSetDescriptor", "(String,Class,MethodDescriptor[],Method,Method)", "", "Argument[2].ArrayElement", "Argument[this]", "taint", "df-generated"]
-      - ["java.beans", "EventSetDescriptor", True, "EventSetDescriptor", "(String,Class,MethodDescriptor[],Method,Method)", "", "Argument[3]", "Argument[this]", "taint", "df-generated"]
-      - ["java.beans", "EventSetDescriptor", True, "EventSetDescriptor", "(String,Class,MethodDescriptor[],Method,Method)", "", "Argument[4]", "Argument[this]", "taint", "df-generated"]
-      - ["java.beans", "EventSetDescriptor", True, "EventSetDescriptor", "(String,Class,Method[],Method,Method)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.beans", "EventSetDescriptor", True, "EventSetDescriptor", "(String,Class,Method[],Method,Method)", "", "Argument[2].ArrayElement", "Argument[this]", "taint", "df-generated"]
-      - ["java.beans", "EventSetDescriptor", True, "EventSetDescriptor", "(String,Class,Method[],Method,Method)", "", "Argument[3]", "Argument[this]", "taint", "df-generated"]
-      - ["java.beans", "EventSetDescriptor", True, "EventSetDescriptor", "(String,Class,Method[],Method,Method)", "", "Argument[4]", "Argument[this]", "taint", "df-generated"]
-      - ["java.beans", "EventSetDescriptor", True, "EventSetDescriptor", "(String,Class,Method[],Method,Method,Method)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.beans", "EventSetDescriptor", True, "EventSetDescriptor", "(String,Class,Method[],Method,Method,Method)", "", "Argument[2].ArrayElement", "Argument[this]", "taint", "df-generated"]
-      - ["java.beans", "EventSetDescriptor", True, "EventSetDescriptor", "(String,Class,Method[],Method,Method,Method)", "", "Argument[3]", "Argument[this]", "taint", "df-generated"]
-      - ["java.beans", "EventSetDescriptor", True, "EventSetDescriptor", "(String,Class,Method[],Method,Method,Method)", "", "Argument[4]", "Argument[this]", "taint", "df-generated"]
-      - ["java.beans", "EventSetDescriptor", True, "EventSetDescriptor", "(String,Class,Method[],Method,Method,Method)", "", "Argument[5]", "Argument[this]", "taint", "df-generated"]
-      - ["java.beans", "EventSetDescriptor", True, "getListenerMethodDescriptors", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.beans", "EventSetDescriptor", True, "getListenerMethods", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.beans", "Expression", True, "Expression", "(Object,Object,String,Object[])", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.beans", "Expression", True, "Expression", "(Object,Object,String,Object[])", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["java.beans", "Expression", True, "Expression", "(Object,Object,String,Object[])", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
-      - ["java.beans", "Expression", True, "Expression", "(Object,Object,String,Object[])", "", "Argument[3].ArrayElement", "Argument[this]", "taint", "df-generated"]
+      - ["java.beans", "EventSetDescriptor", True, "EventSetDescriptor", "(String,Class,MethodDescriptor[],Method,Method)", "", "Argument[2]", "Argument[this].SyntheticField[java.beans.EventSetDescriptor.listenerMethodDescriptors]", "value", "dfc-generated"]
+      - ["java.beans", "EventSetDescriptor", True, "EventSetDescriptor", "(String,Class,Method[],Method,Method)", "", "Argument[2]", "Argument[this].SyntheticField[java.beans.EventSetDescriptor.listenerMethodsRef].SyntheticField[java.lang.ref.Reference.referent]", "value", "dfc-generated"]
+      - ["java.beans", "EventSetDescriptor", True, "EventSetDescriptor", "(String,Class,Method[],Method,Method,Method)", "", "Argument[2]", "Argument[this].SyntheticField[java.beans.EventSetDescriptor.listenerMethodsRef].SyntheticField[java.lang.ref.Reference.referent]", "value", "dfc-generated"]
+      - ["java.beans", "EventSetDescriptor", True, "getListenerMethodDescriptors", "()", "", "Argument[this].SyntheticField[java.beans.EventSetDescriptor.listenerMethodDescriptors]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.beans", "EventSetDescriptor", True, "getListenerMethods", "()", "", "Argument[this].SyntheticField[java.beans.EventSetDescriptor.listenerMethodsRef].SyntheticField[java.lang.ref.Reference.referent]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.beans", "Expression", True, "Expression", "(Object,Object,String,Object[])", "", "Argument[0]", "Argument[this].SyntheticField[java.beans.Expression.value]", "value", "dfc-generated"]
       - ["java.beans", "Expression", True, "Expression", "(Object,String,Object[])", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.beans", "Expression", True, "Expression", "(Object,String,Object[])", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
       - ["java.beans", "Expression", True, "Expression", "(Object,String,Object[])", "", "Argument[2].ArrayElement", "Argument[this]", "taint", "df-generated"]
-      - ["java.beans", "Expression", True, "getValue", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.beans", "Expression", True, "setValue", "(Object)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.beans", "FeatureDescriptor", True, "attributeNames", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.beans", "FeatureDescriptor", True, "getDisplayName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.beans", "FeatureDescriptor", True, "getName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.beans", "FeatureDescriptor", True, "getShortDescription", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.beans", "FeatureDescriptor", True, "getValue", "(String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.beans", "FeatureDescriptor", True, "setDisplayName", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.beans", "FeatureDescriptor", True, "setName", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.beans", "FeatureDescriptor", True, "setShortDescription", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.beans", "FeatureDescriptor", True, "setValue", "(String,Object)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.beans", "FeatureDescriptor", True, "setValue", "(String,Object)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.beans", "Expression", True, "getValue", "()", "", "Argument[this].SyntheticField[java.beans.Expression.value]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.beans", "Expression", True, "setValue", "(Object)", "", "Argument[0]", "Argument[this].SyntheticField[java.beans.Expression.value]", "value", "dfc-generated"]
+      - ["java.beans", "FeatureDescriptor", True, "attributeNames", "()", "", "Argument[this].SyntheticField[java.beans.FeatureDescriptor.table].MapKey", "ReturnValue.Element", "value", "dfc-generated"]
+      - ["java.beans", "FeatureDescriptor", True, "getDisplayName", "()", "", "Argument[this].SyntheticField[java.beans.FeatureDescriptor.displayName]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.beans", "FeatureDescriptor", True, "getDisplayName", "()", "", "Argument[this].SyntheticField[java.beans.FeatureDescriptor.name]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.beans", "FeatureDescriptor", True, "getName", "()", "", "Argument[this].SyntheticField[java.beans.FeatureDescriptor.name]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.beans", "FeatureDescriptor", True, "getShortDescription", "()", "", "Argument[this].SyntheticField[java.beans.FeatureDescriptor.displayName]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.beans", "FeatureDescriptor", True, "getShortDescription", "()", "", "Argument[this].SyntheticField[java.beans.FeatureDescriptor.name]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.beans", "FeatureDescriptor", True, "getShortDescription", "()", "", "Argument[this].SyntheticField[java.beans.FeatureDescriptor.shortDescription]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.beans", "FeatureDescriptor", True, "getValue", "(String)", "", "Argument[this].SyntheticField[java.beans.FeatureDescriptor.table].MapValue", "ReturnValue", "value", "dfc-generated"]
+      - ["java.beans", "FeatureDescriptor", True, "setDisplayName", "(String)", "", "Argument[0]", "Argument[this].SyntheticField[java.beans.FeatureDescriptor.displayName]", "value", "dfc-generated"]
+      - ["java.beans", "FeatureDescriptor", True, "setName", "(String)", "", "Argument[0]", "Argument[this].SyntheticField[java.beans.FeatureDescriptor.name]", "value", "dfc-generated"]
+      - ["java.beans", "FeatureDescriptor", True, "setShortDescription", "(String)", "", "Argument[0]", "Argument[this].SyntheticField[java.beans.FeatureDescriptor.shortDescription]", "value", "dfc-generated"]
+      - ["java.beans", "FeatureDescriptor", True, "setValue", "(String,Object)", "", "Argument[0]", "Argument[this].SyntheticField[java.beans.FeatureDescriptor.table].MapKey", "value", "dfc-generated"]
+      - ["java.beans", "FeatureDescriptor", True, "setValue", "(String,Object)", "", "Argument[1]", "Argument[this].SyntheticField[java.beans.FeatureDescriptor.table].MapValue", "value", "dfc-generated"]
       - ["java.beans", "IndexedPropertyChangeEvent", True, "IndexedPropertyChangeEvent", "(Object,String,Object,Object,int)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.beans", "IndexedPropertyChangeEvent", True, "IndexedPropertyChangeEvent", "(Object,String,Object,Object,int)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
       - ["java.beans", "IndexedPropertyChangeEvent", True, "IndexedPropertyChangeEvent", "(Object,String,Object,Object,int)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
@@ -89,26 +77,23 @@ extensions:
       - ["java.beans", "IndexedPropertyDescriptor", True, "setIndexedReadMethod", "(Method)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.beans", "IndexedPropertyDescriptor", True, "setIndexedWriteMethod", "(Method)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.beans", "IntrospectionException", True, "IntrospectionException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.beans", "Introspector", True, "decapitalize", "(String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.beans", "Introspector", True, "decapitalize", "(String)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
       - ["java.beans", "MethodDescriptor", True, "MethodDescriptor", "(Method)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.beans", "MethodDescriptor", True, "MethodDescriptor", "(Method,ParameterDescriptor[])", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.beans", "MethodDescriptor", True, "MethodDescriptor", "(Method,ParameterDescriptor[])", "", "Argument[1].ArrayElement", "Argument[this]", "taint", "df-generated"]
-      - ["java.beans", "MethodDescriptor", True, "getParameterDescriptors", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.beans", "MethodDescriptor", True, "MethodDescriptor", "(Method,ParameterDescriptor[])", "", "Argument[1]", "Argument[this].SyntheticField[java.beans.MethodDescriptor.parameterDescriptors]", "value", "dfc-generated"]
+      - ["java.beans", "MethodDescriptor", True, "getParameterDescriptors", "()", "", "Argument[this].SyntheticField[java.beans.MethodDescriptor.parameterDescriptors]", "ReturnValue", "value", "dfc-generated"]
       - ["java.beans", "PersistenceDelegate", True, "writeObject", "(Object,Encoder)", "", "Argument[0]", "Argument[1]", "taint", "df-generated"]
       - ["java.beans", "PersistenceDelegate", True, "writeObject", "(Object,Encoder)", "", "Argument[this]", "Argument[1]", "taint", "df-generated"]
-      - ["java.beans", "PropertyChangeEvent", True, "PropertyChangeEvent", "(Object,String,Object,Object)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.beans", "PropertyChangeEvent", True, "PropertyChangeEvent", "(Object,String,Object,Object)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["java.beans", "PropertyChangeEvent", True, "PropertyChangeEvent", "(Object,String,Object,Object)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
-      - ["java.beans", "PropertyChangeEvent", True, "PropertyChangeEvent", "(Object,String,Object,Object)", "", "Argument[3]", "Argument[this]", "taint", "df-generated"]
-      - ["java.beans", "PropertyChangeEvent", True, "getNewValue", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.beans", "PropertyChangeEvent", True, "getOldValue", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.beans", "PropertyChangeEvent", True, "getPropagationId", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.beans", "PropertyChangeEvent", True, "getPropertyName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.beans", "PropertyChangeEvent", True, "setPropagationId", "(Object)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.beans", "PropertyChangeEvent", True, "PropertyChangeEvent", "(Object,String,Object,Object)", "", "Argument[1]", "Argument[this].SyntheticField[java.beans.PropertyChangeEvent.propertyName]", "value", "dfc-generated"]
+      - ["java.beans", "PropertyChangeEvent", True, "PropertyChangeEvent", "(Object,String,Object,Object)", "", "Argument[2]", "Argument[this].SyntheticField[java.beans.PropertyChangeEvent.oldValue]", "value", "dfc-generated"]
+      - ["java.beans", "PropertyChangeEvent", True, "PropertyChangeEvent", "(Object,String,Object,Object)", "", "Argument[3]", "Argument[this].SyntheticField[java.beans.PropertyChangeEvent.newValue]", "value", "dfc-generated"]
+      - ["java.beans", "PropertyChangeEvent", True, "getNewValue", "()", "", "Argument[this].SyntheticField[java.beans.PropertyChangeEvent.newValue]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.beans", "PropertyChangeEvent", True, "getOldValue", "()", "", "Argument[this].SyntheticField[java.beans.PropertyChangeEvent.oldValue]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.beans", "PropertyChangeEvent", True, "getPropagationId", "()", "", "Argument[this].SyntheticField[java.beans.PropertyChangeEvent.propagationId]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.beans", "PropertyChangeEvent", True, "getPropertyName", "()", "", "Argument[this].SyntheticField[java.beans.PropertyChangeEvent.propertyName]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.beans", "PropertyChangeEvent", True, "setPropagationId", "(Object)", "", "Argument[0]", "Argument[this].SyntheticField[java.beans.PropertyChangeEvent.propagationId]", "value", "dfc-generated"]
       - ["java.beans", "PropertyChangeListener", True, "propertyChange", "(PropertyChangeEvent)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.beans", "PropertyChangeListenerProxy", True, "PropertyChangeListenerProxy", "(String,PropertyChangeListener)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.beans", "PropertyChangeListenerProxy", True, "PropertyChangeListenerProxy", "(String,PropertyChangeListener)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["java.beans", "PropertyChangeListenerProxy", True, "getPropertyName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.beans", "PropertyChangeListenerProxy", True, "PropertyChangeListenerProxy", "(String,PropertyChangeListener)", "", "Argument[0]", "Argument[this].SyntheticField[java.beans.PropertyChangeListenerProxy.propertyName]", "value", "dfc-generated"]
+      - ["java.beans", "PropertyChangeListenerProxy", True, "getPropertyName", "()", "", "Argument[this].SyntheticField[java.beans.PropertyChangeListenerProxy.propertyName]", "ReturnValue", "value", "dfc-generated"]
       - ["java.beans", "PropertyChangeSupport", True, "PropertyChangeSupport", "(Object)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.beans", "PropertyChangeSupport", True, "getPropertyChangeListeners", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.beans", "PropertyChangeSupport", True, "getPropertyChangeListeners", "(String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
@@ -122,38 +107,42 @@ extensions:
       - ["java.beans", "PropertyDescriptor", True, "setReadMethod", "(Method)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.beans", "PropertyDescriptor", True, "setWriteMethod", "(Method)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.beans", "PropertyEditor", True, "addPropertyChangeListener", "(PropertyChangeListener)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.beans", "PropertyEditorSupport", True, "PropertyEditorSupport", "(Object)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.beans", "PropertyEditorSupport", True, "getSource", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.beans", "PropertyEditorSupport", True, "setSource", "(Object)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.beans", "PropertyVetoException", True, "PropertyVetoException", "(String,PropertyChangeEvent)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.beans", "PropertyVetoException", True, "PropertyVetoException", "(String,PropertyChangeEvent)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["java.beans", "PropertyVetoException", True, "getPropertyChangeEvent", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.beans", "SimpleBeanInfo", True, "loadImage", "(String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["java.beans", "Statement", True, "Statement", "(Object,String,Object[])", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.beans", "Statement", True, "Statement", "(Object,String,Object[])", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["java.beans", "Statement", True, "Statement", "(Object,String,Object[])", "", "Argument[2].ArrayElement", "Argument[this]", "taint", "df-generated"]
-      - ["java.beans", "Statement", True, "getArguments", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.beans", "Statement", True, "getMethodName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.beans", "Statement", True, "getTarget", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.beans", "VetoableChangeListenerProxy", True, "VetoableChangeListenerProxy", "(String,VetoableChangeListener)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.beans", "VetoableChangeListenerProxy", True, "VetoableChangeListenerProxy", "(String,VetoableChangeListener)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["java.beans", "VetoableChangeListenerProxy", True, "getPropertyName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.beans", "PropertyEditor", True, "getCustomEditor", "()", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.beans", "PropertyEditor", True, "getJavaInitializationString", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.beans", "PropertyEditor", True, "getTags", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.beans", "PropertyEditor", True, "paintValue", "(Graphics,Rectangle)", "", "Argument[this]", "Argument[0]", "taint", "df-generated"]
+      - ["java.beans", "PropertyEditor", True, "setAsText", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.beans", "PropertyEditor", True, "setValue", "(Object)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.beans", "PropertyEditorSupport", True, "PropertyEditorSupport", "(Object)", "", "Argument[0]", "Argument[this].SyntheticField[java.beans.PropertyEditorSupport.source]", "value", "dfc-generated"]
+      - ["java.beans", "PropertyEditorSupport", True, "getSource", "()", "", "Argument[this].SyntheticField[java.beans.PropertyEditorSupport.source]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.beans", "PropertyEditorSupport", True, "setSource", "(Object)", "", "Argument[0]", "Argument[this].SyntheticField[java.beans.PropertyEditorSupport.source]", "value", "dfc-generated"]
+      - ["java.beans", "PropertyVetoException", True, "PropertyVetoException", "(String,PropertyChangeEvent)", "", "Argument[1]", "Argument[this].SyntheticField[java.beans.PropertyVetoException.evt]", "value", "dfc-generated"]
+      - ["java.beans", "PropertyVetoException", True, "getPropertyChangeEvent", "()", "", "Argument[this].SyntheticField[java.beans.PropertyVetoException.evt]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.beans", "Statement", True, "Statement", "(Object,String,Object[])", "", "Argument[0]", "Argument[this].SyntheticField[java.beans.Statement.target]", "value", "dfc-generated"]
+      - ["java.beans", "Statement", True, "Statement", "(Object,String,Object[])", "", "Argument[1]", "Argument[this].SyntheticField[java.beans.Statement.methodName]", "value", "dfc-generated"]
+      - ["java.beans", "Statement", True, "Statement", "(Object,String,Object[])", "", "Argument[2]", "Argument[this].SyntheticField[java.beans.Statement.arguments]", "value", "dfc-generated"]
+      - ["java.beans", "Statement", True, "getArguments", "()", "", "Argument[this].SyntheticField[java.beans.Statement.arguments]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.beans", "Statement", True, "getMethodName", "()", "", "Argument[this].SyntheticField[java.beans.Statement.methodName]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.beans", "Statement", True, "getTarget", "()", "", "Argument[this].SyntheticField[java.beans.Statement.target]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.beans", "VetoableChangeListenerProxy", True, "VetoableChangeListenerProxy", "(String,VetoableChangeListener)", "", "Argument[0]", "Argument[this].SyntheticField[java.beans.VetoableChangeListenerProxy.propertyName]", "value", "dfc-generated"]
+      - ["java.beans", "VetoableChangeListenerProxy", True, "getPropertyName", "()", "", "Argument[this].SyntheticField[java.beans.VetoableChangeListenerProxy.propertyName]", "ReturnValue", "value", "dfc-generated"]
       - ["java.beans", "VetoableChangeSupport", True, "VetoableChangeSupport", "(Object)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.beans", "VetoableChangeSupport", True, "getVetoableChangeListeners", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.beans", "VetoableChangeSupport", True, "getVetoableChangeListeners", "(String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.beans", "XMLDecoder", True, "createHandler", "(Object,ExceptionListener,ClassLoader)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["java.beans", "XMLDecoder", True, "createHandler", "(Object,ExceptionListener,ClassLoader)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
       - ["java.beans", "XMLDecoder", True, "createHandler", "(Object,ExceptionListener,ClassLoader)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
-      - ["java.beans", "XMLDecoder", True, "getExceptionListener", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.beans", "XMLDecoder", True, "getOwner", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.beans", "XMLDecoder", True, "getExceptionListener", "()", "", "Argument[this].SyntheticField[java.beans.XMLDecoder.handler].SyntheticField[com.sun.beans.decoder.DocumentHandler.listener]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.beans", "XMLDecoder", True, "getOwner", "()", "", "Argument[this].SyntheticField[java.beans.XMLDecoder.owner]", "ReturnValue", "value", "dfc-generated"]
       - ["java.beans", "XMLDecoder", True, "readObject", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.beans", "XMLDecoder", True, "setExceptionListener", "(ExceptionListener)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.beans", "XMLDecoder", True, "setOwner", "(Object)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.beans", "XMLDecoder", True, "setExceptionListener", "(ExceptionListener)", "", "Argument[0]", "Argument[this].SyntheticField[java.beans.XMLDecoder.handler].SyntheticField[com.sun.beans.decoder.DocumentHandler.listener]", "value", "dfc-generated"]
+      - ["java.beans", "XMLDecoder", True, "setOwner", "(Object)", "", "Argument[0]", "Argument[this].SyntheticField[java.beans.XMLDecoder.owner]", "value", "dfc-generated"]
       - ["java.beans", "XMLEncoder", True, "XMLEncoder", "(OutputStream)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.beans", "XMLEncoder", True, "XMLEncoder", "(OutputStream,String,boolean,int)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.beans", "XMLEncoder", True, "XMLEncoder", "(OutputStream,String,boolean,int)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["java.beans", "XMLEncoder", True, "getOwner", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.beans", "XMLEncoder", True, "setOwner", "(Object)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.beans", "XMLEncoder", True, "getOwner", "()", "", "Argument[this].SyntheticField[java.beans.XMLEncoder.owner]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.beans", "XMLEncoder", True, "setOwner", "(Object)", "", "Argument[0]", "Argument[this].SyntheticField[java.beans.XMLEncoder.owner]", "value", "dfc-generated"]
+      - ["java.beans", "XMLEncoder", True, "writeObject", "(Object)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
   - addsTo:
       pack: codeql/java-all
       extensible: neutralModel
@@ -162,17 +151,11 @@ extensions:
       - ["java.beans", "BeanDescriptor", "BeanDescriptor", "(Class,Class)", "summary", "df-generated"]
       - ["java.beans", "BeanDescriptor", "getBeanClass", "()", "summary", "df-generated"]
       - ["java.beans", "BeanDescriptor", "getCustomizerClass", "()", "summary", "df-generated"]
-      - ["java.beans", "BeanInfo", "getAdditionalBeanInfo", "()", "summary", "df-generated"]
-      - ["java.beans", "BeanInfo", "getDefaultEventIndex", "()", "summary", "df-generated"]
-      - ["java.beans", "BeanInfo", "getDefaultPropertyIndex", "()", "summary", "df-generated"]
-      - ["java.beans", "BeanInfo", "getIcon", "(int)", "summary", "df-generated"]
       - ["java.beans", "Beans", "isDesignTime", "()", "summary", "df-generated"]
       - ["java.beans", "Beans", "isGuiAvailable", "()", "summary", "df-generated"]
       - ["java.beans", "Beans", "isInstanceOf", "(Object,Class)", "summary", "df-generated"]
       - ["java.beans", "Beans", "setDesignTime", "(boolean)", "summary", "df-generated"]
       - ["java.beans", "Beans", "setGuiAvailable", "(boolean)", "summary", "df-generated"]
-      - ["java.beans", "DesignMode", "isDesignTime", "()", "summary", "df-generated"]
-      - ["java.beans", "DesignMode", "setDesignTime", "(boolean)", "summary", "df-generated"]
       - ["java.beans", "Encoder", "setPersistenceDelegate", "(Class,PersistenceDelegate)", "summary", "df-generated"]
       - ["java.beans", "EventHandler", "create", "(Class,Object,String)", "summary", "df-generated"]
       - ["java.beans", "EventHandler", "create", "(Class,Object,String,String)", "summary", "df-generated"]
@@ -185,7 +168,7 @@ extensions:
       - ["java.beans", "EventSetDescriptor", "isUnicast", "()", "summary", "df-generated"]
       - ["java.beans", "EventSetDescriptor", "setInDefaultEventSet", "(boolean)", "summary", "df-generated"]
       - ["java.beans", "EventSetDescriptor", "setUnicast", "(boolean)", "summary", "df-generated"]
-      - ["java.beans", "ExceptionListener", "exceptionThrown", "(Exception)", "summary", "df-generated"]
+      - ["java.beans", "Expression", "execute", "()", "summary", "df-generated"]
       - ["java.beans", "FeatureDescriptor", "isExpert", "()", "summary", "df-generated"]
       - ["java.beans", "FeatureDescriptor", "isHidden", "()", "summary", "df-generated"]
       - ["java.beans", "FeatureDescriptor", "isPreferred", "()", "summary", "df-generated"]
@@ -227,20 +210,21 @@ extensions:
       - ["java.beans", "PropertyDescriptor", "setBound", "(boolean)", "summary", "df-generated"]
       - ["java.beans", "PropertyDescriptor", "setConstrained", "(boolean)", "summary", "df-generated"]
       - ["java.beans", "PropertyDescriptor", "setPropertyEditorClass", "(Class)", "summary", "df-generated"]
-      - ["java.beans", "PropertyEditor", "getCustomEditor", "()", "summary", "df-generated"]
-      - ["java.beans", "PropertyEditor", "getJavaInitializationString", "()", "summary", "df-generated"]
-      - ["java.beans", "PropertyEditor", "getTags", "()", "summary", "df-generated"]
-      - ["java.beans", "PropertyEditor", "isPaintable", "()", "summary", "df-generated"]
-      - ["java.beans", "PropertyEditor", "paintValue", "(Graphics,Rectangle)", "summary", "df-generated"]
-      - ["java.beans", "PropertyEditor", "removePropertyChangeListener", "(PropertyChangeListener)", "summary", "df-generated"]
-      - ["java.beans", "PropertyEditor", "supportsCustomEditor", "()", "summary", "df-generated"]
       - ["java.beans", "PropertyEditorManager", "findEditor", "(Class)", "summary", "df-generated"]
       - ["java.beans", "PropertyEditorManager", "getEditorSearchPath", "()", "summary", "df-generated"]
       - ["java.beans", "PropertyEditorManager", "registerEditor", "(Class,Class)", "summary", "df-generated"]
       - ["java.beans", "PropertyEditorManager", "setEditorSearchPath", "(String[])", "summary", "df-generated"]
       - ["java.beans", "PropertyEditorSupport", "firePropertyChange", "()", "summary", "df-generated"]
+      - ["java.beans", "PropertyEditorSupport", "isPaintable", "()", "summary", "df-generated"]
+      - ["java.beans", "PropertyEditorSupport", "removePropertyChangeListener", "(PropertyChangeListener)", "summary", "df-generated"]
+      - ["java.beans", "PropertyEditorSupport", "supportsCustomEditor", "()", "summary", "df-generated"]
+      - ["java.beans", "SimpleBeanInfo", "getAdditionalBeanInfo", "()", "summary", "df-generated"]
+      - ["java.beans", "SimpleBeanInfo", "getDefaultEventIndex", "()", "summary", "df-generated"]
+      - ["java.beans", "SimpleBeanInfo", "getDefaultPropertyIndex", "()", "summary", "df-generated"]
+      - ["java.beans", "SimpleBeanInfo", "getIcon", "(int)", "summary", "df-generated"]
+      - ["java.beans", "SimpleBeanInfo", "loadImage", "(String)", "summary", "df-generated"]
       - ["java.beans", "Statement", "execute", "()", "summary", "df-generated"]
-      - ["java.beans", "VetoableChangeListener", "vetoableChange", "(PropertyChangeEvent)", "summary", "df-generated"]
+      - ["java.beans", "VetoableChangeListenerProxy", "vetoableChange", "(PropertyChangeEvent)", "summary", "df-generated"]
       - ["java.beans", "VetoableChangeSupport", "addVetoableChangeListener", "(String,VetoableChangeListener)", "summary", "df-generated"]
       - ["java.beans", "VetoableChangeSupport", "addVetoableChangeListener", "(VetoableChangeListener)", "summary", "df-generated"]
       - ["java.beans", "VetoableChangeSupport", "fireVetoableChange", "(PropertyChangeEvent)", "summary", "df-generated"]
@@ -250,8 +234,6 @@ extensions:
       - ["java.beans", "VetoableChangeSupport", "hasListeners", "(String)", "summary", "df-generated"]
       - ["java.beans", "VetoableChangeSupport", "removeVetoableChangeListener", "(String,VetoableChangeListener)", "summary", "df-generated"]
       - ["java.beans", "VetoableChangeSupport", "removeVetoableChangeListener", "(VetoableChangeListener)", "summary", "df-generated"]
-      - ["java.beans", "Visibility", "avoidingGui", "()", "summary", "df-generated"]
-      - ["java.beans", "Visibility", "dontUseGui", "()", "summary", "df-generated"]
-      - ["java.beans", "Visibility", "needsGui", "()", "summary", "df-generated"]
-      - ["java.beans", "Visibility", "okToUseGui", "()", "summary", "df-generated"]
+      - ["java.beans", "XMLDecoder", "close", "()", "summary", "df-generated"]
+      - ["java.beans", "XMLEncoder", "close", "()", "summary", "df-generated"]
       - ["java.beans", "XMLEncoder", "flush", "()", "summary", "df-generated"]
diff --git a/java/ql/lib/ext/generated/java.io.model.yml b/java/ql/lib/ext/generated/java.io.model.yml
index 8ecad6c31d6..277919d48d0 100644
--- a/java/ql/lib/ext/generated/java.io.model.yml
+++ b/java/ql/lib/ext/generated/java.io.model.yml
@@ -4,21 +4,15 @@ extensions:
       pack: codeql/java-all
       extensible: summaryModel
     data:
-      - ["java.io", "BufferedOutputStream", True, "BufferedOutputStream", "(OutputStream)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.io", "BufferedOutputStream", True, "BufferedOutputStream", "(OutputStream,int)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.io", "BufferedOutputStream", True, "BufferedOutputStream", "(OutputStream)", "", "Argument[0]", "Argument[this]", "taint", "dfc-generated"]
+      - ["java.io", "BufferedOutputStream", True, "BufferedOutputStream", "(OutputStream,int)", "", "Argument[0]", "Argument[this]", "taint", "dfc-generated"]
       - ["java.io", "BufferedWriter", True, "BufferedWriter", "(Writer)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.io", "BufferedWriter", True, "BufferedWriter", "(Writer,int)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.io", "ByteArrayOutputStream", True, "writeBytes", "(byte[])", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.io", "ByteArrayOutputStream", True, "writeBytes", "(byte[])", "", "Argument[0]", "Argument[this]", "taint", "dfc-generated"]
       - ["java.io", "CharArrayWriter", True, "writeTo", "(Writer)", "", "Argument[this]", "Argument[0]", "taint", "df-generated"]
       - ["java.io", "CharConversionException", True, "CharConversionException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.io", "Console", False, "format", "(String,Object[])", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.io", "Console", False, "format", "(String,Object[])", "", "Argument[1].ArrayElement", "Argument[this]", "taint", "df-generated"]
-      - ["java.io", "Console", False, "format", "(String,Object[])", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["java.io", "Console", False, "printf", "(String,Object[])", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.io", "Console", False, "printf", "(String,Object[])", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["java.io", "Console", False, "printf", "(String,Object[])", "", "Argument[1].ArrayElement", "Argument[this]", "taint", "df-generated"]
-      - ["java.io", "Console", False, "printf", "(String,Object[])", "", "Argument[1].ArrayElement", "ReturnValue", "taint", "df-generated"]
-      - ["java.io", "Console", False, "printf", "(String,Object[])", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.io", "Console", False, "format", "(String,Object[])", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.io", "Console", False, "printf", "(String,Object[])", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
       - ["java.io", "Console", False, "readLine", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.io", "Console", False, "readLine", "(String,Object[])", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.io", "Console", False, "readLine", "(String,Object[])", "", "Argument[1].ArrayElement", "Argument[this]", "taint", "df-generated"]
@@ -31,30 +25,30 @@ extensions:
       - ["java.io", "Console", False, "writer", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.io", "DataInputStream", True, "readUTF", "(DataInput)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["java.io", "DataOutput", True, "write", "(byte[])", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.io", "DataOutput", True, "write", "(byte[],int,int)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.io", "DataOutput", True, "writeBytes", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.io", "DataOutput", True, "writeChars", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.io", "DataOutput", True, "writeUTF", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.io", "DataOutputStream", True, "DataOutputStream", "(OutputStream)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.io", "DataOutputStream", True, "DataOutputStream", "(OutputStream)", "", "Argument[0]", "Argument[this]", "taint", "dfc-generated"]
       - ["java.io", "EOFException", True, "EOFException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.io", "Externalizable", True, "readExternal", "(ObjectInput)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.io", "Externalizable", True, "writeExternal", "(ObjectOutput)", "", "Argument[this]", "Argument[0]", "taint", "df-generated"]
+      - ["java.io", "File", True, "createTempFile", "(String,String)", "", "Argument[0]", "ReturnValue", "taint", "dfc-generated"]
+      - ["java.io", "File", True, "createTempFile", "(String,String)", "", "Argument[1]", "ReturnValue", "taint", "dfc-generated"]
+      - ["java.io", "File", True, "createTempFile", "(String,String,File)", "", "Argument[0]", "ReturnValue", "taint", "dfc-generated"]
+      - ["java.io", "File", True, "createTempFile", "(String,String,File)", "", "Argument[1]", "ReturnValue", "taint", "dfc-generated"]
+      - ["java.io", "File", True, "createTempFile", "(String,String,File)", "", "Argument[2]", "ReturnValue", "taint", "dfc-generated"]
       - ["java.io", "FileInputStream", True, "getChannel", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.io", "FileInputStream", True, "getFD", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.io", "FileNotFoundException", True, "FileNotFoundException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.io", "FileOutputStream", True, "FileOutputStream", "(File)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.io", "FileOutputStream", True, "FileOutputStream", "(File,boolean)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.io", "FileOutputStream", True, "FileOutputStream", "(FileDescriptor)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.io", "FileOutputStream", True, "FileOutputStream", "(FileDescriptor)", "", "Argument[this]", "Argument[0]", "taint", "df-generated"]
+      - ["java.io", "FileOutputStream", True, "FileOutputStream", "(FileDescriptor)", "", "Argument[0]", "Argument[this].SyntheticField[java.io.FileOutputStream.fd]", "value", "dfc-generated"]
       - ["java.io", "FileOutputStream", True, "FileOutputStream", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.io", "FileOutputStream", True, "FileOutputStream", "(String,boolean)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.io", "FileOutputStream", True, "getChannel", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.io", "FileOutputStream", True, "getFD", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.io", "FilePermission", False, "FilePermission", "(String,String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.io", "FileReader", True, "FileReader", "(File)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.io", "FileReader", True, "FileReader", "(File,Charset)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.io", "FileReader", True, "FileReader", "(FileDescriptor)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.io", "FileReader", True, "FileReader", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.io", "FileReader", True, "FileReader", "(String,Charset)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.io", "FileOutputStream", True, "getFD", "()", "", "Argument[this].SyntheticField[java.io.FileOutputStream.fd]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.io", "FilePermission", False, "FilePermission", "(String,String)", "", "Argument[0]", "Argument[this]", "taint", "dfc-generated"]
       - ["java.io", "FileWriter", True, "FileWriter", "(File)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.io", "FileWriter", True, "FileWriter", "(File,Charset)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.io", "FileWriter", True, "FileWriter", "(File,Charset,boolean)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
@@ -70,27 +64,24 @@ extensions:
       - ["java.io", "IOException", True, "IOException", "(Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.io", "InterruptedIOException", True, "InterruptedIOException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.io", "InvalidClassException", True, "InvalidClassException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.io", "InvalidClassException", True, "InvalidClassException", "(String,String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.io", "InvalidClassException", True, "InvalidClassException", "(String,String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.io", "InvalidClassException", True, "InvalidClassException", "(String,String)", "", "Argument[0]", "Argument[this].Field[java.io.InvalidClassException.classname]", "value", "dfc-generated"]
       - ["java.io", "InvalidObjectException", True, "InvalidObjectException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.io", "LineNumberInputStream", True, "LineNumberInputStream", "(InputStream)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.io", "LineNumberReader", True, "LineNumberReader", "(Reader)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.io", "LineNumberReader", True, "LineNumberReader", "(Reader,int)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.io", "LineNumberReader", True, "LineNumberReader", "(Reader)", "", "Argument[0]", "Argument[this]", "taint", "dfc-generated"]
+      - ["java.io", "LineNumberReader", True, "LineNumberReader", "(Reader,int)", "", "Argument[0]", "Argument[this]", "taint", "dfc-generated"]
       - ["java.io", "NotActiveException", True, "NotActiveException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.io", "NotSerializableException", True, "NotSerializableException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.io", "ObjectInputFilter$Config", False, "createFilter", "(String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["java.io", "ObjectInputFilter", True, "allowFilter", "(Predicate,ObjectInputFilter$Status)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["java.io", "ObjectInputFilter", True, "merge", "(ObjectInputFilter,ObjectInputFilter)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["java.io", "ObjectInputFilter", True, "merge", "(ObjectInputFilter,ObjectInputFilter)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["java.io", "ObjectInputFilter", True, "merge", "(ObjectInputFilter,ObjectInputFilter)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
       - ["java.io", "ObjectInputFilter", True, "rejectFilter", "(Predicate,ObjectInputFilter$Status)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["java.io", "ObjectInputFilter", True, "rejectUndecidedClass", "(ObjectInputFilter)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["java.io", "ObjectInputStream$GetField", True, "get", "(String,Object)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["java.io", "ObjectInputStream$GetField", True, "get", "(String,Object)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.io", "ObjectInputStream$GetField", True, "get", "(String,Object)", "", "Argument[1]", "ReturnValue", "value", "dfc-generated"]
       - ["java.io", "ObjectInputStream$GetField", True, "getObjectStreamClass", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.io", "ObjectInputStream", True, "getObjectInputFilter", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.io", "ObjectInputStream", True, "getObjectInputFilter", "()", "", "Argument[this].SyntheticField[java.io.ObjectInputStream.serialFilter]", "ReturnValue", "value", "dfc-generated"]
       - ["java.io", "ObjectInputStream", True, "readFields", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.io", "ObjectInputStream", True, "readUnshared", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.io", "ObjectInputStream", True, "setObjectInputFilter", "(ObjectInputFilter)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.io", "ObjectInputStream", True, "setObjectInputFilter", "(ObjectInputFilter)", "", "Argument[0]", "Argument[this].SyntheticField[java.io.ObjectInputStream.serialFilter]", "value", "dfc-generated"]
       - ["java.io", "ObjectOutput", True, "writeObject", "(Object)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.io", "ObjectOutputStream$PutField", True, "put", "(String,Object)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
       - ["java.io", "ObjectOutputStream$PutField", True, "write", "(ObjectOutput)", "", "Argument[this]", "Argument[0]", "taint", "df-generated"]
@@ -100,9 +91,9 @@ extensions:
       - ["java.io", "ObjectStreamClass", True, "getField", "(String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.io", "ObjectStreamClass", True, "getFields", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.io", "ObjectStreamClass", True, "getName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.io", "ObjectStreamField", True, "ObjectStreamField", "(String,Class)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.io", "ObjectStreamField", True, "ObjectStreamField", "(String,Class,boolean)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.io", "ObjectStreamField", True, "getName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.io", "ObjectStreamField", True, "ObjectStreamField", "(String,Class)", "", "Argument[0]", "Argument[this].SyntheticField[java.io.ObjectStreamField.name]", "value", "dfc-generated"]
+      - ["java.io", "ObjectStreamField", True, "ObjectStreamField", "(String,Class,boolean)", "", "Argument[0]", "Argument[this].SyntheticField[java.io.ObjectStreamField.name]", "value", "dfc-generated"]
+      - ["java.io", "ObjectStreamField", True, "getName", "()", "", "Argument[this].SyntheticField[java.io.ObjectStreamField.name]", "ReturnValue", "value", "dfc-generated"]
       - ["java.io", "ObjectStreamField", True, "getTypeString", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.io", "OutputStreamWriter", True, "OutputStreamWriter", "(OutputStream)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.io", "OutputStreamWriter", True, "OutputStreamWriter", "(OutputStream,Charset)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
@@ -122,10 +113,10 @@ extensions:
       - ["java.io", "PrintStream", True, "PrintStream", "(File)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.io", "PrintStream", True, "PrintStream", "(File,Charset)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.io", "PrintStream", True, "PrintStream", "(File,String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.io", "PrintStream", True, "PrintStream", "(OutputStream)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.io", "PrintStream", True, "PrintStream", "(OutputStream,boolean)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.io", "PrintStream", True, "PrintStream", "(OutputStream,boolean,Charset)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.io", "PrintStream", True, "PrintStream", "(OutputStream,boolean,String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.io", "PrintStream", True, "PrintStream", "(OutputStream)", "", "Argument[0]", "Argument[this]", "taint", "dfc-generated"]
+      - ["java.io", "PrintStream", True, "PrintStream", "(OutputStream,boolean)", "", "Argument[0]", "Argument[this]", "taint", "dfc-generated"]
+      - ["java.io", "PrintStream", True, "PrintStream", "(OutputStream,boolean,Charset)", "", "Argument[0]", "Argument[this]", "taint", "dfc-generated"]
+      - ["java.io", "PrintStream", True, "PrintStream", "(OutputStream,boolean,String)", "", "Argument[0]", "Argument[this]", "taint", "dfc-generated"]
       - ["java.io", "PrintStream", True, "PrintStream", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.io", "PrintStream", True, "PrintStream", "(String,Charset)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.io", "PrintStream", True, "PrintStream", "(String,String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
@@ -136,23 +127,9 @@ extensions:
       - ["java.io", "PrintStream", True, "format", "(String,Object[])", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.io", "PrintStream", True, "format", "(String,Object[])", "", "Argument[1].ArrayElement", "Argument[this]", "taint", "df-generated"]
       - ["java.io", "PrintStream", True, "format", "(String,Object[])", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["java.io", "PrintStream", True, "print", "(Object)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.io", "PrintStream", True, "print", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.io", "PrintStream", True, "print", "(char[])", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.io", "PrintStream", True, "printf", "(Locale,String,Object[])", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.io", "PrintStream", True, "printf", "(Locale,String,Object[])", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["java.io", "PrintStream", True, "printf", "(Locale,String,Object[])", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["java.io", "PrintStream", True, "printf", "(Locale,String,Object[])", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["java.io", "PrintStream", True, "printf", "(Locale,String,Object[])", "", "Argument[2].ArrayElement", "Argument[this]", "taint", "df-generated"]
-      - ["java.io", "PrintStream", True, "printf", "(Locale,String,Object[])", "", "Argument[2].ArrayElement", "ReturnValue", "taint", "df-generated"]
-      - ["java.io", "PrintStream", True, "printf", "(Locale,String,Object[])", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.io", "PrintStream", True, "printf", "(String,Object[])", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.io", "PrintStream", True, "printf", "(String,Object[])", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["java.io", "PrintStream", True, "printf", "(String,Object[])", "", "Argument[1].ArrayElement", "Argument[this]", "taint", "df-generated"]
-      - ["java.io", "PrintStream", True, "printf", "(String,Object[])", "", "Argument[1].ArrayElement", "ReturnValue", "taint", "df-generated"]
-      - ["java.io", "PrintStream", True, "printf", "(String,Object[])", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.io", "PrintStream", True, "println", "(Object)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.io", "PrintStream", True, "println", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.io", "PrintStream", True, "printf", "(Locale,String,Object[])", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.io", "PrintStream", True, "printf", "(String,Object[])", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
       - ["java.io", "PrintStream", True, "println", "(char[])", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.io", "PrintStream", True, "writeBytes", "(byte[])", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.io", "PrintWriter", True, "PrintWriter", "(OutputStream)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
@@ -167,23 +144,9 @@ extensions:
       - ["java.io", "PrintWriter", True, "format", "(String,Object[])", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.io", "PrintWriter", True, "format", "(String,Object[])", "", "Argument[1].ArrayElement", "Argument[this]", "taint", "df-generated"]
       - ["java.io", "PrintWriter", True, "format", "(String,Object[])", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["java.io", "PrintWriter", True, "print", "(Object)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.io", "PrintWriter", True, "print", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.io", "PrintWriter", True, "print", "(char[])", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.io", "PrintWriter", True, "printf", "(Locale,String,Object[])", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.io", "PrintWriter", True, "printf", "(Locale,String,Object[])", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["java.io", "PrintWriter", True, "printf", "(Locale,String,Object[])", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["java.io", "PrintWriter", True, "printf", "(Locale,String,Object[])", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["java.io", "PrintWriter", True, "printf", "(Locale,String,Object[])", "", "Argument[2].ArrayElement", "Argument[this]", "taint", "df-generated"]
-      - ["java.io", "PrintWriter", True, "printf", "(Locale,String,Object[])", "", "Argument[2].ArrayElement", "ReturnValue", "taint", "df-generated"]
-      - ["java.io", "PrintWriter", True, "printf", "(Locale,String,Object[])", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.io", "PrintWriter", True, "printf", "(String,Object[])", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.io", "PrintWriter", True, "printf", "(String,Object[])", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["java.io", "PrintWriter", True, "printf", "(String,Object[])", "", "Argument[1].ArrayElement", "Argument[this]", "taint", "df-generated"]
-      - ["java.io", "PrintWriter", True, "printf", "(String,Object[])", "", "Argument[1].ArrayElement", "ReturnValue", "taint", "df-generated"]
-      - ["java.io", "PrintWriter", True, "printf", "(String,Object[])", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.io", "PrintWriter", True, "println", "(Object)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.io", "PrintWriter", True, "println", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.io", "PrintWriter", True, "printf", "(Locale,String,Object[])", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.io", "PrintWriter", True, "printf", "(String,Object[])", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
       - ["java.io", "PrintWriter", True, "println", "(char[])", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.io", "PushbackInputStream", True, "PushbackInputStream", "(InputStream)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.io", "PushbackInputStream", True, "PushbackInputStream", "(InputStream,int)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
@@ -199,8 +162,10 @@ extensions:
       - ["java.io", "RandomAccessFile", True, "getFD", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.io", "Reader", True, "transferTo", "(Writer)", "", "Argument[this]", "Argument[0]", "taint", "df-generated"]
       - ["java.io", "SequenceInputStream", True, "SequenceInputStream", "(Enumeration)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["java.io", "SerializablePermission", False, "SerializablePermission", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.io", "SerializablePermission", False, "SerializablePermission", "(String,String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.io", "SequenceInputStream", True, "SequenceInputStream", "(InputStream,InputStream)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.io", "SequenceInputStream", True, "SequenceInputStream", "(InputStream,InputStream)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.io", "SerializablePermission", False, "SerializablePermission", "(String)", "", "Argument[0]", "Argument[this]", "taint", "dfc-generated"]
+      - ["java.io", "SerializablePermission", False, "SerializablePermission", "(String,String)", "", "Argument[0]", "Argument[this]", "taint", "dfc-generated"]
       - ["java.io", "StreamCorruptedException", True, "StreamCorruptedException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.io", "StreamTokenizer", True, "StreamTokenizer", "(InputStream)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.io", "StreamTokenizer", True, "StreamTokenizer", "(Reader)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
@@ -211,43 +176,58 @@ extensions:
       - ["java.io", "UncheckedIOException", True, "UncheckedIOException", "(String,IOException)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.io", "UncheckedIOException", True, "UncheckedIOException", "(String,IOException)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
       - ["java.io", "UnsupportedEncodingException", True, "UnsupportedEncodingException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.io", "WriteAbortedException", True, "WriteAbortedException", "(String,Exception)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.io", "WriteAbortedException", True, "WriteAbortedException", "(String,Exception)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.io", "WriteAbortedException", True, "WriteAbortedException", "(String,Exception)", "", "Argument[1]", "Argument[this].Field[java.io.WriteAbortedException.detail]", "value", "dfc-generated"]
   - addsTo:
       pack: codeql/java-all
       extensible: neutralModel
     data:
+      - ["java.io", "BufferedInputStream", "available", "()", "summary", "df-generated"]
+      - ["java.io", "BufferedInputStream", "mark", "(int)", "summary", "df-generated"]
+      - ["java.io", "BufferedInputStream", "markSupported", "()", "summary", "df-generated"]
+      - ["java.io", "BufferedInputStream", "reset", "()", "summary", "df-generated"]
+      - ["java.io", "BufferedInputStream", "skip", "(long)", "summary", "df-generated"]
       - ["java.io", "BufferedReader", "lines", "()", "summary", "df-generated"]
+      - ["java.io", "BufferedReader", "mark", "(int)", "summary", "df-generated"]
+      - ["java.io", "BufferedReader", "markSupported", "()", "summary", "df-generated"]
+      - ["java.io", "BufferedReader", "ready", "()", "summary", "df-generated"]
+      - ["java.io", "BufferedReader", "reset", "()", "summary", "df-generated"]
+      - ["java.io", "BufferedReader", "skip", "(long)", "summary", "df-generated"]
+      - ["java.io", "BufferedWriter", "flush", "()", "summary", "df-generated"]
       - ["java.io", "BufferedWriter", "newLine", "()", "summary", "df-generated"]
+      - ["java.io", "ByteArrayInputStream", "available", "()", "summary", "df-generated"]
+      - ["java.io", "ByteArrayInputStream", "mark", "(int)", "summary", "df-generated"]
+      - ["java.io", "ByteArrayInputStream", "markSupported", "()", "summary", "df-generated"]
+      - ["java.io", "ByteArrayInputStream", "reset", "()", "summary", "df-generated"]
+      - ["java.io", "ByteArrayInputStream", "skip", "(long)", "summary", "df-generated"]
       - ["java.io", "ByteArrayOutputStream", "ByteArrayOutputStream", "(int)", "summary", "df-generated"]
       - ["java.io", "ByteArrayOutputStream", "reset", "()", "summary", "df-generated"]
       - ["java.io", "ByteArrayOutputStream", "size", "()", "summary", "df-generated"]
+      - ["java.io", "CharArrayReader", "mark", "(int)", "summary", "df-generated"]
+      - ["java.io", "CharArrayReader", "markSupported", "()", "summary", "df-generated"]
+      - ["java.io", "CharArrayReader", "ready", "()", "summary", "df-generated"]
+      - ["java.io", "CharArrayReader", "reset", "()", "summary", "df-generated"]
+      - ["java.io", "CharArrayReader", "skip", "(long)", "summary", "df-generated"]
       - ["java.io", "CharArrayWriter", "CharArrayWriter", "(int)", "summary", "df-generated"]
+      - ["java.io", "CharArrayWriter", "flush", "()", "summary", "df-generated"]
       - ["java.io", "CharArrayWriter", "reset", "()", "summary", "df-generated"]
       - ["java.io", "CharArrayWriter", "size", "()", "summary", "df-generated"]
       - ["java.io", "Console", "charset", "()", "summary", "df-generated"]
-      - ["java.io", "DataInput", "readBoolean", "()", "summary", "df-generated"]
-      - ["java.io", "DataInput", "readByte", "()", "summary", "df-generated"]
-      - ["java.io", "DataInput", "readChar", "()", "summary", "df-generated"]
-      - ["java.io", "DataInput", "readDouble", "()", "summary", "df-generated"]
-      - ["java.io", "DataInput", "readFloat", "()", "summary", "df-generated"]
-      - ["java.io", "DataInput", "readInt", "()", "summary", "df-generated"]
-      - ["java.io", "DataInput", "readLong", "()", "summary", "df-generated"]
-      - ["java.io", "DataInput", "readShort", "()", "summary", "df-generated"]
-      - ["java.io", "DataInput", "readUnsignedByte", "()", "summary", "df-generated"]
-      - ["java.io", "DataInput", "readUnsignedShort", "()", "summary", "df-generated"]
-      - ["java.io", "DataInput", "skipBytes", "(int)", "summary", "df-generated"]
-      - ["java.io", "DataOutput", "write", "(byte[],int,int)", "summary", "df-generated"]
-      - ["java.io", "DataOutput", "write", "(int)", "summary", "df-generated"]
-      - ["java.io", "DataOutput", "writeBoolean", "(boolean)", "summary", "df-generated"]
-      - ["java.io", "DataOutput", "writeByte", "(int)", "summary", "df-generated"]
-      - ["java.io", "DataOutput", "writeChar", "(int)", "summary", "df-generated"]
-      - ["java.io", "DataOutput", "writeDouble", "(double)", "summary", "df-generated"]
-      - ["java.io", "DataOutput", "writeFloat", "(float)", "summary", "df-generated"]
-      - ["java.io", "DataOutput", "writeInt", "(int)", "summary", "df-generated"]
-      - ["java.io", "DataOutput", "writeLong", "(long)", "summary", "df-generated"]
-      - ["java.io", "DataOutput", "writeShort", "(int)", "summary", "df-generated"]
+      - ["java.io", "Console", "flush", "()", "summary", "df-generated"]
+      - ["java.io", "DataInputStream", "readBoolean", "()", "summary", "df-generated"]
+      - ["java.io", "DataInputStream", "readByte", "()", "summary", "df-generated"]
+      - ["java.io", "DataInputStream", "readChar", "()", "summary", "df-generated"]
+      - ["java.io", "DataInputStream", "readDouble", "()", "summary", "df-generated"]
+      - ["java.io", "DataInputStream", "readFloat", "()", "summary", "df-generated"]
+      - ["java.io", "DataInputStream", "readShort", "()", "summary", "df-generated"]
+      - ["java.io", "DataInputStream", "readUnsignedByte", "()", "summary", "df-generated"]
+      - ["java.io", "DataInputStream", "readUnsignedShort", "()", "summary", "df-generated"]
+      - ["java.io", "DataInputStream", "skipBytes", "(int)", "summary", "df-generated"]
       - ["java.io", "DataOutputStream", "size", "()", "summary", "df-generated"]
+      - ["java.io", "DataOutputStream", "writeByte", "(int)", "summary", "df-generated"]
+      - ["java.io", "DataOutputStream", "writeChar", "(int)", "summary", "df-generated"]
+      - ["java.io", "DataOutputStream", "writeDouble", "(double)", "summary", "df-generated"]
+      - ["java.io", "DataOutputStream", "writeFloat", "(float)", "summary", "df-generated"]
+      - ["java.io", "DataOutputStream", "writeShort", "(int)", "summary", "df-generated"]
       - ["java.io", "File", "canExecute", "()", "summary", "df-generated"]
       - ["java.io", "File", "canRead", "()", "summary", "df-generated"]
       - ["java.io", "File", "canWrite", "()", "summary", "df-generated"]
@@ -274,7 +254,21 @@ extensions:
       - ["java.io", "File", "setWritable", "(boolean,boolean)", "summary", "df-generated"]
       - ["java.io", "FileDescriptor", "sync", "()", "summary", "df-generated"]
       - ["java.io", "FileDescriptor", "valid", "()", "summary", "df-generated"]
-      - ["java.io", "Flushable", "flush", "()", "summary", "df-generated"]
+      - ["java.io", "FileInputStream", "available", "()", "summary", "df-generated"]
+      - ["java.io", "FileInputStream", "skip", "(long)", "summary", "df-generated"]
+      - ["java.io", "FilePermission", "implies", "(Permission)", "summary", "df-generated"]
+      - ["java.io", "FilePermission", "newPermissionCollection", "()", "summary", "df-generated"]
+      - ["java.io", "FilterInputStream", "available", "()", "summary", "df-generated"]
+      - ["java.io", "FilterInputStream", "mark", "(int)", "summary", "df-generated"]
+      - ["java.io", "FilterInputStream", "markSupported", "()", "summary", "df-generated"]
+      - ["java.io", "FilterInputStream", "reset", "()", "summary", "df-generated"]
+      - ["java.io", "FilterInputStream", "skip", "(long)", "summary", "df-generated"]
+      - ["java.io", "FilterReader", "mark", "(int)", "summary", "df-generated"]
+      - ["java.io", "FilterReader", "markSupported", "()", "summary", "df-generated"]
+      - ["java.io", "FilterReader", "ready", "()", "summary", "df-generated"]
+      - ["java.io", "FilterReader", "reset", "()", "summary", "df-generated"]
+      - ["java.io", "FilterReader", "skip", "(long)", "summary", "df-generated"]
+      - ["java.io", "FilterWriter", "flush", "()", "summary", "df-generated"]
       - ["java.io", "InputStream", "available", "()", "summary", "df-generated"]
       - ["java.io", "InputStream", "mark", "(int)", "summary", "df-generated"]
       - ["java.io", "InputStream", "markSupported", "()", "summary", "df-generated"]
@@ -283,21 +277,22 @@ extensions:
       - ["java.io", "InputStream", "skip", "(long)", "summary", "df-generated"]
       - ["java.io", "InputStream", "skipNBytes", "(long)", "summary", "df-generated"]
       - ["java.io", "InputStreamReader", "getEncoding", "()", "summary", "df-generated"]
+      - ["java.io", "InputStreamReader", "ready", "()", "summary", "df-generated"]
+      - ["java.io", "LineNumberInputStream", "available", "()", "summary", "df-generated"]
       - ["java.io", "LineNumberInputStream", "getLineNumber", "()", "summary", "df-generated"]
+      - ["java.io", "LineNumberInputStream", "mark", "(int)", "summary", "df-generated"]
+      - ["java.io", "LineNumberInputStream", "reset", "()", "summary", "df-generated"]
       - ["java.io", "LineNumberInputStream", "setLineNumber", "(int)", "summary", "df-generated"]
+      - ["java.io", "LineNumberInputStream", "skip", "(long)", "summary", "df-generated"]
       - ["java.io", "LineNumberReader", "getLineNumber", "()", "summary", "df-generated"]
+      - ["java.io", "LineNumberReader", "mark", "(int)", "summary", "df-generated"]
+      - ["java.io", "LineNumberReader", "reset", "()", "summary", "df-generated"]
       - ["java.io", "LineNumberReader", "setLineNumber", "(int)", "summary", "df-generated"]
-      - ["java.io", "ObjectInput", "available", "()", "summary", "df-generated"]
+      - ["java.io", "LineNumberReader", "skip", "(long)", "summary", "df-generated"]
       - ["java.io", "ObjectInputFilter$Config", "getSerialFilter", "()", "summary", "df-generated"]
       - ["java.io", "ObjectInputFilter$Config", "getSerialFilterFactory", "()", "summary", "df-generated"]
       - ["java.io", "ObjectInputFilter$Config", "setSerialFilter", "(ObjectInputFilter)", "summary", "df-generated"]
       - ["java.io", "ObjectInputFilter$Config", "setSerialFilterFactory", "(BinaryOperator)", "summary", "df-generated"]
-      - ["java.io", "ObjectInputFilter$FilterInfo", "arrayLength", "()", "summary", "df-generated"]
-      - ["java.io", "ObjectInputFilter$FilterInfo", "depth", "()", "summary", "df-generated"]
-      - ["java.io", "ObjectInputFilter$FilterInfo", "references", "()", "summary", "df-generated"]
-      - ["java.io", "ObjectInputFilter$FilterInfo", "serialClass", "()", "summary", "df-generated"]
-      - ["java.io", "ObjectInputFilter$FilterInfo", "streamBytes", "()", "summary", "df-generated"]
-      - ["java.io", "ObjectInputFilter", "checkInput", "(ObjectInputFilter$FilterInfo)", "summary", "df-generated"]
       - ["java.io", "ObjectInputStream$GetField", "defaulted", "(String)", "summary", "df-generated"]
       - ["java.io", "ObjectInputStream$GetField", "get", "(String,boolean)", "summary", "df-generated"]
       - ["java.io", "ObjectInputStream$GetField", "get", "(String,byte)", "summary", "df-generated"]
@@ -307,9 +302,18 @@ extensions:
       - ["java.io", "ObjectInputStream$GetField", "get", "(String,int)", "summary", "df-generated"]
       - ["java.io", "ObjectInputStream$GetField", "get", "(String,long)", "summary", "df-generated"]
       - ["java.io", "ObjectInputStream$GetField", "get", "(String,short)", "summary", "df-generated"]
+      - ["java.io", "ObjectInputStream", "available", "()", "summary", "df-generated"]
       - ["java.io", "ObjectInputStream", "defaultReadObject", "()", "summary", "df-generated"]
+      - ["java.io", "ObjectInputStream", "readBoolean", "()", "summary", "df-generated"]
+      - ["java.io", "ObjectInputStream", "readByte", "()", "summary", "df-generated"]
+      - ["java.io", "ObjectInputStream", "readChar", "()", "summary", "df-generated"]
+      - ["java.io", "ObjectInputStream", "readDouble", "()", "summary", "df-generated"]
+      - ["java.io", "ObjectInputStream", "readFloat", "()", "summary", "df-generated"]
+      - ["java.io", "ObjectInputStream", "readShort", "()", "summary", "df-generated"]
+      - ["java.io", "ObjectInputStream", "readUnsignedByte", "()", "summary", "df-generated"]
+      - ["java.io", "ObjectInputStream", "readUnsignedShort", "()", "summary", "df-generated"]
       - ["java.io", "ObjectInputStream", "registerValidation", "(ObjectInputValidation,int)", "summary", "df-generated"]
-      - ["java.io", "ObjectOutput", "flush", "()", "summary", "df-generated"]
+      - ["java.io", "ObjectInputStream", "skipBytes", "(int)", "summary", "df-generated"]
       - ["java.io", "ObjectOutputStream$PutField", "put", "(String,boolean)", "summary", "df-generated"]
       - ["java.io", "ObjectOutputStream$PutField", "put", "(String,byte)", "summary", "df-generated"]
       - ["java.io", "ObjectOutputStream$PutField", "put", "(String,char)", "summary", "df-generated"]
@@ -321,7 +325,12 @@ extensions:
       - ["java.io", "ObjectOutputStream", "defaultWriteObject", "()", "summary", "df-generated"]
       - ["java.io", "ObjectOutputStream", "reset", "()", "summary", "df-generated"]
       - ["java.io", "ObjectOutputStream", "useProtocolVersion", "(int)", "summary", "df-generated"]
+      - ["java.io", "ObjectOutputStream", "writeByte", "(int)", "summary", "df-generated"]
+      - ["java.io", "ObjectOutputStream", "writeChar", "(int)", "summary", "df-generated"]
+      - ["java.io", "ObjectOutputStream", "writeDouble", "(double)", "summary", "df-generated"]
       - ["java.io", "ObjectOutputStream", "writeFields", "()", "summary", "df-generated"]
+      - ["java.io", "ObjectOutputStream", "writeFloat", "(float)", "summary", "df-generated"]
+      - ["java.io", "ObjectOutputStream", "writeShort", "(int)", "summary", "df-generated"]
       - ["java.io", "ObjectStreamClass", "forClass", "()", "summary", "df-generated"]
       - ["java.io", "ObjectStreamClass", "getSerialVersionUID", "()", "summary", "df-generated"]
       - ["java.io", "ObjectStreamClass", "lookup", "(Class)", "summary", "df-generated"]
@@ -332,10 +341,16 @@ extensions:
       - ["java.io", "ObjectStreamField", "isPrimitive", "()", "summary", "df-generated"]
       - ["java.io", "ObjectStreamField", "isUnshared", "()", "summary", "df-generated"]
       - ["java.io", "OutputStream", "nullOutputStream", "()", "summary", "df-generated"]
+      - ["java.io", "OutputStreamWriter", "flush", "()", "summary", "df-generated"]
       - ["java.io", "OutputStreamWriter", "getEncoding", "()", "summary", "df-generated"]
       - ["java.io", "PipedInputStream", "PipedInputStream", "(int)", "summary", "df-generated"]
+      - ["java.io", "PipedInputStream", "available", "()", "summary", "df-generated"]
       - ["java.io", "PipedReader", "PipedReader", "(int)", "summary", "df-generated"]
+      - ["java.io", "PipedReader", "ready", "()", "summary", "df-generated"]
+      - ["java.io", "PipedWriter", "flush", "()", "summary", "df-generated"]
       - ["java.io", "PrintStream", "checkError", "()", "summary", "df-generated"]
+      - ["java.io", "PrintStream", "print", "(Object)", "summary", "df-generated"]
+      - ["java.io", "PrintStream", "print", "(String)", "summary", "df-generated"]
       - ["java.io", "PrintStream", "print", "(boolean)", "summary", "df-generated"]
       - ["java.io", "PrintStream", "print", "(char)", "summary", "df-generated"]
       - ["java.io", "PrintStream", "print", "(double)", "summary", "df-generated"]
@@ -343,6 +358,8 @@ extensions:
       - ["java.io", "PrintStream", "print", "(int)", "summary", "df-generated"]
       - ["java.io", "PrintStream", "print", "(long)", "summary", "df-generated"]
       - ["java.io", "PrintStream", "println", "()", "summary", "df-generated"]
+      - ["java.io", "PrintStream", "println", "(Object)", "summary", "df-generated"]
+      - ["java.io", "PrintStream", "println", "(String)", "summary", "df-generated"]
       - ["java.io", "PrintStream", "println", "(boolean)", "summary", "df-generated"]
       - ["java.io", "PrintStream", "println", "(char)", "summary", "df-generated"]
       - ["java.io", "PrintStream", "println", "(double)", "summary", "df-generated"]
@@ -356,6 +373,9 @@ extensions:
       - ["java.io", "PrintWriter", "PrintWriter", "(String,Charset)", "summary", "df-generated"]
       - ["java.io", "PrintWriter", "PrintWriter", "(String,String)", "summary", "df-generated"]
       - ["java.io", "PrintWriter", "checkError", "()", "summary", "df-generated"]
+      - ["java.io", "PrintWriter", "flush", "()", "summary", "df-generated"]
+      - ["java.io", "PrintWriter", "print", "(Object)", "summary", "df-generated"]
+      - ["java.io", "PrintWriter", "print", "(String)", "summary", "df-generated"]
       - ["java.io", "PrintWriter", "print", "(boolean)", "summary", "df-generated"]
       - ["java.io", "PrintWriter", "print", "(char)", "summary", "df-generated"]
       - ["java.io", "PrintWriter", "print", "(double)", "summary", "df-generated"]
@@ -363,28 +383,55 @@ extensions:
       - ["java.io", "PrintWriter", "print", "(int)", "summary", "df-generated"]
       - ["java.io", "PrintWriter", "print", "(long)", "summary", "df-generated"]
       - ["java.io", "PrintWriter", "println", "()", "summary", "df-generated"]
+      - ["java.io", "PrintWriter", "println", "(Object)", "summary", "df-generated"]
+      - ["java.io", "PrintWriter", "println", "(String)", "summary", "df-generated"]
       - ["java.io", "PrintWriter", "println", "(boolean)", "summary", "df-generated"]
       - ["java.io", "PrintWriter", "println", "(char)", "summary", "df-generated"]
       - ["java.io", "PrintWriter", "println", "(double)", "summary", "df-generated"]
       - ["java.io", "PrintWriter", "println", "(float)", "summary", "df-generated"]
       - ["java.io", "PrintWriter", "println", "(int)", "summary", "df-generated"]
       - ["java.io", "PrintWriter", "println", "(long)", "summary", "df-generated"]
+      - ["java.io", "PushbackInputStream", "available", "()", "summary", "df-generated"]
+      - ["java.io", "PushbackInputStream", "mark", "(int)", "summary", "df-generated"]
+      - ["java.io", "PushbackInputStream", "markSupported", "()", "summary", "df-generated"]
+      - ["java.io", "PushbackInputStream", "reset", "()", "summary", "df-generated"]
+      - ["java.io", "PushbackInputStream", "skip", "(long)", "summary", "df-generated"]
       - ["java.io", "PushbackInputStream", "unread", "(int)", "summary", "df-generated"]
+      - ["java.io", "PushbackReader", "mark", "(int)", "summary", "df-generated"]
+      - ["java.io", "PushbackReader", "markSupported", "()", "summary", "df-generated"]
+      - ["java.io", "PushbackReader", "ready", "()", "summary", "df-generated"]
+      - ["java.io", "PushbackReader", "reset", "()", "summary", "df-generated"]
+      - ["java.io", "PushbackReader", "skip", "(long)", "summary", "df-generated"]
       - ["java.io", "PushbackReader", "unread", "(int)", "summary", "df-generated"]
       - ["java.io", "RandomAccessFile", "getFilePointer", "()", "summary", "df-generated"]
       - ["java.io", "RandomAccessFile", "length", "()", "summary", "df-generated"]
       - ["java.io", "RandomAccessFile", "read", "()", "summary", "df-generated"]
       - ["java.io", "RandomAccessFile", "read", "(byte[])", "summary", "df-generated"]
       - ["java.io", "RandomAccessFile", "read", "(byte[],int,int)", "summary", "df-generated"]
+      - ["java.io", "RandomAccessFile", "readBoolean", "()", "summary", "df-generated"]
+      - ["java.io", "RandomAccessFile", "readByte", "()", "summary", "df-generated"]
+      - ["java.io", "RandomAccessFile", "readChar", "()", "summary", "df-generated"]
+      - ["java.io", "RandomAccessFile", "readDouble", "()", "summary", "df-generated"]
+      - ["java.io", "RandomAccessFile", "readFloat", "()", "summary", "df-generated"]
+      - ["java.io", "RandomAccessFile", "readShort", "()", "summary", "df-generated"]
+      - ["java.io", "RandomAccessFile", "readUnsignedByte", "()", "summary", "df-generated"]
+      - ["java.io", "RandomAccessFile", "readUnsignedShort", "()", "summary", "df-generated"]
       - ["java.io", "RandomAccessFile", "seek", "(long)", "summary", "df-generated"]
       - ["java.io", "RandomAccessFile", "setLength", "(long)", "summary", "df-generated"]
+      - ["java.io", "RandomAccessFile", "skipBytes", "(int)", "summary", "df-generated"]
+      - ["java.io", "RandomAccessFile", "write", "(int)", "summary", "df-generated"]
+      - ["java.io", "RandomAccessFile", "writeByte", "(int)", "summary", "df-generated"]
+      - ["java.io", "RandomAccessFile", "writeChar", "(int)", "summary", "df-generated"]
+      - ["java.io", "RandomAccessFile", "writeDouble", "(double)", "summary", "df-generated"]
+      - ["java.io", "RandomAccessFile", "writeFloat", "(float)", "summary", "df-generated"]
+      - ["java.io", "RandomAccessFile", "writeShort", "(int)", "summary", "df-generated"]
       - ["java.io", "Reader", "mark", "(int)", "summary", "df-generated"]
       - ["java.io", "Reader", "markSupported", "()", "summary", "df-generated"]
       - ["java.io", "Reader", "nullReader", "()", "summary", "df-generated"]
       - ["java.io", "Reader", "ready", "()", "summary", "df-generated"]
       - ["java.io", "Reader", "reset", "()", "summary", "df-generated"]
       - ["java.io", "Reader", "skip", "(long)", "summary", "df-generated"]
-      - ["java.io", "SequenceInputStream", "SequenceInputStream", "(InputStream,InputStream)", "summary", "df-generated"]
+      - ["java.io", "SequenceInputStream", "available", "()", "summary", "df-generated"]
       - ["java.io", "StreamTokenizer", "commentChar", "(int)", "summary", "df-generated"]
       - ["java.io", "StreamTokenizer", "eolIsSignificant", "(boolean)", "summary", "df-generated"]
       - ["java.io", "StreamTokenizer", "lineno", "()", "summary", "df-generated"]
@@ -400,5 +447,15 @@ extensions:
       - ["java.io", "StreamTokenizer", "slashStarComments", "(boolean)", "summary", "df-generated"]
       - ["java.io", "StreamTokenizer", "whitespaceChars", "(int,int)", "summary", "df-generated"]
       - ["java.io", "StreamTokenizer", "wordChars", "(int,int)", "summary", "df-generated"]
+      - ["java.io", "StringBufferInputStream", "available", "()", "summary", "df-generated"]
+      - ["java.io", "StringBufferInputStream", "reset", "()", "summary", "df-generated"]
+      - ["java.io", "StringBufferInputStream", "skip", "(long)", "summary", "df-generated"]
+      - ["java.io", "StringReader", "mark", "(int)", "summary", "df-generated"]
+      - ["java.io", "StringReader", "markSupported", "()", "summary", "df-generated"]
+      - ["java.io", "StringReader", "ready", "()", "summary", "df-generated"]
+      - ["java.io", "StringReader", "reset", "()", "summary", "df-generated"]
+      - ["java.io", "StringReader", "skip", "(long)", "summary", "df-generated"]
       - ["java.io", "StringWriter", "StringWriter", "(int)", "summary", "df-generated"]
+      - ["java.io", "StringWriter", "flush", "()", "summary", "df-generated"]
+      - ["java.io", "Writer", "flush", "()", "summary", "df-generated"]
       - ["java.io", "Writer", "nullWriter", "()", "summary", "df-generated"]
diff --git a/java/ql/lib/ext/generated/java.lang.annotation.model.yml b/java/ql/lib/ext/generated/java.lang.annotation.model.yml
index 8417e0d4cee..3f4812ff00d 100644
--- a/java/ql/lib/ext/generated/java.lang.annotation.model.yml
+++ b/java/ql/lib/ext/generated/java.lang.annotation.model.yml
@@ -8,12 +8,12 @@ extensions:
       - ["java.lang.annotation", "AnnotationFormatError", True, "AnnotationFormatError", "(String,Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.lang.annotation", "AnnotationFormatError", True, "AnnotationFormatError", "(String,Throwable)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
       - ["java.lang.annotation", "AnnotationFormatError", True, "AnnotationFormatError", "(Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.lang.annotation", "AnnotationTypeMismatchException", True, "AnnotationTypeMismatchException", "(Method,String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.lang.annotation", "AnnotationTypeMismatchException", True, "AnnotationTypeMismatchException", "(Method,String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["java.lang.annotation", "AnnotationTypeMismatchException", True, "element", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.lang.annotation", "AnnotationTypeMismatchException", True, "foundType", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.lang.annotation", "IncompleteAnnotationException", True, "IncompleteAnnotationException", "(Class,String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["java.lang.annotation", "IncompleteAnnotationException", True, "elementName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.annotation", "AnnotationTypeMismatchException", True, "AnnotationTypeMismatchException", "(Method,String)", "", "Argument[0]", "Argument[this].SyntheticField[java.lang.annotation.AnnotationTypeMismatchException.element]", "value", "dfc-generated"]
+      - ["java.lang.annotation", "AnnotationTypeMismatchException", True, "AnnotationTypeMismatchException", "(Method,String)", "", "Argument[1]", "Argument[this].SyntheticField[java.lang.annotation.AnnotationTypeMismatchException.foundType]", "value", "dfc-generated"]
+      - ["java.lang.annotation", "AnnotationTypeMismatchException", True, "element", "()", "", "Argument[this].SyntheticField[java.lang.annotation.AnnotationTypeMismatchException.element]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.lang.annotation", "AnnotationTypeMismatchException", True, "foundType", "()", "", "Argument[this].SyntheticField[java.lang.annotation.AnnotationTypeMismatchException.foundType]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.lang.annotation", "IncompleteAnnotationException", True, "IncompleteAnnotationException", "(Class,String)", "", "Argument[1]", "Argument[this].SyntheticField[java.lang.annotation.IncompleteAnnotationException.elementName]", "value", "dfc-generated"]
+      - ["java.lang.annotation", "IncompleteAnnotationException", True, "elementName", "()", "", "Argument[this].SyntheticField[java.lang.annotation.IncompleteAnnotationException.elementName]", "ReturnValue", "value", "dfc-generated"]
   - addsTo:
       pack: codeql/java-all
       extensible: neutralModel
diff --git a/java/ql/lib/ext/generated/java.lang.constant.model.yml b/java/ql/lib/ext/generated/java.lang.constant.model.yml
index efa0c1a5b8c..83222ec6804 100644
--- a/java/ql/lib/ext/generated/java.lang.constant.model.yml
+++ b/java/ql/lib/ext/generated/java.lang.constant.model.yml
@@ -4,21 +4,29 @@ extensions:
       pack: codeql/java-all
       extensible: summaryModel
     data:
+      - ["java.lang.constant", "ClassDesc", True, "arrayType", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.lang.constant", "ClassDesc", True, "arrayType", "(int)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.lang.constant", "ClassDesc", True, "displayName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.lang.constant", "ClassDesc", True, "nested", "(String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["java.lang.constant", "ClassDesc", True, "nested", "(String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.lang.constant", "ClassDesc", True, "nested", "(String,String[])", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["java.lang.constant", "ClassDesc", True, "nested", "(String,String[])", "", "Argument[1].ArrayElement", "ReturnValue", "taint", "df-generated"]
-      - ["java.lang.constant", "ClassDesc", True, "nested", "(String,String[])", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.lang.constant", "ClassDesc", True, "of", "(String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["java.lang.constant", "ClassDesc", True, "of", "(String,String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["java.lang.constant", "ClassDesc", True, "of", "(String,String)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["java.lang.constant", "ClassDesc", True, "ofDescriptor", "(String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["java.lang.constant", "ClassDesc", True, "packageName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.lang.constant", "Constable", True, "describeConstable", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.lang.constant", "ConstantDesc", True, "resolveConstantDesc", "(MethodHandles$Lookup)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.lang.constant", "ConstantDesc", True, "resolveConstantDesc", "(MethodHandles$Lookup)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.lang.constant", "ClassDesc", True, "componentType", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.constant", "ClassDesc", True, "displayName", "()", "", "Argument[this].SyntheticField[java.lang.constant.PrimitiveClassDescImpl.descriptor]", "ReturnValue", "taint", "dfc-generated"]
+      - ["java.lang.constant", "ClassDesc", True, "displayName", "()", "", "Argument[this].SyntheticField[java.lang.constant.ReferenceClassDescImpl.descriptor]", "ReturnValue", "taint", "dfc-generated"]
+      - ["java.lang.constant", "ClassDesc", True, "nested", "(String)", "", "Argument[0]", "ReturnValue.SyntheticField[java.lang.constant.PrimitiveClassDescImpl.descriptor]", "taint", "dfc-generated"]
+      - ["java.lang.constant", "ClassDesc", True, "nested", "(String)", "", "Argument[0]", "ReturnValue.SyntheticField[java.lang.constant.ReferenceClassDescImpl.descriptor]", "taint", "dfc-generated"]
+      - ["java.lang.constant", "ClassDesc", True, "nested", "(String,String[])", "", "Argument[0]", "ReturnValue.SyntheticField[java.lang.constant.PrimitiveClassDescImpl.descriptor]", "taint", "dfc-generated"]
+      - ["java.lang.constant", "ClassDesc", True, "nested", "(String,String[])", "", "Argument[0]", "ReturnValue.SyntheticField[java.lang.constant.ReferenceClassDescImpl.descriptor]", "taint", "dfc-generated"]
+      - ["java.lang.constant", "ClassDesc", True, "nested", "(String,String[])", "", "Argument[1].ArrayElement", "ReturnValue.SyntheticField[java.lang.constant.PrimitiveClassDescImpl.descriptor]", "taint", "dfc-generated"]
+      - ["java.lang.constant", "ClassDesc", True, "nested", "(String,String[])", "", "Argument[1].ArrayElement", "ReturnValue.SyntheticField[java.lang.constant.ReferenceClassDescImpl.descriptor]", "taint", "dfc-generated"]
+      - ["java.lang.constant", "ClassDesc", True, "of", "(String)", "", "Argument[0]", "ReturnValue.SyntheticField[java.lang.constant.PrimitiveClassDescImpl.descriptor]", "taint", "dfc-generated"]
+      - ["java.lang.constant", "ClassDesc", True, "of", "(String)", "", "Argument[0]", "ReturnValue.SyntheticField[java.lang.constant.ReferenceClassDescImpl.descriptor]", "taint", "dfc-generated"]
+      - ["java.lang.constant", "ClassDesc", True, "of", "(String,String)", "", "Argument[0]", "ReturnValue.SyntheticField[java.lang.constant.PrimitiveClassDescImpl.descriptor]", "taint", "dfc-generated"]
+      - ["java.lang.constant", "ClassDesc", True, "of", "(String,String)", "", "Argument[0]", "ReturnValue.SyntheticField[java.lang.constant.ReferenceClassDescImpl.descriptor]", "taint", "dfc-generated"]
+      - ["java.lang.constant", "ClassDesc", True, "of", "(String,String)", "", "Argument[1]", "ReturnValue.SyntheticField[java.lang.constant.PrimitiveClassDescImpl.descriptor]", "taint", "dfc-generated"]
+      - ["java.lang.constant", "ClassDesc", True, "of", "(String,String)", "", "Argument[1]", "ReturnValue.SyntheticField[java.lang.constant.ReferenceClassDescImpl.descriptor]", "taint", "dfc-generated"]
+      - ["java.lang.constant", "ClassDesc", True, "ofDescriptor", "(String)", "", "Argument[0]", "ReturnValue.SyntheticField[java.lang.constant.PrimitiveClassDescImpl.descriptor]", "value", "dfc-generated"]
+      - ["java.lang.constant", "ClassDesc", True, "ofDescriptor", "(String)", "", "Argument[0]", "ReturnValue.SyntheticField[java.lang.constant.ReferenceClassDescImpl.descriptor]", "value", "dfc-generated"]
+      - ["java.lang.constant", "ClassDesc", True, "packageName", "()", "", "Argument[this].SyntheticField[java.lang.constant.PrimitiveClassDescImpl.descriptor]", "ReturnValue", "taint", "dfc-generated"]
+      - ["java.lang.constant", "ClassDesc", True, "packageName", "()", "", "Argument[this].SyntheticField[java.lang.constant.ReferenceClassDescImpl.descriptor]", "ReturnValue", "taint", "dfc-generated"]
+      - ["java.lang.constant", "Constable", True, "describeConstable", "()", "", "Argument[this]", "ReturnValue.Element", "value", "dfc-generated"]
+      - ["java.lang.constant", "ConstantDesc", True, "resolveConstantDesc", "(MethodHandles$Lookup)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
       - ["java.lang.constant", "ConstantDescs", False, "ofCallsiteBootstrap", "(ClassDesc,String,ClassDesc,ClassDesc[])", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["java.lang.constant", "ConstantDescs", False, "ofCallsiteBootstrap", "(ClassDesc,String,ClassDesc,ClassDesc[])", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
       - ["java.lang.constant", "ConstantDescs", False, "ofCallsiteBootstrap", "(ClassDesc,String,ClassDesc,ClassDesc[])", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
@@ -30,24 +38,27 @@ extensions:
       - ["java.lang.constant", "DirectMethodHandleDesc", True, "lookupDescriptor", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.lang.constant", "DirectMethodHandleDesc", True, "methodName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.lang.constant", "DirectMethodHandleDesc", True, "owner", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.lang.constant", "DynamicCallSiteDesc", True, "bootstrapArgs", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.lang.constant", "DynamicCallSiteDesc", True, "bootstrapMethod", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.lang.constant", "DynamicCallSiteDesc", True, "invocationName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.lang.constant", "DynamicCallSiteDesc", True, "invocationType", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.lang.constant", "DynamicCallSiteDesc", True, "of", "(DirectMethodHandleDesc,MethodTypeDesc)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["java.lang.constant", "DynamicCallSiteDesc", True, "of", "(DirectMethodHandleDesc,MethodTypeDesc)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["java.lang.constant", "DynamicCallSiteDesc", True, "of", "(DirectMethodHandleDesc,String,MethodTypeDesc)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["java.lang.constant", "DynamicCallSiteDesc", True, "of", "(DirectMethodHandleDesc,String,MethodTypeDesc)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["java.lang.constant", "DynamicCallSiteDesc", True, "of", "(DirectMethodHandleDesc,String,MethodTypeDesc)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
-      - ["java.lang.constant", "DynamicCallSiteDesc", True, "of", "(DirectMethodHandleDesc,String,MethodTypeDesc,ConstantDesc[])", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["java.lang.constant", "DynamicCallSiteDesc", True, "of", "(DirectMethodHandleDesc,String,MethodTypeDesc,ConstantDesc[])", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["java.lang.constant", "DynamicCallSiteDesc", True, "of", "(DirectMethodHandleDesc,String,MethodTypeDesc,ConstantDesc[])", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
-      - ["java.lang.constant", "DynamicCallSiteDesc", True, "of", "(DirectMethodHandleDesc,String,MethodTypeDesc,ConstantDesc[])", "", "Argument[3].ArrayElement", "ReturnValue", "taint", "df-generated"]
-      - ["java.lang.constant", "DynamicCallSiteDesc", True, "withArgs", "(ConstantDesc[])", "", "Argument[0].ArrayElement", "ReturnValue", "taint", "df-generated"]
-      - ["java.lang.constant", "DynamicCallSiteDesc", True, "withArgs", "(ConstantDesc[])", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.lang.constant", "DynamicCallSiteDesc", True, "withNameAndType", "(String,MethodTypeDesc)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["java.lang.constant", "DynamicCallSiteDesc", True, "withNameAndType", "(String,MethodTypeDesc)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["java.lang.constant", "DynamicCallSiteDesc", True, "withNameAndType", "(String,MethodTypeDesc)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.constant", "DynamicCallSiteDesc", True, "bootstrapArgs", "()", "", "Argument[this].SyntheticField[java.lang.constant.DynamicCallSiteDesc.bootstrapArgs]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.lang.constant", "DynamicCallSiteDesc", True, "bootstrapMethod", "()", "", "Argument[this].SyntheticField[java.lang.constant.DynamicCallSiteDesc.bootstrapMethod]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.lang.constant", "DynamicCallSiteDesc", True, "invocationName", "()", "", "Argument[this].SyntheticField[java.lang.constant.DynamicCallSiteDesc.invocationName]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.lang.constant", "DynamicCallSiteDesc", True, "invocationType", "()", "", "Argument[this].SyntheticField[java.lang.constant.DynamicCallSiteDesc.invocationType]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.lang.constant", "DynamicCallSiteDesc", True, "of", "(DirectMethodHandleDesc,MethodTypeDesc)", "", "Argument[0]", "ReturnValue.SyntheticField[java.lang.constant.DynamicCallSiteDesc.bootstrapMethod]", "value", "dfc-generated"]
+      - ["java.lang.constant", "DynamicCallSiteDesc", True, "of", "(DirectMethodHandleDesc,MethodTypeDesc)", "", "Argument[1]", "ReturnValue.SyntheticField[java.lang.constant.DynamicCallSiteDesc.invocationType]", "value", "dfc-generated"]
+      - ["java.lang.constant", "DynamicCallSiteDesc", True, "of", "(DirectMethodHandleDesc,String,MethodTypeDesc)", "", "Argument[0]", "ReturnValue.SyntheticField[java.lang.constant.DynamicCallSiteDesc.bootstrapMethod]", "value", "dfc-generated"]
+      - ["java.lang.constant", "DynamicCallSiteDesc", True, "of", "(DirectMethodHandleDesc,String,MethodTypeDesc)", "", "Argument[1]", "ReturnValue.SyntheticField[java.lang.constant.DynamicCallSiteDesc.invocationName]", "value", "dfc-generated"]
+      - ["java.lang.constant", "DynamicCallSiteDesc", True, "of", "(DirectMethodHandleDesc,String,MethodTypeDesc)", "", "Argument[2]", "ReturnValue.SyntheticField[java.lang.constant.DynamicCallSiteDesc.invocationType]", "value", "dfc-generated"]
+      - ["java.lang.constant", "DynamicCallSiteDesc", True, "of", "(DirectMethodHandleDesc,String,MethodTypeDesc,ConstantDesc[])", "", "Argument[0]", "ReturnValue.SyntheticField[java.lang.constant.DynamicCallSiteDesc.bootstrapMethod]", "value", "dfc-generated"]
+      - ["java.lang.constant", "DynamicCallSiteDesc", True, "of", "(DirectMethodHandleDesc,String,MethodTypeDesc,ConstantDesc[])", "", "Argument[1]", "ReturnValue.SyntheticField[java.lang.constant.DynamicCallSiteDesc.invocationName]", "value", "dfc-generated"]
+      - ["java.lang.constant", "DynamicCallSiteDesc", True, "of", "(DirectMethodHandleDesc,String,MethodTypeDesc,ConstantDesc[])", "", "Argument[2]", "ReturnValue.SyntheticField[java.lang.constant.DynamicCallSiteDesc.invocationType]", "value", "dfc-generated"]
+      - ["java.lang.constant", "DynamicCallSiteDesc", True, "of", "(DirectMethodHandleDesc,String,MethodTypeDesc,ConstantDesc[])", "", "Argument[3]", "ReturnValue.SyntheticField[java.lang.constant.DynamicCallSiteDesc.bootstrapArgs]", "value", "dfc-generated"]
+      - ["java.lang.constant", "DynamicCallSiteDesc", True, "withArgs", "(ConstantDesc[])", "", "Argument[0]", "ReturnValue.SyntheticField[java.lang.constant.DynamicCallSiteDesc.bootstrapArgs]", "value", "dfc-generated"]
+      - ["java.lang.constant", "DynamicCallSiteDesc", True, "withArgs", "(ConstantDesc[])", "", "Argument[this].SyntheticField[java.lang.constant.DynamicCallSiteDesc.bootstrapMethod]", "ReturnValue.SyntheticField[java.lang.constant.DynamicCallSiteDesc.bootstrapMethod]", "value", "dfc-generated"]
+      - ["java.lang.constant", "DynamicCallSiteDesc", True, "withArgs", "(ConstantDesc[])", "", "Argument[this].SyntheticField[java.lang.constant.DynamicCallSiteDesc.invocationName]", "ReturnValue.SyntheticField[java.lang.constant.DynamicCallSiteDesc.invocationName]", "value", "dfc-generated"]
+      - ["java.lang.constant", "DynamicCallSiteDesc", True, "withArgs", "(ConstantDesc[])", "", "Argument[this].SyntheticField[java.lang.constant.DynamicCallSiteDesc.invocationType]", "ReturnValue.SyntheticField[java.lang.constant.DynamicCallSiteDesc.invocationType]", "value", "dfc-generated"]
+      - ["java.lang.constant", "DynamicCallSiteDesc", True, "withNameAndType", "(String,MethodTypeDesc)", "", "Argument[0]", "ReturnValue.SyntheticField[java.lang.constant.DynamicCallSiteDesc.invocationName]", "value", "dfc-generated"]
+      - ["java.lang.constant", "DynamicCallSiteDesc", True, "withNameAndType", "(String,MethodTypeDesc)", "", "Argument[1]", "ReturnValue.SyntheticField[java.lang.constant.DynamicCallSiteDesc.invocationType]", "value", "dfc-generated"]
+      - ["java.lang.constant", "DynamicCallSiteDesc", True, "withNameAndType", "(String,MethodTypeDesc)", "", "Argument[this].SyntheticField[java.lang.constant.DynamicCallSiteDesc.bootstrapArgs]", "ReturnValue.SyntheticField[java.lang.constant.DynamicCallSiteDesc.bootstrapArgs]", "value", "dfc-generated"]
+      - ["java.lang.constant", "DynamicCallSiteDesc", True, "withNameAndType", "(String,MethodTypeDesc)", "", "Argument[this].SyntheticField[java.lang.constant.DynamicCallSiteDesc.bootstrapMethod]", "ReturnValue.SyntheticField[java.lang.constant.DynamicCallSiteDesc.bootstrapMethod]", "value", "dfc-generated"]
       - ["java.lang.constant", "DynamicConstantDesc", True, "bootstrapArgs", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.lang.constant", "DynamicConstantDesc", True, "bootstrapArgsList", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.lang.constant", "DynamicConstantDesc", True, "bootstrapMethod", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
@@ -64,31 +75,39 @@ extensions:
       - ["java.lang.constant", "DynamicConstantDesc", True, "ofNamed", "(DirectMethodHandleDesc,String,ClassDesc,ConstantDesc[])", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
       - ["java.lang.constant", "DynamicConstantDesc", True, "ofNamed", "(DirectMethodHandleDesc,String,ClassDesc,ConstantDesc[])", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
       - ["java.lang.constant", "DynamicConstantDesc", True, "ofNamed", "(DirectMethodHandleDesc,String,ClassDesc,ConstantDesc[])", "", "Argument[3].ArrayElement", "ReturnValue", "taint", "df-generated"]
-      - ["java.lang.constant", "MethodHandleDesc", True, "asType", "(MethodTypeDesc)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["java.lang.constant", "MethodHandleDesc", True, "asType", "(MethodTypeDesc)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.constant", "MethodHandleDesc", True, "asType", "(MethodTypeDesc)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
       - ["java.lang.constant", "MethodHandleDesc", True, "invocationType", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.lang.constant", "MethodHandleDesc", True, "of", "(DirectMethodHandleDesc$Kind,ClassDesc,String,String)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["java.lang.constant", "MethodHandleDesc", True, "of", "(DirectMethodHandleDesc$Kind,ClassDesc,String,String)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.constant", "MethodHandleDesc", True, "of", "(DirectMethodHandleDesc$Kind,ClassDesc,String,String)", "", "Argument[1]", "ReturnValue.SyntheticField[java.lang.constant.DirectMethodHandleDescImpl.owner]", "value", "dfc-generated"]
+      - ["java.lang.constant", "MethodHandleDesc", True, "of", "(DirectMethodHandleDesc$Kind,ClassDesc,String,String)", "", "Argument[2]", "ReturnValue.SyntheticField[java.lang.constant.DirectMethodHandleDescImpl.name]", "value", "dfc-generated"]
       - ["java.lang.constant", "MethodHandleDesc", True, "ofConstructor", "(ClassDesc,ClassDesc[])", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["java.lang.constant", "MethodHandleDesc", True, "ofConstructor", "(ClassDesc,ClassDesc[])", "", "Argument[1].ArrayElement", "ReturnValue", "taint", "df-generated"]
-      - ["java.lang.constant", "MethodHandleDesc", True, "ofField", "(DirectMethodHandleDesc$Kind,ClassDesc,String,ClassDesc)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["java.lang.constant", "MethodHandleDesc", True, "ofField", "(DirectMethodHandleDesc$Kind,ClassDesc,String,ClassDesc)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
-      - ["java.lang.constant", "MethodHandleDesc", True, "ofField", "(DirectMethodHandleDesc$Kind,ClassDesc,String,ClassDesc)", "", "Argument[3]", "ReturnValue", "taint", "df-generated"]
-      - ["java.lang.constant", "MethodHandleDesc", True, "ofMethod", "(DirectMethodHandleDesc$Kind,ClassDesc,String,MethodTypeDesc)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["java.lang.constant", "MethodHandleDesc", True, "ofMethod", "(DirectMethodHandleDesc$Kind,ClassDesc,String,MethodTypeDesc)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
-      - ["java.lang.constant", "MethodHandleDesc", True, "ofMethod", "(DirectMethodHandleDesc$Kind,ClassDesc,String,MethodTypeDesc)", "", "Argument[3]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.constant", "MethodHandleDesc", True, "ofField", "(DirectMethodHandleDesc$Kind,ClassDesc,String,ClassDesc)", "", "Argument[1]", "ReturnValue.SyntheticField[java.lang.constant.DirectMethodHandleDescImpl.owner]", "value", "dfc-generated"]
+      - ["java.lang.constant", "MethodHandleDesc", True, "ofField", "(DirectMethodHandleDesc$Kind,ClassDesc,String,ClassDesc)", "", "Argument[2]", "ReturnValue.SyntheticField[java.lang.constant.DirectMethodHandleDescImpl.name]", "value", "dfc-generated"]
+      - ["java.lang.constant", "MethodHandleDesc", True, "ofMethod", "(DirectMethodHandleDesc$Kind,ClassDesc,String,MethodTypeDesc)", "", "Argument[1]", "ReturnValue.SyntheticField[java.lang.constant.DirectMethodHandleDescImpl.owner]", "value", "dfc-generated"]
+      - ["java.lang.constant", "MethodHandleDesc", True, "ofMethod", "(DirectMethodHandleDesc$Kind,ClassDesc,String,MethodTypeDesc)", "", "Argument[2]", "ReturnValue.SyntheticField[java.lang.constant.DirectMethodHandleDescImpl.name]", "value", "dfc-generated"]
+      - ["java.lang.constant", "MethodHandleDesc", True, "ofMethod", "(DirectMethodHandleDesc$Kind,ClassDesc,String,MethodTypeDesc)", "", "Argument[3]", "ReturnValue.SyntheticField[java.lang.constant.DirectMethodHandleDescImpl.invocationType]", "value", "dfc-generated"]
+      - ["java.lang.constant", "MethodTypeDesc", True, "changeParameterType", "(int,ClassDesc)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.constant", "MethodTypeDesc", True, "changeParameterType", "(int,ClassDesc)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.constant", "MethodTypeDesc", True, "changeReturnType", "(ClassDesc)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.constant", "MethodTypeDesc", True, "changeReturnType", "(ClassDesc)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.lang.constant", "MethodTypeDesc", True, "displayDescriptor", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.lang.constant", "MethodTypeDesc", True, "of", "(ClassDesc,ClassDesc[])", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["java.lang.constant", "MethodTypeDesc", True, "of", "(ClassDesc,ClassDesc[])", "", "Argument[1].ArrayElement", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.constant", "MethodTypeDesc", True, "dropParameterTypes", "(int,int)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.constant", "MethodTypeDesc", True, "insertParameterTypes", "(int,ClassDesc[])", "", "Argument[1].ArrayElement", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.constant", "MethodTypeDesc", True, "insertParameterTypes", "(int,ClassDesc[])", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.constant", "MethodTypeDesc", True, "of", "(ClassDesc,ClassDesc[])", "", "Argument[0]", "ReturnValue.SyntheticField[java.lang.constant.MethodTypeDescImpl.returnType]", "value", "dfc-generated"]
+      - ["java.lang.constant", "MethodTypeDesc", True, "of", "(ClassDesc,ClassDesc[])", "", "Argument[1]", "ReturnValue.SyntheticField[java.lang.constant.MethodTypeDescImpl.argTypes]", "value", "dfc-generated"]
       - ["java.lang.constant", "MethodTypeDesc", True, "ofDescriptor", "(String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.constant", "MethodTypeDesc", True, "parameterArray", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.constant", "MethodTypeDesc", True, "parameterList", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.constant", "MethodTypeDesc", True, "parameterType", "(int)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.constant", "MethodTypeDesc", True, "returnType", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
   - addsTo:
       pack: codeql/java-all
       extensible: neutralModel
     data:
+      - ["java.lang.constant", "ClassDesc", "isArray", "()", "summary", "df-generated"]
       - ["java.lang.constant", "ClassDesc", "isClassOrInterface", "()", "summary", "df-generated"]
+      - ["java.lang.constant", "ClassDesc", "isPrimitive", "()", "summary", "df-generated"]
       - ["java.lang.constant", "DirectMethodHandleDesc$Kind", "valueOf", "(int)", "summary", "df-generated"]
       - ["java.lang.constant", "DirectMethodHandleDesc$Kind", "valueOf", "(int,boolean)", "summary", "df-generated"]
-      - ["java.lang.constant", "DirectMethodHandleDesc", "isOwnerInterface", "()", "summary", "df-generated"]
-      - ["java.lang.constant", "DirectMethodHandleDesc", "kind", "()", "summary", "df-generated"]
-      - ["java.lang.constant", "DirectMethodHandleDesc", "refKind", "()", "summary", "df-generated"]
       - ["java.lang.constant", "DynamicCallSiteDesc", "resolveCallSiteDesc", "(MethodHandles$Lookup)", "summary", "df-generated"]
diff --git a/java/ql/lib/ext/generated/java.lang.instrument.model.yml b/java/ql/lib/ext/generated/java.lang.instrument.model.yml
index ed5693a13d4..fa94377849c 100644
--- a/java/ql/lib/ext/generated/java.lang.instrument.model.yml
+++ b/java/ql/lib/ext/generated/java.lang.instrument.model.yml
@@ -4,8 +4,8 @@ extensions:
       pack: codeql/java-all
       extensible: summaryModel
     data:
-      - ["java.lang.instrument", "ClassDefinition", False, "ClassDefinition", "(Class,byte[])", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["java.lang.instrument", "ClassDefinition", False, "getDefinitionClassFile", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.instrument", "ClassDefinition", False, "ClassDefinition", "(Class,byte[])", "", "Argument[1]", "Argument[this].SyntheticField[java.lang.instrument.ClassDefinition.mClassFile]", "value", "dfc-generated"]
+      - ["java.lang.instrument", "ClassDefinition", False, "getDefinitionClassFile", "()", "", "Argument[this].SyntheticField[java.lang.instrument.ClassDefinition.mClassFile]", "ReturnValue", "value", "dfc-generated"]
       - ["java.lang.instrument", "IllegalClassFormatException", True, "IllegalClassFormatException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.lang.instrument", "UnmodifiableClassException", True, "UnmodifiableClassException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.lang.instrument", "UnmodifiableModuleException", True, "UnmodifiableModuleException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
diff --git a/java/ql/lib/ext/generated/java.lang.invoke.model.yml b/java/ql/lib/ext/generated/java.lang.invoke.model.yml
index 16ba799e924..05f6bec3806 100644
--- a/java/ql/lib/ext/generated/java.lang.invoke.model.yml
+++ b/java/ql/lib/ext/generated/java.lang.invoke.model.yml
@@ -5,39 +5,36 @@ extensions:
       extensible: summaryModel
     data:
       - ["java.lang.invoke", "CallSite", True, "dynamicInvoker", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.lang.invoke", "CallSite", True, "getTarget", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.lang.invoke", "CallSite", True, "type", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.invoke", "CallSite", True, "type", "()", "", "Argument[this].SyntheticField[java.lang.invoke.CallSite.target].SyntheticField[java.lang.invoke.MethodHandle.type]", "ReturnValue", "value", "dfc-generated"]
       - ["java.lang.invoke", "ClassSpecializer$SpeciesData", True, "key", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.lang.invoke", "ConstantBootstraps", False, "explicitCast", "(MethodHandles$Lookup,String,Class,Object)", "", "Argument[3]", "ReturnValue", "taint", "df-generated"]
-      - ["java.lang.invoke", "ConstantCallSite", True, "ConstantCallSite", "(MethodHandle)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.lang.invoke", "ConstantBootstraps", False, "explicitCast", "(MethodHandles$Lookup,String,Class,Object)", "", "Argument[3]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.lang.invoke", "ConstantCallSite", True, "ConstantCallSite", "(MethodHandle)", "", "Argument[0]", "Argument[this].SyntheticField[java.lang.invoke.CallSite.target]", "value", "dfc-generated"]
+      - ["java.lang.invoke", "ConstantCallSite", True, "dynamicInvoker", "()", "", "Argument[this].SyntheticField[java.lang.invoke.CallSite.target]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.lang.invoke", "ConstantCallSite", True, "getTarget", "()", "", "Argument[this].SyntheticField[java.lang.invoke.CallSite.target]", "ReturnValue", "value", "dfc-generated"]
       - ["java.lang.invoke", "LambdaConversionException", True, "LambdaConversionException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.lang.invoke", "LambdaConversionException", True, "LambdaConversionException", "(String,Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.lang.invoke", "LambdaConversionException", True, "LambdaConversionException", "(String,Throwable)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
       - ["java.lang.invoke", "LambdaConversionException", True, "LambdaConversionException", "(String,Throwable,boolean,boolean)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.lang.invoke", "LambdaConversionException", True, "LambdaConversionException", "(String,Throwable,boolean,boolean)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
       - ["java.lang.invoke", "LambdaConversionException", True, "LambdaConversionException", "(Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.lang.invoke", "LambdaMetafactory", False, "altMetafactory", "(MethodHandles$Lookup,String,MethodType,Object[])", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
-      - ["java.lang.invoke", "LambdaMetafactory", False, "metafactory", "(MethodHandles$Lookup,String,MethodType,MethodType,MethodHandle,MethodType)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
-      - ["java.lang.invoke", "MethodHandle", True, "asCollector", "(Class,int)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.lang.invoke", "MethodHandle", True, "asCollector", "(int,Class,int)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.lang.invoke", "MethodHandle", True, "asFixedArity", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.lang.invoke", "MethodHandle", True, "asFixedArity", "()", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.lang.invoke", "LambdaMetafactory", False, "altMetafactory", "(MethodHandles$Lookup,String,MethodType,Object[])", "", "Argument[2]", "ReturnValue.SyntheticField[java.lang.invoke.CallSite.target].SyntheticField[java.lang.invoke.MethodHandle.type]", "value", "dfc-generated"]
+      - ["java.lang.invoke", "LambdaMetafactory", False, "metafactory", "(MethodHandles$Lookup,String,MethodType,MethodType,MethodHandle,MethodType)", "", "Argument[2]", "ReturnValue.SyntheticField[java.lang.invoke.CallSite.target].SyntheticField[java.lang.invoke.MethodHandle.type]", "value", "dfc-generated"]
+      - ["java.lang.invoke", "MethodHandle", True, "asFixedArity", "()", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
       - ["java.lang.invoke", "MethodHandle", True, "asSpreader", "(Class,int)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.lang.invoke", "MethodHandle", True, "asSpreader", "(int,Class,int)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.lang.invoke", "MethodHandle", True, "asType", "(MethodType)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.lang.invoke", "MethodHandle", True, "asType", "(MethodType)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["java.lang.invoke", "MethodHandle", True, "asTypeUncached", "(MethodType)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.lang.invoke", "MethodHandle", True, "asTypeUncached", "(MethodType)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["java.lang.invoke", "MethodHandle", True, "asTypeUncached", "(MethodType)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.lang.invoke", "MethodHandle", True, "asVarargsCollector", "(Class)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
       - ["java.lang.invoke", "MethodHandle", True, "bindTo", "(Object)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["java.lang.invoke", "MethodHandle", True, "bindTo", "(Object)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.lang.invoke", "MethodHandle", True, "type", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.lang.invoke", "MethodHandle", True, "withVarargs", "(boolean)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.lang.invoke", "MethodHandle", True, "withVarargs", "(boolean)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
       - ["java.lang.invoke", "MethodHandleInfo", True, "getMethodType", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.lang.invoke", "MethodHandleInfo", True, "getName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.invoke", "MethodHandleInfo", True, "toString", "(int,Class,String,MethodType)", "", "Argument[2]", "ReturnValue", "taint", "dfc-generated"]
+      - ["java.lang.invoke", "MethodHandleInfo", True, "toString", "(int,Class,String,MethodType)", "", "Argument[3]", "ReturnValue", "taint", "dfc-generated"]
       - ["java.lang.invoke", "MethodHandles$Lookup", False, "bind", "(Object,String,MethodType)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["java.lang.invoke", "MethodHandles$Lookup", False, "dropLookupMode", "(int)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.lang.invoke", "MethodHandles$Lookup", False, "dropLookupMode", "(int)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
       - ["java.lang.invoke", "MethodHandles$Lookup", False, "findConstructor", "(Class,MethodType)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
       - ["java.lang.invoke", "MethodHandles$Lookup", False, "findGetter", "(Class,String,Class)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
       - ["java.lang.invoke", "MethodHandles$Lookup", False, "findSetter", "(Class,String,Class)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
@@ -49,7 +46,7 @@ extensions:
       - ["java.lang.invoke", "MethodHandles$Lookup", False, "findStaticSetter", "(Class,String,Class)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
       - ["java.lang.invoke", "MethodHandles$Lookup", False, "findVirtual", "(Class,String,MethodType)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
       - ["java.lang.invoke", "MethodHandles$Lookup", False, "findVirtual", "(Class,String,MethodType)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
-      - ["java.lang.invoke", "MethodHandles$Lookup", False, "in", "(Class)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.lang.invoke", "MethodHandles$Lookup", False, "in", "(Class)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
       - ["java.lang.invoke", "MethodHandles$Lookup", False, "revealDirect", "(MethodHandle)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["java.lang.invoke", "MethodHandles$Lookup", False, "unreflect", "(Method)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["java.lang.invoke", "MethodHandles$Lookup", False, "unreflectConstructor", "(Constructor)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
@@ -62,13 +59,12 @@ extensions:
       - ["java.lang.invoke", "MethodHandles", True, "dropArguments", "(MethodHandle,int,Class[])", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["java.lang.invoke", "MethodHandles", True, "dropArguments", "(MethodHandle,int,List)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["java.lang.invoke", "MethodHandles", True, "dropArgumentsToMatch", "(MethodHandle,int,List,int)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["java.lang.invoke", "MethodHandles", True, "dropReturn", "(MethodHandle)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.invoke", "MethodHandles", True, "dropReturn", "(MethodHandle)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
       - ["java.lang.invoke", "MethodHandles", True, "exactInvoker", "(MethodType)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["java.lang.invoke", "MethodHandles", True, "explicitCastArguments", "(MethodHandle,MethodType)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["java.lang.invoke", "MethodHandles", True, "explicitCastArguments", "(MethodHandle,MethodType)", "", "Argument[1]", "Argument[0]", "taint", "df-generated"]
       - ["java.lang.invoke", "MethodHandles", True, "explicitCastArguments", "(MethodHandle,MethodType)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["java.lang.invoke", "MethodHandles", True, "filterArguments", "(MethodHandle,int,MethodHandle[])", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["java.lang.invoke", "MethodHandles", True, "filterArguments", "(MethodHandle,int,MethodHandle[])", "", "Argument[2].ArrayElement", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.invoke", "MethodHandles", True, "filterArguments", "(MethodHandle,int,MethodHandle[])", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
       - ["java.lang.invoke", "MethodHandles", True, "filterReturnValue", "(MethodHandle,MethodHandle)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["java.lang.invoke", "MethodHandles", True, "filterReturnValue", "(MethodHandle,MethodHandle)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
       - ["java.lang.invoke", "MethodHandles", True, "foldArguments", "(MethodHandle,MethodHandle)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
@@ -82,58 +78,72 @@ extensions:
       - ["java.lang.invoke", "MethodHandles", True, "permuteArguments", "(MethodHandle,MethodType,int[])", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
       - ["java.lang.invoke", "MethodHandles", True, "varHandleExactInvoker", "(VarHandle$AccessMode,MethodType)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
       - ["java.lang.invoke", "MethodHandles", True, "varHandleInvoker", "(VarHandle$AccessMode,MethodType)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["java.lang.invoke", "MethodType", False, "appendParameterTypes", "(Class[])", "", "Argument[0].ArrayElement", "ReturnValue", "taint", "df-generated"]
-      - ["java.lang.invoke", "MethodType", False, "appendParameterTypes", "(Class[])", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.lang.invoke", "MethodType", False, "appendParameterTypes", "(List)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["java.lang.invoke", "MethodType", False, "appendParameterTypes", "(List)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.invoke", "MethodType", False, "appendParameterTypes", "(Class[])", "", "Argument[0]", "ReturnValue.SyntheticField[java.lang.invoke.MethodType.ptypes]", "taint", "dfc-generated"]
+      - ["java.lang.invoke", "MethodType", False, "appendParameterTypes", "(Class[])", "", "Argument[this].SyntheticField[java.lang.invoke.MethodType.ptypes]", "ReturnValue.SyntheticField[java.lang.invoke.MethodType.ptypes]", "taint", "dfc-generated"]
+      - ["java.lang.invoke", "MethodType", False, "appendParameterTypes", "(Class[])", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.lang.invoke", "MethodType", False, "appendParameterTypes", "(List)", "", "Argument[this].SyntheticField[java.lang.invoke.MethodType.ptypes]", "ReturnValue.SyntheticField[java.lang.invoke.MethodType.ptypes]", "taint", "dfc-generated"]
+      - ["java.lang.invoke", "MethodType", False, "appendParameterTypes", "(List)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.lang.invoke", "MethodType", False, "changeParameterType", "(int,Class)", "", "Argument[this].SyntheticField[java.lang.invoke.MethodType.ptypes].ArrayElement", "ReturnValue.SyntheticField[java.lang.invoke.MethodType.ptypes].ArrayElement", "value", "dfc-generated"]
+      - ["java.lang.invoke", "MethodType", False, "changeParameterType", "(int,Class)", "", "Argument[this].SyntheticField[java.lang.invoke.MethodType.ptypes]", "ReturnValue.SyntheticField[java.lang.invoke.MethodType.ptypes]", "value", "dfc-generated"]
+      - ["java.lang.invoke", "MethodType", False, "changeParameterType", "(int,Class)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.lang.invoke", "MethodType", False, "changeReturnType", "(Class)", "", "Argument[this].SyntheticField[java.lang.invoke.MethodType.ptypes].ArrayElement", "ReturnValue.SyntheticField[java.lang.invoke.MethodType.ptypes].ArrayElement", "value", "dfc-generated"]
+      - ["java.lang.invoke", "MethodType", False, "changeReturnType", "(Class)", "", "Argument[this].SyntheticField[java.lang.invoke.MethodType.ptypes]", "ReturnValue.SyntheticField[java.lang.invoke.MethodType.ptypes]", "value", "dfc-generated"]
+      - ["java.lang.invoke", "MethodType", False, "changeReturnType", "(Class)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.lang.invoke", "MethodType", False, "dropParameterTypes", "(int,int)", "", "Argument[this].SyntheticField[java.lang.invoke.MethodType.ptypes].ArrayElement", "ReturnValue.SyntheticField[java.lang.invoke.MethodType.ptypes].ArrayElement", "value", "dfc-generated"]
+      - ["java.lang.invoke", "MethodType", False, "dropParameterTypes", "(int,int)", "", "Argument[this].SyntheticField[java.lang.invoke.MethodType.ptypes]", "ReturnValue.SyntheticField[java.lang.invoke.MethodType.ptypes]", "taint", "dfc-generated"]
+      - ["java.lang.invoke", "MethodType", False, "dropParameterTypes", "(int,int)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
       - ["java.lang.invoke", "MethodType", False, "erase", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.lang.invoke", "MethodType", False, "insertParameterTypes", "(int,List)", "", "Argument[1].Element", "ReturnValue", "taint", "df-generated"]
-      - ["java.lang.invoke", "MethodType", False, "insertParameterTypes", "(int,List)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.lang.invoke", "MethodType", False, "methodType", "(Class,Class,Class[])", "", "Argument[2].ArrayElement", "ReturnValue", "taint", "df-generated"]
-      - ["java.lang.invoke", "MethodType", False, "methodType", "(Class,Class[])", "", "Argument[1].ArrayElement", "ReturnValue", "taint", "df-generated"]
-      - ["java.lang.invoke", "MethodType", False, "methodType", "(Class,List)", "", "Argument[1].Element", "ReturnValue", "taint", "df-generated"]
-      - ["java.lang.invoke", "MethodType", False, "methodType", "(Class,MethodType)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.invoke", "MethodType", False, "insertParameterTypes", "(int,Class[])", "", "Argument[1]", "ReturnValue.SyntheticField[java.lang.invoke.MethodType.ptypes]", "taint", "dfc-generated"]
+      - ["java.lang.invoke", "MethodType", False, "insertParameterTypes", "(int,Class[])", "", "Argument[this].SyntheticField[java.lang.invoke.MethodType.ptypes]", "ReturnValue.SyntheticField[java.lang.invoke.MethodType.ptypes]", "taint", "dfc-generated"]
+      - ["java.lang.invoke", "MethodType", False, "insertParameterTypes", "(int,Class[])", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.lang.invoke", "MethodType", False, "insertParameterTypes", "(int,List)", "", "Argument[this].SyntheticField[java.lang.invoke.MethodType.ptypes]", "ReturnValue.SyntheticField[java.lang.invoke.MethodType.ptypes]", "taint", "dfc-generated"]
+      - ["java.lang.invoke", "MethodType", False, "insertParameterTypes", "(int,List)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.lang.invoke", "MethodType", False, "methodType", "(Class,Class,Class[])", "", "Argument[2]", "ReturnValue.SyntheticField[java.lang.invoke.MethodType.ptypes]", "taint", "dfc-generated"]
+      - ["java.lang.invoke", "MethodType", False, "methodType", "(Class,Class[])", "", "Argument[1].ArrayElement", "ReturnValue.SyntheticField[java.lang.invoke.MethodType.ptypes].ArrayElement", "value", "dfc-generated"]
+      - ["java.lang.invoke", "MethodType", False, "methodType", "(Class,Class[])", "", "Argument[1]", "ReturnValue.SyntheticField[java.lang.invoke.MethodType.ptypes]", "value", "dfc-generated"]
+      - ["java.lang.invoke", "MethodType", False, "methodType", "(Class,List)", "", "Argument[1].Element", "ReturnValue.SyntheticField[java.lang.invoke.MethodType.ptypes].ArrayElement", "value", "dfc-generated"]
+      - ["java.lang.invoke", "MethodType", False, "methodType", "(Class,MethodType)", "", "Argument[1].SyntheticField[java.lang.invoke.MethodType.ptypes].ArrayElement", "ReturnValue.SyntheticField[java.lang.invoke.MethodType.ptypes].ArrayElement", "value", "dfc-generated"]
+      - ["java.lang.invoke", "MethodType", False, "methodType", "(Class,MethodType)", "", "Argument[1].SyntheticField[java.lang.invoke.MethodType.ptypes]", "ReturnValue.SyntheticField[java.lang.invoke.MethodType.ptypes]", "value", "dfc-generated"]
+      - ["java.lang.invoke", "MethodType", False, "parameterArray", "()", "", "Argument[this].SyntheticField[java.lang.invoke.MethodType.ptypes]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.lang.invoke", "MethodType", False, "parameterList", "()", "", "Argument[this].SyntheticField[java.lang.invoke.MethodType.ptypes].ArrayElement", "ReturnValue.Element", "value", "dfc-generated"]
       - ["java.lang.invoke", "MethodType", False, "toMethodDescriptorString", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.lang.invoke", "MethodType", False, "unwrap", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.lang.invoke", "MethodType", False, "wrap", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.lang.invoke", "MutableCallSite", True, "MutableCallSite", "(MethodHandle)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.lang.invoke", "MutableCallSite", True, "MutableCallSite", "(MethodHandle)", "", "Argument[0]", "Argument[this].SyntheticField[java.lang.invoke.CallSite.target]", "value", "dfc-generated"]
       - ["java.lang.invoke", "MutableCallSite", True, "MutableCallSite", "(MethodType)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.lang.invoke", "SerializedLambda", False, "SerializedLambda", "(Class,String,String,String,int,String,String,String,String,Object[])", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["java.lang.invoke", "SerializedLambda", False, "SerializedLambda", "(Class,String,String,String,int,String,String,String,String,Object[])", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
-      - ["java.lang.invoke", "SerializedLambda", False, "SerializedLambda", "(Class,String,String,String,int,String,String,String,String,Object[])", "", "Argument[3]", "Argument[this]", "taint", "df-generated"]
-      - ["java.lang.invoke", "SerializedLambda", False, "SerializedLambda", "(Class,String,String,String,int,String,String,String,String,Object[])", "", "Argument[5]", "Argument[this]", "taint", "df-generated"]
-      - ["java.lang.invoke", "SerializedLambda", False, "SerializedLambda", "(Class,String,String,String,int,String,String,String,String,Object[])", "", "Argument[6]", "Argument[this]", "taint", "df-generated"]
-      - ["java.lang.invoke", "SerializedLambda", False, "SerializedLambda", "(Class,String,String,String,int,String,String,String,String,Object[])", "", "Argument[7]", "Argument[this]", "taint", "df-generated"]
-      - ["java.lang.invoke", "SerializedLambda", False, "SerializedLambda", "(Class,String,String,String,int,String,String,String,String,Object[])", "", "Argument[8]", "Argument[this]", "taint", "df-generated"]
-      - ["java.lang.invoke", "SerializedLambda", False, "SerializedLambda", "(Class,String,String,String,int,String,String,String,String,Object[])", "", "Argument[9].ArrayElement", "Argument[this]", "taint", "df-generated"]
-      - ["java.lang.invoke", "SerializedLambda", False, "getCapturedArg", "(int)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.lang.invoke", "SerializedLambda", False, "getFunctionalInterfaceClass", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.lang.invoke", "SerializedLambda", False, "getFunctionalInterfaceMethodName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.lang.invoke", "SerializedLambda", False, "getFunctionalInterfaceMethodSignature", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.lang.invoke", "SerializedLambda", False, "getImplClass", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.lang.invoke", "SerializedLambda", False, "getImplMethodName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.lang.invoke", "SerializedLambda", False, "getImplMethodSignature", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.lang.invoke", "SerializedLambda", False, "getInstantiatedMethodType", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.invoke", "MutableCallSite", True, "getTarget", "()", "", "Argument[this].SyntheticField[java.lang.invoke.CallSite.target]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.lang.invoke", "SerializedLambda", False, "SerializedLambda", "(Class,String,String,String,int,String,String,String,String,Object[])", "", "Argument[1]", "Argument[this].SyntheticField[java.lang.invoke.SerializedLambda.functionalInterfaceClass]", "value", "dfc-generated"]
+      - ["java.lang.invoke", "SerializedLambda", False, "SerializedLambda", "(Class,String,String,String,int,String,String,String,String,Object[])", "", "Argument[2]", "Argument[this].SyntheticField[java.lang.invoke.SerializedLambda.functionalInterfaceMethodName]", "value", "dfc-generated"]
+      - ["java.lang.invoke", "SerializedLambda", False, "SerializedLambda", "(Class,String,String,String,int,String,String,String,String,Object[])", "", "Argument[3]", "Argument[this].SyntheticField[java.lang.invoke.SerializedLambda.functionalInterfaceMethodSignature]", "value", "dfc-generated"]
+      - ["java.lang.invoke", "SerializedLambda", False, "SerializedLambda", "(Class,String,String,String,int,String,String,String,String,Object[])", "", "Argument[5]", "Argument[this].SyntheticField[java.lang.invoke.SerializedLambda.implClass]", "value", "dfc-generated"]
+      - ["java.lang.invoke", "SerializedLambda", False, "SerializedLambda", "(Class,String,String,String,int,String,String,String,String,Object[])", "", "Argument[6]", "Argument[this].SyntheticField[java.lang.invoke.SerializedLambda.implMethodName]", "value", "dfc-generated"]
+      - ["java.lang.invoke", "SerializedLambda", False, "SerializedLambda", "(Class,String,String,String,int,String,String,String,String,Object[])", "", "Argument[7]", "Argument[this].SyntheticField[java.lang.invoke.SerializedLambda.implMethodSignature]", "value", "dfc-generated"]
+      - ["java.lang.invoke", "SerializedLambda", False, "SerializedLambda", "(Class,String,String,String,int,String,String,String,String,Object[])", "", "Argument[8]", "Argument[this].SyntheticField[java.lang.invoke.SerializedLambda.instantiatedMethodType]", "value", "dfc-generated"]
+      - ["java.lang.invoke", "SerializedLambda", False, "SerializedLambda", "(Class,String,String,String,int,String,String,String,String,Object[])", "", "Argument[9]", "Argument[this].SyntheticField[java.lang.invoke.SerializedLambda.capturedArgs]", "value", "dfc-generated"]
+      - ["java.lang.invoke", "SerializedLambda", False, "getCapturedArg", "(int)", "", "Argument[this].SyntheticField[java.lang.invoke.SerializedLambda.capturedArgs].ArrayElement", "ReturnValue", "value", "dfc-generated"]
+      - ["java.lang.invoke", "SerializedLambda", False, "getFunctionalInterfaceClass", "()", "", "Argument[this].SyntheticField[java.lang.invoke.SerializedLambda.functionalInterfaceClass]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.lang.invoke", "SerializedLambda", False, "getFunctionalInterfaceMethodName", "()", "", "Argument[this].SyntheticField[java.lang.invoke.SerializedLambda.functionalInterfaceMethodName]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.lang.invoke", "SerializedLambda", False, "getFunctionalInterfaceMethodSignature", "()", "", "Argument[this].SyntheticField[java.lang.invoke.SerializedLambda.functionalInterfaceMethodSignature]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.lang.invoke", "SerializedLambda", False, "getImplClass", "()", "", "Argument[this].SyntheticField[java.lang.invoke.SerializedLambda.implClass]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.lang.invoke", "SerializedLambda", False, "getImplMethodName", "()", "", "Argument[this].SyntheticField[java.lang.invoke.SerializedLambda.implMethodName]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.lang.invoke", "SerializedLambda", False, "getImplMethodSignature", "()", "", "Argument[this].SyntheticField[java.lang.invoke.SerializedLambda.implMethodSignature]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.lang.invoke", "SerializedLambda", False, "getInstantiatedMethodType", "()", "", "Argument[this].SyntheticField[java.lang.invoke.SerializedLambda.instantiatedMethodType]", "ReturnValue", "value", "dfc-generated"]
       - ["java.lang.invoke", "StringConcatException", True, "StringConcatException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.lang.invoke", "StringConcatException", True, "StringConcatException", "(String,Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.lang.invoke", "StringConcatException", True, "StringConcatException", "(String,Throwable)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["java.lang.invoke", "StringConcatFactory", False, "makeConcat", "(MethodHandles$Lookup,String,MethodType)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.invoke", "StringConcatFactory", False, "makeConcat", "(MethodHandles$Lookup,String,MethodType)", "", "Argument[2]", "ReturnValue.SyntheticField[java.lang.invoke.CallSite.target].SyntheticField[java.lang.invoke.MethodHandle.type]", "value", "dfc-generated"]
       - ["java.lang.invoke", "StringConcatFactory", False, "makeConcatWithConstants", "(MethodHandles$Lookup,String,MethodType,String,Object[])", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
-      - ["java.lang.invoke", "SwitchPoint", True, "guardWithTest", "(MethodHandle,MethodHandle)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.invoke", "SwitchPoint", True, "guardWithTest", "(MethodHandle,MethodHandle)", "", "Argument[1]", "ReturnValue", "value", "dfc-generated"]
       - ["java.lang.invoke", "TypeDescriptor", True, "descriptorString", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.lang.invoke", "VarHandle$VarHandleDesc", False, "ofArray", "(ClassDesc)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["java.lang.invoke", "VarHandle$VarHandleDesc", False, "ofField", "(ClassDesc,String,ClassDesc)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["java.lang.invoke", "VarHandle$VarHandleDesc", False, "ofField", "(ClassDesc,String,ClassDesc)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["java.lang.invoke", "VarHandle$VarHandleDesc", False, "ofField", "(ClassDesc,String,ClassDesc)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
-      - ["java.lang.invoke", "VarHandle$VarHandleDesc", False, "ofStaticField", "(ClassDesc,String,ClassDesc)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["java.lang.invoke", "VarHandle$VarHandleDesc", False, "ofStaticField", "(ClassDesc,String,ClassDesc)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["java.lang.invoke", "VarHandle$VarHandleDesc", False, "ofStaticField", "(ClassDesc,String,ClassDesc)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
-      - ["java.lang.invoke", "VarHandle$VarHandleDesc", False, "varType", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.invoke", "VarHandle$VarHandleDesc", False, "ofField", "(ClassDesc,String,ClassDesc)", "", "Argument[2]", "ReturnValue.SyntheticField[java.lang.invoke.VarHandle$VarHandleDesc.varType]", "value", "dfc-generated"]
+      - ["java.lang.invoke", "VarHandle$VarHandleDesc", False, "ofStaticField", "(ClassDesc,String,ClassDesc)", "", "Argument[2]", "ReturnValue.SyntheticField[java.lang.invoke.VarHandle$VarHandleDesc.varType]", "value", "dfc-generated"]
+      - ["java.lang.invoke", "VarHandle$VarHandleDesc", False, "varType", "()", "", "Argument[this].SyntheticField[java.lang.invoke.VarHandle$VarHandleDesc.varType]", "ReturnValue", "value", "dfc-generated"]
       - ["java.lang.invoke", "VarHandle", True, "accessModeType", "(VarHandle$AccessMode)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.lang.invoke", "VarHandle", True, "coordinateTypes", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.lang.invoke", "VarHandle", True, "toMethodHandle", "(VarHandle$AccessMode)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.lang.invoke", "VarHandle", True, "withInvokeBehavior", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.lang.invoke", "VarHandle", True, "withInvokeExactBehavior", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.invoke", "VarHandle", True, "withInvokeBehavior", "()", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.lang.invoke", "VarHandle", True, "withInvokeExactBehavior", "()", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
       - ["java.lang.invoke", "VolatileCallSite", True, "VolatileCallSite", "(MethodHandle)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.lang.invoke", "VolatileCallSite", True, "VolatileCallSite", "(MethodType)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.lang.invoke", "WrongMethodTypeException", True, "WrongMethodTypeException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
@@ -141,6 +151,7 @@ extensions:
       pack: codeql/java-all
       extensible: neutralModel
     data:
+      - ["java.lang.invoke", "CallSite", "getTarget", "()", "summary", "df-generated"]
       - ["java.lang.invoke", "CallSite", "setTarget", "(MethodHandle)", "summary", "df-generated"]
       - ["java.lang.invoke", "ConstantBootstraps", "arrayVarHandle", "(MethodHandles$Lookup,String,Class,Class)", "summary", "df-generated"]
       - ["java.lang.invoke", "ConstantBootstraps", "enumConstant", "(MethodHandles$Lookup,String,Class)", "summary", "df-generated"]
@@ -151,17 +162,16 @@ extensions:
       - ["java.lang.invoke", "ConstantBootstraps", "nullConstant", "(MethodHandles$Lookup,String,Class)", "summary", "df-generated"]
       - ["java.lang.invoke", "ConstantBootstraps", "primitiveClass", "(MethodHandles$Lookup,String,Class)", "summary", "df-generated"]
       - ["java.lang.invoke", "ConstantBootstraps", "staticFieldVarHandle", "(MethodHandles$Lookup,String,Class,Class,Class)", "summary", "df-generated"]
+      - ["java.lang.invoke", "ConstantCallSite", "setTarget", "(MethodHandle)", "summary", "df-generated"]
+      - ["java.lang.invoke", "MethodHandle", "asCollector", "(Class,int)", "summary", "df-generated"]
+      - ["java.lang.invoke", "MethodHandle", "asCollector", "(int,Class,int)", "summary", "df-generated"]
       - ["java.lang.invoke", "MethodHandle", "invoke", "(Object[])", "summary", "df-generated"]
       - ["java.lang.invoke", "MethodHandle", "invokeExact", "(Object[])", "summary", "df-generated"]
       - ["java.lang.invoke", "MethodHandle", "invokeWithArguments", "(List)", "summary", "df-generated"]
       - ["java.lang.invoke", "MethodHandle", "invokeWithArguments", "(Object[])", "summary", "df-generated"]
       - ["java.lang.invoke", "MethodHandle", "isVarargsCollector", "()", "summary", "df-generated"]
-      - ["java.lang.invoke", "MethodHandleInfo", "getDeclaringClass", "()", "summary", "df-generated"]
-      - ["java.lang.invoke", "MethodHandleInfo", "getModifiers", "()", "summary", "df-generated"]
-      - ["java.lang.invoke", "MethodHandleInfo", "getReferenceKind", "()", "summary", "df-generated"]
       - ["java.lang.invoke", "MethodHandleInfo", "isVarArgs", "()", "summary", "df-generated"]
       - ["java.lang.invoke", "MethodHandleInfo", "referenceKindToString", "(int)", "summary", "df-generated"]
-      - ["java.lang.invoke", "MethodHandleInfo", "reflectAs", "(Class,MethodHandles$Lookup)", "summary", "df-generated"]
       - ["java.lang.invoke", "MethodHandleProxies", "asInterfaceInstance", "(Class,MethodHandle)", "summary", "df-generated"]
       - ["java.lang.invoke", "MethodHandleProxies", "isWrapperInstance", "(Object)", "summary", "df-generated"]
       - ["java.lang.invoke", "MethodHandleProxies", "wrapperInstanceTarget", "(Object)", "summary", "df-generated"]
@@ -216,6 +226,10 @@ extensions:
       - ["java.lang.invoke", "MethodType", "lastParameterType", "()", "summary", "df-generated"]
       - ["java.lang.invoke", "MethodType", "methodType", "(Class)", "summary", "df-generated"]
       - ["java.lang.invoke", "MethodType", "methodType", "(Class,Class)", "summary", "df-generated"]
+      - ["java.lang.invoke", "MethodType", "parameterCount", "()", "summary", "df-generated"]
+      - ["java.lang.invoke", "MethodType", "parameterType", "(int)", "summary", "df-generated"]
+      - ["java.lang.invoke", "MethodType", "returnType", "()", "summary", "df-generated"]
+      - ["java.lang.invoke", "MutableCallSite", "setTarget", "(MethodHandle)", "summary", "df-generated"]
       - ["java.lang.invoke", "MutableCallSite", "syncAll", "(MutableCallSite[])", "summary", "df-generated"]
       - ["java.lang.invoke", "SerializedLambda", "getCapturedArgCount", "()", "summary", "df-generated"]
       - ["java.lang.invoke", "SerializedLambda", "getCapturingClass", "()", "summary", "df-generated"]
@@ -263,3 +277,5 @@ extensions:
       - ["java.lang.invoke", "VarHandle", "weakCompareAndSetAcquire", "(Object[])", "summary", "df-generated"]
       - ["java.lang.invoke", "VarHandle", "weakCompareAndSetPlain", "(Object[])", "summary", "df-generated"]
       - ["java.lang.invoke", "VarHandle", "weakCompareAndSetRelease", "(Object[])", "summary", "df-generated"]
+      - ["java.lang.invoke", "VolatileCallSite", "getTarget", "()", "summary", "df-generated"]
+      - ["java.lang.invoke", "VolatileCallSite", "setTarget", "(MethodHandle)", "summary", "df-generated"]
diff --git a/java/ql/lib/ext/generated/java.lang.management.model.yml b/java/ql/lib/ext/generated/java.lang.management.model.yml
index 6fd0dea3597..c6ea183af37 100644
--- a/java/ql/lib/ext/generated/java.lang.management.model.yml
+++ b/java/ql/lib/ext/generated/java.lang.management.model.yml
@@ -4,21 +4,27 @@ extensions:
       pack: codeql/java-all
       extensible: summaryModel
     data:
-      - ["java.lang.management", "LockInfo", True, "LockInfo", "(String,int)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.lang.management", "CompilationMXBean", True, "getName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.management", "LockInfo", True, "LockInfo", "(String,int)", "", "Argument[0]", "Argument[this].SyntheticField[java.lang.management.LockInfo.className]", "value", "dfc-generated"]
       - ["java.lang.management", "LockInfo", True, "from", "(CompositeData)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["java.lang.management", "LockInfo", True, "getClassName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.lang.management", "ManagementPermission", False, "ManagementPermission", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.lang.management", "ManagementPermission", False, "ManagementPermission", "(String,String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.lang.management", "MemoryNotificationInfo", True, "MemoryNotificationInfo", "(String,MemoryUsage,long)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.lang.management", "MemoryNotificationInfo", True, "MemoryNotificationInfo", "(String,MemoryUsage,long)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.lang.management", "LockInfo", True, "getClassName", "()", "", "Argument[this].SyntheticField[java.lang.management.LockInfo.className]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.lang.management", "ManagementPermission", False, "ManagementPermission", "(String)", "", "Argument[0]", "Argument[this]", "taint", "dfc-generated"]
+      - ["java.lang.management", "ManagementPermission", False, "ManagementPermission", "(String,String)", "", "Argument[0]", "Argument[this]", "taint", "dfc-generated"]
+      - ["java.lang.management", "MemoryManagerMXBean", True, "getMemoryPoolNames", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.management", "MemoryManagerMXBean", True, "getName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.management", "MemoryNotificationInfo", True, "MemoryNotificationInfo", "(String,MemoryUsage,long)", "", "Argument[0]", "Argument[this].SyntheticField[java.lang.management.MemoryNotificationInfo.poolName]", "value", "dfc-generated"]
+      - ["java.lang.management", "MemoryNotificationInfo", True, "MemoryNotificationInfo", "(String,MemoryUsage,long)", "", "Argument[1]", "Argument[this].SyntheticField[java.lang.management.MemoryNotificationInfo.usage]", "value", "dfc-generated"]
       - ["java.lang.management", "MemoryNotificationInfo", True, "from", "(CompositeData)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["java.lang.management", "MemoryNotificationInfo", True, "getPoolName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.lang.management", "MemoryNotificationInfo", True, "getUsage", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.management", "MemoryNotificationInfo", True, "getPoolName", "()", "", "Argument[this].SyntheticField[java.lang.management.MemoryNotificationInfo.poolName]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.lang.management", "MemoryNotificationInfo", True, "getUsage", "()", "", "Argument[this].SyntheticField[java.lang.management.MemoryNotificationInfo.usage]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.lang.management", "MemoryPoolMXBean", True, "getMemoryManagerNames", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.management", "MemoryPoolMXBean", True, "getName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.lang.management", "MemoryUsage", True, "from", "(CompositeData)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["java.lang.management", "MonitorInfo", True, "MonitorInfo", "(String,int,int,StackTraceElement)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.lang.management", "MonitorInfo", True, "MonitorInfo", "(String,int,int,StackTraceElement)", "", "Argument[3]", "Argument[this]", "taint", "df-generated"]
+      - ["java.lang.management", "MonitorInfo", True, "MonitorInfo", "(String,int,int,StackTraceElement)", "", "Argument[3]", "Argument[this].SyntheticField[java.lang.management.MonitorInfo.stackFrame]", "value", "dfc-generated"]
       - ["java.lang.management", "MonitorInfo", True, "from", "(CompositeData)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["java.lang.management", "MonitorInfo", True, "getLockedStackFrame", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.management", "MonitorInfo", True, "getLockedStackFrame", "()", "", "Argument[this].SyntheticField[java.lang.management.MonitorInfo.stackFrame]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.lang.management", "PlatformManagedObject", True, "getObjectName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.management", "RuntimeMXBean", True, "getInputArguments", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.lang.management", "ThreadInfo", True, "from", "(CompositeData)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["java.lang.management", "ThreadInfo", True, "getLockInfo", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.lang.management", "ThreadInfo", True, "getLockName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
diff --git a/java/ql/lib/ext/generated/java.lang.model.yml b/java/ql/lib/ext/generated/java.lang.model.yml
index e9b8c6c85ea..fd8552dd265 100644
--- a/java/ql/lib/ext/generated/java.lang.model.yml
+++ b/java/ql/lib/ext/generated/java.lang.model.yml
@@ -5,8 +5,6 @@ extensions:
       extensible: summaryModel
     data:
       - ["java.lang", "AbstractMethodError", True, "AbstractMethodError", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.lang", "AbstractStringBuilder", True, "appendCodePoint", "(int)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["java.lang", "AbstractStringBuilder", True, "deleteCharAt", "(int)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
       - ["java.lang", "ArithmeticException", True, "ArithmeticException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.lang", "ArrayIndexOutOfBoundsException", True, "ArrayIndexOutOfBoundsException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.lang", "ArrayStoreException", True, "ArrayStoreException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
@@ -22,23 +20,23 @@ extensions:
       - ["java.lang", "ClassCastException", True, "ClassCastException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.lang", "ClassCircularityError", True, "ClassCircularityError", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.lang", "ClassFormatError", True, "ClassFormatError", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.lang", "ClassLoader", True, "getResources", "(String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["java.lang", "ClassNotFoundException", True, "ClassNotFoundException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.lang", "ClassNotFoundException", True, "ClassNotFoundException", "(String,Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.lang", "ClassNotFoundException", True, "ClassNotFoundException", "(String,Throwable)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["java.lang", "ClassNotFoundException", True, "getException", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang", "ClassNotFoundException", True, "ClassNotFoundException", "(String,Throwable)", "", "Argument[1]", "Argument[this].SyntheticField[java.lang.Throwable.cause]", "value", "dfc-generated"]
+      - ["java.lang", "ClassNotFoundException", True, "getException", "()", "", "Argument[this].SyntheticField[java.lang.Throwable.cause]", "ReturnValue", "value", "dfc-generated"]
       - ["java.lang", "ClassValue", True, "get", "(Class)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.lang", "CloneNotSupportedException", True, "CloneNotSupportedException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.lang", "Enum$EnumDesc", False, "of", "(ClassDesc,String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["java.lang", "Enum$EnumDesc", False, "of", "(ClassDesc,String)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["java.lang", "EnumConstantNotPresentException", True, "EnumConstantNotPresentException", "(Class,String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["java.lang", "EnumConstantNotPresentException", True, "constantName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang", "EnumConstantNotPresentException", True, "EnumConstantNotPresentException", "(Class,String)", "", "Argument[1]", "Argument[this].SyntheticField[java.lang.EnumConstantNotPresentException.constantName]", "value", "dfc-generated"]
+      - ["java.lang", "EnumConstantNotPresentException", True, "constantName", "()", "", "Argument[this].SyntheticField[java.lang.EnumConstantNotPresentException.constantName]", "ReturnValue", "value", "dfc-generated"]
       - ["java.lang", "Error", True, "Error", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.lang", "Error", True, "Error", "(String,Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.lang", "Error", True, "Error", "(String,Throwable)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
       - ["java.lang", "Error", True, "Error", "(Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.lang", "ExceptionInInitializerError", True, "ExceptionInInitializerError", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.lang", "ExceptionInInitializerError", True, "ExceptionInInitializerError", "(Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.lang", "ExceptionInInitializerError", True, "getException", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang", "ExceptionInInitializerError", True, "ExceptionInInitializerError", "(Throwable)", "", "Argument[0]", "Argument[this].SyntheticField[java.lang.Throwable.cause]", "value", "dfc-generated"]
+      - ["java.lang", "ExceptionInInitializerError", True, "getException", "()", "", "Argument[this].SyntheticField[java.lang.Throwable.cause]", "ReturnValue", "value", "dfc-generated"]
       - ["java.lang", "IllegalAccessError", True, "IllegalAccessError", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.lang", "IllegalAccessException", True, "IllegalAccessException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.lang", "IllegalArgumentException", True, "IllegalArgumentException", "(String,Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
@@ -68,36 +66,34 @@ extensions:
       - ["java.lang", "LinkageError", True, "LinkageError", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.lang", "LinkageError", True, "LinkageError", "(String,Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.lang", "LinkageError", True, "LinkageError", "(String,Throwable)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["java.lang", "Module", False, "addExports", "(String,Module)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["java.lang", "Module", False, "addOpens", "(String,Module)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["java.lang", "Module", False, "addReads", "(Module)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["java.lang", "Module", False, "addUses", "(Class)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.lang", "Module", False, "addExports", "(String,Module)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.lang", "Module", False, "addOpens", "(String,Module)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.lang", "Module", False, "addReads", "(Module)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.lang", "Module", False, "addUses", "(Class)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
       - ["java.lang", "Module", False, "getClassLoader", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.lang", "Module", False, "getDescriptor", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.lang", "Module", False, "getLayer", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.lang", "Module", False, "getName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.lang", "Module", False, "getPackages", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.lang", "ModuleLayer$Controller", False, "addExports", "(Module,String,Module)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["java.lang", "ModuleLayer$Controller", False, "addOpens", "(Module,String,Module)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["java.lang", "ModuleLayer$Controller", False, "addReads", "(Module,Module)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.lang", "Module", False, "getResourceAsStream", "(String)", "", "Argument[0]", "ReturnValue", "taint", "dfc-generated"]
+      - ["java.lang", "ModuleLayer$Controller", False, "addExports", "(Module,String,Module)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.lang", "ModuleLayer$Controller", False, "addOpens", "(Module,String,Module)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.lang", "ModuleLayer$Controller", False, "addReads", "(Module,Module)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
       - ["java.lang", "ModuleLayer$Controller", False, "layer", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.lang", "ModuleLayer", False, "configuration", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.lang", "ModuleLayer", False, "defineModules", "(Configuration,Function)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["java.lang", "ModuleLayer", False, "defineModules", "(Configuration,Function)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang", "ModuleLayer", False, "configuration", "()", "", "Argument[this].SyntheticField[java.lang.ModuleLayer.cf]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.lang", "ModuleLayer", False, "defineModules", "(Configuration,Function)", "", "Argument[0]", "ReturnValue.SyntheticField[java.lang.ModuleLayer.cf]", "value", "dfc-generated"]
+      - ["java.lang", "ModuleLayer", False, "defineModules", "(Configuration,Function)", "", "Argument[this]", "ReturnValue.SyntheticField[java.lang.ModuleLayer.parents].Element", "value", "dfc-generated"]
       - ["java.lang", "ModuleLayer", False, "defineModules", "(Configuration,List,Function)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["java.lang", "ModuleLayer", False, "defineModules", "(Configuration,List,Function)", "", "Argument[1].Element", "ReturnValue", "taint", "df-generated"]
-      - ["java.lang", "ModuleLayer", False, "defineModulesWithManyLoaders", "(Configuration,ClassLoader)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["java.lang", "ModuleLayer", False, "defineModulesWithManyLoaders", "(Configuration,ClassLoader)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang", "ModuleLayer", False, "defineModulesWithManyLoaders", "(Configuration,ClassLoader)", "", "Argument[0]", "ReturnValue.SyntheticField[java.lang.ModuleLayer.cf]", "value", "dfc-generated"]
+      - ["java.lang", "ModuleLayer", False, "defineModulesWithManyLoaders", "(Configuration,ClassLoader)", "", "Argument[this]", "ReturnValue.SyntheticField[java.lang.ModuleLayer.parents].Element", "value", "dfc-generated"]
       - ["java.lang", "ModuleLayer", False, "defineModulesWithManyLoaders", "(Configuration,List,ClassLoader)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["java.lang", "ModuleLayer", False, "defineModulesWithManyLoaders", "(Configuration,List,ClassLoader)", "", "Argument[1].Element", "ReturnValue", "taint", "df-generated"]
-      - ["java.lang", "ModuleLayer", False, "defineModulesWithOneLoader", "(Configuration,ClassLoader)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["java.lang", "ModuleLayer", False, "defineModulesWithOneLoader", "(Configuration,ClassLoader)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang", "ModuleLayer", False, "defineModulesWithOneLoader", "(Configuration,ClassLoader)", "", "Argument[0]", "ReturnValue.SyntheticField[java.lang.ModuleLayer.cf]", "value", "dfc-generated"]
+      - ["java.lang", "ModuleLayer", False, "defineModulesWithOneLoader", "(Configuration,ClassLoader)", "", "Argument[this]", "ReturnValue.SyntheticField[java.lang.ModuleLayer.parents].Element", "value", "dfc-generated"]
       - ["java.lang", "ModuleLayer", False, "defineModulesWithOneLoader", "(Configuration,List,ClassLoader)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["java.lang", "ModuleLayer", False, "defineModulesWithOneLoader", "(Configuration,List,ClassLoader)", "", "Argument[1].Element", "ReturnValue", "taint", "df-generated"]
       - ["java.lang", "ModuleLayer", False, "findLoader", "(String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.lang", "ModuleLayer", False, "findModule", "(String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.lang", "ModuleLayer", False, "modules", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.lang", "ModuleLayer", False, "parents", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang", "ModuleLayer", False, "parents", "()", "", "Argument[this].SyntheticField[java.lang.ModuleLayer.parents]", "ReturnValue", "value", "dfc-generated"]
       - ["java.lang", "NegativeArraySizeException", True, "NegativeArraySizeException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.lang", "NoClassDefFoundError", True, "NoClassDefFoundError", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.lang", "NoSuchFieldError", True, "NoSuchFieldError", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
@@ -109,12 +105,12 @@ extensions:
       - ["java.lang", "Package", True, "getImplementationTitle", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.lang", "Package", True, "getImplementationVendor", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.lang", "Package", True, "getImplementationVersion", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.lang", "Package", True, "getName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.lang", "Package", True, "getPackage", "(String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang", "Package", True, "getName", "()", "", "Argument[this].SyntheticField[java.lang.NamedPackage.name]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.lang", "Package", True, "getPackage", "(String)", "", "Argument[0]", "ReturnValue.SyntheticField[java.lang.NamedPackage.name]", "taint", "dfc-generated"]
       - ["java.lang", "Package", True, "getSpecificationTitle", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.lang", "Package", True, "getSpecificationVendor", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.lang", "Package", True, "getSpecificationVersion", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.lang", "Process", True, "destroyForcibly", "()", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.lang", "Process", True, "destroyForcibly", "()", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
       - ["java.lang", "Process", True, "errorReader", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.lang", "Process", True, "errorReader", "(Charset)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.lang", "Process", True, "getErrorStream", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
@@ -125,109 +121,114 @@ extensions:
       - ["java.lang", "Process", True, "outputWriter", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.lang", "Process", True, "outputWriter", "(Charset)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.lang", "Process", True, "toHandle", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.lang", "ProcessBuilder", False, "ProcessBuilder", "(List)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["java.lang", "ProcessBuilder", False, "ProcessBuilder", "(String[])", "", "Argument[0].ArrayElement", "Argument[this]", "taint", "df-generated"]
-      - ["java.lang", "ProcessBuilder", False, "command", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.lang", "ProcessBuilder", False, "command", "(List)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["java.lang", "ProcessBuilder", False, "command", "(List)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["java.lang", "ProcessBuilder", False, "command", "(String[])", "", "Argument[0].ArrayElement", "Argument[this]", "taint", "df-generated"]
-      - ["java.lang", "ProcessBuilder", False, "command", "(String[])", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["java.lang", "ProcessBuilder", False, "directory", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.lang", "ProcessBuilder", False, "directory", "(File)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.lang", "ProcessBuilder", False, "directory", "(File)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["java.lang", "ProcessBuilder", False, "inheritIO", "()", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["java.lang", "ProcessBuilder", False, "redirectError", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.lang", "ProcessBuilder", False, "redirectError", "(File)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.lang", "ProcessBuilder", False, "redirectError", "(ProcessBuilder$Redirect)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.lang", "ProcessBuilder", False, "redirectError", "(ProcessBuilder$Redirect)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["java.lang", "ProcessBuilder", False, "redirectErrorStream", "(boolean)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["java.lang", "ProcessBuilder", False, "redirectInput", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.lang", "ProcessBuilder", False, "redirectInput", "(File)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.lang", "ProcessBuilder", False, "redirectInput", "(ProcessBuilder$Redirect)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.lang", "ProcessBuilder", False, "redirectInput", "(ProcessBuilder$Redirect)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["java.lang", "ProcessBuilder", False, "redirectOutput", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.lang", "ProcessBuilder", False, "redirectOutput", "(File)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.lang", "ProcessBuilder", False, "redirectOutput", "(ProcessBuilder$Redirect)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.lang", "ProcessBuilder", False, "redirectOutput", "(ProcessBuilder$Redirect)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.lang", "ProcessBuilder", False, "ProcessBuilder", "(List)", "", "Argument[0]", "Argument[this].SyntheticField[java.lang.ProcessBuilder.command]", "value", "dfc-generated"]
+      - ["java.lang", "ProcessBuilder", False, "ProcessBuilder", "(String[])", "", "Argument[0].ArrayElement", "Argument[this].SyntheticField[java.lang.ProcessBuilder.command].Element", "value", "dfc-generated"]
+      - ["java.lang", "ProcessBuilder", False, "command", "()", "", "Argument[this].SyntheticField[java.lang.ProcessBuilder.command]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.lang", "ProcessBuilder", False, "command", "(List)", "", "Argument[0]", "Argument[this].SyntheticField[java.lang.ProcessBuilder.command]", "value", "dfc-generated"]
+      - ["java.lang", "ProcessBuilder", False, "command", "(List)", "", "Argument[0]", "ReturnValue.SyntheticField[java.lang.ProcessBuilder.command]", "value", "dfc-generated"]
+      - ["java.lang", "ProcessBuilder", False, "command", "(List)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.lang", "ProcessBuilder", False, "command", "(String[])", "", "Argument[0].ArrayElement", "Argument[this].SyntheticField[java.lang.ProcessBuilder.command].Element", "value", "dfc-generated"]
+      - ["java.lang", "ProcessBuilder", False, "command", "(String[])", "", "Argument[0].ArrayElement", "ReturnValue.SyntheticField[java.lang.ProcessBuilder.command].Element", "value", "dfc-generated"]
+      - ["java.lang", "ProcessBuilder", False, "command", "(String[])", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.lang", "ProcessBuilder", False, "directory", "()", "", "Argument[this].SyntheticField[java.lang.ProcessBuilder.directory]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.lang", "ProcessBuilder", False, "directory", "(File)", "", "Argument[0]", "Argument[this].SyntheticField[java.lang.ProcessBuilder.directory]", "value", "dfc-generated"]
+      - ["java.lang", "ProcessBuilder", False, "directory", "(File)", "", "Argument[0]", "ReturnValue.SyntheticField[java.lang.ProcessBuilder.directory]", "value", "dfc-generated"]
+      - ["java.lang", "ProcessBuilder", False, "directory", "(File)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.lang", "ProcessBuilder", False, "inheritIO", "()", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.lang", "ProcessBuilder", False, "redirectError", "()", "", "Argument[this].SyntheticField[java.lang.ProcessBuilder.redirects].ArrayElement", "ReturnValue", "value", "dfc-generated"]
+      - ["java.lang", "ProcessBuilder", False, "redirectError", "(File)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.lang", "ProcessBuilder", False, "redirectError", "(ProcessBuilder$Redirect)", "", "Argument[0]", "Argument[this].SyntheticField[java.lang.ProcessBuilder.redirects].ArrayElement", "value", "dfc-generated"]
+      - ["java.lang", "ProcessBuilder", False, "redirectError", "(ProcessBuilder$Redirect)", "", "Argument[0]", "ReturnValue.SyntheticField[java.lang.ProcessBuilder.redirects].ArrayElement", "value", "dfc-generated"]
+      - ["java.lang", "ProcessBuilder", False, "redirectError", "(ProcessBuilder$Redirect)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.lang", "ProcessBuilder", False, "redirectErrorStream", "(boolean)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.lang", "ProcessBuilder", False, "redirectInput", "()", "", "Argument[this].SyntheticField[java.lang.ProcessBuilder.redirects].ArrayElement", "ReturnValue", "value", "dfc-generated"]
+      - ["java.lang", "ProcessBuilder", False, "redirectInput", "(File)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.lang", "ProcessBuilder", False, "redirectInput", "(ProcessBuilder$Redirect)", "", "Argument[0]", "Argument[this].SyntheticField[java.lang.ProcessBuilder.redirects].ArrayElement", "value", "dfc-generated"]
+      - ["java.lang", "ProcessBuilder", False, "redirectInput", "(ProcessBuilder$Redirect)", "", "Argument[0]", "ReturnValue.SyntheticField[java.lang.ProcessBuilder.redirects].ArrayElement", "value", "dfc-generated"]
+      - ["java.lang", "ProcessBuilder", False, "redirectInput", "(ProcessBuilder$Redirect)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.lang", "ProcessBuilder", False, "redirectOutput", "()", "", "Argument[this].SyntheticField[java.lang.ProcessBuilder.redirects].ArrayElement", "ReturnValue", "value", "dfc-generated"]
+      - ["java.lang", "ProcessBuilder", False, "redirectOutput", "(File)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.lang", "ProcessBuilder", False, "redirectOutput", "(ProcessBuilder$Redirect)", "", "Argument[0]", "Argument[this].SyntheticField[java.lang.ProcessBuilder.redirects].ArrayElement", "value", "dfc-generated"]
+      - ["java.lang", "ProcessBuilder", False, "redirectOutput", "(ProcessBuilder$Redirect)", "", "Argument[0]", "ReturnValue.SyntheticField[java.lang.ProcessBuilder.redirects].ArrayElement", "value", "dfc-generated"]
+      - ["java.lang", "ProcessBuilder", False, "redirectOutput", "(ProcessBuilder$Redirect)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
       - ["java.lang", "ProcessHandle$Info", True, "arguments", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.lang", "ProcessHandle$Info", True, "command", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.lang", "ProcessHandle$Info", True, "commandLine", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.lang", "ProcessHandle$Info", True, "user", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang", "Readable", True, "read", "(CharBuffer)", "", "Argument[this]", "Argument[0]", "taint", "df-generated"]
       - ["java.lang", "ReflectiveOperationException", True, "ReflectiveOperationException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.lang", "ReflectiveOperationException", True, "ReflectiveOperationException", "(String,Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.lang", "ReflectiveOperationException", True, "ReflectiveOperationException", "(String,Throwable)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
       - ["java.lang", "ReflectiveOperationException", True, "ReflectiveOperationException", "(Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.lang", "Runtime$Version", False, "build", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.lang", "Runtime$Version", False, "optional", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.lang", "Runtime$Version", False, "pre", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.lang", "RuntimePermission", False, "RuntimePermission", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.lang", "RuntimePermission", False, "RuntimePermission", "(String,String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.lang", "Runtime$Version", False, "optional", "()", "", "Argument[this].SyntheticField[java.lang.Runtime$Version.optional]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.lang", "Runtime$Version", False, "parse", "(String)", "", "Argument[0]", "ReturnValue.SyntheticField[java.lang.Runtime$Version.optional].Element", "taint", "dfc-generated"]
+      - ["java.lang", "Runtime$Version", False, "parse", "(String)", "", "Argument[0]", "ReturnValue.SyntheticField[java.lang.Runtime$Version.pre].Element", "taint", "dfc-generated"]
+      - ["java.lang", "Runtime$Version", False, "pre", "()", "", "Argument[this].SyntheticField[java.lang.Runtime$Version.pre]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.lang", "RuntimePermission", False, "RuntimePermission", "(String)", "", "Argument[0]", "Argument[this]", "taint", "dfc-generated"]
+      - ["java.lang", "RuntimePermission", False, "RuntimePermission", "(String,String)", "", "Argument[0]", "Argument[this]", "taint", "dfc-generated"]
       - ["java.lang", "SecurityException", True, "SecurityException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.lang", "SecurityException", True, "SecurityException", "(String,Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.lang", "SecurityException", True, "SecurityException", "(String,Throwable)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
       - ["java.lang", "SecurityException", True, "SecurityException", "(Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.lang", "StackOverflowError", True, "StackOverflowError", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.lang", "StackTraceElement", False, "StackTraceElement", "(String,String,String,String,String,String,int)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.lang", "StackTraceElement", False, "StackTraceElement", "(String,String,String,String,String,String,int)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["java.lang", "StackTraceElement", False, "StackTraceElement", "(String,String,String,String,String,String,int)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
-      - ["java.lang", "StackTraceElement", False, "StackTraceElement", "(String,String,String,String,String,String,int)", "", "Argument[3]", "Argument[this]", "taint", "df-generated"]
-      - ["java.lang", "StackTraceElement", False, "StackTraceElement", "(String,String,String,String,String,String,int)", "", "Argument[4]", "Argument[this]", "taint", "df-generated"]
-      - ["java.lang", "StackTraceElement", False, "StackTraceElement", "(String,String,String,String,String,String,int)", "", "Argument[5]", "Argument[this]", "taint", "df-generated"]
-      - ["java.lang", "StackTraceElement", False, "StackTraceElement", "(String,String,String,int)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.lang", "StackTraceElement", False, "StackTraceElement", "(String,String,String,int)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["java.lang", "StackTraceElement", False, "StackTraceElement", "(String,String,String,int)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
-      - ["java.lang", "StackTraceElement", False, "getClassLoaderName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.lang", "StackTraceElement", False, "getClassName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.lang", "StackTraceElement", False, "getFileName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.lang", "StackTraceElement", False, "getMethodName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.lang", "StackTraceElement", False, "getModuleName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.lang", "StackTraceElement", False, "getModuleVersion", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang", "StackTraceElement", False, "StackTraceElement", "(String,String,String,String,String,String,int)", "", "Argument[0]", "Argument[this].SyntheticField[java.lang.StackTraceElement.classLoaderName]", "value", "dfc-generated"]
+      - ["java.lang", "StackTraceElement", False, "StackTraceElement", "(String,String,String,String,String,String,int)", "", "Argument[1]", "Argument[this].SyntheticField[java.lang.StackTraceElement.moduleName]", "value", "dfc-generated"]
+      - ["java.lang", "StackTraceElement", False, "StackTraceElement", "(String,String,String,String,String,String,int)", "", "Argument[2]", "Argument[this].SyntheticField[java.lang.StackTraceElement.moduleVersion]", "value", "dfc-generated"]
+      - ["java.lang", "StackTraceElement", False, "StackTraceElement", "(String,String,String,String,String,String,int)", "", "Argument[3]", "Argument[this].SyntheticField[java.lang.StackTraceElement.declaringClass]", "value", "dfc-generated"]
+      - ["java.lang", "StackTraceElement", False, "StackTraceElement", "(String,String,String,String,String,String,int)", "", "Argument[4]", "Argument[this].SyntheticField[java.lang.StackTraceElement.methodName]", "value", "dfc-generated"]
+      - ["java.lang", "StackTraceElement", False, "StackTraceElement", "(String,String,String,String,String,String,int)", "", "Argument[5]", "Argument[this].SyntheticField[java.lang.StackTraceElement.fileName]", "value", "dfc-generated"]
+      - ["java.lang", "StackTraceElement", False, "StackTraceElement", "(String,String,String,int)", "", "Argument[0]", "Argument[this].SyntheticField[java.lang.StackTraceElement.declaringClass]", "value", "dfc-generated"]
+      - ["java.lang", "StackTraceElement", False, "StackTraceElement", "(String,String,String,int)", "", "Argument[1]", "Argument[this].SyntheticField[java.lang.StackTraceElement.methodName]", "value", "dfc-generated"]
+      - ["java.lang", "StackTraceElement", False, "StackTraceElement", "(String,String,String,int)", "", "Argument[2]", "Argument[this].SyntheticField[java.lang.StackTraceElement.fileName]", "value", "dfc-generated"]
+      - ["java.lang", "StackTraceElement", False, "getClassLoaderName", "()", "", "Argument[this].SyntheticField[java.lang.StackTraceElement.classLoaderName]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.lang", "StackTraceElement", False, "getClassName", "()", "", "Argument[this].SyntheticField[java.lang.StackTraceElement.declaringClass]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.lang", "StackTraceElement", False, "getFileName", "()", "", "Argument[this].SyntheticField[java.lang.StackTraceElement.fileName]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.lang", "StackTraceElement", False, "getMethodName", "()", "", "Argument[this].SyntheticField[java.lang.StackTraceElement.methodName]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.lang", "StackTraceElement", False, "getModuleName", "()", "", "Argument[this].SyntheticField[java.lang.StackTraceElement.moduleName]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.lang", "StackTraceElement", False, "getModuleVersion", "()", "", "Argument[this].SyntheticField[java.lang.StackTraceElement.moduleVersion]", "ReturnValue", "value", "dfc-generated"]
       - ["java.lang", "StackWalker$StackFrame", True, "getDescriptor", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.lang", "StackWalker$StackFrame", True, "getFileName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.lang", "StackWalker$StackFrame", True, "getMethodName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.lang", "StackWalker$StackFrame", True, "getMethodType", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.lang", "StackWalker$StackFrame", True, "toStackTraceElement", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.lang", "StackWalker", False, "getInstance", "(Set)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["java.lang", "StackWalker", False, "getInstance", "(Set,int)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang", "StringBuffer", False, "appendCodePoint", "(int)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.lang", "StringBuffer", False, "deleteCharAt", "(int)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.lang", "StringBuilder", False, "appendCodePoint", "(int)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.lang", "StringBuilder", False, "deleteCharAt", "(int)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
       - ["java.lang", "StringIndexOutOfBoundsException", True, "StringIndexOutOfBoundsException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.lang", "System$Logger", True, "getName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.lang", "System$LoggerFinder", True, "getLocalizedLogger", "(String,ResourceBundle,Module)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["java.lang", "System$LoggerFinder", True, "getLocalizedLogger", "(String,ResourceBundle,Module)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang", "System$LoggerFinder", True, "getLogger", "(String,Module)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["java.lang", "System", False, "getLogger", "(String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["java.lang", "System", False, "getLogger", "(String,ResourceBundle)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["java.lang", "System", False, "getLogger", "(String,ResourceBundle)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
       - ["java.lang", "Thread", True, "Thread", "(Runnable,String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.lang", "Thread", True, "Thread", "(Runnable,String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["java.lang", "Thread", True, "Thread", "(ThreadGroup,Runnable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.lang", "Thread", True, "Thread", "(ThreadGroup,Runnable)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["java.lang", "Thread", True, "Thread", "(ThreadGroup,Runnable,String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.lang", "Thread", True, "Thread", "(ThreadGroup,Runnable,String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["java.lang", "Thread", True, "Thread", "(ThreadGroup,Runnable,String)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
-      - ["java.lang", "Thread", True, "Thread", "(ThreadGroup,Runnable,String,long)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.lang", "Thread", True, "Thread", "(ThreadGroup,Runnable,String,long)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["java.lang", "Thread", True, "Thread", "(ThreadGroup,Runnable,String,long)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
-      - ["java.lang", "Thread", True, "Thread", "(ThreadGroup,Runnable,String,long,boolean)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.lang", "Thread", True, "Thread", "(ThreadGroup,Runnable,String,long,boolean)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["java.lang", "Thread", True, "Thread", "(ThreadGroup,Runnable,String,long,boolean)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
-      - ["java.lang", "Thread", True, "Thread", "(ThreadGroup,String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.lang", "Thread", True, "Thread", "(ThreadGroup,String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["java.lang", "Thread", True, "getThreadGroup", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.lang", "Thread", True, "getUncaughtExceptionHandler", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang", "Thread", True, "Thread", "(ThreadGroup,Runnable)", "", "Argument[0]", "Argument[this].SyntheticField[java.lang.Thread.group]", "value", "dfc-generated"]
+      - ["java.lang", "Thread", True, "Thread", "(ThreadGroup,Runnable,String)", "", "Argument[0]", "Argument[this].SyntheticField[java.lang.Thread.group]", "value", "dfc-generated"]
+      - ["java.lang", "Thread", True, "Thread", "(ThreadGroup,Runnable,String,long)", "", "Argument[0]", "Argument[this].SyntheticField[java.lang.Thread.group]", "value", "dfc-generated"]
+      - ["java.lang", "Thread", True, "Thread", "(ThreadGroup,Runnable,String,long,boolean)", "", "Argument[0]", "Argument[this].SyntheticField[java.lang.Thread.group]", "value", "dfc-generated"]
+      - ["java.lang", "Thread", True, "Thread", "(ThreadGroup,String)", "", "Argument[0]", "Argument[this].SyntheticField[java.lang.Thread.group]", "value", "dfc-generated"]
+      - ["java.lang", "Thread", True, "getThreadGroup", "()", "", "Argument[this].SyntheticField[java.lang.Thread.group]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.lang", "Thread", True, "getUncaughtExceptionHandler", "()", "", "Argument[this].SyntheticField[java.lang.Thread.group]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.lang", "Thread", True, "getUncaughtExceptionHandler", "()", "", "Argument[this].SyntheticField[java.lang.Thread.uncaughtExceptionHandler]", "ReturnValue", "value", "dfc-generated"]
       - ["java.lang", "Thread", True, "setContextClassLoader", "(ClassLoader)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.lang", "Thread", True, "setName", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.lang", "Thread", True, "setUncaughtExceptionHandler", "(Thread$UncaughtExceptionHandler)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.lang", "ThreadGroup", True, "ThreadGroup", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.lang", "ThreadGroup", True, "ThreadGroup", "(ThreadGroup,String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.lang", "ThreadGroup", True, "ThreadGroup", "(ThreadGroup,String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["java.lang", "ThreadGroup", True, "ThreadGroup", "(ThreadGroup,String)", "", "Argument[this]", "Argument[0]", "taint", "df-generated"]
-      - ["java.lang", "ThreadGroup", True, "enumerate", "(ThreadGroup[])", "", "Argument[this]", "Argument[0].ArrayElement", "taint", "df-generated"]
-      - ["java.lang", "ThreadGroup", True, "enumerate", "(ThreadGroup[],boolean)", "", "Argument[this]", "Argument[0].ArrayElement", "taint", "df-generated"]
+      - ["java.lang", "Thread", True, "setUncaughtExceptionHandler", "(Thread$UncaughtExceptionHandler)", "", "Argument[0]", "Argument[this].SyntheticField[java.lang.Thread.uncaughtExceptionHandler]", "value", "dfc-generated"]
+      - ["java.lang", "ThreadGroup", True, "ThreadGroup", "(String)", "", "Argument[0]", "Argument[this].SyntheticField[java.lang.ThreadGroup.name]", "value", "dfc-generated"]
+      - ["java.lang", "ThreadGroup", True, "ThreadGroup", "(ThreadGroup,String)", "", "Argument[0]", "Argument[this].SyntheticField[java.lang.ThreadGroup.parent]", "value", "dfc-generated"]
+      - ["java.lang", "ThreadGroup", True, "ThreadGroup", "(ThreadGroup,String)", "", "Argument[1]", "Argument[this].SyntheticField[java.lang.ThreadGroup.name]", "value", "dfc-generated"]
+      - ["java.lang", "ThreadGroup", True, "ThreadGroup", "(ThreadGroup,String)", "", "Argument[this]", "Argument[0].SyntheticField[java.lang.ThreadGroup.groups].ArrayElement", "value", "dfc-generated"]
+      - ["java.lang", "ThreadGroup", True, "enumerate", "(ThreadGroup[])", "", "Argument[this].SyntheticField[java.lang.ThreadGroup.groups]", "Argument[0]", "taint", "dfc-generated"]
+      - ["java.lang", "ThreadGroup", True, "enumerate", "(ThreadGroup[],boolean)", "", "Argument[this].SyntheticField[java.lang.ThreadGroup.groups]", "Argument[0]", "taint", "dfc-generated"]
       - ["java.lang", "ThreadGroup", True, "enumerate", "(Thread[])", "", "Argument[this]", "Argument[0].ArrayElement", "taint", "df-generated"]
       - ["java.lang", "ThreadGroup", True, "enumerate", "(Thread[],boolean)", "", "Argument[this]", "Argument[0].ArrayElement", "taint", "df-generated"]
-      - ["java.lang", "ThreadGroup", True, "getName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.lang", "ThreadGroup", True, "getParent", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.lang", "TypeNotPresentException", True, "TypeNotPresentException", "(String,Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.lang", "TypeNotPresentException", True, "TypeNotPresentException", "(String,Throwable)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["java.lang", "TypeNotPresentException", True, "typeName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang", "ThreadGroup", True, "getName", "()", "", "Argument[this].SyntheticField[java.lang.ThreadGroup.name]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.lang", "ThreadGroup", True, "getParent", "()", "", "Argument[this].SyntheticField[java.lang.ThreadGroup.parent]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.lang", "TypeNotPresentException", True, "TypeNotPresentException", "(String,Throwable)", "", "Argument[0]", "Argument[this].SyntheticField[java.lang.TypeNotPresentException.typeName]", "value", "dfc-generated"]
+      - ["java.lang", "TypeNotPresentException", True, "typeName", "()", "", "Argument[this].SyntheticField[java.lang.TypeNotPresentException.typeName]", "ReturnValue", "value", "dfc-generated"]
       - ["java.lang", "UnknownError", True, "UnknownError", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.lang", "UnsatisfiedLinkError", True, "UnsatisfiedLinkError", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.lang", "UnsupportedClassVersionError", True, "UnsupportedClassVersionError", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
@@ -239,23 +240,14 @@ extensions:
       - ["java.lang", "VirtualMachineError", True, "VirtualMachineError", "(String,Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.lang", "VirtualMachineError", True, "VirtualMachineError", "(String,Throwable)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
       - ["java.lang", "VirtualMachineError", True, "VirtualMachineError", "(Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.lang", "WeakPairMap$Pair$Lookup", False, "first", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang", "WeakPairMap$Pair$Lookup", False, "second", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang", "WeakPairMap$Pair$Weak", False, "first", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang", "WeakPairMap$Pair$Weak", False, "second", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
   - addsTo:
       pack: codeql/java-all
       extensible: neutralModel
     data:
-      - ["java.lang", "AbstractStringBuilder", "capacity", "()", "summary", "df-generated"]
-      - ["java.lang", "AbstractStringBuilder", "codePointAt", "(int)", "summary", "df-generated"]
-      - ["java.lang", "AbstractStringBuilder", "codePointBefore", "(int)", "summary", "df-generated"]
-      - ["java.lang", "AbstractStringBuilder", "codePointCount", "(int,int)", "summary", "df-generated"]
-      - ["java.lang", "AbstractStringBuilder", "ensureCapacity", "(int)", "summary", "df-generated"]
-      - ["java.lang", "AbstractStringBuilder", "indexOf", "(String)", "summary", "df-generated"]
-      - ["java.lang", "AbstractStringBuilder", "indexOf", "(String,int)", "summary", "df-generated"]
-      - ["java.lang", "AbstractStringBuilder", "lastIndexOf", "(String)", "summary", "df-generated"]
-      - ["java.lang", "AbstractStringBuilder", "lastIndexOf", "(String,int)", "summary", "df-generated"]
-      - ["java.lang", "AbstractStringBuilder", "offsetByCodePoints", "(int,int)", "summary", "df-generated"]
-      - ["java.lang", "AbstractStringBuilder", "setCharAt", "(int,char)", "summary", "df-generated"]
-      - ["java.lang", "AbstractStringBuilder", "setLength", "(int)", "summary", "df-generated"]
-      - ["java.lang", "AbstractStringBuilder", "trimToSize", "()", "summary", "df-generated"]
       - ["java.lang", "ArrayIndexOutOfBoundsException", "ArrayIndexOutOfBoundsException", "(int)", "summary", "df-generated"]
       - ["java.lang", "AssertionError", "AssertionError", "(boolean)", "summary", "df-generated"]
       - ["java.lang", "AssertionError", "AssertionError", "(char)", "summary", "df-generated"]
@@ -263,7 +255,6 @@ extensions:
       - ["java.lang", "AssertionError", "AssertionError", "(float)", "summary", "df-generated"]
       - ["java.lang", "AssertionError", "AssertionError", "(int)", "summary", "df-generated"]
       - ["java.lang", "AssertionError", "AssertionError", "(long)", "summary", "df-generated"]
-      - ["java.lang", "AutoCloseable", "close", "()", "summary", "df-generated"]
       - ["java.lang", "Boolean", "Boolean", "(String)", "summary", "df-generated"]
       - ["java.lang", "Boolean", "Boolean", "(boolean)", "summary", "df-generated"]
       - ["java.lang", "Boolean", "compare", "(boolean,boolean)", "summary", "df-generated"]
@@ -272,15 +263,20 @@ extensions:
       - ["java.lang", "Boolean", "logicalAnd", "(boolean,boolean)", "summary", "df-generated"]
       - ["java.lang", "Boolean", "logicalOr", "(boolean,boolean)", "summary", "df-generated"]
       - ["java.lang", "Boolean", "logicalXor", "(boolean,boolean)", "summary", "df-generated"]
+      - ["java.lang", "Boolean", "toString", "(boolean)", "summary", "df-generated"]
       - ["java.lang", "Boolean", "valueOf", "(String)", "summary", "df-generated"]
       - ["java.lang", "Byte", "Byte", "(String)", "summary", "df-generated"]
       - ["java.lang", "Byte", "Byte", "(byte)", "summary", "df-generated"]
+      - ["java.lang", "Byte", "byteValue", "()", "summary", "df-generated"]
       - ["java.lang", "Byte", "compare", "(byte,byte)", "summary", "df-generated"]
       - ["java.lang", "Byte", "compareUnsigned", "(byte,byte)", "summary", "df-generated"]
       - ["java.lang", "Byte", "decode", "(String)", "summary", "df-generated"]
+      - ["java.lang", "Byte", "floatValue", "()", "summary", "df-generated"]
       - ["java.lang", "Byte", "hashCode", "(byte)", "summary", "df-generated"]
       - ["java.lang", "Byte", "parseByte", "(String)", "summary", "df-generated"]
       - ["java.lang", "Byte", "parseByte", "(String,int)", "summary", "df-generated"]
+      - ["java.lang", "Byte", "shortValue", "()", "summary", "df-generated"]
+      - ["java.lang", "Byte", "toString", "(byte)", "summary", "df-generated"]
       - ["java.lang", "Byte", "toUnsignedInt", "(byte)", "summary", "df-generated"]
       - ["java.lang", "Byte", "toUnsignedLong", "(byte)", "summary", "df-generated"]
       - ["java.lang", "Byte", "valueOf", "(String)", "summary", "df-generated"]
@@ -288,7 +284,6 @@ extensions:
       - ["java.lang", "Byte", "valueOf", "(byte)", "summary", "df-generated"]
       - ["java.lang", "CharSequence", "compare", "(CharSequence,CharSequence)", "summary", "df-generated"]
       - ["java.lang", "CharSequence", "isEmpty", "()", "summary", "df-generated"]
-      - ["java.lang", "CharSequence", "length", "()", "summary", "df-generated"]
       - ["java.lang", "Character$UnicodeBlock", "forName", "(String)", "summary", "df-generated"]
       - ["java.lang", "Character$UnicodeBlock", "of", "(char)", "summary", "df-generated"]
       - ["java.lang", "Character$UnicodeBlock", "of", "(int)", "summary", "df-generated"]
@@ -372,12 +367,16 @@ extensions:
       - ["java.lang", "Character", "toCodePoint", "(char,char)", "summary", "df-generated"]
       - ["java.lang", "Character", "toLowerCase", "(char)", "summary", "df-generated"]
       - ["java.lang", "Character", "toLowerCase", "(int)", "summary", "df-generated"]
+      - ["java.lang", "Character", "toString", "(char)", "summary", "df-generated"]
+      - ["java.lang", "Character", "toString", "(int)", "summary", "df-generated"]
       - ["java.lang", "Character", "toTitleCase", "(char)", "summary", "df-generated"]
       - ["java.lang", "Character", "toTitleCase", "(int)", "summary", "df-generated"]
       - ["java.lang", "Character", "toUpperCase", "(char)", "summary", "df-generated"]
       - ["java.lang", "Character", "toUpperCase", "(int)", "summary", "df-generated"]
       - ["java.lang", "Character", "valueOf", "(char)", "summary", "df-generated"]
+      - ["java.lang", "Class", "arrayType", "()", "summary", "df-generated"]
       - ["java.lang", "Class", "asSubclass", "(Class)", "summary", "df-generated"]
+      - ["java.lang", "Class", "componentType", "()", "summary", "df-generated"]
       - ["java.lang", "Class", "desiredAssertionStatus", "()", "summary", "df-generated"]
       - ["java.lang", "Class", "forName", "(Module,String)", "summary", "df-generated"]
       - ["java.lang", "Class", "forName", "(String,boolean,ClassLoader)", "summary", "df-generated"]
@@ -414,24 +413,24 @@ extensions:
       - ["java.lang", "Class", "getSigners", "()", "summary", "df-generated"]
       - ["java.lang", "Class", "getSuperclass", "()", "summary", "df-generated"]
       - ["java.lang", "Class", "isAnnotation", "()", "summary", "df-generated"]
+      - ["java.lang", "Class", "isAnnotationPresent", "(Class)", "summary", "df-generated"]
       - ["java.lang", "Class", "isAnonymousClass", "()", "summary", "df-generated"]
+      - ["java.lang", "Class", "isArray", "()", "summary", "df-generated"]
       - ["java.lang", "Class", "isEnum", "()", "summary", "df-generated"]
       - ["java.lang", "Class", "isHidden", "()", "summary", "df-generated"]
       - ["java.lang", "Class", "isInterface", "()", "summary", "df-generated"]
       - ["java.lang", "Class", "isLocalClass", "()", "summary", "df-generated"]
       - ["java.lang", "Class", "isMemberClass", "()", "summary", "df-generated"]
       - ["java.lang", "Class", "isNestmateOf", "(Class)", "summary", "df-generated"]
+      - ["java.lang", "Class", "isPrimitive", "()", "summary", "df-generated"]
       - ["java.lang", "Class", "isRecord", "()", "summary", "df-generated"]
       - ["java.lang", "Class", "isSealed", "()", "summary", "df-generated"]
       - ["java.lang", "Class", "isSynthetic", "()", "summary", "df-generated"]
       - ["java.lang", "Class", "newInstance", "()", "summary", "df-generated"]
       - ["java.lang", "Class", "toGenericString", "()", "summary", "df-generated"]
       - ["java.lang", "ClassLoader", "clearAssertionStatus", "()", "summary", "df-generated"]
-      - ["java.lang", "ClassLoader", "findResources", "(String)", "summary", "df-generated"]
       - ["java.lang", "ClassLoader", "getDefinedPackages", "()", "summary", "df-generated"]
       - ["java.lang", "ClassLoader", "getPlatformClassLoader", "()", "summary", "df-generated"]
-      - ["java.lang", "ClassLoader", "getResourceAsStream", "(String)", "summary", "df-generated"]
-      - ["java.lang", "ClassLoader", "getResources", "(String)", "summary", "df-generated"]
       - ["java.lang", "ClassLoader", "getSystemClassLoader", "()", "summary", "df-generated"]
       - ["java.lang", "ClassLoader", "getSystemResourceAsStream", "(String)", "summary", "df-generated"]
       - ["java.lang", "ClassLoader", "getSystemResources", "(String)", "summary", "df-generated"]
@@ -446,8 +445,10 @@ extensions:
       - ["java.lang", "Compiler", "enable", "()", "summary", "df-generated"]
       - ["java.lang", "Double", "Double", "(String)", "summary", "df-generated"]
       - ["java.lang", "Double", "Double", "(double)", "summary", "df-generated"]
+      - ["java.lang", "Double", "byteValue", "()", "summary", "df-generated"]
       - ["java.lang", "Double", "compare", "(double,double)", "summary", "df-generated"]
       - ["java.lang", "Double", "doubleToRawLongBits", "(double)", "summary", "df-generated"]
+      - ["java.lang", "Double", "floatValue", "()", "summary", "df-generated"]
       - ["java.lang", "Double", "hashCode", "(double)", "summary", "df-generated"]
       - ["java.lang", "Double", "isFinite", "(double)", "summary", "df-generated"]
       - ["java.lang", "Double", "isInfinite", "()", "summary", "df-generated"]
@@ -457,8 +458,10 @@ extensions:
       - ["java.lang", "Double", "longBitsToDouble", "(long)", "summary", "df-generated"]
       - ["java.lang", "Double", "max", "(double,double)", "summary", "df-generated"]
       - ["java.lang", "Double", "min", "(double,double)", "summary", "df-generated"]
+      - ["java.lang", "Double", "shortValue", "()", "summary", "df-generated"]
       - ["java.lang", "Double", "sum", "(double,double)", "summary", "df-generated"]
       - ["java.lang", "Double", "toHexString", "(double)", "summary", "df-generated"]
+      - ["java.lang", "Double", "toString", "(double)", "summary", "df-generated"]
       - ["java.lang", "Double", "valueOf", "(String)", "summary", "df-generated"]
       - ["java.lang", "Enum", "getDeclaringClass", "()", "summary", "df-generated"]
       - ["java.lang", "Enum", "valueOf", "(Class,String)", "summary", "df-generated"]
@@ -469,9 +472,11 @@ extensions:
       - ["java.lang", "Float", "Float", "(String)", "summary", "df-generated"]
       - ["java.lang", "Float", "Float", "(double)", "summary", "df-generated"]
       - ["java.lang", "Float", "Float", "(float)", "summary", "df-generated"]
+      - ["java.lang", "Float", "byteValue", "()", "summary", "df-generated"]
       - ["java.lang", "Float", "compare", "(float,float)", "summary", "df-generated"]
       - ["java.lang", "Float", "floatToIntBits", "(float)", "summary", "df-generated"]
       - ["java.lang", "Float", "floatToRawIntBits", "(float)", "summary", "df-generated"]
+      - ["java.lang", "Float", "floatValue", "()", "summary", "df-generated"]
       - ["java.lang", "Float", "hashCode", "(float)", "summary", "df-generated"]
       - ["java.lang", "Float", "intBitsToFloat", "(int)", "summary", "df-generated"]
       - ["java.lang", "Float", "isFinite", "(float)", "summary", "df-generated"]
@@ -482,18 +487,22 @@ extensions:
       - ["java.lang", "Float", "max", "(float,float)", "summary", "df-generated"]
       - ["java.lang", "Float", "min", "(float,float)", "summary", "df-generated"]
       - ["java.lang", "Float", "parseFloat", "(String)", "summary", "df-generated"]
+      - ["java.lang", "Float", "shortValue", "()", "summary", "df-generated"]
       - ["java.lang", "Float", "sum", "(float,float)", "summary", "df-generated"]
       - ["java.lang", "Float", "toHexString", "(float)", "summary", "df-generated"]
+      - ["java.lang", "Float", "toString", "(float)", "summary", "df-generated"]
       - ["java.lang", "Float", "valueOf", "(String)", "summary", "df-generated"]
       - ["java.lang", "Float", "valueOf", "(float)", "summary", "df-generated"]
       - ["java.lang", "IndexOutOfBoundsException", "IndexOutOfBoundsException", "(int)", "summary", "df-generated"]
       - ["java.lang", "IndexOutOfBoundsException", "IndexOutOfBoundsException", "(long)", "summary", "df-generated"]
       - ["java.lang", "Integer", "Integer", "(String)", "summary", "df-generated"]
       - ["java.lang", "Integer", "bitCount", "(int)", "summary", "df-generated"]
+      - ["java.lang", "Integer", "byteValue", "()", "summary", "df-generated"]
       - ["java.lang", "Integer", "compare", "(int,int)", "summary", "df-generated"]
       - ["java.lang", "Integer", "compareUnsigned", "(int,int)", "summary", "df-generated"]
       - ["java.lang", "Integer", "decode", "(String)", "summary", "df-generated"]
       - ["java.lang", "Integer", "divideUnsigned", "(int,int)", "summary", "df-generated"]
+      - ["java.lang", "Integer", "floatValue", "()", "summary", "df-generated"]
       - ["java.lang", "Integer", "getInteger", "(String)", "summary", "df-generated"]
       - ["java.lang", "Integer", "getInteger", "(String,Integer)", "summary", "df-generated"]
       - ["java.lang", "Integer", "getInteger", "(String,int)", "summary", "df-generated"]
@@ -514,6 +523,7 @@ extensions:
       - ["java.lang", "Integer", "reverseBytes", "(int)", "summary", "df-generated"]
       - ["java.lang", "Integer", "rotateLeft", "(int,int)", "summary", "df-generated"]
       - ["java.lang", "Integer", "rotateRight", "(int,int)", "summary", "df-generated"]
+      - ["java.lang", "Integer", "shortValue", "()", "summary", "df-generated"]
       - ["java.lang", "Integer", "signum", "(int)", "summary", "df-generated"]
       - ["java.lang", "Integer", "sum", "(int,int)", "summary", "df-generated"]
       - ["java.lang", "Integer", "toBinaryString", "(int)", "summary", "df-generated"]
@@ -526,10 +536,12 @@ extensions:
       - ["java.lang", "LiveStackFrame$PrimitiveSlot", "size", "()", "summary", "df-generated"]
       - ["java.lang", "Long", "Long", "(String)", "summary", "df-generated"]
       - ["java.lang", "Long", "bitCount", "(long)", "summary", "df-generated"]
+      - ["java.lang", "Long", "byteValue", "()", "summary", "df-generated"]
       - ["java.lang", "Long", "compare", "(long,long)", "summary", "df-generated"]
       - ["java.lang", "Long", "compareUnsigned", "(long,long)", "summary", "df-generated"]
       - ["java.lang", "Long", "decode", "(String)", "summary", "df-generated"]
       - ["java.lang", "Long", "divideUnsigned", "(long,long)", "summary", "df-generated"]
+      - ["java.lang", "Long", "floatValue", "()", "summary", "df-generated"]
       - ["java.lang", "Long", "getLong", "(String)", "summary", "df-generated"]
       - ["java.lang", "Long", "getLong", "(String,Long)", "summary", "df-generated"]
       - ["java.lang", "Long", "getLong", "(String,long)", "summary", "df-generated"]
@@ -550,6 +562,7 @@ extensions:
       - ["java.lang", "Long", "reverseBytes", "(long)", "summary", "df-generated"]
       - ["java.lang", "Long", "rotateLeft", "(long,int)", "summary", "df-generated"]
       - ["java.lang", "Long", "rotateRight", "(long,int)", "summary", "df-generated"]
+      - ["java.lang", "Long", "shortValue", "()", "summary", "df-generated"]
       - ["java.lang", "Long", "signum", "(long)", "summary", "df-generated"]
       - ["java.lang", "Long", "sum", "(long,long)", "summary", "df-generated"]
       - ["java.lang", "Long", "toBinaryString", "(long)", "summary", "df-generated"]
@@ -633,7 +646,6 @@ extensions:
       - ["java.lang", "Math", "ulp", "(float)", "summary", "df-generated"]
       - ["java.lang", "Module", "canRead", "(Module)", "summary", "df-generated"]
       - ["java.lang", "Module", "canUse", "(Class)", "summary", "df-generated"]
-      - ["java.lang", "Module", "getResourceAsStream", "(String)", "summary", "df-generated"]
       - ["java.lang", "Module", "isExported", "(String)", "summary", "df-generated"]
       - ["java.lang", "Module", "isExported", "(String,Module)", "summary", "df-generated"]
       - ["java.lang", "Module", "isNamed", "()", "summary", "df-generated"]
@@ -642,20 +654,15 @@ extensions:
       - ["java.lang", "ModuleLayer", "boot", "()", "summary", "df-generated"]
       - ["java.lang", "ModuleLayer", "empty", "()", "summary", "df-generated"]
       - ["java.lang", "Number", "byteValue", "()", "summary", "df-generated"]
-      - ["java.lang", "Number", "doubleValue", "()", "summary", "df-generated"]
       - ["java.lang", "Number", "floatValue", "()", "summary", "df-generated"]
-      - ["java.lang", "Number", "intValue", "()", "summary", "df-generated"]
-      - ["java.lang", "Number", "longValue", "()", "summary", "df-generated"]
       - ["java.lang", "Number", "shortValue", "()", "summary", "df-generated"]
-      - ["java.lang", "Object", "equals", "(Object)", "summary", "df-generated"]
-      - ["java.lang", "Object", "finalize", "()", "summary", "df-generated"]
-      - ["java.lang", "Object", "hashCode", "()", "summary", "df-generated"]
       - ["java.lang", "Object", "notify", "()", "summary", "df-generated"]
       - ["java.lang", "Object", "notifyAll", "()", "summary", "df-generated"]
       - ["java.lang", "Object", "wait", "()", "summary", "df-generated"]
       - ["java.lang", "Object", "wait", "(long)", "summary", "df-generated"]
       - ["java.lang", "Object", "wait", "(long,int)", "summary", "df-generated"]
       - ["java.lang", "Package", "getPackages", "()", "summary", "df-generated"]
+      - ["java.lang", "Package", "isAnnotationPresent", "(Class)", "summary", "df-generated"]
       - ["java.lang", "Package", "isCompatibleWith", "(String)", "summary", "df-generated"]
       - ["java.lang", "Package", "isSealed", "()", "summary", "df-generated"]
       - ["java.lang", "Package", "isSealed", "(URL)", "summary", "df-generated"]
@@ -678,29 +685,15 @@ extensions:
       - ["java.lang", "ProcessBuilder", "redirectErrorStream", "()", "summary", "df-generated"]
       - ["java.lang", "ProcessBuilder", "start", "()", "summary", "df-generated"]
       - ["java.lang", "ProcessBuilder", "startPipeline", "(List)", "summary", "df-generated"]
-      - ["java.lang", "ProcessHandle$Info", "startInstant", "()", "summary", "df-generated"]
-      - ["java.lang", "ProcessHandle$Info", "totalCpuDuration", "()", "summary", "df-generated"]
       - ["java.lang", "ProcessHandle", "allProcesses", "()", "summary", "df-generated"]
-      - ["java.lang", "ProcessHandle", "children", "()", "summary", "df-generated"]
       - ["java.lang", "ProcessHandle", "current", "()", "summary", "df-generated"]
-      - ["java.lang", "ProcessHandle", "descendants", "()", "summary", "df-generated"]
-      - ["java.lang", "ProcessHandle", "destroy", "()", "summary", "df-generated"]
-      - ["java.lang", "ProcessHandle", "destroyForcibly", "()", "summary", "df-generated"]
-      - ["java.lang", "ProcessHandle", "info", "()", "summary", "df-generated"]
-      - ["java.lang", "ProcessHandle", "isAlive", "()", "summary", "df-generated"]
       - ["java.lang", "ProcessHandle", "of", "(long)", "summary", "df-generated"]
-      - ["java.lang", "ProcessHandle", "onExit", "()", "summary", "df-generated"]
-      - ["java.lang", "ProcessHandle", "parent", "()", "summary", "df-generated"]
-      - ["java.lang", "ProcessHandle", "pid", "()", "summary", "df-generated"]
-      - ["java.lang", "ProcessHandle", "supportsNormalTermination", "()", "summary", "df-generated"]
-      - ["java.lang", "Readable", "read", "(CharBuffer)", "summary", "df-generated"]
       - ["java.lang", "Runtime$Version", "compareToIgnoreOptional", "(Runtime$Version)", "summary", "df-generated"]
       - ["java.lang", "Runtime$Version", "equalsIgnoreOptional", "(Object)", "summary", "df-generated"]
       - ["java.lang", "Runtime$Version", "feature", "()", "summary", "df-generated"]
       - ["java.lang", "Runtime$Version", "interim", "()", "summary", "df-generated"]
       - ["java.lang", "Runtime$Version", "major", "()", "summary", "df-generated"]
       - ["java.lang", "Runtime$Version", "minor", "()", "summary", "df-generated"]
-      - ["java.lang", "Runtime$Version", "parse", "(String)", "summary", "df-generated"]
       - ["java.lang", "Runtime$Version", "patch", "()", "summary", "df-generated"]
       - ["java.lang", "Runtime$Version", "security", "()", "summary", "df-generated"]
       - ["java.lang", "Runtime$Version", "update", "()", "summary", "df-generated"]
@@ -755,13 +748,17 @@ extensions:
       - ["java.lang", "SecurityManager", "getThreadGroup", "()", "summary", "df-generated"]
       - ["java.lang", "Short", "Short", "(String)", "summary", "df-generated"]
       - ["java.lang", "Short", "Short", "(short)", "summary", "df-generated"]
+      - ["java.lang", "Short", "byteValue", "()", "summary", "df-generated"]
       - ["java.lang", "Short", "compare", "(short,short)", "summary", "df-generated"]
       - ["java.lang", "Short", "compareUnsigned", "(short,short)", "summary", "df-generated"]
       - ["java.lang", "Short", "decode", "(String)", "summary", "df-generated"]
+      - ["java.lang", "Short", "floatValue", "()", "summary", "df-generated"]
       - ["java.lang", "Short", "hashCode", "(short)", "summary", "df-generated"]
       - ["java.lang", "Short", "parseShort", "(String)", "summary", "df-generated"]
       - ["java.lang", "Short", "parseShort", "(String,int)", "summary", "df-generated"]
       - ["java.lang", "Short", "reverseBytes", "(short)", "summary", "df-generated"]
+      - ["java.lang", "Short", "shortValue", "()", "summary", "df-generated"]
+      - ["java.lang", "Short", "toString", "(short)", "summary", "df-generated"]
       - ["java.lang", "Short", "toUnsignedInt", "(short)", "summary", "df-generated"]
       - ["java.lang", "Short", "toUnsignedLong", "(short)", "summary", "df-generated"]
       - ["java.lang", "Short", "valueOf", "(String)", "summary", "df-generated"]
@@ -769,14 +766,11 @@ extensions:
       - ["java.lang", "Short", "valueOf", "(short)", "summary", "df-generated"]
       - ["java.lang", "StackTraceElement", "getLineNumber", "()", "summary", "df-generated"]
       - ["java.lang", "StackTraceElement", "isNativeMethod", "()", "summary", "df-generated"]
-      - ["java.lang", "StackWalker$StackFrame", "getByteCodeIndex", "()", "summary", "df-generated"]
-      - ["java.lang", "StackWalker$StackFrame", "getClassName", "()", "summary", "df-generated"]
-      - ["java.lang", "StackWalker$StackFrame", "getDeclaringClass", "()", "summary", "df-generated"]
-      - ["java.lang", "StackWalker$StackFrame", "getLineNumber", "()", "summary", "df-generated"]
-      - ["java.lang", "StackWalker$StackFrame", "isNativeMethod", "()", "summary", "df-generated"]
       - ["java.lang", "StackWalker", "forEach", "(Consumer)", "summary", "df-generated"]
       - ["java.lang", "StackWalker", "getCallerClass", "()", "summary", "df-generated"]
       - ["java.lang", "StackWalker", "getInstance", "()", "summary", "df-generated"]
+      - ["java.lang", "StackWalker", "getInstance", "(Set)", "summary", "df-generated"]
+      - ["java.lang", "StackWalker", "getInstance", "(Set,int)", "summary", "df-generated"]
       - ["java.lang", "StackWalker", "getInstance", "(StackWalker$Option)", "summary", "df-generated"]
       - ["java.lang", "StackWalker", "walk", "(Function)", "summary", "df-generated"]
       - ["java.lang", "StrictMath", "IEEEremainder", "(double,double)", "summary", "df-generated"]
@@ -881,6 +875,13 @@ extensions:
       - ["java.lang", "String", "valueOf", "(double)", "summary", "df-generated"]
       - ["java.lang", "String", "valueOf", "(float)", "summary", "df-generated"]
       - ["java.lang", "StringBuffer", "StringBuffer", "(int)", "summary", "df-generated"]
+      - ["java.lang", "StringBuffer", "capacity", "()", "summary", "df-generated"]
+      - ["java.lang", "StringBuffer", "codePointAt", "(int)", "summary", "df-generated"]
+      - ["java.lang", "StringBuffer", "codePointBefore", "(int)", "summary", "df-generated"]
+      - ["java.lang", "StringBuffer", "codePointCount", "(int,int)", "summary", "df-generated"]
+      - ["java.lang", "StringBuffer", "ensureCapacity", "(int)", "summary", "df-generated"]
+      - ["java.lang", "StringBuffer", "offsetByCodePoints", "(int,int)", "summary", "df-generated"]
+      - ["java.lang", "StringBuffer", "trimToSize", "()", "summary", "df-generated"]
       - ["java.lang", "StringIndexOutOfBoundsException", "StringIndexOutOfBoundsException", "(int)", "summary", "df-generated"]
       - ["java.lang", "System$Logger$Level", "getName", "()", "summary", "df-generated"]
       - ["java.lang", "System$Logger$Level", "getSeverity", "()", "summary", "df-generated"]
@@ -890,13 +891,11 @@ extensions:
       - ["java.lang", "System$Logger", "log", "(System$Logger$Level,String,Throwable)", "summary", "df-generated"]
       - ["java.lang", "System$Logger", "log", "(System$Logger$Level,Supplier)", "summary", "df-generated"]
       - ["java.lang", "System$Logger", "log", "(System$Logger$Level,Supplier,Throwable)", "summary", "df-generated"]
-      - ["java.lang", "System$LoggerFinder", "getLogger", "(String,Module)", "summary", "df-generated"]
       - ["java.lang", "System$LoggerFinder", "getLoggerFinder", "()", "summary", "df-generated"]
       - ["java.lang", "System", "clearProperty", "(String)", "summary", "df-generated"]
       - ["java.lang", "System", "console", "()", "summary", "df-generated"]
       - ["java.lang", "System", "gc", "()", "summary", "df-generated"]
       - ["java.lang", "System", "getProperties", "()", "summary", "df-generated"]
-      - ["java.lang", "System", "getProperty", "(String)", "summary", "df-generated"]
       - ["java.lang", "System", "getSecurityManager", "()", "summary", "df-generated"]
       - ["java.lang", "System", "getenv", "()", "summary", "df-generated"]
       - ["java.lang", "System", "inheritedChannel", "()", "summary", "df-generated"]
@@ -909,7 +908,6 @@ extensions:
       - ["java.lang", "System", "setOut", "(PrintStream)", "summary", "df-generated"]
       - ["java.lang", "System", "setProperties", "(Properties)", "summary", "df-generated"]
       - ["java.lang", "System", "setSecurityManager", "(SecurityManager)", "summary", "df-generated"]
-      - ["java.lang", "Thread$UncaughtExceptionHandler", "uncaughtException", "(Thread,Throwable)", "summary", "df-generated"]
       - ["java.lang", "Thread", "activeCount", "()", "summary", "df-generated"]
       - ["java.lang", "Thread", "checkAccess", "()", "summary", "df-generated"]
       - ["java.lang", "Thread", "countStackFrames", "()", "summary", "df-generated"]
@@ -931,6 +929,7 @@ extensions:
       - ["java.lang", "Thread", "join", "(long,int)", "summary", "df-generated"]
       - ["java.lang", "Thread", "onSpinWait", "()", "summary", "df-generated"]
       - ["java.lang", "Thread", "resume", "()", "summary", "df-generated"]
+      - ["java.lang", "Thread", "run", "()", "summary", "df-generated"]
       - ["java.lang", "Thread", "setDaemon", "(boolean)", "summary", "df-generated"]
       - ["java.lang", "Thread", "setDefaultUncaughtExceptionHandler", "(Thread$UncaughtExceptionHandler)", "summary", "df-generated"]
       - ["java.lang", "Thread", "setPriority", "(int)", "summary", "df-generated"]
@@ -954,6 +953,5 @@ extensions:
       - ["java.lang", "ThreadGroup", "setMaxPriority", "(int)", "summary", "df-generated"]
       - ["java.lang", "ThreadGroup", "stop", "()", "summary", "df-generated"]
       - ["java.lang", "ThreadGroup", "suspend", "()", "summary", "df-generated"]
+      - ["java.lang", "ThreadGroup", "uncaughtException", "(Thread,Throwable)", "summary", "df-generated"]
       - ["java.lang", "ThreadLocal", "remove", "()", "summary", "df-generated"]
-      - ["java.lang", "Throwable", "printStackTrace", "()", "summary", "df-generated"]
-      - ["java.lang", "Throwable", "printStackTrace", "(PrintStream)", "summary", "df-generated"]
diff --git a/java/ql/lib/ext/generated/java.lang.module.model.yml b/java/ql/lib/ext/generated/java.lang.module.model.yml
index 99377e90986..80893f89934 100644
--- a/java/ql/lib/ext/generated/java.lang.module.model.yml
+++ b/java/ql/lib/ext/generated/java.lang.module.model.yml
@@ -6,65 +6,38 @@ extensions:
     data:
       - ["java.lang.module", "Configuration", False, "findModule", "(String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.lang.module", "Configuration", False, "modules", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.lang.module", "Configuration", False, "parents", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.lang.module", "Configuration", False, "resolve", "(ModuleFinder,List,ModuleFinder,Collection)", "", "Argument[1].Element", "ReturnValue", "taint", "df-generated"]
-      - ["java.lang.module", "Configuration", False, "resolve", "(ModuleFinder,ModuleFinder,Collection)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.lang.module", "Configuration", False, "resolveAndBind", "(ModuleFinder,List,ModuleFinder,Collection)", "", "Argument[1].Element", "ReturnValue", "taint", "df-generated"]
-      - ["java.lang.module", "Configuration", False, "resolveAndBind", "(ModuleFinder,ModuleFinder,Collection)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.module", "Configuration", False, "parents", "()", "", "Argument[this].SyntheticField[java.lang.module.Configuration.parents]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.lang.module", "Configuration", False, "resolve", "(ModuleFinder,List,ModuleFinder,Collection)", "", "Argument[1].Element", "ReturnValue.SyntheticField[java.lang.module.Configuration.parents].Element", "value", "dfc-generated"]
+      - ["java.lang.module", "Configuration", False, "resolve", "(ModuleFinder,ModuleFinder,Collection)", "", "Argument[this]", "ReturnValue.SyntheticField[java.lang.module.Configuration.parents].Element", "value", "dfc-generated"]
+      - ["java.lang.module", "Configuration", False, "resolveAndBind", "(ModuleFinder,List,ModuleFinder,Collection)", "", "Argument[1].Element", "ReturnValue.SyntheticField[java.lang.module.Configuration.parents].Element", "value", "dfc-generated"]
+      - ["java.lang.module", "Configuration", False, "resolveAndBind", "(ModuleFinder,ModuleFinder,Collection)", "", "Argument[this]", "ReturnValue.SyntheticField[java.lang.module.Configuration.parents].Element", "value", "dfc-generated"]
       - ["java.lang.module", "FindException", True, "FindException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.lang.module", "FindException", True, "FindException", "(String,Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.lang.module", "FindException", True, "FindException", "(String,Throwable)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
       - ["java.lang.module", "FindException", True, "FindException", "(Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.lang.module", "InvalidModuleDescriptorException", True, "InvalidModuleDescriptorException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.lang.module", "ModuleDescriptor$Builder", False, "build", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.lang.module", "ModuleDescriptor$Builder", False, "exports", "(ModuleDescriptor$Exports)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.lang.module", "ModuleDescriptor$Builder", False, "exports", "(ModuleDescriptor$Exports)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["java.lang.module", "ModuleDescriptor$Builder", False, "exports", "(Set,String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["java.lang.module", "ModuleDescriptor$Builder", False, "exports", "(Set,String)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["java.lang.module", "ModuleDescriptor$Builder", False, "exports", "(Set,String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.lang.module", "ModuleDescriptor$Builder", False, "exports", "(Set,String,Set)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["java.lang.module", "ModuleDescriptor$Builder", False, "exports", "(Set,String,Set)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["java.lang.module", "ModuleDescriptor$Builder", False, "exports", "(Set,String,Set)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.lang.module", "ModuleDescriptor$Builder", False, "exports", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.lang.module", "ModuleDescriptor$Builder", False, "exports", "(String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["java.lang.module", "ModuleDescriptor$Builder", False, "exports", "(String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.lang.module", "ModuleDescriptor$Builder", False, "exports", "(String,Set)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.lang.module", "ModuleDescriptor$Builder", False, "exports", "(String,Set)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["java.lang.module", "ModuleDescriptor$Builder", False, "exports", "(String,Set)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.lang.module", "ModuleDescriptor$Builder", False, "mainClass", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.lang.module", "ModuleDescriptor$Builder", False, "mainClass", "(String)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["java.lang.module", "ModuleDescriptor$Builder", False, "opens", "(ModuleDescriptor$Opens)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.lang.module", "ModuleDescriptor$Builder", False, "opens", "(ModuleDescriptor$Opens)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["java.lang.module", "ModuleDescriptor$Builder", False, "opens", "(Set,String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["java.lang.module", "ModuleDescriptor$Builder", False, "opens", "(Set,String)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["java.lang.module", "ModuleDescriptor$Builder", False, "opens", "(Set,String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.lang.module", "ModuleDescriptor$Builder", False, "opens", "(Set,String,Set)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["java.lang.module", "ModuleDescriptor$Builder", False, "opens", "(Set,String,Set)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["java.lang.module", "ModuleDescriptor$Builder", False, "opens", "(Set,String,Set)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.lang.module", "ModuleDescriptor$Builder", False, "opens", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.lang.module", "ModuleDescriptor$Builder", False, "opens", "(String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["java.lang.module", "ModuleDescriptor$Builder", False, "opens", "(String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.lang.module", "ModuleDescriptor$Builder", False, "opens", "(String,Set)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.lang.module", "ModuleDescriptor$Builder", False, "opens", "(String,Set)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["java.lang.module", "ModuleDescriptor$Builder", False, "opens", "(String,Set)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.lang.module", "ModuleDescriptor$Builder", False, "packages", "(Set)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["java.lang.module", "ModuleDescriptor$Builder", False, "packages", "(Set)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["java.lang.module", "ModuleDescriptor$Builder", False, "provides", "(ModuleDescriptor$Provides)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.lang.module", "ModuleDescriptor$Builder", False, "provides", "(ModuleDescriptor$Provides)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["java.lang.module", "ModuleDescriptor$Builder", False, "provides", "(String,List)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.lang.module", "ModuleDescriptor$Builder", False, "provides", "(String,List)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["java.lang.module", "ModuleDescriptor$Builder", False, "provides", "(String,List)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.lang.module", "ModuleDescriptor$Builder", False, "requires", "(ModuleDescriptor$Requires)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.lang.module", "ModuleDescriptor$Builder", False, "requires", "(ModuleDescriptor$Requires)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["java.lang.module", "ModuleDescriptor$Builder", False, "requires", "(Set,String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.lang.module", "ModuleDescriptor$Builder", False, "requires", "(Set,String,ModuleDescriptor$Version)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.lang.module", "ModuleDescriptor$Builder", False, "requires", "(String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.lang.module", "ModuleDescriptor$Builder", False, "uses", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.lang.module", "ModuleDescriptor$Builder", False, "uses", "(String)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["java.lang.module", "ModuleDescriptor$Builder", False, "version", "(ModuleDescriptor$Version)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.lang.module", "ModuleDescriptor$Builder", False, "version", "(ModuleDescriptor$Version)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["java.lang.module", "ModuleDescriptor$Builder", False, "version", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.lang.module", "ModuleDescriptor$Builder", False, "version", "(String)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.lang.module", "ModuleDescriptor$Builder", False, "exports", "(ModuleDescriptor$Exports)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.lang.module", "ModuleDescriptor$Builder", False, "exports", "(Set,String)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.lang.module", "ModuleDescriptor$Builder", False, "exports", "(Set,String,Set)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.lang.module", "ModuleDescriptor$Builder", False, "exports", "(String)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.lang.module", "ModuleDescriptor$Builder", False, "exports", "(String,Set)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.lang.module", "ModuleDescriptor$Builder", False, "mainClass", "(String)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.lang.module", "ModuleDescriptor$Builder", False, "opens", "(ModuleDescriptor$Opens)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.lang.module", "ModuleDescriptor$Builder", False, "opens", "(Set,String)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.lang.module", "ModuleDescriptor$Builder", False, "opens", "(Set,String,Set)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.lang.module", "ModuleDescriptor$Builder", False, "opens", "(String)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.lang.module", "ModuleDescriptor$Builder", False, "opens", "(String,Set)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.lang.module", "ModuleDescriptor$Builder", False, "packages", "(Set)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.lang.module", "ModuleDescriptor$Builder", False, "provides", "(ModuleDescriptor$Provides)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.lang.module", "ModuleDescriptor$Builder", False, "provides", "(String,List)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.lang.module", "ModuleDescriptor$Builder", False, "requires", "(ModuleDescriptor$Requires)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.lang.module", "ModuleDescriptor$Builder", False, "requires", "(Set,String)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.lang.module", "ModuleDescriptor$Builder", False, "requires", "(Set,String,ModuleDescriptor$Version)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.lang.module", "ModuleDescriptor$Builder", False, "requires", "(String)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.lang.module", "ModuleDescriptor$Builder", False, "uses", "(String)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.lang.module", "ModuleDescriptor$Builder", False, "version", "(ModuleDescriptor$Version)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.lang.module", "ModuleDescriptor$Builder", False, "version", "(String)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
       - ["java.lang.module", "ModuleDescriptor$Exports", False, "modifiers", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.lang.module", "ModuleDescriptor$Exports", False, "source", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.lang.module", "ModuleDescriptor$Exports", False, "targets", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
@@ -102,10 +75,12 @@ extensions:
       - ["java.lang.module", "ModuleFinder", True, "find", "(String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.lang.module", "ModuleFinder", True, "findAll", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.lang.module", "ModuleFinder", True, "of", "(Path[])", "", "Argument[0].ArrayElement", "ReturnValue", "taint", "df-generated"]
-      - ["java.lang.module", "ModuleReader", True, "open", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.lang.module", "ModuleReader", True, "read", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.lang.module", "ModuleReader", True, "list", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.module", "ModuleReader", True, "open", "(String)", "", "Argument[0]", "ReturnValue.Element", "taint", "dfc-generated"]
+      - ["java.lang.module", "ModuleReader", True, "read", "(String)", "", "Argument[0]", "ReturnValue.Element", "taint", "dfc-generated"]
       - ["java.lang.module", "ModuleReference", True, "descriptor", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.lang.module", "ModuleReference", True, "location", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.module", "ModuleReference", True, "open", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.lang.module", "ResolutionException", True, "ResolutionException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.lang.module", "ResolutionException", True, "ResolutionException", "(String,Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.lang.module", "ResolutionException", True, "ResolutionException", "(String,Throwable)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
@@ -126,5 +101,4 @@ extensions:
       - ["java.lang.module", "ModuleFinder", "compose", "(ModuleFinder[])", "summary", "df-generated"]
       - ["java.lang.module", "ModuleFinder", "ofSystem", "()", "summary", "df-generated"]
       - ["java.lang.module", "ModuleReader", "release", "(ByteBuffer)", "summary", "df-generated"]
-      - ["java.lang.module", "ModuleReference", "open", "()", "summary", "df-generated"]
       - ["java.lang.module", "ResolvedModule", "name", "()", "summary", "df-generated"]
diff --git a/java/ql/lib/ext/generated/java.lang.ref.model.yml b/java/ql/lib/ext/generated/java.lang.ref.model.yml
index 58ae03a832f..b864cdf1b7d 100644
--- a/java/ql/lib/ext/generated/java.lang.ref.model.yml
+++ b/java/ql/lib/ext/generated/java.lang.ref.model.yml
@@ -13,9 +13,9 @@ extensions:
       - ["java.lang.ref", "ReferenceQueue", True, "poll", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.lang.ref", "ReferenceQueue", True, "remove", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.lang.ref", "ReferenceQueue", True, "remove", "(long)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.lang.ref", "SoftReference", True, "SoftReference", "(Object)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.lang.ref", "SoftReference", True, "SoftReference", "(Object,ReferenceQueue)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.lang.ref", "SoftReference", True, "SoftReference", "(Object,ReferenceQueue)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.lang.ref", "SoftReference", True, "SoftReference", "(Object)", "", "Argument[0]", "Argument[this].SyntheticField[java.lang.ref.Reference.referent]", "value", "dfc-generated"]
+      - ["java.lang.ref", "SoftReference", True, "SoftReference", "(Object,ReferenceQueue)", "", "Argument[0]", "Argument[this].SyntheticField[java.lang.ref.Reference.referent]", "value", "dfc-generated"]
+      - ["java.lang.ref", "SoftReference", True, "get", "()", "", "Argument[this].SyntheticField[java.lang.ref.Reference.referent]", "ReturnValue", "value", "dfc-generated"]
       - ["java.lang.ref", "WeakReference", True, "WeakReference", "(Object)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.lang.ref", "WeakReference", True, "WeakReference", "(Object,ReferenceQueue)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.lang.ref", "WeakReference", True, "WeakReference", "(Object,ReferenceQueue)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
@@ -25,6 +25,7 @@ extensions:
     data:
       - ["java.lang.ref", "Cleaner", "create", "()", "summary", "df-generated"]
       - ["java.lang.ref", "Cleaner", "create", "(ThreadFactory)", "summary", "df-generated"]
+      - ["java.lang.ref", "PhantomReference", "get", "()", "summary", "df-generated"]
       - ["java.lang.ref", "Reference", "clear", "()", "summary", "df-generated"]
       - ["java.lang.ref", "Reference", "enqueue", "()", "summary", "df-generated"]
       - ["java.lang.ref", "Reference", "isEnqueued", "()", "summary", "df-generated"]
diff --git a/java/ql/lib/ext/generated/java.lang.reflect.model.yml b/java/ql/lib/ext/generated/java.lang.reflect.model.yml
index b79a4078005..1c156ca8094 100644
--- a/java/ql/lib/ext/generated/java.lang.reflect.model.yml
+++ b/java/ql/lib/ext/generated/java.lang.reflect.model.yml
@@ -4,12 +4,19 @@ extensions:
       pack: codeql/java-all
       extensible: summaryModel
     data:
+      - ["java.lang.reflect", "AnnotatedArrayType", True, "getAnnotatedGenericComponentType", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.lang.reflect", "AnnotatedElement", True, "getAnnotation", "(Class)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.lang.reflect", "AnnotatedElement", True, "getAnnotations", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.lang.reflect", "AnnotatedElement", True, "getAnnotationsByType", "(Class)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.lang.reflect", "AnnotatedElement", True, "getDeclaredAnnotation", "(Class)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.lang.reflect", "AnnotatedElement", True, "getDeclaredAnnotations", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.lang.reflect", "AnnotatedElement", True, "getDeclaredAnnotationsByType", "(Class)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.reflect", "AnnotatedParameterizedType", True, "getAnnotatedActualTypeArguments", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.reflect", "AnnotatedType", True, "getAnnotatedOwnerType", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.reflect", "AnnotatedType", True, "getType", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.reflect", "AnnotatedTypeVariable", True, "getAnnotatedBounds", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.reflect", "AnnotatedWildcardType", True, "getAnnotatedLowerBounds", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.reflect", "AnnotatedWildcardType", True, "getAnnotatedUpperBounds", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.lang.reflect", "Executable", True, "getAnnotatedExceptionTypes", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.lang.reflect", "Executable", True, "getAnnotatedParameterTypes", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.lang.reflect", "Executable", True, "getAnnotatedReceiverType", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
@@ -23,14 +30,14 @@ extensions:
       - ["java.lang.reflect", "Field", False, "getAnnotatedType", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.lang.reflect", "Field", False, "getGenericType", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.lang.reflect", "Field", False, "toGenericString", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.reflect", "GenericArrayType", True, "getGenericComponentType", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.lang.reflect", "GenericDeclaration", True, "getTypeParameters", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.lang.reflect", "GenericSignatureFormatError", True, "GenericSignatureFormatError", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.lang.reflect", "InaccessibleObjectException", True, "InaccessibleObjectException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.lang.reflect", "InvocationHandler", True, "invoke", "(Object,Method,Object[])", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.lang.reflect", "InvocationTargetException", True, "InvocationTargetException", "(Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.lang.reflect", "InvocationTargetException", True, "InvocationTargetException", "(Throwable,String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.lang.reflect", "InvocationTargetException", True, "InvocationTargetException", "(Throwable,String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["java.lang.reflect", "InvocationTargetException", True, "getTargetException", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.reflect", "InvocationHandler", True, "invoke", "(Object,Method,Object[])", "", "Argument[this]", "ReturnValue", "taint", "dfc-generated"]
+      - ["java.lang.reflect", "InvocationTargetException", True, "InvocationTargetException", "(Throwable)", "", "Argument[0]", "Argument[this].SyntheticField[java.lang.reflect.InvocationTargetException.target]", "value", "dfc-generated"]
+      - ["java.lang.reflect", "InvocationTargetException", True, "InvocationTargetException", "(Throwable,String)", "", "Argument[0]", "Argument[this].SyntheticField[java.lang.reflect.InvocationTargetException.target]", "value", "dfc-generated"]
+      - ["java.lang.reflect", "InvocationTargetException", True, "getTargetException", "()", "", "Argument[this].SyntheticField[java.lang.reflect.InvocationTargetException.target]", "ReturnValue", "value", "dfc-generated"]
       - ["java.lang.reflect", "MalformedParameterizedTypeException", True, "MalformedParameterizedTypeException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.lang.reflect", "MalformedParametersException", True, "MalformedParametersException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.lang.reflect", "Member", True, "getName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
@@ -39,30 +46,33 @@ extensions:
       - ["java.lang.reflect", "Parameter", False, "getDeclaringExecutable", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.lang.reflect", "Parameter", False, "getName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.lang.reflect", "Parameter", False, "getParameterizedType", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.reflect", "ParameterizedType", True, "getActualTypeArguments", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.reflect", "ParameterizedType", True, "getOwnerType", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.lang.reflect", "Proxy", True, "getInvocationHandler", "(Object)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["java.lang.reflect", "RecordComponent", False, "getAccessor", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.lang.reflect", "RecordComponent", False, "getAnnotatedType", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.lang.reflect", "RecordComponent", False, "getGenericSignature", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.lang.reflect", "RecordComponent", False, "getGenericType", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.lang.reflect", "RecordComponent", False, "getName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.lang.reflect", "ReflectPermission", False, "ReflectPermission", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.lang.reflect", "ReflectPermission", False, "ReflectPermission", "(String,String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.lang.reflect", "ReflectPermission", False, "ReflectPermission", "(String)", "", "Argument[0]", "Argument[this]", "taint", "dfc-generated"]
+      - ["java.lang.reflect", "ReflectPermission", False, "ReflectPermission", "(String,String)", "", "Argument[0]", "Argument[this]", "taint", "dfc-generated"]
       - ["java.lang.reflect", "Type", True, "getTypeName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.lang.reflect", "UndeclaredThrowableException", True, "UndeclaredThrowableException", "(Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.lang.reflect", "UndeclaredThrowableException", True, "UndeclaredThrowableException", "(Throwable,String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.lang.reflect", "UndeclaredThrowableException", True, "UndeclaredThrowableException", "(Throwable,String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["java.lang.reflect", "UndeclaredThrowableException", True, "getUndeclaredThrowable", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.reflect", "UndeclaredThrowableException", True, "UndeclaredThrowableException", "(Throwable)", "", "Argument[0]", "Argument[this].SyntheticField[java.lang.Throwable.cause]", "value", "dfc-generated"]
+      - ["java.lang.reflect", "UndeclaredThrowableException", True, "UndeclaredThrowableException", "(Throwable,String)", "", "Argument[0]", "Argument[this].SyntheticField[java.lang.Throwable.cause]", "value", "dfc-generated"]
+      - ["java.lang.reflect", "UndeclaredThrowableException", True, "getUndeclaredThrowable", "()", "", "Argument[this].SyntheticField[java.lang.Throwable.cause]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.lang.reflect", "WildcardType", True, "getLowerBounds", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.reflect", "WildcardType", True, "getUpperBounds", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
   - addsTo:
       pack: codeql/java-all
       extensible: neutralModel
     data:
       - ["java.lang.reflect", "AccessibleObject", "canAccess", "(Object)", "summary", "df-generated"]
       - ["java.lang.reflect", "AccessibleObject", "isAccessible", "()", "summary", "df-generated"]
+      - ["java.lang.reflect", "AccessibleObject", "isAnnotationPresent", "(Class)", "summary", "df-generated"]
       - ["java.lang.reflect", "AccessibleObject", "setAccessible", "(AccessibleObject[],boolean)", "summary", "df-generated"]
       - ["java.lang.reflect", "AccessibleObject", "setAccessible", "(boolean)", "summary", "df-generated"]
       - ["java.lang.reflect", "AccessibleObject", "trySetAccessible", "()", "summary", "df-generated"]
       - ["java.lang.reflect", "AnnotatedElement", "isAnnotationPresent", "(Class)", "summary", "df-generated"]
-      - ["java.lang.reflect", "AnnotatedType", "getAnnotatedOwnerType", "()", "summary", "df-generated"]
       - ["java.lang.reflect", "Array", "get", "(Object,int)", "summary", "df-generated"]
       - ["java.lang.reflect", "Array", "getBoolean", "(Object,int)", "summary", "df-generated"]
       - ["java.lang.reflect", "Array", "getByte", "(Object,int)", "summary", "df-generated"]
@@ -84,20 +94,34 @@ extensions:
       - ["java.lang.reflect", "Array", "setInt", "(Object,int,int)", "summary", "df-generated"]
       - ["java.lang.reflect", "Array", "setLong", "(Object,int,long)", "summary", "df-generated"]
       - ["java.lang.reflect", "Array", "setShort", "(Object,int,short)", "summary", "df-generated"]
+      - ["java.lang.reflect", "Constructor", "getDeclaringClass", "()", "summary", "df-generated"]
+      - ["java.lang.reflect", "Constructor", "getModifiers", "()", "summary", "df-generated"]
+      - ["java.lang.reflect", "Constructor", "getParameterAnnotations", "()", "summary", "df-generated"]
+      - ["java.lang.reflect", "Constructor", "getParameterCount", "()", "summary", "df-generated"]
+      - ["java.lang.reflect", "Constructor", "isSynthetic", "()", "summary", "df-generated"]
+      - ["java.lang.reflect", "Constructor", "isVarArgs", "()", "summary", "df-generated"]
+      - ["java.lang.reflect", "Constructor", "setAccessible", "(boolean)", "summary", "df-generated"]
+      - ["java.lang.reflect", "Executable", "getDeclaringClass", "()", "summary", "df-generated"]
+      - ["java.lang.reflect", "Executable", "getModifiers", "()", "summary", "df-generated"]
       - ["java.lang.reflect", "Executable", "getParameterAnnotations", "()", "summary", "df-generated"]
       - ["java.lang.reflect", "Executable", "getParameterCount", "()", "summary", "df-generated"]
+      - ["java.lang.reflect", "Executable", "isSynthetic", "()", "summary", "df-generated"]
       - ["java.lang.reflect", "Executable", "isVarArgs", "()", "summary", "df-generated"]
       - ["java.lang.reflect", "Field", "getBoolean", "(Object)", "summary", "df-generated"]
       - ["java.lang.reflect", "Field", "getByte", "(Object)", "summary", "df-generated"]
       - ["java.lang.reflect", "Field", "getChar", "(Object)", "summary", "df-generated"]
+      - ["java.lang.reflect", "Field", "getDeclaringClass", "()", "summary", "df-generated"]
       - ["java.lang.reflect", "Field", "getDouble", "(Object)", "summary", "df-generated"]
       - ["java.lang.reflect", "Field", "getFloat", "(Object)", "summary", "df-generated"]
       - ["java.lang.reflect", "Field", "getInt", "(Object)", "summary", "df-generated"]
       - ["java.lang.reflect", "Field", "getLong", "(Object)", "summary", "df-generated"]
+      - ["java.lang.reflect", "Field", "getModifiers", "()", "summary", "df-generated"]
       - ["java.lang.reflect", "Field", "getShort", "(Object)", "summary", "df-generated"]
       - ["java.lang.reflect", "Field", "getType", "()", "summary", "df-generated"]
       - ["java.lang.reflect", "Field", "isEnumConstant", "()", "summary", "df-generated"]
+      - ["java.lang.reflect", "Field", "isSynthetic", "()", "summary", "df-generated"]
       - ["java.lang.reflect", "Field", "set", "(Object,Object)", "summary", "df-generated"]
+      - ["java.lang.reflect", "Field", "setAccessible", "(boolean)", "summary", "df-generated"]
       - ["java.lang.reflect", "Field", "setBoolean", "(Object,boolean)", "summary", "df-generated"]
       - ["java.lang.reflect", "Field", "setByte", "(Object,byte)", "summary", "df-generated"]
       - ["java.lang.reflect", "Field", "setChar", "(Object,char)", "summary", "df-generated"]
@@ -107,13 +131,17 @@ extensions:
       - ["java.lang.reflect", "Field", "setLong", "(Object,long)", "summary", "df-generated"]
       - ["java.lang.reflect", "Field", "setShort", "(Object,short)", "summary", "df-generated"]
       - ["java.lang.reflect", "InvocationHandler", "invokeDefault", "(Object,Method,Object[])", "summary", "df-generated"]
-      - ["java.lang.reflect", "Member", "getDeclaringClass", "()", "summary", "df-generated"]
-      - ["java.lang.reflect", "Member", "getModifiers", "()", "summary", "df-generated"]
-      - ["java.lang.reflect", "Member", "isSynthetic", "()", "summary", "df-generated"]
+      - ["java.lang.reflect", "Method", "getDeclaringClass", "()", "summary", "df-generated"]
       - ["java.lang.reflect", "Method", "getDefaultValue", "()", "summary", "df-generated"]
+      - ["java.lang.reflect", "Method", "getModifiers", "()", "summary", "df-generated"]
+      - ["java.lang.reflect", "Method", "getParameterAnnotations", "()", "summary", "df-generated"]
+      - ["java.lang.reflect", "Method", "getParameterCount", "()", "summary", "df-generated"]
       - ["java.lang.reflect", "Method", "getReturnType", "()", "summary", "df-generated"]
       - ["java.lang.reflect", "Method", "isBridge", "()", "summary", "df-generated"]
       - ["java.lang.reflect", "Method", "isDefault", "()", "summary", "df-generated"]
+      - ["java.lang.reflect", "Method", "isSynthetic", "()", "summary", "df-generated"]
+      - ["java.lang.reflect", "Method", "isVarArgs", "()", "summary", "df-generated"]
+      - ["java.lang.reflect", "Method", "setAccessible", "(boolean)", "summary", "df-generated"]
       - ["java.lang.reflect", "Modifier", "classModifiers", "()", "summary", "df-generated"]
       - ["java.lang.reflect", "Modifier", "constructorModifiers", "()", "summary", "df-generated"]
       - ["java.lang.reflect", "Modifier", "fieldModifiers", "()", "summary", "df-generated"]
@@ -132,6 +160,7 @@ extensions:
       - ["java.lang.reflect", "Modifier", "isVolatile", "(int)", "summary", "df-generated"]
       - ["java.lang.reflect", "Modifier", "methodModifiers", "()", "summary", "df-generated"]
       - ["java.lang.reflect", "Modifier", "parameterModifiers", "()", "summary", "df-generated"]
+      - ["java.lang.reflect", "Modifier", "toString", "(int)", "summary", "df-generated"]
       - ["java.lang.reflect", "Parameter", "getModifiers", "()", "summary", "df-generated"]
       - ["java.lang.reflect", "Parameter", "getType", "()", "summary", "df-generated"]
       - ["java.lang.reflect", "Parameter", "isImplicit", "()", "summary", "df-generated"]
diff --git a/java/ql/lib/ext/generated/java.lang.runtime.model.yml b/java/ql/lib/ext/generated/java.lang.runtime.model.yml
index 940d246f9b3..16b0ca3d7b8 100644
--- a/java/ql/lib/ext/generated/java.lang.runtime.model.yml
+++ b/java/ql/lib/ext/generated/java.lang.runtime.model.yml
@@ -4,10 +4,6 @@ extensions:
       pack: codeql/java-all
       extensible: summaryModel
     data:
+      - ["java.lang.runtime", "ObjectMethods", True, "bootstrap", "(MethodHandles$Lookup,String,TypeDescriptor,Class,String,MethodHandle[])", "", "Argument[5].ArrayElement", "ReturnValue", "taint", "df-generated"]
       - ["java.lang.runtime", "SwitchBootstraps", True, "enumSwitch", "(MethodHandles$Lookup,String,MethodType,Object[])", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
       - ["java.lang.runtime", "SwitchBootstraps", True, "typeSwitch", "(MethodHandles$Lookup,String,MethodType,Object[])", "", "Argument[3].ArrayElement", "ReturnValue", "taint", "df-generated"]
-  - addsTo:
-      pack: codeql/java-all
-      extensible: neutralModel
-    data:
-      - ["java.lang.runtime", "ObjectMethods", "bootstrap", "(MethodHandles$Lookup,String,TypeDescriptor,Class,String,MethodHandle[])", "summary", "df-generated"]
diff --git a/java/ql/lib/ext/generated/java.math.model.yml b/java/ql/lib/ext/generated/java.math.model.yml
index 2f149239f07..1ce8751a532 100644
--- a/java/ql/lib/ext/generated/java.math.model.yml
+++ b/java/ql/lib/ext/generated/java.math.model.yml
@@ -31,6 +31,7 @@ extensions:
       - ["java.math", "BigDecimal", "divideAndRemainder", "(BigDecimal,MathContext)", "summary", "df-generated"]
       - ["java.math", "BigDecimal", "divideToIntegralValue", "(BigDecimal)", "summary", "df-generated"]
       - ["java.math", "BigDecimal", "divideToIntegralValue", "(BigDecimal,MathContext)", "summary", "df-generated"]
+      - ["java.math", "BigDecimal", "floatValue", "()", "summary", "df-generated"]
       - ["java.math", "BigDecimal", "intValueExact", "()", "summary", "df-generated"]
       - ["java.math", "BigDecimal", "longValueExact", "()", "summary", "df-generated"]
       - ["java.math", "BigDecimal", "max", "(BigDecimal)", "summary", "df-generated"]
@@ -74,6 +75,7 @@ extensions:
       - ["java.math", "BigInteger", "divide", "(BigInteger)", "summary", "df-generated"]
       - ["java.math", "BigInteger", "divideAndRemainder", "(BigInteger)", "summary", "df-generated"]
       - ["java.math", "BigInteger", "flipBit", "(int)", "summary", "df-generated"]
+      - ["java.math", "BigInteger", "floatValue", "()", "summary", "df-generated"]
       - ["java.math", "BigInteger", "gcd", "(BigInteger)", "summary", "df-generated"]
       - ["java.math", "BigInteger", "getLowestSetBit", "()", "summary", "df-generated"]
       - ["java.math", "BigInteger", "intValueExact", "()", "summary", "df-generated"]
@@ -98,6 +100,7 @@ extensions:
       - ["java.math", "BigInteger", "sqrtAndRemainder", "()", "summary", "df-generated"]
       - ["java.math", "BigInteger", "testBit", "(int)", "summary", "df-generated"]
       - ["java.math", "BigInteger", "toByteArray", "()", "summary", "df-generated"]
+      - ["java.math", "BigInteger", "toString", "(int)", "summary", "df-generated"]
       - ["java.math", "BigInteger", "xor", "(BigInteger)", "summary", "df-generated"]
       - ["java.math", "MathContext", "MathContext", "(String)", "summary", "df-generated"]
       - ["java.math", "MathContext", "MathContext", "(int)", "summary", "df-generated"]
diff --git a/java/ql/lib/ext/generated/java.net.http.model.yml b/java/ql/lib/ext/generated/java.net.http.model.yml
index 6bb3608a437..c741ffa4921 100644
--- a/java/ql/lib/ext/generated/java.net.http.model.yml
+++ b/java/ql/lib/ext/generated/java.net.http.model.yml
@@ -4,11 +4,31 @@ extensions:
       pack: codeql/java-all
       extensible: summaryModel
     data:
+      - ["java.net.http", "HttpClient$Builder", True, "authenticator", "(Authenticator)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.net.http", "HttpClient$Builder", True, "build", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.net.http", "HttpClient$Builder", True, "connectTimeout", "(Duration)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.net.http", "HttpClient$Builder", True, "cookieHandler", "(CookieHandler)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.net.http", "HttpClient$Builder", True, "executor", "(Executor)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.net.http", "HttpClient$Builder", True, "followRedirects", "(HttpClient$Redirect)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.net.http", "HttpClient$Builder", True, "priority", "(int)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.net.http", "HttpClient$Builder", True, "proxy", "(ProxySelector)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.net.http", "HttpClient$Builder", True, "sslContext", "(SSLContext)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.net.http", "HttpClient$Builder", True, "sslParameters", "(SSLParameters)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.net.http", "HttpClient$Builder", True, "version", "(HttpClient$Version)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.net.http", "HttpClient", True, "authenticator", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.net.http", "HttpClient", True, "connectTimeout", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.net.http", "HttpClient", True, "cookieHandler", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.net.http", "HttpClient", True, "executor", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.net.http", "HttpClient", True, "newWebSocketBuilder", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.net.http", "HttpClient", True, "proxy", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.net.http", "HttpClient", True, "sslContext", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.net.http", "HttpClient", True, "sslParameters", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.net.http", "HttpConnectTimeoutException", True, "HttpConnectTimeoutException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.net.http", "HttpHeaders", False, "allValues", "(String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.net.http", "HttpHeaders", False, "allValues", "(String)", "", "Argument[this].SyntheticField[java.net.http.HttpHeaders.headers].MapValue", "ReturnValue", "value", "dfc-generated"]
       - ["java.net.http", "HttpHeaders", False, "firstValue", "(String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.net.http", "HttpHeaders", False, "map", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.net.http", "HttpRequest$BodyPublishers", True, "concat", "(HttpRequest$BodyPublisher[])", "", "Argument[0].ArrayElement", "ReturnValue", "taint", "df-generated"]
+      - ["java.net.http", "HttpHeaders", False, "map", "()", "", "Argument[this].SyntheticField[java.net.http.HttpHeaders.headers]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.net.http", "HttpHeaders", False, "of", "(Map,BiPredicate)", "", "Argument[0].MapKey", "ReturnValue.SyntheticField[java.net.http.HttpHeaders.headers].MapKey", "taint", "dfc-generated"]
+      - ["java.net.http", "HttpRequest$BodyPublishers", True, "concat", "(HttpRequest$BodyPublisher[])", "", "Argument[0].ArrayElement", "ReturnValue", "value", "dfc-generated"]
       - ["java.net.http", "HttpRequest$BodyPublishers", True, "fromPublisher", "(Flow$Publisher)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["java.net.http", "HttpRequest$BodyPublishers", True, "fromPublisher", "(Flow$Publisher,long)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["java.net.http", "HttpRequest$BodyPublishers", True, "ofByteArray", "(byte[])", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
@@ -18,8 +38,28 @@ extensions:
       - ["java.net.http", "HttpRequest$BodyPublishers", True, "ofInputStream", "(Supplier)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["java.net.http", "HttpRequest$BodyPublishers", True, "ofString", "(String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["java.net.http", "HttpRequest$BodyPublishers", True, "ofString", "(String,Charset)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.net.http", "HttpRequest$Builder", True, "DELETE", "()", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.net.http", "HttpRequest$Builder", True, "GET", "()", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.net.http", "HttpRequest$Builder", True, "POST", "(HttpRequest$BodyPublisher)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.net.http", "HttpRequest$Builder", True, "PUT", "(HttpRequest$BodyPublisher)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.net.http", "HttpRequest$Builder", True, "build", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.net.http", "HttpRequest$Builder", True, "copy", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.net.http", "HttpRequest$Builder", True, "expectContinue", "(boolean)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.net.http", "HttpRequest$Builder", True, "header", "(String,String)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.net.http", "HttpRequest$Builder", True, "headers", "(String[])", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.net.http", "HttpRequest$Builder", True, "method", "(String,HttpRequest$BodyPublisher)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.net.http", "HttpRequest$Builder", True, "setHeader", "(String,String)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.net.http", "HttpRequest$Builder", True, "timeout", "(Duration)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.net.http", "HttpRequest$Builder", True, "uri", "(URI)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.net.http", "HttpRequest$Builder", True, "version", "(HttpClient$Version)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.net.http", "HttpRequest", True, "bodyPublisher", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.net.http", "HttpRequest", True, "headers", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.net.http", "HttpRequest", True, "method", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.net.http", "HttpRequest", True, "newBuilder", "(HttpRequest,BiPredicate)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["java.net.http", "HttpRequest", True, "newBuilder", "(URI)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.net.http", "HttpRequest", True, "timeout", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.net.http", "HttpRequest", True, "uri", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.net.http", "HttpRequest", True, "version", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.net.http", "HttpResponse$BodyHandlers", True, "ofFile", "(Path)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
       - ["java.net.http", "HttpResponse$BodyHandlers", True, "ofFile", "(Path,OpenOption[])", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
       - ["java.net.http", "HttpResponse$BodyHandlers", True, "ofFile", "(Path,OpenOption[])", "", "Argument[1].ArrayElement", "ReturnValue", "taint", "df-generated"]
@@ -38,42 +78,40 @@ extensions:
       - ["java.net.http", "HttpResponse$BodySubscribers", True, "ofByteArrayConsumer", "(Consumer)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["java.net.http", "HttpResponse$BodySubscribers", True, "ofFile", "(Path)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
       - ["java.net.http", "HttpResponse$BodySubscribers", True, "ofFile", "(Path,OpenOption[])", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
+      - ["java.net.http", "HttpResponse$BodySubscribers", True, "ofFile", "(Path,OpenOption[])", "", "Argument[1].ArrayElement", "ReturnValue", "taint", "df-generated"]
       - ["java.net.http", "HttpResponse$BodySubscribers", True, "replacing", "(Object)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["java.net.http", "HttpResponse$PushPromiseHandler", True, "of", "(Function,ConcurrentMap)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["java.net.http", "HttpResponse$PushPromiseHandler", True, "of", "(Function,ConcurrentMap)", "", "Argument[1].Element", "ReturnValue", "taint", "df-generated"]
+      - ["java.net.http", "HttpResponse$ResponseInfo", True, "headers", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.net.http", "HttpTimeoutException", True, "HttpTimeoutException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.net.http", "WebSocketHandshakeException", False, "WebSocketHandshakeException", "(HttpResponse)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.net.http", "WebSocketHandshakeException", False, "getResponse", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.net.http", "WebSocket$Builder", True, "buildAsync", "(URI,WebSocket$Listener)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.net.http", "WebSocket$Builder", True, "buildAsync", "(URI,WebSocket$Listener)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.net.http", "WebSocket$Builder", True, "connectTimeout", "(Duration)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.net.http", "WebSocket$Builder", True, "header", "(String,String)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.net.http", "WebSocket$Builder", True, "subprotocols", "(String,String[])", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.net.http", "WebSocket", True, "getSubprotocol", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.net.http", "WebSocket", True, "sendBinary", "(ByteBuffer,boolean)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.net.http", "WebSocket", True, "sendClose", "(int,String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.net.http", "WebSocket", True, "sendPing", "(ByteBuffer)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.net.http", "WebSocket", True, "sendPong", "(ByteBuffer)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.net.http", "WebSocket", True, "sendText", "(CharSequence,boolean)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.net.http", "WebSocketHandshakeException", False, "WebSocketHandshakeException", "(HttpResponse)", "", "Argument[0]", "Argument[this].SyntheticField[java.net.http.WebSocketHandshakeException.response]", "value", "dfc-generated"]
+      - ["java.net.http", "WebSocketHandshakeException", False, "getResponse", "()", "", "Argument[this].SyntheticField[java.net.http.WebSocketHandshakeException.response]", "ReturnValue", "value", "dfc-generated"]
   - addsTo:
       pack: codeql/java-all
       extensible: neutralModel
     data:
-      - ["java.net.http", "HttpClient", "authenticator", "()", "summary", "df-generated"]
-      - ["java.net.http", "HttpClient", "connectTimeout", "()", "summary", "df-generated"]
-      - ["java.net.http", "HttpClient", "cookieHandler", "()", "summary", "df-generated"]
-      - ["java.net.http", "HttpClient", "executor", "()", "summary", "df-generated"]
       - ["java.net.http", "HttpClient", "followRedirects", "()", "summary", "df-generated"]
       - ["java.net.http", "HttpClient", "newBuilder", "()", "summary", "df-generated"]
       - ["java.net.http", "HttpClient", "newHttpClient", "()", "summary", "df-generated"]
-      - ["java.net.http", "HttpClient", "newWebSocketBuilder", "()", "summary", "df-generated"]
-      - ["java.net.http", "HttpClient", "proxy", "()", "summary", "df-generated"]
       - ["java.net.http", "HttpClient", "send", "(HttpRequest,HttpResponse$BodyHandler)", "summary", "df-generated"]
       - ["java.net.http", "HttpClient", "sendAsync", "(HttpRequest,HttpResponse$BodyHandler)", "summary", "df-generated"]
       - ["java.net.http", "HttpClient", "sendAsync", "(HttpRequest,HttpResponse$BodyHandler,HttpResponse$PushPromiseHandler)", "summary", "df-generated"]
-      - ["java.net.http", "HttpClient", "sslContext", "()", "summary", "df-generated"]
-      - ["java.net.http", "HttpClient", "sslParameters", "()", "summary", "df-generated"]
       - ["java.net.http", "HttpClient", "version", "()", "summary", "df-generated"]
       - ["java.net.http", "HttpHeaders", "firstValueAsLong", "(String)", "summary", "df-generated"]
-      - ["java.net.http", "HttpHeaders", "of", "(Map,BiPredicate)", "summary", "df-generated"]
       - ["java.net.http", "HttpRequest$BodyPublishers", "noBody", "()", "summary", "df-generated"]
-      - ["java.net.http", "HttpRequest", "bodyPublisher", "()", "summary", "df-generated"]
       - ["java.net.http", "HttpRequest", "expectContinue", "()", "summary", "df-generated"]
-      - ["java.net.http", "HttpRequest", "headers", "()", "summary", "df-generated"]
-      - ["java.net.http", "HttpRequest", "method", "()", "summary", "df-generated"]
       - ["java.net.http", "HttpRequest", "newBuilder", "()", "summary", "df-generated"]
-      - ["java.net.http", "HttpRequest", "timeout", "()", "summary", "df-generated"]
-      - ["java.net.http", "HttpRequest", "uri", "()", "summary", "df-generated"]
-      - ["java.net.http", "HttpRequest", "version", "()", "summary", "df-generated"]
       - ["java.net.http", "HttpResponse$BodyHandlers", "buffering", "(HttpResponse$BodyHandler,int)", "summary", "df-generated"]
       - ["java.net.http", "HttpResponse$BodyHandlers", "discarding", "()", "summary", "df-generated"]
       - ["java.net.http", "HttpResponse$BodyHandlers", "fromLineSubscriber", "(Flow$Subscriber)", "summary", "df-generated"]
diff --git a/java/ql/lib/ext/generated/java.net.model.yml b/java/ql/lib/ext/generated/java.net.model.yml
index 6f0a35897f2..7e6a86dbf34 100644
--- a/java/ql/lib/ext/generated/java.net.model.yml
+++ b/java/ql/lib/ext/generated/java.net.model.yml
@@ -20,131 +20,146 @@ extensions:
       - ["java.net", "ConnectException", True, "ConnectException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.net", "ContentHandler", True, "getContent", "(URLConnection)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["java.net", "ContentHandler", True, "getContent", "(URLConnection,Class[])", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["java.net", "CookieManager", True, "CookieManager", "(CookieStore,CookiePolicy)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.net", "CookieManager", True, "CookieManager", "(CookieStore,CookiePolicy)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["java.net", "CookieManager", True, "getCookieStore", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.net", "CookieManager", True, "CookieManager", "(CookieStore,CookiePolicy)", "", "Argument[0]", "Argument[this].SyntheticField[java.net.CookieManager.cookieJar]", "value", "dfc-generated"]
+      - ["java.net", "CookieManager", True, "getCookieStore", "()", "", "Argument[this].SyntheticField[java.net.CookieManager.cookieJar]", "ReturnValue", "value", "dfc-generated"]
       - ["java.net", "CookieManager", True, "setCookiePolicy", "(CookiePolicy)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.net", "CookieStore", True, "add", "(URI,HttpCookie)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.net", "CookieStore", True, "add", "(URI,HttpCookie)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
       - ["java.net", "CookieStore", True, "get", "(URI)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.net", "CookieStore", True, "getCookies", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.net", "CookieStore", True, "getURIs", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.net", "DatagramPacket", False, "DatagramPacket", "(byte[],int)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.net", "DatagramPacket", False, "DatagramPacket", "(byte[],int,InetAddress,int)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.net", "DatagramPacket", False, "DatagramPacket", "(byte[],int,InetAddress,int)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
-      - ["java.net", "DatagramPacket", False, "DatagramPacket", "(byte[],int,SocketAddress)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.net", "DatagramPacket", False, "DatagramPacket", "(byte[],int,SocketAddress)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
-      - ["java.net", "DatagramPacket", False, "DatagramPacket", "(byte[],int,int)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.net", "DatagramPacket", False, "DatagramPacket", "(byte[],int,int,InetAddress,int)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.net", "DatagramPacket", False, "DatagramPacket", "(byte[],int,int,InetAddress,int)", "", "Argument[3]", "Argument[this]", "taint", "df-generated"]
-      - ["java.net", "DatagramPacket", False, "DatagramPacket", "(byte[],int,int,SocketAddress)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.net", "DatagramPacket", False, "DatagramPacket", "(byte[],int,int,SocketAddress)", "", "Argument[3]", "Argument[this]", "taint", "df-generated"]
-      - ["java.net", "DatagramPacket", False, "getAddress", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.net", "DatagramPacket", False, "getData", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.net", "DatagramPacket", False, "getSocketAddress", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.net", "DatagramPacket", False, "setAddress", "(InetAddress)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.net", "DatagramPacket", False, "setData", "(byte[])", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.net", "DatagramPacket", False, "setData", "(byte[],int,int)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.net", "DatagramPacket", False, "setSocketAddress", "(SocketAddress)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.net", "DatagramSocket", True, "connect", "(InetAddress,int)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.net", "DatagramSocket", True, "connect", "(SocketAddress)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.net", "DatagramSocket", True, "getInetAddress", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.net", "DatagramSocket", True, "getRemoteSocketAddress", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.net", "DatagramSocket", True, "send", "(DatagramPacket)", "", "Argument[this]", "Argument[0]", "taint", "df-generated"]
-      - ["java.net", "DatagramSocket", True, "setOption", "(SocketOption,Object)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.net", "DatagramPacket", False, "DatagramPacket", "(byte[],int)", "", "Argument[0]", "Argument[this].SyntheticField[java.net.DatagramPacket.buf]", "value", "dfc-generated"]
+      - ["java.net", "DatagramPacket", False, "DatagramPacket", "(byte[],int,InetAddress,int)", "", "Argument[0]", "Argument[this].SyntheticField[java.net.DatagramPacket.buf]", "value", "dfc-generated"]
+      - ["java.net", "DatagramPacket", False, "DatagramPacket", "(byte[],int,InetAddress,int)", "", "Argument[2]", "Argument[this].SyntheticField[java.net.DatagramPacket.address]", "value", "dfc-generated"]
+      - ["java.net", "DatagramPacket", False, "DatagramPacket", "(byte[],int,SocketAddress)", "", "Argument[0]", "Argument[this].SyntheticField[java.net.DatagramPacket.buf]", "value", "dfc-generated"]
+      - ["java.net", "DatagramPacket", False, "DatagramPacket", "(byte[],int,SocketAddress)", "", "Argument[2]", "Argument[this].SyntheticField[java.net.DatagramPacket.address]", "taint", "dfc-generated"]
+      - ["java.net", "DatagramPacket", False, "DatagramPacket", "(byte[],int,int)", "", "Argument[0]", "Argument[this].SyntheticField[java.net.DatagramPacket.buf]", "value", "dfc-generated"]
+      - ["java.net", "DatagramPacket", False, "DatagramPacket", "(byte[],int,int,InetAddress,int)", "", "Argument[0]", "Argument[this].SyntheticField[java.net.DatagramPacket.buf]", "value", "dfc-generated"]
+      - ["java.net", "DatagramPacket", False, "DatagramPacket", "(byte[],int,int,InetAddress,int)", "", "Argument[3]", "Argument[this].SyntheticField[java.net.DatagramPacket.address]", "value", "dfc-generated"]
+      - ["java.net", "DatagramPacket", False, "DatagramPacket", "(byte[],int,int,SocketAddress)", "", "Argument[0]", "Argument[this].SyntheticField[java.net.DatagramPacket.buf]", "value", "dfc-generated"]
+      - ["java.net", "DatagramPacket", False, "DatagramPacket", "(byte[],int,int,SocketAddress)", "", "Argument[3]", "Argument[this].SyntheticField[java.net.DatagramPacket.address]", "taint", "dfc-generated"]
+      - ["java.net", "DatagramPacket", False, "getAddress", "()", "", "Argument[this].SyntheticField[java.net.DatagramPacket.address]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.net", "DatagramPacket", False, "getData", "()", "", "Argument[this].SyntheticField[java.net.DatagramPacket.buf]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.net", "DatagramPacket", False, "getSocketAddress", "()", "", "Argument[this].SyntheticField[java.net.DatagramPacket.address]", "ReturnValue", "taint", "dfc-generated"]
+      - ["java.net", "DatagramPacket", False, "setAddress", "(InetAddress)", "", "Argument[0]", "Argument[this].SyntheticField[java.net.DatagramPacket.address]", "value", "dfc-generated"]
+      - ["java.net", "DatagramPacket", False, "setData", "(byte[])", "", "Argument[0]", "Argument[this].SyntheticField[java.net.DatagramPacket.buf]", "value", "dfc-generated"]
+      - ["java.net", "DatagramPacket", False, "setData", "(byte[],int,int)", "", "Argument[0]", "Argument[this].SyntheticField[java.net.DatagramPacket.buf]", "value", "dfc-generated"]
+      - ["java.net", "DatagramPacket", False, "setSocketAddress", "(SocketAddress)", "", "Argument[0]", "Argument[this].SyntheticField[java.net.DatagramPacket.address]", "taint", "dfc-generated"]
+      - ["java.net", "DatagramSocket", True, "connect", "(InetAddress,int)", "", "Argument[0]", "Argument[this].SyntheticField[java.net.DatagramSocket.delegate].SyntheticField[java.net.NetMulticastSocket.connectedAddress]", "value", "dfc-generated"]
+      - ["java.net", "DatagramSocket", True, "connect", "(SocketAddress)", "", "Argument[0]", "Argument[this].SyntheticField[java.net.DatagramSocket.delegate].SyntheticField[java.net.NetMulticastSocket.connectedAddress]", "taint", "dfc-generated"]
+      - ["java.net", "DatagramSocket", True, "getChannel", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.net", "DatagramSocket", True, "getInetAddress", "()", "", "Argument[this].SyntheticField[java.net.DatagramSocket.delegate].SyntheticField[java.net.NetMulticastSocket.connectedAddress]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.net", "DatagramSocket", True, "getLocalAddress", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.net", "DatagramSocket", True, "getLocalSocketAddress", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.net", "DatagramSocket", True, "getRemoteSocketAddress", "()", "", "Argument[this].SyntheticField[java.net.DatagramSocket.delegate].SyntheticField[java.net.NetMulticastSocket.connectedAddress]", "ReturnValue", "taint", "dfc-generated"]
+      - ["java.net", "DatagramSocket", True, "receive", "(DatagramPacket)", "", "Argument[this]", "Argument[0]", "taint", "df-generated"]
+      - ["java.net", "DatagramSocket", True, "send", "(DatagramPacket)", "", "Argument[this].SyntheticField[java.net.DatagramSocket.delegate].SyntheticField[java.net.NetMulticastSocket.connectedAddress]", "Argument[0].SyntheticField[java.net.DatagramPacket.address]", "value", "dfc-generated"]
+      - ["java.net", "DatagramSocket", True, "setOption", "(SocketOption,Object)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
       - ["java.net", "DatagramSocket", True, "supportedOptions", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.net", "HttpCookie", False, "HttpCookie", "(String,String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["java.net", "HttpCookie", False, "getComment", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.net", "HttpCookie", False, "getCommentURL", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.net", "HttpCookie", False, "getDomain", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.net", "HttpCookie", False, "getName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.net", "HttpCookie", False, "getPath", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.net", "HttpCookie", False, "getPortlist", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.net", "HttpCookie", False, "getValue", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.net", "FileNameMap", True, "getContentTypeFor", "(String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.net", "HttpCookie", False, "HttpCookie", "(String,String)", "", "Argument[0]", "Argument[this].SyntheticField[java.net.HttpCookie.name]", "taint", "dfc-generated"]
+      - ["java.net", "HttpCookie", False, "HttpCookie", "(String,String)", "", "Argument[1]", "Argument[this].SyntheticField[java.net.HttpCookie.value]", "value", "dfc-generated"]
+      - ["java.net", "HttpCookie", False, "getComment", "()", "", "Argument[this].SyntheticField[java.net.HttpCookie.comment]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.net", "HttpCookie", False, "getCommentURL", "()", "", "Argument[this].SyntheticField[java.net.HttpCookie.commentURL]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.net", "HttpCookie", False, "getDomain", "()", "", "Argument[this].SyntheticField[java.net.HttpCookie.domain]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.net", "HttpCookie", False, "getName", "()", "", "Argument[this].SyntheticField[java.net.HttpCookie.name]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.net", "HttpCookie", False, "getPath", "()", "", "Argument[this].SyntheticField[java.net.HttpCookie.path]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.net", "HttpCookie", False, "getPortlist", "()", "", "Argument[this].SyntheticField[java.net.HttpCookie.portlist]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.net", "HttpCookie", False, "getValue", "()", "", "Argument[this].SyntheticField[java.net.HttpCookie.value]", "ReturnValue", "value", "dfc-generated"]
       - ["java.net", "HttpCookie", False, "parse", "(String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["java.net", "HttpCookie", False, "setComment", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.net", "HttpCookie", False, "setCommentURL", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.net", "HttpCookie", False, "setDomain", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.net", "HttpCookie", False, "setPath", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.net", "HttpCookie", False, "setPortlist", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.net", "HttpCookie", False, "setValue", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.net", "HttpRetryException", True, "HttpRetryException", "(String,int)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.net", "HttpRetryException", True, "HttpRetryException", "(String,int,String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.net", "HttpRetryException", True, "HttpRetryException", "(String,int,String)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
-      - ["java.net", "HttpRetryException", True, "getLocation", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.net", "HttpRetryException", True, "getReason", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.net", "HttpURLConnection", True, "getRequestMethod", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.net", "HttpCookie", False, "setComment", "(String)", "", "Argument[0]", "Argument[this].SyntheticField[java.net.HttpCookie.comment]", "value", "dfc-generated"]
+      - ["java.net", "HttpCookie", False, "setCommentURL", "(String)", "", "Argument[0]", "Argument[this].SyntheticField[java.net.HttpCookie.commentURL]", "value", "dfc-generated"]
+      - ["java.net", "HttpCookie", False, "setDomain", "(String)", "", "Argument[0]", "Argument[this].SyntheticField[java.net.HttpCookie.domain]", "value", "dfc-generated"]
+      - ["java.net", "HttpCookie", False, "setPath", "(String)", "", "Argument[0]", "Argument[this].SyntheticField[java.net.HttpCookie.path]", "value", "dfc-generated"]
+      - ["java.net", "HttpCookie", False, "setPortlist", "(String)", "", "Argument[0]", "Argument[this].SyntheticField[java.net.HttpCookie.portlist]", "value", "dfc-generated"]
+      - ["java.net", "HttpCookie", False, "setValue", "(String)", "", "Argument[0]", "Argument[this].SyntheticField[java.net.HttpCookie.value]", "value", "dfc-generated"]
+      - ["java.net", "HttpRetryException", True, "HttpRetryException", "(String,int)", "", "Argument[0]", "Argument[this].SyntheticField[java.lang.Throwable.message]", "value", "dfc-generated"]
+      - ["java.net", "HttpRetryException", True, "HttpRetryException", "(String,int,String)", "", "Argument[0]", "Argument[this].SyntheticField[java.lang.Throwable.message]", "value", "dfc-generated"]
+      - ["java.net", "HttpRetryException", True, "HttpRetryException", "(String,int,String)", "", "Argument[2]", "Argument[this].SyntheticField[java.net.HttpRetryException.location]", "value", "dfc-generated"]
+      - ["java.net", "HttpRetryException", True, "getLocation", "()", "", "Argument[this].SyntheticField[java.net.HttpRetryException.location]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.net", "HttpRetryException", True, "getReason", "()", "", "Argument[this].SyntheticField[java.lang.Throwable.message]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.net", "HttpURLConnection", True, "getErrorStream", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.net", "HttpURLConnection", True, "getRequestMethod", "()", "", "Argument[this].SyntheticField[java.net.HttpURLConnection.method]", "ReturnValue", "value", "dfc-generated"]
       - ["java.net", "HttpURLConnection", True, "getResponseMessage", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.net", "HttpURLConnection", True, "setRequestMethod", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.net", "Inet6Address", False, "getByAddress", "(String,byte[],NetworkInterface)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["java.net", "Inet6Address", False, "getByAddress", "(String,byte[],NetworkInterface)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["java.net", "Inet6Address", False, "getByAddress", "(String,byte[],NetworkInterface)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
-      - ["java.net", "Inet6Address", False, "getByAddress", "(String,byte[],int)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["java.net", "Inet6Address", False, "getByAddress", "(String,byte[],int)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["java.net", "Inet6Address", False, "getScopedInterface", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.net", "InetAddress", True, "getAddress", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.net", "InetAddress", True, "getByAddress", "(String,byte[])", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["java.net", "InetAddress", True, "getByAddress", "(String,byte[])", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["java.net", "HttpURLConnection", True, "setAuthenticator", "(Authenticator)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.net", "HttpURLConnection", True, "setRequestMethod", "(String)", "", "Argument[0]", "Argument[this].SyntheticField[java.net.HttpURLConnection.method]", "value", "dfc-generated"]
+      - ["java.net", "IDN", False, "toASCII", "(String)", "", "Argument[0]", "ReturnValue", "taint", "dfc-generated"]
+      - ["java.net", "IDN", False, "toASCII", "(String,int)", "", "Argument[0]", "ReturnValue", "taint", "dfc-generated"]
+      - ["java.net", "IDN", False, "toUnicode", "(String)", "", "Argument[0]", "ReturnValue", "taint", "dfc-generated"]
+      - ["java.net", "IDN", False, "toUnicode", "(String,int)", "", "Argument[0]", "ReturnValue", "taint", "dfc-generated"]
+      - ["java.net", "Inet6Address", False, "getAddress", "()", "", "Argument[this].SyntheticField[java.net.Inet6Address.holder6].SyntheticField[java.net.Inet6Address$Inet6AddressHolder.ipaddress]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.net", "Inet6Address", False, "getByAddress", "(String,byte[],NetworkInterface)", "", "Argument[1]", "ReturnValue.SyntheticField[java.net.Inet6Address.holder6].SyntheticField[java.net.Inet6Address$Inet6AddressHolder.ipaddress]", "taint", "dfc-generated"]
+      - ["java.net", "Inet6Address", False, "getByAddress", "(String,byte[],NetworkInterface)", "", "Argument[2]", "ReturnValue.SyntheticField[java.net.Inet6Address.holder6].SyntheticField[java.net.Inet6Address$Inet6AddressHolder.scope_ifname]", "value", "dfc-generated"]
+      - ["java.net", "Inet6Address", False, "getByAddress", "(String,byte[],int)", "", "Argument[1]", "ReturnValue.SyntheticField[java.net.Inet6Address.holder6].SyntheticField[java.net.Inet6Address$Inet6AddressHolder.ipaddress]", "taint", "dfc-generated"]
+      - ["java.net", "Inet6Address", False, "getScopedInterface", "()", "", "Argument[this].SyntheticField[java.net.Inet6Address.holder6].SyntheticField[java.net.Inet6Address$Inet6AddressHolder.scope_ifname]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.net", "InetAddress", True, "getByAddress", "(String,byte[])", "", "Argument[1]", "ReturnValue.SyntheticField[java.net.Inet6Address.holder6].SyntheticField[java.net.Inet6Address$Inet6AddressHolder.ipaddress]", "taint", "dfc-generated"]
       - ["java.net", "InetAddress", True, "getCanonicalHostName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.net", "InetAddress", True, "getHostName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.net", "InetSocketAddress", True, "InetSocketAddress", "(InetAddress,int)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.net", "InetSocketAddress", True, "getAddress", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.net", "InetSocketAddress", True, "getHostName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.net", "InetSocketAddress", True, "getHostString", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.net", "InterfaceAddress", True, "getAddress", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.net", "InterfaceAddress", True, "getBroadcast", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.net", "JarURLConnection", True, "getAttributes", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.net", "JarURLConnection", True, "getCertificates", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.net", "JarURLConnection", True, "getEntryName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.net", "JarURLConnection", True, "getJarEntry", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.net", "JarURLConnection", True, "getJarFile", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.net", "JarURLConnection", True, "getJarFileURL", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.net", "JarURLConnection", True, "getManifest", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.net", "MalformedURLException", True, "MalformedURLException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.net", "MulticastSocket", True, "getInterface", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.net", "MulticastSocket", True, "getInterface", "()", "", "Argument[this].SyntheticField[java.net.DatagramSocket.delegate].SyntheticField[java.net.NetMulticastSocket.infAddress]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.net", "MulticastSocket", True, "getInterface", "()", "", "Argument[this].SyntheticField[java.net.DatagramSocket.delegate].SyntheticField[sun.nio.ch.DatagramSocketAdaptor.outgoingInetAddress]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.net", "MulticastSocket", True, "send", "(DatagramPacket,byte)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.net", "MulticastSocket", True, "send", "(DatagramPacket,byte)", "", "Argument[this]", "Argument[0]", "taint", "df-generated"]
-      - ["java.net", "MulticastSocket", True, "setInterface", "(InetAddress)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.net", "NetPermission", False, "NetPermission", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.net", "NetPermission", False, "NetPermission", "(String,String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.net", "MulticastSocket", True, "setInterface", "(InetAddress)", "", "Argument[0]", "Argument[this].SyntheticField[java.net.DatagramSocket.delegate].SyntheticField[java.net.NetMulticastSocket.infAddress]", "value", "dfc-generated"]
+      - ["java.net", "MulticastSocket", True, "setInterface", "(InetAddress)", "", "Argument[0]", "Argument[this].SyntheticField[java.net.DatagramSocket.delegate].SyntheticField[sun.nio.ch.DatagramSocketAdaptor.outgoingInetAddress]", "value", "dfc-generated"]
+      - ["java.net", "NetPermission", False, "NetPermission", "(String)", "", "Argument[0]", "Argument[this]", "taint", "dfc-generated"]
+      - ["java.net", "NetPermission", False, "NetPermission", "(String,String)", "", "Argument[0]", "Argument[this]", "taint", "dfc-generated"]
       - ["java.net", "NetworkInterface", False, "getDisplayName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.net", "NetworkInterface", False, "getInterfaceAddresses", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.net", "NetworkInterface", False, "getName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.net", "NetworkInterface", False, "getParent", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.net", "NetworkInterface", False, "subInterfaces", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.net", "NoRouteToHostException", True, "NoRouteToHostException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.net", "PasswordAuthentication", False, "PasswordAuthentication", "(String,char[])", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.net", "PasswordAuthentication", False, "PasswordAuthentication", "(String,char[])", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["java.net", "PasswordAuthentication", False, "getPassword", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.net", "PasswordAuthentication", False, "getUserName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.net", "PasswordAuthentication", False, "PasswordAuthentication", "(String,char[])", "", "Argument[0]", "Argument[this].SyntheticField[java.net.PasswordAuthentication.userName]", "value", "dfc-generated"]
+      - ["java.net", "PasswordAuthentication", False, "PasswordAuthentication", "(String,char[])", "", "Argument[1]", "Argument[this].SyntheticField[java.net.PasswordAuthentication.password]", "value", "dfc-generated"]
+      - ["java.net", "PasswordAuthentication", False, "getPassword", "()", "", "Argument[this].SyntheticField[java.net.PasswordAuthentication.password]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.net", "PasswordAuthentication", False, "getUserName", "()", "", "Argument[this].SyntheticField[java.net.PasswordAuthentication.userName]", "ReturnValue", "value", "dfc-generated"]
       - ["java.net", "PortUnreachableException", True, "PortUnreachableException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.net", "ProtocolException", True, "ProtocolException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.net", "Proxy", True, "Proxy", "(Proxy$Type,SocketAddress)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["java.net", "Proxy", True, "address", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.net", "Proxy", True, "Proxy", "(Proxy$Type,SocketAddress)", "", "Argument[1]", "Argument[this].SyntheticField[java.net.Proxy.sa]", "value", "dfc-generated"]
+      - ["java.net", "Proxy", True, "address", "()", "", "Argument[this].SyntheticField[java.net.Proxy.sa]", "ReturnValue", "value", "dfc-generated"]
       - ["java.net", "ProxySelector", True, "select", "(URI)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.net", "ServerSocket", True, "ServerSocket", "(int,int,InetAddress)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
-      - ["java.net", "ServerSocket", True, "bind", "(SocketAddress,int)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.net", "ServerSocket", True, "getInetAddress", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.net", "ServerSocket", True, "ServerSocket", "(int,int,InetAddress)", "", "Argument[2]", "Argument[this].SyntheticField[java.net.ServerSocket.impl].SyntheticField[java.net.SocketImpl.address]", "taint", "dfc-generated"]
+      - ["java.net", "ServerSocket", True, "accept", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.net", "ServerSocket", True, "bind", "(SocketAddress)", "", "Argument[0]", "Argument[this].SyntheticField[java.net.ServerSocket.impl].SyntheticField[java.net.SocketImpl.address]", "taint", "dfc-generated"]
+      - ["java.net", "ServerSocket", True, "bind", "(SocketAddress,int)", "", "Argument[0]", "Argument[this].SyntheticField[java.net.ServerSocket.impl].SyntheticField[java.net.SocketImpl.address]", "taint", "dfc-generated"]
+      - ["java.net", "ServerSocket", True, "getChannel", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.net", "ServerSocket", True, "getInetAddress", "()", "", "Argument[this].SyntheticField[java.net.ServerSocket.impl].SyntheticField[java.net.SocketImpl.address]", "ReturnValue", "value", "dfc-generated"]
       - ["java.net", "ServerSocket", True, "getLocalSocketAddress", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.net", "ServerSocket", True, "setOption", "(SocketOption,Object)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.net", "ServerSocket", True, "setOption", "(SocketOption,Object)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
       - ["java.net", "ServerSocket", True, "supportedOptions", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.net", "Socket", True, "Socket", "(InetAddress,int,InetAddress,int)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
+      - ["java.net", "Socket", True, "Socket", "(InetAddress,int)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.net", "Socket", True, "Socket", "(InetAddress,int,InetAddress,int)", "", "Argument[2]", "Argument[this].SyntheticField[java.net.Socket.impl].SyntheticField[java.net.SocketImpl.address]", "taint", "dfc-generated"]
+      - ["java.net", "Socket", True, "Socket", "(InetAddress,int,boolean)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.net", "Socket", True, "Socket", "(Proxy)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.net", "Socket", True, "Socket", "(String,int)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.net", "Socket", True, "Socket", "(String,int,InetAddress,int)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.net", "Socket", True, "Socket", "(String,int,InetAddress,int)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
+      - ["java.net", "Socket", True, "Socket", "(String,int,InetAddress,int)", "", "Argument[2]", "Argument[this].SyntheticField[java.net.Socket.impl].SyntheticField[java.net.SocketImpl.address]", "taint", "dfc-generated"]
       - ["java.net", "Socket", True, "Socket", "(String,int,boolean)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.net", "Socket", True, "bind", "(SocketAddress)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.net", "Socket", True, "getInetAddress", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.net", "Socket", True, "bind", "(SocketAddress)", "", "Argument[0]", "Argument[this].SyntheticField[java.net.Socket.impl].SyntheticField[java.net.SocketImpl.address]", "taint", "dfc-generated"]
+      - ["java.net", "Socket", True, "getChannel", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.net", "Socket", True, "getInetAddress", "()", "", "Argument[this].SyntheticField[java.net.Socket.impl].SyntheticField[java.net.SocketImpl.address]", "ReturnValue", "value", "dfc-generated"]
       - ["java.net", "Socket", True, "getInputStream", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.net", "Socket", True, "getLocalAddress", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.net", "Socket", True, "getLocalSocketAddress", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.net", "Socket", True, "getRemoteSocketAddress", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.net", "Socket", True, "setOption", "(SocketOption,Object)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.net", "Socket", True, "setOption", "(SocketOption,Object)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
       - ["java.net", "Socket", True, "supportedOptions", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.net", "SocketException", True, "SocketException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.net", "SocketOptions", True, "setOption", "(int,Object)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["java.net", "SocketPermission", False, "SocketPermission", "(String,String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.net", "SocketPermission", False, "SocketPermission", "(String,String)", "", "Argument[0]", "Argument[this]", "taint", "dfc-generated"]
       - ["java.net", "SocketTimeoutException", True, "SocketTimeoutException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.net", "URI", False, "getAuthority", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.net", "URI", False, "getFragment", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.net", "URI", False, "getHost", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.net", "URI", False, "getPath", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.net", "URI", False, "getQuery", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.net", "URI", False, "getRawAuthority", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.net", "URI", False, "getRawFragment", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
@@ -156,31 +171,19 @@ extensions:
       - ["java.net", "URI", False, "getSchemeSpecificPart", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.net", "URI", False, "getUserInfo", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.net", "URI", False, "normalize", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.net", "URI", False, "parseServerAuthority", "()", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.net", "URI", False, "parseServerAuthority", "()", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
       - ["java.net", "URI", False, "relativize", "(URI)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["java.net", "URISyntaxException", True, "URISyntaxException", "(String,String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.net", "URISyntaxException", True, "URISyntaxException", "(String,String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["java.net", "URISyntaxException", True, "URISyntaxException", "(String,String,int)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.net", "URISyntaxException", True, "URISyntaxException", "(String,String,int)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["java.net", "URISyntaxException", True, "getInput", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.net", "URISyntaxException", True, "getReason", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.net", "URL", False, "URL", "(String,String,String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.net", "URL", False, "URL", "(String,String,String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["java.net", "URL", False, "URL", "(String,String,String)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
-      - ["java.net", "URL", False, "URL", "(String,String,int,String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.net", "URL", False, "URL", "(String,String,int,String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["java.net", "URL", False, "URL", "(String,String,int,String)", "", "Argument[3]", "Argument[this]", "taint", "df-generated"]
-      - ["java.net", "URL", False, "URL", "(String,String,int,String,URLStreamHandler)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.net", "URL", False, "URL", "(String,String,int,String,URLStreamHandler)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["java.net", "URL", False, "URL", "(String,String,int,String,URLStreamHandler)", "", "Argument[3]", "Argument[this]", "taint", "df-generated"]
-      - ["java.net", "URL", False, "URL", "(String,String,int,String,URLStreamHandler)", "", "Argument[4]", "Argument[this]", "taint", "df-generated"]
+      - ["java.net", "URISyntaxException", True, "URISyntaxException", "(String,String)", "", "Argument[0]", "Argument[this].SyntheticField[java.net.URISyntaxException.input]", "value", "dfc-generated"]
+      - ["java.net", "URISyntaxException", True, "URISyntaxException", "(String,String)", "", "Argument[1]", "Argument[this].SyntheticField[java.lang.Throwable.message]", "value", "dfc-generated"]
+      - ["java.net", "URISyntaxException", True, "URISyntaxException", "(String,String,int)", "", "Argument[0]", "Argument[this].SyntheticField[java.net.URISyntaxException.input]", "value", "dfc-generated"]
+      - ["java.net", "URISyntaxException", True, "URISyntaxException", "(String,String,int)", "", "Argument[1]", "Argument[this].SyntheticField[java.lang.Throwable.message]", "value", "dfc-generated"]
+      - ["java.net", "URISyntaxException", True, "getInput", "()", "", "Argument[this].SyntheticField[java.net.URISyntaxException.input]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.net", "URISyntaxException", True, "getReason", "()", "", "Argument[this].SyntheticField[java.lang.Throwable.message]", "ReturnValue", "value", "dfc-generated"]
       - ["java.net", "URL", False, "URL", "(URL,String,URLStreamHandler)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.net", "URL", False, "URL", "(URL,String,URLStreamHandler)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
       - ["java.net", "URL", False, "URL", "(URL,String,URLStreamHandler)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
       - ["java.net", "URL", False, "getAuthority", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.net", "URL", False, "getContent", "(Class[])", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.net", "URL", False, "getHost", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.net", "URL", False, "getProtocol", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.net", "URL", False, "getRef", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.net", "URL", False, "getUserInfo", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.net", "URL", False, "openConnection", "(Proxy)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
@@ -192,23 +195,28 @@ extensions:
       - ["java.net", "URLClassLoader", True, "URLClassLoader", "(URL[],ClassLoader)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
       - ["java.net", "URLClassLoader", True, "URLClassLoader", "(URL[],ClassLoader,URLStreamHandlerFactory)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
       - ["java.net", "URLClassLoader", True, "getURLs", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.net", "URLClassLoader", True, "newInstance", "(URL[],ClassLoader)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
       - ["java.net", "URLConnection", True, "getContent", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.net", "URLConnection", True, "getContent", "(Class[])", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.net", "URLConnection", True, "getContentEncoding", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.net", "URLConnection", True, "getContentType", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.net", "URLConnection", True, "getHeaderField", "(String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.net", "URLConnection", True, "getHeaderField", "(int)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.net", "URLConnection", True, "getHeaderFieldKey", "(int)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.net", "URLConnection", True, "getHeaderFields", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.net", "URLConnection", True, "getInputStream", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.net", "URLConnection", True, "getOutputStream", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.net", "URLConnection", True, "getPermission", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.net", "URLConnection", True, "getRequestProperties", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.net", "URLConnection", True, "getRequestProperty", "(String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.net", "URLConnection", True, "getURL", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.net", "URLEncoder", True, "encode", "(String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["java.net", "URLEncoder", True, "encode", "(String,Charset)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["java.net", "URLEncoder", True, "encode", "(String,String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["java.net", "URLPermission", False, "URLPermission", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.net", "URLPermission", False, "URLPermission", "(String,String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.net", "UnixDomainSocketAddress", False, "getPath", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.net", "UnixDomainSocketAddress", False, "of", "(Path)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["java.net", "UnixDomainSocketAddress", False, "of", "(String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.net", "URLEncoder", True, "encode", "(String)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.net", "URLEncoder", True, "encode", "(String,Charset)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.net", "URLEncoder", True, "encode", "(String,String)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.net", "URLPermission", False, "URLPermission", "(String)", "", "Argument[0]", "Argument[this]", "taint", "dfc-generated"]
+      - ["java.net", "URLPermission", False, "URLPermission", "(String,String)", "", "Argument[0]", "Argument[this]", "taint", "dfc-generated"]
+      - ["java.net", "UnixDomainSocketAddress", False, "getPath", "()", "", "Argument[this].SyntheticField[java.net.UnixDomainSocketAddress.path]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.net", "UnixDomainSocketAddress", False, "of", "(Path)", "", "Argument[0]", "ReturnValue.SyntheticField[java.net.UnixDomainSocketAddress.path]", "value", "dfc-generated"]
+      - ["java.net", "UnixDomainSocketAddress", False, "of", "(String)", "", "Argument[0]", "ReturnValue.SyntheticField[java.net.UnixDomainSocketAddress.path]", "taint", "dfc-generated"]
       - ["java.net", "UnknownHostException", True, "UnknownHostException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.net", "UnknownServiceException", True, "UnknownServiceException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
   - addsTo:
@@ -228,9 +236,8 @@ extensions:
       - ["java.net", "CookieHandler", "getDefault", "()", "summary", "df-generated"]
       - ["java.net", "CookieHandler", "put", "(URI,Map)", "summary", "df-generated"]
       - ["java.net", "CookieHandler", "setDefault", "(CookieHandler)", "summary", "df-generated"]
-      - ["java.net", "CookiePolicy", "shouldAccept", "(URI,HttpCookie)", "summary", "df-generated"]
-      - ["java.net", "CookieStore", "remove", "(URI,HttpCookie)", "summary", "df-generated"]
-      - ["java.net", "CookieStore", "removeAll", "()", "summary", "df-generated"]
+      - ["java.net", "CookieManager", "get", "(URI,Map)", "summary", "df-generated"]
+      - ["java.net", "CookieManager", "put", "(URI,Map)", "summary", "df-generated"]
       - ["java.net", "DatagramPacket", "getLength", "()", "summary", "df-generated"]
       - ["java.net", "DatagramPacket", "getOffset", "()", "summary", "df-generated"]
       - ["java.net", "DatagramPacket", "getPort", "()", "summary", "df-generated"]
@@ -242,10 +249,7 @@ extensions:
       - ["java.net", "DatagramSocket", "bind", "(SocketAddress)", "summary", "df-generated"]
       - ["java.net", "DatagramSocket", "disconnect", "()", "summary", "df-generated"]
       - ["java.net", "DatagramSocket", "getBroadcast", "()", "summary", "df-generated"]
-      - ["java.net", "DatagramSocket", "getChannel", "()", "summary", "df-generated"]
-      - ["java.net", "DatagramSocket", "getLocalAddress", "()", "summary", "df-generated"]
       - ["java.net", "DatagramSocket", "getLocalPort", "()", "summary", "df-generated"]
-      - ["java.net", "DatagramSocket", "getLocalSocketAddress", "()", "summary", "df-generated"]
       - ["java.net", "DatagramSocket", "getOption", "(SocketOption)", "summary", "df-generated"]
       - ["java.net", "DatagramSocket", "getPort", "()", "summary", "df-generated"]
       - ["java.net", "DatagramSocket", "getReceiveBufferSize", "()", "summary", "df-generated"]
@@ -258,7 +262,6 @@ extensions:
       - ["java.net", "DatagramSocket", "isConnected", "()", "summary", "df-generated"]
       - ["java.net", "DatagramSocket", "joinGroup", "(SocketAddress,NetworkInterface)", "summary", "df-generated"]
       - ["java.net", "DatagramSocket", "leaveGroup", "(SocketAddress,NetworkInterface)", "summary", "df-generated"]
-      - ["java.net", "DatagramSocket", "receive", "(DatagramPacket)", "summary", "df-generated"]
       - ["java.net", "DatagramSocket", "setBroadcast", "(boolean)", "summary", "df-generated"]
       - ["java.net", "DatagramSocket", "setDatagramSocketImplFactory", "(DatagramSocketImplFactory)", "summary", "df-generated"]
       - ["java.net", "DatagramSocket", "setReceiveBufferSize", "(int)", "summary", "df-generated"]
@@ -266,7 +269,6 @@ extensions:
       - ["java.net", "DatagramSocket", "setSendBufferSize", "(int)", "summary", "df-generated"]
       - ["java.net", "DatagramSocket", "setSoTimeout", "(int)", "summary", "df-generated"]
       - ["java.net", "DatagramSocket", "setTrafficClass", "(int)", "summary", "df-generated"]
-      - ["java.net", "FileNameMap", "getContentTypeFor", "(String)", "summary", "df-generated"]
       - ["java.net", "HttpCookie", "domainMatches", "(String,String)", "summary", "df-generated"]
       - ["java.net", "HttpCookie", "getDiscard", "()", "summary", "df-generated"]
       - ["java.net", "HttpCookie", "getMaxAge", "()", "summary", "df-generated"]
@@ -281,23 +283,42 @@ extensions:
       - ["java.net", "HttpCookie", "setVersion", "(int)", "summary", "df-generated"]
       - ["java.net", "HttpRetryException", "responseCode", "()", "summary", "df-generated"]
       - ["java.net", "HttpURLConnection", "disconnect", "()", "summary", "df-generated"]
-      - ["java.net", "HttpURLConnection", "getErrorStream", "()", "summary", "df-generated"]
       - ["java.net", "HttpURLConnection", "getFollowRedirects", "()", "summary", "df-generated"]
+      - ["java.net", "HttpURLConnection", "getHeaderFieldDate", "(String,long)", "summary", "df-generated"]
       - ["java.net", "HttpURLConnection", "getInstanceFollowRedirects", "()", "summary", "df-generated"]
       - ["java.net", "HttpURLConnection", "getResponseCode", "()", "summary", "df-generated"]
-      - ["java.net", "HttpURLConnection", "setAuthenticator", "(Authenticator)", "summary", "df-generated"]
       - ["java.net", "HttpURLConnection", "setChunkedStreamingMode", "(int)", "summary", "df-generated"]
       - ["java.net", "HttpURLConnection", "setFixedLengthStreamingMode", "(int)", "summary", "df-generated"]
       - ["java.net", "HttpURLConnection", "setFixedLengthStreamingMode", "(long)", "summary", "df-generated"]
       - ["java.net", "HttpURLConnection", "setFollowRedirects", "(boolean)", "summary", "df-generated"]
       - ["java.net", "HttpURLConnection", "setInstanceFollowRedirects", "(boolean)", "summary", "df-generated"]
       - ["java.net", "HttpURLConnection", "usingProxy", "()", "summary", "df-generated"]
-      - ["java.net", "IDN", "toASCII", "(String)", "summary", "df-generated"]
-      - ["java.net", "IDN", "toASCII", "(String,int)", "summary", "df-generated"]
-      - ["java.net", "IDN", "toUnicode", "(String)", "summary", "df-generated"]
-      - ["java.net", "IDN", "toUnicode", "(String,int)", "summary", "df-generated"]
+      - ["java.net", "Inet4Address", "getAddress", "()", "summary", "df-generated"]
+      - ["java.net", "Inet4Address", "getHostAddress", "()", "summary", "df-generated"]
+      - ["java.net", "Inet4Address", "isAnyLocalAddress", "()", "summary", "df-generated"]
+      - ["java.net", "Inet4Address", "isLinkLocalAddress", "()", "summary", "df-generated"]
+      - ["java.net", "Inet4Address", "isLoopbackAddress", "()", "summary", "df-generated"]
+      - ["java.net", "Inet4Address", "isMCGlobal", "()", "summary", "df-generated"]
+      - ["java.net", "Inet4Address", "isMCLinkLocal", "()", "summary", "df-generated"]
+      - ["java.net", "Inet4Address", "isMCNodeLocal", "()", "summary", "df-generated"]
+      - ["java.net", "Inet4Address", "isMCOrgLocal", "()", "summary", "df-generated"]
+      - ["java.net", "Inet4Address", "isMCSiteLocal", "()", "summary", "df-generated"]
+      - ["java.net", "Inet4Address", "isMulticastAddress", "()", "summary", "df-generated"]
+      - ["java.net", "Inet4Address", "isSiteLocalAddress", "()", "summary", "df-generated"]
+      - ["java.net", "Inet6Address", "getHostAddress", "()", "summary", "df-generated"]
       - ["java.net", "Inet6Address", "getScopeId", "()", "summary", "df-generated"]
+      - ["java.net", "Inet6Address", "isAnyLocalAddress", "()", "summary", "df-generated"]
       - ["java.net", "Inet6Address", "isIPv4CompatibleAddress", "()", "summary", "df-generated"]
+      - ["java.net", "Inet6Address", "isLinkLocalAddress", "()", "summary", "df-generated"]
+      - ["java.net", "Inet6Address", "isLoopbackAddress", "()", "summary", "df-generated"]
+      - ["java.net", "Inet6Address", "isMCGlobal", "()", "summary", "df-generated"]
+      - ["java.net", "Inet6Address", "isMCLinkLocal", "()", "summary", "df-generated"]
+      - ["java.net", "Inet6Address", "isMCNodeLocal", "()", "summary", "df-generated"]
+      - ["java.net", "Inet6Address", "isMCOrgLocal", "()", "summary", "df-generated"]
+      - ["java.net", "Inet6Address", "isMCSiteLocal", "()", "summary", "df-generated"]
+      - ["java.net", "Inet6Address", "isMulticastAddress", "()", "summary", "df-generated"]
+      - ["java.net", "Inet6Address", "isSiteLocalAddress", "()", "summary", "df-generated"]
+      - ["java.net", "InetAddress", "getAddress", "()", "summary", "df-generated"]
       - ["java.net", "InetAddress", "getHostAddress", "()", "summary", "df-generated"]
       - ["java.net", "InetAddress", "getLocalHost", "()", "summary", "df-generated"]
       - ["java.net", "InetAddress", "getLoopbackAddress", "()", "summary", "df-generated"]
@@ -314,10 +335,8 @@ extensions:
       - ["java.net", "InetAddress", "isReachable", "(int)", "summary", "df-generated"]
       - ["java.net", "InetAddress", "isSiteLocalAddress", "()", "summary", "df-generated"]
       - ["java.net", "InetSocketAddress", "InetSocketAddress", "(int)", "summary", "df-generated"]
-      - ["java.net", "InetSocketAddress", "getPort", "()", "summary", "df-generated"]
       - ["java.net", "InetSocketAddress", "isUnresolved", "()", "summary", "df-generated"]
       - ["java.net", "InterfaceAddress", "getNetworkPrefixLength", "()", "summary", "df-generated"]
-      - ["java.net", "JarURLConnection", "getJarFile", "()", "summary", "df-generated"]
       - ["java.net", "JarURLConnection", "getMainAttributes", "()", "summary", "df-generated"]
       - ["java.net", "MulticastSocket", "MulticastSocket", "(SocketAddress)", "summary", "df-generated"]
       - ["java.net", "MulticastSocket", "MulticastSocket", "(int)", "summary", "df-generated"]
@@ -326,7 +345,9 @@ extensions:
       - ["java.net", "MulticastSocket", "getTTL", "()", "summary", "df-generated"]
       - ["java.net", "MulticastSocket", "getTimeToLive", "()", "summary", "df-generated"]
       - ["java.net", "MulticastSocket", "joinGroup", "(InetAddress)", "summary", "df-generated"]
+      - ["java.net", "MulticastSocket", "joinGroup", "(SocketAddress,NetworkInterface)", "summary", "df-generated"]
       - ["java.net", "MulticastSocket", "leaveGroup", "(InetAddress)", "summary", "df-generated"]
+      - ["java.net", "MulticastSocket", "leaveGroup", "(SocketAddress,NetworkInterface)", "summary", "df-generated"]
       - ["java.net", "MulticastSocket", "setLoopbackMode", "(boolean)", "summary", "df-generated"]
       - ["java.net", "MulticastSocket", "setNetworkInterface", "(NetworkInterface)", "summary", "df-generated"]
       - ["java.net", "MulticastSocket", "setTTL", "(byte)", "summary", "df-generated"]
@@ -364,9 +385,6 @@ extensions:
       - ["java.net", "SecureCacheResponse", "getServerCertificateChain", "()", "summary", "df-generated"]
       - ["java.net", "ServerSocket", "ServerSocket", "(int)", "summary", "df-generated"]
       - ["java.net", "ServerSocket", "ServerSocket", "(int,int)", "summary", "df-generated"]
-      - ["java.net", "ServerSocket", "accept", "()", "summary", "df-generated"]
-      - ["java.net", "ServerSocket", "bind", "(SocketAddress)", "summary", "df-generated"]
-      - ["java.net", "ServerSocket", "getChannel", "()", "summary", "df-generated"]
       - ["java.net", "ServerSocket", "getLocalPort", "()", "summary", "df-generated"]
       - ["java.net", "ServerSocket", "getOption", "(SocketOption)", "summary", "df-generated"]
       - ["java.net", "ServerSocket", "getReceiveBufferSize", "()", "summary", "df-generated"]
@@ -379,14 +397,8 @@ extensions:
       - ["java.net", "ServerSocket", "setReuseAddress", "(boolean)", "summary", "df-generated"]
       - ["java.net", "ServerSocket", "setSoTimeout", "(int)", "summary", "df-generated"]
       - ["java.net", "ServerSocket", "setSocketFactory", "(SocketImplFactory)", "summary", "df-generated"]
-      - ["java.net", "Socket", "Socket", "(InetAddress,int)", "summary", "df-generated"]
-      - ["java.net", "Socket", "Socket", "(InetAddress,int,boolean)", "summary", "df-generated"]
-      - ["java.net", "Socket", "Socket", "(Proxy)", "summary", "df-generated"]
-      - ["java.net", "Socket", "getChannel", "()", "summary", "df-generated"]
       - ["java.net", "Socket", "getKeepAlive", "()", "summary", "df-generated"]
-      - ["java.net", "Socket", "getLocalAddress", "()", "summary", "df-generated"]
       - ["java.net", "Socket", "getLocalPort", "()", "summary", "df-generated"]
-      - ["java.net", "Socket", "getLocalSocketAddress", "()", "summary", "df-generated"]
       - ["java.net", "Socket", "getOOBInline", "()", "summary", "df-generated"]
       - ["java.net", "Socket", "getOption", "(SocketOption)", "summary", "df-generated"]
       - ["java.net", "Socket", "getPort", "()", "summary", "df-generated"]
@@ -416,19 +428,21 @@ extensions:
       - ["java.net", "Socket", "setTrafficClass", "(int)", "summary", "df-generated"]
       - ["java.net", "Socket", "shutdownInput", "()", "summary", "df-generated"]
       - ["java.net", "Socket", "shutdownOutput", "()", "summary", "df-generated"]
-      - ["java.net", "SocketOptions", "getOption", "(int)", "summary", "df-generated"]
-      - ["java.net", "URI", "URI", "(String,String,String)", "summary", "df-generated"]
+      - ["java.net", "SocketPermission", "implies", "(Permission)", "summary", "df-generated"]
+      - ["java.net", "SocketPermission", "newPermissionCollection", "()", "summary", "df-generated"]
       - ["java.net", "URI", "URI", "(String,String,String,String)", "summary", "df-generated"]
       - ["java.net", "URI", "URI", "(String,String,String,String,String)", "summary", "df-generated"]
       - ["java.net", "URI", "getPort", "()", "summary", "df-generated"]
       - ["java.net", "URI", "isAbsolute", "()", "summary", "df-generated"]
       - ["java.net", "URI", "isOpaque", "()", "summary", "df-generated"]
       - ["java.net", "URISyntaxException", "getIndex", "()", "summary", "df-generated"]
+      - ["java.net", "URL", "getContent", "(Class[])", "summary", "df-generated"]
       - ["java.net", "URL", "sameFile", "(URL)", "summary", "df-generated"]
       - ["java.net", "URL", "setURLStreamHandlerFactory", "(URLStreamHandlerFactory)", "summary", "df-generated"]
       - ["java.net", "URLClassLoader", "URLClassLoader", "(URL[])", "summary", "df-generated"]
-      - ["java.net", "URLClassLoader", "addURL", "(URL)", "summary", "df-generated"]
+      - ["java.net", "URLClassLoader", "findResources", "(String)", "summary", "df-generated"]
       - ["java.net", "URLClassLoader", "newInstance", "(URL[])", "summary", "df-generated"]
+      - ["java.net", "URLClassLoader", "newInstance", "(URL[],ClassLoader)", "summary", "df-generated"]
       - ["java.net", "URLConnection", "addRequestProperty", "(String,String)", "summary", "df-generated"]
       - ["java.net", "URLConnection", "connect", "()", "summary", "df-generated"]
       - ["java.net", "URLConnection", "getAllowUserInteraction", "()", "summary", "df-generated"]
@@ -444,17 +458,11 @@ extensions:
       - ["java.net", "URLConnection", "getDoOutput", "()", "summary", "df-generated"]
       - ["java.net", "URLConnection", "getExpiration", "()", "summary", "df-generated"]
       - ["java.net", "URLConnection", "getFileNameMap", "()", "summary", "df-generated"]
-      - ["java.net", "URLConnection", "getHeaderField", "(String)", "summary", "df-generated"]
-      - ["java.net", "URLConnection", "getHeaderField", "(int)", "summary", "df-generated"]
       - ["java.net", "URLConnection", "getHeaderFieldDate", "(String,long)", "summary", "df-generated"]
       - ["java.net", "URLConnection", "getHeaderFieldInt", "(String,int)", "summary", "df-generated"]
-      - ["java.net", "URLConnection", "getHeaderFieldKey", "(int)", "summary", "df-generated"]
       - ["java.net", "URLConnection", "getHeaderFieldLong", "(String,long)", "summary", "df-generated"]
-      - ["java.net", "URLConnection", "getHeaderFields", "()", "summary", "df-generated"]
       - ["java.net", "URLConnection", "getIfModifiedSince", "()", "summary", "df-generated"]
-      - ["java.net", "URLConnection", "getInputStream", "()", "summary", "df-generated"]
       - ["java.net", "URLConnection", "getLastModified", "()", "summary", "df-generated"]
-      - ["java.net", "URLConnection", "getOutputStream", "()", "summary", "df-generated"]
       - ["java.net", "URLConnection", "getReadTimeout", "()", "summary", "df-generated"]
       - ["java.net", "URLConnection", "getUseCaches", "()", "summary", "df-generated"]
       - ["java.net", "URLConnection", "guessContentTypeFromName", "(String)", "summary", "df-generated"]
@@ -473,4 +481,4 @@ extensions:
       - ["java.net", "URLConnection", "setReadTimeout", "(int)", "summary", "df-generated"]
       - ["java.net", "URLConnection", "setRequestProperty", "(String,String)", "summary", "df-generated"]
       - ["java.net", "URLConnection", "setUseCaches", "(boolean)", "summary", "df-generated"]
-      - ["java.net", "URLStreamHandlerFactory", "createURLStreamHandler", "(String)", "summary", "df-generated"]
+      - ["java.net", "URLPermission", "implies", "(Permission)", "summary", "df-generated"]
diff --git a/java/ql/lib/ext/generated/java.nio.channels.model.yml b/java/ql/lib/ext/generated/java.nio.channels.model.yml
index 4f682461328..94098a47992 100644
--- a/java/ql/lib/ext/generated/java.nio.channels.model.yml
+++ b/java/ql/lib/ext/generated/java.nio.channels.model.yml
@@ -4,9 +4,15 @@ extensions:
       pack: codeql/java-all
       extensible: summaryModel
     data:
+      - ["java.nio.channels", "AsynchronousByteChannel", True, "read", "(ByteBuffer)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.nio.channels", "AsynchronousByteChannel", True, "read", "(ByteBuffer)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio.channels", "AsynchronousByteChannel", True, "read", "(ByteBuffer)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.nio.channels", "AsynchronousByteChannel", True, "read", "(ByteBuffer,Object,CompletionHandler)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.nio.channels", "AsynchronousByteChannel", True, "read", "(ByteBuffer,Object,CompletionHandler)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
       - ["java.nio.channels", "AsynchronousByteChannel", True, "read", "(ByteBuffer,Object,CompletionHandler)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
+      - ["java.nio.channels", "AsynchronousByteChannel", True, "write", "(ByteBuffer)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.nio.channels", "AsynchronousByteChannel", True, "write", "(ByteBuffer)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio.channels", "AsynchronousByteChannel", True, "write", "(ByteBuffer)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.nio.channels", "AsynchronousByteChannel", True, "write", "(ByteBuffer,Object,CompletionHandler)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.nio.channels", "AsynchronousByteChannel", True, "write", "(ByteBuffer,Object,CompletionHandler)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
       - ["java.nio.channels", "AsynchronousByteChannel", True, "write", "(ByteBuffer,Object,CompletionHandler)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
@@ -14,12 +20,42 @@ extensions:
       - ["java.nio.channels", "AsynchronousChannelGroup", True, "withCachedThreadPool", "(ExecutorService,int)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["java.nio.channels", "AsynchronousChannelGroup", True, "withThreadPool", "(ExecutorService)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["java.nio.channels", "AsynchronousFileChannel", True, "lock", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio.channels", "AsynchronousFileChannel", True, "lock", "(long,long,boolean)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.nio.channels", "AsynchronousFileChannel", True, "open", "(Path,Set,ExecutorService,FileAttribute[])", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
-      - ["java.nio.channels", "AsynchronousFileChannel", True, "tryLock", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio.channels", "AsynchronousFileChannel", True, "read", "(ByteBuffer,long)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio.channels", "AsynchronousFileChannel", True, "truncate", "(long)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.nio.channels", "AsynchronousFileChannel", True, "tryLock", "()", "", "Argument[this]", "ReturnValue.SyntheticField[java.nio.channels.FileLock.channel]", "value", "dfc-generated"]
+      - ["java.nio.channels", "AsynchronousFileChannel", True, "tryLock", "(long,long,boolean)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio.channels", "AsynchronousFileChannel", True, "write", "(ByteBuffer,long)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio.channels", "AsynchronousServerSocketChannel", True, "accept", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio.channels", "AsynchronousServerSocketChannel", True, "accept", "(Object,CompletionHandler)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.nio.channels", "AsynchronousServerSocketChannel", True, "accept", "(Object,CompletionHandler)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.nio.channels", "AsynchronousServerSocketChannel", True, "bind", "(SocketAddress,int)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
       - ["java.nio.channels", "AsynchronousServerSocketChannel", True, "open", "(AsynchronousChannelGroup)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["java.nio.channels", "AsynchronousServerSocketChannel", True, "provider", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio.channels", "AsynchronousSocketChannel", True, "connect", "(SocketAddress)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.nio.channels", "AsynchronousSocketChannel", True, "connect", "(SocketAddress)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio.channels", "AsynchronousSocketChannel", True, "connect", "(SocketAddress)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio.channels", "AsynchronousSocketChannel", True, "connect", "(SocketAddress,Object,CompletionHandler)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.nio.channels", "AsynchronousSocketChannel", True, "connect", "(SocketAddress,Object,CompletionHandler)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.nio.channels", "AsynchronousSocketChannel", True, "connect", "(SocketAddress,Object,CompletionHandler)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
+      - ["java.nio.channels", "AsynchronousSocketChannel", True, "getRemoteAddress", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.nio.channels", "AsynchronousSocketChannel", True, "open", "(AsynchronousChannelGroup)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["java.nio.channels", "AsynchronousSocketChannel", True, "provider", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio.channels", "AsynchronousSocketChannel", True, "read", "(ByteBuffer,long,TimeUnit,Object,CompletionHandler)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.nio.channels", "AsynchronousSocketChannel", True, "read", "(ByteBuffer,long,TimeUnit,Object,CompletionHandler)", "", "Argument[3]", "Argument[this]", "taint", "df-generated"]
+      - ["java.nio.channels", "AsynchronousSocketChannel", True, "read", "(ByteBuffer,long,TimeUnit,Object,CompletionHandler)", "", "Argument[4]", "Argument[this]", "taint", "df-generated"]
+      - ["java.nio.channels", "AsynchronousSocketChannel", True, "read", "(ByteBuffer[],int,int,long,TimeUnit,Object,CompletionHandler)", "", "Argument[0].ArrayElement", "Argument[this]", "taint", "df-generated"]
+      - ["java.nio.channels", "AsynchronousSocketChannel", True, "read", "(ByteBuffer[],int,int,long,TimeUnit,Object,CompletionHandler)", "", "Argument[5]", "Argument[this]", "taint", "df-generated"]
+      - ["java.nio.channels", "AsynchronousSocketChannel", True, "read", "(ByteBuffer[],int,int,long,TimeUnit,Object,CompletionHandler)", "", "Argument[6]", "Argument[this]", "taint", "df-generated"]
+      - ["java.nio.channels", "AsynchronousSocketChannel", True, "shutdownInput", "()", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.nio.channels", "AsynchronousSocketChannel", True, "shutdownOutput", "()", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.nio.channels", "AsynchronousSocketChannel", True, "write", "(ByteBuffer,long,TimeUnit,Object,CompletionHandler)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.nio.channels", "AsynchronousSocketChannel", True, "write", "(ByteBuffer,long,TimeUnit,Object,CompletionHandler)", "", "Argument[3]", "Argument[this]", "taint", "df-generated"]
+      - ["java.nio.channels", "AsynchronousSocketChannel", True, "write", "(ByteBuffer,long,TimeUnit,Object,CompletionHandler)", "", "Argument[4]", "Argument[this]", "taint", "df-generated"]
+      - ["java.nio.channels", "AsynchronousSocketChannel", True, "write", "(ByteBuffer[],int,int,long,TimeUnit,Object,CompletionHandler)", "", "Argument[0].ArrayElement", "Argument[this]", "taint", "df-generated"]
+      - ["java.nio.channels", "AsynchronousSocketChannel", True, "write", "(ByteBuffer[],int,int,long,TimeUnit,Object,CompletionHandler)", "", "Argument[5]", "Argument[this]", "taint", "df-generated"]
+      - ["java.nio.channels", "AsynchronousSocketChannel", True, "write", "(ByteBuffer[],int,int,long,TimeUnit,Object,CompletionHandler)", "", "Argument[6]", "Argument[this]", "taint", "df-generated"]
       - ["java.nio.channels", "Channels", False, "newChannel", "(OutputStream)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["java.nio.channels", "Channels", False, "newInputStream", "(ReadableByteChannel)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["java.nio.channels", "Channels", False, "newReader", "(ReadableByteChannel,Charset)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
@@ -30,16 +66,43 @@ extensions:
       - ["java.nio.channels", "Channels", False, "newWriter", "(WritableByteChannel,CharsetEncoder,int)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["java.nio.channels", "Channels", False, "newWriter", "(WritableByteChannel,CharsetEncoder,int)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
       - ["java.nio.channels", "Channels", False, "newWriter", "(WritableByteChannel,String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio.channels", "DatagramChannel", True, "connect", "(SocketAddress)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.nio.channels", "DatagramChannel", True, "disconnect", "()", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.nio.channels", "DatagramChannel", True, "getRemoteAddress", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.nio.channels", "DatagramChannel", True, "open", "(ProtocolFamily)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["java.nio.channels", "FileChannel", True, "lock", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio.channels", "DatagramChannel", True, "receive", "(ByteBuffer)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio.channels", "DatagramChannel", True, "send", "(ByteBuffer,SocketAddress)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.nio.channels", "DatagramChannel", True, "socket", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio.channels", "FileChannel", True, "lock", "()", "", "Argument[this]", "ReturnValue.SyntheticField[java.nio.channels.FileLock.channel]", "value", "dfc-generated"]
+      - ["java.nio.channels", "FileChannel", True, "lock", "(long,long,boolean)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.nio.channels", "FileChannel", True, "open", "(Path,OpenOption[])", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
       - ["java.nio.channels", "FileChannel", True, "open", "(Path,Set,FileAttribute[])", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["java.nio.channels", "FileChannel", True, "tryLock", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.nio.channels", "FileLock", True, "acquiredBy", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.nio.channels", "FileLock", True, "channel", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.nio.channels", "NetworkChannel", True, "bind", "(SocketAddress)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio.channels", "FileChannel", True, "tryLock", "()", "", "Argument[this]", "ReturnValue.SyntheticField[java.nio.channels.FileLock.channel]", "value", "dfc-generated"]
+      - ["java.nio.channels", "FileChannel", True, "tryLock", "(long,long,boolean)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio.channels", "FileLock", True, "acquiredBy", "()", "", "Argument[this].SyntheticField[java.nio.channels.FileLock.channel]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.nio.channels", "FileLock", True, "channel", "()", "", "Argument[this].SyntheticField[java.nio.channels.FileLock.channel]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.nio.channels", "MembershipKey", True, "block", "(InetAddress)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.nio.channels", "MembershipKey", True, "channel", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio.channels", "MembershipKey", True, "group", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio.channels", "MembershipKey", True, "networkInterface", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio.channels", "MembershipKey", True, "sourceAddress", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio.channels", "MembershipKey", True, "unblock", "(InetAddress)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.nio.channels", "MulticastChannel", True, "join", "(InetAddress,NetworkInterface)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio.channels", "MulticastChannel", True, "join", "(InetAddress,NetworkInterface)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio.channels", "MulticastChannel", True, "join", "(InetAddress,NetworkInterface)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio.channels", "MulticastChannel", True, "join", "(InetAddress,NetworkInterface,InetAddress)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio.channels", "MulticastChannel", True, "join", "(InetAddress,NetworkInterface,InetAddress)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio.channels", "MulticastChannel", True, "join", "(InetAddress,NetworkInterface,InetAddress)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio.channels", "MulticastChannel", True, "join", "(InetAddress,NetworkInterface,InetAddress)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio.channels", "NetworkChannel", True, "bind", "(SocketAddress)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.nio.channels", "NetworkChannel", True, "getLocalAddress", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio.channels", "NetworkChannel", True, "setOption", "(SocketOption,Object)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.nio.channels", "Pipe", True, "sink", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio.channels", "Pipe", True, "source", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio.channels", "SeekableByteChannel", True, "position", "(long)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.nio.channels", "SeekableByteChannel", True, "truncate", "(long)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
       - ["java.nio.channels", "SelectableChannel", True, "blockingLock", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.nio.channels", "SelectableChannel", True, "configureBlocking", "(boolean)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.nio.channels", "SelectableChannel", True, "configureBlocking", "(boolean)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
       - ["java.nio.channels", "SelectableChannel", True, "keyFor", "(Selector)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.nio.channels", "SelectableChannel", True, "provider", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.nio.channels", "SelectableChannel", True, "register", "(Selector,int)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
@@ -47,18 +110,32 @@ extensions:
       - ["java.nio.channels", "SelectableChannel", True, "register", "(Selector,int,Object)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["java.nio.channels", "SelectableChannel", True, "register", "(Selector,int,Object)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.nio.channels", "SelectionKey", True, "attachment", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio.channels", "SelectionKey", True, "channel", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio.channels", "SelectionKey", True, "interestOps", "(int)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.nio.channels", "SelectionKey", True, "selector", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio.channels", "Selector", True, "keys", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.nio.channels", "Selector", True, "provider", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.nio.channels", "Selector", True, "select", "(Consumer)", "", "Argument[this]", "Argument[0]", "taint", "df-generated"]
+      - ["java.nio.channels", "Selector", True, "select", "(Consumer,long)", "", "Argument[this]", "Argument[0]", "taint", "df-generated"]
+      - ["java.nio.channels", "Selector", True, "selectNow", "(Consumer)", "", "Argument[this]", "Argument[0]", "taint", "df-generated"]
+      - ["java.nio.channels", "Selector", True, "selectedKeys", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio.channels", "Selector", True, "wakeup", "()", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.nio.channels", "ServerSocketChannel", True, "accept", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio.channels", "ServerSocketChannel", True, "bind", "(SocketAddress,int)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
       - ["java.nio.channels", "ServerSocketChannel", True, "open", "(ProtocolFamily)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio.channels", "ServerSocketChannel", True, "socket", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio.channels", "SocketChannel", True, "connect", "(SocketAddress)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.nio.channels", "SocketChannel", True, "getRemoteAddress", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.nio.channels", "SocketChannel", True, "open", "(ProtocolFamily)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["java.nio.channels", "SocketChannel", True, "open", "(SocketAddress)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio.channels", "SocketChannel", True, "shutdownInput", "()", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.nio.channels", "SocketChannel", True, "shutdownOutput", "()", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.nio.channels", "SocketChannel", True, "socket", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.nio.channels", "WritableByteChannel", True, "write", "(ByteBuffer)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
   - addsTo:
       pack: codeql/java-all
       extensible: neutralModel
     data:
-      - ["java.nio.channels", "AsynchronousByteChannel", "read", "(ByteBuffer)", "summary", "df-generated"]
-      - ["java.nio.channels", "AsynchronousByteChannel", "write", "(ByteBuffer)", "summary", "df-generated"]
       - ["java.nio.channels", "AsynchronousChannelGroup", "awaitTermination", "(long,TimeUnit)", "summary", "df-generated"]
       - ["java.nio.channels", "AsynchronousChannelGroup", "isShutdown", "()", "summary", "df-generated"]
       - ["java.nio.channels", "AsynchronousChannelGroup", "isTerminated", "()", "summary", "df-generated"]
@@ -67,85 +144,53 @@ extensions:
       - ["java.nio.channels", "AsynchronousChannelGroup", "withFixedThreadPool", "(int,ThreadFactory)", "summary", "df-generated"]
       - ["java.nio.channels", "AsynchronousFileChannel", "force", "(boolean)", "summary", "df-generated"]
       - ["java.nio.channels", "AsynchronousFileChannel", "lock", "(Object,CompletionHandler)", "summary", "df-generated"]
-      - ["java.nio.channels", "AsynchronousFileChannel", "lock", "(long,long,boolean)", "summary", "df-generated"]
       - ["java.nio.channels", "AsynchronousFileChannel", "lock", "(long,long,boolean,Object,CompletionHandler)", "summary", "df-generated"]
       - ["java.nio.channels", "AsynchronousFileChannel", "open", "(Path,OpenOption[])", "summary", "df-generated"]
-      - ["java.nio.channels", "AsynchronousFileChannel", "read", "(ByteBuffer,long)", "summary", "df-generated"]
       - ["java.nio.channels", "AsynchronousFileChannel", "read", "(ByteBuffer,long,Object,CompletionHandler)", "summary", "df-generated"]
       - ["java.nio.channels", "AsynchronousFileChannel", "size", "()", "summary", "df-generated"]
-      - ["java.nio.channels", "AsynchronousFileChannel", "truncate", "(long)", "summary", "df-generated"]
-      - ["java.nio.channels", "AsynchronousFileChannel", "tryLock", "(long,long,boolean)", "summary", "df-generated"]
-      - ["java.nio.channels", "AsynchronousFileChannel", "write", "(ByteBuffer,long)", "summary", "df-generated"]
       - ["java.nio.channels", "AsynchronousFileChannel", "write", "(ByteBuffer,long,Object,CompletionHandler)", "summary", "df-generated"]
-      - ["java.nio.channels", "AsynchronousServerSocketChannel", "accept", "()", "summary", "df-generated"]
-      - ["java.nio.channels", "AsynchronousServerSocketChannel", "accept", "(Object,CompletionHandler)", "summary", "df-generated"]
-      - ["java.nio.channels", "AsynchronousServerSocketChannel", "bind", "(SocketAddress,int)", "summary", "df-generated"]
       - ["java.nio.channels", "AsynchronousServerSocketChannel", "open", "()", "summary", "df-generated"]
-      - ["java.nio.channels", "AsynchronousSocketChannel", "connect", "(SocketAddress)", "summary", "df-generated"]
-      - ["java.nio.channels", "AsynchronousSocketChannel", "connect", "(SocketAddress,Object,CompletionHandler)", "summary", "df-generated"]
-      - ["java.nio.channels", "AsynchronousSocketChannel", "getRemoteAddress", "()", "summary", "df-generated"]
       - ["java.nio.channels", "AsynchronousSocketChannel", "open", "()", "summary", "df-generated"]
-      - ["java.nio.channels", "AsynchronousSocketChannel", "read", "(ByteBuffer,long,TimeUnit,Object,CompletionHandler)", "summary", "df-generated"]
-      - ["java.nio.channels", "AsynchronousSocketChannel", "read", "(ByteBuffer[],int,int,long,TimeUnit,Object,CompletionHandler)", "summary", "df-generated"]
-      - ["java.nio.channels", "AsynchronousSocketChannel", "shutdownInput", "()", "summary", "df-generated"]
-      - ["java.nio.channels", "AsynchronousSocketChannel", "shutdownOutput", "()", "summary", "df-generated"]
-      - ["java.nio.channels", "AsynchronousSocketChannel", "write", "(ByteBuffer,long,TimeUnit,Object,CompletionHandler)", "summary", "df-generated"]
-      - ["java.nio.channels", "AsynchronousSocketChannel", "write", "(ByteBuffer[],int,int,long,TimeUnit,Object,CompletionHandler)", "summary", "df-generated"]
-      - ["java.nio.channels", "Channel", "isOpen", "()", "summary", "df-generated"]
       - ["java.nio.channels", "Channels", "newInputStream", "(AsynchronousByteChannel)", "summary", "df-generated"]
       - ["java.nio.channels", "Channels", "newOutputStream", "(AsynchronousByteChannel)", "summary", "df-generated"]
       - ["java.nio.channels", "Channels", "newOutputStream", "(WritableByteChannel)", "summary", "df-generated"]
-      - ["java.nio.channels", "DatagramChannel", "connect", "(SocketAddress)", "summary", "df-generated"]
-      - ["java.nio.channels", "DatagramChannel", "disconnect", "()", "summary", "df-generated"]
-      - ["java.nio.channels", "DatagramChannel", "getRemoteAddress", "()", "summary", "df-generated"]
       - ["java.nio.channels", "DatagramChannel", "isConnected", "()", "summary", "df-generated"]
       - ["java.nio.channels", "DatagramChannel", "open", "()", "summary", "df-generated"]
-      - ["java.nio.channels", "DatagramChannel", "receive", "(ByteBuffer)", "summary", "df-generated"]
-      - ["java.nio.channels", "DatagramChannel", "send", "(ByteBuffer,SocketAddress)", "summary", "df-generated"]
-      - ["java.nio.channels", "DatagramChannel", "socket", "()", "summary", "df-generated"]
+      - ["java.nio.channels", "DatagramChannel", "read", "(ByteBuffer[])", "summary", "df-generated"]
+      - ["java.nio.channels", "DatagramChannel", "read", "(ByteBuffer[],int,int)", "summary", "df-generated"]
+      - ["java.nio.channels", "DatagramChannel", "validOps", "()", "summary", "df-generated"]
+      - ["java.nio.channels", "DatagramChannel", "write", "(ByteBuffer[])", "summary", "df-generated"]
+      - ["java.nio.channels", "DatagramChannel", "write", "(ByteBuffer[],int,int)", "summary", "df-generated"]
       - ["java.nio.channels", "FileChannel", "force", "(boolean)", "summary", "df-generated"]
-      - ["java.nio.channels", "FileChannel", "lock", "(long,long,boolean)", "summary", "df-generated"]
       - ["java.nio.channels", "FileChannel", "map", "(FileChannel$MapMode,long,long)", "summary", "df-generated"]
+      - ["java.nio.channels", "FileChannel", "position", "()", "summary", "df-generated"]
       - ["java.nio.channels", "FileChannel", "read", "(ByteBuffer,long)", "summary", "df-generated"]
+      - ["java.nio.channels", "FileChannel", "read", "(ByteBuffer[])", "summary", "df-generated"]
+      - ["java.nio.channels", "FileChannel", "read", "(ByteBuffer[],int,int)", "summary", "df-generated"]
+      - ["java.nio.channels", "FileChannel", "size", "()", "summary", "df-generated"]
       - ["java.nio.channels", "FileChannel", "transferFrom", "(ReadableByteChannel,long,long)", "summary", "df-generated"]
       - ["java.nio.channels", "FileChannel", "transferTo", "(long,long,WritableByteChannel)", "summary", "df-generated"]
-      - ["java.nio.channels", "FileChannel", "tryLock", "(long,long,boolean)", "summary", "df-generated"]
       - ["java.nio.channels", "FileChannel", "write", "(ByteBuffer,long)", "summary", "df-generated"]
+      - ["java.nio.channels", "FileChannel", "write", "(ByteBuffer[])", "summary", "df-generated"]
+      - ["java.nio.channels", "FileChannel", "write", "(ByteBuffer[],int,int)", "summary", "df-generated"]
+      - ["java.nio.channels", "FileLock", "close", "()", "summary", "df-generated"]
       - ["java.nio.channels", "FileLock", "isShared", "()", "summary", "df-generated"]
       - ["java.nio.channels", "FileLock", "isValid", "()", "summary", "df-generated"]
       - ["java.nio.channels", "FileLock", "overlaps", "(long,long)", "summary", "df-generated"]
       - ["java.nio.channels", "FileLock", "position", "()", "summary", "df-generated"]
       - ["java.nio.channels", "FileLock", "release", "()", "summary", "df-generated"]
       - ["java.nio.channels", "FileLock", "size", "()", "summary", "df-generated"]
-      - ["java.nio.channels", "GatheringByteChannel", "write", "(ByteBuffer[])", "summary", "df-generated"]
-      - ["java.nio.channels", "GatheringByteChannel", "write", "(ByteBuffer[],int,int)", "summary", "df-generated"]
-      - ["java.nio.channels", "MembershipKey", "block", "(InetAddress)", "summary", "df-generated"]
-      - ["java.nio.channels", "MembershipKey", "channel", "()", "summary", "df-generated"]
       - ["java.nio.channels", "MembershipKey", "drop", "()", "summary", "df-generated"]
-      - ["java.nio.channels", "MembershipKey", "group", "()", "summary", "df-generated"]
       - ["java.nio.channels", "MembershipKey", "isValid", "()", "summary", "df-generated"]
-      - ["java.nio.channels", "MembershipKey", "networkInterface", "()", "summary", "df-generated"]
-      - ["java.nio.channels", "MembershipKey", "sourceAddress", "()", "summary", "df-generated"]
-      - ["java.nio.channels", "MembershipKey", "unblock", "(InetAddress)", "summary", "df-generated"]
-      - ["java.nio.channels", "NetworkChannel", "getLocalAddress", "()", "summary", "df-generated"]
-      - ["java.nio.channels", "NetworkChannel", "setOption", "(SocketOption,Object)", "summary", "df-generated"]
+      - ["java.nio.channels", "Pipe$SinkChannel", "validOps", "()", "summary", "df-generated"]
+      - ["java.nio.channels", "Pipe$SourceChannel", "validOps", "()", "summary", "df-generated"]
       - ["java.nio.channels", "Pipe", "open", "()", "summary", "df-generated"]
-      - ["java.nio.channels", "Pipe", "sink", "()", "summary", "df-generated"]
-      - ["java.nio.channels", "Pipe", "source", "()", "summary", "df-generated"]
-      - ["java.nio.channels", "ScatteringByteChannel", "read", "(ByteBuffer[])", "summary", "df-generated"]
-      - ["java.nio.channels", "ScatteringByteChannel", "read", "(ByteBuffer[],int,int)", "summary", "df-generated"]
-      - ["java.nio.channels", "SeekableByteChannel", "position", "()", "summary", "df-generated"]
-      - ["java.nio.channels", "SeekableByteChannel", "position", "(long)", "summary", "df-generated"]
-      - ["java.nio.channels", "SeekableByteChannel", "size", "()", "summary", "df-generated"]
-      - ["java.nio.channels", "SeekableByteChannel", "truncate", "(long)", "summary", "df-generated"]
       - ["java.nio.channels", "SelectableChannel", "isBlocking", "()", "summary", "df-generated"]
       - ["java.nio.channels", "SelectableChannel", "isRegistered", "()", "summary", "df-generated"]
       - ["java.nio.channels", "SelectableChannel", "validOps", "()", "summary", "df-generated"]
       - ["java.nio.channels", "SelectionKey", "attach", "(Object)", "summary", "df-generated"]
       - ["java.nio.channels", "SelectionKey", "cancel", "()", "summary", "df-generated"]
-      - ["java.nio.channels", "SelectionKey", "channel", "()", "summary", "df-generated"]
       - ["java.nio.channels", "SelectionKey", "interestOps", "()", "summary", "df-generated"]
-      - ["java.nio.channels", "SelectionKey", "interestOps", "(int)", "summary", "df-generated"]
       - ["java.nio.channels", "SelectionKey", "interestOpsAnd", "(int)", "summary", "df-generated"]
       - ["java.nio.channels", "SelectionKey", "interestOpsOr", "(int)", "summary", "df-generated"]
       - ["java.nio.channels", "SelectionKey", "isAcceptable", "()", "summary", "df-generated"]
@@ -154,27 +199,19 @@ extensions:
       - ["java.nio.channels", "SelectionKey", "isValid", "()", "summary", "df-generated"]
       - ["java.nio.channels", "SelectionKey", "isWritable", "()", "summary", "df-generated"]
       - ["java.nio.channels", "SelectionKey", "readyOps", "()", "summary", "df-generated"]
-      - ["java.nio.channels", "SelectionKey", "selector", "()", "summary", "df-generated"]
       - ["java.nio.channels", "Selector", "isOpen", "()", "summary", "df-generated"]
-      - ["java.nio.channels", "Selector", "keys", "()", "summary", "df-generated"]
       - ["java.nio.channels", "Selector", "open", "()", "summary", "df-generated"]
       - ["java.nio.channels", "Selector", "select", "()", "summary", "df-generated"]
-      - ["java.nio.channels", "Selector", "select", "(Consumer,long)", "summary", "df-generated"]
       - ["java.nio.channels", "Selector", "select", "(long)", "summary", "df-generated"]
       - ["java.nio.channels", "Selector", "selectNow", "()", "summary", "df-generated"]
-      - ["java.nio.channels", "Selector", "selectNow", "(Consumer)", "summary", "df-generated"]
-      - ["java.nio.channels", "Selector", "selectedKeys", "()", "summary", "df-generated"]
-      - ["java.nio.channels", "Selector", "wakeup", "()", "summary", "df-generated"]
-      - ["java.nio.channels", "ServerSocketChannel", "accept", "()", "summary", "df-generated"]
-      - ["java.nio.channels", "ServerSocketChannel", "bind", "(SocketAddress,int)", "summary", "df-generated"]
       - ["java.nio.channels", "ServerSocketChannel", "open", "()", "summary", "df-generated"]
-      - ["java.nio.channels", "ServerSocketChannel", "socket", "()", "summary", "df-generated"]
-      - ["java.nio.channels", "SocketChannel", "connect", "(SocketAddress)", "summary", "df-generated"]
+      - ["java.nio.channels", "ServerSocketChannel", "validOps", "()", "summary", "df-generated"]
       - ["java.nio.channels", "SocketChannel", "finishConnect", "()", "summary", "df-generated"]
-      - ["java.nio.channels", "SocketChannel", "getRemoteAddress", "()", "summary", "df-generated"]
       - ["java.nio.channels", "SocketChannel", "isConnected", "()", "summary", "df-generated"]
       - ["java.nio.channels", "SocketChannel", "isConnectionPending", "()", "summary", "df-generated"]
       - ["java.nio.channels", "SocketChannel", "open", "()", "summary", "df-generated"]
-      - ["java.nio.channels", "SocketChannel", "shutdownInput", "()", "summary", "df-generated"]
-      - ["java.nio.channels", "SocketChannel", "shutdownOutput", "()", "summary", "df-generated"]
-      - ["java.nio.channels", "SocketChannel", "socket", "()", "summary", "df-generated"]
+      - ["java.nio.channels", "SocketChannel", "read", "(ByteBuffer[])", "summary", "df-generated"]
+      - ["java.nio.channels", "SocketChannel", "read", "(ByteBuffer[],int,int)", "summary", "df-generated"]
+      - ["java.nio.channels", "SocketChannel", "validOps", "()", "summary", "df-generated"]
+      - ["java.nio.channels", "SocketChannel", "write", "(ByteBuffer[])", "summary", "df-generated"]
+      - ["java.nio.channels", "SocketChannel", "write", "(ByteBuffer[],int,int)", "summary", "df-generated"]
diff --git a/java/ql/lib/ext/generated/java.nio.channels.spi.model.yml b/java/ql/lib/ext/generated/java.nio.channels.spi.model.yml
index bb85f0a62ed..956e1e2a6b8 100644
--- a/java/ql/lib/ext/generated/java.nio.channels.spi.model.yml
+++ b/java/ql/lib/ext/generated/java.nio.channels.spi.model.yml
@@ -1,21 +1,35 @@
 # THIS FILE IS AN AUTO-GENERATED MODELS AS DATA FILE. DO NOT EDIT.
 extensions:
+  - addsTo:
+      pack: codeql/java-all
+      extensible: summaryModel
+    data:
+      - ["java.nio.channels.spi", "AsynchronousChannelProvider", True, "openAsynchronousChannelGroup", "(ExecutorService,int)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio.channels.spi", "AsynchronousChannelProvider", True, "openAsynchronousChannelGroup", "(ExecutorService,int)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio.channels.spi", "AsynchronousChannelProvider", True, "openAsynchronousChannelGroup", "(int,ThreadFactory)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio.channels.spi", "AsynchronousChannelProvider", True, "openAsynchronousServerSocketChannel", "(AsynchronousChannelGroup)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio.channels.spi", "AsynchronousChannelProvider", True, "openAsynchronousSocketChannel", "(AsynchronousChannelGroup)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio.channels.spi", "SelectorProvider", True, "openDatagramChannel", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio.channels.spi", "SelectorProvider", True, "openDatagramChannel", "(ProtocolFamily)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio.channels.spi", "SelectorProvider", True, "openDatagramChannel", "(ProtocolFamily)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio.channels.spi", "SelectorProvider", True, "openPipe", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio.channels.spi", "SelectorProvider", True, "openSelector", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio.channels.spi", "SelectorProvider", True, "openServerSocketChannel", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio.channels.spi", "SelectorProvider", True, "openServerSocketChannel", "(ProtocolFamily)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio.channels.spi", "SelectorProvider", True, "openServerSocketChannel", "(ProtocolFamily)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio.channels.spi", "SelectorProvider", True, "openSocketChannel", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio.channels.spi", "SelectorProvider", True, "openSocketChannel", "(ProtocolFamily)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio.channels.spi", "SelectorProvider", True, "openSocketChannel", "(ProtocolFamily)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
   - addsTo:
       pack: codeql/java-all
       extensible: neutralModel
     data:
-      - ["java.nio.channels.spi", "AsynchronousChannelProvider", "openAsynchronousChannelGroup", "(ExecutorService,int)", "summary", "df-generated"]
-      - ["java.nio.channels.spi", "AsynchronousChannelProvider", "openAsynchronousChannelGroup", "(int,ThreadFactory)", "summary", "df-generated"]
-      - ["java.nio.channels.spi", "AsynchronousChannelProvider", "openAsynchronousServerSocketChannel", "(AsynchronousChannelGroup)", "summary", "df-generated"]
-      - ["java.nio.channels.spi", "AsynchronousChannelProvider", "openAsynchronousSocketChannel", "(AsynchronousChannelGroup)", "summary", "df-generated"]
+      - ["java.nio.channels.spi", "AbstractInterruptibleChannel", "isOpen", "()", "summary", "df-generated"]
+      - ["java.nio.channels.spi", "AbstractSelectableChannel", "isBlocking", "()", "summary", "df-generated"]
+      - ["java.nio.channels.spi", "AbstractSelectableChannel", "isRegistered", "()", "summary", "df-generated"]
+      - ["java.nio.channels.spi", "AbstractSelectionKey", "cancel", "()", "summary", "df-generated"]
+      - ["java.nio.channels.spi", "AbstractSelectionKey", "isValid", "()", "summary", "df-generated"]
+      - ["java.nio.channels.spi", "AbstractSelector", "isOpen", "()", "summary", "df-generated"]
       - ["java.nio.channels.spi", "AsynchronousChannelProvider", "provider", "()", "summary", "df-generated"]
       - ["java.nio.channels.spi", "SelectorProvider", "inheritedChannel", "()", "summary", "df-generated"]
-      - ["java.nio.channels.spi", "SelectorProvider", "openDatagramChannel", "()", "summary", "df-generated"]
-      - ["java.nio.channels.spi", "SelectorProvider", "openDatagramChannel", "(ProtocolFamily)", "summary", "df-generated"]
-      - ["java.nio.channels.spi", "SelectorProvider", "openPipe", "()", "summary", "df-generated"]
-      - ["java.nio.channels.spi", "SelectorProvider", "openSelector", "()", "summary", "df-generated"]
-      - ["java.nio.channels.spi", "SelectorProvider", "openServerSocketChannel", "()", "summary", "df-generated"]
-      - ["java.nio.channels.spi", "SelectorProvider", "openServerSocketChannel", "(ProtocolFamily)", "summary", "df-generated"]
-      - ["java.nio.channels.spi", "SelectorProvider", "openSocketChannel", "()", "summary", "df-generated"]
-      - ["java.nio.channels.spi", "SelectorProvider", "openSocketChannel", "(ProtocolFamily)", "summary", "df-generated"]
       - ["java.nio.channels.spi", "SelectorProvider", "provider", "()", "summary", "df-generated"]
diff --git a/java/ql/lib/ext/generated/java.nio.charset.model.yml b/java/ql/lib/ext/generated/java.nio.charset.model.yml
index 488fc3ddecf..e1c8d89ae54 100644
--- a/java/ql/lib/ext/generated/java.nio.charset.model.yml
+++ b/java/ql/lib/ext/generated/java.nio.charset.model.yml
@@ -4,36 +4,41 @@ extensions:
       pack: codeql/java-all
       extensible: summaryModel
     data:
-      - ["java.nio.charset", "CharsetDecoder", True, "decode", "(ByteBuffer)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.nio.charset", "CharsetDecoder", True, "decode", "(ByteBuffer,CharBuffer,boolean)", "", "Argument[this]", "Argument[1]", "taint", "df-generated"]
-      - ["java.nio.charset", "CharsetDecoder", True, "malformedInputAction", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.nio.charset", "CharsetDecoder", True, "onMalformedInput", "(CodingErrorAction)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.nio.charset", "CharsetDecoder", True, "onMalformedInput", "(CodingErrorAction)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["java.nio.charset", "CharsetDecoder", True, "onUnmappableCharacter", "(CodingErrorAction)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.nio.charset", "CharsetDecoder", True, "onUnmappableCharacter", "(CodingErrorAction)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["java.nio.charset", "CharsetDecoder", True, "replaceWith", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.nio.charset", "CharsetDecoder", True, "replaceWith", "(String)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["java.nio.charset", "CharsetDecoder", True, "replacement", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.nio.charset", "CharsetDecoder", True, "reset", "()", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["java.nio.charset", "CharsetDecoder", True, "unmappableCharacterAction", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio.charset", "CharsetDecoder", True, "decode", "(ByteBuffer)", "", "Argument[this].SyntheticField[java.nio.charset.CharsetDecoder.replacement]", "ReturnValue.SyntheticField[java.nio.CharBuffer.hb]", "taint", "dfc-generated"]
+      - ["java.nio.charset", "CharsetDecoder", True, "decode", "(ByteBuffer,CharBuffer,boolean)", "", "Argument[this].SyntheticField[java.nio.charset.CharsetDecoder.replacement]", "Argument[1].SyntheticField[java.nio.CharBuffer.hb]", "taint", "dfc-generated"]
+      - ["java.nio.charset", "CharsetDecoder", True, "malformedInputAction", "()", "", "Argument[this].SyntheticField[java.nio.charset.CharsetDecoder.malformedInputAction]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.nio.charset", "CharsetDecoder", True, "onMalformedInput", "(CodingErrorAction)", "", "Argument[0]", "Argument[this].SyntheticField[java.nio.charset.CharsetDecoder.malformedInputAction]", "value", "dfc-generated"]
+      - ["java.nio.charset", "CharsetDecoder", True, "onMalformedInput", "(CodingErrorAction)", "", "Argument[0]", "ReturnValue.SyntheticField[java.nio.charset.CharsetDecoder.malformedInputAction]", "value", "dfc-generated"]
+      - ["java.nio.charset", "CharsetDecoder", True, "onMalformedInput", "(CodingErrorAction)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.nio.charset", "CharsetDecoder", True, "onUnmappableCharacter", "(CodingErrorAction)", "", "Argument[0]", "Argument[this].SyntheticField[java.nio.charset.CharsetDecoder.unmappableCharacterAction]", "value", "dfc-generated"]
+      - ["java.nio.charset", "CharsetDecoder", True, "onUnmappableCharacter", "(CodingErrorAction)", "", "Argument[0]", "ReturnValue.SyntheticField[java.nio.charset.CharsetDecoder.unmappableCharacterAction]", "value", "dfc-generated"]
+      - ["java.nio.charset", "CharsetDecoder", True, "onUnmappableCharacter", "(CodingErrorAction)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.nio.charset", "CharsetDecoder", True, "replaceWith", "(String)", "", "Argument[0]", "Argument[this].SyntheticField[java.nio.charset.CharsetDecoder.replacement]", "value", "dfc-generated"]
+      - ["java.nio.charset", "CharsetDecoder", True, "replaceWith", "(String)", "", "Argument[0]", "ReturnValue.SyntheticField[java.nio.charset.CharsetDecoder.replacement]", "value", "dfc-generated"]
+      - ["java.nio.charset", "CharsetDecoder", True, "replaceWith", "(String)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.nio.charset", "CharsetDecoder", True, "replacement", "()", "", "Argument[this].SyntheticField[java.nio.charset.CharsetDecoder.replacement]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.nio.charset", "CharsetDecoder", True, "reset", "()", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.nio.charset", "CharsetDecoder", True, "unmappableCharacterAction", "()", "", "Argument[this].SyntheticField[java.nio.charset.CharsetDecoder.unmappableCharacterAction]", "ReturnValue", "value", "dfc-generated"]
       - ["java.nio.charset", "CharsetEncoder", True, "encode", "(CharBuffer)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.nio.charset", "CharsetEncoder", True, "encode", "(CharBuffer,ByteBuffer,boolean)", "", "Argument[this]", "Argument[1]", "taint", "df-generated"]
       - ["java.nio.charset", "CharsetEncoder", True, "encode", "(CharBuffer,ByteBuffer,boolean)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.nio.charset", "CharsetEncoder", True, "malformedInputAction", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.nio.charset", "CharsetEncoder", True, "onMalformedInput", "(CodingErrorAction)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.nio.charset", "CharsetEncoder", True, "onMalformedInput", "(CodingErrorAction)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["java.nio.charset", "CharsetEncoder", True, "onUnmappableCharacter", "(CodingErrorAction)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.nio.charset", "CharsetEncoder", True, "onUnmappableCharacter", "(CodingErrorAction)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.nio.charset", "CharsetEncoder", True, "malformedInputAction", "()", "", "Argument[this].SyntheticField[java.nio.charset.CharsetEncoder.malformedInputAction]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.nio.charset", "CharsetEncoder", True, "onMalformedInput", "(CodingErrorAction)", "", "Argument[0]", "Argument[this].SyntheticField[java.nio.charset.CharsetEncoder.malformedInputAction]", "value", "dfc-generated"]
+      - ["java.nio.charset", "CharsetEncoder", True, "onMalformedInput", "(CodingErrorAction)", "", "Argument[0]", "ReturnValue.SyntheticField[java.nio.charset.CharsetEncoder.malformedInputAction]", "value", "dfc-generated"]
+      - ["java.nio.charset", "CharsetEncoder", True, "onMalformedInput", "(CodingErrorAction)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.nio.charset", "CharsetEncoder", True, "onUnmappableCharacter", "(CodingErrorAction)", "", "Argument[0]", "Argument[this].SyntheticField[java.nio.charset.CharsetEncoder.unmappableCharacterAction]", "value", "dfc-generated"]
+      - ["java.nio.charset", "CharsetEncoder", True, "onUnmappableCharacter", "(CodingErrorAction)", "", "Argument[0]", "ReturnValue.SyntheticField[java.nio.charset.CharsetEncoder.unmappableCharacterAction]", "value", "dfc-generated"]
+      - ["java.nio.charset", "CharsetEncoder", True, "onUnmappableCharacter", "(CodingErrorAction)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
       - ["java.nio.charset", "CharsetEncoder", True, "replaceWith", "(byte[])", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.nio.charset", "CharsetEncoder", True, "replaceWith", "(byte[])", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
       - ["java.nio.charset", "CharsetEncoder", True, "replacement", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.nio.charset", "CharsetEncoder", True, "reset", "()", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["java.nio.charset", "CharsetEncoder", True, "unmappableCharacterAction", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio.charset", "CharsetEncoder", True, "reset", "()", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.nio.charset", "CharsetEncoder", True, "unmappableCharacterAction", "()", "", "Argument[this].SyntheticField[java.nio.charset.CharsetEncoder.unmappableCharacterAction]", "ReturnValue", "value", "dfc-generated"]
       - ["java.nio.charset", "CoderMalfunctionError", True, "CoderMalfunctionError", "(Exception)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.nio.charset", "IllegalCharsetNameException", True, "IllegalCharsetNameException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.nio.charset", "IllegalCharsetNameException", True, "getCharsetName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.nio.charset", "UnsupportedCharsetException", True, "UnsupportedCharsetException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.nio.charset", "UnsupportedCharsetException", True, "getCharsetName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio.charset", "IllegalCharsetNameException", True, "IllegalCharsetNameException", "(String)", "", "Argument[0]", "Argument[this].SyntheticField[java.nio.charset.IllegalCharsetNameException.charsetName]", "value", "dfc-generated"]
+      - ["java.nio.charset", "IllegalCharsetNameException", True, "getCharsetName", "()", "", "Argument[this].SyntheticField[java.nio.charset.IllegalCharsetNameException.charsetName]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.nio.charset", "UnsupportedCharsetException", True, "UnsupportedCharsetException", "(String)", "", "Argument[0]", "Argument[this].SyntheticField[java.nio.charset.UnsupportedCharsetException.charsetName]", "value", "dfc-generated"]
+      - ["java.nio.charset", "UnsupportedCharsetException", True, "getCharsetName", "()", "", "Argument[this].SyntheticField[java.nio.charset.UnsupportedCharsetException.charsetName]", "ReturnValue", "value", "dfc-generated"]
   - addsTo:
       pack: codeql/java-all
       extensible: neutralModel
diff --git a/java/ql/lib/ext/generated/java.nio.charset.spi.model.yml b/java/ql/lib/ext/generated/java.nio.charset.spi.model.yml
index 131afc20afe..72a51a3a908 100644
--- a/java/ql/lib/ext/generated/java.nio.charset.spi.model.yml
+++ b/java/ql/lib/ext/generated/java.nio.charset.spi.model.yml
@@ -2,7 +2,7 @@
 extensions:
   - addsTo:
       pack: codeql/java-all
-      extensible: neutralModel
+      extensible: summaryModel
     data:
-      - ["java.nio.charset.spi", "CharsetProvider", "charsetForName", "(String)", "summary", "df-generated"]
-      - ["java.nio.charset.spi", "CharsetProvider", "charsets", "()", "summary", "df-generated"]
+      - ["java.nio.charset.spi", "CharsetProvider", True, "charsetForName", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.nio.charset.spi", "CharsetProvider", True, "charsets", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
diff --git a/java/ql/lib/ext/generated/java.nio.file.attribute.model.yml b/java/ql/lib/ext/generated/java.nio.file.attribute.model.yml
index 2f0a7c2c02c..140c8aa6c1c 100644
--- a/java/ql/lib/ext/generated/java.nio.file.attribute.model.yml
+++ b/java/ql/lib/ext/generated/java.nio.file.attribute.model.yml
@@ -4,24 +4,29 @@ extensions:
       pack: codeql/java-all
       extensible: summaryModel
     data:
-      - ["java.nio.file.attribute", "AclEntry$Builder", False, "build", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.nio.file.attribute", "AclEntry$Builder", False, "setFlags", "(AclEntryFlag[])", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["java.nio.file.attribute", "AclEntry$Builder", False, "setFlags", "(Set)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["java.nio.file.attribute", "AclEntry$Builder", False, "setFlags", "(Set)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["java.nio.file.attribute", "AclEntry$Builder", False, "setPermissions", "(AclEntryPermission[])", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["java.nio.file.attribute", "AclEntry$Builder", False, "setPermissions", "(Set)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["java.nio.file.attribute", "AclEntry$Builder", False, "setPermissions", "(Set)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["java.nio.file.attribute", "AclEntry$Builder", False, "setPrincipal", "(UserPrincipal)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.nio.file.attribute", "AclEntry$Builder", False, "setPrincipal", "(UserPrincipal)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["java.nio.file.attribute", "AclEntry$Builder", False, "setType", "(AclEntryType)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.nio.file.attribute", "AclEntry$Builder", False, "build", "()", "", "Argument[this].SyntheticField[java.nio.file.attribute.AclEntry$Builder.who]", "ReturnValue.SyntheticField[java.nio.file.attribute.AclEntry.who]", "value", "dfc-generated"]
+      - ["java.nio.file.attribute", "AclEntry$Builder", False, "setFlags", "(AclEntryFlag[])", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.nio.file.attribute", "AclEntry$Builder", False, "setFlags", "(Set)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.nio.file.attribute", "AclEntry$Builder", False, "setPermissions", "(AclEntryPermission[])", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.nio.file.attribute", "AclEntry$Builder", False, "setPermissions", "(Set)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.nio.file.attribute", "AclEntry$Builder", False, "setPrincipal", "(UserPrincipal)", "", "Argument[0]", "Argument[this].SyntheticField[java.nio.file.attribute.AclEntry$Builder.who]", "value", "dfc-generated"]
+      - ["java.nio.file.attribute", "AclEntry$Builder", False, "setPrincipal", "(UserPrincipal)", "", "Argument[0]", "ReturnValue.SyntheticField[java.nio.file.attribute.AclEntry$Builder.who]", "value", "dfc-generated"]
+      - ["java.nio.file.attribute", "AclEntry$Builder", False, "setPrincipal", "(UserPrincipal)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.nio.file.attribute", "AclEntry$Builder", False, "setType", "(AclEntryType)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
       - ["java.nio.file.attribute", "AclEntry", False, "flags", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.nio.file.attribute", "AclEntry", False, "newBuilder", "(AclEntry)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio.file.attribute", "AclEntry", False, "newBuilder", "(AclEntry)", "", "Argument[0].SyntheticField[java.nio.file.attribute.AclEntry.who]", "ReturnValue.SyntheticField[java.nio.file.attribute.AclEntry$Builder.who]", "value", "dfc-generated"]
       - ["java.nio.file.attribute", "AclEntry", False, "permissions", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.nio.file.attribute", "AclEntry", False, "principal", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.nio.file.attribute", "FileTime", False, "from", "(Instant)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["java.nio.file.attribute", "FileTime", False, "toInstant", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.nio.file.attribute", "UserPrincipalNotFoundException", True, "UserPrincipalNotFoundException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.nio.file.attribute", "UserPrincipalNotFoundException", True, "getName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio.file.attribute", "AclEntry", False, "principal", "()", "", "Argument[this].SyntheticField[java.nio.file.attribute.AclEntry.who]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.nio.file.attribute", "BasicFileAttributeView", True, "readAttributes", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio.file.attribute", "BasicFileAttributes", True, "fileKey", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio.file.attribute", "FileTime", False, "from", "(Instant)", "", "Argument[0]", "ReturnValue.SyntheticField[java.nio.file.attribute.FileTime.instant]", "value", "dfc-generated"]
+      - ["java.nio.file.attribute", "FileTime", False, "toInstant", "()", "", "Argument[this].SyntheticField[java.nio.file.attribute.FileTime.instant]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.nio.file.attribute", "PosixFileAttributes", True, "group", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio.file.attribute", "PosixFileAttributes", True, "owner", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio.file.attribute", "UserPrincipalLookupService", True, "lookupPrincipalByGroupName", "(String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio.file.attribute", "UserPrincipalLookupService", True, "lookupPrincipalByName", "(String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio.file.attribute", "UserPrincipalNotFoundException", True, "UserPrincipalNotFoundException", "(String)", "", "Argument[0]", "Argument[this].SyntheticField[java.nio.file.attribute.UserPrincipalNotFoundException.name]", "value", "dfc-generated"]
+      - ["java.nio.file.attribute", "UserPrincipalNotFoundException", True, "getName", "()", "", "Argument[this].SyntheticField[java.nio.file.attribute.UserPrincipalNotFoundException.name]", "ReturnValue", "value", "dfc-generated"]
   - addsTo:
       pack: codeql/java-all
       extensible: neutralModel
@@ -34,5 +39,4 @@ extensions:
       - ["java.nio.file.attribute", "FileTime", "toMillis", "()", "summary", "df-generated"]
       - ["java.nio.file.attribute", "PosixFilePermissions", "asFileAttribute", "(Set)", "summary", "df-generated"]
       - ["java.nio.file.attribute", "PosixFilePermissions", "fromString", "(String)", "summary", "df-generated"]
-      - ["java.nio.file.attribute", "UserPrincipalLookupService", "lookupPrincipalByGroupName", "(String)", "summary", "df-generated"]
-      - ["java.nio.file.attribute", "UserPrincipalLookupService", "lookupPrincipalByName", "(String)", "summary", "df-generated"]
+      - ["java.nio.file.attribute", "PosixFilePermissions", "toString", "(Set)", "summary", "df-generated"]
diff --git a/java/ql/lib/ext/generated/java.nio.file.model.yml b/java/ql/lib/ext/generated/java.nio.file.model.yml
index 4c88fbbe5ec..5ac1c153253 100644
--- a/java/ql/lib/ext/generated/java.nio.file.model.yml
+++ b/java/ql/lib/ext/generated/java.nio.file.model.yml
@@ -17,14 +17,20 @@ extensions:
       - ["java.nio.file", "FileAlreadyExistsException", True, "FileAlreadyExistsException", "(String,String,String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.nio.file", "FileAlreadyExistsException", True, "FileAlreadyExistsException", "(String,String,String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
       - ["java.nio.file", "FileAlreadyExistsException", True, "FileAlreadyExistsException", "(String,String,String)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
+      - ["java.nio.file", "FileStore", True, "name", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio.file", "FileStore", True, "type", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio.file", "FileSystem", True, "getFileStores", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio.file", "FileSystem", True, "newWatchService", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio.file", "FileSystem", True, "provider", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio.file", "FileSystem", True, "supportedFileAttributeViews", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.nio.file", "FileSystemAlreadyExistsException", True, "FileSystemAlreadyExistsException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.nio.file", "FileSystemException", True, "FileSystemException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.nio.file", "FileSystemException", True, "FileSystemException", "(String,String,String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.nio.file", "FileSystemException", True, "FileSystemException", "(String,String,String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["java.nio.file", "FileSystemException", True, "FileSystemException", "(String,String,String)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
-      - ["java.nio.file", "FileSystemException", True, "getFile", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.nio.file", "FileSystemException", True, "getOtherFile", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.nio.file", "FileSystemException", True, "getReason", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio.file", "FileSystemException", True, "FileSystemException", "(String)", "", "Argument[0]", "Argument[this].SyntheticField[java.nio.file.FileSystemException.file]", "value", "dfc-generated"]
+      - ["java.nio.file", "FileSystemException", True, "FileSystemException", "(String,String,String)", "", "Argument[0]", "Argument[this].SyntheticField[java.nio.file.FileSystemException.file]", "value", "dfc-generated"]
+      - ["java.nio.file", "FileSystemException", True, "FileSystemException", "(String,String,String)", "", "Argument[1]", "Argument[this].SyntheticField[java.nio.file.FileSystemException.other]", "value", "dfc-generated"]
+      - ["java.nio.file", "FileSystemException", True, "FileSystemException", "(String,String,String)", "", "Argument[2]", "Argument[this].SyntheticField[java.lang.Throwable.message]", "value", "dfc-generated"]
+      - ["java.nio.file", "FileSystemException", True, "getFile", "()", "", "Argument[this].SyntheticField[java.nio.file.FileSystemException.file]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.nio.file", "FileSystemException", True, "getOtherFile", "()", "", "Argument[this].SyntheticField[java.nio.file.FileSystemException.other]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.nio.file", "FileSystemException", True, "getReason", "()", "", "Argument[this].SyntheticField[java.lang.Throwable.message]", "ReturnValue", "value", "dfc-generated"]
       - ["java.nio.file", "FileSystemLoopException", True, "FileSystemLoopException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.nio.file", "FileSystemNotFoundException", True, "FileSystemNotFoundException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.nio.file", "FileSystems", False, "newFileSystem", "(Path)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
@@ -45,24 +51,23 @@ extensions:
       - ["java.nio.file", "Files", False, "getFileAttributeView", "(Path,Class,LinkOption[])", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
       - ["java.nio.file", "Files", False, "getFileAttributeView", "(Path,Class,LinkOption[])", "", "Argument[2].ArrayElement", "ReturnValue", "taint", "df-generated"]
       - ["java.nio.file", "Files", False, "newDirectoryStream", "(Path,String)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["java.nio.file", "Files", False, "newOutputStream", "(Path,OpenOption[])", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
       - ["java.nio.file", "Files", False, "readAttributes", "(Path,Class,LinkOption[])", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
       - ["java.nio.file", "Files", False, "readAttributes", "(Path,String,LinkOption[])", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
       - ["java.nio.file", "Files", False, "readAttributes", "(Path,String,LinkOption[])", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["java.nio.file", "Files", False, "setAttribute", "(Path,String,Object,LinkOption[])", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["java.nio.file", "Files", False, "setLastModifiedTime", "(Path,FileTime)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["java.nio.file", "Files", False, "setOwner", "(Path,UserPrincipal)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["java.nio.file", "Files", False, "setPosixFilePermissions", "(Path,Set)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["java.nio.file", "Files", False, "walkFileTree", "(Path,FileVisitor)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["java.nio.file", "Files", False, "walkFileTree", "(Path,Set,int,FileVisitor)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["java.nio.file", "InvalidPathException", True, "InvalidPathException", "(String,String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.nio.file", "InvalidPathException", True, "InvalidPathException", "(String,String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["java.nio.file", "InvalidPathException", True, "InvalidPathException", "(String,String,int)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.nio.file", "InvalidPathException", True, "InvalidPathException", "(String,String,int)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["java.nio.file", "InvalidPathException", True, "getInput", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.nio.file", "InvalidPathException", True, "getReason", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.nio.file", "LinkPermission", False, "LinkPermission", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.nio.file", "LinkPermission", False, "LinkPermission", "(String,String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.nio.file", "Files", False, "setAttribute", "(Path,String,Object,LinkOption[])", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.nio.file", "Files", False, "setLastModifiedTime", "(Path,FileTime)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.nio.file", "Files", False, "setOwner", "(Path,UserPrincipal)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.nio.file", "Files", False, "setPosixFilePermissions", "(Path,Set)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.nio.file", "Files", False, "walkFileTree", "(Path,FileVisitor)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.nio.file", "Files", False, "walkFileTree", "(Path,Set,int,FileVisitor)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.nio.file", "InvalidPathException", True, "InvalidPathException", "(String,String)", "", "Argument[0]", "Argument[this].SyntheticField[java.nio.file.InvalidPathException.input]", "value", "dfc-generated"]
+      - ["java.nio.file", "InvalidPathException", True, "InvalidPathException", "(String,String)", "", "Argument[1]", "Argument[this].SyntheticField[java.lang.Throwable.message]", "value", "dfc-generated"]
+      - ["java.nio.file", "InvalidPathException", True, "InvalidPathException", "(String,String,int)", "", "Argument[0]", "Argument[this].SyntheticField[java.nio.file.InvalidPathException.input]", "value", "dfc-generated"]
+      - ["java.nio.file", "InvalidPathException", True, "InvalidPathException", "(String,String,int)", "", "Argument[1]", "Argument[this].SyntheticField[java.lang.Throwable.message]", "value", "dfc-generated"]
+      - ["java.nio.file", "InvalidPathException", True, "getInput", "()", "", "Argument[this].SyntheticField[java.nio.file.InvalidPathException.input]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.nio.file", "InvalidPathException", True, "getReason", "()", "", "Argument[this].SyntheticField[java.lang.Throwable.message]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.nio.file", "LinkPermission", False, "LinkPermission", "(String)", "", "Argument[0]", "Argument[this]", "taint", "dfc-generated"]
+      - ["java.nio.file", "LinkPermission", False, "LinkPermission", "(String,String)", "", "Argument[0]", "Argument[this]", "taint", "dfc-generated"]
       - ["java.nio.file", "NoSuchFileException", True, "NoSuchFileException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.nio.file", "NoSuchFileException", True, "NoSuchFileException", "(String,String,String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.nio.file", "NoSuchFileException", True, "NoSuchFileException", "(String,String,String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
@@ -72,8 +77,18 @@ extensions:
       - ["java.nio.file", "NotLinkException", True, "NotLinkException", "(String,String,String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.nio.file", "NotLinkException", True, "NotLinkException", "(String,String,String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
       - ["java.nio.file", "NotLinkException", True, "NotLinkException", "(String,String,String)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
+      - ["java.nio.file", "Path", True, "getFileSystem", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio.file", "Path", True, "getName", "(int)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio.file", "Path", True, "getRoot", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio.file", "Path", True, "subpath", "(int,int)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio.file", "Path", True, "toRealPath", "(LinkOption[])", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.nio.file", "ProviderMismatchException", True, "ProviderMismatchException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.nio.file", "ProviderNotFoundException", True, "ProviderNotFoundException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.nio.file", "WatchKey", True, "pollEvents", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio.file", "WatchKey", True, "watchable", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio.file", "WatchService", True, "poll", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio.file", "WatchService", True, "poll", "(long,TimeUnit)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio.file", "WatchService", True, "take", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
   - addsTo:
       pack: codeql/java-all
       extensible: neutralModel
@@ -85,20 +100,13 @@ extensions:
       - ["java.nio.file", "FileStore", "getUnallocatedSpace", "()", "summary", "df-generated"]
       - ["java.nio.file", "FileStore", "getUsableSpace", "()", "summary", "df-generated"]
       - ["java.nio.file", "FileStore", "isReadOnly", "()", "summary", "df-generated"]
-      - ["java.nio.file", "FileStore", "name", "()", "summary", "df-generated"]
       - ["java.nio.file", "FileStore", "supportsFileAttributeView", "(Class)", "summary", "df-generated"]
       - ["java.nio.file", "FileStore", "supportsFileAttributeView", "(String)", "summary", "df-generated"]
-      - ["java.nio.file", "FileStore", "type", "()", "summary", "df-generated"]
-      - ["java.nio.file", "FileSystem", "getFileStores", "()", "summary", "df-generated"]
       - ["java.nio.file", "FileSystem", "getSeparator", "()", "summary", "df-generated"]
       - ["java.nio.file", "FileSystem", "getUserPrincipalLookupService", "()", "summary", "df-generated"]
       - ["java.nio.file", "FileSystem", "isOpen", "()", "summary", "df-generated"]
       - ["java.nio.file", "FileSystem", "isReadOnly", "()", "summary", "df-generated"]
-      - ["java.nio.file", "FileSystem", "newWatchService", "()", "summary", "df-generated"]
-      - ["java.nio.file", "FileSystem", "provider", "()", "summary", "df-generated"]
-      - ["java.nio.file", "FileSystem", "supportedFileAttributeViews", "()", "summary", "df-generated"]
       - ["java.nio.file", "FileSystems", "getDefault", "()", "summary", "df-generated"]
-      - ["java.nio.file", "FileSystems", "getFileSystem", "(URI)", "summary", "df-generated"]
       - ["java.nio.file", "Files", "getLastModifiedTime", "(Path,LinkOption[])", "summary", "df-generated"]
       - ["java.nio.file", "Files", "getOwner", "(Path,LinkOption[])", "summary", "df-generated"]
       - ["java.nio.file", "Files", "getPosixFilePermissions", "(Path,LinkOption[])", "summary", "df-generated"]
@@ -115,5 +123,9 @@ extensions:
       - ["java.nio.file", "Files", "walk", "(Path,int,FileVisitOption[])", "summary", "df-generated"]
       - ["java.nio.file", "InvalidPathException", "getIndex", "()", "summary", "df-generated"]
       - ["java.nio.file", "Path", "endsWith", "(String)", "summary", "df-generated"]
+      - ["java.nio.file", "Path", "register", "(WatchService,WatchEvent$Kind[])", "summary", "df-generated"]
       - ["java.nio.file", "Path", "startsWith", "(String)", "summary", "df-generated"]
-      - ["java.nio.file", "Watchable", "register", "(WatchService,WatchEvent$Kind[])", "summary", "df-generated"]
+      - ["java.nio.file", "SimpleFileVisitor", "postVisitDirectory", "(Object,IOException)", "summary", "df-generated"]
+      - ["java.nio.file", "SimpleFileVisitor", "preVisitDirectory", "(Object,BasicFileAttributes)", "summary", "df-generated"]
+      - ["java.nio.file", "SimpleFileVisitor", "visitFile", "(Object,BasicFileAttributes)", "summary", "df-generated"]
+      - ["java.nio.file", "SimpleFileVisitor", "visitFileFailed", "(Object,IOException)", "summary", "df-generated"]
diff --git a/java/ql/lib/ext/generated/java.nio.file.spi.model.yml b/java/ql/lib/ext/generated/java.nio.file.spi.model.yml
index 2e144b26abe..fe26852b866 100644
--- a/java/ql/lib/ext/generated/java.nio.file.spi.model.yml
+++ b/java/ql/lib/ext/generated/java.nio.file.spi.model.yml
@@ -4,7 +4,29 @@ extensions:
       pack: codeql/java-all
       extensible: summaryModel
     data:
+      - ["java.nio.file.spi", "FileSystemProvider", True, "getFileAttributeView", "(Path,Class,LinkOption[])", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio.file.spi", "FileSystemProvider", True, "getFileAttributeView", "(Path,Class,LinkOption[])", "", "Argument[2].ArrayElement", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio.file.spi", "FileSystemProvider", True, "getFileStore", "(Path)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio.file.spi", "FileSystemProvider", True, "getFileSystem", "(URI)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio.file.spi", "FileSystemProvider", True, "getPath", "(URI)", "", "Argument[0]", "ReturnValue", "taint", "dfc-generated"]
+      - ["java.nio.file.spi", "FileSystemProvider", True, "newAsynchronousFileChannel", "(Path,Set,ExecutorService,FileAttribute[])", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio.file.spi", "FileSystemProvider", True, "newByteChannel", "(Path,Set,FileAttribute[])", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio.file.spi", "FileSystemProvider", True, "newDirectoryStream", "(Path,DirectoryStream$Filter)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio.file.spi", "FileSystemProvider", True, "newDirectoryStream", "(Path,DirectoryStream$Filter)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio.file.spi", "FileSystemProvider", True, "newFileChannel", "(Path,Set,FileAttribute[])", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio.file.spi", "FileSystemProvider", True, "newFileSystem", "(Path,Map)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio.file.spi", "FileSystemProvider", True, "newFileSystem", "(Path,Map)", "", "Argument[1].Element", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio.file.spi", "FileSystemProvider", True, "newFileSystem", "(Path,Map)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio.file.spi", "FileSystemProvider", True, "newFileSystem", "(URI,Map)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.nio.file.spi", "FileSystemProvider", True, "newFileSystem", "(URI,Map)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio.file.spi", "FileSystemProvider", True, "newFileSystem", "(URI,Map)", "", "Argument[1].Element", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio.file.spi", "FileSystemProvider", True, "newFileSystem", "(URI,Map)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.nio.file.spi", "FileSystemProvider", True, "newInputStream", "(Path,OpenOption[])", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio.file.spi", "FileSystemProvider", True, "newOutputStream", "(Path,OpenOption[])", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio.file.spi", "FileSystemProvider", True, "readAttributes", "(Path,Class,LinkOption[])", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio.file.spi", "FileSystemProvider", True, "readAttributes", "(Path,String,LinkOption[])", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio.file.spi", "FileSystemProvider", True, "readAttributes", "(Path,String,LinkOption[])", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio.file.spi", "FileSystemProvider", True, "readSymbolicLink", "(Path)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
   - addsTo:
       pack: codeql/java-all
       extensible: neutralModel
@@ -16,24 +38,10 @@ extensions:
       - ["java.nio.file.spi", "FileSystemProvider", "createSymbolicLink", "(Path,Path,FileAttribute[])", "summary", "df-generated"]
       - ["java.nio.file.spi", "FileSystemProvider", "delete", "(Path)", "summary", "df-generated"]
       - ["java.nio.file.spi", "FileSystemProvider", "deleteIfExists", "(Path)", "summary", "df-generated"]
-      - ["java.nio.file.spi", "FileSystemProvider", "getFileAttributeView", "(Path,Class,LinkOption[])", "summary", "df-generated"]
-      - ["java.nio.file.spi", "FileSystemProvider", "getFileStore", "(Path)", "summary", "df-generated"]
-      - ["java.nio.file.spi", "FileSystemProvider", "getFileSystem", "(URI)", "summary", "df-generated"]
-      - ["java.nio.file.spi", "FileSystemProvider", "getPath", "(URI)", "summary", "df-generated"]
       - ["java.nio.file.spi", "FileSystemProvider", "getScheme", "()", "summary", "df-generated"]
       - ["java.nio.file.spi", "FileSystemProvider", "installedProviders", "()", "summary", "df-generated"]
       - ["java.nio.file.spi", "FileSystemProvider", "isHidden", "(Path)", "summary", "df-generated"]
       - ["java.nio.file.spi", "FileSystemProvider", "isSameFile", "(Path,Path)", "summary", "df-generated"]
       - ["java.nio.file.spi", "FileSystemProvider", "move", "(Path,Path,CopyOption[])", "summary", "df-generated"]
-      - ["java.nio.file.spi", "FileSystemProvider", "newAsynchronousFileChannel", "(Path,Set,ExecutorService,FileAttribute[])", "summary", "df-generated"]
-      - ["java.nio.file.spi", "FileSystemProvider", "newByteChannel", "(Path,Set,FileAttribute[])", "summary", "df-generated"]
-      - ["java.nio.file.spi", "FileSystemProvider", "newDirectoryStream", "(Path,DirectoryStream$Filter)", "summary", "df-generated"]
-      - ["java.nio.file.spi", "FileSystemProvider", "newFileChannel", "(Path,Set,FileAttribute[])", "summary", "df-generated"]
-      - ["java.nio.file.spi", "FileSystemProvider", "newFileSystem", "(Path,Map)", "summary", "df-generated"]
-      - ["java.nio.file.spi", "FileSystemProvider", "newFileSystem", "(URI,Map)", "summary", "df-generated"]
-      - ["java.nio.file.spi", "FileSystemProvider", "newOutputStream", "(Path,OpenOption[])", "summary", "df-generated"]
-      - ["java.nio.file.spi", "FileSystemProvider", "readAttributes", "(Path,Class,LinkOption[])", "summary", "df-generated"]
-      - ["java.nio.file.spi", "FileSystemProvider", "readAttributes", "(Path,String,LinkOption[])", "summary", "df-generated"]
-      - ["java.nio.file.spi", "FileSystemProvider", "readSymbolicLink", "(Path)", "summary", "df-generated"]
       - ["java.nio.file.spi", "FileSystemProvider", "setAttribute", "(Path,String,Object,LinkOption[])", "summary", "df-generated"]
       - ["java.nio.file.spi", "FileTypeDetector", "probeContentType", "(Path)", "summary", "df-generated"]
diff --git a/java/ql/lib/ext/generated/java.nio.model.yml b/java/ql/lib/ext/generated/java.nio.model.yml
index bd9bc410cda..6a4ce51b75b 100644
--- a/java/ql/lib/ext/generated/java.nio.model.yml
+++ b/java/ql/lib/ext/generated/java.nio.model.yml
@@ -4,15 +4,15 @@ extensions:
       pack: codeql/java-all
       extensible: summaryModel
     data:
-      - ["java.nio", "Buffer", True, "array", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.nio", "Buffer", True, "clear", "()", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.nio", "Buffer", True, "array", "()", "", "Argument[this]", "ReturnValue", "taint", "dfc-generated"]
+      - ["java.nio", "Buffer", True, "clear", "()", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
       - ["java.nio", "Buffer", True, "duplicate", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.nio", "Buffer", True, "flip", "()", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["java.nio", "Buffer", True, "limit", "(int)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["java.nio", "Buffer", True, "mark", "()", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["java.nio", "Buffer", True, "position", "(int)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["java.nio", "Buffer", True, "reset", "()", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["java.nio", "Buffer", True, "rewind", "()", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.nio", "Buffer", True, "flip", "()", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.nio", "Buffer", True, "limit", "(int)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.nio", "Buffer", True, "mark", "()", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.nio", "Buffer", True, "position", "(int)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.nio", "Buffer", True, "reset", "()", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.nio", "Buffer", True, "rewind", "()", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
       - ["java.nio", "Buffer", True, "slice", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.nio", "Buffer", True, "slice", "(int,int)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.nio", "ByteBuffer", True, "asCharBuffer", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
@@ -22,143 +22,125 @@ extensions:
       - ["java.nio", "ByteBuffer", True, "asLongBuffer", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.nio", "ByteBuffer", True, "asReadOnlyBuffer", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.nio", "ByteBuffer", True, "asShortBuffer", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.nio", "ByteBuffer", True, "compact", "()", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["java.nio", "ByteBuffer", True, "get", "(byte[],int,int)", "", "Argument[this]", "Argument[0]", "taint", "df-generated"]
-      - ["java.nio", "ByteBuffer", True, "get", "(byte[],int,int)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["java.nio", "ByteBuffer", True, "get", "(int,byte[],int,int)", "", "Argument[this]", "Argument[1]", "taint", "df-generated"]
-      - ["java.nio", "ByteBuffer", True, "get", "(int,byte[],int,int)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["java.nio", "ByteBuffer", True, "order", "(ByteOrder)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["java.nio", "ByteBuffer", True, "put", "(ByteBuffer)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["java.nio", "ByteBuffer", True, "put", "(byte)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["java.nio", "ByteBuffer", True, "put", "(byte[])", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.nio", "ByteBuffer", True, "put", "(byte[])", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["java.nio", "ByteBuffer", True, "put", "(byte[])", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.nio", "ByteBuffer", True, "put", "(byte[],int,int)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.nio", "ByteBuffer", True, "put", "(byte[],int,int)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["java.nio", "ByteBuffer", True, "put", "(int,ByteBuffer,int,int)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["java.nio", "ByteBuffer", True, "put", "(int,byte)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["java.nio", "ByteBuffer", True, "put", "(int,byte[])", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["java.nio", "ByteBuffer", True, "put", "(int,byte[])", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["java.nio", "ByteBuffer", True, "put", "(int,byte[])", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.nio", "ByteBuffer", True, "put", "(int,byte[],int,int)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["java.nio", "ByteBuffer", True, "put", "(int,byte[],int,int)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["java.nio", "ByteBuffer", True, "putChar", "(char)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["java.nio", "ByteBuffer", True, "putChar", "(int,char)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["java.nio", "ByteBuffer", True, "putDouble", "(double)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["java.nio", "ByteBuffer", True, "putDouble", "(int,double)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["java.nio", "ByteBuffer", True, "putFloat", "(float)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["java.nio", "ByteBuffer", True, "putFloat", "(int,float)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["java.nio", "ByteBuffer", True, "putInt", "(int)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["java.nio", "ByteBuffer", True, "putInt", "(int,int)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["java.nio", "ByteBuffer", True, "putLong", "(int,long)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["java.nio", "ByteBuffer", True, "putLong", "(long)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["java.nio", "ByteBuffer", True, "putShort", "(int,short)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["java.nio", "ByteBuffer", True, "putShort", "(short)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["java.nio", "ByteBuffer", True, "wrap", "(byte[],int,int)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio", "ByteBuffer", True, "compact", "()", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.nio", "ByteBuffer", True, "order", "(ByteOrder)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.nio", "ByteBuffer", True, "put", "(int,ByteBuffer,int,int)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.nio", "ByteBuffer", True, "put", "(int,byte)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.nio", "ByteBuffer", True, "put", "(int,byte[])", "", "Argument[1]", "Argument[this].SyntheticField[java.nio.ByteBuffer.hb]", "taint", "dfc-generated"]
+      - ["java.nio", "ByteBuffer", True, "put", "(int,byte[])", "", "Argument[1]", "ReturnValue.SyntheticField[java.nio.ByteBuffer.hb]", "taint", "dfc-generated"]
+      - ["java.nio", "ByteBuffer", True, "put", "(int,byte[])", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.nio", "ByteBuffer", True, "put", "(int,byte[],int,int)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.nio", "ByteBuffer", True, "putChar", "(char)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.nio", "ByteBuffer", True, "putChar", "(int,char)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.nio", "ByteBuffer", True, "putDouble", "(double)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.nio", "ByteBuffer", True, "putDouble", "(int,double)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.nio", "ByteBuffer", True, "putFloat", "(float)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.nio", "ByteBuffer", True, "putFloat", "(int,float)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.nio", "ByteBuffer", True, "putInt", "(int)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.nio", "ByteBuffer", True, "putInt", "(int,int)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.nio", "ByteBuffer", True, "putLong", "(int,long)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.nio", "ByteBuffer", True, "putLong", "(long)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.nio", "ByteBuffer", True, "putShort", "(int,short)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.nio", "ByteBuffer", True, "putShort", "(short)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.nio", "CharBuffer", True, "array", "()", "", "Argument[this].SyntheticField[java.nio.CharBuffer.hb]", "ReturnValue", "value", "dfc-generated"]
       - ["java.nio", "CharBuffer", True, "asReadOnlyBuffer", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.nio", "CharBuffer", True, "compact", "()", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["java.nio", "CharBuffer", True, "get", "(char[])", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.nio", "CharBuffer", True, "get", "(char[],int,int)", "", "Argument[this]", "Argument[0]", "taint", "df-generated"]
-      - ["java.nio", "CharBuffer", True, "get", "(char[],int,int)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["java.nio", "CharBuffer", True, "get", "(int,char[])", "", "Argument[this]", "Argument[1]", "taint", "df-generated"]
-      - ["java.nio", "CharBuffer", True, "get", "(int,char[])", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.nio", "CharBuffer", True, "get", "(int,char[],int,int)", "", "Argument[this]", "Argument[1]", "taint", "df-generated"]
-      - ["java.nio", "CharBuffer", True, "get", "(int,char[],int,int)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["java.nio", "CharBuffer", True, "put", "(CharBuffer)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["java.nio", "CharBuffer", True, "put", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.nio", "CharBuffer", True, "put", "(String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["java.nio", "CharBuffer", True, "put", "(String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.nio", "CharBuffer", True, "put", "(String,int,int)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.nio", "CharBuffer", True, "put", "(String,int,int)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["java.nio", "CharBuffer", True, "put", "(char)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["java.nio", "CharBuffer", True, "put", "(char[])", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.nio", "CharBuffer", True, "put", "(char[])", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["java.nio", "CharBuffer", True, "put", "(char[])", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.nio", "CharBuffer", True, "put", "(char[],int,int)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.nio", "CharBuffer", True, "put", "(char[],int,int)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["java.nio", "CharBuffer", True, "put", "(int,CharBuffer,int,int)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["java.nio", "CharBuffer", True, "put", "(int,char)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["java.nio", "CharBuffer", True, "put", "(int,char[])", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["java.nio", "CharBuffer", True, "put", "(int,char[])", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["java.nio", "CharBuffer", True, "put", "(int,char[])", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.nio", "CharBuffer", True, "put", "(int,char[],int,int)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["java.nio", "CharBuffer", True, "put", "(int,char[],int,int)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["java.nio", "CharBuffer", True, "wrap", "(CharSequence)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["java.nio", "CharBuffer", True, "wrap", "(CharSequence,int,int)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["java.nio", "CharBuffer", True, "wrap", "(char[])", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["java.nio", "CharBuffer", True, "wrap", "(char[],int,int)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio", "CharBuffer", True, "compact", "()", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.nio", "CharBuffer", True, "get", "(char[])", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.nio", "CharBuffer", True, "get", "(char[],int,int)", "", "Argument[this]", "Argument[0]", "taint", "dfc-generated"]
+      - ["java.nio", "CharBuffer", True, "get", "(char[],int,int)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.nio", "CharBuffer", True, "get", "(int,char[])", "", "Argument[this].SyntheticField[java.nio.CharBuffer.hb]", "Argument[1]", "taint", "dfc-generated"]
+      - ["java.nio", "CharBuffer", True, "get", "(int,char[])", "", "Argument[this]", "Argument[1]", "taint", "dfc-generated"]
+      - ["java.nio", "CharBuffer", True, "get", "(int,char[])", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.nio", "CharBuffer", True, "get", "(int,char[],int,int)", "", "Argument[this]", "Argument[1]", "taint", "dfc-generated"]
+      - ["java.nio", "CharBuffer", True, "get", "(int,char[],int,int)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.nio", "CharBuffer", True, "put", "(CharBuffer)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.nio", "CharBuffer", True, "put", "(String)", "", "Argument[0]", "Argument[this].SyntheticField[java.nio.CharBuffer.hb]", "taint", "dfc-generated"]
+      - ["java.nio", "CharBuffer", True, "put", "(String)", "", "Argument[0]", "ReturnValue.SyntheticField[java.nio.CharBuffer.hb]", "taint", "dfc-generated"]
+      - ["java.nio", "CharBuffer", True, "put", "(String)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.nio", "CharBuffer", True, "put", "(String,int,int)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.nio", "CharBuffer", True, "put", "(char)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.nio", "CharBuffer", True, "put", "(char[])", "", "Argument[0]", "Argument[this].SyntheticField[java.nio.CharBuffer.hb]", "taint", "dfc-generated"]
+      - ["java.nio", "CharBuffer", True, "put", "(char[])", "", "Argument[0]", "ReturnValue.SyntheticField[java.nio.CharBuffer.hb]", "taint", "dfc-generated"]
+      - ["java.nio", "CharBuffer", True, "put", "(char[])", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.nio", "CharBuffer", True, "put", "(char[],int,int)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.nio", "CharBuffer", True, "put", "(int,CharBuffer,int,int)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.nio", "CharBuffer", True, "put", "(int,char)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.nio", "CharBuffer", True, "put", "(int,char[])", "", "Argument[1]", "Argument[this].SyntheticField[java.nio.CharBuffer.hb]", "taint", "dfc-generated"]
+      - ["java.nio", "CharBuffer", True, "put", "(int,char[])", "", "Argument[1]", "ReturnValue.SyntheticField[java.nio.CharBuffer.hb]", "taint", "dfc-generated"]
+      - ["java.nio", "CharBuffer", True, "put", "(int,char[])", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.nio", "CharBuffer", True, "put", "(int,char[],int,int)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
       - ["java.nio", "DoubleBuffer", True, "asReadOnlyBuffer", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.nio", "DoubleBuffer", True, "compact", "()", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["java.nio", "DoubleBuffer", True, "get", "(double[])", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.nio", "DoubleBuffer", True, "get", "(double[],int,int)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["java.nio", "DoubleBuffer", True, "get", "(int,double[])", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.nio", "DoubleBuffer", True, "get", "(int,double[],int,int)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["java.nio", "DoubleBuffer", True, "put", "(DoubleBuffer)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["java.nio", "DoubleBuffer", True, "put", "(double)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["java.nio", "DoubleBuffer", True, "put", "(double[])", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.nio", "DoubleBuffer", True, "put", "(double[],int,int)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["java.nio", "DoubleBuffer", True, "put", "(int,DoubleBuffer,int,int)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["java.nio", "DoubleBuffer", True, "put", "(int,double)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["java.nio", "DoubleBuffer", True, "put", "(int,double[])", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.nio", "DoubleBuffer", True, "put", "(int,double[],int,int)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.nio", "DoubleBuffer", True, "compact", "()", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.nio", "DoubleBuffer", True, "get", "(double[])", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.nio", "DoubleBuffer", True, "get", "(double[],int,int)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.nio", "DoubleBuffer", True, "get", "(int,double[])", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.nio", "DoubleBuffer", True, "get", "(int,double[],int,int)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.nio", "DoubleBuffer", True, "put", "(DoubleBuffer)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.nio", "DoubleBuffer", True, "put", "(double)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.nio", "DoubleBuffer", True, "put", "(double[])", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.nio", "DoubleBuffer", True, "put", "(double[],int,int)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.nio", "DoubleBuffer", True, "put", "(int,DoubleBuffer,int,int)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.nio", "DoubleBuffer", True, "put", "(int,double)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.nio", "DoubleBuffer", True, "put", "(int,double[])", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.nio", "DoubleBuffer", True, "put", "(int,double[],int,int)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
       - ["java.nio", "FloatBuffer", True, "asReadOnlyBuffer", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.nio", "FloatBuffer", True, "compact", "()", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["java.nio", "FloatBuffer", True, "get", "(float[])", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.nio", "FloatBuffer", True, "get", "(float[],int,int)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["java.nio", "FloatBuffer", True, "get", "(int,float[])", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.nio", "FloatBuffer", True, "get", "(int,float[],int,int)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["java.nio", "FloatBuffer", True, "put", "(FloatBuffer)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["java.nio", "FloatBuffer", True, "put", "(float)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["java.nio", "FloatBuffer", True, "put", "(float[])", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.nio", "FloatBuffer", True, "put", "(float[],int,int)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["java.nio", "FloatBuffer", True, "put", "(int,FloatBuffer,int,int)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["java.nio", "FloatBuffer", True, "put", "(int,float)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["java.nio", "FloatBuffer", True, "put", "(int,float[])", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.nio", "FloatBuffer", True, "put", "(int,float[],int,int)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.nio", "FloatBuffer", True, "compact", "()", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.nio", "FloatBuffer", True, "get", "(float[])", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.nio", "FloatBuffer", True, "get", "(float[],int,int)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.nio", "FloatBuffer", True, "get", "(int,float[])", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.nio", "FloatBuffer", True, "get", "(int,float[],int,int)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.nio", "FloatBuffer", True, "put", "(FloatBuffer)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.nio", "FloatBuffer", True, "put", "(float)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.nio", "FloatBuffer", True, "put", "(float[])", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.nio", "FloatBuffer", True, "put", "(float[],int,int)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.nio", "FloatBuffer", True, "put", "(int,FloatBuffer,int,int)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.nio", "FloatBuffer", True, "put", "(int,float)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.nio", "FloatBuffer", True, "put", "(int,float[])", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.nio", "FloatBuffer", True, "put", "(int,float[],int,int)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
       - ["java.nio", "IntBuffer", True, "asReadOnlyBuffer", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.nio", "IntBuffer", True, "compact", "()", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["java.nio", "IntBuffer", True, "get", "(int,int[])", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.nio", "IntBuffer", True, "get", "(int,int[],int,int)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["java.nio", "IntBuffer", True, "get", "(int[],int,int)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["java.nio", "IntBuffer", True, "put", "(IntBuffer)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["java.nio", "IntBuffer", True, "put", "(int)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["java.nio", "IntBuffer", True, "put", "(int,IntBuffer,int,int)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["java.nio", "IntBuffer", True, "put", "(int,int)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["java.nio", "IntBuffer", True, "put", "(int,int[])", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.nio", "IntBuffer", True, "put", "(int,int[],int,int)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["java.nio", "IntBuffer", True, "put", "(int[])", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.nio", "IntBuffer", True, "put", "(int[],int,int)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.nio", "IntBuffer", True, "compact", "()", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.nio", "IntBuffer", True, "get", "(int,int[])", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.nio", "IntBuffer", True, "get", "(int,int[],int,int)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.nio", "IntBuffer", True, "get", "(int[],int,int)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.nio", "IntBuffer", True, "put", "(IntBuffer)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.nio", "IntBuffer", True, "put", "(int)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.nio", "IntBuffer", True, "put", "(int,IntBuffer,int,int)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.nio", "IntBuffer", True, "put", "(int,int)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.nio", "IntBuffer", True, "put", "(int,int[])", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.nio", "IntBuffer", True, "put", "(int,int[],int,int)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.nio", "IntBuffer", True, "put", "(int[])", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.nio", "IntBuffer", True, "put", "(int[],int,int)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
       - ["java.nio", "LongBuffer", True, "asReadOnlyBuffer", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.nio", "LongBuffer", True, "compact", "()", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["java.nio", "LongBuffer", True, "get", "(int,long[])", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.nio", "LongBuffer", True, "get", "(int,long[],int,int)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["java.nio", "LongBuffer", True, "get", "(long[])", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.nio", "LongBuffer", True, "get", "(long[],int,int)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["java.nio", "LongBuffer", True, "put", "(LongBuffer)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["java.nio", "LongBuffer", True, "put", "(int,LongBuffer,int,int)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["java.nio", "LongBuffer", True, "put", "(int,long)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["java.nio", "LongBuffer", True, "put", "(int,long[])", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.nio", "LongBuffer", True, "put", "(int,long[],int,int)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["java.nio", "LongBuffer", True, "put", "(long)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["java.nio", "LongBuffer", True, "put", "(long[])", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.nio", "LongBuffer", True, "put", "(long[],int,int)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["java.nio", "MappedByteBuffer", True, "force", "()", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["java.nio", "MappedByteBuffer", True, "force", "(int,int)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["java.nio", "MappedByteBuffer", True, "load", "()", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.nio", "LongBuffer", True, "compact", "()", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.nio", "LongBuffer", True, "get", "(int,long[])", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.nio", "LongBuffer", True, "get", "(int,long[],int,int)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.nio", "LongBuffer", True, "get", "(long[])", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.nio", "LongBuffer", True, "get", "(long[],int,int)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.nio", "LongBuffer", True, "put", "(LongBuffer)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.nio", "LongBuffer", True, "put", "(int,LongBuffer,int,int)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.nio", "LongBuffer", True, "put", "(int,long)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.nio", "LongBuffer", True, "put", "(int,long[])", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.nio", "LongBuffer", True, "put", "(int,long[],int,int)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.nio", "LongBuffer", True, "put", "(long)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.nio", "LongBuffer", True, "put", "(long[])", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.nio", "LongBuffer", True, "put", "(long[],int,int)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.nio", "MappedByteBuffer", True, "force", "()", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.nio", "MappedByteBuffer", True, "force", "(int,int)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.nio", "MappedByteBuffer", True, "load", "()", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
       - ["java.nio", "ShortBuffer", True, "asReadOnlyBuffer", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.nio", "ShortBuffer", True, "compact", "()", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["java.nio", "ShortBuffer", True, "get", "(int,short[])", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.nio", "ShortBuffer", True, "get", "(int,short[],int,int)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["java.nio", "ShortBuffer", True, "get", "(short[])", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.nio", "ShortBuffer", True, "get", "(short[],int,int)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["java.nio", "ShortBuffer", True, "put", "(ShortBuffer)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["java.nio", "ShortBuffer", True, "put", "(int,ShortBuffer,int,int)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["java.nio", "ShortBuffer", True, "put", "(int,short)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["java.nio", "ShortBuffer", True, "put", "(int,short[])", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.nio", "ShortBuffer", True, "put", "(int,short[],int,int)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["java.nio", "ShortBuffer", True, "put", "(short)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["java.nio", "ShortBuffer", True, "put", "(short[])", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.nio", "ShortBuffer", True, "put", "(short[],int,int)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.nio", "ShortBuffer", True, "compact", "()", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.nio", "ShortBuffer", True, "get", "(int,short[])", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.nio", "ShortBuffer", True, "get", "(int,short[],int,int)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.nio", "ShortBuffer", True, "get", "(short[])", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.nio", "ShortBuffer", True, "get", "(short[],int,int)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.nio", "ShortBuffer", True, "put", "(ShortBuffer)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.nio", "ShortBuffer", True, "put", "(int,ShortBuffer,int,int)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.nio", "ShortBuffer", True, "put", "(int,short)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.nio", "ShortBuffer", True, "put", "(int,short[])", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.nio", "ShortBuffer", True, "put", "(int,short[],int,int)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.nio", "ShortBuffer", True, "put", "(short)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.nio", "ShortBuffer", True, "put", "(short[])", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.nio", "ShortBuffer", True, "put", "(short[],int,int)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
   - addsTo:
       pack: codeql/java-all
       extensible: neutralModel
@@ -173,8 +155,7 @@ extensions:
       - ["java.nio", "ByteBuffer", "alignedSlice", "(int)", "summary", "df-generated"]
       - ["java.nio", "ByteBuffer", "alignmentOffset", "(int,int)", "summary", "df-generated"]
       - ["java.nio", "ByteBuffer", "allocateDirect", "(int)", "summary", "df-generated"]
-      - ["java.nio", "ByteBuffer", "get", "()", "summary", "df-generated"]
-      - ["java.nio", "ByteBuffer", "get", "(int)", "summary", "df-generated"]
+      - ["java.nio", "ByteBuffer", "arrayOffset", "()", "summary", "df-generated"]
       - ["java.nio", "ByteBuffer", "getChar", "()", "summary", "df-generated"]
       - ["java.nio", "ByteBuffer", "getChar", "(int)", "summary", "df-generated"]
       - ["java.nio", "ByteBuffer", "getDouble", "()", "summary", "df-generated"]
@@ -187,47 +168,68 @@ extensions:
       - ["java.nio", "ByteBuffer", "getLong", "(int)", "summary", "df-generated"]
       - ["java.nio", "ByteBuffer", "getShort", "()", "summary", "df-generated"]
       - ["java.nio", "ByteBuffer", "getShort", "(int)", "summary", "df-generated"]
+      - ["java.nio", "ByteBuffer", "hasArray", "()", "summary", "df-generated"]
+      - ["java.nio", "ByteBuffer", "isDirect", "()", "summary", "df-generated"]
       - ["java.nio", "ByteBuffer", "mismatch", "(ByteBuffer)", "summary", "df-generated"]
       - ["java.nio", "ByteBuffer", "order", "()", "summary", "df-generated"]
       - ["java.nio", "ByteOrder", "nativeOrder", "()", "summary", "df-generated"]
       - ["java.nio", "CharBuffer", "allocate", "(int)", "summary", "df-generated"]
+      - ["java.nio", "CharBuffer", "arrayOffset", "()", "summary", "df-generated"]
       - ["java.nio", "CharBuffer", "get", "()", "summary", "df-generated"]
       - ["java.nio", "CharBuffer", "get", "(int)", "summary", "df-generated"]
+      - ["java.nio", "CharBuffer", "hasArray", "()", "summary", "df-generated"]
+      - ["java.nio", "CharBuffer", "isDirect", "()", "summary", "df-generated"]
+      - ["java.nio", "CharBuffer", "isEmpty", "()", "summary", "df-generated"]
       - ["java.nio", "CharBuffer", "mismatch", "(CharBuffer)", "summary", "df-generated"]
       - ["java.nio", "CharBuffer", "order", "()", "summary", "df-generated"]
       - ["java.nio", "DoubleBuffer", "allocate", "(int)", "summary", "df-generated"]
+      - ["java.nio", "DoubleBuffer", "arrayOffset", "()", "summary", "df-generated"]
       - ["java.nio", "DoubleBuffer", "get", "()", "summary", "df-generated"]
       - ["java.nio", "DoubleBuffer", "get", "(int)", "summary", "df-generated"]
+      - ["java.nio", "DoubleBuffer", "hasArray", "()", "summary", "df-generated"]
+      - ["java.nio", "DoubleBuffer", "isDirect", "()", "summary", "df-generated"]
       - ["java.nio", "DoubleBuffer", "mismatch", "(DoubleBuffer)", "summary", "df-generated"]
       - ["java.nio", "DoubleBuffer", "order", "()", "summary", "df-generated"]
       - ["java.nio", "DoubleBuffer", "wrap", "(double[])", "summary", "df-generated"]
       - ["java.nio", "DoubleBuffer", "wrap", "(double[],int,int)", "summary", "df-generated"]
       - ["java.nio", "FloatBuffer", "allocate", "(int)", "summary", "df-generated"]
+      - ["java.nio", "FloatBuffer", "arrayOffset", "()", "summary", "df-generated"]
       - ["java.nio", "FloatBuffer", "get", "()", "summary", "df-generated"]
       - ["java.nio", "FloatBuffer", "get", "(int)", "summary", "df-generated"]
+      - ["java.nio", "FloatBuffer", "hasArray", "()", "summary", "df-generated"]
+      - ["java.nio", "FloatBuffer", "isDirect", "()", "summary", "df-generated"]
       - ["java.nio", "FloatBuffer", "mismatch", "(FloatBuffer)", "summary", "df-generated"]
       - ["java.nio", "FloatBuffer", "order", "()", "summary", "df-generated"]
       - ["java.nio", "FloatBuffer", "wrap", "(float[])", "summary", "df-generated"]
       - ["java.nio", "FloatBuffer", "wrap", "(float[],int,int)", "summary", "df-generated"]
       - ["java.nio", "IntBuffer", "allocate", "(int)", "summary", "df-generated"]
+      - ["java.nio", "IntBuffer", "arrayOffset", "()", "summary", "df-generated"]
       - ["java.nio", "IntBuffer", "get", "()", "summary", "df-generated"]
       - ["java.nio", "IntBuffer", "get", "(int)", "summary", "df-generated"]
       - ["java.nio", "IntBuffer", "get", "(int[])", "summary", "df-generated"]
+      - ["java.nio", "IntBuffer", "hasArray", "()", "summary", "df-generated"]
+      - ["java.nio", "IntBuffer", "isDirect", "()", "summary", "df-generated"]
       - ["java.nio", "IntBuffer", "mismatch", "(IntBuffer)", "summary", "df-generated"]
       - ["java.nio", "IntBuffer", "order", "()", "summary", "df-generated"]
       - ["java.nio", "IntBuffer", "wrap", "(int[])", "summary", "df-generated"]
       - ["java.nio", "IntBuffer", "wrap", "(int[],int,int)", "summary", "df-generated"]
       - ["java.nio", "LongBuffer", "allocate", "(int)", "summary", "df-generated"]
+      - ["java.nio", "LongBuffer", "arrayOffset", "()", "summary", "df-generated"]
       - ["java.nio", "LongBuffer", "get", "()", "summary", "df-generated"]
       - ["java.nio", "LongBuffer", "get", "(int)", "summary", "df-generated"]
+      - ["java.nio", "LongBuffer", "hasArray", "()", "summary", "df-generated"]
+      - ["java.nio", "LongBuffer", "isDirect", "()", "summary", "df-generated"]
       - ["java.nio", "LongBuffer", "mismatch", "(LongBuffer)", "summary", "df-generated"]
       - ["java.nio", "LongBuffer", "order", "()", "summary", "df-generated"]
       - ["java.nio", "LongBuffer", "wrap", "(long[])", "summary", "df-generated"]
       - ["java.nio", "LongBuffer", "wrap", "(long[],int,int)", "summary", "df-generated"]
       - ["java.nio", "MappedByteBuffer", "isLoaded", "()", "summary", "df-generated"]
       - ["java.nio", "ShortBuffer", "allocate", "(int)", "summary", "df-generated"]
+      - ["java.nio", "ShortBuffer", "arrayOffset", "()", "summary", "df-generated"]
       - ["java.nio", "ShortBuffer", "get", "()", "summary", "df-generated"]
       - ["java.nio", "ShortBuffer", "get", "(int)", "summary", "df-generated"]
+      - ["java.nio", "ShortBuffer", "hasArray", "()", "summary", "df-generated"]
+      - ["java.nio", "ShortBuffer", "isDirect", "()", "summary", "df-generated"]
       - ["java.nio", "ShortBuffer", "mismatch", "(ShortBuffer)", "summary", "df-generated"]
       - ["java.nio", "ShortBuffer", "order", "()", "summary", "df-generated"]
       - ["java.nio", "ShortBuffer", "wrap", "(short[])", "summary", "df-generated"]
diff --git a/java/ql/lib/ext/generated/java.rmi.dgc.model.yml b/java/ql/lib/ext/generated/java.rmi.dgc.model.yml
index 18040c242d0..107ac0834ec 100644
--- a/java/ql/lib/ext/generated/java.rmi.dgc.model.yml
+++ b/java/ql/lib/ext/generated/java.rmi.dgc.model.yml
@@ -4,8 +4,10 @@ extensions:
       pack: codeql/java-all
       extensible: summaryModel
     data:
-      - ["java.rmi.dgc", "Lease", False, "Lease", "(VMID,long)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.rmi.dgc", "Lease", False, "getVMID", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.rmi.dgc", "DGC", True, "dirty", "(ObjID[],long,Lease)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
+      - ["java.rmi.dgc", "DGC", True, "dirty", "(ObjID[],long,Lease)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
+      - ["java.rmi.dgc", "Lease", False, "Lease", "(VMID,long)", "", "Argument[0]", "Argument[this].SyntheticField[java.rmi.dgc.Lease.vmid]", "value", "dfc-generated"]
+      - ["java.rmi.dgc", "Lease", False, "getVMID", "()", "", "Argument[this].SyntheticField[java.rmi.dgc.Lease.vmid]", "ReturnValue", "value", "dfc-generated"]
   - addsTo:
       pack: codeql/java-all
       extensible: neutralModel
diff --git a/java/ql/lib/ext/generated/java.rmi.model.yml b/java/ql/lib/ext/generated/java.rmi.model.yml
index 0eed9da9bab..b5c6de8902c 100644
--- a/java/ql/lib/ext/generated/java.rmi.model.yml
+++ b/java/ql/lib/ext/generated/java.rmi.model.yml
@@ -5,18 +5,14 @@ extensions:
       extensible: summaryModel
     data:
       - ["java.rmi", "AccessException", True, "AccessException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.rmi", "AccessException", True, "AccessException", "(String,Exception)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.rmi", "AccessException", True, "AccessException", "(String,Exception)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.rmi", "AccessException", True, "AccessException", "(String,Exception)", "", "Argument[1]", "Argument[this].Field[java.rmi.RemoteException.detail]", "value", "dfc-generated"]
       - ["java.rmi", "AlreadyBoundException", True, "AlreadyBoundException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.rmi", "ConnectException", True, "ConnectException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.rmi", "ConnectException", True, "ConnectException", "(String,Exception)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.rmi", "ConnectException", True, "ConnectException", "(String,Exception)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.rmi", "ConnectException", True, "ConnectException", "(String,Exception)", "", "Argument[1]", "Argument[this].Field[java.rmi.RemoteException.detail]", "value", "dfc-generated"]
       - ["java.rmi", "ConnectIOException", True, "ConnectIOException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.rmi", "ConnectIOException", True, "ConnectIOException", "(String,Exception)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.rmi", "ConnectIOException", True, "ConnectIOException", "(String,Exception)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.rmi", "ConnectIOException", True, "ConnectIOException", "(String,Exception)", "", "Argument[1]", "Argument[this].Field[java.rmi.RemoteException.detail]", "value", "dfc-generated"]
       - ["java.rmi", "MarshalException", True, "MarshalException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.rmi", "MarshalException", True, "MarshalException", "(String,Exception)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.rmi", "MarshalException", True, "MarshalException", "(String,Exception)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.rmi", "MarshalException", True, "MarshalException", "(String,Exception)", "", "Argument[1]", "Argument[this].Field[java.rmi.RemoteException.detail]", "value", "dfc-generated"]
       - ["java.rmi", "MarshalledObject", False, "get", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.rmi", "Naming", False, "list", "(String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["java.rmi", "NoSuchObjectException", True, "NoSuchObjectException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
@@ -24,27 +20,19 @@ extensions:
       - ["java.rmi", "RMISecurityException", True, "RMISecurityException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.rmi", "RMISecurityException", True, "RMISecurityException", "(String,String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.rmi", "RemoteException", True, "RemoteException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.rmi", "RemoteException", True, "RemoteException", "(String,Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.rmi", "RemoteException", True, "RemoteException", "(String,Throwable)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["java.rmi", "ServerError", True, "ServerError", "(String,Error)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.rmi", "ServerError", True, "ServerError", "(String,Error)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.rmi", "RemoteException", True, "RemoteException", "(String,Throwable)", "", "Argument[1]", "Argument[this].Field[java.rmi.RemoteException.detail]", "value", "dfc-generated"]
+      - ["java.rmi", "ServerError", True, "ServerError", "(String,Error)", "", "Argument[1]", "Argument[this].Field[java.rmi.RemoteException.detail]", "value", "dfc-generated"]
       - ["java.rmi", "ServerException", True, "ServerException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.rmi", "ServerException", True, "ServerException", "(String,Exception)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.rmi", "ServerException", True, "ServerException", "(String,Exception)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["java.rmi", "ServerRuntimeException", True, "ServerRuntimeException", "(String,Exception)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.rmi", "ServerRuntimeException", True, "ServerRuntimeException", "(String,Exception)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.rmi", "ServerException", True, "ServerException", "(String,Exception)", "", "Argument[1]", "Argument[this].Field[java.rmi.RemoteException.detail]", "value", "dfc-generated"]
+      - ["java.rmi", "ServerRuntimeException", True, "ServerRuntimeException", "(String,Exception)", "", "Argument[1]", "Argument[this].Field[java.rmi.RemoteException.detail]", "value", "dfc-generated"]
       - ["java.rmi", "StubNotFoundException", True, "StubNotFoundException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.rmi", "StubNotFoundException", True, "StubNotFoundException", "(String,Exception)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.rmi", "StubNotFoundException", True, "StubNotFoundException", "(String,Exception)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.rmi", "StubNotFoundException", True, "StubNotFoundException", "(String,Exception)", "", "Argument[1]", "Argument[this].Field[java.rmi.RemoteException.detail]", "value", "dfc-generated"]
       - ["java.rmi", "UnexpectedException", True, "UnexpectedException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.rmi", "UnexpectedException", True, "UnexpectedException", "(String,Exception)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.rmi", "UnexpectedException", True, "UnexpectedException", "(String,Exception)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.rmi", "UnexpectedException", True, "UnexpectedException", "(String,Exception)", "", "Argument[1]", "Argument[this].Field[java.rmi.RemoteException.detail]", "value", "dfc-generated"]
       - ["java.rmi", "UnknownHostException", True, "UnknownHostException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.rmi", "UnknownHostException", True, "UnknownHostException", "(String,Exception)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.rmi", "UnknownHostException", True, "UnknownHostException", "(String,Exception)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.rmi", "UnknownHostException", True, "UnknownHostException", "(String,Exception)", "", "Argument[1]", "Argument[this].Field[java.rmi.RemoteException.detail]", "value", "dfc-generated"]
       - ["java.rmi", "UnmarshalException", True, "UnmarshalException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.rmi", "UnmarshalException", True, "UnmarshalException", "(String,Exception)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.rmi", "UnmarshalException", True, "UnmarshalException", "(String,Exception)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.rmi", "UnmarshalException", True, "UnmarshalException", "(String,Exception)", "", "Argument[1]", "Argument[this].Field[java.rmi.RemoteException.detail]", "value", "dfc-generated"]
   - addsTo:
       pack: codeql/java-all
       extensible: neutralModel
diff --git a/java/ql/lib/ext/generated/java.rmi.registry.model.yml b/java/ql/lib/ext/generated/java.rmi.registry.model.yml
index 5594ea1dc32..b0a0f2b07b8 100644
--- a/java/ql/lib/ext/generated/java.rmi.registry.model.yml
+++ b/java/ql/lib/ext/generated/java.rmi.registry.model.yml
@@ -1,5 +1,15 @@
 # THIS FILE IS AN AUTO-GENERATED MODELS AS DATA FILE. DO NOT EDIT.
 extensions:
+  - addsTo:
+      pack: codeql/java-all
+      extensible: summaryModel
+    data:
+      - ["java.rmi.registry", "Registry", True, "bind", "(String,Remote)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.rmi.registry", "Registry", True, "bind", "(String,Remote)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.rmi.registry", "Registry", True, "list", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.rmi.registry", "Registry", True, "lookup", "(String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.rmi.registry", "Registry", True, "rebind", "(String,Remote)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.rmi.registry", "Registry", True, "rebind", "(String,Remote)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
   - addsTo:
       pack: codeql/java-all
       extensible: neutralModel
diff --git a/java/ql/lib/ext/generated/java.rmi.server.model.yml b/java/ql/lib/ext/generated/java.rmi.server.model.yml
index 4fefb533828..93ff1d281d0 100644
--- a/java/ql/lib/ext/generated/java.rmi.server.model.yml
+++ b/java/ql/lib/ext/generated/java.rmi.server.model.yml
@@ -5,31 +5,32 @@ extensions:
       extensible: summaryModel
     data:
       - ["java.rmi.server", "ExportException", True, "ExportException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.rmi.server", "ExportException", True, "ExportException", "(String,Exception)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.rmi.server", "ExportException", True, "ExportException", "(String,Exception)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["java.rmi.server", "LogStream", True, "getOutputStream", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.rmi.server", "ExportException", True, "ExportException", "(String,Exception)", "", "Argument[1]", "Argument[this].Field[java.rmi.RemoteException.detail]", "value", "dfc-generated"]
+      - ["java.rmi.server", "LogStream", True, "getOutputStream", "()", "", "Argument[this].SyntheticField[java.rmi.server.LogStream.logOut]", "ReturnValue", "value", "dfc-generated"]
       - ["java.rmi.server", "LogStream", True, "log", "(String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["java.rmi.server", "LogStream", True, "setOutputStream", "(OutputStream)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.rmi.server", "Operation", True, "Operation", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.rmi.server", "Operation", True, "getOperation", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.rmi.server", "RMIClassLoader", True, "getClassLoader", "(String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.rmi.server", "LogStream", True, "setOutputStream", "(OutputStream)", "", "Argument[0]", "Argument[this].SyntheticField[java.rmi.server.LogStream.logOut]", "value", "dfc-generated"]
+      - ["java.rmi.server", "Operation", True, "Operation", "(String)", "", "Argument[0]", "Argument[this].SyntheticField[java.rmi.server.Operation.operation]", "value", "dfc-generated"]
+      - ["java.rmi.server", "Operation", True, "getOperation", "()", "", "Argument[this].SyntheticField[java.rmi.server.Operation.operation]", "ReturnValue", "value", "dfc-generated"]
       - ["java.rmi.server", "RMIClassLoader", True, "getSecurityContext", "(ClassLoader)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["java.rmi.server", "RMIClassLoaderSpi", True, "getClassLoader", "(String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["java.rmi.server", "RMIClientSocketFactory", True, "createSocket", "(String,int)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.rmi.server", "RMIServerSocketFactory", True, "createServerSocket", "(int)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.rmi.server", "RemoteCall", True, "getInputStream", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.rmi.server", "RemoteCall", True, "getOutputStream", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.rmi.server", "RemoteCall", True, "getResultStream", "(boolean)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.rmi.server", "RemoteObject", True, "getRef", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.rmi.server", "RemoteObject", True, "toStub", "(Remote)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.rmi.server", "RemoteObject", True, "toStub", "(Remote)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
       - ["java.rmi.server", "RemoteObjectInvocationHandler", True, "RemoteObjectInvocationHandler", "(RemoteRef)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.rmi.server", "RemoteRef", True, "newCall", "(RemoteObject,Operation[],int,long)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.rmi.server", "RemoteRef", True, "remoteToString", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.rmi.server", "ServerCloneException", True, "ServerCloneException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.rmi.server", "ServerCloneException", True, "ServerCloneException", "(String,Exception)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.rmi.server", "ServerCloneException", True, "ServerCloneException", "(String,Exception)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.rmi.server", "ServerCloneException", True, "ServerCloneException", "(String,Exception)", "", "Argument[1]", "Argument[this].Field[java.rmi.server.ServerCloneException.detail]", "value", "dfc-generated"]
       - ["java.rmi.server", "ServerNotActiveException", True, "ServerNotActiveException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.rmi.server", "Skeleton", True, "dispatch", "(Remote,RemoteCall,int,long)", "", "Argument[1]", "Argument[0]", "taint", "df-generated"]
       - ["java.rmi.server", "SkeletonMismatchException", True, "SkeletonMismatchException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.rmi.server", "SkeletonNotFoundException", True, "SkeletonNotFoundException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.rmi.server", "SkeletonNotFoundException", True, "SkeletonNotFoundException", "(String,Exception)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.rmi.server", "SkeletonNotFoundException", True, "SkeletonNotFoundException", "(String,Exception)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.rmi.server", "SkeletonNotFoundException", True, "SkeletonNotFoundException", "(String,Exception)", "", "Argument[1]", "Argument[this].Field[java.rmi.RemoteException.detail]", "value", "dfc-generated"]
       - ["java.rmi.server", "SocketSecurityException", True, "SocketSecurityException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.rmi.server", "SocketSecurityException", True, "SocketSecurityException", "(String,Exception)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.rmi.server", "SocketSecurityException", True, "SocketSecurityException", "(String,Exception)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.rmi.server", "SocketSecurityException", True, "SocketSecurityException", "(String,Exception)", "", "Argument[1]", "Argument[this].Field[java.rmi.RemoteException.detail]", "value", "dfc-generated"]
       - ["java.rmi.server", "UnicastRemoteObject", True, "exportObject", "(Remote,int,ObjectInputFilter)", "", "Argument[2]", "Argument[0]", "taint", "df-generated"]
       - ["java.rmi.server", "UnicastRemoteObject", True, "exportObject", "(Remote,int,RMIClientSocketFactory,RMIServerSocketFactory,ObjectInputFilter)", "", "Argument[4]", "Argument[0]", "taint", "df-generated"]
   - addsTo:
@@ -43,6 +44,7 @@ extensions:
       - ["java.rmi.server", "ObjID", "read", "(ObjectInput)", "summary", "df-generated"]
       - ["java.rmi.server", "ObjID", "write", "(ObjectOutput)", "summary", "df-generated"]
       - ["java.rmi.server", "RMIClassLoader", "getClassAnnotation", "(Class)", "summary", "df-generated"]
+      - ["java.rmi.server", "RMIClassLoader", "getClassLoader", "(String)", "summary", "df-generated"]
       - ["java.rmi.server", "RMIClassLoader", "getDefaultProviderInstance", "()", "summary", "df-generated"]
       - ["java.rmi.server", "RMIClassLoader", "loadClass", "(String)", "summary", "df-generated"]
       - ["java.rmi.server", "RMIClassLoader", "loadClass", "(String,String)", "summary", "df-generated"]
@@ -50,9 +52,9 @@ extensions:
       - ["java.rmi.server", "RMIClassLoader", "loadClass", "(URL,String)", "summary", "df-generated"]
       - ["java.rmi.server", "RMIClassLoader", "loadProxyClass", "(String,String[],ClassLoader)", "summary", "df-generated"]
       - ["java.rmi.server", "RMIClassLoaderSpi", "getClassAnnotation", "(Class)", "summary", "df-generated"]
+      - ["java.rmi.server", "RMIClassLoaderSpi", "getClassLoader", "(String)", "summary", "df-generated"]
       - ["java.rmi.server", "RMIClassLoaderSpi", "loadClass", "(String,String,ClassLoader)", "summary", "df-generated"]
       - ["java.rmi.server", "RMIClassLoaderSpi", "loadProxyClass", "(String,String[],ClassLoader)", "summary", "df-generated"]
-      - ["java.rmi.server", "RMIServerSocketFactory", "createServerSocket", "(int)", "summary", "df-generated"]
       - ["java.rmi.server", "RMISocketFactory", "getDefaultSocketFactory", "()", "summary", "df-generated"]
       - ["java.rmi.server", "RMISocketFactory", "getFailureHandler", "()", "summary", "df-generated"]
       - ["java.rmi.server", "RMISocketFactory", "getSocketFactory", "()", "summary", "df-generated"]
@@ -68,4 +70,3 @@ extensions:
       - ["java.rmi.server", "UnicastRemoteObject", "exportObject", "(Remote,int)", "summary", "df-generated"]
       - ["java.rmi.server", "UnicastRemoteObject", "exportObject", "(Remote,int,RMIClientSocketFactory,RMIServerSocketFactory)", "summary", "df-generated"]
       - ["java.rmi.server", "UnicastRemoteObject", "unexportObject", "(Remote,boolean)", "summary", "df-generated"]
-      - ["java.rmi.server", "Unreferenced", "unreferenced", "()", "summary", "df-generated"]
diff --git a/java/ql/lib/ext/generated/java.security.cert.model.yml b/java/ql/lib/ext/generated/java.security.cert.model.yml
index 7f08c1a7d20..103de45206e 100644
--- a/java/ql/lib/ext/generated/java.security.cert.model.yml
+++ b/java/ql/lib/ext/generated/java.security.cert.model.yml
@@ -9,45 +9,47 @@ extensions:
       - ["java.security.cert", "CRLException", True, "CRLException", "(String,Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.security.cert", "CRLException", True, "CRLException", "(String,Throwable)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
       - ["java.security.cert", "CRLException", True, "CRLException", "(Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security.cert", "CertPath", True, "getCertificates", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.security.cert", "CertPath", True, "getType", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.security.cert", "CertPathBuilder", True, "build", "(CertPathParameters)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.security.cert", "CertPathBuilder", True, "getAlgorithm", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.security.cert", "CertPathBuilder", True, "getInstance", "(String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["java.security.cert", "CertPathBuilder", True, "getInstance", "(String,Provider)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["java.security.cert", "CertPathBuilder", True, "getInstance", "(String,Provider)", "", "Argument[1].Element", "ReturnValue", "taint", "df-generated"]
-      - ["java.security.cert", "CertPathBuilder", True, "getInstance", "(String,String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security.cert", "CertPathBuilder", True, "getAlgorithm", "()", "", "Argument[this].SyntheticField[java.security.cert.CertPathBuilder.algorithm]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.security.cert", "CertPathBuilder", True, "getInstance", "(String)", "", "Argument[0]", "ReturnValue.SyntheticField[java.security.cert.CertPathBuilder.algorithm]", "value", "dfc-generated"]
+      - ["java.security.cert", "CertPathBuilder", True, "getInstance", "(String,Provider)", "", "Argument[0]", "ReturnValue.SyntheticField[java.security.cert.CertPathBuilder.algorithm]", "value", "dfc-generated"]
+      - ["java.security.cert", "CertPathBuilder", True, "getInstance", "(String,String)", "", "Argument[0]", "ReturnValue.SyntheticField[java.security.cert.CertPathBuilder.algorithm]", "value", "dfc-generated"]
       - ["java.security.cert", "CertPathBuilder", True, "getProvider", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.security.cert", "CertPathBuilderException", True, "CertPathBuilderException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.security.cert", "CertPathBuilderException", True, "CertPathBuilderException", "(String,Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.security.cert", "CertPathBuilderException", True, "CertPathBuilderException", "(String,Throwable)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
       - ["java.security.cert", "CertPathBuilderException", True, "CertPathBuilderException", "(Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.security.cert", "CertPathBuilderResult", True, "getCertPath", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.security.cert", "CertPathValidator", True, "getAlgorithm", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.security.cert", "CertPathValidator", True, "getInstance", "(String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["java.security.cert", "CertPathValidator", True, "getInstance", "(String,Provider)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["java.security.cert", "CertPathValidator", True, "getInstance", "(String,Provider)", "", "Argument[1].Element", "ReturnValue", "taint", "df-generated"]
-      - ["java.security.cert", "CertPathValidator", True, "getInstance", "(String,String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security.cert", "CertPathBuilderSpi", True, "engineBuild", "(CertPathParameters)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security.cert", "CertPathBuilderSpi", True, "engineBuild", "(CertPathParameters)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security.cert", "CertPathValidator", True, "getAlgorithm", "()", "", "Argument[this].SyntheticField[java.security.cert.CertPathValidator.algorithm]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.security.cert", "CertPathValidator", True, "getInstance", "(String)", "", "Argument[0]", "ReturnValue.SyntheticField[java.security.cert.CertPathValidator.algorithm]", "value", "dfc-generated"]
+      - ["java.security.cert", "CertPathValidator", True, "getInstance", "(String,Provider)", "", "Argument[0]", "ReturnValue.SyntheticField[java.security.cert.CertPathValidator.algorithm]", "value", "dfc-generated"]
+      - ["java.security.cert", "CertPathValidator", True, "getInstance", "(String,String)", "", "Argument[0]", "ReturnValue.SyntheticField[java.security.cert.CertPathValidator.algorithm]", "value", "dfc-generated"]
       - ["java.security.cert", "CertPathValidator", True, "getProvider", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.security.cert", "CertPathValidator", True, "validate", "(CertPath,CertPathParameters)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
       - ["java.security.cert", "CertPathValidatorException", True, "CertPathValidatorException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.security.cert", "CertPathValidatorException", True, "CertPathValidatorException", "(String,Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.security.cert", "CertPathValidatorException", True, "CertPathValidatorException", "(String,Throwable)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["java.security.cert", "CertPathValidatorException", True, "CertPathValidatorException", "(String,Throwable,CertPath,int)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.security.cert", "CertPathValidatorException", True, "CertPathValidatorException", "(String,Throwable,CertPath,int)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["java.security.cert", "CertPathValidatorException", True, "CertPathValidatorException", "(String,Throwable,CertPath,int)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
-      - ["java.security.cert", "CertPathValidatorException", True, "CertPathValidatorException", "(String,Throwable,CertPath,int,CertPathValidatorException$Reason)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.security.cert", "CertPathValidatorException", True, "CertPathValidatorException", "(String,Throwable,CertPath,int,CertPathValidatorException$Reason)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["java.security.cert", "CertPathValidatorException", True, "CertPathValidatorException", "(String,Throwable,CertPath,int,CertPathValidatorException$Reason)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
-      - ["java.security.cert", "CertPathValidatorException", True, "CertPathValidatorException", "(String,Throwable,CertPath,int,CertPathValidatorException$Reason)", "", "Argument[4]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security.cert", "CertPathValidatorException", True, "CertPathValidatorException", "(String,Throwable,CertPath,int)", "", "Argument[2]", "Argument[this].SyntheticField[java.security.cert.CertPathValidatorException.certPath]", "value", "dfc-generated"]
+      - ["java.security.cert", "CertPathValidatorException", True, "CertPathValidatorException", "(String,Throwable,CertPath,int,CertPathValidatorException$Reason)", "", "Argument[2]", "Argument[this].SyntheticField[java.security.cert.CertPathValidatorException.certPath]", "value", "dfc-generated"]
+      - ["java.security.cert", "CertPathValidatorException", True, "CertPathValidatorException", "(String,Throwable,CertPath,int,CertPathValidatorException$Reason)", "", "Argument[4]", "Argument[this].SyntheticField[java.security.cert.CertPathValidatorException.reason]", "value", "dfc-generated"]
       - ["java.security.cert", "CertPathValidatorException", True, "CertPathValidatorException", "(Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.security.cert", "CertPathValidatorException", True, "getCertPath", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.security.cert", "CertPathValidatorException", True, "getReason", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security.cert", "CertPathValidatorException", True, "getCertPath", "()", "", "Argument[this].SyntheticField[java.security.cert.CertPathValidatorException.certPath]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.security.cert", "CertPathValidatorException", True, "getReason", "()", "", "Argument[this].SyntheticField[java.security.cert.CertPathValidatorException.reason]", "ReturnValue", "value", "dfc-generated"]
       - ["java.security.cert", "CertStore", True, "getCertStoreParameters", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.security.cert", "CertStoreException", True, "CertStoreException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.security.cert", "CertStoreException", True, "CertStoreException", "(String,Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.security.cert", "CertStoreException", True, "CertStoreException", "(String,Throwable)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
       - ["java.security.cert", "CertStoreException", True, "CertStoreException", "(Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security.cert", "CertStoreSpi", True, "engineGetCRLs", "(CRLSelector)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security.cert", "CertStoreSpi", True, "engineGetCertificates", "(CertSelector)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security.cert", "Certificate", True, "getEncoded", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.security.cert", "Certificate", True, "getType", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security.cert", "Certificate", True, "verify", "(PublicKey)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security.cert", "Certificate", True, "verify", "(PublicKey,Provider)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security.cert", "Certificate", True, "verify", "(PublicKey,String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security.cert", "Certificate", True, "verify", "(PublicKey,String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
       - ["java.security.cert", "CertificateEncodingException", True, "CertificateEncodingException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.security.cert", "CertificateEncodingException", True, "CertificateEncodingException", "(String,Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.security.cert", "CertificateEncodingException", True, "CertificateEncodingException", "(String,Throwable)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
@@ -57,142 +59,160 @@ extensions:
       - ["java.security.cert", "CertificateException", True, "CertificateException", "(String,Throwable)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
       - ["java.security.cert", "CertificateException", True, "CertificateException", "(Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.security.cert", "CertificateExpiredException", True, "CertificateExpiredException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security.cert", "CertificateFactorySpi", True, "engineGenerateCertPath", "(List)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
+      - ["java.security.cert", "CertificateFactorySpi", True, "engineGenerateCertificate", "(InputStream)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["java.security.cert", "CertificateNotYetValidException", True, "CertificateNotYetValidException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.security.cert", "CertificateParsingException", True, "CertificateParsingException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.security.cert", "CertificateParsingException", True, "CertificateParsingException", "(String,Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.security.cert", "CertificateParsingException", True, "CertificateParsingException", "(String,Throwable)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
       - ["java.security.cert", "CertificateParsingException", True, "CertificateParsingException", "(Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.security.cert", "CertificateRevokedException", True, "CertificateRevokedException", "(Date,CRLReason,X500Principal,Map)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
-      - ["java.security.cert", "CertificateRevokedException", True, "CertificateRevokedException", "(Date,CRLReason,X500Principal,Map)", "", "Argument[3].Element", "Argument[this]", "taint", "df-generated"]
-      - ["java.security.cert", "CertificateRevokedException", True, "getAuthorityName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.security.cert", "CertificateRevokedException", True, "getExtensions", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security.cert", "CertificateRevokedException", True, "CertificateRevokedException", "(Date,CRLReason,X500Principal,Map)", "", "Argument[2]", "Argument[this].SyntheticField[java.security.cert.CertificateRevokedException.authority]", "value", "dfc-generated"]
+      - ["java.security.cert", "CertificateRevokedException", True, "CertificateRevokedException", "(Date,CRLReason,X500Principal,Map)", "", "Argument[3].MapKey", "Argument[this].SyntheticField[java.security.cert.CertificateRevokedException.extensions].MapKey", "value", "dfc-generated"]
+      - ["java.security.cert", "CertificateRevokedException", True, "CertificateRevokedException", "(Date,CRLReason,X500Principal,Map)", "", "Argument[3].MapValue", "Argument[this].SyntheticField[java.security.cert.CertificateRevokedException.extensions].MapValue", "value", "dfc-generated"]
+      - ["java.security.cert", "CertificateRevokedException", True, "getAuthorityName", "()", "", "Argument[this].SyntheticField[java.security.cert.CertificateRevokedException.authority]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.security.cert", "CertificateRevokedException", True, "getExtensions", "()", "", "Argument[this].SyntheticField[java.security.cert.CertificateRevokedException.extensions].MapKey", "ReturnValue.MapKey", "value", "dfc-generated"]
+      - ["java.security.cert", "CertificateRevokedException", True, "getExtensions", "()", "", "Argument[this].SyntheticField[java.security.cert.CertificateRevokedException.extensions].MapValue", "ReturnValue.MapValue", "value", "dfc-generated"]
       - ["java.security.cert", "CertificateRevokedException", True, "getRevocationDate", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.security.cert", "CollectionCertStoreParameters", True, "CollectionCertStoreParameters", "(Collection)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["java.security.cert", "CollectionCertStoreParameters", True, "getCollection", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.security.cert", "LDAPCertStoreParameters", True, "LDAPCertStoreParameters", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.security.cert", "LDAPCertStoreParameters", True, "LDAPCertStoreParameters", "(String,int)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.security.cert", "LDAPCertStoreParameters", True, "getServerName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security.cert", "CollectionCertStoreParameters", True, "CollectionCertStoreParameters", "(Collection)", "", "Argument[0]", "Argument[this].SyntheticField[java.security.cert.CollectionCertStoreParameters.coll]", "value", "dfc-generated"]
+      - ["java.security.cert", "CollectionCertStoreParameters", True, "getCollection", "()", "", "Argument[this].SyntheticField[java.security.cert.CollectionCertStoreParameters.coll]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.security.cert", "Extension", True, "encode", "(OutputStream)", "", "Argument[this]", "Argument[0]", "taint", "df-generated"]
+      - ["java.security.cert", "Extension", True, "getId", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security.cert", "Extension", True, "getValue", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security.cert", "LDAPCertStoreParameters", True, "LDAPCertStoreParameters", "(String)", "", "Argument[0]", "Argument[this].SyntheticField[java.security.cert.LDAPCertStoreParameters.serverName]", "value", "dfc-generated"]
+      - ["java.security.cert", "LDAPCertStoreParameters", True, "LDAPCertStoreParameters", "(String,int)", "", "Argument[0]", "Argument[this].SyntheticField[java.security.cert.LDAPCertStoreParameters.serverName]", "value", "dfc-generated"]
+      - ["java.security.cert", "LDAPCertStoreParameters", True, "getServerName", "()", "", "Argument[this].SyntheticField[java.security.cert.LDAPCertStoreParameters.serverName]", "ReturnValue", "value", "dfc-generated"]
       - ["java.security.cert", "PKIXBuilderParameters", True, "PKIXBuilderParameters", "(KeyStore,CertSelector)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["java.security.cert", "PKIXBuilderParameters", True, "PKIXBuilderParameters", "(Set,CertSelector)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
       - ["java.security.cert", "PKIXBuilderParameters", True, "PKIXBuilderParameters", "(Set,CertSelector)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["java.security.cert", "PKIXCertPathBuilderResult", True, "PKIXCertPathBuilderResult", "(CertPath,TrustAnchor,PolicyNode,PublicKey)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.security.cert", "PKIXCertPathBuilderResult", True, "PKIXCertPathBuilderResult", "(CertPath,TrustAnchor,PolicyNode,PublicKey)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["java.security.cert", "PKIXCertPathBuilderResult", True, "PKIXCertPathBuilderResult", "(CertPath,TrustAnchor,PolicyNode,PublicKey)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
-      - ["java.security.cert", "PKIXCertPathBuilderResult", True, "PKIXCertPathBuilderResult", "(CertPath,TrustAnchor,PolicyNode,PublicKey)", "", "Argument[3]", "Argument[this]", "taint", "df-generated"]
-      - ["java.security.cert", "PKIXCertPathValidatorResult", True, "PKIXCertPathValidatorResult", "(TrustAnchor,PolicyNode,PublicKey)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.security.cert", "PKIXCertPathValidatorResult", True, "PKIXCertPathValidatorResult", "(TrustAnchor,PolicyNode,PublicKey)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["java.security.cert", "PKIXCertPathValidatorResult", True, "PKIXCertPathValidatorResult", "(TrustAnchor,PolicyNode,PublicKey)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
-      - ["java.security.cert", "PKIXCertPathValidatorResult", True, "getPolicyTree", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.security.cert", "PKIXCertPathValidatorResult", True, "getPublicKey", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.security.cert", "PKIXCertPathValidatorResult", True, "getTrustAnchor", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security.cert", "PKIXCertPathBuilderResult", True, "PKIXCertPathBuilderResult", "(CertPath,TrustAnchor,PolicyNode,PublicKey)", "", "Argument[0]", "Argument[this].SyntheticField[java.security.cert.PKIXCertPathBuilderResult.certPath]", "value", "dfc-generated"]
+      - ["java.security.cert", "PKIXCertPathBuilderResult", True, "getCertPath", "()", "", "Argument[this].SyntheticField[java.security.cert.PKIXCertPathBuilderResult.certPath]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.security.cert", "PKIXCertPathChecker", True, "check", "(Certificate,Collection)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security.cert", "PKIXCertPathChecker", True, "check", "(Certificate,Collection)", "", "Argument[this]", "Argument[0]", "taint", "df-generated"]
+      - ["java.security.cert", "PKIXCertPathChecker", True, "getSupportedExtensions", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security.cert", "PKIXCertPathValidatorResult", True, "PKIXCertPathValidatorResult", "(TrustAnchor,PolicyNode,PublicKey)", "", "Argument[0]", "Argument[this].SyntheticField[java.security.cert.PKIXCertPathValidatorResult.trustAnchor]", "value", "dfc-generated"]
+      - ["java.security.cert", "PKIXCertPathValidatorResult", True, "PKIXCertPathValidatorResult", "(TrustAnchor,PolicyNode,PublicKey)", "", "Argument[1]", "Argument[this].SyntheticField[java.security.cert.PKIXCertPathValidatorResult.policyTree]", "value", "dfc-generated"]
+      - ["java.security.cert", "PKIXCertPathValidatorResult", True, "PKIXCertPathValidatorResult", "(TrustAnchor,PolicyNode,PublicKey)", "", "Argument[2]", "Argument[this].SyntheticField[java.security.cert.PKIXCertPathValidatorResult.subjectPublicKey]", "value", "dfc-generated"]
+      - ["java.security.cert", "PKIXCertPathValidatorResult", True, "getPolicyTree", "()", "", "Argument[this].SyntheticField[java.security.cert.PKIXCertPathValidatorResult.policyTree]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.security.cert", "PKIXCertPathValidatorResult", True, "getPublicKey", "()", "", "Argument[this].SyntheticField[java.security.cert.PKIXCertPathValidatorResult.subjectPublicKey]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.security.cert", "PKIXCertPathValidatorResult", True, "getTrustAnchor", "()", "", "Argument[this].SyntheticField[java.security.cert.PKIXCertPathValidatorResult.trustAnchor]", "ReturnValue", "value", "dfc-generated"]
       - ["java.security.cert", "PKIXParameters", True, "setInitialPolicies", "(Set)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["java.security.cert", "PKIXRevocationChecker", True, "getOcspExtensions", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.security.cert", "PKIXRevocationChecker", True, "getOcspResponder", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.security.cert", "PKIXRevocationChecker", True, "getOcspResponderCert", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security.cert", "PKIXParameters", True, "setTargetCertConstraints", "(CertSelector)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security.cert", "PKIXRevocationChecker", True, "getOcspExtensions", "()", "", "Argument[this].SyntheticField[java.security.cert.PKIXRevocationChecker.ocspExtensions].Element", "ReturnValue.Element", "value", "dfc-generated"]
+      - ["java.security.cert", "PKIXRevocationChecker", True, "getOcspResponder", "()", "", "Argument[this].SyntheticField[java.security.cert.PKIXRevocationChecker.ocspResponder]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.security.cert", "PKIXRevocationChecker", True, "getOcspResponderCert", "()", "", "Argument[this].SyntheticField[java.security.cert.PKIXRevocationChecker.ocspResponderCert]", "ReturnValue", "value", "dfc-generated"]
       - ["java.security.cert", "PKIXRevocationChecker", True, "getOcspResponses", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.security.cert", "PKIXRevocationChecker", True, "getOptions", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.security.cert", "PKIXRevocationChecker", True, "setOcspExtensions", "(List)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["java.security.cert", "PKIXRevocationChecker", True, "setOcspResponder", "(URI)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.security.cert", "PKIXRevocationChecker", True, "setOcspResponderCert", "(X509Certificate)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security.cert", "PKIXRevocationChecker", True, "getOptions", "()", "", "Argument[this].SyntheticField[java.security.cert.PKIXRevocationChecker.options].Element", "ReturnValue.Element", "value", "dfc-generated"]
+      - ["java.security.cert", "PKIXRevocationChecker", True, "getSoftFailExceptions", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security.cert", "PKIXRevocationChecker", True, "setOcspExtensions", "(List)", "", "Argument[0].Element", "Argument[this].SyntheticField[java.security.cert.PKIXRevocationChecker.ocspExtensions].Element", "value", "dfc-generated"]
+      - ["java.security.cert", "PKIXRevocationChecker", True, "setOcspResponder", "(URI)", "", "Argument[0]", "Argument[this].SyntheticField[java.security.cert.PKIXRevocationChecker.ocspResponder]", "value", "dfc-generated"]
+      - ["java.security.cert", "PKIXRevocationChecker", True, "setOcspResponderCert", "(X509Certificate)", "", "Argument[0]", "Argument[this].SyntheticField[java.security.cert.PKIXRevocationChecker.ocspResponderCert]", "value", "dfc-generated"]
       - ["java.security.cert", "PKIXRevocationChecker", True, "setOcspResponses", "(Map)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["java.security.cert", "PKIXRevocationChecker", True, "setOptions", "(Set)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["java.security.cert", "PolicyQualifierInfo", True, "PolicyQualifierInfo", "(byte[])", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.security.cert", "PolicyQualifierInfo", True, "getEncoded", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security.cert", "PKIXRevocationChecker", True, "setOptions", "(Set)", "", "Argument[0].Element", "Argument[this].SyntheticField[java.security.cert.PKIXRevocationChecker.options].Element", "value", "dfc-generated"]
+      - ["java.security.cert", "PolicyNode", True, "getChildren", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security.cert", "PolicyNode", True, "getExpectedPolicies", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security.cert", "PolicyNode", True, "getParent", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security.cert", "PolicyNode", True, "getPolicyQualifiers", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security.cert", "PolicyNode", True, "getValidPolicy", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security.cert", "PolicyQualifierInfo", True, "PolicyQualifierInfo", "(byte[])", "", "Argument[0]", "Argument[this].SyntheticField[java.security.cert.PolicyQualifierInfo.mEncoded]", "value", "dfc-generated"]
+      - ["java.security.cert", "PolicyQualifierInfo", True, "getEncoded", "()", "", "Argument[this].SyntheticField[java.security.cert.PolicyQualifierInfo.mEncoded]", "ReturnValue", "value", "dfc-generated"]
       - ["java.security.cert", "PolicyQualifierInfo", True, "getPolicyQualifier", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.security.cert", "PolicyQualifierInfo", True, "getPolicyQualifierId", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.security.cert", "TrustAnchor", True, "TrustAnchor", "(String,PublicKey,byte[])", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.security.cert", "TrustAnchor", True, "TrustAnchor", "(String,PublicKey,byte[])", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["java.security.cert", "TrustAnchor", True, "TrustAnchor", "(String,PublicKey,byte[])", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
-      - ["java.security.cert", "TrustAnchor", True, "TrustAnchor", "(X500Principal,PublicKey,byte[])", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.security.cert", "TrustAnchor", True, "TrustAnchor", "(X500Principal,PublicKey,byte[])", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["java.security.cert", "TrustAnchor", True, "TrustAnchor", "(X500Principal,PublicKey,byte[])", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
-      - ["java.security.cert", "TrustAnchor", True, "TrustAnchor", "(X509Certificate,byte[])", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.security.cert", "TrustAnchor", True, "TrustAnchor", "(X509Certificate,byte[])", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security.cert", "TrustAnchor", True, "TrustAnchor", "(String,PublicKey,byte[])", "", "Argument[0]", "Argument[this].SyntheticField[java.security.cert.TrustAnchor.caName]", "value", "dfc-generated"]
+      - ["java.security.cert", "TrustAnchor", True, "TrustAnchor", "(String,PublicKey,byte[])", "", "Argument[1]", "Argument[this].SyntheticField[java.security.cert.TrustAnchor.pubKey]", "value", "dfc-generated"]
+      - ["java.security.cert", "TrustAnchor", True, "TrustAnchor", "(String,PublicKey,byte[])", "", "Argument[2]", "Argument[this].SyntheticField[java.security.cert.TrustAnchor.ncBytes]", "value", "dfc-generated"]
+      - ["java.security.cert", "TrustAnchor", True, "TrustAnchor", "(X500Principal,PublicKey,byte[])", "", "Argument[1]", "Argument[this].SyntheticField[java.security.cert.TrustAnchor.pubKey]", "value", "dfc-generated"]
+      - ["java.security.cert", "TrustAnchor", True, "TrustAnchor", "(X500Principal,PublicKey,byte[])", "", "Argument[2]", "Argument[this].SyntheticField[java.security.cert.TrustAnchor.ncBytes]", "value", "dfc-generated"]
+      - ["java.security.cert", "TrustAnchor", True, "TrustAnchor", "(X509Certificate,byte[])", "", "Argument[0]", "Argument[this].SyntheticField[java.security.cert.TrustAnchor.trustedCert]", "value", "dfc-generated"]
+      - ["java.security.cert", "TrustAnchor", True, "TrustAnchor", "(X509Certificate,byte[])", "", "Argument[1]", "Argument[this].SyntheticField[java.security.cert.TrustAnchor.ncBytes]", "value", "dfc-generated"]
       - ["java.security.cert", "TrustAnchor", True, "getCA", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.security.cert", "TrustAnchor", True, "getCAName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.security.cert", "TrustAnchor", True, "getCAPublicKey", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.security.cert", "TrustAnchor", True, "getNameConstraints", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.security.cert", "TrustAnchor", True, "getTrustedCert", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.security.cert", "URICertStoreParameters", False, "URICertStoreParameters", "(URI)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.security.cert", "URICertStoreParameters", False, "getURI", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security.cert", "TrustAnchor", True, "getCAName", "()", "", "Argument[this].SyntheticField[java.security.cert.TrustAnchor.caName]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.security.cert", "TrustAnchor", True, "getCAPublicKey", "()", "", "Argument[this].SyntheticField[java.security.cert.TrustAnchor.pubKey]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.security.cert", "TrustAnchor", True, "getNameConstraints", "()", "", "Argument[this].SyntheticField[java.security.cert.TrustAnchor.ncBytes]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.security.cert", "TrustAnchor", True, "getTrustedCert", "()", "", "Argument[this].SyntheticField[java.security.cert.TrustAnchor.trustedCert]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.security.cert", "URICertStoreParameters", False, "URICertStoreParameters", "(URI)", "", "Argument[0]", "Argument[this].SyntheticField[java.security.cert.URICertStoreParameters.uri]", "value", "dfc-generated"]
+      - ["java.security.cert", "URICertStoreParameters", False, "getURI", "()", "", "Argument[this].SyntheticField[java.security.cert.URICertStoreParameters.uri]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.security.cert", "X509CRL", True, "getEncoded", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security.cert", "X509CRL", True, "getIssuerDN", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.security.cert", "X509CRL", True, "getIssuerX500Principal", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security.cert", "X509CRL", True, "getRevokedCertificate", "(BigInteger)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.security.cert", "X509CRL", True, "getRevokedCertificate", "(X509Certificate)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.security.cert", "X509CRLSelector", True, "addIssuer", "(X500Principal)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.security.cert", "X509CRLSelector", True, "addIssuerName", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.security.cert", "X509CRLSelector", True, "addIssuerName", "(byte[])", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.security.cert", "X509CRLSelector", True, "getCertificateChecking", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security.cert", "X509CRL", True, "getRevokedCertificates", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security.cert", "X509CRL", True, "getSigAlgParams", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security.cert", "X509CRL", True, "getSignature", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security.cert", "X509CRL", True, "getTBSCertList", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security.cert", "X509CRL", True, "verify", "(PublicKey)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security.cert", "X509CRL", True, "verify", "(PublicKey,Provider)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security.cert", "X509CRL", True, "verify", "(PublicKey,String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security.cert", "X509CRL", True, "verify", "(PublicKey,String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security.cert", "X509CRLEntry", True, "getCertificateIssuer", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security.cert", "X509CRLEntry", True, "getEncoded", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security.cert", "X509CRLSelector", True, "addIssuer", "(X500Principal)", "", "Argument[0]", "Argument[this].SyntheticField[java.security.cert.X509CRLSelector.issuerX500Principals].Element", "value", "dfc-generated"]
+      - ["java.security.cert", "X509CRLSelector", True, "addIssuerName", "(String)", "", "Argument[0]", "Argument[this].SyntheticField[java.security.cert.X509CRLSelector.issuerNames].Element", "value", "dfc-generated"]
+      - ["java.security.cert", "X509CRLSelector", True, "addIssuerName", "(byte[])", "", "Argument[0]", "Argument[this].SyntheticField[java.security.cert.X509CRLSelector.issuerNames].Element", "value", "dfc-generated"]
+      - ["java.security.cert", "X509CRLSelector", True, "getCertificateChecking", "()", "", "Argument[this].SyntheticField[java.security.cert.X509CRLSelector.certChecking]", "ReturnValue", "value", "dfc-generated"]
       - ["java.security.cert", "X509CRLSelector", True, "getDateAndTime", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.security.cert", "X509CRLSelector", True, "getIssuerNames", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.security.cert", "X509CRLSelector", True, "getIssuers", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.security.cert", "X509CRLSelector", True, "setCertificateChecking", "(X509Certificate)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.security.cert", "X509CRLSelector", True, "setIssuerNames", "(Collection)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["java.security.cert", "X509CRLSelector", True, "setIssuers", "(Collection)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["java.security.cert", "X509CertSelector", True, "getAuthorityKeyIdentifier", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.security.cert", "X509CertSelector", True, "getCertificate", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.security.cert", "X509CertSelector", True, "getCertificateValid", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.security.cert", "X509CertSelector", True, "getExtendedKeyUsage", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.security.cert", "X509CertSelector", True, "getIssuer", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.security.cert", "X509CertSelector", True, "getNameConstraints", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security.cert", "X509CRLSelector", True, "getIssuerNames", "()", "", "Argument[this].SyntheticField[java.security.cert.X509CRLSelector.issuerNames].Element", "ReturnValue.Element", "value", "dfc-generated"]
+      - ["java.security.cert", "X509CRLSelector", True, "getIssuers", "()", "", "Argument[this].SyntheticField[java.security.cert.X509CRLSelector.issuerX500Principals].Element", "ReturnValue.Element", "value", "dfc-generated"]
+      - ["java.security.cert", "X509CRLSelector", True, "setCertificateChecking", "(X509Certificate)", "", "Argument[0]", "Argument[this].SyntheticField[java.security.cert.X509CRLSelector.certChecking]", "value", "dfc-generated"]
+      - ["java.security.cert", "X509CRLSelector", True, "setIssuerNames", "(Collection)", "", "Argument[0].Element", "Argument[this].SyntheticField[java.security.cert.X509CRLSelector.issuerNames].Element", "value", "dfc-generated"]
+      - ["java.security.cert", "X509CRLSelector", True, "setIssuers", "(Collection)", "", "Argument[0].Element", "Argument[this].SyntheticField[java.security.cert.X509CRLSelector.issuerX500Principals].Element", "value", "dfc-generated"]
+      - ["java.security.cert", "X509CertSelector", True, "getAuthorityKeyIdentifier", "()", "", "Argument[this].SyntheticField[java.security.cert.X509CertSelector.authorityKeyID]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.security.cert", "X509CertSelector", True, "getCertificate", "()", "", "Argument[this].SyntheticField[java.security.cert.X509CertSelector.x509Cert]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.security.cert", "X509CertSelector", True, "getCertificateValid", "()", "", "Argument[this].SyntheticField[java.security.cert.X509CertSelector.certificateValid]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.security.cert", "X509CertSelector", True, "getExtendedKeyUsage", "()", "", "Argument[this].SyntheticField[java.security.cert.X509CertSelector.keyPurposeSet]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.security.cert", "X509CertSelector", True, "getIssuer", "()", "", "Argument[this].SyntheticField[java.security.cert.X509CertSelector.issuer]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.security.cert", "X509CertSelector", True, "getNameConstraints", "()", "", "Argument[this].SyntheticField[java.security.cert.X509CertSelector.ncBytes]", "ReturnValue", "value", "dfc-generated"]
       - ["java.security.cert", "X509CertSelector", True, "getPathToNames", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.security.cert", "X509CertSelector", True, "getPolicy", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.security.cert", "X509CertSelector", True, "getPrivateKeyValid", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.security.cert", "X509CertSelector", True, "getSubject", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security.cert", "X509CertSelector", True, "getPolicy", "()", "", "Argument[this].SyntheticField[java.security.cert.X509CertSelector.policySet]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.security.cert", "X509CertSelector", True, "getPrivateKeyValid", "()", "", "Argument[this].SyntheticField[java.security.cert.X509CertSelector.privateKeyValid]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.security.cert", "X509CertSelector", True, "getSubject", "()", "", "Argument[this].SyntheticField[java.security.cert.X509CertSelector.subject]", "ReturnValue", "value", "dfc-generated"]
       - ["java.security.cert", "X509CertSelector", True, "getSubjectAlternativeNames", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.security.cert", "X509CertSelector", True, "getSubjectKeyIdentifier", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security.cert", "X509CertSelector", True, "getSubjectKeyIdentifier", "()", "", "Argument[this].SyntheticField[java.security.cert.X509CertSelector.subjectKeyID]", "ReturnValue", "value", "dfc-generated"]
       - ["java.security.cert", "X509CertSelector", True, "getSubjectPublicKey", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.security.cert", "X509CertSelector", True, "getSubjectPublicKeyAlgID", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.security.cert", "X509CertSelector", True, "setAuthorityKeyIdentifier", "(byte[])", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.security.cert", "X509CertSelector", True, "setCertificate", "(X509Certificate)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.security.cert", "X509CertSelector", True, "setCertificateValid", "(Date)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.security.cert", "X509CertSelector", True, "setExtendedKeyUsage", "(Set)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["java.security.cert", "X509CertSelector", True, "setIssuer", "(X500Principal)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.security.cert", "X509CertSelector", True, "setNameConstraints", "(byte[])", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.security.cert", "X509CertSelector", True, "setPolicy", "(Set)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["java.security.cert", "X509CertSelector", True, "setPrivateKeyValid", "(Date)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.security.cert", "X509CertSelector", True, "setSubject", "(X500Principal)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.security.cert", "X509CertSelector", True, "setSubjectKeyIdentifier", "(byte[])", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security.cert", "X509CertSelector", True, "getSubjectPublicKeyAlgID", "()", "", "Argument[this].SyntheticField[java.security.cert.X509CertSelector.subjectPublicKeyAlgID].SyntheticField[sun.security.util.ObjectIdentifier.stringForm]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.security.cert", "X509CertSelector", True, "setAuthorityKeyIdentifier", "(byte[])", "", "Argument[0]", "Argument[this].SyntheticField[java.security.cert.X509CertSelector.authorityKeyID]", "value", "dfc-generated"]
+      - ["java.security.cert", "X509CertSelector", True, "setCertificate", "(X509Certificate)", "", "Argument[0]", "Argument[this].SyntheticField[java.security.cert.X509CertSelector.x509Cert]", "value", "dfc-generated"]
+      - ["java.security.cert", "X509CertSelector", True, "setCertificateValid", "(Date)", "", "Argument[0]", "Argument[this].SyntheticField[java.security.cert.X509CertSelector.certificateValid]", "value", "dfc-generated"]
+      - ["java.security.cert", "X509CertSelector", True, "setExtendedKeyUsage", "(Set)", "", "Argument[0].Element", "Argument[this].SyntheticField[java.security.cert.X509CertSelector.keyPurposeSet].Element", "value", "dfc-generated"]
+      - ["java.security.cert", "X509CertSelector", True, "setIssuer", "(X500Principal)", "", "Argument[0]", "Argument[this].SyntheticField[java.security.cert.X509CertSelector.issuer]", "value", "dfc-generated"]
+      - ["java.security.cert", "X509CertSelector", True, "setNameConstraints", "(byte[])", "", "Argument[0]", "Argument[this].SyntheticField[java.security.cert.X509CertSelector.ncBytes]", "value", "dfc-generated"]
+      - ["java.security.cert", "X509CertSelector", True, "setPolicy", "(Set)", "", "Argument[0].Element", "Argument[this].SyntheticField[java.security.cert.X509CertSelector.policySet].Element", "value", "dfc-generated"]
+      - ["java.security.cert", "X509CertSelector", True, "setPrivateKeyValid", "(Date)", "", "Argument[0]", "Argument[this].SyntheticField[java.security.cert.X509CertSelector.privateKeyValid]", "value", "dfc-generated"]
+      - ["java.security.cert", "X509CertSelector", True, "setSubject", "(X500Principal)", "", "Argument[0]", "Argument[this].SyntheticField[java.security.cert.X509CertSelector.subject]", "value", "dfc-generated"]
+      - ["java.security.cert", "X509CertSelector", True, "setSubjectKeyIdentifier", "(byte[])", "", "Argument[0]", "Argument[this].SyntheticField[java.security.cert.X509CertSelector.subjectKeyID]", "value", "dfc-generated"]
       - ["java.security.cert", "X509CertSelector", True, "setSubjectPublicKey", "(PublicKey)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.security.cert", "X509CertSelector", True, "setSubjectPublicKey", "(byte[])", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.security.cert", "X509CertSelector", True, "setSubjectPublicKeyAlgID", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.security.cert", "X509Certificate", True, "getIssuerX500Principal", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.security.cert", "X509Certificate", True, "getSubjectX500Principal", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security.cert", "X509CertSelector", True, "setSubjectPublicKeyAlgID", "(String)", "", "Argument[0]", "Argument[this].SyntheticField[java.security.cert.X509CertSelector.subjectPublicKeyAlgID].SyntheticField[sun.security.util.ObjectIdentifier.stringForm]", "value", "dfc-generated"]
+      - ["java.security.cert", "X509Certificate", True, "getExtendedKeyUsage", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security.cert", "X509Certificate", True, "getIssuerAlternativeNames", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security.cert", "X509Certificate", True, "getIssuerDN", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security.cert", "X509Certificate", True, "getSigAlgParams", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security.cert", "X509Certificate", True, "getSignature", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security.cert", "X509Certificate", True, "getSubjectAlternativeNames", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security.cert", "X509Certificate", True, "getSubjectDN", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security.cert", "X509Certificate", True, "getTBSCertificate", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
   - addsTo:
       pack: codeql/java-all
       extensible: neutralModel
     data:
       - ["java.security.cert", "CRL", "isRevoked", "(Certificate)", "summary", "df-generated"]
-      - ["java.security.cert", "CRLSelector", "match", "(CRL)", "summary", "df-generated"]
-      - ["java.security.cert", "CertPath", "getCertificates", "()", "summary", "df-generated"]
       - ["java.security.cert", "CertPath", "getEncoded", "()", "summary", "df-generated"]
       - ["java.security.cert", "CertPath", "getEncoded", "(String)", "summary", "df-generated"]
       - ["java.security.cert", "CertPath", "getEncodings", "()", "summary", "df-generated"]
       - ["java.security.cert", "CertPathBuilder", "getDefaultType", "()", "summary", "df-generated"]
       - ["java.security.cert", "CertPathBuilder", "getRevocationChecker", "()", "summary", "df-generated"]
-      - ["java.security.cert", "CertPathBuilderSpi", "engineBuild", "(CertPathParameters)", "summary", "df-generated"]
       - ["java.security.cert", "CertPathBuilderSpi", "engineGetRevocationChecker", "()", "summary", "df-generated"]
-      - ["java.security.cert", "CertPathChecker", "check", "(Certificate)", "summary", "df-generated"]
-      - ["java.security.cert", "CertPathChecker", "init", "(boolean)", "summary", "df-generated"]
-      - ["java.security.cert", "CertPathChecker", "isForwardCheckingSupported", "()", "summary", "df-generated"]
       - ["java.security.cert", "CertPathValidator", "getDefaultType", "()", "summary", "df-generated"]
       - ["java.security.cert", "CertPathValidator", "getRevocationChecker", "()", "summary", "df-generated"]
+      - ["java.security.cert", "CertPathValidator", "validate", "(CertPath,CertPathParameters)", "summary", "df-generated"]
       - ["java.security.cert", "CertPathValidatorException", "getIndex", "()", "summary", "df-generated"]
       - ["java.security.cert", "CertPathValidatorSpi", "engineGetRevocationChecker", "()", "summary", "df-generated"]
       - ["java.security.cert", "CertPathValidatorSpi", "engineValidate", "(CertPath,CertPathParameters)", "summary", "df-generated"]
-      - ["java.security.cert", "CertSelector", "match", "(Certificate)", "summary", "df-generated"]
       - ["java.security.cert", "CertStoreSpi", "CertStoreSpi", "(CertStoreParameters)", "summary", "df-generated"]
-      - ["java.security.cert", "CertStoreSpi", "engineGetCRLs", "(CRLSelector)", "summary", "df-generated"]
-      - ["java.security.cert", "CertStoreSpi", "engineGetCertificates", "(CertSelector)", "summary", "df-generated"]
-      - ["java.security.cert", "Certificate", "getEncoded", "()", "summary", "df-generated"]
       - ["java.security.cert", "Certificate", "getPublicKey", "()", "summary", "df-generated"]
-      - ["java.security.cert", "Certificate", "verify", "(PublicKey)", "summary", "df-generated"]
-      - ["java.security.cert", "Certificate", "verify", "(PublicKey,Provider)", "summary", "df-generated"]
-      - ["java.security.cert", "Certificate", "verify", "(PublicKey,String)", "summary", "df-generated"]
       - ["java.security.cert", "CertificateFactorySpi", "engineGenerateCRL", "(InputStream)", "summary", "df-generated"]
       - ["java.security.cert", "CertificateFactorySpi", "engineGenerateCRLs", "(InputStream)", "summary", "df-generated"]
       - ["java.security.cert", "CertificateFactorySpi", "engineGenerateCertPath", "(InputStream)", "summary", "df-generated"]
       - ["java.security.cert", "CertificateFactorySpi", "engineGenerateCertPath", "(InputStream,String)", "summary", "df-generated"]
-      - ["java.security.cert", "CertificateFactorySpi", "engineGenerateCertPath", "(List)", "summary", "df-generated"]
-      - ["java.security.cert", "CertificateFactorySpi", "engineGenerateCertificate", "(InputStream)", "summary", "df-generated"]
       - ["java.security.cert", "CertificateFactorySpi", "engineGenerateCertificates", "(InputStream)", "summary", "df-generated"]
       - ["java.security.cert", "CertificateFactorySpi", "engineGetCertPathEncodings", "()", "summary", "df-generated"]
       - ["java.security.cert", "CertificateRevokedException", "getInvalidityDate", "()", "summary", "df-generated"]
@@ -200,8 +220,9 @@ extensions:
       - ["java.security.cert", "LDAPCertStoreParameters", "getPort", "()", "summary", "df-generated"]
       - ["java.security.cert", "PKIXBuilderParameters", "getMaxPathLength", "()", "summary", "df-generated"]
       - ["java.security.cert", "PKIXBuilderParameters", "setMaxPathLength", "(int)", "summary", "df-generated"]
-      - ["java.security.cert", "PKIXCertPathChecker", "check", "(Certificate,Collection)", "summary", "df-generated"]
-      - ["java.security.cert", "PKIXCertPathChecker", "getSupportedExtensions", "()", "summary", "df-generated"]
+      - ["java.security.cert", "PKIXCertPathChecker", "check", "(Certificate)", "summary", "df-generated"]
+      - ["java.security.cert", "PKIXCertPathChecker", "init", "(boolean)", "summary", "df-generated"]
+      - ["java.security.cert", "PKIXCertPathChecker", "isForwardCheckingSupported", "()", "summary", "df-generated"]
       - ["java.security.cert", "PKIXParameters", "isAnyPolicyInhibited", "()", "summary", "df-generated"]
       - ["java.security.cert", "PKIXParameters", "isExplicitPolicyRequired", "()", "summary", "df-generated"]
       - ["java.security.cert", "PKIXParameters", "isPolicyMappingInhibited", "()", "summary", "df-generated"]
@@ -210,30 +231,18 @@ extensions:
       - ["java.security.cert", "PKIXParameters", "setPolicyMappingInhibited", "(boolean)", "summary", "df-generated"]
       - ["java.security.cert", "PKIXParameters", "setPolicyQualifiersRejected", "(boolean)", "summary", "df-generated"]
       - ["java.security.cert", "PKIXParameters", "setRevocationEnabled", "(boolean)", "summary", "df-generated"]
-      - ["java.security.cert", "PKIXRevocationChecker", "getSoftFailExceptions", "()", "summary", "df-generated"]
-      - ["java.security.cert", "X509CRL", "getEncoded", "()", "summary", "df-generated"]
-      - ["java.security.cert", "X509CRL", "getIssuerDN", "()", "summary", "df-generated"]
       - ["java.security.cert", "X509CRL", "getNextUpdate", "()", "summary", "df-generated"]
-      - ["java.security.cert", "X509CRL", "getRevokedCertificate", "(BigInteger)", "summary", "df-generated"]
-      - ["java.security.cert", "X509CRL", "getRevokedCertificates", "()", "summary", "df-generated"]
       - ["java.security.cert", "X509CRL", "getSigAlgName", "()", "summary", "df-generated"]
       - ["java.security.cert", "X509CRL", "getSigAlgOID", "()", "summary", "df-generated"]
-      - ["java.security.cert", "X509CRL", "getSigAlgParams", "()", "summary", "df-generated"]
-      - ["java.security.cert", "X509CRL", "getSignature", "()", "summary", "df-generated"]
-      - ["java.security.cert", "X509CRL", "getTBSCertList", "()", "summary", "df-generated"]
       - ["java.security.cert", "X509CRL", "getThisUpdate", "()", "summary", "df-generated"]
       - ["java.security.cert", "X509CRL", "getVersion", "()", "summary", "df-generated"]
-      - ["java.security.cert", "X509CRL", "verify", "(PublicKey)", "summary", "df-generated"]
-      - ["java.security.cert", "X509CRL", "verify", "(PublicKey,Provider)", "summary", "df-generated"]
-      - ["java.security.cert", "X509CRL", "verify", "(PublicKey,String)", "summary", "df-generated"]
-      - ["java.security.cert", "X509CRLEntry", "getCertificateIssuer", "()", "summary", "df-generated"]
-      - ["java.security.cert", "X509CRLEntry", "getEncoded", "()", "summary", "df-generated"]
       - ["java.security.cert", "X509CRLEntry", "getRevocationDate", "()", "summary", "df-generated"]
       - ["java.security.cert", "X509CRLEntry", "getRevocationReason", "()", "summary", "df-generated"]
       - ["java.security.cert", "X509CRLEntry", "getSerialNumber", "()", "summary", "df-generated"]
       - ["java.security.cert", "X509CRLEntry", "hasExtensions", "()", "summary", "df-generated"]
       - ["java.security.cert", "X509CRLSelector", "getMaxCRL", "()", "summary", "df-generated"]
       - ["java.security.cert", "X509CRLSelector", "getMinCRL", "()", "summary", "df-generated"]
+      - ["java.security.cert", "X509CRLSelector", "match", "(CRL)", "summary", "df-generated"]
       - ["java.security.cert", "X509CRLSelector", "setDateAndTime", "(Date)", "summary", "df-generated"]
       - ["java.security.cert", "X509CRLSelector", "setMaxCRLNumber", "(BigInteger)", "summary", "df-generated"]
       - ["java.security.cert", "X509CRLSelector", "setMinCRLNumber", "(BigInteger)", "summary", "df-generated"]
@@ -249,6 +258,7 @@ extensions:
       - ["java.security.cert", "X509CertSelector", "getSerialNumber", "()", "summary", "df-generated"]
       - ["java.security.cert", "X509CertSelector", "getSubjectAsBytes", "()", "summary", "df-generated"]
       - ["java.security.cert", "X509CertSelector", "getSubjectAsString", "()", "summary", "df-generated"]
+      - ["java.security.cert", "X509CertSelector", "match", "(Certificate)", "summary", "df-generated"]
       - ["java.security.cert", "X509CertSelector", "setBasicConstraints", "(int)", "summary", "df-generated"]
       - ["java.security.cert", "X509CertSelector", "setIssuer", "(String)", "summary", "df-generated"]
       - ["java.security.cert", "X509CertSelector", "setIssuer", "(byte[])", "summary", "df-generated"]
@@ -262,9 +272,6 @@ extensions:
       - ["java.security.cert", "X509Certificate", "checkValidity", "()", "summary", "df-generated"]
       - ["java.security.cert", "X509Certificate", "checkValidity", "(Date)", "summary", "df-generated"]
       - ["java.security.cert", "X509Certificate", "getBasicConstraints", "()", "summary", "df-generated"]
-      - ["java.security.cert", "X509Certificate", "getExtendedKeyUsage", "()", "summary", "df-generated"]
-      - ["java.security.cert", "X509Certificate", "getIssuerAlternativeNames", "()", "summary", "df-generated"]
-      - ["java.security.cert", "X509Certificate", "getIssuerDN", "()", "summary", "df-generated"]
       - ["java.security.cert", "X509Certificate", "getIssuerUniqueID", "()", "summary", "df-generated"]
       - ["java.security.cert", "X509Certificate", "getKeyUsage", "()", "summary", "df-generated"]
       - ["java.security.cert", "X509Certificate", "getNotAfter", "()", "summary", "df-generated"]
@@ -272,10 +279,5 @@ extensions:
       - ["java.security.cert", "X509Certificate", "getSerialNumber", "()", "summary", "df-generated"]
       - ["java.security.cert", "X509Certificate", "getSigAlgName", "()", "summary", "df-generated"]
       - ["java.security.cert", "X509Certificate", "getSigAlgOID", "()", "summary", "df-generated"]
-      - ["java.security.cert", "X509Certificate", "getSigAlgParams", "()", "summary", "df-generated"]
-      - ["java.security.cert", "X509Certificate", "getSignature", "()", "summary", "df-generated"]
-      - ["java.security.cert", "X509Certificate", "getSubjectAlternativeNames", "()", "summary", "df-generated"]
-      - ["java.security.cert", "X509Certificate", "getSubjectDN", "()", "summary", "df-generated"]
       - ["java.security.cert", "X509Certificate", "getSubjectUniqueID", "()", "summary", "df-generated"]
-      - ["java.security.cert", "X509Certificate", "getTBSCertificate", "()", "summary", "df-generated"]
       - ["java.security.cert", "X509Certificate", "getVersion", "()", "summary", "df-generated"]
diff --git a/java/ql/lib/ext/generated/java.security.interfaces.model.yml b/java/ql/lib/ext/generated/java.security.interfaces.model.yml
index cced4d3efc9..e2824f1002e 100644
--- a/java/ql/lib/ext/generated/java.security.interfaces.model.yml
+++ b/java/ql/lib/ext/generated/java.security.interfaces.model.yml
@@ -2,9 +2,16 @@
 extensions:
   - addsTo:
       pack: codeql/java-all
-      extensible: neutralModel
+      extensible: summaryModel
     data:
-      - ["java.security.interfaces", "DSAParams", "getG", "()", "summary", "df-generated"]
-      - ["java.security.interfaces", "DSAParams", "getP", "()", "summary", "df-generated"]
-      - ["java.security.interfaces", "DSAParams", "getQ", "()", "summary", "df-generated"]
-      - ["java.security.interfaces", "RSAKey", "getParams", "()", "summary", "df-generated"]
+      - ["java.security.interfaces", "DSAKey", True, "getParams", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security.interfaces", "DSAKeyPairGenerator", True, "initialize", "(DSAParams,SecureRandom)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security.interfaces", "DSAKeyPairGenerator", True, "initialize", "(int,boolean,SecureRandom)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security.interfaces", "ECKey", True, "getParams", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security.interfaces", "ECPublicKey", True, "getW", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security.interfaces", "EdECKey", True, "getParams", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security.interfaces", "EdECPrivateKey", True, "getBytes", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security.interfaces", "EdECPublicKey", True, "getPoint", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security.interfaces", "RSAKey", True, "getParams", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security.interfaces", "XECKey", True, "getParams", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security.interfaces", "XECPrivateKey", True, "getScalar", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
diff --git a/java/ql/lib/ext/generated/java.security.model.yml b/java/ql/lib/ext/generated/java.security.model.yml
index 15b410e1fe8..d03c7e773dd 100644
--- a/java/ql/lib/ext/generated/java.security.model.yml
+++ b/java/ql/lib/ext/generated/java.security.model.yml
@@ -4,14 +4,12 @@ extensions:
       pack: codeql/java-all
       extensible: summaryModel
     data:
-      - ["java.security", "AccessControlContext", False, "AccessControlContext", "(AccessControlContext,DomainCombiner)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.security", "AccessControlContext", False, "AccessControlContext", "(AccessControlContext,DomainCombiner)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security", "AccessControlContext", False, "AccessControlContext", "(AccessControlContext,DomainCombiner)", "", "Argument[1]", "Argument[this].SyntheticField[java.security.AccessControlContext.combiner]", "value", "dfc-generated"]
       - ["java.security", "AccessControlContext", False, "AccessControlContext", "(ProtectionDomain[])", "", "Argument[0].ArrayElement", "Argument[this]", "taint", "df-generated"]
-      - ["java.security", "AccessControlContext", False, "getDomainCombiner", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security", "AccessControlContext", False, "getDomainCombiner", "()", "", "Argument[this].SyntheticField[java.security.AccessControlContext.combiner]", "ReturnValue", "value", "dfc-generated"]
       - ["java.security", "AccessControlException", True, "AccessControlException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.security", "AccessControlException", True, "AccessControlException", "(String,Permission)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.security", "AccessControlException", True, "AccessControlException", "(String,Permission)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["java.security", "AccessControlException", True, "getPermission", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security", "AccessControlException", True, "AccessControlException", "(String,Permission)", "", "Argument[1]", "Argument[this].SyntheticField[java.security.AccessControlException.perm]", "value", "dfc-generated"]
+      - ["java.security", "AccessControlException", True, "getPermission", "()", "", "Argument[this].SyntheticField[java.security.AccessControlException.perm]", "ReturnValue", "value", "dfc-generated"]
       - ["java.security", "AccessController", False, "doPrivileged", "(PrivilegedAction)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["java.security", "AccessController", False, "doPrivileged", "(PrivilegedAction,AccessControlContext)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["java.security", "AccessController", False, "doPrivileged", "(PrivilegedAction,AccessControlContext,Permission[])", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
@@ -22,75 +20,71 @@ extensions:
       - ["java.security", "AccessController", False, "doPrivilegedWithCombiner", "(PrivilegedAction,AccessControlContext,Permission[])", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["java.security", "AccessController", False, "doPrivilegedWithCombiner", "(PrivilegedExceptionAction)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["java.security", "AccessController", False, "doPrivilegedWithCombiner", "(PrivilegedExceptionAction,AccessControlContext,Permission[])", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["java.security", "AlgorithmParameterGenerator", True, "getAlgorithm", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.security", "AlgorithmParameterGenerator", True, "getInstance", "(String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["java.security", "AlgorithmParameterGenerator", True, "getInstance", "(String,Provider)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["java.security", "AlgorithmParameterGenerator", True, "getInstance", "(String,Provider)", "", "Argument[1].Element", "ReturnValue", "taint", "df-generated"]
-      - ["java.security", "AlgorithmParameterGenerator", True, "getInstance", "(String,String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security", "AlgorithmParameterGenerator", True, "getAlgorithm", "()", "", "Argument[this].SyntheticField[java.security.AlgorithmParameterGenerator.algorithm]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.security", "AlgorithmParameterGenerator", True, "getInstance", "(String)", "", "Argument[0]", "ReturnValue.SyntheticField[java.security.AlgorithmParameterGenerator.algorithm]", "value", "dfc-generated"]
+      - ["java.security", "AlgorithmParameterGenerator", True, "getInstance", "(String,Provider)", "", "Argument[0]", "ReturnValue.SyntheticField[java.security.AlgorithmParameterGenerator.algorithm]", "value", "dfc-generated"]
+      - ["java.security", "AlgorithmParameterGenerator", True, "getInstance", "(String,String)", "", "Argument[0]", "ReturnValue.SyntheticField[java.security.AlgorithmParameterGenerator.algorithm]", "value", "dfc-generated"]
       - ["java.security", "AlgorithmParameterGenerator", True, "getProvider", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.security", "AlgorithmParameterGenerator", True, "init", "(AlgorithmParameterSpec,SecureRandom)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
       - ["java.security", "AlgorithmParameterGenerator", True, "init", "(int,SecureRandom)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["java.security", "AlgorithmParameters", True, "getAlgorithm", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security", "AlgorithmParameters", True, "getAlgorithm", "()", "", "Argument[this].SyntheticField[java.security.AlgorithmParameters.algorithm]", "ReturnValue", "value", "dfc-generated"]
       - ["java.security", "AlgorithmParameters", True, "getEncoded", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.security", "AlgorithmParameters", True, "getEncoded", "(String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.security", "AlgorithmParameters", True, "getInstance", "(String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["java.security", "AlgorithmParameters", True, "getInstance", "(String,Provider)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["java.security", "AlgorithmParameters", True, "getInstance", "(String,Provider)", "", "Argument[1].Element", "ReturnValue", "taint", "df-generated"]
-      - ["java.security", "AlgorithmParameters", True, "getInstance", "(String,String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security", "AlgorithmParameters", True, "getInstance", "(String)", "", "Argument[0]", "ReturnValue.SyntheticField[java.security.AlgorithmParameters.algorithm]", "value", "dfc-generated"]
+      - ["java.security", "AlgorithmParameters", True, "getInstance", "(String,Provider)", "", "Argument[0]", "ReturnValue.SyntheticField[java.security.AlgorithmParameters.algorithm]", "value", "dfc-generated"]
+      - ["java.security", "AlgorithmParameters", True, "getInstance", "(String,String)", "", "Argument[0]", "ReturnValue.SyntheticField[java.security.AlgorithmParameters.algorithm]", "value", "dfc-generated"]
       - ["java.security", "AlgorithmParameters", True, "getParameterSpec", "(Class)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.security", "AlgorithmParameters", True, "getProvider", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.security", "AlgorithmParameters", True, "init", "(AlgorithmParameterSpec)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.security", "AlgorithmParameters", True, "init", "(byte[])", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.security", "AlgorithmParameters", True, "init", "(byte[],String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.security", "BasicPermission", True, "BasicPermission", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.security", "BasicPermission", True, "BasicPermission", "(String,String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.security", "CodeSigner", False, "CodeSigner", "(CertPath,Timestamp)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.security", "CodeSigner", False, "CodeSigner", "(CertPath,Timestamp)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["java.security", "CodeSigner", False, "getSignerCertPath", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.security", "CodeSigner", False, "getTimestamp", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security", "AuthProvider", True, "setCallbackHandler", "(CallbackHandler)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security", "BasicPermission", True, "BasicPermission", "(String)", "", "Argument[0]", "Argument[this]", "taint", "dfc-generated"]
+      - ["java.security", "BasicPermission", True, "BasicPermission", "(String,String)", "", "Argument[0]", "Argument[this]", "taint", "dfc-generated"]
+      - ["java.security", "CodeSigner", False, "CodeSigner", "(CertPath,Timestamp)", "", "Argument[0]", "Argument[this].SyntheticField[java.security.CodeSigner.signerCertPath]", "value", "dfc-generated"]
+      - ["java.security", "CodeSigner", False, "CodeSigner", "(CertPath,Timestamp)", "", "Argument[1]", "Argument[this].SyntheticField[java.security.CodeSigner.timestamp]", "value", "dfc-generated"]
+      - ["java.security", "CodeSigner", False, "getSignerCertPath", "()", "", "Argument[this].SyntheticField[java.security.CodeSigner.signerCertPath]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.security", "CodeSigner", False, "getTimestamp", "()", "", "Argument[this].SyntheticField[java.security.CodeSigner.timestamp]", "ReturnValue", "value", "dfc-generated"]
       - ["java.security", "DigestException", True, "DigestException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.security", "DigestException", True, "DigestException", "(String,Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.security", "DigestException", True, "DigestException", "(String,Throwable)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
       - ["java.security", "DigestException", True, "DigestException", "(Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.security", "DigestInputStream", True, "DigestInputStream", "(InputStream,MessageDigest)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.security", "DigestInputStream", True, "DigestInputStream", "(InputStream,MessageDigest)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["java.security", "DigestInputStream", True, "getMessageDigest", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.security", "DigestInputStream", True, "setMessageDigest", "(MessageDigest)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.security", "DigestOutputStream", True, "DigestOutputStream", "(OutputStream,MessageDigest)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.security", "DigestOutputStream", True, "DigestOutputStream", "(OutputStream,MessageDigest)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["java.security", "DigestOutputStream", True, "getMessageDigest", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.security", "DigestOutputStream", True, "setMessageDigest", "(MessageDigest)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.security", "DomainCombiner", True, "combine", "(ProtectionDomain[],ProtectionDomain[])", "", "Argument[0].ArrayElement", "Argument[this]", "taint", "df-generated"]
-      - ["java.security", "DomainCombiner", True, "combine", "(ProtectionDomain[],ProtectionDomain[])", "", "Argument[0].ArrayElement", "ReturnValue", "taint", "df-generated"]
-      - ["java.security", "DomainCombiner", True, "combine", "(ProtectionDomain[],ProtectionDomain[])", "", "Argument[1].ArrayElement", "ReturnValue", "taint", "df-generated"]
-      - ["java.security", "DomainCombiner", True, "combine", "(ProtectionDomain[],ProtectionDomain[])", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.security", "DomainLoadStoreParameter", False, "DomainLoadStoreParameter", "(URI,Map)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.security", "DomainLoadStoreParameter", False, "DomainLoadStoreParameter", "(URI,Map)", "", "Argument[1].Element", "Argument[this]", "taint", "df-generated"]
-      - ["java.security", "DomainLoadStoreParameter", False, "getConfiguration", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.security", "DomainLoadStoreParameter", False, "getProtectionParams", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.security", "DrbgParameters$Instantiation", False, "getPersonalizationString", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.security", "DrbgParameters$NextBytes", False, "getAdditionalInput", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.security", "DrbgParameters$Reseed", False, "getAdditionalInput", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.security", "DrbgParameters", True, "instantiation", "(int,DrbgParameters$Capability,byte[])", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
-      - ["java.security", "DrbgParameters", True, "nextBytes", "(int,boolean,byte[])", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
-      - ["java.security", "DrbgParameters", True, "reseed", "(boolean,byte[])", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security", "DigestInputStream", True, "DigestInputStream", "(InputStream,MessageDigest)", "", "Argument[1]", "Argument[this].SyntheticField[java.security.DigestInputStream.digest]", "value", "dfc-generated"]
+      - ["java.security", "DigestInputStream", True, "getMessageDigest", "()", "", "Argument[this].SyntheticField[java.security.DigestInputStream.digest]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.security", "DigestInputStream", True, "setMessageDigest", "(MessageDigest)", "", "Argument[0]", "Argument[this].SyntheticField[java.security.DigestInputStream.digest]", "value", "dfc-generated"]
+      - ["java.security", "DigestOutputStream", True, "DigestOutputStream", "(OutputStream,MessageDigest)", "", "Argument[0]", "Argument[this]", "taint", "dfc-generated"]
+      - ["java.security", "DigestOutputStream", True, "DigestOutputStream", "(OutputStream,MessageDigest)", "", "Argument[1]", "Argument[this].SyntheticField[java.security.DigestOutputStream.digest]", "value", "dfc-generated"]
+      - ["java.security", "DigestOutputStream", True, "getMessageDigest", "()", "", "Argument[this].SyntheticField[java.security.DigestOutputStream.digest]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.security", "DigestOutputStream", True, "setMessageDigest", "(MessageDigest)", "", "Argument[0]", "Argument[this].SyntheticField[java.security.DigestOutputStream.digest]", "value", "dfc-generated"]
+      - ["java.security", "DomainCombiner", True, "combine", "(ProtectionDomain[],ProtectionDomain[])", "", "Argument[1]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.security", "DomainLoadStoreParameter", False, "DomainLoadStoreParameter", "(URI,Map)", "", "Argument[0]", "Argument[this].SyntheticField[java.security.DomainLoadStoreParameter.configuration]", "value", "dfc-generated"]
+      - ["java.security", "DomainLoadStoreParameter", False, "DomainLoadStoreParameter", "(URI,Map)", "", "Argument[1].MapKey", "Argument[this].SyntheticField[java.security.DomainLoadStoreParameter.protectionParams].MapKey", "value", "dfc-generated"]
+      - ["java.security", "DomainLoadStoreParameter", False, "DomainLoadStoreParameter", "(URI,Map)", "", "Argument[1].MapValue", "Argument[this].SyntheticField[java.security.DomainLoadStoreParameter.protectionParams].MapValue", "value", "dfc-generated"]
+      - ["java.security", "DomainLoadStoreParameter", False, "getConfiguration", "()", "", "Argument[this].SyntheticField[java.security.DomainLoadStoreParameter.configuration]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.security", "DomainLoadStoreParameter", False, "getProtectionParams", "()", "", "Argument[this].SyntheticField[java.security.DomainLoadStoreParameter.protectionParams]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.security", "DrbgParameters$Instantiation", False, "getPersonalizationString", "()", "", "Argument[this].SyntheticField[java.security.DrbgParameters$Instantiation.personalizationString]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.security", "DrbgParameters$NextBytes", False, "getAdditionalInput", "()", "", "Argument[this].SyntheticField[java.security.DrbgParameters$NextBytes.additionalInput]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.security", "DrbgParameters$Reseed", False, "getAdditionalInput", "()", "", "Argument[this].SyntheticField[java.security.DrbgParameters$Reseed.additionalInput]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.security", "DrbgParameters", True, "instantiation", "(int,DrbgParameters$Capability,byte[])", "", "Argument[2]", "ReturnValue.SyntheticField[java.security.DrbgParameters$Instantiation.personalizationString]", "value", "dfc-generated"]
+      - ["java.security", "DrbgParameters", True, "nextBytes", "(int,boolean,byte[])", "", "Argument[2]", "ReturnValue.SyntheticField[java.security.DrbgParameters$NextBytes.additionalInput]", "value", "dfc-generated"]
+      - ["java.security", "DrbgParameters", True, "reseed", "(boolean,byte[])", "", "Argument[1]", "ReturnValue.SyntheticField[java.security.DrbgParameters$Reseed.additionalInput]", "value", "dfc-generated"]
       - ["java.security", "GeneralSecurityException", True, "GeneralSecurityException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.security", "GeneralSecurityException", True, "GeneralSecurityException", "(String,Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.security", "GeneralSecurityException", True, "GeneralSecurityException", "(String,Throwable)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
       - ["java.security", "GeneralSecurityException", True, "GeneralSecurityException", "(Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.security", "GuardedObject", True, "GuardedObject", "(Object,Guard)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.security", "GuardedObject", True, "GuardedObject", "(Object,Guard)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["java.security", "GuardedObject", True, "getObject", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.security", "Identity", True, "Identity", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.security", "Identity", True, "Identity", "(String,IdentityScope)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.security", "Identity", True, "Identity", "(String,IdentityScope)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["java.security", "Identity", True, "addCertificate", "(Certificate)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.security", "Identity", True, "certificates", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.security", "Identity", True, "getInfo", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.security", "Identity", True, "getPublicKey", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.security", "Identity", True, "getScope", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.security", "Identity", True, "setInfo", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.security", "Identity", True, "setPublicKey", "(PublicKey)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security", "GuardedObject", True, "GuardedObject", "(Object,Guard)", "", "Argument[0]", "Argument[this].SyntheticField[java.security.GuardedObject.object]", "value", "dfc-generated"]
+      - ["java.security", "GuardedObject", True, "getObject", "()", "", "Argument[this].SyntheticField[java.security.GuardedObject.object]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.security", "Identity", True, "Identity", "(String)", "", "Argument[0]", "Argument[this].SyntheticField[java.security.Identity.name]", "value", "dfc-generated"]
+      - ["java.security", "Identity", True, "Identity", "(String,IdentityScope)", "", "Argument[0]", "Argument[this].SyntheticField[java.security.Identity.name]", "value", "dfc-generated"]
+      - ["java.security", "Identity", True, "Identity", "(String,IdentityScope)", "", "Argument[1]", "Argument[this].SyntheticField[java.security.Identity.scope]", "value", "dfc-generated"]
+      - ["java.security", "Identity", True, "addCertificate", "(Certificate)", "", "Argument[0]", "Argument[this].SyntheticField[java.security.Identity.certificates].Element", "value", "dfc-generated"]
+      - ["java.security", "Identity", True, "certificates", "()", "", "Argument[this].SyntheticField[java.security.Identity.certificates].Element", "ReturnValue.ArrayElement", "value", "dfc-generated"]
+      - ["java.security", "Identity", True, "getInfo", "()", "", "Argument[this].SyntheticField[java.security.Identity.info]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.security", "Identity", True, "getName", "()", "", "Argument[this].SyntheticField[java.security.Identity.name]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.security", "Identity", True, "getPublicKey", "()", "", "Argument[this].SyntheticField[java.security.Identity.publicKey]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.security", "Identity", True, "getScope", "()", "", "Argument[this].SyntheticField[java.security.Identity.scope]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.security", "Identity", True, "setInfo", "(String)", "", "Argument[0]", "Argument[this].SyntheticField[java.security.Identity.info]", "value", "dfc-generated"]
+      - ["java.security", "Identity", True, "setPublicKey", "(PublicKey)", "", "Argument[0]", "Argument[this].SyntheticField[java.security.Identity.publicKey]", "value", "dfc-generated"]
+      - ["java.security", "Identity", True, "toString", "(boolean)", "", "Argument[this].SyntheticField[java.security.Identity.info]", "ReturnValue", "taint", "dfc-generated"]
+      - ["java.security", "Identity", True, "toString", "(boolean)", "", "Argument[this].SyntheticField[java.security.Identity.name]", "ReturnValue", "taint", "dfc-generated"]
       - ["java.security", "IdentityScope", True, "IdentityScope", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.security", "IdentityScope", True, "IdentityScope", "(String,IdentityScope)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.security", "IdentityScope", True, "IdentityScope", "(String,IdentityScope)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
@@ -111,11 +105,10 @@ extensions:
       - ["java.security", "KeyException", True, "KeyException", "(Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.security", "KeyFactory", True, "generatePrivate", "(KeySpec)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["java.security", "KeyFactory", True, "generatePublic", "(KeySpec)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["java.security", "KeyFactory", True, "getAlgorithm", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.security", "KeyFactory", True, "getInstance", "(String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["java.security", "KeyFactory", True, "getInstance", "(String,Provider)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["java.security", "KeyFactory", True, "getInstance", "(String,Provider)", "", "Argument[1].Element", "ReturnValue", "taint", "df-generated"]
-      - ["java.security", "KeyFactory", True, "getInstance", "(String,String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security", "KeyFactory", True, "getAlgorithm", "()", "", "Argument[this].SyntheticField[java.security.KeyFactory.algorithm]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.security", "KeyFactory", True, "getInstance", "(String)", "", "Argument[0]", "ReturnValue.SyntheticField[java.security.KeyFactory.algorithm]", "value", "dfc-generated"]
+      - ["java.security", "KeyFactory", True, "getInstance", "(String,Provider)", "", "Argument[0]", "ReturnValue.SyntheticField[java.security.KeyFactory.algorithm]", "value", "dfc-generated"]
+      - ["java.security", "KeyFactory", True, "getInstance", "(String,String)", "", "Argument[0]", "ReturnValue.SyntheticField[java.security.KeyFactory.algorithm]", "value", "dfc-generated"]
       - ["java.security", "KeyFactory", True, "getKeySpec", "(Key,Class)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["java.security", "KeyFactory", True, "getProvider", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.security", "KeyFactory", True, "translateKey", "(Key)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
@@ -123,16 +116,15 @@ extensions:
       - ["java.security", "KeyManagementException", True, "KeyManagementException", "(String,Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.security", "KeyManagementException", True, "KeyManagementException", "(String,Throwable)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
       - ["java.security", "KeyManagementException", True, "KeyManagementException", "(Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.security", "KeyPair", False, "KeyPair", "(PublicKey,PrivateKey)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.security", "KeyPair", False, "KeyPair", "(PublicKey,PrivateKey)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["java.security", "KeyPair", False, "getPrivate", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.security", "KeyPair", False, "getPublic", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security", "KeyPair", False, "KeyPair", "(PublicKey,PrivateKey)", "", "Argument[0]", "Argument[this].SyntheticField[java.security.KeyPair.publicKey]", "value", "dfc-generated"]
+      - ["java.security", "KeyPair", False, "KeyPair", "(PublicKey,PrivateKey)", "", "Argument[1]", "Argument[this].SyntheticField[java.security.KeyPair.privateKey]", "value", "dfc-generated"]
+      - ["java.security", "KeyPair", False, "getPrivate", "()", "", "Argument[this].SyntheticField[java.security.KeyPair.privateKey]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.security", "KeyPair", False, "getPublic", "()", "", "Argument[this].SyntheticField[java.security.KeyPair.publicKey]", "ReturnValue", "value", "dfc-generated"]
       - ["java.security", "KeyPairGenerator", True, "genKeyPair", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.security", "KeyPairGenerator", True, "getAlgorithm", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.security", "KeyPairGenerator", True, "getInstance", "(String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["java.security", "KeyPairGenerator", True, "getInstance", "(String,Provider)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["java.security", "KeyPairGenerator", True, "getInstance", "(String,Provider)", "", "Argument[1].Element", "ReturnValue", "taint", "df-generated"]
-      - ["java.security", "KeyPairGenerator", True, "getInstance", "(String,String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security", "KeyPairGenerator", True, "getAlgorithm", "()", "", "Argument[this].SyntheticField[java.security.KeyPairGenerator.algorithm]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.security", "KeyPairGenerator", True, "getInstance", "(String)", "", "Argument[0]", "ReturnValue.SyntheticField[java.security.KeyPairGenerator.algorithm]", "value", "dfc-generated"]
+      - ["java.security", "KeyPairGenerator", True, "getInstance", "(String,Provider)", "", "Argument[0]", "ReturnValue.SyntheticField[java.security.KeyPairGenerator.algorithm]", "value", "dfc-generated"]
+      - ["java.security", "KeyPairGenerator", True, "getInstance", "(String,String)", "", "Argument[0]", "ReturnValue.SyntheticField[java.security.KeyPairGenerator.algorithm]", "value", "dfc-generated"]
       - ["java.security", "KeyPairGenerator", True, "getProvider", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.security", "KeyPairGenerator", True, "initialize", "(AlgorithmParameterSpec)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.security", "KeyPairGeneratorSpi", True, "generateKeyPair", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
@@ -150,54 +142,60 @@ extensions:
       - ["java.security", "KeyStore$Builder", True, "newInstance", "(String,Provider,File,KeyStore$ProtectionParameter)", "", "Argument[1].Element", "ReturnValue", "taint", "df-generated"]
       - ["java.security", "KeyStore$Builder", True, "newInstance", "(String,Provider,File,KeyStore$ProtectionParameter)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
       - ["java.security", "KeyStore$Builder", True, "newInstance", "(String,Provider,File,KeyStore$ProtectionParameter)", "", "Argument[3]", "ReturnValue", "taint", "df-generated"]
-      - ["java.security", "KeyStore$CallbackHandlerProtection", True, "CallbackHandlerProtection", "(CallbackHandler)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.security", "KeyStore$CallbackHandlerProtection", True, "getCallbackHandler", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.security", "KeyStore$Entry$Attribute", True, "getName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.security", "KeyStore$Entry$Attribute", True, "getValue", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.security", "KeyStore$Entry", True, "getAttributes", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security", "KeyStore$CallbackHandlerProtection", True, "CallbackHandlerProtection", "(CallbackHandler)", "", "Argument[0]", "Argument[this].SyntheticField[java.security.KeyStore$CallbackHandlerProtection.handler]", "value", "dfc-generated"]
+      - ["java.security", "KeyStore$CallbackHandlerProtection", True, "getCallbackHandler", "()", "", "Argument[this].SyntheticField[java.security.KeyStore$CallbackHandlerProtection.handler]", "ReturnValue", "value", "dfc-generated"]
       - ["java.security", "KeyStore$LoadStoreParameter", True, "getProtectionParameter", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.security", "KeyStore$PasswordProtection", True, "PasswordProtection", "(char[])", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.security", "KeyStore$PasswordProtection", True, "PasswordProtection", "(char[],String,AlgorithmParameterSpec)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.security", "KeyStore$PasswordProtection", True, "PasswordProtection", "(char[],String,AlgorithmParameterSpec)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["java.security", "KeyStore$PasswordProtection", True, "PasswordProtection", "(char[],String,AlgorithmParameterSpec)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
-      - ["java.security", "KeyStore$PasswordProtection", True, "getPassword", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.security", "KeyStore$PasswordProtection", True, "getProtectionAlgorithm", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.security", "KeyStore$PasswordProtection", True, "getProtectionParameters", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.security", "KeyStore$PrivateKeyEntry", False, "PrivateKeyEntry", "(PrivateKey,Certificate[])", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.security", "KeyStore$PrivateKeyEntry", False, "PrivateKeyEntry", "(PrivateKey,Certificate[])", "", "Argument[1].ArrayElement", "Argument[this]", "taint", "df-generated"]
-      - ["java.security", "KeyStore$PrivateKeyEntry", False, "PrivateKeyEntry", "(PrivateKey,Certificate[],Set)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.security", "KeyStore$PrivateKeyEntry", False, "PrivateKeyEntry", "(PrivateKey,Certificate[],Set)", "", "Argument[1].ArrayElement", "Argument[this]", "taint", "df-generated"]
-      - ["java.security", "KeyStore$PrivateKeyEntry", False, "PrivateKeyEntry", "(PrivateKey,Certificate[],Set)", "", "Argument[2].Element", "Argument[this]", "taint", "df-generated"]
-      - ["java.security", "KeyStore$PrivateKeyEntry", False, "getCertificate", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.security", "KeyStore$PrivateKeyEntry", False, "getCertificateChain", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.security", "KeyStore$PrivateKeyEntry", False, "getPrivateKey", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.security", "KeyStore$SecretKeyEntry", False, "SecretKeyEntry", "(SecretKey)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.security", "KeyStore$SecretKeyEntry", False, "SecretKeyEntry", "(SecretKey,Set)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.security", "KeyStore$SecretKeyEntry", False, "SecretKeyEntry", "(SecretKey,Set)", "", "Argument[1].Element", "Argument[this]", "taint", "df-generated"]
-      - ["java.security", "KeyStore$SecretKeyEntry", False, "getSecretKey", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.security", "KeyStore$TrustedCertificateEntry", False, "TrustedCertificateEntry", "(Certificate)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.security", "KeyStore$TrustedCertificateEntry", False, "TrustedCertificateEntry", "(Certificate,Set)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.security", "KeyStore$TrustedCertificateEntry", False, "TrustedCertificateEntry", "(Certificate,Set)", "", "Argument[1].Element", "Argument[this]", "taint", "df-generated"]
-      - ["java.security", "KeyStore$TrustedCertificateEntry", False, "getTrustedCertificate", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security", "KeyStore$PasswordProtection", True, "PasswordProtection", "(char[])", "", "Argument[0]", "Argument[this].SyntheticField[java.security.KeyStore$PasswordProtection.password]", "value", "dfc-generated"]
+      - ["java.security", "KeyStore$PasswordProtection", True, "PasswordProtection", "(char[],String,AlgorithmParameterSpec)", "", "Argument[0]", "Argument[this].SyntheticField[java.security.KeyStore$PasswordProtection.password]", "value", "dfc-generated"]
+      - ["java.security", "KeyStore$PasswordProtection", True, "PasswordProtection", "(char[],String,AlgorithmParameterSpec)", "", "Argument[1]", "Argument[this].SyntheticField[java.security.KeyStore$PasswordProtection.protectionAlgorithm]", "value", "dfc-generated"]
+      - ["java.security", "KeyStore$PasswordProtection", True, "PasswordProtection", "(char[],String,AlgorithmParameterSpec)", "", "Argument[2]", "Argument[this].SyntheticField[java.security.KeyStore$PasswordProtection.protectionParameters]", "value", "dfc-generated"]
+      - ["java.security", "KeyStore$PasswordProtection", True, "getPassword", "()", "", "Argument[this].SyntheticField[java.security.KeyStore$PasswordProtection.password]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.security", "KeyStore$PasswordProtection", True, "getProtectionAlgorithm", "()", "", "Argument[this].SyntheticField[java.security.KeyStore$PasswordProtection.protectionAlgorithm]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.security", "KeyStore$PasswordProtection", True, "getProtectionParameters", "()", "", "Argument[this].SyntheticField[java.security.KeyStore$PasswordProtection.protectionParameters]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.security", "KeyStore$PrivateKeyEntry", False, "PrivateKeyEntry", "(PrivateKey,Certificate[])", "", "Argument[0]", "Argument[this].SyntheticField[java.security.KeyStore$PrivateKeyEntry.privKey]", "value", "dfc-generated"]
+      - ["java.security", "KeyStore$PrivateKeyEntry", False, "PrivateKeyEntry", "(PrivateKey,Certificate[])", "", "Argument[1]", "Argument[this].SyntheticField[java.security.KeyStore$PrivateKeyEntry.chain]", "value", "dfc-generated"]
+      - ["java.security", "KeyStore$PrivateKeyEntry", False, "PrivateKeyEntry", "(PrivateKey,Certificate[],Set)", "", "Argument[0]", "Argument[this].SyntheticField[java.security.KeyStore$PrivateKeyEntry.privKey]", "value", "dfc-generated"]
+      - ["java.security", "KeyStore$PrivateKeyEntry", False, "PrivateKeyEntry", "(PrivateKey,Certificate[],Set)", "", "Argument[1]", "Argument[this].SyntheticField[java.security.KeyStore$PrivateKeyEntry.chain]", "value", "dfc-generated"]
+      - ["java.security", "KeyStore$PrivateKeyEntry", False, "PrivateKeyEntry", "(PrivateKey,Certificate[],Set)", "", "Argument[2].Element", "Argument[this].SyntheticField[java.security.KeyStore$PrivateKeyEntry.attributes].Element", "value", "dfc-generated"]
+      - ["java.security", "KeyStore$PrivateKeyEntry", False, "getAttributes", "()", "", "Argument[this].SyntheticField[java.security.KeyStore$PrivateKeyEntry.attributes]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.security", "KeyStore$PrivateKeyEntry", False, "getCertificate", "()", "", "Argument[this].SyntheticField[java.security.KeyStore$PrivateKeyEntry.chain].ArrayElement", "ReturnValue", "value", "dfc-generated"]
+      - ["java.security", "KeyStore$PrivateKeyEntry", False, "getCertificateChain", "()", "", "Argument[this].SyntheticField[java.security.KeyStore$PrivateKeyEntry.chain]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.security", "KeyStore$PrivateKeyEntry", False, "getPrivateKey", "()", "", "Argument[this].SyntheticField[java.security.KeyStore$PrivateKeyEntry.privKey]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.security", "KeyStore$SecretKeyEntry", False, "SecretKeyEntry", "(SecretKey)", "", "Argument[0]", "Argument[this].SyntheticField[java.security.KeyStore$SecretKeyEntry.sKey]", "value", "dfc-generated"]
+      - ["java.security", "KeyStore$SecretKeyEntry", False, "SecretKeyEntry", "(SecretKey,Set)", "", "Argument[0]", "Argument[this].SyntheticField[java.security.KeyStore$SecretKeyEntry.sKey]", "value", "dfc-generated"]
+      - ["java.security", "KeyStore$SecretKeyEntry", False, "SecretKeyEntry", "(SecretKey,Set)", "", "Argument[1].Element", "Argument[this].SyntheticField[java.security.KeyStore$SecretKeyEntry.attributes].Element", "value", "dfc-generated"]
+      - ["java.security", "KeyStore$SecretKeyEntry", False, "getAttributes", "()", "", "Argument[this].SyntheticField[java.security.KeyStore$SecretKeyEntry.attributes]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.security", "KeyStore$SecretKeyEntry", False, "getSecretKey", "()", "", "Argument[this].SyntheticField[java.security.KeyStore$SecretKeyEntry.sKey]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.security", "KeyStore$TrustedCertificateEntry", False, "TrustedCertificateEntry", "(Certificate)", "", "Argument[0]", "Argument[this].SyntheticField[java.security.KeyStore$TrustedCertificateEntry.cert]", "value", "dfc-generated"]
+      - ["java.security", "KeyStore$TrustedCertificateEntry", False, "TrustedCertificateEntry", "(Certificate,Set)", "", "Argument[0]", "Argument[this].SyntheticField[java.security.KeyStore$TrustedCertificateEntry.cert]", "value", "dfc-generated"]
+      - ["java.security", "KeyStore$TrustedCertificateEntry", False, "TrustedCertificateEntry", "(Certificate,Set)", "", "Argument[1].Element", "Argument[this].SyntheticField[java.security.KeyStore$TrustedCertificateEntry.attributes].Element", "value", "dfc-generated"]
+      - ["java.security", "KeyStore$TrustedCertificateEntry", False, "getAttributes", "()", "", "Argument[this].SyntheticField[java.security.KeyStore$TrustedCertificateEntry.attributes]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.security", "KeyStore$TrustedCertificateEntry", False, "getTrustedCertificate", "()", "", "Argument[this].SyntheticField[java.security.KeyStore$TrustedCertificateEntry.cert]", "ReturnValue", "value", "dfc-generated"]
       - ["java.security", "KeyStore", True, "aliases", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.security", "KeyStore", True, "getCertificateAlias", "(Certificate)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.security", "KeyStore", True, "getInstance", "(String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["java.security", "KeyStore", True, "getInstance", "(String,Provider)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["java.security", "KeyStore", True, "getInstance", "(String,Provider)", "", "Argument[1].Element", "ReturnValue", "taint", "df-generated"]
-      - ["java.security", "KeyStore", True, "getInstance", "(String,String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security", "KeyStore", True, "getInstance", "(String)", "", "Argument[0]", "ReturnValue.SyntheticField[java.security.KeyStore.type]", "value", "dfc-generated"]
+      - ["java.security", "KeyStore", True, "getInstance", "(String,Provider)", "", "Argument[0]", "ReturnValue.SyntheticField[java.security.KeyStore.type]", "value", "dfc-generated"]
+      - ["java.security", "KeyStore", True, "getInstance", "(String,String)", "", "Argument[0]", "ReturnValue.SyntheticField[java.security.KeyStore.type]", "value", "dfc-generated"]
       - ["java.security", "KeyStore", True, "getProvider", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.security", "KeyStore", True, "getType", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security", "KeyStore", True, "getType", "()", "", "Argument[this].SyntheticField[java.security.KeyStore.type]", "ReturnValue", "value", "dfc-generated"]
       - ["java.security", "KeyStoreException", True, "KeyStoreException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.security", "KeyStoreException", True, "KeyStoreException", "(String,Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.security", "KeyStoreException", True, "KeyStoreException", "(String,Throwable)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
       - ["java.security", "KeyStoreException", True, "KeyStoreException", "(Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security", "KeyStoreSpi", True, "engineAliases", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security", "KeyStoreSpi", True, "engineGetCertificate", "(String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security", "KeyStoreSpi", True, "engineGetCertificateAlias", "(Certificate)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security", "KeyStoreSpi", True, "engineGetCertificateChain", "(String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.security", "KeyStoreSpi", True, "engineGetEntry", "(String,KeyStore$ProtectionParameter)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security", "KeyStoreSpi", True, "engineLoad", "(InputStream,char[])", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security", "KeyStoreSpi", True, "engineSetCertificateEntry", "(String,Certificate)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.security", "KeyStoreSpi", True, "engineSetEntry", "(String,KeyStore$Entry,KeyStore$ProtectionParameter)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.security", "MessageDigest", True, "getAlgorithm", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.security", "MessageDigest", True, "getInstance", "(String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["java.security", "MessageDigest", True, "getInstance", "(String,Provider)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["java.security", "MessageDigest", True, "getInstance", "(String,Provider)", "", "Argument[1].Element", "ReturnValue", "taint", "df-generated"]
-      - ["java.security", "MessageDigest", True, "getInstance", "(String,String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security", "KeyStoreSpi", True, "engineSetKeyEntry", "(String,Key,char[],Certificate[])", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security", "KeyStoreSpi", True, "engineSetKeyEntry", "(String,byte[],Certificate[])", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security", "MessageDigest", True, "getAlgorithm", "()", "", "Argument[this].SyntheticField[java.security.MessageDigest.algorithm]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.security", "MessageDigest", True, "getInstance", "(String)", "", "Argument[0]", "ReturnValue.SyntheticField[java.security.MessageDigest.algorithm]", "value", "dfc-generated"]
+      - ["java.security", "MessageDigest", True, "getInstance", "(String,Provider)", "", "Argument[0]", "ReturnValue.SyntheticField[java.security.MessageDigest.algorithm]", "value", "dfc-generated"]
+      - ["java.security", "MessageDigest", True, "getInstance", "(String,String)", "", "Argument[0]", "ReturnValue.SyntheticField[java.security.MessageDigest.algorithm]", "value", "dfc-generated"]
       - ["java.security", "MessageDigest", True, "getProvider", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.security", "MessageDigest", True, "update", "(ByteBuffer)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.security", "MessageDigest", True, "update", "(byte[])", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
@@ -207,50 +205,50 @@ extensions:
       - ["java.security", "NoSuchAlgorithmException", True, "NoSuchAlgorithmException", "(String,Throwable)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
       - ["java.security", "NoSuchAlgorithmException", True, "NoSuchAlgorithmException", "(Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.security", "NoSuchProviderException", True, "NoSuchProviderException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.security", "PKCS12Attribute", False, "PKCS12Attribute", "(String,String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.security", "PKCS12Attribute", False, "PKCS12Attribute", "(String,String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["java.security", "PKCS12Attribute", False, "PKCS12Attribute", "(byte[])", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.security", "PKCS12Attribute", False, "getEncoded", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.security", "Permission", True, "Permission", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security", "PKCS12Attribute", False, "PKCS12Attribute", "(String,String)", "", "Argument[0]", "Argument[this].SyntheticField[java.security.PKCS12Attribute.name]", "value", "dfc-generated"]
+      - ["java.security", "PKCS12Attribute", False, "PKCS12Attribute", "(String,String)", "", "Argument[1]", "Argument[this].SyntheticField[java.security.PKCS12Attribute.value]", "value", "dfc-generated"]
+      - ["java.security", "PKCS12Attribute", False, "PKCS12Attribute", "(byte[])", "", "Argument[0]", "Argument[this].SyntheticField[java.security.PKCS12Attribute.encoded]", "value", "dfc-generated"]
+      - ["java.security", "PKCS12Attribute", False, "getEncoded", "()", "", "Argument[this].SyntheticField[java.security.PKCS12Attribute.encoded]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.security", "PKCS12Attribute", False, "getName", "()", "", "Argument[this].SyntheticField[java.security.PKCS12Attribute.name]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.security", "PKCS12Attribute", False, "getValue", "()", "", "Argument[this].SyntheticField[java.security.PKCS12Attribute.value]", "ReturnValue", "value", "dfc-generated"]
       - ["java.security", "Permission", True, "getActions", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.security", "Permission", True, "getName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.security", "PermissionCollection", True, "add", "(Permission)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.security", "PermissionCollection", True, "elements", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.security", "Policy", True, "getInstance", "(String,Policy$Parameters)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["java.security", "Policy", True, "getInstance", "(String,Policy$Parameters)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["java.security", "Policy", True, "getInstance", "(String,Policy$Parameters,Provider)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["java.security", "Policy", True, "getInstance", "(String,Policy$Parameters,Provider)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["java.security", "Policy", True, "getInstance", "(String,Policy$Parameters,Provider)", "", "Argument[2].Element", "ReturnValue", "taint", "df-generated"]
-      - ["java.security", "Policy", True, "getInstance", "(String,Policy$Parameters,String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["java.security", "Policy", True, "getInstance", "(String,Policy$Parameters,String)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security", "Policy", True, "getInstance", "(String,Policy$Parameters)", "", "Argument[0]", "ReturnValue.SyntheticField[java.security.Policy$PolicyDelegate.type]", "value", "dfc-generated"]
+      - ["java.security", "Policy", True, "getInstance", "(String,Policy$Parameters)", "", "Argument[1]", "ReturnValue.SyntheticField[java.security.Policy$PolicyDelegate.params]", "value", "dfc-generated"]
+      - ["java.security", "Policy", True, "getInstance", "(String,Policy$Parameters,Provider)", "", "Argument[0]", "ReturnValue.SyntheticField[java.security.Policy$PolicyDelegate.type]", "value", "dfc-generated"]
+      - ["java.security", "Policy", True, "getInstance", "(String,Policy$Parameters,Provider)", "", "Argument[1]", "ReturnValue.SyntheticField[java.security.Policy$PolicyDelegate.params]", "value", "dfc-generated"]
+      - ["java.security", "Policy", True, "getInstance", "(String,Policy$Parameters,String)", "", "Argument[0]", "ReturnValue.SyntheticField[java.security.Policy$PolicyDelegate.type]", "value", "dfc-generated"]
+      - ["java.security", "Policy", True, "getInstance", "(String,Policy$Parameters,String)", "", "Argument[1]", "ReturnValue.SyntheticField[java.security.Policy$PolicyDelegate.params]", "value", "dfc-generated"]
       - ["java.security", "Policy", True, "getParameters", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.security", "Policy", True, "getProvider", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.security", "Policy", True, "getType", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.security", "Policy", True, "implies", "(ProtectionDomain,Permission)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.security", "Principal", True, "getName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.security", "PrivilegedActionException", True, "PrivilegedActionException", "(Exception)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.security", "PrivilegedActionException", True, "getException", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.security", "ProtectionDomain", True, "ProtectionDomain", "(CodeSource,PermissionCollection)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.security", "ProtectionDomain", True, "ProtectionDomain", "(CodeSource,PermissionCollection)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["java.security", "ProtectionDomain", True, "ProtectionDomain", "(CodeSource,PermissionCollection,ClassLoader,Principal[])", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.security", "ProtectionDomain", True, "ProtectionDomain", "(CodeSource,PermissionCollection,ClassLoader,Principal[])", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["java.security", "ProtectionDomain", True, "ProtectionDomain", "(CodeSource,PermissionCollection,ClassLoader,Principal[])", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
-      - ["java.security", "ProtectionDomain", True, "ProtectionDomain", "(CodeSource,PermissionCollection,ClassLoader,Principal[])", "", "Argument[3].ArrayElement", "Argument[this]", "taint", "df-generated"]
-      - ["java.security", "ProtectionDomain", True, "getClassLoader", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.security", "ProtectionDomain", True, "getCodeSource", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.security", "ProtectionDomain", True, "getPermissions", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.security", "ProtectionDomain", True, "getPrincipals", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.security", "Provider$Service", True, "Service", "(Provider,String,String,String,List,Map)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["java.security", "Provider$Service", True, "Service", "(Provider,String,String,String,List,Map)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["java.security", "Provider$Service", True, "Service", "(Provider,String,String,String,List,Map)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
-      - ["java.security", "Provider$Service", True, "Service", "(Provider,String,String,String,List,Map)", "", "Argument[3]", "Argument[this]", "taint", "df-generated"]
-      - ["java.security", "Provider$Service", True, "Service", "(Provider,String,String,String,List,Map)", "", "Argument[4].Element", "Argument[this]", "taint", "df-generated"]
-      - ["java.security", "Provider$Service", True, "Service", "(Provider,String,String,String,List,Map)", "", "Argument[5].Element", "Argument[this]", "taint", "df-generated"]
-      - ["java.security", "Provider$Service", True, "getAlgorithm", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.security", "Provider$Service", True, "getAttribute", "(String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.security", "Provider$Service", True, "getClassName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.security", "Provider$Service", True, "getProvider", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.security", "Provider$Service", True, "getType", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security", "PrivilegedActionException", True, "PrivilegedActionException", "(Exception)", "", "Argument[0]", "Argument[this].SyntheticField[java.lang.Throwable.cause]", "value", "dfc-generated"]
+      - ["java.security", "PrivilegedActionException", True, "getException", "()", "", "Argument[this].SyntheticField[java.lang.Throwable.cause]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.security", "ProtectionDomain", True, "ProtectionDomain", "(CodeSource,PermissionCollection)", "", "Argument[0]", "Argument[this].SyntheticField[java.security.ProtectionDomain.codesource]", "value", "dfc-generated"]
+      - ["java.security", "ProtectionDomain", True, "ProtectionDomain", "(CodeSource,PermissionCollection)", "", "Argument[1]", "Argument[this].SyntheticField[java.security.ProtectionDomain.permissions]", "value", "dfc-generated"]
+      - ["java.security", "ProtectionDomain", True, "ProtectionDomain", "(CodeSource,PermissionCollection,ClassLoader,Principal[])", "", "Argument[0]", "Argument[this].SyntheticField[java.security.ProtectionDomain.codesource]", "value", "dfc-generated"]
+      - ["java.security", "ProtectionDomain", True, "ProtectionDomain", "(CodeSource,PermissionCollection,ClassLoader,Principal[])", "", "Argument[1]", "Argument[this].SyntheticField[java.security.ProtectionDomain.permissions]", "value", "dfc-generated"]
+      - ["java.security", "ProtectionDomain", True, "ProtectionDomain", "(CodeSource,PermissionCollection,ClassLoader,Principal[])", "", "Argument[2]", "Argument[this].SyntheticField[java.security.ProtectionDomain.classloader]", "value", "dfc-generated"]
+      - ["java.security", "ProtectionDomain", True, "ProtectionDomain", "(CodeSource,PermissionCollection,ClassLoader,Principal[])", "", "Argument[3]", "Argument[this].SyntheticField[java.security.ProtectionDomain.principals]", "value", "dfc-generated"]
+      - ["java.security", "ProtectionDomain", True, "getClassLoader", "()", "", "Argument[this].SyntheticField[java.security.ProtectionDomain.classloader]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.security", "ProtectionDomain", True, "getCodeSource", "()", "", "Argument[this].SyntheticField[java.security.ProtectionDomain.codesource]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.security", "ProtectionDomain", True, "getPermissions", "()", "", "Argument[this].SyntheticField[java.security.ProtectionDomain.permissions]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.security", "ProtectionDomain", True, "getPrincipals", "()", "", "Argument[this].SyntheticField[java.security.ProtectionDomain.principals]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.security", "Provider$Service", True, "Service", "(Provider,String,String,String,List,Map)", "", "Argument[0]", "Argument[this].SyntheticField[java.security.Provider$Service.provider]", "value", "dfc-generated"]
+      - ["java.security", "Provider$Service", True, "Service", "(Provider,String,String,String,List,Map)", "", "Argument[1]", "Argument[this].SyntheticField[java.security.Provider$Service.type]", "value", "dfc-generated"]
+      - ["java.security", "Provider$Service", True, "Service", "(Provider,String,String,String,List,Map)", "", "Argument[2]", "Argument[this].SyntheticField[java.security.Provider$Service.algorithm]", "value", "dfc-generated"]
+      - ["java.security", "Provider$Service", True, "Service", "(Provider,String,String,String,List,Map)", "", "Argument[3]", "Argument[this].SyntheticField[java.security.Provider$Service.className]", "value", "dfc-generated"]
+      - ["java.security", "Provider$Service", True, "Service", "(Provider,String,String,String,List,Map)", "", "Argument[5].MapValue", "Argument[this].SyntheticField[java.security.Provider$Service.attributes].MapValue", "value", "dfc-generated"]
+      - ["java.security", "Provider$Service", True, "getAlgorithm", "()", "", "Argument[this].SyntheticField[java.security.Provider$Service.algorithm]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.security", "Provider$Service", True, "getAttribute", "(String)", "", "Argument[this].SyntheticField[java.security.Provider$Service.attributes].MapValue", "ReturnValue", "value", "dfc-generated"]
+      - ["java.security", "Provider$Service", True, "getClassName", "()", "", "Argument[this].SyntheticField[java.security.Provider$Service.className]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.security", "Provider$Service", True, "getProvider", "()", "", "Argument[this].SyntheticField[java.security.Provider$Service.provider]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.security", "Provider$Service", True, "getType", "()", "", "Argument[this].SyntheticField[java.security.Provider$Service.type]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.security", "Provider$Service", True, "newInstance", "(Object)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security", "Provider$Service", True, "newInstance", "(Object)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.security", "Provider", True, "getInfo", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.security", "Provider", True, "getName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.security", "Provider", True, "getService", "(String,String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
@@ -260,8 +258,6 @@ extensions:
       - ["java.security", "ProviderException", True, "ProviderException", "(String,Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.security", "ProviderException", True, "ProviderException", "(String,Throwable)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
       - ["java.security", "ProviderException", True, "ProviderException", "(Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.security", "SecureRandom", True, "SecureRandom", "(byte[])", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.security", "SecureRandom", True, "getAlgorithm", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.security", "SecureRandom", True, "getInstance", "(String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["java.security", "SecureRandom", True, "getInstance", "(String,Provider)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["java.security", "SecureRandom", True, "getInstance", "(String,Provider)", "", "Argument[1].Element", "ReturnValue", "taint", "df-generated"]
@@ -271,14 +267,12 @@ extensions:
       - ["java.security", "SecureRandom", True, "getInstance", "(String,SecureRandomParameters,String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["java.security", "SecureRandom", True, "getInstance", "(String,String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["java.security", "SecureRandom", True, "getProvider", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.security", "SecureRandom", True, "setSeed", "(byte[])", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.security", "SecurityPermission", False, "SecurityPermission", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.security", "SecurityPermission", False, "SecurityPermission", "(String,String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.security", "Signature", True, "getAlgorithm", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.security", "Signature", True, "getInstance", "(String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["java.security", "Signature", True, "getInstance", "(String,Provider)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["java.security", "Signature", True, "getInstance", "(String,Provider)", "", "Argument[1].Element", "ReturnValue", "taint", "df-generated"]
-      - ["java.security", "Signature", True, "getInstance", "(String,String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security", "SecurityPermission", False, "SecurityPermission", "(String)", "", "Argument[0]", "Argument[this]", "taint", "dfc-generated"]
+      - ["java.security", "SecurityPermission", False, "SecurityPermission", "(String,String)", "", "Argument[0]", "Argument[this]", "taint", "dfc-generated"]
+      - ["java.security", "Signature", True, "getAlgorithm", "()", "", "Argument[this].SyntheticField[java.security.Signature.algorithm]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.security", "Signature", True, "getInstance", "(String)", "", "Argument[0]", "ReturnValue.SyntheticField[java.security.Signature.algorithm]", "value", "dfc-generated"]
+      - ["java.security", "Signature", True, "getInstance", "(String,Provider)", "", "Argument[0]", "ReturnValue.SyntheticField[java.security.Signature.algorithm]", "value", "dfc-generated"]
+      - ["java.security", "Signature", True, "getInstance", "(String,String)", "", "Argument[0]", "ReturnValue.SyntheticField[java.security.Signature.algorithm]", "value", "dfc-generated"]
       - ["java.security", "Signature", True, "getParameters", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.security", "Signature", True, "getProvider", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.security", "Signature", True, "initSign", "(PrivateKey)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
@@ -292,12 +286,8 @@ extensions:
       - ["java.security", "SignatureException", True, "SignatureException", "(String,Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.security", "SignatureException", True, "SignatureException", "(String,Throwable)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
       - ["java.security", "SignatureException", True, "SignatureException", "(Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.security", "SignedObject", False, "SignedObject", "(Serializable,PrivateKey,Signature)", "", "Argument[0]", "Argument[2]", "taint", "df-generated"]
-      - ["java.security", "SignedObject", False, "SignedObject", "(Serializable,PrivateKey,Signature)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.security", "SignedObject", False, "SignedObject", "(Serializable,PrivateKey,Signature)", "", "Argument[1]", "Argument[2]", "taint", "df-generated"]
-      - ["java.security", "SignedObject", False, "SignedObject", "(Serializable,PrivateKey,Signature)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
-      - ["java.security", "SignedObject", False, "SignedObject", "(Serializable,PrivateKey,Signature)", "", "Argument[this]", "Argument[2]", "taint", "df-generated"]
-      - ["java.security", "SignedObject", False, "getAlgorithm", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security", "SignedObject", False, "SignedObject", "(Serializable,PrivateKey,Signature)", "", "Argument[2].SyntheticField[java.security.Signature.algorithm]", "Argument[this].SyntheticField[java.security.SignedObject.thealgorithm]", "value", "dfc-generated"]
+      - ["java.security", "SignedObject", False, "getAlgorithm", "()", "", "Argument[this].SyntheticField[java.security.SignedObject.thealgorithm]", "ReturnValue", "value", "dfc-generated"]
       - ["java.security", "SignedObject", False, "getObject", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.security", "SignedObject", False, "getSignature", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.security", "SignedObject", False, "verify", "(PublicKey,Signature)", "", "Argument[0]", "Argument[1]", "taint", "df-generated"]
@@ -305,22 +295,24 @@ extensions:
       - ["java.security", "Signer", True, "Signer", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.security", "Signer", True, "Signer", "(String,IdentityScope)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.security", "Signer", True, "Signer", "(String,IdentityScope)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["java.security", "Signer", True, "getPrivateKey", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.security", "Signer", True, "setKeyPair", "(KeyPair)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.security", "Timestamp", False, "Timestamp", "(Date,CertPath)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["java.security", "Timestamp", False, "getSignerCertPath", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.security", "URIParameter", True, "URIParameter", "(URI)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.security", "URIParameter", True, "getURI", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security", "Signer", True, "getPrivateKey", "()", "", "Argument[this].SyntheticField[java.security.Signer.privateKey]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.security", "Signer", True, "setKeyPair", "(KeyPair)", "", "Argument[0].SyntheticField[java.security.KeyPair.privateKey]", "Argument[this].SyntheticField[java.security.Signer.privateKey]", "value", "dfc-generated"]
+      - ["java.security", "Timestamp", False, "Timestamp", "(Date,CertPath)", "", "Argument[1]", "Argument[this].SyntheticField[java.security.Timestamp.signerCertPath]", "value", "dfc-generated"]
+      - ["java.security", "Timestamp", False, "getSignerCertPath", "()", "", "Argument[this].SyntheticField[java.security.Timestamp.signerCertPath]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.security", "URIParameter", True, "URIParameter", "(URI)", "", "Argument[0]", "Argument[this].SyntheticField[java.security.URIParameter.uri]", "value", "dfc-generated"]
+      - ["java.security", "URIParameter", True, "getURI", "()", "", "Argument[this].SyntheticField[java.security.URIParameter.uri]", "ReturnValue", "value", "dfc-generated"]
       - ["java.security", "UnrecoverableEntryException", True, "UnrecoverableEntryException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.security", "UnrecoverableKeyException", True, "UnrecoverableKeyException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.security", "UnresolvedPermission", False, "UnresolvedPermission", "(String,String,String,Certificate[])", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.security", "UnresolvedPermission", False, "UnresolvedPermission", "(String,String,String,Certificate[])", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["java.security", "UnresolvedPermission", False, "UnresolvedPermission", "(String,String,String,Certificate[])", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
-      - ["java.security", "UnresolvedPermission", False, "UnresolvedPermission", "(String,String,String,Certificate[])", "", "Argument[3].ArrayElement", "Argument[this]", "taint", "df-generated"]
-      - ["java.security", "UnresolvedPermission", False, "getUnresolvedActions", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.security", "UnresolvedPermission", False, "getUnresolvedCerts", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.security", "UnresolvedPermission", False, "getUnresolvedName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.security", "UnresolvedPermission", False, "getUnresolvedType", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security", "UnresolvedPermission", False, "UnresolvedPermission", "(String,String,String,Certificate[])", "", "Argument[0]", "Argument[this].SyntheticField[java.security.UnresolvedPermission.type]", "value", "dfc-generated"]
+      - ["java.security", "UnresolvedPermission", False, "UnresolvedPermission", "(String,String,String,Certificate[])", "", "Argument[0]", "Argument[this]", "taint", "dfc-generated"]
+      - ["java.security", "UnresolvedPermission", False, "UnresolvedPermission", "(String,String,String,Certificate[])", "", "Argument[1]", "Argument[this].SyntheticField[java.security.UnresolvedPermission.name]", "value", "dfc-generated"]
+      - ["java.security", "UnresolvedPermission", False, "UnresolvedPermission", "(String,String,String,Certificate[])", "", "Argument[2]", "Argument[this].SyntheticField[java.security.UnresolvedPermission.actions]", "value", "dfc-generated"]
+      - ["java.security", "UnresolvedPermission", False, "UnresolvedPermission", "(String,String,String,Certificate[])", "", "Argument[3].ArrayElement", "Argument[this].SyntheticField[java.security.UnresolvedPermission.certs].ArrayElement", "value", "dfc-generated"]
+      - ["java.security", "UnresolvedPermission", False, "UnresolvedPermission", "(String,String,String,Certificate[])", "", "Argument[3]", "Argument[this].SyntheticField[java.security.UnresolvedPermission.certs]", "value", "dfc-generated"]
+      - ["java.security", "UnresolvedPermission", False, "getUnresolvedActions", "()", "", "Argument[this].SyntheticField[java.security.UnresolvedPermission.actions]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.security", "UnresolvedPermission", False, "getUnresolvedCerts", "()", "", "Argument[this].SyntheticField[java.security.UnresolvedPermission.certs]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.security", "UnresolvedPermission", False, "getUnresolvedName", "()", "", "Argument[this].SyntheticField[java.security.UnresolvedPermission.name]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.security", "UnresolvedPermission", False, "getUnresolvedType", "()", "", "Argument[this].SyntheticField[java.security.UnresolvedPermission.type]", "ReturnValue", "value", "dfc-generated"]
   - addsTo:
       pack: codeql/java-all
       extensible: neutralModel
@@ -331,10 +323,15 @@ extensions:
       - ["java.security", "AlgorithmParameterGenerator", "generateParameters", "()", "summary", "df-generated"]
       - ["java.security", "AlgorithmParameterGenerator", "init", "(AlgorithmParameterSpec)", "summary", "df-generated"]
       - ["java.security", "AlgorithmParameterGenerator", "init", "(int)", "summary", "df-generated"]
+      - ["java.security", "AlgorithmParameters", "init", "(byte[])", "summary", "df-generated"]
+      - ["java.security", "AlgorithmParameters", "init", "(byte[],String)", "summary", "df-generated"]
       - ["java.security", "AllPermission", "AllPermission", "(String,String)", "summary", "df-generated"]
+      - ["java.security", "AllPermission", "implies", "(Permission)", "summary", "df-generated"]
+      - ["java.security", "AllPermission", "newPermissionCollection", "()", "summary", "df-generated"]
       - ["java.security", "AuthProvider", "login", "(Subject,CallbackHandler)", "summary", "df-generated"]
       - ["java.security", "AuthProvider", "logout", "()", "summary", "df-generated"]
-      - ["java.security", "AuthProvider", "setCallbackHandler", "(CallbackHandler)", "summary", "df-generated"]
+      - ["java.security", "BasicPermission", "implies", "(Permission)", "summary", "df-generated"]
+      - ["java.security", "BasicPermission", "newPermissionCollection", "()", "summary", "df-generated"]
       - ["java.security", "CodeSource", "implies", "(CodeSource)", "summary", "df-generated"]
       - ["java.security", "DigestInputStream", "on", "(boolean)", "summary", "df-generated"]
       - ["java.security", "DigestOutputStream", "on", "(boolean)", "summary", "df-generated"]
@@ -345,7 +342,6 @@ extensions:
       - ["java.security", "DrbgParameters$NextBytes", "getPredictionResistance", "()", "summary", "df-generated"]
       - ["java.security", "DrbgParameters$NextBytes", "getStrength", "()", "summary", "df-generated"]
       - ["java.security", "DrbgParameters$Reseed", "getPredictionResistance", "()", "summary", "df-generated"]
-      - ["java.security", "Guard", "checkGuard", "(Object)", "summary", "df-generated"]
       - ["java.security", "Identity", "removeCertificate", "(Certificate)", "summary", "df-generated"]
       - ["java.security", "IdentityScope", "addIdentity", "(Identity)", "summary", "df-generated"]
       - ["java.security", "IdentityScope", "getIdentity", "(Principal)", "summary", "df-generated"]
@@ -355,10 +351,12 @@ extensions:
       - ["java.security", "IdentityScope", "identities", "()", "summary", "df-generated"]
       - ["java.security", "IdentityScope", "removeIdentity", "(Identity)", "summary", "df-generated"]
       - ["java.security", "IdentityScope", "size", "()", "summary", "df-generated"]
-      - ["java.security", "Key", "getFormat", "()", "summary", "df-generated"]
       - ["java.security", "KeyPairGenerator", "initialize", "(int)", "summary", "df-generated"]
       - ["java.security", "KeyStore$Builder", "newInstance", "(KeyStore,KeyStore$ProtectionParameter)", "summary", "df-generated"]
       - ["java.security", "KeyStore$Builder", "newInstance", "(String,Provider,KeyStore$ProtectionParameter)", "summary", "df-generated"]
+      - ["java.security", "KeyStore$Entry", "getAttributes", "()", "summary", "df-generated"]
+      - ["java.security", "KeyStore$PasswordProtection", "destroy", "()", "summary", "df-generated"]
+      - ["java.security", "KeyStore$PasswordProtection", "isDestroyed", "()", "summary", "df-generated"]
       - ["java.security", "KeyStore", "containsAlias", "(String)", "summary", "df-generated"]
       - ["java.security", "KeyStore", "deleteEntry", "(String)", "summary", "df-generated"]
       - ["java.security", "KeyStore", "entryInstanceOf", "(String,Class)", "summary", "df-generated"]
@@ -381,23 +379,15 @@ extensions:
       - ["java.security", "KeyStore", "size", "()", "summary", "df-generated"]
       - ["java.security", "KeyStore", "store", "(KeyStore$LoadStoreParameter)", "summary", "df-generated"]
       - ["java.security", "KeyStore", "store", "(OutputStream,char[])", "summary", "df-generated"]
-      - ["java.security", "KeyStoreSpi", "engineAliases", "()", "summary", "df-generated"]
       - ["java.security", "KeyStoreSpi", "engineContainsAlias", "(String)", "summary", "df-generated"]
       - ["java.security", "KeyStoreSpi", "engineDeleteEntry", "(String)", "summary", "df-generated"]
       - ["java.security", "KeyStoreSpi", "engineEntryInstanceOf", "(String,Class)", "summary", "df-generated"]
-      - ["java.security", "KeyStoreSpi", "engineGetCertificate", "(String)", "summary", "df-generated"]
-      - ["java.security", "KeyStoreSpi", "engineGetCertificateAlias", "(Certificate)", "summary", "df-generated"]
-      - ["java.security", "KeyStoreSpi", "engineGetCertificateChain", "(String)", "summary", "df-generated"]
       - ["java.security", "KeyStoreSpi", "engineGetCreationDate", "(String)", "summary", "df-generated"]
       - ["java.security", "KeyStoreSpi", "engineGetKey", "(String,char[])", "summary", "df-generated"]
       - ["java.security", "KeyStoreSpi", "engineIsCertificateEntry", "(String)", "summary", "df-generated"]
       - ["java.security", "KeyStoreSpi", "engineIsKeyEntry", "(String)", "summary", "df-generated"]
-      - ["java.security", "KeyStoreSpi", "engineLoad", "(InputStream,char[])", "summary", "df-generated"]
       - ["java.security", "KeyStoreSpi", "engineLoad", "(KeyStore$LoadStoreParameter)", "summary", "df-generated"]
       - ["java.security", "KeyStoreSpi", "engineProbe", "(InputStream)", "summary", "df-generated"]
-      - ["java.security", "KeyStoreSpi", "engineSetCertificateEntry", "(String,Certificate)", "summary", "df-generated"]
-      - ["java.security", "KeyStoreSpi", "engineSetKeyEntry", "(String,Key,char[],Certificate[])", "summary", "df-generated"]
-      - ["java.security", "KeyStoreSpi", "engineSetKeyEntry", "(String,byte[],Certificate[])", "summary", "df-generated"]
       - ["java.security", "KeyStoreSpi", "engineSize", "()", "summary", "df-generated"]
       - ["java.security", "KeyStoreSpi", "engineStore", "(KeyStore$LoadStoreParameter)", "summary", "df-generated"]
       - ["java.security", "KeyStoreSpi", "engineStore", "(OutputStream,char[])", "summary", "df-generated"]
@@ -405,12 +395,14 @@ extensions:
       - ["java.security", "MessageDigest", "isEqual", "(byte[],byte[])", "summary", "df-generated"]
       - ["java.security", "MessageDigest", "reset", "()", "summary", "df-generated"]
       - ["java.security", "MessageDigest", "update", "(byte)", "summary", "df-generated"]
+      - ["java.security", "Permission", "checkGuard", "(Object)", "summary", "df-generated"]
       - ["java.security", "Permission", "implies", "(Permission)", "summary", "df-generated"]
       - ["java.security", "Permission", "newPermissionCollection", "()", "summary", "df-generated"]
       - ["java.security", "PermissionCollection", "elementsAsStream", "()", "summary", "df-generated"]
       - ["java.security", "PermissionCollection", "implies", "(Permission)", "summary", "df-generated"]
       - ["java.security", "PermissionCollection", "isReadOnly", "()", "summary", "df-generated"]
       - ["java.security", "PermissionCollection", "setReadOnly", "()", "summary", "df-generated"]
+      - ["java.security", "Permissions", "implies", "(Permission)", "summary", "df-generated"]
       - ["java.security", "Policy", "getPermissions", "(CodeSource)", "summary", "df-generated"]
       - ["java.security", "Policy", "getPermissions", "(ProtectionDomain)", "summary", "df-generated"]
       - ["java.security", "Policy", "getPolicy", "()", "summary", "df-generated"]
@@ -419,18 +411,27 @@ extensions:
       - ["java.security", "Principal", "implies", "(Subject)", "summary", "df-generated"]
       - ["java.security", "ProtectionDomain", "implies", "(Permission)", "summary", "df-generated"]
       - ["java.security", "ProtectionDomain", "staticPermissionsOnly", "()", "summary", "df-generated"]
-      - ["java.security", "Provider$Service", "newInstance", "(Object)", "summary", "df-generated"]
       - ["java.security", "Provider$Service", "supportsParameter", "(Object)", "summary", "df-generated"]
+      - ["java.security", "Provider", "compute", "(Object,BiFunction)", "summary", "df-generated"]
+      - ["java.security", "Provider", "computeIfPresent", "(Object,BiFunction)", "summary", "df-generated"]
       - ["java.security", "Provider", "configure", "(String)", "summary", "df-generated"]
       - ["java.security", "Provider", "getVersion", "()", "summary", "df-generated"]
       - ["java.security", "Provider", "isConfigured", "()", "summary", "df-generated"]
+      - ["java.security", "Provider", "load", "(InputStream)", "summary", "df-generated"]
+      - ["java.security", "Provider", "remove", "(Object,Object)", "summary", "df-generated"]
+      - ["java.security", "Provider", "replaceAll", "(BiFunction)", "summary", "df-generated"]
+      - ["java.security", "SecureRandom", "SecureRandom", "(byte[])", "summary", "df-generated"]
       - ["java.security", "SecureRandom", "generateSeed", "(int)", "summary", "df-generated"]
+      - ["java.security", "SecureRandom", "getAlgorithm", "()", "summary", "df-generated"]
       - ["java.security", "SecureRandom", "getInstanceStrong", "()", "summary", "df-generated"]
       - ["java.security", "SecureRandom", "getParameters", "()", "summary", "df-generated"]
       - ["java.security", "SecureRandom", "getSeed", "(int)", "summary", "df-generated"]
+      - ["java.security", "SecureRandom", "nextBytes", "(byte[])", "summary", "df-generated"]
       - ["java.security", "SecureRandom", "nextBytes", "(byte[],SecureRandomParameters)", "summary", "df-generated"]
       - ["java.security", "SecureRandom", "reseed", "()", "summary", "df-generated"]
       - ["java.security", "SecureRandom", "reseed", "(SecureRandomParameters)", "summary", "df-generated"]
+      - ["java.security", "SecureRandom", "setSeed", "(byte[])", "summary", "df-generated"]
+      - ["java.security", "SecureRandom", "setSeed", "(long)", "summary", "df-generated"]
       - ["java.security", "Security", "addProvider", "(Provider)", "summary", "df-generated"]
       - ["java.security", "Security", "getAlgorithmProperty", "(String,String)", "summary", "df-generated"]
       - ["java.security", "Security", "getAlgorithms", "(String)", "summary", "df-generated"]
@@ -452,3 +453,5 @@ extensions:
       - ["java.security", "Signature", "verify", "(byte[])", "summary", "df-generated"]
       - ["java.security", "Signature", "verify", "(byte[],int,int)", "summary", "df-generated"]
       - ["java.security", "Timestamp", "getTimestamp", "()", "summary", "df-generated"]
+      - ["java.security", "UnresolvedPermission", "implies", "(Permission)", "summary", "df-generated"]
+      - ["java.security", "UnresolvedPermission", "newPermissionCollection", "()", "summary", "df-generated"]
diff --git a/java/ql/lib/ext/generated/java.security.spec.model.yml b/java/ql/lib/ext/generated/java.security.spec.model.yml
index ba978ed02fa..11c6e6a0a28 100644
--- a/java/ql/lib/ext/generated/java.security.spec.model.yml
+++ b/java/ql/lib/ext/generated/java.security.spec.model.yml
@@ -5,72 +5,71 @@ extensions:
       extensible: summaryModel
     data:
       - ["java.security.spec", "ECGenParameterSpec", True, "ECGenParameterSpec", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.security.spec", "ECParameterSpec", True, "ECParameterSpec", "(EllipticCurve,ECPoint,BigInteger,int)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.security.spec", "ECParameterSpec", True, "ECParameterSpec", "(EllipticCurve,ECPoint,BigInteger,int)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["java.security.spec", "ECParameterSpec", True, "getCurve", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.security.spec", "ECParameterSpec", True, "getGenerator", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.security.spec", "ECPrivateKeySpec", True, "ECPrivateKeySpec", "(BigInteger,ECParameterSpec)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["java.security.spec", "ECPrivateKeySpec", True, "getParams", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.security.spec", "ECPublicKeySpec", True, "ECPublicKeySpec", "(ECPoint,ECParameterSpec)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.security.spec", "ECPublicKeySpec", True, "ECPublicKeySpec", "(ECPoint,ECParameterSpec)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["java.security.spec", "ECPublicKeySpec", True, "getParams", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.security.spec", "ECPublicKeySpec", True, "getW", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.security.spec", "EdDSAParameterSpec", True, "EdDSAParameterSpec", "(boolean,byte[])", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["java.security.spec", "EdDSAParameterSpec", True, "getContext", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.security.spec", "EdECPrivateKeySpec", False, "EdECPrivateKeySpec", "(NamedParameterSpec,byte[])", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.security.spec", "EdECPrivateKeySpec", False, "EdECPrivateKeySpec", "(NamedParameterSpec,byte[])", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["java.security.spec", "EdECPrivateKeySpec", False, "getBytes", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.security.spec", "EdECPrivateKeySpec", False, "getParams", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.security.spec", "EdECPublicKeySpec", False, "EdECPublicKeySpec", "(NamedParameterSpec,EdECPoint)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.security.spec", "EdECPublicKeySpec", False, "EdECPublicKeySpec", "(NamedParameterSpec,EdECPoint)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["java.security.spec", "EdECPublicKeySpec", False, "getParams", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.security.spec", "EdECPublicKeySpec", False, "getPoint", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.security.spec", "EllipticCurve", True, "EllipticCurve", "(ECField,BigInteger,BigInteger)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.security.spec", "EllipticCurve", True, "EllipticCurve", "(ECField,BigInteger,BigInteger,byte[])", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.security.spec", "EllipticCurve", True, "EllipticCurve", "(ECField,BigInteger,BigInteger,byte[])", "", "Argument[3]", "Argument[this]", "taint", "df-generated"]
-      - ["java.security.spec", "EllipticCurve", True, "getField", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.security.spec", "EllipticCurve", True, "getSeed", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.security.spec", "EncodedKeySpec", True, "EncodedKeySpec", "(byte[])", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security.spec", "ECParameterSpec", True, "ECParameterSpec", "(EllipticCurve,ECPoint,BigInteger,int)", "", "Argument[0]", "Argument[this].SyntheticField[java.security.spec.ECParameterSpec.curve]", "value", "dfc-generated"]
+      - ["java.security.spec", "ECParameterSpec", True, "ECParameterSpec", "(EllipticCurve,ECPoint,BigInteger,int)", "", "Argument[1]", "Argument[this].SyntheticField[java.security.spec.ECParameterSpec.g]", "value", "dfc-generated"]
+      - ["java.security.spec", "ECParameterSpec", True, "getCurve", "()", "", "Argument[this].SyntheticField[java.security.spec.ECParameterSpec.curve]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.security.spec", "ECParameterSpec", True, "getGenerator", "()", "", "Argument[this].SyntheticField[java.security.spec.ECParameterSpec.g]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.security.spec", "ECPrivateKeySpec", True, "ECPrivateKeySpec", "(BigInteger,ECParameterSpec)", "", "Argument[1]", "Argument[this].SyntheticField[java.security.spec.ECPrivateKeySpec.params]", "value", "dfc-generated"]
+      - ["java.security.spec", "ECPrivateKeySpec", True, "getParams", "()", "", "Argument[this].SyntheticField[java.security.spec.ECPrivateKeySpec.params]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.security.spec", "ECPublicKeySpec", True, "ECPublicKeySpec", "(ECPoint,ECParameterSpec)", "", "Argument[0]", "Argument[this].SyntheticField[java.security.spec.ECPublicKeySpec.w]", "value", "dfc-generated"]
+      - ["java.security.spec", "ECPublicKeySpec", True, "ECPublicKeySpec", "(ECPoint,ECParameterSpec)", "", "Argument[1]", "Argument[this].SyntheticField[java.security.spec.ECPublicKeySpec.params]", "value", "dfc-generated"]
+      - ["java.security.spec", "ECPublicKeySpec", True, "getParams", "()", "", "Argument[this].SyntheticField[java.security.spec.ECPublicKeySpec.params]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.security.spec", "ECPublicKeySpec", True, "getW", "()", "", "Argument[this].SyntheticField[java.security.spec.ECPublicKeySpec.w]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.security.spec", "EdDSAParameterSpec", True, "EdDSAParameterSpec", "(boolean,byte[])", "", "Argument[1]", "Argument[this].SyntheticField[java.security.spec.EdDSAParameterSpec.context]", "value", "dfc-generated"]
+      - ["java.security.spec", "EdDSAParameterSpec", True, "getContext", "()", "", "Argument[this].SyntheticField[java.security.spec.EdDSAParameterSpec.context]", "ReturnValue.Element", "value", "dfc-generated"]
+      - ["java.security.spec", "EdECPrivateKeySpec", False, "EdECPrivateKeySpec", "(NamedParameterSpec,byte[])", "", "Argument[0]", "Argument[this].SyntheticField[java.security.spec.EdECPrivateKeySpec.params]", "value", "dfc-generated"]
+      - ["java.security.spec", "EdECPrivateKeySpec", False, "EdECPrivateKeySpec", "(NamedParameterSpec,byte[])", "", "Argument[1]", "Argument[this].SyntheticField[java.security.spec.EdECPrivateKeySpec.bytes]", "value", "dfc-generated"]
+      - ["java.security.spec", "EdECPrivateKeySpec", False, "getBytes", "()", "", "Argument[this].SyntheticField[java.security.spec.EdECPrivateKeySpec.bytes]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.security.spec", "EdECPrivateKeySpec", False, "getParams", "()", "", "Argument[this].SyntheticField[java.security.spec.EdECPrivateKeySpec.params]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.security.spec", "EdECPublicKeySpec", False, "EdECPublicKeySpec", "(NamedParameterSpec,EdECPoint)", "", "Argument[0]", "Argument[this].SyntheticField[java.security.spec.EdECPublicKeySpec.params]", "value", "dfc-generated"]
+      - ["java.security.spec", "EdECPublicKeySpec", False, "EdECPublicKeySpec", "(NamedParameterSpec,EdECPoint)", "", "Argument[1]", "Argument[this].SyntheticField[java.security.spec.EdECPublicKeySpec.point]", "value", "dfc-generated"]
+      - ["java.security.spec", "EdECPublicKeySpec", False, "getParams", "()", "", "Argument[this].SyntheticField[java.security.spec.EdECPublicKeySpec.params]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.security.spec", "EdECPublicKeySpec", False, "getPoint", "()", "", "Argument[this].SyntheticField[java.security.spec.EdECPublicKeySpec.point]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.security.spec", "EllipticCurve", True, "EllipticCurve", "(ECField,BigInteger,BigInteger)", "", "Argument[0]", "Argument[this].SyntheticField[java.security.spec.EllipticCurve.field]", "value", "dfc-generated"]
+      - ["java.security.spec", "EllipticCurve", True, "EllipticCurve", "(ECField,BigInteger,BigInteger,byte[])", "", "Argument[0]", "Argument[this].SyntheticField[java.security.spec.EllipticCurve.field]", "value", "dfc-generated"]
+      - ["java.security.spec", "EllipticCurve", True, "EllipticCurve", "(ECField,BigInteger,BigInteger,byte[])", "", "Argument[3]", "Argument[this].SyntheticField[java.security.spec.EllipticCurve.seed]", "value", "dfc-generated"]
+      - ["java.security.spec", "EllipticCurve", True, "getField", "()", "", "Argument[this].SyntheticField[java.security.spec.EllipticCurve.field]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.security.spec", "EllipticCurve", True, "getSeed", "()", "", "Argument[this].SyntheticField[java.security.spec.EllipticCurve.seed]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.security.spec", "EncodedKeySpec", True, "EncodedKeySpec", "(byte[])", "", "Argument[0]", "Argument[this].SyntheticField[java.security.spec.EncodedKeySpec.encodedKey]", "value", "dfc-generated"]
       - ["java.security.spec", "EncodedKeySpec", True, "getAlgorithm", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.security.spec", "EncodedKeySpec", True, "getEncoded", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security.spec", "EncodedKeySpec", True, "getEncoded", "()", "", "Argument[this].SyntheticField[java.security.spec.EncodedKeySpec.encodedKey]", "ReturnValue", "value", "dfc-generated"]
       - ["java.security.spec", "InvalidKeySpecException", True, "InvalidKeySpecException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.security.spec", "InvalidKeySpecException", True, "InvalidKeySpecException", "(String,Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.security.spec", "InvalidKeySpecException", True, "InvalidKeySpecException", "(String,Throwable)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
       - ["java.security.spec", "InvalidKeySpecException", True, "InvalidKeySpecException", "(Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.security.spec", "InvalidParameterSpecException", True, "InvalidParameterSpecException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.security.spec", "MGF1ParameterSpec", True, "MGF1ParameterSpec", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.security.spec", "MGF1ParameterSpec", True, "getDigestAlgorithm", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.security.spec", "NamedParameterSpec", True, "NamedParameterSpec", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.security.spec", "NamedParameterSpec", True, "getName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.security.spec", "PKCS8EncodedKeySpec", True, "PKCS8EncodedKeySpec", "(byte[])", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.security.spec", "PKCS8EncodedKeySpec", True, "PKCS8EncodedKeySpec", "(byte[],String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.security.spec", "PKCS8EncodedKeySpec", True, "PKCS8EncodedKeySpec", "(byte[],String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["java.security.spec", "PSSParameterSpec", True, "PSSParameterSpec", "(String,String,AlgorithmParameterSpec,int,int)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.security.spec", "PSSParameterSpec", True, "PSSParameterSpec", "(String,String,AlgorithmParameterSpec,int,int)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["java.security.spec", "PSSParameterSpec", True, "PSSParameterSpec", "(String,String,AlgorithmParameterSpec,int,int)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
-      - ["java.security.spec", "PSSParameterSpec", True, "getDigestAlgorithm", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.security.spec", "PSSParameterSpec", True, "getMGFAlgorithm", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.security.spec", "PSSParameterSpec", True, "getMGFParameters", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.security.spec", "RSAKeyGenParameterSpec", True, "RSAKeyGenParameterSpec", "(int,BigInteger,AlgorithmParameterSpec)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
-      - ["java.security.spec", "RSAKeyGenParameterSpec", True, "getKeyParams", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.security.spec", "RSAMultiPrimePrivateCrtKeySpec", True, "RSAMultiPrimePrivateCrtKeySpec", "(BigInteger,BigInteger,BigInteger,BigInteger,BigInteger,BigInteger,BigInteger,BigInteger,RSAOtherPrimeInfo[])", "", "Argument[8].ArrayElement", "Argument[this]", "taint", "df-generated"]
-      - ["java.security.spec", "RSAMultiPrimePrivateCrtKeySpec", True, "RSAMultiPrimePrivateCrtKeySpec", "(BigInteger,BigInteger,BigInteger,BigInteger,BigInteger,BigInteger,BigInteger,BigInteger,RSAOtherPrimeInfo[],AlgorithmParameterSpec)", "", "Argument[8].ArrayElement", "Argument[this]", "taint", "df-generated"]
-      - ["java.security.spec", "RSAMultiPrimePrivateCrtKeySpec", True, "RSAMultiPrimePrivateCrtKeySpec", "(BigInteger,BigInteger,BigInteger,BigInteger,BigInteger,BigInteger,BigInteger,BigInteger,RSAOtherPrimeInfo[],AlgorithmParameterSpec)", "", "Argument[9]", "Argument[this]", "taint", "df-generated"]
-      - ["java.security.spec", "RSAMultiPrimePrivateCrtKeySpec", True, "getOtherPrimeInfo", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security.spec", "MGF1ParameterSpec", True, "MGF1ParameterSpec", "(String)", "", "Argument[0]", "Argument[this].SyntheticField[java.security.spec.MGF1ParameterSpec.mdName]", "value", "dfc-generated"]
+      - ["java.security.spec", "MGF1ParameterSpec", True, "getDigestAlgorithm", "()", "", "Argument[this].SyntheticField[java.security.spec.MGF1ParameterSpec.mdName]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.security.spec", "NamedParameterSpec", True, "NamedParameterSpec", "(String)", "", "Argument[0]", "Argument[this].SyntheticField[java.security.spec.NamedParameterSpec.name]", "value", "dfc-generated"]
+      - ["java.security.spec", "NamedParameterSpec", True, "getName", "()", "", "Argument[this].SyntheticField[java.security.spec.NamedParameterSpec.name]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.security.spec", "PKCS8EncodedKeySpec", True, "PKCS8EncodedKeySpec", "(byte[])", "", "Argument[0]", "Argument[this].SyntheticField[java.security.spec.EncodedKeySpec.encodedKey]", "value", "dfc-generated"]
+      - ["java.security.spec", "PKCS8EncodedKeySpec", True, "PKCS8EncodedKeySpec", "(byte[],String)", "", "Argument[0]", "Argument[this].SyntheticField[java.security.spec.EncodedKeySpec.encodedKey]", "value", "dfc-generated"]
+      - ["java.security.spec", "PKCS8EncodedKeySpec", True, "getEncoded", "()", "", "Argument[this].SyntheticField[java.security.spec.EncodedKeySpec.encodedKey]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.security.spec", "PSSParameterSpec", True, "PSSParameterSpec", "(String,String,AlgorithmParameterSpec,int,int)", "", "Argument[0]", "Argument[this].SyntheticField[java.security.spec.PSSParameterSpec.mdName]", "value", "dfc-generated"]
+      - ["java.security.spec", "PSSParameterSpec", True, "PSSParameterSpec", "(String,String,AlgorithmParameterSpec,int,int)", "", "Argument[1]", "Argument[this].SyntheticField[java.security.spec.PSSParameterSpec.mgfName]", "value", "dfc-generated"]
+      - ["java.security.spec", "PSSParameterSpec", True, "PSSParameterSpec", "(String,String,AlgorithmParameterSpec,int,int)", "", "Argument[2]", "Argument[this].SyntheticField[java.security.spec.PSSParameterSpec.mgfSpec]", "value", "dfc-generated"]
+      - ["java.security.spec", "PSSParameterSpec", True, "getDigestAlgorithm", "()", "", "Argument[this].SyntheticField[java.security.spec.PSSParameterSpec.mdName]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.security.spec", "PSSParameterSpec", True, "getMGFAlgorithm", "()", "", "Argument[this].SyntheticField[java.security.spec.PSSParameterSpec.mgfName]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.security.spec", "PSSParameterSpec", True, "getMGFParameters", "()", "", "Argument[this].SyntheticField[java.security.spec.PSSParameterSpec.mgfSpec]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.security.spec", "RSAKeyGenParameterSpec", True, "RSAKeyGenParameterSpec", "(int,BigInteger,AlgorithmParameterSpec)", "", "Argument[2]", "Argument[this].SyntheticField[java.security.spec.RSAKeyGenParameterSpec.keyParams]", "value", "dfc-generated"]
+      - ["java.security.spec", "RSAKeyGenParameterSpec", True, "getKeyParams", "()", "", "Argument[this].SyntheticField[java.security.spec.RSAKeyGenParameterSpec.keyParams]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.security.spec", "RSAMultiPrimePrivateCrtKeySpec", True, "RSAMultiPrimePrivateCrtKeySpec", "(BigInteger,BigInteger,BigInteger,BigInteger,BigInteger,BigInteger,BigInteger,BigInteger,RSAOtherPrimeInfo[])", "", "Argument[8]", "Argument[this].SyntheticField[java.security.spec.RSAMultiPrimePrivateCrtKeySpec.otherPrimeInfo]", "value", "dfc-generated"]
+      - ["java.security.spec", "RSAMultiPrimePrivateCrtKeySpec", True, "RSAMultiPrimePrivateCrtKeySpec", "(BigInteger,BigInteger,BigInteger,BigInteger,BigInteger,BigInteger,BigInteger,BigInteger,RSAOtherPrimeInfo[],AlgorithmParameterSpec)", "", "Argument[8]", "Argument[this].SyntheticField[java.security.spec.RSAMultiPrimePrivateCrtKeySpec.otherPrimeInfo]", "value", "dfc-generated"]
+      - ["java.security.spec", "RSAMultiPrimePrivateCrtKeySpec", True, "getOtherPrimeInfo", "()", "", "Argument[this].SyntheticField[java.security.spec.RSAMultiPrimePrivateCrtKeySpec.otherPrimeInfo]", "ReturnValue", "value", "dfc-generated"]
       - ["java.security.spec", "RSAPrivateCrtKeySpec", True, "RSAPrivateCrtKeySpec", "(BigInteger,BigInteger,BigInteger,BigInteger,BigInteger,BigInteger,BigInteger,BigInteger,AlgorithmParameterSpec)", "", "Argument[8]", "Argument[this]", "taint", "df-generated"]
-      - ["java.security.spec", "RSAPrivateKeySpec", True, "RSAPrivateKeySpec", "(BigInteger,BigInteger,AlgorithmParameterSpec)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
-      - ["java.security.spec", "RSAPrivateKeySpec", True, "getParams", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.security.spec", "RSAPublicKeySpec", True, "RSAPublicKeySpec", "(BigInteger,BigInteger,AlgorithmParameterSpec)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
-      - ["java.security.spec", "RSAPublicKeySpec", True, "getParams", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.security.spec", "X509EncodedKeySpec", True, "X509EncodedKeySpec", "(byte[])", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.security.spec", "X509EncodedKeySpec", True, "X509EncodedKeySpec", "(byte[],String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.security.spec", "X509EncodedKeySpec", True, "X509EncodedKeySpec", "(byte[],String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["java.security.spec", "XECPrivateKeySpec", True, "XECPrivateKeySpec", "(AlgorithmParameterSpec,byte[])", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.security.spec", "XECPrivateKeySpec", True, "XECPrivateKeySpec", "(AlgorithmParameterSpec,byte[])", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["java.security.spec", "XECPrivateKeySpec", True, "getParams", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.security.spec", "XECPrivateKeySpec", True, "getScalar", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.security.spec", "XECPublicKeySpec", True, "XECPublicKeySpec", "(AlgorithmParameterSpec,BigInteger)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.security.spec", "XECPublicKeySpec", True, "getParams", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security.spec", "RSAPrivateKeySpec", True, "RSAPrivateKeySpec", "(BigInteger,BigInteger,AlgorithmParameterSpec)", "", "Argument[2]", "Argument[this].SyntheticField[java.security.spec.RSAPrivateKeySpec.params]", "value", "dfc-generated"]
+      - ["java.security.spec", "RSAPrivateKeySpec", True, "getParams", "()", "", "Argument[this].SyntheticField[java.security.spec.RSAPrivateKeySpec.params]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.security.spec", "RSAPublicKeySpec", True, "RSAPublicKeySpec", "(BigInteger,BigInteger,AlgorithmParameterSpec)", "", "Argument[2]", "Argument[this].SyntheticField[java.security.spec.RSAPublicKeySpec.params]", "value", "dfc-generated"]
+      - ["java.security.spec", "RSAPublicKeySpec", True, "getParams", "()", "", "Argument[this].SyntheticField[java.security.spec.RSAPublicKeySpec.params]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.security.spec", "X509EncodedKeySpec", True, "X509EncodedKeySpec", "(byte[])", "", "Argument[0]", "Argument[this].SyntheticField[java.security.spec.EncodedKeySpec.encodedKey]", "value", "dfc-generated"]
+      - ["java.security.spec", "X509EncodedKeySpec", True, "X509EncodedKeySpec", "(byte[],String)", "", "Argument[0]", "Argument[this].SyntheticField[java.security.spec.EncodedKeySpec.encodedKey]", "value", "dfc-generated"]
+      - ["java.security.spec", "X509EncodedKeySpec", True, "getEncoded", "()", "", "Argument[this].SyntheticField[java.security.spec.EncodedKeySpec.encodedKey]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.security.spec", "XECPrivateKeySpec", True, "XECPrivateKeySpec", "(AlgorithmParameterSpec,byte[])", "", "Argument[0]", "Argument[this].SyntheticField[java.security.spec.XECPrivateKeySpec.params]", "value", "dfc-generated"]
+      - ["java.security.spec", "XECPrivateKeySpec", True, "XECPrivateKeySpec", "(AlgorithmParameterSpec,byte[])", "", "Argument[1]", "Argument[this].SyntheticField[java.security.spec.XECPrivateKeySpec.scalar]", "value", "dfc-generated"]
+      - ["java.security.spec", "XECPrivateKeySpec", True, "getParams", "()", "", "Argument[this].SyntheticField[java.security.spec.XECPrivateKeySpec.params]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.security.spec", "XECPrivateKeySpec", True, "getScalar", "()", "", "Argument[this].SyntheticField[java.security.spec.XECPrivateKeySpec.scalar]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.security.spec", "XECPublicKeySpec", True, "XECPublicKeySpec", "(AlgorithmParameterSpec,BigInteger)", "", "Argument[0]", "Argument[this].SyntheticField[java.security.spec.XECPublicKeySpec.params]", "value", "dfc-generated"]
+      - ["java.security.spec", "XECPublicKeySpec", True, "getParams", "()", "", "Argument[this].SyntheticField[java.security.spec.XECPublicKeySpec.params]", "ReturnValue", "value", "dfc-generated"]
   - addsTo:
       pack: codeql/java-all
       extensible: neutralModel
@@ -81,6 +80,9 @@ extensions:
       - ["java.security.spec", "DSAGenParameterSpec", "getSeedLength", "()", "summary", "df-generated"]
       - ["java.security.spec", "DSAGenParameterSpec", "getSubprimeQLength", "()", "summary", "df-generated"]
       - ["java.security.spec", "DSAParameterSpec", "DSAParameterSpec", "(BigInteger,BigInteger,BigInteger)", "summary", "df-generated"]
+      - ["java.security.spec", "DSAParameterSpec", "getG", "()", "summary", "df-generated"]
+      - ["java.security.spec", "DSAParameterSpec", "getP", "()", "summary", "df-generated"]
+      - ["java.security.spec", "DSAParameterSpec", "getQ", "()", "summary", "df-generated"]
       - ["java.security.spec", "DSAPrivateKeySpec", "DSAPrivateKeySpec", "(BigInteger,BigInteger,BigInteger,BigInteger)", "summary", "df-generated"]
       - ["java.security.spec", "DSAPrivateKeySpec", "getG", "()", "summary", "df-generated"]
       - ["java.security.spec", "DSAPrivateKeySpec", "getP", "()", "summary", "df-generated"]
@@ -91,14 +93,15 @@ extensions:
       - ["java.security.spec", "DSAPublicKeySpec", "getP", "()", "summary", "df-generated"]
       - ["java.security.spec", "DSAPublicKeySpec", "getQ", "()", "summary", "df-generated"]
       - ["java.security.spec", "DSAPublicKeySpec", "getY", "()", "summary", "df-generated"]
-      - ["java.security.spec", "ECField", "getFieldSize", "()", "summary", "df-generated"]
       - ["java.security.spec", "ECFieldF2m", "ECFieldF2m", "(int)", "summary", "df-generated"]
       - ["java.security.spec", "ECFieldF2m", "ECFieldF2m", "(int,BigInteger)", "summary", "df-generated"]
       - ["java.security.spec", "ECFieldF2m", "ECFieldF2m", "(int,int[])", "summary", "df-generated"]
+      - ["java.security.spec", "ECFieldF2m", "getFieldSize", "()", "summary", "df-generated"]
       - ["java.security.spec", "ECFieldF2m", "getM", "()", "summary", "df-generated"]
       - ["java.security.spec", "ECFieldF2m", "getMidTermsOfReductionPolynomial", "()", "summary", "df-generated"]
       - ["java.security.spec", "ECFieldF2m", "getReductionPolynomial", "()", "summary", "df-generated"]
       - ["java.security.spec", "ECFieldFp", "ECFieldFp", "(BigInteger)", "summary", "df-generated"]
+      - ["java.security.spec", "ECFieldFp", "getFieldSize", "()", "summary", "df-generated"]
       - ["java.security.spec", "ECFieldFp", "getP", "()", "summary", "df-generated"]
       - ["java.security.spec", "ECParameterSpec", "getCofactor", "()", "summary", "df-generated"]
       - ["java.security.spec", "ECParameterSpec", "getOrder", "()", "summary", "df-generated"]
@@ -114,6 +117,7 @@ extensions:
       - ["java.security.spec", "EllipticCurve", "getA", "()", "summary", "df-generated"]
       - ["java.security.spec", "EllipticCurve", "getB", "()", "summary", "df-generated"]
       - ["java.security.spec", "EncodedKeySpec", "getFormat", "()", "summary", "df-generated"]
+      - ["java.security.spec", "PKCS8EncodedKeySpec", "getFormat", "()", "summary", "df-generated"]
       - ["java.security.spec", "PSSParameterSpec", "PSSParameterSpec", "(int)", "summary", "df-generated"]
       - ["java.security.spec", "PSSParameterSpec", "getSaltLength", "()", "summary", "df-generated"]
       - ["java.security.spec", "PSSParameterSpec", "getTrailerField", "()", "summary", "df-generated"]
@@ -143,4 +147,5 @@ extensions:
       - ["java.security.spec", "RSAPublicKeySpec", "RSAPublicKeySpec", "(BigInteger,BigInteger)", "summary", "df-generated"]
       - ["java.security.spec", "RSAPublicKeySpec", "getModulus", "()", "summary", "df-generated"]
       - ["java.security.spec", "RSAPublicKeySpec", "getPublicExponent", "()", "summary", "df-generated"]
+      - ["java.security.spec", "X509EncodedKeySpec", "getFormat", "()", "summary", "df-generated"]
       - ["java.security.spec", "XECPublicKeySpec", "getU", "()", "summary", "df-generated"]
diff --git a/java/ql/lib/ext/generated/java.sql.model.yml b/java/ql/lib/ext/generated/java.sql.model.yml
index 310a430ab75..6cd578b446a 100644
--- a/java/ql/lib/ext/generated/java.sql.model.yml
+++ b/java/ql/lib/ext/generated/java.sql.model.yml
@@ -33,40 +33,53 @@ extensions:
       - ["java.sql", "Clob", True, "getCharacterStream", "(long,long)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.sql", "Clob", True, "getSubString", "(long,int)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.sql", "DataTruncation", True, "DataTruncation", "(int,boolean,boolean,int,int,Throwable)", "", "Argument[5]", "Argument[this]", "taint", "df-generated"]
-      - ["java.sql", "DriverPropertyInfo", True, "DriverPropertyInfo", "(String,String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.sql", "DriverPropertyInfo", True, "DriverPropertyInfo", "(String,String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.sql", "DriverPropertyInfo", True, "DriverPropertyInfo", "(String,String)", "", "Argument[0]", "Argument[this].Field[java.sql.DriverPropertyInfo.name]", "value", "dfc-generated"]
+      - ["java.sql", "DriverPropertyInfo", True, "DriverPropertyInfo", "(String,String)", "", "Argument[1]", "Argument[this].Field[java.sql.DriverPropertyInfo.value]", "value", "dfc-generated"]
       - ["java.sql", "Ref", True, "getBaseTypeName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.sql", "Ref", True, "getObject", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.sql", "Ref", True, "setObject", "(Object)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.sql", "ResultSet", True, "getArray", "(String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.sql", "ResultSet", True, "getArray", "(int)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.sql", "ResultSet", True, "getAsciiStream", "(String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.sql", "ResultSet", True, "getAsciiStream", "(int)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.sql", "ResultSet", True, "getBinaryStream", "(String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.sql", "ResultSet", True, "getBinaryStream", "(int)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.sql", "ResultSet", True, "getBlob", "(String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.sql", "ResultSet", True, "getBlob", "(int)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.sql", "ResultSet", True, "getBytes", "(String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.sql", "ResultSet", True, "getBytes", "(int)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.sql", "ResultSet", True, "getCharacterStream", "(String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.sql", "ResultSet", True, "getCharacterStream", "(int)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.sql", "ResultSet", True, "getClob", "(String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.sql", "ResultSet", True, "getClob", "(int)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.sql", "ResultSet", True, "getMetaData", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.sql", "ResultSet", True, "getObject", "(String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.sql", "ResultSet", True, "getObject", "(String,Map)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.sql", "ResultSet", True, "getObject", "(int)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.sql", "ResultSet", True, "getObject", "(int,Map)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.sql", "ResultSet", True, "getRef", "(String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.sql", "ResultSet", True, "getRef", "(int)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.sql", "ResultSet", True, "getTime", "(String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.sql", "ResultSet", True, "getTime", "(int)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.sql", "ResultSet", True, "getTimestamp", "(int)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.sql", "ResultSet", True, "getURL", "(String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.sql", "ResultSet", True, "getURL", "(int)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.sql", "ResultSet", True, "getUnicodeStream", "(String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.sql", "ResultSet", True, "getUnicodeStream", "(int)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.sql", "ResultSet", True, "getWarnings", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.sql", "ResultSetMetaData", True, "getCatalogName", "(int)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.sql", "ResultSetMetaData", True, "getColumnLabel", "(int)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.sql", "ResultSetMetaData", True, "getColumnName", "(int)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.sql", "ResultSetMetaData", True, "getColumnTypeName", "(int)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.sql", "ResultSetMetaData", True, "getSchemaName", "(int)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.sql", "ResultSetMetaData", True, "getTableName", "(int)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.sql", "SQLClientInfoException", True, "SQLClientInfoException", "(Map)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["java.sql", "SQLClientInfoException", True, "SQLClientInfoException", "(Map,Throwable)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["java.sql", "SQLClientInfoException", True, "SQLClientInfoException", "(Map,Throwable)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["java.sql", "SQLClientInfoException", True, "SQLClientInfoException", "(String,Map)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.sql", "SQLClientInfoException", True, "SQLClientInfoException", "(String,Map)", "", "Argument[1].Element", "Argument[this]", "taint", "df-generated"]
-      - ["java.sql", "SQLClientInfoException", True, "SQLClientInfoException", "(String,Map,Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.sql", "SQLClientInfoException", True, "SQLClientInfoException", "(String,Map,Throwable)", "", "Argument[1].Element", "Argument[this]", "taint", "df-generated"]
-      - ["java.sql", "SQLClientInfoException", True, "SQLClientInfoException", "(String,Map,Throwable)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
-      - ["java.sql", "SQLClientInfoException", True, "SQLClientInfoException", "(String,String,Map)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.sql", "SQLClientInfoException", True, "SQLClientInfoException", "(String,String,Map)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["java.sql", "SQLClientInfoException", True, "SQLClientInfoException", "(String,String,Map)", "", "Argument[2].Element", "Argument[this]", "taint", "df-generated"]
-      - ["java.sql", "SQLClientInfoException", True, "SQLClientInfoException", "(String,String,Map,Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.sql", "SQLClientInfoException", True, "SQLClientInfoException", "(String,String,Map,Throwable)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["java.sql", "SQLClientInfoException", True, "SQLClientInfoException", "(String,String,Map,Throwable)", "", "Argument[2].Element", "Argument[this]", "taint", "df-generated"]
-      - ["java.sql", "SQLClientInfoException", True, "SQLClientInfoException", "(String,String,Map,Throwable)", "", "Argument[3]", "Argument[this]", "taint", "df-generated"]
-      - ["java.sql", "SQLClientInfoException", True, "SQLClientInfoException", "(String,String,int,Map)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.sql", "SQLClientInfoException", True, "SQLClientInfoException", "(String,String,int,Map)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["java.sql", "SQLClientInfoException", True, "SQLClientInfoException", "(String,String,int,Map)", "", "Argument[3].Element", "Argument[this]", "taint", "df-generated"]
-      - ["java.sql", "SQLClientInfoException", True, "SQLClientInfoException", "(String,String,int,Map,Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.sql", "SQLClientInfoException", True, "SQLClientInfoException", "(String,String,int,Map,Throwable)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["java.sql", "SQLClientInfoException", True, "SQLClientInfoException", "(String,String,int,Map,Throwable)", "", "Argument[3].Element", "Argument[this]", "taint", "df-generated"]
-      - ["java.sql", "SQLClientInfoException", True, "SQLClientInfoException", "(String,String,int,Map,Throwable)", "", "Argument[4]", "Argument[this]", "taint", "df-generated"]
-      - ["java.sql", "SQLClientInfoException", True, "getFailedProperties", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.sql", "SQLClientInfoException", True, "SQLClientInfoException", "(Map)", "", "Argument[0]", "Argument[this].SyntheticField[java.sql.SQLClientInfoException.failedProperties]", "value", "dfc-generated"]
+      - ["java.sql", "SQLClientInfoException", True, "SQLClientInfoException", "(Map,Throwable)", "", "Argument[0]", "Argument[this].SyntheticField[java.sql.SQLClientInfoException.failedProperties]", "value", "dfc-generated"]
+      - ["java.sql", "SQLClientInfoException", True, "SQLClientInfoException", "(String,Map)", "", "Argument[1]", "Argument[this].SyntheticField[java.sql.SQLClientInfoException.failedProperties]", "value", "dfc-generated"]
+      - ["java.sql", "SQLClientInfoException", True, "SQLClientInfoException", "(String,Map,Throwable)", "", "Argument[1]", "Argument[this].SyntheticField[java.sql.SQLClientInfoException.failedProperties]", "value", "dfc-generated"]
+      - ["java.sql", "SQLClientInfoException", True, "SQLClientInfoException", "(String,String,Map)", "", "Argument[2]", "Argument[this].SyntheticField[java.sql.SQLClientInfoException.failedProperties]", "value", "dfc-generated"]
+      - ["java.sql", "SQLClientInfoException", True, "SQLClientInfoException", "(String,String,Map,Throwable)", "", "Argument[2]", "Argument[this].SyntheticField[java.sql.SQLClientInfoException.failedProperties]", "value", "dfc-generated"]
+      - ["java.sql", "SQLClientInfoException", True, "SQLClientInfoException", "(String,String,int,Map)", "", "Argument[3]", "Argument[this].SyntheticField[java.sql.SQLClientInfoException.failedProperties]", "value", "dfc-generated"]
+      - ["java.sql", "SQLClientInfoException", True, "SQLClientInfoException", "(String,String,int,Map,Throwable)", "", "Argument[3]", "Argument[this].SyntheticField[java.sql.SQLClientInfoException.failedProperties]", "value", "dfc-generated"]
+      - ["java.sql", "SQLClientInfoException", True, "getFailedProperties", "()", "", "Argument[this].SyntheticField[java.sql.SQLClientInfoException.failedProperties]", "ReturnValue", "value", "dfc-generated"]
       - ["java.sql", "SQLDataException", True, "SQLDataException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.sql", "SQLDataException", True, "SQLDataException", "(String,String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.sql", "SQLDataException", True, "SQLDataException", "(String,String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
@@ -82,21 +95,15 @@ extensions:
       - ["java.sql", "SQLDataException", True, "SQLDataException", "(String,Throwable)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
       - ["java.sql", "SQLDataException", True, "SQLDataException", "(Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.sql", "SQLException", True, "SQLException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.sql", "SQLException", True, "SQLException", "(String,String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.sql", "SQLException", True, "SQLException", "(String,String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["java.sql", "SQLException", True, "SQLException", "(String,String,Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.sql", "SQLException", True, "SQLException", "(String,String,Throwable)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["java.sql", "SQLException", True, "SQLException", "(String,String,Throwable)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
-      - ["java.sql", "SQLException", True, "SQLException", "(String,String,int)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.sql", "SQLException", True, "SQLException", "(String,String,int)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["java.sql", "SQLException", True, "SQLException", "(String,String,int,Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.sql", "SQLException", True, "SQLException", "(String,String,int,Throwable)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["java.sql", "SQLException", True, "SQLException", "(String,String,int,Throwable)", "", "Argument[3]", "Argument[this]", "taint", "df-generated"]
+      - ["java.sql", "SQLException", True, "SQLException", "(String,String)", "", "Argument[1]", "Argument[this].SyntheticField[java.sql.SQLException.SQLState]", "value", "dfc-generated"]
+      - ["java.sql", "SQLException", True, "SQLException", "(String,String,Throwable)", "", "Argument[1]", "Argument[this].SyntheticField[java.sql.SQLException.SQLState]", "value", "dfc-generated"]
+      - ["java.sql", "SQLException", True, "SQLException", "(String,String,int)", "", "Argument[1]", "Argument[this].SyntheticField[java.sql.SQLException.SQLState]", "value", "dfc-generated"]
+      - ["java.sql", "SQLException", True, "SQLException", "(String,String,int,Throwable)", "", "Argument[1]", "Argument[this].SyntheticField[java.sql.SQLException.SQLState]", "value", "dfc-generated"]
       - ["java.sql", "SQLException", True, "SQLException", "(String,Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.sql", "SQLException", True, "SQLException", "(String,Throwable)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
       - ["java.sql", "SQLException", True, "SQLException", "(Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.sql", "SQLException", True, "getNextException", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.sql", "SQLException", True, "getSQLState", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.sql", "SQLException", True, "getSQLState", "()", "", "Argument[this].SyntheticField[java.sql.SQLException.SQLState]", "ReturnValue", "value", "dfc-generated"]
       - ["java.sql", "SQLFeatureNotSupportedException", True, "SQLFeatureNotSupportedException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.sql", "SQLFeatureNotSupportedException", True, "SQLFeatureNotSupportedException", "(String,String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.sql", "SQLFeatureNotSupportedException", True, "SQLFeatureNotSupportedException", "(String,String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
@@ -111,24 +118,6 @@ extensions:
       - ["java.sql", "SQLFeatureNotSupportedException", True, "SQLFeatureNotSupportedException", "(String,Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.sql", "SQLFeatureNotSupportedException", True, "SQLFeatureNotSupportedException", "(String,Throwable)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
       - ["java.sql", "SQLFeatureNotSupportedException", True, "SQLFeatureNotSupportedException", "(Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.sql", "SQLInput", True, "readArray", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.sql", "SQLInput", True, "readAsciiStream", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.sql", "SQLInput", True, "readBinaryStream", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.sql", "SQLInput", True, "readBlob", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.sql", "SQLInput", True, "readBytes", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.sql", "SQLInput", True, "readCharacterStream", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.sql", "SQLInput", True, "readClob", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.sql", "SQLInput", True, "readDate", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.sql", "SQLInput", True, "readNClob", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.sql", "SQLInput", True, "readNString", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.sql", "SQLInput", True, "readObject", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.sql", "SQLInput", True, "readRef", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.sql", "SQLInput", True, "readRowId", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.sql", "SQLInput", True, "readSQLXML", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.sql", "SQLInput", True, "readString", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.sql", "SQLInput", True, "readTime", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.sql", "SQLInput", True, "readTimestamp", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.sql", "SQLInput", True, "readURL", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.sql", "SQLIntegrityConstraintViolationException", True, "SQLIntegrityConstraintViolationException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.sql", "SQLIntegrityConstraintViolationException", True, "SQLIntegrityConstraintViolationException", "(String,String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.sql", "SQLIntegrityConstraintViolationException", True, "SQLIntegrityConstraintViolationException", "(String,String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
@@ -197,8 +186,8 @@ extensions:
       - ["java.sql", "SQLOutput", True, "writeString", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.sql", "SQLOutput", True, "writeTime", "(Time)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.sql", "SQLOutput", True, "writeTimestamp", "(Timestamp)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.sql", "SQLPermission", False, "SQLPermission", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.sql", "SQLPermission", False, "SQLPermission", "(String,String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.sql", "SQLPermission", False, "SQLPermission", "(String)", "", "Argument[0]", "Argument[this]", "taint", "dfc-generated"]
+      - ["java.sql", "SQLPermission", False, "SQLPermission", "(String,String)", "", "Argument[0]", "Argument[this]", "taint", "dfc-generated"]
       - ["java.sql", "SQLRecoverableException", True, "SQLRecoverableException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.sql", "SQLRecoverableException", True, "SQLRecoverableException", "(String,String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.sql", "SQLRecoverableException", True, "SQLRecoverableException", "(String,String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
@@ -298,35 +287,20 @@ extensions:
       - ["java.sql", "SQLWarning", True, "SQLWarning", "(String,Throwable)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
       - ["java.sql", "SQLWarning", True, "SQLWarning", "(Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.sql", "SQLWarning", True, "getNextWarning", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.sql", "Statement", True, "enquoteIdentifier", "(String,boolean)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["java.sql", "Statement", True, "enquoteLiteral", "(String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["java.sql", "Statement", True, "enquoteNCharLiteral", "(String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.sql", "Statement", True, "enquoteIdentifier", "(String,boolean)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.sql", "Statement", True, "enquoteLiteral", "(String)", "", "Argument[0]", "ReturnValue", "taint", "dfc-generated"]
+      - ["java.sql", "Statement", True, "enquoteNCharLiteral", "(String)", "", "Argument[0]", "ReturnValue", "taint", "dfc-generated"]
       - ["java.sql", "Struct", True, "getAttributes", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.sql", "Struct", True, "getAttributes", "(Map)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.sql", "Struct", True, "getSQLTypeName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.sql", "Wrapper", True, "unwrap", "(Class)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.sql", "Wrapper", True, "unwrap", "(Class)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
   - addsTo:
       pack: codeql/java-all
       extensible: neutralModel
     data:
-      - ["java.sql", "Array", "free", "()", "summary", "df-generated"]
-      - ["java.sql", "Array", "getBaseType", "()", "summary", "df-generated"]
-      - ["java.sql", "Array", "getResultSet", "()", "summary", "df-generated"]
-      - ["java.sql", "Array", "getResultSet", "(Map)", "summary", "df-generated"]
-      - ["java.sql", "Array", "getResultSet", "(long,int)", "summary", "df-generated"]
-      - ["java.sql", "Array", "getResultSet", "(long,int,Map)", "summary", "df-generated"]
       - ["java.sql", "BatchUpdateException", "BatchUpdateException", "(int[])", "summary", "df-generated"]
       - ["java.sql", "BatchUpdateException", "getLargeUpdateCounts", "()", "summary", "df-generated"]
       - ["java.sql", "BatchUpdateException", "getUpdateCounts", "()", "summary", "df-generated"]
-      - ["java.sql", "Blob", "free", "()", "summary", "df-generated"]
-      - ["java.sql", "Blob", "getBytes", "(long,int)", "summary", "df-generated"]
-      - ["java.sql", "Blob", "length", "()", "summary", "df-generated"]
-      - ["java.sql", "Blob", "position", "(Blob,long)", "summary", "df-generated"]
-      - ["java.sql", "Blob", "position", "(byte[],long)", "summary", "df-generated"]
-      - ["java.sql", "Blob", "setBinaryStream", "(long)", "summary", "df-generated"]
-      - ["java.sql", "Blob", "setBytes", "(long,byte[])", "summary", "df-generated"]
-      - ["java.sql", "Blob", "setBytes", "(long,byte[],int,int)", "summary", "df-generated"]
-      - ["java.sql", "Blob", "truncate", "(long)", "summary", "df-generated"]
       - ["java.sql", "CallableStatement", "registerOutParameter", "(String,SQLType)", "summary", "df-generated"]
       - ["java.sql", "CallableStatement", "registerOutParameter", "(String,SQLType,String)", "summary", "df-generated"]
       - ["java.sql", "CallableStatement", "registerOutParameter", "(String,SQLType,int)", "summary", "df-generated"]
@@ -335,16 +309,6 @@ extensions:
       - ["java.sql", "CallableStatement", "registerOutParameter", "(int,SQLType,int)", "summary", "df-generated"]
       - ["java.sql", "CallableStatement", "setObject", "(String,Object,SQLType)", "summary", "df-generated"]
       - ["java.sql", "CallableStatement", "setObject", "(String,Object,SQLType,int)", "summary", "df-generated"]
-      - ["java.sql", "Clob", "free", "()", "summary", "df-generated"]
-      - ["java.sql", "Clob", "getAsciiStream", "()", "summary", "df-generated"]
-      - ["java.sql", "Clob", "length", "()", "summary", "df-generated"]
-      - ["java.sql", "Clob", "position", "(Clob,long)", "summary", "df-generated"]
-      - ["java.sql", "Clob", "position", "(String,long)", "summary", "df-generated"]
-      - ["java.sql", "Clob", "setAsciiStream", "(long)", "summary", "df-generated"]
-      - ["java.sql", "Clob", "setCharacterStream", "(long)", "summary", "df-generated"]
-      - ["java.sql", "Clob", "setString", "(long,String)", "summary", "df-generated"]
-      - ["java.sql", "Clob", "setString", "(long,String,int,int)", "summary", "df-generated"]
-      - ["java.sql", "Clob", "truncate", "(long)", "summary", "df-generated"]
       - ["java.sql", "Connection", "beginRequest", "()", "summary", "df-generated"]
       - ["java.sql", "Connection", "endRequest", "()", "summary", "df-generated"]
       - ["java.sql", "Connection", "setShardingKey", "(ShardingKey)", "summary", "df-generated"]
@@ -362,6 +326,13 @@ extensions:
       - ["java.sql", "DatabaseMetaData", "supportsSharding", "()", "summary", "df-generated"]
       - ["java.sql", "Date", "Date", "(int,int,int)", "summary", "df-generated"]
       - ["java.sql", "Date", "Date", "(long)", "summary", "df-generated"]
+      - ["java.sql", "Date", "getHours", "()", "summary", "df-generated"]
+      - ["java.sql", "Date", "getMinutes", "()", "summary", "df-generated"]
+      - ["java.sql", "Date", "getSeconds", "()", "summary", "df-generated"]
+      - ["java.sql", "Date", "setHours", "(int)", "summary", "df-generated"]
+      - ["java.sql", "Date", "setMinutes", "(int)", "summary", "df-generated"]
+      - ["java.sql", "Date", "setSeconds", "(int)", "summary", "df-generated"]
+      - ["java.sql", "Date", "setTime", "(long)", "summary", "df-generated"]
       - ["java.sql", "Date", "toLocalDate", "()", "summary", "df-generated"]
       - ["java.sql", "Date", "valueOf", "(LocalDate)", "summary", "df-generated"]
       - ["java.sql", "Date", "valueOf", "(String)", "summary", "df-generated"]
@@ -381,61 +352,21 @@ extensions:
       - ["java.sql", "DriverManager", "setLogStream", "(PrintStream)", "summary", "df-generated"]
       - ["java.sql", "DriverManager", "setLogWriter", "(PrintWriter)", "summary", "df-generated"]
       - ["java.sql", "DriverManager", "setLoginTimeout", "(int)", "summary", "df-generated"]
+      - ["java.sql", "JDBCType", "getName", "()", "summary", "df-generated"]
+      - ["java.sql", "JDBCType", "getVendor", "()", "summary", "df-generated"]
+      - ["java.sql", "JDBCType", "getVendorTypeNumber", "()", "summary", "df-generated"]
       - ["java.sql", "JDBCType", "valueOf", "(int)", "summary", "df-generated"]
       - ["java.sql", "PreparedStatement", "executeLargeUpdate", "()", "summary", "df-generated"]
       - ["java.sql", "PreparedStatement", "setObject", "(int,Object,SQLType)", "summary", "df-generated"]
       - ["java.sql", "PreparedStatement", "setObject", "(int,Object,SQLType,int)", "summary", "df-generated"]
-      - ["java.sql", "Ref", "getObject", "(Map)", "summary", "df-generated"]
       - ["java.sql", "ResultSet", "updateObject", "(String,Object,SQLType)", "summary", "df-generated"]
       - ["java.sql", "ResultSet", "updateObject", "(String,Object,SQLType,int)", "summary", "df-generated"]
       - ["java.sql", "ResultSet", "updateObject", "(int,Object,SQLType)", "summary", "df-generated"]
       - ["java.sql", "ResultSet", "updateObject", "(int,Object,SQLType,int)", "summary", "df-generated"]
-      - ["java.sql", "ResultSetMetaData", "getColumnClassName", "(int)", "summary", "df-generated"]
-      - ["java.sql", "ResultSetMetaData", "getColumnCount", "()", "summary", "df-generated"]
-      - ["java.sql", "ResultSetMetaData", "getColumnDisplaySize", "(int)", "summary", "df-generated"]
-      - ["java.sql", "ResultSetMetaData", "getColumnType", "(int)", "summary", "df-generated"]
-      - ["java.sql", "ResultSetMetaData", "getPrecision", "(int)", "summary", "df-generated"]
-      - ["java.sql", "ResultSetMetaData", "getScale", "(int)", "summary", "df-generated"]
-      - ["java.sql", "ResultSetMetaData", "isAutoIncrement", "(int)", "summary", "df-generated"]
-      - ["java.sql", "ResultSetMetaData", "isCaseSensitive", "(int)", "summary", "df-generated"]
-      - ["java.sql", "ResultSetMetaData", "isCurrency", "(int)", "summary", "df-generated"]
-      - ["java.sql", "ResultSetMetaData", "isDefinitelyWritable", "(int)", "summary", "df-generated"]
-      - ["java.sql", "ResultSetMetaData", "isNullable", "(int)", "summary", "df-generated"]
-      - ["java.sql", "ResultSetMetaData", "isReadOnly", "(int)", "summary", "df-generated"]
-      - ["java.sql", "ResultSetMetaData", "isSearchable", "(int)", "summary", "df-generated"]
-      - ["java.sql", "ResultSetMetaData", "isSigned", "(int)", "summary", "df-generated"]
-      - ["java.sql", "ResultSetMetaData", "isWritable", "(int)", "summary", "df-generated"]
       - ["java.sql", "SQLException", "getErrorCode", "()", "summary", "df-generated"]
       - ["java.sql", "SQLException", "setNextException", "(SQLException)", "summary", "df-generated"]
-      - ["java.sql", "SQLInput", "readBigDecimal", "()", "summary", "df-generated"]
-      - ["java.sql", "SQLInput", "readBoolean", "()", "summary", "df-generated"]
-      - ["java.sql", "SQLInput", "readByte", "()", "summary", "df-generated"]
-      - ["java.sql", "SQLInput", "readDouble", "()", "summary", "df-generated"]
-      - ["java.sql", "SQLInput", "readFloat", "()", "summary", "df-generated"]
-      - ["java.sql", "SQLInput", "readInt", "()", "summary", "df-generated"]
-      - ["java.sql", "SQLInput", "readLong", "()", "summary", "df-generated"]
       - ["java.sql", "SQLInput", "readObject", "(Class)", "summary", "df-generated"]
-      - ["java.sql", "SQLInput", "readShort", "()", "summary", "df-generated"]
-      - ["java.sql", "SQLInput", "wasNull", "()", "summary", "df-generated"]
-      - ["java.sql", "SQLOutput", "writeArray", "(Array)", "summary", "df-generated"]
-      - ["java.sql", "SQLOutput", "writeBigDecimal", "(BigDecimal)", "summary", "df-generated"]
-      - ["java.sql", "SQLOutput", "writeBlob", "(Blob)", "summary", "df-generated"]
-      - ["java.sql", "SQLOutput", "writeBoolean", "(boolean)", "summary", "df-generated"]
-      - ["java.sql", "SQLOutput", "writeByte", "(byte)", "summary", "df-generated"]
-      - ["java.sql", "SQLOutput", "writeClob", "(Clob)", "summary", "df-generated"]
-      - ["java.sql", "SQLOutput", "writeDouble", "(double)", "summary", "df-generated"]
-      - ["java.sql", "SQLOutput", "writeFloat", "(float)", "summary", "df-generated"]
-      - ["java.sql", "SQLOutput", "writeInt", "(int)", "summary", "df-generated"]
-      - ["java.sql", "SQLOutput", "writeLong", "(long)", "summary", "df-generated"]
       - ["java.sql", "SQLOutput", "writeObject", "(Object,SQLType)", "summary", "df-generated"]
-      - ["java.sql", "SQLOutput", "writeObject", "(SQLData)", "summary", "df-generated"]
-      - ["java.sql", "SQLOutput", "writeRef", "(Ref)", "summary", "df-generated"]
-      - ["java.sql", "SQLOutput", "writeShort", "(short)", "summary", "df-generated"]
-      - ["java.sql", "SQLOutput", "writeStruct", "(Struct)", "summary", "df-generated"]
-      - ["java.sql", "SQLOutput", "writeURL", "(URL)", "summary", "df-generated"]
-      - ["java.sql", "SQLType", "getName", "()", "summary", "df-generated"]
-      - ["java.sql", "SQLType", "getVendor", "()", "summary", "df-generated"]
-      - ["java.sql", "SQLType", "getVendorTypeNumber", "()", "summary", "df-generated"]
       - ["java.sql", "SQLWarning", "setNextWarning", "(SQLWarning)", "summary", "df-generated"]
       - ["java.sql", "Statement", "executeLargeBatch", "()", "summary", "df-generated"]
       - ["java.sql", "Statement", "executeLargeUpdate", "(String)", "summary", "df-generated"]
@@ -448,6 +379,14 @@ extensions:
       - ["java.sql", "Statement", "setLargeMaxRows", "(long)", "summary", "df-generated"]
       - ["java.sql", "Time", "Time", "(int,int,int)", "summary", "df-generated"]
       - ["java.sql", "Time", "Time", "(long)", "summary", "df-generated"]
+      - ["java.sql", "Time", "getDate", "()", "summary", "df-generated"]
+      - ["java.sql", "Time", "getDay", "()", "summary", "df-generated"]
+      - ["java.sql", "Time", "getMonth", "()", "summary", "df-generated"]
+      - ["java.sql", "Time", "getYear", "()", "summary", "df-generated"]
+      - ["java.sql", "Time", "setDate", "(int)", "summary", "df-generated"]
+      - ["java.sql", "Time", "setMonth", "(int)", "summary", "df-generated"]
+      - ["java.sql", "Time", "setTime", "(long)", "summary", "df-generated"]
+      - ["java.sql", "Time", "setYear", "(int)", "summary", "df-generated"]
       - ["java.sql", "Time", "toLocalTime", "()", "summary", "df-generated"]
       - ["java.sql", "Time", "valueOf", "(LocalTime)", "summary", "df-generated"]
       - ["java.sql", "Time", "valueOf", "(String)", "summary", "df-generated"]
@@ -459,7 +398,7 @@ extensions:
       - ["java.sql", "Timestamp", "from", "(Instant)", "summary", "df-generated"]
       - ["java.sql", "Timestamp", "getNanos", "()", "summary", "df-generated"]
       - ["java.sql", "Timestamp", "setNanos", "(int)", "summary", "df-generated"]
+      - ["java.sql", "Timestamp", "setTime", "(long)", "summary", "df-generated"]
       - ["java.sql", "Timestamp", "toLocalDateTime", "()", "summary", "df-generated"]
       - ["java.sql", "Timestamp", "valueOf", "(LocalDateTime)", "summary", "df-generated"]
       - ["java.sql", "Timestamp", "valueOf", "(String)", "summary", "df-generated"]
-      - ["java.sql", "Wrapper", "isWrapperFor", "(Class)", "summary", "df-generated"]
diff --git a/java/ql/lib/ext/generated/java.text.model.yml b/java/ql/lib/ext/generated/java.text.model.yml
index 2f384e7c178..22ccc0a219d 100644
--- a/java/ql/lib/ext/generated/java.text.model.yml
+++ b/java/ql/lib/ext/generated/java.text.model.yml
@@ -4,19 +4,27 @@ extensions:
       pack: codeql/java-all
       extensible: summaryModel
     data:
-      - ["java.text", "Annotation", True, "Annotation", "(Object)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.text", "Annotation", True, "getValue", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.text", "Annotation", True, "Annotation", "(Object)", "", "Argument[0]", "Argument[this].SyntheticField[java.text.Annotation.value]", "value", "dfc-generated"]
+      - ["java.text", "Annotation", True, "getValue", "()", "", "Argument[this].SyntheticField[java.text.Annotation.value]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.text", "AttributedCharacterIterator", True, "getAttribute", "(AttributedCharacterIterator$Attribute)", "", "Argument[this]", "ReturnValue", "taint", "dfc-generated"]
+      - ["java.text", "AttributedCharacterIterator", True, "getAttributes", "()", "", "Argument[this]", "ReturnValue.MapValue", "taint", "dfc-generated"]
       - ["java.text", "AttributedString", True, "AttributedString", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.text", "AttributedString", True, "AttributedString", "(String,Map)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.text", "AttributedString", True, "getIterator", "(AttributedCharacterIterator$Attribute[])", "", "Argument[0].ArrayElement", "ReturnValue", "taint", "df-generated"]
       - ["java.text", "AttributedString", True, "getIterator", "(AttributedCharacterIterator$Attribute[],int,int)", "", "Argument[0].ArrayElement", "ReturnValue", "taint", "df-generated"]
       - ["java.text", "Bidi", False, "Bidi", "(String,int)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.text", "Bidi", False, "Bidi", "(char[],int,byte[],int,int,int)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.text", "BreakIterator", True, "getText", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.text", "BreakIterator", True, "setText", "(CharacterIterator)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.text", "BreakIterator", True, "setText", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.text", "ChoiceFormat", True, "ChoiceFormat", "(double[],String[])", "", "Argument[1].ArrayElement", "Argument[this]", "taint", "df-generated"]
-      - ["java.text", "ChoiceFormat", True, "getFormats", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.text", "ChoiceFormat", True, "setChoices", "(double[],String[])", "", "Argument[1].ArrayElement", "Argument[this]", "taint", "df-generated"]
-      - ["java.text", "ChoiceFormat", True, "toPattern", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.text", "ChoiceFormat", True, "ChoiceFormat", "(double[],String[])", "", "Argument[1].ArrayElement", "Argument[this].SyntheticField[java.text.ChoiceFormat.choiceFormats].ArrayElement", "value", "dfc-generated"]
+      - ["java.text", "ChoiceFormat", True, "format", "(double,StringBuffer,FieldPosition)", "", "Argument[this].SyntheticField[java.text.ChoiceFormat.choiceFormats].ArrayElement", "Argument[1]", "taint", "dfc-generated"]
+      - ["java.text", "ChoiceFormat", True, "format", "(double,StringBuffer,FieldPosition)", "", "Argument[this].SyntheticField[java.text.ChoiceFormat.choiceFormats].ArrayElement", "ReturnValue", "taint", "dfc-generated"]
+      - ["java.text", "ChoiceFormat", True, "format", "(long,StringBuffer,FieldPosition)", "", "Argument[this].SyntheticField[java.text.ChoiceFormat.choiceFormats].ArrayElement", "Argument[1]", "taint", "dfc-generated"]
+      - ["java.text", "ChoiceFormat", True, "format", "(long,StringBuffer,FieldPosition)", "", "Argument[this].SyntheticField[java.text.ChoiceFormat.choiceFormats].ArrayElement", "ReturnValue", "taint", "dfc-generated"]
+      - ["java.text", "ChoiceFormat", True, "getFormats", "()", "", "Argument[this].SyntheticField[java.text.ChoiceFormat.choiceFormats].ArrayElement", "ReturnValue.ArrayElement", "value", "dfc-generated"]
+      - ["java.text", "ChoiceFormat", True, "setChoices", "(double[],String[])", "", "Argument[1].ArrayElement", "Argument[this].SyntheticField[java.text.ChoiceFormat.choiceFormats].ArrayElement", "value", "dfc-generated"]
+      - ["java.text", "ChoiceFormat", True, "toPattern", "()", "", "Argument[this].SyntheticField[java.text.ChoiceFormat.choiceFormats].ArrayElement", "ReturnValue", "taint", "dfc-generated"]
       - ["java.text", "CollationKey", True, "getSourceString", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.text", "Collator", True, "getCollationKey", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.text", "Collator", True, "getCollationKey", "(String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
@@ -28,112 +36,114 @@ extensions:
       - ["java.text", "CompactNumberFormat", False, "CompactNumberFormat", "(String,DecimalFormatSymbols,String[],String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
       - ["java.text", "CompactNumberFormat", False, "CompactNumberFormat", "(String,DecimalFormatSymbols,String[],String)", "", "Argument[2].ArrayElement", "Argument[this]", "taint", "df-generated"]
       - ["java.text", "CompactNumberFormat", False, "CompactNumberFormat", "(String,DecimalFormatSymbols,String[],String)", "", "Argument[3]", "Argument[this]", "taint", "df-generated"]
-      - ["java.text", "DateFormat", True, "format", "(Date,StringBuffer,FieldPosition)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["java.text", "DateFormat", True, "format", "(Date,StringBuffer,FieldPosition)", "", "Argument[this]", "Argument[1]", "taint", "df-generated"]
-      - ["java.text", "DateFormat", True, "format", "(Date,StringBuffer,FieldPosition)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.text", "DateFormat", True, "getCalendar", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.text", "DateFormat", True, "format", "(Date,StringBuffer,FieldPosition)", "", "Argument[1]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.text", "DateFormat", True, "getCalendar", "()", "", "Argument[this].SyntheticField[java.text.DateFormat.calendar]", "ReturnValue", "value", "dfc-generated"]
       - ["java.text", "DateFormat", True, "getDateInstance", "(int,Locale)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
       - ["java.text", "DateFormat", True, "getDateTimeInstance", "(int,int,Locale)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
-      - ["java.text", "DateFormat", True, "getNumberFormat", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.text", "DateFormat", True, "getNumberFormat", "()", "", "Argument[this].SyntheticField[java.text.DateFormat.numberFormat]", "ReturnValue", "value", "dfc-generated"]
       - ["java.text", "DateFormat", True, "getTimeInstance", "(int,Locale)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["java.text", "DateFormat", True, "getTimeZone", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.text", "DateFormat", True, "setCalendar", "(Calendar)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.text", "DateFormat", True, "setNumberFormat", "(NumberFormat)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.text", "DateFormat", True, "setTimeZone", "(TimeZone)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.text", "DateFormat", True, "getTimeZone", "()", "", "Argument[this].SyntheticField[java.text.DateFormat.calendar].SyntheticField[java.util.Calendar.zone]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.text", "DateFormat", True, "setCalendar", "(Calendar)", "", "Argument[0]", "Argument[this].SyntheticField[java.text.DateFormat.calendar]", "value", "dfc-generated"]
+      - ["java.text", "DateFormat", True, "setNumberFormat", "(NumberFormat)", "", "Argument[0]", "Argument[this].SyntheticField[java.text.DateFormat.numberFormat]", "value", "dfc-generated"]
+      - ["java.text", "DateFormat", True, "setTimeZone", "(TimeZone)", "", "Argument[0]", "Argument[this].SyntheticField[java.text.DateFormat.calendar].SyntheticField[java.util.Calendar.zone]", "value", "dfc-generated"]
       - ["java.text", "DateFormatSymbols", True, "DateFormatSymbols", "(Locale)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.text", "DateFormatSymbols", True, "getAmPmStrings", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.text", "DateFormatSymbols", True, "getEras", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.text", "DateFormatSymbols", True, "getAmPmStrings", "()", "", "Argument[this].SyntheticField[java.text.DateFormatSymbols.ampms].ArrayElement", "ReturnValue.ArrayElement", "value", "dfc-generated"]
+      - ["java.text", "DateFormatSymbols", True, "getEras", "()", "", "Argument[this].SyntheticField[java.text.DateFormatSymbols.eras].ArrayElement", "ReturnValue.ArrayElement", "value", "dfc-generated"]
       - ["java.text", "DateFormatSymbols", True, "getInstance", "(Locale)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["java.text", "DateFormatSymbols", True, "getLocalPatternChars", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.text", "DateFormatSymbols", True, "getMonths", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.text", "DateFormatSymbols", True, "getShortMonths", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.text", "DateFormatSymbols", True, "getShortWeekdays", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.text", "DateFormatSymbols", True, "getWeekdays", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.text", "DateFormatSymbols", True, "getLocalPatternChars", "()", "", "Argument[this].SyntheticField[java.text.DateFormatSymbols.localPatternChars]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.text", "DateFormatSymbols", True, "getMonths", "()", "", "Argument[this].SyntheticField[java.text.DateFormatSymbols.months].ArrayElement", "ReturnValue.ArrayElement", "value", "dfc-generated"]
+      - ["java.text", "DateFormatSymbols", True, "getShortMonths", "()", "", "Argument[this].SyntheticField[java.text.DateFormatSymbols.shortMonths].ArrayElement", "ReturnValue.ArrayElement", "value", "dfc-generated"]
+      - ["java.text", "DateFormatSymbols", True, "getShortWeekdays", "()", "", "Argument[this].SyntheticField[java.text.DateFormatSymbols.shortWeekdays].ArrayElement", "ReturnValue.ArrayElement", "value", "dfc-generated"]
+      - ["java.text", "DateFormatSymbols", True, "getWeekdays", "()", "", "Argument[this].SyntheticField[java.text.DateFormatSymbols.weekdays].ArrayElement", "ReturnValue.ArrayElement", "value", "dfc-generated"]
       - ["java.text", "DateFormatSymbols", True, "getZoneStrings", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.text", "DateFormatSymbols", True, "setAmPmStrings", "(String[])", "", "Argument[0].ArrayElement", "Argument[this]", "taint", "df-generated"]
-      - ["java.text", "DateFormatSymbols", True, "setEras", "(String[])", "", "Argument[0].ArrayElement", "Argument[this]", "taint", "df-generated"]
-      - ["java.text", "DateFormatSymbols", True, "setLocalPatternChars", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.text", "DateFormatSymbols", True, "setMonths", "(String[])", "", "Argument[0].ArrayElement", "Argument[this]", "taint", "df-generated"]
-      - ["java.text", "DateFormatSymbols", True, "setShortMonths", "(String[])", "", "Argument[0].ArrayElement", "Argument[this]", "taint", "df-generated"]
-      - ["java.text", "DateFormatSymbols", True, "setShortWeekdays", "(String[])", "", "Argument[0].ArrayElement", "Argument[this]", "taint", "df-generated"]
-      - ["java.text", "DateFormatSymbols", True, "setWeekdays", "(String[])", "", "Argument[0].ArrayElement", "Argument[this]", "taint", "df-generated"]
-      - ["java.text", "DateFormatSymbols", True, "setZoneStrings", "(String[][])", "", "Argument[0].ArrayElement", "Argument[this]", "taint", "df-generated"]
-      - ["java.text", "DecimalFormat", True, "DecimalFormat", "(String,DecimalFormatSymbols)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["java.text", "DecimalFormat", True, "getDecimalFormatSymbols", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.text", "DecimalFormat", True, "getNegativePrefix", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.text", "DecimalFormat", True, "getNegativeSuffix", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.text", "DecimalFormat", True, "getPositivePrefix", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.text", "DecimalFormat", True, "getPositiveSuffix", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.text", "DecimalFormat", True, "setDecimalFormatSymbols", "(DecimalFormatSymbols)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.text", "DecimalFormat", True, "setNegativePrefix", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.text", "DecimalFormat", True, "setNegativeSuffix", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.text", "DecimalFormat", True, "setPositivePrefix", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.text", "DecimalFormat", True, "setPositiveSuffix", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.text", "DateFormatSymbols", True, "setAmPmStrings", "(String[])", "", "Argument[0].ArrayElement", "Argument[this].SyntheticField[java.text.DateFormatSymbols.ampms].ArrayElement", "value", "dfc-generated"]
+      - ["java.text", "DateFormatSymbols", True, "setEras", "(String[])", "", "Argument[0].ArrayElement", "Argument[this].SyntheticField[java.text.DateFormatSymbols.eras].ArrayElement", "value", "dfc-generated"]
+      - ["java.text", "DateFormatSymbols", True, "setLocalPatternChars", "(String)", "", "Argument[0]", "Argument[this].SyntheticField[java.text.DateFormatSymbols.localPatternChars]", "value", "dfc-generated"]
+      - ["java.text", "DateFormatSymbols", True, "setMonths", "(String[])", "", "Argument[0].ArrayElement", "Argument[this].SyntheticField[java.text.DateFormatSymbols.months].ArrayElement", "value", "dfc-generated"]
+      - ["java.text", "DateFormatSymbols", True, "setShortMonths", "(String[])", "", "Argument[0].ArrayElement", "Argument[this].SyntheticField[java.text.DateFormatSymbols.shortMonths].ArrayElement", "value", "dfc-generated"]
+      - ["java.text", "DateFormatSymbols", True, "setShortWeekdays", "(String[])", "", "Argument[0].ArrayElement", "Argument[this].SyntheticField[java.text.DateFormatSymbols.shortWeekdays].ArrayElement", "value", "dfc-generated"]
+      - ["java.text", "DateFormatSymbols", True, "setWeekdays", "(String[])", "", "Argument[0].ArrayElement", "Argument[this].SyntheticField[java.text.DateFormatSymbols.weekdays].ArrayElement", "value", "dfc-generated"]
+      - ["java.text", "DecimalFormat", True, "DecimalFormat", "(String,DecimalFormatSymbols)", "", "Argument[1]", "Argument[this].SyntheticField[java.text.DecimalFormat.symbols]", "value", "dfc-generated"]
+      - ["java.text", "DecimalFormat", True, "getCurrency", "()", "", "Argument[this].SyntheticField[java.text.DecimalFormat.symbols].SyntheticField[java.text.DecimalFormatSymbols.currency]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.text", "DecimalFormat", True, "getDecimalFormatSymbols", "()", "", "Argument[this].SyntheticField[java.text.DecimalFormat.symbols]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.text", "DecimalFormat", True, "getNegativePrefix", "()", "", "Argument[this].SyntheticField[java.text.DecimalFormat.negativePrefix]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.text", "DecimalFormat", True, "getNegativeSuffix", "()", "", "Argument[this].SyntheticField[java.text.DecimalFormat.negativeSuffix]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.text", "DecimalFormat", True, "getPositivePrefix", "()", "", "Argument[this].SyntheticField[java.text.DecimalFormat.positivePrefix]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.text", "DecimalFormat", True, "getPositiveSuffix", "()", "", "Argument[this].SyntheticField[java.text.DecimalFormat.positiveSuffix]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.text", "DecimalFormat", True, "setCurrency", "(Currency)", "", "Argument[0]", "Argument[this].SyntheticField[java.text.DecimalFormat.symbols].SyntheticField[java.text.DecimalFormatSymbols.currency]", "value", "dfc-generated"]
+      - ["java.text", "DecimalFormat", True, "setDecimalFormatSymbols", "(DecimalFormatSymbols)", "", "Argument[0]", "Argument[this].SyntheticField[java.text.DecimalFormat.symbols]", "value", "dfc-generated"]
+      - ["java.text", "DecimalFormat", True, "setNegativePrefix", "(String)", "", "Argument[0]", "Argument[this].SyntheticField[java.text.DecimalFormat.negativePrefix]", "value", "dfc-generated"]
+      - ["java.text", "DecimalFormat", True, "setNegativeSuffix", "(String)", "", "Argument[0]", "Argument[this].SyntheticField[java.text.DecimalFormat.negativeSuffix]", "value", "dfc-generated"]
+      - ["java.text", "DecimalFormat", True, "setPositivePrefix", "(String)", "", "Argument[0]", "Argument[this].SyntheticField[java.text.DecimalFormat.positivePrefix]", "value", "dfc-generated"]
+      - ["java.text", "DecimalFormat", True, "setPositiveSuffix", "(String)", "", "Argument[0]", "Argument[this].SyntheticField[java.text.DecimalFormat.positiveSuffix]", "value", "dfc-generated"]
       - ["java.text", "DecimalFormat", True, "toLocalizedPattern", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.text", "DecimalFormat", True, "toPattern", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.text", "DecimalFormatSymbols", True, "DecimalFormatSymbols", "(Locale)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.text", "DecimalFormatSymbols", True, "getCurrency", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.text", "DecimalFormatSymbols", True, "getCurrencySymbol", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.text", "DecimalFormatSymbols", True, "getExponentSeparator", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.text", "DecimalFormatSymbols", True, "getInfinity", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.text", "DecimalFormatSymbols", True, "getCurrency", "()", "", "Argument[this].SyntheticField[java.text.DecimalFormatSymbols.currency]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.text", "DecimalFormatSymbols", True, "getCurrencySymbol", "()", "", "Argument[this].SyntheticField[java.text.DecimalFormatSymbols.currencySymbol]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.text", "DecimalFormatSymbols", True, "getExponentSeparator", "()", "", "Argument[this].SyntheticField[java.text.DecimalFormatSymbols.exponentialSeparator]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.text", "DecimalFormatSymbols", True, "getInfinity", "()", "", "Argument[this].SyntheticField[java.text.DecimalFormatSymbols.infinity]", "ReturnValue", "value", "dfc-generated"]
       - ["java.text", "DecimalFormatSymbols", True, "getInstance", "(Locale)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["java.text", "DecimalFormatSymbols", True, "getInternationalCurrencySymbol", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.text", "DecimalFormatSymbols", True, "getNaN", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.text", "DecimalFormatSymbols", True, "setCurrency", "(Currency)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.text", "DecimalFormatSymbols", True, "setCurrencySymbol", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.text", "DecimalFormatSymbols", True, "setExponentSeparator", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.text", "DecimalFormatSymbols", True, "setInfinity", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.text", "DecimalFormatSymbols", True, "setInternationalCurrencySymbol", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.text", "DecimalFormatSymbols", True, "setNaN", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.text", "FieldPosition", True, "FieldPosition", "(Format$Field)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.text", "FieldPosition", True, "FieldPosition", "(Format$Field,int)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.text", "FieldPosition", True, "getFieldAttribute", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.text", "Format", True, "parseObject", "(String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["java.text", "Format", True, "parseObject", "(String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.text", "Format", True, "parseObject", "(String,ParsePosition)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["java.text", "Format", True, "parseObject", "(String,ParsePosition)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.text", "MessageFormat", True, "MessageFormat", "(String,Locale)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["java.text", "MessageFormat", True, "getFormats", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.text", "MessageFormat", True, "getFormatsByArgumentIndex", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.text", "MessageFormat", True, "getLocale", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.text", "MessageFormat", True, "parse", "(String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["java.text", "MessageFormat", True, "parse", "(String,ParsePosition)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["java.text", "MessageFormat", True, "setFormat", "(int,Format)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["java.text", "MessageFormat", True, "setFormatByArgumentIndex", "(int,Format)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["java.text", "MessageFormat", True, "setFormats", "(Format[])", "", "Argument[0].ArrayElement", "Argument[this]", "taint", "df-generated"]
-      - ["java.text", "MessageFormat", True, "setFormatsByArgumentIndex", "(Format[])", "", "Argument[0].ArrayElement", "Argument[this]", "taint", "df-generated"]
-      - ["java.text", "MessageFormat", True, "setLocale", "(Locale)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.text", "DecimalFormatSymbols", True, "getInternationalCurrencySymbol", "()", "", "Argument[this].SyntheticField[java.text.DecimalFormatSymbols.intlCurrencySymbol]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.text", "DecimalFormatSymbols", True, "getNaN", "()", "", "Argument[this].SyntheticField[java.text.DecimalFormatSymbols.NaN]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.text", "DecimalFormatSymbols", True, "setCurrency", "(Currency)", "", "Argument[0].SyntheticField[java.util.Currency.currencyCode]", "Argument[this].SyntheticField[java.text.DecimalFormatSymbols.currencySymbol]", "value", "dfc-generated"]
+      - ["java.text", "DecimalFormatSymbols", True, "setCurrency", "(Currency)", "", "Argument[0].SyntheticField[java.util.Currency.currencyCode]", "Argument[this].SyntheticField[java.text.DecimalFormatSymbols.intlCurrencySymbol]", "value", "dfc-generated"]
+      - ["java.text", "DecimalFormatSymbols", True, "setCurrency", "(Currency)", "", "Argument[0]", "Argument[this].SyntheticField[java.text.DecimalFormatSymbols.currency]", "value", "dfc-generated"]
+      - ["java.text", "DecimalFormatSymbols", True, "setCurrencySymbol", "(String)", "", "Argument[0]", "Argument[this].SyntheticField[java.text.DecimalFormatSymbols.currencySymbol]", "value", "dfc-generated"]
+      - ["java.text", "DecimalFormatSymbols", True, "setExponentSeparator", "(String)", "", "Argument[0]", "Argument[this].SyntheticField[java.text.DecimalFormatSymbols.exponentialSeparator]", "value", "dfc-generated"]
+      - ["java.text", "DecimalFormatSymbols", True, "setInfinity", "(String)", "", "Argument[0]", "Argument[this].SyntheticField[java.text.DecimalFormatSymbols.infinity]", "value", "dfc-generated"]
+      - ["java.text", "DecimalFormatSymbols", True, "setInternationalCurrencySymbol", "(String)", "", "Argument[0]", "Argument[this].SyntheticField[java.text.DecimalFormatSymbols.currencySymbol]", "value", "dfc-generated"]
+      - ["java.text", "DecimalFormatSymbols", True, "setInternationalCurrencySymbol", "(String)", "", "Argument[0]", "Argument[this].SyntheticField[java.text.DecimalFormatSymbols.currency].SyntheticField[java.util.Currency.currencyCode]", "value", "dfc-generated"]
+      - ["java.text", "DecimalFormatSymbols", True, "setInternationalCurrencySymbol", "(String)", "", "Argument[0]", "Argument[this].SyntheticField[java.text.DecimalFormatSymbols.intlCurrencySymbol]", "value", "dfc-generated"]
+      - ["java.text", "DecimalFormatSymbols", True, "setInternationalCurrencySymbol", "(String)", "", "Argument[this].SyntheticField[java.text.DecimalFormatSymbols.currency].SyntheticField[java.util.Currency.currencyCode]", "Argument[this].SyntheticField[java.text.DecimalFormatSymbols.currencySymbol]", "value", "dfc-generated"]
+      - ["java.text", "DecimalFormatSymbols", True, "setNaN", "(String)", "", "Argument[0]", "Argument[this].SyntheticField[java.text.DecimalFormatSymbols.NaN]", "value", "dfc-generated"]
+      - ["java.text", "FieldPosition", True, "FieldPosition", "(Format$Field)", "", "Argument[0]", "Argument[this].SyntheticField[java.text.FieldPosition.attribute]", "value", "dfc-generated"]
+      - ["java.text", "FieldPosition", True, "FieldPosition", "(Format$Field,int)", "", "Argument[0]", "Argument[this].SyntheticField[java.text.FieldPosition.attribute]", "value", "dfc-generated"]
+      - ["java.text", "FieldPosition", True, "getFieldAttribute", "()", "", "Argument[this].SyntheticField[java.text.FieldPosition.attribute]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.text", "Format", True, "parseObject", "(String)", "", "Argument[0]", "ReturnValue.ArrayElement.ArrayElement", "taint", "dfc-generated"]
+      - ["java.text", "Format", True, "parseObject", "(String)", "", "Argument[0]", "ReturnValue.ArrayElement", "taint", "dfc-generated"]
+      - ["java.text", "Format", True, "parseObject", "(String,ParsePosition)", "", "Argument[0]", "ReturnValue.ArrayElement.ArrayElement", "taint", "dfc-generated"]
+      - ["java.text", "Format", True, "parseObject", "(String,ParsePosition)", "", "Argument[0]", "ReturnValue.ArrayElement", "taint", "dfc-generated"]
+      - ["java.text", "MessageFormat", True, "MessageFormat", "(String,Locale)", "", "Argument[1]", "Argument[this].SyntheticField[java.text.MessageFormat.locale]", "value", "dfc-generated"]
+      - ["java.text", "MessageFormat", True, "getFormats", "()", "", "Argument[this].SyntheticField[java.text.MessageFormat.formats]", "ReturnValue", "taint", "dfc-generated"]
+      - ["java.text", "MessageFormat", True, "getFormatsByArgumentIndex", "()", "", "Argument[this].SyntheticField[java.text.MessageFormat.formats].ArrayElement", "ReturnValue.ArrayElement", "value", "dfc-generated"]
+      - ["java.text", "MessageFormat", True, "getLocale", "()", "", "Argument[this].SyntheticField[java.text.MessageFormat.locale]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.text", "MessageFormat", True, "parse", "(String)", "", "Argument[0]", "ReturnValue.ArrayElement.ArrayElement", "taint", "dfc-generated"]
+      - ["java.text", "MessageFormat", True, "parse", "(String)", "", "Argument[0]", "ReturnValue.ArrayElement", "taint", "dfc-generated"]
+      - ["java.text", "MessageFormat", True, "parse", "(String,ParsePosition)", "", "Argument[0]", "ReturnValue.ArrayElement.ArrayElement", "taint", "dfc-generated"]
+      - ["java.text", "MessageFormat", True, "parse", "(String,ParsePosition)", "", "Argument[0]", "ReturnValue.ArrayElement", "taint", "dfc-generated"]
+      - ["java.text", "MessageFormat", True, "setFormat", "(int,Format)", "", "Argument[1]", "Argument[this].SyntheticField[java.text.MessageFormat.formats].ArrayElement", "value", "dfc-generated"]
+      - ["java.text", "MessageFormat", True, "setFormatByArgumentIndex", "(int,Format)", "", "Argument[1]", "Argument[this].SyntheticField[java.text.MessageFormat.formats].ArrayElement", "value", "dfc-generated"]
+      - ["java.text", "MessageFormat", True, "setFormats", "(Format[])", "", "Argument[0].ArrayElement", "Argument[this].SyntheticField[java.text.MessageFormat.formats].ArrayElement", "value", "dfc-generated"]
+      - ["java.text", "MessageFormat", True, "setFormatsByArgumentIndex", "(Format[])", "", "Argument[0].ArrayElement", "Argument[this].SyntheticField[java.text.MessageFormat.formats].ArrayElement", "value", "dfc-generated"]
+      - ["java.text", "MessageFormat", True, "setLocale", "(Locale)", "", "Argument[0]", "Argument[this].SyntheticField[java.text.MessageFormat.locale]", "value", "dfc-generated"]
       - ["java.text", "MessageFormat", True, "toPattern", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.text", "Normalizer", False, "normalize", "(CharSequence,Normalizer$Form)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["java.text", "NumberFormat", True, "format", "(double,StringBuffer,FieldPosition)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["java.text", "NumberFormat", True, "format", "(double,StringBuffer,FieldPosition)", "", "Argument[this]", "Argument[1]", "taint", "df-generated"]
-      - ["java.text", "NumberFormat", True, "format", "(double,StringBuffer,FieldPosition)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.text", "Normalizer", False, "normalize", "(CharSequence,Normalizer$Form)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.text", "NumberFormat", True, "format", "(double,StringBuffer,FieldPosition)", "", "Argument[1]", "ReturnValue", "value", "dfc-generated"]
       - ["java.text", "NumberFormat", True, "format", "(long)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.text", "NumberFormat", True, "format", "(long,StringBuffer,FieldPosition)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["java.text", "NumberFormat", True, "format", "(long,StringBuffer,FieldPosition)", "", "Argument[this]", "Argument[1]", "taint", "df-generated"]
-      - ["java.text", "NumberFormat", True, "format", "(long,StringBuffer,FieldPosition)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.text", "NumberFormat", True, "format", "(long,StringBuffer,FieldPosition)", "", "Argument[1]", "ReturnValue", "value", "dfc-generated"]
       - ["java.text", "NumberFormat", True, "getCompactNumberInstance", "(Locale,NumberFormat$Style)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["java.text", "NumberFormat", True, "getCurrency", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.text", "NumberFormat", True, "getCurrencyInstance", "(Locale)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["java.text", "NumberFormat", True, "getInstance", "(Locale)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["java.text", "NumberFormat", True, "getIntegerInstance", "(Locale)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["java.text", "NumberFormat", True, "getNumberInstance", "(Locale)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["java.text", "NumberFormat", True, "getPercentInstance", "(Locale)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["java.text", "NumberFormat", True, "setCurrency", "(Currency)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.text", "ParseException", True, "ParseException", "(String,int)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.text", "RuleBasedCollator", True, "RuleBasedCollator", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.text", "RuleBasedCollator", True, "RuleBasedCollator", "(String)", "", "Argument[0]", "Argument[this].SyntheticField[java.text.RuleBasedCollator.tables].SyntheticField[java.text.RBCollationTables.rules]", "value", "dfc-generated"]
       - ["java.text", "RuleBasedCollator", True, "getCollationElementIterator", "(CharacterIterator)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.text", "RuleBasedCollator", True, "getCollationElementIterator", "(String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.text", "RuleBasedCollator", True, "getRules", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.text", "SimpleDateFormat", True, "SimpleDateFormat", "(String,DateFormatSymbols)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.text", "SimpleDateFormat", True, "SimpleDateFormat", "(String,DateFormatSymbols)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["java.text", "SimpleDateFormat", True, "SimpleDateFormat", "(String,Locale)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.text", "SimpleDateFormat", True, "SimpleDateFormat", "(String,Locale)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["java.text", "SimpleDateFormat", True, "applyPattern", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.text", "RuleBasedCollator", True, "getRules", "()", "", "Argument[this].SyntheticField[java.text.RuleBasedCollator.tables].SyntheticField[java.text.RBCollationTables.rules]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.text", "SimpleDateFormat", True, "SimpleDateFormat", "(String,DateFormatSymbols)", "", "Argument[0]", "Argument[this].SyntheticField[java.text.SimpleDateFormat.pattern]", "value", "dfc-generated"]
+      - ["java.text", "SimpleDateFormat", True, "SimpleDateFormat", "(String,DateFormatSymbols)", "", "Argument[1].SyntheticField[java.text.DateFormatSymbols.localPatternChars]", "Argument[this].SyntheticField[java.text.SimpleDateFormat.formatData].SyntheticField[java.text.DateFormatSymbols.localPatternChars]", "value", "dfc-generated"]
+      - ["java.text", "SimpleDateFormat", True, "SimpleDateFormat", "(String,DateFormatSymbols)", "", "Argument[1]", "Argument[this].SyntheticField[java.text.SimpleDateFormat.formatData]", "value", "dfc-generated"]
+      - ["java.text", "SimpleDateFormat", True, "SimpleDateFormat", "(String,Locale)", "", "Argument[0]", "Argument[this].SyntheticField[java.text.SimpleDateFormat.pattern]", "value", "dfc-generated"]
+      - ["java.text", "SimpleDateFormat", True, "applyPattern", "(String)", "", "Argument[0]", "Argument[this].SyntheticField[java.text.SimpleDateFormat.pattern]", "value", "dfc-generated"]
       - ["java.text", "SimpleDateFormat", True, "get2DigitYearStart", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.text", "SimpleDateFormat", True, "getDateFormatSymbols", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.text", "SimpleDateFormat", True, "setDateFormatSymbols", "(DateFormatSymbols)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.text", "SimpleDateFormat", True, "toPattern", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.text", "SimpleDateFormat", True, "getDateFormatSymbols", "()", "", "Argument[this].SyntheticField[java.text.SimpleDateFormat.formatData].SyntheticField[java.text.DateFormatSymbols.localPatternChars]", "ReturnValue.SyntheticField[java.text.DateFormatSymbols.localPatternChars]", "value", "dfc-generated"]
+      - ["java.text", "SimpleDateFormat", True, "getDateFormatSymbols", "()", "", "Argument[this].SyntheticField[java.text.SimpleDateFormat.formatData]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.text", "SimpleDateFormat", True, "setDateFormatSymbols", "(DateFormatSymbols)", "", "Argument[0].SyntheticField[java.text.DateFormatSymbols.localPatternChars]", "Argument[this].SyntheticField[java.text.SimpleDateFormat.formatData].SyntheticField[java.text.DateFormatSymbols.localPatternChars]", "value", "dfc-generated"]
+      - ["java.text", "SimpleDateFormat", True, "setDateFormatSymbols", "(DateFormatSymbols)", "", "Argument[0]", "Argument[this].SyntheticField[java.text.SimpleDateFormat.formatData]", "value", "dfc-generated"]
+      - ["java.text", "SimpleDateFormat", True, "toPattern", "()", "", "Argument[this].SyntheticField[java.text.SimpleDateFormat.pattern]", "ReturnValue", "value", "dfc-generated"]
       - ["java.text", "StringCharacterIterator", False, "StringCharacterIterator", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.text", "StringCharacterIterator", False, "StringCharacterIterator", "(String,int)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.text", "StringCharacterIterator", False, "StringCharacterIterator", "(String,int,int,int)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
@@ -142,15 +152,6 @@ extensions:
       pack: codeql/java-all
       extensible: neutralModel
     data:
-      - ["java.text", "AttributedCharacterIterator", "getAllAttributeKeys", "()", "summary", "df-generated"]
-      - ["java.text", "AttributedCharacterIterator", "getAttribute", "(AttributedCharacterIterator$Attribute)", "summary", "df-generated"]
-      - ["java.text", "AttributedCharacterIterator", "getAttributes", "()", "summary", "df-generated"]
-      - ["java.text", "AttributedCharacterIterator", "getRunLimit", "()", "summary", "df-generated"]
-      - ["java.text", "AttributedCharacterIterator", "getRunLimit", "(AttributedCharacterIterator$Attribute)", "summary", "df-generated"]
-      - ["java.text", "AttributedCharacterIterator", "getRunLimit", "(Set)", "summary", "df-generated"]
-      - ["java.text", "AttributedCharacterIterator", "getRunStart", "()", "summary", "df-generated"]
-      - ["java.text", "AttributedCharacterIterator", "getRunStart", "(AttributedCharacterIterator$Attribute)", "summary", "df-generated"]
-      - ["java.text", "AttributedCharacterIterator", "getRunStart", "(Set)", "summary", "df-generated"]
       - ["java.text", "AttributedString", "AttributedString", "(AttributedCharacterIterator)", "summary", "df-generated"]
       - ["java.text", "AttributedString", "AttributedString", "(AttributedCharacterIterator,int,int)", "summary", "df-generated"]
       - ["java.text", "AttributedString", "AttributedString", "(AttributedCharacterIterator,int,int,AttributedCharacterIterator$Attribute[])", "summary", "df-generated"]
@@ -183,7 +184,6 @@ extensions:
       - ["java.text", "BreakIterator", "getLineInstance", "(Locale)", "summary", "df-generated"]
       - ["java.text", "BreakIterator", "getSentenceInstance", "()", "summary", "df-generated"]
       - ["java.text", "BreakIterator", "getSentenceInstance", "(Locale)", "summary", "df-generated"]
-      - ["java.text", "BreakIterator", "getText", "()", "summary", "df-generated"]
       - ["java.text", "BreakIterator", "getWordInstance", "()", "summary", "df-generated"]
       - ["java.text", "BreakIterator", "getWordInstance", "(Locale)", "summary", "df-generated"]
       - ["java.text", "BreakIterator", "isBoundary", "(int)", "summary", "df-generated"]
@@ -192,21 +192,12 @@ extensions:
       - ["java.text", "BreakIterator", "next", "(int)", "summary", "df-generated"]
       - ["java.text", "BreakIterator", "preceding", "(int)", "summary", "df-generated"]
       - ["java.text", "BreakIterator", "previous", "()", "summary", "df-generated"]
-      - ["java.text", "BreakIterator", "setText", "(CharacterIterator)", "summary", "df-generated"]
-      - ["java.text", "CharacterIterator", "current", "()", "summary", "df-generated"]
-      - ["java.text", "CharacterIterator", "first", "()", "summary", "df-generated"]
-      - ["java.text", "CharacterIterator", "getBeginIndex", "()", "summary", "df-generated"]
-      - ["java.text", "CharacterIterator", "getEndIndex", "()", "summary", "df-generated"]
-      - ["java.text", "CharacterIterator", "getIndex", "()", "summary", "df-generated"]
-      - ["java.text", "CharacterIterator", "last", "()", "summary", "df-generated"]
-      - ["java.text", "CharacterIterator", "next", "()", "summary", "df-generated"]
-      - ["java.text", "CharacterIterator", "previous", "()", "summary", "df-generated"]
-      - ["java.text", "CharacterIterator", "setIndex", "(int)", "summary", "df-generated"]
       - ["java.text", "ChoiceFormat", "ChoiceFormat", "(String)", "summary", "df-generated"]
       - ["java.text", "ChoiceFormat", "applyPattern", "(String)", "summary", "df-generated"]
       - ["java.text", "ChoiceFormat", "getLimits", "()", "summary", "df-generated"]
       - ["java.text", "ChoiceFormat", "nextDouble", "(double)", "summary", "df-generated"]
       - ["java.text", "ChoiceFormat", "nextDouble", "(double,boolean)", "summary", "df-generated"]
+      - ["java.text", "ChoiceFormat", "parse", "(String,ParsePosition)", "summary", "df-generated"]
       - ["java.text", "ChoiceFormat", "previousDouble", "(double)", "summary", "df-generated"]
       - ["java.text", "CollationElementIterator", "getMaxExpansion", "(int)", "summary", "df-generated"]
       - ["java.text", "CollationElementIterator", "getOffset", "()", "summary", "df-generated"]
@@ -220,6 +211,7 @@ extensions:
       - ["java.text", "CollationElementIterator", "setText", "(String)", "summary", "df-generated"]
       - ["java.text", "CollationElementIterator", "tertiaryOrder", "(int)", "summary", "df-generated"]
       - ["java.text", "CollationKey", "toByteArray", "()", "summary", "df-generated"]
+      - ["java.text", "Collator", "compare", "(Object,Object)", "summary", "df-generated"]
       - ["java.text", "Collator", "compare", "(String,String)", "summary", "df-generated"]
       - ["java.text", "Collator", "equals", "(String,String)", "summary", "df-generated"]
       - ["java.text", "Collator", "getAvailableLocales", "()", "summary", "df-generated"]
@@ -229,10 +221,22 @@ extensions:
       - ["java.text", "Collator", "getStrength", "()", "summary", "df-generated"]
       - ["java.text", "Collator", "setDecomposition", "(int)", "summary", "df-generated"]
       - ["java.text", "Collator", "setStrength", "(int)", "summary", "df-generated"]
+      - ["java.text", "CompactNumberFormat", "formatToCharacterIterator", "(Object)", "summary", "df-generated"]
       - ["java.text", "CompactNumberFormat", "getGroupingSize", "()", "summary", "df-generated"]
+      - ["java.text", "CompactNumberFormat", "getRoundingMode", "()", "summary", "df-generated"]
+      - ["java.text", "CompactNumberFormat", "isGroupingUsed", "()", "summary", "df-generated"]
       - ["java.text", "CompactNumberFormat", "isParseBigDecimal", "()", "summary", "df-generated"]
+      - ["java.text", "CompactNumberFormat", "isParseIntegerOnly", "()", "summary", "df-generated"]
+      - ["java.text", "CompactNumberFormat", "parse", "(String,ParsePosition)", "summary", "df-generated"]
       - ["java.text", "CompactNumberFormat", "setGroupingSize", "(int)", "summary", "df-generated"]
+      - ["java.text", "CompactNumberFormat", "setGroupingUsed", "(boolean)", "summary", "df-generated"]
+      - ["java.text", "CompactNumberFormat", "setMaximumFractionDigits", "(int)", "summary", "df-generated"]
+      - ["java.text", "CompactNumberFormat", "setMaximumIntegerDigits", "(int)", "summary", "df-generated"]
+      - ["java.text", "CompactNumberFormat", "setMinimumFractionDigits", "(int)", "summary", "df-generated"]
+      - ["java.text", "CompactNumberFormat", "setMinimumIntegerDigits", "(int)", "summary", "df-generated"]
       - ["java.text", "CompactNumberFormat", "setParseBigDecimal", "(boolean)", "summary", "df-generated"]
+      - ["java.text", "CompactNumberFormat", "setParseIntegerOnly", "(boolean)", "summary", "df-generated"]
+      - ["java.text", "CompactNumberFormat", "setRoundingMode", "(RoundingMode)", "summary", "df-generated"]
       - ["java.text", "DateFormat$Field", "getCalendarField", "()", "summary", "df-generated"]
       - ["java.text", "DateFormat$Field", "ofCalendarField", "(int)", "summary", "df-generated"]
       - ["java.text", "DateFormat", "getAvailableLocales", "()", "summary", "df-generated"]
@@ -248,17 +252,31 @@ extensions:
       - ["java.text", "DateFormat", "setLenient", "(boolean)", "summary", "df-generated"]
       - ["java.text", "DateFormatSymbols", "getAvailableLocales", "()", "summary", "df-generated"]
       - ["java.text", "DateFormatSymbols", "getInstance", "()", "summary", "df-generated"]
+      - ["java.text", "DateFormatSymbols", "setZoneStrings", "(String[][])", "summary", "df-generated"]
       - ["java.text", "DecimalFormat", "DecimalFormat", "(String)", "summary", "df-generated"]
       - ["java.text", "DecimalFormat", "applyLocalizedPattern", "(String)", "summary", "df-generated"]
       - ["java.text", "DecimalFormat", "applyPattern", "(String)", "summary", "df-generated"]
+      - ["java.text", "DecimalFormat", "formatToCharacterIterator", "(Object)", "summary", "df-generated"]
       - ["java.text", "DecimalFormat", "getGroupingSize", "()", "summary", "df-generated"]
+      - ["java.text", "DecimalFormat", "getMaximumFractionDigits", "()", "summary", "df-generated"]
+      - ["java.text", "DecimalFormat", "getMaximumIntegerDigits", "()", "summary", "df-generated"]
+      - ["java.text", "DecimalFormat", "getMinimumFractionDigits", "()", "summary", "df-generated"]
+      - ["java.text", "DecimalFormat", "getMinimumIntegerDigits", "()", "summary", "df-generated"]
       - ["java.text", "DecimalFormat", "getMultiplier", "()", "summary", "df-generated"]
+      - ["java.text", "DecimalFormat", "getRoundingMode", "()", "summary", "df-generated"]
       - ["java.text", "DecimalFormat", "isDecimalSeparatorAlwaysShown", "()", "summary", "df-generated"]
       - ["java.text", "DecimalFormat", "isParseBigDecimal", "()", "summary", "df-generated"]
+      - ["java.text", "DecimalFormat", "parse", "(String,ParsePosition)", "summary", "df-generated"]
       - ["java.text", "DecimalFormat", "setDecimalSeparatorAlwaysShown", "(boolean)", "summary", "df-generated"]
       - ["java.text", "DecimalFormat", "setGroupingSize", "(int)", "summary", "df-generated"]
+      - ["java.text", "DecimalFormat", "setGroupingUsed", "(boolean)", "summary", "df-generated"]
+      - ["java.text", "DecimalFormat", "setMaximumFractionDigits", "(int)", "summary", "df-generated"]
+      - ["java.text", "DecimalFormat", "setMaximumIntegerDigits", "(int)", "summary", "df-generated"]
+      - ["java.text", "DecimalFormat", "setMinimumFractionDigits", "(int)", "summary", "df-generated"]
+      - ["java.text", "DecimalFormat", "setMinimumIntegerDigits", "(int)", "summary", "df-generated"]
       - ["java.text", "DecimalFormat", "setMultiplier", "(int)", "summary", "df-generated"]
       - ["java.text", "DecimalFormat", "setParseBigDecimal", "(boolean)", "summary", "df-generated"]
+      - ["java.text", "DecimalFormat", "setRoundingMode", "(RoundingMode)", "summary", "df-generated"]
       - ["java.text", "DecimalFormatSymbols", "getAvailableLocales", "()", "summary", "df-generated"]
       - ["java.text", "DecimalFormatSymbols", "getDecimalSeparator", "()", "summary", "df-generated"]
       - ["java.text", "DecimalFormatSymbols", "getDigit", "()", "summary", "df-generated"]
@@ -290,10 +308,12 @@ extensions:
       - ["java.text", "Format", "formatToCharacterIterator", "(Object)", "summary", "df-generated"]
       - ["java.text", "MessageFormat", "MessageFormat", "(String)", "summary", "df-generated"]
       - ["java.text", "MessageFormat", "applyPattern", "(String)", "summary", "df-generated"]
+      - ["java.text", "MessageFormat", "formatToCharacterIterator", "(Object)", "summary", "df-generated"]
       - ["java.text", "Normalizer", "isNormalized", "(CharSequence,Normalizer$Form)", "summary", "df-generated"]
       - ["java.text", "NumberFormat", "format", "(double)", "summary", "df-generated"]
       - ["java.text", "NumberFormat", "getAvailableLocales", "()", "summary", "df-generated"]
       - ["java.text", "NumberFormat", "getCompactNumberInstance", "()", "summary", "df-generated"]
+      - ["java.text", "NumberFormat", "getCurrency", "()", "summary", "df-generated"]
       - ["java.text", "NumberFormat", "getCurrencyInstance", "()", "summary", "df-generated"]
       - ["java.text", "NumberFormat", "getInstance", "()", "summary", "df-generated"]
       - ["java.text", "NumberFormat", "getIntegerInstance", "()", "summary", "df-generated"]
@@ -308,6 +328,7 @@ extensions:
       - ["java.text", "NumberFormat", "isParseIntegerOnly", "()", "summary", "df-generated"]
       - ["java.text", "NumberFormat", "parse", "(String)", "summary", "df-generated"]
       - ["java.text", "NumberFormat", "parse", "(String,ParsePosition)", "summary", "df-generated"]
+      - ["java.text", "NumberFormat", "setCurrency", "(Currency)", "summary", "df-generated"]
       - ["java.text", "NumberFormat", "setGroupingUsed", "(boolean)", "summary", "df-generated"]
       - ["java.text", "NumberFormat", "setMaximumFractionDigits", "(int)", "summary", "df-generated"]
       - ["java.text", "NumberFormat", "setMaximumIntegerDigits", "(int)", "summary", "df-generated"]
@@ -321,6 +342,18 @@ extensions:
       - ["java.text", "ParsePosition", "getIndex", "()", "summary", "df-generated"]
       - ["java.text", "ParsePosition", "setErrorIndex", "(int)", "summary", "df-generated"]
       - ["java.text", "ParsePosition", "setIndex", "(int)", "summary", "df-generated"]
+      - ["java.text", "RuleBasedCollator", "compare", "(String,String)", "summary", "df-generated"]
       - ["java.text", "SimpleDateFormat", "applyLocalizedPattern", "(String)", "summary", "df-generated"]
+      - ["java.text", "SimpleDateFormat", "formatToCharacterIterator", "(Object)", "summary", "df-generated"]
+      - ["java.text", "SimpleDateFormat", "parse", "(String,ParsePosition)", "summary", "df-generated"]
       - ["java.text", "SimpleDateFormat", "set2DigitYearStart", "(Date)", "summary", "df-generated"]
       - ["java.text", "SimpleDateFormat", "toLocalizedPattern", "()", "summary", "df-generated"]
+      - ["java.text", "StringCharacterIterator", "current", "()", "summary", "df-generated"]
+      - ["java.text", "StringCharacterIterator", "first", "()", "summary", "df-generated"]
+      - ["java.text", "StringCharacterIterator", "getBeginIndex", "()", "summary", "df-generated"]
+      - ["java.text", "StringCharacterIterator", "getEndIndex", "()", "summary", "df-generated"]
+      - ["java.text", "StringCharacterIterator", "getIndex", "()", "summary", "df-generated"]
+      - ["java.text", "StringCharacterIterator", "last", "()", "summary", "df-generated"]
+      - ["java.text", "StringCharacterIterator", "next", "()", "summary", "df-generated"]
+      - ["java.text", "StringCharacterIterator", "previous", "()", "summary", "df-generated"]
+      - ["java.text", "StringCharacterIterator", "setIndex", "(int)", "summary", "df-generated"]
diff --git a/java/ql/lib/ext/generated/java.text.spi.model.yml b/java/ql/lib/ext/generated/java.text.spi.model.yml
index e802b83640a..eef7ffa0e51 100644
--- a/java/ql/lib/ext/generated/java.text.spi.model.yml
+++ b/java/ql/lib/ext/generated/java.text.spi.model.yml
@@ -1,5 +1,19 @@
 # THIS FILE IS AN AUTO-GENERATED MODELS AS DATA FILE. DO NOT EDIT.
 extensions:
+  - addsTo:
+      pack: codeql/java-all
+      extensible: summaryModel
+    data:
+      - ["java.text.spi", "DateFormatProvider", True, "getDateInstance", "(int,Locale)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["java.text.spi", "DateFormatProvider", True, "getDateTimeInstance", "(int,int,Locale)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
+      - ["java.text.spi", "DateFormatProvider", True, "getTimeInstance", "(int,Locale)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["java.text.spi", "DateFormatSymbolsProvider", True, "getInstance", "(Locale)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.text.spi", "DecimalFormatSymbolsProvider", True, "getInstance", "(Locale)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.text.spi", "NumberFormatProvider", True, "getCompactNumberInstance", "(Locale,NumberFormat$Style)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.text.spi", "NumberFormatProvider", True, "getCurrencyInstance", "(Locale)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.text.spi", "NumberFormatProvider", True, "getIntegerInstance", "(Locale)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.text.spi", "NumberFormatProvider", True, "getNumberInstance", "(Locale)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.text.spi", "NumberFormatProvider", True, "getPercentInstance", "(Locale)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
   - addsTo:
       pack: codeql/java-all
       extensible: neutralModel
@@ -9,13 +23,3 @@ extensions:
       - ["java.text.spi", "BreakIteratorProvider", "getSentenceInstance", "(Locale)", "summary", "df-generated"]
       - ["java.text.spi", "BreakIteratorProvider", "getWordInstance", "(Locale)", "summary", "df-generated"]
       - ["java.text.spi", "CollatorProvider", "getInstance", "(Locale)", "summary", "df-generated"]
-      - ["java.text.spi", "DateFormatProvider", "getDateInstance", "(int,Locale)", "summary", "df-generated"]
-      - ["java.text.spi", "DateFormatProvider", "getDateTimeInstance", "(int,int,Locale)", "summary", "df-generated"]
-      - ["java.text.spi", "DateFormatProvider", "getTimeInstance", "(int,Locale)", "summary", "df-generated"]
-      - ["java.text.spi", "DateFormatSymbolsProvider", "getInstance", "(Locale)", "summary", "df-generated"]
-      - ["java.text.spi", "DecimalFormatSymbolsProvider", "getInstance", "(Locale)", "summary", "df-generated"]
-      - ["java.text.spi", "NumberFormatProvider", "getCompactNumberInstance", "(Locale,NumberFormat$Style)", "summary", "df-generated"]
-      - ["java.text.spi", "NumberFormatProvider", "getCurrencyInstance", "(Locale)", "summary", "df-generated"]
-      - ["java.text.spi", "NumberFormatProvider", "getIntegerInstance", "(Locale)", "summary", "df-generated"]
-      - ["java.text.spi", "NumberFormatProvider", "getNumberInstance", "(Locale)", "summary", "df-generated"]
-      - ["java.text.spi", "NumberFormatProvider", "getPercentInstance", "(Locale)", "summary", "df-generated"]
diff --git a/java/ql/lib/ext/generated/java.time.chrono.model.yml b/java/ql/lib/ext/generated/java.time.chrono.model.yml
index f050a4c5ee5..fc9ba3427d5 100644
--- a/java/ql/lib/ext/generated/java.time.chrono.model.yml
+++ b/java/ql/lib/ext/generated/java.time.chrono.model.yml
@@ -4,9 +4,9 @@ extensions:
       pack: codeql/java-all
       extensible: summaryModel
     data:
-      - ["java.time.chrono", "ChronoPeriod", True, "multipliedBy", "(int)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["java.time.chrono", "ChronoPeriod", True, "normalized", "()", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["java.time.chrono", "HijrahDate", False, "withVariant", "(HijrahChronology)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.time.chrono", "ChronoPeriod", True, "multipliedBy", "(int)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.time.chrono", "ChronoPeriod", True, "normalized", "()", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.time.chrono", "HijrahDate", False, "withVariant", "(HijrahChronology)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
   - addsTo:
       pack: codeql/java-all
       extensible: neutralModel
@@ -15,55 +15,104 @@ extensions:
       - ["java.time.chrono", "ChronoLocalDate", "isBefore", "(ChronoLocalDate)", "summary", "df-generated"]
       - ["java.time.chrono", "ChronoLocalDate", "isEqual", "(ChronoLocalDate)", "summary", "df-generated"]
       - ["java.time.chrono", "ChronoLocalDate", "isLeapYear", "()", "summary", "df-generated"]
-      - ["java.time.chrono", "ChronoLocalDate", "lengthOfMonth", "()", "summary", "df-generated"]
+      - ["java.time.chrono", "ChronoLocalDate", "isSupported", "(TemporalField)", "summary", "df-generated"]
+      - ["java.time.chrono", "ChronoLocalDate", "isSupported", "(TemporalUnit)", "summary", "df-generated"]
       - ["java.time.chrono", "ChronoLocalDate", "lengthOfYear", "()", "summary", "df-generated"]
       - ["java.time.chrono", "ChronoLocalDate", "timeLineOrder", "()", "summary", "df-generated"]
       - ["java.time.chrono", "ChronoLocalDate", "toEpochDay", "()", "summary", "df-generated"]
       - ["java.time.chrono", "ChronoLocalDateTime", "isAfter", "(ChronoLocalDateTime)", "summary", "df-generated"]
       - ["java.time.chrono", "ChronoLocalDateTime", "isBefore", "(ChronoLocalDateTime)", "summary", "df-generated"]
       - ["java.time.chrono", "ChronoLocalDateTime", "isEqual", "(ChronoLocalDateTime)", "summary", "df-generated"]
+      - ["java.time.chrono", "ChronoLocalDateTime", "isSupported", "(TemporalUnit)", "summary", "df-generated"]
       - ["java.time.chrono", "ChronoLocalDateTime", "timeLineOrder", "()", "summary", "df-generated"]
       - ["java.time.chrono", "ChronoLocalDateTime", "toEpochSecond", "(ZoneOffset)", "summary", "df-generated"]
       - ["java.time.chrono", "ChronoLocalDateTime", "toInstant", "(ZoneOffset)", "summary", "df-generated"]
       - ["java.time.chrono", "ChronoPeriod", "isNegative", "()", "summary", "df-generated"]
       - ["java.time.chrono", "ChronoPeriod", "isZero", "()", "summary", "df-generated"]
+      - ["java.time.chrono", "ChronoZonedDateTime", "get", "(TemporalField)", "summary", "df-generated"]
       - ["java.time.chrono", "ChronoZonedDateTime", "getChronology", "()", "summary", "df-generated"]
+      - ["java.time.chrono", "ChronoZonedDateTime", "getLong", "(TemporalField)", "summary", "df-generated"]
       - ["java.time.chrono", "ChronoZonedDateTime", "isAfter", "(ChronoZonedDateTime)", "summary", "df-generated"]
       - ["java.time.chrono", "ChronoZonedDateTime", "isBefore", "(ChronoZonedDateTime)", "summary", "df-generated"]
       - ["java.time.chrono", "ChronoZonedDateTime", "isEqual", "(ChronoZonedDateTime)", "summary", "df-generated"]
+      - ["java.time.chrono", "ChronoZonedDateTime", "isSupported", "(TemporalUnit)", "summary", "df-generated"]
       - ["java.time.chrono", "ChronoZonedDateTime", "timeLineOrder", "()", "summary", "df-generated"]
       - ["java.time.chrono", "ChronoZonedDateTime", "toEpochSecond", "()", "summary", "df-generated"]
       - ["java.time.chrono", "Chronology", "epochSecond", "(Era,int,int,int,int,int,int,ZoneOffset)", "summary", "df-generated"]
       - ["java.time.chrono", "Chronology", "epochSecond", "(int,int,int,int,int,int,ZoneOffset)", "summary", "df-generated"]
-      - ["java.time.chrono", "Chronology", "eraOf", "(int)", "summary", "df-generated"]
-      - ["java.time.chrono", "Chronology", "eras", "()", "summary", "df-generated"]
       - ["java.time.chrono", "Chronology", "getAvailableChronologies", "()", "summary", "df-generated"]
-      - ["java.time.chrono", "Chronology", "isLeapYear", "(long)", "summary", "df-generated"]
       - ["java.time.chrono", "Chronology", "of", "(String)", "summary", "df-generated"]
       - ["java.time.chrono", "Chronology", "ofLocale", "(Locale)", "summary", "df-generated"]
-      - ["java.time.chrono", "Chronology", "prolepticYear", "(Era,int)", "summary", "df-generated"]
-      - ["java.time.chrono", "Chronology", "range", "(ChronoField)", "summary", "df-generated"]
-      - ["java.time.chrono", "Era", "getValue", "()", "summary", "df-generated"]
+      - ["java.time.chrono", "Era", "get", "(TemporalField)", "summary", "df-generated"]
+      - ["java.time.chrono", "Era", "getLong", "(TemporalField)", "summary", "df-generated"]
+      - ["java.time.chrono", "Era", "isSupported", "(TemporalField)", "summary", "df-generated"]
+      - ["java.time.chrono", "HijrahChronology", "eraOf", "(int)", "summary", "df-generated"]
+      - ["java.time.chrono", "HijrahChronology", "eras", "()", "summary", "df-generated"]
+      - ["java.time.chrono", "HijrahChronology", "isLeapYear", "(long)", "summary", "df-generated"]
+      - ["java.time.chrono", "HijrahChronology", "prolepticYear", "(Era,int)", "summary", "df-generated"]
+      - ["java.time.chrono", "HijrahChronology", "range", "(ChronoField)", "summary", "df-generated"]
+      - ["java.time.chrono", "HijrahDate", "getLong", "(TemporalField)", "summary", "df-generated"]
+      - ["java.time.chrono", "HijrahDate", "isLeapYear", "()", "summary", "df-generated"]
+      - ["java.time.chrono", "HijrahDate", "lengthOfMonth", "()", "summary", "df-generated"]
+      - ["java.time.chrono", "HijrahDate", "lengthOfYear", "()", "summary", "df-generated"]
       - ["java.time.chrono", "HijrahDate", "now", "()", "summary", "df-generated"]
       - ["java.time.chrono", "HijrahDate", "now", "(Clock)", "summary", "df-generated"]
       - ["java.time.chrono", "HijrahDate", "now", "(ZoneId)", "summary", "df-generated"]
       - ["java.time.chrono", "HijrahDate", "of", "(int,int,int)", "summary", "df-generated"]
+      - ["java.time.chrono", "HijrahDate", "toEpochDay", "()", "summary", "df-generated"]
+      - ["java.time.chrono", "HijrahEra", "getValue", "()", "summary", "df-generated"]
       - ["java.time.chrono", "HijrahEra", "of", "(int)", "summary", "df-generated"]
+      - ["java.time.chrono", "IsoChronology", "epochSecond", "(int,int,int,int,int,int,ZoneOffset)", "summary", "df-generated"]
+      - ["java.time.chrono", "IsoChronology", "eraOf", "(int)", "summary", "df-generated"]
+      - ["java.time.chrono", "IsoChronology", "eras", "()", "summary", "df-generated"]
+      - ["java.time.chrono", "IsoChronology", "isLeapYear", "(long)", "summary", "df-generated"]
+      - ["java.time.chrono", "IsoChronology", "prolepticYear", "(Era,int)", "summary", "df-generated"]
+      - ["java.time.chrono", "IsoChronology", "range", "(ChronoField)", "summary", "df-generated"]
+      - ["java.time.chrono", "IsoEra", "getValue", "()", "summary", "df-generated"]
       - ["java.time.chrono", "IsoEra", "of", "(int)", "summary", "df-generated"]
+      - ["java.time.chrono", "JapaneseChronology", "eraOf", "(int)", "summary", "df-generated"]
+      - ["java.time.chrono", "JapaneseChronology", "eras", "()", "summary", "df-generated"]
+      - ["java.time.chrono", "JapaneseChronology", "isLeapYear", "(long)", "summary", "df-generated"]
+      - ["java.time.chrono", "JapaneseChronology", "prolepticYear", "(Era,int)", "summary", "df-generated"]
+      - ["java.time.chrono", "JapaneseChronology", "range", "(ChronoField)", "summary", "df-generated"]
+      - ["java.time.chrono", "JapaneseDate", "getLong", "(TemporalField)", "summary", "df-generated"]
+      - ["java.time.chrono", "JapaneseDate", "isSupported", "(TemporalField)", "summary", "df-generated"]
+      - ["java.time.chrono", "JapaneseDate", "lengthOfMonth", "()", "summary", "df-generated"]
+      - ["java.time.chrono", "JapaneseDate", "lengthOfYear", "()", "summary", "df-generated"]
       - ["java.time.chrono", "JapaneseDate", "now", "()", "summary", "df-generated"]
       - ["java.time.chrono", "JapaneseDate", "now", "(Clock)", "summary", "df-generated"]
       - ["java.time.chrono", "JapaneseDate", "now", "(ZoneId)", "summary", "df-generated"]
       - ["java.time.chrono", "JapaneseDate", "of", "(int,int,int)", "summary", "df-generated"]
+      - ["java.time.chrono", "JapaneseDate", "toEpochDay", "()", "summary", "df-generated"]
+      - ["java.time.chrono", "JapaneseEra", "getValue", "()", "summary", "df-generated"]
       - ["java.time.chrono", "JapaneseEra", "of", "(int)", "summary", "df-generated"]
       - ["java.time.chrono", "JapaneseEra", "valueOf", "(String)", "summary", "df-generated"]
       - ["java.time.chrono", "JapaneseEra", "values", "()", "summary", "df-generated"]
+      - ["java.time.chrono", "MinguoChronology", "eraOf", "(int)", "summary", "df-generated"]
+      - ["java.time.chrono", "MinguoChronology", "eras", "()", "summary", "df-generated"]
+      - ["java.time.chrono", "MinguoChronology", "isLeapYear", "(long)", "summary", "df-generated"]
+      - ["java.time.chrono", "MinguoChronology", "prolepticYear", "(Era,int)", "summary", "df-generated"]
+      - ["java.time.chrono", "MinguoChronology", "range", "(ChronoField)", "summary", "df-generated"]
+      - ["java.time.chrono", "MinguoDate", "getLong", "(TemporalField)", "summary", "df-generated"]
+      - ["java.time.chrono", "MinguoDate", "lengthOfMonth", "()", "summary", "df-generated"]
       - ["java.time.chrono", "MinguoDate", "now", "()", "summary", "df-generated"]
       - ["java.time.chrono", "MinguoDate", "now", "(Clock)", "summary", "df-generated"]
       - ["java.time.chrono", "MinguoDate", "now", "(ZoneId)", "summary", "df-generated"]
       - ["java.time.chrono", "MinguoDate", "of", "(int,int,int)", "summary", "df-generated"]
+      - ["java.time.chrono", "MinguoDate", "toEpochDay", "()", "summary", "df-generated"]
+      - ["java.time.chrono", "MinguoEra", "getValue", "()", "summary", "df-generated"]
       - ["java.time.chrono", "MinguoEra", "of", "(int)", "summary", "df-generated"]
+      - ["java.time.chrono", "ThaiBuddhistChronology", "eraOf", "(int)", "summary", "df-generated"]
+      - ["java.time.chrono", "ThaiBuddhistChronology", "eras", "()", "summary", "df-generated"]
+      - ["java.time.chrono", "ThaiBuddhistChronology", "isLeapYear", "(long)", "summary", "df-generated"]
+      - ["java.time.chrono", "ThaiBuddhistChronology", "prolepticYear", "(Era,int)", "summary", "df-generated"]
+      - ["java.time.chrono", "ThaiBuddhistChronology", "range", "(ChronoField)", "summary", "df-generated"]
+      - ["java.time.chrono", "ThaiBuddhistDate", "getLong", "(TemporalField)", "summary", "df-generated"]
+      - ["java.time.chrono", "ThaiBuddhistDate", "lengthOfMonth", "()", "summary", "df-generated"]
       - ["java.time.chrono", "ThaiBuddhistDate", "now", "()", "summary", "df-generated"]
       - ["java.time.chrono", "ThaiBuddhistDate", "now", "(Clock)", "summary", "df-generated"]
       - ["java.time.chrono", "ThaiBuddhistDate", "now", "(ZoneId)", "summary", "df-generated"]
       - ["java.time.chrono", "ThaiBuddhistDate", "of", "(int,int,int)", "summary", "df-generated"]
+      - ["java.time.chrono", "ThaiBuddhistDate", "toEpochDay", "()", "summary", "df-generated"]
+      - ["java.time.chrono", "ThaiBuddhistEra", "getValue", "()", "summary", "df-generated"]
       - ["java.time.chrono", "ThaiBuddhistEra", "of", "(int)", "summary", "df-generated"]
diff --git a/java/ql/lib/ext/generated/java.time.format.model.yml b/java/ql/lib/ext/generated/java.time.format.model.yml
index f8a7a3955f5..d3a5b975a16 100644
--- a/java/ql/lib/ext/generated/java.time.format.model.yml
+++ b/java/ql/lib/ext/generated/java.time.format.model.yml
@@ -4,70 +4,68 @@ extensions:
       pack: codeql/java-all
       extensible: summaryModel
     data:
-      - ["java.time.format", "DateTimeFormatter", False, "formatTo", "(TemporalAccessor,Appendable)", "", "Argument[0]", "Argument[1]", "taint", "df-generated"]
-      - ["java.time.format", "DateTimeFormatter", False, "formatTo", "(TemporalAccessor,Appendable)", "", "Argument[this]", "Argument[1]", "taint", "df-generated"]
-      - ["java.time.format", "DateTimeFormatter", False, "getChronology", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.time.format", "DateTimeFormatter", False, "getDecimalStyle", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.time.format", "DateTimeFormatter", False, "getLocale", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.time.format", "DateTimeFormatter", False, "getResolverFields", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.time.format", "DateTimeFormatter", False, "getZone", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.time.format", "DateTimeFormatter", False, "localizedBy", "(Locale)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["java.time.format", "DateTimeFormatter", False, "ofPattern", "(String,Locale)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time.format", "DateTimeFormatter", False, "getChronology", "()", "", "Argument[this].SyntheticField[java.time.format.DateTimeFormatter.chrono]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.time.format", "DateTimeFormatter", False, "getDecimalStyle", "()", "", "Argument[this].SyntheticField[java.time.format.DateTimeFormatter.decimalStyle]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.time.format", "DateTimeFormatter", False, "getLocale", "()", "", "Argument[this].SyntheticField[java.time.format.DateTimeFormatter.locale]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.time.format", "DateTimeFormatter", False, "getResolverFields", "()", "", "Argument[this].SyntheticField[java.time.format.DateTimeFormatter.resolverFields]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.time.format", "DateTimeFormatter", False, "getZone", "()", "", "Argument[this].SyntheticField[java.time.format.DateTimeFormatter.zone]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.time.format", "DateTimeFormatter", False, "localizedBy", "(Locale)", "", "Argument[0]", "ReturnValue.SyntheticField[java.time.format.DateTimeFormatter.locale]", "value", "dfc-generated"]
+      - ["java.time.format", "DateTimeFormatter", False, "ofPattern", "(String,Locale)", "", "Argument[1]", "ReturnValue.SyntheticField[java.time.format.DateTimeFormatter.locale]", "value", "dfc-generated"]
       - ["java.time.format", "DateTimeFormatter", False, "parse", "(CharSequence)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.time.format", "DateTimeFormatter", False, "parse", "(CharSequence,ParsePosition)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.time.format", "DateTimeFormatter", False, "parse", "(CharSequence,TemporalQuery)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.time.format", "DateTimeFormatter", False, "parseBest", "(CharSequence,TemporalQuery[])", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.time.format", "DateTimeFormatter", False, "toFormat", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.time.format", "DateTimeFormatter", False, "toFormat", "(TemporalQuery)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["java.time.format", "DateTimeFormatter", False, "toFormat", "(TemporalQuery)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.time.format", "DateTimeFormatter", False, "withChronology", "(Chronology)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["java.time.format", "DateTimeFormatter", False, "withDecimalStyle", "(DecimalStyle)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["java.time.format", "DateTimeFormatter", False, "withLocale", "(Locale)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["java.time.format", "DateTimeFormatter", False, "withResolverFields", "(Set)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["java.time.format", "DateTimeFormatter", False, "withResolverFields", "(TemporalField[])", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.time.format", "DateTimeFormatter", False, "withChronology", "(Chronology)", "", "Argument[0]", "ReturnValue.SyntheticField[java.time.format.DateTimeFormatter.chrono]", "value", "dfc-generated"]
+      - ["java.time.format", "DateTimeFormatter", False, "withDecimalStyle", "(DecimalStyle)", "", "Argument[0]", "ReturnValue.SyntheticField[java.time.format.DateTimeFormatter.decimalStyle]", "value", "dfc-generated"]
+      - ["java.time.format", "DateTimeFormatter", False, "withLocale", "(Locale)", "", "Argument[0]", "ReturnValue.SyntheticField[java.time.format.DateTimeFormatter.locale]", "value", "dfc-generated"]
+      - ["java.time.format", "DateTimeFormatter", False, "withResolverFields", "(Set)", "", "Argument[0].Element", "ReturnValue.SyntheticField[java.time.format.DateTimeFormatter.resolverFields].Element", "value", "dfc-generated"]
+      - ["java.time.format", "DateTimeFormatter", False, "withResolverFields", "(Set)", "", "Argument[0]", "ReturnValue.SyntheticField[java.time.format.DateTimeFormatter.resolverFields]", "value", "dfc-generated"]
+      - ["java.time.format", "DateTimeFormatter", False, "withResolverFields", "(TemporalField[])", "", "Argument[0].ArrayElement", "ReturnValue.SyntheticField[java.time.format.DateTimeFormatter.resolverFields].Element", "value", "dfc-generated"]
       - ["java.time.format", "DateTimeFormatter", False, "withResolverStyle", "(ResolverStyle)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["java.time.format", "DateTimeFormatter", False, "withZone", "(ZoneId)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["java.time.format", "DateTimeFormatterBuilder", False, "append", "(DateTimeFormatter)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["java.time.format", "DateTimeFormatterBuilder", False, "appendChronologyId", "()", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["java.time.format", "DateTimeFormatterBuilder", False, "appendChronologyText", "(TextStyle)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["java.time.format", "DateTimeFormatterBuilder", False, "appendDayPeriodText", "(TextStyle)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["java.time.format", "DateTimeFormatterBuilder", False, "appendFraction", "(TemporalField,int,int,boolean)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["java.time.format", "DateTimeFormatterBuilder", False, "appendGenericZoneText", "(TextStyle)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["java.time.format", "DateTimeFormatterBuilder", False, "appendGenericZoneText", "(TextStyle,Set)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["java.time.format", "DateTimeFormatterBuilder", False, "appendInstant", "()", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["java.time.format", "DateTimeFormatterBuilder", False, "appendInstant", "(int)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["java.time.format", "DateTimeFormatterBuilder", False, "appendLiteral", "(String)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["java.time.format", "DateTimeFormatterBuilder", False, "appendLiteral", "(char)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["java.time.format", "DateTimeFormatterBuilder", False, "appendLocalized", "(FormatStyle,FormatStyle)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["java.time.format", "DateTimeFormatterBuilder", False, "appendLocalizedOffset", "(TextStyle)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["java.time.format", "DateTimeFormatterBuilder", False, "appendOffset", "(String,String)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["java.time.format", "DateTimeFormatterBuilder", False, "appendOffsetId", "()", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["java.time.format", "DateTimeFormatterBuilder", False, "appendOptional", "(DateTimeFormatter)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["java.time.format", "DateTimeFormatterBuilder", False, "appendPattern", "(String)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["java.time.format", "DateTimeFormatterBuilder", False, "appendText", "(TemporalField)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.time.format", "DateTimeFormatterBuilder", False, "appendText", "(TemporalField,Map)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["java.time.format", "DateTimeFormatterBuilder", False, "appendText", "(TemporalField,TextStyle)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["java.time.format", "DateTimeFormatterBuilder", False, "appendValue", "(TemporalField)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["java.time.format", "DateTimeFormatterBuilder", False, "appendValue", "(TemporalField,int)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["java.time.format", "DateTimeFormatterBuilder", False, "appendValue", "(TemporalField,int,int,SignStyle)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["java.time.format", "DateTimeFormatterBuilder", False, "appendValueReduced", "(TemporalField,int,int,ChronoLocalDate)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["java.time.format", "DateTimeFormatterBuilder", False, "appendValueReduced", "(TemporalField,int,int,int)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["java.time.format", "DateTimeFormatterBuilder", False, "appendZoneId", "()", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["java.time.format", "DateTimeFormatterBuilder", False, "appendZoneOrOffsetId", "()", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["java.time.format", "DateTimeFormatterBuilder", False, "appendZoneRegionId", "()", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["java.time.format", "DateTimeFormatterBuilder", False, "appendZoneText", "(TextStyle)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["java.time.format", "DateTimeFormatterBuilder", False, "appendZoneText", "(TextStyle,Set)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.time.format", "DateTimeFormatter", False, "withZone", "(ZoneId)", "", "Argument[0]", "ReturnValue.SyntheticField[java.time.format.DateTimeFormatter.zone]", "value", "dfc-generated"]
+      - ["java.time.format", "DateTimeFormatterBuilder", False, "append", "(DateTimeFormatter)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.time.format", "DateTimeFormatterBuilder", False, "appendChronologyId", "()", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.time.format", "DateTimeFormatterBuilder", False, "appendChronologyText", "(TextStyle)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.time.format", "DateTimeFormatterBuilder", False, "appendDayPeriodText", "(TextStyle)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.time.format", "DateTimeFormatterBuilder", False, "appendFraction", "(TemporalField,int,int,boolean)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.time.format", "DateTimeFormatterBuilder", False, "appendGenericZoneText", "(TextStyle)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.time.format", "DateTimeFormatterBuilder", False, "appendGenericZoneText", "(TextStyle,Set)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.time.format", "DateTimeFormatterBuilder", False, "appendInstant", "()", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.time.format", "DateTimeFormatterBuilder", False, "appendInstant", "(int)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.time.format", "DateTimeFormatterBuilder", False, "appendLiteral", "(String)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.time.format", "DateTimeFormatterBuilder", False, "appendLiteral", "(char)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.time.format", "DateTimeFormatterBuilder", False, "appendLocalized", "(FormatStyle,FormatStyle)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.time.format", "DateTimeFormatterBuilder", False, "appendLocalizedOffset", "(TextStyle)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.time.format", "DateTimeFormatterBuilder", False, "appendOffset", "(String,String)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.time.format", "DateTimeFormatterBuilder", False, "appendOffsetId", "()", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.time.format", "DateTimeFormatterBuilder", False, "appendOptional", "(DateTimeFormatter)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.time.format", "DateTimeFormatterBuilder", False, "appendPattern", "(String)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.time.format", "DateTimeFormatterBuilder", False, "appendText", "(TemporalField)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.time.format", "DateTimeFormatterBuilder", False, "appendText", "(TemporalField,Map)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.time.format", "DateTimeFormatterBuilder", False, "appendText", "(TemporalField,TextStyle)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.time.format", "DateTimeFormatterBuilder", False, "appendValue", "(TemporalField)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.time.format", "DateTimeFormatterBuilder", False, "appendValue", "(TemporalField,int)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.time.format", "DateTimeFormatterBuilder", False, "appendValue", "(TemporalField,int,int,SignStyle)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.time.format", "DateTimeFormatterBuilder", False, "appendValueReduced", "(TemporalField,int,int,ChronoLocalDate)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.time.format", "DateTimeFormatterBuilder", False, "appendValueReduced", "(TemporalField,int,int,int)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.time.format", "DateTimeFormatterBuilder", False, "appendZoneId", "()", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.time.format", "DateTimeFormatterBuilder", False, "appendZoneOrOffsetId", "()", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.time.format", "DateTimeFormatterBuilder", False, "appendZoneRegionId", "()", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.time.format", "DateTimeFormatterBuilder", False, "appendZoneText", "(TextStyle)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.time.format", "DateTimeFormatterBuilder", False, "appendZoneText", "(TextStyle,Set)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
       - ["java.time.format", "DateTimeFormatterBuilder", False, "getLocalizedDateTimePattern", "(FormatStyle,FormatStyle,Chronology,Locale)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
-      - ["java.time.format", "DateTimeFormatterBuilder", False, "optionalEnd", "()", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["java.time.format", "DateTimeFormatterBuilder", False, "optionalStart", "()", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["java.time.format", "DateTimeFormatterBuilder", False, "padNext", "(int)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.time.format", "DateTimeFormatterBuilder", False, "padNext", "(int,char)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["java.time.format", "DateTimeFormatterBuilder", False, "parseCaseInsensitive", "()", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["java.time.format", "DateTimeFormatterBuilder", False, "parseCaseSensitive", "()", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["java.time.format", "DateTimeFormatterBuilder", False, "parseDefaulting", "(TemporalField,long)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["java.time.format", "DateTimeFormatterBuilder", False, "parseLenient", "()", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["java.time.format", "DateTimeFormatterBuilder", False, "parseStrict", "()", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["java.time.format", "DateTimeFormatterBuilder", False, "toFormatter", "(Locale)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time.format", "DateTimeFormatterBuilder", False, "optionalEnd", "()", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.time.format", "DateTimeFormatterBuilder", False, "optionalStart", "()", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.time.format", "DateTimeFormatterBuilder", False, "padNext", "(int)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.time.format", "DateTimeFormatterBuilder", False, "padNext", "(int,char)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.time.format", "DateTimeFormatterBuilder", False, "parseCaseInsensitive", "()", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.time.format", "DateTimeFormatterBuilder", False, "parseCaseSensitive", "()", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.time.format", "DateTimeFormatterBuilder", False, "parseDefaulting", "(TemporalField,long)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.time.format", "DateTimeFormatterBuilder", False, "parseLenient", "()", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.time.format", "DateTimeFormatterBuilder", False, "parseStrict", "()", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.time.format", "DateTimeFormatterBuilder", False, "toFormatter", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time.format", "DateTimeFormatterBuilder", False, "toFormatter", "(Locale)", "", "Argument[0]", "ReturnValue.SyntheticField[java.time.format.DateTimeFormatter.locale]", "value", "dfc-generated"]
       - ["java.time.format", "DateTimeParseException", True, "DateTimeParseException", "(String,CharSequence,int)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.time.format", "DateTimeParseException", True, "DateTimeParseException", "(String,CharSequence,int)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
       - ["java.time.format", "DateTimeParseException", True, "DateTimeParseException", "(String,CharSequence,int,Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
@@ -75,23 +73,25 @@ extensions:
       - ["java.time.format", "DateTimeParseException", True, "DateTimeParseException", "(String,CharSequence,int,Throwable)", "", "Argument[3]", "Argument[this]", "taint", "df-generated"]
       - ["java.time.format", "DateTimeParseException", True, "getParsedString", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.time.format", "DecimalStyle", False, "of", "(Locale)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["java.time.format", "DecimalStyle", False, "withDecimalSeparator", "(char)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["java.time.format", "DecimalStyle", False, "withNegativeSign", "(char)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["java.time.format", "DecimalStyle", False, "withPositiveSign", "(char)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["java.time.format", "DecimalStyle", False, "withZeroDigit", "(char)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.time.format", "DecimalStyle", False, "withDecimalSeparator", "(char)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.time.format", "DecimalStyle", False, "withNegativeSign", "(char)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.time.format", "DecimalStyle", False, "withPositiveSign", "(char)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.time.format", "DecimalStyle", False, "withZeroDigit", "(char)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
   - addsTo:
       pack: codeql/java-all
       extensible: neutralModel
     data:
+      - ["java.time.format", "DateTimeFormatter", "formatTo", "(TemporalAccessor,Appendable)", "summary", "df-generated"]
       - ["java.time.format", "DateTimeFormatter", "getResolverStyle", "()", "summary", "df-generated"]
       - ["java.time.format", "DateTimeFormatter", "ofLocalizedDate", "(FormatStyle)", "summary", "df-generated"]
       - ["java.time.format", "DateTimeFormatter", "ofLocalizedDateTime", "(FormatStyle)", "summary", "df-generated"]
       - ["java.time.format", "DateTimeFormatter", "ofLocalizedDateTime", "(FormatStyle,FormatStyle)", "summary", "df-generated"]
       - ["java.time.format", "DateTimeFormatter", "ofLocalizedTime", "(FormatStyle)", "summary", "df-generated"]
+      - ["java.time.format", "DateTimeFormatter", "parse", "(CharSequence,TemporalQuery)", "summary", "df-generated"]
+      - ["java.time.format", "DateTimeFormatter", "parseBest", "(CharSequence,TemporalQuery[])", "summary", "df-generated"]
       - ["java.time.format", "DateTimeFormatter", "parseUnresolved", "(CharSequence,ParsePosition)", "summary", "df-generated"]
       - ["java.time.format", "DateTimeFormatter", "parsedExcessDays", "()", "summary", "df-generated"]
       - ["java.time.format", "DateTimeFormatter", "parsedLeapSecond", "()", "summary", "df-generated"]
-      - ["java.time.format", "DateTimeFormatterBuilder", "toFormatter", "()", "summary", "df-generated"]
       - ["java.time.format", "DateTimeParseException", "getErrorIndex", "()", "summary", "df-generated"]
       - ["java.time.format", "DecimalStyle", "getAvailableLocales", "()", "summary", "df-generated"]
       - ["java.time.format", "DecimalStyle", "getDecimalSeparator", "()", "summary", "df-generated"]
diff --git a/java/ql/lib/ext/generated/java.time.model.yml b/java/ql/lib/ext/generated/java.time.model.yml
index bef34598ce3..2b3c1e0c011 100644
--- a/java/ql/lib/ext/generated/java.time.model.yml
+++ b/java/ql/lib/ext/generated/java.time.model.yml
@@ -7,57 +7,74 @@ extensions:
       - ["java.time", "DateTimeException", True, "DateTimeException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.time", "DateTimeException", True, "DateTimeException", "(String,Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.time", "DateTimeException", True, "DateTimeException", "(String,Throwable)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["java.time", "Duration", False, "dividedBy", "(long)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["java.time", "Duration", False, "multipliedBy", "(long)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["java.time", "Duration", False, "plus", "(long,TemporalUnit)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["java.time", "Duration", False, "truncatedTo", "(TemporalUnit)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["java.time", "Instant", False, "truncatedTo", "(TemporalUnit)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["java.time", "InstantSource", True, "withZone", "(ZoneId)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["java.time", "LocalDate", False, "plusMonths", "(long)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["java.time", "LocalDate", False, "plusYears", "(long)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["java.time", "LocalDate", False, "withDayOfMonth", "(int)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["java.time", "LocalDate", False, "withDayOfYear", "(int)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["java.time", "LocalDate", False, "withMonth", "(int)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["java.time", "LocalDate", False, "withYear", "(int)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["java.time", "LocalTime", False, "plusHours", "(long)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["java.time", "LocalTime", False, "plusMinutes", "(long)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["java.time", "LocalTime", False, "plusNanos", "(long)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["java.time", "LocalTime", False, "plusSeconds", "(long)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["java.time", "LocalTime", False, "truncatedTo", "(TemporalUnit)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["java.time", "LocalTime", False, "withHour", "(int)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["java.time", "LocalTime", False, "withMinute", "(int)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["java.time", "LocalTime", False, "withNano", "(int)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["java.time", "LocalTime", False, "withSecond", "(int)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["java.time", "MonthDay", False, "with", "(Month)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["java.time", "MonthDay", False, "withDayOfMonth", "(int)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["java.time", "OffsetDateTime", False, "withOffsetSameInstant", "(ZoneOffset)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["java.time", "OffsetTime", False, "withOffsetSameInstant", "(ZoneOffset)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["java.time", "Period", False, "plusDays", "(long)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["java.time", "Period", False, "plusMonths", "(long)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["java.time", "Period", False, "plusYears", "(long)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["java.time", "Period", False, "withDays", "(int)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["java.time", "Period", False, "withMonths", "(int)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["java.time", "Period", False, "withYears", "(int)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["java.time", "Year", False, "plusYears", "(long)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["java.time", "YearMonth", False, "plusMonths", "(long)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["java.time", "YearMonth", False, "plusYears", "(long)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["java.time", "ZoneId", True, "normalized", "()", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.time", "Duration", False, "dividedBy", "(long)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.time", "Duration", False, "multipliedBy", "(long)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.time", "Duration", False, "plus", "(long,TemporalUnit)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.time", "Duration", False, "truncatedTo", "(TemporalUnit)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.time", "Instant", False, "truncatedTo", "(TemporalUnit)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.time", "LocalDate", False, "plusMonths", "(long)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.time", "LocalDate", False, "plusYears", "(long)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.time", "LocalDate", False, "withDayOfMonth", "(int)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.time", "LocalDate", False, "withDayOfYear", "(int)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.time", "LocalDate", False, "withMonth", "(int)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.time", "LocalDate", False, "withYear", "(int)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.time", "LocalDateTime", False, "toLocalDate", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time", "LocalDateTime", False, "toLocalTime", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time", "LocalTime", False, "plusHours", "(long)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.time", "LocalTime", False, "plusMinutes", "(long)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.time", "LocalTime", False, "plusNanos", "(long)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.time", "LocalTime", False, "plusSeconds", "(long)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.time", "LocalTime", False, "truncatedTo", "(TemporalUnit)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.time", "LocalTime", False, "withHour", "(int)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.time", "LocalTime", False, "withMinute", "(int)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.time", "LocalTime", False, "withNano", "(int)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.time", "LocalTime", False, "withSecond", "(int)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.time", "MonthDay", False, "with", "(Month)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.time", "MonthDay", False, "withDayOfMonth", "(int)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.time", "OffsetDateTime", False, "withOffsetSameInstant", "(ZoneOffset)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.time", "OffsetTime", False, "withOffsetSameInstant", "(ZoneOffset)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.time", "Period", False, "plusDays", "(long)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.time", "Period", False, "plusMonths", "(long)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.time", "Period", False, "plusYears", "(long)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.time", "Period", False, "withDays", "(int)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.time", "Period", False, "withMonths", "(int)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.time", "Period", False, "withYears", "(int)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.time", "Year", False, "plusYears", "(long)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.time", "YearMonth", False, "plusMonths", "(long)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.time", "YearMonth", False, "plusYears", "(long)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.time", "ZoneId", True, "normalized", "()", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.time", "ZonedDateTime", False, "getOffset", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time", "ZonedDateTime", False, "getZone", "()", "", "Argument[this].SyntheticField[java.time.ZonedDateTime.zone]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.time", "ZonedDateTime", False, "toLocalDateTime", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time", "ZonedDateTime", False, "withEarlierOffsetAtOverlap", "()", "", "Argument[this].SyntheticField[java.time.ZonedDateTime.zone]", "ReturnValue.SyntheticField[java.time.ZonedDateTime.zone]", "value", "dfc-generated"]
+      - ["java.time", "ZonedDateTime", False, "withEarlierOffsetAtOverlap", "()", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.time", "ZonedDateTime", False, "withLaterOffsetAtOverlap", "()", "", "Argument[this].SyntheticField[java.time.ZonedDateTime.zone]", "ReturnValue.SyntheticField[java.time.ZonedDateTime.zone]", "value", "dfc-generated"]
+      - ["java.time", "ZonedDateTime", False, "withLaterOffsetAtOverlap", "()", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.time", "ZonedDateTime", False, "withZoneSameInstant", "(ZoneId)", "", "Argument[0]", "ReturnValue.SyntheticField[java.time.ZonedDateTime.zone]", "value", "dfc-generated"]
+      - ["java.time", "ZonedDateTime", False, "withZoneSameInstant", "(ZoneId)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.time", "ZonedDateTime", False, "withZoneSameLocal", "(ZoneId)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
   - addsTo:
       pack: codeql/java-all
       extensible: neutralModel
     data:
+      - ["java.time", "Clock", "millis", "()", "summary", "df-generated"]
       - ["java.time", "Clock", "systemDefaultZone", "()", "summary", "df-generated"]
       - ["java.time", "Clock", "systemUTC", "()", "summary", "df-generated"]
       - ["java.time", "DayOfWeek", "from", "(TemporalAccessor)", "summary", "df-generated"]
+      - ["java.time", "DayOfWeek", "get", "(TemporalField)", "summary", "df-generated"]
+      - ["java.time", "DayOfWeek", "getLong", "(TemporalField)", "summary", "df-generated"]
       - ["java.time", "DayOfWeek", "getValue", "()", "summary", "df-generated"]
+      - ["java.time", "DayOfWeek", "isSupported", "(TemporalField)", "summary", "df-generated"]
       - ["java.time", "DayOfWeek", "minus", "(long)", "summary", "df-generated"]
       - ["java.time", "DayOfWeek", "of", "(int)", "summary", "df-generated"]
       - ["java.time", "DayOfWeek", "plus", "(long)", "summary", "df-generated"]
       - ["java.time", "Duration", "between", "(Temporal,Temporal)", "summary", "df-generated"]
       - ["java.time", "Duration", "dividedBy", "(Duration)", "summary", "df-generated"]
       - ["java.time", "Duration", "from", "(TemporalAmount)", "summary", "df-generated"]
+      - ["java.time", "Duration", "get", "(TemporalUnit)", "summary", "df-generated"]
       - ["java.time", "Duration", "getNano", "()", "summary", "df-generated"]
       - ["java.time", "Duration", "getSeconds", "()", "summary", "df-generated"]
+      - ["java.time", "Duration", "getUnits", "()", "summary", "df-generated"]
       - ["java.time", "Duration", "isNegative", "()", "summary", "df-generated"]
       - ["java.time", "Duration", "isZero", "()", "summary", "df-generated"]
       - ["java.time", "Duration", "of", "(long,TemporalUnit)", "summary", "df-generated"]
@@ -79,22 +96,37 @@ extensions:
       - ["java.time", "Duration", "toSecondsPart", "()", "summary", "df-generated"]
       - ["java.time", "Duration", "withNanos", "(int)", "summary", "df-generated"]
       - ["java.time", "Duration", "withSeconds", "(long)", "summary", "df-generated"]
+      - ["java.time", "Instant", "get", "(TemporalField)", "summary", "df-generated"]
       - ["java.time", "Instant", "getEpochSecond", "()", "summary", "df-generated"]
+      - ["java.time", "Instant", "getLong", "(TemporalField)", "summary", "df-generated"]
       - ["java.time", "Instant", "getNano", "()", "summary", "df-generated"]
       - ["java.time", "Instant", "isAfter", "(Instant)", "summary", "df-generated"]
       - ["java.time", "Instant", "isBefore", "(Instant)", "summary", "df-generated"]
+      - ["java.time", "Instant", "isSupported", "(TemporalField)", "summary", "df-generated"]
+      - ["java.time", "Instant", "isSupported", "(TemporalUnit)", "summary", "df-generated"]
       - ["java.time", "Instant", "ofEpochSecond", "(long)", "summary", "df-generated"]
       - ["java.time", "Instant", "ofEpochSecond", "(long,long)", "summary", "df-generated"]
+      - ["java.time", "Instant", "until", "(Temporal,TemporalUnit)", "summary", "df-generated"]
       - ["java.time", "InstantSource", "millis", "()", "summary", "df-generated"]
       - ["java.time", "InstantSource", "system", "()", "summary", "df-generated"]
       - ["java.time", "LocalDate", "datesUntil", "(LocalDate)", "summary", "df-generated"]
       - ["java.time", "LocalDate", "datesUntil", "(LocalDate,Period)", "summary", "df-generated"]
+      - ["java.time", "LocalDate", "get", "(TemporalField)", "summary", "df-generated"]
       - ["java.time", "LocalDate", "getDayOfMonth", "()", "summary", "df-generated"]
       - ["java.time", "LocalDate", "getDayOfWeek", "()", "summary", "df-generated"]
       - ["java.time", "LocalDate", "getDayOfYear", "()", "summary", "df-generated"]
+      - ["java.time", "LocalDate", "getLong", "(TemporalField)", "summary", "df-generated"]
       - ["java.time", "LocalDate", "getMonth", "()", "summary", "df-generated"]
       - ["java.time", "LocalDate", "getMonthValue", "()", "summary", "df-generated"]
       - ["java.time", "LocalDate", "getYear", "()", "summary", "df-generated"]
+      - ["java.time", "LocalDate", "isAfter", "(ChronoLocalDate)", "summary", "df-generated"]
+      - ["java.time", "LocalDate", "isBefore", "(ChronoLocalDate)", "summary", "df-generated"]
+      - ["java.time", "LocalDate", "isEqual", "(ChronoLocalDate)", "summary", "df-generated"]
+      - ["java.time", "LocalDate", "isLeapYear", "()", "summary", "df-generated"]
+      - ["java.time", "LocalDate", "isSupported", "(TemporalField)", "summary", "df-generated"]
+      - ["java.time", "LocalDate", "isSupported", "(TemporalUnit)", "summary", "df-generated"]
+      - ["java.time", "LocalDate", "lengthOfMonth", "()", "summary", "df-generated"]
+      - ["java.time", "LocalDate", "lengthOfYear", "()", "summary", "df-generated"]
       - ["java.time", "LocalDate", "now", "(Clock)", "summary", "df-generated"]
       - ["java.time", "LocalDate", "now", "(ZoneId)", "summary", "df-generated"]
       - ["java.time", "LocalDate", "of", "(int,Month,int)", "summary", "df-generated"]
@@ -102,17 +134,27 @@ extensions:
       - ["java.time", "LocalDate", "ofInstant", "(Instant,ZoneId)", "summary", "df-generated"]
       - ["java.time", "LocalDate", "ofYearDay", "(int,int)", "summary", "df-generated"]
       - ["java.time", "LocalDate", "parse", "(CharSequence,DateTimeFormatter)", "summary", "df-generated"]
+      - ["java.time", "LocalDate", "toEpochDay", "()", "summary", "df-generated"]
       - ["java.time", "LocalDate", "toEpochSecond", "(LocalTime,ZoneOffset)", "summary", "df-generated"]
+      - ["java.time", "LocalDate", "until", "(Temporal,TemporalUnit)", "summary", "df-generated"]
+      - ["java.time", "LocalDateTime", "atZone", "(ZoneId)", "summary", "df-generated"]
+      - ["java.time", "LocalDateTime", "get", "(TemporalField)", "summary", "df-generated"]
       - ["java.time", "LocalDateTime", "getDayOfMonth", "()", "summary", "df-generated"]
       - ["java.time", "LocalDateTime", "getDayOfWeek", "()", "summary", "df-generated"]
       - ["java.time", "LocalDateTime", "getDayOfYear", "()", "summary", "df-generated"]
       - ["java.time", "LocalDateTime", "getHour", "()", "summary", "df-generated"]
+      - ["java.time", "LocalDateTime", "getLong", "(TemporalField)", "summary", "df-generated"]
       - ["java.time", "LocalDateTime", "getMinute", "()", "summary", "df-generated"]
       - ["java.time", "LocalDateTime", "getMonth", "()", "summary", "df-generated"]
       - ["java.time", "LocalDateTime", "getMonthValue", "()", "summary", "df-generated"]
       - ["java.time", "LocalDateTime", "getNano", "()", "summary", "df-generated"]
       - ["java.time", "LocalDateTime", "getSecond", "()", "summary", "df-generated"]
       - ["java.time", "LocalDateTime", "getYear", "()", "summary", "df-generated"]
+      - ["java.time", "LocalDateTime", "isAfter", "(ChronoLocalDateTime)", "summary", "df-generated"]
+      - ["java.time", "LocalDateTime", "isBefore", "(ChronoLocalDateTime)", "summary", "df-generated"]
+      - ["java.time", "LocalDateTime", "isEqual", "(ChronoLocalDateTime)", "summary", "df-generated"]
+      - ["java.time", "LocalDateTime", "isSupported", "(TemporalField)", "summary", "df-generated"]
+      - ["java.time", "LocalDateTime", "isSupported", "(TemporalUnit)", "summary", "df-generated"]
       - ["java.time", "LocalDateTime", "now", "(Clock)", "summary", "df-generated"]
       - ["java.time", "LocalDateTime", "now", "(ZoneId)", "summary", "df-generated"]
       - ["java.time", "LocalDateTime", "of", "(int,Month,int,int,int)", "summary", "df-generated"]
@@ -124,12 +166,17 @@ extensions:
       - ["java.time", "LocalDateTime", "ofInstant", "(Instant,ZoneId)", "summary", "df-generated"]
       - ["java.time", "LocalDateTime", "parse", "(CharSequence)", "summary", "df-generated"]
       - ["java.time", "LocalDateTime", "parse", "(CharSequence,DateTimeFormatter)", "summary", "df-generated"]
+      - ["java.time", "LocalDateTime", "until", "(Temporal,TemporalUnit)", "summary", "df-generated"]
+      - ["java.time", "LocalTime", "get", "(TemporalField)", "summary", "df-generated"]
       - ["java.time", "LocalTime", "getHour", "()", "summary", "df-generated"]
+      - ["java.time", "LocalTime", "getLong", "(TemporalField)", "summary", "df-generated"]
       - ["java.time", "LocalTime", "getMinute", "()", "summary", "df-generated"]
       - ["java.time", "LocalTime", "getNano", "()", "summary", "df-generated"]
       - ["java.time", "LocalTime", "getSecond", "()", "summary", "df-generated"]
       - ["java.time", "LocalTime", "isAfter", "(LocalTime)", "summary", "df-generated"]
       - ["java.time", "LocalTime", "isBefore", "(LocalTime)", "summary", "df-generated"]
+      - ["java.time", "LocalTime", "isSupported", "(TemporalField)", "summary", "df-generated"]
+      - ["java.time", "LocalTime", "isSupported", "(TemporalUnit)", "summary", "df-generated"]
       - ["java.time", "LocalTime", "now", "()", "summary", "df-generated"]
       - ["java.time", "LocalTime", "now", "(Clock)", "summary", "df-generated"]
       - ["java.time", "LocalTime", "now", "(ZoneId)", "summary", "df-generated"]
@@ -144,10 +191,14 @@ extensions:
       - ["java.time", "LocalTime", "toEpochSecond", "(LocalDate,ZoneOffset)", "summary", "df-generated"]
       - ["java.time", "LocalTime", "toNanoOfDay", "()", "summary", "df-generated"]
       - ["java.time", "LocalTime", "toSecondOfDay", "()", "summary", "df-generated"]
+      - ["java.time", "LocalTime", "until", "(Temporal,TemporalUnit)", "summary", "df-generated"]
       - ["java.time", "Month", "firstDayOfYear", "(boolean)", "summary", "df-generated"]
       - ["java.time", "Month", "firstMonthOfQuarter", "()", "summary", "df-generated"]
       - ["java.time", "Month", "from", "(TemporalAccessor)", "summary", "df-generated"]
+      - ["java.time", "Month", "get", "(TemporalField)", "summary", "df-generated"]
+      - ["java.time", "Month", "getLong", "(TemporalField)", "summary", "df-generated"]
       - ["java.time", "Month", "getValue", "()", "summary", "df-generated"]
+      - ["java.time", "Month", "isSupported", "(TemporalField)", "summary", "df-generated"]
       - ["java.time", "Month", "length", "(boolean)", "summary", "df-generated"]
       - ["java.time", "Month", "maxLength", "()", "summary", "df-generated"]
       - ["java.time", "Month", "minLength", "()", "summary", "df-generated"]
@@ -155,11 +206,14 @@ extensions:
       - ["java.time", "Month", "of", "(int)", "summary", "df-generated"]
       - ["java.time", "Month", "plus", "(long)", "summary", "df-generated"]
       - ["java.time", "MonthDay", "atYear", "(int)", "summary", "df-generated"]
+      - ["java.time", "MonthDay", "get", "(TemporalField)", "summary", "df-generated"]
       - ["java.time", "MonthDay", "getDayOfMonth", "()", "summary", "df-generated"]
+      - ["java.time", "MonthDay", "getLong", "(TemporalField)", "summary", "df-generated"]
       - ["java.time", "MonthDay", "getMonth", "()", "summary", "df-generated"]
       - ["java.time", "MonthDay", "getMonthValue", "()", "summary", "df-generated"]
       - ["java.time", "MonthDay", "isAfter", "(MonthDay)", "summary", "df-generated"]
       - ["java.time", "MonthDay", "isBefore", "(MonthDay)", "summary", "df-generated"]
+      - ["java.time", "MonthDay", "isSupported", "(TemporalField)", "summary", "df-generated"]
       - ["java.time", "MonthDay", "isValidYear", "(int)", "summary", "df-generated"]
       - ["java.time", "MonthDay", "now", "()", "summary", "df-generated"]
       - ["java.time", "MonthDay", "now", "(Clock)", "summary", "df-generated"]
@@ -168,10 +222,12 @@ extensions:
       - ["java.time", "MonthDay", "of", "(int,int)", "summary", "df-generated"]
       - ["java.time", "MonthDay", "parse", "(CharSequence)", "summary", "df-generated"]
       - ["java.time", "MonthDay", "parse", "(CharSequence,DateTimeFormatter)", "summary", "df-generated"]
+      - ["java.time", "OffsetDateTime", "get", "(TemporalField)", "summary", "df-generated"]
       - ["java.time", "OffsetDateTime", "getDayOfMonth", "()", "summary", "df-generated"]
       - ["java.time", "OffsetDateTime", "getDayOfWeek", "()", "summary", "df-generated"]
       - ["java.time", "OffsetDateTime", "getDayOfYear", "()", "summary", "df-generated"]
       - ["java.time", "OffsetDateTime", "getHour", "()", "summary", "df-generated"]
+      - ["java.time", "OffsetDateTime", "getLong", "(TemporalField)", "summary", "df-generated"]
       - ["java.time", "OffsetDateTime", "getMinute", "()", "summary", "df-generated"]
       - ["java.time", "OffsetDateTime", "getMonth", "()", "summary", "df-generated"]
       - ["java.time", "OffsetDateTime", "getMonthValue", "()", "summary", "df-generated"]
@@ -181,27 +237,39 @@ extensions:
       - ["java.time", "OffsetDateTime", "isAfter", "(OffsetDateTime)", "summary", "df-generated"]
       - ["java.time", "OffsetDateTime", "isBefore", "(OffsetDateTime)", "summary", "df-generated"]
       - ["java.time", "OffsetDateTime", "isEqual", "(OffsetDateTime)", "summary", "df-generated"]
+      - ["java.time", "OffsetDateTime", "isSupported", "(TemporalField)", "summary", "df-generated"]
+      - ["java.time", "OffsetDateTime", "isSupported", "(TemporalUnit)", "summary", "df-generated"]
       - ["java.time", "OffsetDateTime", "now", "()", "summary", "df-generated"]
       - ["java.time", "OffsetDateTime", "parse", "(CharSequence)", "summary", "df-generated"]
       - ["java.time", "OffsetDateTime", "parse", "(CharSequence,DateTimeFormatter)", "summary", "df-generated"]
       - ["java.time", "OffsetDateTime", "timeLineOrder", "()", "summary", "df-generated"]
       - ["java.time", "OffsetDateTime", "toEpochSecond", "()", "summary", "df-generated"]
       - ["java.time", "OffsetDateTime", "toInstant", "()", "summary", "df-generated"]
+      - ["java.time", "OffsetDateTime", "until", "(Temporal,TemporalUnit)", "summary", "df-generated"]
+      - ["java.time", "OffsetTime", "get", "(TemporalField)", "summary", "df-generated"]
       - ["java.time", "OffsetTime", "getHour", "()", "summary", "df-generated"]
+      - ["java.time", "OffsetTime", "getLong", "(TemporalField)", "summary", "df-generated"]
       - ["java.time", "OffsetTime", "getMinute", "()", "summary", "df-generated"]
       - ["java.time", "OffsetTime", "getNano", "()", "summary", "df-generated"]
       - ["java.time", "OffsetTime", "getSecond", "()", "summary", "df-generated"]
       - ["java.time", "OffsetTime", "isAfter", "(OffsetTime)", "summary", "df-generated"]
       - ["java.time", "OffsetTime", "isBefore", "(OffsetTime)", "summary", "df-generated"]
       - ["java.time", "OffsetTime", "isEqual", "(OffsetTime)", "summary", "df-generated"]
+      - ["java.time", "OffsetTime", "isSupported", "(TemporalField)", "summary", "df-generated"]
+      - ["java.time", "OffsetTime", "isSupported", "(TemporalUnit)", "summary", "df-generated"]
       - ["java.time", "OffsetTime", "now", "()", "summary", "df-generated"]
       - ["java.time", "OffsetTime", "parse", "(CharSequence)", "summary", "df-generated"]
       - ["java.time", "OffsetTime", "parse", "(CharSequence,DateTimeFormatter)", "summary", "df-generated"]
       - ["java.time", "OffsetTime", "toEpochSecond", "(LocalDate)", "summary", "df-generated"]
+      - ["java.time", "OffsetTime", "until", "(Temporal,TemporalUnit)", "summary", "df-generated"]
       - ["java.time", "Period", "between", "(LocalDate,LocalDate)", "summary", "df-generated"]
+      - ["java.time", "Period", "get", "(TemporalUnit)", "summary", "df-generated"]
       - ["java.time", "Period", "getDays", "()", "summary", "df-generated"]
       - ["java.time", "Period", "getMonths", "()", "summary", "df-generated"]
+      - ["java.time", "Period", "getUnits", "()", "summary", "df-generated"]
       - ["java.time", "Period", "getYears", "()", "summary", "df-generated"]
+      - ["java.time", "Period", "isNegative", "()", "summary", "df-generated"]
+      - ["java.time", "Period", "isZero", "()", "summary", "df-generated"]
       - ["java.time", "Period", "of", "(int,int,int)", "summary", "df-generated"]
       - ["java.time", "Period", "ofDays", "(int)", "summary", "df-generated"]
       - ["java.time", "Period", "ofMonths", "(int)", "summary", "df-generated"]
@@ -213,11 +281,15 @@ extensions:
       - ["java.time", "Year", "atMonth", "(Month)", "summary", "df-generated"]
       - ["java.time", "Year", "atMonth", "(int)", "summary", "df-generated"]
       - ["java.time", "Year", "atMonthDay", "(MonthDay)", "summary", "df-generated"]
+      - ["java.time", "Year", "get", "(TemporalField)", "summary", "df-generated"]
+      - ["java.time", "Year", "getLong", "(TemporalField)", "summary", "df-generated"]
       - ["java.time", "Year", "getValue", "()", "summary", "df-generated"]
       - ["java.time", "Year", "isAfter", "(Year)", "summary", "df-generated"]
       - ["java.time", "Year", "isBefore", "(Year)", "summary", "df-generated"]
       - ["java.time", "Year", "isLeap", "()", "summary", "df-generated"]
       - ["java.time", "Year", "isLeap", "(long)", "summary", "df-generated"]
+      - ["java.time", "Year", "isSupported", "(TemporalField)", "summary", "df-generated"]
+      - ["java.time", "Year", "isSupported", "(TemporalUnit)", "summary", "df-generated"]
       - ["java.time", "Year", "isValidMonthDay", "(MonthDay)", "summary", "df-generated"]
       - ["java.time", "Year", "length", "()", "summary", "df-generated"]
       - ["java.time", "Year", "now", "()", "summary", "df-generated"]
@@ -226,14 +298,19 @@ extensions:
       - ["java.time", "Year", "of", "(int)", "summary", "df-generated"]
       - ["java.time", "Year", "parse", "(CharSequence)", "summary", "df-generated"]
       - ["java.time", "Year", "parse", "(CharSequence,DateTimeFormatter)", "summary", "df-generated"]
+      - ["java.time", "Year", "until", "(Temporal,TemporalUnit)", "summary", "df-generated"]
       - ["java.time", "YearMonth", "atDay", "(int)", "summary", "df-generated"]
       - ["java.time", "YearMonth", "atEndOfMonth", "()", "summary", "df-generated"]
+      - ["java.time", "YearMonth", "get", "(TemporalField)", "summary", "df-generated"]
+      - ["java.time", "YearMonth", "getLong", "(TemporalField)", "summary", "df-generated"]
       - ["java.time", "YearMonth", "getMonth", "()", "summary", "df-generated"]
       - ["java.time", "YearMonth", "getMonthValue", "()", "summary", "df-generated"]
       - ["java.time", "YearMonth", "getYear", "()", "summary", "df-generated"]
       - ["java.time", "YearMonth", "isAfter", "(YearMonth)", "summary", "df-generated"]
       - ["java.time", "YearMonth", "isBefore", "(YearMonth)", "summary", "df-generated"]
       - ["java.time", "YearMonth", "isLeapYear", "()", "summary", "df-generated"]
+      - ["java.time", "YearMonth", "isSupported", "(TemporalField)", "summary", "df-generated"]
+      - ["java.time", "YearMonth", "isSupported", "(TemporalUnit)", "summary", "df-generated"]
       - ["java.time", "YearMonth", "isValidDay", "(int)", "summary", "df-generated"]
       - ["java.time", "YearMonth", "lengthOfMonth", "()", "summary", "df-generated"]
       - ["java.time", "YearMonth", "lengthOfYear", "()", "summary", "df-generated"]
@@ -244,22 +321,31 @@ extensions:
       - ["java.time", "YearMonth", "of", "(int,int)", "summary", "df-generated"]
       - ["java.time", "YearMonth", "parse", "(CharSequence)", "summary", "df-generated"]
       - ["java.time", "YearMonth", "parse", "(CharSequence,DateTimeFormatter)", "summary", "df-generated"]
+      - ["java.time", "YearMonth", "until", "(Temporal,TemporalUnit)", "summary", "df-generated"]
       - ["java.time", "ZoneId", "getAvailableZoneIds", "()", "summary", "df-generated"]
+      - ["java.time", "ZoneOffset", "get", "(TemporalField)", "summary", "df-generated"]
+      - ["java.time", "ZoneOffset", "getLong", "(TemporalField)", "summary", "df-generated"]
       - ["java.time", "ZoneOffset", "getTotalSeconds", "()", "summary", "df-generated"]
+      - ["java.time", "ZoneOffset", "isSupported", "(TemporalField)", "summary", "df-generated"]
       - ["java.time", "ZoneOffset", "of", "(String)", "summary", "df-generated"]
       - ["java.time", "ZoneOffset", "ofHours", "(int)", "summary", "df-generated"]
       - ["java.time", "ZoneOffset", "ofHoursMinutes", "(int,int)", "summary", "df-generated"]
       - ["java.time", "ZoneOffset", "ofHoursMinutesSeconds", "(int,int,int)", "summary", "df-generated"]
       - ["java.time", "ZoneOffset", "ofTotalSeconds", "(int)", "summary", "df-generated"]
+      - ["java.time", "ZonedDateTime", "get", "(TemporalField)", "summary", "df-generated"]
       - ["java.time", "ZonedDateTime", "getDayOfMonth", "()", "summary", "df-generated"]
       - ["java.time", "ZonedDateTime", "getDayOfWeek", "()", "summary", "df-generated"]
       - ["java.time", "ZonedDateTime", "getDayOfYear", "()", "summary", "df-generated"]
       - ["java.time", "ZonedDateTime", "getHour", "()", "summary", "df-generated"]
+      - ["java.time", "ZonedDateTime", "getLong", "(TemporalField)", "summary", "df-generated"]
       - ["java.time", "ZonedDateTime", "getMinute", "()", "summary", "df-generated"]
       - ["java.time", "ZonedDateTime", "getMonth", "()", "summary", "df-generated"]
       - ["java.time", "ZonedDateTime", "getMonthValue", "()", "summary", "df-generated"]
       - ["java.time", "ZonedDateTime", "getNano", "()", "summary", "df-generated"]
       - ["java.time", "ZonedDateTime", "getSecond", "()", "summary", "df-generated"]
       - ["java.time", "ZonedDateTime", "getYear", "()", "summary", "df-generated"]
+      - ["java.time", "ZonedDateTime", "isSupported", "(TemporalField)", "summary", "df-generated"]
+      - ["java.time", "ZonedDateTime", "isSupported", "(TemporalUnit)", "summary", "df-generated"]
       - ["java.time", "ZonedDateTime", "parse", "(CharSequence)", "summary", "df-generated"]
       - ["java.time", "ZonedDateTime", "parse", "(CharSequence,DateTimeFormatter)", "summary", "df-generated"]
+      - ["java.time", "ZonedDateTime", "until", "(Temporal,TemporalUnit)", "summary", "df-generated"]
diff --git a/java/ql/lib/ext/generated/java.time.temporal.model.yml b/java/ql/lib/ext/generated/java.time.temporal.model.yml
index 9a3ab361c31..8dc9bf748d9 100644
--- a/java/ql/lib/ext/generated/java.time.temporal.model.yml
+++ b/java/ql/lib/ext/generated/java.time.temporal.model.yml
@@ -4,7 +4,6 @@ extensions:
       pack: codeql/java-all
       extensible: summaryModel
     data:
-      - ["java.time.temporal", "Temporal", True, "with", "(TemporalField,long)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
       - ["java.time.temporal", "UnsupportedTemporalTypeException", True, "UnsupportedTemporalTypeException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.time.temporal", "UnsupportedTemporalTypeException", True, "UnsupportedTemporalTypeException", "(String,Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.time.temporal", "UnsupportedTemporalTypeException", True, "UnsupportedTemporalTypeException", "(String,Throwable)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
@@ -14,11 +13,17 @@ extensions:
     data:
       - ["java.time.temporal", "ChronoField", "checkValidIntValue", "(long)", "summary", "df-generated"]
       - ["java.time.temporal", "ChronoField", "checkValidValue", "(long)", "summary", "df-generated"]
-      - ["java.time.temporal", "Temporal", "isSupported", "(TemporalUnit)", "summary", "df-generated"]
-      - ["java.time.temporal", "Temporal", "until", "(Temporal,TemporalUnit)", "summary", "df-generated"]
+      - ["java.time.temporal", "ChronoField", "getFrom", "(TemporalAccessor)", "summary", "df-generated"]
+      - ["java.time.temporal", "ChronoField", "isDateBased", "()", "summary", "df-generated"]
+      - ["java.time.temporal", "ChronoField", "isSupportedBy", "(TemporalAccessor)", "summary", "df-generated"]
+      - ["java.time.temporal", "ChronoField", "isTimeBased", "()", "summary", "df-generated"]
+      - ["java.time.temporal", "ChronoUnit", "between", "(Temporal,Temporal)", "summary", "df-generated"]
+      - ["java.time.temporal", "ChronoUnit", "getDuration", "()", "summary", "df-generated"]
+      - ["java.time.temporal", "ChronoUnit", "isDateBased", "()", "summary", "df-generated"]
+      - ["java.time.temporal", "ChronoUnit", "isDurationEstimated", "()", "summary", "df-generated"]
+      - ["java.time.temporal", "ChronoUnit", "isSupportedBy", "(Temporal)", "summary", "df-generated"]
+      - ["java.time.temporal", "ChronoUnit", "isTimeBased", "()", "summary", "df-generated"]
       - ["java.time.temporal", "TemporalAccessor", "get", "(TemporalField)", "summary", "df-generated"]
-      - ["java.time.temporal", "TemporalAccessor", "getLong", "(TemporalField)", "summary", "df-generated"]
-      - ["java.time.temporal", "TemporalAccessor", "isSupported", "(TemporalField)", "summary", "df-generated"]
       - ["java.time.temporal", "TemporalAdjusters", "dayOfWeekInMonth", "(int,DayOfWeek)", "summary", "df-generated"]
       - ["java.time.temporal", "TemporalAdjusters", "firstDayOfMonth", "()", "summary", "df-generated"]
       - ["java.time.temporal", "TemporalAdjusters", "firstDayOfNextMonth", "()", "summary", "df-generated"]
@@ -33,12 +38,6 @@ extensions:
       - ["java.time.temporal", "TemporalAdjusters", "ofDateAdjuster", "(UnaryOperator)", "summary", "df-generated"]
       - ["java.time.temporal", "TemporalAdjusters", "previous", "(DayOfWeek)", "summary", "df-generated"]
       - ["java.time.temporal", "TemporalAdjusters", "previousOrSame", "(DayOfWeek)", "summary", "df-generated"]
-      - ["java.time.temporal", "TemporalAmount", "get", "(TemporalUnit)", "summary", "df-generated"]
-      - ["java.time.temporal", "TemporalAmount", "getUnits", "()", "summary", "df-generated"]
-      - ["java.time.temporal", "TemporalField", "getFrom", "(TemporalAccessor)", "summary", "df-generated"]
-      - ["java.time.temporal", "TemporalField", "isDateBased", "()", "summary", "df-generated"]
-      - ["java.time.temporal", "TemporalField", "isSupportedBy", "(TemporalAccessor)", "summary", "df-generated"]
-      - ["java.time.temporal", "TemporalField", "isTimeBased", "()", "summary", "df-generated"]
       - ["java.time.temporal", "TemporalQueries", "chronology", "()", "summary", "df-generated"]
       - ["java.time.temporal", "TemporalQueries", "localDate", "()", "summary", "df-generated"]
       - ["java.time.temporal", "TemporalQueries", "localTime", "()", "summary", "df-generated"]
@@ -46,12 +45,7 @@ extensions:
       - ["java.time.temporal", "TemporalQueries", "precision", "()", "summary", "df-generated"]
       - ["java.time.temporal", "TemporalQueries", "zone", "()", "summary", "df-generated"]
       - ["java.time.temporal", "TemporalQueries", "zoneId", "()", "summary", "df-generated"]
-      - ["java.time.temporal", "TemporalUnit", "between", "(Temporal,Temporal)", "summary", "df-generated"]
-      - ["java.time.temporal", "TemporalUnit", "getDuration", "()", "summary", "df-generated"]
-      - ["java.time.temporal", "TemporalUnit", "isDateBased", "()", "summary", "df-generated"]
-      - ["java.time.temporal", "TemporalUnit", "isDurationEstimated", "()", "summary", "df-generated"]
       - ["java.time.temporal", "TemporalUnit", "isSupportedBy", "(Temporal)", "summary", "df-generated"]
-      - ["java.time.temporal", "TemporalUnit", "isTimeBased", "()", "summary", "df-generated"]
       - ["java.time.temporal", "ValueRange", "checkValidIntValue", "(long,TemporalField)", "summary", "df-generated"]
       - ["java.time.temporal", "ValueRange", "checkValidValue", "(long,TemporalField)", "summary", "df-generated"]
       - ["java.time.temporal", "ValueRange", "getLargestMinimum", "()", "summary", "df-generated"]
diff --git a/java/ql/lib/ext/generated/java.util.concurrent.atomic.model.yml b/java/ql/lib/ext/generated/java.util.concurrent.atomic.model.yml
index 7f40c376f34..8ddbc831339 100644
--- a/java/ql/lib/ext/generated/java.util.concurrent.atomic.model.yml
+++ b/java/ql/lib/ext/generated/java.util.concurrent.atomic.model.yml
@@ -4,18 +4,18 @@ extensions:
       pack: codeql/java-all
       extensible: summaryModel
     data:
-      - ["java.util.concurrent.atomic", "AtomicMarkableReference", True, "AtomicMarkableReference", "(Object,boolean)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.util.concurrent.atomic", "AtomicMarkableReference", True, "get", "(boolean[])", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.util.concurrent.atomic", "AtomicMarkableReference", True, "getReference", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.util.concurrent.atomic", "AtomicMarkableReference", True, "set", "(Object,boolean)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util.concurrent.atomic", "AtomicMarkableReference", True, "AtomicMarkableReference", "(Object,boolean)", "", "Argument[0]", "Argument[this].SyntheticField[java.util.concurrent.atomic.AtomicMarkableReference.pair].SyntheticField[java.util.concurrent.atomic.AtomicMarkableReference$Pair.reference]", "value", "dfc-generated"]
+      - ["java.util.concurrent.atomic", "AtomicMarkableReference", True, "get", "(boolean[])", "", "Argument[this].SyntheticField[java.util.concurrent.atomic.AtomicMarkableReference.pair].SyntheticField[java.util.concurrent.atomic.AtomicMarkableReference$Pair.reference]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.util.concurrent.atomic", "AtomicMarkableReference", True, "getReference", "()", "", "Argument[this].SyntheticField[java.util.concurrent.atomic.AtomicMarkableReference.pair].SyntheticField[java.util.concurrent.atomic.AtomicMarkableReference$Pair.reference]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.util.concurrent.atomic", "AtomicMarkableReference", True, "set", "(Object,boolean)", "", "Argument[0]", "Argument[this].SyntheticField[java.util.concurrent.atomic.AtomicMarkableReference.pair].SyntheticField[java.util.concurrent.atomic.AtomicMarkableReference$Pair.reference]", "value", "dfc-generated"]
       - ["java.util.concurrent.atomic", "AtomicReference", True, "getAndAccumulate", "(Object,BinaryOperator)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.util.concurrent.atomic", "AtomicReference", True, "getAndUpdate", "(UnaryOperator)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.util.concurrent.atomic", "AtomicReference", True, "updateAndGet", "(UnaryOperator)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.util.concurrent.atomic", "AtomicReferenceArray", True, "AtomicReferenceArray", "(Object[])", "", "Argument[0].ArrayElement", "Argument[this]", "taint", "df-generated"]
-      - ["java.util.concurrent.atomic", "AtomicStampedReference", True, "AtomicStampedReference", "(Object,int)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.util.concurrent.atomic", "AtomicStampedReference", True, "get", "(int[])", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.util.concurrent.atomic", "AtomicStampedReference", True, "getReference", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.util.concurrent.atomic", "AtomicStampedReference", True, "set", "(Object,int)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util.concurrent.atomic", "AtomicStampedReference", True, "AtomicStampedReference", "(Object,int)", "", "Argument[0]", "Argument[this].SyntheticField[java.util.concurrent.atomic.AtomicStampedReference.pair].SyntheticField[java.util.concurrent.atomic.AtomicStampedReference$Pair.reference]", "value", "dfc-generated"]
+      - ["java.util.concurrent.atomic", "AtomicStampedReference", True, "get", "(int[])", "", "Argument[this].SyntheticField[java.util.concurrent.atomic.AtomicStampedReference.pair].SyntheticField[java.util.concurrent.atomic.AtomicStampedReference$Pair.reference]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.util.concurrent.atomic", "AtomicStampedReference", True, "getReference", "()", "", "Argument[this].SyntheticField[java.util.concurrent.atomic.AtomicStampedReference.pair].SyntheticField[java.util.concurrent.atomic.AtomicStampedReference$Pair.reference]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.util.concurrent.atomic", "AtomicStampedReference", True, "set", "(Object,int)", "", "Argument[0]", "Argument[this].SyntheticField[java.util.concurrent.atomic.AtomicStampedReference.pair].SyntheticField[java.util.concurrent.atomic.AtomicStampedReference$Pair.reference]", "value", "dfc-generated"]
   - addsTo:
       pack: codeql/java-all
       extensible: neutralModel
@@ -43,6 +43,7 @@ extensions:
       - ["java.util.concurrent.atomic", "AtomicInteger", "compareAndExchangeRelease", "(int,int)", "summary", "df-generated"]
       - ["java.util.concurrent.atomic", "AtomicInteger", "compareAndSet", "(int,int)", "summary", "df-generated"]
       - ["java.util.concurrent.atomic", "AtomicInteger", "decrementAndGet", "()", "summary", "df-generated"]
+      - ["java.util.concurrent.atomic", "AtomicInteger", "floatValue", "()", "summary", "df-generated"]
       - ["java.util.concurrent.atomic", "AtomicInteger", "getAcquire", "()", "summary", "df-generated"]
       - ["java.util.concurrent.atomic", "AtomicInteger", "getAndAccumulate", "(int,IntBinaryOperator)", "summary", "df-generated"]
       - ["java.util.concurrent.atomic", "AtomicInteger", "getAndAdd", "(int)", "summary", "df-generated"]
@@ -118,6 +119,7 @@ extensions:
       - ["java.util.concurrent.atomic", "AtomicLong", "compareAndExchangeRelease", "(long,long)", "summary", "df-generated"]
       - ["java.util.concurrent.atomic", "AtomicLong", "compareAndSet", "(long,long)", "summary", "df-generated"]
       - ["java.util.concurrent.atomic", "AtomicLong", "decrementAndGet", "()", "summary", "df-generated"]
+      - ["java.util.concurrent.atomic", "AtomicLong", "floatValue", "()", "summary", "df-generated"]
       - ["java.util.concurrent.atomic", "AtomicLong", "getAcquire", "()", "summary", "df-generated"]
       - ["java.util.concurrent.atomic", "AtomicLong", "getAndAccumulate", "(long,LongBinaryOperator)", "summary", "df-generated"]
       - ["java.util.concurrent.atomic", "AtomicLong", "getAndAdd", "(long)", "summary", "df-generated"]
@@ -251,20 +253,24 @@ extensions:
       - ["java.util.concurrent.atomic", "AtomicStampedReference", "weakCompareAndSet", "(Object,Object,int,int)", "summary", "df-generated"]
       - ["java.util.concurrent.atomic", "DoubleAccumulator", "DoubleAccumulator", "(DoubleBinaryOperator,double)", "summary", "df-generated"]
       - ["java.util.concurrent.atomic", "DoubleAccumulator", "accumulate", "(double)", "summary", "df-generated"]
+      - ["java.util.concurrent.atomic", "DoubleAccumulator", "floatValue", "()", "summary", "df-generated"]
       - ["java.util.concurrent.atomic", "DoubleAccumulator", "get", "()", "summary", "df-generated"]
       - ["java.util.concurrent.atomic", "DoubleAccumulator", "getThenReset", "()", "summary", "df-generated"]
       - ["java.util.concurrent.atomic", "DoubleAccumulator", "reset", "()", "summary", "df-generated"]
       - ["java.util.concurrent.atomic", "DoubleAdder", "add", "(double)", "summary", "df-generated"]
+      - ["java.util.concurrent.atomic", "DoubleAdder", "floatValue", "()", "summary", "df-generated"]
       - ["java.util.concurrent.atomic", "DoubleAdder", "reset", "()", "summary", "df-generated"]
       - ["java.util.concurrent.atomic", "DoubleAdder", "sum", "()", "summary", "df-generated"]
       - ["java.util.concurrent.atomic", "DoubleAdder", "sumThenReset", "()", "summary", "df-generated"]
       - ["java.util.concurrent.atomic", "LongAccumulator", "LongAccumulator", "(LongBinaryOperator,long)", "summary", "df-generated"]
       - ["java.util.concurrent.atomic", "LongAccumulator", "accumulate", "(long)", "summary", "df-generated"]
+      - ["java.util.concurrent.atomic", "LongAccumulator", "floatValue", "()", "summary", "df-generated"]
       - ["java.util.concurrent.atomic", "LongAccumulator", "get", "()", "summary", "df-generated"]
       - ["java.util.concurrent.atomic", "LongAccumulator", "getThenReset", "()", "summary", "df-generated"]
       - ["java.util.concurrent.atomic", "LongAccumulator", "reset", "()", "summary", "df-generated"]
       - ["java.util.concurrent.atomic", "LongAdder", "add", "(long)", "summary", "df-generated"]
       - ["java.util.concurrent.atomic", "LongAdder", "decrement", "()", "summary", "df-generated"]
+      - ["java.util.concurrent.atomic", "LongAdder", "floatValue", "()", "summary", "df-generated"]
       - ["java.util.concurrent.atomic", "LongAdder", "increment", "()", "summary", "df-generated"]
       - ["java.util.concurrent.atomic", "LongAdder", "reset", "()", "summary", "df-generated"]
       - ["java.util.concurrent.atomic", "LongAdder", "sum", "()", "summary", "df-generated"]
diff --git a/java/ql/lib/ext/generated/java.util.concurrent.locks.model.yml b/java/ql/lib/ext/generated/java.util.concurrent.locks.model.yml
index e8f78f593d0..0d4d9ce875e 100644
--- a/java/ql/lib/ext/generated/java.util.concurrent.locks.model.yml
+++ b/java/ql/lib/ext/generated/java.util.concurrent.locks.model.yml
@@ -23,6 +23,13 @@ extensions:
       pack: codeql/java-all
       extensible: neutralModel
     data:
+      - ["java.util.concurrent.locks", "AbstractQueuedLongSynchronizer$ConditionObject", "await", "()", "summary", "df-generated"]
+      - ["java.util.concurrent.locks", "AbstractQueuedLongSynchronizer$ConditionObject", "await", "(long,TimeUnit)", "summary", "df-generated"]
+      - ["java.util.concurrent.locks", "AbstractQueuedLongSynchronizer$ConditionObject", "awaitNanos", "(long)", "summary", "df-generated"]
+      - ["java.util.concurrent.locks", "AbstractQueuedLongSynchronizer$ConditionObject", "awaitUninterruptibly", "()", "summary", "df-generated"]
+      - ["java.util.concurrent.locks", "AbstractQueuedLongSynchronizer$ConditionObject", "awaitUntil", "(Date)", "summary", "df-generated"]
+      - ["java.util.concurrent.locks", "AbstractQueuedLongSynchronizer$ConditionObject", "signal", "()", "summary", "df-generated"]
+      - ["java.util.concurrent.locks", "AbstractQueuedLongSynchronizer$ConditionObject", "signalAll", "()", "summary", "df-generated"]
       - ["java.util.concurrent.locks", "AbstractQueuedLongSynchronizer", "acquire", "(long)", "summary", "df-generated"]
       - ["java.util.concurrent.locks", "AbstractQueuedLongSynchronizer", "acquireInterruptibly", "(long)", "summary", "df-generated"]
       - ["java.util.concurrent.locks", "AbstractQueuedLongSynchronizer", "acquireShared", "(long)", "summary", "df-generated"]
@@ -39,6 +46,13 @@ extensions:
       - ["java.util.concurrent.locks", "AbstractQueuedLongSynchronizer", "releaseShared", "(long)", "summary", "df-generated"]
       - ["java.util.concurrent.locks", "AbstractQueuedLongSynchronizer", "tryAcquireNanos", "(long,long)", "summary", "df-generated"]
       - ["java.util.concurrent.locks", "AbstractQueuedLongSynchronizer", "tryAcquireSharedNanos", "(long,long)", "summary", "df-generated"]
+      - ["java.util.concurrent.locks", "AbstractQueuedSynchronizer$ConditionObject", "await", "()", "summary", "df-generated"]
+      - ["java.util.concurrent.locks", "AbstractQueuedSynchronizer$ConditionObject", "await", "(long,TimeUnit)", "summary", "df-generated"]
+      - ["java.util.concurrent.locks", "AbstractQueuedSynchronizer$ConditionObject", "awaitNanos", "(long)", "summary", "df-generated"]
+      - ["java.util.concurrent.locks", "AbstractQueuedSynchronizer$ConditionObject", "awaitUninterruptibly", "()", "summary", "df-generated"]
+      - ["java.util.concurrent.locks", "AbstractQueuedSynchronizer$ConditionObject", "awaitUntil", "(Date)", "summary", "df-generated"]
+      - ["java.util.concurrent.locks", "AbstractQueuedSynchronizer$ConditionObject", "signal", "()", "summary", "df-generated"]
+      - ["java.util.concurrent.locks", "AbstractQueuedSynchronizer$ConditionObject", "signalAll", "()", "summary", "df-generated"]
       - ["java.util.concurrent.locks", "AbstractQueuedSynchronizer", "acquire", "(int)", "summary", "df-generated"]
       - ["java.util.concurrent.locks", "AbstractQueuedSynchronizer", "acquireInterruptibly", "(int)", "summary", "df-generated"]
       - ["java.util.concurrent.locks", "AbstractQueuedSynchronizer", "acquireShared", "(int)", "summary", "df-generated"]
@@ -55,19 +69,6 @@ extensions:
       - ["java.util.concurrent.locks", "AbstractQueuedSynchronizer", "releaseShared", "(int)", "summary", "df-generated"]
       - ["java.util.concurrent.locks", "AbstractQueuedSynchronizer", "tryAcquireNanos", "(int,long)", "summary", "df-generated"]
       - ["java.util.concurrent.locks", "AbstractQueuedSynchronizer", "tryAcquireSharedNanos", "(int,long)", "summary", "df-generated"]
-      - ["java.util.concurrent.locks", "Condition", "await", "()", "summary", "df-generated"]
-      - ["java.util.concurrent.locks", "Condition", "await", "(long,TimeUnit)", "summary", "df-generated"]
-      - ["java.util.concurrent.locks", "Condition", "awaitNanos", "(long)", "summary", "df-generated"]
-      - ["java.util.concurrent.locks", "Condition", "awaitUninterruptibly", "()", "summary", "df-generated"]
-      - ["java.util.concurrent.locks", "Condition", "awaitUntil", "(Date)", "summary", "df-generated"]
-      - ["java.util.concurrent.locks", "Condition", "signal", "()", "summary", "df-generated"]
-      - ["java.util.concurrent.locks", "Condition", "signalAll", "()", "summary", "df-generated"]
-      - ["java.util.concurrent.locks", "Lock", "lock", "()", "summary", "df-generated"]
-      - ["java.util.concurrent.locks", "Lock", "lockInterruptibly", "()", "summary", "df-generated"]
-      - ["java.util.concurrent.locks", "Lock", "newCondition", "()", "summary", "df-generated"]
-      - ["java.util.concurrent.locks", "Lock", "tryLock", "()", "summary", "df-generated"]
-      - ["java.util.concurrent.locks", "Lock", "tryLock", "(long,TimeUnit)", "summary", "df-generated"]
-      - ["java.util.concurrent.locks", "Lock", "unlock", "()", "summary", "df-generated"]
       - ["java.util.concurrent.locks", "LockSupport", "getBlocker", "(Thread)", "summary", "df-generated"]
       - ["java.util.concurrent.locks", "LockSupport", "park", "()", "summary", "df-generated"]
       - ["java.util.concurrent.locks", "LockSupport", "park", "(Object)", "summary", "df-generated"]
@@ -87,8 +88,20 @@ extensions:
       - ["java.util.concurrent.locks", "ReentrantLock", "isFair", "()", "summary", "df-generated"]
       - ["java.util.concurrent.locks", "ReentrantLock", "isHeldByCurrentThread", "()", "summary", "df-generated"]
       - ["java.util.concurrent.locks", "ReentrantLock", "isLocked", "()", "summary", "df-generated"]
+      - ["java.util.concurrent.locks", "ReentrantLock", "lockInterruptibly", "()", "summary", "df-generated"]
+      - ["java.util.concurrent.locks", "ReentrantLock", "newCondition", "()", "summary", "df-generated"]
+      - ["java.util.concurrent.locks", "ReentrantLock", "tryLock", "()", "summary", "df-generated"]
+      - ["java.util.concurrent.locks", "ReentrantLock", "tryLock", "(long,TimeUnit)", "summary", "df-generated"]
+      - ["java.util.concurrent.locks", "ReentrantReadWriteLock$ReadLock", "lockInterruptibly", "()", "summary", "df-generated"]
+      - ["java.util.concurrent.locks", "ReentrantReadWriteLock$ReadLock", "newCondition", "()", "summary", "df-generated"]
+      - ["java.util.concurrent.locks", "ReentrantReadWriteLock$ReadLock", "tryLock", "()", "summary", "df-generated"]
+      - ["java.util.concurrent.locks", "ReentrantReadWriteLock$ReadLock", "tryLock", "(long,TimeUnit)", "summary", "df-generated"]
       - ["java.util.concurrent.locks", "ReentrantReadWriteLock$WriteLock", "getHoldCount", "()", "summary", "df-generated"]
       - ["java.util.concurrent.locks", "ReentrantReadWriteLock$WriteLock", "isHeldByCurrentThread", "()", "summary", "df-generated"]
+      - ["java.util.concurrent.locks", "ReentrantReadWriteLock$WriteLock", "lockInterruptibly", "()", "summary", "df-generated"]
+      - ["java.util.concurrent.locks", "ReentrantReadWriteLock$WriteLock", "newCondition", "()", "summary", "df-generated"]
+      - ["java.util.concurrent.locks", "ReentrantReadWriteLock$WriteLock", "tryLock", "()", "summary", "df-generated"]
+      - ["java.util.concurrent.locks", "ReentrantReadWriteLock$WriteLock", "tryLock", "(long,TimeUnit)", "summary", "df-generated"]
       - ["java.util.concurrent.locks", "ReentrantReadWriteLock", "ReentrantReadWriteLock", "(boolean)", "summary", "df-generated"]
       - ["java.util.concurrent.locks", "ReentrantReadWriteLock", "getQueueLength", "()", "summary", "df-generated"]
       - ["java.util.concurrent.locks", "ReentrantReadWriteLock", "getReadHoldCount", "()", "summary", "df-generated"]
diff --git a/java/ql/lib/ext/generated/java.util.concurrent.model.yml b/java/ql/lib/ext/generated/java.util.concurrent.model.yml
index 528a8eb3183..6d0d5e2699b 100644
--- a/java/ql/lib/ext/generated/java.util.concurrent.model.yml
+++ b/java/ql/lib/ext/generated/java.util.concurrent.model.yml
@@ -6,18 +6,95 @@ extensions:
     data:
       - ["java.util.concurrent", "BrokenBarrierException", True, "BrokenBarrierException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.util.concurrent", "CancellationException", True, "CancellationException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util.concurrent", "CompletableFuture", True, "acceptEither", "(CompletionStage,Consumer)", "", "Argument[0]", "Argument[1]", "taint", "df-generated"]
+      - ["java.util.concurrent", "CompletableFuture", True, "acceptEither", "(CompletionStage,Consumer)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.concurrent", "CompletableFuture", True, "acceptEither", "(CompletionStage,Consumer)", "", "Argument[this]", "Argument[1]", "taint", "df-generated"]
+      - ["java.util.concurrent", "CompletableFuture", True, "acceptEither", "(CompletionStage,Consumer)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.concurrent", "CompletableFuture", True, "acceptEitherAsync", "(CompletionStage,Consumer)", "", "Argument[0]", "Argument[1]", "taint", "df-generated"]
+      - ["java.util.concurrent", "CompletableFuture", True, "acceptEitherAsync", "(CompletionStage,Consumer)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.concurrent", "CompletableFuture", True, "acceptEitherAsync", "(CompletionStage,Consumer)", "", "Argument[this]", "Argument[1]", "taint", "df-generated"]
+      - ["java.util.concurrent", "CompletableFuture", True, "acceptEitherAsync", "(CompletionStage,Consumer)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.concurrent", "CompletableFuture", True, "acceptEitherAsync", "(CompletionStage,Consumer,Executor)", "", "Argument[0]", "Argument[1]", "taint", "df-generated"]
+      - ["java.util.concurrent", "CompletableFuture", True, "acceptEitherAsync", "(CompletionStage,Consumer,Executor)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.concurrent", "CompletableFuture", True, "acceptEitherAsync", "(CompletionStage,Consumer,Executor)", "", "Argument[this]", "Argument[1]", "taint", "df-generated"]
+      - ["java.util.concurrent", "CompletableFuture", True, "acceptEitherAsync", "(CompletionStage,Consumer,Executor)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.util.concurrent", "CompletableFuture", True, "allOf", "(CompletableFuture[])", "", "Argument[0].ArrayElement", "ReturnValue", "taint", "df-generated"]
       - ["java.util.concurrent", "CompletableFuture", True, "anyOf", "(CompletableFuture[])", "", "Argument[0].ArrayElement", "ReturnValue", "taint", "df-generated"]
-      - ["java.util.concurrent", "CompletableFuture", True, "completeAsync", "(Supplier)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.util.concurrent", "CompletableFuture", True, "completeAsync", "(Supplier,Executor)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["java.util.concurrent", "CompletableFuture", True, "completeOnTimeout", "(Object,long,TimeUnit)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["java.util.concurrent", "CompletableFuture", True, "copy", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.concurrent", "CompletableFuture", True, "applyToEither", "(CompletionStage,Function)", "", "Argument[0]", "Argument[1]", "taint", "df-generated"]
+      - ["java.util.concurrent", "CompletableFuture", True, "applyToEither", "(CompletionStage,Function)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.concurrent", "CompletableFuture", True, "applyToEither", "(CompletionStage,Function)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.concurrent", "CompletableFuture", True, "applyToEither", "(CompletionStage,Function)", "", "Argument[this]", "Argument[1]", "taint", "df-generated"]
+      - ["java.util.concurrent", "CompletableFuture", True, "applyToEither", "(CompletionStage,Function)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.concurrent", "CompletableFuture", True, "applyToEitherAsync", "(CompletionStage,Function)", "", "Argument[0]", "Argument[1]", "taint", "df-generated"]
+      - ["java.util.concurrent", "CompletableFuture", True, "applyToEitherAsync", "(CompletionStage,Function)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.concurrent", "CompletableFuture", True, "applyToEitherAsync", "(CompletionStage,Function)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.concurrent", "CompletableFuture", True, "applyToEitherAsync", "(CompletionStage,Function)", "", "Argument[this]", "Argument[1]", "taint", "df-generated"]
+      - ["java.util.concurrent", "CompletableFuture", True, "applyToEitherAsync", "(CompletionStage,Function)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.concurrent", "CompletableFuture", True, "applyToEitherAsync", "(CompletionStage,Function,Executor)", "", "Argument[0]", "Argument[1]", "taint", "df-generated"]
+      - ["java.util.concurrent", "CompletableFuture", True, "applyToEitherAsync", "(CompletionStage,Function,Executor)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.concurrent", "CompletableFuture", True, "applyToEitherAsync", "(CompletionStage,Function,Executor)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.concurrent", "CompletableFuture", True, "applyToEitherAsync", "(CompletionStage,Function,Executor)", "", "Argument[this]", "Argument[1]", "taint", "df-generated"]
+      - ["java.util.concurrent", "CompletableFuture", True, "applyToEitherAsync", "(CompletionStage,Function,Executor)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.concurrent", "CompletableFuture", True, "completeAsync", "(Supplier)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.util.concurrent", "CompletableFuture", True, "completeAsync", "(Supplier,Executor)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.util.concurrent", "CompletableFuture", True, "completeOnTimeout", "(Object,long,TimeUnit)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.util.concurrent", "CompletableFuture", True, "copy", "()", "", "Argument[this].SyntheticField[java.util.concurrent.CompletableFuture.result]", "ReturnValue.SyntheticField[java.util.concurrent.CompletableFuture.result]", "value", "dfc-generated"]
       - ["java.util.concurrent", "CompletableFuture", True, "delayedExecutor", "(long,TimeUnit,Executor)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
-      - ["java.util.concurrent", "CompletableFuture", True, "getNow", "(Object)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["java.util.concurrent", "CompletableFuture", True, "getNow", "(Object)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.concurrent", "CompletableFuture", True, "exceptionally", "(Function)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.concurrent", "CompletableFuture", True, "exceptionallyAsync", "(Function)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.concurrent", "CompletableFuture", True, "exceptionallyAsync", "(Function,Executor)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.concurrent", "CompletableFuture", True, "exceptionallyCompose", "(Function)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.concurrent", "CompletableFuture", True, "exceptionallyComposeAsync", "(Function)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.concurrent", "CompletableFuture", True, "exceptionallyComposeAsync", "(Function,Executor)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.concurrent", "CompletableFuture", True, "get", "(long,TimeUnit)", "", "Argument[this].SyntheticField[java.util.concurrent.CompletableFuture.result]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.util.concurrent", "CompletableFuture", True, "getNow", "(Object)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.util.concurrent", "CompletableFuture", True, "getNow", "(Object)", "", "Argument[this].SyntheticField[java.util.concurrent.CompletableFuture.result]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.util.concurrent", "CompletableFuture", True, "handle", "(BiFunction)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.concurrent", "CompletableFuture", True, "handleAsync", "(BiFunction)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.concurrent", "CompletableFuture", True, "handleAsync", "(BiFunction,Executor)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.util.concurrent", "CompletableFuture", True, "obtrudeException", "(Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.util.concurrent", "CompletableFuture", True, "obtrudeValue", "(Object)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.util.concurrent", "CompletableFuture", True, "orTimeout", "(long,TimeUnit)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.util.concurrent", "CompletableFuture", True, "obtrudeValue", "(Object)", "", "Argument[0]", "Argument[this].SyntheticField[java.util.concurrent.CompletableFuture.result]", "value", "dfc-generated"]
+      - ["java.util.concurrent", "CompletableFuture", True, "orTimeout", "(long,TimeUnit)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.util.concurrent", "CompletableFuture", True, "runAfterBoth", "(CompletionStage,Runnable)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.concurrent", "CompletableFuture", True, "runAfterBothAsync", "(CompletionStage,Runnable)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.concurrent", "CompletableFuture", True, "runAfterBothAsync", "(CompletionStage,Runnable,Executor)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.concurrent", "CompletableFuture", True, "runAfterEither", "(CompletionStage,Runnable)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.concurrent", "CompletableFuture", True, "runAfterEither", "(CompletionStage,Runnable)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.concurrent", "CompletableFuture", True, "runAfterEitherAsync", "(CompletionStage,Runnable)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.concurrent", "CompletableFuture", True, "runAfterEitherAsync", "(CompletionStage,Runnable)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.concurrent", "CompletableFuture", True, "runAfterEitherAsync", "(CompletionStage,Runnable,Executor)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.concurrent", "CompletableFuture", True, "runAfterEitherAsync", "(CompletionStage,Runnable,Executor)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.concurrent", "CompletableFuture", True, "thenAccept", "(Consumer)", "", "Argument[this]", "Argument[0]", "taint", "df-generated"]
+      - ["java.util.concurrent", "CompletableFuture", True, "thenAccept", "(Consumer)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.concurrent", "CompletableFuture", True, "thenAcceptAsync", "(Consumer)", "", "Argument[this]", "Argument[0]", "taint", "df-generated"]
+      - ["java.util.concurrent", "CompletableFuture", True, "thenAcceptAsync", "(Consumer)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.concurrent", "CompletableFuture", True, "thenAcceptAsync", "(Consumer,Executor)", "", "Argument[this]", "Argument[0]", "taint", "df-generated"]
+      - ["java.util.concurrent", "CompletableFuture", True, "thenAcceptAsync", "(Consumer,Executor)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.concurrent", "CompletableFuture", True, "thenAcceptBoth", "(CompletionStage,BiConsumer)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.concurrent", "CompletableFuture", True, "thenAcceptBothAsync", "(CompletionStage,BiConsumer)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.concurrent", "CompletableFuture", True, "thenAcceptBothAsync", "(CompletionStage,BiConsumer,Executor)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.concurrent", "CompletableFuture", True, "thenApply", "(Function)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.concurrent", "CompletableFuture", True, "thenApply", "(Function)", "", "Argument[this]", "Argument[0]", "taint", "df-generated"]
+      - ["java.util.concurrent", "CompletableFuture", True, "thenApply", "(Function)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.concurrent", "CompletableFuture", True, "thenApplyAsync", "(Function)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.concurrent", "CompletableFuture", True, "thenApplyAsync", "(Function)", "", "Argument[this]", "Argument[0]", "taint", "df-generated"]
+      - ["java.util.concurrent", "CompletableFuture", True, "thenApplyAsync", "(Function)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.concurrent", "CompletableFuture", True, "thenApplyAsync", "(Function,Executor)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.concurrent", "CompletableFuture", True, "thenApplyAsync", "(Function,Executor)", "", "Argument[this]", "Argument[0]", "taint", "df-generated"]
+      - ["java.util.concurrent", "CompletableFuture", True, "thenApplyAsync", "(Function,Executor)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.concurrent", "CompletableFuture", True, "thenCombine", "(CompletionStage,BiFunction)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.concurrent", "CompletableFuture", True, "thenCombineAsync", "(CompletionStage,BiFunction)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.concurrent", "CompletableFuture", True, "thenCombineAsync", "(CompletionStage,BiFunction,Executor)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.concurrent", "CompletableFuture", True, "thenCompose", "(Function)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.concurrent", "CompletableFuture", True, "thenComposeAsync", "(Function)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.concurrent", "CompletableFuture", True, "thenComposeAsync", "(Function,Executor)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.concurrent", "CompletableFuture", True, "thenRun", "(Runnable)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.concurrent", "CompletableFuture", True, "thenRunAsync", "(Runnable)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.concurrent", "CompletableFuture", True, "thenRunAsync", "(Runnable,Executor)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.concurrent", "CompletableFuture", True, "toCompletableFuture", "()", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.util.concurrent", "CompletableFuture", True, "whenComplete", "(BiConsumer)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.concurrent", "CompletableFuture", True, "whenCompleteAsync", "(BiConsumer)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.concurrent", "CompletableFuture", True, "whenCompleteAsync", "(BiConsumer,Executor)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.util.concurrent", "CompletionException", True, "CompletionException", "(String,Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.util.concurrent", "CompletionException", True, "CompletionException", "(String,Throwable)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
       - ["java.util.concurrent", "CompletionException", True, "CompletionException", "(Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
@@ -27,35 +104,48 @@ extensions:
       - ["java.util.concurrent", "CompletionStage", True, "exceptionallyComposeAsync", "(Function)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.util.concurrent", "CompletionStage", True, "exceptionallyComposeAsync", "(Function,Executor)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.util.concurrent", "ConcurrentHashMap$KeySetView", True, "getMappedValue", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.util.concurrent", "ConcurrentHashMap", True, "ConcurrentHashMap", "(Map)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
+      - ["java.util.concurrent", "ConcurrentHashMap", True, "ConcurrentHashMap", "(Map)", "", "Argument[0].MapKey", "Argument[this].MapKey", "value", "dfc-generated"]
+      - ["java.util.concurrent", "ConcurrentHashMap", True, "ConcurrentHashMap", "(Map)", "", "Argument[0].MapValue", "Argument[this].MapValue", "value", "dfc-generated"]
+      - ["java.util.concurrent", "ConcurrentHashMap", True, "compute", "(Object,BiFunction)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["java.util.concurrent", "ConcurrentHashMap", True, "keySet", "(Object)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["java.util.concurrent", "ConcurrentHashMap", True, "keySet", "(Object)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.util.concurrent", "ConcurrentHashMap", True, "keys", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.util.concurrent", "ConcurrentSkipListMap", True, "ConcurrentSkipListMap", "(Comparator)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.util.concurrent", "ConcurrentSkipListMap", True, "ConcurrentSkipListMap", "(Map)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["java.util.concurrent", "ConcurrentSkipListSet", True, "ConcurrentSkipListSet", "(Collection)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["java.util.concurrent", "ConcurrentSkipListSet", True, "ConcurrentSkipListSet", "(Comparator)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util.concurrent", "ConcurrentMap", True, "compute", "(Object,BiFunction)", "", "Argument[0]", "Argument[this].MapKey", "value", "dfc-generated"]
+      - ["java.util.concurrent", "ConcurrentMap", True, "computeIfPresent", "(Object,BiFunction)", "", "Argument[0]", "Argument[this].MapKey", "value", "dfc-generated"]
+      - ["java.util.concurrent", "ConcurrentSkipListMap", True, "ConcurrentSkipListMap", "(Comparator)", "", "Argument[0]", "Argument[this].SyntheticField[java.util.concurrent.ConcurrentSkipListMap.comparator]", "value", "dfc-generated"]
+      - ["java.util.concurrent", "ConcurrentSkipListMap", True, "ConcurrentSkipListMap", "(Map)", "", "Argument[0].MapKey", "Argument[this].MapKey", "value", "dfc-generated"]
+      - ["java.util.concurrent", "ConcurrentSkipListMap", True, "ConcurrentSkipListMap", "(Map)", "", "Argument[0].MapValue", "Argument[this].MapValue", "value", "dfc-generated"]
+      - ["java.util.concurrent", "ConcurrentSkipListMap", True, "comparator", "()", "", "Argument[this].SyntheticField[java.util.concurrent.ConcurrentSkipListMap.comparator]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.util.concurrent", "ConcurrentSkipListMap", True, "descendingKeySet", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.concurrent", "ConcurrentSkipListMap", True, "navigableKeySet", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.concurrent", "ConcurrentSkipListSet", True, "ConcurrentSkipListSet", "(Collection)", "", "Argument[0].Element", "Argument[this].Element", "value", "dfc-generated"]
+      - ["java.util.concurrent", "ConcurrentSkipListSet", True, "ConcurrentSkipListSet", "(Comparator)", "", "Argument[0]", "Argument[this].SyntheticField[java.util.concurrent.ConcurrentSkipListSet.m].SyntheticField[java.util.concurrent.ConcurrentSkipListMap.comparator]", "value", "dfc-generated"]
       - ["java.util.concurrent", "ConcurrentSkipListSet", True, "ConcurrentSkipListSet", "(SortedSet)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
+      - ["java.util.concurrent", "ConcurrentSkipListSet", True, "comparator", "()", "", "Argument[this].SyntheticField[java.util.concurrent.ConcurrentSkipListSet.m].SyntheticField[java.util.concurrent.ConcurrentSkipListMap.comparator]", "ReturnValue", "value", "dfc-generated"]
       - ["java.util.concurrent", "CopyOnWriteArrayList", True, "CopyOnWriteArrayList", "(Collection)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
       - ["java.util.concurrent", "CopyOnWriteArrayList", True, "CopyOnWriteArrayList", "(Object[])", "", "Argument[0].ArrayElement", "Argument[this]", "taint", "df-generated"]
       - ["java.util.concurrent", "CopyOnWriteArrayList", True, "addAllAbsent", "(Collection)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
       - ["java.util.concurrent", "CopyOnWriteArrayList", True, "addIfAbsent", "(Object)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.util.concurrent", "CopyOnWriteArraySet", True, "CopyOnWriteArraySet", "(Collection)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["java.util.concurrent", "CountedCompleter", True, "firstComplete", "()", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.util.concurrent", "CountedCompleter", True, "firstComplete", "()", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
       - ["java.util.concurrent", "CountedCompleter", True, "getCompleter", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.util.concurrent", "CountedCompleter", True, "getRoot", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.concurrent", "CountedCompleter", True, "getRoot", "()", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
       - ["java.util.concurrent", "CountedCompleter", True, "nextComplete", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.util.concurrent", "CyclicBarrier", True, "CyclicBarrier", "(int,Runnable)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["java.util.concurrent", "DelayQueue", True, "DelayQueue", "(Collection)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
+      - ["java.util.concurrent", "DelayQueue", True, "DelayQueue", "(Collection)", "", "Argument[0].Element", "Argument[this].Element", "value", "dfc-generated"]
       - ["java.util.concurrent", "Exchanger", True, "exchange", "(Object)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.util.concurrent", "Exchanger", True, "exchange", "(Object,long,TimeUnit)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.util.concurrent", "ExecutionException", True, "ExecutionException", "(String,Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.util.concurrent", "ExecutionException", True, "ExecutionException", "(String,Throwable)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
       - ["java.util.concurrent", "ExecutionException", True, "ExecutionException", "(Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.util.concurrent", "Executor", True, "execute", "(Runnable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.util.concurrent", "ExecutorCompletionService", True, "ExecutorCompletionService", "(Executor)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.util.concurrent", "ExecutorCompletionService", True, "ExecutorCompletionService", "(Executor,BlockingQueue)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.util.concurrent", "ExecutorCompletionService", True, "ExecutorCompletionService", "(Executor,BlockingQueue)", "", "Argument[1].Element", "Argument[this]", "taint", "df-generated"]
+      - ["java.util.concurrent", "ExecutorCompletionService", True, "ExecutorCompletionService", "(Executor,BlockingQueue)", "", "Argument[1]", "Argument[this].SyntheticField[java.util.concurrent.ExecutorCompletionService.completionQueue]", "value", "dfc-generated"]
+      - ["java.util.concurrent", "ExecutorCompletionService", True, "poll", "()", "", "Argument[this].SyntheticField[java.util.concurrent.ExecutorCompletionService.completionQueue].Element", "ReturnValue", "value", "dfc-generated"]
+      - ["java.util.concurrent", "ExecutorCompletionService", True, "poll", "(long,TimeUnit)", "", "Argument[this].SyntheticField[java.util.concurrent.ExecutorCompletionService.completionQueue].Element", "ReturnValue", "value", "dfc-generated"]
+      - ["java.util.concurrent", "ExecutorCompletionService", True, "submit", "(Callable)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.concurrent", "ExecutorCompletionService", True, "submit", "(Runnable,Object)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.concurrent", "ExecutorCompletionService", True, "submit", "(Runnable,Object)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.concurrent", "ExecutorCompletionService", True, "take", "()", "", "Argument[this].SyntheticField[java.util.concurrent.ExecutorCompletionService.completionQueue].Element", "ReturnValue", "value", "dfc-generated"]
       - ["java.util.concurrent", "ExecutorService", True, "invokeAll", "(Collection)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
       - ["java.util.concurrent", "ExecutorService", True, "invokeAll", "(Collection,long,TimeUnit)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
       - ["java.util.concurrent", "ExecutorService", True, "shutdownNow", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
@@ -65,8 +155,8 @@ extensions:
       - ["java.util.concurrent", "Executors", True, "callable", "(Runnable)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["java.util.concurrent", "Executors", True, "callable", "(Runnable,Object)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["java.util.concurrent", "Executors", True, "callable", "(Runnable,Object)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["java.util.concurrent", "Executors", True, "newCachedThreadPool", "(ThreadFactory)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["java.util.concurrent", "Executors", True, "newFixedThreadPool", "(int,ThreadFactory)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.concurrent", "Executors", True, "newCachedThreadPool", "(ThreadFactory)", "", "Argument[0]", "ReturnValue.SyntheticField[java.util.concurrent.ThreadPoolExecutor.threadFactory]", "value", "dfc-generated"]
+      - ["java.util.concurrent", "Executors", True, "newFixedThreadPool", "(int,ThreadFactory)", "", "Argument[1]", "ReturnValue.SyntheticField[java.util.concurrent.ThreadPoolExecutor.threadFactory]", "value", "dfc-generated"]
       - ["java.util.concurrent", "Executors", True, "newScheduledThreadPool", "(int,ThreadFactory)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
       - ["java.util.concurrent", "Executors", True, "newSingleThreadExecutor", "(ThreadFactory)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["java.util.concurrent", "Executors", True, "newSingleThreadScheduledExecutor", "(ThreadFactory)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
@@ -74,43 +164,43 @@ extensions:
       - ["java.util.concurrent", "Executors", True, "privilegedCallableUsingCurrentClassLoader", "(Callable)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["java.util.concurrent", "Executors", True, "unconfigurableExecutorService", "(ExecutorService)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["java.util.concurrent", "Executors", True, "unconfigurableScheduledExecutorService", "(ScheduledExecutorService)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["java.util.concurrent", "ForkJoinPool$ForkJoinWorkerThreadFactory", True, "newThread", "(ForkJoinPool)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["java.util.concurrent", "ForkJoinPool", True, "ForkJoinPool", "(int,ForkJoinPool$ForkJoinWorkerThreadFactory,Thread$UncaughtExceptionHandler,boolean)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["java.util.concurrent", "ForkJoinPool", True, "ForkJoinPool", "(int,ForkJoinPool$ForkJoinWorkerThreadFactory,Thread$UncaughtExceptionHandler,boolean)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
-      - ["java.util.concurrent", "ForkJoinPool", True, "ForkJoinPool", "(int,ForkJoinPool$ForkJoinWorkerThreadFactory,Thread$UncaughtExceptionHandler,boolean,int,int,int,Predicate,long,TimeUnit)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["java.util.concurrent", "ForkJoinPool", True, "ForkJoinPool", "(int,ForkJoinPool$ForkJoinWorkerThreadFactory,Thread$UncaughtExceptionHandler,boolean,int,int,int,Predicate,long,TimeUnit)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
-      - ["java.util.concurrent", "ForkJoinPool", True, "ForkJoinPool", "(int,ForkJoinPool$ForkJoinWorkerThreadFactory,Thread$UncaughtExceptionHandler,boolean,int,int,int,Predicate,long,TimeUnit)", "", "Argument[7]", "Argument[this]", "taint", "df-generated"]
-      - ["java.util.concurrent", "ForkJoinPool", True, "getFactory", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.util.concurrent", "ForkJoinPool", True, "getUncaughtExceptionHandler", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.concurrent", "ForkJoinPool", True, "ForkJoinPool", "(int,ForkJoinPool$ForkJoinWorkerThreadFactory,Thread$UncaughtExceptionHandler,boolean)", "", "Argument[1]", "Argument[this].SyntheticField[java.util.concurrent.ForkJoinPool.factory]", "value", "dfc-generated"]
+      - ["java.util.concurrent", "ForkJoinPool", True, "ForkJoinPool", "(int,ForkJoinPool$ForkJoinWorkerThreadFactory,Thread$UncaughtExceptionHandler,boolean)", "", "Argument[2]", "Argument[this].SyntheticField[java.util.concurrent.ForkJoinPool.ueh]", "value", "dfc-generated"]
+      - ["java.util.concurrent", "ForkJoinPool", True, "ForkJoinPool", "(int,ForkJoinPool$ForkJoinWorkerThreadFactory,Thread$UncaughtExceptionHandler,boolean,int,int,int,Predicate,long,TimeUnit)", "", "Argument[1]", "Argument[this].SyntheticField[java.util.concurrent.ForkJoinPool.factory]", "value", "dfc-generated"]
+      - ["java.util.concurrent", "ForkJoinPool", True, "ForkJoinPool", "(int,ForkJoinPool$ForkJoinWorkerThreadFactory,Thread$UncaughtExceptionHandler,boolean,int,int,int,Predicate,long,TimeUnit)", "", "Argument[2]", "Argument[this].SyntheticField[java.util.concurrent.ForkJoinPool.ueh]", "value", "dfc-generated"]
+      - ["java.util.concurrent", "ForkJoinPool", True, "getFactory", "()", "", "Argument[this].SyntheticField[java.util.concurrent.ForkJoinPool.factory]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.util.concurrent", "ForkJoinPool", True, "getUncaughtExceptionHandler", "()", "", "Argument[this].SyntheticField[java.util.concurrent.ForkJoinPool.ueh]", "ReturnValue", "value", "dfc-generated"]
       - ["java.util.concurrent", "ForkJoinPool", True, "invoke", "(ForkJoinTask)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["java.util.concurrent", "ForkJoinPool", True, "submit", "(ForkJoinTask)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.concurrent", "ForkJoinPool", True, "submit", "(ForkJoinTask)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
       - ["java.util.concurrent", "ForkJoinTask", True, "adapt", "(Callable)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["java.util.concurrent", "ForkJoinTask", True, "adapt", "(Runnable)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["java.util.concurrent", "ForkJoinTask", True, "adapt", "(Runnable,Object)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["java.util.concurrent", "ForkJoinTask", True, "adapt", "(Runnable,Object)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
       - ["java.util.concurrent", "ForkJoinTask", True, "complete", "(Object)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.util.concurrent", "ForkJoinTask", True, "fork", "()", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.util.concurrent", "ForkJoinTask", True, "fork", "()", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.util.concurrent", "ForkJoinTask", True, "get", "(long,TimeUnit)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.util.concurrent", "ForkJoinTask", True, "getException", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.util.concurrent", "ForkJoinTask", True, "invoke", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.util.concurrent", "ForkJoinTask", True, "invokeAll", "(Collection)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.concurrent", "ForkJoinTask", True, "invokeAll", "(Collection)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
       - ["java.util.concurrent", "ForkJoinWorkerThread", True, "getPool", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.util.concurrent", "FutureTask", True, "FutureTask", "(Callable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.util.concurrent", "FutureTask", True, "FutureTask", "(Runnable,Object)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.util.concurrent", "FutureTask", True, "FutureTask", "(Runnable,Object)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["java.util.concurrent", "LinkedBlockingDeque", True, "LinkedBlockingDeque", "(Collection)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
+      - ["java.util.concurrent", "FutureTask", True, "FutureTask", "(Runnable,Object)", "", "Argument[1]", "Argument[this].SyntheticField[java.util.concurrent.FutureTask.callable].SyntheticField[java.util.concurrent.Executors$RunnableAdapter.result]", "value", "dfc-generated"]
+      - ["java.util.concurrent", "FutureTask", True, "get", "(long,TimeUnit)", "", "Argument[this].SyntheticField[java.util.concurrent.FutureTask.outcome]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.util.concurrent", "FutureTask", True, "run", "()", "", "Argument[this].SyntheticField[java.util.concurrent.FutureTask.callable].SyntheticField[java.util.concurrent.Executors$RunnableAdapter.result]", "Argument[this].SyntheticField[java.util.concurrent.FutureTask.outcome]", "value", "dfc-generated"]
+      - ["java.util.concurrent", "LinkedBlockingDeque", True, "LinkedBlockingDeque", "(Collection)", "", "Argument[0].Element", "Argument[this].Element", "value", "dfc-generated"]
       - ["java.util.concurrent", "LinkedBlockingQueue", True, "LinkedBlockingQueue", "(Collection)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
       - ["java.util.concurrent", "Phaser", True, "Phaser", "(Phaser)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.util.concurrent", "Phaser", True, "Phaser", "(Phaser,int)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util.concurrent", "Phaser", True, "Phaser", "(Phaser,int)", "", "Argument[this]", "Argument[this].SyntheticField[java.util.concurrent.Phaser.root]", "value", "dfc-generated"]
       - ["java.util.concurrent", "Phaser", True, "getParent", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.util.concurrent", "Phaser", True, "getRoot", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.concurrent", "Phaser", True, "getRoot", "()", "", "Argument[this].SyntheticField[java.util.concurrent.Phaser.root]", "ReturnValue", "value", "dfc-generated"]
       - ["java.util.concurrent", "PriorityBlockingQueue", True, "PriorityBlockingQueue", "(Collection)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["java.util.concurrent", "PriorityBlockingQueue", True, "PriorityBlockingQueue", "(int,Comparator)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["java.util.concurrent", "PriorityBlockingQueue", True, "comparator", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.concurrent", "PriorityBlockingQueue", True, "PriorityBlockingQueue", "(int,Comparator)", "", "Argument[1]", "Argument[this].SyntheticField[java.util.concurrent.PriorityBlockingQueue.comparator]", "value", "dfc-generated"]
+      - ["java.util.concurrent", "PriorityBlockingQueue", True, "comparator", "()", "", "Argument[this].SyntheticField[java.util.concurrent.PriorityBlockingQueue.comparator]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.util.concurrent", "RecursiveTask", True, "getRawResult", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.util.concurrent", "RejectedExecutionException", True, "RejectedExecutionException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.util.concurrent", "RejectedExecutionException", True, "RejectedExecutionException", "(String,Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.util.concurrent", "RejectedExecutionException", True, "RejectedExecutionException", "(String,Throwable)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
       - ["java.util.concurrent", "RejectedExecutionException", True, "RejectedExecutionException", "(Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.util.concurrent", "RejectedExecutionHandler", True, "rejectedExecution", "(Runnable,ThreadPoolExecutor)", "", "Argument[0]", "Argument[1]", "taint", "df-generated"]
       - ["java.util.concurrent", "ScheduledExecutorService", True, "schedule", "(Callable,long,TimeUnit)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["java.util.concurrent", "ScheduledExecutorService", True, "schedule", "(Runnable,long,TimeUnit)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["java.util.concurrent", "ScheduledExecutorService", True, "scheduleAtFixedRate", "(Runnable,long,long,TimeUnit)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
@@ -119,42 +209,51 @@ extensions:
       - ["java.util.concurrent", "ScheduledThreadPoolExecutor", True, "ScheduledThreadPoolExecutor", "(int,ThreadFactory)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
       - ["java.util.concurrent", "ScheduledThreadPoolExecutor", True, "ScheduledThreadPoolExecutor", "(int,ThreadFactory,RejectedExecutionHandler)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
       - ["java.util.concurrent", "ScheduledThreadPoolExecutor", True, "ScheduledThreadPoolExecutor", "(int,ThreadFactory,RejectedExecutionHandler)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
-      - ["java.util.concurrent", "SubmissionPublisher", True, "SubmissionPublisher", "(Executor,int)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.util.concurrent", "SubmissionPublisher", True, "SubmissionPublisher", "(Executor,int,BiConsumer)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.util.concurrent", "SubmissionPublisher", True, "SubmissionPublisher", "(Executor,int,BiConsumer)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
-      - ["java.util.concurrent", "SubmissionPublisher", True, "closeExceptionally", "(Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.util.concurrent", "SubmissionPublisher", True, "getClosedException", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.util.concurrent", "SubmissionPublisher", True, "getExecutor", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.util.concurrent", "SubmissionPublisher", True, "getSubscribers", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.util.concurrent", "ThreadFactory", True, "newThread", "(Runnable)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["java.util.concurrent", "ThreadFactory", True, "newThread", "(Runnable)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.util.concurrent", "ThreadPoolExecutor", True, "ThreadPoolExecutor", "(int,int,long,TimeUnit,BlockingQueue)", "", "Argument[4].Element", "Argument[this]", "taint", "df-generated"]
-      - ["java.util.concurrent", "ThreadPoolExecutor", True, "ThreadPoolExecutor", "(int,int,long,TimeUnit,BlockingQueue,RejectedExecutionHandler)", "", "Argument[4].Element", "Argument[this]", "taint", "df-generated"]
-      - ["java.util.concurrent", "ThreadPoolExecutor", True, "ThreadPoolExecutor", "(int,int,long,TimeUnit,BlockingQueue,RejectedExecutionHandler)", "", "Argument[5]", "Argument[this]", "taint", "df-generated"]
-      - ["java.util.concurrent", "ThreadPoolExecutor", True, "ThreadPoolExecutor", "(int,int,long,TimeUnit,BlockingQueue,ThreadFactory)", "", "Argument[4].Element", "Argument[this]", "taint", "df-generated"]
-      - ["java.util.concurrent", "ThreadPoolExecutor", True, "ThreadPoolExecutor", "(int,int,long,TimeUnit,BlockingQueue,ThreadFactory)", "", "Argument[5]", "Argument[this]", "taint", "df-generated"]
-      - ["java.util.concurrent", "ThreadPoolExecutor", True, "ThreadPoolExecutor", "(int,int,long,TimeUnit,BlockingQueue,ThreadFactory,RejectedExecutionHandler)", "", "Argument[4].Element", "Argument[this]", "taint", "df-generated"]
-      - ["java.util.concurrent", "ThreadPoolExecutor", True, "ThreadPoolExecutor", "(int,int,long,TimeUnit,BlockingQueue,ThreadFactory,RejectedExecutionHandler)", "", "Argument[5]", "Argument[this]", "taint", "df-generated"]
-      - ["java.util.concurrent", "ThreadPoolExecutor", True, "ThreadPoolExecutor", "(int,int,long,TimeUnit,BlockingQueue,ThreadFactory,RejectedExecutionHandler)", "", "Argument[6]", "Argument[this]", "taint", "df-generated"]
-      - ["java.util.concurrent", "ThreadPoolExecutor", True, "getQueue", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.util.concurrent", "ThreadPoolExecutor", True, "getRejectedExecutionHandler", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.util.concurrent", "ThreadPoolExecutor", True, "getThreadFactory", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.util.concurrent", "ThreadPoolExecutor", True, "setRejectedExecutionHandler", "(RejectedExecutionHandler)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.util.concurrent", "ThreadPoolExecutor", True, "setThreadFactory", "(ThreadFactory)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util.concurrent", "SubmissionPublisher", True, "SubmissionPublisher", "(Executor,int)", "", "Argument[0]", "Argument[this].SyntheticField[java.util.concurrent.SubmissionPublisher.executor]", "value", "dfc-generated"]
+      - ["java.util.concurrent", "SubmissionPublisher", True, "SubmissionPublisher", "(Executor,int,BiConsumer)", "", "Argument[0]", "Argument[this].SyntheticField[java.util.concurrent.SubmissionPublisher.executor]", "value", "dfc-generated"]
+      - ["java.util.concurrent", "SubmissionPublisher", True, "closeExceptionally", "(Throwable)", "", "Argument[0]", "Argument[this].SyntheticField[java.util.concurrent.SubmissionPublisher.closedException]", "value", "dfc-generated"]
+      - ["java.util.concurrent", "SubmissionPublisher", True, "getClosedException", "()", "", "Argument[this].SyntheticField[java.util.concurrent.SubmissionPublisher.closedException]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.util.concurrent", "SubmissionPublisher", True, "getExecutor", "()", "", "Argument[this].SyntheticField[java.util.concurrent.SubmissionPublisher.executor]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.util.concurrent", "SubmissionPublisher", True, "getSubscribers", "()", "", "Argument[this].SyntheticField[java.util.concurrent.SubmissionPublisher.clients].SyntheticField[java.util.concurrent.SubmissionPublisher$BufferedSubscription.subscriber]", "ReturnValue.Element", "value", "dfc-generated"]
+      - ["java.util.concurrent", "SubmissionPublisher", True, "subscribe", "(Flow$Subscriber)", "", "Argument[0]", "Argument[this].SyntheticField[java.util.concurrent.SubmissionPublisher.clients].SyntheticField[java.util.concurrent.SubmissionPublisher$BufferedSubscription.subscriber]", "value", "dfc-generated"]
+      - ["java.util.concurrent", "ThreadFactory", True, "newThread", "(Runnable)", "", "Argument[0]", "ReturnValue", "taint", "dfc-generated"]
+      - ["java.util.concurrent", "ThreadPoolExecutor$DiscardOldestPolicy", True, "rejectedExecution", "(Runnable,ThreadPoolExecutor)", "", "Argument[0]", "Argument[1].SyntheticField[java.util.concurrent.ThreadPoolExecutor.workQueue].Element", "value", "dfc-generated"]
+      - ["java.util.concurrent", "ThreadPoolExecutor", True, "ThreadPoolExecutor", "(int,int,long,TimeUnit,BlockingQueue)", "", "Argument[4]", "Argument[this].SyntheticField[java.util.concurrent.ThreadPoolExecutor.workQueue]", "value", "dfc-generated"]
+      - ["java.util.concurrent", "ThreadPoolExecutor", True, "ThreadPoolExecutor", "(int,int,long,TimeUnit,BlockingQueue,RejectedExecutionHandler)", "", "Argument[4]", "Argument[this].SyntheticField[java.util.concurrent.ThreadPoolExecutor.workQueue]", "value", "dfc-generated"]
+      - ["java.util.concurrent", "ThreadPoolExecutor", True, "ThreadPoolExecutor", "(int,int,long,TimeUnit,BlockingQueue,RejectedExecutionHandler)", "", "Argument[5]", "Argument[this].SyntheticField[java.util.concurrent.ThreadPoolExecutor.handler]", "value", "dfc-generated"]
+      - ["java.util.concurrent", "ThreadPoolExecutor", True, "ThreadPoolExecutor", "(int,int,long,TimeUnit,BlockingQueue,ThreadFactory)", "", "Argument[4]", "Argument[this].SyntheticField[java.util.concurrent.ThreadPoolExecutor.workQueue]", "value", "dfc-generated"]
+      - ["java.util.concurrent", "ThreadPoolExecutor", True, "ThreadPoolExecutor", "(int,int,long,TimeUnit,BlockingQueue,ThreadFactory)", "", "Argument[5]", "Argument[this].SyntheticField[java.util.concurrent.ThreadPoolExecutor.threadFactory]", "value", "dfc-generated"]
+      - ["java.util.concurrent", "ThreadPoolExecutor", True, "ThreadPoolExecutor", "(int,int,long,TimeUnit,BlockingQueue,ThreadFactory,RejectedExecutionHandler)", "", "Argument[4]", "Argument[this].SyntheticField[java.util.concurrent.ThreadPoolExecutor.workQueue]", "value", "dfc-generated"]
+      - ["java.util.concurrent", "ThreadPoolExecutor", True, "ThreadPoolExecutor", "(int,int,long,TimeUnit,BlockingQueue,ThreadFactory,RejectedExecutionHandler)", "", "Argument[5]", "Argument[this].SyntheticField[java.util.concurrent.ThreadPoolExecutor.threadFactory]", "value", "dfc-generated"]
+      - ["java.util.concurrent", "ThreadPoolExecutor", True, "ThreadPoolExecutor", "(int,int,long,TimeUnit,BlockingQueue,ThreadFactory,RejectedExecutionHandler)", "", "Argument[6]", "Argument[this].SyntheticField[java.util.concurrent.ThreadPoolExecutor.handler]", "value", "dfc-generated"]
+      - ["java.util.concurrent", "ThreadPoolExecutor", True, "getQueue", "()", "", "Argument[this].SyntheticField[java.util.concurrent.ThreadPoolExecutor.workQueue]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.util.concurrent", "ThreadPoolExecutor", True, "getRejectedExecutionHandler", "()", "", "Argument[this].SyntheticField[java.util.concurrent.ThreadPoolExecutor.handler]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.util.concurrent", "ThreadPoolExecutor", True, "getThreadFactory", "()", "", "Argument[this].SyntheticField[java.util.concurrent.ThreadPoolExecutor.threadFactory]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.util.concurrent", "ThreadPoolExecutor", True, "setRejectedExecutionHandler", "(RejectedExecutionHandler)", "", "Argument[0]", "Argument[this].SyntheticField[java.util.concurrent.ThreadPoolExecutor.handler]", "value", "dfc-generated"]
+      - ["java.util.concurrent", "ThreadPoolExecutor", True, "setThreadFactory", "(ThreadFactory)", "", "Argument[0]", "Argument[this].SyntheticField[java.util.concurrent.ThreadPoolExecutor.threadFactory]", "value", "dfc-generated"]
+      - ["java.util.concurrent", "ThreadPoolExecutor", True, "shutdownNow", "()", "", "Argument[this].SyntheticField[java.util.concurrent.ThreadPoolExecutor.workQueue].Element", "ReturnValue.Element", "value", "dfc-generated"]
       - ["java.util.concurrent", "TimeoutException", True, "TimeoutException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
   - addsTo:
       pack: codeql/java-all
       extensible: neutralModel
     data:
+      - ["java.util.concurrent", "AbstractExecutorService", "invokeAny", "(Collection)", "summary", "df-generated"]
+      - ["java.util.concurrent", "AbstractExecutorService", "invokeAny", "(Collection,long,TimeUnit)", "summary", "df-generated"]
       - ["java.util.concurrent", "ArrayBlockingQueue", "ArrayBlockingQueue", "(int)", "summary", "df-generated"]
       - ["java.util.concurrent", "ArrayBlockingQueue", "ArrayBlockingQueue", "(int,boolean)", "summary", "df-generated"]
       - ["java.util.concurrent", "ArrayBlockingQueue", "ArrayBlockingQueue", "(int,boolean,Collection)", "summary", "df-generated"]
+      - ["java.util.concurrent", "ArrayBlockingQueue", "clear", "()", "summary", "df-generated"]
+      - ["java.util.concurrent", "ArrayBlockingQueue", "remainingCapacity", "()", "summary", "df-generated"]
+      - ["java.util.concurrent", "ArrayBlockingQueue", "removeAll", "(Collection)", "summary", "df-generated"]
+      - ["java.util.concurrent", "ArrayBlockingQueue", "retainAll", "(Collection)", "summary", "df-generated"]
+      - ["java.util.concurrent", "CompletableFuture", "cancel", "(boolean)", "summary", "df-generated"]
       - ["java.util.concurrent", "CompletableFuture", "completedStage", "(Object)", "summary", "df-generated"]
       - ["java.util.concurrent", "CompletableFuture", "defaultExecutor", "()", "summary", "df-generated"]
       - ["java.util.concurrent", "CompletableFuture", "delayedExecutor", "(long,TimeUnit)", "summary", "df-generated"]
       - ["java.util.concurrent", "CompletableFuture", "failedFuture", "(Throwable)", "summary", "df-generated"]
       - ["java.util.concurrent", "CompletableFuture", "failedStage", "(Throwable)", "summary", "df-generated"]
       - ["java.util.concurrent", "CompletableFuture", "getNumberOfDependents", "()", "summary", "df-generated"]
+      - ["java.util.concurrent", "CompletableFuture", "isCancelled", "()", "summary", "df-generated"]
       - ["java.util.concurrent", "CompletableFuture", "isCompletedExceptionally", "()", "summary", "df-generated"]
       - ["java.util.concurrent", "CompletableFuture", "minimalCompletionStage", "()", "summary", "df-generated"]
       - ["java.util.concurrent", "CompletableFuture", "newIncompleteFuture", "()", "summary", "df-generated"]
@@ -165,7 +264,9 @@ extensions:
       - ["java.util.concurrent", "ConcurrentHashMap", "ConcurrentHashMap", "(int)", "summary", "df-generated"]
       - ["java.util.concurrent", "ConcurrentHashMap", "ConcurrentHashMap", "(int,float)", "summary", "df-generated"]
       - ["java.util.concurrent", "ConcurrentHashMap", "ConcurrentHashMap", "(int,float,int)", "summary", "df-generated"]
+      - ["java.util.concurrent", "ConcurrentHashMap", "computeIfPresent", "(Object,BiFunction)", "summary", "df-generated"]
       - ["java.util.concurrent", "ConcurrentHashMap", "contains", "(Object)", "summary", "df-generated"]
+      - ["java.util.concurrent", "ConcurrentHashMap", "containsValue", "(Object)", "summary", "df-generated"]
       - ["java.util.concurrent", "ConcurrentHashMap", "forEach", "(long,BiConsumer)", "summary", "df-generated"]
       - ["java.util.concurrent", "ConcurrentHashMap", "forEach", "(long,BiFunction,Consumer)", "summary", "df-generated"]
       - ["java.util.concurrent", "ConcurrentHashMap", "forEachEntry", "(long,Consumer)", "summary", "df-generated"]
@@ -196,20 +297,49 @@ extensions:
       - ["java.util.concurrent", "ConcurrentHashMap", "reduceValuesToDouble", "(long,ToDoubleFunction,double,DoubleBinaryOperator)", "summary", "df-generated"]
       - ["java.util.concurrent", "ConcurrentHashMap", "reduceValuesToInt", "(long,ToIntFunction,int,IntBinaryOperator)", "summary", "df-generated"]
       - ["java.util.concurrent", "ConcurrentHashMap", "reduceValuesToLong", "(long,ToLongFunction,long,LongBinaryOperator)", "summary", "df-generated"]
+      - ["java.util.concurrent", "ConcurrentHashMap", "remove", "(Object,Object)", "summary", "df-generated"]
+      - ["java.util.concurrent", "ConcurrentHashMap", "replaceAll", "(BiFunction)", "summary", "df-generated"]
       - ["java.util.concurrent", "ConcurrentHashMap", "search", "(long,BiFunction)", "summary", "df-generated"]
       - ["java.util.concurrent", "ConcurrentHashMap", "searchEntries", "(long,Function)", "summary", "df-generated"]
       - ["java.util.concurrent", "ConcurrentHashMap", "searchKeys", "(long,Function)", "summary", "df-generated"]
       - ["java.util.concurrent", "ConcurrentHashMap", "searchValues", "(long,Function)", "summary", "df-generated"]
       - ["java.util.concurrent", "ConcurrentLinkedDeque", "ConcurrentLinkedDeque", "(Collection)", "summary", "df-generated"]
+      - ["java.util.concurrent", "ConcurrentLinkedDeque", "clear", "()", "summary", "df-generated"]
+      - ["java.util.concurrent", "ConcurrentLinkedDeque", "removeAll", "(Collection)", "summary", "df-generated"]
+      - ["java.util.concurrent", "ConcurrentLinkedDeque", "removeFirstOccurrence", "(Object)", "summary", "df-generated"]
+      - ["java.util.concurrent", "ConcurrentLinkedDeque", "removeLastOccurrence", "(Object)", "summary", "df-generated"]
+      - ["java.util.concurrent", "ConcurrentLinkedDeque", "retainAll", "(Collection)", "summary", "df-generated"]
       - ["java.util.concurrent", "ConcurrentLinkedQueue", "ConcurrentLinkedQueue", "(Collection)", "summary", "df-generated"]
+      - ["java.util.concurrent", "ConcurrentLinkedQueue", "clear", "()", "summary", "df-generated"]
+      - ["java.util.concurrent", "ConcurrentLinkedQueue", "removeAll", "(Collection)", "summary", "df-generated"]
+      - ["java.util.concurrent", "ConcurrentLinkedQueue", "retainAll", "(Collection)", "summary", "df-generated"]
+      - ["java.util.concurrent", "ConcurrentMap", "replaceAll", "(BiFunction)", "summary", "df-generated"]
       - ["java.util.concurrent", "ConcurrentSkipListMap", "ConcurrentSkipListMap", "(SortedMap)", "summary", "df-generated"]
+      - ["java.util.concurrent", "ConcurrentSkipListMap", "ceilingKey", "(Object)", "summary", "df-generated"]
+      - ["java.util.concurrent", "ConcurrentSkipListMap", "compute", "(Object,BiFunction)", "summary", "df-generated"]
+      - ["java.util.concurrent", "ConcurrentSkipListMap", "computeIfPresent", "(Object,BiFunction)", "summary", "df-generated"]
+      - ["java.util.concurrent", "ConcurrentSkipListMap", "containsValue", "(Object)", "summary", "df-generated"]
+      - ["java.util.concurrent", "ConcurrentSkipListMap", "firstKey", "()", "summary", "df-generated"]
+      - ["java.util.concurrent", "ConcurrentSkipListMap", "floorKey", "(Object)", "summary", "df-generated"]
+      - ["java.util.concurrent", "ConcurrentSkipListMap", "higherKey", "(Object)", "summary", "df-generated"]
+      - ["java.util.concurrent", "ConcurrentSkipListMap", "lastKey", "()", "summary", "df-generated"]
+      - ["java.util.concurrent", "ConcurrentSkipListMap", "lowerKey", "(Object)", "summary", "df-generated"]
+      - ["java.util.concurrent", "ConcurrentSkipListMap", "remove", "(Object,Object)", "summary", "df-generated"]
+      - ["java.util.concurrent", "ConcurrentSkipListMap", "replaceAll", "(BiFunction)", "summary", "df-generated"]
       - ["java.util.concurrent", "CopyOnWriteArrayList", "indexOf", "(Object,int)", "summary", "df-generated"]
+      - ["java.util.concurrent", "CopyOnWriteArrayList", "lastIndexOf", "(Object)", "summary", "df-generated"]
       - ["java.util.concurrent", "CopyOnWriteArrayList", "lastIndexOf", "(Object,int)", "summary", "df-generated"]
+      - ["java.util.concurrent", "CopyOnWriteArrayList", "removeAll", "(Collection)", "summary", "df-generated"]
+      - ["java.util.concurrent", "CopyOnWriteArrayList", "replaceAll", "(UnaryOperator)", "summary", "df-generated"]
+      - ["java.util.concurrent", "CopyOnWriteArrayList", "retainAll", "(Collection)", "summary", "df-generated"]
+      - ["java.util.concurrent", "CopyOnWriteArraySet", "retainAll", "(Collection)", "summary", "df-generated"]
       - ["java.util.concurrent", "CountedCompleter", "addToPendingCount", "(int)", "summary", "df-generated"]
       - ["java.util.concurrent", "CountedCompleter", "compareAndSetPendingCount", "(int,int)", "summary", "df-generated"]
+      - ["java.util.concurrent", "CountedCompleter", "complete", "(Object)", "summary", "df-generated"]
       - ["java.util.concurrent", "CountedCompleter", "compute", "()", "summary", "df-generated"]
       - ["java.util.concurrent", "CountedCompleter", "decrementPendingCountUnlessZero", "()", "summary", "df-generated"]
       - ["java.util.concurrent", "CountedCompleter", "getPendingCount", "()", "summary", "df-generated"]
+      - ["java.util.concurrent", "CountedCompleter", "getRawResult", "()", "summary", "df-generated"]
       - ["java.util.concurrent", "CountedCompleter", "helpComplete", "(int)", "summary", "df-generated"]
       - ["java.util.concurrent", "CountedCompleter", "onCompletion", "(CountedCompleter)", "summary", "df-generated"]
       - ["java.util.concurrent", "CountedCompleter", "onExceptionalCompletion", "(Throwable,CountedCompleter)", "summary", "df-generated"]
@@ -224,13 +354,8 @@ extensions:
       - ["java.util.concurrent", "CyclicBarrier", "getParties", "()", "summary", "df-generated"]
       - ["java.util.concurrent", "CyclicBarrier", "isBroken", "()", "summary", "df-generated"]
       - ["java.util.concurrent", "CyclicBarrier", "reset", "()", "summary", "df-generated"]
-      - ["java.util.concurrent", "Delayed", "getDelay", "(TimeUnit)", "summary", "df-generated"]
-      - ["java.util.concurrent", "ExecutorService", "awaitTermination", "(long,TimeUnit)", "summary", "df-generated"]
-      - ["java.util.concurrent", "ExecutorService", "invokeAny", "(Collection)", "summary", "df-generated"]
-      - ["java.util.concurrent", "ExecutorService", "invokeAny", "(Collection,long,TimeUnit)", "summary", "df-generated"]
-      - ["java.util.concurrent", "ExecutorService", "isShutdown", "()", "summary", "df-generated"]
-      - ["java.util.concurrent", "ExecutorService", "isTerminated", "()", "summary", "df-generated"]
-      - ["java.util.concurrent", "ExecutorService", "shutdown", "()", "summary", "df-generated"]
+      - ["java.util.concurrent", "DelayQueue", "clear", "()", "summary", "df-generated"]
+      - ["java.util.concurrent", "DelayQueue", "remainingCapacity", "()", "summary", "df-generated"]
       - ["java.util.concurrent", "Executors", "callable", "(PrivilegedAction)", "summary", "df-generated"]
       - ["java.util.concurrent", "Executors", "callable", "(PrivilegedExceptionAction)", "summary", "df-generated"]
       - ["java.util.concurrent", "Executors", "defaultThreadFactory", "()", "summary", "df-generated"]
@@ -242,13 +367,10 @@ extensions:
       - ["java.util.concurrent", "Executors", "newWorkStealingPool", "()", "summary", "df-generated"]
       - ["java.util.concurrent", "Executors", "newWorkStealingPool", "(int)", "summary", "df-generated"]
       - ["java.util.concurrent", "Executors", "privilegedThreadFactory", "()", "summary", "df-generated"]
-      - ["java.util.concurrent", "Flow$Subscription", "cancel", "()", "summary", "df-generated"]
-      - ["java.util.concurrent", "Flow$Subscription", "request", "(long)", "summary", "df-generated"]
       - ["java.util.concurrent", "Flow", "defaultBufferSize", "()", "summary", "df-generated"]
-      - ["java.util.concurrent", "ForkJoinPool$ManagedBlocker", "block", "()", "summary", "df-generated"]
-      - ["java.util.concurrent", "ForkJoinPool$ManagedBlocker", "isReleasable", "()", "summary", "df-generated"]
       - ["java.util.concurrent", "ForkJoinPool", "ForkJoinPool", "(int)", "summary", "df-generated"]
       - ["java.util.concurrent", "ForkJoinPool", "awaitQuiescence", "(long,TimeUnit)", "summary", "df-generated"]
+      - ["java.util.concurrent", "ForkJoinPool", "awaitTermination", "(long,TimeUnit)", "summary", "df-generated"]
       - ["java.util.concurrent", "ForkJoinPool", "commonPool", "()", "summary", "df-generated"]
       - ["java.util.concurrent", "ForkJoinPool", "execute", "(ForkJoinTask)", "summary", "df-generated"]
       - ["java.util.concurrent", "ForkJoinPool", "getActiveThreadCount", "()", "summary", "df-generated"]
@@ -261,9 +383,14 @@ extensions:
       - ["java.util.concurrent", "ForkJoinPool", "getRunningThreadCount", "()", "summary", "df-generated"]
       - ["java.util.concurrent", "ForkJoinPool", "getStealCount", "()", "summary", "df-generated"]
       - ["java.util.concurrent", "ForkJoinPool", "hasQueuedSubmissions", "()", "summary", "df-generated"]
+      - ["java.util.concurrent", "ForkJoinPool", "invokeAny", "(Collection)", "summary", "df-generated"]
+      - ["java.util.concurrent", "ForkJoinPool", "invokeAny", "(Collection,long,TimeUnit)", "summary", "df-generated"]
       - ["java.util.concurrent", "ForkJoinPool", "isQuiescent", "()", "summary", "df-generated"]
+      - ["java.util.concurrent", "ForkJoinPool", "isShutdown", "()", "summary", "df-generated"]
+      - ["java.util.concurrent", "ForkJoinPool", "isTerminated", "()", "summary", "df-generated"]
       - ["java.util.concurrent", "ForkJoinPool", "isTerminating", "()", "summary", "df-generated"]
       - ["java.util.concurrent", "ForkJoinPool", "managedBlock", "(ForkJoinPool$ManagedBlocker)", "summary", "df-generated"]
+      - ["java.util.concurrent", "ForkJoinTask", "cancel", "(boolean)", "summary", "df-generated"]
       - ["java.util.concurrent", "ForkJoinTask", "compareAndSetForkJoinTaskTag", "(short,short)", "summary", "df-generated"]
       - ["java.util.concurrent", "ForkJoinTask", "completeExceptionally", "(Throwable)", "summary", "df-generated"]
       - ["java.util.concurrent", "ForkJoinTask", "getForkJoinTaskTag", "()", "summary", "df-generated"]
@@ -275,8 +402,10 @@ extensions:
       - ["java.util.concurrent", "ForkJoinTask", "inForkJoinPool", "()", "summary", "df-generated"]
       - ["java.util.concurrent", "ForkJoinTask", "invokeAll", "(ForkJoinTask,ForkJoinTask)", "summary", "df-generated"]
       - ["java.util.concurrent", "ForkJoinTask", "invokeAll", "(ForkJoinTask[])", "summary", "df-generated"]
+      - ["java.util.concurrent", "ForkJoinTask", "isCancelled", "()", "summary", "df-generated"]
       - ["java.util.concurrent", "ForkJoinTask", "isCompletedAbnormally", "()", "summary", "df-generated"]
       - ["java.util.concurrent", "ForkJoinTask", "isCompletedNormally", "()", "summary", "df-generated"]
+      - ["java.util.concurrent", "ForkJoinTask", "isDone", "()", "summary", "df-generated"]
       - ["java.util.concurrent", "ForkJoinTask", "join", "()", "summary", "df-generated"]
       - ["java.util.concurrent", "ForkJoinTask", "quietlyComplete", "()", "summary", "df-generated"]
       - ["java.util.concurrent", "ForkJoinTask", "quietlyInvoke", "()", "summary", "df-generated"]
@@ -285,9 +414,29 @@ extensions:
       - ["java.util.concurrent", "ForkJoinTask", "setForkJoinTaskTag", "(short)", "summary", "df-generated"]
       - ["java.util.concurrent", "ForkJoinTask", "tryUnfork", "()", "summary", "df-generated"]
       - ["java.util.concurrent", "ForkJoinWorkerThread", "getPoolIndex", "()", "summary", "df-generated"]
+      - ["java.util.concurrent", "ForkJoinWorkerThread", "run", "()", "summary", "df-generated"]
+      - ["java.util.concurrent", "FutureTask", "cancel", "(boolean)", "summary", "df-generated"]
+      - ["java.util.concurrent", "FutureTask", "isCancelled", "()", "summary", "df-generated"]
+      - ["java.util.concurrent", "FutureTask", "isDone", "()", "summary", "df-generated"]
       - ["java.util.concurrent", "LinkedBlockingDeque", "LinkedBlockingDeque", "(int)", "summary", "df-generated"]
+      - ["java.util.concurrent", "LinkedBlockingDeque", "clear", "()", "summary", "df-generated"]
+      - ["java.util.concurrent", "LinkedBlockingDeque", "remainingCapacity", "()", "summary", "df-generated"]
+      - ["java.util.concurrent", "LinkedBlockingDeque", "removeAll", "(Collection)", "summary", "df-generated"]
+      - ["java.util.concurrent", "LinkedBlockingDeque", "removeFirstOccurrence", "(Object)", "summary", "df-generated"]
+      - ["java.util.concurrent", "LinkedBlockingDeque", "removeLastOccurrence", "(Object)", "summary", "df-generated"]
+      - ["java.util.concurrent", "LinkedBlockingDeque", "retainAll", "(Collection)", "summary", "df-generated"]
       - ["java.util.concurrent", "LinkedBlockingQueue", "LinkedBlockingQueue", "(int)", "summary", "df-generated"]
+      - ["java.util.concurrent", "LinkedBlockingQueue", "clear", "()", "summary", "df-generated"]
+      - ["java.util.concurrent", "LinkedBlockingQueue", "remainingCapacity", "()", "summary", "df-generated"]
+      - ["java.util.concurrent", "LinkedBlockingQueue", "removeAll", "(Collection)", "summary", "df-generated"]
+      - ["java.util.concurrent", "LinkedBlockingQueue", "retainAll", "(Collection)", "summary", "df-generated"]
       - ["java.util.concurrent", "LinkedTransferQueue", "LinkedTransferQueue", "(Collection)", "summary", "df-generated"]
+      - ["java.util.concurrent", "LinkedTransferQueue", "clear", "()", "summary", "df-generated"]
+      - ["java.util.concurrent", "LinkedTransferQueue", "getWaitingConsumerCount", "()", "summary", "df-generated"]
+      - ["java.util.concurrent", "LinkedTransferQueue", "hasWaitingConsumer", "()", "summary", "df-generated"]
+      - ["java.util.concurrent", "LinkedTransferQueue", "remainingCapacity", "()", "summary", "df-generated"]
+      - ["java.util.concurrent", "LinkedTransferQueue", "removeAll", "(Collection)", "summary", "df-generated"]
+      - ["java.util.concurrent", "LinkedTransferQueue", "retainAll", "(Collection)", "summary", "df-generated"]
       - ["java.util.concurrent", "Phaser", "Phaser", "(int)", "summary", "df-generated"]
       - ["java.util.concurrent", "Phaser", "arrive", "()", "summary", "df-generated"]
       - ["java.util.concurrent", "Phaser", "arriveAndAwaitAdvance", "()", "summary", "df-generated"]
@@ -304,6 +453,11 @@ extensions:
       - ["java.util.concurrent", "Phaser", "isTerminated", "()", "summary", "df-generated"]
       - ["java.util.concurrent", "Phaser", "register", "()", "summary", "df-generated"]
       - ["java.util.concurrent", "PriorityBlockingQueue", "PriorityBlockingQueue", "(int)", "summary", "df-generated"]
+      - ["java.util.concurrent", "PriorityBlockingQueue", "clear", "()", "summary", "df-generated"]
+      - ["java.util.concurrent", "PriorityBlockingQueue", "remainingCapacity", "()", "summary", "df-generated"]
+      - ["java.util.concurrent", "PriorityBlockingQueue", "removeAll", "(Collection)", "summary", "df-generated"]
+      - ["java.util.concurrent", "PriorityBlockingQueue", "retainAll", "(Collection)", "summary", "df-generated"]
+      - ["java.util.concurrent", "RecursiveAction", "getRawResult", "()", "summary", "df-generated"]
       - ["java.util.concurrent", "ScheduledThreadPoolExecutor", "ScheduledThreadPoolExecutor", "(int)", "summary", "df-generated"]
       - ["java.util.concurrent", "ScheduledThreadPoolExecutor", "getContinueExistingPeriodicTasksAfterShutdownPolicy", "()", "summary", "df-generated"]
       - ["java.util.concurrent", "ScheduledThreadPoolExecutor", "getExecuteExistingDelayedTasksAfterShutdownPolicy", "()", "summary", "df-generated"]
@@ -328,6 +482,7 @@ extensions:
       - ["java.util.concurrent", "Semaphore", "tryAcquire", "(int)", "summary", "df-generated"]
       - ["java.util.concurrent", "Semaphore", "tryAcquire", "(int,long,TimeUnit)", "summary", "df-generated"]
       - ["java.util.concurrent", "Semaphore", "tryAcquire", "(long,TimeUnit)", "summary", "df-generated"]
+      - ["java.util.concurrent", "SubmissionPublisher", "close", "()", "summary", "df-generated"]
       - ["java.util.concurrent", "SubmissionPublisher", "consume", "(Consumer)", "summary", "df-generated"]
       - ["java.util.concurrent", "SubmissionPublisher", "estimateMaximumLag", "()", "summary", "df-generated"]
       - ["java.util.concurrent", "SubmissionPublisher", "estimateMinimumDemand", "()", "summary", "df-generated"]
@@ -340,9 +495,30 @@ extensions:
       - ["java.util.concurrent", "SubmissionPublisher", "offer", "(Object,long,TimeUnit,BiPredicate)", "summary", "df-generated"]
       - ["java.util.concurrent", "SubmissionPublisher", "submit", "(Object)", "summary", "df-generated"]
       - ["java.util.concurrent", "SynchronousQueue", "SynchronousQueue", "(boolean)", "summary", "df-generated"]
+      - ["java.util.concurrent", "SynchronousQueue", "clear", "()", "summary", "df-generated"]
+      - ["java.util.concurrent", "SynchronousQueue", "remainingCapacity", "()", "summary", "df-generated"]
+      - ["java.util.concurrent", "SynchronousQueue", "removeAll", "(Collection)", "summary", "df-generated"]
+      - ["java.util.concurrent", "SynchronousQueue", "retainAll", "(Collection)", "summary", "df-generated"]
       - ["java.util.concurrent", "ThreadLocalRandom", "current", "()", "summary", "df-generated"]
+      - ["java.util.concurrent", "ThreadLocalRandom", "nextBoolean", "()", "summary", "df-generated"]
+      - ["java.util.concurrent", "ThreadLocalRandom", "nextDouble", "()", "summary", "df-generated"]
+      - ["java.util.concurrent", "ThreadLocalRandom", "nextDouble", "(double)", "summary", "df-generated"]
+      - ["java.util.concurrent", "ThreadLocalRandom", "nextDouble", "(double,double)", "summary", "df-generated"]
+      - ["java.util.concurrent", "ThreadLocalRandom", "nextFloat", "()", "summary", "df-generated"]
+      - ["java.util.concurrent", "ThreadLocalRandom", "nextFloat", "(float)", "summary", "df-generated"]
+      - ["java.util.concurrent", "ThreadLocalRandom", "nextFloat", "(float,float)", "summary", "df-generated"]
+      - ["java.util.concurrent", "ThreadLocalRandom", "nextInt", "()", "summary", "df-generated"]
+      - ["java.util.concurrent", "ThreadLocalRandom", "nextInt", "(int,int)", "summary", "df-generated"]
+      - ["java.util.concurrent", "ThreadLocalRandom", "nextLong", "()", "summary", "df-generated"]
+      - ["java.util.concurrent", "ThreadLocalRandom", "nextLong", "(long)", "summary", "df-generated"]
+      - ["java.util.concurrent", "ThreadLocalRandom", "nextLong", "(long,long)", "summary", "df-generated"]
+      - ["java.util.concurrent", "ThreadLocalRandom", "setSeed", "(long)", "summary", "df-generated"]
+      - ["java.util.concurrent", "ThreadPoolExecutor$AbortPolicy", "rejectedExecution", "(Runnable,ThreadPoolExecutor)", "summary", "df-generated"]
+      - ["java.util.concurrent", "ThreadPoolExecutor$CallerRunsPolicy", "rejectedExecution", "(Runnable,ThreadPoolExecutor)", "summary", "df-generated"]
+      - ["java.util.concurrent", "ThreadPoolExecutor$DiscardPolicy", "rejectedExecution", "(Runnable,ThreadPoolExecutor)", "summary", "df-generated"]
       - ["java.util.concurrent", "ThreadPoolExecutor", "allowCoreThreadTimeOut", "(boolean)", "summary", "df-generated"]
       - ["java.util.concurrent", "ThreadPoolExecutor", "allowsCoreThreadTimeOut", "()", "summary", "df-generated"]
+      - ["java.util.concurrent", "ThreadPoolExecutor", "awaitTermination", "(long,TimeUnit)", "summary", "df-generated"]
       - ["java.util.concurrent", "ThreadPoolExecutor", "getActiveCount", "()", "summary", "df-generated"]
       - ["java.util.concurrent", "ThreadPoolExecutor", "getCompletedTaskCount", "()", "summary", "df-generated"]
       - ["java.util.concurrent", "ThreadPoolExecutor", "getCorePoolSize", "()", "summary", "df-generated"]
@@ -351,6 +527,8 @@ extensions:
       - ["java.util.concurrent", "ThreadPoolExecutor", "getMaximumPoolSize", "()", "summary", "df-generated"]
       - ["java.util.concurrent", "ThreadPoolExecutor", "getPoolSize", "()", "summary", "df-generated"]
       - ["java.util.concurrent", "ThreadPoolExecutor", "getTaskCount", "()", "summary", "df-generated"]
+      - ["java.util.concurrent", "ThreadPoolExecutor", "isShutdown", "()", "summary", "df-generated"]
+      - ["java.util.concurrent", "ThreadPoolExecutor", "isTerminated", "()", "summary", "df-generated"]
       - ["java.util.concurrent", "ThreadPoolExecutor", "isTerminating", "()", "summary", "df-generated"]
       - ["java.util.concurrent", "ThreadPoolExecutor", "prestartAllCoreThreads", "()", "summary", "df-generated"]
       - ["java.util.concurrent", "ThreadPoolExecutor", "prestartCoreThread", "()", "summary", "df-generated"]
diff --git a/java/ql/lib/ext/generated/java.util.function.model.yml b/java/ql/lib/ext/generated/java.util.function.model.yml
index 5080eeeacc7..24fa9ced64f 100644
--- a/java/ql/lib/ext/generated/java.util.function.model.yml
+++ b/java/ql/lib/ext/generated/java.util.function.model.yml
@@ -12,7 +12,6 @@ extensions:
       - ["java.util.function", "BinaryOperator", "maxBy", "(Comparator)", "summary", "df-generated"]
       - ["java.util.function", "BinaryOperator", "minBy", "(Comparator)", "summary", "df-generated"]
       - ["java.util.function", "Consumer", "andThen", "(Consumer)", "summary", "df-generated"]
-      - ["java.util.function", "DoubleConsumer", "accept", "(double)", "summary", "df-generated"]
       - ["java.util.function", "DoubleConsumer", "andThen", "(DoubleConsumer)", "summary", "df-generated"]
       - ["java.util.function", "DoublePredicate", "and", "(DoublePredicate)", "summary", "df-generated"]
       - ["java.util.function", "DoublePredicate", "negate", "()", "summary", "df-generated"]
@@ -22,7 +21,6 @@ extensions:
       - ["java.util.function", "DoubleUnaryOperator", "identity", "()", "summary", "df-generated"]
       - ["java.util.function", "Function", "andThen", "(Function)", "summary", "df-generated"]
       - ["java.util.function", "Function", "compose", "(Function)", "summary", "df-generated"]
-      - ["java.util.function", "IntConsumer", "accept", "(int)", "summary", "df-generated"]
       - ["java.util.function", "IntConsumer", "andThen", "(IntConsumer)", "summary", "df-generated"]
       - ["java.util.function", "IntPredicate", "and", "(IntPredicate)", "summary", "df-generated"]
       - ["java.util.function", "IntPredicate", "negate", "()", "summary", "df-generated"]
@@ -30,7 +28,6 @@ extensions:
       - ["java.util.function", "IntUnaryOperator", "andThen", "(IntUnaryOperator)", "summary", "df-generated"]
       - ["java.util.function", "IntUnaryOperator", "compose", "(IntUnaryOperator)", "summary", "df-generated"]
       - ["java.util.function", "IntUnaryOperator", "identity", "()", "summary", "df-generated"]
-      - ["java.util.function", "LongConsumer", "accept", "(long)", "summary", "df-generated"]
       - ["java.util.function", "LongConsumer", "andThen", "(LongConsumer)", "summary", "df-generated"]
       - ["java.util.function", "LongPredicate", "and", "(LongPredicate)", "summary", "df-generated"]
       - ["java.util.function", "LongPredicate", "negate", "()", "summary", "df-generated"]
diff --git a/java/ql/lib/ext/generated/java.util.jar.model.yml b/java/ql/lib/ext/generated/java.util.jar.model.yml
index 9b4df579bd0..33d7d00ffa6 100644
--- a/java/ql/lib/ext/generated/java.util.jar.model.yml
+++ b/java/ql/lib/ext/generated/java.util.jar.model.yml
@@ -5,36 +5,39 @@ extensions:
       extensible: summaryModel
     data:
       - ["java.util.jar", "Attributes$Name", True, "Name", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.util.jar", "Attributes", True, "Attributes", "(Attributes)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["java.util.jar", "Attributes", True, "getValue", "(Attributes$Name)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.util.jar", "Attributes", True, "getValue", "(String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.util.jar", "Attributes", True, "putValue", "(String,String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.util.jar", "Attributes", True, "putValue", "(String,String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["java.util.jar", "Attributes", True, "putValue", "(String,String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.jar", "Attributes", True, "Attributes", "(Attributes)", "", "Argument[0].MapKey", "Argument[this].SyntheticField[java.util.jar.Attributes.map].MapKey", "value", "dfc-generated"]
+      - ["java.util.jar", "Attributes", True, "Attributes", "(Attributes)", "", "Argument[0].MapValue", "Argument[this].SyntheticField[java.util.jar.Attributes.map].MapValue", "value", "dfc-generated"]
+      - ["java.util.jar", "Attributes", True, "getValue", "(Attributes$Name)", "", "Argument[this].MapValue", "ReturnValue", "value", "dfc-generated"]
+      - ["java.util.jar", "Attributes", True, "getValue", "(Attributes$Name)", "", "Argument[this].SyntheticField[java.util.jar.Attributes.map].MapValue", "ReturnValue", "value", "dfc-generated"]
+      - ["java.util.jar", "Attributes", True, "getValue", "(String)", "", "Argument[this].MapValue", "ReturnValue", "value", "dfc-generated"]
+      - ["java.util.jar", "Attributes", True, "getValue", "(String)", "", "Argument[this].SyntheticField[java.util.jar.Attributes.map].MapValue", "ReturnValue", "value", "dfc-generated"]
+      - ["java.util.jar", "Attributes", True, "putValue", "(String,String)", "", "Argument[1]", "Argument[this].MapValue", "value", "dfc-generated"]
+      - ["java.util.jar", "Attributes", True, "putValue", "(String,String)", "", "Argument[1]", "Argument[this].SyntheticField[java.util.jar.Attributes.map].MapValue", "value", "dfc-generated"]
+      - ["java.util.jar", "Attributes", True, "putValue", "(String,String)", "", "Argument[this].MapValue", "ReturnValue", "value", "dfc-generated"]
+      - ["java.util.jar", "Attributes", True, "putValue", "(String,String)", "", "Argument[this].SyntheticField[java.util.jar.Attributes.map].MapValue", "ReturnValue", "value", "dfc-generated"]
       - ["java.util.jar", "JarEntry", True, "JarEntry", "(JarEntry)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.util.jar", "JarEntry", True, "JarEntry", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.util.jar", "JarEntry", True, "JarEntry", "(ZipEntry)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.util.jar", "JarEntry", True, "getAttributes", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.util.jar", "JarEntry", True, "getCertificates", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.util.jar", "JarEntry", True, "getCodeSigners", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.util.jar", "JarEntry", True, "getRealName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.util.jar", "JarException", True, "JarException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.util.jar", "JarFile", True, "JarFile", "(File)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.util.jar", "JarFile", True, "JarFile", "(File,boolean)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.util.jar", "JarFile", True, "JarFile", "(File,boolean,int)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.util.jar", "JarFile", True, "JarFile", "(File,boolean,int,Runtime$Version)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.util.jar", "JarFile", True, "JarFile", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.util.jar", "JarFile", True, "JarFile", "(String,boolean)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.util.jar", "JarFile", True, "getJarEntry", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.util.jar", "JarFile", True, "getJarEntry", "(String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.jar", "JarFile", True, "JarFile", "(File)", "", "Argument[0]", "Argument[this]", "taint", "dfc-generated"]
+      - ["java.util.jar", "JarFile", True, "JarFile", "(File,boolean)", "", "Argument[0]", "Argument[this]", "taint", "dfc-generated"]
+      - ["java.util.jar", "JarFile", True, "JarFile", "(File,boolean,int)", "", "Argument[0]", "Argument[this]", "taint", "dfc-generated"]
+      - ["java.util.jar", "JarFile", True, "JarFile", "(File,boolean,int,Runtime$Version)", "", "Argument[0]", "Argument[this]", "taint", "dfc-generated"]
+      - ["java.util.jar", "JarFile", True, "JarFile", "(String)", "", "Argument[0]", "Argument[this]", "taint", "dfc-generated"]
+      - ["java.util.jar", "JarFile", True, "JarFile", "(String,boolean)", "", "Argument[0]", "Argument[this]", "taint", "dfc-generated"]
+      - ["java.util.jar", "JarFile", True, "getJarEntry", "(String)", "", "Argument[this]", "ReturnValue", "taint", "dfc-generated"]
       - ["java.util.jar", "JarFile", True, "getManifest", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.util.jar", "JarFile", True, "getVersion", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.util.jar", "JarInputStream", True, "JarInputStream", "(InputStream)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.util.jar", "JarInputStream", True, "JarInputStream", "(InputStream,boolean)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util.jar", "JarFile", True, "versionedStream", "()", "", "Argument[this]", "ReturnValue", "taint", "dfc-generated"]
+      - ["java.util.jar", "JarInputStream", True, "JarInputStream", "(InputStream)", "", "Argument[0]", "Argument[this]", "taint", "dfc-generated"]
+      - ["java.util.jar", "JarInputStream", True, "JarInputStream", "(InputStream,boolean)", "", "Argument[0]", "Argument[this]", "taint", "dfc-generated"]
       - ["java.util.jar", "JarInputStream", True, "getManifest", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.util.jar", "JarInputStream", True, "getNextJarEntry", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.util.jar", "JarOutputStream", True, "JarOutputStream", "(OutputStream)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.util.jar", "JarOutputStream", True, "JarOutputStream", "(OutputStream,Manifest)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util.jar", "JarOutputStream", True, "JarOutputStream", "(OutputStream)", "", "Argument[0]", "Argument[this]", "taint", "dfc-generated"]
+      - ["java.util.jar", "JarOutputStream", True, "JarOutputStream", "(OutputStream,Manifest)", "", "Argument[0]", "Argument[this]", "taint", "dfc-generated"]
       - ["java.util.jar", "Manifest", True, "Manifest", "(Manifest)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.util.jar", "Manifest", True, "getAttributes", "(String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.util.jar", "Manifest", True, "getEntries", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
@@ -44,10 +47,11 @@ extensions:
       extensible: neutralModel
     data:
       - ["java.util.jar", "Attributes", "Attributes", "(int)", "summary", "df-generated"]
+      - ["java.util.jar", "Attributes", "containsValue", "(Object)", "summary", "df-generated"]
+      - ["java.util.jar", "JarEntry", "JarEntry", "(String)", "summary", "df-generated"]
       - ["java.util.jar", "JarFile", "baseVersion", "()", "summary", "df-generated"]
       - ["java.util.jar", "JarFile", "isMultiRelease", "()", "summary", "df-generated"]
       - ["java.util.jar", "JarFile", "runtimeVersion", "()", "summary", "df-generated"]
-      - ["java.util.jar", "JarFile", "versionedStream", "()", "summary", "df-generated"]
       - ["java.util.jar", "Manifest", "Manifest", "(InputStream)", "summary", "df-generated"]
       - ["java.util.jar", "Manifest", "clear", "()", "summary", "df-generated"]
       - ["java.util.jar", "Manifest", "read", "(InputStream)", "summary", "df-generated"]
diff --git a/java/ql/lib/ext/generated/java.util.logging.model.yml b/java/ql/lib/ext/generated/java.util.logging.model.yml
index 5ca7ed9013a..87d7d642a37 100644
--- a/java/ql/lib/ext/generated/java.util.logging.model.yml
+++ b/java/ql/lib/ext/generated/java.util.logging.model.yml
@@ -12,72 +12,68 @@ extensions:
       - ["java.util.logging", "FileHandler", True, "FileHandler", "(String,long,int,boolean)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.util.logging", "Formatter", True, "format", "(LogRecord)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["java.util.logging", "Formatter", True, "format", "(LogRecord)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.util.logging", "Formatter", True, "formatMessage", "(LogRecord)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["java.util.logging", "Formatter", True, "getHead", "(Handler)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["java.util.logging", "Handler", True, "getEncoding", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.util.logging", "Handler", True, "getErrorManager", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.util.logging", "Handler", True, "getFilter", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.util.logging", "Handler", True, "getFormatter", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.util.logging", "Handler", True, "getLevel", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.logging", "Formatter", True, "formatMessage", "(LogRecord)", "", "Argument[0]", "ReturnValue", "taint", "dfc-generated"]
+      - ["java.util.logging", "Handler", True, "getErrorManager", "()", "", "Argument[this].SyntheticField[java.util.logging.Handler.errorManager]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.util.logging", "Handler", True, "getFilter", "()", "", "Argument[this].SyntheticField[java.util.logging.Handler.filter]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.util.logging", "Handler", True, "getFormatter", "()", "", "Argument[this].SyntheticField[java.util.logging.Handler.formatter]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.util.logging", "Handler", True, "getLevel", "()", "", "Argument[this].SyntheticField[java.util.logging.Handler.logLevel]", "ReturnValue", "value", "dfc-generated"]
       - ["java.util.logging", "Handler", True, "publish", "(LogRecord)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.util.logging", "Handler", True, "setEncoding", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.util.logging", "Handler", True, "setErrorManager", "(ErrorManager)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.util.logging", "Handler", True, "setFilter", "(Filter)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.util.logging", "Handler", True, "setFormatter", "(Formatter)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.util.logging", "Handler", True, "setLevel", "(Level)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util.logging", "Handler", True, "setErrorManager", "(ErrorManager)", "", "Argument[0]", "Argument[this].SyntheticField[java.util.logging.Handler.errorManager]", "value", "dfc-generated"]
+      - ["java.util.logging", "Handler", True, "setFilter", "(Filter)", "", "Argument[0]", "Argument[this].SyntheticField[java.util.logging.Handler.filter]", "value", "dfc-generated"]
+      - ["java.util.logging", "Handler", True, "setFormatter", "(Formatter)", "", "Argument[0]", "Argument[this].SyntheticField[java.util.logging.Handler.formatter]", "value", "dfc-generated"]
+      - ["java.util.logging", "Handler", True, "setLevel", "(Level)", "", "Argument[0]", "Argument[this].SyntheticField[java.util.logging.Handler.logLevel]", "value", "dfc-generated"]
       - ["java.util.logging", "Level", True, "getLocalizedName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.util.logging", "Level", True, "getName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.util.logging", "Level", True, "getResourceBundleName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.util.logging", "LogManager", True, "addConfigurationListener", "(Runnable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.util.logging", "LogManager", True, "addConfigurationListener", "(Runnable)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.util.logging", "LogManager", True, "addConfigurationListener", "(Runnable)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
       - ["java.util.logging", "LogManager", True, "getLoggerNames", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.util.logging", "LogManager", True, "getProperty", "(String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.util.logging", "LogRecord", True, "getInstant", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.util.logging", "LogRecord", True, "getLevel", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.util.logging", "LogRecord", True, "getLoggerName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.util.logging", "LogRecord", True, "getMessage", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.util.logging", "LogRecord", True, "getParameters", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.util.logging", "LogRecord", True, "getResourceBundleName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.util.logging", "LogRecord", True, "getSourceClassName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.util.logging", "LogRecord", True, "getSourceMethodName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.util.logging", "LogRecord", True, "getThrown", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.util.logging", "LogRecord", True, "setInstant", "(Instant)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.util.logging", "LogRecord", True, "setLevel", "(Level)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.util.logging", "LogRecord", True, "setLoggerName", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.util.logging", "LogRecord", True, "setLongThreadID", "(long)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.util.logging", "LogRecord", True, "getInstant", "()", "", "Argument[this].SyntheticField[java.util.logging.LogRecord.instant]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.util.logging", "LogRecord", True, "getLevel", "()", "", "Argument[this].SyntheticField[java.util.logging.LogRecord.level]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.util.logging", "LogRecord", True, "getLoggerName", "()", "", "Argument[this].SyntheticField[java.util.logging.LogRecord.loggerName]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.util.logging", "LogRecord", True, "getResourceBundleName", "()", "", "Argument[this].SyntheticField[java.util.logging.LogRecord.resourceBundleName]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.util.logging", "LogRecord", True, "getSourceClassName", "()", "", "Argument[this].SyntheticField[java.util.logging.LogRecord.sourceClassName]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.util.logging", "LogRecord", True, "getSourceMethodName", "()", "", "Argument[this].SyntheticField[java.util.logging.LogRecord.sourceMethodName]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.util.logging", "LogRecord", True, "getThrown", "()", "", "Argument[this].SyntheticField[java.util.logging.LogRecord.thrown]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.util.logging", "LogRecord", True, "setInstant", "(Instant)", "", "Argument[0]", "Argument[this].SyntheticField[java.util.logging.LogRecord.instant]", "value", "dfc-generated"]
+      - ["java.util.logging", "LogRecord", True, "setLevel", "(Level)", "", "Argument[0]", "Argument[this].SyntheticField[java.util.logging.LogRecord.level]", "value", "dfc-generated"]
+      - ["java.util.logging", "LogRecord", True, "setLoggerName", "(String)", "", "Argument[0]", "Argument[this].SyntheticField[java.util.logging.LogRecord.loggerName]", "value", "dfc-generated"]
+      - ["java.util.logging", "LogRecord", True, "setLongThreadID", "(long)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
       - ["java.util.logging", "LogRecord", True, "setMessage", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.util.logging", "LogRecord", True, "setResourceBundle", "(ResourceBundle)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.util.logging", "LogRecord", True, "setResourceBundleName", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.util.logging", "LogRecord", True, "setSourceClassName", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.util.logging", "LogRecord", True, "setSourceMethodName", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.util.logging", "LogRecord", True, "setThrown", "(Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.util.logging", "Logger", True, "getAnonymousLogger", "(String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["java.util.logging", "Logger", True, "getFilter", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.logging", "LogRecord", True, "setResourceBundleName", "(String)", "", "Argument[0]", "Argument[this].SyntheticField[java.util.logging.LogRecord.resourceBundleName]", "value", "dfc-generated"]
+      - ["java.util.logging", "LogRecord", True, "setSourceClassName", "(String)", "", "Argument[0]", "Argument[this].SyntheticField[java.util.logging.LogRecord.sourceClassName]", "value", "dfc-generated"]
+      - ["java.util.logging", "LogRecord", True, "setSourceMethodName", "(String)", "", "Argument[0]", "Argument[this].SyntheticField[java.util.logging.LogRecord.sourceMethodName]", "value", "dfc-generated"]
+      - ["java.util.logging", "LogRecord", True, "setThrown", "(Throwable)", "", "Argument[0]", "Argument[this].SyntheticField[java.util.logging.LogRecord.thrown]", "value", "dfc-generated"]
+      - ["java.util.logging", "Logger", True, "getAnonymousLogger", "(String)", "", "Argument[0]", "ReturnValue.SyntheticField[java.util.logging.Logger.loggerBundle].SyntheticField[java.util.logging.Logger$LoggerBundle.resourceBundleName]", "value", "dfc-generated"]
+      - ["java.util.logging", "Logger", True, "getFilter", "()", "", "Argument[this].SyntheticField[java.util.logging.Logger.config].SyntheticField[java.util.logging.Logger$ConfigurationData.filter]", "ReturnValue", "value", "dfc-generated"]
       - ["java.util.logging", "Logger", True, "getHandlers", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.util.logging", "Logger", True, "getLevel", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.util.logging", "Logger", True, "getLogger", "(String,String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["java.util.logging", "Logger", True, "getLogger", "(String,String)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["java.util.logging", "Logger", True, "getParent", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.logging", "Logger", True, "getLevel", "()", "", "Argument[this].SyntheticField[java.util.logging.Logger.config].SyntheticField[java.util.logging.Logger$ConfigurationData.levelObject]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.util.logging", "Logger", True, "getLogger", "(String,String)", "", "Argument[1]", "ReturnValue.SyntheticField[java.util.logging.Logger.loggerBundle].SyntheticField[java.util.logging.Logger$LoggerBundle.resourceBundleName]", "value", "dfc-generated"]
+      - ["java.util.logging", "Logger", True, "getParent", "()", "", "Argument[this].SyntheticField[java.util.logging.Logger.parent]", "ReturnValue", "value", "dfc-generated"]
       - ["java.util.logging", "Logger", True, "getResourceBundle", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.util.logging", "Logger", True, "getResourceBundleName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.logging", "Logger", True, "getResourceBundleName", "()", "", "Argument[this].SyntheticField[java.util.logging.Logger.loggerBundle].SyntheticField[java.util.logging.Logger$LoggerBundle.resourceBundleName]", "ReturnValue", "value", "dfc-generated"]
       - ["java.util.logging", "Logger", True, "logrb", "(Level,String,String,String,String)", "", "Argument[3]", "Argument[this]", "taint", "df-generated"]
       - ["java.util.logging", "Logger", True, "logrb", "(Level,String,String,String,String,Object)", "", "Argument[3]", "Argument[this]", "taint", "df-generated"]
       - ["java.util.logging", "Logger", True, "logrb", "(Level,String,String,String,String,Object[])", "", "Argument[3]", "Argument[this]", "taint", "df-generated"]
       - ["java.util.logging", "Logger", True, "logrb", "(Level,String,String,String,String,Throwable)", "", "Argument[3]", "Argument[this]", "taint", "df-generated"]
-      - ["java.util.logging", "Logger", True, "setFilter", "(Filter)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.util.logging", "Logger", True, "setLevel", "(Level)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.util.logging", "Logger", True, "setParent", "(Logger)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util.logging", "Logger", True, "setFilter", "(Filter)", "", "Argument[0]", "Argument[this].SyntheticField[java.util.logging.Logger.config].SyntheticField[java.util.logging.Logger$ConfigurationData.filter]", "value", "dfc-generated"]
+      - ["java.util.logging", "Logger", True, "setLevel", "(Level)", "", "Argument[0]", "Argument[this].SyntheticField[java.util.logging.Logger.config].SyntheticField[java.util.logging.Logger$ConfigurationData.levelObject]", "value", "dfc-generated"]
+      - ["java.util.logging", "Logger", True, "setParent", "(Logger)", "", "Argument[0]", "Argument[this].SyntheticField[java.util.logging.Logger.parent]", "value", "dfc-generated"]
       - ["java.util.logging", "Logger", True, "setResourceBundle", "(ResourceBundle)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.util.logging", "LoggingPermission", False, "LoggingPermission", "(String,String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.util.logging", "MemoryHandler", True, "MemoryHandler", "(Handler,int,Level)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.util.logging", "MemoryHandler", True, "MemoryHandler", "(Handler,int,Level)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
-      - ["java.util.logging", "MemoryHandler", True, "getPushLevel", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.util.logging", "MemoryHandler", True, "setPushLevel", "(Level)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util.logging", "LoggingPermission", False, "LoggingPermission", "(String,String)", "", "Argument[0]", "Argument[this]", "taint", "dfc-generated"]
+      - ["java.util.logging", "MemoryHandler", True, "MemoryHandler", "(Handler,int,Level)", "", "Argument[2]", "Argument[this].SyntheticField[java.util.logging.MemoryHandler.pushLevel]", "value", "dfc-generated"]
+      - ["java.util.logging", "MemoryHandler", True, "getPushLevel", "()", "", "Argument[this].SyntheticField[java.util.logging.MemoryHandler.pushLevel]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.util.logging", "MemoryHandler", True, "setPushLevel", "(Level)", "", "Argument[0]", "Argument[this].SyntheticField[java.util.logging.MemoryHandler.pushLevel]", "value", "dfc-generated"]
       - ["java.util.logging", "SocketHandler", True, "SocketHandler", "(String,int)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
   - addsTo:
       pack: codeql/java-all
       extensible: neutralModel
     data:
+      - ["java.util.logging", "ConsoleHandler", "close", "()", "summary", "df-generated"]
+      - ["java.util.logging", "FileHandler", "close", "()", "summary", "df-generated"]
+      - ["java.util.logging", "Formatter", "getHead", "(Handler)", "summary", "df-generated"]
       - ["java.util.logging", "Formatter", "getTail", "(Handler)", "summary", "df-generated"]
       - ["java.util.logging", "Handler", "close", "()", "summary", "df-generated"]
       - ["java.util.logging", "Handler", "flush", "()", "summary", "df-generated"]
@@ -145,9 +141,14 @@ extensions:
       - ["java.util.logging", "Logger", "throwing", "(String,String,Throwable)", "summary", "df-generated"]
       - ["java.util.logging", "Logger", "warning", "(String)", "summary", "df-generated"]
       - ["java.util.logging", "Logger", "warning", "(Supplier)", "summary", "df-generated"]
-      - ["java.util.logging", "LoggingMXBean", "getLoggerLevel", "(String)", "summary", "df-generated"]
-      - ["java.util.logging", "LoggingMXBean", "getLoggerNames", "()", "summary", "df-generated"]
-      - ["java.util.logging", "LoggingMXBean", "getParentLoggerName", "(String)", "summary", "df-generated"]
-      - ["java.util.logging", "LoggingMXBean", "setLoggerLevel", "(String,String)", "summary", "df-generated"]
+      - ["java.util.logging", "MemoryHandler", "close", "()", "summary", "df-generated"]
+      - ["java.util.logging", "MemoryHandler", "flush", "()", "summary", "df-generated"]
+      - ["java.util.logging", "MemoryHandler", "isLoggable", "(LogRecord)", "summary", "df-generated"]
       - ["java.util.logging", "MemoryHandler", "push", "()", "summary", "df-generated"]
+      - ["java.util.logging", "SocketHandler", "close", "()", "summary", "df-generated"]
       - ["java.util.logging", "StreamHandler", "StreamHandler", "(OutputStream,Formatter)", "summary", "df-generated"]
+      - ["java.util.logging", "StreamHandler", "close", "()", "summary", "df-generated"]
+      - ["java.util.logging", "StreamHandler", "flush", "()", "summary", "df-generated"]
+      - ["java.util.logging", "StreamHandler", "isLoggable", "(LogRecord)", "summary", "df-generated"]
+      - ["java.util.logging", "XMLFormatter", "getHead", "(Handler)", "summary", "df-generated"]
+      - ["java.util.logging", "XMLFormatter", "getTail", "(Handler)", "summary", "df-generated"]
diff --git a/java/ql/lib/ext/generated/java.util.model.yml b/java/ql/lib/ext/generated/java.util.model.yml
index e6170696fba..c9d7d9e5d99 100644
--- a/java/ql/lib/ext/generated/java.util.model.yml
+++ b/java/ql/lib/ext/generated/java.util.model.yml
@@ -4,150 +4,150 @@ extensions:
       pack: codeql/java-all
       extensible: summaryModel
     data:
-      - ["java.util", "Base64$Encoder", True, "withoutPadding", "()", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.util", "Base64$Encoder", True, "withoutPadding", "()", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
       - ["java.util", "Base64", True, "getMimeEncoder", "(int,byte[])", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["java.util", "Calendar$Builder", True, "build", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.util", "Calendar$Builder", True, "set", "(int,int)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["java.util", "Calendar$Builder", True, "setCalendarType", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.util", "Calendar$Builder", True, "setCalendarType", "(String)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["java.util", "Calendar$Builder", True, "setDate", "(int,int,int)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.util", "Calendar$Builder", True, "setFields", "(int[])", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["java.util", "Calendar$Builder", True, "setInstant", "(Date)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.util", "Calendar$Builder", True, "setInstant", "(long)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["java.util", "Calendar$Builder", True, "setLenient", "(boolean)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["java.util", "Calendar$Builder", True, "setLocale", "(Locale)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.util", "Calendar$Builder", True, "setLocale", "(Locale)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["java.util", "Calendar$Builder", True, "setTimeOfDay", "(int,int,int)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.util", "Calendar$Builder", True, "setTimeOfDay", "(int,int,int,int)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.util", "Calendar$Builder", True, "setTimeZone", "(TimeZone)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.util", "Calendar$Builder", True, "setTimeZone", "(TimeZone)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["java.util", "Calendar$Builder", True, "setWeekDate", "(int,int,int)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["java.util", "Calendar$Builder", True, "setWeekDefinition", "(int,int)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["java.util", "Calendar", True, "getDisplayName", "(int,int,Locale)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
-      - ["java.util", "Calendar", True, "getInstance", "(TimeZone)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["java.util", "Calendar", True, "getInstance", "(TimeZone,Locale)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["java.util", "Calendar", True, "getTimeZone", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.util", "Calendar", True, "setTimeZone", "(TimeZone)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util", "Calendar$Builder", True, "build", "()", "", "Argument[this].SyntheticField[java.util.Calendar$Builder.zone]", "ReturnValue.SyntheticField[java.util.Calendar.zone]", "value", "dfc-generated"]
+      - ["java.util", "Calendar$Builder", True, "set", "(int,int)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.util", "Calendar$Builder", True, "setCalendarType", "(String)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.util", "Calendar$Builder", True, "setDate", "(int,int,int)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.util", "Calendar$Builder", True, "setFields", "(int[])", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.util", "Calendar$Builder", True, "setInstant", "(Date)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.util", "Calendar$Builder", True, "setInstant", "(long)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.util", "Calendar$Builder", True, "setLenient", "(boolean)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.util", "Calendar$Builder", True, "setLocale", "(Locale)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.util", "Calendar$Builder", True, "setTimeOfDay", "(int,int,int)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.util", "Calendar$Builder", True, "setTimeOfDay", "(int,int,int,int)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.util", "Calendar$Builder", True, "setTimeZone", "(TimeZone)", "", "Argument[0]", "Argument[this].SyntheticField[java.util.Calendar$Builder.zone]", "value", "dfc-generated"]
+      - ["java.util", "Calendar$Builder", True, "setTimeZone", "(TimeZone)", "", "Argument[0]", "ReturnValue.SyntheticField[java.util.Calendar$Builder.zone]", "value", "dfc-generated"]
+      - ["java.util", "Calendar$Builder", True, "setTimeZone", "(TimeZone)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.util", "Calendar$Builder", True, "setWeekDate", "(int,int,int)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.util", "Calendar$Builder", True, "setWeekDefinition", "(int,int)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.util", "Calendar", True, "getInstance", "(TimeZone)", "", "Argument[0]", "ReturnValue.SyntheticField[java.util.Calendar.zone]", "value", "dfc-generated"]
+      - ["java.util", "Calendar", True, "getInstance", "(TimeZone,Locale)", "", "Argument[0]", "ReturnValue.SyntheticField[java.util.Calendar.zone]", "value", "dfc-generated"]
+      - ["java.util", "Calendar", True, "getTimeZone", "()", "", "Argument[this].SyntheticField[java.util.Calendar.zone]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.util", "Calendar", True, "setTimeZone", "(TimeZone)", "", "Argument[0]", "Argument[this].SyntheticField[java.util.Calendar.zone]", "value", "dfc-generated"]
       - ["java.util", "Comparator", True, "nullsFirst", "(Comparator)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["java.util", "Comparator", True, "nullsLast", "(Comparator)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["java.util", "Comparator", True, "reversed", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.util", "ConcurrentModificationException", True, "ConcurrentModificationException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.util", "ConcurrentModificationException", True, "ConcurrentModificationException", "(String,Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.util", "ConcurrentModificationException", True, "ConcurrentModificationException", "(String,Throwable)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
       - ["java.util", "ConcurrentModificationException", True, "ConcurrentModificationException", "(Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.util", "Currency", False, "getCurrencyCode", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.util", "Currency", False, "getDisplayName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.util", "Currency", False, "getDisplayName", "(Locale)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["java.util", "Currency", False, "getDisplayName", "(Locale)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.util", "Currency", False, "getInstance", "(Locale)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["java.util", "Currency", False, "getInstance", "(String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["java.util", "Currency", False, "getSymbol", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.util", "Currency", False, "getSymbol", "(Locale)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["java.util", "Currency", False, "getSymbol", "(Locale)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.util", "DuplicateFormatFlagsException", True, "DuplicateFormatFlagsException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.util", "DuplicateFormatFlagsException", True, "getFlags", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.util", "EventListenerProxy", True, "EventListenerProxy", "(EventListener)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.util", "EventListenerProxy", True, "getListener", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.util", "FormatFlagsConversionMismatchException", True, "FormatFlagsConversionMismatchException", "(String,char)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.util", "FormatFlagsConversionMismatchException", True, "getFlags", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.util", "Formatter", False, "Formatter", "(Appendable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.util", "Formatter", False, "Formatter", "(Appendable,Locale)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.util", "Formatter", False, "Formatter", "(Appendable,Locale)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["java.util", "Formatter", False, "Formatter", "(File,Charset,Locale)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
-      - ["java.util", "Formatter", False, "Formatter", "(File,String,Locale)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
-      - ["java.util", "Formatter", False, "Formatter", "(Locale)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.util", "Formatter", False, "Formatter", "(OutputStream,Charset,Locale)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
-      - ["java.util", "Formatter", False, "Formatter", "(OutputStream,String,Locale)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
-      - ["java.util", "Formatter", False, "Formatter", "(PrintStream)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.util", "Formatter", False, "Formatter", "(String,Charset,Locale)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
-      - ["java.util", "Formatter", False, "Formatter", "(String,String,Locale)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
-      - ["java.util", "Formatter", False, "format", "(Locale,String,Object[])", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["java.util", "Formatter", False, "format", "(String,Object[])", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["java.util", "Formatter", False, "format", "(String,Object[])", "", "Argument[1].ArrayElement", "ReturnValue", "taint", "df-generated"]
-      - ["java.util", "Formatter", False, "format", "(String,Object[])", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util", "Currency", False, "getCurrencyCode", "()", "", "Argument[this].SyntheticField[java.util.Currency.currencyCode]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.util", "Currency", False, "getDisplayName", "()", "", "Argument[this].SyntheticField[java.util.Currency.currencyCode]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.util", "Currency", False, "getDisplayName", "(Locale)", "", "Argument[this].SyntheticField[java.util.Currency.currencyCode]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.util", "Currency", False, "getInstance", "(String)", "", "Argument[0]", "ReturnValue.SyntheticField[java.util.Currency.currencyCode]", "value", "dfc-generated"]
+      - ["java.util", "Currency", False, "getSymbol", "()", "", "Argument[this].SyntheticField[java.util.Currency.currencyCode]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.util", "Currency", False, "getSymbol", "(Locale)", "", "Argument[this].SyntheticField[java.util.Currency.currencyCode]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.util", "DuplicateFormatFlagsException", True, "DuplicateFormatFlagsException", "(String)", "", "Argument[0]", "Argument[this].SyntheticField[java.util.DuplicateFormatFlagsException.flags]", "value", "dfc-generated"]
+      - ["java.util", "DuplicateFormatFlagsException", True, "getFlags", "()", "", "Argument[this].SyntheticField[java.util.DuplicateFormatFlagsException.flags]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.util", "EventListenerProxy", True, "EventListenerProxy", "(EventListener)", "", "Argument[0]", "Argument[this].SyntheticField[java.util.EventListenerProxy.listener]", "value", "dfc-generated"]
+      - ["java.util", "EventListenerProxy", True, "getListener", "()", "", "Argument[this].SyntheticField[java.util.EventListenerProxy.listener]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.util", "FormatFlagsConversionMismatchException", True, "FormatFlagsConversionMismatchException", "(String,char)", "", "Argument[0]", "Argument[this].SyntheticField[java.util.FormatFlagsConversionMismatchException.f]", "value", "dfc-generated"]
+      - ["java.util", "FormatFlagsConversionMismatchException", True, "getFlags", "()", "", "Argument[this].SyntheticField[java.util.FormatFlagsConversionMismatchException.f]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.util", "Formattable", True, "formatTo", "(Formatter,int,int,int)", "", "Argument[this]", "Argument[0]", "taint", "df-generated"]
+      - ["java.util", "Formatter", False, "Formatter", "(Appendable)", "", "Argument[0]", "Argument[this].SyntheticField[java.util.Formatter.a]", "value", "dfc-generated"]
+      - ["java.util", "Formatter", False, "Formatter", "(Appendable,Locale)", "", "Argument[0]", "Argument[this].SyntheticField[java.util.Formatter.a]", "value", "dfc-generated"]
+      - ["java.util", "Formatter", False, "Formatter", "(Appendable,Locale)", "", "Argument[1]", "Argument[this].SyntheticField[java.util.Formatter.l]", "value", "dfc-generated"]
+      - ["java.util", "Formatter", False, "Formatter", "(File,Charset,Locale)", "", "Argument[2]", "Argument[this].SyntheticField[java.util.Formatter.l]", "value", "dfc-generated"]
+      - ["java.util", "Formatter", False, "Formatter", "(File,String,Locale)", "", "Argument[2]", "Argument[this].SyntheticField[java.util.Formatter.l]", "value", "dfc-generated"]
+      - ["java.util", "Formatter", False, "Formatter", "(Locale)", "", "Argument[0]", "Argument[this].SyntheticField[java.util.Formatter.l]", "value", "dfc-generated"]
+      - ["java.util", "Formatter", False, "Formatter", "(OutputStream,Charset,Locale)", "", "Argument[2]", "Argument[this].SyntheticField[java.util.Formatter.l]", "value", "dfc-generated"]
+      - ["java.util", "Formatter", False, "Formatter", "(OutputStream,String,Locale)", "", "Argument[2]", "Argument[this].SyntheticField[java.util.Formatter.l]", "value", "dfc-generated"]
+      - ["java.util", "Formatter", False, "Formatter", "(PrintStream)", "", "Argument[0]", "Argument[this].SyntheticField[java.util.Formatter.a]", "value", "dfc-generated"]
+      - ["java.util", "Formatter", False, "Formatter", "(String,Charset,Locale)", "", "Argument[2]", "Argument[this].SyntheticField[java.util.Formatter.l]", "value", "dfc-generated"]
+      - ["java.util", "Formatter", False, "Formatter", "(String,String,Locale)", "", "Argument[2]", "Argument[this].SyntheticField[java.util.Formatter.l]", "value", "dfc-generated"]
+      - ["java.util", "Formatter", False, "format", "(Locale,String,Object[])", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.util", "Formatter", False, "format", "(String,Object[])", "", "Argument[0]", "ReturnValue", "taint", "dfc-generated"]
+      - ["java.util", "Formatter", False, "format", "(String,Object[])", "", "Argument[1]", "ReturnValue", "taint", "dfc-generated"]
+      - ["java.util", "Formatter", False, "format", "(String,Object[])", "", "Argument[this].SyntheticField[java.util.Formatter.l]", "ReturnValue", "taint", "dfc-generated"]
+      - ["java.util", "Formatter", False, "format", "(String,Object[])", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
       - ["java.util", "Formatter", False, "ioException", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.util", "Formatter", False, "locale", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.util", "Formatter", False, "out", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.util", "GregorianCalendar", True, "GregorianCalendar", "(TimeZone)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.util", "GregorianCalendar", True, "GregorianCalendar", "(TimeZone,Locale)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util", "Formatter", False, "locale", "()", "", "Argument[this].SyntheticField[java.util.Formatter.l]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.util", "Formatter", False, "out", "()", "", "Argument[this].SyntheticField[java.util.Formatter.a]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.util", "GregorianCalendar", True, "GregorianCalendar", "(TimeZone)", "", "Argument[0]", "Argument[this].SyntheticField[java.util.Calendar.zone]", "value", "dfc-generated"]
+      - ["java.util", "GregorianCalendar", True, "GregorianCalendar", "(TimeZone,Locale)", "", "Argument[0]", "Argument[this].SyntheticField[java.util.Calendar.zone]", "value", "dfc-generated"]
       - ["java.util", "GregorianCalendar", True, "from", "(ZonedDateTime)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["java.util", "GregorianCalendar", True, "toZonedDateTime", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.util", "HexFormat", False, "delimiter", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.util", "HexFormat", False, "formatHex", "(Appendable,byte[])", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["java.util", "HexFormat", False, "formatHex", "(Appendable,byte[])", "", "Argument[this]", "Argument[0]", "taint", "df-generated"]
-      - ["java.util", "HexFormat", False, "formatHex", "(Appendable,byte[])", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.util", "HexFormat", False, "formatHex", "(Appendable,byte[],int,int)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["java.util", "HexFormat", False, "formatHex", "(Appendable,byte[],int,int)", "", "Argument[this]", "Argument[0]", "taint", "df-generated"]
-      - ["java.util", "HexFormat", False, "formatHex", "(Appendable,byte[],int,int)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.util", "HexFormat", False, "formatHex", "(byte[])", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.util", "HexFormat", False, "formatHex", "(byte[],int,int)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.util", "HexFormat", False, "ofDelimiter", "(String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["java.util", "HexFormat", False, "prefix", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.util", "HexFormat", False, "suffix", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.util", "HexFormat", False, "toHexDigits", "(Appendable,byte)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["java.util", "HexFormat", False, "withDelimiter", "(String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["java.util", "HexFormat", False, "withDelimiter", "(String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.util", "HexFormat", False, "withLowerCase", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.util", "HexFormat", False, "withPrefix", "(String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["java.util", "HexFormat", False, "withPrefix", "(String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.util", "HexFormat", False, "withSuffix", "(String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["java.util", "HexFormat", False, "withSuffix", "(String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.util", "HexFormat", False, "withUpperCase", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.util", "IllegalFormatFlagsException", True, "IllegalFormatFlagsException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.util", "IllegalFormatFlagsException", True, "getFlags", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util", "GregorianCalendar", True, "getTimeZone", "()", "", "Argument[this].SyntheticField[java.util.Calendar.zone]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.util", "GregorianCalendar", True, "setTimeZone", "(TimeZone)", "", "Argument[0]", "Argument[this].SyntheticField[java.util.Calendar.zone]", "value", "dfc-generated"]
+      - ["java.util", "HashMap", True, "compute", "(Object,BiFunction)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util", "HashMap", True, "compute", "(Object,BiFunction)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util", "HashMap", True, "computeIfPresent", "(Object,BiFunction)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util", "Hashtable", True, "compute", "(Object,BiFunction)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util", "Hashtable", True, "computeIfPresent", "(Object,BiFunction)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util", "HexFormat", False, "delimiter", "()", "", "Argument[this].SyntheticField[java.util.HexFormat.delimiter]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.util", "HexFormat", False, "formatHex", "(Appendable,byte[])", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.util", "HexFormat", False, "formatHex", "(Appendable,byte[],int,int)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.util", "HexFormat", False, "formatHex", "(byte[])", "", "Argument[this].SyntheticField[java.util.HexFormat.delimiter]", "ReturnValue", "taint", "dfc-generated"]
+      - ["java.util", "HexFormat", False, "formatHex", "(byte[])", "", "Argument[this].SyntheticField[java.util.HexFormat.prefix]", "ReturnValue", "taint", "dfc-generated"]
+      - ["java.util", "HexFormat", False, "formatHex", "(byte[])", "", "Argument[this].SyntheticField[java.util.HexFormat.suffix]", "ReturnValue", "taint", "dfc-generated"]
+      - ["java.util", "HexFormat", False, "formatHex", "(byte[],int,int)", "", "Argument[this].SyntheticField[java.util.HexFormat.delimiter]", "ReturnValue", "taint", "dfc-generated"]
+      - ["java.util", "HexFormat", False, "formatHex", "(byte[],int,int)", "", "Argument[this].SyntheticField[java.util.HexFormat.prefix]", "ReturnValue", "taint", "dfc-generated"]
+      - ["java.util", "HexFormat", False, "formatHex", "(byte[],int,int)", "", "Argument[this].SyntheticField[java.util.HexFormat.suffix]", "ReturnValue", "taint", "dfc-generated"]
+      - ["java.util", "HexFormat", False, "ofDelimiter", "(String)", "", "Argument[0]", "ReturnValue.SyntheticField[java.util.HexFormat.delimiter]", "value", "dfc-generated"]
+      - ["java.util", "HexFormat", False, "prefix", "()", "", "Argument[this].SyntheticField[java.util.HexFormat.prefix]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.util", "HexFormat", False, "suffix", "()", "", "Argument[this].SyntheticField[java.util.HexFormat.suffix]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.util", "HexFormat", False, "toHexDigits", "(Appendable,byte)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.util", "HexFormat", False, "withDelimiter", "(String)", "", "Argument[0]", "ReturnValue.SyntheticField[java.util.HexFormat.delimiter]", "value", "dfc-generated"]
+      - ["java.util", "HexFormat", False, "withDelimiter", "(String)", "", "Argument[this].SyntheticField[java.util.HexFormat.prefix]", "ReturnValue.SyntheticField[java.util.HexFormat.prefix]", "value", "dfc-generated"]
+      - ["java.util", "HexFormat", False, "withDelimiter", "(String)", "", "Argument[this].SyntheticField[java.util.HexFormat.suffix]", "ReturnValue.SyntheticField[java.util.HexFormat.suffix]", "value", "dfc-generated"]
+      - ["java.util", "HexFormat", False, "withLowerCase", "()", "", "Argument[this].SyntheticField[java.util.HexFormat.delimiter]", "ReturnValue.SyntheticField[java.util.HexFormat.delimiter]", "value", "dfc-generated"]
+      - ["java.util", "HexFormat", False, "withLowerCase", "()", "", "Argument[this].SyntheticField[java.util.HexFormat.prefix]", "ReturnValue.SyntheticField[java.util.HexFormat.prefix]", "value", "dfc-generated"]
+      - ["java.util", "HexFormat", False, "withLowerCase", "()", "", "Argument[this].SyntheticField[java.util.HexFormat.suffix]", "ReturnValue.SyntheticField[java.util.HexFormat.suffix]", "value", "dfc-generated"]
+      - ["java.util", "HexFormat", False, "withPrefix", "(String)", "", "Argument[0]", "ReturnValue.SyntheticField[java.util.HexFormat.prefix]", "value", "dfc-generated"]
+      - ["java.util", "HexFormat", False, "withPrefix", "(String)", "", "Argument[this].SyntheticField[java.util.HexFormat.delimiter]", "ReturnValue.SyntheticField[java.util.HexFormat.delimiter]", "value", "dfc-generated"]
+      - ["java.util", "HexFormat", False, "withPrefix", "(String)", "", "Argument[this].SyntheticField[java.util.HexFormat.suffix]", "ReturnValue.SyntheticField[java.util.HexFormat.suffix]", "value", "dfc-generated"]
+      - ["java.util", "HexFormat", False, "withSuffix", "(String)", "", "Argument[0]", "ReturnValue.SyntheticField[java.util.HexFormat.suffix]", "value", "dfc-generated"]
+      - ["java.util", "HexFormat", False, "withSuffix", "(String)", "", "Argument[this].SyntheticField[java.util.HexFormat.delimiter]", "ReturnValue.SyntheticField[java.util.HexFormat.delimiter]", "value", "dfc-generated"]
+      - ["java.util", "HexFormat", False, "withSuffix", "(String)", "", "Argument[this].SyntheticField[java.util.HexFormat.prefix]", "ReturnValue.SyntheticField[java.util.HexFormat.prefix]", "value", "dfc-generated"]
+      - ["java.util", "HexFormat", False, "withUpperCase", "()", "", "Argument[this].SyntheticField[java.util.HexFormat.delimiter]", "ReturnValue.SyntheticField[java.util.HexFormat.delimiter]", "value", "dfc-generated"]
+      - ["java.util", "HexFormat", False, "withUpperCase", "()", "", "Argument[this].SyntheticField[java.util.HexFormat.prefix]", "ReturnValue.SyntheticField[java.util.HexFormat.prefix]", "value", "dfc-generated"]
+      - ["java.util", "HexFormat", False, "withUpperCase", "()", "", "Argument[this].SyntheticField[java.util.HexFormat.suffix]", "ReturnValue.SyntheticField[java.util.HexFormat.suffix]", "value", "dfc-generated"]
+      - ["java.util", "IllegalFormatFlagsException", True, "IllegalFormatFlagsException", "(String)", "", "Argument[0]", "Argument[this].SyntheticField[java.util.IllegalFormatFlagsException.flags]", "value", "dfc-generated"]
+      - ["java.util", "IllegalFormatFlagsException", True, "getFlags", "()", "", "Argument[this].SyntheticField[java.util.IllegalFormatFlagsException.flags]", "ReturnValue", "value", "dfc-generated"]
       - ["java.util", "IllformedLocaleException", True, "IllformedLocaleException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.util", "IllformedLocaleException", True, "IllformedLocaleException", "(String,int)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.util", "InputMismatchException", True, "InputMismatchException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.util", "InvalidPropertiesFormatException", True, "InvalidPropertiesFormatException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.util", "InvalidPropertiesFormatException", True, "InvalidPropertiesFormatException", "(Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.util", "Map", True, "compute", "(Object,BiFunction)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.util", "Map", True, "compute", "(Object,BiFunction)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.util", "Map", True, "computeIfPresent", "(Object,BiFunction)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.util", "Map", True, "computeIfPresent", "(Object,BiFunction)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.util", "MissingFormatArgumentException", True, "MissingFormatArgumentException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.util", "MissingFormatArgumentException", True, "getFormatSpecifier", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.util", "MissingFormatWidthException", True, "MissingFormatWidthException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.util", "MissingFormatWidthException", True, "getFormatSpecifier", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.util", "MissingResourceException", True, "MissingResourceException", "(String,String,String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.util", "MissingResourceException", True, "MissingResourceException", "(String,String,String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["java.util", "MissingResourceException", True, "MissingResourceException", "(String,String,String)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
-      - ["java.util", "MissingResourceException", True, "getClassName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.util", "MissingResourceException", True, "getKey", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util", "ListResourceBundle", True, "handleGetObject", "(String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util", "Map", True, "compute", "(Object,BiFunction)", "", "Argument[0]", "Argument[this].MapKey", "value", "dfc-generated"]
+      - ["java.util", "Map", True, "computeIfPresent", "(Object,BiFunction)", "", "Argument[0]", "Argument[this].MapKey", "value", "dfc-generated"]
+      - ["java.util", "MissingFormatArgumentException", True, "MissingFormatArgumentException", "(String)", "", "Argument[0]", "Argument[this].SyntheticField[java.util.MissingFormatArgumentException.s]", "value", "dfc-generated"]
+      - ["java.util", "MissingFormatArgumentException", True, "getFormatSpecifier", "()", "", "Argument[this].SyntheticField[java.util.MissingFormatArgumentException.s]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.util", "MissingFormatWidthException", True, "MissingFormatWidthException", "(String)", "", "Argument[0]", "Argument[this].SyntheticField[java.util.MissingFormatWidthException.s]", "value", "dfc-generated"]
+      - ["java.util", "MissingFormatWidthException", True, "getFormatSpecifier", "()", "", "Argument[this].SyntheticField[java.util.MissingFormatWidthException.s]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.util", "MissingResourceException", True, "MissingResourceException", "(String,String,String)", "", "Argument[1]", "Argument[this].SyntheticField[java.util.MissingResourceException.className]", "value", "dfc-generated"]
+      - ["java.util", "MissingResourceException", True, "MissingResourceException", "(String,String,String)", "", "Argument[2]", "Argument[this].SyntheticField[java.util.MissingResourceException.key]", "value", "dfc-generated"]
+      - ["java.util", "MissingResourceException", True, "getClassName", "()", "", "Argument[this].SyntheticField[java.util.MissingResourceException.className]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.util", "MissingResourceException", True, "getKey", "()", "", "Argument[this].SyntheticField[java.util.MissingResourceException.key]", "ReturnValue", "value", "dfc-generated"]
       - ["java.util", "NoSuchElementException", True, "NoSuchElementException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.util", "NoSuchElementException", True, "NoSuchElementException", "(String,Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.util", "NoSuchElementException", True, "NoSuchElementException", "(String,Throwable)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
       - ["java.util", "NoSuchElementException", True, "NoSuchElementException", "(Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.util", "Observable", True, "addObserver", "(Observer)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.util", "PriorityQueue", True, "PriorityQueue", "(Comparator)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.util", "PriorityQueue", True, "PriorityQueue", "(int,Comparator)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["java.util", "PriorityQueue", True, "comparator", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util", "PriorityQueue", True, "PriorityQueue", "(Comparator)", "", "Argument[0]", "Argument[this].SyntheticField[java.util.PriorityQueue.comparator]", "value", "dfc-generated"]
+      - ["java.util", "PriorityQueue", True, "PriorityQueue", "(int,Comparator)", "", "Argument[1]", "Argument[this].SyntheticField[java.util.PriorityQueue.comparator]", "value", "dfc-generated"]
+      - ["java.util", "PriorityQueue", True, "comparator", "()", "", "Argument[this].SyntheticField[java.util.PriorityQueue.comparator]", "ReturnValue", "value", "dfc-generated"]
       - ["java.util", "Properties", True, "Properties", "(Properties)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["java.util", "Properties", True, "list", "(PrintStream)", "", "Argument[this]", "Argument[0]", "taint", "df-generated"]
-      - ["java.util", "Properties", True, "list", "(PrintWriter)", "", "Argument[this]", "Argument[0]", "taint", "df-generated"]
       - ["java.util", "Properties", True, "propertyNames", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.util", "Properties", True, "store", "(Writer,String)", "", "Argument[1]", "Argument[0]", "taint", "df-generated"]
+      - ["java.util", "Properties", True, "store", "(Writer,String)", "", "Argument[1]", "Argument[0]", "taint", "dfc-generated"]
       - ["java.util", "Properties", True, "stringPropertyNames", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.util", "PropertyPermission", False, "PropertyPermission", "(String,String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util", "PropertyPermission", False, "PropertyPermission", "(String,String)", "", "Argument[0]", "Argument[this]", "taint", "dfc-generated"]
+      - ["java.util", "PropertyResourceBundle", True, "handleGetObject", "(String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.util", "ResourceBundle$Control", True, "getFormats", "(String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.util", "ResourceBundle$Control", True, "newBundle", "(String,Locale,String,ClassLoader,boolean)", "", "Argument[0]", "Argument[3]", "taint", "df-generated"]
-      - ["java.util", "ResourceBundle$Control", True, "newBundle", "(String,Locale,String,ClassLoader,boolean)", "", "Argument[1]", "Argument[3]", "taint", "df-generated"]
-      - ["java.util", "ResourceBundle$Control", True, "toBundleName", "(String,Locale)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["java.util", "ResourceBundle$Control", True, "toBundleName", "(String,Locale)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["java.util", "ResourceBundle$Control", True, "toResourceName", "(String,String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["java.util", "ResourceBundle$Control", True, "toResourceName", "(String,String)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util", "ResourceBundle$Control", True, "toBundleName", "(String,Locale)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.util", "ResourceBundle$Control", True, "toResourceName", "(String,String)", "", "Argument[0]", "ReturnValue", "taint", "dfc-generated"]
+      - ["java.util", "ResourceBundle$Control", True, "toResourceName", "(String,String)", "", "Argument[1]", "ReturnValue", "taint", "dfc-generated"]
       - ["java.util", "ResourceBundle", True, "getBaseBundleName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.util", "ResourceBundle", True, "getKeys", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.util", "ResourceBundle", True, "getLocale", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.util", "ResourceBundle", True, "getObject", "(String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["java.util", "ResourceBundle", True, "getObject", "(String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.util", "ResourceBundle", True, "getStringArray", "(String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["java.util", "ResourceBundle", True, "getStringArray", "(String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.util", "ResourceBundle", True, "handleGetObject", "(String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util", "ResourceBundle", True, "getObject", "(String)", "", "Argument[0]", "ReturnValue.ArrayElement", "value", "dfc-generated"]
+      - ["java.util", "ResourceBundle", True, "getStringArray", "(String)", "", "Argument[0]", "ReturnValue.ArrayElement", "value", "dfc-generated"]
       - ["java.util", "ResourceBundle", True, "keySet", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.util", "ServiceConfigurationError", True, "ServiceConfigurationError", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.util", "ServiceConfigurationError", True, "ServiceConfigurationError", "(String,Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.util", "ServiceConfigurationError", True, "ServiceConfigurationError", "(String,Throwable)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["java.util", "ServiceLoader", False, "findFirst", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util", "ServiceLoader", False, "findFirst", "()", "", "Argument[this].Element", "ReturnValue.Element", "value", "dfc-generated"]
       - ["java.util", "ServiceLoader", False, "load", "(Class,ClassLoader)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
       - ["java.util", "ServiceLoader", False, "load", "(ModuleLayer,Class)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["java.util", "ServiceLoader", False, "stream", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
@@ -155,6 +155,9 @@ extensions:
       - ["java.util", "SimpleTimeZone", True, "SimpleTimeZone", "(int,String,int,int,int,int,int,int,int,int)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
       - ["java.util", "SimpleTimeZone", True, "SimpleTimeZone", "(int,String,int,int,int,int,int,int,int,int,int)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
       - ["java.util", "SimpleTimeZone", True, "SimpleTimeZone", "(int,String,int,int,int,int,int,int,int,int,int,int,int)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util", "Spliterator$OfDouble", True, "trySplit", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util", "Spliterator$OfInt", True, "trySplit", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util", "Spliterator$OfLong", True, "trySplit", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.util", "Spliterator", True, "forEachRemaining", "(Consumer)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.util", "Spliterator", True, "forEachRemaining", "(Consumer)", "", "Argument[this]", "Argument[0]", "taint", "df-generated"]
       - ["java.util", "Spliterators", False, "spliterator", "(Collection,int)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
@@ -168,29 +171,54 @@ extensions:
       - ["java.util", "Spliterators", False, "spliteratorUnknownSize", "(PrimitiveIterator$OfDouble,int)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
       - ["java.util", "Spliterators", False, "spliteratorUnknownSize", "(PrimitiveIterator$OfInt,int)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
       - ["java.util", "Spliterators", False, "spliteratorUnknownSize", "(PrimitiveIterator$OfLong,int)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["java.util", "TimeZone", True, "getDisplayName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.util", "TimeZone", True, "getDisplayName", "(Locale)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["java.util", "TimeZone", True, "getDisplayName", "(Locale)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.util", "TimeZone", True, "getDisplayName", "(boolean,int)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.util", "TimeZone", True, "getDisplayName", "(boolean,int,Locale)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
-      - ["java.util", "TimeZone", True, "getDisplayName", "(boolean,int,Locale)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.util", "TimeZone", True, "getID", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util", "TimeZone", True, "getDisplayName", "()", "", "Argument[this].SyntheticField[java.util.TimeZone.ID]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.util", "TimeZone", True, "getDisplayName", "(Locale)", "", "Argument[this].SyntheticField[java.util.TimeZone.ID]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.util", "TimeZone", True, "getDisplayName", "(boolean,int)", "", "Argument[this].SyntheticField[java.util.TimeZone.ID]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.util", "TimeZone", True, "getDisplayName", "(boolean,int,Locale)", "", "Argument[this].SyntheticField[java.util.TimeZone.ID]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.util", "TimeZone", True, "getID", "()", "", "Argument[this].SyntheticField[java.util.TimeZone.ID]", "ReturnValue", "value", "dfc-generated"]
       - ["java.util", "TimeZone", True, "getTimeZone", "(ZoneId)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["java.util", "TimeZone", True, "setID", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util", "TimeZone", True, "setID", "(String)", "", "Argument[0]", "Argument[this].SyntheticField[java.util.TimeZone.ID]", "value", "dfc-generated"]
       - ["java.util", "TimeZone", True, "toZoneId", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.util", "Timer", True, "Timer", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.util", "Timer", True, "Timer", "(String,boolean)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.util", "TooManyListenersException", True, "TooManyListenersException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.util", "UnknownFormatConversionException", True, "UnknownFormatConversionException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.util", "UnknownFormatConversionException", True, "getConversion", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.util", "UnknownFormatFlagsException", True, "UnknownFormatFlagsException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.util", "UnknownFormatFlagsException", True, "getFlags", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util", "TreeMap", True, "ceilingKey", "(Object)", "", "Argument[this].SyntheticField[java.util.TreeMap.root].SyntheticField[java.util.TreeMap$Entry.key]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.util", "TreeMap", True, "comparator", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util", "TreeMap", True, "compute", "(Object,BiFunction)", "", "Argument[0]", "Argument[this].SyntheticField[java.util.TreeMap.root].SyntheticField[java.util.TreeMap$Entry.key]", "value", "dfc-generated"]
+      - ["java.util", "TreeMap", True, "computeIfPresent", "(Object,BiFunction)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util", "TreeMap", True, "descendingKeySet", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util", "TreeMap", True, "firstKey", "()", "", "Argument[this].SyntheticField[java.util.TreeMap.root].SyntheticField[java.util.TreeMap$Entry.key]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.util", "TreeMap", True, "floorKey", "(Object)", "", "Argument[this].SyntheticField[java.util.TreeMap.root].SyntheticField[java.util.TreeMap$Entry.key]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.util", "TreeMap", True, "higherKey", "(Object)", "", "Argument[this].SyntheticField[java.util.TreeMap.root].SyntheticField[java.util.TreeMap$Entry.key]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.util", "TreeMap", True, "lastKey", "()", "", "Argument[this].SyntheticField[java.util.TreeMap.root].SyntheticField[java.util.TreeMap$Entry.key]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.util", "TreeMap", True, "lowerKey", "(Object)", "", "Argument[this].SyntheticField[java.util.TreeMap.root].SyntheticField[java.util.TreeMap$Entry.key]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.util", "TreeMap", True, "navigableKeySet", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util", "TreeSet", True, "comparator", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util", "UnknownFormatConversionException", True, "UnknownFormatConversionException", "(String)", "", "Argument[0]", "Argument[this].SyntheticField[java.util.UnknownFormatConversionException.s]", "value", "dfc-generated"]
+      - ["java.util", "UnknownFormatConversionException", True, "getConversion", "()", "", "Argument[this].SyntheticField[java.util.UnknownFormatConversionException.s]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.util", "UnknownFormatFlagsException", True, "UnknownFormatFlagsException", "(String)", "", "Argument[0]", "Argument[this].SyntheticField[java.util.UnknownFormatFlagsException.flags]", "value", "dfc-generated"]
+      - ["java.util", "UnknownFormatFlagsException", True, "getFlags", "()", "", "Argument[this].SyntheticField[java.util.UnknownFormatFlagsException.flags]", "ReturnValue", "value", "dfc-generated"]
   - addsTo:
       pack: codeql/java-all
       extensible: neutralModel
     data:
+      - ["java.util", "AbstractCollection", "clear", "()", "summary", "df-generated"]
+      - ["java.util", "AbstractCollection", "removeAll", "(Collection)", "summary", "df-generated"]
+      - ["java.util", "AbstractCollection", "retainAll", "(Collection)", "summary", "df-generated"]
+      - ["java.util", "AbstractList", "lastIndexOf", "(Object)", "summary", "df-generated"]
+      - ["java.util", "AbstractMap", "containsValue", "(Object)", "summary", "df-generated"]
+      - ["java.util", "AbstractQueue", "clear", "()", "summary", "df-generated"]
       - ["java.util", "ArrayDeque", "ArrayDeque", "(int)", "summary", "df-generated"]
+      - ["java.util", "ArrayDeque", "clear", "()", "summary", "df-generated"]
+      - ["java.util", "ArrayDeque", "removeAll", "(Collection)", "summary", "df-generated"]
+      - ["java.util", "ArrayDeque", "removeFirstOccurrence", "(Object)", "summary", "df-generated"]
+      - ["java.util", "ArrayDeque", "removeLastOccurrence", "(Object)", "summary", "df-generated"]
+      - ["java.util", "ArrayDeque", "retainAll", "(Collection)", "summary", "df-generated"]
       - ["java.util", "ArrayList", "ensureCapacity", "(int)", "summary", "df-generated"]
+      - ["java.util", "ArrayList", "lastIndexOf", "(Object)", "summary", "df-generated"]
+      - ["java.util", "ArrayList", "removeAll", "(Collection)", "summary", "df-generated"]
+      - ["java.util", "ArrayList", "replaceAll", "(UnaryOperator)", "summary", "df-generated"]
+      - ["java.util", "ArrayList", "retainAll", "(Collection)", "summary", "df-generated"]
       - ["java.util", "ArrayList", "trimToSize", "()", "summary", "df-generated"]
       - ["java.util", "Arrays", "binarySearch", "(Object[],Object)", "summary", "df-generated"]
       - ["java.util", "Arrays", "binarySearch", "(Object[],Object,Comparator)", "summary", "df-generated"]
@@ -341,6 +369,14 @@ extensions:
       - ["java.util", "Arrays", "sort", "(long[],int,int)", "summary", "df-generated"]
       - ["java.util", "Arrays", "sort", "(short[])", "summary", "df-generated"]
       - ["java.util", "Arrays", "sort", "(short[],int,int)", "summary", "df-generated"]
+      - ["java.util", "Arrays", "toString", "(boolean[])", "summary", "df-generated"]
+      - ["java.util", "Arrays", "toString", "(byte[])", "summary", "df-generated"]
+      - ["java.util", "Arrays", "toString", "(char[])", "summary", "df-generated"]
+      - ["java.util", "Arrays", "toString", "(double[])", "summary", "df-generated"]
+      - ["java.util", "Arrays", "toString", "(float[])", "summary", "df-generated"]
+      - ["java.util", "Arrays", "toString", "(int[])", "summary", "df-generated"]
+      - ["java.util", "Arrays", "toString", "(long[])", "summary", "df-generated"]
+      - ["java.util", "Arrays", "toString", "(short[])", "summary", "df-generated"]
       - ["java.util", "Base64$Decoder", "decode", "(byte[],byte[])", "summary", "df-generated"]
       - ["java.util", "Base64$Encoder", "encode", "(byte[],byte[])", "summary", "df-generated"]
       - ["java.util", "Base64", "getDecoder", "()", "summary", "df-generated"]
@@ -381,7 +417,6 @@ extensions:
       - ["java.util", "BitSet", "valueOf", "(byte[])", "summary", "df-generated"]
       - ["java.util", "BitSet", "valueOf", "(long[])", "summary", "df-generated"]
       - ["java.util", "BitSet", "xor", "(BitSet)", "summary", "df-generated"]
-      - ["java.util", "Calendar", "add", "(int,int)", "summary", "df-generated"]
       - ["java.util", "Calendar", "after", "(Object)", "summary", "df-generated"]
       - ["java.util", "Calendar", "before", "(Object)", "summary", "df-generated"]
       - ["java.util", "Calendar", "clear", "()", "summary", "df-generated"]
@@ -391,6 +426,7 @@ extensions:
       - ["java.util", "Calendar", "getAvailableCalendarTypes", "()", "summary", "df-generated"]
       - ["java.util", "Calendar", "getAvailableLocales", "()", "summary", "df-generated"]
       - ["java.util", "Calendar", "getCalendarType", "()", "summary", "df-generated"]
+      - ["java.util", "Calendar", "getDisplayName", "(int,int,Locale)", "summary", "df-generated"]
       - ["java.util", "Calendar", "getDisplayNames", "(int,int,Locale)", "summary", "df-generated"]
       - ["java.util", "Calendar", "getFirstDayOfWeek", "()", "summary", "df-generated"]
       - ["java.util", "Calendar", "getGreatestMinimum", "(int)", "summary", "df-generated"]
@@ -429,18 +465,13 @@ extensions:
       - ["java.util", "Collections", "indexOfSubList", "(List,List)", "summary", "df-generated"]
       - ["java.util", "Collections", "lastIndexOfSubList", "(List,List)", "summary", "df-generated"]
       - ["java.util", "Collections", "reverse", "(List)", "summary", "df-generated"]
-      - ["java.util", "Collections", "reverseOrder", "()", "summary", "df-generated"]
       - ["java.util", "Collections", "rotate", "(List,int)", "summary", "df-generated"]
       - ["java.util", "Collections", "shuffle", "(List)", "summary", "df-generated"]
       - ["java.util", "Collections", "shuffle", "(List,Random)", "summary", "df-generated"]
       - ["java.util", "Collections", "swap", "(List,int,int)", "summary", "df-generated"]
-      - ["java.util", "Comparator", "comparing", "(Function)", "summary", "df-generated"]
-      - ["java.util", "Comparator", "comparing", "(Function,Comparator)", "summary", "df-generated"]
-      - ["java.util", "Comparator", "comparingDouble", "(ToDoubleFunction)", "summary", "df-generated"]
-      - ["java.util", "Comparator", "comparingInt", "(ToIntFunction)", "summary", "df-generated"]
-      - ["java.util", "Comparator", "comparingLong", "(ToLongFunction)", "summary", "df-generated"]
       - ["java.util", "Comparator", "naturalOrder", "()", "summary", "df-generated"]
       - ["java.util", "Comparator", "reverseOrder", "()", "summary", "df-generated"]
+      - ["java.util", "Comparator", "reversed", "()", "summary", "df-generated"]
       - ["java.util", "Comparator", "thenComparing", "(Comparator)", "summary", "df-generated"]
       - ["java.util", "Comparator", "thenComparing", "(Function)", "summary", "df-generated"]
       - ["java.util", "Comparator", "thenComparing", "(Function,Comparator)", "summary", "df-generated"]
@@ -449,6 +480,7 @@ extensions:
       - ["java.util", "Comparator", "thenComparingLong", "(ToLongFunction)", "summary", "df-generated"]
       - ["java.util", "Currency", "getAvailableCurrencies", "()", "summary", "df-generated"]
       - ["java.util", "Currency", "getDefaultFractionDigits", "()", "summary", "df-generated"]
+      - ["java.util", "Currency", "getInstance", "(Locale)", "summary", "df-generated"]
       - ["java.util", "Currency", "getNumericCode", "()", "summary", "df-generated"]
       - ["java.util", "Currency", "getNumericCodeAsString", "()", "summary", "df-generated"]
       - ["java.util", "Date", "Date", "(String)", "summary", "df-generated"]
@@ -475,11 +507,11 @@ extensions:
       - ["java.util", "Date", "setTime", "(long)", "summary", "df-generated"]
       - ["java.util", "Date", "setYear", "(int)", "summary", "df-generated"]
       - ["java.util", "Date", "toGMTString", "()", "summary", "df-generated"]
-      - ["java.util", "Date", "toInstant", "()", "summary", "df-generated"]
       - ["java.util", "Date", "toLocaleString", "()", "summary", "df-generated"]
       - ["java.util", "Dictionary", "isEmpty", "()", "summary", "df-generated"]
       - ["java.util", "Dictionary", "size", "()", "summary", "df-generated"]
       - ["java.util", "DoubleSummaryStatistics", "DoubleSummaryStatistics", "(long,double,double,double)", "summary", "df-generated"]
+      - ["java.util", "DoubleSummaryStatistics", "accept", "(double)", "summary", "df-generated"]
       - ["java.util", "DoubleSummaryStatistics", "combine", "(DoubleSummaryStatistics)", "summary", "df-generated"]
       - ["java.util", "DoubleSummaryStatistics", "getAverage", "()", "summary", "df-generated"]
       - ["java.util", "DoubleSummaryStatistics", "getCount", "()", "summary", "df-generated"]
@@ -487,6 +519,7 @@ extensions:
       - ["java.util", "DoubleSummaryStatistics", "getMin", "()", "summary", "df-generated"]
       - ["java.util", "DoubleSummaryStatistics", "getSum", "()", "summary", "df-generated"]
       - ["java.util", "EnumMap", "EnumMap", "(Class)", "summary", "df-generated"]
+      - ["java.util", "EnumMap", "containsValue", "(Object)", "summary", "df-generated"]
       - ["java.util", "EnumSet", "range", "(Enum,Enum)", "summary", "df-generated"]
       - ["java.util", "FormatFlagsConversionMismatchException", "getConversion", "()", "summary", "df-generated"]
       - ["java.util", "Formatter", "Formatter", "(File)", "summary", "df-generated"]
@@ -495,18 +528,39 @@ extensions:
       - ["java.util", "Formatter", "Formatter", "(OutputStream,String)", "summary", "df-generated"]
       - ["java.util", "Formatter", "Formatter", "(String)", "summary", "df-generated"]
       - ["java.util", "Formatter", "Formatter", "(String,String)", "summary", "df-generated"]
+      - ["java.util", "Formatter", "flush", "()", "summary", "df-generated"]
       - ["java.util", "GregorianCalendar", "GregorianCalendar", "(Locale)", "summary", "df-generated"]
       - ["java.util", "GregorianCalendar", "GregorianCalendar", "(int,int,int)", "summary", "df-generated"]
       - ["java.util", "GregorianCalendar", "GregorianCalendar", "(int,int,int,int,int)", "summary", "df-generated"]
       - ["java.util", "GregorianCalendar", "GregorianCalendar", "(int,int,int,int,int,int)", "summary", "df-generated"]
+      - ["java.util", "GregorianCalendar", "getActualMaximum", "(int)", "summary", "df-generated"]
+      - ["java.util", "GregorianCalendar", "getActualMinimum", "(int)", "summary", "df-generated"]
+      - ["java.util", "GregorianCalendar", "getCalendarType", "()", "summary", "df-generated"]
+      - ["java.util", "GregorianCalendar", "getGreatestMinimum", "(int)", "summary", "df-generated"]
       - ["java.util", "GregorianCalendar", "getGregorianChange", "()", "summary", "df-generated"]
+      - ["java.util", "GregorianCalendar", "getLeastMaximum", "(int)", "summary", "df-generated"]
+      - ["java.util", "GregorianCalendar", "getMaximum", "(int)", "summary", "df-generated"]
+      - ["java.util", "GregorianCalendar", "getMinimum", "(int)", "summary", "df-generated"]
+      - ["java.util", "GregorianCalendar", "getWeekYear", "()", "summary", "df-generated"]
+      - ["java.util", "GregorianCalendar", "getWeeksInWeekYear", "()", "summary", "df-generated"]
       - ["java.util", "GregorianCalendar", "isLeapYear", "(int)", "summary", "df-generated"]
+      - ["java.util", "GregorianCalendar", "isWeekDateSupported", "()", "summary", "df-generated"]
+      - ["java.util", "GregorianCalendar", "roll", "(int,boolean)", "summary", "df-generated"]
+      - ["java.util", "GregorianCalendar", "roll", "(int,int)", "summary", "df-generated"]
       - ["java.util", "GregorianCalendar", "setGregorianChange", "(Date)", "summary", "df-generated"]
+      - ["java.util", "GregorianCalendar", "setWeekDate", "(int,int,int)", "summary", "df-generated"]
+      - ["java.util", "GregorianCalendar", "toZonedDateTime", "()", "summary", "df-generated"]
       - ["java.util", "HashMap", "HashMap", "(int,float)", "summary", "df-generated"]
+      - ["java.util", "HashMap", "containsValue", "(Object)", "summary", "df-generated"]
+      - ["java.util", "HashMap", "remove", "(Object,Object)", "summary", "df-generated"]
+      - ["java.util", "HashMap", "replaceAll", "(BiFunction)", "summary", "df-generated"]
       - ["java.util", "HashSet", "HashSet", "(int,float)", "summary", "df-generated"]
       - ["java.util", "Hashtable", "Hashtable", "(int)", "summary", "df-generated"]
       - ["java.util", "Hashtable", "Hashtable", "(int,float)", "summary", "df-generated"]
       - ["java.util", "Hashtable", "contains", "(Object)", "summary", "df-generated"]
+      - ["java.util", "Hashtable", "containsValue", "(Object)", "summary", "df-generated"]
+      - ["java.util", "Hashtable", "remove", "(Object,Object)", "summary", "df-generated"]
+      - ["java.util", "Hashtable", "replaceAll", "(BiFunction)", "summary", "df-generated"]
       - ["java.util", "HexFormat", "fromHexDigit", "(int)", "summary", "df-generated"]
       - ["java.util", "HexFormat", "fromHexDigits", "(CharSequence)", "summary", "df-generated"]
       - ["java.util", "HexFormat", "fromHexDigits", "(CharSequence,int,int)", "summary", "df-generated"]
@@ -527,6 +581,8 @@ extensions:
       - ["java.util", "HexFormat", "toHighHexDigit", "(int)", "summary", "df-generated"]
       - ["java.util", "HexFormat", "toLowHexDigit", "(int)", "summary", "df-generated"]
       - ["java.util", "IdentityHashMap", "IdentityHashMap", "(int)", "summary", "df-generated"]
+      - ["java.util", "IdentityHashMap", "containsValue", "(Object)", "summary", "df-generated"]
+      - ["java.util", "IdentityHashMap", "replaceAll", "(BiFunction)", "summary", "df-generated"]
       - ["java.util", "IllegalFormatCodePointException", "IllegalFormatCodePointException", "(int)", "summary", "df-generated"]
       - ["java.util", "IllegalFormatCodePointException", "getCodePoint", "()", "summary", "df-generated"]
       - ["java.util", "IllegalFormatConversionException", "IllegalFormatConversionException", "(char,Class)", "summary", "df-generated"]
@@ -538,6 +594,7 @@ extensions:
       - ["java.util", "IllegalFormatWidthException", "getWidth", "()", "summary", "df-generated"]
       - ["java.util", "IllformedLocaleException", "getErrorIndex", "()", "summary", "df-generated"]
       - ["java.util", "IntSummaryStatistics", "IntSummaryStatistics", "(long,int,int,long)", "summary", "df-generated"]
+      - ["java.util", "IntSummaryStatistics", "accept", "(int)", "summary", "df-generated"]
       - ["java.util", "IntSummaryStatistics", "combine", "(IntSummaryStatistics)", "summary", "df-generated"]
       - ["java.util", "IntSummaryStatistics", "getAverage", "()", "summary", "df-generated"]
       - ["java.util", "IntSummaryStatistics", "getCount", "()", "summary", "df-generated"]
@@ -547,10 +604,14 @@ extensions:
       - ["java.util", "LinkedHashMap", "LinkedHashMap", "(int)", "summary", "df-generated"]
       - ["java.util", "LinkedHashMap", "LinkedHashMap", "(int,float)", "summary", "df-generated"]
       - ["java.util", "LinkedHashMap", "LinkedHashMap", "(int,float,boolean)", "summary", "df-generated"]
+      - ["java.util", "LinkedHashMap", "containsValue", "(Object)", "summary", "df-generated"]
+      - ["java.util", "LinkedHashMap", "replaceAll", "(BiFunction)", "summary", "df-generated"]
       - ["java.util", "LinkedHashSet", "LinkedHashSet", "(int)", "summary", "df-generated"]
       - ["java.util", "LinkedHashSet", "LinkedHashSet", "(int,float)", "summary", "df-generated"]
+      - ["java.util", "LinkedList", "lastIndexOf", "(Object)", "summary", "df-generated"]
+      - ["java.util", "LinkedList", "removeFirstOccurrence", "(Object)", "summary", "df-generated"]
+      - ["java.util", "LinkedList", "removeLastOccurrence", "(Object)", "summary", "df-generated"]
       - ["java.util", "List", "replaceAll", "(UnaryOperator)", "summary", "df-generated"]
-      - ["java.util", "ListResourceBundle", "getContents", "()", "summary", "df-generated"]
       - ["java.util", "Locale$LanguageRange", "getWeight", "()", "summary", "df-generated"]
       - ["java.util", "Locale", "filter", "(List,Collection)", "summary", "df-generated"]
       - ["java.util", "Locale", "filter", "(List,Collection,Locale$FilteringMode)", "summary", "df-generated"]
@@ -570,6 +631,8 @@ extensions:
       - ["java.util", "Locale", "setDefault", "(Locale$Category,Locale)", "summary", "df-generated"]
       - ["java.util", "Locale", "setDefault", "(Locale)", "summary", "df-generated"]
       - ["java.util", "LongSummaryStatistics", "LongSummaryStatistics", "(long,long,long,long)", "summary", "df-generated"]
+      - ["java.util", "LongSummaryStatistics", "accept", "(int)", "summary", "df-generated"]
+      - ["java.util", "LongSummaryStatistics", "accept", "(long)", "summary", "df-generated"]
       - ["java.util", "LongSummaryStatistics", "combine", "(LongSummaryStatistics)", "summary", "df-generated"]
       - ["java.util", "LongSummaryStatistics", "getAverage", "()", "summary", "df-generated"]
       - ["java.util", "LongSummaryStatistics", "getCount", "()", "summary", "df-generated"]
@@ -632,22 +695,42 @@ extensions:
       - ["java.util", "OptionalLong", "orElseThrow", "()", "summary", "df-generated"]
       - ["java.util", "OptionalLong", "orElseThrow", "(Supplier)", "summary", "df-generated"]
       - ["java.util", "OptionalLong", "stream", "()", "summary", "df-generated"]
-      - ["java.util", "PrimitiveIterator$OfDouble", "nextDouble", "()", "summary", "df-generated"]
-      - ["java.util", "PrimitiveIterator$OfInt", "nextInt", "()", "summary", "df-generated"]
-      - ["java.util", "PrimitiveIterator$OfLong", "nextLong", "()", "summary", "df-generated"]
+      - ["java.util", "PrimitiveIterator$OfDouble", "forEachRemaining", "(DoubleConsumer)", "summary", "df-generated"]
+      - ["java.util", "PrimitiveIterator$OfInt", "forEachRemaining", "(IntConsumer)", "summary", "df-generated"]
+      - ["java.util", "PrimitiveIterator$OfLong", "forEachRemaining", "(LongConsumer)", "summary", "df-generated"]
       - ["java.util", "PriorityQueue", "PriorityQueue", "(int)", "summary", "df-generated"]
+      - ["java.util", "PriorityQueue", "clear", "()", "summary", "df-generated"]
+      - ["java.util", "PriorityQueue", "removeAll", "(Collection)", "summary", "df-generated"]
+      - ["java.util", "PriorityQueue", "retainAll", "(Collection)", "summary", "df-generated"]
       - ["java.util", "Properties", "Properties", "(int)", "summary", "df-generated"]
+      - ["java.util", "Properties", "compute", "(Object,BiFunction)", "summary", "df-generated"]
+      - ["java.util", "Properties", "computeIfPresent", "(Object,BiFunction)", "summary", "df-generated"]
+      - ["java.util", "Properties", "contains", "(Object)", "summary", "df-generated"]
+      - ["java.util", "Properties", "containsValue", "(Object)", "summary", "df-generated"]
+      - ["java.util", "Properties", "list", "(PrintStream)", "summary", "df-generated"]
+      - ["java.util", "Properties", "list", "(PrintWriter)", "summary", "df-generated"]
       - ["java.util", "Properties", "load", "(InputStream)", "summary", "df-generated"]
       - ["java.util", "Properties", "load", "(Reader)", "summary", "df-generated"]
       - ["java.util", "Properties", "loadFromXML", "(InputStream)", "summary", "df-generated"]
+      - ["java.util", "Properties", "remove", "(Object,Object)", "summary", "df-generated"]
+      - ["java.util", "Properties", "replaceAll", "(BiFunction)", "summary", "df-generated"]
       - ["java.util", "Properties", "save", "(OutputStream,String)", "summary", "df-generated"]
       - ["java.util", "Properties", "store", "(OutputStream,String)", "summary", "df-generated"]
       - ["java.util", "Properties", "storeToXML", "(OutputStream,String)", "summary", "df-generated"]
       - ["java.util", "Properties", "storeToXML", "(OutputStream,String,Charset)", "summary", "df-generated"]
       - ["java.util", "Properties", "storeToXML", "(OutputStream,String,String)", "summary", "df-generated"]
+      - ["java.util", "PropertyPermission", "implies", "(Permission)", "summary", "df-generated"]
+      - ["java.util", "PropertyPermission", "newPermissionCollection", "()", "summary", "df-generated"]
       - ["java.util", "PropertyResourceBundle", "PropertyResourceBundle", "(InputStream)", "summary", "df-generated"]
       - ["java.util", "PropertyResourceBundle", "PropertyResourceBundle", "(Reader)", "summary", "df-generated"]
       - ["java.util", "Random", "Random", "(long)", "summary", "df-generated"]
+      - ["java.util", "Random", "nextBoolean", "()", "summary", "df-generated"]
+      - ["java.util", "Random", "nextBytes", "(byte[])", "summary", "df-generated"]
+      - ["java.util", "Random", "nextDouble", "()", "summary", "df-generated"]
+      - ["java.util", "Random", "nextFloat", "()", "summary", "df-generated"]
+      - ["java.util", "Random", "nextGaussian", "()", "summary", "df-generated"]
+      - ["java.util", "Random", "nextInt", "()", "summary", "df-generated"]
+      - ["java.util", "Random", "nextLong", "()", "summary", "df-generated"]
       - ["java.util", "Random", "setSeed", "(long)", "summary", "df-generated"]
       - ["java.util", "ResourceBundle$Control", "getCandidateLocales", "(String,Locale)", "summary", "df-generated"]
       - ["java.util", "ResourceBundle$Control", "getControl", "(List)", "summary", "df-generated"]
@@ -655,6 +738,7 @@ extensions:
       - ["java.util", "ResourceBundle$Control", "getNoFallbackControl", "(List)", "summary", "df-generated"]
       - ["java.util", "ResourceBundle$Control", "getTimeToLive", "(String,Locale)", "summary", "df-generated"]
       - ["java.util", "ResourceBundle$Control", "needsReload", "(String,Locale,String,ClassLoader,ResourceBundle,long)", "summary", "df-generated"]
+      - ["java.util", "ResourceBundle$Control", "newBundle", "(String,Locale,String,ClassLoader,boolean)", "summary", "df-generated"]
       - ["java.util", "ResourceBundle", "clearCache", "()", "summary", "df-generated"]
       - ["java.util", "ResourceBundle", "clearCache", "(ClassLoader)", "summary", "df-generated"]
       - ["java.util", "ResourceBundle", "containsKey", "(String)", "summary", "df-generated"]
@@ -679,18 +763,45 @@ extensions:
       - ["java.util", "ServiceLoader", "loadInstalled", "(Class)", "summary", "df-generated"]
       - ["java.util", "ServiceLoader", "reload", "()", "summary", "df-generated"]
       - ["java.util", "Set", "of", "()", "summary", "df-generated"]
+      - ["java.util", "SimpleTimeZone", "getDSTSavings", "()", "summary", "df-generated"]
+      - ["java.util", "SimpleTimeZone", "getOffset", "(int,int,int,int,int,int)", "summary", "df-generated"]
+      - ["java.util", "SimpleTimeZone", "getOffset", "(long)", "summary", "df-generated"]
+      - ["java.util", "SimpleTimeZone", "getRawOffset", "()", "summary", "df-generated"]
+      - ["java.util", "SimpleTimeZone", "hasSameRules", "(TimeZone)", "summary", "df-generated"]
+      - ["java.util", "SimpleTimeZone", "inDaylightTime", "(Date)", "summary", "df-generated"]
+      - ["java.util", "SimpleTimeZone", "observesDaylightTime", "()", "summary", "df-generated"]
       - ["java.util", "SimpleTimeZone", "setDSTSavings", "(int)", "summary", "df-generated"]
       - ["java.util", "SimpleTimeZone", "setEndRule", "(int,int,int)", "summary", "df-generated"]
       - ["java.util", "SimpleTimeZone", "setEndRule", "(int,int,int,int)", "summary", "df-generated"]
       - ["java.util", "SimpleTimeZone", "setEndRule", "(int,int,int,int,boolean)", "summary", "df-generated"]
+      - ["java.util", "SimpleTimeZone", "setRawOffset", "(int)", "summary", "df-generated"]
       - ["java.util", "SimpleTimeZone", "setStartRule", "(int,int,int)", "summary", "df-generated"]
       - ["java.util", "SimpleTimeZone", "setStartRule", "(int,int,int,int)", "summary", "df-generated"]
       - ["java.util", "SimpleTimeZone", "setStartRule", "(int,int,int,int,boolean)", "summary", "df-generated"]
       - ["java.util", "SimpleTimeZone", "setStartYear", "(int)", "summary", "df-generated"]
+      - ["java.util", "SimpleTimeZone", "useDaylightTime", "()", "summary", "df-generated"]
+      - ["java.util", "Spliterator$OfDouble", "forEachRemaining", "(Consumer)", "summary", "df-generated"]
+      - ["java.util", "Spliterator$OfDouble", "forEachRemaining", "(DoubleConsumer)", "summary", "df-generated"]
+      - ["java.util", "Spliterator$OfDouble", "tryAdvance", "(Consumer)", "summary", "df-generated"]
+      - ["java.util", "Spliterator$OfInt", "forEachRemaining", "(Consumer)", "summary", "df-generated"]
+      - ["java.util", "Spliterator$OfInt", "forEachRemaining", "(IntConsumer)", "summary", "df-generated"]
+      - ["java.util", "Spliterator$OfInt", "tryAdvance", "(Consumer)", "summary", "df-generated"]
+      - ["java.util", "Spliterator$OfLong", "forEachRemaining", "(Consumer)", "summary", "df-generated"]
+      - ["java.util", "Spliterator$OfLong", "forEachRemaining", "(LongConsumer)", "summary", "df-generated"]
+      - ["java.util", "Spliterator$OfLong", "tryAdvance", "(Consumer)", "summary", "df-generated"]
       - ["java.util", "Spliterator$OfPrimitive", "forEachRemaining", "(Object)", "summary", "df-generated"]
       - ["java.util", "Spliterator", "getComparator", "()", "summary", "df-generated"]
       - ["java.util", "Spliterator", "getExactSizeIfKnown", "()", "summary", "df-generated"]
       - ["java.util", "Spliterator", "hasCharacteristics", "(int)", "summary", "df-generated"]
+      - ["java.util", "Spliterators$AbstractDoubleSpliterator", "characteristics", "()", "summary", "df-generated"]
+      - ["java.util", "Spliterators$AbstractDoubleSpliterator", "estimateSize", "()", "summary", "df-generated"]
+      - ["java.util", "Spliterators$AbstractIntSpliterator", "characteristics", "()", "summary", "df-generated"]
+      - ["java.util", "Spliterators$AbstractIntSpliterator", "estimateSize", "()", "summary", "df-generated"]
+      - ["java.util", "Spliterators$AbstractLongSpliterator", "characteristics", "()", "summary", "df-generated"]
+      - ["java.util", "Spliterators$AbstractLongSpliterator", "estimateSize", "()", "summary", "df-generated"]
+      - ["java.util", "Spliterators$AbstractSpliterator", "characteristics", "()", "summary", "df-generated"]
+      - ["java.util", "Spliterators$AbstractSpliterator", "estimateSize", "()", "summary", "df-generated"]
+      - ["java.util", "Spliterators$AbstractSpliterator", "trySplit", "()", "summary", "df-generated"]
       - ["java.util", "Spliterators", "emptyDoubleSpliterator", "()", "summary", "df-generated"]
       - ["java.util", "Spliterators", "emptyIntSpliterator", "()", "summary", "df-generated"]
       - ["java.util", "Spliterators", "emptyLongSpliterator", "()", "summary", "df-generated"]
@@ -706,6 +817,11 @@ extensions:
       - ["java.util", "Spliterators", "spliterator", "(long[],int)", "summary", "df-generated"]
       - ["java.util", "Spliterators", "spliterator", "(long[],int,int,int)", "summary", "df-generated"]
       - ["java.util", "SplittableRandom", "SplittableRandom", "(long)", "summary", "df-generated"]
+      - ["java.util", "SplittableRandom", "nextBytes", "(byte[])", "summary", "df-generated"]
+      - ["java.util", "SplittableRandom", "nextInt", "()", "summary", "df-generated"]
+      - ["java.util", "SplittableRandom", "nextLong", "()", "summary", "df-generated"]
+      - ["java.util", "SplittableRandom", "split", "()", "summary", "df-generated"]
+      - ["java.util", "SplittableRandom", "split", "(RandomGenerator$SplittableGenerator)", "summary", "df-generated"]
       - ["java.util", "Stack", "empty", "()", "summary", "df-generated"]
       - ["java.util", "Stack", "search", "(Object)", "summary", "df-generated"]
       - ["java.util", "StringJoiner", "length", "()", "summary", "df-generated"]
@@ -734,7 +850,10 @@ extensions:
       - ["java.util", "Timer", "scheduleAtFixedRate", "(TimerTask,Date,long)", "summary", "df-generated"]
       - ["java.util", "Timer", "scheduleAtFixedRate", "(TimerTask,long,long)", "summary", "df-generated"]
       - ["java.util", "TimerTask", "cancel", "()", "summary", "df-generated"]
+      - ["java.util", "TimerTask", "run", "()", "summary", "df-generated"]
       - ["java.util", "TimerTask", "scheduledExecutionTime", "()", "summary", "df-generated"]
+      - ["java.util", "TreeMap", "containsValue", "(Object)", "summary", "df-generated"]
+      - ["java.util", "TreeMap", "replaceAll", "(BiFunction)", "summary", "df-generated"]
       - ["java.util", "UUID", "UUID", "(long,long)", "summary", "df-generated"]
       - ["java.util", "UUID", "clockSequence", "()", "summary", "df-generated"]
       - ["java.util", "UUID", "getLeastSignificantBits", "()", "summary", "df-generated"]
@@ -749,11 +868,17 @@ extensions:
       - ["java.util", "Vector", "capacity", "()", "summary", "df-generated"]
       - ["java.util", "Vector", "ensureCapacity", "(int)", "summary", "df-generated"]
       - ["java.util", "Vector", "indexOf", "(Object,int)", "summary", "df-generated"]
+      - ["java.util", "Vector", "lastIndexOf", "(Object)", "summary", "df-generated"]
       - ["java.util", "Vector", "lastIndexOf", "(Object,int)", "summary", "df-generated"]
+      - ["java.util", "Vector", "removeAll", "(Collection)", "summary", "df-generated"]
       - ["java.util", "Vector", "removeAllElements", "()", "summary", "df-generated"]
       - ["java.util", "Vector", "removeElement", "(Object)", "summary", "df-generated"]
       - ["java.util", "Vector", "removeElementAt", "(int)", "summary", "df-generated"]
+      - ["java.util", "Vector", "replaceAll", "(UnaryOperator)", "summary", "df-generated"]
+      - ["java.util", "Vector", "retainAll", "(Collection)", "summary", "df-generated"]
       - ["java.util", "Vector", "setSize", "(int)", "summary", "df-generated"]
       - ["java.util", "Vector", "trimToSize", "()", "summary", "df-generated"]
       - ["java.util", "WeakHashMap", "WeakHashMap", "(int)", "summary", "df-generated"]
       - ["java.util", "WeakHashMap", "WeakHashMap", "(int,float)", "summary", "df-generated"]
+      - ["java.util", "WeakHashMap", "containsValue", "(Object)", "summary", "df-generated"]
+      - ["java.util", "WeakHashMap", "replaceAll", "(BiFunction)", "summary", "df-generated"]
diff --git a/java/ql/lib/ext/generated/java.util.prefs.model.yml b/java/ql/lib/ext/generated/java.util.prefs.model.yml
index e87f3c13a9a..e5d72fcd364 100644
--- a/java/ql/lib/ext/generated/java.util.prefs.model.yml
+++ b/java/ql/lib/ext/generated/java.util.prefs.model.yml
@@ -4,27 +4,28 @@ extensions:
       pack: codeql/java-all
       extensible: summaryModel
     data:
+      - ["java.util.prefs", "AbstractPreferences", True, "keys", "()", "", "Argument[this].SyntheticField[java.util.prefs.FileSystemPreferences.prefsCache].MapKey", "ReturnValue.ArrayElement", "value", "dfc-generated"]
+      - ["java.util.prefs", "AbstractPreferences", True, "putLong", "(String,long)", "", "Argument[0]", "Argument[this].SyntheticField[java.util.prefs.FileSystemPreferences.prefsCache].MapKey", "value", "dfc-generated"]
       - ["java.util.prefs", "BackingStoreException", True, "BackingStoreException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.util.prefs", "BackingStoreException", True, "BackingStoreException", "(Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.util.prefs", "InvalidPreferencesFormatException", True, "InvalidPreferencesFormatException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.util.prefs", "InvalidPreferencesFormatException", True, "InvalidPreferencesFormatException", "(String,Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.util.prefs", "InvalidPreferencesFormatException", True, "InvalidPreferencesFormatException", "(String,Throwable)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
       - ["java.util.prefs", "InvalidPreferencesFormatException", True, "InvalidPreferencesFormatException", "(Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.util.prefs", "NodeChangeEvent", True, "NodeChangeEvent", "(Preferences,Preferences)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.util.prefs", "NodeChangeEvent", True, "NodeChangeEvent", "(Preferences,Preferences)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["java.util.prefs", "NodeChangeEvent", True, "getChild", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.util.prefs", "NodeChangeEvent", True, "getParent", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.util.prefs", "PreferenceChangeEvent", True, "PreferenceChangeEvent", "(Preferences,String,String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.util.prefs", "PreferenceChangeEvent", True, "PreferenceChangeEvent", "(Preferences,String,String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["java.util.prefs", "PreferenceChangeEvent", True, "PreferenceChangeEvent", "(Preferences,String,String)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
-      - ["java.util.prefs", "PreferenceChangeEvent", True, "getKey", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.util.prefs", "PreferenceChangeEvent", True, "getNewValue", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.util.prefs", "PreferenceChangeEvent", True, "getNode", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.prefs", "NodeChangeEvent", True, "NodeChangeEvent", "(Preferences,Preferences)", "", "Argument[0]", "Argument[this].SyntheticField[java.util.EventObject.source]", "value", "dfc-generated"]
+      - ["java.util.prefs", "NodeChangeEvent", True, "NodeChangeEvent", "(Preferences,Preferences)", "", "Argument[1]", "Argument[this].SyntheticField[java.util.prefs.NodeChangeEvent.child]", "value", "dfc-generated"]
+      - ["java.util.prefs", "NodeChangeEvent", True, "getChild", "()", "", "Argument[this].SyntheticField[java.util.prefs.NodeChangeEvent.child]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.util.prefs", "NodeChangeEvent", True, "getParent", "()", "", "Argument[this].SyntheticField[java.util.EventObject.source]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.util.prefs", "PreferenceChangeEvent", True, "PreferenceChangeEvent", "(Preferences,String,String)", "", "Argument[0]", "Argument[this].SyntheticField[java.util.EventObject.source]", "value", "dfc-generated"]
+      - ["java.util.prefs", "PreferenceChangeEvent", True, "PreferenceChangeEvent", "(Preferences,String,String)", "", "Argument[1]", "Argument[this].SyntheticField[java.util.prefs.PreferenceChangeEvent.key]", "value", "dfc-generated"]
+      - ["java.util.prefs", "PreferenceChangeEvent", True, "PreferenceChangeEvent", "(Preferences,String,String)", "", "Argument[2]", "Argument[this].SyntheticField[java.util.prefs.PreferenceChangeEvent.newValue]", "value", "dfc-generated"]
+      - ["java.util.prefs", "PreferenceChangeEvent", True, "getKey", "()", "", "Argument[this].SyntheticField[java.util.prefs.PreferenceChangeEvent.key]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.util.prefs", "PreferenceChangeEvent", True, "getNewValue", "()", "", "Argument[this].SyntheticField[java.util.prefs.PreferenceChangeEvent.newValue]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.util.prefs", "PreferenceChangeEvent", True, "getNode", "()", "", "Argument[this].SyntheticField[java.util.EventObject.source]", "ReturnValue", "value", "dfc-generated"]
       - ["java.util.prefs", "Preferences", True, "absolutePath", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.util.prefs", "Preferences", True, "addNodeChangeListener", "(NodeChangeListener)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.util.prefs", "Preferences", True, "addPreferenceChangeListener", "(PreferenceChangeListener)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.util.prefs", "Preferences", True, "childrenNames", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.util.prefs", "Preferences", True, "keys", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.util.prefs", "Preferences", True, "name", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.util.prefs", "Preferences", True, "node", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.util.prefs", "Preferences", True, "node", "(String)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
@@ -33,12 +34,28 @@ extensions:
       pack: codeql/java-all
       extensible: neutralModel
     data:
+      - ["java.util.prefs", "AbstractPreferences", "clear", "()", "summary", "df-generated"]
+      - ["java.util.prefs", "AbstractPreferences", "exportNode", "(OutputStream)", "summary", "df-generated"]
+      - ["java.util.prefs", "AbstractPreferences", "exportSubtree", "(OutputStream)", "summary", "df-generated"]
+      - ["java.util.prefs", "AbstractPreferences", "flush", "()", "summary", "df-generated"]
+      - ["java.util.prefs", "AbstractPreferences", "getLong", "(String,long)", "summary", "df-generated"]
+      - ["java.util.prefs", "AbstractPreferences", "isUserNode", "()", "summary", "df-generated"]
+      - ["java.util.prefs", "AbstractPreferences", "nodeExists", "(String)", "summary", "df-generated"]
+      - ["java.util.prefs", "AbstractPreferences", "remove", "(String)", "summary", "df-generated"]
+      - ["java.util.prefs", "AbstractPreferences", "removeNode", "()", "summary", "df-generated"]
+      - ["java.util.prefs", "AbstractPreferences", "removeNodeChangeListener", "(NodeChangeListener)", "summary", "df-generated"]
+      - ["java.util.prefs", "AbstractPreferences", "removePreferenceChangeListener", "(PreferenceChangeListener)", "summary", "df-generated"]
+      - ["java.util.prefs", "AbstractPreferences", "sync", "()", "summary", "df-generated"]
       - ["java.util.prefs", "Preferences", "clear", "()", "summary", "df-generated"]
       - ["java.util.prefs", "Preferences", "exportNode", "(OutputStream)", "summary", "df-generated"]
       - ["java.util.prefs", "Preferences", "exportSubtree", "(OutputStream)", "summary", "df-generated"]
       - ["java.util.prefs", "Preferences", "flush", "()", "summary", "df-generated"]
+      - ["java.util.prefs", "Preferences", "getLong", "(String,long)", "summary", "df-generated"]
       - ["java.util.prefs", "Preferences", "importPreferences", "(InputStream)", "summary", "df-generated"]
       - ["java.util.prefs", "Preferences", "isUserNode", "()", "summary", "df-generated"]
+      - ["java.util.prefs", "Preferences", "keys", "()", "summary", "df-generated"]
+      - ["java.util.prefs", "Preferences", "nodeExists", "(String)", "summary", "df-generated"]
+      - ["java.util.prefs", "Preferences", "putLong", "(String,long)", "summary", "df-generated"]
       - ["java.util.prefs", "Preferences", "remove", "(String)", "summary", "df-generated"]
       - ["java.util.prefs", "Preferences", "removeNode", "()", "summary", "df-generated"]
       - ["java.util.prefs", "Preferences", "removeNodeChangeListener", "(NodeChangeListener)", "summary", "df-generated"]
@@ -48,5 +65,3 @@ extensions:
       - ["java.util.prefs", "Preferences", "systemRoot", "()", "summary", "df-generated"]
       - ["java.util.prefs", "Preferences", "userNodeForPackage", "(Class)", "summary", "df-generated"]
       - ["java.util.prefs", "Preferences", "userRoot", "()", "summary", "df-generated"]
-      - ["java.util.prefs", "PreferencesFactory", "systemRoot", "()", "summary", "df-generated"]
-      - ["java.util.prefs", "PreferencesFactory", "userRoot", "()", "summary", "df-generated"]
diff --git a/java/ql/lib/ext/generated/java.util.random.model.yml b/java/ql/lib/ext/generated/java.util.random.model.yml
index 2e543aebe8f..3b118df56f9 100644
--- a/java/ql/lib/ext/generated/java.util.random.model.yml
+++ b/java/ql/lib/ext/generated/java.util.random.model.yml
@@ -4,6 +4,12 @@ extensions:
       pack: codeql/java-all
       extensible: summaryModel
     data:
+      - ["java.util.random", "RandomGenerator$ArbitrarilyJumpableGenerator", True, "jumps", "(double)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.random", "RandomGenerator$ArbitrarilyJumpableGenerator", True, "jumps", "(long,double)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.random", "RandomGenerator$JumpableGenerator", True, "jumps", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.random", "RandomGenerator$JumpableGenerator", True, "jumps", "(long)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.random", "RandomGenerator$LeapableGenerator", True, "leaps", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.random", "RandomGenerator$LeapableGenerator", True, "leaps", "(long)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.util.random", "RandomGenerator$SplittableGenerator", True, "splits", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.util.random", "RandomGenerator$SplittableGenerator", True, "splits", "(RandomGenerator$SplittableGenerator)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["java.util.random", "RandomGenerator$SplittableGenerator", True, "splits", "(RandomGenerator$SplittableGenerator)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
@@ -27,24 +33,19 @@ extensions:
       extensible: neutralModel
     data:
       - ["java.util.random", "RandomGenerator$ArbitrarilyJumpableGenerator", "copyAndJump", "(double)", "summary", "df-generated"]
-      - ["java.util.random", "RandomGenerator$ArbitrarilyJumpableGenerator", "jumps", "(double)", "summary", "df-generated"]
-      - ["java.util.random", "RandomGenerator$ArbitrarilyJumpableGenerator", "jumps", "(long,double)", "summary", "df-generated"]
+      - ["java.util.random", "RandomGenerator$ArbitrarilyJumpableGenerator", "jump", "()", "summary", "df-generated"]
+      - ["java.util.random", "RandomGenerator$ArbitrarilyJumpableGenerator", "leap", "()", "summary", "df-generated"]
       - ["java.util.random", "RandomGenerator$ArbitrarilyJumpableGenerator", "of", "(String)", "summary", "df-generated"]
       - ["java.util.random", "RandomGenerator$JumpableGenerator", "copyAndJump", "()", "summary", "df-generated"]
-      - ["java.util.random", "RandomGenerator$JumpableGenerator", "jump", "()", "summary", "df-generated"]
-      - ["java.util.random", "RandomGenerator$JumpableGenerator", "jumps", "()", "summary", "df-generated"]
-      - ["java.util.random", "RandomGenerator$JumpableGenerator", "jumps", "(long)", "summary", "df-generated"]
       - ["java.util.random", "RandomGenerator$JumpableGenerator", "of", "(String)", "summary", "df-generated"]
+      - ["java.util.random", "RandomGenerator$JumpableGenerator", "rngs", "()", "summary", "df-generated"]
+      - ["java.util.random", "RandomGenerator$JumpableGenerator", "rngs", "(long)", "summary", "df-generated"]
       - ["java.util.random", "RandomGenerator$LeapableGenerator", "copyAndLeap", "()", "summary", "df-generated"]
-      - ["java.util.random", "RandomGenerator$LeapableGenerator", "leap", "()", "summary", "df-generated"]
-      - ["java.util.random", "RandomGenerator$LeapableGenerator", "leaps", "()", "summary", "df-generated"]
-      - ["java.util.random", "RandomGenerator$LeapableGenerator", "leaps", "(long)", "summary", "df-generated"]
       - ["java.util.random", "RandomGenerator$LeapableGenerator", "of", "(String)", "summary", "df-generated"]
       - ["java.util.random", "RandomGenerator$SplittableGenerator", "of", "(String)", "summary", "df-generated"]
-      - ["java.util.random", "RandomGenerator$SplittableGenerator", "split", "()", "summary", "df-generated"]
-      - ["java.util.random", "RandomGenerator$SplittableGenerator", "split", "(RandomGenerator$SplittableGenerator)", "summary", "df-generated"]
+      - ["java.util.random", "RandomGenerator$SplittableGenerator", "rngs", "()", "summary", "df-generated"]
+      - ["java.util.random", "RandomGenerator$SplittableGenerator", "rngs", "(long)", "summary", "df-generated"]
       - ["java.util.random", "RandomGenerator$StreamableGenerator", "of", "(String)", "summary", "df-generated"]
-      - ["java.util.random", "RandomGenerator$StreamableGenerator", "rngs", "()", "summary", "df-generated"]
       - ["java.util.random", "RandomGenerator$StreamableGenerator", "rngs", "(long)", "summary", "df-generated"]
       - ["java.util.random", "RandomGenerator", "getDefault", "()", "summary", "df-generated"]
       - ["java.util.random", "RandomGenerator", "isDeprecated", "()", "summary", "df-generated"]
@@ -62,7 +63,6 @@ extensions:
       - ["java.util.random", "RandomGenerator", "nextInt", "()", "summary", "df-generated"]
       - ["java.util.random", "RandomGenerator", "nextInt", "(int)", "summary", "df-generated"]
       - ["java.util.random", "RandomGenerator", "nextInt", "(int,int)", "summary", "df-generated"]
-      - ["java.util.random", "RandomGenerator", "nextLong", "()", "summary", "df-generated"]
       - ["java.util.random", "RandomGenerator", "nextLong", "(long)", "summary", "df-generated"]
       - ["java.util.random", "RandomGenerator", "nextLong", "(long,long)", "summary", "df-generated"]
       - ["java.util.random", "RandomGenerator", "of", "(String)", "summary", "df-generated"]
diff --git a/java/ql/lib/ext/generated/java.util.regex.model.yml b/java/ql/lib/ext/generated/java.util.regex.model.yml
index 8b5680b1311..6dd78701b25 100644
--- a/java/ql/lib/ext/generated/java.util.regex.model.yml
+++ b/java/ql/lib/ext/generated/java.util.regex.model.yml
@@ -4,44 +4,48 @@ extensions:
       pack: codeql/java-all
       extensible: summaryModel
     data:
-      - ["java.util.regex", "MatchResult", True, "group", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.regex", "MatchResult", True, "group", "()", "", "Argument[this]", "ReturnValue", "taint", "dfc-generated"]
       - ["java.util.regex", "MatchResult", True, "group", "(int)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.util.regex", "Matcher", False, "quoteReplacement", "(String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["java.util.regex", "Matcher", False, "region", "(int,int)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["java.util.regex", "Matcher", False, "reset", "()", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["java.util.regex", "Matcher", False, "reset", "(CharSequence)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.util.regex", "Matcher", False, "reset", "(CharSequence)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["java.util.regex", "Matcher", False, "reset", "(CharSequence)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.regex", "Matcher", False, "appendReplacement", "(StringBuilder,String)", "", "Argument[this].SyntheticField[java.util.regex.Matcher.text]", "Argument[0]", "taint", "dfc-generated"]
+      - ["java.util.regex", "Matcher", False, "appendReplacement", "(StringBuilder,String)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.util.regex", "Matcher", False, "appendTail", "(StringBuilder)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.util.regex", "Matcher", False, "appendTail", "(StringBuilder)", "", "Argument[this].SyntheticField[java.util.regex.Matcher.text]", "Argument[0]", "taint", "dfc-generated"]
+      - ["java.util.regex", "Matcher", False, "appendTail", "(StringBuilder)", "", "Argument[this].SyntheticField[java.util.regex.Matcher.text]", "ReturnValue", "taint", "dfc-generated"]
+      - ["java.util.regex", "Matcher", False, "quoteReplacement", "(String)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.util.regex", "Matcher", False, "region", "(int,int)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.util.regex", "Matcher", False, "reset", "()", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.util.regex", "Matcher", False, "reset", "(CharSequence)", "", "Argument[0]", "Argument[this].SyntheticField[java.util.regex.Matcher.text]", "value", "dfc-generated"]
+      - ["java.util.regex", "Matcher", False, "reset", "(CharSequence)", "", "Argument[0]", "ReturnValue.SyntheticField[java.util.regex.Matcher.text]", "value", "dfc-generated"]
+      - ["java.util.regex", "Matcher", False, "reset", "(CharSequence)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
       - ["java.util.regex", "Matcher", False, "toMatchResult", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.util.regex", "Matcher", False, "useAnchoringBounds", "(boolean)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["java.util.regex", "Matcher", False, "usePattern", "(Pattern)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.util.regex", "Matcher", False, "usePattern", "(Pattern)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["java.util.regex", "Matcher", False, "useTransparentBounds", "(boolean)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["java.util.regex", "Pattern", False, "compile", "(String,int)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["java.util.regex", "Pattern", False, "pattern", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.util.regex", "PatternSyntaxException", True, "PatternSyntaxException", "(String,String,int)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.util.regex", "PatternSyntaxException", True, "PatternSyntaxException", "(String,String,int)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["java.util.regex", "PatternSyntaxException", True, "getDescription", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.util.regex", "PatternSyntaxException", True, "getPattern", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.regex", "Matcher", False, "useAnchoringBounds", "(boolean)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.util.regex", "Matcher", False, "usePattern", "(Pattern)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.util.regex", "Matcher", False, "useTransparentBounds", "(boolean)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.util.regex", "PatternSyntaxException", True, "PatternSyntaxException", "(String,String,int)", "", "Argument[0]", "Argument[this].SyntheticField[java.util.regex.PatternSyntaxException.desc]", "value", "dfc-generated"]
+      - ["java.util.regex", "PatternSyntaxException", True, "PatternSyntaxException", "(String,String,int)", "", "Argument[1]", "Argument[this].SyntheticField[java.util.regex.PatternSyntaxException.pattern]", "value", "dfc-generated"]
+      - ["java.util.regex", "PatternSyntaxException", True, "getDescription", "()", "", "Argument[this].SyntheticField[java.util.regex.PatternSyntaxException.desc]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.util.regex", "PatternSyntaxException", True, "getPattern", "()", "", "Argument[this].SyntheticField[java.util.regex.PatternSyntaxException.pattern]", "ReturnValue", "value", "dfc-generated"]
   - addsTo:
       pack: codeql/java-all
       extensible: neutralModel
     data:
-      - ["java.util.regex", "MatchResult", "end", "()", "summary", "df-generated"]
-      - ["java.util.regex", "MatchResult", "end", "(int)", "summary", "df-generated"]
-      - ["java.util.regex", "MatchResult", "groupCount", "()", "summary", "df-generated"]
-      - ["java.util.regex", "MatchResult", "start", "()", "summary", "df-generated"]
-      - ["java.util.regex", "MatchResult", "start", "(int)", "summary", "df-generated"]
+      - ["java.util.regex", "Matcher", "end", "()", "summary", "df-generated"]
       - ["java.util.regex", "Matcher", "end", "(String)", "summary", "df-generated"]
+      - ["java.util.regex", "Matcher", "end", "(int)", "summary", "df-generated"]
+      - ["java.util.regex", "Matcher", "find", "(int)", "summary", "df-generated"]
+      - ["java.util.regex", "Matcher", "groupCount", "()", "summary", "df-generated"]
       - ["java.util.regex", "Matcher", "hasAnchoringBounds", "()", "summary", "df-generated"]
       - ["java.util.regex", "Matcher", "hasTransparentBounds", "()", "summary", "df-generated"]
       - ["java.util.regex", "Matcher", "hitEnd", "()", "summary", "df-generated"]
       - ["java.util.regex", "Matcher", "lookingAt", "()", "summary", "df-generated"]
+      - ["java.util.regex", "Matcher", "matches", "()", "summary", "df-generated"]
       - ["java.util.regex", "Matcher", "regionEnd", "()", "summary", "df-generated"]
       - ["java.util.regex", "Matcher", "regionStart", "()", "summary", "df-generated"]
       - ["java.util.regex", "Matcher", "requireEnd", "()", "summary", "df-generated"]
       - ["java.util.regex", "Matcher", "results", "()", "summary", "df-generated"]
+      - ["java.util.regex", "Matcher", "start", "()", "summary", "df-generated"]
       - ["java.util.regex", "Matcher", "start", "(String)", "summary", "df-generated"]
+      - ["java.util.regex", "Matcher", "start", "(int)", "summary", "df-generated"]
       - ["java.util.regex", "Pattern", "asMatchPredicate", "()", "summary", "df-generated"]
       - ["java.util.regex", "Pattern", "asPredicate", "()", "summary", "df-generated"]
       - ["java.util.regex", "Pattern", "flags", "()", "summary", "df-generated"]
diff --git a/java/ql/lib/ext/generated/java.util.spi.model.yml b/java/ql/lib/ext/generated/java.util.spi.model.yml
index b2bdab212b0..e8d5fe7325f 100644
--- a/java/ql/lib/ext/generated/java.util.spi.model.yml
+++ b/java/ql/lib/ext/generated/java.util.spi.model.yml
@@ -1,25 +1,29 @@
 # THIS FILE IS AN AUTO-GENERATED MODELS AS DATA FILE. DO NOT EDIT.
 extensions:
+  - addsTo:
+      pack: codeql/java-all
+      extensible: summaryModel
+    data:
+      - ["java.util.spi", "CalendarNameProvider", True, "getDisplayName", "(String,int,int,int,Locale)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.spi", "CalendarNameProvider", True, "getDisplayNames", "(String,int,int,Locale)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.spi", "LocaleNameProvider", True, "getDisplayUnicodeExtensionKey", "(String,Locale)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.util.spi", "LocaleNameProvider", True, "getDisplayUnicodeExtensionType", "(String,String,Locale)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.util.spi", "LocaleServiceProvider", True, "getAvailableLocales", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.spi", "TimeZoneNameProvider", True, "getDisplayName", "(String,boolean,int,Locale)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.spi", "TimeZoneNameProvider", True, "getGenericDisplayName", "(String,int,Locale)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
   - addsTo:
       pack: codeql/java-all
       extensible: neutralModel
     data:
+      - ["java.util.spi", "AbstractResourceBundleProvider", "getBundle", "(String,Locale)", "summary", "df-generated"]
       - ["java.util.spi", "CalendarDataProvider", "getFirstDayOfWeek", "(Locale)", "summary", "df-generated"]
       - ["java.util.spi", "CalendarDataProvider", "getMinimalDaysInFirstWeek", "(Locale)", "summary", "df-generated"]
-      - ["java.util.spi", "CalendarNameProvider", "getDisplayName", "(String,int,int,int,Locale)", "summary", "df-generated"]
-      - ["java.util.spi", "CalendarNameProvider", "getDisplayNames", "(String,int,int,Locale)", "summary", "df-generated"]
       - ["java.util.spi", "CurrencyNameProvider", "getDisplayName", "(String,Locale)", "summary", "df-generated"]
       - ["java.util.spi", "CurrencyNameProvider", "getSymbol", "(String,Locale)", "summary", "df-generated"]
       - ["java.util.spi", "LocaleNameProvider", "getDisplayCountry", "(String,Locale)", "summary", "df-generated"]
       - ["java.util.spi", "LocaleNameProvider", "getDisplayLanguage", "(String,Locale)", "summary", "df-generated"]
       - ["java.util.spi", "LocaleNameProvider", "getDisplayScript", "(String,Locale)", "summary", "df-generated"]
-      - ["java.util.spi", "LocaleNameProvider", "getDisplayUnicodeExtensionKey", "(String,Locale)", "summary", "df-generated"]
-      - ["java.util.spi", "LocaleNameProvider", "getDisplayUnicodeExtensionType", "(String,String,Locale)", "summary", "df-generated"]
       - ["java.util.spi", "LocaleNameProvider", "getDisplayVariant", "(String,Locale)", "summary", "df-generated"]
-      - ["java.util.spi", "LocaleServiceProvider", "getAvailableLocales", "()", "summary", "df-generated"]
       - ["java.util.spi", "LocaleServiceProvider", "isSupportedLocale", "(Locale)", "summary", "df-generated"]
-      - ["java.util.spi", "ResourceBundleProvider", "getBundle", "(String,Locale)", "summary", "df-generated"]
-      - ["java.util.spi", "TimeZoneNameProvider", "getDisplayName", "(String,boolean,int,Locale)", "summary", "df-generated"]
-      - ["java.util.spi", "TimeZoneNameProvider", "getGenericDisplayName", "(String,int,Locale)", "summary", "df-generated"]
       - ["java.util.spi", "ToolProvider", "findFirst", "(String)", "summary", "df-generated"]
       - ["java.util.spi", "ToolProvider", "run", "(PrintStream,PrintStream,String[])", "summary", "df-generated"]
diff --git a/java/ql/lib/ext/generated/java.util.stream.model.yml b/java/ql/lib/ext/generated/java.util.stream.model.yml
index ce97043b8dd..1d54b99c828 100644
--- a/java/ql/lib/ext/generated/java.util.stream.model.yml
+++ b/java/ql/lib/ext/generated/java.util.stream.model.yml
@@ -17,11 +17,9 @@ extensions:
       - ["java.util.stream", "Collectors", False, "groupingBy", "(Function,Supplier,Collector)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
       - ["java.util.stream", "Collectors", False, "groupingByConcurrent", "(Function,Supplier,Collector)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
       - ["java.util.stream", "Collectors", False, "mapping", "(Function,Collector)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["java.util.stream", "Collectors", False, "teeing", "(Collector,Collector,BiFunction)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["java.util.stream", "Collectors", False, "toCollection", "(Supplier)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["java.util.stream", "Collectors", False, "toConcurrentMap", "(Function,Function,BinaryOperator,Supplier)", "", "Argument[3]", "ReturnValue", "taint", "df-generated"]
-      - ["java.util.stream", "Collectors", False, "toMap", "(Function,Function,BinaryOperator,Supplier)", "", "Argument[3]", "ReturnValue", "taint", "df-generated"]
-      - ["java.util.stream", "DoubleStream$Builder", True, "add", "(double)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.util.stream", "DoubleStream$Builder", True, "add", "(double)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
       - ["java.util.stream", "DoubleStream$Builder", True, "build", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.util.stream", "DoubleStream", True, "boxed", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.util.stream", "DoubleStream", True, "concat", "(DoubleStream,DoubleStream)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
@@ -39,11 +37,11 @@ extensions:
       - ["java.util.stream", "DoubleStream", True, "mapToLong", "(DoubleToLongFunction)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.util.stream", "DoubleStream", True, "mapToObj", "(DoubleFunction)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.util.stream", "DoubleStream", True, "peek", "(DoubleConsumer)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.util.stream", "DoubleStream", True, "skip", "(long)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.util.stream", "DoubleStream", True, "skip", "(long)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
       - ["java.util.stream", "DoubleStream", True, "sorted", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.util.stream", "DoubleStream", True, "takeWhile", "(DoublePredicate)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["java.util.stream", "DoubleStream", True, "takeWhile", "(DoublePredicate)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.util.stream", "IntStream$Builder", True, "add", "(int)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.util.stream", "IntStream$Builder", True, "add", "(int)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
       - ["java.util.stream", "IntStream$Builder", True, "build", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.util.stream", "IntStream", True, "asDoubleStream", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.util.stream", "IntStream", True, "asLongStream", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
@@ -61,13 +59,12 @@ extensions:
       - ["java.util.stream", "IntStream", True, "mapMulti", "(IntStream$IntMapMultiConsumer)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.util.stream", "IntStream", True, "mapToDouble", "(IntToDoubleFunction)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.util.stream", "IntStream", True, "mapToLong", "(IntToLongFunction)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.util.stream", "IntStream", True, "mapToObj", "(IntFunction)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.util.stream", "IntStream", True, "peek", "(IntConsumer)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.util.stream", "IntStream", True, "skip", "(long)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.util.stream", "IntStream", True, "skip", "(long)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
       - ["java.util.stream", "IntStream", True, "sorted", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.util.stream", "IntStream", True, "takeWhile", "(IntPredicate)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["java.util.stream", "IntStream", True, "takeWhile", "(IntPredicate)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.util.stream", "LongStream$Builder", True, "add", "(long)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.util.stream", "LongStream$Builder", True, "add", "(long)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
       - ["java.util.stream", "LongStream$Builder", True, "build", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.util.stream", "LongStream", True, "asDoubleStream", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.util.stream", "LongStream", True, "boxed", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
@@ -86,16 +83,21 @@ extensions:
       - ["java.util.stream", "LongStream", True, "mapToInt", "(LongToIntFunction)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.util.stream", "LongStream", True, "mapToObj", "(LongFunction)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.util.stream", "LongStream", True, "peek", "(LongConsumer)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.util.stream", "LongStream", True, "skip", "(long)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.util.stream", "LongStream", True, "skip", "(long)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
       - ["java.util.stream", "LongStream", True, "sorted", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.util.stream", "LongStream", True, "takeWhile", "(LongPredicate)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["java.util.stream", "LongStream", True, "takeWhile", "(LongPredicate)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.stream", "Node$Builder$OfDouble", True, "build", "()", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.util.stream", "Node$Builder$OfInt", True, "build", "()", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.util.stream", "Node$Builder$OfLong", True, "build", "()", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.util.stream", "Node$OfDouble", True, "truncate", "(long,long,IntFunction)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.util.stream", "Node$OfInt", True, "truncate", "(long,long,IntFunction)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.util.stream", "Node$OfLong", True, "truncate", "(long,long,IntFunction)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
       - ["java.util.stream", "Sink$ChainedDouble", True, "ChainedDouble", "(Sink)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.util.stream", "Sink$ChainedInt", True, "ChainedInt", "(Sink)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.util.stream", "Sink$ChainedLong", True, "ChainedLong", "(Sink)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.util.stream", "Sink$ChainedReference", True, "ChainedReference", "(Sink)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.util.stream", "Stream$Builder", True, "add", "(Object)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.util.stream", "Stream$Builder", True, "add", "(Object)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.util.stream", "Stream$Builder", True, "add", "(Object)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
       - ["java.util.stream", "StreamSupport", False, "doubleStream", "(Spliterator$OfDouble,boolean)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["java.util.stream", "StreamSupport", False, "doubleStream", "(Supplier,int,boolean)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["java.util.stream", "StreamSupport", False, "intStream", "(Spliterator$OfInt,boolean)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
@@ -129,83 +131,62 @@ extensions:
       - ["java.util.stream", "Collectors", "summingDouble", "(ToDoubleFunction)", "summary", "df-generated"]
       - ["java.util.stream", "Collectors", "summingInt", "(ToIntFunction)", "summary", "df-generated"]
       - ["java.util.stream", "Collectors", "summingLong", "(ToLongFunction)", "summary", "df-generated"]
+      - ["java.util.stream", "Collectors", "teeing", "(Collector,Collector,BiFunction)", "summary", "df-generated"]
       - ["java.util.stream", "Collectors", "toConcurrentMap", "(Function,Function)", "summary", "df-generated"]
       - ["java.util.stream", "Collectors", "toConcurrentMap", "(Function,Function,BinaryOperator)", "summary", "df-generated"]
       - ["java.util.stream", "Collectors", "toUnmodifiableList", "()", "summary", "df-generated"]
       - ["java.util.stream", "Collectors", "toUnmodifiableMap", "(Function,Function)", "summary", "df-generated"]
       - ["java.util.stream", "Collectors", "toUnmodifiableMap", "(Function,Function,BinaryOperator)", "summary", "df-generated"]
       - ["java.util.stream", "Collectors", "toUnmodifiableSet", "()", "summary", "df-generated"]
-      - ["java.util.stream", "DoubleStream", "allMatch", "(DoublePredicate)", "summary", "df-generated"]
-      - ["java.util.stream", "DoubleStream", "anyMatch", "(DoublePredicate)", "summary", "df-generated"]
-      - ["java.util.stream", "DoubleStream", "average", "()", "summary", "df-generated"]
       - ["java.util.stream", "DoubleStream", "builder", "()", "summary", "df-generated"]
-      - ["java.util.stream", "DoubleStream", "collect", "(Supplier,ObjDoubleConsumer,BiConsumer)", "summary", "df-generated"]
-      - ["java.util.stream", "DoubleStream", "count", "()", "summary", "df-generated"]
       - ["java.util.stream", "DoubleStream", "empty", "()", "summary", "df-generated"]
-      - ["java.util.stream", "DoubleStream", "findAny", "()", "summary", "df-generated"]
-      - ["java.util.stream", "DoubleStream", "findFirst", "()", "summary", "df-generated"]
-      - ["java.util.stream", "DoubleStream", "forEach", "(DoubleConsumer)", "summary", "df-generated"]
-      - ["java.util.stream", "DoubleStream", "forEachOrdered", "(DoubleConsumer)", "summary", "df-generated"]
       - ["java.util.stream", "DoubleStream", "iterate", "(double,DoublePredicate,DoubleUnaryOperator)", "summary", "df-generated"]
       - ["java.util.stream", "DoubleStream", "iterate", "(double,DoubleUnaryOperator)", "summary", "df-generated"]
-      - ["java.util.stream", "DoubleStream", "max", "()", "summary", "df-generated"]
-      - ["java.util.stream", "DoubleStream", "min", "()", "summary", "df-generated"]
-      - ["java.util.stream", "DoubleStream", "noneMatch", "(DoublePredicate)", "summary", "df-generated"]
       - ["java.util.stream", "DoubleStream", "of", "(double)", "summary", "df-generated"]
       - ["java.util.stream", "DoubleStream", "of", "(double[])", "summary", "df-generated"]
-      - ["java.util.stream", "DoubleStream", "reduce", "(DoubleBinaryOperator)", "summary", "df-generated"]
-      - ["java.util.stream", "DoubleStream", "reduce", "(double,DoubleBinaryOperator)", "summary", "df-generated"]
-      - ["java.util.stream", "DoubleStream", "sum", "()", "summary", "df-generated"]
-      - ["java.util.stream", "DoubleStream", "summaryStatistics", "()", "summary", "df-generated"]
-      - ["java.util.stream", "DoubleStream", "toArray", "()", "summary", "df-generated"]
-      - ["java.util.stream", "IntStream", "allMatch", "(IntPredicate)", "summary", "df-generated"]
-      - ["java.util.stream", "IntStream", "anyMatch", "(IntPredicate)", "summary", "df-generated"]
-      - ["java.util.stream", "IntStream", "average", "()", "summary", "df-generated"]
       - ["java.util.stream", "IntStream", "builder", "()", "summary", "df-generated"]
-      - ["java.util.stream", "IntStream", "collect", "(Supplier,ObjIntConsumer,BiConsumer)", "summary", "df-generated"]
-      - ["java.util.stream", "IntStream", "count", "()", "summary", "df-generated"]
       - ["java.util.stream", "IntStream", "empty", "()", "summary", "df-generated"]
-      - ["java.util.stream", "IntStream", "findAny", "()", "summary", "df-generated"]
-      - ["java.util.stream", "IntStream", "findFirst", "()", "summary", "df-generated"]
-      - ["java.util.stream", "IntStream", "forEach", "(IntConsumer)", "summary", "df-generated"]
-      - ["java.util.stream", "IntStream", "forEachOrdered", "(IntConsumer)", "summary", "df-generated"]
       - ["java.util.stream", "IntStream", "iterate", "(int,IntPredicate,IntUnaryOperator)", "summary", "df-generated"]
       - ["java.util.stream", "IntStream", "iterate", "(int,IntUnaryOperator)", "summary", "df-generated"]
-      - ["java.util.stream", "IntStream", "max", "()", "summary", "df-generated"]
-      - ["java.util.stream", "IntStream", "min", "()", "summary", "df-generated"]
-      - ["java.util.stream", "IntStream", "noneMatch", "(IntPredicate)", "summary", "df-generated"]
       - ["java.util.stream", "IntStream", "of", "(int)", "summary", "df-generated"]
       - ["java.util.stream", "IntStream", "of", "(int[])", "summary", "df-generated"]
       - ["java.util.stream", "IntStream", "rangeClosed", "(int,int)", "summary", "df-generated"]
-      - ["java.util.stream", "IntStream", "reduce", "(IntBinaryOperator)", "summary", "df-generated"]
-      - ["java.util.stream", "IntStream", "reduce", "(int,IntBinaryOperator)", "summary", "df-generated"]
-      - ["java.util.stream", "IntStream", "sum", "()", "summary", "df-generated"]
-      - ["java.util.stream", "IntStream", "summaryStatistics", "()", "summary", "df-generated"]
-      - ["java.util.stream", "IntStream", "toArray", "()", "summary", "df-generated"]
-      - ["java.util.stream", "LongStream", "allMatch", "(LongPredicate)", "summary", "df-generated"]
-      - ["java.util.stream", "LongStream", "anyMatch", "(LongPredicate)", "summary", "df-generated"]
-      - ["java.util.stream", "LongStream", "average", "()", "summary", "df-generated"]
       - ["java.util.stream", "LongStream", "builder", "()", "summary", "df-generated"]
-      - ["java.util.stream", "LongStream", "collect", "(Supplier,ObjLongConsumer,BiConsumer)", "summary", "df-generated"]
-      - ["java.util.stream", "LongStream", "count", "()", "summary", "df-generated"]
       - ["java.util.stream", "LongStream", "empty", "()", "summary", "df-generated"]
-      - ["java.util.stream", "LongStream", "findAny", "()", "summary", "df-generated"]
-      - ["java.util.stream", "LongStream", "findFirst", "()", "summary", "df-generated"]
-      - ["java.util.stream", "LongStream", "forEach", "(LongConsumer)", "summary", "df-generated"]
-      - ["java.util.stream", "LongStream", "forEachOrdered", "(LongConsumer)", "summary", "df-generated"]
       - ["java.util.stream", "LongStream", "iterate", "(long,LongPredicate,LongUnaryOperator)", "summary", "df-generated"]
       - ["java.util.stream", "LongStream", "iterate", "(long,LongUnaryOperator)", "summary", "df-generated"]
-      - ["java.util.stream", "LongStream", "max", "()", "summary", "df-generated"]
-      - ["java.util.stream", "LongStream", "min", "()", "summary", "df-generated"]
-      - ["java.util.stream", "LongStream", "noneMatch", "(LongPredicate)", "summary", "df-generated"]
       - ["java.util.stream", "LongStream", "of", "(long)", "summary", "df-generated"]
       - ["java.util.stream", "LongStream", "of", "(long[])", "summary", "df-generated"]
       - ["java.util.stream", "LongStream", "range", "(long,long)", "summary", "df-generated"]
       - ["java.util.stream", "LongStream", "rangeClosed", "(long,long)", "summary", "df-generated"]
-      - ["java.util.stream", "LongStream", "reduce", "(LongBinaryOperator)", "summary", "df-generated"]
-      - ["java.util.stream", "LongStream", "reduce", "(long,LongBinaryOperator)", "summary", "df-generated"]
-      - ["java.util.stream", "LongStream", "sum", "()", "summary", "df-generated"]
-      - ["java.util.stream", "LongStream", "summaryStatistics", "()", "summary", "df-generated"]
-      - ["java.util.stream", "LongStream", "toArray", "()", "summary", "df-generated"]
+      - ["java.util.stream", "Node$OfDouble", "copyInto", "(Double[],int)", "summary", "df-generated"]
+      - ["java.util.stream", "Node$OfDouble", "forEach", "(Consumer)", "summary", "df-generated"]
+      - ["java.util.stream", "Node$OfDouble", "getShape", "()", "summary", "df-generated"]
+      - ["java.util.stream", "Node$OfDouble", "newArray", "(int)", "summary", "df-generated"]
+      - ["java.util.stream", "Node$OfInt", "copyInto", "(Integer[],int)", "summary", "df-generated"]
+      - ["java.util.stream", "Node$OfInt", "forEach", "(Consumer)", "summary", "df-generated"]
+      - ["java.util.stream", "Node$OfInt", "getShape", "()", "summary", "df-generated"]
+      - ["java.util.stream", "Node$OfInt", "newArray", "(int)", "summary", "df-generated"]
+      - ["java.util.stream", "Node$OfLong", "copyInto", "(Long[],int)", "summary", "df-generated"]
+      - ["java.util.stream", "Node$OfLong", "forEach", "(Consumer)", "summary", "df-generated"]
+      - ["java.util.stream", "Node$OfLong", "getShape", "()", "summary", "df-generated"]
+      - ["java.util.stream", "Node$OfLong", "newArray", "(int)", "summary", "df-generated"]
+      - ["java.util.stream", "Node$OfPrimitive", "asArray", "(IntFunction)", "summary", "df-generated"]
+      - ["java.util.stream", "Node$OfPrimitive", "getChild", "(int)", "summary", "df-generated"]
+      - ["java.util.stream", "Sink$ChainedDouble", "begin", "(long)", "summary", "df-generated"]
+      - ["java.util.stream", "Sink$ChainedDouble", "cancellationRequested", "()", "summary", "df-generated"]
+      - ["java.util.stream", "Sink$ChainedDouble", "end", "()", "summary", "df-generated"]
+      - ["java.util.stream", "Sink$ChainedInt", "begin", "(long)", "summary", "df-generated"]
+      - ["java.util.stream", "Sink$ChainedInt", "cancellationRequested", "()", "summary", "df-generated"]
+      - ["java.util.stream", "Sink$ChainedInt", "end", "()", "summary", "df-generated"]
+      - ["java.util.stream", "Sink$ChainedLong", "begin", "(long)", "summary", "df-generated"]
+      - ["java.util.stream", "Sink$ChainedLong", "cancellationRequested", "()", "summary", "df-generated"]
+      - ["java.util.stream", "Sink$ChainedLong", "end", "()", "summary", "df-generated"]
+      - ["java.util.stream", "Sink$ChainedReference", "begin", "(long)", "summary", "df-generated"]
+      - ["java.util.stream", "Sink$ChainedReference", "cancellationRequested", "()", "summary", "df-generated"]
+      - ["java.util.stream", "Sink$ChainedReference", "end", "()", "summary", "df-generated"]
+      - ["java.util.stream", "Sink$OfDouble", "accept", "(Double)", "summary", "df-generated"]
+      - ["java.util.stream", "Sink$OfInt", "accept", "(Integer)", "summary", "df-generated"]
+      - ["java.util.stream", "Sink$OfLong", "accept", "(Long)", "summary", "df-generated"]
       - ["java.util.stream", "Stream", "builder", "()", "summary", "df-generated"]
       - ["java.util.stream", "Stream", "empty", "()", "summary", "df-generated"]
diff --git a/java/ql/lib/ext/generated/java.util.zip.model.yml b/java/ql/lib/ext/generated/java.util.zip.model.yml
index 8aaf1118ad6..09be65e9dce 100644
--- a/java/ql/lib/ext/generated/java.util.zip.model.yml
+++ b/java/ql/lib/ext/generated/java.util.zip.model.yml
@@ -4,12 +4,11 @@ extensions:
       pack: codeql/java-all
       extensible: summaryModel
     data:
-      - ["java.util.zip", "CheckedInputStream", True, "CheckedInputStream", "(InputStream,Checksum)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.util.zip", "CheckedInputStream", True, "CheckedInputStream", "(InputStream,Checksum)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["java.util.zip", "CheckedInputStream", True, "getChecksum", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.util.zip", "CheckedOutputStream", True, "CheckedOutputStream", "(OutputStream,Checksum)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.util.zip", "CheckedOutputStream", True, "CheckedOutputStream", "(OutputStream,Checksum)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["java.util.zip", "CheckedOutputStream", True, "getChecksum", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.zip", "CheckedInputStream", True, "CheckedInputStream", "(InputStream,Checksum)", "", "Argument[1]", "Argument[this].SyntheticField[java.util.zip.CheckedInputStream.cksum]", "value", "dfc-generated"]
+      - ["java.util.zip", "CheckedInputStream", True, "getChecksum", "()", "", "Argument[this].SyntheticField[java.util.zip.CheckedInputStream.cksum]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.util.zip", "CheckedOutputStream", True, "CheckedOutputStream", "(OutputStream,Checksum)", "", "Argument[0]", "Argument[this]", "taint", "dfc-generated"]
+      - ["java.util.zip", "CheckedOutputStream", True, "CheckedOutputStream", "(OutputStream,Checksum)", "", "Argument[1]", "Argument[this].SyntheticField[java.util.zip.CheckedOutputStream.cksum]", "value", "dfc-generated"]
+      - ["java.util.zip", "CheckedOutputStream", True, "getChecksum", "()", "", "Argument[this].SyntheticField[java.util.zip.CheckedOutputStream.cksum]", "ReturnValue", "value", "dfc-generated"]
       - ["java.util.zip", "DataFormatException", True, "DataFormatException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.util.zip", "Deflater", True, "setInput", "(ByteBuffer)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.util.zip", "Deflater", True, "setInput", "(byte[])", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
@@ -19,20 +18,16 @@ extensions:
       - ["java.util.zip", "DeflaterInputStream", True, "DeflaterInputStream", "(InputStream,Deflater)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
       - ["java.util.zip", "DeflaterInputStream", True, "DeflaterInputStream", "(InputStream,Deflater,int)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.util.zip", "DeflaterInputStream", True, "DeflaterInputStream", "(InputStream,Deflater,int)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["java.util.zip", "DeflaterOutputStream", True, "DeflaterOutputStream", "(OutputStream)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.util.zip", "DeflaterOutputStream", True, "DeflaterOutputStream", "(OutputStream,Deflater)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.util.zip", "DeflaterOutputStream", True, "DeflaterOutputStream", "(OutputStream,Deflater)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["java.util.zip", "DeflaterOutputStream", True, "DeflaterOutputStream", "(OutputStream,Deflater,boolean)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.util.zip", "DeflaterOutputStream", True, "DeflaterOutputStream", "(OutputStream,Deflater,boolean)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["java.util.zip", "DeflaterOutputStream", True, "DeflaterOutputStream", "(OutputStream,Deflater,int)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.util.zip", "DeflaterOutputStream", True, "DeflaterOutputStream", "(OutputStream,Deflater,int)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["java.util.zip", "DeflaterOutputStream", True, "DeflaterOutputStream", "(OutputStream,Deflater,int,boolean)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.util.zip", "DeflaterOutputStream", True, "DeflaterOutputStream", "(OutputStream,Deflater,int,boolean)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["java.util.zip", "DeflaterOutputStream", True, "DeflaterOutputStream", "(OutputStream,boolean)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.util.zip", "GZIPOutputStream", True, "GZIPOutputStream", "(OutputStream)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.util.zip", "GZIPOutputStream", True, "GZIPOutputStream", "(OutputStream,boolean)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.util.zip", "GZIPOutputStream", True, "GZIPOutputStream", "(OutputStream,int)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.util.zip", "GZIPOutputStream", True, "GZIPOutputStream", "(OutputStream,int,boolean)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util.zip", "DeflaterOutputStream", True, "DeflaterOutputStream", "(OutputStream)", "", "Argument[0]", "Argument[this]", "taint", "dfc-generated"]
+      - ["java.util.zip", "DeflaterOutputStream", True, "DeflaterOutputStream", "(OutputStream,Deflater)", "", "Argument[0]", "Argument[this]", "taint", "dfc-generated"]
+      - ["java.util.zip", "DeflaterOutputStream", True, "DeflaterOutputStream", "(OutputStream,Deflater,boolean)", "", "Argument[0]", "Argument[this]", "taint", "dfc-generated"]
+      - ["java.util.zip", "DeflaterOutputStream", True, "DeflaterOutputStream", "(OutputStream,Deflater,int)", "", "Argument[0]", "Argument[this]", "taint", "dfc-generated"]
+      - ["java.util.zip", "DeflaterOutputStream", True, "DeflaterOutputStream", "(OutputStream,Deflater,int,boolean)", "", "Argument[0]", "Argument[this]", "taint", "dfc-generated"]
+      - ["java.util.zip", "DeflaterOutputStream", True, "DeflaterOutputStream", "(OutputStream,boolean)", "", "Argument[0]", "Argument[this]", "taint", "dfc-generated"]
+      - ["java.util.zip", "GZIPOutputStream", True, "GZIPOutputStream", "(OutputStream)", "", "Argument[0]", "Argument[this]", "taint", "dfc-generated"]
+      - ["java.util.zip", "GZIPOutputStream", True, "GZIPOutputStream", "(OutputStream,boolean)", "", "Argument[0]", "Argument[this]", "taint", "dfc-generated"]
+      - ["java.util.zip", "GZIPOutputStream", True, "GZIPOutputStream", "(OutputStream,int)", "", "Argument[0]", "Argument[this]", "taint", "dfc-generated"]
+      - ["java.util.zip", "GZIPOutputStream", True, "GZIPOutputStream", "(OutputStream,int,boolean)", "", "Argument[0]", "Argument[this]", "taint", "dfc-generated"]
       - ["java.util.zip", "Inflater", True, "setInput", "(ByteBuffer)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.util.zip", "Inflater", True, "setInput", "(byte[])", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.util.zip", "Inflater", True, "setInput", "(byte[],int,int)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
@@ -41,55 +36,56 @@ extensions:
       - ["java.util.zip", "InflaterInputStream", True, "InflaterInputStream", "(InputStream,Inflater)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
       - ["java.util.zip", "InflaterInputStream", True, "InflaterInputStream", "(InputStream,Inflater,int)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.util.zip", "InflaterInputStream", True, "InflaterInputStream", "(InputStream,Inflater,int)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["java.util.zip", "InflaterOutputStream", True, "InflaterOutputStream", "(OutputStream)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.util.zip", "InflaterOutputStream", True, "InflaterOutputStream", "(OutputStream,Inflater)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.util.zip", "InflaterOutputStream", True, "InflaterOutputStream", "(OutputStream,Inflater)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["java.util.zip", "InflaterOutputStream", True, "InflaterOutputStream", "(OutputStream,Inflater,int)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.util.zip", "InflaterOutputStream", True, "InflaterOutputStream", "(OutputStream,Inflater,int)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util.zip", "InflaterOutputStream", True, "InflaterOutputStream", "(OutputStream)", "", "Argument[0]", "Argument[this]", "taint", "dfc-generated"]
+      - ["java.util.zip", "InflaterOutputStream", True, "InflaterOutputStream", "(OutputStream,Inflater)", "", "Argument[0]", "Argument[this]", "taint", "dfc-generated"]
+      - ["java.util.zip", "InflaterOutputStream", True, "InflaterOutputStream", "(OutputStream,Inflater,int)", "", "Argument[0]", "Argument[this]", "taint", "dfc-generated"]
       - ["java.util.zip", "ZipEntry", True, "ZipEntry", "(ZipEntry)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.util.zip", "ZipEntry", True, "getComment", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.util.zip", "ZipEntry", True, "getCreationTime", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.util.zip", "ZipEntry", True, "getExtra", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.util.zip", "ZipEntry", True, "getLastAccessTime", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.util.zip", "ZipEntry", True, "getLastModifiedTime", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.zip", "ZipEntry", True, "getComment", "()", "", "Argument[this].SyntheticField[java.util.zip.ZipEntry.comment]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.util.zip", "ZipEntry", True, "getCreationTime", "()", "", "Argument[this].SyntheticField[java.util.zip.ZipEntry.ctime]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.util.zip", "ZipEntry", True, "getExtra", "()", "", "Argument[this].SyntheticField[java.util.zip.ZipEntry.extra]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.util.zip", "ZipEntry", True, "getLastAccessTime", "()", "", "Argument[this].SyntheticField[java.util.zip.ZipEntry.atime]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.util.zip", "ZipEntry", True, "getLastModifiedTime", "()", "", "Argument[this].SyntheticField[java.util.zip.ZipEntry.mtime]", "ReturnValue", "value", "dfc-generated"]
       - ["java.util.zip", "ZipEntry", True, "getName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.util.zip", "ZipEntry", True, "setComment", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.util.zip", "ZipEntry", True, "setCreationTime", "(FileTime)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.util.zip", "ZipEntry", True, "setCreationTime", "(FileTime)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["java.util.zip", "ZipEntry", True, "setExtra", "(byte[])", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.util.zip", "ZipEntry", True, "setLastAccessTime", "(FileTime)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.util.zip", "ZipEntry", True, "setLastAccessTime", "(FileTime)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["java.util.zip", "ZipEntry", True, "setLastModifiedTime", "(FileTime)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.util.zip", "ZipEntry", True, "setLastModifiedTime", "(FileTime)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.util.zip", "ZipEntry", True, "setComment", "(String)", "", "Argument[0]", "Argument[this].SyntheticField[java.util.zip.ZipEntry.comment]", "value", "dfc-generated"]
+      - ["java.util.zip", "ZipEntry", True, "setCreationTime", "(FileTime)", "", "Argument[0]", "Argument[this].SyntheticField[java.util.zip.ZipEntry.ctime]", "value", "dfc-generated"]
+      - ["java.util.zip", "ZipEntry", True, "setCreationTime", "(FileTime)", "", "Argument[0]", "ReturnValue.SyntheticField[java.util.zip.ZipEntry.ctime]", "value", "dfc-generated"]
+      - ["java.util.zip", "ZipEntry", True, "setCreationTime", "(FileTime)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.util.zip", "ZipEntry", True, "setExtra", "(byte[])", "", "Argument[0]", "Argument[this].SyntheticField[java.util.zip.ZipEntry.extra]", "value", "dfc-generated"]
+      - ["java.util.zip", "ZipEntry", True, "setLastAccessTime", "(FileTime)", "", "Argument[0]", "Argument[this].SyntheticField[java.util.zip.ZipEntry.atime]", "value", "dfc-generated"]
+      - ["java.util.zip", "ZipEntry", True, "setLastAccessTime", "(FileTime)", "", "Argument[0]", "ReturnValue.SyntheticField[java.util.zip.ZipEntry.atime]", "value", "dfc-generated"]
+      - ["java.util.zip", "ZipEntry", True, "setLastAccessTime", "(FileTime)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["java.util.zip", "ZipEntry", True, "setLastModifiedTime", "(FileTime)", "", "Argument[0]", "Argument[this].SyntheticField[java.util.zip.ZipEntry.mtime]", "value", "dfc-generated"]
+      - ["java.util.zip", "ZipEntry", True, "setLastModifiedTime", "(FileTime)", "", "Argument[0]", "ReturnValue.SyntheticField[java.util.zip.ZipEntry.mtime]", "value", "dfc-generated"]
+      - ["java.util.zip", "ZipEntry", True, "setLastModifiedTime", "(FileTime)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
       - ["java.util.zip", "ZipError", True, "ZipError", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.util.zip", "ZipException", True, "ZipException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.util.zip", "ZipFile", True, "ZipFile", "(File)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.util.zip", "ZipFile", True, "ZipFile", "(File,Charset)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.util.zip", "ZipFile", True, "ZipFile", "(File,int)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.util.zip", "ZipFile", True, "ZipFile", "(File,int,Charset)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.util.zip", "ZipFile", True, "ZipFile", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.util.zip", "ZipFile", True, "ZipFile", "(String,Charset)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.util.zip", "ZipFile", True, "getEntry", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.util.zip", "ZipFile", True, "getEntry", "(String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["java.util.zip", "ZipFile", True, "getInputStream", "(ZipEntry)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.util.zip", "ZipFile", True, "getInputStream", "(ZipEntry)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["java.util.zip", "ZipFile", True, "getInputStream", "(ZipEntry)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.util.zip", "ZipFile", True, "getName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.util.zip", "ZipInputStream", True, "getNextEntry", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.util.zip", "ZipOutputStream", True, "ZipOutputStream", "(OutputStream)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.util.zip", "ZipOutputStream", True, "ZipOutputStream", "(OutputStream,Charset)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util.zip", "ZipOutputStream", True, "ZipOutputStream", "(OutputStream)", "", "Argument[0]", "Argument[this]", "taint", "dfc-generated"]
+      - ["java.util.zip", "ZipOutputStream", True, "ZipOutputStream", "(OutputStream,Charset)", "", "Argument[0]", "Argument[this]", "taint", "dfc-generated"]
       - ["java.util.zip", "ZipOutputStream", True, "putNextEntry", "(ZipEntry)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.util.zip", "ZipOutputStream", True, "setComment", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
   - addsTo:
       pack: codeql/java-all
       extensible: neutralModel
     data:
-      - ["java.util.zip", "Checksum", "getValue", "()", "summary", "df-generated"]
-      - ["java.util.zip", "Checksum", "reset", "()", "summary", "df-generated"]
+      - ["java.util.zip", "Adler32", "getValue", "()", "summary", "df-generated"]
+      - ["java.util.zip", "Adler32", "reset", "()", "summary", "df-generated"]
+      - ["java.util.zip", "Adler32", "update", "(ByteBuffer)", "summary", "df-generated"]
+      - ["java.util.zip", "Adler32", "update", "(byte[],int,int)", "summary", "df-generated"]
+      - ["java.util.zip", "Adler32", "update", "(int)", "summary", "df-generated"]
+      - ["java.util.zip", "CRC32", "getValue", "()", "summary", "df-generated"]
+      - ["java.util.zip", "CRC32", "reset", "()", "summary", "df-generated"]
+      - ["java.util.zip", "CRC32", "update", "(ByteBuffer)", "summary", "df-generated"]
+      - ["java.util.zip", "CRC32", "update", "(byte[],int,int)", "summary", "df-generated"]
+      - ["java.util.zip", "CRC32", "update", "(int)", "summary", "df-generated"]
+      - ["java.util.zip", "CRC32C", "getValue", "()", "summary", "df-generated"]
+      - ["java.util.zip", "CRC32C", "reset", "()", "summary", "df-generated"]
+      - ["java.util.zip", "CRC32C", "update", "(ByteBuffer)", "summary", "df-generated"]
+      - ["java.util.zip", "CRC32C", "update", "(byte[],int,int)", "summary", "df-generated"]
+      - ["java.util.zip", "CRC32C", "update", "(int)", "summary", "df-generated"]
+      - ["java.util.zip", "CheckedInputStream", "skip", "(long)", "summary", "df-generated"]
       - ["java.util.zip", "Checksum", "update", "(ByteBuffer)", "summary", "df-generated"]
       - ["java.util.zip", "Checksum", "update", "(byte[])", "summary", "df-generated"]
-      - ["java.util.zip", "Checksum", "update", "(byte[],int,int)", "summary", "df-generated"]
-      - ["java.util.zip", "Checksum", "update", "(int)", "summary", "df-generated"]
       - ["java.util.zip", "Deflater", "Deflater", "(int)", "summary", "df-generated"]
       - ["java.util.zip", "Deflater", "Deflater", "(int,boolean)", "summary", "df-generated"]
       - ["java.util.zip", "Deflater", "deflate", "(ByteBuffer)", "summary", "df-generated"]
@@ -112,7 +108,13 @@ extensions:
       - ["java.util.zip", "Deflater", "setDictionary", "(byte[],int,int)", "summary", "df-generated"]
       - ["java.util.zip", "Deflater", "setLevel", "(int)", "summary", "df-generated"]
       - ["java.util.zip", "Deflater", "setStrategy", "(int)", "summary", "df-generated"]
+      - ["java.util.zip", "DeflaterInputStream", "available", "()", "summary", "df-generated"]
+      - ["java.util.zip", "DeflaterInputStream", "mark", "(int)", "summary", "df-generated"]
+      - ["java.util.zip", "DeflaterInputStream", "markSupported", "()", "summary", "df-generated"]
+      - ["java.util.zip", "DeflaterInputStream", "reset", "()", "summary", "df-generated"]
+      - ["java.util.zip", "DeflaterInputStream", "skip", "(long)", "summary", "df-generated"]
       - ["java.util.zip", "DeflaterOutputStream", "finish", "()", "summary", "df-generated"]
+      - ["java.util.zip", "GZIPOutputStream", "finish", "()", "summary", "df-generated"]
       - ["java.util.zip", "Inflater", "Inflater", "(boolean)", "summary", "df-generated"]
       - ["java.util.zip", "Inflater", "end", "()", "summary", "df-generated"]
       - ["java.util.zip", "Inflater", "finished", "()", "summary", "df-generated"]
@@ -131,6 +133,11 @@ extensions:
       - ["java.util.zip", "Inflater", "setDictionary", "(ByteBuffer)", "summary", "df-generated"]
       - ["java.util.zip", "Inflater", "setDictionary", "(byte[])", "summary", "df-generated"]
       - ["java.util.zip", "Inflater", "setDictionary", "(byte[],int,int)", "summary", "df-generated"]
+      - ["java.util.zip", "InflaterInputStream", "available", "()", "summary", "df-generated"]
+      - ["java.util.zip", "InflaterInputStream", "mark", "(int)", "summary", "df-generated"]
+      - ["java.util.zip", "InflaterInputStream", "markSupported", "()", "summary", "df-generated"]
+      - ["java.util.zip", "InflaterInputStream", "reset", "()", "summary", "df-generated"]
+      - ["java.util.zip", "InflaterInputStream", "skip", "(long)", "summary", "df-generated"]
       - ["java.util.zip", "InflaterOutputStream", "finish", "()", "summary", "df-generated"]
       - ["java.util.zip", "ZipEntry", "getCompressedSize", "()", "summary", "df-generated"]
       - ["java.util.zip", "ZipEntry", "getCrc", "()", "summary", "df-generated"]
@@ -145,11 +152,11 @@ extensions:
       - ["java.util.zip", "ZipEntry", "setSize", "(long)", "summary", "df-generated"]
       - ["java.util.zip", "ZipEntry", "setTime", "(long)", "summary", "df-generated"]
       - ["java.util.zip", "ZipEntry", "setTimeLocal", "(LocalDateTime)", "summary", "df-generated"]
-      - ["java.util.zip", "ZipFile", "entries", "()", "summary", "df-generated"]
-      - ["java.util.zip", "ZipFile", "getComment", "()", "summary", "df-generated"]
       - ["java.util.zip", "ZipFile", "size", "()", "summary", "df-generated"]
-      - ["java.util.zip", "ZipFile", "stream", "()", "summary", "df-generated"]
+      - ["java.util.zip", "ZipInputStream", "available", "()", "summary", "df-generated"]
       - ["java.util.zip", "ZipInputStream", "closeEntry", "()", "summary", "df-generated"]
+      - ["java.util.zip", "ZipInputStream", "skip", "(long)", "summary", "df-generated"]
       - ["java.util.zip", "ZipOutputStream", "closeEntry", "()", "summary", "df-generated"]
+      - ["java.util.zip", "ZipOutputStream", "finish", "()", "summary", "df-generated"]
       - ["java.util.zip", "ZipOutputStream", "setLevel", "(int)", "summary", "df-generated"]
       - ["java.util.zip", "ZipOutputStream", "setMethod", "(int)", "summary", "df-generated"]
diff --git a/java/ql/lib/ext/generated/javax.accessibility.model.yml b/java/ql/lib/ext/generated/javax.accessibility.model.yml
index ff17aaf81e1..4c263912f23 100644
--- a/java/ql/lib/ext/generated/javax.accessibility.model.yml
+++ b/java/ql/lib/ext/generated/javax.accessibility.model.yml
@@ -4,64 +4,86 @@ extensions:
       pack: codeql/java-all
       extensible: summaryModel
     data:
-      - ["javax.accessibility", "Accessible", True, "getAccessibleContext", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.accessibility", "AccessibleAttributeSequence", True, "AccessibleAttributeSequence", "(int,int,AttributeSet)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.accessibility", "Accessible", True, "getAccessibleContext", "()", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.accessibility", "AccessibleAttributeSequence", True, "AccessibleAttributeSequence", "(int,int,AttributeSet)", "", "Argument[2]", "Argument[this].Field[javax.accessibility.AccessibleAttributeSequence.attributes]", "value", "dfc-generated"]
       - ["javax.accessibility", "AccessibleBundle", True, "toDisplayString", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.accessibility", "AccessibleBundle", True, "toDisplayString", "(Locale)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["javax.accessibility", "AccessibleBundle", True, "toDisplayString", "(Locale)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.accessibility", "AccessibleContext", True, "getAccessibleDescription", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.accessibility", "AccessibleContext", True, "getAccessibleName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.accessibility", "AccessibleContext", True, "getAccessibleParent", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.accessibility", "AccessibleComponent", True, "getAccessibleAt", "(Point)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.accessibility", "AccessibleComponent", True, "getBackground", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.accessibility", "AccessibleComponent", True, "getCursor", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.accessibility", "AccessibleComponent", True, "getFont", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.accessibility", "AccessibleComponent", True, "getFontMetrics", "(Font)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.accessibility", "AccessibleComponent", True, "getFontMetrics", "(Font)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.accessibility", "AccessibleComponent", True, "getForeground", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.accessibility", "AccessibleComponent", True, "setBackground", "(Color)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.accessibility", "AccessibleComponent", True, "setCursor", "(Cursor)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.accessibility", "AccessibleComponent", True, "setFont", "(Font)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.accessibility", "AccessibleComponent", True, "setForeground", "(Color)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.accessibility", "AccessibleContext", True, "getAccessibleAction", "()", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.accessibility", "AccessibleContext", True, "getAccessibleChild", "(int)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.accessibility", "AccessibleContext", True, "getAccessibleComponent", "()", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.accessibility", "AccessibleContext", True, "getAccessibleDescription", "()", "", "Argument[this].SyntheticField[javax.accessibility.AccessibleContext.accessibleDescription]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.accessibility", "AccessibleContext", True, "getAccessibleEditableText", "()", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.accessibility", "AccessibleContext", True, "getAccessibleIcon", "()", "", "Argument[this]", "ReturnValue.ArrayElement", "value", "dfc-generated"]
+      - ["javax.accessibility", "AccessibleContext", True, "getAccessibleName", "()", "", "Argument[this].SyntheticField[javax.accessibility.AccessibleContext.accessibleName]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.accessibility", "AccessibleContext", True, "getAccessibleParent", "()", "", "Argument[this].SyntheticField[javax.accessibility.AccessibleContext.accessibleParent]", "ReturnValue", "value", "dfc-generated"]
       - ["javax.accessibility", "AccessibleContext", True, "getAccessibleRelationSet", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.accessibility", "AccessibleContext", True, "setAccessibleDescription", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.accessibility", "AccessibleContext", True, "setAccessibleName", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.accessibility", "AccessibleContext", True, "setAccessibleParent", "(Accessible)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.accessibility", "AccessibleRelation", True, "AccessibleRelation", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.accessibility", "AccessibleRelation", True, "AccessibleRelation", "(String,Object)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.accessibility", "AccessibleRelation", True, "AccessibleRelation", "(String,Object)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.accessibility", "AccessibleRelation", True, "AccessibleRelation", "(String,Object[])", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.accessibility", "AccessibleRelation", True, "AccessibleRelation", "(String,Object[])", "", "Argument[1].ArrayElement", "Argument[this]", "taint", "df-generated"]
-      - ["javax.accessibility", "AccessibleRelation", True, "getKey", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.accessibility", "AccessibleRelation", True, "getTarget", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.accessibility", "AccessibleRelation", True, "setTarget", "(Object)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.accessibility", "AccessibleRelation", True, "setTarget", "(Object[])", "", "Argument[0].ArrayElement", "Argument[this]", "taint", "df-generated"]
-      - ["javax.accessibility", "AccessibleRelationSet", True, "AccessibleRelationSet", "(AccessibleRelation[])", "", "Argument[0].ArrayElement", "Argument[this]", "taint", "df-generated"]
-      - ["javax.accessibility", "AccessibleRelationSet", True, "add", "(AccessibleRelation)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.accessibility", "AccessibleRelationSet", True, "addAll", "(AccessibleRelation[])", "", "Argument[0].ArrayElement", "Argument[this]", "taint", "df-generated"]
-      - ["javax.accessibility", "AccessibleRelationSet", True, "get", "(String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.accessibility", "AccessibleRelationSet", True, "toArray", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.accessibility", "AccessibleStateSet", True, "AccessibleStateSet", "(AccessibleState[])", "", "Argument[0].ArrayElement", "Argument[this]", "taint", "df-generated"]
-      - ["javax.accessibility", "AccessibleStateSet", True, "add", "(AccessibleState)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.accessibility", "AccessibleStateSet", True, "addAll", "(AccessibleState[])", "", "Argument[0].ArrayElement", "Argument[this]", "taint", "df-generated"]
-      - ["javax.accessibility", "AccessibleStateSet", True, "toArray", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.accessibility", "AccessibleTextSequence", True, "AccessibleTextSequence", "(int,int,String)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.accessibility", "AccessibleContext", True, "getAccessibleSelection", "()", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.accessibility", "AccessibleContext", True, "getAccessibleTable", "()", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.accessibility", "AccessibleContext", True, "getAccessibleText", "()", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.accessibility", "AccessibleContext", True, "getAccessibleValue", "()", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.accessibility", "AccessibleContext", True, "getLocale", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.accessibility", "AccessibleContext", True, "setAccessibleDescription", "(String)", "", "Argument[0]", "Argument[this].SyntheticField[javax.accessibility.AccessibleContext.accessibleDescription]", "value", "dfc-generated"]
+      - ["javax.accessibility", "AccessibleContext", True, "setAccessibleName", "(String)", "", "Argument[0]", "Argument[this].SyntheticField[javax.accessibility.AccessibleContext.accessibleName]", "value", "dfc-generated"]
+      - ["javax.accessibility", "AccessibleContext", True, "setAccessibleParent", "(Accessible)", "", "Argument[0]", "Argument[this].SyntheticField[javax.accessibility.AccessibleContext.accessibleParent]", "value", "dfc-generated"]
+      - ["javax.accessibility", "AccessibleHypertext", True, "getLink", "(int)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.accessibility", "AccessibleRelation", True, "AccessibleRelation", "(String)", "", "Argument[0]", "Argument[this].SyntheticField[javax.accessibility.AccessibleBundle.key]", "value", "dfc-generated"]
+      - ["javax.accessibility", "AccessibleRelation", True, "AccessibleRelation", "(String,Object)", "", "Argument[0]", "Argument[this].SyntheticField[javax.accessibility.AccessibleBundle.key]", "value", "dfc-generated"]
+      - ["javax.accessibility", "AccessibleRelation", True, "AccessibleRelation", "(String,Object)", "", "Argument[1]", "Argument[this].SyntheticField[javax.accessibility.AccessibleRelation.target].ArrayElement", "value", "dfc-generated"]
+      - ["javax.accessibility", "AccessibleRelation", True, "AccessibleRelation", "(String,Object[])", "", "Argument[0]", "Argument[this].SyntheticField[javax.accessibility.AccessibleBundle.key]", "value", "dfc-generated"]
+      - ["javax.accessibility", "AccessibleRelation", True, "AccessibleRelation", "(String,Object[])", "", "Argument[1]", "Argument[this].SyntheticField[javax.accessibility.AccessibleRelation.target]", "value", "dfc-generated"]
+      - ["javax.accessibility", "AccessibleRelation", True, "getKey", "()", "", "Argument[this].SyntheticField[javax.accessibility.AccessibleBundle.key]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.accessibility", "AccessibleRelation", True, "getTarget", "()", "", "Argument[this].SyntheticField[javax.accessibility.AccessibleRelation.target].ArrayElement", "ReturnValue.ArrayElement", "value", "dfc-generated"]
+      - ["javax.accessibility", "AccessibleRelation", True, "setTarget", "(Object)", "", "Argument[0]", "Argument[this].SyntheticField[javax.accessibility.AccessibleRelation.target].ArrayElement", "value", "dfc-generated"]
+      - ["javax.accessibility", "AccessibleRelation", True, "setTarget", "(Object[])", "", "Argument[0]", "Argument[this].SyntheticField[javax.accessibility.AccessibleRelation.target]", "value", "dfc-generated"]
+      - ["javax.accessibility", "AccessibleRelationSet", True, "AccessibleRelationSet", "(AccessibleRelation[])", "", "Argument[0].ArrayElement", "Argument[this].SyntheticField[javax.accessibility.AccessibleRelationSet.relations].Element", "value", "dfc-generated"]
+      - ["javax.accessibility", "AccessibleRelationSet", True, "add", "(AccessibleRelation)", "", "Argument[0]", "Argument[this].SyntheticField[javax.accessibility.AccessibleRelationSet.relations].Element", "value", "dfc-generated"]
+      - ["javax.accessibility", "AccessibleRelationSet", True, "addAll", "(AccessibleRelation[])", "", "Argument[0].ArrayElement", "Argument[this].SyntheticField[javax.accessibility.AccessibleRelationSet.relations].Element", "value", "dfc-generated"]
+      - ["javax.accessibility", "AccessibleRelationSet", True, "get", "(String)", "", "Argument[this].SyntheticField[javax.accessibility.AccessibleRelationSet.relations].Element", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.accessibility", "AccessibleRelationSet", True, "toArray", "()", "", "Argument[this].SyntheticField[javax.accessibility.AccessibleRelationSet.relations].Element", "ReturnValue.ArrayElement", "value", "dfc-generated"]
+      - ["javax.accessibility", "AccessibleSelection", True, "getAccessibleSelection", "(int)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.accessibility", "AccessibleStateSet", True, "AccessibleStateSet", "(AccessibleState[])", "", "Argument[0].ArrayElement", "Argument[this].SyntheticField[javax.accessibility.AccessibleStateSet.states].Element", "value", "dfc-generated"]
+      - ["javax.accessibility", "AccessibleStateSet", True, "add", "(AccessibleState)", "", "Argument[0]", "Argument[this].SyntheticField[javax.accessibility.AccessibleStateSet.states].Element", "value", "dfc-generated"]
+      - ["javax.accessibility", "AccessibleStateSet", True, "addAll", "(AccessibleState[])", "", "Argument[0].ArrayElement", "Argument[this].SyntheticField[javax.accessibility.AccessibleStateSet.states].Element", "value", "dfc-generated"]
+      - ["javax.accessibility", "AccessibleStateSet", True, "toArray", "()", "", "Argument[this].SyntheticField[javax.accessibility.AccessibleStateSet.states].Element", "ReturnValue.ArrayElement", "value", "dfc-generated"]
+      - ["javax.accessibility", "AccessibleTable", True, "getAccessibleAt", "(int,int)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.accessibility", "AccessibleTable", True, "getAccessibleCaption", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.accessibility", "AccessibleTable", True, "getAccessibleColumnDescription", "(int)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.accessibility", "AccessibleTable", True, "getAccessibleRowDescription", "(int)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.accessibility", "AccessibleTable", True, "getAccessibleRowHeader", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.accessibility", "AccessibleTable", True, "getAccessibleSummary", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.accessibility", "AccessibleTable", True, "setAccessibleCaption", "(Accessible)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.accessibility", "AccessibleTable", True, "setAccessibleColumnDescription", "(int,Accessible)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.accessibility", "AccessibleTable", True, "setAccessibleRowDescription", "(int,Accessible)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.accessibility", "AccessibleTable", True, "setAccessibleSummary", "(Accessible)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.accessibility", "AccessibleTextSequence", True, "AccessibleTextSequence", "(int,int,String)", "", "Argument[2]", "Argument[this].Field[javax.accessibility.AccessibleTextSequence.text]", "value", "dfc-generated"]
   - addsTo:
       pack: codeql/java-all
       extensible: neutralModel
     data:
       - ["javax.accessibility", "AccessibilityProvider", "activate", "()", "summary", "df-generated"]
       - ["javax.accessibility", "AccessibilityProvider", "getName", "()", "summary", "df-generated"]
-      - ["javax.accessibility", "AccessibleAction", "doAccessibleAction", "(int)", "summary", "df-generated"]
-      - ["javax.accessibility", "AccessibleAction", "getAccessibleActionCount", "()", "summary", "df-generated"]
-      - ["javax.accessibility", "AccessibleAction", "getAccessibleActionDescription", "(int)", "summary", "df-generated"]
       - ["javax.accessibility", "AccessibleContext", "addPropertyChangeListener", "(PropertyChangeListener)", "summary", "df-generated"]
       - ["javax.accessibility", "AccessibleContext", "firePropertyChange", "(String,Object,Object)", "summary", "df-generated"]
-      - ["javax.accessibility", "AccessibleContext", "getAccessibleAction", "()", "summary", "df-generated"]
-      - ["javax.accessibility", "AccessibleContext", "getAccessibleChild", "(int)", "summary", "df-generated"]
       - ["javax.accessibility", "AccessibleContext", "getAccessibleChildrenCount", "()", "summary", "df-generated"]
-      - ["javax.accessibility", "AccessibleContext", "getAccessibleComponent", "()", "summary", "df-generated"]
-      - ["javax.accessibility", "AccessibleContext", "getAccessibleEditableText", "()", "summary", "df-generated"]
-      - ["javax.accessibility", "AccessibleContext", "getAccessibleIcon", "()", "summary", "df-generated"]
       - ["javax.accessibility", "AccessibleContext", "getAccessibleIndexInParent", "()", "summary", "df-generated"]
       - ["javax.accessibility", "AccessibleContext", "getAccessibleRole", "()", "summary", "df-generated"]
-      - ["javax.accessibility", "AccessibleContext", "getAccessibleSelection", "()", "summary", "df-generated"]
       - ["javax.accessibility", "AccessibleContext", "getAccessibleStateSet", "()", "summary", "df-generated"]
-      - ["javax.accessibility", "AccessibleContext", "getAccessibleTable", "()", "summary", "df-generated"]
-      - ["javax.accessibility", "AccessibleContext", "getAccessibleText", "()", "summary", "df-generated"]
-      - ["javax.accessibility", "AccessibleContext", "getAccessibleValue", "()", "summary", "df-generated"]
-      - ["javax.accessibility", "AccessibleContext", "getLocale", "()", "summary", "df-generated"]
       - ["javax.accessibility", "AccessibleContext", "removePropertyChangeListener", "(PropertyChangeListener)", "summary", "df-generated"]
+      - ["javax.accessibility", "AccessibleHyperlink", "doAccessibleAction", "(int)", "summary", "df-generated"]
       - ["javax.accessibility", "AccessibleHyperlink", "getAccessibleActionAnchor", "(int)", "summary", "df-generated"]
+      - ["javax.accessibility", "AccessibleHyperlink", "getAccessibleActionCount", "()", "summary", "df-generated"]
+      - ["javax.accessibility", "AccessibleHyperlink", "getAccessibleActionDescription", "(int)", "summary", "df-generated"]
       - ["javax.accessibility", "AccessibleHyperlink", "getAccessibleActionObject", "(int)", "summary", "df-generated"]
       - ["javax.accessibility", "AccessibleHyperlink", "getEndIndex", "()", "summary", "df-generated"]
       - ["javax.accessibility", "AccessibleHyperlink", "getStartIndex", "()", "summary", "df-generated"]
@@ -70,6 +92,7 @@ extensions:
       - ["javax.accessibility", "AccessibleRelationSet", "contains", "(String)", "summary", "df-generated"]
       - ["javax.accessibility", "AccessibleRelationSet", "remove", "(AccessibleRelation)", "summary", "df-generated"]
       - ["javax.accessibility", "AccessibleRelationSet", "size", "()", "summary", "df-generated"]
+      - ["javax.accessibility", "AccessibleResourceBundle", "getContents", "()", "summary", "df-generated"]
       - ["javax.accessibility", "AccessibleStateSet", "clear", "()", "summary", "df-generated"]
       - ["javax.accessibility", "AccessibleStateSet", "contains", "(AccessibleState)", "summary", "df-generated"]
       - ["javax.accessibility", "AccessibleStateSet", "remove", "(AccessibleState)", "summary", "df-generated"]
diff --git a/java/ql/lib/ext/generated/javax.annotation.processing.model.yml b/java/ql/lib/ext/generated/javax.annotation.processing.model.yml
index 6f80ce5dce9..48e9e25079a 100644
--- a/java/ql/lib/ext/generated/javax.annotation.processing.model.yml
+++ b/java/ql/lib/ext/generated/javax.annotation.processing.model.yml
@@ -6,20 +6,39 @@ extensions:
     data:
       - ["javax.annotation.processing", "Completion", True, "getMessage", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["javax.annotation.processing", "Completion", True, "getValue", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.annotation.processing", "Completions", True, "of", "(String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.annotation.processing", "Completions", True, "of", "(String,String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.annotation.processing", "Completions", True, "of", "(String,String)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.annotation.processing", "Completions", True, "of", "(String)", "", "Argument[0]", "ReturnValue.SyntheticField[javax.annotation.processing.Completions$SimpleCompletion.value]", "value", "dfc-generated"]
+      - ["javax.annotation.processing", "Completions", True, "of", "(String,String)", "", "Argument[0]", "ReturnValue.SyntheticField[javax.annotation.processing.Completions$SimpleCompletion.value]", "value", "dfc-generated"]
+      - ["javax.annotation.processing", "Completions", True, "of", "(String,String)", "", "Argument[1]", "ReturnValue.SyntheticField[javax.annotation.processing.Completions$SimpleCompletion.message]", "value", "dfc-generated"]
+      - ["javax.annotation.processing", "Filer", True, "createClassFile", "(CharSequence,Element[])", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.annotation.processing", "Filer", True, "createResource", "(JavaFileManager$Location,CharSequence,CharSequence,Element[])", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.annotation.processing", "Filer", True, "createResource", "(JavaFileManager$Location,CharSequence,CharSequence,Element[])", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.annotation.processing", "Filer", True, "createResource", "(JavaFileManager$Location,CharSequence,CharSequence,Element[])", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.annotation.processing", "Filer", True, "createResource", "(JavaFileManager$Location,CharSequence,CharSequence,Element[])", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.annotation.processing", "Filer", True, "createSourceFile", "(CharSequence,Element[])", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.annotation.processing", "Filer", True, "getResource", "(JavaFileManager$Location,CharSequence,CharSequence)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.annotation.processing", "Filer", True, "getResource", "(JavaFileManager$Location,CharSequence,CharSequence)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.annotation.processing", "Filer", True, "getResource", "(JavaFileManager$Location,CharSequence,CharSequence)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.annotation.processing", "Filer", True, "getResource", "(JavaFileManager$Location,CharSequence,CharSequence)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["javax.annotation.processing", "FilerException", True, "FilerException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.annotation.processing", "ProcessingEnvironment", True, "getElementUtils", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.annotation.processing", "ProcessingEnvironment", True, "getFiler", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.annotation.processing", "ProcessingEnvironment", True, "getLocale", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.annotation.processing", "ProcessingEnvironment", True, "getMessager", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.annotation.processing", "ProcessingEnvironment", True, "getOptions", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.annotation.processing", "ProcessingEnvironment", True, "getTypeUtils", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["javax.annotation.processing", "Processor", True, "init", "(ProcessingEnvironment)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.annotation.processing", "RoundEnvironment", True, "getElementsAnnotatedWith", "(Class)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.annotation.processing", "RoundEnvironment", True, "getElementsAnnotatedWith", "(TypeElement)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["javax.annotation.processing", "RoundEnvironment", True, "getElementsAnnotatedWithAny", "(Set)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["javax.annotation.processing", "RoundEnvironment", True, "getElementsAnnotatedWithAny", "(TypeElement[])", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.annotation.processing", "RoundEnvironment", True, "getRootElements", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
   - addsTo:
       pack: codeql/java-all
       extensible: neutralModel
     data:
+      - ["javax.annotation.processing", "AbstractProcessor", "getCompletions", "(Element,AnnotationMirror,ExecutableElement,String)", "summary", "df-generated"]
+      - ["javax.annotation.processing", "AbstractProcessor", "getSupportedAnnotationTypes", "()", "summary", "df-generated"]
+      - ["javax.annotation.processing", "AbstractProcessor", "getSupportedOptions", "()", "summary", "df-generated"]
+      - ["javax.annotation.processing", "AbstractProcessor", "getSupportedSourceVersion", "()", "summary", "df-generated"]
+      - ["javax.annotation.processing", "AbstractProcessor", "process", "(Set,RoundEnvironment)", "summary", "df-generated"]
       - ["javax.annotation.processing", "ProcessingEnvironment", "isPreviewEnabled", "()", "summary", "df-generated"]
-      - ["javax.annotation.processing", "Processor", "getCompletions", "(Element,AnnotationMirror,ExecutableElement,String)", "summary", "df-generated"]
-      - ["javax.annotation.processing", "Processor", "getSupportedAnnotationTypes", "()", "summary", "df-generated"]
-      - ["javax.annotation.processing", "Processor", "getSupportedOptions", "()", "summary", "df-generated"]
-      - ["javax.annotation.processing", "Processor", "getSupportedSourceVersion", "()", "summary", "df-generated"]
-      - ["javax.annotation.processing", "Processor", "process", "(Set,RoundEnvironment)", "summary", "df-generated"]
diff --git a/java/ql/lib/ext/generated/javax.crypto.interfaces.model.yml b/java/ql/lib/ext/generated/javax.crypto.interfaces.model.yml
new file mode 100644
index 00000000000..30fbec308c8
--- /dev/null
+++ b/java/ql/lib/ext/generated/javax.crypto.interfaces.model.yml
@@ -0,0 +1,9 @@
+# THIS FILE IS AN AUTO-GENERATED MODELS AS DATA FILE. DO NOT EDIT.
+extensions:
+  - addsTo:
+      pack: codeql/java-all
+      extensible: summaryModel
+    data:
+      - ["javax.crypto.interfaces", "DHKey", True, "getParams", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.crypto.interfaces", "PBEKey", True, "getPassword", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.crypto.interfaces", "PBEKey", True, "getSalt", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
diff --git a/java/ql/lib/ext/generated/javax.crypto.model.yml b/java/ql/lib/ext/generated/javax.crypto.model.yml
index 727ba26863f..1e917f8d6ab 100644
--- a/java/ql/lib/ext/generated/javax.crypto.model.yml
+++ b/java/ql/lib/ext/generated/javax.crypto.model.yml
@@ -8,26 +8,25 @@ extensions:
       - ["javax.crypto", "BadPaddingException", True, "BadPaddingException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["javax.crypto", "CipherInputStream", True, "CipherInputStream", "(InputStream,Cipher)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["javax.crypto", "CipherInputStream", True, "CipherInputStream", "(InputStream,Cipher)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.crypto", "CipherOutputStream", True, "CipherOutputStream", "(OutputStream,Cipher)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.crypto", "CipherOutputStream", True, "CipherOutputStream", "(OutputStream,Cipher)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.crypto", "EncryptedPrivateKeyInfo", True, "EncryptedPrivateKeyInfo", "(AlgorithmParameters,byte[])", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.crypto", "EncryptedPrivateKeyInfo", True, "EncryptedPrivateKeyInfo", "(AlgorithmParameters,byte[])", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.crypto", "EncryptedPrivateKeyInfo", True, "EncryptedPrivateKeyInfo", "(String,byte[])", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.crypto", "EncryptedPrivateKeyInfo", True, "EncryptedPrivateKeyInfo", "(byte[])", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.crypto", "CipherOutputStream", True, "CipherOutputStream", "(OutputStream,Cipher)", "", "Argument[0]", "Argument[this]", "taint", "dfc-generated"]
+      - ["javax.crypto", "EncryptedPrivateKeyInfo", True, "EncryptedPrivateKeyInfo", "(AlgorithmParameters,byte[])", "", "Argument[1]", "Argument[this].SyntheticField[javax.crypto.EncryptedPrivateKeyInfo.encryptedData]", "value", "dfc-generated"]
+      - ["javax.crypto", "EncryptedPrivateKeyInfo", True, "EncryptedPrivateKeyInfo", "(String,byte[])", "", "Argument[1]", "Argument[this].SyntheticField[javax.crypto.EncryptedPrivateKeyInfo.encryptedData]", "value", "dfc-generated"]
+      - ["javax.crypto", "EncryptedPrivateKeyInfo", True, "EncryptedPrivateKeyInfo", "(byte[])", "", "Argument[0].ArrayElement", "Argument[this].SyntheticField[javax.crypto.EncryptedPrivateKeyInfo.encryptedData].ArrayElement", "value", "dfc-generated"]
+      - ["javax.crypto", "EncryptedPrivateKeyInfo", True, "EncryptedPrivateKeyInfo", "(byte[])", "", "Argument[0]", "Argument[this].SyntheticField[javax.crypto.EncryptedPrivateKeyInfo.encoded]", "value", "dfc-generated"]
+      - ["javax.crypto", "EncryptedPrivateKeyInfo", True, "EncryptedPrivateKeyInfo", "(byte[])", "", "Argument[this].SyntheticField[javax.crypto.EncryptedPrivateKeyInfo.encoded].ArrayElement", "Argument[this].SyntheticField[javax.crypto.EncryptedPrivateKeyInfo.encryptedData].ArrayElement", "value", "dfc-generated"]
       - ["javax.crypto", "EncryptedPrivateKeyInfo", True, "getAlgParameters", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.crypto", "EncryptedPrivateKeyInfo", True, "getEncoded", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.crypto", "EncryptedPrivateKeyInfo", True, "getEncryptedData", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.crypto", "EncryptedPrivateKeyInfo", True, "getKeySpec", "(Cipher)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.crypto", "EncryptedPrivateKeyInfo", True, "getKeySpec", "(Cipher)", "", "Argument[this]", "Argument[0]", "taint", "df-generated"]
+      - ["javax.crypto", "EncryptedPrivateKeyInfo", True, "getEncoded", "()", "", "Argument[this].SyntheticField[javax.crypto.EncryptedPrivateKeyInfo.encoded]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.crypto", "EncryptedPrivateKeyInfo", True, "getEncoded", "()", "", "Argument[this].SyntheticField[javax.crypto.EncryptedPrivateKeyInfo.encryptedData]", "Argument[this].SyntheticField[javax.crypto.EncryptedPrivateKeyInfo.encoded]", "taint", "dfc-generated"]
+      - ["javax.crypto", "EncryptedPrivateKeyInfo", True, "getEncoded", "()", "", "Argument[this].SyntheticField[javax.crypto.EncryptedPrivateKeyInfo.encryptedData]", "ReturnValue", "taint", "dfc-generated"]
+      - ["javax.crypto", "EncryptedPrivateKeyInfo", True, "getEncryptedData", "()", "", "Argument[this].SyntheticField[javax.crypto.EncryptedPrivateKeyInfo.encryptedData]", "ReturnValue", "value", "dfc-generated"]
       - ["javax.crypto", "EncryptedPrivateKeyInfo", True, "getKeySpec", "(Cipher)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["javax.crypto", "EncryptedPrivateKeyInfo", True, "getKeySpec", "(Key)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["javax.crypto", "EncryptedPrivateKeyInfo", True, "getKeySpec", "(Key,Provider)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["javax.crypto", "EncryptedPrivateKeyInfo", True, "getKeySpec", "(Key,String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.crypto", "ExemptionMechanism", True, "getInstance", "(String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.crypto", "ExemptionMechanism", True, "getInstance", "(String,Provider)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.crypto", "ExemptionMechanism", True, "getInstance", "(String,Provider)", "", "Argument[1].Element", "ReturnValue", "taint", "df-generated"]
-      - ["javax.crypto", "ExemptionMechanism", True, "getInstance", "(String,String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.crypto", "ExemptionMechanism", True, "getName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.crypto", "ExemptionMechanism", True, "getInstance", "(String)", "", "Argument[0]", "ReturnValue.SyntheticField[javax.crypto.ExemptionMechanism.mechanism]", "value", "dfc-generated"]
+      - ["javax.crypto", "ExemptionMechanism", True, "getInstance", "(String,Provider)", "", "Argument[0]", "ReturnValue.SyntheticField[javax.crypto.ExemptionMechanism.mechanism]", "value", "dfc-generated"]
+      - ["javax.crypto", "ExemptionMechanism", True, "getInstance", "(String,String)", "", "Argument[0]", "ReturnValue.SyntheticField[javax.crypto.ExemptionMechanism.mechanism]", "value", "dfc-generated"]
+      - ["javax.crypto", "ExemptionMechanism", True, "getName", "()", "", "Argument[this].SyntheticField[javax.crypto.ExemptionMechanism.mechanism]", "ReturnValue", "value", "dfc-generated"]
       - ["javax.crypto", "ExemptionMechanism", True, "getProvider", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["javax.crypto", "ExemptionMechanism", True, "init", "(Key)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["javax.crypto", "ExemptionMechanism", True, "init", "(Key,AlgorithmParameterSpec)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
@@ -37,58 +36,42 @@ extensions:
       - ["javax.crypto", "KeyAgreement", True, "doPhase", "(Key,boolean)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["javax.crypto", "KeyAgreement", True, "generateSecret", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["javax.crypto", "KeyAgreement", True, "generateSecret", "(String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.crypto", "KeyAgreement", True, "generateSecret", "(String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["javax.crypto", "KeyAgreement", True, "generateSecret", "(byte[],int)", "", "Argument[this]", "Argument[0]", "taint", "df-generated"]
-      - ["javax.crypto", "KeyAgreement", True, "getAlgorithm", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.crypto", "KeyAgreement", True, "getInstance", "(String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.crypto", "KeyAgreement", True, "getInstance", "(String,Provider)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.crypto", "KeyAgreement", True, "getInstance", "(String,Provider)", "", "Argument[1].Element", "ReturnValue", "taint", "df-generated"]
-      - ["javax.crypto", "KeyAgreement", True, "getInstance", "(String,String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.crypto", "KeyAgreement", True, "getAlgorithm", "()", "", "Argument[this].SyntheticField[javax.crypto.KeyAgreement.algorithm]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.crypto", "KeyAgreement", True, "getInstance", "(String)", "", "Argument[0]", "ReturnValue.SyntheticField[javax.crypto.KeyAgreement.algorithm]", "value", "dfc-generated"]
+      - ["javax.crypto", "KeyAgreement", True, "getInstance", "(String,Provider)", "", "Argument[0]", "ReturnValue.SyntheticField[javax.crypto.KeyAgreement.algorithm]", "value", "dfc-generated"]
+      - ["javax.crypto", "KeyAgreement", True, "getInstance", "(String,String)", "", "Argument[0]", "ReturnValue.SyntheticField[javax.crypto.KeyAgreement.algorithm]", "value", "dfc-generated"]
       - ["javax.crypto", "KeyAgreement", True, "getProvider", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["javax.crypto", "KeyAgreement", True, "init", "(Key)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["javax.crypto", "KeyAgreement", True, "init", "(Key,AlgorithmParameterSpec)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["javax.crypto", "KeyAgreement", True, "init", "(Key,AlgorithmParameterSpec,SecureRandom)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["javax.crypto", "KeyAgreement", True, "init", "(Key,SecureRandom)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["javax.crypto", "KeyGenerator", True, "generateKey", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.crypto", "KeyGenerator", True, "getAlgorithm", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.crypto", "KeyGenerator", True, "getInstance", "(String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.crypto", "KeyGenerator", True, "getInstance", "(String,Provider)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.crypto", "KeyGenerator", True, "getInstance", "(String,Provider)", "", "Argument[1].Element", "ReturnValue", "taint", "df-generated"]
-      - ["javax.crypto", "KeyGenerator", True, "getInstance", "(String,String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.crypto", "KeyGenerator", True, "getAlgorithm", "()", "", "Argument[this].SyntheticField[javax.crypto.KeyGenerator.algorithm]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.crypto", "KeyGenerator", True, "getInstance", "(String)", "", "Argument[0]", "ReturnValue.SyntheticField[javax.crypto.KeyGenerator.algorithm]", "value", "dfc-generated"]
+      - ["javax.crypto", "KeyGenerator", True, "getInstance", "(String,Provider)", "", "Argument[0]", "ReturnValue.SyntheticField[javax.crypto.KeyGenerator.algorithm]", "value", "dfc-generated"]
+      - ["javax.crypto", "KeyGenerator", True, "getInstance", "(String,String)", "", "Argument[0]", "ReturnValue.SyntheticField[javax.crypto.KeyGenerator.algorithm]", "value", "dfc-generated"]
       - ["javax.crypto", "KeyGenerator", True, "getProvider", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["javax.crypto", "KeyGenerator", True, "init", "(AlgorithmParameterSpec)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["javax.crypto", "KeyGenerator", True, "init", "(AlgorithmParameterSpec,SecureRandom)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["javax.crypto", "KeyGenerator", True, "init", "(AlgorithmParameterSpec,SecureRandom)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
       - ["javax.crypto", "KeyGenerator", True, "init", "(SecureRandom)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["javax.crypto", "KeyGenerator", True, "init", "(int,SecureRandom)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.crypto", "Mac", True, "doFinal", "(byte[])", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.crypto", "Mac", True, "doFinal", "(byte[],int)", "", "Argument[this]", "Argument[0]", "taint", "df-generated"]
-      - ["javax.crypto", "Mac", True, "getAlgorithm", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.crypto", "Mac", True, "getInstance", "(String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.crypto", "Mac", True, "getInstance", "(String,Provider)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.crypto", "Mac", True, "getInstance", "(String,Provider)", "", "Argument[1].Element", "ReturnValue", "taint", "df-generated"]
-      - ["javax.crypto", "Mac", True, "getInstance", "(String,String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.crypto", "Mac", True, "getAlgorithm", "()", "", "Argument[this].SyntheticField[javax.crypto.Mac.algorithm]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.crypto", "Mac", True, "getInstance", "(String)", "", "Argument[0]", "ReturnValue.SyntheticField[javax.crypto.Mac.algorithm]", "value", "dfc-generated"]
+      - ["javax.crypto", "Mac", True, "getInstance", "(String,Provider)", "", "Argument[0]", "ReturnValue.SyntheticField[javax.crypto.Mac.algorithm]", "value", "dfc-generated"]
+      - ["javax.crypto", "Mac", True, "getInstance", "(String,String)", "", "Argument[0]", "ReturnValue.SyntheticField[javax.crypto.Mac.algorithm]", "value", "dfc-generated"]
       - ["javax.crypto", "Mac", True, "getProvider", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["javax.crypto", "Mac", True, "init", "(Key,AlgorithmParameterSpec)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["javax.crypto", "NoSuchPaddingException", True, "NoSuchPaddingException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.crypto", "SealedObject", True, "SealedObject", "(Serializable,Cipher)", "", "Argument[0]", "Argument[1]", "taint", "df-generated"]
-      - ["javax.crypto", "SealedObject", True, "SealedObject", "(Serializable,Cipher)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.crypto", "SealedObject", True, "SealedObject", "(Serializable,Cipher)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
       - ["javax.crypto", "SealedObject", True, "getAlgorithm", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.crypto", "SealedObject", True, "getObject", "(Cipher)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.crypto", "SealedObject", True, "getObject", "(Cipher)", "", "Argument[this]", "Argument[0]", "taint", "df-generated"]
-      - ["javax.crypto", "SealedObject", True, "getObject", "(Cipher)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.crypto", "SealedObject", True, "getObject", "(Key)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.crypto", "SealedObject", True, "getObject", "(Key,String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["javax.crypto", "SecretKeyFactory", True, "generateSecret", "(KeySpec)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["javax.crypto", "SecretKeyFactory", True, "generateSecret", "(KeySpec)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.crypto", "SecretKeyFactory", True, "getAlgorithm", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.crypto", "SecretKeyFactory", True, "getInstance", "(String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.crypto", "SecretKeyFactory", True, "getInstance", "(String,Provider)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.crypto", "SecretKeyFactory", True, "getInstance", "(String,Provider)", "", "Argument[1].Element", "ReturnValue", "taint", "df-generated"]
-      - ["javax.crypto", "SecretKeyFactory", True, "getInstance", "(String,String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.crypto", "SecretKeyFactory", True, "getAlgorithm", "()", "", "Argument[this].SyntheticField[javax.crypto.SecretKeyFactory.algorithm]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.crypto", "SecretKeyFactory", True, "getInstance", "(String)", "", "Argument[0]", "ReturnValue.SyntheticField[javax.crypto.SecretKeyFactory.algorithm]", "value", "dfc-generated"]
+      - ["javax.crypto", "SecretKeyFactory", True, "getInstance", "(String,Provider)", "", "Argument[0]", "ReturnValue.SyntheticField[javax.crypto.SecretKeyFactory.algorithm]", "value", "dfc-generated"]
+      - ["javax.crypto", "SecretKeyFactory", True, "getInstance", "(String,String)", "", "Argument[0]", "ReturnValue.SyntheticField[javax.crypto.SecretKeyFactory.algorithm]", "value", "dfc-generated"]
       - ["javax.crypto", "SecretKeyFactory", True, "getKeySpec", "(SecretKey,Class)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.crypto", "SecretKeyFactory", True, "getKeySpec", "(SecretKey,Class)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["javax.crypto", "SecretKeyFactory", True, "getProvider", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["javax.crypto", "SecretKeyFactory", True, "translateKey", "(SecretKey)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["javax.crypto", "SecretKeyFactory", True, "translateKey", "(SecretKey)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
@@ -101,9 +84,9 @@ extensions:
       - ["javax.crypto", "Cipher", "getMaxAllowedKeyLength", "(String)", "summary", "df-generated"]
       - ["javax.crypto", "Cipher", "getMaxAllowedParameterSpec", "(String)", "summary", "df-generated"]
       - ["javax.crypto", "Cipher", "getOutputSize", "(int)", "summary", "df-generated"]
-      - ["javax.crypto", "Cipher", "init", "(int,Certificate)", "summary", "df-generated"]
-      - ["javax.crypto", "CipherSpi", "engineSetMode", "(String)", "summary", "df-generated"]
-      - ["javax.crypto", "CipherSpi", "engineSetPadding", "(String)", "summary", "df-generated"]
+      - ["javax.crypto", "CipherInputStream", "available", "()", "summary", "df-generated"]
+      - ["javax.crypto", "CipherInputStream", "markSupported", "()", "summary", "df-generated"]
+      - ["javax.crypto", "CipherInputStream", "skip", "(long)", "summary", "df-generated"]
       - ["javax.crypto", "EncryptedPrivateKeyInfo", "getAlgName", "()", "summary", "df-generated"]
       - ["javax.crypto", "ExemptionMechanism", "genExemptionBlob", "()", "summary", "df-generated"]
       - ["javax.crypto", "ExemptionMechanism", "genExemptionBlob", "(byte[])", "summary", "df-generated"]
@@ -111,9 +94,15 @@ extensions:
       - ["javax.crypto", "ExemptionMechanism", "getOutputSize", "(int)", "summary", "df-generated"]
       - ["javax.crypto", "ExemptionMechanism", "isCryptoAllowed", "(Key)", "summary", "df-generated"]
       - ["javax.crypto", "KeyGenerator", "init", "(int)", "summary", "df-generated"]
+      - ["javax.crypto", "Mac", "doFinal", "(byte[])", "summary", "df-generated"]
+      - ["javax.crypto", "Mac", "doFinal", "(byte[],int)", "summary", "df-generated"]
       - ["javax.crypto", "Mac", "getMacLength", "()", "summary", "df-generated"]
       - ["javax.crypto", "Mac", "reset", "()", "summary", "df-generated"]
       - ["javax.crypto", "Mac", "update", "(ByteBuffer)", "summary", "df-generated"]
       - ["javax.crypto", "Mac", "update", "(byte)", "summary", "df-generated"]
       - ["javax.crypto", "Mac", "update", "(byte[])", "summary", "df-generated"]
       - ["javax.crypto", "Mac", "update", "(byte[],int,int)", "summary", "df-generated"]
+      - ["javax.crypto", "SealedObject", "SealedObject", "(Serializable,Cipher)", "summary", "df-generated"]
+      - ["javax.crypto", "SealedObject", "getObject", "(Cipher)", "summary", "df-generated"]
+      - ["javax.crypto", "SealedObject", "getObject", "(Key)", "summary", "df-generated"]
+      - ["javax.crypto", "SealedObject", "getObject", "(Key,String)", "summary", "df-generated"]
diff --git a/java/ql/lib/ext/generated/javax.crypto.spec.model.yml b/java/ql/lib/ext/generated/javax.crypto.spec.model.yml
index 9f7408d3e36..ec5d2c20bbd 100644
--- a/java/ql/lib/ext/generated/javax.crypto.spec.model.yml
+++ b/java/ql/lib/ext/generated/javax.crypto.spec.model.yml
@@ -4,38 +4,38 @@ extensions:
       pack: codeql/java-all
       extensible: summaryModel
     data:
-      - ["javax.crypto.spec", "ChaCha20ParameterSpec", False, "ChaCha20ParameterSpec", "(byte[],int)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.crypto.spec", "ChaCha20ParameterSpec", False, "getNonce", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.crypto.spec", "DESKeySpec", True, "DESKeySpec", "(byte[])", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.crypto.spec", "DESKeySpec", True, "DESKeySpec", "(byte[],int)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.crypto.spec", "DESKeySpec", True, "getKey", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.crypto.spec", "DESedeKeySpec", True, "DESedeKeySpec", "(byte[])", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.crypto.spec", "DESedeKeySpec", True, "DESedeKeySpec", "(byte[],int)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.crypto.spec", "DESedeKeySpec", True, "getKey", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.crypto.spec", "ChaCha20ParameterSpec", False, "ChaCha20ParameterSpec", "(byte[],int)", "", "Argument[0]", "Argument[this].SyntheticField[javax.crypto.spec.ChaCha20ParameterSpec.nonce]", "value", "dfc-generated"]
+      - ["javax.crypto.spec", "ChaCha20ParameterSpec", False, "getNonce", "()", "", "Argument[this].SyntheticField[javax.crypto.spec.ChaCha20ParameterSpec.nonce]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.crypto.spec", "DESKeySpec", True, "DESKeySpec", "(byte[])", "", "Argument[0]", "Argument[this].SyntheticField[javax.crypto.spec.DESKeySpec.key]", "taint", "dfc-generated"]
+      - ["javax.crypto.spec", "DESKeySpec", True, "DESKeySpec", "(byte[],int)", "", "Argument[0]", "Argument[this].SyntheticField[javax.crypto.spec.DESKeySpec.key]", "taint", "dfc-generated"]
+      - ["javax.crypto.spec", "DESKeySpec", True, "getKey", "()", "", "Argument[this].SyntheticField[javax.crypto.spec.DESKeySpec.key]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.crypto.spec", "DESedeKeySpec", True, "DESedeKeySpec", "(byte[])", "", "Argument[0]", "Argument[this].SyntheticField[javax.crypto.spec.DESedeKeySpec.key]", "taint", "dfc-generated"]
+      - ["javax.crypto.spec", "DESedeKeySpec", True, "DESedeKeySpec", "(byte[],int)", "", "Argument[0]", "Argument[this].SyntheticField[javax.crypto.spec.DESedeKeySpec.key]", "taint", "dfc-generated"]
+      - ["javax.crypto.spec", "DESedeKeySpec", True, "getKey", "()", "", "Argument[this].SyntheticField[javax.crypto.spec.DESedeKeySpec.key]", "ReturnValue", "value", "dfc-generated"]
       - ["javax.crypto.spec", "GCMParameterSpec", True, "getIV", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["javax.crypto.spec", "IvParameterSpec", True, "getIV", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.crypto.spec", "OAEPParameterSpec", True, "OAEPParameterSpec", "(String,String,AlgorithmParameterSpec,PSource)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.crypto.spec", "OAEPParameterSpec", True, "OAEPParameterSpec", "(String,String,AlgorithmParameterSpec,PSource)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.crypto.spec", "OAEPParameterSpec", True, "OAEPParameterSpec", "(String,String,AlgorithmParameterSpec,PSource)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.crypto.spec", "OAEPParameterSpec", True, "OAEPParameterSpec", "(String,String,AlgorithmParameterSpec,PSource)", "", "Argument[3]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.crypto.spec", "OAEPParameterSpec", True, "getDigestAlgorithm", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.crypto.spec", "OAEPParameterSpec", True, "getMGFAlgorithm", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.crypto.spec", "OAEPParameterSpec", True, "getMGFParameters", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.crypto.spec", "OAEPParameterSpec", True, "getPSource", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.crypto.spec", "PBEKeySpec", True, "PBEKeySpec", "(char[])", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.crypto.spec", "PBEKeySpec", True, "PBEKeySpec", "(char[],byte[],int)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.crypto.spec", "PBEKeySpec", True, "PBEKeySpec", "(char[],byte[],int)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.crypto.spec", "PBEKeySpec", True, "PBEKeySpec", "(char[],byte[],int,int)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.crypto.spec", "PBEKeySpec", True, "PBEKeySpec", "(char[],byte[],int,int)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.crypto.spec", "PBEKeySpec", True, "getPassword", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.crypto.spec", "PBEKeySpec", True, "getSalt", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.crypto.spec", "PBEParameterSpec", True, "PBEParameterSpec", "(byte[],int)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.crypto.spec", "PBEParameterSpec", True, "PBEParameterSpec", "(byte[],int,AlgorithmParameterSpec)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.crypto.spec", "PBEParameterSpec", True, "PBEParameterSpec", "(byte[],int,AlgorithmParameterSpec)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.crypto.spec", "PBEParameterSpec", True, "getParameterSpec", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.crypto.spec", "PBEParameterSpec", True, "getSalt", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.crypto.spec", "PSource$PSpecified", False, "PSpecified", "(byte[])", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.crypto.spec", "PSource$PSpecified", False, "getValue", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.crypto.spec", "OAEPParameterSpec", True, "OAEPParameterSpec", "(String,String,AlgorithmParameterSpec,PSource)", "", "Argument[0]", "Argument[this].SyntheticField[javax.crypto.spec.OAEPParameterSpec.mdName]", "value", "dfc-generated"]
+      - ["javax.crypto.spec", "OAEPParameterSpec", True, "OAEPParameterSpec", "(String,String,AlgorithmParameterSpec,PSource)", "", "Argument[1]", "Argument[this].SyntheticField[javax.crypto.spec.OAEPParameterSpec.mgfName]", "value", "dfc-generated"]
+      - ["javax.crypto.spec", "OAEPParameterSpec", True, "OAEPParameterSpec", "(String,String,AlgorithmParameterSpec,PSource)", "", "Argument[2]", "Argument[this].SyntheticField[javax.crypto.spec.OAEPParameterSpec.mgfSpec]", "value", "dfc-generated"]
+      - ["javax.crypto.spec", "OAEPParameterSpec", True, "OAEPParameterSpec", "(String,String,AlgorithmParameterSpec,PSource)", "", "Argument[3]", "Argument[this].SyntheticField[javax.crypto.spec.OAEPParameterSpec.pSrc]", "value", "dfc-generated"]
+      - ["javax.crypto.spec", "OAEPParameterSpec", True, "getDigestAlgorithm", "()", "", "Argument[this].SyntheticField[javax.crypto.spec.OAEPParameterSpec.mdName]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.crypto.spec", "OAEPParameterSpec", True, "getMGFAlgorithm", "()", "", "Argument[this].SyntheticField[javax.crypto.spec.OAEPParameterSpec.mgfName]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.crypto.spec", "OAEPParameterSpec", True, "getMGFParameters", "()", "", "Argument[this].SyntheticField[javax.crypto.spec.OAEPParameterSpec.mgfSpec]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.crypto.spec", "OAEPParameterSpec", True, "getPSource", "()", "", "Argument[this].SyntheticField[javax.crypto.spec.OAEPParameterSpec.pSrc]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.crypto.spec", "PBEKeySpec", True, "PBEKeySpec", "(char[])", "", "Argument[0]", "Argument[this].SyntheticField[javax.crypto.spec.PBEKeySpec.password]", "value", "dfc-generated"]
+      - ["javax.crypto.spec", "PBEKeySpec", True, "PBEKeySpec", "(char[],byte[],int)", "", "Argument[0]", "Argument[this].SyntheticField[javax.crypto.spec.PBEKeySpec.password]", "value", "dfc-generated"]
+      - ["javax.crypto.spec", "PBEKeySpec", True, "PBEKeySpec", "(char[],byte[],int)", "", "Argument[1]", "Argument[this].SyntheticField[javax.crypto.spec.PBEKeySpec.salt]", "value", "dfc-generated"]
+      - ["javax.crypto.spec", "PBEKeySpec", True, "PBEKeySpec", "(char[],byte[],int,int)", "", "Argument[0]", "Argument[this].SyntheticField[javax.crypto.spec.PBEKeySpec.password]", "value", "dfc-generated"]
+      - ["javax.crypto.spec", "PBEKeySpec", True, "PBEKeySpec", "(char[],byte[],int,int)", "", "Argument[1]", "Argument[this].SyntheticField[javax.crypto.spec.PBEKeySpec.salt]", "value", "dfc-generated"]
+      - ["javax.crypto.spec", "PBEKeySpec", True, "getPassword", "()", "", "Argument[this].SyntheticField[javax.crypto.spec.PBEKeySpec.password]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.crypto.spec", "PBEKeySpec", True, "getSalt", "()", "", "Argument[this].SyntheticField[javax.crypto.spec.PBEKeySpec.salt]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.crypto.spec", "PBEParameterSpec", True, "PBEParameterSpec", "(byte[],int)", "", "Argument[0]", "Argument[this].SyntheticField[javax.crypto.spec.PBEParameterSpec.salt]", "value", "dfc-generated"]
+      - ["javax.crypto.spec", "PBEParameterSpec", True, "PBEParameterSpec", "(byte[],int,AlgorithmParameterSpec)", "", "Argument[0]", "Argument[this].SyntheticField[javax.crypto.spec.PBEParameterSpec.salt]", "value", "dfc-generated"]
+      - ["javax.crypto.spec", "PBEParameterSpec", True, "PBEParameterSpec", "(byte[],int,AlgorithmParameterSpec)", "", "Argument[2]", "Argument[this].SyntheticField[javax.crypto.spec.PBEParameterSpec.paramSpec]", "value", "dfc-generated"]
+      - ["javax.crypto.spec", "PBEParameterSpec", True, "getParameterSpec", "()", "", "Argument[this].SyntheticField[javax.crypto.spec.PBEParameterSpec.paramSpec]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.crypto.spec", "PBEParameterSpec", True, "getSalt", "()", "", "Argument[this].SyntheticField[javax.crypto.spec.PBEParameterSpec.salt]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.crypto.spec", "PSource$PSpecified", False, "PSpecified", "(byte[])", "", "Argument[0]", "Argument[this].SyntheticField[javax.crypto.spec.PSource$PSpecified.p]", "value", "dfc-generated"]
+      - ["javax.crypto.spec", "PSource$PSpecified", False, "getValue", "()", "", "Argument[this].SyntheticField[javax.crypto.spec.PSource$PSpecified.p]", "ReturnValue", "value", "dfc-generated"]
       - ["javax.crypto.spec", "PSource", True, "getAlgorithm", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["javax.crypto.spec", "RC2ParameterSpec", True, "getIV", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["javax.crypto.spec", "RC5ParameterSpec", True, "getIV", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
@@ -72,3 +72,4 @@ extensions:
       - ["javax.crypto.spec", "RC5ParameterSpec", "getRounds", "()", "summary", "df-generated"]
       - ["javax.crypto.spec", "RC5ParameterSpec", "getVersion", "()", "summary", "df-generated"]
       - ["javax.crypto.spec", "RC5ParameterSpec", "getWordSize", "()", "summary", "df-generated"]
+      - ["javax.crypto.spec", "SecretKeySpec", "getFormat", "()", "summary", "df-generated"]
diff --git a/java/ql/lib/ext/generated/javax.imageio.metadata.model.yml b/java/ql/lib/ext/generated/javax.imageio.metadata.model.yml
index 961bbceb1bd..7af531385a9 100644
--- a/java/ql/lib/ext/generated/javax.imageio.metadata.model.yml
+++ b/java/ql/lib/ext/generated/javax.imageio.metadata.model.yml
@@ -4,62 +4,130 @@ extensions:
       pack: codeql/java-all
       extensible: summaryModel
     data:
-      - ["javax.imageio.metadata", "IIOInvalidTreeException", True, "IIOInvalidTreeException", "(String,Node)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.imageio.metadata", "IIOInvalidTreeException", True, "IIOInvalidTreeException", "(String,Node)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.imageio.metadata", "IIOInvalidTreeException", True, "IIOInvalidTreeException", "(String,Throwable,Node)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.imageio.metadata", "IIOInvalidTreeException", True, "IIOInvalidTreeException", "(String,Throwable,Node)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.imageio.metadata", "IIOInvalidTreeException", True, "IIOInvalidTreeException", "(String,Throwable,Node)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.imageio.metadata", "IIOInvalidTreeException", True, "getOffendingNode", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.imageio.metadata", "IIOMetadata", True, "getController", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.imageio.metadata", "IIOInvalidTreeException", True, "IIOInvalidTreeException", "(String,Node)", "", "Argument[1]", "Argument[this].SyntheticField[javax.imageio.metadata.IIOInvalidTreeException.offendingNode]", "value", "dfc-generated"]
+      - ["javax.imageio.metadata", "IIOInvalidTreeException", True, "IIOInvalidTreeException", "(String,Throwable,Node)", "", "Argument[2]", "Argument[this].SyntheticField[javax.imageio.metadata.IIOInvalidTreeException.offendingNode]", "value", "dfc-generated"]
+      - ["javax.imageio.metadata", "IIOInvalidTreeException", True, "getOffendingNode", "()", "", "Argument[this].SyntheticField[javax.imageio.metadata.IIOInvalidTreeException.offendingNode]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.imageio.metadata", "IIOMetadata", True, "getAsTree", "(String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.imageio.metadata", "IIOMetadata", True, "getController", "()", "", "Argument[this].SyntheticField[javax.imageio.metadata.IIOMetadata.controller]", "ReturnValue", "value", "dfc-generated"]
       - ["javax.imageio.metadata", "IIOMetadata", True, "getDefaultController", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["javax.imageio.metadata", "IIOMetadata", True, "getExtraMetadataFormatNames", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["javax.imageio.metadata", "IIOMetadata", True, "getMetadataFormatNames", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["javax.imageio.metadata", "IIOMetadata", True, "getNativeMetadataFormatName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.imageio.metadata", "IIOMetadata", True, "setController", "(IIOMetadataController)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.imageio.metadata", "IIOMetadata", True, "setFromTree", "(String,Node)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.imageio.metadata", "IIOMetadataFormat", True, "getAttributeDescription", "(String,String,Locale)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.imageio.metadata", "IIOMetadataFormat", True, "getAttributeDescription", "(String,String,Locale)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.imageio.metadata", "IIOMetadata", True, "mergeTree", "(String,Node)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.imageio.metadata", "IIOMetadata", True, "setController", "(IIOMetadataController)", "", "Argument[0]", "Argument[this].SyntheticField[javax.imageio.metadata.IIOMetadata.controller]", "value", "dfc-generated"]
+      - ["javax.imageio.metadata", "IIOMetadata", True, "setFromTree", "(String,Node)", "", "Argument[1].SyntheticField[javax.imageio.metadata.IIOMetadataNode.firstChild].SyntheticField[javax.imageio.metadata.IIOMetadataNode.userObject]", "Argument[this].Field[com.sun.imageio.plugins.png.PNGMetadata.iCCP_compressedProfile]", "value", "dfc-generated"]
       - ["javax.imageio.metadata", "IIOMetadataFormat", True, "getAttributeNames", "(String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["javax.imageio.metadata", "IIOMetadataFormat", True, "getChildNames", "(String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.imageio.metadata", "IIOMetadataFormat", True, "getElementDescription", "(String,Locale)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.imageio.metadata", "IIOMetadataFormat", True, "getElementDescription", "(String,Locale)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.imageio.metadata", "IIOMetadataFormat", True, "getObjectDefaultValue", "(String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.imageio.metadata", "IIOMetadataFormat", True, "getObjectEnumerations", "(String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.imageio.metadata", "IIOMetadataFormat", True, "getObjectMaxValue", "(String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.imageio.metadata", "IIOMetadataFormat", True, "getObjectMinValue", "(String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["javax.imageio.metadata", "IIOMetadataFormat", True, "getRootName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.imageio.metadata", "IIOMetadataFormatImpl", True, "IIOMetadataFormatImpl", "(String,int)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.imageio.metadata", "IIOMetadataFormatImpl", True, "IIOMetadataFormatImpl", "(String,int,int)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.imageio.metadata", "IIOMetadataNode", True, "IIOMetadataNode", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.imageio.metadata", "IIOMetadataNode", True, "getUserObject", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.imageio.metadata", "IIOMetadataNode", True, "setUserObject", "(Object)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.imageio.metadata", "IIOMetadataFormatImpl", True, "IIOMetadataFormatImpl", "(String,int)", "", "Argument[0]", "Argument[this].SyntheticField[javax.imageio.metadata.IIOMetadataFormatImpl.rootName]", "value", "dfc-generated"]
+      - ["javax.imageio.metadata", "IIOMetadataFormatImpl", True, "IIOMetadataFormatImpl", "(String,int,int)", "", "Argument[0]", "Argument[this].SyntheticField[javax.imageio.metadata.IIOMetadataFormatImpl.rootName]", "value", "dfc-generated"]
+      - ["javax.imageio.metadata", "IIOMetadataFormatImpl", True, "getRootName", "()", "", "Argument[this].SyntheticField[javax.imageio.metadata.IIOMetadataFormatImpl.rootName]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.imageio.metadata", "IIOMetadataNode", True, "IIOMetadataNode", "(String)", "", "Argument[0]", "Argument[this].SyntheticField[javax.imageio.metadata.IIOMetadataNode.nodeName]", "value", "dfc-generated"]
+      - ["javax.imageio.metadata", "IIOMetadataNode", True, "appendChild", "(Node)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.imageio.metadata", "IIOMetadataNode", True, "appendChild", "(Node)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.imageio.metadata", "IIOMetadataNode", True, "appendChild", "(Node)", "", "Argument[this]", "Argument[0]", "taint", "df-generated"]
+      - ["javax.imageio.metadata", "IIOMetadataNode", True, "appendChild", "(Node)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.imageio.metadata", "IIOMetadataNode", True, "cloneNode", "(boolean)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.imageio.metadata", "IIOMetadataNode", True, "getAttribute", "(String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.imageio.metadata", "IIOMetadataNode", True, "getAttributeNS", "(String,String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.imageio.metadata", "IIOMetadataNode", True, "getAttributeNode", "(String)", "", "Argument[this].SyntheticField[javax.imageio.metadata.IIOMetadataNode.attributes].Element", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.imageio.metadata", "IIOMetadataNode", True, "getAttributeNodeNS", "(String,String)", "", "Argument[this].SyntheticField[javax.imageio.metadata.IIOMetadataNode.attributes].Element", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.imageio.metadata", "IIOMetadataNode", True, "getAttributes", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.imageio.metadata", "IIOMetadataNode", True, "getChildNodes", "()", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.imageio.metadata", "IIOMetadataNode", True, "getElementsByTagName", "(String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.imageio.metadata", "IIOMetadataNode", True, "getElementsByTagNameNS", "(String,String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.imageio.metadata", "IIOMetadataNode", True, "getFirstChild", "()", "", "Argument[this].SyntheticField[javax.imageio.metadata.IIOMetadataNode.firstChild]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.imageio.metadata", "IIOMetadataNode", True, "getLastChild", "()", "", "Argument[this].SyntheticField[javax.imageio.metadata.IIOMetadataNode.lastChild]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.imageio.metadata", "IIOMetadataNode", True, "getLocalName", "()", "", "Argument[this].SyntheticField[javax.imageio.metadata.IIOMetadataNode.nodeName]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.imageio.metadata", "IIOMetadataNode", True, "getNextSibling", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.imageio.metadata", "IIOMetadataNode", True, "getNodeName", "()", "", "Argument[this].SyntheticField[javax.imageio.metadata.IIOMetadataNode.nodeName]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.imageio.metadata", "IIOMetadataNode", True, "getNodeValue", "()", "", "Argument[this].SyntheticField[javax.imageio.metadata.IIOMetadataNode.nodeValue]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.imageio.metadata", "IIOMetadataNode", True, "getParentNode", "()", "", "Argument[this].SyntheticField[javax.imageio.metadata.IIOMetadataNode.parent]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.imageio.metadata", "IIOMetadataNode", True, "getPreviousSibling", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.imageio.metadata", "IIOMetadataNode", True, "getTagName", "()", "", "Argument[this].SyntheticField[javax.imageio.metadata.IIOMetadataNode.nodeName]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.imageio.metadata", "IIOMetadataNode", True, "getUserObject", "()", "", "Argument[this].SyntheticField[javax.imageio.metadata.IIOMetadataNode.userObject]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.imageio.metadata", "IIOMetadataNode", True, "insertBefore", "(Node,Node)", "", "Argument[0]", "Argument[1]", "taint", "df-generated"]
+      - ["javax.imageio.metadata", "IIOMetadataNode", True, "insertBefore", "(Node,Node)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.imageio.metadata", "IIOMetadataNode", True, "insertBefore", "(Node,Node)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.imageio.metadata", "IIOMetadataNode", True, "insertBefore", "(Node,Node)", "", "Argument[1]", "Argument[0]", "taint", "df-generated"]
+      - ["javax.imageio.metadata", "IIOMetadataNode", True, "insertBefore", "(Node,Node)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.imageio.metadata", "IIOMetadataNode", True, "insertBefore", "(Node,Node)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.imageio.metadata", "IIOMetadataNode", True, "insertBefore", "(Node,Node)", "", "Argument[this]", "Argument[0]", "taint", "df-generated"]
+      - ["javax.imageio.metadata", "IIOMetadataNode", True, "insertBefore", "(Node,Node)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.imageio.metadata", "IIOMetadataNode", True, "item", "(int)", "", "Argument[this].SyntheticField[javax.imageio.metadata.IIOMetadataNode.firstChild]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.imageio.metadata", "IIOMetadataNode", True, "removeAttributeNode", "(Attr)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.imageio.metadata", "IIOMetadataNode", True, "removeChild", "(Node)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.imageio.metadata", "IIOMetadataNode", True, "removeChild", "(Node)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.imageio.metadata", "IIOMetadataNode", True, "replaceChild", "(Node,Node)", "", "Argument[this]", "Argument[0].SyntheticField[javax.imageio.metadata.IIOMetadataNode.parent]", "value", "dfc-generated"]
+      - ["javax.imageio.metadata", "IIOMetadataNode", True, "setAttributeNode", "(Attr)", "", "Argument[0]", "Argument[this].SyntheticField[javax.imageio.metadata.IIOMetadataNode.attributes].Element", "value", "dfc-generated"]
+      - ["javax.imageio.metadata", "IIOMetadataNode", True, "setAttributeNode", "(Attr)", "", "Argument[this].SyntheticField[javax.imageio.metadata.IIOMetadataNode.attributes].Element", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.imageio.metadata", "IIOMetadataNode", True, "setAttributeNodeNS", "(Attr)", "", "Argument[0]", "Argument[this].SyntheticField[javax.imageio.metadata.IIOMetadataNode.attributes].Element", "value", "dfc-generated"]
+      - ["javax.imageio.metadata", "IIOMetadataNode", True, "setAttributeNodeNS", "(Attr)", "", "Argument[this].SyntheticField[javax.imageio.metadata.IIOMetadataNode.attributes].Element", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.imageio.metadata", "IIOMetadataNode", True, "setNodeValue", "(String)", "", "Argument[0]", "Argument[this].SyntheticField[javax.imageio.metadata.IIOMetadataNode.nodeValue]", "value", "dfc-generated"]
+      - ["javax.imageio.metadata", "IIOMetadataNode", True, "setUserObject", "(Object)", "", "Argument[0]", "Argument[this].SyntheticField[javax.imageio.metadata.IIOMetadataNode.userObject]", "value", "dfc-generated"]
   - addsTo:
       pack: codeql/java-all
       extensible: neutralModel
     data:
       - ["javax.imageio.metadata", "IIOMetadata", "activateController", "()", "summary", "df-generated"]
-      - ["javax.imageio.metadata", "IIOMetadata", "getAsTree", "(String)", "summary", "df-generated"]
       - ["javax.imageio.metadata", "IIOMetadata", "getMetadataFormat", "(String)", "summary", "df-generated"]
       - ["javax.imageio.metadata", "IIOMetadata", "hasController", "()", "summary", "df-generated"]
       - ["javax.imageio.metadata", "IIOMetadata", "isReadOnly", "()", "summary", "df-generated"]
       - ["javax.imageio.metadata", "IIOMetadata", "isStandardMetadataFormatSupported", "()", "summary", "df-generated"]
-      - ["javax.imageio.metadata", "IIOMetadata", "mergeTree", "(String,Node)", "summary", "df-generated"]
       - ["javax.imageio.metadata", "IIOMetadata", "reset", "()", "summary", "df-generated"]
-      - ["javax.imageio.metadata", "IIOMetadataFormat", "canNodeAppear", "(String,ImageTypeSpecifier)", "summary", "df-generated"]
-      - ["javax.imageio.metadata", "IIOMetadataFormat", "getAttributeDataType", "(String,String)", "summary", "df-generated"]
-      - ["javax.imageio.metadata", "IIOMetadataFormat", "getAttributeDefaultValue", "(String,String)", "summary", "df-generated"]
-      - ["javax.imageio.metadata", "IIOMetadataFormat", "getAttributeEnumerations", "(String,String)", "summary", "df-generated"]
-      - ["javax.imageio.metadata", "IIOMetadataFormat", "getAttributeListMaxLength", "(String,String)", "summary", "df-generated"]
-      - ["javax.imageio.metadata", "IIOMetadataFormat", "getAttributeListMinLength", "(String,String)", "summary", "df-generated"]
-      - ["javax.imageio.metadata", "IIOMetadataFormat", "getAttributeMaxValue", "(String,String)", "summary", "df-generated"]
-      - ["javax.imageio.metadata", "IIOMetadataFormat", "getAttributeMinValue", "(String,String)", "summary", "df-generated"]
-      - ["javax.imageio.metadata", "IIOMetadataFormat", "getAttributeValueType", "(String,String)", "summary", "df-generated"]
-      - ["javax.imageio.metadata", "IIOMetadataFormat", "getChildPolicy", "(String)", "summary", "df-generated"]
-      - ["javax.imageio.metadata", "IIOMetadataFormat", "getElementMaxChildren", "(String)", "summary", "df-generated"]
-      - ["javax.imageio.metadata", "IIOMetadataFormat", "getElementMinChildren", "(String)", "summary", "df-generated"]
-      - ["javax.imageio.metadata", "IIOMetadataFormat", "getObjectArrayMaxLength", "(String)", "summary", "df-generated"]
-      - ["javax.imageio.metadata", "IIOMetadataFormat", "getObjectArrayMinLength", "(String)", "summary", "df-generated"]
-      - ["javax.imageio.metadata", "IIOMetadataFormat", "getObjectClass", "(String)", "summary", "df-generated"]
-      - ["javax.imageio.metadata", "IIOMetadataFormat", "getObjectDefaultValue", "(String)", "summary", "df-generated"]
-      - ["javax.imageio.metadata", "IIOMetadataFormat", "getObjectEnumerations", "(String)", "summary", "df-generated"]
-      - ["javax.imageio.metadata", "IIOMetadataFormat", "getObjectMaxValue", "(String)", "summary", "df-generated"]
-      - ["javax.imageio.metadata", "IIOMetadataFormat", "getObjectMinValue", "(String)", "summary", "df-generated"]
-      - ["javax.imageio.metadata", "IIOMetadataFormat", "getObjectValueType", "(String)", "summary", "df-generated"]
-      - ["javax.imageio.metadata", "IIOMetadataFormat", "isAttributeRequired", "(String,String)", "summary", "df-generated"]
+      - ["javax.imageio.metadata", "IIOMetadataFormatImpl", "canNodeAppear", "(String,ImageTypeSpecifier)", "summary", "df-generated"]
+      - ["javax.imageio.metadata", "IIOMetadataFormatImpl", "getAttributeDataType", "(String,String)", "summary", "df-generated"]
+      - ["javax.imageio.metadata", "IIOMetadataFormatImpl", "getAttributeDefaultValue", "(String,String)", "summary", "df-generated"]
+      - ["javax.imageio.metadata", "IIOMetadataFormatImpl", "getAttributeDescription", "(String,String,Locale)", "summary", "df-generated"]
+      - ["javax.imageio.metadata", "IIOMetadataFormatImpl", "getAttributeEnumerations", "(String,String)", "summary", "df-generated"]
+      - ["javax.imageio.metadata", "IIOMetadataFormatImpl", "getAttributeListMaxLength", "(String,String)", "summary", "df-generated"]
+      - ["javax.imageio.metadata", "IIOMetadataFormatImpl", "getAttributeListMinLength", "(String,String)", "summary", "df-generated"]
+      - ["javax.imageio.metadata", "IIOMetadataFormatImpl", "getAttributeMaxValue", "(String,String)", "summary", "df-generated"]
+      - ["javax.imageio.metadata", "IIOMetadataFormatImpl", "getAttributeMinValue", "(String,String)", "summary", "df-generated"]
+      - ["javax.imageio.metadata", "IIOMetadataFormatImpl", "getAttributeValueType", "(String,String)", "summary", "df-generated"]
+      - ["javax.imageio.metadata", "IIOMetadataFormatImpl", "getChildPolicy", "(String)", "summary", "df-generated"]
+      - ["javax.imageio.metadata", "IIOMetadataFormatImpl", "getElementDescription", "(String,Locale)", "summary", "df-generated"]
+      - ["javax.imageio.metadata", "IIOMetadataFormatImpl", "getElementMaxChildren", "(String)", "summary", "df-generated"]
+      - ["javax.imageio.metadata", "IIOMetadataFormatImpl", "getElementMinChildren", "(String)", "summary", "df-generated"]
+      - ["javax.imageio.metadata", "IIOMetadataFormatImpl", "getObjectArrayMaxLength", "(String)", "summary", "df-generated"]
+      - ["javax.imageio.metadata", "IIOMetadataFormatImpl", "getObjectArrayMinLength", "(String)", "summary", "df-generated"]
+      - ["javax.imageio.metadata", "IIOMetadataFormatImpl", "getObjectClass", "(String)", "summary", "df-generated"]
+      - ["javax.imageio.metadata", "IIOMetadataFormatImpl", "getObjectValueType", "(String)", "summary", "df-generated"]
       - ["javax.imageio.metadata", "IIOMetadataFormatImpl", "getStandardFormatInstance", "()", "summary", "df-generated"]
+      - ["javax.imageio.metadata", "IIOMetadataFormatImpl", "isAttributeRequired", "(String,String)", "summary", "df-generated"]
+      - ["javax.imageio.metadata", "IIOMetadataNode", "compareDocumentPosition", "(Node)", "summary", "df-generated"]
+      - ["javax.imageio.metadata", "IIOMetadataNode", "getBaseURI", "()", "summary", "df-generated"]
+      - ["javax.imageio.metadata", "IIOMetadataNode", "getFeature", "(String,String)", "summary", "df-generated"]
+      - ["javax.imageio.metadata", "IIOMetadataNode", "getLength", "()", "summary", "df-generated"]
+      - ["javax.imageio.metadata", "IIOMetadataNode", "getNamespaceURI", "()", "summary", "df-generated"]
+      - ["javax.imageio.metadata", "IIOMetadataNode", "getNodeType", "()", "summary", "df-generated"]
+      - ["javax.imageio.metadata", "IIOMetadataNode", "getOwnerDocument", "()", "summary", "df-generated"]
+      - ["javax.imageio.metadata", "IIOMetadataNode", "getPrefix", "()", "summary", "df-generated"]
+      - ["javax.imageio.metadata", "IIOMetadataNode", "getSchemaTypeInfo", "()", "summary", "df-generated"]
+      - ["javax.imageio.metadata", "IIOMetadataNode", "getTextContent", "()", "summary", "df-generated"]
+      - ["javax.imageio.metadata", "IIOMetadataNode", "getUserData", "(String)", "summary", "df-generated"]
+      - ["javax.imageio.metadata", "IIOMetadataNode", "hasAttribute", "(String)", "summary", "df-generated"]
+      - ["javax.imageio.metadata", "IIOMetadataNode", "hasAttributeNS", "(String,String)", "summary", "df-generated"]
+      - ["javax.imageio.metadata", "IIOMetadataNode", "hasAttributes", "()", "summary", "df-generated"]
+      - ["javax.imageio.metadata", "IIOMetadataNode", "hasChildNodes", "()", "summary", "df-generated"]
+      - ["javax.imageio.metadata", "IIOMetadataNode", "isDefaultNamespace", "(String)", "summary", "df-generated"]
+      - ["javax.imageio.metadata", "IIOMetadataNode", "isEqualNode", "(Node)", "summary", "df-generated"]
+      - ["javax.imageio.metadata", "IIOMetadataNode", "isSameNode", "(Node)", "summary", "df-generated"]
+      - ["javax.imageio.metadata", "IIOMetadataNode", "isSupported", "(String,String)", "summary", "df-generated"]
+      - ["javax.imageio.metadata", "IIOMetadataNode", "lookupNamespaceURI", "(String)", "summary", "df-generated"]
+      - ["javax.imageio.metadata", "IIOMetadataNode", "lookupPrefix", "(String)", "summary", "df-generated"]
+      - ["javax.imageio.metadata", "IIOMetadataNode", "normalize", "()", "summary", "df-generated"]
+      - ["javax.imageio.metadata", "IIOMetadataNode", "removeAttribute", "(String)", "summary", "df-generated"]
+      - ["javax.imageio.metadata", "IIOMetadataNode", "removeAttributeNS", "(String,String)", "summary", "df-generated"]
+      - ["javax.imageio.metadata", "IIOMetadataNode", "setAttribute", "(String,String)", "summary", "df-generated"]
+      - ["javax.imageio.metadata", "IIOMetadataNode", "setAttributeNS", "(String,String,String)", "summary", "df-generated"]
+      - ["javax.imageio.metadata", "IIOMetadataNode", "setIdAttribute", "(String,boolean)", "summary", "df-generated"]
+      - ["javax.imageio.metadata", "IIOMetadataNode", "setIdAttributeNS", "(String,String,boolean)", "summary", "df-generated"]
+      - ["javax.imageio.metadata", "IIOMetadataNode", "setIdAttributeNode", "(Attr,boolean)", "summary", "df-generated"]
+      - ["javax.imageio.metadata", "IIOMetadataNode", "setPrefix", "(String)", "summary", "df-generated"]
+      - ["javax.imageio.metadata", "IIOMetadataNode", "setTextContent", "(String)", "summary", "df-generated"]
+      - ["javax.imageio.metadata", "IIOMetadataNode", "setUserData", "(String,Object,UserDataHandler)", "summary", "df-generated"]
diff --git a/java/ql/lib/ext/generated/javax.imageio.model.yml b/java/ql/lib/ext/generated/javax.imageio.model.yml
index a1be538932d..df0112e4a5f 100644
--- a/java/ql/lib/ext/generated/javax.imageio.model.yml
+++ b/java/ql/lib/ext/generated/javax.imageio.model.yml
@@ -7,63 +7,76 @@ extensions:
       - ["javax.imageio", "IIOException", True, "IIOException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["javax.imageio", "IIOException", True, "IIOException", "(String,Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["javax.imageio", "IIOException", True, "IIOException", "(String,Throwable)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.imageio", "IIOImage", True, "IIOImage", "(Raster,List,IIOMetadata)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.imageio", "IIOImage", True, "IIOImage", "(Raster,List,IIOMetadata)", "", "Argument[1].Element", "Argument[this]", "taint", "df-generated"]
-      - ["javax.imageio", "IIOImage", True, "IIOImage", "(Raster,List,IIOMetadata)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.imageio", "IIOImage", True, "IIOImage", "(RenderedImage,List,IIOMetadata)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.imageio", "IIOImage", True, "IIOImage", "(RenderedImage,List,IIOMetadata)", "", "Argument[1].Element", "Argument[this]", "taint", "df-generated"]
-      - ["javax.imageio", "IIOImage", True, "IIOImage", "(RenderedImage,List,IIOMetadata)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.imageio", "IIOImage", True, "getMetadata", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.imageio", "IIOImage", True, "getRaster", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.imageio", "IIOImage", True, "getRenderedImage", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.imageio", "IIOImage", True, "getThumbnail", "(int)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.imageio", "IIOImage", True, "getThumbnails", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.imageio", "IIOImage", True, "setMetadata", "(IIOMetadata)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.imageio", "IIOImage", True, "setRaster", "(Raster)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.imageio", "IIOImage", True, "setRenderedImage", "(RenderedImage)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.imageio", "IIOImage", True, "setThumbnails", "(List)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["javax.imageio", "IIOParam", True, "getController", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.imageio", "IIOImage", True, "IIOImage", "(Raster,List,IIOMetadata)", "", "Argument[0]", "Argument[this].SyntheticField[javax.imageio.IIOImage.raster]", "value", "dfc-generated"]
+      - ["javax.imageio", "IIOImage", True, "IIOImage", "(Raster,List,IIOMetadata)", "", "Argument[1]", "Argument[this].SyntheticField[javax.imageio.IIOImage.thumbnails]", "value", "dfc-generated"]
+      - ["javax.imageio", "IIOImage", True, "IIOImage", "(Raster,List,IIOMetadata)", "", "Argument[2]", "Argument[this].SyntheticField[javax.imageio.IIOImage.metadata]", "value", "dfc-generated"]
+      - ["javax.imageio", "IIOImage", True, "IIOImage", "(RenderedImage,List,IIOMetadata)", "", "Argument[0]", "Argument[this].SyntheticField[javax.imageio.IIOImage.image]", "value", "dfc-generated"]
+      - ["javax.imageio", "IIOImage", True, "IIOImage", "(RenderedImage,List,IIOMetadata)", "", "Argument[1]", "Argument[this].SyntheticField[javax.imageio.IIOImage.thumbnails]", "value", "dfc-generated"]
+      - ["javax.imageio", "IIOImage", True, "IIOImage", "(RenderedImage,List,IIOMetadata)", "", "Argument[2]", "Argument[this].SyntheticField[javax.imageio.IIOImage.metadata]", "value", "dfc-generated"]
+      - ["javax.imageio", "IIOImage", True, "getMetadata", "()", "", "Argument[this].SyntheticField[javax.imageio.IIOImage.metadata]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.imageio", "IIOImage", True, "getRaster", "()", "", "Argument[this].SyntheticField[javax.imageio.IIOImage.raster]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.imageio", "IIOImage", True, "getRenderedImage", "()", "", "Argument[this].SyntheticField[javax.imageio.IIOImage.image]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.imageio", "IIOImage", True, "getThumbnail", "(int)", "", "Argument[this].SyntheticField[javax.imageio.IIOImage.thumbnails].Element", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.imageio", "IIOImage", True, "getThumbnails", "()", "", "Argument[this].SyntheticField[javax.imageio.IIOImage.thumbnails]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.imageio", "IIOImage", True, "setMetadata", "(IIOMetadata)", "", "Argument[0]", "Argument[this].SyntheticField[javax.imageio.IIOImage.metadata]", "value", "dfc-generated"]
+      - ["javax.imageio", "IIOImage", True, "setRaster", "(Raster)", "", "Argument[0]", "Argument[this].SyntheticField[javax.imageio.IIOImage.raster]", "value", "dfc-generated"]
+      - ["javax.imageio", "IIOImage", True, "setRenderedImage", "(RenderedImage)", "", "Argument[0]", "Argument[this].SyntheticField[javax.imageio.IIOImage.image]", "value", "dfc-generated"]
+      - ["javax.imageio", "IIOImage", True, "setThumbnails", "(List)", "", "Argument[0]", "Argument[this].SyntheticField[javax.imageio.IIOImage.thumbnails]", "value", "dfc-generated"]
+      - ["javax.imageio", "IIOParam", True, "getController", "()", "", "Argument[this].SyntheticField[javax.imageio.IIOParam.controller]", "ReturnValue", "value", "dfc-generated"]
       - ["javax.imageio", "IIOParam", True, "getDefaultController", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.imageio", "IIOParam", True, "getDestinationOffset", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.imageio", "IIOParam", True, "getDestinationType", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.imageio", "IIOParam", True, "getSourceRegion", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.imageio", "IIOParam", True, "setController", "(IIOParamController)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.imageio", "IIOParam", True, "setDestinationOffset", "(Point)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.imageio", "IIOParam", True, "setDestinationType", "(ImageTypeSpecifier)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.imageio", "IIOParam", True, "setSourceRegion", "(Rectangle)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.imageio", "IIOParam", True, "getDestinationOffset", "()", "", "Argument[this].SyntheticField[javax.imageio.IIOParam.destinationOffset]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.imageio", "IIOParam", True, "getDestinationType", "()", "", "Argument[this].SyntheticField[javax.imageio.IIOParam.destinationType]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.imageio", "IIOParam", True, "getSourceRegion", "()", "", "Argument[this].SyntheticField[javax.imageio.IIOParam.sourceRegion]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.imageio", "IIOParam", True, "setController", "(IIOParamController)", "", "Argument[0]", "Argument[this].SyntheticField[javax.imageio.IIOParam.controller]", "value", "dfc-generated"]
+      - ["javax.imageio", "IIOParam", True, "setDestinationOffset", "(Point)", "", "Argument[0]", "Argument[this].SyntheticField[javax.imageio.IIOParam.destinationOffset]", "value", "dfc-generated"]
+      - ["javax.imageio", "IIOParam", True, "setDestinationType", "(ImageTypeSpecifier)", "", "Argument[0]", "Argument[this].SyntheticField[javax.imageio.IIOParam.destinationType]", "value", "dfc-generated"]
+      - ["javax.imageio", "IIOParam", True, "setSourceRegion", "(Rectangle)", "", "Argument[0]", "Argument[this].SyntheticField[javax.imageio.IIOParam.sourceRegion]", "value", "dfc-generated"]
       - ["javax.imageio", "ImageIO", False, "createImageInputStream", "(Object)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["javax.imageio", "ImageIO", False, "createImageOutputStream", "(Object)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.imageio", "ImageReadParam", True, "getDestination", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.imageio", "ImageReadParam", True, "getSourceRenderSize", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.imageio", "ImageReadParam", True, "setDestination", "(BufferedImage)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.imageio", "ImageReadParam", True, "setSourceRenderSize", "(Dimension)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.imageio", "ImageReadParam", True, "getDestination", "()", "", "Argument[this].SyntheticField[javax.imageio.ImageReadParam.destination]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.imageio", "ImageReadParam", True, "getSourceRenderSize", "()", "", "Argument[this].SyntheticField[javax.imageio.ImageReadParam.sourceRenderSize]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.imageio", "ImageReadParam", True, "setDestination", "(BufferedImage)", "", "Argument[0]", "Argument[this].SyntheticField[javax.imageio.ImageReadParam.destination]", "value", "dfc-generated"]
+      - ["javax.imageio", "ImageReadParam", True, "setDestinationType", "(ImageTypeSpecifier)", "", "Argument[0]", "Argument[this].SyntheticField[javax.imageio.IIOParam.destinationType]", "value", "dfc-generated"]
+      - ["javax.imageio", "ImageReadParam", True, "setSourceRenderSize", "(Dimension)", "", "Argument[0]", "Argument[this].SyntheticField[javax.imageio.ImageReadParam.sourceRenderSize]", "value", "dfc-generated"]
       - ["javax.imageio", "ImageReader", True, "addIIOReadProgressListener", "(IIOReadProgressListener)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["javax.imageio", "ImageReader", True, "addIIOReadUpdateListener", "(IIOReadUpdateListener)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["javax.imageio", "ImageReader", True, "addIIOReadWarningListener", "(IIOReadWarningListener)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["javax.imageio", "ImageReader", True, "getAvailableLocales", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["javax.imageio", "ImageReader", True, "getFormatName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.imageio", "ImageReader", True, "getImageMetadata", "(int)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["javax.imageio", "ImageReader", True, "getImageMetadata", "(int,String,Set)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.imageio", "ImageReader", True, "getInput", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.imageio", "ImageReader", True, "getLocale", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.imageio", "ImageReader", True, "getOriginatingProvider", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.imageio", "ImageReader", True, "getImageTypes", "(int)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.imageio", "ImageReader", True, "getInput", "()", "", "Argument[this].SyntheticField[javax.imageio.ImageReader.input]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.imageio", "ImageReader", True, "getLocale", "()", "", "Argument[this].SyntheticField[javax.imageio.ImageReader.locale]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.imageio", "ImageReader", True, "getOriginatingProvider", "()", "", "Argument[this].SyntheticField[javax.imageio.ImageReader.originatingProvider]", "ReturnValue", "value", "dfc-generated"]
       - ["javax.imageio", "ImageReader", True, "getRawImageType", "(int)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.imageio", "ImageReader", True, "getStreamMetadata", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["javax.imageio", "ImageReader", True, "getStreamMetadata", "(String,Set)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["javax.imageio", "ImageReader", True, "read", "(int)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.imageio", "ImageReader", True, "read", "(int,ImageReadParam)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.imageio", "ImageReader", True, "read", "(int,ImageReadParam)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.imageio", "ImageReader", True, "read", "(int,ImageReadParam)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["javax.imageio", "ImageReader", True, "readAll", "(Iterator)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
+      - ["javax.imageio", "ImageReader", True, "readAll", "(Iterator)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
+      - ["javax.imageio", "ImageReader", True, "readAll", "(Iterator)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["javax.imageio", "ImageReader", True, "readAll", "(int,ImageReadParam)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
       - ["javax.imageio", "ImageReader", True, "readAll", "(int,ImageReadParam)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
       - ["javax.imageio", "ImageReader", True, "readAll", "(int,ImageReadParam)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["javax.imageio", "ImageReader", True, "readAsRenderedImage", "(int,ImageReadParam)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
       - ["javax.imageio", "ImageReader", True, "readAsRenderedImage", "(int,ImageReadParam)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
       - ["javax.imageio", "ImageReader", True, "readAsRenderedImage", "(int,ImageReadParam)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.imageio", "ImageReader", True, "readRaster", "(int,ImageReadParam)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.imageio", "ImageReader", True, "readRaster", "(int,ImageReadParam)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["javax.imageio", "ImageReader", True, "readTile", "(int,int,int)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["javax.imageio", "ImageReader", True, "readTileRaster", "(int,int,int)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["javax.imageio", "ImageReader", True, "setInput", "(Object)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["javax.imageio", "ImageReader", True, "setInput", "(Object,boolean)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.imageio", "ImageReader", True, "setInput", "(Object,boolean,boolean)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.imageio", "ImageReader", True, "setLocale", "(Locale)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.imageio", "ImageTypeSpecifier", True, "ImageTypeSpecifier", "(ColorModel,SampleModel)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.imageio", "ImageTypeSpecifier", True, "ImageTypeSpecifier", "(ColorModel,SampleModel)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.imageio", "ImageReader", True, "setInput", "(Object,boolean,boolean)", "", "Argument[0]", "Argument[this].SyntheticField[javax.imageio.ImageReader.input]", "value", "dfc-generated"]
+      - ["javax.imageio", "ImageReader", True, "setLocale", "(Locale)", "", "Argument[0]", "Argument[this].SyntheticField[javax.imageio.ImageReader.locale]", "value", "dfc-generated"]
+      - ["javax.imageio", "ImageTranscoder", True, "convertImageMetadata", "(IIOMetadata,ImageTypeSpecifier,ImageWriteParam)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.imageio", "ImageTranscoder", True, "convertStreamMetadata", "(IIOMetadata,ImageWriteParam)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.imageio", "ImageTypeSpecifier", True, "ImageTypeSpecifier", "(ColorModel,SampleModel)", "", "Argument[0]", "Argument[this].SyntheticField[javax.imageio.ImageTypeSpecifier.colorModel]", "value", "dfc-generated"]
+      - ["javax.imageio", "ImageTypeSpecifier", True, "ImageTypeSpecifier", "(ColorModel,SampleModel)", "", "Argument[1]", "Argument[this].SyntheticField[javax.imageio.ImageTypeSpecifier.sampleModel]", "value", "dfc-generated"]
       - ["javax.imageio", "ImageTypeSpecifier", True, "ImageTypeSpecifier", "(RenderedImage)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["javax.imageio", "ImageTypeSpecifier", True, "createBanded", "(ColorSpace,int[],int[],int,boolean,boolean)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["javax.imageio", "ImageTypeSpecifier", True, "createBufferedImage", "(int,int)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
@@ -74,24 +87,40 @@ extensions:
       - ["javax.imageio", "ImageTypeSpecifier", True, "createIndexed", "(byte[],byte[],byte[],byte[],int,int)", "", "Argument[3]", "ReturnValue", "taint", "df-generated"]
       - ["javax.imageio", "ImageTypeSpecifier", True, "createInterleaved", "(ColorSpace,int[],int,boolean,boolean)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["javax.imageio", "ImageTypeSpecifier", True, "createPacked", "(ColorSpace,int,int,int,int,int,boolean)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.imageio", "ImageTypeSpecifier", True, "getColorModel", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.imageio", "ImageTypeSpecifier", True, "getSampleModel", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.imageio", "ImageWriteParam", True, "ImageWriteParam", "(Locale)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.imageio", "ImageTypeSpecifier", True, "getColorModel", "()", "", "Argument[this].SyntheticField[javax.imageio.ImageTypeSpecifier.colorModel]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.imageio", "ImageTypeSpecifier", True, "getSampleModel", "()", "", "Argument[this].SyntheticField[javax.imageio.ImageTypeSpecifier.sampleModel]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.imageio", "ImageWriteParam", True, "ImageWriteParam", "(Locale)", "", "Argument[0]", "Argument[this].SyntheticField[javax.imageio.ImageWriteParam.locale]", "value", "dfc-generated"]
       - ["javax.imageio", "ImageWriteParam", True, "getCompressionQualityDescriptions", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.imageio", "ImageWriteParam", True, "getCompressionType", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.imageio", "ImageWriteParam", True, "getCompressionType", "()", "", "Argument[this].SyntheticField[javax.imageio.ImageWriteParam.compressionType]", "ReturnValue", "value", "dfc-generated"]
       - ["javax.imageio", "ImageWriteParam", True, "getCompressionTypes", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.imageio", "ImageWriteParam", True, "getLocale", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.imageio", "ImageWriteParam", True, "getLocalizedCompressionTypeName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.imageio", "ImageWriteParam", True, "setCompressionType", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.imageio", "ImageWriteParam", True, "getLocale", "()", "", "Argument[this].SyntheticField[javax.imageio.ImageWriteParam.locale]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.imageio", "ImageWriteParam", True, "getLocalizedCompressionTypeName", "()", "", "Argument[this].SyntheticField[javax.imageio.ImageWriteParam.compressionType]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.imageio", "ImageWriteParam", True, "setCompressionType", "(String)", "", "Argument[0]", "Argument[this].SyntheticField[javax.imageio.ImageWriteParam.compressionType]", "value", "dfc-generated"]
       - ["javax.imageio", "ImageWriter", True, "addIIOWriteProgressListener", "(IIOWriteProgressListener)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["javax.imageio", "ImageWriter", True, "addIIOWriteWarningListener", "(IIOWriteWarningListener)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["javax.imageio", "ImageWriter", True, "getAvailableLocales", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.imageio", "ImageWriter", True, "getDefaultWriteParam", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.imageio", "ImageWriter", True, "getLocale", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.imageio", "ImageWriter", True, "getOriginatingProvider", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.imageio", "ImageWriter", True, "getOutput", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.imageio", "ImageWriter", True, "setLocale", "(Locale)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.imageio", "ImageWriter", True, "setOutput", "(Object)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.imageio", "ImageWriter", True, "getDefaultWriteParam", "()", "", "Argument[this].SyntheticField[javax.imageio.ImageWriter.locale]", "ReturnValue.SyntheticField[javax.imageio.ImageWriteParam.locale]", "value", "dfc-generated"]
+      - ["javax.imageio", "ImageWriter", True, "getLocale", "()", "", "Argument[this].SyntheticField[javax.imageio.ImageWriter.locale]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.imageio", "ImageWriter", True, "getOriginatingProvider", "()", "", "Argument[this].SyntheticField[javax.imageio.ImageWriter.originatingProvider]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.imageio", "ImageWriter", True, "getOutput", "()", "", "Argument[this].SyntheticField[javax.imageio.ImageWriter.output]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.imageio", "ImageWriter", True, "prepareInsertEmpty", "(int,ImageTypeSpecifier,int,int,IIOMetadata,List,ImageWriteParam)", "", "Argument[6]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.imageio", "ImageWriter", True, "prepareWriteEmpty", "(IIOMetadata,ImageTypeSpecifier,int,int,IIOMetadata,List,ImageWriteParam)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.imageio", "ImageWriter", True, "prepareWriteEmpty", "(IIOMetadata,ImageTypeSpecifier,int,int,IIOMetadata,List,ImageWriteParam)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.imageio", "ImageWriter", True, "prepareWriteEmpty", "(IIOMetadata,ImageTypeSpecifier,int,int,IIOMetadata,List,ImageWriteParam)", "", "Argument[4]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.imageio", "ImageWriter", True, "prepareWriteEmpty", "(IIOMetadata,ImageTypeSpecifier,int,int,IIOMetadata,List,ImageWriteParam)", "", "Argument[6]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.imageio", "ImageWriter", True, "prepareWriteSequence", "(IIOMetadata)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.imageio", "ImageWriter", True, "replacePixels", "(Raster,ImageWriteParam)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.imageio", "ImageWriter", True, "replacePixels", "(RenderedImage,ImageWriteParam)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.imageio", "ImageWriter", True, "replacePixels", "(RenderedImage,ImageWriteParam)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.imageio", "ImageWriter", True, "setLocale", "(Locale)", "", "Argument[0]", "Argument[this].SyntheticField[javax.imageio.ImageWriter.locale]", "value", "dfc-generated"]
+      - ["javax.imageio", "ImageWriter", True, "setOutput", "(Object)", "", "Argument[0]", "Argument[this].SyntheticField[javax.imageio.ImageWriter.output]", "value", "dfc-generated"]
+      - ["javax.imageio", "ImageWriter", True, "write", "(IIOMetadata,IIOImage,ImageWriteParam)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.imageio", "ImageWriter", True, "write", "(IIOMetadata,IIOImage,ImageWriteParam)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.imageio", "ImageWriter", True, "write", "(IIOMetadata,IIOImage,ImageWriteParam)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.imageio", "ImageWriter", True, "writeInsert", "(int,IIOImage,ImageWriteParam)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.imageio", "ImageWriter", True, "writeInsert", "(int,IIOImage,ImageWriteParam)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.imageio", "ImageWriter", True, "writeToSequence", "(IIOImage,ImageWriteParam)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.imageio", "ImageWriter", True, "writeToSequence", "(IIOImage,ImageWriteParam)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
   - addsTo:
       pack: codeql/java-all
       extensible: neutralModel
@@ -149,12 +178,9 @@ extensions:
       - ["javax.imageio", "ImageReader", "getAspectRatio", "(int)", "summary", "df-generated"]
       - ["javax.imageio", "ImageReader", "getDefaultReadParam", "()", "summary", "df-generated"]
       - ["javax.imageio", "ImageReader", "getHeight", "(int)", "summary", "df-generated"]
-      - ["javax.imageio", "ImageReader", "getImageMetadata", "(int)", "summary", "df-generated"]
-      - ["javax.imageio", "ImageReader", "getImageTypes", "(int)", "summary", "df-generated"]
       - ["javax.imageio", "ImageReader", "getMinIndex", "()", "summary", "df-generated"]
       - ["javax.imageio", "ImageReader", "getNumImages", "(boolean)", "summary", "df-generated"]
       - ["javax.imageio", "ImageReader", "getNumThumbnails", "(int)", "summary", "df-generated"]
-      - ["javax.imageio", "ImageReader", "getStreamMetadata", "()", "summary", "df-generated"]
       - ["javax.imageio", "ImageReader", "getThumbnailHeight", "(int,int)", "summary", "df-generated"]
       - ["javax.imageio", "ImageReader", "getThumbnailWidth", "(int,int)", "summary", "df-generated"]
       - ["javax.imageio", "ImageReader", "getTileGridXOffset", "(int)", "summary", "df-generated"]
@@ -167,8 +193,6 @@ extensions:
       - ["javax.imageio", "ImageReader", "isImageTiled", "(int)", "summary", "df-generated"]
       - ["javax.imageio", "ImageReader", "isRandomAccessEasy", "(int)", "summary", "df-generated"]
       - ["javax.imageio", "ImageReader", "isSeekForwardOnly", "()", "summary", "df-generated"]
-      - ["javax.imageio", "ImageReader", "read", "(int,ImageReadParam)", "summary", "df-generated"]
-      - ["javax.imageio", "ImageReader", "readRaster", "(int,ImageReadParam)", "summary", "df-generated"]
       - ["javax.imageio", "ImageReader", "readThumbnail", "(int,int)", "summary", "df-generated"]
       - ["javax.imageio", "ImageReader", "readerSupportsThumbnails", "()", "summary", "df-generated"]
       - ["javax.imageio", "ImageReader", "removeAllIIOReadProgressListeners", "()", "summary", "df-generated"]
@@ -178,8 +202,6 @@ extensions:
       - ["javax.imageio", "ImageReader", "removeIIOReadUpdateListener", "(IIOReadUpdateListener)", "summary", "df-generated"]
       - ["javax.imageio", "ImageReader", "removeIIOReadWarningListener", "(IIOReadWarningListener)", "summary", "df-generated"]
       - ["javax.imageio", "ImageReader", "reset", "()", "summary", "df-generated"]
-      - ["javax.imageio", "ImageTranscoder", "convertImageMetadata", "(IIOMetadata,ImageTypeSpecifier,ImageWriteParam)", "summary", "df-generated"]
-      - ["javax.imageio", "ImageTranscoder", "convertStreamMetadata", "(IIOMetadata,ImageWriteParam)", "summary", "df-generated"]
       - ["javax.imageio", "ImageTypeSpecifier", "createFromBufferedImageType", "(int)", "summary", "df-generated"]
       - ["javax.imageio", "ImageTypeSpecifier", "createGrayscale", "(int,int,boolean)", "summary", "df-generated"]
       - ["javax.imageio", "ImageTypeSpecifier", "createGrayscale", "(int,int,boolean,boolean)", "summary", "df-generated"]
@@ -230,22 +252,14 @@ extensions:
       - ["javax.imageio", "ImageWriter", "getDefaultStreamMetadata", "(ImageWriteParam)", "summary", "df-generated"]
       - ["javax.imageio", "ImageWriter", "getNumThumbnailsSupported", "(ImageTypeSpecifier,ImageWriteParam,IIOMetadata,IIOMetadata)", "summary", "df-generated"]
       - ["javax.imageio", "ImageWriter", "getPreferredThumbnailSizes", "(ImageTypeSpecifier,ImageWriteParam,IIOMetadata,IIOMetadata)", "summary", "df-generated"]
-      - ["javax.imageio", "ImageWriter", "prepareInsertEmpty", "(int,ImageTypeSpecifier,int,int,IIOMetadata,List,ImageWriteParam)", "summary", "df-generated"]
       - ["javax.imageio", "ImageWriter", "prepareReplacePixels", "(int,Rectangle)", "summary", "df-generated"]
-      - ["javax.imageio", "ImageWriter", "prepareWriteEmpty", "(IIOMetadata,ImageTypeSpecifier,int,int,IIOMetadata,List,ImageWriteParam)", "summary", "df-generated"]
-      - ["javax.imageio", "ImageWriter", "prepareWriteSequence", "(IIOMetadata)", "summary", "df-generated"]
       - ["javax.imageio", "ImageWriter", "removeAllIIOWriteProgressListeners", "()", "summary", "df-generated"]
       - ["javax.imageio", "ImageWriter", "removeAllIIOWriteWarningListeners", "()", "summary", "df-generated"]
       - ["javax.imageio", "ImageWriter", "removeIIOWriteProgressListener", "(IIOWriteProgressListener)", "summary", "df-generated"]
       - ["javax.imageio", "ImageWriter", "removeIIOWriteWarningListener", "(IIOWriteWarningListener)", "summary", "df-generated"]
       - ["javax.imageio", "ImageWriter", "removeImage", "(int)", "summary", "df-generated"]
       - ["javax.imageio", "ImageWriter", "replaceImageMetadata", "(int,IIOMetadata)", "summary", "df-generated"]
-      - ["javax.imageio", "ImageWriter", "replacePixels", "(Raster,ImageWriteParam)", "summary", "df-generated"]
-      - ["javax.imageio", "ImageWriter", "replacePixels", "(RenderedImage,ImageWriteParam)", "summary", "df-generated"]
       - ["javax.imageio", "ImageWriter", "replaceStreamMetadata", "(IIOMetadata)", "summary", "df-generated"]
       - ["javax.imageio", "ImageWriter", "reset", "()", "summary", "df-generated"]
       - ["javax.imageio", "ImageWriter", "write", "(IIOImage)", "summary", "df-generated"]
-      - ["javax.imageio", "ImageWriter", "write", "(IIOMetadata,IIOImage,ImageWriteParam)", "summary", "df-generated"]
       - ["javax.imageio", "ImageWriter", "write", "(RenderedImage)", "summary", "df-generated"]
-      - ["javax.imageio", "ImageWriter", "writeInsert", "(int,IIOImage,ImageWriteParam)", "summary", "df-generated"]
-      - ["javax.imageio", "ImageWriter", "writeToSequence", "(IIOImage,ImageWriteParam)", "summary", "df-generated"]
diff --git a/java/ql/lib/ext/generated/javax.imageio.plugins.jpeg.model.yml b/java/ql/lib/ext/generated/javax.imageio.plugins.jpeg.model.yml
index 00938e459a3..68fa78314ad 100644
--- a/java/ql/lib/ext/generated/javax.imageio.plugins.jpeg.model.yml
+++ b/java/ql/lib/ext/generated/javax.imageio.plugins.jpeg.model.yml
@@ -4,19 +4,19 @@ extensions:
       pack: codeql/java-all
       extensible: summaryModel
     data:
-      - ["javax.imageio.plugins.jpeg", "JPEGImageReadParam", True, "getACHuffmanTables", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.imageio.plugins.jpeg", "JPEGImageReadParam", True, "getDCHuffmanTables", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.imageio.plugins.jpeg", "JPEGImageReadParam", True, "getQTables", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.imageio.plugins.jpeg", "JPEGImageReadParam", True, "setDecodeTables", "(JPEGQTable[],JPEGHuffmanTable[],JPEGHuffmanTable[])", "", "Argument[0].ArrayElement", "Argument[this]", "taint", "df-generated"]
-      - ["javax.imageio.plugins.jpeg", "JPEGImageReadParam", True, "setDecodeTables", "(JPEGQTable[],JPEGHuffmanTable[],JPEGHuffmanTable[])", "", "Argument[1].ArrayElement", "Argument[this]", "taint", "df-generated"]
-      - ["javax.imageio.plugins.jpeg", "JPEGImageReadParam", True, "setDecodeTables", "(JPEGQTable[],JPEGHuffmanTable[],JPEGHuffmanTable[])", "", "Argument[2].ArrayElement", "Argument[this]", "taint", "df-generated"]
+      - ["javax.imageio.plugins.jpeg", "JPEGImageReadParam", True, "getACHuffmanTables", "()", "", "Argument[this].SyntheticField[javax.imageio.plugins.jpeg.JPEGImageReadParam.ACHuffmanTables]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.imageio.plugins.jpeg", "JPEGImageReadParam", True, "getDCHuffmanTables", "()", "", "Argument[this].SyntheticField[javax.imageio.plugins.jpeg.JPEGImageReadParam.DCHuffmanTables]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.imageio.plugins.jpeg", "JPEGImageReadParam", True, "getQTables", "()", "", "Argument[this].SyntheticField[javax.imageio.plugins.jpeg.JPEGImageReadParam.qTables]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.imageio.plugins.jpeg", "JPEGImageReadParam", True, "setDecodeTables", "(JPEGQTable[],JPEGHuffmanTable[],JPEGHuffmanTable[])", "", "Argument[0]", "Argument[this].SyntheticField[javax.imageio.plugins.jpeg.JPEGImageReadParam.qTables]", "value", "dfc-generated"]
+      - ["javax.imageio.plugins.jpeg", "JPEGImageReadParam", True, "setDecodeTables", "(JPEGQTable[],JPEGHuffmanTable[],JPEGHuffmanTable[])", "", "Argument[1]", "Argument[this].SyntheticField[javax.imageio.plugins.jpeg.JPEGImageReadParam.DCHuffmanTables]", "value", "dfc-generated"]
+      - ["javax.imageio.plugins.jpeg", "JPEGImageReadParam", True, "setDecodeTables", "(JPEGQTable[],JPEGHuffmanTable[],JPEGHuffmanTable[])", "", "Argument[2]", "Argument[this].SyntheticField[javax.imageio.plugins.jpeg.JPEGImageReadParam.ACHuffmanTables]", "value", "dfc-generated"]
       - ["javax.imageio.plugins.jpeg", "JPEGImageWriteParam", True, "JPEGImageWriteParam", "(Locale)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.imageio.plugins.jpeg", "JPEGImageWriteParam", True, "getACHuffmanTables", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.imageio.plugins.jpeg", "JPEGImageWriteParam", True, "getDCHuffmanTables", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.imageio.plugins.jpeg", "JPEGImageWriteParam", True, "getQTables", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.imageio.plugins.jpeg", "JPEGImageWriteParam", True, "setEncodeTables", "(JPEGQTable[],JPEGHuffmanTable[],JPEGHuffmanTable[])", "", "Argument[0].ArrayElement", "Argument[this]", "taint", "df-generated"]
-      - ["javax.imageio.plugins.jpeg", "JPEGImageWriteParam", True, "setEncodeTables", "(JPEGQTable[],JPEGHuffmanTable[],JPEGHuffmanTable[])", "", "Argument[1].ArrayElement", "Argument[this]", "taint", "df-generated"]
-      - ["javax.imageio.plugins.jpeg", "JPEGImageWriteParam", True, "setEncodeTables", "(JPEGQTable[],JPEGHuffmanTable[],JPEGHuffmanTable[])", "", "Argument[2].ArrayElement", "Argument[this]", "taint", "df-generated"]
+      - ["javax.imageio.plugins.jpeg", "JPEGImageWriteParam", True, "getACHuffmanTables", "()", "", "Argument[this].SyntheticField[javax.imageio.plugins.jpeg.JPEGImageWriteParam.ACHuffmanTables]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.imageio.plugins.jpeg", "JPEGImageWriteParam", True, "getDCHuffmanTables", "()", "", "Argument[this].SyntheticField[javax.imageio.plugins.jpeg.JPEGImageWriteParam.DCHuffmanTables]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.imageio.plugins.jpeg", "JPEGImageWriteParam", True, "getQTables", "()", "", "Argument[this].SyntheticField[javax.imageio.plugins.jpeg.JPEGImageWriteParam.qTables]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.imageio.plugins.jpeg", "JPEGImageWriteParam", True, "setEncodeTables", "(JPEGQTable[],JPEGHuffmanTable[],JPEGHuffmanTable[])", "", "Argument[0]", "Argument[this].SyntheticField[javax.imageio.plugins.jpeg.JPEGImageWriteParam.qTables]", "value", "dfc-generated"]
+      - ["javax.imageio.plugins.jpeg", "JPEGImageWriteParam", True, "setEncodeTables", "(JPEGQTable[],JPEGHuffmanTable[],JPEGHuffmanTable[])", "", "Argument[1]", "Argument[this].SyntheticField[javax.imageio.plugins.jpeg.JPEGImageWriteParam.DCHuffmanTables]", "value", "dfc-generated"]
+      - ["javax.imageio.plugins.jpeg", "JPEGImageWriteParam", True, "setEncodeTables", "(JPEGQTable[],JPEGHuffmanTable[],JPEGHuffmanTable[])", "", "Argument[2]", "Argument[this].SyntheticField[javax.imageio.plugins.jpeg.JPEGImageWriteParam.ACHuffmanTables]", "value", "dfc-generated"]
   - addsTo:
       pack: codeql/java-all
       extensible: neutralModel
@@ -27,8 +27,11 @@ extensions:
       - ["javax.imageio.plugins.jpeg", "JPEGImageReadParam", "areTablesSet", "()", "summary", "df-generated"]
       - ["javax.imageio.plugins.jpeg", "JPEGImageReadParam", "unsetDecodeTables", "()", "summary", "df-generated"]
       - ["javax.imageio.plugins.jpeg", "JPEGImageWriteParam", "areTablesSet", "()", "summary", "df-generated"]
+      - ["javax.imageio.plugins.jpeg", "JPEGImageWriteParam", "getCompressionQualityValues", "()", "summary", "df-generated"]
       - ["javax.imageio.plugins.jpeg", "JPEGImageWriteParam", "getOptimizeHuffmanTables", "()", "summary", "df-generated"]
+      - ["javax.imageio.plugins.jpeg", "JPEGImageWriteParam", "isCompressionLossless", "()", "summary", "df-generated"]
       - ["javax.imageio.plugins.jpeg", "JPEGImageWriteParam", "setOptimizeHuffmanTables", "(boolean)", "summary", "df-generated"]
+      - ["javax.imageio.plugins.jpeg", "JPEGImageWriteParam", "unsetCompression", "()", "summary", "df-generated"]
       - ["javax.imageio.plugins.jpeg", "JPEGImageWriteParam", "unsetEncodeTables", "()", "summary", "df-generated"]
       - ["javax.imageio.plugins.jpeg", "JPEGQTable", "JPEGQTable", "(int[])", "summary", "df-generated"]
       - ["javax.imageio.plugins.jpeg", "JPEGQTable", "getScaledInstance", "(float,boolean)", "summary", "df-generated"]
diff --git a/java/ql/lib/ext/generated/javax.imageio.plugins.tiff.model.yml b/java/ql/lib/ext/generated/javax.imageio.plugins.tiff.model.yml
index 56152d0710e..9ec5e1d9b46 100644
--- a/java/ql/lib/ext/generated/javax.imageio.plugins.tiff.model.yml
+++ b/java/ql/lib/ext/generated/javax.imageio.plugins.tiff.model.yml
@@ -4,45 +4,49 @@ extensions:
       pack: codeql/java-all
       extensible: summaryModel
     data:
-      - ["javax.imageio.plugins.tiff", "TIFFDirectory", True, "TIFFDirectory", "(TIFFTagSet[],TIFFTag)", "", "Argument[0].ArrayElement", "Argument[this]", "taint", "df-generated"]
-      - ["javax.imageio.plugins.tiff", "TIFFDirectory", True, "TIFFDirectory", "(TIFFTagSet[],TIFFTag)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.imageio.plugins.tiff", "TIFFDirectory", True, "addTIFFField", "(TIFFField)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.imageio.plugins.tiff", "TIFFDirectory", True, "addTagSet", "(TIFFTagSet)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.imageio.plugins.tiff", "TIFFDirectory", True, "TIFFDirectory", "(TIFFTagSet[],TIFFTag)", "", "Argument[0].ArrayElement", "Argument[this].SyntheticField[javax.imageio.plugins.tiff.TIFFDirectory.tagSets].Element", "value", "dfc-generated"]
+      - ["javax.imageio.plugins.tiff", "TIFFDirectory", True, "TIFFDirectory", "(TIFFTagSet[],TIFFTag)", "", "Argument[1]", "Argument[this].SyntheticField[javax.imageio.plugins.tiff.TIFFDirectory.parentTag]", "value", "dfc-generated"]
+      - ["javax.imageio.plugins.tiff", "TIFFDirectory", True, "addTIFFField", "(TIFFField)", "", "Argument[0]", "Argument[this].SyntheticField[javax.imageio.plugins.tiff.TIFFDirectory.highFields].MapValue", "value", "dfc-generated"]
+      - ["javax.imageio.plugins.tiff", "TIFFDirectory", True, "addTIFFField", "(TIFFField)", "", "Argument[0]", "Argument[this].SyntheticField[javax.imageio.plugins.tiff.TIFFDirectory.lowFields].ArrayElement", "value", "dfc-generated"]
+      - ["javax.imageio.plugins.tiff", "TIFFDirectory", True, "addTagSet", "(TIFFTagSet)", "", "Argument[0]", "Argument[this].SyntheticField[javax.imageio.plugins.tiff.TIFFDirectory.tagSets].Element", "value", "dfc-generated"]
       - ["javax.imageio.plugins.tiff", "TIFFDirectory", True, "createFromMetadata", "(IIOMetadata)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["javax.imageio.plugins.tiff", "TIFFDirectory", True, "getAsMetadata", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.imageio.plugins.tiff", "TIFFDirectory", True, "getParentTag", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.imageio.plugins.tiff", "TIFFDirectory", True, "getTIFFField", "(int)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.imageio.plugins.tiff", "TIFFDirectory", True, "getTIFFFields", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.imageio.plugins.tiff", "TIFFDirectory", True, "getParentTag", "()", "", "Argument[this].SyntheticField[javax.imageio.plugins.tiff.TIFFDirectory.parentTag]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.imageio.plugins.tiff", "TIFFDirectory", True, "getTIFFField", "(int)", "", "Argument[this].SyntheticField[javax.imageio.plugins.tiff.TIFFDirectory.highFields].MapValue", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.imageio.plugins.tiff", "TIFFDirectory", True, "getTIFFField", "(int)", "", "Argument[this].SyntheticField[javax.imageio.plugins.tiff.TIFFDirectory.lowFields].ArrayElement", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.imageio.plugins.tiff", "TIFFDirectory", True, "getTIFFFields", "()", "", "Argument[this].SyntheticField[javax.imageio.plugins.tiff.TIFFDirectory.highFields].MapValue", "ReturnValue.ArrayElement", "value", "dfc-generated"]
+      - ["javax.imageio.plugins.tiff", "TIFFDirectory", True, "getTIFFFields", "()", "", "Argument[this].SyntheticField[javax.imageio.plugins.tiff.TIFFDirectory.lowFields].ArrayElement", "ReturnValue.ArrayElement", "value", "dfc-generated"]
       - ["javax.imageio.plugins.tiff", "TIFFDirectory", True, "getTag", "(int)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.imageio.plugins.tiff", "TIFFDirectory", True, "getTagSets", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.imageio.plugins.tiff", "TIFFField", False, "TIFFField", "(TIFFTag,int,int)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.imageio.plugins.tiff", "TIFFField", False, "TIFFField", "(TIFFTag,int,int,Object)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.imageio.plugins.tiff", "TIFFField", False, "TIFFField", "(TIFFTag,int,int,Object)", "", "Argument[3]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.imageio.plugins.tiff", "TIFFField", False, "TIFFField", "(TIFFTag,int,long,TIFFDirectory)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.imageio.plugins.tiff", "TIFFField", False, "TIFFField", "(TIFFTag,int,long,TIFFDirectory)", "", "Argument[3]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.imageio.plugins.tiff", "TIFFField", False, "TIFFField", "(TIFFTag,long)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.imageio.plugins.tiff", "TIFFField", False, "createFromMetadataNode", "(TIFFTagSet,Node)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.imageio.plugins.tiff", "TIFFField", False, "getAsBytes", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.imageio.plugins.tiff", "TIFFField", False, "getAsChars", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.imageio.plugins.tiff", "TIFFDirectory", True, "getTagSets", "()", "", "Argument[this].SyntheticField[javax.imageio.plugins.tiff.TIFFDirectory.tagSets].Element", "ReturnValue.ArrayElement", "value", "dfc-generated"]
+      - ["javax.imageio.plugins.tiff", "TIFFField", False, "TIFFField", "(TIFFTag,int,int)", "", "Argument[0]", "Argument[this].SyntheticField[javax.imageio.plugins.tiff.TIFFField.tag]", "value", "dfc-generated"]
+      - ["javax.imageio.plugins.tiff", "TIFFField", False, "TIFFField", "(TIFFTag,int,int,Object)", "", "Argument[0]", "Argument[this].SyntheticField[javax.imageio.plugins.tiff.TIFFField.tag]", "value", "dfc-generated"]
+      - ["javax.imageio.plugins.tiff", "TIFFField", False, "TIFFField", "(TIFFTag,int,int,Object)", "", "Argument[3]", "Argument[this].SyntheticField[javax.imageio.plugins.tiff.TIFFField.data]", "value", "dfc-generated"]
+      - ["javax.imageio.plugins.tiff", "TIFFField", False, "TIFFField", "(TIFFTag,int,long,TIFFDirectory)", "", "Argument[0]", "Argument[this].SyntheticField[javax.imageio.plugins.tiff.TIFFField.tag]", "value", "dfc-generated"]
+      - ["javax.imageio.plugins.tiff", "TIFFField", False, "TIFFField", "(TIFFTag,int,long,TIFFDirectory)", "", "Argument[3]", "Argument[this].SyntheticField[javax.imageio.plugins.tiff.TIFFField.dir]", "value", "dfc-generated"]
+      - ["javax.imageio.plugins.tiff", "TIFFField", False, "TIFFField", "(TIFFTag,long)", "", "Argument[0]", "Argument[this].SyntheticField[javax.imageio.plugins.tiff.TIFFField.tag]", "value", "dfc-generated"]
+      - ["javax.imageio.plugins.tiff", "TIFFField", False, "createFromMetadataNode", "(TIFFTagSet,Node)", "", "Argument[0].SyntheticField[javax.imageio.plugins.tiff.TIFFTagSet.allowedTagsByNumber].MapValue", "ReturnValue.SyntheticField[javax.imageio.plugins.tiff.TIFFField.tag]", "value", "dfc-generated"]
+      - ["javax.imageio.plugins.tiff", "TIFFField", False, "getAsBytes", "()", "", "Argument[this].SyntheticField[javax.imageio.plugins.tiff.TIFFField.data]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.imageio.plugins.tiff", "TIFFField", False, "getAsChars", "()", "", "Argument[this].SyntheticField[javax.imageio.plugins.tiff.TIFFField.data]", "ReturnValue", "value", "dfc-generated"]
       - ["javax.imageio.plugins.tiff", "TIFFField", False, "getAsNativeNode", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.imageio.plugins.tiff", "TIFFField", False, "getAsString", "(int)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.imageio.plugins.tiff", "TIFFField", False, "getData", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.imageio.plugins.tiff", "TIFFField", False, "getDirectory", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.imageio.plugins.tiff", "TIFFField", False, "getTag", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.imageio.plugins.tiff", "TIFFField", False, "getValueAsString", "(int)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.imageio.plugins.tiff", "TIFFImageReadParam", False, "addAllowedTagSet", "(TIFFTagSet)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.imageio.plugins.tiff", "TIFFImageReadParam", False, "getAllowedTagSets", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.imageio.plugins.tiff", "TIFFTag", True, "TIFFTag", "(String,int,TIFFTagSet)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.imageio.plugins.tiff", "TIFFTag", True, "TIFFTag", "(String,int,TIFFTagSet)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.imageio.plugins.tiff", "TIFFTag", True, "TIFFTag", "(String,int,int)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.imageio.plugins.tiff", "TIFFTag", True, "TIFFTag", "(String,int,int,int)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.imageio.plugins.tiff", "TIFFTag", True, "getName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.imageio.plugins.tiff", "TIFFTag", True, "getTagSet", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.imageio.plugins.tiff", "TIFFField", False, "getAsString", "(int)", "", "Argument[this].SyntheticField[javax.imageio.plugins.tiff.TIFFField.data].ArrayElement", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.imageio.plugins.tiff", "TIFFField", False, "getData", "()", "", "Argument[this].SyntheticField[javax.imageio.plugins.tiff.TIFFField.data]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.imageio.plugins.tiff", "TIFFField", False, "getDirectory", "()", "", "Argument[this].SyntheticField[javax.imageio.plugins.tiff.TIFFField.dir]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.imageio.plugins.tiff", "TIFFField", False, "getTag", "()", "", "Argument[this].SyntheticField[javax.imageio.plugins.tiff.TIFFField.tag]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.imageio.plugins.tiff", "TIFFField", False, "getValueAsString", "(int)", "", "Argument[this].SyntheticField[javax.imageio.plugins.tiff.TIFFField.data].ArrayElement", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.imageio.plugins.tiff", "TIFFImageReadParam", False, "addAllowedTagSet", "(TIFFTagSet)", "", "Argument[0]", "Argument[this].SyntheticField[javax.imageio.plugins.tiff.TIFFImageReadParam.allowedTagSets].Element", "value", "dfc-generated"]
+      - ["javax.imageio.plugins.tiff", "TIFFImageReadParam", False, "getAllowedTagSets", "()", "", "Argument[this].SyntheticField[javax.imageio.plugins.tiff.TIFFImageReadParam.allowedTagSets]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.imageio.plugins.tiff", "TIFFTag", True, "TIFFTag", "(String,int,TIFFTagSet)", "", "Argument[0]", "Argument[this].SyntheticField[javax.imageio.plugins.tiff.TIFFTag.name]", "value", "dfc-generated"]
+      - ["javax.imageio.plugins.tiff", "TIFFTag", True, "TIFFTag", "(String,int,TIFFTagSet)", "", "Argument[2]", "Argument[this].SyntheticField[javax.imageio.plugins.tiff.TIFFTag.tagSet]", "value", "dfc-generated"]
+      - ["javax.imageio.plugins.tiff", "TIFFTag", True, "TIFFTag", "(String,int,int)", "", "Argument[0]", "Argument[this].SyntheticField[javax.imageio.plugins.tiff.TIFFTag.name]", "value", "dfc-generated"]
+      - ["javax.imageio.plugins.tiff", "TIFFTag", True, "TIFFTag", "(String,int,int,int)", "", "Argument[0]", "Argument[this].SyntheticField[javax.imageio.plugins.tiff.TIFFTag.name]", "value", "dfc-generated"]
+      - ["javax.imageio.plugins.tiff", "TIFFTag", True, "getName", "()", "", "Argument[this].SyntheticField[javax.imageio.plugins.tiff.TIFFTag.name]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.imageio.plugins.tiff", "TIFFTag", True, "getTagSet", "()", "", "Argument[this].SyntheticField[javax.imageio.plugins.tiff.TIFFTag.tagSet]", "ReturnValue", "value", "dfc-generated"]
       - ["javax.imageio.plugins.tiff", "TIFFTag", True, "getValueName", "(int)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.imageio.plugins.tiff", "TIFFTagSet", True, "TIFFTagSet", "(List)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["javax.imageio.plugins.tiff", "TIFFTagSet", True, "getTag", "(String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.imageio.plugins.tiff", "TIFFTagSet", True, "getTag", "(int)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.imageio.plugins.tiff", "TIFFTagSet", True, "getTagNames", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.imageio.plugins.tiff", "TIFFTagSet", True, "TIFFTagSet", "(List)", "", "Argument[0].Element", "Argument[this].SyntheticField[javax.imageio.plugins.tiff.TIFFTagSet.allowedTagsByName].MapValue", "value", "dfc-generated"]
+      - ["javax.imageio.plugins.tiff", "TIFFTagSet", True, "TIFFTagSet", "(List)", "", "Argument[0].Element", "Argument[this].SyntheticField[javax.imageio.plugins.tiff.TIFFTagSet.allowedTagsByNumber].MapValue", "value", "dfc-generated"]
+      - ["javax.imageio.plugins.tiff", "TIFFTagSet", True, "getTag", "(String)", "", "Argument[this].SyntheticField[javax.imageio.plugins.tiff.TIFFTagSet.allowedTagsByName].MapValue", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.imageio.plugins.tiff", "TIFFTagSet", True, "getTag", "(int)", "", "Argument[this].SyntheticField[javax.imageio.plugins.tiff.TIFFTagSet.allowedTagsByNumber].MapValue", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.imageio.plugins.tiff", "TIFFTagSet", True, "getTagNames", "()", "", "Argument[this].SyntheticField[javax.imageio.plugins.tiff.TIFFTagSet.allowedTagsByName].MapKey", "ReturnValue.Element", "value", "dfc-generated"]
   - addsTo:
       pack: codeql/java-all
       extensible: neutralModel
diff --git a/java/ql/lib/ext/generated/javax.imageio.spi.model.yml b/java/ql/lib/ext/generated/javax.imageio.spi.model.yml
index 1550958d1fa..67a97628ecf 100644
--- a/java/ql/lib/ext/generated/javax.imageio.spi.model.yml
+++ b/java/ql/lib/ext/generated/javax.imageio.spi.model.yml
@@ -4,78 +4,48 @@ extensions:
       pack: codeql/java-all
       extensible: summaryModel
     data:
-      - ["javax.imageio.spi", "IIOServiceProvider", True, "IIOServiceProvider", "(String,String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.imageio.spi", "IIOServiceProvider", True, "IIOServiceProvider", "(String,String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.imageio.spi", "IIOServiceProvider", True, "getVendorName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.imageio.spi", "IIOServiceProvider", True, "getVersion", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.imageio.spi", "IIOServiceProvider", True, "IIOServiceProvider", "(String,String)", "", "Argument[0]", "Argument[this].SyntheticField[javax.imageio.spi.IIOServiceProvider.vendorName]", "value", "dfc-generated"]
+      - ["javax.imageio.spi", "IIOServiceProvider", True, "IIOServiceProvider", "(String,String)", "", "Argument[1]", "Argument[this].SyntheticField[javax.imageio.spi.IIOServiceProvider.version]", "value", "dfc-generated"]
+      - ["javax.imageio.spi", "IIOServiceProvider", True, "getVendorName", "()", "", "Argument[this].SyntheticField[javax.imageio.spi.IIOServiceProvider.vendorName]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.imageio.spi", "IIOServiceProvider", True, "getVersion", "()", "", "Argument[this].SyntheticField[javax.imageio.spi.IIOServiceProvider.version]", "ReturnValue", "value", "dfc-generated"]
       - ["javax.imageio.spi", "ImageInputStreamSpi", True, "ImageInputStreamSpi", "(String,String,Class)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["javax.imageio.spi", "ImageInputStreamSpi", True, "ImageInputStreamSpi", "(String,String,Class)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
       - ["javax.imageio.spi", "ImageInputStreamSpi", True, "createInputStreamInstance", "(Object)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.imageio.spi", "ImageInputStreamSpi", True, "createInputStreamInstance", "(Object,boolean,File)", "", "Argument[0]", "ReturnValue.Element", "taint", "dfc-generated"]
       - ["javax.imageio.spi", "ImageOutputStreamSpi", True, "ImageOutputStreamSpi", "(String,String,Class)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["javax.imageio.spi", "ImageOutputStreamSpi", True, "ImageOutputStreamSpi", "(String,String,Class)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
       - ["javax.imageio.spi", "ImageOutputStreamSpi", True, "createOutputStreamInstance", "(Object)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.imageio.spi", "ImageReaderSpi", True, "ImageReaderSpi", "(String,String,String[],String[],String[],String,Class[],String[],boolean,String,String,String[],String[],boolean,String,String,String[],String[])", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.imageio.spi", "ImageReaderSpi", True, "ImageReaderSpi", "(String,String,String[],String[],String[],String,Class[],String[],boolean,String,String,String[],String[],boolean,String,String,String[],String[])", "", "Argument[10]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.imageio.spi", "ImageReaderSpi", True, "ImageReaderSpi", "(String,String,String[],String[],String[],String,Class[],String[],boolean,String,String,String[],String[],boolean,String,String,String[],String[])", "", "Argument[11].ArrayElement", "Argument[this]", "taint", "df-generated"]
-      - ["javax.imageio.spi", "ImageReaderSpi", True, "ImageReaderSpi", "(String,String,String[],String[],String[],String,Class[],String[],boolean,String,String,String[],String[],boolean,String,String,String[],String[])", "", "Argument[12].ArrayElement", "Argument[this]", "taint", "df-generated"]
-      - ["javax.imageio.spi", "ImageReaderSpi", True, "ImageReaderSpi", "(String,String,String[],String[],String[],String,Class[],String[],boolean,String,String,String[],String[],boolean,String,String,String[],String[])", "", "Argument[14]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.imageio.spi", "ImageReaderSpi", True, "ImageReaderSpi", "(String,String,String[],String[],String[],String,Class[],String[],boolean,String,String,String[],String[],boolean,String,String,String[],String[])", "", "Argument[15]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.imageio.spi", "ImageReaderSpi", True, "ImageReaderSpi", "(String,String,String[],String[],String[],String,Class[],String[],boolean,String,String,String[],String[],boolean,String,String,String[],String[])", "", "Argument[16].ArrayElement", "Argument[this]", "taint", "df-generated"]
-      - ["javax.imageio.spi", "ImageReaderSpi", True, "ImageReaderSpi", "(String,String,String[],String[],String[],String,Class[],String[],boolean,String,String,String[],String[],boolean,String,String,String[],String[])", "", "Argument[17].ArrayElement", "Argument[this]", "taint", "df-generated"]
-      - ["javax.imageio.spi", "ImageReaderSpi", True, "ImageReaderSpi", "(String,String,String[],String[],String[],String,Class[],String[],boolean,String,String,String[],String[],boolean,String,String,String[],String[])", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.imageio.spi", "ImageReaderSpi", True, "ImageReaderSpi", "(String,String,String[],String[],String[],String,Class[],String[],boolean,String,String,String[],String[],boolean,String,String,String[],String[])", "", "Argument[2].ArrayElement", "Argument[this]", "taint", "df-generated"]
-      - ["javax.imageio.spi", "ImageReaderSpi", True, "ImageReaderSpi", "(String,String,String[],String[],String[],String,Class[],String[],boolean,String,String,String[],String[],boolean,String,String,String[],String[])", "", "Argument[3].ArrayElement", "Argument[this]", "taint", "df-generated"]
-      - ["javax.imageio.spi", "ImageReaderSpi", True, "ImageReaderSpi", "(String,String,String[],String[],String[],String,Class[],String[],boolean,String,String,String[],String[],boolean,String,String,String[],String[])", "", "Argument[4].ArrayElement", "Argument[this]", "taint", "df-generated"]
-      - ["javax.imageio.spi", "ImageReaderSpi", True, "ImageReaderSpi", "(String,String,String[],String[],String[],String,Class[],String[],boolean,String,String,String[],String[],boolean,String,String,String[],String[])", "", "Argument[5]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.imageio.spi", "ImageReaderSpi", True, "ImageReaderSpi", "(String,String,String[],String[],String[],String,Class[],String[],boolean,String,String,String[],String[],boolean,String,String,String[],String[])", "", "Argument[6].ArrayElement", "Argument[this]", "taint", "df-generated"]
-      - ["javax.imageio.spi", "ImageReaderSpi", True, "ImageReaderSpi", "(String,String,String[],String[],String[],String,Class[],String[],boolean,String,String,String[],String[],boolean,String,String,String[],String[])", "", "Argument[7].ArrayElement", "Argument[this]", "taint", "df-generated"]
-      - ["javax.imageio.spi", "ImageReaderSpi", True, "ImageReaderSpi", "(String,String,String[],String[],String[],String,Class[],String[],boolean,String,String,String[],String[],boolean,String,String,String[],String[])", "", "Argument[9]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.imageio.spi", "ImageReaderSpi", True, "createReaderInstance", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.imageio.spi", "ImageReaderSpi", True, "getImageWriterSpiNames", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.imageio.spi", "ImageReaderSpi", True, "getInputTypes", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.imageio.spi", "ImageReaderWriterSpi", True, "ImageReaderWriterSpi", "(String,String,String[],String[],String[],String,boolean,String,String,String[],String[],boolean,String,String,String[],String[])", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.imageio.spi", "ImageReaderWriterSpi", True, "ImageReaderWriterSpi", "(String,String,String[],String[],String[],String,boolean,String,String,String[],String[],boolean,String,String,String[],String[])", "", "Argument[10].ArrayElement", "Argument[this]", "taint", "df-generated"]
-      - ["javax.imageio.spi", "ImageReaderWriterSpi", True, "ImageReaderWriterSpi", "(String,String,String[],String[],String[],String,boolean,String,String,String[],String[],boolean,String,String,String[],String[])", "", "Argument[12]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.imageio.spi", "ImageReaderWriterSpi", True, "ImageReaderWriterSpi", "(String,String,String[],String[],String[],String,boolean,String,String,String[],String[],boolean,String,String,String[],String[])", "", "Argument[13]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.imageio.spi", "ImageReaderWriterSpi", True, "ImageReaderWriterSpi", "(String,String,String[],String[],String[],String,boolean,String,String,String[],String[],boolean,String,String,String[],String[])", "", "Argument[14].ArrayElement", "Argument[this]", "taint", "df-generated"]
-      - ["javax.imageio.spi", "ImageReaderWriterSpi", True, "ImageReaderWriterSpi", "(String,String,String[],String[],String[],String,boolean,String,String,String[],String[],boolean,String,String,String[],String[])", "", "Argument[15].ArrayElement", "Argument[this]", "taint", "df-generated"]
-      - ["javax.imageio.spi", "ImageReaderWriterSpi", True, "ImageReaderWriterSpi", "(String,String,String[],String[],String[],String,boolean,String,String,String[],String[],boolean,String,String,String[],String[])", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.imageio.spi", "ImageReaderWriterSpi", True, "ImageReaderWriterSpi", "(String,String,String[],String[],String[],String,boolean,String,String,String[],String[],boolean,String,String,String[],String[])", "", "Argument[2].ArrayElement", "Argument[this]", "taint", "df-generated"]
-      - ["javax.imageio.spi", "ImageReaderWriterSpi", True, "ImageReaderWriterSpi", "(String,String,String[],String[],String[],String,boolean,String,String,String[],String[],boolean,String,String,String[],String[])", "", "Argument[3].ArrayElement", "Argument[this]", "taint", "df-generated"]
-      - ["javax.imageio.spi", "ImageReaderWriterSpi", True, "ImageReaderWriterSpi", "(String,String,String[],String[],String[],String,boolean,String,String,String[],String[],boolean,String,String,String[],String[])", "", "Argument[4].ArrayElement", "Argument[this]", "taint", "df-generated"]
-      - ["javax.imageio.spi", "ImageReaderWriterSpi", True, "ImageReaderWriterSpi", "(String,String,String[],String[],String[],String,boolean,String,String,String[],String[],boolean,String,String,String[],String[])", "", "Argument[5]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.imageio.spi", "ImageReaderWriterSpi", True, "ImageReaderWriterSpi", "(String,String,String[],String[],String[],String,boolean,String,String,String[],String[],boolean,String,String,String[],String[])", "", "Argument[7]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.imageio.spi", "ImageReaderWriterSpi", True, "ImageReaderWriterSpi", "(String,String,String[],String[],String[],String,boolean,String,String,String[],String[],boolean,String,String,String[],String[])", "", "Argument[8]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.imageio.spi", "ImageReaderWriterSpi", True, "ImageReaderWriterSpi", "(String,String,String[],String[],String[],String,boolean,String,String,String[],String[],boolean,String,String,String[],String[])", "", "Argument[9].ArrayElement", "Argument[this]", "taint", "df-generated"]
-      - ["javax.imageio.spi", "ImageReaderWriterSpi", True, "getExtraImageMetadataFormatNames", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.imageio.spi", "ImageReaderWriterSpi", True, "getExtraStreamMetadataFormatNames", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.imageio.spi", "ImageReaderWriterSpi", True, "getFileSuffixes", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.imageio.spi", "ImageReaderWriterSpi", True, "getFormatNames", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.imageio.spi", "ImageReaderWriterSpi", True, "getMIMETypes", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.imageio.spi", "ImageReaderWriterSpi", True, "getNativeImageMetadataFormatName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.imageio.spi", "ImageReaderWriterSpi", True, "getNativeStreamMetadataFormatName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.imageio.spi", "ImageReaderWriterSpi", True, "getPluginClassName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.imageio.spi", "ImageOutputStreamSpi", True, "createOutputStreamInstance", "(Object,boolean,File)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.imageio.spi", "ImageReaderSpi", True, "ImageReaderSpi", "(String,String,String[],String[],String[],String,Class[],String[],boolean,String,String,String[],String[],boolean,String,String,String[],String[])", "", "Argument[6]", "Argument[this].SyntheticField[javax.imageio.spi.ImageReaderSpi.inputTypes]", "value", "dfc-generated"]
+      - ["javax.imageio.spi", "ImageReaderSpi", True, "ImageReaderSpi", "(String,String,String[],String[],String[],String,Class[],String[],boolean,String,String,String[],String[],boolean,String,String,String[],String[])", "", "Argument[7]", "Argument[this].SyntheticField[javax.imageio.spi.ImageReaderSpi.writerSpiNames]", "value", "dfc-generated"]
+      - ["javax.imageio.spi", "ImageReaderSpi", True, "createReaderInstance", "()", "", "Argument[this]", "ReturnValue.SyntheticField[javax.imageio.ImageReader.originatingProvider]", "value", "dfc-generated"]
+      - ["javax.imageio.spi", "ImageReaderSpi", True, "createReaderInstance", "(Object)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.imageio.spi", "ImageReaderSpi", True, "getImageWriterSpiNames", "()", "", "Argument[this].SyntheticField[javax.imageio.spi.ImageReaderSpi.writerSpiNames]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.imageio.spi", "ImageReaderSpi", True, "getInputTypes", "()", "", "Argument[this].SyntheticField[javax.imageio.spi.ImageReaderSpi.inputTypes]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.imageio.spi", "ImageReaderWriterSpi", True, "ImageReaderWriterSpi", "(String,String,String[],String[],String[],String,boolean,String,String,String[],String[],boolean,String,String,String[],String[])", "", "Argument[12]", "Argument[this].SyntheticField[javax.imageio.spi.ImageReaderWriterSpi.nativeImageMetadataFormatName]", "value", "dfc-generated"]
+      - ["javax.imageio.spi", "ImageReaderWriterSpi", True, "ImageReaderWriterSpi", "(String,String,String[],String[],String[],String,boolean,String,String,String[],String[],boolean,String,String,String[],String[])", "", "Argument[14]", "Argument[this].SyntheticField[javax.imageio.spi.ImageReaderWriterSpi.extraImageMetadataFormatNames]", "value", "dfc-generated"]
+      - ["javax.imageio.spi", "ImageReaderWriterSpi", True, "ImageReaderWriterSpi", "(String,String,String[],String[],String[],String,boolean,String,String,String[],String[],boolean,String,String,String[],String[])", "", "Argument[2]", "Argument[this].SyntheticField[javax.imageio.spi.ImageReaderWriterSpi.names]", "value", "dfc-generated"]
+      - ["javax.imageio.spi", "ImageReaderWriterSpi", True, "ImageReaderWriterSpi", "(String,String,String[],String[],String[],String,boolean,String,String,String[],String[],boolean,String,String,String[],String[])", "", "Argument[3]", "Argument[this].SyntheticField[javax.imageio.spi.ImageReaderWriterSpi.suffixes]", "value", "dfc-generated"]
+      - ["javax.imageio.spi", "ImageReaderWriterSpi", True, "ImageReaderWriterSpi", "(String,String,String[],String[],String[],String,boolean,String,String,String[],String[],boolean,String,String,String[],String[])", "", "Argument[4]", "Argument[this].SyntheticField[javax.imageio.spi.ImageReaderWriterSpi.MIMETypes]", "value", "dfc-generated"]
+      - ["javax.imageio.spi", "ImageReaderWriterSpi", True, "ImageReaderWriterSpi", "(String,String,String[],String[],String[],String,boolean,String,String,String[],String[],boolean,String,String,String[],String[])", "", "Argument[5]", "Argument[this].SyntheticField[javax.imageio.spi.ImageReaderWriterSpi.pluginClassName]", "value", "dfc-generated"]
+      - ["javax.imageio.spi", "ImageReaderWriterSpi", True, "ImageReaderWriterSpi", "(String,String,String[],String[],String[],String,boolean,String,String,String[],String[],boolean,String,String,String[],String[])", "", "Argument[7]", "Argument[this].SyntheticField[javax.imageio.spi.ImageReaderWriterSpi.nativeStreamMetadataFormatName]", "value", "dfc-generated"]
+      - ["javax.imageio.spi", "ImageReaderWriterSpi", True, "ImageReaderWriterSpi", "(String,String,String[],String[],String[],String,boolean,String,String,String[],String[],boolean,String,String,String[],String[])", "", "Argument[9]", "Argument[this].SyntheticField[javax.imageio.spi.ImageReaderWriterSpi.extraStreamMetadataFormatNames]", "value", "dfc-generated"]
+      - ["javax.imageio.spi", "ImageReaderWriterSpi", True, "getExtraImageMetadataFormatNames", "()", "", "Argument[this].SyntheticField[javax.imageio.spi.ImageReaderWriterSpi.extraImageMetadataFormatNames]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.imageio.spi", "ImageReaderWriterSpi", True, "getExtraStreamMetadataFormatNames", "()", "", "Argument[this].SyntheticField[javax.imageio.spi.ImageReaderWriterSpi.extraStreamMetadataFormatNames]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.imageio.spi", "ImageReaderWriterSpi", True, "getFileSuffixes", "()", "", "Argument[this].SyntheticField[javax.imageio.spi.ImageReaderWriterSpi.suffixes]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.imageio.spi", "ImageReaderWriterSpi", True, "getFormatNames", "()", "", "Argument[this].SyntheticField[javax.imageio.spi.ImageReaderWriterSpi.names]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.imageio.spi", "ImageReaderWriterSpi", True, "getMIMETypes", "()", "", "Argument[this].SyntheticField[javax.imageio.spi.ImageReaderWriterSpi.MIMETypes]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.imageio.spi", "ImageReaderWriterSpi", True, "getNativeImageMetadataFormatName", "()", "", "Argument[this].SyntheticField[javax.imageio.spi.ImageReaderWriterSpi.nativeImageMetadataFormatName]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.imageio.spi", "ImageReaderWriterSpi", True, "getNativeStreamMetadataFormatName", "()", "", "Argument[this].SyntheticField[javax.imageio.spi.ImageReaderWriterSpi.nativeStreamMetadataFormatName]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.imageio.spi", "ImageReaderWriterSpi", True, "getPluginClassName", "()", "", "Argument[this].SyntheticField[javax.imageio.spi.ImageReaderWriterSpi.pluginClassName]", "ReturnValue", "value", "dfc-generated"]
       - ["javax.imageio.spi", "ImageTranscoderSpi", True, "ImageTranscoderSpi", "(String,String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["javax.imageio.spi", "ImageTranscoderSpi", True, "ImageTranscoderSpi", "(String,String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.imageio.spi", "ImageWriterSpi", True, "ImageWriterSpi", "(String,String,String[],String[],String[],String,Class[],String[],boolean,String,String,String[],String[],boolean,String,String,String[],String[])", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.imageio.spi", "ImageWriterSpi", True, "ImageWriterSpi", "(String,String,String[],String[],String[],String,Class[],String[],boolean,String,String,String[],String[],boolean,String,String,String[],String[])", "", "Argument[10]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.imageio.spi", "ImageWriterSpi", True, "ImageWriterSpi", "(String,String,String[],String[],String[],String,Class[],String[],boolean,String,String,String[],String[],boolean,String,String,String[],String[])", "", "Argument[11].ArrayElement", "Argument[this]", "taint", "df-generated"]
-      - ["javax.imageio.spi", "ImageWriterSpi", True, "ImageWriterSpi", "(String,String,String[],String[],String[],String,Class[],String[],boolean,String,String,String[],String[],boolean,String,String,String[],String[])", "", "Argument[12].ArrayElement", "Argument[this]", "taint", "df-generated"]
-      - ["javax.imageio.spi", "ImageWriterSpi", True, "ImageWriterSpi", "(String,String,String[],String[],String[],String,Class[],String[],boolean,String,String,String[],String[],boolean,String,String,String[],String[])", "", "Argument[14]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.imageio.spi", "ImageWriterSpi", True, "ImageWriterSpi", "(String,String,String[],String[],String[],String,Class[],String[],boolean,String,String,String[],String[],boolean,String,String,String[],String[])", "", "Argument[15]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.imageio.spi", "ImageWriterSpi", True, "ImageWriterSpi", "(String,String,String[],String[],String[],String,Class[],String[],boolean,String,String,String[],String[],boolean,String,String,String[],String[])", "", "Argument[16].ArrayElement", "Argument[this]", "taint", "df-generated"]
-      - ["javax.imageio.spi", "ImageWriterSpi", True, "ImageWriterSpi", "(String,String,String[],String[],String[],String,Class[],String[],boolean,String,String,String[],String[],boolean,String,String,String[],String[])", "", "Argument[17].ArrayElement", "Argument[this]", "taint", "df-generated"]
-      - ["javax.imageio.spi", "ImageWriterSpi", True, "ImageWriterSpi", "(String,String,String[],String[],String[],String,Class[],String[],boolean,String,String,String[],String[],boolean,String,String,String[],String[])", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.imageio.spi", "ImageWriterSpi", True, "ImageWriterSpi", "(String,String,String[],String[],String[],String,Class[],String[],boolean,String,String,String[],String[],boolean,String,String,String[],String[])", "", "Argument[2].ArrayElement", "Argument[this]", "taint", "df-generated"]
-      - ["javax.imageio.spi", "ImageWriterSpi", True, "ImageWriterSpi", "(String,String,String[],String[],String[],String,Class[],String[],boolean,String,String,String[],String[],boolean,String,String,String[],String[])", "", "Argument[3].ArrayElement", "Argument[this]", "taint", "df-generated"]
-      - ["javax.imageio.spi", "ImageWriterSpi", True, "ImageWriterSpi", "(String,String,String[],String[],String[],String,Class[],String[],boolean,String,String,String[],String[],boolean,String,String,String[],String[])", "", "Argument[4].ArrayElement", "Argument[this]", "taint", "df-generated"]
-      - ["javax.imageio.spi", "ImageWriterSpi", True, "ImageWriterSpi", "(String,String,String[],String[],String[],String,Class[],String[],boolean,String,String,String[],String[],boolean,String,String,String[],String[])", "", "Argument[5]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.imageio.spi", "ImageWriterSpi", True, "ImageWriterSpi", "(String,String,String[],String[],String[],String,Class[],String[],boolean,String,String,String[],String[],boolean,String,String,String[],String[])", "", "Argument[6].ArrayElement", "Argument[this]", "taint", "df-generated"]
-      - ["javax.imageio.spi", "ImageWriterSpi", True, "ImageWriterSpi", "(String,String,String[],String[],String[],String,Class[],String[],boolean,String,String,String[],String[],boolean,String,String,String[],String[])", "", "Argument[7].ArrayElement", "Argument[this]", "taint", "df-generated"]
-      - ["javax.imageio.spi", "ImageWriterSpi", True, "ImageWriterSpi", "(String,String,String[],String[],String[],String,Class[],String[],boolean,String,String,String[],String[],boolean,String,String,String[],String[])", "", "Argument[9]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.imageio.spi", "ImageWriterSpi", True, "createWriterInstance", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.imageio.spi", "ImageWriterSpi", True, "getImageReaderSpiNames", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.imageio.spi", "ImageWriterSpi", True, "getOutputTypes", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.imageio.spi", "ImageWriterSpi", True, "ImageWriterSpi", "(String,String,String[],String[],String[],String,Class[],String[],boolean,String,String,String[],String[],boolean,String,String,String[],String[])", "", "Argument[6]", "Argument[this].SyntheticField[javax.imageio.spi.ImageWriterSpi.outputTypes]", "value", "dfc-generated"]
+      - ["javax.imageio.spi", "ImageWriterSpi", True, "ImageWriterSpi", "(String,String,String[],String[],String[],String,Class[],String[],boolean,String,String,String[],String[],boolean,String,String,String[],String[])", "", "Argument[7]", "Argument[this].SyntheticField[javax.imageio.spi.ImageWriterSpi.readerSpiNames]", "value", "dfc-generated"]
+      - ["javax.imageio.spi", "ImageWriterSpi", True, "createWriterInstance", "()", "", "Argument[this]", "ReturnValue.SyntheticField[javax.imageio.ImageWriter.originatingProvider]", "value", "dfc-generated"]
+      - ["javax.imageio.spi", "ImageWriterSpi", True, "createWriterInstance", "(Object)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.imageio.spi", "ImageWriterSpi", True, "getImageReaderSpiNames", "()", "", "Argument[this].SyntheticField[javax.imageio.spi.ImageWriterSpi.readerSpiNames]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.imageio.spi", "ImageWriterSpi", True, "getOutputTypes", "()", "", "Argument[this].SyntheticField[javax.imageio.spi.ImageWriterSpi.outputTypes]", "ReturnValue", "value", "dfc-generated"]
       - ["javax.imageio.spi", "ServiceRegistry", True, "getCategories", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["javax.imageio.spi", "ServiceRegistry", True, "getServiceProviderByClass", "(Class)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["javax.imageio.spi", "ServiceRegistry", True, "getServiceProviders", "(Class,ServiceRegistry$Filter,boolean)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
@@ -89,16 +59,15 @@ extensions:
       - ["javax.imageio.spi", "IIORegistry", "getDefaultInstance", "()", "summary", "df-generated"]
       - ["javax.imageio.spi", "IIORegistry", "registerApplicationClasspathSpis", "()", "summary", "df-generated"]
       - ["javax.imageio.spi", "IIOServiceProvider", "getDescription", "(Locale)", "summary", "df-generated"]
+      - ["javax.imageio.spi", "IIOServiceProvider", "onDeregistration", "(ServiceRegistry,Class)", "summary", "df-generated"]
+      - ["javax.imageio.spi", "IIOServiceProvider", "onRegistration", "(ServiceRegistry,Class)", "summary", "df-generated"]
       - ["javax.imageio.spi", "ImageInputStreamSpi", "canUseCacheFile", "()", "summary", "df-generated"]
-      - ["javax.imageio.spi", "ImageInputStreamSpi", "createInputStreamInstance", "(Object,boolean,File)", "summary", "df-generated"]
       - ["javax.imageio.spi", "ImageInputStreamSpi", "getInputClass", "()", "summary", "df-generated"]
       - ["javax.imageio.spi", "ImageInputStreamSpi", "needsCacheFile", "()", "summary", "df-generated"]
       - ["javax.imageio.spi", "ImageOutputStreamSpi", "canUseCacheFile", "()", "summary", "df-generated"]
-      - ["javax.imageio.spi", "ImageOutputStreamSpi", "createOutputStreamInstance", "(Object,boolean,File)", "summary", "df-generated"]
       - ["javax.imageio.spi", "ImageOutputStreamSpi", "getOutputClass", "()", "summary", "df-generated"]
       - ["javax.imageio.spi", "ImageOutputStreamSpi", "needsCacheFile", "()", "summary", "df-generated"]
       - ["javax.imageio.spi", "ImageReaderSpi", "canDecodeInput", "(Object)", "summary", "df-generated"]
-      - ["javax.imageio.spi", "ImageReaderSpi", "createReaderInstance", "(Object)", "summary", "df-generated"]
       - ["javax.imageio.spi", "ImageReaderSpi", "isOwnReader", "(ImageReader)", "summary", "df-generated"]
       - ["javax.imageio.spi", "ImageReaderWriterSpi", "getImageMetadataFormat", "(String)", "summary", "df-generated"]
       - ["javax.imageio.spi", "ImageReaderWriterSpi", "getStreamMetadataFormat", "(String)", "summary", "df-generated"]
@@ -109,18 +78,15 @@ extensions:
       - ["javax.imageio.spi", "ImageTranscoderSpi", "getWriterServiceProviderName", "()", "summary", "df-generated"]
       - ["javax.imageio.spi", "ImageWriterSpi", "canEncodeImage", "(ImageTypeSpecifier)", "summary", "df-generated"]
       - ["javax.imageio.spi", "ImageWriterSpi", "canEncodeImage", "(RenderedImage)", "summary", "df-generated"]
-      - ["javax.imageio.spi", "ImageWriterSpi", "createWriterInstance", "(Object)", "summary", "df-generated"]
       - ["javax.imageio.spi", "ImageWriterSpi", "isFormatLossless", "()", "summary", "df-generated"]
       - ["javax.imageio.spi", "ImageWriterSpi", "isOwnWriter", "(ImageWriter)", "summary", "df-generated"]
-      - ["javax.imageio.spi", "RegisterableService", "onDeregistration", "(ServiceRegistry,Class)", "summary", "df-generated"]
-      - ["javax.imageio.spi", "RegisterableService", "onRegistration", "(ServiceRegistry,Class)", "summary", "df-generated"]
-      - ["javax.imageio.spi", "ServiceRegistry$Filter", "filter", "(Object)", "summary", "df-generated"]
       - ["javax.imageio.spi", "ServiceRegistry", "ServiceRegistry", "(Iterator)", "summary", "df-generated"]
       - ["javax.imageio.spi", "ServiceRegistry", "contains", "(Object)", "summary", "df-generated"]
       - ["javax.imageio.spi", "ServiceRegistry", "deregisterAll", "()", "summary", "df-generated"]
       - ["javax.imageio.spi", "ServiceRegistry", "deregisterAll", "(Class)", "summary", "df-generated"]
       - ["javax.imageio.spi", "ServiceRegistry", "deregisterServiceProvider", "(Object)", "summary", "df-generated"]
       - ["javax.imageio.spi", "ServiceRegistry", "deregisterServiceProvider", "(Object,Class)", "summary", "df-generated"]
+      - ["javax.imageio.spi", "ServiceRegistry", "finalize", "()", "summary", "df-generated"]
       - ["javax.imageio.spi", "ServiceRegistry", "lookupProviders", "(Class)", "summary", "df-generated"]
       - ["javax.imageio.spi", "ServiceRegistry", "registerServiceProvider", "(Object)", "summary", "df-generated"]
       - ["javax.imageio.spi", "ServiceRegistry", "registerServiceProvider", "(Object,Class)", "summary", "df-generated"]
diff --git a/java/ql/lib/ext/generated/javax.imageio.stream.model.yml b/java/ql/lib/ext/generated/javax.imageio.stream.model.yml
index f9dc67c2a67..12220beabe7 100644
--- a/java/ql/lib/ext/generated/javax.imageio.stream.model.yml
+++ b/java/ql/lib/ext/generated/javax.imageio.stream.model.yml
@@ -5,58 +5,104 @@ extensions:
       extensible: summaryModel
     data:
       - ["javax.imageio.stream", "FileCacheImageOutputStream", True, "FileCacheImageOutputStream", "(OutputStream,File)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.imageio.stream", "FileCacheImageOutputStream", True, "FileCacheImageOutputStream", "(OutputStream,File)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
       - ["javax.imageio.stream", "FileImageInputStream", True, "FileImageInputStream", "(File)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["javax.imageio.stream", "FileImageInputStream", True, "FileImageInputStream", "(RandomAccessFile)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["javax.imageio.stream", "FileImageOutputStream", True, "FileImageOutputStream", "(File)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["javax.imageio.stream", "FileImageOutputStream", True, "FileImageOutputStream", "(RandomAccessFile)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.imageio.stream", "IIOByteBuffer", True, "IIOByteBuffer", "(byte[],int,int)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.imageio.stream", "IIOByteBuffer", True, "getData", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.imageio.stream", "IIOByteBuffer", True, "setData", "(byte[])", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.imageio.stream", "ImageInputStream", True, "getByteOrder", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.imageio.stream", "IIOByteBuffer", True, "IIOByteBuffer", "(byte[],int,int)", "", "Argument[0]", "Argument[this].SyntheticField[javax.imageio.stream.IIOByteBuffer.data]", "value", "dfc-generated"]
+      - ["javax.imageio.stream", "IIOByteBuffer", True, "getData", "()", "", "Argument[this].SyntheticField[javax.imageio.stream.IIOByteBuffer.data]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.imageio.stream", "IIOByteBuffer", True, "setData", "(byte[])", "", "Argument[0]", "Argument[this].SyntheticField[javax.imageio.stream.IIOByteBuffer.data]", "value", "dfc-generated"]
       - ["javax.imageio.stream", "ImageInputStream", True, "read", "(byte[])", "", "Argument[this]", "Argument[0]", "taint", "df-generated"]
       - ["javax.imageio.stream", "ImageInputStream", True, "read", "(byte[],int,int)", "", "Argument[this]", "Argument[0]", "taint", "df-generated"]
       - ["javax.imageio.stream", "ImageInputStream", True, "readBytes", "(IIOByteBuffer,int)", "", "Argument[this]", "Argument[0]", "taint", "df-generated"]
-      - ["javax.imageio.stream", "ImageInputStream", True, "setByteOrder", "(ByteOrder)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.imageio.stream", "MemoryCacheImageInputStream", True, "MemoryCacheImageInputStream", "(InputStream)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.imageio.stream", "ImageInputStreamImpl", True, "getByteOrder", "()", "", "Argument[this].SyntheticField[javax.imageio.stream.ImageInputStreamImpl.byteOrder]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.imageio.stream", "ImageInputStreamImpl", True, "setByteOrder", "(ByteOrder)", "", "Argument[0]", "Argument[this].SyntheticField[javax.imageio.stream.ImageInputStreamImpl.byteOrder]", "value", "dfc-generated"]
+      - ["javax.imageio.stream", "MemoryCacheImageInputStream", True, "MemoryCacheImageInputStream", "(InputStream)", "", "Argument[0]", "Argument[this].SyntheticField[javax.imageio.stream.MemoryCacheImageInputStream.stream]", "value", "dfc-generated"]
+      - ["javax.imageio.stream", "MemoryCacheImageInputStream", True, "read", "(byte[],int,int)", "", "Argument[this].SyntheticField[javax.imageio.stream.MemoryCacheImageInputStream.stream]", "Argument[0]", "taint", "dfc-generated"]
       - ["javax.imageio.stream", "MemoryCacheImageOutputStream", True, "MemoryCacheImageOutputStream", "(OutputStream)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
   - addsTo:
       pack: codeql/java-all
       extensible: neutralModel
     data:
+      - ["javax.imageio.stream", "FileCacheImageInputStream", "isCached", "()", "summary", "df-generated"]
+      - ["javax.imageio.stream", "FileCacheImageInputStream", "isCachedFile", "()", "summary", "df-generated"]
+      - ["javax.imageio.stream", "FileCacheImageInputStream", "isCachedMemory", "()", "summary", "df-generated"]
+      - ["javax.imageio.stream", "FileCacheImageInputStream", "read", "()", "summary", "df-generated"]
+      - ["javax.imageio.stream", "FileCacheImageOutputStream", "flushBefore", "(long)", "summary", "df-generated"]
+      - ["javax.imageio.stream", "FileCacheImageOutputStream", "isCached", "()", "summary", "df-generated"]
+      - ["javax.imageio.stream", "FileCacheImageOutputStream", "isCachedFile", "()", "summary", "df-generated"]
+      - ["javax.imageio.stream", "FileCacheImageOutputStream", "isCachedMemory", "()", "summary", "df-generated"]
+      - ["javax.imageio.stream", "FileCacheImageOutputStream", "length", "()", "summary", "df-generated"]
+      - ["javax.imageio.stream", "FileCacheImageOutputStream", "read", "()", "summary", "df-generated"]
+      - ["javax.imageio.stream", "FileCacheImageOutputStream", "seek", "(long)", "summary", "df-generated"]
+      - ["javax.imageio.stream", "FileCacheImageOutputStream", "write", "(int)", "summary", "df-generated"]
+      - ["javax.imageio.stream", "FileImageInputStream", "length", "()", "summary", "df-generated"]
+      - ["javax.imageio.stream", "FileImageInputStream", "read", "()", "summary", "df-generated"]
+      - ["javax.imageio.stream", "FileImageInputStream", "seek", "(long)", "summary", "df-generated"]
+      - ["javax.imageio.stream", "FileImageOutputStream", "length", "()", "summary", "df-generated"]
+      - ["javax.imageio.stream", "FileImageOutputStream", "read", "()", "summary", "df-generated"]
+      - ["javax.imageio.stream", "FileImageOutputStream", "seek", "(long)", "summary", "df-generated"]
+      - ["javax.imageio.stream", "FileImageOutputStream", "write", "(int)", "summary", "df-generated"]
       - ["javax.imageio.stream", "IIOByteBuffer", "getLength", "()", "summary", "df-generated"]
       - ["javax.imageio.stream", "IIOByteBuffer", "getOffset", "()", "summary", "df-generated"]
       - ["javax.imageio.stream", "IIOByteBuffer", "setLength", "(int)", "summary", "df-generated"]
       - ["javax.imageio.stream", "IIOByteBuffer", "setOffset", "(int)", "summary", "df-generated"]
-      - ["javax.imageio.stream", "ImageInputStream", "flush", "()", "summary", "df-generated"]
-      - ["javax.imageio.stream", "ImageInputStream", "flushBefore", "(long)", "summary", "df-generated"]
-      - ["javax.imageio.stream", "ImageInputStream", "getBitOffset", "()", "summary", "df-generated"]
-      - ["javax.imageio.stream", "ImageInputStream", "getFlushedPosition", "()", "summary", "df-generated"]
-      - ["javax.imageio.stream", "ImageInputStream", "getStreamPosition", "()", "summary", "df-generated"]
-      - ["javax.imageio.stream", "ImageInputStream", "isCached", "()", "summary", "df-generated"]
-      - ["javax.imageio.stream", "ImageInputStream", "isCachedFile", "()", "summary", "df-generated"]
-      - ["javax.imageio.stream", "ImageInputStream", "isCachedMemory", "()", "summary", "df-generated"]
-      - ["javax.imageio.stream", "ImageInputStream", "length", "()", "summary", "df-generated"]
-      - ["javax.imageio.stream", "ImageInputStream", "mark", "()", "summary", "df-generated"]
-      - ["javax.imageio.stream", "ImageInputStream", "read", "()", "summary", "df-generated"]
-      - ["javax.imageio.stream", "ImageInputStream", "readBit", "()", "summary", "df-generated"]
-      - ["javax.imageio.stream", "ImageInputStream", "readBits", "(int)", "summary", "df-generated"]
-      - ["javax.imageio.stream", "ImageInputStream", "readFully", "(char[],int,int)", "summary", "df-generated"]
-      - ["javax.imageio.stream", "ImageInputStream", "readFully", "(double[],int,int)", "summary", "df-generated"]
-      - ["javax.imageio.stream", "ImageInputStream", "readFully", "(float[],int,int)", "summary", "df-generated"]
-      - ["javax.imageio.stream", "ImageInputStream", "readFully", "(int[],int,int)", "summary", "df-generated"]
-      - ["javax.imageio.stream", "ImageInputStream", "readFully", "(long[],int,int)", "summary", "df-generated"]
-      - ["javax.imageio.stream", "ImageInputStream", "readFully", "(short[],int,int)", "summary", "df-generated"]
-      - ["javax.imageio.stream", "ImageInputStream", "readUnsignedInt", "()", "summary", "df-generated"]
-      - ["javax.imageio.stream", "ImageInputStream", "reset", "()", "summary", "df-generated"]
-      - ["javax.imageio.stream", "ImageInputStream", "seek", "(long)", "summary", "df-generated"]
-      - ["javax.imageio.stream", "ImageInputStream", "setBitOffset", "(int)", "summary", "df-generated"]
-      - ["javax.imageio.stream", "ImageInputStream", "skipBytes", "(long)", "summary", "df-generated"]
-      - ["javax.imageio.stream", "ImageOutputStream", "writeBit", "(int)", "summary", "df-generated"]
-      - ["javax.imageio.stream", "ImageOutputStream", "writeBits", "(long,int)", "summary", "df-generated"]
-      - ["javax.imageio.stream", "ImageOutputStream", "writeChars", "(char[],int,int)", "summary", "df-generated"]
-      - ["javax.imageio.stream", "ImageOutputStream", "writeDoubles", "(double[],int,int)", "summary", "df-generated"]
-      - ["javax.imageio.stream", "ImageOutputStream", "writeFloats", "(float[],int,int)", "summary", "df-generated"]
-      - ["javax.imageio.stream", "ImageOutputStream", "writeInts", "(int[],int,int)", "summary", "df-generated"]
-      - ["javax.imageio.stream", "ImageOutputStream", "writeLongs", "(long[],int,int)", "summary", "df-generated"]
-      - ["javax.imageio.stream", "ImageOutputStream", "writeShorts", "(short[],int,int)", "summary", "df-generated"]
+      - ["javax.imageio.stream", "ImageInputStreamImpl", "flush", "()", "summary", "df-generated"]
+      - ["javax.imageio.stream", "ImageInputStreamImpl", "flushBefore", "(long)", "summary", "df-generated"]
+      - ["javax.imageio.stream", "ImageInputStreamImpl", "getBitOffset", "()", "summary", "df-generated"]
+      - ["javax.imageio.stream", "ImageInputStreamImpl", "getFlushedPosition", "()", "summary", "df-generated"]
+      - ["javax.imageio.stream", "ImageInputStreamImpl", "getStreamPosition", "()", "summary", "df-generated"]
+      - ["javax.imageio.stream", "ImageInputStreamImpl", "isCached", "()", "summary", "df-generated"]
+      - ["javax.imageio.stream", "ImageInputStreamImpl", "isCachedFile", "()", "summary", "df-generated"]
+      - ["javax.imageio.stream", "ImageInputStreamImpl", "isCachedMemory", "()", "summary", "df-generated"]
+      - ["javax.imageio.stream", "ImageInputStreamImpl", "length", "()", "summary", "df-generated"]
+      - ["javax.imageio.stream", "ImageInputStreamImpl", "mark", "()", "summary", "df-generated"]
+      - ["javax.imageio.stream", "ImageInputStreamImpl", "read", "()", "summary", "df-generated"]
+      - ["javax.imageio.stream", "ImageInputStreamImpl", "readBit", "()", "summary", "df-generated"]
+      - ["javax.imageio.stream", "ImageInputStreamImpl", "readBits", "(int)", "summary", "df-generated"]
+      - ["javax.imageio.stream", "ImageInputStreamImpl", "readBoolean", "()", "summary", "df-generated"]
+      - ["javax.imageio.stream", "ImageInputStreamImpl", "readByte", "()", "summary", "df-generated"]
+      - ["javax.imageio.stream", "ImageInputStreamImpl", "readChar", "()", "summary", "df-generated"]
+      - ["javax.imageio.stream", "ImageInputStreamImpl", "readDouble", "()", "summary", "df-generated"]
+      - ["javax.imageio.stream", "ImageInputStreamImpl", "readFloat", "()", "summary", "df-generated"]
+      - ["javax.imageio.stream", "ImageInputStreamImpl", "readFully", "(char[],int,int)", "summary", "df-generated"]
+      - ["javax.imageio.stream", "ImageInputStreamImpl", "readFully", "(double[],int,int)", "summary", "df-generated"]
+      - ["javax.imageio.stream", "ImageInputStreamImpl", "readFully", "(float[],int,int)", "summary", "df-generated"]
+      - ["javax.imageio.stream", "ImageInputStreamImpl", "readFully", "(int[],int,int)", "summary", "df-generated"]
+      - ["javax.imageio.stream", "ImageInputStreamImpl", "readFully", "(long[],int,int)", "summary", "df-generated"]
+      - ["javax.imageio.stream", "ImageInputStreamImpl", "readFully", "(short[],int,int)", "summary", "df-generated"]
+      - ["javax.imageio.stream", "ImageInputStreamImpl", "readShort", "()", "summary", "df-generated"]
+      - ["javax.imageio.stream", "ImageInputStreamImpl", "readUnsignedByte", "()", "summary", "df-generated"]
+      - ["javax.imageio.stream", "ImageInputStreamImpl", "readUnsignedInt", "()", "summary", "df-generated"]
+      - ["javax.imageio.stream", "ImageInputStreamImpl", "readUnsignedShort", "()", "summary", "df-generated"]
+      - ["javax.imageio.stream", "ImageInputStreamImpl", "reset", "()", "summary", "df-generated"]
+      - ["javax.imageio.stream", "ImageInputStreamImpl", "seek", "(long)", "summary", "df-generated"]
+      - ["javax.imageio.stream", "ImageInputStreamImpl", "setBitOffset", "(int)", "summary", "df-generated"]
+      - ["javax.imageio.stream", "ImageInputStreamImpl", "skipBytes", "(int)", "summary", "df-generated"]
+      - ["javax.imageio.stream", "ImageInputStreamImpl", "skipBytes", "(long)", "summary", "df-generated"]
+      - ["javax.imageio.stream", "ImageOutputStreamImpl", "write", "(int)", "summary", "df-generated"]
+      - ["javax.imageio.stream", "ImageOutputStreamImpl", "writeBit", "(int)", "summary", "df-generated"]
+      - ["javax.imageio.stream", "ImageOutputStreamImpl", "writeBits", "(long,int)", "summary", "df-generated"]
+      - ["javax.imageio.stream", "ImageOutputStreamImpl", "writeByte", "(int)", "summary", "df-generated"]
+      - ["javax.imageio.stream", "ImageOutputStreamImpl", "writeChar", "(int)", "summary", "df-generated"]
+      - ["javax.imageio.stream", "ImageOutputStreamImpl", "writeChars", "(char[],int,int)", "summary", "df-generated"]
+      - ["javax.imageio.stream", "ImageOutputStreamImpl", "writeDouble", "(double)", "summary", "df-generated"]
+      - ["javax.imageio.stream", "ImageOutputStreamImpl", "writeDoubles", "(double[],int,int)", "summary", "df-generated"]
+      - ["javax.imageio.stream", "ImageOutputStreamImpl", "writeFloat", "(float)", "summary", "df-generated"]
+      - ["javax.imageio.stream", "ImageOutputStreamImpl", "writeFloats", "(float[],int,int)", "summary", "df-generated"]
+      - ["javax.imageio.stream", "ImageOutputStreamImpl", "writeInts", "(int[],int,int)", "summary", "df-generated"]
+      - ["javax.imageio.stream", "ImageOutputStreamImpl", "writeLongs", "(long[],int,int)", "summary", "df-generated"]
+      - ["javax.imageio.stream", "ImageOutputStreamImpl", "writeShort", "(int)", "summary", "df-generated"]
+      - ["javax.imageio.stream", "ImageOutputStreamImpl", "writeShorts", "(short[],int,int)", "summary", "df-generated"]
+      - ["javax.imageio.stream", "MemoryCacheImageInputStream", "flushBefore", "(long)", "summary", "df-generated"]
+      - ["javax.imageio.stream", "MemoryCacheImageInputStream", "isCached", "()", "summary", "df-generated"]
+      - ["javax.imageio.stream", "MemoryCacheImageInputStream", "isCachedFile", "()", "summary", "df-generated"]
+      - ["javax.imageio.stream", "MemoryCacheImageInputStream", "isCachedMemory", "()", "summary", "df-generated"]
+      - ["javax.imageio.stream", "MemoryCacheImageInputStream", "read", "()", "summary", "df-generated"]
+      - ["javax.imageio.stream", "MemoryCacheImageOutputStream", "flushBefore", "(long)", "summary", "df-generated"]
+      - ["javax.imageio.stream", "MemoryCacheImageOutputStream", "isCached", "()", "summary", "df-generated"]
+      - ["javax.imageio.stream", "MemoryCacheImageOutputStream", "isCachedFile", "()", "summary", "df-generated"]
+      - ["javax.imageio.stream", "MemoryCacheImageOutputStream", "isCachedMemory", "()", "summary", "df-generated"]
+      - ["javax.imageio.stream", "MemoryCacheImageOutputStream", "length", "()", "summary", "df-generated"]
+      - ["javax.imageio.stream", "MemoryCacheImageOutputStream", "read", "()", "summary", "df-generated"]
+      - ["javax.imageio.stream", "MemoryCacheImageOutputStream", "write", "(int)", "summary", "df-generated"]
diff --git a/java/ql/lib/ext/generated/javax.lang.model.element.model.yml b/java/ql/lib/ext/generated/javax.lang.model.element.model.yml
index 642f6c6315c..7ca5c71fb74 100644
--- a/java/ql/lib/ext/generated/javax.lang.model.element.model.yml
+++ b/java/ql/lib/ext/generated/javax.lang.model.element.model.yml
@@ -4,23 +4,57 @@ extensions:
       pack: codeql/java-all
       extensible: summaryModel
     data:
+      - ["javax.lang.model.element", "AnnotationMirror", True, "getAnnotationType", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.lang.model.element", "AnnotationMirror", True, "getElementValues", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.lang.model.element", "AnnotationValue", True, "accept", "(AnnotationValueVisitor,Object)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.lang.model.element", "AnnotationValue", True, "accept", "(AnnotationValueVisitor,Object)", "", "Argument[this]", "Argument[1]", "taint", "df-generated"]
+      - ["javax.lang.model.element", "AnnotationValue", True, "accept", "(AnnotationValueVisitor,Object)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.lang.model.element", "AnnotationValue", True, "getValue", "()", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
       - ["javax.lang.model.element", "AnnotationValueVisitor", True, "visit", "(AnnotationValue)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["javax.lang.model.element", "AnnotationValueVisitor", True, "visit", "(AnnotationValue)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.lang.model.element", "Element", True, "accept", "(ElementVisitor,Object)", "", "Argument[1]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.lang.model.element", "Element", True, "asType", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.lang.model.element", "Element", True, "getEnclosedElements", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.lang.model.element", "Element", True, "getEnclosingElement", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.lang.model.element", "Element", True, "getSimpleName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["javax.lang.model.element", "ElementVisitor", True, "visit", "(Element)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["javax.lang.model.element", "ElementVisitor", True, "visit", "(Element)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["javax.lang.model.element", "ElementVisitor", True, "visit", "(Element)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.lang.model.element", "UnknownAnnotationValueException", True, "UnknownAnnotationValueException", "(AnnotationValue,Object)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.lang.model.element", "UnknownAnnotationValueException", True, "UnknownAnnotationValueException", "(AnnotationValue,Object)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.lang.model.element", "UnknownAnnotationValueException", True, "getArgument", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.lang.model.element", "UnknownAnnotationValueException", True, "getUnknownAnnotationValue", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.lang.model.element", "UnknownDirectiveException", True, "UnknownDirectiveException", "(ModuleElement$Directive,Object)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.lang.model.element", "UnknownDirectiveException", True, "UnknownDirectiveException", "(ModuleElement$Directive,Object)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.lang.model.element", "UnknownDirectiveException", True, "getArgument", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.lang.model.element", "UnknownDirectiveException", True, "getUnknownDirective", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.lang.model.element", "UnknownElementException", True, "UnknownElementException", "(Element,Object)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.lang.model.element", "UnknownElementException", True, "UnknownElementException", "(Element,Object)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.lang.model.element", "UnknownElementException", True, "getArgument", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.lang.model.element", "UnknownElementException", True, "getUnknownElement", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.lang.model.element", "ExecutableElement", True, "getDefaultValue", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.lang.model.element", "ExecutableElement", True, "getParameters", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.lang.model.element", "ExecutableElement", True, "getReceiverType", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.lang.model.element", "ExecutableElement", True, "getReturnType", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.lang.model.element", "ExecutableElement", True, "getThrownTypes", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.lang.model.element", "ModuleElement$ExportsDirective", True, "getPackage", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.lang.model.element", "ModuleElement$ExportsDirective", True, "getTargetModules", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.lang.model.element", "ModuleElement$OpensDirective", True, "getPackage", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.lang.model.element", "ModuleElement$OpensDirective", True, "getTargetModules", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.lang.model.element", "ModuleElement$ProvidesDirective", True, "getImplementations", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.lang.model.element", "ModuleElement$ProvidesDirective", True, "getService", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.lang.model.element", "ModuleElement$RequiresDirective", True, "getDependency", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.lang.model.element", "ModuleElement$UsesDirective", True, "getService", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.lang.model.element", "ModuleElement", True, "getDirectives", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.lang.model.element", "QualifiedNameable", True, "getQualifiedName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.lang.model.element", "RecordComponentElement", True, "getAccessor", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.lang.model.element", "TypeElement", True, "getInterfaces", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.lang.model.element", "TypeElement", True, "getPermittedSubclasses", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.lang.model.element", "TypeElement", True, "getRecordComponents", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.lang.model.element", "TypeElement", True, "getSuperclass", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.lang.model.element", "TypeParameterElement", True, "getBounds", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.lang.model.element", "TypeParameterElement", True, "getGenericElement", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.lang.model.element", "UnknownAnnotationValueException", True, "UnknownAnnotationValueException", "(AnnotationValue,Object)", "", "Argument[0]", "Argument[this].SyntheticField[javax.lang.model.element.UnknownAnnotationValueException.av]", "value", "dfc-generated"]
+      - ["javax.lang.model.element", "UnknownAnnotationValueException", True, "UnknownAnnotationValueException", "(AnnotationValue,Object)", "", "Argument[1]", "Argument[this].SyntheticField[javax.lang.model.element.UnknownAnnotationValueException.parameter]", "value", "dfc-generated"]
+      - ["javax.lang.model.element", "UnknownAnnotationValueException", True, "getArgument", "()", "", "Argument[this].SyntheticField[javax.lang.model.element.UnknownAnnotationValueException.parameter]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.lang.model.element", "UnknownAnnotationValueException", True, "getUnknownAnnotationValue", "()", "", "Argument[this].SyntheticField[javax.lang.model.element.UnknownAnnotationValueException.av]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.lang.model.element", "UnknownDirectiveException", True, "UnknownDirectiveException", "(ModuleElement$Directive,Object)", "", "Argument[0]", "Argument[this].SyntheticField[javax.lang.model.element.UnknownDirectiveException.directive]", "value", "dfc-generated"]
+      - ["javax.lang.model.element", "UnknownDirectiveException", True, "UnknownDirectiveException", "(ModuleElement$Directive,Object)", "", "Argument[1]", "Argument[this].SyntheticField[javax.lang.model.element.UnknownDirectiveException.parameter]", "value", "dfc-generated"]
+      - ["javax.lang.model.element", "UnknownDirectiveException", True, "getArgument", "()", "", "Argument[this].SyntheticField[javax.lang.model.element.UnknownDirectiveException.parameter]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.lang.model.element", "UnknownDirectiveException", True, "getUnknownDirective", "()", "", "Argument[this].SyntheticField[javax.lang.model.element.UnknownDirectiveException.directive]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.lang.model.element", "UnknownElementException", True, "UnknownElementException", "(Element,Object)", "", "Argument[0]", "Argument[this].SyntheticField[javax.lang.model.element.UnknownElementException.element]", "value", "dfc-generated"]
+      - ["javax.lang.model.element", "UnknownElementException", True, "UnknownElementException", "(Element,Object)", "", "Argument[1]", "Argument[this].SyntheticField[javax.lang.model.element.UnknownElementException.parameter]", "value", "dfc-generated"]
+      - ["javax.lang.model.element", "UnknownElementException", True, "getArgument", "()", "", "Argument[this].SyntheticField[javax.lang.model.element.UnknownElementException.parameter]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.lang.model.element", "UnknownElementException", True, "getUnknownElement", "()", "", "Argument[this].SyntheticField[javax.lang.model.element.UnknownElementException.element]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.lang.model.element", "VariableElement", True, "getConstantValue", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
   - addsTo:
       pack: codeql/java-all
       extensible: neutralModel
@@ -34,5 +68,3 @@ extensions:
       - ["javax.lang.model.element", "ModuleElement$DirectiveVisitor", "visit", "(ModuleElement$Directive,Object)", "summary", "df-generated"]
       - ["javax.lang.model.element", "ModuleElement$DirectiveVisitor", "visitUnknown", "(ModuleElement$Directive,Object)", "summary", "df-generated"]
       - ["javax.lang.model.element", "NestingKind", "isNested", "()", "summary", "df-generated"]
-      - ["javax.lang.model.element", "TypeElement", "getPermittedSubclasses", "()", "summary", "df-generated"]
-      - ["javax.lang.model.element", "TypeElement", "getRecordComponents", "()", "summary", "df-generated"]
diff --git a/java/ql/lib/ext/generated/javax.lang.model.model.yml b/java/ql/lib/ext/generated/javax.lang.model.model.yml
index 45b57d256bd..8dfdd20af9d 100644
--- a/java/ql/lib/ext/generated/javax.lang.model.model.yml
+++ b/java/ql/lib/ext/generated/javax.lang.model.model.yml
@@ -1,5 +1,10 @@
 # THIS FILE IS AN AUTO-GENERATED MODELS AS DATA FILE. DO NOT EDIT.
 extensions:
+  - addsTo:
+      pack: codeql/java-all
+      extensible: summaryModel
+    data:
+      - ["javax.lang.model", "AnnotatedConstruct", True, "getAnnotationMirrors", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
   - addsTo:
       pack: codeql/java-all
       extensible: neutralModel
diff --git a/java/ql/lib/ext/generated/javax.lang.model.type.model.yml b/java/ql/lib/ext/generated/javax.lang.model.type.model.yml
index 0e9eca5bac8..3abc630f492 100644
--- a/java/ql/lib/ext/generated/javax.lang.model.type.model.yml
+++ b/java/ql/lib/ext/generated/javax.lang.model.type.model.yml
@@ -4,15 +4,30 @@ extensions:
       pack: codeql/java-all
       extensible: summaryModel
     data:
+      - ["javax.lang.model.type", "ArrayType", True, "getComponentType", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.lang.model.type", "DeclaredType", True, "getEnclosingType", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.lang.model.type", "DeclaredType", True, "getTypeArguments", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.lang.model.type", "ExecutableType", True, "getParameterTypes", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.lang.model.type", "ExecutableType", True, "getReceiverType", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.lang.model.type", "ExecutableType", True, "getReturnType", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.lang.model.type", "ExecutableType", True, "getThrownTypes", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.lang.model.type", "ExecutableType", True, "getTypeVariables", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.lang.model.type", "IntersectionType", True, "getBounds", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["javax.lang.model.type", "MirroredTypeException", True, "MirroredTypeException", "(TypeMirror)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["javax.lang.model.type", "MirroredTypeException", True, "getTypeMirror", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.lang.model.type", "MirroredTypesException", True, "MirroredTypesException", "(List)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["javax.lang.model.type", "MirroredTypesException", True, "getTypeMirrors", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.lang.model.type", "MirroredTypesException", True, "MirroredTypesException", "(List)", "", "Argument[0].Element", "Argument[this].SyntheticField[javax.lang.model.type.MirroredTypesException.types].Element", "value", "dfc-generated"]
+      - ["javax.lang.model.type", "MirroredTypesException", True, "getTypeMirrors", "()", "", "Argument[this].SyntheticField[javax.lang.model.type.MirroredTypesException.types]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.lang.model.type", "TypeMirror", True, "accept", "(TypeVisitor,Object)", "", "Argument[this]", "ReturnValue", "taint", "dfc-generated"]
+      - ["javax.lang.model.type", "TypeVariable", True, "getLowerBound", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.lang.model.type", "TypeVariable", True, "getUpperBound", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["javax.lang.model.type", "TypeVisitor", True, "visit", "(TypeMirror)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.lang.model.type", "UnknownTypeException", True, "UnknownTypeException", "(TypeMirror,Object)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.lang.model.type", "UnknownTypeException", True, "UnknownTypeException", "(TypeMirror,Object)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.lang.model.type", "UnknownTypeException", True, "getArgument", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.lang.model.type", "UnknownTypeException", True, "getUnknownType", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.lang.model.type", "UnionType", True, "getAlternatives", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.lang.model.type", "UnknownTypeException", True, "UnknownTypeException", "(TypeMirror,Object)", "", "Argument[0]", "Argument[this].SyntheticField[javax.lang.model.type.UnknownTypeException.type]", "value", "dfc-generated"]
+      - ["javax.lang.model.type", "UnknownTypeException", True, "UnknownTypeException", "(TypeMirror,Object)", "", "Argument[1]", "Argument[this].SyntheticField[javax.lang.model.type.UnknownTypeException.parameter]", "value", "dfc-generated"]
+      - ["javax.lang.model.type", "UnknownTypeException", True, "getArgument", "()", "", "Argument[this].SyntheticField[javax.lang.model.type.UnknownTypeException.parameter]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.lang.model.type", "UnknownTypeException", True, "getUnknownType", "()", "", "Argument[this].SyntheticField[javax.lang.model.type.UnknownTypeException.type]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.lang.model.type", "WildcardType", True, "getExtendsBound", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.lang.model.type", "WildcardType", True, "getSuperBound", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
   - addsTo:
       pack: codeql/java-all
       extensible: neutralModel
diff --git a/java/ql/lib/ext/generated/javax.lang.model.util.model.yml b/java/ql/lib/ext/generated/javax.lang.model.util.model.yml
index e57b66161c4..e969148e2d5 100644
--- a/java/ql/lib/ext/generated/javax.lang.model.util.model.yml
+++ b/java/ql/lib/ext/generated/javax.lang.model.util.model.yml
@@ -4,58 +4,168 @@ extensions:
       pack: codeql/java-all
       extensible: summaryModel
     data:
-      - ["javax.lang.model.util", "ElementFilter", True, "constructorsIn", "(Iterable)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["javax.lang.model.util", "ElementFilter", True, "constructorsIn", "(Set)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["javax.lang.model.util", "ElementFilter", True, "exportsIn", "(Iterable)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["javax.lang.model.util", "ElementFilter", True, "fieldsIn", "(Iterable)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["javax.lang.model.util", "ElementFilter", True, "fieldsIn", "(Set)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["javax.lang.model.util", "ElementFilter", True, "methodsIn", "(Iterable)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["javax.lang.model.util", "ElementFilter", True, "methodsIn", "(Set)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["javax.lang.model.util", "ElementFilter", True, "modulesIn", "(Iterable)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["javax.lang.model.util", "ElementFilter", True, "modulesIn", "(Set)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["javax.lang.model.util", "ElementFilter", True, "opensIn", "(Iterable)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["javax.lang.model.util", "ElementFilter", True, "packagesIn", "(Iterable)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["javax.lang.model.util", "ElementFilter", True, "packagesIn", "(Set)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["javax.lang.model.util", "ElementFilter", True, "providesIn", "(Iterable)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["javax.lang.model.util", "ElementFilter", True, "recordComponentsIn", "(Iterable)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["javax.lang.model.util", "ElementFilter", True, "recordComponentsIn", "(Set)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["javax.lang.model.util", "ElementFilter", True, "requiresIn", "(Iterable)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["javax.lang.model.util", "ElementFilter", True, "typesIn", "(Iterable)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["javax.lang.model.util", "ElementFilter", True, "typesIn", "(Set)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["javax.lang.model.util", "ElementFilter", True, "usesIn", "(Iterable)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
+      - ["javax.lang.model.util", "AbstractAnnotationValueVisitor6", True, "visit", "(AnnotationValue)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.lang.model.util", "AbstractAnnotationValueVisitor6", True, "visit", "(AnnotationValue)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.lang.model.util", "AbstractAnnotationValueVisitor6", True, "visit", "(AnnotationValue,Object)", "", "Argument[0]", "Argument[1]", "taint", "df-generated"]
+      - ["javax.lang.model.util", "AbstractAnnotationValueVisitor6", True, "visit", "(AnnotationValue,Object)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.lang.model.util", "AbstractAnnotationValueVisitor6", True, "visit", "(AnnotationValue,Object)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.lang.model.util", "AbstractElementVisitor6", True, "visit", "(Element)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.lang.model.util", "AbstractElementVisitor6", True, "visit", "(Element)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.lang.model.util", "AbstractElementVisitor6", True, "visit", "(Element)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.lang.model.util", "AbstractElementVisitor6", True, "visit", "(Element,Object)", "", "Argument[1]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.lang.model.util", "AbstractTypeVisitor6", True, "visit", "(TypeMirror)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.lang.model.util", "AbstractTypeVisitor6", True, "visit", "(TypeMirror)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.lang.model.util", "AbstractTypeVisitor6", True, "visit", "(TypeMirror)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.lang.model.util", "AbstractTypeVisitor6", True, "visit", "(TypeMirror,Object)", "", "Argument[0]", "Argument[1]", "taint", "df-generated"]
+      - ["javax.lang.model.util", "AbstractTypeVisitor6", True, "visit", "(TypeMirror,Object)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.lang.model.util", "AbstractTypeVisitor6", True, "visit", "(TypeMirror,Object)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.lang.model.util", "AbstractTypeVisitor6", True, "visit", "(TypeMirror,Object)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.lang.model.util", "AbstractTypeVisitor6", True, "visit", "(TypeMirror,Object)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.lang.model.util", "ElementFilter", True, "constructorsIn", "(Iterable)", "", "Argument[0].Element", "ReturnValue.Element", "value", "dfc-generated"]
+      - ["javax.lang.model.util", "ElementFilter", True, "constructorsIn", "(Set)", "", "Argument[0].Element", "ReturnValue.Element", "value", "dfc-generated"]
+      - ["javax.lang.model.util", "ElementFilter", True, "exportsIn", "(Iterable)", "", "Argument[0].Element", "ReturnValue.Element", "value", "dfc-generated"]
+      - ["javax.lang.model.util", "ElementFilter", True, "fieldsIn", "(Iterable)", "", "Argument[0].Element", "ReturnValue.Element", "value", "dfc-generated"]
+      - ["javax.lang.model.util", "ElementFilter", True, "fieldsIn", "(Set)", "", "Argument[0].Element", "ReturnValue.Element", "value", "dfc-generated"]
+      - ["javax.lang.model.util", "ElementFilter", True, "methodsIn", "(Iterable)", "", "Argument[0].Element", "ReturnValue.Element", "value", "dfc-generated"]
+      - ["javax.lang.model.util", "ElementFilter", True, "methodsIn", "(Set)", "", "Argument[0].Element", "ReturnValue.Element", "value", "dfc-generated"]
+      - ["javax.lang.model.util", "ElementFilter", True, "modulesIn", "(Iterable)", "", "Argument[0].Element", "ReturnValue.Element", "value", "dfc-generated"]
+      - ["javax.lang.model.util", "ElementFilter", True, "modulesIn", "(Set)", "", "Argument[0].Element", "ReturnValue.Element", "value", "dfc-generated"]
+      - ["javax.lang.model.util", "ElementFilter", True, "opensIn", "(Iterable)", "", "Argument[0].Element", "ReturnValue.Element", "value", "dfc-generated"]
+      - ["javax.lang.model.util", "ElementFilter", True, "packagesIn", "(Iterable)", "", "Argument[0].Element", "ReturnValue.Element", "value", "dfc-generated"]
+      - ["javax.lang.model.util", "ElementFilter", True, "packagesIn", "(Set)", "", "Argument[0].Element", "ReturnValue.Element", "value", "dfc-generated"]
+      - ["javax.lang.model.util", "ElementFilter", True, "providesIn", "(Iterable)", "", "Argument[0].Element", "ReturnValue.Element", "value", "dfc-generated"]
+      - ["javax.lang.model.util", "ElementFilter", True, "recordComponentsIn", "(Iterable)", "", "Argument[0].Element", "ReturnValue.Element", "value", "dfc-generated"]
+      - ["javax.lang.model.util", "ElementFilter", True, "recordComponentsIn", "(Set)", "", "Argument[0].Element", "ReturnValue.Element", "value", "dfc-generated"]
+      - ["javax.lang.model.util", "ElementFilter", True, "requiresIn", "(Iterable)", "", "Argument[0].Element", "ReturnValue.Element", "value", "dfc-generated"]
+      - ["javax.lang.model.util", "ElementFilter", True, "typesIn", "(Iterable)", "", "Argument[0].Element", "ReturnValue.Element", "value", "dfc-generated"]
+      - ["javax.lang.model.util", "ElementFilter", True, "typesIn", "(Set)", "", "Argument[0].Element", "ReturnValue.Element", "value", "dfc-generated"]
+      - ["javax.lang.model.util", "ElementFilter", True, "usesIn", "(Iterable)", "", "Argument[0].Element", "ReturnValue.Element", "value", "dfc-generated"]
+      - ["javax.lang.model.util", "ElementKindVisitor14", True, "visitRecordComponent", "(RecordComponentElement,Object)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.lang.model.util", "ElementKindVisitor14", True, "visitTypeAsRecord", "(TypeElement,Object)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.lang.model.util", "ElementKindVisitor14", True, "visitVariableAsBindingVariable", "(VariableElement,Object)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.lang.model.util", "ElementKindVisitor6", True, "visitExecutable", "(ExecutableElement,Object)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["javax.lang.model.util", "ElementKindVisitor6", True, "visitExecutableAsConstructor", "(ExecutableElement,Object)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["javax.lang.model.util", "ElementKindVisitor6", True, "visitExecutableAsInstanceInit", "(ExecutableElement,Object)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["javax.lang.model.util", "ElementKindVisitor6", True, "visitExecutableAsMethod", "(ExecutableElement,Object)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["javax.lang.model.util", "ElementKindVisitor6", True, "visitExecutableAsStaticInit", "(ExecutableElement,Object)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.lang.model.util", "ElementKindVisitor6", True, "visitPackage", "(PackageElement,Object)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.lang.model.util", "ElementKindVisitor6", True, "visitType", "(TypeElement,Object)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["javax.lang.model.util", "ElementKindVisitor6", True, "visitTypeAsAnnotationType", "(TypeElement,Object)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["javax.lang.model.util", "ElementKindVisitor6", True, "visitTypeAsClass", "(TypeElement,Object)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["javax.lang.model.util", "ElementKindVisitor6", True, "visitTypeAsEnum", "(TypeElement,Object)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["javax.lang.model.util", "ElementKindVisitor6", True, "visitTypeAsInterface", "(TypeElement,Object)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.lang.model.util", "ElementKindVisitor6", True, "visitTypeParameter", "(TypeParameterElement,Object)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.lang.model.util", "ElementKindVisitor6", True, "visitVariable", "(VariableElement,Object)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["javax.lang.model.util", "ElementKindVisitor6", True, "visitVariableAsEnumConstant", "(VariableElement,Object)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["javax.lang.model.util", "ElementKindVisitor6", True, "visitVariableAsExceptionParameter", "(VariableElement,Object)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["javax.lang.model.util", "ElementKindVisitor6", True, "visitVariableAsField", "(VariableElement,Object)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["javax.lang.model.util", "ElementKindVisitor6", True, "visitVariableAsLocalVariable", "(VariableElement,Object)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["javax.lang.model.util", "ElementKindVisitor6", True, "visitVariableAsParameter", "(VariableElement,Object)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.lang.model.util", "ElementKindVisitor7", True, "visitVariableAsResourceVariable", "(VariableElement,Object)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.lang.model.util", "ElementKindVisitor9", True, "visitModule", "(ModuleElement,Object)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.lang.model.util", "ElementScanner14", True, "visitExecutable", "(ExecutableElement,Object)", "", "Argument[1]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.lang.model.util", "ElementScanner14", True, "visitRecordComponent", "(RecordComponentElement,Object)", "", "Argument[1]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.lang.model.util", "ElementScanner14", True, "visitType", "(TypeElement,Object)", "", "Argument[1]", "ReturnValue", "value", "dfc-generated"]
       - ["javax.lang.model.util", "ElementScanner6", True, "scan", "(Element)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["javax.lang.model.util", "ElementScanner6", True, "scan", "(Element)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["javax.lang.model.util", "ElementScanner6", True, "scan", "(Element)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.lang.model.util", "ElementScanner6", True, "scan", "(Element,Object)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.lang.model.util", "ElementScanner6", True, "scan", "(Element,Object)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.lang.model.util", "ElementScanner6", True, "scan", "(Element,Object)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.lang.model.util", "ElementScanner6", True, "scan", "(Element,Object)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.lang.model.util", "ElementScanner6", True, "scan", "(Iterable,Object)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["javax.lang.model.util", "ElementScanner6", True, "scan", "(Iterable,Object)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["javax.lang.model.util", "ElementScanner6", True, "scan", "(Iterable,Object)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.lang.model.util", "ElementScanner6", True, "scan", "(Iterable,Object)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.lang.model.util", "ElementScanner6", True, "scan", "(Element,Object)", "", "Argument[1]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.lang.model.util", "ElementScanner6", True, "scan", "(Iterable,Object)", "", "Argument[1]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.lang.model.util", "ElementScanner6", True, "visitExecutable", "(ExecutableElement,Object)", "", "Argument[1]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.lang.model.util", "ElementScanner6", True, "visitPackage", "(PackageElement,Object)", "", "Argument[1]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.lang.model.util", "ElementScanner6", True, "visitType", "(TypeElement,Object)", "", "Argument[1]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.lang.model.util", "ElementScanner6", True, "visitTypeParameter", "(TypeParameterElement,Object)", "", "Argument[1]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.lang.model.util", "ElementScanner6", True, "visitVariable", "(VariableElement,Object)", "", "Argument[1]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.lang.model.util", "ElementScanner7", True, "visitVariable", "(VariableElement,Object)", "", "Argument[1]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.lang.model.util", "ElementScanner9", True, "visitModule", "(ModuleElement,Object)", "", "Argument[1]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.lang.model.util", "Elements", True, "getAllAnnotationMirrors", "(Element)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.lang.model.util", "Elements", True, "getAllMembers", "(TypeElement)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.lang.model.util", "Elements", True, "getAllModuleElements", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["javax.lang.model.util", "Elements", True, "getAllPackageElements", "(CharSequence)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["javax.lang.model.util", "Elements", True, "getAllTypeElements", "(CharSequence)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.lang.model.util", "Elements", True, "getBinaryName", "(TypeElement)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.lang.model.util", "Elements", True, "getElementValuesWithDefaults", "(AnnotationMirror)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.lang.model.util", "Elements", True, "getModuleElement", "(CharSequence)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.lang.model.util", "Elements", True, "getModuleOf", "(Element)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.lang.model.util", "Elements", True, "getName", "(CharSequence)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.lang.model.util", "Elements", True, "getPackageElement", "(CharSequence)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.lang.model.util", "Elements", True, "getPackageElement", "(ModuleElement,CharSequence)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.lang.model.util", "Elements", True, "getPackageElement", "(ModuleElement,CharSequence)", "", "Argument[this]", "Argument[0]", "taint", "df-generated"]
+      - ["javax.lang.model.util", "Elements", True, "getPackageElement", "(ModuleElement,CharSequence)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.lang.model.util", "Elements", True, "getPackageOf", "(Element)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.lang.model.util", "Elements", True, "getTypeElement", "(CharSequence)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.lang.model.util", "Elements", True, "getTypeElement", "(ModuleElement,CharSequence)", "", "Argument[this]", "Argument[0]", "taint", "df-generated"]
+      - ["javax.lang.model.util", "Elements", True, "getTypeElement", "(ModuleElement,CharSequence)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["javax.lang.model.util", "Elements", True, "recordComponentFor", "(ExecutableElement)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.lang.model.util", "SimpleAnnotationValueVisitor6", True, "visitAnnotation", "(AnnotationMirror,Object)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.lang.model.util", "SimpleAnnotationValueVisitor6", True, "visitArray", "(List,Object)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.lang.model.util", "SimpleAnnotationValueVisitor6", True, "visitBoolean", "(boolean,Object)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.lang.model.util", "SimpleAnnotationValueVisitor6", True, "visitByte", "(byte,Object)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.lang.model.util", "SimpleAnnotationValueVisitor6", True, "visitChar", "(char,Object)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.lang.model.util", "SimpleAnnotationValueVisitor6", True, "visitDouble", "(double,Object)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.lang.model.util", "SimpleAnnotationValueVisitor6", True, "visitEnumConstant", "(VariableElement,Object)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.lang.model.util", "SimpleAnnotationValueVisitor6", True, "visitFloat", "(float,Object)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.lang.model.util", "SimpleAnnotationValueVisitor6", True, "visitInt", "(int,Object)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.lang.model.util", "SimpleAnnotationValueVisitor6", True, "visitLong", "(long,Object)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.lang.model.util", "SimpleAnnotationValueVisitor6", True, "visitShort", "(short,Object)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.lang.model.util", "SimpleAnnotationValueVisitor6", True, "visitString", "(String,Object)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.lang.model.util", "SimpleAnnotationValueVisitor6", True, "visitType", "(TypeMirror,Object)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.lang.model.util", "SimpleElementVisitor14", True, "visitRecordComponent", "(RecordComponentElement,Object)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.lang.model.util", "SimpleElementVisitor6", True, "visitExecutable", "(ExecutableElement,Object)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.lang.model.util", "SimpleElementVisitor6", True, "visitPackage", "(PackageElement,Object)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.lang.model.util", "SimpleElementVisitor6", True, "visitType", "(TypeElement,Object)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.lang.model.util", "SimpleElementVisitor6", True, "visitTypeParameter", "(TypeParameterElement,Object)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.lang.model.util", "SimpleElementVisitor6", True, "visitVariable", "(VariableElement,Object)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.lang.model.util", "SimpleElementVisitor7", True, "visitVariable", "(VariableElement,Object)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.lang.model.util", "SimpleElementVisitor9", True, "visitModule", "(ModuleElement,Object)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.lang.model.util", "SimpleTypeVisitor6", True, "visitArray", "(ArrayType,Object)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.lang.model.util", "SimpleTypeVisitor6", True, "visitArray", "(ArrayType,Object)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.lang.model.util", "SimpleTypeVisitor6", True, "visitArray", "(ArrayType,Object)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.lang.model.util", "SimpleTypeVisitor6", True, "visitArray", "(ArrayType,Object)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.lang.model.util", "SimpleTypeVisitor6", True, "visitDeclared", "(DeclaredType,Object)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.lang.model.util", "SimpleTypeVisitor6", True, "visitDeclared", "(DeclaredType,Object)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.lang.model.util", "SimpleTypeVisitor6", True, "visitDeclared", "(DeclaredType,Object)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.lang.model.util", "SimpleTypeVisitor6", True, "visitDeclared", "(DeclaredType,Object)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.lang.model.util", "SimpleTypeVisitor6", True, "visitError", "(ErrorType,Object)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.lang.model.util", "SimpleTypeVisitor6", True, "visitError", "(ErrorType,Object)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.lang.model.util", "SimpleTypeVisitor6", True, "visitError", "(ErrorType,Object)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.lang.model.util", "SimpleTypeVisitor6", True, "visitError", "(ErrorType,Object)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.lang.model.util", "SimpleTypeVisitor6", True, "visitExecutable", "(ExecutableType,Object)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.lang.model.util", "SimpleTypeVisitor6", True, "visitExecutable", "(ExecutableType,Object)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.lang.model.util", "SimpleTypeVisitor6", True, "visitExecutable", "(ExecutableType,Object)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.lang.model.util", "SimpleTypeVisitor6", True, "visitExecutable", "(ExecutableType,Object)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.lang.model.util", "SimpleTypeVisitor6", True, "visitNoType", "(NoType,Object)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.lang.model.util", "SimpleTypeVisitor6", True, "visitNoType", "(NoType,Object)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.lang.model.util", "SimpleTypeVisitor6", True, "visitNoType", "(NoType,Object)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.lang.model.util", "SimpleTypeVisitor6", True, "visitNoType", "(NoType,Object)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.lang.model.util", "SimpleTypeVisitor6", True, "visitNull", "(NullType,Object)", "", "Argument[0].Field[com.sun.tools.javac.code.Type.tsym].Field[com.sun.tools.javac.code.Symbol.name]", "ReturnValue", "taint", "dfc-generated"]
+      - ["javax.lang.model.util", "SimpleTypeVisitor6", True, "visitNull", "(NullType,Object)", "", "Argument[0]", "ReturnValue", "taint", "dfc-generated"]
+      - ["javax.lang.model.util", "SimpleTypeVisitor6", True, "visitPrimitive", "(PrimitiveType,Object)", "", "Argument[0].Field[com.sun.tools.javac.code.Type.tsym].Field[com.sun.tools.javac.code.Symbol.name]", "ReturnValue", "taint", "dfc-generated"]
+      - ["javax.lang.model.util", "SimpleTypeVisitor6", True, "visitPrimitive", "(PrimitiveType,Object)", "", "Argument[0]", "ReturnValue", "taint", "dfc-generated"]
+      - ["javax.lang.model.util", "SimpleTypeVisitor6", True, "visitTypeVariable", "(TypeVariable,Object)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.lang.model.util", "SimpleTypeVisitor6", True, "visitTypeVariable", "(TypeVariable,Object)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.lang.model.util", "SimpleTypeVisitor6", True, "visitTypeVariable", "(TypeVariable,Object)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.lang.model.util", "SimpleTypeVisitor6", True, "visitTypeVariable", "(TypeVariable,Object)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.lang.model.util", "SimpleTypeVisitor6", True, "visitWildcard", "(WildcardType,Object)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.lang.model.util", "SimpleTypeVisitor6", True, "visitWildcard", "(WildcardType,Object)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.lang.model.util", "SimpleTypeVisitor6", True, "visitWildcard", "(WildcardType,Object)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.lang.model.util", "SimpleTypeVisitor6", True, "visitWildcard", "(WildcardType,Object)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.lang.model.util", "SimpleTypeVisitor7", True, "visitUnion", "(UnionType,Object)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.lang.model.util", "SimpleTypeVisitor7", True, "visitUnion", "(UnionType,Object)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.lang.model.util", "SimpleTypeVisitor7", True, "visitUnion", "(UnionType,Object)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.lang.model.util", "SimpleTypeVisitor8", True, "visitIntersection", "(IntersectionType,Object)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.lang.model.util", "SimpleTypeVisitor8", True, "visitIntersection", "(IntersectionType,Object)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.lang.model.util", "SimpleTypeVisitor8", True, "visitIntersection", "(IntersectionType,Object)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.lang.model.util", "TypeKindVisitor6", True, "visitNoType", "(NoType,Object)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.lang.model.util", "TypeKindVisitor6", True, "visitNoType", "(NoType,Object)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["javax.lang.model.util", "TypeKindVisitor6", True, "visitNoTypeAsNone", "(NoType,Object)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
       - ["javax.lang.model.util", "TypeKindVisitor6", True, "visitNoTypeAsNone", "(NoType,Object)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["javax.lang.model.util", "TypeKindVisitor6", True, "visitNoTypeAsPackage", "(NoType,Object)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
       - ["javax.lang.model.util", "TypeKindVisitor6", True, "visitNoTypeAsPackage", "(NoType,Object)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["javax.lang.model.util", "TypeKindVisitor6", True, "visitNoTypeAsVoid", "(NoType,Object)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
       - ["javax.lang.model.util", "TypeKindVisitor6", True, "visitNoTypeAsVoid", "(NoType,Object)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.lang.model.util", "TypeKindVisitor6", True, "visitPrimitive", "(PrimitiveType,Object)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.lang.model.util", "TypeKindVisitor6", True, "visitPrimitive", "(PrimitiveType,Object)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["javax.lang.model.util", "TypeKindVisitor6", True, "visitPrimitiveAsBoolean", "(PrimitiveType,Object)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
       - ["javax.lang.model.util", "TypeKindVisitor6", True, "visitPrimitiveAsBoolean", "(PrimitiveType,Object)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["javax.lang.model.util", "TypeKindVisitor6", True, "visitPrimitiveAsByte", "(PrimitiveType,Object)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
@@ -72,22 +182,51 @@ extensions:
       - ["javax.lang.model.util", "TypeKindVisitor6", True, "visitPrimitiveAsLong", "(PrimitiveType,Object)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["javax.lang.model.util", "TypeKindVisitor6", True, "visitPrimitiveAsShort", "(PrimitiveType,Object)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
       - ["javax.lang.model.util", "TypeKindVisitor6", True, "visitPrimitiveAsShort", "(PrimitiveType,Object)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.lang.model.util", "TypeKindVisitor7", True, "visitUnion", "(UnionType,Object)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.lang.model.util", "TypeKindVisitor7", True, "visitUnion", "(UnionType,Object)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.lang.model.util", "TypeKindVisitor8", True, "visitIntersection", "(IntersectionType,Object)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.lang.model.util", "TypeKindVisitor8", True, "visitIntersection", "(IntersectionType,Object)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.lang.model.util", "TypeKindVisitor9", True, "visitNoTypeAsModule", "(NoType,Object)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.lang.model.util", "TypeKindVisitor9", True, "visitNoTypeAsModule", "(NoType,Object)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.lang.model.util", "Types", True, "asElement", "(TypeMirror)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.lang.model.util", "Types", True, "asMemberOf", "(DeclaredType,Element)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.lang.model.util", "Types", True, "asMemberOf", "(DeclaredType,Element)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.lang.model.util", "Types", True, "capture", "(TypeMirror)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.lang.model.util", "Types", True, "directSupertypes", "(TypeMirror)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.lang.model.util", "Types", True, "erasure", "(TypeMirror)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.lang.model.util", "Types", True, "getArrayType", "(TypeMirror)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.lang.model.util", "Types", True, "getArrayType", "(TypeMirror)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.lang.model.util", "Types", True, "getDeclaredType", "(DeclaredType,TypeElement,TypeMirror[])", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.lang.model.util", "Types", True, "getDeclaredType", "(DeclaredType,TypeElement,TypeMirror[])", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.lang.model.util", "Types", True, "getDeclaredType", "(TypeElement,TypeMirror[])", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.lang.model.util", "Types", True, "getNoType", "(TypeKind)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.lang.model.util", "Types", True, "getNullType", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.lang.model.util", "Types", True, "getPrimitiveType", "(TypeKind)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.lang.model.util", "Types", True, "getWildcardType", "(TypeMirror,TypeMirror)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.lang.model.util", "Types", True, "getWildcardType", "(TypeMirror,TypeMirror)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.lang.model.util", "Types", True, "getWildcardType", "(TypeMirror,TypeMirror)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
   - addsTo:
       pack: codeql/java-all
       extensible: neutralModel
     data:
+      - ["javax.lang.model.util", "AbstractAnnotationValueVisitor6", "visitUnknown", "(AnnotationValue,Object)", "summary", "df-generated"]
+      - ["javax.lang.model.util", "AbstractElementVisitor14", "visitRecordComponent", "(RecordComponentElement,Object)", "summary", "df-generated"]
+      - ["javax.lang.model.util", "AbstractElementVisitor6", "visitModule", "(ModuleElement,Object)", "summary", "df-generated"]
+      - ["javax.lang.model.util", "AbstractElementVisitor6", "visitRecordComponent", "(RecordComponentElement,Object)", "summary", "df-generated"]
+      - ["javax.lang.model.util", "AbstractElementVisitor6", "visitUnknown", "(Element,Object)", "summary", "df-generated"]
+      - ["javax.lang.model.util", "AbstractElementVisitor9", "visitModule", "(ModuleElement,Object)", "summary", "df-generated"]
+      - ["javax.lang.model.util", "AbstractTypeVisitor6", "visitIntersection", "(IntersectionType,Object)", "summary", "df-generated"]
+      - ["javax.lang.model.util", "AbstractTypeVisitor6", "visitUnion", "(UnionType,Object)", "summary", "df-generated"]
+      - ["javax.lang.model.util", "AbstractTypeVisitor6", "visitUnknown", "(TypeMirror,Object)", "summary", "df-generated"]
+      - ["javax.lang.model.util", "AbstractTypeVisitor7", "visitUnion", "(UnionType,Object)", "summary", "df-generated"]
+      - ["javax.lang.model.util", "AbstractTypeVisitor8", "visitIntersection", "(IntersectionType,Object)", "summary", "df-generated"]
       - ["javax.lang.model.util", "ElementKindVisitor6", "visitTypeAsRecord", "(TypeElement,Object)", "summary", "df-generated"]
       - ["javax.lang.model.util", "ElementKindVisitor6", "visitVariableAsBindingVariable", "(VariableElement,Object)", "summary", "df-generated"]
       - ["javax.lang.model.util", "ElementKindVisitor6", "visitVariableAsResourceVariable", "(VariableElement,Object)", "summary", "df-generated"]
       - ["javax.lang.model.util", "Elements$Origin", "isDeclared", "()", "summary", "df-generated"]
-      - ["javax.lang.model.util", "Elements", "getAllModuleElements", "()", "summary", "df-generated"]
-      - ["javax.lang.model.util", "Elements", "getModuleElement", "(CharSequence)", "summary", "df-generated"]
-      - ["javax.lang.model.util", "Elements", "getModuleOf", "(Element)", "summary", "df-generated"]
       - ["javax.lang.model.util", "Elements", "getOrigin", "(AnnotatedConstruct,AnnotationMirror)", "summary", "df-generated"]
       - ["javax.lang.model.util", "Elements", "getOrigin", "(Element)", "summary", "df-generated"]
       - ["javax.lang.model.util", "Elements", "getOrigin", "(ModuleElement,ModuleElement$Directive)", "summary", "df-generated"]
-      - ["javax.lang.model.util", "Elements", "getPackageElement", "(ModuleElement,CharSequence)", "summary", "df-generated"]
-      - ["javax.lang.model.util", "Elements", "getTypeElement", "(ModuleElement,CharSequence)", "summary", "df-generated"]
       - ["javax.lang.model.util", "Elements", "isAutomaticModule", "(ModuleElement)", "summary", "df-generated"]
       - ["javax.lang.model.util", "Elements", "isBridge", "(ExecutableElement)", "summary", "df-generated"]
       - ["javax.lang.model.util", "TypeKindVisitor6", "visitNoTypeAsModule", "(NoType,Object)", "summary", "df-generated"]
diff --git a/java/ql/lib/ext/generated/javax.management.loading.model.yml b/java/ql/lib/ext/generated/javax.management.loading.model.yml
index ada13786d72..144b3e489f0 100644
--- a/java/ql/lib/ext/generated/javax.management.loading.model.yml
+++ b/java/ql/lib/ext/generated/javax.management.loading.model.yml
@@ -4,31 +4,39 @@ extensions:
       pack: codeql/java-all
       extensible: summaryModel
     data:
+      - ["javax.management.loading", "ClassLoaderRepository", True, "loadClassBefore", "(ClassLoader,String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.loading", "ClassLoaderRepository", True, "loadClassWithout", "(ClassLoader,String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
       - ["javax.management.loading", "MLet", True, "MLet", "(URL[],ClassLoader)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
       - ["javax.management.loading", "MLet", True, "MLet", "(URL[],ClassLoader,URLStreamHandlerFactory)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
       - ["javax.management.loading", "MLet", True, "MLet", "(URL[],ClassLoader,URLStreamHandlerFactory,boolean)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
       - ["javax.management.loading", "MLet", True, "MLet", "(URL[],ClassLoader,boolean)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management.loading", "MLet", True, "loadClass", "(String,ClassLoaderRepository)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.loading", "MLet", True, "getLibraryDirectory", "()", "", "Argument[this].SyntheticField[javax.management.loading.MLet.libraryDirectory]", "ReturnValue", "value", "dfc-generated"]
       - ["javax.management.loading", "MLet", True, "loadClass", "(String,ClassLoaderRepository)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management.loading", "MLetContent", True, "MLetContent", "(URL,Map,List,List)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management.loading", "MLetContent", True, "MLetContent", "(URL,Map,List,List)", "", "Argument[1].Element", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management.loading", "MLetContent", True, "MLetContent", "(URL,Map,List,List)", "", "Argument[2].Element", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management.loading", "MLetContent", True, "MLetContent", "(URL,Map,List,List)", "", "Argument[3].Element", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management.loading", "MLetContent", True, "getAttributes", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.management.loading", "MLetContent", True, "getCode", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.management.loading", "MLetContent", True, "getCodeBase", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.management.loading", "MLetContent", True, "getDocumentBase", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.management.loading", "MLetContent", True, "getJarFiles", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.management.loading", "MLetContent", True, "getName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.management.loading", "MLetContent", True, "getParameterTypes", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.management.loading", "MLetContent", True, "getParameterValues", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.management.loading", "MLetContent", True, "getSerializedObject", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.management.loading", "MLetContent", True, "getVersion", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.management.loading", "MLetMBean", True, "getLibraryDirectory", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management.loading", "MLet", True, "preRegister", "(MBeanServer,ObjectName)", "", "Argument[1]", "Argument[this].SyntheticField[javax.management.loading.MLet.mletObjectName]", "value", "dfc-generated"]
+      - ["javax.management.loading", "MLet", True, "preRegister", "(MBeanServer,ObjectName)", "", "Argument[this].SyntheticField[javax.management.loading.MLet.mletObjectName]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.management.loading", "MLet", True, "setLibraryDirectory", "(String)", "", "Argument[0]", "Argument[this].SyntheticField[javax.management.loading.MLet.libraryDirectory]", "value", "dfc-generated"]
+      - ["javax.management.loading", "MLetContent", True, "MLetContent", "(URL,Map,List,List)", "", "Argument[0]", "Argument[this].SyntheticField[javax.management.loading.MLetContent.baseURL]", "value", "dfc-generated"]
+      - ["javax.management.loading", "MLetContent", True, "MLetContent", "(URL,Map,List,List)", "", "Argument[0]", "Argument[this].SyntheticField[javax.management.loading.MLetContent.documentURL]", "value", "dfc-generated"]
+      - ["javax.management.loading", "MLetContent", True, "MLetContent", "(URL,Map,List,List)", "", "Argument[1].MapKey", "Argument[this].SyntheticField[javax.management.loading.MLetContent.attributes].MapKey", "value", "dfc-generated"]
+      - ["javax.management.loading", "MLetContent", True, "MLetContent", "(URL,Map,List,List)", "", "Argument[1].MapValue", "Argument[this].SyntheticField[javax.management.loading.MLetContent.attributes].MapValue", "value", "dfc-generated"]
+      - ["javax.management.loading", "MLetContent", True, "MLetContent", "(URL,Map,List,List)", "", "Argument[1].MapValue", "Argument[this].SyntheticField[javax.management.loading.MLetContent.baseURL]", "taint", "dfc-generated"]
+      - ["javax.management.loading", "MLetContent", True, "MLetContent", "(URL,Map,List,List)", "", "Argument[2].Element", "Argument[this].SyntheticField[javax.management.loading.MLetContent.types].Element", "value", "dfc-generated"]
+      - ["javax.management.loading", "MLetContent", True, "MLetContent", "(URL,Map,List,List)", "", "Argument[3].Element", "Argument[this].SyntheticField[javax.management.loading.MLetContent.values].Element", "value", "dfc-generated"]
+      - ["javax.management.loading", "MLetContent", True, "MLetContent", "(URL,Map,List,List)", "", "Argument[this].SyntheticField[javax.management.loading.MLetContent.attributes].MapValue", "Argument[this].SyntheticField[javax.management.loading.MLetContent.baseURL]", "taint", "dfc-generated"]
+      - ["javax.management.loading", "MLetContent", True, "MLetContent", "(URL,Map,List,List)", "", "Argument[this].SyntheticField[javax.management.loading.MLetContent.documentURL]", "Argument[this].SyntheticField[javax.management.loading.MLetContent.baseURL]", "value", "dfc-generated"]
+      - ["javax.management.loading", "MLetContent", True, "getAttributes", "()", "", "Argument[this].SyntheticField[javax.management.loading.MLetContent.attributes]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.management.loading", "MLetContent", True, "getCode", "()", "", "Argument[this].SyntheticField[javax.management.loading.MLetContent.attributes].MapValue", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.management.loading", "MLetContent", True, "getCodeBase", "()", "", "Argument[this].SyntheticField[javax.management.loading.MLetContent.baseURL]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.management.loading", "MLetContent", True, "getDocumentBase", "()", "", "Argument[this].SyntheticField[javax.management.loading.MLetContent.documentURL]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.management.loading", "MLetContent", True, "getJarFiles", "()", "", "Argument[this].SyntheticField[javax.management.loading.MLetContent.attributes].MapValue", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.management.loading", "MLetContent", True, "getName", "()", "", "Argument[this].SyntheticField[javax.management.loading.MLetContent.attributes].MapValue", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.management.loading", "MLetContent", True, "getParameterTypes", "()", "", "Argument[this].SyntheticField[javax.management.loading.MLetContent.types]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.management.loading", "MLetContent", True, "getParameterValues", "()", "", "Argument[this].SyntheticField[javax.management.loading.MLetContent.values]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.management.loading", "MLetContent", True, "getSerializedObject", "()", "", "Argument[this].SyntheticField[javax.management.loading.MLetContent.attributes].MapValue", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.management.loading", "MLetContent", True, "getVersion", "()", "", "Argument[this].SyntheticField[javax.management.loading.MLetContent.attributes].MapValue", "ReturnValue", "value", "dfc-generated"]
       - ["javax.management.loading", "MLetMBean", True, "getMBeansFromURL", "(String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["javax.management.loading", "MLetMBean", True, "getMBeansFromURL", "(URL)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["javax.management.loading", "MLetMBean", True, "getURLs", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.management.loading", "MLetMBean", True, "setLibraryDirectory", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["javax.management.loading", "PrivateMLet", True, "PrivateMLet", "(URL[],ClassLoader,URLStreamHandlerFactory,boolean)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
       - ["javax.management.loading", "PrivateMLet", True, "PrivateMLet", "(URL[],ClassLoader,boolean)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
   - addsTo:
@@ -39,6 +47,9 @@ extensions:
       - ["javax.management.loading", "DefaultLoaderRepository", "loadClassWithout", "(ClassLoader,String)", "summary", "df-generated"]
       - ["javax.management.loading", "MLet", "MLet", "(URL[])", "summary", "df-generated"]
       - ["javax.management.loading", "MLet", "MLet", "(URL[],boolean)", "summary", "df-generated"]
-      - ["javax.management.loading", "MLetMBean", "addURL", "(String)", "summary", "df-generated"]
-      - ["javax.management.loading", "MLetMBean", "addURL", "(URL)", "summary", "df-generated"]
+      - ["javax.management.loading", "MLet", "addURL", "(String)", "summary", "df-generated"]
+      - ["javax.management.loading", "MLet", "addURL", "(URL)", "summary", "df-generated"]
+      - ["javax.management.loading", "MLet", "postDeregister", "()", "summary", "df-generated"]
+      - ["javax.management.loading", "MLet", "postRegister", "(Boolean)", "summary", "df-generated"]
+      - ["javax.management.loading", "MLet", "preDeregister", "()", "summary", "df-generated"]
       - ["javax.management.loading", "PrivateMLet", "PrivateMLet", "(URL[],boolean)", "summary", "df-generated"]
diff --git a/java/ql/lib/ext/generated/javax.management.model.yml b/java/ql/lib/ext/generated/javax.management.model.yml
index fbde549df2e..eab97b6f471 100644
--- a/java/ql/lib/ext/generated/javax.management.model.yml
+++ b/java/ql/lib/ext/generated/javax.management.model.yml
@@ -4,55 +4,53 @@ extensions:
       pack: codeql/java-all
       extensible: summaryModel
     data:
-      - ["javax.management", "Attribute", True, "Attribute", "(String,Object)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management", "Attribute", True, "Attribute", "(String,Object)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management", "Attribute", True, "getName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.management", "Attribute", True, "getValue", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.management", "AttributeChangeNotification", True, "AttributeChangeNotification", "(Object,long,long,String,String,String,Object,Object)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management", "AttributeChangeNotification", True, "AttributeChangeNotification", "(Object,long,long,String,String,String,Object,Object)", "", "Argument[3]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management", "AttributeChangeNotification", True, "AttributeChangeNotification", "(Object,long,long,String,String,String,Object,Object)", "", "Argument[4]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management", "AttributeChangeNotification", True, "AttributeChangeNotification", "(Object,long,long,String,String,String,Object,Object)", "", "Argument[5]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management", "AttributeChangeNotification", True, "AttributeChangeNotification", "(Object,long,long,String,String,String,Object,Object)", "", "Argument[6]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management", "AttributeChangeNotification", True, "AttributeChangeNotification", "(Object,long,long,String,String,String,Object,Object)", "", "Argument[7]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management", "AttributeChangeNotification", True, "getAttributeName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.management", "AttributeChangeNotification", True, "getAttributeType", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.management", "AttributeChangeNotification", True, "getNewValue", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.management", "AttributeChangeNotification", True, "getOldValue", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.management", "AttributeChangeNotificationFilter", True, "enableAttribute", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management", "AttributeChangeNotificationFilter", True, "getEnabledAttributes", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.management", "AttributeList", True, "AttributeList", "(AttributeList)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management", "AttributeList", True, "AttributeList", "(List)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management", "AttributeList", True, "add", "(Attribute)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management", "AttributeList", True, "add", "(int,Attribute)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management", "AttributeList", True, "addAll", "(AttributeList)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management", "AttributeList", True, "asList", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.management", "AttributeList", True, "set", "(int,Attribute)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management", "Attribute", True, "Attribute", "(String,Object)", "", "Argument[0]", "Argument[this].SyntheticField[javax.management.Attribute.name]", "value", "dfc-generated"]
+      - ["javax.management", "Attribute", True, "Attribute", "(String,Object)", "", "Argument[1]", "Argument[this].SyntheticField[javax.management.Attribute.value]", "value", "dfc-generated"]
+      - ["javax.management", "Attribute", True, "getName", "()", "", "Argument[this].SyntheticField[javax.management.Attribute.name]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.management", "Attribute", True, "getValue", "()", "", "Argument[this].SyntheticField[javax.management.Attribute.value]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.management", "AttributeChangeNotification", True, "AttributeChangeNotification", "(Object,long,long,String,String,String,Object,Object)", "", "Argument[3]", "Argument[this]", "taint", "dfc-generated"]
+      - ["javax.management", "AttributeChangeNotification", True, "AttributeChangeNotification", "(Object,long,long,String,String,String,Object,Object)", "", "Argument[4]", "Argument[this].SyntheticField[javax.management.AttributeChangeNotification.attributeName]", "value", "dfc-generated"]
+      - ["javax.management", "AttributeChangeNotification", True, "AttributeChangeNotification", "(Object,long,long,String,String,String,Object,Object)", "", "Argument[5]", "Argument[this].SyntheticField[javax.management.AttributeChangeNotification.attributeType]", "value", "dfc-generated"]
+      - ["javax.management", "AttributeChangeNotification", True, "AttributeChangeNotification", "(Object,long,long,String,String,String,Object,Object)", "", "Argument[6]", "Argument[this].SyntheticField[javax.management.AttributeChangeNotification.oldValue]", "value", "dfc-generated"]
+      - ["javax.management", "AttributeChangeNotification", True, "AttributeChangeNotification", "(Object,long,long,String,String,String,Object,Object)", "", "Argument[7]", "Argument[this].SyntheticField[javax.management.AttributeChangeNotification.newValue]", "value", "dfc-generated"]
+      - ["javax.management", "AttributeChangeNotification", True, "getAttributeName", "()", "", "Argument[this].SyntheticField[javax.management.AttributeChangeNotification.attributeName]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.management", "AttributeChangeNotification", True, "getAttributeType", "()", "", "Argument[this].SyntheticField[javax.management.AttributeChangeNotification.attributeType]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.management", "AttributeChangeNotification", True, "getNewValue", "()", "", "Argument[this].SyntheticField[javax.management.AttributeChangeNotification.newValue]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.management", "AttributeChangeNotification", True, "getOldValue", "()", "", "Argument[this].SyntheticField[javax.management.AttributeChangeNotification.oldValue]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.management", "AttributeChangeNotificationFilter", True, "enableAttribute", "(String)", "", "Argument[0]", "Argument[this].SyntheticField[javax.management.AttributeChangeNotificationFilter.enabledAttributes].Element", "value", "dfc-generated"]
+      - ["javax.management", "AttributeChangeNotificationFilter", True, "getEnabledAttributes", "()", "", "Argument[this].SyntheticField[javax.management.AttributeChangeNotificationFilter.enabledAttributes]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.management", "AttributeList", True, "AttributeList", "(AttributeList)", "", "Argument[0].Element", "Argument[this].Element", "value", "dfc-generated"]
+      - ["javax.management", "AttributeList", True, "AttributeList", "(List)", "", "Argument[0].Element", "Argument[this].Element", "value", "dfc-generated"]
+      - ["javax.management", "AttributeList", True, "add", "(Attribute)", "", "Argument[0]", "Argument[this].Element", "value", "dfc-generated"]
+      - ["javax.management", "AttributeList", True, "add", "(int,Attribute)", "", "Argument[1]", "Argument[this].Element", "value", "dfc-generated"]
+      - ["javax.management", "AttributeList", True, "addAll", "(AttributeList)", "", "Argument[0].Element", "Argument[this].Element", "value", "dfc-generated"]
+      - ["javax.management", "AttributeList", True, "asList", "()", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.management", "AttributeList", True, "set", "(int,Attribute)", "", "Argument[1]", "Argument[this].Element", "value", "dfc-generated"]
       - ["javax.management", "AttributeNotFoundException", True, "AttributeNotFoundException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management", "AttributeValueExp", True, "AttributeValueExp", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management", "AttributeValueExp", True, "getAttributeName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management", "AttributeValueExp", True, "AttributeValueExp", "(String)", "", "Argument[0]", "Argument[this].SyntheticField[javax.management.AttributeValueExp.attr]", "value", "dfc-generated"]
+      - ["javax.management", "AttributeValueExp", True, "getAttributeName", "()", "", "Argument[this].SyntheticField[javax.management.AttributeValueExp.attr]", "ReturnValue", "value", "dfc-generated"]
       - ["javax.management", "BadAttributeValueExpException", True, "BadAttributeValueExpException", "(Object)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management", "BadBinaryOpValueExpException", True, "BadBinaryOpValueExpException", "(ValueExp)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management", "BadBinaryOpValueExpException", True, "getExp", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management", "BadBinaryOpValueExpException", True, "BadBinaryOpValueExpException", "(ValueExp)", "", "Argument[0]", "Argument[this].SyntheticField[javax.management.BadBinaryOpValueExpException.exp]", "value", "dfc-generated"]
+      - ["javax.management", "BadBinaryOpValueExpException", True, "getExp", "()", "", "Argument[this].SyntheticField[javax.management.BadBinaryOpValueExpException.exp]", "ReturnValue", "value", "dfc-generated"]
       - ["javax.management", "BadStringOperationException", True, "BadStringOperationException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management", "Descriptor", True, "getFieldNames", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.management", "Descriptor", True, "getFieldValue", "(String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.management", "Descriptor", True, "getFieldValues", "(String[])", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.management", "Descriptor", True, "getFields", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.management", "Descriptor", True, "setField", "(String,Object)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management", "Descriptor", True, "setField", "(String,Object)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management", "Descriptor", True, "setFields", "(String[],Object[])", "", "Argument[0].ArrayElement", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management", "Descriptor", True, "setFields", "(String[],Object[])", "", "Argument[1].ArrayElement", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management", "DescriptorAccess", True, "setDescriptor", "(Descriptor)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management", "DescriptorAccess", True, "setDescriptor", "(Descriptor)", "", "Argument[this]", "Argument[0]", "taint", "df-generated"]
-      - ["javax.management", "DescriptorRead", True, "getDescriptor", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management", "DynamicMBean", True, "getAttribute", "(String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["javax.management", "DynamicMBean", True, "getAttributes", "(String[])", "", "Argument[0].ArrayElement", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management", "DynamicMBean", True, "getAttributes", "(String[])", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["javax.management", "DynamicMBean", True, "getMBeanInfo", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.management", "DynamicMBean", True, "setAttributes", "(AttributeList)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["javax.management", "ImmutableDescriptor", True, "ImmutableDescriptor", "(Map)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management", "ImmutableDescriptor", True, "ImmutableDescriptor", "(String[])", "", "Argument[0].ArrayElement", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management", "ImmutableDescriptor", True, "ImmutableDescriptor", "(String[],Object[])", "", "Argument[0].ArrayElement", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management", "ImmutableDescriptor", True, "ImmutableDescriptor", "(String[],Object[])", "", "Argument[1].ArrayElement", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management", "ImmutableDescriptor", True, "union", "(Descriptor[])", "", "Argument[0].ArrayElement", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management", "DynamicMBean", True, "setAttributes", "(AttributeList)", "", "Argument[0].Element", "ReturnValue.Element", "value", "dfc-generated"]
+      - ["javax.management", "ImmutableDescriptor", True, "ImmutableDescriptor", "(Map)", "", "Argument[0].MapKey", "Argument[this].SyntheticField[javax.management.ImmutableDescriptor.names].ArrayElement", "value", "dfc-generated"]
+      - ["javax.management", "ImmutableDescriptor", True, "ImmutableDescriptor", "(Map)", "", "Argument[0].MapValue", "Argument[this].SyntheticField[javax.management.ImmutableDescriptor.values].ArrayElement", "value", "dfc-generated"]
+      - ["javax.management", "ImmutableDescriptor", True, "ImmutableDescriptor", "(String[])", "", "Argument[0].ArrayElement", "Argument[this].SyntheticField[javax.management.ImmutableDescriptor.names].ArrayElement", "taint", "dfc-generated"]
+      - ["javax.management", "ImmutableDescriptor", True, "ImmutableDescriptor", "(String[])", "", "Argument[0].ArrayElement", "Argument[this].SyntheticField[javax.management.ImmutableDescriptor.values].ArrayElement", "taint", "dfc-generated"]
+      - ["javax.management", "ImmutableDescriptor", True, "ImmutableDescriptor", "(String[],Object[])", "", "Argument[0].ArrayElement", "Argument[this].SyntheticField[javax.management.ImmutableDescriptor.names].ArrayElement", "value", "dfc-generated"]
+      - ["javax.management", "ImmutableDescriptor", True, "ImmutableDescriptor", "(String[],Object[])", "", "Argument[1].ArrayElement", "Argument[this].SyntheticField[javax.management.ImmutableDescriptor.values].ArrayElement", "value", "dfc-generated"]
+      - ["javax.management", "ImmutableDescriptor", True, "getFieldNames", "()", "", "Argument[this].SyntheticField[javax.management.ImmutableDescriptor.names]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.management", "ImmutableDescriptor", True, "getFieldValue", "(String)", "", "Argument[this].SyntheticField[javax.management.ImmutableDescriptor.values].ArrayElement", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.management", "ImmutableDescriptor", True, "getFieldValues", "(String[])", "", "Argument[this].SyntheticField[javax.management.ImmutableDescriptor.values].ArrayElement", "ReturnValue.ArrayElement", "value", "dfc-generated"]
+      - ["javax.management", "ImmutableDescriptor", True, "getFieldValues", "(String[])", "", "Argument[this].SyntheticField[javax.management.ImmutableDescriptor.values]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.management", "ImmutableDescriptor", True, "getFields", "()", "", "Argument[this].SyntheticField[javax.management.ImmutableDescriptor.names].ArrayElement", "ReturnValue.ArrayElement", "taint", "dfc-generated"]
+      - ["javax.management", "ImmutableDescriptor", True, "getFields", "()", "", "Argument[this].SyntheticField[javax.management.ImmutableDescriptor.values].ArrayElement", "ReturnValue.ArrayElement", "taint", "dfc-generated"]
+      - ["javax.management", "ImmutableDescriptor", True, "union", "(Descriptor[])", "", "Argument[0].ArrayElement", "ReturnValue", "value", "dfc-generated"]
       - ["javax.management", "InstanceAlreadyExistsException", True, "InstanceAlreadyExistsException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["javax.management", "InstanceNotFoundException", True, "InstanceNotFoundException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["javax.management", "IntrospectionException", True, "IntrospectionException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
@@ -63,187 +61,174 @@ extensions:
       - ["javax.management", "ListenerNotFoundException", True, "ListenerNotFoundException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["javax.management", "MBeanAttributeInfo", True, "MBeanAttributeInfo", "(String,String,Method,Method)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["javax.management", "MBeanAttributeInfo", True, "MBeanAttributeInfo", "(String,String,Method,Method)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management", "MBeanAttributeInfo", True, "MBeanAttributeInfo", "(String,String,String,boolean,boolean,boolean)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management", "MBeanAttributeInfo", True, "MBeanAttributeInfo", "(String,String,String,boolean,boolean,boolean)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management", "MBeanAttributeInfo", True, "MBeanAttributeInfo", "(String,String,String,boolean,boolean,boolean)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management", "MBeanAttributeInfo", True, "MBeanAttributeInfo", "(String,String,String,boolean,boolean,boolean,Descriptor)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management", "MBeanAttributeInfo", True, "MBeanAttributeInfo", "(String,String,String,boolean,boolean,boolean,Descriptor)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management", "MBeanAttributeInfo", True, "MBeanAttributeInfo", "(String,String,String,boolean,boolean,boolean,Descriptor)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management", "MBeanAttributeInfo", True, "MBeanAttributeInfo", "(String,String,String,boolean,boolean,boolean,Descriptor)", "", "Argument[6]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management", "MBeanAttributeInfo", True, "getType", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management", "MBeanAttributeInfo", True, "MBeanAttributeInfo", "(String,String,String,boolean,boolean,boolean)", "", "Argument[1]", "Argument[this].SyntheticField[javax.management.MBeanAttributeInfo.attributeType]", "value", "dfc-generated"]
+      - ["javax.management", "MBeanAttributeInfo", True, "MBeanAttributeInfo", "(String,String,String,boolean,boolean,boolean,Descriptor)", "", "Argument[1]", "Argument[this].SyntheticField[javax.management.MBeanAttributeInfo.attributeType]", "value", "dfc-generated"]
+      - ["javax.management", "MBeanAttributeInfo", True, "getType", "()", "", "Argument[this].SyntheticField[javax.management.MBeanAttributeInfo.attributeType]", "ReturnValue", "value", "dfc-generated"]
       - ["javax.management", "MBeanConstructorInfo", True, "MBeanConstructorInfo", "(String,Constructor)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management", "MBeanConstructorInfo", True, "MBeanConstructorInfo", "(String,String,MBeanParameterInfo[])", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management", "MBeanConstructorInfo", True, "MBeanConstructorInfo", "(String,String,MBeanParameterInfo[])", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management", "MBeanConstructorInfo", True, "MBeanConstructorInfo", "(String,String,MBeanParameterInfo[])", "", "Argument[2].ArrayElement", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management", "MBeanConstructorInfo", True, "MBeanConstructorInfo", "(String,String,MBeanParameterInfo[],Descriptor)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management", "MBeanConstructorInfo", True, "MBeanConstructorInfo", "(String,String,MBeanParameterInfo[],Descriptor)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management", "MBeanConstructorInfo", True, "MBeanConstructorInfo", "(String,String,MBeanParameterInfo[],Descriptor)", "", "Argument[2].ArrayElement", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management", "MBeanConstructorInfo", True, "MBeanConstructorInfo", "(String,String,MBeanParameterInfo[],Descriptor)", "", "Argument[3]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management", "MBeanConstructorInfo", True, "getSignature", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.management", "MBeanException", True, "MBeanException", "(Exception)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management", "MBeanException", True, "MBeanException", "(Exception,String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management", "MBeanException", True, "MBeanException", "(Exception,String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management", "MBeanException", True, "getTargetException", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.management", "MBeanFeatureInfo", True, "MBeanFeatureInfo", "(String,String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management", "MBeanFeatureInfo", True, "MBeanFeatureInfo", "(String,String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management", "MBeanFeatureInfo", True, "MBeanFeatureInfo", "(String,String,Descriptor)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management", "MBeanFeatureInfo", True, "MBeanFeatureInfo", "(String,String,Descriptor)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management", "MBeanFeatureInfo", True, "MBeanFeatureInfo", "(String,String,Descriptor)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management", "MBeanFeatureInfo", True, "getDescription", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.management", "MBeanFeatureInfo", True, "getName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.management", "MBeanInfo", True, "MBeanInfo", "(String,String,MBeanAttributeInfo[],MBeanConstructorInfo[],MBeanOperationInfo[],MBeanNotificationInfo[])", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management", "MBeanInfo", True, "MBeanInfo", "(String,String,MBeanAttributeInfo[],MBeanConstructorInfo[],MBeanOperationInfo[],MBeanNotificationInfo[])", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management", "MBeanInfo", True, "MBeanInfo", "(String,String,MBeanAttributeInfo[],MBeanConstructorInfo[],MBeanOperationInfo[],MBeanNotificationInfo[])", "", "Argument[2].ArrayElement", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management", "MBeanInfo", True, "MBeanInfo", "(String,String,MBeanAttributeInfo[],MBeanConstructorInfo[],MBeanOperationInfo[],MBeanNotificationInfo[])", "", "Argument[3].ArrayElement", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management", "MBeanInfo", True, "MBeanInfo", "(String,String,MBeanAttributeInfo[],MBeanConstructorInfo[],MBeanOperationInfo[],MBeanNotificationInfo[])", "", "Argument[4].ArrayElement", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management", "MBeanInfo", True, "MBeanInfo", "(String,String,MBeanAttributeInfo[],MBeanConstructorInfo[],MBeanOperationInfo[],MBeanNotificationInfo[])", "", "Argument[5].ArrayElement", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management", "MBeanInfo", True, "MBeanInfo", "(String,String,MBeanAttributeInfo[],MBeanConstructorInfo[],MBeanOperationInfo[],MBeanNotificationInfo[],Descriptor)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management", "MBeanInfo", True, "MBeanInfo", "(String,String,MBeanAttributeInfo[],MBeanConstructorInfo[],MBeanOperationInfo[],MBeanNotificationInfo[],Descriptor)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management", "MBeanInfo", True, "MBeanInfo", "(String,String,MBeanAttributeInfo[],MBeanConstructorInfo[],MBeanOperationInfo[],MBeanNotificationInfo[],Descriptor)", "", "Argument[2].ArrayElement", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management", "MBeanInfo", True, "MBeanInfo", "(String,String,MBeanAttributeInfo[],MBeanConstructorInfo[],MBeanOperationInfo[],MBeanNotificationInfo[],Descriptor)", "", "Argument[3].ArrayElement", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management", "MBeanInfo", True, "MBeanInfo", "(String,String,MBeanAttributeInfo[],MBeanConstructorInfo[],MBeanOperationInfo[],MBeanNotificationInfo[],Descriptor)", "", "Argument[4].ArrayElement", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management", "MBeanInfo", True, "MBeanInfo", "(String,String,MBeanAttributeInfo[],MBeanConstructorInfo[],MBeanOperationInfo[],MBeanNotificationInfo[],Descriptor)", "", "Argument[5].ArrayElement", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management", "MBeanInfo", True, "MBeanInfo", "(String,String,MBeanAttributeInfo[],MBeanConstructorInfo[],MBeanOperationInfo[],MBeanNotificationInfo[],Descriptor)", "", "Argument[6]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management", "MBeanInfo", True, "getAttributes", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.management", "MBeanInfo", True, "getClassName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.management", "MBeanInfo", True, "getConstructors", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.management", "MBeanInfo", True, "getDescription", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.management", "MBeanInfo", True, "getNotifications", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.management", "MBeanInfo", True, "getOperations", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.management", "MBeanNotificationInfo", True, "MBeanNotificationInfo", "(String[],String,String)", "", "Argument[0].ArrayElement", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management", "MBeanNotificationInfo", True, "MBeanNotificationInfo", "(String[],String,String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management", "MBeanNotificationInfo", True, "MBeanNotificationInfo", "(String[],String,String)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management", "MBeanNotificationInfo", True, "MBeanNotificationInfo", "(String[],String,String,Descriptor)", "", "Argument[0].ArrayElement", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management", "MBeanNotificationInfo", True, "MBeanNotificationInfo", "(String[],String,String,Descriptor)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management", "MBeanNotificationInfo", True, "MBeanNotificationInfo", "(String[],String,String,Descriptor)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management", "MBeanNotificationInfo", True, "MBeanNotificationInfo", "(String[],String,String,Descriptor)", "", "Argument[3]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management", "MBeanNotificationInfo", True, "getNotifTypes", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management", "MBeanConstructorInfo", True, "MBeanConstructorInfo", "(String,String,MBeanParameterInfo[])", "", "Argument[2]", "Argument[this].SyntheticField[javax.management.MBeanConstructorInfo.signature]", "value", "dfc-generated"]
+      - ["javax.management", "MBeanConstructorInfo", True, "MBeanConstructorInfo", "(String,String,MBeanParameterInfo[],Descriptor)", "", "Argument[2]", "Argument[this].SyntheticField[javax.management.MBeanConstructorInfo.signature]", "value", "dfc-generated"]
+      - ["javax.management", "MBeanConstructorInfo", True, "getSignature", "()", "", "Argument[this].SyntheticField[javax.management.MBeanConstructorInfo.signature]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.management", "MBeanException", True, "MBeanException", "(Exception)", "", "Argument[0]", "Argument[this].SyntheticField[javax.management.MBeanException.exception]", "value", "dfc-generated"]
+      - ["javax.management", "MBeanException", True, "MBeanException", "(Exception,String)", "", "Argument[0]", "Argument[this].SyntheticField[javax.management.MBeanException.exception]", "value", "dfc-generated"]
+      - ["javax.management", "MBeanException", True, "getTargetException", "()", "", "Argument[this].SyntheticField[javax.management.MBeanException.exception]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.management", "MBeanFeatureInfo", True, "MBeanFeatureInfo", "(String,String)", "", "Argument[0]", "Argument[this].SyntheticField[javax.management.MBeanFeatureInfo.name]", "value", "dfc-generated"]
+      - ["javax.management", "MBeanFeatureInfo", True, "MBeanFeatureInfo", "(String,String)", "", "Argument[1]", "Argument[this].SyntheticField[javax.management.MBeanFeatureInfo.description]", "value", "dfc-generated"]
+      - ["javax.management", "MBeanFeatureInfo", True, "MBeanFeatureInfo", "(String,String,Descriptor)", "", "Argument[0]", "Argument[this].SyntheticField[javax.management.MBeanFeatureInfo.name]", "value", "dfc-generated"]
+      - ["javax.management", "MBeanFeatureInfo", True, "MBeanFeatureInfo", "(String,String,Descriptor)", "", "Argument[1]", "Argument[this].SyntheticField[javax.management.MBeanFeatureInfo.description]", "value", "dfc-generated"]
+      - ["javax.management", "MBeanFeatureInfo", True, "MBeanFeatureInfo", "(String,String,Descriptor)", "", "Argument[2]", "Argument[this].SyntheticField[javax.management.MBeanFeatureInfo.descriptor]", "value", "dfc-generated"]
+      - ["javax.management", "MBeanFeatureInfo", True, "getDescription", "()", "", "Argument[this].SyntheticField[javax.management.MBeanFeatureInfo.description]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.management", "MBeanFeatureInfo", True, "getDescriptor", "()", "", "Argument[this].SyntheticField[javax.management.MBeanFeatureInfo.descriptor]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.management", "MBeanFeatureInfo", True, "getName", "()", "", "Argument[this].SyntheticField[javax.management.MBeanFeatureInfo.name]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.management", "MBeanInfo", True, "MBeanInfo", "(String,String,MBeanAttributeInfo[],MBeanConstructorInfo[],MBeanOperationInfo[],MBeanNotificationInfo[])", "", "Argument[0]", "Argument[this].SyntheticField[javax.management.MBeanInfo.className]", "value", "dfc-generated"]
+      - ["javax.management", "MBeanInfo", True, "MBeanInfo", "(String,String,MBeanAttributeInfo[],MBeanConstructorInfo[],MBeanOperationInfo[],MBeanNotificationInfo[])", "", "Argument[1]", "Argument[this].SyntheticField[javax.management.MBeanInfo.description]", "value", "dfc-generated"]
+      - ["javax.management", "MBeanInfo", True, "MBeanInfo", "(String,String,MBeanAttributeInfo[],MBeanConstructorInfo[],MBeanOperationInfo[],MBeanNotificationInfo[])", "", "Argument[2]", "Argument[this].SyntheticField[javax.management.MBeanInfo.attributes]", "value", "dfc-generated"]
+      - ["javax.management", "MBeanInfo", True, "MBeanInfo", "(String,String,MBeanAttributeInfo[],MBeanConstructorInfo[],MBeanOperationInfo[],MBeanNotificationInfo[])", "", "Argument[3]", "Argument[this].SyntheticField[javax.management.MBeanInfo.constructors]", "value", "dfc-generated"]
+      - ["javax.management", "MBeanInfo", True, "MBeanInfo", "(String,String,MBeanAttributeInfo[],MBeanConstructorInfo[],MBeanOperationInfo[],MBeanNotificationInfo[])", "", "Argument[4]", "Argument[this].SyntheticField[javax.management.MBeanInfo.operations]", "value", "dfc-generated"]
+      - ["javax.management", "MBeanInfo", True, "MBeanInfo", "(String,String,MBeanAttributeInfo[],MBeanConstructorInfo[],MBeanOperationInfo[],MBeanNotificationInfo[])", "", "Argument[5]", "Argument[this].SyntheticField[javax.management.MBeanInfo.notifications]", "value", "dfc-generated"]
+      - ["javax.management", "MBeanInfo", True, "MBeanInfo", "(String,String,MBeanAttributeInfo[],MBeanConstructorInfo[],MBeanOperationInfo[],MBeanNotificationInfo[],Descriptor)", "", "Argument[0]", "Argument[this].SyntheticField[javax.management.MBeanInfo.className]", "value", "dfc-generated"]
+      - ["javax.management", "MBeanInfo", True, "MBeanInfo", "(String,String,MBeanAttributeInfo[],MBeanConstructorInfo[],MBeanOperationInfo[],MBeanNotificationInfo[],Descriptor)", "", "Argument[1]", "Argument[this].SyntheticField[javax.management.MBeanInfo.description]", "value", "dfc-generated"]
+      - ["javax.management", "MBeanInfo", True, "MBeanInfo", "(String,String,MBeanAttributeInfo[],MBeanConstructorInfo[],MBeanOperationInfo[],MBeanNotificationInfo[],Descriptor)", "", "Argument[2]", "Argument[this].SyntheticField[javax.management.MBeanInfo.attributes]", "value", "dfc-generated"]
+      - ["javax.management", "MBeanInfo", True, "MBeanInfo", "(String,String,MBeanAttributeInfo[],MBeanConstructorInfo[],MBeanOperationInfo[],MBeanNotificationInfo[],Descriptor)", "", "Argument[3]", "Argument[this].SyntheticField[javax.management.MBeanInfo.constructors]", "value", "dfc-generated"]
+      - ["javax.management", "MBeanInfo", True, "MBeanInfo", "(String,String,MBeanAttributeInfo[],MBeanConstructorInfo[],MBeanOperationInfo[],MBeanNotificationInfo[],Descriptor)", "", "Argument[4]", "Argument[this].SyntheticField[javax.management.MBeanInfo.operations]", "value", "dfc-generated"]
+      - ["javax.management", "MBeanInfo", True, "MBeanInfo", "(String,String,MBeanAttributeInfo[],MBeanConstructorInfo[],MBeanOperationInfo[],MBeanNotificationInfo[],Descriptor)", "", "Argument[5]", "Argument[this].SyntheticField[javax.management.MBeanInfo.notifications]", "value", "dfc-generated"]
+      - ["javax.management", "MBeanInfo", True, "MBeanInfo", "(String,String,MBeanAttributeInfo[],MBeanConstructorInfo[],MBeanOperationInfo[],MBeanNotificationInfo[],Descriptor)", "", "Argument[6]", "Argument[this].SyntheticField[javax.management.MBeanInfo.descriptor]", "value", "dfc-generated"]
+      - ["javax.management", "MBeanInfo", True, "getAttributes", "()", "", "Argument[this].SyntheticField[javax.management.MBeanInfo.attributes]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.management", "MBeanInfo", True, "getClassName", "()", "", "Argument[this].SyntheticField[javax.management.MBeanInfo.className]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.management", "MBeanInfo", True, "getConstructors", "()", "", "Argument[this].SyntheticField[javax.management.MBeanInfo.constructors]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.management", "MBeanInfo", True, "getDescription", "()", "", "Argument[this].SyntheticField[javax.management.MBeanInfo.description]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.management", "MBeanInfo", True, "getDescriptor", "()", "", "Argument[this].SyntheticField[javax.management.MBeanInfo.descriptor]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.management", "MBeanInfo", True, "getNotifications", "()", "", "Argument[this].SyntheticField[javax.management.MBeanInfo.notifications]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.management", "MBeanInfo", True, "getOperations", "()", "", "Argument[this].SyntheticField[javax.management.MBeanInfo.operations]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.management", "MBeanNotificationInfo", True, "MBeanNotificationInfo", "(String[],String,String)", "", "Argument[0]", "Argument[this].SyntheticField[javax.management.MBeanNotificationInfo.types]", "value", "dfc-generated"]
+      - ["javax.management", "MBeanNotificationInfo", True, "MBeanNotificationInfo", "(String[],String,String,Descriptor)", "", "Argument[0]", "Argument[this].SyntheticField[javax.management.MBeanNotificationInfo.types]", "value", "dfc-generated"]
+      - ["javax.management", "MBeanNotificationInfo", True, "getNotifTypes", "()", "", "Argument[this].SyntheticField[javax.management.MBeanNotificationInfo.types]", "ReturnValue", "value", "dfc-generated"]
       - ["javax.management", "MBeanOperationInfo", True, "MBeanOperationInfo", "(String,Method)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management", "MBeanOperationInfo", True, "MBeanOperationInfo", "(String,Method)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management", "MBeanOperationInfo", True, "MBeanOperationInfo", "(String,String,MBeanParameterInfo[],String,int)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management", "MBeanOperationInfo", True, "MBeanOperationInfo", "(String,String,MBeanParameterInfo[],String,int)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management", "MBeanOperationInfo", True, "MBeanOperationInfo", "(String,String,MBeanParameterInfo[],String,int)", "", "Argument[2].ArrayElement", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management", "MBeanOperationInfo", True, "MBeanOperationInfo", "(String,String,MBeanParameterInfo[],String,int)", "", "Argument[3]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management", "MBeanOperationInfo", True, "MBeanOperationInfo", "(String,String,MBeanParameterInfo[],String,int,Descriptor)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management", "MBeanOperationInfo", True, "MBeanOperationInfo", "(String,String,MBeanParameterInfo[],String,int,Descriptor)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management", "MBeanOperationInfo", True, "MBeanOperationInfo", "(String,String,MBeanParameterInfo[],String,int,Descriptor)", "", "Argument[2].ArrayElement", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management", "MBeanOperationInfo", True, "MBeanOperationInfo", "(String,String,MBeanParameterInfo[],String,int,Descriptor)", "", "Argument[3]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management", "MBeanOperationInfo", True, "MBeanOperationInfo", "(String,String,MBeanParameterInfo[],String,int,Descriptor)", "", "Argument[5]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management", "MBeanOperationInfo", True, "getReturnType", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.management", "MBeanOperationInfo", True, "getSignature", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.management", "MBeanParameterInfo", True, "MBeanParameterInfo", "(String,String,String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management", "MBeanParameterInfo", True, "MBeanParameterInfo", "(String,String,String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management", "MBeanParameterInfo", True, "MBeanParameterInfo", "(String,String,String)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management", "MBeanParameterInfo", True, "MBeanParameterInfo", "(String,String,String,Descriptor)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management", "MBeanParameterInfo", True, "MBeanParameterInfo", "(String,String,String,Descriptor)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management", "MBeanParameterInfo", True, "MBeanParameterInfo", "(String,String,String,Descriptor)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management", "MBeanParameterInfo", True, "MBeanParameterInfo", "(String,String,String,Descriptor)", "", "Argument[3]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management", "MBeanParameterInfo", True, "getType", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.management", "MBeanPermission", True, "MBeanPermission", "(String,String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management", "MBeanPermission", True, "MBeanPermission", "(String,String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management", "MBeanPermission", True, "MBeanPermission", "(String,String,ObjectName,String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management", "MBeanPermission", True, "MBeanPermission", "(String,String,ObjectName,String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management", "MBeanPermission", True, "MBeanPermission", "(String,String,ObjectName,String)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management", "MBeanPermission", True, "MBeanPermission", "(String,String,ObjectName,String)", "", "Argument[3]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management", "MBeanRegistration", True, "preRegister", "(MBeanServer,ObjectName)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management", "MBeanRegistration", True, "preRegister", "(MBeanServer,ObjectName)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.management", "MBeanRegistration", True, "preRegister", "(MBeanServer,ObjectName)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management", "MBeanRegistration", True, "preRegister", "(MBeanServer,ObjectName)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.management", "MBeanRegistration", True, "preRegister", "(MBeanServer,ObjectName)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management", "MBeanOperationInfo", True, "MBeanOperationInfo", "(String,String,MBeanParameterInfo[],String,int)", "", "Argument[2]", "Argument[this].SyntheticField[javax.management.MBeanOperationInfo.signature]", "value", "dfc-generated"]
+      - ["javax.management", "MBeanOperationInfo", True, "MBeanOperationInfo", "(String,String,MBeanParameterInfo[],String,int)", "", "Argument[3]", "Argument[this].SyntheticField[javax.management.MBeanOperationInfo.type]", "value", "dfc-generated"]
+      - ["javax.management", "MBeanOperationInfo", True, "MBeanOperationInfo", "(String,String,MBeanParameterInfo[],String,int,Descriptor)", "", "Argument[2]", "Argument[this].SyntheticField[javax.management.MBeanOperationInfo.signature]", "value", "dfc-generated"]
+      - ["javax.management", "MBeanOperationInfo", True, "MBeanOperationInfo", "(String,String,MBeanParameterInfo[],String,int,Descriptor)", "", "Argument[3]", "Argument[this].SyntheticField[javax.management.MBeanOperationInfo.type]", "value", "dfc-generated"]
+      - ["javax.management", "MBeanOperationInfo", True, "getReturnType", "()", "", "Argument[this].SyntheticField[javax.management.MBeanOperationInfo.type]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.management", "MBeanOperationInfo", True, "getSignature", "()", "", "Argument[this].SyntheticField[javax.management.MBeanOperationInfo.signature]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.management", "MBeanParameterInfo", True, "MBeanParameterInfo", "(String,String,String)", "", "Argument[1]", "Argument[this].SyntheticField[javax.management.MBeanParameterInfo.type]", "value", "dfc-generated"]
+      - ["javax.management", "MBeanParameterInfo", True, "MBeanParameterInfo", "(String,String,String,Descriptor)", "", "Argument[1]", "Argument[this].SyntheticField[javax.management.MBeanParameterInfo.type]", "value", "dfc-generated"]
+      - ["javax.management", "MBeanParameterInfo", True, "getType", "()", "", "Argument[this].SyntheticField[javax.management.MBeanParameterInfo.type]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.management", "MBeanPermission", True, "MBeanPermission", "(String,String)", "", "Argument[0]", "Argument[this]", "taint", "dfc-generated"]
+      - ["javax.management", "MBeanPermission", True, "MBeanPermission", "(String,String)", "", "Argument[1]", "Argument[this].SyntheticField[javax.management.MBeanPermission.actions]", "value", "dfc-generated"]
+      - ["javax.management", "MBeanPermission", True, "MBeanPermission", "(String,String,ObjectName,String)", "", "Argument[0]", "Argument[this]", "taint", "dfc-generated"]
+      - ["javax.management", "MBeanPermission", True, "MBeanPermission", "(String,String,ObjectName,String)", "", "Argument[1]", "Argument[this]", "taint", "dfc-generated"]
+      - ["javax.management", "MBeanPermission", True, "MBeanPermission", "(String,String,ObjectName,String)", "", "Argument[2].SyntheticField[javax.management.ObjectName._canonicalName]", "Argument[this]", "taint", "dfc-generated"]
+      - ["javax.management", "MBeanPermission", True, "MBeanPermission", "(String,String,ObjectName,String)", "", "Argument[3]", "Argument[this].SyntheticField[javax.management.MBeanPermission.actions]", "value", "dfc-generated"]
+      - ["javax.management", "MBeanPermission", True, "getActions", "()", "", "Argument[this].SyntheticField[javax.management.MBeanPermission.actions]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.management", "MBeanRegistration", True, "preRegister", "(MBeanServer,ObjectName)", "", "Argument[1]", "ReturnValue", "value", "dfc-generated"]
       - ["javax.management", "MBeanRegistrationException", True, "MBeanRegistrationException", "(Exception)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["javax.management", "MBeanRegistrationException", True, "MBeanRegistrationException", "(Exception,String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["javax.management", "MBeanRegistrationException", True, "MBeanRegistrationException", "(Exception,String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management", "MBeanServerBuilder", True, "newMBeanServer", "(String,MBeanServer,MBeanServerDelegate)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.management", "MBeanServerBuilder", True, "newMBeanServer", "(String,MBeanServer,MBeanServerDelegate)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.management", "MBeanServerBuilder", True, "newMBeanServer", "(String,MBeanServer,MBeanServerDelegate)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management", "MBeanServer", True, "deserialize", "(ObjectName,byte[])", "", "Argument[1]", "ReturnValue", "taint", "dfc-generated"]
+      - ["javax.management", "MBeanServer", True, "deserialize", "(String,ObjectName,byte[])", "", "Argument[2]", "ReturnValue", "taint", "dfc-generated"]
+      - ["javax.management", "MBeanServer", True, "deserialize", "(String,byte[])", "", "Argument[1]", "ReturnValue", "taint", "dfc-generated"]
+      - ["javax.management", "MBeanServer", True, "getClassLoaderRepository", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management", "MBeanServer", True, "registerMBean", "(Object,ObjectName)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management", "MBeanServer", True, "registerMBean", "(Object,ObjectName)", "", "Argument[1]", "Argument[0]", "taint", "df-generated"]
+      - ["javax.management", "MBeanServer", True, "registerMBean", "(Object,ObjectName)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management", "MBeanServer", True, "registerMBean", "(Object,ObjectName)", "", "Argument[this]", "Argument[0]", "taint", "df-generated"]
+      - ["javax.management", "MBeanServer", True, "registerMBean", "(Object,ObjectName)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management", "MBeanServerBuilder", True, "newMBeanServer", "(String,MBeanServer,MBeanServerDelegate)", "", "Argument[0]", "ReturnValue.SyntheticField[com.sun.jmx.mbeanserver.JmxMBeanServer.mbsInterceptor].SyntheticField[com.sun.jmx.interceptor.DefaultMBeanServerInterceptor.domain]", "taint", "dfc-generated"]
       - ["javax.management", "MBeanServerConnection", True, "createMBean", "(String,ObjectName)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["javax.management", "MBeanServerConnection", True, "createMBean", "(String,ObjectName)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management", "MBeanServerConnection", True, "createMBean", "(String,ObjectName)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["javax.management", "MBeanServerConnection", True, "createMBean", "(String,ObjectName,ObjectName)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["javax.management", "MBeanServerConnection", True, "createMBean", "(String,ObjectName,ObjectName)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
       - ["javax.management", "MBeanServerConnection", True, "createMBean", "(String,ObjectName,ObjectName)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management", "MBeanServerConnection", True, "createMBean", "(String,ObjectName,ObjectName)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["javax.management", "MBeanServerConnection", True, "createMBean", "(String,ObjectName,ObjectName,Object[],String[])", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["javax.management", "MBeanServerConnection", True, "createMBean", "(String,ObjectName,ObjectName,Object[],String[])", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
       - ["javax.management", "MBeanServerConnection", True, "createMBean", "(String,ObjectName,ObjectName,Object[],String[])", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
       - ["javax.management", "MBeanServerConnection", True, "createMBean", "(String,ObjectName,ObjectName,Object[],String[])", "", "Argument[4].ArrayElement", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management", "MBeanServerConnection", True, "createMBean", "(String,ObjectName,ObjectName,Object[],String[])", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["javax.management", "MBeanServerConnection", True, "createMBean", "(String,ObjectName,Object[],String[])", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["javax.management", "MBeanServerConnection", True, "createMBean", "(String,ObjectName,Object[],String[])", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
       - ["javax.management", "MBeanServerConnection", True, "createMBean", "(String,ObjectName,Object[],String[])", "", "Argument[3].ArrayElement", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management", "MBeanServerConnection", True, "createMBean", "(String,ObjectName,Object[],String[])", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["javax.management", "MBeanServerConnection", True, "getAttribute", "(ObjectName,String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["javax.management", "MBeanServerConnection", True, "getAttribute", "(ObjectName,String)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
       - ["javax.management", "MBeanServerConnection", True, "getAttributes", "(ObjectName,String[])", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["javax.management", "MBeanServerConnection", True, "getAttributes", "(ObjectName,String[])", "", "Argument[1].ArrayElement", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management", "MBeanServerConnection", True, "getDefaultDomain", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management", "MBeanServerConnection", True, "getDomains", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["javax.management", "MBeanServerConnection", True, "getObjectInstance", "(ObjectName)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management", "MBeanServerConnection", True, "getObjectInstance", "(ObjectName)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["javax.management", "MBeanServerConnection", True, "invoke", "(ObjectName,String,Object[],String[])", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["javax.management", "MBeanServerConnection", True, "invoke", "(ObjectName,String,Object[],String[])", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
       - ["javax.management", "MBeanServerConnection", True, "invoke", "(ObjectName,String,Object[],String[])", "", "Argument[3].ArrayElement", "ReturnValue", "taint", "df-generated"]
       - ["javax.management", "MBeanServerConnection", True, "setAttributes", "(ObjectName,AttributeList)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management", "MBeanServerConnection", True, "setAttributes", "(ObjectName,AttributeList)", "", "Argument[1].Element", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management", "MBeanServerConnection", True, "unregisterMBean", "(ObjectName)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["javax.management", "MBeanServerDelegateMBean", True, "getMBeanServerId", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.management", "MBeanServerFactory", True, "createMBeanServer", "(String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management", "MBeanServerFactory", True, "createMBeanServer", "(String)", "", "Argument[0]", "ReturnValue.SyntheticField[com.sun.jmx.mbeanserver.JmxMBeanServer.mbsInterceptor].SyntheticField[com.sun.jmx.interceptor.DefaultMBeanServerInterceptor.domain]", "taint", "dfc-generated"]
       - ["javax.management", "MBeanServerFactory", True, "getClassLoaderRepository", "(MBeanServer)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.management", "MBeanServerFactory", True, "newMBeanServer", "(String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.management", "MBeanServerInvocationHandler", True, "MBeanServerInvocationHandler", "(MBeanServerConnection,ObjectName)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management", "MBeanServerInvocationHandler", True, "MBeanServerInvocationHandler", "(MBeanServerConnection,ObjectName)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management", "MBeanServerInvocationHandler", True, "MBeanServerInvocationHandler", "(MBeanServerConnection,ObjectName,boolean)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management", "MBeanServerInvocationHandler", True, "MBeanServerInvocationHandler", "(MBeanServerConnection,ObjectName,boolean)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management", "MBeanServerInvocationHandler", True, "getMBeanServerConnection", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.management", "MBeanServerInvocationHandler", True, "getObjectName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.management", "MBeanServerNotification", True, "MBeanServerNotification", "(String,Object,long,ObjectName)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management", "MBeanServerNotification", True, "MBeanServerNotification", "(String,Object,long,ObjectName)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management", "MBeanServerNotification", True, "MBeanServerNotification", "(String,Object,long,ObjectName)", "", "Argument[3]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management", "MBeanServerNotification", True, "getMBeanName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.management", "MBeanTrustPermission", True, "MBeanTrustPermission", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management", "MBeanTrustPermission", True, "MBeanTrustPermission", "(String,String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management", "MBeanServerFactory", True, "newMBeanServer", "(String)", "", "Argument[0]", "ReturnValue.SyntheticField[com.sun.jmx.mbeanserver.JmxMBeanServer.mbsInterceptor].SyntheticField[com.sun.jmx.interceptor.DefaultMBeanServerInterceptor.domain]", "taint", "dfc-generated"]
+      - ["javax.management", "MBeanServerInvocationHandler", True, "MBeanServerInvocationHandler", "(MBeanServerConnection,ObjectName)", "", "Argument[0]", "Argument[this].SyntheticField[javax.management.MBeanServerInvocationHandler.connection]", "value", "dfc-generated"]
+      - ["javax.management", "MBeanServerInvocationHandler", True, "MBeanServerInvocationHandler", "(MBeanServerConnection,ObjectName)", "", "Argument[1]", "Argument[this].SyntheticField[javax.management.MBeanServerInvocationHandler.objectName]", "value", "dfc-generated"]
+      - ["javax.management", "MBeanServerInvocationHandler", True, "MBeanServerInvocationHandler", "(MBeanServerConnection,ObjectName,boolean)", "", "Argument[0]", "Argument[this].SyntheticField[javax.management.MBeanServerInvocationHandler.connection]", "value", "dfc-generated"]
+      - ["javax.management", "MBeanServerInvocationHandler", True, "MBeanServerInvocationHandler", "(MBeanServerConnection,ObjectName,boolean)", "", "Argument[1]", "Argument[this].SyntheticField[javax.management.MBeanServerInvocationHandler.objectName]", "value", "dfc-generated"]
+      - ["javax.management", "MBeanServerInvocationHandler", True, "getMBeanServerConnection", "()", "", "Argument[this].SyntheticField[javax.management.MBeanServerInvocationHandler.connection]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.management", "MBeanServerInvocationHandler", True, "getObjectName", "()", "", "Argument[this].SyntheticField[javax.management.MBeanServerInvocationHandler.objectName]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.management", "MBeanServerInvocationHandler", True, "invoke", "(Object,Method,Object[])", "", "Argument[this].SyntheticField[javax.management.MBeanServerInvocationHandler.connection]", "ReturnValue", "taint", "dfc-generated"]
+      - ["javax.management", "MBeanServerInvocationHandler", True, "invoke", "(Object,Method,Object[])", "", "Argument[this].SyntheticField[javax.management.MBeanServerInvocationHandler.objectName]", "ReturnValue", "taint", "dfc-generated"]
+      - ["javax.management", "MBeanServerNotification", True, "MBeanServerNotification", "(String,Object,long,ObjectName)", "", "Argument[3]", "Argument[this].SyntheticField[javax.management.MBeanServerNotification.objectName]", "value", "dfc-generated"]
+      - ["javax.management", "MBeanServerNotification", True, "getMBeanName", "()", "", "Argument[this].SyntheticField[javax.management.MBeanServerNotification.objectName]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.management", "MBeanTrustPermission", True, "MBeanTrustPermission", "(String)", "", "Argument[0]", "Argument[this]", "taint", "dfc-generated"]
+      - ["javax.management", "MBeanTrustPermission", True, "MBeanTrustPermission", "(String,String)", "", "Argument[0]", "Argument[this]", "taint", "dfc-generated"]
       - ["javax.management", "MalformedObjectNameException", True, "MalformedObjectNameException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["javax.management", "NotCompliantMBeanException", True, "NotCompliantMBeanException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management", "Notification", True, "Notification", "(String,Object,long)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management", "Notification", True, "Notification", "(String,Object,long)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management", "Notification", True, "Notification", "(String,Object,long,String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management", "Notification", True, "Notification", "(String,Object,long,String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management", "Notification", True, "Notification", "(String,Object,long,String)", "", "Argument[3]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management", "Notification", True, "Notification", "(String,Object,long,long)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management", "Notification", True, "Notification", "(String,Object,long,long)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management", "Notification", True, "Notification", "(String,Object,long,long,String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management", "Notification", True, "Notification", "(String,Object,long,long,String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management", "Notification", True, "Notification", "(String,Object,long,long,String)", "", "Argument[4]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management", "Notification", True, "getMessage", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.management", "Notification", True, "getType", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.management", "Notification", True, "getUserData", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management", "Notification", True, "Notification", "(String,Object,long)", "", "Argument[0]", "Argument[this].SyntheticField[javax.management.Notification.type]", "value", "dfc-generated"]
+      - ["javax.management", "Notification", True, "Notification", "(String,Object,long,long)", "", "Argument[0]", "Argument[this].SyntheticField[javax.management.Notification.type]", "value", "dfc-generated"]
+      - ["javax.management", "Notification", True, "getType", "()", "", "Argument[this].SyntheticField[javax.management.Notification.type]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.management", "Notification", True, "getUserData", "()", "", "Argument[this].SyntheticField[javax.management.Notification.userData]", "ReturnValue", "value", "dfc-generated"]
       - ["javax.management", "Notification", True, "setSource", "(Object)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management", "Notification", True, "setUserData", "(Object)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management", "Notification", True, "setUserData", "(Object)", "", "Argument[0]", "Argument[this].SyntheticField[javax.management.Notification.userData]", "value", "dfc-generated"]
       - ["javax.management", "NotificationBroadcaster", True, "getNotificationInfo", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["javax.management", "NotificationBroadcasterSupport", True, "NotificationBroadcasterSupport", "(Executor)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management", "NotificationBroadcasterSupport", True, "NotificationBroadcasterSupport", "(Executor,MBeanNotificationInfo[])", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management", "NotificationBroadcasterSupport", True, "NotificationBroadcasterSupport", "(Executor,MBeanNotificationInfo[])", "", "Argument[1].ArrayElement", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management", "NotificationBroadcasterSupport", True, "NotificationBroadcasterSupport", "(MBeanNotificationInfo[])", "", "Argument[0].ArrayElement", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management", "NotificationFilterSupport", True, "enableType", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management", "NotificationFilterSupport", True, "getEnabledTypes", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management", "NotificationBroadcasterSupport", True, "NotificationBroadcasterSupport", "(Executor,MBeanNotificationInfo[])", "", "Argument[1]", "Argument[this].SyntheticField[javax.management.NotificationBroadcasterSupport.notifInfo]", "value", "dfc-generated"]
+      - ["javax.management", "NotificationBroadcasterSupport", True, "NotificationBroadcasterSupport", "(MBeanNotificationInfo[])", "", "Argument[0]", "Argument[this].SyntheticField[javax.management.NotificationBroadcasterSupport.notifInfo]", "value", "dfc-generated"]
+      - ["javax.management", "NotificationBroadcasterSupport", True, "getNotificationInfo", "()", "", "Argument[this].SyntheticField[javax.management.NotificationBroadcasterSupport.notifInfo]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.management", "NotificationFilterSupport", True, "enableType", "(String)", "", "Argument[0]", "Argument[this].SyntheticField[javax.management.NotificationFilterSupport.enabledTypes].Element", "value", "dfc-generated"]
+      - ["javax.management", "NotificationFilterSupport", True, "getEnabledTypes", "()", "", "Argument[this].SyntheticField[javax.management.NotificationFilterSupport.enabledTypes]", "ReturnValue", "value", "dfc-generated"]
       - ["javax.management", "NotificationListener", True, "handleNotification", "(Notification,Object)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management", "ObjectInstance", True, "ObjectInstance", "(ObjectName,String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management", "ObjectInstance", True, "ObjectInstance", "(ObjectName,String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management", "ObjectInstance", True, "ObjectInstance", "(String,String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management", "ObjectInstance", True, "ObjectInstance", "(String,String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management", "ObjectInstance", True, "getClassName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.management", "ObjectInstance", True, "getObjectName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.management", "ObjectName", True, "ObjectName", "(String,Hashtable)", "", "Argument[1].Element", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management", "ObjectName", True, "ObjectName", "(String,String,String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management", "ObjectName", True, "ObjectName", "(String,String,String)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management", "ObjectName", True, "getCanonicalKeyPropertyListString", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.management", "ObjectName", True, "getCanonicalName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.management", "ObjectName", True, "getDomain", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.management", "ObjectName", True, "getInstance", "(ObjectName)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.management", "ObjectName", True, "getInstance", "(String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.management", "ObjectName", True, "getInstance", "(String,Hashtable)", "", "Argument[1].Element", "ReturnValue", "taint", "df-generated"]
-      - ["javax.management", "ObjectName", True, "getInstance", "(String,String,String)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.management", "ObjectName", True, "getInstance", "(String,String,String)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.management", "ObjectName", True, "getKeyProperty", "(String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management", "NotificationListener", True, "handleNotification", "(Notification,Object)", "", "Argument[this]", "Argument[0]", "taint", "df-generated"]
+      - ["javax.management", "ObjectInstance", True, "ObjectInstance", "(ObjectName,String)", "", "Argument[0]", "Argument[this].SyntheticField[javax.management.ObjectInstance.name]", "value", "dfc-generated"]
+      - ["javax.management", "ObjectInstance", True, "ObjectInstance", "(ObjectName,String)", "", "Argument[1]", "Argument[this].SyntheticField[javax.management.ObjectInstance.className]", "value", "dfc-generated"]
+      - ["javax.management", "ObjectInstance", True, "ObjectInstance", "(String,String)", "", "Argument[0]", "Argument[this].SyntheticField[javax.management.ObjectInstance.name]", "taint", "dfc-generated"]
+      - ["javax.management", "ObjectInstance", True, "ObjectInstance", "(String,String)", "", "Argument[1]", "Argument[this].SyntheticField[javax.management.ObjectInstance.className]", "value", "dfc-generated"]
+      - ["javax.management", "ObjectInstance", True, "getClassName", "()", "", "Argument[this].SyntheticField[javax.management.ObjectInstance.className]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.management", "ObjectInstance", True, "getObjectName", "()", "", "Argument[this].SyntheticField[javax.management.ObjectInstance.name]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.management", "ObjectName", True, "ObjectName", "(String,Hashtable)", "", "Argument[0]", "Argument[this].SyntheticField[javax.management.ObjectName._canonicalName]", "taint", "dfc-generated"]
+      - ["javax.management", "ObjectName", True, "ObjectName", "(String,Hashtable)", "", "Argument[1].MapKey", "Argument[this].SyntheticField[javax.management.ObjectName._canonicalName]", "taint", "dfc-generated"]
+      - ["javax.management", "ObjectName", True, "ObjectName", "(String,Hashtable)", "", "Argument[1].MapValue", "Argument[this].SyntheticField[javax.management.ObjectName._canonicalName]", "taint", "dfc-generated"]
+      - ["javax.management", "ObjectName", True, "ObjectName", "(String,String,String)", "", "Argument[0]", "Argument[this].SyntheticField[javax.management.ObjectName._canonicalName]", "taint", "dfc-generated"]
+      - ["javax.management", "ObjectName", True, "ObjectName", "(String,String,String)", "", "Argument[1]", "Argument[this].SyntheticField[javax.management.ObjectName._canonicalName]", "taint", "dfc-generated"]
+      - ["javax.management", "ObjectName", True, "ObjectName", "(String,String,String)", "", "Argument[2]", "Argument[this].SyntheticField[javax.management.ObjectName._canonicalName]", "taint", "dfc-generated"]
+      - ["javax.management", "ObjectName", True, "getCanonicalKeyPropertyListString", "()", "", "Argument[this].SyntheticField[javax.management.ObjectName._canonicalName]", "ReturnValue", "taint", "dfc-generated"]
+      - ["javax.management", "ObjectName", True, "getCanonicalName", "()", "", "Argument[this].SyntheticField[javax.management.ObjectName._canonicalName]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.management", "ObjectName", True, "getDomain", "()", "", "Argument[this].SyntheticField[javax.management.ObjectName._canonicalName]", "ReturnValue", "taint", "dfc-generated"]
+      - ["javax.management", "ObjectName", True, "getInstance", "(ObjectName)", "", "Argument[0].SyntheticField[javax.management.ObjectName._canonicalName]", "ReturnValue", "taint", "dfc-generated"]
+      - ["javax.management", "ObjectName", True, "getInstance", "(ObjectName)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.management", "ObjectName", True, "getInstance", "(String)", "", "Argument[0]", "ReturnValue", "taint", "dfc-generated"]
+      - ["javax.management", "ObjectName", True, "getInstance", "(String,Hashtable)", "", "Argument[0]", "ReturnValue.SyntheticField[javax.management.ObjectName._canonicalName]", "taint", "dfc-generated"]
+      - ["javax.management", "ObjectName", True, "getInstance", "(String,Hashtable)", "", "Argument[1].MapKey", "ReturnValue.SyntheticField[javax.management.ObjectName._canonicalName]", "taint", "dfc-generated"]
+      - ["javax.management", "ObjectName", True, "getInstance", "(String,Hashtable)", "", "Argument[1].MapValue", "ReturnValue.SyntheticField[javax.management.ObjectName._canonicalName]", "taint", "dfc-generated"]
+      - ["javax.management", "ObjectName", True, "getInstance", "(String,String,String)", "", "Argument[0]", "ReturnValue.SyntheticField[javax.management.ObjectName._canonicalName]", "taint", "dfc-generated"]
+      - ["javax.management", "ObjectName", True, "getInstance", "(String,String,String)", "", "Argument[1]", "ReturnValue.SyntheticField[javax.management.ObjectName._canonicalName]", "taint", "dfc-generated"]
+      - ["javax.management", "ObjectName", True, "getInstance", "(String,String,String)", "", "Argument[2]", "ReturnValue.SyntheticField[javax.management.ObjectName._canonicalName]", "taint", "dfc-generated"]
+      - ["javax.management", "ObjectName", True, "getKeyProperty", "(String)", "", "Argument[this].SyntheticField[javax.management.ObjectName._canonicalName]", "ReturnValue", "taint", "dfc-generated"]
       - ["javax.management", "ObjectName", True, "getKeyPropertyList", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.management", "ObjectName", True, "getKeyPropertyListString", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management", "ObjectName", True, "getKeyPropertyListString", "()", "", "Argument[this].SyntheticField[javax.management.ObjectName._canonicalName]", "ReturnValue", "taint", "dfc-generated"]
       - ["javax.management", "OperationsException", True, "OperationsException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["javax.management", "Query", True, "and", "(QueryExp,QueryExp)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["javax.management", "Query", True, "and", "(QueryExp,QueryExp)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
       - ["javax.management", "Query", True, "anySubString", "(AttributeValueExp,StringValueExp)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["javax.management", "Query", True, "anySubString", "(AttributeValueExp,StringValueExp)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.management", "Query", True, "attr", "(String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management", "Query", True, "attr", "(String)", "", "Argument[0]", "ReturnValue.SyntheticField[javax.management.AttributeValueExp.attr]", "value", "dfc-generated"]
       - ["javax.management", "Query", True, "attr", "(String,String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["javax.management", "Query", True, "attr", "(String,String)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
       - ["javax.management", "Query", True, "between", "(ValueExp,ValueExp,ValueExp)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
@@ -279,51 +264,47 @@ extensions:
       - ["javax.management", "Query", True, "plus", "(ValueExp,ValueExp)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
       - ["javax.management", "Query", True, "times", "(ValueExp,ValueExp)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["javax.management", "Query", True, "times", "(ValueExp,ValueExp)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.management", "Query", True, "value", "(String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.management", "ReflectionException", True, "ReflectionException", "(Exception)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management", "ReflectionException", True, "ReflectionException", "(Exception,String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management", "ReflectionException", True, "ReflectionException", "(Exception,String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management", "ReflectionException", True, "getTargetException", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.management", "RuntimeErrorException", True, "RuntimeErrorException", "(Error)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management", "RuntimeErrorException", True, "RuntimeErrorException", "(Error,String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management", "RuntimeErrorException", True, "RuntimeErrorException", "(Error,String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management", "RuntimeErrorException", True, "getTargetError", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.management", "RuntimeMBeanException", True, "RuntimeMBeanException", "(RuntimeException)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management", "RuntimeMBeanException", True, "RuntimeMBeanException", "(RuntimeException,String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management", "RuntimeMBeanException", True, "RuntimeMBeanException", "(RuntimeException,String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management", "RuntimeMBeanException", True, "getTargetException", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.management", "RuntimeOperationsException", True, "RuntimeOperationsException", "(RuntimeException)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management", "RuntimeOperationsException", True, "RuntimeOperationsException", "(RuntimeException,String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management", "RuntimeOperationsException", True, "RuntimeOperationsException", "(RuntimeException,String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management", "RuntimeOperationsException", True, "getTargetException", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management", "Query", True, "value", "(String)", "", "Argument[0]", "ReturnValue.SyntheticField[javax.management.StringValueExp.val]", "value", "dfc-generated"]
+      - ["javax.management", "ReflectionException", True, "ReflectionException", "(Exception)", "", "Argument[0]", "Argument[this].SyntheticField[javax.management.ReflectionException.exception]", "value", "dfc-generated"]
+      - ["javax.management", "ReflectionException", True, "ReflectionException", "(Exception,String)", "", "Argument[0]", "Argument[this].SyntheticField[javax.management.ReflectionException.exception]", "value", "dfc-generated"]
+      - ["javax.management", "ReflectionException", True, "getTargetException", "()", "", "Argument[this].SyntheticField[javax.management.ReflectionException.exception]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.management", "RuntimeErrorException", True, "RuntimeErrorException", "(Error)", "", "Argument[0]", "Argument[this].SyntheticField[javax.management.RuntimeErrorException.error]", "value", "dfc-generated"]
+      - ["javax.management", "RuntimeErrorException", True, "RuntimeErrorException", "(Error,String)", "", "Argument[0]", "Argument[this].SyntheticField[javax.management.RuntimeErrorException.error]", "value", "dfc-generated"]
+      - ["javax.management", "RuntimeErrorException", True, "getTargetError", "()", "", "Argument[this].SyntheticField[javax.management.RuntimeErrorException.error]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.management", "RuntimeMBeanException", True, "RuntimeMBeanException", "(RuntimeException)", "", "Argument[0]", "Argument[this].SyntheticField[javax.management.RuntimeMBeanException.runtimeException]", "value", "dfc-generated"]
+      - ["javax.management", "RuntimeMBeanException", True, "RuntimeMBeanException", "(RuntimeException,String)", "", "Argument[0]", "Argument[this].SyntheticField[javax.management.RuntimeMBeanException.runtimeException]", "value", "dfc-generated"]
+      - ["javax.management", "RuntimeMBeanException", True, "getTargetException", "()", "", "Argument[this].SyntheticField[javax.management.RuntimeMBeanException.runtimeException]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.management", "RuntimeOperationsException", True, "RuntimeOperationsException", "(RuntimeException)", "", "Argument[0]", "Argument[this].SyntheticField[javax.management.RuntimeOperationsException.runtimeException]", "value", "dfc-generated"]
+      - ["javax.management", "RuntimeOperationsException", True, "RuntimeOperationsException", "(RuntimeException,String)", "", "Argument[0]", "Argument[this].SyntheticField[javax.management.RuntimeOperationsException.runtimeException]", "value", "dfc-generated"]
+      - ["javax.management", "RuntimeOperationsException", True, "getTargetException", "()", "", "Argument[this].SyntheticField[javax.management.RuntimeOperationsException.runtimeException]", "ReturnValue", "value", "dfc-generated"]
       - ["javax.management", "ServiceNotFoundException", True, "ServiceNotFoundException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["javax.management", "StandardEmitterMBean", True, "StandardEmitterMBean", "(Object,Class,NotificationEmitter)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["javax.management", "StandardEmitterMBean", True, "StandardEmitterMBean", "(Object,Class,NotificationEmitter)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
       - ["javax.management", "StandardEmitterMBean", True, "StandardEmitterMBean", "(Object,Class,boolean,NotificationEmitter)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["javax.management", "StandardEmitterMBean", True, "StandardEmitterMBean", "(Object,Class,boolean,NotificationEmitter)", "", "Argument[3]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management", "StandardMBean", True, "StandardMBean", "(Object,Class)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management", "StandardMBean", True, "StandardMBean", "(Object,Class,boolean)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management", "StandardMBean", True, "getImplementation", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.management", "StandardMBean", True, "setImplementation", "(Object)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management", "StringValueExp", True, "StringValueExp", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management", "StringValueExp", True, "getValue", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.management", "ValueExp", True, "apply", "(ObjectName)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.management", "ValueExp", True, "apply", "(ObjectName)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["javax.management", "StandardMBean", True, "StandardMBean", "(Object,Class)", "", "Argument[0]", "Argument[this].SyntheticField[javax.management.StandardMBean.mbean].SyntheticField[com.sun.jmx.mbeanserver.MBeanSupport.resource]", "value", "dfc-generated"]
+      - ["javax.management", "StandardMBean", True, "StandardMBean", "(Object,Class,boolean)", "", "Argument[0]", "Argument[this].SyntheticField[javax.management.StandardMBean.mbean].SyntheticField[com.sun.jmx.mbeanserver.MBeanSupport.resource]", "value", "dfc-generated"]
+      - ["javax.management", "StandardMBean", True, "getImplementation", "()", "", "Argument[this].SyntheticField[javax.management.StandardMBean.mbean].SyntheticField[com.sun.jmx.mbeanserver.MBeanSupport.resource]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.management", "StandardMBean", True, "setImplementation", "(Object)", "", "Argument[0]", "Argument[this].SyntheticField[javax.management.StandardMBean.mbean].SyntheticField[com.sun.jmx.mbeanserver.MBeanSupport.resource]", "value", "dfc-generated"]
+      - ["javax.management", "StringValueExp", True, "StringValueExp", "(String)", "", "Argument[0]", "Argument[this].SyntheticField[javax.management.StringValueExp.val]", "value", "dfc-generated"]
+      - ["javax.management", "StringValueExp", True, "getValue", "()", "", "Argument[this].SyntheticField[javax.management.StringValueExp.val]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.management", "ValueExp", True, "apply", "(ObjectName)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
   - addsTo:
       pack: codeql/java-all
       extensible: neutralModel
     data:
       - ["javax.management", "AttributeChangeNotificationFilter", "disableAllAttributes", "()", "summary", "df-generated"]
       - ["javax.management", "AttributeChangeNotificationFilter", "disableAttribute", "(String)", "summary", "df-generated"]
+      - ["javax.management", "AttributeChangeNotificationFilter", "isNotificationEnabled", "(Notification)", "summary", "df-generated"]
       - ["javax.management", "AttributeList", "AttributeList", "(int)", "summary", "df-generated"]
       - ["javax.management", "AttributeList", "addAll", "(int,AttributeList)", "summary", "df-generated"]
+      - ["javax.management", "AttributeValueExp", "setMBeanServer", "(MBeanServer)", "summary", "df-generated"]
       - ["javax.management", "DefaultLoaderRepository", "loadClass", "(String)", "summary", "df-generated"]
       - ["javax.management", "DefaultLoaderRepository", "loadClassWithout", "(ClassLoader,String)", "summary", "df-generated"]
-      - ["javax.management", "Descriptor", "isValid", "()", "summary", "df-generated"]
-      - ["javax.management", "Descriptor", "removeField", "(String)", "summary", "df-generated"]
-      - ["javax.management", "DynamicMBean", "getAttribute", "(String)", "summary", "df-generated"]
-      - ["javax.management", "DynamicMBean", "invoke", "(String,Object[],String[])", "summary", "df-generated"]
-      - ["javax.management", "DynamicMBean", "setAttribute", "(Attribute)", "summary", "df-generated"]
+      - ["javax.management", "ImmutableDescriptor", "isValid", "()", "summary", "df-generated"]
+      - ["javax.management", "ImmutableDescriptor", "removeField", "(String)", "summary", "df-generated"]
+      - ["javax.management", "ImmutableDescriptor", "setField", "(String,Object)", "summary", "df-generated"]
+      - ["javax.management", "ImmutableDescriptor", "setFields", "(String[],Object[])", "summary", "df-generated"]
       - ["javax.management", "JMX", "isMXBeanInterface", "(Class)", "summary", "df-generated"]
       - ["javax.management", "JMX", "newMBeanProxy", "(MBeanServerConnection,ObjectName,Class)", "summary", "df-generated"]
       - ["javax.management", "JMX", "newMBeanProxy", "(MBeanServerConnection,ObjectName,Class,boolean)", "summary", "df-generated"]
@@ -333,36 +314,18 @@ extensions:
       - ["javax.management", "MBeanAttributeInfo", "isReadable", "()", "summary", "df-generated"]
       - ["javax.management", "MBeanAttributeInfo", "isWritable", "()", "summary", "df-generated"]
       - ["javax.management", "MBeanOperationInfo", "getImpact", "()", "summary", "df-generated"]
-      - ["javax.management", "MBeanRegistration", "postDeregister", "()", "summary", "df-generated"]
-      - ["javax.management", "MBeanRegistration", "postRegister", "(Boolean)", "summary", "df-generated"]
-      - ["javax.management", "MBeanRegistration", "preDeregister", "()", "summary", "df-generated"]
-      - ["javax.management", "MBeanServer", "deserialize", "(ObjectName,byte[])", "summary", "df-generated"]
-      - ["javax.management", "MBeanServer", "deserialize", "(String,ObjectName,byte[])", "summary", "df-generated"]
-      - ["javax.management", "MBeanServer", "deserialize", "(String,byte[])", "summary", "df-generated"]
+      - ["javax.management", "MBeanPermission", "implies", "(Permission)", "summary", "df-generated"]
       - ["javax.management", "MBeanServerBuilder", "newMBeanServerDelegate", "()", "summary", "df-generated"]
-      - ["javax.management", "MBeanServerConnection", "addNotificationListener", "(ObjectName,NotificationListener,NotificationFilter,Object)", "summary", "df-generated"]
-      - ["javax.management", "MBeanServerConnection", "addNotificationListener", "(ObjectName,ObjectName,NotificationFilter,Object)", "summary", "df-generated"]
-      - ["javax.management", "MBeanServerConnection", "getDefaultDomain", "()", "summary", "df-generated"]
-      - ["javax.management", "MBeanServerConnection", "getDomains", "()", "summary", "df-generated"]
-      - ["javax.management", "MBeanServerConnection", "getMBeanCount", "()", "summary", "df-generated"]
-      - ["javax.management", "MBeanServerConnection", "getMBeanInfo", "(ObjectName)", "summary", "df-generated"]
-      - ["javax.management", "MBeanServerConnection", "isInstanceOf", "(ObjectName,String)", "summary", "df-generated"]
-      - ["javax.management", "MBeanServerConnection", "isRegistered", "(ObjectName)", "summary", "df-generated"]
-      - ["javax.management", "MBeanServerConnection", "queryMBeans", "(ObjectName,QueryExp)", "summary", "df-generated"]
-      - ["javax.management", "MBeanServerConnection", "queryNames", "(ObjectName,QueryExp)", "summary", "df-generated"]
-      - ["javax.management", "MBeanServerConnection", "removeNotificationListener", "(ObjectName,NotificationListener)", "summary", "df-generated"]
-      - ["javax.management", "MBeanServerConnection", "removeNotificationListener", "(ObjectName,NotificationListener,NotificationFilter,Object)", "summary", "df-generated"]
-      - ["javax.management", "MBeanServerConnection", "removeNotificationListener", "(ObjectName,ObjectName)", "summary", "df-generated"]
-      - ["javax.management", "MBeanServerConnection", "removeNotificationListener", "(ObjectName,ObjectName,NotificationFilter,Object)", "summary", "df-generated"]
-      - ["javax.management", "MBeanServerConnection", "setAttribute", "(ObjectName,Attribute)", "summary", "df-generated"]
-      - ["javax.management", "MBeanServerConnection", "unregisterMBean", "(ObjectName)", "summary", "df-generated"]
+      - ["javax.management", "MBeanServerDelegate", "addNotificationListener", "(NotificationListener,NotificationFilter,Object)", "summary", "df-generated"]
+      - ["javax.management", "MBeanServerDelegate", "getImplementationName", "()", "summary", "df-generated"]
+      - ["javax.management", "MBeanServerDelegate", "getImplementationVendor", "()", "summary", "df-generated"]
+      - ["javax.management", "MBeanServerDelegate", "getImplementationVersion", "()", "summary", "df-generated"]
+      - ["javax.management", "MBeanServerDelegate", "getSpecificationName", "()", "summary", "df-generated"]
+      - ["javax.management", "MBeanServerDelegate", "getSpecificationVendor", "()", "summary", "df-generated"]
+      - ["javax.management", "MBeanServerDelegate", "getSpecificationVersion", "()", "summary", "df-generated"]
+      - ["javax.management", "MBeanServerDelegate", "removeNotificationListener", "(NotificationListener)", "summary", "df-generated"]
+      - ["javax.management", "MBeanServerDelegate", "removeNotificationListener", "(NotificationListener,NotificationFilter,Object)", "summary", "df-generated"]
       - ["javax.management", "MBeanServerDelegate", "sendNotification", "(Notification)", "summary", "df-generated"]
-      - ["javax.management", "MBeanServerDelegateMBean", "getImplementationName", "()", "summary", "df-generated"]
-      - ["javax.management", "MBeanServerDelegateMBean", "getImplementationVendor", "()", "summary", "df-generated"]
-      - ["javax.management", "MBeanServerDelegateMBean", "getImplementationVersion", "()", "summary", "df-generated"]
-      - ["javax.management", "MBeanServerDelegateMBean", "getSpecificationName", "()", "summary", "df-generated"]
-      - ["javax.management", "MBeanServerDelegateMBean", "getSpecificationVendor", "()", "summary", "df-generated"]
-      - ["javax.management", "MBeanServerDelegateMBean", "getSpecificationVersion", "()", "summary", "df-generated"]
       - ["javax.management", "MBeanServerFactory", "createMBeanServer", "()", "summary", "df-generated"]
       - ["javax.management", "MBeanServerFactory", "findMBeanServer", "(String)", "summary", "df-generated"]
       - ["javax.management", "MBeanServerFactory", "newMBeanServer", "()", "summary", "df-generated"]
@@ -371,17 +334,20 @@ extensions:
       - ["javax.management", "MBeanServerInvocationHandler", "newProxyInstance", "(MBeanServerConnection,ObjectName,Class,boolean)", "summary", "df-generated"]
       - ["javax.management", "MBeanServerPermission", "MBeanServerPermission", "(String)", "summary", "df-generated"]
       - ["javax.management", "MBeanServerPermission", "MBeanServerPermission", "(String,String)", "summary", "df-generated"]
+      - ["javax.management", "MBeanServerPermission", "implies", "(Permission)", "summary", "df-generated"]
+      - ["javax.management", "MBeanServerPermission", "newPermissionCollection", "()", "summary", "df-generated"]
       - ["javax.management", "Notification", "getSequenceNumber", "()", "summary", "df-generated"]
       - ["javax.management", "Notification", "getTimeStamp", "()", "summary", "df-generated"]
       - ["javax.management", "Notification", "setSequenceNumber", "(long)", "summary", "df-generated"]
       - ["javax.management", "Notification", "setTimeStamp", "(long)", "summary", "df-generated"]
-      - ["javax.management", "NotificationBroadcaster", "addNotificationListener", "(NotificationListener,NotificationFilter,Object)", "summary", "df-generated"]
-      - ["javax.management", "NotificationBroadcaster", "removeNotificationListener", "(NotificationListener)", "summary", "df-generated"]
+      - ["javax.management", "NotificationBroadcasterSupport", "addNotificationListener", "(NotificationListener,NotificationFilter,Object)", "summary", "df-generated"]
+      - ["javax.management", "NotificationBroadcasterSupport", "removeNotificationListener", "(NotificationListener)", "summary", "df-generated"]
+      - ["javax.management", "NotificationBroadcasterSupport", "removeNotificationListener", "(NotificationListener,NotificationFilter,Object)", "summary", "df-generated"]
       - ["javax.management", "NotificationBroadcasterSupport", "sendNotification", "(Notification)", "summary", "df-generated"]
-      - ["javax.management", "NotificationEmitter", "removeNotificationListener", "(NotificationListener,NotificationFilter,Object)", "summary", "df-generated"]
-      - ["javax.management", "NotificationFilter", "isNotificationEnabled", "(Notification)", "summary", "df-generated"]
       - ["javax.management", "NotificationFilterSupport", "disableAllTypes", "()", "summary", "df-generated"]
       - ["javax.management", "NotificationFilterSupport", "disableType", "(String)", "summary", "df-generated"]
+      - ["javax.management", "NotificationFilterSupport", "isNotificationEnabled", "(Notification)", "summary", "df-generated"]
+      - ["javax.management", "ObjectName", "apply", "(ObjectName)", "summary", "df-generated"]
       - ["javax.management", "ObjectName", "isDomainPattern", "()", "summary", "df-generated"]
       - ["javax.management", "ObjectName", "isPattern", "()", "summary", "df-generated"]
       - ["javax.management", "ObjectName", "isPropertyListPattern", "()", "summary", "df-generated"]
@@ -389,9 +355,8 @@ extensions:
       - ["javax.management", "ObjectName", "isPropertyValuePattern", "()", "summary", "df-generated"]
       - ["javax.management", "ObjectName", "isPropertyValuePattern", "(String)", "summary", "df-generated"]
       - ["javax.management", "ObjectName", "quote", "(String)", "summary", "df-generated"]
+      - ["javax.management", "ObjectName", "setMBeanServer", "(MBeanServer)", "summary", "df-generated"]
       - ["javax.management", "ObjectName", "unquote", "(String)", "summary", "df-generated"]
-      - ["javax.management", "PersistentMBean", "load", "()", "summary", "df-generated"]
-      - ["javax.management", "PersistentMBean", "store", "()", "summary", "df-generated"]
       - ["javax.management", "Query", "classattr", "()", "summary", "df-generated"]
       - ["javax.management", "Query", "value", "(Number)", "summary", "df-generated"]
       - ["javax.management", "Query", "value", "(boolean)", "summary", "df-generated"]
@@ -401,9 +366,15 @@ extensions:
       - ["javax.management", "Query", "value", "(long)", "summary", "df-generated"]
       - ["javax.management", "QueryEval", "getMBeanServer", "()", "summary", "df-generated"]
       - ["javax.management", "QueryEval", "setMBeanServer", "(MBeanServer)", "summary", "df-generated"]
-      - ["javax.management", "QueryExp", "apply", "(ObjectName)", "summary", "df-generated"]
-      - ["javax.management", "QueryExp", "setMBeanServer", "(MBeanServer)", "summary", "df-generated"]
+      - ["javax.management", "StandardEmitterMBean", "addNotificationListener", "(NotificationListener,NotificationFilter,Object)", "summary", "df-generated"]
+      - ["javax.management", "StandardEmitterMBean", "removeNotificationListener", "(NotificationListener)", "summary", "df-generated"]
+      - ["javax.management", "StandardEmitterMBean", "removeNotificationListener", "(NotificationListener,NotificationFilter,Object)", "summary", "df-generated"]
       - ["javax.management", "StandardEmitterMBean", "sendNotification", "(Notification)", "summary", "df-generated"]
       - ["javax.management", "StandardMBean", "getImplementationClass", "()", "summary", "df-generated"]
       - ["javax.management", "StandardMBean", "getMBeanInterface", "()", "summary", "df-generated"]
-      - ["javax.management", "ValueExp", "setMBeanServer", "(MBeanServer)", "summary", "df-generated"]
+      - ["javax.management", "StandardMBean", "invoke", "(String,Object[],String[])", "summary", "df-generated"]
+      - ["javax.management", "StandardMBean", "postDeregister", "()", "summary", "df-generated"]
+      - ["javax.management", "StandardMBean", "postRegister", "(Boolean)", "summary", "df-generated"]
+      - ["javax.management", "StandardMBean", "preDeregister", "()", "summary", "df-generated"]
+      - ["javax.management", "StandardMBean", "setAttribute", "(Attribute)", "summary", "df-generated"]
+      - ["javax.management", "StringValueExp", "setMBeanServer", "(MBeanServer)", "summary", "df-generated"]
diff --git a/java/ql/lib/ext/generated/javax.management.modelmbean.model.yml b/java/ql/lib/ext/generated/javax.management.modelmbean.model.yml
index 9bf6223b24a..97200fb5268 100644
--- a/java/ql/lib/ext/generated/javax.management.modelmbean.model.yml
+++ b/java/ql/lib/ext/generated/javax.management.modelmbean.model.yml
@@ -4,12 +4,24 @@ extensions:
       pack: codeql/java-all
       extensible: summaryModel
     data:
-      - ["javax.management.modelmbean", "DescriptorSupport", True, "DescriptorSupport", "(DescriptorSupport)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management.modelmbean", "DescriptorSupport", True, "DescriptorSupport", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management.modelmbean", "DescriptorSupport", True, "DescriptorSupport", "(String[])", "", "Argument[0].ArrayElement", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management.modelmbean", "DescriptorSupport", True, "DescriptorSupport", "(String[],Object[])", "", "Argument[0].ArrayElement", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management.modelmbean", "DescriptorSupport", True, "DescriptorSupport", "(String[],Object[])", "", "Argument[1].ArrayElement", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management.modelmbean", "DescriptorSupport", True, "toXMLString", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management.modelmbean", "DescriptorSupport", True, "DescriptorSupport", "(DescriptorSupport)", "", "Argument[0].SyntheticField[javax.management.modelmbean.DescriptorSupport.descriptorMap].MapKey", "Argument[this].SyntheticField[javax.management.modelmbean.DescriptorSupport.descriptorMap].MapKey", "value", "dfc-generated"]
+      - ["javax.management.modelmbean", "DescriptorSupport", True, "DescriptorSupport", "(DescriptorSupport)", "", "Argument[0].SyntheticField[javax.management.modelmbean.DescriptorSupport.descriptorMap].MapValue", "Argument[this].SyntheticField[javax.management.modelmbean.DescriptorSupport.descriptorMap].MapValue", "value", "dfc-generated"]
+      - ["javax.management.modelmbean", "DescriptorSupport", True, "DescriptorSupport", "(String)", "", "Argument[0]", "Argument[this].SyntheticField[javax.management.modelmbean.DescriptorSupport.descriptorMap].MapKey", "taint", "dfc-generated"]
+      - ["javax.management.modelmbean", "DescriptorSupport", True, "DescriptorSupport", "(String[])", "", "Argument[0].ArrayElement", "Argument[this].SyntheticField[javax.management.modelmbean.DescriptorSupport.descriptorMap].MapKey", "taint", "dfc-generated"]
+      - ["javax.management.modelmbean", "DescriptorSupport", True, "DescriptorSupport", "(String[])", "", "Argument[0].ArrayElement", "Argument[this].SyntheticField[javax.management.modelmbean.DescriptorSupport.descriptorMap].MapValue", "taint", "dfc-generated"]
+      - ["javax.management.modelmbean", "DescriptorSupport", True, "DescriptorSupport", "(String[],Object[])", "", "Argument[0].ArrayElement", "Argument[this].SyntheticField[javax.management.modelmbean.DescriptorSupport.descriptorMap].MapKey", "value", "dfc-generated"]
+      - ["javax.management.modelmbean", "DescriptorSupport", True, "DescriptorSupport", "(String[],Object[])", "", "Argument[1].ArrayElement", "Argument[this].SyntheticField[javax.management.modelmbean.DescriptorSupport.descriptorMap].MapValue", "value", "dfc-generated"]
+      - ["javax.management.modelmbean", "DescriptorSupport", True, "getFieldNames", "()", "", "Argument[this].SyntheticField[javax.management.modelmbean.DescriptorSupport.descriptorMap].MapKey", "ReturnValue.ArrayElement", "value", "dfc-generated"]
+      - ["javax.management.modelmbean", "DescriptorSupport", True, "getFieldValue", "(String)", "", "Argument[this].SyntheticField[javax.management.modelmbean.DescriptorSupport.descriptorMap].MapValue", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.management.modelmbean", "DescriptorSupport", True, "getFieldValues", "(String[])", "", "Argument[this].SyntheticField[javax.management.modelmbean.DescriptorSupport.descriptorMap].MapValue", "ReturnValue.ArrayElement", "value", "dfc-generated"]
+      - ["javax.management.modelmbean", "DescriptorSupport", True, "getFields", "()", "", "Argument[this].SyntheticField[javax.management.modelmbean.DescriptorSupport.descriptorMap].MapKey", "ReturnValue.ArrayElement", "taint", "dfc-generated"]
+      - ["javax.management.modelmbean", "DescriptorSupport", True, "getFields", "()", "", "Argument[this].SyntheticField[javax.management.modelmbean.DescriptorSupport.descriptorMap].MapValue", "ReturnValue.ArrayElement", "taint", "dfc-generated"]
+      - ["javax.management.modelmbean", "DescriptorSupport", True, "setField", "(String,Object)", "", "Argument[0]", "Argument[this].SyntheticField[javax.management.modelmbean.DescriptorSupport.descriptorMap].MapKey", "value", "dfc-generated"]
+      - ["javax.management.modelmbean", "DescriptorSupport", True, "setField", "(String,Object)", "", "Argument[1]", "Argument[this].SyntheticField[javax.management.modelmbean.DescriptorSupport.descriptorMap].MapValue", "value", "dfc-generated"]
+      - ["javax.management.modelmbean", "DescriptorSupport", True, "setFields", "(String[],Object[])", "", "Argument[0].ArrayElement", "Argument[this].SyntheticField[javax.management.modelmbean.DescriptorSupport.descriptorMap].MapKey", "value", "dfc-generated"]
+      - ["javax.management.modelmbean", "DescriptorSupport", True, "setFields", "(String[],Object[])", "", "Argument[1].ArrayElement", "Argument[this].SyntheticField[javax.management.modelmbean.DescriptorSupport.descriptorMap].MapValue", "value", "dfc-generated"]
+      - ["javax.management.modelmbean", "DescriptorSupport", True, "toXMLString", "()", "", "Argument[this].SyntheticField[javax.management.modelmbean.DescriptorSupport.descriptorMap].MapKey", "ReturnValue", "taint", "dfc-generated"]
+      - ["javax.management.modelmbean", "DescriptorSupport", True, "toXMLString", "()", "", "Argument[this].SyntheticField[javax.management.modelmbean.DescriptorSupport.descriptorMap].MapValue", "ReturnValue", "taint", "dfc-generated"]
       - ["javax.management.modelmbean", "InvalidTargetObjectTypeException", True, "InvalidTargetObjectTypeException", "(Exception,String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["javax.management.modelmbean", "InvalidTargetObjectTypeException", True, "InvalidTargetObjectTypeException", "(Exception,String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
       - ["javax.management.modelmbean", "InvalidTargetObjectTypeException", True, "InvalidTargetObjectTypeException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
@@ -18,84 +30,60 @@ extensions:
       - ["javax.management.modelmbean", "ModelMBeanAttributeInfo", True, "ModelMBeanAttributeInfo", "(ModelMBeanAttributeInfo)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["javax.management.modelmbean", "ModelMBeanAttributeInfo", True, "ModelMBeanAttributeInfo", "(String,String,Method,Method)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["javax.management.modelmbean", "ModelMBeanAttributeInfo", True, "ModelMBeanAttributeInfo", "(String,String,Method,Method)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management.modelmbean", "ModelMBeanAttributeInfo", True, "ModelMBeanAttributeInfo", "(String,String,Method,Method,Descriptor)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management.modelmbean", "ModelMBeanAttributeInfo", True, "ModelMBeanAttributeInfo", "(String,String,Method,Method,Descriptor)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management.modelmbean", "ModelMBeanAttributeInfo", True, "ModelMBeanAttributeInfo", "(String,String,Method,Method,Descriptor)", "", "Argument[4]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management.modelmbean", "ModelMBeanAttributeInfo", True, "ModelMBeanAttributeInfo", "(String,String,Method,Method,Descriptor)", "", "Argument[this]", "Argument[4]", "taint", "df-generated"]
+      - ["javax.management.modelmbean", "ModelMBeanAttributeInfo", True, "ModelMBeanAttributeInfo", "(String,String,Method,Method,Descriptor)", "", "Argument[4]", "Argument[this].SyntheticField[javax.management.modelmbean.ModelMBeanAttributeInfo.attrDescriptor]", "value", "dfc-generated"]
       - ["javax.management.modelmbean", "ModelMBeanAttributeInfo", True, "ModelMBeanAttributeInfo", "(String,String,String,boolean,boolean,boolean)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["javax.management.modelmbean", "ModelMBeanAttributeInfo", True, "ModelMBeanAttributeInfo", "(String,String,String,boolean,boolean,boolean)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
       - ["javax.management.modelmbean", "ModelMBeanAttributeInfo", True, "ModelMBeanAttributeInfo", "(String,String,String,boolean,boolean,boolean)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management.modelmbean", "ModelMBeanAttributeInfo", True, "ModelMBeanAttributeInfo", "(String,String,String,boolean,boolean,boolean,Descriptor)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management.modelmbean", "ModelMBeanAttributeInfo", True, "ModelMBeanAttributeInfo", "(String,String,String,boolean,boolean,boolean,Descriptor)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management.modelmbean", "ModelMBeanAttributeInfo", True, "ModelMBeanAttributeInfo", "(String,String,String,boolean,boolean,boolean,Descriptor)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management.modelmbean", "ModelMBeanAttributeInfo", True, "ModelMBeanAttributeInfo", "(String,String,String,boolean,boolean,boolean,Descriptor)", "", "Argument[6]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management.modelmbean", "ModelMBeanAttributeInfo", True, "ModelMBeanAttributeInfo", "(String,String,String,boolean,boolean,boolean,Descriptor)", "", "Argument[this]", "Argument[6]", "taint", "df-generated"]
+      - ["javax.management.modelmbean", "ModelMBeanAttributeInfo", True, "ModelMBeanAttributeInfo", "(String,String,String,boolean,boolean,boolean,Descriptor)", "", "Argument[6]", "Argument[this].SyntheticField[javax.management.modelmbean.ModelMBeanAttributeInfo.attrDescriptor]", "value", "dfc-generated"]
+      - ["javax.management.modelmbean", "ModelMBeanAttributeInfo", True, "getDescriptor", "()", "", "Argument[this].SyntheticField[javax.management.modelmbean.ModelMBeanAttributeInfo.attrDescriptor]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.management.modelmbean", "ModelMBeanAttributeInfo", True, "setDescriptor", "(Descriptor)", "", "Argument[0]", "Argument[this].SyntheticField[javax.management.modelmbean.ModelMBeanAttributeInfo.attrDescriptor]", "value", "dfc-generated"]
       - ["javax.management.modelmbean", "ModelMBeanConstructorInfo", True, "ModelMBeanConstructorInfo", "(String,Constructor)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management.modelmbean", "ModelMBeanConstructorInfo", True, "ModelMBeanConstructorInfo", "(String,Constructor,Descriptor)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management.modelmbean", "ModelMBeanConstructorInfo", True, "ModelMBeanConstructorInfo", "(String,Constructor,Descriptor)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management.modelmbean", "ModelMBeanConstructorInfo", True, "ModelMBeanConstructorInfo", "(String,Constructor,Descriptor)", "", "Argument[this]", "Argument[2]", "taint", "df-generated"]
+      - ["javax.management.modelmbean", "ModelMBeanConstructorInfo", True, "ModelMBeanConstructorInfo", "(String,Constructor,Descriptor)", "", "Argument[2]", "Argument[this].SyntheticField[javax.management.modelmbean.ModelMBeanConstructorInfo.consDescriptor]", "value", "dfc-generated"]
       - ["javax.management.modelmbean", "ModelMBeanConstructorInfo", True, "ModelMBeanConstructorInfo", "(String,String,MBeanParameterInfo[])", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["javax.management.modelmbean", "ModelMBeanConstructorInfo", True, "ModelMBeanConstructorInfo", "(String,String,MBeanParameterInfo[])", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
       - ["javax.management.modelmbean", "ModelMBeanConstructorInfo", True, "ModelMBeanConstructorInfo", "(String,String,MBeanParameterInfo[])", "", "Argument[2].ArrayElement", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management.modelmbean", "ModelMBeanConstructorInfo", True, "ModelMBeanConstructorInfo", "(String,String,MBeanParameterInfo[],Descriptor)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management.modelmbean", "ModelMBeanConstructorInfo", True, "ModelMBeanConstructorInfo", "(String,String,MBeanParameterInfo[],Descriptor)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management.modelmbean", "ModelMBeanConstructorInfo", True, "ModelMBeanConstructorInfo", "(String,String,MBeanParameterInfo[],Descriptor)", "", "Argument[2].ArrayElement", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management.modelmbean", "ModelMBeanConstructorInfo", True, "ModelMBeanConstructorInfo", "(String,String,MBeanParameterInfo[],Descriptor)", "", "Argument[3]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management.modelmbean", "ModelMBeanConstructorInfo", True, "ModelMBeanConstructorInfo", "(String,String,MBeanParameterInfo[],Descriptor)", "", "Argument[this]", "Argument[3]", "taint", "df-generated"]
-      - ["javax.management.modelmbean", "ModelMBeanInfo", True, "getAttribute", "(String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.management.modelmbean", "ModelMBeanInfo", True, "getDescriptor", "(String,String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.management.modelmbean", "ModelMBeanInfo", True, "getDescriptors", "(String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.management.modelmbean", "ModelMBeanInfo", True, "getMBeanDescriptor", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.management.modelmbean", "ModelMBeanInfo", True, "getNotification", "(String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.management.modelmbean", "ModelMBeanInfo", True, "getOperation", "(String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.management.modelmbean", "ModelMBeanInfo", True, "setDescriptor", "(Descriptor,String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management.modelmbean", "ModelMBeanInfo", True, "setDescriptor", "(Descriptor,String)", "", "Argument[this]", "Argument[0]", "taint", "df-generated"]
-      - ["javax.management.modelmbean", "ModelMBeanInfo", True, "setDescriptors", "(Descriptor[])", "", "Argument[0].ArrayElement", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management.modelmbean", "ModelMBeanInfo", True, "setMBeanDescriptor", "(Descriptor)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management.modelmbean", "ModelMBeanInfo", True, "setMBeanDescriptor", "(Descriptor)", "", "Argument[this]", "Argument[0]", "taint", "df-generated"]
+      - ["javax.management.modelmbean", "ModelMBeanConstructorInfo", True, "ModelMBeanConstructorInfo", "(String,String,MBeanParameterInfo[],Descriptor)", "", "Argument[3]", "Argument[this].SyntheticField[javax.management.modelmbean.ModelMBeanConstructorInfo.consDescriptor]", "value", "dfc-generated"]
+      - ["javax.management.modelmbean", "ModelMBeanConstructorInfo", True, "getDescriptor", "()", "", "Argument[this].SyntheticField[javax.management.modelmbean.ModelMBeanConstructorInfo.consDescriptor]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.management.modelmbean", "ModelMBeanConstructorInfo", True, "setDescriptor", "(Descriptor)", "", "Argument[0]", "Argument[this].SyntheticField[javax.management.modelmbean.ModelMBeanConstructorInfo.consDescriptor]", "value", "dfc-generated"]
       - ["javax.management.modelmbean", "ModelMBeanInfoSupport", True, "ModelMBeanInfoSupport", "(ModelMBeanInfo)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management.modelmbean", "ModelMBeanInfoSupport", True, "ModelMBeanInfoSupport", "(String,String,ModelMBeanAttributeInfo[],ModelMBeanConstructorInfo[],ModelMBeanOperationInfo[],ModelMBeanNotificationInfo[])", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management.modelmbean", "ModelMBeanInfoSupport", True, "ModelMBeanInfoSupport", "(String,String,ModelMBeanAttributeInfo[],ModelMBeanConstructorInfo[],ModelMBeanOperationInfo[],ModelMBeanNotificationInfo[])", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management.modelmbean", "ModelMBeanInfoSupport", True, "ModelMBeanInfoSupport", "(String,String,ModelMBeanAttributeInfo[],ModelMBeanConstructorInfo[],ModelMBeanOperationInfo[],ModelMBeanNotificationInfo[])", "", "Argument[2].ArrayElement", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management.modelmbean", "ModelMBeanInfoSupport", True, "ModelMBeanInfoSupport", "(String,String,ModelMBeanAttributeInfo[],ModelMBeanConstructorInfo[],ModelMBeanOperationInfo[],ModelMBeanNotificationInfo[])", "", "Argument[3].ArrayElement", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management.modelmbean", "ModelMBeanInfoSupport", True, "ModelMBeanInfoSupport", "(String,String,ModelMBeanAttributeInfo[],ModelMBeanConstructorInfo[],ModelMBeanOperationInfo[],ModelMBeanNotificationInfo[])", "", "Argument[4].ArrayElement", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management.modelmbean", "ModelMBeanInfoSupport", True, "ModelMBeanInfoSupport", "(String,String,ModelMBeanAttributeInfo[],ModelMBeanConstructorInfo[],ModelMBeanOperationInfo[],ModelMBeanNotificationInfo[])", "", "Argument[5].ArrayElement", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management.modelmbean", "ModelMBeanInfoSupport", True, "ModelMBeanInfoSupport", "(String,String,ModelMBeanAttributeInfo[],ModelMBeanConstructorInfo[],ModelMBeanOperationInfo[],ModelMBeanNotificationInfo[],Descriptor)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management.modelmbean", "ModelMBeanInfoSupport", True, "ModelMBeanInfoSupport", "(String,String,ModelMBeanAttributeInfo[],ModelMBeanConstructorInfo[],ModelMBeanOperationInfo[],ModelMBeanNotificationInfo[],Descriptor)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management.modelmbean", "ModelMBeanInfoSupport", True, "ModelMBeanInfoSupport", "(String,String,ModelMBeanAttributeInfo[],ModelMBeanConstructorInfo[],ModelMBeanOperationInfo[],ModelMBeanNotificationInfo[],Descriptor)", "", "Argument[2].ArrayElement", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management.modelmbean", "ModelMBeanInfoSupport", True, "ModelMBeanInfoSupport", "(String,String,ModelMBeanAttributeInfo[],ModelMBeanConstructorInfo[],ModelMBeanOperationInfo[],ModelMBeanNotificationInfo[],Descriptor)", "", "Argument[3].ArrayElement", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management.modelmbean", "ModelMBeanInfoSupport", True, "ModelMBeanInfoSupport", "(String,String,ModelMBeanAttributeInfo[],ModelMBeanConstructorInfo[],ModelMBeanOperationInfo[],ModelMBeanNotificationInfo[],Descriptor)", "", "Argument[4].ArrayElement", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management.modelmbean", "ModelMBeanInfoSupport", True, "ModelMBeanInfoSupport", "(String,String,ModelMBeanAttributeInfo[],ModelMBeanConstructorInfo[],ModelMBeanOperationInfo[],ModelMBeanNotificationInfo[],Descriptor)", "", "Argument[5].ArrayElement", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management.modelmbean", "ModelMBeanInfoSupport", True, "ModelMBeanInfoSupport", "(String,String,ModelMBeanAttributeInfo[],ModelMBeanConstructorInfo[],ModelMBeanOperationInfo[],ModelMBeanNotificationInfo[],Descriptor)", "", "Argument[6]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management.modelmbean", "ModelMBeanInfoSupport", True, "ModelMBeanInfoSupport", "(String,String,ModelMBeanAttributeInfo[],ModelMBeanConstructorInfo[],ModelMBeanOperationInfo[],ModelMBeanNotificationInfo[],Descriptor)", "", "Argument[this]", "Argument[6]", "taint", "df-generated"]
-      - ["javax.management.modelmbean", "ModelMBeanInfoSupport", True, "getConstructor", "(String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.management.modelmbean", "ModelMBeanInfoSupport", True, "getDescriptor", "(String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management.modelmbean", "ModelMBeanInfoSupport", True, "ModelMBeanInfoSupport", "(String,String,ModelMBeanAttributeInfo[],ModelMBeanConstructorInfo[],ModelMBeanOperationInfo[],ModelMBeanNotificationInfo[])", "", "Argument[2]", "Argument[this].SyntheticField[javax.management.modelmbean.ModelMBeanInfoSupport.modelMBeanAttributes]", "value", "dfc-generated"]
+      - ["javax.management.modelmbean", "ModelMBeanInfoSupport", True, "ModelMBeanInfoSupport", "(String,String,ModelMBeanAttributeInfo[],ModelMBeanConstructorInfo[],ModelMBeanOperationInfo[],ModelMBeanNotificationInfo[])", "", "Argument[3]", "Argument[this].SyntheticField[javax.management.modelmbean.ModelMBeanInfoSupport.modelMBeanConstructors]", "value", "dfc-generated"]
+      - ["javax.management.modelmbean", "ModelMBeanInfoSupport", True, "ModelMBeanInfoSupport", "(String,String,ModelMBeanAttributeInfo[],ModelMBeanConstructorInfo[],ModelMBeanOperationInfo[],ModelMBeanNotificationInfo[])", "", "Argument[4]", "Argument[this].SyntheticField[javax.management.modelmbean.ModelMBeanInfoSupport.modelMBeanOperations]", "value", "dfc-generated"]
+      - ["javax.management.modelmbean", "ModelMBeanInfoSupport", True, "ModelMBeanInfoSupport", "(String,String,ModelMBeanAttributeInfo[],ModelMBeanConstructorInfo[],ModelMBeanOperationInfo[],ModelMBeanNotificationInfo[])", "", "Argument[5]", "Argument[this].SyntheticField[javax.management.modelmbean.ModelMBeanInfoSupport.modelMBeanNotifications]", "value", "dfc-generated"]
+      - ["javax.management.modelmbean", "ModelMBeanInfoSupport", True, "ModelMBeanInfoSupport", "(String,String,ModelMBeanAttributeInfo[],ModelMBeanConstructorInfo[],ModelMBeanOperationInfo[],ModelMBeanNotificationInfo[],Descriptor)", "", "Argument[2]", "Argument[this].SyntheticField[javax.management.modelmbean.ModelMBeanInfoSupport.modelMBeanAttributes]", "value", "dfc-generated"]
+      - ["javax.management.modelmbean", "ModelMBeanInfoSupport", True, "ModelMBeanInfoSupport", "(String,String,ModelMBeanAttributeInfo[],ModelMBeanConstructorInfo[],ModelMBeanOperationInfo[],ModelMBeanNotificationInfo[],Descriptor)", "", "Argument[3]", "Argument[this].SyntheticField[javax.management.modelmbean.ModelMBeanInfoSupport.modelMBeanConstructors]", "value", "dfc-generated"]
+      - ["javax.management.modelmbean", "ModelMBeanInfoSupport", True, "ModelMBeanInfoSupport", "(String,String,ModelMBeanAttributeInfo[],ModelMBeanConstructorInfo[],ModelMBeanOperationInfo[],ModelMBeanNotificationInfo[],Descriptor)", "", "Argument[4]", "Argument[this].SyntheticField[javax.management.modelmbean.ModelMBeanInfoSupport.modelMBeanOperations]", "value", "dfc-generated"]
+      - ["javax.management.modelmbean", "ModelMBeanInfoSupport", True, "ModelMBeanInfoSupport", "(String,String,ModelMBeanAttributeInfo[],ModelMBeanConstructorInfo[],ModelMBeanOperationInfo[],ModelMBeanNotificationInfo[],Descriptor)", "", "Argument[5]", "Argument[this].SyntheticField[javax.management.modelmbean.ModelMBeanInfoSupport.modelMBeanNotifications]", "value", "dfc-generated"]
+      - ["javax.management.modelmbean", "ModelMBeanInfoSupport", True, "ModelMBeanInfoSupport", "(String,String,ModelMBeanAttributeInfo[],ModelMBeanConstructorInfo[],ModelMBeanOperationInfo[],ModelMBeanNotificationInfo[],Descriptor)", "", "Argument[6]", "Argument[this].SyntheticField[javax.management.modelmbean.ModelMBeanInfoSupport.modelMBeanDescriptor]", "value", "dfc-generated"]
+      - ["javax.management.modelmbean", "ModelMBeanInfoSupport", True, "getAttribute", "(String)", "", "Argument[this].SyntheticField[javax.management.modelmbean.ModelMBeanInfoSupport.modelMBeanAttributes].ArrayElement", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.management.modelmbean", "ModelMBeanInfoSupport", True, "getConstructor", "(String)", "", "Argument[this].SyntheticField[javax.management.modelmbean.ModelMBeanInfoSupport.modelMBeanConstructors].ArrayElement", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.management.modelmbean", "ModelMBeanInfoSupport", True, "getDescriptor", "()", "", "Argument[this].SyntheticField[javax.management.modelmbean.ModelMBeanInfoSupport.modelMBeanDescriptor]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.management.modelmbean", "ModelMBeanInfoSupport", True, "getDescriptor", "(String)", "", "Argument[this].SyntheticField[javax.management.modelmbean.ModelMBeanInfoSupport.modelMBeanDescriptor]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.management.modelmbean", "ModelMBeanInfoSupport", True, "getDescriptor", "(String,String)", "", "Argument[this].SyntheticField[javax.management.modelmbean.ModelMBeanInfoSupport.modelMBeanDescriptor]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.management.modelmbean", "ModelMBeanInfoSupport", True, "getDescriptors", "(String)", "", "Argument[this].SyntheticField[javax.management.modelmbean.ModelMBeanInfoSupport.modelMBeanDescriptor]", "ReturnValue.ArrayElement", "value", "dfc-generated"]
+      - ["javax.management.modelmbean", "ModelMBeanInfoSupport", True, "getMBeanDescriptor", "()", "", "Argument[this].SyntheticField[javax.management.modelmbean.ModelMBeanInfoSupport.modelMBeanDescriptor]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.management.modelmbean", "ModelMBeanInfoSupport", True, "getNotification", "(String)", "", "Argument[this].SyntheticField[javax.management.modelmbean.ModelMBeanInfoSupport.modelMBeanNotifications].ArrayElement", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.management.modelmbean", "ModelMBeanInfoSupport", True, "getOperation", "(String)", "", "Argument[this].SyntheticField[javax.management.modelmbean.ModelMBeanInfoSupport.modelMBeanOperations].ArrayElement", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.management.modelmbean", "ModelMBeanInfoSupport", True, "setDescriptor", "(Descriptor,String)", "", "Argument[0]", "Argument[this].SyntheticField[javax.management.modelmbean.ModelMBeanInfoSupport.modelMBeanDescriptor]", "value", "dfc-generated"]
+      - ["javax.management.modelmbean", "ModelMBeanInfoSupport", True, "setDescriptors", "(Descriptor[])", "", "Argument[0].ArrayElement", "Argument[this].SyntheticField[javax.management.modelmbean.ModelMBeanInfoSupport.modelMBeanDescriptor]", "value", "dfc-generated"]
+      - ["javax.management.modelmbean", "ModelMBeanInfoSupport", True, "setMBeanDescriptor", "(Descriptor)", "", "Argument[0]", "Argument[this].SyntheticField[javax.management.modelmbean.ModelMBeanInfoSupport.modelMBeanDescriptor]", "value", "dfc-generated"]
       - ["javax.management.modelmbean", "ModelMBeanNotificationInfo", True, "ModelMBeanNotificationInfo", "(ModelMBeanNotificationInfo)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["javax.management.modelmbean", "ModelMBeanNotificationInfo", True, "ModelMBeanNotificationInfo", "(String[],String,String)", "", "Argument[0].ArrayElement", "Argument[this]", "taint", "df-generated"]
       - ["javax.management.modelmbean", "ModelMBeanNotificationInfo", True, "ModelMBeanNotificationInfo", "(String[],String,String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
       - ["javax.management.modelmbean", "ModelMBeanNotificationInfo", True, "ModelMBeanNotificationInfo", "(String[],String,String)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management.modelmbean", "ModelMBeanNotificationInfo", True, "ModelMBeanNotificationInfo", "(String[],String,String,Descriptor)", "", "Argument[0].ArrayElement", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management.modelmbean", "ModelMBeanNotificationInfo", True, "ModelMBeanNotificationInfo", "(String[],String,String,Descriptor)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management.modelmbean", "ModelMBeanNotificationInfo", True, "ModelMBeanNotificationInfo", "(String[],String,String,Descriptor)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management.modelmbean", "ModelMBeanNotificationInfo", True, "ModelMBeanNotificationInfo", "(String[],String,String,Descriptor)", "", "Argument[3]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management.modelmbean", "ModelMBeanNotificationInfo", True, "ModelMBeanNotificationInfo", "(String[],String,String,Descriptor)", "", "Argument[this]", "Argument[3]", "taint", "df-generated"]
+      - ["javax.management.modelmbean", "ModelMBeanNotificationInfo", True, "ModelMBeanNotificationInfo", "(String[],String,String,Descriptor)", "", "Argument[3]", "Argument[this].SyntheticField[javax.management.modelmbean.ModelMBeanNotificationInfo.notificationDescriptor]", "value", "dfc-generated"]
+      - ["javax.management.modelmbean", "ModelMBeanNotificationInfo", True, "getDescriptor", "()", "", "Argument[this].SyntheticField[javax.management.modelmbean.ModelMBeanNotificationInfo.notificationDescriptor]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.management.modelmbean", "ModelMBeanNotificationInfo", True, "setDescriptor", "(Descriptor)", "", "Argument[0]", "Argument[this].SyntheticField[javax.management.modelmbean.ModelMBeanNotificationInfo.notificationDescriptor]", "value", "dfc-generated"]
       - ["javax.management.modelmbean", "ModelMBeanOperationInfo", True, "ModelMBeanOperationInfo", "(ModelMBeanOperationInfo)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["javax.management.modelmbean", "ModelMBeanOperationInfo", True, "ModelMBeanOperationInfo", "(String,Method)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management.modelmbean", "ModelMBeanOperationInfo", True, "ModelMBeanOperationInfo", "(String,Method)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management.modelmbean", "ModelMBeanOperationInfo", True, "ModelMBeanOperationInfo", "(String,Method,Descriptor)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management.modelmbean", "ModelMBeanOperationInfo", True, "ModelMBeanOperationInfo", "(String,Method,Descriptor)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management.modelmbean", "ModelMBeanOperationInfo", True, "ModelMBeanOperationInfo", "(String,Method,Descriptor)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management.modelmbean", "ModelMBeanOperationInfo", True, "ModelMBeanOperationInfo", "(String,Method,Descriptor)", "", "Argument[this]", "Argument[2]", "taint", "df-generated"]
+      - ["javax.management.modelmbean", "ModelMBeanOperationInfo", True, "ModelMBeanOperationInfo", "(String,Method,Descriptor)", "", "Argument[2]", "Argument[this].SyntheticField[javax.management.modelmbean.ModelMBeanOperationInfo.operationDescriptor]", "value", "dfc-generated"]
       - ["javax.management.modelmbean", "ModelMBeanOperationInfo", True, "ModelMBeanOperationInfo", "(String,String,MBeanParameterInfo[],String,int)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["javax.management.modelmbean", "ModelMBeanOperationInfo", True, "ModelMBeanOperationInfo", "(String,String,MBeanParameterInfo[],String,int)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
       - ["javax.management.modelmbean", "ModelMBeanOperationInfo", True, "ModelMBeanOperationInfo", "(String,String,MBeanParameterInfo[],String,int)", "", "Argument[2].ArrayElement", "Argument[this]", "taint", "df-generated"]
       - ["javax.management.modelmbean", "ModelMBeanOperationInfo", True, "ModelMBeanOperationInfo", "(String,String,MBeanParameterInfo[],String,int)", "", "Argument[3]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management.modelmbean", "ModelMBeanOperationInfo", True, "ModelMBeanOperationInfo", "(String,String,MBeanParameterInfo[],String,int,Descriptor)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management.modelmbean", "ModelMBeanOperationInfo", True, "ModelMBeanOperationInfo", "(String,String,MBeanParameterInfo[],String,int,Descriptor)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management.modelmbean", "ModelMBeanOperationInfo", True, "ModelMBeanOperationInfo", "(String,String,MBeanParameterInfo[],String,int,Descriptor)", "", "Argument[2].ArrayElement", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management.modelmbean", "ModelMBeanOperationInfo", True, "ModelMBeanOperationInfo", "(String,String,MBeanParameterInfo[],String,int,Descriptor)", "", "Argument[3]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management.modelmbean", "ModelMBeanOperationInfo", True, "ModelMBeanOperationInfo", "(String,String,MBeanParameterInfo[],String,int,Descriptor)", "", "Argument[5]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management.modelmbean", "ModelMBeanOperationInfo", True, "ModelMBeanOperationInfo", "(String,String,MBeanParameterInfo[],String,int,Descriptor)", "", "Argument[this]", "Argument[5]", "taint", "df-generated"]
+      - ["javax.management.modelmbean", "ModelMBeanOperationInfo", True, "ModelMBeanOperationInfo", "(String,String,MBeanParameterInfo[],String,int,Descriptor)", "", "Argument[5]", "Argument[this].SyntheticField[javax.management.modelmbean.ModelMBeanOperationInfo.operationDescriptor]", "value", "dfc-generated"]
+      - ["javax.management.modelmbean", "ModelMBeanOperationInfo", True, "getDescriptor", "()", "", "Argument[this].SyntheticField[javax.management.modelmbean.ModelMBeanOperationInfo.operationDescriptor]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.management.modelmbean", "ModelMBeanOperationInfo", True, "setDescriptor", "(Descriptor)", "", "Argument[0]", "Argument[this].SyntheticField[javax.management.modelmbean.ModelMBeanOperationInfo.operationDescriptor]", "value", "dfc-generated"]
       - ["javax.management.modelmbean", "RequiredModelMBean", True, "RequiredModelMBean", "(ModelMBeanInfo)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["javax.management.modelmbean", "XMLParseException", True, "XMLParseException", "(Exception,String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["javax.management.modelmbean", "XMLParseException", True, "XMLParseException", "(Exception,String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
@@ -105,9 +93,21 @@ extensions:
       extensible: neutralModel
     data:
       - ["javax.management.modelmbean", "DescriptorSupport", "DescriptorSupport", "(int)", "summary", "df-generated"]
-      - ["javax.management.modelmbean", "ModelMBeanNotificationBroadcaster", "addAttributeChangeNotificationListener", "(NotificationListener,String,Object)", "summary", "df-generated"]
-      - ["javax.management.modelmbean", "ModelMBeanNotificationBroadcaster", "removeAttributeChangeNotificationListener", "(NotificationListener,String)", "summary", "df-generated"]
-      - ["javax.management.modelmbean", "ModelMBeanNotificationBroadcaster", "sendAttributeChangeNotification", "(Attribute,Attribute)", "summary", "df-generated"]
-      - ["javax.management.modelmbean", "ModelMBeanNotificationBroadcaster", "sendAttributeChangeNotification", "(AttributeChangeNotification)", "summary", "df-generated"]
-      - ["javax.management.modelmbean", "ModelMBeanNotificationBroadcaster", "sendNotification", "(Notification)", "summary", "df-generated"]
-      - ["javax.management.modelmbean", "ModelMBeanNotificationBroadcaster", "sendNotification", "(String)", "summary", "df-generated"]
+      - ["javax.management.modelmbean", "DescriptorSupport", "isValid", "()", "summary", "df-generated"]
+      - ["javax.management.modelmbean", "DescriptorSupport", "removeField", "(String)", "summary", "df-generated"]
+      - ["javax.management.modelmbean", "RequiredModelMBean", "addAttributeChangeNotificationListener", "(NotificationListener,String,Object)", "summary", "df-generated"]
+      - ["javax.management.modelmbean", "RequiredModelMBean", "addNotificationListener", "(NotificationListener,NotificationFilter,Object)", "summary", "df-generated"]
+      - ["javax.management.modelmbean", "RequiredModelMBean", "invoke", "(String,Object[],String[])", "summary", "df-generated"]
+      - ["javax.management.modelmbean", "RequiredModelMBean", "load", "()", "summary", "df-generated"]
+      - ["javax.management.modelmbean", "RequiredModelMBean", "postDeregister", "()", "summary", "df-generated"]
+      - ["javax.management.modelmbean", "RequiredModelMBean", "postRegister", "(Boolean)", "summary", "df-generated"]
+      - ["javax.management.modelmbean", "RequiredModelMBean", "preDeregister", "()", "summary", "df-generated"]
+      - ["javax.management.modelmbean", "RequiredModelMBean", "removeAttributeChangeNotificationListener", "(NotificationListener,String)", "summary", "df-generated"]
+      - ["javax.management.modelmbean", "RequiredModelMBean", "removeNotificationListener", "(NotificationListener)", "summary", "df-generated"]
+      - ["javax.management.modelmbean", "RequiredModelMBean", "removeNotificationListener", "(NotificationListener,NotificationFilter,Object)", "summary", "df-generated"]
+      - ["javax.management.modelmbean", "RequiredModelMBean", "sendAttributeChangeNotification", "(Attribute,Attribute)", "summary", "df-generated"]
+      - ["javax.management.modelmbean", "RequiredModelMBean", "sendAttributeChangeNotification", "(AttributeChangeNotification)", "summary", "df-generated"]
+      - ["javax.management.modelmbean", "RequiredModelMBean", "sendNotification", "(Notification)", "summary", "df-generated"]
+      - ["javax.management.modelmbean", "RequiredModelMBean", "sendNotification", "(String)", "summary", "df-generated"]
+      - ["javax.management.modelmbean", "RequiredModelMBean", "setAttribute", "(Attribute)", "summary", "df-generated"]
+      - ["javax.management.modelmbean", "RequiredModelMBean", "store", "()", "summary", "df-generated"]
diff --git a/java/ql/lib/ext/generated/javax.management.monitor.model.yml b/java/ql/lib/ext/generated/javax.management.monitor.model.yml
index fecd28f766d..d1485ddbd29 100644
--- a/java/ql/lib/ext/generated/javax.management.monitor.model.yml
+++ b/java/ql/lib/ext/generated/javax.management.monitor.model.yml
@@ -4,65 +4,74 @@ extensions:
       pack: codeql/java-all
       extensible: summaryModel
     data:
-      - ["javax.management.monitor", "Monitor", True, "getDerivedGauge", "(ObjectName)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.management.monitor", "MonitorMBean", True, "getObservedAttribute", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management.monitor", "Monitor", True, "getObservedAttribute", "()", "", "Argument[this].SyntheticField[javax.management.monitor.Monitor.observedAttribute]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.management.monitor", "Monitor", True, "setObservedAttribute", "(String)", "", "Argument[0]", "Argument[this].SyntheticField[javax.management.monitor.Monitor.observedAttribute]", "value", "dfc-generated"]
       - ["javax.management.monitor", "MonitorMBean", True, "getObservedObject", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["javax.management.monitor", "MonitorMBean", True, "getObservedObjects", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.management.monitor", "MonitorMBean", True, "setObservedAttribute", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["javax.management.monitor", "MonitorNotification", True, "getDerivedGauge", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["javax.management.monitor", "MonitorNotification", True, "getObservedAttribute", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["javax.management.monitor", "MonitorNotification", True, "getObservedObject", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["javax.management.monitor", "MonitorNotification", True, "getTrigger", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["javax.management.monitor", "MonitorSettingException", True, "MonitorSettingException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.monitor", "StringMonitor", True, "getStringToCompare", "()", "", "Argument[this].SyntheticField[javax.management.monitor.StringMonitor.stringToCompare]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.management.monitor", "StringMonitor", True, "setStringToCompare", "(String)", "", "Argument[0]", "Argument[this].SyntheticField[javax.management.monitor.StringMonitor.stringToCompare]", "value", "dfc-generated"]
       - ["javax.management.monitor", "StringMonitorMBean", True, "getDerivedGauge", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["javax.management.monitor", "StringMonitorMBean", True, "getDerivedGauge", "(ObjectName)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.management.monitor", "StringMonitorMBean", True, "getStringToCompare", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.management.monitor", "StringMonitorMBean", True, "setStringToCompare", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
   - addsTo:
       pack: codeql/java-all
       extensible: neutralModel
     data:
-      - ["javax.management.monitor", "CounterMonitorMBean", "getDerivedGauge", "()", "summary", "df-generated"]
-      - ["javax.management.monitor", "CounterMonitorMBean", "getDerivedGaugeTimeStamp", "()", "summary", "df-generated"]
-      - ["javax.management.monitor", "CounterMonitorMBean", "getDerivedGaugeTimeStamp", "(ObjectName)", "summary", "df-generated"]
-      - ["javax.management.monitor", "CounterMonitorMBean", "getDifferenceMode", "()", "summary", "df-generated"]
-      - ["javax.management.monitor", "CounterMonitorMBean", "getInitThreshold", "()", "summary", "df-generated"]
-      - ["javax.management.monitor", "CounterMonitorMBean", "getModulus", "()", "summary", "df-generated"]
-      - ["javax.management.monitor", "CounterMonitorMBean", "getNotify", "()", "summary", "df-generated"]
-      - ["javax.management.monitor", "CounterMonitorMBean", "getOffset", "()", "summary", "df-generated"]
-      - ["javax.management.monitor", "CounterMonitorMBean", "getThreshold", "()", "summary", "df-generated"]
-      - ["javax.management.monitor", "CounterMonitorMBean", "getThreshold", "(ObjectName)", "summary", "df-generated"]
-      - ["javax.management.monitor", "CounterMonitorMBean", "setDifferenceMode", "(boolean)", "summary", "df-generated"]
-      - ["javax.management.monitor", "CounterMonitorMBean", "setInitThreshold", "(Number)", "summary", "df-generated"]
-      - ["javax.management.monitor", "CounterMonitorMBean", "setModulus", "(Number)", "summary", "df-generated"]
-      - ["javax.management.monitor", "CounterMonitorMBean", "setNotify", "(boolean)", "summary", "df-generated"]
-      - ["javax.management.monitor", "CounterMonitorMBean", "setOffset", "(Number)", "summary", "df-generated"]
-      - ["javax.management.monitor", "CounterMonitorMBean", "setThreshold", "(Number)", "summary", "df-generated"]
-      - ["javax.management.monitor", "GaugeMonitorMBean", "getDerivedGauge", "()", "summary", "df-generated"]
-      - ["javax.management.monitor", "GaugeMonitorMBean", "getDerivedGaugeTimeStamp", "()", "summary", "df-generated"]
-      - ["javax.management.monitor", "GaugeMonitorMBean", "getDerivedGaugeTimeStamp", "(ObjectName)", "summary", "df-generated"]
-      - ["javax.management.monitor", "GaugeMonitorMBean", "getDifferenceMode", "()", "summary", "df-generated"]
-      - ["javax.management.monitor", "GaugeMonitorMBean", "getHighThreshold", "()", "summary", "df-generated"]
-      - ["javax.management.monitor", "GaugeMonitorMBean", "getLowThreshold", "()", "summary", "df-generated"]
-      - ["javax.management.monitor", "GaugeMonitorMBean", "getNotifyHigh", "()", "summary", "df-generated"]
-      - ["javax.management.monitor", "GaugeMonitorMBean", "getNotifyLow", "()", "summary", "df-generated"]
-      - ["javax.management.monitor", "GaugeMonitorMBean", "setDifferenceMode", "(boolean)", "summary", "df-generated"]
-      - ["javax.management.monitor", "GaugeMonitorMBean", "setNotifyHigh", "(boolean)", "summary", "df-generated"]
-      - ["javax.management.monitor", "GaugeMonitorMBean", "setNotifyLow", "(boolean)", "summary", "df-generated"]
-      - ["javax.management.monitor", "GaugeMonitorMBean", "setThresholds", "(Number,Number)", "summary", "df-generated"]
-      - ["javax.management.monitor", "Monitor", "getDerivedGaugeTimeStamp", "(ObjectName)", "summary", "df-generated"]
-      - ["javax.management.monitor", "MonitorMBean", "addObservedObject", "(ObjectName)", "summary", "df-generated"]
-      - ["javax.management.monitor", "MonitorMBean", "containsObservedObject", "(ObjectName)", "summary", "df-generated"]
-      - ["javax.management.monitor", "MonitorMBean", "getGranularityPeriod", "()", "summary", "df-generated"]
-      - ["javax.management.monitor", "MonitorMBean", "isActive", "()", "summary", "df-generated"]
-      - ["javax.management.monitor", "MonitorMBean", "removeObservedObject", "(ObjectName)", "summary", "df-generated"]
-      - ["javax.management.monitor", "MonitorMBean", "setGranularityPeriod", "(long)", "summary", "df-generated"]
-      - ["javax.management.monitor", "MonitorMBean", "setObservedObject", "(ObjectName)", "summary", "df-generated"]
-      - ["javax.management.monitor", "MonitorMBean", "start", "()", "summary", "df-generated"]
-      - ["javax.management.monitor", "MonitorMBean", "stop", "()", "summary", "df-generated"]
-      - ["javax.management.monitor", "StringMonitorMBean", "getDerivedGaugeTimeStamp", "()", "summary", "df-generated"]
-      - ["javax.management.monitor", "StringMonitorMBean", "getDerivedGaugeTimeStamp", "(ObjectName)", "summary", "df-generated"]
-      - ["javax.management.monitor", "StringMonitorMBean", "getNotifyDiffer", "()", "summary", "df-generated"]
-      - ["javax.management.monitor", "StringMonitorMBean", "getNotifyMatch", "()", "summary", "df-generated"]
-      - ["javax.management.monitor", "StringMonitorMBean", "setNotifyDiffer", "(boolean)", "summary", "df-generated"]
-      - ["javax.management.monitor", "StringMonitorMBean", "setNotifyMatch", "(boolean)", "summary", "df-generated"]
+      - ["javax.management.monitor", "CounterMonitor", "getDerivedGauge", "()", "summary", "df-generated"]
+      - ["javax.management.monitor", "CounterMonitor", "getDerivedGauge", "(ObjectName)", "summary", "df-generated"]
+      - ["javax.management.monitor", "CounterMonitor", "getDerivedGaugeTimeStamp", "()", "summary", "df-generated"]
+      - ["javax.management.monitor", "CounterMonitor", "getDerivedGaugeTimeStamp", "(ObjectName)", "summary", "df-generated"]
+      - ["javax.management.monitor", "CounterMonitor", "getDifferenceMode", "()", "summary", "df-generated"]
+      - ["javax.management.monitor", "CounterMonitor", "getInitThreshold", "()", "summary", "df-generated"]
+      - ["javax.management.monitor", "CounterMonitor", "getModulus", "()", "summary", "df-generated"]
+      - ["javax.management.monitor", "CounterMonitor", "getNotify", "()", "summary", "df-generated"]
+      - ["javax.management.monitor", "CounterMonitor", "getOffset", "()", "summary", "df-generated"]
+      - ["javax.management.monitor", "CounterMonitor", "getThreshold", "()", "summary", "df-generated"]
+      - ["javax.management.monitor", "CounterMonitor", "getThreshold", "(ObjectName)", "summary", "df-generated"]
+      - ["javax.management.monitor", "CounterMonitor", "setDifferenceMode", "(boolean)", "summary", "df-generated"]
+      - ["javax.management.monitor", "CounterMonitor", "setInitThreshold", "(Number)", "summary", "df-generated"]
+      - ["javax.management.monitor", "CounterMonitor", "setModulus", "(Number)", "summary", "df-generated"]
+      - ["javax.management.monitor", "CounterMonitor", "setNotify", "(boolean)", "summary", "df-generated"]
+      - ["javax.management.monitor", "CounterMonitor", "setOffset", "(Number)", "summary", "df-generated"]
+      - ["javax.management.monitor", "CounterMonitor", "setThreshold", "(Number)", "summary", "df-generated"]
+      - ["javax.management.monitor", "CounterMonitor", "start", "()", "summary", "df-generated"]
+      - ["javax.management.monitor", "CounterMonitor", "stop", "()", "summary", "df-generated"]
+      - ["javax.management.monitor", "GaugeMonitor", "getDerivedGauge", "()", "summary", "df-generated"]
+      - ["javax.management.monitor", "GaugeMonitor", "getDerivedGauge", "(ObjectName)", "summary", "df-generated"]
+      - ["javax.management.monitor", "GaugeMonitor", "getDerivedGaugeTimeStamp", "()", "summary", "df-generated"]
+      - ["javax.management.monitor", "GaugeMonitor", "getDerivedGaugeTimeStamp", "(ObjectName)", "summary", "df-generated"]
+      - ["javax.management.monitor", "GaugeMonitor", "getDifferenceMode", "()", "summary", "df-generated"]
+      - ["javax.management.monitor", "GaugeMonitor", "getHighThreshold", "()", "summary", "df-generated"]
+      - ["javax.management.monitor", "GaugeMonitor", "getLowThreshold", "()", "summary", "df-generated"]
+      - ["javax.management.monitor", "GaugeMonitor", "getNotifyHigh", "()", "summary", "df-generated"]
+      - ["javax.management.monitor", "GaugeMonitor", "getNotifyLow", "()", "summary", "df-generated"]
+      - ["javax.management.monitor", "GaugeMonitor", "setDifferenceMode", "(boolean)", "summary", "df-generated"]
+      - ["javax.management.monitor", "GaugeMonitor", "setNotifyHigh", "(boolean)", "summary", "df-generated"]
+      - ["javax.management.monitor", "GaugeMonitor", "setNotifyLow", "(boolean)", "summary", "df-generated"]
+      - ["javax.management.monitor", "GaugeMonitor", "setThresholds", "(Number,Number)", "summary", "df-generated"]
+      - ["javax.management.monitor", "GaugeMonitor", "start", "()", "summary", "df-generated"]
+      - ["javax.management.monitor", "GaugeMonitor", "stop", "()", "summary", "df-generated"]
+      - ["javax.management.monitor", "Monitor", "addObservedObject", "(ObjectName)", "summary", "df-generated"]
+      - ["javax.management.monitor", "Monitor", "containsObservedObject", "(ObjectName)", "summary", "df-generated"]
+      - ["javax.management.monitor", "Monitor", "getGranularityPeriod", "()", "summary", "df-generated"]
+      - ["javax.management.monitor", "Monitor", "isActive", "()", "summary", "df-generated"]
+      - ["javax.management.monitor", "Monitor", "postDeregister", "()", "summary", "df-generated"]
+      - ["javax.management.monitor", "Monitor", "postRegister", "(Boolean)", "summary", "df-generated"]
+      - ["javax.management.monitor", "Monitor", "preDeregister", "()", "summary", "df-generated"]
+      - ["javax.management.monitor", "Monitor", "removeObservedObject", "(ObjectName)", "summary", "df-generated"]
+      - ["javax.management.monitor", "Monitor", "setGranularityPeriod", "(long)", "summary", "df-generated"]
+      - ["javax.management.monitor", "Monitor", "setObservedObject", "(ObjectName)", "summary", "df-generated"]
+      - ["javax.management.monitor", "Monitor", "start", "()", "summary", "df-generated"]
+      - ["javax.management.monitor", "Monitor", "stop", "()", "summary", "df-generated"]
+      - ["javax.management.monitor", "StringMonitor", "getDerivedGaugeTimeStamp", "()", "summary", "df-generated"]
+      - ["javax.management.monitor", "StringMonitor", "getDerivedGaugeTimeStamp", "(ObjectName)", "summary", "df-generated"]
+      - ["javax.management.monitor", "StringMonitor", "getNotifyDiffer", "()", "summary", "df-generated"]
+      - ["javax.management.monitor", "StringMonitor", "getNotifyMatch", "()", "summary", "df-generated"]
+      - ["javax.management.monitor", "StringMonitor", "setNotifyDiffer", "(boolean)", "summary", "df-generated"]
+      - ["javax.management.monitor", "StringMonitor", "setNotifyMatch", "(boolean)", "summary", "df-generated"]
+      - ["javax.management.monitor", "StringMonitor", "start", "()", "summary", "df-generated"]
+      - ["javax.management.monitor", "StringMonitor", "stop", "()", "summary", "df-generated"]
diff --git a/java/ql/lib/ext/generated/javax.management.openmbean.model.yml b/java/ql/lib/ext/generated/javax.management.openmbean.model.yml
index 7ad51e1fb4f..457d6976419 100644
--- a/java/ql/lib/ext/generated/javax.management.openmbean.model.yml
+++ b/java/ql/lib/ext/generated/javax.management.openmbean.model.yml
@@ -12,46 +12,47 @@ extensions:
       - ["javax.management.openmbean", "CompositeData", True, "getAll", "(String[])", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["javax.management.openmbean", "CompositeData", True, "getCompositeType", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["javax.management.openmbean", "CompositeData", True, "values", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.management.openmbean", "CompositeDataInvocationHandler", True, "CompositeDataInvocationHandler", "(CompositeData)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management.openmbean", "CompositeDataInvocationHandler", True, "getCompositeData", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.management.openmbean", "CompositeDataSupport", True, "CompositeDataSupport", "(CompositeType,Map)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management.openmbean", "CompositeDataSupport", True, "CompositeDataSupport", "(CompositeType,Map)", "", "Argument[1].Element", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management.openmbean", "CompositeDataSupport", True, "CompositeDataSupport", "(CompositeType,String[],Object[])", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management.openmbean", "CompositeDataSupport", True, "CompositeDataSupport", "(CompositeType,String[],Object[])", "", "Argument[1].ArrayElement", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management.openmbean", "CompositeDataSupport", True, "CompositeDataSupport", "(CompositeType,String[],Object[])", "", "Argument[2].ArrayElement", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management.openmbean", "CompositeType", True, "CompositeType", "(String,String,String[],String[],OpenType[])", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management.openmbean", "CompositeType", True, "CompositeType", "(String,String,String[],String[],OpenType[])", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management.openmbean", "CompositeType", True, "CompositeType", "(String,String,String[],String[],OpenType[])", "", "Argument[2].ArrayElement", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management.openmbean", "CompositeType", True, "CompositeType", "(String,String,String[],String[],OpenType[])", "", "Argument[3].ArrayElement", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management.openmbean", "CompositeType", True, "CompositeType", "(String,String,String[],String[],OpenType[])", "", "Argument[4].ArrayElement", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management.openmbean", "CompositeType", True, "getDescription", "(String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.management.openmbean", "CompositeType", True, "getType", "(String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.management.openmbean", "CompositeType", True, "keySet", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management.openmbean", "CompositeDataInvocationHandler", True, "CompositeDataInvocationHandler", "(CompositeData)", "", "Argument[0]", "Argument[this].SyntheticField[javax.management.openmbean.CompositeDataInvocationHandler.compositeData]", "value", "dfc-generated"]
+      - ["javax.management.openmbean", "CompositeDataInvocationHandler", True, "getCompositeData", "()", "", "Argument[this].SyntheticField[javax.management.openmbean.CompositeDataInvocationHandler.compositeData]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.management.openmbean", "CompositeDataInvocationHandler", True, "invoke", "(Object,Method,Object[])", "", "Argument[this].SyntheticField[javax.management.openmbean.CompositeDataInvocationHandler.compositeData]", "ReturnValue", "taint", "dfc-generated"]
+      - ["javax.management.openmbean", "CompositeDataSupport", True, "CompositeDataSupport", "(CompositeType,Map)", "", "Argument[0]", "Argument[this].SyntheticField[javax.management.openmbean.CompositeDataSupport.compositeType]", "value", "dfc-generated"]
+      - ["javax.management.openmbean", "CompositeDataSupport", True, "CompositeDataSupport", "(CompositeType,Map)", "", "Argument[1].MapKey", "Argument[this].SyntheticField[javax.management.openmbean.CompositeDataSupport.contents].MapKey", "value", "dfc-generated"]
+      - ["javax.management.openmbean", "CompositeDataSupport", True, "CompositeDataSupport", "(CompositeType,Map)", "", "Argument[1].MapValue", "Argument[this].SyntheticField[javax.management.openmbean.CompositeDataSupport.contents].MapValue", "value", "dfc-generated"]
+      - ["javax.management.openmbean", "CompositeDataSupport", True, "CompositeDataSupport", "(CompositeType,String[],Object[])", "", "Argument[0]", "Argument[this].SyntheticField[javax.management.openmbean.CompositeDataSupport.compositeType]", "value", "dfc-generated"]
+      - ["javax.management.openmbean", "CompositeDataSupport", True, "CompositeDataSupport", "(CompositeType,String[],Object[])", "", "Argument[1].ArrayElement", "Argument[this].SyntheticField[javax.management.openmbean.CompositeDataSupport.contents].MapKey", "value", "dfc-generated"]
+      - ["javax.management.openmbean", "CompositeDataSupport", True, "CompositeDataSupport", "(CompositeType,String[],Object[])", "", "Argument[2].ArrayElement", "Argument[this].SyntheticField[javax.management.openmbean.CompositeDataSupport.contents].MapValue", "value", "dfc-generated"]
+      - ["javax.management.openmbean", "CompositeDataSupport", True, "get", "(String)", "", "Argument[this].SyntheticField[javax.management.openmbean.CompositeDataSupport.contents].MapValue", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.management.openmbean", "CompositeDataSupport", True, "getAll", "(String[])", "", "Argument[this].SyntheticField[javax.management.openmbean.CompositeDataSupport.contents].MapValue", "ReturnValue.ArrayElement", "value", "dfc-generated"]
+      - ["javax.management.openmbean", "CompositeDataSupport", True, "getCompositeType", "()", "", "Argument[this].SyntheticField[javax.management.openmbean.CompositeDataSupport.compositeType]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.management.openmbean", "CompositeDataSupport", True, "values", "()", "", "Argument[this].SyntheticField[javax.management.openmbean.CompositeDataSupport.contents].MapValue", "ReturnValue.Element", "value", "dfc-generated"]
+      - ["javax.management.openmbean", "CompositeDataView", True, "toCompositeData", "(CompositeType)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management.openmbean", "CompositeType", True, "CompositeType", "(String,String,String[],String[],OpenType[])", "", "Argument[2].ArrayElement", "Argument[this].SyntheticField[javax.management.openmbean.CompositeType.nameToDescription].MapKey", "taint", "dfc-generated"]
+      - ["javax.management.openmbean", "CompositeType", True, "CompositeType", "(String,String,String[],String[],OpenType[])", "", "Argument[2].ArrayElement", "Argument[this].SyntheticField[javax.management.openmbean.CompositeType.nameToType].MapKey", "taint", "dfc-generated"]
+      - ["javax.management.openmbean", "CompositeType", True, "CompositeType", "(String,String,String[],String[],OpenType[])", "", "Argument[3].ArrayElement", "Argument[this].SyntheticField[javax.management.openmbean.CompositeType.nameToDescription].MapValue", "taint", "dfc-generated"]
+      - ["javax.management.openmbean", "CompositeType", True, "CompositeType", "(String,String,String[],String[],OpenType[])", "", "Argument[4].ArrayElement", "Argument[this].SyntheticField[javax.management.openmbean.CompositeType.nameToType].MapValue", "value", "dfc-generated"]
+      - ["javax.management.openmbean", "CompositeType", True, "getDescription", "(String)", "", "Argument[this].SyntheticField[javax.management.openmbean.CompositeType.nameToDescription].MapValue", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.management.openmbean", "CompositeType", True, "getType", "(String)", "", "Argument[this].SyntheticField[javax.management.openmbean.CompositeType.nameToType].MapValue", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.management.openmbean", "CompositeType", True, "keySet", "()", "", "Argument[this].SyntheticField[javax.management.openmbean.CompositeType.myNamesSet]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.management.openmbean", "CompositeType", True, "keySet", "()", "", "Argument[this].SyntheticField[javax.management.openmbean.CompositeType.nameToDescription].MapKey", "Argument[this].SyntheticField[javax.management.openmbean.CompositeType.myNamesSet].Element", "value", "dfc-generated"]
+      - ["javax.management.openmbean", "CompositeType", True, "keySet", "()", "", "Argument[this].SyntheticField[javax.management.openmbean.CompositeType.nameToDescription].MapKey", "ReturnValue.Element", "value", "dfc-generated"]
       - ["javax.management.openmbean", "InvalidKeyException", True, "InvalidKeyException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["javax.management.openmbean", "InvalidOpenTypeException", True, "InvalidOpenTypeException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["javax.management.openmbean", "KeyAlreadyExistsException", True, "KeyAlreadyExistsException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["javax.management.openmbean", "OpenDataException", True, "OpenDataException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management.openmbean", "OpenMBeanAttributeInfoSupport", True, "OpenMBeanAttributeInfoSupport", "(String,String,OpenType,boolean,boolean,boolean)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management.openmbean", "OpenMBeanAttributeInfoSupport", True, "OpenMBeanAttributeInfoSupport", "(String,String,OpenType,boolean,boolean,boolean)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management.openmbean", "OpenMBeanAttributeInfoSupport", True, "OpenMBeanAttributeInfoSupport", "(String,String,OpenType,boolean,boolean,boolean)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management.openmbean", "OpenMBeanAttributeInfoSupport", True, "OpenMBeanAttributeInfoSupport", "(String,String,OpenType,boolean,boolean,boolean,Descriptor)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management.openmbean", "OpenMBeanAttributeInfoSupport", True, "OpenMBeanAttributeInfoSupport", "(String,String,OpenType,boolean,boolean,boolean,Descriptor)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management.openmbean", "OpenMBeanAttributeInfoSupport", True, "OpenMBeanAttributeInfoSupport", "(String,String,OpenType,boolean,boolean,boolean,Descriptor)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management.openmbean", "OpenMBeanAttributeInfoSupport", True, "OpenMBeanAttributeInfoSupport", "(String,String,OpenType,boolean,boolean,boolean,Descriptor)", "", "Argument[6]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management.openmbean", "OpenMBeanAttributeInfoSupport", True, "OpenMBeanAttributeInfoSupport", "(String,String,OpenType,boolean,boolean,boolean,Object)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management.openmbean", "OpenMBeanAttributeInfoSupport", True, "OpenMBeanAttributeInfoSupport", "(String,String,OpenType,boolean,boolean,boolean,Object)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management.openmbean", "OpenMBeanAttributeInfoSupport", True, "OpenMBeanAttributeInfoSupport", "(String,String,OpenType,boolean,boolean,boolean,Object)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management.openmbean", "OpenMBeanAttributeInfoSupport", True, "OpenMBeanAttributeInfoSupport", "(String,String,OpenType,boolean,boolean,boolean,Object)", "", "Argument[6]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management.openmbean", "OpenMBeanAttributeInfoSupport", True, "OpenMBeanAttributeInfoSupport", "(String,String,OpenType,boolean,boolean,boolean,Object,Comparable,Comparable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management.openmbean", "OpenMBeanAttributeInfoSupport", True, "OpenMBeanAttributeInfoSupport", "(String,String,OpenType,boolean,boolean,boolean,Object,Comparable,Comparable)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management.openmbean", "OpenMBeanAttributeInfoSupport", True, "OpenMBeanAttributeInfoSupport", "(String,String,OpenType,boolean,boolean,boolean,Object,Comparable,Comparable)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management.openmbean", "OpenMBeanAttributeInfoSupport", True, "OpenMBeanAttributeInfoSupport", "(String,String,OpenType,boolean,boolean,boolean,Object,Comparable,Comparable)", "", "Argument[6]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management.openmbean", "OpenMBeanAttributeInfoSupport", True, "OpenMBeanAttributeInfoSupport", "(String,String,OpenType,boolean,boolean,boolean,Object,Comparable,Comparable)", "", "Argument[7]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management.openmbean", "OpenMBeanAttributeInfoSupport", True, "OpenMBeanAttributeInfoSupport", "(String,String,OpenType,boolean,boolean,boolean,Object,Comparable,Comparable)", "", "Argument[8]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management.openmbean", "OpenMBeanAttributeInfoSupport", True, "OpenMBeanAttributeInfoSupport", "(String,String,OpenType,boolean,boolean,boolean,Object,Object[])", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management.openmbean", "OpenMBeanAttributeInfoSupport", True, "OpenMBeanAttributeInfoSupport", "(String,String,OpenType,boolean,boolean,boolean,Object,Object[])", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management.openmbean", "OpenMBeanAttributeInfoSupport", True, "OpenMBeanAttributeInfoSupport", "(String,String,OpenType,boolean,boolean,boolean,Object,Object[])", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management.openmbean", "OpenMBeanAttributeInfoSupport", True, "OpenMBeanAttributeInfoSupport", "(String,String,OpenType,boolean,boolean,boolean,Object,Object[])", "", "Argument[6]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.openmbean", "OpenMBeanAttributeInfoSupport", True, "OpenMBeanAttributeInfoSupport", "(String,String,OpenType,boolean,boolean,boolean)", "", "Argument[2]", "Argument[this].SyntheticField[javax.management.openmbean.OpenMBeanAttributeInfoSupport.openType]", "value", "dfc-generated"]
+      - ["javax.management.openmbean", "OpenMBeanAttributeInfoSupport", True, "OpenMBeanAttributeInfoSupport", "(String,String,OpenType,boolean,boolean,boolean,Descriptor)", "", "Argument[2]", "Argument[this].SyntheticField[javax.management.openmbean.OpenMBeanAttributeInfoSupport.openType]", "value", "dfc-generated"]
+      - ["javax.management.openmbean", "OpenMBeanAttributeInfoSupport", True, "OpenMBeanAttributeInfoSupport", "(String,String,OpenType,boolean,boolean,boolean,Object)", "", "Argument[2]", "Argument[this].SyntheticField[javax.management.openmbean.OpenMBeanAttributeInfoSupport.openType]", "value", "dfc-generated"]
+      - ["javax.management.openmbean", "OpenMBeanAttributeInfoSupport", True, "OpenMBeanAttributeInfoSupport", "(String,String,OpenType,boolean,boolean,boolean,Object)", "", "Argument[6]", "Argument[this].SyntheticField[javax.management.openmbean.OpenMBeanAttributeInfoSupport.defaultValue]", "value", "dfc-generated"]
+      - ["javax.management.openmbean", "OpenMBeanAttributeInfoSupport", True, "OpenMBeanAttributeInfoSupport", "(String,String,OpenType,boolean,boolean,boolean,Object,Comparable,Comparable)", "", "Argument[2]", "Argument[this].SyntheticField[javax.management.openmbean.OpenMBeanAttributeInfoSupport.openType]", "value", "dfc-generated"]
+      - ["javax.management.openmbean", "OpenMBeanAttributeInfoSupport", True, "OpenMBeanAttributeInfoSupport", "(String,String,OpenType,boolean,boolean,boolean,Object,Comparable,Comparable)", "", "Argument[6]", "Argument[this].SyntheticField[javax.management.openmbean.OpenMBeanAttributeInfoSupport.defaultValue]", "value", "dfc-generated"]
+      - ["javax.management.openmbean", "OpenMBeanAttributeInfoSupport", True, "OpenMBeanAttributeInfoSupport", "(String,String,OpenType,boolean,boolean,boolean,Object,Comparable,Comparable)", "", "Argument[7]", "Argument[this].SyntheticField[javax.management.openmbean.OpenMBeanAttributeInfoSupport.minValue]", "value", "dfc-generated"]
+      - ["javax.management.openmbean", "OpenMBeanAttributeInfoSupport", True, "OpenMBeanAttributeInfoSupport", "(String,String,OpenType,boolean,boolean,boolean,Object,Comparable,Comparable)", "", "Argument[8]", "Argument[this].SyntheticField[javax.management.openmbean.OpenMBeanAttributeInfoSupport.maxValue]", "value", "dfc-generated"]
+      - ["javax.management.openmbean", "OpenMBeanAttributeInfoSupport", True, "OpenMBeanAttributeInfoSupport", "(String,String,OpenType,boolean,boolean,boolean,Object,Object[])", "", "Argument[2]", "Argument[this].SyntheticField[javax.management.openmbean.OpenMBeanAttributeInfoSupport.openType]", "value", "dfc-generated"]
+      - ["javax.management.openmbean", "OpenMBeanAttributeInfoSupport", True, "OpenMBeanAttributeInfoSupport", "(String,String,OpenType,boolean,boolean,boolean,Object,Object[])", "", "Argument[6]", "Argument[this].SyntheticField[javax.management.openmbean.OpenMBeanAttributeInfoSupport.defaultValue]", "value", "dfc-generated"]
+      - ["javax.management.openmbean", "OpenMBeanAttributeInfoSupport", True, "getDefaultValue", "()", "", "Argument[this].SyntheticField[javax.management.openmbean.OpenMBeanAttributeInfoSupport.defaultValue]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.management.openmbean", "OpenMBeanAttributeInfoSupport", True, "getMaxValue", "()", "", "Argument[this].SyntheticField[javax.management.openmbean.OpenMBeanAttributeInfoSupport.maxValue]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.management.openmbean", "OpenMBeanAttributeInfoSupport", True, "getMinValue", "()", "", "Argument[this].SyntheticField[javax.management.openmbean.OpenMBeanAttributeInfoSupport.minValue]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.management.openmbean", "OpenMBeanAttributeInfoSupport", True, "getOpenType", "()", "", "Argument[this].SyntheticField[javax.management.openmbean.OpenMBeanAttributeInfoSupport.openType]", "ReturnValue", "value", "dfc-generated"]
       - ["javax.management.openmbean", "OpenMBeanConstructorInfoSupport", True, "OpenMBeanConstructorInfoSupport", "(String,String,OpenMBeanParameterInfo[])", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["javax.management.openmbean", "OpenMBeanConstructorInfoSupport", True, "OpenMBeanConstructorInfoSupport", "(String,String,OpenMBeanParameterInfo[])", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
       - ["javax.management.openmbean", "OpenMBeanConstructorInfoSupport", True, "OpenMBeanConstructorInfoSupport", "(String,String,OpenMBeanParameterInfo[])", "", "Argument[2].ArrayElement", "Argument[this]", "taint", "df-generated"]
@@ -72,58 +73,41 @@ extensions:
       - ["javax.management.openmbean", "OpenMBeanInfoSupport", True, "OpenMBeanInfoSupport", "(String,String,OpenMBeanAttributeInfo[],OpenMBeanConstructorInfo[],OpenMBeanOperationInfo[],MBeanNotificationInfo[],Descriptor)", "", "Argument[4].ArrayElement", "Argument[this]", "taint", "df-generated"]
       - ["javax.management.openmbean", "OpenMBeanInfoSupport", True, "OpenMBeanInfoSupport", "(String,String,OpenMBeanAttributeInfo[],OpenMBeanConstructorInfo[],OpenMBeanOperationInfo[],MBeanNotificationInfo[],Descriptor)", "", "Argument[5].ArrayElement", "Argument[this]", "taint", "df-generated"]
       - ["javax.management.openmbean", "OpenMBeanInfoSupport", True, "OpenMBeanInfoSupport", "(String,String,OpenMBeanAttributeInfo[],OpenMBeanConstructorInfo[],OpenMBeanOperationInfo[],MBeanNotificationInfo[],Descriptor)", "", "Argument[6]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management.openmbean", "OpenMBeanOperationInfo", True, "getReturnOpenType", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.management.openmbean", "OpenMBeanOperationInfoSupport", True, "OpenMBeanOperationInfoSupport", "(String,String,OpenMBeanParameterInfo[],OpenType,int)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management.openmbean", "OpenMBeanOperationInfoSupport", True, "OpenMBeanOperationInfoSupport", "(String,String,OpenMBeanParameterInfo[],OpenType,int)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management.openmbean", "OpenMBeanOperationInfoSupport", True, "OpenMBeanOperationInfoSupport", "(String,String,OpenMBeanParameterInfo[],OpenType,int)", "", "Argument[2].ArrayElement", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management.openmbean", "OpenMBeanOperationInfoSupport", True, "OpenMBeanOperationInfoSupport", "(String,String,OpenMBeanParameterInfo[],OpenType,int)", "", "Argument[3]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management.openmbean", "OpenMBeanOperationInfoSupport", True, "OpenMBeanOperationInfoSupport", "(String,String,OpenMBeanParameterInfo[],OpenType,int,Descriptor)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management.openmbean", "OpenMBeanOperationInfoSupport", True, "OpenMBeanOperationInfoSupport", "(String,String,OpenMBeanParameterInfo[],OpenType,int,Descriptor)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management.openmbean", "OpenMBeanOperationInfoSupport", True, "OpenMBeanOperationInfoSupport", "(String,String,OpenMBeanParameterInfo[],OpenType,int,Descriptor)", "", "Argument[2].ArrayElement", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management.openmbean", "OpenMBeanOperationInfoSupport", True, "OpenMBeanOperationInfoSupport", "(String,String,OpenMBeanParameterInfo[],OpenType,int,Descriptor)", "", "Argument[3]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management.openmbean", "OpenMBeanOperationInfoSupport", True, "OpenMBeanOperationInfoSupport", "(String,String,OpenMBeanParameterInfo[],OpenType,int,Descriptor)", "", "Argument[5]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management.openmbean", "OpenMBeanParameterInfo", True, "getDefaultValue", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management.openmbean", "OpenMBeanOperationInfoSupport", True, "OpenMBeanOperationInfoSupport", "(String,String,OpenMBeanParameterInfo[],OpenType,int)", "", "Argument[3]", "Argument[this].SyntheticField[javax.management.openmbean.OpenMBeanOperationInfoSupport.returnOpenType]", "value", "dfc-generated"]
+      - ["javax.management.openmbean", "OpenMBeanOperationInfoSupport", True, "OpenMBeanOperationInfoSupport", "(String,String,OpenMBeanParameterInfo[],OpenType,int,Descriptor)", "", "Argument[3]", "Argument[this].SyntheticField[javax.management.openmbean.OpenMBeanOperationInfoSupport.returnOpenType]", "value", "dfc-generated"]
+      - ["javax.management.openmbean", "OpenMBeanOperationInfoSupport", True, "getReturnOpenType", "()", "", "Argument[this].SyntheticField[javax.management.openmbean.OpenMBeanOperationInfoSupport.returnOpenType]", "ReturnValue", "value", "dfc-generated"]
       - ["javax.management.openmbean", "OpenMBeanParameterInfo", True, "getLegalValues", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.management.openmbean", "OpenMBeanParameterInfo", True, "getMaxValue", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.management.openmbean", "OpenMBeanParameterInfo", True, "getMinValue", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.management.openmbean", "OpenMBeanParameterInfo", True, "getOpenType", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.management.openmbean", "OpenMBeanParameterInfoSupport", True, "OpenMBeanParameterInfoSupport", "(String,String,OpenType)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management.openmbean", "OpenMBeanParameterInfoSupport", True, "OpenMBeanParameterInfoSupport", "(String,String,OpenType)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management.openmbean", "OpenMBeanParameterInfoSupport", True, "OpenMBeanParameterInfoSupport", "(String,String,OpenType)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management.openmbean", "OpenMBeanParameterInfoSupport", True, "OpenMBeanParameterInfoSupport", "(String,String,OpenType,Descriptor)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management.openmbean", "OpenMBeanParameterInfoSupport", True, "OpenMBeanParameterInfoSupport", "(String,String,OpenType,Descriptor)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management.openmbean", "OpenMBeanParameterInfoSupport", True, "OpenMBeanParameterInfoSupport", "(String,String,OpenType,Descriptor)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management.openmbean", "OpenMBeanParameterInfoSupport", True, "OpenMBeanParameterInfoSupport", "(String,String,OpenType,Descriptor)", "", "Argument[3]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management.openmbean", "OpenMBeanParameterInfoSupport", True, "OpenMBeanParameterInfoSupport", "(String,String,OpenType,Object)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management.openmbean", "OpenMBeanParameterInfoSupport", True, "OpenMBeanParameterInfoSupport", "(String,String,OpenType,Object)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management.openmbean", "OpenMBeanParameterInfoSupport", True, "OpenMBeanParameterInfoSupport", "(String,String,OpenType,Object)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management.openmbean", "OpenMBeanParameterInfoSupport", True, "OpenMBeanParameterInfoSupport", "(String,String,OpenType,Object)", "", "Argument[3]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management.openmbean", "OpenMBeanParameterInfoSupport", True, "OpenMBeanParameterInfoSupport", "(String,String,OpenType,Object,Comparable,Comparable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management.openmbean", "OpenMBeanParameterInfoSupport", True, "OpenMBeanParameterInfoSupport", "(String,String,OpenType,Object,Comparable,Comparable)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management.openmbean", "OpenMBeanParameterInfoSupport", True, "OpenMBeanParameterInfoSupport", "(String,String,OpenType,Object,Comparable,Comparable)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management.openmbean", "OpenMBeanParameterInfoSupport", True, "OpenMBeanParameterInfoSupport", "(String,String,OpenType,Object,Comparable,Comparable)", "", "Argument[3]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management.openmbean", "OpenMBeanParameterInfoSupport", True, "OpenMBeanParameterInfoSupport", "(String,String,OpenType,Object,Comparable,Comparable)", "", "Argument[4]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management.openmbean", "OpenMBeanParameterInfoSupport", True, "OpenMBeanParameterInfoSupport", "(String,String,OpenType,Object,Comparable,Comparable)", "", "Argument[5]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management.openmbean", "OpenMBeanParameterInfoSupport", True, "OpenMBeanParameterInfoSupport", "(String,String,OpenType,Object,Object[])", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management.openmbean", "OpenMBeanParameterInfoSupport", True, "OpenMBeanParameterInfoSupport", "(String,String,OpenType,Object,Object[])", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management.openmbean", "OpenMBeanParameterInfoSupport", True, "OpenMBeanParameterInfoSupport", "(String,String,OpenType,Object,Object[])", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management.openmbean", "OpenMBeanParameterInfoSupport", True, "OpenMBeanParameterInfoSupport", "(String,String,OpenType,Object,Object[])", "", "Argument[3]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.openmbean", "OpenMBeanParameterInfoSupport", True, "OpenMBeanParameterInfoSupport", "(String,String,OpenType)", "", "Argument[2]", "Argument[this].SyntheticField[javax.management.openmbean.OpenMBeanParameterInfoSupport.openType]", "value", "dfc-generated"]
+      - ["javax.management.openmbean", "OpenMBeanParameterInfoSupport", True, "OpenMBeanParameterInfoSupport", "(String,String,OpenType,Descriptor)", "", "Argument[2]", "Argument[this].SyntheticField[javax.management.openmbean.OpenMBeanParameterInfoSupport.openType]", "value", "dfc-generated"]
+      - ["javax.management.openmbean", "OpenMBeanParameterInfoSupport", True, "OpenMBeanParameterInfoSupport", "(String,String,OpenType,Object)", "", "Argument[2]", "Argument[this].SyntheticField[javax.management.openmbean.OpenMBeanParameterInfoSupport.openType]", "value", "dfc-generated"]
+      - ["javax.management.openmbean", "OpenMBeanParameterInfoSupport", True, "OpenMBeanParameterInfoSupport", "(String,String,OpenType,Object)", "", "Argument[3]", "Argument[this].SyntheticField[javax.management.openmbean.OpenMBeanParameterInfoSupport.defaultValue]", "value", "dfc-generated"]
+      - ["javax.management.openmbean", "OpenMBeanParameterInfoSupport", True, "OpenMBeanParameterInfoSupport", "(String,String,OpenType,Object,Comparable,Comparable)", "", "Argument[2]", "Argument[this].SyntheticField[javax.management.openmbean.OpenMBeanParameterInfoSupport.openType]", "value", "dfc-generated"]
+      - ["javax.management.openmbean", "OpenMBeanParameterInfoSupport", True, "OpenMBeanParameterInfoSupport", "(String,String,OpenType,Object,Comparable,Comparable)", "", "Argument[3]", "Argument[this].SyntheticField[javax.management.openmbean.OpenMBeanParameterInfoSupport.defaultValue]", "value", "dfc-generated"]
+      - ["javax.management.openmbean", "OpenMBeanParameterInfoSupport", True, "OpenMBeanParameterInfoSupport", "(String,String,OpenType,Object,Comparable,Comparable)", "", "Argument[4]", "Argument[this].SyntheticField[javax.management.openmbean.OpenMBeanParameterInfoSupport.minValue]", "value", "dfc-generated"]
+      - ["javax.management.openmbean", "OpenMBeanParameterInfoSupport", True, "OpenMBeanParameterInfoSupport", "(String,String,OpenType,Object,Comparable,Comparable)", "", "Argument[5]", "Argument[this].SyntheticField[javax.management.openmbean.OpenMBeanParameterInfoSupport.maxValue]", "value", "dfc-generated"]
+      - ["javax.management.openmbean", "OpenMBeanParameterInfoSupport", True, "OpenMBeanParameterInfoSupport", "(String,String,OpenType,Object,Object[])", "", "Argument[2]", "Argument[this].SyntheticField[javax.management.openmbean.OpenMBeanParameterInfoSupport.openType]", "value", "dfc-generated"]
+      - ["javax.management.openmbean", "OpenMBeanParameterInfoSupport", True, "OpenMBeanParameterInfoSupport", "(String,String,OpenType,Object,Object[])", "", "Argument[3]", "Argument[this].SyntheticField[javax.management.openmbean.OpenMBeanParameterInfoSupport.defaultValue]", "value", "dfc-generated"]
+      - ["javax.management.openmbean", "OpenMBeanParameterInfoSupport", True, "getDefaultValue", "()", "", "Argument[this].SyntheticField[javax.management.openmbean.OpenMBeanParameterInfoSupport.defaultValue]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.management.openmbean", "OpenMBeanParameterInfoSupport", True, "getMaxValue", "()", "", "Argument[this].SyntheticField[javax.management.openmbean.OpenMBeanParameterInfoSupport.maxValue]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.management.openmbean", "OpenMBeanParameterInfoSupport", True, "getMinValue", "()", "", "Argument[this].SyntheticField[javax.management.openmbean.OpenMBeanParameterInfoSupport.minValue]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.management.openmbean", "OpenMBeanParameterInfoSupport", True, "getOpenType", "()", "", "Argument[this].SyntheticField[javax.management.openmbean.OpenMBeanParameterInfoSupport.openType]", "ReturnValue", "value", "dfc-generated"]
       - ["javax.management.openmbean", "OpenType", True, "getClassName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["javax.management.openmbean", "OpenType", True, "getDescription", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["javax.management.openmbean", "OpenType", True, "getTypeName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.management.openmbean", "TabularData", True, "get", "(Object[])", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.management.openmbean", "TabularData", True, "getTabularType", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.management.openmbean", "TabularData", True, "put", "(CompositeData)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management.openmbean", "TabularData", True, "putAll", "(CompositeData[])", "", "Argument[0].ArrayElement", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management.openmbean", "TabularData", True, "remove", "(Object[])", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.management.openmbean", "TabularDataSupport", True, "TabularDataSupport", "(TabularType)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management.openmbean", "TabularDataSupport", True, "TabularDataSupport", "(TabularType,int,float)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management.openmbean", "TabularType", True, "TabularType", "(String,String,CompositeType,String[])", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management.openmbean", "TabularType", True, "TabularType", "(String,String,CompositeType,String[])", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management.openmbean", "TabularType", True, "TabularType", "(String,String,CompositeType,String[])", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management.openmbean", "TabularType", True, "TabularType", "(String,String,CompositeType,String[])", "", "Argument[3].ArrayElement", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management.openmbean", "TabularType", True, "getIndexNames", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.management.openmbean", "TabularType", True, "getRowType", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management.openmbean", "TabularData", True, "calculateIndex", "(CompositeData)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management.openmbean", "TabularData", True, "keySet", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management.openmbean", "TabularData", True, "values", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management.openmbean", "TabularDataSupport", True, "TabularDataSupport", "(TabularType)", "", "Argument[0]", "Argument[this].SyntheticField[javax.management.openmbean.TabularDataSupport.tabularType]", "value", "dfc-generated"]
+      - ["javax.management.openmbean", "TabularDataSupport", True, "TabularDataSupport", "(TabularType,int,float)", "", "Argument[0]", "Argument[this].SyntheticField[javax.management.openmbean.TabularDataSupport.tabularType]", "value", "dfc-generated"]
+      - ["javax.management.openmbean", "TabularDataSupport", True, "get", "(Object[])", "", "Argument[this].SyntheticField[javax.management.openmbean.TabularDataSupport.dataMap].MapValue", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.management.openmbean", "TabularDataSupport", True, "getTabularType", "()", "", "Argument[this].SyntheticField[javax.management.openmbean.TabularDataSupport.tabularType]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.management.openmbean", "TabularDataSupport", True, "put", "(CompositeData)", "", "Argument[0]", "Argument[this].SyntheticField[javax.management.openmbean.TabularDataSupport.dataMap].MapValue", "value", "dfc-generated"]
+      - ["javax.management.openmbean", "TabularDataSupport", True, "putAll", "(CompositeData[])", "", "Argument[0].ArrayElement", "Argument[this].SyntheticField[javax.management.openmbean.TabularDataSupport.dataMap].MapValue", "value", "dfc-generated"]
+      - ["javax.management.openmbean", "TabularDataSupport", True, "remove", "(Object[])", "", "Argument[this].SyntheticField[javax.management.openmbean.TabularDataSupport.dataMap].MapValue", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.management.openmbean", "TabularType", True, "TabularType", "(String,String,CompositeType,String[])", "", "Argument[2]", "Argument[this].SyntheticField[javax.management.openmbean.TabularType.rowType]", "value", "dfc-generated"]
+      - ["javax.management.openmbean", "TabularType", True, "TabularType", "(String,String,CompositeType,String[])", "", "Argument[3].ArrayElement", "Argument[this].SyntheticField[javax.management.openmbean.TabularType.indexNames].Element", "value", "dfc-generated"]
+      - ["javax.management.openmbean", "TabularType", True, "getIndexNames", "()", "", "Argument[this].SyntheticField[javax.management.openmbean.TabularType.indexNames]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.management.openmbean", "TabularType", True, "getRowType", "()", "", "Argument[this].SyntheticField[javax.management.openmbean.TabularType.rowType]", "ReturnValue", "value", "dfc-generated"]
   - addsTo:
       pack: codeql/java-all
       extensible: neutralModel
@@ -131,20 +115,26 @@ extensions:
       - ["javax.management.openmbean", "ArrayType", "getDimension", "()", "summary", "df-generated"]
       - ["javax.management.openmbean", "ArrayType", "getPrimitiveArrayType", "(Class)", "summary", "df-generated"]
       - ["javax.management.openmbean", "ArrayType", "isPrimitiveArray", "()", "summary", "df-generated"]
-      - ["javax.management.openmbean", "CompositeData", "containsKey", "(String)", "summary", "df-generated"]
-      - ["javax.management.openmbean", "CompositeData", "containsValue", "(Object)", "summary", "df-generated"]
+      - ["javax.management.openmbean", "ArrayType", "isValue", "(Object)", "summary", "df-generated"]
+      - ["javax.management.openmbean", "CompositeDataSupport", "containsKey", "(String)", "summary", "df-generated"]
+      - ["javax.management.openmbean", "CompositeDataSupport", "containsValue", "(Object)", "summary", "df-generated"]
       - ["javax.management.openmbean", "CompositeType", "containsKey", "(String)", "summary", "df-generated"]
-      - ["javax.management.openmbean", "OpenMBeanParameterInfo", "hasDefaultValue", "()", "summary", "df-generated"]
-      - ["javax.management.openmbean", "OpenMBeanParameterInfo", "hasLegalValues", "()", "summary", "df-generated"]
-      - ["javax.management.openmbean", "OpenMBeanParameterInfo", "hasMaxValue", "()", "summary", "df-generated"]
-      - ["javax.management.openmbean", "OpenMBeanParameterInfo", "hasMinValue", "()", "summary", "df-generated"]
-      - ["javax.management.openmbean", "OpenMBeanParameterInfo", "isValue", "(Object)", "summary", "df-generated"]
+      - ["javax.management.openmbean", "CompositeType", "isValue", "(Object)", "summary", "df-generated"]
+      - ["javax.management.openmbean", "OpenMBeanAttributeInfoSupport", "hasDefaultValue", "()", "summary", "df-generated"]
+      - ["javax.management.openmbean", "OpenMBeanAttributeInfoSupport", "hasLegalValues", "()", "summary", "df-generated"]
+      - ["javax.management.openmbean", "OpenMBeanAttributeInfoSupport", "hasMaxValue", "()", "summary", "df-generated"]
+      - ["javax.management.openmbean", "OpenMBeanAttributeInfoSupport", "hasMinValue", "()", "summary", "df-generated"]
+      - ["javax.management.openmbean", "OpenMBeanAttributeInfoSupport", "isValue", "(Object)", "summary", "df-generated"]
+      - ["javax.management.openmbean", "OpenMBeanParameterInfoSupport", "hasDefaultValue", "()", "summary", "df-generated"]
+      - ["javax.management.openmbean", "OpenMBeanParameterInfoSupport", "hasLegalValues", "()", "summary", "df-generated"]
+      - ["javax.management.openmbean", "OpenMBeanParameterInfoSupport", "hasMaxValue", "()", "summary", "df-generated"]
+      - ["javax.management.openmbean", "OpenMBeanParameterInfoSupport", "hasMinValue", "()", "summary", "df-generated"]
+      - ["javax.management.openmbean", "OpenMBeanParameterInfoSupport", "isValue", "(Object)", "summary", "df-generated"]
       - ["javax.management.openmbean", "OpenType", "isArray", "()", "summary", "df-generated"]
       - ["javax.management.openmbean", "OpenType", "isValue", "(Object)", "summary", "df-generated"]
+      - ["javax.management.openmbean", "SimpleType", "isValue", "(Object)", "summary", "df-generated"]
       - ["javax.management.openmbean", "SimpleType", "readResolve", "()", "summary", "df-generated"]
-      - ["javax.management.openmbean", "TabularData", "calculateIndex", "(CompositeData)", "summary", "df-generated"]
-      - ["javax.management.openmbean", "TabularData", "clear", "()", "summary", "df-generated"]
-      - ["javax.management.openmbean", "TabularData", "containsKey", "(Object[])", "summary", "df-generated"]
-      - ["javax.management.openmbean", "TabularData", "containsValue", "(CompositeData)", "summary", "df-generated"]
-      - ["javax.management.openmbean", "TabularData", "isEmpty", "()", "summary", "df-generated"]
-      - ["javax.management.openmbean", "TabularData", "size", "()", "summary", "df-generated"]
+      - ["javax.management.openmbean", "TabularDataSupport", "containsKey", "(Object[])", "summary", "df-generated"]
+      - ["javax.management.openmbean", "TabularDataSupport", "containsValue", "(CompositeData)", "summary", "df-generated"]
+      - ["javax.management.openmbean", "TabularDataSupport", "containsValue", "(Object)", "summary", "df-generated"]
+      - ["javax.management.openmbean", "TabularType", "isValue", "(Object)", "summary", "df-generated"]
diff --git a/java/ql/lib/ext/generated/javax.management.relation.model.yml b/java/ql/lib/ext/generated/javax.management.relation.model.yml
index 86b04e58252..5505994e466 100644
--- a/java/ql/lib/ext/generated/javax.management.relation.model.yml
+++ b/java/ql/lib/ext/generated/javax.management.relation.model.yml
@@ -9,153 +9,158 @@ extensions:
       - ["javax.management.relation", "InvalidRelationTypeException", True, "InvalidRelationTypeException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["javax.management.relation", "InvalidRoleInfoException", True, "InvalidRoleInfoException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["javax.management.relation", "InvalidRoleValueException", True, "InvalidRoleValueException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management.relation", "MBeanServerNotificationFilter", True, "disableObjectName", "(ObjectName)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management.relation", "MBeanServerNotificationFilter", True, "enableObjectName", "(ObjectName)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management.relation", "MBeanServerNotificationFilter", True, "getDisabledObjectNames", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.management.relation", "MBeanServerNotificationFilter", True, "getEnabledObjectNames", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management.relation", "MBeanServerNotificationFilter", True, "disableObjectName", "(ObjectName)", "", "Argument[0]", "Argument[this].SyntheticField[javax.management.relation.MBeanServerNotificationFilter.deselectedNames].Element", "value", "dfc-generated"]
+      - ["javax.management.relation", "MBeanServerNotificationFilter", True, "enableObjectName", "(ObjectName)", "", "Argument[0]", "Argument[this].SyntheticField[javax.management.relation.MBeanServerNotificationFilter.selectedNames].Element", "value", "dfc-generated"]
+      - ["javax.management.relation", "MBeanServerNotificationFilter", True, "getDisabledObjectNames", "()", "", "Argument[this].SyntheticField[javax.management.relation.MBeanServerNotificationFilter.deselectedNames].Element", "ReturnValue.Element", "value", "dfc-generated"]
+      - ["javax.management.relation", "MBeanServerNotificationFilter", True, "getEnabledObjectNames", "()", "", "Argument[this].SyntheticField[javax.management.relation.MBeanServerNotificationFilter.selectedNames].Element", "ReturnValue.Element", "value", "dfc-generated"]
       - ["javax.management.relation", "Relation", True, "getReferencedMBeans", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.management.relation", "Relation", True, "getRelationId", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.management.relation", "Relation", True, "getRelationServiceName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.management.relation", "Relation", True, "getRelationTypeName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["javax.management.relation", "Relation", True, "getRole", "(String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.management.relation", "Relation", True, "handleMBeanUnregistration", "(ObjectName,String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management.relation", "Relation", True, "retrieveAllRoles", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.management.relation", "Relation", True, "setRole", "(Role)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management.relation", "Relation", True, "setRoles", "(RoleList)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
       - ["javax.management.relation", "RelationException", True, "RelationException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["javax.management.relation", "RelationNotFoundException", True, "RelationNotFoundException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management.relation", "RelationNotification", True, "RelationNotification", "(String,Object,long,long,String,String,String,ObjectName,List)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management.relation", "RelationNotification", True, "RelationNotification", "(String,Object,long,long,String,String,String,ObjectName,List)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management.relation", "RelationNotification", True, "RelationNotification", "(String,Object,long,long,String,String,String,ObjectName,List)", "", "Argument[4]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management.relation", "RelationNotification", True, "RelationNotification", "(String,Object,long,long,String,String,String,ObjectName,List)", "", "Argument[5]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management.relation", "RelationNotification", True, "RelationNotification", "(String,Object,long,long,String,String,String,ObjectName,List)", "", "Argument[6]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management.relation", "RelationNotification", True, "RelationNotification", "(String,Object,long,long,String,String,String,ObjectName,List)", "", "Argument[7]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management.relation", "RelationNotification", True, "RelationNotification", "(String,Object,long,long,String,String,String,ObjectName,List)", "", "Argument[8].Element", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management.relation", "RelationNotification", True, "RelationNotification", "(String,Object,long,long,String,String,String,ObjectName,String,List,List)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management.relation", "RelationNotification", True, "RelationNotification", "(String,Object,long,long,String,String,String,ObjectName,String,List,List)", "", "Argument[10].Element", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management.relation", "RelationNotification", True, "RelationNotification", "(String,Object,long,long,String,String,String,ObjectName,String,List,List)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management.relation", "RelationNotification", True, "RelationNotification", "(String,Object,long,long,String,String,String,ObjectName,String,List,List)", "", "Argument[4]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management.relation", "RelationNotification", True, "RelationNotification", "(String,Object,long,long,String,String,String,ObjectName,String,List,List)", "", "Argument[5]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management.relation", "RelationNotification", True, "RelationNotification", "(String,Object,long,long,String,String,String,ObjectName,String,List,List)", "", "Argument[6]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management.relation", "RelationNotification", True, "RelationNotification", "(String,Object,long,long,String,String,String,ObjectName,String,List,List)", "", "Argument[7]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management.relation", "RelationNotification", True, "RelationNotification", "(String,Object,long,long,String,String,String,ObjectName,String,List,List)", "", "Argument[8]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management.relation", "RelationNotification", True, "RelationNotification", "(String,Object,long,long,String,String,String,ObjectName,String,List,List)", "", "Argument[9].Element", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management.relation", "RelationNotification", True, "getMBeansToUnregister", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.management.relation", "RelationNotification", True, "getNewRoleValue", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.management.relation", "RelationNotification", True, "getObjectName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.management.relation", "RelationNotification", True, "getOldRoleValue", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.management.relation", "RelationNotification", True, "getRelationId", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.management.relation", "RelationNotification", True, "getRelationTypeName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.management.relation", "RelationNotification", True, "getRoleName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.management.relation", "RelationServiceMBean", True, "addRelation", "(ObjectName)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management.relation", "RelationServiceMBean", True, "addRelationType", "(RelationType)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management.relation", "RelationServiceMBean", True, "createRelation", "(String,String,RoleList)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management.relation", "RelationServiceMBean", True, "createRelation", "(String,String,RoleList)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management.relation", "RelationServiceMBean", True, "createRelation", "(String,String,RoleList)", "", "Argument[2].Element", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management.relation", "RelationServiceMBean", True, "createRelationType", "(String,RoleInfo[])", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management.relation", "RelationServiceMBean", True, "findReferencingRelations", "(ObjectName,String,String)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.management.relation", "RelationServiceMBean", True, "findReferencingRelations", "(ObjectName,String,String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management.relation", "RelationNotification", True, "RelationNotification", "(String,Object,long,long,String,String,String,ObjectName,List)", "", "Argument[4]", "Argument[this]", "taint", "dfc-generated"]
+      - ["javax.management.relation", "RelationNotification", True, "RelationNotification", "(String,Object,long,long,String,String,String,ObjectName,List)", "", "Argument[5]", "Argument[this].SyntheticField[javax.management.relation.RelationNotification.relationId]", "value", "dfc-generated"]
+      - ["javax.management.relation", "RelationNotification", True, "RelationNotification", "(String,Object,long,long,String,String,String,ObjectName,List)", "", "Argument[6]", "Argument[this].SyntheticField[javax.management.relation.RelationNotification.relationTypeName]", "value", "dfc-generated"]
+      - ["javax.management.relation", "RelationNotification", True, "RelationNotification", "(String,Object,long,long,String,String,String,ObjectName,List)", "", "Argument[7].SyntheticField[javax.management.ObjectName._canonicalName]", "Argument[this].SyntheticField[javax.management.relation.RelationNotification.relationObjName]", "taint", "dfc-generated"]
+      - ["javax.management.relation", "RelationNotification", True, "RelationNotification", "(String,Object,long,long,String,String,String,ObjectName,List)", "", "Argument[7]", "Argument[this].SyntheticField[javax.management.relation.RelationNotification.relationObjName]", "value", "dfc-generated"]
+      - ["javax.management.relation", "RelationNotification", True, "RelationNotification", "(String,Object,long,long,String,String,String,ObjectName,List)", "", "Argument[8].Element", "Argument[this].SyntheticField[javax.management.relation.RelationNotification.unregisterMBeanList].Element", "value", "dfc-generated"]
+      - ["javax.management.relation", "RelationNotification", True, "RelationNotification", "(String,Object,long,long,String,String,String,ObjectName,String,List,List)", "", "Argument[10].Element", "Argument[this].SyntheticField[javax.management.relation.RelationNotification.oldRoleValue].Element", "value", "dfc-generated"]
+      - ["javax.management.relation", "RelationNotification", True, "RelationNotification", "(String,Object,long,long,String,String,String,ObjectName,String,List,List)", "", "Argument[4]", "Argument[this]", "taint", "dfc-generated"]
+      - ["javax.management.relation", "RelationNotification", True, "RelationNotification", "(String,Object,long,long,String,String,String,ObjectName,String,List,List)", "", "Argument[5]", "Argument[this].SyntheticField[javax.management.relation.RelationNotification.relationId]", "value", "dfc-generated"]
+      - ["javax.management.relation", "RelationNotification", True, "RelationNotification", "(String,Object,long,long,String,String,String,ObjectName,String,List,List)", "", "Argument[6]", "Argument[this].SyntheticField[javax.management.relation.RelationNotification.relationTypeName]", "value", "dfc-generated"]
+      - ["javax.management.relation", "RelationNotification", True, "RelationNotification", "(String,Object,long,long,String,String,String,ObjectName,String,List,List)", "", "Argument[7].SyntheticField[javax.management.ObjectName._canonicalName]", "Argument[this].SyntheticField[javax.management.relation.RelationNotification.relationObjName]", "taint", "dfc-generated"]
+      - ["javax.management.relation", "RelationNotification", True, "RelationNotification", "(String,Object,long,long,String,String,String,ObjectName,String,List,List)", "", "Argument[7]", "Argument[this].SyntheticField[javax.management.relation.RelationNotification.relationObjName]", "value", "dfc-generated"]
+      - ["javax.management.relation", "RelationNotification", True, "RelationNotification", "(String,Object,long,long,String,String,String,ObjectName,String,List,List)", "", "Argument[8]", "Argument[this].SyntheticField[javax.management.relation.RelationNotification.roleName]", "value", "dfc-generated"]
+      - ["javax.management.relation", "RelationNotification", True, "RelationNotification", "(String,Object,long,long,String,String,String,ObjectName,String,List,List)", "", "Argument[9].Element", "Argument[this].SyntheticField[javax.management.relation.RelationNotification.newRoleValue].Element", "value", "dfc-generated"]
+      - ["javax.management.relation", "RelationNotification", True, "getMBeansToUnregister", "()", "", "Argument[this].SyntheticField[javax.management.relation.RelationNotification.unregisterMBeanList].Element", "ReturnValue.Element", "value", "dfc-generated"]
+      - ["javax.management.relation", "RelationNotification", True, "getNewRoleValue", "()", "", "Argument[this].SyntheticField[javax.management.relation.RelationNotification.newRoleValue].Element", "ReturnValue.Element", "value", "dfc-generated"]
+      - ["javax.management.relation", "RelationNotification", True, "getObjectName", "()", "", "Argument[this].SyntheticField[javax.management.relation.RelationNotification.relationObjName]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.management.relation", "RelationNotification", True, "getOldRoleValue", "()", "", "Argument[this].SyntheticField[javax.management.relation.RelationNotification.oldRoleValue].Element", "ReturnValue.Element", "value", "dfc-generated"]
+      - ["javax.management.relation", "RelationNotification", True, "getRelationId", "()", "", "Argument[this].SyntheticField[javax.management.relation.RelationNotification.relationId]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.management.relation", "RelationNotification", True, "getRelationTypeName", "()", "", "Argument[this].SyntheticField[javax.management.relation.RelationNotification.relationTypeName]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.management.relation", "RelationNotification", True, "getRoleName", "()", "", "Argument[this].SyntheticField[javax.management.relation.RelationNotification.roleName]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.management.relation", "RelationService", True, "addRelation", "(ObjectName)", "", "Argument[0]", "Argument[this].SyntheticField[javax.management.relation.RelationService.myRelId2ObjMap].MapValue", "value", "dfc-generated"]
+      - ["javax.management.relation", "RelationService", True, "addRelation", "(ObjectName)", "", "Argument[0]", "Argument[this].SyntheticField[javax.management.relation.RelationService.myRelMBeanObjName2RelIdMap].MapKey", "value", "dfc-generated"]
+      - ["javax.management.relation", "RelationService", True, "addRelationType", "(RelationType)", "", "Argument[0]", "Argument[this].SyntheticField[javax.management.relation.RelationService.myRelType2ObjMap].MapValue", "value", "dfc-generated"]
+      - ["javax.management.relation", "RelationService", True, "createRelation", "(String,String,RoleList)", "", "Argument[0]", "Argument[this].SyntheticField[javax.management.relation.RelationService.myRelId2ObjMap].MapKey", "value", "dfc-generated"]
+      - ["javax.management.relation", "RelationService", True, "createRelationType", "(String,RoleInfo[])", "", "Argument[0]", "Argument[this].SyntheticField[javax.management.relation.RelationService.myRelType2ObjMap].MapKey", "value", "dfc-generated"]
+      - ["javax.management.relation", "RelationService", True, "getAllRelationIds", "()", "", "Argument[this].SyntheticField[javax.management.relation.RelationService.myRelId2ObjMap].MapKey", "ReturnValue.Element", "value", "dfc-generated"]
+      - ["javax.management.relation", "RelationService", True, "getAllRelationTypeNames", "()", "", "Argument[this].SyntheticField[javax.management.relation.RelationService.myRelType2ObjMap].MapKey", "ReturnValue.Element", "value", "dfc-generated"]
+      - ["javax.management.relation", "RelationService", True, "isRelation", "(ObjectName)", "", "Argument[this].SyntheticField[javax.management.relation.RelationService.myRelMBeanObjName2RelIdMap].MapValue", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.management.relation", "RelationService", True, "isRelationMBean", "(String)", "", "Argument[this].SyntheticField[javax.management.relation.RelationService.myRelId2ObjMap].MapValue", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.management.relation", "RelationService", True, "setRoles", "(String,RoleList)", "", "Argument[1].Element", "ReturnValue.SyntheticField[javax.management.relation.RoleResult.roleList].Element", "value", "dfc-generated"]
+      - ["javax.management.relation", "RelationServiceMBean", True, "findAssociatedMBeans", "(ObjectName,String,String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management.relation", "RelationServiceMBean", True, "findReferencingRelations", "(ObjectName,String,String)", "", "Argument[2]", "ReturnValue.MapValue.Element", "value", "dfc-generated"]
       - ["javax.management.relation", "RelationServiceMBean", True, "findRelationsOfType", "(String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.management.relation", "RelationServiceMBean", True, "getAllRelationIds", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.management.relation", "RelationServiceMBean", True, "getAllRelationTypeNames", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management.relation", "RelationServiceMBean", True, "getAllRoles", "(String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["javax.management.relation", "RelationServiceMBean", True, "getRelationTypeName", "(String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["javax.management.relation", "RelationServiceMBean", True, "getRoleInfo", "(String,String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["javax.management.relation", "RelationServiceMBean", True, "getRoleInfos", "(String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.management.relation", "RelationServiceMBean", True, "isRelation", "(ObjectName)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.management.relation", "RelationServiceMBean", True, "isRelationMBean", "(String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management.relation", "RelationServiceMBean", True, "getRoles", "(String,String[])", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["javax.management.relation", "RelationServiceMBean", True, "setRole", "(String,Role)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management.relation", "RelationServiceMBean", True, "setRoles", "(String,RoleList)", "", "Argument[1].Element", "Argument[this]", "taint", "df-generated"]
       - ["javax.management.relation", "RelationServiceMBean", True, "updateRoleMap", "(String,Role,List)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
       - ["javax.management.relation", "RelationServiceNotRegisteredException", True, "RelationServiceNotRegisteredException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management.relation", "RelationSupport", True, "RelationSupport", "(String,ObjectName,MBeanServer,String,RoleList)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management.relation", "RelationSupport", True, "RelationSupport", "(String,ObjectName,MBeanServer,String,RoleList)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management.relation", "RelationSupport", True, "RelationSupport", "(String,ObjectName,MBeanServer,String,RoleList)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management.relation", "RelationSupport", True, "RelationSupport", "(String,ObjectName,MBeanServer,String,RoleList)", "", "Argument[3]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management.relation", "RelationSupport", True, "RelationSupport", "(String,ObjectName,MBeanServer,String,RoleList)", "", "Argument[4].Element", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management.relation", "RelationSupport", True, "RelationSupport", "(String,ObjectName,String,RoleList)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management.relation", "RelationSupport", True, "RelationSupport", "(String,ObjectName,String,RoleList)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management.relation", "RelationSupport", True, "RelationSupport", "(String,ObjectName,String,RoleList)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management.relation", "RelationSupport", True, "RelationSupport", "(String,ObjectName,String,RoleList)", "", "Argument[3].Element", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management.relation", "RelationType", True, "getRelationTypeName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management.relation", "RelationSupport", True, "RelationSupport", "(String,ObjectName,MBeanServer,String,RoleList)", "", "Argument[0]", "Argument[this].SyntheticField[javax.management.relation.RelationSupport.myRelId]", "value", "dfc-generated"]
+      - ["javax.management.relation", "RelationSupport", True, "RelationSupport", "(String,ObjectName,MBeanServer,String,RoleList)", "", "Argument[1]", "Argument[this].SyntheticField[javax.management.relation.RelationSupport.myRelServiceName]", "value", "dfc-generated"]
+      - ["javax.management.relation", "RelationSupport", True, "RelationSupport", "(String,ObjectName,MBeanServer,String,RoleList)", "", "Argument[3]", "Argument[this].SyntheticField[javax.management.relation.RelationSupport.myRelTypeName]", "value", "dfc-generated"]
+      - ["javax.management.relation", "RelationSupport", True, "RelationSupport", "(String,ObjectName,MBeanServer,String,RoleList)", "", "Argument[4].Element", "Argument[this].SyntheticField[javax.management.relation.RelationSupport.myRoleName2ValueMap].MapValue", "value", "dfc-generated"]
+      - ["javax.management.relation", "RelationSupport", True, "RelationSupport", "(String,ObjectName,String,RoleList)", "", "Argument[0]", "Argument[this].SyntheticField[javax.management.relation.RelationSupport.myRelId]", "value", "dfc-generated"]
+      - ["javax.management.relation", "RelationSupport", True, "RelationSupport", "(String,ObjectName,String,RoleList)", "", "Argument[1]", "Argument[this].SyntheticField[javax.management.relation.RelationSupport.myRelServiceName]", "value", "dfc-generated"]
+      - ["javax.management.relation", "RelationSupport", True, "RelationSupport", "(String,ObjectName,String,RoleList)", "", "Argument[2]", "Argument[this].SyntheticField[javax.management.relation.RelationSupport.myRelTypeName]", "value", "dfc-generated"]
+      - ["javax.management.relation", "RelationSupport", True, "RelationSupport", "(String,ObjectName,String,RoleList)", "", "Argument[3].Element", "Argument[this].SyntheticField[javax.management.relation.RelationSupport.myRoleName2ValueMap].MapValue", "value", "dfc-generated"]
+      - ["javax.management.relation", "RelationSupport", True, "getAllRoles", "()", "", "Argument[this].SyntheticField[javax.management.relation.RelationSupport.myRoleName2ValueMap].MapValue", "ReturnValue.SyntheticField[javax.management.relation.RoleResult.roleList].Element", "value", "dfc-generated"]
+      - ["javax.management.relation", "RelationSupport", True, "getRelationId", "()", "", "Argument[this].SyntheticField[javax.management.relation.RelationSupport.myRelId]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.management.relation", "RelationSupport", True, "getRelationServiceName", "()", "", "Argument[this].SyntheticField[javax.management.relation.RelationSupport.myRelServiceName]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.management.relation", "RelationSupport", True, "getRelationTypeName", "()", "", "Argument[this].SyntheticField[javax.management.relation.RelationSupport.myRelTypeName]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.management.relation", "RelationSupport", True, "getRoles", "(String[])", "", "Argument[this].SyntheticField[javax.management.relation.RelationSupport.myRoleName2ValueMap].MapValue", "ReturnValue.SyntheticField[javax.management.relation.RoleResult.roleList].Element", "value", "dfc-generated"]
+      - ["javax.management.relation", "RelationSupport", True, "handleMBeanUnregistration", "(ObjectName,String)", "", "Argument[1]", "Argument[this].SyntheticField[javax.management.relation.RelationSupport.myRoleName2ValueMap].MapKey", "value", "dfc-generated"]
+      - ["javax.management.relation", "RelationSupport", True, "retrieveAllRoles", "()", "", "Argument[this].SyntheticField[javax.management.relation.RelationSupport.myRoleName2ValueMap].MapValue", "ReturnValue.Element", "value", "dfc-generated"]
+      - ["javax.management.relation", "RelationSupport", True, "setRole", "(Role)", "", "Argument[0].SyntheticField[javax.management.relation.Role.name]", "Argument[this].SyntheticField[javax.management.relation.RelationSupport.myRoleName2ValueMap].MapKey", "value", "dfc-generated"]
+      - ["javax.management.relation", "RelationSupport", True, "setRole", "(Role)", "", "Argument[0]", "Argument[this].SyntheticField[javax.management.relation.RelationSupport.myRoleName2ValueMap].MapValue", "value", "dfc-generated"]
+      - ["javax.management.relation", "RelationSupport", True, "setRoles", "(RoleList)", "", "Argument[0].Element", "Argument[this].SyntheticField[javax.management.relation.RelationSupport.myRoleName2ValueMap].MapValue", "value", "dfc-generated"]
+      - ["javax.management.relation", "RelationSupport", True, "setRoles", "(RoleList)", "", "Argument[0].Element", "ReturnValue.SyntheticField[javax.management.relation.RoleResult.roleList].Element", "value", "dfc-generated"]
       - ["javax.management.relation", "RelationType", True, "getRoleInfo", "(String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["javax.management.relation", "RelationType", True, "getRoleInfos", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["javax.management.relation", "RelationTypeNotFoundException", True, "RelationTypeNotFoundException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management.relation", "RelationTypeSupport", True, "RelationTypeSupport", "(String,RoleInfo[])", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management.relation", "RelationTypeSupport", True, "RelationTypeSupport", "(String,RoleInfo[])", "", "Argument[1].ArrayElement", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management.relation", "Role", True, "Role", "(String,List)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management.relation", "Role", True, "Role", "(String,List)", "", "Argument[1].Element", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management.relation", "Role", True, "getRoleName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.management.relation", "Role", True, "getRoleValue", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management.relation", "RelationTypeSupport", True, "RelationTypeSupport", "(String,RoleInfo[])", "", "Argument[0]", "Argument[this].SyntheticField[javax.management.relation.RelationTypeSupport.typeName]", "value", "dfc-generated"]
+      - ["javax.management.relation", "RelationTypeSupport", True, "getRelationTypeName", "()", "", "Argument[this].SyntheticField[javax.management.relation.RelationTypeSupport.typeName]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.management.relation", "Role", True, "Role", "(String,List)", "", "Argument[0]", "Argument[this].SyntheticField[javax.management.relation.Role.name]", "value", "dfc-generated"]
+      - ["javax.management.relation", "Role", True, "Role", "(String,List)", "", "Argument[1].Element", "Argument[this].SyntheticField[javax.management.relation.Role.objectNameList].Element", "value", "dfc-generated"]
+      - ["javax.management.relation", "Role", True, "getRoleName", "()", "", "Argument[this].SyntheticField[javax.management.relation.Role.name]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.management.relation", "Role", True, "getRoleValue", "()", "", "Argument[this].SyntheticField[javax.management.relation.Role.objectNameList]", "ReturnValue", "value", "dfc-generated"]
       - ["javax.management.relation", "Role", True, "roleValueToString", "(List)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["javax.management.relation", "Role", True, "setRoleName", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management.relation", "Role", True, "setRoleValue", "(List)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management.relation", "RoleInfo", True, "RoleInfo", "(RoleInfo)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management.relation", "RoleInfo", True, "RoleInfo", "(String,String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management.relation", "RoleInfo", True, "RoleInfo", "(String,String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management.relation", "RoleInfo", True, "RoleInfo", "(String,String,boolean,boolean)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management.relation", "RoleInfo", True, "RoleInfo", "(String,String,boolean,boolean)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management.relation", "RoleInfo", True, "RoleInfo", "(String,String,boolean,boolean,int,int,String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management.relation", "RoleInfo", True, "RoleInfo", "(String,String,boolean,boolean,int,int,String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management.relation", "RoleInfo", True, "RoleInfo", "(String,String,boolean,boolean,int,int,String)", "", "Argument[6]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management.relation", "RoleInfo", True, "getDescription", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.management.relation", "RoleInfo", True, "getName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.management.relation", "RoleInfo", True, "getRefMBeanClassName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management.relation", "Role", True, "setRoleName", "(String)", "", "Argument[0]", "Argument[this].SyntheticField[javax.management.relation.Role.name]", "value", "dfc-generated"]
+      - ["javax.management.relation", "Role", True, "setRoleValue", "(List)", "", "Argument[0].Element", "Argument[this].SyntheticField[javax.management.relation.Role.objectNameList].Element", "value", "dfc-generated"]
+      - ["javax.management.relation", "RoleInfo", True, "RoleInfo", "(RoleInfo)", "", "Argument[0].SyntheticField[javax.management.relation.RoleInfo.description]", "Argument[this].SyntheticField[javax.management.relation.RoleInfo.description]", "value", "dfc-generated"]
+      - ["javax.management.relation", "RoleInfo", True, "RoleInfo", "(RoleInfo)", "", "Argument[0].SyntheticField[javax.management.relation.RoleInfo.name]", "Argument[this].SyntheticField[javax.management.relation.RoleInfo.name]", "value", "dfc-generated"]
+      - ["javax.management.relation", "RoleInfo", True, "RoleInfo", "(RoleInfo)", "", "Argument[0].SyntheticField[javax.management.relation.RoleInfo.referencedMBeanClassName]", "Argument[this].SyntheticField[javax.management.relation.RoleInfo.referencedMBeanClassName]", "value", "dfc-generated"]
+      - ["javax.management.relation", "RoleInfo", True, "RoleInfo", "(String,String)", "", "Argument[0]", "Argument[this].SyntheticField[javax.management.relation.RoleInfo.name]", "value", "dfc-generated"]
+      - ["javax.management.relation", "RoleInfo", True, "RoleInfo", "(String,String)", "", "Argument[1]", "Argument[this].SyntheticField[javax.management.relation.RoleInfo.referencedMBeanClassName]", "value", "dfc-generated"]
+      - ["javax.management.relation", "RoleInfo", True, "RoleInfo", "(String,String,boolean,boolean)", "", "Argument[0]", "Argument[this].SyntheticField[javax.management.relation.RoleInfo.name]", "value", "dfc-generated"]
+      - ["javax.management.relation", "RoleInfo", True, "RoleInfo", "(String,String,boolean,boolean)", "", "Argument[1]", "Argument[this].SyntheticField[javax.management.relation.RoleInfo.referencedMBeanClassName]", "value", "dfc-generated"]
+      - ["javax.management.relation", "RoleInfo", True, "RoleInfo", "(String,String,boolean,boolean,int,int,String)", "", "Argument[0]", "Argument[this].SyntheticField[javax.management.relation.RoleInfo.name]", "value", "dfc-generated"]
+      - ["javax.management.relation", "RoleInfo", True, "RoleInfo", "(String,String,boolean,boolean,int,int,String)", "", "Argument[1]", "Argument[this].SyntheticField[javax.management.relation.RoleInfo.referencedMBeanClassName]", "value", "dfc-generated"]
+      - ["javax.management.relation", "RoleInfo", True, "RoleInfo", "(String,String,boolean,boolean,int,int,String)", "", "Argument[6]", "Argument[this].SyntheticField[javax.management.relation.RoleInfo.description]", "value", "dfc-generated"]
+      - ["javax.management.relation", "RoleInfo", True, "getDescription", "()", "", "Argument[this].SyntheticField[javax.management.relation.RoleInfo.description]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.management.relation", "RoleInfo", True, "getName", "()", "", "Argument[this].SyntheticField[javax.management.relation.RoleInfo.name]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.management.relation", "RoleInfo", True, "getRefMBeanClassName", "()", "", "Argument[this].SyntheticField[javax.management.relation.RoleInfo.referencedMBeanClassName]", "ReturnValue", "value", "dfc-generated"]
       - ["javax.management.relation", "RoleInfoNotFoundException", True, "RoleInfoNotFoundException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management.relation", "RoleList", True, "RoleList", "(List)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management.relation", "RoleList", True, "add", "(Role)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management.relation", "RoleList", True, "add", "(int,Role)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management.relation", "RoleList", True, "addAll", "(RoleList)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management.relation", "RoleList", True, "asList", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.management.relation", "RoleList", True, "set", "(int,Role)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.relation", "RoleList", True, "RoleList", "(List)", "", "Argument[0].Element", "Argument[this].Element", "value", "dfc-generated"]
+      - ["javax.management.relation", "RoleList", True, "add", "(Role)", "", "Argument[0]", "Argument[this].Element", "value", "dfc-generated"]
+      - ["javax.management.relation", "RoleList", True, "add", "(int,Role)", "", "Argument[1]", "Argument[this].Element", "value", "dfc-generated"]
+      - ["javax.management.relation", "RoleList", True, "addAll", "(RoleList)", "", "Argument[0].Element", "Argument[this].Element", "value", "dfc-generated"]
+      - ["javax.management.relation", "RoleList", True, "asList", "()", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.management.relation", "RoleList", True, "set", "(int,Role)", "", "Argument[1]", "Argument[this].Element", "value", "dfc-generated"]
       - ["javax.management.relation", "RoleNotFoundException", True, "RoleNotFoundException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management.relation", "RoleResult", True, "RoleResult", "(RoleList,RoleUnresolvedList)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management.relation", "RoleResult", True, "RoleResult", "(RoleList,RoleUnresolvedList)", "", "Argument[1].Element", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management.relation", "RoleResult", True, "getRoles", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.management.relation", "RoleResult", True, "getRolesUnresolved", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.management.relation", "RoleResult", True, "setRoles", "(RoleList)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management.relation", "RoleResult", True, "setRolesUnresolved", "(RoleUnresolvedList)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management.relation", "RoleUnresolved", True, "RoleUnresolved", "(String,List,int)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management.relation", "RoleUnresolved", True, "RoleUnresolved", "(String,List,int)", "", "Argument[1].Element", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management.relation", "RoleUnresolved", True, "getRoleName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.management.relation", "RoleUnresolved", True, "getRoleValue", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.management.relation", "RoleUnresolved", True, "setRoleName", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management.relation", "RoleUnresolved", True, "setRoleValue", "(List)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management.relation", "RoleUnresolvedList", True, "RoleUnresolvedList", "(List)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management.relation", "RoleUnresolvedList", True, "add", "(RoleUnresolved)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management.relation", "RoleUnresolvedList", True, "add", "(int,RoleUnresolved)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management.relation", "RoleUnresolvedList", True, "addAll", "(RoleUnresolvedList)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management.relation", "RoleUnresolvedList", True, "asList", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.management.relation", "RoleUnresolvedList", True, "set", "(int,RoleUnresolved)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.relation", "RoleResult", True, "RoleResult", "(RoleList,RoleUnresolvedList)", "", "Argument[0].Element", "Argument[this].SyntheticField[javax.management.relation.RoleResult.roleList].Element", "value", "dfc-generated"]
+      - ["javax.management.relation", "RoleResult", True, "RoleResult", "(RoleList,RoleUnresolvedList)", "", "Argument[1].Element", "Argument[this].SyntheticField[javax.management.relation.RoleResult.unresolvedRoleList].Element", "value", "dfc-generated"]
+      - ["javax.management.relation", "RoleResult", True, "getRoles", "()", "", "Argument[this].SyntheticField[javax.management.relation.RoleResult.roleList]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.management.relation", "RoleResult", True, "getRolesUnresolved", "()", "", "Argument[this].SyntheticField[javax.management.relation.RoleResult.unresolvedRoleList]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.management.relation", "RoleResult", True, "setRoles", "(RoleList)", "", "Argument[0].Element", "Argument[this].SyntheticField[javax.management.relation.RoleResult.roleList].Element", "value", "dfc-generated"]
+      - ["javax.management.relation", "RoleResult", True, "setRolesUnresolved", "(RoleUnresolvedList)", "", "Argument[0].Element", "Argument[this].SyntheticField[javax.management.relation.RoleResult.unresolvedRoleList].Element", "value", "dfc-generated"]
+      - ["javax.management.relation", "RoleUnresolved", True, "RoleUnresolved", "(String,List,int)", "", "Argument[0]", "Argument[this].SyntheticField[javax.management.relation.RoleUnresolved.roleName]", "value", "dfc-generated"]
+      - ["javax.management.relation", "RoleUnresolved", True, "RoleUnresolved", "(String,List,int)", "", "Argument[1].Element", "Argument[this].SyntheticField[javax.management.relation.RoleUnresolved.roleValue].Element", "value", "dfc-generated"]
+      - ["javax.management.relation", "RoleUnresolved", True, "getRoleName", "()", "", "Argument[this].SyntheticField[javax.management.relation.RoleUnresolved.roleName]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.management.relation", "RoleUnresolved", True, "getRoleValue", "()", "", "Argument[this].SyntheticField[javax.management.relation.RoleUnresolved.roleValue]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.management.relation", "RoleUnresolved", True, "setRoleName", "(String)", "", "Argument[0]", "Argument[this].SyntheticField[javax.management.relation.RoleUnresolved.roleName]", "value", "dfc-generated"]
+      - ["javax.management.relation", "RoleUnresolved", True, "setRoleValue", "(List)", "", "Argument[0].Element", "Argument[this].SyntheticField[javax.management.relation.RoleUnresolved.roleValue].Element", "value", "dfc-generated"]
+      - ["javax.management.relation", "RoleUnresolvedList", True, "RoleUnresolvedList", "(List)", "", "Argument[0].Element", "Argument[this].Element", "value", "dfc-generated"]
+      - ["javax.management.relation", "RoleUnresolvedList", True, "add", "(RoleUnresolved)", "", "Argument[0]", "Argument[this].Element", "value", "dfc-generated"]
+      - ["javax.management.relation", "RoleUnresolvedList", True, "add", "(int,RoleUnresolved)", "", "Argument[1]", "Argument[this].Element", "value", "dfc-generated"]
+      - ["javax.management.relation", "RoleUnresolvedList", True, "addAll", "(RoleUnresolvedList)", "", "Argument[0].Element", "Argument[this].Element", "value", "dfc-generated"]
+      - ["javax.management.relation", "RoleUnresolvedList", True, "asList", "()", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.management.relation", "RoleUnresolvedList", True, "set", "(int,RoleUnresolved)", "", "Argument[1]", "Argument[this].Element", "value", "dfc-generated"]
   - addsTo:
       pack: codeql/java-all
       extensible: neutralModel
     data:
       - ["javax.management.relation", "MBeanServerNotificationFilter", "disableAllObjectNames", "()", "summary", "df-generated"]
       - ["javax.management.relation", "MBeanServerNotificationFilter", "enableAllObjectNames", "()", "summary", "df-generated"]
-      - ["javax.management.relation", "Relation", "getAllRoles", "()", "summary", "df-generated"]
-      - ["javax.management.relation", "Relation", "getRoleCardinality", "(String)", "summary", "df-generated"]
-      - ["javax.management.relation", "Relation", "getRoles", "(String[])", "summary", "df-generated"]
+      - ["javax.management.relation", "MBeanServerNotificationFilter", "isNotificationEnabled", "(Notification)", "summary", "df-generated"]
       - ["javax.management.relation", "RelationService", "RelationService", "(boolean)", "summary", "df-generated"]
-      - ["javax.management.relation", "RelationServiceMBean", "checkRoleReading", "(String,String)", "summary", "df-generated"]
-      - ["javax.management.relation", "RelationServiceMBean", "checkRoleWriting", "(Role,String,Boolean)", "summary", "df-generated"]
-      - ["javax.management.relation", "RelationServiceMBean", "findAssociatedMBeans", "(ObjectName,String,String)", "summary", "df-generated"]
-      - ["javax.management.relation", "RelationServiceMBean", "getAllRoles", "(String)", "summary", "df-generated"]
-      - ["javax.management.relation", "RelationServiceMBean", "getPurgeFlag", "()", "summary", "df-generated"]
-      - ["javax.management.relation", "RelationServiceMBean", "getReferencedMBeans", "(String)", "summary", "df-generated"]
-      - ["javax.management.relation", "RelationServiceMBean", "getRole", "(String,String)", "summary", "df-generated"]
-      - ["javax.management.relation", "RelationServiceMBean", "getRoleCardinality", "(String,String)", "summary", "df-generated"]
-      - ["javax.management.relation", "RelationServiceMBean", "getRoles", "(String,String[])", "summary", "df-generated"]
-      - ["javax.management.relation", "RelationServiceMBean", "hasRelation", "(String)", "summary", "df-generated"]
-      - ["javax.management.relation", "RelationServiceMBean", "isActive", "()", "summary", "df-generated"]
-      - ["javax.management.relation", "RelationServiceMBean", "purgeRelations", "()", "summary", "df-generated"]
-      - ["javax.management.relation", "RelationServiceMBean", "removeRelation", "(String)", "summary", "df-generated"]
-      - ["javax.management.relation", "RelationServiceMBean", "removeRelationType", "(String)", "summary", "df-generated"]
-      - ["javax.management.relation", "RelationServiceMBean", "sendRelationCreationNotification", "(String)", "summary", "df-generated"]
-      - ["javax.management.relation", "RelationServiceMBean", "sendRelationRemovalNotification", "(String,List)", "summary", "df-generated"]
-      - ["javax.management.relation", "RelationServiceMBean", "sendRoleUpdateNotification", "(String,Role,List)", "summary", "df-generated"]
-      - ["javax.management.relation", "RelationServiceMBean", "setPurgeFlag", "(boolean)", "summary", "df-generated"]
-      - ["javax.management.relation", "RelationSupportMBean", "isInRelationService", "()", "summary", "df-generated"]
-      - ["javax.management.relation", "RelationSupportMBean", "setRelationServiceManagementFlag", "(Boolean)", "summary", "df-generated"]
+      - ["javax.management.relation", "RelationService", "checkRoleReading", "(String,String)", "summary", "df-generated"]
+      - ["javax.management.relation", "RelationService", "checkRoleWriting", "(Role,String,Boolean)", "summary", "df-generated"]
+      - ["javax.management.relation", "RelationService", "getPurgeFlag", "()", "summary", "df-generated"]
+      - ["javax.management.relation", "RelationService", "getReferencedMBeans", "(String)", "summary", "df-generated"]
+      - ["javax.management.relation", "RelationService", "getRole", "(String,String)", "summary", "df-generated"]
+      - ["javax.management.relation", "RelationService", "getRoleCardinality", "(String,String)", "summary", "df-generated"]
+      - ["javax.management.relation", "RelationService", "hasRelation", "(String)", "summary", "df-generated"]
+      - ["javax.management.relation", "RelationService", "isActive", "()", "summary", "df-generated"]
+      - ["javax.management.relation", "RelationService", "postDeregister", "()", "summary", "df-generated"]
+      - ["javax.management.relation", "RelationService", "postRegister", "(Boolean)", "summary", "df-generated"]
+      - ["javax.management.relation", "RelationService", "preDeregister", "()", "summary", "df-generated"]
+      - ["javax.management.relation", "RelationService", "purgeRelations", "()", "summary", "df-generated"]
+      - ["javax.management.relation", "RelationService", "removeRelation", "(String)", "summary", "df-generated"]
+      - ["javax.management.relation", "RelationService", "removeRelationType", "(String)", "summary", "df-generated"]
+      - ["javax.management.relation", "RelationService", "sendRelationCreationNotification", "(String)", "summary", "df-generated"]
+      - ["javax.management.relation", "RelationService", "sendRelationRemovalNotification", "(String,List)", "summary", "df-generated"]
+      - ["javax.management.relation", "RelationService", "sendRoleUpdateNotification", "(String,Role,List)", "summary", "df-generated"]
+      - ["javax.management.relation", "RelationService", "setPurgeFlag", "(boolean)", "summary", "df-generated"]
+      - ["javax.management.relation", "RelationSupport", "getRoleCardinality", "(String)", "summary", "df-generated"]
+      - ["javax.management.relation", "RelationSupport", "isInRelationService", "()", "summary", "df-generated"]
+      - ["javax.management.relation", "RelationSupport", "postDeregister", "()", "summary", "df-generated"]
+      - ["javax.management.relation", "RelationSupport", "postRegister", "(Boolean)", "summary", "df-generated"]
+      - ["javax.management.relation", "RelationSupport", "preDeregister", "()", "summary", "df-generated"]
+      - ["javax.management.relation", "RelationSupport", "setRelationServiceManagementFlag", "(Boolean)", "summary", "df-generated"]
       - ["javax.management.relation", "RoleInfo", "checkMaxDegree", "(int)", "summary", "df-generated"]
       - ["javax.management.relation", "RoleInfo", "checkMinDegree", "(int)", "summary", "df-generated"]
       - ["javax.management.relation", "RoleInfo", "getMaxDegree", "()", "summary", "df-generated"]
diff --git a/java/ql/lib/ext/generated/javax.management.remote.model.yml b/java/ql/lib/ext/generated/javax.management.remote.model.yml
index e06da36da21..6c2dc2f12f2 100644
--- a/java/ql/lib/ext/generated/javax.management.remote.model.yml
+++ b/java/ql/lib/ext/generated/javax.management.remote.model.yml
@@ -4,13 +4,11 @@ extensions:
       pack: codeql/java-all
       extensible: summaryModel
     data:
-      - ["javax.management.remote", "JMXAddressable", True, "getAddress", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.management.remote", "JMXConnectionNotification", True, "JMXConnectionNotification", "(String,Object,String,long,String,Object)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management.remote", "JMXConnectionNotification", True, "JMXConnectionNotification", "(String,Object,String,long,String,Object)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management.remote", "JMXConnectionNotification", True, "JMXConnectionNotification", "(String,Object,String,long,String,Object)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management.remote", "JMXConnectionNotification", True, "JMXConnectionNotification", "(String,Object,String,long,String,Object)", "", "Argument[4]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management.remote", "JMXConnectionNotification", True, "JMXConnectionNotification", "(String,Object,String,long,String,Object)", "", "Argument[5]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management.remote", "JMXConnectionNotification", True, "getConnectionId", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management.remote", "JMXAuthenticator", True, "authenticate", "(Object)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.remote", "JMXAuthenticator", True, "authenticate", "(Object)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management.remote", "JMXConnectionNotification", True, "JMXConnectionNotification", "(String,Object,String,long,String,Object)", "", "Argument[2]", "Argument[this].SyntheticField[javax.management.remote.JMXConnectionNotification.connectionId]", "value", "dfc-generated"]
+      - ["javax.management.remote", "JMXConnectionNotification", True, "JMXConnectionNotification", "(String,Object,String,long,String,Object)", "", "Argument[4]", "Argument[this]", "taint", "dfc-generated"]
+      - ["javax.management.remote", "JMXConnectionNotification", True, "getConnectionId", "()", "", "Argument[this].SyntheticField[javax.management.remote.JMXConnectionNotification.connectionId]", "ReturnValue", "value", "dfc-generated"]
       - ["javax.management.remote", "JMXConnector", True, "connect", "(Map)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
       - ["javax.management.remote", "JMXConnector", True, "getConnectionId", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["javax.management.remote", "JMXConnector", True, "getMBeanServerConnection", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
@@ -22,50 +20,52 @@ extensions:
       - ["javax.management.remote", "JMXConnectorFactory", True, "connect", "(JMXServiceURL,Map)", "", "Argument[1].Element", "ReturnValue", "taint", "df-generated"]
       - ["javax.management.remote", "JMXConnectorFactory", True, "newJMXConnector", "(JMXServiceURL,Map)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["javax.management.remote", "JMXConnectorFactory", True, "newJMXConnector", "(JMXServiceURL,Map)", "", "Argument[1].Element", "ReturnValue", "taint", "df-generated"]
-      - ["javax.management.remote", "JMXConnectorServer", True, "JMXConnectorServer", "(MBeanServer)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management.remote", "JMXConnectorServer", True, "getMBeanServer", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.management.remote", "JMXConnectorServerFactory", True, "newJMXConnectorServer", "(JMXServiceURL,Map,MBeanServer)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.management.remote", "JMXConnectorServerFactory", True, "newJMXConnectorServer", "(JMXServiceURL,Map,MBeanServer)", "", "Argument[1].Element", "ReturnValue", "taint", "df-generated"]
-      - ["javax.management.remote", "JMXConnectorServerFactory", True, "newJMXConnectorServer", "(JMXServiceURL,Map,MBeanServer)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.management.remote", "JMXConnectorServerMBean", True, "getAddress", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.management.remote", "JMXConnectorServerMBean", True, "getAttributes", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management.remote", "JMXConnectorProvider", True, "newJMXConnector", "(JMXServiceURL,Map)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management.remote", "JMXConnectorProvider", True, "newJMXConnector", "(JMXServiceURL,Map)", "", "Argument[1].Element", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management.remote", "JMXConnectorServer", True, "JMXConnectorServer", "(MBeanServer)", "", "Argument[0]", "Argument[this].SyntheticField[javax.management.remote.JMXConnectorServer.mbeanServer]", "value", "dfc-generated"]
+      - ["javax.management.remote", "JMXConnectorServer", True, "getMBeanServer", "()", "", "Argument[this].SyntheticField[javax.management.remote.JMXConnectorServer.mbeanServer]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.management.remote", "JMXConnectorServer", True, "preRegister", "(MBeanServer,ObjectName)", "", "Argument[0]", "Argument[this].SyntheticField[javax.management.remote.JMXConnectorServer.mbeanServer]", "value", "dfc-generated"]
+      - ["javax.management.remote", "JMXConnectorServer", True, "setMBeanServerForwarder", "(MBeanServerForwarder)", "", "Argument[0]", "Argument[this].SyntheticField[javax.management.remote.JMXConnectorServer.mbeanServer]", "value", "dfc-generated"]
+      - ["javax.management.remote", "JMXConnectorServerFactory", True, "newJMXConnectorServer", "(JMXServiceURL,Map,MBeanServer)", "", "Argument[2]", "ReturnValue.SyntheticField[javax.management.remote.JMXConnectorServer.mbeanServer]", "value", "dfc-generated"]
       - ["javax.management.remote", "JMXConnectorServerMBean", True, "getConnectionIds", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.management.remote", "JMXConnectorServerMBean", True, "setMBeanServerForwarder", "(MBeanServerForwarder)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management.remote", "JMXConnectorServerMBean", True, "setMBeanServerForwarder", "(MBeanServerForwarder)", "", "Argument[this]", "Argument[0]", "taint", "df-generated"]
       - ["javax.management.remote", "JMXConnectorServerMBean", True, "toJMXConnector", "(Map)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
       - ["javax.management.remote", "JMXConnectorServerMBean", True, "toJMXConnector", "(Map)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.management.remote", "JMXPrincipal", True, "JMXPrincipal", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.remote", "JMXConnectorServerProvider", True, "newJMXConnectorServer", "(JMXServiceURL,Map,MBeanServer)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management.remote", "JMXConnectorServerProvider", True, "newJMXConnectorServer", "(JMXServiceURL,Map,MBeanServer)", "", "Argument[1].Element", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management.remote", "JMXConnectorServerProvider", True, "newJMXConnectorServer", "(JMXServiceURL,Map,MBeanServer)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management.remote", "JMXPrincipal", True, "JMXPrincipal", "(String)", "", "Argument[0]", "Argument[this].SyntheticField[javax.management.remote.JMXPrincipal.name]", "value", "dfc-generated"]
+      - ["javax.management.remote", "JMXPrincipal", True, "getName", "()", "", "Argument[this].SyntheticField[javax.management.remote.JMXPrincipal.name]", "ReturnValue", "value", "dfc-generated"]
       - ["javax.management.remote", "JMXProviderException", True, "JMXProviderException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["javax.management.remote", "JMXProviderException", True, "JMXProviderException", "(String,Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["javax.management.remote", "JMXProviderException", True, "JMXProviderException", "(String,Throwable)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
       - ["javax.management.remote", "JMXServerErrorException", True, "JMXServerErrorException", "(String,Error)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["javax.management.remote", "JMXServerErrorException", True, "JMXServerErrorException", "(String,Error)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management.remote", "JMXServiceURL", True, "JMXServiceURL", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management.remote", "JMXServiceURL", True, "JMXServiceURL", "(String,String,int)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management.remote", "JMXServiceURL", True, "JMXServiceURL", "(String,String,int)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management.remote", "JMXServiceURL", True, "JMXServiceURL", "(String,String,int,String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management.remote", "JMXServiceURL", True, "JMXServiceURL", "(String,String,int,String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management.remote", "JMXServiceURL", True, "JMXServiceURL", "(String,String,int,String)", "", "Argument[3]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management.remote", "JMXServiceURL", True, "getHost", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.management.remote", "JMXServiceURL", True, "getProtocol", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.management.remote", "JMXServiceURL", True, "getURLPath", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.management.remote", "NotificationResult", True, "NotificationResult", "(long,long,TargetedNotification[])", "", "Argument[2].ArrayElement", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management.remote", "NotificationResult", True, "getTargetedNotifications", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.management.remote", "SubjectDelegationPermission", False, "SubjectDelegationPermission", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management.remote", "SubjectDelegationPermission", False, "SubjectDelegationPermission", "(String,String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management.remote", "TargetedNotification", True, "TargetedNotification", "(Notification,Integer)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management.remote", "TargetedNotification", True, "getNotification", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management.remote", "JMXServiceURL", True, "JMXServiceURL", "(String)", "", "Argument[0]", "Argument[this].SyntheticField[javax.management.remote.JMXServiceURL.host]", "taint", "dfc-generated"]
+      - ["javax.management.remote", "JMXServiceURL", True, "JMXServiceURL", "(String)", "", "Argument[0]", "Argument[this].SyntheticField[javax.management.remote.JMXServiceURL.protocol]", "taint", "dfc-generated"]
+      - ["javax.management.remote", "JMXServiceURL", True, "JMXServiceURL", "(String)", "", "Argument[0]", "Argument[this].SyntheticField[javax.management.remote.JMXServiceURL.urlPath]", "taint", "dfc-generated"]
+      - ["javax.management.remote", "JMXServiceURL", True, "JMXServiceURL", "(String,String,int)", "", "Argument[0]", "Argument[this].SyntheticField[javax.management.remote.JMXServiceURL.protocol]", "taint", "dfc-generated"]
+      - ["javax.management.remote", "JMXServiceURL", True, "JMXServiceURL", "(String,String,int)", "", "Argument[1]", "Argument[this].SyntheticField[javax.management.remote.JMXServiceURL.host]", "value", "dfc-generated"]
+      - ["javax.management.remote", "JMXServiceURL", True, "JMXServiceURL", "(String,String,int,String)", "", "Argument[0]", "Argument[this].SyntheticField[javax.management.remote.JMXServiceURL.protocol]", "taint", "dfc-generated"]
+      - ["javax.management.remote", "JMXServiceURL", True, "JMXServiceURL", "(String,String,int,String)", "", "Argument[1]", "Argument[this].SyntheticField[javax.management.remote.JMXServiceURL.host]", "value", "dfc-generated"]
+      - ["javax.management.remote", "JMXServiceURL", True, "JMXServiceURL", "(String,String,int,String)", "", "Argument[3]", "Argument[this].SyntheticField[javax.management.remote.JMXServiceURL.urlPath]", "value", "dfc-generated"]
+      - ["javax.management.remote", "JMXServiceURL", True, "getHost", "()", "", "Argument[this].SyntheticField[javax.management.remote.JMXServiceURL.host]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.management.remote", "JMXServiceURL", True, "getProtocol", "()", "", "Argument[this].SyntheticField[javax.management.remote.JMXServiceURL.protocol]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.management.remote", "JMXServiceURL", True, "getURLPath", "()", "", "Argument[this].SyntheticField[javax.management.remote.JMXServiceURL.urlPath]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.management.remote", "MBeanServerForwarder", True, "getMBeanServer", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management.remote", "MBeanServerForwarder", True, "setMBeanServer", "(MBeanServer)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.remote", "NotificationResult", True, "NotificationResult", "(long,long,TargetedNotification[])", "", "Argument[2]", "Argument[this].SyntheticField[javax.management.remote.NotificationResult.targetedNotifications]", "value", "dfc-generated"]
+      - ["javax.management.remote", "NotificationResult", True, "getTargetedNotifications", "()", "", "Argument[this].SyntheticField[javax.management.remote.NotificationResult.targetedNotifications]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.management.remote", "SubjectDelegationPermission", False, "SubjectDelegationPermission", "(String)", "", "Argument[0]", "Argument[this]", "taint", "dfc-generated"]
+      - ["javax.management.remote", "SubjectDelegationPermission", False, "SubjectDelegationPermission", "(String,String)", "", "Argument[0]", "Argument[this]", "taint", "dfc-generated"]
+      - ["javax.management.remote", "TargetedNotification", True, "TargetedNotification", "(Notification,Integer)", "", "Argument[0]", "Argument[this].SyntheticField[javax.management.remote.TargetedNotification.notif]", "value", "dfc-generated"]
+      - ["javax.management.remote", "TargetedNotification", True, "getNotification", "()", "", "Argument[this].SyntheticField[javax.management.remote.TargetedNotification.notif]", "ReturnValue", "value", "dfc-generated"]
   - addsTo:
       pack: codeql/java-all
       extensible: neutralModel
     data:
-      - ["javax.management.remote", "JMXConnector", "addConnectionNotificationListener", "(NotificationListener,NotificationFilter,Object)", "summary", "df-generated"]
-      - ["javax.management.remote", "JMXConnector", "connect", "()", "summary", "df-generated"]
-      - ["javax.management.remote", "JMXConnector", "removeConnectionNotificationListener", "(NotificationListener)", "summary", "df-generated"]
-      - ["javax.management.remote", "JMXConnector", "removeConnectionNotificationListener", "(NotificationListener,NotificationFilter,Object)", "summary", "df-generated"]
-      - ["javax.management.remote", "JMXConnectorServerMBean", "isActive", "()", "summary", "df-generated"]
-      - ["javax.management.remote", "JMXConnectorServerMBean", "start", "()", "summary", "df-generated"]
-      - ["javax.management.remote", "JMXConnectorServerMBean", "stop", "()", "summary", "df-generated"]
+      - ["javax.management.remote", "JMXConnectorServer", "postDeregister", "()", "summary", "df-generated"]
+      - ["javax.management.remote", "JMXConnectorServer", "postRegister", "(Boolean)", "summary", "df-generated"]
+      - ["javax.management.remote", "JMXConnectorServer", "preDeregister", "()", "summary", "df-generated"]
       - ["javax.management.remote", "JMXServiceURL", "getPort", "()", "summary", "df-generated"]
       - ["javax.management.remote", "NotificationResult", "getEarliestSequenceNumber", "()", "summary", "df-generated"]
       - ["javax.management.remote", "NotificationResult", "getNextSequenceNumber", "()", "summary", "df-generated"]
diff --git a/java/ql/lib/ext/generated/javax.management.remote.rmi.model.yml b/java/ql/lib/ext/generated/javax.management.remote.rmi.model.yml
index 2189861fca8..e340f346425 100644
--- a/java/ql/lib/ext/generated/javax.management.remote.rmi.model.yml
+++ b/java/ql/lib/ext/generated/javax.management.remote.rmi.model.yml
@@ -22,7 +22,6 @@ extensions:
       - ["javax.management.remote.rmi", "RMIConnection", True, "getAttribute", "(ObjectName,String,Subject)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
       - ["javax.management.remote.rmi", "RMIConnection", True, "getAttributes", "(ObjectName,String[],Subject)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["javax.management.remote.rmi", "RMIConnection", True, "getAttributes", "(ObjectName,String[],Subject)", "", "Argument[1].ArrayElement", "ReturnValue", "taint", "df-generated"]
-      - ["javax.management.remote.rmi", "RMIConnection", True, "getConnectionId", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["javax.management.remote.rmi", "RMIConnection", True, "getObjectInstance", "(ObjectName,Subject)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["javax.management.remote.rmi", "RMIConnection", True, "invoke", "(ObjectName,String,MarshalledObject,String[],Subject)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["javax.management.remote.rmi", "RMIConnection", True, "invoke", "(ObjectName,String,MarshalledObject,String[],Subject)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
@@ -30,55 +29,82 @@ extensions:
       - ["javax.management.remote.rmi", "RMIConnection", True, "invoke", "(ObjectName,String,MarshalledObject,String[],Subject)", "", "Argument[3].ArrayElement", "ReturnValue", "taint", "df-generated"]
       - ["javax.management.remote.rmi", "RMIConnection", True, "setAttributes", "(ObjectName,MarshalledObject,Subject)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["javax.management.remote.rmi", "RMIConnection", True, "setAttributes", "(ObjectName,MarshalledObject,Subject)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.management.remote.rmi", "RMIConnectionImpl", True, "RMIConnectionImpl", "(RMIServerImpl,String,ClassLoader,Subject,Map)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management.remote.rmi", "RMIConnectionImpl", True, "RMIConnectionImpl", "(RMIServerImpl,String,ClassLoader,Subject,Map)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management.remote.rmi", "RMIConnectionImpl", True, "RMIConnectionImpl", "(RMIServerImpl,String,ClassLoader,Subject,Map)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management.remote.rmi", "RMIConnectionImpl", True, "RMIConnectionImpl", "(RMIServerImpl,String,ClassLoader,Subject,Map)", "", "Argument[3]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management.remote.rmi", "RMIConnectionImpl", True, "RMIConnectionImpl", "(RMIServerImpl,String,ClassLoader,Subject,Map)", "", "Argument[4].Element", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.remote.rmi", "RMIConnectionImpl", True, "RMIConnectionImpl", "(RMIServerImpl,String,ClassLoader,Subject,Map)", "", "Argument[1]", "Argument[this].SyntheticField[javax.management.remote.rmi.RMIConnectionImpl.connectionId]", "value", "dfc-generated"]
+      - ["javax.management.remote.rmi", "RMIConnectionImpl", True, "getConnectionId", "()", "", "Argument[this].SyntheticField[javax.management.remote.rmi.RMIConnectionImpl.connectionId]", "ReturnValue", "value", "dfc-generated"]
       - ["javax.management.remote.rmi", "RMIConnectionImpl_Stub", False, "RMIConnectionImpl_Stub", "(RemoteRef)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management.remote.rmi", "RMIConnector", True, "RMIConnector", "(JMXServiceURL,Map)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management.remote.rmi", "RMIConnector", True, "RMIConnector", "(JMXServiceURL,Map)", "", "Argument[1].Element", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.remote.rmi", "RMIConnector", True, "RMIConnector", "(JMXServiceURL,Map)", "", "Argument[0]", "Argument[this].SyntheticField[javax.management.remote.rmi.RMIConnector.jmxServiceURL]", "value", "dfc-generated"]
       - ["javax.management.remote.rmi", "RMIConnector", True, "RMIConnector", "(RMIServer,Map)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["javax.management.remote.rmi", "RMIConnector", True, "RMIConnector", "(RMIServer,Map)", "", "Argument[1].Element", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management.remote.rmi", "RMIConnectorServer", True, "RMIConnectorServer", "(JMXServiceURL,Map)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management.remote.rmi", "RMIConnectorServer", True, "RMIConnectorServer", "(JMXServiceURL,Map)", "", "Argument[1].Element", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management.remote.rmi", "RMIConnectorServer", True, "RMIConnectorServer", "(JMXServiceURL,Map,MBeanServer)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management.remote.rmi", "RMIConnectorServer", True, "RMIConnectorServer", "(JMXServiceURL,Map,MBeanServer)", "", "Argument[1].Element", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management.remote.rmi", "RMIConnectorServer", True, "RMIConnectorServer", "(JMXServiceURL,Map,MBeanServer)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management.remote.rmi", "RMIConnectorServer", True, "RMIConnectorServer", "(JMXServiceURL,Map,RMIServerImpl,MBeanServer)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management.remote.rmi", "RMIConnectorServer", True, "RMIConnectorServer", "(JMXServiceURL,Map,RMIServerImpl,MBeanServer)", "", "Argument[1].Element", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management.remote.rmi", "RMIConnectorServer", True, "RMIConnectorServer", "(JMXServiceURL,Map,RMIServerImpl,MBeanServer)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management.remote.rmi", "RMIConnectorServer", True, "RMIConnectorServer", "(JMXServiceURL,Map,RMIServerImpl,MBeanServer)", "", "Argument[3]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.remote.rmi", "RMIConnector", True, "getAddress", "()", "", "Argument[this].SyntheticField[javax.management.remote.rmi.RMIConnector.jmxServiceURL]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.management.remote.rmi", "RMIConnectorServer", True, "RMIConnectorServer", "(JMXServiceURL,Map)", "", "Argument[0]", "Argument[this].SyntheticField[javax.management.remote.rmi.RMIConnectorServer.address]", "value", "dfc-generated"]
+      - ["javax.management.remote.rmi", "RMIConnectorServer", True, "RMIConnectorServer", "(JMXServiceURL,Map)", "", "Argument[1].MapKey", "Argument[this].SyntheticField[javax.management.remote.rmi.RMIConnectorServer.attributes].MapKey", "value", "dfc-generated"]
+      - ["javax.management.remote.rmi", "RMIConnectorServer", True, "RMIConnectorServer", "(JMXServiceURL,Map)", "", "Argument[1].MapValue", "Argument[this].SyntheticField[javax.management.remote.rmi.RMIConnectorServer.attributes].MapValue", "value", "dfc-generated"]
+      - ["javax.management.remote.rmi", "RMIConnectorServer", True, "RMIConnectorServer", "(JMXServiceURL,Map,MBeanServer)", "", "Argument[0]", "Argument[this].SyntheticField[javax.management.remote.rmi.RMIConnectorServer.address]", "value", "dfc-generated"]
+      - ["javax.management.remote.rmi", "RMIConnectorServer", True, "RMIConnectorServer", "(JMXServiceURL,Map,MBeanServer)", "", "Argument[1].MapKey", "Argument[this].SyntheticField[javax.management.remote.rmi.RMIConnectorServer.attributes].MapKey", "value", "dfc-generated"]
+      - ["javax.management.remote.rmi", "RMIConnectorServer", True, "RMIConnectorServer", "(JMXServiceURL,Map,MBeanServer)", "", "Argument[1].MapValue", "Argument[this].SyntheticField[javax.management.remote.rmi.RMIConnectorServer.attributes].MapValue", "value", "dfc-generated"]
+      - ["javax.management.remote.rmi", "RMIConnectorServer", True, "RMIConnectorServer", "(JMXServiceURL,Map,RMIServerImpl,MBeanServer)", "", "Argument[0]", "Argument[this].SyntheticField[javax.management.remote.rmi.RMIConnectorServer.address]", "value", "dfc-generated"]
+      - ["javax.management.remote.rmi", "RMIConnectorServer", True, "RMIConnectorServer", "(JMXServiceURL,Map,RMIServerImpl,MBeanServer)", "", "Argument[1].MapKey", "Argument[this].SyntheticField[javax.management.remote.rmi.RMIConnectorServer.attributes].MapKey", "value", "dfc-generated"]
+      - ["javax.management.remote.rmi", "RMIConnectorServer", True, "RMIConnectorServer", "(JMXServiceURL,Map,RMIServerImpl,MBeanServer)", "", "Argument[1].MapValue", "Argument[this].SyntheticField[javax.management.remote.rmi.RMIConnectorServer.attributes].MapValue", "value", "dfc-generated"]
+      - ["javax.management.remote.rmi", "RMIConnectorServer", True, "getAddress", "()", "", "Argument[this].SyntheticField[javax.management.remote.rmi.RMIConnectorServer.address]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.management.remote.rmi", "RMIConnectorServer", True, "getAttributes", "()", "", "Argument[this].SyntheticField[javax.management.remote.rmi.RMIConnectorServer.attributes].MapKey", "ReturnValue.MapKey", "value", "dfc-generated"]
+      - ["javax.management.remote.rmi", "RMIConnectorServer", True, "getAttributes", "()", "", "Argument[this].SyntheticField[javax.management.remote.rmi.RMIConnectorServer.attributes].MapValue", "ReturnValue.MapValue", "value", "dfc-generated"]
+      - ["javax.management.remote.rmi", "RMIConnectorServer", True, "setMBeanServerForwarder", "(MBeanServerForwarder)", "", "Argument[0]", "Argument[this].SyntheticField[javax.management.remote.JMXConnectorServer.mbeanServer]", "value", "dfc-generated"]
       - ["javax.management.remote.rmi", "RMIIIOPServerImpl", True, "RMIIIOPServerImpl", "(Map)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
       - ["javax.management.remote.rmi", "RMIJRMPServerImpl", True, "RMIJRMPServerImpl", "(int,RMIClientSocketFactory,RMIServerSocketFactory,Map)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
       - ["javax.management.remote.rmi", "RMIJRMPServerImpl", True, "RMIJRMPServerImpl", "(int,RMIClientSocketFactory,RMIServerSocketFactory,Map)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
       - ["javax.management.remote.rmi", "RMIJRMPServerImpl", True, "RMIJRMPServerImpl", "(int,RMIClientSocketFactory,RMIServerSocketFactory,Map)", "", "Argument[3].Element", "Argument[this]", "taint", "df-generated"]
       - ["javax.management.remote.rmi", "RMIServer", True, "newClient", "(Object)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["javax.management.remote.rmi", "RMIServerImpl", True, "RMIServerImpl", "(Map)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management.remote.rmi", "RMIServerImpl", True, "getDefaultClassLoader", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.management.remote.rmi", "RMIServerImpl", True, "getMBeanServer", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.management.remote.rmi", "RMIServerImpl", True, "setDefaultClassLoader", "(ClassLoader)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management.remote.rmi", "RMIServerImpl", True, "setMBeanServer", "(MBeanServer)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management.remote.rmi", "RMIServerImpl", True, "toStub", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management.remote.rmi", "RMIServerImpl", True, "getDefaultClassLoader", "()", "", "Argument[this].SyntheticField[javax.management.remote.rmi.RMIServerImpl.cl]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.management.remote.rmi", "RMIServerImpl", True, "getMBeanServer", "()", "", "Argument[this].SyntheticField[javax.management.remote.rmi.RMIServerImpl.mbeanServer]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.management.remote.rmi", "RMIServerImpl", True, "setDefaultClassLoader", "(ClassLoader)", "", "Argument[0]", "Argument[this].SyntheticField[javax.management.remote.rmi.RMIServerImpl.cl]", "value", "dfc-generated"]
+      - ["javax.management.remote.rmi", "RMIServerImpl", True, "setMBeanServer", "(MBeanServer)", "", "Argument[0]", "Argument[this].SyntheticField[javax.management.remote.rmi.RMIServerImpl.mbeanServer]", "value", "dfc-generated"]
+      - ["javax.management.remote.rmi", "RMIServerImpl", True, "toStub", "()", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
       - ["javax.management.remote.rmi", "RMIServerImpl_Stub", False, "RMIServerImpl_Stub", "(RemoteRef)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
   - addsTo:
       pack: codeql/java-all
       extensible: neutralModel
     data:
-      - ["javax.management.remote.rmi", "RMIConnection", "addNotificationListener", "(ObjectName,ObjectName,MarshalledObject,MarshalledObject,Subject)", "summary", "df-generated"]
-      - ["javax.management.remote.rmi", "RMIConnection", "addNotificationListeners", "(ObjectName[],MarshalledObject[],Subject[])", "summary", "df-generated"]
-      - ["javax.management.remote.rmi", "RMIConnection", "fetchNotifications", "(long,int,long)", "summary", "df-generated"]
-      - ["javax.management.remote.rmi", "RMIConnection", "getDefaultDomain", "(Subject)", "summary", "df-generated"]
-      - ["javax.management.remote.rmi", "RMIConnection", "getDomains", "(Subject)", "summary", "df-generated"]
-      - ["javax.management.remote.rmi", "RMIConnection", "getMBeanCount", "(Subject)", "summary", "df-generated"]
-      - ["javax.management.remote.rmi", "RMIConnection", "getMBeanInfo", "(ObjectName,Subject)", "summary", "df-generated"]
-      - ["javax.management.remote.rmi", "RMIConnection", "isInstanceOf", "(ObjectName,String,Subject)", "summary", "df-generated"]
-      - ["javax.management.remote.rmi", "RMIConnection", "isRegistered", "(ObjectName,Subject)", "summary", "df-generated"]
-      - ["javax.management.remote.rmi", "RMIConnection", "queryMBeans", "(ObjectName,MarshalledObject,Subject)", "summary", "df-generated"]
-      - ["javax.management.remote.rmi", "RMIConnection", "queryNames", "(ObjectName,MarshalledObject,Subject)", "summary", "df-generated"]
-      - ["javax.management.remote.rmi", "RMIConnection", "removeNotificationListener", "(ObjectName,ObjectName,MarshalledObject,MarshalledObject,Subject)", "summary", "df-generated"]
-      - ["javax.management.remote.rmi", "RMIConnection", "removeNotificationListener", "(ObjectName,ObjectName,Subject)", "summary", "df-generated"]
-      - ["javax.management.remote.rmi", "RMIConnection", "removeNotificationListeners", "(ObjectName,Integer[],Subject)", "summary", "df-generated"]
-      - ["javax.management.remote.rmi", "RMIConnection", "setAttribute", "(ObjectName,MarshalledObject,Subject)", "summary", "df-generated"]
-      - ["javax.management.remote.rmi", "RMIConnection", "unregisterMBean", "(ObjectName,Subject)", "summary", "df-generated"]
-      - ["javax.management.remote.rmi", "RMIServer", "getVersion", "()", "summary", "df-generated"]
+      - ["javax.management.remote.rmi", "RMIConnectionImpl", "addNotificationListener", "(ObjectName,ObjectName,MarshalledObject,MarshalledObject,Subject)", "summary", "df-generated"]
+      - ["javax.management.remote.rmi", "RMIConnectionImpl", "addNotificationListeners", "(ObjectName[],MarshalledObject[],Subject[])", "summary", "df-generated"]
+      - ["javax.management.remote.rmi", "RMIConnectionImpl", "fetchNotifications", "(long,int,long)", "summary", "df-generated"]
+      - ["javax.management.remote.rmi", "RMIConnectionImpl", "getDefaultDomain", "(Subject)", "summary", "df-generated"]
+      - ["javax.management.remote.rmi", "RMIConnectionImpl", "getDomains", "(Subject)", "summary", "df-generated"]
+      - ["javax.management.remote.rmi", "RMIConnectionImpl", "getMBeanCount", "(Subject)", "summary", "df-generated"]
+      - ["javax.management.remote.rmi", "RMIConnectionImpl", "getMBeanInfo", "(ObjectName,Subject)", "summary", "df-generated"]
+      - ["javax.management.remote.rmi", "RMIConnectionImpl", "isInstanceOf", "(ObjectName,String,Subject)", "summary", "df-generated"]
+      - ["javax.management.remote.rmi", "RMIConnectionImpl", "isRegistered", "(ObjectName,Subject)", "summary", "df-generated"]
+      - ["javax.management.remote.rmi", "RMIConnectionImpl", "queryMBeans", "(ObjectName,MarshalledObject,Subject)", "summary", "df-generated"]
+      - ["javax.management.remote.rmi", "RMIConnectionImpl", "queryNames", "(ObjectName,MarshalledObject,Subject)", "summary", "df-generated"]
+      - ["javax.management.remote.rmi", "RMIConnectionImpl", "removeNotificationListener", "(ObjectName,ObjectName,MarshalledObject,MarshalledObject,Subject)", "summary", "df-generated"]
+      - ["javax.management.remote.rmi", "RMIConnectionImpl", "removeNotificationListener", "(ObjectName,ObjectName,Subject)", "summary", "df-generated"]
+      - ["javax.management.remote.rmi", "RMIConnectionImpl", "removeNotificationListeners", "(ObjectName,Integer[],Subject)", "summary", "df-generated"]
+      - ["javax.management.remote.rmi", "RMIConnectionImpl", "setAttribute", "(ObjectName,MarshalledObject,Subject)", "summary", "df-generated"]
+      - ["javax.management.remote.rmi", "RMIConnectionImpl", "unreferenced", "()", "summary", "df-generated"]
+      - ["javax.management.remote.rmi", "RMIConnectionImpl", "unregisterMBean", "(ObjectName,Subject)", "summary", "df-generated"]
+      - ["javax.management.remote.rmi", "RMIConnectionImpl_Stub", "addNotificationListener", "(ObjectName,ObjectName,MarshalledObject,MarshalledObject,Subject)", "summary", "df-generated"]
+      - ["javax.management.remote.rmi", "RMIConnectionImpl_Stub", "addNotificationListeners", "(ObjectName[],MarshalledObject[],Subject[])", "summary", "df-generated"]
+      - ["javax.management.remote.rmi", "RMIConnectionImpl_Stub", "fetchNotifications", "(long,int,long)", "summary", "df-generated"]
+      - ["javax.management.remote.rmi", "RMIConnectionImpl_Stub", "getConnectionId", "()", "summary", "df-generated"]
+      - ["javax.management.remote.rmi", "RMIConnectionImpl_Stub", "getDefaultDomain", "(Subject)", "summary", "df-generated"]
+      - ["javax.management.remote.rmi", "RMIConnectionImpl_Stub", "getDomains", "(Subject)", "summary", "df-generated"]
+      - ["javax.management.remote.rmi", "RMIConnectionImpl_Stub", "getMBeanCount", "(Subject)", "summary", "df-generated"]
+      - ["javax.management.remote.rmi", "RMIConnectionImpl_Stub", "getMBeanInfo", "(ObjectName,Subject)", "summary", "df-generated"]
+      - ["javax.management.remote.rmi", "RMIConnectionImpl_Stub", "isInstanceOf", "(ObjectName,String,Subject)", "summary", "df-generated"]
+      - ["javax.management.remote.rmi", "RMIConnectionImpl_Stub", "isRegistered", "(ObjectName,Subject)", "summary", "df-generated"]
+      - ["javax.management.remote.rmi", "RMIConnectionImpl_Stub", "queryMBeans", "(ObjectName,MarshalledObject,Subject)", "summary", "df-generated"]
+      - ["javax.management.remote.rmi", "RMIConnectionImpl_Stub", "queryNames", "(ObjectName,MarshalledObject,Subject)", "summary", "df-generated"]
+      - ["javax.management.remote.rmi", "RMIConnectionImpl_Stub", "removeNotificationListener", "(ObjectName,ObjectName,MarshalledObject,MarshalledObject,Subject)", "summary", "df-generated"]
+      - ["javax.management.remote.rmi", "RMIConnectionImpl_Stub", "removeNotificationListener", "(ObjectName,ObjectName,Subject)", "summary", "df-generated"]
+      - ["javax.management.remote.rmi", "RMIConnectionImpl_Stub", "removeNotificationListeners", "(ObjectName,Integer[],Subject)", "summary", "df-generated"]
+      - ["javax.management.remote.rmi", "RMIConnectionImpl_Stub", "setAttribute", "(ObjectName,MarshalledObject,Subject)", "summary", "df-generated"]
+      - ["javax.management.remote.rmi", "RMIConnectionImpl_Stub", "unregisterMBean", "(ObjectName,Subject)", "summary", "df-generated"]
+      - ["javax.management.remote.rmi", "RMIConnector", "addConnectionNotificationListener", "(NotificationListener,NotificationFilter,Object)", "summary", "df-generated"]
+      - ["javax.management.remote.rmi", "RMIConnector", "connect", "()", "summary", "df-generated"]
+      - ["javax.management.remote.rmi", "RMIConnector", "removeConnectionNotificationListener", "(NotificationListener)", "summary", "df-generated"]
+      - ["javax.management.remote.rmi", "RMIConnector", "removeConnectionNotificationListener", "(NotificationListener,NotificationFilter,Object)", "summary", "df-generated"]
+      - ["javax.management.remote.rmi", "RMIConnectorServer", "isActive", "()", "summary", "df-generated"]
+      - ["javax.management.remote.rmi", "RMIConnectorServer", "start", "()", "summary", "df-generated"]
+      - ["javax.management.remote.rmi", "RMIConnectorServer", "stop", "()", "summary", "df-generated"]
+      - ["javax.management.remote.rmi", "RMIServerImpl", "getVersion", "()", "summary", "df-generated"]
+      - ["javax.management.remote.rmi", "RMIServerImpl_Stub", "getVersion", "()", "summary", "df-generated"]
diff --git a/java/ql/lib/ext/generated/javax.management.timer.model.yml b/java/ql/lib/ext/generated/javax.management.timer.model.yml
index 2dd312e78fc..7e34751de56 100644
--- a/java/ql/lib/ext/generated/javax.management.timer.model.yml
+++ b/java/ql/lib/ext/generated/javax.management.timer.model.yml
@@ -7,31 +7,32 @@ extensions:
       - ["javax.management.timer", "TimerMBean", True, "getNotificationMessage", "(Integer)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["javax.management.timer", "TimerMBean", True, "getNotificationType", "(Integer)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["javax.management.timer", "TimerMBean", True, "getNotificationUserData", "(Integer)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.management.timer", "TimerNotification", True, "TimerNotification", "(String,Object,long,long,String,Integer)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management.timer", "TimerNotification", True, "TimerNotification", "(String,Object,long,long,String,Integer)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.management.timer", "TimerNotification", True, "TimerNotification", "(String,Object,long,long,String,Integer)", "", "Argument[4]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.timer", "TimerNotification", True, "TimerNotification", "(String,Object,long,long,String,Integer)", "", "Argument[4]", "Argument[this]", "taint", "dfc-generated"]
   - addsTo:
       pack: codeql/java-all
       extensible: neutralModel
     data:
-      - ["javax.management.timer", "TimerMBean", "addNotification", "(String,String,Object,Date)", "summary", "df-generated"]
-      - ["javax.management.timer", "TimerMBean", "addNotification", "(String,String,Object,Date,long)", "summary", "df-generated"]
-      - ["javax.management.timer", "TimerMBean", "addNotification", "(String,String,Object,Date,long,long)", "summary", "df-generated"]
-      - ["javax.management.timer", "TimerMBean", "addNotification", "(String,String,Object,Date,long,long,boolean)", "summary", "df-generated"]
-      - ["javax.management.timer", "TimerMBean", "getAllNotificationIDs", "()", "summary", "df-generated"]
-      - ["javax.management.timer", "TimerMBean", "getDate", "(Integer)", "summary", "df-generated"]
-      - ["javax.management.timer", "TimerMBean", "getFixedRate", "(Integer)", "summary", "df-generated"]
-      - ["javax.management.timer", "TimerMBean", "getNbNotifications", "()", "summary", "df-generated"]
-      - ["javax.management.timer", "TimerMBean", "getNbOccurences", "(Integer)", "summary", "df-generated"]
-      - ["javax.management.timer", "TimerMBean", "getNotificationIDs", "(String)", "summary", "df-generated"]
-      - ["javax.management.timer", "TimerMBean", "getPeriod", "(Integer)", "summary", "df-generated"]
-      - ["javax.management.timer", "TimerMBean", "getSendPastNotifications", "()", "summary", "df-generated"]
-      - ["javax.management.timer", "TimerMBean", "isActive", "()", "summary", "df-generated"]
-      - ["javax.management.timer", "TimerMBean", "isEmpty", "()", "summary", "df-generated"]
-      - ["javax.management.timer", "TimerMBean", "removeAllNotifications", "()", "summary", "df-generated"]
-      - ["javax.management.timer", "TimerMBean", "removeNotification", "(Integer)", "summary", "df-generated"]
-      - ["javax.management.timer", "TimerMBean", "removeNotifications", "(String)", "summary", "df-generated"]
-      - ["javax.management.timer", "TimerMBean", "setSendPastNotifications", "(boolean)", "summary", "df-generated"]
-      - ["javax.management.timer", "TimerMBean", "start", "()", "summary", "df-generated"]
-      - ["javax.management.timer", "TimerMBean", "stop", "()", "summary", "df-generated"]
+      - ["javax.management.timer", "Timer", "addNotification", "(String,String,Object,Date)", "summary", "df-generated"]
+      - ["javax.management.timer", "Timer", "addNotification", "(String,String,Object,Date,long)", "summary", "df-generated"]
+      - ["javax.management.timer", "Timer", "addNotification", "(String,String,Object,Date,long,long)", "summary", "df-generated"]
+      - ["javax.management.timer", "Timer", "addNotification", "(String,String,Object,Date,long,long,boolean)", "summary", "df-generated"]
+      - ["javax.management.timer", "Timer", "getAllNotificationIDs", "()", "summary", "df-generated"]
+      - ["javax.management.timer", "Timer", "getDate", "(Integer)", "summary", "df-generated"]
+      - ["javax.management.timer", "Timer", "getFixedRate", "(Integer)", "summary", "df-generated"]
+      - ["javax.management.timer", "Timer", "getNbNotifications", "()", "summary", "df-generated"]
+      - ["javax.management.timer", "Timer", "getNbOccurences", "(Integer)", "summary", "df-generated"]
+      - ["javax.management.timer", "Timer", "getNotificationIDs", "(String)", "summary", "df-generated"]
+      - ["javax.management.timer", "Timer", "getPeriod", "(Integer)", "summary", "df-generated"]
+      - ["javax.management.timer", "Timer", "getSendPastNotifications", "()", "summary", "df-generated"]
+      - ["javax.management.timer", "Timer", "isActive", "()", "summary", "df-generated"]
+      - ["javax.management.timer", "Timer", "isEmpty", "()", "summary", "df-generated"]
+      - ["javax.management.timer", "Timer", "postDeregister", "()", "summary", "df-generated"]
+      - ["javax.management.timer", "Timer", "postRegister", "(Boolean)", "summary", "df-generated"]
+      - ["javax.management.timer", "Timer", "preDeregister", "()", "summary", "df-generated"]
+      - ["javax.management.timer", "Timer", "removeAllNotifications", "()", "summary", "df-generated"]
+      - ["javax.management.timer", "Timer", "removeNotification", "(Integer)", "summary", "df-generated"]
+      - ["javax.management.timer", "Timer", "removeNotifications", "(String)", "summary", "df-generated"]
+      - ["javax.management.timer", "Timer", "setSendPastNotifications", "(boolean)", "summary", "df-generated"]
+      - ["javax.management.timer", "Timer", "start", "()", "summary", "df-generated"]
+      - ["javax.management.timer", "Timer", "stop", "()", "summary", "df-generated"]
       - ["javax.management.timer", "TimerNotification", "getNotificationID", "()", "summary", "df-generated"]
diff --git a/java/ql/lib/ext/generated/javax.naming.directory.model.yml b/java/ql/lib/ext/generated/javax.naming.directory.model.yml
index 21cc4851eef..198621607b9 100644
--- a/java/ql/lib/ext/generated/javax.naming.directory.model.yml
+++ b/java/ql/lib/ext/generated/javax.naming.directory.model.yml
@@ -5,31 +5,34 @@ extensions:
       extensible: summaryModel
     data:
       - ["javax.naming.directory", "Attribute", True, "add", "(Object)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.naming.directory", "Attribute", True, "add", "(int,Object)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.naming.directory", "Attribute", True, "get", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.naming.directory", "Attribute", True, "get", "(int)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.naming.directory", "Attribute", True, "getID", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.naming.directory", "Attribute", True, "remove", "(int)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.naming.directory", "Attribute", True, "set", "(int,Object)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.naming.directory", "Attribute", True, "set", "(int,Object)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.naming.directory", "Attribute", True, "getAttributeDefinition", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.naming.directory", "Attribute", True, "getAttributeSyntaxDefinition", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["javax.naming.directory", "AttributeInUseException", True, "AttributeInUseException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["javax.naming.directory", "AttributeModificationException", True, "AttributeModificationException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.naming.directory", "AttributeModificationException", True, "getUnexecutedModifications", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.naming.directory", "AttributeModificationException", True, "setUnexecutedModifications", "(ModificationItem[])", "", "Argument[0].ArrayElement", "Argument[this]", "taint", "df-generated"]
+      - ["javax.naming.directory", "AttributeModificationException", True, "getUnexecutedModifications", "()", "", "Argument[this].SyntheticField[javax.naming.directory.AttributeModificationException.unexecs]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.naming.directory", "AttributeModificationException", True, "setUnexecutedModifications", "(ModificationItem[])", "", "Argument[0]", "Argument[this].SyntheticField[javax.naming.directory.AttributeModificationException.unexecs]", "value", "dfc-generated"]
       - ["javax.naming.directory", "Attributes", True, "get", "(String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["javax.naming.directory", "Attributes", True, "put", "(Attribute)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["javax.naming.directory", "Attributes", True, "put", "(Attribute)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.naming.directory", "Attributes", True, "put", "(String,Object)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.naming.directory", "Attributes", True, "put", "(String,Object)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.naming.directory", "Attributes", True, "remove", "(String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.naming.directory", "BasicAttribute", True, "BasicAttribute", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.naming.directory", "BasicAttribute", True, "BasicAttribute", "(String,Object)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.naming.directory", "BasicAttribute", True, "BasicAttribute", "(String,Object)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.naming.directory", "BasicAttribute", True, "BasicAttribute", "(String,Object,boolean)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.naming.directory", "BasicAttribute", True, "BasicAttribute", "(String,Object,boolean)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.naming.directory", "BasicAttribute", True, "BasicAttribute", "(String,boolean)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.naming.directory", "BasicAttributes", True, "BasicAttributes", "(String,Object)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.naming.directory", "BasicAttributes", True, "BasicAttributes", "(String,Object,boolean)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.naming.directory", "Attributes", True, "put", "(String,Object)", "", "Argument[this]", "ReturnValue", "taint", "dfc-generated"]
+      - ["javax.naming.directory", "BasicAttribute", True, "BasicAttribute", "(String)", "", "Argument[0]", "Argument[this].SyntheticField[javax.naming.directory.BasicAttribute.attrID]", "value", "dfc-generated"]
+      - ["javax.naming.directory", "BasicAttribute", True, "BasicAttribute", "(String,Object)", "", "Argument[0]", "Argument[this].SyntheticField[javax.naming.directory.BasicAttribute.attrID]", "value", "dfc-generated"]
+      - ["javax.naming.directory", "BasicAttribute", True, "BasicAttribute", "(String,Object)", "", "Argument[1]", "Argument[this].SyntheticField[javax.naming.directory.BasicAttribute.values].Element", "value", "dfc-generated"]
+      - ["javax.naming.directory", "BasicAttribute", True, "BasicAttribute", "(String,Object,boolean)", "", "Argument[0]", "Argument[this].SyntheticField[javax.naming.directory.BasicAttribute.attrID]", "value", "dfc-generated"]
+      - ["javax.naming.directory", "BasicAttribute", True, "BasicAttribute", "(String,Object,boolean)", "", "Argument[1]", "Argument[this].SyntheticField[javax.naming.directory.BasicAttribute.values].Element", "value", "dfc-generated"]
+      - ["javax.naming.directory", "BasicAttribute", True, "BasicAttribute", "(String,boolean)", "", "Argument[0]", "Argument[this].SyntheticField[javax.naming.directory.BasicAttribute.attrID]", "value", "dfc-generated"]
+      - ["javax.naming.directory", "BasicAttribute", True, "add", "(Object)", "", "Argument[0]", "Argument[this].SyntheticField[javax.naming.directory.BasicAttribute.values].Element", "value", "dfc-generated"]
+      - ["javax.naming.directory", "BasicAttribute", True, "add", "(int,Object)", "", "Argument[1]", "Argument[this].SyntheticField[javax.naming.directory.BasicAttribute.values].Element", "value", "dfc-generated"]
+      - ["javax.naming.directory", "BasicAttribute", True, "get", "()", "", "Argument[this].SyntheticField[javax.naming.directory.BasicAttribute.values].Element", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.naming.directory", "BasicAttribute", True, "get", "(int)", "", "Argument[this].SyntheticField[javax.naming.directory.BasicAttribute.values].Element", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.naming.directory", "BasicAttribute", True, "getID", "()", "", "Argument[this].SyntheticField[javax.naming.directory.BasicAttribute.attrID]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.naming.directory", "BasicAttribute", True, "remove", "(int)", "", "Argument[this].SyntheticField[javax.naming.directory.BasicAttribute.values].Element", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.naming.directory", "BasicAttribute", True, "set", "(int,Object)", "", "Argument[1]", "Argument[this].SyntheticField[javax.naming.directory.BasicAttribute.values].Element", "value", "dfc-generated"]
+      - ["javax.naming.directory", "BasicAttribute", True, "set", "(int,Object)", "", "Argument[this].SyntheticField[javax.naming.directory.BasicAttribute.values].Element", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.naming.directory", "BasicAttributes", True, "remove", "(String)", "", "Argument[this].SyntheticField[javax.naming.directory.BasicAttributes.attrs].MapValue", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.naming.directory", "DirContext", True, "bind", "(Name,Object,Attributes)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.naming.directory", "DirContext", True, "bind", "(Name,Object,Attributes)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.naming.directory", "DirContext", True, "bind", "(String,Object,Attributes)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
       - ["javax.naming.directory", "DirContext", True, "createSubcontext", "(Name,Attributes)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["javax.naming.directory", "DirContext", True, "createSubcontext", "(String,Attributes)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["javax.naming.directory", "DirContext", True, "getAttributes", "(Name)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
@@ -40,6 +43,9 @@ extensions:
       - ["javax.naming.directory", "DirContext", True, "getSchema", "(String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["javax.naming.directory", "DirContext", True, "getSchemaClassDefinition", "(Name)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["javax.naming.directory", "DirContext", True, "getSchemaClassDefinition", "(String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.naming.directory", "DirContext", True, "rebind", "(Name,Object,Attributes)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.naming.directory", "DirContext", True, "rebind", "(Name,Object,Attributes)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.naming.directory", "DirContext", True, "rebind", "(String,Object,Attributes)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
       - ["javax.naming.directory", "DirContext", True, "search", "(Name,Attributes)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["javax.naming.directory", "DirContext", True, "search", "(Name,Attributes)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
       - ["javax.naming.directory", "DirContext", True, "search", "(Name,Attributes)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
@@ -55,18 +61,14 @@ extensions:
       - ["javax.naming.directory", "DirContext", True, "search", "(Name,String,SearchControls)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
       - ["javax.naming.directory", "DirContext", True, "search", "(Name,String,SearchControls)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
       - ["javax.naming.directory", "DirContext", True, "search", "(Name,String,SearchControls)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.naming.directory", "DirContext", True, "search", "(String,Attributes)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["javax.naming.directory", "DirContext", True, "search", "(String,Attributes)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
       - ["javax.naming.directory", "DirContext", True, "search", "(String,Attributes)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.naming.directory", "DirContext", True, "search", "(String,Attributes,String[])", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["javax.naming.directory", "DirContext", True, "search", "(String,Attributes,String[])", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
       - ["javax.naming.directory", "DirContext", True, "search", "(String,Attributes,String[])", "", "Argument[2].ArrayElement", "ReturnValue", "taint", "df-generated"]
       - ["javax.naming.directory", "DirContext", True, "search", "(String,Attributes,String[])", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.naming.directory", "DirContext", True, "search", "(String,String,Object[],SearchControls)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["javax.naming.directory", "DirContext", True, "search", "(String,String,Object[],SearchControls)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
       - ["javax.naming.directory", "DirContext", True, "search", "(String,String,Object[],SearchControls)", "", "Argument[3]", "ReturnValue", "taint", "df-generated"]
       - ["javax.naming.directory", "DirContext", True, "search", "(String,String,Object[],SearchControls)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.naming.directory", "DirContext", True, "search", "(String,String,SearchControls)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["javax.naming.directory", "DirContext", True, "search", "(String,String,SearchControls)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
       - ["javax.naming.directory", "DirContext", True, "search", "(String,String,SearchControls)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
       - ["javax.naming.directory", "DirContext", True, "search", "(String,String,SearchControls)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
@@ -76,54 +78,38 @@ extensions:
       - ["javax.naming.directory", "InvalidAttributesException", True, "InvalidAttributesException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["javax.naming.directory", "InvalidSearchControlsException", True, "InvalidSearchControlsException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["javax.naming.directory", "InvalidSearchFilterException", True, "InvalidSearchFilterException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.naming.directory", "ModificationItem", True, "ModificationItem", "(int,Attribute)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.naming.directory", "ModificationItem", True, "getAttribute", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.naming.directory", "ModificationItem", True, "ModificationItem", "(int,Attribute)", "", "Argument[1]", "Argument[this].SyntheticField[javax.naming.directory.ModificationItem.attr]", "value", "dfc-generated"]
+      - ["javax.naming.directory", "ModificationItem", True, "getAttribute", "()", "", "Argument[this].SyntheticField[javax.naming.directory.ModificationItem.attr]", "ReturnValue", "value", "dfc-generated"]
       - ["javax.naming.directory", "NoSuchAttributeException", True, "NoSuchAttributeException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["javax.naming.directory", "SchemaViolationException", True, "SchemaViolationException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.naming.directory", "SearchControls", True, "SearchControls", "(int,long,int,String[],boolean,boolean)", "", "Argument[3].ArrayElement", "Argument[this]", "taint", "df-generated"]
-      - ["javax.naming.directory", "SearchControls", True, "getReturningAttributes", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.naming.directory", "SearchControls", True, "setReturningAttributes", "(String[])", "", "Argument[0].ArrayElement", "Argument[this]", "taint", "df-generated"]
-      - ["javax.naming.directory", "SearchResult", True, "SearchResult", "(String,Object,Attributes)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.naming.directory", "SearchResult", True, "SearchResult", "(String,Object,Attributes)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.naming.directory", "SearchResult", True, "SearchResult", "(String,Object,Attributes)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.naming.directory", "SearchResult", True, "SearchResult", "(String,Object,Attributes,boolean)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.naming.directory", "SearchResult", True, "SearchResult", "(String,Object,Attributes,boolean)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.naming.directory", "SearchResult", True, "SearchResult", "(String,Object,Attributes,boolean)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.naming.directory", "SearchResult", True, "SearchResult", "(String,String,Object,Attributes)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.naming.directory", "SearchResult", True, "SearchResult", "(String,String,Object,Attributes)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.naming.directory", "SearchResult", True, "SearchResult", "(String,String,Object,Attributes)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.naming.directory", "SearchResult", True, "SearchResult", "(String,String,Object,Attributes)", "", "Argument[3]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.naming.directory", "SearchResult", True, "SearchResult", "(String,String,Object,Attributes,boolean)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.naming.directory", "SearchResult", True, "SearchResult", "(String,String,Object,Attributes,boolean)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.naming.directory", "SearchResult", True, "SearchResult", "(String,String,Object,Attributes,boolean)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.naming.directory", "SearchResult", True, "SearchResult", "(String,String,Object,Attributes,boolean)", "", "Argument[3]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.naming.directory", "SearchResult", True, "getAttributes", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.naming.directory", "SearchResult", True, "setAttributes", "(Attributes)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.naming.directory", "SearchControls", True, "SearchControls", "(int,long,int,String[],boolean,boolean)", "", "Argument[3]", "Argument[this].SyntheticField[javax.naming.directory.SearchControls.attributesToReturn]", "value", "dfc-generated"]
+      - ["javax.naming.directory", "SearchControls", True, "getReturningAttributes", "()", "", "Argument[this].SyntheticField[javax.naming.directory.SearchControls.attributesToReturn]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.naming.directory", "SearchControls", True, "setReturningAttributes", "(String[])", "", "Argument[0]", "Argument[this].SyntheticField[javax.naming.directory.SearchControls.attributesToReturn]", "value", "dfc-generated"]
+      - ["javax.naming.directory", "SearchResult", True, "SearchResult", "(String,Object,Attributes)", "", "Argument[2]", "Argument[this].SyntheticField[javax.naming.directory.SearchResult.attrs]", "value", "dfc-generated"]
+      - ["javax.naming.directory", "SearchResult", True, "SearchResult", "(String,Object,Attributes,boolean)", "", "Argument[2]", "Argument[this].SyntheticField[javax.naming.directory.SearchResult.attrs]", "value", "dfc-generated"]
+      - ["javax.naming.directory", "SearchResult", True, "SearchResult", "(String,String,Object,Attributes)", "", "Argument[3]", "Argument[this].SyntheticField[javax.naming.directory.SearchResult.attrs]", "value", "dfc-generated"]
+      - ["javax.naming.directory", "SearchResult", True, "SearchResult", "(String,String,Object,Attributes,boolean)", "", "Argument[3]", "Argument[this].SyntheticField[javax.naming.directory.SearchResult.attrs]", "value", "dfc-generated"]
+      - ["javax.naming.directory", "SearchResult", True, "getAttributes", "()", "", "Argument[this].SyntheticField[javax.naming.directory.SearchResult.attrs]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.naming.directory", "SearchResult", True, "setAttributes", "(Attributes)", "", "Argument[0]", "Argument[this].SyntheticField[javax.naming.directory.SearchResult.attrs]", "value", "dfc-generated"]
   - addsTo:
       pack: codeql/java-all
       extensible: neutralModel
     data:
-      - ["javax.naming.directory", "Attribute", "clear", "()", "summary", "df-generated"]
-      - ["javax.naming.directory", "Attribute", "contains", "(Object)", "summary", "df-generated"]
-      - ["javax.naming.directory", "Attribute", "getAll", "()", "summary", "df-generated"]
-      - ["javax.naming.directory", "Attribute", "getAttributeDefinition", "()", "summary", "df-generated"]
-      - ["javax.naming.directory", "Attribute", "getAttributeSyntaxDefinition", "()", "summary", "df-generated"]
-      - ["javax.naming.directory", "Attribute", "isOrdered", "()", "summary", "df-generated"]
-      - ["javax.naming.directory", "Attribute", "remove", "(Object)", "summary", "df-generated"]
-      - ["javax.naming.directory", "Attribute", "size", "()", "summary", "df-generated"]
-      - ["javax.naming.directory", "Attributes", "getAll", "()", "summary", "df-generated"]
-      - ["javax.naming.directory", "Attributes", "getIDs", "()", "summary", "df-generated"]
-      - ["javax.naming.directory", "Attributes", "isCaseIgnored", "()", "summary", "df-generated"]
-      - ["javax.naming.directory", "Attributes", "size", "()", "summary", "df-generated"]
+      - ["javax.naming.directory", "BasicAttribute", "clear", "()", "summary", "df-generated"]
+      - ["javax.naming.directory", "BasicAttribute", "contains", "(Object)", "summary", "df-generated"]
+      - ["javax.naming.directory", "BasicAttribute", "getAll", "()", "summary", "df-generated"]
+      - ["javax.naming.directory", "BasicAttribute", "isOrdered", "()", "summary", "df-generated"]
+      - ["javax.naming.directory", "BasicAttribute", "remove", "(Object)", "summary", "df-generated"]
+      - ["javax.naming.directory", "BasicAttribute", "size", "()", "summary", "df-generated"]
       - ["javax.naming.directory", "BasicAttributes", "BasicAttributes", "(boolean)", "summary", "df-generated"]
-      - ["javax.naming.directory", "DirContext", "bind", "(Name,Object,Attributes)", "summary", "df-generated"]
-      - ["javax.naming.directory", "DirContext", "bind", "(String,Object,Attributes)", "summary", "df-generated"]
-      - ["javax.naming.directory", "DirContext", "modifyAttributes", "(Name,ModificationItem[])", "summary", "df-generated"]
-      - ["javax.naming.directory", "DirContext", "modifyAttributes", "(Name,int,Attributes)", "summary", "df-generated"]
-      - ["javax.naming.directory", "DirContext", "modifyAttributes", "(String,ModificationItem[])", "summary", "df-generated"]
-      - ["javax.naming.directory", "DirContext", "modifyAttributes", "(String,int,Attributes)", "summary", "df-generated"]
-      - ["javax.naming.directory", "DirContext", "rebind", "(Name,Object,Attributes)", "summary", "df-generated"]
-      - ["javax.naming.directory", "DirContext", "rebind", "(String,Object,Attributes)", "summary", "df-generated"]
+      - ["javax.naming.directory", "BasicAttributes", "getAll", "()", "summary", "df-generated"]
+      - ["javax.naming.directory", "BasicAttributes", "getIDs", "()", "summary", "df-generated"]
+      - ["javax.naming.directory", "BasicAttributes", "isCaseIgnored", "()", "summary", "df-generated"]
+      - ["javax.naming.directory", "BasicAttributes", "size", "()", "summary", "df-generated"]
+      - ["javax.naming.directory", "InitialDirContext", "modifyAttributes", "(Name,ModificationItem[])", "summary", "df-generated"]
+      - ["javax.naming.directory", "InitialDirContext", "modifyAttributes", "(Name,int,Attributes)", "summary", "df-generated"]
+      - ["javax.naming.directory", "InitialDirContext", "modifyAttributes", "(String,ModificationItem[])", "summary", "df-generated"]
+      - ["javax.naming.directory", "InitialDirContext", "modifyAttributes", "(String,int,Attributes)", "summary", "df-generated"]
       - ["javax.naming.directory", "ModificationItem", "getModificationOp", "()", "summary", "df-generated"]
       - ["javax.naming.directory", "SearchControls", "getCountLimit", "()", "summary", "df-generated"]
       - ["javax.naming.directory", "SearchControls", "getDerefLinkFlag", "()", "summary", "df-generated"]
diff --git a/java/ql/lib/ext/generated/javax.naming.event.model.yml b/java/ql/lib/ext/generated/javax.naming.event.model.yml
index 2dae0e7370f..136df900568 100644
--- a/java/ql/lib/ext/generated/javax.naming.event.model.yml
+++ b/java/ql/lib/ext/generated/javax.naming.event.model.yml
@@ -4,18 +4,18 @@ extensions:
       pack: codeql/java-all
       extensible: summaryModel
     data:
-      - ["javax.naming.event", "NamingEvent", True, "NamingEvent", "(EventContext,int,Binding,Binding,Object)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.naming.event", "NamingEvent", True, "NamingEvent", "(EventContext,int,Binding,Binding,Object)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.naming.event", "NamingEvent", True, "NamingEvent", "(EventContext,int,Binding,Binding,Object)", "", "Argument[3]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.naming.event", "NamingEvent", True, "NamingEvent", "(EventContext,int,Binding,Binding,Object)", "", "Argument[4]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.naming.event", "NamingEvent", True, "getChangeInfo", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.naming.event", "NamingEvent", True, "getEventContext", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.naming.event", "NamingEvent", True, "getNewBinding", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.naming.event", "NamingEvent", True, "getOldBinding", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.naming.event", "NamingExceptionEvent", True, "NamingExceptionEvent", "(EventContext,NamingException)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.naming.event", "NamingExceptionEvent", True, "NamingExceptionEvent", "(EventContext,NamingException)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.naming.event", "NamingExceptionEvent", True, "getEventContext", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.naming.event", "NamingExceptionEvent", True, "getException", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.naming.event", "NamingEvent", True, "NamingEvent", "(EventContext,int,Binding,Binding,Object)", "", "Argument[0]", "Argument[this].SyntheticField[java.util.EventObject.source]", "value", "dfc-generated"]
+      - ["javax.naming.event", "NamingEvent", True, "NamingEvent", "(EventContext,int,Binding,Binding,Object)", "", "Argument[2]", "Argument[this].SyntheticField[javax.naming.event.NamingEvent.newBinding]", "value", "dfc-generated"]
+      - ["javax.naming.event", "NamingEvent", True, "NamingEvent", "(EventContext,int,Binding,Binding,Object)", "", "Argument[3]", "Argument[this].SyntheticField[javax.naming.event.NamingEvent.oldBinding]", "value", "dfc-generated"]
+      - ["javax.naming.event", "NamingEvent", True, "NamingEvent", "(EventContext,int,Binding,Binding,Object)", "", "Argument[4]", "Argument[this].SyntheticField[javax.naming.event.NamingEvent.changeInfo]", "value", "dfc-generated"]
+      - ["javax.naming.event", "NamingEvent", True, "getChangeInfo", "()", "", "Argument[this].SyntheticField[javax.naming.event.NamingEvent.changeInfo]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.naming.event", "NamingEvent", True, "getEventContext", "()", "", "Argument[this].SyntheticField[java.util.EventObject.source]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.naming.event", "NamingEvent", True, "getNewBinding", "()", "", "Argument[this].SyntheticField[javax.naming.event.NamingEvent.newBinding]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.naming.event", "NamingEvent", True, "getOldBinding", "()", "", "Argument[this].SyntheticField[javax.naming.event.NamingEvent.oldBinding]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.naming.event", "NamingExceptionEvent", True, "NamingExceptionEvent", "(EventContext,NamingException)", "", "Argument[0]", "Argument[this].SyntheticField[java.util.EventObject.source]", "value", "dfc-generated"]
+      - ["javax.naming.event", "NamingExceptionEvent", True, "NamingExceptionEvent", "(EventContext,NamingException)", "", "Argument[1]", "Argument[this].SyntheticField[javax.naming.event.NamingExceptionEvent.exception]", "value", "dfc-generated"]
+      - ["javax.naming.event", "NamingExceptionEvent", True, "getEventContext", "()", "", "Argument[this].SyntheticField[java.util.EventObject.source]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.naming.event", "NamingExceptionEvent", True, "getException", "()", "", "Argument[this].SyntheticField[javax.naming.event.NamingExceptionEvent.exception]", "ReturnValue", "value", "dfc-generated"]
   - addsTo:
       pack: codeql/java-all
       extensible: neutralModel
diff --git a/java/ql/lib/ext/generated/javax.naming.ldap.model.yml b/java/ql/lib/ext/generated/javax.naming.ldap.model.yml
index 8597d37da7c..822135f130e 100644
--- a/java/ql/lib/ext/generated/javax.naming.ldap.model.yml
+++ b/java/ql/lib/ext/generated/javax.naming.ldap.model.yml
@@ -4,14 +4,24 @@ extensions:
       pack: codeql/java-all
       extensible: summaryModel
     data:
-      - ["javax.naming.ldap", "BasicControl", True, "BasicControl", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.naming.ldap", "BasicControl", True, "BasicControl", "(String,boolean,byte[])", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.naming.ldap", "BasicControl", True, "BasicControl", "(String,boolean,byte[])", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.naming.ldap", "BasicControl", True, "BasicControl", "(String)", "", "Argument[0]", "Argument[this].SyntheticField[javax.naming.ldap.BasicControl.id]", "value", "dfc-generated"]
+      - ["javax.naming.ldap", "BasicControl", True, "BasicControl", "(String,boolean,byte[])", "", "Argument[0]", "Argument[this].SyntheticField[javax.naming.ldap.BasicControl.id]", "value", "dfc-generated"]
+      - ["javax.naming.ldap", "BasicControl", True, "BasicControl", "(String,boolean,byte[])", "", "Argument[2]", "Argument[this].SyntheticField[javax.naming.ldap.BasicControl.value]", "value", "dfc-generated"]
+      - ["javax.naming.ldap", "BasicControl", True, "getEncodedValue", "()", "", "Argument[this].SyntheticField[javax.naming.ldap.BasicControl.value]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.naming.ldap", "BasicControl", True, "getID", "()", "", "Argument[this].SyntheticField[javax.naming.ldap.BasicControl.id]", "ReturnValue", "value", "dfc-generated"]
       - ["javax.naming.ldap", "Control", True, "getEncodedValue", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["javax.naming.ldap", "Control", True, "getID", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.naming.ldap", "ControlFactory", True, "getControlInstance", "(Control)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["javax.naming.ldap", "ControlFactory", True, "getControlInstance", "(Control,Context,Hashtable)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.naming.ldap", "ExtendedResponse", True, "getEncodedValue", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.naming.ldap", "ExtendedResponse", True, "getID", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.naming.ldap", "HasControls", True, "getControls", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["javax.naming.ldap", "InitialLdapContext", True, "InitialLdapContext", "(Hashtable,Control[])", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
       - ["javax.naming.ldap", "InitialLdapContext", True, "InitialLdapContext", "(Hashtable,Control[])", "", "Argument[1].ArrayElement", "Argument[this]", "taint", "df-generated"]
+      - ["javax.naming.ldap", "InitialLdapContext", True, "getConnectControls", "()", "", "Argument[this].SyntheticField[javax.naming.InitialContext.defaultInitCtx].SyntheticField[com.sun.jndi.ldap.LdapCtx.bindCtls]", "ReturnValue", "taint", "dfc-generated"]
+      - ["javax.naming.ldap", "InitialLdapContext", True, "getRequestControls", "()", "", "Argument[this].SyntheticField[javax.naming.InitialContext.defaultInitCtx].SyntheticField[com.sun.jndi.ldap.LdapCtx.reqCtls]", "ReturnValue", "taint", "dfc-generated"]
+      - ["javax.naming.ldap", "InitialLdapContext", True, "reconnect", "(Control[])", "", "Argument[0]", "Argument[this].SyntheticField[javax.naming.InitialContext.defaultInitCtx].SyntheticField[com.sun.jndi.ldap.LdapCtx.bindCtls]", "taint", "dfc-generated"]
+      - ["javax.naming.ldap", "InitialLdapContext", True, "setRequestControls", "(Control[])", "", "Argument[0]", "Argument[this].SyntheticField[javax.naming.InitialContext.defaultInitCtx].SyntheticField[com.sun.jndi.ldap.LdapCtx.reqCtls]", "value", "dfc-generated"]
       - ["javax.naming.ldap", "LdapContext", True, "getConnectControls", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["javax.naming.ldap", "LdapContext", True, "getRequestControls", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["javax.naming.ldap", "LdapContext", True, "getResponseControls", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
@@ -19,56 +29,58 @@ extensions:
       - ["javax.naming.ldap", "LdapContext", True, "newInstance", "(Control[])", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["javax.naming.ldap", "LdapContext", True, "reconnect", "(Control[])", "", "Argument[0].ArrayElement", "Argument[this]", "taint", "df-generated"]
       - ["javax.naming.ldap", "LdapContext", True, "setRequestControls", "(Control[])", "", "Argument[0].ArrayElement", "Argument[this]", "taint", "df-generated"]
-      - ["javax.naming.ldap", "LdapName", True, "LdapName", "(List)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
+      - ["javax.naming.ldap", "LdapName", True, "LdapName", "(List)", "", "Argument[0].Element", "Argument[this].SyntheticField[javax.naming.ldap.LdapName.rdns].Element", "value", "dfc-generated"]
       - ["javax.naming.ldap", "LdapName", True, "LdapName", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.naming.ldap", "LdapName", True, "add", "(Rdn)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.naming.ldap", "LdapName", True, "add", "(Rdn)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.naming.ldap", "LdapName", True, "add", "(Rdn)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.naming.ldap", "LdapName", True, "add", "(int,Rdn)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.naming.ldap", "LdapName", True, "add", "(int,Rdn)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["javax.naming.ldap", "LdapName", True, "addAll", "(List)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["javax.naming.ldap", "LdapName", True, "addAll", "(List)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["javax.naming.ldap", "LdapName", True, "addAll", "(List)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.naming.ldap", "LdapName", True, "addAll", "(int,List)", "", "Argument[1].Element", "Argument[this]", "taint", "df-generated"]
-      - ["javax.naming.ldap", "LdapName", True, "addAll", "(int,List)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["javax.naming.ldap", "LdapName", True, "getRdn", "(int)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.naming.ldap", "LdapName", True, "getRdns", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.naming.ldap", "PagedResultsResponseControl", False, "PagedResultsResponseControl", "(String,boolean,byte[])", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.naming.ldap", "PagedResultsResponseControl", False, "PagedResultsResponseControl", "(String,boolean,byte[])", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.naming.ldap", "PagedResultsResponseControl", False, "getCookie", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.naming.ldap", "LdapName", True, "add", "(Rdn)", "", "Argument[0]", "Argument[this].SyntheticField[javax.naming.ldap.LdapName.rdns].Element", "value", "dfc-generated"]
+      - ["javax.naming.ldap", "LdapName", True, "add", "(Rdn)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.naming.ldap", "LdapName", True, "add", "(int,Rdn)", "", "Argument[1]", "Argument[this].SyntheticField[javax.naming.ldap.LdapName.rdns].Element", "value", "dfc-generated"]
+      - ["javax.naming.ldap", "LdapName", True, "add", "(int,Rdn)", "", "Argument[1]", "ReturnValue.SyntheticField[javax.naming.ldap.LdapName.rdns].Element", "value", "dfc-generated"]
+      - ["javax.naming.ldap", "LdapName", True, "add", "(int,Rdn)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.naming.ldap", "LdapName", True, "addAll", "(List)", "", "Argument[0].Element", "Argument[this].SyntheticField[javax.naming.ldap.LdapName.rdns].Element", "value", "dfc-generated"]
+      - ["javax.naming.ldap", "LdapName", True, "addAll", "(List)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.naming.ldap", "LdapName", True, "addAll", "(int,List)", "", "Argument[1].Element", "Argument[this].SyntheticField[javax.naming.ldap.LdapName.rdns].Element", "value", "dfc-generated"]
+      - ["javax.naming.ldap", "LdapName", True, "addAll", "(int,List)", "", "Argument[1].Element", "ReturnValue.SyntheticField[javax.naming.ldap.LdapName.rdns].Element", "value", "dfc-generated"]
+      - ["javax.naming.ldap", "LdapName", True, "addAll", "(int,List)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.naming.ldap", "LdapName", True, "getPrefix", "(int)", "", "Argument[this].SyntheticField[javax.naming.ldap.LdapName.rdns].Element", "ReturnValue.SyntheticField[javax.naming.ldap.LdapName.rdns].Element", "value", "dfc-generated"]
+      - ["javax.naming.ldap", "LdapName", True, "getRdn", "(int)", "", "Argument[this].SyntheticField[javax.naming.ldap.LdapName.rdns].Element", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.naming.ldap", "LdapName", True, "getRdns", "()", "", "Argument[this].SyntheticField[javax.naming.ldap.LdapName.rdns].Element", "ReturnValue.Element", "value", "dfc-generated"]
+      - ["javax.naming.ldap", "LdapName", True, "getSuffix", "(int)", "", "Argument[this].SyntheticField[javax.naming.ldap.LdapName.rdns].Element", "ReturnValue.SyntheticField[javax.naming.ldap.LdapName.rdns].Element", "value", "dfc-generated"]
+      - ["javax.naming.ldap", "LdapReferralException", True, "getReferralContext", "(Hashtable,Control[])", "", "Argument[1]", "Argument[0].MapValue", "taint", "dfc-generated"]
+      - ["javax.naming.ldap", "PagedResultsControl", False, "PagedResultsControl", "(int,byte[],boolean)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.naming.ldap", "PagedResultsResponseControl", False, "PagedResultsResponseControl", "(String,boolean,byte[])", "", "Argument[2]", "Argument[this].SyntheticField[javax.naming.ldap.PagedResultsResponseControl.cookie]", "taint", "dfc-generated"]
+      - ["javax.naming.ldap", "PagedResultsResponseControl", False, "getCookie", "()", "", "Argument[this].SyntheticField[javax.naming.ldap.PagedResultsResponseControl.cookie]", "ReturnValue", "value", "dfc-generated"]
       - ["javax.naming.ldap", "Rdn", True, "Rdn", "(Rdn)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["javax.naming.ldap", "Rdn", True, "getType", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["javax.naming.ldap", "Rdn", True, "getValue", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["javax.naming.ldap", "Rdn", True, "toAttributes", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.naming.ldap", "SortKey", True, "SortKey", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.naming.ldap", "SortKey", True, "SortKey", "(String,boolean,String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.naming.ldap", "SortKey", True, "SortKey", "(String,boolean,String)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.naming.ldap", "SortKey", True, "getAttributeID", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.naming.ldap", "SortKey", True, "getMatchingRuleID", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.naming.ldap", "SortResponseControl", False, "SortResponseControl", "(String,boolean,byte[])", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.naming.ldap", "SortResponseControl", False, "SortResponseControl", "(String,boolean,byte[])", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.naming.ldap", "SortResponseControl", False, "getAttributeID", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.naming.ldap", "UnsolicitedNotificationEvent", True, "UnsolicitedNotificationEvent", "(Object,UnsolicitedNotification)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.naming.ldap", "UnsolicitedNotificationEvent", True, "UnsolicitedNotificationEvent", "(Object,UnsolicitedNotification)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.naming.ldap", "UnsolicitedNotificationEvent", True, "getNotification", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.naming.ldap", "SortKey", True, "SortKey", "(String)", "", "Argument[0]", "Argument[this].SyntheticField[javax.naming.ldap.SortKey.attrID]", "value", "dfc-generated"]
+      - ["javax.naming.ldap", "SortKey", True, "SortKey", "(String,boolean,String)", "", "Argument[0]", "Argument[this].SyntheticField[javax.naming.ldap.SortKey.attrID]", "value", "dfc-generated"]
+      - ["javax.naming.ldap", "SortKey", True, "SortKey", "(String,boolean,String)", "", "Argument[2]", "Argument[this].SyntheticField[javax.naming.ldap.SortKey.matchingRuleID]", "value", "dfc-generated"]
+      - ["javax.naming.ldap", "SortKey", True, "getAttributeID", "()", "", "Argument[this].SyntheticField[javax.naming.ldap.SortKey.attrID]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.naming.ldap", "SortKey", True, "getMatchingRuleID", "()", "", "Argument[this].SyntheticField[javax.naming.ldap.SortKey.matchingRuleID]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.naming.ldap", "SortResponseControl", False, "SortResponseControl", "(String,boolean,byte[])", "", "Argument[2]", "Argument[this].SyntheticField[javax.naming.ldap.SortResponseControl.badAttrId]", "taint", "dfc-generated"]
+      - ["javax.naming.ldap", "SortResponseControl", False, "getAttributeID", "()", "", "Argument[this].SyntheticField[javax.naming.ldap.SortResponseControl.badAttrId]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.naming.ldap", "StartTlsResponse", True, "negotiate", "(SSLSocketFactory)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.naming.ldap", "StartTlsResponse", True, "setEnabledCipherSuites", "(String[])", "", "Argument[0].ArrayElement", "Argument[this]", "taint", "df-generated"]
+      - ["javax.naming.ldap", "StartTlsResponse", True, "setHostnameVerifier", "(HostnameVerifier)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.naming.ldap", "UnsolicitedNotification", True, "getException", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.naming.ldap", "UnsolicitedNotification", True, "getReferrals", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.naming.ldap", "UnsolicitedNotificationEvent", True, "UnsolicitedNotificationEvent", "(Object,UnsolicitedNotification)", "", "Argument[1]", "Argument[this].SyntheticField[javax.naming.ldap.UnsolicitedNotificationEvent.notice]", "value", "dfc-generated"]
+      - ["javax.naming.ldap", "UnsolicitedNotificationEvent", True, "getNotification", "()", "", "Argument[this].SyntheticField[javax.naming.ldap.UnsolicitedNotificationEvent.notice]", "ReturnValue", "value", "dfc-generated"]
   - addsTo:
       pack: codeql/java-all
       extensible: neutralModel
     data:
-      - ["javax.naming.ldap", "Control", "isCritical", "()", "summary", "df-generated"]
-      - ["javax.naming.ldap", "ControlFactory", "getControlInstance", "(Control)", "summary", "df-generated"]
-      - ["javax.naming.ldap", "ExtendedRequest", "createExtendedResponse", "(String,byte[],int,int)", "summary", "df-generated"]
-      - ["javax.naming.ldap", "ExtendedRequest", "getEncodedValue", "()", "summary", "df-generated"]
-      - ["javax.naming.ldap", "ExtendedRequest", "getID", "()", "summary", "df-generated"]
-      - ["javax.naming.ldap", "ExtendedResponse", "getEncodedValue", "()", "summary", "df-generated"]
-      - ["javax.naming.ldap", "ExtendedResponse", "getID", "()", "summary", "df-generated"]
-      - ["javax.naming.ldap", "LdapContext", "extendedOperation", "(ExtendedRequest)", "summary", "df-generated"]
+      - ["javax.naming.ldap", "BasicControl", "isCritical", "()", "summary", "df-generated"]
+      - ["javax.naming.ldap", "InitialLdapContext", "extendedOperation", "(ExtendedRequest)", "summary", "df-generated"]
       - ["javax.naming.ldap", "LdapName", "endsWith", "(List)", "summary", "df-generated"]
+      - ["javax.naming.ldap", "LdapName", "endsWith", "(Name)", "summary", "df-generated"]
+      - ["javax.naming.ldap", "LdapName", "isEmpty", "()", "summary", "df-generated"]
+      - ["javax.naming.ldap", "LdapName", "size", "()", "summary", "df-generated"]
       - ["javax.naming.ldap", "LdapName", "startsWith", "(List)", "summary", "df-generated"]
-      - ["javax.naming.ldap", "LdapReferralException", "getReferralContext", "(Hashtable,Control[])", "summary", "df-generated"]
+      - ["javax.naming.ldap", "LdapName", "startsWith", "(Name)", "summary", "df-generated"]
       - ["javax.naming.ldap", "ManageReferralControl", "ManageReferralControl", "(boolean)", "summary", "df-generated"]
       - ["javax.naming.ldap", "PagedResultsControl", "PagedResultsControl", "(int,boolean)", "summary", "df-generated"]
-      - ["javax.naming.ldap", "PagedResultsControl", "PagedResultsControl", "(int,byte[],boolean)", "summary", "df-generated"]
       - ["javax.naming.ldap", "PagedResultsResponseControl", "getResultSize", "()", "summary", "df-generated"]
       - ["javax.naming.ldap", "Rdn", "Rdn", "(Attributes)", "summary", "df-generated"]
       - ["javax.naming.ldap", "Rdn", "Rdn", "(String)", "summary", "df-generated"]
@@ -83,9 +95,9 @@ extensions:
       - ["javax.naming.ldap", "SortResponseControl", "getException", "()", "summary", "df-generated"]
       - ["javax.naming.ldap", "SortResponseControl", "getResultCode", "()", "summary", "df-generated"]
       - ["javax.naming.ldap", "SortResponseControl", "isSorted", "()", "summary", "df-generated"]
+      - ["javax.naming.ldap", "StartTlsRequest", "createExtendedResponse", "(String,byte[],int,int)", "summary", "df-generated"]
+      - ["javax.naming.ldap", "StartTlsRequest", "getEncodedValue", "()", "summary", "df-generated"]
+      - ["javax.naming.ldap", "StartTlsRequest", "getID", "()", "summary", "df-generated"]
       - ["javax.naming.ldap", "StartTlsResponse", "close", "()", "summary", "df-generated"]
       - ["javax.naming.ldap", "StartTlsResponse", "negotiate", "()", "summary", "df-generated"]
-      - ["javax.naming.ldap", "StartTlsResponse", "negotiate", "(SSLSocketFactory)", "summary", "df-generated"]
-      - ["javax.naming.ldap", "StartTlsResponse", "setEnabledCipherSuites", "(String[])", "summary", "df-generated"]
-      - ["javax.naming.ldap", "StartTlsResponse", "setHostnameVerifier", "(HostnameVerifier)", "summary", "df-generated"]
       - ["javax.naming.ldap", "UnsolicitedNotificationEvent", "dispatch", "(UnsolicitedNotificationListener)", "summary", "df-generated"]
diff --git a/java/ql/lib/ext/generated/javax.naming.ldap.spi.model.yml b/java/ql/lib/ext/generated/javax.naming.ldap.spi.model.yml
index ed57b597119..86c49d898b0 100644
--- a/java/ql/lib/ext/generated/javax.naming.ldap.spi.model.yml
+++ b/java/ql/lib/ext/generated/javax.naming.ldap.spi.model.yml
@@ -4,10 +4,10 @@ extensions:
       pack: codeql/java-all
       extensible: summaryModel
     data:
-      - ["javax.naming.ldap.spi", "LdapDnsProviderResult", False, "LdapDnsProviderResult", "(String,List)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.naming.ldap.spi", "LdapDnsProviderResult", False, "LdapDnsProviderResult", "(String,List)", "", "Argument[1].Element", "Argument[this]", "taint", "df-generated"]
-      - ["javax.naming.ldap.spi", "LdapDnsProviderResult", False, "getDomainName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.naming.ldap.spi", "LdapDnsProviderResult", False, "getEndpoints", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.naming.ldap.spi", "LdapDnsProviderResult", False, "LdapDnsProviderResult", "(String,List)", "", "Argument[0]", "Argument[this].SyntheticField[javax.naming.ldap.spi.LdapDnsProviderResult.domainName]", "value", "dfc-generated"]
+      - ["javax.naming.ldap.spi", "LdapDnsProviderResult", False, "LdapDnsProviderResult", "(String,List)", "", "Argument[1].Element", "Argument[this].SyntheticField[javax.naming.ldap.spi.LdapDnsProviderResult.endpoints].Element", "value", "dfc-generated"]
+      - ["javax.naming.ldap.spi", "LdapDnsProviderResult", False, "getDomainName", "()", "", "Argument[this].SyntheticField[javax.naming.ldap.spi.LdapDnsProviderResult.domainName]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.naming.ldap.spi", "LdapDnsProviderResult", False, "getEndpoints", "()", "", "Argument[this].SyntheticField[javax.naming.ldap.spi.LdapDnsProviderResult.endpoints]", "ReturnValue", "value", "dfc-generated"]
   - addsTo:
       pack: codeql/java-all
       extensible: neutralModel
diff --git a/java/ql/lib/ext/generated/javax.naming.model.yml b/java/ql/lib/ext/generated/javax.naming.model.yml
index 86321736e88..50047ca8a95 100644
--- a/java/ql/lib/ext/generated/javax.naming.model.yml
+++ b/java/ql/lib/ext/generated/javax.naming.model.yml
@@ -6,42 +6,36 @@ extensions:
     data:
       - ["javax.naming", "AuthenticationException", True, "AuthenticationException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["javax.naming", "AuthenticationNotSupportedException", True, "AuthenticationNotSupportedException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.naming", "BinaryRefAddr", True, "BinaryRefAddr", "(String,byte[])", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.naming", "BinaryRefAddr", True, "BinaryRefAddr", "(String,byte[])", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.naming", "BinaryRefAddr", True, "BinaryRefAddr", "(String,byte[],int,int)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.naming", "BinaryRefAddr", True, "BinaryRefAddr", "(String,byte[],int,int)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.naming", "Binding", True, "Binding", "(String,Object)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.naming", "Binding", True, "Binding", "(String,Object)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.naming", "Binding", True, "Binding", "(String,Object,boolean)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.naming", "Binding", True, "Binding", "(String,Object,boolean)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.naming", "Binding", True, "Binding", "(String,String,Object)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.naming", "Binding", True, "Binding", "(String,String,Object)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.naming", "Binding", True, "Binding", "(String,String,Object)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.naming", "Binding", True, "Binding", "(String,String,Object,boolean)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.naming", "Binding", True, "Binding", "(String,String,Object,boolean)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.naming", "Binding", True, "Binding", "(String,String,Object,boolean)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.naming", "Binding", True, "getObject", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.naming", "Binding", True, "setObject", "(Object)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.naming", "BinaryRefAddr", True, "BinaryRefAddr", "(String,byte[])", "", "Argument[1]", "Argument[this].SyntheticField[javax.naming.BinaryRefAddr.buf]", "taint", "dfc-generated"]
+      - ["javax.naming", "BinaryRefAddr", True, "BinaryRefAddr", "(String,byte[],int,int)", "", "Argument[1]", "Argument[this].SyntheticField[javax.naming.BinaryRefAddr.buf]", "taint", "dfc-generated"]
+      - ["javax.naming", "BinaryRefAddr", True, "getContent", "()", "", "Argument[this].SyntheticField[javax.naming.BinaryRefAddr.buf]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.naming", "Binding", True, "Binding", "(String,Object)", "", "Argument[1]", "Argument[this].SyntheticField[javax.naming.Binding.boundObj]", "value", "dfc-generated"]
+      - ["javax.naming", "Binding", True, "Binding", "(String,Object,boolean)", "", "Argument[1]", "Argument[this].SyntheticField[javax.naming.Binding.boundObj]", "value", "dfc-generated"]
+      - ["javax.naming", "Binding", True, "Binding", "(String,String,Object)", "", "Argument[1]", "Argument[this].SyntheticField[javax.naming.NameClassPair.className]", "value", "dfc-generated"]
+      - ["javax.naming", "Binding", True, "Binding", "(String,String,Object)", "", "Argument[2]", "Argument[this].SyntheticField[javax.naming.Binding.boundObj]", "value", "dfc-generated"]
+      - ["javax.naming", "Binding", True, "Binding", "(String,String,Object,boolean)", "", "Argument[1]", "Argument[this].SyntheticField[javax.naming.NameClassPair.className]", "value", "dfc-generated"]
+      - ["javax.naming", "Binding", True, "Binding", "(String,String,Object,boolean)", "", "Argument[2]", "Argument[this].SyntheticField[javax.naming.Binding.boundObj]", "value", "dfc-generated"]
+      - ["javax.naming", "Binding", True, "getClassName", "()", "", "Argument[this].SyntheticField[javax.naming.NameClassPair.className]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.naming", "Binding", True, "getObject", "()", "", "Argument[this].SyntheticField[javax.naming.Binding.boundObj]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.naming", "Binding", True, "setObject", "(Object)", "", "Argument[0]", "Argument[this].SyntheticField[javax.naming.Binding.boundObj]", "value", "dfc-generated"]
       - ["javax.naming", "CannotProceedException", True, "CannotProceedException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.naming", "CannotProceedException", True, "getAltName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.naming", "CannotProceedException", True, "getAltNameCtx", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.naming", "CannotProceedException", True, "getEnvironment", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.naming", "CannotProceedException", True, "getAltName", "()", "", "Argument[this].SyntheticField[javax.naming.CannotProceedException.altName]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.naming", "CannotProceedException", True, "getAltNameCtx", "()", "", "Argument[this].SyntheticField[javax.naming.CannotProceedException.altNameCtx]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.naming", "CannotProceedException", True, "getEnvironment", "()", "", "Argument[this].SyntheticField[javax.naming.CannotProceedException.environment]", "ReturnValue", "value", "dfc-generated"]
       - ["javax.naming", "CannotProceedException", True, "getRemainingNewName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.naming", "CannotProceedException", True, "setAltName", "(Name)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.naming", "CannotProceedException", True, "setAltNameCtx", "(Context)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.naming", "CannotProceedException", True, "setEnvironment", "(Hashtable)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
+      - ["javax.naming", "CannotProceedException", True, "setAltName", "(Name)", "", "Argument[0]", "Argument[this].SyntheticField[javax.naming.CannotProceedException.altName]", "value", "dfc-generated"]
+      - ["javax.naming", "CannotProceedException", True, "setAltNameCtx", "(Context)", "", "Argument[0]", "Argument[this].SyntheticField[javax.naming.CannotProceedException.altNameCtx]", "value", "dfc-generated"]
+      - ["javax.naming", "CannotProceedException", True, "setEnvironment", "(Hashtable)", "", "Argument[0]", "Argument[this].SyntheticField[javax.naming.CannotProceedException.environment]", "value", "dfc-generated"]
       - ["javax.naming", "CannotProceedException", True, "setRemainingNewName", "(Name)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["javax.naming", "CommunicationException", True, "CommunicationException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["javax.naming", "CompoundName", True, "CompoundName", "(String,Properties)", "", "Argument[1].Element", "Argument[this]", "taint", "df-generated"]
       - ["javax.naming", "ConfigurationException", True, "ConfigurationException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.naming", "Context", True, "addToEnvironment", "(String,Object)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.naming", "Context", True, "addToEnvironment", "(String,Object)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.naming", "Context", True, "addToEnvironment", "(String,Object)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.naming", "Context", True, "addToEnvironment", "(String,Object)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.naming", "Context", True, "composeName", "(Name,Name)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.naming", "Context", True, "composeName", "(Name,Name)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.naming", "Context", True, "composeName", "(String,String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.naming", "Context", True, "composeName", "(String,String)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.naming", "Context", True, "addToEnvironment", "(String,Object)", "", "Argument[1]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.naming", "Context", True, "bind", "(Name,Object)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.naming", "Context", True, "bind", "(String,Object)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.naming", "Context", True, "composeName", "(Name,Name)", "", "Argument[1]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.naming", "Context", True, "composeName", "(String,String)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.naming", "Context", True, "composeName", "(String,String)", "", "Argument[1]", "ReturnValue", "value", "dfc-generated"]
       - ["javax.naming", "Context", True, "createSubcontext", "(Name)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["javax.naming", "Context", True, "createSubcontext", "(String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["javax.naming", "Context", True, "getEnvironment", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
@@ -58,6 +52,8 @@ extensions:
       - ["javax.naming", "Context", True, "lookup", "(String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["javax.naming", "Context", True, "lookupLink", "(Name)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["javax.naming", "Context", True, "lookupLink", "(String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.naming", "Context", True, "rebind", "(Name,Object)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.naming", "Context", True, "rebind", "(String,Object)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
       - ["javax.naming", "Context", True, "removeFromEnvironment", "(String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["javax.naming", "ContextNotEmptyException", True, "ContextNotEmptyException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["javax.naming", "InitialContext", True, "InitialContext", "(Hashtable)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
@@ -66,53 +62,53 @@ extensions:
       - ["javax.naming", "InvalidNameException", True, "InvalidNameException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["javax.naming", "LimitExceededException", True, "LimitExceededException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["javax.naming", "LinkException", True, "LinkException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.naming", "LinkException", True, "getLinkExplanation", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.naming", "LinkException", True, "getLinkExplanation", "()", "", "Argument[this].SyntheticField[javax.naming.LinkException.linkExplanation]", "ReturnValue", "value", "dfc-generated"]
       - ["javax.naming", "LinkException", True, "getLinkRemainingName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["javax.naming", "LinkException", True, "getLinkResolvedName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.naming", "LinkException", True, "getLinkResolvedObj", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.naming", "LinkException", True, "setLinkExplanation", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.naming", "LinkException", True, "getLinkResolvedObj", "()", "", "Argument[this].SyntheticField[javax.naming.LinkException.linkResolvedObj]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.naming", "LinkException", True, "setLinkExplanation", "(String)", "", "Argument[0]", "Argument[this].SyntheticField[javax.naming.LinkException.linkExplanation]", "value", "dfc-generated"]
       - ["javax.naming", "LinkException", True, "setLinkRemainingName", "(Name)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["javax.naming", "LinkException", True, "setLinkResolvedName", "(Name)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.naming", "LinkException", True, "setLinkResolvedObj", "(Object)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.naming", "LinkException", True, "setLinkResolvedObj", "(Object)", "", "Argument[0]", "Argument[this].SyntheticField[javax.naming.LinkException.linkResolvedObj]", "value", "dfc-generated"]
       - ["javax.naming", "LinkLoopException", True, "LinkLoopException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["javax.naming", "LinkRef", True, "LinkRef", "(Name)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["javax.naming", "LinkRef", True, "LinkRef", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["javax.naming", "LinkRef", True, "getLinkName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["javax.naming", "MalformedLinkException", True, "MalformedLinkException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.naming", "Name", True, "add", "(String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.naming", "Name", True, "add", "(String)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["javax.naming", "Name", True, "add", "(int,String)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["javax.naming", "Name", True, "addAll", "(Name)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.naming", "Name", True, "addAll", "(Name)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["javax.naming", "Name", True, "addAll", "(int,Name)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["javax.naming", "Name", True, "add", "(String)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.naming", "Name", True, "add", "(int,String)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.naming", "Name", True, "addAll", "(Name)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.naming", "Name", True, "addAll", "(int,Name)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
       - ["javax.naming", "Name", True, "get", "(int)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["javax.naming", "Name", True, "getAll", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["javax.naming", "Name", True, "getPrefix", "(int)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["javax.naming", "Name", True, "getSuffix", "(int)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["javax.naming", "Name", True, "remove", "(int)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["javax.naming", "NameAlreadyBoundException", True, "NameAlreadyBoundException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.naming", "NameClassPair", True, "NameClassPair", "(String,String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.naming", "NameClassPair", True, "NameClassPair", "(String,String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.naming", "NameClassPair", True, "NameClassPair", "(String,String,boolean)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.naming", "NameClassPair", True, "NameClassPair", "(String,String,boolean)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.naming", "NameClassPair", True, "getClassName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.naming", "NameClassPair", True, "getName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.naming", "NameClassPair", True, "getNameInNamespace", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.naming", "NameClassPair", True, "setClassName", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.naming", "NameClassPair", True, "setName", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.naming", "NameClassPair", True, "setNameInNamespace", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.naming", "NameClassPair", True, "NameClassPair", "(String,String)", "", "Argument[0]", "Argument[this].SyntheticField[javax.naming.NameClassPair.name]", "value", "dfc-generated"]
+      - ["javax.naming", "NameClassPair", True, "NameClassPair", "(String,String)", "", "Argument[1]", "Argument[this].SyntheticField[javax.naming.NameClassPair.className]", "value", "dfc-generated"]
+      - ["javax.naming", "NameClassPair", True, "NameClassPair", "(String,String,boolean)", "", "Argument[0]", "Argument[this].SyntheticField[javax.naming.NameClassPair.name]", "value", "dfc-generated"]
+      - ["javax.naming", "NameClassPair", True, "NameClassPair", "(String,String,boolean)", "", "Argument[1]", "Argument[this].SyntheticField[javax.naming.NameClassPair.className]", "value", "dfc-generated"]
+      - ["javax.naming", "NameClassPair", True, "getClassName", "()", "", "Argument[this].SyntheticField[javax.naming.NameClassPair.className]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.naming", "NameClassPair", True, "getName", "()", "", "Argument[this].SyntheticField[javax.naming.NameClassPair.name]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.naming", "NameClassPair", True, "getNameInNamespace", "()", "", "Argument[this].SyntheticField[javax.naming.NameClassPair.fullName]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.naming", "NameClassPair", True, "setClassName", "(String)", "", "Argument[0]", "Argument[this].SyntheticField[javax.naming.NameClassPair.className]", "value", "dfc-generated"]
+      - ["javax.naming", "NameClassPair", True, "setName", "(String)", "", "Argument[0]", "Argument[this].SyntheticField[javax.naming.NameClassPair.name]", "value", "dfc-generated"]
+      - ["javax.naming", "NameClassPair", True, "setNameInNamespace", "(String)", "", "Argument[0]", "Argument[this].SyntheticField[javax.naming.NameClassPair.fullName]", "value", "dfc-generated"]
       - ["javax.naming", "NameNotFoundException", True, "NameNotFoundException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.naming", "NamingException", True, "NamingException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.naming", "NameParser", True, "parse", "(String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.naming", "NamingException", True, "NamingException", "(String)", "", "Argument[0]", "Argument[this].SyntheticField[java.lang.Throwable.message]", "value", "dfc-generated"]
       - ["javax.naming", "NamingException", True, "appendRemainingName", "(Name)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.naming", "NamingException", True, "getExplanation", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.naming", "NamingException", True, "getExplanation", "()", "", "Argument[this].SyntheticField[java.lang.Throwable.message]", "ReturnValue", "value", "dfc-generated"]
       - ["javax.naming", "NamingException", True, "getRemainingName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["javax.naming", "NamingException", True, "getResolvedName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.naming", "NamingException", True, "getResolvedObj", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.naming", "NamingException", True, "getRootCause", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.naming", "NamingException", True, "getResolvedObj", "()", "", "Argument[this].SyntheticField[javax.naming.NamingException.resolvedObj]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.naming", "NamingException", True, "getRootCause", "()", "", "Argument[this].SyntheticField[javax.naming.NamingException.rootException]", "ReturnValue", "value", "dfc-generated"]
       - ["javax.naming", "NamingException", True, "setRemainingName", "(Name)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["javax.naming", "NamingException", True, "setResolvedName", "(Name)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.naming", "NamingException", True, "setResolvedObj", "(Object)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.naming", "NamingException", True, "setRootCause", "(Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.naming", "NamingException", True, "setResolvedObj", "(Object)", "", "Argument[0]", "Argument[this].SyntheticField[javax.naming.NamingException.resolvedObj]", "value", "dfc-generated"]
+      - ["javax.naming", "NamingException", True, "setRootCause", "(Throwable)", "", "Argument[0]", "Argument[this].SyntheticField[javax.naming.NamingException.rootException]", "value", "dfc-generated"]
+      - ["javax.naming", "NamingException", True, "toString", "(boolean)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["javax.naming", "NamingSecurityException", True, "NamingSecurityException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["javax.naming", "NoInitialContextException", True, "NoInitialContextException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["javax.naming", "NoPermissionException", True, "NoPermissionException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
@@ -121,25 +117,30 @@ extensions:
       - ["javax.naming", "PartialResultException", True, "PartialResultException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["javax.naming", "RefAddr", True, "getContent", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["javax.naming", "RefAddr", True, "getType", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.naming", "Reference", True, "Reference", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.naming", "Reference", True, "Reference", "(String,RefAddr)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.naming", "Reference", True, "Reference", "(String,RefAddr)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.naming", "Reference", True, "Reference", "(String,RefAddr,String,String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.naming", "Reference", True, "Reference", "(String,RefAddr,String,String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.naming", "Reference", True, "Reference", "(String,RefAddr,String,String)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.naming", "Reference", True, "Reference", "(String,RefAddr,String,String)", "", "Argument[3]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.naming", "Reference", True, "Reference", "(String,String,String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.naming", "Reference", True, "Reference", "(String,String,String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.naming", "Reference", True, "Reference", "(String,String,String)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.naming", "Reference", True, "add", "(RefAddr)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.naming", "Reference", True, "add", "(int,RefAddr)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.naming", "Reference", True, "get", "(String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.naming", "Reference", True, "get", "(int)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.naming", "Reference", True, "getAll", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.naming", "Reference", True, "getClassName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.naming", "Reference", True, "getFactoryClassLocation", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.naming", "Reference", True, "getFactoryClassName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.naming", "Reference", True, "remove", "(int)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.naming", "Reference", True, "Reference", "(String)", "", "Argument[0]", "Argument[this].SyntheticField[javax.naming.Reference.className]", "value", "dfc-generated"]
+      - ["javax.naming", "Reference", True, "Reference", "(String,RefAddr)", "", "Argument[0]", "Argument[this].SyntheticField[javax.naming.Reference.className]", "value", "dfc-generated"]
+      - ["javax.naming", "Reference", True, "Reference", "(String,RefAddr)", "", "Argument[1]", "Argument[this].SyntheticField[javax.naming.Reference.addrs].Element", "value", "dfc-generated"]
+      - ["javax.naming", "Reference", True, "Reference", "(String,RefAddr,String,String)", "", "Argument[0]", "Argument[this].SyntheticField[javax.naming.Reference.className]", "value", "dfc-generated"]
+      - ["javax.naming", "Reference", True, "Reference", "(String,RefAddr,String,String)", "", "Argument[1]", "Argument[this].SyntheticField[javax.naming.Reference.addrs].Element", "value", "dfc-generated"]
+      - ["javax.naming", "Reference", True, "Reference", "(String,RefAddr,String,String)", "", "Argument[2]", "Argument[this].SyntheticField[javax.naming.Reference.classFactory]", "value", "dfc-generated"]
+      - ["javax.naming", "Reference", True, "Reference", "(String,RefAddr,String,String)", "", "Argument[3]", "Argument[this].SyntheticField[javax.naming.Reference.classFactoryLocation]", "value", "dfc-generated"]
+      - ["javax.naming", "Reference", True, "Reference", "(String,String,String)", "", "Argument[0]", "Argument[this].SyntheticField[javax.naming.Reference.className]", "value", "dfc-generated"]
+      - ["javax.naming", "Reference", True, "Reference", "(String,String,String)", "", "Argument[1]", "Argument[this].SyntheticField[javax.naming.Reference.classFactory]", "value", "dfc-generated"]
+      - ["javax.naming", "Reference", True, "Reference", "(String,String,String)", "", "Argument[2]", "Argument[this].SyntheticField[javax.naming.Reference.classFactoryLocation]", "value", "dfc-generated"]
+      - ["javax.naming", "Reference", True, "add", "(RefAddr)", "", "Argument[0]", "Argument[this].SyntheticField[javax.naming.Reference.addrs].Element", "value", "dfc-generated"]
+      - ["javax.naming", "Reference", True, "add", "(int,RefAddr)", "", "Argument[1]", "Argument[this].SyntheticField[javax.naming.Reference.addrs].Element", "value", "dfc-generated"]
+      - ["javax.naming", "Reference", True, "get", "(String)", "", "Argument[this].SyntheticField[javax.naming.Reference.addrs].Element", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.naming", "Reference", True, "get", "(int)", "", "Argument[this].SyntheticField[javax.naming.Reference.addrs].Element", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.naming", "Reference", True, "getAll", "()", "", "Argument[this].SyntheticField[javax.naming.Reference.addrs].Element", "ReturnValue.Element", "value", "dfc-generated"]
+      - ["javax.naming", "Reference", True, "getClassName", "()", "", "Argument[this].SyntheticField[javax.naming.Reference.className]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.naming", "Reference", True, "getFactoryClassLocation", "()", "", "Argument[this].SyntheticField[javax.naming.Reference.classFactoryLocation]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.naming", "Reference", True, "getFactoryClassName", "()", "", "Argument[this].SyntheticField[javax.naming.Reference.classFactory]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.naming", "Reference", True, "remove", "(int)", "", "Argument[this].SyntheticField[javax.naming.Reference.addrs].Element", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.naming", "Referenceable", True, "getReference", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.naming", "ReferralException", True, "getReferralContext", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.naming", "ReferralException", True, "getReferralContext", "(Hashtable)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
+      - ["javax.naming", "ReferralException", True, "getReferralContext", "(Hashtable)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.naming", "ReferralException", True, "getReferralInfo", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["javax.naming", "ServiceUnavailableException", True, "ServiceUnavailableException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["javax.naming", "SizeLimitExceededException", True, "SizeLimitExceededException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["javax.naming", "TimeLimitExceededException", True, "TimeLimitExceededException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
@@ -148,30 +149,27 @@ extensions:
       extensible: neutralModel
     data:
       - ["javax.naming", "CompositeName", "CompositeName", "(String)", "summary", "df-generated"]
-      - ["javax.naming", "Context", "bind", "(Name,Object)", "summary", "df-generated"]
-      - ["javax.naming", "Context", "bind", "(String,Object)", "summary", "df-generated"]
-      - ["javax.naming", "Context", "close", "()", "summary", "df-generated"]
-      - ["javax.naming", "Context", "destroySubcontext", "(Name)", "summary", "df-generated"]
-      - ["javax.naming", "Context", "destroySubcontext", "(String)", "summary", "df-generated"]
-      - ["javax.naming", "Context", "rebind", "(Name,Object)", "summary", "df-generated"]
-      - ["javax.naming", "Context", "rebind", "(String,Object)", "summary", "df-generated"]
-      - ["javax.naming", "Context", "rename", "(Name,Name)", "summary", "df-generated"]
-      - ["javax.naming", "Context", "rename", "(String,String)", "summary", "df-generated"]
-      - ["javax.naming", "Context", "unbind", "(Name)", "summary", "df-generated"]
-      - ["javax.naming", "Context", "unbind", "(String)", "summary", "df-generated"]
+      - ["javax.naming", "CompositeName", "endsWith", "(Name)", "summary", "df-generated"]
+      - ["javax.naming", "CompositeName", "isEmpty", "()", "summary", "df-generated"]
+      - ["javax.naming", "CompositeName", "size", "()", "summary", "df-generated"]
+      - ["javax.naming", "CompositeName", "startsWith", "(Name)", "summary", "df-generated"]
+      - ["javax.naming", "CompoundName", "endsWith", "(Name)", "summary", "df-generated"]
+      - ["javax.naming", "CompoundName", "isEmpty", "()", "summary", "df-generated"]
+      - ["javax.naming", "CompoundName", "size", "()", "summary", "df-generated"]
+      - ["javax.naming", "CompoundName", "startsWith", "(Name)", "summary", "df-generated"]
+      - ["javax.naming", "InitialContext", "close", "()", "summary", "df-generated"]
+      - ["javax.naming", "InitialContext", "destroySubcontext", "(Name)", "summary", "df-generated"]
+      - ["javax.naming", "InitialContext", "destroySubcontext", "(String)", "summary", "df-generated"]
       - ["javax.naming", "InitialContext", "doLookup", "(Name)", "summary", "df-generated"]
       - ["javax.naming", "InitialContext", "doLookup", "(String)", "summary", "df-generated"]
-      - ["javax.naming", "Name", "endsWith", "(Name)", "summary", "df-generated"]
-      - ["javax.naming", "Name", "isEmpty", "()", "summary", "df-generated"]
-      - ["javax.naming", "Name", "size", "()", "summary", "df-generated"]
-      - ["javax.naming", "Name", "startsWith", "(Name)", "summary", "df-generated"]
+      - ["javax.naming", "InitialContext", "rename", "(Name,Name)", "summary", "df-generated"]
+      - ["javax.naming", "InitialContext", "rename", "(String,String)", "summary", "df-generated"]
+      - ["javax.naming", "InitialContext", "unbind", "(Name)", "summary", "df-generated"]
+      - ["javax.naming", "InitialContext", "unbind", "(String)", "summary", "df-generated"]
       - ["javax.naming", "NameClassPair", "isRelative", "()", "summary", "df-generated"]
       - ["javax.naming", "NameClassPair", "setRelative", "(boolean)", "summary", "df-generated"]
       - ["javax.naming", "NamingException", "appendRemainingComponent", "(String)", "summary", "df-generated"]
       - ["javax.naming", "Reference", "clear", "()", "summary", "df-generated"]
       - ["javax.naming", "Reference", "size", "()", "summary", "df-generated"]
-      - ["javax.naming", "ReferralException", "getReferralContext", "()", "summary", "df-generated"]
-      - ["javax.naming", "ReferralException", "getReferralContext", "(Hashtable)", "summary", "df-generated"]
-      - ["javax.naming", "ReferralException", "getReferralInfo", "()", "summary", "df-generated"]
       - ["javax.naming", "ReferralException", "retryReferral", "()", "summary", "df-generated"]
       - ["javax.naming", "ReferralException", "skipReferral", "()", "summary", "df-generated"]
diff --git a/java/ql/lib/ext/generated/javax.naming.spi.model.yml b/java/ql/lib/ext/generated/javax.naming.spi.model.yml
index 5f36e7d0e73..3054774c10d 100644
--- a/java/ql/lib/ext/generated/javax.naming.spi.model.yml
+++ b/java/ql/lib/ext/generated/javax.naming.spi.model.yml
@@ -4,29 +4,29 @@ extensions:
       pack: codeql/java-all
       extensible: summaryModel
     data:
-      - ["javax.naming.spi", "DirStateFactory$Result", True, "Result", "(Object,Attributes)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.naming.spi", "DirStateFactory$Result", True, "Result", "(Object,Attributes)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.naming.spi", "DirStateFactory$Result", True, "getAttributes", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.naming.spi", "DirStateFactory$Result", True, "getObject", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.naming.spi", "DirStateFactory$Result", True, "Result", "(Object,Attributes)", "", "Argument[0]", "Argument[this].SyntheticField[javax.naming.spi.DirStateFactory$Result.obj]", "value", "dfc-generated"]
+      - ["javax.naming.spi", "DirStateFactory$Result", True, "Result", "(Object,Attributes)", "", "Argument[1]", "Argument[this].SyntheticField[javax.naming.spi.DirStateFactory$Result.attrs]", "value", "dfc-generated"]
+      - ["javax.naming.spi", "DirStateFactory$Result", True, "getAttributes", "()", "", "Argument[this].SyntheticField[javax.naming.spi.DirStateFactory$Result.attrs]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.naming.spi", "DirStateFactory$Result", True, "getObject", "()", "", "Argument[this].SyntheticField[javax.naming.spi.DirStateFactory$Result.obj]", "ReturnValue", "value", "dfc-generated"]
       - ["javax.naming.spi", "DirectoryManager", True, "getContinuationDirContext", "(CannotProceedException)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.naming.spi", "DirectoryManager", True, "getObjectInstance", "(Object,Name,Context,Hashtable,Attributes)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.naming.spi", "DirectoryManager", True, "getObjectInstance", "(Object,Name,Context,Hashtable,Attributes)", "", "Argument[3].Element", "ReturnValue", "taint", "df-generated"]
-      - ["javax.naming.spi", "DirectoryManager", True, "getStateToBind", "(Object,Name,Context,Hashtable,Attributes)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.naming.spi", "DirectoryManager", True, "getStateToBind", "(Object,Name,Context,Hashtable,Attributes)", "", "Argument[4]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.naming.spi", "DirectoryManager", True, "getObjectInstance", "(Object,Name,Context,Hashtable,Attributes)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.naming.spi", "DirectoryManager", True, "getStateToBind", "(Object,Name,Context,Hashtable,Attributes)", "", "Argument[0]", "ReturnValue.SyntheticField[javax.naming.spi.DirStateFactory$Result.obj]", "value", "dfc-generated"]
+      - ["javax.naming.spi", "DirectoryManager", True, "getStateToBind", "(Object,Name,Context,Hashtable,Attributes)", "", "Argument[4]", "ReturnValue.SyntheticField[javax.naming.spi.DirStateFactory$Result.attrs]", "value", "dfc-generated"]
+      - ["javax.naming.spi", "InitialContextFactory", True, "getInitialContext", "(Hashtable)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
       - ["javax.naming.spi", "NamingManager", True, "getContinuationContext", "(CannotProceedException)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["javax.naming.spi", "NamingManager", True, "getInitialContext", "(Hashtable)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["javax.naming.spi", "NamingManager", True, "getObjectInstance", "(Object,Name,Context,Hashtable)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.naming.spi", "NamingManager", True, "getObjectInstance", "(Object,Name,Context,Hashtable)", "", "Argument[3].Element", "ReturnValue", "taint", "df-generated"]
-      - ["javax.naming.spi", "NamingManager", True, "getStateToBind", "(Object,Name,Context,Hashtable)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.naming.spi", "NamingManager", True, "getObjectInstance", "(Object,Name,Context,Hashtable)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.naming.spi", "NamingManager", True, "getStateToBind", "(Object,Name,Context,Hashtable)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
       - ["javax.naming.spi", "NamingManager", True, "getURLContext", "(String,Hashtable)", "", "Argument[1].Element", "ReturnValue", "taint", "df-generated"]
-      - ["javax.naming.spi", "ResolveResult", True, "ResolveResult", "(Object,Name)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.naming.spi", "ResolveResult", True, "ResolveResult", "(Object,Name)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.naming.spi", "ResolveResult", True, "ResolveResult", "(Object,String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.naming.spi", "ObjectFactory", True, "getObjectInstance", "(Object,Name,Context,Hashtable)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.naming.spi", "ObjectFactory", True, "getObjectInstance", "(Object,Name,Context,Hashtable)", "", "Argument[3].Element", "ReturnValue", "taint", "df-generated"]
+      - ["javax.naming.spi", "ResolveResult", True, "ResolveResult", "(Object,Name)", "", "Argument[0]", "Argument[this].SyntheticField[javax.naming.spi.ResolveResult.resolvedObj]", "value", "dfc-generated"]
+      - ["javax.naming.spi", "ResolveResult", True, "ResolveResult", "(Object,String)", "", "Argument[0]", "Argument[this].SyntheticField[javax.naming.spi.ResolveResult.resolvedObj]", "value", "dfc-generated"]
       - ["javax.naming.spi", "ResolveResult", True, "appendRemainingName", "(Name)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["javax.naming.spi", "ResolveResult", True, "getRemainingName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.naming.spi", "ResolveResult", True, "getResolvedObj", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.naming.spi", "ResolveResult", True, "getResolvedObj", "()", "", "Argument[this].SyntheticField[javax.naming.spi.ResolveResult.resolvedObj]", "ReturnValue", "value", "dfc-generated"]
       - ["javax.naming.spi", "ResolveResult", True, "setRemainingName", "(Name)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.naming.spi", "ResolveResult", True, "setResolvedObj", "(Object)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.naming.spi", "ResolveResult", True, "setResolvedObj", "(Object)", "", "Argument[0]", "Argument[this].SyntheticField[javax.naming.spi.ResolveResult.resolvedObj]", "value", "dfc-generated"]
       - ["javax.naming.spi", "Resolver", True, "resolveToClass", "(Name,Class)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["javax.naming.spi", "Resolver", True, "resolveToClass", "(Name,Class)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["javax.naming.spi", "Resolver", True, "resolveToClass", "(String,Class)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
diff --git a/java/ql/lib/ext/generated/javax.net.model.yml b/java/ql/lib/ext/generated/javax.net.model.yml
index 2990ef69c06..dd1eed6f1f1 100644
--- a/java/ql/lib/ext/generated/javax.net.model.yml
+++ b/java/ql/lib/ext/generated/javax.net.model.yml
@@ -4,19 +4,25 @@ extensions:
       pack: codeql/java-all
       extensible: summaryModel
     data:
+      - ["javax.net", "ServerSocketFactory", True, "createServerSocket", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.net", "ServerSocketFactory", True, "createServerSocket", "(int)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.net", "ServerSocketFactory", True, "createServerSocket", "(int,int)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["javax.net", "ServerSocketFactory", True, "createServerSocket", "(int,int,InetAddress)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.net", "ServerSocketFactory", True, "createServerSocket", "(int,int,InetAddress)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.net", "SocketFactory", True, "createSocket", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.net", "SocketFactory", True, "createSocket", "(InetAddress,int)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.net", "SocketFactory", True, "createSocket", "(InetAddress,int)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.net", "SocketFactory", True, "createSocket", "(InetAddress,int,InetAddress,int)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["javax.net", "SocketFactory", True, "createSocket", "(InetAddress,int,InetAddress,int)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.net", "SocketFactory", True, "createSocket", "(InetAddress,int,InetAddress,int)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["javax.net", "SocketFactory", True, "createSocket", "(String,int)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.net", "SocketFactory", True, "createSocket", "(String,int)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["javax.net", "SocketFactory", True, "createSocket", "(String,int,InetAddress,int)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["javax.net", "SocketFactory", True, "createSocket", "(String,int,InetAddress,int)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.net", "SocketFactory", True, "createSocket", "(String,int,InetAddress,int)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
   - addsTo:
       pack: codeql/java-all
       extensible: neutralModel
     data:
-      - ["javax.net", "ServerSocketFactory", "createServerSocket", "()", "summary", "df-generated"]
-      - ["javax.net", "ServerSocketFactory", "createServerSocket", "(int)", "summary", "df-generated"]
-      - ["javax.net", "ServerSocketFactory", "createServerSocket", "(int,int)", "summary", "df-generated"]
       - ["javax.net", "ServerSocketFactory", "getDefault", "()", "summary", "df-generated"]
-      - ["javax.net", "SocketFactory", "createSocket", "()", "summary", "df-generated"]
-      - ["javax.net", "SocketFactory", "createSocket", "(InetAddress,int)", "summary", "df-generated"]
       - ["javax.net", "SocketFactory", "getDefault", "()", "summary", "df-generated"]
diff --git a/java/ql/lib/ext/generated/javax.net.ssl.model.yml b/java/ql/lib/ext/generated/javax.net.ssl.model.yml
index 194be2c2008..b2eec1fe7ad 100644
--- a/java/ql/lib/ext/generated/javax.net.ssl.model.yml
+++ b/java/ql/lib/ext/generated/javax.net.ssl.model.yml
@@ -4,41 +4,43 @@ extensions:
       pack: codeql/java-all
       extensible: summaryModel
     data:
-      - ["javax.net.ssl", "CertPathTrustManagerParameters", True, "CertPathTrustManagerParameters", "(CertPathParameters)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.net.ssl", "CertPathTrustManagerParameters", True, "getParameters", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.net.ssl", "HandshakeCompletedEvent", True, "HandshakeCompletedEvent", "(SSLSocket,SSLSession)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.net.ssl", "HandshakeCompletedEvent", True, "HandshakeCompletedEvent", "(SSLSocket,SSLSession)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.net.ssl", "CertPathTrustManagerParameters", True, "CertPathTrustManagerParameters", "(CertPathParameters)", "", "Argument[0]", "Argument[this].SyntheticField[javax.net.ssl.CertPathTrustManagerParameters.parameters]", "value", "dfc-generated"]
+      - ["javax.net.ssl", "CertPathTrustManagerParameters", True, "getParameters", "()", "", "Argument[this].SyntheticField[javax.net.ssl.CertPathTrustManagerParameters.parameters]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.net.ssl", "ExtendedSSLSession", True, "getRequestedServerNames", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.net.ssl", "ExtendedSSLSession", True, "getStatusResponses", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.net.ssl", "HandshakeCompletedEvent", True, "HandshakeCompletedEvent", "(SSLSocket,SSLSession)", "", "Argument[0]", "Argument[this].SyntheticField[java.util.EventObject.source]", "value", "dfc-generated"]
+      - ["javax.net.ssl", "HandshakeCompletedEvent", True, "HandshakeCompletedEvent", "(SSLSocket,SSLSession)", "", "Argument[1]", "Argument[this].SyntheticField[javax.net.ssl.HandshakeCompletedEvent.session]", "value", "dfc-generated"]
       - ["javax.net.ssl", "HandshakeCompletedEvent", True, "getLocalCertificates", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.net.ssl", "HandshakeCompletedEvent", True, "getLocalPrincipal", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["javax.net.ssl", "HandshakeCompletedEvent", True, "getPeerCertificates", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.net.ssl", "HandshakeCompletedEvent", True, "getSession", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.net.ssl", "HandshakeCompletedEvent", True, "getSocket", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.net.ssl", "HttpsURLConnection", True, "getHostnameVerifier", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.net.ssl", "HttpsURLConnection", True, "getSSLSocketFactory", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.net.ssl", "HttpsURLConnection", True, "setHostnameVerifier", "(HostnameVerifier)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.net.ssl", "HttpsURLConnection", True, "setSSLSocketFactory", "(SSLSocketFactory)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.net.ssl", "KeyManagerFactory", True, "getAlgorithm", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.net.ssl", "KeyManagerFactory", True, "getInstance", "(String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.net.ssl", "KeyManagerFactory", True, "getInstance", "(String,Provider)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.net.ssl", "KeyManagerFactory", True, "getInstance", "(String,Provider)", "", "Argument[1].Element", "ReturnValue", "taint", "df-generated"]
-      - ["javax.net.ssl", "KeyManagerFactory", True, "getInstance", "(String,String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.net.ssl", "HandshakeCompletedEvent", True, "getPeerPrincipal", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.net.ssl", "HandshakeCompletedEvent", True, "getSession", "()", "", "Argument[this].SyntheticField[javax.net.ssl.HandshakeCompletedEvent.session]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.net.ssl", "HandshakeCompletedEvent", True, "getSocket", "()", "", "Argument[this].SyntheticField[java.util.EventObject.source]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.net.ssl", "HandshakeCompletedListener", True, "handshakeCompleted", "(HandshakeCompletedEvent)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.net.ssl", "HttpsURLConnection", True, "getHostnameVerifier", "()", "", "Argument[this].SyntheticField[javax.net.ssl.HttpsURLConnection.hostnameVerifier]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.net.ssl", "HttpsURLConnection", True, "getSSLSocketFactory", "()", "", "Argument[this].SyntheticField[javax.net.ssl.HttpsURLConnection.sslSocketFactory]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.net.ssl", "HttpsURLConnection", True, "setHostnameVerifier", "(HostnameVerifier)", "", "Argument[0]", "Argument[this].SyntheticField[javax.net.ssl.HttpsURLConnection.hostnameVerifier]", "value", "dfc-generated"]
+      - ["javax.net.ssl", "HttpsURLConnection", True, "setSSLSocketFactory", "(SSLSocketFactory)", "", "Argument[0]", "Argument[this].SyntheticField[javax.net.ssl.HttpsURLConnection.sslSocketFactory]", "value", "dfc-generated"]
+      - ["javax.net.ssl", "KeyManagerFactory", True, "getAlgorithm", "()", "", "Argument[this].SyntheticField[javax.net.ssl.KeyManagerFactory.algorithm]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.net.ssl", "KeyManagerFactory", True, "getInstance", "(String)", "", "Argument[0]", "ReturnValue.SyntheticField[javax.net.ssl.KeyManagerFactory.algorithm]", "value", "dfc-generated"]
+      - ["javax.net.ssl", "KeyManagerFactory", True, "getInstance", "(String,Provider)", "", "Argument[0]", "ReturnValue.SyntheticField[javax.net.ssl.KeyManagerFactory.algorithm]", "value", "dfc-generated"]
+      - ["javax.net.ssl", "KeyManagerFactory", True, "getInstance", "(String,String)", "", "Argument[0]", "ReturnValue.SyntheticField[javax.net.ssl.KeyManagerFactory.algorithm]", "value", "dfc-generated"]
       - ["javax.net.ssl", "KeyManagerFactory", True, "getKeyManagers", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["javax.net.ssl", "KeyManagerFactory", True, "getProvider", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.net.ssl", "KeyStoreBuilderParameters", True, "KeyStoreBuilderParameters", "(KeyStore$Builder)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.net.ssl", "KeyStoreBuilderParameters", True, "KeyStoreBuilderParameters", "(List)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["javax.net.ssl", "KeyStoreBuilderParameters", True, "getParameters", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.net.ssl", "KeyStoreBuilderParameters", True, "KeyStoreBuilderParameters", "(KeyStore$Builder)", "", "Argument[0]", "Argument[this].SyntheticField[javax.net.ssl.KeyStoreBuilderParameters.parameters].Element", "value", "dfc-generated"]
+      - ["javax.net.ssl", "KeyStoreBuilderParameters", True, "KeyStoreBuilderParameters", "(List)", "", "Argument[0].Element", "Argument[this].SyntheticField[javax.net.ssl.KeyStoreBuilderParameters.parameters].Element", "value", "dfc-generated"]
+      - ["javax.net.ssl", "KeyStoreBuilderParameters", True, "getParameters", "()", "", "Argument[this].SyntheticField[javax.net.ssl.KeyStoreBuilderParameters.parameters]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.net.ssl", "SNIHostName", False, "SNIHostName", "(String)", "", "Argument[0]", "Argument[this].SyntheticField[javax.net.ssl.SNIHostName.hostname]", "taint", "dfc-generated"]
       - ["javax.net.ssl", "SNIHostName", False, "SNIHostName", "(byte[])", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.net.ssl", "SNIHostName", False, "createSNIMatcher", "(String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.net.ssl", "SNIHostName", False, "getAsciiName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.net.ssl", "SNIHostName", False, "getAsciiName", "()", "", "Argument[this].SyntheticField[javax.net.ssl.SNIHostName.hostname]", "ReturnValue", "value", "dfc-generated"]
       - ["javax.net.ssl", "SNIServerName", True, "getEncoded", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["javax.net.ssl", "SSLContext", True, "createSSLEngine", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.net.ssl", "SSLContext", True, "createSSLEngine", "(String,int)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.net.ssl", "SSLContext", True, "createSSLEngine", "(String,int)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.net.ssl", "SSLContext", True, "createSSLEngine", "(String,int)", "", "Argument[0]", "ReturnValue.SyntheticField[javax.net.ssl.SSLEngine.peerHost]", "value", "dfc-generated"]
       - ["javax.net.ssl", "SSLContext", True, "getClientSessionContext", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.net.ssl", "SSLContext", True, "getInstance", "(String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.net.ssl", "SSLContext", True, "getInstance", "(String,Provider)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.net.ssl", "SSLContext", True, "getInstance", "(String,Provider)", "", "Argument[1].Element", "ReturnValue", "taint", "df-generated"]
-      - ["javax.net.ssl", "SSLContext", True, "getInstance", "(String,String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.net.ssl", "SSLContext", True, "getProtocol", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.net.ssl", "SSLContext", True, "getInstance", "(String)", "", "Argument[0]", "ReturnValue.SyntheticField[javax.net.ssl.SSLContext.protocol]", "value", "dfc-generated"]
+      - ["javax.net.ssl", "SSLContext", True, "getInstance", "(String,Provider)", "", "Argument[0]", "ReturnValue.SyntheticField[javax.net.ssl.SSLContext.protocol]", "value", "dfc-generated"]
+      - ["javax.net.ssl", "SSLContext", True, "getInstance", "(String,String)", "", "Argument[0]", "ReturnValue.SyntheticField[javax.net.ssl.SSLContext.protocol]", "value", "dfc-generated"]
+      - ["javax.net.ssl", "SSLContext", True, "getProtocol", "()", "", "Argument[this].SyntheticField[javax.net.ssl.SSLContext.protocol]", "ReturnValue", "value", "dfc-generated"]
       - ["javax.net.ssl", "SSLContext", True, "getProvider", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["javax.net.ssl", "SSLContext", True, "getServerSessionContext", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["javax.net.ssl", "SSLContext", True, "getServerSocketFactory", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
@@ -46,58 +48,90 @@ extensions:
       - ["javax.net.ssl", "SSLContext", True, "init", "(KeyManager[],TrustManager[],SecureRandom)", "", "Argument[0].ArrayElement", "Argument[this]", "taint", "df-generated"]
       - ["javax.net.ssl", "SSLContext", True, "init", "(KeyManager[],TrustManager[],SecureRandom)", "", "Argument[1].ArrayElement", "Argument[this]", "taint", "df-generated"]
       - ["javax.net.ssl", "SSLContext", True, "init", "(KeyManager[],TrustManager[],SecureRandom)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.net.ssl", "SSLEngine", True, "getPeerHost", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.net.ssl", "SSLEngine", True, "getApplicationProtocol", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.net.ssl", "SSLEngine", True, "getDelegatedTask", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.net.ssl", "SSLEngine", True, "getPeerHost", "()", "", "Argument[this].SyntheticField[javax.net.ssl.SSLEngine.peerHost]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.net.ssl", "SSLEngine", True, "getSession", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["javax.net.ssl", "SSLException", True, "SSLException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["javax.net.ssl", "SSLException", True, "SSLException", "(String,Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["javax.net.ssl", "SSLException", True, "SSLException", "(String,Throwable)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
       - ["javax.net.ssl", "SSLException", True, "SSLException", "(Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["javax.net.ssl", "SSLHandshakeException", True, "SSLHandshakeException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["javax.net.ssl", "SSLKeyException", True, "SSLKeyException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.net.ssl", "SSLParameters", True, "SSLParameters", "(String[])", "", "Argument[0].ArrayElement", "Argument[this]", "taint", "df-generated"]
-      - ["javax.net.ssl", "SSLParameters", True, "SSLParameters", "(String[],String[])", "", "Argument[0].ArrayElement", "Argument[this]", "taint", "df-generated"]
-      - ["javax.net.ssl", "SSLParameters", True, "SSLParameters", "(String[],String[])", "", "Argument[1].ArrayElement", "Argument[this]", "taint", "df-generated"]
-      - ["javax.net.ssl", "SSLParameters", True, "getAlgorithmConstraints", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.net.ssl", "SSLParameters", True, "getApplicationProtocols", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.net.ssl", "SSLParameters", True, "getCipherSuites", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.net.ssl", "SSLParameters", True, "getEndpointIdentificationAlgorithm", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.net.ssl", "SSLParameters", True, "getProtocols", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.net.ssl", "SSLParameters", True, "getSNIMatchers", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.net.ssl", "SSLParameters", True, "getServerNames", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.net.ssl", "SSLParameters", True, "setAlgorithmConstraints", "(AlgorithmConstraints)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.net.ssl", "SSLParameters", True, "setApplicationProtocols", "(String[])", "", "Argument[0].ArrayElement", "Argument[this]", "taint", "df-generated"]
-      - ["javax.net.ssl", "SSLParameters", True, "setCipherSuites", "(String[])", "", "Argument[0].ArrayElement", "Argument[this]", "taint", "df-generated"]
-      - ["javax.net.ssl", "SSLParameters", True, "setEndpointIdentificationAlgorithm", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.net.ssl", "SSLParameters", True, "setProtocols", "(String[])", "", "Argument[0].ArrayElement", "Argument[this]", "taint", "df-generated"]
-      - ["javax.net.ssl", "SSLParameters", True, "setSNIMatchers", "(Collection)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["javax.net.ssl", "SSLParameters", True, "setServerNames", "(List)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
+      - ["javax.net.ssl", "SSLParameters", True, "SSLParameters", "(String[])", "", "Argument[0]", "Argument[this].SyntheticField[javax.net.ssl.SSLParameters.cipherSuites]", "value", "dfc-generated"]
+      - ["javax.net.ssl", "SSLParameters", True, "SSLParameters", "(String[],String[])", "", "Argument[0]", "Argument[this].SyntheticField[javax.net.ssl.SSLParameters.cipherSuites]", "value", "dfc-generated"]
+      - ["javax.net.ssl", "SSLParameters", True, "SSLParameters", "(String[],String[])", "", "Argument[1]", "Argument[this].SyntheticField[javax.net.ssl.SSLParameters.protocols]", "value", "dfc-generated"]
+      - ["javax.net.ssl", "SSLParameters", True, "getAlgorithmConstraints", "()", "", "Argument[this].SyntheticField[javax.net.ssl.SSLParameters.algorithmConstraints]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.net.ssl", "SSLParameters", True, "getApplicationProtocols", "()", "", "Argument[this].SyntheticField[javax.net.ssl.SSLParameters.applicationProtocols]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.net.ssl", "SSLParameters", True, "getCipherSuites", "()", "", "Argument[this].SyntheticField[javax.net.ssl.SSLParameters.cipherSuites]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.net.ssl", "SSLParameters", True, "getEndpointIdentificationAlgorithm", "()", "", "Argument[this].SyntheticField[javax.net.ssl.SSLParameters.identificationAlgorithm]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.net.ssl", "SSLParameters", True, "getProtocols", "()", "", "Argument[this].SyntheticField[javax.net.ssl.SSLParameters.protocols]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.net.ssl", "SSLParameters", True, "getSNIMatchers", "()", "", "Argument[this].SyntheticField[javax.net.ssl.SSLParameters.sniMatchers].MapValue", "ReturnValue.Element", "value", "dfc-generated"]
+      - ["javax.net.ssl", "SSLParameters", True, "getServerNames", "()", "", "Argument[this].SyntheticField[javax.net.ssl.SSLParameters.sniNames].MapValue", "ReturnValue.Element", "value", "dfc-generated"]
+      - ["javax.net.ssl", "SSLParameters", True, "setAlgorithmConstraints", "(AlgorithmConstraints)", "", "Argument[0]", "Argument[this].SyntheticField[javax.net.ssl.SSLParameters.algorithmConstraints]", "value", "dfc-generated"]
+      - ["javax.net.ssl", "SSLParameters", True, "setApplicationProtocols", "(String[])", "", "Argument[0]", "Argument[this].SyntheticField[javax.net.ssl.SSLParameters.applicationProtocols]", "value", "dfc-generated"]
+      - ["javax.net.ssl", "SSLParameters", True, "setCipherSuites", "(String[])", "", "Argument[0]", "Argument[this].SyntheticField[javax.net.ssl.SSLParameters.cipherSuites]", "value", "dfc-generated"]
+      - ["javax.net.ssl", "SSLParameters", True, "setEndpointIdentificationAlgorithm", "(String)", "", "Argument[0]", "Argument[this].SyntheticField[javax.net.ssl.SSLParameters.identificationAlgorithm]", "value", "dfc-generated"]
+      - ["javax.net.ssl", "SSLParameters", True, "setProtocols", "(String[])", "", "Argument[0]", "Argument[this].SyntheticField[javax.net.ssl.SSLParameters.protocols]", "value", "dfc-generated"]
+      - ["javax.net.ssl", "SSLParameters", True, "setSNIMatchers", "(Collection)", "", "Argument[0].Element", "Argument[this].SyntheticField[javax.net.ssl.SSLParameters.sniMatchers].MapValue", "value", "dfc-generated"]
+      - ["javax.net.ssl", "SSLParameters", True, "setServerNames", "(List)", "", "Argument[0].Element", "Argument[this].SyntheticField[javax.net.ssl.SSLParameters.sniNames].MapValue", "value", "dfc-generated"]
       - ["javax.net.ssl", "SSLPeerUnverifiedException", True, "SSLPeerUnverifiedException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.net.ssl", "SSLPermission", False, "SSLPermission", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.net.ssl", "SSLPermission", False, "SSLPermission", "(String,String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.net.ssl", "SSLPermission", False, "SSLPermission", "(String)", "", "Argument[0]", "Argument[this]", "taint", "dfc-generated"]
+      - ["javax.net.ssl", "SSLPermission", False, "SSLPermission", "(String,String)", "", "Argument[0]", "Argument[this]", "taint", "dfc-generated"]
       - ["javax.net.ssl", "SSLProtocolException", True, "SSLProtocolException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.net.ssl", "SSLSessionBindingEvent", True, "SSLSessionBindingEvent", "(SSLSession,String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.net.ssl", "SSLSessionBindingEvent", True, "SSLSessionBindingEvent", "(SSLSession,String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.net.ssl", "SSLSessionBindingEvent", True, "getName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.net.ssl", "SSLSessionBindingEvent", True, "getSession", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.net.ssl", "TrustManagerFactory", True, "getAlgorithm", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.net.ssl", "TrustManagerFactory", True, "getInstance", "(String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.net.ssl", "TrustManagerFactory", True, "getInstance", "(String,Provider)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.net.ssl", "TrustManagerFactory", True, "getInstance", "(String,Provider)", "", "Argument[1].Element", "ReturnValue", "taint", "df-generated"]
-      - ["javax.net.ssl", "TrustManagerFactory", True, "getInstance", "(String,String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.net.ssl", "SSLServerSocket", True, "getSSLParameters", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.net.ssl", "SSLServerSocket", True, "setSSLParameters", "(SSLParameters)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.net.ssl", "SSLSession", True, "getId", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.net.ssl", "SSLSession", True, "getLocalCertificates", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.net.ssl", "SSLSession", True, "getLocalPrincipal", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.net.ssl", "SSLSession", True, "getPeerCertificates", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.net.ssl", "SSLSession", True, "getPeerHost", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.net.ssl", "SSLSession", True, "getPeerPrincipal", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.net.ssl", "SSLSession", True, "getSessionContext", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.net.ssl", "SSLSession", True, "getValue", "(String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.net.ssl", "SSLSession", True, "putValue", "(String,Object)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.net.ssl", "SSLSessionBindingEvent", True, "SSLSessionBindingEvent", "(SSLSession,String)", "", "Argument[0]", "Argument[this].SyntheticField[java.util.EventObject.source]", "value", "dfc-generated"]
+      - ["javax.net.ssl", "SSLSessionBindingEvent", True, "SSLSessionBindingEvent", "(SSLSession,String)", "", "Argument[1]", "Argument[this].SyntheticField[javax.net.ssl.SSLSessionBindingEvent.name]", "value", "dfc-generated"]
+      - ["javax.net.ssl", "SSLSessionBindingEvent", True, "getName", "()", "", "Argument[this].SyntheticField[javax.net.ssl.SSLSessionBindingEvent.name]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.net.ssl", "SSLSessionBindingEvent", True, "getSession", "()", "", "Argument[this].SyntheticField[java.util.EventObject.source]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.net.ssl", "SSLSocket", True, "getApplicationProtocol", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.net.ssl", "SSLSocket", True, "getSession", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.net.ssl", "SSLSocketFactory", True, "createSocket", "(Socket,InputStream,boolean)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.net.ssl", "SSLSocketFactory", True, "createSocket", "(Socket,InputStream,boolean)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.net.ssl", "SSLSocketFactory", True, "createSocket", "(Socket,InputStream,boolean)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.net.ssl", "SSLSocketFactory", True, "createSocket", "(Socket,String,int,boolean)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.net.ssl", "SSLSocketFactory", True, "createSocket", "(Socket,String,int,boolean)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.net.ssl", "SSLSocketFactory", True, "createSocket", "(Socket,String,int,boolean)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.net.ssl", "TrustManagerFactory", True, "getAlgorithm", "()", "", "Argument[this].SyntheticField[javax.net.ssl.TrustManagerFactory.algorithm]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.net.ssl", "TrustManagerFactory", True, "getInstance", "(String)", "", "Argument[0]", "ReturnValue.SyntheticField[javax.net.ssl.TrustManagerFactory.algorithm]", "value", "dfc-generated"]
+      - ["javax.net.ssl", "TrustManagerFactory", True, "getInstance", "(String,Provider)", "", "Argument[0]", "ReturnValue.SyntheticField[javax.net.ssl.TrustManagerFactory.algorithm]", "value", "dfc-generated"]
+      - ["javax.net.ssl", "TrustManagerFactory", True, "getInstance", "(String,String)", "", "Argument[0]", "ReturnValue.SyntheticField[javax.net.ssl.TrustManagerFactory.algorithm]", "value", "dfc-generated"]
       - ["javax.net.ssl", "TrustManagerFactory", True, "getProvider", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["javax.net.ssl", "TrustManagerFactory", True, "getTrustManagers", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.net.ssl", "X509ExtendedKeyManager", True, "chooseEngineClientAlias", "(String[],Principal[],SSLEngine)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.net.ssl", "X509ExtendedKeyManager", True, "chooseEngineServerAlias", "(String,Principal[],SSLEngine)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.net.ssl", "X509ExtendedKeyManager", True, "chooseEngineServerAlias", "(String,Principal[],SSLEngine)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.net.ssl", "X509ExtendedTrustManager", True, "checkServerTrusted", "(X509Certificate[],String,SSLEngine)", "", "Argument[0].ArrayElement", "Argument[this]", "taint", "df-generated"]
+      - ["javax.net.ssl", "X509ExtendedTrustManager", True, "checkServerTrusted", "(X509Certificate[],String,Socket)", "", "Argument[0].ArrayElement", "Argument[this]", "taint", "df-generated"]
+      - ["javax.net.ssl", "X509KeyManager", True, "chooseClientAlias", "(String[],Principal[],Socket)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.net.ssl", "X509KeyManager", True, "chooseServerAlias", "(String,Principal[],Socket)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.net.ssl", "X509KeyManager", True, "chooseServerAlias", "(String,Principal[],Socket)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.net.ssl", "X509KeyManager", True, "getCertificateChain", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.net.ssl", "X509KeyManager", True, "getCertificateChain", "(String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.net.ssl", "X509KeyManager", True, "getClientAliases", "(String,Principal[])", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.net.ssl", "X509KeyManager", True, "getPrivateKey", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.net.ssl", "X509KeyManager", True, "getPrivateKey", "(String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.net.ssl", "X509KeyManager", True, "getServerAliases", "(String,Principal[])", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.net.ssl", "X509TrustManager", True, "checkServerTrusted", "(X509Certificate[],String)", "", "Argument[0].ArrayElement", "Argument[this]", "taint", "df-generated"]
+      - ["javax.net.ssl", "X509TrustManager", True, "getAcceptedIssuers", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
   - addsTo:
       pack: codeql/java-all
       extensible: neutralModel
     data:
       - ["javax.net.ssl", "ExtendedSSLSession", "getLocalSupportedSignatureAlgorithms", "()", "summary", "df-generated"]
       - ["javax.net.ssl", "ExtendedSSLSession", "getPeerSupportedSignatureAlgorithms", "()", "summary", "df-generated"]
-      - ["javax.net.ssl", "ExtendedSSLSession", "getRequestedServerNames", "()", "summary", "df-generated"]
-      - ["javax.net.ssl", "ExtendedSSLSession", "getStatusResponses", "()", "summary", "df-generated"]
       - ["javax.net.ssl", "HandshakeCompletedEvent", "getCipherSuite", "()", "summary", "df-generated"]
-      - ["javax.net.ssl", "HandshakeCompletedEvent", "getLocalPrincipal", "()", "summary", "df-generated"]
       - ["javax.net.ssl", "HandshakeCompletedEvent", "getPeerCertificateChain", "()", "summary", "df-generated"]
-      - ["javax.net.ssl", "HandshakeCompletedEvent", "getPeerPrincipal", "()", "summary", "df-generated"]
-      - ["javax.net.ssl", "HostnameVerifier", "verify", "(String,SSLSession)", "summary", "df-generated"]
       - ["javax.net.ssl", "HttpsURLConnection", "getCipherSuite", "()", "summary", "df-generated"]
       - ["javax.net.ssl", "HttpsURLConnection", "getDefaultHostnameVerifier", "()", "summary", "df-generated"]
       - ["javax.net.ssl", "HttpsURLConnection", "getDefaultSSLSocketFactory", "()", "summary", "df-generated"]
@@ -111,7 +145,7 @@ extensions:
       - ["javax.net.ssl", "KeyManagerFactory", "getDefaultAlgorithm", "()", "summary", "df-generated"]
       - ["javax.net.ssl", "KeyManagerFactory", "init", "(KeyStore,char[])", "summary", "df-generated"]
       - ["javax.net.ssl", "KeyManagerFactory", "init", "(ManagerFactoryParameters)", "summary", "df-generated"]
-      - ["javax.net.ssl", "SNIHostName", "SNIHostName", "(String)", "summary", "df-generated"]
+      - ["javax.net.ssl", "SNIHostName", "createSNIMatcher", "(String)", "summary", "df-generated"]
       - ["javax.net.ssl", "SNIMatcher", "getType", "()", "summary", "df-generated"]
       - ["javax.net.ssl", "SNIMatcher", "matches", "(SNIServerName)", "summary", "df-generated"]
       - ["javax.net.ssl", "SNIServerName", "getType", "()", "summary", "df-generated"]
@@ -122,8 +156,6 @@ extensions:
       - ["javax.net.ssl", "SSLEngine", "beginHandshake", "()", "summary", "df-generated"]
       - ["javax.net.ssl", "SSLEngine", "closeInbound", "()", "summary", "df-generated"]
       - ["javax.net.ssl", "SSLEngine", "closeOutbound", "()", "summary", "df-generated"]
-      - ["javax.net.ssl", "SSLEngine", "getApplicationProtocol", "()", "summary", "df-generated"]
-      - ["javax.net.ssl", "SSLEngine", "getDelegatedTask", "()", "summary", "df-generated"]
       - ["javax.net.ssl", "SSLEngine", "getEnableSessionCreation", "()", "summary", "df-generated"]
       - ["javax.net.ssl", "SSLEngine", "getEnabledCipherSuites", "()", "summary", "df-generated"]
       - ["javax.net.ssl", "SSLEngine", "getEnabledProtocols", "()", "summary", "df-generated"]
@@ -134,7 +166,6 @@ extensions:
       - ["javax.net.ssl", "SSLEngine", "getNeedClientAuth", "()", "summary", "df-generated"]
       - ["javax.net.ssl", "SSLEngine", "getPeerPort", "()", "summary", "df-generated"]
       - ["javax.net.ssl", "SSLEngine", "getSSLParameters", "()", "summary", "df-generated"]
-      - ["javax.net.ssl", "SSLEngine", "getSession", "()", "summary", "df-generated"]
       - ["javax.net.ssl", "SSLEngine", "getSupportedCipherSuites", "()", "summary", "df-generated"]
       - ["javax.net.ssl", "SSLEngine", "getSupportedProtocols", "()", "summary", "df-generated"]
       - ["javax.net.ssl", "SSLEngine", "getUseClientMode", "()", "summary", "df-generated"]
@@ -176,7 +207,6 @@ extensions:
       - ["javax.net.ssl", "SSLServerSocket", "getEnabledCipherSuites", "()", "summary", "df-generated"]
       - ["javax.net.ssl", "SSLServerSocket", "getEnabledProtocols", "()", "summary", "df-generated"]
       - ["javax.net.ssl", "SSLServerSocket", "getNeedClientAuth", "()", "summary", "df-generated"]
-      - ["javax.net.ssl", "SSLServerSocket", "getSSLParameters", "()", "summary", "df-generated"]
       - ["javax.net.ssl", "SSLServerSocket", "getSupportedCipherSuites", "()", "summary", "df-generated"]
       - ["javax.net.ssl", "SSLServerSocket", "getSupportedProtocols", "()", "summary", "df-generated"]
       - ["javax.net.ssl", "SSLServerSocket", "getUseClientMode", "()", "summary", "df-generated"]
@@ -185,7 +215,6 @@ extensions:
       - ["javax.net.ssl", "SSLServerSocket", "setEnabledCipherSuites", "(String[])", "summary", "df-generated"]
       - ["javax.net.ssl", "SSLServerSocket", "setEnabledProtocols", "(String[])", "summary", "df-generated"]
       - ["javax.net.ssl", "SSLServerSocket", "setNeedClientAuth", "(boolean)", "summary", "df-generated"]
-      - ["javax.net.ssl", "SSLServerSocket", "setSSLParameters", "(SSLParameters)", "summary", "df-generated"]
       - ["javax.net.ssl", "SSLServerSocket", "setUseClientMode", "(boolean)", "summary", "df-generated"]
       - ["javax.net.ssl", "SSLServerSocket", "setWantClientAuth", "(boolean)", "summary", "df-generated"]
       - ["javax.net.ssl", "SSLServerSocketFactory", "getDefault", "()", "summary", "df-generated"]
@@ -193,7 +222,6 @@ extensions:
       - ["javax.net.ssl", "SSLServerSocketFactory", "getSupportedCipherSuites", "()", "summary", "df-generated"]
       - ["javax.net.ssl", "SSLSession", "getPeerCertificateChain", "()", "summary", "df-generated"]
       - ["javax.net.ssl", "SSLSocket", "addHandshakeCompletedListener", "(HandshakeCompletedListener)", "summary", "df-generated"]
-      - ["javax.net.ssl", "SSLSocket", "getApplicationProtocol", "()", "summary", "df-generated"]
       - ["javax.net.ssl", "SSLSocket", "getEnableSessionCreation", "()", "summary", "df-generated"]
       - ["javax.net.ssl", "SSLSocket", "getEnabledCipherSuites", "()", "summary", "df-generated"]
       - ["javax.net.ssl", "SSLSocket", "getEnabledProtocols", "()", "summary", "df-generated"]
@@ -202,7 +230,6 @@ extensions:
       - ["javax.net.ssl", "SSLSocket", "getHandshakeSession", "()", "summary", "df-generated"]
       - ["javax.net.ssl", "SSLSocket", "getNeedClientAuth", "()", "summary", "df-generated"]
       - ["javax.net.ssl", "SSLSocket", "getSSLParameters", "()", "summary", "df-generated"]
-      - ["javax.net.ssl", "SSLSocket", "getSession", "()", "summary", "df-generated"]
       - ["javax.net.ssl", "SSLSocket", "getSupportedCipherSuites", "()", "summary", "df-generated"]
       - ["javax.net.ssl", "SSLSocket", "getSupportedProtocols", "()", "summary", "df-generated"]
       - ["javax.net.ssl", "SSLSocket", "getUseClientMode", "()", "summary", "df-generated"]
@@ -217,17 +244,11 @@ extensions:
       - ["javax.net.ssl", "SSLSocket", "setUseClientMode", "(boolean)", "summary", "df-generated"]
       - ["javax.net.ssl", "SSLSocket", "setWantClientAuth", "(boolean)", "summary", "df-generated"]
       - ["javax.net.ssl", "SSLSocket", "startHandshake", "()", "summary", "df-generated"]
-      - ["javax.net.ssl", "SSLSocketFactory", "createSocket", "(Socket,InputStream,boolean)", "summary", "df-generated"]
-      - ["javax.net.ssl", "SSLSocketFactory", "createSocket", "(Socket,String,int,boolean)", "summary", "df-generated"]
       - ["javax.net.ssl", "SSLSocketFactory", "getDefault", "()", "summary", "df-generated"]
       - ["javax.net.ssl", "SSLSocketFactory", "getDefaultCipherSuites", "()", "summary", "df-generated"]
       - ["javax.net.ssl", "SSLSocketFactory", "getSupportedCipherSuites", "()", "summary", "df-generated"]
       - ["javax.net.ssl", "TrustManagerFactory", "getDefaultAlgorithm", "()", "summary", "df-generated"]
       - ["javax.net.ssl", "TrustManagerFactory", "init", "(KeyStore)", "summary", "df-generated"]
       - ["javax.net.ssl", "TrustManagerFactory", "init", "(ManagerFactoryParameters)", "summary", "df-generated"]
-      - ["javax.net.ssl", "X509ExtendedKeyManager", "chooseEngineClientAlias", "(String[],Principal[],SSLEngine)", "summary", "df-generated"]
-      - ["javax.net.ssl", "X509ExtendedKeyManager", "chooseEngineServerAlias", "(String,Principal[],SSLEngine)", "summary", "df-generated"]
       - ["javax.net.ssl", "X509ExtendedTrustManager", "checkClientTrusted", "(X509Certificate[],String,SSLEngine)", "summary", "df-generated"]
       - ["javax.net.ssl", "X509ExtendedTrustManager", "checkClientTrusted", "(X509Certificate[],String,Socket)", "summary", "df-generated"]
-      - ["javax.net.ssl", "X509ExtendedTrustManager", "checkServerTrusted", "(X509Certificate[],String,SSLEngine)", "summary", "df-generated"]
-      - ["javax.net.ssl", "X509ExtendedTrustManager", "checkServerTrusted", "(X509Certificate[],String,Socket)", "summary", "df-generated"]
diff --git a/java/ql/lib/ext/generated/javax.portlet.model.yml b/java/ql/lib/ext/generated/javax.portlet.model.yml
deleted file mode 100644
index 085d5f4800a..00000000000
--- a/java/ql/lib/ext/generated/javax.portlet.model.yml
+++ /dev/null
@@ -1,190 +0,0 @@
-# THIS FILE IS AN AUTO-GENERATED MODELS AS DATA FILE. DO NOT EDIT.
-# Definitions of models for the Java Portlet framework.
-extensions:
-  - addsTo:
-      pack: codeql/java-all
-      extensible: summaryModel
-    data:
-      - ["javax.portlet.filter", "ActionRequestWrapper", true, "ActionRequestWrapper", "(ActionRequest)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.portlet.filter", "ActionRequestWrapper", true, "setRequest", "(ActionRequest)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.portlet.filter", "ActionResponseWrapper", true, "ActionResponseWrapper", "(ActionResponse)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.portlet.filter", "ActionResponseWrapper", true, "setResponse", "(ActionResponse)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.portlet.filter", "EventRequestWrapper", true, "EventRequestWrapper", "(EventRequest)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.portlet.filter", "EventRequestWrapper", true, "setRequest", "(EventRequest)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.portlet.filter", "EventResponseWrapper", true, "EventResponseWrapper", "(EventResponse)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.portlet.filter", "EventResponseWrapper", true, "setResponse", "(EventResponse)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.portlet.filter", "PortletRequestWrapper", true, "PortletRequestWrapper", "(PortletRequest)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.portlet.filter", "PortletRequestWrapper", true, "getRequest", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.portlet.filter", "PortletRequestWrapper", true, "setRequest", "(PortletRequest)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.portlet.filter", "PortletResponseWrapper", true, "PortletResponseWrapper", "(PortletResponse)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.portlet.filter", "PortletResponseWrapper", true, "getResponse", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.portlet.filter", "PortletResponseWrapper", true, "setResponse", "(PortletResponse)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.portlet.filter", "RenderRequestWrapper", true, "RenderRequestWrapper", "(RenderRequest)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.portlet.filter", "RenderRequestWrapper", true, "setRequest", "(RenderRequest)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.portlet.filter", "RenderResponseWrapper", true, "RenderResponseWrapper", "(RenderResponse)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.portlet.filter", "RenderResponseWrapper", true, "setResponse", "(RenderResponse)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.portlet.filter", "ResourceRequestWrapper", true, "ResourceRequestWrapper", "(ResourceRequest)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.portlet.filter", "ResourceRequestWrapper", true, "setRequest", "(ResourceRequest)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.portlet.filter", "ResourceResponseWrapper", true, "ResourceResponseWrapper", "(ResourceResponse)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.portlet.filter", "ResourceResponseWrapper", true, "setResponse", "(ResourceResponse)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.portlet", "GenericPortlet", true, "getPortletConfig", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.portlet", "Portlet", true, "init", "(PortletConfig)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.portlet", "PortletException", true, "PortletException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.portlet", "PortletException", true, "PortletException", "(String,Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.portlet", "PortletException", true, "PortletException", "(String,Throwable)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.portlet", "PortletMode", true, "PortletMode", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.portlet", "PortletMode", true, "toString", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.portlet", "PortletModeException", true, "PortletModeException", "(String,PortletMode)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.portlet", "PortletModeException", true, "PortletModeException", "(String,PortletMode)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.portlet", "PortletModeException", true, "PortletModeException", "(String,Throwable,PortletMode)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.portlet", "PortletModeException", true, "PortletModeException", "(String,Throwable,PortletMode)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.portlet", "PortletModeException", true, "PortletModeException", "(String,Throwable,PortletMode)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.portlet", "PortletModeException", true, "PortletModeException", "(Throwable,PortletMode)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.portlet", "PortletModeException", true, "getMode", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.portlet", "PortletSecurityException", true, "PortletSecurityException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.portlet", "PortletSecurityException", true, "PortletSecurityException", "(String,Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.portlet", "PortletSecurityException", true, "PortletSecurityException", "(String,Throwable)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.portlet", "PortletSessionUtil", true, "decodeAttributeName", "(String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.portlet", "ReadOnlyException", true, "ReadOnlyException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.portlet", "ReadOnlyException", true, "ReadOnlyException", "(String,Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.portlet", "ReadOnlyException", true, "ReadOnlyException", "(String,Throwable)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.portlet", "UnavailableException", true, "UnavailableException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.portlet", "UnavailableException", true, "UnavailableException", "(String,int)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.portlet", "ValidatorException", true, "ValidatorException", "(String,Collection)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.portlet", "ValidatorException", true, "ValidatorException", "(String,Collection)", "", "Argument[1].Element", "Argument[this]", "taint", "df-generated"]
-      - ["javax.portlet", "ValidatorException", true, "ValidatorException", "(String,Throwable,Collection)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.portlet", "ValidatorException", true, "ValidatorException", "(String,Throwable,Collection)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.portlet", "ValidatorException", true, "ValidatorException", "(String,Throwable,Collection)", "", "Argument[2].Element", "Argument[this]", "taint", "df-generated"]
-      - ["javax.portlet", "ValidatorException", true, "ValidatorException", "(Throwable,Collection)", "", "Argument[1].Element", "Argument[this]", "taint", "df-generated"]
-      - ["javax.portlet", "ValidatorException", true, "getFailedKeys", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.portlet", "WindowState", true, "WindowState", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.portlet", "WindowState", true, "toString", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.portlet", "WindowStateException", true, "WindowStateException", "(String,Throwable,WindowState)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.portlet", "WindowStateException", true, "WindowStateException", "(String,Throwable,WindowState)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.portlet", "WindowStateException", true, "WindowStateException", "(String,Throwable,WindowState)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.portlet", "WindowStateException", true, "WindowStateException", "(String,WindowState)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.portlet", "WindowStateException", true, "WindowStateException", "(String,WindowState)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.portlet", "WindowStateException", true, "WindowStateException", "(Throwable,WindowState)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.portlet", "WindowStateException", true, "getState", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-  - addsTo:
-      pack: codeql/java-all
-      extensible: neutralModel
-    data:
-      - ["javax.portlet", "ActionResponse", "sendRedirect", "(String)", "summary", "df-generated"]
-      - ["javax.portlet", "ActionResponse", "sendRedirect", "(String,String)", "summary", "df-generated"]
-      - ["javax.portlet", "ClientDataRequest", "getCharacterEncoding", "()", "summary", "df-generated"]
-      - ["javax.portlet", "ClientDataRequest", "getContentLength", "()", "summary", "df-generated"]
-      - ["javax.portlet", "ClientDataRequest", "getContentType", "()", "summary", "df-generated"]
-      - ["javax.portlet", "ClientDataRequest", "getMethod", "()", "summary", "df-generated"]
-      - ["javax.portlet", "ClientDataRequest", "getPortletInputStream", "()", "summary", "df-generated"]
-      - ["javax.portlet", "ClientDataRequest", "getReader", "()", "summary", "df-generated"]
-      - ["javax.portlet", "ClientDataRequest", "setCharacterEncoding", "(String)", "summary", "df-generated"]
-      - ["javax.portlet", "EventPortlet", "processEvent", "(EventRequest,EventResponse)", "summary", "df-generated"]
-      - ["javax.portlet", "EventRequest", "getEvent", "()", "summary", "df-generated"]
-      - ["javax.portlet", "EventRequest", "getMethod", "()", "summary", "df-generated"]
-      - ["javax.portlet", "EventResponse", "setRenderParameters", "(EventRequest)", "summary", "df-generated"]
-      - ["javax.portlet", "GenericPortlet", "init", "()", "summary", "df-generated"]
-      - ["javax.portlet", "MimeResponse", "createActionURL", "()", "summary", "df-generated"]
-      - ["javax.portlet", "MimeResponse", "createRenderURL", "()", "summary", "df-generated"]
-      - ["javax.portlet", "MimeResponse", "createResourceURL", "()", "summary", "df-generated"]
-      - ["javax.portlet", "MimeResponse", "flushBuffer", "()", "summary", "df-generated"]
-      - ["javax.portlet", "MimeResponse", "getBufferSize", "()", "summary", "df-generated"]
-      - ["javax.portlet", "MimeResponse", "getCacheControl", "()", "summary", "df-generated"]
-      - ["javax.portlet", "MimeResponse", "getCharacterEncoding", "()", "summary", "df-generated"]
-      - ["javax.portlet", "MimeResponse", "getContentType", "()", "summary", "df-generated"]
-      - ["javax.portlet", "MimeResponse", "getLocale", "()", "summary", "df-generated"]
-      - ["javax.portlet", "MimeResponse", "getPortletOutputStream", "()", "summary", "df-generated"]
-      - ["javax.portlet", "MimeResponse", "getWriter", "()", "summary", "df-generated"]
-      - ["javax.portlet", "MimeResponse", "isCommitted", "()", "summary", "df-generated"]
-      - ["javax.portlet", "MimeResponse", "reset", "()", "summary", "df-generated"]
-      - ["javax.portlet", "MimeResponse", "resetBuffer", "()", "summary", "df-generated"]
-      - ["javax.portlet", "MimeResponse", "setBufferSize", "(int)", "summary", "df-generated"]
-      - ["javax.portlet", "MimeResponse", "setContentType", "(String)", "summary", "df-generated"]
-      - ["javax.portlet", "Portlet", "destroy", "()", "summary", "df-generated"]
-      - ["javax.portlet", "Portlet", "processAction", "(ActionRequest,ActionResponse)", "summary", "df-generated"]
-      - ["javax.portlet", "Portlet", "render", "(RenderRequest,RenderResponse)", "summary", "df-generated"]
-      - ["javax.portlet", "PortletConfig", "getContainerRuntimeOptions", "()", "summary", "df-generated"]
-      - ["javax.portlet", "PortletConfig", "getDefaultNamespace", "()", "summary", "df-generated"]
-      - ["javax.portlet", "PortletConfig", "getInitParameter", "(String)", "summary", "df-generated"]
-      - ["javax.portlet", "PortletConfig", "getInitParameterNames", "()", "summary", "df-generated"]
-      - ["javax.portlet", "PortletConfig", "getPortletContext", "()", "summary", "df-generated"]
-      - ["javax.portlet", "PortletConfig", "getPortletName", "()", "summary", "df-generated"]
-      - ["javax.portlet", "PortletConfig", "getProcessingEventQNames", "()", "summary", "df-generated"]
-      - ["javax.portlet", "PortletConfig", "getPublicRenderParameterNames", "()", "summary", "df-generated"]
-      - ["javax.portlet", "PortletConfig", "getPublishingEventQNames", "()", "summary", "df-generated"]
-      - ["javax.portlet", "PortletConfig", "getResourceBundle", "(Locale)", "summary", "df-generated"]
-      - ["javax.portlet", "PortletConfig", "getSupportedLocales", "()", "summary", "df-generated"]
-      - ["javax.portlet", "PortletException", "PortletException", "(Throwable)", "summary", "df-generated"]
-      - ["javax.portlet", "PortletRequest$P3PUserInfos", "toString", "()", "summary", "df-generated"]
-      - ["javax.portlet", "PortletRequest", "getAttribute", "(String)", "summary", "df-generated"]
-      - ["javax.portlet", "PortletRequest", "getAttributeNames", "()", "summary", "df-generated"]
-      - ["javax.portlet", "PortletRequest", "getAuthType", "()", "summary", "df-generated"]
-      - ["javax.portlet", "PortletRequest", "getContextPath", "()", "summary", "df-generated"]
-      - ["javax.portlet", "PortletRequest", "getCookies", "()", "summary", "df-generated"]
-      - ["javax.portlet", "PortletRequest", "getLocale", "()", "summary", "df-generated"]
-      - ["javax.portlet", "PortletRequest", "getLocales", "()", "summary", "df-generated"]
-      - ["javax.portlet", "PortletRequest", "getParameter", "(String)", "summary", "df-generated"]
-      - ["javax.portlet", "PortletRequest", "getParameterMap", "()", "summary", "df-generated"]
-      - ["javax.portlet", "PortletRequest", "getParameterNames", "()", "summary", "df-generated"]
-      - ["javax.portlet", "PortletRequest", "getParameterValues", "(String)", "summary", "df-generated"]
-      - ["javax.portlet", "PortletRequest", "getPortalContext", "()", "summary", "df-generated"]
-      - ["javax.portlet", "PortletRequest", "getPortletMode", "()", "summary", "df-generated"]
-      - ["javax.portlet", "PortletRequest", "getPortletSession", "()", "summary", "df-generated"]
-      - ["javax.portlet", "PortletRequest", "getPortletSession", "(boolean)", "summary", "df-generated"]
-      - ["javax.portlet", "PortletRequest", "getPreferences", "()", "summary", "df-generated"]
-      - ["javax.portlet", "PortletRequest", "getPrivateParameterMap", "()", "summary", "df-generated"]
-      - ["javax.portlet", "PortletRequest", "getProperties", "(String)", "summary", "df-generated"]
-      - ["javax.portlet", "PortletRequest", "getProperty", "(String)", "summary", "df-generated"]
-      - ["javax.portlet", "PortletRequest", "getPropertyNames", "()", "summary", "df-generated"]
-      - ["javax.portlet", "PortletRequest", "getPublicParameterMap", "()", "summary", "df-generated"]
-      - ["javax.portlet", "PortletRequest", "getRemoteUser", "()", "summary", "df-generated"]
-      - ["javax.portlet", "PortletRequest", "getRequestedSessionId", "()", "summary", "df-generated"]
-      - ["javax.portlet", "PortletRequest", "getResponseContentType", "()", "summary", "df-generated"]
-      - ["javax.portlet", "PortletRequest", "getResponseContentTypes", "()", "summary", "df-generated"]
-      - ["javax.portlet", "PortletRequest", "getScheme", "()", "summary", "df-generated"]
-      - ["javax.portlet", "PortletRequest", "getServerName", "()", "summary", "df-generated"]
-      - ["javax.portlet", "PortletRequest", "getServerPort", "()", "summary", "df-generated"]
-      - ["javax.portlet", "PortletRequest", "getUserPrincipal", "()", "summary", "df-generated"]
-      - ["javax.portlet", "PortletRequest", "getWindowID", "()", "summary", "df-generated"]
-      - ["javax.portlet", "PortletRequest", "getWindowState", "()", "summary", "df-generated"]
-      - ["javax.portlet", "PortletRequest", "isPortletModeAllowed", "(PortletMode)", "summary", "df-generated"]
-      - ["javax.portlet", "PortletRequest", "isRequestedSessionIdValid", "()", "summary", "df-generated"]
-      - ["javax.portlet", "PortletRequest", "isSecure", "()", "summary", "df-generated"]
-      - ["javax.portlet", "PortletRequest", "isUserInRole", "(String)", "summary", "df-generated"]
-      - ["javax.portlet", "PortletRequest", "isWindowStateAllowed", "(WindowState)", "summary", "df-generated"]
-      - ["javax.portlet", "PortletRequest", "removeAttribute", "(String)", "summary", "df-generated"]
-      - ["javax.portlet", "PortletRequest", "setAttribute", "(String,Object)", "summary", "df-generated"]
-      - ["javax.portlet", "PortletResponse", "addProperty", "(Cookie)", "summary", "df-generated"]
-      - ["javax.portlet", "PortletResponse", "addProperty", "(String,Element)", "summary", "df-generated"]
-      - ["javax.portlet", "PortletResponse", "addProperty", "(String,String)", "summary", "df-generated"]
-      - ["javax.portlet", "PortletResponse", "createElement", "(String)", "summary", "df-generated"]
-      - ["javax.portlet", "PortletResponse", "encodeURL", "(String)", "summary", "df-generated"]
-      - ["javax.portlet", "PortletResponse", "getNamespace", "()", "summary", "df-generated"]
-      - ["javax.portlet", "PortletResponse", "setProperty", "(String,String)", "summary", "df-generated"]
-      - ["javax.portlet", "PortletSecurityException", "PortletSecurityException", "(Throwable)", "summary", "df-generated"]
-      - ["javax.portlet", "PortletSessionUtil", "decodeScope", "(String)", "summary", "df-generated"]
-      - ["javax.portlet", "ReadOnlyException", "ReadOnlyException", "(Throwable)", "summary", "df-generated"]
-      - ["javax.portlet", "RenderRequest", "getETag", "()", "summary", "df-generated"]
-      - ["javax.portlet", "RenderResponse", "setNextPossiblePortletModes", "(Collection)", "summary", "df-generated"]
-      - ["javax.portlet", "RenderResponse", "setTitle", "(String)", "summary", "df-generated"]
-      - ["javax.portlet", "ResourceRequest", "getCacheability", "()", "summary", "df-generated"]
-      - ["javax.portlet", "ResourceRequest", "getETag", "()", "summary", "df-generated"]
-      - ["javax.portlet", "ResourceRequest", "getPrivateRenderParameterMap", "()", "summary", "df-generated"]
-      - ["javax.portlet", "ResourceRequest", "getResourceID", "()", "summary", "df-generated"]
-      - ["javax.portlet", "ResourceResponse", "setCharacterEncoding", "(String)", "summary", "df-generated"]
-      - ["javax.portlet", "ResourceResponse", "setContentLength", "(int)", "summary", "df-generated"]
-      - ["javax.portlet", "ResourceResponse", "setLocale", "(Locale)", "summary", "df-generated"]
-      - ["javax.portlet", "ResourceServingPortlet", "serveResource", "(ResourceRequest,ResourceResponse)", "summary", "df-generated"]
-      - ["javax.portlet", "StateAwareResponse", "getPortletMode", "()", "summary", "df-generated"]
-      - ["javax.portlet", "StateAwareResponse", "getRenderParameterMap", "()", "summary", "df-generated"]
-      - ["javax.portlet", "StateAwareResponse", "getWindowState", "()", "summary", "df-generated"]
-      - ["javax.portlet", "StateAwareResponse", "removePublicRenderParameter", "(String)", "summary", "df-generated"]
-      - ["javax.portlet", "StateAwareResponse", "setEvent", "(QName,Serializable)", "summary", "df-generated"]
-      - ["javax.portlet", "StateAwareResponse", "setEvent", "(String,Serializable)", "summary", "df-generated"]
-      - ["javax.portlet", "StateAwareResponse", "setPortletMode", "(PortletMode)", "summary", "df-generated"]
-      - ["javax.portlet", "StateAwareResponse", "setRenderParameter", "(String,String)", "summary", "df-generated"]
-      - ["javax.portlet", "StateAwareResponse", "setRenderParameter", "(String,String[])", "summary", "df-generated"]
-      - ["javax.portlet", "StateAwareResponse", "setRenderParameters", "(Map)", "summary", "df-generated"]
-      - ["javax.portlet", "StateAwareResponse", "setWindowState", "(WindowState)", "summary", "df-generated"]
-      - ["javax.portlet", "UnavailableException", "getUnavailableSeconds", "()", "summary", "df-generated"]
-      - ["javax.portlet", "UnavailableException", "isPermanent", "()", "summary", "df-generated"]
diff --git a/java/ql/lib/ext/generated/javax.print.attribute.model.yml b/java/ql/lib/ext/generated/javax.print.attribute.model.yml
index 08866afd480..49a8ec9963c 100644
--- a/java/ql/lib/ext/generated/javax.print.attribute.model.yml
+++ b/java/ql/lib/ext/generated/javax.print.attribute.model.yml
@@ -4,7 +4,7 @@ extensions:
       pack: codeql/java-all
       extensible: summaryModel
     data:
-      - ["javax.print.attribute", "AttributeSet", True, "add", "(Attribute)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.print.attribute", "AttributeSet", True, "addAll", "(AttributeSet)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["javax.print.attribute", "AttributeSet", True, "get", "(Class)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["javax.print.attribute", "AttributeSet", True, "toArray", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["javax.print.attribute", "AttributeSetUtilities", False, "synchronizedView", "(AttributeSet)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
@@ -17,17 +17,27 @@ extensions:
       - ["javax.print.attribute", "AttributeSetUtilities", False, "unmodifiableView", "(PrintJobAttributeSet)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["javax.print.attribute", "AttributeSetUtilities", False, "unmodifiableView", "(PrintRequestAttributeSet)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["javax.print.attribute", "AttributeSetUtilities", False, "unmodifiableView", "(PrintServiceAttributeSet)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.print.attribute", "AttributeSetUtilities", False, "verifyAttributeValue", "(Object,Class)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.print.attribute", "HashAttributeSet", True, "HashAttributeSet", "(Attribute)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.print.attribute", "HashAttributeSet", True, "HashAttributeSet", "(Attribute[])", "", "Argument[0].ArrayElement", "Argument[this]", "taint", "df-generated"]
+      - ["javax.print.attribute", "AttributeSetUtilities", False, "verifyAttributeValue", "(Object,Class)", "", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.print.attribute", "HashAttributeSet", True, "HashAttributeSet", "(Attribute)", "", "Argument[0]", "Argument[this].SyntheticField[javax.print.attribute.HashAttributeSet.attrMap].MapValue", "value", "dfc-generated"]
+      - ["javax.print.attribute", "HashAttributeSet", True, "HashAttributeSet", "(AttributeSet)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.print.attribute", "HashAttributeSet", True, "HashAttributeSet", "(Attribute[])", "", "Argument[0].ArrayElement", "Argument[this].SyntheticField[javax.print.attribute.HashAttributeSet.attrMap].MapValue", "value", "dfc-generated"]
+      - ["javax.print.attribute", "HashAttributeSet", True, "add", "(Attribute)", "", "Argument[0]", "Argument[this].SyntheticField[javax.print.attribute.HashAttributeSet.attrMap].MapValue", "value", "dfc-generated"]
+      - ["javax.print.attribute", "HashAttributeSet", True, "get", "(Class)", "", "Argument[this].SyntheticField[javax.print.attribute.HashAttributeSet.attrMap].MapValue", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.print.attribute", "HashAttributeSet", True, "toArray", "()", "", "Argument[this].SyntheticField[javax.print.attribute.HashAttributeSet.attrMap].MapValue", "ReturnValue.ArrayElement", "value", "dfc-generated"]
       - ["javax.print.attribute", "HashDocAttributeSet", True, "HashDocAttributeSet", "(DocAttribute)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.print.attribute", "HashDocAttributeSet", True, "HashDocAttributeSet", "(DocAttributeSet)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["javax.print.attribute", "HashDocAttributeSet", True, "HashDocAttributeSet", "(DocAttribute[])", "", "Argument[0].ArrayElement", "Argument[this]", "taint", "df-generated"]
       - ["javax.print.attribute", "HashPrintJobAttributeSet", True, "HashPrintJobAttributeSet", "(PrintJobAttribute)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.print.attribute", "HashPrintJobAttributeSet", True, "HashPrintJobAttributeSet", "(PrintJobAttributeSet)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["javax.print.attribute", "HashPrintJobAttributeSet", True, "HashPrintJobAttributeSet", "(PrintJobAttribute[])", "", "Argument[0].ArrayElement", "Argument[this]", "taint", "df-generated"]
       - ["javax.print.attribute", "HashPrintRequestAttributeSet", True, "HashPrintRequestAttributeSet", "(PrintRequestAttribute)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.print.attribute", "HashPrintRequestAttributeSet", True, "HashPrintRequestAttributeSet", "(PrintRequestAttributeSet)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["javax.print.attribute", "HashPrintRequestAttributeSet", True, "HashPrintRequestAttributeSet", "(PrintRequestAttribute[])", "", "Argument[0].ArrayElement", "Argument[this]", "taint", "df-generated"]
       - ["javax.print.attribute", "HashPrintServiceAttributeSet", True, "HashPrintServiceAttributeSet", "(PrintServiceAttribute)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.print.attribute", "HashPrintServiceAttributeSet", True, "HashPrintServiceAttributeSet", "(PrintServiceAttributeSet)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["javax.print.attribute", "HashPrintServiceAttributeSet", True, "HashPrintServiceAttributeSet", "(PrintServiceAttribute[])", "", "Argument[0].ArrayElement", "Argument[this]", "taint", "df-generated"]
+      - ["javax.print.attribute", "ResolutionSyntax", True, "toString", "(int,String)", "", "Argument[1]", "ReturnValue", "taint", "dfc-generated"]
+      - ["javax.print.attribute", "Size2DSyntax", True, "toString", "(int,String)", "", "Argument[1]", "ReturnValue", "taint", "dfc-generated"]
       - ["javax.print.attribute", "TextSyntax", True, "getLocale", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["javax.print.attribute", "TextSyntax", True, "getValue", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["javax.print.attribute", "URISyntax", True, "getURI", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
@@ -36,25 +46,17 @@ extensions:
       pack: codeql/java-all
       extensible: neutralModel
     data:
-      - ["javax.print.attribute", "Attribute", "getCategory", "()", "summary", "df-generated"]
-      - ["javax.print.attribute", "Attribute", "getName", "()", "summary", "df-generated"]
-      - ["javax.print.attribute", "AttributeSet", "addAll", "(AttributeSet)", "summary", "df-generated"]
-      - ["javax.print.attribute", "AttributeSet", "clear", "()", "summary", "df-generated"]
-      - ["javax.print.attribute", "AttributeSet", "containsKey", "(Class)", "summary", "df-generated"]
-      - ["javax.print.attribute", "AttributeSet", "containsValue", "(Attribute)", "summary", "df-generated"]
-      - ["javax.print.attribute", "AttributeSet", "isEmpty", "()", "summary", "df-generated"]
-      - ["javax.print.attribute", "AttributeSet", "remove", "(Attribute)", "summary", "df-generated"]
-      - ["javax.print.attribute", "AttributeSet", "remove", "(Class)", "summary", "df-generated"]
-      - ["javax.print.attribute", "AttributeSet", "size", "()", "summary", "df-generated"]
       - ["javax.print.attribute", "AttributeSetUtilities", "verifyAttributeCategory", "(Object,Class)", "summary", "df-generated"]
       - ["javax.print.attribute", "AttributeSetUtilities", "verifyCategoryForValue", "(Class,Attribute)", "summary", "df-generated"]
       - ["javax.print.attribute", "DateTimeSyntax", "getValue", "()", "summary", "df-generated"]
       - ["javax.print.attribute", "EnumSyntax", "getValue", "()", "summary", "df-generated"]
-      - ["javax.print.attribute", "HashAttributeSet", "HashAttributeSet", "(AttributeSet)", "summary", "df-generated"]
-      - ["javax.print.attribute", "HashDocAttributeSet", "HashDocAttributeSet", "(DocAttributeSet)", "summary", "df-generated"]
-      - ["javax.print.attribute", "HashPrintJobAttributeSet", "HashPrintJobAttributeSet", "(PrintJobAttributeSet)", "summary", "df-generated"]
-      - ["javax.print.attribute", "HashPrintRequestAttributeSet", "HashPrintRequestAttributeSet", "(PrintRequestAttributeSet)", "summary", "df-generated"]
-      - ["javax.print.attribute", "HashPrintServiceAttributeSet", "HashPrintServiceAttributeSet", "(PrintServiceAttributeSet)", "summary", "df-generated"]
+      - ["javax.print.attribute", "HashAttributeSet", "clear", "()", "summary", "df-generated"]
+      - ["javax.print.attribute", "HashAttributeSet", "containsKey", "(Class)", "summary", "df-generated"]
+      - ["javax.print.attribute", "HashAttributeSet", "containsValue", "(Attribute)", "summary", "df-generated"]
+      - ["javax.print.attribute", "HashAttributeSet", "isEmpty", "()", "summary", "df-generated"]
+      - ["javax.print.attribute", "HashAttributeSet", "remove", "(Attribute)", "summary", "df-generated"]
+      - ["javax.print.attribute", "HashAttributeSet", "remove", "(Class)", "summary", "df-generated"]
+      - ["javax.print.attribute", "HashAttributeSet", "size", "()", "summary", "df-generated"]
       - ["javax.print.attribute", "IntegerSyntax", "getValue", "()", "summary", "df-generated"]
       - ["javax.print.attribute", "ResolutionSyntax", "ResolutionSyntax", "(int,int,int)", "summary", "df-generated"]
       - ["javax.print.attribute", "ResolutionSyntax", "getCrossFeedResolution", "(int)", "summary", "df-generated"]
diff --git a/java/ql/lib/ext/generated/javax.print.attribute.standard.model.yml b/java/ql/lib/ext/generated/javax.print.attribute.standard.model.yml
index 362cdbb4c1e..2c92c54321c 100644
--- a/java/ql/lib/ext/generated/javax.print.attribute.standard.model.yml
+++ b/java/ql/lib/ext/generated/javax.print.attribute.standard.model.yml
@@ -8,8 +8,8 @@ extensions:
       - ["javax.print.attribute.standard", "DateTimeAtCreation", False, "DateTimeAtCreation", "(Date)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["javax.print.attribute.standard", "DateTimeAtProcessing", False, "DateTimeAtProcessing", "(Date)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["javax.print.attribute.standard", "Destination", False, "Destination", "(URI)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.print.attribute.standard", "DialogOwner", False, "DialogOwner", "(Window)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.print.attribute.standard", "DialogOwner", False, "getOwner", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.print.attribute.standard", "DialogOwner", False, "DialogOwner", "(Window)", "", "Argument[0]", "Argument[this].SyntheticField[javax.print.attribute.standard.DialogOwner.owner]", "value", "dfc-generated"]
+      - ["javax.print.attribute.standard", "DialogOwner", False, "getOwner", "()", "", "Argument[this].SyntheticField[javax.print.attribute.standard.DialogOwner.owner]", "ReturnValue", "value", "dfc-generated"]
       - ["javax.print.attribute.standard", "DocumentName", False, "DocumentName", "(String,Locale)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["javax.print.attribute.standard", "DocumentName", False, "DocumentName", "(String,Locale)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
       - ["javax.print.attribute.standard", "JobHoldUntil", False, "JobHoldUntil", "(Date)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
@@ -19,10 +19,11 @@ extensions:
       - ["javax.print.attribute.standard", "JobName", False, "JobName", "(String,Locale)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
       - ["javax.print.attribute.standard", "JobOriginatingUserName", False, "JobOriginatingUserName", "(String,Locale)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["javax.print.attribute.standard", "JobOriginatingUserName", False, "JobOriginatingUserName", "(String,Locale)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.print.attribute.standard", "JobStateReasons", False, "JobStateReasons", "(Collection)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["javax.print.attribute.standard", "MediaSize", True, "MediaSize", "(float,float,int,MediaSizeName)", "", "Argument[3]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.print.attribute.standard", "MediaSize", True, "MediaSize", "(int,int,int,MediaSizeName)", "", "Argument[3]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.print.attribute.standard", "MediaSize", True, "getMediaSizeName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.print.attribute.standard", "JobStateReasons", False, "JobStateReasons", "(Collection)", "", "Argument[0].Element", "Argument[this].Element", "value", "dfc-generated"]
+      - ["javax.print.attribute.standard", "MediaPrintableArea", False, "toString", "(int,String)", "", "Argument[1]", "ReturnValue", "taint", "dfc-generated"]
+      - ["javax.print.attribute.standard", "MediaSize", True, "MediaSize", "(float,float,int,MediaSizeName)", "", "Argument[3]", "Argument[this].SyntheticField[javax.print.attribute.standard.MediaSize.mediaName]", "value", "dfc-generated"]
+      - ["javax.print.attribute.standard", "MediaSize", True, "MediaSize", "(int,int,int,MediaSizeName)", "", "Argument[3]", "Argument[this].SyntheticField[javax.print.attribute.standard.MediaSize.mediaName]", "value", "dfc-generated"]
+      - ["javax.print.attribute.standard", "MediaSize", True, "getMediaSizeName", "()", "", "Argument[this].SyntheticField[javax.print.attribute.standard.MediaSize.mediaName]", "ReturnValue", "value", "dfc-generated"]
       - ["javax.print.attribute.standard", "OutputDeviceAssigned", False, "OutputDeviceAssigned", "(String,Locale)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["javax.print.attribute.standard", "OutputDeviceAssigned", False, "OutputDeviceAssigned", "(String,Locale)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
       - ["javax.print.attribute.standard", "PrinterInfo", False, "PrinterInfo", "(String,Locale)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
@@ -37,7 +38,8 @@ extensions:
       - ["javax.print.attribute.standard", "PrinterMoreInfoManufacturer", False, "PrinterMoreInfoManufacturer", "(URI)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["javax.print.attribute.standard", "PrinterName", False, "PrinterName", "(String,Locale)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["javax.print.attribute.standard", "PrinterName", False, "PrinterName", "(String,Locale)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.print.attribute.standard", "PrinterStateReasons", False, "PrinterStateReasons", "(Map)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
+      - ["javax.print.attribute.standard", "PrinterStateReasons", False, "PrinterStateReasons", "(Map)", "", "Argument[0].MapKey", "Argument[this].MapKey", "value", "dfc-generated"]
+      - ["javax.print.attribute.standard", "PrinterStateReasons", False, "PrinterStateReasons", "(Map)", "", "Argument[0].MapValue", "Argument[this].MapValue", "value", "dfc-generated"]
       - ["javax.print.attribute.standard", "PrinterStateReasons", False, "printerStateReasonSet", "(Severity)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["javax.print.attribute.standard", "PrinterStateReasons", False, "printerStateReasonSet", "(Severity)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["javax.print.attribute.standard", "PrinterURI", False, "PrinterURI", "(URI)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
@@ -47,25 +49,95 @@ extensions:
       pack: codeql/java-all
       extensible: neutralModel
     data:
+      - ["javax.print.attribute.standard", "Chromaticity", "getCategory", "()", "summary", "df-generated"]
+      - ["javax.print.attribute.standard", "Chromaticity", "getName", "()", "summary", "df-generated"]
+      - ["javax.print.attribute.standard", "ColorSupported", "getCategory", "()", "summary", "df-generated"]
+      - ["javax.print.attribute.standard", "ColorSupported", "getName", "()", "summary", "df-generated"]
+      - ["javax.print.attribute.standard", "Compression", "getCategory", "()", "summary", "df-generated"]
+      - ["javax.print.attribute.standard", "Compression", "getName", "()", "summary", "df-generated"]
       - ["javax.print.attribute.standard", "Copies", "Copies", "(int)", "summary", "df-generated"]
+      - ["javax.print.attribute.standard", "Copies", "getCategory", "()", "summary", "df-generated"]
+      - ["javax.print.attribute.standard", "Copies", "getName", "()", "summary", "df-generated"]
       - ["javax.print.attribute.standard", "CopiesSupported", "CopiesSupported", "(int)", "summary", "df-generated"]
       - ["javax.print.attribute.standard", "CopiesSupported", "CopiesSupported", "(int,int)", "summary", "df-generated"]
+      - ["javax.print.attribute.standard", "CopiesSupported", "getCategory", "()", "summary", "df-generated"]
+      - ["javax.print.attribute.standard", "CopiesSupported", "getName", "()", "summary", "df-generated"]
+      - ["javax.print.attribute.standard", "DateTimeAtCompleted", "getCategory", "()", "summary", "df-generated"]
+      - ["javax.print.attribute.standard", "DateTimeAtCompleted", "getName", "()", "summary", "df-generated"]
+      - ["javax.print.attribute.standard", "DateTimeAtCreation", "getCategory", "()", "summary", "df-generated"]
+      - ["javax.print.attribute.standard", "DateTimeAtCreation", "getName", "()", "summary", "df-generated"]
+      - ["javax.print.attribute.standard", "DateTimeAtProcessing", "getCategory", "()", "summary", "df-generated"]
+      - ["javax.print.attribute.standard", "DateTimeAtProcessing", "getName", "()", "summary", "df-generated"]
+      - ["javax.print.attribute.standard", "Destination", "getCategory", "()", "summary", "df-generated"]
+      - ["javax.print.attribute.standard", "Destination", "getName", "()", "summary", "df-generated"]
+      - ["javax.print.attribute.standard", "DialogOwner", "getCategory", "()", "summary", "df-generated"]
+      - ["javax.print.attribute.standard", "DialogOwner", "getName", "()", "summary", "df-generated"]
+      - ["javax.print.attribute.standard", "DialogTypeSelection", "getCategory", "()", "summary", "df-generated"]
+      - ["javax.print.attribute.standard", "DialogTypeSelection", "getName", "()", "summary", "df-generated"]
+      - ["javax.print.attribute.standard", "DocumentName", "getCategory", "()", "summary", "df-generated"]
+      - ["javax.print.attribute.standard", "DocumentName", "getName", "()", "summary", "df-generated"]
+      - ["javax.print.attribute.standard", "Fidelity", "getCategory", "()", "summary", "df-generated"]
+      - ["javax.print.attribute.standard", "Fidelity", "getName", "()", "summary", "df-generated"]
+      - ["javax.print.attribute.standard", "Finishings", "getCategory", "()", "summary", "df-generated"]
+      - ["javax.print.attribute.standard", "Finishings", "getName", "()", "summary", "df-generated"]
+      - ["javax.print.attribute.standard", "JobHoldUntil", "getCategory", "()", "summary", "df-generated"]
+      - ["javax.print.attribute.standard", "JobHoldUntil", "getName", "()", "summary", "df-generated"]
       - ["javax.print.attribute.standard", "JobImpressions", "JobImpressions", "(int)", "summary", "df-generated"]
+      - ["javax.print.attribute.standard", "JobImpressions", "getCategory", "()", "summary", "df-generated"]
+      - ["javax.print.attribute.standard", "JobImpressions", "getName", "()", "summary", "df-generated"]
       - ["javax.print.attribute.standard", "JobImpressionsCompleted", "JobImpressionsCompleted", "(int)", "summary", "df-generated"]
+      - ["javax.print.attribute.standard", "JobImpressionsCompleted", "getCategory", "()", "summary", "df-generated"]
+      - ["javax.print.attribute.standard", "JobImpressionsCompleted", "getName", "()", "summary", "df-generated"]
       - ["javax.print.attribute.standard", "JobImpressionsSupported", "JobImpressionsSupported", "(int,int)", "summary", "df-generated"]
+      - ["javax.print.attribute.standard", "JobImpressionsSupported", "getCategory", "()", "summary", "df-generated"]
+      - ["javax.print.attribute.standard", "JobImpressionsSupported", "getName", "()", "summary", "df-generated"]
       - ["javax.print.attribute.standard", "JobKOctets", "JobKOctets", "(int)", "summary", "df-generated"]
+      - ["javax.print.attribute.standard", "JobKOctets", "getCategory", "()", "summary", "df-generated"]
+      - ["javax.print.attribute.standard", "JobKOctets", "getName", "()", "summary", "df-generated"]
       - ["javax.print.attribute.standard", "JobKOctetsProcessed", "JobKOctetsProcessed", "(int)", "summary", "df-generated"]
+      - ["javax.print.attribute.standard", "JobKOctetsProcessed", "getCategory", "()", "summary", "df-generated"]
+      - ["javax.print.attribute.standard", "JobKOctetsProcessed", "getName", "()", "summary", "df-generated"]
       - ["javax.print.attribute.standard", "JobKOctetsSupported", "JobKOctetsSupported", "(int,int)", "summary", "df-generated"]
+      - ["javax.print.attribute.standard", "JobKOctetsSupported", "getCategory", "()", "summary", "df-generated"]
+      - ["javax.print.attribute.standard", "JobKOctetsSupported", "getName", "()", "summary", "df-generated"]
       - ["javax.print.attribute.standard", "JobMediaSheets", "JobMediaSheets", "(int)", "summary", "df-generated"]
+      - ["javax.print.attribute.standard", "JobMediaSheets", "getCategory", "()", "summary", "df-generated"]
+      - ["javax.print.attribute.standard", "JobMediaSheets", "getName", "()", "summary", "df-generated"]
       - ["javax.print.attribute.standard", "JobMediaSheetsCompleted", "JobMediaSheetsCompleted", "(int)", "summary", "df-generated"]
+      - ["javax.print.attribute.standard", "JobMediaSheetsCompleted", "getCategory", "()", "summary", "df-generated"]
+      - ["javax.print.attribute.standard", "JobMediaSheetsCompleted", "getName", "()", "summary", "df-generated"]
       - ["javax.print.attribute.standard", "JobMediaSheetsSupported", "JobMediaSheetsSupported", "(int,int)", "summary", "df-generated"]
+      - ["javax.print.attribute.standard", "JobMediaSheetsSupported", "getCategory", "()", "summary", "df-generated"]
+      - ["javax.print.attribute.standard", "JobMediaSheetsSupported", "getName", "()", "summary", "df-generated"]
+      - ["javax.print.attribute.standard", "JobMessageFromOperator", "getCategory", "()", "summary", "df-generated"]
+      - ["javax.print.attribute.standard", "JobMessageFromOperator", "getName", "()", "summary", "df-generated"]
+      - ["javax.print.attribute.standard", "JobName", "getCategory", "()", "summary", "df-generated"]
+      - ["javax.print.attribute.standard", "JobName", "getName", "()", "summary", "df-generated"]
+      - ["javax.print.attribute.standard", "JobOriginatingUserName", "getCategory", "()", "summary", "df-generated"]
+      - ["javax.print.attribute.standard", "JobOriginatingUserName", "getName", "()", "summary", "df-generated"]
       - ["javax.print.attribute.standard", "JobPriority", "JobPriority", "(int)", "summary", "df-generated"]
+      - ["javax.print.attribute.standard", "JobPriority", "getCategory", "()", "summary", "df-generated"]
+      - ["javax.print.attribute.standard", "JobPriority", "getName", "()", "summary", "df-generated"]
       - ["javax.print.attribute.standard", "JobPrioritySupported", "JobPrioritySupported", "(int)", "summary", "df-generated"]
+      - ["javax.print.attribute.standard", "JobPrioritySupported", "getCategory", "()", "summary", "df-generated"]
+      - ["javax.print.attribute.standard", "JobPrioritySupported", "getName", "()", "summary", "df-generated"]
+      - ["javax.print.attribute.standard", "JobSheets", "getCategory", "()", "summary", "df-generated"]
+      - ["javax.print.attribute.standard", "JobSheets", "getName", "()", "summary", "df-generated"]
+      - ["javax.print.attribute.standard", "JobState", "getCategory", "()", "summary", "df-generated"]
+      - ["javax.print.attribute.standard", "JobState", "getName", "()", "summary", "df-generated"]
+      - ["javax.print.attribute.standard", "JobStateReason", "getCategory", "()", "summary", "df-generated"]
+      - ["javax.print.attribute.standard", "JobStateReason", "getName", "()", "summary", "df-generated"]
       - ["javax.print.attribute.standard", "JobStateReasons", "JobStateReasons", "(int)", "summary", "df-generated"]
       - ["javax.print.attribute.standard", "JobStateReasons", "JobStateReasons", "(int,float)", "summary", "df-generated"]
+      - ["javax.print.attribute.standard", "JobStateReasons", "getCategory", "()", "summary", "df-generated"]
+      - ["javax.print.attribute.standard", "JobStateReasons", "getName", "()", "summary", "df-generated"]
+      - ["javax.print.attribute.standard", "Media", "getCategory", "()", "summary", "df-generated"]
+      - ["javax.print.attribute.standard", "Media", "getName", "()", "summary", "df-generated"]
       - ["javax.print.attribute.standard", "MediaPrintableArea", "MediaPrintableArea", "(float,float,float,float,int)", "summary", "df-generated"]
       - ["javax.print.attribute.standard", "MediaPrintableArea", "MediaPrintableArea", "(int,int,int,int,int)", "summary", "df-generated"]
+      - ["javax.print.attribute.standard", "MediaPrintableArea", "getCategory", "()", "summary", "df-generated"]
       - ["javax.print.attribute.standard", "MediaPrintableArea", "getHeight", "(int)", "summary", "df-generated"]
+      - ["javax.print.attribute.standard", "MediaPrintableArea", "getName", "()", "summary", "df-generated"]
       - ["javax.print.attribute.standard", "MediaPrintableArea", "getPrintableArea", "(int)", "summary", "df-generated"]
       - ["javax.print.attribute.standard", "MediaPrintableArea", "getWidth", "(int)", "summary", "df-generated"]
       - ["javax.print.attribute.standard", "MediaPrintableArea", "getX", "(int)", "summary", "df-generated"]
@@ -73,20 +145,86 @@ extensions:
       - ["javax.print.attribute.standard", "MediaSize", "MediaSize", "(float,float,int)", "summary", "df-generated"]
       - ["javax.print.attribute.standard", "MediaSize", "MediaSize", "(int,int,int)", "summary", "df-generated"]
       - ["javax.print.attribute.standard", "MediaSize", "findMedia", "(float,float,int)", "summary", "df-generated"]
+      - ["javax.print.attribute.standard", "MediaSize", "getCategory", "()", "summary", "df-generated"]
       - ["javax.print.attribute.standard", "MediaSize", "getMediaSizeForName", "(MediaSizeName)", "summary", "df-generated"]
+      - ["javax.print.attribute.standard", "MediaSize", "getName", "()", "summary", "df-generated"]
+      - ["javax.print.attribute.standard", "MultipleDocumentHandling", "getCategory", "()", "summary", "df-generated"]
+      - ["javax.print.attribute.standard", "MultipleDocumentHandling", "getName", "()", "summary", "df-generated"]
       - ["javax.print.attribute.standard", "NumberOfDocuments", "NumberOfDocuments", "(int)", "summary", "df-generated"]
+      - ["javax.print.attribute.standard", "NumberOfDocuments", "getCategory", "()", "summary", "df-generated"]
+      - ["javax.print.attribute.standard", "NumberOfDocuments", "getName", "()", "summary", "df-generated"]
       - ["javax.print.attribute.standard", "NumberOfInterveningJobs", "NumberOfInterveningJobs", "(int)", "summary", "df-generated"]
+      - ["javax.print.attribute.standard", "NumberOfInterveningJobs", "getCategory", "()", "summary", "df-generated"]
+      - ["javax.print.attribute.standard", "NumberOfInterveningJobs", "getName", "()", "summary", "df-generated"]
       - ["javax.print.attribute.standard", "NumberUp", "NumberUp", "(int)", "summary", "df-generated"]
+      - ["javax.print.attribute.standard", "NumberUp", "getCategory", "()", "summary", "df-generated"]
+      - ["javax.print.attribute.standard", "NumberUp", "getName", "()", "summary", "df-generated"]
       - ["javax.print.attribute.standard", "NumberUpSupported", "NumberUpSupported", "(int)", "summary", "df-generated"]
       - ["javax.print.attribute.standard", "NumberUpSupported", "NumberUpSupported", "(int,int)", "summary", "df-generated"]
       - ["javax.print.attribute.standard", "NumberUpSupported", "NumberUpSupported", "(int[][])", "summary", "df-generated"]
+      - ["javax.print.attribute.standard", "NumberUpSupported", "getCategory", "()", "summary", "df-generated"]
+      - ["javax.print.attribute.standard", "NumberUpSupported", "getName", "()", "summary", "df-generated"]
+      - ["javax.print.attribute.standard", "OrientationRequested", "getCategory", "()", "summary", "df-generated"]
+      - ["javax.print.attribute.standard", "OrientationRequested", "getName", "()", "summary", "df-generated"]
+      - ["javax.print.attribute.standard", "OutputDeviceAssigned", "getCategory", "()", "summary", "df-generated"]
+      - ["javax.print.attribute.standard", "OutputDeviceAssigned", "getName", "()", "summary", "df-generated"]
+      - ["javax.print.attribute.standard", "PDLOverrideSupported", "getCategory", "()", "summary", "df-generated"]
+      - ["javax.print.attribute.standard", "PDLOverrideSupported", "getName", "()", "summary", "df-generated"]
       - ["javax.print.attribute.standard", "PageRanges", "PageRanges", "(String)", "summary", "df-generated"]
       - ["javax.print.attribute.standard", "PageRanges", "PageRanges", "(int)", "summary", "df-generated"]
       - ["javax.print.attribute.standard", "PageRanges", "PageRanges", "(int,int)", "summary", "df-generated"]
       - ["javax.print.attribute.standard", "PageRanges", "PageRanges", "(int[][])", "summary", "df-generated"]
+      - ["javax.print.attribute.standard", "PageRanges", "getCategory", "()", "summary", "df-generated"]
+      - ["javax.print.attribute.standard", "PageRanges", "getName", "()", "summary", "df-generated"]
       - ["javax.print.attribute.standard", "PagesPerMinute", "PagesPerMinute", "(int)", "summary", "df-generated"]
+      - ["javax.print.attribute.standard", "PagesPerMinute", "getCategory", "()", "summary", "df-generated"]
+      - ["javax.print.attribute.standard", "PagesPerMinute", "getName", "()", "summary", "df-generated"]
       - ["javax.print.attribute.standard", "PagesPerMinuteColor", "PagesPerMinuteColor", "(int)", "summary", "df-generated"]
+      - ["javax.print.attribute.standard", "PagesPerMinuteColor", "getCategory", "()", "summary", "df-generated"]
+      - ["javax.print.attribute.standard", "PagesPerMinuteColor", "getName", "()", "summary", "df-generated"]
+      - ["javax.print.attribute.standard", "PresentationDirection", "getCategory", "()", "summary", "df-generated"]
+      - ["javax.print.attribute.standard", "PresentationDirection", "getName", "()", "summary", "df-generated"]
+      - ["javax.print.attribute.standard", "PrintQuality", "getCategory", "()", "summary", "df-generated"]
+      - ["javax.print.attribute.standard", "PrintQuality", "getName", "()", "summary", "df-generated"]
+      - ["javax.print.attribute.standard", "PrinterInfo", "getCategory", "()", "summary", "df-generated"]
+      - ["javax.print.attribute.standard", "PrinterInfo", "getName", "()", "summary", "df-generated"]
+      - ["javax.print.attribute.standard", "PrinterIsAcceptingJobs", "getCategory", "()", "summary", "df-generated"]
+      - ["javax.print.attribute.standard", "PrinterIsAcceptingJobs", "getName", "()", "summary", "df-generated"]
+      - ["javax.print.attribute.standard", "PrinterLocation", "getCategory", "()", "summary", "df-generated"]
+      - ["javax.print.attribute.standard", "PrinterLocation", "getName", "()", "summary", "df-generated"]
+      - ["javax.print.attribute.standard", "PrinterMakeAndModel", "getCategory", "()", "summary", "df-generated"]
+      - ["javax.print.attribute.standard", "PrinterMakeAndModel", "getName", "()", "summary", "df-generated"]
+      - ["javax.print.attribute.standard", "PrinterMessageFromOperator", "getCategory", "()", "summary", "df-generated"]
+      - ["javax.print.attribute.standard", "PrinterMessageFromOperator", "getName", "()", "summary", "df-generated"]
+      - ["javax.print.attribute.standard", "PrinterMoreInfo", "getCategory", "()", "summary", "df-generated"]
+      - ["javax.print.attribute.standard", "PrinterMoreInfo", "getName", "()", "summary", "df-generated"]
+      - ["javax.print.attribute.standard", "PrinterMoreInfoManufacturer", "getCategory", "()", "summary", "df-generated"]
+      - ["javax.print.attribute.standard", "PrinterMoreInfoManufacturer", "getName", "()", "summary", "df-generated"]
+      - ["javax.print.attribute.standard", "PrinterName", "getCategory", "()", "summary", "df-generated"]
+      - ["javax.print.attribute.standard", "PrinterName", "getName", "()", "summary", "df-generated"]
       - ["javax.print.attribute.standard", "PrinterResolution", "PrinterResolution", "(int,int,int)", "summary", "df-generated"]
+      - ["javax.print.attribute.standard", "PrinterResolution", "getCategory", "()", "summary", "df-generated"]
+      - ["javax.print.attribute.standard", "PrinterResolution", "getName", "()", "summary", "df-generated"]
+      - ["javax.print.attribute.standard", "PrinterState", "getCategory", "()", "summary", "df-generated"]
+      - ["javax.print.attribute.standard", "PrinterState", "getName", "()", "summary", "df-generated"]
+      - ["javax.print.attribute.standard", "PrinterStateReason", "getCategory", "()", "summary", "df-generated"]
+      - ["javax.print.attribute.standard", "PrinterStateReason", "getName", "()", "summary", "df-generated"]
       - ["javax.print.attribute.standard", "PrinterStateReasons", "PrinterStateReasons", "(int)", "summary", "df-generated"]
       - ["javax.print.attribute.standard", "PrinterStateReasons", "PrinterStateReasons", "(int,float)", "summary", "df-generated"]
+      - ["javax.print.attribute.standard", "PrinterStateReasons", "getCategory", "()", "summary", "df-generated"]
+      - ["javax.print.attribute.standard", "PrinterStateReasons", "getName", "()", "summary", "df-generated"]
+      - ["javax.print.attribute.standard", "PrinterURI", "getCategory", "()", "summary", "df-generated"]
+      - ["javax.print.attribute.standard", "PrinterURI", "getName", "()", "summary", "df-generated"]
       - ["javax.print.attribute.standard", "QueuedJobCount", "QueuedJobCount", "(int)", "summary", "df-generated"]
+      - ["javax.print.attribute.standard", "QueuedJobCount", "getCategory", "()", "summary", "df-generated"]
+      - ["javax.print.attribute.standard", "QueuedJobCount", "getName", "()", "summary", "df-generated"]
+      - ["javax.print.attribute.standard", "ReferenceUriSchemesSupported", "getCategory", "()", "summary", "df-generated"]
+      - ["javax.print.attribute.standard", "ReferenceUriSchemesSupported", "getName", "()", "summary", "df-generated"]
+      - ["javax.print.attribute.standard", "RequestingUserName", "getCategory", "()", "summary", "df-generated"]
+      - ["javax.print.attribute.standard", "RequestingUserName", "getName", "()", "summary", "df-generated"]
+      - ["javax.print.attribute.standard", "Severity", "getCategory", "()", "summary", "df-generated"]
+      - ["javax.print.attribute.standard", "Severity", "getName", "()", "summary", "df-generated"]
+      - ["javax.print.attribute.standard", "SheetCollate", "getCategory", "()", "summary", "df-generated"]
+      - ["javax.print.attribute.standard", "SheetCollate", "getName", "()", "summary", "df-generated"]
+      - ["javax.print.attribute.standard", "Sides", "getCategory", "()", "summary", "df-generated"]
+      - ["javax.print.attribute.standard", "Sides", "getName", "()", "summary", "df-generated"]
diff --git a/java/ql/lib/ext/generated/javax.print.event.model.yml b/java/ql/lib/ext/generated/javax.print.event.model.yml
index 91b146ba8b0..fb9c8549684 100644
--- a/java/ql/lib/ext/generated/javax.print.event.model.yml
+++ b/java/ql/lib/ext/generated/javax.print.event.model.yml
@@ -5,24 +5,22 @@ extensions:
       extensible: summaryModel
     data:
       - ["javax.print.event", "PrintEvent", True, "PrintEvent", "(Object)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.print.event", "PrintJobAttributeEvent", True, "PrintJobAttributeEvent", "(DocPrintJob,PrintJobAttributeSet)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.print.event", "PrintJobAttributeEvent", True, "PrintJobAttributeEvent", "(DocPrintJob,PrintJobAttributeSet)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.print.event", "PrintJobAttributeEvent", True, "PrintJobAttributeEvent", "(DocPrintJob,PrintJobAttributeSet)", "", "Argument[0]", "Argument[this].SyntheticField[java.util.EventObject.source]", "value", "dfc-generated"]
       - ["javax.print.event", "PrintJobAttributeEvent", True, "getAttributes", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.print.event", "PrintJobAttributeEvent", True, "getPrintJob", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.print.event", "PrintJobEvent", True, "PrintJobEvent", "(DocPrintJob,int)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.print.event", "PrintJobEvent", True, "getPrintJob", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.print.event", "PrintServiceAttributeEvent", True, "PrintServiceAttributeEvent", "(PrintService,PrintServiceAttributeSet)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.print.event", "PrintServiceAttributeEvent", True, "PrintServiceAttributeEvent", "(PrintService,PrintServiceAttributeSet)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.print.event", "PrintJobAttributeEvent", True, "getPrintJob", "()", "", "Argument[this].SyntheticField[java.util.EventObject.source]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.print.event", "PrintJobEvent", True, "PrintJobEvent", "(DocPrintJob,int)", "", "Argument[0]", "Argument[this].SyntheticField[java.util.EventObject.source]", "value", "dfc-generated"]
+      - ["javax.print.event", "PrintJobEvent", True, "getPrintJob", "()", "", "Argument[this].SyntheticField[java.util.EventObject.source]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.print.event", "PrintServiceAttributeEvent", True, "PrintServiceAttributeEvent", "(PrintService,PrintServiceAttributeSet)", "", "Argument[0]", "Argument[this].SyntheticField[java.util.EventObject.source]", "value", "dfc-generated"]
       - ["javax.print.event", "PrintServiceAttributeEvent", True, "getAttributes", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.print.event", "PrintServiceAttributeEvent", True, "getPrintService", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.print.event", "PrintServiceAttributeEvent", True, "getPrintService", "()", "", "Argument[this].SyntheticField[java.util.EventObject.source]", "ReturnValue", "value", "dfc-generated"]
   - addsTo:
       pack: codeql/java-all
       extensible: neutralModel
     data:
+      - ["javax.print.event", "PrintJobAdapter", "printDataTransferCompleted", "(PrintJobEvent)", "summary", "df-generated"]
+      - ["javax.print.event", "PrintJobAdapter", "printJobCanceled", "(PrintJobEvent)", "summary", "df-generated"]
+      - ["javax.print.event", "PrintJobAdapter", "printJobCompleted", "(PrintJobEvent)", "summary", "df-generated"]
+      - ["javax.print.event", "PrintJobAdapter", "printJobFailed", "(PrintJobEvent)", "summary", "df-generated"]
+      - ["javax.print.event", "PrintJobAdapter", "printJobNoMoreEvents", "(PrintJobEvent)", "summary", "df-generated"]
+      - ["javax.print.event", "PrintJobAdapter", "printJobRequiresAttention", "(PrintJobEvent)", "summary", "df-generated"]
       - ["javax.print.event", "PrintJobEvent", "getPrintEventType", "()", "summary", "df-generated"]
-      - ["javax.print.event", "PrintJobListener", "printDataTransferCompleted", "(PrintJobEvent)", "summary", "df-generated"]
-      - ["javax.print.event", "PrintJobListener", "printJobCanceled", "(PrintJobEvent)", "summary", "df-generated"]
-      - ["javax.print.event", "PrintJobListener", "printJobCompleted", "(PrintJobEvent)", "summary", "df-generated"]
-      - ["javax.print.event", "PrintJobListener", "printJobFailed", "(PrintJobEvent)", "summary", "df-generated"]
-      - ["javax.print.event", "PrintJobListener", "printJobNoMoreEvents", "(PrintJobEvent)", "summary", "df-generated"]
-      - ["javax.print.event", "PrintJobListener", "printJobRequiresAttention", "(PrintJobEvent)", "summary", "df-generated"]
diff --git a/java/ql/lib/ext/generated/javax.print.model.yml b/java/ql/lib/ext/generated/javax.print.model.yml
index bf9267dea96..d93afbb8d62 100644
--- a/java/ql/lib/ext/generated/javax.print.model.yml
+++ b/java/ql/lib/ext/generated/javax.print.model.yml
@@ -4,28 +4,51 @@ extensions:
       pack: codeql/java-all
       extensible: summaryModel
     data:
+      - ["javax.print", "AttributeException", True, "getUnsupportedValues", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["javax.print", "Doc", True, "getAttributes", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.print", "Doc", True, "getDocFlavor", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["javax.print", "Doc", True, "getPrintData", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.print", "Doc", True, "getReaderForText", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.print", "Doc", True, "getStreamForBytes", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["javax.print", "DocFlavor$SERVICE_FORMATTED", True, "SERVICE_FORMATTED", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.print", "DocFlavor", True, "DocFlavor", "(String,String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.print", "DocFlavor", True, "DocFlavor", "(String,String)", "", "Argument[1]", "Argument[this].SyntheticField[javax.print.DocFlavor.myClassName]", "value", "dfc-generated"]
       - ["javax.print", "DocFlavor", True, "getMediaSubtype", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["javax.print", "DocFlavor", True, "getMediaType", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["javax.print", "DocFlavor", True, "getMimeType", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["javax.print", "DocFlavor", True, "getParameter", "(String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.print", "DocFlavor", True, "getRepresentationClassName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.print", "DocFlavor", True, "getRepresentationClassName", "()", "", "Argument[this].SyntheticField[javax.print.DocFlavor.myClassName]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.print", "DocPrintJob", True, "addPrintJobAttributeListener", "(PrintJobAttributeListener,PrintJobAttributeSet)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.print", "DocPrintJob", True, "addPrintJobAttributeListener", "(PrintJobAttributeListener,PrintJobAttributeSet)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.print", "DocPrintJob", True, "addPrintJobListener", "(PrintJobListener)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.print", "DocPrintJob", True, "getAttributes", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.print", "DocPrintJob", True, "getPrintService", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.print", "DocPrintJob", True, "print", "(Doc,PrintRequestAttributeSet)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.print", "FlavorException", True, "getUnsupportedFlavors", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["javax.print", "PrintException", True, "PrintException", "(Exception)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["javax.print", "PrintException", True, "PrintException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["javax.print", "PrintException", True, "PrintException", "(String,Exception)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["javax.print", "PrintException", True, "PrintException", "(String,Exception)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.print", "ServiceUI", True, "printDialog", "(GraphicsConfiguration,int,int,PrintService[],PrintService,DocFlavor,PrintRequestAttributeSet)", "", "Argument[3].ArrayElement", "Argument[6]", "taint", "df-generated"]
-      - ["javax.print", "ServiceUI", True, "printDialog", "(GraphicsConfiguration,int,int,PrintService[],PrintService,DocFlavor,PrintRequestAttributeSet)", "", "Argument[3].ArrayElement", "ReturnValue", "taint", "df-generated"]
-      - ["javax.print", "SimpleDoc", False, "SimpleDoc", "(Object,DocFlavor,DocAttributeSet)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.print", "SimpleDoc", False, "SimpleDoc", "(Object,DocFlavor,DocAttributeSet)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.print", "SimpleDoc", False, "SimpleDoc", "(Object,DocFlavor,DocAttributeSet)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.print", "PrintService", True, "createPrintJob", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.print", "PrintService", True, "getAttribute", "(Class)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.print", "PrintService", True, "getDefaultAttributeValue", "(Class)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.print", "PrintService", True, "getName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.print", "PrintService", True, "getSupportedAttributeCategories", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.print", "PrintService", True, "getSupportedAttributeValues", "(Class,DocFlavor,AttributeSet)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.print", "PrintService", True, "getSupportedDocFlavors", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.print", "PrintService", True, "getUnsupportedAttributes", "(DocFlavor,AttributeSet)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.print", "PrintServiceLookup", True, "getDefaultPrintService", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.print", "PrintServiceLookup", True, "getPrintServices", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.print", "PrintServiceLookup", True, "getPrintServices", "(DocFlavor,AttributeSet)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.print", "ServiceUI", True, "printDialog", "(GraphicsConfiguration,int,int,PrintService[],PrintService,DocFlavor,PrintRequestAttributeSet)", "", "Argument[3].ArrayElement", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.print", "SimpleDoc", False, "SimpleDoc", "(Object,DocFlavor,DocAttributeSet)", "", "Argument[0]", "Argument[this].SyntheticField[javax.print.SimpleDoc.printData]", "value", "dfc-generated"]
+      - ["javax.print", "SimpleDoc", False, "SimpleDoc", "(Object,DocFlavor,DocAttributeSet)", "", "Argument[1]", "Argument[this].SyntheticField[javax.print.SimpleDoc.flavor]", "value", "dfc-generated"]
+      - ["javax.print", "SimpleDoc", False, "getDocFlavor", "()", "", "Argument[this].SyntheticField[javax.print.SimpleDoc.flavor]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.print", "SimpleDoc", False, "getPrintData", "()", "", "Argument[this].SyntheticField[javax.print.SimpleDoc.printData]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.print", "SimpleDoc", False, "getReaderForText", "()", "", "Argument[this].SyntheticField[javax.print.SimpleDoc.printData]", "Argument[this].SyntheticField[javax.print.SimpleDoc.reader]", "taint", "dfc-generated"]
+      - ["javax.print", "SimpleDoc", False, "getReaderForText", "()", "", "Argument[this].SyntheticField[javax.print.SimpleDoc.printData]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.print", "SimpleDoc", False, "getReaderForText", "()", "", "Argument[this].SyntheticField[javax.print.SimpleDoc.reader]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.print", "SimpleDoc", False, "getStreamForBytes", "()", "", "Argument[this].SyntheticField[javax.print.SimpleDoc.inStream]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.print", "SimpleDoc", False, "getStreamForBytes", "()", "", "Argument[this].SyntheticField[javax.print.SimpleDoc.printData]", "Argument[this].SyntheticField[javax.print.SimpleDoc.inStream]", "taint", "dfc-generated"]
+      - ["javax.print", "SimpleDoc", False, "getStreamForBytes", "()", "", "Argument[this].SyntheticField[javax.print.SimpleDoc.printData]", "ReturnValue", "value", "dfc-generated"]
       - ["javax.print", "StreamPrintService", True, "getOutputStream", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.print", "StreamPrintServiceFactory", True, "getPrintService", "(OutputStream)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
   - addsTo:
       pack: codeql/java-all
       extensible: neutralModel
@@ -36,10 +59,7 @@ extensions:
       - ["javax.print", "DocFlavor$READER", "READER", "(String)", "summary", "df-generated"]
       - ["javax.print", "DocFlavor$STRING", "STRING", "(String)", "summary", "df-generated"]
       - ["javax.print", "DocFlavor$URL", "URL", "(String)", "summary", "df-generated"]
-      - ["javax.print", "PrintServiceLookup", "getDefaultPrintService", "()", "summary", "df-generated"]
       - ["javax.print", "PrintServiceLookup", "getMultiDocPrintServices", "(DocFlavor[],AttributeSet)", "summary", "df-generated"]
-      - ["javax.print", "PrintServiceLookup", "getPrintServices", "()", "summary", "df-generated"]
-      - ["javax.print", "PrintServiceLookup", "getPrintServices", "(DocFlavor,AttributeSet)", "summary", "df-generated"]
       - ["javax.print", "PrintServiceLookup", "lookupDefaultPrintService", "()", "summary", "df-generated"]
       - ["javax.print", "PrintServiceLookup", "lookupMultiDocPrintServices", "(DocFlavor[],AttributeSet)", "summary", "df-generated"]
       - ["javax.print", "PrintServiceLookup", "lookupPrintServices", "(DocFlavor,AttributeSet)", "summary", "df-generated"]
@@ -51,6 +71,5 @@ extensions:
       - ["javax.print", "StreamPrintService", "getOutputFormat", "()", "summary", "df-generated"]
       - ["javax.print", "StreamPrintService", "isDisposed", "()", "summary", "df-generated"]
       - ["javax.print", "StreamPrintServiceFactory", "getOutputFormat", "()", "summary", "df-generated"]
-      - ["javax.print", "StreamPrintServiceFactory", "getPrintService", "(OutputStream)", "summary", "df-generated"]
       - ["javax.print", "StreamPrintServiceFactory", "getSupportedDocFlavors", "()", "summary", "df-generated"]
       - ["javax.print", "StreamPrintServiceFactory", "lookupStreamPrintServiceFactories", "(DocFlavor,String)", "summary", "df-generated"]
diff --git a/java/ql/lib/ext/generated/javax.rmi.ssl.model.yml b/java/ql/lib/ext/generated/javax.rmi.ssl.model.yml
index 54e1b150eb9..6c00aa2f4d4 100644
--- a/java/ql/lib/ext/generated/javax.rmi.ssl.model.yml
+++ b/java/ql/lib/ext/generated/javax.rmi.ssl.model.yml
@@ -4,13 +4,12 @@ extensions:
       pack: codeql/java-all
       extensible: summaryModel
     data:
-      - ["javax.rmi.ssl", "SslRMIServerSocketFactory", True, "SslRMIServerSocketFactory", "(SSLContext,String[],String[],boolean)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.rmi.ssl", "SslRMIServerSocketFactory", True, "SslRMIServerSocketFactory", "(SSLContext,String[],String[],boolean)", "", "Argument[1].ArrayElement", "Argument[this]", "taint", "df-generated"]
-      - ["javax.rmi.ssl", "SslRMIServerSocketFactory", True, "SslRMIServerSocketFactory", "(SSLContext,String[],String[],boolean)", "", "Argument[2].ArrayElement", "Argument[this]", "taint", "df-generated"]
-      - ["javax.rmi.ssl", "SslRMIServerSocketFactory", True, "SslRMIServerSocketFactory", "(String[],String[],boolean)", "", "Argument[0].ArrayElement", "Argument[this]", "taint", "df-generated"]
-      - ["javax.rmi.ssl", "SslRMIServerSocketFactory", True, "SslRMIServerSocketFactory", "(String[],String[],boolean)", "", "Argument[1].ArrayElement", "Argument[this]", "taint", "df-generated"]
-      - ["javax.rmi.ssl", "SslRMIServerSocketFactory", True, "getEnabledCipherSuites", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.rmi.ssl", "SslRMIServerSocketFactory", True, "getEnabledProtocols", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.rmi.ssl", "SslRMIServerSocketFactory", True, "SslRMIServerSocketFactory", "(SSLContext,String[],String[],boolean)", "", "Argument[1]", "Argument[this].SyntheticField[javax.rmi.ssl.SslRMIServerSocketFactory.enabledCipherSuites]", "value", "dfc-generated"]
+      - ["javax.rmi.ssl", "SslRMIServerSocketFactory", True, "SslRMIServerSocketFactory", "(SSLContext,String[],String[],boolean)", "", "Argument[2]", "Argument[this].SyntheticField[javax.rmi.ssl.SslRMIServerSocketFactory.enabledProtocols]", "value", "dfc-generated"]
+      - ["javax.rmi.ssl", "SslRMIServerSocketFactory", True, "SslRMIServerSocketFactory", "(String[],String[],boolean)", "", "Argument[0]", "Argument[this].SyntheticField[javax.rmi.ssl.SslRMIServerSocketFactory.enabledCipherSuites]", "value", "dfc-generated"]
+      - ["javax.rmi.ssl", "SslRMIServerSocketFactory", True, "SslRMIServerSocketFactory", "(String[],String[],boolean)", "", "Argument[1]", "Argument[this].SyntheticField[javax.rmi.ssl.SslRMIServerSocketFactory.enabledProtocols]", "value", "dfc-generated"]
+      - ["javax.rmi.ssl", "SslRMIServerSocketFactory", True, "getEnabledCipherSuites", "()", "", "Argument[this].SyntheticField[javax.rmi.ssl.SslRMIServerSocketFactory.enabledCipherSuites]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.rmi.ssl", "SslRMIServerSocketFactory", True, "getEnabledProtocols", "()", "", "Argument[this].SyntheticField[javax.rmi.ssl.SslRMIServerSocketFactory.enabledProtocols]", "ReturnValue", "value", "dfc-generated"]
   - addsTo:
       pack: codeql/java-all
       extensible: neutralModel
diff --git a/java/ql/lib/ext/generated/javax.script.model.yml b/java/ql/lib/ext/generated/javax.script.model.yml
index 6350613b8c4..78ea561a2a9 100644
--- a/java/ql/lib/ext/generated/javax.script.model.yml
+++ b/java/ql/lib/ext/generated/javax.script.model.yml
@@ -4,63 +4,72 @@ extensions:
       pack: codeql/java-all
       extensible: summaryModel
     data:
-      - ["javax.script", "AbstractScriptEngine", True, "AbstractScriptEngine", "(Bindings)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["javax.script", "ScriptContext", True, "getAttribute", "(String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.script", "ScriptContext", True, "getAttribute", "(String,int)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.script", "ScriptContext", True, "getBindings", "(int)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.script", "ScriptContext", True, "getErrorWriter", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.script", "ScriptContext", True, "getReader", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.script", "ScriptContext", True, "getWriter", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.script", "ScriptContext", True, "removeAttribute", "(String,int)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.script", "ScriptContext", True, "setAttribute", "(String,Object,int)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.script", "ScriptContext", True, "setAttribute", "(String,Object,int)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.script", "ScriptContext", True, "setBindings", "(Bindings,int)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["javax.script", "ScriptContext", True, "setErrorWriter", "(Writer)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.script", "ScriptContext", True, "setReader", "(Reader)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.script", "ScriptContext", True, "setWriter", "(Writer)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.script", "AbstractScriptEngine", True, "AbstractScriptEngine", "(Bindings)", "", "Argument[0]", "Argument[this].SyntheticField[javax.script.AbstractScriptEngine.context].SyntheticField[javax.script.SimpleScriptContext.engineScope]", "value", "dfc-generated"]
+      - ["javax.script", "AbstractScriptEngine", True, "AbstractScriptEngine", "(Bindings)", "", "Argument[0]", "Argument[this].SyntheticField[javax.script.AbstractScriptEngine.context].SyntheticField[javax.script.SimpleScriptContext.globalScope]", "value", "dfc-generated"]
+      - ["javax.script", "AbstractScriptEngine", True, "getBindings", "(int)", "", "Argument[this].SyntheticField[javax.script.AbstractScriptEngine.context].SyntheticField[javax.script.SimpleScriptContext.engineScope]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.script", "AbstractScriptEngine", True, "getBindings", "(int)", "", "Argument[this].SyntheticField[javax.script.AbstractScriptEngine.context].SyntheticField[javax.script.SimpleScriptContext.globalScope]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.script", "AbstractScriptEngine", True, "getContext", "()", "", "Argument[this].SyntheticField[javax.script.AbstractScriptEngine.context]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.script", "AbstractScriptEngine", True, "setBindings", "(Bindings,int)", "", "Argument[0]", "Argument[this].SyntheticField[javax.script.AbstractScriptEngine.context].SyntheticField[javax.script.SimpleScriptContext.engineScope]", "value", "dfc-generated"]
+      - ["javax.script", "AbstractScriptEngine", True, "setBindings", "(Bindings,int)", "", "Argument[0]", "Argument[this].SyntheticField[javax.script.AbstractScriptEngine.context].SyntheticField[javax.script.SimpleScriptContext.globalScope]", "value", "dfc-generated"]
+      - ["javax.script", "AbstractScriptEngine", True, "setContext", "(ScriptContext)", "", "Argument[0]", "Argument[this].SyntheticField[javax.script.AbstractScriptEngine.context]", "value", "dfc-generated"]
       - ["javax.script", "ScriptEngine", True, "get", "(String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.script", "ScriptEngine", True, "getBindings", "(int)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.script", "ScriptEngine", True, "getContext", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.script", "ScriptEngine", True, "setBindings", "(Bindings,int)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["javax.script", "ScriptEngine", True, "setContext", "(ScriptContext)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.script", "ScriptEngineManager", True, "get", "(String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.script", "ScriptEngineManager", True, "getBindings", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.script", "ScriptEngineManager", True, "get", "(String)", "", "Argument[this].SyntheticField[javax.script.ScriptEngineManager.globalScope].MapValue", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.script", "ScriptEngineManager", True, "getBindings", "()", "", "Argument[this].SyntheticField[javax.script.ScriptEngineManager.globalScope]", "ReturnValue", "value", "dfc-generated"]
       - ["javax.script", "ScriptEngineManager", True, "getEngineByExtension", "(String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["javax.script", "ScriptEngineManager", True, "getEngineByMimeType", "(String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["javax.script", "ScriptEngineManager", True, "getEngineByName", "(String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["javax.script", "ScriptEngineManager", True, "getEngineFactories", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.script", "ScriptEngineManager", True, "put", "(String,Object)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.script", "ScriptEngineManager", True, "put", "(String,Object)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.script", "ScriptEngineManager", True, "put", "(String,Object)", "", "Argument[0]", "Argument[this].SyntheticField[javax.script.ScriptEngineManager.globalScope].MapKey", "value", "dfc-generated"]
+      - ["javax.script", "ScriptEngineManager", True, "put", "(String,Object)", "", "Argument[1]", "Argument[this].SyntheticField[javax.script.ScriptEngineManager.globalScope].MapValue", "value", "dfc-generated"]
       - ["javax.script", "ScriptEngineManager", True, "registerEngineExtension", "(String,ScriptEngineFactory)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["javax.script", "ScriptEngineManager", True, "registerEngineExtension", "(String,ScriptEngineFactory)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
       - ["javax.script", "ScriptEngineManager", True, "registerEngineMimeType", "(String,ScriptEngineFactory)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["javax.script", "ScriptEngineManager", True, "registerEngineMimeType", "(String,ScriptEngineFactory)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
       - ["javax.script", "ScriptEngineManager", True, "registerEngineName", "(String,ScriptEngineFactory)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["javax.script", "ScriptEngineManager", True, "registerEngineName", "(String,ScriptEngineFactory)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.script", "ScriptEngineManager", True, "setBindings", "(Bindings)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
+      - ["javax.script", "ScriptEngineManager", True, "setBindings", "(Bindings)", "", "Argument[0]", "Argument[this].SyntheticField[javax.script.ScriptEngineManager.globalScope]", "value", "dfc-generated"]
       - ["javax.script", "ScriptException", True, "ScriptException", "(Exception)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["javax.script", "ScriptException", True, "ScriptException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.script", "ScriptException", True, "ScriptException", "(String,String,int)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.script", "ScriptException", True, "ScriptException", "(String,String,int)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.script", "ScriptException", True, "ScriptException", "(String,String,int,int)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.script", "ScriptException", True, "ScriptException", "(String,String,int,int)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.script", "ScriptException", True, "getFileName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.script", "ScriptException", True, "ScriptException", "(String,String,int)", "", "Argument[1]", "Argument[this].SyntheticField[javax.script.ScriptException.fileName]", "value", "dfc-generated"]
+      - ["javax.script", "ScriptException", True, "ScriptException", "(String,String,int,int)", "", "Argument[1]", "Argument[this].SyntheticField[javax.script.ScriptException.fileName]", "value", "dfc-generated"]
+      - ["javax.script", "ScriptException", True, "getFileName", "()", "", "Argument[this].SyntheticField[javax.script.ScriptException.fileName]", "ReturnValue", "value", "dfc-generated"]
       - ["javax.script", "SimpleBindings", True, "SimpleBindings", "(Map)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
+      - ["javax.script", "SimpleScriptContext", True, "getAttribute", "(String)", "", "Argument[this].SyntheticField[javax.script.SimpleScriptContext.engineScope].MapValue", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.script", "SimpleScriptContext", True, "getAttribute", "(String)", "", "Argument[this].SyntheticField[javax.script.SimpleScriptContext.globalScope].MapValue", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.script", "SimpleScriptContext", True, "getAttribute", "(String,int)", "", "Argument[this].SyntheticField[javax.script.SimpleScriptContext.engineScope].MapValue", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.script", "SimpleScriptContext", True, "getAttribute", "(String,int)", "", "Argument[this].SyntheticField[javax.script.SimpleScriptContext.globalScope].MapValue", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.script", "SimpleScriptContext", True, "getBindings", "(int)", "", "Argument[this].SyntheticField[javax.script.SimpleScriptContext.engineScope]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.script", "SimpleScriptContext", True, "getBindings", "(int)", "", "Argument[this].SyntheticField[javax.script.SimpleScriptContext.globalScope]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.script", "SimpleScriptContext", True, "getErrorWriter", "()", "", "Argument[this].SyntheticField[javax.script.SimpleScriptContext.errorWriter]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.script", "SimpleScriptContext", True, "getReader", "()", "", "Argument[this].SyntheticField[javax.script.SimpleScriptContext.reader]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.script", "SimpleScriptContext", True, "getWriter", "()", "", "Argument[this].SyntheticField[javax.script.SimpleScriptContext.writer]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.script", "SimpleScriptContext", True, "removeAttribute", "(String,int)", "", "Argument[this].SyntheticField[javax.script.SimpleScriptContext.engineScope].MapValue", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.script", "SimpleScriptContext", True, "removeAttribute", "(String,int)", "", "Argument[this].SyntheticField[javax.script.SimpleScriptContext.globalScope].MapValue", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.script", "SimpleScriptContext", True, "setAttribute", "(String,Object,int)", "", "Argument[0]", "Argument[this].SyntheticField[javax.script.SimpleScriptContext.engineScope].MapKey", "value", "dfc-generated"]
+      - ["javax.script", "SimpleScriptContext", True, "setAttribute", "(String,Object,int)", "", "Argument[0]", "Argument[this].SyntheticField[javax.script.SimpleScriptContext.globalScope].MapKey", "value", "dfc-generated"]
+      - ["javax.script", "SimpleScriptContext", True, "setAttribute", "(String,Object,int)", "", "Argument[1]", "Argument[this].SyntheticField[javax.script.SimpleScriptContext.engineScope].MapValue", "value", "dfc-generated"]
+      - ["javax.script", "SimpleScriptContext", True, "setAttribute", "(String,Object,int)", "", "Argument[1]", "Argument[this].SyntheticField[javax.script.SimpleScriptContext.globalScope].MapValue", "value", "dfc-generated"]
+      - ["javax.script", "SimpleScriptContext", True, "setBindings", "(Bindings,int)", "", "Argument[0]", "Argument[this].SyntheticField[javax.script.SimpleScriptContext.engineScope]", "value", "dfc-generated"]
+      - ["javax.script", "SimpleScriptContext", True, "setBindings", "(Bindings,int)", "", "Argument[0]", "Argument[this].SyntheticField[javax.script.SimpleScriptContext.globalScope]", "value", "dfc-generated"]
+      - ["javax.script", "SimpleScriptContext", True, "setErrorWriter", "(Writer)", "", "Argument[0]", "Argument[this].SyntheticField[javax.script.SimpleScriptContext.errorWriter]", "value", "dfc-generated"]
+      - ["javax.script", "SimpleScriptContext", True, "setReader", "(Reader)", "", "Argument[0]", "Argument[this].SyntheticField[javax.script.SimpleScriptContext.reader]", "value", "dfc-generated"]
+      - ["javax.script", "SimpleScriptContext", True, "setWriter", "(Writer)", "", "Argument[0]", "Argument[this].SyntheticField[javax.script.SimpleScriptContext.writer]", "value", "dfc-generated"]
   - addsTo:
       pack: codeql/java-all
       extensible: neutralModel
     data:
+      - ["javax.script", "AbstractScriptEngine", "eval", "(Reader)", "summary", "df-generated"]
+      - ["javax.script", "AbstractScriptEngine", "eval", "(Reader,Bindings)", "summary", "df-generated"]
+      - ["javax.script", "AbstractScriptEngine", "eval", "(String)", "summary", "df-generated"]
+      - ["javax.script", "AbstractScriptEngine", "eval", "(String,Bindings)", "summary", "df-generated"]
+      - ["javax.script", "AbstractScriptEngine", "put", "(String,Object)", "summary", "df-generated"]
       - ["javax.script", "CompiledScript", "eval", "()", "summary", "df-generated"]
       - ["javax.script", "CompiledScript", "eval", "(Bindings)", "summary", "df-generated"]
       - ["javax.script", "CompiledScript", "eval", "(ScriptContext)", "summary", "df-generated"]
       - ["javax.script", "CompiledScript", "getEngine", "()", "summary", "df-generated"]
-      - ["javax.script", "ScriptContext", "getAttributesScope", "(String)", "summary", "df-generated"]
-      - ["javax.script", "ScriptContext", "getScopes", "()", "summary", "df-generated"]
-      - ["javax.script", "ScriptEngine", "eval", "(Reader)", "summary", "df-generated"]
-      - ["javax.script", "ScriptEngine", "eval", "(Reader,Bindings)", "summary", "df-generated"]
-      - ["javax.script", "ScriptEngine", "eval", "(String)", "summary", "df-generated"]
-      - ["javax.script", "ScriptEngine", "eval", "(String,Bindings)", "summary", "df-generated"]
-      - ["javax.script", "ScriptEngine", "put", "(String,Object)", "summary", "df-generated"]
       - ["javax.script", "ScriptEngineManager", "ScriptEngineManager", "(ClassLoader)", "summary", "df-generated"]
       - ["javax.script", "ScriptException", "getColumnNumber", "()", "summary", "df-generated"]
       - ["javax.script", "ScriptException", "getLineNumber", "()", "summary", "df-generated"]
+      - ["javax.script", "SimpleBindings", "containsValue", "(Object)", "summary", "df-generated"]
+      - ["javax.script", "SimpleScriptContext", "getAttributesScope", "(String)", "summary", "df-generated"]
+      - ["javax.script", "SimpleScriptContext", "getScopes", "()", "summary", "df-generated"]
diff --git a/java/ql/lib/ext/generated/javax.security.auth.callback.model.yml b/java/ql/lib/ext/generated/javax.security.auth.callback.model.yml
index ffb0e36d7b1..a13a027c555 100644
--- a/java/ql/lib/ext/generated/javax.security.auth.callback.model.yml
+++ b/java/ql/lib/ext/generated/javax.security.auth.callback.model.yml
@@ -4,47 +4,45 @@ extensions:
       pack: codeql/java-all
       extensible: summaryModel
     data:
-      - ["javax.security.auth.callback", "ChoiceCallback", True, "ChoiceCallback", "(String,String[],int,boolean)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.security.auth.callback", "ChoiceCallback", True, "ChoiceCallback", "(String,String[],int,boolean)", "", "Argument[1].ArrayElement", "Argument[this]", "taint", "df-generated"]
-      - ["javax.security.auth.callback", "ChoiceCallback", True, "getChoices", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.security.auth.callback", "ChoiceCallback", True, "getPrompt", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.security.auth.callback", "ConfirmationCallback", True, "ConfirmationCallback", "(String,int,String[],int)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.security.auth.callback", "ConfirmationCallback", True, "ConfirmationCallback", "(String,int,String[],int)", "", "Argument[2].ArrayElement", "Argument[this]", "taint", "df-generated"]
-      - ["javax.security.auth.callback", "ConfirmationCallback", True, "ConfirmationCallback", "(String,int,int,int)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.security.auth.callback", "ConfirmationCallback", True, "ConfirmationCallback", "(int,String[],int)", "", "Argument[1].ArrayElement", "Argument[this]", "taint", "df-generated"]
-      - ["javax.security.auth.callback", "ConfirmationCallback", True, "getOptions", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.security.auth.callback", "ConfirmationCallback", True, "getPrompt", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.security.auth.callback", "LanguageCallback", True, "getLocale", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.security.auth.callback", "LanguageCallback", True, "setLocale", "(Locale)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.security.auth.callback", "NameCallback", True, "NameCallback", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.security.auth.callback", "NameCallback", True, "NameCallback", "(String,String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.security.auth.callback", "NameCallback", True, "NameCallback", "(String,String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.security.auth.callback", "NameCallback", True, "getDefaultName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.security.auth.callback", "NameCallback", True, "getName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.security.auth.callback", "NameCallback", True, "getPrompt", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.security.auth.callback", "NameCallback", True, "setName", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.security.auth.callback", "PasswordCallback", True, "PasswordCallback", "(String,boolean)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.security.auth.callback", "PasswordCallback", True, "getPassword", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.security.auth.callback", "PasswordCallback", True, "getPrompt", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.security.auth.callback", "PasswordCallback", True, "setPassword", "(char[])", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.security.auth.callback", "TextInputCallback", True, "TextInputCallback", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.security.auth.callback", "TextInputCallback", True, "TextInputCallback", "(String,String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.security.auth.callback", "TextInputCallback", True, "TextInputCallback", "(String,String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.security.auth.callback", "TextInputCallback", True, "getDefaultText", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.security.auth.callback", "TextInputCallback", True, "getPrompt", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.security.auth.callback", "TextInputCallback", True, "getText", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.security.auth.callback", "TextInputCallback", True, "setText", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.security.auth.callback", "TextOutputCallback", True, "TextOutputCallback", "(int,String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.security.auth.callback", "TextOutputCallback", True, "getMessage", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.security.auth.callback", "UnsupportedCallbackException", True, "UnsupportedCallbackException", "(Callback)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.security.auth.callback", "UnsupportedCallbackException", True, "UnsupportedCallbackException", "(Callback,String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.security.auth.callback", "UnsupportedCallbackException", True, "UnsupportedCallbackException", "(Callback,String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.security.auth.callback", "UnsupportedCallbackException", True, "getCallback", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.security.auth.callback", "ChoiceCallback", True, "ChoiceCallback", "(String,String[],int,boolean)", "", "Argument[0]", "Argument[this].SyntheticField[javax.security.auth.callback.ChoiceCallback.prompt]", "value", "dfc-generated"]
+      - ["javax.security.auth.callback", "ChoiceCallback", True, "ChoiceCallback", "(String,String[],int,boolean)", "", "Argument[1]", "Argument[this].SyntheticField[javax.security.auth.callback.ChoiceCallback.choices]", "value", "dfc-generated"]
+      - ["javax.security.auth.callback", "ChoiceCallback", True, "getChoices", "()", "", "Argument[this].SyntheticField[javax.security.auth.callback.ChoiceCallback.choices]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.security.auth.callback", "ChoiceCallback", True, "getPrompt", "()", "", "Argument[this].SyntheticField[javax.security.auth.callback.ChoiceCallback.prompt]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.security.auth.callback", "ConfirmationCallback", True, "ConfirmationCallback", "(String,int,String[],int)", "", "Argument[0]", "Argument[this].SyntheticField[javax.security.auth.callback.ConfirmationCallback.prompt]", "value", "dfc-generated"]
+      - ["javax.security.auth.callback", "ConfirmationCallback", True, "ConfirmationCallback", "(String,int,String[],int)", "", "Argument[2]", "Argument[this].SyntheticField[javax.security.auth.callback.ConfirmationCallback.options]", "value", "dfc-generated"]
+      - ["javax.security.auth.callback", "ConfirmationCallback", True, "ConfirmationCallback", "(String,int,int,int)", "", "Argument[0]", "Argument[this].SyntheticField[javax.security.auth.callback.ConfirmationCallback.prompt]", "value", "dfc-generated"]
+      - ["javax.security.auth.callback", "ConfirmationCallback", True, "ConfirmationCallback", "(int,String[],int)", "", "Argument[1]", "Argument[this].SyntheticField[javax.security.auth.callback.ConfirmationCallback.options]", "value", "dfc-generated"]
+      - ["javax.security.auth.callback", "ConfirmationCallback", True, "getOptions", "()", "", "Argument[this].SyntheticField[javax.security.auth.callback.ConfirmationCallback.options]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.security.auth.callback", "ConfirmationCallback", True, "getPrompt", "()", "", "Argument[this].SyntheticField[javax.security.auth.callback.ConfirmationCallback.prompt]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.security.auth.callback", "LanguageCallback", True, "getLocale", "()", "", "Argument[this].SyntheticField[javax.security.auth.callback.LanguageCallback.locale]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.security.auth.callback", "LanguageCallback", True, "setLocale", "(Locale)", "", "Argument[0]", "Argument[this].SyntheticField[javax.security.auth.callback.LanguageCallback.locale]", "value", "dfc-generated"]
+      - ["javax.security.auth.callback", "NameCallback", True, "NameCallback", "(String)", "", "Argument[0]", "Argument[this].SyntheticField[javax.security.auth.callback.NameCallback.prompt]", "value", "dfc-generated"]
+      - ["javax.security.auth.callback", "NameCallback", True, "NameCallback", "(String,String)", "", "Argument[0]", "Argument[this].SyntheticField[javax.security.auth.callback.NameCallback.prompt]", "value", "dfc-generated"]
+      - ["javax.security.auth.callback", "NameCallback", True, "NameCallback", "(String,String)", "", "Argument[1]", "Argument[this].SyntheticField[javax.security.auth.callback.NameCallback.defaultName]", "value", "dfc-generated"]
+      - ["javax.security.auth.callback", "NameCallback", True, "getDefaultName", "()", "", "Argument[this].SyntheticField[javax.security.auth.callback.NameCallback.defaultName]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.security.auth.callback", "NameCallback", True, "getName", "()", "", "Argument[this].SyntheticField[javax.security.auth.callback.NameCallback.inputName]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.security.auth.callback", "NameCallback", True, "getPrompt", "()", "", "Argument[this].SyntheticField[javax.security.auth.callback.NameCallback.prompt]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.security.auth.callback", "NameCallback", True, "setName", "(String)", "", "Argument[0]", "Argument[this].SyntheticField[javax.security.auth.callback.NameCallback.inputName]", "value", "dfc-generated"]
+      - ["javax.security.auth.callback", "PasswordCallback", True, "PasswordCallback", "(String,boolean)", "", "Argument[0]", "Argument[this].SyntheticField[javax.security.auth.callback.PasswordCallback.prompt]", "value", "dfc-generated"]
+      - ["javax.security.auth.callback", "PasswordCallback", True, "getPassword", "()", "", "Argument[this].SyntheticField[javax.security.auth.callback.PasswordCallback.inputPassword]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.security.auth.callback", "PasswordCallback", True, "getPrompt", "()", "", "Argument[this].SyntheticField[javax.security.auth.callback.PasswordCallback.prompt]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.security.auth.callback", "PasswordCallback", True, "setPassword", "(char[])", "", "Argument[0]", "Argument[this].SyntheticField[javax.security.auth.callback.PasswordCallback.inputPassword]", "value", "dfc-generated"]
+      - ["javax.security.auth.callback", "TextInputCallback", True, "TextInputCallback", "(String)", "", "Argument[0]", "Argument[this].SyntheticField[javax.security.auth.callback.TextInputCallback.prompt]", "value", "dfc-generated"]
+      - ["javax.security.auth.callback", "TextInputCallback", True, "TextInputCallback", "(String,String)", "", "Argument[0]", "Argument[this].SyntheticField[javax.security.auth.callback.TextInputCallback.prompt]", "value", "dfc-generated"]
+      - ["javax.security.auth.callback", "TextInputCallback", True, "TextInputCallback", "(String,String)", "", "Argument[1]", "Argument[this].SyntheticField[javax.security.auth.callback.TextInputCallback.defaultText]", "value", "dfc-generated"]
+      - ["javax.security.auth.callback", "TextInputCallback", True, "getDefaultText", "()", "", "Argument[this].SyntheticField[javax.security.auth.callback.TextInputCallback.defaultText]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.security.auth.callback", "TextInputCallback", True, "getPrompt", "()", "", "Argument[this].SyntheticField[javax.security.auth.callback.TextInputCallback.prompt]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.security.auth.callback", "TextInputCallback", True, "getText", "()", "", "Argument[this].SyntheticField[javax.security.auth.callback.TextInputCallback.inputText]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.security.auth.callback", "TextInputCallback", True, "setText", "(String)", "", "Argument[0]", "Argument[this].SyntheticField[javax.security.auth.callback.TextInputCallback.inputText]", "value", "dfc-generated"]
+      - ["javax.security.auth.callback", "TextOutputCallback", True, "TextOutputCallback", "(int,String)", "", "Argument[1]", "Argument[this].SyntheticField[javax.security.auth.callback.TextOutputCallback.message]", "value", "dfc-generated"]
+      - ["javax.security.auth.callback", "TextOutputCallback", True, "getMessage", "()", "", "Argument[this].SyntheticField[javax.security.auth.callback.TextOutputCallback.message]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.security.auth.callback", "UnsupportedCallbackException", True, "UnsupportedCallbackException", "(Callback)", "", "Argument[0]", "Argument[this].SyntheticField[javax.security.auth.callback.UnsupportedCallbackException.callback]", "value", "dfc-generated"]
+      - ["javax.security.auth.callback", "UnsupportedCallbackException", True, "UnsupportedCallbackException", "(Callback,String)", "", "Argument[0]", "Argument[this].SyntheticField[javax.security.auth.callback.UnsupportedCallbackException.callback]", "value", "dfc-generated"]
+      - ["javax.security.auth.callback", "UnsupportedCallbackException", True, "getCallback", "()", "", "Argument[this].SyntheticField[javax.security.auth.callback.UnsupportedCallbackException.callback]", "ReturnValue", "value", "dfc-generated"]
   - addsTo:
       pack: codeql/java-all
       extensible: neutralModel
     data:
-      - ["javax.security.auth.callback", "CallbackHandler", "handle", "(Callback[])", "summary", "df-generated"]
       - ["javax.security.auth.callback", "ChoiceCallback", "allowMultipleSelections", "()", "summary", "df-generated"]
       - ["javax.security.auth.callback", "ChoiceCallback", "getDefaultChoice", "()", "summary", "df-generated"]
       - ["javax.security.auth.callback", "ChoiceCallback", "getSelectedIndexes", "()", "summary", "df-generated"]
diff --git a/java/ql/lib/ext/generated/javax.security.auth.kerberos.model.yml b/java/ql/lib/ext/generated/javax.security.auth.kerberos.model.yml
index 8be4b007b84..c3d309cca7b 100644
--- a/java/ql/lib/ext/generated/javax.security.auth.kerberos.model.yml
+++ b/java/ql/lib/ext/generated/javax.security.auth.kerberos.model.yml
@@ -6,52 +6,69 @@ extensions:
     data:
       - ["javax.security.auth.kerberos", "DelegationPermission", False, "DelegationPermission", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["javax.security.auth.kerberos", "DelegationPermission", False, "DelegationPermission", "(String,String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.security.auth.kerberos", "EncryptionKey", False, "EncryptionKey", "(byte[],int)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.security.auth.kerberos", "KerberosCredMessage", False, "KerberosCredMessage", "(KerberosPrincipal,KerberosPrincipal,byte[])", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.security.auth.kerberos", "KerberosCredMessage", False, "KerberosCredMessage", "(KerberosPrincipal,KerberosPrincipal,byte[])", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.security.auth.kerberos", "KerberosCredMessage", False, "KerberosCredMessage", "(KerberosPrincipal,KerberosPrincipal,byte[])", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.security.auth.kerberos", "KerberosCredMessage", False, "getEncoded", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.security.auth.kerberos", "KerberosCredMessage", False, "getRecipient", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.security.auth.kerberos", "KerberosCredMessage", False, "getSender", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.security.auth.kerberos", "KerberosKey", True, "KerberosKey", "(KerberosPrincipal,byte[],int,int)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.security.auth.kerberos", "KerberosKey", True, "KerberosKey", "(KerberosPrincipal,byte[],int,int)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.security.auth.kerberos", "KerberosKey", True, "KerberosKey", "(KerberosPrincipal,char[],String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.security.auth.kerberos", "KerberosKey", True, "getPrincipal", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.security.auth.kerberos", "KerberosPrincipal", False, "KerberosPrincipal", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.security.auth.kerberos", "KerberosPrincipal", False, "KerberosPrincipal", "(String,int)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.security.auth.kerberos", "KerberosPrincipal", False, "getRealm", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.security.auth.kerberos", "KerberosTicket", True, "KerberosTicket", "(byte[],KerberosPrincipal,KerberosPrincipal,byte[],int,boolean[],Date,Date,Date,Date,InetAddress[])", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.security.auth.kerberos", "KerberosTicket", True, "KerberosTicket", "(byte[],KerberosPrincipal,KerberosPrincipal,byte[],int,boolean[],Date,Date,Date,Date,InetAddress[])", "", "Argument[10].ArrayElement", "Argument[this]", "taint", "df-generated"]
-      - ["javax.security.auth.kerberos", "KerberosTicket", True, "KerberosTicket", "(byte[],KerberosPrincipal,KerberosPrincipal,byte[],int,boolean[],Date,Date,Date,Date,InetAddress[])", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.security.auth.kerberos", "KerberosTicket", True, "KerberosTicket", "(byte[],KerberosPrincipal,KerberosPrincipal,byte[],int,boolean[],Date,Date,Date,Date,InetAddress[])", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.security.auth.kerberos", "KerberosTicket", True, "KerberosTicket", "(byte[],KerberosPrincipal,KerberosPrincipal,byte[],int,boolean[],Date,Date,Date,Date,InetAddress[])", "", "Argument[3]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.security.auth.kerberos", "EncryptionKey", False, "EncryptionKey", "(byte[],int)", "", "Argument[0]", "Argument[this].SyntheticField[javax.security.auth.kerberos.EncryptionKey.key].SyntheticField[javax.security.auth.kerberos.KeyImpl.keyBytes]", "value", "dfc-generated"]
+      - ["javax.security.auth.kerberos", "EncryptionKey", False, "getEncoded", "()", "", "Argument[this].SyntheticField[javax.security.auth.kerberos.EncryptionKey.key].SyntheticField[javax.security.auth.kerberos.KeyImpl.keyBytes]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.security.auth.kerberos", "KerberosCredMessage", False, "KerberosCredMessage", "(KerberosPrincipal,KerberosPrincipal,byte[])", "", "Argument[0]", "Argument[this].SyntheticField[javax.security.auth.kerberos.KerberosCredMessage.sender]", "value", "dfc-generated"]
+      - ["javax.security.auth.kerberos", "KerberosCredMessage", False, "KerberosCredMessage", "(KerberosPrincipal,KerberosPrincipal,byte[])", "", "Argument[1]", "Argument[this].SyntheticField[javax.security.auth.kerberos.KerberosCredMessage.recipient]", "value", "dfc-generated"]
+      - ["javax.security.auth.kerberos", "KerberosCredMessage", False, "KerberosCredMessage", "(KerberosPrincipal,KerberosPrincipal,byte[])", "", "Argument[2]", "Argument[this].SyntheticField[javax.security.auth.kerberos.KerberosCredMessage.message]", "value", "dfc-generated"]
+      - ["javax.security.auth.kerberos", "KerberosCredMessage", False, "getEncoded", "()", "", "Argument[this].SyntheticField[javax.security.auth.kerberos.KerberosCredMessage.message]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.security.auth.kerberos", "KerberosCredMessage", False, "getRecipient", "()", "", "Argument[this].SyntheticField[javax.security.auth.kerberos.KerberosCredMessage.recipient]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.security.auth.kerberos", "KerberosCredMessage", False, "getSender", "()", "", "Argument[this].SyntheticField[javax.security.auth.kerberos.KerberosCredMessage.sender]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.security.auth.kerberos", "KerberosKey", True, "KerberosKey", "(KerberosPrincipal,byte[],int,int)", "", "Argument[0]", "Argument[this].SyntheticField[javax.security.auth.kerberos.KerberosKey.principal]", "value", "dfc-generated"]
+      - ["javax.security.auth.kerberos", "KerberosKey", True, "KerberosKey", "(KerberosPrincipal,byte[],int,int)", "", "Argument[1]", "Argument[this].SyntheticField[javax.security.auth.kerberos.KerberosKey.key].SyntheticField[javax.security.auth.kerberos.KeyImpl.keyBytes]", "value", "dfc-generated"]
+      - ["javax.security.auth.kerberos", "KerberosKey", True, "KerberosKey", "(KerberosPrincipal,char[],String)", "", "Argument[0]", "Argument[this].SyntheticField[javax.security.auth.kerberos.KerberosKey.principal]", "value", "dfc-generated"]
+      - ["javax.security.auth.kerberos", "KerberosKey", True, "getEncoded", "()", "", "Argument[this].SyntheticField[javax.security.auth.kerberos.KerberosKey.key].SyntheticField[javax.security.auth.kerberos.KeyImpl.keyBytes]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.security.auth.kerberos", "KerberosKey", True, "getPrincipal", "()", "", "Argument[this].SyntheticField[javax.security.auth.kerberos.KerberosKey.principal]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.security.auth.kerberos", "KerberosPrincipal", False, "KerberosPrincipal", "(String)", "", "Argument[0]", "Argument[this].SyntheticField[javax.security.auth.kerberos.KerberosPrincipal.fullName]", "taint", "dfc-generated"]
+      - ["javax.security.auth.kerberos", "KerberosPrincipal", False, "KerberosPrincipal", "(String)", "", "Argument[0]", "Argument[this].SyntheticField[javax.security.auth.kerberos.KerberosPrincipal.realm]", "taint", "dfc-generated"]
+      - ["javax.security.auth.kerberos", "KerberosPrincipal", False, "KerberosPrincipal", "(String,int)", "", "Argument[0]", "Argument[this].SyntheticField[javax.security.auth.kerberos.KerberosPrincipal.fullName]", "taint", "dfc-generated"]
+      - ["javax.security.auth.kerberos", "KerberosPrincipal", False, "KerberosPrincipal", "(String,int)", "", "Argument[0]", "Argument[this].SyntheticField[javax.security.auth.kerberos.KerberosPrincipal.realm]", "taint", "dfc-generated"]
+      - ["javax.security.auth.kerberos", "KerberosPrincipal", False, "getName", "()", "", "Argument[this].SyntheticField[javax.security.auth.kerberos.KerberosPrincipal.fullName]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.security.auth.kerberos", "KerberosPrincipal", False, "getRealm", "()", "", "Argument[this].SyntheticField[javax.security.auth.kerberos.KerberosPrincipal.realm]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.security.auth.kerberos", "KerberosTicket", True, "KerberosTicket", "(byte[],KerberosPrincipal,KerberosPrincipal,byte[],int,boolean[],Date,Date,Date,Date,InetAddress[])", "", "Argument[0]", "Argument[this].SyntheticField[javax.security.auth.kerberos.KerberosTicket.asn1Encoding]", "value", "dfc-generated"]
+      - ["javax.security.auth.kerberos", "KerberosTicket", True, "KerberosTicket", "(byte[],KerberosPrincipal,KerberosPrincipal,byte[],int,boolean[],Date,Date,Date,Date,InetAddress[])", "", "Argument[10]", "Argument[this].SyntheticField[javax.security.auth.kerberos.KerberosTicket.clientAddresses]", "value", "dfc-generated"]
+      - ["javax.security.auth.kerberos", "KerberosTicket", True, "KerberosTicket", "(byte[],KerberosPrincipal,KerberosPrincipal,byte[],int,boolean[],Date,Date,Date,Date,InetAddress[])", "", "Argument[1]", "Argument[this].SyntheticField[javax.security.auth.kerberos.KerberosTicket.client]", "value", "dfc-generated"]
+      - ["javax.security.auth.kerberos", "KerberosTicket", True, "KerberosTicket", "(byte[],KerberosPrincipal,KerberosPrincipal,byte[],int,boolean[],Date,Date,Date,Date,InetAddress[])", "", "Argument[2]", "Argument[this].SyntheticField[javax.security.auth.kerberos.KerberosTicket.server]", "value", "dfc-generated"]
+      - ["javax.security.auth.kerberos", "KerberosTicket", True, "KerberosTicket", "(byte[],KerberosPrincipal,KerberosPrincipal,byte[],int,boolean[],Date,Date,Date,Date,InetAddress[])", "", "Argument[3]", "Argument[this].SyntheticField[javax.security.auth.kerberos.KerberosTicket.sessionKey].SyntheticField[javax.security.auth.kerberos.KeyImpl.keyBytes]", "value", "dfc-generated"]
       - ["javax.security.auth.kerberos", "KerberosTicket", True, "getAuthTime", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.security.auth.kerberos", "KerberosTicket", True, "getClient", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.security.auth.kerberos", "KerberosTicket", True, "getClientAddresses", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.security.auth.kerberos", "KerberosTicket", True, "getEncoded", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.security.auth.kerberos", "KerberosTicket", True, "getClient", "()", "", "Argument[this].SyntheticField[javax.security.auth.kerberos.KerberosTicket.client]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.security.auth.kerberos", "KerberosTicket", True, "getClientAddresses", "()", "", "Argument[this].SyntheticField[javax.security.auth.kerberos.KerberosTicket.clientAddresses]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.security.auth.kerberos", "KerberosTicket", True, "getEncoded", "()", "", "Argument[this].SyntheticField[javax.security.auth.kerberos.KerberosTicket.asn1Encoding]", "ReturnValue", "value", "dfc-generated"]
       - ["javax.security.auth.kerberos", "KerberosTicket", True, "getEndTime", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["javax.security.auth.kerberos", "KerberosTicket", True, "getRenewTill", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.security.auth.kerberos", "KerberosTicket", True, "getServer", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.security.auth.kerberos", "KerberosTicket", True, "getSessionKey", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.security.auth.kerberos", "KerberosTicket", True, "getServer", "()", "", "Argument[this].SyntheticField[javax.security.auth.kerberos.KerberosTicket.server]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.security.auth.kerberos", "KerberosTicket", True, "getSessionKey", "()", "", "Argument[this].SyntheticField[javax.security.auth.kerberos.KerberosTicket.sessionKey].SyntheticField[javax.security.auth.kerberos.KeyImpl.keyBytes]", "ReturnValue.SyntheticField[javax.security.auth.kerberos.EncryptionKey.key].SyntheticField[javax.security.auth.kerberos.KeyImpl.keyBytes]", "value", "dfc-generated"]
       - ["javax.security.auth.kerberos", "KerberosTicket", True, "getStartTime", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["javax.security.auth.kerberos", "KeyTab", False, "getInstance", "(File)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.security.auth.kerberos", "KeyTab", False, "getInstance", "(KerberosPrincipal)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.security.auth.kerberos", "KeyTab", False, "getInstance", "(KerberosPrincipal,File)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.security.auth.kerberos", "KeyTab", False, "getInstance", "(KerberosPrincipal,File)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.security.auth.kerberos", "KeyTab", False, "getInstance", "(KerberosPrincipal)", "", "Argument[0]", "ReturnValue.SyntheticField[javax.security.auth.kerberos.KeyTab.princ]", "value", "dfc-generated"]
+      - ["javax.security.auth.kerberos", "KeyTab", False, "getInstance", "(KerberosPrincipal,File)", "", "Argument[0]", "ReturnValue.SyntheticField[javax.security.auth.kerberos.KeyTab.princ]", "value", "dfc-generated"]
       - ["javax.security.auth.kerberos", "KeyTab", False, "getKeys", "(KerberosPrincipal)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.security.auth.kerberos", "KeyTab", False, "getPrincipal", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.security.auth.kerberos", "KeyTab", False, "getPrincipal", "()", "", "Argument[this].SyntheticField[javax.security.auth.kerberos.KeyTab.princ]", "ReturnValue", "value", "dfc-generated"]
       - ["javax.security.auth.kerberos", "KeyTab", False, "getUnboundInstance", "(File)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.security.auth.kerberos", "ServicePermission", False, "ServicePermission", "(String,String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.security.auth.kerberos", "ServicePermission", False, "ServicePermission", "(String,String)", "", "Argument[0]", "Argument[this]", "taint", "dfc-generated"]
   - addsTo:
       pack: codeql/java-all
       extensible: neutralModel
     data:
+      - ["javax.security.auth.kerberos", "DelegationPermission", "implies", "(Permission)", "summary", "df-generated"]
+      - ["javax.security.auth.kerberos", "DelegationPermission", "newPermissionCollection", "()", "summary", "df-generated"]
+      - ["javax.security.auth.kerberos", "EncryptionKey", "destroy", "()", "summary", "df-generated"]
+      - ["javax.security.auth.kerberos", "EncryptionKey", "getFormat", "()", "summary", "df-generated"]
       - ["javax.security.auth.kerberos", "EncryptionKey", "getKeyType", "()", "summary", "df-generated"]
+      - ["javax.security.auth.kerberos", "EncryptionKey", "isDestroyed", "()", "summary", "df-generated"]
+      - ["javax.security.auth.kerberos", "KerberosCredMessage", "destroy", "()", "summary", "df-generated"]
+      - ["javax.security.auth.kerberos", "KerberosCredMessage", "isDestroyed", "()", "summary", "df-generated"]
+      - ["javax.security.auth.kerberos", "KerberosKey", "destroy", "()", "summary", "df-generated"]
+      - ["javax.security.auth.kerberos", "KerberosKey", "getFormat", "()", "summary", "df-generated"]
       - ["javax.security.auth.kerberos", "KerberosKey", "getKeyType", "()", "summary", "df-generated"]
       - ["javax.security.auth.kerberos", "KerberosKey", "getVersionNumber", "()", "summary", "df-generated"]
+      - ["javax.security.auth.kerberos", "KerberosKey", "isDestroyed", "()", "summary", "df-generated"]
       - ["javax.security.auth.kerberos", "KerberosPrincipal", "getNameType", "()", "summary", "df-generated"]
+      - ["javax.security.auth.kerberos", "KerberosTicket", "destroy", "()", "summary", "df-generated"]
       - ["javax.security.auth.kerberos", "KerberosTicket", "getFlags", "()", "summary", "df-generated"]
       - ["javax.security.auth.kerberos", "KerberosTicket", "getSessionKeyType", "()", "summary", "df-generated"]
+      - ["javax.security.auth.kerberos", "KerberosTicket", "isCurrent", "()", "summary", "df-generated"]
+      - ["javax.security.auth.kerberos", "KerberosTicket", "isDestroyed", "()", "summary", "df-generated"]
       - ["javax.security.auth.kerberos", "KerberosTicket", "isForwardable", "()", "summary", "df-generated"]
       - ["javax.security.auth.kerberos", "KerberosTicket", "isForwarded", "()", "summary", "df-generated"]
       - ["javax.security.auth.kerberos", "KerberosTicket", "isInitial", "()", "summary", "df-generated"]
@@ -59,7 +76,10 @@ extensions:
       - ["javax.security.auth.kerberos", "KerberosTicket", "isProxiable", "()", "summary", "df-generated"]
       - ["javax.security.auth.kerberos", "KerberosTicket", "isProxy", "()", "summary", "df-generated"]
       - ["javax.security.auth.kerberos", "KerberosTicket", "isRenewable", "()", "summary", "df-generated"]
+      - ["javax.security.auth.kerberos", "KerberosTicket", "refresh", "()", "summary", "df-generated"]
       - ["javax.security.auth.kerberos", "KeyTab", "exists", "()", "summary", "df-generated"]
       - ["javax.security.auth.kerberos", "KeyTab", "getInstance", "()", "summary", "df-generated"]
       - ["javax.security.auth.kerberos", "KeyTab", "getUnboundInstance", "()", "summary", "df-generated"]
       - ["javax.security.auth.kerberos", "KeyTab", "isBound", "()", "summary", "df-generated"]
+      - ["javax.security.auth.kerberos", "ServicePermission", "implies", "(Permission)", "summary", "df-generated"]
+      - ["javax.security.auth.kerberos", "ServicePermission", "newPermissionCollection", "()", "summary", "df-generated"]
diff --git a/java/ql/lib/ext/generated/javax.security.auth.login.model.yml b/java/ql/lib/ext/generated/javax.security.auth.login.model.yml
index 1779821afbf..da62938dbe5 100644
--- a/java/ql/lib/ext/generated/javax.security.auth.login.model.yml
+++ b/java/ql/lib/ext/generated/javax.security.auth.login.model.yml
@@ -8,19 +8,20 @@ extensions:
       - ["javax.security.auth.login", "AccountExpiredException", True, "AccountExpiredException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["javax.security.auth.login", "AccountLockedException", True, "AccountLockedException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["javax.security.auth.login", "AccountNotFoundException", True, "AccountNotFoundException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.security.auth.login", "AppConfigurationEntry", True, "AppConfigurationEntry", "(String,AppConfigurationEntry$LoginModuleControlFlag,Map)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.security.auth.login", "AppConfigurationEntry", True, "AppConfigurationEntry", "(String,AppConfigurationEntry$LoginModuleControlFlag,Map)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.security.auth.login", "AppConfigurationEntry", True, "AppConfigurationEntry", "(String,AppConfigurationEntry$LoginModuleControlFlag,Map)", "", "Argument[2].Element", "Argument[this]", "taint", "df-generated"]
-      - ["javax.security.auth.login", "AppConfigurationEntry", True, "getControlFlag", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.security.auth.login", "AppConfigurationEntry", True, "getLoginModuleName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.security.auth.login", "AppConfigurationEntry", True, "getOptions", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.security.auth.login", "Configuration", True, "getInstance", "(String,Configuration$Parameters)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.security.auth.login", "Configuration", True, "getInstance", "(String,Configuration$Parameters)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.security.auth.login", "Configuration", True, "getInstance", "(String,Configuration$Parameters,Provider)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.security.auth.login", "Configuration", True, "getInstance", "(String,Configuration$Parameters,Provider)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.security.auth.login", "Configuration", True, "getInstance", "(String,Configuration$Parameters,Provider)", "", "Argument[2].Element", "ReturnValue", "taint", "df-generated"]
-      - ["javax.security.auth.login", "Configuration", True, "getInstance", "(String,Configuration$Parameters,String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.security.auth.login", "Configuration", True, "getInstance", "(String,Configuration$Parameters,String)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.security.auth.login", "AppConfigurationEntry", True, "AppConfigurationEntry", "(String,AppConfigurationEntry$LoginModuleControlFlag,Map)", "", "Argument[0]", "Argument[this].SyntheticField[javax.security.auth.login.AppConfigurationEntry.loginModuleName]", "value", "dfc-generated"]
+      - ["javax.security.auth.login", "AppConfigurationEntry", True, "AppConfigurationEntry", "(String,AppConfigurationEntry$LoginModuleControlFlag,Map)", "", "Argument[1]", "Argument[this].SyntheticField[javax.security.auth.login.AppConfigurationEntry.controlFlag]", "value", "dfc-generated"]
+      - ["javax.security.auth.login", "AppConfigurationEntry", True, "AppConfigurationEntry", "(String,AppConfigurationEntry$LoginModuleControlFlag,Map)", "", "Argument[2].MapKey", "Argument[this].SyntheticField[javax.security.auth.login.AppConfigurationEntry.options].MapKey", "value", "dfc-generated"]
+      - ["javax.security.auth.login", "AppConfigurationEntry", True, "AppConfigurationEntry", "(String,AppConfigurationEntry$LoginModuleControlFlag,Map)", "", "Argument[2].MapValue", "Argument[this].SyntheticField[javax.security.auth.login.AppConfigurationEntry.options].MapValue", "value", "dfc-generated"]
+      - ["javax.security.auth.login", "AppConfigurationEntry", True, "getControlFlag", "()", "", "Argument[this].SyntheticField[javax.security.auth.login.AppConfigurationEntry.controlFlag]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.security.auth.login", "AppConfigurationEntry", True, "getLoginModuleName", "()", "", "Argument[this].SyntheticField[javax.security.auth.login.AppConfigurationEntry.loginModuleName]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.security.auth.login", "AppConfigurationEntry", True, "getOptions", "()", "", "Argument[this].SyntheticField[javax.security.auth.login.AppConfigurationEntry.options]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.security.auth.login", "Configuration", True, "getAppConfigurationEntry", "(String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.security.auth.login", "Configuration", True, "getInstance", "(String,Configuration$Parameters)", "", "Argument[0]", "ReturnValue.SyntheticField[javax.security.auth.login.Configuration$ConfigDelegate.type]", "value", "dfc-generated"]
+      - ["javax.security.auth.login", "Configuration", True, "getInstance", "(String,Configuration$Parameters)", "", "Argument[1]", "ReturnValue.SyntheticField[javax.security.auth.login.Configuration$ConfigDelegate.params]", "value", "dfc-generated"]
+      - ["javax.security.auth.login", "Configuration", True, "getInstance", "(String,Configuration$Parameters,Provider)", "", "Argument[0]", "ReturnValue.SyntheticField[javax.security.auth.login.Configuration$ConfigDelegate.type]", "value", "dfc-generated"]
+      - ["javax.security.auth.login", "Configuration", True, "getInstance", "(String,Configuration$Parameters,Provider)", "", "Argument[1]", "ReturnValue.SyntheticField[javax.security.auth.login.Configuration$ConfigDelegate.params]", "value", "dfc-generated"]
+      - ["javax.security.auth.login", "Configuration", True, "getInstance", "(String,Configuration$Parameters,String)", "", "Argument[0]", "ReturnValue.SyntheticField[javax.security.auth.login.Configuration$ConfigDelegate.type]", "value", "dfc-generated"]
+      - ["javax.security.auth.login", "Configuration", True, "getInstance", "(String,Configuration$Parameters,String)", "", "Argument[1]", "ReturnValue.SyntheticField[javax.security.auth.login.Configuration$ConfigDelegate.params]", "value", "dfc-generated"]
       - ["javax.security.auth.login", "Configuration", True, "getParameters", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["javax.security.auth.login", "Configuration", True, "getProvider", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["javax.security.auth.login", "Configuration", True, "getType", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
@@ -29,19 +30,15 @@ extensions:
       - ["javax.security.auth.login", "CredentialNotFoundException", True, "CredentialNotFoundException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["javax.security.auth.login", "FailedLoginException", True, "FailedLoginException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["javax.security.auth.login", "LoginContext", True, "LoginContext", "(String,CallbackHandler)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.security.auth.login", "LoginContext", True, "LoginContext", "(String,Subject)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.security.auth.login", "LoginContext", True, "LoginContext", "(String,Subject,CallbackHandler)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.security.auth.login", "LoginContext", True, "LoginContext", "(String,Subject,CallbackHandler)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.security.auth.login", "LoginContext", True, "LoginContext", "(String,Subject,CallbackHandler,Configuration)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.security.auth.login", "LoginContext", True, "LoginContext", "(String,Subject,CallbackHandler,Configuration)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.security.auth.login", "LoginContext", True, "LoginContext", "(String,Subject,CallbackHandler,Configuration)", "", "Argument[3]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.security.auth.login", "LoginContext", True, "getSubject", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.security.auth.login", "LoginContext", True, "LoginContext", "(String,Subject)", "", "Argument[1]", "Argument[this].SyntheticField[javax.security.auth.login.LoginContext.subject]", "value", "dfc-generated"]
+      - ["javax.security.auth.login", "LoginContext", True, "LoginContext", "(String,Subject,CallbackHandler)", "", "Argument[1]", "Argument[this].SyntheticField[javax.security.auth.login.LoginContext.subject]", "value", "dfc-generated"]
+      - ["javax.security.auth.login", "LoginContext", True, "LoginContext", "(String,Subject,CallbackHandler,Configuration)", "", "Argument[1]", "Argument[this].SyntheticField[javax.security.auth.login.LoginContext.subject]", "value", "dfc-generated"]
+      - ["javax.security.auth.login", "LoginContext", True, "getSubject", "()", "", "Argument[this].SyntheticField[javax.security.auth.login.LoginContext.subject]", "ReturnValue", "value", "dfc-generated"]
       - ["javax.security.auth.login", "LoginException", True, "LoginException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
   - addsTo:
       pack: codeql/java-all
       extensible: neutralModel
     data:
-      - ["javax.security.auth.login", "Configuration", "getAppConfigurationEntry", "(String)", "summary", "df-generated"]
       - ["javax.security.auth.login", "Configuration", "getConfiguration", "()", "summary", "df-generated"]
       - ["javax.security.auth.login", "Configuration", "refresh", "()", "summary", "df-generated"]
       - ["javax.security.auth.login", "Configuration", "setConfiguration", "(Configuration)", "summary", "df-generated"]
diff --git a/java/ql/lib/ext/generated/javax.security.auth.model.yml b/java/ql/lib/ext/generated/javax.security.auth.model.yml
index 435da160deb..48b9e84ae7d 100644
--- a/java/ql/lib/ext/generated/javax.security.auth.model.yml
+++ b/java/ql/lib/ext/generated/javax.security.auth.model.yml
@@ -4,11 +4,12 @@ extensions:
       pack: codeql/java-all
       extensible: summaryModel
     data:
-      - ["javax.security.auth", "AuthPermission", False, "AuthPermission", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.security.auth", "AuthPermission", False, "AuthPermission", "(String,String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.security.auth", "AuthPermission", False, "AuthPermission", "(String)", "", "Argument[0]", "Argument[this]", "taint", "dfc-generated"]
+      - ["javax.security.auth", "AuthPermission", False, "AuthPermission", "(String,String)", "", "Argument[0]", "Argument[this]", "taint", "dfc-generated"]
       - ["javax.security.auth", "DestroyFailedException", True, "DestroyFailedException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.security.auth", "PrivateCredentialPermission", False, "PrivateCredentialPermission", "(String,String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.security.auth", "PrivateCredentialPermission", False, "getCredentialClass", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.security.auth", "PrivateCredentialPermission", False, "PrivateCredentialPermission", "(String,String)", "", "Argument[0]", "Argument[this].SyntheticField[javax.security.auth.PrivateCredentialPermission.credentialClass]", "taint", "dfc-generated"]
+      - ["javax.security.auth", "PrivateCredentialPermission", False, "PrivateCredentialPermission", "(String,String)", "", "Argument[0]", "Argument[this]", "taint", "dfc-generated"]
+      - ["javax.security.auth", "PrivateCredentialPermission", False, "getCredentialClass", "()", "", "Argument[this].SyntheticField[javax.security.auth.PrivateCredentialPermission.credentialClass]", "ReturnValue", "value", "dfc-generated"]
       - ["javax.security.auth", "PrivateCredentialPermission", False, "getPrincipals", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["javax.security.auth", "RefreshFailedException", True, "RefreshFailedException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["javax.security.auth", "Subject", False, "doAs", "(Subject,PrivilegedAction)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
@@ -18,20 +19,20 @@ extensions:
       - ["javax.security.auth", "Subject", False, "getPrincipals", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["javax.security.auth", "Subject", False, "getPrivateCredentials", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["javax.security.auth", "Subject", False, "getPublicCredentials", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.security.auth", "Subject", False, "getSubject", "(AccessControlContext)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.security.auth", "SubjectDomainCombiner", True, "SubjectDomainCombiner", "(Subject)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.security.auth", "SubjectDomainCombiner", True, "getSubject", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.security.auth", "SubjectDomainCombiner", True, "SubjectDomainCombiner", "(Subject)", "", "Argument[0]", "Argument[this].SyntheticField[javax.security.auth.SubjectDomainCombiner.subject]", "value", "dfc-generated"]
+      - ["javax.security.auth", "SubjectDomainCombiner", True, "getSubject", "()", "", "Argument[this].SyntheticField[javax.security.auth.SubjectDomainCombiner.subject]", "ReturnValue", "value", "dfc-generated"]
   - addsTo:
       pack: codeql/java-all
       extensible: neutralModel
     data:
       - ["javax.security.auth", "Destroyable", "destroy", "()", "summary", "df-generated"]
       - ["javax.security.auth", "Destroyable", "isDestroyed", "()", "summary", "df-generated"]
-      - ["javax.security.auth", "Refreshable", "isCurrent", "()", "summary", "df-generated"]
-      - ["javax.security.auth", "Refreshable", "refresh", "()", "summary", "df-generated"]
+      - ["javax.security.auth", "PrivateCredentialPermission", "implies", "(Permission)", "summary", "df-generated"]
+      - ["javax.security.auth", "PrivateCredentialPermission", "newPermissionCollection", "()", "summary", "df-generated"]
       - ["javax.security.auth", "Subject", "Subject", "(boolean,Set,Set,Set)", "summary", "df-generated"]
       - ["javax.security.auth", "Subject", "getPrincipals", "(Class)", "summary", "df-generated"]
       - ["javax.security.auth", "Subject", "getPrivateCredentials", "(Class)", "summary", "df-generated"]
       - ["javax.security.auth", "Subject", "getPublicCredentials", "(Class)", "summary", "df-generated"]
+      - ["javax.security.auth", "Subject", "getSubject", "(AccessControlContext)", "summary", "df-generated"]
       - ["javax.security.auth", "Subject", "isReadOnly", "()", "summary", "df-generated"]
       - ["javax.security.auth", "Subject", "setReadOnly", "()", "summary", "df-generated"]
diff --git a/java/ql/lib/ext/generated/javax.security.auth.spi.model.yml b/java/ql/lib/ext/generated/javax.security.auth.spi.model.yml
new file mode 100644
index 00000000000..612f6aa5a4b
--- /dev/null
+++ b/java/ql/lib/ext/generated/javax.security.auth.spi.model.yml
@@ -0,0 +1,10 @@
+# THIS FILE IS AN AUTO-GENERATED MODELS AS DATA FILE. DO NOT EDIT.
+extensions:
+  - addsTo:
+      pack: codeql/java-all
+      extensible: summaryModel
+    data:
+      - ["javax.security.auth.spi", "LoginModule", True, "initialize", "(Subject,CallbackHandler,Map,Map)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.security.auth.spi", "LoginModule", True, "initialize", "(Subject,CallbackHandler,Map,Map)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.security.auth.spi", "LoginModule", True, "initialize", "(Subject,CallbackHandler,Map,Map)", "", "Argument[2].Element", "Argument[this]", "taint", "df-generated"]
+      - ["javax.security.auth.spi", "LoginModule", True, "initialize", "(Subject,CallbackHandler,Map,Map)", "", "Argument[3].Element", "Argument[this]", "taint", "df-generated"]
diff --git a/java/ql/lib/ext/generated/javax.security.auth.x500.model.yml b/java/ql/lib/ext/generated/javax.security.auth.x500.model.yml
index f2c6e64a21a..f2060005fc6 100644
--- a/java/ql/lib/ext/generated/javax.security.auth.x500.model.yml
+++ b/java/ql/lib/ext/generated/javax.security.auth.x500.model.yml
@@ -5,18 +5,23 @@ extensions:
       extensible: summaryModel
     data:
       - ["javax.security.auth.x500", "X500Principal", False, "getEncoded", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.security.auth.x500", "X500Principal", False, "getName", "(String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.security.auth.x500", "X500Principal", False, "getName", "(String,Map)", "", "Argument[1].Element", "Argument[this]", "taint", "df-generated"]
-      - ["javax.security.auth.x500", "X500Principal", False, "getName", "(String,Map)", "", "Argument[1].Element", "ReturnValue", "taint", "df-generated"]
-      - ["javax.security.auth.x500", "X500Principal", False, "getName", "(String,Map)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.security.auth.x500", "X500PrivateCredential", False, "X500PrivateCredential", "(X509Certificate,PrivateKey)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.security.auth.x500", "X500PrivateCredential", False, "X500PrivateCredential", "(X509Certificate,PrivateKey)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.security.auth.x500", "X500PrivateCredential", False, "X500PrivateCredential", "(X509Certificate,PrivateKey,String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.security.auth.x500", "X500PrivateCredential", False, "X500PrivateCredential", "(X509Certificate,PrivateKey,String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.security.auth.x500", "X500PrivateCredential", False, "X500PrivateCredential", "(X509Certificate,PrivateKey,String)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.security.auth.x500", "X500PrivateCredential", False, "getAlias", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.security.auth.x500", "X500PrivateCredential", False, "getCertificate", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.security.auth.x500", "X500PrivateCredential", False, "getPrivateKey", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.security.auth.x500", "X500Principal", False, "getName", "()", "", "Argument[this].SyntheticField[javax.security.auth.x500.X500Principal.thisX500Name].SyntheticField[sun.security.x509.X500Name.rfc1779Dn]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.security.auth.x500", "X500Principal", False, "getName", "()", "", "Argument[this].SyntheticField[javax.security.auth.x500.X500Principal.thisX500Name].SyntheticField[sun.security.x509.X500Name.rfc2253Dn]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.security.auth.x500", "X500Principal", False, "getName", "(String)", "", "Argument[this].SyntheticField[javax.security.auth.x500.X500Principal.thisX500Name].SyntheticField[sun.security.x509.X500Name.rfc1779Dn]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.security.auth.x500", "X500Principal", False, "getName", "(String)", "", "Argument[this].SyntheticField[javax.security.auth.x500.X500Principal.thisX500Name].SyntheticField[sun.security.x509.X500Name.rfc2253Dn]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.security.auth.x500", "X500Principal", False, "getName", "(String,Map)", "", "Argument[1].MapValue", "Argument[this].SyntheticField[javax.security.auth.x500.X500Principal.thisX500Name].SyntheticField[sun.security.x509.X500Name.rfc1779Dn]", "taint", "dfc-generated"]
+      - ["javax.security.auth.x500", "X500Principal", False, "getName", "(String,Map)", "", "Argument[1].MapValue", "Argument[this].SyntheticField[javax.security.auth.x500.X500Principal.thisX500Name].SyntheticField[sun.security.x509.X500Name.rfc2253Dn]", "taint", "dfc-generated"]
+      - ["javax.security.auth.x500", "X500Principal", False, "getName", "(String,Map)", "", "Argument[1].MapValue", "ReturnValue", "taint", "dfc-generated"]
+      - ["javax.security.auth.x500", "X500Principal", False, "getName", "(String,Map)", "", "Argument[this].SyntheticField[javax.security.auth.x500.X500Principal.thisX500Name].SyntheticField[sun.security.x509.X500Name.rfc1779Dn]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.security.auth.x500", "X500Principal", False, "getName", "(String,Map)", "", "Argument[this].SyntheticField[javax.security.auth.x500.X500Principal.thisX500Name].SyntheticField[sun.security.x509.X500Name.rfc2253Dn]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.security.auth.x500", "X500PrivateCredential", False, "X500PrivateCredential", "(X509Certificate,PrivateKey)", "", "Argument[0]", "Argument[this].SyntheticField[javax.security.auth.x500.X500PrivateCredential.cert]", "value", "dfc-generated"]
+      - ["javax.security.auth.x500", "X500PrivateCredential", False, "X500PrivateCredential", "(X509Certificate,PrivateKey)", "", "Argument[1]", "Argument[this].SyntheticField[javax.security.auth.x500.X500PrivateCredential.key]", "value", "dfc-generated"]
+      - ["javax.security.auth.x500", "X500PrivateCredential", False, "X500PrivateCredential", "(X509Certificate,PrivateKey,String)", "", "Argument[0]", "Argument[this].SyntheticField[javax.security.auth.x500.X500PrivateCredential.cert]", "value", "dfc-generated"]
+      - ["javax.security.auth.x500", "X500PrivateCredential", False, "X500PrivateCredential", "(X509Certificate,PrivateKey,String)", "", "Argument[1]", "Argument[this].SyntheticField[javax.security.auth.x500.X500PrivateCredential.key]", "value", "dfc-generated"]
+      - ["javax.security.auth.x500", "X500PrivateCredential", False, "X500PrivateCredential", "(X509Certificate,PrivateKey,String)", "", "Argument[2]", "Argument[this].SyntheticField[javax.security.auth.x500.X500PrivateCredential.alias]", "value", "dfc-generated"]
+      - ["javax.security.auth.x500", "X500PrivateCredential", False, "getAlias", "()", "", "Argument[this].SyntheticField[javax.security.auth.x500.X500PrivateCredential.alias]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.security.auth.x500", "X500PrivateCredential", False, "getCertificate", "()", "", "Argument[this].SyntheticField[javax.security.auth.x500.X500PrivateCredential.cert]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.security.auth.x500", "X500PrivateCredential", False, "getPrivateKey", "()", "", "Argument[this].SyntheticField[javax.security.auth.x500.X500PrivateCredential.key]", "ReturnValue", "value", "dfc-generated"]
   - addsTo:
       pack: codeql/java-all
       extensible: neutralModel
@@ -25,3 +30,5 @@ extensions:
       - ["javax.security.auth.x500", "X500Principal", "X500Principal", "(String)", "summary", "df-generated"]
       - ["javax.security.auth.x500", "X500Principal", "X500Principal", "(String,Map)", "summary", "df-generated"]
       - ["javax.security.auth.x500", "X500Principal", "X500Principal", "(byte[])", "summary", "df-generated"]
+      - ["javax.security.auth.x500", "X500PrivateCredential", "destroy", "()", "summary", "df-generated"]
+      - ["javax.security.auth.x500", "X500PrivateCredential", "isDestroyed", "()", "summary", "df-generated"]
diff --git a/java/ql/lib/ext/generated/javax.security.sasl.model.yml b/java/ql/lib/ext/generated/javax.security.sasl.model.yml
index b2b5c3ac25a..759133b03cf 100644
--- a/java/ql/lib/ext/generated/javax.security.sasl.model.yml
+++ b/java/ql/lib/ext/generated/javax.security.sasl.model.yml
@@ -7,12 +7,13 @@ extensions:
       - ["javax.security.sasl", "AuthenticationException", True, "AuthenticationException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["javax.security.sasl", "AuthenticationException", True, "AuthenticationException", "(String,Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["javax.security.sasl", "AuthenticationException", True, "AuthenticationException", "(String,Throwable)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.security.sasl", "AuthorizeCallback", True, "AuthorizeCallback", "(String,String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.security.sasl", "AuthorizeCallback", True, "AuthorizeCallback", "(String,String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.security.sasl", "AuthorizeCallback", True, "getAuthenticationID", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.security.sasl", "AuthorizeCallback", True, "getAuthorizationID", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.security.sasl", "AuthorizeCallback", True, "getAuthorizedID", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.security.sasl", "AuthorizeCallback", True, "setAuthorizedID", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.security.sasl", "AuthorizeCallback", True, "AuthorizeCallback", "(String,String)", "", "Argument[0]", "Argument[this].SyntheticField[javax.security.sasl.AuthorizeCallback.authenticationID]", "value", "dfc-generated"]
+      - ["javax.security.sasl", "AuthorizeCallback", True, "AuthorizeCallback", "(String,String)", "", "Argument[1]", "Argument[this].SyntheticField[javax.security.sasl.AuthorizeCallback.authorizationID]", "value", "dfc-generated"]
+      - ["javax.security.sasl", "AuthorizeCallback", True, "getAuthenticationID", "()", "", "Argument[this].SyntheticField[javax.security.sasl.AuthorizeCallback.authenticationID]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.security.sasl", "AuthorizeCallback", True, "getAuthorizationID", "()", "", "Argument[this].SyntheticField[javax.security.sasl.AuthorizeCallback.authorizationID]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.security.sasl", "AuthorizeCallback", True, "getAuthorizedID", "()", "", "Argument[this].SyntheticField[javax.security.sasl.AuthorizeCallback.authorizationID]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.security.sasl", "AuthorizeCallback", True, "getAuthorizedID", "()", "", "Argument[this].SyntheticField[javax.security.sasl.AuthorizeCallback.authorizedID]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.security.sasl", "AuthorizeCallback", True, "setAuthorizedID", "(String)", "", "Argument[0]", "Argument[this].SyntheticField[javax.security.sasl.AuthorizeCallback.authorizedID]", "value", "dfc-generated"]
       - ["javax.security.sasl", "RealmCallback", True, "RealmCallback", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["javax.security.sasl", "RealmCallback", True, "RealmCallback", "(String,String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["javax.security.sasl", "RealmCallback", True, "RealmCallback", "(String,String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
@@ -29,9 +30,29 @@ extensions:
       - ["javax.security.sasl", "Sasl", True, "createSaslServer", "(String,String,String,Map,CallbackHandler)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
       - ["javax.security.sasl", "Sasl", True, "createSaslServer", "(String,String,String,Map,CallbackHandler)", "", "Argument[3].Element", "ReturnValue", "taint", "df-generated"]
       - ["javax.security.sasl", "Sasl", True, "createSaslServer", "(String,String,String,Map,CallbackHandler)", "", "Argument[4]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.security.sasl", "SaslClient", True, "evaluateChallenge", "(byte[])", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.security.sasl", "SaslClient", True, "evaluateChallenge", "(byte[])", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.security.sasl", "SaslClient", True, "getMechanismName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.security.sasl", "SaslClient", True, "getNegotiatedProperty", "(String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.security.sasl", "SaslClientFactory", True, "createSaslClient", "(String[],String,String,String,Map,CallbackHandler)", "", "Argument[0].ArrayElement", "ReturnValue", "taint", "df-generated"]
+      - ["javax.security.sasl", "SaslClientFactory", True, "createSaslClient", "(String[],String,String,String,Map,CallbackHandler)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.security.sasl", "SaslClientFactory", True, "createSaslClient", "(String[],String,String,String,Map,CallbackHandler)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.security.sasl", "SaslClientFactory", True, "createSaslClient", "(String[],String,String,String,Map,CallbackHandler)", "", "Argument[3]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.security.sasl", "SaslClientFactory", True, "createSaslClient", "(String[],String,String,String,Map,CallbackHandler)", "", "Argument[4].Element", "ReturnValue", "taint", "df-generated"]
+      - ["javax.security.sasl", "SaslClientFactory", True, "createSaslClient", "(String[],String,String,String,Map,CallbackHandler)", "", "Argument[5]", "ReturnValue", "taint", "df-generated"]
       - ["javax.security.sasl", "SaslException", True, "SaslException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["javax.security.sasl", "SaslException", True, "SaslException", "(String,Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["javax.security.sasl", "SaslException", True, "SaslException", "(String,Throwable)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.security.sasl", "SaslServer", True, "evaluateResponse", "(byte[])", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.security.sasl", "SaslServer", True, "evaluateResponse", "(byte[])", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.security.sasl", "SaslServer", True, "getAuthorizationID", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.security.sasl", "SaslServer", True, "getMechanismName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.security.sasl", "SaslServer", True, "getNegotiatedProperty", "(String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.security.sasl", "SaslServerFactory", True, "createSaslServer", "(String,String,String,Map,CallbackHandler)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.security.sasl", "SaslServerFactory", True, "createSaslServer", "(String,String,String,Map,CallbackHandler)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.security.sasl", "SaslServerFactory", True, "createSaslServer", "(String,String,String,Map,CallbackHandler)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.security.sasl", "SaslServerFactory", True, "createSaslServer", "(String,String,String,Map,CallbackHandler)", "", "Argument[3].Element", "ReturnValue", "taint", "df-generated"]
+      - ["javax.security.sasl", "SaslServerFactory", True, "createSaslServer", "(String,String,String,Map,CallbackHandler)", "", "Argument[4]", "ReturnValue", "taint", "df-generated"]
   - addsTo:
       pack: codeql/java-all
       extensible: neutralModel
diff --git a/java/ql/lib/ext/generated/javax.smartcardio.model.yml b/java/ql/lib/ext/generated/javax.smartcardio.model.yml
index 232d7c3fc98..1590ec10217 100644
--- a/java/ql/lib/ext/generated/javax.smartcardio.model.yml
+++ b/java/ql/lib/ext/generated/javax.smartcardio.model.yml
@@ -4,9 +4,13 @@ extensions:
       pack: codeql/java-all
       extensible: summaryModel
     data:
-      - ["javax.smartcardio", "ATR", False, "ATR", "(byte[])", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.smartcardio", "ATR", False, "getBytes", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.smartcardio", "ATR", False, "getHistoricalBytes", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.smartcardio", "ATR", False, "ATR", "(byte[])", "", "Argument[0]", "Argument[this].SyntheticField[javax.smartcardio.ATR.atr]", "value", "dfc-generated"]
+      - ["javax.smartcardio", "ATR", False, "getBytes", "()", "", "Argument[this].SyntheticField[javax.smartcardio.ATR.atr]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.smartcardio", "ATR", False, "getHistoricalBytes", "()", "", "Argument[this].SyntheticField[javax.smartcardio.ATR.atr]", "ReturnValue", "taint", "dfc-generated"]
+      - ["javax.smartcardio", "Card", True, "getATR", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.smartcardio", "Card", True, "getBasicChannel", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.smartcardio", "Card", True, "openLogicalChannel", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.smartcardio", "CardChannel", True, "getCard", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["javax.smartcardio", "CardException", True, "CardException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["javax.smartcardio", "CardException", True, "CardException", "(String,Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["javax.smartcardio", "CardException", True, "CardException", "(String,Throwable)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
@@ -15,25 +19,25 @@ extensions:
       - ["javax.smartcardio", "CardNotPresentException", True, "CardNotPresentException", "(String,Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["javax.smartcardio", "CardNotPresentException", True, "CardNotPresentException", "(String,Throwable)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
       - ["javax.smartcardio", "CardNotPresentException", True, "CardNotPresentException", "(Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.smartcardio", "CardPermission", True, "CardPermission", "(String,String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.smartcardio", "CommandAPDU", False, "CommandAPDU", "(ByteBuffer)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.smartcardio", "CommandAPDU", False, "CommandAPDU", "(byte[])", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.smartcardio", "CommandAPDU", False, "CommandAPDU", "(byte[],int,int)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.smartcardio", "CommandAPDU", False, "CommandAPDU", "(int,int,int,int,byte[])", "", "Argument[4]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.smartcardio", "CommandAPDU", False, "CommandAPDU", "(int,int,int,int,byte[],int)", "", "Argument[4]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.smartcardio", "CommandAPDU", False, "CommandAPDU", "(int,int,int,int,byte[],int,int)", "", "Argument[4]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.smartcardio", "CommandAPDU", False, "CommandAPDU", "(int,int,int,int,byte[],int,int,int)", "", "Argument[4]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.smartcardio", "CommandAPDU", False, "getBytes", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.smartcardio", "CommandAPDU", False, "getData", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.smartcardio", "ResponseAPDU", False, "ResponseAPDU", "(byte[])", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.smartcardio", "ResponseAPDU", False, "getBytes", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.smartcardio", "ResponseAPDU", False, "getData", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.smartcardio", "TerminalFactory", False, "getInstance", "(String,Object)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.smartcardio", "TerminalFactory", False, "getInstance", "(String,Object,Provider)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.smartcardio", "TerminalFactory", False, "getInstance", "(String,Object,Provider)", "", "Argument[2].Element", "ReturnValue", "taint", "df-generated"]
-      - ["javax.smartcardio", "TerminalFactory", False, "getInstance", "(String,Object,String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.smartcardio", "CardPermission", True, "CardPermission", "(String,String)", "", "Argument[0]", "Argument[this]", "taint", "dfc-generated"]
+      - ["javax.smartcardio", "CardTerminal", True, "connect", "(String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.smartcardio", "CardTerminal", True, "getName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.smartcardio", "CommandAPDU", False, "CommandAPDU", "(byte[])", "", "Argument[0]", "Argument[this].SyntheticField[javax.smartcardio.CommandAPDU.apdu]", "value", "dfc-generated"]
+      - ["javax.smartcardio", "CommandAPDU", False, "CommandAPDU", "(byte[],int,int)", "", "Argument[0]", "Argument[this].SyntheticField[javax.smartcardio.CommandAPDU.apdu]", "taint", "dfc-generated"]
+      - ["javax.smartcardio", "CommandAPDU", False, "CommandAPDU", "(int,int,int,int,byte[])", "", "Argument[4]", "Argument[this].SyntheticField[javax.smartcardio.CommandAPDU.apdu]", "taint", "dfc-generated"]
+      - ["javax.smartcardio", "CommandAPDU", False, "CommandAPDU", "(int,int,int,int,byte[],int)", "", "Argument[4]", "Argument[this].SyntheticField[javax.smartcardio.CommandAPDU.apdu]", "taint", "dfc-generated"]
+      - ["javax.smartcardio", "CommandAPDU", False, "CommandAPDU", "(int,int,int,int,byte[],int,int)", "", "Argument[4]", "Argument[this].SyntheticField[javax.smartcardio.CommandAPDU.apdu]", "taint", "dfc-generated"]
+      - ["javax.smartcardio", "CommandAPDU", False, "CommandAPDU", "(int,int,int,int,byte[],int,int,int)", "", "Argument[4]", "Argument[this].SyntheticField[javax.smartcardio.CommandAPDU.apdu]", "taint", "dfc-generated"]
+      - ["javax.smartcardio", "CommandAPDU", False, "getBytes", "()", "", "Argument[this].SyntheticField[javax.smartcardio.CommandAPDU.apdu]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.smartcardio", "CommandAPDU", False, "getData", "()", "", "Argument[this].SyntheticField[javax.smartcardio.CommandAPDU.apdu]", "ReturnValue", "taint", "dfc-generated"]
+      - ["javax.smartcardio", "ResponseAPDU", False, "ResponseAPDU", "(byte[])", "", "Argument[0]", "Argument[this].SyntheticField[javax.smartcardio.ResponseAPDU.apdu]", "value", "dfc-generated"]
+      - ["javax.smartcardio", "ResponseAPDU", False, "getBytes", "()", "", "Argument[this].SyntheticField[javax.smartcardio.ResponseAPDU.apdu]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.smartcardio", "ResponseAPDU", False, "getData", "()", "", "Argument[this].SyntheticField[javax.smartcardio.ResponseAPDU.apdu]", "ReturnValue", "taint", "dfc-generated"]
+      - ["javax.smartcardio", "TerminalFactory", False, "getInstance", "(String,Object)", "", "Argument[0]", "ReturnValue.SyntheticField[javax.smartcardio.TerminalFactory.type]", "value", "dfc-generated"]
+      - ["javax.smartcardio", "TerminalFactory", False, "getInstance", "(String,Object,Provider)", "", "Argument[0]", "ReturnValue.SyntheticField[javax.smartcardio.TerminalFactory.type]", "value", "dfc-generated"]
+      - ["javax.smartcardio", "TerminalFactory", False, "getInstance", "(String,Object,String)", "", "Argument[0]", "ReturnValue.SyntheticField[javax.smartcardio.TerminalFactory.type]", "value", "dfc-generated"]
       - ["javax.smartcardio", "TerminalFactory", False, "getProvider", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.smartcardio", "TerminalFactory", False, "getType", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.smartcardio", "TerminalFactory", False, "getType", "()", "", "Argument[this].SyntheticField[javax.smartcardio.TerminalFactory.type]", "ReturnValue", "value", "dfc-generated"]
   - addsTo:
       pack: codeql/java-all
       extensible: neutralModel
@@ -41,18 +45,13 @@ extensions:
       - ["javax.smartcardio", "Card", "beginExclusive", "()", "summary", "df-generated"]
       - ["javax.smartcardio", "Card", "disconnect", "(boolean)", "summary", "df-generated"]
       - ["javax.smartcardio", "Card", "endExclusive", "()", "summary", "df-generated"]
-      - ["javax.smartcardio", "Card", "getATR", "()", "summary", "df-generated"]
-      - ["javax.smartcardio", "Card", "getBasicChannel", "()", "summary", "df-generated"]
       - ["javax.smartcardio", "Card", "getProtocol", "()", "summary", "df-generated"]
-      - ["javax.smartcardio", "Card", "openLogicalChannel", "()", "summary", "df-generated"]
       - ["javax.smartcardio", "Card", "transmitControlCommand", "(int,byte[])", "summary", "df-generated"]
       - ["javax.smartcardio", "CardChannel", "close", "()", "summary", "df-generated"]
-      - ["javax.smartcardio", "CardChannel", "getCard", "()", "summary", "df-generated"]
       - ["javax.smartcardio", "CardChannel", "getChannelNumber", "()", "summary", "df-generated"]
       - ["javax.smartcardio", "CardChannel", "transmit", "(ByteBuffer,ByteBuffer)", "summary", "df-generated"]
       - ["javax.smartcardio", "CardChannel", "transmit", "(CommandAPDU)", "summary", "df-generated"]
-      - ["javax.smartcardio", "CardTerminal", "connect", "(String)", "summary", "df-generated"]
-      - ["javax.smartcardio", "CardTerminal", "getName", "()", "summary", "df-generated"]
+      - ["javax.smartcardio", "CardPermission", "implies", "(Permission)", "summary", "df-generated"]
       - ["javax.smartcardio", "CardTerminal", "isCardPresent", "()", "summary", "df-generated"]
       - ["javax.smartcardio", "CardTerminal", "waitForCardAbsent", "(long)", "summary", "df-generated"]
       - ["javax.smartcardio", "CardTerminal", "waitForCardPresent", "(long)", "summary", "df-generated"]
@@ -61,6 +60,7 @@ extensions:
       - ["javax.smartcardio", "CardTerminals", "list", "(CardTerminals$State)", "summary", "df-generated"]
       - ["javax.smartcardio", "CardTerminals", "waitForChange", "()", "summary", "df-generated"]
       - ["javax.smartcardio", "CardTerminals", "waitForChange", "(long)", "summary", "df-generated"]
+      - ["javax.smartcardio", "CommandAPDU", "CommandAPDU", "(ByteBuffer)", "summary", "df-generated"]
       - ["javax.smartcardio", "CommandAPDU", "CommandAPDU", "(int,int,int,int)", "summary", "df-generated"]
       - ["javax.smartcardio", "CommandAPDU", "CommandAPDU", "(int,int,int,int,int)", "summary", "df-generated"]
       - ["javax.smartcardio", "CommandAPDU", "getCLA", "()", "summary", "df-generated"]
diff --git a/java/ql/lib/ext/generated/javax.sound.midi.model.yml b/java/ql/lib/ext/generated/javax.sound.midi.model.yml
index a2cb3589795..104171ea031 100644
--- a/java/ql/lib/ext/generated/javax.sound.midi.model.yml
+++ b/java/ql/lib/ext/generated/javax.sound.midi.model.yml
@@ -6,33 +6,61 @@ extensions:
     data:
       - ["javax.sound.midi", "Instrument", True, "getPatch", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["javax.sound.midi", "InvalidMidiDataException", True, "InvalidMidiDataException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.sound.midi", "MetaMessage", True, "MetaMessage", "(int,byte[],int)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.sound.midi", "MetaMessage", True, "getData", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.sound.midi", "MetaMessage", True, "setMessage", "(int,byte[],int)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.sound.midi", "MetaMessage", True, "MetaMessage", "(int,byte[],int)", "", "Argument[1]", "Argument[this].SyntheticField[javax.sound.midi.MidiMessage.data]", "taint", "dfc-generated"]
+      - ["javax.sound.midi", "MetaMessage", True, "getData", "()", "", "Argument[this].SyntheticField[javax.sound.midi.MidiMessage.data]", "ReturnValue", "taint", "dfc-generated"]
+      - ["javax.sound.midi", "MetaMessage", True, "setMessage", "(int,byte[],int)", "", "Argument[1]", "Argument[this].SyntheticField[javax.sound.midi.MidiMessage.data]", "taint", "dfc-generated"]
       - ["javax.sound.midi", "MidiDevice$Info", True, "getDescription", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["javax.sound.midi", "MidiDevice$Info", True, "getName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["javax.sound.midi", "MidiDevice$Info", True, "getVendor", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["javax.sound.midi", "MidiDevice$Info", True, "getVersion", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.sound.midi", "MidiEvent", True, "MidiEvent", "(MidiMessage,long)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.sound.midi", "MidiEvent", True, "getMessage", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.sound.midi", "MidiFileFormat", True, "MidiFileFormat", "(int,float,int,int,long,Map)", "", "Argument[5].Element", "Argument[this]", "taint", "df-generated"]
-      - ["javax.sound.midi", "MidiFileFormat", True, "getProperty", "(String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.sound.midi", "MidiFileFormat", True, "properties", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.sound.midi", "MidiMessage", True, "getMessage", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.sound.midi", "MidiMessage", True, "setMessage", "(byte[],int)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.sound.midi", "MidiDevice", True, "getDeviceInfo", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.sound.midi", "MidiDevice", True, "getReceiver", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.sound.midi", "MidiDevice", True, "getReceivers", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.sound.midi", "MidiDevice", True, "getTransmitter", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.sound.midi", "MidiDevice", True, "getTransmitters", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.sound.midi", "MidiDeviceReceiver", True, "getMidiDevice", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.sound.midi", "MidiDeviceTransmitter", True, "getMidiDevice", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.sound.midi", "MidiEvent", True, "MidiEvent", "(MidiMessage,long)", "", "Argument[0]", "Argument[this].SyntheticField[javax.sound.midi.MidiEvent.message]", "value", "dfc-generated"]
+      - ["javax.sound.midi", "MidiEvent", True, "getMessage", "()", "", "Argument[this].SyntheticField[javax.sound.midi.MidiEvent.message]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.sound.midi", "MidiFileFormat", True, "MidiFileFormat", "(int,float,int,int,long,Map)", "", "Argument[5].MapKey", "Argument[this].SyntheticField[javax.sound.midi.MidiFileFormat.properties].MapKey", "value", "dfc-generated"]
+      - ["javax.sound.midi", "MidiFileFormat", True, "MidiFileFormat", "(int,float,int,int,long,Map)", "", "Argument[5].MapValue", "Argument[this].SyntheticField[javax.sound.midi.MidiFileFormat.properties].MapValue", "value", "dfc-generated"]
+      - ["javax.sound.midi", "MidiFileFormat", True, "getProperty", "(String)", "", "Argument[this].SyntheticField[javax.sound.midi.MidiFileFormat.properties].MapValue", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.sound.midi", "MidiFileFormat", True, "properties", "()", "", "Argument[this].SyntheticField[javax.sound.midi.MidiFileFormat.properties].MapKey", "ReturnValue.MapKey", "value", "dfc-generated"]
+      - ["javax.sound.midi", "MidiFileFormat", True, "properties", "()", "", "Argument[this].SyntheticField[javax.sound.midi.MidiFileFormat.properties].MapValue", "ReturnValue.MapValue", "value", "dfc-generated"]
+      - ["javax.sound.midi", "MidiMessage", True, "getMessage", "()", "", "Argument[this].SyntheticField[javax.sound.midi.MidiMessage.data]", "ReturnValue", "taint", "dfc-generated"]
       - ["javax.sound.midi", "MidiSystem", True, "getMidiDevice", "(MidiDevice$Info)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["javax.sound.midi", "MidiSystem", True, "getSoundbank", "(File)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["javax.sound.midi", "MidiSystem", True, "getSoundbank", "(InputStream)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["javax.sound.midi", "MidiUnavailableException", True, "MidiUnavailableException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.sound.midi", "Receiver", True, "send", "(MidiMessage,long)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["javax.sound.midi", "Sequence", True, "getTracks", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.sound.midi", "Sequencer", True, "addMetaEventListener", "(MetaEventListener)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.sound.midi", "Sequencer", True, "getSequence", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.sound.midi", "Sequencer", True, "setSequence", "(Sequence)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.sound.midi", "Soundbank", True, "getDescription", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.sound.midi", "Soundbank", True, "getInstrument", "(Patch)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.sound.midi", "Soundbank", True, "getInstruments", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.sound.midi", "Soundbank", True, "getName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.sound.midi", "Soundbank", True, "getResources", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.sound.midi", "Soundbank", True, "getVendor", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.sound.midi", "Soundbank", True, "getVersion", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.sound.midi", "SoundbankResource", True, "getData", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["javax.sound.midi", "SoundbankResource", True, "getName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["javax.sound.midi", "SoundbankResource", True, "getSoundbank", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.sound.midi", "SysexMessage", True, "SysexMessage", "(byte[],int)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.sound.midi", "SysexMessage", True, "SysexMessage", "(int,byte[],int)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.sound.midi", "SysexMessage", True, "getData", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.sound.midi", "SysexMessage", True, "setMessage", "(int,byte[],int)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.sound.midi", "Track", True, "add", "(MidiEvent)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.sound.midi", "Track", True, "get", "(int)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.sound.midi", "Synthesizer", True, "getChannels", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.sound.midi", "Synthesizer", True, "getLoadedInstruments", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.sound.midi", "Synthesizer", True, "loadAllInstruments", "(Soundbank)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.sound.midi", "Synthesizer", True, "loadInstrument", "(Instrument)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.sound.midi", "Synthesizer", True, "loadInstruments", "(Soundbank,Patch[])", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.sound.midi", "SysexMessage", True, "SysexMessage", "(byte[],int)", "", "Argument[0]", "Argument[this].SyntheticField[javax.sound.midi.MidiMessage.data]", "taint", "dfc-generated"]
+      - ["javax.sound.midi", "SysexMessage", True, "SysexMessage", "(int,byte[],int)", "", "Argument[1]", "Argument[this].SyntheticField[javax.sound.midi.MidiMessage.data]", "taint", "dfc-generated"]
+      - ["javax.sound.midi", "SysexMessage", True, "getData", "()", "", "Argument[this].SyntheticField[javax.sound.midi.MidiMessage.data]", "ReturnValue", "taint", "dfc-generated"]
+      - ["javax.sound.midi", "SysexMessage", True, "setMessage", "(byte[],int)", "", "Argument[0]", "Argument[this].SyntheticField[javax.sound.midi.MidiMessage.data]", "taint", "dfc-generated"]
+      - ["javax.sound.midi", "SysexMessage", True, "setMessage", "(int,byte[],int)", "", "Argument[1]", "Argument[this].SyntheticField[javax.sound.midi.MidiMessage.data]", "taint", "dfc-generated"]
+      - ["javax.sound.midi", "Track", True, "add", "(MidiEvent)", "", "Argument[0]", "Argument[this].SyntheticField[javax.sound.midi.Track.eventsList].Element", "value", "dfc-generated"]
+      - ["javax.sound.midi", "Track", True, "get", "(int)", "", "Argument[this].SyntheticField[javax.sound.midi.Track.eventsList].Element", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.sound.midi", "Transmitter", True, "getReceiver", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.sound.midi", "Transmitter", True, "setReceiver", "(Receiver)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
   - addsTo:
       pack: codeql/java-all
       extensible: neutralModel
@@ -89,7 +117,6 @@ extensions:
       - ["javax.sound.midi", "ShortMessage", "setMessage", "(int)", "summary", "df-generated"]
       - ["javax.sound.midi", "ShortMessage", "setMessage", "(int,int,int)", "summary", "df-generated"]
       - ["javax.sound.midi", "ShortMessage", "setMessage", "(int,int,int,int)", "summary", "df-generated"]
-      - ["javax.sound.midi", "SoundbankResource", "getData", "()", "summary", "df-generated"]
       - ["javax.sound.midi", "SoundbankResource", "getDataClass", "()", "summary", "df-generated"]
       - ["javax.sound.midi", "Track", "remove", "(MidiEvent)", "summary", "df-generated"]
       - ["javax.sound.midi", "Track", "size", "()", "summary", "df-generated"]
diff --git a/java/ql/lib/ext/generated/javax.sound.midi.spi.model.yml b/java/ql/lib/ext/generated/javax.sound.midi.spi.model.yml
index 2012851b25d..0aeb6165abf 100644
--- a/java/ql/lib/ext/generated/javax.sound.midi.spi.model.yml
+++ b/java/ql/lib/ext/generated/javax.sound.midi.spi.model.yml
@@ -1,10 +1,16 @@
 # THIS FILE IS AN AUTO-GENERATED MODELS AS DATA FILE. DO NOT EDIT.
 extensions:
+  - addsTo:
+      pack: codeql/java-all
+      extensible: summaryModel
+    data:
+      - ["javax.sound.midi.spi", "MidiDeviceProvider", True, "getDevice", "(MidiDevice$Info)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.sound.midi.spi", "SoundbankReader", True, "getSoundbank", "(File)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.sound.midi.spi", "SoundbankReader", True, "getSoundbank", "(InputStream)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
   - addsTo:
       pack: codeql/java-all
       extensible: neutralModel
     data:
-      - ["javax.sound.midi.spi", "MidiDeviceProvider", "getDevice", "(MidiDevice$Info)", "summary", "df-generated"]
       - ["javax.sound.midi.spi", "MidiDeviceProvider", "getDeviceInfo", "()", "summary", "df-generated"]
       - ["javax.sound.midi.spi", "MidiDeviceProvider", "isDeviceSupported", "(MidiDevice$Info)", "summary", "df-generated"]
       - ["javax.sound.midi.spi", "MidiFileReader", "getMidiFileFormat", "(File)", "summary", "df-generated"]
@@ -19,6 +25,4 @@ extensions:
       - ["javax.sound.midi.spi", "MidiFileWriter", "isFileTypeSupported", "(int,Sequence)", "summary", "df-generated"]
       - ["javax.sound.midi.spi", "MidiFileWriter", "write", "(Sequence,int,File)", "summary", "df-generated"]
       - ["javax.sound.midi.spi", "MidiFileWriter", "write", "(Sequence,int,OutputStream)", "summary", "df-generated"]
-      - ["javax.sound.midi.spi", "SoundbankReader", "getSoundbank", "(File)", "summary", "df-generated"]
-      - ["javax.sound.midi.spi", "SoundbankReader", "getSoundbank", "(InputStream)", "summary", "df-generated"]
       - ["javax.sound.midi.spi", "SoundbankReader", "getSoundbank", "(URL)", "summary", "df-generated"]
diff --git a/java/ql/lib/ext/generated/javax.sound.sampled.model.yml b/java/ql/lib/ext/generated/javax.sound.sampled.model.yml
index 5721eb3dd21..6030c229ae7 100644
--- a/java/ql/lib/ext/generated/javax.sound.sampled.model.yml
+++ b/java/ql/lib/ext/generated/javax.sound.sampled.model.yml
@@ -4,71 +4,89 @@ extensions:
       pack: codeql/java-all
       extensible: summaryModel
     data:
-      - ["javax.sound.sampled", "AudioFileFormat$Type", True, "Type", "(String,String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.sound.sampled", "AudioFileFormat$Type", True, "Type", "(String,String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.sound.sampled", "AudioFileFormat$Type", True, "getExtension", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.sound.sampled", "AudioFileFormat", True, "AudioFileFormat", "(AudioFileFormat$Type,AudioFormat,int)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.sound.sampled", "AudioFileFormat", True, "AudioFileFormat", "(AudioFileFormat$Type,AudioFormat,int)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.sound.sampled", "AudioFileFormat", True, "AudioFileFormat", "(AudioFileFormat$Type,AudioFormat,int,Map)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.sound.sampled", "AudioFileFormat", True, "AudioFileFormat", "(AudioFileFormat$Type,AudioFormat,int,Map)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.sound.sampled", "AudioFileFormat", True, "AudioFileFormat", "(AudioFileFormat$Type,AudioFormat,int,Map)", "", "Argument[3].Element", "Argument[this]", "taint", "df-generated"]
-      - ["javax.sound.sampled", "AudioFileFormat", True, "getFormat", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.sound.sampled", "AudioFileFormat", True, "getProperty", "(String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.sound.sampled", "AudioFileFormat", True, "getType", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.sound.sampled", "AudioFileFormat", True, "properties", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.sound.sampled", "AudioFileFormat$Type", True, "Type", "(String,String)", "", "Argument[1]", "Argument[this].SyntheticField[javax.sound.sampled.AudioFileFormat$Type.extension]", "value", "dfc-generated"]
+      - ["javax.sound.sampled", "AudioFileFormat$Type", True, "getExtension", "()", "", "Argument[this].SyntheticField[javax.sound.sampled.AudioFileFormat$Type.extension]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.sound.sampled", "AudioFileFormat", True, "AudioFileFormat", "(AudioFileFormat$Type,AudioFormat,int)", "", "Argument[0]", "Argument[this].SyntheticField[javax.sound.sampled.AudioFileFormat.type]", "value", "dfc-generated"]
+      - ["javax.sound.sampled", "AudioFileFormat", True, "AudioFileFormat", "(AudioFileFormat$Type,AudioFormat,int)", "", "Argument[1]", "Argument[this].SyntheticField[javax.sound.sampled.AudioFileFormat.format]", "value", "dfc-generated"]
+      - ["javax.sound.sampled", "AudioFileFormat", True, "AudioFileFormat", "(AudioFileFormat$Type,AudioFormat,int,Map)", "", "Argument[0]", "Argument[this].SyntheticField[javax.sound.sampled.AudioFileFormat.type]", "value", "dfc-generated"]
+      - ["javax.sound.sampled", "AudioFileFormat", True, "AudioFileFormat", "(AudioFileFormat$Type,AudioFormat,int,Map)", "", "Argument[1]", "Argument[this].SyntheticField[javax.sound.sampled.AudioFileFormat.format]", "value", "dfc-generated"]
+      - ["javax.sound.sampled", "AudioFileFormat", True, "AudioFileFormat", "(AudioFileFormat$Type,AudioFormat,int,Map)", "", "Argument[3].MapKey", "Argument[this].SyntheticField[javax.sound.sampled.AudioFileFormat.properties].MapKey", "value", "dfc-generated"]
+      - ["javax.sound.sampled", "AudioFileFormat", True, "AudioFileFormat", "(AudioFileFormat$Type,AudioFormat,int,Map)", "", "Argument[3].MapValue", "Argument[this].SyntheticField[javax.sound.sampled.AudioFileFormat.properties].MapValue", "value", "dfc-generated"]
+      - ["javax.sound.sampled", "AudioFileFormat", True, "getFormat", "()", "", "Argument[this].SyntheticField[javax.sound.sampled.AudioFileFormat.format]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.sound.sampled", "AudioFileFormat", True, "getProperty", "(String)", "", "Argument[this].SyntheticField[javax.sound.sampled.AudioFileFormat.properties].MapValue", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.sound.sampled", "AudioFileFormat", True, "getType", "()", "", "Argument[this].SyntheticField[javax.sound.sampled.AudioFileFormat.type]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.sound.sampled", "AudioFileFormat", True, "properties", "()", "", "Argument[this].SyntheticField[javax.sound.sampled.AudioFileFormat.properties].MapKey", "ReturnValue.MapKey", "value", "dfc-generated"]
+      - ["javax.sound.sampled", "AudioFileFormat", True, "properties", "()", "", "Argument[this].SyntheticField[javax.sound.sampled.AudioFileFormat.properties].MapValue", "ReturnValue.MapValue", "value", "dfc-generated"]
       - ["javax.sound.sampled", "AudioFormat$Encoding", True, "Encoding", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.sound.sampled", "AudioFormat", True, "AudioFormat", "(AudioFormat$Encoding,float,int,int,int,float,boolean)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.sound.sampled", "AudioFormat", True, "AudioFormat", "(AudioFormat$Encoding,float,int,int,int,float,boolean,Map)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.sound.sampled", "AudioFormat", True, "AudioFormat", "(AudioFormat$Encoding,float,int,int,int,float,boolean,Map)", "", "Argument[7].Element", "Argument[this]", "taint", "df-generated"]
-      - ["javax.sound.sampled", "AudioFormat", True, "getEncoding", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.sound.sampled", "AudioFormat", True, "getProperty", "(String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.sound.sampled", "AudioFormat", True, "properties", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.sound.sampled", "AudioInputStream", True, "AudioInputStream", "(InputStream,AudioFormat,long)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.sound.sampled", "AudioInputStream", True, "AudioInputStream", "(InputStream,AudioFormat,long)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.sound.sampled", "AudioFormat", True, "AudioFormat", "(AudioFormat$Encoding,float,int,int,int,float,boolean)", "", "Argument[0]", "Argument[this].SyntheticField[javax.sound.sampled.AudioFormat.encoding]", "value", "dfc-generated"]
+      - ["javax.sound.sampled", "AudioFormat", True, "AudioFormat", "(AudioFormat$Encoding,float,int,int,int,float,boolean,Map)", "", "Argument[0]", "Argument[this].SyntheticField[javax.sound.sampled.AudioFormat.encoding]", "value", "dfc-generated"]
+      - ["javax.sound.sampled", "AudioFormat", True, "AudioFormat", "(AudioFormat$Encoding,float,int,int,int,float,boolean,Map)", "", "Argument[7].MapKey", "Argument[this].SyntheticField[javax.sound.sampled.AudioFormat.properties].MapKey", "value", "dfc-generated"]
+      - ["javax.sound.sampled", "AudioFormat", True, "AudioFormat", "(AudioFormat$Encoding,float,int,int,int,float,boolean,Map)", "", "Argument[7].MapValue", "Argument[this].SyntheticField[javax.sound.sampled.AudioFormat.properties].MapValue", "value", "dfc-generated"]
+      - ["javax.sound.sampled", "AudioFormat", True, "getEncoding", "()", "", "Argument[this].SyntheticField[javax.sound.sampled.AudioFormat.encoding]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.sound.sampled", "AudioFormat", True, "getProperty", "(String)", "", "Argument[this].SyntheticField[javax.sound.sampled.AudioFormat.properties].MapValue", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.sound.sampled", "AudioFormat", True, "properties", "()", "", "Argument[this].SyntheticField[javax.sound.sampled.AudioFormat.properties].MapKey", "ReturnValue.MapKey", "value", "dfc-generated"]
+      - ["javax.sound.sampled", "AudioFormat", True, "properties", "()", "", "Argument[this].SyntheticField[javax.sound.sampled.AudioFormat.properties].MapValue", "ReturnValue.MapValue", "value", "dfc-generated"]
+      - ["javax.sound.sampled", "AudioInputStream", True, "AudioInputStream", "(InputStream,AudioFormat,long)", "", "Argument[1]", "Argument[this].SyntheticField[javax.sound.sampled.AudioInputStream.format]", "value", "dfc-generated"]
       - ["javax.sound.sampled", "AudioInputStream", True, "AudioInputStream", "(TargetDataLine)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.sound.sampled", "AudioInputStream", True, "getFormat", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.sound.sampled", "AudioPermission", True, "AudioPermission", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.sound.sampled", "AudioPermission", True, "AudioPermission", "(String,String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.sound.sampled", "AudioInputStream", True, "getFormat", "()", "", "Argument[this].SyntheticField[javax.sound.sampled.AudioInputStream.format]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.sound.sampled", "AudioPermission", True, "AudioPermission", "(String)", "", "Argument[0]", "Argument[this]", "taint", "dfc-generated"]
+      - ["javax.sound.sampled", "AudioPermission", True, "AudioPermission", "(String,String)", "", "Argument[0]", "Argument[this]", "taint", "dfc-generated"]
       - ["javax.sound.sampled", "AudioSystem", True, "getAudioInputStream", "(AudioFormat$Encoding,AudioInputStream)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["javax.sound.sampled", "AudioSystem", True, "getAudioInputStream", "(AudioFormat$Encoding,AudioInputStream)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
       - ["javax.sound.sampled", "AudioSystem", True, "getAudioInputStream", "(AudioFormat,AudioInputStream)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["javax.sound.sampled", "AudioSystem", True, "getAudioInputStream", "(AudioFormat,AudioInputStream)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.sound.sampled", "AudioSystem", True, "getAudioInputStream", "(File)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.sound.sampled", "AudioSystem", True, "getAudioInputStream", "(InputStream)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.sound.sampled", "AudioSystem", True, "getAudioInputStream", "(InputStream)", "", "Argument[0]", "ReturnValue", "taint", "dfc-generated"]
       - ["javax.sound.sampled", "AudioSystem", True, "getLine", "(Line$Info)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.sound.sampled", "AudioSystem", True, "getSourceDataLine", "(AudioFormat)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.sound.sampled", "AudioSystem", True, "getSourceDataLine", "(AudioFormat,Mixer$Info)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.sound.sampled", "AudioSystem", True, "getTargetDataLine", "(AudioFormat)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.sound.sampled", "AudioSystem", True, "getTargetDataLine", "(AudioFormat,Mixer$Info)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["javax.sound.sampled", "AudioSystem", True, "getTargetEncodings", "(AudioFormat$Encoding)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["javax.sound.sampled", "AudioSystem", True, "getTargetEncodings", "(AudioFormat)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["javax.sound.sampled", "AudioSystem", True, "getTargetFormats", "(AudioFormat$Encoding,AudioFormat)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.sound.sampled", "AudioSystem", True, "write", "(AudioInputStream,AudioFileFormat$Type,OutputStream)", "", "Argument[0]", "Argument[2]", "taint", "df-generated"]
       - ["javax.sound.sampled", "BooleanControl", True, "getStateLabel", "(boolean)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.sound.sampled", "Clip", True, "open", "(AudioFormat,byte[],int,int)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.sound.sampled", "Clip", True, "open", "(AudioFormat,byte[],int,int)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.sound.sampled", "Clip", True, "open", "(AudioInputStream)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["javax.sound.sampled", "CompoundControl", True, "getMemberControls", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["javax.sound.sampled", "Control", True, "getType", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.sound.sampled", "DataLine$Info", True, "Info", "(Class,AudioFormat)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.sound.sampled", "DataLine$Info", True, "Info", "(Class,AudioFormat,int)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.sound.sampled", "DataLine$Info", True, "Info", "(Class,AudioFormat[],int,int)", "", "Argument[1].ArrayElement", "Argument[this]", "taint", "df-generated"]
-      - ["javax.sound.sampled", "DataLine$Info", True, "getFormats", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.sound.sampled", "EnumControl", True, "getValue", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.sound.sampled", "DataLine$Info", True, "Info", "(Class,AudioFormat)", "", "Argument[1]", "Argument[this].SyntheticField[javax.sound.sampled.DataLine$Info.formats].ArrayElement", "value", "dfc-generated"]
+      - ["javax.sound.sampled", "DataLine$Info", True, "Info", "(Class,AudioFormat,int)", "", "Argument[1]", "Argument[this].SyntheticField[javax.sound.sampled.DataLine$Info.formats].ArrayElement", "value", "dfc-generated"]
+      - ["javax.sound.sampled", "DataLine$Info", True, "Info", "(Class,AudioFormat[],int,int)", "", "Argument[1].ArrayElement", "Argument[this].SyntheticField[javax.sound.sampled.DataLine$Info.formats].ArrayElement", "value", "dfc-generated"]
+      - ["javax.sound.sampled", "DataLine$Info", True, "getFormats", "()", "", "Argument[this].SyntheticField[javax.sound.sampled.DataLine$Info.formats].ArrayElement", "ReturnValue.ArrayElement", "value", "dfc-generated"]
+      - ["javax.sound.sampled", "DataLine", True, "getFormat", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.sound.sampled", "EnumControl", True, "getValue", "()", "", "Argument[this].SyntheticField[javax.sound.sampled.EnumControl.value]", "ReturnValue", "value", "dfc-generated"]
       - ["javax.sound.sampled", "EnumControl", True, "getValues", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.sound.sampled", "EnumControl", True, "setValue", "(Object)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.sound.sampled", "EnumControl", True, "setValue", "(Object)", "", "Argument[0]", "Argument[this].SyntheticField[javax.sound.sampled.EnumControl.value]", "value", "dfc-generated"]
       - ["javax.sound.sampled", "FloatControl", True, "getMaxLabel", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["javax.sound.sampled", "FloatControl", True, "getMidLabel", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["javax.sound.sampled", "FloatControl", True, "getMinLabel", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["javax.sound.sampled", "FloatControl", True, "getUnits", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.sound.sampled", "LineEvent", True, "LineEvent", "(Line,LineEvent$Type,long)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.sound.sampled", "LineEvent", True, "LineEvent", "(Line,LineEvent$Type,long)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.sound.sampled", "LineEvent", True, "getLine", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.sound.sampled", "LineEvent", True, "getType", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.sound.sampled", "Line", True, "addLineListener", "(LineListener)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.sound.sampled", "Line", True, "getControl", "(Control$Type)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.sound.sampled", "Line", True, "getControls", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.sound.sampled", "Line", True, "getLineInfo", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.sound.sampled", "Line", True, "removeLineListener", "(LineListener)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.sound.sampled", "LineEvent", True, "LineEvent", "(Line,LineEvent$Type,long)", "", "Argument[0]", "Argument[this].SyntheticField[java.util.EventObject.source]", "value", "dfc-generated"]
+      - ["javax.sound.sampled", "LineEvent", True, "LineEvent", "(Line,LineEvent$Type,long)", "", "Argument[1]", "Argument[this].SyntheticField[javax.sound.sampled.LineEvent.type]", "value", "dfc-generated"]
+      - ["javax.sound.sampled", "LineEvent", True, "getLine", "()", "", "Argument[this].SyntheticField[java.util.EventObject.source]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.sound.sampled", "LineEvent", True, "getType", "()", "", "Argument[this].SyntheticField[javax.sound.sampled.LineEvent.type]", "ReturnValue", "value", "dfc-generated"]
       - ["javax.sound.sampled", "LineUnavailableException", True, "LineUnavailableException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["javax.sound.sampled", "Mixer$Info", True, "getDescription", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["javax.sound.sampled", "Mixer$Info", True, "getName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["javax.sound.sampled", "Mixer$Info", True, "getVendor", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["javax.sound.sampled", "Mixer$Info", True, "getVersion", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.sound.sampled", "Port$Info", True, "Info", "(Class,String,boolean)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.sound.sampled", "Port$Info", True, "getName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.sound.sampled", "Mixer", True, "getLine", "(Line$Info)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.sound.sampled", "Mixer", True, "getLine", "(Line$Info)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.sound.sampled", "Mixer", True, "getMixerInfo", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.sound.sampled", "Mixer", True, "getSourceLineInfo", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.sound.sampled", "Mixer", True, "getSourceLineInfo", "(Line$Info)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.sound.sampled", "Mixer", True, "getSourceLines", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.sound.sampled", "Mixer", True, "getTargetLineInfo", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.sound.sampled", "Mixer", True, "getTargetLineInfo", "(Line$Info)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.sound.sampled", "Mixer", True, "getTargetLines", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.sound.sampled", "Port$Info", True, "Info", "(Class,String,boolean)", "", "Argument[1]", "Argument[this].SyntheticField[javax.sound.sampled.Port$Info.name]", "value", "dfc-generated"]
+      - ["javax.sound.sampled", "Port$Info", True, "getName", "()", "", "Argument[this].SyntheticField[javax.sound.sampled.Port$Info.name]", "ReturnValue", "value", "dfc-generated"]
       - ["javax.sound.sampled", "ReverbType", True, "getName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.sound.sampled", "SourceDataLine", True, "open", "(AudioFormat)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.sound.sampled", "SourceDataLine", True, "open", "(AudioFormat,int)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["javax.sound.sampled", "UnsupportedAudioFileException", True, "UnsupportedAudioFileException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
   - addsTo:
       pack: codeql/java-all
@@ -84,18 +102,28 @@ extensions:
       - ["javax.sound.sampled", "AudioFormat", "getSampleSizeInBits", "()", "summary", "df-generated"]
       - ["javax.sound.sampled", "AudioFormat", "isBigEndian", "()", "summary", "df-generated"]
       - ["javax.sound.sampled", "AudioFormat", "matches", "(AudioFormat)", "summary", "df-generated"]
+      - ["javax.sound.sampled", "AudioInputStream", "available", "()", "summary", "df-generated"]
       - ["javax.sound.sampled", "AudioInputStream", "getFrameLength", "()", "summary", "df-generated"]
+      - ["javax.sound.sampled", "AudioInputStream", "mark", "(int)", "summary", "df-generated"]
+      - ["javax.sound.sampled", "AudioInputStream", "markSupported", "()", "summary", "df-generated"]
+      - ["javax.sound.sampled", "AudioInputStream", "reset", "()", "summary", "df-generated"]
+      - ["javax.sound.sampled", "AudioInputStream", "skip", "(long)", "summary", "df-generated"]
       - ["javax.sound.sampled", "AudioSystem", "getAudioFileFormat", "(File)", "summary", "df-generated"]
       - ["javax.sound.sampled", "AudioSystem", "getAudioFileFormat", "(InputStream)", "summary", "df-generated"]
       - ["javax.sound.sampled", "AudioSystem", "getAudioFileFormat", "(URL)", "summary", "df-generated"]
       - ["javax.sound.sampled", "AudioSystem", "getAudioFileTypes", "()", "summary", "df-generated"]
       - ["javax.sound.sampled", "AudioSystem", "getAudioFileTypes", "(AudioInputStream)", "summary", "df-generated"]
+      - ["javax.sound.sampled", "AudioSystem", "getAudioInputStream", "(File)", "summary", "df-generated"]
       - ["javax.sound.sampled", "AudioSystem", "getAudioInputStream", "(URL)", "summary", "df-generated"]
       - ["javax.sound.sampled", "AudioSystem", "getClip", "()", "summary", "df-generated"]
       - ["javax.sound.sampled", "AudioSystem", "getClip", "(Mixer$Info)", "summary", "df-generated"]
       - ["javax.sound.sampled", "AudioSystem", "getMixer", "(Mixer$Info)", "summary", "df-generated"]
       - ["javax.sound.sampled", "AudioSystem", "getMixerInfo", "()", "summary", "df-generated"]
+      - ["javax.sound.sampled", "AudioSystem", "getSourceDataLine", "(AudioFormat)", "summary", "df-generated"]
+      - ["javax.sound.sampled", "AudioSystem", "getSourceDataLine", "(AudioFormat,Mixer$Info)", "summary", "df-generated"]
       - ["javax.sound.sampled", "AudioSystem", "getSourceLineInfo", "(Line$Info)", "summary", "df-generated"]
+      - ["javax.sound.sampled", "AudioSystem", "getTargetDataLine", "(AudioFormat)", "summary", "df-generated"]
+      - ["javax.sound.sampled", "AudioSystem", "getTargetDataLine", "(AudioFormat,Mixer$Info)", "summary", "df-generated"]
       - ["javax.sound.sampled", "AudioSystem", "getTargetLineInfo", "(Line$Info)", "summary", "df-generated"]
       - ["javax.sound.sampled", "AudioSystem", "isConversionSupported", "(AudioFormat$Encoding,AudioFormat)", "summary", "df-generated"]
       - ["javax.sound.sampled", "AudioSystem", "isConversionSupported", "(AudioFormat,AudioFormat)", "summary", "df-generated"]
@@ -103,12 +131,12 @@ extensions:
       - ["javax.sound.sampled", "AudioSystem", "isFileTypeSupported", "(AudioFileFormat$Type,AudioInputStream)", "summary", "df-generated"]
       - ["javax.sound.sampled", "AudioSystem", "isLineSupported", "(Line$Info)", "summary", "df-generated"]
       - ["javax.sound.sampled", "AudioSystem", "write", "(AudioInputStream,AudioFileFormat$Type,File)", "summary", "df-generated"]
-      - ["javax.sound.sampled", "AudioSystem", "write", "(AudioInputStream,AudioFileFormat$Type,OutputStream)", "summary", "df-generated"]
       - ["javax.sound.sampled", "BooleanControl", "getValue", "()", "summary", "df-generated"]
       - ["javax.sound.sampled", "BooleanControl", "setValue", "(boolean)", "summary", "df-generated"]
       - ["javax.sound.sampled", "DataLine$Info", "getMaxBufferSize", "()", "summary", "df-generated"]
       - ["javax.sound.sampled", "DataLine$Info", "getMinBufferSize", "()", "summary", "df-generated"]
       - ["javax.sound.sampled", "DataLine$Info", "isFormatSupported", "(AudioFormat)", "summary", "df-generated"]
+      - ["javax.sound.sampled", "DataLine$Info", "matches", "(Line$Info)", "summary", "df-generated"]
       - ["javax.sound.sampled", "FloatControl", "getMaximum", "()", "summary", "df-generated"]
       - ["javax.sound.sampled", "FloatControl", "getMinimum", "()", "summary", "df-generated"]
       - ["javax.sound.sampled", "FloatControl", "getPrecision", "()", "summary", "df-generated"]
@@ -121,6 +149,7 @@ extensions:
       - ["javax.sound.sampled", "Line$Info", "matches", "(Line$Info)", "summary", "df-generated"]
       - ["javax.sound.sampled", "LineEvent", "getFramePosition", "()", "summary", "df-generated"]
       - ["javax.sound.sampled", "Port$Info", "isSource", "()", "summary", "df-generated"]
+      - ["javax.sound.sampled", "Port$Info", "matches", "(Line$Info)", "summary", "df-generated"]
       - ["javax.sound.sampled", "ReverbType", "getDecayTime", "()", "summary", "df-generated"]
       - ["javax.sound.sampled", "ReverbType", "getEarlyReflectionDelay", "()", "summary", "df-generated"]
       - ["javax.sound.sampled", "ReverbType", "getEarlyReflectionIntensity", "()", "summary", "df-generated"]
diff --git a/java/ql/lib/ext/generated/javax.sound.sampled.spi.model.yml b/java/ql/lib/ext/generated/javax.sound.sampled.spi.model.yml
index 4fc6de066ef..d1a4e6e324c 100644
--- a/java/ql/lib/ext/generated/javax.sound.sampled.spi.model.yml
+++ b/java/ql/lib/ext/generated/javax.sound.sampled.spi.model.yml
@@ -1,5 +1,15 @@
 # THIS FILE IS AN AUTO-GENERATED MODELS AS DATA FILE. DO NOT EDIT.
 extensions:
+  - addsTo:
+      pack: codeql/java-all
+      extensible: summaryModel
+    data:
+      - ["javax.sound.sampled.spi", "AudioFileReader", True, "getAudioInputStream", "(InputStream)", "", "Argument[0]", "ReturnValue", "taint", "dfc-generated"]
+      - ["javax.sound.sampled.spi", "AudioFileWriter", True, "getAudioFileTypes", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.sound.sampled.spi", "AudioFileWriter", True, "getAudioFileTypes", "(AudioInputStream)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.sound.sampled.spi", "AudioFileWriter", True, "write", "(AudioInputStream,AudioFileFormat$Type,OutputStream)", "", "Argument[0]", "Argument[2]", "taint", "df-generated"]
+      - ["javax.sound.sampled.spi", "FormatConversionProvider", True, "getAudioInputStream", "(AudioFormat$Encoding,AudioInputStream)", "", "Argument[1]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.sound.sampled.spi", "FormatConversionProvider", True, "getAudioInputStream", "(AudioFormat,AudioInputStream)", "", "Argument[1]", "ReturnValue", "value", "dfc-generated"]
   - addsTo:
       pack: codeql/java-all
       extensible: neutralModel
@@ -8,16 +18,10 @@ extensions:
       - ["javax.sound.sampled.spi", "AudioFileReader", "getAudioFileFormat", "(InputStream)", "summary", "df-generated"]
       - ["javax.sound.sampled.spi", "AudioFileReader", "getAudioFileFormat", "(URL)", "summary", "df-generated"]
       - ["javax.sound.sampled.spi", "AudioFileReader", "getAudioInputStream", "(File)", "summary", "df-generated"]
-      - ["javax.sound.sampled.spi", "AudioFileReader", "getAudioInputStream", "(InputStream)", "summary", "df-generated"]
       - ["javax.sound.sampled.spi", "AudioFileReader", "getAudioInputStream", "(URL)", "summary", "df-generated"]
-      - ["javax.sound.sampled.spi", "AudioFileWriter", "getAudioFileTypes", "()", "summary", "df-generated"]
-      - ["javax.sound.sampled.spi", "AudioFileWriter", "getAudioFileTypes", "(AudioInputStream)", "summary", "df-generated"]
       - ["javax.sound.sampled.spi", "AudioFileWriter", "isFileTypeSupported", "(AudioFileFormat$Type)", "summary", "df-generated"]
       - ["javax.sound.sampled.spi", "AudioFileWriter", "isFileTypeSupported", "(AudioFileFormat$Type,AudioInputStream)", "summary", "df-generated"]
       - ["javax.sound.sampled.spi", "AudioFileWriter", "write", "(AudioInputStream,AudioFileFormat$Type,File)", "summary", "df-generated"]
-      - ["javax.sound.sampled.spi", "AudioFileWriter", "write", "(AudioInputStream,AudioFileFormat$Type,OutputStream)", "summary", "df-generated"]
-      - ["javax.sound.sampled.spi", "FormatConversionProvider", "getAudioInputStream", "(AudioFormat$Encoding,AudioInputStream)", "summary", "df-generated"]
-      - ["javax.sound.sampled.spi", "FormatConversionProvider", "getAudioInputStream", "(AudioFormat,AudioInputStream)", "summary", "df-generated"]
       - ["javax.sound.sampled.spi", "FormatConversionProvider", "getSourceEncodings", "()", "summary", "df-generated"]
       - ["javax.sound.sampled.spi", "FormatConversionProvider", "getTargetEncodings", "()", "summary", "df-generated"]
       - ["javax.sound.sampled.spi", "FormatConversionProvider", "getTargetEncodings", "(AudioFormat)", "summary", "df-generated"]
diff --git a/java/ql/lib/ext/generated/javax.sql.model.yml b/java/ql/lib/ext/generated/javax.sql.model.yml
index 1e285d91311..b30626367c0 100644
--- a/java/ql/lib/ext/generated/javax.sql.model.yml
+++ b/java/ql/lib/ext/generated/javax.sql.model.yml
@@ -5,17 +5,19 @@ extensions:
       extensible: summaryModel
     data:
       - ["javax.sql", "ConnectionEvent", True, "ConnectionEvent", "(PooledConnection)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.sql", "ConnectionEvent", True, "ConnectionEvent", "(PooledConnection,SQLException)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.sql", "ConnectionEvent", True, "ConnectionEvent", "(PooledConnection,SQLException)", "", "Argument[1].Element", "Argument[this]", "taint", "df-generated"]
-      - ["javax.sql", "ConnectionEvent", True, "getSQLException", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.sql", "ConnectionEvent", True, "ConnectionEvent", "(PooledConnection,SQLException)", "", "Argument[1]", "Argument[this].SyntheticField[javax.sql.ConnectionEvent.ex]", "value", "dfc-generated"]
+      - ["javax.sql", "ConnectionEvent", True, "getSQLException", "()", "", "Argument[this].SyntheticField[javax.sql.ConnectionEvent.ex]", "ReturnValue", "value", "dfc-generated"]
       - ["javax.sql", "RowSetEvent", True, "RowSetEvent", "(RowSet)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.sql", "StatementEvent", True, "StatementEvent", "(PooledConnection,PreparedStatement)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.sql", "StatementEvent", True, "StatementEvent", "(PooledConnection,PreparedStatement)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.sql", "StatementEvent", True, "StatementEvent", "(PooledConnection,PreparedStatement,SQLException)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.sql", "StatementEvent", True, "StatementEvent", "(PooledConnection,PreparedStatement,SQLException)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.sql", "StatementEvent", True, "StatementEvent", "(PooledConnection,PreparedStatement,SQLException)", "", "Argument[2].Element", "Argument[this]", "taint", "df-generated"]
-      - ["javax.sql", "StatementEvent", True, "getSQLException", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.sql", "StatementEvent", True, "getStatement", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.sql", "RowSetInternal", True, "getConnection", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.sql", "RowSetInternal", True, "getOriginal", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.sql", "RowSetInternal", True, "getOriginalRow", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.sql", "RowSetInternal", True, "setMetaData", "(RowSetMetaData)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.sql", "RowSetWriter", True, "writeData", "(RowSetInternal)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.sql", "StatementEvent", True, "StatementEvent", "(PooledConnection,PreparedStatement)", "", "Argument[1]", "Argument[this].SyntheticField[javax.sql.StatementEvent.statement]", "value", "dfc-generated"]
+      - ["javax.sql", "StatementEvent", True, "StatementEvent", "(PooledConnection,PreparedStatement,SQLException)", "", "Argument[1]", "Argument[this].SyntheticField[javax.sql.StatementEvent.statement]", "value", "dfc-generated"]
+      - ["javax.sql", "StatementEvent", True, "StatementEvent", "(PooledConnection,PreparedStatement,SQLException)", "", "Argument[2]", "Argument[this].SyntheticField[javax.sql.StatementEvent.exception]", "value", "dfc-generated"]
+      - ["javax.sql", "StatementEvent", True, "getSQLException", "()", "", "Argument[this].SyntheticField[javax.sql.StatementEvent.exception]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.sql", "StatementEvent", True, "getStatement", "()", "", "Argument[this].SyntheticField[javax.sql.StatementEvent.statement]", "ReturnValue", "value", "dfc-generated"]
   - addsTo:
       pack: codeql/java-all
       extensible: neutralModel
@@ -23,21 +25,4 @@ extensions:
       - ["javax.sql", "CommonDataSource", "createShardingKeyBuilder", "()", "summary", "df-generated"]
       - ["javax.sql", "ConnectionPoolDataSource", "createPooledConnectionBuilder", "()", "summary", "df-generated"]
       - ["javax.sql", "DataSource", "createConnectionBuilder", "()", "summary", "df-generated"]
-      - ["javax.sql", "RowSetMetaData", "setAutoIncrement", "(int,boolean)", "summary", "df-generated"]
-      - ["javax.sql", "RowSetMetaData", "setCaseSensitive", "(int,boolean)", "summary", "df-generated"]
-      - ["javax.sql", "RowSetMetaData", "setCatalogName", "(int,String)", "summary", "df-generated"]
-      - ["javax.sql", "RowSetMetaData", "setColumnCount", "(int)", "summary", "df-generated"]
-      - ["javax.sql", "RowSetMetaData", "setColumnDisplaySize", "(int,int)", "summary", "df-generated"]
-      - ["javax.sql", "RowSetMetaData", "setColumnLabel", "(int,String)", "summary", "df-generated"]
-      - ["javax.sql", "RowSetMetaData", "setColumnName", "(int,String)", "summary", "df-generated"]
-      - ["javax.sql", "RowSetMetaData", "setColumnType", "(int,int)", "summary", "df-generated"]
-      - ["javax.sql", "RowSetMetaData", "setColumnTypeName", "(int,String)", "summary", "df-generated"]
-      - ["javax.sql", "RowSetMetaData", "setCurrency", "(int,boolean)", "summary", "df-generated"]
-      - ["javax.sql", "RowSetMetaData", "setNullable", "(int,int)", "summary", "df-generated"]
-      - ["javax.sql", "RowSetMetaData", "setPrecision", "(int,int)", "summary", "df-generated"]
-      - ["javax.sql", "RowSetMetaData", "setScale", "(int,int)", "summary", "df-generated"]
-      - ["javax.sql", "RowSetMetaData", "setSchemaName", "(int,String)", "summary", "df-generated"]
-      - ["javax.sql", "RowSetMetaData", "setSearchable", "(int,boolean)", "summary", "df-generated"]
-      - ["javax.sql", "RowSetMetaData", "setSigned", "(int,boolean)", "summary", "df-generated"]
-      - ["javax.sql", "RowSetMetaData", "setTableName", "(int,String)", "summary", "df-generated"]
       - ["javax.sql", "XADataSource", "createXAConnectionBuilder", "()", "summary", "df-generated"]
diff --git a/java/ql/lib/ext/generated/javax.sql.rowset.model.yml b/java/ql/lib/ext/generated/javax.sql.rowset.model.yml
index 3382f5b2cb2..172cdd035ab 100644
--- a/java/ql/lib/ext/generated/javax.sql.rowset.model.yml
+++ b/java/ql/lib/ext/generated/javax.sql.rowset.model.yml
@@ -5,32 +5,68 @@ extensions:
       extensible: summaryModel
     data:
       - ["javax.sql.rowset", "BaseRowSet", True, "addRowSetListener", "(RowSetListener)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.sql.rowset", "BaseRowSet", True, "getCommand", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.sql.rowset", "BaseRowSet", True, "getDataSourceName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.sql.rowset", "BaseRowSet", True, "getParams", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.sql.rowset", "BaseRowSet", True, "getPassword", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.sql.rowset", "BaseRowSet", True, "getTypeMap", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.sql.rowset", "BaseRowSet", True, "getUrl", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.sql.rowset", "BaseRowSet", True, "getUsername", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.sql.rowset", "BaseRowSet", True, "setBytes", "(int,byte[])", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.sql.rowset", "BaseRowSet", True, "setCommand", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.sql.rowset", "BaseRowSet", True, "setDataSourceName", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.sql.rowset", "BaseRowSet", True, "setDate", "(int,Date)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.sql.rowset", "BaseRowSet", True, "setObject", "(int,Object)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.sql.rowset", "BaseRowSet", True, "setPassword", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.sql.rowset", "BaseRowSet", True, "setString", "(int,String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.sql.rowset", "BaseRowSet", True, "setTime", "(int,Time)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.sql.rowset", "BaseRowSet", True, "setTimestamp", "(int,Timestamp)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.sql.rowset", "BaseRowSet", True, "setTypeMap", "(Map)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["javax.sql.rowset", "BaseRowSet", True, "setUrl", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.sql.rowset", "BaseRowSet", True, "setUsername", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.sql.rowset", "RowSetProvider", True, "newFactory", "(String,ClassLoader)", "", "Argument[0]", "Argument[1]", "taint", "df-generated"]
+      - ["javax.sql.rowset", "BaseRowSet", True, "getCommand", "()", "", "Argument[this].SyntheticField[javax.sql.rowset.BaseRowSet.command]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.sql.rowset", "BaseRowSet", True, "getDataSourceName", "()", "", "Argument[this].SyntheticField[javax.sql.rowset.BaseRowSet.dataSource]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.sql.rowset", "BaseRowSet", True, "getParams", "()", "", "Argument[this].SyntheticField[javax.sql.rowset.BaseRowSet.params].MapValue", "ReturnValue.ArrayElement", "value", "dfc-generated"]
+      - ["javax.sql.rowset", "BaseRowSet", True, "getPassword", "()", "", "Argument[this].SyntheticField[javax.sql.rowset.BaseRowSet.password]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.sql.rowset", "BaseRowSet", True, "getTypeMap", "()", "", "Argument[this].SyntheticField[javax.sql.rowset.BaseRowSet.map]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.sql.rowset", "BaseRowSet", True, "getUrl", "()", "", "Argument[this].SyntheticField[javax.sql.rowset.BaseRowSet.URL]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.sql.rowset", "BaseRowSet", True, "getUsername", "()", "", "Argument[this].SyntheticField[javax.sql.rowset.BaseRowSet.username]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.sql.rowset", "BaseRowSet", True, "setBytes", "(int,byte[])", "", "Argument[1]", "Argument[this].SyntheticField[javax.sql.rowset.BaseRowSet.params].MapValue", "value", "dfc-generated"]
+      - ["javax.sql.rowset", "BaseRowSet", True, "setCommand", "(String)", "", "Argument[0]", "Argument[this].SyntheticField[javax.sql.rowset.BaseRowSet.command]", "value", "dfc-generated"]
+      - ["javax.sql.rowset", "BaseRowSet", True, "setDataSourceName", "(String)", "", "Argument[0]", "Argument[this].SyntheticField[javax.sql.rowset.BaseRowSet.dataSource]", "value", "dfc-generated"]
+      - ["javax.sql.rowset", "BaseRowSet", True, "setDate", "(int,Date)", "", "Argument[1]", "Argument[this].SyntheticField[javax.sql.rowset.BaseRowSet.params].MapValue", "value", "dfc-generated"]
+      - ["javax.sql.rowset", "BaseRowSet", True, "setObject", "(int,Object)", "", "Argument[1]", "Argument[this].SyntheticField[javax.sql.rowset.BaseRowSet.params].MapValue", "value", "dfc-generated"]
+      - ["javax.sql.rowset", "BaseRowSet", True, "setPassword", "(String)", "", "Argument[0]", "Argument[this].SyntheticField[javax.sql.rowset.BaseRowSet.password]", "value", "dfc-generated"]
+      - ["javax.sql.rowset", "BaseRowSet", True, "setString", "(int,String)", "", "Argument[1]", "Argument[this].SyntheticField[javax.sql.rowset.BaseRowSet.params].MapValue", "value", "dfc-generated"]
+      - ["javax.sql.rowset", "BaseRowSet", True, "setTime", "(int,Time)", "", "Argument[1]", "Argument[this].SyntheticField[javax.sql.rowset.BaseRowSet.params].MapValue", "value", "dfc-generated"]
+      - ["javax.sql.rowset", "BaseRowSet", True, "setTimestamp", "(int,Timestamp)", "", "Argument[1]", "Argument[this].SyntheticField[javax.sql.rowset.BaseRowSet.params].MapValue", "value", "dfc-generated"]
+      - ["javax.sql.rowset", "BaseRowSet", True, "setTypeMap", "(Map)", "", "Argument[0]", "Argument[this].SyntheticField[javax.sql.rowset.BaseRowSet.map]", "value", "dfc-generated"]
+      - ["javax.sql.rowset", "BaseRowSet", True, "setUrl", "(String)", "", "Argument[0]", "Argument[this].SyntheticField[javax.sql.rowset.BaseRowSet.URL]", "value", "dfc-generated"]
+      - ["javax.sql.rowset", "BaseRowSet", True, "setUsername", "(String)", "", "Argument[0]", "Argument[this].SyntheticField[javax.sql.rowset.BaseRowSet.username]", "value", "dfc-generated"]
+      - ["javax.sql.rowset", "CachedRowSet", True, "acceptChanges", "(Connection)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.sql.rowset", "CachedRowSet", True, "createCopy", "()", "", "Argument[this]", "ReturnValue", "taint", "dfc-generated"]
+      - ["javax.sql.rowset", "CachedRowSet", True, "createCopyNoConstraints", "()", "", "Argument[this]", "ReturnValue", "taint", "dfc-generated"]
+      - ["javax.sql.rowset", "CachedRowSet", True, "createCopySchema", "()", "", "Argument[this]", "ReturnValue", "taint", "dfc-generated"]
+      - ["javax.sql.rowset", "CachedRowSet", True, "createShared", "()", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.sql.rowset", "CachedRowSet", True, "execute", "(Connection)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.sql.rowset", "CachedRowSet", True, "getOriginal", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.sql.rowset", "CachedRowSet", True, "getOriginalRow", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.sql.rowset", "CachedRowSet", True, "getRowSetWarnings", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.sql.rowset", "CachedRowSet", True, "getSyncProvider", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.sql.rowset", "CachedRowSet", True, "getTableName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.sql.rowset", "CachedRowSet", True, "populate", "(ResultSet)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.sql.rowset", "CachedRowSet", True, "populate", "(ResultSet,int)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.sql.rowset", "CachedRowSet", True, "setMetaData", "(RowSetMetaData)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.sql.rowset", "CachedRowSet", True, "setTableName", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.sql.rowset", "CachedRowSet", True, "toCollection", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.sql.rowset", "CachedRowSet", True, "toCollection", "(String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.sql.rowset", "CachedRowSet", True, "toCollection", "(int)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.sql.rowset", "FilteredRowSet", True, "getFilter", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.sql.rowset", "FilteredRowSet", True, "setFilter", "(Predicate)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.sql.rowset", "JoinRowSet", True, "addRowSet", "(Joinable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.sql.rowset", "JoinRowSet", True, "addRowSet", "(RowSet,String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.sql.rowset", "JoinRowSet", True, "addRowSet", "(RowSet,String)", "", "Argument[1]", "Argument[0]", "taint", "df-generated"]
+      - ["javax.sql.rowset", "JoinRowSet", True, "addRowSet", "(RowSet,int)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.sql.rowset", "JoinRowSet", True, "addRowSet", "(RowSet[],String[])", "", "Argument[0].ArrayElement", "Argument[this]", "taint", "df-generated"]
+      - ["javax.sql.rowset", "JoinRowSet", True, "addRowSet", "(RowSet[],int[])", "", "Argument[0].ArrayElement", "Argument[this]", "taint", "df-generated"]
+      - ["javax.sql.rowset", "JoinRowSet", True, "getRowSetNames", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.sql.rowset", "JoinRowSet", True, "getRowSets", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.sql.rowset", "JoinRowSet", True, "getWhereClause", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.sql.rowset", "JoinRowSet", True, "toCachedRowSet", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.sql.rowset", "Joinable", True, "getMatchColumnNames", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.sql.rowset", "Joinable", True, "setMatchColumn", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.sql.rowset", "Joinable", True, "setMatchColumn", "(String[])", "", "Argument[0].ArrayElement", "Argument[this]", "taint", "df-generated"]
       - ["javax.sql.rowset", "RowSetWarning", True, "RowSetWarning", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["javax.sql.rowset", "RowSetWarning", True, "RowSetWarning", "(String,String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["javax.sql.rowset", "RowSetWarning", True, "RowSetWarning", "(String,String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
       - ["javax.sql.rowset", "RowSetWarning", True, "RowSetWarning", "(String,String,int)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["javax.sql.rowset", "RowSetWarning", True, "RowSetWarning", "(String,String,int)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
       - ["javax.sql.rowset", "RowSetWarning", True, "getNextWarning", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.sql.rowset", "WebRowSet", True, "writeXml", "(ResultSet,OutputStream)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.sql.rowset", "WebRowSet", True, "writeXml", "(ResultSet,Writer)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.sql.rowset", "WebRowSet", True, "writeXml", "(ResultSet,Writer)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.sql.rowset", "WebRowSet", True, "writeXml", "(Writer)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
   - addsTo:
       pack: codeql/java-all
       extensible: neutralModel
@@ -139,5 +175,39 @@ extensions:
       - ["javax.sql.rowset", "BaseRowSet", "setType", "(int)", "summary", "df-generated"]
       - ["javax.sql.rowset", "BaseRowSet", "setURL", "(int,URL)", "summary", "df-generated"]
       - ["javax.sql.rowset", "BaseRowSet", "setUnicodeStream", "(int,InputStream,int)", "summary", "df-generated"]
+      - ["javax.sql.rowset", "RowSetMetaDataImpl", "getColumnClassName", "(int)", "summary", "df-generated"]
+      - ["javax.sql.rowset", "RowSetMetaDataImpl", "getColumnCount", "()", "summary", "df-generated"]
+      - ["javax.sql.rowset", "RowSetMetaDataImpl", "getColumnDisplaySize", "(int)", "summary", "df-generated"]
+      - ["javax.sql.rowset", "RowSetMetaDataImpl", "getColumnType", "(int)", "summary", "df-generated"]
+      - ["javax.sql.rowset", "RowSetMetaDataImpl", "getPrecision", "(int)", "summary", "df-generated"]
+      - ["javax.sql.rowset", "RowSetMetaDataImpl", "getScale", "(int)", "summary", "df-generated"]
+      - ["javax.sql.rowset", "RowSetMetaDataImpl", "isAutoIncrement", "(int)", "summary", "df-generated"]
+      - ["javax.sql.rowset", "RowSetMetaDataImpl", "isCaseSensitive", "(int)", "summary", "df-generated"]
+      - ["javax.sql.rowset", "RowSetMetaDataImpl", "isCurrency", "(int)", "summary", "df-generated"]
+      - ["javax.sql.rowset", "RowSetMetaDataImpl", "isDefinitelyWritable", "(int)", "summary", "df-generated"]
+      - ["javax.sql.rowset", "RowSetMetaDataImpl", "isNullable", "(int)", "summary", "df-generated"]
+      - ["javax.sql.rowset", "RowSetMetaDataImpl", "isReadOnly", "(int)", "summary", "df-generated"]
+      - ["javax.sql.rowset", "RowSetMetaDataImpl", "isSearchable", "(int)", "summary", "df-generated"]
+      - ["javax.sql.rowset", "RowSetMetaDataImpl", "isSigned", "(int)", "summary", "df-generated"]
+      - ["javax.sql.rowset", "RowSetMetaDataImpl", "isWrapperFor", "(Class)", "summary", "df-generated"]
+      - ["javax.sql.rowset", "RowSetMetaDataImpl", "isWritable", "(int)", "summary", "df-generated"]
+      - ["javax.sql.rowset", "RowSetMetaDataImpl", "setAutoIncrement", "(int,boolean)", "summary", "df-generated"]
+      - ["javax.sql.rowset", "RowSetMetaDataImpl", "setCaseSensitive", "(int,boolean)", "summary", "df-generated"]
+      - ["javax.sql.rowset", "RowSetMetaDataImpl", "setCatalogName", "(int,String)", "summary", "df-generated"]
+      - ["javax.sql.rowset", "RowSetMetaDataImpl", "setColumnCount", "(int)", "summary", "df-generated"]
+      - ["javax.sql.rowset", "RowSetMetaDataImpl", "setColumnDisplaySize", "(int,int)", "summary", "df-generated"]
+      - ["javax.sql.rowset", "RowSetMetaDataImpl", "setColumnLabel", "(int,String)", "summary", "df-generated"]
+      - ["javax.sql.rowset", "RowSetMetaDataImpl", "setColumnName", "(int,String)", "summary", "df-generated"]
+      - ["javax.sql.rowset", "RowSetMetaDataImpl", "setColumnType", "(int,int)", "summary", "df-generated"]
+      - ["javax.sql.rowset", "RowSetMetaDataImpl", "setColumnTypeName", "(int,String)", "summary", "df-generated"]
+      - ["javax.sql.rowset", "RowSetMetaDataImpl", "setCurrency", "(int,boolean)", "summary", "df-generated"]
+      - ["javax.sql.rowset", "RowSetMetaDataImpl", "setNullable", "(int,int)", "summary", "df-generated"]
+      - ["javax.sql.rowset", "RowSetMetaDataImpl", "setPrecision", "(int,int)", "summary", "df-generated"]
+      - ["javax.sql.rowset", "RowSetMetaDataImpl", "setScale", "(int,int)", "summary", "df-generated"]
+      - ["javax.sql.rowset", "RowSetMetaDataImpl", "setSchemaName", "(int,String)", "summary", "df-generated"]
+      - ["javax.sql.rowset", "RowSetMetaDataImpl", "setSearchable", "(int,boolean)", "summary", "df-generated"]
+      - ["javax.sql.rowset", "RowSetMetaDataImpl", "setSigned", "(int,boolean)", "summary", "df-generated"]
+      - ["javax.sql.rowset", "RowSetMetaDataImpl", "setTableName", "(int,String)", "summary", "df-generated"]
       - ["javax.sql.rowset", "RowSetProvider", "newFactory", "()", "summary", "df-generated"]
+      - ["javax.sql.rowset", "RowSetProvider", "newFactory", "(String,ClassLoader)", "summary", "df-generated"]
       - ["javax.sql.rowset", "RowSetWarning", "setNextWarning", "(RowSetWarning)", "summary", "df-generated"]
diff --git a/java/ql/lib/ext/generated/javax.sql.rowset.serial.model.yml b/java/ql/lib/ext/generated/javax.sql.rowset.serial.model.yml
index f460c159312..0e97e51b039 100644
--- a/java/ql/lib/ext/generated/javax.sql.rowset.serial.model.yml
+++ b/java/ql/lib/ext/generated/javax.sql.rowset.serial.model.yml
@@ -4,26 +4,97 @@ extensions:
       pack: codeql/java-all
       extensible: summaryModel
     data:
-      - ["javax.sql.rowset.serial", "SQLInputImpl", True, "SQLInputImpl", "(Object[],Map)", "", "Argument[0].ArrayElement", "Argument[this]", "taint", "df-generated"]
-      - ["javax.sql.rowset.serial", "SQLInputImpl", True, "SQLInputImpl", "(Object[],Map)", "", "Argument[1].Element", "Argument[this]", "taint", "df-generated"]
+      - ["javax.sql.rowset.serial", "SQLInputImpl", True, "SQLInputImpl", "(Object[],Map)", "", "Argument[0].ArrayElement", "Argument[this].SyntheticField[javax.sql.rowset.serial.SQLInputImpl.attrib].ArrayElement", "value", "dfc-generated"]
+      - ["javax.sql.rowset.serial", "SQLInputImpl", True, "readArray", "()", "", "Argument[this].SyntheticField[javax.sql.rowset.serial.SQLInputImpl.attrib].ArrayElement", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.sql.rowset.serial", "SQLInputImpl", True, "readAsciiStream", "()", "", "Argument[this].SyntheticField[javax.sql.rowset.serial.SQLInputImpl.attrib].ArrayElement", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.sql.rowset.serial", "SQLInputImpl", True, "readBinaryStream", "()", "", "Argument[this].SyntheticField[javax.sql.rowset.serial.SQLInputImpl.attrib].ArrayElement", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.sql.rowset.serial", "SQLInputImpl", True, "readBlob", "()", "", "Argument[this].SyntheticField[javax.sql.rowset.serial.SQLInputImpl.attrib].ArrayElement", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.sql.rowset.serial", "SQLInputImpl", True, "readBytes", "()", "", "Argument[this].SyntheticField[javax.sql.rowset.serial.SQLInputImpl.attrib].ArrayElement", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.sql.rowset.serial", "SQLInputImpl", True, "readCharacterStream", "()", "", "Argument[this].SyntheticField[javax.sql.rowset.serial.SQLInputImpl.attrib].ArrayElement", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.sql.rowset.serial", "SQLInputImpl", True, "readClob", "()", "", "Argument[this].SyntheticField[javax.sql.rowset.serial.SQLInputImpl.attrib].ArrayElement", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.sql.rowset.serial", "SQLInputImpl", True, "readDate", "()", "", "Argument[this].SyntheticField[javax.sql.rowset.serial.SQLInputImpl.attrib].ArrayElement", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.sql.rowset.serial", "SQLInputImpl", True, "readNClob", "()", "", "Argument[this].SyntheticField[javax.sql.rowset.serial.SQLInputImpl.attrib].ArrayElement", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.sql.rowset.serial", "SQLInputImpl", True, "readNString", "()", "", "Argument[this].SyntheticField[javax.sql.rowset.serial.SQLInputImpl.attrib].ArrayElement", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.sql.rowset.serial", "SQLInputImpl", True, "readObject", "()", "", "Argument[this].SyntheticField[javax.sql.rowset.serial.SQLInputImpl.attrib].ArrayElement", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.sql.rowset.serial", "SQLInputImpl", True, "readRef", "()", "", "Argument[this].SyntheticField[javax.sql.rowset.serial.SQLInputImpl.attrib].ArrayElement", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.sql.rowset.serial", "SQLInputImpl", True, "readRowId", "()", "", "Argument[this].SyntheticField[javax.sql.rowset.serial.SQLInputImpl.attrib].ArrayElement", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.sql.rowset.serial", "SQLInputImpl", True, "readSQLXML", "()", "", "Argument[this].SyntheticField[javax.sql.rowset.serial.SQLInputImpl.attrib].ArrayElement", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.sql.rowset.serial", "SQLInputImpl", True, "readString", "()", "", "Argument[this].SyntheticField[javax.sql.rowset.serial.SQLInputImpl.attrib].ArrayElement", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.sql.rowset.serial", "SQLInputImpl", True, "readTime", "()", "", "Argument[this].SyntheticField[javax.sql.rowset.serial.SQLInputImpl.attrib].ArrayElement", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.sql.rowset.serial", "SQLInputImpl", True, "readTimestamp", "()", "", "Argument[this].SyntheticField[javax.sql.rowset.serial.SQLInputImpl.attrib].ArrayElement", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.sql.rowset.serial", "SQLInputImpl", True, "readURL", "()", "", "Argument[this].SyntheticField[javax.sql.rowset.serial.SQLInputImpl.attrib].ArrayElement", "ReturnValue", "value", "dfc-generated"]
       - ["javax.sql.rowset.serial", "SQLOutputImpl", True, "SQLOutputImpl", "(Vector,Map)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
       - ["javax.sql.rowset.serial", "SQLOutputImpl", True, "SQLOutputImpl", "(Vector,Map)", "", "Argument[1].Element", "Argument[this]", "taint", "df-generated"]
       - ["javax.sql.rowset.serial", "SerialArray", True, "SerialArray", "(Array)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["javax.sql.rowset.serial", "SerialArray", True, "SerialArray", "(Array,Map)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["javax.sql.rowset.serial", "SerialBlob", True, "SerialBlob", "(Blob)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["javax.sql.rowset.serial", "SerialClob", True, "SerialClob", "(Clob)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.sql.rowset.serial", "SerialDatalink", True, "SerialDatalink", "(URL)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.sql.rowset.serial", "SerialDatalink", True, "getDatalink", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.sql.rowset.serial", "SerialDatalink", True, "SerialDatalink", "(URL)", "", "Argument[0]", "Argument[this].SyntheticField[javax.sql.rowset.serial.SerialDatalink.url]", "value", "dfc-generated"]
+      - ["javax.sql.rowset.serial", "SerialDatalink", True, "getDatalink", "()", "", "Argument[this].SyntheticField[javax.sql.rowset.serial.SerialDatalink.url]", "ReturnValue", "taint", "dfc-generated"]
       - ["javax.sql.rowset.serial", "SerialException", True, "SerialException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.sql.rowset.serial", "SerialJavaObject", True, "SerialJavaObject", "(Object)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.sql.rowset.serial", "SerialJavaObject", True, "getObject", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.sql.rowset.serial", "SerialRef", True, "SerialRef", "(Ref)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.sql.rowset.serial", "SerialJavaObject", True, "SerialJavaObject", "(Object)", "", "Argument[0]", "Argument[this].SyntheticField[javax.sql.rowset.serial.SerialJavaObject.obj]", "value", "dfc-generated"]
+      - ["javax.sql.rowset.serial", "SerialJavaObject", True, "getObject", "()", "", "Argument[this].SyntheticField[javax.sql.rowset.serial.SerialJavaObject.obj]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.sql.rowset.serial", "SerialRef", True, "SerialRef", "(Ref)", "", "Argument[0]", "Argument[this].SyntheticField[javax.sql.rowset.serial.SerialRef.object]", "value", "dfc-generated"]
+      - ["javax.sql.rowset.serial", "SerialRef", True, "getObject", "()", "", "Argument[this].SyntheticField[javax.sql.rowset.serial.SerialRef.object]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.sql.rowset.serial", "SerialRef", True, "getObject", "()", "", "Argument[this].SyntheticField[javax.sql.rowset.serial.SerialRef.reference].SyntheticField[javax.sql.rowset.serial.SerialRef.object]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.sql.rowset.serial", "SerialRef", True, "setObject", "(Object)", "", "Argument[0]", "Argument[this].SyntheticField[javax.sql.rowset.serial.SerialRef.object]", "value", "dfc-generated"]
+      - ["javax.sql.rowset.serial", "SerialRef", True, "setObject", "(Object)", "", "Argument[0]", "Argument[this].SyntheticField[javax.sql.rowset.serial.SerialRef.reference].SyntheticField[javax.sql.rowset.serial.SerialRef.object]", "value", "dfc-generated"]
       - ["javax.sql.rowset.serial", "SerialStruct", True, "SerialStruct", "(Struct,Map)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
   - addsTo:
       pack: codeql/java-all
       extensible: neutralModel
     data:
+      - ["javax.sql.rowset.serial", "SQLInputImpl", "readBigDecimal", "()", "summary", "df-generated"]
+      - ["javax.sql.rowset.serial", "SQLInputImpl", "readBoolean", "()", "summary", "df-generated"]
+      - ["javax.sql.rowset.serial", "SQLInputImpl", "readByte", "()", "summary", "df-generated"]
+      - ["javax.sql.rowset.serial", "SQLInputImpl", "readDouble", "()", "summary", "df-generated"]
+      - ["javax.sql.rowset.serial", "SQLInputImpl", "readFloat", "()", "summary", "df-generated"]
+      - ["javax.sql.rowset.serial", "SQLInputImpl", "readInt", "()", "summary", "df-generated"]
+      - ["javax.sql.rowset.serial", "SQLInputImpl", "readLong", "()", "summary", "df-generated"]
+      - ["javax.sql.rowset.serial", "SQLInputImpl", "readShort", "()", "summary", "df-generated"]
+      - ["javax.sql.rowset.serial", "SQLInputImpl", "wasNull", "()", "summary", "df-generated"]
+      - ["javax.sql.rowset.serial", "SQLOutputImpl", "writeArray", "(Array)", "summary", "df-generated"]
+      - ["javax.sql.rowset.serial", "SQLOutputImpl", "writeBigDecimal", "(BigDecimal)", "summary", "df-generated"]
+      - ["javax.sql.rowset.serial", "SQLOutputImpl", "writeBlob", "(Blob)", "summary", "df-generated"]
+      - ["javax.sql.rowset.serial", "SQLOutputImpl", "writeBoolean", "(boolean)", "summary", "df-generated"]
+      - ["javax.sql.rowset.serial", "SQLOutputImpl", "writeByte", "(byte)", "summary", "df-generated"]
+      - ["javax.sql.rowset.serial", "SQLOutputImpl", "writeClob", "(Clob)", "summary", "df-generated"]
+      - ["javax.sql.rowset.serial", "SQLOutputImpl", "writeDouble", "(double)", "summary", "df-generated"]
+      - ["javax.sql.rowset.serial", "SQLOutputImpl", "writeFloat", "(float)", "summary", "df-generated"]
+      - ["javax.sql.rowset.serial", "SQLOutputImpl", "writeInt", "(int)", "summary", "df-generated"]
+      - ["javax.sql.rowset.serial", "SQLOutputImpl", "writeLong", "(long)", "summary", "df-generated"]
+      - ["javax.sql.rowset.serial", "SQLOutputImpl", "writeObject", "(SQLData)", "summary", "df-generated"]
+      - ["javax.sql.rowset.serial", "SQLOutputImpl", "writeRef", "(Ref)", "summary", "df-generated"]
+      - ["javax.sql.rowset.serial", "SQLOutputImpl", "writeShort", "(short)", "summary", "df-generated"]
+      - ["javax.sql.rowset.serial", "SQLOutputImpl", "writeStruct", "(Struct)", "summary", "df-generated"]
+      - ["javax.sql.rowset.serial", "SQLOutputImpl", "writeURL", "(URL)", "summary", "df-generated"]
+      - ["javax.sql.rowset.serial", "SerialArray", "free", "()", "summary", "df-generated"]
+      - ["javax.sql.rowset.serial", "SerialArray", "getBaseType", "()", "summary", "df-generated"]
+      - ["javax.sql.rowset.serial", "SerialArray", "getResultSet", "()", "summary", "df-generated"]
+      - ["javax.sql.rowset.serial", "SerialArray", "getResultSet", "(Map)", "summary", "df-generated"]
+      - ["javax.sql.rowset.serial", "SerialArray", "getResultSet", "(long,int)", "summary", "df-generated"]
+      - ["javax.sql.rowset.serial", "SerialArray", "getResultSet", "(long,int,Map)", "summary", "df-generated"]
       - ["javax.sql.rowset.serial", "SerialBlob", "SerialBlob", "(byte[])", "summary", "df-generated"]
+      - ["javax.sql.rowset.serial", "SerialBlob", "free", "()", "summary", "df-generated"]
+      - ["javax.sql.rowset.serial", "SerialBlob", "getBytes", "(long,int)", "summary", "df-generated"]
+      - ["javax.sql.rowset.serial", "SerialBlob", "length", "()", "summary", "df-generated"]
+      - ["javax.sql.rowset.serial", "SerialBlob", "position", "(Blob,long)", "summary", "df-generated"]
+      - ["javax.sql.rowset.serial", "SerialBlob", "position", "(byte[],long)", "summary", "df-generated"]
+      - ["javax.sql.rowset.serial", "SerialBlob", "setBinaryStream", "(long)", "summary", "df-generated"]
+      - ["javax.sql.rowset.serial", "SerialBlob", "setBytes", "(long,byte[])", "summary", "df-generated"]
+      - ["javax.sql.rowset.serial", "SerialBlob", "setBytes", "(long,byte[],int,int)", "summary", "df-generated"]
+      - ["javax.sql.rowset.serial", "SerialBlob", "truncate", "(long)", "summary", "df-generated"]
       - ["javax.sql.rowset.serial", "SerialClob", "SerialClob", "(char[])", "summary", "df-generated"]
+      - ["javax.sql.rowset.serial", "SerialClob", "free", "()", "summary", "df-generated"]
+      - ["javax.sql.rowset.serial", "SerialClob", "getAsciiStream", "()", "summary", "df-generated"]
+      - ["javax.sql.rowset.serial", "SerialClob", "length", "()", "summary", "df-generated"]
+      - ["javax.sql.rowset.serial", "SerialClob", "position", "(Clob,long)", "summary", "df-generated"]
+      - ["javax.sql.rowset.serial", "SerialClob", "position", "(String,long)", "summary", "df-generated"]
+      - ["javax.sql.rowset.serial", "SerialClob", "setAsciiStream", "(long)", "summary", "df-generated"]
+      - ["javax.sql.rowset.serial", "SerialClob", "setCharacterStream", "(long)", "summary", "df-generated"]
+      - ["javax.sql.rowset.serial", "SerialClob", "setString", "(long,String)", "summary", "df-generated"]
+      - ["javax.sql.rowset.serial", "SerialClob", "setString", "(long,String,int,int)", "summary", "df-generated"]
+      - ["javax.sql.rowset.serial", "SerialClob", "truncate", "(long)", "summary", "df-generated"]
       - ["javax.sql.rowset.serial", "SerialJavaObject", "getFields", "()", "summary", "df-generated"]
+      - ["javax.sql.rowset.serial", "SerialRef", "getObject", "(Map)", "summary", "df-generated"]
       - ["javax.sql.rowset.serial", "SerialStruct", "SerialStruct", "(SQLData,Map)", "summary", "df-generated"]
diff --git a/java/ql/lib/ext/generated/javax.sql.rowset.spi.model.yml b/java/ql/lib/ext/generated/javax.sql.rowset.spi.model.yml
index 4750381cd8c..3f264d1c497 100644
--- a/java/ql/lib/ext/generated/javax.sql.rowset.spi.model.yml
+++ b/java/ql/lib/ext/generated/javax.sql.rowset.spi.model.yml
@@ -4,15 +4,19 @@ extensions:
       pack: codeql/java-all
       extensible: summaryModel
     data:
-      - ["javax.sql.rowset.spi", "SyncFactory", True, "setLogger", "(Logger,Level)", "", "Argument[1]", "Argument[0]", "taint", "df-generated"]
+      - ["javax.sql.rowset.spi", "SyncFactory", True, "setLogger", "(Logger,Level)", "", "Argument[1]", "Argument[0].SyntheticField[java.util.logging.Logger.config].SyntheticField[java.util.logging.Logger$ConfigurationData.levelObject]", "value", "dfc-generated"]
       - ["javax.sql.rowset.spi", "SyncFactoryException", True, "SyncFactoryException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["javax.sql.rowset.spi", "SyncProvider", True, "getProviderID", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.sql.rowset.spi", "SyncProvider", True, "getRowSetReader", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.sql.rowset.spi", "SyncProvider", True, "getRowSetWriter", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["javax.sql.rowset.spi", "SyncProvider", True, "getVendor", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["javax.sql.rowset.spi", "SyncProvider", True, "getVersion", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["javax.sql.rowset.spi", "SyncProviderException", True, "SyncProviderException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.sql.rowset.spi", "SyncProviderException", True, "SyncProviderException", "(SyncResolver)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.sql.rowset.spi", "SyncProviderException", True, "getSyncResolver", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.sql.rowset.spi", "SyncProviderException", True, "setSyncResolver", "(SyncResolver)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.sql.rowset.spi", "SyncProviderException", True, "SyncProviderException", "(SyncResolver)", "", "Argument[0]", "Argument[this].SyntheticField[javax.sql.rowset.spi.SyncProviderException.syncResolver]", "value", "dfc-generated"]
+      - ["javax.sql.rowset.spi", "SyncProviderException", True, "getSyncResolver", "()", "", "Argument[this].SyntheticField[javax.sql.rowset.spi.SyncProviderException.syncResolver]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.sql.rowset.spi", "SyncProviderException", True, "setSyncResolver", "(SyncResolver)", "", "Argument[0]", "Argument[this].SyntheticField[javax.sql.rowset.spi.SyncProviderException.syncResolver]", "value", "dfc-generated"]
+      - ["javax.sql.rowset.spi", "XmlWriter", True, "writeXML", "(WebRowSet,Writer)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.sql.rowset.spi", "XmlWriter", True, "writeXML", "(WebRowSet,Writer)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
   - addsTo:
       pack: codeql/java-all
       extensible: neutralModel
@@ -27,7 +31,5 @@ extensions:
       - ["javax.sql.rowset.spi", "SyncFactory", "unregisterProvider", "(String)", "summary", "df-generated"]
       - ["javax.sql.rowset.spi", "SyncProvider", "getDataSourceLock", "()", "summary", "df-generated"]
       - ["javax.sql.rowset.spi", "SyncProvider", "getProviderGrade", "()", "summary", "df-generated"]
-      - ["javax.sql.rowset.spi", "SyncProvider", "getRowSetReader", "()", "summary", "df-generated"]
-      - ["javax.sql.rowset.spi", "SyncProvider", "getRowSetWriter", "()", "summary", "df-generated"]
       - ["javax.sql.rowset.spi", "SyncProvider", "setDataSourceLock", "(int)", "summary", "df-generated"]
       - ["javax.sql.rowset.spi", "SyncProvider", "supportsUpdatableView", "()", "summary", "df-generated"]
diff --git a/java/ql/lib/ext/generated/javax.tools.model.yml b/java/ql/lib/ext/generated/javax.tools.model.yml
index d68f04440e7..02e98f06f22 100644
--- a/java/ql/lib/ext/generated/javax.tools.model.yml
+++ b/java/ql/lib/ext/generated/javax.tools.model.yml
@@ -4,7 +4,14 @@ extensions:
       pack: codeql/java-all
       extensible: summaryModel
     data:
-      - ["javax.tools", "DiagnosticCollector", False, "getDiagnostics", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.tools", "DiagnosticCollector", False, "getDiagnostics", "()", "", "Argument[this].SyntheticField[javax.tools.DiagnosticCollector.diagnostics].Element", "ReturnValue.Element", "value", "dfc-generated"]
+      - ["javax.tools", "DiagnosticCollector", False, "report", "(Diagnostic)", "", "Argument[0]", "Argument[this].SyntheticField[javax.tools.DiagnosticCollector.diagnostics].Element", "value", "dfc-generated"]
+      - ["javax.tools", "DocumentationTool$DocumentationTask", True, "addModules", "(Iterable)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
+      - ["javax.tools", "DocumentationTool$DocumentationTask", True, "setLocale", "(Locale)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.tools", "DocumentationTool", True, "getStandardFileManager", "(DiagnosticListener,Locale,Charset)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.tools", "DocumentationTool", True, "getStandardFileManager", "(DiagnosticListener,Locale,Charset)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.tools", "DocumentationTool", True, "getTask", "(Writer,JavaFileManager,DiagnosticListener,Class,Iterable,Iterable)", "", "Argument[4].Element", "ReturnValue", "taint", "df-generated"]
+      - ["javax.tools", "DocumentationTool", True, "getTask", "(Writer,JavaFileManager,DiagnosticListener,Class,Iterable,Iterable)", "", "Argument[5].Element", "ReturnValue", "taint", "df-generated"]
       - ["javax.tools", "FileObject", True, "getCharContent", "(boolean)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["javax.tools", "FileObject", True, "getName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["javax.tools", "FileObject", True, "openInputStream", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
@@ -12,56 +19,93 @@ extensions:
       - ["javax.tools", "FileObject", True, "openReader", "(boolean)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["javax.tools", "FileObject", True, "openWriter", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["javax.tools", "FileObject", True, "toUri", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.tools", "ForwardingJavaFileManager", True, "getLocationForModule", "(JavaFileManager$Location,String)", "", "Argument[1]", "ReturnValue.SyntheticField[com.sun.tools.javac.file.Locations$ModuleLocationHandler.moduleName]", "value", "dfc-generated"]
+      - ["javax.tools", "ForwardingJavaFileManager", True, "getLocationForModule", "(JavaFileManager$Location,String)", "", "Argument[1]", "ReturnValue.SyntheticField[com.sun.tools.javac.file.Locations$ModuleLocationHandler.searchPath].Element", "taint", "dfc-generated"]
+      - ["javax.tools", "ForwardingJavaFileManager", True, "inferModuleName", "(JavaFileManager$Location)", "", "Argument[0].SyntheticField[com.sun.tools.javac.file.Locations$ModuleLocationHandler.moduleName]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.tools", "JavaCompiler$CompilationTask", True, "addModules", "(Iterable)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
+      - ["javax.tools", "JavaCompiler$CompilationTask", True, "setLocale", "(Locale)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.tools", "JavaCompiler$CompilationTask", True, "setProcessors", "(Iterable)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
+      - ["javax.tools", "JavaCompiler", True, "getStandardFileManager", "(DiagnosticListener,Locale,Charset)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.tools", "JavaCompiler", True, "getStandardFileManager", "(DiagnosticListener,Locale,Charset)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.tools", "JavaCompiler", True, "getTask", "(Writer,JavaFileManager,DiagnosticListener,Iterable,Iterable,Iterable)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.tools", "JavaCompiler", True, "getTask", "(Writer,JavaFileManager,DiagnosticListener,Iterable,Iterable,Iterable)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.tools", "JavaCompiler", True, "getTask", "(Writer,JavaFileManager,DiagnosticListener,Iterable,Iterable,Iterable)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.tools", "JavaFileManager$Location", True, "getName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["javax.tools", "JavaFileManager", True, "getFileForInput", "(JavaFileManager$Location,String,String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.tools", "JavaFileManager", True, "getFileForInput", "(JavaFileManager$Location,String,String)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.tools", "JavaFileManager", True, "getFileForInput", "(JavaFileManager$Location,String,String)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.tools", "JavaFileManager", True, "getFileForInput", "(JavaFileManager$Location,String,String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["javax.tools", "JavaFileManager", True, "getFileForOutput", "(JavaFileManager$Location,String,String,FileObject)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.tools", "JavaFileManager", True, "getFileForOutput", "(JavaFileManager$Location,String,String,FileObject)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
       - ["javax.tools", "JavaFileManager", True, "getFileForOutput", "(JavaFileManager$Location,String,String,FileObject)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.tools", "JavaFileManager", True, "getFileForOutput", "(JavaFileManager$Location,String,String,FileObject)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
       - ["javax.tools", "JavaFileManager", True, "getFileForOutput", "(JavaFileManager$Location,String,String,FileObject)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
       - ["javax.tools", "JavaFileManager", True, "getFileForOutput", "(JavaFileManager$Location,String,String,FileObject)", "", "Argument[3]", "ReturnValue", "taint", "df-generated"]
       - ["javax.tools", "JavaFileManager", True, "getFileForOutput", "(JavaFileManager$Location,String,String,FileObject)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["javax.tools", "JavaFileManager", True, "getJavaFileForInput", "(JavaFileManager$Location,String,JavaFileObject$Kind)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.tools", "JavaFileManager", True, "getJavaFileForInput", "(JavaFileManager$Location,String,JavaFileObject$Kind)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.tools", "JavaFileManager", True, "getJavaFileForInput", "(JavaFileManager$Location,String,JavaFileObject$Kind)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["javax.tools", "JavaFileManager", True, "getJavaFileForOutput", "(JavaFileManager$Location,String,JavaFileObject$Kind,FileObject)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.tools", "JavaFileManager", True, "getJavaFileForOutput", "(JavaFileManager$Location,String,JavaFileObject$Kind,FileObject)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
       - ["javax.tools", "JavaFileManager", True, "getJavaFileForOutput", "(JavaFileManager$Location,String,JavaFileObject$Kind,FileObject)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
       - ["javax.tools", "JavaFileManager", True, "getJavaFileForOutput", "(JavaFileManager$Location,String,JavaFileObject$Kind,FileObject)", "", "Argument[3]", "ReturnValue", "taint", "df-generated"]
       - ["javax.tools", "JavaFileManager", True, "getJavaFileForOutput", "(JavaFileManager$Location,String,JavaFileObject$Kind,FileObject)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["javax.tools", "JavaFileManager", True, "getLocationForModule", "(JavaFileManager$Location,String)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.tools", "JavaFileManager", True, "getLocationForModule", "(JavaFileManager$Location,String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["javax.tools", "JavaFileManager", True, "inferBinaryName", "(JavaFileManager$Location,JavaFileObject)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
       - ["javax.tools", "JavaFileManager", True, "inferModuleName", "(JavaFileManager$Location)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.tools", "JavaFileManager", True, "inferModuleName", "(JavaFileManager$Location)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["javax.tools", "JavaFileManager", True, "list", "(JavaFileManager$Location,String,Set,boolean)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.tools", "StandardJavaFileManager$PathFactory", True, "getPath", "(String,String[])", "", "Argument[0]", "ReturnValue", "taint", "dfc-generated"]
+      - ["javax.tools", "StandardJavaFileManager$PathFactory", True, "getPath", "(String,String[])", "", "Argument[1].ArrayElement", "ReturnValue", "taint", "dfc-generated"]
+      - ["javax.tools", "StandardJavaFileManager", True, "asPath", "(FileObject)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.tools", "StandardJavaFileManager", True, "getJavaFileObjects", "(File[])", "", "Argument[0].ArrayElement", "ReturnValue", "taint", "df-generated"]
+      - ["javax.tools", "StandardJavaFileManager", True, "getJavaFileObjects", "(File[])", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["javax.tools", "StandardJavaFileManager", True, "getJavaFileObjects", "(Path[])", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.tools", "StandardJavaFileManager", True, "getJavaFileObjects", "(String[])", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.tools", "StandardJavaFileManager", True, "getJavaFileObjectsFromFiles", "(Iterable)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
+      - ["javax.tools", "StandardJavaFileManager", True, "getJavaFileObjectsFromFiles", "(Iterable)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.tools", "StandardJavaFileManager", True, "getJavaFileObjectsFromPaths", "(Collection)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
       - ["javax.tools", "StandardJavaFileManager", True, "getJavaFileObjectsFromPaths", "(Collection)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["javax.tools", "StandardJavaFileManager", True, "getJavaFileObjectsFromPaths", "(Iterable)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
       - ["javax.tools", "StandardJavaFileManager", True, "getJavaFileObjectsFromPaths", "(Iterable)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.tools", "StandardJavaFileManager", True, "getJavaFileObjectsFromStrings", "(Iterable)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.tools", "StandardJavaFileManager", True, "getLocationAsPaths", "(JavaFileManager$Location)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.tools", "StandardJavaFileManager", True, "setPathFactory", "(StandardJavaFileManager$PathFactory)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["javax.tools", "StandardLocation", False, "locationFor", "(String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
   - addsTo:
       pack: codeql/java-all
       extensible: neutralModel
     data:
-      - ["javax.tools", "FileObject", "delete", "()", "summary", "df-generated"]
-      - ["javax.tools", "FileObject", "getLastModified", "()", "summary", "df-generated"]
-      - ["javax.tools", "JavaFileManager$Location", "getName", "()", "summary", "df-generated"]
+      - ["javax.tools", "DocumentationTool$Location", "isOutputLocation", "()", "summary", "df-generated"]
+      - ["javax.tools", "ForwardingFileObject", "delete", "()", "summary", "df-generated"]
+      - ["javax.tools", "ForwardingFileObject", "getLastModified", "()", "summary", "df-generated"]
+      - ["javax.tools", "ForwardingJavaFileManager", "contains", "(JavaFileManager$Location,FileObject)", "summary", "df-generated"]
+      - ["javax.tools", "ForwardingJavaFileManager", "flush", "()", "summary", "df-generated"]
+      - ["javax.tools", "ForwardingJavaFileManager", "getClassLoader", "(JavaFileManager$Location)", "summary", "df-generated"]
+      - ["javax.tools", "ForwardingJavaFileManager", "getLocationForModule", "(JavaFileManager$Location,JavaFileObject)", "summary", "df-generated"]
+      - ["javax.tools", "ForwardingJavaFileManager", "getServiceLoader", "(JavaFileManager$Location,Class)", "summary", "df-generated"]
+      - ["javax.tools", "ForwardingJavaFileManager", "handleOption", "(String,Iterator)", "summary", "df-generated"]
+      - ["javax.tools", "ForwardingJavaFileManager", "hasLocation", "(JavaFileManager$Location)", "summary", "df-generated"]
+      - ["javax.tools", "ForwardingJavaFileManager", "isSameFile", "(FileObject,FileObject)", "summary", "df-generated"]
+      - ["javax.tools", "ForwardingJavaFileManager", "isSupportedOption", "(String)", "summary", "df-generated"]
+      - ["javax.tools", "ForwardingJavaFileManager", "listLocationsForModules", "(JavaFileManager$Location)", "summary", "df-generated"]
+      - ["javax.tools", "ForwardingJavaFileObject", "getAccessLevel", "()", "summary", "df-generated"]
+      - ["javax.tools", "ForwardingJavaFileObject", "getKind", "()", "summary", "df-generated"]
+      - ["javax.tools", "ForwardingJavaFileObject", "getNestingKind", "()", "summary", "df-generated"]
+      - ["javax.tools", "ForwardingJavaFileObject", "isNameCompatible", "(String,JavaFileObject$Kind)", "summary", "df-generated"]
       - ["javax.tools", "JavaFileManager$Location", "isModuleOrientedLocation", "()", "summary", "df-generated"]
-      - ["javax.tools", "JavaFileManager$Location", "isOutputLocation", "()", "summary", "df-generated"]
       - ["javax.tools", "JavaFileManager", "contains", "(JavaFileManager$Location,FileObject)", "summary", "df-generated"]
-      - ["javax.tools", "JavaFileManager", "getClassLoader", "(JavaFileManager$Location)", "summary", "df-generated"]
       - ["javax.tools", "JavaFileManager", "getLocationForModule", "(JavaFileManager$Location,JavaFileObject)", "summary", "df-generated"]
       - ["javax.tools", "JavaFileManager", "getServiceLoader", "(JavaFileManager$Location,Class)", "summary", "df-generated"]
-      - ["javax.tools", "JavaFileManager", "handleOption", "(String,Iterator)", "summary", "df-generated"]
-      - ["javax.tools", "JavaFileManager", "hasLocation", "(JavaFileManager$Location)", "summary", "df-generated"]
-      - ["javax.tools", "JavaFileManager", "isSameFile", "(FileObject,FileObject)", "summary", "df-generated"]
       - ["javax.tools", "JavaFileManager", "listLocationsForModules", "(JavaFileManager$Location)", "summary", "df-generated"]
-      - ["javax.tools", "JavaFileObject", "getAccessLevel", "()", "summary", "df-generated"]
-      - ["javax.tools", "JavaFileObject", "getKind", "()", "summary", "df-generated"]
-      - ["javax.tools", "JavaFileObject", "getNestingKind", "()", "summary", "df-generated"]
-      - ["javax.tools", "JavaFileObject", "isNameCompatible", "(String,JavaFileObject$Kind)", "summary", "df-generated"]
-      - ["javax.tools", "OptionChecker", "isSupportedOption", "(String)", "summary", "df-generated"]
-      - ["javax.tools", "StandardJavaFileManager", "asPath", "(FileObject)", "summary", "df-generated"]
-      - ["javax.tools", "StandardJavaFileManager", "getLocationAsPaths", "(JavaFileManager$Location)", "summary", "df-generated"]
+      - ["javax.tools", "SimpleJavaFileObject", "delete", "()", "summary", "df-generated"]
+      - ["javax.tools", "SimpleJavaFileObject", "getAccessLevel", "()", "summary", "df-generated"]
+      - ["javax.tools", "SimpleJavaFileObject", "getKind", "()", "summary", "df-generated"]
+      - ["javax.tools", "SimpleJavaFileObject", "getLastModified", "()", "summary", "df-generated"]
+      - ["javax.tools", "SimpleJavaFileObject", "getNestingKind", "()", "summary", "df-generated"]
+      - ["javax.tools", "SimpleJavaFileObject", "isNameCompatible", "(String,JavaFileObject$Kind)", "summary", "df-generated"]
       - ["javax.tools", "StandardJavaFileManager", "setLocationForModule", "(JavaFileManager$Location,String,Collection)", "summary", "df-generated"]
       - ["javax.tools", "StandardJavaFileManager", "setLocationFromPaths", "(JavaFileManager$Location,Collection)", "summary", "df-generated"]
-      - ["javax.tools", "StandardJavaFileManager", "setPathFactory", "(StandardJavaFileManager$PathFactory)", "summary", "df-generated"]
+      - ["javax.tools", "StandardLocation", "isModuleOrientedLocation", "()", "summary", "df-generated"]
+      - ["javax.tools", "StandardLocation", "isOutputLocation", "()", "summary", "df-generated"]
       - ["javax.tools", "Tool", "name", "()", "summary", "df-generated"]
       - ["javax.tools", "ToolProvider", "getSystemDocumentationTool", "()", "summary", "df-generated"]
       - ["javax.tools", "ToolProvider", "getSystemJavaCompiler", "()", "summary", "df-generated"]
diff --git a/java/ql/lib/ext/generated/javax.xml.catalog.model.yml b/java/ql/lib/ext/generated/javax.xml.catalog.model.yml
index bdce521147c..a53482f7c44 100644
--- a/java/ql/lib/ext/generated/javax.xml.catalog.model.yml
+++ b/java/ql/lib/ext/generated/javax.xml.catalog.model.yml
@@ -7,19 +7,19 @@ extensions:
       - ["javax.xml.catalog", "CatalogException", True, "CatalogException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["javax.xml.catalog", "CatalogException", True, "CatalogException", "(String,Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["javax.xml.catalog", "CatalogException", True, "CatalogException", "(String,Throwable)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.xml.catalog", "CatalogFeatures$Builder", True, "with", "(CatalogFeatures$Feature,String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.xml.catalog", "CatalogFeatures$Builder", True, "with", "(CatalogFeatures$Feature,String)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["javax.xml.catalog", "CatalogFeatures$Builder", True, "with", "(CatalogFeatures$Feature,String)", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
       - ["javax.xml.catalog", "CatalogFeatures", True, "get", "(CatalogFeatures$Feature)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["javax.xml.catalog", "CatalogManager", False, "catalog", "(CatalogFeatures,URI[])", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["javax.xml.catalog", "CatalogManager", False, "catalog", "(CatalogFeatures,URI[])", "", "Argument[1].ArrayElement", "ReturnValue", "taint", "df-generated"]
       - ["javax.xml.catalog", "CatalogManager", False, "catalogResolver", "(Catalog)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["javax.xml.catalog", "CatalogManager", False, "catalogResolver", "(CatalogFeatures,URI[])", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["javax.xml.catalog", "CatalogManager", False, "catalogResolver", "(CatalogFeatures,URI[])", "", "Argument[1].ArrayElement", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.catalog", "CatalogResolver", True, "resolveEntity", "(String,String)", "", "Argument[1]", "ReturnValue", "taint", "dfc-generated"]
+      - ["javax.xml.catalog", "CatalogResolver", True, "resolveResource", "(String,String,String,String,String)", "", "Argument[3]", "ReturnValue", "taint", "df-generated"]
   - addsTo:
       pack: codeql/java-all
       extensible: neutralModel
     data:
-      - ["javax.xml.catalog", "Catalog", "catalogs", "()", "summary", "df-generated"]
       - ["javax.xml.catalog", "CatalogFeatures$Builder", "build", "()", "summary", "df-generated"]
       - ["javax.xml.catalog", "CatalogFeatures$Feature", "defaultValue", "()", "summary", "df-generated"]
       - ["javax.xml.catalog", "CatalogFeatures$Feature", "getPropertyName", "()", "summary", "df-generated"]
diff --git a/java/ql/lib/ext/generated/javax.xml.crypto.dom.model.yml b/java/ql/lib/ext/generated/javax.xml.crypto.dom.model.yml
index a2933bbf4c2..6095e5309a7 100644
--- a/java/ql/lib/ext/generated/javax.xml.crypto.dom.model.yml
+++ b/java/ql/lib/ext/generated/javax.xml.crypto.dom.model.yml
@@ -4,8 +4,35 @@ extensions:
       pack: codeql/java-all
       extensible: summaryModel
     data:
-      - ["javax.xml.crypto.dom", "DOMCryptoContext", True, "getElementById", "(String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.xml.crypto.dom", "DOMCryptoContext", True, "iterator", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.xml.crypto.dom", "DOMCryptoContext", True, "setIdAttributeNS", "(Element,String,String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.xml.crypto.dom", "DOMStructure", True, "DOMStructure", "(Node)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.xml.crypto.dom", "DOMStructure", True, "getNode", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.crypto.dom", "DOMCryptoContext", True, "get", "(Object)", "", "Argument[this].SyntheticField[javax.xml.crypto.dom.DOMCryptoContext.objMap].MapValue", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.xml.crypto.dom", "DOMCryptoContext", True, "getBaseURI", "()", "", "Argument[this].SyntheticField[javax.xml.crypto.dom.DOMCryptoContext.baseURI]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.xml.crypto.dom", "DOMCryptoContext", True, "getDefaultNamespacePrefix", "()", "", "Argument[this].SyntheticField[javax.xml.crypto.dom.DOMCryptoContext.defaultPrefix]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.xml.crypto.dom", "DOMCryptoContext", True, "getElementById", "(String)", "", "Argument[this].SyntheticField[javax.xml.crypto.dom.DOMCryptoContext.idMap].MapValue", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.xml.crypto.dom", "DOMCryptoContext", True, "getKeySelector", "()", "", "Argument[this].SyntheticField[javax.xml.crypto.dom.DOMCryptoContext.ks]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.xml.crypto.dom", "DOMCryptoContext", True, "getNamespacePrefix", "(String,String)", "", "Argument[this].SyntheticField[javax.xml.crypto.dom.DOMCryptoContext.nsMap].MapValue", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.xml.crypto.dom", "DOMCryptoContext", True, "getProperty", "(String)", "", "Argument[this].SyntheticField[javax.xml.crypto.dom.DOMCryptoContext.propMap].MapValue", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.xml.crypto.dom", "DOMCryptoContext", True, "getURIDereferencer", "()", "", "Argument[this].SyntheticField[javax.xml.crypto.dom.DOMCryptoContext.dereferencer]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.xml.crypto.dom", "DOMCryptoContext", True, "iterator", "()", "", "Argument[this].SyntheticField[javax.xml.crypto.dom.DOMCryptoContext.idMap].MapKey", "ReturnValue.Element.MapKey", "value", "dfc-generated"]
+      - ["javax.xml.crypto.dom", "DOMCryptoContext", True, "iterator", "()", "", "Argument[this].SyntheticField[javax.xml.crypto.dom.DOMCryptoContext.idMap].MapValue", "ReturnValue.Element.MapValue", "value", "dfc-generated"]
+      - ["javax.xml.crypto.dom", "DOMCryptoContext", True, "put", "(Object,Object)", "", "Argument[0]", "Argument[this].SyntheticField[javax.xml.crypto.dom.DOMCryptoContext.objMap].MapKey", "value", "dfc-generated"]
+      - ["javax.xml.crypto.dom", "DOMCryptoContext", True, "put", "(Object,Object)", "", "Argument[1]", "Argument[this].SyntheticField[javax.xml.crypto.dom.DOMCryptoContext.objMap].MapValue", "value", "dfc-generated"]
+      - ["javax.xml.crypto.dom", "DOMCryptoContext", True, "put", "(Object,Object)", "", "Argument[this].SyntheticField[javax.xml.crypto.dom.DOMCryptoContext.objMap].MapValue", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.xml.crypto.dom", "DOMCryptoContext", True, "putNamespacePrefix", "(String,String)", "", "Argument[0]", "Argument[this].SyntheticField[javax.xml.crypto.dom.DOMCryptoContext.nsMap].MapKey", "value", "dfc-generated"]
+      - ["javax.xml.crypto.dom", "DOMCryptoContext", True, "putNamespacePrefix", "(String,String)", "", "Argument[1]", "Argument[this].SyntheticField[javax.xml.crypto.dom.DOMCryptoContext.nsMap].MapValue", "value", "dfc-generated"]
+      - ["javax.xml.crypto.dom", "DOMCryptoContext", True, "putNamespacePrefix", "(String,String)", "", "Argument[this].SyntheticField[javax.xml.crypto.dom.DOMCryptoContext.nsMap].MapValue", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.xml.crypto.dom", "DOMCryptoContext", True, "setBaseURI", "(String)", "", "Argument[0]", "Argument[this].SyntheticField[javax.xml.crypto.dom.DOMCryptoContext.baseURI]", "value", "dfc-generated"]
+      - ["javax.xml.crypto.dom", "DOMCryptoContext", True, "setDefaultNamespacePrefix", "(String)", "", "Argument[0]", "Argument[this].SyntheticField[javax.xml.crypto.dom.DOMCryptoContext.defaultPrefix]", "value", "dfc-generated"]
+      - ["javax.xml.crypto.dom", "DOMCryptoContext", True, "setIdAttributeNS", "(Element,String,String)", "", "Argument[0]", "Argument[this].SyntheticField[javax.xml.crypto.dom.DOMCryptoContext.idMap].MapValue", "value", "dfc-generated"]
+      - ["javax.xml.crypto.dom", "DOMCryptoContext", True, "setKeySelector", "(KeySelector)", "", "Argument[0]", "Argument[this].SyntheticField[javax.xml.crypto.dom.DOMCryptoContext.ks]", "value", "dfc-generated"]
+      - ["javax.xml.crypto.dom", "DOMCryptoContext", True, "setProperty", "(String,Object)", "", "Argument[0]", "Argument[this].SyntheticField[javax.xml.crypto.dom.DOMCryptoContext.propMap].MapKey", "value", "dfc-generated"]
+      - ["javax.xml.crypto.dom", "DOMCryptoContext", True, "setProperty", "(String,Object)", "", "Argument[1]", "Argument[this].SyntheticField[javax.xml.crypto.dom.DOMCryptoContext.propMap].MapValue", "value", "dfc-generated"]
+      - ["javax.xml.crypto.dom", "DOMCryptoContext", True, "setProperty", "(String,Object)", "", "Argument[this].SyntheticField[javax.xml.crypto.dom.DOMCryptoContext.propMap].MapValue", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.xml.crypto.dom", "DOMCryptoContext", True, "setURIDereferencer", "(URIDereferencer)", "", "Argument[0]", "Argument[this].SyntheticField[javax.xml.crypto.dom.DOMCryptoContext.dereferencer]", "value", "dfc-generated"]
+      - ["javax.xml.crypto.dom", "DOMStructure", True, "DOMStructure", "(Node)", "", "Argument[0]", "Argument[this].SyntheticField[javax.xml.crypto.dom.DOMStructure.node]", "value", "dfc-generated"]
+      - ["javax.xml.crypto.dom", "DOMStructure", True, "getNode", "()", "", "Argument[this].SyntheticField[javax.xml.crypto.dom.DOMStructure.node]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.xml.crypto.dom", "DOMURIReference", True, "getHere", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+  - addsTo:
+      pack: codeql/java-all
+      extensible: neutralModel
+    data:
+      - ["javax.xml.crypto.dom", "DOMStructure", "isFeatureSupported", "(String)", "summary", "df-generated"]
diff --git a/java/ql/lib/ext/generated/javax.xml.crypto.dsig.dom.model.yml b/java/ql/lib/ext/generated/javax.xml.crypto.dsig.dom.model.yml
index 719eccf3822..eaa1d244caf 100644
--- a/java/ql/lib/ext/generated/javax.xml.crypto.dsig.dom.model.yml
+++ b/java/ql/lib/ext/generated/javax.xml.crypto.dsig.dom.model.yml
@@ -4,23 +4,17 @@ extensions:
       pack: codeql/java-all
       extensible: summaryModel
     data:
-      - ["javax.xml.crypto.dsig.dom", "DOMSignContext", True, "DOMSignContext", "(Key,Node)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.xml.crypto.dsig.dom", "DOMSignContext", True, "DOMSignContext", "(Key,Node)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.xml.crypto.dsig.dom", "DOMSignContext", True, "DOMSignContext", "(Key,Node,Node)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.xml.crypto.dsig.dom", "DOMSignContext", True, "DOMSignContext", "(Key,Node,Node)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.xml.crypto.dsig.dom", "DOMSignContext", True, "DOMSignContext", "(Key,Node,Node)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.xml.crypto.dsig.dom", "DOMSignContext", True, "DOMSignContext", "(KeySelector,Node)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.xml.crypto.dsig.dom", "DOMSignContext", True, "DOMSignContext", "(KeySelector,Node)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.xml.crypto.dsig.dom", "DOMSignContext", True, "DOMSignContext", "(KeySelector,Node,Node)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.xml.crypto.dsig.dom", "DOMSignContext", True, "DOMSignContext", "(KeySelector,Node,Node)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.xml.crypto.dsig.dom", "DOMSignContext", True, "DOMSignContext", "(KeySelector,Node,Node)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.xml.crypto.dsig.dom", "DOMSignContext", True, "getNextSibling", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.xml.crypto.dsig.dom", "DOMSignContext", True, "getParent", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.xml.crypto.dsig.dom", "DOMSignContext", True, "setNextSibling", "(Node)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.xml.crypto.dsig.dom", "DOMSignContext", True, "setParent", "(Node)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.xml.crypto.dsig.dom", "DOMValidateContext", True, "DOMValidateContext", "(Key,Node)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.xml.crypto.dsig.dom", "DOMValidateContext", True, "DOMValidateContext", "(Key,Node)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.xml.crypto.dsig.dom", "DOMValidateContext", True, "DOMValidateContext", "(KeySelector,Node)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.xml.crypto.dsig.dom", "DOMValidateContext", True, "DOMValidateContext", "(KeySelector,Node)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.xml.crypto.dsig.dom", "DOMValidateContext", True, "getNode", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.xml.crypto.dsig.dom", "DOMValidateContext", True, "setNode", "(Node)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.crypto.dsig.dom", "DOMSignContext", True, "DOMSignContext", "(Key,Node)", "", "Argument[1]", "Argument[this].SyntheticField[javax.xml.crypto.dsig.dom.DOMSignContext.parent]", "value", "dfc-generated"]
+      - ["javax.xml.crypto.dsig.dom", "DOMSignContext", True, "DOMSignContext", "(Key,Node,Node)", "", "Argument[1]", "Argument[this].SyntheticField[javax.xml.crypto.dsig.dom.DOMSignContext.parent]", "value", "dfc-generated"]
+      - ["javax.xml.crypto.dsig.dom", "DOMSignContext", True, "DOMSignContext", "(Key,Node,Node)", "", "Argument[2]", "Argument[this].SyntheticField[javax.xml.crypto.dsig.dom.DOMSignContext.nextSibling]", "value", "dfc-generated"]
+      - ["javax.xml.crypto.dsig.dom", "DOMSignContext", True, "DOMSignContext", "(KeySelector,Node)", "", "Argument[1]", "Argument[this].SyntheticField[javax.xml.crypto.dsig.dom.DOMSignContext.parent]", "value", "dfc-generated"]
+      - ["javax.xml.crypto.dsig.dom", "DOMSignContext", True, "DOMSignContext", "(KeySelector,Node,Node)", "", "Argument[1]", "Argument[this].SyntheticField[javax.xml.crypto.dsig.dom.DOMSignContext.parent]", "value", "dfc-generated"]
+      - ["javax.xml.crypto.dsig.dom", "DOMSignContext", True, "DOMSignContext", "(KeySelector,Node,Node)", "", "Argument[2]", "Argument[this].SyntheticField[javax.xml.crypto.dsig.dom.DOMSignContext.nextSibling]", "value", "dfc-generated"]
+      - ["javax.xml.crypto.dsig.dom", "DOMSignContext", True, "getNextSibling", "()", "", "Argument[this].SyntheticField[javax.xml.crypto.dsig.dom.DOMSignContext.nextSibling]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.xml.crypto.dsig.dom", "DOMSignContext", True, "getParent", "()", "", "Argument[this].SyntheticField[javax.xml.crypto.dsig.dom.DOMSignContext.parent]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.xml.crypto.dsig.dom", "DOMSignContext", True, "setNextSibling", "(Node)", "", "Argument[0]", "Argument[this].SyntheticField[javax.xml.crypto.dsig.dom.DOMSignContext.nextSibling]", "value", "dfc-generated"]
+      - ["javax.xml.crypto.dsig.dom", "DOMSignContext", True, "setParent", "(Node)", "", "Argument[0]", "Argument[this].SyntheticField[javax.xml.crypto.dsig.dom.DOMSignContext.parent]", "value", "dfc-generated"]
+      - ["javax.xml.crypto.dsig.dom", "DOMValidateContext", True, "DOMValidateContext", "(Key,Node)", "", "Argument[1]", "Argument[this].SyntheticField[javax.xml.crypto.dsig.dom.DOMValidateContext.node]", "value", "dfc-generated"]
+      - ["javax.xml.crypto.dsig.dom", "DOMValidateContext", True, "DOMValidateContext", "(KeySelector,Node)", "", "Argument[1]", "Argument[this].SyntheticField[javax.xml.crypto.dsig.dom.DOMValidateContext.node]", "value", "dfc-generated"]
+      - ["javax.xml.crypto.dsig.dom", "DOMValidateContext", True, "getNode", "()", "", "Argument[this].SyntheticField[javax.xml.crypto.dsig.dom.DOMValidateContext.node]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.xml.crypto.dsig.dom", "DOMValidateContext", True, "setNode", "(Node)", "", "Argument[0]", "Argument[this].SyntheticField[javax.xml.crypto.dsig.dom.DOMValidateContext.node]", "value", "dfc-generated"]
diff --git a/java/ql/lib/ext/generated/javax.xml.crypto.dsig.keyinfo.model.yml b/java/ql/lib/ext/generated/javax.xml.crypto.dsig.keyinfo.model.yml
index 87e2099b5d0..04af9157205 100644
--- a/java/ql/lib/ext/generated/javax.xml.crypto.dsig.keyinfo.model.yml
+++ b/java/ql/lib/ext/generated/javax.xml.crypto.dsig.keyinfo.model.yml
@@ -4,12 +4,41 @@ extensions:
       pack: codeql/java-all
       extensible: summaryModel
     data:
-      - ["javax.xml.crypto.dsig.keyinfo", "KeyInfoFactory", True, "getInstance", "(String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.xml.crypto.dsig.keyinfo", "KeyInfoFactory", True, "getInstance", "(String,Provider)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.xml.crypto.dsig.keyinfo", "KeyInfoFactory", True, "getInstance", "(String,Provider)", "", "Argument[1].Element", "ReturnValue", "taint", "df-generated"]
-      - ["javax.xml.crypto.dsig.keyinfo", "KeyInfoFactory", True, "getInstance", "(String,String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.xml.crypto.dsig.keyinfo", "KeyInfoFactory", True, "getMechanismType", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.xml.crypto.dsig.keyinfo", "KeyInfoFactory", True, "getProvider", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.crypto.dsig.keyinfo", "KeyInfo", True, "getContent", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.crypto.dsig.keyinfo", "KeyInfo", True, "getId", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.crypto.dsig.keyinfo", "KeyInfoFactory", True, "getInstance", "(String)", "", "Argument[0]", "ReturnValue.SyntheticField[javax.xml.crypto.dsig.keyinfo.KeyInfoFactory.mechanismType]", "value", "dfc-generated"]
+      - ["javax.xml.crypto.dsig.keyinfo", "KeyInfoFactory", True, "getInstance", "(String,Provider)", "", "Argument[0]", "ReturnValue.SyntheticField[javax.xml.crypto.dsig.keyinfo.KeyInfoFactory.mechanismType]", "value", "dfc-generated"]
+      - ["javax.xml.crypto.dsig.keyinfo", "KeyInfoFactory", True, "getInstance", "(String,Provider)", "", "Argument[1]", "ReturnValue.SyntheticField[javax.xml.crypto.dsig.keyinfo.KeyInfoFactory.provider]", "value", "dfc-generated"]
+      - ["javax.xml.crypto.dsig.keyinfo", "KeyInfoFactory", True, "getInstance", "(String,String)", "", "Argument[0]", "ReturnValue.SyntheticField[javax.xml.crypto.dsig.keyinfo.KeyInfoFactory.mechanismType]", "value", "dfc-generated"]
+      - ["javax.xml.crypto.dsig.keyinfo", "KeyInfoFactory", True, "getMechanismType", "()", "", "Argument[this].SyntheticField[javax.xml.crypto.dsig.keyinfo.KeyInfoFactory.mechanismType]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.xml.crypto.dsig.keyinfo", "KeyInfoFactory", True, "getProvider", "()", "", "Argument[this].SyntheticField[javax.xml.crypto.dsig.keyinfo.KeyInfoFactory.provider]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.xml.crypto.dsig.keyinfo", "KeyInfoFactory", True, "newKeyInfo", "(List)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.crypto.dsig.keyinfo", "KeyInfoFactory", True, "newKeyInfo", "(List,String)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.crypto.dsig.keyinfo", "KeyInfoFactory", True, "newKeyInfo", "(List,String)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.crypto.dsig.keyinfo", "KeyInfoFactory", True, "newKeyName", "(String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.crypto.dsig.keyinfo", "KeyInfoFactory", True, "newKeyValue", "(PublicKey)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.crypto.dsig.keyinfo", "KeyInfoFactory", True, "newPGPData", "(byte[])", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.crypto.dsig.keyinfo", "KeyInfoFactory", True, "newPGPData", "(byte[],List)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.crypto.dsig.keyinfo", "KeyInfoFactory", True, "newPGPData", "(byte[],List)", "", "Argument[1].Element", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.crypto.dsig.keyinfo", "KeyInfoFactory", True, "newPGPData", "(byte[],byte[],List)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.crypto.dsig.keyinfo", "KeyInfoFactory", True, "newPGPData", "(byte[],byte[],List)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.crypto.dsig.keyinfo", "KeyInfoFactory", True, "newPGPData", "(byte[],byte[],List)", "", "Argument[2].Element", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.crypto.dsig.keyinfo", "KeyInfoFactory", True, "newRetrievalMethod", "(String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.crypto.dsig.keyinfo", "KeyInfoFactory", True, "newRetrievalMethod", "(String,String,List)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.crypto.dsig.keyinfo", "KeyInfoFactory", True, "newRetrievalMethod", "(String,String,List)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.crypto.dsig.keyinfo", "KeyInfoFactory", True, "newRetrievalMethod", "(String,String,List)", "", "Argument[2].Element", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.crypto.dsig.keyinfo", "KeyInfoFactory", True, "newX509Data", "(List)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.crypto.dsig.keyinfo", "KeyInfoFactory", True, "newX509IssuerSerial", "(String,BigInteger)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.crypto.dsig.keyinfo", "KeyName", True, "getName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.crypto.dsig.keyinfo", "KeyValue", True, "getPublicKey", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.crypto.dsig.keyinfo", "PGPData", True, "getExternalElements", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.crypto.dsig.keyinfo", "PGPData", True, "getKeyId", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.crypto.dsig.keyinfo", "PGPData", True, "getKeyPacket", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.crypto.dsig.keyinfo", "RetrievalMethod", True, "dereference", "(XMLCryptoContext)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.crypto.dsig.keyinfo", "RetrievalMethod", True, "dereference", "(XMLCryptoContext)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.crypto.dsig.keyinfo", "RetrievalMethod", True, "getTransforms", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.crypto.dsig.keyinfo", "X509Data", True, "getContent", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.crypto.dsig.keyinfo", "X509IssuerSerial", True, "getIssuerName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
   - addsTo:
       pack: codeql/java-all
       extensible: neutralModel
@@ -17,15 +46,4 @@ extensions:
       - ["javax.xml.crypto.dsig.keyinfo", "KeyInfoFactory", "getInstance", "()", "summary", "df-generated"]
       - ["javax.xml.crypto.dsig.keyinfo", "KeyInfoFactory", "getURIDereferencer", "()", "summary", "df-generated"]
       - ["javax.xml.crypto.dsig.keyinfo", "KeyInfoFactory", "isFeatureSupported", "(String)", "summary", "df-generated"]
-      - ["javax.xml.crypto.dsig.keyinfo", "KeyInfoFactory", "newKeyInfo", "(List)", "summary", "df-generated"]
-      - ["javax.xml.crypto.dsig.keyinfo", "KeyInfoFactory", "newKeyInfo", "(List,String)", "summary", "df-generated"]
-      - ["javax.xml.crypto.dsig.keyinfo", "KeyInfoFactory", "newKeyName", "(String)", "summary", "df-generated"]
-      - ["javax.xml.crypto.dsig.keyinfo", "KeyInfoFactory", "newKeyValue", "(PublicKey)", "summary", "df-generated"]
-      - ["javax.xml.crypto.dsig.keyinfo", "KeyInfoFactory", "newPGPData", "(byte[])", "summary", "df-generated"]
-      - ["javax.xml.crypto.dsig.keyinfo", "KeyInfoFactory", "newPGPData", "(byte[],List)", "summary", "df-generated"]
-      - ["javax.xml.crypto.dsig.keyinfo", "KeyInfoFactory", "newPGPData", "(byte[],byte[],List)", "summary", "df-generated"]
-      - ["javax.xml.crypto.dsig.keyinfo", "KeyInfoFactory", "newRetrievalMethod", "(String)", "summary", "df-generated"]
-      - ["javax.xml.crypto.dsig.keyinfo", "KeyInfoFactory", "newRetrievalMethod", "(String,String,List)", "summary", "df-generated"]
-      - ["javax.xml.crypto.dsig.keyinfo", "KeyInfoFactory", "newX509Data", "(List)", "summary", "df-generated"]
-      - ["javax.xml.crypto.dsig.keyinfo", "KeyInfoFactory", "newX509IssuerSerial", "(String,BigInteger)", "summary", "df-generated"]
       - ["javax.xml.crypto.dsig.keyinfo", "KeyInfoFactory", "unmarshalKeyInfo", "(XMLStructure)", "summary", "df-generated"]
diff --git a/java/ql/lib/ext/generated/javax.xml.crypto.dsig.model.yml b/java/ql/lib/ext/generated/javax.xml.crypto.dsig.model.yml
index ced7da4a1cc..c955f5efd05 100644
--- a/java/ql/lib/ext/generated/javax.xml.crypto.dsig.model.yml
+++ b/java/ql/lib/ext/generated/javax.xml.crypto.dsig.model.yml
@@ -4,58 +4,147 @@ extensions:
       pack: codeql/java-all
       extensible: summaryModel
     data:
+      - ["javax.xml.crypto.dsig", "Manifest", True, "getId", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.crypto.dsig", "Manifest", True, "getReferences", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.crypto.dsig", "Reference", True, "getCalculatedDigestValue", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.crypto.dsig", "Reference", True, "getDereferencedData", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.crypto.dsig", "Reference", True, "getDigestInputStream", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.crypto.dsig", "Reference", True, "getDigestMethod", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.crypto.dsig", "Reference", True, "getDigestValue", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.crypto.dsig", "Reference", True, "getId", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.crypto.dsig", "Reference", True, "getTransforms", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.crypto.dsig", "Reference", True, "validate", "(XMLValidateContext)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.crypto.dsig", "SignatureProperties", True, "getId", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.crypto.dsig", "SignatureProperties", True, "getProperties", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.crypto.dsig", "SignatureProperty", True, "getContent", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.crypto.dsig", "SignatureProperty", True, "getId", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.crypto.dsig", "SignatureProperty", True, "getTarget", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.crypto.dsig", "SignedInfo", True, "getCanonicalizationMethod", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.crypto.dsig", "SignedInfo", True, "getCanonicalizedData", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.crypto.dsig", "SignedInfo", True, "getId", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.crypto.dsig", "SignedInfo", True, "getReferences", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.crypto.dsig", "SignedInfo", True, "getSignatureMethod", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.crypto.dsig", "Transform", True, "transform", "(Data,XMLCryptoContext)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.crypto.dsig", "Transform", True, "transform", "(Data,XMLCryptoContext)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.crypto.dsig", "Transform", True, "transform", "(Data,XMLCryptoContext)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.crypto.dsig", "Transform", True, "transform", "(Data,XMLCryptoContext,OutputStream)", "", "Argument[0]", "Argument[2]", "taint", "df-generated"]
+      - ["javax.xml.crypto.dsig", "Transform", True, "transform", "(Data,XMLCryptoContext,OutputStream)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.crypto.dsig", "Transform", True, "transform", "(Data,XMLCryptoContext,OutputStream)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.crypto.dsig", "Transform", True, "transform", "(Data,XMLCryptoContext,OutputStream)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.crypto.dsig", "Transform", True, "transform", "(Data,XMLCryptoContext,OutputStream)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["javax.xml.crypto.dsig", "TransformException", True, "TransformException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["javax.xml.crypto.dsig", "TransformException", True, "TransformException", "(String,Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["javax.xml.crypto.dsig", "TransformException", True, "TransformException", "(String,Throwable)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
       - ["javax.xml.crypto.dsig", "TransformException", True, "TransformException", "(Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.xml.crypto.dsig", "TransformService", True, "getInstance", "(String,String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.xml.crypto.dsig", "TransformService", True, "getInstance", "(String,String)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.xml.crypto.dsig", "TransformService", True, "getInstance", "(String,String,Provider)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.xml.crypto.dsig", "TransformService", True, "getInstance", "(String,String,Provider)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.xml.crypto.dsig", "TransformService", True, "getInstance", "(String,String,Provider)", "", "Argument[2].Element", "ReturnValue", "taint", "df-generated"]
-      - ["javax.xml.crypto.dsig", "TransformService", True, "getInstance", "(String,String,String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.xml.crypto.dsig", "TransformService", True, "getInstance", "(String,String,String)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.xml.crypto.dsig", "TransformService", True, "getMechanismType", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.xml.crypto.dsig", "TransformService", True, "getProvider", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.crypto.dsig", "TransformService", True, "getAlgorithm", "()", "", "Argument[this].SyntheticField[javax.xml.crypto.dsig.TransformService.algorithm]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.xml.crypto.dsig", "TransformService", True, "getInstance", "(String,String)", "", "Argument[0]", "ReturnValue.SyntheticField[javax.xml.crypto.dsig.TransformService.algorithm]", "value", "dfc-generated"]
+      - ["javax.xml.crypto.dsig", "TransformService", True, "getInstance", "(String,String)", "", "Argument[1]", "ReturnValue.SyntheticField[javax.xml.crypto.dsig.TransformService.mechanism]", "value", "dfc-generated"]
+      - ["javax.xml.crypto.dsig", "TransformService", True, "getInstance", "(String,String,Provider)", "", "Argument[0]", "ReturnValue.SyntheticField[javax.xml.crypto.dsig.TransformService.algorithm]", "value", "dfc-generated"]
+      - ["javax.xml.crypto.dsig", "TransformService", True, "getInstance", "(String,String,Provider)", "", "Argument[1]", "ReturnValue.SyntheticField[javax.xml.crypto.dsig.TransformService.mechanism]", "value", "dfc-generated"]
+      - ["javax.xml.crypto.dsig", "TransformService", True, "getInstance", "(String,String,Provider)", "", "Argument[2]", "ReturnValue.SyntheticField[javax.xml.crypto.dsig.TransformService.provider]", "value", "dfc-generated"]
+      - ["javax.xml.crypto.dsig", "TransformService", True, "getInstance", "(String,String,String)", "", "Argument[0]", "ReturnValue.SyntheticField[javax.xml.crypto.dsig.TransformService.algorithm]", "value", "dfc-generated"]
+      - ["javax.xml.crypto.dsig", "TransformService", True, "getInstance", "(String,String,String)", "", "Argument[1]", "ReturnValue.SyntheticField[javax.xml.crypto.dsig.TransformService.mechanism]", "value", "dfc-generated"]
+      - ["javax.xml.crypto.dsig", "TransformService", True, "getMechanismType", "()", "", "Argument[this].SyntheticField[javax.xml.crypto.dsig.TransformService.mechanism]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.xml.crypto.dsig", "TransformService", True, "getProvider", "()", "", "Argument[this].SyntheticField[javax.xml.crypto.dsig.TransformService.provider]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.xml.crypto.dsig", "TransformService", True, "init", "(TransformParameterSpec)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.crypto.dsig", "TransformService", True, "init", "(XMLStructure,XMLCryptoContext)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.crypto.dsig", "TransformService", True, "marshalParams", "(XMLStructure,XMLCryptoContext)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.crypto.dsig", "XMLObject", True, "getContent", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.crypto.dsig", "XMLObject", True, "getEncoding", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.crypto.dsig", "XMLObject", True, "getId", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.crypto.dsig", "XMLObject", True, "getMimeType", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.crypto.dsig", "XMLSignature$SignatureValue", True, "getId", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.crypto.dsig", "XMLSignature$SignatureValue", True, "getValue", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.crypto.dsig", "XMLSignature", True, "getId", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.crypto.dsig", "XMLSignature", True, "getKeyInfo", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.crypto.dsig", "XMLSignature", True, "getKeySelectorResult", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.crypto.dsig", "XMLSignature", True, "getObjects", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.crypto.dsig", "XMLSignature", True, "getSignatureValue", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.crypto.dsig", "XMLSignature", True, "getSignedInfo", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.crypto.dsig", "XMLSignature", True, "sign", "(XMLSignContext)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.crypto.dsig", "XMLSignature", True, "sign", "(XMLSignContext)", "", "Argument[this]", "Argument[0]", "taint", "df-generated"]
       - ["javax.xml.crypto.dsig", "XMLSignatureException", True, "XMLSignatureException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["javax.xml.crypto.dsig", "XMLSignatureException", True, "XMLSignatureException", "(String,Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["javax.xml.crypto.dsig", "XMLSignatureException", True, "XMLSignatureException", "(String,Throwable)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
       - ["javax.xml.crypto.dsig", "XMLSignatureException", True, "XMLSignatureException", "(Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.xml.crypto.dsig", "XMLSignatureFactory", True, "getInstance", "(String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.xml.crypto.dsig", "XMLSignatureFactory", True, "getInstance", "(String,Provider)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.xml.crypto.dsig", "XMLSignatureFactory", True, "getInstance", "(String,Provider)", "", "Argument[1].Element", "ReturnValue", "taint", "df-generated"]
-      - ["javax.xml.crypto.dsig", "XMLSignatureFactory", True, "getInstance", "(String,String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.xml.crypto.dsig", "XMLSignatureFactory", True, "getKeyInfoFactory", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.xml.crypto.dsig", "XMLSignatureFactory", True, "getMechanismType", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.xml.crypto.dsig", "XMLSignatureFactory", True, "getProvider", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.crypto.dsig", "XMLSignatureFactory", True, "getInstance", "(String)", "", "Argument[0]", "ReturnValue.SyntheticField[javax.xml.crypto.dsig.XMLSignatureFactory.mechanismType]", "value", "dfc-generated"]
+      - ["javax.xml.crypto.dsig", "XMLSignatureFactory", True, "getInstance", "(String,Provider)", "", "Argument[0]", "ReturnValue.SyntheticField[javax.xml.crypto.dsig.XMLSignatureFactory.mechanismType]", "value", "dfc-generated"]
+      - ["javax.xml.crypto.dsig", "XMLSignatureFactory", True, "getInstance", "(String,Provider)", "", "Argument[1]", "ReturnValue.SyntheticField[javax.xml.crypto.dsig.XMLSignatureFactory.provider]", "value", "dfc-generated"]
+      - ["javax.xml.crypto.dsig", "XMLSignatureFactory", True, "getInstance", "(String,String)", "", "Argument[0]", "ReturnValue.SyntheticField[javax.xml.crypto.dsig.XMLSignatureFactory.mechanismType]", "value", "dfc-generated"]
+      - ["javax.xml.crypto.dsig", "XMLSignatureFactory", True, "getKeyInfoFactory", "()", "", "Argument[this].SyntheticField[javax.xml.crypto.dsig.XMLSignatureFactory.mechanismType]", "ReturnValue.SyntheticField[javax.xml.crypto.dsig.keyinfo.KeyInfoFactory.mechanismType]", "value", "dfc-generated"]
+      - ["javax.xml.crypto.dsig", "XMLSignatureFactory", True, "getKeyInfoFactory", "()", "", "Argument[this].SyntheticField[javax.xml.crypto.dsig.XMLSignatureFactory.provider]", "ReturnValue.SyntheticField[javax.xml.crypto.dsig.keyinfo.KeyInfoFactory.provider]", "value", "dfc-generated"]
+      - ["javax.xml.crypto.dsig", "XMLSignatureFactory", True, "getMechanismType", "()", "", "Argument[this].SyntheticField[javax.xml.crypto.dsig.XMLSignatureFactory.mechanismType]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.xml.crypto.dsig", "XMLSignatureFactory", True, "getProvider", "()", "", "Argument[this].SyntheticField[javax.xml.crypto.dsig.XMLSignatureFactory.provider]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.xml.crypto.dsig", "XMLSignatureFactory", True, "newCanonicalizationMethod", "(String,C14NMethodParameterSpec)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.crypto.dsig", "XMLSignatureFactory", True, "newCanonicalizationMethod", "(String,C14NMethodParameterSpec)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.crypto.dsig", "XMLSignatureFactory", True, "newCanonicalizationMethod", "(String,C14NMethodParameterSpec)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.crypto.dsig", "XMLSignatureFactory", True, "newCanonicalizationMethod", "(String,XMLStructure)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.crypto.dsig", "XMLSignatureFactory", True, "newCanonicalizationMethod", "(String,XMLStructure)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.crypto.dsig", "XMLSignatureFactory", True, "newCanonicalizationMethod", "(String,XMLStructure)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.crypto.dsig", "XMLSignatureFactory", True, "newDigestMethod", "(String,DigestMethodParameterSpec)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.crypto.dsig", "XMLSignatureFactory", True, "newManifest", "(List)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.crypto.dsig", "XMLSignatureFactory", True, "newManifest", "(List,String)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.crypto.dsig", "XMLSignatureFactory", True, "newManifest", "(List,String)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.crypto.dsig", "XMLSignatureFactory", True, "newReference", "(String,DigestMethod)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.crypto.dsig", "XMLSignatureFactory", True, "newReference", "(String,DigestMethod)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.crypto.dsig", "XMLSignatureFactory", True, "newReference", "(String,DigestMethod)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.crypto.dsig", "XMLSignatureFactory", True, "newReference", "(String,DigestMethod,List,Data,List,String,String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.crypto.dsig", "XMLSignatureFactory", True, "newReference", "(String,DigestMethod,List,Data,List,String,String)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.crypto.dsig", "XMLSignatureFactory", True, "newReference", "(String,DigestMethod,List,Data,List,String,String)", "", "Argument[2].Element", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.crypto.dsig", "XMLSignatureFactory", True, "newReference", "(String,DigestMethod,List,Data,List,String,String)", "", "Argument[3]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.crypto.dsig", "XMLSignatureFactory", True, "newReference", "(String,DigestMethod,List,Data,List,String,String)", "", "Argument[4].Element", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.crypto.dsig", "XMLSignatureFactory", True, "newReference", "(String,DigestMethod,List,Data,List,String,String)", "", "Argument[5]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.crypto.dsig", "XMLSignatureFactory", True, "newReference", "(String,DigestMethod,List,Data,List,String,String)", "", "Argument[6]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.crypto.dsig", "XMLSignatureFactory", True, "newReference", "(String,DigestMethod,List,Data,List,String,String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.crypto.dsig", "XMLSignatureFactory", True, "newReference", "(String,DigestMethod,List,String,String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.crypto.dsig", "XMLSignatureFactory", True, "newReference", "(String,DigestMethod,List,String,String)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.crypto.dsig", "XMLSignatureFactory", True, "newReference", "(String,DigestMethod,List,String,String)", "", "Argument[2].Element", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.crypto.dsig", "XMLSignatureFactory", True, "newReference", "(String,DigestMethod,List,String,String)", "", "Argument[3]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.crypto.dsig", "XMLSignatureFactory", True, "newReference", "(String,DigestMethod,List,String,String)", "", "Argument[4]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.crypto.dsig", "XMLSignatureFactory", True, "newReference", "(String,DigestMethod,List,String,String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.crypto.dsig", "XMLSignatureFactory", True, "newReference", "(String,DigestMethod,List,String,String,byte[])", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.crypto.dsig", "XMLSignatureFactory", True, "newReference", "(String,DigestMethod,List,String,String,byte[])", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.crypto.dsig", "XMLSignatureFactory", True, "newReference", "(String,DigestMethod,List,String,String,byte[])", "", "Argument[2].Element", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.crypto.dsig", "XMLSignatureFactory", True, "newReference", "(String,DigestMethod,List,String,String,byte[])", "", "Argument[3]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.crypto.dsig", "XMLSignatureFactory", True, "newReference", "(String,DigestMethod,List,String,String,byte[])", "", "Argument[4]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.crypto.dsig", "XMLSignatureFactory", True, "newReference", "(String,DigestMethod,List,String,String,byte[])", "", "Argument[5]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.crypto.dsig", "XMLSignatureFactory", True, "newReference", "(String,DigestMethod,List,String,String,byte[])", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.crypto.dsig", "XMLSignatureFactory", True, "newSignatureMethod", "(String,SignatureMethodParameterSpec)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.crypto.dsig", "XMLSignatureFactory", True, "newSignatureProperties", "(List,String)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.crypto.dsig", "XMLSignatureFactory", True, "newSignatureProperties", "(List,String)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.crypto.dsig", "XMLSignatureFactory", True, "newSignatureProperty", "(List,String,String)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.crypto.dsig", "XMLSignatureFactory", True, "newSignatureProperty", "(List,String,String)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.crypto.dsig", "XMLSignatureFactory", True, "newSignatureProperty", "(List,String,String)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.crypto.dsig", "XMLSignatureFactory", True, "newSignedInfo", "(CanonicalizationMethod,SignatureMethod,List)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.crypto.dsig", "XMLSignatureFactory", True, "newSignedInfo", "(CanonicalizationMethod,SignatureMethod,List)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.crypto.dsig", "XMLSignatureFactory", True, "newSignedInfo", "(CanonicalizationMethod,SignatureMethod,List)", "", "Argument[2].Element", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.crypto.dsig", "XMLSignatureFactory", True, "newSignedInfo", "(CanonicalizationMethod,SignatureMethod,List,String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.crypto.dsig", "XMLSignatureFactory", True, "newSignedInfo", "(CanonicalizationMethod,SignatureMethod,List,String)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.crypto.dsig", "XMLSignatureFactory", True, "newSignedInfo", "(CanonicalizationMethod,SignatureMethod,List,String)", "", "Argument[2].Element", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.crypto.dsig", "XMLSignatureFactory", True, "newSignedInfo", "(CanonicalizationMethod,SignatureMethod,List,String)", "", "Argument[3]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.crypto.dsig", "XMLSignatureFactory", True, "newTransform", "(String,TransformParameterSpec)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.crypto.dsig", "XMLSignatureFactory", True, "newTransform", "(String,TransformParameterSpec)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.crypto.dsig", "XMLSignatureFactory", True, "newTransform", "(String,TransformParameterSpec)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.crypto.dsig", "XMLSignatureFactory", True, "newTransform", "(String,XMLStructure)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.crypto.dsig", "XMLSignatureFactory", True, "newTransform", "(String,XMLStructure)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.crypto.dsig", "XMLSignatureFactory", True, "newTransform", "(String,XMLStructure)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.crypto.dsig", "XMLSignatureFactory", True, "newXMLObject", "(List,String,String,String)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.crypto.dsig", "XMLSignatureFactory", True, "newXMLObject", "(List,String,String,String)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.crypto.dsig", "XMLSignatureFactory", True, "newXMLObject", "(List,String,String,String)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.crypto.dsig", "XMLSignatureFactory", True, "newXMLObject", "(List,String,String,String)", "", "Argument[3]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.crypto.dsig", "XMLSignatureFactory", True, "newXMLSignature", "(SignedInfo,KeyInfo)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.crypto.dsig", "XMLSignatureFactory", True, "newXMLSignature", "(SignedInfo,KeyInfo)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.crypto.dsig", "XMLSignatureFactory", True, "newXMLSignature", "(SignedInfo,KeyInfo,List,String,String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.crypto.dsig", "XMLSignatureFactory", True, "newXMLSignature", "(SignedInfo,KeyInfo,List,String,String)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.crypto.dsig", "XMLSignatureFactory", True, "newXMLSignature", "(SignedInfo,KeyInfo,List,String,String)", "", "Argument[2].Element", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.crypto.dsig", "XMLSignatureFactory", True, "newXMLSignature", "(SignedInfo,KeyInfo,List,String,String)", "", "Argument[3]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.crypto.dsig", "XMLSignatureFactory", True, "newXMLSignature", "(SignedInfo,KeyInfo,List,String,String)", "", "Argument[4]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.crypto.dsig", "XMLSignatureFactory", True, "unmarshalXMLSignature", "(XMLStructure)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.crypto.dsig", "XMLSignatureFactory", True, "unmarshalXMLSignature", "(XMLValidateContext)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
   - addsTo:
       pack: codeql/java-all
       extensible: neutralModel
     data:
-      - ["javax.xml.crypto.dsig", "TransformService", "init", "(TransformParameterSpec)", "summary", "df-generated"]
-      - ["javax.xml.crypto.dsig", "TransformService", "init", "(XMLStructure,XMLCryptoContext)", "summary", "df-generated"]
-      - ["javax.xml.crypto.dsig", "TransformService", "marshalParams", "(XMLStructure,XMLCryptoContext)", "summary", "df-generated"]
       - ["javax.xml.crypto.dsig", "XMLSignatureFactory", "getInstance", "()", "summary", "df-generated"]
       - ["javax.xml.crypto.dsig", "XMLSignatureFactory", "getURIDereferencer", "()", "summary", "df-generated"]
       - ["javax.xml.crypto.dsig", "XMLSignatureFactory", "isFeatureSupported", "(String)", "summary", "df-generated"]
-      - ["javax.xml.crypto.dsig", "XMLSignatureFactory", "newCanonicalizationMethod", "(String,C14NMethodParameterSpec)", "summary", "df-generated"]
-      - ["javax.xml.crypto.dsig", "XMLSignatureFactory", "newCanonicalizationMethod", "(String,XMLStructure)", "summary", "df-generated"]
-      - ["javax.xml.crypto.dsig", "XMLSignatureFactory", "newDigestMethod", "(String,DigestMethodParameterSpec)", "summary", "df-generated"]
-      - ["javax.xml.crypto.dsig", "XMLSignatureFactory", "newManifest", "(List)", "summary", "df-generated"]
-      - ["javax.xml.crypto.dsig", "XMLSignatureFactory", "newManifest", "(List,String)", "summary", "df-generated"]
-      - ["javax.xml.crypto.dsig", "XMLSignatureFactory", "newReference", "(String,DigestMethod)", "summary", "df-generated"]
-      - ["javax.xml.crypto.dsig", "XMLSignatureFactory", "newReference", "(String,DigestMethod,List,Data,List,String,String)", "summary", "df-generated"]
-      - ["javax.xml.crypto.dsig", "XMLSignatureFactory", "newReference", "(String,DigestMethod,List,String,String)", "summary", "df-generated"]
-      - ["javax.xml.crypto.dsig", "XMLSignatureFactory", "newReference", "(String,DigestMethod,List,String,String,byte[])", "summary", "df-generated"]
-      - ["javax.xml.crypto.dsig", "XMLSignatureFactory", "newSignatureMethod", "(String,SignatureMethodParameterSpec)", "summary", "df-generated"]
-      - ["javax.xml.crypto.dsig", "XMLSignatureFactory", "newSignatureProperties", "(List,String)", "summary", "df-generated"]
-      - ["javax.xml.crypto.dsig", "XMLSignatureFactory", "newSignatureProperty", "(List,String,String)", "summary", "df-generated"]
-      - ["javax.xml.crypto.dsig", "XMLSignatureFactory", "newSignedInfo", "(CanonicalizationMethod,SignatureMethod,List)", "summary", "df-generated"]
-      - ["javax.xml.crypto.dsig", "XMLSignatureFactory", "newSignedInfo", "(CanonicalizationMethod,SignatureMethod,List,String)", "summary", "df-generated"]
-      - ["javax.xml.crypto.dsig", "XMLSignatureFactory", "newTransform", "(String,TransformParameterSpec)", "summary", "df-generated"]
-      - ["javax.xml.crypto.dsig", "XMLSignatureFactory", "newTransform", "(String,XMLStructure)", "summary", "df-generated"]
-      - ["javax.xml.crypto.dsig", "XMLSignatureFactory", "newXMLObject", "(List,String,String,String)", "summary", "df-generated"]
-      - ["javax.xml.crypto.dsig", "XMLSignatureFactory", "newXMLSignature", "(SignedInfo,KeyInfo)", "summary", "df-generated"]
-      - ["javax.xml.crypto.dsig", "XMLSignatureFactory", "newXMLSignature", "(SignedInfo,KeyInfo,List,String,String)", "summary", "df-generated"]
-      - ["javax.xml.crypto.dsig", "XMLSignatureFactory", "unmarshalXMLSignature", "(XMLStructure)", "summary", "df-generated"]
-      - ["javax.xml.crypto.dsig", "XMLSignatureFactory", "unmarshalXMLSignature", "(XMLValidateContext)", "summary", "df-generated"]
diff --git a/java/ql/lib/ext/generated/javax.xml.crypto.dsig.spec.model.yml b/java/ql/lib/ext/generated/javax.xml.crypto.dsig.spec.model.yml
index c93065e77e3..318830fdd1f 100644
--- a/java/ql/lib/ext/generated/javax.xml.crypto.dsig.spec.model.yml
+++ b/java/ql/lib/ext/generated/javax.xml.crypto.dsig.spec.model.yml
@@ -4,27 +4,29 @@ extensions:
       pack: codeql/java-all
       extensible: summaryModel
     data:
-      - ["javax.xml.crypto.dsig.spec", "ExcC14NParameterSpec", False, "ExcC14NParameterSpec", "(List)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["javax.xml.crypto.dsig.spec", "ExcC14NParameterSpec", False, "getPrefixList", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.xml.crypto.dsig.spec", "RSAPSSParameterSpec", False, "RSAPSSParameterSpec", "(PSSParameterSpec)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.xml.crypto.dsig.spec", "RSAPSSParameterSpec", False, "getPSSParameterSpec", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.xml.crypto.dsig.spec", "XPathFilter2ParameterSpec", False, "XPathFilter2ParameterSpec", "(List)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["javax.xml.crypto.dsig.spec", "XPathFilter2ParameterSpec", False, "getXPathList", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.xml.crypto.dsig.spec", "XPathFilterParameterSpec", False, "XPathFilterParameterSpec", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.xml.crypto.dsig.spec", "XPathFilterParameterSpec", False, "XPathFilterParameterSpec", "(String,Map)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.xml.crypto.dsig.spec", "XPathFilterParameterSpec", False, "XPathFilterParameterSpec", "(String,Map)", "", "Argument[1].Element", "Argument[this]", "taint", "df-generated"]
-      - ["javax.xml.crypto.dsig.spec", "XPathFilterParameterSpec", False, "getNamespaceMap", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.xml.crypto.dsig.spec", "XPathFilterParameterSpec", False, "getXPath", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.xml.crypto.dsig.spec", "XPathType", True, "XPathType", "(String,XPathType$Filter)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.xml.crypto.dsig.spec", "XPathType", True, "XPathType", "(String,XPathType$Filter)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.xml.crypto.dsig.spec", "XPathType", True, "XPathType", "(String,XPathType$Filter,Map)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.xml.crypto.dsig.spec", "XPathType", True, "XPathType", "(String,XPathType$Filter,Map)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.xml.crypto.dsig.spec", "XPathType", True, "XPathType", "(String,XPathType$Filter,Map)", "", "Argument[2].Element", "Argument[this]", "taint", "df-generated"]
-      - ["javax.xml.crypto.dsig.spec", "XPathType", True, "getExpression", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.xml.crypto.dsig.spec", "XPathType", True, "getFilter", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.xml.crypto.dsig.spec", "XPathType", True, "getNamespaceMap", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.xml.crypto.dsig.spec", "XSLTTransformParameterSpec", False, "XSLTTransformParameterSpec", "(XMLStructure)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.xml.crypto.dsig.spec", "XSLTTransformParameterSpec", False, "getStylesheet", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.crypto.dsig.spec", "ExcC14NParameterSpec", False, "ExcC14NParameterSpec", "(List)", "", "Argument[0].Element", "Argument[this].SyntheticField[javax.xml.crypto.dsig.spec.ExcC14NParameterSpec.prefixList].Element", "value", "dfc-generated"]
+      - ["javax.xml.crypto.dsig.spec", "ExcC14NParameterSpec", False, "getPrefixList", "()", "", "Argument[this].SyntheticField[javax.xml.crypto.dsig.spec.ExcC14NParameterSpec.prefixList]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.xml.crypto.dsig.spec", "RSAPSSParameterSpec", False, "RSAPSSParameterSpec", "(PSSParameterSpec)", "", "Argument[0]", "Argument[this].SyntheticField[javax.xml.crypto.dsig.spec.RSAPSSParameterSpec.spec]", "value", "dfc-generated"]
+      - ["javax.xml.crypto.dsig.spec", "RSAPSSParameterSpec", False, "getPSSParameterSpec", "()", "", "Argument[this].SyntheticField[javax.xml.crypto.dsig.spec.RSAPSSParameterSpec.spec]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.xml.crypto.dsig.spec", "XPathFilter2ParameterSpec", False, "XPathFilter2ParameterSpec", "(List)", "", "Argument[0].Element", "Argument[this].SyntheticField[javax.xml.crypto.dsig.spec.XPathFilter2ParameterSpec.xPathList].Element", "value", "dfc-generated"]
+      - ["javax.xml.crypto.dsig.spec", "XPathFilter2ParameterSpec", False, "getXPathList", "()", "", "Argument[this].SyntheticField[javax.xml.crypto.dsig.spec.XPathFilter2ParameterSpec.xPathList]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.xml.crypto.dsig.spec", "XPathFilterParameterSpec", False, "XPathFilterParameterSpec", "(String)", "", "Argument[0]", "Argument[this].SyntheticField[javax.xml.crypto.dsig.spec.XPathFilterParameterSpec.xPath]", "value", "dfc-generated"]
+      - ["javax.xml.crypto.dsig.spec", "XPathFilterParameterSpec", False, "XPathFilterParameterSpec", "(String,Map)", "", "Argument[0]", "Argument[this].SyntheticField[javax.xml.crypto.dsig.spec.XPathFilterParameterSpec.xPath]", "value", "dfc-generated"]
+      - ["javax.xml.crypto.dsig.spec", "XPathFilterParameterSpec", False, "XPathFilterParameterSpec", "(String,Map)", "", "Argument[1].MapKey", "Argument[this].SyntheticField[javax.xml.crypto.dsig.spec.XPathFilterParameterSpec.nsMap].MapKey", "value", "dfc-generated"]
+      - ["javax.xml.crypto.dsig.spec", "XPathFilterParameterSpec", False, "XPathFilterParameterSpec", "(String,Map)", "", "Argument[1].MapValue", "Argument[this].SyntheticField[javax.xml.crypto.dsig.spec.XPathFilterParameterSpec.nsMap].MapValue", "value", "dfc-generated"]
+      - ["javax.xml.crypto.dsig.spec", "XPathFilterParameterSpec", False, "getNamespaceMap", "()", "", "Argument[this].SyntheticField[javax.xml.crypto.dsig.spec.XPathFilterParameterSpec.nsMap]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.xml.crypto.dsig.spec", "XPathFilterParameterSpec", False, "getXPath", "()", "", "Argument[this].SyntheticField[javax.xml.crypto.dsig.spec.XPathFilterParameterSpec.xPath]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.xml.crypto.dsig.spec", "XPathType", True, "XPathType", "(String,XPathType$Filter)", "", "Argument[0]", "Argument[this].SyntheticField[javax.xml.crypto.dsig.spec.XPathType.expression]", "value", "dfc-generated"]
+      - ["javax.xml.crypto.dsig.spec", "XPathType", True, "XPathType", "(String,XPathType$Filter)", "", "Argument[1]", "Argument[this].SyntheticField[javax.xml.crypto.dsig.spec.XPathType.filter]", "value", "dfc-generated"]
+      - ["javax.xml.crypto.dsig.spec", "XPathType", True, "XPathType", "(String,XPathType$Filter,Map)", "", "Argument[0]", "Argument[this].SyntheticField[javax.xml.crypto.dsig.spec.XPathType.expression]", "value", "dfc-generated"]
+      - ["javax.xml.crypto.dsig.spec", "XPathType", True, "XPathType", "(String,XPathType$Filter,Map)", "", "Argument[1]", "Argument[this].SyntheticField[javax.xml.crypto.dsig.spec.XPathType.filter]", "value", "dfc-generated"]
+      - ["javax.xml.crypto.dsig.spec", "XPathType", True, "XPathType", "(String,XPathType$Filter,Map)", "", "Argument[2].MapKey", "Argument[this].SyntheticField[javax.xml.crypto.dsig.spec.XPathType.nsMap].MapKey", "value", "dfc-generated"]
+      - ["javax.xml.crypto.dsig.spec", "XPathType", True, "XPathType", "(String,XPathType$Filter,Map)", "", "Argument[2].MapValue", "Argument[this].SyntheticField[javax.xml.crypto.dsig.spec.XPathType.nsMap].MapValue", "value", "dfc-generated"]
+      - ["javax.xml.crypto.dsig.spec", "XPathType", True, "getExpression", "()", "", "Argument[this].SyntheticField[javax.xml.crypto.dsig.spec.XPathType.expression]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.xml.crypto.dsig.spec", "XPathType", True, "getFilter", "()", "", "Argument[this].SyntheticField[javax.xml.crypto.dsig.spec.XPathType.filter]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.xml.crypto.dsig.spec", "XPathType", True, "getNamespaceMap", "()", "", "Argument[this].SyntheticField[javax.xml.crypto.dsig.spec.XPathType.nsMap]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.xml.crypto.dsig.spec", "XSLTTransformParameterSpec", False, "XSLTTransformParameterSpec", "(XMLStructure)", "", "Argument[0]", "Argument[this].SyntheticField[javax.xml.crypto.dsig.spec.XSLTTransformParameterSpec.stylesheet]", "value", "dfc-generated"]
+      - ["javax.xml.crypto.dsig.spec", "XSLTTransformParameterSpec", False, "getStylesheet", "()", "", "Argument[this].SyntheticField[javax.xml.crypto.dsig.spec.XSLTTransformParameterSpec.stylesheet]", "ReturnValue", "value", "dfc-generated"]
   - addsTo:
       pack: codeql/java-all
       extensible: neutralModel
diff --git a/java/ql/lib/ext/generated/javax.xml.crypto.model.yml b/java/ql/lib/ext/generated/javax.xml.crypto.model.yml
index ec58522b0ab..bf1ad1153a1 100644
--- a/java/ql/lib/ext/generated/javax.xml.crypto.model.yml
+++ b/java/ql/lib/ext/generated/javax.xml.crypto.model.yml
@@ -5,6 +5,7 @@ extensions:
       extensible: summaryModel
     data:
       - ["javax.xml.crypto", "AlgorithmMethod", True, "getAlgorithm", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.crypto", "AlgorithmMethod", True, "getParameterSpec", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["javax.xml.crypto", "KeySelector", True, "singletonKeySelector", "(Key)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["javax.xml.crypto", "KeySelectorException", True, "KeySelectorException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["javax.xml.crypto", "KeySelectorException", True, "KeySelectorException", "(String,Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
@@ -18,46 +19,26 @@ extensions:
       - ["javax.xml.crypto", "NoSuchMechanismException", True, "NoSuchMechanismException", "(String,Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["javax.xml.crypto", "NoSuchMechanismException", True, "NoSuchMechanismException", "(String,Throwable)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
       - ["javax.xml.crypto", "NoSuchMechanismException", True, "NoSuchMechanismException", "(Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.xml.crypto", "OctetStreamData", True, "OctetStreamData", "(InputStream)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.xml.crypto", "OctetStreamData", True, "OctetStreamData", "(InputStream,String,String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.xml.crypto", "OctetStreamData", True, "OctetStreamData", "(InputStream,String,String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.xml.crypto", "OctetStreamData", True, "OctetStreamData", "(InputStream,String,String)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.xml.crypto", "OctetStreamData", True, "getMimeType", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.xml.crypto", "OctetStreamData", True, "getOctetStream", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.xml.crypto", "OctetStreamData", True, "getURI", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.crypto", "OctetStreamData", True, "OctetStreamData", "(InputStream)", "", "Argument[0]", "Argument[this].SyntheticField[javax.xml.crypto.OctetStreamData.octetStream]", "value", "dfc-generated"]
+      - ["javax.xml.crypto", "OctetStreamData", True, "OctetStreamData", "(InputStream,String,String)", "", "Argument[0]", "Argument[this].SyntheticField[javax.xml.crypto.OctetStreamData.octetStream]", "value", "dfc-generated"]
+      - ["javax.xml.crypto", "OctetStreamData", True, "OctetStreamData", "(InputStream,String,String)", "", "Argument[1]", "Argument[this].SyntheticField[javax.xml.crypto.OctetStreamData.uri]", "value", "dfc-generated"]
+      - ["javax.xml.crypto", "OctetStreamData", True, "OctetStreamData", "(InputStream,String,String)", "", "Argument[2]", "Argument[this].SyntheticField[javax.xml.crypto.OctetStreamData.mimeType]", "value", "dfc-generated"]
+      - ["javax.xml.crypto", "OctetStreamData", True, "getMimeType", "()", "", "Argument[this].SyntheticField[javax.xml.crypto.OctetStreamData.mimeType]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.xml.crypto", "OctetStreamData", True, "getOctetStream", "()", "", "Argument[this].SyntheticField[javax.xml.crypto.OctetStreamData.octetStream]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.xml.crypto", "OctetStreamData", True, "getURI", "()", "", "Argument[this].SyntheticField[javax.xml.crypto.OctetStreamData.uri]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.xml.crypto", "URIDereferencer", True, "dereference", "(URIReference,XMLCryptoContext)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.crypto", "URIDereferencer", True, "dereference", "(URIReference,XMLCryptoContext)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.crypto", "URIReference", True, "getType", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.crypto", "URIReference", True, "getURI", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["javax.xml.crypto", "URIReferenceException", True, "URIReferenceException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["javax.xml.crypto", "URIReferenceException", True, "URIReferenceException", "(String,Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["javax.xml.crypto", "URIReferenceException", True, "URIReferenceException", "(String,Throwable)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.xml.crypto", "URIReferenceException", True, "URIReferenceException", "(String,Throwable,URIReference)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.xml.crypto", "URIReferenceException", True, "URIReferenceException", "(String,Throwable,URIReference)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.xml.crypto", "URIReferenceException", True, "URIReferenceException", "(String,Throwable,URIReference)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.crypto", "URIReferenceException", True, "URIReferenceException", "(String,Throwable,URIReference)", "", "Argument[2]", "Argument[this].SyntheticField[javax.xml.crypto.URIReferenceException.uriReference]", "value", "dfc-generated"]
       - ["javax.xml.crypto", "URIReferenceException", True, "URIReferenceException", "(Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.xml.crypto", "URIReferenceException", True, "getURIReference", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.xml.crypto", "XMLCryptoContext", True, "get", "(Object)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.xml.crypto", "XMLCryptoContext", True, "getBaseURI", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.xml.crypto", "XMLCryptoContext", True, "getDefaultNamespacePrefix", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.xml.crypto", "XMLCryptoContext", True, "getKeySelector", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.xml.crypto", "XMLCryptoContext", True, "getNamespacePrefix", "(String,String)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.xml.crypto", "XMLCryptoContext", True, "getNamespacePrefix", "(String,String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.xml.crypto", "XMLCryptoContext", True, "getProperty", "(String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.xml.crypto", "XMLCryptoContext", True, "getURIDereferencer", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.xml.crypto", "XMLCryptoContext", True, "put", "(Object,Object)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.xml.crypto", "XMLCryptoContext", True, "put", "(Object,Object)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.xml.crypto", "XMLCryptoContext", True, "put", "(Object,Object)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.xml.crypto", "XMLCryptoContext", True, "putNamespacePrefix", "(String,String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.xml.crypto", "XMLCryptoContext", True, "putNamespacePrefix", "(String,String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.xml.crypto", "XMLCryptoContext", True, "putNamespacePrefix", "(String,String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.xml.crypto", "XMLCryptoContext", True, "setBaseURI", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.xml.crypto", "XMLCryptoContext", True, "setDefaultNamespacePrefix", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.xml.crypto", "XMLCryptoContext", True, "setKeySelector", "(KeySelector)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.xml.crypto", "XMLCryptoContext", True, "setProperty", "(String,Object)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.xml.crypto", "XMLCryptoContext", True, "setProperty", "(String,Object)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.xml.crypto", "XMLCryptoContext", True, "setProperty", "(String,Object)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.xml.crypto", "XMLCryptoContext", True, "setURIDereferencer", "(URIDereferencer)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.crypto", "URIReferenceException", True, "getURIReference", "()", "", "Argument[this].SyntheticField[javax.xml.crypto.URIReferenceException.uriReference]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.xml.crypto", "XMLCryptoContext", True, "getNamespacePrefix", "(String,String)", "", "Argument[1]", "ReturnValue", "value", "dfc-generated"]
   - addsTo:
       pack: codeql/java-all
       extensible: neutralModel
     data:
       - ["javax.xml.crypto", "KeySelector", "select", "(KeyInfo,KeySelector$Purpose,AlgorithmMethod,XMLCryptoContext)", "summary", "df-generated"]
-      - ["javax.xml.crypto", "KeySelectorResult", "getKey", "()", "summary", "df-generated"]
-      - ["javax.xml.crypto", "XMLStructure", "isFeatureSupported", "(String)", "summary", "df-generated"]
diff --git a/java/ql/lib/ext/generated/javax.xml.datatype.model.yml b/java/ql/lib/ext/generated/javax.xml.datatype.model.yml
index ea6d6f45c78..ea27a737e9d 100644
--- a/java/ql/lib/ext/generated/javax.xml.datatype.model.yml
+++ b/java/ql/lib/ext/generated/javax.xml.datatype.model.yml
@@ -8,6 +8,8 @@ extensions:
       - ["javax.xml.datatype", "DatatypeConfigurationException", True, "DatatypeConfigurationException", "(String,Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["javax.xml.datatype", "DatatypeConfigurationException", True, "DatatypeConfigurationException", "(String,Throwable)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
       - ["javax.xml.datatype", "DatatypeConfigurationException", True, "DatatypeConfigurationException", "(Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.datatype", "XMLGregorianCalendar", True, "normalize", "()", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.xml.datatype", "XMLGregorianCalendar", True, "toGregorianCalendar", "(TimeZone,Locale,XMLGregorianCalendar)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
   - addsTo:
       pack: codeql/java-all
       extensible: neutralModel
@@ -77,7 +79,6 @@ extensions:
       - ["javax.xml.datatype", "XMLGregorianCalendar", "getXMLSchemaType", "()", "summary", "df-generated"]
       - ["javax.xml.datatype", "XMLGregorianCalendar", "getYear", "()", "summary", "df-generated"]
       - ["javax.xml.datatype", "XMLGregorianCalendar", "isValid", "()", "summary", "df-generated"]
-      - ["javax.xml.datatype", "XMLGregorianCalendar", "normalize", "()", "summary", "df-generated"]
       - ["javax.xml.datatype", "XMLGregorianCalendar", "reset", "()", "summary", "df-generated"]
       - ["javax.xml.datatype", "XMLGregorianCalendar", "setDay", "(int)", "summary", "df-generated"]
       - ["javax.xml.datatype", "XMLGregorianCalendar", "setFractionalSecond", "(BigDecimal)", "summary", "df-generated"]
@@ -93,5 +94,4 @@ extensions:
       - ["javax.xml.datatype", "XMLGregorianCalendar", "setYear", "(BigInteger)", "summary", "df-generated"]
       - ["javax.xml.datatype", "XMLGregorianCalendar", "setYear", "(int)", "summary", "df-generated"]
       - ["javax.xml.datatype", "XMLGregorianCalendar", "toGregorianCalendar", "()", "summary", "df-generated"]
-      - ["javax.xml.datatype", "XMLGregorianCalendar", "toGregorianCalendar", "(TimeZone,Locale,XMLGregorianCalendar)", "summary", "df-generated"]
       - ["javax.xml.datatype", "XMLGregorianCalendar", "toXMLFormat", "()", "summary", "df-generated"]
diff --git a/java/ql/lib/ext/generated/javax.xml.namespace.model.yml b/java/ql/lib/ext/generated/javax.xml.namespace.model.yml
index 452e79f45bd..703b5f65464 100644
--- a/java/ql/lib/ext/generated/javax.xml.namespace.model.yml
+++ b/java/ql/lib/ext/generated/javax.xml.namespace.model.yml
@@ -4,13 +4,18 @@ extensions:
       pack: codeql/java-all
       extensible: summaryModel
     data:
-      - ["javax.xml.namespace", "QName", True, "QName", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.xml.namespace", "QName", True, "QName", "(String,String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.xml.namespace", "QName", True, "QName", "(String,String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.xml.namespace", "QName", True, "QName", "(String,String,String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.xml.namespace", "QName", True, "QName", "(String,String,String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.xml.namespace", "QName", True, "QName", "(String,String,String)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.xml.namespace", "QName", True, "getLocalPart", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.xml.namespace", "QName", True, "getNamespaceURI", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.xml.namespace", "QName", True, "getPrefix", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.xml.namespace", "QName", True, "valueOf", "(String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.namespace", "NamespaceContext", True, "getNamespaceURI", "(String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.namespace", "NamespaceContext", True, "getPrefix", "(String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.namespace", "NamespaceContext", True, "getPrefixes", "(String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.namespace", "NamespaceContext", True, "getPrefixes", "(String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.namespace", "QName", True, "QName", "(String)", "", "Argument[0]", "Argument[this].SyntheticField[javax.xml.namespace.QName.localPart]", "value", "dfc-generated"]
+      - ["javax.xml.namespace", "QName", True, "QName", "(String,String)", "", "Argument[0]", "Argument[this].SyntheticField[javax.xml.namespace.QName.namespaceURI]", "value", "dfc-generated"]
+      - ["javax.xml.namespace", "QName", True, "QName", "(String,String)", "", "Argument[1]", "Argument[this].SyntheticField[javax.xml.namespace.QName.localPart]", "value", "dfc-generated"]
+      - ["javax.xml.namespace", "QName", True, "QName", "(String,String,String)", "", "Argument[0]", "Argument[this].SyntheticField[javax.xml.namespace.QName.namespaceURI]", "value", "dfc-generated"]
+      - ["javax.xml.namespace", "QName", True, "QName", "(String,String,String)", "", "Argument[1]", "Argument[this].SyntheticField[javax.xml.namespace.QName.localPart]", "value", "dfc-generated"]
+      - ["javax.xml.namespace", "QName", True, "QName", "(String,String,String)", "", "Argument[2]", "Argument[this].SyntheticField[javax.xml.namespace.QName.prefix]", "value", "dfc-generated"]
+      - ["javax.xml.namespace", "QName", True, "getLocalPart", "()", "", "Argument[this].SyntheticField[javax.xml.namespace.QName.localPart]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.xml.namespace", "QName", True, "getNamespaceURI", "()", "", "Argument[this].SyntheticField[javax.xml.namespace.QName.namespaceURI]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.xml.namespace", "QName", True, "getPrefix", "()", "", "Argument[this].SyntheticField[javax.xml.namespace.QName.prefix]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.xml.namespace", "QName", True, "valueOf", "(String)", "", "Argument[0]", "ReturnValue.SyntheticField[javax.xml.namespace.QName.localPart]", "value", "dfc-generated"]
+      - ["javax.xml.namespace", "QName", True, "valueOf", "(String)", "", "Argument[0]", "ReturnValue.SyntheticField[javax.xml.namespace.QName.namespaceURI]", "taint", "dfc-generated"]
diff --git a/java/ql/lib/ext/generated/javax.xml.parsers.model.yml b/java/ql/lib/ext/generated/javax.xml.parsers.model.yml
index 885b668c180..1db93967588 100644
--- a/java/ql/lib/ext/generated/javax.xml.parsers.model.yml
+++ b/java/ql/lib/ext/generated/javax.xml.parsers.model.yml
@@ -4,41 +4,56 @@ extensions:
       pack: codeql/java-all
       extensible: summaryModel
     data:
+      - ["javax.xml.parsers", "DocumentBuilder", True, "getSchema", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["javax.xml.parsers", "DocumentBuilder", True, "parse", "(File)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.parsers", "DocumentBuilder", True, "parse", "(InputSource)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["javax.xml.parsers", "DocumentBuilder", True, "parse", "(InputStream)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["javax.xml.parsers", "DocumentBuilder", True, "parse", "(InputStream,String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["javax.xml.parsers", "DocumentBuilder", True, "parse", "(String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.parsers", "DocumentBuilderFactory", True, "getAttribute", "(String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.parsers", "DocumentBuilderFactory", True, "getSchema", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.parsers", "DocumentBuilderFactory", True, "newDocumentBuilder", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.parsers", "DocumentBuilderFactory", True, "setAttribute", "(String,Object)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.parsers", "DocumentBuilderFactory", True, "setAttribute", "(String,Object)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.parsers", "DocumentBuilderFactory", True, "setFeature", "(String,boolean)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.parsers", "DocumentBuilderFactory", True, "setSchema", "(Schema)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["javax.xml.parsers", "FactoryConfigurationError", True, "FactoryConfigurationError", "(Exception)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.xml.parsers", "FactoryConfigurationError", True, "FactoryConfigurationError", "(Exception,String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.xml.parsers", "FactoryConfigurationError", True, "FactoryConfigurationError", "(Exception,String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.parsers", "FactoryConfigurationError", True, "FactoryConfigurationError", "(Exception,String)", "", "Argument[0]", "Argument[this].SyntheticField[javax.xml.parsers.FactoryConfigurationError.exception]", "value", "dfc-generated"]
       - ["javax.xml.parsers", "FactoryConfigurationError", True, "FactoryConfigurationError", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.xml.parsers", "FactoryConfigurationError", True, "getException", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.parsers", "FactoryConfigurationError", True, "getException", "()", "", "Argument[this].SyntheticField[javax.xml.parsers.FactoryConfigurationError.exception]", "ReturnValue", "value", "dfc-generated"]
       - ["javax.xml.parsers", "ParserConfigurationException", True, "ParserConfigurationException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.parsers", "SAXParser", True, "getParser", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.parsers", "SAXParser", True, "getProperty", "(String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.parsers", "SAXParser", True, "getSchema", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.parsers", "SAXParser", True, "getXMLReader", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["javax.xml.parsers", "SAXParser", True, "parse", "(File,DefaultHandler)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
       - ["javax.xml.parsers", "SAXParser", True, "parse", "(File,HandlerBase)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.parsers", "SAXParser", True, "parse", "(InputSource,DefaultHandler)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.parsers", "SAXParser", True, "parse", "(InputSource,HandlerBase)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
       - ["javax.xml.parsers", "SAXParser", True, "parse", "(InputStream,DefaultHandler)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
       - ["javax.xml.parsers", "SAXParser", True, "parse", "(InputStream,DefaultHandler,String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
       - ["javax.xml.parsers", "SAXParser", True, "parse", "(InputStream,HandlerBase)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
       - ["javax.xml.parsers", "SAXParser", True, "parse", "(InputStream,HandlerBase,String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
       - ["javax.xml.parsers", "SAXParser", True, "parse", "(String,DefaultHandler)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
       - ["javax.xml.parsers", "SAXParser", True, "parse", "(String,HandlerBase)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.parsers", "SAXParser", True, "setProperty", "(String,Object)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.parsers", "SAXParserFactory", True, "getSchema", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.parsers", "SAXParserFactory", True, "newSAXParser", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.parsers", "SAXParserFactory", True, "setFeature", "(String,boolean)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.parsers", "SAXParserFactory", True, "setSchema", "(Schema)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
   - addsTo:
       pack: codeql/java-all
       extensible: neutralModel
     data:
       - ["javax.xml.parsers", "DocumentBuilder", "getDOMImplementation", "()", "summary", "df-generated"]
-      - ["javax.xml.parsers", "DocumentBuilder", "getSchema", "()", "summary", "df-generated"]
       - ["javax.xml.parsers", "DocumentBuilder", "isNamespaceAware", "()", "summary", "df-generated"]
       - ["javax.xml.parsers", "DocumentBuilder", "isValidating", "()", "summary", "df-generated"]
       - ["javax.xml.parsers", "DocumentBuilder", "isXIncludeAware", "()", "summary", "df-generated"]
       - ["javax.xml.parsers", "DocumentBuilder", "newDocument", "()", "summary", "df-generated"]
-      - ["javax.xml.parsers", "DocumentBuilder", "parse", "(InputSource)", "summary", "df-generated"]
       - ["javax.xml.parsers", "DocumentBuilder", "reset", "()", "summary", "df-generated"]
       - ["javax.xml.parsers", "DocumentBuilder", "setEntityResolver", "(EntityResolver)", "summary", "df-generated"]
       - ["javax.xml.parsers", "DocumentBuilder", "setErrorHandler", "(ErrorHandler)", "summary", "df-generated"]
-      - ["javax.xml.parsers", "DocumentBuilderFactory", "getAttribute", "(String)", "summary", "df-generated"]
       - ["javax.xml.parsers", "DocumentBuilderFactory", "getFeature", "(String)", "summary", "df-generated"]
-      - ["javax.xml.parsers", "DocumentBuilderFactory", "getSchema", "()", "summary", "df-generated"]
       - ["javax.xml.parsers", "DocumentBuilderFactory", "isCoalescing", "()", "summary", "df-generated"]
       - ["javax.xml.parsers", "DocumentBuilderFactory", "isExpandEntityReferences", "()", "summary", "df-generated"]
       - ["javax.xml.parsers", "DocumentBuilderFactory", "isIgnoringComments", "()", "summary", "df-generated"]
@@ -48,34 +63,22 @@ extensions:
       - ["javax.xml.parsers", "DocumentBuilderFactory", "isXIncludeAware", "()", "summary", "df-generated"]
       - ["javax.xml.parsers", "DocumentBuilderFactory", "newDefaultInstance", "()", "summary", "df-generated"]
       - ["javax.xml.parsers", "DocumentBuilderFactory", "newDefaultNSInstance", "()", "summary", "df-generated"]
-      - ["javax.xml.parsers", "DocumentBuilderFactory", "newDocumentBuilder", "()", "summary", "df-generated"]
       - ["javax.xml.parsers", "DocumentBuilderFactory", "newInstance", "()", "summary", "df-generated"]
       - ["javax.xml.parsers", "DocumentBuilderFactory", "newInstance", "(String,ClassLoader)", "summary", "df-generated"]
       - ["javax.xml.parsers", "DocumentBuilderFactory", "newNSInstance", "()", "summary", "df-generated"]
       - ["javax.xml.parsers", "DocumentBuilderFactory", "newNSInstance", "(String,ClassLoader)", "summary", "df-generated"]
-      - ["javax.xml.parsers", "DocumentBuilderFactory", "setAttribute", "(String,Object)", "summary", "df-generated"]
       - ["javax.xml.parsers", "DocumentBuilderFactory", "setCoalescing", "(boolean)", "summary", "df-generated"]
       - ["javax.xml.parsers", "DocumentBuilderFactory", "setExpandEntityReferences", "(boolean)", "summary", "df-generated"]
-      - ["javax.xml.parsers", "DocumentBuilderFactory", "setFeature", "(String,boolean)", "summary", "df-generated"]
       - ["javax.xml.parsers", "DocumentBuilderFactory", "setIgnoringComments", "(boolean)", "summary", "df-generated"]
       - ["javax.xml.parsers", "DocumentBuilderFactory", "setIgnoringElementContentWhitespace", "(boolean)", "summary", "df-generated"]
       - ["javax.xml.parsers", "DocumentBuilderFactory", "setNamespaceAware", "(boolean)", "summary", "df-generated"]
-      - ["javax.xml.parsers", "DocumentBuilderFactory", "setSchema", "(Schema)", "summary", "df-generated"]
       - ["javax.xml.parsers", "DocumentBuilderFactory", "setValidating", "(boolean)", "summary", "df-generated"]
       - ["javax.xml.parsers", "DocumentBuilderFactory", "setXIncludeAware", "(boolean)", "summary", "df-generated"]
-      - ["javax.xml.parsers", "SAXParser", "getParser", "()", "summary", "df-generated"]
-      - ["javax.xml.parsers", "SAXParser", "getProperty", "(String)", "summary", "df-generated"]
-      - ["javax.xml.parsers", "SAXParser", "getSchema", "()", "summary", "df-generated"]
-      - ["javax.xml.parsers", "SAXParser", "getXMLReader", "()", "summary", "df-generated"]
       - ["javax.xml.parsers", "SAXParser", "isNamespaceAware", "()", "summary", "df-generated"]
       - ["javax.xml.parsers", "SAXParser", "isValidating", "()", "summary", "df-generated"]
       - ["javax.xml.parsers", "SAXParser", "isXIncludeAware", "()", "summary", "df-generated"]
-      - ["javax.xml.parsers", "SAXParser", "parse", "(InputSource,DefaultHandler)", "summary", "df-generated"]
-      - ["javax.xml.parsers", "SAXParser", "parse", "(InputSource,HandlerBase)", "summary", "df-generated"]
       - ["javax.xml.parsers", "SAXParser", "reset", "()", "summary", "df-generated"]
-      - ["javax.xml.parsers", "SAXParser", "setProperty", "(String,Object)", "summary", "df-generated"]
       - ["javax.xml.parsers", "SAXParserFactory", "getFeature", "(String)", "summary", "df-generated"]
-      - ["javax.xml.parsers", "SAXParserFactory", "getSchema", "()", "summary", "df-generated"]
       - ["javax.xml.parsers", "SAXParserFactory", "isNamespaceAware", "()", "summary", "df-generated"]
       - ["javax.xml.parsers", "SAXParserFactory", "isValidating", "()", "summary", "df-generated"]
       - ["javax.xml.parsers", "SAXParserFactory", "isXIncludeAware", "()", "summary", "df-generated"]
@@ -85,9 +88,6 @@ extensions:
       - ["javax.xml.parsers", "SAXParserFactory", "newInstance", "(String,ClassLoader)", "summary", "df-generated"]
       - ["javax.xml.parsers", "SAXParserFactory", "newNSInstance", "()", "summary", "df-generated"]
       - ["javax.xml.parsers", "SAXParserFactory", "newNSInstance", "(String,ClassLoader)", "summary", "df-generated"]
-      - ["javax.xml.parsers", "SAXParserFactory", "newSAXParser", "()", "summary", "df-generated"]
-      - ["javax.xml.parsers", "SAXParserFactory", "setFeature", "(String,boolean)", "summary", "df-generated"]
       - ["javax.xml.parsers", "SAXParserFactory", "setNamespaceAware", "(boolean)", "summary", "df-generated"]
-      - ["javax.xml.parsers", "SAXParserFactory", "setSchema", "(Schema)", "summary", "df-generated"]
       - ["javax.xml.parsers", "SAXParserFactory", "setValidating", "(boolean)", "summary", "df-generated"]
       - ["javax.xml.parsers", "SAXParserFactory", "setXIncludeAware", "(boolean)", "summary", "df-generated"]
diff --git a/java/ql/lib/ext/generated/javax.xml.stream.events.model.yml b/java/ql/lib/ext/generated/javax.xml.stream.events.model.yml
new file mode 100644
index 00000000000..c2e755d86b7
--- /dev/null
+++ b/java/ql/lib/ext/generated/javax.xml.stream.events.model.yml
@@ -0,0 +1,44 @@
+# THIS FILE IS AN AUTO-GENERATED MODELS AS DATA FILE. DO NOT EDIT.
+extensions:
+  - addsTo:
+      pack: codeql/java-all
+      extensible: summaryModel
+    data:
+      - ["javax.xml.stream.events", "Attribute", True, "getDTDType", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.stream.events", "Attribute", True, "getName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.stream.events", "Attribute", True, "getValue", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.stream.events", "Characters", True, "getData", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.stream.events", "Comment", True, "getText", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.stream.events", "DTD", True, "getDocumentTypeDeclaration", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.stream.events", "DTD", True, "getEntities", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.stream.events", "DTD", True, "getNotations", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.stream.events", "EndElement", True, "getName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.stream.events", "EntityDeclaration", True, "getBaseURI", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.stream.events", "EntityDeclaration", True, "getName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.stream.events", "EntityDeclaration", True, "getNotationName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.stream.events", "EntityDeclaration", True, "getPublicId", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.stream.events", "EntityDeclaration", True, "getReplacementText", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.stream.events", "EntityDeclaration", True, "getSystemId", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.stream.events", "EntityReference", True, "getDeclaration", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.stream.events", "EntityReference", True, "getName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.stream.events", "Namespace", True, "getNamespaceURI", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.stream.events", "Namespace", True, "getPrefix", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.stream.events", "NotationDeclaration", True, "getName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.stream.events", "NotationDeclaration", True, "getPublicId", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.stream.events", "NotationDeclaration", True, "getSystemId", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.stream.events", "ProcessingInstruction", True, "getData", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.stream.events", "ProcessingInstruction", True, "getTarget", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.stream.events", "StartDocument", True, "getCharacterEncodingScheme", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.stream.events", "StartDocument", True, "getSystemId", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.stream.events", "StartDocument", True, "getVersion", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.stream.events", "StartElement", True, "getAttributeByName", "(QName)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.stream.events", "StartElement", True, "getAttributes", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.stream.events", "StartElement", True, "getName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.stream.events", "StartElement", True, "getNamespaceContext", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.stream.events", "StartElement", True, "getNamespaceURI", "(String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.stream.events", "StartElement", True, "getNamespaces", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.stream.events", "XMLEvent", True, "asCharacters", "()", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.xml.stream.events", "XMLEvent", True, "asEndElement", "()", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.xml.stream.events", "XMLEvent", True, "asStartElement", "()", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.xml.stream.events", "XMLEvent", True, "getLocation", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.stream.events", "XMLEvent", True, "writeAsEncodedUnicode", "(Writer)", "", "Argument[this]", "Argument[0]", "taint", "df-generated"]
diff --git a/java/ql/lib/ext/generated/javax.xml.stream.model.yml b/java/ql/lib/ext/generated/javax.xml.stream.model.yml
index 86ce369cf51..f3dcefdc59a 100644
--- a/java/ql/lib/ext/generated/javax.xml.stream.model.yml
+++ b/java/ql/lib/ext/generated/javax.xml.stream.model.yml
@@ -4,153 +4,203 @@ extensions:
       pack: codeql/java-all
       extensible: summaryModel
     data:
-      - ["javax.xml.stream", "FactoryConfigurationError", True, "FactoryConfigurationError", "(Exception)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.xml.stream", "FactoryConfigurationError", True, "FactoryConfigurationError", "(Exception,String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.xml.stream", "FactoryConfigurationError", True, "FactoryConfigurationError", "(Exception,String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.stream", "FactoryConfigurationError", True, "FactoryConfigurationError", "(Exception)", "", "Argument[0]", "Argument[this].SyntheticField[javax.xml.stream.FactoryConfigurationError.nested]", "value", "dfc-generated"]
+      - ["javax.xml.stream", "FactoryConfigurationError", True, "FactoryConfigurationError", "(Exception,String)", "", "Argument[0]", "Argument[this].SyntheticField[javax.xml.stream.FactoryConfigurationError.nested]", "value", "dfc-generated"]
       - ["javax.xml.stream", "FactoryConfigurationError", True, "FactoryConfigurationError", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.xml.stream", "FactoryConfigurationError", True, "FactoryConfigurationError", "(String,Exception)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.xml.stream", "FactoryConfigurationError", True, "FactoryConfigurationError", "(String,Exception)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.xml.stream", "FactoryConfigurationError", True, "getException", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.xml.stream", "XMLEventFactory", True, "newFactory", "(String,ClassLoader)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.xml.stream", "XMLEventFactory", True, "newInstance", "(String,ClassLoader)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.stream", "FactoryConfigurationError", True, "FactoryConfigurationError", "(String,Exception)", "", "Argument[1]", "Argument[this].SyntheticField[javax.xml.stream.FactoryConfigurationError.nested]", "value", "dfc-generated"]
+      - ["javax.xml.stream", "FactoryConfigurationError", True, "getException", "()", "", "Argument[this].SyntheticField[javax.xml.stream.FactoryConfigurationError.nested]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.xml.stream", "Location", True, "getPublicId", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.stream", "Location", True, "getSystemId", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.stream", "XMLEventFactory", True, "createAttribute", "(QName,String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.stream", "XMLEventFactory", True, "createAttribute", "(QName,String)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.stream", "XMLEventFactory", True, "createAttribute", "(QName,String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.stream", "XMLEventFactory", True, "createAttribute", "(String,String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.stream", "XMLEventFactory", True, "createAttribute", "(String,String)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.stream", "XMLEventFactory", True, "createAttribute", "(String,String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.stream", "XMLEventFactory", True, "createAttribute", "(String,String,String,String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.stream", "XMLEventFactory", True, "createAttribute", "(String,String,String,String)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.stream", "XMLEventFactory", True, "createAttribute", "(String,String,String,String)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.stream", "XMLEventFactory", True, "createAttribute", "(String,String,String,String)", "", "Argument[3]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.stream", "XMLEventFactory", True, "createAttribute", "(String,String,String,String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.stream", "XMLEventFactory", True, "createCData", "(String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.stream", "XMLEventFactory", True, "createCData", "(String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.stream", "XMLEventFactory", True, "createCharacters", "(String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.stream", "XMLEventFactory", True, "createCharacters", "(String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.stream", "XMLEventFactory", True, "createComment", "(String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.stream", "XMLEventFactory", True, "createComment", "(String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.stream", "XMLEventFactory", True, "createDTD", "(String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.stream", "XMLEventFactory", True, "createDTD", "(String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.stream", "XMLEventFactory", True, "createEndDocument", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.stream", "XMLEventFactory", True, "createEndElement", "(QName,Iterator)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.stream", "XMLEventFactory", True, "createEndElement", "(QName,Iterator)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.stream", "XMLEventFactory", True, "createEndElement", "(String,String,String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.stream", "XMLEventFactory", True, "createEndElement", "(String,String,String)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.stream", "XMLEventFactory", True, "createEndElement", "(String,String,String)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.stream", "XMLEventFactory", True, "createEndElement", "(String,String,String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.stream", "XMLEventFactory", True, "createEndElement", "(String,String,String,Iterator)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.stream", "XMLEventFactory", True, "createEndElement", "(String,String,String,Iterator)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.stream", "XMLEventFactory", True, "createEndElement", "(String,String,String,Iterator)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.stream", "XMLEventFactory", True, "createEndElement", "(String,String,String,Iterator)", "", "Argument[3].Element", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.stream", "XMLEventFactory", True, "createEndElement", "(String,String,String,Iterator)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.stream", "XMLEventFactory", True, "createEntityReference", "(String,EntityDeclaration)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.stream", "XMLEventFactory", True, "createEntityReference", "(String,EntityDeclaration)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.stream", "XMLEventFactory", True, "createEntityReference", "(String,EntityDeclaration)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.stream", "XMLEventFactory", True, "createIgnorableSpace", "(String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.stream", "XMLEventFactory", True, "createIgnorableSpace", "(String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.stream", "XMLEventFactory", True, "createNamespace", "(String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.stream", "XMLEventFactory", True, "createNamespace", "(String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.stream", "XMLEventFactory", True, "createNamespace", "(String,String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.stream", "XMLEventFactory", True, "createNamespace", "(String,String)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.stream", "XMLEventFactory", True, "createNamespace", "(String,String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.stream", "XMLEventFactory", True, "createProcessingInstruction", "(String,String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.stream", "XMLEventFactory", True, "createProcessingInstruction", "(String,String)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.stream", "XMLEventFactory", True, "createProcessingInstruction", "(String,String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.stream", "XMLEventFactory", True, "createSpace", "(String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.stream", "XMLEventFactory", True, "createSpace", "(String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.stream", "XMLEventFactory", True, "createStartDocument", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.stream", "XMLEventFactory", True, "createStartDocument", "(String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.stream", "XMLEventFactory", True, "createStartDocument", "(String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.stream", "XMLEventFactory", True, "createStartDocument", "(String,String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.stream", "XMLEventFactory", True, "createStartDocument", "(String,String)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.stream", "XMLEventFactory", True, "createStartDocument", "(String,String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.stream", "XMLEventFactory", True, "createStartDocument", "(String,String,boolean)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.stream", "XMLEventFactory", True, "createStartDocument", "(String,String,boolean)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.stream", "XMLEventFactory", True, "createStartDocument", "(String,String,boolean)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.stream", "XMLEventFactory", True, "createStartElement", "(QName,Iterator,Iterator)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.stream", "XMLEventFactory", True, "createStartElement", "(QName,Iterator,Iterator)", "", "Argument[1].Element", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.stream", "XMLEventFactory", True, "createStartElement", "(QName,Iterator,Iterator)", "", "Argument[2].Element", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.stream", "XMLEventFactory", True, "createStartElement", "(QName,Iterator,Iterator)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.stream", "XMLEventFactory", True, "createStartElement", "(String,String,String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.stream", "XMLEventFactory", True, "createStartElement", "(String,String,String)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.stream", "XMLEventFactory", True, "createStartElement", "(String,String,String)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.stream", "XMLEventFactory", True, "createStartElement", "(String,String,String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.stream", "XMLEventFactory", True, "createStartElement", "(String,String,String,Iterator,Iterator)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.stream", "XMLEventFactory", True, "createStartElement", "(String,String,String,Iterator,Iterator)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.stream", "XMLEventFactory", True, "createStartElement", "(String,String,String,Iterator,Iterator)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.stream", "XMLEventFactory", True, "createStartElement", "(String,String,String,Iterator,Iterator)", "", "Argument[3].Element", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.stream", "XMLEventFactory", True, "createStartElement", "(String,String,String,Iterator,Iterator)", "", "Argument[4].Element", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.stream", "XMLEventFactory", True, "createStartElement", "(String,String,String,Iterator,Iterator)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.stream", "XMLEventFactory", True, "createStartElement", "(String,String,String,Iterator,Iterator,NamespaceContext)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.stream", "XMLEventFactory", True, "createStartElement", "(String,String,String,Iterator,Iterator,NamespaceContext)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.stream", "XMLEventFactory", True, "createStartElement", "(String,String,String,Iterator,Iterator,NamespaceContext)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.stream", "XMLEventFactory", True, "createStartElement", "(String,String,String,Iterator,Iterator,NamespaceContext)", "", "Argument[3].Element", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.stream", "XMLEventFactory", True, "createStartElement", "(String,String,String,Iterator,Iterator,NamespaceContext)", "", "Argument[4].Element", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.stream", "XMLEventFactory", True, "createStartElement", "(String,String,String,Iterator,Iterator,NamespaceContext)", "", "Argument[5]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.stream", "XMLEventFactory", True, "createStartElement", "(String,String,String,Iterator,Iterator,NamespaceContext)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.stream", "XMLEventFactory", True, "setLocation", "(Location)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.stream", "XMLEventReader", True, "getElementText", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["javax.xml.stream", "XMLEventReader", True, "nextEvent", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["javax.xml.stream", "XMLEventReader", True, "nextTag", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["javax.xml.stream", "XMLEventReader", True, "peek", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.xml.stream", "XMLInputFactory", True, "newFactory", "(String,ClassLoader)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.xml.stream", "XMLInputFactory", True, "newInstance", "(String,ClassLoader)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.xml.stream", "XMLOutputFactory", True, "newFactory", "(String,ClassLoader)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.xml.stream", "XMLOutputFactory", True, "newInstance", "(String,ClassLoader)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.stream", "XMLEventWriter", True, "add", "(XMLEventReader)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.stream", "XMLEventWriter", True, "getNamespaceContext", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.stream", "XMLInputFactory", True, "createFilteredReader", "(XMLEventReader,EventFilter)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.stream", "XMLInputFactory", True, "createFilteredReader", "(XMLEventReader,EventFilter)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.stream", "XMLInputFactory", True, "createFilteredReader", "(XMLStreamReader,StreamFilter)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.stream", "XMLInputFactory", True, "createFilteredReader", "(XMLStreamReader,StreamFilter)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.stream", "XMLInputFactory", True, "createXMLEventReader", "(InputStream)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.stream", "XMLInputFactory", True, "createXMLEventReader", "(InputStream,String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.stream", "XMLInputFactory", True, "createXMLEventReader", "(Reader)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.stream", "XMLInputFactory", True, "createXMLEventReader", "(String,InputStream)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.stream", "XMLInputFactory", True, "createXMLEventReader", "(String,Reader)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.stream", "XMLInputFactory", True, "createXMLEventReader", "(XMLStreamReader)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.stream", "XMLInputFactory", True, "createXMLStreamReader", "(InputStream)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.stream", "XMLInputFactory", True, "createXMLStreamReader", "(InputStream,String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.stream", "XMLInputFactory", True, "createXMLStreamReader", "(Reader)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.stream", "XMLInputFactory", True, "createXMLStreamReader", "(Source)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.stream", "XMLInputFactory", True, "createXMLStreamReader", "(String,InputStream)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.stream", "XMLInputFactory", True, "createXMLStreamReader", "(String,Reader)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.stream", "XMLInputFactory", True, "getEventAllocator", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.stream", "XMLInputFactory", True, "getProperty", "(String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.stream", "XMLInputFactory", True, "getXMLReporter", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.stream", "XMLInputFactory", True, "getXMLResolver", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.stream", "XMLInputFactory", True, "setProperty", "(String,Object)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.stream", "XMLOutputFactory", True, "createXMLEventWriter", "(OutputStream)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.stream", "XMLOutputFactory", True, "createXMLEventWriter", "(OutputStream,String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.stream", "XMLOutputFactory", True, "createXMLEventWriter", "(Result)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.stream", "XMLOutputFactory", True, "createXMLEventWriter", "(Result)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.stream", "XMLOutputFactory", True, "createXMLEventWriter", "(Result)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.stream", "XMLOutputFactory", True, "createXMLEventWriter", "(Writer)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.stream", "XMLOutputFactory", True, "createXMLStreamWriter", "(OutputStream)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.stream", "XMLOutputFactory", True, "createXMLStreamWriter", "(OutputStream,String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.stream", "XMLOutputFactory", True, "createXMLStreamWriter", "(Result)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.stream", "XMLOutputFactory", True, "createXMLStreamWriter", "(Result)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.stream", "XMLOutputFactory", True, "createXMLStreamWriter", "(Result)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.stream", "XMLOutputFactory", True, "createXMLStreamWriter", "(Writer)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.stream", "XMLOutputFactory", True, "getProperty", "(String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.stream", "XMLOutputFactory", True, "setProperty", "(String,Object)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
       - ["javax.xml.stream", "XMLStreamException", True, "XMLStreamException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.xml.stream", "XMLStreamException", True, "XMLStreamException", "(String,Location)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.xml.stream", "XMLStreamException", True, "XMLStreamException", "(String,Location)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.xml.stream", "XMLStreamException", True, "XMLStreamException", "(String,Location,Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.xml.stream", "XMLStreamException", True, "XMLStreamException", "(String,Location,Throwable)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.xml.stream", "XMLStreamException", True, "XMLStreamException", "(String,Location,Throwable)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.xml.stream", "XMLStreamException", True, "XMLStreamException", "(String,Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.xml.stream", "XMLStreamException", True, "XMLStreamException", "(String,Throwable)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.xml.stream", "XMLStreamException", True, "XMLStreamException", "(Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.xml.stream", "XMLStreamException", True, "getLocation", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.xml.stream", "XMLStreamException", True, "getNestedException", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.stream", "XMLStreamException", True, "XMLStreamException", "(String,Location)", "", "Argument[1]", "Argument[this].SyntheticField[javax.xml.stream.XMLStreamException.location]", "value", "dfc-generated"]
+      - ["javax.xml.stream", "XMLStreamException", True, "XMLStreamException", "(String,Location,Throwable)", "", "Argument[1]", "Argument[this].SyntheticField[javax.xml.stream.XMLStreamException.location]", "value", "dfc-generated"]
+      - ["javax.xml.stream", "XMLStreamException", True, "XMLStreamException", "(String,Location,Throwable)", "", "Argument[2]", "Argument[this].SyntheticField[javax.xml.stream.XMLStreamException.nested]", "value", "dfc-generated"]
+      - ["javax.xml.stream", "XMLStreamException", True, "XMLStreamException", "(String,Throwable)", "", "Argument[1]", "Argument[this].SyntheticField[javax.xml.stream.XMLStreamException.nested]", "value", "dfc-generated"]
+      - ["javax.xml.stream", "XMLStreamException", True, "XMLStreamException", "(Throwable)", "", "Argument[0]", "Argument[this].SyntheticField[javax.xml.stream.XMLStreamException.nested]", "value", "dfc-generated"]
+      - ["javax.xml.stream", "XMLStreamException", True, "getLocation", "()", "", "Argument[this].SyntheticField[javax.xml.stream.XMLStreamException.location]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.xml.stream", "XMLStreamException", True, "getNestedException", "()", "", "Argument[this].SyntheticField[javax.xml.stream.XMLStreamException.nested]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.xml.stream", "XMLStreamReader", True, "getCharacterEncodingScheme", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["javax.xml.stream", "XMLStreamReader", True, "getElementText", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.stream", "XMLStreamReader", True, "getLocalName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["javax.xml.stream", "XMLStreamReader", True, "getNamespaceContext", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.stream", "XMLStreamReader", True, "getPITarget", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.stream", "XMLStreamReader", True, "getProperty", "(String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["javax.xml.stream", "XMLStreamReader", True, "getText", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.stream", "XMLStreamWriter", True, "getNamespaceContext", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.stream", "XMLStreamWriter", True, "getProperty", "(String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.stream", "XMLStreamWriter", True, "setNamespaceContext", "(NamespaceContext)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.stream", "XMLStreamWriter", True, "writeAttribute", "(String,String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.stream", "XMLStreamWriter", True, "writeAttribute", "(String,String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.stream", "XMLStreamWriter", True, "writeAttribute", "(String,String,String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.stream", "XMLStreamWriter", True, "writeAttribute", "(String,String,String)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.stream", "XMLStreamWriter", True, "writeAttribute", "(String,String,String,String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.stream", "XMLStreamWriter", True, "writeAttribute", "(String,String,String,String)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.stream", "XMLStreamWriter", True, "writeAttribute", "(String,String,String,String)", "", "Argument[3]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.stream", "XMLStreamWriter", True, "writeCData", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.stream", "XMLStreamWriter", True, "writeCharacters", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.stream", "XMLStreamWriter", True, "writeCharacters", "(char[],int,int)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.stream", "XMLStreamWriter", True, "writeComment", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.stream", "XMLStreamWriter", True, "writeDTD", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.stream", "XMLStreamWriter", True, "writeDefaultNamespace", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.stream", "XMLStreamWriter", True, "writeEmptyElement", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.stream", "XMLStreamWriter", True, "writeEmptyElement", "(String,String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.stream", "XMLStreamWriter", True, "writeEmptyElement", "(String,String,String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.stream", "XMLStreamWriter", True, "writeEmptyElement", "(String,String,String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.stream", "XMLStreamWriter", True, "writeEntityRef", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.stream", "XMLStreamWriter", True, "writeNamespace", "(String,String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.stream", "XMLStreamWriter", True, "writeNamespace", "(String,String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.stream", "XMLStreamWriter", True, "writeProcessingInstruction", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.stream", "XMLStreamWriter", True, "writeProcessingInstruction", "(String,String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.stream", "XMLStreamWriter", True, "writeProcessingInstruction", "(String,String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.stream", "XMLStreamWriter", True, "writeStartDocument", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.stream", "XMLStreamWriter", True, "writeStartDocument", "(String,String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.stream", "XMLStreamWriter", True, "writeStartDocument", "(String,String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.stream", "XMLStreamWriter", True, "writeStartElement", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.stream", "XMLStreamWriter", True, "writeStartElement", "(String,String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.stream", "XMLStreamWriter", True, "writeStartElement", "(String,String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.stream", "XMLStreamWriter", True, "writeStartElement", "(String,String,String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.stream", "XMLStreamWriter", True, "writeStartElement", "(String,String,String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.stream", "XMLStreamWriter", True, "writeStartElement", "(String,String,String)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
   - addsTo:
       pack: codeql/java-all
       extensible: neutralModel
     data:
-      - ["javax.xml.stream", "XMLEventFactory", "createAttribute", "(QName,String)", "summary", "df-generated"]
-      - ["javax.xml.stream", "XMLEventFactory", "createAttribute", "(String,String)", "summary", "df-generated"]
-      - ["javax.xml.stream", "XMLEventFactory", "createAttribute", "(String,String,String,String)", "summary", "df-generated"]
-      - ["javax.xml.stream", "XMLEventFactory", "createCData", "(String)", "summary", "df-generated"]
-      - ["javax.xml.stream", "XMLEventFactory", "createCharacters", "(String)", "summary", "df-generated"]
-      - ["javax.xml.stream", "XMLEventFactory", "createComment", "(String)", "summary", "df-generated"]
-      - ["javax.xml.stream", "XMLEventFactory", "createDTD", "(String)", "summary", "df-generated"]
-      - ["javax.xml.stream", "XMLEventFactory", "createEndDocument", "()", "summary", "df-generated"]
-      - ["javax.xml.stream", "XMLEventFactory", "createEndElement", "(QName,Iterator)", "summary", "df-generated"]
-      - ["javax.xml.stream", "XMLEventFactory", "createEndElement", "(String,String,String)", "summary", "df-generated"]
-      - ["javax.xml.stream", "XMLEventFactory", "createEndElement", "(String,String,String,Iterator)", "summary", "df-generated"]
-      - ["javax.xml.stream", "XMLEventFactory", "createEntityReference", "(String,EntityDeclaration)", "summary", "df-generated"]
-      - ["javax.xml.stream", "XMLEventFactory", "createIgnorableSpace", "(String)", "summary", "df-generated"]
-      - ["javax.xml.stream", "XMLEventFactory", "createNamespace", "(String)", "summary", "df-generated"]
-      - ["javax.xml.stream", "XMLEventFactory", "createNamespace", "(String,String)", "summary", "df-generated"]
-      - ["javax.xml.stream", "XMLEventFactory", "createProcessingInstruction", "(String,String)", "summary", "df-generated"]
-      - ["javax.xml.stream", "XMLEventFactory", "createSpace", "(String)", "summary", "df-generated"]
-      - ["javax.xml.stream", "XMLEventFactory", "createStartDocument", "()", "summary", "df-generated"]
-      - ["javax.xml.stream", "XMLEventFactory", "createStartDocument", "(String)", "summary", "df-generated"]
-      - ["javax.xml.stream", "XMLEventFactory", "createStartDocument", "(String,String)", "summary", "df-generated"]
-      - ["javax.xml.stream", "XMLEventFactory", "createStartDocument", "(String,String,boolean)", "summary", "df-generated"]
-      - ["javax.xml.stream", "XMLEventFactory", "createStartElement", "(QName,Iterator,Iterator)", "summary", "df-generated"]
-      - ["javax.xml.stream", "XMLEventFactory", "createStartElement", "(String,String,String)", "summary", "df-generated"]
-      - ["javax.xml.stream", "XMLEventFactory", "createStartElement", "(String,String,String,Iterator,Iterator)", "summary", "df-generated"]
-      - ["javax.xml.stream", "XMLEventFactory", "createStartElement", "(String,String,String,Iterator,Iterator,NamespaceContext)", "summary", "df-generated"]
       - ["javax.xml.stream", "XMLEventFactory", "newDefaultFactory", "()", "summary", "df-generated"]
       - ["javax.xml.stream", "XMLEventFactory", "newFactory", "()", "summary", "df-generated"]
+      - ["javax.xml.stream", "XMLEventFactory", "newFactory", "(String,ClassLoader)", "summary", "df-generated"]
       - ["javax.xml.stream", "XMLEventFactory", "newInstance", "()", "summary", "df-generated"]
-      - ["javax.xml.stream", "XMLEventFactory", "setLocation", "(Location)", "summary", "df-generated"]
-      - ["javax.xml.stream", "XMLEventReader", "close", "()", "summary", "df-generated"]
-      - ["javax.xml.stream", "XMLEventReader", "getElementText", "()", "summary", "df-generated"]
-      - ["javax.xml.stream", "XMLEventReader", "getProperty", "(String)", "summary", "df-generated"]
-      - ["javax.xml.stream", "XMLInputFactory", "createFilteredReader", "(XMLEventReader,EventFilter)", "summary", "df-generated"]
-      - ["javax.xml.stream", "XMLInputFactory", "createFilteredReader", "(XMLStreamReader,StreamFilter)", "summary", "df-generated"]
-      - ["javax.xml.stream", "XMLInputFactory", "createXMLEventReader", "(InputStream)", "summary", "df-generated"]
-      - ["javax.xml.stream", "XMLInputFactory", "createXMLEventReader", "(InputStream,String)", "summary", "df-generated"]
-      - ["javax.xml.stream", "XMLInputFactory", "createXMLEventReader", "(Reader)", "summary", "df-generated"]
+      - ["javax.xml.stream", "XMLEventFactory", "newInstance", "(String,ClassLoader)", "summary", "df-generated"]
       - ["javax.xml.stream", "XMLInputFactory", "createXMLEventReader", "(Source)", "summary", "df-generated"]
-      - ["javax.xml.stream", "XMLInputFactory", "createXMLEventReader", "(String,InputStream)", "summary", "df-generated"]
-      - ["javax.xml.stream", "XMLInputFactory", "createXMLEventReader", "(String,Reader)", "summary", "df-generated"]
-      - ["javax.xml.stream", "XMLInputFactory", "createXMLEventReader", "(XMLStreamReader)", "summary", "df-generated"]
-      - ["javax.xml.stream", "XMLInputFactory", "createXMLStreamReader", "(InputStream)", "summary", "df-generated"]
-      - ["javax.xml.stream", "XMLInputFactory", "createXMLStreamReader", "(InputStream,String)", "summary", "df-generated"]
-      - ["javax.xml.stream", "XMLInputFactory", "createXMLStreamReader", "(Reader)", "summary", "df-generated"]
-      - ["javax.xml.stream", "XMLInputFactory", "createXMLStreamReader", "(Source)", "summary", "df-generated"]
-      - ["javax.xml.stream", "XMLInputFactory", "createXMLStreamReader", "(String,InputStream)", "summary", "df-generated"]
-      - ["javax.xml.stream", "XMLInputFactory", "createXMLStreamReader", "(String,Reader)", "summary", "df-generated"]
-      - ["javax.xml.stream", "XMLInputFactory", "getEventAllocator", "()", "summary", "df-generated"]
-      - ["javax.xml.stream", "XMLInputFactory", "getProperty", "(String)", "summary", "df-generated"]
-      - ["javax.xml.stream", "XMLInputFactory", "getXMLReporter", "()", "summary", "df-generated"]
-      - ["javax.xml.stream", "XMLInputFactory", "getXMLResolver", "()", "summary", "df-generated"]
       - ["javax.xml.stream", "XMLInputFactory", "isPropertySupported", "(String)", "summary", "df-generated"]
       - ["javax.xml.stream", "XMLInputFactory", "newDefaultFactory", "()", "summary", "df-generated"]
       - ["javax.xml.stream", "XMLInputFactory", "newFactory", "()", "summary", "df-generated"]
+      - ["javax.xml.stream", "XMLInputFactory", "newFactory", "(String,ClassLoader)", "summary", "df-generated"]
       - ["javax.xml.stream", "XMLInputFactory", "newInstance", "()", "summary", "df-generated"]
+      - ["javax.xml.stream", "XMLInputFactory", "newInstance", "(String,ClassLoader)", "summary", "df-generated"]
       - ["javax.xml.stream", "XMLInputFactory", "setEventAllocator", "(XMLEventAllocator)", "summary", "df-generated"]
-      - ["javax.xml.stream", "XMLInputFactory", "setProperty", "(String,Object)", "summary", "df-generated"]
       - ["javax.xml.stream", "XMLInputFactory", "setXMLReporter", "(XMLReporter)", "summary", "df-generated"]
       - ["javax.xml.stream", "XMLInputFactory", "setXMLResolver", "(XMLResolver)", "summary", "df-generated"]
-      - ["javax.xml.stream", "XMLOutputFactory", "createXMLEventWriter", "(OutputStream)", "summary", "df-generated"]
-      - ["javax.xml.stream", "XMLOutputFactory", "createXMLEventWriter", "(OutputStream,String)", "summary", "df-generated"]
-      - ["javax.xml.stream", "XMLOutputFactory", "createXMLEventWriter", "(Result)", "summary", "df-generated"]
-      - ["javax.xml.stream", "XMLOutputFactory", "createXMLEventWriter", "(Writer)", "summary", "df-generated"]
-      - ["javax.xml.stream", "XMLOutputFactory", "createXMLStreamWriter", "(OutputStream)", "summary", "df-generated"]
-      - ["javax.xml.stream", "XMLOutputFactory", "createXMLStreamWriter", "(OutputStream,String)", "summary", "df-generated"]
-      - ["javax.xml.stream", "XMLOutputFactory", "createXMLStreamWriter", "(Result)", "summary", "df-generated"]
-      - ["javax.xml.stream", "XMLOutputFactory", "createXMLStreamWriter", "(Writer)", "summary", "df-generated"]
-      - ["javax.xml.stream", "XMLOutputFactory", "getProperty", "(String)", "summary", "df-generated"]
       - ["javax.xml.stream", "XMLOutputFactory", "isPropertySupported", "(String)", "summary", "df-generated"]
       - ["javax.xml.stream", "XMLOutputFactory", "newDefaultFactory", "()", "summary", "df-generated"]
       - ["javax.xml.stream", "XMLOutputFactory", "newFactory", "()", "summary", "df-generated"]
+      - ["javax.xml.stream", "XMLOutputFactory", "newFactory", "(String,ClassLoader)", "summary", "df-generated"]
       - ["javax.xml.stream", "XMLOutputFactory", "newInstance", "()", "summary", "df-generated"]
-      - ["javax.xml.stream", "XMLOutputFactory", "setProperty", "(String,Object)", "summary", "df-generated"]
-      - ["javax.xml.stream", "XMLResolver", "resolveEntity", "(String,String,String,String)", "summary", "df-generated"]
-      - ["javax.xml.stream", "XMLStreamReader", "close", "()", "summary", "df-generated"]
-      - ["javax.xml.stream", "XMLStreamReader", "getAttributeCount", "()", "summary", "df-generated"]
-      - ["javax.xml.stream", "XMLStreamReader", "getAttributeLocalName", "(int)", "summary", "df-generated"]
-      - ["javax.xml.stream", "XMLStreamReader", "getAttributeName", "(int)", "summary", "df-generated"]
-      - ["javax.xml.stream", "XMLStreamReader", "getAttributeNamespace", "(int)", "summary", "df-generated"]
-      - ["javax.xml.stream", "XMLStreamReader", "getAttributePrefix", "(int)", "summary", "df-generated"]
-      - ["javax.xml.stream", "XMLStreamReader", "getAttributeType", "(int)", "summary", "df-generated"]
-      - ["javax.xml.stream", "XMLStreamReader", "getAttributeValue", "(String,String)", "summary", "df-generated"]
-      - ["javax.xml.stream", "XMLStreamReader", "getAttributeValue", "(int)", "summary", "df-generated"]
-      - ["javax.xml.stream", "XMLStreamReader", "getCharacterEncodingScheme", "()", "summary", "df-generated"]
-      - ["javax.xml.stream", "XMLStreamReader", "getEncoding", "()", "summary", "df-generated"]
-      - ["javax.xml.stream", "XMLStreamReader", "getEventType", "()", "summary", "df-generated"]
-      - ["javax.xml.stream", "XMLStreamReader", "getLocalName", "()", "summary", "df-generated"]
-      - ["javax.xml.stream", "XMLStreamReader", "getLocation", "()", "summary", "df-generated"]
-      - ["javax.xml.stream", "XMLStreamReader", "getName", "()", "summary", "df-generated"]
-      - ["javax.xml.stream", "XMLStreamReader", "getNamespaceCount", "()", "summary", "df-generated"]
-      - ["javax.xml.stream", "XMLStreamReader", "getNamespacePrefix", "(int)", "summary", "df-generated"]
-      - ["javax.xml.stream", "XMLStreamReader", "getNamespaceURI", "()", "summary", "df-generated"]
-      - ["javax.xml.stream", "XMLStreamReader", "getNamespaceURI", "(String)", "summary", "df-generated"]
-      - ["javax.xml.stream", "XMLStreamReader", "getNamespaceURI", "(int)", "summary", "df-generated"]
-      - ["javax.xml.stream", "XMLStreamReader", "getPIData", "()", "summary", "df-generated"]
-      - ["javax.xml.stream", "XMLStreamReader", "getPITarget", "()", "summary", "df-generated"]
-      - ["javax.xml.stream", "XMLStreamReader", "getPrefix", "()", "summary", "df-generated"]
-      - ["javax.xml.stream", "XMLStreamReader", "getProperty", "(String)", "summary", "df-generated"]
-      - ["javax.xml.stream", "XMLStreamReader", "getTextCharacters", "()", "summary", "df-generated"]
-      - ["javax.xml.stream", "XMLStreamReader", "getTextCharacters", "(int,char[],int,int)", "summary", "df-generated"]
-      - ["javax.xml.stream", "XMLStreamReader", "getTextLength", "()", "summary", "df-generated"]
-      - ["javax.xml.stream", "XMLStreamReader", "getTextStart", "()", "summary", "df-generated"]
-      - ["javax.xml.stream", "XMLStreamReader", "getVersion", "()", "summary", "df-generated"]
-      - ["javax.xml.stream", "XMLStreamReader", "hasName", "()", "summary", "df-generated"]
-      - ["javax.xml.stream", "XMLStreamReader", "hasNext", "()", "summary", "df-generated"]
-      - ["javax.xml.stream", "XMLStreamReader", "hasText", "()", "summary", "df-generated"]
-      - ["javax.xml.stream", "XMLStreamReader", "isAttributeSpecified", "(int)", "summary", "df-generated"]
-      - ["javax.xml.stream", "XMLStreamReader", "isCharacters", "()", "summary", "df-generated"]
-      - ["javax.xml.stream", "XMLStreamReader", "isEndElement", "()", "summary", "df-generated"]
-      - ["javax.xml.stream", "XMLStreamReader", "isStandalone", "()", "summary", "df-generated"]
-      - ["javax.xml.stream", "XMLStreamReader", "isStartElement", "()", "summary", "df-generated"]
-      - ["javax.xml.stream", "XMLStreamReader", "isWhiteSpace", "()", "summary", "df-generated"]
-      - ["javax.xml.stream", "XMLStreamReader", "next", "()", "summary", "df-generated"]
-      - ["javax.xml.stream", "XMLStreamReader", "nextTag", "()", "summary", "df-generated"]
-      - ["javax.xml.stream", "XMLStreamReader", "require", "(int,String,String)", "summary", "df-generated"]
-      - ["javax.xml.stream", "XMLStreamReader", "standaloneSet", "()", "summary", "df-generated"]
+      - ["javax.xml.stream", "XMLOutputFactory", "newInstance", "(String,ClassLoader)", "summary", "df-generated"]
diff --git a/java/ql/lib/ext/generated/javax.xml.stream.util.model.yml b/java/ql/lib/ext/generated/javax.xml.stream.util.model.yml
index e4485a47e75..28b93f8e31e 100644
--- a/java/ql/lib/ext/generated/javax.xml.stream.util.model.yml
+++ b/java/ql/lib/ext/generated/javax.xml.stream.util.model.yml
@@ -4,9 +4,55 @@ extensions:
       pack: codeql/java-all
       extensible: summaryModel
     data:
-      - ["javax.xml.stream.util", "EventReaderDelegate", True, "EventReaderDelegate", "(XMLEventReader)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["javax.xml.stream.util", "EventReaderDelegate", True, "getParent", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.xml.stream.util", "EventReaderDelegate", True, "setParent", "(XMLEventReader)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["javax.xml.stream.util", "StreamReaderDelegate", True, "StreamReaderDelegate", "(XMLStreamReader)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.xml.stream.util", "StreamReaderDelegate", True, "getParent", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.xml.stream.util", "StreamReaderDelegate", True, "setParent", "(XMLStreamReader)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.stream.util", "EventReaderDelegate", True, "EventReaderDelegate", "(XMLEventReader)", "", "Argument[0]", "Argument[this].SyntheticField[javax.xml.stream.util.EventReaderDelegate.reader]", "value", "dfc-generated"]
+      - ["javax.xml.stream.util", "EventReaderDelegate", True, "getParent", "()", "", "Argument[this].SyntheticField[javax.xml.stream.util.EventReaderDelegate.reader]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.xml.stream.util", "EventReaderDelegate", True, "setParent", "(XMLEventReader)", "", "Argument[0]", "Argument[this].SyntheticField[javax.xml.stream.util.EventReaderDelegate.reader]", "value", "dfc-generated"]
+      - ["javax.xml.stream.util", "StreamReaderDelegate", True, "StreamReaderDelegate", "(XMLStreamReader)", "", "Argument[0]", "Argument[this].SyntheticField[javax.xml.stream.util.StreamReaderDelegate.reader]", "value", "dfc-generated"]
+      - ["javax.xml.stream.util", "StreamReaderDelegate", True, "getParent", "()", "", "Argument[this].SyntheticField[javax.xml.stream.util.StreamReaderDelegate.reader]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.xml.stream.util", "StreamReaderDelegate", True, "setParent", "(XMLStreamReader)", "", "Argument[0]", "Argument[this].SyntheticField[javax.xml.stream.util.StreamReaderDelegate.reader]", "value", "dfc-generated"]
+      - ["javax.xml.stream.util", "XMLEventAllocator", True, "allocate", "(XMLStreamReader)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.stream.util", "XMLEventConsumer", True, "add", "(XMLEvent)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+  - addsTo:
+      pack: codeql/java-all
+      extensible: neutralModel
+    data:
+      - ["javax.xml.stream.util", "EventReaderDelegate", "close", "()", "summary", "df-generated"]
+      - ["javax.xml.stream.util", "EventReaderDelegate", "getProperty", "(String)", "summary", "df-generated"]
+      - ["javax.xml.stream.util", "StreamReaderDelegate", "close", "()", "summary", "df-generated"]
+      - ["javax.xml.stream.util", "StreamReaderDelegate", "getAttributeCount", "()", "summary", "df-generated"]
+      - ["javax.xml.stream.util", "StreamReaderDelegate", "getAttributeLocalName", "(int)", "summary", "df-generated"]
+      - ["javax.xml.stream.util", "StreamReaderDelegate", "getAttributeName", "(int)", "summary", "df-generated"]
+      - ["javax.xml.stream.util", "StreamReaderDelegate", "getAttributeNamespace", "(int)", "summary", "df-generated"]
+      - ["javax.xml.stream.util", "StreamReaderDelegate", "getAttributePrefix", "(int)", "summary", "df-generated"]
+      - ["javax.xml.stream.util", "StreamReaderDelegate", "getAttributeType", "(int)", "summary", "df-generated"]
+      - ["javax.xml.stream.util", "StreamReaderDelegate", "getAttributeValue", "(String,String)", "summary", "df-generated"]
+      - ["javax.xml.stream.util", "StreamReaderDelegate", "getAttributeValue", "(int)", "summary", "df-generated"]
+      - ["javax.xml.stream.util", "StreamReaderDelegate", "getEncoding", "()", "summary", "df-generated"]
+      - ["javax.xml.stream.util", "StreamReaderDelegate", "getEventType", "()", "summary", "df-generated"]
+      - ["javax.xml.stream.util", "StreamReaderDelegate", "getLocation", "()", "summary", "df-generated"]
+      - ["javax.xml.stream.util", "StreamReaderDelegate", "getName", "()", "summary", "df-generated"]
+      - ["javax.xml.stream.util", "StreamReaderDelegate", "getNamespaceCount", "()", "summary", "df-generated"]
+      - ["javax.xml.stream.util", "StreamReaderDelegate", "getNamespacePrefix", "(int)", "summary", "df-generated"]
+      - ["javax.xml.stream.util", "StreamReaderDelegate", "getNamespaceURI", "()", "summary", "df-generated"]
+      - ["javax.xml.stream.util", "StreamReaderDelegate", "getNamespaceURI", "(String)", "summary", "df-generated"]
+      - ["javax.xml.stream.util", "StreamReaderDelegate", "getNamespaceURI", "(int)", "summary", "df-generated"]
+      - ["javax.xml.stream.util", "StreamReaderDelegate", "getPIData", "()", "summary", "df-generated"]
+      - ["javax.xml.stream.util", "StreamReaderDelegate", "getPrefix", "()", "summary", "df-generated"]
+      - ["javax.xml.stream.util", "StreamReaderDelegate", "getTextCharacters", "()", "summary", "df-generated"]
+      - ["javax.xml.stream.util", "StreamReaderDelegate", "getTextCharacters", "(int,char[],int,int)", "summary", "df-generated"]
+      - ["javax.xml.stream.util", "StreamReaderDelegate", "getTextLength", "()", "summary", "df-generated"]
+      - ["javax.xml.stream.util", "StreamReaderDelegate", "getTextStart", "()", "summary", "df-generated"]
+      - ["javax.xml.stream.util", "StreamReaderDelegate", "getVersion", "()", "summary", "df-generated"]
+      - ["javax.xml.stream.util", "StreamReaderDelegate", "hasName", "()", "summary", "df-generated"]
+      - ["javax.xml.stream.util", "StreamReaderDelegate", "hasNext", "()", "summary", "df-generated"]
+      - ["javax.xml.stream.util", "StreamReaderDelegate", "hasText", "()", "summary", "df-generated"]
+      - ["javax.xml.stream.util", "StreamReaderDelegate", "isAttributeSpecified", "(int)", "summary", "df-generated"]
+      - ["javax.xml.stream.util", "StreamReaderDelegate", "isCharacters", "()", "summary", "df-generated"]
+      - ["javax.xml.stream.util", "StreamReaderDelegate", "isEndElement", "()", "summary", "df-generated"]
+      - ["javax.xml.stream.util", "StreamReaderDelegate", "isStandalone", "()", "summary", "df-generated"]
+      - ["javax.xml.stream.util", "StreamReaderDelegate", "isStartElement", "()", "summary", "df-generated"]
+      - ["javax.xml.stream.util", "StreamReaderDelegate", "isWhiteSpace", "()", "summary", "df-generated"]
+      - ["javax.xml.stream.util", "StreamReaderDelegate", "next", "()", "summary", "df-generated"]
+      - ["javax.xml.stream.util", "StreamReaderDelegate", "nextTag", "()", "summary", "df-generated"]
+      - ["javax.xml.stream.util", "StreamReaderDelegate", "require", "(int,String,String)", "summary", "df-generated"]
+      - ["javax.xml.stream.util", "StreamReaderDelegate", "standaloneSet", "()", "summary", "df-generated"]
diff --git a/java/ql/lib/ext/generated/javax.xml.transform.dom.model.yml b/java/ql/lib/ext/generated/javax.xml.transform.dom.model.yml
index de450418d67..865c6e14208 100644
--- a/java/ql/lib/ext/generated/javax.xml.transform.dom.model.yml
+++ b/java/ql/lib/ext/generated/javax.xml.transform.dom.model.yml
@@ -4,20 +4,29 @@ extensions:
       pack: codeql/java-all
       extensible: summaryModel
     data:
-      - ["javax.xml.transform.dom", "DOMResult", True, "DOMResult", "(Node)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.xml.transform.dom", "DOMResult", True, "DOMResult", "(Node,Node)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.xml.transform.dom", "DOMResult", True, "DOMResult", "(Node,Node)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.xml.transform.dom", "DOMResult", True, "DOMResult", "(Node,Node,String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.xml.transform.dom", "DOMResult", True, "DOMResult", "(Node,Node,String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.xml.transform.dom", "DOMResult", True, "DOMResult", "(Node,Node,String)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.xml.transform.dom", "DOMResult", True, "DOMResult", "(Node,String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.xml.transform.dom", "DOMResult", True, "DOMResult", "(Node,String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.xml.transform.dom", "DOMResult", True, "getNextSibling", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.xml.transform.dom", "DOMResult", True, "getNode", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.xml.transform.dom", "DOMResult", True, "setNextSibling", "(Node)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.xml.transform.dom", "DOMResult", True, "setNode", "(Node)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.xml.transform.dom", "DOMSource", True, "DOMSource", "(Node)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.xml.transform.dom", "DOMSource", True, "DOMSource", "(Node,String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.xml.transform.dom", "DOMSource", True, "DOMSource", "(Node,String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.xml.transform.dom", "DOMSource", True, "getNode", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.xml.transform.dom", "DOMSource", True, "setNode", "(Node)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.transform.dom", "DOMResult", True, "DOMResult", "(Node)", "", "Argument[0]", "Argument[this].SyntheticField[javax.xml.transform.dom.DOMResult.node]", "value", "dfc-generated"]
+      - ["javax.xml.transform.dom", "DOMResult", True, "DOMResult", "(Node,Node)", "", "Argument[0]", "Argument[this].SyntheticField[javax.xml.transform.dom.DOMResult.node]", "value", "dfc-generated"]
+      - ["javax.xml.transform.dom", "DOMResult", True, "DOMResult", "(Node,Node)", "", "Argument[1]", "Argument[this].SyntheticField[javax.xml.transform.dom.DOMResult.nextSibling]", "value", "dfc-generated"]
+      - ["javax.xml.transform.dom", "DOMResult", True, "DOMResult", "(Node,Node,String)", "", "Argument[0]", "Argument[this].SyntheticField[javax.xml.transform.dom.DOMResult.node]", "value", "dfc-generated"]
+      - ["javax.xml.transform.dom", "DOMResult", True, "DOMResult", "(Node,Node,String)", "", "Argument[1]", "Argument[this].SyntheticField[javax.xml.transform.dom.DOMResult.nextSibling]", "value", "dfc-generated"]
+      - ["javax.xml.transform.dom", "DOMResult", True, "DOMResult", "(Node,Node,String)", "", "Argument[2]", "Argument[this].SyntheticField[javax.xml.transform.dom.DOMResult.systemId]", "value", "dfc-generated"]
+      - ["javax.xml.transform.dom", "DOMResult", True, "DOMResult", "(Node,String)", "", "Argument[0]", "Argument[this].SyntheticField[javax.xml.transform.dom.DOMResult.node]", "value", "dfc-generated"]
+      - ["javax.xml.transform.dom", "DOMResult", True, "DOMResult", "(Node,String)", "", "Argument[1]", "Argument[this].SyntheticField[javax.xml.transform.dom.DOMResult.systemId]", "value", "dfc-generated"]
+      - ["javax.xml.transform.dom", "DOMResult", True, "getNextSibling", "()", "", "Argument[this].SyntheticField[javax.xml.transform.dom.DOMResult.nextSibling]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.xml.transform.dom", "DOMResult", True, "getNode", "()", "", "Argument[this].SyntheticField[javax.xml.transform.dom.DOMResult.node]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.xml.transform.dom", "DOMResult", True, "getSystemId", "()", "", "Argument[this].SyntheticField[javax.xml.transform.dom.DOMResult.systemId]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.xml.transform.dom", "DOMResult", True, "setNextSibling", "(Node)", "", "Argument[0]", "Argument[this].SyntheticField[javax.xml.transform.dom.DOMResult.nextSibling]", "value", "dfc-generated"]
+      - ["javax.xml.transform.dom", "DOMResult", True, "setNode", "(Node)", "", "Argument[0]", "Argument[this].SyntheticField[javax.xml.transform.dom.DOMResult.node]", "value", "dfc-generated"]
+      - ["javax.xml.transform.dom", "DOMResult", True, "setSystemId", "(String)", "", "Argument[0]", "Argument[this].SyntheticField[javax.xml.transform.dom.DOMResult.systemId]", "value", "dfc-generated"]
+      - ["javax.xml.transform.dom", "DOMSource", True, "DOMSource", "(Node)", "", "Argument[0]", "Argument[this].SyntheticField[javax.xml.transform.dom.DOMSource.node]", "value", "dfc-generated"]
+      - ["javax.xml.transform.dom", "DOMSource", True, "DOMSource", "(Node,String)", "", "Argument[0]", "Argument[this].SyntheticField[javax.xml.transform.dom.DOMSource.node]", "value", "dfc-generated"]
+      - ["javax.xml.transform.dom", "DOMSource", True, "DOMSource", "(Node,String)", "", "Argument[1]", "Argument[this].SyntheticField[javax.xml.transform.dom.DOMSource.systemID]", "value", "dfc-generated"]
+      - ["javax.xml.transform.dom", "DOMSource", True, "getNode", "()", "", "Argument[this].SyntheticField[javax.xml.transform.dom.DOMSource.node]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.xml.transform.dom", "DOMSource", True, "getSystemId", "()", "", "Argument[this].SyntheticField[javax.xml.transform.dom.DOMSource.systemID]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.xml.transform.dom", "DOMSource", True, "setNode", "(Node)", "", "Argument[0]", "Argument[this].SyntheticField[javax.xml.transform.dom.DOMSource.node]", "value", "dfc-generated"]
+      - ["javax.xml.transform.dom", "DOMSource", True, "setSystemId", "(String)", "", "Argument[0]", "Argument[this].SyntheticField[javax.xml.transform.dom.DOMSource.systemID]", "value", "dfc-generated"]
+  - addsTo:
+      pack: codeql/java-all
+      extensible: neutralModel
+    data:
+      - ["javax.xml.transform.dom", "DOMSource", "isEmpty", "()", "summary", "df-generated"]
diff --git a/java/ql/lib/ext/generated/javax.xml.transform.model.yml b/java/ql/lib/ext/generated/javax.xml.transform.model.yml
index 589ccbc1d36..1d052e97308 100644
--- a/java/ql/lib/ext/generated/javax.xml.transform.model.yml
+++ b/java/ql/lib/ext/generated/javax.xml.transform.model.yml
@@ -4,10 +4,24 @@ extensions:
       pack: codeql/java-all
       extensible: summaryModel
     data:
-      - ["javax.xml.transform", "Result", True, "getSystemId", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.xml.transform", "Result", True, "setSystemId", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["javax.xml.transform", "Source", True, "getSystemId", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["javax.xml.transform", "Source", True, "setSystemId", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.transform", "SourceLocator", True, "getPublicId", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.transform", "SourceLocator", True, "getSystemId", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.transform", "Templates", True, "newTransformer", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.transform", "Transformer", True, "getErrorListener", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.transform", "Transformer", True, "getOutputProperties", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.transform", "Transformer", True, "getOutputProperty", "(String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.transform", "Transformer", True, "getParameter", "(String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.transform", "Transformer", True, "getURIResolver", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.transform", "Transformer", True, "setErrorListener", "(ErrorListener)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.transform", "Transformer", True, "setOutputProperties", "(Properties)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.transform", "Transformer", True, "setOutputProperty", "(String,String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.transform", "Transformer", True, "setParameter", "(String,Object)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.transform", "Transformer", True, "setParameter", "(String,Object)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.transform", "Transformer", True, "setURIResolver", "(URIResolver)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.transform", "Transformer", True, "transform", "(Source,Result)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.transform", "Transformer", True, "transform", "(Source,Result)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
       - ["javax.xml.transform", "TransformerConfigurationException", True, "TransformerConfigurationException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["javax.xml.transform", "TransformerConfigurationException", True, "TransformerConfigurationException", "(String,SourceLocator)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["javax.xml.transform", "TransformerConfigurationException", True, "TransformerConfigurationException", "(String,SourceLocator)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
@@ -18,24 +32,29 @@ extensions:
       - ["javax.xml.transform", "TransformerConfigurationException", True, "TransformerConfigurationException", "(String,Throwable)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
       - ["javax.xml.transform", "TransformerConfigurationException", True, "TransformerConfigurationException", "(Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["javax.xml.transform", "TransformerException", True, "TransformerException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.xml.transform", "TransformerException", True, "TransformerException", "(String,SourceLocator)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.xml.transform", "TransformerException", True, "TransformerException", "(String,SourceLocator)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.xml.transform", "TransformerException", True, "TransformerException", "(String,SourceLocator,Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.xml.transform", "TransformerException", True, "TransformerException", "(String,SourceLocator,Throwable)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.xml.transform", "TransformerException", True, "TransformerException", "(String,SourceLocator,Throwable)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.transform", "TransformerException", True, "TransformerException", "(String,SourceLocator)", "", "Argument[1]", "Argument[this].SyntheticField[javax.xml.transform.TransformerException.locator]", "value", "dfc-generated"]
+      - ["javax.xml.transform", "TransformerException", True, "TransformerException", "(String,SourceLocator,Throwable)", "", "Argument[1]", "Argument[this].SyntheticField[javax.xml.transform.TransformerException.locator]", "value", "dfc-generated"]
       - ["javax.xml.transform", "TransformerException", True, "TransformerException", "(String,Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["javax.xml.transform", "TransformerException", True, "TransformerException", "(String,Throwable)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
       - ["javax.xml.transform", "TransformerException", True, "TransformerException", "(Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["javax.xml.transform", "TransformerException", True, "getException", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["javax.xml.transform", "TransformerException", True, "getLocationAsString", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.xml.transform", "TransformerException", True, "getLocator", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.xml.transform", "TransformerException", True, "getMessageAndLocation", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.xml.transform", "TransformerException", True, "setLocator", "(SourceLocator)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.xml.transform", "TransformerFactoryConfigurationError", True, "TransformerFactoryConfigurationError", "(Exception)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.xml.transform", "TransformerFactoryConfigurationError", True, "TransformerFactoryConfigurationError", "(Exception,String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.xml.transform", "TransformerFactoryConfigurationError", True, "TransformerFactoryConfigurationError", "(Exception,String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.transform", "TransformerException", True, "getLocator", "()", "", "Argument[this].SyntheticField[javax.xml.transform.TransformerException.locator]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.xml.transform", "TransformerException", True, "setLocator", "(SourceLocator)", "", "Argument[0]", "Argument[this].SyntheticField[javax.xml.transform.TransformerException.locator]", "value", "dfc-generated"]
+      - ["javax.xml.transform", "TransformerFactory", True, "getAttribute", "(String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.transform", "TransformerFactory", True, "getErrorListener", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.transform", "TransformerFactory", True, "getURIResolver", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.transform", "TransformerFactory", True, "newTemplates", "(Source)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.transform", "TransformerFactory", True, "newTemplates", "(Source)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.transform", "TransformerFactory", True, "newTransformer", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.transform", "TransformerFactory", True, "newTransformer", "(Source)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.transform", "TransformerFactory", True, "setAttribute", "(String,Object)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.transform", "TransformerFactory", True, "setErrorListener", "(ErrorListener)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.transform", "TransformerFactory", True, "setURIResolver", "(URIResolver)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.transform", "TransformerFactoryConfigurationError", True, "TransformerFactoryConfigurationError", "(Exception)", "", "Argument[0]", "Argument[this].SyntheticField[javax.xml.transform.TransformerFactoryConfigurationError.exception]", "value", "dfc-generated"]
+      - ["javax.xml.transform", "TransformerFactoryConfigurationError", True, "TransformerFactoryConfigurationError", "(Exception,String)", "", "Argument[0]", "Argument[this].SyntheticField[javax.xml.transform.TransformerFactoryConfigurationError.exception]", "value", "dfc-generated"]
       - ["javax.xml.transform", "TransformerFactoryConfigurationError", True, "TransformerFactoryConfigurationError", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.xml.transform", "TransformerFactoryConfigurationError", True, "getException", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.transform", "TransformerFactoryConfigurationError", True, "getException", "()", "", "Argument[this].SyntheticField[javax.xml.transform.TransformerFactoryConfigurationError.exception]", "ReturnValue", "value", "dfc-generated"]
       - ["javax.xml.transform", "URIResolver", True, "resolve", "(String,String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["javax.xml.transform", "URIResolver", True, "resolve", "(String,String)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
       - ["javax.xml.transform", "URIResolver", True, "resolve", "(String,String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
@@ -45,30 +64,11 @@ extensions:
     data:
       - ["javax.xml.transform", "Source", "isEmpty", "()", "summary", "df-generated"]
       - ["javax.xml.transform", "Transformer", "clearParameters", "()", "summary", "df-generated"]
-      - ["javax.xml.transform", "Transformer", "getErrorListener", "()", "summary", "df-generated"]
-      - ["javax.xml.transform", "Transformer", "getOutputProperties", "()", "summary", "df-generated"]
-      - ["javax.xml.transform", "Transformer", "getOutputProperty", "(String)", "summary", "df-generated"]
-      - ["javax.xml.transform", "Transformer", "getParameter", "(String)", "summary", "df-generated"]
-      - ["javax.xml.transform", "Transformer", "getURIResolver", "()", "summary", "df-generated"]
       - ["javax.xml.transform", "Transformer", "reset", "()", "summary", "df-generated"]
-      - ["javax.xml.transform", "Transformer", "setErrorListener", "(ErrorListener)", "summary", "df-generated"]
-      - ["javax.xml.transform", "Transformer", "setOutputProperties", "(Properties)", "summary", "df-generated"]
-      - ["javax.xml.transform", "Transformer", "setOutputProperty", "(String,String)", "summary", "df-generated"]
-      - ["javax.xml.transform", "Transformer", "setParameter", "(String,Object)", "summary", "df-generated"]
-      - ["javax.xml.transform", "Transformer", "setURIResolver", "(URIResolver)", "summary", "df-generated"]
-      - ["javax.xml.transform", "Transformer", "transform", "(Source,Result)", "summary", "df-generated"]
+      - ["javax.xml.transform", "TransformerException", "getMessageAndLocation", "()", "summary", "df-generated"]
       - ["javax.xml.transform", "TransformerFactory", "getAssociatedStylesheet", "(Source,String,String,String)", "summary", "df-generated"]
-      - ["javax.xml.transform", "TransformerFactory", "getAttribute", "(String)", "summary", "df-generated"]
-      - ["javax.xml.transform", "TransformerFactory", "getErrorListener", "()", "summary", "df-generated"]
       - ["javax.xml.transform", "TransformerFactory", "getFeature", "(String)", "summary", "df-generated"]
-      - ["javax.xml.transform", "TransformerFactory", "getURIResolver", "()", "summary", "df-generated"]
       - ["javax.xml.transform", "TransformerFactory", "newDefaultInstance", "()", "summary", "df-generated"]
       - ["javax.xml.transform", "TransformerFactory", "newInstance", "()", "summary", "df-generated"]
       - ["javax.xml.transform", "TransformerFactory", "newInstance", "(String,ClassLoader)", "summary", "df-generated"]
-      - ["javax.xml.transform", "TransformerFactory", "newTemplates", "(Source)", "summary", "df-generated"]
-      - ["javax.xml.transform", "TransformerFactory", "newTransformer", "()", "summary", "df-generated"]
-      - ["javax.xml.transform", "TransformerFactory", "newTransformer", "(Source)", "summary", "df-generated"]
-      - ["javax.xml.transform", "TransformerFactory", "setAttribute", "(String,Object)", "summary", "df-generated"]
-      - ["javax.xml.transform", "TransformerFactory", "setErrorListener", "(ErrorListener)", "summary", "df-generated"]
       - ["javax.xml.transform", "TransformerFactory", "setFeature", "(String,boolean)", "summary", "df-generated"]
-      - ["javax.xml.transform", "TransformerFactory", "setURIResolver", "(URIResolver)", "summary", "df-generated"]
diff --git a/java/ql/lib/ext/generated/javax.xml.transform.sax.model.yml b/java/ql/lib/ext/generated/javax.xml.transform.sax.model.yml
index cd02ad21d93..c1846d44862 100644
--- a/java/ql/lib/ext/generated/javax.xml.transform.sax.model.yml
+++ b/java/ql/lib/ext/generated/javax.xml.transform.sax.model.yml
@@ -4,21 +4,34 @@ extensions:
       pack: codeql/java-all
       extensible: summaryModel
     data:
-      - ["javax.xml.transform.sax", "SAXResult", True, "SAXResult", "(ContentHandler)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.xml.transform.sax", "SAXResult", True, "getHandler", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.xml.transform.sax", "SAXResult", True, "getLexicalHandler", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.xml.transform.sax", "SAXResult", True, "setHandler", "(ContentHandler)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.xml.transform.sax", "SAXResult", True, "setLexicalHandler", "(LexicalHandler)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.xml.transform.sax", "SAXSource", True, "getXMLReader", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.transform.sax", "SAXResult", True, "SAXResult", "(ContentHandler)", "", "Argument[0]", "Argument[this].SyntheticField[javax.xml.transform.sax.SAXResult.handler]", "value", "dfc-generated"]
+      - ["javax.xml.transform.sax", "SAXResult", True, "getHandler", "()", "", "Argument[this].SyntheticField[javax.xml.transform.sax.SAXResult.handler]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.xml.transform.sax", "SAXResult", True, "getLexicalHandler", "()", "", "Argument[this].SyntheticField[javax.xml.transform.sax.SAXResult.lexhandler]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.xml.transform.sax", "SAXResult", True, "getSystemId", "()", "", "Argument[this].SyntheticField[javax.xml.transform.sax.SAXResult.systemId]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.xml.transform.sax", "SAXResult", True, "setHandler", "(ContentHandler)", "", "Argument[0]", "Argument[this].SyntheticField[javax.xml.transform.sax.SAXResult.handler]", "value", "dfc-generated"]
+      - ["javax.xml.transform.sax", "SAXResult", True, "setLexicalHandler", "(LexicalHandler)", "", "Argument[0]", "Argument[this].SyntheticField[javax.xml.transform.sax.SAXResult.lexhandler]", "value", "dfc-generated"]
+      - ["javax.xml.transform.sax", "SAXResult", True, "setSystemId", "(String)", "", "Argument[0]", "Argument[this].SyntheticField[javax.xml.transform.sax.SAXResult.systemId]", "value", "dfc-generated"]
+      - ["javax.xml.transform.sax", "SAXSource", True, "getSystemId", "()", "", "Argument[this].SyntheticField[javax.xml.transform.sax.SAXSource.inputSource].SyntheticField[org.xml.sax.InputSource.systemId]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.xml.transform.sax", "SAXSource", True, "getXMLReader", "()", "", "Argument[this].SyntheticField[javax.xml.transform.sax.SAXSource.reader]", "ReturnValue", "value", "dfc-generated"]
       - ["javax.xml.transform.sax", "SAXSource", True, "setInputSource", "(InputSource)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.xml.transform.sax", "SAXSource", True, "setXMLReader", "(XMLReader)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.transform.sax", "SAXSource", True, "setSystemId", "(String)", "", "Argument[0]", "Argument[this].SyntheticField[javax.xml.transform.sax.SAXSource.inputSource].SyntheticField[org.xml.sax.InputSource.systemId]", "value", "dfc-generated"]
+      - ["javax.xml.transform.sax", "SAXSource", True, "setXMLReader", "(XMLReader)", "", "Argument[0]", "Argument[this].SyntheticField[javax.xml.transform.sax.SAXSource.reader]", "value", "dfc-generated"]
+      - ["javax.xml.transform.sax", "SAXTransformerFactory", True, "newTemplatesHandler", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.transform.sax", "SAXTransformerFactory", True, "newTransformerHandler", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.transform.sax", "SAXTransformerFactory", True, "newTransformerHandler", "(Source)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.transform.sax", "SAXTransformerFactory", True, "newTransformerHandler", "(Templates)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.transform.sax", "SAXTransformerFactory", True, "newXMLFilter", "(Source)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.transform.sax", "SAXTransformerFactory", True, "newXMLFilter", "(Source)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.transform.sax", "SAXTransformerFactory", True, "newXMLFilter", "(Templates)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.transform.sax", "TemplatesHandler", True, "getSystemId", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.transform.sax", "TemplatesHandler", True, "getTemplates", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.transform.sax", "TemplatesHandler", True, "setSystemId", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.transform.sax", "TransformerHandler", True, "getSystemId", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.transform.sax", "TransformerHandler", True, "getTransformer", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.transform.sax", "TransformerHandler", True, "setResult", "(Result)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.transform.sax", "TransformerHandler", True, "setSystemId", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
   - addsTo:
       pack: codeql/java-all
       extensible: neutralModel
     data:
-      - ["javax.xml.transform.sax", "SAXTransformerFactory", "newTemplatesHandler", "()", "summary", "df-generated"]
-      - ["javax.xml.transform.sax", "SAXTransformerFactory", "newTransformerHandler", "()", "summary", "df-generated"]
-      - ["javax.xml.transform.sax", "SAXTransformerFactory", "newTransformerHandler", "(Source)", "summary", "df-generated"]
-      - ["javax.xml.transform.sax", "SAXTransformerFactory", "newTransformerHandler", "(Templates)", "summary", "df-generated"]
-      - ["javax.xml.transform.sax", "SAXTransformerFactory", "newXMLFilter", "(Source)", "summary", "df-generated"]
-      - ["javax.xml.transform.sax", "SAXTransformerFactory", "newXMLFilter", "(Templates)", "summary", "df-generated"]
+      - ["javax.xml.transform.sax", "SAXSource", "isEmpty", "()", "summary", "df-generated"]
diff --git a/java/ql/lib/ext/generated/javax.xml.transform.stax.model.yml b/java/ql/lib/ext/generated/javax.xml.transform.stax.model.yml
index 25ca3d5c8cf..f7af349906d 100644
--- a/java/ql/lib/ext/generated/javax.xml.transform.stax.model.yml
+++ b/java/ql/lib/ext/generated/javax.xml.transform.stax.model.yml
@@ -4,11 +4,18 @@ extensions:
       pack: codeql/java-all
       extensible: summaryModel
     data:
-      - ["javax.xml.transform.stax", "StAXResult", True, "StAXResult", "(XMLEventWriter)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.xml.transform.stax", "StAXResult", True, "StAXResult", "(XMLStreamWriter)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.xml.transform.stax", "StAXResult", True, "getXMLEventWriter", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.xml.transform.stax", "StAXResult", True, "getXMLStreamWriter", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.xml.transform.stax", "StAXSource", True, "StAXSource", "(XMLEventReader)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["javax.xml.transform.stax", "StAXSource", True, "StAXSource", "(XMLStreamReader)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.xml.transform.stax", "StAXSource", True, "getXMLEventReader", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.xml.transform.stax", "StAXSource", True, "getXMLStreamReader", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.transform.stax", "StAXResult", True, "StAXResult", "(XMLEventWriter)", "", "Argument[0]", "Argument[this].SyntheticField[javax.xml.transform.stax.StAXResult.xmlEventWriter]", "value", "dfc-generated"]
+      - ["javax.xml.transform.stax", "StAXResult", True, "StAXResult", "(XMLStreamWriter)", "", "Argument[0]", "Argument[this].SyntheticField[javax.xml.transform.stax.StAXResult.xmlStreamWriter]", "value", "dfc-generated"]
+      - ["javax.xml.transform.stax", "StAXResult", True, "getXMLEventWriter", "()", "", "Argument[this].SyntheticField[javax.xml.transform.stax.StAXResult.xmlEventWriter]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.xml.transform.stax", "StAXResult", True, "getXMLStreamWriter", "()", "", "Argument[this].SyntheticField[javax.xml.transform.stax.StAXResult.xmlStreamWriter]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.xml.transform.stax", "StAXSource", True, "StAXSource", "(XMLEventReader)", "", "Argument[0]", "Argument[this].SyntheticField[javax.xml.transform.stax.StAXSource.xmlEventReader]", "value", "dfc-generated"]
+      - ["javax.xml.transform.stax", "StAXSource", True, "StAXSource", "(XMLStreamReader)", "", "Argument[0]", "Argument[this].SyntheticField[javax.xml.transform.stax.StAXSource.xmlStreamReader]", "value", "dfc-generated"]
+      - ["javax.xml.transform.stax", "StAXSource", True, "getXMLEventReader", "()", "", "Argument[this].SyntheticField[javax.xml.transform.stax.StAXSource.xmlEventReader]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.xml.transform.stax", "StAXSource", True, "getXMLStreamReader", "()", "", "Argument[this].SyntheticField[javax.xml.transform.stax.StAXSource.xmlStreamReader]", "ReturnValue", "value", "dfc-generated"]
+  - addsTo:
+      pack: codeql/java-all
+      extensible: neutralModel
+    data:
+      - ["javax.xml.transform.stax", "StAXResult", "getSystemId", "()", "summary", "df-generated"]
+      - ["javax.xml.transform.stax", "StAXResult", "setSystemId", "(String)", "summary", "df-generated"]
+      - ["javax.xml.transform.stax", "StAXSource", "isEmpty", "()", "summary", "df-generated"]
diff --git a/java/ql/lib/ext/generated/javax.xml.transform.stream.model.yml b/java/ql/lib/ext/generated/javax.xml.transform.stream.model.yml
index c7d28706810..b39abfec5e5 100644
--- a/java/ql/lib/ext/generated/javax.xml.transform.stream.model.yml
+++ b/java/ql/lib/ext/generated/javax.xml.transform.stream.model.yml
@@ -4,18 +4,27 @@ extensions:
       pack: codeql/java-all
       extensible: summaryModel
     data:
-      - ["javax.xml.transform.stream", "StreamResult", True, "StreamResult", "(File)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.xml.transform.stream", "StreamResult", True, "StreamResult", "(OutputStream)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.xml.transform.stream", "StreamResult", True, "StreamResult", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.xml.transform.stream", "StreamResult", True, "StreamResult", "(Writer)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.xml.transform.stream", "StreamResult", True, "getOutputStream", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.xml.transform.stream", "StreamResult", True, "getWriter", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.xml.transform.stream", "StreamResult", True, "setOutputStream", "(OutputStream)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.xml.transform.stream", "StreamResult", True, "setSystemId", "(File)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.xml.transform.stream", "StreamResult", True, "setWriter", "(Writer)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.xml.transform.stream", "StreamSource", True, "getPublicId", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.xml.transform.stream", "StreamSource", True, "getReader", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.transform.stream", "StreamResult", True, "StreamResult", "(File)", "", "Argument[0]", "Argument[this].SyntheticField[javax.xml.transform.stream.StreamResult.systemId]", "taint", "dfc-generated"]
+      - ["javax.xml.transform.stream", "StreamResult", True, "StreamResult", "(OutputStream)", "", "Argument[0]", "Argument[this].SyntheticField[javax.xml.transform.stream.StreamResult.outputStream]", "value", "dfc-generated"]
+      - ["javax.xml.transform.stream", "StreamResult", True, "StreamResult", "(String)", "", "Argument[0]", "Argument[this].SyntheticField[javax.xml.transform.stream.StreamResult.systemId]", "value", "dfc-generated"]
+      - ["javax.xml.transform.stream", "StreamResult", True, "StreamResult", "(Writer)", "", "Argument[0]", "Argument[this].SyntheticField[javax.xml.transform.stream.StreamResult.writer]", "value", "dfc-generated"]
+      - ["javax.xml.transform.stream", "StreamResult", True, "getOutputStream", "()", "", "Argument[this].SyntheticField[javax.xml.transform.stream.StreamResult.outputStream]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.xml.transform.stream", "StreamResult", True, "getSystemId", "()", "", "Argument[this].SyntheticField[javax.xml.transform.stream.StreamResult.systemId]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.xml.transform.stream", "StreamResult", True, "getWriter", "()", "", "Argument[this].SyntheticField[javax.xml.transform.stream.StreamResult.writer]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.xml.transform.stream", "StreamResult", True, "setOutputStream", "(OutputStream)", "", "Argument[0]", "Argument[this].SyntheticField[javax.xml.transform.stream.StreamResult.outputStream]", "value", "dfc-generated"]
+      - ["javax.xml.transform.stream", "StreamResult", True, "setSystemId", "(File)", "", "Argument[0]", "Argument[this].SyntheticField[javax.xml.transform.stream.StreamResult.systemId]", "taint", "dfc-generated"]
+      - ["javax.xml.transform.stream", "StreamResult", True, "setSystemId", "(String)", "", "Argument[0]", "Argument[this].SyntheticField[javax.xml.transform.stream.StreamResult.systemId]", "value", "dfc-generated"]
+      - ["javax.xml.transform.stream", "StreamResult", True, "setWriter", "(Writer)", "", "Argument[0]", "Argument[this].SyntheticField[javax.xml.transform.stream.StreamResult.writer]", "value", "dfc-generated"]
+      - ["javax.xml.transform.stream", "StreamSource", True, "getPublicId", "()", "", "Argument[this].SyntheticField[javax.xml.transform.stream.StreamSource.publicId]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.xml.transform.stream", "StreamSource", True, "getReader", "()", "", "Argument[this].SyntheticField[javax.xml.transform.stream.StreamSource.reader]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.xml.transform.stream", "StreamSource", True, "getSystemId", "()", "", "Argument[this].SyntheticField[javax.xml.transform.stream.StreamSource.systemId]", "ReturnValue", "value", "dfc-generated"]
       - ["javax.xml.transform.stream", "StreamSource", True, "setInputStream", "(InputStream)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.xml.transform.stream", "StreamSource", True, "setPublicId", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.xml.transform.stream", "StreamSource", True, "setReader", "(Reader)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.xml.transform.stream", "StreamSource", True, "setSystemId", "(File)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.transform.stream", "StreamSource", True, "setPublicId", "(String)", "", "Argument[0]", "Argument[this].SyntheticField[javax.xml.transform.stream.StreamSource.publicId]", "value", "dfc-generated"]
+      - ["javax.xml.transform.stream", "StreamSource", True, "setReader", "(Reader)", "", "Argument[0]", "Argument[this].SyntheticField[javax.xml.transform.stream.StreamSource.reader]", "value", "dfc-generated"]
+      - ["javax.xml.transform.stream", "StreamSource", True, "setSystemId", "(File)", "", "Argument[0]", "Argument[this].SyntheticField[javax.xml.transform.stream.StreamSource.systemId]", "taint", "dfc-generated"]
+      - ["javax.xml.transform.stream", "StreamSource", True, "setSystemId", "(String)", "", "Argument[0]", "Argument[this].SyntheticField[javax.xml.transform.stream.StreamSource.systemId]", "value", "dfc-generated"]
+  - addsTo:
+      pack: codeql/java-all
+      extensible: neutralModel
+    data:
+      - ["javax.xml.transform.stream", "StreamSource", "isEmpty", "()", "summary", "df-generated"]
diff --git a/java/ql/lib/ext/generated/javax.xml.validation.model.yml b/java/ql/lib/ext/generated/javax.xml.validation.model.yml
index 328462437dc..5cfcd3a28ba 100644
--- a/java/ql/lib/ext/generated/javax.xml.validation.model.yml
+++ b/java/ql/lib/ext/generated/javax.xml.validation.model.yml
@@ -4,21 +4,40 @@ extensions:
       pack: codeql/java-all
       extensible: summaryModel
     data:
+      - ["javax.xml.validation", "Schema", True, "newValidator", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.validation", "Schema", True, "newValidatorHandler", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.validation", "SchemaFactory", True, "getErrorHandler", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.validation", "SchemaFactory", True, "getProperty", "(String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.validation", "SchemaFactory", True, "getResourceResolver", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.validation", "SchemaFactory", True, "setErrorHandler", "(ErrorHandler)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.validation", "SchemaFactory", True, "setProperty", "(String,Object)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.validation", "SchemaFactory", True, "setResourceResolver", "(LSResourceResolver)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["javax.xml.validation", "SchemaFactoryConfigurationError", False, "SchemaFactoryConfigurationError", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["javax.xml.validation", "SchemaFactoryConfigurationError", False, "SchemaFactoryConfigurationError", "(String,Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["javax.xml.validation", "SchemaFactoryConfigurationError", False, "SchemaFactoryConfigurationError", "(String,Throwable)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
       - ["javax.xml.validation", "SchemaFactoryConfigurationError", False, "SchemaFactoryConfigurationError", "(Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.validation", "Validator", True, "getErrorHandler", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.validation", "Validator", True, "getProperty", "(String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.validation", "Validator", True, "getResourceResolver", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.validation", "Validator", True, "setErrorHandler", "(ErrorHandler)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.validation", "Validator", True, "setProperty", "(String,Object)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.validation", "Validator", True, "setResourceResolver", "(LSResourceResolver)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["javax.xml.validation", "Validator", True, "validate", "(Source)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.validation", "Validator", True, "validate", "(Source,Result)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.validation", "Validator", True, "validate", "(Source,Result)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.validation", "ValidatorHandler", True, "getContentHandler", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.validation", "ValidatorHandler", True, "getErrorHandler", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.validation", "ValidatorHandler", True, "getResourceResolver", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.validation", "ValidatorHandler", True, "getTypeInfoProvider", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.validation", "ValidatorHandler", True, "setContentHandler", "(ContentHandler)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.validation", "ValidatorHandler", True, "setErrorHandler", "(ErrorHandler)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.validation", "ValidatorHandler", True, "setProperty", "(String,Object)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.validation", "ValidatorHandler", True, "setResourceResolver", "(LSResourceResolver)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
   - addsTo:
       pack: codeql/java-all
       extensible: neutralModel
     data:
-      - ["javax.xml.validation", "Schema", "newValidator", "()", "summary", "df-generated"]
-      - ["javax.xml.validation", "Schema", "newValidatorHandler", "()", "summary", "df-generated"]
-      - ["javax.xml.validation", "SchemaFactory", "getErrorHandler", "()", "summary", "df-generated"]
       - ["javax.xml.validation", "SchemaFactory", "getFeature", "(String)", "summary", "df-generated"]
-      - ["javax.xml.validation", "SchemaFactory", "getProperty", "(String)", "summary", "df-generated"]
-      - ["javax.xml.validation", "SchemaFactory", "getResourceResolver", "()", "summary", "df-generated"]
       - ["javax.xml.validation", "SchemaFactory", "isSchemaLanguageSupported", "(String)", "summary", "df-generated"]
       - ["javax.xml.validation", "SchemaFactory", "newDefaultInstance", "()", "summary", "df-generated"]
       - ["javax.xml.validation", "SchemaFactory", "newInstance", "(String)", "summary", "df-generated"]
@@ -28,33 +47,15 @@ extensions:
       - ["javax.xml.validation", "SchemaFactory", "newSchema", "(Source)", "summary", "df-generated"]
       - ["javax.xml.validation", "SchemaFactory", "newSchema", "(Source[])", "summary", "df-generated"]
       - ["javax.xml.validation", "SchemaFactory", "newSchema", "(URL)", "summary", "df-generated"]
-      - ["javax.xml.validation", "SchemaFactory", "setErrorHandler", "(ErrorHandler)", "summary", "df-generated"]
       - ["javax.xml.validation", "SchemaFactory", "setFeature", "(String,boolean)", "summary", "df-generated"]
-      - ["javax.xml.validation", "SchemaFactory", "setProperty", "(String,Object)", "summary", "df-generated"]
-      - ["javax.xml.validation", "SchemaFactory", "setResourceResolver", "(LSResourceResolver)", "summary", "df-generated"]
       - ["javax.xml.validation", "SchemaFactoryLoader", "newFactory", "(String)", "summary", "df-generated"]
       - ["javax.xml.validation", "TypeInfoProvider", "getAttributeTypeInfo", "(int)", "summary", "df-generated"]
       - ["javax.xml.validation", "TypeInfoProvider", "getElementTypeInfo", "()", "summary", "df-generated"]
       - ["javax.xml.validation", "TypeInfoProvider", "isIdAttribute", "(int)", "summary", "df-generated"]
       - ["javax.xml.validation", "TypeInfoProvider", "isSpecified", "(int)", "summary", "df-generated"]
-      - ["javax.xml.validation", "Validator", "getErrorHandler", "()", "summary", "df-generated"]
       - ["javax.xml.validation", "Validator", "getFeature", "(String)", "summary", "df-generated"]
-      - ["javax.xml.validation", "Validator", "getProperty", "(String)", "summary", "df-generated"]
-      - ["javax.xml.validation", "Validator", "getResourceResolver", "()", "summary", "df-generated"]
       - ["javax.xml.validation", "Validator", "reset", "()", "summary", "df-generated"]
-      - ["javax.xml.validation", "Validator", "setErrorHandler", "(ErrorHandler)", "summary", "df-generated"]
       - ["javax.xml.validation", "Validator", "setFeature", "(String,boolean)", "summary", "df-generated"]
-      - ["javax.xml.validation", "Validator", "setProperty", "(String,Object)", "summary", "df-generated"]
-      - ["javax.xml.validation", "Validator", "setResourceResolver", "(LSResourceResolver)", "summary", "df-generated"]
-      - ["javax.xml.validation", "Validator", "validate", "(Source,Result)", "summary", "df-generated"]
-      - ["javax.xml.validation", "ValidatorHandler", "getContentHandler", "()", "summary", "df-generated"]
-      - ["javax.xml.validation", "ValidatorHandler", "getErrorHandler", "()", "summary", "df-generated"]
       - ["javax.xml.validation", "ValidatorHandler", "getFeature", "(String)", "summary", "df-generated"]
       - ["javax.xml.validation", "ValidatorHandler", "getProperty", "(String)", "summary", "df-generated"]
-      - ["javax.xml.validation", "ValidatorHandler", "getResourceResolver", "()", "summary", "df-generated"]
-      - ["javax.xml.validation", "ValidatorHandler", "getTypeInfoProvider", "()", "summary", "df-generated"]
-      - ["javax.xml.validation", "ValidatorHandler", "setContentHandler", "(ContentHandler)", "summary", "df-generated"]
-      - ["javax.xml.validation", "ValidatorHandler", "setErrorHandler", "(ErrorHandler)", "summary", "df-generated"]
       - ["javax.xml.validation", "ValidatorHandler", "setFeature", "(String,boolean)", "summary", "df-generated"]
-      - ["javax.xml.validation", "ValidatorHandler", "setProperty", "(String,Object)", "summary", "df-generated"]
-      - ["javax.xml.validation", "ValidatorHandler", "setResourceResolver", "(LSResourceResolver)", "summary", "df-generated"]
diff --git a/java/ql/lib/ext/generated/javax.xml.xpath.model.yml b/java/ql/lib/ext/generated/javax.xml.xpath.model.yml
index 4cef7e1a19e..27de73a21a1 100644
--- a/java/ql/lib/ext/generated/javax.xml.xpath.model.yml
+++ b/java/ql/lib/ext/generated/javax.xml.xpath.model.yml
@@ -4,18 +4,32 @@ extensions:
       pack: codeql/java-all
       extensible: summaryModel
     data:
+      - ["javax.xml.xpath", "XPath", True, "compile", "(String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.xpath", "XPath", True, "compile", "(String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.xpath", "XPath", True, "getNamespaceContext", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.xpath", "XPath", True, "getXPathFunctionResolver", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.xpath", "XPath", True, "getXPathVariableResolver", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.xpath", "XPath", True, "setNamespaceContext", "(NamespaceContext)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.xpath", "XPath", True, "setXPathFunctionResolver", "(XPathFunctionResolver)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.xpath", "XPath", True, "setXPathVariableResolver", "(XPathVariableResolver)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["javax.xml.xpath", "XPathException", True, "XPathException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["javax.xml.xpath", "XPathException", True, "XPathException", "(Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.xpath", "XPathExpression", True, "evaluate", "(InputSource,QName)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.xpath", "XPathExpression", True, "evaluate", "(Object,QName)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["javax.xml.xpath", "XPathExpression", True, "evaluateExpression", "(InputSource)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["javax.xml.xpath", "XPathExpression", True, "evaluateExpression", "(InputSource,Class)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["javax.xml.xpath", "XPathExpression", True, "evaluateExpression", "(Object)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["javax.xml.xpath", "XPathExpression", True, "evaluateExpression", "(Object,Class)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["javax.xml.xpath", "XPathExpressionException", True, "XPathExpressionException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["javax.xml.xpath", "XPathExpressionException", True, "XPathExpressionException", "(Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.xpath", "XPathFactory", True, "newXPath", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.xpath", "XPathFactory", True, "setXPathFunctionResolver", "(XPathFunctionResolver)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.xpath", "XPathFactory", True, "setXPathVariableResolver", "(XPathVariableResolver)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["javax.xml.xpath", "XPathFactoryConfigurationException", True, "XPathFactoryConfigurationException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["javax.xml.xpath", "XPathFactoryConfigurationException", True, "XPathFactoryConfigurationException", "(Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["javax.xml.xpath", "XPathFunctionException", True, "XPathFunctionException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["javax.xml.xpath", "XPathFunctionException", True, "XPathFunctionException", "(Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.xpath", "XPathNodes", True, "get", "(int)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
   - addsTo:
       pack: codeql/java-all
       extensible: neutralModel
@@ -31,7 +45,4 @@ extensions:
       - ["javax.xml.xpath", "XPathFactory", "newInstance", "()", "summary", "df-generated"]
       - ["javax.xml.xpath", "XPathFactory", "newInstance", "(String)", "summary", "df-generated"]
       - ["javax.xml.xpath", "XPathFactory", "newInstance", "(String,String,ClassLoader)", "summary", "df-generated"]
-      - ["javax.xml.xpath", "XPathFactory", "newXPath", "()", "summary", "df-generated"]
       - ["javax.xml.xpath", "XPathFactory", "setFeature", "(String,boolean)", "summary", "df-generated"]
-      - ["javax.xml.xpath", "XPathFactory", "setXPathFunctionResolver", "(XPathFunctionResolver)", "summary", "df-generated"]
-      - ["javax.xml.xpath", "XPathFactory", "setXPathVariableResolver", "(XPathVariableResolver)", "summary", "df-generated"]
diff --git a/java/ql/lib/ext/generated/org.w3c.dom.ls.model.yml b/java/ql/lib/ext/generated/org.w3c.dom.ls.model.yml
deleted file mode 100644
index ffc38030b8a..00000000000
--- a/java/ql/lib/ext/generated/org.w3c.dom.ls.model.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-# THIS FILE IS AN AUTO-GENERATED MODELS AS DATA FILE. DO NOT EDIT.
-extensions:
-  - addsTo:
-      pack: codeql/java-all
-      extensible: summaryModel
-    data:
-      - ["org.w3c.dom.ls", "LSInput", True, "getSystemId", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["org.w3c.dom.ls", "LSInput", True, "setSystemId", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["org.w3c.dom.ls", "LSResourceResolver", True, "resolveResource", "(String,String,String,String,String)", "", "Argument[3]", "ReturnValue", "taint", "df-generated"]
-      - ["org.w3c.dom.ls", "LSResourceResolver", True, "resolveResource", "(String,String,String,String,String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-  - addsTo:
-      pack: codeql/java-all
-      extensible: neutralModel
-    data:
-      - ["org.w3c.dom.ls", "LSInput", "getBaseURI", "()", "summary", "df-generated"]
-      - ["org.w3c.dom.ls", "LSInput", "getByteStream", "()", "summary", "df-generated"]
-      - ["org.w3c.dom.ls", "LSInput", "getCertifiedText", "()", "summary", "df-generated"]
-      - ["org.w3c.dom.ls", "LSInput", "getCharacterStream", "()", "summary", "df-generated"]
-      - ["org.w3c.dom.ls", "LSInput", "getEncoding", "()", "summary", "df-generated"]
-      - ["org.w3c.dom.ls", "LSInput", "getPublicId", "()", "summary", "df-generated"]
-      - ["org.w3c.dom.ls", "LSInput", "getStringData", "()", "summary", "df-generated"]
-      - ["org.w3c.dom.ls", "LSInput", "setBaseURI", "(String)", "summary", "df-generated"]
-      - ["org.w3c.dom.ls", "LSInput", "setByteStream", "(InputStream)", "summary", "df-generated"]
-      - ["org.w3c.dom.ls", "LSInput", "setCertifiedText", "(boolean)", "summary", "df-generated"]
-      - ["org.w3c.dom.ls", "LSInput", "setCharacterStream", "(Reader)", "summary", "df-generated"]
-      - ["org.w3c.dom.ls", "LSInput", "setEncoding", "(String)", "summary", "df-generated"]
-      - ["org.w3c.dom.ls", "LSInput", "setPublicId", "(String)", "summary", "df-generated"]
-      - ["org.w3c.dom.ls", "LSInput", "setStringData", "(String)", "summary", "df-generated"]
diff --git a/java/ql/lib/ext/generated/org.w3c.dom.model.yml b/java/ql/lib/ext/generated/org.w3c.dom.model.yml
deleted file mode 100644
index 9c519c9ae73..00000000000
--- a/java/ql/lib/ext/generated/org.w3c.dom.model.yml
+++ /dev/null
@@ -1,102 +0,0 @@
-# THIS FILE IS AN AUTO-GENERATED MODELS AS DATA FILE. DO NOT EDIT.
-extensions:
-  - addsTo:
-      pack: codeql/java-all
-      extensible: summaryModel
-    data:
-      - ["org.w3c.dom", "Attr", True, "getName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["org.w3c.dom", "Attr", True, "getOwnerElement", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["org.w3c.dom", "Attr", True, "getValue", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["org.w3c.dom", "Attr", True, "setValue", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["org.w3c.dom", "Element", True, "getAttribute", "(String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["org.w3c.dom", "Element", True, "getAttributeNS", "(String,String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["org.w3c.dom", "Element", True, "getAttributeNode", "(String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["org.w3c.dom", "Element", True, "getAttributeNodeNS", "(String,String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["org.w3c.dom", "Element", True, "getElementsByTagName", "(String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["org.w3c.dom", "Element", True, "getElementsByTagNameNS", "(String,String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["org.w3c.dom", "Element", True, "getTagName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["org.w3c.dom", "Element", True, "removeAttributeNode", "(Attr)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["org.w3c.dom", "Element", True, "setAttributeNode", "(Attr)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["org.w3c.dom", "Element", True, "setAttributeNode", "(Attr)", "", "Argument[this]", "Argument[0]", "taint", "df-generated"]
-      - ["org.w3c.dom", "Element", True, "setAttributeNode", "(Attr)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["org.w3c.dom", "Element", True, "setAttributeNodeNS", "(Attr)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["org.w3c.dom", "Element", True, "setAttributeNodeNS", "(Attr)", "", "Argument[this]", "Argument[0]", "taint", "df-generated"]
-      - ["org.w3c.dom", "Element", True, "setAttributeNodeNS", "(Attr)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["org.w3c.dom", "NamedNodeMap", True, "getNamedItem", "(String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["org.w3c.dom", "NamedNodeMap", True, "getNamedItemNS", "(String,String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["org.w3c.dom", "NamedNodeMap", True, "item", "(int)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["org.w3c.dom", "Node", True, "appendChild", "(Node)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["org.w3c.dom", "Node", True, "appendChild", "(Node)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["org.w3c.dom", "Node", True, "appendChild", "(Node)", "", "Argument[this]", "Argument[0]", "taint", "df-generated"]
-      - ["org.w3c.dom", "Node", True, "appendChild", "(Node)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["org.w3c.dom", "Node", True, "cloneNode", "(boolean)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["org.w3c.dom", "Node", True, "getAttributes", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["org.w3c.dom", "Node", True, "getChildNodes", "()", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["org.w3c.dom", "Node", True, "getFirstChild", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["org.w3c.dom", "Node", True, "getLastChild", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["org.w3c.dom", "Node", True, "getLocalName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["org.w3c.dom", "Node", True, "getNextSibling", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["org.w3c.dom", "Node", True, "getNodeName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["org.w3c.dom", "Node", True, "getNodeValue", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["org.w3c.dom", "Node", True, "getParentNode", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["org.w3c.dom", "Node", True, "getPreviousSibling", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["org.w3c.dom", "Node", True, "insertBefore", "(Node,Node)", "", "Argument[0]", "Argument[1]", "taint", "df-generated"]
-      - ["org.w3c.dom", "Node", True, "insertBefore", "(Node,Node)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["org.w3c.dom", "Node", True, "insertBefore", "(Node,Node)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["org.w3c.dom", "Node", True, "insertBefore", "(Node,Node)", "", "Argument[1]", "Argument[0]", "taint", "df-generated"]
-      - ["org.w3c.dom", "Node", True, "insertBefore", "(Node,Node)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["org.w3c.dom", "Node", True, "insertBefore", "(Node,Node)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["org.w3c.dom", "Node", True, "insertBefore", "(Node,Node)", "", "Argument[this]", "Argument[0]", "taint", "df-generated"]
-      - ["org.w3c.dom", "Node", True, "insertBefore", "(Node,Node)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["org.w3c.dom", "Node", True, "removeChild", "(Node)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["org.w3c.dom", "Node", True, "removeChild", "(Node)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["org.w3c.dom", "Node", True, "replaceChild", "(Node,Node)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["org.w3c.dom", "Node", True, "replaceChild", "(Node,Node)", "", "Argument[1]", "Argument[0]", "taint", "df-generated"]
-      - ["org.w3c.dom", "Node", True, "replaceChild", "(Node,Node)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["org.w3c.dom", "Node", True, "replaceChild", "(Node,Node)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["org.w3c.dom", "Node", True, "replaceChild", "(Node,Node)", "", "Argument[this]", "Argument[0]", "taint", "df-generated"]
-      - ["org.w3c.dom", "Node", True, "setNodeValue", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["org.w3c.dom", "NodeList", True, "item", "(int)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-  - addsTo:
-      pack: codeql/java-all
-      extensible: neutralModel
-    data:
-      - ["org.w3c.dom", "Attr", "getSpecified", "()", "summary", "df-generated"]
-      - ["org.w3c.dom", "Attr", "isId", "()", "summary", "df-generated"]
-      - ["org.w3c.dom", "Element", "getSchemaTypeInfo", "()", "summary", "df-generated"]
-      - ["org.w3c.dom", "Element", "hasAttribute", "(String)", "summary", "df-generated"]
-      - ["org.w3c.dom", "Element", "hasAttributeNS", "(String,String)", "summary", "df-generated"]
-      - ["org.w3c.dom", "Element", "removeAttribute", "(String)", "summary", "df-generated"]
-      - ["org.w3c.dom", "Element", "removeAttributeNS", "(String,String)", "summary", "df-generated"]
-      - ["org.w3c.dom", "Element", "setAttribute", "(String,String)", "summary", "df-generated"]
-      - ["org.w3c.dom", "Element", "setAttributeNS", "(String,String,String)", "summary", "df-generated"]
-      - ["org.w3c.dom", "Element", "setIdAttribute", "(String,boolean)", "summary", "df-generated"]
-      - ["org.w3c.dom", "Element", "setIdAttributeNS", "(String,String,boolean)", "summary", "df-generated"]
-      - ["org.w3c.dom", "Element", "setIdAttributeNode", "(Attr,boolean)", "summary", "df-generated"]
-      - ["org.w3c.dom", "NamedNodeMap", "getLength", "()", "summary", "df-generated"]
-      - ["org.w3c.dom", "NamedNodeMap", "removeNamedItem", "(String)", "summary", "df-generated"]
-      - ["org.w3c.dom", "NamedNodeMap", "removeNamedItemNS", "(String,String)", "summary", "df-generated"]
-      - ["org.w3c.dom", "NamedNodeMap", "setNamedItem", "(Node)", "summary", "df-generated"]
-      - ["org.w3c.dom", "NamedNodeMap", "setNamedItemNS", "(Node)", "summary", "df-generated"]
-      - ["org.w3c.dom", "Node", "compareDocumentPosition", "(Node)", "summary", "df-generated"]
-      - ["org.w3c.dom", "Node", "getBaseURI", "()", "summary", "df-generated"]
-      - ["org.w3c.dom", "Node", "getFeature", "(String,String)", "summary", "df-generated"]
-      - ["org.w3c.dom", "Node", "getNamespaceURI", "()", "summary", "df-generated"]
-      - ["org.w3c.dom", "Node", "getNodeType", "()", "summary", "df-generated"]
-      - ["org.w3c.dom", "Node", "getOwnerDocument", "()", "summary", "df-generated"]
-      - ["org.w3c.dom", "Node", "getPrefix", "()", "summary", "df-generated"]
-      - ["org.w3c.dom", "Node", "getTextContent", "()", "summary", "df-generated"]
-      - ["org.w3c.dom", "Node", "getUserData", "(String)", "summary", "df-generated"]
-      - ["org.w3c.dom", "Node", "hasAttributes", "()", "summary", "df-generated"]
-      - ["org.w3c.dom", "Node", "hasChildNodes", "()", "summary", "df-generated"]
-      - ["org.w3c.dom", "Node", "isDefaultNamespace", "(String)", "summary", "df-generated"]
-      - ["org.w3c.dom", "Node", "isEqualNode", "(Node)", "summary", "df-generated"]
-      - ["org.w3c.dom", "Node", "isSameNode", "(Node)", "summary", "df-generated"]
-      - ["org.w3c.dom", "Node", "isSupported", "(String,String)", "summary", "df-generated"]
-      - ["org.w3c.dom", "Node", "lookupNamespaceURI", "(String)", "summary", "df-generated"]
-      - ["org.w3c.dom", "Node", "lookupPrefix", "(String)", "summary", "df-generated"]
-      - ["org.w3c.dom", "Node", "normalize", "()", "summary", "df-generated"]
-      - ["org.w3c.dom", "Node", "setPrefix", "(String)", "summary", "df-generated"]
-      - ["org.w3c.dom", "Node", "setTextContent", "(String)", "summary", "df-generated"]
-      - ["org.w3c.dom", "Node", "setUserData", "(String,Object,UserDataHandler)", "summary", "df-generated"]
-      - ["org.w3c.dom", "NodeList", "getLength", "()", "summary", "df-generated"]
diff --git a/java/ql/lib/ext/generated/org.xml.sax.model.yml b/java/ql/lib/ext/generated/org.xml.sax.model.yml
deleted file mode 100644
index b8377f80341..00000000000
--- a/java/ql/lib/ext/generated/org.xml.sax.model.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-# THIS FILE IS AN AUTO-GENERATED MODELS AS DATA FILE. DO NOT EDIT.
-extensions:
-  - addsTo:
-      pack: codeql/java-all
-      extensible: summaryModel
-    data:
-      - ["org.xml.sax", "ContentHandler", True, "startElement", "(String,String,String,Attributes)", "", "Argument[3]", "Argument[this]", "taint", "df-generated"]
-      - ["org.xml.sax", "EntityResolver", True, "resolveEntity", "(String,String)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["org.xml.sax", "EntityResolver", True, "resolveEntity", "(String,String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-  - addsTo:
-      pack: codeql/java-all
-      extensible: neutralModel
-    data:
-      - ["org.xml.sax", "ContentHandler", "endElement", "(String,String,String)", "summary", "df-generated"]
-      - ["org.xml.sax", "ErrorHandler", "error", "(SAXParseException)", "summary", "df-generated"]
-      - ["org.xml.sax", "ErrorHandler", "fatalError", "(SAXParseException)", "summary", "df-generated"]
-      - ["org.xml.sax", "ErrorHandler", "warning", "(SAXParseException)", "summary", "df-generated"]
diff --git a/java/ql/lib/ext/generated/sun.awt.model.yml b/java/ql/lib/ext/generated/sun.awt.model.yml
deleted file mode 100644
index 42476dac95e..00000000000
--- a/java/ql/lib/ext/generated/sun.awt.model.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-# THIS FILE IS AN AUTO-GENERATED MODELS AS DATA FILE. DO NOT EDIT.
-extensions:
-  - addsTo:
-      pack: codeql/java-all
-      extensible: summaryModel
-    data:
-      - ["sun.awt", "AWTAccessor$AccessibleBundleAccessor", True, "getKey", "(AccessibleBundle)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["sun.awt", "AWTAccessor$AccessibleContextAccessor", True, "getAppContext", "(AccessibleContext)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["sun.awt", "AWTAccessor$AccessibleContextAccessor", True, "getNativeAXResource", "(AccessibleContext)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["sun.awt", "AWTAccessor$AccessibleContextAccessor", True, "setAppContext", "(AccessibleContext,AppContext)", "", "Argument[1]", "Argument[0]", "taint", "df-generated"]
-      - ["sun.awt", "AWTAccessor$AccessibleContextAccessor", True, "setNativeAXResource", "(AccessibleContext,Object)", "", "Argument[1]", "Argument[0]", "taint", "df-generated"]
diff --git a/java/ql/lib/ext/generated/sun.java2d.model.yml b/java/ql/lib/ext/generated/sun.java2d.model.yml
deleted file mode 100644
index 4e8c183dbaa..00000000000
--- a/java/ql/lib/ext/generated/sun.java2d.model.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-# THIS FILE IS AN AUTO-GENERATED MODELS AS DATA FILE. DO NOT EDIT.
-extensions:
-  - addsTo:
-      pack: codeql/java-all
-      extensible: neutralModel
-    data:
-      - ["sun.java2d", "DisposerRecord", "dispose", "()", "summary", "df-generated"]
diff --git a/java/ql/lib/ext/generated/sun.management.spi.model.yml b/java/ql/lib/ext/generated/sun.management.spi.model.yml
deleted file mode 100644
index 20407d0cdf8..00000000000
--- a/java/ql/lib/ext/generated/sun.management.spi.model.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-# THIS FILE IS AN AUTO-GENERATED MODELS AS DATA FILE. DO NOT EDIT.
-extensions:
-  - addsTo:
-      pack: codeql/java-all
-      extensible: summaryModel
-    data:
-      - ["sun.management.spi", "PlatformMBeanProvider", True, "getPlatformComponentList", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
diff --git a/java/ql/lib/ext/generated/sun.nio.ch.model.yml b/java/ql/lib/ext/generated/sun.nio.ch.model.yml
deleted file mode 100644
index 6bf0c30693e..00000000000
--- a/java/ql/lib/ext/generated/sun.nio.ch.model.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-# THIS FILE IS AN AUTO-GENERATED MODELS AS DATA FILE. DO NOT EDIT.
-extensions:
-  - addsTo:
-      pack: codeql/java-all
-      extensible: summaryModel
-    data:
-      - ["sun.nio.ch", "DirectBuffer", True, "attachment", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["sun.nio.ch", "DirectBuffer", True, "cleaner", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-  - addsTo:
-      pack: codeql/java-all
-      extensible: neutralModel
-    data:
-      - ["sun.nio.ch", "DirectBuffer", "address", "()", "summary", "df-generated"]
-      - ["sun.nio.ch", "Interruptible", "interrupt", "(Thread)", "summary", "df-generated"]
diff --git a/java/ql/lib/ext/generated/sun.print.model.yml b/java/ql/lib/ext/generated/sun.print.model.yml
deleted file mode 100644
index b680eb20867..00000000000
--- a/java/ql/lib/ext/generated/sun.print.model.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-# THIS FILE IS AN AUTO-GENERATED MODELS AS DATA FILE. DO NOT EDIT.
-extensions:
-  - addsTo:
-      pack: codeql/java-all
-      extensible: neutralModel
-    data:
-      - ["sun.print", "DialogOwnerAccessor", "getOwnerID", "(DialogOwner)", "summary", "df-generated"]
diff --git a/java/ql/lib/ext/generated/sun.security.krb5.model.yml b/java/ql/lib/ext/generated/sun.security.krb5.model.yml
deleted file mode 100644
index 464a5ae3afe..00000000000
--- a/java/ql/lib/ext/generated/sun.security.krb5.model.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-# THIS FILE IS AN AUTO-GENERATED MODELS AS DATA FILE. DO NOT EDIT.
-extensions:
-  - addsTo:
-      pack: codeql/java-all
-      extensible: summaryModel
-    data:
-      - ["sun.security.krb5", "JavaxSecurityAuthKerberosAccess", True, "kerberosTicketGetClientAlias", "(KerberosTicket)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["sun.security.krb5", "JavaxSecurityAuthKerberosAccess", True, "kerberosTicketGetProxy", "(KerberosTicket)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["sun.security.krb5", "JavaxSecurityAuthKerberosAccess", True, "kerberosTicketGetServerAlias", "(KerberosTicket)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["sun.security.krb5", "JavaxSecurityAuthKerberosAccess", True, "kerberosTicketSetClientAlias", "(KerberosTicket,KerberosPrincipal)", "", "Argument[1]", "Argument[0]", "taint", "df-generated"]
-      - ["sun.security.krb5", "JavaxSecurityAuthKerberosAccess", True, "kerberosTicketSetProxy", "(KerberosTicket,KerberosTicket)", "", "Argument[1]", "Argument[0]", "taint", "df-generated"]
-      - ["sun.security.krb5", "JavaxSecurityAuthKerberosAccess", True, "kerberosTicketSetServerAlias", "(KerberosTicket,KerberosPrincipal)", "", "Argument[1]", "Argument[0]", "taint", "df-generated"]
-      - ["sun.security.krb5", "JavaxSecurityAuthKerberosAccess", True, "keyTabTakeSnapshot", "(KeyTab)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
diff --git a/java/ql/lib/ext/generated/sun.security.util.model.yml b/java/ql/lib/ext/generated/sun.security.util.model.yml
deleted file mode 100644
index 3f742e5e297..00000000000
--- a/java/ql/lib/ext/generated/sun.security.util.model.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-# THIS FILE IS AN AUTO-GENERATED MODELS AS DATA FILE. DO NOT EDIT.
-extensions:
-  - addsTo:
-      pack: codeql/java-all
-      extensible: neutralModel
-    data:
-      - ["sun.security.util", "MessageDigestSpi2", "engineUpdate", "(SecretKey)", "summary", "df-generated"]
diff --git a/java/ql/lib/ext/generated/sun.util.logging.internal.model.yml b/java/ql/lib/ext/generated/sun.util.logging.internal.model.yml
deleted file mode 100644
index 66270c3750b..00000000000
--- a/java/ql/lib/ext/generated/sun.util.logging.internal.model.yml
+++ /dev/null
@@ -1,9 +0,0 @@
-# THIS FILE IS AN AUTO-GENERATED MODELS AS DATA FILE. DO NOT EDIT.
-extensions:
-  - addsTo:
-      pack: codeql/java-all
-      extensible: summaryModel
-    data:
-      - ["sun.util.logging.internal", "LoggingProviderImpl$LogManagerAccess", True, "demandLoggerFor", "(LogManager,String,Module)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["sun.util.logging.internal", "LoggingProviderImpl$LogManagerAccess", True, "demandLoggerFor", "(LogManager,String,Module)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["sun.util.logging.internal", "LoggingProviderImpl$LogManagerAccess", True, "demandLoggerFor", "(LogManager,String,Module)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
diff --git a/java/ql/lib/ext/java.io.model.yml b/java/ql/lib/ext/java.io.model.yml
index 1d16ed8b827..e408d1dd58f 100644
--- a/java/ql/lib/ext/java.io.model.yml
+++ b/java/ql/lib/ext/java.io.model.yml
@@ -82,6 +82,7 @@ extensions:
       - ["java.io", "ByteArrayOutputStream", False, "writeTo", "", "", "Argument[this]", "Argument[0]", "taint", "manual"]
       - ["java.io", "CharArrayReader", False, "CharArrayReader", "", "", "Argument[0]", "Argument[this]", "taint", "manual"]
       - ["java.io", "CharArrayWriter", True, "toCharArray", "", "", "Argument[this]", "ReturnValue", "taint", "manual"]
+      - ["java.io", "CharArrayWriter", True, "toString", "()", "", "Argument[this]", "ReturnValue", "taint", "manual"]
       - ["java.io", "DataInput", True, "readFully", "", "", "Argument[this]", "Argument[0]", "taint", "manual"]
       - ["java.io", "DataInput", True, "readLine", "()", "", "Argument[this]", "ReturnValue", "taint", "manual"]
       - ["java.io", "DataInput", True, "readUTF", "()", "", "Argument[this]", "ReturnValue", "taint", "manual"]
@@ -100,6 +101,11 @@ extensions:
       - ["java.io", "File", True, "toString", "", "", "Argument[this]", "ReturnValue", "taint", "manual"]
       - ["java.io", "File", True, "toURI", "", "", "Argument[this]", "ReturnValue", "taint", "manual"]
       - ["java.io", "File", True, "toURL", "()", "", "Argument[this]", "ReturnValue", "taint", "df-manual"]
+      - ["java.io", "FileReader", True, "FileReader", "(File)", "", "Argument[0]", "Argument[this]", "taint", "manual"]
+      - ["java.io", "FileReader", True, "FileReader", "(File,Charset)", "", "Argument[0]", "Argument[this]", "taint", "manual"]
+      - ["java.io", "FileReader", True, "FileReader", "(FileDescriptor)", "", "Argument[0]", "Argument[this]", "taint", "manual"]
+      - ["java.io", "FileReader", True, "FileReader", "(String)", "", "Argument[0]", "Argument[this]", "taint", "manual"]
+      - ["java.io", "FileReader", True, "FileReader", "(String,Charset)", "", "Argument[0]", "Argument[this]", "taint", "manual"]
       - ["java.io", "FilterOutputStream", True, "FilterOutputStream", "(OutputStream)", "", "Argument[0]", "Argument[this]", "taint", "manual"]
       - ["java.io", "InputStream", True, "read", "()", "", "Argument[this]", "ReturnValue", "taint", "manual"]
       - ["java.io", "InputStream", True, "read", "(byte[])", "", "Argument[this]", "Argument[0]", "taint", "manual"]
diff --git a/java/ql/lib/ext/java.lang.model.yml b/java/ql/lib/ext/java.lang.model.yml
index c0c0905a7a4..8c2c448f4c2 100644
--- a/java/ql/lib/ext/java.lang.model.yml
+++ b/java/ql/lib/ext/java.lang.model.yml
@@ -162,6 +162,10 @@ extensions:
       pack: codeql/java-all
       extensible: neutralModel
     data:
+      - ["java.lang", "AbstractStringBuilder", "indexOf", "(String)", "summary", "manual"]
+      - ["java.lang", "AbstractStringBuilder", "indexOf", "(String,int)", "summary", "manual"]
+      - ["java.lang", "AbstractStringBuilder", "lastIndexOf", "(String)", "summary", "manual"]
+      - ["java.lang", "AbstractStringBuilder", "lastIndexOf", "(String,int)", "summary", "manual"]
       - ["java.lang", "AbstractStringBuilder", "length", "()", "summary", "manual"]
       - ["java.lang", "AbstractStringBuilder", "setCharAt", "(int,char)", "summary", "manual"]
       - ["java.lang", "AbstractStringBuilder", "setLength", "(int)", "summary", "manual"]
@@ -196,6 +200,7 @@ extensions:
       - ["java.lang", "ClassLoader", "loadClass", "(String,boolean)", "summary", "df-manual"]
       - ["java.lang", "ClassLoader", "setClassAssertionStatus", "(String,boolean)", "summary", "df-manual"]
       - ["java.lang", "ClassLoader", "setPackageAssertionStatus", "(String,boolean)", "summary", "df-manual"]
+      - ["java.lang", "Comparable", "compareTo", "", "summary", "manual"]
       - ["java.lang", "Enum", "Enum", "(String,int)", "summary", "manual"]
       - ["java.lang", "Enum", "equals", "(Object)", "summary", "manual"]
       - ["java.lang", "Enum", "hashCode", "()", "summary", "manual"]
@@ -207,7 +212,6 @@ extensions:
       - ["java.lang", "Object", "equals", "(Object)", "summary", "manual"]
       - ["java.lang", "Object", "getClass", "()", "summary", "manual"]
       - ["java.lang", "Object", "hashCode", "()", "summary", "manual"]
-      - ["java.lang", "Object", "toString", "()", "summary", "manual"]
       - ["java.lang", "Runtime", "getRuntime", "()", "summary", "manual"]
       - ["java.lang", "String", "compareTo", "(String)", "summary", "manual"]
       - ["java.lang", "String", "contains", "(CharSequence)", "summary", "manual"]
diff --git a/java/ql/lib/ext/java.net.model.yml b/java/ql/lib/ext/java.net.model.yml
index 5acfd7f4e10..084fce7bbc4 100644
--- a/java/ql/lib/ext/java.net.model.yml
+++ b/java/ql/lib/ext/java.net.model.yml
@@ -41,8 +41,15 @@ extensions:
       - ["java.net", "InetAddress", True, "getByAddress", "(byte[])", "", "Argument[0]", "ReturnValue", "taint", "ai-manual"]
       - ["java.net", "InetAddress", True, "getByName", "(String)", "", "Argument[0]", "ReturnValue", "taint", "ai-manual"]
       - ["java.net", "InetAddress", True, "getAllByName", "(String)", "", "Argument[0]", "ReturnValue.ArrayElement", "taint", "ai-manual"]
-      - ["java.net", "InetSocketAddress", True, "createUnresolved", "(String,int)", "", "Argument[0]", "ReturnValue", "taint", "ai-manual"]
+      - ["java.net", "InetSocketAddress", True, "InetSocketAddress", "(InetAddress,int)", "", "Argument[0]", "Argument[this]", "taint", "manual"]
       - ["java.net", "InetSocketAddress", True, "InetSocketAddress", "(String,int)", "", "Argument[0]", "Argument[this]", "taint", "ai-manual"]
+      - ["java.net", "InetSocketAddress", True, "InetSocketAddress", "(InetAddress,int)", "", "Argument[1]", "Argument[this].SyntheticField[java.net.InetSocketAddress.port]", "taint", "manual"]
+      - ["java.net", "InetSocketAddress", True, "InetSocketAddress", "(String,int)", "", "Argument[1]", "Argument[this].SyntheticField[java.net.InetSocketAddress.port]", "taint", "manual"]
+      - ["java.net", "InetSocketAddress", True, "createUnresolved", "(String,int)", "", "Argument[0]", "ReturnValue", "taint", "ai-manual"]
+      - ["java.net", "InetSocketAddress", True, "getAddress", "()", "", "Argument[this]", "ReturnValue", "taint", "manual"]
+      - ["java.net", "InetSocketAddress", True, "getHostName", "()", "", "Argument[this]", "ReturnValue", "taint", "manual"]
+      - ["java.net", "InetSocketAddress", True, "getHostString", "()", "", "Argument[this]", "ReturnValue", "taint", "manual"]
+      - ["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"]
diff --git a/java/ql/lib/ext/java.nio.model.yml b/java/ql/lib/ext/java.nio.model.yml
index 40c12b6c633..77387882745 100644
--- a/java/ql/lib/ext/java.nio.model.yml
+++ b/java/ql/lib/ext/java.nio.model.yml
@@ -1,4 +1,12 @@
 extensions:
+  - addsTo:
+      pack: codeql/java-all
+      extensible: sinkModel
+    data:
+      - ["java.nio.file", "FileSystems", True, "getFileSystem", "(URI)", "", "Argument[0]", "path-injection", "manual"]
+      - ["java.nio.channels", "AsynchronousFileChannel", True, "open", "(Path,OpenOption[])", "", "Argument[0]", "path-injection", "manual"]
+      - ["java.nio.channels", "AsynchronousFileChannel", True, "open", "(Path,Set,ExecutorService,FileAttribute[])", "", "Argument[0]", "path-injection", "manual"]
+
   - addsTo:
       pack: codeql/java-all
       extensible: summaryModel
diff --git a/java/ql/lib/ext/java.util.model.yml b/java/ql/lib/ext/java.util.model.yml
index cb49a50fbdf..bfae915d36a 100644
--- a/java/ql/lib/ext/java.util.model.yml
+++ b/java/ql/lib/ext/java.util.model.yml
@@ -362,7 +362,7 @@ extensions:
       - ["java.util", "SequencedMap", True, "sequencedValues", "", "", "Argument[this].MapValue", "ReturnValue.Element", "value", "manual"]
       - ["java.util", "SequencedSet", True, "reversed", "", "", "Argument[this].Element", "ReturnValue.Element", "value", "manual"]
       - ["java.util", "Set", False, "copyOf", "(Collection)", "", "Argument[0].Element", "ReturnValue.Element", "value", "manual"]
-      - ["java.util", "Set", False, "clear", "()", "", "Argument[this].WithoutElement", "Argument[this]", "value", "manual"]
+      - ["java.util", "Set", True, "clear", "()", "", "Argument[this].WithoutElement", "Argument[this]", "value", "manual"]
       - ["java.util", "Set", False, "of", "(Object)", "", "Argument[0]", "ReturnValue.Element", "value", "manual"]
       - ["java.util", "Set", False, "of", "(Object,Object)", "", "Argument[0..1]", "ReturnValue.Element", "value", "manual"]
       - ["java.util", "Set", False, "of", "(Object,Object,Object)", "", "Argument[0..2]", "ReturnValue.Element", "value", "manual"]
@@ -430,6 +430,8 @@ extensions:
       - ["java.util", "Collection", "contains", "(Object)", "summary", "manual"]
       - ["java.util", "Collection", "containsAll", "(Collection)", "summary", "manual"]
       - ["java.util", "Collection", "isEmpty", "()", "summary", "manual"]
+      - ["java.util", "Collection", "remove", "(Object)", "summary", "manual"]
+      - ["java.util", "Collection", "removeIf", "(Predicate)", "summary", "manual"]
       - ["java.util", "Collection", "size", "()", "summary", "manual"]
       - ["java.util", "Collections", "emptyList", "()", "summary", "manual"]
       - ["java.util", "Collections", "emptyMap", "()", "summary", "manual"]
@@ -451,12 +453,14 @@ extensions:
       - ["java.util", "HashMap", "size", "()", "summary", "manual"]
       - ["java.util", "HashSet", "HashSet", "(int)", "summary", "manual"]
       - ["java.util", "Iterator", "hasNext", "()", "summary", "manual"]
+      - ["java.util", "Iterator", "remove", "()", "summary", "manual"]
       - ["java.util", "List", "contains", "(Object)", "summary", "manual"]
       - ["java.util", "List", "equals", "(Object)", "summary", "manual"]
       - ["java.util", "List", "hashCode", "()", "summary", "manual"]
       - ["java.util", "List", "indexOf", "(Object)", "summary", "manual"]
       - ["java.util", "List", "isEmpty", "()", "summary", "manual"]
       - ["java.util", "List", "of", "()", "summary", "manual"]
+      - ["java.util", "List", "remove", "(Object)", "summary", "manual"]
       - ["java.util", "List", "sort", "(Comparator)", "summary", "manual"]
       - ["java.util", "List", "size", "()", "summary", "manual"]
       - ["java.util", "Locale$Builder", "addUnicodeLocaleAttribute", "(String)", "summary", "df-manual"]
@@ -535,6 +539,8 @@ extensions:
       - ["java.util", "Scanner", "locale", "()", "summary", "df-manual"]
       - ["java.util", "Set", "contains", "(Object)", "summary", "manual"]
       - ["java.util", "Set", "isEmpty", "()", "summary", "manual"]
+      - ["java.util", "Set", "remove", "(Object)", "summary", "manual"]
+      - ["java.util", "Set", "removeAll", "(Collection)", "summary", "manual"]
       - ["java.util", "Set", "size", "()", "summary", "manual"]
       - ["java.util", "TreeMap", "TreeMap", "(Comparator)", "summary", "df-manual"]
       - ["java.util", "TreeSet", "TreeSet", "(Comparator)", "summary", "df-manual"]
@@ -545,14 +551,8 @@ extensions:
       - ["java.util", "TimeZone", "getTimeZone", "(String)", "summary", "manual"]
       - ["java.util", "Vector", "size", "()", "summary", "manual"]
 
-      # The below APIs are currently being stored as neutral models since `WithoutElement` has not yet been implemented for Java.
-      # When `WithoutElement` is implemented, these should be changed to summary models of the form `Argument[this].WithoutElement -> Argument[this]`.
-      - ["java.util", "Collection", "removeIf", "(Predicate)", "summary", "manual"]
-      - ["java.util", "Iterator", "remove", "()", "summary", "manual"]
-      - ["java.util", "List", "remove", "(Object)", "summary", "manual"]
+      # The below API is currently being stored as neutral models since `WithoutElement` does not yet have a counterpart for MapValue/MapKey.
       - ["java.util", "Map", "clear", "()", "summary", "manual"]
-      - ["java.util", "Set", "remove", "(Object)", "summary", "manual"]
-      - ["java.util", "Set", "removeAll", "(Collection)", "summary", "manual"]
 
       # The below APIs have numeric flow and are currently being stored as neutral models.
       # These may be changed to summary models with kinds "value-numeric" and "taint-numeric" (or similar) in the future.
diff --git a/java/ql/lib/ext/java.util.stream.model.yml b/java/ql/lib/ext/java.util.stream.model.yml
index 32438ab1956..68cde91a5a8 100644
--- a/java/ql/lib/ext/java.util.stream.model.yml
+++ b/java/ql/lib/ext/java.util.stream.model.yml
@@ -9,6 +9,9 @@ extensions:
       - ["java.util.stream", "BaseStream", True, "sequential", "()", "", "Argument[this].Element", "ReturnValue.Element", "value", "manual"]
       - ["java.util.stream", "BaseStream", True, "spliterator", "()", "", "Argument[this].Element", "ReturnValue.Element", "value", "manual"]
       - ["java.util.stream", "BaseStream", True, "unordered", "()", "", "Argument[this].Element", "ReturnValue.Element", "value", "manual"]
+      - ["java.util.stream", "DoubleStream", True, "mapToObj", "(IntFunction)", "", "Argument[0].ReturnValue", "ReturnValue.Element", "value", "manual"]
+      - ["java.util.stream", "IntStream", True, "mapToObj", "(IntFunction)", "", "Argument[0].ReturnValue", "ReturnValue.Element", "value", "manual"]
+      - ["java.util.stream", "LongStream", True, "mapToObj", "(IntFunction)", "", "Argument[0].ReturnValue", "ReturnValue.Element", "value", "manual"]
       - ["java.util.stream", "Stream", True, "allMatch", "(Predicate)", "", "Argument[this].Element", "Argument[0].Parameter[0]", "value", "manual"]
       - ["java.util.stream", "Stream", True, "anyMatch", "(Predicate)", "", "Argument[this].Element", "Argument[0].Parameter[0]", "value", "manual"]
       - ["java.util.stream", "Stream", True, "collect", "(Supplier,BiConsumer,BiConsumer)", "", "Argument[this].Element", "Argument[1].Parameter[1]", "value", "manual"]
@@ -101,5 +104,4 @@ extensions:
 
       # The below APIs have numeric flow and are currently being stored as neutral models.
       # These may be changed to summary models with kinds "value-numeric" and "taint-numeric" (or similar) in the future.
-      - ["java.util.stream", "IntStream", "mapToObj", "(IntFunction)", "summary", "manual"] # taint-numeric
       - ["java.util.stream", "IntStream", "range", "(int,int)", "summary", "manual"]        # taint-numeric
diff --git a/java/ql/lib/ext/java.util.zip.model.yml b/java/ql/lib/ext/java.util.zip.model.yml
index 611fc7804ef..dc24570995f 100644
--- a/java/ql/lib/ext/java.util.zip.model.yml
+++ b/java/ql/lib/ext/java.util.zip.model.yml
@@ -5,10 +5,24 @@ extensions:
     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", "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"]
+      - ["java.util.zip", "ZipFile", True, "ZipFile", "(File,int,Charset)", "", "Argument[0]", "Argument[this]", "taint", "manual"]
+      - ["java.util.zip", "ZipFile", True, "ZipFile", "(String)", "", "Argument[0]", "Argument[this]", "taint", "manual"]
+      - ["java.util.zip", "ZipFile", True, "ZipFile", "(String,Charset)", "", "Argument[0]", "Argument[this]", "taint", "manual"]
+      - ["java.util.zip", "ZipFile", True, "entries", "()", "", "Argument[this]", "ReturnValue", "taint", "manual"]
+      - ["java.util.zip", "ZipFile", True, "getComment", "()", "", "Argument[this]", "ReturnValue", "taint", "manual"]
+      - ["java.util.zip", "ZipFile", True, "getEntry", "(String)", "", "Argument[0]", "ReturnValue", "taint", "manual"]
+      - ["java.util.zip", "ZipFile", True, "getEntry", "(String)", "", "Argument[this]", "ReturnValue", "taint", "manual"]
       - ["java.util.zip", "ZipFile", True, "getInputStream", "(ZipEntry)", "", "Argument[0]", "ReturnValue", "taint", "ai-manual"]
+      - ["java.util.zip", "ZipFile", True, "getInputStream", "(ZipEntry)", "", "Argument[this]", "ReturnValue", "taint", "manual"]
+      - ["java.util.zip", "ZipFile", True, "getName", "()", "", "Argument[this]", "ReturnValue", "taint", "manual"]
+      - ["java.util.zip", "ZipFile", True, "stream", "()", "", "Argument[this]", "ReturnValue", "taint", "manual"]
       - ["java.util.zip", "ZipInputStream", False, "ZipInputStream", "", "", "Argument[0]", "Argument[this]", "taint", "manual"]
   - addsTo:
       pack: codeql/java-all
       extensible: sinkModel
     data:
       - ["java.util.zip", "ZipOutputStream", True, "putNextEntry", "(ZipEntry)", "", "Argument[0]", "file-content-store", "ai-manual"]
+      - ["java.util.zip", "ZipFile", True, "ZipFile", "(String)", "", "Argument[0]", "path-injection", "manual"]
diff --git a/java/ql/lib/ext/javax.naming.directory.model.yml b/java/ql/lib/ext/javax.naming.directory.model.yml
index 6f60e7cf20d..4bf0cfba2da 100644
--- a/java/ql/lib/ext/javax.naming.directory.model.yml
+++ b/java/ql/lib/ext/javax.naming.directory.model.yml
@@ -1,4 +1,17 @@
 extensions:
+  - addsTo:
+      pack: codeql/java-all
+      extensible: summaryModel
+    data:
+      - ["javax.naming.directory", "BasicAttributes", True, "BasicAttributes", "(String,Object)", "", "Argument[0..1]", "Argument[this]", "taint", "manual"]
+      - ["javax.naming.directory", "BasicAttributes", True, "BasicAttributes", "(String,Object,boolean)", "", "Argument[0..1]", "Argument[this]", "taint", "manual"]
+      - ["javax.naming.directory", "BasicAttributes", True, "clone", "()", "", "Argument[this]", "ReturnValue", "taint", "manual"]
+      - ["javax.naming.directory", "BasicAttributes", True, "get", "(String)", "", "Argument[this]", "ReturnValue", "taint", "manual"]
+      - ["javax.naming.directory", "BasicAttributes", True, "put", "(Attribute)", "", "Argument[0..1]", "Argument[this]", "taint", "manual"]
+      - ["javax.naming.directory", "BasicAttributes", True, "put", "(Attribute)", "", "Argument[this]", "ReturnValue", "taint", "manual"]
+      - ["javax.naming.directory", "BasicAttributes", True, "put", "(String,Object)", "", "Argument[0..1]", "Argument[this]", "taint", "manual"]
+      - ["javax.naming.directory", "BasicAttributes", True, "put", "(String,Object)", "", "Argument[this]", "ReturnValue", "taint", "manual"]
+
   - addsTo:
       pack: codeql/java-all
       extensible: sinkModel
diff --git a/java/ql/lib/ext/experimental/zip4j.model.yml b/java/ql/lib/ext/net.lingala.zip4j.model.yml
similarity index 100%
rename from java/ql/lib/ext/experimental/zip4j.model.yml
rename to java/ql/lib/ext/net.lingala.zip4j.model.yml
diff --git a/java/ql/lib/ext/org.apache.shiro.authc.model.yml b/java/ql/lib/ext/org.apache.shiro.authc.model.yml
new file mode 100644
index 00000000000..dbb3c06f40f
--- /dev/null
+++ b/java/ql/lib/ext/org.apache.shiro.authc.model.yml
@@ -0,0 +1,6 @@
+extensions:
+  - addsTo:
+      pack: codeql/java-all
+      extensible: sourceModel
+    data:
+      - ["org.apache.shiro.authc", "AuthenticationToken", True, "getCredentials", "()", "", "ReturnValue", "remote", "manual"]
\ No newline at end of file
diff --git a/java/ql/lib/ext/org.springframework.core.io.model.yml b/java/ql/lib/ext/org.springframework.core.io.model.yml
index 2e8df641110..7ef9e7ced4d 100644
--- a/java/ql/lib/ext/org.springframework.core.io.model.yml
+++ b/java/ql/lib/ext/org.springframework.core.io.model.yml
@@ -6,6 +6,28 @@ extensions:
       - ["org.springframework.core.io", "Resource", True, "createRelative", "(String)", "", "Argument[0]", "path-injection", "manual"]
       - ["org.springframework.core.io", "ResourceLoader", True, "getResource", "(String)", "", "Argument[0]", "path-injection", "ai-manual"]
       - ["org.springframework.core.io", "ResourceLoader", True, "getResource", "(String)", "", "Argument[0]", "request-forgery", "manual"]
+      - ["org.springframework.core.io", "FileSystemResource", True, "FileSystemResource", "(FileSystem,String)", "", "Argument[1]", "path-injection", "manual"]
+      - ["org.springframework.core.io", "FileSystemResource", True, "FileSystemResource", "(File)", "", "Argument[0]", "path-injection", "manual"]
+      - ["org.springframework.core.io", "FileSystemResource", True, "FileSystemResource", "(Path)", "", "Argument[0]", "path-injection", "manual"]
+      - ["org.springframework.core.io", "FileSystemResource", True, "FileSystemResource", "(String)", "", "Argument[0]", "path-injection", "manual"]
+      - ["org.springframework.core.io", "FileUrlResource", True, "FileUrlResource", "(String)", "", "Argument[0]", "path-injection", "manual"]
+      - ["org.springframework.core.io", "FileUrlResource", True, "FileUrlResource", "(URL)", "", "Argument[0]", "path-injection", "manual"]
+      - ["org.springframework.core.io", "PathResource", True, "PathResource", "(Path)", "", "Argument[0]", "path-injection", "manual"]
+      - ["org.springframework.core.io", "PathResource", True, "PathResource", "(String)", "", "Argument[0]", "path-injection", "manual"]
+      - ["org.springframework.core.io", "PathResource", True, "PathResource", "(URI)", "", "Argument[0]", "path-injection", "manual"]
+      - ["org.springframework.core.io", "UrlResource", True, "UrlResource", "(String,String,String)", "", "Argument[1]", "path-injection", "manual"]
+      - ["org.springframework.core.io", "UrlResource", True, "UrlResource", "(String,String)", "", "Argument[1]", "path-injection", "manual"]
+      - ["org.springframework.core.io", "UrlResource", True, "UrlResource", "(String)", "", "Argument[0]", "path-injection", "manual"]
+      - ["org.springframework.core.io", "UrlResource", True, "UrlResource", "(URI)", "", "Argument[0]", "path-injection", "manual"]
+      - ["org.springframework.core.io", "UrlResource", True, "UrlResource", "(URL)", "", "Argument[0]", "path-injection", "manual"]
+      - ["org.springframework.util", "FileSystemUtils", True, "copyRecursively", "(Path,Path)", "", "Argument[0]", "path-injection", "manual"]
+      - ["org.springframework.util", "FileSystemUtils", True, "copyRecursively", "(Path,Path)", "", "Argument[1]", "path-injection", "manual"]
+      - ["org.springframework.util", "FileSystemUtils", True, "deleteRecursively", "(File)", "", "Argument[0]", "path-injection", "manual"]
+      - ["org.springframework.util", "FileSystemUtils", True, "deleteRecursively", "(Path)", "", "Argument[0]", "path-injection", "manual"]
+      - ["org.springframework.util", "ResourceUtils", True, "getFile", "(String)", "", "Argument[0]", "path-injection", "manual"]
+      - ["org.springframework.util", "FileCopyUtils", True, "copyToByteArray", "(File)", "", "Argument[0]", "path-injection", "manual"]
+      - ["org.springframework.util", "FileSystemUtils", True, "copyRecursively", "(File,File)", "", "Argument[0]", "path-injection", "manual"]
+
   - addsTo:
       pack: codeql/java-all
       extensible: summaryModel
@@ -15,3 +37,4 @@ extensions:
       - ["org.springframework.core.io", "ClassPathResource", True, "getPath", "", "", "Argument[this]", "ReturnValue", "taint", "manual"]
       - ["org.springframework.core.io", "ClassPathResource", True, "getURL", "", "", "Argument[this]", "ReturnValue", "taint", "manual"]
       - ["org.springframework.core.io", "ClassPathResource", True, "resolveURL", "", "", "Argument[this]", "ReturnValue", "taint", "manual"]
+      - ["org.springframework.core.io", "InputStreamSource", True, "getInputStream", "", "", "Argument[this]", "ReturnValue", "taint", "manual"]
diff --git a/java/ql/lib/ext/org.springframework.web.multipart.model.yml b/java/ql/lib/ext/org.springframework.web.multipart.model.yml
index 86cce206ece..a2a627b6501 100644
--- a/java/ql/lib/ext/org.springframework.web.multipart.model.yml
+++ b/java/ql/lib/ext/org.springframework.web.multipart.model.yml
@@ -20,7 +20,6 @@ extensions:
       extensible: summaryModel
     data:
       - ["org.springframework.web.multipart", "MultipartFile", True, "getBytes", "", "", "Argument[this]", "ReturnValue", "taint", "manual"]
-      - ["org.springframework.web.multipart", "MultipartFile", True, "getInputStream", "", "", "Argument[this]", "ReturnValue", "taint", "manual"]
       - ["org.springframework.web.multipart", "MultipartFile", True, "getName", "", "", "Argument[this]", "ReturnValue", "taint", "manual"]
       - ["org.springframework.web.multipart", "MultipartFile", True, "getOriginalFilename", "", "", "Argument[this]", "ReturnValue", "taint", "manual"]
       - ["org.springframework.web.multipart", "MultipartFile", True, "getResource", "", "", "Argument[this]", "ReturnValue", "taint", "manual"]
diff --git a/java/ql/lib/ext/software.amazon.awssdk.transfer.s3.model.model.yml b/java/ql/lib/ext/software.amazon.awssdk.transfer.s3.model.model.yml
new file mode 100644
index 00000000000..e35ae485e39
--- /dev/null
+++ b/java/ql/lib/ext/software.amazon.awssdk.transfer.s3.model.model.yml
@@ -0,0 +1,13 @@
+extensions:
+  - addsTo:
+      pack: codeql/java-all
+      extensible: sinkModel
+    data:
+      - ["software.amazon.awssdk.transfer.s3.model", "ResumableFileUpload", True, "serializeToFile", "(Path)", "", "Argument[0]", "path-injection", "manual"]
+      - ["software.amazon.awssdk.transfer.s3.model", "DownloadFileRequest$Builder", True, "destination", "(Path)", "", "Argument[0]", "path-injection", "manual"]
+      - ["software.amazon.awssdk.transfer.s3.model", "UploadFileRequest$Builder", True, "source", "(Path)", "", "Argument[0]", "path-injection", "manual"]
+      - ["software.amazon.awssdk.transfer.s3.model", "DownloadDirectoryRequest$Builder", True, "destination", "(Path)", "", "Argument[0]", "path-injection", "manual"]
+      - ["software.amazon.awssdk.transfer.s3.model", "ResumableFileDownload", True, "fromFile", "(Path)", "", "Argument[0]", "path-injection", "manual"]
+      - ["software.amazon.awssdk.transfer.s3.model", "ResumableFileDownload", True, "serializeToFile", "(Path)", "", "Argument[0]", "path-injection", "manual"]
+      - ["software.amazon.awssdk.transfer.s3.model", "ResumableFileUpload", True, "fromFile", "(Path)", "", "Argument[0]", "path-injection", "manual"]
+      - ["software.amazon.awssdk.transfer.s3.model", "UploadDirectoryRequest$Builder", True, "source", "(Path)", "", "Argument[0]", "path-injection", "manual"]
diff --git a/java/ql/lib/qlpack.yml b/java/ql/lib/qlpack.yml
index 9189b611545..cc639056e4e 100644
--- a/java/ql/lib/qlpack.yml
+++ b/java/ql/lib/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/java-all
-version: 4.0.1-dev
+version: 4.2.1-dev
 groups: java
 dbscheme: config/semmlecode.dbscheme
 extractor: java
diff --git a/java/ql/lib/semmle/code/Location.qll b/java/ql/lib/semmle/code/Location.qll
index 1a6ddc73728..abc1d19d0f8 100644
--- a/java/ql/lib/semmle/code/Location.qll
+++ b/java/ql/lib/semmle/code/Location.qll
@@ -18,7 +18,7 @@ predicate hasName(Element e, string name) {
   or
   methods(e, name, _, _, _, _)
   or
-  fields(e, name, _, _, _)
+  fields(e, name, _, _)
   or
   packages(e, name)
   or
diff --git a/java/ql/lib/semmle/code/java/Dependency.qll b/java/ql/lib/semmle/code/java/Dependency.qll
index 29dc81a1960..8514bcb466a 100644
--- a/java/ql/lib/semmle/code/java/Dependency.qll
+++ b/java/ql/lib/semmle/code/java/Dependency.qll
@@ -52,7 +52,7 @@ predicate depends(RefType t, RefType dep) {
     or
     // the declaring type of a field accessed in `t`,
     exists(Field f | f.getAnAccess().getEnclosingCallable().getDeclaringType() = t |
-      usesType(f.getSourceDeclaration().getDeclaringType(), dep)
+      usesType(f.getDeclaringType(), dep)
     )
     or
     // the type of a local variable declared in `t`,
diff --git a/java/ql/lib/semmle/code/java/DependencyCounts.qll b/java/ql/lib/semmle/code/java/DependencyCounts.qll
index 464f8847188..4cb958373a9 100644
--- a/java/ql/lib/semmle/code/java/DependencyCounts.qll
+++ b/java/ql/lib/semmle/code/java/DependencyCounts.qll
@@ -64,7 +64,7 @@ predicate numDepends(RefType t, RefType dep, int value) {
         elem = fa and
         fa.getEnclosingCallable().getDeclaringType() = t
       |
-        usesType(fa.getField().getSourceDeclaration().getDeclaringType(), dep)
+        usesType(fa.getField().getDeclaringType(), dep)
       )
       or
       // the type of a local variable declared in `t`,
diff --git a/java/ql/lib/semmle/code/java/Element.qll b/java/ql/lib/semmle/code/java/Element.qll
index 493bf7cec0f..2032d72ee5f 100644
--- a/java/ql/lib/semmle/code/java/Element.qll
+++ b/java/ql/lib/semmle/code/java/Element.qll
@@ -115,7 +115,7 @@ private predicate hasChildElement(Element parent, Element e) {
   or
   params(e, _, _, parent, _)
   or
-  fields(e, _, _, parent, _)
+  fields(e, _, _, parent)
   or
   typeVars(e, _, _, parent)
 }
diff --git a/java/ql/lib/semmle/code/java/Exception.qll b/java/ql/lib/semmle/code/java/Exception.qll
index c2c8e568281..0b92975a580 100644
--- a/java/ql/lib/semmle/code/java/Exception.qll
+++ b/java/ql/lib/semmle/code/java/Exception.qll
@@ -7,7 +7,7 @@ import Type
 
 /**
  * An Exception represents an element listed in the `throws` clause
- * of a method of constructor.
+ * of a method or constructor.
  *
  * For example, `E` is an exception thrown by method `m` in
  * `void m() throws E;`, whereas `T` is an exception _type_ in
diff --git a/java/ql/lib/semmle/code/java/Generics.qll b/java/ql/lib/semmle/code/java/Generics.qll
index 507c3bb919e..a50dcabe224 100644
--- a/java/ql/lib/semmle/code/java/Generics.qll
+++ b/java/ql/lib/semmle/code/java/Generics.qll
@@ -330,13 +330,6 @@ class ParameterizedType extends ClassOrInterface {
     typeVars(_, _, _, this)
   }
 
-  /**
-   * The erasure of a parameterized type is its generic counterpart.
-   *
-   * For example, the erasure of both `X<Number>` and `X<Integer>` is `X<T>`.
-   */
-  override RefType getErasure() { erasure(this, result) or this.(GenericType) = result }
-
   /**
    * Gets the generic type corresponding to this parameterized type.
    *
@@ -406,13 +399,6 @@ class ParameterizedInterface extends Interface, ParameterizedType {
 class RawType extends RefType {
   RawType() { isRaw(this) }
 
-  /**
-   * The erasure of a raw type is its generic counterpart.
-   *
-   * For example, the erasure of `List` is `List<E>`.
-   */
-  override RefType getErasure() { erasure(this, result) }
-
   /** Holds if this type originates from source code. */
   override predicate fromSource() { not any() }
 
diff --git a/java/ql/lib/semmle/code/java/Member.qll b/java/ql/lib/semmle/code/java/Member.qll
index 7c625ae48c6..f6f4ca56f92 100644
--- a/java/ql/lib/semmle/code/java/Member.qll
+++ b/java/ql/lib/semmle/code/java/Member.qll
@@ -756,13 +756,13 @@ class FieldDeclaration extends ExprParent, @fielddecl, Annotatable {
 /** A class or instance field. */
 class Field extends Member, ExprParent, @field, Variable {
   /** Gets the declared type of this field. */
-  override Type getType() { fields(this, _, result, _, _) }
+  override Type getType() { fields(this, _, result, _) }
 
   /** Gets the Kotlin type of this field. */
   override KotlinType getKotlinType() { fieldsKotlinType(this, result) }
 
   /** Gets the type in which this field is declared. */
-  override RefType getDeclaringType() { fields(this, _, _, result, _) }
+  override RefType getDeclaringType() { fields(this, _, _, result) }
 
   /**
    * Gets the field declaration in which this field is declared.
@@ -794,18 +794,12 @@ class Field extends Member, ExprParent, @field, Variable {
   }
 
   /**
-   * Gets the source declaration of this field.
-   *
-   * For fields that are members of a parameterized
-   * instance of a generic type, the source declaration is the
-   * corresponding field in the generic type.
-   *
-   * For all other fields, the source declaration is the field itself.
+   * DEPRECATED: The result is always `this`.
    */
-  Field getSourceDeclaration() { fields(this, _, _, _, result) }
+  deprecated Field getSourceDeclaration() { result = this }
 
-  /** Holds if this field is the same as its source declaration. */
-  predicate isSourceDeclaration() { this.getSourceDeclaration() = this }
+  /** DEPRECATED: This always holds. */
+  deprecated predicate isSourceDeclaration() { any() }
 
   override predicate isPublic() {
     Member.super.isPublic()
diff --git a/java/ql/lib/semmle/code/java/Type.qll b/java/ql/lib/semmle/code/java/Type.qll
index f2709d3dda1..5036bbea622 100644
--- a/java/ql/lib/semmle/code/java/Type.qll
+++ b/java/ql/lib/semmle/code/java/Type.qll
@@ -324,7 +324,7 @@ predicate declaresMember(Type t, @member m) {
   or
   constrs(m, _, _, _, t, _)
   or
-  fields(m, _, _, t, _)
+  fields(m, _, _, t)
   or
   enclInReftype(m, t) and
   // Since the type `@member` in the dbscheme includes all `@reftype`s,
@@ -1195,12 +1195,10 @@ class EnumType extends Class {
   EnumType() { isEnumType(this) }
 
   /** Gets the enum constant with the specified name. */
-  EnumConstant getEnumConstant(string name) {
-    fields(result, _, _, this, _) and result.hasName(name)
-  }
+  EnumConstant getEnumConstant(string name) { fields(result, _, _, this) and result.hasName(name) }
 
   /** Gets an enum constant declared in this enum type. */
-  EnumConstant getAnEnumConstant() { fields(result, _, _, this, _) }
+  EnumConstant getAnEnumConstant() { fields(result, _, _, this) }
 
   override predicate isFinal() {
     // JLS 8.9: An enum declaration is implicitly `final` unless it contains
diff --git a/java/ql/lib/semmle/code/java/controlflow/UnreachableBlocks.qll b/java/ql/lib/semmle/code/java/controlflow/UnreachableBlocks.qll
index 3145371561a..f34ace10d31 100644
--- a/java/ql/lib/semmle/code/java/controlflow/UnreachableBlocks.qll
+++ b/java/ql/lib/semmle/code/java/controlflow/UnreachableBlocks.qll
@@ -217,13 +217,15 @@ class UnreachableBasicBlock extends BasicBlock {
     not this instanceof CatchClause
     or
     // Switch statements with a constant comparison expression may have unreachable cases.
-    exists(ConstSwitchStmt constSwitchStmt, BasicBlock failingCaseBlock |
-      failingCaseBlock = constSwitchStmt.getAFailingCase().getBasicBlock()
-    |
+    exists(ConstSwitchStmt constSwitchStmt, BasicBlock unreachableCaseBlock |
+      // Not accessible from the switch expression
+      unreachableCaseBlock = constSwitchStmt.getAFailingCase().getBasicBlock() and
       // Not accessible from the successful case
-      not constSwitchStmt.getMatchingCase().getBasicBlock().getABBSuccessor*() = failingCaseBlock and
-      // Blocks dominated by the failing case block are unreachable
-      constSwitchStmt.getAFailingCase().getBasicBlock().bbDominates(this)
+      not constSwitchStmt.getMatchingCase().getBasicBlock().getABBSuccessor*() =
+        unreachableCaseBlock
+    |
+      // Blocks dominated by an unreachable case block are unreachable
+      unreachableCaseBlock.bbDominates(this)
     )
   }
 }
diff --git a/java/ql/lib/semmle/code/java/dataflow/ExternalFlow.qll b/java/ql/lib/semmle/code/java/dataflow/ExternalFlow.qll
index 28be9a61d75..123e042b621 100644
--- a/java/ql/lib/semmle/code/java/dataflow/ExternalFlow.qll
+++ b/java/ql/lib/semmle/code/java/dataflow/ExternalFlow.qll
@@ -416,7 +416,7 @@ private predicate elementSpec(
   or
   summaryModel(package, type, subtypes, name, signature, ext, _, _, _, _, _)
   or
-  neutralModel(package, type, name, signature, _, _) and ext = "" and subtypes = false
+  neutralModel(package, type, name, signature, _, _) and ext = "" and subtypes = true
 }
 
 private string getNestedName(Type t) {
diff --git a/java/ql/lib/semmle/code/java/dataflow/FlowSources.qll b/java/ql/lib/semmle/code/java/dataflow/FlowSources.qll
index d18d8e4c8a4..77af39967c6 100644
--- a/java/ql/lib/semmle/code/java/dataflow/FlowSources.qll
+++ b/java/ql/lib/semmle/code/java/dataflow/FlowSources.qll
@@ -42,11 +42,18 @@ abstract class SourceNode extends DataFlow::Node {
 }
 
 /**
+ * DEPRECATED: Use `ActiveThreatModelSource` instead.
+ *
  * A class of data flow sources that respects the
  * current threat model configuration.
  */
-class ThreatModelFlowSource extends DataFlow::Node {
-  ThreatModelFlowSource() {
+deprecated class ThreatModelFlowSource = ActiveThreatModelSource;
+
+/**
+ * A data flow source that is enabled in the current threat model configuration.
+ */
+class ActiveThreatModelSource extends DataFlow::Node {
+  ActiveThreatModelSource() {
     exists(string kind |
       // Specific threat model.
       currentThreatModel(kind) and
@@ -195,7 +202,7 @@ abstract class LocalUserInput extends UserInput {
 
 /**
  * DEPRECATED: Use the threat models feature.
- * That is, use `ThreatModelFlowSource` as the class of nodes for sources
+ * That is, use `ActiveThreatModelSource` as the class of nodes for sources
  * and set up the threat model configuration to filter source nodes.
  * Alternatively, use `getThreatModel` to filter nodes to create the
  * class of nodes you need.
@@ -266,7 +273,7 @@ private class FileInput extends LocalUserInput {
 
 /**
  * DEPRECATED: Use the threat models feature.
- * That is, use `ThreatModelFlowSource` as the class of nodes for sources
+ * That is, use `ActiveThreatModelSource` as the class of nodes for sources
  * and set up the threat model configuration to filter source nodes.
  * Alternatively, use `getThreatModel` to filter nodes to create the
  * class of nodes you need.
diff --git a/java/ql/lib/semmle/code/java/dataflow/TypeFlow.qll b/java/ql/lib/semmle/code/java/dataflow/TypeFlow.qll
index 0c37215de78..c548c5db38b 100644
--- a/java/ql/lib/semmle/code/java/dataflow/TypeFlow.qll
+++ b/java/ql/lib/semmle/code/java/dataflow/TypeFlow.qll
@@ -84,10 +84,11 @@ private module Input implements TypeFlowInput<Location> {
   }
 
   /**
-   * Holds if data can flow from `n1` to `n2` in one step, and `n1` is not
-   * necessarily functionally determined by `n2`.
+   * Holds if data can flow from `n1` to `n2` in one step.
+   *
+   * For a given `n2`, this predicate must include all possible `n1` that can flow to `n2`.
    */
-  predicate joinStep(TypeFlowNode n1, TypeFlowNode n2) {
+  predicate step(TypeFlowNode n1, TypeFlowNode n2) {
     n2.asExpr().(ChooseExpr).getAResultExpr() = n1.asExpr()
     or
     exists(Field f, Expr e |
@@ -112,13 +113,7 @@ private module Input implements TypeFlowInput<Location> {
       // skip trivial recursion
       not arg = n2.asSsa().getAUse()
     )
-  }
-
-  /**
-   * Holds if data can flow from `n1` to `n2` in one step, and `n1` is
-   * functionally determined by `n2`.
-   */
-  predicate step(TypeFlowNode n1, TypeFlowNode n2) {
+    or
     n2.asExpr() = n1.asField().getAnAccess()
     or
     n2.asExpr() = n1.asSsa().getAUse()
@@ -132,6 +127,8 @@ private module Input implements TypeFlowInput<Location> {
     n2.asSsa().(BaseSsaUpdate).getDefiningExpr().(VariableAssign).getSource() = n1.asExpr()
     or
     n2.asSsa().(BaseSsaImplicitInit).captures(n1.asSsa())
+    or
+    n2.asExpr().(NotNullExpr).getExpr() = n1.asExpr()
   }
 
   /**
@@ -143,7 +140,7 @@ private module Input implements TypeFlowInput<Location> {
     exists(LocalVariableDeclExpr decl |
       n.asSsa().(BaseSsaUpdate).getDefiningExpr() = decl and
       not decl.hasImplicitInit() and
-      not exists(decl.getInit())
+      not exists(decl.getInitOrPatternSource())
     )
   }
 
@@ -169,7 +166,7 @@ private module Input implements TypeFlowInput<Location> {
    */
   pragma[nomagic]
   private predicate upcastCand(TypeFlowNode n, RefType t1, RefType t1e, RefType t2, RefType t2e) {
-    exists(TypeFlowNode next | step(n, next) or joinStep(n, next) |
+    exists(TypeFlowNode next | step(n, next) |
       n.getType() = t1 and
       next.getType() = t2 and
       t1.getErasure() = t1e and
diff --git a/java/ql/lib/semmle/code/java/dataflow/internal/DataFlowImpl1.qll b/java/ql/lib/semmle/code/java/dataflow/internal/DataFlowImpl1.qll
index 359fa71744b..17def0c431d 100644
--- a/java/ql/lib/semmle/code/java/dataflow/internal/DataFlowImpl1.qll
+++ b/java/ql/lib/semmle/code/java/dataflow/internal/DataFlowImpl1.qll
@@ -261,13 +261,17 @@ deprecated private module Config implements FullStateConfigSig {
     model = ""
   }
 
-  predicate isAdditionalFlowStep(Node node1, FlowState state1, Node node2, FlowState state2) {
+  predicate isAdditionalFlowStep(
+    Node node1, FlowState state1, Node node2, FlowState state2, string model
+  ) {
     getConfig(state1).isAdditionalFlowStep(node1, getState(state1), node2, getState(state2)) and
-    getConfig(state2) = getConfig(state1)
+    getConfig(state2) = getConfig(state1) and
+    model = ""
     or
     not singleConfiguration() and
     getConfig(state1).isAdditionalFlowStep(node1, node2) and
-    state2 = state1
+    state2 = state1 and
+    model = ""
   }
 
   predicate allowImplicitRead(Node node, ContentSet c) {
@@ -283,6 +287,8 @@ deprecated private module Config implements FullStateConfigSig {
   FlowFeature getAFeature() { result = any(Configuration config).getAFeature() }
 
   predicate includeHiddenNodes() { any(Configuration config).includeHiddenNodes() }
+
+  predicate observeDiffInformedIncrementalMode() { none() }
 }
 
 deprecated private import Impl<Config> as I
diff --git a/java/ql/lib/semmle/code/java/dataflow/internal/DataFlowImpl2.qll b/java/ql/lib/semmle/code/java/dataflow/internal/DataFlowImpl2.qll
index 359fa71744b..17def0c431d 100644
--- a/java/ql/lib/semmle/code/java/dataflow/internal/DataFlowImpl2.qll
+++ b/java/ql/lib/semmle/code/java/dataflow/internal/DataFlowImpl2.qll
@@ -261,13 +261,17 @@ deprecated private module Config implements FullStateConfigSig {
     model = ""
   }
 
-  predicate isAdditionalFlowStep(Node node1, FlowState state1, Node node2, FlowState state2) {
+  predicate isAdditionalFlowStep(
+    Node node1, FlowState state1, Node node2, FlowState state2, string model
+  ) {
     getConfig(state1).isAdditionalFlowStep(node1, getState(state1), node2, getState(state2)) and
-    getConfig(state2) = getConfig(state1)
+    getConfig(state2) = getConfig(state1) and
+    model = ""
     or
     not singleConfiguration() and
     getConfig(state1).isAdditionalFlowStep(node1, node2) and
-    state2 = state1
+    state2 = state1 and
+    model = ""
   }
 
   predicate allowImplicitRead(Node node, ContentSet c) {
@@ -283,6 +287,8 @@ deprecated private module Config implements FullStateConfigSig {
   FlowFeature getAFeature() { result = any(Configuration config).getAFeature() }
 
   predicate includeHiddenNodes() { any(Configuration config).includeHiddenNodes() }
+
+  predicate observeDiffInformedIncrementalMode() { none() }
 }
 
 deprecated private import Impl<Config> as I
diff --git a/java/ql/lib/semmle/code/java/dataflow/internal/DataFlowImpl3.qll b/java/ql/lib/semmle/code/java/dataflow/internal/DataFlowImpl3.qll
index 359fa71744b..17def0c431d 100644
--- a/java/ql/lib/semmle/code/java/dataflow/internal/DataFlowImpl3.qll
+++ b/java/ql/lib/semmle/code/java/dataflow/internal/DataFlowImpl3.qll
@@ -261,13 +261,17 @@ deprecated private module Config implements FullStateConfigSig {
     model = ""
   }
 
-  predicate isAdditionalFlowStep(Node node1, FlowState state1, Node node2, FlowState state2) {
+  predicate isAdditionalFlowStep(
+    Node node1, FlowState state1, Node node2, FlowState state2, string model
+  ) {
     getConfig(state1).isAdditionalFlowStep(node1, getState(state1), node2, getState(state2)) and
-    getConfig(state2) = getConfig(state1)
+    getConfig(state2) = getConfig(state1) and
+    model = ""
     or
     not singleConfiguration() and
     getConfig(state1).isAdditionalFlowStep(node1, node2) and
-    state2 = state1
+    state2 = state1 and
+    model = ""
   }
 
   predicate allowImplicitRead(Node node, ContentSet c) {
@@ -283,6 +287,8 @@ deprecated private module Config implements FullStateConfigSig {
   FlowFeature getAFeature() { result = any(Configuration config).getAFeature() }
 
   predicate includeHiddenNodes() { any(Configuration config).includeHiddenNodes() }
+
+  predicate observeDiffInformedIncrementalMode() { none() }
 }
 
 deprecated private import Impl<Config> as I
diff --git a/java/ql/lib/semmle/code/java/dataflow/internal/DataFlowImpl4.qll b/java/ql/lib/semmle/code/java/dataflow/internal/DataFlowImpl4.qll
index 359fa71744b..17def0c431d 100644
--- a/java/ql/lib/semmle/code/java/dataflow/internal/DataFlowImpl4.qll
+++ b/java/ql/lib/semmle/code/java/dataflow/internal/DataFlowImpl4.qll
@@ -261,13 +261,17 @@ deprecated private module Config implements FullStateConfigSig {
     model = ""
   }
 
-  predicate isAdditionalFlowStep(Node node1, FlowState state1, Node node2, FlowState state2) {
+  predicate isAdditionalFlowStep(
+    Node node1, FlowState state1, Node node2, FlowState state2, string model
+  ) {
     getConfig(state1).isAdditionalFlowStep(node1, getState(state1), node2, getState(state2)) and
-    getConfig(state2) = getConfig(state1)
+    getConfig(state2) = getConfig(state1) and
+    model = ""
     or
     not singleConfiguration() and
     getConfig(state1).isAdditionalFlowStep(node1, node2) and
-    state2 = state1
+    state2 = state1 and
+    model = ""
   }
 
   predicate allowImplicitRead(Node node, ContentSet c) {
@@ -283,6 +287,8 @@ deprecated private module Config implements FullStateConfigSig {
   FlowFeature getAFeature() { result = any(Configuration config).getAFeature() }
 
   predicate includeHiddenNodes() { any(Configuration config).includeHiddenNodes() }
+
+  predicate observeDiffInformedIncrementalMode() { none() }
 }
 
 deprecated private import Impl<Config> as I
diff --git a/java/ql/lib/semmle/code/java/dataflow/internal/DataFlowImpl5.qll b/java/ql/lib/semmle/code/java/dataflow/internal/DataFlowImpl5.qll
index 359fa71744b..17def0c431d 100644
--- a/java/ql/lib/semmle/code/java/dataflow/internal/DataFlowImpl5.qll
+++ b/java/ql/lib/semmle/code/java/dataflow/internal/DataFlowImpl5.qll
@@ -261,13 +261,17 @@ deprecated private module Config implements FullStateConfigSig {
     model = ""
   }
 
-  predicate isAdditionalFlowStep(Node node1, FlowState state1, Node node2, FlowState state2) {
+  predicate isAdditionalFlowStep(
+    Node node1, FlowState state1, Node node2, FlowState state2, string model
+  ) {
     getConfig(state1).isAdditionalFlowStep(node1, getState(state1), node2, getState(state2)) and
-    getConfig(state2) = getConfig(state1)
+    getConfig(state2) = getConfig(state1) and
+    model = ""
     or
     not singleConfiguration() and
     getConfig(state1).isAdditionalFlowStep(node1, node2) and
-    state2 = state1
+    state2 = state1 and
+    model = ""
   }
 
   predicate allowImplicitRead(Node node, ContentSet c) {
@@ -283,6 +287,8 @@ deprecated private module Config implements FullStateConfigSig {
   FlowFeature getAFeature() { result = any(Configuration config).getAFeature() }
 
   predicate includeHiddenNodes() { any(Configuration config).includeHiddenNodes() }
+
+  predicate observeDiffInformedIncrementalMode() { none() }
 }
 
 deprecated private import Impl<Config> as I
diff --git a/java/ql/lib/semmle/code/java/dataflow/internal/DataFlowImpl6.qll b/java/ql/lib/semmle/code/java/dataflow/internal/DataFlowImpl6.qll
index 359fa71744b..17def0c431d 100644
--- a/java/ql/lib/semmle/code/java/dataflow/internal/DataFlowImpl6.qll
+++ b/java/ql/lib/semmle/code/java/dataflow/internal/DataFlowImpl6.qll
@@ -261,13 +261,17 @@ deprecated private module Config implements FullStateConfigSig {
     model = ""
   }
 
-  predicate isAdditionalFlowStep(Node node1, FlowState state1, Node node2, FlowState state2) {
+  predicate isAdditionalFlowStep(
+    Node node1, FlowState state1, Node node2, FlowState state2, string model
+  ) {
     getConfig(state1).isAdditionalFlowStep(node1, getState(state1), node2, getState(state2)) and
-    getConfig(state2) = getConfig(state1)
+    getConfig(state2) = getConfig(state1) and
+    model = ""
     or
     not singleConfiguration() and
     getConfig(state1).isAdditionalFlowStep(node1, node2) and
-    state2 = state1
+    state2 = state1 and
+    model = ""
   }
 
   predicate allowImplicitRead(Node node, ContentSet c) {
@@ -283,6 +287,8 @@ deprecated private module Config implements FullStateConfigSig {
   FlowFeature getAFeature() { result = any(Configuration config).getAFeature() }
 
   predicate includeHiddenNodes() { any(Configuration config).includeHiddenNodes() }
+
+  predicate observeDiffInformedIncrementalMode() { none() }
 }
 
 deprecated private import Impl<Config> as I
diff --git a/java/ql/lib/semmle/code/java/dataflow/internal/DataFlowPrivate.qll b/java/ql/lib/semmle/code/java/dataflow/internal/DataFlowPrivate.qll
index 784d248d8dc..589d75c3635 100644
--- a/java/ql/lib/semmle/code/java/dataflow/internal/DataFlowPrivate.qll
+++ b/java/ql/lib/semmle/code/java/dataflow/internal/DataFlowPrivate.qll
@@ -760,7 +760,7 @@ ContentApprox getContentApprox(Content c) {
 /**
  * Holds if the the content `c` is a container.
  */
-predicate containerContent(Content c) {
+predicate containerContent(ContentSet c) {
   c instanceof ArrayContent or
   c instanceof CollectionContent or
   c instanceof MapKeyContent or
diff --git a/java/ql/lib/semmle/code/java/dataflow/internal/FlowSummaryImpl.qll b/java/ql/lib/semmle/code/java/dataflow/internal/FlowSummaryImpl.qll
index feab4b3cec7..b4a2bad48f3 100644
--- a/java/ql/lib/semmle/code/java/dataflow/internal/FlowSummaryImpl.qll
+++ b/java/ql/lib/semmle/code/java/dataflow/internal/FlowSummaryImpl.qll
@@ -34,7 +34,7 @@ module Input implements InputSig<Location, DataFlowImplSpecific::JavaDataFlow> {
   ) {
     exists(string namespace, string type, string name, string signature |
       neutralModel(namespace, type, name, signature, kind, provenance) and
-      c.asCallable() = interpretElement(namespace, type, false, name, signature, "", isExact)
+      c.asCallable() = interpretElement(namespace, type, true, name, signature, "", isExact)
     )
   }
 
diff --git a/java/ql/lib/semmle/code/java/dataflow/internal/ModelExclusions.qll b/java/ql/lib/semmle/code/java/dataflow/internal/ModelExclusions.qll
index 12569b4f6c2..cc95a2b5c1f 100644
--- a/java/ql/lib/semmle/code/java/dataflow/internal/ModelExclusions.qll
+++ b/java/ql/lib/semmle/code/java/dataflow/internal/ModelExclusions.qll
@@ -78,6 +78,7 @@ predicate isUninterestingForModels(Callable c) {
   isInTestFile(c.getCompilationUnit().getFile()) or
   isInternal(c.getCompilationUnit()) or
   c instanceof MainMethod or
+  c instanceof CloneMethod or
   c instanceof ToStringMethod or
   c instanceof LambdaFlowMethod or
   c instanceof StaticInitializer or
diff --git a/java/ql/lib/semmle/code/java/dataflow/internal/TaintTrackingUtil.qll b/java/ql/lib/semmle/code/java/dataflow/internal/TaintTrackingUtil.qll
index 47db4f825c4..ad770b75a3e 100644
--- a/java/ql/lib/semmle/code/java/dataflow/internal/TaintTrackingUtil.qll
+++ b/java/ql/lib/semmle/code/java/dataflow/internal/TaintTrackingUtil.qll
@@ -640,7 +640,7 @@ private MethodCall callReturningSameType(Expr ref) {
 }
 
 private SrcRefType entrypointType() {
-  exists(ThreatModelFlowSource s, RefType t |
+  exists(ActiveThreatModelSource s, RefType t |
     s instanceof DataFlow::ExplicitParameterNode and
     t = pragma[only_bind_out](s).getType() and
     not t instanceof TypeObject and
@@ -658,3 +658,53 @@ private predicate entrypointFieldStep(DataFlow::Node src, DataFlow::Node sink) {
   ) and
   src.getType().(RefType).getSourceDeclaration() = entrypointType()
 }
+
+import SpeculativeTaintFlow
+
+private module SpeculativeTaintFlow {
+  private import semmle.code.java.dataflow.ExternalFlow as ExternalFlow
+  private import semmle.code.java.dataflow.internal.DataFlowNodes
+  private import semmle.code.java.dataflow.internal.FlowSummaryImpl as Impl
+  private import semmle.code.java.dispatch.VirtualDispatch
+  private import semmle.code.java.security.Sanitizers
+
+  private predicate hasTarget(Call call) {
+    exists(Impl::Public::SummarizedCallable sc | sc.getACall() = call)
+    or
+    exists(Impl::Public::NeutralSummaryCallable nc | nc.getACall() = call)
+    or
+    call.getCallee().getSourceDeclaration() instanceof ExternalFlow::SinkCallable
+    or
+    exists(FlowSummaryImpl::Public::NeutralSinkCallable sc | sc.getACall() = call)
+    or
+    exists(viableCallable(call))
+    or
+    call.getQualifier().getType() instanceof Array
+    or
+    call.getCallee().getSourceDeclaration() instanceof CloneMethod
+    or
+    call.getCallee()
+        .getSourceDeclaration()
+        .getDeclaringType()
+        .getPackage()
+        .hasName("java.util.function")
+  }
+
+  /**
+   * Holds if the additional step from `src` to `sink` should be considered in
+   * speculative taint flow exploration.
+   */
+  predicate speculativeTaintStep(DataFlow::Node src, DataFlow::Node sink) {
+    exists(DataFlowCall call, Call srcCall, int argpos |
+      not hasTarget(srcCall) and
+      call.asCall() = srcCall and
+      src.(ArgumentNode).argumentOf(call, argpos) and
+      not src instanceof SimpleTypeSanitizer
+    |
+      argpos != -1 and
+      sink.(DataFlow::PostUpdateNode).getPreUpdateNode() = Public::getInstanceArgument(srcCall)
+      or
+      sink.(OutNode).getCall() = call
+    )
+  }
+}
diff --git a/java/ql/lib/semmle/code/java/frameworks/android/Layout.qll b/java/ql/lib/semmle/code/java/frameworks/android/Layout.qll
index d7f0b0e2e6c..ee430b62d57 100644
--- a/java/ql/lib/semmle/code/java/frameworks/android/Layout.qll
+++ b/java/ql/lib/semmle/code/java/frameworks/android/Layout.qll
@@ -6,7 +6,7 @@ private import semmle.code.java.dataflow.DataFlow
 
 /** An Android Layout XML file. */
 class AndroidLayoutXmlFile extends XmlFile {
-  AndroidLayoutXmlFile() { this.getRelativePath().matches("%/res/layout/%.xml") }
+  AndroidLayoutXmlFile() { this.getRelativePath().regexpMatch("(.*/)?res/layout/.*\\.xml") }
 }
 
 /** A component declared in an Android layout file. */
diff --git a/java/ql/lib/semmle/code/java/security/AndroidIntentRedirectionQuery.qll b/java/ql/lib/semmle/code/java/security/AndroidIntentRedirectionQuery.qll
index b179a4f92e0..109300458d2 100644
--- a/java/ql/lib/semmle/code/java/security/AndroidIntentRedirectionQuery.qll
+++ b/java/ql/lib/semmle/code/java/security/AndroidIntentRedirectionQuery.qll
@@ -9,7 +9,7 @@ import semmle.code.java.security.AndroidIntentRedirection
 
 /** A taint tracking configuration for tainted Intents being used to start Android components. */
 module IntentRedirectionConfig implements DataFlow::ConfigSig {
-  predicate isSource(DataFlow::Node source) { source instanceof ThreatModelFlowSource }
+  predicate isSource(DataFlow::Node source) { source instanceof ActiveThreatModelSource }
 
   predicate isSink(DataFlow::Node sink) { sink instanceof IntentRedirectionSink }
 
@@ -18,6 +18,8 @@ module IntentRedirectionConfig implements DataFlow::ConfigSig {
   predicate isAdditionalFlowStep(DataFlow::Node node1, DataFlow::Node node2) {
     any(IntentRedirectionAdditionalTaintStep c).step(node1, node2)
   }
+
+  predicate observeDiffInformedIncrementalMode() { any() }
 }
 
 /** Tracks the flow of tainted Intents being used to start Android components. */
@@ -36,7 +38,7 @@ private class OriginalIntentSanitizer extends IntentRedirectionSanitizer {
  * flowing directly to sinks that start Android components.
  */
 private module SameIntentBeingRelaunchedConfig implements DataFlow::ConfigSig {
-  predicate isSource(DataFlow::Node source) { source instanceof ThreatModelFlowSource }
+  predicate isSource(DataFlow::Node source) { source instanceof ActiveThreatModelSource }
 
   predicate isSink(DataFlow::Node sink) { sink instanceof IntentRedirectionSink }
 
@@ -72,7 +74,7 @@ private class IntentWithTaintedComponent extends DataFlow::Node {
  * A taint tracking configuration for tainted data flowing to an `Intent`'s component.
  */
 private module TaintedIntentComponentConfig implements DataFlow::ConfigSig {
-  predicate isSource(DataFlow::Node source) { source instanceof ThreatModelFlowSource }
+  predicate isSource(DataFlow::Node source) { source instanceof ActiveThreatModelSource }
 
   predicate isSink(DataFlow::Node sink) {
     any(IntentSetComponent setComponent).getSink() = sink.asExpr()
diff --git a/java/ql/lib/semmle/code/java/security/ArbitraryApkInstallation.qll b/java/ql/lib/semmle/code/java/security/ArbitraryApkInstallation.qll
index d7c5fe94f28..0402aca6987 100644
--- a/java/ql/lib/semmle/code/java/security/ArbitraryApkInstallation.qll
+++ b/java/ql/lib/semmle/code/java/security/ArbitraryApkInstallation.qll
@@ -75,7 +75,7 @@ class ExternalApkSource extends ApiSourceNode {
     sourceNode(this, "android-external-storage-dir") or
     this.asExpr().(MethodCall).getMethod() instanceof UriConstructorMethod or
     this.asExpr().(StringLiteral).getValue().matches("file://%") or
-    this instanceof ThreatModelFlowSource
+    this instanceof ActiveThreatModelSource
   }
 }
 
diff --git a/java/ql/lib/semmle/code/java/security/ArithmeticTaintedQuery.qll b/java/ql/lib/semmle/code/java/security/ArithmeticTaintedQuery.qll
index 7d58de46a67..51d6c284e1c 100644
--- a/java/ql/lib/semmle/code/java/security/ArithmeticTaintedQuery.qll
+++ b/java/ql/lib/semmle/code/java/security/ArithmeticTaintedQuery.qll
@@ -6,7 +6,7 @@ private import semmle.code.java.security.ArithmeticCommon
 
 /** A taint-tracking configuration to reason about overflow from unvalidated input. */
 module ArithmeticOverflowConfig implements DataFlow::ConfigSig {
-  predicate isSource(DataFlow::Node source) { source instanceof ThreatModelFlowSource }
+  predicate isSource(DataFlow::Node source) { source instanceof ActiveThreatModelSource }
 
   predicate isSink(DataFlow::Node sink) { overflowSink(_, sink.asExpr()) }
 
@@ -22,7 +22,7 @@ deprecated module RemoteUserInputOverflowConfig = ArithmeticOverflowConfig;
 
 /** A taint-tracking configuration to reason about underflow from unvalidated input. */
 module ArithmeticUnderflowConfig implements DataFlow::ConfigSig {
-  predicate isSource(DataFlow::Node source) { source instanceof ThreatModelFlowSource }
+  predicate isSource(DataFlow::Node source) { source instanceof ActiveThreatModelSource }
 
   predicate isSink(DataFlow::Node sink) { underflowSink(_, sink.asExpr()) }
 
diff --git a/java/ql/lib/semmle/code/java/security/CommandLineQuery.qll b/java/ql/lib/semmle/code/java/security/CommandLineQuery.qll
index 692bdfc1a70..af5476f8b3d 100644
--- a/java/ql/lib/semmle/code/java/security/CommandLineQuery.qll
+++ b/java/ql/lib/semmle/code/java/security/CommandLineQuery.qll
@@ -49,7 +49,7 @@ private class DefaultCommandInjectionSanitizer extends CommandInjectionSanitizer
  * A taint-tracking configuration for unvalidated user input that is used to run an external process.
  */
 module InputToArgumentToExecFlowConfig implements DataFlow::ConfigSig {
-  predicate isSource(DataFlow::Node src) { src instanceof ThreatModelFlowSource }
+  predicate isSource(DataFlow::Node src) { src instanceof ActiveThreatModelSource }
 
   predicate isSink(DataFlow::Node sink) { sink instanceof CommandInjectionSink }
 
diff --git a/java/ql/lib/semmle/code/java/security/ConditionalBypassQuery.qll b/java/ql/lib/semmle/code/java/security/ConditionalBypassQuery.qll
index 96d3c5a528c..03ba8d46197 100644
--- a/java/ql/lib/semmle/code/java/security/ConditionalBypassQuery.qll
+++ b/java/ql/lib/semmle/code/java/security/ConditionalBypassQuery.qll
@@ -40,7 +40,7 @@ private predicate endsWithStep(DataFlow::Node node1, DataFlow::Node node2) {
  * A taint tracking configuration for untrusted data flowing to sensitive conditions.
  */
 module ConditionalBypassFlowConfig implements DataFlow::ConfigSig {
-  predicate isSource(DataFlow::Node source) { source instanceof ThreatModelFlowSource }
+  predicate isSource(DataFlow::Node source) { source instanceof ActiveThreatModelSource }
 
   predicate isSink(DataFlow::Node sink) { conditionControlsMethod(_, sink.asExpr()) }
 
diff --git a/java/ql/lib/semmle/code/java/security/ExternalAPIs.qll b/java/ql/lib/semmle/code/java/security/ExternalAPIs.qll
index 6838555179a..360493e2635 100644
--- a/java/ql/lib/semmle/code/java/security/ExternalAPIs.qll
+++ b/java/ql/lib/semmle/code/java/security/ExternalAPIs.qll
@@ -93,10 +93,10 @@ class ExternalApiDataNode extends DataFlow::Node {
 }
 
 /**
- * Taint tracking configuration for flow from `ThreatModelFlowSource`s to `ExternalApiDataNode`s.
+ * Taint tracking configuration for flow from `ActiveThreatModelSource`s to `ExternalApiDataNode`s.
  */
 module UntrustedDataToExternalApiConfig implements DataFlow::ConfigSig {
-  predicate isSource(DataFlow::Node source) { source instanceof ThreatModelFlowSource }
+  predicate isSource(DataFlow::Node source) { source instanceof ActiveThreatModelSource }
 
   predicate isSink(DataFlow::Node sink) { sink instanceof ExternalApiDataNode }
 }
diff --git a/java/ql/lib/semmle/code/java/security/ExternallyControlledFormatStringQuery.qll b/java/ql/lib/semmle/code/java/security/ExternallyControlledFormatStringQuery.qll
index 606e31a07cb..da440e0cd2c 100644
--- a/java/ql/lib/semmle/code/java/security/ExternallyControlledFormatStringQuery.qll
+++ b/java/ql/lib/semmle/code/java/security/ExternallyControlledFormatStringQuery.qll
@@ -16,13 +16,15 @@ private class StringFormatSink extends ApiSinkNode {
  * A taint-tracking configuration for externally controlled format string vulnerabilities.
  */
 module ExternallyControlledFormatStringConfig implements DataFlow::ConfigSig {
-  predicate isSource(DataFlow::Node source) { source instanceof ThreatModelFlowSource }
+  predicate isSource(DataFlow::Node source) { source instanceof ActiveThreatModelSource }
 
   predicate isSink(DataFlow::Node sink) { sink instanceof StringFormatSink }
 
   predicate isBarrier(DataFlow::Node node) {
     node.getType() instanceof NumericType or node.getType() instanceof BooleanType
   }
+
+  predicate observeDiffInformedIncrementalMode() { any() }
 }
 
 /**
diff --git a/java/ql/lib/semmle/code/java/security/FragmentInjectionQuery.qll b/java/ql/lib/semmle/code/java/security/FragmentInjectionQuery.qll
index f625807470d..40636ffd8c2 100644
--- a/java/ql/lib/semmle/code/java/security/FragmentInjectionQuery.qll
+++ b/java/ql/lib/semmle/code/java/security/FragmentInjectionQuery.qll
@@ -10,13 +10,15 @@ import semmle.code.java.security.FragmentInjection
  * that is used to create Android fragments dynamically.
  */
 module FragmentInjectionTaintConfig implements DataFlow::ConfigSig {
-  predicate isSource(DataFlow::Node source) { source instanceof ThreatModelFlowSource }
+  predicate isSource(DataFlow::Node source) { source instanceof ActiveThreatModelSource }
 
   predicate isSink(DataFlow::Node sink) { sink instanceof FragmentInjectionSink }
 
   predicate isAdditionalFlowStep(DataFlow::Node n1, DataFlow::Node n2) {
     any(FragmentInjectionAdditionalTaintStep c).step(n1, n2)
   }
+
+  predicate observeDiffInformedIncrementalMode() { any() }
 }
 
 /**
diff --git a/java/ql/lib/semmle/code/java/security/GroovyInjectionQuery.qll b/java/ql/lib/semmle/code/java/security/GroovyInjectionQuery.qll
index 3af836cac97..b497873b9bb 100644
--- a/java/ql/lib/semmle/code/java/security/GroovyInjectionQuery.qll
+++ b/java/ql/lib/semmle/code/java/security/GroovyInjectionQuery.qll
@@ -10,13 +10,15 @@ import semmle.code.java.security.GroovyInjection
  * that is used to evaluate a Groovy expression.
  */
 module GroovyInjectionConfig implements DataFlow::ConfigSig {
-  predicate isSource(DataFlow::Node source) { source instanceof ThreatModelFlowSource }
+  predicate isSource(DataFlow::Node source) { source instanceof ActiveThreatModelSource }
 
   predicate isSink(DataFlow::Node sink) { sink instanceof GroovyInjectionSink }
 
   predicate isAdditionalFlowStep(DataFlow::Node fromNode, DataFlow::Node toNode) {
     any(GroovyInjectionAdditionalTaintStep c).step(fromNode, toNode)
   }
+
+  predicate observeDiffInformedIncrementalMode() { any() }
 }
 
 /**
diff --git a/java/ql/lib/semmle/code/java/security/ImplicitPendingIntentsQuery.qll b/java/ql/lib/semmle/code/java/security/ImplicitPendingIntentsQuery.qll
index 0a8e0686549..a57f643d817 100644
--- a/java/ql/lib/semmle/code/java/security/ImplicitPendingIntentsQuery.qll
+++ b/java/ql/lib/semmle/code/java/security/ImplicitPendingIntentsQuery.qll
@@ -48,6 +48,8 @@ module ImplicitPendingIntentStartConfig implements DataFlow::StateConfigSig {
     node.getType().(Array).getElementType() instanceof TypeIntent and
     c instanceof DataFlow::ArrayContent
   }
+
+  predicate observeDiffInformedIncrementalMode() { any() }
 }
 
 module ImplicitPendingIntentStartFlow =
diff --git a/java/ql/lib/semmle/code/java/security/ImproperValidationOfArrayConstructionQuery.qll b/java/ql/lib/semmle/code/java/security/ImproperValidationOfArrayConstructionQuery.qll
index 8bef1ec3650..2af9396a119 100644
--- a/java/ql/lib/semmle/code/java/security/ImproperValidationOfArrayConstructionQuery.qll
+++ b/java/ql/lib/semmle/code/java/security/ImproperValidationOfArrayConstructionQuery.qll
@@ -9,7 +9,7 @@ private import semmle.code.java.dataflow.FlowSources
  * user-provided size used for array construction.
  */
 module ImproperValidationOfArrayConstructionConfig implements DataFlow::ConfigSig {
-  predicate isSource(DataFlow::Node source) { source instanceof ThreatModelFlowSource }
+  predicate isSource(DataFlow::Node source) { source instanceof ActiveThreatModelSource }
 
   predicate isSink(DataFlow::Node sink) {
     any(CheckableArrayAccess caa).canThrowOutOfBoundsDueToEmptyArray(sink.asExpr(), _)
diff --git a/java/ql/lib/semmle/code/java/security/ImproperValidationOfArrayIndexQuery.qll b/java/ql/lib/semmle/code/java/security/ImproperValidationOfArrayIndexQuery.qll
index 440600b8a7c..6d11962f2f4 100644
--- a/java/ql/lib/semmle/code/java/security/ImproperValidationOfArrayIndexQuery.qll
+++ b/java/ql/lib/semmle/code/java/security/ImproperValidationOfArrayIndexQuery.qll
@@ -9,7 +9,7 @@ private import semmle.code.java.dataflow.FlowSources
  * of user-provided array index.
  */
 module ImproperValidationOfArrayIndexConfig implements DataFlow::ConfigSig {
-  predicate isSource(DataFlow::Node source) { source instanceof ThreatModelFlowSource }
+  predicate isSource(DataFlow::Node source) { source instanceof ActiveThreatModelSource }
 
   predicate isSink(DataFlow::Node sink) {
     any(CheckableArrayAccess caa).canThrowOutOfBounds(sink.asExpr())
diff --git a/java/ql/lib/semmle/code/java/security/InsecureBeanValidationQuery.qll b/java/ql/lib/semmle/code/java/security/InsecureBeanValidationQuery.qll
index 1ad0677ca61..e1c840ce264 100644
--- a/java/ql/lib/semmle/code/java/security/InsecureBeanValidationQuery.qll
+++ b/java/ql/lib/semmle/code/java/security/InsecureBeanValidationQuery.qll
@@ -46,9 +46,11 @@ class SetMessageInterpolatorCall extends MethodCall {
  * to the argument of a method that builds constraint error messages.
  */
 module BeanValidationConfig implements DataFlow::ConfigSig {
-  predicate isSource(DataFlow::Node source) { source instanceof ThreatModelFlowSource }
+  predicate isSource(DataFlow::Node source) { source instanceof ActiveThreatModelSource }
 
   predicate isSink(DataFlow::Node sink) { sink instanceof BeanValidationSink }
+
+  predicate observeDiffInformedIncrementalMode() { any() }
 }
 
 /** Tracks flow from user input to the argument of a method that builds constraint error messages. */
diff --git a/java/ql/lib/semmle/code/java/security/InsecureLdapAuthQuery.qll b/java/ql/lib/semmle/code/java/security/InsecureLdapAuthQuery.qll
index 498a9401071..94d80b9b37b 100644
--- a/java/ql/lib/semmle/code/java/security/InsecureLdapAuthQuery.qll
+++ b/java/ql/lib/semmle/code/java/security/InsecureLdapAuthQuery.qll
@@ -22,6 +22,8 @@ module InsecureLdapUrlConfig implements DataFlow::ConfigSig {
       succ.asExpr() = ma.getQualifier()
     )
   }
+
+  predicate observeDiffInformedIncrementalMode() { any() }
 }
 
 module InsecureLdapUrlFlow = TaintTracking::Global<InsecureLdapUrlConfig>;
diff --git a/java/ql/lib/semmle/code/java/security/InsecureRandomnessQuery.qll b/java/ql/lib/semmle/code/java/security/InsecureRandomnessQuery.qll
index 423046b6746..77da25d3586 100644
--- a/java/ql/lib/semmle/code/java/security/InsecureRandomnessQuery.qll
+++ b/java/ql/lib/semmle/code/java/security/InsecureRandomnessQuery.qll
@@ -96,6 +96,8 @@ module InsecureRandomnessConfig implements DataFlow::ConfigSig {
       n2.asExpr() = c
     )
   }
+
+  predicate observeDiffInformedIncrementalMode() { any() }
 }
 
 /**
diff --git a/java/ql/lib/semmle/code/java/security/InsufficientKeySizeQuery.qll b/java/ql/lib/semmle/code/java/security/InsufficientKeySizeQuery.qll
index e08cd50cdb3..876b2efd840 100644
--- a/java/ql/lib/semmle/code/java/security/InsufficientKeySizeQuery.qll
+++ b/java/ql/lib/semmle/code/java/security/InsufficientKeySizeQuery.qll
@@ -16,6 +16,8 @@ module KeySizeConfig implements DataFlow::StateConfigSig {
   predicate isSink(DataFlow::Node sink, KeySizeState state) {
     sink.(InsufficientKeySizeSink).hasState(state)
   }
+
+  predicate observeDiffInformedIncrementalMode() { any() }
 }
 
 /** Tracks key sizes used in cryptographic algorithms. */
diff --git a/java/ql/lib/semmle/code/java/security/IntentUriPermissionManipulationQuery.qll b/java/ql/lib/semmle/code/java/security/IntentUriPermissionManipulationQuery.qll
index 740ce24bf62..5ac8024d81f 100644
--- a/java/ql/lib/semmle/code/java/security/IntentUriPermissionManipulationQuery.qll
+++ b/java/ql/lib/semmle/code/java/security/IntentUriPermissionManipulationQuery.qll
@@ -12,7 +12,7 @@ private import IntentUriPermissionManipulation
  * A taint tracking configuration for user-provided Intents being returned to third party apps.
  */
 module IntentUriPermissionManipulationConfig implements DataFlow::ConfigSig {
-  predicate isSource(DataFlow::Node source) { source instanceof ThreatModelFlowSource }
+  predicate isSource(DataFlow::Node source) { source instanceof ActiveThreatModelSource }
 
   predicate isSink(DataFlow::Node sink) { sink instanceof IntentUriPermissionManipulationSink }
 
@@ -23,6 +23,8 @@ module IntentUriPermissionManipulationConfig implements DataFlow::ConfigSig {
   predicate isAdditionalFlowStep(DataFlow::Node node1, DataFlow::Node node2) {
     any(IntentUriPermissionManipulationAdditionalTaintStep c).step(node1, node2)
   }
+
+  predicate observeDiffInformedIncrementalMode() { any() }
 }
 
 /**
diff --git a/java/ql/lib/semmle/code/java/security/JexlInjectionQuery.qll b/java/ql/lib/semmle/code/java/security/JexlInjectionQuery.qll
index de49560e779..4ad1dd3ba31 100644
--- a/java/ql/lib/semmle/code/java/security/JexlInjectionQuery.qll
+++ b/java/ql/lib/semmle/code/java/security/JexlInjectionQuery.qll
@@ -44,13 +44,15 @@ private class DefaultJexlInjectionAdditionalTaintStep extends JexlInjectionAddit
  * It supports both JEXL 2 and 3.
  */
 module JexlInjectionConfig implements DataFlow::ConfigSig {
-  predicate isSource(DataFlow::Node source) { source instanceof ThreatModelFlowSource }
+  predicate isSource(DataFlow::Node source) { source instanceof ActiveThreatModelSource }
 
   predicate isSink(DataFlow::Node sink) { sink instanceof JexlEvaluationSink }
 
   predicate isAdditionalFlowStep(DataFlow::Node node1, DataFlow::Node node2) {
     any(JexlInjectionAdditionalTaintStep c).step(node1, node2)
   }
+
+  predicate observeDiffInformedIncrementalMode() { any() }
 }
 
 /**
diff --git a/java/ql/lib/semmle/code/java/security/JndiInjectionQuery.qll b/java/ql/lib/semmle/code/java/security/JndiInjectionQuery.qll
index 3c1f4b8e68e..f50787fef02 100644
--- a/java/ql/lib/semmle/code/java/security/JndiInjectionQuery.qll
+++ b/java/ql/lib/semmle/code/java/security/JndiInjectionQuery.qll
@@ -11,7 +11,7 @@ private import semmle.code.java.security.Sanitizers
  * A taint-tracking configuration for unvalidated user input that is used in JNDI lookup.
  */
 module JndiInjectionFlowConfig implements DataFlow::ConfigSig {
-  predicate isSource(DataFlow::Node source) { source instanceof ThreatModelFlowSource }
+  predicate isSource(DataFlow::Node source) { source instanceof ActiveThreatModelSource }
 
   predicate isSink(DataFlow::Node sink) { sink instanceof JndiInjectionSink }
 
@@ -23,6 +23,8 @@ module JndiInjectionFlowConfig implements DataFlow::ConfigSig {
   predicate isAdditionalFlowStep(DataFlow::Node node1, DataFlow::Node node2) {
     any(JndiInjectionAdditionalTaintStep c).step(node1, node2)
   }
+
+  predicate observeDiffInformedIncrementalMode() { any() }
 }
 
 /** Tracks flow of unvalidated user input that is used in JNDI lookup */
diff --git a/java/ql/lib/semmle/code/java/security/LdapInjectionQuery.qll b/java/ql/lib/semmle/code/java/security/LdapInjectionQuery.qll
index 5c055c00516..ef27fa3cd16 100644
--- a/java/ql/lib/semmle/code/java/security/LdapInjectionQuery.qll
+++ b/java/ql/lib/semmle/code/java/security/LdapInjectionQuery.qll
@@ -8,7 +8,7 @@ import semmle.code.java.security.LdapInjection
  * A taint-tracking configuration for unvalidated user input that is used to construct LDAP queries.
  */
 module LdapInjectionFlowConfig implements DataFlow::ConfigSig {
-  predicate isSource(DataFlow::Node source) { source instanceof ThreatModelFlowSource }
+  predicate isSource(DataFlow::Node source) { source instanceof ActiveThreatModelSource }
 
   predicate isSink(DataFlow::Node sink) { sink instanceof LdapInjectionSink }
 
@@ -17,6 +17,8 @@ module LdapInjectionFlowConfig implements DataFlow::ConfigSig {
   predicate isAdditionalFlowStep(DataFlow::Node pred, DataFlow::Node succ) {
     any(LdapInjectionAdditionalTaintStep a).step(pred, succ)
   }
+
+  predicate observeDiffInformedIncrementalMode() { any() }
 }
 
 /** Tracks flow from remote sources to LDAP injection vulnerabilities. */
diff --git a/java/ql/lib/semmle/code/java/security/LogInjectionQuery.qll b/java/ql/lib/semmle/code/java/security/LogInjectionQuery.qll
index cebc807cc47..64d59993b3d 100644
--- a/java/ql/lib/semmle/code/java/security/LogInjectionQuery.qll
+++ b/java/ql/lib/semmle/code/java/security/LogInjectionQuery.qll
@@ -8,7 +8,7 @@ import semmle.code.java.security.LogInjection
  * A taint-tracking configuration for tracking untrusted user input used in log entries.
  */
 module LogInjectionConfig implements DataFlow::ConfigSig {
-  predicate isSource(DataFlow::Node source) { source instanceof ThreatModelFlowSource }
+  predicate isSource(DataFlow::Node source) { source instanceof ActiveThreatModelSource }
 
   predicate isSink(DataFlow::Node sink) { sink instanceof LogInjectionSink }
 
diff --git a/java/ql/lib/semmle/code/java/security/MissingJWTSignatureCheckQuery.qll b/java/ql/lib/semmle/code/java/security/MissingJWTSignatureCheckQuery.qll
index eaa4c6320c1..4f1f614dbc4 100644
--- a/java/ql/lib/semmle/code/java/security/MissingJWTSignatureCheckQuery.qll
+++ b/java/ql/lib/semmle/code/java/security/MissingJWTSignatureCheckQuery.qll
@@ -16,6 +16,8 @@ module MissingJwtSignatureCheckConfig implements DataFlow::ConfigSig {
   predicate isAdditionalFlowStep(DataFlow::Node node1, DataFlow::Node node2) {
     any(JwtParserWithInsecureParseAdditionalFlowStep c).step(node1, node2)
   }
+
+  predicate observeDiffInformedIncrementalMode() { any() }
 }
 
 module MissingJwtSignatureCheckFlow = DataFlow::Global<MissingJwtSignatureCheckConfig>;
diff --git a/java/ql/lib/semmle/code/java/security/MvelInjectionQuery.qll b/java/ql/lib/semmle/code/java/security/MvelInjectionQuery.qll
index 4bf81804f82..d0f6e02357b 100644
--- a/java/ql/lib/semmle/code/java/security/MvelInjectionQuery.qll
+++ b/java/ql/lib/semmle/code/java/security/MvelInjectionQuery.qll
@@ -10,7 +10,7 @@ import semmle.code.java.security.MvelInjection
  * that is used to construct and evaluate a MVEL expression.
  */
 module MvelInjectionFlowConfig implements DataFlow::ConfigSig {
-  predicate isSource(DataFlow::Node source) { source instanceof ThreatModelFlowSource }
+  predicate isSource(DataFlow::Node source) { source instanceof ActiveThreatModelSource }
 
   predicate isSink(DataFlow::Node sink) { sink instanceof MvelEvaluationSink }
 
@@ -19,6 +19,8 @@ module MvelInjectionFlowConfig implements DataFlow::ConfigSig {
   predicate isAdditionalFlowStep(DataFlow::Node node1, DataFlow::Node node2) {
     any(MvelInjectionAdditionalTaintStep c).step(node1, node2)
   }
+
+  predicate observeDiffInformedIncrementalMode() { any() }
 }
 
 /** Tracks flow of unsafe user input that is used to construct and evaluate a MVEL expression. */
diff --git a/java/ql/lib/semmle/code/java/security/NumericCastTaintedQuery.qll b/java/ql/lib/semmle/code/java/security/NumericCastTaintedQuery.qll
index b6bd505c38b..7efa6e03062 100644
--- a/java/ql/lib/semmle/code/java/security/NumericCastTaintedQuery.qll
+++ b/java/ql/lib/semmle/code/java/security/NumericCastTaintedQuery.qll
@@ -85,7 +85,7 @@ private predicate smallExpr(Expr e) {
  * numeric cast.
  */
 module NumericCastFlowConfig implements DataFlow::ConfigSig {
-  predicate isSource(DataFlow::Node src) { src instanceof ThreatModelFlowSource }
+  predicate isSource(DataFlow::Node src) { src instanceof ActiveThreatModelSource }
 
   predicate isSink(DataFlow::Node sink) {
     sink.asExpr() = any(NumericNarrowingCastExpr cast).getExpr() and
@@ -102,6 +102,8 @@ module NumericCastFlowConfig implements DataFlow::ConfigSig {
   }
 
   predicate isBarrierIn(DataFlow::Node node) { isSource(node) }
+
+  predicate observeDiffInformedIncrementalMode() { any() }
 }
 
 /**
diff --git a/java/ql/lib/semmle/code/java/security/OgnlInjectionQuery.qll b/java/ql/lib/semmle/code/java/security/OgnlInjectionQuery.qll
index 3acf18c453c..d9bfad41259 100644
--- a/java/ql/lib/semmle/code/java/security/OgnlInjectionQuery.qll
+++ b/java/ql/lib/semmle/code/java/security/OgnlInjectionQuery.qll
@@ -9,7 +9,7 @@ private import semmle.code.java.security.Sanitizers
  * A taint-tracking configuration for unvalidated user input that is used in OGNL EL evaluation.
  */
 module OgnlInjectionFlowConfig implements DataFlow::ConfigSig {
-  predicate isSource(DataFlow::Node source) { source instanceof ThreatModelFlowSource }
+  predicate isSource(DataFlow::Node source) { source instanceof ActiveThreatModelSource }
 
   predicate isSink(DataFlow::Node sink) { sink instanceof OgnlInjectionSink }
 
@@ -18,6 +18,8 @@ module OgnlInjectionFlowConfig implements DataFlow::ConfigSig {
   predicate isAdditionalFlowStep(DataFlow::Node node1, DataFlow::Node node2) {
     any(OgnlInjectionAdditionalTaintStep c).step(node1, node2)
   }
+
+  predicate observeDiffInformedIncrementalMode() { any() }
 }
 
 /** Tracks flow of unvalidated user input that is used in OGNL EL evaluation. */
diff --git a/java/ql/lib/semmle/code/java/security/PartialPathTraversalQuery.qll b/java/ql/lib/semmle/code/java/security/PartialPathTraversalQuery.qll
index c4c3e6b093c..78b9098beee 100644
--- a/java/ql/lib/semmle/code/java/security/PartialPathTraversalQuery.qll
+++ b/java/ql/lib/semmle/code/java/security/PartialPathTraversalQuery.qll
@@ -12,11 +12,13 @@ import semmle.code.java.dataflow.FlowSources
  * and remains vulnerable to Partial Path Traversal.
  */
 module PartialPathTraversalFromRemoteConfig implements DataFlow::ConfigSig {
-  predicate isSource(DataFlow::Node node) { node instanceof ThreatModelFlowSource }
+  predicate isSource(DataFlow::Node node) { node instanceof ActiveThreatModelSource }
 
   predicate isSink(DataFlow::Node node) {
     any(PartialPathTraversalMethodCall ma).getQualifier() = node.asExpr()
   }
+
+  predicate observeDiffInformedIncrementalMode() { any() }
 }
 
 /** Tracks flow of unsafe user input that is used to validate against path traversal, but is insufficient and remains vulnerable to Partial Path Traversal. */
diff --git a/java/ql/lib/semmle/code/java/security/RequestForgeryConfig.qll b/java/ql/lib/semmle/code/java/security/RequestForgeryConfig.qll
index e8415cc1978..ec4bbaf8d09 100644
--- a/java/ql/lib/semmle/code/java/security/RequestForgeryConfig.qll
+++ b/java/ql/lib/semmle/code/java/security/RequestForgeryConfig.qll
@@ -12,7 +12,7 @@ import semmle.code.java.security.RequestForgery
  */
 module RequestForgeryConfig implements DataFlow::ConfigSig {
   predicate isSource(DataFlow::Node source) {
-    source instanceof ThreatModelFlowSource and
+    source instanceof ActiveThreatModelSource and
     // Exclude results of remote HTTP requests: fetching something else based on that result
     // is no worse than following a redirect returned by the remote server, and typically
     // we're requesting a resource via https which we trust to only send us to safe URLs.
@@ -28,6 +28,8 @@ module RequestForgeryConfig implements DataFlow::ConfigSig {
   predicate isBarrier(DataFlow::Node node) { node instanceof RequestForgerySanitizer }
 
   predicate isBarrierIn(DataFlow::Node node) { isSource(node) }
+
+  predicate observeDiffInformedIncrementalMode() { any() }
 }
 
 module RequestForgeryFlow = TaintTracking::Global<RequestForgeryConfig>;
diff --git a/java/ql/lib/semmle/code/java/security/ResponseSplittingQuery.qll b/java/ql/lib/semmle/code/java/security/ResponseSplittingQuery.qll
index 40e1ec1b4db..9bd96a51a68 100644
--- a/java/ql/lib/semmle/code/java/security/ResponseSplittingQuery.qll
+++ b/java/ql/lib/semmle/code/java/security/ResponseSplittingQuery.qll
@@ -10,7 +10,7 @@ import semmle.code.java.security.ResponseSplitting
  */
 module ResponseSplittingConfig implements DataFlow::ConfigSig {
   predicate isSource(DataFlow::Node source) {
-    source instanceof ThreatModelFlowSource and
+    source instanceof ActiveThreatModelSource and
     not source instanceof SafeHeaderSplittingSource
   }
 
@@ -31,6 +31,8 @@ module ResponseSplittingConfig implements DataFlow::ConfigSig {
       )
     )
   }
+
+  predicate observeDiffInformedIncrementalMode() { any() }
 }
 
 /**
diff --git a/java/ql/lib/semmle/code/java/security/RsaWithoutOaepQuery.qll b/java/ql/lib/semmle/code/java/security/RsaWithoutOaepQuery.qll
index 66e4a0537d2..8fed05f2186 100644
--- a/java/ql/lib/semmle/code/java/security/RsaWithoutOaepQuery.qll
+++ b/java/ql/lib/semmle/code/java/security/RsaWithoutOaepQuery.qll
@@ -20,6 +20,8 @@ module RsaWithoutOaepConfig implements DataFlow::ConfigSig {
   predicate isSink(DataFlow::Node sink) {
     exists(CryptoAlgoSpec cr | sink.asExpr() = cr.getAlgoSpec())
   }
+
+  predicate observeDiffInformedIncrementalMode() { any() }
 }
 
 /** Flow for finding RSA ciphers initialized without using OAEP padding. */
diff --git a/java/ql/lib/semmle/code/java/security/Sanitizers.qll b/java/ql/lib/semmle/code/java/security/Sanitizers.qll
index 8d399b8feea..6035b068bd0 100644
--- a/java/ql/lib/semmle/code/java/security/Sanitizers.qll
+++ b/java/ql/lib/semmle/code/java/security/Sanitizers.qll
@@ -13,6 +13,16 @@ class SimpleTypeSanitizer extends DataFlow::Node {
     this.getType() instanceof BoxedType or
     this.getType() instanceof NumberType or
     this.getType().(RefType).hasQualifiedName("java.util", "UUID") or
-    this.getType().(RefType).hasQualifiedName("java.util", "Date")
+    this.getType().(RefType).getASourceSupertype*().hasQualifiedName("java.util", "Date") or
+    this.getType().(RefType).hasQualifiedName("java.util", "Calendar") or
+    this.getType().(RefType).hasQualifiedName("java.util", "BitSet") or
+    this.getType()
+        .(RefType)
+        .getASourceSupertype*()
+        .hasQualifiedName("java.time.temporal", "TemporalAmount") or
+    this.getType()
+        .(RefType)
+        .getASourceSupertype*()
+        .hasQualifiedName("java.time.temporal", "TemporalAccessor")
   }
 }
diff --git a/java/ql/lib/semmle/code/java/security/SensitiveResultReceiverQuery.qll b/java/ql/lib/semmle/code/java/security/SensitiveResultReceiverQuery.qll
index e22dcef1211..f3a07480cf0 100644
--- a/java/ql/lib/semmle/code/java/security/SensitiveResultReceiverQuery.qll
+++ b/java/ql/lib/semmle/code/java/security/SensitiveResultReceiverQuery.qll
@@ -19,7 +19,7 @@ private class ResultReceiverSendCall extends MethodCall {
 }
 
 private module UntrustedResultReceiverConfig implements DataFlow::ConfigSig {
-  predicate isSource(DataFlow::Node node) { node instanceof ThreatModelFlowSource }
+  predicate isSource(DataFlow::Node node) { node instanceof ActiveThreatModelSource }
 
   predicate isSink(DataFlow::Node node) {
     node.asExpr() = any(ResultReceiverSendCall c).getReceiver()
diff --git a/java/ql/lib/semmle/code/java/security/SpelInjectionQuery.qll b/java/ql/lib/semmle/code/java/security/SpelInjectionQuery.qll
index 848aae8da30..a982b094ee4 100644
--- a/java/ql/lib/semmle/code/java/security/SpelInjectionQuery.qll
+++ b/java/ql/lib/semmle/code/java/security/SpelInjectionQuery.qll
@@ -11,13 +11,15 @@ private import semmle.code.java.security.SpelInjection
  * that is used to construct and evaluate a SpEL expression.
  */
 module SpelInjectionConfig implements DataFlow::ConfigSig {
-  predicate isSource(DataFlow::Node source) { source instanceof ThreatModelFlowSource }
+  predicate isSource(DataFlow::Node source) { source instanceof ActiveThreatModelSource }
 
   predicate isSink(DataFlow::Node sink) { sink instanceof SpelExpressionEvaluationSink }
 
   predicate isAdditionalFlowStep(DataFlow::Node node1, DataFlow::Node node2) {
     any(SpelExpressionInjectionAdditionalTaintStep c).step(node1, node2)
   }
+
+  predicate observeDiffInformedIncrementalMode() { any() }
 }
 
 /** Tracks flow of unsafe user input that is used to construct and evaluate a SpEL expression. */
diff --git a/java/ql/lib/semmle/code/java/security/SqlInjectionQuery.qll b/java/ql/lib/semmle/code/java/security/SqlInjectionQuery.qll
index c4638538a63..0aaf46cf2dd 100644
--- a/java/ql/lib/semmle/code/java/security/SqlInjectionQuery.qll
+++ b/java/ql/lib/semmle/code/java/security/SqlInjectionQuery.qll
@@ -15,7 +15,7 @@ import semmle.code.java.security.QueryInjection
  * A taint-tracking configuration for unvalidated user input that is used in SQL queries.
  */
 module QueryInjectionFlowConfig implements DataFlow::ConfigSig {
-  predicate isSource(DataFlow::Node src) { src instanceof ThreatModelFlowSource }
+  predicate isSource(DataFlow::Node src) { src instanceof ActiveThreatModelSource }
 
   predicate isSink(DataFlow::Node sink) { sink instanceof QueryInjectionSink }
 
diff --git a/java/ql/lib/semmle/code/java/security/StaticInitializationVectorQuery.qll b/java/ql/lib/semmle/code/java/security/StaticInitializationVectorQuery.qll
index 9ba848d1e0d..282133ec5c6 100644
--- a/java/ql/lib/semmle/code/java/security/StaticInitializationVectorQuery.qll
+++ b/java/ql/lib/semmle/code/java/security/StaticInitializationVectorQuery.qll
@@ -126,6 +126,8 @@ module StaticInitializationVectorConfig implements DataFlow::ConfigSig {
   predicate isSource(DataFlow::Node source) { source instanceof StaticInitializationVectorSource }
 
   predicate isSink(DataFlow::Node sink) { sink instanceof EncryptionInitializationSink }
+
+  predicate observeDiffInformedIncrementalMode() { any() }
 }
 
 /** Tracks the flow from a static initialization vector to the initialization of a cipher */
diff --git a/java/ql/lib/semmle/code/java/security/TaintedEnvironmentVariableQuery.qll b/java/ql/lib/semmle/code/java/security/TaintedEnvironmentVariableQuery.qll
index beb0921fc47..597c05b0454 100644
--- a/java/ql/lib/semmle/code/java/security/TaintedEnvironmentVariableQuery.qll
+++ b/java/ql/lib/semmle/code/java/security/TaintedEnvironmentVariableQuery.qll
@@ -26,7 +26,7 @@ abstract class ExecTaintedEnvironmentSanitizer extends DataFlow::Node { }
  * A taint-tracking configuration that tracks flow from unvalidated data to an environment variable for a subprocess.
  */
 module ExecTaintedEnvironmentConfig implements DataFlow::ConfigSig {
-  predicate isSource(DataFlow::Node source) { source instanceof ThreatModelFlowSource }
+  predicate isSource(DataFlow::Node source) { source instanceof ActiveThreatModelSource }
 
   predicate isBarrier(DataFlow::Node barrier) { barrier instanceof ExecTaintedEnvironmentSanitizer }
 
diff --git a/java/ql/lib/semmle/code/java/security/TaintedPathQuery.qll b/java/ql/lib/semmle/code/java/security/TaintedPathQuery.qll
index c396b48a7b8..6726bcc3508 100644
--- a/java/ql/lib/semmle/code/java/security/TaintedPathQuery.qll
+++ b/java/ql/lib/semmle/code/java/security/TaintedPathQuery.qll
@@ -60,7 +60,7 @@ private class TaintPreservingUriCtorParam extends Parameter {
  * A taint-tracking configuration for tracking flow from remote sources to the creation of a path.
  */
 module TaintedPathConfig implements DataFlow::ConfigSig {
-  predicate isSource(DataFlow::Node source) { source instanceof ThreatModelFlowSource }
+  predicate isSource(DataFlow::Node source) { source instanceof ActiveThreatModelSource }
 
   predicate isSink(DataFlow::Node sink) { sink instanceof TaintedPathSink }
 
@@ -72,6 +72,8 @@ module TaintedPathConfig implements DataFlow::ConfigSig {
   predicate isAdditionalFlowStep(DataFlow::Node n1, DataFlow::Node n2) {
     any(TaintedPathAdditionalTaintStep s).step(n1, n2)
   }
+
+  predicate observeDiffInformedIncrementalMode() { any() }
 }
 
 /** Tracks flow from remote sources to the creation of a path. */
diff --git a/java/ql/lib/semmle/code/java/security/TaintedPermissionsCheckQuery.qll b/java/ql/lib/semmle/code/java/security/TaintedPermissionsCheckQuery.qll
index 132e8a3fadf..eb5b589a98b 100644
--- a/java/ql/lib/semmle/code/java/security/TaintedPermissionsCheckQuery.qll
+++ b/java/ql/lib/semmle/code/java/security/TaintedPermissionsCheckQuery.qll
@@ -54,7 +54,7 @@ private class WildCardPermissionConstruction extends ClassInstanceExpr, Permissi
  * A configuration for tracking flow from user input to a permissions check.
  */
 module TaintedPermissionsCheckFlowConfig implements DataFlow::ConfigSig {
-  predicate isSource(DataFlow::Node source) { source instanceof ThreatModelFlowSource }
+  predicate isSource(DataFlow::Node source) { source instanceof ActiveThreatModelSource }
 
   predicate isSink(DataFlow::Node sink) {
     sink.asExpr() = any(PermissionsConstruction p).getInput()
diff --git a/java/ql/lib/semmle/code/java/security/TemplateInjection.qll b/java/ql/lib/semmle/code/java/security/TemplateInjection.qll
index f2cc980a0d8..a74f4db8030 100644
--- a/java/ql/lib/semmle/code/java/security/TemplateInjection.qll
+++ b/java/ql/lib/semmle/code/java/security/TemplateInjection.qll
@@ -83,7 +83,7 @@ abstract deprecated class TemplateInjectionSanitizerWithState extends DataFlow::
   abstract deprecated predicate hasState(DataFlow::FlowState state);
 }
 
-private class DefaultTemplateInjectionSource extends TemplateInjectionSource instanceof ThreatModelFlowSource
+private class DefaultTemplateInjectionSource extends TemplateInjectionSource instanceof ActiveThreatModelSource
 { }
 
 private class DefaultTemplateInjectionSink extends TemplateInjectionSink {
diff --git a/java/ql/lib/semmle/code/java/security/TemplateInjectionQuery.qll b/java/ql/lib/semmle/code/java/security/TemplateInjectionQuery.qll
index a9595b0f6f1..536c8f33daf 100644
--- a/java/ql/lib/semmle/code/java/security/TemplateInjectionQuery.qll
+++ b/java/ql/lib/semmle/code/java/security/TemplateInjectionQuery.qll
@@ -16,6 +16,8 @@ module TemplateInjectionFlowConfig implements DataFlow::ConfigSig {
   predicate isAdditionalFlowStep(DataFlow::Node node1, DataFlow::Node node2) {
     any(TemplateInjectionAdditionalTaintStep a).isAdditionalTaintStep(node1, node2)
   }
+
+  predicate observeDiffInformedIncrementalMode() { any() }
 }
 
 /** Tracks server-side template injection (SST) vulnerabilities */
diff --git a/java/ql/lib/semmle/code/java/security/TrustBoundaryViolationQuery.qll b/java/ql/lib/semmle/code/java/security/TrustBoundaryViolationQuery.qll
index b93b3f0ca1a..f70542486de 100644
--- a/java/ql/lib/semmle/code/java/security/TrustBoundaryViolationQuery.qll
+++ b/java/ql/lib/semmle/code/java/security/TrustBoundaryViolationQuery.qll
@@ -13,7 +13,7 @@ private import semmle.code.java.security.Sanitizers
  */
 abstract class TrustBoundaryViolationSource extends DataFlow::Node { }
 
-private class ThreatModelSource extends TrustBoundaryViolationSource instanceof ThreatModelFlowSource
+private class ThreatModelSource extends TrustBoundaryViolationSource instanceof ActiveThreatModelSource
 { }
 
 /**
diff --git a/java/ql/lib/semmle/code/java/security/UnsafeAndroidAccessQuery.qll b/java/ql/lib/semmle/code/java/security/UnsafeAndroidAccessQuery.qll
index 3239b387d8e..1c9d2809eba 100644
--- a/java/ql/lib/semmle/code/java/security/UnsafeAndroidAccessQuery.qll
+++ b/java/ql/lib/semmle/code/java/security/UnsafeAndroidAccessQuery.qll
@@ -10,7 +10,7 @@ import semmle.code.java.security.UnsafeAndroidAccess
  * A taint configuration tracking flow from untrusted inputs to a resource fetching call.
  */
 module FetchUntrustedResourceConfig implements DataFlow::ConfigSig {
-  predicate isSource(DataFlow::Node source) { source instanceof ThreatModelFlowSource }
+  predicate isSource(DataFlow::Node source) { source instanceof ActiveThreatModelSource }
 
   predicate isSink(DataFlow::Node sink) { sink instanceof UrlResourceSink }
 
diff --git a/java/ql/lib/semmle/code/java/security/UnsafeContentUriResolutionQuery.qll b/java/ql/lib/semmle/code/java/security/UnsafeContentUriResolutionQuery.qll
index db629143d5c..d072de05c1c 100644
--- a/java/ql/lib/semmle/code/java/security/UnsafeContentUriResolutionQuery.qll
+++ b/java/ql/lib/semmle/code/java/security/UnsafeContentUriResolutionQuery.qll
@@ -9,7 +9,7 @@ import semmle.code.java.security.UnsafeContentUriResolution
  * A taint-tracking configuration to find paths from remote sources to content URI resolutions.
  */
 module UnsafeContentResolutionConfig implements DataFlow::ConfigSig {
-  predicate isSource(DataFlow::Node src) { src instanceof ThreatModelFlowSource }
+  predicate isSource(DataFlow::Node src) { src instanceof ActiveThreatModelSource }
 
   predicate isSink(DataFlow::Node sink) { sink instanceof ContentUriResolutionSink }
 
@@ -20,6 +20,8 @@ module UnsafeContentResolutionConfig implements DataFlow::ConfigSig {
   predicate isAdditionalFlowStep(DataFlow::Node node1, DataFlow::Node node2) {
     any(ContentUriResolutionAdditionalTaintStep s).step(node1, node2)
   }
+
+  predicate observeDiffInformedIncrementalMode() { any() }
 }
 
 /** Taint-tracking flow to find paths from remote sources to content URI resolutions. */
diff --git a/java/ql/lib/semmle/code/java/security/UnsafeDeserializationQuery.qll b/java/ql/lib/semmle/code/java/security/UnsafeDeserializationQuery.qll
index 739b2713780..9a627d54c5a 100644
--- a/java/ql/lib/semmle/code/java/security/UnsafeDeserializationQuery.qll
+++ b/java/ql/lib/semmle/code/java/security/UnsafeDeserializationQuery.qll
@@ -316,7 +316,7 @@ private predicate isUnsafeDeserializationTaintStep(DataFlow::Node pred, DataFlow
 
 /** Tracks flows from remote user input to a deserialization sink. */
 private module UnsafeDeserializationConfig implements DataFlow::ConfigSig {
-  predicate isSource(DataFlow::Node source) { source instanceof ThreatModelFlowSource }
+  predicate isSource(DataFlow::Node source) { source instanceof ActiveThreatModelSource }
 
   predicate isSink(DataFlow::Node sink) { sink instanceof UnsafeDeserializationSink }
 
@@ -325,6 +325,8 @@ private module UnsafeDeserializationConfig implements DataFlow::ConfigSig {
   }
 
   predicate isBarrier(DataFlow::Node node) { isUnsafeDeserializationSanitizer(node) }
+
+  predicate observeDiffInformedIncrementalMode() { any() }
 }
 
 module UnsafeDeserializationFlow = TaintTracking::Global<UnsafeDeserializationConfig>;
@@ -416,7 +418,7 @@ private predicate isUnsafeTypeAdditionalTaintStep(DataFlow::Node fromNode, DataF
  * If this is user-controlled, arbitrary code could be executed while instantiating the user-specified type.
  */
 module UnsafeTypeConfig implements DataFlow::ConfigSig {
-  predicate isSource(DataFlow::Node src) { src instanceof ThreatModelFlowSource }
+  predicate isSource(DataFlow::Node src) { src instanceof ActiveThreatModelSource }
 
   predicate isSink(DataFlow::Node sink) { sink instanceof UnsafeTypeSink }
 
diff --git a/java/ql/lib/semmle/code/java/security/UrlForwardQuery.qll b/java/ql/lib/semmle/code/java/security/UrlForwardQuery.qll
index 2ca38d69551..bc3b4000927 100644
--- a/java/ql/lib/semmle/code/java/security/UrlForwardQuery.qll
+++ b/java/ql/lib/semmle/code/java/security/UrlForwardQuery.qll
@@ -178,7 +178,7 @@ private class FullyDecodesUrlBarrier extends DataFlow::Node {
  */
 module UrlForwardFlowConfig implements DataFlow::ConfigSig {
   predicate isSource(DataFlow::Node source) {
-    source instanceof ThreatModelFlowSource and
+    source instanceof ActiveThreatModelSource and
     // excluded due to FPs
     not exists(MethodCall mc, Method m |
       m instanceof HttpServletRequestGetRequestUriMethod or
@@ -195,6 +195,8 @@ module UrlForwardFlowConfig implements DataFlow::ConfigSig {
   predicate isBarrier(DataFlow::Node node) { node instanceof UrlForwardBarrier }
 
   DataFlow::FlowFeature getAFeature() { result instanceof DataFlow::FeatureHasSourceCallContext }
+
+  predicate observeDiffInformedIncrementalMode() { any() }
 }
 
 /**
diff --git a/java/ql/lib/semmle/code/java/security/UrlRedirectQuery.qll b/java/ql/lib/semmle/code/java/security/UrlRedirectQuery.qll
index 675937985c4..26d133d4adb 100644
--- a/java/ql/lib/semmle/code/java/security/UrlRedirectQuery.qll
+++ b/java/ql/lib/semmle/code/java/security/UrlRedirectQuery.qll
@@ -8,11 +8,13 @@ private import semmle.code.java.security.UrlRedirect
  * A taint-tracking configuration for reasoning about URL redirections.
  */
 module UrlRedirectConfig implements DataFlow::ConfigSig {
-  predicate isSource(DataFlow::Node source) { source instanceof ThreatModelFlowSource }
+  predicate isSource(DataFlow::Node source) { source instanceof ActiveThreatModelSource }
 
   predicate isSink(DataFlow::Node sink) { sink instanceof UrlRedirectSink }
 
   predicate isBarrier(DataFlow::Node node) { node instanceof UrlRedirectSanitizer }
+
+  predicate observeDiffInformedIncrementalMode() { any() }
 }
 
 /**
diff --git a/java/ql/lib/semmle/code/java/security/WebviewDebuggingEnabledQuery.qll b/java/ql/lib/semmle/code/java/security/WebviewDebuggingEnabledQuery.qll
index 8e5b177268d..90e47521bf0 100644
--- a/java/ql/lib/semmle/code/java/security/WebviewDebuggingEnabledQuery.qll
+++ b/java/ql/lib/semmle/code/java/security/WebviewDebuggingEnabledQuery.qll
@@ -44,6 +44,8 @@ module WebviewDebugEnabledConfig implements DataFlow::ConfigSig {
     or
     node.getEnclosingCallable().getDeclaringType() instanceof NonSecurityTestClass
   }
+
+  predicate observeDiffInformedIncrementalMode() { any() }
 }
 
 /**
diff --git a/java/ql/lib/semmle/code/java/security/XPathInjectionQuery.qll b/java/ql/lib/semmle/code/java/security/XPathInjectionQuery.qll
index 38dc1ff993c..e387f0d0e11 100644
--- a/java/ql/lib/semmle/code/java/security/XPathInjectionQuery.qll
+++ b/java/ql/lib/semmle/code/java/security/XPathInjectionQuery.qll
@@ -9,9 +9,11 @@ private import semmle.code.java.security.XPath
  * A taint-tracking configuration for reasoning about XPath injection vulnerabilities.
  */
 module XPathInjectionConfig implements DataFlow::ConfigSig {
-  predicate isSource(DataFlow::Node source) { source instanceof ThreatModelFlowSource }
+  predicate isSource(DataFlow::Node source) { source instanceof ActiveThreatModelSource }
 
   predicate isSink(DataFlow::Node sink) { sink instanceof XPathInjectionSink }
+
+  predicate observeDiffInformedIncrementalMode() { any() }
 }
 
 /**
diff --git a/java/ql/lib/semmle/code/java/security/XsltInjectionQuery.qll b/java/ql/lib/semmle/code/java/security/XsltInjectionQuery.qll
index d437ca860d5..7ff745a057c 100644
--- a/java/ql/lib/semmle/code/java/security/XsltInjectionQuery.qll
+++ b/java/ql/lib/semmle/code/java/security/XsltInjectionQuery.qll
@@ -11,7 +11,7 @@ private import semmle.code.java.security.Sanitizers
  * A taint-tracking configuration for unvalidated user input that is used in XSLT transformation.
  */
 module XsltInjectionFlowConfig implements DataFlow::ConfigSig {
-  predicate isSource(DataFlow::Node source) { source instanceof ThreatModelFlowSource }
+  predicate isSource(DataFlow::Node source) { source instanceof ActiveThreatModelSource }
 
   predicate isSink(DataFlow::Node sink) { sink instanceof XsltInjectionSink }
 
@@ -20,6 +20,8 @@ module XsltInjectionFlowConfig implements DataFlow::ConfigSig {
   predicate isAdditionalFlowStep(DataFlow::Node node1, DataFlow::Node node2) {
     any(XsltInjectionAdditionalTaintStep c).step(node1, node2)
   }
+
+  predicate observeDiffInformedIncrementalMode() { any() }
 }
 
 /**
diff --git a/java/ql/lib/semmle/code/java/security/XssQuery.qll b/java/ql/lib/semmle/code/java/security/XssQuery.qll
index 6fec86a78dd..c0d7035a4f9 100644
--- a/java/ql/lib/semmle/code/java/security/XssQuery.qll
+++ b/java/ql/lib/semmle/code/java/security/XssQuery.qll
@@ -9,7 +9,7 @@ import semmle.code.java.security.XSS
  * A taint-tracking configuration for cross site scripting vulnerabilities.
  */
 module XssConfig implements DataFlow::ConfigSig {
-  predicate isSource(DataFlow::Node source) { source instanceof ThreatModelFlowSource }
+  predicate isSource(DataFlow::Node source) { source instanceof ActiveThreatModelSource }
 
   predicate isSink(DataFlow::Node sink) { sink instanceof XssSink }
 
@@ -20,6 +20,8 @@ module XssConfig implements DataFlow::ConfigSig {
   predicate isAdditionalFlowStep(DataFlow::Node node1, DataFlow::Node node2) {
     any(XssAdditionalTaintStep s).step(node1, node2)
   }
+
+  predicate observeDiffInformedIncrementalMode() { any() }
 }
 
 /** Tracks flow from remote sources to cross site scripting vulnerabilities. */
diff --git a/java/ql/lib/semmle/code/java/security/XxeRemoteQuery.qll b/java/ql/lib/semmle/code/java/security/XxeRemoteQuery.qll
index 58b1e5bfed1..ecfdb7c4ae1 100644
--- a/java/ql/lib/semmle/code/java/security/XxeRemoteQuery.qll
+++ b/java/ql/lib/semmle/code/java/security/XxeRemoteQuery.qll
@@ -9,7 +9,7 @@ private import semmle.code.java.security.XxeQuery
  * A taint-tracking configuration for unvalidated remote user input that is used in XML external entity expansion.
  */
 module XxeConfig implements DataFlow::ConfigSig {
-  predicate isSource(DataFlow::Node src) { src instanceof ThreatModelFlowSource }
+  predicate isSource(DataFlow::Node src) { src instanceof ActiveThreatModelSource }
 
   predicate isSink(DataFlow::Node sink) { sink instanceof XxeSink }
 
@@ -18,6 +18,8 @@ module XxeConfig implements DataFlow::ConfigSig {
   predicate isAdditionalFlowStep(DataFlow::Node n1, DataFlow::Node n2) {
     any(XxeAdditionalTaintStep s).step(n1, n2)
   }
+
+  predicate observeDiffInformedIncrementalMode() { any() }
 }
 
 /**
diff --git a/java/ql/lib/semmle/code/java/security/ZipSlipQuery.qll b/java/ql/lib/semmle/code/java/security/ZipSlipQuery.qll
index 0055670d895..9e2e5e4a6c7 100644
--- a/java/ql/lib/semmle/code/java/security/ZipSlipQuery.qll
+++ b/java/ql/lib/semmle/code/java/security/ZipSlipQuery.qll
@@ -43,6 +43,8 @@ module ZipSlipConfig implements DataFlow::ConfigSig {
     node instanceof SimpleTypeSanitizer or
     node instanceof PathInjectionSanitizer
   }
+
+  predicate observeDiffInformedIncrementalMode() { any() }
 }
 
 /** Tracks flow from archive entries to file creation. */
diff --git a/java/ql/lib/semmle/code/java/security/regexp/PolynomialReDoSQuery.qll b/java/ql/lib/semmle/code/java/security/regexp/PolynomialReDoSQuery.qll
index 55c1a043230..ba65e13dd61 100644
--- a/java/ql/lib/semmle/code/java/security/regexp/PolynomialReDoSQuery.qll
+++ b/java/ql/lib/semmle/code/java/security/regexp/PolynomialReDoSQuery.qll
@@ -35,7 +35,7 @@ private class LengthRestrictedMethod extends Method {
 
 /** A configuration for Polynomial ReDoS queries. */
 module PolynomialRedosConfig implements DataFlow::ConfigSig {
-  predicate isSource(DataFlow::Node src) { src instanceof ThreatModelFlowSource }
+  predicate isSource(DataFlow::Node src) { src instanceof ActiveThreatModelSource }
 
   predicate isSink(DataFlow::Node sink) {
     exists(SuperlinearBackTracking::PolynomialBackTrackingTerm regexp |
diff --git a/java/ql/lib/semmle/code/java/security/regexp/RegexInjectionQuery.qll b/java/ql/lib/semmle/code/java/security/regexp/RegexInjectionQuery.qll
index 88710061819..533482a8af1 100644
--- a/java/ql/lib/semmle/code/java/security/regexp/RegexInjectionQuery.qll
+++ b/java/ql/lib/semmle/code/java/security/regexp/RegexInjectionQuery.qll
@@ -9,11 +9,13 @@ import semmle.code.java.security.regexp.RegexInjection
  * A taint-tracking configuration for untrusted user input used to construct regular expressions.
  */
 module RegexInjectionConfig implements DataFlow::ConfigSig {
-  predicate isSource(DataFlow::Node source) { source instanceof ThreatModelFlowSource }
+  predicate isSource(DataFlow::Node source) { source instanceof ActiveThreatModelSource }
 
   predicate isSink(DataFlow::Node sink) { sink instanceof RegexInjectionSink }
 
   predicate isBarrier(DataFlow::Node node) { node instanceof RegexInjectionSanitizer }
+
+  predicate observeDiffInformedIncrementalMode() { any() }
 }
 
 /**
diff --git a/java/ql/lib/upgrades/376ce7dad79375c0772b8edb938da82ca5271ba1/fields.ql b/java/ql/lib/upgrades/376ce7dad79375c0772b8edb938da82ca5271ba1/fields.ql
new file mode 100644
index 00000000000..a8b9b57c3f6
--- /dev/null
+++ b/java/ql/lib/upgrades/376ce7dad79375c0772b8edb938da82ca5271ba1/fields.ql
@@ -0,0 +1,15 @@
+class Field extends @field {
+  string toString() { none() }
+}
+
+class Type extends @type {
+  string toString() { none() }
+}
+
+class RefType extends @reftype {
+  string toString() { none() }
+}
+
+from Field f, string name, Type t, RefType parent
+where fields(f, name, t, parent, _)
+select f, name, t, parent
diff --git a/java/ql/lib/upgrades/376ce7dad79375c0772b8edb938da82ca5271ba1/old.dbscheme b/java/ql/lib/upgrades/376ce7dad79375c0772b8edb938da82ca5271ba1/old.dbscheme
new file mode 100644
index 00000000000..376ce7dad79
--- /dev/null
+++ b/java/ql/lib/upgrades/376ce7dad79375c0772b8edb938da82ca5271ba1/old.dbscheme
@@ -0,0 +1,1233 @@
+/**
+ * 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
+);
+
+/*
+ * 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,
+  int sourceid: @field 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
+);
+
+erasure(
+  unique int memberid: @member ref,
+  int erasureid: @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
+);
+
+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/376ce7dad79375c0772b8edb938da82ca5271ba1/semmlecode.dbscheme b/java/ql/lib/upgrades/376ce7dad79375c0772b8edb938da82ca5271ba1/semmlecode.dbscheme
new file mode 100644
index 00000000000..876cabc76c5
--- /dev/null
+++ b/java/ql/lib/upgrades/376ce7dad79375c0772b8edb938da82ca5271ba1/semmlecode.dbscheme
@@ -0,0 +1,1232 @@
+/**
+ * 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
+);
+
+/*
+ * 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
+);
+
+erasure(
+  unique int memberid: @member ref,
+  int erasureid: @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
+);
+
+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/376ce7dad79375c0772b8edb938da82ca5271ba1/upgrade.properties b/java/ql/lib/upgrades/376ce7dad79375c0772b8edb938da82ca5271ba1/upgrade.properties
new file mode 100644
index 00000000000..64fe711dd70
--- /dev/null
+++ b/java/ql/lib/upgrades/376ce7dad79375c0772b8edb938da82ca5271ba1/upgrade.properties
@@ -0,0 +1,3 @@
+description: Remove fields.sourceid
+compatibility: full
+fields.rel: run fields.qlo
diff --git a/java/ql/lib/upgrades/876cabc76c5c83912271db331481f8cba2749643/old.dbscheme b/java/ql/lib/upgrades/876cabc76c5c83912271db331481f8cba2749643/old.dbscheme
new file mode 100644
index 00000000000..876cabc76c5
--- /dev/null
+++ b/java/ql/lib/upgrades/876cabc76c5c83912271db331481f8cba2749643/old.dbscheme
@@ -0,0 +1,1232 @@
+/**
+ * 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
+);
+
+/*
+ * 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
+);
+
+erasure(
+  unique int memberid: @member ref,
+  int erasureid: @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
+);
+
+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/876cabc76c5c83912271db331481f8cba2749643/semmlecode.dbscheme b/java/ql/lib/upgrades/876cabc76c5c83912271db331481f8cba2749643/semmlecode.dbscheme
new file mode 100644
index 00000000000..1fd1afa7862
--- /dev/null
+++ b/java/ql/lib/upgrades/876cabc76c5c83912271db331481f8cba2749643/semmlecode.dbscheme
@@ -0,0 +1,1227 @@
+/**
+ * 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
+);
+
+/*
+ * 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
+);
+
+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/876cabc76c5c83912271db331481f8cba2749643/upgrade.properties b/java/ql/lib/upgrades/876cabc76c5c83912271db331481f8cba2749643/upgrade.properties
new file mode 100644
index 00000000000..04bc9cb8faf
--- /dev/null
+++ b/java/ql/lib/upgrades/876cabc76c5c83912271db331481f8cba2749643/upgrade.properties
@@ -0,0 +1,2 @@
+description: Remove erasure
+erasure.rel: delete
diff --git a/java/ql/src/Advisory/Declarations/NonFinalImmutableField.ql b/java/ql/src/Advisory/Declarations/NonFinalImmutableField.ql
index d025466ae5a..493168d80a7 100644
--- a/java/ql/src/Advisory/Declarations/NonFinalImmutableField.ql
+++ b/java/ql/src/Advisory/Declarations/NonFinalImmutableField.ql
@@ -40,7 +40,7 @@ class ImmutableField extends Field {
     this.getType() instanceof ImmutableType and
     // The field is only assigned to in a constructor or static initializer of the type it is declared in.
     forall(FieldAccess fw, AnyAssignment ae |
-      fw.getField().getSourceDeclaration() = this and
+      fw.getField() = this and
       fw = ae.getDest()
     |
       ae.getEnclosingCallable().getDeclaringType() = this.getDeclaringType() and
diff --git a/java/ql/src/CHANGELOG.md b/java/ql/src/CHANGELOG.md
index c33e27c7b65..3a29e9e55e0 100644
--- a/java/ql/src/CHANGELOG.md
+++ b/java/ql/src/CHANGELOG.md
@@ -1,3 +1,17 @@
+## 1.1.8
+
+No user-facing changes.
+
+## 1.1.7
+
+No user-facing changes.
+
+## 1.1.6
+
+### Minor Analysis Improvements
+
+* Added taint summary model for `org.springframework.core.io.InputStreamSource#getInputStream()`.
+
 ## 1.1.5
 
 No user-facing changes.
diff --git a/java/ql/src/Metrics/Summaries/GeneratedVsManualCoverageQuery.qll b/java/ql/src/Metrics/Summaries/GeneratedVsManualCoverageQuery.qll
index 9a2a0201e80..8309126c06d 100644
--- a/java/ql/src/Metrics/Summaries/GeneratedVsManualCoverageQuery.qll
+++ b/java/ql/src/Metrics/Summaries/GeneratedVsManualCoverageQuery.qll
@@ -17,12 +17,12 @@ private int getNumMadModeledApis(string package, string provenance, string apiSu
       (
         // "auto-only"
         not sc.hasManualModel() and
-        sc.hasProvenance("df-generated") and
+        sc.hasGeneratedModel() and
         provenance = "generated"
         or
         sc.hasManualModel() and
         (
-          if sc.hasProvenance("df-generated")
+          if sc.hasGeneratedModel()
           then
             // "both"
             provenance = "both"
diff --git a/java/ql/src/Security/CWE/CWE-352/SpringCSRFProtection.qhelp b/java/ql/src/Security/CWE/CWE-352/SpringCSRFProtection.qhelp
index af1119bcd1c..a7e0b21d7e4 100644
--- a/java/ql/src/Security/CWE/CWE-352/SpringCSRFProtection.qhelp
+++ b/java/ql/src/Security/CWE/CWE-352/SpringCSRFProtection.qhelp
@@ -5,7 +5,7 @@
 <p>When you set up a web server to receive a request from a client without any mechanism
 for verifying that it was intentionally sent, then it is vulnerable to attack. An attacker can
 trick a client into making an unintended request to the web server that will be treated as
-an authentic request. This can be done via a URL, image load, XMLHttpRequest, etc. and can 
+an authentic request. This can be done via a URL, image load, XMLHttpRequest, etc. and can
 result in exposure of data or unintended code execution.</p>
 </overview>
 
@@ -30,9 +30,9 @@ OWASP:
 </li>
 <li>
 Spring Security Reference:
-<a href="https://docs.spring.io/spring-security/site/docs/current/reference/html5/#servlet-csrf">
-  Cross Site Request Forgery (CSRF) for Servlet Environments
+<a href="https://docs.spring.io/spring-security/reference/servlet/exploits/csrf.html">
+  Cross Site Request Forgery (CSRF)
 </a>.
 </li>
 </references>
-</qhelp>
\ No newline at end of file
+</qhelp>
diff --git a/java/ql/src/Violations of Best Practice/Dead Code/NonAssignedFields.ql b/java/ql/src/Violations of Best Practice/Dead Code/NonAssignedFields.ql
index 2c618f94aad..28f06c4edfc 100644
--- a/java/ql/src/Violations of Best Practice/Dead Code/NonAssignedFields.ql	
+++ b/java/ql/src/Violations of Best Practice/Dead Code/NonAssignedFields.ql	
@@ -63,15 +63,10 @@ predicate isVMObserver(RefType rt) {
 from Field f, FieldRead fr
 where
   f.fromSource() and
-  fr.getField().getSourceDeclaration() = f and
+  fr.getField() = f and
   not f.getDeclaringType() instanceof EnumType and
-  forall(Assignment ae, Field g | ae.getDest() = g.getAnAccess() and g.getSourceDeclaration() = f |
-    ae.getSource() instanceof NullLiteral
-  ) and
-  not exists(UnaryAssignExpr ua, Field g |
-    ua.getExpr() = g.getAnAccess() and
-    g.getSourceDeclaration() = f
-  ) and
+  forall(Assignment ae | ae.getDest() = f.getAnAccess() | ae.getSource() instanceof NullLiteral) and
+  not exists(UnaryAssignExpr ua | ua.getExpr() = f.getAnAccess()) and
   not f.isFinal() and
   // Exclude fields that may be accessed reflectively.
   not reflectivelyWritten(f) and
diff --git a/java/ql/src/Violations of Best Practice/Dead Code/UnusedField.ql b/java/ql/src/Violations of Best Practice/Dead Code/UnusedField.ql
index b5cb9f1c3c1..fab4e76bbda 100644
--- a/java/ql/src/Violations of Best Practice/Dead Code/UnusedField.ql	
+++ b/java/ql/src/Violations of Best Practice/Dead Code/UnusedField.ql	
@@ -19,7 +19,7 @@ where
   not (f.isPublic() or f.isProtected()) and
   f.fromSource() and
   not f.getDeclaringType() instanceof EnumType and
-  not exists(VarAccess va | va.getVariable().(Field).getSourceDeclaration() = f) and
+  not exists(VarAccess va | va.getVariable() = f) and
   // Exclude results in generated classes.
   not f.getDeclaringType() instanceof GeneratedClass and
   // Exclude fields that may be reflectively read (this includes standard serialization).
diff --git a/java/ql/src/Violations of Best Practice/Naming Conventions/Shadowing.qll b/java/ql/src/Violations of Best Practice/Naming Conventions/Shadowing.qll
index f37d7fdcab0..561c57b7cd9 100644
--- a/java/ql/src/Violations of Best Practice/Naming Conventions/Shadowing.qll	
+++ b/java/ql/src/Violations of Best Practice/Naming Conventions/Shadowing.qll	
@@ -33,7 +33,7 @@ private Field getField(Class c, string name, Type t) {
 
 predicate thisAccess(LocalVariableDecl d, Field f) {
   shadows(d, _, f, _) and
-  exists(VarAccess va | va.getVariable().(Field).getSourceDeclaration() = f |
+  exists(VarAccess va | va.getVariable() = f |
     va.getQualifier() instanceof ThisAccess and
     va.getEnclosingCallable() = d.getCallable()
   )
@@ -41,7 +41,7 @@ predicate thisAccess(LocalVariableDecl d, Field f) {
 
 predicate confusingAccess(LocalVariableDecl d, Field f) {
   shadows(d, _, f, _) and
-  exists(VarAccess va | va.getVariable().(Field).getSourceDeclaration() = f |
+  exists(VarAccess va | va.getVariable() = f |
     not exists(va.getQualifier()) and
     va.getEnclosingCallable() = d.getCallable()
   )
@@ -52,10 +52,7 @@ predicate assignmentToShadowingLocal(LocalVariableDecl d, Field f) {
   exists(Expr assignedValue, Expr use |
     d.getAnAssignedValue() = assignedValue and getARelevantChild(assignedValue) = use
   |
-    exists(FieldAccess access, Field ff | access = assignedValue |
-      ff = access.getField() and
-      ff.getSourceDeclaration() = f
-    )
+    exists(FieldAccess access | access = assignedValue | f = access.getField())
     or
     exists(MethodCall get, Method getter | get = assignedValue and getter = get.getMethod() |
       getterFor(getter, f)
@@ -73,10 +70,9 @@ predicate assignmentFromShadowingLocal(LocalVariableDecl d, Field f) {
       setterFor(setter, f)
     )
     or
-    exists(Field instance, Expr assignedValue |
+    exists(Expr assignedValue |
       access = getARelevantChild(assignedValue) and
-      assignedValue = instance.getAnAssignedValue() and
-      instance.getSourceDeclaration() = f
+      assignedValue = f.getAnAssignedValue()
     )
   )
 }
diff --git a/java/ql/src/change-notes/released/1.1.6.md b/java/ql/src/change-notes/released/1.1.6.md
new file mode 100644
index 00000000000..dc156b8a5be
--- /dev/null
+++ b/java/ql/src/change-notes/released/1.1.6.md
@@ -0,0 +1,5 @@
+## 1.1.6
+
+### Minor Analysis Improvements
+
+* Added taint summary model for `org.springframework.core.io.InputStreamSource#getInputStream()`.
diff --git a/java/ql/src/change-notes/released/1.1.7.md b/java/ql/src/change-notes/released/1.1.7.md
new file mode 100644
index 00000000000..81505c0507a
--- /dev/null
+++ b/java/ql/src/change-notes/released/1.1.7.md
@@ -0,0 +1,3 @@
+## 1.1.7
+
+No user-facing changes.
diff --git a/java/ql/src/change-notes/released/1.1.8.md b/java/ql/src/change-notes/released/1.1.8.md
new file mode 100644
index 00000000000..f4fe325b335
--- /dev/null
+++ b/java/ql/src/change-notes/released/1.1.8.md
@@ -0,0 +1,3 @@
+## 1.1.8
+
+No user-facing changes.
diff --git a/java/ql/src/codeql-pack.release.yml b/java/ql/src/codeql-pack.release.yml
index df39a9de059..64972659c42 100644
--- a/java/ql/src/codeql-pack.release.yml
+++ b/java/ql/src/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.1.5
+lastReleaseVersion: 1.1.8
diff --git a/java/ql/src/experimental/Security/CWE/CWE-020/Log4jJndiInjection.ql b/java/ql/src/experimental/Security/CWE/CWE-020/Log4jJndiInjection.ql
index 442c45f4328..b729aceffee 100644
--- a/java/ql/src/experimental/Security/CWE/CWE-020/Log4jJndiInjection.ql
+++ b/java/ql/src/experimental/Security/CWE/CWE-020/Log4jJndiInjection.ql
@@ -40,7 +40,7 @@ class Log4jInjectionSanitizer extends DataFlow::Node instanceof SimpleTypeSaniti
  * A taint-tracking configuration for tracking untrusted user input used in log entries.
  */
 module Log4jInjectionConfig implements DataFlow::ConfigSig {
-  predicate isSource(DataFlow::Node source) { source instanceof ThreatModelFlowSource }
+  predicate isSource(DataFlow::Node source) { source instanceof ActiveThreatModelSource }
 
   predicate isSink(DataFlow::Node sink) { sink instanceof Log4jInjectionSink }
 
diff --git a/java/ql/src/experimental/Security/CWE/CWE-036/OpenStream.ql b/java/ql/src/experimental/Security/CWE/CWE-036/OpenStream.ql
index 4b71c297c23..19ce0263560 100644
--- a/java/ql/src/experimental/Security/CWE/CWE-036/OpenStream.ql
+++ b/java/ql/src/experimental/Security/CWE/CWE-036/OpenStream.ql
@@ -33,7 +33,7 @@ class UrlConstructor extends ClassInstanceExpr {
 }
 
 module RemoteUrlToOpenStreamFlowConfig implements DataFlow::ConfigSig {
-  predicate isSource(DataFlow::Node source) { source instanceof ThreatModelFlowSource }
+  predicate isSource(DataFlow::Node source) { source instanceof ActiveThreatModelSource }
 
   predicate isSink(DataFlow::Node sink) {
     exists(MethodCall m |
diff --git a/java/ql/src/experimental/Security/CWE/CWE-073/FilePathInjection.ql b/java/ql/src/experimental/Security/CWE/CWE-073/FilePathInjection.ql
index 6fab554ac67..1c50f8304fc 100644
--- a/java/ql/src/experimental/Security/CWE/CWE-073/FilePathInjection.ql
+++ b/java/ql/src/experimental/Security/CWE/CWE-073/FilePathInjection.ql
@@ -50,7 +50,7 @@ class NormalizedPathNode extends DataFlow::Node {
 }
 
 module InjectFilePathConfig implements DataFlow::ConfigSig {
-  predicate isSource(DataFlow::Node source) { source instanceof ThreatModelFlowSource }
+  predicate isSource(DataFlow::Node source) { source instanceof ActiveThreatModelSource }
 
   predicate isSink(DataFlow::Node sink) {
     sink instanceof TaintedPathSink and
diff --git a/java/ql/src/experimental/Security/CWE/CWE-078/CommandInjectionRuntimeExec.ql b/java/ql/src/experimental/Security/CWE/CWE-078/CommandInjectionRuntimeExec.ql
index 88733773de1..60a28d2b252 100644
--- a/java/ql/src/experimental/Security/CWE/CWE-078/CommandInjectionRuntimeExec.ql
+++ b/java/ql/src/experimental/Security/CWE/CWE-078/CommandInjectionRuntimeExec.ql
@@ -14,7 +14,7 @@
 import CommandInjectionRuntimeExec
 import ExecUserFlow::PathGraph
 
-class ThreatModelSource extends Source instanceof ThreatModelFlowSource { }
+class ThreatModelSource extends Source instanceof ActiveThreatModelSource { }
 
 from
   ExecUserFlow::PathNode source, ExecUserFlow::PathNode sink, DataFlow::Node sourceCmd,
diff --git a/java/ql/src/experimental/Security/CWE/CWE-089/MyBatisAnnotationSqlInjection.ql b/java/ql/src/experimental/Security/CWE/CWE-089/MyBatisAnnotationSqlInjection.ql
index e5779543125..a67d0e06f16 100644
--- a/java/ql/src/experimental/Security/CWE/CWE-089/MyBatisAnnotationSqlInjection.ql
+++ b/java/ql/src/experimental/Security/CWE/CWE-089/MyBatisAnnotationSqlInjection.ql
@@ -21,7 +21,7 @@ private import semmle.code.java.security.Sanitizers
 import MyBatisAnnotationSqlInjectionFlow::PathGraph
 
 private module MyBatisAnnotationSqlInjectionConfig implements DataFlow::ConfigSig {
-  predicate isSource(DataFlow::Node source) { source instanceof ThreatModelFlowSource }
+  predicate isSource(DataFlow::Node source) { source instanceof ActiveThreatModelSource }
 
   predicate isSink(DataFlow::Node sink) { sink instanceof MyBatisAnnotatedMethodCallArgument }
 
diff --git a/java/ql/src/experimental/Security/CWE/CWE-089/MyBatisMapperXmlSqlInjection.ql b/java/ql/src/experimental/Security/CWE/CWE-089/MyBatisMapperXmlSqlInjection.ql
index 32cd2904dce..7597f0f67a5 100644
--- a/java/ql/src/experimental/Security/CWE/CWE-089/MyBatisMapperXmlSqlInjection.ql
+++ b/java/ql/src/experimental/Security/CWE/CWE-089/MyBatisMapperXmlSqlInjection.ql
@@ -21,7 +21,7 @@ private import semmle.code.java.security.Sanitizers
 import MyBatisMapperXmlSqlInjectionFlow::PathGraph
 
 private module MyBatisMapperXmlSqlInjectionConfig implements DataFlow::ConfigSig {
-  predicate isSource(DataFlow::Node source) { source instanceof ThreatModelFlowSource }
+  predicate isSource(DataFlow::Node source) { source instanceof ActiveThreatModelSource }
 
   predicate isSink(DataFlow::Node sink) { sink instanceof MyBatisMapperMethodCallAnArgument }
 
diff --git a/java/ql/src/experimental/Security/CWE/CWE-094/BeanShellInjection.ql b/java/ql/src/experimental/Security/CWE/CWE-094/BeanShellInjection.ql
index d1d5ee93691..75ef4e6fec2 100644
--- a/java/ql/src/experimental/Security/CWE/CWE-094/BeanShellInjection.ql
+++ b/java/ql/src/experimental/Security/CWE/CWE-094/BeanShellInjection.ql
@@ -18,7 +18,7 @@ import semmle.code.java.dataflow.TaintTracking
 import BeanShellInjectionFlow::PathGraph
 
 module BeanShellInjectionConfig implements DataFlow::ConfigSig {
-  predicate isSource(DataFlow::Node source) { source instanceof ThreatModelFlowSource }
+  predicate isSource(DataFlow::Node source) { source instanceof ActiveThreatModelSource }
 
   predicate isSink(DataFlow::Node sink) { sink instanceof BeanShellInjectionSink }
 
diff --git a/java/ql/src/experimental/Security/CWE/CWE-094/JShellInjection.ql b/java/ql/src/experimental/Security/CWE/CWE-094/JShellInjection.ql
index 88eebc1ab7f..500c6dabca9 100644
--- a/java/ql/src/experimental/Security/CWE/CWE-094/JShellInjection.ql
+++ b/java/ql/src/experimental/Security/CWE/CWE-094/JShellInjection.ql
@@ -18,7 +18,7 @@ import semmle.code.java.dataflow.TaintTracking
 import JShellInjectionFlow::PathGraph
 
 module JShellInjectionConfig implements DataFlow::ConfigSig {
-  predicate isSource(DataFlow::Node source) { source instanceof ThreatModelFlowSource }
+  predicate isSource(DataFlow::Node source) { source instanceof ActiveThreatModelSource }
 
   predicate isSink(DataFlow::Node sink) { sink instanceof JShellInjectionSink }
 
diff --git a/java/ql/src/experimental/Security/CWE/CWE-094/JakartaExpressionInjectionLib.qll b/java/ql/src/experimental/Security/CWE/CWE-094/JakartaExpressionInjectionLib.qll
index cd5d50338b9..85a1dd11dad 100644
--- a/java/ql/src/experimental/Security/CWE/CWE-094/JakartaExpressionInjectionLib.qll
+++ b/java/ql/src/experimental/Security/CWE/CWE-094/JakartaExpressionInjectionLib.qll
@@ -8,7 +8,7 @@ import semmle.code.java.dataflow.TaintTracking
  * that is used to construct and evaluate an expression.
  */
 module JakartaExpressionInjectionConfig implements DataFlow::ConfigSig {
-  predicate isSource(DataFlow::Node source) { source instanceof ThreatModelFlowSource }
+  predicate isSource(DataFlow::Node source) { source instanceof ActiveThreatModelSource }
 
   predicate isSink(DataFlow::Node sink) { sink instanceof ExpressionEvaluationSink }
 
diff --git a/java/ql/src/experimental/Security/CWE/CWE-094/JythonInjection.ql b/java/ql/src/experimental/Security/CWE/CWE-094/JythonInjection.ql
index 1dfadce6091..cc919385ba4 100644
--- a/java/ql/src/experimental/Security/CWE/CWE-094/JythonInjection.ql
+++ b/java/ql/src/experimental/Security/CWE/CWE-094/JythonInjection.ql
@@ -99,17 +99,17 @@ class CodeInjectionSink extends DataFlow::ExprNode {
 }
 
 /**
- * A taint configuration for tracking flow from `ThreatModelFlowSource` to a Jython method call
+ * A taint configuration for tracking flow from `ActiveThreatModelSource` to a Jython method call
  * `CodeInjectionSink` that executes injected code.
  */
 module CodeInjectionConfig implements DataFlow::ConfigSig {
-  predicate isSource(DataFlow::Node source) { source instanceof ThreatModelFlowSource }
+  predicate isSource(DataFlow::Node source) { source instanceof ActiveThreatModelSource }
 
   predicate isSink(DataFlow::Node sink) { sink instanceof CodeInjectionSink }
 }
 
 /**
- * Taint tracking flow from `ThreatModelFlowSource` to a Jython method call
+ * Taint tracking flow from `ActiveThreatModelSource` to a Jython method call
  * `CodeInjectionSink` that executes injected code.
  */
 module CodeInjectionFlow = TaintTracking::Global<CodeInjectionConfig>;
diff --git a/java/ql/src/experimental/Security/CWE/CWE-094/ScriptInjection.ql b/java/ql/src/experimental/Security/CWE/CWE-094/ScriptInjection.ql
index 0792d8e498a..6f8f7ec1cb3 100644
--- a/java/ql/src/experimental/Security/CWE/CWE-094/ScriptInjection.ql
+++ b/java/ql/src/experimental/Security/CWE/CWE-094/ScriptInjection.ql
@@ -131,11 +131,11 @@ class ScriptInjectionSink extends DataFlow::ExprNode {
 }
 
 /**
- * A taint tracking configuration that tracks flow from `ThreatModelFlowSource` to an argument
+ * A taint tracking configuration that tracks flow from `ActiveThreatModelSource` to an argument
  * of a method call that executes injected script.
  */
 module ScriptInjectionConfig implements DataFlow::ConfigSig {
-  predicate isSource(DataFlow::Node source) { source instanceof ThreatModelFlowSource }
+  predicate isSource(DataFlow::Node source) { source instanceof ActiveThreatModelSource }
 
   predicate isSink(DataFlow::Node sink) { sink instanceof ScriptInjectionSink }
 }
diff --git a/java/ql/src/experimental/Security/CWE/CWE-094/SpringViewManipulationLib.qll b/java/ql/src/experimental/Security/CWE/CWE-094/SpringViewManipulationLib.qll
index 310aafb30f5..256947a2dc7 100644
--- a/java/ql/src/experimental/Security/CWE/CWE-094/SpringViewManipulationLib.qll
+++ b/java/ql/src/experimental/Security/CWE/CWE-094/SpringViewManipulationLib.qll
@@ -42,7 +42,7 @@ class PortletRenderRequestMethod extends Method {
  */
 module SpringViewManipulationConfig implements DataFlow::ConfigSig {
   predicate isSource(DataFlow::Node source) {
-    source instanceof ThreatModelFlowSource or
+    source instanceof ActiveThreatModelSource or
     source instanceof WebRequestSource or
     source.asExpr().(MethodCall).getMethod() instanceof PortletRenderRequestMethod
   }
diff --git a/java/ql/src/experimental/Security/CWE/CWE-200/InsecureWebResourceResponse.ql b/java/ql/src/experimental/Security/CWE/CWE-200/InsecureWebResourceResponse.ql
index f32c1682c29..1a5a97a8691 100644
--- a/java/ql/src/experimental/Security/CWE/CWE-200/InsecureWebResourceResponse.ql
+++ b/java/ql/src/experimental/Security/CWE/CWE-200/InsecureWebResourceResponse.ql
@@ -19,7 +19,7 @@ import AndroidWebResourceResponse
 import InsecureWebResourceResponseFlow::PathGraph
 
 module InsecureWebResourceResponseConfig implements DataFlow::ConfigSig {
-  predicate isSource(DataFlow::Node src) { src instanceof ThreatModelFlowSource }
+  predicate isSource(DataFlow::Node src) { src instanceof ActiveThreatModelSource }
 
   predicate isSink(DataFlow::Node sink) { sink instanceof WebResourceResponseSink }
 
diff --git a/java/ql/src/experimental/Security/CWE/CWE-208/NonConstantTimeCheckOnSignatureQuery.qll b/java/ql/src/experimental/Security/CWE/CWE-208/NonConstantTimeCheckOnSignatureQuery.qll
index e865e18ecaa..8e545a5e8f0 100644
--- a/java/ql/src/experimental/Security/CWE/CWE-208/NonConstantTimeCheckOnSignatureQuery.qll
+++ b/java/ql/src/experimental/Security/CWE/CWE-208/NonConstantTimeCheckOnSignatureQuery.qll
@@ -148,7 +148,7 @@ private predicate updateMessageDigestStep(DataFlow2::Node fromNode, DataFlow2::N
  * such as cipher, MAC or signature.
  */
 private module UserInputInCryptoOperationConfig implements DataFlow::ConfigSig {
-  predicate isSource(DataFlow::Node source) { source instanceof ThreatModelFlowSource }
+  predicate isSource(DataFlow::Node source) { source instanceof ActiveThreatModelSource }
 
   predicate isSink(DataFlow::Node sink) {
     exists(ProduceCryptoCall call | call.getQualifier() = sink.asExpr())
@@ -214,7 +214,7 @@ private class NonConstantTimeComparisonCall extends StaticMethodCall {
  * that compare inputs using a non-constant-time algorithm.
  */
 private module UserInputInComparisonConfig implements DataFlow::ConfigSig {
-  predicate isSource(DataFlow::Node source) { source instanceof ThreatModelFlowSource }
+  predicate isSource(DataFlow::Node source) { source instanceof ActiveThreatModelSource }
 
   predicate isSink(DataFlow::Node sink) {
     exists(NonConstantTimeEqualsCall call |
diff --git a/java/ql/src/experimental/Security/CWE/CWE-346/UnvalidatedCors.ql b/java/ql/src/experimental/Security/CWE/CWE-346/UnvalidatedCors.ql
index 9d47e177a27..3c450d4e04c 100644
--- a/java/ql/src/experimental/Security/CWE/CWE-346/UnvalidatedCors.ql
+++ b/java/ql/src/experimental/Security/CWE/CWE-346/UnvalidatedCors.ql
@@ -63,7 +63,7 @@ module CorsSourceReachesCheckConfig implements DataFlow::ConfigSig {
 module CorsSourceReachesCheckFlow = TaintTracking::Global<CorsSourceReachesCheckConfig>;
 
 private module CorsOriginConfig implements DataFlow::ConfigSig {
-  predicate isSource(DataFlow::Node source) { source instanceof ThreatModelFlowSource }
+  predicate isSource(DataFlow::Node source) { source instanceof ActiveThreatModelSource }
 
   predicate isSink(DataFlow::Node sink) {
     exists(MethodCall corsHeader, MethodCall allowCredentialsHeader |
diff --git a/java/ql/src/experimental/Security/CWE/CWE-352/JsonpInjection.ql b/java/ql/src/experimental/Security/CWE/CWE-352/JsonpInjection.ql
index 647175797be..ce5ba05b619 100644
--- a/java/ql/src/experimental/Security/CWE/CWE-352/JsonpInjection.ql
+++ b/java/ql/src/experimental/Security/CWE/CWE-352/JsonpInjection.ql
@@ -22,7 +22,7 @@ import RequestResponseFlow::PathGraph
 /** Taint-tracking configuration tracing flow from get method request sources to output jsonp data. */
 module RequestResponseFlowConfig implements DataFlow::ConfigSig {
   predicate isSource(DataFlow::Node source) {
-    source instanceof ThreatModelFlowSource and
+    source instanceof ActiveThreatModelSource and
     any(RequestGetMethod m).polyCalls*(source.getEnclosingCallable())
   }
 
diff --git a/java/ql/src/experimental/Security/CWE/CWE-352/JsonpInjectionLib.qll b/java/ql/src/experimental/Security/CWE/CWE-352/JsonpInjectionLib.qll
index 65a75392ef4..b0d2897ea54 100644
--- a/java/ql/src/experimental/Security/CWE/CWE-352/JsonpInjectionLib.qll
+++ b/java/ql/src/experimental/Security/CWE/CWE-352/JsonpInjectionLib.qll
@@ -79,7 +79,7 @@ class JsonpBuilderExpr extends AddExpr {
 
 /** A data flow configuration tracing flow from threat model sources to jsonp function name. */
 module ThreatModelFlowConfig implements DataFlow::ConfigSig {
-  predicate isSource(DataFlow::Node src) { src instanceof ThreatModelFlowSource }
+  predicate isSource(DataFlow::Node src) { src instanceof ActiveThreatModelSource }
 
   predicate isSink(DataFlow::Node sink) {
     exists(JsonpBuilderExpr jhe | jhe.getFunctionName() = sink.asExpr())
diff --git a/java/ql/src/experimental/Security/CWE/CWE-400/ThreadResourceAbuse.ql b/java/ql/src/experimental/Security/CWE/CWE-400/ThreadResourceAbuse.ql
index 7cfd1f2ef9c..44af710990c 100644
--- a/java/ql/src/experimental/Security/CWE/CWE-400/ThreadResourceAbuse.ql
+++ b/java/ql/src/experimental/Security/CWE/CWE-400/ThreadResourceAbuse.ql
@@ -17,7 +17,7 @@ import ThreadResourceAbuseFlow::PathGraph
 
 /** Taint configuration of uncontrolled thread resource consumption. */
 module ThreadResourceAbuseConfig implements DataFlow::ConfigSig {
-  predicate isSource(DataFlow::Node source) { source instanceof ThreatModelFlowSource }
+  predicate isSource(DataFlow::Node source) { source instanceof ActiveThreatModelSource }
 
   predicate isSink(DataFlow::Node sink) { sink instanceof PauseThreadSink }
 
diff --git a/java/ql/src/experimental/Security/CWE/CWE-470/UnsafeReflection.ql b/java/ql/src/experimental/Security/CWE/CWE-470/UnsafeReflection.ql
index a525e2c8067..f18355b1d97 100644
--- a/java/ql/src/experimental/Security/CWE/CWE-470/UnsafeReflection.ql
+++ b/java/ql/src/experimental/Security/CWE/CWE-470/UnsafeReflection.ql
@@ -32,7 +32,7 @@ private predicate equalsSanitizer(Guard g, Expr e, boolean branch) {
 }
 
 module UnsafeReflectionConfig implements DataFlow::ConfigSig {
-  predicate isSource(DataFlow::Node source) { source instanceof ThreatModelFlowSource }
+  predicate isSource(DataFlow::Node source) { source instanceof ActiveThreatModelSource }
 
   predicate isSink(DataFlow::Node sink) { sink instanceof UnsafeReflectionSink }
 
diff --git a/java/ql/src/experimental/Security/CWE/CWE-600/UncaughtServletException.ql b/java/ql/src/experimental/Security/CWE/CWE-600/UncaughtServletException.ql
index ea162cf6d28..c318bd300f5 100644
--- a/java/ql/src/experimental/Security/CWE/CWE-600/UncaughtServletException.ql
+++ b/java/ql/src/experimental/Security/CWE/CWE-600/UncaughtServletException.ql
@@ -65,9 +65,9 @@ class UncaughtServletExceptionSink extends DataFlow::ExprNode {
   }
 }
 
-/** Taint configuration of uncaught exceptions caused by user provided data from `ThreatModelFlowSource` */
+/** Taint configuration of uncaught exceptions caused by user provided data from `ActiveThreatModelSource` */
 module UncaughtServletExceptionConfig implements DataFlow::ConfigSig {
-  predicate isSource(DataFlow::Node source) { source instanceof ThreatModelFlowSource }
+  predicate isSource(DataFlow::Node source) { source instanceof ActiveThreatModelSource }
 
   predicate isSink(DataFlow::Node sink) { sink instanceof UncaughtServletExceptionSink }
 }
diff --git a/java/ql/src/experimental/Security/CWE/CWE-601/SpringUrlRedirect.ql b/java/ql/src/experimental/Security/CWE/CWE-601/SpringUrlRedirect.ql
index 9ab24bdb659..8b300a08288 100644
--- a/java/ql/src/experimental/Security/CWE/CWE-601/SpringUrlRedirect.ql
+++ b/java/ql/src/experimental/Security/CWE/CWE-601/SpringUrlRedirect.ql
@@ -26,7 +26,7 @@ private predicate startsWithSanitizer(Guard g, Expr e, boolean branch) {
 }
 
 module SpringUrlRedirectFlowConfig implements DataFlow::ConfigSig {
-  predicate isSource(DataFlow::Node source) { source instanceof ThreatModelFlowSource }
+  predicate isSource(DataFlow::Node source) { source instanceof ActiveThreatModelSource }
 
   predicate isSink(DataFlow::Node sink) { sink instanceof SpringUrlRedirectSink }
 
diff --git a/java/ql/src/experimental/Security/CWE/CWE-652/XQueryInjection.ql b/java/ql/src/experimental/Security/CWE/CWE-652/XQueryInjection.ql
index f7a8c335f1a..a758b86279d 100644
--- a/java/ql/src/experimental/Security/CWE/CWE-652/XQueryInjection.ql
+++ b/java/ql/src/experimental/Security/CWE/CWE-652/XQueryInjection.ql
@@ -20,7 +20,7 @@ import XQueryInjectionFlow::PathGraph
  * A taint-tracking configuration tracing flow from remote sources, through an XQuery parser, to its eventual execution.
  */
 module XQueryInjectionConfig implements DataFlow::ConfigSig {
-  predicate isSource(DataFlow::Node source) { source instanceof ThreatModelFlowSource }
+  predicate isSource(DataFlow::Node source) { source instanceof ActiveThreatModelSource }
 
   predicate isSink(DataFlow::Node sink) {
     sink.asExpr() = any(XQueryPreparedExecuteCall xpec).getPreparedExpression() or
diff --git a/java/ql/src/experimental/Security/CWE/CWE-755/NFEAndroidDoS.ql b/java/ql/src/experimental/Security/CWE/CWE-755/NFEAndroidDoS.ql
index f2c31e566b8..c6737a11c32 100644
--- a/java/ql/src/experimental/Security/CWE/CWE-755/NFEAndroidDoS.ql
+++ b/java/ql/src/experimental/Security/CWE/CWE-755/NFEAndroidDoS.ql
@@ -24,7 +24,7 @@ import NfeLocalDoSFlow::PathGraph
  */
 module NfeLocalDoSConfig implements DataFlow::ConfigSig {
   /** Holds if source is a remote flow source */
-  predicate isSource(DataFlow::Node source) { source instanceof ThreatModelFlowSource }
+  predicate isSource(DataFlow::Node source) { source instanceof ActiveThreatModelSource }
 
   /** Holds if NFE is thrown but not caught */
   predicate isSink(DataFlow::Node sink) {
diff --git a/java/ql/src/qlpack.yml b/java/ql/src/qlpack.yml
index 28de019af81..40ca32d8070 100644
--- a/java/ql/src/qlpack.yml
+++ b/java/ql/src/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/java-queries
-version: 1.1.6-dev
+version: 1.1.9-dev
 groups:
   - java
   - queries
diff --git a/java/ql/src/utils/modeleditor/ModelEditor.qll b/java/ql/src/utils/modeleditor/ModelEditor.qll
index d5286e9024a..016b4664b3b 100644
--- a/java/ql/src/utils/modeleditor/ModelEditor.qll
+++ b/java/ql/src/utils/modeleditor/ModelEditor.qll
@@ -77,7 +77,7 @@ class Endpoint extends Callable {
   predicate isNeutral() {
     exists(string namespace, string type, string name, string signature |
       neutralModel(namespace, type, name, signature, _, _) and
-      this = interpretElement(namespace, type, false, name, signature, "", _)
+      this = interpretElement(namespace, type, true, name, signature, "", _)
     )
   }
 
diff --git a/java/ql/src/utils/modelgenerator/CaptureContentSummaryModels.ql b/java/ql/src/utils/modelgenerator/CaptureContentSummaryModels.ql
index e0e793348f5..b1340e2c0d3 100644
--- a/java/ql/src/utils/modelgenerator/CaptureContentSummaryModels.ql
+++ b/java/ql/src/utils/modelgenerator/CaptureContentSummaryModels.ql
@@ -9,5 +9,5 @@
 import internal.CaptureModels
 
 from DataFlowSummaryTargetApi api, string flow
-where flow = captureContentFlow(api)
+where flow = ContentSensitive::captureFlow(api, _)
 select flow order by flow
diff --git a/java/ql/src/utils/modelgenerator/CaptureMixedNeutralModels.ql b/java/ql/src/utils/modelgenerator/CaptureMixedNeutralModels.ql
new file mode 100644
index 00000000000..6ad94313769
--- /dev/null
+++ b/java/ql/src/utils/modelgenerator/CaptureMixedNeutralModels.ql
@@ -0,0 +1,13 @@
+/**
+ * @name Capture mixed neutral models.
+ * @description Finds neutral models to be used by other queries.
+ * @kind diagnostic
+ * @id java/utils/modelgenerator/mixed-neutral-models
+ * @tags modelgenerator
+ */
+
+import internal.CaptureModels
+
+from DataFlowSummaryTargetApi api, string noflow
+where noflow = captureMixedNeutral(api)
+select noflow order by noflow
diff --git a/java/ql/src/utils/modelgenerator/CaptureMixedSummaryModels.ql b/java/ql/src/utils/modelgenerator/CaptureMixedSummaryModels.ql
new file mode 100644
index 00000000000..b6f6fc9ff3a
--- /dev/null
+++ b/java/ql/src/utils/modelgenerator/CaptureMixedSummaryModels.ql
@@ -0,0 +1,13 @@
+/**
+ * @name Capture mixed summary models.
+ * @description Finds applicable summary models to be used by other queries.
+ * @kind diagnostic
+ * @id java/utils/modelgenerator/mixed-summary-models
+ * @tags modelgenerator
+ */
+
+import internal.CaptureModels
+
+from DataFlowSummaryTargetApi api, string flow
+where flow = captureMixedFlow(api, _)
+select flow order by flow
diff --git a/java/ql/src/utils/modelgenerator/CaptureNeutralModels.ql b/java/ql/src/utils/modelgenerator/CaptureNeutralModels.ql
index 2ff65ad7fae..c91f182f603 100644
--- a/java/ql/src/utils/modelgenerator/CaptureNeutralModels.ql
+++ b/java/ql/src/utils/modelgenerator/CaptureNeutralModels.ql
@@ -7,7 +7,6 @@
  */
 
 import internal.CaptureModels
-import internal.CaptureSummaryFlowQuery
 
 from DataFlowSummaryTargetApi api, string noflow
 where noflow = captureNoFlow(api)
diff --git a/java/ql/src/utils/modelgenerator/CaptureSummaryModels.ql b/java/ql/src/utils/modelgenerator/CaptureSummaryModels.ql
index 3f18bf49428..7fc7c0f7a57 100644
--- a/java/ql/src/utils/modelgenerator/CaptureSummaryModels.ql
+++ b/java/ql/src/utils/modelgenerator/CaptureSummaryModels.ql
@@ -7,7 +7,6 @@
  */
 
 import internal.CaptureModels
-import internal.CaptureSummaryFlowQuery
 
 from DataFlowSummaryTargetApi api, string flow
 where flow = captureFlow(api)
diff --git a/java/ql/src/utils/modelgenerator/internal/CaptureModels.qll b/java/ql/src/utils/modelgenerator/internal/CaptureModels.qll
index 0f24bab005e..3e8859be932 100644
--- a/java/ql/src/utils/modelgenerator/internal/CaptureModels.qll
+++ b/java/ql/src/utils/modelgenerator/internal/CaptureModels.qll
@@ -1,404 +1,299 @@
 /**
- * Provides classes and predicates related to capturing summary, source,
- * and sink models of the Standard or a 3rd party library.
+ * Provides predicates related to capturing summary models of the Standard or a 3rd party library.
  */
 
-private import CaptureModelsSpecific
-private import CaptureModelsPrinting
+private import java as J
+private import semmle.code.java.dataflow.DataFlow
+private import semmle.code.java.dataflow.ExternalFlow as ExternalFlow
+private import semmle.code.java.dataflow.internal.ContainerFlow as ContainerFlow
+private import semmle.code.java.dataflow.internal.DataFlowDispatch
+private import semmle.code.java.dataflow.internal.DataFlowImplCommon as DataFlowImplCommon
+private import semmle.code.java.dataflow.internal.DataFlowImplSpecific
+private import semmle.code.java.dataflow.internal.DataFlowPrivate as DataFlowPrivate
+private import semmle.code.java.dataflow.internal.DataFlowUtil as DataFlowUtil
+private import semmle.code.java.dataflow.internal.FlowSummaryImpl as FlowSummaryImpl
+private import semmle.code.java.dataflow.internal.ModelExclusions
+private import semmle.code.java.dataflow.internal.TaintTrackingImplSpecific
+private import semmle.code.java.dataflow.SSA as Ssa
+private import semmle.code.java.dataflow.TaintTracking
+private import codeql.mad.modelgenerator.internal.ModelGeneratorImpl
 
 /**
- * A node from which flow can return to the caller. This is either a regular
- * `ReturnNode` or a `PostUpdateNode` corresponding to the value of a parameter.
+ * Holds if the type `t` is a primitive type used for bulk data.
  */
-private class ReturnNodeExt extends DataFlow::Node {
-  private DataFlowImplCommon::ReturnKindExt kind;
+predicate isPrimitiveTypeUsedForBulkData(J::Type t) {
+  t.hasName(["byte", "char", "Byte", "Character"])
+}
 
-  ReturnNodeExt() {
-    kind = DataFlowImplCommon::getValueReturnPosition(this).getKind() or
-    kind = DataFlowImplCommon::getParamReturnPosition(this, _).getKind()
+module ModelGeneratorInput implements ModelGeneratorInputSig<Location, JavaDataFlow> {
+  class Type = J::Type;
+
+  class Parameter = J::Parameter;
+
+  class Callable = J::Callable;
+
+  class NodeExtended extends DataFlow::Node {
+    Callable getAsExprEnclosingCallable() { result = this.asExpr().getEnclosingCallable() }
+  }
+
+  private predicate isInfrequentlyUsed(J::CompilationUnit cu) {
+    cu.getPackage().getName().matches("javax.swing%") or
+    cu.getPackage().getName().matches("java.awt%")
+  }
+
+  private predicate relevant(Callable api) {
+    api.isPublic() and
+    api.getDeclaringType().isPublic() and
+    api.fromSource() and
+    not isUninterestingForModels(api) and
+    not isInfrequentlyUsed(api.getCompilationUnit())
+  }
+
+  private J::Method getARelevantOverride(J::Method m) {
+    result = m.getAnOverride() and
+    relevant(result) and
+    // Other exclusions for overrides.
+    not m instanceof J::ToStringMethod
   }
 
   /**
-   * Gets the kind of the return node.
+   * Gets the super implementation of `m` if it is relevant.
+   * If such a super implementations does not exist, returns `m` if it is relevant.
    */
-  DataFlowImplCommon::ReturnKindExt getKind() { result = kind }
-}
+  private J::Callable liftedImpl(J::Callable m) {
+    (
+      result = getARelevantOverride(m)
+      or
+      result = m and relevant(m)
+    ) and
+    not exists(getARelevantOverride(result))
+  }
 
-bindingset[c]
-private signature string printCallableParamSig(Callable c, ParameterPosition p);
+  private predicate hasManualSummaryModel(Callable api) {
+    api = any(FlowSummaryImpl::Public::SummarizedCallable sc | sc.applyManualModel()).asCallable() or
+    api = any(FlowSummaryImpl::Public::NeutralSummaryCallable sc | sc.hasManualModel()).asCallable()
+  }
 
-private module PrintReturnNodeExt<printCallableParamSig/2 printCallableParam> {
-  string getOutput(ReturnNodeExt node) {
-    node.getKind() instanceof DataFlowImplCommon::ValueReturnKind and
-    result = "ReturnValue"
-    or
-    exists(ParameterPosition pos |
-      pos = node.getKind().(DataFlowImplCommon::ParamUpdateReturnKind).getPosition() and
-      result = printCallableParam(returnNodeEnclosingCallable(node), pos)
+  private predicate hasManualSourceModel(Callable api) {
+    api = any(ExternalFlow::SourceCallable sc | sc.hasManualModel()) or
+    api = any(FlowSummaryImpl::Public::NeutralSourceCallable sc | sc.hasManualModel()).asCallable()
+  }
+
+  private predicate hasManualSinkModel(Callable api) {
+    api = any(ExternalFlow::SinkCallable sc | sc.hasManualModel()) or
+    api = any(FlowSummaryImpl::Public::NeutralSinkCallable sc | sc.hasManualModel()).asCallable()
+  }
+
+  predicate isUninterestingForDataFlowModels(Callable api) {
+    api.getDeclaringType() instanceof J::Interface and not exists(api.getBody())
+  }
+
+  predicate isUninterestingForHeuristicDataFlowModels(Callable api) { none() }
+
+  class SourceOrSinkTargetApi extends Callable {
+    SourceOrSinkTargetApi() { relevant(this) }
+  }
+
+  class SinkTargetApi extends SourceOrSinkTargetApi {
+    SinkTargetApi() { not hasManualSinkModel(this) }
+  }
+
+  class SourceTargetApi extends SourceOrSinkTargetApi {
+    SourceTargetApi() { not hasManualSourceModel(this) }
+  }
+
+  class SummaryTargetApi extends Callable {
+    private Callable lift;
+
+    SummaryTargetApi() {
+      lift = liftedImpl(this) and
+      not hasManualSummaryModel(lift)
+    }
+
+    Callable lift() { result = lift }
+
+    predicate isRelevant() {
+      relevant(this) and
+      not hasManualSummaryModel(this)
+    }
+  }
+
+  private string isExtensible(Callable c) {
+    if c.getDeclaringType().isFinal() then result = "false" else result = "true"
+  }
+
+  /**
+   * Holds if the callable `c` is in package `package`
+   * and is a member of `type`.
+   */
+  private predicate qualifiedName(Callable c, string package, string type) {
+    exists(RefType t | t = c.getDeclaringType() |
+      package = t.getCompilationUnit().getPackage().getName() and
+      type = t.getErasure().(J::RefType).getNestedName()
     )
   }
-}
 
-string getOutput(ReturnNodeExt node) {
-  result = PrintReturnNodeExt<paramReturnNodeAsOutput/2>::getOutput(node)
-}
-
-string getContentOutput(ReturnNodeExt node) {
-  result = PrintReturnNodeExt<paramReturnNodeAsContentOutput/2>::getOutput(node)
-}
-
-class DataFlowSummaryTargetApi extends SummaryTargetApi {
-  DataFlowSummaryTargetApi() { not isUninterestingForDataFlowModels(this) }
-}
-
-class DataFlowSourceTargetApi = SourceTargetApi;
-
-class DataFlowSinkTargetApi = SinkTargetApi;
-
-private module ModelPrintingInput implements ModelPrintingSig {
-  class SummaryApi = DataFlowSummaryTargetApi;
-
-  class SourceOrSinkApi = SourceOrSinkTargetApi;
-
-  string getProvenance() { result = "df-generated" }
-}
-
-module Printing = ModelPrinting<ModelPrintingInput>;
-
-/**
- * Holds if `c` is a relevant content kind, where the underlying type is relevant.
- */
-private predicate isRelevantTypeInContent(DataFlow::ContentSet c) {
-  isRelevantType(getUnderlyingContentType(c))
-}
-
-/**
- * Holds if data can flow from `node1` to `node2` either via a read or a write of an intermediate field `f`.
- */
-private predicate isRelevantTaintStep(DataFlow::Node node1, DataFlow::Node node2) {
-  exists(DataFlow::ContentSet f |
-    DataFlowPrivate::readStep(node1, f, node2) and
-    // Partially restrict the content types used for intermediate steps.
-    (not exists(getUnderlyingContentType(f)) or isRelevantTypeInContent(f))
-  )
-  or
-  exists(DataFlow::ContentSet f | DataFlowPrivate::storeStep(node1, f, node2) | containerContent(f))
-}
-
-/**
- * Holds if content `c` is either a field, a synthetic field or language specific
- * content of a relevant type or a container like content.
- */
-pragma[nomagic]
-private predicate isRelevantContent0(DataFlow::ContentSet c) {
-  isRelevantTypeInContent(c) or
-  containerContent(c)
-}
-
-/**
- * Gets the MaD string representation of the parameter node `p`.
- */
-string parameterNodeAsInput(DataFlow::ParameterNode p) {
-  result = parameterAccess(p.asParameter())
-  or
-  result = qualifierString() and p instanceof InstanceParameterNode
-}
-
-/**
- * Gets the MaD string representation of the parameter `p`
- * when used in content flow.
- */
-string parameterNodeAsContentInput(DataFlow::ParameterNode p) {
-  result = parameterContentAccess(p.asParameter())
-  or
-  result = qualifierString() and p instanceof InstanceParameterNode
-}
-
-/**
- * Gets the MaD input string representation of `source`.
- */
-string asInputArgument(DataFlow::Node source) { result = asInputArgumentSpecific(source) }
-
-/**
- * Gets the summary model of `api`, if it follows the `fluent` programming pattern (returns `this`).
- */
-string captureQualifierFlow(DataFlowSummaryTargetApi api) {
-  exists(ReturnNodeExt ret |
-    api = returnNodeEnclosingCallable(ret) and
-    isOwnInstanceAccessNode(ret)
-  ) and
-  result = Printing::asValueModel(api, qualifierString(), "ReturnValue")
-}
-
-private int accessPathLimit0() { result = 2 }
-
-private newtype TTaintState =
-  TTaintRead(int n) { n in [0 .. accessPathLimit0()] } or
-  TTaintStore(int n) { n in [1 .. accessPathLimit0()] }
-
-abstract private class TaintState extends TTaintState {
-  abstract string toString();
-}
-
-/**
- * A FlowState representing a tainted read.
- */
-private class TaintRead extends TaintState, TTaintRead {
-  private int step;
-
-  TaintRead() { this = TTaintRead(step) }
-
-  /**
-   * Gets the flow state step number.
-   */
-  int getStep() { result = step }
-
-  override string toString() { result = "TaintRead(" + step + ")" }
-}
-
-/**
- * A FlowState representing a tainted write.
- */
-private class TaintStore extends TaintState, TTaintStore {
-  private int step;
-
-  TaintStore() { this = TTaintStore(step) }
-
-  /**
-   * Gets the flow state step number.
-   */
-  int getStep() { result = step }
-
-  override string toString() { result = "TaintStore(" + step + ")" }
-}
-
-/**
- * A data-flow configuration for tracking flow through APIs.
- * The sources are the parameters of an API and the sinks are the return values (excluding `this`) and parameters.
- *
- * This can be used to generate Flow summaries for APIs from parameter to return.
- */
-module PropagateFlowConfig implements DataFlow::StateConfigSig {
-  class FlowState = TaintState;
-
-  predicate isSource(DataFlow::Node source, FlowState state) {
-    source instanceof DataFlow::ParameterNode and
-    source.getEnclosingCallable() instanceof DataFlowSummaryTargetApi and
-    state.(TaintRead).getStep() = 0
+  predicate isRelevantType(Type t) {
+    not t instanceof J::TypeClass and
+    not t instanceof J::EnumType and
+    not t instanceof J::PrimitiveType and
+    not t instanceof J::BoxedType and
+    not t.(J::RefType).getAnAncestor().hasQualifiedName("java.lang", "Number") and
+    not t.(J::RefType).getAnAncestor().hasQualifiedName("java.nio.charset", "Charset") and
+    (
+      not t.(J::Array).getElementType() instanceof J::PrimitiveType or
+      isPrimitiveTypeUsedForBulkData(t.(J::Array).getElementType())
+    ) and
+    (
+      not t.(J::Array).getElementType() instanceof J::BoxedType or
+      isPrimitiveTypeUsedForBulkData(t.(J::Array).getElementType())
+    ) and
+    (
+      not t.(ContainerFlow::CollectionType).getElementType() instanceof J::BoxedType or
+      isPrimitiveTypeUsedForBulkData(t.(ContainerFlow::CollectionType).getElementType())
+    )
   }
 
-  predicate isSink(DataFlow::Node sink, FlowState state) {
-    sink instanceof ReturnNodeExt and
-    not isOwnInstanceAccessNode(sink) and
-    not exists(captureQualifierFlow(sink.asExpr().getEnclosingCallable())) and
-    (state instanceof TaintRead or state instanceof TaintStore)
+  Type getUnderlyingContentType(DataFlow::ContentSet c) {
+    result = c.(DataFlow::FieldContent).getField().getType() or
+    result = c.(DataFlow::SyntheticFieldContent).getField().getType()
   }
 
-  predicate isAdditionalFlowStep(
-    DataFlow::Node node1, FlowState state1, DataFlow::Node node2, FlowState state2
+  string qualifierString() { result = "Argument[this]" }
+
+  string parameterAccess(J::Parameter p) {
+    if
+      p.getType() instanceof J::Array and
+      not isPrimitiveTypeUsedForBulkData(p.getType().(J::Array).getElementType())
+    then result = "Argument[" + p.getPosition() + "].ArrayElement"
+    else
+      if p.getType() instanceof ContainerFlow::ContainerType
+      then result = "Argument[" + p.getPosition() + "].Element"
+      else result = "Argument[" + p.getPosition() + "]"
+  }
+
+  string parameterContentAccess(J::Parameter p) { result = "Argument[" + p.getPosition() + "]" }
+
+  class InstanceParameterNode = DataFlow::InstanceParameterNode;
+
+  bindingset[c]
+  string paramReturnNodeAsOutput(Callable c, ParameterPosition pos) {
+    result = parameterAccess(c.getParameter(pos))
+    or
+    result = qualifierString() and pos = -1
+  }
+
+  bindingset[c]
+  string paramReturnNodeAsContentOutput(Callable c, ParameterPosition pos) {
+    result = parameterContentAccess(c.getParameter(pos))
+    or
+    result = qualifierString() and pos = -1
+  }
+
+  Callable returnNodeEnclosingCallable(DataFlow::Node ret) {
+    result = DataFlowImplCommon::getNodeEnclosingCallable(ret).asCallable()
+  }
+
+  predicate isOwnInstanceAccessNode(DataFlowPrivate::ReturnNode node) {
+    node.asExpr().(J::ThisAccess).isOwnInstanceAccess()
+  }
+
+  predicate sinkModelSanitizer(DataFlow::Node node) {
+    // exclude variable capture jump steps
+    exists(Ssa::SsaImplicitInit closure |
+      closure.captures(_) and
+      node.asExpr() = closure.getAFirstUse()
+    )
+  }
+
+  predicate apiSource(DataFlow::Node source) {
+    (
+      source.asExpr().(J::FieldAccess).isOwnFieldAccess() or
+      source instanceof DataFlow::ParameterNode
+    ) and
+    exists(J::RefType t |
+      t = source.getEnclosingCallable().getDeclaringType().getAnAncestor() and
+      not t instanceof J::TypeObject and
+      t.isPublic()
+    )
+  }
+
+  predicate irrelevantSourceSinkApi(Callable source, SourceTargetApi api) { none() }
+
+  string getInputArgument(DataFlow::Node source) {
+    exists(int pos |
+      source.(DataFlow::ParameterNode).isParameterOf(_, pos) and
+      if pos >= 0 then result = "Argument[" + pos + "]" else result = qualifierString()
+    )
+    or
+    source.asExpr() instanceof J::FieldAccess and
+    result = qualifierString()
+  }
+
+  bindingset[kind]
+  predicate isRelevantSinkKind(string kind) {
+    not kind = "log-injection" and
+    not kind.matches("regex-use%") and
+    not kind = "file-content-store"
+  }
+
+  bindingset[kind]
+  predicate isRelevantSourceKind(string kind) { any() }
+
+  predicate containerContent = DataFlowPrivate::containerContent/1;
+
+  predicate isAdditionalContentFlowStep(DataFlow::Node node1, DataFlow::Node node2) {
+    TaintTracking::defaultAdditionalTaintStep(node1, node2, _) and
+    not exists(DataFlow::Content f |
+      DataFlowPrivate::readStep(node1, f, node2) and containerContent(f)
+    )
+  }
+
+  predicate isField(DataFlow::ContentSet c) {
+    c instanceof DataFlowUtil::FieldContent or
+    c instanceof DataFlowUtil::SyntheticFieldContent
+  }
+
+  predicate isCallback(DataFlow::ContentSet c) { none() }
+
+  string getSyntheticName(DataFlow::ContentSet c) {
+    exists(Field f |
+      not f.isPublic() and
+      f = c.(DataFlowUtil::FieldContent).getField() and
+      result = f.getQualifiedName()
+    )
+    or
+    result = c.(DataFlowUtil::SyntheticFieldContent).getField()
+  }
+
+  string printContent(DataFlow::ContentSet c) {
+    exists(Field f | f = c.(DataFlowUtil::FieldContent).getField() and f.isPublic() |
+      result = "Field[" + f.getQualifiedName() + "]"
+    )
+    or
+    result = "SyntheticField[" + getSyntheticName(c) + "]"
+    or
+    c instanceof DataFlowUtil::CollectionContent and result = "Element"
+    or
+    c instanceof DataFlowUtil::ArrayContent and result = "ArrayElement"
+    or
+    c instanceof DataFlowUtil::MapValueContent and result = "MapValue"
+    or
+    c instanceof DataFlowUtil::MapKeyContent and result = "MapKey"
+  }
+
+  predicate partialModel(
+    Callable api, string package, string type, string extensible, string name, string parameters
   ) {
-    exists(DataFlow::ContentSet c |
-      DataFlowImplCommon::store(node1, c.getAStoreContent(), node2, _, _) and
-      isRelevantContent0(c) and
-      (
-        state1 instanceof TaintRead and state2.(TaintStore).getStep() = 1
-        or
-        state1.(TaintStore).getStep() + 1 = state2.(TaintStore).getStep()
-      )
-    )
-    or
-    exists(DataFlow::ContentSet c |
-      DataFlowPrivate::readStep(node1, c, node2) and
-      isRelevantContent0(c) and
-      state1.(TaintRead).getStep() + 1 = state2.(TaintRead).getStep()
-    )
+    qualifiedName(api, package, type) and
+    extensible = isExtensible(api) and
+    name = api.getName() and
+    parameters = ExternalFlow::paramsString(api)
   }
 
-  predicate isBarrier(DataFlow::Node n) {
-    exists(Type t | t = n.getType() and not isRelevantType(t))
-  }
+  predicate sourceNode = ExternalFlow::sourceNode/2;
 
-  DataFlow::FlowFeature getAFeature() {
-    result instanceof DataFlow::FeatureEqualSourceSinkCallContext
-  }
+  predicate sinkNode = ExternalFlow::sinkNode/2;
 }
 
-module PropagateFlow = TaintTracking::GlobalWithState<PropagateFlowConfig>;
-
-/**
- * Gets the summary model(s) of `api`, if there is flow from parameters to return value or parameter.
- */
-string captureThroughFlow0(
-  DataFlowSummaryTargetApi api, DataFlow::ParameterNode p, ReturnNodeExt returnNodeExt
-) {
-  exists(string input, string output |
-    p.getEnclosingCallable() = api and
-    returnNodeExt.(DataFlow::Node).getEnclosingCallable() = api and
-    input = parameterNodeAsInput(p) and
-    output = getOutput(returnNodeExt) and
-    input != output and
-    result = Printing::asTaintModel(api, input, output)
-  )
-}
-
-/**
- * Gets the summary model(s) of `api`, if there is flow from parameters to return value or parameter.
- */
-string captureThroughFlow(DataFlowSummaryTargetApi api) {
-  exists(DataFlow::ParameterNode p, ReturnNodeExt returnNodeExt |
-    PropagateFlow::flow(p, returnNodeExt) and
-    result = captureThroughFlow0(api, p, returnNodeExt)
-  )
-}
-
-private module PropagateContentFlowConfig implements ContentDataFlow::ConfigSig {
-  predicate isSource(DataFlow::Node source) {
-    source instanceof DataFlow::ParameterNode and
-    source.getEnclosingCallable() instanceof DataFlowSummaryTargetApi
-  }
-
-  predicate isSink(DataFlow::Node sink) {
-    sink instanceof ReturnNodeExt and
-    sink.getEnclosingCallable() instanceof DataFlowSummaryTargetApi
-  }
-
-  predicate isAdditionalFlowStep = isAdditionalContentFlowStep/2;
-
-  predicate isBarrier(DataFlow::Node n) {
-    exists(Type t | t = n.getType() and not isRelevantType(t))
-  }
-
-  int accessPathLimit() { result = 2 }
-
-  predicate isRelevantContent(DataFlow::ContentSet s) { isRelevantContent0(s) }
-
-  DataFlow::FlowFeature getAFeature() {
-    result instanceof DataFlow::FeatureEqualSourceSinkCallContext
-  }
-}
-
-private module PropagateContentFlow = ContentDataFlow::Global<PropagateContentFlowConfig>;
-
-private string getContent(PropagateContentFlow::AccessPath ap, int i) {
-  exists(ContentSet head, PropagateContentFlow::AccessPath tail |
-    head = ap.getHead() and
-    tail = ap.getTail()
-  |
-    i = 0 and
-    result = "." + printContent(head)
-    or
-    i > 0 and result = getContent(tail, i - 1)
-  )
-}
-
-private string printStoreAccessPath(PropagateContentFlow::AccessPath ap) {
-  result = concat(int i | | getContent(ap, i), "" order by i)
-}
-
-private string printReadAccessPath(PropagateContentFlow::AccessPath ap) {
-  result = concat(int i | | getContent(ap, i), "" order by i desc)
-}
-
-string captureContentFlow(DataFlowSummaryTargetApi api) {
-  exists(
-    DataFlow::ParameterNode p, ReturnNodeExt returnNodeExt, string input, string output,
-    PropagateContentFlow::AccessPath reads, PropagateContentFlow::AccessPath stores,
-    boolean preservesValue
-  |
-    PropagateContentFlow::flow(p, reads, returnNodeExt, stores, preservesValue) and
-    returnNodeExt.getEnclosingCallable() = api and
-    input = parameterNodeAsContentInput(p) + printReadAccessPath(reads) and
-    output = getContentOutput(returnNodeExt) + printStoreAccessPath(stores) and
-    input != output and
-    result = Printing::asModel(api, input, output, preservesValue)
-  )
-}
-
-/**
- * A dataflow configuration used for finding new sources.
- * The sources are the already known existing sources and the sinks are the API return nodes.
- *
- * This can be used to generate Source summaries for an API, if the API expose an already known source
- * via its return (then the API itself becomes a source).
- */
-module PropagateFromSourceConfig implements DataFlow::ConfigSig {
-  predicate isSource(DataFlow::Node source) {
-    exists(string kind |
-      isRelevantSourceKind(kind) and
-      ExternalFlow::sourceNode(source, kind)
-    )
-  }
-
-  predicate isSink(DataFlow::Node sink) {
-    sink instanceof ReturnNodeExt and
-    sink.getEnclosingCallable() instanceof DataFlowSourceTargetApi
-  }
-
-  DataFlow::FlowFeature getAFeature() { result instanceof DataFlow::FeatureHasSinkCallContext }
-
-  predicate isBarrier(DataFlow::Node n) {
-    exists(Type t | t = n.getType() and not isRelevantType(t))
-  }
-
-  predicate isAdditionalFlowStep(DataFlow::Node node1, DataFlow::Node node2) {
-    isRelevantTaintStep(node1, node2)
-  }
-}
-
-private module PropagateFromSource = TaintTracking::Global<PropagateFromSourceConfig>;
-
-/**
- * Gets the source model(s) of `api`, if there is flow from an existing known source to the return of `api`.
- */
-string captureSource(DataFlowSourceTargetApi api) {
-  exists(DataFlow::Node source, ReturnNodeExt sink, string kind |
-    PropagateFromSource::flow(source, sink) and
-    ExternalFlow::sourceNode(source, kind) and
-    api = sink.getEnclosingCallable() and
-    not irrelevantSourceSinkApi(source.getEnclosingCallable(), api) and
-    result = Printing::asSourceModel(api, getOutput(sink), kind)
-  )
-}
-
-/**
- * A dataflow configuration used for finding new sinks.
- * The sources are the parameters of the API and the fields of the enclosing type.
- *
- * This can be used to generate Sink summaries for APIs, if the API propagates a parameter (or enclosing type field)
- * into an existing known sink (then the API itself becomes a sink).
- */
-module PropagateToSinkConfig implements DataFlow::ConfigSig {
-  predicate isSource(DataFlow::Node source) {
-    apiSource(source) and source.getEnclosingCallable() instanceof DataFlowSinkTargetApi
-  }
-
-  predicate isSink(DataFlow::Node sink) {
-    exists(string kind | isRelevantSinkKind(kind) and ExternalFlow::sinkNode(sink, kind))
-  }
-
-  predicate isBarrier(DataFlow::Node node) {
-    exists(Type t | t = node.getType() and not isRelevantType(t))
-    or
-    sinkModelSanitizer(node)
-  }
-
-  DataFlow::FlowFeature getAFeature() { result instanceof DataFlow::FeatureHasSourceCallContext }
-
-  predicate isAdditionalFlowStep(DataFlow::Node node1, DataFlow::Node node2) {
-    isRelevantTaintStep(node1, node2)
-  }
-}
-
-private module PropagateToSink = TaintTracking::Global<PropagateToSinkConfig>;
-
-/**
- * Gets the sink model(s) of `api`, if there is flow from a parameter to an existing known sink.
- */
-string captureSink(DataFlowSinkTargetApi api) {
-  exists(DataFlow::Node src, DataFlow::Node sink, string kind |
-    PropagateToSink::flow(src, sink) and
-    ExternalFlow::sinkNode(sink, kind) and
-    api = src.getEnclosingCallable() and
-    result = Printing::asSinkModel(api, asInputArgument(src), kind)
-  )
-}
+import MakeModelGenerator<Location, JavaDataFlow, JavaTaintTracking, ModelGeneratorInput>
diff --git a/java/ql/src/utils/modelgenerator/internal/CaptureModelsPrinting.qll b/java/ql/src/utils/modelgenerator/internal/CaptureModelsPrinting.qll
index 33d176c3d89..dbf08b15e90 100644
--- a/java/ql/src/utils/modelgenerator/internal/CaptureModelsPrinting.qll
+++ b/java/ql/src/utils/modelgenerator/internal/CaptureModelsPrinting.qll
@@ -1,11 +1,11 @@
 private import java as J
-private import codeql.mad.modelgenerator.ModelPrinting
-private import CaptureModelsSpecific as Specific
+private import codeql.mad.modelgenerator.internal.ModelPrinting
+private import CaptureModels::ModelGeneratorInput as ModelGeneratorInput
 
 private module ModelPrintingLang implements ModelPrintingLangSig {
   class Callable = J::Callable;
 
-  predicate partialModel = Specific::partialModel/6;
+  predicate partialModel = ModelGeneratorInput::partialModel/6;
 }
 
 import ModelPrintingImpl<ModelPrintingLang>
diff --git a/java/ql/src/utils/modelgenerator/internal/CaptureModelsSpecific.qll b/java/ql/src/utils/modelgenerator/internal/CaptureModelsSpecific.qll
deleted file mode 100644
index 763960df0d8..00000000000
--- a/java/ql/src/utils/modelgenerator/internal/CaptureModelsSpecific.qll
+++ /dev/null
@@ -1,361 +0,0 @@
-/**
- * Provides predicates related to capturing summary models of the Standard or a 3rd party library.
- */
-
-private import java as J
-private import semmle.code.java.dataflow.internal.DataFlowPrivate
-private import semmle.code.java.dataflow.internal.DataFlowUtil as DataFlowUtil
-private import semmle.code.java.dataflow.internal.ContainerFlow as ContainerFlow
-private import semmle.code.java.dataflow.internal.FlowSummaryImpl as FlowSummaryImpl
-private import semmle.code.java.dataflow.internal.ModelExclusions
-private import semmle.code.java.dataflow.DataFlow as Df
-private import semmle.code.java.dataflow.internal.ContentDataFlow as Cdf
-private import semmle.code.java.dataflow.SSA as Ssa
-private import semmle.code.java.dataflow.TaintTracking as Tt
-import semmle.code.java.dataflow.ExternalFlow as ExternalFlow
-import semmle.code.java.dataflow.internal.DataFlowImplCommon as DataFlowImplCommon
-import semmle.code.java.dataflow.internal.DataFlowPrivate as DataFlowPrivate
-import semmle.code.java.dataflow.internal.DataFlowDispatch as DataFlowDispatch
-
-module DataFlow = Df::DataFlow;
-
-module ContentDataFlow = Cdf::ContentDataFlow;
-
-module TaintTracking = Tt::TaintTracking;
-
-class Type = J::Type;
-
-class Unit = J::Unit;
-
-class Callable = J::Callable;
-
-class ContentSet = DataFlowUtil::ContentSet;
-
-private predicate isInfrequentlyUsed(J::CompilationUnit cu) {
-  cu.getPackage().getName().matches("javax.swing%") or
-  cu.getPackage().getName().matches("java.awt%")
-}
-
-private predicate relevant(Callable api) {
-  api.isPublic() and
-  api.getDeclaringType().isPublic() and
-  api.fromSource() and
-  not isUninterestingForModels(api) and
-  not isInfrequentlyUsed(api.getCompilationUnit())
-}
-
-private J::Method getARelevantOverride(J::Method m) {
-  result = m.getAnOverride() and
-  relevant(result) and
-  // Other exclusions for overrides.
-  not m instanceof J::ToStringMethod
-}
-
-/**
- * Gets the super implementation of `m` if it is relevant.
- * If such a super implementations does not exist, returns `m` if it is relevant.
- */
-private J::Callable liftedImpl(J::Callable m) {
-  (
-    result = getARelevantOverride(m)
-    or
-    result = m and relevant(m)
-  ) and
-  not exists(getARelevantOverride(result))
-}
-
-private predicate hasManualSummaryModel(Callable api) {
-  api = any(FlowSummaryImpl::Public::SummarizedCallable sc | sc.applyManualModel()).asCallable() or
-  api = any(FlowSummaryImpl::Public::NeutralSummaryCallable sc | sc.hasManualModel()).asCallable()
-}
-
-private predicate hasManualSourceModel(Callable api) {
-  api = any(ExternalFlow::SourceCallable sc | sc.hasManualModel()) or
-  api = any(FlowSummaryImpl::Public::NeutralSourceCallable sc | sc.hasManualModel()).asCallable()
-}
-
-private predicate hasManualSinkModel(Callable api) {
-  api = any(ExternalFlow::SinkCallable sc | sc.hasManualModel()) or
-  api = any(FlowSummaryImpl::Public::NeutralSinkCallable sc | sc.hasManualModel()).asCallable()
-}
-
-/**
- * Holds if it is irrelevant to generate models for `api` based on data flow analysis.
- *
- * This serves as an extra filter for the `relevant` predicate.
- */
-predicate isUninterestingForDataFlowModels(Callable api) {
-  api.getDeclaringType() instanceof J::Interface and not exists(api.getBody())
-}
-
-/**
- * A class of callables that are potentially relevant for generating source or
- * sink models.
- */
-class SourceOrSinkTargetApi extends Callable {
-  SourceOrSinkTargetApi() { relevant(this) }
-}
-
-/**
- * A class of callables that are potentially relevant for generating sink models.
- */
-class SinkTargetApi extends SourceOrSinkTargetApi {
-  SinkTargetApi() { not hasManualSinkModel(this) }
-}
-
-/**
- * A class of callables that are potentially relevant for generating source models.
- */
-class SourceTargetApi extends SourceOrSinkTargetApi {
-  SourceTargetApi() { not hasManualSourceModel(this) }
-}
-
-/**
- * Holds if it is irrelevant to generate models for `api` based on type-based analysis.
- *
- * This serves as an extra filter for the `relevant` predicate.
- */
-predicate isUninterestingForTypeBasedFlowModels(Callable api) { none() }
-
-/**
- * A class of callables that are potentially relevant for generating summary or
- * neutral models.
- *
- * In the Standard library and 3rd party libraries it is the callables (or callables that have a
- * super implementation) that can be called from outside the library itself.
- */
-class SummaryTargetApi extends Callable {
-  private Callable lift;
-
-  SummaryTargetApi() {
-    lift = liftedImpl(this) and
-    not hasManualSummaryModel(lift)
-  }
-
-  /**
-   * Gets the callable that a model will be lifted to.
-   */
-  Callable lift() { result = lift }
-
-  /**
-   * Holds if this callable is relevant in terms of generating models.
-   */
-  predicate isRelevant() { relevant(this) }
-}
-
-private string isExtensible(Callable c) {
-  if c.getDeclaringType().isFinal() then result = "false" else result = "true"
-}
-
-/**
- * Holds if the callable `c` is in package `package`
- * and is a member of `type`.
- */
-private predicate qualifiedName(Callable c, string package, string type) {
-  exists(RefType t | t = c.getDeclaringType() |
-    package = t.getCompilationUnit().getPackage().getName() and
-    type = t.getErasure().(J::RefType).getNestedName()
-  )
-}
-
-predicate partialModel(
-  Callable api, string package, string type, string extensible, string name, string parameters
-) {
-  qualifiedName(api, package, type) and
-  extensible = isExtensible(api) and
-  name = api.getName() and
-  parameters = ExternalFlow::paramsString(api)
-}
-
-predicate isPrimitiveTypeUsedForBulkData(J::Type t) {
-  t.hasName(["byte", "char", "Byte", "Character"])
-}
-
-/**
- * Holds for type `t` for fields that are relevant as an intermediate
- * read or write step in the data flow analysis.
- */
-predicate isRelevantType(J::Type t) {
-  not t instanceof J::TypeClass and
-  not t instanceof J::EnumType and
-  not t instanceof J::PrimitiveType and
-  not t instanceof J::BoxedType and
-  not t.(J::RefType).getAnAncestor().hasQualifiedName("java.lang", "Number") and
-  not t.(J::RefType).getAnAncestor().hasQualifiedName("java.nio.charset", "Charset") and
-  (
-    not t.(J::Array).getElementType() instanceof J::PrimitiveType or
-    isPrimitiveTypeUsedForBulkData(t.(J::Array).getElementType())
-  ) and
-  (
-    not t.(J::Array).getElementType() instanceof J::BoxedType or
-    isPrimitiveTypeUsedForBulkData(t.(J::Array).getElementType())
-  ) and
-  (
-    not t.(ContainerFlow::CollectionType).getElementType() instanceof J::BoxedType or
-    isPrimitiveTypeUsedForBulkData(t.(ContainerFlow::CollectionType).getElementType())
-  )
-}
-
-/**
- * Gets the underlying type of the content `c`.
- */
-J::Type getUnderlyingContentType(DataFlow::Content c) {
-  result = c.(DataFlow::FieldContent).getField().getType() or
-  result = c.(DataFlow::SyntheticFieldContent).getField().getType()
-}
-
-/**
- * Gets the MaD string representation of the qualifier.
- */
-string qualifierString() { result = "Argument[this]" }
-
-/**
- * Gets the MaD string representation of the parameter `p`.
- */
-string parameterAccess(J::Parameter p) {
-  if
-    p.getType() instanceof J::Array and
-    not isPrimitiveTypeUsedForBulkData(p.getType().(J::Array).getElementType())
-  then result = "Argument[" + p.getPosition() + "].ArrayElement"
-  else
-    if p.getType() instanceof ContainerFlow::ContainerType
-    then result = "Argument[" + p.getPosition() + "].Element"
-    else result = "Argument[" + p.getPosition() + "]"
-}
-
-/**
- * Gets the MaD string representation of the parameter `p`
- * when used in content flow.
- */
-string parameterContentAccess(J::Parameter p) { result = "Argument[" + p.getPosition() + "]" }
-
-class InstanceParameterNode = DataFlow::InstanceParameterNode;
-
-class ParameterPosition = DataFlowDispatch::ParameterPosition;
-
-/**
- * Gets the MaD string representation of return through parameter at position
- * `pos` of callable `c`.
- */
-bindingset[c]
-string paramReturnNodeAsOutput(Callable c, ParameterPosition pos) {
-  result = parameterAccess(c.getParameter(pos))
-  or
-  result = qualifierString() and pos = -1
-}
-
-/**
- * Gets the MaD string representation of return through parameter at position
- * `pos` of callable `c` for content flow.
- */
-bindingset[c]
-string paramReturnNodeAsContentOutput(Callable c, ParameterPosition pos) {
-  result = parameterContentAccess(c.getParameter(pos))
-  or
-  result = qualifierString() and pos = -1
-}
-
-/**
- * Gets the enclosing callable of `ret`.
- */
-Callable returnNodeEnclosingCallable(DataFlow::Node ret) {
-  result = DataFlowImplCommon::getNodeEnclosingCallable(ret).asCallable()
-}
-
-/**
- * Holds if `node` is an own instance access.
- */
-predicate isOwnInstanceAccessNode(ReturnNode node) {
-  node.asExpr().(J::ThisAccess).isOwnInstanceAccess()
-}
-
-predicate sinkModelSanitizer(DataFlow::Node node) {
-  // exclude variable capture jump steps
-  exists(Ssa::SsaImplicitInit closure |
-    closure.captures(_) and
-    node.asExpr() = closure.getAFirstUse()
-  )
-}
-
-/**
- * Holds if `source` is an api entrypoint relevant for creating sink models.
- */
-predicate apiSource(DataFlow::Node source) {
-  (
-    source.asExpr().(J::FieldAccess).isOwnFieldAccess() or
-    source instanceof DataFlow::ParameterNode
-  ) and
-  exists(J::RefType t |
-    t = source.getEnclosingCallable().getDeclaringType().getAnAncestor() and
-    not t instanceof J::TypeObject and
-    t.isPublic()
-  )
-}
-
-/**
- * Holds if it is not relevant to generate a source model for `api`, even
- * if flow is detected from a node within `source` to a sink within `api`.
- */
-predicate irrelevantSourceSinkApi(Callable source, SourceTargetApi api) { none() }
-
-/**
- * Gets the MaD input string representation of `source`.
- */
-string asInputArgumentSpecific(DataFlow::Node source) {
-  exists(int pos |
-    source.(DataFlow::ParameterNode).isParameterOf(_, pos) and
-    if pos >= 0 then result = "Argument[" + pos + "]" else result = qualifierString()
-  )
-  or
-  source.asExpr() instanceof J::FieldAccess and
-  result = qualifierString()
-}
-
-/**
- * Holds if `kind` is a relevant sink kind for creating sink models.
- */
-bindingset[kind]
-predicate isRelevantSinkKind(string kind) {
-  not kind = "log-injection" and
-  not kind.matches("regex-use%") and
-  not kind = "file-content-store"
-}
-
-/**
- * Holds if `kind` is a relevant source kind for creating source models.
- */
-bindingset[kind]
-predicate isRelevantSourceKind(string kind) { any() }
-
-predicate containerContent = DataFlowPrivate::containerContent/1;
-
-/**
- * Holds if there is a taint step from `node1` to `node2` in content flow.
- */
-predicate isAdditionalContentFlowStep(DataFlow::Node node1, DataFlow::Node node2) {
-  TaintTracking::defaultAdditionalTaintStep(node1, node2, _) and
-  not exists(DataFlow::Content f |
-    DataFlowPrivate::readStep(node1, f, node2) and containerContent(f)
-  )
-}
-
-/**
- * Gets the MaD string representation of the contentset `c`.
- */
-string printContent(ContentSet c) {
-  exists(Field f, string name |
-    f = c.(DataFlowUtil::FieldContent).getField() and name = f.getQualifiedName()
-  |
-    if f.isPublic() then result = "Field[" + name + "]" else result = "SyntheticField[" + name + "]"
-  )
-  or
-  result = "SyntheticField[" + c.(DataFlowUtil::SyntheticFieldContent).getField() + "]"
-  or
-  c instanceof DataFlowUtil::CollectionContent and result = "Element"
-  or
-  c instanceof DataFlowUtil::ArrayContent and result = "ArrayElement"
-  or
-  c instanceof DataFlowUtil::MapValueContent and result = "MapValue"
-  or
-  c instanceof DataFlowUtil::MapKeyContent and result = "MapKey"
-}
diff --git a/java/ql/src/utils/modelgenerator/internal/CaptureSummaryFlowQuery.qll b/java/ql/src/utils/modelgenerator/internal/CaptureSummaryFlowQuery.qll
deleted file mode 100644
index 5b1a6fc031b..00000000000
--- a/java/ql/src/utils/modelgenerator/internal/CaptureSummaryFlowQuery.qll
+++ /dev/null
@@ -1,84 +0,0 @@
-private import CaptureModels
-
-/**
- * Capture fluent APIs that return `this`.
- * Example of a fluent API:
- * ```java
- * public class Foo {
- *   public Foo someAPI() {
- *    // some side-effect
- *    return this;
- *  }
- * }
- * ```
- *
- * Capture APIs that transfer taint from an input parameter to an output return
- * value or parameter.
- * Allows a sequence of read steps followed by a sequence of store steps.
- *
- * Examples:
- *
- * ```java
- * public class Foo {
- *   private String tainted;
- *
- *   public String returnsTainted() {
- *     return tainted;
- *   }
- *
- *   public void putsTaintIntoParameter(List<String> foo) {
- *     foo.add(tainted);
- *   }
- * }
- * ```
- * Captured Models:
- * ```
- * p;Foo;true;returnsTainted;;Argument[this];ReturnValue;taint;df-generated
- * p;Foo;true;putsTaintIntoParameter;(List);Argument[this];Argument[0];taint;df-generated
- * ```
- *
- * ```java
- * public class Foo {
- *  private String tainted;
- *  public void doSomething(String input) {
- *    tainted = input;
- *  }
- * ```
- * Captured Model:
- * ```p;Foo;true;doSomething;(String);Argument[0];Argument[this];taint;df-generated```
- *
- * ```java
- * public class Foo {
- *   public String returnData(String tainted) {
- *     return tainted.substring(0,10)
- *   }
- * }
- * ```
- * Captured Model:
- * ```p;Foo;true;returnData;;Argument[0];ReturnValue;taint;df-generated```
- *
- * ```java
- * public class Foo {
- *   public void addToList(String tainted, List<String> foo) {
- *     foo.add(tainted);
- *   }
- * }
- * ```
- * Captured Model:
- * ```p;Foo;true;addToList;;Argument[0];Argument[1];taint;df-generated```
- */
-string captureFlow(DataFlowSummaryTargetApi api) {
-  result = captureQualifierFlow(api) or
-  result = captureThroughFlow(api)
-}
-
-/**
- * Gets the neutral summary model for `api`, if any.
- * A neutral summary model is generated, if we are not generating
- * a summary model that applies to `api`.
- */
-string captureNoFlow(DataFlowSummaryTargetApi api) {
-  not exists(DataFlowSummaryTargetApi api0 | exists(captureFlow(api0)) and api0.lift() = api.lift()) and
-  api.isRelevant() and
-  result = Printing::asNeutralSummaryModel(api)
-}
diff --git a/java/ql/src/utils/modelgenerator/internal/CaptureTypeBasedSummaryModels.qll b/java/ql/src/utils/modelgenerator/internal/CaptureTypeBasedSummaryModels.qll
index 34e53bad2d7..36aec805319 100644
--- a/java/ql/src/utils/modelgenerator/internal/CaptureTypeBasedSummaryModels.qll
+++ b/java/ql/src/utils/modelgenerator/internal/CaptureTypeBasedSummaryModels.qll
@@ -1,7 +1,8 @@
 private import java
 private import semmle.code.java.Collections
 private import semmle.code.java.dataflow.internal.ContainerFlow
-private import CaptureModelsSpecific as Specific
+private import CaptureModels as CaptureModels
+private import CaptureModels::ModelGeneratorInput as ModelGeneratorInput
 private import CaptureModelsPrinting
 
 /**
@@ -81,7 +82,7 @@ private predicate localTypeParameter(Callable callable, TypeVariable tv) {
 private string getAccessPath(Type t) {
   if
     t instanceof Array and
-    not Specific::isPrimitiveTypeUsedForBulkData(t.(Array).getElementType())
+    not CaptureModels::isPrimitiveTypeUsedForBulkData(t.(Array).getElementType())
   then result = ".ArrayElement"
   else
     if t instanceof ContainerType or t instanceof IterableClass
@@ -134,7 +135,7 @@ private string implicit(Callable callable, TypeVariable tv) {
     then access = getAccessPath(decl)
     else access = getSyntheticField(tv)
   |
-    result = Specific::qualifierString() + access
+    result = ModelGeneratorInput::qualifierString() + access
   )
 }
 
@@ -286,7 +287,7 @@ private predicate output(Callable callable, TypeVariable tv, string output) {
 module ModelPrintingInput implements ModelPrintingSig {
   class SummaryApi = TypeBasedFlowTargetApi;
 
-  class SourceOrSinkApi = Specific::SourceOrSinkTargetApi;
+  class SourceOrSinkApi = ModelGeneratorInput::SourceOrSinkTargetApi;
 
   string getProvenance() { result = "tb-generated" }
 }
@@ -297,9 +298,7 @@ private module Printing = ModelPrinting<ModelPrintingInput>;
  * A class of callables that are relevant generating summaries for based
  * on the Theorems for Free approach.
  */
-class TypeBasedFlowTargetApi extends Specific::SummaryTargetApi {
-  TypeBasedFlowTargetApi() { not Specific::isUninterestingForTypeBasedFlowModels(this) }
-
+class TypeBasedFlowTargetApi extends ModelGeneratorInput::SummaryTargetApi {
   /**
    * Gets the string representation of all type based summaries for `this`
    * inspired by the Theorems for Free approach.
@@ -329,7 +328,7 @@ class TypeBasedFlowTargetApi extends Specific::SummaryTargetApi {
       output(this, tv, output) and
       input != output
     |
-      result = Printing::asValueModel(this, input, output)
+      result = Printing::asLiftedValueModel(this, input, output)
     )
   }
 }
diff --git a/java/ql/test-kotlin1/library-tests/classes/genericExprTypes.expected b/java/ql/test-kotlin1/library-tests/classes/genericExprTypes.expected
index 95594fa9c69..b350fd8d7bb 100644
--- a/java/ql/test-kotlin1/library-tests/classes/genericExprTypes.expected
+++ b/java/ql/test-kotlin1/library-tests/classes/genericExprTypes.expected
@@ -45,9 +45,9 @@
 | generic_anonymous.kt:13:27:13:47 | get(...) | int |
 | generic_anonymous.kt:13:40:13:40 | i | int |
 | generic_anonymous.kt:17:9:17:29 | T0 | T0 |
-| generic_anonymous.kt:17:26:17:29 | null | Void |
+| generic_anonymous.kt:17:26:17:29 | null | <nulltype> |
 | generic_anonymous.kt:21:9:21:29 | T1 | T1 |
-| generic_anonymous.kt:21:26:21:29 | null | Void |
+| generic_anonymous.kt:21:26:21:29 | null | <nulltype> |
 | generic_anonymous.kt:24:5:32:5 | Unit | Unit |
 | generic_anonymous.kt:25:9:31:9 | Unit | Unit |
 | generic_anonymous.kt:26:13:26:37 | <Stmt> | new Object(...) { ... } |
diff --git a/java/ql/test-kotlin1/library-tests/classes/local_anonymous.ql b/java/ql/test-kotlin1/library-tests/classes/local_anonymous.ql
index af8e63e50d8..479c6111d42 100644
--- a/java/ql/test-kotlin1/library-tests/classes/local_anonymous.ql
+++ b/java/ql/test-kotlin1/library-tests/classes/local_anonymous.ql
@@ -1,8 +1,6 @@
 import java
 
-private predicate filterFile(Top t) {
-  t.getFile().getRelativePath().matches("%/local_anonymous.kt")
-}
+private predicate filterFile(Top t) { t.getFile().getRelativePath().matches("%local_anonymous.kt") }
 
 private string isAnonymousType(Type t) {
   if t instanceof AnonymousClass then result = "anonymous" else result = "not anonymous"
diff --git a/java/ql/test-kotlin1/library-tests/dataflow/summaries/test.expected b/java/ql/test-kotlin1/library-tests/dataflow/summaries/test.expected
index 84fdf028642..553af8b14e4 100644
--- a/java/ql/test-kotlin1/library-tests/dataflow/summaries/test.expected
+++ b/java/ql/test-kotlin1/library-tests/dataflow/summaries/test.expected
@@ -1,45 +1,45 @@
 models
-| 1 | Summary: kotlin.collections; ArraysKt; false; copyOf; (byte[]); ; Argument[0]; ReturnValue; taint; df-generated |
-| 2 | Summary: kotlin.collections; ArraysKt; false; plus; (char[],char[]); ; Argument[0]; ReturnValue; taint; df-generated |
-| 3 | Summary: kotlin.collections; CollectionsKt; false; toList; (Iterable); ; Argument[0].Element; ReturnValue; taint; df-generated |
-| 4 | Summary: kotlin.collections; IndexedValue; false; IndexedValue; (int,Object); ; Argument[1]; Argument[this]; taint; df-generated |
-| 5 | Summary: kotlin.collections; IndexedValue; false; component2; (); ; Argument[this]; ReturnValue; taint; df-generated |
-| 6 | Summary: kotlin.collections; IndexedValue; false; getValue; (); ; Argument[this]; ReturnValue; taint; df-generated |
-| 7 | Summary: kotlin.io; FileTreeWalk; false; maxDepth; (int); ; Argument[this]; ReturnValue; taint; df-generated |
-| 8 | Summary: kotlin.text; MatchGroup; false; MatchGroup; (String,IntRange); ; Argument[0]; Argument[this]; taint; df-generated |
-| 9 | Summary: kotlin.text; MatchGroup; false; component2; (); ; Argument[this]; ReturnValue; taint; df-generated |
-| 10 | Summary: kotlin.text; MatchGroup; false; getValue; (); ; Argument[this]; ReturnValue; taint; df-generated |
-| 11 | Summary: kotlin.text; StringsKt; false; capitalize; (String); ; Argument[0]; ReturnValue; taint; df-generated |
-| 12 | Summary: kotlin.text; StringsKt; false; insertRange; (StringBuilder,int,char[],int,int); ; Argument[2]; Argument[0]; taint; df-generated |
-| 13 | Summary: kotlin.text; StringsKt; false; insertRange; (StringBuilder,int,char[],int,int); ; Argument[2]; ReturnValue; taint; df-generated |
-| 14 | Summary: kotlin.text; StringsKt; false; replaceFirstCharWithChar; (String,Function1); ; Argument[0]; ReturnValue; taint; df-generated |
-| 15 | Summary: kotlin.time; TimedValue; false; TimedValue; (Object,Duration); ; Argument[0]; Argument[this]; taint; df-generated |
-| 16 | Summary: kotlin.time; TimedValue; false; component1; (); ; Argument[this]; ReturnValue; taint; df-generated |
-| 17 | Summary: kotlin.time; TimedValue; false; getDuration; (); ; Argument[this]; ReturnValue; taint; df-generated |
-| 18 | Summary: kotlin; Pair; false; Pair; (Object,Object); ; Argument[0]; Argument[this]; taint; df-generated |
-| 19 | Summary: kotlin; Pair; false; component1; (); ; Argument[this]; ReturnValue; taint; df-generated |
-| 20 | Summary: kotlin; Pair; false; getSecond; (); ; Argument[this]; ReturnValue; taint; df-generated |
-| 21 | Summary: kotlin; Triple; false; Triple; (Object,Object,Object); ; Argument[1]; Argument[this]; taint; df-generated |
-| 22 | Summary: kotlin; Triple; false; component1; (); ; Argument[this]; ReturnValue; taint; df-generated |
-| 23 | Summary: kotlin; Triple; false; getSecond; (); ; Argument[this]; ReturnValue; taint; df-generated |
-| 24 | Summary: kotlin; TuplesKt; false; to; (Object,Object); ; Argument[0]; ReturnValue; taint; df-generated |
-| 25 | Summary: kotlin; TuplesKt; false; toList; (Pair); ; Argument[0]; ReturnValue; taint; df-generated |
-| 26 | Summary: java.util; List; true; get; (int); ; Argument[this].Element; ReturnValue; value; manual |
-| 27 | Summary: java.util; List; true; set; (int,Object); ; Argument[1]; Argument[this].Element; value; manual |
-| 28 | Summary: kotlin.collections; ArraysKt; false; withIndex; (Object[]); ; Argument[0].ArrayElement; ReturnValue; taint; manual |
-| 29 | Summary: kotlin.io; CloseableKt; false; use; ; ; Argument[0]; Argument[1].Parameter[0]; value; manual |
-| 30 | Summary: kotlin; StandardKt; false; apply; ; ; Argument[0]; Argument[1].Parameter[0]; value; manual |
-| 31 | Summary: kotlin; StandardKt; false; apply; ; ; Argument[0]; ReturnValue; value; manual |
-| 32 | Summary: kotlin; StandardKt; false; with; ; ; Argument[0]; Argument[1].Parameter[0]; value; manual |
+| 1 | Summary: java.util; List; true; get; (int); ; Argument[this].Element; ReturnValue; value; manual |
+| 2 | Summary: java.util; List; true; set; (int,Object); ; Argument[1]; Argument[this].Element; value; manual |
+| 3 | Summary: kotlin.collections; ArraysKt; false; copyOf; (byte[]); ; Argument[0]; ReturnValue; taint; df-generated |
+| 4 | Summary: kotlin.collections; ArraysKt; false; plus; (char[],char[]); ; Argument[0]; ReturnValue; taint; df-generated |
+| 5 | Summary: kotlin.collections; ArraysKt; false; withIndex; (Object[]); ; Argument[0].ArrayElement; ReturnValue; taint; manual |
+| 6 | Summary: kotlin.collections; CollectionsKt; false; toList; (Iterable); ; Argument[0].Element; ReturnValue; taint; df-generated |
+| 7 | Summary: kotlin.collections; IndexedValue; false; IndexedValue; (int,Object); ; Argument[1]; Argument[this]; taint; df-generated |
+| 8 | Summary: kotlin.collections; IndexedValue; false; component2; (); ; Argument[this]; ReturnValue; taint; df-generated |
+| 9 | Summary: kotlin.collections; IndexedValue; false; getValue; (); ; Argument[this]; ReturnValue; taint; df-generated |
+| 10 | Summary: kotlin.io; CloseableKt; false; use; ; ; Argument[0]; Argument[1].Parameter[0]; value; manual |
+| 11 | Summary: kotlin.io; FileTreeWalk; false; maxDepth; (int); ; Argument[this]; ReturnValue; taint; df-generated |
+| 12 | Summary: kotlin.text; MatchGroup; false; MatchGroup; (String,IntRange); ; Argument[0]; Argument[this]; taint; df-generated |
+| 13 | Summary: kotlin.text; MatchGroup; false; component2; (); ; Argument[this]; ReturnValue; taint; df-generated |
+| 14 | Summary: kotlin.text; MatchGroup; false; getValue; (); ; Argument[this]; ReturnValue; taint; df-generated |
+| 15 | Summary: kotlin.text; StringsKt; false; capitalize; (String); ; Argument[0]; ReturnValue; taint; df-generated |
+| 16 | Summary: kotlin.text; StringsKt; false; insertRange; (StringBuilder,int,char[],int,int); ; Argument[2]; Argument[0]; taint; df-generated |
+| 17 | Summary: kotlin.text; StringsKt; false; insertRange; (StringBuilder,int,char[],int,int); ; Argument[2]; ReturnValue; taint; df-generated |
+| 18 | Summary: kotlin.text; StringsKt; false; replaceFirstCharWithChar; (String,Function1); ; Argument[0]; ReturnValue; taint; df-generated |
+| 19 | Summary: kotlin.time; TimedValue; false; TimedValue; (Object,Duration); ; Argument[0]; Argument[this]; taint; df-generated |
+| 20 | Summary: kotlin.time; TimedValue; false; component1; (); ; Argument[this]; ReturnValue; taint; df-generated |
+| 21 | Summary: kotlin.time; TimedValue; false; getDuration; (); ; Argument[this]; ReturnValue; taint; df-generated |
+| 22 | Summary: kotlin; Pair; false; Pair; (Object,Object); ; Argument[0]; Argument[this]; taint; df-generated |
+| 23 | Summary: kotlin; Pair; false; component1; (); ; Argument[this]; ReturnValue; taint; df-generated |
+| 24 | Summary: kotlin; Pair; false; getSecond; (); ; Argument[this]; ReturnValue; taint; df-generated |
+| 25 | Summary: kotlin; StandardKt; false; apply; ; ; Argument[0]; Argument[1].Parameter[0]; value; manual |
+| 26 | Summary: kotlin; StandardKt; false; apply; ; ; Argument[0]; ReturnValue; value; manual |
+| 27 | Summary: kotlin; StandardKt; false; with; ; ; Argument[0]; Argument[1].Parameter[0]; value; manual |
+| 28 | Summary: kotlin; Triple; false; Triple; (Object,Object,Object); ; Argument[1]; Argument[this]; taint; df-generated |
+| 29 | Summary: kotlin; Triple; false; component1; (); ; Argument[this]; ReturnValue; taint; df-generated |
+| 30 | Summary: kotlin; Triple; false; getSecond; (); ; Argument[this]; ReturnValue; taint; df-generated |
+| 31 | Summary: kotlin; TuplesKt; false; to; (Object,Object); ; Argument[0]; ReturnValue; taint; df-generated |
+| 32 | Summary: kotlin; TuplesKt; false; toList; (Pair); ; Argument[0]; ReturnValue; taint; df-generated |
 edges
-| apply.kt:6:9:6:20 | taint(...) : String | apply.kt:6:28:6:41 | $this$apply : String | provenance | MaD:30 |
+| apply.kt:6:9:6:20 | taint(...) : String | apply.kt:6:28:6:41 | $this$apply : String | provenance | MaD:25 |
 | apply.kt:6:28:6:41 | $this$apply : String | apply.kt:6:35:6:38 | this | provenance |  |
-| apply.kt:7:14:7:25 | taint(...) : String | apply.kt:7:14:7:40 | apply(...) | provenance | MaD:31 |
+| apply.kt:7:14:7:25 | taint(...) : String | apply.kt:7:14:7:40 | apply(...) | provenance | MaD:26 |
 | list.kt:6:9:6:9 | l [post update] : List [<element>] : String | list.kt:7:14:7:14 | l | provenance |  |
 | list.kt:6:9:6:9 | l [post update] : List [<element>] : String | list.kt:8:14:8:14 | l : List [<element>] : String | provenance |  |
 | list.kt:6:9:6:9 | l [post update] : List [<element>] : String | list.kt:9:19:9:19 | l : List [<element>] : String | provenance |  |
-| list.kt:6:16:6:25 | taint(...) : String | list.kt:6:9:6:9 | l [post update] : List [<element>] : String | provenance | MaD:27 |
-| list.kt:8:14:8:14 | l : List [<element>] : String | list.kt:8:14:8:17 | get(...) | provenance | MaD:26 |
+| list.kt:6:16:6:25 | taint(...) : String | list.kt:6:9:6:9 | l [post update] : List [<element>] : String | provenance | MaD:2 |
+| list.kt:8:14:8:14 | l : List [<element>] : String | list.kt:8:14:8:17 | get(...) | provenance | MaD:1 |
 | list.kt:9:19:9:19 | l : List [<element>] : String | list.kt:10:18:10:18 | s | provenance |  |
 | list.kt:13:17:13:40 | {...} : String[] [[]] : String | list.kt:14:14:14:14 | a | provenance |  |
 | list.kt:13:17:13:40 | {...} : String[] [[]] : String | list.kt:15:14:15:14 | a : String[] [[]] : String | provenance |  |
@@ -47,78 +47,78 @@ edges
 | list.kt:13:25:13:34 | taint(...) : String | list.kt:13:17:13:40 | {...} : String[] [[]] : String | provenance |  |
 | list.kt:15:14:15:14 | a : String[] [[]] : String | list.kt:15:14:15:17 | ...[...] | provenance |  |
 | list.kt:16:19:16:19 | a : String[] [[]] : String | list.kt:17:18:17:18 | s | provenance |  |
-| test.kt:16:14:16:21 | taint(...) : byte[] | test.kt:16:14:16:30 | copyOf(...) | provenance | MaD:1 |
-| test.kt:17:14:17:21 | taint(...) : FileTreeWalk | test.kt:17:14:17:33 | maxDepth(...) | provenance | MaD:7 |
+| test.kt:16:14:16:21 | taint(...) : byte[] | test.kt:16:14:16:30 | copyOf(...) | provenance | MaD:3 |
+| test.kt:17:14:17:21 | taint(...) : FileTreeWalk | test.kt:17:14:17:33 | maxDepth(...) | provenance | MaD:11 |
 | test.kt:20:14:20:15 | sb [post update] : StringBuilder | test.kt:21:14:21:15 | sb | provenance |  |
-| test.kt:20:32:20:40 | taint(...) : char[] | test.kt:20:14:20:15 | sb [post update] : StringBuilder | provenance | MaD:12 |
-| test.kt:20:32:20:40 | taint(...) : char[] | test.kt:20:14:20:47 | insertRange(...) | provenance | MaD:13 |
-| test.kt:23:14:23:22 | taint(...) : char[] | test.kt:23:14:23:27 | plus(...) | provenance | MaD:2 |
+| test.kt:20:32:20:40 | taint(...) : char[] | test.kt:20:14:20:15 | sb [post update] : StringBuilder | provenance | MaD:16 |
+| test.kt:20:32:20:40 | taint(...) : char[] | test.kt:20:14:20:47 | insertRange(...) | provenance | MaD:17 |
+| test.kt:23:14:23:22 | taint(...) : char[] | test.kt:23:14:23:27 | plus(...) | provenance | MaD:4 |
 | test.kt:25:17:25:36 | new Pair<String,String>(...) : Pair | test.kt:26:14:26:14 | p | provenance |  |
 | test.kt:25:17:25:36 | new Pair<String,String>(...) : Pair | test.kt:27:14:27:14 | p : Pair | provenance |  |
 | test.kt:25:17:25:36 | new Pair<String,String>(...) : Pair | test.kt:28:14:28:14 | p : Pair | provenance |  |
 | test.kt:25:17:25:36 | new Pair<String,String>(...) : Pair | test.kt:43:17:43:17 | p : Pair | provenance |  |
-| test.kt:25:22:25:31 | taint(...) : String | test.kt:25:17:25:36 | new Pair<String,String>(...) : Pair | provenance | MaD:18 |
-| test.kt:27:14:27:14 | p : Pair | test.kt:27:14:27:27 | component1(...) | provenance | MaD:19 |
-| test.kt:28:14:28:14 | p : Pair | test.kt:28:14:28:21 | getSecond(...) | provenance | MaD:20 |
-| test.kt:30:14:30:23 | taint(...) : String | test.kt:30:14:30:36 | capitalize(...) | provenance | MaD:11 |
-| test.kt:31:14:31:23 | taint(...) : String | test.kt:31:14:31:53 | replaceFirstCharWithChar(...) | provenance | MaD:14 |
+| test.kt:25:22:25:31 | taint(...) : String | test.kt:25:17:25:36 | new Pair<String,String>(...) : Pair | provenance | MaD:22 |
+| test.kt:27:14:27:14 | p : Pair | test.kt:27:14:27:27 | component1(...) | provenance | MaD:23 |
+| test.kt:28:14:28:14 | p : Pair | test.kt:28:14:28:21 | getSecond(...) | provenance | MaD:24 |
+| test.kt:30:14:30:23 | taint(...) : String | test.kt:30:14:30:36 | capitalize(...) | provenance | MaD:15 |
+| test.kt:31:14:31:23 | taint(...) : String | test.kt:31:14:31:53 | replaceFirstCharWithChar(...) | provenance | MaD:18 |
 | test.kt:33:17:33:42 | new Triple<String,String,String>(...) : Triple | test.kt:34:14:34:14 | t | provenance |  |
 | test.kt:33:17:33:42 | new Triple<String,String,String>(...) : Triple | test.kt:35:14:35:14 | t : Triple | provenance |  |
 | test.kt:33:17:33:42 | new Triple<String,String,String>(...) : Triple | test.kt:36:14:36:14 | t : Triple | provenance |  |
-| test.kt:33:28:33:37 | taint(...) : String | test.kt:33:17:33:42 | new Triple<String,String,String>(...) : Triple | provenance | MaD:21 |
-| test.kt:35:14:35:14 | t : Triple | test.kt:35:14:35:27 | component1(...) | provenance | MaD:22 |
-| test.kt:36:14:36:14 | t : Triple | test.kt:36:14:36:21 | getSecond(...) | provenance | MaD:23 |
-| test.kt:38:18:38:27 | taint(...) : String | test.kt:38:18:38:33 | to(...) : Pair | provenance | MaD:24 |
+| test.kt:33:28:33:37 | taint(...) : String | test.kt:33:17:33:42 | new Triple<String,String,String>(...) : Triple | provenance | MaD:28 |
+| test.kt:35:14:35:14 | t : Triple | test.kt:35:14:35:27 | component1(...) | provenance | MaD:29 |
+| test.kt:36:14:36:14 | t : Triple | test.kt:36:14:36:21 | getSecond(...) | provenance | MaD:30 |
+| test.kt:38:18:38:27 | taint(...) : String | test.kt:38:18:38:33 | to(...) : Pair | provenance | MaD:31 |
 | test.kt:38:18:38:33 | to(...) : Pair | test.kt:39:14:39:15 | p1 | provenance |  |
 | test.kt:38:18:38:33 | to(...) : Pair | test.kt:40:14:40:15 | p1 : Pair | provenance |  |
 | test.kt:38:18:38:33 | to(...) : Pair | test.kt:41:14:41:15 | p1 : Pair | provenance |  |
-| test.kt:40:14:40:15 | p1 : Pair | test.kt:40:14:40:28 | component1(...) | provenance | MaD:19 |
-| test.kt:41:14:41:15 | p1 : Pair | test.kt:41:14:41:22 | getSecond(...) | provenance | MaD:20 |
-| test.kt:43:17:43:17 | p : Pair | test.kt:43:17:43:26 | toList(...) : List | provenance | MaD:25 |
+| test.kt:40:14:40:15 | p1 : Pair | test.kt:40:14:40:28 | component1(...) | provenance | MaD:23 |
+| test.kt:41:14:41:15 | p1 : Pair | test.kt:41:14:41:22 | getSecond(...) | provenance | MaD:24 |
+| test.kt:43:17:43:17 | p : Pair | test.kt:43:17:43:26 | toList(...) : List | provenance | MaD:32 |
 | test.kt:43:17:43:26 | toList(...) : List | test.kt:44:14:44:14 | l | provenance |  |
 | test.kt:43:17:43:26 | toList(...) : List | test.kt:45:14:45:14 | l : List | provenance |  |
 | test.kt:43:17:43:26 | toList(...) : List | test.kt:47:18:47:18 | s | provenance |  |
-| test.kt:45:14:45:14 | l : List | test.kt:45:14:45:17 | get(...) | provenance | MaD:26 |
+| test.kt:45:14:45:14 | l : List | test.kt:45:14:45:17 | get(...) | provenance | MaD:1 |
 | test.kt:50:18:50:59 | new TimedValue<String>(...) : TimedValue | test.kt:51:14:51:15 | tv | provenance |  |
 | test.kt:50:18:50:59 | new TimedValue<String>(...) : TimedValue | test.kt:52:14:52:15 | tv : TimedValue | provenance |  |
 | test.kt:50:18:50:59 | new TimedValue<String>(...) : TimedValue | test.kt:53:14:53:15 | tv : TimedValue | provenance |  |
-| test.kt:50:29:50:38 | taint(...) : String | test.kt:50:18:50:59 | new TimedValue<String>(...) : TimedValue | provenance | MaD:15 |
-| test.kt:52:14:52:15 | tv : TimedValue | test.kt:52:14:52:28 | component1(...) | provenance | MaD:16 |
-| test.kt:53:14:53:15 | tv : TimedValue | test.kt:53:14:53:24 | getDuration(...) | provenance | MaD:17 |
+| test.kt:50:29:50:38 | taint(...) : String | test.kt:50:18:50:59 | new TimedValue<String>(...) : TimedValue | provenance | MaD:19 |
+| test.kt:52:14:52:15 | tv : TimedValue | test.kt:52:14:52:28 | component1(...) | provenance | MaD:20 |
+| test.kt:53:14:53:15 | tv : TimedValue | test.kt:53:14:53:24 | getDuration(...) | provenance | MaD:21 |
 | test.kt:55:19:55:57 | new MatchGroup(...) : MatchGroup | test.kt:56:14:56:16 | mg0 | provenance |  |
 | test.kt:55:19:55:57 | new MatchGroup(...) : MatchGroup | test.kt:57:14:57:16 | mg0 : MatchGroup | provenance |  |
 | test.kt:55:19:55:57 | new MatchGroup(...) : MatchGroup | test.kt:58:14:58:16 | mg0 : MatchGroup | provenance |  |
-| test.kt:55:30:55:39 | taint(...) : String | test.kt:55:19:55:57 | new MatchGroup(...) : MatchGroup | provenance | MaD:8 |
-| test.kt:57:14:57:16 | mg0 : MatchGroup | test.kt:57:14:57:22 | getValue(...) | provenance | MaD:10 |
-| test.kt:58:14:58:16 | mg0 : MatchGroup | test.kt:58:14:58:29 | component2(...) | provenance | MaD:9 |
+| test.kt:55:30:55:39 | taint(...) : String | test.kt:55:19:55:57 | new MatchGroup(...) : MatchGroup | provenance | MaD:12 |
+| test.kt:57:14:57:16 | mg0 : MatchGroup | test.kt:57:14:57:22 | getValue(...) | provenance | MaD:14 |
+| test.kt:58:14:58:16 | mg0 : MatchGroup | test.kt:58:14:58:29 | component2(...) | provenance | MaD:13 |
 | test.kt:60:18:60:52 | new IndexedValue<String>(...) : IndexedValue | test.kt:61:14:61:15 | iv | provenance |  |
 | test.kt:60:18:60:52 | new IndexedValue<String>(...) : IndexedValue | test.kt:63:14:63:15 | iv : IndexedValue | provenance |  |
-| test.kt:60:42:60:51 | taint(...) : String | test.kt:60:18:60:52 | new IndexedValue<String>(...) : IndexedValue | provenance | MaD:4 |
-| test.kt:63:14:63:15 | iv : IndexedValue | test.kt:63:14:63:28 | component2(...) | provenance | MaD:5 |
+| test.kt:60:42:60:51 | taint(...) : String | test.kt:60:18:60:52 | new IndexedValue<String>(...) : IndexedValue | provenance | MaD:7 |
+| test.kt:63:14:63:15 | iv : IndexedValue | test.kt:63:14:63:28 | component2(...) | provenance | MaD:8 |
 | test.kt:65:23:65:45 | {...} : String[] [[]] : String | test.kt:66:14:66:20 | strings : String[] [[]] : String | provenance |  |
 | test.kt:65:23:65:45 | {...} : String[] [[]] : String | test.kt:67:14:67:20 | strings : String[] [[]] : String | provenance |  |
 | test.kt:65:23:65:45 | {...} : String[] [[]] : String | test.kt:68:14:68:20 | strings : String[] [[]] : String | provenance |  |
 | test.kt:65:23:65:45 | {...} : String[] [[]] : String | test.kt:70:19:70:25 | strings : String[] [[]] : String | provenance |  |
 | test.kt:65:35:65:44 | taint(...) : String | test.kt:65:23:65:45 | {...} : String[] [[]] : String | provenance |  |
-| test.kt:66:14:66:20 | strings : String[] [[]] : String | test.kt:66:14:66:32 | withIndex(...) | provenance | MaD:28 |
-| test.kt:67:14:67:20 | strings : String[] [[]] : String | test.kt:67:14:67:32 | withIndex(...) : Iterable | provenance | MaD:28 |
-| test.kt:67:14:67:32 | withIndex(...) : Iterable | test.kt:67:14:67:41 | toList(...) | provenance | MaD:3 |
-| test.kt:68:14:68:20 | strings : String[] [[]] : String | test.kt:68:14:68:32 | withIndex(...) : Iterable | provenance | MaD:28 |
-| test.kt:68:14:68:32 | withIndex(...) : Iterable | test.kt:68:14:68:41 | toList(...) : List | provenance | MaD:3 |
-| test.kt:68:14:68:41 | toList(...) : List | test.kt:68:14:68:44 | get(...) : IndexedValue | provenance | MaD:26 |
-| test.kt:68:14:68:44 | get(...) : IndexedValue | test.kt:68:14:68:50 | getValue(...) | provenance | MaD:6 |
-| test.kt:70:19:70:25 | strings : String[] [[]] : String | test.kt:70:19:70:37 | withIndex(...) : Iterable | provenance | MaD:28 |
+| test.kt:66:14:66:20 | strings : String[] [[]] : String | test.kt:66:14:66:32 | withIndex(...) | provenance | MaD:5 |
+| test.kt:67:14:67:20 | strings : String[] [[]] : String | test.kt:67:14:67:32 | withIndex(...) : Iterable | provenance | MaD:5 |
+| test.kt:67:14:67:32 | withIndex(...) : Iterable | test.kt:67:14:67:41 | toList(...) | provenance | MaD:6 |
+| test.kt:68:14:68:20 | strings : String[] [[]] : String | test.kt:68:14:68:32 | withIndex(...) : Iterable | provenance | MaD:5 |
+| test.kt:68:14:68:32 | withIndex(...) : Iterable | test.kt:68:14:68:41 | toList(...) : List | provenance | MaD:6 |
+| test.kt:68:14:68:41 | toList(...) : List | test.kt:68:14:68:44 | get(...) : IndexedValue | provenance | MaD:1 |
+| test.kt:68:14:68:44 | get(...) : IndexedValue | test.kt:68:14:68:50 | getValue(...) | provenance | MaD:9 |
+| test.kt:70:19:70:25 | strings : String[] [[]] : String | test.kt:70:19:70:37 | withIndex(...) : Iterable | provenance | MaD:5 |
 | test.kt:70:19:70:37 | withIndex(...) : Iterable | test.kt:71:18:71:18 | x : IndexedValue | provenance |  |
-| test.kt:71:18:71:18 | x : IndexedValue | test.kt:71:18:71:24 | getValue(...) | provenance | MaD:6 |
-| use.kt:8:9:8:20 | taint(...) : Closeable | use.kt:8:28:8:29 | it : Closeable | provenance | MaD:29 |
+| test.kt:71:18:71:18 | x : IndexedValue | test.kt:71:18:71:24 | getValue(...) | provenance | MaD:9 |
+| use.kt:8:9:8:20 | taint(...) : Closeable | use.kt:8:28:8:29 | it : Closeable | provenance | MaD:10 |
 | use.kt:8:28:8:29 | it : Closeable | use.kt:8:39:8:40 | it | provenance |  |
-| use.kt:9:14:9:25 | taint(...) : Closeable | use.kt:9:14:9:36 | use(...) | provenance | MaD:29 |
-| use.kt:9:14:9:25 | taint(...) : Closeable | use.kt:9:31:9:36 | it : Closeable | provenance | MaD:29 |
+| use.kt:9:14:9:25 | taint(...) : Closeable | use.kt:9:14:9:36 | use(...) | provenance | MaD:10 |
+| use.kt:9:14:9:25 | taint(...) : Closeable | use.kt:9:31:9:36 | it : Closeable | provenance | MaD:10 |
 | use.kt:9:31:9:36 | it : Closeable | use.kt:9:33:9:34 | it : Closeable | provenance |  |
-| with.kt:6:14:6:25 | taint(...) : String | with.kt:6:28:6:41 | $this$with : String | provenance | MaD:32 |
+| with.kt:6:14:6:25 | taint(...) : String | with.kt:6:28:6:41 | $this$with : String | provenance | MaD:27 |
 | with.kt:6:28:6:41 | $this$with : String | with.kt:6:35:6:38 | this | provenance |  |
-| with.kt:7:19:7:30 | taint(...) : String | with.kt:7:14:7:40 | with(...) | provenance | MaD:32 |
-| with.kt:7:19:7:30 | taint(...) : String | with.kt:7:33:7:40 | $this$with : String | provenance | MaD:32 |
+| with.kt:7:19:7:30 | taint(...) : String | with.kt:7:14:7:40 | with(...) | provenance | MaD:27 |
+| with.kt:7:19:7:30 | taint(...) : String | with.kt:7:33:7:40 | $this$with : String | provenance | MaD:27 |
 | with.kt:7:33:7:40 | $this$with : String | with.kt:7:35:7:38 | this : String | provenance |  |
 nodes
 | apply.kt:6:9:6:20 | taint(...) : String | semmle.label | taint(...) : String |
diff --git a/java/ql/test-kotlin1/library-tests/methods/constructors.expected b/java/ql/test-kotlin1/library-tests/methods/constructors.expected
new file mode 100644
index 00000000000..abcab582ad7
--- /dev/null
+++ b/java/ql/test-kotlin1/library-tests/methods/constructors.expected
@@ -0,0 +1,18 @@
+| dataClass.kt:1:21:1:47 | DataClass | dataClass.kt:1:1:1:47 | DataClass | file://:0:0:0:0 | void |
+| delegates.kt:3:1:12:1 | MyClass | delegates.kt:3:1:12:1 | MyClass | file://:0:0:0:0 | void |
+| delegates.kt:4:18:6:5 |  | delegates.kt:4:18:6:5 | new KProperty1<MyClass,Integer>(...) { ... } | file://:0:0:0:0 | void |
+| delegates.kt:4:26:6:5 |  | delegates.kt:4:26:6:5 | new Function0<Integer>(...) { ... } | file://:0:0:0:0 | void |
+| delegates.kt:8:32:11:5 |  | delegates.kt:8:32:11:5 | new KMutableProperty1<MyClass,String>(...) { ... } | file://:0:0:0:0 | void |
+| delegates.kt:8:32:11:5 |  | delegates.kt:8:32:11:5 | new KMutableProperty1<MyClass,String>(...) { ... } | file://:0:0:0:0 | void |
+| delegates.kt:8:66:11:5 |  | delegates.kt:8:66:11:5 | new Function3<KProperty<?>,String,String,Unit>(...) { ... } | file://:0:0:0:0 | void |
+| enumClass.kt:1:21:1:32 | EnumClass | enumClass.kt:1:1:4:1 | EnumClass | file://:0:0:0:0 | void |
+| enumClass.kt:6:6:16:1 | EnumWithFunctions | enumClass.kt:6:1:16:1 | EnumWithFunctions | file://:0:0:0:0 | void |
+| enumClass.kt:8:3:11:4 | VAL | enumClass.kt:8:3:11:4 | VAL | file://:0:0:0:0 | void |
+| methods2.kt:7:1:10:1 | Class2 | methods2.kt:7:1:10:1 | Class2 | file://:0:0:0:0 | void |
+| methods3.kt:5:1:7:1 | Class3 | methods3.kt:5:1:7:1 | Class3 | file://:0:0:0:0 | void |
+| methods4.kt:3:1:11:1 | NestedTest | methods4.kt:3:1:11:1 | NestedTest | file://:0:0:0:0 | void |
+| methods4.kt:5:3:9:3 | InsideNestedTest | methods4.kt:5:3:9:3 | InsideNestedTest | file://:0:0:0:0 | void |
+| methods5.kt:5:3:5:27 |  | methods5.kt:5:3:5:27 |  | file://:0:0:0:0 | void |
+| methods5.kt:9:3:9:32 |  | methods5.kt:9:3:9:32 |  | file://:0:0:0:0 | void |
+| methods5.kt:13:1:13:14 | C1 | methods5.kt:13:1:13:14 | C1 | file://:0:0:0:0 | void |
+| methods.kt:5:1:20:1 | Class | methods.kt:5:1:20:1 | Class | file://:0:0:0:0 | void |
diff --git a/java/ql/test-kotlin1/library-tests/methods/constructors.ql b/java/ql/test-kotlin1/library-tests/methods/constructors.ql
new file mode 100644
index 00000000000..7a15bd29af5
--- /dev/null
+++ b/java/ql/test-kotlin1/library-tests/methods/constructors.ql
@@ -0,0 +1,5 @@
+import java
+
+from Constructor c
+where c.fromSource()
+select c, c.getDeclaringType(), c.getReturnType()
diff --git a/java/ql/test-kotlin2/library-tests/classes/genericExprTypes.expected b/java/ql/test-kotlin2/library-tests/classes/genericExprTypes.expected
index 383b5ace4bf..a61d001d270 100644
--- a/java/ql/test-kotlin2/library-tests/classes/genericExprTypes.expected
+++ b/java/ql/test-kotlin2/library-tests/classes/genericExprTypes.expected
@@ -45,9 +45,9 @@
 | generic_anonymous.kt:13:27:13:47 | get(...) | int |
 | generic_anonymous.kt:13:40:13:40 | i | int |
 | generic_anonymous.kt:17:9:17:29 | T0 | T0 |
-| generic_anonymous.kt:17:26:17:29 | null | Void |
+| generic_anonymous.kt:17:26:17:29 | null | <nulltype> |
 | generic_anonymous.kt:21:9:21:29 | T1 | T1 |
-| generic_anonymous.kt:21:26:21:29 | null | Void |
+| generic_anonymous.kt:21:26:21:29 | null | <nulltype> |
 | generic_anonymous.kt:24:5:32:5 | Unit | Unit |
 | generic_anonymous.kt:25:9:31:9 | Unit | Unit |
 | generic_anonymous.kt:26:13:26:37 | <Stmt> | new Object(...) { ... } |
diff --git a/java/ql/test-kotlin2/library-tests/classes/local_anonymous.ql b/java/ql/test-kotlin2/library-tests/classes/local_anonymous.ql
index af8e63e50d8..479c6111d42 100644
--- a/java/ql/test-kotlin2/library-tests/classes/local_anonymous.ql
+++ b/java/ql/test-kotlin2/library-tests/classes/local_anonymous.ql
@@ -1,8 +1,6 @@
 import java
 
-private predicate filterFile(Top t) {
-  t.getFile().getRelativePath().matches("%/local_anonymous.kt")
-}
+private predicate filterFile(Top t) { t.getFile().getRelativePath().matches("%local_anonymous.kt") }
 
 private string isAnonymousType(Type t) {
   if t instanceof AnonymousClass then result = "anonymous" else result = "not anonymous"
diff --git a/java/ql/test-kotlin2/library-tests/dataflow/summaries/test.expected b/java/ql/test-kotlin2/library-tests/dataflow/summaries/test.expected
index 84fdf028642..553af8b14e4 100644
--- a/java/ql/test-kotlin2/library-tests/dataflow/summaries/test.expected
+++ b/java/ql/test-kotlin2/library-tests/dataflow/summaries/test.expected
@@ -1,45 +1,45 @@
 models
-| 1 | Summary: kotlin.collections; ArraysKt; false; copyOf; (byte[]); ; Argument[0]; ReturnValue; taint; df-generated |
-| 2 | Summary: kotlin.collections; ArraysKt; false; plus; (char[],char[]); ; Argument[0]; ReturnValue; taint; df-generated |
-| 3 | Summary: kotlin.collections; CollectionsKt; false; toList; (Iterable); ; Argument[0].Element; ReturnValue; taint; df-generated |
-| 4 | Summary: kotlin.collections; IndexedValue; false; IndexedValue; (int,Object); ; Argument[1]; Argument[this]; taint; df-generated |
-| 5 | Summary: kotlin.collections; IndexedValue; false; component2; (); ; Argument[this]; ReturnValue; taint; df-generated |
-| 6 | Summary: kotlin.collections; IndexedValue; false; getValue; (); ; Argument[this]; ReturnValue; taint; df-generated |
-| 7 | Summary: kotlin.io; FileTreeWalk; false; maxDepth; (int); ; Argument[this]; ReturnValue; taint; df-generated |
-| 8 | Summary: kotlin.text; MatchGroup; false; MatchGroup; (String,IntRange); ; Argument[0]; Argument[this]; taint; df-generated |
-| 9 | Summary: kotlin.text; MatchGroup; false; component2; (); ; Argument[this]; ReturnValue; taint; df-generated |
-| 10 | Summary: kotlin.text; MatchGroup; false; getValue; (); ; Argument[this]; ReturnValue; taint; df-generated |
-| 11 | Summary: kotlin.text; StringsKt; false; capitalize; (String); ; Argument[0]; ReturnValue; taint; df-generated |
-| 12 | Summary: kotlin.text; StringsKt; false; insertRange; (StringBuilder,int,char[],int,int); ; Argument[2]; Argument[0]; taint; df-generated |
-| 13 | Summary: kotlin.text; StringsKt; false; insertRange; (StringBuilder,int,char[],int,int); ; Argument[2]; ReturnValue; taint; df-generated |
-| 14 | Summary: kotlin.text; StringsKt; false; replaceFirstCharWithChar; (String,Function1); ; Argument[0]; ReturnValue; taint; df-generated |
-| 15 | Summary: kotlin.time; TimedValue; false; TimedValue; (Object,Duration); ; Argument[0]; Argument[this]; taint; df-generated |
-| 16 | Summary: kotlin.time; TimedValue; false; component1; (); ; Argument[this]; ReturnValue; taint; df-generated |
-| 17 | Summary: kotlin.time; TimedValue; false; getDuration; (); ; Argument[this]; ReturnValue; taint; df-generated |
-| 18 | Summary: kotlin; Pair; false; Pair; (Object,Object); ; Argument[0]; Argument[this]; taint; df-generated |
-| 19 | Summary: kotlin; Pair; false; component1; (); ; Argument[this]; ReturnValue; taint; df-generated |
-| 20 | Summary: kotlin; Pair; false; getSecond; (); ; Argument[this]; ReturnValue; taint; df-generated |
-| 21 | Summary: kotlin; Triple; false; Triple; (Object,Object,Object); ; Argument[1]; Argument[this]; taint; df-generated |
-| 22 | Summary: kotlin; Triple; false; component1; (); ; Argument[this]; ReturnValue; taint; df-generated |
-| 23 | Summary: kotlin; Triple; false; getSecond; (); ; Argument[this]; ReturnValue; taint; df-generated |
-| 24 | Summary: kotlin; TuplesKt; false; to; (Object,Object); ; Argument[0]; ReturnValue; taint; df-generated |
-| 25 | Summary: kotlin; TuplesKt; false; toList; (Pair); ; Argument[0]; ReturnValue; taint; df-generated |
-| 26 | Summary: java.util; List; true; get; (int); ; Argument[this].Element; ReturnValue; value; manual |
-| 27 | Summary: java.util; List; true; set; (int,Object); ; Argument[1]; Argument[this].Element; value; manual |
-| 28 | Summary: kotlin.collections; ArraysKt; false; withIndex; (Object[]); ; Argument[0].ArrayElement; ReturnValue; taint; manual |
-| 29 | Summary: kotlin.io; CloseableKt; false; use; ; ; Argument[0]; Argument[1].Parameter[0]; value; manual |
-| 30 | Summary: kotlin; StandardKt; false; apply; ; ; Argument[0]; Argument[1].Parameter[0]; value; manual |
-| 31 | Summary: kotlin; StandardKt; false; apply; ; ; Argument[0]; ReturnValue; value; manual |
-| 32 | Summary: kotlin; StandardKt; false; with; ; ; Argument[0]; Argument[1].Parameter[0]; value; manual |
+| 1 | Summary: java.util; List; true; get; (int); ; Argument[this].Element; ReturnValue; value; manual |
+| 2 | Summary: java.util; List; true; set; (int,Object); ; Argument[1]; Argument[this].Element; value; manual |
+| 3 | Summary: kotlin.collections; ArraysKt; false; copyOf; (byte[]); ; Argument[0]; ReturnValue; taint; df-generated |
+| 4 | Summary: kotlin.collections; ArraysKt; false; plus; (char[],char[]); ; Argument[0]; ReturnValue; taint; df-generated |
+| 5 | Summary: kotlin.collections; ArraysKt; false; withIndex; (Object[]); ; Argument[0].ArrayElement; ReturnValue; taint; manual |
+| 6 | Summary: kotlin.collections; CollectionsKt; false; toList; (Iterable); ; Argument[0].Element; ReturnValue; taint; df-generated |
+| 7 | Summary: kotlin.collections; IndexedValue; false; IndexedValue; (int,Object); ; Argument[1]; Argument[this]; taint; df-generated |
+| 8 | Summary: kotlin.collections; IndexedValue; false; component2; (); ; Argument[this]; ReturnValue; taint; df-generated |
+| 9 | Summary: kotlin.collections; IndexedValue; false; getValue; (); ; Argument[this]; ReturnValue; taint; df-generated |
+| 10 | Summary: kotlin.io; CloseableKt; false; use; ; ; Argument[0]; Argument[1].Parameter[0]; value; manual |
+| 11 | Summary: kotlin.io; FileTreeWalk; false; maxDepth; (int); ; Argument[this]; ReturnValue; taint; df-generated |
+| 12 | Summary: kotlin.text; MatchGroup; false; MatchGroup; (String,IntRange); ; Argument[0]; Argument[this]; taint; df-generated |
+| 13 | Summary: kotlin.text; MatchGroup; false; component2; (); ; Argument[this]; ReturnValue; taint; df-generated |
+| 14 | Summary: kotlin.text; MatchGroup; false; getValue; (); ; Argument[this]; ReturnValue; taint; df-generated |
+| 15 | Summary: kotlin.text; StringsKt; false; capitalize; (String); ; Argument[0]; ReturnValue; taint; df-generated |
+| 16 | Summary: kotlin.text; StringsKt; false; insertRange; (StringBuilder,int,char[],int,int); ; Argument[2]; Argument[0]; taint; df-generated |
+| 17 | Summary: kotlin.text; StringsKt; false; insertRange; (StringBuilder,int,char[],int,int); ; Argument[2]; ReturnValue; taint; df-generated |
+| 18 | Summary: kotlin.text; StringsKt; false; replaceFirstCharWithChar; (String,Function1); ; Argument[0]; ReturnValue; taint; df-generated |
+| 19 | Summary: kotlin.time; TimedValue; false; TimedValue; (Object,Duration); ; Argument[0]; Argument[this]; taint; df-generated |
+| 20 | Summary: kotlin.time; TimedValue; false; component1; (); ; Argument[this]; ReturnValue; taint; df-generated |
+| 21 | Summary: kotlin.time; TimedValue; false; getDuration; (); ; Argument[this]; ReturnValue; taint; df-generated |
+| 22 | Summary: kotlin; Pair; false; Pair; (Object,Object); ; Argument[0]; Argument[this]; taint; df-generated |
+| 23 | Summary: kotlin; Pair; false; component1; (); ; Argument[this]; ReturnValue; taint; df-generated |
+| 24 | Summary: kotlin; Pair; false; getSecond; (); ; Argument[this]; ReturnValue; taint; df-generated |
+| 25 | Summary: kotlin; StandardKt; false; apply; ; ; Argument[0]; Argument[1].Parameter[0]; value; manual |
+| 26 | Summary: kotlin; StandardKt; false; apply; ; ; Argument[0]; ReturnValue; value; manual |
+| 27 | Summary: kotlin; StandardKt; false; with; ; ; Argument[0]; Argument[1].Parameter[0]; value; manual |
+| 28 | Summary: kotlin; Triple; false; Triple; (Object,Object,Object); ; Argument[1]; Argument[this]; taint; df-generated |
+| 29 | Summary: kotlin; Triple; false; component1; (); ; Argument[this]; ReturnValue; taint; df-generated |
+| 30 | Summary: kotlin; Triple; false; getSecond; (); ; Argument[this]; ReturnValue; taint; df-generated |
+| 31 | Summary: kotlin; TuplesKt; false; to; (Object,Object); ; Argument[0]; ReturnValue; taint; df-generated |
+| 32 | Summary: kotlin; TuplesKt; false; toList; (Pair); ; Argument[0]; ReturnValue; taint; df-generated |
 edges
-| apply.kt:6:9:6:20 | taint(...) : String | apply.kt:6:28:6:41 | $this$apply : String | provenance | MaD:30 |
+| apply.kt:6:9:6:20 | taint(...) : String | apply.kt:6:28:6:41 | $this$apply : String | provenance | MaD:25 |
 | apply.kt:6:28:6:41 | $this$apply : String | apply.kt:6:35:6:38 | this | provenance |  |
-| apply.kt:7:14:7:25 | taint(...) : String | apply.kt:7:14:7:40 | apply(...) | provenance | MaD:31 |
+| apply.kt:7:14:7:25 | taint(...) : String | apply.kt:7:14:7:40 | apply(...) | provenance | MaD:26 |
 | list.kt:6:9:6:9 | l [post update] : List [<element>] : String | list.kt:7:14:7:14 | l | provenance |  |
 | list.kt:6:9:6:9 | l [post update] : List [<element>] : String | list.kt:8:14:8:14 | l : List [<element>] : String | provenance |  |
 | list.kt:6:9:6:9 | l [post update] : List [<element>] : String | list.kt:9:19:9:19 | l : List [<element>] : String | provenance |  |
-| list.kt:6:16:6:25 | taint(...) : String | list.kt:6:9:6:9 | l [post update] : List [<element>] : String | provenance | MaD:27 |
-| list.kt:8:14:8:14 | l : List [<element>] : String | list.kt:8:14:8:17 | get(...) | provenance | MaD:26 |
+| list.kt:6:16:6:25 | taint(...) : String | list.kt:6:9:6:9 | l [post update] : List [<element>] : String | provenance | MaD:2 |
+| list.kt:8:14:8:14 | l : List [<element>] : String | list.kt:8:14:8:17 | get(...) | provenance | MaD:1 |
 | list.kt:9:19:9:19 | l : List [<element>] : String | list.kt:10:18:10:18 | s | provenance |  |
 | list.kt:13:17:13:40 | {...} : String[] [[]] : String | list.kt:14:14:14:14 | a | provenance |  |
 | list.kt:13:17:13:40 | {...} : String[] [[]] : String | list.kt:15:14:15:14 | a : String[] [[]] : String | provenance |  |
@@ -47,78 +47,78 @@ edges
 | list.kt:13:25:13:34 | taint(...) : String | list.kt:13:17:13:40 | {...} : String[] [[]] : String | provenance |  |
 | list.kt:15:14:15:14 | a : String[] [[]] : String | list.kt:15:14:15:17 | ...[...] | provenance |  |
 | list.kt:16:19:16:19 | a : String[] [[]] : String | list.kt:17:18:17:18 | s | provenance |  |
-| test.kt:16:14:16:21 | taint(...) : byte[] | test.kt:16:14:16:30 | copyOf(...) | provenance | MaD:1 |
-| test.kt:17:14:17:21 | taint(...) : FileTreeWalk | test.kt:17:14:17:33 | maxDepth(...) | provenance | MaD:7 |
+| test.kt:16:14:16:21 | taint(...) : byte[] | test.kt:16:14:16:30 | copyOf(...) | provenance | MaD:3 |
+| test.kt:17:14:17:21 | taint(...) : FileTreeWalk | test.kt:17:14:17:33 | maxDepth(...) | provenance | MaD:11 |
 | test.kt:20:14:20:15 | sb [post update] : StringBuilder | test.kt:21:14:21:15 | sb | provenance |  |
-| test.kt:20:32:20:40 | taint(...) : char[] | test.kt:20:14:20:15 | sb [post update] : StringBuilder | provenance | MaD:12 |
-| test.kt:20:32:20:40 | taint(...) : char[] | test.kt:20:14:20:47 | insertRange(...) | provenance | MaD:13 |
-| test.kt:23:14:23:22 | taint(...) : char[] | test.kt:23:14:23:27 | plus(...) | provenance | MaD:2 |
+| test.kt:20:32:20:40 | taint(...) : char[] | test.kt:20:14:20:15 | sb [post update] : StringBuilder | provenance | MaD:16 |
+| test.kt:20:32:20:40 | taint(...) : char[] | test.kt:20:14:20:47 | insertRange(...) | provenance | MaD:17 |
+| test.kt:23:14:23:22 | taint(...) : char[] | test.kt:23:14:23:27 | plus(...) | provenance | MaD:4 |
 | test.kt:25:17:25:36 | new Pair<String,String>(...) : Pair | test.kt:26:14:26:14 | p | provenance |  |
 | test.kt:25:17:25:36 | new Pair<String,String>(...) : Pair | test.kt:27:14:27:14 | p : Pair | provenance |  |
 | test.kt:25:17:25:36 | new Pair<String,String>(...) : Pair | test.kt:28:14:28:14 | p : Pair | provenance |  |
 | test.kt:25:17:25:36 | new Pair<String,String>(...) : Pair | test.kt:43:17:43:17 | p : Pair | provenance |  |
-| test.kt:25:22:25:31 | taint(...) : String | test.kt:25:17:25:36 | new Pair<String,String>(...) : Pair | provenance | MaD:18 |
-| test.kt:27:14:27:14 | p : Pair | test.kt:27:14:27:27 | component1(...) | provenance | MaD:19 |
-| test.kt:28:14:28:14 | p : Pair | test.kt:28:14:28:21 | getSecond(...) | provenance | MaD:20 |
-| test.kt:30:14:30:23 | taint(...) : String | test.kt:30:14:30:36 | capitalize(...) | provenance | MaD:11 |
-| test.kt:31:14:31:23 | taint(...) : String | test.kt:31:14:31:53 | replaceFirstCharWithChar(...) | provenance | MaD:14 |
+| test.kt:25:22:25:31 | taint(...) : String | test.kt:25:17:25:36 | new Pair<String,String>(...) : Pair | provenance | MaD:22 |
+| test.kt:27:14:27:14 | p : Pair | test.kt:27:14:27:27 | component1(...) | provenance | MaD:23 |
+| test.kt:28:14:28:14 | p : Pair | test.kt:28:14:28:21 | getSecond(...) | provenance | MaD:24 |
+| test.kt:30:14:30:23 | taint(...) : String | test.kt:30:14:30:36 | capitalize(...) | provenance | MaD:15 |
+| test.kt:31:14:31:23 | taint(...) : String | test.kt:31:14:31:53 | replaceFirstCharWithChar(...) | provenance | MaD:18 |
 | test.kt:33:17:33:42 | new Triple<String,String,String>(...) : Triple | test.kt:34:14:34:14 | t | provenance |  |
 | test.kt:33:17:33:42 | new Triple<String,String,String>(...) : Triple | test.kt:35:14:35:14 | t : Triple | provenance |  |
 | test.kt:33:17:33:42 | new Triple<String,String,String>(...) : Triple | test.kt:36:14:36:14 | t : Triple | provenance |  |
-| test.kt:33:28:33:37 | taint(...) : String | test.kt:33:17:33:42 | new Triple<String,String,String>(...) : Triple | provenance | MaD:21 |
-| test.kt:35:14:35:14 | t : Triple | test.kt:35:14:35:27 | component1(...) | provenance | MaD:22 |
-| test.kt:36:14:36:14 | t : Triple | test.kt:36:14:36:21 | getSecond(...) | provenance | MaD:23 |
-| test.kt:38:18:38:27 | taint(...) : String | test.kt:38:18:38:33 | to(...) : Pair | provenance | MaD:24 |
+| test.kt:33:28:33:37 | taint(...) : String | test.kt:33:17:33:42 | new Triple<String,String,String>(...) : Triple | provenance | MaD:28 |
+| test.kt:35:14:35:14 | t : Triple | test.kt:35:14:35:27 | component1(...) | provenance | MaD:29 |
+| test.kt:36:14:36:14 | t : Triple | test.kt:36:14:36:21 | getSecond(...) | provenance | MaD:30 |
+| test.kt:38:18:38:27 | taint(...) : String | test.kt:38:18:38:33 | to(...) : Pair | provenance | MaD:31 |
 | test.kt:38:18:38:33 | to(...) : Pair | test.kt:39:14:39:15 | p1 | provenance |  |
 | test.kt:38:18:38:33 | to(...) : Pair | test.kt:40:14:40:15 | p1 : Pair | provenance |  |
 | test.kt:38:18:38:33 | to(...) : Pair | test.kt:41:14:41:15 | p1 : Pair | provenance |  |
-| test.kt:40:14:40:15 | p1 : Pair | test.kt:40:14:40:28 | component1(...) | provenance | MaD:19 |
-| test.kt:41:14:41:15 | p1 : Pair | test.kt:41:14:41:22 | getSecond(...) | provenance | MaD:20 |
-| test.kt:43:17:43:17 | p : Pair | test.kt:43:17:43:26 | toList(...) : List | provenance | MaD:25 |
+| test.kt:40:14:40:15 | p1 : Pair | test.kt:40:14:40:28 | component1(...) | provenance | MaD:23 |
+| test.kt:41:14:41:15 | p1 : Pair | test.kt:41:14:41:22 | getSecond(...) | provenance | MaD:24 |
+| test.kt:43:17:43:17 | p : Pair | test.kt:43:17:43:26 | toList(...) : List | provenance | MaD:32 |
 | test.kt:43:17:43:26 | toList(...) : List | test.kt:44:14:44:14 | l | provenance |  |
 | test.kt:43:17:43:26 | toList(...) : List | test.kt:45:14:45:14 | l : List | provenance |  |
 | test.kt:43:17:43:26 | toList(...) : List | test.kt:47:18:47:18 | s | provenance |  |
-| test.kt:45:14:45:14 | l : List | test.kt:45:14:45:17 | get(...) | provenance | MaD:26 |
+| test.kt:45:14:45:14 | l : List | test.kt:45:14:45:17 | get(...) | provenance | MaD:1 |
 | test.kt:50:18:50:59 | new TimedValue<String>(...) : TimedValue | test.kt:51:14:51:15 | tv | provenance |  |
 | test.kt:50:18:50:59 | new TimedValue<String>(...) : TimedValue | test.kt:52:14:52:15 | tv : TimedValue | provenance |  |
 | test.kt:50:18:50:59 | new TimedValue<String>(...) : TimedValue | test.kt:53:14:53:15 | tv : TimedValue | provenance |  |
-| test.kt:50:29:50:38 | taint(...) : String | test.kt:50:18:50:59 | new TimedValue<String>(...) : TimedValue | provenance | MaD:15 |
-| test.kt:52:14:52:15 | tv : TimedValue | test.kt:52:14:52:28 | component1(...) | provenance | MaD:16 |
-| test.kt:53:14:53:15 | tv : TimedValue | test.kt:53:14:53:24 | getDuration(...) | provenance | MaD:17 |
+| test.kt:50:29:50:38 | taint(...) : String | test.kt:50:18:50:59 | new TimedValue<String>(...) : TimedValue | provenance | MaD:19 |
+| test.kt:52:14:52:15 | tv : TimedValue | test.kt:52:14:52:28 | component1(...) | provenance | MaD:20 |
+| test.kt:53:14:53:15 | tv : TimedValue | test.kt:53:14:53:24 | getDuration(...) | provenance | MaD:21 |
 | test.kt:55:19:55:57 | new MatchGroup(...) : MatchGroup | test.kt:56:14:56:16 | mg0 | provenance |  |
 | test.kt:55:19:55:57 | new MatchGroup(...) : MatchGroup | test.kt:57:14:57:16 | mg0 : MatchGroup | provenance |  |
 | test.kt:55:19:55:57 | new MatchGroup(...) : MatchGroup | test.kt:58:14:58:16 | mg0 : MatchGroup | provenance |  |
-| test.kt:55:30:55:39 | taint(...) : String | test.kt:55:19:55:57 | new MatchGroup(...) : MatchGroup | provenance | MaD:8 |
-| test.kt:57:14:57:16 | mg0 : MatchGroup | test.kt:57:14:57:22 | getValue(...) | provenance | MaD:10 |
-| test.kt:58:14:58:16 | mg0 : MatchGroup | test.kt:58:14:58:29 | component2(...) | provenance | MaD:9 |
+| test.kt:55:30:55:39 | taint(...) : String | test.kt:55:19:55:57 | new MatchGroup(...) : MatchGroup | provenance | MaD:12 |
+| test.kt:57:14:57:16 | mg0 : MatchGroup | test.kt:57:14:57:22 | getValue(...) | provenance | MaD:14 |
+| test.kt:58:14:58:16 | mg0 : MatchGroup | test.kt:58:14:58:29 | component2(...) | provenance | MaD:13 |
 | test.kt:60:18:60:52 | new IndexedValue<String>(...) : IndexedValue | test.kt:61:14:61:15 | iv | provenance |  |
 | test.kt:60:18:60:52 | new IndexedValue<String>(...) : IndexedValue | test.kt:63:14:63:15 | iv : IndexedValue | provenance |  |
-| test.kt:60:42:60:51 | taint(...) : String | test.kt:60:18:60:52 | new IndexedValue<String>(...) : IndexedValue | provenance | MaD:4 |
-| test.kt:63:14:63:15 | iv : IndexedValue | test.kt:63:14:63:28 | component2(...) | provenance | MaD:5 |
+| test.kt:60:42:60:51 | taint(...) : String | test.kt:60:18:60:52 | new IndexedValue<String>(...) : IndexedValue | provenance | MaD:7 |
+| test.kt:63:14:63:15 | iv : IndexedValue | test.kt:63:14:63:28 | component2(...) | provenance | MaD:8 |
 | test.kt:65:23:65:45 | {...} : String[] [[]] : String | test.kt:66:14:66:20 | strings : String[] [[]] : String | provenance |  |
 | test.kt:65:23:65:45 | {...} : String[] [[]] : String | test.kt:67:14:67:20 | strings : String[] [[]] : String | provenance |  |
 | test.kt:65:23:65:45 | {...} : String[] [[]] : String | test.kt:68:14:68:20 | strings : String[] [[]] : String | provenance |  |
 | test.kt:65:23:65:45 | {...} : String[] [[]] : String | test.kt:70:19:70:25 | strings : String[] [[]] : String | provenance |  |
 | test.kt:65:35:65:44 | taint(...) : String | test.kt:65:23:65:45 | {...} : String[] [[]] : String | provenance |  |
-| test.kt:66:14:66:20 | strings : String[] [[]] : String | test.kt:66:14:66:32 | withIndex(...) | provenance | MaD:28 |
-| test.kt:67:14:67:20 | strings : String[] [[]] : String | test.kt:67:14:67:32 | withIndex(...) : Iterable | provenance | MaD:28 |
-| test.kt:67:14:67:32 | withIndex(...) : Iterable | test.kt:67:14:67:41 | toList(...) | provenance | MaD:3 |
-| test.kt:68:14:68:20 | strings : String[] [[]] : String | test.kt:68:14:68:32 | withIndex(...) : Iterable | provenance | MaD:28 |
-| test.kt:68:14:68:32 | withIndex(...) : Iterable | test.kt:68:14:68:41 | toList(...) : List | provenance | MaD:3 |
-| test.kt:68:14:68:41 | toList(...) : List | test.kt:68:14:68:44 | get(...) : IndexedValue | provenance | MaD:26 |
-| test.kt:68:14:68:44 | get(...) : IndexedValue | test.kt:68:14:68:50 | getValue(...) | provenance | MaD:6 |
-| test.kt:70:19:70:25 | strings : String[] [[]] : String | test.kt:70:19:70:37 | withIndex(...) : Iterable | provenance | MaD:28 |
+| test.kt:66:14:66:20 | strings : String[] [[]] : String | test.kt:66:14:66:32 | withIndex(...) | provenance | MaD:5 |
+| test.kt:67:14:67:20 | strings : String[] [[]] : String | test.kt:67:14:67:32 | withIndex(...) : Iterable | provenance | MaD:5 |
+| test.kt:67:14:67:32 | withIndex(...) : Iterable | test.kt:67:14:67:41 | toList(...) | provenance | MaD:6 |
+| test.kt:68:14:68:20 | strings : String[] [[]] : String | test.kt:68:14:68:32 | withIndex(...) : Iterable | provenance | MaD:5 |
+| test.kt:68:14:68:32 | withIndex(...) : Iterable | test.kt:68:14:68:41 | toList(...) : List | provenance | MaD:6 |
+| test.kt:68:14:68:41 | toList(...) : List | test.kt:68:14:68:44 | get(...) : IndexedValue | provenance | MaD:1 |
+| test.kt:68:14:68:44 | get(...) : IndexedValue | test.kt:68:14:68:50 | getValue(...) | provenance | MaD:9 |
+| test.kt:70:19:70:25 | strings : String[] [[]] : String | test.kt:70:19:70:37 | withIndex(...) : Iterable | provenance | MaD:5 |
 | test.kt:70:19:70:37 | withIndex(...) : Iterable | test.kt:71:18:71:18 | x : IndexedValue | provenance |  |
-| test.kt:71:18:71:18 | x : IndexedValue | test.kt:71:18:71:24 | getValue(...) | provenance | MaD:6 |
-| use.kt:8:9:8:20 | taint(...) : Closeable | use.kt:8:28:8:29 | it : Closeable | provenance | MaD:29 |
+| test.kt:71:18:71:18 | x : IndexedValue | test.kt:71:18:71:24 | getValue(...) | provenance | MaD:9 |
+| use.kt:8:9:8:20 | taint(...) : Closeable | use.kt:8:28:8:29 | it : Closeable | provenance | MaD:10 |
 | use.kt:8:28:8:29 | it : Closeable | use.kt:8:39:8:40 | it | provenance |  |
-| use.kt:9:14:9:25 | taint(...) : Closeable | use.kt:9:14:9:36 | use(...) | provenance | MaD:29 |
-| use.kt:9:14:9:25 | taint(...) : Closeable | use.kt:9:31:9:36 | it : Closeable | provenance | MaD:29 |
+| use.kt:9:14:9:25 | taint(...) : Closeable | use.kt:9:14:9:36 | use(...) | provenance | MaD:10 |
+| use.kt:9:14:9:25 | taint(...) : Closeable | use.kt:9:31:9:36 | it : Closeable | provenance | MaD:10 |
 | use.kt:9:31:9:36 | it : Closeable | use.kt:9:33:9:34 | it : Closeable | provenance |  |
-| with.kt:6:14:6:25 | taint(...) : String | with.kt:6:28:6:41 | $this$with : String | provenance | MaD:32 |
+| with.kt:6:14:6:25 | taint(...) : String | with.kt:6:28:6:41 | $this$with : String | provenance | MaD:27 |
 | with.kt:6:28:6:41 | $this$with : String | with.kt:6:35:6:38 | this | provenance |  |
-| with.kt:7:19:7:30 | taint(...) : String | with.kt:7:14:7:40 | with(...) | provenance | MaD:32 |
-| with.kt:7:19:7:30 | taint(...) : String | with.kt:7:33:7:40 | $this$with : String | provenance | MaD:32 |
+| with.kt:7:19:7:30 | taint(...) : String | with.kt:7:14:7:40 | with(...) | provenance | MaD:27 |
+| with.kt:7:19:7:30 | taint(...) : String | with.kt:7:33:7:40 | $this$with : String | provenance | MaD:27 |
 | with.kt:7:33:7:40 | $this$with : String | with.kt:7:35:7:38 | this : String | provenance |  |
 nodes
 | apply.kt:6:9:6:20 | taint(...) : String | semmle.label | taint(...) : String |
diff --git a/java/ql/test-kotlin2/library-tests/methods/constructors.expected b/java/ql/test-kotlin2/library-tests/methods/constructors.expected
new file mode 100644
index 00000000000..3896fa7668d
--- /dev/null
+++ b/java/ql/test-kotlin2/library-tests/methods/constructors.expected
@@ -0,0 +1,18 @@
+| dataClass.kt:1:21:1:47 | DataClass | dataClass.kt:1:1:1:47 | DataClass | file://:0:0:0:0 | void |
+| delegates.kt:3:1:12:1 | MyClass | delegates.kt:3:1:12:1 | MyClass | file://:0:0:0:0 | void |
+| delegates.kt:4:21:6:5 |  | delegates.kt:4:21:6:5 | new KProperty1<MyClass,Integer>(...) { ... } | file://:0:0:0:0 | void |
+| delegates.kt:4:26:6:5 |  | delegates.kt:4:26:6:5 | new Function0<Integer>(...) { ... } | file://:0:0:0:0 | void |
+| delegates.kt:8:35:11:5 |  | delegates.kt:8:35:11:5 | new KMutableProperty1<MyClass,String>(...) { ... } | file://:0:0:0:0 | void |
+| delegates.kt:8:35:11:5 |  | delegates.kt:8:35:11:5 | new KMutableProperty1<MyClass,String>(...) { ... } | file://:0:0:0:0 | void |
+| delegates.kt:8:66:11:5 |  | delegates.kt:8:66:11:5 | new Function3<KProperty<?>,String,String,Unit>(...) { ... } | file://:0:0:0:0 | void |
+| enumClass.kt:1:21:1:32 | EnumClass | enumClass.kt:1:1:4:1 | EnumClass | file://:0:0:0:0 | void |
+| enumClass.kt:6:1:16:1 | EnumWithFunctions | enumClass.kt:6:1:16:1 | EnumWithFunctions | file://:0:0:0:0 | void |
+| enumClass.kt:8:3:11:4 | VAL | enumClass.kt:8:3:11:4 | VAL | file://:0:0:0:0 | void |
+| methods2.kt:7:1:10:1 | Class2 | methods2.kt:7:1:10:1 | Class2 | file://:0:0:0:0 | void |
+| methods3.kt:5:1:7:1 | Class3 | methods3.kt:5:1:7:1 | Class3 | file://:0:0:0:0 | void |
+| methods4.kt:3:1:11:1 | NestedTest | methods4.kt:3:1:11:1 | NestedTest | file://:0:0:0:0 | void |
+| methods4.kt:5:3:9:3 | InsideNestedTest | methods4.kt:5:3:9:3 | InsideNestedTest | file://:0:0:0:0 | void |
+| methods5.kt:5:3:5:27 |  | methods5.kt:5:3:5:27 |  | file://:0:0:0:0 | void |
+| methods5.kt:9:3:9:32 |  | methods5.kt:9:3:9:32 |  | file://:0:0:0:0 | void |
+| methods5.kt:13:1:13:14 | C1 | methods5.kt:13:1:13:14 | C1 | file://:0:0:0:0 | void |
+| methods.kt:5:1:20:1 | Class | methods.kt:5:1:20:1 | Class | file://:0:0:0:0 | void |
diff --git a/java/ql/test-kotlin2/library-tests/methods/constructors.ql b/java/ql/test-kotlin2/library-tests/methods/constructors.ql
new file mode 100644
index 00000000000..7a15bd29af5
--- /dev/null
+++ b/java/ql/test-kotlin2/library-tests/methods/constructors.ql
@@ -0,0 +1,5 @@
+import java
+
+from Constructor c
+where c.fromSource()
+select c, c.getDeclaringType(), c.getReturnType()
diff --git a/java/ql/test/TestUtilities/InlineExpectationsTestQuery.ql b/java/ql/test/TestUtilities/InlineExpectationsTestQuery.ql
new file mode 100644
index 00000000000..b0360dfecd8
--- /dev/null
+++ b/java/ql/test/TestUtilities/InlineExpectationsTestQuery.ql
@@ -0,0 +1,21 @@
+/**
+ * @kind test-postprocess
+ */
+
+private import java
+private import codeql.util.test.InlineExpectationsTest as T
+private import internal.InlineExpectationsTestImpl
+import T::TestPostProcessing
+import T::TestPostProcessing::Make<Impl, Input>
+
+private module Input implements T::TestPostProcessing::InputSig<Impl> {
+  string getRelativeUrl(Location location) {
+    exists(File f, int startline, int startcolumn, int endline, int endcolumn |
+      location.hasLocationInfo(_, startline, startcolumn, endline, endcolumn) and
+      f = location.getFile()
+    |
+      result =
+        f.getRelativePath() + ":" + startline + ":" + startcolumn + ":" + endline + ":" + endcolumn
+    )
+  }
+}
diff --git a/java/ql/test/TestUtilities/PrettyPrintModels.ql b/java/ql/test/TestUtilities/PrettyPrintModels.ql
index eff62a86050..d127de1e150 100644
--- a/java/ql/test/TestUtilities/PrettyPrintModels.ql
+++ b/java/ql/test/TestUtilities/PrettyPrintModels.ql
@@ -4,7 +4,3 @@
 
 import semmle.code.java.dataflow.ExternalFlow
 import codeql.dataflow.test.ProvenancePathGraph::TestPostProcessing::TranslateProvenanceResults<interpretModelForTest/2>
-
-from string relation, int row, int column, string data
-where results(relation, row, column, data)
-select relation, row, column, data
diff --git a/java/ql/test/experimental/query-tests/security/CWE-020/Log4jInjectionTest.expected b/java/ql/test/experimental/query-tests/security/CWE-020/Log4jInjectionTest.expected
index 7685d68e730..d1b6f3110fa 100644
--- a/java/ql/test/experimental/query-tests/security/CWE-020/Log4jInjectionTest.expected
+++ b/java/ql/test/experimental/query-tests/security/CWE-020/Log4jInjectionTest.expected
@@ -1046,3780 +1046,3780 @@
 | Log4jJndiInjectionTest.java:1120:43:1120:45 | map | Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:1120:43:1120:45 | map | Log4j log entry depends on a $@. | Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) | user-provided value |
 | Log4jJndiInjectionTest.java:1121:63:1121:65 | map | Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:1121:63:1121:65 | map | Log4j log entry depends on a $@. | Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) | user-provided value |
 edges
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:31:41:31:48 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:32:41:32:48 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:33:56:33:63 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:34:56:34:63 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:35:51:35:58 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:36:59:36:66 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:37:59:37:66 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:38:41:38:48 | source(...) | provenance | Src:MaD:324  Sink:MaD:30 |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:38:41:38:48 | source(...) | provenance | Src:MaD:324  Sink:MaD:346 |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:39:50:39:57 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:40:50:40:57 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:41:70:41:77 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:42:65:42:72 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:43:50:43:57 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:44:80:44:87 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:45:65:45:72 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:46:50:46:57 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:47:95:47:102 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:48:80:48:87 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:49:65:49:72 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:50:50:50:57 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:51:110:51:117 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:52:95:52:102 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:53:80:53:87 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:54:65:54:72 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:55:50:55:57 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:56:125:56:132 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:57:110:57:117 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:58:95:58:102 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:59:80:59:87 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:60:65:60:72 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:61:50:61:57 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:62:140:62:147 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:63:125:63:132 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:64:110:64:117 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:65:95:65:102 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:66:80:66:87 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:67:65:67:72 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:68:50:68:57 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:69:155:69:162 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:70:140:70:147 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:71:125:71:132 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:72:110:72:117 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:73:95:73:102 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:74:80:74:87 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:75:65:75:72 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:76:50:76:57 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:77:170:77:177 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:78:155:78:162 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:79:140:79:147 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:80:125:80:132 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:81:110:81:117 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:82:95:82:102 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:83:80:83:87 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:84:65:84:72 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:85:50:85:57 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:86:185:86:192 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:87:170:87:177 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:88:155:88:162 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:89:140:89:147 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:90:125:90:132 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:91:110:91:117 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:92:95:92:102 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:93:80:93:87 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:94:65:94:72 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:95:50:95:57 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:96:50:96:57 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:97:70:97:77 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:98:50:98:57 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:99:55:99:62 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:100:55:100:62 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:101:44:101:51 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:102:44:102:51 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:103:36:103:43 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:104:36:104:43 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:105:26:105:33 | source(...) | provenance | Src:MaD:324  Sink:MaD:49 |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:105:26:105:33 | source(...) | provenance | Src:MaD:324  Sink:MaD:365 |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:106:26:106:33 | source(...) | provenance | Src:MaD:324  Sink:MaD:50 |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:106:26:106:33 | source(...) | provenance | Src:MaD:324  Sink:MaD:366 |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:107:35:107:42 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:108:35:108:42 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:109:55:109:62 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:110:50:110:57 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:111:35:111:42 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:112:65:112:72 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:113:50:113:57 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:114:35:114:42 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:115:80:115:87 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:116:65:116:72 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:117:50:117:57 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:118:35:118:42 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:119:95:119:102 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:120:80:120:87 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:121:65:121:72 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:122:50:122:57 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:123:35:123:42 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:124:110:124:117 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:125:95:125:102 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:126:80:126:87 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:127:65:127:72 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:128:50:128:57 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:129:35:129:42 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:130:125:130:132 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:131:110:131:117 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:132:95:132:102 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:133:80:133:87 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:134:65:134:72 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:135:50:135:57 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:136:35:136:42 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:137:140:137:147 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:138:125:138:132 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:139:110:139:117 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:140:95:140:102 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:141:80:141:87 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:142:65:142:72 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:143:50:143:57 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:144:35:144:42 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:145:155:145:162 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:146:140:146:147 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:147:125:147:132 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:148:110:148:117 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:149:95:149:102 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:150:80:150:87 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:151:65:151:72 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:152:50:152:57 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:153:35:153:42 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:154:170:154:177 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:155:155:155:162 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:156:140:156:147 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:157:125:157:132 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:158:110:158:117 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:159:95:159:102 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:160:80:160:87 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:161:65:161:72 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:162:50:162:57 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:163:35:163:42 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:164:35:164:42 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:165:55:165:62 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:166:35:166:42 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:167:40:167:47 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:168:40:168:47 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:169:41:169:48 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:170:41:170:48 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:171:56:171:63 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:172:56:172:63 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:173:51:173:58 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:174:59:174:66 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:175:59:175:66 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:176:41:176:48 | source(...) | provenance | Src:MaD:324  Sink:MaD:72 |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:176:41:176:48 | source(...) | provenance | Src:MaD:324  Sink:MaD:388 |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:177:50:177:57 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:178:50:178:57 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:179:70:179:77 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:180:65:180:72 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:181:50:181:57 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:182:80:182:87 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:183:65:183:72 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:184:50:184:57 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:185:95:185:102 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:186:80:186:87 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:187:65:187:72 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:188:50:188:57 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:189:110:189:117 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:190:95:190:102 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:191:80:191:87 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:192:65:192:72 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:193:50:193:57 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:194:125:194:132 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:195:110:195:117 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:196:95:196:102 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:197:80:197:87 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:198:65:198:72 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:199:50:199:57 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:200:140:200:147 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:201:125:201:132 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:202:110:202:117 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:203:95:203:102 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:204:80:204:87 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:205:65:205:72 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:206:50:206:57 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:207:155:207:162 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:208:140:208:147 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:209:125:209:132 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:210:110:210:117 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:211:95:211:102 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:212:80:212:87 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:213:65:213:72 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:214:50:214:57 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:215:170:215:177 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:216:155:216:162 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:217:140:217:147 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:218:125:218:132 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:219:110:219:117 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:220:95:220:102 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:221:80:221:87 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:222:65:222:72 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:223:50:223:57 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:224:185:224:192 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:225:170:225:177 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:226:155:226:162 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:227:140:227:147 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:228:125:228:132 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:229:110:229:117 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:230:95:230:102 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:231:80:231:87 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:232:65:232:72 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:233:50:233:57 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:234:50:234:57 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:235:70:235:77 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:236:50:236:57 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:237:55:237:62 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:238:55:238:62 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:239:44:239:51 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:240:44:240:51 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:241:36:241:43 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:242:36:242:43 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:243:26:243:33 | source(...) | provenance | Src:MaD:324  Sink:MaD:91 |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:243:26:243:33 | source(...) | provenance | Src:MaD:324  Sink:MaD:407 |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:244:26:244:33 | source(...) | provenance | Src:MaD:324  Sink:MaD:92 |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:244:26:244:33 | source(...) | provenance | Src:MaD:324  Sink:MaD:408 |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:245:35:245:42 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:246:35:246:42 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:247:55:247:62 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:248:50:248:57 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:249:35:249:42 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:250:65:250:72 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:251:50:251:57 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:252:35:252:42 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:253:80:253:87 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:254:65:254:72 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:255:50:255:57 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:256:35:256:42 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:257:95:257:102 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:258:80:258:87 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:259:65:259:72 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:260:50:260:57 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:261:35:261:42 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:262:110:262:117 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:263:95:263:102 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:264:80:264:87 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:265:65:265:72 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:266:50:266:57 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:267:35:267:42 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:268:125:268:132 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:269:110:269:117 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:270:95:270:102 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:271:80:271:87 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:272:65:272:72 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:273:50:273:57 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:274:35:274:42 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:275:140:275:147 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:276:125:276:132 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:277:110:277:117 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:278:95:278:102 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:279:80:279:87 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:280:65:280:72 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:281:50:281:57 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:282:35:282:42 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:283:155:283:162 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:284:140:284:147 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:285:125:285:132 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:286:110:286:117 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:287:95:287:102 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:288:80:288:87 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:289:65:289:72 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:290:50:290:57 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:291:35:291:42 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:292:170:292:177 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:293:155:293:162 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:294:140:294:147 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:295:125:295:132 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:296:110:296:117 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:297:95:297:102 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:298:80:298:87 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:299:65:299:72 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:300:50:300:57 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:301:35:301:42 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:302:35:302:42 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:303:55:303:62 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:304:35:304:42 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:305:40:305:47 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:306:40:306:47 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:307:41:307:48 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:308:41:308:48 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:309:56:309:63 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:310:56:310:63 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:311:51:311:58 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:312:59:312:66 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:313:59:313:66 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:314:41:314:48 | source(...) | provenance | Src:MaD:324  Sink:MaD:114 |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:314:41:314:48 | source(...) | provenance | Src:MaD:324  Sink:MaD:430 |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:315:50:315:57 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:316:50:316:57 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:317:70:317:77 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:318:65:318:72 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:319:50:319:57 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:320:80:320:87 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:321:65:321:72 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:322:50:322:57 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:323:95:323:102 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:324:80:324:87 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:325:65:325:72 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:326:50:326:57 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:327:110:327:117 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:328:95:328:102 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:329:80:329:87 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:330:65:330:72 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:331:50:331:57 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:332:125:332:132 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:333:110:333:117 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:334:95:334:102 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:335:80:335:87 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:336:65:336:72 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:337:50:337:57 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:338:140:338:147 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:339:125:339:132 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:340:110:340:117 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:341:95:341:102 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:342:80:342:87 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:343:65:343:72 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:344:50:344:57 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:345:155:345:162 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:346:140:346:147 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:347:125:347:132 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:348:110:348:117 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:349:95:349:102 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:350:80:350:87 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:351:65:351:72 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:352:50:352:57 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:353:170:353:177 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:354:155:354:162 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:355:140:355:147 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:356:125:356:132 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:357:110:357:117 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:358:95:358:102 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:359:80:359:87 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:360:65:360:72 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:361:50:361:57 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:362:185:362:192 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:363:170:363:177 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:364:155:364:162 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:365:140:365:147 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:366:125:366:132 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:367:110:367:117 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:368:95:368:102 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:369:80:369:87 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:370:65:370:72 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:371:50:371:57 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:372:50:372:57 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:373:70:373:77 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:374:50:374:57 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:375:55:375:62 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:376:55:376:62 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:377:44:377:51 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:378:44:378:51 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:379:36:379:43 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:380:36:380:43 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:381:26:381:33 | source(...) | provenance | Src:MaD:324  Sink:MaD:133 |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:381:26:381:33 | source(...) | provenance | Src:MaD:324  Sink:MaD:449 |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:382:26:382:33 | source(...) | provenance | Src:MaD:324  Sink:MaD:134 |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:382:26:382:33 | source(...) | provenance | Src:MaD:324  Sink:MaD:450 |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:383:35:383:42 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:384:35:384:42 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:385:55:385:62 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:386:50:386:57 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:387:35:387:42 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:388:65:388:72 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:389:50:389:57 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:390:35:390:42 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:391:80:391:87 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:392:65:392:72 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:393:50:393:57 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:394:35:394:42 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:395:95:395:102 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:396:80:396:87 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:397:65:397:72 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:398:50:398:57 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:399:35:399:42 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:400:110:400:117 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:401:95:401:102 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:402:80:402:87 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:403:65:403:72 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:404:50:404:57 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:405:35:405:42 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:406:125:406:132 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:407:110:407:117 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:408:95:408:102 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:409:80:409:87 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:410:65:410:72 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:411:50:411:57 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:412:35:412:42 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:413:140:413:147 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:414:125:414:132 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:415:110:415:117 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:416:95:416:102 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:417:80:417:87 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:418:65:418:72 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:419:50:419:57 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:420:35:420:42 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:421:155:421:162 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:422:140:422:147 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:423:125:423:132 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:424:110:424:117 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:425:95:425:102 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:426:80:426:87 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:427:65:427:72 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:428:50:428:57 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:429:35:429:42 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:430:170:430:177 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:431:155:431:162 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:432:140:432:147 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:433:125:433:132 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:434:110:434:117 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:435:95:435:102 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:436:80:436:87 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:437:65:437:72 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:438:50:438:57 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:439:35:439:42 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:440:35:440:42 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:441:55:441:62 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:442:35:442:42 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:443:40:443:47 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:444:40:444:47 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:445:40:445:47 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:446:40:446:47 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:447:55:447:62 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:448:55:448:62 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:449:50:449:57 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:450:58:450:65 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:451:58:451:65 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:452:40:452:47 | source(...) | provenance | Src:MaD:324  Sink:MaD:156 |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:452:40:452:47 | source(...) | provenance | Src:MaD:324  Sink:MaD:472 |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:453:49:453:56 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:454:49:454:56 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:455:69:455:76 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:456:64:456:71 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:457:49:457:56 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:458:79:458:86 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:459:64:459:71 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:460:49:460:56 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:461:94:461:101 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:462:79:462:86 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:463:64:463:71 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:464:49:464:56 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:465:109:465:116 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:466:94:466:101 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:467:79:467:86 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:468:64:468:71 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:469:49:469:56 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:470:124:470:131 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:471:109:471:116 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:472:94:472:101 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:473:79:473:86 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:474:64:474:71 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:475:49:475:56 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:476:139:476:146 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:477:124:477:131 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:478:109:478:116 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:479:94:479:101 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:480:79:480:86 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:481:64:481:71 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:482:49:482:56 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:483:154:483:161 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:484:139:484:146 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:485:124:485:131 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:486:109:486:116 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:487:94:487:101 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:488:79:488:86 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:489:64:489:71 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:490:49:490:56 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:491:169:491:176 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:492:154:492:161 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:493:139:493:146 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:494:124:494:131 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:495:109:495:116 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:496:94:496:101 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:497:79:497:86 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:498:64:498:71 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:499:49:499:56 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:500:184:500:191 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:501:169:501:176 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:502:154:502:161 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:503:139:503:146 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:504:124:504:131 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:505:109:505:116 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:506:94:506:101 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:507:79:507:86 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:508:64:508:71 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:509:49:509:56 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:510:49:510:56 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:511:69:511:76 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:512:49:512:56 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:513:54:513:61 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:514:54:514:61 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:515:43:515:50 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:516:43:516:50 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:517:35:517:42 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:518:35:518:42 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:519:25:519:32 | source(...) | provenance | Src:MaD:324  Sink:MaD:175 |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:519:25:519:32 | source(...) | provenance | Src:MaD:324  Sink:MaD:491 |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:520:25:520:32 | source(...) | provenance | Src:MaD:324  Sink:MaD:176 |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:520:25:520:32 | source(...) | provenance | Src:MaD:324  Sink:MaD:492 |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:521:34:521:41 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:522:34:522:41 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:523:54:523:61 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:524:49:524:56 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:525:34:525:41 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:526:64:526:71 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:527:49:527:56 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:528:34:528:41 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:529:79:529:86 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:530:64:530:71 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:531:49:531:56 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:532:34:532:41 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:533:94:533:101 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:534:79:534:86 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:535:64:535:71 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:536:49:536:56 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:537:34:537:41 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:538:109:538:116 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:539:94:539:101 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:540:79:540:86 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:541:64:541:71 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:542:49:542:56 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:543:34:543:41 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:544:124:544:131 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:545:109:545:116 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:546:94:546:101 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:547:79:547:86 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:548:64:548:71 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:549:49:549:56 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:550:34:550:41 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:551:139:551:146 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:552:124:552:131 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:553:109:553:116 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:554:94:554:101 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:555:79:555:86 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:556:64:556:71 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:557:49:557:56 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:558:34:558:41 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:559:154:559:161 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:560:139:560:146 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:561:124:561:131 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:562:109:562:116 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:563:94:563:101 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:564:79:564:86 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:565:64:565:71 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:566:49:566:56 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:567:34:567:41 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:568:169:568:176 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:569:154:569:161 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:570:139:570:146 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:571:124:571:131 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:572:109:572:116 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:573:94:573:101 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:574:79:574:86 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:575:64:575:71 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:576:49:576:56 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:577:34:577:41 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:578:34:578:41 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:579:54:579:61 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:580:34:580:41 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:581:39:581:46 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:582:39:582:46 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:583:53:583:60 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:584:53:584:60 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:585:68:585:75 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:586:68:586:75 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:587:63:587:70 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:588:71:588:78 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:589:71:589:78 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:590:53:590:60 | source(...) | provenance | Src:MaD:324  Sink:MaD:198 |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:590:53:590:60 | source(...) | provenance | Src:MaD:324  Sink:MaD:514 |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:591:62:591:69 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:592:62:592:69 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:593:82:593:89 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:594:77:594:84 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:595:62:595:69 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:596:92:596:99 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:597:77:597:84 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:598:62:598:69 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:599:107:599:114 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:600:92:600:99 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:601:77:601:84 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:602:62:602:69 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:603:122:603:129 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:604:107:604:114 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:605:92:605:99 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:606:77:606:84 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:607:62:607:69 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:608:137:608:144 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:609:122:609:129 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:610:107:610:114 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:611:92:611:99 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:612:77:612:84 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:613:62:613:69 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:614:152:614:159 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:615:137:615:144 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:616:122:616:129 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:617:107:617:114 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:618:92:618:99 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:619:77:619:84 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:620:62:620:69 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:621:167:621:174 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:622:152:622:159 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:623:137:623:144 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:624:122:624:129 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:625:107:625:114 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:626:92:626:99 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:627:77:627:84 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:628:62:628:69 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:629:182:629:189 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:630:167:630:174 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:631:152:631:159 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:632:137:632:144 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:633:122:633:129 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:634:107:634:114 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:635:92:635:99 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:636:77:636:84 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:637:62:637:69 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:638:197:638:204 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:639:182:639:189 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:640:167:640:174 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:641:152:641:159 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:642:137:642:144 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:643:122:643:129 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:644:107:644:114 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:645:92:645:99 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:646:77:646:84 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:647:62:647:69 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:648:62:648:69 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:649:82:649:89 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:650:62:650:69 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:651:67:651:74 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:652:67:652:74 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:653:56:653:63 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:654:56:654:63 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:655:48:655:55 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:656:48:656:55 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:657:38:657:45 | source(...) | provenance | Src:MaD:324  Sink:MaD:217 |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:657:38:657:45 | source(...) | provenance | Src:MaD:324  Sink:MaD:533 |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:658:38:658:45 | source(...) | provenance | Src:MaD:324  Sink:MaD:218 |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:658:38:658:45 | source(...) | provenance | Src:MaD:324  Sink:MaD:534 |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:659:47:659:54 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:660:47:660:54 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:661:67:661:74 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:662:62:662:69 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:663:47:663:54 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:664:77:664:84 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:665:62:665:69 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:666:47:666:54 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:667:92:667:99 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:668:77:668:84 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:669:62:669:69 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:670:47:670:54 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:671:107:671:114 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:672:92:672:99 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:673:77:673:84 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:674:62:674:69 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:675:47:675:54 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:676:122:676:129 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:677:107:677:114 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:678:92:678:99 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:679:77:679:84 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:680:62:680:69 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:681:47:681:54 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:682:137:682:144 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:683:122:683:129 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:684:107:684:114 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:685:92:685:99 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:686:77:686:84 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:687:62:687:69 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:688:47:688:54 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:689:152:689:159 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:690:137:690:144 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:691:122:691:129 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:692:107:692:114 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:693:92:693:99 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:694:77:694:84 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:695:62:695:69 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:696:47:696:54 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:697:167:697:174 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:698:152:698:159 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:699:137:699:144 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:700:122:700:129 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:701:107:701:114 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:702:92:702:99 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:703:77:703:84 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:704:62:704:69 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:705:47:705:54 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:706:182:706:189 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:707:167:707:174 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:708:152:708:159 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:709:137:709:144 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:710:122:710:129 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:711:107:711:114 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:712:92:712:99 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:713:77:713:84 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:714:62:714:69 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:715:47:715:54 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:716:47:716:54 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:717:67:717:74 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:718:47:718:54 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:719:52:719:59 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:720:52:720:59 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:721:41:721:48 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:722:41:722:48 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:723:56:723:63 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:724:56:724:63 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:725:51:725:58 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:726:59:726:66 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:727:59:727:66 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:728:41:728:48 | source(...) | provenance | Src:MaD:324  Sink:MaD:243 |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:728:41:728:48 | source(...) | provenance | Src:MaD:324  Sink:MaD:559 |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:729:50:729:57 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:730:50:730:57 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:731:70:731:77 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:732:65:732:72 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:733:50:733:57 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:734:80:734:87 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:735:65:735:72 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:736:50:736:57 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:737:95:737:102 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:738:80:738:87 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:739:65:739:72 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:740:50:740:57 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:741:110:741:117 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:742:95:742:102 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:743:80:743:87 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:744:65:744:72 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:745:50:745:57 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:746:125:746:132 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:747:110:747:117 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:748:95:748:102 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:749:80:749:87 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:750:65:750:72 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:751:50:751:57 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:752:140:752:147 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:753:125:753:132 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:754:110:754:117 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:755:95:755:102 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:756:80:756:87 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:757:65:757:72 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:758:50:758:57 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:759:155:759:162 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:760:140:760:147 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:761:125:761:132 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:762:110:762:117 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:763:95:763:102 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:764:80:764:87 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:765:65:765:72 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:766:50:766:57 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:767:170:767:177 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:768:155:768:162 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:769:140:769:147 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:770:125:770:132 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:771:110:771:117 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:772:95:772:102 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:773:80:773:87 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:774:65:774:72 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:775:50:775:57 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:776:185:776:192 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:777:170:777:177 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:778:155:778:162 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:779:140:779:147 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:780:125:780:132 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:781:110:781:117 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:782:95:782:102 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:783:80:783:87 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:784:65:784:72 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:785:50:785:57 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:786:50:786:57 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:787:70:787:77 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:788:50:788:57 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:789:55:789:62 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:790:55:790:62 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:791:44:791:51 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:792:44:792:51 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:793:36:793:43 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:794:36:794:43 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:795:26:795:33 | source(...) | provenance | Src:MaD:324  Sink:MaD:262 |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:795:26:795:33 | source(...) | provenance | Src:MaD:324  Sink:MaD:578 |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:796:26:796:33 | source(...) | provenance | Src:MaD:324  Sink:MaD:263 |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:796:26:796:33 | source(...) | provenance | Src:MaD:324  Sink:MaD:579 |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:797:35:797:42 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:798:35:798:42 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:799:55:799:62 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:800:50:800:57 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:801:35:801:42 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:802:65:802:72 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:803:50:803:57 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:804:35:804:42 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:805:80:805:87 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:806:65:806:72 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:807:50:807:57 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:808:35:808:42 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:809:95:809:102 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:810:80:810:87 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:811:65:811:72 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:812:50:812:57 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:813:35:813:42 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:814:110:814:117 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:815:95:815:102 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:816:80:816:87 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:817:65:817:72 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:818:50:818:57 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:819:35:819:42 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:820:125:820:132 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:821:110:821:117 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:822:95:822:102 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:823:80:823:87 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:824:65:824:72 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:825:50:825:57 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:826:35:826:42 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:827:140:827:147 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:828:125:828:132 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:829:110:829:117 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:830:95:830:102 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:831:80:831:87 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:832:65:832:72 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:833:50:833:57 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:834:35:834:42 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:835:155:835:162 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:836:140:836:147 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:837:125:837:132 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:838:110:838:117 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:839:95:839:102 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:840:80:840:87 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:841:65:841:72 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:842:50:842:57 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:843:35:843:42 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:844:170:844:177 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:845:155:845:162 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:846:140:846:147 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:847:125:847:132 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:848:110:848:117 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:849:95:849:102 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:850:80:850:87 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:851:65:851:72 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:852:50:852:57 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:853:35:853:42 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:854:35:854:42 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:855:55:855:62 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:856:35:856:42 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:857:40:857:47 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:858:40:858:47 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:859:40:859:47 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:860:40:860:47 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:861:55:861:62 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:862:55:862:62 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:863:50:863:57 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:864:58:864:65 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:865:58:865:65 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:866:40:866:47 | source(...) | provenance | Src:MaD:324  Sink:MaD:285 |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:866:40:866:47 | source(...) | provenance | Src:MaD:324  Sink:MaD:601 |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:867:49:867:56 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:868:49:868:56 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:869:69:869:76 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:870:64:870:71 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:871:49:871:56 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:872:79:872:86 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:873:64:873:71 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:874:49:874:56 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:875:94:875:101 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:876:79:876:86 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:877:64:877:71 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:878:49:878:56 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:879:109:879:116 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:880:94:880:101 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:881:79:881:86 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:882:64:882:71 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:883:49:883:56 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:884:124:884:131 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:885:109:885:116 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:886:94:886:101 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:887:79:887:86 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:888:64:888:71 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:889:49:889:56 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:890:139:890:146 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:891:124:891:131 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:892:109:892:116 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:893:94:893:101 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:894:79:894:86 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:895:64:895:71 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:896:49:896:56 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:897:154:897:161 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:898:139:898:146 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:899:124:899:131 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:900:109:900:116 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:901:94:901:101 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:902:79:902:86 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:903:64:903:71 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:904:49:904:56 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:905:169:905:176 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:906:154:906:161 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:907:139:907:146 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:908:124:908:131 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:909:109:909:116 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:910:94:910:101 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:911:79:911:86 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:912:64:912:71 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:913:49:913:56 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:914:184:914:191 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:915:169:915:176 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:916:154:916:161 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:917:139:917:146 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:918:124:918:131 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:919:109:919:116 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:920:94:920:101 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:921:79:921:86 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:922:64:922:71 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:923:49:923:56 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:924:49:924:56 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:925:69:925:76 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:926:49:926:56 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:927:54:927:61 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:928:54:928:61 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:929:43:929:50 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:930:43:930:50 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:931:35:931:42 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:932:35:932:42 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:933:25:933:32 | source(...) | provenance | Src:MaD:324  Sink:MaD:304 |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:933:25:933:32 | source(...) | provenance | Src:MaD:324  Sink:MaD:620 |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:934:25:934:32 | source(...) | provenance | Src:MaD:324  Sink:MaD:305 |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:934:25:934:32 | source(...) | provenance | Src:MaD:324  Sink:MaD:621 |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:935:34:935:41 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:936:34:936:41 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:937:54:937:61 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:938:49:938:56 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:939:34:939:41 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:940:64:940:71 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:941:49:941:56 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:942:34:942:41 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:943:79:943:86 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:944:64:944:71 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:945:49:945:56 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:946:34:946:41 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:947:94:947:101 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:948:79:948:86 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:949:64:949:71 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:950:49:950:56 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:951:34:951:41 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:952:109:952:116 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:953:94:953:101 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:954:79:954:86 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:955:64:955:71 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:956:49:956:56 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:957:34:957:41 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:958:124:958:131 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:959:109:959:116 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:960:94:960:101 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:961:79:961:86 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:962:64:962:71 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:963:49:963:56 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:964:34:964:41 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:965:139:965:146 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:966:124:966:131 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:967:109:967:116 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:968:94:968:101 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:969:79:969:86 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:970:64:970:71 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:971:49:971:56 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:972:34:972:41 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:973:154:973:161 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:974:139:974:146 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:975:124:975:131 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:976:109:976:116 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:977:94:977:101 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:978:79:978:86 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:979:64:979:71 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:980:49:980:56 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:981:34:981:41 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:982:169:982:176 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:983:154:983:161 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:984:139:984:146 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:985:124:985:131 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:986:109:986:116 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:987:94:987:101 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:988:79:988:86 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:989:64:989:71 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:990:49:990:56 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:991:34:991:41 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:992:34:992:41 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:993:54:993:61 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:994:34:994:41 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:995:39:995:46 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:996:39:996:46 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:998:65:998:72 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:999:48:999:55 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:1000:59:1000:66 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:1001:42:1001:49 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:1002:53:1002:60 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:1020:40:1020:47 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:1021:35:1021:42 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:1022:25:1022:32 | source(...) | provenance | Src:MaD:324  Sink:MaD:11 |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:1022:25:1022:32 | source(...) | provenance | Src:MaD:324  Sink:MaD:327 |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:1023:34:1023:41 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:1024:34:1024:41 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:1025:54:1025:61 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:1026:40:1026:47 | source(...) | provenance | Src:MaD:324  Sink:MaD:13 |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:1026:40:1026:47 | source(...) | provenance | Src:MaD:324  Sink:MaD:329 |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:1028:49:1028:56 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:1029:34:1029:41 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:1030:64:1030:71 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:1031:49:1031:56 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:1032:34:1032:41 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:1033:79:1033:86 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:1034:64:1034:71 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:1035:49:1035:56 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:1036:34:1036:41 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:1037:94:1037:101 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:1038:79:1038:86 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:1039:64:1039:71 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:1040:49:1040:56 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:1041:34:1041:41 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:1042:109:1042:116 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:1043:94:1043:101 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:1044:79:1044:86 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:1045:64:1045:71 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:1046:49:1046:56 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:1047:34:1047:41 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:1048:124:1048:131 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:1049:109:1049:116 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:1050:94:1050:101 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:1051:79:1051:86 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:1052:64:1052:71 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:1053:49:1053:56 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:1054:34:1054:41 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:1055:139:1055:146 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:1056:124:1056:131 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:1057:109:1057:116 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:1058:94:1058:101 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:1059:79:1059:86 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:1060:64:1060:71 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:1061:49:1061:56 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:1062:34:1062:41 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:1063:154:1063:161 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:1064:139:1064:146 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:1065:124:1065:131 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:1066:109:1066:116 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:1067:94:1067:101 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:1068:79:1068:86 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:1069:64:1069:71 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:1070:49:1070:56 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:1071:34:1071:41 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:1072:169:1072:176 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:1073:154:1073:161 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:1074:139:1074:146 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:1075:124:1075:131 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:1076:109:1076:116 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:1077:94:1077:101 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:1078:79:1078:86 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:1079:64:1079:71 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:1080:49:1080:56 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:1081:34:1081:41 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:1083:34:1083:41 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:1084:54:1084:61 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:1085:39:1085:46 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:1088:47:1088:54 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:1089:53:1089:60 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:1091:37:1091:44 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:1095:80:1095:87 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:1100:44:1100:51 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:1105:43:1105:50 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:1111:42:1111:49 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:1116:61:1116:68 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:1117:81:1117:88 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:1119:42:1119:49 | source(...) : String | provenance | Src:MaD:324  |
-| Log4jJndiInjectionTest.java:31:41:31:48 | source(...) : String | Log4jJndiInjectionTest.java:31:26:31:48 | (...)... | provenance |  Sink:MaD:23 |
-| Log4jJndiInjectionTest.java:31:41:31:48 | source(...) : String | Log4jJndiInjectionTest.java:31:26:31:48 | (...)... | provenance |  Sink:MaD:339 |
-| Log4jJndiInjectionTest.java:32:41:32:48 | source(...) : String | Log4jJndiInjectionTest.java:32:26:32:48 | (...)... | provenance |  Sink:MaD:24 |
-| Log4jJndiInjectionTest.java:32:41:32:48 | source(...) : String | Log4jJndiInjectionTest.java:32:26:32:48 | (...)... | provenance |  Sink:MaD:340 |
-| Log4jJndiInjectionTest.java:33:56:33:63 | source(...) : String | Log4jJndiInjectionTest.java:33:41:33:63 | (...)... | provenance |  Sink:MaD:25 |
-| Log4jJndiInjectionTest.java:33:56:33:63 | source(...) : String | Log4jJndiInjectionTest.java:33:41:33:63 | (...)... | provenance |  Sink:MaD:341 |
-| Log4jJndiInjectionTest.java:34:56:34:63 | source(...) : String | Log4jJndiInjectionTest.java:34:41:34:63 | (...)... | provenance |  Sink:MaD:26 |
-| Log4jJndiInjectionTest.java:34:56:34:63 | source(...) : String | Log4jJndiInjectionTest.java:34:41:34:63 | (...)... | provenance |  Sink:MaD:342 |
-| Log4jJndiInjectionTest.java:35:51:35:58 | source(...) : String | Log4jJndiInjectionTest.java:35:41:35:58 | (...)... | provenance |  Sink:MaD:27 |
-| Log4jJndiInjectionTest.java:35:51:35:58 | source(...) : String | Log4jJndiInjectionTest.java:35:41:35:58 | (...)... | provenance |  Sink:MaD:343 |
-| Log4jJndiInjectionTest.java:36:59:36:66 | source(...) : String | Log4jJndiInjectionTest.java:36:41:36:66 | (...)... | provenance |  Sink:MaD:28 |
-| Log4jJndiInjectionTest.java:36:59:36:66 | source(...) : String | Log4jJndiInjectionTest.java:36:41:36:66 | (...)... | provenance |  Sink:MaD:344 |
-| Log4jJndiInjectionTest.java:37:59:37:66 | source(...) : String | Log4jJndiInjectionTest.java:37:41:37:66 | (...)... | provenance |  Sink:MaD:29 |
-| Log4jJndiInjectionTest.java:37:59:37:66 | source(...) : String | Log4jJndiInjectionTest.java:37:41:37:66 | (...)... | provenance |  Sink:MaD:345 |
-| Log4jJndiInjectionTest.java:39:50:39:57 | source(...) : String | Log4jJndiInjectionTest.java:39:41:39:57 | (...)... | provenance |  Sink:MaD:31 |
-| Log4jJndiInjectionTest.java:39:50:39:57 | source(...) : String | Log4jJndiInjectionTest.java:39:41:39:57 | (...)... | provenance |  Sink:MaD:347 |
-| Log4jJndiInjectionTest.java:40:50:40:57 | source(...) : String | Log4jJndiInjectionTest.java:40:41:40:57 | (...)... | provenance |  Sink:MaD:41 |
-| Log4jJndiInjectionTest.java:40:50:40:57 | source(...) : String | Log4jJndiInjectionTest.java:40:41:40:57 | (...)... | provenance |  Sink:MaD:357 |
-| Log4jJndiInjectionTest.java:41:56:41:78 | {...} : Object[] [[]] : String | Log4jJndiInjectionTest.java:41:56:41:78 | new Object[] | provenance |  Sink:MaD:41 |
-| Log4jJndiInjectionTest.java:41:56:41:78 | {...} : Object[] [[]] : String | Log4jJndiInjectionTest.java:41:56:41:78 | new Object[] | provenance |  Sink:MaD:357 |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:31:41:31:48 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:32:41:32:48 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:33:56:33:63 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:34:56:34:63 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:35:51:35:58 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:36:59:36:66 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:37:59:37:66 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:38:41:38:48 | source(...) | provenance | Src:MaD:630 Sink:MaD:48 |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:38:41:38:48 | source(...) | provenance | Src:MaD:630 Sink:MaD:47 |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:39:50:39:57 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:40:50:40:57 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:41:70:41:77 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:42:65:42:72 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:43:50:43:57 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:44:80:44:87 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:45:65:45:72 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:46:50:46:57 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:47:95:47:102 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:48:80:48:87 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:49:65:49:72 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:50:50:50:57 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:51:110:51:117 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:52:95:52:102 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:53:80:53:87 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:54:65:54:72 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:55:50:55:57 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:56:125:56:132 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:57:110:57:117 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:58:95:58:102 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:59:80:59:87 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:60:65:60:72 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:61:50:61:57 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:62:140:62:147 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:63:125:63:132 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:64:110:64:117 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:65:95:65:102 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:66:80:66:87 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:67:65:67:72 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:68:50:68:57 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:69:155:69:162 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:70:140:70:147 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:71:125:71:132 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:72:110:72:117 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:73:95:73:102 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:74:80:74:87 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:75:65:75:72 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:76:50:76:57 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:77:170:77:177 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:78:155:78:162 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:79:140:79:147 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:80:125:80:132 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:81:110:81:117 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:82:95:82:102 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:83:80:83:87 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:84:65:84:72 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:85:50:85:57 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:86:185:86:192 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:87:170:87:177 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:88:155:88:162 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:89:140:89:147 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:90:125:90:132 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:91:110:91:117 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:92:95:92:102 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:93:80:93:87 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:94:65:94:72 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:95:50:95:57 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:96:50:96:57 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:97:70:97:77 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:98:50:98:57 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:99:55:99:62 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:100:55:100:62 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:101:44:101:51 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:102:44:102:51 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:103:36:103:43 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:104:36:104:43 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:105:26:105:33 | source(...) | provenance | Src:MaD:630 Sink:MaD:86 |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:105:26:105:33 | source(...) | provenance | Src:MaD:630 Sink:MaD:85 |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:106:26:106:33 | source(...) | provenance | Src:MaD:630 Sink:MaD:88 |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:106:26:106:33 | source(...) | provenance | Src:MaD:630 Sink:MaD:87 |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:107:35:107:42 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:108:35:108:42 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:109:55:109:62 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:110:50:110:57 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:111:35:111:42 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:112:65:112:72 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:113:50:113:57 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:114:35:114:42 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:115:80:115:87 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:116:65:116:72 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:117:50:117:57 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:118:35:118:42 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:119:95:119:102 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:120:80:120:87 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:121:65:121:72 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:122:50:122:57 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:123:35:123:42 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:124:110:124:117 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:125:95:125:102 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:126:80:126:87 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:127:65:127:72 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:128:50:128:57 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:129:35:129:42 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:130:125:130:132 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:131:110:131:117 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:132:95:132:102 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:133:80:133:87 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:134:65:134:72 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:135:50:135:57 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:136:35:136:42 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:137:140:137:147 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:138:125:138:132 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:139:110:139:117 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:140:95:140:102 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:141:80:141:87 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:142:65:142:72 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:143:50:143:57 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:144:35:144:42 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:145:155:145:162 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:146:140:146:147 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:147:125:147:132 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:148:110:148:117 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:149:95:149:102 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:150:80:150:87 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:151:65:151:72 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:152:50:152:57 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:153:35:153:42 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:154:170:154:177 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:155:155:155:162 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:156:140:156:147 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:157:125:157:132 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:158:110:158:117 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:159:95:159:102 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:160:80:160:87 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:161:65:161:72 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:162:50:162:57 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:163:35:163:42 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:164:35:164:42 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:165:55:165:62 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:166:35:166:42 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:167:40:167:47 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:168:40:168:47 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:169:41:169:48 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:170:41:170:48 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:171:56:171:63 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:172:56:172:63 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:173:51:173:58 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:174:59:174:66 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:175:59:175:66 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:176:41:176:48 | source(...) | provenance | Src:MaD:630 Sink:MaD:132 |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:176:41:176:48 | source(...) | provenance | Src:MaD:630 Sink:MaD:131 |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:177:50:177:57 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:178:50:178:57 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:179:70:179:77 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:180:65:180:72 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:181:50:181:57 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:182:80:182:87 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:183:65:183:72 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:184:50:184:57 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:185:95:185:102 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:186:80:186:87 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:187:65:187:72 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:188:50:188:57 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:189:110:189:117 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:190:95:190:102 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:191:80:191:87 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:192:65:192:72 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:193:50:193:57 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:194:125:194:132 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:195:110:195:117 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:196:95:196:102 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:197:80:197:87 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:198:65:198:72 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:199:50:199:57 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:200:140:200:147 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:201:125:201:132 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:202:110:202:117 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:203:95:203:102 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:204:80:204:87 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:205:65:205:72 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:206:50:206:57 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:207:155:207:162 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:208:140:208:147 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:209:125:209:132 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:210:110:210:117 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:211:95:211:102 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:212:80:212:87 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:213:65:213:72 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:214:50:214:57 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:215:170:215:177 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:216:155:216:162 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:217:140:217:147 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:218:125:218:132 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:219:110:219:117 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:220:95:220:102 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:221:80:221:87 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:222:65:222:72 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:223:50:223:57 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:224:185:224:192 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:225:170:225:177 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:226:155:226:162 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:227:140:227:147 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:228:125:228:132 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:229:110:229:117 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:230:95:230:102 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:231:80:231:87 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:232:65:232:72 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:233:50:233:57 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:234:50:234:57 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:235:70:235:77 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:236:50:236:57 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:237:55:237:62 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:238:55:238:62 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:239:44:239:51 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:240:44:240:51 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:241:36:241:43 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:242:36:242:43 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:243:26:243:33 | source(...) | provenance | Src:MaD:630 Sink:MaD:170 |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:243:26:243:33 | source(...) | provenance | Src:MaD:630 Sink:MaD:169 |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:244:26:244:33 | source(...) | provenance | Src:MaD:630 Sink:MaD:172 |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:244:26:244:33 | source(...) | provenance | Src:MaD:630 Sink:MaD:171 |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:245:35:245:42 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:246:35:246:42 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:247:55:247:62 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:248:50:248:57 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:249:35:249:42 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:250:65:250:72 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:251:50:251:57 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:252:35:252:42 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:253:80:253:87 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:254:65:254:72 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:255:50:255:57 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:256:35:256:42 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:257:95:257:102 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:258:80:258:87 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:259:65:259:72 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:260:50:260:57 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:261:35:261:42 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:262:110:262:117 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:263:95:263:102 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:264:80:264:87 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:265:65:265:72 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:266:50:266:57 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:267:35:267:42 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:268:125:268:132 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:269:110:269:117 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:270:95:270:102 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:271:80:271:87 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:272:65:272:72 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:273:50:273:57 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:274:35:274:42 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:275:140:275:147 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:276:125:276:132 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:277:110:277:117 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:278:95:278:102 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:279:80:279:87 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:280:65:280:72 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:281:50:281:57 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:282:35:282:42 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:283:155:283:162 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:284:140:284:147 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:285:125:285:132 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:286:110:286:117 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:287:95:287:102 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:288:80:288:87 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:289:65:289:72 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:290:50:290:57 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:291:35:291:42 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:292:170:292:177 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:293:155:293:162 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:294:140:294:147 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:295:125:295:132 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:296:110:296:117 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:297:95:297:102 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:298:80:298:87 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:299:65:299:72 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:300:50:300:57 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:301:35:301:42 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:302:35:302:42 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:303:55:303:62 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:304:35:304:42 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:305:40:305:47 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:306:40:306:47 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:307:41:307:48 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:308:41:308:48 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:309:56:309:63 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:310:56:310:63 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:311:51:311:58 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:312:59:312:66 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:313:59:313:66 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:314:41:314:48 | source(...) | provenance | Src:MaD:630 Sink:MaD:216 |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:314:41:314:48 | source(...) | provenance | Src:MaD:630 Sink:MaD:215 |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:315:50:315:57 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:316:50:316:57 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:317:70:317:77 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:318:65:318:72 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:319:50:319:57 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:320:80:320:87 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:321:65:321:72 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:322:50:322:57 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:323:95:323:102 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:324:80:324:87 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:325:65:325:72 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:326:50:326:57 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:327:110:327:117 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:328:95:328:102 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:329:80:329:87 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:330:65:330:72 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:331:50:331:57 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:332:125:332:132 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:333:110:333:117 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:334:95:334:102 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:335:80:335:87 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:336:65:336:72 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:337:50:337:57 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:338:140:338:147 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:339:125:339:132 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:340:110:340:117 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:341:95:341:102 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:342:80:342:87 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:343:65:343:72 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:344:50:344:57 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:345:155:345:162 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:346:140:346:147 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:347:125:347:132 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:348:110:348:117 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:349:95:349:102 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:350:80:350:87 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:351:65:351:72 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:352:50:352:57 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:353:170:353:177 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:354:155:354:162 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:355:140:355:147 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:356:125:356:132 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:357:110:357:117 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:358:95:358:102 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:359:80:359:87 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:360:65:360:72 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:361:50:361:57 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:362:185:362:192 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:363:170:363:177 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:364:155:364:162 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:365:140:365:147 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:366:125:366:132 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:367:110:367:117 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:368:95:368:102 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:369:80:369:87 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:370:65:370:72 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:371:50:371:57 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:372:50:372:57 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:373:70:373:77 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:374:50:374:57 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:375:55:375:62 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:376:55:376:62 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:377:44:377:51 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:378:44:378:51 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:379:36:379:43 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:380:36:380:43 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:381:26:381:33 | source(...) | provenance | Src:MaD:630 Sink:MaD:254 |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:381:26:381:33 | source(...) | provenance | Src:MaD:630 Sink:MaD:253 |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:382:26:382:33 | source(...) | provenance | Src:MaD:630 Sink:MaD:256 |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:382:26:382:33 | source(...) | provenance | Src:MaD:630 Sink:MaD:255 |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:383:35:383:42 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:384:35:384:42 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:385:55:385:62 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:386:50:386:57 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:387:35:387:42 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:388:65:388:72 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:389:50:389:57 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:390:35:390:42 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:391:80:391:87 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:392:65:392:72 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:393:50:393:57 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:394:35:394:42 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:395:95:395:102 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:396:80:396:87 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:397:65:397:72 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:398:50:398:57 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:399:35:399:42 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:400:110:400:117 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:401:95:401:102 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:402:80:402:87 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:403:65:403:72 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:404:50:404:57 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:405:35:405:42 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:406:125:406:132 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:407:110:407:117 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:408:95:408:102 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:409:80:409:87 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:410:65:410:72 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:411:50:411:57 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:412:35:412:42 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:413:140:413:147 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:414:125:414:132 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:415:110:415:117 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:416:95:416:102 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:417:80:417:87 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:418:65:418:72 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:419:50:419:57 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:420:35:420:42 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:421:155:421:162 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:422:140:422:147 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:423:125:423:132 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:424:110:424:117 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:425:95:425:102 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:426:80:426:87 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:427:65:427:72 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:428:50:428:57 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:429:35:429:42 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:430:170:430:177 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:431:155:431:162 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:432:140:432:147 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:433:125:433:132 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:434:110:434:117 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:435:95:435:102 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:436:80:436:87 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:437:65:437:72 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:438:50:438:57 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:439:35:439:42 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:440:35:440:42 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:441:55:441:62 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:442:35:442:42 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:443:40:443:47 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:444:40:444:47 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:445:40:445:47 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:446:40:446:47 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:447:55:447:62 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:448:55:448:62 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:449:50:449:57 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:450:58:450:65 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:451:58:451:65 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:452:40:452:47 | source(...) | provenance | Src:MaD:630 Sink:MaD:300 |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:452:40:452:47 | source(...) | provenance | Src:MaD:630 Sink:MaD:299 |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:453:49:453:56 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:454:49:454:56 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:455:69:455:76 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:456:64:456:71 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:457:49:457:56 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:458:79:458:86 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:459:64:459:71 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:460:49:460:56 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:461:94:461:101 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:462:79:462:86 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:463:64:463:71 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:464:49:464:56 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:465:109:465:116 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:466:94:466:101 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:467:79:467:86 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:468:64:468:71 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:469:49:469:56 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:470:124:470:131 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:471:109:471:116 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:472:94:472:101 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:473:79:473:86 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:474:64:474:71 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:475:49:475:56 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:476:139:476:146 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:477:124:477:131 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:478:109:478:116 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:479:94:479:101 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:480:79:480:86 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:481:64:481:71 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:482:49:482:56 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:483:154:483:161 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:484:139:484:146 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:485:124:485:131 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:486:109:486:116 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:487:94:487:101 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:488:79:488:86 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:489:64:489:71 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:490:49:490:56 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:491:169:491:176 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:492:154:492:161 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:493:139:493:146 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:494:124:494:131 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:495:109:495:116 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:496:94:496:101 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:497:79:497:86 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:498:64:498:71 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:499:49:499:56 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:500:184:500:191 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:501:169:501:176 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:502:154:502:161 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:503:139:503:146 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:504:124:504:131 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:505:109:505:116 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:506:94:506:101 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:507:79:507:86 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:508:64:508:71 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:509:49:509:56 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:510:49:510:56 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:511:69:511:76 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:512:49:512:56 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:513:54:513:61 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:514:54:514:61 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:515:43:515:50 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:516:43:516:50 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:517:35:517:42 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:518:35:518:42 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:519:25:519:32 | source(...) | provenance | Src:MaD:630 Sink:MaD:338 |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:519:25:519:32 | source(...) | provenance | Src:MaD:630 Sink:MaD:337 |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:520:25:520:32 | source(...) | provenance | Src:MaD:630 Sink:MaD:340 |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:520:25:520:32 | source(...) | provenance | Src:MaD:630 Sink:MaD:339 |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:521:34:521:41 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:522:34:522:41 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:523:54:523:61 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:524:49:524:56 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:525:34:525:41 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:526:64:526:71 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:527:49:527:56 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:528:34:528:41 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:529:79:529:86 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:530:64:530:71 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:531:49:531:56 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:532:34:532:41 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:533:94:533:101 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:534:79:534:86 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:535:64:535:71 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:536:49:536:56 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:537:34:537:41 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:538:109:538:116 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:539:94:539:101 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:540:79:540:86 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:541:64:541:71 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:542:49:542:56 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:543:34:543:41 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:544:124:544:131 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:545:109:545:116 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:546:94:546:101 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:547:79:547:86 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:548:64:548:71 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:549:49:549:56 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:550:34:550:41 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:551:139:551:146 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:552:124:552:131 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:553:109:553:116 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:554:94:554:101 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:555:79:555:86 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:556:64:556:71 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:557:49:557:56 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:558:34:558:41 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:559:154:559:161 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:560:139:560:146 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:561:124:561:131 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:562:109:562:116 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:563:94:563:101 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:564:79:564:86 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:565:64:565:71 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:566:49:566:56 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:567:34:567:41 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:568:169:568:176 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:569:154:569:161 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:570:139:570:146 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:571:124:571:131 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:572:109:572:116 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:573:94:573:101 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:574:79:574:86 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:575:64:575:71 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:576:49:576:56 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:577:34:577:41 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:578:34:578:41 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:579:54:579:61 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:580:34:580:41 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:581:39:581:46 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:582:39:582:46 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:583:53:583:60 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:584:53:584:60 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:585:68:585:75 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:586:68:586:75 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:587:63:587:70 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:588:71:588:78 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:589:71:589:78 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:590:53:590:60 | source(...) | provenance | Src:MaD:630 Sink:MaD:384 |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:590:53:590:60 | source(...) | provenance | Src:MaD:630 Sink:MaD:383 |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:591:62:591:69 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:592:62:592:69 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:593:82:593:89 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:594:77:594:84 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:595:62:595:69 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:596:92:596:99 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:597:77:597:84 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:598:62:598:69 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:599:107:599:114 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:600:92:600:99 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:601:77:601:84 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:602:62:602:69 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:603:122:603:129 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:604:107:604:114 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:605:92:605:99 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:606:77:606:84 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:607:62:607:69 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:608:137:608:144 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:609:122:609:129 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:610:107:610:114 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:611:92:611:99 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:612:77:612:84 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:613:62:613:69 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:614:152:614:159 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:615:137:615:144 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:616:122:616:129 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:617:107:617:114 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:618:92:618:99 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:619:77:619:84 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:620:62:620:69 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:621:167:621:174 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:622:152:622:159 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:623:137:623:144 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:624:122:624:129 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:625:107:625:114 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:626:92:626:99 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:627:77:627:84 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:628:62:628:69 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:629:182:629:189 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:630:167:630:174 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:631:152:631:159 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:632:137:632:144 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:633:122:633:129 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:634:107:634:114 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:635:92:635:99 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:636:77:636:84 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:637:62:637:69 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:638:197:638:204 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:639:182:639:189 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:640:167:640:174 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:641:152:641:159 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:642:137:642:144 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:643:122:643:129 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:644:107:644:114 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:645:92:645:99 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:646:77:646:84 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:647:62:647:69 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:648:62:648:69 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:649:82:649:89 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:650:62:650:69 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:651:67:651:74 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:652:67:652:74 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:653:56:653:63 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:654:56:654:63 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:655:48:655:55 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:656:48:656:55 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:657:38:657:45 | source(...) | provenance | Src:MaD:630 Sink:MaD:422 |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:657:38:657:45 | source(...) | provenance | Src:MaD:630 Sink:MaD:421 |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:658:38:658:45 | source(...) | provenance | Src:MaD:630 Sink:MaD:424 |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:658:38:658:45 | source(...) | provenance | Src:MaD:630 Sink:MaD:423 |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:659:47:659:54 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:660:47:660:54 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:661:67:661:74 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:662:62:662:69 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:663:47:663:54 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:664:77:664:84 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:665:62:665:69 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:666:47:666:54 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:667:92:667:99 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:668:77:668:84 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:669:62:669:69 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:670:47:670:54 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:671:107:671:114 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:672:92:672:99 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:673:77:673:84 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:674:62:674:69 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:675:47:675:54 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:676:122:676:129 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:677:107:677:114 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:678:92:678:99 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:679:77:679:84 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:680:62:680:69 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:681:47:681:54 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:682:137:682:144 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:683:122:683:129 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:684:107:684:114 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:685:92:685:99 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:686:77:686:84 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:687:62:687:69 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:688:47:688:54 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:689:152:689:159 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:690:137:690:144 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:691:122:691:129 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:692:107:692:114 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:693:92:693:99 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:694:77:694:84 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:695:62:695:69 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:696:47:696:54 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:697:167:697:174 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:698:152:698:159 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:699:137:699:144 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:700:122:700:129 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:701:107:701:114 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:702:92:702:99 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:703:77:703:84 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:704:62:704:69 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:705:47:705:54 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:706:182:706:189 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:707:167:707:174 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:708:152:708:159 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:709:137:709:144 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:710:122:710:129 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:711:107:711:114 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:712:92:712:99 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:713:77:713:84 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:714:62:714:69 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:715:47:715:54 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:716:47:716:54 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:717:67:717:74 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:718:47:718:54 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:719:52:719:59 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:720:52:720:59 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:721:41:721:48 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:722:41:722:48 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:723:56:723:63 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:724:56:724:63 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:725:51:725:58 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:726:59:726:66 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:727:59:727:66 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:728:41:728:48 | source(...) | provenance | Src:MaD:630 Sink:MaD:474 |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:728:41:728:48 | source(...) | provenance | Src:MaD:630 Sink:MaD:473 |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:729:50:729:57 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:730:50:730:57 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:731:70:731:77 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:732:65:732:72 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:733:50:733:57 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:734:80:734:87 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:735:65:735:72 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:736:50:736:57 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:737:95:737:102 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:738:80:738:87 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:739:65:739:72 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:740:50:740:57 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:741:110:741:117 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:742:95:742:102 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:743:80:743:87 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:744:65:744:72 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:745:50:745:57 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:746:125:746:132 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:747:110:747:117 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:748:95:748:102 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:749:80:749:87 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:750:65:750:72 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:751:50:751:57 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:752:140:752:147 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:753:125:753:132 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:754:110:754:117 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:755:95:755:102 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:756:80:756:87 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:757:65:757:72 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:758:50:758:57 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:759:155:759:162 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:760:140:760:147 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:761:125:761:132 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:762:110:762:117 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:763:95:763:102 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:764:80:764:87 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:765:65:765:72 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:766:50:766:57 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:767:170:767:177 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:768:155:768:162 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:769:140:769:147 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:770:125:770:132 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:771:110:771:117 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:772:95:772:102 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:773:80:773:87 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:774:65:774:72 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:775:50:775:57 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:776:185:776:192 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:777:170:777:177 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:778:155:778:162 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:779:140:779:147 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:780:125:780:132 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:781:110:781:117 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:782:95:782:102 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:783:80:783:87 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:784:65:784:72 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:785:50:785:57 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:786:50:786:57 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:787:70:787:77 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:788:50:788:57 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:789:55:789:62 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:790:55:790:62 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:791:44:791:51 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:792:44:792:51 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:793:36:793:43 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:794:36:794:43 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:795:26:795:33 | source(...) | provenance | Src:MaD:630 Sink:MaD:512 |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:795:26:795:33 | source(...) | provenance | Src:MaD:630 Sink:MaD:511 |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:796:26:796:33 | source(...) | provenance | Src:MaD:630 Sink:MaD:514 |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:796:26:796:33 | source(...) | provenance | Src:MaD:630 Sink:MaD:513 |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:797:35:797:42 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:798:35:798:42 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:799:55:799:62 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:800:50:800:57 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:801:35:801:42 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:802:65:802:72 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:803:50:803:57 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:804:35:804:42 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:805:80:805:87 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:806:65:806:72 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:807:50:807:57 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:808:35:808:42 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:809:95:809:102 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:810:80:810:87 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:811:65:811:72 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:812:50:812:57 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:813:35:813:42 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:814:110:814:117 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:815:95:815:102 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:816:80:816:87 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:817:65:817:72 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:818:50:818:57 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:819:35:819:42 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:820:125:820:132 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:821:110:821:117 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:822:95:822:102 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:823:80:823:87 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:824:65:824:72 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:825:50:825:57 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:826:35:826:42 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:827:140:827:147 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:828:125:828:132 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:829:110:829:117 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:830:95:830:102 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:831:80:831:87 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:832:65:832:72 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:833:50:833:57 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:834:35:834:42 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:835:155:835:162 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:836:140:836:147 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:837:125:837:132 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:838:110:838:117 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:839:95:839:102 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:840:80:840:87 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:841:65:841:72 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:842:50:842:57 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:843:35:843:42 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:844:170:844:177 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:845:155:845:162 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:846:140:846:147 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:847:125:847:132 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:848:110:848:117 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:849:95:849:102 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:850:80:850:87 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:851:65:851:72 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:852:50:852:57 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:853:35:853:42 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:854:35:854:42 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:855:55:855:62 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:856:35:856:42 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:857:40:857:47 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:858:40:858:47 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:859:40:859:47 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:860:40:860:47 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:861:55:861:62 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:862:55:862:62 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:863:50:863:57 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:864:58:864:65 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:865:58:865:65 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:866:40:866:47 | source(...) | provenance | Src:MaD:630 Sink:MaD:558 |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:866:40:866:47 | source(...) | provenance | Src:MaD:630 Sink:MaD:557 |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:867:49:867:56 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:868:49:868:56 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:869:69:869:76 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:870:64:870:71 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:871:49:871:56 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:872:79:872:86 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:873:64:873:71 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:874:49:874:56 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:875:94:875:101 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:876:79:876:86 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:877:64:877:71 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:878:49:878:56 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:879:109:879:116 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:880:94:880:101 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:881:79:881:86 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:882:64:882:71 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:883:49:883:56 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:884:124:884:131 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:885:109:885:116 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:886:94:886:101 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:887:79:887:86 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:888:64:888:71 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:889:49:889:56 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:890:139:890:146 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:891:124:891:131 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:892:109:892:116 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:893:94:893:101 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:894:79:894:86 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:895:64:895:71 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:896:49:896:56 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:897:154:897:161 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:898:139:898:146 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:899:124:899:131 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:900:109:900:116 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:901:94:901:101 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:902:79:902:86 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:903:64:903:71 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:904:49:904:56 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:905:169:905:176 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:906:154:906:161 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:907:139:907:146 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:908:124:908:131 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:909:109:909:116 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:910:94:910:101 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:911:79:911:86 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:912:64:912:71 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:913:49:913:56 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:914:184:914:191 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:915:169:915:176 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:916:154:916:161 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:917:139:917:146 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:918:124:918:131 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:919:109:919:116 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:920:94:920:101 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:921:79:921:86 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:922:64:922:71 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:923:49:923:56 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:924:49:924:56 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:925:69:925:76 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:926:49:926:56 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:927:54:927:61 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:928:54:928:61 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:929:43:929:50 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:930:43:930:50 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:931:35:931:42 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:932:35:932:42 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:933:25:933:32 | source(...) | provenance | Src:MaD:630 Sink:MaD:596 |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:933:25:933:32 | source(...) | provenance | Src:MaD:630 Sink:MaD:595 |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:934:25:934:32 | source(...) | provenance | Src:MaD:630 Sink:MaD:598 |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:934:25:934:32 | source(...) | provenance | Src:MaD:630 Sink:MaD:597 |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:935:34:935:41 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:936:34:936:41 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:937:54:937:61 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:938:49:938:56 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:939:34:939:41 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:940:64:940:71 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:941:49:941:56 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:942:34:942:41 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:943:79:943:86 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:944:64:944:71 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:945:49:945:56 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:946:34:946:41 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:947:94:947:101 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:948:79:948:86 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:949:64:949:71 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:950:49:950:56 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:951:34:951:41 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:952:109:952:116 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:953:94:953:101 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:954:79:954:86 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:955:64:955:71 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:956:49:956:56 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:957:34:957:41 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:958:124:958:131 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:959:109:959:116 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:960:94:960:101 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:961:79:961:86 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:962:64:962:71 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:963:49:963:56 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:964:34:964:41 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:965:139:965:146 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:966:124:966:131 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:967:109:967:116 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:968:94:968:101 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:969:79:969:86 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:970:64:970:71 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:971:49:971:56 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:972:34:972:41 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:973:154:973:161 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:974:139:974:146 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:975:124:975:131 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:976:109:976:116 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:977:94:977:101 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:978:79:978:86 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:979:64:979:71 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:980:49:980:56 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:981:34:981:41 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:982:169:982:176 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:983:154:983:161 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:984:139:984:146 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:985:124:985:131 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:986:109:986:116 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:987:94:987:101 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:988:79:988:86 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:989:64:989:71 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:990:49:990:56 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:991:34:991:41 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:992:34:992:41 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:993:54:993:61 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:994:34:994:41 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:995:39:995:46 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:996:39:996:46 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:998:65:998:72 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:999:48:999:55 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:1000:59:1000:66 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:1001:42:1001:49 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:1002:53:1002:60 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:1020:40:1020:47 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:1021:35:1021:42 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:1022:25:1022:32 | source(...) | provenance | Src:MaD:630 Sink:MaD:10 |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:1022:25:1022:32 | source(...) | provenance | Src:MaD:630 Sink:MaD:9 |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:1023:34:1023:41 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:1024:34:1024:41 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:1025:54:1025:61 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:1026:40:1026:47 | source(...) | provenance | Src:MaD:630 Sink:MaD:14 |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:1026:40:1026:47 | source(...) | provenance | Src:MaD:630 Sink:MaD:13 |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:1028:49:1028:56 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:1029:34:1029:41 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:1030:64:1030:71 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:1031:49:1031:56 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:1032:34:1032:41 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:1033:79:1033:86 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:1034:64:1034:71 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:1035:49:1035:56 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:1036:34:1036:41 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:1037:94:1037:101 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:1038:79:1038:86 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:1039:64:1039:71 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:1040:49:1040:56 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:1041:34:1041:41 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:1042:109:1042:116 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:1043:94:1043:101 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:1044:79:1044:86 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:1045:64:1045:71 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:1046:49:1046:56 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:1047:34:1047:41 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:1048:124:1048:131 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:1049:109:1049:116 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:1050:94:1050:101 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:1051:79:1051:86 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:1052:64:1052:71 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:1053:49:1053:56 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:1054:34:1054:41 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:1055:139:1055:146 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:1056:124:1056:131 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:1057:109:1057:116 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:1058:94:1058:101 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:1059:79:1059:86 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:1060:64:1060:71 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:1061:49:1061:56 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:1062:34:1062:41 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:1063:154:1063:161 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:1064:139:1064:146 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:1065:124:1065:131 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:1066:109:1066:116 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:1067:94:1067:101 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:1068:79:1068:86 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:1069:64:1069:71 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:1070:49:1070:56 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:1071:34:1071:41 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:1072:169:1072:176 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:1073:154:1073:161 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:1074:139:1074:146 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:1075:124:1075:131 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:1076:109:1076:116 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:1077:94:1077:101 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:1078:79:1078:86 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:1079:64:1079:71 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:1080:49:1080:56 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:1081:34:1081:41 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:1083:34:1083:41 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:1084:54:1084:61 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:1085:39:1085:46 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:1088:47:1088:54 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:1089:53:1089:60 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:1091:37:1091:44 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:1095:80:1095:87 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:1100:44:1100:51 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:1105:43:1105:50 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:1111:42:1111:49 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:1116:61:1116:68 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:1117:81:1117:88 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | Log4jJndiInjectionTest.java:1119:42:1119:49 | source(...) : String | provenance | Src:MaD:630  |
+| Log4jJndiInjectionTest.java:31:41:31:48 | source(...) : String | Log4jJndiInjectionTest.java:31:26:31:48 | (...)... | provenance | Sink:MaD:34 |
+| Log4jJndiInjectionTest.java:31:41:31:48 | source(...) : String | Log4jJndiInjectionTest.java:31:26:31:48 | (...)... | provenance | Sink:MaD:33 |
+| Log4jJndiInjectionTest.java:32:41:32:48 | source(...) : String | Log4jJndiInjectionTest.java:32:26:32:48 | (...)... | provenance | Sink:MaD:36 |
+| Log4jJndiInjectionTest.java:32:41:32:48 | source(...) : String | Log4jJndiInjectionTest.java:32:26:32:48 | (...)... | provenance | Sink:MaD:35 |
+| Log4jJndiInjectionTest.java:33:56:33:63 | source(...) : String | Log4jJndiInjectionTest.java:33:41:33:63 | (...)... | provenance | Sink:MaD:38 |
+| Log4jJndiInjectionTest.java:33:56:33:63 | source(...) : String | Log4jJndiInjectionTest.java:33:41:33:63 | (...)... | provenance | Sink:MaD:37 |
+| Log4jJndiInjectionTest.java:34:56:34:63 | source(...) : String | Log4jJndiInjectionTest.java:34:41:34:63 | (...)... | provenance | Sink:MaD:40 |
+| Log4jJndiInjectionTest.java:34:56:34:63 | source(...) : String | Log4jJndiInjectionTest.java:34:41:34:63 | (...)... | provenance | Sink:MaD:39 |
+| Log4jJndiInjectionTest.java:35:51:35:58 | source(...) : String | Log4jJndiInjectionTest.java:35:41:35:58 | (...)... | provenance | Sink:MaD:42 |
+| Log4jJndiInjectionTest.java:35:51:35:58 | source(...) : String | Log4jJndiInjectionTest.java:35:41:35:58 | (...)... | provenance | Sink:MaD:41 |
+| Log4jJndiInjectionTest.java:36:59:36:66 | source(...) : String | Log4jJndiInjectionTest.java:36:41:36:66 | (...)... | provenance | Sink:MaD:44 |
+| Log4jJndiInjectionTest.java:36:59:36:66 | source(...) : String | Log4jJndiInjectionTest.java:36:41:36:66 | (...)... | provenance | Sink:MaD:43 |
+| Log4jJndiInjectionTest.java:37:59:37:66 | source(...) : String | Log4jJndiInjectionTest.java:37:41:37:66 | (...)... | provenance | Sink:MaD:46 |
+| Log4jJndiInjectionTest.java:37:59:37:66 | source(...) : String | Log4jJndiInjectionTest.java:37:41:37:66 | (...)... | provenance | Sink:MaD:45 |
+| Log4jJndiInjectionTest.java:39:50:39:57 | source(...) : String | Log4jJndiInjectionTest.java:39:41:39:57 | (...)... | provenance | Sink:MaD:50 |
+| Log4jJndiInjectionTest.java:39:50:39:57 | source(...) : String | Log4jJndiInjectionTest.java:39:41:39:57 | (...)... | provenance | Sink:MaD:49 |
+| Log4jJndiInjectionTest.java:40:50:40:57 | source(...) : String | Log4jJndiInjectionTest.java:40:41:40:57 | (...)... | provenance | Sink:MaD:70 |
+| Log4jJndiInjectionTest.java:40:50:40:57 | source(...) : String | Log4jJndiInjectionTest.java:40:41:40:57 | (...)... | provenance | Sink:MaD:69 |
+| Log4jJndiInjectionTest.java:41:56:41:78 | {...} : Object[] [[]] : String | Log4jJndiInjectionTest.java:41:56:41:78 | new Object[] | provenance | Sink:MaD:70 |
+| Log4jJndiInjectionTest.java:41:56:41:78 | {...} : Object[] [[]] : String | Log4jJndiInjectionTest.java:41:56:41:78 | new Object[] | provenance | Sink:MaD:69 |
 | Log4jJndiInjectionTest.java:41:70:41:77 | source(...) : String | Log4jJndiInjectionTest.java:41:56:41:78 | {...} : Object[] [[]] : String | provenance |  |
-| Log4jJndiInjectionTest.java:42:65:42:72 | source(...) : String | Log4jJndiInjectionTest.java:42:56:42:72 | (...)... | provenance |  Sink:MaD:32 |
-| Log4jJndiInjectionTest.java:42:65:42:72 | source(...) : String | Log4jJndiInjectionTest.java:42:56:42:72 | (...)... | provenance |  Sink:MaD:348 |
-| Log4jJndiInjectionTest.java:43:50:43:57 | source(...) : String | Log4jJndiInjectionTest.java:43:41:43:57 | (...)... | provenance |  Sink:MaD:32 |
-| Log4jJndiInjectionTest.java:43:50:43:57 | source(...) : String | Log4jJndiInjectionTest.java:43:41:43:57 | (...)... | provenance |  Sink:MaD:348 |
-| Log4jJndiInjectionTest.java:44:80:44:87 | source(...) : String | Log4jJndiInjectionTest.java:44:71:44:87 | (...)... | provenance |  Sink:MaD:33 |
-| Log4jJndiInjectionTest.java:44:80:44:87 | source(...) : String | Log4jJndiInjectionTest.java:44:71:44:87 | (...)... | provenance |  Sink:MaD:349 |
-| Log4jJndiInjectionTest.java:45:65:45:72 | source(...) : String | Log4jJndiInjectionTest.java:45:56:45:72 | (...)... | provenance |  Sink:MaD:33 |
-| Log4jJndiInjectionTest.java:45:65:45:72 | source(...) : String | Log4jJndiInjectionTest.java:45:56:45:72 | (...)... | provenance |  Sink:MaD:349 |
-| Log4jJndiInjectionTest.java:46:50:46:57 | source(...) : String | Log4jJndiInjectionTest.java:46:41:46:57 | (...)... | provenance |  Sink:MaD:33 |
-| Log4jJndiInjectionTest.java:46:50:46:57 | source(...) : String | Log4jJndiInjectionTest.java:46:41:46:57 | (...)... | provenance |  Sink:MaD:349 |
-| Log4jJndiInjectionTest.java:47:95:47:102 | source(...) : String | Log4jJndiInjectionTest.java:47:86:47:102 | (...)... | provenance |  Sink:MaD:34 |
-| Log4jJndiInjectionTest.java:47:95:47:102 | source(...) : String | Log4jJndiInjectionTest.java:47:86:47:102 | (...)... | provenance |  Sink:MaD:350 |
-| Log4jJndiInjectionTest.java:48:80:48:87 | source(...) : String | Log4jJndiInjectionTest.java:48:71:48:87 | (...)... | provenance |  Sink:MaD:34 |
-| Log4jJndiInjectionTest.java:48:80:48:87 | source(...) : String | Log4jJndiInjectionTest.java:48:71:48:87 | (...)... | provenance |  Sink:MaD:350 |
-| Log4jJndiInjectionTest.java:49:65:49:72 | source(...) : String | Log4jJndiInjectionTest.java:49:56:49:72 | (...)... | provenance |  Sink:MaD:34 |
-| Log4jJndiInjectionTest.java:49:65:49:72 | source(...) : String | Log4jJndiInjectionTest.java:49:56:49:72 | (...)... | provenance |  Sink:MaD:350 |
-| Log4jJndiInjectionTest.java:50:50:50:57 | source(...) : String | Log4jJndiInjectionTest.java:50:41:50:57 | (...)... | provenance |  Sink:MaD:34 |
-| Log4jJndiInjectionTest.java:50:50:50:57 | source(...) : String | Log4jJndiInjectionTest.java:50:41:50:57 | (...)... | provenance |  Sink:MaD:350 |
-| Log4jJndiInjectionTest.java:51:110:51:117 | source(...) : String | Log4jJndiInjectionTest.java:51:101:51:117 | (...)... | provenance |  Sink:MaD:35 |
-| Log4jJndiInjectionTest.java:51:110:51:117 | source(...) : String | Log4jJndiInjectionTest.java:51:101:51:117 | (...)... | provenance |  Sink:MaD:351 |
-| Log4jJndiInjectionTest.java:52:95:52:102 | source(...) : String | Log4jJndiInjectionTest.java:52:86:52:102 | (...)... | provenance |  Sink:MaD:35 |
-| Log4jJndiInjectionTest.java:52:95:52:102 | source(...) : String | Log4jJndiInjectionTest.java:52:86:52:102 | (...)... | provenance |  Sink:MaD:351 |
-| Log4jJndiInjectionTest.java:53:80:53:87 | source(...) : String | Log4jJndiInjectionTest.java:53:71:53:87 | (...)... | provenance |  Sink:MaD:35 |
-| Log4jJndiInjectionTest.java:53:80:53:87 | source(...) : String | Log4jJndiInjectionTest.java:53:71:53:87 | (...)... | provenance |  Sink:MaD:351 |
-| Log4jJndiInjectionTest.java:54:65:54:72 | source(...) : String | Log4jJndiInjectionTest.java:54:56:54:72 | (...)... | provenance |  Sink:MaD:35 |
-| Log4jJndiInjectionTest.java:54:65:54:72 | source(...) : String | Log4jJndiInjectionTest.java:54:56:54:72 | (...)... | provenance |  Sink:MaD:351 |
-| Log4jJndiInjectionTest.java:55:50:55:57 | source(...) : String | Log4jJndiInjectionTest.java:55:41:55:57 | (...)... | provenance |  Sink:MaD:35 |
-| Log4jJndiInjectionTest.java:55:50:55:57 | source(...) : String | Log4jJndiInjectionTest.java:55:41:55:57 | (...)... | provenance |  Sink:MaD:351 |
-| Log4jJndiInjectionTest.java:56:125:56:132 | source(...) : String | Log4jJndiInjectionTest.java:56:116:56:132 | (...)... | provenance |  Sink:MaD:36 |
-| Log4jJndiInjectionTest.java:56:125:56:132 | source(...) : String | Log4jJndiInjectionTest.java:56:116:56:132 | (...)... | provenance |  Sink:MaD:352 |
-| Log4jJndiInjectionTest.java:57:110:57:117 | source(...) : String | Log4jJndiInjectionTest.java:57:101:57:117 | (...)... | provenance |  Sink:MaD:36 |
-| Log4jJndiInjectionTest.java:57:110:57:117 | source(...) : String | Log4jJndiInjectionTest.java:57:101:57:117 | (...)... | provenance |  Sink:MaD:352 |
-| Log4jJndiInjectionTest.java:58:95:58:102 | source(...) : String | Log4jJndiInjectionTest.java:58:86:58:102 | (...)... | provenance |  Sink:MaD:36 |
-| Log4jJndiInjectionTest.java:58:95:58:102 | source(...) : String | Log4jJndiInjectionTest.java:58:86:58:102 | (...)... | provenance |  Sink:MaD:352 |
-| Log4jJndiInjectionTest.java:59:80:59:87 | source(...) : String | Log4jJndiInjectionTest.java:59:71:59:87 | (...)... | provenance |  Sink:MaD:36 |
-| Log4jJndiInjectionTest.java:59:80:59:87 | source(...) : String | Log4jJndiInjectionTest.java:59:71:59:87 | (...)... | provenance |  Sink:MaD:352 |
-| Log4jJndiInjectionTest.java:60:65:60:72 | source(...) : String | Log4jJndiInjectionTest.java:60:56:60:72 | (...)... | provenance |  Sink:MaD:36 |
-| Log4jJndiInjectionTest.java:60:65:60:72 | source(...) : String | Log4jJndiInjectionTest.java:60:56:60:72 | (...)... | provenance |  Sink:MaD:352 |
-| Log4jJndiInjectionTest.java:61:50:61:57 | source(...) : String | Log4jJndiInjectionTest.java:61:41:61:57 | (...)... | provenance |  Sink:MaD:36 |
-| Log4jJndiInjectionTest.java:61:50:61:57 | source(...) : String | Log4jJndiInjectionTest.java:61:41:61:57 | (...)... | provenance |  Sink:MaD:352 |
-| Log4jJndiInjectionTest.java:62:140:62:147 | source(...) : String | Log4jJndiInjectionTest.java:62:131:62:147 | (...)... | provenance |  Sink:MaD:37 |
-| Log4jJndiInjectionTest.java:62:140:62:147 | source(...) : String | Log4jJndiInjectionTest.java:62:131:62:147 | (...)... | provenance |  Sink:MaD:353 |
-| Log4jJndiInjectionTest.java:63:125:63:132 | source(...) : String | Log4jJndiInjectionTest.java:63:116:63:132 | (...)... | provenance |  Sink:MaD:37 |
-| Log4jJndiInjectionTest.java:63:125:63:132 | source(...) : String | Log4jJndiInjectionTest.java:63:116:63:132 | (...)... | provenance |  Sink:MaD:353 |
-| Log4jJndiInjectionTest.java:64:110:64:117 | source(...) : String | Log4jJndiInjectionTest.java:64:101:64:117 | (...)... | provenance |  Sink:MaD:37 |
-| Log4jJndiInjectionTest.java:64:110:64:117 | source(...) : String | Log4jJndiInjectionTest.java:64:101:64:117 | (...)... | provenance |  Sink:MaD:353 |
-| Log4jJndiInjectionTest.java:65:95:65:102 | source(...) : String | Log4jJndiInjectionTest.java:65:86:65:102 | (...)... | provenance |  Sink:MaD:37 |
-| Log4jJndiInjectionTest.java:65:95:65:102 | source(...) : String | Log4jJndiInjectionTest.java:65:86:65:102 | (...)... | provenance |  Sink:MaD:353 |
-| Log4jJndiInjectionTest.java:66:80:66:87 | source(...) : String | Log4jJndiInjectionTest.java:66:71:66:87 | (...)... | provenance |  Sink:MaD:37 |
-| Log4jJndiInjectionTest.java:66:80:66:87 | source(...) : String | Log4jJndiInjectionTest.java:66:71:66:87 | (...)... | provenance |  Sink:MaD:353 |
-| Log4jJndiInjectionTest.java:67:65:67:72 | source(...) : String | Log4jJndiInjectionTest.java:67:56:67:72 | (...)... | provenance |  Sink:MaD:37 |
-| Log4jJndiInjectionTest.java:67:65:67:72 | source(...) : String | Log4jJndiInjectionTest.java:67:56:67:72 | (...)... | provenance |  Sink:MaD:353 |
-| Log4jJndiInjectionTest.java:68:50:68:57 | source(...) : String | Log4jJndiInjectionTest.java:68:41:68:57 | (...)... | provenance |  Sink:MaD:37 |
-| Log4jJndiInjectionTest.java:68:50:68:57 | source(...) : String | Log4jJndiInjectionTest.java:68:41:68:57 | (...)... | provenance |  Sink:MaD:353 |
-| Log4jJndiInjectionTest.java:69:155:69:162 | source(...) : String | Log4jJndiInjectionTest.java:69:146:69:162 | (...)... | provenance |  Sink:MaD:38 |
-| Log4jJndiInjectionTest.java:69:155:69:162 | source(...) : String | Log4jJndiInjectionTest.java:69:146:69:162 | (...)... | provenance |  Sink:MaD:354 |
-| Log4jJndiInjectionTest.java:70:140:70:147 | source(...) : String | Log4jJndiInjectionTest.java:70:131:70:147 | (...)... | provenance |  Sink:MaD:38 |
-| Log4jJndiInjectionTest.java:70:140:70:147 | source(...) : String | Log4jJndiInjectionTest.java:70:131:70:147 | (...)... | provenance |  Sink:MaD:354 |
-| Log4jJndiInjectionTest.java:71:125:71:132 | source(...) : String | Log4jJndiInjectionTest.java:71:116:71:132 | (...)... | provenance |  Sink:MaD:38 |
-| Log4jJndiInjectionTest.java:71:125:71:132 | source(...) : String | Log4jJndiInjectionTest.java:71:116:71:132 | (...)... | provenance |  Sink:MaD:354 |
-| Log4jJndiInjectionTest.java:72:110:72:117 | source(...) : String | Log4jJndiInjectionTest.java:72:101:72:117 | (...)... | provenance |  Sink:MaD:38 |
-| Log4jJndiInjectionTest.java:72:110:72:117 | source(...) : String | Log4jJndiInjectionTest.java:72:101:72:117 | (...)... | provenance |  Sink:MaD:354 |
-| Log4jJndiInjectionTest.java:73:95:73:102 | source(...) : String | Log4jJndiInjectionTest.java:73:86:73:102 | (...)... | provenance |  Sink:MaD:38 |
-| Log4jJndiInjectionTest.java:73:95:73:102 | source(...) : String | Log4jJndiInjectionTest.java:73:86:73:102 | (...)... | provenance |  Sink:MaD:354 |
-| Log4jJndiInjectionTest.java:74:80:74:87 | source(...) : String | Log4jJndiInjectionTest.java:74:71:74:87 | (...)... | provenance |  Sink:MaD:38 |
-| Log4jJndiInjectionTest.java:74:80:74:87 | source(...) : String | Log4jJndiInjectionTest.java:74:71:74:87 | (...)... | provenance |  Sink:MaD:354 |
-| Log4jJndiInjectionTest.java:75:65:75:72 | source(...) : String | Log4jJndiInjectionTest.java:75:56:75:72 | (...)... | provenance |  Sink:MaD:38 |
-| Log4jJndiInjectionTest.java:75:65:75:72 | source(...) : String | Log4jJndiInjectionTest.java:75:56:75:72 | (...)... | provenance |  Sink:MaD:354 |
-| Log4jJndiInjectionTest.java:76:50:76:57 | source(...) : String | Log4jJndiInjectionTest.java:76:41:76:57 | (...)... | provenance |  Sink:MaD:38 |
-| Log4jJndiInjectionTest.java:76:50:76:57 | source(...) : String | Log4jJndiInjectionTest.java:76:41:76:57 | (...)... | provenance |  Sink:MaD:354 |
-| Log4jJndiInjectionTest.java:77:170:77:177 | source(...) : String | Log4jJndiInjectionTest.java:77:161:77:177 | (...)... | provenance |  Sink:MaD:39 |
-| Log4jJndiInjectionTest.java:77:170:77:177 | source(...) : String | Log4jJndiInjectionTest.java:77:161:77:177 | (...)... | provenance |  Sink:MaD:355 |
-| Log4jJndiInjectionTest.java:78:155:78:162 | source(...) : String | Log4jJndiInjectionTest.java:78:146:78:162 | (...)... | provenance |  Sink:MaD:39 |
-| Log4jJndiInjectionTest.java:78:155:78:162 | source(...) : String | Log4jJndiInjectionTest.java:78:146:78:162 | (...)... | provenance |  Sink:MaD:355 |
-| Log4jJndiInjectionTest.java:79:140:79:147 | source(...) : String | Log4jJndiInjectionTest.java:79:131:79:147 | (...)... | provenance |  Sink:MaD:39 |
-| Log4jJndiInjectionTest.java:79:140:79:147 | source(...) : String | Log4jJndiInjectionTest.java:79:131:79:147 | (...)... | provenance |  Sink:MaD:355 |
-| Log4jJndiInjectionTest.java:80:125:80:132 | source(...) : String | Log4jJndiInjectionTest.java:80:116:80:132 | (...)... | provenance |  Sink:MaD:39 |
-| Log4jJndiInjectionTest.java:80:125:80:132 | source(...) : String | Log4jJndiInjectionTest.java:80:116:80:132 | (...)... | provenance |  Sink:MaD:355 |
-| Log4jJndiInjectionTest.java:81:110:81:117 | source(...) : String | Log4jJndiInjectionTest.java:81:101:81:117 | (...)... | provenance |  Sink:MaD:39 |
-| Log4jJndiInjectionTest.java:81:110:81:117 | source(...) : String | Log4jJndiInjectionTest.java:81:101:81:117 | (...)... | provenance |  Sink:MaD:355 |
-| Log4jJndiInjectionTest.java:82:95:82:102 | source(...) : String | Log4jJndiInjectionTest.java:82:86:82:102 | (...)... | provenance |  Sink:MaD:39 |
-| Log4jJndiInjectionTest.java:82:95:82:102 | source(...) : String | Log4jJndiInjectionTest.java:82:86:82:102 | (...)... | provenance |  Sink:MaD:355 |
-| Log4jJndiInjectionTest.java:83:80:83:87 | source(...) : String | Log4jJndiInjectionTest.java:83:71:83:87 | (...)... | provenance |  Sink:MaD:39 |
-| Log4jJndiInjectionTest.java:83:80:83:87 | source(...) : String | Log4jJndiInjectionTest.java:83:71:83:87 | (...)... | provenance |  Sink:MaD:355 |
-| Log4jJndiInjectionTest.java:84:65:84:72 | source(...) : String | Log4jJndiInjectionTest.java:84:56:84:72 | (...)... | provenance |  Sink:MaD:39 |
-| Log4jJndiInjectionTest.java:84:65:84:72 | source(...) : String | Log4jJndiInjectionTest.java:84:56:84:72 | (...)... | provenance |  Sink:MaD:355 |
-| Log4jJndiInjectionTest.java:85:50:85:57 | source(...) : String | Log4jJndiInjectionTest.java:85:41:85:57 | (...)... | provenance |  Sink:MaD:39 |
-| Log4jJndiInjectionTest.java:85:50:85:57 | source(...) : String | Log4jJndiInjectionTest.java:85:41:85:57 | (...)... | provenance |  Sink:MaD:355 |
-| Log4jJndiInjectionTest.java:86:185:86:192 | source(...) : String | Log4jJndiInjectionTest.java:86:176:86:192 | (...)... | provenance |  Sink:MaD:40 |
-| Log4jJndiInjectionTest.java:86:185:86:192 | source(...) : String | Log4jJndiInjectionTest.java:86:176:86:192 | (...)... | provenance |  Sink:MaD:356 |
-| Log4jJndiInjectionTest.java:87:170:87:177 | source(...) : String | Log4jJndiInjectionTest.java:87:161:87:177 | (...)... | provenance |  Sink:MaD:40 |
-| Log4jJndiInjectionTest.java:87:170:87:177 | source(...) : String | Log4jJndiInjectionTest.java:87:161:87:177 | (...)... | provenance |  Sink:MaD:356 |
-| Log4jJndiInjectionTest.java:88:155:88:162 | source(...) : String | Log4jJndiInjectionTest.java:88:146:88:162 | (...)... | provenance |  Sink:MaD:40 |
-| Log4jJndiInjectionTest.java:88:155:88:162 | source(...) : String | Log4jJndiInjectionTest.java:88:146:88:162 | (...)... | provenance |  Sink:MaD:356 |
-| Log4jJndiInjectionTest.java:89:140:89:147 | source(...) : String | Log4jJndiInjectionTest.java:89:131:89:147 | (...)... | provenance |  Sink:MaD:40 |
-| Log4jJndiInjectionTest.java:89:140:89:147 | source(...) : String | Log4jJndiInjectionTest.java:89:131:89:147 | (...)... | provenance |  Sink:MaD:356 |
-| Log4jJndiInjectionTest.java:90:125:90:132 | source(...) : String | Log4jJndiInjectionTest.java:90:116:90:132 | (...)... | provenance |  Sink:MaD:40 |
-| Log4jJndiInjectionTest.java:90:125:90:132 | source(...) : String | Log4jJndiInjectionTest.java:90:116:90:132 | (...)... | provenance |  Sink:MaD:356 |
-| Log4jJndiInjectionTest.java:91:110:91:117 | source(...) : String | Log4jJndiInjectionTest.java:91:101:91:117 | (...)... | provenance |  Sink:MaD:40 |
-| Log4jJndiInjectionTest.java:91:110:91:117 | source(...) : String | Log4jJndiInjectionTest.java:91:101:91:117 | (...)... | provenance |  Sink:MaD:356 |
-| Log4jJndiInjectionTest.java:92:95:92:102 | source(...) : String | Log4jJndiInjectionTest.java:92:86:92:102 | (...)... | provenance |  Sink:MaD:40 |
-| Log4jJndiInjectionTest.java:92:95:92:102 | source(...) : String | Log4jJndiInjectionTest.java:92:86:92:102 | (...)... | provenance |  Sink:MaD:356 |
-| Log4jJndiInjectionTest.java:93:80:93:87 | source(...) : String | Log4jJndiInjectionTest.java:93:71:93:87 | (...)... | provenance |  Sink:MaD:40 |
-| Log4jJndiInjectionTest.java:93:80:93:87 | source(...) : String | Log4jJndiInjectionTest.java:93:71:93:87 | (...)... | provenance |  Sink:MaD:356 |
-| Log4jJndiInjectionTest.java:94:65:94:72 | source(...) : String | Log4jJndiInjectionTest.java:94:56:94:72 | (...)... | provenance |  Sink:MaD:40 |
-| Log4jJndiInjectionTest.java:94:65:94:72 | source(...) : String | Log4jJndiInjectionTest.java:94:56:94:72 | (...)... | provenance |  Sink:MaD:356 |
-| Log4jJndiInjectionTest.java:95:50:95:57 | source(...) : String | Log4jJndiInjectionTest.java:95:41:95:57 | (...)... | provenance |  Sink:MaD:40 |
-| Log4jJndiInjectionTest.java:95:50:95:57 | source(...) : String | Log4jJndiInjectionTest.java:95:41:95:57 | (...)... | provenance |  Sink:MaD:356 |
-| Log4jJndiInjectionTest.java:96:50:96:57 | source(...) : String | Log4jJndiInjectionTest.java:96:41:96:57 | (...)... | provenance |  Sink:MaD:32 |
-| Log4jJndiInjectionTest.java:96:50:96:57 | source(...) : String | Log4jJndiInjectionTest.java:96:41:96:57 | (...)... | provenance |  Sink:MaD:348 |
-| Log4jJndiInjectionTest.java:97:70:97:77 | source(...) : String | Log4jJndiInjectionTest.java:97:56:97:77 | (...)... | provenance |  Sink:MaD:32 |
-| Log4jJndiInjectionTest.java:97:70:97:77 | source(...) : String | Log4jJndiInjectionTest.java:97:56:97:77 | (...)... | provenance |  Sink:MaD:348 |
-| Log4jJndiInjectionTest.java:98:50:98:57 | source(...) : String | Log4jJndiInjectionTest.java:98:41:98:57 | (...)... | provenance |  Sink:MaD:42 |
-| Log4jJndiInjectionTest.java:98:50:98:57 | source(...) : String | Log4jJndiInjectionTest.java:98:41:98:57 | (...)... | provenance |  Sink:MaD:358 |
-| Log4jJndiInjectionTest.java:99:55:99:62 | source(...) : String | Log4jJndiInjectionTest.java:99:41:99:62 | (...)... | provenance |  Sink:MaD:43 |
-| Log4jJndiInjectionTest.java:99:55:99:62 | source(...) : String | Log4jJndiInjectionTest.java:99:41:99:62 | (...)... | provenance |  Sink:MaD:359 |
-| Log4jJndiInjectionTest.java:100:55:100:62 | source(...) : String | Log4jJndiInjectionTest.java:100:41:100:62 | (...)... | provenance |  Sink:MaD:44 |
-| Log4jJndiInjectionTest.java:100:55:100:62 | source(...) : String | Log4jJndiInjectionTest.java:100:41:100:62 | (...)... | provenance |  Sink:MaD:360 |
-| Log4jJndiInjectionTest.java:101:44:101:51 | source(...) : String | Log4jJndiInjectionTest.java:101:26:101:51 | (...)... | provenance |  Sink:MaD:47 |
-| Log4jJndiInjectionTest.java:101:44:101:51 | source(...) : String | Log4jJndiInjectionTest.java:101:26:101:51 | (...)... | provenance |  Sink:MaD:363 |
-| Log4jJndiInjectionTest.java:102:44:102:51 | source(...) : String | Log4jJndiInjectionTest.java:102:26:102:51 | (...)... | provenance |  Sink:MaD:48 |
-| Log4jJndiInjectionTest.java:102:44:102:51 | source(...) : String | Log4jJndiInjectionTest.java:102:26:102:51 | (...)... | provenance |  Sink:MaD:364 |
-| Log4jJndiInjectionTest.java:103:36:103:43 | source(...) : String | Log4jJndiInjectionTest.java:103:26:103:43 | (...)... | provenance |  Sink:MaD:45 |
-| Log4jJndiInjectionTest.java:103:36:103:43 | source(...) : String | Log4jJndiInjectionTest.java:103:26:103:43 | (...)... | provenance |  Sink:MaD:361 |
-| Log4jJndiInjectionTest.java:104:36:104:43 | source(...) : String | Log4jJndiInjectionTest.java:104:26:104:43 | (...)... | provenance |  Sink:MaD:46 |
-| Log4jJndiInjectionTest.java:104:36:104:43 | source(...) : String | Log4jJndiInjectionTest.java:104:26:104:43 | (...)... | provenance |  Sink:MaD:362 |
-| Log4jJndiInjectionTest.java:107:35:107:42 | source(...) : String | Log4jJndiInjectionTest.java:107:26:107:42 | (...)... | provenance |  Sink:MaD:51 |
-| Log4jJndiInjectionTest.java:107:35:107:42 | source(...) : String | Log4jJndiInjectionTest.java:107:26:107:42 | (...)... | provenance |  Sink:MaD:367 |
-| Log4jJndiInjectionTest.java:108:35:108:42 | source(...) : String | Log4jJndiInjectionTest.java:108:26:108:42 | (...)... | provenance |  Sink:MaD:61 |
-| Log4jJndiInjectionTest.java:108:35:108:42 | source(...) : String | Log4jJndiInjectionTest.java:108:26:108:42 | (...)... | provenance |  Sink:MaD:377 |
-| Log4jJndiInjectionTest.java:109:41:109:63 | {...} : Object[] [[]] : String | Log4jJndiInjectionTest.java:109:41:109:63 | new Object[] | provenance |  Sink:MaD:61 |
-| Log4jJndiInjectionTest.java:109:41:109:63 | {...} : Object[] [[]] : String | Log4jJndiInjectionTest.java:109:41:109:63 | new Object[] | provenance |  Sink:MaD:377 |
+| Log4jJndiInjectionTest.java:42:65:42:72 | source(...) : String | Log4jJndiInjectionTest.java:42:56:42:72 | (...)... | provenance | Sink:MaD:52 |
+| Log4jJndiInjectionTest.java:42:65:42:72 | source(...) : String | Log4jJndiInjectionTest.java:42:56:42:72 | (...)... | provenance | Sink:MaD:51 |
+| Log4jJndiInjectionTest.java:43:50:43:57 | source(...) : String | Log4jJndiInjectionTest.java:43:41:43:57 | (...)... | provenance | Sink:MaD:52 |
+| Log4jJndiInjectionTest.java:43:50:43:57 | source(...) : String | Log4jJndiInjectionTest.java:43:41:43:57 | (...)... | provenance | Sink:MaD:51 |
+| Log4jJndiInjectionTest.java:44:80:44:87 | source(...) : String | Log4jJndiInjectionTest.java:44:71:44:87 | (...)... | provenance | Sink:MaD:54 |
+| Log4jJndiInjectionTest.java:44:80:44:87 | source(...) : String | Log4jJndiInjectionTest.java:44:71:44:87 | (...)... | provenance | Sink:MaD:53 |
+| Log4jJndiInjectionTest.java:45:65:45:72 | source(...) : String | Log4jJndiInjectionTest.java:45:56:45:72 | (...)... | provenance | Sink:MaD:54 |
+| Log4jJndiInjectionTest.java:45:65:45:72 | source(...) : String | Log4jJndiInjectionTest.java:45:56:45:72 | (...)... | provenance | Sink:MaD:53 |
+| Log4jJndiInjectionTest.java:46:50:46:57 | source(...) : String | Log4jJndiInjectionTest.java:46:41:46:57 | (...)... | provenance | Sink:MaD:54 |
+| Log4jJndiInjectionTest.java:46:50:46:57 | source(...) : String | Log4jJndiInjectionTest.java:46:41:46:57 | (...)... | provenance | Sink:MaD:53 |
+| Log4jJndiInjectionTest.java:47:95:47:102 | source(...) : String | Log4jJndiInjectionTest.java:47:86:47:102 | (...)... | provenance | Sink:MaD:56 |
+| Log4jJndiInjectionTest.java:47:95:47:102 | source(...) : String | Log4jJndiInjectionTest.java:47:86:47:102 | (...)... | provenance | Sink:MaD:55 |
+| Log4jJndiInjectionTest.java:48:80:48:87 | source(...) : String | Log4jJndiInjectionTest.java:48:71:48:87 | (...)... | provenance | Sink:MaD:56 |
+| Log4jJndiInjectionTest.java:48:80:48:87 | source(...) : String | Log4jJndiInjectionTest.java:48:71:48:87 | (...)... | provenance | Sink:MaD:55 |
+| Log4jJndiInjectionTest.java:49:65:49:72 | source(...) : String | Log4jJndiInjectionTest.java:49:56:49:72 | (...)... | provenance | Sink:MaD:56 |
+| Log4jJndiInjectionTest.java:49:65:49:72 | source(...) : String | Log4jJndiInjectionTest.java:49:56:49:72 | (...)... | provenance | Sink:MaD:55 |
+| Log4jJndiInjectionTest.java:50:50:50:57 | source(...) : String | Log4jJndiInjectionTest.java:50:41:50:57 | (...)... | provenance | Sink:MaD:56 |
+| Log4jJndiInjectionTest.java:50:50:50:57 | source(...) : String | Log4jJndiInjectionTest.java:50:41:50:57 | (...)... | provenance | Sink:MaD:55 |
+| Log4jJndiInjectionTest.java:51:110:51:117 | source(...) : String | Log4jJndiInjectionTest.java:51:101:51:117 | (...)... | provenance | Sink:MaD:58 |
+| Log4jJndiInjectionTest.java:51:110:51:117 | source(...) : String | Log4jJndiInjectionTest.java:51:101:51:117 | (...)... | provenance | Sink:MaD:57 |
+| Log4jJndiInjectionTest.java:52:95:52:102 | source(...) : String | Log4jJndiInjectionTest.java:52:86:52:102 | (...)... | provenance | Sink:MaD:58 |
+| Log4jJndiInjectionTest.java:52:95:52:102 | source(...) : String | Log4jJndiInjectionTest.java:52:86:52:102 | (...)... | provenance | Sink:MaD:57 |
+| Log4jJndiInjectionTest.java:53:80:53:87 | source(...) : String | Log4jJndiInjectionTest.java:53:71:53:87 | (...)... | provenance | Sink:MaD:58 |
+| Log4jJndiInjectionTest.java:53:80:53:87 | source(...) : String | Log4jJndiInjectionTest.java:53:71:53:87 | (...)... | provenance | Sink:MaD:57 |
+| Log4jJndiInjectionTest.java:54:65:54:72 | source(...) : String | Log4jJndiInjectionTest.java:54:56:54:72 | (...)... | provenance | Sink:MaD:58 |
+| Log4jJndiInjectionTest.java:54:65:54:72 | source(...) : String | Log4jJndiInjectionTest.java:54:56:54:72 | (...)... | provenance | Sink:MaD:57 |
+| Log4jJndiInjectionTest.java:55:50:55:57 | source(...) : String | Log4jJndiInjectionTest.java:55:41:55:57 | (...)... | provenance | Sink:MaD:58 |
+| Log4jJndiInjectionTest.java:55:50:55:57 | source(...) : String | Log4jJndiInjectionTest.java:55:41:55:57 | (...)... | provenance | Sink:MaD:57 |
+| Log4jJndiInjectionTest.java:56:125:56:132 | source(...) : String | Log4jJndiInjectionTest.java:56:116:56:132 | (...)... | provenance | Sink:MaD:60 |
+| Log4jJndiInjectionTest.java:56:125:56:132 | source(...) : String | Log4jJndiInjectionTest.java:56:116:56:132 | (...)... | provenance | Sink:MaD:59 |
+| Log4jJndiInjectionTest.java:57:110:57:117 | source(...) : String | Log4jJndiInjectionTest.java:57:101:57:117 | (...)... | provenance | Sink:MaD:60 |
+| Log4jJndiInjectionTest.java:57:110:57:117 | source(...) : String | Log4jJndiInjectionTest.java:57:101:57:117 | (...)... | provenance | Sink:MaD:59 |
+| Log4jJndiInjectionTest.java:58:95:58:102 | source(...) : String | Log4jJndiInjectionTest.java:58:86:58:102 | (...)... | provenance | Sink:MaD:60 |
+| Log4jJndiInjectionTest.java:58:95:58:102 | source(...) : String | Log4jJndiInjectionTest.java:58:86:58:102 | (...)... | provenance | Sink:MaD:59 |
+| Log4jJndiInjectionTest.java:59:80:59:87 | source(...) : String | Log4jJndiInjectionTest.java:59:71:59:87 | (...)... | provenance | Sink:MaD:60 |
+| Log4jJndiInjectionTest.java:59:80:59:87 | source(...) : String | Log4jJndiInjectionTest.java:59:71:59:87 | (...)... | provenance | Sink:MaD:59 |
+| Log4jJndiInjectionTest.java:60:65:60:72 | source(...) : String | Log4jJndiInjectionTest.java:60:56:60:72 | (...)... | provenance | Sink:MaD:60 |
+| Log4jJndiInjectionTest.java:60:65:60:72 | source(...) : String | Log4jJndiInjectionTest.java:60:56:60:72 | (...)... | provenance | Sink:MaD:59 |
+| Log4jJndiInjectionTest.java:61:50:61:57 | source(...) : String | Log4jJndiInjectionTest.java:61:41:61:57 | (...)... | provenance | Sink:MaD:60 |
+| Log4jJndiInjectionTest.java:61:50:61:57 | source(...) : String | Log4jJndiInjectionTest.java:61:41:61:57 | (...)... | provenance | Sink:MaD:59 |
+| Log4jJndiInjectionTest.java:62:140:62:147 | source(...) : String | Log4jJndiInjectionTest.java:62:131:62:147 | (...)... | provenance | Sink:MaD:62 |
+| Log4jJndiInjectionTest.java:62:140:62:147 | source(...) : String | Log4jJndiInjectionTest.java:62:131:62:147 | (...)... | provenance | Sink:MaD:61 |
+| Log4jJndiInjectionTest.java:63:125:63:132 | source(...) : String | Log4jJndiInjectionTest.java:63:116:63:132 | (...)... | provenance | Sink:MaD:62 |
+| Log4jJndiInjectionTest.java:63:125:63:132 | source(...) : String | Log4jJndiInjectionTest.java:63:116:63:132 | (...)... | provenance | Sink:MaD:61 |
+| Log4jJndiInjectionTest.java:64:110:64:117 | source(...) : String | Log4jJndiInjectionTest.java:64:101:64:117 | (...)... | provenance | Sink:MaD:62 |
+| Log4jJndiInjectionTest.java:64:110:64:117 | source(...) : String | Log4jJndiInjectionTest.java:64:101:64:117 | (...)... | provenance | Sink:MaD:61 |
+| Log4jJndiInjectionTest.java:65:95:65:102 | source(...) : String | Log4jJndiInjectionTest.java:65:86:65:102 | (...)... | provenance | Sink:MaD:62 |
+| Log4jJndiInjectionTest.java:65:95:65:102 | source(...) : String | Log4jJndiInjectionTest.java:65:86:65:102 | (...)... | provenance | Sink:MaD:61 |
+| Log4jJndiInjectionTest.java:66:80:66:87 | source(...) : String | Log4jJndiInjectionTest.java:66:71:66:87 | (...)... | provenance | Sink:MaD:62 |
+| Log4jJndiInjectionTest.java:66:80:66:87 | source(...) : String | Log4jJndiInjectionTest.java:66:71:66:87 | (...)... | provenance | Sink:MaD:61 |
+| Log4jJndiInjectionTest.java:67:65:67:72 | source(...) : String | Log4jJndiInjectionTest.java:67:56:67:72 | (...)... | provenance | Sink:MaD:62 |
+| Log4jJndiInjectionTest.java:67:65:67:72 | source(...) : String | Log4jJndiInjectionTest.java:67:56:67:72 | (...)... | provenance | Sink:MaD:61 |
+| Log4jJndiInjectionTest.java:68:50:68:57 | source(...) : String | Log4jJndiInjectionTest.java:68:41:68:57 | (...)... | provenance | Sink:MaD:62 |
+| Log4jJndiInjectionTest.java:68:50:68:57 | source(...) : String | Log4jJndiInjectionTest.java:68:41:68:57 | (...)... | provenance | Sink:MaD:61 |
+| Log4jJndiInjectionTest.java:69:155:69:162 | source(...) : String | Log4jJndiInjectionTest.java:69:146:69:162 | (...)... | provenance | Sink:MaD:64 |
+| Log4jJndiInjectionTest.java:69:155:69:162 | source(...) : String | Log4jJndiInjectionTest.java:69:146:69:162 | (...)... | provenance | Sink:MaD:63 |
+| Log4jJndiInjectionTest.java:70:140:70:147 | source(...) : String | Log4jJndiInjectionTest.java:70:131:70:147 | (...)... | provenance | Sink:MaD:64 |
+| Log4jJndiInjectionTest.java:70:140:70:147 | source(...) : String | Log4jJndiInjectionTest.java:70:131:70:147 | (...)... | provenance | Sink:MaD:63 |
+| Log4jJndiInjectionTest.java:71:125:71:132 | source(...) : String | Log4jJndiInjectionTest.java:71:116:71:132 | (...)... | provenance | Sink:MaD:64 |
+| Log4jJndiInjectionTest.java:71:125:71:132 | source(...) : String | Log4jJndiInjectionTest.java:71:116:71:132 | (...)... | provenance | Sink:MaD:63 |
+| Log4jJndiInjectionTest.java:72:110:72:117 | source(...) : String | Log4jJndiInjectionTest.java:72:101:72:117 | (...)... | provenance | Sink:MaD:64 |
+| Log4jJndiInjectionTest.java:72:110:72:117 | source(...) : String | Log4jJndiInjectionTest.java:72:101:72:117 | (...)... | provenance | Sink:MaD:63 |
+| Log4jJndiInjectionTest.java:73:95:73:102 | source(...) : String | Log4jJndiInjectionTest.java:73:86:73:102 | (...)... | provenance | Sink:MaD:64 |
+| Log4jJndiInjectionTest.java:73:95:73:102 | source(...) : String | Log4jJndiInjectionTest.java:73:86:73:102 | (...)... | provenance | Sink:MaD:63 |
+| Log4jJndiInjectionTest.java:74:80:74:87 | source(...) : String | Log4jJndiInjectionTest.java:74:71:74:87 | (...)... | provenance | Sink:MaD:64 |
+| Log4jJndiInjectionTest.java:74:80:74:87 | source(...) : String | Log4jJndiInjectionTest.java:74:71:74:87 | (...)... | provenance | Sink:MaD:63 |
+| Log4jJndiInjectionTest.java:75:65:75:72 | source(...) : String | Log4jJndiInjectionTest.java:75:56:75:72 | (...)... | provenance | Sink:MaD:64 |
+| Log4jJndiInjectionTest.java:75:65:75:72 | source(...) : String | Log4jJndiInjectionTest.java:75:56:75:72 | (...)... | provenance | Sink:MaD:63 |
+| Log4jJndiInjectionTest.java:76:50:76:57 | source(...) : String | Log4jJndiInjectionTest.java:76:41:76:57 | (...)... | provenance | Sink:MaD:64 |
+| Log4jJndiInjectionTest.java:76:50:76:57 | source(...) : String | Log4jJndiInjectionTest.java:76:41:76:57 | (...)... | provenance | Sink:MaD:63 |
+| Log4jJndiInjectionTest.java:77:170:77:177 | source(...) : String | Log4jJndiInjectionTest.java:77:161:77:177 | (...)... | provenance | Sink:MaD:66 |
+| Log4jJndiInjectionTest.java:77:170:77:177 | source(...) : String | Log4jJndiInjectionTest.java:77:161:77:177 | (...)... | provenance | Sink:MaD:65 |
+| Log4jJndiInjectionTest.java:78:155:78:162 | source(...) : String | Log4jJndiInjectionTest.java:78:146:78:162 | (...)... | provenance | Sink:MaD:66 |
+| Log4jJndiInjectionTest.java:78:155:78:162 | source(...) : String | Log4jJndiInjectionTest.java:78:146:78:162 | (...)... | provenance | Sink:MaD:65 |
+| Log4jJndiInjectionTest.java:79:140:79:147 | source(...) : String | Log4jJndiInjectionTest.java:79:131:79:147 | (...)... | provenance | Sink:MaD:66 |
+| Log4jJndiInjectionTest.java:79:140:79:147 | source(...) : String | Log4jJndiInjectionTest.java:79:131:79:147 | (...)... | provenance | Sink:MaD:65 |
+| Log4jJndiInjectionTest.java:80:125:80:132 | source(...) : String | Log4jJndiInjectionTest.java:80:116:80:132 | (...)... | provenance | Sink:MaD:66 |
+| Log4jJndiInjectionTest.java:80:125:80:132 | source(...) : String | Log4jJndiInjectionTest.java:80:116:80:132 | (...)... | provenance | Sink:MaD:65 |
+| Log4jJndiInjectionTest.java:81:110:81:117 | source(...) : String | Log4jJndiInjectionTest.java:81:101:81:117 | (...)... | provenance | Sink:MaD:66 |
+| Log4jJndiInjectionTest.java:81:110:81:117 | source(...) : String | Log4jJndiInjectionTest.java:81:101:81:117 | (...)... | provenance | Sink:MaD:65 |
+| Log4jJndiInjectionTest.java:82:95:82:102 | source(...) : String | Log4jJndiInjectionTest.java:82:86:82:102 | (...)... | provenance | Sink:MaD:66 |
+| Log4jJndiInjectionTest.java:82:95:82:102 | source(...) : String | Log4jJndiInjectionTest.java:82:86:82:102 | (...)... | provenance | Sink:MaD:65 |
+| Log4jJndiInjectionTest.java:83:80:83:87 | source(...) : String | Log4jJndiInjectionTest.java:83:71:83:87 | (...)... | provenance | Sink:MaD:66 |
+| Log4jJndiInjectionTest.java:83:80:83:87 | source(...) : String | Log4jJndiInjectionTest.java:83:71:83:87 | (...)... | provenance | Sink:MaD:65 |
+| Log4jJndiInjectionTest.java:84:65:84:72 | source(...) : String | Log4jJndiInjectionTest.java:84:56:84:72 | (...)... | provenance | Sink:MaD:66 |
+| Log4jJndiInjectionTest.java:84:65:84:72 | source(...) : String | Log4jJndiInjectionTest.java:84:56:84:72 | (...)... | provenance | Sink:MaD:65 |
+| Log4jJndiInjectionTest.java:85:50:85:57 | source(...) : String | Log4jJndiInjectionTest.java:85:41:85:57 | (...)... | provenance | Sink:MaD:66 |
+| Log4jJndiInjectionTest.java:85:50:85:57 | source(...) : String | Log4jJndiInjectionTest.java:85:41:85:57 | (...)... | provenance | Sink:MaD:65 |
+| Log4jJndiInjectionTest.java:86:185:86:192 | source(...) : String | Log4jJndiInjectionTest.java:86:176:86:192 | (...)... | provenance | Sink:MaD:68 |
+| Log4jJndiInjectionTest.java:86:185:86:192 | source(...) : String | Log4jJndiInjectionTest.java:86:176:86:192 | (...)... | provenance | Sink:MaD:67 |
+| Log4jJndiInjectionTest.java:87:170:87:177 | source(...) : String | Log4jJndiInjectionTest.java:87:161:87:177 | (...)... | provenance | Sink:MaD:68 |
+| Log4jJndiInjectionTest.java:87:170:87:177 | source(...) : String | Log4jJndiInjectionTest.java:87:161:87:177 | (...)... | provenance | Sink:MaD:67 |
+| Log4jJndiInjectionTest.java:88:155:88:162 | source(...) : String | Log4jJndiInjectionTest.java:88:146:88:162 | (...)... | provenance | Sink:MaD:68 |
+| Log4jJndiInjectionTest.java:88:155:88:162 | source(...) : String | Log4jJndiInjectionTest.java:88:146:88:162 | (...)... | provenance | Sink:MaD:67 |
+| Log4jJndiInjectionTest.java:89:140:89:147 | source(...) : String | Log4jJndiInjectionTest.java:89:131:89:147 | (...)... | provenance | Sink:MaD:68 |
+| Log4jJndiInjectionTest.java:89:140:89:147 | source(...) : String | Log4jJndiInjectionTest.java:89:131:89:147 | (...)... | provenance | Sink:MaD:67 |
+| Log4jJndiInjectionTest.java:90:125:90:132 | source(...) : String | Log4jJndiInjectionTest.java:90:116:90:132 | (...)... | provenance | Sink:MaD:68 |
+| Log4jJndiInjectionTest.java:90:125:90:132 | source(...) : String | Log4jJndiInjectionTest.java:90:116:90:132 | (...)... | provenance | Sink:MaD:67 |
+| Log4jJndiInjectionTest.java:91:110:91:117 | source(...) : String | Log4jJndiInjectionTest.java:91:101:91:117 | (...)... | provenance | Sink:MaD:68 |
+| Log4jJndiInjectionTest.java:91:110:91:117 | source(...) : String | Log4jJndiInjectionTest.java:91:101:91:117 | (...)... | provenance | Sink:MaD:67 |
+| Log4jJndiInjectionTest.java:92:95:92:102 | source(...) : String | Log4jJndiInjectionTest.java:92:86:92:102 | (...)... | provenance | Sink:MaD:68 |
+| Log4jJndiInjectionTest.java:92:95:92:102 | source(...) : String | Log4jJndiInjectionTest.java:92:86:92:102 | (...)... | provenance | Sink:MaD:67 |
+| Log4jJndiInjectionTest.java:93:80:93:87 | source(...) : String | Log4jJndiInjectionTest.java:93:71:93:87 | (...)... | provenance | Sink:MaD:68 |
+| Log4jJndiInjectionTest.java:93:80:93:87 | source(...) : String | Log4jJndiInjectionTest.java:93:71:93:87 | (...)... | provenance | Sink:MaD:67 |
+| Log4jJndiInjectionTest.java:94:65:94:72 | source(...) : String | Log4jJndiInjectionTest.java:94:56:94:72 | (...)... | provenance | Sink:MaD:68 |
+| Log4jJndiInjectionTest.java:94:65:94:72 | source(...) : String | Log4jJndiInjectionTest.java:94:56:94:72 | (...)... | provenance | Sink:MaD:67 |
+| Log4jJndiInjectionTest.java:95:50:95:57 | source(...) : String | Log4jJndiInjectionTest.java:95:41:95:57 | (...)... | provenance | Sink:MaD:68 |
+| Log4jJndiInjectionTest.java:95:50:95:57 | source(...) : String | Log4jJndiInjectionTest.java:95:41:95:57 | (...)... | provenance | Sink:MaD:67 |
+| Log4jJndiInjectionTest.java:96:50:96:57 | source(...) : String | Log4jJndiInjectionTest.java:96:41:96:57 | (...)... | provenance | Sink:MaD:52 |
+| Log4jJndiInjectionTest.java:96:50:96:57 | source(...) : String | Log4jJndiInjectionTest.java:96:41:96:57 | (...)... | provenance | Sink:MaD:51 |
+| Log4jJndiInjectionTest.java:97:70:97:77 | source(...) : String | Log4jJndiInjectionTest.java:97:56:97:77 | (...)... | provenance | Sink:MaD:52 |
+| Log4jJndiInjectionTest.java:97:70:97:77 | source(...) : String | Log4jJndiInjectionTest.java:97:56:97:77 | (...)... | provenance | Sink:MaD:51 |
+| Log4jJndiInjectionTest.java:98:50:98:57 | source(...) : String | Log4jJndiInjectionTest.java:98:41:98:57 | (...)... | provenance | Sink:MaD:72 |
+| Log4jJndiInjectionTest.java:98:50:98:57 | source(...) : String | Log4jJndiInjectionTest.java:98:41:98:57 | (...)... | provenance | Sink:MaD:71 |
+| Log4jJndiInjectionTest.java:99:55:99:62 | source(...) : String | Log4jJndiInjectionTest.java:99:41:99:62 | (...)... | provenance | Sink:MaD:74 |
+| Log4jJndiInjectionTest.java:99:55:99:62 | source(...) : String | Log4jJndiInjectionTest.java:99:41:99:62 | (...)... | provenance | Sink:MaD:73 |
+| Log4jJndiInjectionTest.java:100:55:100:62 | source(...) : String | Log4jJndiInjectionTest.java:100:41:100:62 | (...)... | provenance | Sink:MaD:76 |
+| Log4jJndiInjectionTest.java:100:55:100:62 | source(...) : String | Log4jJndiInjectionTest.java:100:41:100:62 | (...)... | provenance | Sink:MaD:75 |
+| Log4jJndiInjectionTest.java:101:44:101:51 | source(...) : String | Log4jJndiInjectionTest.java:101:26:101:51 | (...)... | provenance | Sink:MaD:82 |
+| Log4jJndiInjectionTest.java:101:44:101:51 | source(...) : String | Log4jJndiInjectionTest.java:101:26:101:51 | (...)... | provenance | Sink:MaD:81 |
+| Log4jJndiInjectionTest.java:102:44:102:51 | source(...) : String | Log4jJndiInjectionTest.java:102:26:102:51 | (...)... | provenance | Sink:MaD:84 |
+| Log4jJndiInjectionTest.java:102:44:102:51 | source(...) : String | Log4jJndiInjectionTest.java:102:26:102:51 | (...)... | provenance | Sink:MaD:83 |
+| Log4jJndiInjectionTest.java:103:36:103:43 | source(...) : String | Log4jJndiInjectionTest.java:103:26:103:43 | (...)... | provenance | Sink:MaD:78 |
+| Log4jJndiInjectionTest.java:103:36:103:43 | source(...) : String | Log4jJndiInjectionTest.java:103:26:103:43 | (...)... | provenance | Sink:MaD:77 |
+| Log4jJndiInjectionTest.java:104:36:104:43 | source(...) : String | Log4jJndiInjectionTest.java:104:26:104:43 | (...)... | provenance | Sink:MaD:80 |
+| Log4jJndiInjectionTest.java:104:36:104:43 | source(...) : String | Log4jJndiInjectionTest.java:104:26:104:43 | (...)... | provenance | Sink:MaD:79 |
+| Log4jJndiInjectionTest.java:107:35:107:42 | source(...) : String | Log4jJndiInjectionTest.java:107:26:107:42 | (...)... | provenance | Sink:MaD:90 |
+| Log4jJndiInjectionTest.java:107:35:107:42 | source(...) : String | Log4jJndiInjectionTest.java:107:26:107:42 | (...)... | provenance | Sink:MaD:89 |
+| Log4jJndiInjectionTest.java:108:35:108:42 | source(...) : String | Log4jJndiInjectionTest.java:108:26:108:42 | (...)... | provenance | Sink:MaD:110 |
+| Log4jJndiInjectionTest.java:108:35:108:42 | source(...) : String | Log4jJndiInjectionTest.java:108:26:108:42 | (...)... | provenance | Sink:MaD:109 |
+| Log4jJndiInjectionTest.java:109:41:109:63 | {...} : Object[] [[]] : String | Log4jJndiInjectionTest.java:109:41:109:63 | new Object[] | provenance | Sink:MaD:110 |
+| Log4jJndiInjectionTest.java:109:41:109:63 | {...} : Object[] [[]] : String | Log4jJndiInjectionTest.java:109:41:109:63 | new Object[] | provenance | Sink:MaD:109 |
 | Log4jJndiInjectionTest.java:109:55:109:62 | source(...) : String | Log4jJndiInjectionTest.java:109:41:109:63 | {...} : Object[] [[]] : String | provenance |  |
-| Log4jJndiInjectionTest.java:110:50:110:57 | source(...) : String | Log4jJndiInjectionTest.java:110:41:110:57 | (...)... | provenance |  Sink:MaD:52 |
-| Log4jJndiInjectionTest.java:110:50:110:57 | source(...) : String | Log4jJndiInjectionTest.java:110:41:110:57 | (...)... | provenance |  Sink:MaD:368 |
-| Log4jJndiInjectionTest.java:111:35:111:42 | source(...) : String | Log4jJndiInjectionTest.java:111:26:111:42 | (...)... | provenance |  Sink:MaD:52 |
-| Log4jJndiInjectionTest.java:111:35:111:42 | source(...) : String | Log4jJndiInjectionTest.java:111:26:111:42 | (...)... | provenance |  Sink:MaD:368 |
-| Log4jJndiInjectionTest.java:112:65:112:72 | source(...) : String | Log4jJndiInjectionTest.java:112:56:112:72 | (...)... | provenance |  Sink:MaD:53 |
-| Log4jJndiInjectionTest.java:112:65:112:72 | source(...) : String | Log4jJndiInjectionTest.java:112:56:112:72 | (...)... | provenance |  Sink:MaD:369 |
-| Log4jJndiInjectionTest.java:113:50:113:57 | source(...) : String | Log4jJndiInjectionTest.java:113:41:113:57 | (...)... | provenance |  Sink:MaD:53 |
-| Log4jJndiInjectionTest.java:113:50:113:57 | source(...) : String | Log4jJndiInjectionTest.java:113:41:113:57 | (...)... | provenance |  Sink:MaD:369 |
-| Log4jJndiInjectionTest.java:114:35:114:42 | source(...) : String | Log4jJndiInjectionTest.java:114:26:114:42 | (...)... | provenance |  Sink:MaD:53 |
-| Log4jJndiInjectionTest.java:114:35:114:42 | source(...) : String | Log4jJndiInjectionTest.java:114:26:114:42 | (...)... | provenance |  Sink:MaD:369 |
-| Log4jJndiInjectionTest.java:115:80:115:87 | source(...) : String | Log4jJndiInjectionTest.java:115:71:115:87 | (...)... | provenance |  Sink:MaD:54 |
-| Log4jJndiInjectionTest.java:115:80:115:87 | source(...) : String | Log4jJndiInjectionTest.java:115:71:115:87 | (...)... | provenance |  Sink:MaD:370 |
-| Log4jJndiInjectionTest.java:116:65:116:72 | source(...) : String | Log4jJndiInjectionTest.java:116:56:116:72 | (...)... | provenance |  Sink:MaD:54 |
-| Log4jJndiInjectionTest.java:116:65:116:72 | source(...) : String | Log4jJndiInjectionTest.java:116:56:116:72 | (...)... | provenance |  Sink:MaD:370 |
-| Log4jJndiInjectionTest.java:117:50:117:57 | source(...) : String | Log4jJndiInjectionTest.java:117:41:117:57 | (...)... | provenance |  Sink:MaD:54 |
-| Log4jJndiInjectionTest.java:117:50:117:57 | source(...) : String | Log4jJndiInjectionTest.java:117:41:117:57 | (...)... | provenance |  Sink:MaD:370 |
-| Log4jJndiInjectionTest.java:118:35:118:42 | source(...) : String | Log4jJndiInjectionTest.java:118:26:118:42 | (...)... | provenance |  Sink:MaD:54 |
-| Log4jJndiInjectionTest.java:118:35:118:42 | source(...) : String | Log4jJndiInjectionTest.java:118:26:118:42 | (...)... | provenance |  Sink:MaD:370 |
-| Log4jJndiInjectionTest.java:119:95:119:102 | source(...) : String | Log4jJndiInjectionTest.java:119:86:119:102 | (...)... | provenance |  Sink:MaD:55 |
-| Log4jJndiInjectionTest.java:119:95:119:102 | source(...) : String | Log4jJndiInjectionTest.java:119:86:119:102 | (...)... | provenance |  Sink:MaD:371 |
-| Log4jJndiInjectionTest.java:120:80:120:87 | source(...) : String | Log4jJndiInjectionTest.java:120:71:120:87 | (...)... | provenance |  Sink:MaD:55 |
-| Log4jJndiInjectionTest.java:120:80:120:87 | source(...) : String | Log4jJndiInjectionTest.java:120:71:120:87 | (...)... | provenance |  Sink:MaD:371 |
-| Log4jJndiInjectionTest.java:121:65:121:72 | source(...) : String | Log4jJndiInjectionTest.java:121:56:121:72 | (...)... | provenance |  Sink:MaD:55 |
-| Log4jJndiInjectionTest.java:121:65:121:72 | source(...) : String | Log4jJndiInjectionTest.java:121:56:121:72 | (...)... | provenance |  Sink:MaD:371 |
-| Log4jJndiInjectionTest.java:122:50:122:57 | source(...) : String | Log4jJndiInjectionTest.java:122:41:122:57 | (...)... | provenance |  Sink:MaD:55 |
-| Log4jJndiInjectionTest.java:122:50:122:57 | source(...) : String | Log4jJndiInjectionTest.java:122:41:122:57 | (...)... | provenance |  Sink:MaD:371 |
-| Log4jJndiInjectionTest.java:123:35:123:42 | source(...) : String | Log4jJndiInjectionTest.java:123:26:123:42 | (...)... | provenance |  Sink:MaD:55 |
-| Log4jJndiInjectionTest.java:123:35:123:42 | source(...) : String | Log4jJndiInjectionTest.java:123:26:123:42 | (...)... | provenance |  Sink:MaD:371 |
-| Log4jJndiInjectionTest.java:124:110:124:117 | source(...) : String | Log4jJndiInjectionTest.java:124:101:124:117 | (...)... | provenance |  Sink:MaD:56 |
-| Log4jJndiInjectionTest.java:124:110:124:117 | source(...) : String | Log4jJndiInjectionTest.java:124:101:124:117 | (...)... | provenance |  Sink:MaD:372 |
-| Log4jJndiInjectionTest.java:125:95:125:102 | source(...) : String | Log4jJndiInjectionTest.java:125:86:125:102 | (...)... | provenance |  Sink:MaD:56 |
-| Log4jJndiInjectionTest.java:125:95:125:102 | source(...) : String | Log4jJndiInjectionTest.java:125:86:125:102 | (...)... | provenance |  Sink:MaD:372 |
-| Log4jJndiInjectionTest.java:126:80:126:87 | source(...) : String | Log4jJndiInjectionTest.java:126:71:126:87 | (...)... | provenance |  Sink:MaD:56 |
-| Log4jJndiInjectionTest.java:126:80:126:87 | source(...) : String | Log4jJndiInjectionTest.java:126:71:126:87 | (...)... | provenance |  Sink:MaD:372 |
-| Log4jJndiInjectionTest.java:127:65:127:72 | source(...) : String | Log4jJndiInjectionTest.java:127:56:127:72 | (...)... | provenance |  Sink:MaD:56 |
-| Log4jJndiInjectionTest.java:127:65:127:72 | source(...) : String | Log4jJndiInjectionTest.java:127:56:127:72 | (...)... | provenance |  Sink:MaD:372 |
-| Log4jJndiInjectionTest.java:128:50:128:57 | source(...) : String | Log4jJndiInjectionTest.java:128:41:128:57 | (...)... | provenance |  Sink:MaD:56 |
-| Log4jJndiInjectionTest.java:128:50:128:57 | source(...) : String | Log4jJndiInjectionTest.java:128:41:128:57 | (...)... | provenance |  Sink:MaD:372 |
-| Log4jJndiInjectionTest.java:129:35:129:42 | source(...) : String | Log4jJndiInjectionTest.java:129:26:129:42 | (...)... | provenance |  Sink:MaD:56 |
-| Log4jJndiInjectionTest.java:129:35:129:42 | source(...) : String | Log4jJndiInjectionTest.java:129:26:129:42 | (...)... | provenance |  Sink:MaD:372 |
-| Log4jJndiInjectionTest.java:130:125:130:132 | source(...) : String | Log4jJndiInjectionTest.java:130:116:130:132 | (...)... | provenance |  Sink:MaD:57 |
-| Log4jJndiInjectionTest.java:130:125:130:132 | source(...) : String | Log4jJndiInjectionTest.java:130:116:130:132 | (...)... | provenance |  Sink:MaD:373 |
-| Log4jJndiInjectionTest.java:131:110:131:117 | source(...) : String | Log4jJndiInjectionTest.java:131:101:131:117 | (...)... | provenance |  Sink:MaD:57 |
-| Log4jJndiInjectionTest.java:131:110:131:117 | source(...) : String | Log4jJndiInjectionTest.java:131:101:131:117 | (...)... | provenance |  Sink:MaD:373 |
-| Log4jJndiInjectionTest.java:132:95:132:102 | source(...) : String | Log4jJndiInjectionTest.java:132:86:132:102 | (...)... | provenance |  Sink:MaD:57 |
-| Log4jJndiInjectionTest.java:132:95:132:102 | source(...) : String | Log4jJndiInjectionTest.java:132:86:132:102 | (...)... | provenance |  Sink:MaD:373 |
-| Log4jJndiInjectionTest.java:133:80:133:87 | source(...) : String | Log4jJndiInjectionTest.java:133:71:133:87 | (...)... | provenance |  Sink:MaD:57 |
-| Log4jJndiInjectionTest.java:133:80:133:87 | source(...) : String | Log4jJndiInjectionTest.java:133:71:133:87 | (...)... | provenance |  Sink:MaD:373 |
-| Log4jJndiInjectionTest.java:134:65:134:72 | source(...) : String | Log4jJndiInjectionTest.java:134:56:134:72 | (...)... | provenance |  Sink:MaD:57 |
-| Log4jJndiInjectionTest.java:134:65:134:72 | source(...) : String | Log4jJndiInjectionTest.java:134:56:134:72 | (...)... | provenance |  Sink:MaD:373 |
-| Log4jJndiInjectionTest.java:135:50:135:57 | source(...) : String | Log4jJndiInjectionTest.java:135:41:135:57 | (...)... | provenance |  Sink:MaD:57 |
-| Log4jJndiInjectionTest.java:135:50:135:57 | source(...) : String | Log4jJndiInjectionTest.java:135:41:135:57 | (...)... | provenance |  Sink:MaD:373 |
-| Log4jJndiInjectionTest.java:136:35:136:42 | source(...) : String | Log4jJndiInjectionTest.java:136:26:136:42 | (...)... | provenance |  Sink:MaD:57 |
-| Log4jJndiInjectionTest.java:136:35:136:42 | source(...) : String | Log4jJndiInjectionTest.java:136:26:136:42 | (...)... | provenance |  Sink:MaD:373 |
-| Log4jJndiInjectionTest.java:137:140:137:147 | source(...) : String | Log4jJndiInjectionTest.java:137:131:137:147 | (...)... | provenance |  Sink:MaD:58 |
-| Log4jJndiInjectionTest.java:137:140:137:147 | source(...) : String | Log4jJndiInjectionTest.java:137:131:137:147 | (...)... | provenance |  Sink:MaD:374 |
-| Log4jJndiInjectionTest.java:138:125:138:132 | source(...) : String | Log4jJndiInjectionTest.java:138:116:138:132 | (...)... | provenance |  Sink:MaD:58 |
-| Log4jJndiInjectionTest.java:138:125:138:132 | source(...) : String | Log4jJndiInjectionTest.java:138:116:138:132 | (...)... | provenance |  Sink:MaD:374 |
-| Log4jJndiInjectionTest.java:139:110:139:117 | source(...) : String | Log4jJndiInjectionTest.java:139:101:139:117 | (...)... | provenance |  Sink:MaD:58 |
-| Log4jJndiInjectionTest.java:139:110:139:117 | source(...) : String | Log4jJndiInjectionTest.java:139:101:139:117 | (...)... | provenance |  Sink:MaD:374 |
-| Log4jJndiInjectionTest.java:140:95:140:102 | source(...) : String | Log4jJndiInjectionTest.java:140:86:140:102 | (...)... | provenance |  Sink:MaD:58 |
-| Log4jJndiInjectionTest.java:140:95:140:102 | source(...) : String | Log4jJndiInjectionTest.java:140:86:140:102 | (...)... | provenance |  Sink:MaD:374 |
-| Log4jJndiInjectionTest.java:141:80:141:87 | source(...) : String | Log4jJndiInjectionTest.java:141:71:141:87 | (...)... | provenance |  Sink:MaD:58 |
-| Log4jJndiInjectionTest.java:141:80:141:87 | source(...) : String | Log4jJndiInjectionTest.java:141:71:141:87 | (...)... | provenance |  Sink:MaD:374 |
-| Log4jJndiInjectionTest.java:142:65:142:72 | source(...) : String | Log4jJndiInjectionTest.java:142:56:142:72 | (...)... | provenance |  Sink:MaD:58 |
-| Log4jJndiInjectionTest.java:142:65:142:72 | source(...) : String | Log4jJndiInjectionTest.java:142:56:142:72 | (...)... | provenance |  Sink:MaD:374 |
-| Log4jJndiInjectionTest.java:143:50:143:57 | source(...) : String | Log4jJndiInjectionTest.java:143:41:143:57 | (...)... | provenance |  Sink:MaD:58 |
-| Log4jJndiInjectionTest.java:143:50:143:57 | source(...) : String | Log4jJndiInjectionTest.java:143:41:143:57 | (...)... | provenance |  Sink:MaD:374 |
-| Log4jJndiInjectionTest.java:144:35:144:42 | source(...) : String | Log4jJndiInjectionTest.java:144:26:144:42 | (...)... | provenance |  Sink:MaD:58 |
-| Log4jJndiInjectionTest.java:144:35:144:42 | source(...) : String | Log4jJndiInjectionTest.java:144:26:144:42 | (...)... | provenance |  Sink:MaD:374 |
-| Log4jJndiInjectionTest.java:145:155:145:162 | source(...) : String | Log4jJndiInjectionTest.java:145:146:145:162 | (...)... | provenance |  Sink:MaD:59 |
-| Log4jJndiInjectionTest.java:145:155:145:162 | source(...) : String | Log4jJndiInjectionTest.java:145:146:145:162 | (...)... | provenance |  Sink:MaD:375 |
-| Log4jJndiInjectionTest.java:146:140:146:147 | source(...) : String | Log4jJndiInjectionTest.java:146:131:146:147 | (...)... | provenance |  Sink:MaD:59 |
-| Log4jJndiInjectionTest.java:146:140:146:147 | source(...) : String | Log4jJndiInjectionTest.java:146:131:146:147 | (...)... | provenance |  Sink:MaD:375 |
-| Log4jJndiInjectionTest.java:147:125:147:132 | source(...) : String | Log4jJndiInjectionTest.java:147:116:147:132 | (...)... | provenance |  Sink:MaD:59 |
-| Log4jJndiInjectionTest.java:147:125:147:132 | source(...) : String | Log4jJndiInjectionTest.java:147:116:147:132 | (...)... | provenance |  Sink:MaD:375 |
-| Log4jJndiInjectionTest.java:148:110:148:117 | source(...) : String | Log4jJndiInjectionTest.java:148:101:148:117 | (...)... | provenance |  Sink:MaD:59 |
-| Log4jJndiInjectionTest.java:148:110:148:117 | source(...) : String | Log4jJndiInjectionTest.java:148:101:148:117 | (...)... | provenance |  Sink:MaD:375 |
-| Log4jJndiInjectionTest.java:149:95:149:102 | source(...) : String | Log4jJndiInjectionTest.java:149:86:149:102 | (...)... | provenance |  Sink:MaD:59 |
-| Log4jJndiInjectionTest.java:149:95:149:102 | source(...) : String | Log4jJndiInjectionTest.java:149:86:149:102 | (...)... | provenance |  Sink:MaD:375 |
-| Log4jJndiInjectionTest.java:150:80:150:87 | source(...) : String | Log4jJndiInjectionTest.java:150:71:150:87 | (...)... | provenance |  Sink:MaD:59 |
-| Log4jJndiInjectionTest.java:150:80:150:87 | source(...) : String | Log4jJndiInjectionTest.java:150:71:150:87 | (...)... | provenance |  Sink:MaD:375 |
-| Log4jJndiInjectionTest.java:151:65:151:72 | source(...) : String | Log4jJndiInjectionTest.java:151:56:151:72 | (...)... | provenance |  Sink:MaD:59 |
-| Log4jJndiInjectionTest.java:151:65:151:72 | source(...) : String | Log4jJndiInjectionTest.java:151:56:151:72 | (...)... | provenance |  Sink:MaD:375 |
-| Log4jJndiInjectionTest.java:152:50:152:57 | source(...) : String | Log4jJndiInjectionTest.java:152:41:152:57 | (...)... | provenance |  Sink:MaD:59 |
-| Log4jJndiInjectionTest.java:152:50:152:57 | source(...) : String | Log4jJndiInjectionTest.java:152:41:152:57 | (...)... | provenance |  Sink:MaD:375 |
-| Log4jJndiInjectionTest.java:153:35:153:42 | source(...) : String | Log4jJndiInjectionTest.java:153:26:153:42 | (...)... | provenance |  Sink:MaD:59 |
-| Log4jJndiInjectionTest.java:153:35:153:42 | source(...) : String | Log4jJndiInjectionTest.java:153:26:153:42 | (...)... | provenance |  Sink:MaD:375 |
-| Log4jJndiInjectionTest.java:154:170:154:177 | source(...) : String | Log4jJndiInjectionTest.java:154:161:154:177 | (...)... | provenance |  Sink:MaD:60 |
-| Log4jJndiInjectionTest.java:154:170:154:177 | source(...) : String | Log4jJndiInjectionTest.java:154:161:154:177 | (...)... | provenance |  Sink:MaD:376 |
-| Log4jJndiInjectionTest.java:155:155:155:162 | source(...) : String | Log4jJndiInjectionTest.java:155:146:155:162 | (...)... | provenance |  Sink:MaD:60 |
-| Log4jJndiInjectionTest.java:155:155:155:162 | source(...) : String | Log4jJndiInjectionTest.java:155:146:155:162 | (...)... | provenance |  Sink:MaD:376 |
-| Log4jJndiInjectionTest.java:156:140:156:147 | source(...) : String | Log4jJndiInjectionTest.java:156:131:156:147 | (...)... | provenance |  Sink:MaD:60 |
-| Log4jJndiInjectionTest.java:156:140:156:147 | source(...) : String | Log4jJndiInjectionTest.java:156:131:156:147 | (...)... | provenance |  Sink:MaD:376 |
-| Log4jJndiInjectionTest.java:157:125:157:132 | source(...) : String | Log4jJndiInjectionTest.java:157:116:157:132 | (...)... | provenance |  Sink:MaD:60 |
-| Log4jJndiInjectionTest.java:157:125:157:132 | source(...) : String | Log4jJndiInjectionTest.java:157:116:157:132 | (...)... | provenance |  Sink:MaD:376 |
-| Log4jJndiInjectionTest.java:158:110:158:117 | source(...) : String | Log4jJndiInjectionTest.java:158:101:158:117 | (...)... | provenance |  Sink:MaD:60 |
-| Log4jJndiInjectionTest.java:158:110:158:117 | source(...) : String | Log4jJndiInjectionTest.java:158:101:158:117 | (...)... | provenance |  Sink:MaD:376 |
-| Log4jJndiInjectionTest.java:159:95:159:102 | source(...) : String | Log4jJndiInjectionTest.java:159:86:159:102 | (...)... | provenance |  Sink:MaD:60 |
-| Log4jJndiInjectionTest.java:159:95:159:102 | source(...) : String | Log4jJndiInjectionTest.java:159:86:159:102 | (...)... | provenance |  Sink:MaD:376 |
-| Log4jJndiInjectionTest.java:160:80:160:87 | source(...) : String | Log4jJndiInjectionTest.java:160:71:160:87 | (...)... | provenance |  Sink:MaD:60 |
-| Log4jJndiInjectionTest.java:160:80:160:87 | source(...) : String | Log4jJndiInjectionTest.java:160:71:160:87 | (...)... | provenance |  Sink:MaD:376 |
-| Log4jJndiInjectionTest.java:161:65:161:72 | source(...) : String | Log4jJndiInjectionTest.java:161:56:161:72 | (...)... | provenance |  Sink:MaD:60 |
-| Log4jJndiInjectionTest.java:161:65:161:72 | source(...) : String | Log4jJndiInjectionTest.java:161:56:161:72 | (...)... | provenance |  Sink:MaD:376 |
-| Log4jJndiInjectionTest.java:162:50:162:57 | source(...) : String | Log4jJndiInjectionTest.java:162:41:162:57 | (...)... | provenance |  Sink:MaD:60 |
-| Log4jJndiInjectionTest.java:162:50:162:57 | source(...) : String | Log4jJndiInjectionTest.java:162:41:162:57 | (...)... | provenance |  Sink:MaD:376 |
-| Log4jJndiInjectionTest.java:163:35:163:42 | source(...) : String | Log4jJndiInjectionTest.java:163:26:163:42 | (...)... | provenance |  Sink:MaD:60 |
-| Log4jJndiInjectionTest.java:163:35:163:42 | source(...) : String | Log4jJndiInjectionTest.java:163:26:163:42 | (...)... | provenance |  Sink:MaD:376 |
-| Log4jJndiInjectionTest.java:164:35:164:42 | source(...) : String | Log4jJndiInjectionTest.java:164:26:164:42 | (...)... | provenance |  Sink:MaD:52 |
-| Log4jJndiInjectionTest.java:164:35:164:42 | source(...) : String | Log4jJndiInjectionTest.java:164:26:164:42 | (...)... | provenance |  Sink:MaD:368 |
-| Log4jJndiInjectionTest.java:165:55:165:62 | source(...) : String | Log4jJndiInjectionTest.java:165:41:165:62 | (...)... | provenance |  Sink:MaD:52 |
-| Log4jJndiInjectionTest.java:165:55:165:62 | source(...) : String | Log4jJndiInjectionTest.java:165:41:165:62 | (...)... | provenance |  Sink:MaD:368 |
-| Log4jJndiInjectionTest.java:166:35:166:42 | source(...) : String | Log4jJndiInjectionTest.java:166:26:166:42 | (...)... | provenance |  Sink:MaD:62 |
-| Log4jJndiInjectionTest.java:166:35:166:42 | source(...) : String | Log4jJndiInjectionTest.java:166:26:166:42 | (...)... | provenance |  Sink:MaD:378 |
-| Log4jJndiInjectionTest.java:167:40:167:47 | source(...) : String | Log4jJndiInjectionTest.java:167:26:167:47 | (...)... | provenance |  Sink:MaD:63 |
-| Log4jJndiInjectionTest.java:167:40:167:47 | source(...) : String | Log4jJndiInjectionTest.java:167:26:167:47 | (...)... | provenance |  Sink:MaD:379 |
-| Log4jJndiInjectionTest.java:168:40:168:47 | source(...) : String | Log4jJndiInjectionTest.java:168:26:168:47 | (...)... | provenance |  Sink:MaD:64 |
-| Log4jJndiInjectionTest.java:168:40:168:47 | source(...) : String | Log4jJndiInjectionTest.java:168:26:168:47 | (...)... | provenance |  Sink:MaD:380 |
-| Log4jJndiInjectionTest.java:169:41:169:48 | source(...) : String | Log4jJndiInjectionTest.java:169:26:169:48 | (...)... | provenance |  Sink:MaD:65 |
-| Log4jJndiInjectionTest.java:169:41:169:48 | source(...) : String | Log4jJndiInjectionTest.java:169:26:169:48 | (...)... | provenance |  Sink:MaD:381 |
-| Log4jJndiInjectionTest.java:170:41:170:48 | source(...) : String | Log4jJndiInjectionTest.java:170:26:170:48 | (...)... | provenance |  Sink:MaD:66 |
-| Log4jJndiInjectionTest.java:170:41:170:48 | source(...) : String | Log4jJndiInjectionTest.java:170:26:170:48 | (...)... | provenance |  Sink:MaD:382 |
-| Log4jJndiInjectionTest.java:171:56:171:63 | source(...) : String | Log4jJndiInjectionTest.java:171:41:171:63 | (...)... | provenance |  Sink:MaD:67 |
-| Log4jJndiInjectionTest.java:171:56:171:63 | source(...) : String | Log4jJndiInjectionTest.java:171:41:171:63 | (...)... | provenance |  Sink:MaD:383 |
-| Log4jJndiInjectionTest.java:172:56:172:63 | source(...) : String | Log4jJndiInjectionTest.java:172:41:172:63 | (...)... | provenance |  Sink:MaD:68 |
-| Log4jJndiInjectionTest.java:172:56:172:63 | source(...) : String | Log4jJndiInjectionTest.java:172:41:172:63 | (...)... | provenance |  Sink:MaD:384 |
-| Log4jJndiInjectionTest.java:173:51:173:58 | source(...) : String | Log4jJndiInjectionTest.java:173:41:173:58 | (...)... | provenance |  Sink:MaD:69 |
-| Log4jJndiInjectionTest.java:173:51:173:58 | source(...) : String | Log4jJndiInjectionTest.java:173:41:173:58 | (...)... | provenance |  Sink:MaD:385 |
-| Log4jJndiInjectionTest.java:174:59:174:66 | source(...) : String | Log4jJndiInjectionTest.java:174:41:174:66 | (...)... | provenance |  Sink:MaD:70 |
-| Log4jJndiInjectionTest.java:174:59:174:66 | source(...) : String | Log4jJndiInjectionTest.java:174:41:174:66 | (...)... | provenance |  Sink:MaD:386 |
-| Log4jJndiInjectionTest.java:175:59:175:66 | source(...) : String | Log4jJndiInjectionTest.java:175:41:175:66 | (...)... | provenance |  Sink:MaD:71 |
-| Log4jJndiInjectionTest.java:175:59:175:66 | source(...) : String | Log4jJndiInjectionTest.java:175:41:175:66 | (...)... | provenance |  Sink:MaD:387 |
-| Log4jJndiInjectionTest.java:177:50:177:57 | source(...) : String | Log4jJndiInjectionTest.java:177:41:177:57 | (...)... | provenance |  Sink:MaD:73 |
-| Log4jJndiInjectionTest.java:177:50:177:57 | source(...) : String | Log4jJndiInjectionTest.java:177:41:177:57 | (...)... | provenance |  Sink:MaD:389 |
-| Log4jJndiInjectionTest.java:178:50:178:57 | source(...) : String | Log4jJndiInjectionTest.java:178:41:178:57 | (...)... | provenance |  Sink:MaD:83 |
-| Log4jJndiInjectionTest.java:178:50:178:57 | source(...) : String | Log4jJndiInjectionTest.java:178:41:178:57 | (...)... | provenance |  Sink:MaD:399 |
-| Log4jJndiInjectionTest.java:179:56:179:78 | {...} : Object[] [[]] : String | Log4jJndiInjectionTest.java:179:56:179:78 | new Object[] | provenance |  Sink:MaD:83 |
-| Log4jJndiInjectionTest.java:179:56:179:78 | {...} : Object[] [[]] : String | Log4jJndiInjectionTest.java:179:56:179:78 | new Object[] | provenance |  Sink:MaD:399 |
+| Log4jJndiInjectionTest.java:110:50:110:57 | source(...) : String | Log4jJndiInjectionTest.java:110:41:110:57 | (...)... | provenance | Sink:MaD:92 |
+| Log4jJndiInjectionTest.java:110:50:110:57 | source(...) : String | Log4jJndiInjectionTest.java:110:41:110:57 | (...)... | provenance | Sink:MaD:91 |
+| Log4jJndiInjectionTest.java:111:35:111:42 | source(...) : String | Log4jJndiInjectionTest.java:111:26:111:42 | (...)... | provenance | Sink:MaD:92 |
+| Log4jJndiInjectionTest.java:111:35:111:42 | source(...) : String | Log4jJndiInjectionTest.java:111:26:111:42 | (...)... | provenance | Sink:MaD:91 |
+| Log4jJndiInjectionTest.java:112:65:112:72 | source(...) : String | Log4jJndiInjectionTest.java:112:56:112:72 | (...)... | provenance | Sink:MaD:94 |
+| Log4jJndiInjectionTest.java:112:65:112:72 | source(...) : String | Log4jJndiInjectionTest.java:112:56:112:72 | (...)... | provenance | Sink:MaD:93 |
+| Log4jJndiInjectionTest.java:113:50:113:57 | source(...) : String | Log4jJndiInjectionTest.java:113:41:113:57 | (...)... | provenance | Sink:MaD:94 |
+| Log4jJndiInjectionTest.java:113:50:113:57 | source(...) : String | Log4jJndiInjectionTest.java:113:41:113:57 | (...)... | provenance | Sink:MaD:93 |
+| Log4jJndiInjectionTest.java:114:35:114:42 | source(...) : String | Log4jJndiInjectionTest.java:114:26:114:42 | (...)... | provenance | Sink:MaD:94 |
+| Log4jJndiInjectionTest.java:114:35:114:42 | source(...) : String | Log4jJndiInjectionTest.java:114:26:114:42 | (...)... | provenance | Sink:MaD:93 |
+| Log4jJndiInjectionTest.java:115:80:115:87 | source(...) : String | Log4jJndiInjectionTest.java:115:71:115:87 | (...)... | provenance | Sink:MaD:96 |
+| Log4jJndiInjectionTest.java:115:80:115:87 | source(...) : String | Log4jJndiInjectionTest.java:115:71:115:87 | (...)... | provenance | Sink:MaD:95 |
+| Log4jJndiInjectionTest.java:116:65:116:72 | source(...) : String | Log4jJndiInjectionTest.java:116:56:116:72 | (...)... | provenance | Sink:MaD:96 |
+| Log4jJndiInjectionTest.java:116:65:116:72 | source(...) : String | Log4jJndiInjectionTest.java:116:56:116:72 | (...)... | provenance | Sink:MaD:95 |
+| Log4jJndiInjectionTest.java:117:50:117:57 | source(...) : String | Log4jJndiInjectionTest.java:117:41:117:57 | (...)... | provenance | Sink:MaD:96 |
+| Log4jJndiInjectionTest.java:117:50:117:57 | source(...) : String | Log4jJndiInjectionTest.java:117:41:117:57 | (...)... | provenance | Sink:MaD:95 |
+| Log4jJndiInjectionTest.java:118:35:118:42 | source(...) : String | Log4jJndiInjectionTest.java:118:26:118:42 | (...)... | provenance | Sink:MaD:96 |
+| Log4jJndiInjectionTest.java:118:35:118:42 | source(...) : String | Log4jJndiInjectionTest.java:118:26:118:42 | (...)... | provenance | Sink:MaD:95 |
+| Log4jJndiInjectionTest.java:119:95:119:102 | source(...) : String | Log4jJndiInjectionTest.java:119:86:119:102 | (...)... | provenance | Sink:MaD:98 |
+| Log4jJndiInjectionTest.java:119:95:119:102 | source(...) : String | Log4jJndiInjectionTest.java:119:86:119:102 | (...)... | provenance | Sink:MaD:97 |
+| Log4jJndiInjectionTest.java:120:80:120:87 | source(...) : String | Log4jJndiInjectionTest.java:120:71:120:87 | (...)... | provenance | Sink:MaD:98 |
+| Log4jJndiInjectionTest.java:120:80:120:87 | source(...) : String | Log4jJndiInjectionTest.java:120:71:120:87 | (...)... | provenance | Sink:MaD:97 |
+| Log4jJndiInjectionTest.java:121:65:121:72 | source(...) : String | Log4jJndiInjectionTest.java:121:56:121:72 | (...)... | provenance | Sink:MaD:98 |
+| Log4jJndiInjectionTest.java:121:65:121:72 | source(...) : String | Log4jJndiInjectionTest.java:121:56:121:72 | (...)... | provenance | Sink:MaD:97 |
+| Log4jJndiInjectionTest.java:122:50:122:57 | source(...) : String | Log4jJndiInjectionTest.java:122:41:122:57 | (...)... | provenance | Sink:MaD:98 |
+| Log4jJndiInjectionTest.java:122:50:122:57 | source(...) : String | Log4jJndiInjectionTest.java:122:41:122:57 | (...)... | provenance | Sink:MaD:97 |
+| Log4jJndiInjectionTest.java:123:35:123:42 | source(...) : String | Log4jJndiInjectionTest.java:123:26:123:42 | (...)... | provenance | Sink:MaD:98 |
+| Log4jJndiInjectionTest.java:123:35:123:42 | source(...) : String | Log4jJndiInjectionTest.java:123:26:123:42 | (...)... | provenance | Sink:MaD:97 |
+| Log4jJndiInjectionTest.java:124:110:124:117 | source(...) : String | Log4jJndiInjectionTest.java:124:101:124:117 | (...)... | provenance | Sink:MaD:100 |
+| Log4jJndiInjectionTest.java:124:110:124:117 | source(...) : String | Log4jJndiInjectionTest.java:124:101:124:117 | (...)... | provenance | Sink:MaD:99 |
+| Log4jJndiInjectionTest.java:125:95:125:102 | source(...) : String | Log4jJndiInjectionTest.java:125:86:125:102 | (...)... | provenance | Sink:MaD:100 |
+| Log4jJndiInjectionTest.java:125:95:125:102 | source(...) : String | Log4jJndiInjectionTest.java:125:86:125:102 | (...)... | provenance | Sink:MaD:99 |
+| Log4jJndiInjectionTest.java:126:80:126:87 | source(...) : String | Log4jJndiInjectionTest.java:126:71:126:87 | (...)... | provenance | Sink:MaD:100 |
+| Log4jJndiInjectionTest.java:126:80:126:87 | source(...) : String | Log4jJndiInjectionTest.java:126:71:126:87 | (...)... | provenance | Sink:MaD:99 |
+| Log4jJndiInjectionTest.java:127:65:127:72 | source(...) : String | Log4jJndiInjectionTest.java:127:56:127:72 | (...)... | provenance | Sink:MaD:100 |
+| Log4jJndiInjectionTest.java:127:65:127:72 | source(...) : String | Log4jJndiInjectionTest.java:127:56:127:72 | (...)... | provenance | Sink:MaD:99 |
+| Log4jJndiInjectionTest.java:128:50:128:57 | source(...) : String | Log4jJndiInjectionTest.java:128:41:128:57 | (...)... | provenance | Sink:MaD:100 |
+| Log4jJndiInjectionTest.java:128:50:128:57 | source(...) : String | Log4jJndiInjectionTest.java:128:41:128:57 | (...)... | provenance | Sink:MaD:99 |
+| Log4jJndiInjectionTest.java:129:35:129:42 | source(...) : String | Log4jJndiInjectionTest.java:129:26:129:42 | (...)... | provenance | Sink:MaD:100 |
+| Log4jJndiInjectionTest.java:129:35:129:42 | source(...) : String | Log4jJndiInjectionTest.java:129:26:129:42 | (...)... | provenance | Sink:MaD:99 |
+| Log4jJndiInjectionTest.java:130:125:130:132 | source(...) : String | Log4jJndiInjectionTest.java:130:116:130:132 | (...)... | provenance | Sink:MaD:102 |
+| Log4jJndiInjectionTest.java:130:125:130:132 | source(...) : String | Log4jJndiInjectionTest.java:130:116:130:132 | (...)... | provenance | Sink:MaD:101 |
+| Log4jJndiInjectionTest.java:131:110:131:117 | source(...) : String | Log4jJndiInjectionTest.java:131:101:131:117 | (...)... | provenance | Sink:MaD:102 |
+| Log4jJndiInjectionTest.java:131:110:131:117 | source(...) : String | Log4jJndiInjectionTest.java:131:101:131:117 | (...)... | provenance | Sink:MaD:101 |
+| Log4jJndiInjectionTest.java:132:95:132:102 | source(...) : String | Log4jJndiInjectionTest.java:132:86:132:102 | (...)... | provenance | Sink:MaD:102 |
+| Log4jJndiInjectionTest.java:132:95:132:102 | source(...) : String | Log4jJndiInjectionTest.java:132:86:132:102 | (...)... | provenance | Sink:MaD:101 |
+| Log4jJndiInjectionTest.java:133:80:133:87 | source(...) : String | Log4jJndiInjectionTest.java:133:71:133:87 | (...)... | provenance | Sink:MaD:102 |
+| Log4jJndiInjectionTest.java:133:80:133:87 | source(...) : String | Log4jJndiInjectionTest.java:133:71:133:87 | (...)... | provenance | Sink:MaD:101 |
+| Log4jJndiInjectionTest.java:134:65:134:72 | source(...) : String | Log4jJndiInjectionTest.java:134:56:134:72 | (...)... | provenance | Sink:MaD:102 |
+| Log4jJndiInjectionTest.java:134:65:134:72 | source(...) : String | Log4jJndiInjectionTest.java:134:56:134:72 | (...)... | provenance | Sink:MaD:101 |
+| Log4jJndiInjectionTest.java:135:50:135:57 | source(...) : String | Log4jJndiInjectionTest.java:135:41:135:57 | (...)... | provenance | Sink:MaD:102 |
+| Log4jJndiInjectionTest.java:135:50:135:57 | source(...) : String | Log4jJndiInjectionTest.java:135:41:135:57 | (...)... | provenance | Sink:MaD:101 |
+| Log4jJndiInjectionTest.java:136:35:136:42 | source(...) : String | Log4jJndiInjectionTest.java:136:26:136:42 | (...)... | provenance | Sink:MaD:102 |
+| Log4jJndiInjectionTest.java:136:35:136:42 | source(...) : String | Log4jJndiInjectionTest.java:136:26:136:42 | (...)... | provenance | Sink:MaD:101 |
+| Log4jJndiInjectionTest.java:137:140:137:147 | source(...) : String | Log4jJndiInjectionTest.java:137:131:137:147 | (...)... | provenance | Sink:MaD:104 |
+| Log4jJndiInjectionTest.java:137:140:137:147 | source(...) : String | Log4jJndiInjectionTest.java:137:131:137:147 | (...)... | provenance | Sink:MaD:103 |
+| Log4jJndiInjectionTest.java:138:125:138:132 | source(...) : String | Log4jJndiInjectionTest.java:138:116:138:132 | (...)... | provenance | Sink:MaD:104 |
+| Log4jJndiInjectionTest.java:138:125:138:132 | source(...) : String | Log4jJndiInjectionTest.java:138:116:138:132 | (...)... | provenance | Sink:MaD:103 |
+| Log4jJndiInjectionTest.java:139:110:139:117 | source(...) : String | Log4jJndiInjectionTest.java:139:101:139:117 | (...)... | provenance | Sink:MaD:104 |
+| Log4jJndiInjectionTest.java:139:110:139:117 | source(...) : String | Log4jJndiInjectionTest.java:139:101:139:117 | (...)... | provenance | Sink:MaD:103 |
+| Log4jJndiInjectionTest.java:140:95:140:102 | source(...) : String | Log4jJndiInjectionTest.java:140:86:140:102 | (...)... | provenance | Sink:MaD:104 |
+| Log4jJndiInjectionTest.java:140:95:140:102 | source(...) : String | Log4jJndiInjectionTest.java:140:86:140:102 | (...)... | provenance | Sink:MaD:103 |
+| Log4jJndiInjectionTest.java:141:80:141:87 | source(...) : String | Log4jJndiInjectionTest.java:141:71:141:87 | (...)... | provenance | Sink:MaD:104 |
+| Log4jJndiInjectionTest.java:141:80:141:87 | source(...) : String | Log4jJndiInjectionTest.java:141:71:141:87 | (...)... | provenance | Sink:MaD:103 |
+| Log4jJndiInjectionTest.java:142:65:142:72 | source(...) : String | Log4jJndiInjectionTest.java:142:56:142:72 | (...)... | provenance | Sink:MaD:104 |
+| Log4jJndiInjectionTest.java:142:65:142:72 | source(...) : String | Log4jJndiInjectionTest.java:142:56:142:72 | (...)... | provenance | Sink:MaD:103 |
+| Log4jJndiInjectionTest.java:143:50:143:57 | source(...) : String | Log4jJndiInjectionTest.java:143:41:143:57 | (...)... | provenance | Sink:MaD:104 |
+| Log4jJndiInjectionTest.java:143:50:143:57 | source(...) : String | Log4jJndiInjectionTest.java:143:41:143:57 | (...)... | provenance | Sink:MaD:103 |
+| Log4jJndiInjectionTest.java:144:35:144:42 | source(...) : String | Log4jJndiInjectionTest.java:144:26:144:42 | (...)... | provenance | Sink:MaD:104 |
+| Log4jJndiInjectionTest.java:144:35:144:42 | source(...) : String | Log4jJndiInjectionTest.java:144:26:144:42 | (...)... | provenance | Sink:MaD:103 |
+| Log4jJndiInjectionTest.java:145:155:145:162 | source(...) : String | Log4jJndiInjectionTest.java:145:146:145:162 | (...)... | provenance | Sink:MaD:106 |
+| Log4jJndiInjectionTest.java:145:155:145:162 | source(...) : String | Log4jJndiInjectionTest.java:145:146:145:162 | (...)... | provenance | Sink:MaD:105 |
+| Log4jJndiInjectionTest.java:146:140:146:147 | source(...) : String | Log4jJndiInjectionTest.java:146:131:146:147 | (...)... | provenance | Sink:MaD:106 |
+| Log4jJndiInjectionTest.java:146:140:146:147 | source(...) : String | Log4jJndiInjectionTest.java:146:131:146:147 | (...)... | provenance | Sink:MaD:105 |
+| Log4jJndiInjectionTest.java:147:125:147:132 | source(...) : String | Log4jJndiInjectionTest.java:147:116:147:132 | (...)... | provenance | Sink:MaD:106 |
+| Log4jJndiInjectionTest.java:147:125:147:132 | source(...) : String | Log4jJndiInjectionTest.java:147:116:147:132 | (...)... | provenance | Sink:MaD:105 |
+| Log4jJndiInjectionTest.java:148:110:148:117 | source(...) : String | Log4jJndiInjectionTest.java:148:101:148:117 | (...)... | provenance | Sink:MaD:106 |
+| Log4jJndiInjectionTest.java:148:110:148:117 | source(...) : String | Log4jJndiInjectionTest.java:148:101:148:117 | (...)... | provenance | Sink:MaD:105 |
+| Log4jJndiInjectionTest.java:149:95:149:102 | source(...) : String | Log4jJndiInjectionTest.java:149:86:149:102 | (...)... | provenance | Sink:MaD:106 |
+| Log4jJndiInjectionTest.java:149:95:149:102 | source(...) : String | Log4jJndiInjectionTest.java:149:86:149:102 | (...)... | provenance | Sink:MaD:105 |
+| Log4jJndiInjectionTest.java:150:80:150:87 | source(...) : String | Log4jJndiInjectionTest.java:150:71:150:87 | (...)... | provenance | Sink:MaD:106 |
+| Log4jJndiInjectionTest.java:150:80:150:87 | source(...) : String | Log4jJndiInjectionTest.java:150:71:150:87 | (...)... | provenance | Sink:MaD:105 |
+| Log4jJndiInjectionTest.java:151:65:151:72 | source(...) : String | Log4jJndiInjectionTest.java:151:56:151:72 | (...)... | provenance | Sink:MaD:106 |
+| Log4jJndiInjectionTest.java:151:65:151:72 | source(...) : String | Log4jJndiInjectionTest.java:151:56:151:72 | (...)... | provenance | Sink:MaD:105 |
+| Log4jJndiInjectionTest.java:152:50:152:57 | source(...) : String | Log4jJndiInjectionTest.java:152:41:152:57 | (...)... | provenance | Sink:MaD:106 |
+| Log4jJndiInjectionTest.java:152:50:152:57 | source(...) : String | Log4jJndiInjectionTest.java:152:41:152:57 | (...)... | provenance | Sink:MaD:105 |
+| Log4jJndiInjectionTest.java:153:35:153:42 | source(...) : String | Log4jJndiInjectionTest.java:153:26:153:42 | (...)... | provenance | Sink:MaD:106 |
+| Log4jJndiInjectionTest.java:153:35:153:42 | source(...) : String | Log4jJndiInjectionTest.java:153:26:153:42 | (...)... | provenance | Sink:MaD:105 |
+| Log4jJndiInjectionTest.java:154:170:154:177 | source(...) : String | Log4jJndiInjectionTest.java:154:161:154:177 | (...)... | provenance | Sink:MaD:108 |
+| Log4jJndiInjectionTest.java:154:170:154:177 | source(...) : String | Log4jJndiInjectionTest.java:154:161:154:177 | (...)... | provenance | Sink:MaD:107 |
+| Log4jJndiInjectionTest.java:155:155:155:162 | source(...) : String | Log4jJndiInjectionTest.java:155:146:155:162 | (...)... | provenance | Sink:MaD:108 |
+| Log4jJndiInjectionTest.java:155:155:155:162 | source(...) : String | Log4jJndiInjectionTest.java:155:146:155:162 | (...)... | provenance | Sink:MaD:107 |
+| Log4jJndiInjectionTest.java:156:140:156:147 | source(...) : String | Log4jJndiInjectionTest.java:156:131:156:147 | (...)... | provenance | Sink:MaD:108 |
+| Log4jJndiInjectionTest.java:156:140:156:147 | source(...) : String | Log4jJndiInjectionTest.java:156:131:156:147 | (...)... | provenance | Sink:MaD:107 |
+| Log4jJndiInjectionTest.java:157:125:157:132 | source(...) : String | Log4jJndiInjectionTest.java:157:116:157:132 | (...)... | provenance | Sink:MaD:108 |
+| Log4jJndiInjectionTest.java:157:125:157:132 | source(...) : String | Log4jJndiInjectionTest.java:157:116:157:132 | (...)... | provenance | Sink:MaD:107 |
+| Log4jJndiInjectionTest.java:158:110:158:117 | source(...) : String | Log4jJndiInjectionTest.java:158:101:158:117 | (...)... | provenance | Sink:MaD:108 |
+| Log4jJndiInjectionTest.java:158:110:158:117 | source(...) : String | Log4jJndiInjectionTest.java:158:101:158:117 | (...)... | provenance | Sink:MaD:107 |
+| Log4jJndiInjectionTest.java:159:95:159:102 | source(...) : String | Log4jJndiInjectionTest.java:159:86:159:102 | (...)... | provenance | Sink:MaD:108 |
+| Log4jJndiInjectionTest.java:159:95:159:102 | source(...) : String | Log4jJndiInjectionTest.java:159:86:159:102 | (...)... | provenance | Sink:MaD:107 |
+| Log4jJndiInjectionTest.java:160:80:160:87 | source(...) : String | Log4jJndiInjectionTest.java:160:71:160:87 | (...)... | provenance | Sink:MaD:108 |
+| Log4jJndiInjectionTest.java:160:80:160:87 | source(...) : String | Log4jJndiInjectionTest.java:160:71:160:87 | (...)... | provenance | Sink:MaD:107 |
+| Log4jJndiInjectionTest.java:161:65:161:72 | source(...) : String | Log4jJndiInjectionTest.java:161:56:161:72 | (...)... | provenance | Sink:MaD:108 |
+| Log4jJndiInjectionTest.java:161:65:161:72 | source(...) : String | Log4jJndiInjectionTest.java:161:56:161:72 | (...)... | provenance | Sink:MaD:107 |
+| Log4jJndiInjectionTest.java:162:50:162:57 | source(...) : String | Log4jJndiInjectionTest.java:162:41:162:57 | (...)... | provenance | Sink:MaD:108 |
+| Log4jJndiInjectionTest.java:162:50:162:57 | source(...) : String | Log4jJndiInjectionTest.java:162:41:162:57 | (...)... | provenance | Sink:MaD:107 |
+| Log4jJndiInjectionTest.java:163:35:163:42 | source(...) : String | Log4jJndiInjectionTest.java:163:26:163:42 | (...)... | provenance | Sink:MaD:108 |
+| Log4jJndiInjectionTest.java:163:35:163:42 | source(...) : String | Log4jJndiInjectionTest.java:163:26:163:42 | (...)... | provenance | Sink:MaD:107 |
+| Log4jJndiInjectionTest.java:164:35:164:42 | source(...) : String | Log4jJndiInjectionTest.java:164:26:164:42 | (...)... | provenance | Sink:MaD:92 |
+| Log4jJndiInjectionTest.java:164:35:164:42 | source(...) : String | Log4jJndiInjectionTest.java:164:26:164:42 | (...)... | provenance | Sink:MaD:91 |
+| Log4jJndiInjectionTest.java:165:55:165:62 | source(...) : String | Log4jJndiInjectionTest.java:165:41:165:62 | (...)... | provenance | Sink:MaD:92 |
+| Log4jJndiInjectionTest.java:165:55:165:62 | source(...) : String | Log4jJndiInjectionTest.java:165:41:165:62 | (...)... | provenance | Sink:MaD:91 |
+| Log4jJndiInjectionTest.java:166:35:166:42 | source(...) : String | Log4jJndiInjectionTest.java:166:26:166:42 | (...)... | provenance | Sink:MaD:112 |
+| Log4jJndiInjectionTest.java:166:35:166:42 | source(...) : String | Log4jJndiInjectionTest.java:166:26:166:42 | (...)... | provenance | Sink:MaD:111 |
+| Log4jJndiInjectionTest.java:167:40:167:47 | source(...) : String | Log4jJndiInjectionTest.java:167:26:167:47 | (...)... | provenance | Sink:MaD:114 |
+| Log4jJndiInjectionTest.java:167:40:167:47 | source(...) : String | Log4jJndiInjectionTest.java:167:26:167:47 | (...)... | provenance | Sink:MaD:113 |
+| Log4jJndiInjectionTest.java:168:40:168:47 | source(...) : String | Log4jJndiInjectionTest.java:168:26:168:47 | (...)... | provenance | Sink:MaD:116 |
+| Log4jJndiInjectionTest.java:168:40:168:47 | source(...) : String | Log4jJndiInjectionTest.java:168:26:168:47 | (...)... | provenance | Sink:MaD:115 |
+| Log4jJndiInjectionTest.java:169:41:169:48 | source(...) : String | Log4jJndiInjectionTest.java:169:26:169:48 | (...)... | provenance | Sink:MaD:118 |
+| Log4jJndiInjectionTest.java:169:41:169:48 | source(...) : String | Log4jJndiInjectionTest.java:169:26:169:48 | (...)... | provenance | Sink:MaD:117 |
+| Log4jJndiInjectionTest.java:170:41:170:48 | source(...) : String | Log4jJndiInjectionTest.java:170:26:170:48 | (...)... | provenance | Sink:MaD:120 |
+| Log4jJndiInjectionTest.java:170:41:170:48 | source(...) : String | Log4jJndiInjectionTest.java:170:26:170:48 | (...)... | provenance | Sink:MaD:119 |
+| Log4jJndiInjectionTest.java:171:56:171:63 | source(...) : String | Log4jJndiInjectionTest.java:171:41:171:63 | (...)... | provenance | Sink:MaD:122 |
+| Log4jJndiInjectionTest.java:171:56:171:63 | source(...) : String | Log4jJndiInjectionTest.java:171:41:171:63 | (...)... | provenance | Sink:MaD:121 |
+| Log4jJndiInjectionTest.java:172:56:172:63 | source(...) : String | Log4jJndiInjectionTest.java:172:41:172:63 | (...)... | provenance | Sink:MaD:124 |
+| Log4jJndiInjectionTest.java:172:56:172:63 | source(...) : String | Log4jJndiInjectionTest.java:172:41:172:63 | (...)... | provenance | Sink:MaD:123 |
+| Log4jJndiInjectionTest.java:173:51:173:58 | source(...) : String | Log4jJndiInjectionTest.java:173:41:173:58 | (...)... | provenance | Sink:MaD:126 |
+| Log4jJndiInjectionTest.java:173:51:173:58 | source(...) : String | Log4jJndiInjectionTest.java:173:41:173:58 | (...)... | provenance | Sink:MaD:125 |
+| Log4jJndiInjectionTest.java:174:59:174:66 | source(...) : String | Log4jJndiInjectionTest.java:174:41:174:66 | (...)... | provenance | Sink:MaD:128 |
+| Log4jJndiInjectionTest.java:174:59:174:66 | source(...) : String | Log4jJndiInjectionTest.java:174:41:174:66 | (...)... | provenance | Sink:MaD:127 |
+| Log4jJndiInjectionTest.java:175:59:175:66 | source(...) : String | Log4jJndiInjectionTest.java:175:41:175:66 | (...)... | provenance | Sink:MaD:130 |
+| Log4jJndiInjectionTest.java:175:59:175:66 | source(...) : String | Log4jJndiInjectionTest.java:175:41:175:66 | (...)... | provenance | Sink:MaD:129 |
+| Log4jJndiInjectionTest.java:177:50:177:57 | source(...) : String | Log4jJndiInjectionTest.java:177:41:177:57 | (...)... | provenance | Sink:MaD:134 |
+| Log4jJndiInjectionTest.java:177:50:177:57 | source(...) : String | Log4jJndiInjectionTest.java:177:41:177:57 | (...)... | provenance | Sink:MaD:133 |
+| Log4jJndiInjectionTest.java:178:50:178:57 | source(...) : String | Log4jJndiInjectionTest.java:178:41:178:57 | (...)... | provenance | Sink:MaD:154 |
+| Log4jJndiInjectionTest.java:178:50:178:57 | source(...) : String | Log4jJndiInjectionTest.java:178:41:178:57 | (...)... | provenance | Sink:MaD:153 |
+| Log4jJndiInjectionTest.java:179:56:179:78 | {...} : Object[] [[]] : String | Log4jJndiInjectionTest.java:179:56:179:78 | new Object[] | provenance | Sink:MaD:154 |
+| Log4jJndiInjectionTest.java:179:56:179:78 | {...} : Object[] [[]] : String | Log4jJndiInjectionTest.java:179:56:179:78 | new Object[] | provenance | Sink:MaD:153 |
 | Log4jJndiInjectionTest.java:179:70:179:77 | source(...) : String | Log4jJndiInjectionTest.java:179:56:179:78 | {...} : Object[] [[]] : String | provenance |  |
-| Log4jJndiInjectionTest.java:180:65:180:72 | source(...) : String | Log4jJndiInjectionTest.java:180:56:180:72 | (...)... | provenance |  Sink:MaD:74 |
-| Log4jJndiInjectionTest.java:180:65:180:72 | source(...) : String | Log4jJndiInjectionTest.java:180:56:180:72 | (...)... | provenance |  Sink:MaD:390 |
-| Log4jJndiInjectionTest.java:181:50:181:57 | source(...) : String | Log4jJndiInjectionTest.java:181:41:181:57 | (...)... | provenance |  Sink:MaD:74 |
-| Log4jJndiInjectionTest.java:181:50:181:57 | source(...) : String | Log4jJndiInjectionTest.java:181:41:181:57 | (...)... | provenance |  Sink:MaD:390 |
-| Log4jJndiInjectionTest.java:182:80:182:87 | source(...) : String | Log4jJndiInjectionTest.java:182:71:182:87 | (...)... | provenance |  Sink:MaD:75 |
-| Log4jJndiInjectionTest.java:182:80:182:87 | source(...) : String | Log4jJndiInjectionTest.java:182:71:182:87 | (...)... | provenance |  Sink:MaD:391 |
-| Log4jJndiInjectionTest.java:183:65:183:72 | source(...) : String | Log4jJndiInjectionTest.java:183:56:183:72 | (...)... | provenance |  Sink:MaD:75 |
-| Log4jJndiInjectionTest.java:183:65:183:72 | source(...) : String | Log4jJndiInjectionTest.java:183:56:183:72 | (...)... | provenance |  Sink:MaD:391 |
-| Log4jJndiInjectionTest.java:184:50:184:57 | source(...) : String | Log4jJndiInjectionTest.java:184:41:184:57 | (...)... | provenance |  Sink:MaD:75 |
-| Log4jJndiInjectionTest.java:184:50:184:57 | source(...) : String | Log4jJndiInjectionTest.java:184:41:184:57 | (...)... | provenance |  Sink:MaD:391 |
-| Log4jJndiInjectionTest.java:185:95:185:102 | source(...) : String | Log4jJndiInjectionTest.java:185:86:185:102 | (...)... | provenance |  Sink:MaD:76 |
-| Log4jJndiInjectionTest.java:185:95:185:102 | source(...) : String | Log4jJndiInjectionTest.java:185:86:185:102 | (...)... | provenance |  Sink:MaD:392 |
-| Log4jJndiInjectionTest.java:186:80:186:87 | source(...) : String | Log4jJndiInjectionTest.java:186:71:186:87 | (...)... | provenance |  Sink:MaD:76 |
-| Log4jJndiInjectionTest.java:186:80:186:87 | source(...) : String | Log4jJndiInjectionTest.java:186:71:186:87 | (...)... | provenance |  Sink:MaD:392 |
-| Log4jJndiInjectionTest.java:187:65:187:72 | source(...) : String | Log4jJndiInjectionTest.java:187:56:187:72 | (...)... | provenance |  Sink:MaD:76 |
-| Log4jJndiInjectionTest.java:187:65:187:72 | source(...) : String | Log4jJndiInjectionTest.java:187:56:187:72 | (...)... | provenance |  Sink:MaD:392 |
-| Log4jJndiInjectionTest.java:188:50:188:57 | source(...) : String | Log4jJndiInjectionTest.java:188:41:188:57 | (...)... | provenance |  Sink:MaD:76 |
-| Log4jJndiInjectionTest.java:188:50:188:57 | source(...) : String | Log4jJndiInjectionTest.java:188:41:188:57 | (...)... | provenance |  Sink:MaD:392 |
-| Log4jJndiInjectionTest.java:189:110:189:117 | source(...) : String | Log4jJndiInjectionTest.java:189:101:189:117 | (...)... | provenance |  Sink:MaD:77 |
-| Log4jJndiInjectionTest.java:189:110:189:117 | source(...) : String | Log4jJndiInjectionTest.java:189:101:189:117 | (...)... | provenance |  Sink:MaD:393 |
-| Log4jJndiInjectionTest.java:190:95:190:102 | source(...) : String | Log4jJndiInjectionTest.java:190:86:190:102 | (...)... | provenance |  Sink:MaD:77 |
-| Log4jJndiInjectionTest.java:190:95:190:102 | source(...) : String | Log4jJndiInjectionTest.java:190:86:190:102 | (...)... | provenance |  Sink:MaD:393 |
-| Log4jJndiInjectionTest.java:191:80:191:87 | source(...) : String | Log4jJndiInjectionTest.java:191:71:191:87 | (...)... | provenance |  Sink:MaD:77 |
-| Log4jJndiInjectionTest.java:191:80:191:87 | source(...) : String | Log4jJndiInjectionTest.java:191:71:191:87 | (...)... | provenance |  Sink:MaD:393 |
-| Log4jJndiInjectionTest.java:192:65:192:72 | source(...) : String | Log4jJndiInjectionTest.java:192:56:192:72 | (...)... | provenance |  Sink:MaD:77 |
-| Log4jJndiInjectionTest.java:192:65:192:72 | source(...) : String | Log4jJndiInjectionTest.java:192:56:192:72 | (...)... | provenance |  Sink:MaD:393 |
-| Log4jJndiInjectionTest.java:193:50:193:57 | source(...) : String | Log4jJndiInjectionTest.java:193:41:193:57 | (...)... | provenance |  Sink:MaD:77 |
-| Log4jJndiInjectionTest.java:193:50:193:57 | source(...) : String | Log4jJndiInjectionTest.java:193:41:193:57 | (...)... | provenance |  Sink:MaD:393 |
-| Log4jJndiInjectionTest.java:194:125:194:132 | source(...) : String | Log4jJndiInjectionTest.java:194:116:194:132 | (...)... | provenance |  Sink:MaD:78 |
-| Log4jJndiInjectionTest.java:194:125:194:132 | source(...) : String | Log4jJndiInjectionTest.java:194:116:194:132 | (...)... | provenance |  Sink:MaD:394 |
-| Log4jJndiInjectionTest.java:195:110:195:117 | source(...) : String | Log4jJndiInjectionTest.java:195:101:195:117 | (...)... | provenance |  Sink:MaD:78 |
-| Log4jJndiInjectionTest.java:195:110:195:117 | source(...) : String | Log4jJndiInjectionTest.java:195:101:195:117 | (...)... | provenance |  Sink:MaD:394 |
-| Log4jJndiInjectionTest.java:196:95:196:102 | source(...) : String | Log4jJndiInjectionTest.java:196:86:196:102 | (...)... | provenance |  Sink:MaD:78 |
-| Log4jJndiInjectionTest.java:196:95:196:102 | source(...) : String | Log4jJndiInjectionTest.java:196:86:196:102 | (...)... | provenance |  Sink:MaD:394 |
-| Log4jJndiInjectionTest.java:197:80:197:87 | source(...) : String | Log4jJndiInjectionTest.java:197:71:197:87 | (...)... | provenance |  Sink:MaD:78 |
-| Log4jJndiInjectionTest.java:197:80:197:87 | source(...) : String | Log4jJndiInjectionTest.java:197:71:197:87 | (...)... | provenance |  Sink:MaD:394 |
-| Log4jJndiInjectionTest.java:198:65:198:72 | source(...) : String | Log4jJndiInjectionTest.java:198:56:198:72 | (...)... | provenance |  Sink:MaD:78 |
-| Log4jJndiInjectionTest.java:198:65:198:72 | source(...) : String | Log4jJndiInjectionTest.java:198:56:198:72 | (...)... | provenance |  Sink:MaD:394 |
-| Log4jJndiInjectionTest.java:199:50:199:57 | source(...) : String | Log4jJndiInjectionTest.java:199:41:199:57 | (...)... | provenance |  Sink:MaD:78 |
-| Log4jJndiInjectionTest.java:199:50:199:57 | source(...) : String | Log4jJndiInjectionTest.java:199:41:199:57 | (...)... | provenance |  Sink:MaD:394 |
-| Log4jJndiInjectionTest.java:200:140:200:147 | source(...) : String | Log4jJndiInjectionTest.java:200:131:200:147 | (...)... | provenance |  Sink:MaD:79 |
-| Log4jJndiInjectionTest.java:200:140:200:147 | source(...) : String | Log4jJndiInjectionTest.java:200:131:200:147 | (...)... | provenance |  Sink:MaD:395 |
-| Log4jJndiInjectionTest.java:201:125:201:132 | source(...) : String | Log4jJndiInjectionTest.java:201:116:201:132 | (...)... | provenance |  Sink:MaD:79 |
-| Log4jJndiInjectionTest.java:201:125:201:132 | source(...) : String | Log4jJndiInjectionTest.java:201:116:201:132 | (...)... | provenance |  Sink:MaD:395 |
-| Log4jJndiInjectionTest.java:202:110:202:117 | source(...) : String | Log4jJndiInjectionTest.java:202:101:202:117 | (...)... | provenance |  Sink:MaD:79 |
-| Log4jJndiInjectionTest.java:202:110:202:117 | source(...) : String | Log4jJndiInjectionTest.java:202:101:202:117 | (...)... | provenance |  Sink:MaD:395 |
-| Log4jJndiInjectionTest.java:203:95:203:102 | source(...) : String | Log4jJndiInjectionTest.java:203:86:203:102 | (...)... | provenance |  Sink:MaD:79 |
-| Log4jJndiInjectionTest.java:203:95:203:102 | source(...) : String | Log4jJndiInjectionTest.java:203:86:203:102 | (...)... | provenance |  Sink:MaD:395 |
-| Log4jJndiInjectionTest.java:204:80:204:87 | source(...) : String | Log4jJndiInjectionTest.java:204:71:204:87 | (...)... | provenance |  Sink:MaD:79 |
-| Log4jJndiInjectionTest.java:204:80:204:87 | source(...) : String | Log4jJndiInjectionTest.java:204:71:204:87 | (...)... | provenance |  Sink:MaD:395 |
-| Log4jJndiInjectionTest.java:205:65:205:72 | source(...) : String | Log4jJndiInjectionTest.java:205:56:205:72 | (...)... | provenance |  Sink:MaD:79 |
-| Log4jJndiInjectionTest.java:205:65:205:72 | source(...) : String | Log4jJndiInjectionTest.java:205:56:205:72 | (...)... | provenance |  Sink:MaD:395 |
-| Log4jJndiInjectionTest.java:206:50:206:57 | source(...) : String | Log4jJndiInjectionTest.java:206:41:206:57 | (...)... | provenance |  Sink:MaD:79 |
-| Log4jJndiInjectionTest.java:206:50:206:57 | source(...) : String | Log4jJndiInjectionTest.java:206:41:206:57 | (...)... | provenance |  Sink:MaD:395 |
-| Log4jJndiInjectionTest.java:207:155:207:162 | source(...) : String | Log4jJndiInjectionTest.java:207:146:207:162 | (...)... | provenance |  Sink:MaD:80 |
-| Log4jJndiInjectionTest.java:207:155:207:162 | source(...) : String | Log4jJndiInjectionTest.java:207:146:207:162 | (...)... | provenance |  Sink:MaD:396 |
-| Log4jJndiInjectionTest.java:208:140:208:147 | source(...) : String | Log4jJndiInjectionTest.java:208:131:208:147 | (...)... | provenance |  Sink:MaD:80 |
-| Log4jJndiInjectionTest.java:208:140:208:147 | source(...) : String | Log4jJndiInjectionTest.java:208:131:208:147 | (...)... | provenance |  Sink:MaD:396 |
-| Log4jJndiInjectionTest.java:209:125:209:132 | source(...) : String | Log4jJndiInjectionTest.java:209:116:209:132 | (...)... | provenance |  Sink:MaD:80 |
-| Log4jJndiInjectionTest.java:209:125:209:132 | source(...) : String | Log4jJndiInjectionTest.java:209:116:209:132 | (...)... | provenance |  Sink:MaD:396 |
-| Log4jJndiInjectionTest.java:210:110:210:117 | source(...) : String | Log4jJndiInjectionTest.java:210:101:210:117 | (...)... | provenance |  Sink:MaD:80 |
-| Log4jJndiInjectionTest.java:210:110:210:117 | source(...) : String | Log4jJndiInjectionTest.java:210:101:210:117 | (...)... | provenance |  Sink:MaD:396 |
-| Log4jJndiInjectionTest.java:211:95:211:102 | source(...) : String | Log4jJndiInjectionTest.java:211:86:211:102 | (...)... | provenance |  Sink:MaD:80 |
-| Log4jJndiInjectionTest.java:211:95:211:102 | source(...) : String | Log4jJndiInjectionTest.java:211:86:211:102 | (...)... | provenance |  Sink:MaD:396 |
-| Log4jJndiInjectionTest.java:212:80:212:87 | source(...) : String | Log4jJndiInjectionTest.java:212:71:212:87 | (...)... | provenance |  Sink:MaD:80 |
-| Log4jJndiInjectionTest.java:212:80:212:87 | source(...) : String | Log4jJndiInjectionTest.java:212:71:212:87 | (...)... | provenance |  Sink:MaD:396 |
-| Log4jJndiInjectionTest.java:213:65:213:72 | source(...) : String | Log4jJndiInjectionTest.java:213:56:213:72 | (...)... | provenance |  Sink:MaD:80 |
-| Log4jJndiInjectionTest.java:213:65:213:72 | source(...) : String | Log4jJndiInjectionTest.java:213:56:213:72 | (...)... | provenance |  Sink:MaD:396 |
-| Log4jJndiInjectionTest.java:214:50:214:57 | source(...) : String | Log4jJndiInjectionTest.java:214:41:214:57 | (...)... | provenance |  Sink:MaD:80 |
-| Log4jJndiInjectionTest.java:214:50:214:57 | source(...) : String | Log4jJndiInjectionTest.java:214:41:214:57 | (...)... | provenance |  Sink:MaD:396 |
-| Log4jJndiInjectionTest.java:215:170:215:177 | source(...) : String | Log4jJndiInjectionTest.java:215:161:215:177 | (...)... | provenance |  Sink:MaD:81 |
-| Log4jJndiInjectionTest.java:215:170:215:177 | source(...) : String | Log4jJndiInjectionTest.java:215:161:215:177 | (...)... | provenance |  Sink:MaD:397 |
-| Log4jJndiInjectionTest.java:216:155:216:162 | source(...) : String | Log4jJndiInjectionTest.java:216:146:216:162 | (...)... | provenance |  Sink:MaD:81 |
-| Log4jJndiInjectionTest.java:216:155:216:162 | source(...) : String | Log4jJndiInjectionTest.java:216:146:216:162 | (...)... | provenance |  Sink:MaD:397 |
-| Log4jJndiInjectionTest.java:217:140:217:147 | source(...) : String | Log4jJndiInjectionTest.java:217:131:217:147 | (...)... | provenance |  Sink:MaD:81 |
-| Log4jJndiInjectionTest.java:217:140:217:147 | source(...) : String | Log4jJndiInjectionTest.java:217:131:217:147 | (...)... | provenance |  Sink:MaD:397 |
-| Log4jJndiInjectionTest.java:218:125:218:132 | source(...) : String | Log4jJndiInjectionTest.java:218:116:218:132 | (...)... | provenance |  Sink:MaD:81 |
-| Log4jJndiInjectionTest.java:218:125:218:132 | source(...) : String | Log4jJndiInjectionTest.java:218:116:218:132 | (...)... | provenance |  Sink:MaD:397 |
-| Log4jJndiInjectionTest.java:219:110:219:117 | source(...) : String | Log4jJndiInjectionTest.java:219:101:219:117 | (...)... | provenance |  Sink:MaD:81 |
-| Log4jJndiInjectionTest.java:219:110:219:117 | source(...) : String | Log4jJndiInjectionTest.java:219:101:219:117 | (...)... | provenance |  Sink:MaD:397 |
-| Log4jJndiInjectionTest.java:220:95:220:102 | source(...) : String | Log4jJndiInjectionTest.java:220:86:220:102 | (...)... | provenance |  Sink:MaD:81 |
-| Log4jJndiInjectionTest.java:220:95:220:102 | source(...) : String | Log4jJndiInjectionTest.java:220:86:220:102 | (...)... | provenance |  Sink:MaD:397 |
-| Log4jJndiInjectionTest.java:221:80:221:87 | source(...) : String | Log4jJndiInjectionTest.java:221:71:221:87 | (...)... | provenance |  Sink:MaD:81 |
-| Log4jJndiInjectionTest.java:221:80:221:87 | source(...) : String | Log4jJndiInjectionTest.java:221:71:221:87 | (...)... | provenance |  Sink:MaD:397 |
-| Log4jJndiInjectionTest.java:222:65:222:72 | source(...) : String | Log4jJndiInjectionTest.java:222:56:222:72 | (...)... | provenance |  Sink:MaD:81 |
-| Log4jJndiInjectionTest.java:222:65:222:72 | source(...) : String | Log4jJndiInjectionTest.java:222:56:222:72 | (...)... | provenance |  Sink:MaD:397 |
-| Log4jJndiInjectionTest.java:223:50:223:57 | source(...) : String | Log4jJndiInjectionTest.java:223:41:223:57 | (...)... | provenance |  Sink:MaD:81 |
-| Log4jJndiInjectionTest.java:223:50:223:57 | source(...) : String | Log4jJndiInjectionTest.java:223:41:223:57 | (...)... | provenance |  Sink:MaD:397 |
-| Log4jJndiInjectionTest.java:224:185:224:192 | source(...) : String | Log4jJndiInjectionTest.java:224:176:224:192 | (...)... | provenance |  Sink:MaD:82 |
-| Log4jJndiInjectionTest.java:224:185:224:192 | source(...) : String | Log4jJndiInjectionTest.java:224:176:224:192 | (...)... | provenance |  Sink:MaD:398 |
-| Log4jJndiInjectionTest.java:225:170:225:177 | source(...) : String | Log4jJndiInjectionTest.java:225:161:225:177 | (...)... | provenance |  Sink:MaD:82 |
-| Log4jJndiInjectionTest.java:225:170:225:177 | source(...) : String | Log4jJndiInjectionTest.java:225:161:225:177 | (...)... | provenance |  Sink:MaD:398 |
-| Log4jJndiInjectionTest.java:226:155:226:162 | source(...) : String | Log4jJndiInjectionTest.java:226:146:226:162 | (...)... | provenance |  Sink:MaD:82 |
-| Log4jJndiInjectionTest.java:226:155:226:162 | source(...) : String | Log4jJndiInjectionTest.java:226:146:226:162 | (...)... | provenance |  Sink:MaD:398 |
-| Log4jJndiInjectionTest.java:227:140:227:147 | source(...) : String | Log4jJndiInjectionTest.java:227:131:227:147 | (...)... | provenance |  Sink:MaD:82 |
-| Log4jJndiInjectionTest.java:227:140:227:147 | source(...) : String | Log4jJndiInjectionTest.java:227:131:227:147 | (...)... | provenance |  Sink:MaD:398 |
-| Log4jJndiInjectionTest.java:228:125:228:132 | source(...) : String | Log4jJndiInjectionTest.java:228:116:228:132 | (...)... | provenance |  Sink:MaD:82 |
-| Log4jJndiInjectionTest.java:228:125:228:132 | source(...) : String | Log4jJndiInjectionTest.java:228:116:228:132 | (...)... | provenance |  Sink:MaD:398 |
-| Log4jJndiInjectionTest.java:229:110:229:117 | source(...) : String | Log4jJndiInjectionTest.java:229:101:229:117 | (...)... | provenance |  Sink:MaD:82 |
-| Log4jJndiInjectionTest.java:229:110:229:117 | source(...) : String | Log4jJndiInjectionTest.java:229:101:229:117 | (...)... | provenance |  Sink:MaD:398 |
-| Log4jJndiInjectionTest.java:230:95:230:102 | source(...) : String | Log4jJndiInjectionTest.java:230:86:230:102 | (...)... | provenance |  Sink:MaD:82 |
-| Log4jJndiInjectionTest.java:230:95:230:102 | source(...) : String | Log4jJndiInjectionTest.java:230:86:230:102 | (...)... | provenance |  Sink:MaD:398 |
-| Log4jJndiInjectionTest.java:231:80:231:87 | source(...) : String | Log4jJndiInjectionTest.java:231:71:231:87 | (...)... | provenance |  Sink:MaD:82 |
-| Log4jJndiInjectionTest.java:231:80:231:87 | source(...) : String | Log4jJndiInjectionTest.java:231:71:231:87 | (...)... | provenance |  Sink:MaD:398 |
-| Log4jJndiInjectionTest.java:232:65:232:72 | source(...) : String | Log4jJndiInjectionTest.java:232:56:232:72 | (...)... | provenance |  Sink:MaD:82 |
-| Log4jJndiInjectionTest.java:232:65:232:72 | source(...) : String | Log4jJndiInjectionTest.java:232:56:232:72 | (...)... | provenance |  Sink:MaD:398 |
-| Log4jJndiInjectionTest.java:233:50:233:57 | source(...) : String | Log4jJndiInjectionTest.java:233:41:233:57 | (...)... | provenance |  Sink:MaD:82 |
-| Log4jJndiInjectionTest.java:233:50:233:57 | source(...) : String | Log4jJndiInjectionTest.java:233:41:233:57 | (...)... | provenance |  Sink:MaD:398 |
-| Log4jJndiInjectionTest.java:234:50:234:57 | source(...) : String | Log4jJndiInjectionTest.java:234:41:234:57 | (...)... | provenance |  Sink:MaD:74 |
-| Log4jJndiInjectionTest.java:234:50:234:57 | source(...) : String | Log4jJndiInjectionTest.java:234:41:234:57 | (...)... | provenance |  Sink:MaD:390 |
-| Log4jJndiInjectionTest.java:235:70:235:77 | source(...) : String | Log4jJndiInjectionTest.java:235:56:235:77 | (...)... | provenance |  Sink:MaD:74 |
-| Log4jJndiInjectionTest.java:235:70:235:77 | source(...) : String | Log4jJndiInjectionTest.java:235:56:235:77 | (...)... | provenance |  Sink:MaD:390 |
-| Log4jJndiInjectionTest.java:236:50:236:57 | source(...) : String | Log4jJndiInjectionTest.java:236:41:236:57 | (...)... | provenance |  Sink:MaD:84 |
-| Log4jJndiInjectionTest.java:236:50:236:57 | source(...) : String | Log4jJndiInjectionTest.java:236:41:236:57 | (...)... | provenance |  Sink:MaD:400 |
-| Log4jJndiInjectionTest.java:237:55:237:62 | source(...) : String | Log4jJndiInjectionTest.java:237:41:237:62 | (...)... | provenance |  Sink:MaD:85 |
-| Log4jJndiInjectionTest.java:237:55:237:62 | source(...) : String | Log4jJndiInjectionTest.java:237:41:237:62 | (...)... | provenance |  Sink:MaD:401 |
-| Log4jJndiInjectionTest.java:238:55:238:62 | source(...) : String | Log4jJndiInjectionTest.java:238:41:238:62 | (...)... | provenance |  Sink:MaD:86 |
-| Log4jJndiInjectionTest.java:238:55:238:62 | source(...) : String | Log4jJndiInjectionTest.java:238:41:238:62 | (...)... | provenance |  Sink:MaD:402 |
-| Log4jJndiInjectionTest.java:239:44:239:51 | source(...) : String | Log4jJndiInjectionTest.java:239:26:239:51 | (...)... | provenance |  Sink:MaD:89 |
-| Log4jJndiInjectionTest.java:239:44:239:51 | source(...) : String | Log4jJndiInjectionTest.java:239:26:239:51 | (...)... | provenance |  Sink:MaD:405 |
-| Log4jJndiInjectionTest.java:240:44:240:51 | source(...) : String | Log4jJndiInjectionTest.java:240:26:240:51 | (...)... | provenance |  Sink:MaD:90 |
-| Log4jJndiInjectionTest.java:240:44:240:51 | source(...) : String | Log4jJndiInjectionTest.java:240:26:240:51 | (...)... | provenance |  Sink:MaD:406 |
-| Log4jJndiInjectionTest.java:241:36:241:43 | source(...) : String | Log4jJndiInjectionTest.java:241:26:241:43 | (...)... | provenance |  Sink:MaD:87 |
-| Log4jJndiInjectionTest.java:241:36:241:43 | source(...) : String | Log4jJndiInjectionTest.java:241:26:241:43 | (...)... | provenance |  Sink:MaD:403 |
-| Log4jJndiInjectionTest.java:242:36:242:43 | source(...) : String | Log4jJndiInjectionTest.java:242:26:242:43 | (...)... | provenance |  Sink:MaD:88 |
-| Log4jJndiInjectionTest.java:242:36:242:43 | source(...) : String | Log4jJndiInjectionTest.java:242:26:242:43 | (...)... | provenance |  Sink:MaD:404 |
-| Log4jJndiInjectionTest.java:245:35:245:42 | source(...) : String | Log4jJndiInjectionTest.java:245:26:245:42 | (...)... | provenance |  Sink:MaD:93 |
-| Log4jJndiInjectionTest.java:245:35:245:42 | source(...) : String | Log4jJndiInjectionTest.java:245:26:245:42 | (...)... | provenance |  Sink:MaD:409 |
-| Log4jJndiInjectionTest.java:246:35:246:42 | source(...) : String | Log4jJndiInjectionTest.java:246:26:246:42 | (...)... | provenance |  Sink:MaD:103 |
-| Log4jJndiInjectionTest.java:246:35:246:42 | source(...) : String | Log4jJndiInjectionTest.java:246:26:246:42 | (...)... | provenance |  Sink:MaD:419 |
-| Log4jJndiInjectionTest.java:247:41:247:63 | {...} : Object[] [[]] : String | Log4jJndiInjectionTest.java:247:41:247:63 | new Object[] | provenance |  Sink:MaD:103 |
-| Log4jJndiInjectionTest.java:247:41:247:63 | {...} : Object[] [[]] : String | Log4jJndiInjectionTest.java:247:41:247:63 | new Object[] | provenance |  Sink:MaD:419 |
+| Log4jJndiInjectionTest.java:180:65:180:72 | source(...) : String | Log4jJndiInjectionTest.java:180:56:180:72 | (...)... | provenance | Sink:MaD:136 |
+| Log4jJndiInjectionTest.java:180:65:180:72 | source(...) : String | Log4jJndiInjectionTest.java:180:56:180:72 | (...)... | provenance | Sink:MaD:135 |
+| Log4jJndiInjectionTest.java:181:50:181:57 | source(...) : String | Log4jJndiInjectionTest.java:181:41:181:57 | (...)... | provenance | Sink:MaD:136 |
+| Log4jJndiInjectionTest.java:181:50:181:57 | source(...) : String | Log4jJndiInjectionTest.java:181:41:181:57 | (...)... | provenance | Sink:MaD:135 |
+| Log4jJndiInjectionTest.java:182:80:182:87 | source(...) : String | Log4jJndiInjectionTest.java:182:71:182:87 | (...)... | provenance | Sink:MaD:138 |
+| Log4jJndiInjectionTest.java:182:80:182:87 | source(...) : String | Log4jJndiInjectionTest.java:182:71:182:87 | (...)... | provenance | Sink:MaD:137 |
+| Log4jJndiInjectionTest.java:183:65:183:72 | source(...) : String | Log4jJndiInjectionTest.java:183:56:183:72 | (...)... | provenance | Sink:MaD:138 |
+| Log4jJndiInjectionTest.java:183:65:183:72 | source(...) : String | Log4jJndiInjectionTest.java:183:56:183:72 | (...)... | provenance | Sink:MaD:137 |
+| Log4jJndiInjectionTest.java:184:50:184:57 | source(...) : String | Log4jJndiInjectionTest.java:184:41:184:57 | (...)... | provenance | Sink:MaD:138 |
+| Log4jJndiInjectionTest.java:184:50:184:57 | source(...) : String | Log4jJndiInjectionTest.java:184:41:184:57 | (...)... | provenance | Sink:MaD:137 |
+| Log4jJndiInjectionTest.java:185:95:185:102 | source(...) : String | Log4jJndiInjectionTest.java:185:86:185:102 | (...)... | provenance | Sink:MaD:140 |
+| Log4jJndiInjectionTest.java:185:95:185:102 | source(...) : String | Log4jJndiInjectionTest.java:185:86:185:102 | (...)... | provenance | Sink:MaD:139 |
+| Log4jJndiInjectionTest.java:186:80:186:87 | source(...) : String | Log4jJndiInjectionTest.java:186:71:186:87 | (...)... | provenance | Sink:MaD:140 |
+| Log4jJndiInjectionTest.java:186:80:186:87 | source(...) : String | Log4jJndiInjectionTest.java:186:71:186:87 | (...)... | provenance | Sink:MaD:139 |
+| Log4jJndiInjectionTest.java:187:65:187:72 | source(...) : String | Log4jJndiInjectionTest.java:187:56:187:72 | (...)... | provenance | Sink:MaD:140 |
+| Log4jJndiInjectionTest.java:187:65:187:72 | source(...) : String | Log4jJndiInjectionTest.java:187:56:187:72 | (...)... | provenance | Sink:MaD:139 |
+| Log4jJndiInjectionTest.java:188:50:188:57 | source(...) : String | Log4jJndiInjectionTest.java:188:41:188:57 | (...)... | provenance | Sink:MaD:140 |
+| Log4jJndiInjectionTest.java:188:50:188:57 | source(...) : String | Log4jJndiInjectionTest.java:188:41:188:57 | (...)... | provenance | Sink:MaD:139 |
+| Log4jJndiInjectionTest.java:189:110:189:117 | source(...) : String | Log4jJndiInjectionTest.java:189:101:189:117 | (...)... | provenance | Sink:MaD:142 |
+| Log4jJndiInjectionTest.java:189:110:189:117 | source(...) : String | Log4jJndiInjectionTest.java:189:101:189:117 | (...)... | provenance | Sink:MaD:141 |
+| Log4jJndiInjectionTest.java:190:95:190:102 | source(...) : String | Log4jJndiInjectionTest.java:190:86:190:102 | (...)... | provenance | Sink:MaD:142 |
+| Log4jJndiInjectionTest.java:190:95:190:102 | source(...) : String | Log4jJndiInjectionTest.java:190:86:190:102 | (...)... | provenance | Sink:MaD:141 |
+| Log4jJndiInjectionTest.java:191:80:191:87 | source(...) : String | Log4jJndiInjectionTest.java:191:71:191:87 | (...)... | provenance | Sink:MaD:142 |
+| Log4jJndiInjectionTest.java:191:80:191:87 | source(...) : String | Log4jJndiInjectionTest.java:191:71:191:87 | (...)... | provenance | Sink:MaD:141 |
+| Log4jJndiInjectionTest.java:192:65:192:72 | source(...) : String | Log4jJndiInjectionTest.java:192:56:192:72 | (...)... | provenance | Sink:MaD:142 |
+| Log4jJndiInjectionTest.java:192:65:192:72 | source(...) : String | Log4jJndiInjectionTest.java:192:56:192:72 | (...)... | provenance | Sink:MaD:141 |
+| Log4jJndiInjectionTest.java:193:50:193:57 | source(...) : String | Log4jJndiInjectionTest.java:193:41:193:57 | (...)... | provenance | Sink:MaD:142 |
+| Log4jJndiInjectionTest.java:193:50:193:57 | source(...) : String | Log4jJndiInjectionTest.java:193:41:193:57 | (...)... | provenance | Sink:MaD:141 |
+| Log4jJndiInjectionTest.java:194:125:194:132 | source(...) : String | Log4jJndiInjectionTest.java:194:116:194:132 | (...)... | provenance | Sink:MaD:144 |
+| Log4jJndiInjectionTest.java:194:125:194:132 | source(...) : String | Log4jJndiInjectionTest.java:194:116:194:132 | (...)... | provenance | Sink:MaD:143 |
+| Log4jJndiInjectionTest.java:195:110:195:117 | source(...) : String | Log4jJndiInjectionTest.java:195:101:195:117 | (...)... | provenance | Sink:MaD:144 |
+| Log4jJndiInjectionTest.java:195:110:195:117 | source(...) : String | Log4jJndiInjectionTest.java:195:101:195:117 | (...)... | provenance | Sink:MaD:143 |
+| Log4jJndiInjectionTest.java:196:95:196:102 | source(...) : String | Log4jJndiInjectionTest.java:196:86:196:102 | (...)... | provenance | Sink:MaD:144 |
+| Log4jJndiInjectionTest.java:196:95:196:102 | source(...) : String | Log4jJndiInjectionTest.java:196:86:196:102 | (...)... | provenance | Sink:MaD:143 |
+| Log4jJndiInjectionTest.java:197:80:197:87 | source(...) : String | Log4jJndiInjectionTest.java:197:71:197:87 | (...)... | provenance | Sink:MaD:144 |
+| Log4jJndiInjectionTest.java:197:80:197:87 | source(...) : String | Log4jJndiInjectionTest.java:197:71:197:87 | (...)... | provenance | Sink:MaD:143 |
+| Log4jJndiInjectionTest.java:198:65:198:72 | source(...) : String | Log4jJndiInjectionTest.java:198:56:198:72 | (...)... | provenance | Sink:MaD:144 |
+| Log4jJndiInjectionTest.java:198:65:198:72 | source(...) : String | Log4jJndiInjectionTest.java:198:56:198:72 | (...)... | provenance | Sink:MaD:143 |
+| Log4jJndiInjectionTest.java:199:50:199:57 | source(...) : String | Log4jJndiInjectionTest.java:199:41:199:57 | (...)... | provenance | Sink:MaD:144 |
+| Log4jJndiInjectionTest.java:199:50:199:57 | source(...) : String | Log4jJndiInjectionTest.java:199:41:199:57 | (...)... | provenance | Sink:MaD:143 |
+| Log4jJndiInjectionTest.java:200:140:200:147 | source(...) : String | Log4jJndiInjectionTest.java:200:131:200:147 | (...)... | provenance | Sink:MaD:146 |
+| Log4jJndiInjectionTest.java:200:140:200:147 | source(...) : String | Log4jJndiInjectionTest.java:200:131:200:147 | (...)... | provenance | Sink:MaD:145 |
+| Log4jJndiInjectionTest.java:201:125:201:132 | source(...) : String | Log4jJndiInjectionTest.java:201:116:201:132 | (...)... | provenance | Sink:MaD:146 |
+| Log4jJndiInjectionTest.java:201:125:201:132 | source(...) : String | Log4jJndiInjectionTest.java:201:116:201:132 | (...)... | provenance | Sink:MaD:145 |
+| Log4jJndiInjectionTest.java:202:110:202:117 | source(...) : String | Log4jJndiInjectionTest.java:202:101:202:117 | (...)... | provenance | Sink:MaD:146 |
+| Log4jJndiInjectionTest.java:202:110:202:117 | source(...) : String | Log4jJndiInjectionTest.java:202:101:202:117 | (...)... | provenance | Sink:MaD:145 |
+| Log4jJndiInjectionTest.java:203:95:203:102 | source(...) : String | Log4jJndiInjectionTest.java:203:86:203:102 | (...)... | provenance | Sink:MaD:146 |
+| Log4jJndiInjectionTest.java:203:95:203:102 | source(...) : String | Log4jJndiInjectionTest.java:203:86:203:102 | (...)... | provenance | Sink:MaD:145 |
+| Log4jJndiInjectionTest.java:204:80:204:87 | source(...) : String | Log4jJndiInjectionTest.java:204:71:204:87 | (...)... | provenance | Sink:MaD:146 |
+| Log4jJndiInjectionTest.java:204:80:204:87 | source(...) : String | Log4jJndiInjectionTest.java:204:71:204:87 | (...)... | provenance | Sink:MaD:145 |
+| Log4jJndiInjectionTest.java:205:65:205:72 | source(...) : String | Log4jJndiInjectionTest.java:205:56:205:72 | (...)... | provenance | Sink:MaD:146 |
+| Log4jJndiInjectionTest.java:205:65:205:72 | source(...) : String | Log4jJndiInjectionTest.java:205:56:205:72 | (...)... | provenance | Sink:MaD:145 |
+| Log4jJndiInjectionTest.java:206:50:206:57 | source(...) : String | Log4jJndiInjectionTest.java:206:41:206:57 | (...)... | provenance | Sink:MaD:146 |
+| Log4jJndiInjectionTest.java:206:50:206:57 | source(...) : String | Log4jJndiInjectionTest.java:206:41:206:57 | (...)... | provenance | Sink:MaD:145 |
+| Log4jJndiInjectionTest.java:207:155:207:162 | source(...) : String | Log4jJndiInjectionTest.java:207:146:207:162 | (...)... | provenance | Sink:MaD:148 |
+| Log4jJndiInjectionTest.java:207:155:207:162 | source(...) : String | Log4jJndiInjectionTest.java:207:146:207:162 | (...)... | provenance | Sink:MaD:147 |
+| Log4jJndiInjectionTest.java:208:140:208:147 | source(...) : String | Log4jJndiInjectionTest.java:208:131:208:147 | (...)... | provenance | Sink:MaD:148 |
+| Log4jJndiInjectionTest.java:208:140:208:147 | source(...) : String | Log4jJndiInjectionTest.java:208:131:208:147 | (...)... | provenance | Sink:MaD:147 |
+| Log4jJndiInjectionTest.java:209:125:209:132 | source(...) : String | Log4jJndiInjectionTest.java:209:116:209:132 | (...)... | provenance | Sink:MaD:148 |
+| Log4jJndiInjectionTest.java:209:125:209:132 | source(...) : String | Log4jJndiInjectionTest.java:209:116:209:132 | (...)... | provenance | Sink:MaD:147 |
+| Log4jJndiInjectionTest.java:210:110:210:117 | source(...) : String | Log4jJndiInjectionTest.java:210:101:210:117 | (...)... | provenance | Sink:MaD:148 |
+| Log4jJndiInjectionTest.java:210:110:210:117 | source(...) : String | Log4jJndiInjectionTest.java:210:101:210:117 | (...)... | provenance | Sink:MaD:147 |
+| Log4jJndiInjectionTest.java:211:95:211:102 | source(...) : String | Log4jJndiInjectionTest.java:211:86:211:102 | (...)... | provenance | Sink:MaD:148 |
+| Log4jJndiInjectionTest.java:211:95:211:102 | source(...) : String | Log4jJndiInjectionTest.java:211:86:211:102 | (...)... | provenance | Sink:MaD:147 |
+| Log4jJndiInjectionTest.java:212:80:212:87 | source(...) : String | Log4jJndiInjectionTest.java:212:71:212:87 | (...)... | provenance | Sink:MaD:148 |
+| Log4jJndiInjectionTest.java:212:80:212:87 | source(...) : String | Log4jJndiInjectionTest.java:212:71:212:87 | (...)... | provenance | Sink:MaD:147 |
+| Log4jJndiInjectionTest.java:213:65:213:72 | source(...) : String | Log4jJndiInjectionTest.java:213:56:213:72 | (...)... | provenance | Sink:MaD:148 |
+| Log4jJndiInjectionTest.java:213:65:213:72 | source(...) : String | Log4jJndiInjectionTest.java:213:56:213:72 | (...)... | provenance | Sink:MaD:147 |
+| Log4jJndiInjectionTest.java:214:50:214:57 | source(...) : String | Log4jJndiInjectionTest.java:214:41:214:57 | (...)... | provenance | Sink:MaD:148 |
+| Log4jJndiInjectionTest.java:214:50:214:57 | source(...) : String | Log4jJndiInjectionTest.java:214:41:214:57 | (...)... | provenance | Sink:MaD:147 |
+| Log4jJndiInjectionTest.java:215:170:215:177 | source(...) : String | Log4jJndiInjectionTest.java:215:161:215:177 | (...)... | provenance | Sink:MaD:150 |
+| Log4jJndiInjectionTest.java:215:170:215:177 | source(...) : String | Log4jJndiInjectionTest.java:215:161:215:177 | (...)... | provenance | Sink:MaD:149 |
+| Log4jJndiInjectionTest.java:216:155:216:162 | source(...) : String | Log4jJndiInjectionTest.java:216:146:216:162 | (...)... | provenance | Sink:MaD:150 |
+| Log4jJndiInjectionTest.java:216:155:216:162 | source(...) : String | Log4jJndiInjectionTest.java:216:146:216:162 | (...)... | provenance | Sink:MaD:149 |
+| Log4jJndiInjectionTest.java:217:140:217:147 | source(...) : String | Log4jJndiInjectionTest.java:217:131:217:147 | (...)... | provenance | Sink:MaD:150 |
+| Log4jJndiInjectionTest.java:217:140:217:147 | source(...) : String | Log4jJndiInjectionTest.java:217:131:217:147 | (...)... | provenance | Sink:MaD:149 |
+| Log4jJndiInjectionTest.java:218:125:218:132 | source(...) : String | Log4jJndiInjectionTest.java:218:116:218:132 | (...)... | provenance | Sink:MaD:150 |
+| Log4jJndiInjectionTest.java:218:125:218:132 | source(...) : String | Log4jJndiInjectionTest.java:218:116:218:132 | (...)... | provenance | Sink:MaD:149 |
+| Log4jJndiInjectionTest.java:219:110:219:117 | source(...) : String | Log4jJndiInjectionTest.java:219:101:219:117 | (...)... | provenance | Sink:MaD:150 |
+| Log4jJndiInjectionTest.java:219:110:219:117 | source(...) : String | Log4jJndiInjectionTest.java:219:101:219:117 | (...)... | provenance | Sink:MaD:149 |
+| Log4jJndiInjectionTest.java:220:95:220:102 | source(...) : String | Log4jJndiInjectionTest.java:220:86:220:102 | (...)... | provenance | Sink:MaD:150 |
+| Log4jJndiInjectionTest.java:220:95:220:102 | source(...) : String | Log4jJndiInjectionTest.java:220:86:220:102 | (...)... | provenance | Sink:MaD:149 |
+| Log4jJndiInjectionTest.java:221:80:221:87 | source(...) : String | Log4jJndiInjectionTest.java:221:71:221:87 | (...)... | provenance | Sink:MaD:150 |
+| Log4jJndiInjectionTest.java:221:80:221:87 | source(...) : String | Log4jJndiInjectionTest.java:221:71:221:87 | (...)... | provenance | Sink:MaD:149 |
+| Log4jJndiInjectionTest.java:222:65:222:72 | source(...) : String | Log4jJndiInjectionTest.java:222:56:222:72 | (...)... | provenance | Sink:MaD:150 |
+| Log4jJndiInjectionTest.java:222:65:222:72 | source(...) : String | Log4jJndiInjectionTest.java:222:56:222:72 | (...)... | provenance | Sink:MaD:149 |
+| Log4jJndiInjectionTest.java:223:50:223:57 | source(...) : String | Log4jJndiInjectionTest.java:223:41:223:57 | (...)... | provenance | Sink:MaD:150 |
+| Log4jJndiInjectionTest.java:223:50:223:57 | source(...) : String | Log4jJndiInjectionTest.java:223:41:223:57 | (...)... | provenance | Sink:MaD:149 |
+| Log4jJndiInjectionTest.java:224:185:224:192 | source(...) : String | Log4jJndiInjectionTest.java:224:176:224:192 | (...)... | provenance | Sink:MaD:152 |
+| Log4jJndiInjectionTest.java:224:185:224:192 | source(...) : String | Log4jJndiInjectionTest.java:224:176:224:192 | (...)... | provenance | Sink:MaD:151 |
+| Log4jJndiInjectionTest.java:225:170:225:177 | source(...) : String | Log4jJndiInjectionTest.java:225:161:225:177 | (...)... | provenance | Sink:MaD:152 |
+| Log4jJndiInjectionTest.java:225:170:225:177 | source(...) : String | Log4jJndiInjectionTest.java:225:161:225:177 | (...)... | provenance | Sink:MaD:151 |
+| Log4jJndiInjectionTest.java:226:155:226:162 | source(...) : String | Log4jJndiInjectionTest.java:226:146:226:162 | (...)... | provenance | Sink:MaD:152 |
+| Log4jJndiInjectionTest.java:226:155:226:162 | source(...) : String | Log4jJndiInjectionTest.java:226:146:226:162 | (...)... | provenance | Sink:MaD:151 |
+| Log4jJndiInjectionTest.java:227:140:227:147 | source(...) : String | Log4jJndiInjectionTest.java:227:131:227:147 | (...)... | provenance | Sink:MaD:152 |
+| Log4jJndiInjectionTest.java:227:140:227:147 | source(...) : String | Log4jJndiInjectionTest.java:227:131:227:147 | (...)... | provenance | Sink:MaD:151 |
+| Log4jJndiInjectionTest.java:228:125:228:132 | source(...) : String | Log4jJndiInjectionTest.java:228:116:228:132 | (...)... | provenance | Sink:MaD:152 |
+| Log4jJndiInjectionTest.java:228:125:228:132 | source(...) : String | Log4jJndiInjectionTest.java:228:116:228:132 | (...)... | provenance | Sink:MaD:151 |
+| Log4jJndiInjectionTest.java:229:110:229:117 | source(...) : String | Log4jJndiInjectionTest.java:229:101:229:117 | (...)... | provenance | Sink:MaD:152 |
+| Log4jJndiInjectionTest.java:229:110:229:117 | source(...) : String | Log4jJndiInjectionTest.java:229:101:229:117 | (...)... | provenance | Sink:MaD:151 |
+| Log4jJndiInjectionTest.java:230:95:230:102 | source(...) : String | Log4jJndiInjectionTest.java:230:86:230:102 | (...)... | provenance | Sink:MaD:152 |
+| Log4jJndiInjectionTest.java:230:95:230:102 | source(...) : String | Log4jJndiInjectionTest.java:230:86:230:102 | (...)... | provenance | Sink:MaD:151 |
+| Log4jJndiInjectionTest.java:231:80:231:87 | source(...) : String | Log4jJndiInjectionTest.java:231:71:231:87 | (...)... | provenance | Sink:MaD:152 |
+| Log4jJndiInjectionTest.java:231:80:231:87 | source(...) : String | Log4jJndiInjectionTest.java:231:71:231:87 | (...)... | provenance | Sink:MaD:151 |
+| Log4jJndiInjectionTest.java:232:65:232:72 | source(...) : String | Log4jJndiInjectionTest.java:232:56:232:72 | (...)... | provenance | Sink:MaD:152 |
+| Log4jJndiInjectionTest.java:232:65:232:72 | source(...) : String | Log4jJndiInjectionTest.java:232:56:232:72 | (...)... | provenance | Sink:MaD:151 |
+| Log4jJndiInjectionTest.java:233:50:233:57 | source(...) : String | Log4jJndiInjectionTest.java:233:41:233:57 | (...)... | provenance | Sink:MaD:152 |
+| Log4jJndiInjectionTest.java:233:50:233:57 | source(...) : String | Log4jJndiInjectionTest.java:233:41:233:57 | (...)... | provenance | Sink:MaD:151 |
+| Log4jJndiInjectionTest.java:234:50:234:57 | source(...) : String | Log4jJndiInjectionTest.java:234:41:234:57 | (...)... | provenance | Sink:MaD:136 |
+| Log4jJndiInjectionTest.java:234:50:234:57 | source(...) : String | Log4jJndiInjectionTest.java:234:41:234:57 | (...)... | provenance | Sink:MaD:135 |
+| Log4jJndiInjectionTest.java:235:70:235:77 | source(...) : String | Log4jJndiInjectionTest.java:235:56:235:77 | (...)... | provenance | Sink:MaD:136 |
+| Log4jJndiInjectionTest.java:235:70:235:77 | source(...) : String | Log4jJndiInjectionTest.java:235:56:235:77 | (...)... | provenance | Sink:MaD:135 |
+| Log4jJndiInjectionTest.java:236:50:236:57 | source(...) : String | Log4jJndiInjectionTest.java:236:41:236:57 | (...)... | provenance | Sink:MaD:156 |
+| Log4jJndiInjectionTest.java:236:50:236:57 | source(...) : String | Log4jJndiInjectionTest.java:236:41:236:57 | (...)... | provenance | Sink:MaD:155 |
+| Log4jJndiInjectionTest.java:237:55:237:62 | source(...) : String | Log4jJndiInjectionTest.java:237:41:237:62 | (...)... | provenance | Sink:MaD:158 |
+| Log4jJndiInjectionTest.java:237:55:237:62 | source(...) : String | Log4jJndiInjectionTest.java:237:41:237:62 | (...)... | provenance | Sink:MaD:157 |
+| Log4jJndiInjectionTest.java:238:55:238:62 | source(...) : String | Log4jJndiInjectionTest.java:238:41:238:62 | (...)... | provenance | Sink:MaD:160 |
+| Log4jJndiInjectionTest.java:238:55:238:62 | source(...) : String | Log4jJndiInjectionTest.java:238:41:238:62 | (...)... | provenance | Sink:MaD:159 |
+| Log4jJndiInjectionTest.java:239:44:239:51 | source(...) : String | Log4jJndiInjectionTest.java:239:26:239:51 | (...)... | provenance | Sink:MaD:166 |
+| Log4jJndiInjectionTest.java:239:44:239:51 | source(...) : String | Log4jJndiInjectionTest.java:239:26:239:51 | (...)... | provenance | Sink:MaD:165 |
+| Log4jJndiInjectionTest.java:240:44:240:51 | source(...) : String | Log4jJndiInjectionTest.java:240:26:240:51 | (...)... | provenance | Sink:MaD:168 |
+| Log4jJndiInjectionTest.java:240:44:240:51 | source(...) : String | Log4jJndiInjectionTest.java:240:26:240:51 | (...)... | provenance | Sink:MaD:167 |
+| Log4jJndiInjectionTest.java:241:36:241:43 | source(...) : String | Log4jJndiInjectionTest.java:241:26:241:43 | (...)... | provenance | Sink:MaD:162 |
+| Log4jJndiInjectionTest.java:241:36:241:43 | source(...) : String | Log4jJndiInjectionTest.java:241:26:241:43 | (...)... | provenance | Sink:MaD:161 |
+| Log4jJndiInjectionTest.java:242:36:242:43 | source(...) : String | Log4jJndiInjectionTest.java:242:26:242:43 | (...)... | provenance | Sink:MaD:164 |
+| Log4jJndiInjectionTest.java:242:36:242:43 | source(...) : String | Log4jJndiInjectionTest.java:242:26:242:43 | (...)... | provenance | Sink:MaD:163 |
+| Log4jJndiInjectionTest.java:245:35:245:42 | source(...) : String | Log4jJndiInjectionTest.java:245:26:245:42 | (...)... | provenance | Sink:MaD:174 |
+| Log4jJndiInjectionTest.java:245:35:245:42 | source(...) : String | Log4jJndiInjectionTest.java:245:26:245:42 | (...)... | provenance | Sink:MaD:173 |
+| Log4jJndiInjectionTest.java:246:35:246:42 | source(...) : String | Log4jJndiInjectionTest.java:246:26:246:42 | (...)... | provenance | Sink:MaD:194 |
+| Log4jJndiInjectionTest.java:246:35:246:42 | source(...) : String | Log4jJndiInjectionTest.java:246:26:246:42 | (...)... | provenance | Sink:MaD:193 |
+| Log4jJndiInjectionTest.java:247:41:247:63 | {...} : Object[] [[]] : String | Log4jJndiInjectionTest.java:247:41:247:63 | new Object[] | provenance | Sink:MaD:194 |
+| Log4jJndiInjectionTest.java:247:41:247:63 | {...} : Object[] [[]] : String | Log4jJndiInjectionTest.java:247:41:247:63 | new Object[] | provenance | Sink:MaD:193 |
 | Log4jJndiInjectionTest.java:247:55:247:62 | source(...) : String | Log4jJndiInjectionTest.java:247:41:247:63 | {...} : Object[] [[]] : String | provenance |  |
-| Log4jJndiInjectionTest.java:248:50:248:57 | source(...) : String | Log4jJndiInjectionTest.java:248:41:248:57 | (...)... | provenance |  Sink:MaD:94 |
-| Log4jJndiInjectionTest.java:248:50:248:57 | source(...) : String | Log4jJndiInjectionTest.java:248:41:248:57 | (...)... | provenance |  Sink:MaD:410 |
-| Log4jJndiInjectionTest.java:249:35:249:42 | source(...) : String | Log4jJndiInjectionTest.java:249:26:249:42 | (...)... | provenance |  Sink:MaD:94 |
-| Log4jJndiInjectionTest.java:249:35:249:42 | source(...) : String | Log4jJndiInjectionTest.java:249:26:249:42 | (...)... | provenance |  Sink:MaD:410 |
-| Log4jJndiInjectionTest.java:250:65:250:72 | source(...) : String | Log4jJndiInjectionTest.java:250:56:250:72 | (...)... | provenance |  Sink:MaD:95 |
-| Log4jJndiInjectionTest.java:250:65:250:72 | source(...) : String | Log4jJndiInjectionTest.java:250:56:250:72 | (...)... | provenance |  Sink:MaD:411 |
-| Log4jJndiInjectionTest.java:251:50:251:57 | source(...) : String | Log4jJndiInjectionTest.java:251:41:251:57 | (...)... | provenance |  Sink:MaD:95 |
-| Log4jJndiInjectionTest.java:251:50:251:57 | source(...) : String | Log4jJndiInjectionTest.java:251:41:251:57 | (...)... | provenance |  Sink:MaD:411 |
-| Log4jJndiInjectionTest.java:252:35:252:42 | source(...) : String | Log4jJndiInjectionTest.java:252:26:252:42 | (...)... | provenance |  Sink:MaD:95 |
-| Log4jJndiInjectionTest.java:252:35:252:42 | source(...) : String | Log4jJndiInjectionTest.java:252:26:252:42 | (...)... | provenance |  Sink:MaD:411 |
-| Log4jJndiInjectionTest.java:253:80:253:87 | source(...) : String | Log4jJndiInjectionTest.java:253:71:253:87 | (...)... | provenance |  Sink:MaD:96 |
-| Log4jJndiInjectionTest.java:253:80:253:87 | source(...) : String | Log4jJndiInjectionTest.java:253:71:253:87 | (...)... | provenance |  Sink:MaD:412 |
-| Log4jJndiInjectionTest.java:254:65:254:72 | source(...) : String | Log4jJndiInjectionTest.java:254:56:254:72 | (...)... | provenance |  Sink:MaD:96 |
-| Log4jJndiInjectionTest.java:254:65:254:72 | source(...) : String | Log4jJndiInjectionTest.java:254:56:254:72 | (...)... | provenance |  Sink:MaD:412 |
-| Log4jJndiInjectionTest.java:255:50:255:57 | source(...) : String | Log4jJndiInjectionTest.java:255:41:255:57 | (...)... | provenance |  Sink:MaD:96 |
-| Log4jJndiInjectionTest.java:255:50:255:57 | source(...) : String | Log4jJndiInjectionTest.java:255:41:255:57 | (...)... | provenance |  Sink:MaD:412 |
-| Log4jJndiInjectionTest.java:256:35:256:42 | source(...) : String | Log4jJndiInjectionTest.java:256:26:256:42 | (...)... | provenance |  Sink:MaD:96 |
-| Log4jJndiInjectionTest.java:256:35:256:42 | source(...) : String | Log4jJndiInjectionTest.java:256:26:256:42 | (...)... | provenance |  Sink:MaD:412 |
-| Log4jJndiInjectionTest.java:257:95:257:102 | source(...) : String | Log4jJndiInjectionTest.java:257:86:257:102 | (...)... | provenance |  Sink:MaD:97 |
-| Log4jJndiInjectionTest.java:257:95:257:102 | source(...) : String | Log4jJndiInjectionTest.java:257:86:257:102 | (...)... | provenance |  Sink:MaD:413 |
-| Log4jJndiInjectionTest.java:258:80:258:87 | source(...) : String | Log4jJndiInjectionTest.java:258:71:258:87 | (...)... | provenance |  Sink:MaD:97 |
-| Log4jJndiInjectionTest.java:258:80:258:87 | source(...) : String | Log4jJndiInjectionTest.java:258:71:258:87 | (...)... | provenance |  Sink:MaD:413 |
-| Log4jJndiInjectionTest.java:259:65:259:72 | source(...) : String | Log4jJndiInjectionTest.java:259:56:259:72 | (...)... | provenance |  Sink:MaD:97 |
-| Log4jJndiInjectionTest.java:259:65:259:72 | source(...) : String | Log4jJndiInjectionTest.java:259:56:259:72 | (...)... | provenance |  Sink:MaD:413 |
-| Log4jJndiInjectionTest.java:260:50:260:57 | source(...) : String | Log4jJndiInjectionTest.java:260:41:260:57 | (...)... | provenance |  Sink:MaD:97 |
-| Log4jJndiInjectionTest.java:260:50:260:57 | source(...) : String | Log4jJndiInjectionTest.java:260:41:260:57 | (...)... | provenance |  Sink:MaD:413 |
-| Log4jJndiInjectionTest.java:261:35:261:42 | source(...) : String | Log4jJndiInjectionTest.java:261:26:261:42 | (...)... | provenance |  Sink:MaD:97 |
-| Log4jJndiInjectionTest.java:261:35:261:42 | source(...) : String | Log4jJndiInjectionTest.java:261:26:261:42 | (...)... | provenance |  Sink:MaD:413 |
-| Log4jJndiInjectionTest.java:262:110:262:117 | source(...) : String | Log4jJndiInjectionTest.java:262:101:262:117 | (...)... | provenance |  Sink:MaD:98 |
-| Log4jJndiInjectionTest.java:262:110:262:117 | source(...) : String | Log4jJndiInjectionTest.java:262:101:262:117 | (...)... | provenance |  Sink:MaD:414 |
-| Log4jJndiInjectionTest.java:263:95:263:102 | source(...) : String | Log4jJndiInjectionTest.java:263:86:263:102 | (...)... | provenance |  Sink:MaD:98 |
-| Log4jJndiInjectionTest.java:263:95:263:102 | source(...) : String | Log4jJndiInjectionTest.java:263:86:263:102 | (...)... | provenance |  Sink:MaD:414 |
-| Log4jJndiInjectionTest.java:264:80:264:87 | source(...) : String | Log4jJndiInjectionTest.java:264:71:264:87 | (...)... | provenance |  Sink:MaD:98 |
-| Log4jJndiInjectionTest.java:264:80:264:87 | source(...) : String | Log4jJndiInjectionTest.java:264:71:264:87 | (...)... | provenance |  Sink:MaD:414 |
-| Log4jJndiInjectionTest.java:265:65:265:72 | source(...) : String | Log4jJndiInjectionTest.java:265:56:265:72 | (...)... | provenance |  Sink:MaD:98 |
-| Log4jJndiInjectionTest.java:265:65:265:72 | source(...) : String | Log4jJndiInjectionTest.java:265:56:265:72 | (...)... | provenance |  Sink:MaD:414 |
-| Log4jJndiInjectionTest.java:266:50:266:57 | source(...) : String | Log4jJndiInjectionTest.java:266:41:266:57 | (...)... | provenance |  Sink:MaD:98 |
-| Log4jJndiInjectionTest.java:266:50:266:57 | source(...) : String | Log4jJndiInjectionTest.java:266:41:266:57 | (...)... | provenance |  Sink:MaD:414 |
-| Log4jJndiInjectionTest.java:267:35:267:42 | source(...) : String | Log4jJndiInjectionTest.java:267:26:267:42 | (...)... | provenance |  Sink:MaD:98 |
-| Log4jJndiInjectionTest.java:267:35:267:42 | source(...) : String | Log4jJndiInjectionTest.java:267:26:267:42 | (...)... | provenance |  Sink:MaD:414 |
-| Log4jJndiInjectionTest.java:268:125:268:132 | source(...) : String | Log4jJndiInjectionTest.java:268:116:268:132 | (...)... | provenance |  Sink:MaD:99 |
-| Log4jJndiInjectionTest.java:268:125:268:132 | source(...) : String | Log4jJndiInjectionTest.java:268:116:268:132 | (...)... | provenance |  Sink:MaD:415 |
-| Log4jJndiInjectionTest.java:269:110:269:117 | source(...) : String | Log4jJndiInjectionTest.java:269:101:269:117 | (...)... | provenance |  Sink:MaD:99 |
-| Log4jJndiInjectionTest.java:269:110:269:117 | source(...) : String | Log4jJndiInjectionTest.java:269:101:269:117 | (...)... | provenance |  Sink:MaD:415 |
-| Log4jJndiInjectionTest.java:270:95:270:102 | source(...) : String | Log4jJndiInjectionTest.java:270:86:270:102 | (...)... | provenance |  Sink:MaD:99 |
-| Log4jJndiInjectionTest.java:270:95:270:102 | source(...) : String | Log4jJndiInjectionTest.java:270:86:270:102 | (...)... | provenance |  Sink:MaD:415 |
-| Log4jJndiInjectionTest.java:271:80:271:87 | source(...) : String | Log4jJndiInjectionTest.java:271:71:271:87 | (...)... | provenance |  Sink:MaD:99 |
-| Log4jJndiInjectionTest.java:271:80:271:87 | source(...) : String | Log4jJndiInjectionTest.java:271:71:271:87 | (...)... | provenance |  Sink:MaD:415 |
-| Log4jJndiInjectionTest.java:272:65:272:72 | source(...) : String | Log4jJndiInjectionTest.java:272:56:272:72 | (...)... | provenance |  Sink:MaD:99 |
-| Log4jJndiInjectionTest.java:272:65:272:72 | source(...) : String | Log4jJndiInjectionTest.java:272:56:272:72 | (...)... | provenance |  Sink:MaD:415 |
-| Log4jJndiInjectionTest.java:273:50:273:57 | source(...) : String | Log4jJndiInjectionTest.java:273:41:273:57 | (...)... | provenance |  Sink:MaD:99 |
-| Log4jJndiInjectionTest.java:273:50:273:57 | source(...) : String | Log4jJndiInjectionTest.java:273:41:273:57 | (...)... | provenance |  Sink:MaD:415 |
-| Log4jJndiInjectionTest.java:274:35:274:42 | source(...) : String | Log4jJndiInjectionTest.java:274:26:274:42 | (...)... | provenance |  Sink:MaD:99 |
-| Log4jJndiInjectionTest.java:274:35:274:42 | source(...) : String | Log4jJndiInjectionTest.java:274:26:274:42 | (...)... | provenance |  Sink:MaD:415 |
-| Log4jJndiInjectionTest.java:275:140:275:147 | source(...) : String | Log4jJndiInjectionTest.java:275:131:275:147 | (...)... | provenance |  Sink:MaD:100 |
-| Log4jJndiInjectionTest.java:275:140:275:147 | source(...) : String | Log4jJndiInjectionTest.java:275:131:275:147 | (...)... | provenance |  Sink:MaD:416 |
-| Log4jJndiInjectionTest.java:276:125:276:132 | source(...) : String | Log4jJndiInjectionTest.java:276:116:276:132 | (...)... | provenance |  Sink:MaD:100 |
-| Log4jJndiInjectionTest.java:276:125:276:132 | source(...) : String | Log4jJndiInjectionTest.java:276:116:276:132 | (...)... | provenance |  Sink:MaD:416 |
-| Log4jJndiInjectionTest.java:277:110:277:117 | source(...) : String | Log4jJndiInjectionTest.java:277:101:277:117 | (...)... | provenance |  Sink:MaD:100 |
-| Log4jJndiInjectionTest.java:277:110:277:117 | source(...) : String | Log4jJndiInjectionTest.java:277:101:277:117 | (...)... | provenance |  Sink:MaD:416 |
-| Log4jJndiInjectionTest.java:278:95:278:102 | source(...) : String | Log4jJndiInjectionTest.java:278:86:278:102 | (...)... | provenance |  Sink:MaD:100 |
-| Log4jJndiInjectionTest.java:278:95:278:102 | source(...) : String | Log4jJndiInjectionTest.java:278:86:278:102 | (...)... | provenance |  Sink:MaD:416 |
-| Log4jJndiInjectionTest.java:279:80:279:87 | source(...) : String | Log4jJndiInjectionTest.java:279:71:279:87 | (...)... | provenance |  Sink:MaD:100 |
-| Log4jJndiInjectionTest.java:279:80:279:87 | source(...) : String | Log4jJndiInjectionTest.java:279:71:279:87 | (...)... | provenance |  Sink:MaD:416 |
-| Log4jJndiInjectionTest.java:280:65:280:72 | source(...) : String | Log4jJndiInjectionTest.java:280:56:280:72 | (...)... | provenance |  Sink:MaD:100 |
-| Log4jJndiInjectionTest.java:280:65:280:72 | source(...) : String | Log4jJndiInjectionTest.java:280:56:280:72 | (...)... | provenance |  Sink:MaD:416 |
-| Log4jJndiInjectionTest.java:281:50:281:57 | source(...) : String | Log4jJndiInjectionTest.java:281:41:281:57 | (...)... | provenance |  Sink:MaD:100 |
-| Log4jJndiInjectionTest.java:281:50:281:57 | source(...) : String | Log4jJndiInjectionTest.java:281:41:281:57 | (...)... | provenance |  Sink:MaD:416 |
-| Log4jJndiInjectionTest.java:282:35:282:42 | source(...) : String | Log4jJndiInjectionTest.java:282:26:282:42 | (...)... | provenance |  Sink:MaD:100 |
-| Log4jJndiInjectionTest.java:282:35:282:42 | source(...) : String | Log4jJndiInjectionTest.java:282:26:282:42 | (...)... | provenance |  Sink:MaD:416 |
-| Log4jJndiInjectionTest.java:283:155:283:162 | source(...) : String | Log4jJndiInjectionTest.java:283:146:283:162 | (...)... | provenance |  Sink:MaD:101 |
-| Log4jJndiInjectionTest.java:283:155:283:162 | source(...) : String | Log4jJndiInjectionTest.java:283:146:283:162 | (...)... | provenance |  Sink:MaD:417 |
-| Log4jJndiInjectionTest.java:284:140:284:147 | source(...) : String | Log4jJndiInjectionTest.java:284:131:284:147 | (...)... | provenance |  Sink:MaD:101 |
-| Log4jJndiInjectionTest.java:284:140:284:147 | source(...) : String | Log4jJndiInjectionTest.java:284:131:284:147 | (...)... | provenance |  Sink:MaD:417 |
-| Log4jJndiInjectionTest.java:285:125:285:132 | source(...) : String | Log4jJndiInjectionTest.java:285:116:285:132 | (...)... | provenance |  Sink:MaD:101 |
-| Log4jJndiInjectionTest.java:285:125:285:132 | source(...) : String | Log4jJndiInjectionTest.java:285:116:285:132 | (...)... | provenance |  Sink:MaD:417 |
-| Log4jJndiInjectionTest.java:286:110:286:117 | source(...) : String | Log4jJndiInjectionTest.java:286:101:286:117 | (...)... | provenance |  Sink:MaD:101 |
-| Log4jJndiInjectionTest.java:286:110:286:117 | source(...) : String | Log4jJndiInjectionTest.java:286:101:286:117 | (...)... | provenance |  Sink:MaD:417 |
-| Log4jJndiInjectionTest.java:287:95:287:102 | source(...) : String | Log4jJndiInjectionTest.java:287:86:287:102 | (...)... | provenance |  Sink:MaD:101 |
-| Log4jJndiInjectionTest.java:287:95:287:102 | source(...) : String | Log4jJndiInjectionTest.java:287:86:287:102 | (...)... | provenance |  Sink:MaD:417 |
-| Log4jJndiInjectionTest.java:288:80:288:87 | source(...) : String | Log4jJndiInjectionTest.java:288:71:288:87 | (...)... | provenance |  Sink:MaD:101 |
-| Log4jJndiInjectionTest.java:288:80:288:87 | source(...) : String | Log4jJndiInjectionTest.java:288:71:288:87 | (...)... | provenance |  Sink:MaD:417 |
-| Log4jJndiInjectionTest.java:289:65:289:72 | source(...) : String | Log4jJndiInjectionTest.java:289:56:289:72 | (...)... | provenance |  Sink:MaD:101 |
-| Log4jJndiInjectionTest.java:289:65:289:72 | source(...) : String | Log4jJndiInjectionTest.java:289:56:289:72 | (...)... | provenance |  Sink:MaD:417 |
-| Log4jJndiInjectionTest.java:290:50:290:57 | source(...) : String | Log4jJndiInjectionTest.java:290:41:290:57 | (...)... | provenance |  Sink:MaD:101 |
-| Log4jJndiInjectionTest.java:290:50:290:57 | source(...) : String | Log4jJndiInjectionTest.java:290:41:290:57 | (...)... | provenance |  Sink:MaD:417 |
-| Log4jJndiInjectionTest.java:291:35:291:42 | source(...) : String | Log4jJndiInjectionTest.java:291:26:291:42 | (...)... | provenance |  Sink:MaD:101 |
-| Log4jJndiInjectionTest.java:291:35:291:42 | source(...) : String | Log4jJndiInjectionTest.java:291:26:291:42 | (...)... | provenance |  Sink:MaD:417 |
-| Log4jJndiInjectionTest.java:292:170:292:177 | source(...) : String | Log4jJndiInjectionTest.java:292:161:292:177 | (...)... | provenance |  Sink:MaD:102 |
-| Log4jJndiInjectionTest.java:292:170:292:177 | source(...) : String | Log4jJndiInjectionTest.java:292:161:292:177 | (...)... | provenance |  Sink:MaD:418 |
-| Log4jJndiInjectionTest.java:293:155:293:162 | source(...) : String | Log4jJndiInjectionTest.java:293:146:293:162 | (...)... | provenance |  Sink:MaD:102 |
-| Log4jJndiInjectionTest.java:293:155:293:162 | source(...) : String | Log4jJndiInjectionTest.java:293:146:293:162 | (...)... | provenance |  Sink:MaD:418 |
-| Log4jJndiInjectionTest.java:294:140:294:147 | source(...) : String | Log4jJndiInjectionTest.java:294:131:294:147 | (...)... | provenance |  Sink:MaD:102 |
-| Log4jJndiInjectionTest.java:294:140:294:147 | source(...) : String | Log4jJndiInjectionTest.java:294:131:294:147 | (...)... | provenance |  Sink:MaD:418 |
-| Log4jJndiInjectionTest.java:295:125:295:132 | source(...) : String | Log4jJndiInjectionTest.java:295:116:295:132 | (...)... | provenance |  Sink:MaD:102 |
-| Log4jJndiInjectionTest.java:295:125:295:132 | source(...) : String | Log4jJndiInjectionTest.java:295:116:295:132 | (...)... | provenance |  Sink:MaD:418 |
-| Log4jJndiInjectionTest.java:296:110:296:117 | source(...) : String | Log4jJndiInjectionTest.java:296:101:296:117 | (...)... | provenance |  Sink:MaD:102 |
-| Log4jJndiInjectionTest.java:296:110:296:117 | source(...) : String | Log4jJndiInjectionTest.java:296:101:296:117 | (...)... | provenance |  Sink:MaD:418 |
-| Log4jJndiInjectionTest.java:297:95:297:102 | source(...) : String | Log4jJndiInjectionTest.java:297:86:297:102 | (...)... | provenance |  Sink:MaD:102 |
-| Log4jJndiInjectionTest.java:297:95:297:102 | source(...) : String | Log4jJndiInjectionTest.java:297:86:297:102 | (...)... | provenance |  Sink:MaD:418 |
-| Log4jJndiInjectionTest.java:298:80:298:87 | source(...) : String | Log4jJndiInjectionTest.java:298:71:298:87 | (...)... | provenance |  Sink:MaD:102 |
-| Log4jJndiInjectionTest.java:298:80:298:87 | source(...) : String | Log4jJndiInjectionTest.java:298:71:298:87 | (...)... | provenance |  Sink:MaD:418 |
-| Log4jJndiInjectionTest.java:299:65:299:72 | source(...) : String | Log4jJndiInjectionTest.java:299:56:299:72 | (...)... | provenance |  Sink:MaD:102 |
-| Log4jJndiInjectionTest.java:299:65:299:72 | source(...) : String | Log4jJndiInjectionTest.java:299:56:299:72 | (...)... | provenance |  Sink:MaD:418 |
-| Log4jJndiInjectionTest.java:300:50:300:57 | source(...) : String | Log4jJndiInjectionTest.java:300:41:300:57 | (...)... | provenance |  Sink:MaD:102 |
-| Log4jJndiInjectionTest.java:300:50:300:57 | source(...) : String | Log4jJndiInjectionTest.java:300:41:300:57 | (...)... | provenance |  Sink:MaD:418 |
-| Log4jJndiInjectionTest.java:301:35:301:42 | source(...) : String | Log4jJndiInjectionTest.java:301:26:301:42 | (...)... | provenance |  Sink:MaD:102 |
-| Log4jJndiInjectionTest.java:301:35:301:42 | source(...) : String | Log4jJndiInjectionTest.java:301:26:301:42 | (...)... | provenance |  Sink:MaD:418 |
-| Log4jJndiInjectionTest.java:302:35:302:42 | source(...) : String | Log4jJndiInjectionTest.java:302:26:302:42 | (...)... | provenance |  Sink:MaD:94 |
-| Log4jJndiInjectionTest.java:302:35:302:42 | source(...) : String | Log4jJndiInjectionTest.java:302:26:302:42 | (...)... | provenance |  Sink:MaD:410 |
-| Log4jJndiInjectionTest.java:303:55:303:62 | source(...) : String | Log4jJndiInjectionTest.java:303:41:303:62 | (...)... | provenance |  Sink:MaD:94 |
-| Log4jJndiInjectionTest.java:303:55:303:62 | source(...) : String | Log4jJndiInjectionTest.java:303:41:303:62 | (...)... | provenance |  Sink:MaD:410 |
-| Log4jJndiInjectionTest.java:304:35:304:42 | source(...) : String | Log4jJndiInjectionTest.java:304:26:304:42 | (...)... | provenance |  Sink:MaD:104 |
-| Log4jJndiInjectionTest.java:304:35:304:42 | source(...) : String | Log4jJndiInjectionTest.java:304:26:304:42 | (...)... | provenance |  Sink:MaD:420 |
-| Log4jJndiInjectionTest.java:305:40:305:47 | source(...) : String | Log4jJndiInjectionTest.java:305:26:305:47 | (...)... | provenance |  Sink:MaD:105 |
-| Log4jJndiInjectionTest.java:305:40:305:47 | source(...) : String | Log4jJndiInjectionTest.java:305:26:305:47 | (...)... | provenance |  Sink:MaD:421 |
-| Log4jJndiInjectionTest.java:306:40:306:47 | source(...) : String | Log4jJndiInjectionTest.java:306:26:306:47 | (...)... | provenance |  Sink:MaD:106 |
-| Log4jJndiInjectionTest.java:306:40:306:47 | source(...) : String | Log4jJndiInjectionTest.java:306:26:306:47 | (...)... | provenance |  Sink:MaD:422 |
-| Log4jJndiInjectionTest.java:307:41:307:48 | source(...) : String | Log4jJndiInjectionTest.java:307:26:307:48 | (...)... | provenance |  Sink:MaD:107 |
-| Log4jJndiInjectionTest.java:307:41:307:48 | source(...) : String | Log4jJndiInjectionTest.java:307:26:307:48 | (...)... | provenance |  Sink:MaD:423 |
-| Log4jJndiInjectionTest.java:308:41:308:48 | source(...) : String | Log4jJndiInjectionTest.java:308:26:308:48 | (...)... | provenance |  Sink:MaD:108 |
-| Log4jJndiInjectionTest.java:308:41:308:48 | source(...) : String | Log4jJndiInjectionTest.java:308:26:308:48 | (...)... | provenance |  Sink:MaD:424 |
-| Log4jJndiInjectionTest.java:309:56:309:63 | source(...) : String | Log4jJndiInjectionTest.java:309:41:309:63 | (...)... | provenance |  Sink:MaD:109 |
-| Log4jJndiInjectionTest.java:309:56:309:63 | source(...) : String | Log4jJndiInjectionTest.java:309:41:309:63 | (...)... | provenance |  Sink:MaD:425 |
-| Log4jJndiInjectionTest.java:310:56:310:63 | source(...) : String | Log4jJndiInjectionTest.java:310:41:310:63 | (...)... | provenance |  Sink:MaD:110 |
-| Log4jJndiInjectionTest.java:310:56:310:63 | source(...) : String | Log4jJndiInjectionTest.java:310:41:310:63 | (...)... | provenance |  Sink:MaD:426 |
-| Log4jJndiInjectionTest.java:311:51:311:58 | source(...) : String | Log4jJndiInjectionTest.java:311:41:311:58 | (...)... | provenance |  Sink:MaD:111 |
-| Log4jJndiInjectionTest.java:311:51:311:58 | source(...) : String | Log4jJndiInjectionTest.java:311:41:311:58 | (...)... | provenance |  Sink:MaD:427 |
-| Log4jJndiInjectionTest.java:312:59:312:66 | source(...) : String | Log4jJndiInjectionTest.java:312:41:312:66 | (...)... | provenance |  Sink:MaD:112 |
-| Log4jJndiInjectionTest.java:312:59:312:66 | source(...) : String | Log4jJndiInjectionTest.java:312:41:312:66 | (...)... | provenance |  Sink:MaD:428 |
-| Log4jJndiInjectionTest.java:313:59:313:66 | source(...) : String | Log4jJndiInjectionTest.java:313:41:313:66 | (...)... | provenance |  Sink:MaD:113 |
-| Log4jJndiInjectionTest.java:313:59:313:66 | source(...) : String | Log4jJndiInjectionTest.java:313:41:313:66 | (...)... | provenance |  Sink:MaD:429 |
-| Log4jJndiInjectionTest.java:315:50:315:57 | source(...) : String | Log4jJndiInjectionTest.java:315:41:315:57 | (...)... | provenance |  Sink:MaD:115 |
-| Log4jJndiInjectionTest.java:315:50:315:57 | source(...) : String | Log4jJndiInjectionTest.java:315:41:315:57 | (...)... | provenance |  Sink:MaD:431 |
-| Log4jJndiInjectionTest.java:316:50:316:57 | source(...) : String | Log4jJndiInjectionTest.java:316:41:316:57 | (...)... | provenance |  Sink:MaD:125 |
-| Log4jJndiInjectionTest.java:316:50:316:57 | source(...) : String | Log4jJndiInjectionTest.java:316:41:316:57 | (...)... | provenance |  Sink:MaD:441 |
-| Log4jJndiInjectionTest.java:317:56:317:78 | {...} : Object[] [[]] : String | Log4jJndiInjectionTest.java:317:56:317:78 | new Object[] | provenance |  Sink:MaD:125 |
-| Log4jJndiInjectionTest.java:317:56:317:78 | {...} : Object[] [[]] : String | Log4jJndiInjectionTest.java:317:56:317:78 | new Object[] | provenance |  Sink:MaD:441 |
+| Log4jJndiInjectionTest.java:248:50:248:57 | source(...) : String | Log4jJndiInjectionTest.java:248:41:248:57 | (...)... | provenance | Sink:MaD:176 |
+| Log4jJndiInjectionTest.java:248:50:248:57 | source(...) : String | Log4jJndiInjectionTest.java:248:41:248:57 | (...)... | provenance | Sink:MaD:175 |
+| Log4jJndiInjectionTest.java:249:35:249:42 | source(...) : String | Log4jJndiInjectionTest.java:249:26:249:42 | (...)... | provenance | Sink:MaD:176 |
+| Log4jJndiInjectionTest.java:249:35:249:42 | source(...) : String | Log4jJndiInjectionTest.java:249:26:249:42 | (...)... | provenance | Sink:MaD:175 |
+| Log4jJndiInjectionTest.java:250:65:250:72 | source(...) : String | Log4jJndiInjectionTest.java:250:56:250:72 | (...)... | provenance | Sink:MaD:178 |
+| Log4jJndiInjectionTest.java:250:65:250:72 | source(...) : String | Log4jJndiInjectionTest.java:250:56:250:72 | (...)... | provenance | Sink:MaD:177 |
+| Log4jJndiInjectionTest.java:251:50:251:57 | source(...) : String | Log4jJndiInjectionTest.java:251:41:251:57 | (...)... | provenance | Sink:MaD:178 |
+| Log4jJndiInjectionTest.java:251:50:251:57 | source(...) : String | Log4jJndiInjectionTest.java:251:41:251:57 | (...)... | provenance | Sink:MaD:177 |
+| Log4jJndiInjectionTest.java:252:35:252:42 | source(...) : String | Log4jJndiInjectionTest.java:252:26:252:42 | (...)... | provenance | Sink:MaD:178 |
+| Log4jJndiInjectionTest.java:252:35:252:42 | source(...) : String | Log4jJndiInjectionTest.java:252:26:252:42 | (...)... | provenance | Sink:MaD:177 |
+| Log4jJndiInjectionTest.java:253:80:253:87 | source(...) : String | Log4jJndiInjectionTest.java:253:71:253:87 | (...)... | provenance | Sink:MaD:180 |
+| Log4jJndiInjectionTest.java:253:80:253:87 | source(...) : String | Log4jJndiInjectionTest.java:253:71:253:87 | (...)... | provenance | Sink:MaD:179 |
+| Log4jJndiInjectionTest.java:254:65:254:72 | source(...) : String | Log4jJndiInjectionTest.java:254:56:254:72 | (...)... | provenance | Sink:MaD:180 |
+| Log4jJndiInjectionTest.java:254:65:254:72 | source(...) : String | Log4jJndiInjectionTest.java:254:56:254:72 | (...)... | provenance | Sink:MaD:179 |
+| Log4jJndiInjectionTest.java:255:50:255:57 | source(...) : String | Log4jJndiInjectionTest.java:255:41:255:57 | (...)... | provenance | Sink:MaD:180 |
+| Log4jJndiInjectionTest.java:255:50:255:57 | source(...) : String | Log4jJndiInjectionTest.java:255:41:255:57 | (...)... | provenance | Sink:MaD:179 |
+| Log4jJndiInjectionTest.java:256:35:256:42 | source(...) : String | Log4jJndiInjectionTest.java:256:26:256:42 | (...)... | provenance | Sink:MaD:180 |
+| Log4jJndiInjectionTest.java:256:35:256:42 | source(...) : String | Log4jJndiInjectionTest.java:256:26:256:42 | (...)... | provenance | Sink:MaD:179 |
+| Log4jJndiInjectionTest.java:257:95:257:102 | source(...) : String | Log4jJndiInjectionTest.java:257:86:257:102 | (...)... | provenance | Sink:MaD:182 |
+| Log4jJndiInjectionTest.java:257:95:257:102 | source(...) : String | Log4jJndiInjectionTest.java:257:86:257:102 | (...)... | provenance | Sink:MaD:181 |
+| Log4jJndiInjectionTest.java:258:80:258:87 | source(...) : String | Log4jJndiInjectionTest.java:258:71:258:87 | (...)... | provenance | Sink:MaD:182 |
+| Log4jJndiInjectionTest.java:258:80:258:87 | source(...) : String | Log4jJndiInjectionTest.java:258:71:258:87 | (...)... | provenance | Sink:MaD:181 |
+| Log4jJndiInjectionTest.java:259:65:259:72 | source(...) : String | Log4jJndiInjectionTest.java:259:56:259:72 | (...)... | provenance | Sink:MaD:182 |
+| Log4jJndiInjectionTest.java:259:65:259:72 | source(...) : String | Log4jJndiInjectionTest.java:259:56:259:72 | (...)... | provenance | Sink:MaD:181 |
+| Log4jJndiInjectionTest.java:260:50:260:57 | source(...) : String | Log4jJndiInjectionTest.java:260:41:260:57 | (...)... | provenance | Sink:MaD:182 |
+| Log4jJndiInjectionTest.java:260:50:260:57 | source(...) : String | Log4jJndiInjectionTest.java:260:41:260:57 | (...)... | provenance | Sink:MaD:181 |
+| Log4jJndiInjectionTest.java:261:35:261:42 | source(...) : String | Log4jJndiInjectionTest.java:261:26:261:42 | (...)... | provenance | Sink:MaD:182 |
+| Log4jJndiInjectionTest.java:261:35:261:42 | source(...) : String | Log4jJndiInjectionTest.java:261:26:261:42 | (...)... | provenance | Sink:MaD:181 |
+| Log4jJndiInjectionTest.java:262:110:262:117 | source(...) : String | Log4jJndiInjectionTest.java:262:101:262:117 | (...)... | provenance | Sink:MaD:184 |
+| Log4jJndiInjectionTest.java:262:110:262:117 | source(...) : String | Log4jJndiInjectionTest.java:262:101:262:117 | (...)... | provenance | Sink:MaD:183 |
+| Log4jJndiInjectionTest.java:263:95:263:102 | source(...) : String | Log4jJndiInjectionTest.java:263:86:263:102 | (...)... | provenance | Sink:MaD:184 |
+| Log4jJndiInjectionTest.java:263:95:263:102 | source(...) : String | Log4jJndiInjectionTest.java:263:86:263:102 | (...)... | provenance | Sink:MaD:183 |
+| Log4jJndiInjectionTest.java:264:80:264:87 | source(...) : String | Log4jJndiInjectionTest.java:264:71:264:87 | (...)... | provenance | Sink:MaD:184 |
+| Log4jJndiInjectionTest.java:264:80:264:87 | source(...) : String | Log4jJndiInjectionTest.java:264:71:264:87 | (...)... | provenance | Sink:MaD:183 |
+| Log4jJndiInjectionTest.java:265:65:265:72 | source(...) : String | Log4jJndiInjectionTest.java:265:56:265:72 | (...)... | provenance | Sink:MaD:184 |
+| Log4jJndiInjectionTest.java:265:65:265:72 | source(...) : String | Log4jJndiInjectionTest.java:265:56:265:72 | (...)... | provenance | Sink:MaD:183 |
+| Log4jJndiInjectionTest.java:266:50:266:57 | source(...) : String | Log4jJndiInjectionTest.java:266:41:266:57 | (...)... | provenance | Sink:MaD:184 |
+| Log4jJndiInjectionTest.java:266:50:266:57 | source(...) : String | Log4jJndiInjectionTest.java:266:41:266:57 | (...)... | provenance | Sink:MaD:183 |
+| Log4jJndiInjectionTest.java:267:35:267:42 | source(...) : String | Log4jJndiInjectionTest.java:267:26:267:42 | (...)... | provenance | Sink:MaD:184 |
+| Log4jJndiInjectionTest.java:267:35:267:42 | source(...) : String | Log4jJndiInjectionTest.java:267:26:267:42 | (...)... | provenance | Sink:MaD:183 |
+| Log4jJndiInjectionTest.java:268:125:268:132 | source(...) : String | Log4jJndiInjectionTest.java:268:116:268:132 | (...)... | provenance | Sink:MaD:186 |
+| Log4jJndiInjectionTest.java:268:125:268:132 | source(...) : String | Log4jJndiInjectionTest.java:268:116:268:132 | (...)... | provenance | Sink:MaD:185 |
+| Log4jJndiInjectionTest.java:269:110:269:117 | source(...) : String | Log4jJndiInjectionTest.java:269:101:269:117 | (...)... | provenance | Sink:MaD:186 |
+| Log4jJndiInjectionTest.java:269:110:269:117 | source(...) : String | Log4jJndiInjectionTest.java:269:101:269:117 | (...)... | provenance | Sink:MaD:185 |
+| Log4jJndiInjectionTest.java:270:95:270:102 | source(...) : String | Log4jJndiInjectionTest.java:270:86:270:102 | (...)... | provenance | Sink:MaD:186 |
+| Log4jJndiInjectionTest.java:270:95:270:102 | source(...) : String | Log4jJndiInjectionTest.java:270:86:270:102 | (...)... | provenance | Sink:MaD:185 |
+| Log4jJndiInjectionTest.java:271:80:271:87 | source(...) : String | Log4jJndiInjectionTest.java:271:71:271:87 | (...)... | provenance | Sink:MaD:186 |
+| Log4jJndiInjectionTest.java:271:80:271:87 | source(...) : String | Log4jJndiInjectionTest.java:271:71:271:87 | (...)... | provenance | Sink:MaD:185 |
+| Log4jJndiInjectionTest.java:272:65:272:72 | source(...) : String | Log4jJndiInjectionTest.java:272:56:272:72 | (...)... | provenance | Sink:MaD:186 |
+| Log4jJndiInjectionTest.java:272:65:272:72 | source(...) : String | Log4jJndiInjectionTest.java:272:56:272:72 | (...)... | provenance | Sink:MaD:185 |
+| Log4jJndiInjectionTest.java:273:50:273:57 | source(...) : String | Log4jJndiInjectionTest.java:273:41:273:57 | (...)... | provenance | Sink:MaD:186 |
+| Log4jJndiInjectionTest.java:273:50:273:57 | source(...) : String | Log4jJndiInjectionTest.java:273:41:273:57 | (...)... | provenance | Sink:MaD:185 |
+| Log4jJndiInjectionTest.java:274:35:274:42 | source(...) : String | Log4jJndiInjectionTest.java:274:26:274:42 | (...)... | provenance | Sink:MaD:186 |
+| Log4jJndiInjectionTest.java:274:35:274:42 | source(...) : String | Log4jJndiInjectionTest.java:274:26:274:42 | (...)... | provenance | Sink:MaD:185 |
+| Log4jJndiInjectionTest.java:275:140:275:147 | source(...) : String | Log4jJndiInjectionTest.java:275:131:275:147 | (...)... | provenance | Sink:MaD:188 |
+| Log4jJndiInjectionTest.java:275:140:275:147 | source(...) : String | Log4jJndiInjectionTest.java:275:131:275:147 | (...)... | provenance | Sink:MaD:187 |
+| Log4jJndiInjectionTest.java:276:125:276:132 | source(...) : String | Log4jJndiInjectionTest.java:276:116:276:132 | (...)... | provenance | Sink:MaD:188 |
+| Log4jJndiInjectionTest.java:276:125:276:132 | source(...) : String | Log4jJndiInjectionTest.java:276:116:276:132 | (...)... | provenance | Sink:MaD:187 |
+| Log4jJndiInjectionTest.java:277:110:277:117 | source(...) : String | Log4jJndiInjectionTest.java:277:101:277:117 | (...)... | provenance | Sink:MaD:188 |
+| Log4jJndiInjectionTest.java:277:110:277:117 | source(...) : String | Log4jJndiInjectionTest.java:277:101:277:117 | (...)... | provenance | Sink:MaD:187 |
+| Log4jJndiInjectionTest.java:278:95:278:102 | source(...) : String | Log4jJndiInjectionTest.java:278:86:278:102 | (...)... | provenance | Sink:MaD:188 |
+| Log4jJndiInjectionTest.java:278:95:278:102 | source(...) : String | Log4jJndiInjectionTest.java:278:86:278:102 | (...)... | provenance | Sink:MaD:187 |
+| Log4jJndiInjectionTest.java:279:80:279:87 | source(...) : String | Log4jJndiInjectionTest.java:279:71:279:87 | (...)... | provenance | Sink:MaD:188 |
+| Log4jJndiInjectionTest.java:279:80:279:87 | source(...) : String | Log4jJndiInjectionTest.java:279:71:279:87 | (...)... | provenance | Sink:MaD:187 |
+| Log4jJndiInjectionTest.java:280:65:280:72 | source(...) : String | Log4jJndiInjectionTest.java:280:56:280:72 | (...)... | provenance | Sink:MaD:188 |
+| Log4jJndiInjectionTest.java:280:65:280:72 | source(...) : String | Log4jJndiInjectionTest.java:280:56:280:72 | (...)... | provenance | Sink:MaD:187 |
+| Log4jJndiInjectionTest.java:281:50:281:57 | source(...) : String | Log4jJndiInjectionTest.java:281:41:281:57 | (...)... | provenance | Sink:MaD:188 |
+| Log4jJndiInjectionTest.java:281:50:281:57 | source(...) : String | Log4jJndiInjectionTest.java:281:41:281:57 | (...)... | provenance | Sink:MaD:187 |
+| Log4jJndiInjectionTest.java:282:35:282:42 | source(...) : String | Log4jJndiInjectionTest.java:282:26:282:42 | (...)... | provenance | Sink:MaD:188 |
+| Log4jJndiInjectionTest.java:282:35:282:42 | source(...) : String | Log4jJndiInjectionTest.java:282:26:282:42 | (...)... | provenance | Sink:MaD:187 |
+| Log4jJndiInjectionTest.java:283:155:283:162 | source(...) : String | Log4jJndiInjectionTest.java:283:146:283:162 | (...)... | provenance | Sink:MaD:190 |
+| Log4jJndiInjectionTest.java:283:155:283:162 | source(...) : String | Log4jJndiInjectionTest.java:283:146:283:162 | (...)... | provenance | Sink:MaD:189 |
+| Log4jJndiInjectionTest.java:284:140:284:147 | source(...) : String | Log4jJndiInjectionTest.java:284:131:284:147 | (...)... | provenance | Sink:MaD:190 |
+| Log4jJndiInjectionTest.java:284:140:284:147 | source(...) : String | Log4jJndiInjectionTest.java:284:131:284:147 | (...)... | provenance | Sink:MaD:189 |
+| Log4jJndiInjectionTest.java:285:125:285:132 | source(...) : String | Log4jJndiInjectionTest.java:285:116:285:132 | (...)... | provenance | Sink:MaD:190 |
+| Log4jJndiInjectionTest.java:285:125:285:132 | source(...) : String | Log4jJndiInjectionTest.java:285:116:285:132 | (...)... | provenance | Sink:MaD:189 |
+| Log4jJndiInjectionTest.java:286:110:286:117 | source(...) : String | Log4jJndiInjectionTest.java:286:101:286:117 | (...)... | provenance | Sink:MaD:190 |
+| Log4jJndiInjectionTest.java:286:110:286:117 | source(...) : String | Log4jJndiInjectionTest.java:286:101:286:117 | (...)... | provenance | Sink:MaD:189 |
+| Log4jJndiInjectionTest.java:287:95:287:102 | source(...) : String | Log4jJndiInjectionTest.java:287:86:287:102 | (...)... | provenance | Sink:MaD:190 |
+| Log4jJndiInjectionTest.java:287:95:287:102 | source(...) : String | Log4jJndiInjectionTest.java:287:86:287:102 | (...)... | provenance | Sink:MaD:189 |
+| Log4jJndiInjectionTest.java:288:80:288:87 | source(...) : String | Log4jJndiInjectionTest.java:288:71:288:87 | (...)... | provenance | Sink:MaD:190 |
+| Log4jJndiInjectionTest.java:288:80:288:87 | source(...) : String | Log4jJndiInjectionTest.java:288:71:288:87 | (...)... | provenance | Sink:MaD:189 |
+| Log4jJndiInjectionTest.java:289:65:289:72 | source(...) : String | Log4jJndiInjectionTest.java:289:56:289:72 | (...)... | provenance | Sink:MaD:190 |
+| Log4jJndiInjectionTest.java:289:65:289:72 | source(...) : String | Log4jJndiInjectionTest.java:289:56:289:72 | (...)... | provenance | Sink:MaD:189 |
+| Log4jJndiInjectionTest.java:290:50:290:57 | source(...) : String | Log4jJndiInjectionTest.java:290:41:290:57 | (...)... | provenance | Sink:MaD:190 |
+| Log4jJndiInjectionTest.java:290:50:290:57 | source(...) : String | Log4jJndiInjectionTest.java:290:41:290:57 | (...)... | provenance | Sink:MaD:189 |
+| Log4jJndiInjectionTest.java:291:35:291:42 | source(...) : String | Log4jJndiInjectionTest.java:291:26:291:42 | (...)... | provenance | Sink:MaD:190 |
+| Log4jJndiInjectionTest.java:291:35:291:42 | source(...) : String | Log4jJndiInjectionTest.java:291:26:291:42 | (...)... | provenance | Sink:MaD:189 |
+| Log4jJndiInjectionTest.java:292:170:292:177 | source(...) : String | Log4jJndiInjectionTest.java:292:161:292:177 | (...)... | provenance | Sink:MaD:192 |
+| Log4jJndiInjectionTest.java:292:170:292:177 | source(...) : String | Log4jJndiInjectionTest.java:292:161:292:177 | (...)... | provenance | Sink:MaD:191 |
+| Log4jJndiInjectionTest.java:293:155:293:162 | source(...) : String | Log4jJndiInjectionTest.java:293:146:293:162 | (...)... | provenance | Sink:MaD:192 |
+| Log4jJndiInjectionTest.java:293:155:293:162 | source(...) : String | Log4jJndiInjectionTest.java:293:146:293:162 | (...)... | provenance | Sink:MaD:191 |
+| Log4jJndiInjectionTest.java:294:140:294:147 | source(...) : String | Log4jJndiInjectionTest.java:294:131:294:147 | (...)... | provenance | Sink:MaD:192 |
+| Log4jJndiInjectionTest.java:294:140:294:147 | source(...) : String | Log4jJndiInjectionTest.java:294:131:294:147 | (...)... | provenance | Sink:MaD:191 |
+| Log4jJndiInjectionTest.java:295:125:295:132 | source(...) : String | Log4jJndiInjectionTest.java:295:116:295:132 | (...)... | provenance | Sink:MaD:192 |
+| Log4jJndiInjectionTest.java:295:125:295:132 | source(...) : String | Log4jJndiInjectionTest.java:295:116:295:132 | (...)... | provenance | Sink:MaD:191 |
+| Log4jJndiInjectionTest.java:296:110:296:117 | source(...) : String | Log4jJndiInjectionTest.java:296:101:296:117 | (...)... | provenance | Sink:MaD:192 |
+| Log4jJndiInjectionTest.java:296:110:296:117 | source(...) : String | Log4jJndiInjectionTest.java:296:101:296:117 | (...)... | provenance | Sink:MaD:191 |
+| Log4jJndiInjectionTest.java:297:95:297:102 | source(...) : String | Log4jJndiInjectionTest.java:297:86:297:102 | (...)... | provenance | Sink:MaD:192 |
+| Log4jJndiInjectionTest.java:297:95:297:102 | source(...) : String | Log4jJndiInjectionTest.java:297:86:297:102 | (...)... | provenance | Sink:MaD:191 |
+| Log4jJndiInjectionTest.java:298:80:298:87 | source(...) : String | Log4jJndiInjectionTest.java:298:71:298:87 | (...)... | provenance | Sink:MaD:192 |
+| Log4jJndiInjectionTest.java:298:80:298:87 | source(...) : String | Log4jJndiInjectionTest.java:298:71:298:87 | (...)... | provenance | Sink:MaD:191 |
+| Log4jJndiInjectionTest.java:299:65:299:72 | source(...) : String | Log4jJndiInjectionTest.java:299:56:299:72 | (...)... | provenance | Sink:MaD:192 |
+| Log4jJndiInjectionTest.java:299:65:299:72 | source(...) : String | Log4jJndiInjectionTest.java:299:56:299:72 | (...)... | provenance | Sink:MaD:191 |
+| Log4jJndiInjectionTest.java:300:50:300:57 | source(...) : String | Log4jJndiInjectionTest.java:300:41:300:57 | (...)... | provenance | Sink:MaD:192 |
+| Log4jJndiInjectionTest.java:300:50:300:57 | source(...) : String | Log4jJndiInjectionTest.java:300:41:300:57 | (...)... | provenance | Sink:MaD:191 |
+| Log4jJndiInjectionTest.java:301:35:301:42 | source(...) : String | Log4jJndiInjectionTest.java:301:26:301:42 | (...)... | provenance | Sink:MaD:192 |
+| Log4jJndiInjectionTest.java:301:35:301:42 | source(...) : String | Log4jJndiInjectionTest.java:301:26:301:42 | (...)... | provenance | Sink:MaD:191 |
+| Log4jJndiInjectionTest.java:302:35:302:42 | source(...) : String | Log4jJndiInjectionTest.java:302:26:302:42 | (...)... | provenance | Sink:MaD:176 |
+| Log4jJndiInjectionTest.java:302:35:302:42 | source(...) : String | Log4jJndiInjectionTest.java:302:26:302:42 | (...)... | provenance | Sink:MaD:175 |
+| Log4jJndiInjectionTest.java:303:55:303:62 | source(...) : String | Log4jJndiInjectionTest.java:303:41:303:62 | (...)... | provenance | Sink:MaD:176 |
+| Log4jJndiInjectionTest.java:303:55:303:62 | source(...) : String | Log4jJndiInjectionTest.java:303:41:303:62 | (...)... | provenance | Sink:MaD:175 |
+| Log4jJndiInjectionTest.java:304:35:304:42 | source(...) : String | Log4jJndiInjectionTest.java:304:26:304:42 | (...)... | provenance | Sink:MaD:196 |
+| Log4jJndiInjectionTest.java:304:35:304:42 | source(...) : String | Log4jJndiInjectionTest.java:304:26:304:42 | (...)... | provenance | Sink:MaD:195 |
+| Log4jJndiInjectionTest.java:305:40:305:47 | source(...) : String | Log4jJndiInjectionTest.java:305:26:305:47 | (...)... | provenance | Sink:MaD:198 |
+| Log4jJndiInjectionTest.java:305:40:305:47 | source(...) : String | Log4jJndiInjectionTest.java:305:26:305:47 | (...)... | provenance | Sink:MaD:197 |
+| Log4jJndiInjectionTest.java:306:40:306:47 | source(...) : String | Log4jJndiInjectionTest.java:306:26:306:47 | (...)... | provenance | Sink:MaD:200 |
+| Log4jJndiInjectionTest.java:306:40:306:47 | source(...) : String | Log4jJndiInjectionTest.java:306:26:306:47 | (...)... | provenance | Sink:MaD:199 |
+| Log4jJndiInjectionTest.java:307:41:307:48 | source(...) : String | Log4jJndiInjectionTest.java:307:26:307:48 | (...)... | provenance | Sink:MaD:202 |
+| Log4jJndiInjectionTest.java:307:41:307:48 | source(...) : String | Log4jJndiInjectionTest.java:307:26:307:48 | (...)... | provenance | Sink:MaD:201 |
+| Log4jJndiInjectionTest.java:308:41:308:48 | source(...) : String | Log4jJndiInjectionTest.java:308:26:308:48 | (...)... | provenance | Sink:MaD:204 |
+| Log4jJndiInjectionTest.java:308:41:308:48 | source(...) : String | Log4jJndiInjectionTest.java:308:26:308:48 | (...)... | provenance | Sink:MaD:203 |
+| Log4jJndiInjectionTest.java:309:56:309:63 | source(...) : String | Log4jJndiInjectionTest.java:309:41:309:63 | (...)... | provenance | Sink:MaD:206 |
+| Log4jJndiInjectionTest.java:309:56:309:63 | source(...) : String | Log4jJndiInjectionTest.java:309:41:309:63 | (...)... | provenance | Sink:MaD:205 |
+| Log4jJndiInjectionTest.java:310:56:310:63 | source(...) : String | Log4jJndiInjectionTest.java:310:41:310:63 | (...)... | provenance | Sink:MaD:208 |
+| Log4jJndiInjectionTest.java:310:56:310:63 | source(...) : String | Log4jJndiInjectionTest.java:310:41:310:63 | (...)... | provenance | Sink:MaD:207 |
+| Log4jJndiInjectionTest.java:311:51:311:58 | source(...) : String | Log4jJndiInjectionTest.java:311:41:311:58 | (...)... | provenance | Sink:MaD:210 |
+| Log4jJndiInjectionTest.java:311:51:311:58 | source(...) : String | Log4jJndiInjectionTest.java:311:41:311:58 | (...)... | provenance | Sink:MaD:209 |
+| Log4jJndiInjectionTest.java:312:59:312:66 | source(...) : String | Log4jJndiInjectionTest.java:312:41:312:66 | (...)... | provenance | Sink:MaD:212 |
+| Log4jJndiInjectionTest.java:312:59:312:66 | source(...) : String | Log4jJndiInjectionTest.java:312:41:312:66 | (...)... | provenance | Sink:MaD:211 |
+| Log4jJndiInjectionTest.java:313:59:313:66 | source(...) : String | Log4jJndiInjectionTest.java:313:41:313:66 | (...)... | provenance | Sink:MaD:214 |
+| Log4jJndiInjectionTest.java:313:59:313:66 | source(...) : String | Log4jJndiInjectionTest.java:313:41:313:66 | (...)... | provenance | Sink:MaD:213 |
+| Log4jJndiInjectionTest.java:315:50:315:57 | source(...) : String | Log4jJndiInjectionTest.java:315:41:315:57 | (...)... | provenance | Sink:MaD:218 |
+| Log4jJndiInjectionTest.java:315:50:315:57 | source(...) : String | Log4jJndiInjectionTest.java:315:41:315:57 | (...)... | provenance | Sink:MaD:217 |
+| Log4jJndiInjectionTest.java:316:50:316:57 | source(...) : String | Log4jJndiInjectionTest.java:316:41:316:57 | (...)... | provenance | Sink:MaD:238 |
+| Log4jJndiInjectionTest.java:316:50:316:57 | source(...) : String | Log4jJndiInjectionTest.java:316:41:316:57 | (...)... | provenance | Sink:MaD:237 |
+| Log4jJndiInjectionTest.java:317:56:317:78 | {...} : Object[] [[]] : String | Log4jJndiInjectionTest.java:317:56:317:78 | new Object[] | provenance | Sink:MaD:238 |
+| Log4jJndiInjectionTest.java:317:56:317:78 | {...} : Object[] [[]] : String | Log4jJndiInjectionTest.java:317:56:317:78 | new Object[] | provenance | Sink:MaD:237 |
 | Log4jJndiInjectionTest.java:317:70:317:77 | source(...) : String | Log4jJndiInjectionTest.java:317:56:317:78 | {...} : Object[] [[]] : String | provenance |  |
-| Log4jJndiInjectionTest.java:318:65:318:72 | source(...) : String | Log4jJndiInjectionTest.java:318:56:318:72 | (...)... | provenance |  Sink:MaD:116 |
-| Log4jJndiInjectionTest.java:318:65:318:72 | source(...) : String | Log4jJndiInjectionTest.java:318:56:318:72 | (...)... | provenance |  Sink:MaD:432 |
-| Log4jJndiInjectionTest.java:319:50:319:57 | source(...) : String | Log4jJndiInjectionTest.java:319:41:319:57 | (...)... | provenance |  Sink:MaD:116 |
-| Log4jJndiInjectionTest.java:319:50:319:57 | source(...) : String | Log4jJndiInjectionTest.java:319:41:319:57 | (...)... | provenance |  Sink:MaD:432 |
-| Log4jJndiInjectionTest.java:320:80:320:87 | source(...) : String | Log4jJndiInjectionTest.java:320:71:320:87 | (...)... | provenance |  Sink:MaD:117 |
-| Log4jJndiInjectionTest.java:320:80:320:87 | source(...) : String | Log4jJndiInjectionTest.java:320:71:320:87 | (...)... | provenance |  Sink:MaD:433 |
-| Log4jJndiInjectionTest.java:321:65:321:72 | source(...) : String | Log4jJndiInjectionTest.java:321:56:321:72 | (...)... | provenance |  Sink:MaD:117 |
-| Log4jJndiInjectionTest.java:321:65:321:72 | source(...) : String | Log4jJndiInjectionTest.java:321:56:321:72 | (...)... | provenance |  Sink:MaD:433 |
-| Log4jJndiInjectionTest.java:322:50:322:57 | source(...) : String | Log4jJndiInjectionTest.java:322:41:322:57 | (...)... | provenance |  Sink:MaD:117 |
-| Log4jJndiInjectionTest.java:322:50:322:57 | source(...) : String | Log4jJndiInjectionTest.java:322:41:322:57 | (...)... | provenance |  Sink:MaD:433 |
-| Log4jJndiInjectionTest.java:323:95:323:102 | source(...) : String | Log4jJndiInjectionTest.java:323:86:323:102 | (...)... | provenance |  Sink:MaD:118 |
-| Log4jJndiInjectionTest.java:323:95:323:102 | source(...) : String | Log4jJndiInjectionTest.java:323:86:323:102 | (...)... | provenance |  Sink:MaD:434 |
-| Log4jJndiInjectionTest.java:324:80:324:87 | source(...) : String | Log4jJndiInjectionTest.java:324:71:324:87 | (...)... | provenance |  Sink:MaD:118 |
-| Log4jJndiInjectionTest.java:324:80:324:87 | source(...) : String | Log4jJndiInjectionTest.java:324:71:324:87 | (...)... | provenance |  Sink:MaD:434 |
-| Log4jJndiInjectionTest.java:325:65:325:72 | source(...) : String | Log4jJndiInjectionTest.java:325:56:325:72 | (...)... | provenance |  Sink:MaD:118 |
-| Log4jJndiInjectionTest.java:325:65:325:72 | source(...) : String | Log4jJndiInjectionTest.java:325:56:325:72 | (...)... | provenance |  Sink:MaD:434 |
-| Log4jJndiInjectionTest.java:326:50:326:57 | source(...) : String | Log4jJndiInjectionTest.java:326:41:326:57 | (...)... | provenance |  Sink:MaD:118 |
-| Log4jJndiInjectionTest.java:326:50:326:57 | source(...) : String | Log4jJndiInjectionTest.java:326:41:326:57 | (...)... | provenance |  Sink:MaD:434 |
-| Log4jJndiInjectionTest.java:327:110:327:117 | source(...) : String | Log4jJndiInjectionTest.java:327:101:327:117 | (...)... | provenance |  Sink:MaD:119 |
-| Log4jJndiInjectionTest.java:327:110:327:117 | source(...) : String | Log4jJndiInjectionTest.java:327:101:327:117 | (...)... | provenance |  Sink:MaD:435 |
-| Log4jJndiInjectionTest.java:328:95:328:102 | source(...) : String | Log4jJndiInjectionTest.java:328:86:328:102 | (...)... | provenance |  Sink:MaD:119 |
-| Log4jJndiInjectionTest.java:328:95:328:102 | source(...) : String | Log4jJndiInjectionTest.java:328:86:328:102 | (...)... | provenance |  Sink:MaD:435 |
-| Log4jJndiInjectionTest.java:329:80:329:87 | source(...) : String | Log4jJndiInjectionTest.java:329:71:329:87 | (...)... | provenance |  Sink:MaD:119 |
-| Log4jJndiInjectionTest.java:329:80:329:87 | source(...) : String | Log4jJndiInjectionTest.java:329:71:329:87 | (...)... | provenance |  Sink:MaD:435 |
-| Log4jJndiInjectionTest.java:330:65:330:72 | source(...) : String | Log4jJndiInjectionTest.java:330:56:330:72 | (...)... | provenance |  Sink:MaD:119 |
-| Log4jJndiInjectionTest.java:330:65:330:72 | source(...) : String | Log4jJndiInjectionTest.java:330:56:330:72 | (...)... | provenance |  Sink:MaD:435 |
-| Log4jJndiInjectionTest.java:331:50:331:57 | source(...) : String | Log4jJndiInjectionTest.java:331:41:331:57 | (...)... | provenance |  Sink:MaD:119 |
-| Log4jJndiInjectionTest.java:331:50:331:57 | source(...) : String | Log4jJndiInjectionTest.java:331:41:331:57 | (...)... | provenance |  Sink:MaD:435 |
-| Log4jJndiInjectionTest.java:332:125:332:132 | source(...) : String | Log4jJndiInjectionTest.java:332:116:332:132 | (...)... | provenance |  Sink:MaD:120 |
-| Log4jJndiInjectionTest.java:332:125:332:132 | source(...) : String | Log4jJndiInjectionTest.java:332:116:332:132 | (...)... | provenance |  Sink:MaD:436 |
-| Log4jJndiInjectionTest.java:333:110:333:117 | source(...) : String | Log4jJndiInjectionTest.java:333:101:333:117 | (...)... | provenance |  Sink:MaD:120 |
-| Log4jJndiInjectionTest.java:333:110:333:117 | source(...) : String | Log4jJndiInjectionTest.java:333:101:333:117 | (...)... | provenance |  Sink:MaD:436 |
-| Log4jJndiInjectionTest.java:334:95:334:102 | source(...) : String | Log4jJndiInjectionTest.java:334:86:334:102 | (...)... | provenance |  Sink:MaD:120 |
-| Log4jJndiInjectionTest.java:334:95:334:102 | source(...) : String | Log4jJndiInjectionTest.java:334:86:334:102 | (...)... | provenance |  Sink:MaD:436 |
-| Log4jJndiInjectionTest.java:335:80:335:87 | source(...) : String | Log4jJndiInjectionTest.java:335:71:335:87 | (...)... | provenance |  Sink:MaD:120 |
-| Log4jJndiInjectionTest.java:335:80:335:87 | source(...) : String | Log4jJndiInjectionTest.java:335:71:335:87 | (...)... | provenance |  Sink:MaD:436 |
-| Log4jJndiInjectionTest.java:336:65:336:72 | source(...) : String | Log4jJndiInjectionTest.java:336:56:336:72 | (...)... | provenance |  Sink:MaD:120 |
-| Log4jJndiInjectionTest.java:336:65:336:72 | source(...) : String | Log4jJndiInjectionTest.java:336:56:336:72 | (...)... | provenance |  Sink:MaD:436 |
-| Log4jJndiInjectionTest.java:337:50:337:57 | source(...) : String | Log4jJndiInjectionTest.java:337:41:337:57 | (...)... | provenance |  Sink:MaD:120 |
-| Log4jJndiInjectionTest.java:337:50:337:57 | source(...) : String | Log4jJndiInjectionTest.java:337:41:337:57 | (...)... | provenance |  Sink:MaD:436 |
-| Log4jJndiInjectionTest.java:338:140:338:147 | source(...) : String | Log4jJndiInjectionTest.java:338:131:338:147 | (...)... | provenance |  Sink:MaD:121 |
-| Log4jJndiInjectionTest.java:338:140:338:147 | source(...) : String | Log4jJndiInjectionTest.java:338:131:338:147 | (...)... | provenance |  Sink:MaD:437 |
-| Log4jJndiInjectionTest.java:339:125:339:132 | source(...) : String | Log4jJndiInjectionTest.java:339:116:339:132 | (...)... | provenance |  Sink:MaD:121 |
-| Log4jJndiInjectionTest.java:339:125:339:132 | source(...) : String | Log4jJndiInjectionTest.java:339:116:339:132 | (...)... | provenance |  Sink:MaD:437 |
-| Log4jJndiInjectionTest.java:340:110:340:117 | source(...) : String | Log4jJndiInjectionTest.java:340:101:340:117 | (...)... | provenance |  Sink:MaD:121 |
-| Log4jJndiInjectionTest.java:340:110:340:117 | source(...) : String | Log4jJndiInjectionTest.java:340:101:340:117 | (...)... | provenance |  Sink:MaD:437 |
-| Log4jJndiInjectionTest.java:341:95:341:102 | source(...) : String | Log4jJndiInjectionTest.java:341:86:341:102 | (...)... | provenance |  Sink:MaD:121 |
-| Log4jJndiInjectionTest.java:341:95:341:102 | source(...) : String | Log4jJndiInjectionTest.java:341:86:341:102 | (...)... | provenance |  Sink:MaD:437 |
-| Log4jJndiInjectionTest.java:342:80:342:87 | source(...) : String | Log4jJndiInjectionTest.java:342:71:342:87 | (...)... | provenance |  Sink:MaD:121 |
-| Log4jJndiInjectionTest.java:342:80:342:87 | source(...) : String | Log4jJndiInjectionTest.java:342:71:342:87 | (...)... | provenance |  Sink:MaD:437 |
-| Log4jJndiInjectionTest.java:343:65:343:72 | source(...) : String | Log4jJndiInjectionTest.java:343:56:343:72 | (...)... | provenance |  Sink:MaD:121 |
-| Log4jJndiInjectionTest.java:343:65:343:72 | source(...) : String | Log4jJndiInjectionTest.java:343:56:343:72 | (...)... | provenance |  Sink:MaD:437 |
-| Log4jJndiInjectionTest.java:344:50:344:57 | source(...) : String | Log4jJndiInjectionTest.java:344:41:344:57 | (...)... | provenance |  Sink:MaD:121 |
-| Log4jJndiInjectionTest.java:344:50:344:57 | source(...) : String | Log4jJndiInjectionTest.java:344:41:344:57 | (...)... | provenance |  Sink:MaD:437 |
-| Log4jJndiInjectionTest.java:345:155:345:162 | source(...) : String | Log4jJndiInjectionTest.java:345:146:345:162 | (...)... | provenance |  Sink:MaD:122 |
-| Log4jJndiInjectionTest.java:345:155:345:162 | source(...) : String | Log4jJndiInjectionTest.java:345:146:345:162 | (...)... | provenance |  Sink:MaD:438 |
-| Log4jJndiInjectionTest.java:346:140:346:147 | source(...) : String | Log4jJndiInjectionTest.java:346:131:346:147 | (...)... | provenance |  Sink:MaD:122 |
-| Log4jJndiInjectionTest.java:346:140:346:147 | source(...) : String | Log4jJndiInjectionTest.java:346:131:346:147 | (...)... | provenance |  Sink:MaD:438 |
-| Log4jJndiInjectionTest.java:347:125:347:132 | source(...) : String | Log4jJndiInjectionTest.java:347:116:347:132 | (...)... | provenance |  Sink:MaD:122 |
-| Log4jJndiInjectionTest.java:347:125:347:132 | source(...) : String | Log4jJndiInjectionTest.java:347:116:347:132 | (...)... | provenance |  Sink:MaD:438 |
-| Log4jJndiInjectionTest.java:348:110:348:117 | source(...) : String | Log4jJndiInjectionTest.java:348:101:348:117 | (...)... | provenance |  Sink:MaD:122 |
-| Log4jJndiInjectionTest.java:348:110:348:117 | source(...) : String | Log4jJndiInjectionTest.java:348:101:348:117 | (...)... | provenance |  Sink:MaD:438 |
-| Log4jJndiInjectionTest.java:349:95:349:102 | source(...) : String | Log4jJndiInjectionTest.java:349:86:349:102 | (...)... | provenance |  Sink:MaD:122 |
-| Log4jJndiInjectionTest.java:349:95:349:102 | source(...) : String | Log4jJndiInjectionTest.java:349:86:349:102 | (...)... | provenance |  Sink:MaD:438 |
-| Log4jJndiInjectionTest.java:350:80:350:87 | source(...) : String | Log4jJndiInjectionTest.java:350:71:350:87 | (...)... | provenance |  Sink:MaD:122 |
-| Log4jJndiInjectionTest.java:350:80:350:87 | source(...) : String | Log4jJndiInjectionTest.java:350:71:350:87 | (...)... | provenance |  Sink:MaD:438 |
-| Log4jJndiInjectionTest.java:351:65:351:72 | source(...) : String | Log4jJndiInjectionTest.java:351:56:351:72 | (...)... | provenance |  Sink:MaD:122 |
-| Log4jJndiInjectionTest.java:351:65:351:72 | source(...) : String | Log4jJndiInjectionTest.java:351:56:351:72 | (...)... | provenance |  Sink:MaD:438 |
-| Log4jJndiInjectionTest.java:352:50:352:57 | source(...) : String | Log4jJndiInjectionTest.java:352:41:352:57 | (...)... | provenance |  Sink:MaD:122 |
-| Log4jJndiInjectionTest.java:352:50:352:57 | source(...) : String | Log4jJndiInjectionTest.java:352:41:352:57 | (...)... | provenance |  Sink:MaD:438 |
-| Log4jJndiInjectionTest.java:353:170:353:177 | source(...) : String | Log4jJndiInjectionTest.java:353:161:353:177 | (...)... | provenance |  Sink:MaD:123 |
-| Log4jJndiInjectionTest.java:353:170:353:177 | source(...) : String | Log4jJndiInjectionTest.java:353:161:353:177 | (...)... | provenance |  Sink:MaD:439 |
-| Log4jJndiInjectionTest.java:354:155:354:162 | source(...) : String | Log4jJndiInjectionTest.java:354:146:354:162 | (...)... | provenance |  Sink:MaD:123 |
-| Log4jJndiInjectionTest.java:354:155:354:162 | source(...) : String | Log4jJndiInjectionTest.java:354:146:354:162 | (...)... | provenance |  Sink:MaD:439 |
-| Log4jJndiInjectionTest.java:355:140:355:147 | source(...) : String | Log4jJndiInjectionTest.java:355:131:355:147 | (...)... | provenance |  Sink:MaD:123 |
-| Log4jJndiInjectionTest.java:355:140:355:147 | source(...) : String | Log4jJndiInjectionTest.java:355:131:355:147 | (...)... | provenance |  Sink:MaD:439 |
-| Log4jJndiInjectionTest.java:356:125:356:132 | source(...) : String | Log4jJndiInjectionTest.java:356:116:356:132 | (...)... | provenance |  Sink:MaD:123 |
-| Log4jJndiInjectionTest.java:356:125:356:132 | source(...) : String | Log4jJndiInjectionTest.java:356:116:356:132 | (...)... | provenance |  Sink:MaD:439 |
-| Log4jJndiInjectionTest.java:357:110:357:117 | source(...) : String | Log4jJndiInjectionTest.java:357:101:357:117 | (...)... | provenance |  Sink:MaD:123 |
-| Log4jJndiInjectionTest.java:357:110:357:117 | source(...) : String | Log4jJndiInjectionTest.java:357:101:357:117 | (...)... | provenance |  Sink:MaD:439 |
-| Log4jJndiInjectionTest.java:358:95:358:102 | source(...) : String | Log4jJndiInjectionTest.java:358:86:358:102 | (...)... | provenance |  Sink:MaD:123 |
-| Log4jJndiInjectionTest.java:358:95:358:102 | source(...) : String | Log4jJndiInjectionTest.java:358:86:358:102 | (...)... | provenance |  Sink:MaD:439 |
-| Log4jJndiInjectionTest.java:359:80:359:87 | source(...) : String | Log4jJndiInjectionTest.java:359:71:359:87 | (...)... | provenance |  Sink:MaD:123 |
-| Log4jJndiInjectionTest.java:359:80:359:87 | source(...) : String | Log4jJndiInjectionTest.java:359:71:359:87 | (...)... | provenance |  Sink:MaD:439 |
-| Log4jJndiInjectionTest.java:360:65:360:72 | source(...) : String | Log4jJndiInjectionTest.java:360:56:360:72 | (...)... | provenance |  Sink:MaD:123 |
-| Log4jJndiInjectionTest.java:360:65:360:72 | source(...) : String | Log4jJndiInjectionTest.java:360:56:360:72 | (...)... | provenance |  Sink:MaD:439 |
-| Log4jJndiInjectionTest.java:361:50:361:57 | source(...) : String | Log4jJndiInjectionTest.java:361:41:361:57 | (...)... | provenance |  Sink:MaD:123 |
-| Log4jJndiInjectionTest.java:361:50:361:57 | source(...) : String | Log4jJndiInjectionTest.java:361:41:361:57 | (...)... | provenance |  Sink:MaD:439 |
-| Log4jJndiInjectionTest.java:362:185:362:192 | source(...) : String | Log4jJndiInjectionTest.java:362:176:362:192 | (...)... | provenance |  Sink:MaD:124 |
-| Log4jJndiInjectionTest.java:362:185:362:192 | source(...) : String | Log4jJndiInjectionTest.java:362:176:362:192 | (...)... | provenance |  Sink:MaD:440 |
-| Log4jJndiInjectionTest.java:363:170:363:177 | source(...) : String | Log4jJndiInjectionTest.java:363:161:363:177 | (...)... | provenance |  Sink:MaD:124 |
-| Log4jJndiInjectionTest.java:363:170:363:177 | source(...) : String | Log4jJndiInjectionTest.java:363:161:363:177 | (...)... | provenance |  Sink:MaD:440 |
-| Log4jJndiInjectionTest.java:364:155:364:162 | source(...) : String | Log4jJndiInjectionTest.java:364:146:364:162 | (...)... | provenance |  Sink:MaD:124 |
-| Log4jJndiInjectionTest.java:364:155:364:162 | source(...) : String | Log4jJndiInjectionTest.java:364:146:364:162 | (...)... | provenance |  Sink:MaD:440 |
-| Log4jJndiInjectionTest.java:365:140:365:147 | source(...) : String | Log4jJndiInjectionTest.java:365:131:365:147 | (...)... | provenance |  Sink:MaD:124 |
-| Log4jJndiInjectionTest.java:365:140:365:147 | source(...) : String | Log4jJndiInjectionTest.java:365:131:365:147 | (...)... | provenance |  Sink:MaD:440 |
-| Log4jJndiInjectionTest.java:366:125:366:132 | source(...) : String | Log4jJndiInjectionTest.java:366:116:366:132 | (...)... | provenance |  Sink:MaD:124 |
-| Log4jJndiInjectionTest.java:366:125:366:132 | source(...) : String | Log4jJndiInjectionTest.java:366:116:366:132 | (...)... | provenance |  Sink:MaD:440 |
-| Log4jJndiInjectionTest.java:367:110:367:117 | source(...) : String | Log4jJndiInjectionTest.java:367:101:367:117 | (...)... | provenance |  Sink:MaD:124 |
-| Log4jJndiInjectionTest.java:367:110:367:117 | source(...) : String | Log4jJndiInjectionTest.java:367:101:367:117 | (...)... | provenance |  Sink:MaD:440 |
-| Log4jJndiInjectionTest.java:368:95:368:102 | source(...) : String | Log4jJndiInjectionTest.java:368:86:368:102 | (...)... | provenance |  Sink:MaD:124 |
-| Log4jJndiInjectionTest.java:368:95:368:102 | source(...) : String | Log4jJndiInjectionTest.java:368:86:368:102 | (...)... | provenance |  Sink:MaD:440 |
-| Log4jJndiInjectionTest.java:369:80:369:87 | source(...) : String | Log4jJndiInjectionTest.java:369:71:369:87 | (...)... | provenance |  Sink:MaD:124 |
-| Log4jJndiInjectionTest.java:369:80:369:87 | source(...) : String | Log4jJndiInjectionTest.java:369:71:369:87 | (...)... | provenance |  Sink:MaD:440 |
-| Log4jJndiInjectionTest.java:370:65:370:72 | source(...) : String | Log4jJndiInjectionTest.java:370:56:370:72 | (...)... | provenance |  Sink:MaD:124 |
-| Log4jJndiInjectionTest.java:370:65:370:72 | source(...) : String | Log4jJndiInjectionTest.java:370:56:370:72 | (...)... | provenance |  Sink:MaD:440 |
-| Log4jJndiInjectionTest.java:371:50:371:57 | source(...) : String | Log4jJndiInjectionTest.java:371:41:371:57 | (...)... | provenance |  Sink:MaD:124 |
-| Log4jJndiInjectionTest.java:371:50:371:57 | source(...) : String | Log4jJndiInjectionTest.java:371:41:371:57 | (...)... | provenance |  Sink:MaD:440 |
-| Log4jJndiInjectionTest.java:372:50:372:57 | source(...) : String | Log4jJndiInjectionTest.java:372:41:372:57 | (...)... | provenance |  Sink:MaD:116 |
-| Log4jJndiInjectionTest.java:372:50:372:57 | source(...) : String | Log4jJndiInjectionTest.java:372:41:372:57 | (...)... | provenance |  Sink:MaD:432 |
-| Log4jJndiInjectionTest.java:373:70:373:77 | source(...) : String | Log4jJndiInjectionTest.java:373:56:373:77 | (...)... | provenance |  Sink:MaD:116 |
-| Log4jJndiInjectionTest.java:373:70:373:77 | source(...) : String | Log4jJndiInjectionTest.java:373:56:373:77 | (...)... | provenance |  Sink:MaD:432 |
-| Log4jJndiInjectionTest.java:374:50:374:57 | source(...) : String | Log4jJndiInjectionTest.java:374:41:374:57 | (...)... | provenance |  Sink:MaD:126 |
-| Log4jJndiInjectionTest.java:374:50:374:57 | source(...) : String | Log4jJndiInjectionTest.java:374:41:374:57 | (...)... | provenance |  Sink:MaD:442 |
-| Log4jJndiInjectionTest.java:375:55:375:62 | source(...) : String | Log4jJndiInjectionTest.java:375:41:375:62 | (...)... | provenance |  Sink:MaD:127 |
-| Log4jJndiInjectionTest.java:375:55:375:62 | source(...) : String | Log4jJndiInjectionTest.java:375:41:375:62 | (...)... | provenance |  Sink:MaD:443 |
-| Log4jJndiInjectionTest.java:376:55:376:62 | source(...) : String | Log4jJndiInjectionTest.java:376:41:376:62 | (...)... | provenance |  Sink:MaD:128 |
-| Log4jJndiInjectionTest.java:376:55:376:62 | source(...) : String | Log4jJndiInjectionTest.java:376:41:376:62 | (...)... | provenance |  Sink:MaD:444 |
-| Log4jJndiInjectionTest.java:377:44:377:51 | source(...) : String | Log4jJndiInjectionTest.java:377:26:377:51 | (...)... | provenance |  Sink:MaD:131 |
-| Log4jJndiInjectionTest.java:377:44:377:51 | source(...) : String | Log4jJndiInjectionTest.java:377:26:377:51 | (...)... | provenance |  Sink:MaD:447 |
-| Log4jJndiInjectionTest.java:378:44:378:51 | source(...) : String | Log4jJndiInjectionTest.java:378:26:378:51 | (...)... | provenance |  Sink:MaD:132 |
-| Log4jJndiInjectionTest.java:378:44:378:51 | source(...) : String | Log4jJndiInjectionTest.java:378:26:378:51 | (...)... | provenance |  Sink:MaD:448 |
-| Log4jJndiInjectionTest.java:379:36:379:43 | source(...) : String | Log4jJndiInjectionTest.java:379:26:379:43 | (...)... | provenance |  Sink:MaD:129 |
-| Log4jJndiInjectionTest.java:379:36:379:43 | source(...) : String | Log4jJndiInjectionTest.java:379:26:379:43 | (...)... | provenance |  Sink:MaD:445 |
-| Log4jJndiInjectionTest.java:380:36:380:43 | source(...) : String | Log4jJndiInjectionTest.java:380:26:380:43 | (...)... | provenance |  Sink:MaD:130 |
-| Log4jJndiInjectionTest.java:380:36:380:43 | source(...) : String | Log4jJndiInjectionTest.java:380:26:380:43 | (...)... | provenance |  Sink:MaD:446 |
-| Log4jJndiInjectionTest.java:383:35:383:42 | source(...) : String | Log4jJndiInjectionTest.java:383:26:383:42 | (...)... | provenance |  Sink:MaD:135 |
-| Log4jJndiInjectionTest.java:383:35:383:42 | source(...) : String | Log4jJndiInjectionTest.java:383:26:383:42 | (...)... | provenance |  Sink:MaD:451 |
-| Log4jJndiInjectionTest.java:384:35:384:42 | source(...) : String | Log4jJndiInjectionTest.java:384:26:384:42 | (...)... | provenance |  Sink:MaD:145 |
-| Log4jJndiInjectionTest.java:384:35:384:42 | source(...) : String | Log4jJndiInjectionTest.java:384:26:384:42 | (...)... | provenance |  Sink:MaD:461 |
-| Log4jJndiInjectionTest.java:385:41:385:63 | {...} : Object[] [[]] : String | Log4jJndiInjectionTest.java:385:41:385:63 | new Object[] | provenance |  Sink:MaD:145 |
-| Log4jJndiInjectionTest.java:385:41:385:63 | {...} : Object[] [[]] : String | Log4jJndiInjectionTest.java:385:41:385:63 | new Object[] | provenance |  Sink:MaD:461 |
+| Log4jJndiInjectionTest.java:318:65:318:72 | source(...) : String | Log4jJndiInjectionTest.java:318:56:318:72 | (...)... | provenance | Sink:MaD:220 |
+| Log4jJndiInjectionTest.java:318:65:318:72 | source(...) : String | Log4jJndiInjectionTest.java:318:56:318:72 | (...)... | provenance | Sink:MaD:219 |
+| Log4jJndiInjectionTest.java:319:50:319:57 | source(...) : String | Log4jJndiInjectionTest.java:319:41:319:57 | (...)... | provenance | Sink:MaD:220 |
+| Log4jJndiInjectionTest.java:319:50:319:57 | source(...) : String | Log4jJndiInjectionTest.java:319:41:319:57 | (...)... | provenance | Sink:MaD:219 |
+| Log4jJndiInjectionTest.java:320:80:320:87 | source(...) : String | Log4jJndiInjectionTest.java:320:71:320:87 | (...)... | provenance | Sink:MaD:222 |
+| Log4jJndiInjectionTest.java:320:80:320:87 | source(...) : String | Log4jJndiInjectionTest.java:320:71:320:87 | (...)... | provenance | Sink:MaD:221 |
+| Log4jJndiInjectionTest.java:321:65:321:72 | source(...) : String | Log4jJndiInjectionTest.java:321:56:321:72 | (...)... | provenance | Sink:MaD:222 |
+| Log4jJndiInjectionTest.java:321:65:321:72 | source(...) : String | Log4jJndiInjectionTest.java:321:56:321:72 | (...)... | provenance | Sink:MaD:221 |
+| Log4jJndiInjectionTest.java:322:50:322:57 | source(...) : String | Log4jJndiInjectionTest.java:322:41:322:57 | (...)... | provenance | Sink:MaD:222 |
+| Log4jJndiInjectionTest.java:322:50:322:57 | source(...) : String | Log4jJndiInjectionTest.java:322:41:322:57 | (...)... | provenance | Sink:MaD:221 |
+| Log4jJndiInjectionTest.java:323:95:323:102 | source(...) : String | Log4jJndiInjectionTest.java:323:86:323:102 | (...)... | provenance | Sink:MaD:224 |
+| Log4jJndiInjectionTest.java:323:95:323:102 | source(...) : String | Log4jJndiInjectionTest.java:323:86:323:102 | (...)... | provenance | Sink:MaD:223 |
+| Log4jJndiInjectionTest.java:324:80:324:87 | source(...) : String | Log4jJndiInjectionTest.java:324:71:324:87 | (...)... | provenance | Sink:MaD:224 |
+| Log4jJndiInjectionTest.java:324:80:324:87 | source(...) : String | Log4jJndiInjectionTest.java:324:71:324:87 | (...)... | provenance | Sink:MaD:223 |
+| Log4jJndiInjectionTest.java:325:65:325:72 | source(...) : String | Log4jJndiInjectionTest.java:325:56:325:72 | (...)... | provenance | Sink:MaD:224 |
+| Log4jJndiInjectionTest.java:325:65:325:72 | source(...) : String | Log4jJndiInjectionTest.java:325:56:325:72 | (...)... | provenance | Sink:MaD:223 |
+| Log4jJndiInjectionTest.java:326:50:326:57 | source(...) : String | Log4jJndiInjectionTest.java:326:41:326:57 | (...)... | provenance | Sink:MaD:224 |
+| Log4jJndiInjectionTest.java:326:50:326:57 | source(...) : String | Log4jJndiInjectionTest.java:326:41:326:57 | (...)... | provenance | Sink:MaD:223 |
+| Log4jJndiInjectionTest.java:327:110:327:117 | source(...) : String | Log4jJndiInjectionTest.java:327:101:327:117 | (...)... | provenance | Sink:MaD:226 |
+| Log4jJndiInjectionTest.java:327:110:327:117 | source(...) : String | Log4jJndiInjectionTest.java:327:101:327:117 | (...)... | provenance | Sink:MaD:225 |
+| Log4jJndiInjectionTest.java:328:95:328:102 | source(...) : String | Log4jJndiInjectionTest.java:328:86:328:102 | (...)... | provenance | Sink:MaD:226 |
+| Log4jJndiInjectionTest.java:328:95:328:102 | source(...) : String | Log4jJndiInjectionTest.java:328:86:328:102 | (...)... | provenance | Sink:MaD:225 |
+| Log4jJndiInjectionTest.java:329:80:329:87 | source(...) : String | Log4jJndiInjectionTest.java:329:71:329:87 | (...)... | provenance | Sink:MaD:226 |
+| Log4jJndiInjectionTest.java:329:80:329:87 | source(...) : String | Log4jJndiInjectionTest.java:329:71:329:87 | (...)... | provenance | Sink:MaD:225 |
+| Log4jJndiInjectionTest.java:330:65:330:72 | source(...) : String | Log4jJndiInjectionTest.java:330:56:330:72 | (...)... | provenance | Sink:MaD:226 |
+| Log4jJndiInjectionTest.java:330:65:330:72 | source(...) : String | Log4jJndiInjectionTest.java:330:56:330:72 | (...)... | provenance | Sink:MaD:225 |
+| Log4jJndiInjectionTest.java:331:50:331:57 | source(...) : String | Log4jJndiInjectionTest.java:331:41:331:57 | (...)... | provenance | Sink:MaD:226 |
+| Log4jJndiInjectionTest.java:331:50:331:57 | source(...) : String | Log4jJndiInjectionTest.java:331:41:331:57 | (...)... | provenance | Sink:MaD:225 |
+| Log4jJndiInjectionTest.java:332:125:332:132 | source(...) : String | Log4jJndiInjectionTest.java:332:116:332:132 | (...)... | provenance | Sink:MaD:228 |
+| Log4jJndiInjectionTest.java:332:125:332:132 | source(...) : String | Log4jJndiInjectionTest.java:332:116:332:132 | (...)... | provenance | Sink:MaD:227 |
+| Log4jJndiInjectionTest.java:333:110:333:117 | source(...) : String | Log4jJndiInjectionTest.java:333:101:333:117 | (...)... | provenance | Sink:MaD:228 |
+| Log4jJndiInjectionTest.java:333:110:333:117 | source(...) : String | Log4jJndiInjectionTest.java:333:101:333:117 | (...)... | provenance | Sink:MaD:227 |
+| Log4jJndiInjectionTest.java:334:95:334:102 | source(...) : String | Log4jJndiInjectionTest.java:334:86:334:102 | (...)... | provenance | Sink:MaD:228 |
+| Log4jJndiInjectionTest.java:334:95:334:102 | source(...) : String | Log4jJndiInjectionTest.java:334:86:334:102 | (...)... | provenance | Sink:MaD:227 |
+| Log4jJndiInjectionTest.java:335:80:335:87 | source(...) : String | Log4jJndiInjectionTest.java:335:71:335:87 | (...)... | provenance | Sink:MaD:228 |
+| Log4jJndiInjectionTest.java:335:80:335:87 | source(...) : String | Log4jJndiInjectionTest.java:335:71:335:87 | (...)... | provenance | Sink:MaD:227 |
+| Log4jJndiInjectionTest.java:336:65:336:72 | source(...) : String | Log4jJndiInjectionTest.java:336:56:336:72 | (...)... | provenance | Sink:MaD:228 |
+| Log4jJndiInjectionTest.java:336:65:336:72 | source(...) : String | Log4jJndiInjectionTest.java:336:56:336:72 | (...)... | provenance | Sink:MaD:227 |
+| Log4jJndiInjectionTest.java:337:50:337:57 | source(...) : String | Log4jJndiInjectionTest.java:337:41:337:57 | (...)... | provenance | Sink:MaD:228 |
+| Log4jJndiInjectionTest.java:337:50:337:57 | source(...) : String | Log4jJndiInjectionTest.java:337:41:337:57 | (...)... | provenance | Sink:MaD:227 |
+| Log4jJndiInjectionTest.java:338:140:338:147 | source(...) : String | Log4jJndiInjectionTest.java:338:131:338:147 | (...)... | provenance | Sink:MaD:230 |
+| Log4jJndiInjectionTest.java:338:140:338:147 | source(...) : String | Log4jJndiInjectionTest.java:338:131:338:147 | (...)... | provenance | Sink:MaD:229 |
+| Log4jJndiInjectionTest.java:339:125:339:132 | source(...) : String | Log4jJndiInjectionTest.java:339:116:339:132 | (...)... | provenance | Sink:MaD:230 |
+| Log4jJndiInjectionTest.java:339:125:339:132 | source(...) : String | Log4jJndiInjectionTest.java:339:116:339:132 | (...)... | provenance | Sink:MaD:229 |
+| Log4jJndiInjectionTest.java:340:110:340:117 | source(...) : String | Log4jJndiInjectionTest.java:340:101:340:117 | (...)... | provenance | Sink:MaD:230 |
+| Log4jJndiInjectionTest.java:340:110:340:117 | source(...) : String | Log4jJndiInjectionTest.java:340:101:340:117 | (...)... | provenance | Sink:MaD:229 |
+| Log4jJndiInjectionTest.java:341:95:341:102 | source(...) : String | Log4jJndiInjectionTest.java:341:86:341:102 | (...)... | provenance | Sink:MaD:230 |
+| Log4jJndiInjectionTest.java:341:95:341:102 | source(...) : String | Log4jJndiInjectionTest.java:341:86:341:102 | (...)... | provenance | Sink:MaD:229 |
+| Log4jJndiInjectionTest.java:342:80:342:87 | source(...) : String | Log4jJndiInjectionTest.java:342:71:342:87 | (...)... | provenance | Sink:MaD:230 |
+| Log4jJndiInjectionTest.java:342:80:342:87 | source(...) : String | Log4jJndiInjectionTest.java:342:71:342:87 | (...)... | provenance | Sink:MaD:229 |
+| Log4jJndiInjectionTest.java:343:65:343:72 | source(...) : String | Log4jJndiInjectionTest.java:343:56:343:72 | (...)... | provenance | Sink:MaD:230 |
+| Log4jJndiInjectionTest.java:343:65:343:72 | source(...) : String | Log4jJndiInjectionTest.java:343:56:343:72 | (...)... | provenance | Sink:MaD:229 |
+| Log4jJndiInjectionTest.java:344:50:344:57 | source(...) : String | Log4jJndiInjectionTest.java:344:41:344:57 | (...)... | provenance | Sink:MaD:230 |
+| Log4jJndiInjectionTest.java:344:50:344:57 | source(...) : String | Log4jJndiInjectionTest.java:344:41:344:57 | (...)... | provenance | Sink:MaD:229 |
+| Log4jJndiInjectionTest.java:345:155:345:162 | source(...) : String | Log4jJndiInjectionTest.java:345:146:345:162 | (...)... | provenance | Sink:MaD:232 |
+| Log4jJndiInjectionTest.java:345:155:345:162 | source(...) : String | Log4jJndiInjectionTest.java:345:146:345:162 | (...)... | provenance | Sink:MaD:231 |
+| Log4jJndiInjectionTest.java:346:140:346:147 | source(...) : String | Log4jJndiInjectionTest.java:346:131:346:147 | (...)... | provenance | Sink:MaD:232 |
+| Log4jJndiInjectionTest.java:346:140:346:147 | source(...) : String | Log4jJndiInjectionTest.java:346:131:346:147 | (...)... | provenance | Sink:MaD:231 |
+| Log4jJndiInjectionTest.java:347:125:347:132 | source(...) : String | Log4jJndiInjectionTest.java:347:116:347:132 | (...)... | provenance | Sink:MaD:232 |
+| Log4jJndiInjectionTest.java:347:125:347:132 | source(...) : String | Log4jJndiInjectionTest.java:347:116:347:132 | (...)... | provenance | Sink:MaD:231 |
+| Log4jJndiInjectionTest.java:348:110:348:117 | source(...) : String | Log4jJndiInjectionTest.java:348:101:348:117 | (...)... | provenance | Sink:MaD:232 |
+| Log4jJndiInjectionTest.java:348:110:348:117 | source(...) : String | Log4jJndiInjectionTest.java:348:101:348:117 | (...)... | provenance | Sink:MaD:231 |
+| Log4jJndiInjectionTest.java:349:95:349:102 | source(...) : String | Log4jJndiInjectionTest.java:349:86:349:102 | (...)... | provenance | Sink:MaD:232 |
+| Log4jJndiInjectionTest.java:349:95:349:102 | source(...) : String | Log4jJndiInjectionTest.java:349:86:349:102 | (...)... | provenance | Sink:MaD:231 |
+| Log4jJndiInjectionTest.java:350:80:350:87 | source(...) : String | Log4jJndiInjectionTest.java:350:71:350:87 | (...)... | provenance | Sink:MaD:232 |
+| Log4jJndiInjectionTest.java:350:80:350:87 | source(...) : String | Log4jJndiInjectionTest.java:350:71:350:87 | (...)... | provenance | Sink:MaD:231 |
+| Log4jJndiInjectionTest.java:351:65:351:72 | source(...) : String | Log4jJndiInjectionTest.java:351:56:351:72 | (...)... | provenance | Sink:MaD:232 |
+| Log4jJndiInjectionTest.java:351:65:351:72 | source(...) : String | Log4jJndiInjectionTest.java:351:56:351:72 | (...)... | provenance | Sink:MaD:231 |
+| Log4jJndiInjectionTest.java:352:50:352:57 | source(...) : String | Log4jJndiInjectionTest.java:352:41:352:57 | (...)... | provenance | Sink:MaD:232 |
+| Log4jJndiInjectionTest.java:352:50:352:57 | source(...) : String | Log4jJndiInjectionTest.java:352:41:352:57 | (...)... | provenance | Sink:MaD:231 |
+| Log4jJndiInjectionTest.java:353:170:353:177 | source(...) : String | Log4jJndiInjectionTest.java:353:161:353:177 | (...)... | provenance | Sink:MaD:234 |
+| Log4jJndiInjectionTest.java:353:170:353:177 | source(...) : String | Log4jJndiInjectionTest.java:353:161:353:177 | (...)... | provenance | Sink:MaD:233 |
+| Log4jJndiInjectionTest.java:354:155:354:162 | source(...) : String | Log4jJndiInjectionTest.java:354:146:354:162 | (...)... | provenance | Sink:MaD:234 |
+| Log4jJndiInjectionTest.java:354:155:354:162 | source(...) : String | Log4jJndiInjectionTest.java:354:146:354:162 | (...)... | provenance | Sink:MaD:233 |
+| Log4jJndiInjectionTest.java:355:140:355:147 | source(...) : String | Log4jJndiInjectionTest.java:355:131:355:147 | (...)... | provenance | Sink:MaD:234 |
+| Log4jJndiInjectionTest.java:355:140:355:147 | source(...) : String | Log4jJndiInjectionTest.java:355:131:355:147 | (...)... | provenance | Sink:MaD:233 |
+| Log4jJndiInjectionTest.java:356:125:356:132 | source(...) : String | Log4jJndiInjectionTest.java:356:116:356:132 | (...)... | provenance | Sink:MaD:234 |
+| Log4jJndiInjectionTest.java:356:125:356:132 | source(...) : String | Log4jJndiInjectionTest.java:356:116:356:132 | (...)... | provenance | Sink:MaD:233 |
+| Log4jJndiInjectionTest.java:357:110:357:117 | source(...) : String | Log4jJndiInjectionTest.java:357:101:357:117 | (...)... | provenance | Sink:MaD:234 |
+| Log4jJndiInjectionTest.java:357:110:357:117 | source(...) : String | Log4jJndiInjectionTest.java:357:101:357:117 | (...)... | provenance | Sink:MaD:233 |
+| Log4jJndiInjectionTest.java:358:95:358:102 | source(...) : String | Log4jJndiInjectionTest.java:358:86:358:102 | (...)... | provenance | Sink:MaD:234 |
+| Log4jJndiInjectionTest.java:358:95:358:102 | source(...) : String | Log4jJndiInjectionTest.java:358:86:358:102 | (...)... | provenance | Sink:MaD:233 |
+| Log4jJndiInjectionTest.java:359:80:359:87 | source(...) : String | Log4jJndiInjectionTest.java:359:71:359:87 | (...)... | provenance | Sink:MaD:234 |
+| Log4jJndiInjectionTest.java:359:80:359:87 | source(...) : String | Log4jJndiInjectionTest.java:359:71:359:87 | (...)... | provenance | Sink:MaD:233 |
+| Log4jJndiInjectionTest.java:360:65:360:72 | source(...) : String | Log4jJndiInjectionTest.java:360:56:360:72 | (...)... | provenance | Sink:MaD:234 |
+| Log4jJndiInjectionTest.java:360:65:360:72 | source(...) : String | Log4jJndiInjectionTest.java:360:56:360:72 | (...)... | provenance | Sink:MaD:233 |
+| Log4jJndiInjectionTest.java:361:50:361:57 | source(...) : String | Log4jJndiInjectionTest.java:361:41:361:57 | (...)... | provenance | Sink:MaD:234 |
+| Log4jJndiInjectionTest.java:361:50:361:57 | source(...) : String | Log4jJndiInjectionTest.java:361:41:361:57 | (...)... | provenance | Sink:MaD:233 |
+| Log4jJndiInjectionTest.java:362:185:362:192 | source(...) : String | Log4jJndiInjectionTest.java:362:176:362:192 | (...)... | provenance | Sink:MaD:236 |
+| Log4jJndiInjectionTest.java:362:185:362:192 | source(...) : String | Log4jJndiInjectionTest.java:362:176:362:192 | (...)... | provenance | Sink:MaD:235 |
+| Log4jJndiInjectionTest.java:363:170:363:177 | source(...) : String | Log4jJndiInjectionTest.java:363:161:363:177 | (...)... | provenance | Sink:MaD:236 |
+| Log4jJndiInjectionTest.java:363:170:363:177 | source(...) : String | Log4jJndiInjectionTest.java:363:161:363:177 | (...)... | provenance | Sink:MaD:235 |
+| Log4jJndiInjectionTest.java:364:155:364:162 | source(...) : String | Log4jJndiInjectionTest.java:364:146:364:162 | (...)... | provenance | Sink:MaD:236 |
+| Log4jJndiInjectionTest.java:364:155:364:162 | source(...) : String | Log4jJndiInjectionTest.java:364:146:364:162 | (...)... | provenance | Sink:MaD:235 |
+| Log4jJndiInjectionTest.java:365:140:365:147 | source(...) : String | Log4jJndiInjectionTest.java:365:131:365:147 | (...)... | provenance | Sink:MaD:236 |
+| Log4jJndiInjectionTest.java:365:140:365:147 | source(...) : String | Log4jJndiInjectionTest.java:365:131:365:147 | (...)... | provenance | Sink:MaD:235 |
+| Log4jJndiInjectionTest.java:366:125:366:132 | source(...) : String | Log4jJndiInjectionTest.java:366:116:366:132 | (...)... | provenance | Sink:MaD:236 |
+| Log4jJndiInjectionTest.java:366:125:366:132 | source(...) : String | Log4jJndiInjectionTest.java:366:116:366:132 | (...)... | provenance | Sink:MaD:235 |
+| Log4jJndiInjectionTest.java:367:110:367:117 | source(...) : String | Log4jJndiInjectionTest.java:367:101:367:117 | (...)... | provenance | Sink:MaD:236 |
+| Log4jJndiInjectionTest.java:367:110:367:117 | source(...) : String | Log4jJndiInjectionTest.java:367:101:367:117 | (...)... | provenance | Sink:MaD:235 |
+| Log4jJndiInjectionTest.java:368:95:368:102 | source(...) : String | Log4jJndiInjectionTest.java:368:86:368:102 | (...)... | provenance | Sink:MaD:236 |
+| Log4jJndiInjectionTest.java:368:95:368:102 | source(...) : String | Log4jJndiInjectionTest.java:368:86:368:102 | (...)... | provenance | Sink:MaD:235 |
+| Log4jJndiInjectionTest.java:369:80:369:87 | source(...) : String | Log4jJndiInjectionTest.java:369:71:369:87 | (...)... | provenance | Sink:MaD:236 |
+| Log4jJndiInjectionTest.java:369:80:369:87 | source(...) : String | Log4jJndiInjectionTest.java:369:71:369:87 | (...)... | provenance | Sink:MaD:235 |
+| Log4jJndiInjectionTest.java:370:65:370:72 | source(...) : String | Log4jJndiInjectionTest.java:370:56:370:72 | (...)... | provenance | Sink:MaD:236 |
+| Log4jJndiInjectionTest.java:370:65:370:72 | source(...) : String | Log4jJndiInjectionTest.java:370:56:370:72 | (...)... | provenance | Sink:MaD:235 |
+| Log4jJndiInjectionTest.java:371:50:371:57 | source(...) : String | Log4jJndiInjectionTest.java:371:41:371:57 | (...)... | provenance | Sink:MaD:236 |
+| Log4jJndiInjectionTest.java:371:50:371:57 | source(...) : String | Log4jJndiInjectionTest.java:371:41:371:57 | (...)... | provenance | Sink:MaD:235 |
+| Log4jJndiInjectionTest.java:372:50:372:57 | source(...) : String | Log4jJndiInjectionTest.java:372:41:372:57 | (...)... | provenance | Sink:MaD:220 |
+| Log4jJndiInjectionTest.java:372:50:372:57 | source(...) : String | Log4jJndiInjectionTest.java:372:41:372:57 | (...)... | provenance | Sink:MaD:219 |
+| Log4jJndiInjectionTest.java:373:70:373:77 | source(...) : String | Log4jJndiInjectionTest.java:373:56:373:77 | (...)... | provenance | Sink:MaD:220 |
+| Log4jJndiInjectionTest.java:373:70:373:77 | source(...) : String | Log4jJndiInjectionTest.java:373:56:373:77 | (...)... | provenance | Sink:MaD:219 |
+| Log4jJndiInjectionTest.java:374:50:374:57 | source(...) : String | Log4jJndiInjectionTest.java:374:41:374:57 | (...)... | provenance | Sink:MaD:240 |
+| Log4jJndiInjectionTest.java:374:50:374:57 | source(...) : String | Log4jJndiInjectionTest.java:374:41:374:57 | (...)... | provenance | Sink:MaD:239 |
+| Log4jJndiInjectionTest.java:375:55:375:62 | source(...) : String | Log4jJndiInjectionTest.java:375:41:375:62 | (...)... | provenance | Sink:MaD:242 |
+| Log4jJndiInjectionTest.java:375:55:375:62 | source(...) : String | Log4jJndiInjectionTest.java:375:41:375:62 | (...)... | provenance | Sink:MaD:241 |
+| Log4jJndiInjectionTest.java:376:55:376:62 | source(...) : String | Log4jJndiInjectionTest.java:376:41:376:62 | (...)... | provenance | Sink:MaD:244 |
+| Log4jJndiInjectionTest.java:376:55:376:62 | source(...) : String | Log4jJndiInjectionTest.java:376:41:376:62 | (...)... | provenance | Sink:MaD:243 |
+| Log4jJndiInjectionTest.java:377:44:377:51 | source(...) : String | Log4jJndiInjectionTest.java:377:26:377:51 | (...)... | provenance | Sink:MaD:250 |
+| Log4jJndiInjectionTest.java:377:44:377:51 | source(...) : String | Log4jJndiInjectionTest.java:377:26:377:51 | (...)... | provenance | Sink:MaD:249 |
+| Log4jJndiInjectionTest.java:378:44:378:51 | source(...) : String | Log4jJndiInjectionTest.java:378:26:378:51 | (...)... | provenance | Sink:MaD:252 |
+| Log4jJndiInjectionTest.java:378:44:378:51 | source(...) : String | Log4jJndiInjectionTest.java:378:26:378:51 | (...)... | provenance | Sink:MaD:251 |
+| Log4jJndiInjectionTest.java:379:36:379:43 | source(...) : String | Log4jJndiInjectionTest.java:379:26:379:43 | (...)... | provenance | Sink:MaD:246 |
+| Log4jJndiInjectionTest.java:379:36:379:43 | source(...) : String | Log4jJndiInjectionTest.java:379:26:379:43 | (...)... | provenance | Sink:MaD:245 |
+| Log4jJndiInjectionTest.java:380:36:380:43 | source(...) : String | Log4jJndiInjectionTest.java:380:26:380:43 | (...)... | provenance | Sink:MaD:248 |
+| Log4jJndiInjectionTest.java:380:36:380:43 | source(...) : String | Log4jJndiInjectionTest.java:380:26:380:43 | (...)... | provenance | Sink:MaD:247 |
+| Log4jJndiInjectionTest.java:383:35:383:42 | source(...) : String | Log4jJndiInjectionTest.java:383:26:383:42 | (...)... | provenance | Sink:MaD:258 |
+| Log4jJndiInjectionTest.java:383:35:383:42 | source(...) : String | Log4jJndiInjectionTest.java:383:26:383:42 | (...)... | provenance | Sink:MaD:257 |
+| Log4jJndiInjectionTest.java:384:35:384:42 | source(...) : String | Log4jJndiInjectionTest.java:384:26:384:42 | (...)... | provenance | Sink:MaD:278 |
+| Log4jJndiInjectionTest.java:384:35:384:42 | source(...) : String | Log4jJndiInjectionTest.java:384:26:384:42 | (...)... | provenance | Sink:MaD:277 |
+| Log4jJndiInjectionTest.java:385:41:385:63 | {...} : Object[] [[]] : String | Log4jJndiInjectionTest.java:385:41:385:63 | new Object[] | provenance | Sink:MaD:278 |
+| Log4jJndiInjectionTest.java:385:41:385:63 | {...} : Object[] [[]] : String | Log4jJndiInjectionTest.java:385:41:385:63 | new Object[] | provenance | Sink:MaD:277 |
 | Log4jJndiInjectionTest.java:385:55:385:62 | source(...) : String | Log4jJndiInjectionTest.java:385:41:385:63 | {...} : Object[] [[]] : String | provenance |  |
-| Log4jJndiInjectionTest.java:386:50:386:57 | source(...) : String | Log4jJndiInjectionTest.java:386:41:386:57 | (...)... | provenance |  Sink:MaD:136 |
-| Log4jJndiInjectionTest.java:386:50:386:57 | source(...) : String | Log4jJndiInjectionTest.java:386:41:386:57 | (...)... | provenance |  Sink:MaD:452 |
-| Log4jJndiInjectionTest.java:387:35:387:42 | source(...) : String | Log4jJndiInjectionTest.java:387:26:387:42 | (...)... | provenance |  Sink:MaD:136 |
-| Log4jJndiInjectionTest.java:387:35:387:42 | source(...) : String | Log4jJndiInjectionTest.java:387:26:387:42 | (...)... | provenance |  Sink:MaD:452 |
-| Log4jJndiInjectionTest.java:388:65:388:72 | source(...) : String | Log4jJndiInjectionTest.java:388:56:388:72 | (...)... | provenance |  Sink:MaD:137 |
-| Log4jJndiInjectionTest.java:388:65:388:72 | source(...) : String | Log4jJndiInjectionTest.java:388:56:388:72 | (...)... | provenance |  Sink:MaD:453 |
-| Log4jJndiInjectionTest.java:389:50:389:57 | source(...) : String | Log4jJndiInjectionTest.java:389:41:389:57 | (...)... | provenance |  Sink:MaD:137 |
-| Log4jJndiInjectionTest.java:389:50:389:57 | source(...) : String | Log4jJndiInjectionTest.java:389:41:389:57 | (...)... | provenance |  Sink:MaD:453 |
-| Log4jJndiInjectionTest.java:390:35:390:42 | source(...) : String | Log4jJndiInjectionTest.java:390:26:390:42 | (...)... | provenance |  Sink:MaD:137 |
-| Log4jJndiInjectionTest.java:390:35:390:42 | source(...) : String | Log4jJndiInjectionTest.java:390:26:390:42 | (...)... | provenance |  Sink:MaD:453 |
-| Log4jJndiInjectionTest.java:391:80:391:87 | source(...) : String | Log4jJndiInjectionTest.java:391:71:391:87 | (...)... | provenance |  Sink:MaD:138 |
-| Log4jJndiInjectionTest.java:391:80:391:87 | source(...) : String | Log4jJndiInjectionTest.java:391:71:391:87 | (...)... | provenance |  Sink:MaD:454 |
-| Log4jJndiInjectionTest.java:392:65:392:72 | source(...) : String | Log4jJndiInjectionTest.java:392:56:392:72 | (...)... | provenance |  Sink:MaD:138 |
-| Log4jJndiInjectionTest.java:392:65:392:72 | source(...) : String | Log4jJndiInjectionTest.java:392:56:392:72 | (...)... | provenance |  Sink:MaD:454 |
-| Log4jJndiInjectionTest.java:393:50:393:57 | source(...) : String | Log4jJndiInjectionTest.java:393:41:393:57 | (...)... | provenance |  Sink:MaD:138 |
-| Log4jJndiInjectionTest.java:393:50:393:57 | source(...) : String | Log4jJndiInjectionTest.java:393:41:393:57 | (...)... | provenance |  Sink:MaD:454 |
-| Log4jJndiInjectionTest.java:394:35:394:42 | source(...) : String | Log4jJndiInjectionTest.java:394:26:394:42 | (...)... | provenance |  Sink:MaD:138 |
-| Log4jJndiInjectionTest.java:394:35:394:42 | source(...) : String | Log4jJndiInjectionTest.java:394:26:394:42 | (...)... | provenance |  Sink:MaD:454 |
-| Log4jJndiInjectionTest.java:395:95:395:102 | source(...) : String | Log4jJndiInjectionTest.java:395:86:395:102 | (...)... | provenance |  Sink:MaD:139 |
-| Log4jJndiInjectionTest.java:395:95:395:102 | source(...) : String | Log4jJndiInjectionTest.java:395:86:395:102 | (...)... | provenance |  Sink:MaD:455 |
-| Log4jJndiInjectionTest.java:396:80:396:87 | source(...) : String | Log4jJndiInjectionTest.java:396:71:396:87 | (...)... | provenance |  Sink:MaD:139 |
-| Log4jJndiInjectionTest.java:396:80:396:87 | source(...) : String | Log4jJndiInjectionTest.java:396:71:396:87 | (...)... | provenance |  Sink:MaD:455 |
-| Log4jJndiInjectionTest.java:397:65:397:72 | source(...) : String | Log4jJndiInjectionTest.java:397:56:397:72 | (...)... | provenance |  Sink:MaD:139 |
-| Log4jJndiInjectionTest.java:397:65:397:72 | source(...) : String | Log4jJndiInjectionTest.java:397:56:397:72 | (...)... | provenance |  Sink:MaD:455 |
-| Log4jJndiInjectionTest.java:398:50:398:57 | source(...) : String | Log4jJndiInjectionTest.java:398:41:398:57 | (...)... | provenance |  Sink:MaD:139 |
-| Log4jJndiInjectionTest.java:398:50:398:57 | source(...) : String | Log4jJndiInjectionTest.java:398:41:398:57 | (...)... | provenance |  Sink:MaD:455 |
-| Log4jJndiInjectionTest.java:399:35:399:42 | source(...) : String | Log4jJndiInjectionTest.java:399:26:399:42 | (...)... | provenance |  Sink:MaD:139 |
-| Log4jJndiInjectionTest.java:399:35:399:42 | source(...) : String | Log4jJndiInjectionTest.java:399:26:399:42 | (...)... | provenance |  Sink:MaD:455 |
-| Log4jJndiInjectionTest.java:400:110:400:117 | source(...) : String | Log4jJndiInjectionTest.java:400:101:400:117 | (...)... | provenance |  Sink:MaD:140 |
-| Log4jJndiInjectionTest.java:400:110:400:117 | source(...) : String | Log4jJndiInjectionTest.java:400:101:400:117 | (...)... | provenance |  Sink:MaD:456 |
-| Log4jJndiInjectionTest.java:401:95:401:102 | source(...) : String | Log4jJndiInjectionTest.java:401:86:401:102 | (...)... | provenance |  Sink:MaD:140 |
-| Log4jJndiInjectionTest.java:401:95:401:102 | source(...) : String | Log4jJndiInjectionTest.java:401:86:401:102 | (...)... | provenance |  Sink:MaD:456 |
-| Log4jJndiInjectionTest.java:402:80:402:87 | source(...) : String | Log4jJndiInjectionTest.java:402:71:402:87 | (...)... | provenance |  Sink:MaD:140 |
-| Log4jJndiInjectionTest.java:402:80:402:87 | source(...) : String | Log4jJndiInjectionTest.java:402:71:402:87 | (...)... | provenance |  Sink:MaD:456 |
-| Log4jJndiInjectionTest.java:403:65:403:72 | source(...) : String | Log4jJndiInjectionTest.java:403:56:403:72 | (...)... | provenance |  Sink:MaD:140 |
-| Log4jJndiInjectionTest.java:403:65:403:72 | source(...) : String | Log4jJndiInjectionTest.java:403:56:403:72 | (...)... | provenance |  Sink:MaD:456 |
-| Log4jJndiInjectionTest.java:404:50:404:57 | source(...) : String | Log4jJndiInjectionTest.java:404:41:404:57 | (...)... | provenance |  Sink:MaD:140 |
-| Log4jJndiInjectionTest.java:404:50:404:57 | source(...) : String | Log4jJndiInjectionTest.java:404:41:404:57 | (...)... | provenance |  Sink:MaD:456 |
-| Log4jJndiInjectionTest.java:405:35:405:42 | source(...) : String | Log4jJndiInjectionTest.java:405:26:405:42 | (...)... | provenance |  Sink:MaD:140 |
-| Log4jJndiInjectionTest.java:405:35:405:42 | source(...) : String | Log4jJndiInjectionTest.java:405:26:405:42 | (...)... | provenance |  Sink:MaD:456 |
-| Log4jJndiInjectionTest.java:406:125:406:132 | source(...) : String | Log4jJndiInjectionTest.java:406:116:406:132 | (...)... | provenance |  Sink:MaD:141 |
-| Log4jJndiInjectionTest.java:406:125:406:132 | source(...) : String | Log4jJndiInjectionTest.java:406:116:406:132 | (...)... | provenance |  Sink:MaD:457 |
-| Log4jJndiInjectionTest.java:407:110:407:117 | source(...) : String | Log4jJndiInjectionTest.java:407:101:407:117 | (...)... | provenance |  Sink:MaD:141 |
-| Log4jJndiInjectionTest.java:407:110:407:117 | source(...) : String | Log4jJndiInjectionTest.java:407:101:407:117 | (...)... | provenance |  Sink:MaD:457 |
-| Log4jJndiInjectionTest.java:408:95:408:102 | source(...) : String | Log4jJndiInjectionTest.java:408:86:408:102 | (...)... | provenance |  Sink:MaD:141 |
-| Log4jJndiInjectionTest.java:408:95:408:102 | source(...) : String | Log4jJndiInjectionTest.java:408:86:408:102 | (...)... | provenance |  Sink:MaD:457 |
-| Log4jJndiInjectionTest.java:409:80:409:87 | source(...) : String | Log4jJndiInjectionTest.java:409:71:409:87 | (...)... | provenance |  Sink:MaD:141 |
-| Log4jJndiInjectionTest.java:409:80:409:87 | source(...) : String | Log4jJndiInjectionTest.java:409:71:409:87 | (...)... | provenance |  Sink:MaD:457 |
-| Log4jJndiInjectionTest.java:410:65:410:72 | source(...) : String | Log4jJndiInjectionTest.java:410:56:410:72 | (...)... | provenance |  Sink:MaD:141 |
-| Log4jJndiInjectionTest.java:410:65:410:72 | source(...) : String | Log4jJndiInjectionTest.java:410:56:410:72 | (...)... | provenance |  Sink:MaD:457 |
-| Log4jJndiInjectionTest.java:411:50:411:57 | source(...) : String | Log4jJndiInjectionTest.java:411:41:411:57 | (...)... | provenance |  Sink:MaD:141 |
-| Log4jJndiInjectionTest.java:411:50:411:57 | source(...) : String | Log4jJndiInjectionTest.java:411:41:411:57 | (...)... | provenance |  Sink:MaD:457 |
-| Log4jJndiInjectionTest.java:412:35:412:42 | source(...) : String | Log4jJndiInjectionTest.java:412:26:412:42 | (...)... | provenance |  Sink:MaD:141 |
-| Log4jJndiInjectionTest.java:412:35:412:42 | source(...) : String | Log4jJndiInjectionTest.java:412:26:412:42 | (...)... | provenance |  Sink:MaD:457 |
-| Log4jJndiInjectionTest.java:413:140:413:147 | source(...) : String | Log4jJndiInjectionTest.java:413:131:413:147 | (...)... | provenance |  Sink:MaD:142 |
-| Log4jJndiInjectionTest.java:413:140:413:147 | source(...) : String | Log4jJndiInjectionTest.java:413:131:413:147 | (...)... | provenance |  Sink:MaD:458 |
-| Log4jJndiInjectionTest.java:414:125:414:132 | source(...) : String | Log4jJndiInjectionTest.java:414:116:414:132 | (...)... | provenance |  Sink:MaD:142 |
-| Log4jJndiInjectionTest.java:414:125:414:132 | source(...) : String | Log4jJndiInjectionTest.java:414:116:414:132 | (...)... | provenance |  Sink:MaD:458 |
-| Log4jJndiInjectionTest.java:415:110:415:117 | source(...) : String | Log4jJndiInjectionTest.java:415:101:415:117 | (...)... | provenance |  Sink:MaD:142 |
-| Log4jJndiInjectionTest.java:415:110:415:117 | source(...) : String | Log4jJndiInjectionTest.java:415:101:415:117 | (...)... | provenance |  Sink:MaD:458 |
-| Log4jJndiInjectionTest.java:416:95:416:102 | source(...) : String | Log4jJndiInjectionTest.java:416:86:416:102 | (...)... | provenance |  Sink:MaD:142 |
-| Log4jJndiInjectionTest.java:416:95:416:102 | source(...) : String | Log4jJndiInjectionTest.java:416:86:416:102 | (...)... | provenance |  Sink:MaD:458 |
-| Log4jJndiInjectionTest.java:417:80:417:87 | source(...) : String | Log4jJndiInjectionTest.java:417:71:417:87 | (...)... | provenance |  Sink:MaD:142 |
-| Log4jJndiInjectionTest.java:417:80:417:87 | source(...) : String | Log4jJndiInjectionTest.java:417:71:417:87 | (...)... | provenance |  Sink:MaD:458 |
-| Log4jJndiInjectionTest.java:418:65:418:72 | source(...) : String | Log4jJndiInjectionTest.java:418:56:418:72 | (...)... | provenance |  Sink:MaD:142 |
-| Log4jJndiInjectionTest.java:418:65:418:72 | source(...) : String | Log4jJndiInjectionTest.java:418:56:418:72 | (...)... | provenance |  Sink:MaD:458 |
-| Log4jJndiInjectionTest.java:419:50:419:57 | source(...) : String | Log4jJndiInjectionTest.java:419:41:419:57 | (...)... | provenance |  Sink:MaD:142 |
-| Log4jJndiInjectionTest.java:419:50:419:57 | source(...) : String | Log4jJndiInjectionTest.java:419:41:419:57 | (...)... | provenance |  Sink:MaD:458 |
-| Log4jJndiInjectionTest.java:420:35:420:42 | source(...) : String | Log4jJndiInjectionTest.java:420:26:420:42 | (...)... | provenance |  Sink:MaD:142 |
-| Log4jJndiInjectionTest.java:420:35:420:42 | source(...) : String | Log4jJndiInjectionTest.java:420:26:420:42 | (...)... | provenance |  Sink:MaD:458 |
-| Log4jJndiInjectionTest.java:421:155:421:162 | source(...) : String | Log4jJndiInjectionTest.java:421:146:421:162 | (...)... | provenance |  Sink:MaD:143 |
-| Log4jJndiInjectionTest.java:421:155:421:162 | source(...) : String | Log4jJndiInjectionTest.java:421:146:421:162 | (...)... | provenance |  Sink:MaD:459 |
-| Log4jJndiInjectionTest.java:422:140:422:147 | source(...) : String | Log4jJndiInjectionTest.java:422:131:422:147 | (...)... | provenance |  Sink:MaD:143 |
-| Log4jJndiInjectionTest.java:422:140:422:147 | source(...) : String | Log4jJndiInjectionTest.java:422:131:422:147 | (...)... | provenance |  Sink:MaD:459 |
-| Log4jJndiInjectionTest.java:423:125:423:132 | source(...) : String | Log4jJndiInjectionTest.java:423:116:423:132 | (...)... | provenance |  Sink:MaD:143 |
-| Log4jJndiInjectionTest.java:423:125:423:132 | source(...) : String | Log4jJndiInjectionTest.java:423:116:423:132 | (...)... | provenance |  Sink:MaD:459 |
-| Log4jJndiInjectionTest.java:424:110:424:117 | source(...) : String | Log4jJndiInjectionTest.java:424:101:424:117 | (...)... | provenance |  Sink:MaD:143 |
-| Log4jJndiInjectionTest.java:424:110:424:117 | source(...) : String | Log4jJndiInjectionTest.java:424:101:424:117 | (...)... | provenance |  Sink:MaD:459 |
-| Log4jJndiInjectionTest.java:425:95:425:102 | source(...) : String | Log4jJndiInjectionTest.java:425:86:425:102 | (...)... | provenance |  Sink:MaD:143 |
-| Log4jJndiInjectionTest.java:425:95:425:102 | source(...) : String | Log4jJndiInjectionTest.java:425:86:425:102 | (...)... | provenance |  Sink:MaD:459 |
-| Log4jJndiInjectionTest.java:426:80:426:87 | source(...) : String | Log4jJndiInjectionTest.java:426:71:426:87 | (...)... | provenance |  Sink:MaD:143 |
-| Log4jJndiInjectionTest.java:426:80:426:87 | source(...) : String | Log4jJndiInjectionTest.java:426:71:426:87 | (...)... | provenance |  Sink:MaD:459 |
-| Log4jJndiInjectionTest.java:427:65:427:72 | source(...) : String | Log4jJndiInjectionTest.java:427:56:427:72 | (...)... | provenance |  Sink:MaD:143 |
-| Log4jJndiInjectionTest.java:427:65:427:72 | source(...) : String | Log4jJndiInjectionTest.java:427:56:427:72 | (...)... | provenance |  Sink:MaD:459 |
-| Log4jJndiInjectionTest.java:428:50:428:57 | source(...) : String | Log4jJndiInjectionTest.java:428:41:428:57 | (...)... | provenance |  Sink:MaD:143 |
-| Log4jJndiInjectionTest.java:428:50:428:57 | source(...) : String | Log4jJndiInjectionTest.java:428:41:428:57 | (...)... | provenance |  Sink:MaD:459 |
-| Log4jJndiInjectionTest.java:429:35:429:42 | source(...) : String | Log4jJndiInjectionTest.java:429:26:429:42 | (...)... | provenance |  Sink:MaD:143 |
-| Log4jJndiInjectionTest.java:429:35:429:42 | source(...) : String | Log4jJndiInjectionTest.java:429:26:429:42 | (...)... | provenance |  Sink:MaD:459 |
-| Log4jJndiInjectionTest.java:430:170:430:177 | source(...) : String | Log4jJndiInjectionTest.java:430:161:430:177 | (...)... | provenance |  Sink:MaD:144 |
-| Log4jJndiInjectionTest.java:430:170:430:177 | source(...) : String | Log4jJndiInjectionTest.java:430:161:430:177 | (...)... | provenance |  Sink:MaD:460 |
-| Log4jJndiInjectionTest.java:431:155:431:162 | source(...) : String | Log4jJndiInjectionTest.java:431:146:431:162 | (...)... | provenance |  Sink:MaD:144 |
-| Log4jJndiInjectionTest.java:431:155:431:162 | source(...) : String | Log4jJndiInjectionTest.java:431:146:431:162 | (...)... | provenance |  Sink:MaD:460 |
-| Log4jJndiInjectionTest.java:432:140:432:147 | source(...) : String | Log4jJndiInjectionTest.java:432:131:432:147 | (...)... | provenance |  Sink:MaD:144 |
-| Log4jJndiInjectionTest.java:432:140:432:147 | source(...) : String | Log4jJndiInjectionTest.java:432:131:432:147 | (...)... | provenance |  Sink:MaD:460 |
-| Log4jJndiInjectionTest.java:433:125:433:132 | source(...) : String | Log4jJndiInjectionTest.java:433:116:433:132 | (...)... | provenance |  Sink:MaD:144 |
-| Log4jJndiInjectionTest.java:433:125:433:132 | source(...) : String | Log4jJndiInjectionTest.java:433:116:433:132 | (...)... | provenance |  Sink:MaD:460 |
-| Log4jJndiInjectionTest.java:434:110:434:117 | source(...) : String | Log4jJndiInjectionTest.java:434:101:434:117 | (...)... | provenance |  Sink:MaD:144 |
-| Log4jJndiInjectionTest.java:434:110:434:117 | source(...) : String | Log4jJndiInjectionTest.java:434:101:434:117 | (...)... | provenance |  Sink:MaD:460 |
-| Log4jJndiInjectionTest.java:435:95:435:102 | source(...) : String | Log4jJndiInjectionTest.java:435:86:435:102 | (...)... | provenance |  Sink:MaD:144 |
-| Log4jJndiInjectionTest.java:435:95:435:102 | source(...) : String | Log4jJndiInjectionTest.java:435:86:435:102 | (...)... | provenance |  Sink:MaD:460 |
-| Log4jJndiInjectionTest.java:436:80:436:87 | source(...) : String | Log4jJndiInjectionTest.java:436:71:436:87 | (...)... | provenance |  Sink:MaD:144 |
-| Log4jJndiInjectionTest.java:436:80:436:87 | source(...) : String | Log4jJndiInjectionTest.java:436:71:436:87 | (...)... | provenance |  Sink:MaD:460 |
-| Log4jJndiInjectionTest.java:437:65:437:72 | source(...) : String | Log4jJndiInjectionTest.java:437:56:437:72 | (...)... | provenance |  Sink:MaD:144 |
-| Log4jJndiInjectionTest.java:437:65:437:72 | source(...) : String | Log4jJndiInjectionTest.java:437:56:437:72 | (...)... | provenance |  Sink:MaD:460 |
-| Log4jJndiInjectionTest.java:438:50:438:57 | source(...) : String | Log4jJndiInjectionTest.java:438:41:438:57 | (...)... | provenance |  Sink:MaD:144 |
-| Log4jJndiInjectionTest.java:438:50:438:57 | source(...) : String | Log4jJndiInjectionTest.java:438:41:438:57 | (...)... | provenance |  Sink:MaD:460 |
-| Log4jJndiInjectionTest.java:439:35:439:42 | source(...) : String | Log4jJndiInjectionTest.java:439:26:439:42 | (...)... | provenance |  Sink:MaD:144 |
-| Log4jJndiInjectionTest.java:439:35:439:42 | source(...) : String | Log4jJndiInjectionTest.java:439:26:439:42 | (...)... | provenance |  Sink:MaD:460 |
-| Log4jJndiInjectionTest.java:440:35:440:42 | source(...) : String | Log4jJndiInjectionTest.java:440:26:440:42 | (...)... | provenance |  Sink:MaD:136 |
-| Log4jJndiInjectionTest.java:440:35:440:42 | source(...) : String | Log4jJndiInjectionTest.java:440:26:440:42 | (...)... | provenance |  Sink:MaD:452 |
-| Log4jJndiInjectionTest.java:441:55:441:62 | source(...) : String | Log4jJndiInjectionTest.java:441:41:441:62 | (...)... | provenance |  Sink:MaD:136 |
-| Log4jJndiInjectionTest.java:441:55:441:62 | source(...) : String | Log4jJndiInjectionTest.java:441:41:441:62 | (...)... | provenance |  Sink:MaD:452 |
-| Log4jJndiInjectionTest.java:442:35:442:42 | source(...) : String | Log4jJndiInjectionTest.java:442:26:442:42 | (...)... | provenance |  Sink:MaD:146 |
-| Log4jJndiInjectionTest.java:442:35:442:42 | source(...) : String | Log4jJndiInjectionTest.java:442:26:442:42 | (...)... | provenance |  Sink:MaD:462 |
-| Log4jJndiInjectionTest.java:443:40:443:47 | source(...) : String | Log4jJndiInjectionTest.java:443:26:443:47 | (...)... | provenance |  Sink:MaD:147 |
-| Log4jJndiInjectionTest.java:443:40:443:47 | source(...) : String | Log4jJndiInjectionTest.java:443:26:443:47 | (...)... | provenance |  Sink:MaD:463 |
-| Log4jJndiInjectionTest.java:444:40:444:47 | source(...) : String | Log4jJndiInjectionTest.java:444:26:444:47 | (...)... | provenance |  Sink:MaD:148 |
-| Log4jJndiInjectionTest.java:444:40:444:47 | source(...) : String | Log4jJndiInjectionTest.java:444:26:444:47 | (...)... | provenance |  Sink:MaD:464 |
-| Log4jJndiInjectionTest.java:445:40:445:47 | source(...) : String | Log4jJndiInjectionTest.java:445:25:445:47 | (...)... | provenance |  Sink:MaD:149 |
-| Log4jJndiInjectionTest.java:445:40:445:47 | source(...) : String | Log4jJndiInjectionTest.java:445:25:445:47 | (...)... | provenance |  Sink:MaD:465 |
-| Log4jJndiInjectionTest.java:446:40:446:47 | source(...) : String | Log4jJndiInjectionTest.java:446:25:446:47 | (...)... | provenance |  Sink:MaD:150 |
-| Log4jJndiInjectionTest.java:446:40:446:47 | source(...) : String | Log4jJndiInjectionTest.java:446:25:446:47 | (...)... | provenance |  Sink:MaD:466 |
-| Log4jJndiInjectionTest.java:447:55:447:62 | source(...) : String | Log4jJndiInjectionTest.java:447:40:447:62 | (...)... | provenance |  Sink:MaD:151 |
-| Log4jJndiInjectionTest.java:447:55:447:62 | source(...) : String | Log4jJndiInjectionTest.java:447:40:447:62 | (...)... | provenance |  Sink:MaD:467 |
-| Log4jJndiInjectionTest.java:448:55:448:62 | source(...) : String | Log4jJndiInjectionTest.java:448:40:448:62 | (...)... | provenance |  Sink:MaD:152 |
-| Log4jJndiInjectionTest.java:448:55:448:62 | source(...) : String | Log4jJndiInjectionTest.java:448:40:448:62 | (...)... | provenance |  Sink:MaD:468 |
-| Log4jJndiInjectionTest.java:449:50:449:57 | source(...) : String | Log4jJndiInjectionTest.java:449:40:449:57 | (...)... | provenance |  Sink:MaD:153 |
-| Log4jJndiInjectionTest.java:449:50:449:57 | source(...) : String | Log4jJndiInjectionTest.java:449:40:449:57 | (...)... | provenance |  Sink:MaD:469 |
-| Log4jJndiInjectionTest.java:450:58:450:65 | source(...) : String | Log4jJndiInjectionTest.java:450:40:450:65 | (...)... | provenance |  Sink:MaD:154 |
-| Log4jJndiInjectionTest.java:450:58:450:65 | source(...) : String | Log4jJndiInjectionTest.java:450:40:450:65 | (...)... | provenance |  Sink:MaD:470 |
-| Log4jJndiInjectionTest.java:451:58:451:65 | source(...) : String | Log4jJndiInjectionTest.java:451:40:451:65 | (...)... | provenance |  Sink:MaD:155 |
-| Log4jJndiInjectionTest.java:451:58:451:65 | source(...) : String | Log4jJndiInjectionTest.java:451:40:451:65 | (...)... | provenance |  Sink:MaD:471 |
-| Log4jJndiInjectionTest.java:453:49:453:56 | source(...) : String | Log4jJndiInjectionTest.java:453:40:453:56 | (...)... | provenance |  Sink:MaD:157 |
-| Log4jJndiInjectionTest.java:453:49:453:56 | source(...) : String | Log4jJndiInjectionTest.java:453:40:453:56 | (...)... | provenance |  Sink:MaD:473 |
-| Log4jJndiInjectionTest.java:454:49:454:56 | source(...) : String | Log4jJndiInjectionTest.java:454:40:454:56 | (...)... | provenance |  Sink:MaD:167 |
-| Log4jJndiInjectionTest.java:454:49:454:56 | source(...) : String | Log4jJndiInjectionTest.java:454:40:454:56 | (...)... | provenance |  Sink:MaD:483 |
-| Log4jJndiInjectionTest.java:455:55:455:77 | {...} : Object[] [[]] : String | Log4jJndiInjectionTest.java:455:55:455:77 | new Object[] | provenance |  Sink:MaD:167 |
-| Log4jJndiInjectionTest.java:455:55:455:77 | {...} : Object[] [[]] : String | Log4jJndiInjectionTest.java:455:55:455:77 | new Object[] | provenance |  Sink:MaD:483 |
+| Log4jJndiInjectionTest.java:386:50:386:57 | source(...) : String | Log4jJndiInjectionTest.java:386:41:386:57 | (...)... | provenance | Sink:MaD:260 |
+| Log4jJndiInjectionTest.java:386:50:386:57 | source(...) : String | Log4jJndiInjectionTest.java:386:41:386:57 | (...)... | provenance | Sink:MaD:259 |
+| Log4jJndiInjectionTest.java:387:35:387:42 | source(...) : String | Log4jJndiInjectionTest.java:387:26:387:42 | (...)... | provenance | Sink:MaD:260 |
+| Log4jJndiInjectionTest.java:387:35:387:42 | source(...) : String | Log4jJndiInjectionTest.java:387:26:387:42 | (...)... | provenance | Sink:MaD:259 |
+| Log4jJndiInjectionTest.java:388:65:388:72 | source(...) : String | Log4jJndiInjectionTest.java:388:56:388:72 | (...)... | provenance | Sink:MaD:262 |
+| Log4jJndiInjectionTest.java:388:65:388:72 | source(...) : String | Log4jJndiInjectionTest.java:388:56:388:72 | (...)... | provenance | Sink:MaD:261 |
+| Log4jJndiInjectionTest.java:389:50:389:57 | source(...) : String | Log4jJndiInjectionTest.java:389:41:389:57 | (...)... | provenance | Sink:MaD:262 |
+| Log4jJndiInjectionTest.java:389:50:389:57 | source(...) : String | Log4jJndiInjectionTest.java:389:41:389:57 | (...)... | provenance | Sink:MaD:261 |
+| Log4jJndiInjectionTest.java:390:35:390:42 | source(...) : String | Log4jJndiInjectionTest.java:390:26:390:42 | (...)... | provenance | Sink:MaD:262 |
+| Log4jJndiInjectionTest.java:390:35:390:42 | source(...) : String | Log4jJndiInjectionTest.java:390:26:390:42 | (...)... | provenance | Sink:MaD:261 |
+| Log4jJndiInjectionTest.java:391:80:391:87 | source(...) : String | Log4jJndiInjectionTest.java:391:71:391:87 | (...)... | provenance | Sink:MaD:264 |
+| Log4jJndiInjectionTest.java:391:80:391:87 | source(...) : String | Log4jJndiInjectionTest.java:391:71:391:87 | (...)... | provenance | Sink:MaD:263 |
+| Log4jJndiInjectionTest.java:392:65:392:72 | source(...) : String | Log4jJndiInjectionTest.java:392:56:392:72 | (...)... | provenance | Sink:MaD:264 |
+| Log4jJndiInjectionTest.java:392:65:392:72 | source(...) : String | Log4jJndiInjectionTest.java:392:56:392:72 | (...)... | provenance | Sink:MaD:263 |
+| Log4jJndiInjectionTest.java:393:50:393:57 | source(...) : String | Log4jJndiInjectionTest.java:393:41:393:57 | (...)... | provenance | Sink:MaD:264 |
+| Log4jJndiInjectionTest.java:393:50:393:57 | source(...) : String | Log4jJndiInjectionTest.java:393:41:393:57 | (...)... | provenance | Sink:MaD:263 |
+| Log4jJndiInjectionTest.java:394:35:394:42 | source(...) : String | Log4jJndiInjectionTest.java:394:26:394:42 | (...)... | provenance | Sink:MaD:264 |
+| Log4jJndiInjectionTest.java:394:35:394:42 | source(...) : String | Log4jJndiInjectionTest.java:394:26:394:42 | (...)... | provenance | Sink:MaD:263 |
+| Log4jJndiInjectionTest.java:395:95:395:102 | source(...) : String | Log4jJndiInjectionTest.java:395:86:395:102 | (...)... | provenance | Sink:MaD:266 |
+| Log4jJndiInjectionTest.java:395:95:395:102 | source(...) : String | Log4jJndiInjectionTest.java:395:86:395:102 | (...)... | provenance | Sink:MaD:265 |
+| Log4jJndiInjectionTest.java:396:80:396:87 | source(...) : String | Log4jJndiInjectionTest.java:396:71:396:87 | (...)... | provenance | Sink:MaD:266 |
+| Log4jJndiInjectionTest.java:396:80:396:87 | source(...) : String | Log4jJndiInjectionTest.java:396:71:396:87 | (...)... | provenance | Sink:MaD:265 |
+| Log4jJndiInjectionTest.java:397:65:397:72 | source(...) : String | Log4jJndiInjectionTest.java:397:56:397:72 | (...)... | provenance | Sink:MaD:266 |
+| Log4jJndiInjectionTest.java:397:65:397:72 | source(...) : String | Log4jJndiInjectionTest.java:397:56:397:72 | (...)... | provenance | Sink:MaD:265 |
+| Log4jJndiInjectionTest.java:398:50:398:57 | source(...) : String | Log4jJndiInjectionTest.java:398:41:398:57 | (...)... | provenance | Sink:MaD:266 |
+| Log4jJndiInjectionTest.java:398:50:398:57 | source(...) : String | Log4jJndiInjectionTest.java:398:41:398:57 | (...)... | provenance | Sink:MaD:265 |
+| Log4jJndiInjectionTest.java:399:35:399:42 | source(...) : String | Log4jJndiInjectionTest.java:399:26:399:42 | (...)... | provenance | Sink:MaD:266 |
+| Log4jJndiInjectionTest.java:399:35:399:42 | source(...) : String | Log4jJndiInjectionTest.java:399:26:399:42 | (...)... | provenance | Sink:MaD:265 |
+| Log4jJndiInjectionTest.java:400:110:400:117 | source(...) : String | Log4jJndiInjectionTest.java:400:101:400:117 | (...)... | provenance | Sink:MaD:268 |
+| Log4jJndiInjectionTest.java:400:110:400:117 | source(...) : String | Log4jJndiInjectionTest.java:400:101:400:117 | (...)... | provenance | Sink:MaD:267 |
+| Log4jJndiInjectionTest.java:401:95:401:102 | source(...) : String | Log4jJndiInjectionTest.java:401:86:401:102 | (...)... | provenance | Sink:MaD:268 |
+| Log4jJndiInjectionTest.java:401:95:401:102 | source(...) : String | Log4jJndiInjectionTest.java:401:86:401:102 | (...)... | provenance | Sink:MaD:267 |
+| Log4jJndiInjectionTest.java:402:80:402:87 | source(...) : String | Log4jJndiInjectionTest.java:402:71:402:87 | (...)... | provenance | Sink:MaD:268 |
+| Log4jJndiInjectionTest.java:402:80:402:87 | source(...) : String | Log4jJndiInjectionTest.java:402:71:402:87 | (...)... | provenance | Sink:MaD:267 |
+| Log4jJndiInjectionTest.java:403:65:403:72 | source(...) : String | Log4jJndiInjectionTest.java:403:56:403:72 | (...)... | provenance | Sink:MaD:268 |
+| Log4jJndiInjectionTest.java:403:65:403:72 | source(...) : String | Log4jJndiInjectionTest.java:403:56:403:72 | (...)... | provenance | Sink:MaD:267 |
+| Log4jJndiInjectionTest.java:404:50:404:57 | source(...) : String | Log4jJndiInjectionTest.java:404:41:404:57 | (...)... | provenance | Sink:MaD:268 |
+| Log4jJndiInjectionTest.java:404:50:404:57 | source(...) : String | Log4jJndiInjectionTest.java:404:41:404:57 | (...)... | provenance | Sink:MaD:267 |
+| Log4jJndiInjectionTest.java:405:35:405:42 | source(...) : String | Log4jJndiInjectionTest.java:405:26:405:42 | (...)... | provenance | Sink:MaD:268 |
+| Log4jJndiInjectionTest.java:405:35:405:42 | source(...) : String | Log4jJndiInjectionTest.java:405:26:405:42 | (...)... | provenance | Sink:MaD:267 |
+| Log4jJndiInjectionTest.java:406:125:406:132 | source(...) : String | Log4jJndiInjectionTest.java:406:116:406:132 | (...)... | provenance | Sink:MaD:270 |
+| Log4jJndiInjectionTest.java:406:125:406:132 | source(...) : String | Log4jJndiInjectionTest.java:406:116:406:132 | (...)... | provenance | Sink:MaD:269 |
+| Log4jJndiInjectionTest.java:407:110:407:117 | source(...) : String | Log4jJndiInjectionTest.java:407:101:407:117 | (...)... | provenance | Sink:MaD:270 |
+| Log4jJndiInjectionTest.java:407:110:407:117 | source(...) : String | Log4jJndiInjectionTest.java:407:101:407:117 | (...)... | provenance | Sink:MaD:269 |
+| Log4jJndiInjectionTest.java:408:95:408:102 | source(...) : String | Log4jJndiInjectionTest.java:408:86:408:102 | (...)... | provenance | Sink:MaD:270 |
+| Log4jJndiInjectionTest.java:408:95:408:102 | source(...) : String | Log4jJndiInjectionTest.java:408:86:408:102 | (...)... | provenance | Sink:MaD:269 |
+| Log4jJndiInjectionTest.java:409:80:409:87 | source(...) : String | Log4jJndiInjectionTest.java:409:71:409:87 | (...)... | provenance | Sink:MaD:270 |
+| Log4jJndiInjectionTest.java:409:80:409:87 | source(...) : String | Log4jJndiInjectionTest.java:409:71:409:87 | (...)... | provenance | Sink:MaD:269 |
+| Log4jJndiInjectionTest.java:410:65:410:72 | source(...) : String | Log4jJndiInjectionTest.java:410:56:410:72 | (...)... | provenance | Sink:MaD:270 |
+| Log4jJndiInjectionTest.java:410:65:410:72 | source(...) : String | Log4jJndiInjectionTest.java:410:56:410:72 | (...)... | provenance | Sink:MaD:269 |
+| Log4jJndiInjectionTest.java:411:50:411:57 | source(...) : String | Log4jJndiInjectionTest.java:411:41:411:57 | (...)... | provenance | Sink:MaD:270 |
+| Log4jJndiInjectionTest.java:411:50:411:57 | source(...) : String | Log4jJndiInjectionTest.java:411:41:411:57 | (...)... | provenance | Sink:MaD:269 |
+| Log4jJndiInjectionTest.java:412:35:412:42 | source(...) : String | Log4jJndiInjectionTest.java:412:26:412:42 | (...)... | provenance | Sink:MaD:270 |
+| Log4jJndiInjectionTest.java:412:35:412:42 | source(...) : String | Log4jJndiInjectionTest.java:412:26:412:42 | (...)... | provenance | Sink:MaD:269 |
+| Log4jJndiInjectionTest.java:413:140:413:147 | source(...) : String | Log4jJndiInjectionTest.java:413:131:413:147 | (...)... | provenance | Sink:MaD:272 |
+| Log4jJndiInjectionTest.java:413:140:413:147 | source(...) : String | Log4jJndiInjectionTest.java:413:131:413:147 | (...)... | provenance | Sink:MaD:271 |
+| Log4jJndiInjectionTest.java:414:125:414:132 | source(...) : String | Log4jJndiInjectionTest.java:414:116:414:132 | (...)... | provenance | Sink:MaD:272 |
+| Log4jJndiInjectionTest.java:414:125:414:132 | source(...) : String | Log4jJndiInjectionTest.java:414:116:414:132 | (...)... | provenance | Sink:MaD:271 |
+| Log4jJndiInjectionTest.java:415:110:415:117 | source(...) : String | Log4jJndiInjectionTest.java:415:101:415:117 | (...)... | provenance | Sink:MaD:272 |
+| Log4jJndiInjectionTest.java:415:110:415:117 | source(...) : String | Log4jJndiInjectionTest.java:415:101:415:117 | (...)... | provenance | Sink:MaD:271 |
+| Log4jJndiInjectionTest.java:416:95:416:102 | source(...) : String | Log4jJndiInjectionTest.java:416:86:416:102 | (...)... | provenance | Sink:MaD:272 |
+| Log4jJndiInjectionTest.java:416:95:416:102 | source(...) : String | Log4jJndiInjectionTest.java:416:86:416:102 | (...)... | provenance | Sink:MaD:271 |
+| Log4jJndiInjectionTest.java:417:80:417:87 | source(...) : String | Log4jJndiInjectionTest.java:417:71:417:87 | (...)... | provenance | Sink:MaD:272 |
+| Log4jJndiInjectionTest.java:417:80:417:87 | source(...) : String | Log4jJndiInjectionTest.java:417:71:417:87 | (...)... | provenance | Sink:MaD:271 |
+| Log4jJndiInjectionTest.java:418:65:418:72 | source(...) : String | Log4jJndiInjectionTest.java:418:56:418:72 | (...)... | provenance | Sink:MaD:272 |
+| Log4jJndiInjectionTest.java:418:65:418:72 | source(...) : String | Log4jJndiInjectionTest.java:418:56:418:72 | (...)... | provenance | Sink:MaD:271 |
+| Log4jJndiInjectionTest.java:419:50:419:57 | source(...) : String | Log4jJndiInjectionTest.java:419:41:419:57 | (...)... | provenance | Sink:MaD:272 |
+| Log4jJndiInjectionTest.java:419:50:419:57 | source(...) : String | Log4jJndiInjectionTest.java:419:41:419:57 | (...)... | provenance | Sink:MaD:271 |
+| Log4jJndiInjectionTest.java:420:35:420:42 | source(...) : String | Log4jJndiInjectionTest.java:420:26:420:42 | (...)... | provenance | Sink:MaD:272 |
+| Log4jJndiInjectionTest.java:420:35:420:42 | source(...) : String | Log4jJndiInjectionTest.java:420:26:420:42 | (...)... | provenance | Sink:MaD:271 |
+| Log4jJndiInjectionTest.java:421:155:421:162 | source(...) : String | Log4jJndiInjectionTest.java:421:146:421:162 | (...)... | provenance | Sink:MaD:274 |
+| Log4jJndiInjectionTest.java:421:155:421:162 | source(...) : String | Log4jJndiInjectionTest.java:421:146:421:162 | (...)... | provenance | Sink:MaD:273 |
+| Log4jJndiInjectionTest.java:422:140:422:147 | source(...) : String | Log4jJndiInjectionTest.java:422:131:422:147 | (...)... | provenance | Sink:MaD:274 |
+| Log4jJndiInjectionTest.java:422:140:422:147 | source(...) : String | Log4jJndiInjectionTest.java:422:131:422:147 | (...)... | provenance | Sink:MaD:273 |
+| Log4jJndiInjectionTest.java:423:125:423:132 | source(...) : String | Log4jJndiInjectionTest.java:423:116:423:132 | (...)... | provenance | Sink:MaD:274 |
+| Log4jJndiInjectionTest.java:423:125:423:132 | source(...) : String | Log4jJndiInjectionTest.java:423:116:423:132 | (...)... | provenance | Sink:MaD:273 |
+| Log4jJndiInjectionTest.java:424:110:424:117 | source(...) : String | Log4jJndiInjectionTest.java:424:101:424:117 | (...)... | provenance | Sink:MaD:274 |
+| Log4jJndiInjectionTest.java:424:110:424:117 | source(...) : String | Log4jJndiInjectionTest.java:424:101:424:117 | (...)... | provenance | Sink:MaD:273 |
+| Log4jJndiInjectionTest.java:425:95:425:102 | source(...) : String | Log4jJndiInjectionTest.java:425:86:425:102 | (...)... | provenance | Sink:MaD:274 |
+| Log4jJndiInjectionTest.java:425:95:425:102 | source(...) : String | Log4jJndiInjectionTest.java:425:86:425:102 | (...)... | provenance | Sink:MaD:273 |
+| Log4jJndiInjectionTest.java:426:80:426:87 | source(...) : String | Log4jJndiInjectionTest.java:426:71:426:87 | (...)... | provenance | Sink:MaD:274 |
+| Log4jJndiInjectionTest.java:426:80:426:87 | source(...) : String | Log4jJndiInjectionTest.java:426:71:426:87 | (...)... | provenance | Sink:MaD:273 |
+| Log4jJndiInjectionTest.java:427:65:427:72 | source(...) : String | Log4jJndiInjectionTest.java:427:56:427:72 | (...)... | provenance | Sink:MaD:274 |
+| Log4jJndiInjectionTest.java:427:65:427:72 | source(...) : String | Log4jJndiInjectionTest.java:427:56:427:72 | (...)... | provenance | Sink:MaD:273 |
+| Log4jJndiInjectionTest.java:428:50:428:57 | source(...) : String | Log4jJndiInjectionTest.java:428:41:428:57 | (...)... | provenance | Sink:MaD:274 |
+| Log4jJndiInjectionTest.java:428:50:428:57 | source(...) : String | Log4jJndiInjectionTest.java:428:41:428:57 | (...)... | provenance | Sink:MaD:273 |
+| Log4jJndiInjectionTest.java:429:35:429:42 | source(...) : String | Log4jJndiInjectionTest.java:429:26:429:42 | (...)... | provenance | Sink:MaD:274 |
+| Log4jJndiInjectionTest.java:429:35:429:42 | source(...) : String | Log4jJndiInjectionTest.java:429:26:429:42 | (...)... | provenance | Sink:MaD:273 |
+| Log4jJndiInjectionTest.java:430:170:430:177 | source(...) : String | Log4jJndiInjectionTest.java:430:161:430:177 | (...)... | provenance | Sink:MaD:276 |
+| Log4jJndiInjectionTest.java:430:170:430:177 | source(...) : String | Log4jJndiInjectionTest.java:430:161:430:177 | (...)... | provenance | Sink:MaD:275 |
+| Log4jJndiInjectionTest.java:431:155:431:162 | source(...) : String | Log4jJndiInjectionTest.java:431:146:431:162 | (...)... | provenance | Sink:MaD:276 |
+| Log4jJndiInjectionTest.java:431:155:431:162 | source(...) : String | Log4jJndiInjectionTest.java:431:146:431:162 | (...)... | provenance | Sink:MaD:275 |
+| Log4jJndiInjectionTest.java:432:140:432:147 | source(...) : String | Log4jJndiInjectionTest.java:432:131:432:147 | (...)... | provenance | Sink:MaD:276 |
+| Log4jJndiInjectionTest.java:432:140:432:147 | source(...) : String | Log4jJndiInjectionTest.java:432:131:432:147 | (...)... | provenance | Sink:MaD:275 |
+| Log4jJndiInjectionTest.java:433:125:433:132 | source(...) : String | Log4jJndiInjectionTest.java:433:116:433:132 | (...)... | provenance | Sink:MaD:276 |
+| Log4jJndiInjectionTest.java:433:125:433:132 | source(...) : String | Log4jJndiInjectionTest.java:433:116:433:132 | (...)... | provenance | Sink:MaD:275 |
+| Log4jJndiInjectionTest.java:434:110:434:117 | source(...) : String | Log4jJndiInjectionTest.java:434:101:434:117 | (...)... | provenance | Sink:MaD:276 |
+| Log4jJndiInjectionTest.java:434:110:434:117 | source(...) : String | Log4jJndiInjectionTest.java:434:101:434:117 | (...)... | provenance | Sink:MaD:275 |
+| Log4jJndiInjectionTest.java:435:95:435:102 | source(...) : String | Log4jJndiInjectionTest.java:435:86:435:102 | (...)... | provenance | Sink:MaD:276 |
+| Log4jJndiInjectionTest.java:435:95:435:102 | source(...) : String | Log4jJndiInjectionTest.java:435:86:435:102 | (...)... | provenance | Sink:MaD:275 |
+| Log4jJndiInjectionTest.java:436:80:436:87 | source(...) : String | Log4jJndiInjectionTest.java:436:71:436:87 | (...)... | provenance | Sink:MaD:276 |
+| Log4jJndiInjectionTest.java:436:80:436:87 | source(...) : String | Log4jJndiInjectionTest.java:436:71:436:87 | (...)... | provenance | Sink:MaD:275 |
+| Log4jJndiInjectionTest.java:437:65:437:72 | source(...) : String | Log4jJndiInjectionTest.java:437:56:437:72 | (...)... | provenance | Sink:MaD:276 |
+| Log4jJndiInjectionTest.java:437:65:437:72 | source(...) : String | Log4jJndiInjectionTest.java:437:56:437:72 | (...)... | provenance | Sink:MaD:275 |
+| Log4jJndiInjectionTest.java:438:50:438:57 | source(...) : String | Log4jJndiInjectionTest.java:438:41:438:57 | (...)... | provenance | Sink:MaD:276 |
+| Log4jJndiInjectionTest.java:438:50:438:57 | source(...) : String | Log4jJndiInjectionTest.java:438:41:438:57 | (...)... | provenance | Sink:MaD:275 |
+| Log4jJndiInjectionTest.java:439:35:439:42 | source(...) : String | Log4jJndiInjectionTest.java:439:26:439:42 | (...)... | provenance | Sink:MaD:276 |
+| Log4jJndiInjectionTest.java:439:35:439:42 | source(...) : String | Log4jJndiInjectionTest.java:439:26:439:42 | (...)... | provenance | Sink:MaD:275 |
+| Log4jJndiInjectionTest.java:440:35:440:42 | source(...) : String | Log4jJndiInjectionTest.java:440:26:440:42 | (...)... | provenance | Sink:MaD:260 |
+| Log4jJndiInjectionTest.java:440:35:440:42 | source(...) : String | Log4jJndiInjectionTest.java:440:26:440:42 | (...)... | provenance | Sink:MaD:259 |
+| Log4jJndiInjectionTest.java:441:55:441:62 | source(...) : String | Log4jJndiInjectionTest.java:441:41:441:62 | (...)... | provenance | Sink:MaD:260 |
+| Log4jJndiInjectionTest.java:441:55:441:62 | source(...) : String | Log4jJndiInjectionTest.java:441:41:441:62 | (...)... | provenance | Sink:MaD:259 |
+| Log4jJndiInjectionTest.java:442:35:442:42 | source(...) : String | Log4jJndiInjectionTest.java:442:26:442:42 | (...)... | provenance | Sink:MaD:280 |
+| Log4jJndiInjectionTest.java:442:35:442:42 | source(...) : String | Log4jJndiInjectionTest.java:442:26:442:42 | (...)... | provenance | Sink:MaD:279 |
+| Log4jJndiInjectionTest.java:443:40:443:47 | source(...) : String | Log4jJndiInjectionTest.java:443:26:443:47 | (...)... | provenance | Sink:MaD:282 |
+| Log4jJndiInjectionTest.java:443:40:443:47 | source(...) : String | Log4jJndiInjectionTest.java:443:26:443:47 | (...)... | provenance | Sink:MaD:281 |
+| Log4jJndiInjectionTest.java:444:40:444:47 | source(...) : String | Log4jJndiInjectionTest.java:444:26:444:47 | (...)... | provenance | Sink:MaD:284 |
+| Log4jJndiInjectionTest.java:444:40:444:47 | source(...) : String | Log4jJndiInjectionTest.java:444:26:444:47 | (...)... | provenance | Sink:MaD:283 |
+| Log4jJndiInjectionTest.java:445:40:445:47 | source(...) : String | Log4jJndiInjectionTest.java:445:25:445:47 | (...)... | provenance | Sink:MaD:286 |
+| Log4jJndiInjectionTest.java:445:40:445:47 | source(...) : String | Log4jJndiInjectionTest.java:445:25:445:47 | (...)... | provenance | Sink:MaD:285 |
+| Log4jJndiInjectionTest.java:446:40:446:47 | source(...) : String | Log4jJndiInjectionTest.java:446:25:446:47 | (...)... | provenance | Sink:MaD:288 |
+| Log4jJndiInjectionTest.java:446:40:446:47 | source(...) : String | Log4jJndiInjectionTest.java:446:25:446:47 | (...)... | provenance | Sink:MaD:287 |
+| Log4jJndiInjectionTest.java:447:55:447:62 | source(...) : String | Log4jJndiInjectionTest.java:447:40:447:62 | (...)... | provenance | Sink:MaD:290 |
+| Log4jJndiInjectionTest.java:447:55:447:62 | source(...) : String | Log4jJndiInjectionTest.java:447:40:447:62 | (...)... | provenance | Sink:MaD:289 |
+| Log4jJndiInjectionTest.java:448:55:448:62 | source(...) : String | Log4jJndiInjectionTest.java:448:40:448:62 | (...)... | provenance | Sink:MaD:292 |
+| Log4jJndiInjectionTest.java:448:55:448:62 | source(...) : String | Log4jJndiInjectionTest.java:448:40:448:62 | (...)... | provenance | Sink:MaD:291 |
+| Log4jJndiInjectionTest.java:449:50:449:57 | source(...) : String | Log4jJndiInjectionTest.java:449:40:449:57 | (...)... | provenance | Sink:MaD:294 |
+| Log4jJndiInjectionTest.java:449:50:449:57 | source(...) : String | Log4jJndiInjectionTest.java:449:40:449:57 | (...)... | provenance | Sink:MaD:293 |
+| Log4jJndiInjectionTest.java:450:58:450:65 | source(...) : String | Log4jJndiInjectionTest.java:450:40:450:65 | (...)... | provenance | Sink:MaD:296 |
+| Log4jJndiInjectionTest.java:450:58:450:65 | source(...) : String | Log4jJndiInjectionTest.java:450:40:450:65 | (...)... | provenance | Sink:MaD:295 |
+| Log4jJndiInjectionTest.java:451:58:451:65 | source(...) : String | Log4jJndiInjectionTest.java:451:40:451:65 | (...)... | provenance | Sink:MaD:298 |
+| Log4jJndiInjectionTest.java:451:58:451:65 | source(...) : String | Log4jJndiInjectionTest.java:451:40:451:65 | (...)... | provenance | Sink:MaD:297 |
+| Log4jJndiInjectionTest.java:453:49:453:56 | source(...) : String | Log4jJndiInjectionTest.java:453:40:453:56 | (...)... | provenance | Sink:MaD:302 |
+| Log4jJndiInjectionTest.java:453:49:453:56 | source(...) : String | Log4jJndiInjectionTest.java:453:40:453:56 | (...)... | provenance | Sink:MaD:301 |
+| Log4jJndiInjectionTest.java:454:49:454:56 | source(...) : String | Log4jJndiInjectionTest.java:454:40:454:56 | (...)... | provenance | Sink:MaD:322 |
+| Log4jJndiInjectionTest.java:454:49:454:56 | source(...) : String | Log4jJndiInjectionTest.java:454:40:454:56 | (...)... | provenance | Sink:MaD:321 |
+| Log4jJndiInjectionTest.java:455:55:455:77 | {...} : Object[] [[]] : String | Log4jJndiInjectionTest.java:455:55:455:77 | new Object[] | provenance | Sink:MaD:322 |
+| Log4jJndiInjectionTest.java:455:55:455:77 | {...} : Object[] [[]] : String | Log4jJndiInjectionTest.java:455:55:455:77 | new Object[] | provenance | Sink:MaD:321 |
 | Log4jJndiInjectionTest.java:455:69:455:76 | source(...) : String | Log4jJndiInjectionTest.java:455:55:455:77 | {...} : Object[] [[]] : String | provenance |  |
-| Log4jJndiInjectionTest.java:456:64:456:71 | source(...) : String | Log4jJndiInjectionTest.java:456:55:456:71 | (...)... | provenance |  Sink:MaD:158 |
-| Log4jJndiInjectionTest.java:456:64:456:71 | source(...) : String | Log4jJndiInjectionTest.java:456:55:456:71 | (...)... | provenance |  Sink:MaD:474 |
-| Log4jJndiInjectionTest.java:457:49:457:56 | source(...) : String | Log4jJndiInjectionTest.java:457:40:457:56 | (...)... | provenance |  Sink:MaD:158 |
-| Log4jJndiInjectionTest.java:457:49:457:56 | source(...) : String | Log4jJndiInjectionTest.java:457:40:457:56 | (...)... | provenance |  Sink:MaD:474 |
-| Log4jJndiInjectionTest.java:458:79:458:86 | source(...) : String | Log4jJndiInjectionTest.java:458:70:458:86 | (...)... | provenance |  Sink:MaD:159 |
-| Log4jJndiInjectionTest.java:458:79:458:86 | source(...) : String | Log4jJndiInjectionTest.java:458:70:458:86 | (...)... | provenance |  Sink:MaD:475 |
-| Log4jJndiInjectionTest.java:459:64:459:71 | source(...) : String | Log4jJndiInjectionTest.java:459:55:459:71 | (...)... | provenance |  Sink:MaD:159 |
-| Log4jJndiInjectionTest.java:459:64:459:71 | source(...) : String | Log4jJndiInjectionTest.java:459:55:459:71 | (...)... | provenance |  Sink:MaD:475 |
-| Log4jJndiInjectionTest.java:460:49:460:56 | source(...) : String | Log4jJndiInjectionTest.java:460:40:460:56 | (...)... | provenance |  Sink:MaD:159 |
-| Log4jJndiInjectionTest.java:460:49:460:56 | source(...) : String | Log4jJndiInjectionTest.java:460:40:460:56 | (...)... | provenance |  Sink:MaD:475 |
-| Log4jJndiInjectionTest.java:461:94:461:101 | source(...) : String | Log4jJndiInjectionTest.java:461:85:461:101 | (...)... | provenance |  Sink:MaD:160 |
-| Log4jJndiInjectionTest.java:461:94:461:101 | source(...) : String | Log4jJndiInjectionTest.java:461:85:461:101 | (...)... | provenance |  Sink:MaD:476 |
-| Log4jJndiInjectionTest.java:462:79:462:86 | source(...) : String | Log4jJndiInjectionTest.java:462:70:462:86 | (...)... | provenance |  Sink:MaD:160 |
-| Log4jJndiInjectionTest.java:462:79:462:86 | source(...) : String | Log4jJndiInjectionTest.java:462:70:462:86 | (...)... | provenance |  Sink:MaD:476 |
-| Log4jJndiInjectionTest.java:463:64:463:71 | source(...) : String | Log4jJndiInjectionTest.java:463:55:463:71 | (...)... | provenance |  Sink:MaD:160 |
-| Log4jJndiInjectionTest.java:463:64:463:71 | source(...) : String | Log4jJndiInjectionTest.java:463:55:463:71 | (...)... | provenance |  Sink:MaD:476 |
-| Log4jJndiInjectionTest.java:464:49:464:56 | source(...) : String | Log4jJndiInjectionTest.java:464:40:464:56 | (...)... | provenance |  Sink:MaD:160 |
-| Log4jJndiInjectionTest.java:464:49:464:56 | source(...) : String | Log4jJndiInjectionTest.java:464:40:464:56 | (...)... | provenance |  Sink:MaD:476 |
-| Log4jJndiInjectionTest.java:465:109:465:116 | source(...) : String | Log4jJndiInjectionTest.java:465:100:465:116 | (...)... | provenance |  Sink:MaD:161 |
-| Log4jJndiInjectionTest.java:465:109:465:116 | source(...) : String | Log4jJndiInjectionTest.java:465:100:465:116 | (...)... | provenance |  Sink:MaD:477 |
-| Log4jJndiInjectionTest.java:466:94:466:101 | source(...) : String | Log4jJndiInjectionTest.java:466:85:466:101 | (...)... | provenance |  Sink:MaD:161 |
-| Log4jJndiInjectionTest.java:466:94:466:101 | source(...) : String | Log4jJndiInjectionTest.java:466:85:466:101 | (...)... | provenance |  Sink:MaD:477 |
-| Log4jJndiInjectionTest.java:467:79:467:86 | source(...) : String | Log4jJndiInjectionTest.java:467:70:467:86 | (...)... | provenance |  Sink:MaD:161 |
-| Log4jJndiInjectionTest.java:467:79:467:86 | source(...) : String | Log4jJndiInjectionTest.java:467:70:467:86 | (...)... | provenance |  Sink:MaD:477 |
-| Log4jJndiInjectionTest.java:468:64:468:71 | source(...) : String | Log4jJndiInjectionTest.java:468:55:468:71 | (...)... | provenance |  Sink:MaD:161 |
-| Log4jJndiInjectionTest.java:468:64:468:71 | source(...) : String | Log4jJndiInjectionTest.java:468:55:468:71 | (...)... | provenance |  Sink:MaD:477 |
-| Log4jJndiInjectionTest.java:469:49:469:56 | source(...) : String | Log4jJndiInjectionTest.java:469:40:469:56 | (...)... | provenance |  Sink:MaD:161 |
-| Log4jJndiInjectionTest.java:469:49:469:56 | source(...) : String | Log4jJndiInjectionTest.java:469:40:469:56 | (...)... | provenance |  Sink:MaD:477 |
-| Log4jJndiInjectionTest.java:470:124:470:131 | source(...) : String | Log4jJndiInjectionTest.java:470:115:470:131 | (...)... | provenance |  Sink:MaD:162 |
-| Log4jJndiInjectionTest.java:470:124:470:131 | source(...) : String | Log4jJndiInjectionTest.java:470:115:470:131 | (...)... | provenance |  Sink:MaD:478 |
-| Log4jJndiInjectionTest.java:471:109:471:116 | source(...) : String | Log4jJndiInjectionTest.java:471:100:471:116 | (...)... | provenance |  Sink:MaD:162 |
-| Log4jJndiInjectionTest.java:471:109:471:116 | source(...) : String | Log4jJndiInjectionTest.java:471:100:471:116 | (...)... | provenance |  Sink:MaD:478 |
-| Log4jJndiInjectionTest.java:472:94:472:101 | source(...) : String | Log4jJndiInjectionTest.java:472:85:472:101 | (...)... | provenance |  Sink:MaD:162 |
-| Log4jJndiInjectionTest.java:472:94:472:101 | source(...) : String | Log4jJndiInjectionTest.java:472:85:472:101 | (...)... | provenance |  Sink:MaD:478 |
-| Log4jJndiInjectionTest.java:473:79:473:86 | source(...) : String | Log4jJndiInjectionTest.java:473:70:473:86 | (...)... | provenance |  Sink:MaD:162 |
-| Log4jJndiInjectionTest.java:473:79:473:86 | source(...) : String | Log4jJndiInjectionTest.java:473:70:473:86 | (...)... | provenance |  Sink:MaD:478 |
-| Log4jJndiInjectionTest.java:474:64:474:71 | source(...) : String | Log4jJndiInjectionTest.java:474:55:474:71 | (...)... | provenance |  Sink:MaD:162 |
-| Log4jJndiInjectionTest.java:474:64:474:71 | source(...) : String | Log4jJndiInjectionTest.java:474:55:474:71 | (...)... | provenance |  Sink:MaD:478 |
-| Log4jJndiInjectionTest.java:475:49:475:56 | source(...) : String | Log4jJndiInjectionTest.java:475:40:475:56 | (...)... | provenance |  Sink:MaD:162 |
-| Log4jJndiInjectionTest.java:475:49:475:56 | source(...) : String | Log4jJndiInjectionTest.java:475:40:475:56 | (...)... | provenance |  Sink:MaD:478 |
-| Log4jJndiInjectionTest.java:476:139:476:146 | source(...) : String | Log4jJndiInjectionTest.java:476:130:476:146 | (...)... | provenance |  Sink:MaD:163 |
-| Log4jJndiInjectionTest.java:476:139:476:146 | source(...) : String | Log4jJndiInjectionTest.java:476:130:476:146 | (...)... | provenance |  Sink:MaD:479 |
-| Log4jJndiInjectionTest.java:477:124:477:131 | source(...) : String | Log4jJndiInjectionTest.java:477:115:477:131 | (...)... | provenance |  Sink:MaD:163 |
-| Log4jJndiInjectionTest.java:477:124:477:131 | source(...) : String | Log4jJndiInjectionTest.java:477:115:477:131 | (...)... | provenance |  Sink:MaD:479 |
-| Log4jJndiInjectionTest.java:478:109:478:116 | source(...) : String | Log4jJndiInjectionTest.java:478:100:478:116 | (...)... | provenance |  Sink:MaD:163 |
-| Log4jJndiInjectionTest.java:478:109:478:116 | source(...) : String | Log4jJndiInjectionTest.java:478:100:478:116 | (...)... | provenance |  Sink:MaD:479 |
-| Log4jJndiInjectionTest.java:479:94:479:101 | source(...) : String | Log4jJndiInjectionTest.java:479:85:479:101 | (...)... | provenance |  Sink:MaD:163 |
-| Log4jJndiInjectionTest.java:479:94:479:101 | source(...) : String | Log4jJndiInjectionTest.java:479:85:479:101 | (...)... | provenance |  Sink:MaD:479 |
-| Log4jJndiInjectionTest.java:480:79:480:86 | source(...) : String | Log4jJndiInjectionTest.java:480:70:480:86 | (...)... | provenance |  Sink:MaD:163 |
-| Log4jJndiInjectionTest.java:480:79:480:86 | source(...) : String | Log4jJndiInjectionTest.java:480:70:480:86 | (...)... | provenance |  Sink:MaD:479 |
-| Log4jJndiInjectionTest.java:481:64:481:71 | source(...) : String | Log4jJndiInjectionTest.java:481:55:481:71 | (...)... | provenance |  Sink:MaD:163 |
-| Log4jJndiInjectionTest.java:481:64:481:71 | source(...) : String | Log4jJndiInjectionTest.java:481:55:481:71 | (...)... | provenance |  Sink:MaD:479 |
-| Log4jJndiInjectionTest.java:482:49:482:56 | source(...) : String | Log4jJndiInjectionTest.java:482:40:482:56 | (...)... | provenance |  Sink:MaD:163 |
-| Log4jJndiInjectionTest.java:482:49:482:56 | source(...) : String | Log4jJndiInjectionTest.java:482:40:482:56 | (...)... | provenance |  Sink:MaD:479 |
-| Log4jJndiInjectionTest.java:483:154:483:161 | source(...) : String | Log4jJndiInjectionTest.java:483:145:483:161 | (...)... | provenance |  Sink:MaD:164 |
-| Log4jJndiInjectionTest.java:483:154:483:161 | source(...) : String | Log4jJndiInjectionTest.java:483:145:483:161 | (...)... | provenance |  Sink:MaD:480 |
-| Log4jJndiInjectionTest.java:484:139:484:146 | source(...) : String | Log4jJndiInjectionTest.java:484:130:484:146 | (...)... | provenance |  Sink:MaD:164 |
-| Log4jJndiInjectionTest.java:484:139:484:146 | source(...) : String | Log4jJndiInjectionTest.java:484:130:484:146 | (...)... | provenance |  Sink:MaD:480 |
-| Log4jJndiInjectionTest.java:485:124:485:131 | source(...) : String | Log4jJndiInjectionTest.java:485:115:485:131 | (...)... | provenance |  Sink:MaD:164 |
-| Log4jJndiInjectionTest.java:485:124:485:131 | source(...) : String | Log4jJndiInjectionTest.java:485:115:485:131 | (...)... | provenance |  Sink:MaD:480 |
-| Log4jJndiInjectionTest.java:486:109:486:116 | source(...) : String | Log4jJndiInjectionTest.java:486:100:486:116 | (...)... | provenance |  Sink:MaD:164 |
-| Log4jJndiInjectionTest.java:486:109:486:116 | source(...) : String | Log4jJndiInjectionTest.java:486:100:486:116 | (...)... | provenance |  Sink:MaD:480 |
-| Log4jJndiInjectionTest.java:487:94:487:101 | source(...) : String | Log4jJndiInjectionTest.java:487:85:487:101 | (...)... | provenance |  Sink:MaD:164 |
-| Log4jJndiInjectionTest.java:487:94:487:101 | source(...) : String | Log4jJndiInjectionTest.java:487:85:487:101 | (...)... | provenance |  Sink:MaD:480 |
-| Log4jJndiInjectionTest.java:488:79:488:86 | source(...) : String | Log4jJndiInjectionTest.java:488:70:488:86 | (...)... | provenance |  Sink:MaD:164 |
-| Log4jJndiInjectionTest.java:488:79:488:86 | source(...) : String | Log4jJndiInjectionTest.java:488:70:488:86 | (...)... | provenance |  Sink:MaD:480 |
-| Log4jJndiInjectionTest.java:489:64:489:71 | source(...) : String | Log4jJndiInjectionTest.java:489:55:489:71 | (...)... | provenance |  Sink:MaD:164 |
-| Log4jJndiInjectionTest.java:489:64:489:71 | source(...) : String | Log4jJndiInjectionTest.java:489:55:489:71 | (...)... | provenance |  Sink:MaD:480 |
-| Log4jJndiInjectionTest.java:490:49:490:56 | source(...) : String | Log4jJndiInjectionTest.java:490:40:490:56 | (...)... | provenance |  Sink:MaD:164 |
-| Log4jJndiInjectionTest.java:490:49:490:56 | source(...) : String | Log4jJndiInjectionTest.java:490:40:490:56 | (...)... | provenance |  Sink:MaD:480 |
-| Log4jJndiInjectionTest.java:491:169:491:176 | source(...) : String | Log4jJndiInjectionTest.java:491:160:491:176 | (...)... | provenance |  Sink:MaD:165 |
-| Log4jJndiInjectionTest.java:491:169:491:176 | source(...) : String | Log4jJndiInjectionTest.java:491:160:491:176 | (...)... | provenance |  Sink:MaD:481 |
-| Log4jJndiInjectionTest.java:492:154:492:161 | source(...) : String | Log4jJndiInjectionTest.java:492:145:492:161 | (...)... | provenance |  Sink:MaD:165 |
-| Log4jJndiInjectionTest.java:492:154:492:161 | source(...) : String | Log4jJndiInjectionTest.java:492:145:492:161 | (...)... | provenance |  Sink:MaD:481 |
-| Log4jJndiInjectionTest.java:493:139:493:146 | source(...) : String | Log4jJndiInjectionTest.java:493:130:493:146 | (...)... | provenance |  Sink:MaD:165 |
-| Log4jJndiInjectionTest.java:493:139:493:146 | source(...) : String | Log4jJndiInjectionTest.java:493:130:493:146 | (...)... | provenance |  Sink:MaD:481 |
-| Log4jJndiInjectionTest.java:494:124:494:131 | source(...) : String | Log4jJndiInjectionTest.java:494:115:494:131 | (...)... | provenance |  Sink:MaD:165 |
-| Log4jJndiInjectionTest.java:494:124:494:131 | source(...) : String | Log4jJndiInjectionTest.java:494:115:494:131 | (...)... | provenance |  Sink:MaD:481 |
-| Log4jJndiInjectionTest.java:495:109:495:116 | source(...) : String | Log4jJndiInjectionTest.java:495:100:495:116 | (...)... | provenance |  Sink:MaD:165 |
-| Log4jJndiInjectionTest.java:495:109:495:116 | source(...) : String | Log4jJndiInjectionTest.java:495:100:495:116 | (...)... | provenance |  Sink:MaD:481 |
-| Log4jJndiInjectionTest.java:496:94:496:101 | source(...) : String | Log4jJndiInjectionTest.java:496:85:496:101 | (...)... | provenance |  Sink:MaD:165 |
-| Log4jJndiInjectionTest.java:496:94:496:101 | source(...) : String | Log4jJndiInjectionTest.java:496:85:496:101 | (...)... | provenance |  Sink:MaD:481 |
-| Log4jJndiInjectionTest.java:497:79:497:86 | source(...) : String | Log4jJndiInjectionTest.java:497:70:497:86 | (...)... | provenance |  Sink:MaD:165 |
-| Log4jJndiInjectionTest.java:497:79:497:86 | source(...) : String | Log4jJndiInjectionTest.java:497:70:497:86 | (...)... | provenance |  Sink:MaD:481 |
-| Log4jJndiInjectionTest.java:498:64:498:71 | source(...) : String | Log4jJndiInjectionTest.java:498:55:498:71 | (...)... | provenance |  Sink:MaD:165 |
-| Log4jJndiInjectionTest.java:498:64:498:71 | source(...) : String | Log4jJndiInjectionTest.java:498:55:498:71 | (...)... | provenance |  Sink:MaD:481 |
-| Log4jJndiInjectionTest.java:499:49:499:56 | source(...) : String | Log4jJndiInjectionTest.java:499:40:499:56 | (...)... | provenance |  Sink:MaD:165 |
-| Log4jJndiInjectionTest.java:499:49:499:56 | source(...) : String | Log4jJndiInjectionTest.java:499:40:499:56 | (...)... | provenance |  Sink:MaD:481 |
-| Log4jJndiInjectionTest.java:500:184:500:191 | source(...) : String | Log4jJndiInjectionTest.java:500:175:500:191 | (...)... | provenance |  Sink:MaD:166 |
-| Log4jJndiInjectionTest.java:500:184:500:191 | source(...) : String | Log4jJndiInjectionTest.java:500:175:500:191 | (...)... | provenance |  Sink:MaD:482 |
-| Log4jJndiInjectionTest.java:501:169:501:176 | source(...) : String | Log4jJndiInjectionTest.java:501:160:501:176 | (...)... | provenance |  Sink:MaD:166 |
-| Log4jJndiInjectionTest.java:501:169:501:176 | source(...) : String | Log4jJndiInjectionTest.java:501:160:501:176 | (...)... | provenance |  Sink:MaD:482 |
-| Log4jJndiInjectionTest.java:502:154:502:161 | source(...) : String | Log4jJndiInjectionTest.java:502:145:502:161 | (...)... | provenance |  Sink:MaD:166 |
-| Log4jJndiInjectionTest.java:502:154:502:161 | source(...) : String | Log4jJndiInjectionTest.java:502:145:502:161 | (...)... | provenance |  Sink:MaD:482 |
-| Log4jJndiInjectionTest.java:503:139:503:146 | source(...) : String | Log4jJndiInjectionTest.java:503:130:503:146 | (...)... | provenance |  Sink:MaD:166 |
-| Log4jJndiInjectionTest.java:503:139:503:146 | source(...) : String | Log4jJndiInjectionTest.java:503:130:503:146 | (...)... | provenance |  Sink:MaD:482 |
-| Log4jJndiInjectionTest.java:504:124:504:131 | source(...) : String | Log4jJndiInjectionTest.java:504:115:504:131 | (...)... | provenance |  Sink:MaD:166 |
-| Log4jJndiInjectionTest.java:504:124:504:131 | source(...) : String | Log4jJndiInjectionTest.java:504:115:504:131 | (...)... | provenance |  Sink:MaD:482 |
-| Log4jJndiInjectionTest.java:505:109:505:116 | source(...) : String | Log4jJndiInjectionTest.java:505:100:505:116 | (...)... | provenance |  Sink:MaD:166 |
-| Log4jJndiInjectionTest.java:505:109:505:116 | source(...) : String | Log4jJndiInjectionTest.java:505:100:505:116 | (...)... | provenance |  Sink:MaD:482 |
-| Log4jJndiInjectionTest.java:506:94:506:101 | source(...) : String | Log4jJndiInjectionTest.java:506:85:506:101 | (...)... | provenance |  Sink:MaD:166 |
-| Log4jJndiInjectionTest.java:506:94:506:101 | source(...) : String | Log4jJndiInjectionTest.java:506:85:506:101 | (...)... | provenance |  Sink:MaD:482 |
-| Log4jJndiInjectionTest.java:507:79:507:86 | source(...) : String | Log4jJndiInjectionTest.java:507:70:507:86 | (...)... | provenance |  Sink:MaD:166 |
-| Log4jJndiInjectionTest.java:507:79:507:86 | source(...) : String | Log4jJndiInjectionTest.java:507:70:507:86 | (...)... | provenance |  Sink:MaD:482 |
-| Log4jJndiInjectionTest.java:508:64:508:71 | source(...) : String | Log4jJndiInjectionTest.java:508:55:508:71 | (...)... | provenance |  Sink:MaD:166 |
-| Log4jJndiInjectionTest.java:508:64:508:71 | source(...) : String | Log4jJndiInjectionTest.java:508:55:508:71 | (...)... | provenance |  Sink:MaD:482 |
-| Log4jJndiInjectionTest.java:509:49:509:56 | source(...) : String | Log4jJndiInjectionTest.java:509:40:509:56 | (...)... | provenance |  Sink:MaD:166 |
-| Log4jJndiInjectionTest.java:509:49:509:56 | source(...) : String | Log4jJndiInjectionTest.java:509:40:509:56 | (...)... | provenance |  Sink:MaD:482 |
-| Log4jJndiInjectionTest.java:510:49:510:56 | source(...) : String | Log4jJndiInjectionTest.java:510:40:510:56 | (...)... | provenance |  Sink:MaD:158 |
-| Log4jJndiInjectionTest.java:510:49:510:56 | source(...) : String | Log4jJndiInjectionTest.java:510:40:510:56 | (...)... | provenance |  Sink:MaD:474 |
-| Log4jJndiInjectionTest.java:511:69:511:76 | source(...) : String | Log4jJndiInjectionTest.java:511:55:511:76 | (...)... | provenance |  Sink:MaD:158 |
-| Log4jJndiInjectionTest.java:511:69:511:76 | source(...) : String | Log4jJndiInjectionTest.java:511:55:511:76 | (...)... | provenance |  Sink:MaD:474 |
-| Log4jJndiInjectionTest.java:512:49:512:56 | source(...) : String | Log4jJndiInjectionTest.java:512:40:512:56 | (...)... | provenance |  Sink:MaD:168 |
-| Log4jJndiInjectionTest.java:512:49:512:56 | source(...) : String | Log4jJndiInjectionTest.java:512:40:512:56 | (...)... | provenance |  Sink:MaD:484 |
-| Log4jJndiInjectionTest.java:513:54:513:61 | source(...) : String | Log4jJndiInjectionTest.java:513:40:513:61 | (...)... | provenance |  Sink:MaD:169 |
-| Log4jJndiInjectionTest.java:513:54:513:61 | source(...) : String | Log4jJndiInjectionTest.java:513:40:513:61 | (...)... | provenance |  Sink:MaD:485 |
-| Log4jJndiInjectionTest.java:514:54:514:61 | source(...) : String | Log4jJndiInjectionTest.java:514:40:514:61 | (...)... | provenance |  Sink:MaD:170 |
-| Log4jJndiInjectionTest.java:514:54:514:61 | source(...) : String | Log4jJndiInjectionTest.java:514:40:514:61 | (...)... | provenance |  Sink:MaD:486 |
-| Log4jJndiInjectionTest.java:515:43:515:50 | source(...) : String | Log4jJndiInjectionTest.java:515:25:515:50 | (...)... | provenance |  Sink:MaD:173 |
-| Log4jJndiInjectionTest.java:515:43:515:50 | source(...) : String | Log4jJndiInjectionTest.java:515:25:515:50 | (...)... | provenance |  Sink:MaD:489 |
-| Log4jJndiInjectionTest.java:516:43:516:50 | source(...) : String | Log4jJndiInjectionTest.java:516:25:516:50 | (...)... | provenance |  Sink:MaD:174 |
-| Log4jJndiInjectionTest.java:516:43:516:50 | source(...) : String | Log4jJndiInjectionTest.java:516:25:516:50 | (...)... | provenance |  Sink:MaD:490 |
-| Log4jJndiInjectionTest.java:517:35:517:42 | source(...) : String | Log4jJndiInjectionTest.java:517:25:517:42 | (...)... | provenance |  Sink:MaD:171 |
-| Log4jJndiInjectionTest.java:517:35:517:42 | source(...) : String | Log4jJndiInjectionTest.java:517:25:517:42 | (...)... | provenance |  Sink:MaD:487 |
-| Log4jJndiInjectionTest.java:518:35:518:42 | source(...) : String | Log4jJndiInjectionTest.java:518:25:518:42 | (...)... | provenance |  Sink:MaD:172 |
-| Log4jJndiInjectionTest.java:518:35:518:42 | source(...) : String | Log4jJndiInjectionTest.java:518:25:518:42 | (...)... | provenance |  Sink:MaD:488 |
-| Log4jJndiInjectionTest.java:521:34:521:41 | source(...) : String | Log4jJndiInjectionTest.java:521:25:521:41 | (...)... | provenance |  Sink:MaD:177 |
-| Log4jJndiInjectionTest.java:521:34:521:41 | source(...) : String | Log4jJndiInjectionTest.java:521:25:521:41 | (...)... | provenance |  Sink:MaD:493 |
-| Log4jJndiInjectionTest.java:522:34:522:41 | source(...) : String | Log4jJndiInjectionTest.java:522:25:522:41 | (...)... | provenance |  Sink:MaD:187 |
-| Log4jJndiInjectionTest.java:522:34:522:41 | source(...) : String | Log4jJndiInjectionTest.java:522:25:522:41 | (...)... | provenance |  Sink:MaD:503 |
-| Log4jJndiInjectionTest.java:523:40:523:62 | {...} : Object[] [[]] : String | Log4jJndiInjectionTest.java:523:40:523:62 | new Object[] | provenance |  Sink:MaD:187 |
-| Log4jJndiInjectionTest.java:523:40:523:62 | {...} : Object[] [[]] : String | Log4jJndiInjectionTest.java:523:40:523:62 | new Object[] | provenance |  Sink:MaD:503 |
+| Log4jJndiInjectionTest.java:456:64:456:71 | source(...) : String | Log4jJndiInjectionTest.java:456:55:456:71 | (...)... | provenance | Sink:MaD:304 |
+| Log4jJndiInjectionTest.java:456:64:456:71 | source(...) : String | Log4jJndiInjectionTest.java:456:55:456:71 | (...)... | provenance | Sink:MaD:303 |
+| Log4jJndiInjectionTest.java:457:49:457:56 | source(...) : String | Log4jJndiInjectionTest.java:457:40:457:56 | (...)... | provenance | Sink:MaD:304 |
+| Log4jJndiInjectionTest.java:457:49:457:56 | source(...) : String | Log4jJndiInjectionTest.java:457:40:457:56 | (...)... | provenance | Sink:MaD:303 |
+| Log4jJndiInjectionTest.java:458:79:458:86 | source(...) : String | Log4jJndiInjectionTest.java:458:70:458:86 | (...)... | provenance | Sink:MaD:306 |
+| Log4jJndiInjectionTest.java:458:79:458:86 | source(...) : String | Log4jJndiInjectionTest.java:458:70:458:86 | (...)... | provenance | Sink:MaD:305 |
+| Log4jJndiInjectionTest.java:459:64:459:71 | source(...) : String | Log4jJndiInjectionTest.java:459:55:459:71 | (...)... | provenance | Sink:MaD:306 |
+| Log4jJndiInjectionTest.java:459:64:459:71 | source(...) : String | Log4jJndiInjectionTest.java:459:55:459:71 | (...)... | provenance | Sink:MaD:305 |
+| Log4jJndiInjectionTest.java:460:49:460:56 | source(...) : String | Log4jJndiInjectionTest.java:460:40:460:56 | (...)... | provenance | Sink:MaD:306 |
+| Log4jJndiInjectionTest.java:460:49:460:56 | source(...) : String | Log4jJndiInjectionTest.java:460:40:460:56 | (...)... | provenance | Sink:MaD:305 |
+| Log4jJndiInjectionTest.java:461:94:461:101 | source(...) : String | Log4jJndiInjectionTest.java:461:85:461:101 | (...)... | provenance | Sink:MaD:308 |
+| Log4jJndiInjectionTest.java:461:94:461:101 | source(...) : String | Log4jJndiInjectionTest.java:461:85:461:101 | (...)... | provenance | Sink:MaD:307 |
+| Log4jJndiInjectionTest.java:462:79:462:86 | source(...) : String | Log4jJndiInjectionTest.java:462:70:462:86 | (...)... | provenance | Sink:MaD:308 |
+| Log4jJndiInjectionTest.java:462:79:462:86 | source(...) : String | Log4jJndiInjectionTest.java:462:70:462:86 | (...)... | provenance | Sink:MaD:307 |
+| Log4jJndiInjectionTest.java:463:64:463:71 | source(...) : String | Log4jJndiInjectionTest.java:463:55:463:71 | (...)... | provenance | Sink:MaD:308 |
+| Log4jJndiInjectionTest.java:463:64:463:71 | source(...) : String | Log4jJndiInjectionTest.java:463:55:463:71 | (...)... | provenance | Sink:MaD:307 |
+| Log4jJndiInjectionTest.java:464:49:464:56 | source(...) : String | Log4jJndiInjectionTest.java:464:40:464:56 | (...)... | provenance | Sink:MaD:308 |
+| Log4jJndiInjectionTest.java:464:49:464:56 | source(...) : String | Log4jJndiInjectionTest.java:464:40:464:56 | (...)... | provenance | Sink:MaD:307 |
+| Log4jJndiInjectionTest.java:465:109:465:116 | source(...) : String | Log4jJndiInjectionTest.java:465:100:465:116 | (...)... | provenance | Sink:MaD:310 |
+| Log4jJndiInjectionTest.java:465:109:465:116 | source(...) : String | Log4jJndiInjectionTest.java:465:100:465:116 | (...)... | provenance | Sink:MaD:309 |
+| Log4jJndiInjectionTest.java:466:94:466:101 | source(...) : String | Log4jJndiInjectionTest.java:466:85:466:101 | (...)... | provenance | Sink:MaD:310 |
+| Log4jJndiInjectionTest.java:466:94:466:101 | source(...) : String | Log4jJndiInjectionTest.java:466:85:466:101 | (...)... | provenance | Sink:MaD:309 |
+| Log4jJndiInjectionTest.java:467:79:467:86 | source(...) : String | Log4jJndiInjectionTest.java:467:70:467:86 | (...)... | provenance | Sink:MaD:310 |
+| Log4jJndiInjectionTest.java:467:79:467:86 | source(...) : String | Log4jJndiInjectionTest.java:467:70:467:86 | (...)... | provenance | Sink:MaD:309 |
+| Log4jJndiInjectionTest.java:468:64:468:71 | source(...) : String | Log4jJndiInjectionTest.java:468:55:468:71 | (...)... | provenance | Sink:MaD:310 |
+| Log4jJndiInjectionTest.java:468:64:468:71 | source(...) : String | Log4jJndiInjectionTest.java:468:55:468:71 | (...)... | provenance | Sink:MaD:309 |
+| Log4jJndiInjectionTest.java:469:49:469:56 | source(...) : String | Log4jJndiInjectionTest.java:469:40:469:56 | (...)... | provenance | Sink:MaD:310 |
+| Log4jJndiInjectionTest.java:469:49:469:56 | source(...) : String | Log4jJndiInjectionTest.java:469:40:469:56 | (...)... | provenance | Sink:MaD:309 |
+| Log4jJndiInjectionTest.java:470:124:470:131 | source(...) : String | Log4jJndiInjectionTest.java:470:115:470:131 | (...)... | provenance | Sink:MaD:312 |
+| Log4jJndiInjectionTest.java:470:124:470:131 | source(...) : String | Log4jJndiInjectionTest.java:470:115:470:131 | (...)... | provenance | Sink:MaD:311 |
+| Log4jJndiInjectionTest.java:471:109:471:116 | source(...) : String | Log4jJndiInjectionTest.java:471:100:471:116 | (...)... | provenance | Sink:MaD:312 |
+| Log4jJndiInjectionTest.java:471:109:471:116 | source(...) : String | Log4jJndiInjectionTest.java:471:100:471:116 | (...)... | provenance | Sink:MaD:311 |
+| Log4jJndiInjectionTest.java:472:94:472:101 | source(...) : String | Log4jJndiInjectionTest.java:472:85:472:101 | (...)... | provenance | Sink:MaD:312 |
+| Log4jJndiInjectionTest.java:472:94:472:101 | source(...) : String | Log4jJndiInjectionTest.java:472:85:472:101 | (...)... | provenance | Sink:MaD:311 |
+| Log4jJndiInjectionTest.java:473:79:473:86 | source(...) : String | Log4jJndiInjectionTest.java:473:70:473:86 | (...)... | provenance | Sink:MaD:312 |
+| Log4jJndiInjectionTest.java:473:79:473:86 | source(...) : String | Log4jJndiInjectionTest.java:473:70:473:86 | (...)... | provenance | Sink:MaD:311 |
+| Log4jJndiInjectionTest.java:474:64:474:71 | source(...) : String | Log4jJndiInjectionTest.java:474:55:474:71 | (...)... | provenance | Sink:MaD:312 |
+| Log4jJndiInjectionTest.java:474:64:474:71 | source(...) : String | Log4jJndiInjectionTest.java:474:55:474:71 | (...)... | provenance | Sink:MaD:311 |
+| Log4jJndiInjectionTest.java:475:49:475:56 | source(...) : String | Log4jJndiInjectionTest.java:475:40:475:56 | (...)... | provenance | Sink:MaD:312 |
+| Log4jJndiInjectionTest.java:475:49:475:56 | source(...) : String | Log4jJndiInjectionTest.java:475:40:475:56 | (...)... | provenance | Sink:MaD:311 |
+| Log4jJndiInjectionTest.java:476:139:476:146 | source(...) : String | Log4jJndiInjectionTest.java:476:130:476:146 | (...)... | provenance | Sink:MaD:314 |
+| Log4jJndiInjectionTest.java:476:139:476:146 | source(...) : String | Log4jJndiInjectionTest.java:476:130:476:146 | (...)... | provenance | Sink:MaD:313 |
+| Log4jJndiInjectionTest.java:477:124:477:131 | source(...) : String | Log4jJndiInjectionTest.java:477:115:477:131 | (...)... | provenance | Sink:MaD:314 |
+| Log4jJndiInjectionTest.java:477:124:477:131 | source(...) : String | Log4jJndiInjectionTest.java:477:115:477:131 | (...)... | provenance | Sink:MaD:313 |
+| Log4jJndiInjectionTest.java:478:109:478:116 | source(...) : String | Log4jJndiInjectionTest.java:478:100:478:116 | (...)... | provenance | Sink:MaD:314 |
+| Log4jJndiInjectionTest.java:478:109:478:116 | source(...) : String | Log4jJndiInjectionTest.java:478:100:478:116 | (...)... | provenance | Sink:MaD:313 |
+| Log4jJndiInjectionTest.java:479:94:479:101 | source(...) : String | Log4jJndiInjectionTest.java:479:85:479:101 | (...)... | provenance | Sink:MaD:314 |
+| Log4jJndiInjectionTest.java:479:94:479:101 | source(...) : String | Log4jJndiInjectionTest.java:479:85:479:101 | (...)... | provenance | Sink:MaD:313 |
+| Log4jJndiInjectionTest.java:480:79:480:86 | source(...) : String | Log4jJndiInjectionTest.java:480:70:480:86 | (...)... | provenance | Sink:MaD:314 |
+| Log4jJndiInjectionTest.java:480:79:480:86 | source(...) : String | Log4jJndiInjectionTest.java:480:70:480:86 | (...)... | provenance | Sink:MaD:313 |
+| Log4jJndiInjectionTest.java:481:64:481:71 | source(...) : String | Log4jJndiInjectionTest.java:481:55:481:71 | (...)... | provenance | Sink:MaD:314 |
+| Log4jJndiInjectionTest.java:481:64:481:71 | source(...) : String | Log4jJndiInjectionTest.java:481:55:481:71 | (...)... | provenance | Sink:MaD:313 |
+| Log4jJndiInjectionTest.java:482:49:482:56 | source(...) : String | Log4jJndiInjectionTest.java:482:40:482:56 | (...)... | provenance | Sink:MaD:314 |
+| Log4jJndiInjectionTest.java:482:49:482:56 | source(...) : String | Log4jJndiInjectionTest.java:482:40:482:56 | (...)... | provenance | Sink:MaD:313 |
+| Log4jJndiInjectionTest.java:483:154:483:161 | source(...) : String | Log4jJndiInjectionTest.java:483:145:483:161 | (...)... | provenance | Sink:MaD:316 |
+| Log4jJndiInjectionTest.java:483:154:483:161 | source(...) : String | Log4jJndiInjectionTest.java:483:145:483:161 | (...)... | provenance | Sink:MaD:315 |
+| Log4jJndiInjectionTest.java:484:139:484:146 | source(...) : String | Log4jJndiInjectionTest.java:484:130:484:146 | (...)... | provenance | Sink:MaD:316 |
+| Log4jJndiInjectionTest.java:484:139:484:146 | source(...) : String | Log4jJndiInjectionTest.java:484:130:484:146 | (...)... | provenance | Sink:MaD:315 |
+| Log4jJndiInjectionTest.java:485:124:485:131 | source(...) : String | Log4jJndiInjectionTest.java:485:115:485:131 | (...)... | provenance | Sink:MaD:316 |
+| Log4jJndiInjectionTest.java:485:124:485:131 | source(...) : String | Log4jJndiInjectionTest.java:485:115:485:131 | (...)... | provenance | Sink:MaD:315 |
+| Log4jJndiInjectionTest.java:486:109:486:116 | source(...) : String | Log4jJndiInjectionTest.java:486:100:486:116 | (...)... | provenance | Sink:MaD:316 |
+| Log4jJndiInjectionTest.java:486:109:486:116 | source(...) : String | Log4jJndiInjectionTest.java:486:100:486:116 | (...)... | provenance | Sink:MaD:315 |
+| Log4jJndiInjectionTest.java:487:94:487:101 | source(...) : String | Log4jJndiInjectionTest.java:487:85:487:101 | (...)... | provenance | Sink:MaD:316 |
+| Log4jJndiInjectionTest.java:487:94:487:101 | source(...) : String | Log4jJndiInjectionTest.java:487:85:487:101 | (...)... | provenance | Sink:MaD:315 |
+| Log4jJndiInjectionTest.java:488:79:488:86 | source(...) : String | Log4jJndiInjectionTest.java:488:70:488:86 | (...)... | provenance | Sink:MaD:316 |
+| Log4jJndiInjectionTest.java:488:79:488:86 | source(...) : String | Log4jJndiInjectionTest.java:488:70:488:86 | (...)... | provenance | Sink:MaD:315 |
+| Log4jJndiInjectionTest.java:489:64:489:71 | source(...) : String | Log4jJndiInjectionTest.java:489:55:489:71 | (...)... | provenance | Sink:MaD:316 |
+| Log4jJndiInjectionTest.java:489:64:489:71 | source(...) : String | Log4jJndiInjectionTest.java:489:55:489:71 | (...)... | provenance | Sink:MaD:315 |
+| Log4jJndiInjectionTest.java:490:49:490:56 | source(...) : String | Log4jJndiInjectionTest.java:490:40:490:56 | (...)... | provenance | Sink:MaD:316 |
+| Log4jJndiInjectionTest.java:490:49:490:56 | source(...) : String | Log4jJndiInjectionTest.java:490:40:490:56 | (...)... | provenance | Sink:MaD:315 |
+| Log4jJndiInjectionTest.java:491:169:491:176 | source(...) : String | Log4jJndiInjectionTest.java:491:160:491:176 | (...)... | provenance | Sink:MaD:318 |
+| Log4jJndiInjectionTest.java:491:169:491:176 | source(...) : String | Log4jJndiInjectionTest.java:491:160:491:176 | (...)... | provenance | Sink:MaD:317 |
+| Log4jJndiInjectionTest.java:492:154:492:161 | source(...) : String | Log4jJndiInjectionTest.java:492:145:492:161 | (...)... | provenance | Sink:MaD:318 |
+| Log4jJndiInjectionTest.java:492:154:492:161 | source(...) : String | Log4jJndiInjectionTest.java:492:145:492:161 | (...)... | provenance | Sink:MaD:317 |
+| Log4jJndiInjectionTest.java:493:139:493:146 | source(...) : String | Log4jJndiInjectionTest.java:493:130:493:146 | (...)... | provenance | Sink:MaD:318 |
+| Log4jJndiInjectionTest.java:493:139:493:146 | source(...) : String | Log4jJndiInjectionTest.java:493:130:493:146 | (...)... | provenance | Sink:MaD:317 |
+| Log4jJndiInjectionTest.java:494:124:494:131 | source(...) : String | Log4jJndiInjectionTest.java:494:115:494:131 | (...)... | provenance | Sink:MaD:318 |
+| Log4jJndiInjectionTest.java:494:124:494:131 | source(...) : String | Log4jJndiInjectionTest.java:494:115:494:131 | (...)... | provenance | Sink:MaD:317 |
+| Log4jJndiInjectionTest.java:495:109:495:116 | source(...) : String | Log4jJndiInjectionTest.java:495:100:495:116 | (...)... | provenance | Sink:MaD:318 |
+| Log4jJndiInjectionTest.java:495:109:495:116 | source(...) : String | Log4jJndiInjectionTest.java:495:100:495:116 | (...)... | provenance | Sink:MaD:317 |
+| Log4jJndiInjectionTest.java:496:94:496:101 | source(...) : String | Log4jJndiInjectionTest.java:496:85:496:101 | (...)... | provenance | Sink:MaD:318 |
+| Log4jJndiInjectionTest.java:496:94:496:101 | source(...) : String | Log4jJndiInjectionTest.java:496:85:496:101 | (...)... | provenance | Sink:MaD:317 |
+| Log4jJndiInjectionTest.java:497:79:497:86 | source(...) : String | Log4jJndiInjectionTest.java:497:70:497:86 | (...)... | provenance | Sink:MaD:318 |
+| Log4jJndiInjectionTest.java:497:79:497:86 | source(...) : String | Log4jJndiInjectionTest.java:497:70:497:86 | (...)... | provenance | Sink:MaD:317 |
+| Log4jJndiInjectionTest.java:498:64:498:71 | source(...) : String | Log4jJndiInjectionTest.java:498:55:498:71 | (...)... | provenance | Sink:MaD:318 |
+| Log4jJndiInjectionTest.java:498:64:498:71 | source(...) : String | Log4jJndiInjectionTest.java:498:55:498:71 | (...)... | provenance | Sink:MaD:317 |
+| Log4jJndiInjectionTest.java:499:49:499:56 | source(...) : String | Log4jJndiInjectionTest.java:499:40:499:56 | (...)... | provenance | Sink:MaD:318 |
+| Log4jJndiInjectionTest.java:499:49:499:56 | source(...) : String | Log4jJndiInjectionTest.java:499:40:499:56 | (...)... | provenance | Sink:MaD:317 |
+| Log4jJndiInjectionTest.java:500:184:500:191 | source(...) : String | Log4jJndiInjectionTest.java:500:175:500:191 | (...)... | provenance | Sink:MaD:320 |
+| Log4jJndiInjectionTest.java:500:184:500:191 | source(...) : String | Log4jJndiInjectionTest.java:500:175:500:191 | (...)... | provenance | Sink:MaD:319 |
+| Log4jJndiInjectionTest.java:501:169:501:176 | source(...) : String | Log4jJndiInjectionTest.java:501:160:501:176 | (...)... | provenance | Sink:MaD:320 |
+| Log4jJndiInjectionTest.java:501:169:501:176 | source(...) : String | Log4jJndiInjectionTest.java:501:160:501:176 | (...)... | provenance | Sink:MaD:319 |
+| Log4jJndiInjectionTest.java:502:154:502:161 | source(...) : String | Log4jJndiInjectionTest.java:502:145:502:161 | (...)... | provenance | Sink:MaD:320 |
+| Log4jJndiInjectionTest.java:502:154:502:161 | source(...) : String | Log4jJndiInjectionTest.java:502:145:502:161 | (...)... | provenance | Sink:MaD:319 |
+| Log4jJndiInjectionTest.java:503:139:503:146 | source(...) : String | Log4jJndiInjectionTest.java:503:130:503:146 | (...)... | provenance | Sink:MaD:320 |
+| Log4jJndiInjectionTest.java:503:139:503:146 | source(...) : String | Log4jJndiInjectionTest.java:503:130:503:146 | (...)... | provenance | Sink:MaD:319 |
+| Log4jJndiInjectionTest.java:504:124:504:131 | source(...) : String | Log4jJndiInjectionTest.java:504:115:504:131 | (...)... | provenance | Sink:MaD:320 |
+| Log4jJndiInjectionTest.java:504:124:504:131 | source(...) : String | Log4jJndiInjectionTest.java:504:115:504:131 | (...)... | provenance | Sink:MaD:319 |
+| Log4jJndiInjectionTest.java:505:109:505:116 | source(...) : String | Log4jJndiInjectionTest.java:505:100:505:116 | (...)... | provenance | Sink:MaD:320 |
+| Log4jJndiInjectionTest.java:505:109:505:116 | source(...) : String | Log4jJndiInjectionTest.java:505:100:505:116 | (...)... | provenance | Sink:MaD:319 |
+| Log4jJndiInjectionTest.java:506:94:506:101 | source(...) : String | Log4jJndiInjectionTest.java:506:85:506:101 | (...)... | provenance | Sink:MaD:320 |
+| Log4jJndiInjectionTest.java:506:94:506:101 | source(...) : String | Log4jJndiInjectionTest.java:506:85:506:101 | (...)... | provenance | Sink:MaD:319 |
+| Log4jJndiInjectionTest.java:507:79:507:86 | source(...) : String | Log4jJndiInjectionTest.java:507:70:507:86 | (...)... | provenance | Sink:MaD:320 |
+| Log4jJndiInjectionTest.java:507:79:507:86 | source(...) : String | Log4jJndiInjectionTest.java:507:70:507:86 | (...)... | provenance | Sink:MaD:319 |
+| Log4jJndiInjectionTest.java:508:64:508:71 | source(...) : String | Log4jJndiInjectionTest.java:508:55:508:71 | (...)... | provenance | Sink:MaD:320 |
+| Log4jJndiInjectionTest.java:508:64:508:71 | source(...) : String | Log4jJndiInjectionTest.java:508:55:508:71 | (...)... | provenance | Sink:MaD:319 |
+| Log4jJndiInjectionTest.java:509:49:509:56 | source(...) : String | Log4jJndiInjectionTest.java:509:40:509:56 | (...)... | provenance | Sink:MaD:320 |
+| Log4jJndiInjectionTest.java:509:49:509:56 | source(...) : String | Log4jJndiInjectionTest.java:509:40:509:56 | (...)... | provenance | Sink:MaD:319 |
+| Log4jJndiInjectionTest.java:510:49:510:56 | source(...) : String | Log4jJndiInjectionTest.java:510:40:510:56 | (...)... | provenance | Sink:MaD:304 |
+| Log4jJndiInjectionTest.java:510:49:510:56 | source(...) : String | Log4jJndiInjectionTest.java:510:40:510:56 | (...)... | provenance | Sink:MaD:303 |
+| Log4jJndiInjectionTest.java:511:69:511:76 | source(...) : String | Log4jJndiInjectionTest.java:511:55:511:76 | (...)... | provenance | Sink:MaD:304 |
+| Log4jJndiInjectionTest.java:511:69:511:76 | source(...) : String | Log4jJndiInjectionTest.java:511:55:511:76 | (...)... | provenance | Sink:MaD:303 |
+| Log4jJndiInjectionTest.java:512:49:512:56 | source(...) : String | Log4jJndiInjectionTest.java:512:40:512:56 | (...)... | provenance | Sink:MaD:324 |
+| Log4jJndiInjectionTest.java:512:49:512:56 | source(...) : String | Log4jJndiInjectionTest.java:512:40:512:56 | (...)... | provenance | Sink:MaD:323 |
+| Log4jJndiInjectionTest.java:513:54:513:61 | source(...) : String | Log4jJndiInjectionTest.java:513:40:513:61 | (...)... | provenance | Sink:MaD:326 |
+| Log4jJndiInjectionTest.java:513:54:513:61 | source(...) : String | Log4jJndiInjectionTest.java:513:40:513:61 | (...)... | provenance | Sink:MaD:325 |
+| Log4jJndiInjectionTest.java:514:54:514:61 | source(...) : String | Log4jJndiInjectionTest.java:514:40:514:61 | (...)... | provenance | Sink:MaD:328 |
+| Log4jJndiInjectionTest.java:514:54:514:61 | source(...) : String | Log4jJndiInjectionTest.java:514:40:514:61 | (...)... | provenance | Sink:MaD:327 |
+| Log4jJndiInjectionTest.java:515:43:515:50 | source(...) : String | Log4jJndiInjectionTest.java:515:25:515:50 | (...)... | provenance | Sink:MaD:334 |
+| Log4jJndiInjectionTest.java:515:43:515:50 | source(...) : String | Log4jJndiInjectionTest.java:515:25:515:50 | (...)... | provenance | Sink:MaD:333 |
+| Log4jJndiInjectionTest.java:516:43:516:50 | source(...) : String | Log4jJndiInjectionTest.java:516:25:516:50 | (...)... | provenance | Sink:MaD:336 |
+| Log4jJndiInjectionTest.java:516:43:516:50 | source(...) : String | Log4jJndiInjectionTest.java:516:25:516:50 | (...)... | provenance | Sink:MaD:335 |
+| Log4jJndiInjectionTest.java:517:35:517:42 | source(...) : String | Log4jJndiInjectionTest.java:517:25:517:42 | (...)... | provenance | Sink:MaD:330 |
+| Log4jJndiInjectionTest.java:517:35:517:42 | source(...) : String | Log4jJndiInjectionTest.java:517:25:517:42 | (...)... | provenance | Sink:MaD:329 |
+| Log4jJndiInjectionTest.java:518:35:518:42 | source(...) : String | Log4jJndiInjectionTest.java:518:25:518:42 | (...)... | provenance | Sink:MaD:332 |
+| Log4jJndiInjectionTest.java:518:35:518:42 | source(...) : String | Log4jJndiInjectionTest.java:518:25:518:42 | (...)... | provenance | Sink:MaD:331 |
+| Log4jJndiInjectionTest.java:521:34:521:41 | source(...) : String | Log4jJndiInjectionTest.java:521:25:521:41 | (...)... | provenance | Sink:MaD:342 |
+| Log4jJndiInjectionTest.java:521:34:521:41 | source(...) : String | Log4jJndiInjectionTest.java:521:25:521:41 | (...)... | provenance | Sink:MaD:341 |
+| Log4jJndiInjectionTest.java:522:34:522:41 | source(...) : String | Log4jJndiInjectionTest.java:522:25:522:41 | (...)... | provenance | Sink:MaD:362 |
+| Log4jJndiInjectionTest.java:522:34:522:41 | source(...) : String | Log4jJndiInjectionTest.java:522:25:522:41 | (...)... | provenance | Sink:MaD:361 |
+| Log4jJndiInjectionTest.java:523:40:523:62 | {...} : Object[] [[]] : String | Log4jJndiInjectionTest.java:523:40:523:62 | new Object[] | provenance | Sink:MaD:362 |
+| Log4jJndiInjectionTest.java:523:40:523:62 | {...} : Object[] [[]] : String | Log4jJndiInjectionTest.java:523:40:523:62 | new Object[] | provenance | Sink:MaD:361 |
 | Log4jJndiInjectionTest.java:523:54:523:61 | source(...) : String | Log4jJndiInjectionTest.java:523:40:523:62 | {...} : Object[] [[]] : String | provenance |  |
-| Log4jJndiInjectionTest.java:524:49:524:56 | source(...) : String | Log4jJndiInjectionTest.java:524:40:524:56 | (...)... | provenance |  Sink:MaD:178 |
-| Log4jJndiInjectionTest.java:524:49:524:56 | source(...) : String | Log4jJndiInjectionTest.java:524:40:524:56 | (...)... | provenance |  Sink:MaD:494 |
-| Log4jJndiInjectionTest.java:525:34:525:41 | source(...) : String | Log4jJndiInjectionTest.java:525:25:525:41 | (...)... | provenance |  Sink:MaD:178 |
-| Log4jJndiInjectionTest.java:525:34:525:41 | source(...) : String | Log4jJndiInjectionTest.java:525:25:525:41 | (...)... | provenance |  Sink:MaD:494 |
-| Log4jJndiInjectionTest.java:526:64:526:71 | source(...) : String | Log4jJndiInjectionTest.java:526:55:526:71 | (...)... | provenance |  Sink:MaD:179 |
-| Log4jJndiInjectionTest.java:526:64:526:71 | source(...) : String | Log4jJndiInjectionTest.java:526:55:526:71 | (...)... | provenance |  Sink:MaD:495 |
-| Log4jJndiInjectionTest.java:527:49:527:56 | source(...) : String | Log4jJndiInjectionTest.java:527:40:527:56 | (...)... | provenance |  Sink:MaD:179 |
-| Log4jJndiInjectionTest.java:527:49:527:56 | source(...) : String | Log4jJndiInjectionTest.java:527:40:527:56 | (...)... | provenance |  Sink:MaD:495 |
-| Log4jJndiInjectionTest.java:528:34:528:41 | source(...) : String | Log4jJndiInjectionTest.java:528:25:528:41 | (...)... | provenance |  Sink:MaD:179 |
-| Log4jJndiInjectionTest.java:528:34:528:41 | source(...) : String | Log4jJndiInjectionTest.java:528:25:528:41 | (...)... | provenance |  Sink:MaD:495 |
-| Log4jJndiInjectionTest.java:529:79:529:86 | source(...) : String | Log4jJndiInjectionTest.java:529:70:529:86 | (...)... | provenance |  Sink:MaD:180 |
-| Log4jJndiInjectionTest.java:529:79:529:86 | source(...) : String | Log4jJndiInjectionTest.java:529:70:529:86 | (...)... | provenance |  Sink:MaD:496 |
-| Log4jJndiInjectionTest.java:530:64:530:71 | source(...) : String | Log4jJndiInjectionTest.java:530:55:530:71 | (...)... | provenance |  Sink:MaD:180 |
-| Log4jJndiInjectionTest.java:530:64:530:71 | source(...) : String | Log4jJndiInjectionTest.java:530:55:530:71 | (...)... | provenance |  Sink:MaD:496 |
-| Log4jJndiInjectionTest.java:531:49:531:56 | source(...) : String | Log4jJndiInjectionTest.java:531:40:531:56 | (...)... | provenance |  Sink:MaD:180 |
-| Log4jJndiInjectionTest.java:531:49:531:56 | source(...) : String | Log4jJndiInjectionTest.java:531:40:531:56 | (...)... | provenance |  Sink:MaD:496 |
-| Log4jJndiInjectionTest.java:532:34:532:41 | source(...) : String | Log4jJndiInjectionTest.java:532:25:532:41 | (...)... | provenance |  Sink:MaD:180 |
-| Log4jJndiInjectionTest.java:532:34:532:41 | source(...) : String | Log4jJndiInjectionTest.java:532:25:532:41 | (...)... | provenance |  Sink:MaD:496 |
-| Log4jJndiInjectionTest.java:533:94:533:101 | source(...) : String | Log4jJndiInjectionTest.java:533:85:533:101 | (...)... | provenance |  Sink:MaD:181 |
-| Log4jJndiInjectionTest.java:533:94:533:101 | source(...) : String | Log4jJndiInjectionTest.java:533:85:533:101 | (...)... | provenance |  Sink:MaD:497 |
-| Log4jJndiInjectionTest.java:534:79:534:86 | source(...) : String | Log4jJndiInjectionTest.java:534:70:534:86 | (...)... | provenance |  Sink:MaD:181 |
-| Log4jJndiInjectionTest.java:534:79:534:86 | source(...) : String | Log4jJndiInjectionTest.java:534:70:534:86 | (...)... | provenance |  Sink:MaD:497 |
-| Log4jJndiInjectionTest.java:535:64:535:71 | source(...) : String | Log4jJndiInjectionTest.java:535:55:535:71 | (...)... | provenance |  Sink:MaD:181 |
-| Log4jJndiInjectionTest.java:535:64:535:71 | source(...) : String | Log4jJndiInjectionTest.java:535:55:535:71 | (...)... | provenance |  Sink:MaD:497 |
-| Log4jJndiInjectionTest.java:536:49:536:56 | source(...) : String | Log4jJndiInjectionTest.java:536:40:536:56 | (...)... | provenance |  Sink:MaD:181 |
-| Log4jJndiInjectionTest.java:536:49:536:56 | source(...) : String | Log4jJndiInjectionTest.java:536:40:536:56 | (...)... | provenance |  Sink:MaD:497 |
-| Log4jJndiInjectionTest.java:537:34:537:41 | source(...) : String | Log4jJndiInjectionTest.java:537:25:537:41 | (...)... | provenance |  Sink:MaD:181 |
-| Log4jJndiInjectionTest.java:537:34:537:41 | source(...) : String | Log4jJndiInjectionTest.java:537:25:537:41 | (...)... | provenance |  Sink:MaD:497 |
-| Log4jJndiInjectionTest.java:538:109:538:116 | source(...) : String | Log4jJndiInjectionTest.java:538:100:538:116 | (...)... | provenance |  Sink:MaD:182 |
-| Log4jJndiInjectionTest.java:538:109:538:116 | source(...) : String | Log4jJndiInjectionTest.java:538:100:538:116 | (...)... | provenance |  Sink:MaD:498 |
-| Log4jJndiInjectionTest.java:539:94:539:101 | source(...) : String | Log4jJndiInjectionTest.java:539:85:539:101 | (...)... | provenance |  Sink:MaD:182 |
-| Log4jJndiInjectionTest.java:539:94:539:101 | source(...) : String | Log4jJndiInjectionTest.java:539:85:539:101 | (...)... | provenance |  Sink:MaD:498 |
-| Log4jJndiInjectionTest.java:540:79:540:86 | source(...) : String | Log4jJndiInjectionTest.java:540:70:540:86 | (...)... | provenance |  Sink:MaD:182 |
-| Log4jJndiInjectionTest.java:540:79:540:86 | source(...) : String | Log4jJndiInjectionTest.java:540:70:540:86 | (...)... | provenance |  Sink:MaD:498 |
-| Log4jJndiInjectionTest.java:541:64:541:71 | source(...) : String | Log4jJndiInjectionTest.java:541:55:541:71 | (...)... | provenance |  Sink:MaD:182 |
-| Log4jJndiInjectionTest.java:541:64:541:71 | source(...) : String | Log4jJndiInjectionTest.java:541:55:541:71 | (...)... | provenance |  Sink:MaD:498 |
-| Log4jJndiInjectionTest.java:542:49:542:56 | source(...) : String | Log4jJndiInjectionTest.java:542:40:542:56 | (...)... | provenance |  Sink:MaD:182 |
-| Log4jJndiInjectionTest.java:542:49:542:56 | source(...) : String | Log4jJndiInjectionTest.java:542:40:542:56 | (...)... | provenance |  Sink:MaD:498 |
-| Log4jJndiInjectionTest.java:543:34:543:41 | source(...) : String | Log4jJndiInjectionTest.java:543:25:543:41 | (...)... | provenance |  Sink:MaD:182 |
-| Log4jJndiInjectionTest.java:543:34:543:41 | source(...) : String | Log4jJndiInjectionTest.java:543:25:543:41 | (...)... | provenance |  Sink:MaD:498 |
-| Log4jJndiInjectionTest.java:544:124:544:131 | source(...) : String | Log4jJndiInjectionTest.java:544:115:544:131 | (...)... | provenance |  Sink:MaD:183 |
-| Log4jJndiInjectionTest.java:544:124:544:131 | source(...) : String | Log4jJndiInjectionTest.java:544:115:544:131 | (...)... | provenance |  Sink:MaD:499 |
-| Log4jJndiInjectionTest.java:545:109:545:116 | source(...) : String | Log4jJndiInjectionTest.java:545:100:545:116 | (...)... | provenance |  Sink:MaD:183 |
-| Log4jJndiInjectionTest.java:545:109:545:116 | source(...) : String | Log4jJndiInjectionTest.java:545:100:545:116 | (...)... | provenance |  Sink:MaD:499 |
-| Log4jJndiInjectionTest.java:546:94:546:101 | source(...) : String | Log4jJndiInjectionTest.java:546:85:546:101 | (...)... | provenance |  Sink:MaD:183 |
-| Log4jJndiInjectionTest.java:546:94:546:101 | source(...) : String | Log4jJndiInjectionTest.java:546:85:546:101 | (...)... | provenance |  Sink:MaD:499 |
-| Log4jJndiInjectionTest.java:547:79:547:86 | source(...) : String | Log4jJndiInjectionTest.java:547:70:547:86 | (...)... | provenance |  Sink:MaD:183 |
-| Log4jJndiInjectionTest.java:547:79:547:86 | source(...) : String | Log4jJndiInjectionTest.java:547:70:547:86 | (...)... | provenance |  Sink:MaD:499 |
-| Log4jJndiInjectionTest.java:548:64:548:71 | source(...) : String | Log4jJndiInjectionTest.java:548:55:548:71 | (...)... | provenance |  Sink:MaD:183 |
-| Log4jJndiInjectionTest.java:548:64:548:71 | source(...) : String | Log4jJndiInjectionTest.java:548:55:548:71 | (...)... | provenance |  Sink:MaD:499 |
-| Log4jJndiInjectionTest.java:549:49:549:56 | source(...) : String | Log4jJndiInjectionTest.java:549:40:549:56 | (...)... | provenance |  Sink:MaD:183 |
-| Log4jJndiInjectionTest.java:549:49:549:56 | source(...) : String | Log4jJndiInjectionTest.java:549:40:549:56 | (...)... | provenance |  Sink:MaD:499 |
-| Log4jJndiInjectionTest.java:550:34:550:41 | source(...) : String | Log4jJndiInjectionTest.java:550:25:550:41 | (...)... | provenance |  Sink:MaD:183 |
-| Log4jJndiInjectionTest.java:550:34:550:41 | source(...) : String | Log4jJndiInjectionTest.java:550:25:550:41 | (...)... | provenance |  Sink:MaD:499 |
-| Log4jJndiInjectionTest.java:551:139:551:146 | source(...) : String | Log4jJndiInjectionTest.java:551:130:551:146 | (...)... | provenance |  Sink:MaD:184 |
-| Log4jJndiInjectionTest.java:551:139:551:146 | source(...) : String | Log4jJndiInjectionTest.java:551:130:551:146 | (...)... | provenance |  Sink:MaD:500 |
-| Log4jJndiInjectionTest.java:552:124:552:131 | source(...) : String | Log4jJndiInjectionTest.java:552:115:552:131 | (...)... | provenance |  Sink:MaD:184 |
-| Log4jJndiInjectionTest.java:552:124:552:131 | source(...) : String | Log4jJndiInjectionTest.java:552:115:552:131 | (...)... | provenance |  Sink:MaD:500 |
-| Log4jJndiInjectionTest.java:553:109:553:116 | source(...) : String | Log4jJndiInjectionTest.java:553:100:553:116 | (...)... | provenance |  Sink:MaD:184 |
-| Log4jJndiInjectionTest.java:553:109:553:116 | source(...) : String | Log4jJndiInjectionTest.java:553:100:553:116 | (...)... | provenance |  Sink:MaD:500 |
-| Log4jJndiInjectionTest.java:554:94:554:101 | source(...) : String | Log4jJndiInjectionTest.java:554:85:554:101 | (...)... | provenance |  Sink:MaD:184 |
-| Log4jJndiInjectionTest.java:554:94:554:101 | source(...) : String | Log4jJndiInjectionTest.java:554:85:554:101 | (...)... | provenance |  Sink:MaD:500 |
-| Log4jJndiInjectionTest.java:555:79:555:86 | source(...) : String | Log4jJndiInjectionTest.java:555:70:555:86 | (...)... | provenance |  Sink:MaD:184 |
-| Log4jJndiInjectionTest.java:555:79:555:86 | source(...) : String | Log4jJndiInjectionTest.java:555:70:555:86 | (...)... | provenance |  Sink:MaD:500 |
-| Log4jJndiInjectionTest.java:556:64:556:71 | source(...) : String | Log4jJndiInjectionTest.java:556:55:556:71 | (...)... | provenance |  Sink:MaD:184 |
-| Log4jJndiInjectionTest.java:556:64:556:71 | source(...) : String | Log4jJndiInjectionTest.java:556:55:556:71 | (...)... | provenance |  Sink:MaD:500 |
-| Log4jJndiInjectionTest.java:557:49:557:56 | source(...) : String | Log4jJndiInjectionTest.java:557:40:557:56 | (...)... | provenance |  Sink:MaD:184 |
-| Log4jJndiInjectionTest.java:557:49:557:56 | source(...) : String | Log4jJndiInjectionTest.java:557:40:557:56 | (...)... | provenance |  Sink:MaD:500 |
-| Log4jJndiInjectionTest.java:558:34:558:41 | source(...) : String | Log4jJndiInjectionTest.java:558:25:558:41 | (...)... | provenance |  Sink:MaD:184 |
-| Log4jJndiInjectionTest.java:558:34:558:41 | source(...) : String | Log4jJndiInjectionTest.java:558:25:558:41 | (...)... | provenance |  Sink:MaD:500 |
-| Log4jJndiInjectionTest.java:559:154:559:161 | source(...) : String | Log4jJndiInjectionTest.java:559:145:559:161 | (...)... | provenance |  Sink:MaD:185 |
-| Log4jJndiInjectionTest.java:559:154:559:161 | source(...) : String | Log4jJndiInjectionTest.java:559:145:559:161 | (...)... | provenance |  Sink:MaD:501 |
-| Log4jJndiInjectionTest.java:560:139:560:146 | source(...) : String | Log4jJndiInjectionTest.java:560:130:560:146 | (...)... | provenance |  Sink:MaD:185 |
-| Log4jJndiInjectionTest.java:560:139:560:146 | source(...) : String | Log4jJndiInjectionTest.java:560:130:560:146 | (...)... | provenance |  Sink:MaD:501 |
-| Log4jJndiInjectionTest.java:561:124:561:131 | source(...) : String | Log4jJndiInjectionTest.java:561:115:561:131 | (...)... | provenance |  Sink:MaD:185 |
-| Log4jJndiInjectionTest.java:561:124:561:131 | source(...) : String | Log4jJndiInjectionTest.java:561:115:561:131 | (...)... | provenance |  Sink:MaD:501 |
-| Log4jJndiInjectionTest.java:562:109:562:116 | source(...) : String | Log4jJndiInjectionTest.java:562:100:562:116 | (...)... | provenance |  Sink:MaD:185 |
-| Log4jJndiInjectionTest.java:562:109:562:116 | source(...) : String | Log4jJndiInjectionTest.java:562:100:562:116 | (...)... | provenance |  Sink:MaD:501 |
-| Log4jJndiInjectionTest.java:563:94:563:101 | source(...) : String | Log4jJndiInjectionTest.java:563:85:563:101 | (...)... | provenance |  Sink:MaD:185 |
-| Log4jJndiInjectionTest.java:563:94:563:101 | source(...) : String | Log4jJndiInjectionTest.java:563:85:563:101 | (...)... | provenance |  Sink:MaD:501 |
-| Log4jJndiInjectionTest.java:564:79:564:86 | source(...) : String | Log4jJndiInjectionTest.java:564:70:564:86 | (...)... | provenance |  Sink:MaD:185 |
-| Log4jJndiInjectionTest.java:564:79:564:86 | source(...) : String | Log4jJndiInjectionTest.java:564:70:564:86 | (...)... | provenance |  Sink:MaD:501 |
-| Log4jJndiInjectionTest.java:565:64:565:71 | source(...) : String | Log4jJndiInjectionTest.java:565:55:565:71 | (...)... | provenance |  Sink:MaD:185 |
-| Log4jJndiInjectionTest.java:565:64:565:71 | source(...) : String | Log4jJndiInjectionTest.java:565:55:565:71 | (...)... | provenance |  Sink:MaD:501 |
-| Log4jJndiInjectionTest.java:566:49:566:56 | source(...) : String | Log4jJndiInjectionTest.java:566:40:566:56 | (...)... | provenance |  Sink:MaD:185 |
-| Log4jJndiInjectionTest.java:566:49:566:56 | source(...) : String | Log4jJndiInjectionTest.java:566:40:566:56 | (...)... | provenance |  Sink:MaD:501 |
-| Log4jJndiInjectionTest.java:567:34:567:41 | source(...) : String | Log4jJndiInjectionTest.java:567:25:567:41 | (...)... | provenance |  Sink:MaD:185 |
-| Log4jJndiInjectionTest.java:567:34:567:41 | source(...) : String | Log4jJndiInjectionTest.java:567:25:567:41 | (...)... | provenance |  Sink:MaD:501 |
-| Log4jJndiInjectionTest.java:568:169:568:176 | source(...) : String | Log4jJndiInjectionTest.java:568:160:568:176 | (...)... | provenance |  Sink:MaD:186 |
-| Log4jJndiInjectionTest.java:568:169:568:176 | source(...) : String | Log4jJndiInjectionTest.java:568:160:568:176 | (...)... | provenance |  Sink:MaD:502 |
-| Log4jJndiInjectionTest.java:569:154:569:161 | source(...) : String | Log4jJndiInjectionTest.java:569:145:569:161 | (...)... | provenance |  Sink:MaD:186 |
-| Log4jJndiInjectionTest.java:569:154:569:161 | source(...) : String | Log4jJndiInjectionTest.java:569:145:569:161 | (...)... | provenance |  Sink:MaD:502 |
-| Log4jJndiInjectionTest.java:570:139:570:146 | source(...) : String | Log4jJndiInjectionTest.java:570:130:570:146 | (...)... | provenance |  Sink:MaD:186 |
-| Log4jJndiInjectionTest.java:570:139:570:146 | source(...) : String | Log4jJndiInjectionTest.java:570:130:570:146 | (...)... | provenance |  Sink:MaD:502 |
-| Log4jJndiInjectionTest.java:571:124:571:131 | source(...) : String | Log4jJndiInjectionTest.java:571:115:571:131 | (...)... | provenance |  Sink:MaD:186 |
-| Log4jJndiInjectionTest.java:571:124:571:131 | source(...) : String | Log4jJndiInjectionTest.java:571:115:571:131 | (...)... | provenance |  Sink:MaD:502 |
-| Log4jJndiInjectionTest.java:572:109:572:116 | source(...) : String | Log4jJndiInjectionTest.java:572:100:572:116 | (...)... | provenance |  Sink:MaD:186 |
-| Log4jJndiInjectionTest.java:572:109:572:116 | source(...) : String | Log4jJndiInjectionTest.java:572:100:572:116 | (...)... | provenance |  Sink:MaD:502 |
-| Log4jJndiInjectionTest.java:573:94:573:101 | source(...) : String | Log4jJndiInjectionTest.java:573:85:573:101 | (...)... | provenance |  Sink:MaD:186 |
-| Log4jJndiInjectionTest.java:573:94:573:101 | source(...) : String | Log4jJndiInjectionTest.java:573:85:573:101 | (...)... | provenance |  Sink:MaD:502 |
-| Log4jJndiInjectionTest.java:574:79:574:86 | source(...) : String | Log4jJndiInjectionTest.java:574:70:574:86 | (...)... | provenance |  Sink:MaD:186 |
-| Log4jJndiInjectionTest.java:574:79:574:86 | source(...) : String | Log4jJndiInjectionTest.java:574:70:574:86 | (...)... | provenance |  Sink:MaD:502 |
-| Log4jJndiInjectionTest.java:575:64:575:71 | source(...) : String | Log4jJndiInjectionTest.java:575:55:575:71 | (...)... | provenance |  Sink:MaD:186 |
-| Log4jJndiInjectionTest.java:575:64:575:71 | source(...) : String | Log4jJndiInjectionTest.java:575:55:575:71 | (...)... | provenance |  Sink:MaD:502 |
-| Log4jJndiInjectionTest.java:576:49:576:56 | source(...) : String | Log4jJndiInjectionTest.java:576:40:576:56 | (...)... | provenance |  Sink:MaD:186 |
-| Log4jJndiInjectionTest.java:576:49:576:56 | source(...) : String | Log4jJndiInjectionTest.java:576:40:576:56 | (...)... | provenance |  Sink:MaD:502 |
-| Log4jJndiInjectionTest.java:577:34:577:41 | source(...) : String | Log4jJndiInjectionTest.java:577:25:577:41 | (...)... | provenance |  Sink:MaD:186 |
-| Log4jJndiInjectionTest.java:577:34:577:41 | source(...) : String | Log4jJndiInjectionTest.java:577:25:577:41 | (...)... | provenance |  Sink:MaD:502 |
-| Log4jJndiInjectionTest.java:578:34:578:41 | source(...) : String | Log4jJndiInjectionTest.java:578:25:578:41 | (...)... | provenance |  Sink:MaD:178 |
-| Log4jJndiInjectionTest.java:578:34:578:41 | source(...) : String | Log4jJndiInjectionTest.java:578:25:578:41 | (...)... | provenance |  Sink:MaD:494 |
-| Log4jJndiInjectionTest.java:579:54:579:61 | source(...) : String | Log4jJndiInjectionTest.java:579:40:579:61 | (...)... | provenance |  Sink:MaD:178 |
-| Log4jJndiInjectionTest.java:579:54:579:61 | source(...) : String | Log4jJndiInjectionTest.java:579:40:579:61 | (...)... | provenance |  Sink:MaD:494 |
-| Log4jJndiInjectionTest.java:580:34:580:41 | source(...) : String | Log4jJndiInjectionTest.java:580:25:580:41 | (...)... | provenance |  Sink:MaD:188 |
-| Log4jJndiInjectionTest.java:580:34:580:41 | source(...) : String | Log4jJndiInjectionTest.java:580:25:580:41 | (...)... | provenance |  Sink:MaD:504 |
-| Log4jJndiInjectionTest.java:581:39:581:46 | source(...) : String | Log4jJndiInjectionTest.java:581:25:581:46 | (...)... | provenance |  Sink:MaD:189 |
-| Log4jJndiInjectionTest.java:581:39:581:46 | source(...) : String | Log4jJndiInjectionTest.java:581:25:581:46 | (...)... | provenance |  Sink:MaD:505 |
-| Log4jJndiInjectionTest.java:582:39:582:46 | source(...) : String | Log4jJndiInjectionTest.java:582:25:582:46 | (...)... | provenance |  Sink:MaD:190 |
-| Log4jJndiInjectionTest.java:582:39:582:46 | source(...) : String | Log4jJndiInjectionTest.java:582:25:582:46 | (...)... | provenance |  Sink:MaD:506 |
-| Log4jJndiInjectionTest.java:583:53:583:60 | source(...) : String | Log4jJndiInjectionTest.java:583:38:583:60 | (...)... | provenance |  Sink:MaD:191 |
-| Log4jJndiInjectionTest.java:583:53:583:60 | source(...) : String | Log4jJndiInjectionTest.java:583:38:583:60 | (...)... | provenance |  Sink:MaD:507 |
-| Log4jJndiInjectionTest.java:584:53:584:60 | source(...) : String | Log4jJndiInjectionTest.java:584:38:584:60 | (...)... | provenance |  Sink:MaD:192 |
-| Log4jJndiInjectionTest.java:584:53:584:60 | source(...) : String | Log4jJndiInjectionTest.java:584:38:584:60 | (...)... | provenance |  Sink:MaD:508 |
-| Log4jJndiInjectionTest.java:585:68:585:75 | source(...) : String | Log4jJndiInjectionTest.java:585:53:585:75 | (...)... | provenance |  Sink:MaD:193 |
-| Log4jJndiInjectionTest.java:585:68:585:75 | source(...) : String | Log4jJndiInjectionTest.java:585:53:585:75 | (...)... | provenance |  Sink:MaD:509 |
-| Log4jJndiInjectionTest.java:586:68:586:75 | source(...) : String | Log4jJndiInjectionTest.java:586:53:586:75 | (...)... | provenance |  Sink:MaD:194 |
-| Log4jJndiInjectionTest.java:586:68:586:75 | source(...) : String | Log4jJndiInjectionTest.java:586:53:586:75 | (...)... | provenance |  Sink:MaD:510 |
-| Log4jJndiInjectionTest.java:587:63:587:70 | source(...) : String | Log4jJndiInjectionTest.java:587:53:587:70 | (...)... | provenance |  Sink:MaD:195 |
-| Log4jJndiInjectionTest.java:587:63:587:70 | source(...) : String | Log4jJndiInjectionTest.java:587:53:587:70 | (...)... | provenance |  Sink:MaD:511 |
-| Log4jJndiInjectionTest.java:588:71:588:78 | source(...) : String | Log4jJndiInjectionTest.java:588:53:588:78 | (...)... | provenance |  Sink:MaD:196 |
-| Log4jJndiInjectionTest.java:588:71:588:78 | source(...) : String | Log4jJndiInjectionTest.java:588:53:588:78 | (...)... | provenance |  Sink:MaD:512 |
-| Log4jJndiInjectionTest.java:589:71:589:78 | source(...) : String | Log4jJndiInjectionTest.java:589:53:589:78 | (...)... | provenance |  Sink:MaD:197 |
-| Log4jJndiInjectionTest.java:589:71:589:78 | source(...) : String | Log4jJndiInjectionTest.java:589:53:589:78 | (...)... | provenance |  Sink:MaD:513 |
-| Log4jJndiInjectionTest.java:591:62:591:69 | source(...) : String | Log4jJndiInjectionTest.java:591:53:591:69 | (...)... | provenance |  Sink:MaD:199 |
-| Log4jJndiInjectionTest.java:591:62:591:69 | source(...) : String | Log4jJndiInjectionTest.java:591:53:591:69 | (...)... | provenance |  Sink:MaD:515 |
-| Log4jJndiInjectionTest.java:592:62:592:69 | source(...) : String | Log4jJndiInjectionTest.java:592:53:592:69 | (...)... | provenance |  Sink:MaD:209 |
-| Log4jJndiInjectionTest.java:592:62:592:69 | source(...) : String | Log4jJndiInjectionTest.java:592:53:592:69 | (...)... | provenance |  Sink:MaD:525 |
-| Log4jJndiInjectionTest.java:593:68:593:90 | {...} : Object[] [[]] : String | Log4jJndiInjectionTest.java:593:68:593:90 | new Object[] | provenance |  Sink:MaD:209 |
-| Log4jJndiInjectionTest.java:593:68:593:90 | {...} : Object[] [[]] : String | Log4jJndiInjectionTest.java:593:68:593:90 | new Object[] | provenance |  Sink:MaD:525 |
+| Log4jJndiInjectionTest.java:524:49:524:56 | source(...) : String | Log4jJndiInjectionTest.java:524:40:524:56 | (...)... | provenance | Sink:MaD:344 |
+| Log4jJndiInjectionTest.java:524:49:524:56 | source(...) : String | Log4jJndiInjectionTest.java:524:40:524:56 | (...)... | provenance | Sink:MaD:343 |
+| Log4jJndiInjectionTest.java:525:34:525:41 | source(...) : String | Log4jJndiInjectionTest.java:525:25:525:41 | (...)... | provenance | Sink:MaD:344 |
+| Log4jJndiInjectionTest.java:525:34:525:41 | source(...) : String | Log4jJndiInjectionTest.java:525:25:525:41 | (...)... | provenance | Sink:MaD:343 |
+| Log4jJndiInjectionTest.java:526:64:526:71 | source(...) : String | Log4jJndiInjectionTest.java:526:55:526:71 | (...)... | provenance | Sink:MaD:346 |
+| Log4jJndiInjectionTest.java:526:64:526:71 | source(...) : String | Log4jJndiInjectionTest.java:526:55:526:71 | (...)... | provenance | Sink:MaD:345 |
+| Log4jJndiInjectionTest.java:527:49:527:56 | source(...) : String | Log4jJndiInjectionTest.java:527:40:527:56 | (...)... | provenance | Sink:MaD:346 |
+| Log4jJndiInjectionTest.java:527:49:527:56 | source(...) : String | Log4jJndiInjectionTest.java:527:40:527:56 | (...)... | provenance | Sink:MaD:345 |
+| Log4jJndiInjectionTest.java:528:34:528:41 | source(...) : String | Log4jJndiInjectionTest.java:528:25:528:41 | (...)... | provenance | Sink:MaD:346 |
+| Log4jJndiInjectionTest.java:528:34:528:41 | source(...) : String | Log4jJndiInjectionTest.java:528:25:528:41 | (...)... | provenance | Sink:MaD:345 |
+| Log4jJndiInjectionTest.java:529:79:529:86 | source(...) : String | Log4jJndiInjectionTest.java:529:70:529:86 | (...)... | provenance | Sink:MaD:348 |
+| Log4jJndiInjectionTest.java:529:79:529:86 | source(...) : String | Log4jJndiInjectionTest.java:529:70:529:86 | (...)... | provenance | Sink:MaD:347 |
+| Log4jJndiInjectionTest.java:530:64:530:71 | source(...) : String | Log4jJndiInjectionTest.java:530:55:530:71 | (...)... | provenance | Sink:MaD:348 |
+| Log4jJndiInjectionTest.java:530:64:530:71 | source(...) : String | Log4jJndiInjectionTest.java:530:55:530:71 | (...)... | provenance | Sink:MaD:347 |
+| Log4jJndiInjectionTest.java:531:49:531:56 | source(...) : String | Log4jJndiInjectionTest.java:531:40:531:56 | (...)... | provenance | Sink:MaD:348 |
+| Log4jJndiInjectionTest.java:531:49:531:56 | source(...) : String | Log4jJndiInjectionTest.java:531:40:531:56 | (...)... | provenance | Sink:MaD:347 |
+| Log4jJndiInjectionTest.java:532:34:532:41 | source(...) : String | Log4jJndiInjectionTest.java:532:25:532:41 | (...)... | provenance | Sink:MaD:348 |
+| Log4jJndiInjectionTest.java:532:34:532:41 | source(...) : String | Log4jJndiInjectionTest.java:532:25:532:41 | (...)... | provenance | Sink:MaD:347 |
+| Log4jJndiInjectionTest.java:533:94:533:101 | source(...) : String | Log4jJndiInjectionTest.java:533:85:533:101 | (...)... | provenance | Sink:MaD:350 |
+| Log4jJndiInjectionTest.java:533:94:533:101 | source(...) : String | Log4jJndiInjectionTest.java:533:85:533:101 | (...)... | provenance | Sink:MaD:349 |
+| Log4jJndiInjectionTest.java:534:79:534:86 | source(...) : String | Log4jJndiInjectionTest.java:534:70:534:86 | (...)... | provenance | Sink:MaD:350 |
+| Log4jJndiInjectionTest.java:534:79:534:86 | source(...) : String | Log4jJndiInjectionTest.java:534:70:534:86 | (...)... | provenance | Sink:MaD:349 |
+| Log4jJndiInjectionTest.java:535:64:535:71 | source(...) : String | Log4jJndiInjectionTest.java:535:55:535:71 | (...)... | provenance | Sink:MaD:350 |
+| Log4jJndiInjectionTest.java:535:64:535:71 | source(...) : String | Log4jJndiInjectionTest.java:535:55:535:71 | (...)... | provenance | Sink:MaD:349 |
+| Log4jJndiInjectionTest.java:536:49:536:56 | source(...) : String | Log4jJndiInjectionTest.java:536:40:536:56 | (...)... | provenance | Sink:MaD:350 |
+| Log4jJndiInjectionTest.java:536:49:536:56 | source(...) : String | Log4jJndiInjectionTest.java:536:40:536:56 | (...)... | provenance | Sink:MaD:349 |
+| Log4jJndiInjectionTest.java:537:34:537:41 | source(...) : String | Log4jJndiInjectionTest.java:537:25:537:41 | (...)... | provenance | Sink:MaD:350 |
+| Log4jJndiInjectionTest.java:537:34:537:41 | source(...) : String | Log4jJndiInjectionTest.java:537:25:537:41 | (...)... | provenance | Sink:MaD:349 |
+| Log4jJndiInjectionTest.java:538:109:538:116 | source(...) : String | Log4jJndiInjectionTest.java:538:100:538:116 | (...)... | provenance | Sink:MaD:352 |
+| Log4jJndiInjectionTest.java:538:109:538:116 | source(...) : String | Log4jJndiInjectionTest.java:538:100:538:116 | (...)... | provenance | Sink:MaD:351 |
+| Log4jJndiInjectionTest.java:539:94:539:101 | source(...) : String | Log4jJndiInjectionTest.java:539:85:539:101 | (...)... | provenance | Sink:MaD:352 |
+| Log4jJndiInjectionTest.java:539:94:539:101 | source(...) : String | Log4jJndiInjectionTest.java:539:85:539:101 | (...)... | provenance | Sink:MaD:351 |
+| Log4jJndiInjectionTest.java:540:79:540:86 | source(...) : String | Log4jJndiInjectionTest.java:540:70:540:86 | (...)... | provenance | Sink:MaD:352 |
+| Log4jJndiInjectionTest.java:540:79:540:86 | source(...) : String | Log4jJndiInjectionTest.java:540:70:540:86 | (...)... | provenance | Sink:MaD:351 |
+| Log4jJndiInjectionTest.java:541:64:541:71 | source(...) : String | Log4jJndiInjectionTest.java:541:55:541:71 | (...)... | provenance | Sink:MaD:352 |
+| Log4jJndiInjectionTest.java:541:64:541:71 | source(...) : String | Log4jJndiInjectionTest.java:541:55:541:71 | (...)... | provenance | Sink:MaD:351 |
+| Log4jJndiInjectionTest.java:542:49:542:56 | source(...) : String | Log4jJndiInjectionTest.java:542:40:542:56 | (...)... | provenance | Sink:MaD:352 |
+| Log4jJndiInjectionTest.java:542:49:542:56 | source(...) : String | Log4jJndiInjectionTest.java:542:40:542:56 | (...)... | provenance | Sink:MaD:351 |
+| Log4jJndiInjectionTest.java:543:34:543:41 | source(...) : String | Log4jJndiInjectionTest.java:543:25:543:41 | (...)... | provenance | Sink:MaD:352 |
+| Log4jJndiInjectionTest.java:543:34:543:41 | source(...) : String | Log4jJndiInjectionTest.java:543:25:543:41 | (...)... | provenance | Sink:MaD:351 |
+| Log4jJndiInjectionTest.java:544:124:544:131 | source(...) : String | Log4jJndiInjectionTest.java:544:115:544:131 | (...)... | provenance | Sink:MaD:354 |
+| Log4jJndiInjectionTest.java:544:124:544:131 | source(...) : String | Log4jJndiInjectionTest.java:544:115:544:131 | (...)... | provenance | Sink:MaD:353 |
+| Log4jJndiInjectionTest.java:545:109:545:116 | source(...) : String | Log4jJndiInjectionTest.java:545:100:545:116 | (...)... | provenance | Sink:MaD:354 |
+| Log4jJndiInjectionTest.java:545:109:545:116 | source(...) : String | Log4jJndiInjectionTest.java:545:100:545:116 | (...)... | provenance | Sink:MaD:353 |
+| Log4jJndiInjectionTest.java:546:94:546:101 | source(...) : String | Log4jJndiInjectionTest.java:546:85:546:101 | (...)... | provenance | Sink:MaD:354 |
+| Log4jJndiInjectionTest.java:546:94:546:101 | source(...) : String | Log4jJndiInjectionTest.java:546:85:546:101 | (...)... | provenance | Sink:MaD:353 |
+| Log4jJndiInjectionTest.java:547:79:547:86 | source(...) : String | Log4jJndiInjectionTest.java:547:70:547:86 | (...)... | provenance | Sink:MaD:354 |
+| Log4jJndiInjectionTest.java:547:79:547:86 | source(...) : String | Log4jJndiInjectionTest.java:547:70:547:86 | (...)... | provenance | Sink:MaD:353 |
+| Log4jJndiInjectionTest.java:548:64:548:71 | source(...) : String | Log4jJndiInjectionTest.java:548:55:548:71 | (...)... | provenance | Sink:MaD:354 |
+| Log4jJndiInjectionTest.java:548:64:548:71 | source(...) : String | Log4jJndiInjectionTest.java:548:55:548:71 | (...)... | provenance | Sink:MaD:353 |
+| Log4jJndiInjectionTest.java:549:49:549:56 | source(...) : String | Log4jJndiInjectionTest.java:549:40:549:56 | (...)... | provenance | Sink:MaD:354 |
+| Log4jJndiInjectionTest.java:549:49:549:56 | source(...) : String | Log4jJndiInjectionTest.java:549:40:549:56 | (...)... | provenance | Sink:MaD:353 |
+| Log4jJndiInjectionTest.java:550:34:550:41 | source(...) : String | Log4jJndiInjectionTest.java:550:25:550:41 | (...)... | provenance | Sink:MaD:354 |
+| Log4jJndiInjectionTest.java:550:34:550:41 | source(...) : String | Log4jJndiInjectionTest.java:550:25:550:41 | (...)... | provenance | Sink:MaD:353 |
+| Log4jJndiInjectionTest.java:551:139:551:146 | source(...) : String | Log4jJndiInjectionTest.java:551:130:551:146 | (...)... | provenance | Sink:MaD:356 |
+| Log4jJndiInjectionTest.java:551:139:551:146 | source(...) : String | Log4jJndiInjectionTest.java:551:130:551:146 | (...)... | provenance | Sink:MaD:355 |
+| Log4jJndiInjectionTest.java:552:124:552:131 | source(...) : String | Log4jJndiInjectionTest.java:552:115:552:131 | (...)... | provenance | Sink:MaD:356 |
+| Log4jJndiInjectionTest.java:552:124:552:131 | source(...) : String | Log4jJndiInjectionTest.java:552:115:552:131 | (...)... | provenance | Sink:MaD:355 |
+| Log4jJndiInjectionTest.java:553:109:553:116 | source(...) : String | Log4jJndiInjectionTest.java:553:100:553:116 | (...)... | provenance | Sink:MaD:356 |
+| Log4jJndiInjectionTest.java:553:109:553:116 | source(...) : String | Log4jJndiInjectionTest.java:553:100:553:116 | (...)... | provenance | Sink:MaD:355 |
+| Log4jJndiInjectionTest.java:554:94:554:101 | source(...) : String | Log4jJndiInjectionTest.java:554:85:554:101 | (...)... | provenance | Sink:MaD:356 |
+| Log4jJndiInjectionTest.java:554:94:554:101 | source(...) : String | Log4jJndiInjectionTest.java:554:85:554:101 | (...)... | provenance | Sink:MaD:355 |
+| Log4jJndiInjectionTest.java:555:79:555:86 | source(...) : String | Log4jJndiInjectionTest.java:555:70:555:86 | (...)... | provenance | Sink:MaD:356 |
+| Log4jJndiInjectionTest.java:555:79:555:86 | source(...) : String | Log4jJndiInjectionTest.java:555:70:555:86 | (...)... | provenance | Sink:MaD:355 |
+| Log4jJndiInjectionTest.java:556:64:556:71 | source(...) : String | Log4jJndiInjectionTest.java:556:55:556:71 | (...)... | provenance | Sink:MaD:356 |
+| Log4jJndiInjectionTest.java:556:64:556:71 | source(...) : String | Log4jJndiInjectionTest.java:556:55:556:71 | (...)... | provenance | Sink:MaD:355 |
+| Log4jJndiInjectionTest.java:557:49:557:56 | source(...) : String | Log4jJndiInjectionTest.java:557:40:557:56 | (...)... | provenance | Sink:MaD:356 |
+| Log4jJndiInjectionTest.java:557:49:557:56 | source(...) : String | Log4jJndiInjectionTest.java:557:40:557:56 | (...)... | provenance | Sink:MaD:355 |
+| Log4jJndiInjectionTest.java:558:34:558:41 | source(...) : String | Log4jJndiInjectionTest.java:558:25:558:41 | (...)... | provenance | Sink:MaD:356 |
+| Log4jJndiInjectionTest.java:558:34:558:41 | source(...) : String | Log4jJndiInjectionTest.java:558:25:558:41 | (...)... | provenance | Sink:MaD:355 |
+| Log4jJndiInjectionTest.java:559:154:559:161 | source(...) : String | Log4jJndiInjectionTest.java:559:145:559:161 | (...)... | provenance | Sink:MaD:358 |
+| Log4jJndiInjectionTest.java:559:154:559:161 | source(...) : String | Log4jJndiInjectionTest.java:559:145:559:161 | (...)... | provenance | Sink:MaD:357 |
+| Log4jJndiInjectionTest.java:560:139:560:146 | source(...) : String | Log4jJndiInjectionTest.java:560:130:560:146 | (...)... | provenance | Sink:MaD:358 |
+| Log4jJndiInjectionTest.java:560:139:560:146 | source(...) : String | Log4jJndiInjectionTest.java:560:130:560:146 | (...)... | provenance | Sink:MaD:357 |
+| Log4jJndiInjectionTest.java:561:124:561:131 | source(...) : String | Log4jJndiInjectionTest.java:561:115:561:131 | (...)... | provenance | Sink:MaD:358 |
+| Log4jJndiInjectionTest.java:561:124:561:131 | source(...) : String | Log4jJndiInjectionTest.java:561:115:561:131 | (...)... | provenance | Sink:MaD:357 |
+| Log4jJndiInjectionTest.java:562:109:562:116 | source(...) : String | Log4jJndiInjectionTest.java:562:100:562:116 | (...)... | provenance | Sink:MaD:358 |
+| Log4jJndiInjectionTest.java:562:109:562:116 | source(...) : String | Log4jJndiInjectionTest.java:562:100:562:116 | (...)... | provenance | Sink:MaD:357 |
+| Log4jJndiInjectionTest.java:563:94:563:101 | source(...) : String | Log4jJndiInjectionTest.java:563:85:563:101 | (...)... | provenance | Sink:MaD:358 |
+| Log4jJndiInjectionTest.java:563:94:563:101 | source(...) : String | Log4jJndiInjectionTest.java:563:85:563:101 | (...)... | provenance | Sink:MaD:357 |
+| Log4jJndiInjectionTest.java:564:79:564:86 | source(...) : String | Log4jJndiInjectionTest.java:564:70:564:86 | (...)... | provenance | Sink:MaD:358 |
+| Log4jJndiInjectionTest.java:564:79:564:86 | source(...) : String | Log4jJndiInjectionTest.java:564:70:564:86 | (...)... | provenance | Sink:MaD:357 |
+| Log4jJndiInjectionTest.java:565:64:565:71 | source(...) : String | Log4jJndiInjectionTest.java:565:55:565:71 | (...)... | provenance | Sink:MaD:358 |
+| Log4jJndiInjectionTest.java:565:64:565:71 | source(...) : String | Log4jJndiInjectionTest.java:565:55:565:71 | (...)... | provenance | Sink:MaD:357 |
+| Log4jJndiInjectionTest.java:566:49:566:56 | source(...) : String | Log4jJndiInjectionTest.java:566:40:566:56 | (...)... | provenance | Sink:MaD:358 |
+| Log4jJndiInjectionTest.java:566:49:566:56 | source(...) : String | Log4jJndiInjectionTest.java:566:40:566:56 | (...)... | provenance | Sink:MaD:357 |
+| Log4jJndiInjectionTest.java:567:34:567:41 | source(...) : String | Log4jJndiInjectionTest.java:567:25:567:41 | (...)... | provenance | Sink:MaD:358 |
+| Log4jJndiInjectionTest.java:567:34:567:41 | source(...) : String | Log4jJndiInjectionTest.java:567:25:567:41 | (...)... | provenance | Sink:MaD:357 |
+| Log4jJndiInjectionTest.java:568:169:568:176 | source(...) : String | Log4jJndiInjectionTest.java:568:160:568:176 | (...)... | provenance | Sink:MaD:360 |
+| Log4jJndiInjectionTest.java:568:169:568:176 | source(...) : String | Log4jJndiInjectionTest.java:568:160:568:176 | (...)... | provenance | Sink:MaD:359 |
+| Log4jJndiInjectionTest.java:569:154:569:161 | source(...) : String | Log4jJndiInjectionTest.java:569:145:569:161 | (...)... | provenance | Sink:MaD:360 |
+| Log4jJndiInjectionTest.java:569:154:569:161 | source(...) : String | Log4jJndiInjectionTest.java:569:145:569:161 | (...)... | provenance | Sink:MaD:359 |
+| Log4jJndiInjectionTest.java:570:139:570:146 | source(...) : String | Log4jJndiInjectionTest.java:570:130:570:146 | (...)... | provenance | Sink:MaD:360 |
+| Log4jJndiInjectionTest.java:570:139:570:146 | source(...) : String | Log4jJndiInjectionTest.java:570:130:570:146 | (...)... | provenance | Sink:MaD:359 |
+| Log4jJndiInjectionTest.java:571:124:571:131 | source(...) : String | Log4jJndiInjectionTest.java:571:115:571:131 | (...)... | provenance | Sink:MaD:360 |
+| Log4jJndiInjectionTest.java:571:124:571:131 | source(...) : String | Log4jJndiInjectionTest.java:571:115:571:131 | (...)... | provenance | Sink:MaD:359 |
+| Log4jJndiInjectionTest.java:572:109:572:116 | source(...) : String | Log4jJndiInjectionTest.java:572:100:572:116 | (...)... | provenance | Sink:MaD:360 |
+| Log4jJndiInjectionTest.java:572:109:572:116 | source(...) : String | Log4jJndiInjectionTest.java:572:100:572:116 | (...)... | provenance | Sink:MaD:359 |
+| Log4jJndiInjectionTest.java:573:94:573:101 | source(...) : String | Log4jJndiInjectionTest.java:573:85:573:101 | (...)... | provenance | Sink:MaD:360 |
+| Log4jJndiInjectionTest.java:573:94:573:101 | source(...) : String | Log4jJndiInjectionTest.java:573:85:573:101 | (...)... | provenance | Sink:MaD:359 |
+| Log4jJndiInjectionTest.java:574:79:574:86 | source(...) : String | Log4jJndiInjectionTest.java:574:70:574:86 | (...)... | provenance | Sink:MaD:360 |
+| Log4jJndiInjectionTest.java:574:79:574:86 | source(...) : String | Log4jJndiInjectionTest.java:574:70:574:86 | (...)... | provenance | Sink:MaD:359 |
+| Log4jJndiInjectionTest.java:575:64:575:71 | source(...) : String | Log4jJndiInjectionTest.java:575:55:575:71 | (...)... | provenance | Sink:MaD:360 |
+| Log4jJndiInjectionTest.java:575:64:575:71 | source(...) : String | Log4jJndiInjectionTest.java:575:55:575:71 | (...)... | provenance | Sink:MaD:359 |
+| Log4jJndiInjectionTest.java:576:49:576:56 | source(...) : String | Log4jJndiInjectionTest.java:576:40:576:56 | (...)... | provenance | Sink:MaD:360 |
+| Log4jJndiInjectionTest.java:576:49:576:56 | source(...) : String | Log4jJndiInjectionTest.java:576:40:576:56 | (...)... | provenance | Sink:MaD:359 |
+| Log4jJndiInjectionTest.java:577:34:577:41 | source(...) : String | Log4jJndiInjectionTest.java:577:25:577:41 | (...)... | provenance | Sink:MaD:360 |
+| Log4jJndiInjectionTest.java:577:34:577:41 | source(...) : String | Log4jJndiInjectionTest.java:577:25:577:41 | (...)... | provenance | Sink:MaD:359 |
+| Log4jJndiInjectionTest.java:578:34:578:41 | source(...) : String | Log4jJndiInjectionTest.java:578:25:578:41 | (...)... | provenance | Sink:MaD:344 |
+| Log4jJndiInjectionTest.java:578:34:578:41 | source(...) : String | Log4jJndiInjectionTest.java:578:25:578:41 | (...)... | provenance | Sink:MaD:343 |
+| Log4jJndiInjectionTest.java:579:54:579:61 | source(...) : String | Log4jJndiInjectionTest.java:579:40:579:61 | (...)... | provenance | Sink:MaD:344 |
+| Log4jJndiInjectionTest.java:579:54:579:61 | source(...) : String | Log4jJndiInjectionTest.java:579:40:579:61 | (...)... | provenance | Sink:MaD:343 |
+| Log4jJndiInjectionTest.java:580:34:580:41 | source(...) : String | Log4jJndiInjectionTest.java:580:25:580:41 | (...)... | provenance | Sink:MaD:364 |
+| Log4jJndiInjectionTest.java:580:34:580:41 | source(...) : String | Log4jJndiInjectionTest.java:580:25:580:41 | (...)... | provenance | Sink:MaD:363 |
+| Log4jJndiInjectionTest.java:581:39:581:46 | source(...) : String | Log4jJndiInjectionTest.java:581:25:581:46 | (...)... | provenance | Sink:MaD:366 |
+| Log4jJndiInjectionTest.java:581:39:581:46 | source(...) : String | Log4jJndiInjectionTest.java:581:25:581:46 | (...)... | provenance | Sink:MaD:365 |
+| Log4jJndiInjectionTest.java:582:39:582:46 | source(...) : String | Log4jJndiInjectionTest.java:582:25:582:46 | (...)... | provenance | Sink:MaD:368 |
+| Log4jJndiInjectionTest.java:582:39:582:46 | source(...) : String | Log4jJndiInjectionTest.java:582:25:582:46 | (...)... | provenance | Sink:MaD:367 |
+| Log4jJndiInjectionTest.java:583:53:583:60 | source(...) : String | Log4jJndiInjectionTest.java:583:38:583:60 | (...)... | provenance | Sink:MaD:370 |
+| Log4jJndiInjectionTest.java:583:53:583:60 | source(...) : String | Log4jJndiInjectionTest.java:583:38:583:60 | (...)... | provenance | Sink:MaD:369 |
+| Log4jJndiInjectionTest.java:584:53:584:60 | source(...) : String | Log4jJndiInjectionTest.java:584:38:584:60 | (...)... | provenance | Sink:MaD:372 |
+| Log4jJndiInjectionTest.java:584:53:584:60 | source(...) : String | Log4jJndiInjectionTest.java:584:38:584:60 | (...)... | provenance | Sink:MaD:371 |
+| Log4jJndiInjectionTest.java:585:68:585:75 | source(...) : String | Log4jJndiInjectionTest.java:585:53:585:75 | (...)... | provenance | Sink:MaD:374 |
+| Log4jJndiInjectionTest.java:585:68:585:75 | source(...) : String | Log4jJndiInjectionTest.java:585:53:585:75 | (...)... | provenance | Sink:MaD:373 |
+| Log4jJndiInjectionTest.java:586:68:586:75 | source(...) : String | Log4jJndiInjectionTest.java:586:53:586:75 | (...)... | provenance | Sink:MaD:376 |
+| Log4jJndiInjectionTest.java:586:68:586:75 | source(...) : String | Log4jJndiInjectionTest.java:586:53:586:75 | (...)... | provenance | Sink:MaD:375 |
+| Log4jJndiInjectionTest.java:587:63:587:70 | source(...) : String | Log4jJndiInjectionTest.java:587:53:587:70 | (...)... | provenance | Sink:MaD:378 |
+| Log4jJndiInjectionTest.java:587:63:587:70 | source(...) : String | Log4jJndiInjectionTest.java:587:53:587:70 | (...)... | provenance | Sink:MaD:377 |
+| Log4jJndiInjectionTest.java:588:71:588:78 | source(...) : String | Log4jJndiInjectionTest.java:588:53:588:78 | (...)... | provenance | Sink:MaD:380 |
+| Log4jJndiInjectionTest.java:588:71:588:78 | source(...) : String | Log4jJndiInjectionTest.java:588:53:588:78 | (...)... | provenance | Sink:MaD:379 |
+| Log4jJndiInjectionTest.java:589:71:589:78 | source(...) : String | Log4jJndiInjectionTest.java:589:53:589:78 | (...)... | provenance | Sink:MaD:382 |
+| Log4jJndiInjectionTest.java:589:71:589:78 | source(...) : String | Log4jJndiInjectionTest.java:589:53:589:78 | (...)... | provenance | Sink:MaD:381 |
+| Log4jJndiInjectionTest.java:591:62:591:69 | source(...) : String | Log4jJndiInjectionTest.java:591:53:591:69 | (...)... | provenance | Sink:MaD:386 |
+| Log4jJndiInjectionTest.java:591:62:591:69 | source(...) : String | Log4jJndiInjectionTest.java:591:53:591:69 | (...)... | provenance | Sink:MaD:385 |
+| Log4jJndiInjectionTest.java:592:62:592:69 | source(...) : String | Log4jJndiInjectionTest.java:592:53:592:69 | (...)... | provenance | Sink:MaD:406 |
+| Log4jJndiInjectionTest.java:592:62:592:69 | source(...) : String | Log4jJndiInjectionTest.java:592:53:592:69 | (...)... | provenance | Sink:MaD:405 |
+| Log4jJndiInjectionTest.java:593:68:593:90 | {...} : Object[] [[]] : String | Log4jJndiInjectionTest.java:593:68:593:90 | new Object[] | provenance | Sink:MaD:406 |
+| Log4jJndiInjectionTest.java:593:68:593:90 | {...} : Object[] [[]] : String | Log4jJndiInjectionTest.java:593:68:593:90 | new Object[] | provenance | Sink:MaD:405 |
 | Log4jJndiInjectionTest.java:593:82:593:89 | source(...) : String | Log4jJndiInjectionTest.java:593:68:593:90 | {...} : Object[] [[]] : String | provenance |  |
-| Log4jJndiInjectionTest.java:594:77:594:84 | source(...) : String | Log4jJndiInjectionTest.java:594:68:594:84 | (...)... | provenance |  Sink:MaD:200 |
-| Log4jJndiInjectionTest.java:594:77:594:84 | source(...) : String | Log4jJndiInjectionTest.java:594:68:594:84 | (...)... | provenance |  Sink:MaD:516 |
-| Log4jJndiInjectionTest.java:595:62:595:69 | source(...) : String | Log4jJndiInjectionTest.java:595:53:595:69 | (...)... | provenance |  Sink:MaD:200 |
-| Log4jJndiInjectionTest.java:595:62:595:69 | source(...) : String | Log4jJndiInjectionTest.java:595:53:595:69 | (...)... | provenance |  Sink:MaD:516 |
-| Log4jJndiInjectionTest.java:596:92:596:99 | source(...) : String | Log4jJndiInjectionTest.java:596:83:596:99 | (...)... | provenance |  Sink:MaD:201 |
-| Log4jJndiInjectionTest.java:596:92:596:99 | source(...) : String | Log4jJndiInjectionTest.java:596:83:596:99 | (...)... | provenance |  Sink:MaD:517 |
-| Log4jJndiInjectionTest.java:597:77:597:84 | source(...) : String | Log4jJndiInjectionTest.java:597:68:597:84 | (...)... | provenance |  Sink:MaD:201 |
-| Log4jJndiInjectionTest.java:597:77:597:84 | source(...) : String | Log4jJndiInjectionTest.java:597:68:597:84 | (...)... | provenance |  Sink:MaD:517 |
-| Log4jJndiInjectionTest.java:598:62:598:69 | source(...) : String | Log4jJndiInjectionTest.java:598:53:598:69 | (...)... | provenance |  Sink:MaD:201 |
-| Log4jJndiInjectionTest.java:598:62:598:69 | source(...) : String | Log4jJndiInjectionTest.java:598:53:598:69 | (...)... | provenance |  Sink:MaD:517 |
-| Log4jJndiInjectionTest.java:599:107:599:114 | source(...) : String | Log4jJndiInjectionTest.java:599:98:599:114 | (...)... | provenance |  Sink:MaD:202 |
-| Log4jJndiInjectionTest.java:599:107:599:114 | source(...) : String | Log4jJndiInjectionTest.java:599:98:599:114 | (...)... | provenance |  Sink:MaD:518 |
-| Log4jJndiInjectionTest.java:600:92:600:99 | source(...) : String | Log4jJndiInjectionTest.java:600:83:600:99 | (...)... | provenance |  Sink:MaD:202 |
-| Log4jJndiInjectionTest.java:600:92:600:99 | source(...) : String | Log4jJndiInjectionTest.java:600:83:600:99 | (...)... | provenance |  Sink:MaD:518 |
-| Log4jJndiInjectionTest.java:601:77:601:84 | source(...) : String | Log4jJndiInjectionTest.java:601:68:601:84 | (...)... | provenance |  Sink:MaD:202 |
-| Log4jJndiInjectionTest.java:601:77:601:84 | source(...) : String | Log4jJndiInjectionTest.java:601:68:601:84 | (...)... | provenance |  Sink:MaD:518 |
-| Log4jJndiInjectionTest.java:602:62:602:69 | source(...) : String | Log4jJndiInjectionTest.java:602:53:602:69 | (...)... | provenance |  Sink:MaD:202 |
-| Log4jJndiInjectionTest.java:602:62:602:69 | source(...) : String | Log4jJndiInjectionTest.java:602:53:602:69 | (...)... | provenance |  Sink:MaD:518 |
-| Log4jJndiInjectionTest.java:603:122:603:129 | source(...) : String | Log4jJndiInjectionTest.java:603:113:603:129 | (...)... | provenance |  Sink:MaD:203 |
-| Log4jJndiInjectionTest.java:603:122:603:129 | source(...) : String | Log4jJndiInjectionTest.java:603:113:603:129 | (...)... | provenance |  Sink:MaD:519 |
-| Log4jJndiInjectionTest.java:604:107:604:114 | source(...) : String | Log4jJndiInjectionTest.java:604:98:604:114 | (...)... | provenance |  Sink:MaD:203 |
-| Log4jJndiInjectionTest.java:604:107:604:114 | source(...) : String | Log4jJndiInjectionTest.java:604:98:604:114 | (...)... | provenance |  Sink:MaD:519 |
-| Log4jJndiInjectionTest.java:605:92:605:99 | source(...) : String | Log4jJndiInjectionTest.java:605:83:605:99 | (...)... | provenance |  Sink:MaD:203 |
-| Log4jJndiInjectionTest.java:605:92:605:99 | source(...) : String | Log4jJndiInjectionTest.java:605:83:605:99 | (...)... | provenance |  Sink:MaD:519 |
-| Log4jJndiInjectionTest.java:606:77:606:84 | source(...) : String | Log4jJndiInjectionTest.java:606:68:606:84 | (...)... | provenance |  Sink:MaD:203 |
-| Log4jJndiInjectionTest.java:606:77:606:84 | source(...) : String | Log4jJndiInjectionTest.java:606:68:606:84 | (...)... | provenance |  Sink:MaD:519 |
-| Log4jJndiInjectionTest.java:607:62:607:69 | source(...) : String | Log4jJndiInjectionTest.java:607:53:607:69 | (...)... | provenance |  Sink:MaD:203 |
-| Log4jJndiInjectionTest.java:607:62:607:69 | source(...) : String | Log4jJndiInjectionTest.java:607:53:607:69 | (...)... | provenance |  Sink:MaD:519 |
-| Log4jJndiInjectionTest.java:608:137:608:144 | source(...) : String | Log4jJndiInjectionTest.java:608:128:608:144 | (...)... | provenance |  Sink:MaD:204 |
-| Log4jJndiInjectionTest.java:608:137:608:144 | source(...) : String | Log4jJndiInjectionTest.java:608:128:608:144 | (...)... | provenance |  Sink:MaD:520 |
-| Log4jJndiInjectionTest.java:609:122:609:129 | source(...) : String | Log4jJndiInjectionTest.java:609:113:609:129 | (...)... | provenance |  Sink:MaD:204 |
-| Log4jJndiInjectionTest.java:609:122:609:129 | source(...) : String | Log4jJndiInjectionTest.java:609:113:609:129 | (...)... | provenance |  Sink:MaD:520 |
-| Log4jJndiInjectionTest.java:610:107:610:114 | source(...) : String | Log4jJndiInjectionTest.java:610:98:610:114 | (...)... | provenance |  Sink:MaD:204 |
-| Log4jJndiInjectionTest.java:610:107:610:114 | source(...) : String | Log4jJndiInjectionTest.java:610:98:610:114 | (...)... | provenance |  Sink:MaD:520 |
-| Log4jJndiInjectionTest.java:611:92:611:99 | source(...) : String | Log4jJndiInjectionTest.java:611:83:611:99 | (...)... | provenance |  Sink:MaD:204 |
-| Log4jJndiInjectionTest.java:611:92:611:99 | source(...) : String | Log4jJndiInjectionTest.java:611:83:611:99 | (...)... | provenance |  Sink:MaD:520 |
-| Log4jJndiInjectionTest.java:612:77:612:84 | source(...) : String | Log4jJndiInjectionTest.java:612:68:612:84 | (...)... | provenance |  Sink:MaD:204 |
-| Log4jJndiInjectionTest.java:612:77:612:84 | source(...) : String | Log4jJndiInjectionTest.java:612:68:612:84 | (...)... | provenance |  Sink:MaD:520 |
-| Log4jJndiInjectionTest.java:613:62:613:69 | source(...) : String | Log4jJndiInjectionTest.java:613:53:613:69 | (...)... | provenance |  Sink:MaD:204 |
-| Log4jJndiInjectionTest.java:613:62:613:69 | source(...) : String | Log4jJndiInjectionTest.java:613:53:613:69 | (...)... | provenance |  Sink:MaD:520 |
-| Log4jJndiInjectionTest.java:614:152:614:159 | source(...) : String | Log4jJndiInjectionTest.java:614:143:614:159 | (...)... | provenance |  Sink:MaD:205 |
-| Log4jJndiInjectionTest.java:614:152:614:159 | source(...) : String | Log4jJndiInjectionTest.java:614:143:614:159 | (...)... | provenance |  Sink:MaD:521 |
-| Log4jJndiInjectionTest.java:615:137:615:144 | source(...) : String | Log4jJndiInjectionTest.java:615:128:615:144 | (...)... | provenance |  Sink:MaD:205 |
-| Log4jJndiInjectionTest.java:615:137:615:144 | source(...) : String | Log4jJndiInjectionTest.java:615:128:615:144 | (...)... | provenance |  Sink:MaD:521 |
-| Log4jJndiInjectionTest.java:616:122:616:129 | source(...) : String | Log4jJndiInjectionTest.java:616:113:616:129 | (...)... | provenance |  Sink:MaD:205 |
-| Log4jJndiInjectionTest.java:616:122:616:129 | source(...) : String | Log4jJndiInjectionTest.java:616:113:616:129 | (...)... | provenance |  Sink:MaD:521 |
-| Log4jJndiInjectionTest.java:617:107:617:114 | source(...) : String | Log4jJndiInjectionTest.java:617:98:617:114 | (...)... | provenance |  Sink:MaD:205 |
-| Log4jJndiInjectionTest.java:617:107:617:114 | source(...) : String | Log4jJndiInjectionTest.java:617:98:617:114 | (...)... | provenance |  Sink:MaD:521 |
-| Log4jJndiInjectionTest.java:618:92:618:99 | source(...) : String | Log4jJndiInjectionTest.java:618:83:618:99 | (...)... | provenance |  Sink:MaD:205 |
-| Log4jJndiInjectionTest.java:618:92:618:99 | source(...) : String | Log4jJndiInjectionTest.java:618:83:618:99 | (...)... | provenance |  Sink:MaD:521 |
-| Log4jJndiInjectionTest.java:619:77:619:84 | source(...) : String | Log4jJndiInjectionTest.java:619:68:619:84 | (...)... | provenance |  Sink:MaD:205 |
-| Log4jJndiInjectionTest.java:619:77:619:84 | source(...) : String | Log4jJndiInjectionTest.java:619:68:619:84 | (...)... | provenance |  Sink:MaD:521 |
-| Log4jJndiInjectionTest.java:620:62:620:69 | source(...) : String | Log4jJndiInjectionTest.java:620:53:620:69 | (...)... | provenance |  Sink:MaD:205 |
-| Log4jJndiInjectionTest.java:620:62:620:69 | source(...) : String | Log4jJndiInjectionTest.java:620:53:620:69 | (...)... | provenance |  Sink:MaD:521 |
-| Log4jJndiInjectionTest.java:621:167:621:174 | source(...) : String | Log4jJndiInjectionTest.java:621:158:621:174 | (...)... | provenance |  Sink:MaD:206 |
-| Log4jJndiInjectionTest.java:621:167:621:174 | source(...) : String | Log4jJndiInjectionTest.java:621:158:621:174 | (...)... | provenance |  Sink:MaD:522 |
-| Log4jJndiInjectionTest.java:622:152:622:159 | source(...) : String | Log4jJndiInjectionTest.java:622:143:622:159 | (...)... | provenance |  Sink:MaD:206 |
-| Log4jJndiInjectionTest.java:622:152:622:159 | source(...) : String | Log4jJndiInjectionTest.java:622:143:622:159 | (...)... | provenance |  Sink:MaD:522 |
-| Log4jJndiInjectionTest.java:623:137:623:144 | source(...) : String | Log4jJndiInjectionTest.java:623:128:623:144 | (...)... | provenance |  Sink:MaD:206 |
-| Log4jJndiInjectionTest.java:623:137:623:144 | source(...) : String | Log4jJndiInjectionTest.java:623:128:623:144 | (...)... | provenance |  Sink:MaD:522 |
-| Log4jJndiInjectionTest.java:624:122:624:129 | source(...) : String | Log4jJndiInjectionTest.java:624:113:624:129 | (...)... | provenance |  Sink:MaD:206 |
-| Log4jJndiInjectionTest.java:624:122:624:129 | source(...) : String | Log4jJndiInjectionTest.java:624:113:624:129 | (...)... | provenance |  Sink:MaD:522 |
-| Log4jJndiInjectionTest.java:625:107:625:114 | source(...) : String | Log4jJndiInjectionTest.java:625:98:625:114 | (...)... | provenance |  Sink:MaD:206 |
-| Log4jJndiInjectionTest.java:625:107:625:114 | source(...) : String | Log4jJndiInjectionTest.java:625:98:625:114 | (...)... | provenance |  Sink:MaD:522 |
-| Log4jJndiInjectionTest.java:626:92:626:99 | source(...) : String | Log4jJndiInjectionTest.java:626:83:626:99 | (...)... | provenance |  Sink:MaD:206 |
-| Log4jJndiInjectionTest.java:626:92:626:99 | source(...) : String | Log4jJndiInjectionTest.java:626:83:626:99 | (...)... | provenance |  Sink:MaD:522 |
-| Log4jJndiInjectionTest.java:627:77:627:84 | source(...) : String | Log4jJndiInjectionTest.java:627:68:627:84 | (...)... | provenance |  Sink:MaD:206 |
-| Log4jJndiInjectionTest.java:627:77:627:84 | source(...) : String | Log4jJndiInjectionTest.java:627:68:627:84 | (...)... | provenance |  Sink:MaD:522 |
-| Log4jJndiInjectionTest.java:628:62:628:69 | source(...) : String | Log4jJndiInjectionTest.java:628:53:628:69 | (...)... | provenance |  Sink:MaD:206 |
-| Log4jJndiInjectionTest.java:628:62:628:69 | source(...) : String | Log4jJndiInjectionTest.java:628:53:628:69 | (...)... | provenance |  Sink:MaD:522 |
-| Log4jJndiInjectionTest.java:629:182:629:189 | source(...) : String | Log4jJndiInjectionTest.java:629:173:629:189 | (...)... | provenance |  Sink:MaD:207 |
-| Log4jJndiInjectionTest.java:629:182:629:189 | source(...) : String | Log4jJndiInjectionTest.java:629:173:629:189 | (...)... | provenance |  Sink:MaD:523 |
-| Log4jJndiInjectionTest.java:630:167:630:174 | source(...) : String | Log4jJndiInjectionTest.java:630:158:630:174 | (...)... | provenance |  Sink:MaD:207 |
-| Log4jJndiInjectionTest.java:630:167:630:174 | source(...) : String | Log4jJndiInjectionTest.java:630:158:630:174 | (...)... | provenance |  Sink:MaD:523 |
-| Log4jJndiInjectionTest.java:631:152:631:159 | source(...) : String | Log4jJndiInjectionTest.java:631:143:631:159 | (...)... | provenance |  Sink:MaD:207 |
-| Log4jJndiInjectionTest.java:631:152:631:159 | source(...) : String | Log4jJndiInjectionTest.java:631:143:631:159 | (...)... | provenance |  Sink:MaD:523 |
-| Log4jJndiInjectionTest.java:632:137:632:144 | source(...) : String | Log4jJndiInjectionTest.java:632:128:632:144 | (...)... | provenance |  Sink:MaD:207 |
-| Log4jJndiInjectionTest.java:632:137:632:144 | source(...) : String | Log4jJndiInjectionTest.java:632:128:632:144 | (...)... | provenance |  Sink:MaD:523 |
-| Log4jJndiInjectionTest.java:633:122:633:129 | source(...) : String | Log4jJndiInjectionTest.java:633:113:633:129 | (...)... | provenance |  Sink:MaD:207 |
-| Log4jJndiInjectionTest.java:633:122:633:129 | source(...) : String | Log4jJndiInjectionTest.java:633:113:633:129 | (...)... | provenance |  Sink:MaD:523 |
-| Log4jJndiInjectionTest.java:634:107:634:114 | source(...) : String | Log4jJndiInjectionTest.java:634:98:634:114 | (...)... | provenance |  Sink:MaD:207 |
-| Log4jJndiInjectionTest.java:634:107:634:114 | source(...) : String | Log4jJndiInjectionTest.java:634:98:634:114 | (...)... | provenance |  Sink:MaD:523 |
-| Log4jJndiInjectionTest.java:635:92:635:99 | source(...) : String | Log4jJndiInjectionTest.java:635:83:635:99 | (...)... | provenance |  Sink:MaD:207 |
-| Log4jJndiInjectionTest.java:635:92:635:99 | source(...) : String | Log4jJndiInjectionTest.java:635:83:635:99 | (...)... | provenance |  Sink:MaD:523 |
-| Log4jJndiInjectionTest.java:636:77:636:84 | source(...) : String | Log4jJndiInjectionTest.java:636:68:636:84 | (...)... | provenance |  Sink:MaD:207 |
-| Log4jJndiInjectionTest.java:636:77:636:84 | source(...) : String | Log4jJndiInjectionTest.java:636:68:636:84 | (...)... | provenance |  Sink:MaD:523 |
-| Log4jJndiInjectionTest.java:637:62:637:69 | source(...) : String | Log4jJndiInjectionTest.java:637:53:637:69 | (...)... | provenance |  Sink:MaD:207 |
-| Log4jJndiInjectionTest.java:637:62:637:69 | source(...) : String | Log4jJndiInjectionTest.java:637:53:637:69 | (...)... | provenance |  Sink:MaD:523 |
-| Log4jJndiInjectionTest.java:638:197:638:204 | source(...) : String | Log4jJndiInjectionTest.java:638:188:638:204 | (...)... | provenance |  Sink:MaD:208 |
-| Log4jJndiInjectionTest.java:638:197:638:204 | source(...) : String | Log4jJndiInjectionTest.java:638:188:638:204 | (...)... | provenance |  Sink:MaD:524 |
-| Log4jJndiInjectionTest.java:639:182:639:189 | source(...) : String | Log4jJndiInjectionTest.java:639:173:639:189 | (...)... | provenance |  Sink:MaD:208 |
-| Log4jJndiInjectionTest.java:639:182:639:189 | source(...) : String | Log4jJndiInjectionTest.java:639:173:639:189 | (...)... | provenance |  Sink:MaD:524 |
-| Log4jJndiInjectionTest.java:640:167:640:174 | source(...) : String | Log4jJndiInjectionTest.java:640:158:640:174 | (...)... | provenance |  Sink:MaD:208 |
-| Log4jJndiInjectionTest.java:640:167:640:174 | source(...) : String | Log4jJndiInjectionTest.java:640:158:640:174 | (...)... | provenance |  Sink:MaD:524 |
-| Log4jJndiInjectionTest.java:641:152:641:159 | source(...) : String | Log4jJndiInjectionTest.java:641:143:641:159 | (...)... | provenance |  Sink:MaD:208 |
-| Log4jJndiInjectionTest.java:641:152:641:159 | source(...) : String | Log4jJndiInjectionTest.java:641:143:641:159 | (...)... | provenance |  Sink:MaD:524 |
-| Log4jJndiInjectionTest.java:642:137:642:144 | source(...) : String | Log4jJndiInjectionTest.java:642:128:642:144 | (...)... | provenance |  Sink:MaD:208 |
-| Log4jJndiInjectionTest.java:642:137:642:144 | source(...) : String | Log4jJndiInjectionTest.java:642:128:642:144 | (...)... | provenance |  Sink:MaD:524 |
-| Log4jJndiInjectionTest.java:643:122:643:129 | source(...) : String | Log4jJndiInjectionTest.java:643:113:643:129 | (...)... | provenance |  Sink:MaD:208 |
-| Log4jJndiInjectionTest.java:643:122:643:129 | source(...) : String | Log4jJndiInjectionTest.java:643:113:643:129 | (...)... | provenance |  Sink:MaD:524 |
-| Log4jJndiInjectionTest.java:644:107:644:114 | source(...) : String | Log4jJndiInjectionTest.java:644:98:644:114 | (...)... | provenance |  Sink:MaD:208 |
-| Log4jJndiInjectionTest.java:644:107:644:114 | source(...) : String | Log4jJndiInjectionTest.java:644:98:644:114 | (...)... | provenance |  Sink:MaD:524 |
-| Log4jJndiInjectionTest.java:645:92:645:99 | source(...) : String | Log4jJndiInjectionTest.java:645:83:645:99 | (...)... | provenance |  Sink:MaD:208 |
-| Log4jJndiInjectionTest.java:645:92:645:99 | source(...) : String | Log4jJndiInjectionTest.java:645:83:645:99 | (...)... | provenance |  Sink:MaD:524 |
-| Log4jJndiInjectionTest.java:646:77:646:84 | source(...) : String | Log4jJndiInjectionTest.java:646:68:646:84 | (...)... | provenance |  Sink:MaD:208 |
-| Log4jJndiInjectionTest.java:646:77:646:84 | source(...) : String | Log4jJndiInjectionTest.java:646:68:646:84 | (...)... | provenance |  Sink:MaD:524 |
-| Log4jJndiInjectionTest.java:647:62:647:69 | source(...) : String | Log4jJndiInjectionTest.java:647:53:647:69 | (...)... | provenance |  Sink:MaD:208 |
-| Log4jJndiInjectionTest.java:647:62:647:69 | source(...) : String | Log4jJndiInjectionTest.java:647:53:647:69 | (...)... | provenance |  Sink:MaD:524 |
-| Log4jJndiInjectionTest.java:648:62:648:69 | source(...) : String | Log4jJndiInjectionTest.java:648:53:648:69 | (...)... | provenance |  Sink:MaD:200 |
-| Log4jJndiInjectionTest.java:648:62:648:69 | source(...) : String | Log4jJndiInjectionTest.java:648:53:648:69 | (...)... | provenance |  Sink:MaD:516 |
-| Log4jJndiInjectionTest.java:649:82:649:89 | source(...) : String | Log4jJndiInjectionTest.java:649:68:649:89 | (...)... | provenance |  Sink:MaD:200 |
-| Log4jJndiInjectionTest.java:649:82:649:89 | source(...) : String | Log4jJndiInjectionTest.java:649:68:649:89 | (...)... | provenance |  Sink:MaD:516 |
-| Log4jJndiInjectionTest.java:650:62:650:69 | source(...) : String | Log4jJndiInjectionTest.java:650:53:650:69 | (...)... | provenance |  Sink:MaD:210 |
-| Log4jJndiInjectionTest.java:650:62:650:69 | source(...) : String | Log4jJndiInjectionTest.java:650:53:650:69 | (...)... | provenance |  Sink:MaD:526 |
-| Log4jJndiInjectionTest.java:651:67:651:74 | source(...) : String | Log4jJndiInjectionTest.java:651:53:651:74 | (...)... | provenance |  Sink:MaD:211 |
-| Log4jJndiInjectionTest.java:651:67:651:74 | source(...) : String | Log4jJndiInjectionTest.java:651:53:651:74 | (...)... | provenance |  Sink:MaD:527 |
-| Log4jJndiInjectionTest.java:652:67:652:74 | source(...) : String | Log4jJndiInjectionTest.java:652:53:652:74 | (...)... | provenance |  Sink:MaD:212 |
-| Log4jJndiInjectionTest.java:652:67:652:74 | source(...) : String | Log4jJndiInjectionTest.java:652:53:652:74 | (...)... | provenance |  Sink:MaD:528 |
-| Log4jJndiInjectionTest.java:653:56:653:63 | source(...) : String | Log4jJndiInjectionTest.java:653:38:653:63 | (...)... | provenance |  Sink:MaD:215 |
-| Log4jJndiInjectionTest.java:653:56:653:63 | source(...) : String | Log4jJndiInjectionTest.java:653:38:653:63 | (...)... | provenance |  Sink:MaD:531 |
-| Log4jJndiInjectionTest.java:654:56:654:63 | source(...) : String | Log4jJndiInjectionTest.java:654:38:654:63 | (...)... | provenance |  Sink:MaD:216 |
-| Log4jJndiInjectionTest.java:654:56:654:63 | source(...) : String | Log4jJndiInjectionTest.java:654:38:654:63 | (...)... | provenance |  Sink:MaD:532 |
-| Log4jJndiInjectionTest.java:655:48:655:55 | source(...) : String | Log4jJndiInjectionTest.java:655:38:655:55 | (...)... | provenance |  Sink:MaD:213 |
-| Log4jJndiInjectionTest.java:655:48:655:55 | source(...) : String | Log4jJndiInjectionTest.java:655:38:655:55 | (...)... | provenance |  Sink:MaD:529 |
-| Log4jJndiInjectionTest.java:656:48:656:55 | source(...) : String | Log4jJndiInjectionTest.java:656:38:656:55 | (...)... | provenance |  Sink:MaD:214 |
-| Log4jJndiInjectionTest.java:656:48:656:55 | source(...) : String | Log4jJndiInjectionTest.java:656:38:656:55 | (...)... | provenance |  Sink:MaD:530 |
-| Log4jJndiInjectionTest.java:659:47:659:54 | source(...) : String | Log4jJndiInjectionTest.java:659:38:659:54 | (...)... | provenance |  Sink:MaD:219 |
-| Log4jJndiInjectionTest.java:659:47:659:54 | source(...) : String | Log4jJndiInjectionTest.java:659:38:659:54 | (...)... | provenance |  Sink:MaD:535 |
-| Log4jJndiInjectionTest.java:660:47:660:54 | source(...) : String | Log4jJndiInjectionTest.java:660:38:660:54 | (...)... | provenance |  Sink:MaD:229 |
-| Log4jJndiInjectionTest.java:660:47:660:54 | source(...) : String | Log4jJndiInjectionTest.java:660:38:660:54 | (...)... | provenance |  Sink:MaD:545 |
-| Log4jJndiInjectionTest.java:661:53:661:75 | {...} : Object[] [[]] : String | Log4jJndiInjectionTest.java:661:53:661:75 | new Object[] | provenance |  Sink:MaD:229 |
-| Log4jJndiInjectionTest.java:661:53:661:75 | {...} : Object[] [[]] : String | Log4jJndiInjectionTest.java:661:53:661:75 | new Object[] | provenance |  Sink:MaD:545 |
+| Log4jJndiInjectionTest.java:594:77:594:84 | source(...) : String | Log4jJndiInjectionTest.java:594:68:594:84 | (...)... | provenance | Sink:MaD:388 |
+| Log4jJndiInjectionTest.java:594:77:594:84 | source(...) : String | Log4jJndiInjectionTest.java:594:68:594:84 | (...)... | provenance | Sink:MaD:387 |
+| Log4jJndiInjectionTest.java:595:62:595:69 | source(...) : String | Log4jJndiInjectionTest.java:595:53:595:69 | (...)... | provenance | Sink:MaD:388 |
+| Log4jJndiInjectionTest.java:595:62:595:69 | source(...) : String | Log4jJndiInjectionTest.java:595:53:595:69 | (...)... | provenance | Sink:MaD:387 |
+| Log4jJndiInjectionTest.java:596:92:596:99 | source(...) : String | Log4jJndiInjectionTest.java:596:83:596:99 | (...)... | provenance | Sink:MaD:390 |
+| Log4jJndiInjectionTest.java:596:92:596:99 | source(...) : String | Log4jJndiInjectionTest.java:596:83:596:99 | (...)... | provenance | Sink:MaD:389 |
+| Log4jJndiInjectionTest.java:597:77:597:84 | source(...) : String | Log4jJndiInjectionTest.java:597:68:597:84 | (...)... | provenance | Sink:MaD:390 |
+| Log4jJndiInjectionTest.java:597:77:597:84 | source(...) : String | Log4jJndiInjectionTest.java:597:68:597:84 | (...)... | provenance | Sink:MaD:389 |
+| Log4jJndiInjectionTest.java:598:62:598:69 | source(...) : String | Log4jJndiInjectionTest.java:598:53:598:69 | (...)... | provenance | Sink:MaD:390 |
+| Log4jJndiInjectionTest.java:598:62:598:69 | source(...) : String | Log4jJndiInjectionTest.java:598:53:598:69 | (...)... | provenance | Sink:MaD:389 |
+| Log4jJndiInjectionTest.java:599:107:599:114 | source(...) : String | Log4jJndiInjectionTest.java:599:98:599:114 | (...)... | provenance | Sink:MaD:392 |
+| Log4jJndiInjectionTest.java:599:107:599:114 | source(...) : String | Log4jJndiInjectionTest.java:599:98:599:114 | (...)... | provenance | Sink:MaD:391 |
+| Log4jJndiInjectionTest.java:600:92:600:99 | source(...) : String | Log4jJndiInjectionTest.java:600:83:600:99 | (...)... | provenance | Sink:MaD:392 |
+| Log4jJndiInjectionTest.java:600:92:600:99 | source(...) : String | Log4jJndiInjectionTest.java:600:83:600:99 | (...)... | provenance | Sink:MaD:391 |
+| Log4jJndiInjectionTest.java:601:77:601:84 | source(...) : String | Log4jJndiInjectionTest.java:601:68:601:84 | (...)... | provenance | Sink:MaD:392 |
+| Log4jJndiInjectionTest.java:601:77:601:84 | source(...) : String | Log4jJndiInjectionTest.java:601:68:601:84 | (...)... | provenance | Sink:MaD:391 |
+| Log4jJndiInjectionTest.java:602:62:602:69 | source(...) : String | Log4jJndiInjectionTest.java:602:53:602:69 | (...)... | provenance | Sink:MaD:392 |
+| Log4jJndiInjectionTest.java:602:62:602:69 | source(...) : String | Log4jJndiInjectionTest.java:602:53:602:69 | (...)... | provenance | Sink:MaD:391 |
+| Log4jJndiInjectionTest.java:603:122:603:129 | source(...) : String | Log4jJndiInjectionTest.java:603:113:603:129 | (...)... | provenance | Sink:MaD:394 |
+| Log4jJndiInjectionTest.java:603:122:603:129 | source(...) : String | Log4jJndiInjectionTest.java:603:113:603:129 | (...)... | provenance | Sink:MaD:393 |
+| Log4jJndiInjectionTest.java:604:107:604:114 | source(...) : String | Log4jJndiInjectionTest.java:604:98:604:114 | (...)... | provenance | Sink:MaD:394 |
+| Log4jJndiInjectionTest.java:604:107:604:114 | source(...) : String | Log4jJndiInjectionTest.java:604:98:604:114 | (...)... | provenance | Sink:MaD:393 |
+| Log4jJndiInjectionTest.java:605:92:605:99 | source(...) : String | Log4jJndiInjectionTest.java:605:83:605:99 | (...)... | provenance | Sink:MaD:394 |
+| Log4jJndiInjectionTest.java:605:92:605:99 | source(...) : String | Log4jJndiInjectionTest.java:605:83:605:99 | (...)... | provenance | Sink:MaD:393 |
+| Log4jJndiInjectionTest.java:606:77:606:84 | source(...) : String | Log4jJndiInjectionTest.java:606:68:606:84 | (...)... | provenance | Sink:MaD:394 |
+| Log4jJndiInjectionTest.java:606:77:606:84 | source(...) : String | Log4jJndiInjectionTest.java:606:68:606:84 | (...)... | provenance | Sink:MaD:393 |
+| Log4jJndiInjectionTest.java:607:62:607:69 | source(...) : String | Log4jJndiInjectionTest.java:607:53:607:69 | (...)... | provenance | Sink:MaD:394 |
+| Log4jJndiInjectionTest.java:607:62:607:69 | source(...) : String | Log4jJndiInjectionTest.java:607:53:607:69 | (...)... | provenance | Sink:MaD:393 |
+| Log4jJndiInjectionTest.java:608:137:608:144 | source(...) : String | Log4jJndiInjectionTest.java:608:128:608:144 | (...)... | provenance | Sink:MaD:396 |
+| Log4jJndiInjectionTest.java:608:137:608:144 | source(...) : String | Log4jJndiInjectionTest.java:608:128:608:144 | (...)... | provenance | Sink:MaD:395 |
+| Log4jJndiInjectionTest.java:609:122:609:129 | source(...) : String | Log4jJndiInjectionTest.java:609:113:609:129 | (...)... | provenance | Sink:MaD:396 |
+| Log4jJndiInjectionTest.java:609:122:609:129 | source(...) : String | Log4jJndiInjectionTest.java:609:113:609:129 | (...)... | provenance | Sink:MaD:395 |
+| Log4jJndiInjectionTest.java:610:107:610:114 | source(...) : String | Log4jJndiInjectionTest.java:610:98:610:114 | (...)... | provenance | Sink:MaD:396 |
+| Log4jJndiInjectionTest.java:610:107:610:114 | source(...) : String | Log4jJndiInjectionTest.java:610:98:610:114 | (...)... | provenance | Sink:MaD:395 |
+| Log4jJndiInjectionTest.java:611:92:611:99 | source(...) : String | Log4jJndiInjectionTest.java:611:83:611:99 | (...)... | provenance | Sink:MaD:396 |
+| Log4jJndiInjectionTest.java:611:92:611:99 | source(...) : String | Log4jJndiInjectionTest.java:611:83:611:99 | (...)... | provenance | Sink:MaD:395 |
+| Log4jJndiInjectionTest.java:612:77:612:84 | source(...) : String | Log4jJndiInjectionTest.java:612:68:612:84 | (...)... | provenance | Sink:MaD:396 |
+| Log4jJndiInjectionTest.java:612:77:612:84 | source(...) : String | Log4jJndiInjectionTest.java:612:68:612:84 | (...)... | provenance | Sink:MaD:395 |
+| Log4jJndiInjectionTest.java:613:62:613:69 | source(...) : String | Log4jJndiInjectionTest.java:613:53:613:69 | (...)... | provenance | Sink:MaD:396 |
+| Log4jJndiInjectionTest.java:613:62:613:69 | source(...) : String | Log4jJndiInjectionTest.java:613:53:613:69 | (...)... | provenance | Sink:MaD:395 |
+| Log4jJndiInjectionTest.java:614:152:614:159 | source(...) : String | Log4jJndiInjectionTest.java:614:143:614:159 | (...)... | provenance | Sink:MaD:398 |
+| Log4jJndiInjectionTest.java:614:152:614:159 | source(...) : String | Log4jJndiInjectionTest.java:614:143:614:159 | (...)... | provenance | Sink:MaD:397 |
+| Log4jJndiInjectionTest.java:615:137:615:144 | source(...) : String | Log4jJndiInjectionTest.java:615:128:615:144 | (...)... | provenance | Sink:MaD:398 |
+| Log4jJndiInjectionTest.java:615:137:615:144 | source(...) : String | Log4jJndiInjectionTest.java:615:128:615:144 | (...)... | provenance | Sink:MaD:397 |
+| Log4jJndiInjectionTest.java:616:122:616:129 | source(...) : String | Log4jJndiInjectionTest.java:616:113:616:129 | (...)... | provenance | Sink:MaD:398 |
+| Log4jJndiInjectionTest.java:616:122:616:129 | source(...) : String | Log4jJndiInjectionTest.java:616:113:616:129 | (...)... | provenance | Sink:MaD:397 |
+| Log4jJndiInjectionTest.java:617:107:617:114 | source(...) : String | Log4jJndiInjectionTest.java:617:98:617:114 | (...)... | provenance | Sink:MaD:398 |
+| Log4jJndiInjectionTest.java:617:107:617:114 | source(...) : String | Log4jJndiInjectionTest.java:617:98:617:114 | (...)... | provenance | Sink:MaD:397 |
+| Log4jJndiInjectionTest.java:618:92:618:99 | source(...) : String | Log4jJndiInjectionTest.java:618:83:618:99 | (...)... | provenance | Sink:MaD:398 |
+| Log4jJndiInjectionTest.java:618:92:618:99 | source(...) : String | Log4jJndiInjectionTest.java:618:83:618:99 | (...)... | provenance | Sink:MaD:397 |
+| Log4jJndiInjectionTest.java:619:77:619:84 | source(...) : String | Log4jJndiInjectionTest.java:619:68:619:84 | (...)... | provenance | Sink:MaD:398 |
+| Log4jJndiInjectionTest.java:619:77:619:84 | source(...) : String | Log4jJndiInjectionTest.java:619:68:619:84 | (...)... | provenance | Sink:MaD:397 |
+| Log4jJndiInjectionTest.java:620:62:620:69 | source(...) : String | Log4jJndiInjectionTest.java:620:53:620:69 | (...)... | provenance | Sink:MaD:398 |
+| Log4jJndiInjectionTest.java:620:62:620:69 | source(...) : String | Log4jJndiInjectionTest.java:620:53:620:69 | (...)... | provenance | Sink:MaD:397 |
+| Log4jJndiInjectionTest.java:621:167:621:174 | source(...) : String | Log4jJndiInjectionTest.java:621:158:621:174 | (...)... | provenance | Sink:MaD:400 |
+| Log4jJndiInjectionTest.java:621:167:621:174 | source(...) : String | Log4jJndiInjectionTest.java:621:158:621:174 | (...)... | provenance | Sink:MaD:399 |
+| Log4jJndiInjectionTest.java:622:152:622:159 | source(...) : String | Log4jJndiInjectionTest.java:622:143:622:159 | (...)... | provenance | Sink:MaD:400 |
+| Log4jJndiInjectionTest.java:622:152:622:159 | source(...) : String | Log4jJndiInjectionTest.java:622:143:622:159 | (...)... | provenance | Sink:MaD:399 |
+| Log4jJndiInjectionTest.java:623:137:623:144 | source(...) : String | Log4jJndiInjectionTest.java:623:128:623:144 | (...)... | provenance | Sink:MaD:400 |
+| Log4jJndiInjectionTest.java:623:137:623:144 | source(...) : String | Log4jJndiInjectionTest.java:623:128:623:144 | (...)... | provenance | Sink:MaD:399 |
+| Log4jJndiInjectionTest.java:624:122:624:129 | source(...) : String | Log4jJndiInjectionTest.java:624:113:624:129 | (...)... | provenance | Sink:MaD:400 |
+| Log4jJndiInjectionTest.java:624:122:624:129 | source(...) : String | Log4jJndiInjectionTest.java:624:113:624:129 | (...)... | provenance | Sink:MaD:399 |
+| Log4jJndiInjectionTest.java:625:107:625:114 | source(...) : String | Log4jJndiInjectionTest.java:625:98:625:114 | (...)... | provenance | Sink:MaD:400 |
+| Log4jJndiInjectionTest.java:625:107:625:114 | source(...) : String | Log4jJndiInjectionTest.java:625:98:625:114 | (...)... | provenance | Sink:MaD:399 |
+| Log4jJndiInjectionTest.java:626:92:626:99 | source(...) : String | Log4jJndiInjectionTest.java:626:83:626:99 | (...)... | provenance | Sink:MaD:400 |
+| Log4jJndiInjectionTest.java:626:92:626:99 | source(...) : String | Log4jJndiInjectionTest.java:626:83:626:99 | (...)... | provenance | Sink:MaD:399 |
+| Log4jJndiInjectionTest.java:627:77:627:84 | source(...) : String | Log4jJndiInjectionTest.java:627:68:627:84 | (...)... | provenance | Sink:MaD:400 |
+| Log4jJndiInjectionTest.java:627:77:627:84 | source(...) : String | Log4jJndiInjectionTest.java:627:68:627:84 | (...)... | provenance | Sink:MaD:399 |
+| Log4jJndiInjectionTest.java:628:62:628:69 | source(...) : String | Log4jJndiInjectionTest.java:628:53:628:69 | (...)... | provenance | Sink:MaD:400 |
+| Log4jJndiInjectionTest.java:628:62:628:69 | source(...) : String | Log4jJndiInjectionTest.java:628:53:628:69 | (...)... | provenance | Sink:MaD:399 |
+| Log4jJndiInjectionTest.java:629:182:629:189 | source(...) : String | Log4jJndiInjectionTest.java:629:173:629:189 | (...)... | provenance | Sink:MaD:402 |
+| Log4jJndiInjectionTest.java:629:182:629:189 | source(...) : String | Log4jJndiInjectionTest.java:629:173:629:189 | (...)... | provenance | Sink:MaD:401 |
+| Log4jJndiInjectionTest.java:630:167:630:174 | source(...) : String | Log4jJndiInjectionTest.java:630:158:630:174 | (...)... | provenance | Sink:MaD:402 |
+| Log4jJndiInjectionTest.java:630:167:630:174 | source(...) : String | Log4jJndiInjectionTest.java:630:158:630:174 | (...)... | provenance | Sink:MaD:401 |
+| Log4jJndiInjectionTest.java:631:152:631:159 | source(...) : String | Log4jJndiInjectionTest.java:631:143:631:159 | (...)... | provenance | Sink:MaD:402 |
+| Log4jJndiInjectionTest.java:631:152:631:159 | source(...) : String | Log4jJndiInjectionTest.java:631:143:631:159 | (...)... | provenance | Sink:MaD:401 |
+| Log4jJndiInjectionTest.java:632:137:632:144 | source(...) : String | Log4jJndiInjectionTest.java:632:128:632:144 | (...)... | provenance | Sink:MaD:402 |
+| Log4jJndiInjectionTest.java:632:137:632:144 | source(...) : String | Log4jJndiInjectionTest.java:632:128:632:144 | (...)... | provenance | Sink:MaD:401 |
+| Log4jJndiInjectionTest.java:633:122:633:129 | source(...) : String | Log4jJndiInjectionTest.java:633:113:633:129 | (...)... | provenance | Sink:MaD:402 |
+| Log4jJndiInjectionTest.java:633:122:633:129 | source(...) : String | Log4jJndiInjectionTest.java:633:113:633:129 | (...)... | provenance | Sink:MaD:401 |
+| Log4jJndiInjectionTest.java:634:107:634:114 | source(...) : String | Log4jJndiInjectionTest.java:634:98:634:114 | (...)... | provenance | Sink:MaD:402 |
+| Log4jJndiInjectionTest.java:634:107:634:114 | source(...) : String | Log4jJndiInjectionTest.java:634:98:634:114 | (...)... | provenance | Sink:MaD:401 |
+| Log4jJndiInjectionTest.java:635:92:635:99 | source(...) : String | Log4jJndiInjectionTest.java:635:83:635:99 | (...)... | provenance | Sink:MaD:402 |
+| Log4jJndiInjectionTest.java:635:92:635:99 | source(...) : String | Log4jJndiInjectionTest.java:635:83:635:99 | (...)... | provenance | Sink:MaD:401 |
+| Log4jJndiInjectionTest.java:636:77:636:84 | source(...) : String | Log4jJndiInjectionTest.java:636:68:636:84 | (...)... | provenance | Sink:MaD:402 |
+| Log4jJndiInjectionTest.java:636:77:636:84 | source(...) : String | Log4jJndiInjectionTest.java:636:68:636:84 | (...)... | provenance | Sink:MaD:401 |
+| Log4jJndiInjectionTest.java:637:62:637:69 | source(...) : String | Log4jJndiInjectionTest.java:637:53:637:69 | (...)... | provenance | Sink:MaD:402 |
+| Log4jJndiInjectionTest.java:637:62:637:69 | source(...) : String | Log4jJndiInjectionTest.java:637:53:637:69 | (...)... | provenance | Sink:MaD:401 |
+| Log4jJndiInjectionTest.java:638:197:638:204 | source(...) : String | Log4jJndiInjectionTest.java:638:188:638:204 | (...)... | provenance | Sink:MaD:404 |
+| Log4jJndiInjectionTest.java:638:197:638:204 | source(...) : String | Log4jJndiInjectionTest.java:638:188:638:204 | (...)... | provenance | Sink:MaD:403 |
+| Log4jJndiInjectionTest.java:639:182:639:189 | source(...) : String | Log4jJndiInjectionTest.java:639:173:639:189 | (...)... | provenance | Sink:MaD:404 |
+| Log4jJndiInjectionTest.java:639:182:639:189 | source(...) : String | Log4jJndiInjectionTest.java:639:173:639:189 | (...)... | provenance | Sink:MaD:403 |
+| Log4jJndiInjectionTest.java:640:167:640:174 | source(...) : String | Log4jJndiInjectionTest.java:640:158:640:174 | (...)... | provenance | Sink:MaD:404 |
+| Log4jJndiInjectionTest.java:640:167:640:174 | source(...) : String | Log4jJndiInjectionTest.java:640:158:640:174 | (...)... | provenance | Sink:MaD:403 |
+| Log4jJndiInjectionTest.java:641:152:641:159 | source(...) : String | Log4jJndiInjectionTest.java:641:143:641:159 | (...)... | provenance | Sink:MaD:404 |
+| Log4jJndiInjectionTest.java:641:152:641:159 | source(...) : String | Log4jJndiInjectionTest.java:641:143:641:159 | (...)... | provenance | Sink:MaD:403 |
+| Log4jJndiInjectionTest.java:642:137:642:144 | source(...) : String | Log4jJndiInjectionTest.java:642:128:642:144 | (...)... | provenance | Sink:MaD:404 |
+| Log4jJndiInjectionTest.java:642:137:642:144 | source(...) : String | Log4jJndiInjectionTest.java:642:128:642:144 | (...)... | provenance | Sink:MaD:403 |
+| Log4jJndiInjectionTest.java:643:122:643:129 | source(...) : String | Log4jJndiInjectionTest.java:643:113:643:129 | (...)... | provenance | Sink:MaD:404 |
+| Log4jJndiInjectionTest.java:643:122:643:129 | source(...) : String | Log4jJndiInjectionTest.java:643:113:643:129 | (...)... | provenance | Sink:MaD:403 |
+| Log4jJndiInjectionTest.java:644:107:644:114 | source(...) : String | Log4jJndiInjectionTest.java:644:98:644:114 | (...)... | provenance | Sink:MaD:404 |
+| Log4jJndiInjectionTest.java:644:107:644:114 | source(...) : String | Log4jJndiInjectionTest.java:644:98:644:114 | (...)... | provenance | Sink:MaD:403 |
+| Log4jJndiInjectionTest.java:645:92:645:99 | source(...) : String | Log4jJndiInjectionTest.java:645:83:645:99 | (...)... | provenance | Sink:MaD:404 |
+| Log4jJndiInjectionTest.java:645:92:645:99 | source(...) : String | Log4jJndiInjectionTest.java:645:83:645:99 | (...)... | provenance | Sink:MaD:403 |
+| Log4jJndiInjectionTest.java:646:77:646:84 | source(...) : String | Log4jJndiInjectionTest.java:646:68:646:84 | (...)... | provenance | Sink:MaD:404 |
+| Log4jJndiInjectionTest.java:646:77:646:84 | source(...) : String | Log4jJndiInjectionTest.java:646:68:646:84 | (...)... | provenance | Sink:MaD:403 |
+| Log4jJndiInjectionTest.java:647:62:647:69 | source(...) : String | Log4jJndiInjectionTest.java:647:53:647:69 | (...)... | provenance | Sink:MaD:404 |
+| Log4jJndiInjectionTest.java:647:62:647:69 | source(...) : String | Log4jJndiInjectionTest.java:647:53:647:69 | (...)... | provenance | Sink:MaD:403 |
+| Log4jJndiInjectionTest.java:648:62:648:69 | source(...) : String | Log4jJndiInjectionTest.java:648:53:648:69 | (...)... | provenance | Sink:MaD:388 |
+| Log4jJndiInjectionTest.java:648:62:648:69 | source(...) : String | Log4jJndiInjectionTest.java:648:53:648:69 | (...)... | provenance | Sink:MaD:387 |
+| Log4jJndiInjectionTest.java:649:82:649:89 | source(...) : String | Log4jJndiInjectionTest.java:649:68:649:89 | (...)... | provenance | Sink:MaD:388 |
+| Log4jJndiInjectionTest.java:649:82:649:89 | source(...) : String | Log4jJndiInjectionTest.java:649:68:649:89 | (...)... | provenance | Sink:MaD:387 |
+| Log4jJndiInjectionTest.java:650:62:650:69 | source(...) : String | Log4jJndiInjectionTest.java:650:53:650:69 | (...)... | provenance | Sink:MaD:408 |
+| Log4jJndiInjectionTest.java:650:62:650:69 | source(...) : String | Log4jJndiInjectionTest.java:650:53:650:69 | (...)... | provenance | Sink:MaD:407 |
+| Log4jJndiInjectionTest.java:651:67:651:74 | source(...) : String | Log4jJndiInjectionTest.java:651:53:651:74 | (...)... | provenance | Sink:MaD:410 |
+| Log4jJndiInjectionTest.java:651:67:651:74 | source(...) : String | Log4jJndiInjectionTest.java:651:53:651:74 | (...)... | provenance | Sink:MaD:409 |
+| Log4jJndiInjectionTest.java:652:67:652:74 | source(...) : String | Log4jJndiInjectionTest.java:652:53:652:74 | (...)... | provenance | Sink:MaD:412 |
+| Log4jJndiInjectionTest.java:652:67:652:74 | source(...) : String | Log4jJndiInjectionTest.java:652:53:652:74 | (...)... | provenance | Sink:MaD:411 |
+| Log4jJndiInjectionTest.java:653:56:653:63 | source(...) : String | Log4jJndiInjectionTest.java:653:38:653:63 | (...)... | provenance | Sink:MaD:418 |
+| Log4jJndiInjectionTest.java:653:56:653:63 | source(...) : String | Log4jJndiInjectionTest.java:653:38:653:63 | (...)... | provenance | Sink:MaD:417 |
+| Log4jJndiInjectionTest.java:654:56:654:63 | source(...) : String | Log4jJndiInjectionTest.java:654:38:654:63 | (...)... | provenance | Sink:MaD:420 |
+| Log4jJndiInjectionTest.java:654:56:654:63 | source(...) : String | Log4jJndiInjectionTest.java:654:38:654:63 | (...)... | provenance | Sink:MaD:419 |
+| Log4jJndiInjectionTest.java:655:48:655:55 | source(...) : String | Log4jJndiInjectionTest.java:655:38:655:55 | (...)... | provenance | Sink:MaD:414 |
+| Log4jJndiInjectionTest.java:655:48:655:55 | source(...) : String | Log4jJndiInjectionTest.java:655:38:655:55 | (...)... | provenance | Sink:MaD:413 |
+| Log4jJndiInjectionTest.java:656:48:656:55 | source(...) : String | Log4jJndiInjectionTest.java:656:38:656:55 | (...)... | provenance | Sink:MaD:416 |
+| Log4jJndiInjectionTest.java:656:48:656:55 | source(...) : String | Log4jJndiInjectionTest.java:656:38:656:55 | (...)... | provenance | Sink:MaD:415 |
+| Log4jJndiInjectionTest.java:659:47:659:54 | source(...) : String | Log4jJndiInjectionTest.java:659:38:659:54 | (...)... | provenance | Sink:MaD:426 |
+| Log4jJndiInjectionTest.java:659:47:659:54 | source(...) : String | Log4jJndiInjectionTest.java:659:38:659:54 | (...)... | provenance | Sink:MaD:425 |
+| Log4jJndiInjectionTest.java:660:47:660:54 | source(...) : String | Log4jJndiInjectionTest.java:660:38:660:54 | (...)... | provenance | Sink:MaD:446 |
+| Log4jJndiInjectionTest.java:660:47:660:54 | source(...) : String | Log4jJndiInjectionTest.java:660:38:660:54 | (...)... | provenance | Sink:MaD:445 |
+| Log4jJndiInjectionTest.java:661:53:661:75 | {...} : Object[] [[]] : String | Log4jJndiInjectionTest.java:661:53:661:75 | new Object[] | provenance | Sink:MaD:446 |
+| Log4jJndiInjectionTest.java:661:53:661:75 | {...} : Object[] [[]] : String | Log4jJndiInjectionTest.java:661:53:661:75 | new Object[] | provenance | Sink:MaD:445 |
 | Log4jJndiInjectionTest.java:661:67:661:74 | source(...) : String | Log4jJndiInjectionTest.java:661:53:661:75 | {...} : Object[] [[]] : String | provenance |  |
-| Log4jJndiInjectionTest.java:662:62:662:69 | source(...) : String | Log4jJndiInjectionTest.java:662:53:662:69 | (...)... | provenance |  Sink:MaD:220 |
-| Log4jJndiInjectionTest.java:662:62:662:69 | source(...) : String | Log4jJndiInjectionTest.java:662:53:662:69 | (...)... | provenance |  Sink:MaD:536 |
-| Log4jJndiInjectionTest.java:663:47:663:54 | source(...) : String | Log4jJndiInjectionTest.java:663:38:663:54 | (...)... | provenance |  Sink:MaD:220 |
-| Log4jJndiInjectionTest.java:663:47:663:54 | source(...) : String | Log4jJndiInjectionTest.java:663:38:663:54 | (...)... | provenance |  Sink:MaD:536 |
-| Log4jJndiInjectionTest.java:664:77:664:84 | source(...) : String | Log4jJndiInjectionTest.java:664:68:664:84 | (...)... | provenance |  Sink:MaD:221 |
-| Log4jJndiInjectionTest.java:664:77:664:84 | source(...) : String | Log4jJndiInjectionTest.java:664:68:664:84 | (...)... | provenance |  Sink:MaD:537 |
-| Log4jJndiInjectionTest.java:665:62:665:69 | source(...) : String | Log4jJndiInjectionTest.java:665:53:665:69 | (...)... | provenance |  Sink:MaD:221 |
-| Log4jJndiInjectionTest.java:665:62:665:69 | source(...) : String | Log4jJndiInjectionTest.java:665:53:665:69 | (...)... | provenance |  Sink:MaD:537 |
-| Log4jJndiInjectionTest.java:666:47:666:54 | source(...) : String | Log4jJndiInjectionTest.java:666:38:666:54 | (...)... | provenance |  Sink:MaD:221 |
-| Log4jJndiInjectionTest.java:666:47:666:54 | source(...) : String | Log4jJndiInjectionTest.java:666:38:666:54 | (...)... | provenance |  Sink:MaD:537 |
-| Log4jJndiInjectionTest.java:667:92:667:99 | source(...) : String | Log4jJndiInjectionTest.java:667:83:667:99 | (...)... | provenance |  Sink:MaD:222 |
-| Log4jJndiInjectionTest.java:667:92:667:99 | source(...) : String | Log4jJndiInjectionTest.java:667:83:667:99 | (...)... | provenance |  Sink:MaD:538 |
-| Log4jJndiInjectionTest.java:668:77:668:84 | source(...) : String | Log4jJndiInjectionTest.java:668:68:668:84 | (...)... | provenance |  Sink:MaD:222 |
-| Log4jJndiInjectionTest.java:668:77:668:84 | source(...) : String | Log4jJndiInjectionTest.java:668:68:668:84 | (...)... | provenance |  Sink:MaD:538 |
-| Log4jJndiInjectionTest.java:669:62:669:69 | source(...) : String | Log4jJndiInjectionTest.java:669:53:669:69 | (...)... | provenance |  Sink:MaD:222 |
-| Log4jJndiInjectionTest.java:669:62:669:69 | source(...) : String | Log4jJndiInjectionTest.java:669:53:669:69 | (...)... | provenance |  Sink:MaD:538 |
-| Log4jJndiInjectionTest.java:670:47:670:54 | source(...) : String | Log4jJndiInjectionTest.java:670:38:670:54 | (...)... | provenance |  Sink:MaD:222 |
-| Log4jJndiInjectionTest.java:670:47:670:54 | source(...) : String | Log4jJndiInjectionTest.java:670:38:670:54 | (...)... | provenance |  Sink:MaD:538 |
-| Log4jJndiInjectionTest.java:671:107:671:114 | source(...) : String | Log4jJndiInjectionTest.java:671:98:671:114 | (...)... | provenance |  Sink:MaD:223 |
-| Log4jJndiInjectionTest.java:671:107:671:114 | source(...) : String | Log4jJndiInjectionTest.java:671:98:671:114 | (...)... | provenance |  Sink:MaD:539 |
-| Log4jJndiInjectionTest.java:672:92:672:99 | source(...) : String | Log4jJndiInjectionTest.java:672:83:672:99 | (...)... | provenance |  Sink:MaD:223 |
-| Log4jJndiInjectionTest.java:672:92:672:99 | source(...) : String | Log4jJndiInjectionTest.java:672:83:672:99 | (...)... | provenance |  Sink:MaD:539 |
-| Log4jJndiInjectionTest.java:673:77:673:84 | source(...) : String | Log4jJndiInjectionTest.java:673:68:673:84 | (...)... | provenance |  Sink:MaD:223 |
-| Log4jJndiInjectionTest.java:673:77:673:84 | source(...) : String | Log4jJndiInjectionTest.java:673:68:673:84 | (...)... | provenance |  Sink:MaD:539 |
-| Log4jJndiInjectionTest.java:674:62:674:69 | source(...) : String | Log4jJndiInjectionTest.java:674:53:674:69 | (...)... | provenance |  Sink:MaD:223 |
-| Log4jJndiInjectionTest.java:674:62:674:69 | source(...) : String | Log4jJndiInjectionTest.java:674:53:674:69 | (...)... | provenance |  Sink:MaD:539 |
-| Log4jJndiInjectionTest.java:675:47:675:54 | source(...) : String | Log4jJndiInjectionTest.java:675:38:675:54 | (...)... | provenance |  Sink:MaD:223 |
-| Log4jJndiInjectionTest.java:675:47:675:54 | source(...) : String | Log4jJndiInjectionTest.java:675:38:675:54 | (...)... | provenance |  Sink:MaD:539 |
-| Log4jJndiInjectionTest.java:676:122:676:129 | source(...) : String | Log4jJndiInjectionTest.java:676:113:676:129 | (...)... | provenance |  Sink:MaD:224 |
-| Log4jJndiInjectionTest.java:676:122:676:129 | source(...) : String | Log4jJndiInjectionTest.java:676:113:676:129 | (...)... | provenance |  Sink:MaD:540 |
-| Log4jJndiInjectionTest.java:677:107:677:114 | source(...) : String | Log4jJndiInjectionTest.java:677:98:677:114 | (...)... | provenance |  Sink:MaD:224 |
-| Log4jJndiInjectionTest.java:677:107:677:114 | source(...) : String | Log4jJndiInjectionTest.java:677:98:677:114 | (...)... | provenance |  Sink:MaD:540 |
-| Log4jJndiInjectionTest.java:678:92:678:99 | source(...) : String | Log4jJndiInjectionTest.java:678:83:678:99 | (...)... | provenance |  Sink:MaD:224 |
-| Log4jJndiInjectionTest.java:678:92:678:99 | source(...) : String | Log4jJndiInjectionTest.java:678:83:678:99 | (...)... | provenance |  Sink:MaD:540 |
-| Log4jJndiInjectionTest.java:679:77:679:84 | source(...) : String | Log4jJndiInjectionTest.java:679:68:679:84 | (...)... | provenance |  Sink:MaD:224 |
-| Log4jJndiInjectionTest.java:679:77:679:84 | source(...) : String | Log4jJndiInjectionTest.java:679:68:679:84 | (...)... | provenance |  Sink:MaD:540 |
-| Log4jJndiInjectionTest.java:680:62:680:69 | source(...) : String | Log4jJndiInjectionTest.java:680:53:680:69 | (...)... | provenance |  Sink:MaD:224 |
-| Log4jJndiInjectionTest.java:680:62:680:69 | source(...) : String | Log4jJndiInjectionTest.java:680:53:680:69 | (...)... | provenance |  Sink:MaD:540 |
-| Log4jJndiInjectionTest.java:681:47:681:54 | source(...) : String | Log4jJndiInjectionTest.java:681:38:681:54 | (...)... | provenance |  Sink:MaD:224 |
-| Log4jJndiInjectionTest.java:681:47:681:54 | source(...) : String | Log4jJndiInjectionTest.java:681:38:681:54 | (...)... | provenance |  Sink:MaD:540 |
-| Log4jJndiInjectionTest.java:682:137:682:144 | source(...) : String | Log4jJndiInjectionTest.java:682:128:682:144 | (...)... | provenance |  Sink:MaD:225 |
-| Log4jJndiInjectionTest.java:682:137:682:144 | source(...) : String | Log4jJndiInjectionTest.java:682:128:682:144 | (...)... | provenance |  Sink:MaD:541 |
-| Log4jJndiInjectionTest.java:683:122:683:129 | source(...) : String | Log4jJndiInjectionTest.java:683:113:683:129 | (...)... | provenance |  Sink:MaD:225 |
-| Log4jJndiInjectionTest.java:683:122:683:129 | source(...) : String | Log4jJndiInjectionTest.java:683:113:683:129 | (...)... | provenance |  Sink:MaD:541 |
-| Log4jJndiInjectionTest.java:684:107:684:114 | source(...) : String | Log4jJndiInjectionTest.java:684:98:684:114 | (...)... | provenance |  Sink:MaD:225 |
-| Log4jJndiInjectionTest.java:684:107:684:114 | source(...) : String | Log4jJndiInjectionTest.java:684:98:684:114 | (...)... | provenance |  Sink:MaD:541 |
-| Log4jJndiInjectionTest.java:685:92:685:99 | source(...) : String | Log4jJndiInjectionTest.java:685:83:685:99 | (...)... | provenance |  Sink:MaD:225 |
-| Log4jJndiInjectionTest.java:685:92:685:99 | source(...) : String | Log4jJndiInjectionTest.java:685:83:685:99 | (...)... | provenance |  Sink:MaD:541 |
-| Log4jJndiInjectionTest.java:686:77:686:84 | source(...) : String | Log4jJndiInjectionTest.java:686:68:686:84 | (...)... | provenance |  Sink:MaD:225 |
-| Log4jJndiInjectionTest.java:686:77:686:84 | source(...) : String | Log4jJndiInjectionTest.java:686:68:686:84 | (...)... | provenance |  Sink:MaD:541 |
-| Log4jJndiInjectionTest.java:687:62:687:69 | source(...) : String | Log4jJndiInjectionTest.java:687:53:687:69 | (...)... | provenance |  Sink:MaD:225 |
-| Log4jJndiInjectionTest.java:687:62:687:69 | source(...) : String | Log4jJndiInjectionTest.java:687:53:687:69 | (...)... | provenance |  Sink:MaD:541 |
-| Log4jJndiInjectionTest.java:688:47:688:54 | source(...) : String | Log4jJndiInjectionTest.java:688:38:688:54 | (...)... | provenance |  Sink:MaD:225 |
-| Log4jJndiInjectionTest.java:688:47:688:54 | source(...) : String | Log4jJndiInjectionTest.java:688:38:688:54 | (...)... | provenance |  Sink:MaD:541 |
-| Log4jJndiInjectionTest.java:689:152:689:159 | source(...) : String | Log4jJndiInjectionTest.java:689:143:689:159 | (...)... | provenance |  Sink:MaD:226 |
-| Log4jJndiInjectionTest.java:689:152:689:159 | source(...) : String | Log4jJndiInjectionTest.java:689:143:689:159 | (...)... | provenance |  Sink:MaD:542 |
-| Log4jJndiInjectionTest.java:690:137:690:144 | source(...) : String | Log4jJndiInjectionTest.java:690:128:690:144 | (...)... | provenance |  Sink:MaD:226 |
-| Log4jJndiInjectionTest.java:690:137:690:144 | source(...) : String | Log4jJndiInjectionTest.java:690:128:690:144 | (...)... | provenance |  Sink:MaD:542 |
-| Log4jJndiInjectionTest.java:691:122:691:129 | source(...) : String | Log4jJndiInjectionTest.java:691:113:691:129 | (...)... | provenance |  Sink:MaD:226 |
-| Log4jJndiInjectionTest.java:691:122:691:129 | source(...) : String | Log4jJndiInjectionTest.java:691:113:691:129 | (...)... | provenance |  Sink:MaD:542 |
-| Log4jJndiInjectionTest.java:692:107:692:114 | source(...) : String | Log4jJndiInjectionTest.java:692:98:692:114 | (...)... | provenance |  Sink:MaD:226 |
-| Log4jJndiInjectionTest.java:692:107:692:114 | source(...) : String | Log4jJndiInjectionTest.java:692:98:692:114 | (...)... | provenance |  Sink:MaD:542 |
-| Log4jJndiInjectionTest.java:693:92:693:99 | source(...) : String | Log4jJndiInjectionTest.java:693:83:693:99 | (...)... | provenance |  Sink:MaD:226 |
-| Log4jJndiInjectionTest.java:693:92:693:99 | source(...) : String | Log4jJndiInjectionTest.java:693:83:693:99 | (...)... | provenance |  Sink:MaD:542 |
-| Log4jJndiInjectionTest.java:694:77:694:84 | source(...) : String | Log4jJndiInjectionTest.java:694:68:694:84 | (...)... | provenance |  Sink:MaD:226 |
-| Log4jJndiInjectionTest.java:694:77:694:84 | source(...) : String | Log4jJndiInjectionTest.java:694:68:694:84 | (...)... | provenance |  Sink:MaD:542 |
-| Log4jJndiInjectionTest.java:695:62:695:69 | source(...) : String | Log4jJndiInjectionTest.java:695:53:695:69 | (...)... | provenance |  Sink:MaD:226 |
-| Log4jJndiInjectionTest.java:695:62:695:69 | source(...) : String | Log4jJndiInjectionTest.java:695:53:695:69 | (...)... | provenance |  Sink:MaD:542 |
-| Log4jJndiInjectionTest.java:696:47:696:54 | source(...) : String | Log4jJndiInjectionTest.java:696:38:696:54 | (...)... | provenance |  Sink:MaD:226 |
-| Log4jJndiInjectionTest.java:696:47:696:54 | source(...) : String | Log4jJndiInjectionTest.java:696:38:696:54 | (...)... | provenance |  Sink:MaD:542 |
-| Log4jJndiInjectionTest.java:697:167:697:174 | source(...) : String | Log4jJndiInjectionTest.java:697:158:697:174 | (...)... | provenance |  Sink:MaD:227 |
-| Log4jJndiInjectionTest.java:697:167:697:174 | source(...) : String | Log4jJndiInjectionTest.java:697:158:697:174 | (...)... | provenance |  Sink:MaD:543 |
-| Log4jJndiInjectionTest.java:698:152:698:159 | source(...) : String | Log4jJndiInjectionTest.java:698:143:698:159 | (...)... | provenance |  Sink:MaD:227 |
-| Log4jJndiInjectionTest.java:698:152:698:159 | source(...) : String | Log4jJndiInjectionTest.java:698:143:698:159 | (...)... | provenance |  Sink:MaD:543 |
-| Log4jJndiInjectionTest.java:699:137:699:144 | source(...) : String | Log4jJndiInjectionTest.java:699:128:699:144 | (...)... | provenance |  Sink:MaD:227 |
-| Log4jJndiInjectionTest.java:699:137:699:144 | source(...) : String | Log4jJndiInjectionTest.java:699:128:699:144 | (...)... | provenance |  Sink:MaD:543 |
-| Log4jJndiInjectionTest.java:700:122:700:129 | source(...) : String | Log4jJndiInjectionTest.java:700:113:700:129 | (...)... | provenance |  Sink:MaD:227 |
-| Log4jJndiInjectionTest.java:700:122:700:129 | source(...) : String | Log4jJndiInjectionTest.java:700:113:700:129 | (...)... | provenance |  Sink:MaD:543 |
-| Log4jJndiInjectionTest.java:701:107:701:114 | source(...) : String | Log4jJndiInjectionTest.java:701:98:701:114 | (...)... | provenance |  Sink:MaD:227 |
-| Log4jJndiInjectionTest.java:701:107:701:114 | source(...) : String | Log4jJndiInjectionTest.java:701:98:701:114 | (...)... | provenance |  Sink:MaD:543 |
-| Log4jJndiInjectionTest.java:702:92:702:99 | source(...) : String | Log4jJndiInjectionTest.java:702:83:702:99 | (...)... | provenance |  Sink:MaD:227 |
-| Log4jJndiInjectionTest.java:702:92:702:99 | source(...) : String | Log4jJndiInjectionTest.java:702:83:702:99 | (...)... | provenance |  Sink:MaD:543 |
-| Log4jJndiInjectionTest.java:703:77:703:84 | source(...) : String | Log4jJndiInjectionTest.java:703:68:703:84 | (...)... | provenance |  Sink:MaD:227 |
-| Log4jJndiInjectionTest.java:703:77:703:84 | source(...) : String | Log4jJndiInjectionTest.java:703:68:703:84 | (...)... | provenance |  Sink:MaD:543 |
-| Log4jJndiInjectionTest.java:704:62:704:69 | source(...) : String | Log4jJndiInjectionTest.java:704:53:704:69 | (...)... | provenance |  Sink:MaD:227 |
-| Log4jJndiInjectionTest.java:704:62:704:69 | source(...) : String | Log4jJndiInjectionTest.java:704:53:704:69 | (...)... | provenance |  Sink:MaD:543 |
-| Log4jJndiInjectionTest.java:705:47:705:54 | source(...) : String | Log4jJndiInjectionTest.java:705:38:705:54 | (...)... | provenance |  Sink:MaD:227 |
-| Log4jJndiInjectionTest.java:705:47:705:54 | source(...) : String | Log4jJndiInjectionTest.java:705:38:705:54 | (...)... | provenance |  Sink:MaD:543 |
-| Log4jJndiInjectionTest.java:706:182:706:189 | source(...) : String | Log4jJndiInjectionTest.java:706:173:706:189 | (...)... | provenance |  Sink:MaD:228 |
-| Log4jJndiInjectionTest.java:706:182:706:189 | source(...) : String | Log4jJndiInjectionTest.java:706:173:706:189 | (...)... | provenance |  Sink:MaD:544 |
-| Log4jJndiInjectionTest.java:707:167:707:174 | source(...) : String | Log4jJndiInjectionTest.java:707:158:707:174 | (...)... | provenance |  Sink:MaD:228 |
-| Log4jJndiInjectionTest.java:707:167:707:174 | source(...) : String | Log4jJndiInjectionTest.java:707:158:707:174 | (...)... | provenance |  Sink:MaD:544 |
-| Log4jJndiInjectionTest.java:708:152:708:159 | source(...) : String | Log4jJndiInjectionTest.java:708:143:708:159 | (...)... | provenance |  Sink:MaD:228 |
-| Log4jJndiInjectionTest.java:708:152:708:159 | source(...) : String | Log4jJndiInjectionTest.java:708:143:708:159 | (...)... | provenance |  Sink:MaD:544 |
-| Log4jJndiInjectionTest.java:709:137:709:144 | source(...) : String | Log4jJndiInjectionTest.java:709:128:709:144 | (...)... | provenance |  Sink:MaD:228 |
-| Log4jJndiInjectionTest.java:709:137:709:144 | source(...) : String | Log4jJndiInjectionTest.java:709:128:709:144 | (...)... | provenance |  Sink:MaD:544 |
-| Log4jJndiInjectionTest.java:710:122:710:129 | source(...) : String | Log4jJndiInjectionTest.java:710:113:710:129 | (...)... | provenance |  Sink:MaD:228 |
-| Log4jJndiInjectionTest.java:710:122:710:129 | source(...) : String | Log4jJndiInjectionTest.java:710:113:710:129 | (...)... | provenance |  Sink:MaD:544 |
-| Log4jJndiInjectionTest.java:711:107:711:114 | source(...) : String | Log4jJndiInjectionTest.java:711:98:711:114 | (...)... | provenance |  Sink:MaD:228 |
-| Log4jJndiInjectionTest.java:711:107:711:114 | source(...) : String | Log4jJndiInjectionTest.java:711:98:711:114 | (...)... | provenance |  Sink:MaD:544 |
-| Log4jJndiInjectionTest.java:712:92:712:99 | source(...) : String | Log4jJndiInjectionTest.java:712:83:712:99 | (...)... | provenance |  Sink:MaD:228 |
-| Log4jJndiInjectionTest.java:712:92:712:99 | source(...) : String | Log4jJndiInjectionTest.java:712:83:712:99 | (...)... | provenance |  Sink:MaD:544 |
-| Log4jJndiInjectionTest.java:713:77:713:84 | source(...) : String | Log4jJndiInjectionTest.java:713:68:713:84 | (...)... | provenance |  Sink:MaD:228 |
-| Log4jJndiInjectionTest.java:713:77:713:84 | source(...) : String | Log4jJndiInjectionTest.java:713:68:713:84 | (...)... | provenance |  Sink:MaD:544 |
-| Log4jJndiInjectionTest.java:714:62:714:69 | source(...) : String | Log4jJndiInjectionTest.java:714:53:714:69 | (...)... | provenance |  Sink:MaD:228 |
-| Log4jJndiInjectionTest.java:714:62:714:69 | source(...) : String | Log4jJndiInjectionTest.java:714:53:714:69 | (...)... | provenance |  Sink:MaD:544 |
-| Log4jJndiInjectionTest.java:715:47:715:54 | source(...) : String | Log4jJndiInjectionTest.java:715:38:715:54 | (...)... | provenance |  Sink:MaD:228 |
-| Log4jJndiInjectionTest.java:715:47:715:54 | source(...) : String | Log4jJndiInjectionTest.java:715:38:715:54 | (...)... | provenance |  Sink:MaD:544 |
-| Log4jJndiInjectionTest.java:716:47:716:54 | source(...) : String | Log4jJndiInjectionTest.java:716:38:716:54 | (...)... | provenance |  Sink:MaD:220 |
-| Log4jJndiInjectionTest.java:716:47:716:54 | source(...) : String | Log4jJndiInjectionTest.java:716:38:716:54 | (...)... | provenance |  Sink:MaD:536 |
-| Log4jJndiInjectionTest.java:717:67:717:74 | source(...) : String | Log4jJndiInjectionTest.java:717:53:717:74 | (...)... | provenance |  Sink:MaD:220 |
-| Log4jJndiInjectionTest.java:717:67:717:74 | source(...) : String | Log4jJndiInjectionTest.java:717:53:717:74 | (...)... | provenance |  Sink:MaD:536 |
-| Log4jJndiInjectionTest.java:718:47:718:54 | source(...) : String | Log4jJndiInjectionTest.java:718:38:718:54 | (...)... | provenance |  Sink:MaD:230 |
-| Log4jJndiInjectionTest.java:718:47:718:54 | source(...) : String | Log4jJndiInjectionTest.java:718:38:718:54 | (...)... | provenance |  Sink:MaD:546 |
-| Log4jJndiInjectionTest.java:719:52:719:59 | source(...) : String | Log4jJndiInjectionTest.java:719:38:719:59 | (...)... | provenance |  Sink:MaD:231 |
-| Log4jJndiInjectionTest.java:719:52:719:59 | source(...) : String | Log4jJndiInjectionTest.java:719:38:719:59 | (...)... | provenance |  Sink:MaD:547 |
-| Log4jJndiInjectionTest.java:720:52:720:59 | source(...) : String | Log4jJndiInjectionTest.java:720:38:720:59 | (...)... | provenance |  Sink:MaD:232 |
-| Log4jJndiInjectionTest.java:720:52:720:59 | source(...) : String | Log4jJndiInjectionTest.java:720:38:720:59 | (...)... | provenance |  Sink:MaD:548 |
-| Log4jJndiInjectionTest.java:721:41:721:48 | source(...) : String | Log4jJndiInjectionTest.java:721:26:721:48 | (...)... | provenance |  Sink:MaD:236 |
-| Log4jJndiInjectionTest.java:721:41:721:48 | source(...) : String | Log4jJndiInjectionTest.java:721:26:721:48 | (...)... | provenance |  Sink:MaD:552 |
-| Log4jJndiInjectionTest.java:722:41:722:48 | source(...) : String | Log4jJndiInjectionTest.java:722:26:722:48 | (...)... | provenance |  Sink:MaD:237 |
-| Log4jJndiInjectionTest.java:722:41:722:48 | source(...) : String | Log4jJndiInjectionTest.java:722:26:722:48 | (...)... | provenance |  Sink:MaD:553 |
-| Log4jJndiInjectionTest.java:723:56:723:63 | source(...) : String | Log4jJndiInjectionTest.java:723:41:723:63 | (...)... | provenance |  Sink:MaD:238 |
-| Log4jJndiInjectionTest.java:723:56:723:63 | source(...) : String | Log4jJndiInjectionTest.java:723:41:723:63 | (...)... | provenance |  Sink:MaD:554 |
-| Log4jJndiInjectionTest.java:724:56:724:63 | source(...) : String | Log4jJndiInjectionTest.java:724:41:724:63 | (...)... | provenance |  Sink:MaD:239 |
-| Log4jJndiInjectionTest.java:724:56:724:63 | source(...) : String | Log4jJndiInjectionTest.java:724:41:724:63 | (...)... | provenance |  Sink:MaD:555 |
-| Log4jJndiInjectionTest.java:725:51:725:58 | source(...) : String | Log4jJndiInjectionTest.java:725:41:725:58 | (...)... | provenance |  Sink:MaD:240 |
-| Log4jJndiInjectionTest.java:725:51:725:58 | source(...) : String | Log4jJndiInjectionTest.java:725:41:725:58 | (...)... | provenance |  Sink:MaD:556 |
-| Log4jJndiInjectionTest.java:726:59:726:66 | source(...) : String | Log4jJndiInjectionTest.java:726:41:726:66 | (...)... | provenance |  Sink:MaD:241 |
-| Log4jJndiInjectionTest.java:726:59:726:66 | source(...) : String | Log4jJndiInjectionTest.java:726:41:726:66 | (...)... | provenance |  Sink:MaD:557 |
-| Log4jJndiInjectionTest.java:727:59:727:66 | source(...) : String | Log4jJndiInjectionTest.java:727:41:727:66 | (...)... | provenance |  Sink:MaD:242 |
-| Log4jJndiInjectionTest.java:727:59:727:66 | source(...) : String | Log4jJndiInjectionTest.java:727:41:727:66 | (...)... | provenance |  Sink:MaD:558 |
-| Log4jJndiInjectionTest.java:729:50:729:57 | source(...) : String | Log4jJndiInjectionTest.java:729:41:729:57 | (...)... | provenance |  Sink:MaD:244 |
-| Log4jJndiInjectionTest.java:729:50:729:57 | source(...) : String | Log4jJndiInjectionTest.java:729:41:729:57 | (...)... | provenance |  Sink:MaD:560 |
-| Log4jJndiInjectionTest.java:730:50:730:57 | source(...) : String | Log4jJndiInjectionTest.java:730:41:730:57 | (...)... | provenance |  Sink:MaD:254 |
-| Log4jJndiInjectionTest.java:730:50:730:57 | source(...) : String | Log4jJndiInjectionTest.java:730:41:730:57 | (...)... | provenance |  Sink:MaD:570 |
-| Log4jJndiInjectionTest.java:731:56:731:78 | {...} : Object[] [[]] : String | Log4jJndiInjectionTest.java:731:56:731:78 | new Object[] | provenance |  Sink:MaD:254 |
-| Log4jJndiInjectionTest.java:731:56:731:78 | {...} : Object[] [[]] : String | Log4jJndiInjectionTest.java:731:56:731:78 | new Object[] | provenance |  Sink:MaD:570 |
+| Log4jJndiInjectionTest.java:662:62:662:69 | source(...) : String | Log4jJndiInjectionTest.java:662:53:662:69 | (...)... | provenance | Sink:MaD:428 |
+| Log4jJndiInjectionTest.java:662:62:662:69 | source(...) : String | Log4jJndiInjectionTest.java:662:53:662:69 | (...)... | provenance | Sink:MaD:427 |
+| Log4jJndiInjectionTest.java:663:47:663:54 | source(...) : String | Log4jJndiInjectionTest.java:663:38:663:54 | (...)... | provenance | Sink:MaD:428 |
+| Log4jJndiInjectionTest.java:663:47:663:54 | source(...) : String | Log4jJndiInjectionTest.java:663:38:663:54 | (...)... | provenance | Sink:MaD:427 |
+| Log4jJndiInjectionTest.java:664:77:664:84 | source(...) : String | Log4jJndiInjectionTest.java:664:68:664:84 | (...)... | provenance | Sink:MaD:430 |
+| Log4jJndiInjectionTest.java:664:77:664:84 | source(...) : String | Log4jJndiInjectionTest.java:664:68:664:84 | (...)... | provenance | Sink:MaD:429 |
+| Log4jJndiInjectionTest.java:665:62:665:69 | source(...) : String | Log4jJndiInjectionTest.java:665:53:665:69 | (...)... | provenance | Sink:MaD:430 |
+| Log4jJndiInjectionTest.java:665:62:665:69 | source(...) : String | Log4jJndiInjectionTest.java:665:53:665:69 | (...)... | provenance | Sink:MaD:429 |
+| Log4jJndiInjectionTest.java:666:47:666:54 | source(...) : String | Log4jJndiInjectionTest.java:666:38:666:54 | (...)... | provenance | Sink:MaD:430 |
+| Log4jJndiInjectionTest.java:666:47:666:54 | source(...) : String | Log4jJndiInjectionTest.java:666:38:666:54 | (...)... | provenance | Sink:MaD:429 |
+| Log4jJndiInjectionTest.java:667:92:667:99 | source(...) : String | Log4jJndiInjectionTest.java:667:83:667:99 | (...)... | provenance | Sink:MaD:432 |
+| Log4jJndiInjectionTest.java:667:92:667:99 | source(...) : String | Log4jJndiInjectionTest.java:667:83:667:99 | (...)... | provenance | Sink:MaD:431 |
+| Log4jJndiInjectionTest.java:668:77:668:84 | source(...) : String | Log4jJndiInjectionTest.java:668:68:668:84 | (...)... | provenance | Sink:MaD:432 |
+| Log4jJndiInjectionTest.java:668:77:668:84 | source(...) : String | Log4jJndiInjectionTest.java:668:68:668:84 | (...)... | provenance | Sink:MaD:431 |
+| Log4jJndiInjectionTest.java:669:62:669:69 | source(...) : String | Log4jJndiInjectionTest.java:669:53:669:69 | (...)... | provenance | Sink:MaD:432 |
+| Log4jJndiInjectionTest.java:669:62:669:69 | source(...) : String | Log4jJndiInjectionTest.java:669:53:669:69 | (...)... | provenance | Sink:MaD:431 |
+| Log4jJndiInjectionTest.java:670:47:670:54 | source(...) : String | Log4jJndiInjectionTest.java:670:38:670:54 | (...)... | provenance | Sink:MaD:432 |
+| Log4jJndiInjectionTest.java:670:47:670:54 | source(...) : String | Log4jJndiInjectionTest.java:670:38:670:54 | (...)... | provenance | Sink:MaD:431 |
+| Log4jJndiInjectionTest.java:671:107:671:114 | source(...) : String | Log4jJndiInjectionTest.java:671:98:671:114 | (...)... | provenance | Sink:MaD:434 |
+| Log4jJndiInjectionTest.java:671:107:671:114 | source(...) : String | Log4jJndiInjectionTest.java:671:98:671:114 | (...)... | provenance | Sink:MaD:433 |
+| Log4jJndiInjectionTest.java:672:92:672:99 | source(...) : String | Log4jJndiInjectionTest.java:672:83:672:99 | (...)... | provenance | Sink:MaD:434 |
+| Log4jJndiInjectionTest.java:672:92:672:99 | source(...) : String | Log4jJndiInjectionTest.java:672:83:672:99 | (...)... | provenance | Sink:MaD:433 |
+| Log4jJndiInjectionTest.java:673:77:673:84 | source(...) : String | Log4jJndiInjectionTest.java:673:68:673:84 | (...)... | provenance | Sink:MaD:434 |
+| Log4jJndiInjectionTest.java:673:77:673:84 | source(...) : String | Log4jJndiInjectionTest.java:673:68:673:84 | (...)... | provenance | Sink:MaD:433 |
+| Log4jJndiInjectionTest.java:674:62:674:69 | source(...) : String | Log4jJndiInjectionTest.java:674:53:674:69 | (...)... | provenance | Sink:MaD:434 |
+| Log4jJndiInjectionTest.java:674:62:674:69 | source(...) : String | Log4jJndiInjectionTest.java:674:53:674:69 | (...)... | provenance | Sink:MaD:433 |
+| Log4jJndiInjectionTest.java:675:47:675:54 | source(...) : String | Log4jJndiInjectionTest.java:675:38:675:54 | (...)... | provenance | Sink:MaD:434 |
+| Log4jJndiInjectionTest.java:675:47:675:54 | source(...) : String | Log4jJndiInjectionTest.java:675:38:675:54 | (...)... | provenance | Sink:MaD:433 |
+| Log4jJndiInjectionTest.java:676:122:676:129 | source(...) : String | Log4jJndiInjectionTest.java:676:113:676:129 | (...)... | provenance | Sink:MaD:436 |
+| Log4jJndiInjectionTest.java:676:122:676:129 | source(...) : String | Log4jJndiInjectionTest.java:676:113:676:129 | (...)... | provenance | Sink:MaD:435 |
+| Log4jJndiInjectionTest.java:677:107:677:114 | source(...) : String | Log4jJndiInjectionTest.java:677:98:677:114 | (...)... | provenance | Sink:MaD:436 |
+| Log4jJndiInjectionTest.java:677:107:677:114 | source(...) : String | Log4jJndiInjectionTest.java:677:98:677:114 | (...)... | provenance | Sink:MaD:435 |
+| Log4jJndiInjectionTest.java:678:92:678:99 | source(...) : String | Log4jJndiInjectionTest.java:678:83:678:99 | (...)... | provenance | Sink:MaD:436 |
+| Log4jJndiInjectionTest.java:678:92:678:99 | source(...) : String | Log4jJndiInjectionTest.java:678:83:678:99 | (...)... | provenance | Sink:MaD:435 |
+| Log4jJndiInjectionTest.java:679:77:679:84 | source(...) : String | Log4jJndiInjectionTest.java:679:68:679:84 | (...)... | provenance | Sink:MaD:436 |
+| Log4jJndiInjectionTest.java:679:77:679:84 | source(...) : String | Log4jJndiInjectionTest.java:679:68:679:84 | (...)... | provenance | Sink:MaD:435 |
+| Log4jJndiInjectionTest.java:680:62:680:69 | source(...) : String | Log4jJndiInjectionTest.java:680:53:680:69 | (...)... | provenance | Sink:MaD:436 |
+| Log4jJndiInjectionTest.java:680:62:680:69 | source(...) : String | Log4jJndiInjectionTest.java:680:53:680:69 | (...)... | provenance | Sink:MaD:435 |
+| Log4jJndiInjectionTest.java:681:47:681:54 | source(...) : String | Log4jJndiInjectionTest.java:681:38:681:54 | (...)... | provenance | Sink:MaD:436 |
+| Log4jJndiInjectionTest.java:681:47:681:54 | source(...) : String | Log4jJndiInjectionTest.java:681:38:681:54 | (...)... | provenance | Sink:MaD:435 |
+| Log4jJndiInjectionTest.java:682:137:682:144 | source(...) : String | Log4jJndiInjectionTest.java:682:128:682:144 | (...)... | provenance | Sink:MaD:438 |
+| Log4jJndiInjectionTest.java:682:137:682:144 | source(...) : String | Log4jJndiInjectionTest.java:682:128:682:144 | (...)... | provenance | Sink:MaD:437 |
+| Log4jJndiInjectionTest.java:683:122:683:129 | source(...) : String | Log4jJndiInjectionTest.java:683:113:683:129 | (...)... | provenance | Sink:MaD:438 |
+| Log4jJndiInjectionTest.java:683:122:683:129 | source(...) : String | Log4jJndiInjectionTest.java:683:113:683:129 | (...)... | provenance | Sink:MaD:437 |
+| Log4jJndiInjectionTest.java:684:107:684:114 | source(...) : String | Log4jJndiInjectionTest.java:684:98:684:114 | (...)... | provenance | Sink:MaD:438 |
+| Log4jJndiInjectionTest.java:684:107:684:114 | source(...) : String | Log4jJndiInjectionTest.java:684:98:684:114 | (...)... | provenance | Sink:MaD:437 |
+| Log4jJndiInjectionTest.java:685:92:685:99 | source(...) : String | Log4jJndiInjectionTest.java:685:83:685:99 | (...)... | provenance | Sink:MaD:438 |
+| Log4jJndiInjectionTest.java:685:92:685:99 | source(...) : String | Log4jJndiInjectionTest.java:685:83:685:99 | (...)... | provenance | Sink:MaD:437 |
+| Log4jJndiInjectionTest.java:686:77:686:84 | source(...) : String | Log4jJndiInjectionTest.java:686:68:686:84 | (...)... | provenance | Sink:MaD:438 |
+| Log4jJndiInjectionTest.java:686:77:686:84 | source(...) : String | Log4jJndiInjectionTest.java:686:68:686:84 | (...)... | provenance | Sink:MaD:437 |
+| Log4jJndiInjectionTest.java:687:62:687:69 | source(...) : String | Log4jJndiInjectionTest.java:687:53:687:69 | (...)... | provenance | Sink:MaD:438 |
+| Log4jJndiInjectionTest.java:687:62:687:69 | source(...) : String | Log4jJndiInjectionTest.java:687:53:687:69 | (...)... | provenance | Sink:MaD:437 |
+| Log4jJndiInjectionTest.java:688:47:688:54 | source(...) : String | Log4jJndiInjectionTest.java:688:38:688:54 | (...)... | provenance | Sink:MaD:438 |
+| Log4jJndiInjectionTest.java:688:47:688:54 | source(...) : String | Log4jJndiInjectionTest.java:688:38:688:54 | (...)... | provenance | Sink:MaD:437 |
+| Log4jJndiInjectionTest.java:689:152:689:159 | source(...) : String | Log4jJndiInjectionTest.java:689:143:689:159 | (...)... | provenance | Sink:MaD:440 |
+| Log4jJndiInjectionTest.java:689:152:689:159 | source(...) : String | Log4jJndiInjectionTest.java:689:143:689:159 | (...)... | provenance | Sink:MaD:439 |
+| Log4jJndiInjectionTest.java:690:137:690:144 | source(...) : String | Log4jJndiInjectionTest.java:690:128:690:144 | (...)... | provenance | Sink:MaD:440 |
+| Log4jJndiInjectionTest.java:690:137:690:144 | source(...) : String | Log4jJndiInjectionTest.java:690:128:690:144 | (...)... | provenance | Sink:MaD:439 |
+| Log4jJndiInjectionTest.java:691:122:691:129 | source(...) : String | Log4jJndiInjectionTest.java:691:113:691:129 | (...)... | provenance | Sink:MaD:440 |
+| Log4jJndiInjectionTest.java:691:122:691:129 | source(...) : String | Log4jJndiInjectionTest.java:691:113:691:129 | (...)... | provenance | Sink:MaD:439 |
+| Log4jJndiInjectionTest.java:692:107:692:114 | source(...) : String | Log4jJndiInjectionTest.java:692:98:692:114 | (...)... | provenance | Sink:MaD:440 |
+| Log4jJndiInjectionTest.java:692:107:692:114 | source(...) : String | Log4jJndiInjectionTest.java:692:98:692:114 | (...)... | provenance | Sink:MaD:439 |
+| Log4jJndiInjectionTest.java:693:92:693:99 | source(...) : String | Log4jJndiInjectionTest.java:693:83:693:99 | (...)... | provenance | Sink:MaD:440 |
+| Log4jJndiInjectionTest.java:693:92:693:99 | source(...) : String | Log4jJndiInjectionTest.java:693:83:693:99 | (...)... | provenance | Sink:MaD:439 |
+| Log4jJndiInjectionTest.java:694:77:694:84 | source(...) : String | Log4jJndiInjectionTest.java:694:68:694:84 | (...)... | provenance | Sink:MaD:440 |
+| Log4jJndiInjectionTest.java:694:77:694:84 | source(...) : String | Log4jJndiInjectionTest.java:694:68:694:84 | (...)... | provenance | Sink:MaD:439 |
+| Log4jJndiInjectionTest.java:695:62:695:69 | source(...) : String | Log4jJndiInjectionTest.java:695:53:695:69 | (...)... | provenance | Sink:MaD:440 |
+| Log4jJndiInjectionTest.java:695:62:695:69 | source(...) : String | Log4jJndiInjectionTest.java:695:53:695:69 | (...)... | provenance | Sink:MaD:439 |
+| Log4jJndiInjectionTest.java:696:47:696:54 | source(...) : String | Log4jJndiInjectionTest.java:696:38:696:54 | (...)... | provenance | Sink:MaD:440 |
+| Log4jJndiInjectionTest.java:696:47:696:54 | source(...) : String | Log4jJndiInjectionTest.java:696:38:696:54 | (...)... | provenance | Sink:MaD:439 |
+| Log4jJndiInjectionTest.java:697:167:697:174 | source(...) : String | Log4jJndiInjectionTest.java:697:158:697:174 | (...)... | provenance | Sink:MaD:442 |
+| Log4jJndiInjectionTest.java:697:167:697:174 | source(...) : String | Log4jJndiInjectionTest.java:697:158:697:174 | (...)... | provenance | Sink:MaD:441 |
+| Log4jJndiInjectionTest.java:698:152:698:159 | source(...) : String | Log4jJndiInjectionTest.java:698:143:698:159 | (...)... | provenance | Sink:MaD:442 |
+| Log4jJndiInjectionTest.java:698:152:698:159 | source(...) : String | Log4jJndiInjectionTest.java:698:143:698:159 | (...)... | provenance | Sink:MaD:441 |
+| Log4jJndiInjectionTest.java:699:137:699:144 | source(...) : String | Log4jJndiInjectionTest.java:699:128:699:144 | (...)... | provenance | Sink:MaD:442 |
+| Log4jJndiInjectionTest.java:699:137:699:144 | source(...) : String | Log4jJndiInjectionTest.java:699:128:699:144 | (...)... | provenance | Sink:MaD:441 |
+| Log4jJndiInjectionTest.java:700:122:700:129 | source(...) : String | Log4jJndiInjectionTest.java:700:113:700:129 | (...)... | provenance | Sink:MaD:442 |
+| Log4jJndiInjectionTest.java:700:122:700:129 | source(...) : String | Log4jJndiInjectionTest.java:700:113:700:129 | (...)... | provenance | Sink:MaD:441 |
+| Log4jJndiInjectionTest.java:701:107:701:114 | source(...) : String | Log4jJndiInjectionTest.java:701:98:701:114 | (...)... | provenance | Sink:MaD:442 |
+| Log4jJndiInjectionTest.java:701:107:701:114 | source(...) : String | Log4jJndiInjectionTest.java:701:98:701:114 | (...)... | provenance | Sink:MaD:441 |
+| Log4jJndiInjectionTest.java:702:92:702:99 | source(...) : String | Log4jJndiInjectionTest.java:702:83:702:99 | (...)... | provenance | Sink:MaD:442 |
+| Log4jJndiInjectionTest.java:702:92:702:99 | source(...) : String | Log4jJndiInjectionTest.java:702:83:702:99 | (...)... | provenance | Sink:MaD:441 |
+| Log4jJndiInjectionTest.java:703:77:703:84 | source(...) : String | Log4jJndiInjectionTest.java:703:68:703:84 | (...)... | provenance | Sink:MaD:442 |
+| Log4jJndiInjectionTest.java:703:77:703:84 | source(...) : String | Log4jJndiInjectionTest.java:703:68:703:84 | (...)... | provenance | Sink:MaD:441 |
+| Log4jJndiInjectionTest.java:704:62:704:69 | source(...) : String | Log4jJndiInjectionTest.java:704:53:704:69 | (...)... | provenance | Sink:MaD:442 |
+| Log4jJndiInjectionTest.java:704:62:704:69 | source(...) : String | Log4jJndiInjectionTest.java:704:53:704:69 | (...)... | provenance | Sink:MaD:441 |
+| Log4jJndiInjectionTest.java:705:47:705:54 | source(...) : String | Log4jJndiInjectionTest.java:705:38:705:54 | (...)... | provenance | Sink:MaD:442 |
+| Log4jJndiInjectionTest.java:705:47:705:54 | source(...) : String | Log4jJndiInjectionTest.java:705:38:705:54 | (...)... | provenance | Sink:MaD:441 |
+| Log4jJndiInjectionTest.java:706:182:706:189 | source(...) : String | Log4jJndiInjectionTest.java:706:173:706:189 | (...)... | provenance | Sink:MaD:444 |
+| Log4jJndiInjectionTest.java:706:182:706:189 | source(...) : String | Log4jJndiInjectionTest.java:706:173:706:189 | (...)... | provenance | Sink:MaD:443 |
+| Log4jJndiInjectionTest.java:707:167:707:174 | source(...) : String | Log4jJndiInjectionTest.java:707:158:707:174 | (...)... | provenance | Sink:MaD:444 |
+| Log4jJndiInjectionTest.java:707:167:707:174 | source(...) : String | Log4jJndiInjectionTest.java:707:158:707:174 | (...)... | provenance | Sink:MaD:443 |
+| Log4jJndiInjectionTest.java:708:152:708:159 | source(...) : String | Log4jJndiInjectionTest.java:708:143:708:159 | (...)... | provenance | Sink:MaD:444 |
+| Log4jJndiInjectionTest.java:708:152:708:159 | source(...) : String | Log4jJndiInjectionTest.java:708:143:708:159 | (...)... | provenance | Sink:MaD:443 |
+| Log4jJndiInjectionTest.java:709:137:709:144 | source(...) : String | Log4jJndiInjectionTest.java:709:128:709:144 | (...)... | provenance | Sink:MaD:444 |
+| Log4jJndiInjectionTest.java:709:137:709:144 | source(...) : String | Log4jJndiInjectionTest.java:709:128:709:144 | (...)... | provenance | Sink:MaD:443 |
+| Log4jJndiInjectionTest.java:710:122:710:129 | source(...) : String | Log4jJndiInjectionTest.java:710:113:710:129 | (...)... | provenance | Sink:MaD:444 |
+| Log4jJndiInjectionTest.java:710:122:710:129 | source(...) : String | Log4jJndiInjectionTest.java:710:113:710:129 | (...)... | provenance | Sink:MaD:443 |
+| Log4jJndiInjectionTest.java:711:107:711:114 | source(...) : String | Log4jJndiInjectionTest.java:711:98:711:114 | (...)... | provenance | Sink:MaD:444 |
+| Log4jJndiInjectionTest.java:711:107:711:114 | source(...) : String | Log4jJndiInjectionTest.java:711:98:711:114 | (...)... | provenance | Sink:MaD:443 |
+| Log4jJndiInjectionTest.java:712:92:712:99 | source(...) : String | Log4jJndiInjectionTest.java:712:83:712:99 | (...)... | provenance | Sink:MaD:444 |
+| Log4jJndiInjectionTest.java:712:92:712:99 | source(...) : String | Log4jJndiInjectionTest.java:712:83:712:99 | (...)... | provenance | Sink:MaD:443 |
+| Log4jJndiInjectionTest.java:713:77:713:84 | source(...) : String | Log4jJndiInjectionTest.java:713:68:713:84 | (...)... | provenance | Sink:MaD:444 |
+| Log4jJndiInjectionTest.java:713:77:713:84 | source(...) : String | Log4jJndiInjectionTest.java:713:68:713:84 | (...)... | provenance | Sink:MaD:443 |
+| Log4jJndiInjectionTest.java:714:62:714:69 | source(...) : String | Log4jJndiInjectionTest.java:714:53:714:69 | (...)... | provenance | Sink:MaD:444 |
+| Log4jJndiInjectionTest.java:714:62:714:69 | source(...) : String | Log4jJndiInjectionTest.java:714:53:714:69 | (...)... | provenance | Sink:MaD:443 |
+| Log4jJndiInjectionTest.java:715:47:715:54 | source(...) : String | Log4jJndiInjectionTest.java:715:38:715:54 | (...)... | provenance | Sink:MaD:444 |
+| Log4jJndiInjectionTest.java:715:47:715:54 | source(...) : String | Log4jJndiInjectionTest.java:715:38:715:54 | (...)... | provenance | Sink:MaD:443 |
+| Log4jJndiInjectionTest.java:716:47:716:54 | source(...) : String | Log4jJndiInjectionTest.java:716:38:716:54 | (...)... | provenance | Sink:MaD:428 |
+| Log4jJndiInjectionTest.java:716:47:716:54 | source(...) : String | Log4jJndiInjectionTest.java:716:38:716:54 | (...)... | provenance | Sink:MaD:427 |
+| Log4jJndiInjectionTest.java:717:67:717:74 | source(...) : String | Log4jJndiInjectionTest.java:717:53:717:74 | (...)... | provenance | Sink:MaD:428 |
+| Log4jJndiInjectionTest.java:717:67:717:74 | source(...) : String | Log4jJndiInjectionTest.java:717:53:717:74 | (...)... | provenance | Sink:MaD:427 |
+| Log4jJndiInjectionTest.java:718:47:718:54 | source(...) : String | Log4jJndiInjectionTest.java:718:38:718:54 | (...)... | provenance | Sink:MaD:448 |
+| Log4jJndiInjectionTest.java:718:47:718:54 | source(...) : String | Log4jJndiInjectionTest.java:718:38:718:54 | (...)... | provenance | Sink:MaD:447 |
+| Log4jJndiInjectionTest.java:719:52:719:59 | source(...) : String | Log4jJndiInjectionTest.java:719:38:719:59 | (...)... | provenance | Sink:MaD:450 |
+| Log4jJndiInjectionTest.java:719:52:719:59 | source(...) : String | Log4jJndiInjectionTest.java:719:38:719:59 | (...)... | provenance | Sink:MaD:449 |
+| Log4jJndiInjectionTest.java:720:52:720:59 | source(...) : String | Log4jJndiInjectionTest.java:720:38:720:59 | (...)... | provenance | Sink:MaD:452 |
+| Log4jJndiInjectionTest.java:720:52:720:59 | source(...) : String | Log4jJndiInjectionTest.java:720:38:720:59 | (...)... | provenance | Sink:MaD:451 |
+| Log4jJndiInjectionTest.java:721:41:721:48 | source(...) : String | Log4jJndiInjectionTest.java:721:26:721:48 | (...)... | provenance | Sink:MaD:460 |
+| Log4jJndiInjectionTest.java:721:41:721:48 | source(...) : String | Log4jJndiInjectionTest.java:721:26:721:48 | (...)... | provenance | Sink:MaD:459 |
+| Log4jJndiInjectionTest.java:722:41:722:48 | source(...) : String | Log4jJndiInjectionTest.java:722:26:722:48 | (...)... | provenance | Sink:MaD:462 |
+| Log4jJndiInjectionTest.java:722:41:722:48 | source(...) : String | Log4jJndiInjectionTest.java:722:26:722:48 | (...)... | provenance | Sink:MaD:461 |
+| Log4jJndiInjectionTest.java:723:56:723:63 | source(...) : String | Log4jJndiInjectionTest.java:723:41:723:63 | (...)... | provenance | Sink:MaD:464 |
+| Log4jJndiInjectionTest.java:723:56:723:63 | source(...) : String | Log4jJndiInjectionTest.java:723:41:723:63 | (...)... | provenance | Sink:MaD:463 |
+| Log4jJndiInjectionTest.java:724:56:724:63 | source(...) : String | Log4jJndiInjectionTest.java:724:41:724:63 | (...)... | provenance | Sink:MaD:466 |
+| Log4jJndiInjectionTest.java:724:56:724:63 | source(...) : String | Log4jJndiInjectionTest.java:724:41:724:63 | (...)... | provenance | Sink:MaD:465 |
+| Log4jJndiInjectionTest.java:725:51:725:58 | source(...) : String | Log4jJndiInjectionTest.java:725:41:725:58 | (...)... | provenance | Sink:MaD:468 |
+| Log4jJndiInjectionTest.java:725:51:725:58 | source(...) : String | Log4jJndiInjectionTest.java:725:41:725:58 | (...)... | provenance | Sink:MaD:467 |
+| Log4jJndiInjectionTest.java:726:59:726:66 | source(...) : String | Log4jJndiInjectionTest.java:726:41:726:66 | (...)... | provenance | Sink:MaD:470 |
+| Log4jJndiInjectionTest.java:726:59:726:66 | source(...) : String | Log4jJndiInjectionTest.java:726:41:726:66 | (...)... | provenance | Sink:MaD:469 |
+| Log4jJndiInjectionTest.java:727:59:727:66 | source(...) : String | Log4jJndiInjectionTest.java:727:41:727:66 | (...)... | provenance | Sink:MaD:472 |
+| Log4jJndiInjectionTest.java:727:59:727:66 | source(...) : String | Log4jJndiInjectionTest.java:727:41:727:66 | (...)... | provenance | Sink:MaD:471 |
+| Log4jJndiInjectionTest.java:729:50:729:57 | source(...) : String | Log4jJndiInjectionTest.java:729:41:729:57 | (...)... | provenance | Sink:MaD:476 |
+| Log4jJndiInjectionTest.java:729:50:729:57 | source(...) : String | Log4jJndiInjectionTest.java:729:41:729:57 | (...)... | provenance | Sink:MaD:475 |
+| Log4jJndiInjectionTest.java:730:50:730:57 | source(...) : String | Log4jJndiInjectionTest.java:730:41:730:57 | (...)... | provenance | Sink:MaD:496 |
+| Log4jJndiInjectionTest.java:730:50:730:57 | source(...) : String | Log4jJndiInjectionTest.java:730:41:730:57 | (...)... | provenance | Sink:MaD:495 |
+| Log4jJndiInjectionTest.java:731:56:731:78 | {...} : Object[] [[]] : String | Log4jJndiInjectionTest.java:731:56:731:78 | new Object[] | provenance | Sink:MaD:496 |
+| Log4jJndiInjectionTest.java:731:56:731:78 | {...} : Object[] [[]] : String | Log4jJndiInjectionTest.java:731:56:731:78 | new Object[] | provenance | Sink:MaD:495 |
 | Log4jJndiInjectionTest.java:731:70:731:77 | source(...) : String | Log4jJndiInjectionTest.java:731:56:731:78 | {...} : Object[] [[]] : String | provenance |  |
-| Log4jJndiInjectionTest.java:732:65:732:72 | source(...) : String | Log4jJndiInjectionTest.java:732:56:732:72 | (...)... | provenance |  Sink:MaD:245 |
-| Log4jJndiInjectionTest.java:732:65:732:72 | source(...) : String | Log4jJndiInjectionTest.java:732:56:732:72 | (...)... | provenance |  Sink:MaD:561 |
-| Log4jJndiInjectionTest.java:733:50:733:57 | source(...) : String | Log4jJndiInjectionTest.java:733:41:733:57 | (...)... | provenance |  Sink:MaD:245 |
-| Log4jJndiInjectionTest.java:733:50:733:57 | source(...) : String | Log4jJndiInjectionTest.java:733:41:733:57 | (...)... | provenance |  Sink:MaD:561 |
-| Log4jJndiInjectionTest.java:734:80:734:87 | source(...) : String | Log4jJndiInjectionTest.java:734:71:734:87 | (...)... | provenance |  Sink:MaD:246 |
-| Log4jJndiInjectionTest.java:734:80:734:87 | source(...) : String | Log4jJndiInjectionTest.java:734:71:734:87 | (...)... | provenance |  Sink:MaD:562 |
-| Log4jJndiInjectionTest.java:735:65:735:72 | source(...) : String | Log4jJndiInjectionTest.java:735:56:735:72 | (...)... | provenance |  Sink:MaD:246 |
-| Log4jJndiInjectionTest.java:735:65:735:72 | source(...) : String | Log4jJndiInjectionTest.java:735:56:735:72 | (...)... | provenance |  Sink:MaD:562 |
-| Log4jJndiInjectionTest.java:736:50:736:57 | source(...) : String | Log4jJndiInjectionTest.java:736:41:736:57 | (...)... | provenance |  Sink:MaD:246 |
-| Log4jJndiInjectionTest.java:736:50:736:57 | source(...) : String | Log4jJndiInjectionTest.java:736:41:736:57 | (...)... | provenance |  Sink:MaD:562 |
-| Log4jJndiInjectionTest.java:737:95:737:102 | source(...) : String | Log4jJndiInjectionTest.java:737:86:737:102 | (...)... | provenance |  Sink:MaD:247 |
-| Log4jJndiInjectionTest.java:737:95:737:102 | source(...) : String | Log4jJndiInjectionTest.java:737:86:737:102 | (...)... | provenance |  Sink:MaD:563 |
-| Log4jJndiInjectionTest.java:738:80:738:87 | source(...) : String | Log4jJndiInjectionTest.java:738:71:738:87 | (...)... | provenance |  Sink:MaD:247 |
-| Log4jJndiInjectionTest.java:738:80:738:87 | source(...) : String | Log4jJndiInjectionTest.java:738:71:738:87 | (...)... | provenance |  Sink:MaD:563 |
-| Log4jJndiInjectionTest.java:739:65:739:72 | source(...) : String | Log4jJndiInjectionTest.java:739:56:739:72 | (...)... | provenance |  Sink:MaD:247 |
-| Log4jJndiInjectionTest.java:739:65:739:72 | source(...) : String | Log4jJndiInjectionTest.java:739:56:739:72 | (...)... | provenance |  Sink:MaD:563 |
-| Log4jJndiInjectionTest.java:740:50:740:57 | source(...) : String | Log4jJndiInjectionTest.java:740:41:740:57 | (...)... | provenance |  Sink:MaD:247 |
-| Log4jJndiInjectionTest.java:740:50:740:57 | source(...) : String | Log4jJndiInjectionTest.java:740:41:740:57 | (...)... | provenance |  Sink:MaD:563 |
-| Log4jJndiInjectionTest.java:741:110:741:117 | source(...) : String | Log4jJndiInjectionTest.java:741:101:741:117 | (...)... | provenance |  Sink:MaD:248 |
-| Log4jJndiInjectionTest.java:741:110:741:117 | source(...) : String | Log4jJndiInjectionTest.java:741:101:741:117 | (...)... | provenance |  Sink:MaD:564 |
-| Log4jJndiInjectionTest.java:742:95:742:102 | source(...) : String | Log4jJndiInjectionTest.java:742:86:742:102 | (...)... | provenance |  Sink:MaD:248 |
-| Log4jJndiInjectionTest.java:742:95:742:102 | source(...) : String | Log4jJndiInjectionTest.java:742:86:742:102 | (...)... | provenance |  Sink:MaD:564 |
-| Log4jJndiInjectionTest.java:743:80:743:87 | source(...) : String | Log4jJndiInjectionTest.java:743:71:743:87 | (...)... | provenance |  Sink:MaD:248 |
-| Log4jJndiInjectionTest.java:743:80:743:87 | source(...) : String | Log4jJndiInjectionTest.java:743:71:743:87 | (...)... | provenance |  Sink:MaD:564 |
-| Log4jJndiInjectionTest.java:744:65:744:72 | source(...) : String | Log4jJndiInjectionTest.java:744:56:744:72 | (...)... | provenance |  Sink:MaD:248 |
-| Log4jJndiInjectionTest.java:744:65:744:72 | source(...) : String | Log4jJndiInjectionTest.java:744:56:744:72 | (...)... | provenance |  Sink:MaD:564 |
-| Log4jJndiInjectionTest.java:745:50:745:57 | source(...) : String | Log4jJndiInjectionTest.java:745:41:745:57 | (...)... | provenance |  Sink:MaD:248 |
-| Log4jJndiInjectionTest.java:745:50:745:57 | source(...) : String | Log4jJndiInjectionTest.java:745:41:745:57 | (...)... | provenance |  Sink:MaD:564 |
-| Log4jJndiInjectionTest.java:746:125:746:132 | source(...) : String | Log4jJndiInjectionTest.java:746:116:746:132 | (...)... | provenance |  Sink:MaD:249 |
-| Log4jJndiInjectionTest.java:746:125:746:132 | source(...) : String | Log4jJndiInjectionTest.java:746:116:746:132 | (...)... | provenance |  Sink:MaD:565 |
-| Log4jJndiInjectionTest.java:747:110:747:117 | source(...) : String | Log4jJndiInjectionTest.java:747:101:747:117 | (...)... | provenance |  Sink:MaD:249 |
-| Log4jJndiInjectionTest.java:747:110:747:117 | source(...) : String | Log4jJndiInjectionTest.java:747:101:747:117 | (...)... | provenance |  Sink:MaD:565 |
-| Log4jJndiInjectionTest.java:748:95:748:102 | source(...) : String | Log4jJndiInjectionTest.java:748:86:748:102 | (...)... | provenance |  Sink:MaD:249 |
-| Log4jJndiInjectionTest.java:748:95:748:102 | source(...) : String | Log4jJndiInjectionTest.java:748:86:748:102 | (...)... | provenance |  Sink:MaD:565 |
-| Log4jJndiInjectionTest.java:749:80:749:87 | source(...) : String | Log4jJndiInjectionTest.java:749:71:749:87 | (...)... | provenance |  Sink:MaD:249 |
-| Log4jJndiInjectionTest.java:749:80:749:87 | source(...) : String | Log4jJndiInjectionTest.java:749:71:749:87 | (...)... | provenance |  Sink:MaD:565 |
-| Log4jJndiInjectionTest.java:750:65:750:72 | source(...) : String | Log4jJndiInjectionTest.java:750:56:750:72 | (...)... | provenance |  Sink:MaD:249 |
-| Log4jJndiInjectionTest.java:750:65:750:72 | source(...) : String | Log4jJndiInjectionTest.java:750:56:750:72 | (...)... | provenance |  Sink:MaD:565 |
-| Log4jJndiInjectionTest.java:751:50:751:57 | source(...) : String | Log4jJndiInjectionTest.java:751:41:751:57 | (...)... | provenance |  Sink:MaD:249 |
-| Log4jJndiInjectionTest.java:751:50:751:57 | source(...) : String | Log4jJndiInjectionTest.java:751:41:751:57 | (...)... | provenance |  Sink:MaD:565 |
-| Log4jJndiInjectionTest.java:752:140:752:147 | source(...) : String | Log4jJndiInjectionTest.java:752:131:752:147 | (...)... | provenance |  Sink:MaD:250 |
-| Log4jJndiInjectionTest.java:752:140:752:147 | source(...) : String | Log4jJndiInjectionTest.java:752:131:752:147 | (...)... | provenance |  Sink:MaD:566 |
-| Log4jJndiInjectionTest.java:753:125:753:132 | source(...) : String | Log4jJndiInjectionTest.java:753:116:753:132 | (...)... | provenance |  Sink:MaD:250 |
-| Log4jJndiInjectionTest.java:753:125:753:132 | source(...) : String | Log4jJndiInjectionTest.java:753:116:753:132 | (...)... | provenance |  Sink:MaD:566 |
-| Log4jJndiInjectionTest.java:754:110:754:117 | source(...) : String | Log4jJndiInjectionTest.java:754:101:754:117 | (...)... | provenance |  Sink:MaD:250 |
-| Log4jJndiInjectionTest.java:754:110:754:117 | source(...) : String | Log4jJndiInjectionTest.java:754:101:754:117 | (...)... | provenance |  Sink:MaD:566 |
-| Log4jJndiInjectionTest.java:755:95:755:102 | source(...) : String | Log4jJndiInjectionTest.java:755:86:755:102 | (...)... | provenance |  Sink:MaD:250 |
-| Log4jJndiInjectionTest.java:755:95:755:102 | source(...) : String | Log4jJndiInjectionTest.java:755:86:755:102 | (...)... | provenance |  Sink:MaD:566 |
-| Log4jJndiInjectionTest.java:756:80:756:87 | source(...) : String | Log4jJndiInjectionTest.java:756:71:756:87 | (...)... | provenance |  Sink:MaD:250 |
-| Log4jJndiInjectionTest.java:756:80:756:87 | source(...) : String | Log4jJndiInjectionTest.java:756:71:756:87 | (...)... | provenance |  Sink:MaD:566 |
-| Log4jJndiInjectionTest.java:757:65:757:72 | source(...) : String | Log4jJndiInjectionTest.java:757:56:757:72 | (...)... | provenance |  Sink:MaD:250 |
-| Log4jJndiInjectionTest.java:757:65:757:72 | source(...) : String | Log4jJndiInjectionTest.java:757:56:757:72 | (...)... | provenance |  Sink:MaD:566 |
-| Log4jJndiInjectionTest.java:758:50:758:57 | source(...) : String | Log4jJndiInjectionTest.java:758:41:758:57 | (...)... | provenance |  Sink:MaD:250 |
-| Log4jJndiInjectionTest.java:758:50:758:57 | source(...) : String | Log4jJndiInjectionTest.java:758:41:758:57 | (...)... | provenance |  Sink:MaD:566 |
-| Log4jJndiInjectionTest.java:759:155:759:162 | source(...) : String | Log4jJndiInjectionTest.java:759:146:759:162 | (...)... | provenance |  Sink:MaD:251 |
-| Log4jJndiInjectionTest.java:759:155:759:162 | source(...) : String | Log4jJndiInjectionTest.java:759:146:759:162 | (...)... | provenance |  Sink:MaD:567 |
-| Log4jJndiInjectionTest.java:760:140:760:147 | source(...) : String | Log4jJndiInjectionTest.java:760:131:760:147 | (...)... | provenance |  Sink:MaD:251 |
-| Log4jJndiInjectionTest.java:760:140:760:147 | source(...) : String | Log4jJndiInjectionTest.java:760:131:760:147 | (...)... | provenance |  Sink:MaD:567 |
-| Log4jJndiInjectionTest.java:761:125:761:132 | source(...) : String | Log4jJndiInjectionTest.java:761:116:761:132 | (...)... | provenance |  Sink:MaD:251 |
-| Log4jJndiInjectionTest.java:761:125:761:132 | source(...) : String | Log4jJndiInjectionTest.java:761:116:761:132 | (...)... | provenance |  Sink:MaD:567 |
-| Log4jJndiInjectionTest.java:762:110:762:117 | source(...) : String | Log4jJndiInjectionTest.java:762:101:762:117 | (...)... | provenance |  Sink:MaD:251 |
-| Log4jJndiInjectionTest.java:762:110:762:117 | source(...) : String | Log4jJndiInjectionTest.java:762:101:762:117 | (...)... | provenance |  Sink:MaD:567 |
-| Log4jJndiInjectionTest.java:763:95:763:102 | source(...) : String | Log4jJndiInjectionTest.java:763:86:763:102 | (...)... | provenance |  Sink:MaD:251 |
-| Log4jJndiInjectionTest.java:763:95:763:102 | source(...) : String | Log4jJndiInjectionTest.java:763:86:763:102 | (...)... | provenance |  Sink:MaD:567 |
-| Log4jJndiInjectionTest.java:764:80:764:87 | source(...) : String | Log4jJndiInjectionTest.java:764:71:764:87 | (...)... | provenance |  Sink:MaD:251 |
-| Log4jJndiInjectionTest.java:764:80:764:87 | source(...) : String | Log4jJndiInjectionTest.java:764:71:764:87 | (...)... | provenance |  Sink:MaD:567 |
-| Log4jJndiInjectionTest.java:765:65:765:72 | source(...) : String | Log4jJndiInjectionTest.java:765:56:765:72 | (...)... | provenance |  Sink:MaD:251 |
-| Log4jJndiInjectionTest.java:765:65:765:72 | source(...) : String | Log4jJndiInjectionTest.java:765:56:765:72 | (...)... | provenance |  Sink:MaD:567 |
-| Log4jJndiInjectionTest.java:766:50:766:57 | source(...) : String | Log4jJndiInjectionTest.java:766:41:766:57 | (...)... | provenance |  Sink:MaD:251 |
-| Log4jJndiInjectionTest.java:766:50:766:57 | source(...) : String | Log4jJndiInjectionTest.java:766:41:766:57 | (...)... | provenance |  Sink:MaD:567 |
-| Log4jJndiInjectionTest.java:767:170:767:177 | source(...) : String | Log4jJndiInjectionTest.java:767:161:767:177 | (...)... | provenance |  Sink:MaD:252 |
-| Log4jJndiInjectionTest.java:767:170:767:177 | source(...) : String | Log4jJndiInjectionTest.java:767:161:767:177 | (...)... | provenance |  Sink:MaD:568 |
-| Log4jJndiInjectionTest.java:768:155:768:162 | source(...) : String | Log4jJndiInjectionTest.java:768:146:768:162 | (...)... | provenance |  Sink:MaD:252 |
-| Log4jJndiInjectionTest.java:768:155:768:162 | source(...) : String | Log4jJndiInjectionTest.java:768:146:768:162 | (...)... | provenance |  Sink:MaD:568 |
-| Log4jJndiInjectionTest.java:769:140:769:147 | source(...) : String | Log4jJndiInjectionTest.java:769:131:769:147 | (...)... | provenance |  Sink:MaD:252 |
-| Log4jJndiInjectionTest.java:769:140:769:147 | source(...) : String | Log4jJndiInjectionTest.java:769:131:769:147 | (...)... | provenance |  Sink:MaD:568 |
-| Log4jJndiInjectionTest.java:770:125:770:132 | source(...) : String | Log4jJndiInjectionTest.java:770:116:770:132 | (...)... | provenance |  Sink:MaD:252 |
-| Log4jJndiInjectionTest.java:770:125:770:132 | source(...) : String | Log4jJndiInjectionTest.java:770:116:770:132 | (...)... | provenance |  Sink:MaD:568 |
-| Log4jJndiInjectionTest.java:771:110:771:117 | source(...) : String | Log4jJndiInjectionTest.java:771:101:771:117 | (...)... | provenance |  Sink:MaD:252 |
-| Log4jJndiInjectionTest.java:771:110:771:117 | source(...) : String | Log4jJndiInjectionTest.java:771:101:771:117 | (...)... | provenance |  Sink:MaD:568 |
-| Log4jJndiInjectionTest.java:772:95:772:102 | source(...) : String | Log4jJndiInjectionTest.java:772:86:772:102 | (...)... | provenance |  Sink:MaD:252 |
-| Log4jJndiInjectionTest.java:772:95:772:102 | source(...) : String | Log4jJndiInjectionTest.java:772:86:772:102 | (...)... | provenance |  Sink:MaD:568 |
-| Log4jJndiInjectionTest.java:773:80:773:87 | source(...) : String | Log4jJndiInjectionTest.java:773:71:773:87 | (...)... | provenance |  Sink:MaD:252 |
-| Log4jJndiInjectionTest.java:773:80:773:87 | source(...) : String | Log4jJndiInjectionTest.java:773:71:773:87 | (...)... | provenance |  Sink:MaD:568 |
-| Log4jJndiInjectionTest.java:774:65:774:72 | source(...) : String | Log4jJndiInjectionTest.java:774:56:774:72 | (...)... | provenance |  Sink:MaD:252 |
-| Log4jJndiInjectionTest.java:774:65:774:72 | source(...) : String | Log4jJndiInjectionTest.java:774:56:774:72 | (...)... | provenance |  Sink:MaD:568 |
-| Log4jJndiInjectionTest.java:775:50:775:57 | source(...) : String | Log4jJndiInjectionTest.java:775:41:775:57 | (...)... | provenance |  Sink:MaD:252 |
-| Log4jJndiInjectionTest.java:775:50:775:57 | source(...) : String | Log4jJndiInjectionTest.java:775:41:775:57 | (...)... | provenance |  Sink:MaD:568 |
-| Log4jJndiInjectionTest.java:776:185:776:192 | source(...) : String | Log4jJndiInjectionTest.java:776:176:776:192 | (...)... | provenance |  Sink:MaD:253 |
-| Log4jJndiInjectionTest.java:776:185:776:192 | source(...) : String | Log4jJndiInjectionTest.java:776:176:776:192 | (...)... | provenance |  Sink:MaD:569 |
-| Log4jJndiInjectionTest.java:777:170:777:177 | source(...) : String | Log4jJndiInjectionTest.java:777:161:777:177 | (...)... | provenance |  Sink:MaD:253 |
-| Log4jJndiInjectionTest.java:777:170:777:177 | source(...) : String | Log4jJndiInjectionTest.java:777:161:777:177 | (...)... | provenance |  Sink:MaD:569 |
-| Log4jJndiInjectionTest.java:778:155:778:162 | source(...) : String | Log4jJndiInjectionTest.java:778:146:778:162 | (...)... | provenance |  Sink:MaD:253 |
-| Log4jJndiInjectionTest.java:778:155:778:162 | source(...) : String | Log4jJndiInjectionTest.java:778:146:778:162 | (...)... | provenance |  Sink:MaD:569 |
-| Log4jJndiInjectionTest.java:779:140:779:147 | source(...) : String | Log4jJndiInjectionTest.java:779:131:779:147 | (...)... | provenance |  Sink:MaD:253 |
-| Log4jJndiInjectionTest.java:779:140:779:147 | source(...) : String | Log4jJndiInjectionTest.java:779:131:779:147 | (...)... | provenance |  Sink:MaD:569 |
-| Log4jJndiInjectionTest.java:780:125:780:132 | source(...) : String | Log4jJndiInjectionTest.java:780:116:780:132 | (...)... | provenance |  Sink:MaD:253 |
-| Log4jJndiInjectionTest.java:780:125:780:132 | source(...) : String | Log4jJndiInjectionTest.java:780:116:780:132 | (...)... | provenance |  Sink:MaD:569 |
-| Log4jJndiInjectionTest.java:781:110:781:117 | source(...) : String | Log4jJndiInjectionTest.java:781:101:781:117 | (...)... | provenance |  Sink:MaD:253 |
-| Log4jJndiInjectionTest.java:781:110:781:117 | source(...) : String | Log4jJndiInjectionTest.java:781:101:781:117 | (...)... | provenance |  Sink:MaD:569 |
-| Log4jJndiInjectionTest.java:782:95:782:102 | source(...) : String | Log4jJndiInjectionTest.java:782:86:782:102 | (...)... | provenance |  Sink:MaD:253 |
-| Log4jJndiInjectionTest.java:782:95:782:102 | source(...) : String | Log4jJndiInjectionTest.java:782:86:782:102 | (...)... | provenance |  Sink:MaD:569 |
-| Log4jJndiInjectionTest.java:783:80:783:87 | source(...) : String | Log4jJndiInjectionTest.java:783:71:783:87 | (...)... | provenance |  Sink:MaD:253 |
-| Log4jJndiInjectionTest.java:783:80:783:87 | source(...) : String | Log4jJndiInjectionTest.java:783:71:783:87 | (...)... | provenance |  Sink:MaD:569 |
-| Log4jJndiInjectionTest.java:784:65:784:72 | source(...) : String | Log4jJndiInjectionTest.java:784:56:784:72 | (...)... | provenance |  Sink:MaD:253 |
-| Log4jJndiInjectionTest.java:784:65:784:72 | source(...) : String | Log4jJndiInjectionTest.java:784:56:784:72 | (...)... | provenance |  Sink:MaD:569 |
-| Log4jJndiInjectionTest.java:785:50:785:57 | source(...) : String | Log4jJndiInjectionTest.java:785:41:785:57 | (...)... | provenance |  Sink:MaD:253 |
-| Log4jJndiInjectionTest.java:785:50:785:57 | source(...) : String | Log4jJndiInjectionTest.java:785:41:785:57 | (...)... | provenance |  Sink:MaD:569 |
-| Log4jJndiInjectionTest.java:786:50:786:57 | source(...) : String | Log4jJndiInjectionTest.java:786:41:786:57 | (...)... | provenance |  Sink:MaD:245 |
-| Log4jJndiInjectionTest.java:786:50:786:57 | source(...) : String | Log4jJndiInjectionTest.java:786:41:786:57 | (...)... | provenance |  Sink:MaD:561 |
-| Log4jJndiInjectionTest.java:787:70:787:77 | source(...) : String | Log4jJndiInjectionTest.java:787:56:787:77 | (...)... | provenance |  Sink:MaD:245 |
-| Log4jJndiInjectionTest.java:787:70:787:77 | source(...) : String | Log4jJndiInjectionTest.java:787:56:787:77 | (...)... | provenance |  Sink:MaD:561 |
-| Log4jJndiInjectionTest.java:788:50:788:57 | source(...) : String | Log4jJndiInjectionTest.java:788:41:788:57 | (...)... | provenance |  Sink:MaD:255 |
-| Log4jJndiInjectionTest.java:788:50:788:57 | source(...) : String | Log4jJndiInjectionTest.java:788:41:788:57 | (...)... | provenance |  Sink:MaD:571 |
-| Log4jJndiInjectionTest.java:789:55:789:62 | source(...) : String | Log4jJndiInjectionTest.java:789:41:789:62 | (...)... | provenance |  Sink:MaD:256 |
-| Log4jJndiInjectionTest.java:789:55:789:62 | source(...) : String | Log4jJndiInjectionTest.java:789:41:789:62 | (...)... | provenance |  Sink:MaD:572 |
-| Log4jJndiInjectionTest.java:790:55:790:62 | source(...) : String | Log4jJndiInjectionTest.java:790:41:790:62 | (...)... | provenance |  Sink:MaD:257 |
-| Log4jJndiInjectionTest.java:790:55:790:62 | source(...) : String | Log4jJndiInjectionTest.java:790:41:790:62 | (...)... | provenance |  Sink:MaD:573 |
-| Log4jJndiInjectionTest.java:791:44:791:51 | source(...) : String | Log4jJndiInjectionTest.java:791:26:791:51 | (...)... | provenance |  Sink:MaD:260 |
-| Log4jJndiInjectionTest.java:791:44:791:51 | source(...) : String | Log4jJndiInjectionTest.java:791:26:791:51 | (...)... | provenance |  Sink:MaD:576 |
-| Log4jJndiInjectionTest.java:792:44:792:51 | source(...) : String | Log4jJndiInjectionTest.java:792:26:792:51 | (...)... | provenance |  Sink:MaD:261 |
-| Log4jJndiInjectionTest.java:792:44:792:51 | source(...) : String | Log4jJndiInjectionTest.java:792:26:792:51 | (...)... | provenance |  Sink:MaD:577 |
-| Log4jJndiInjectionTest.java:793:36:793:43 | source(...) : String | Log4jJndiInjectionTest.java:793:26:793:43 | (...)... | provenance |  Sink:MaD:258 |
-| Log4jJndiInjectionTest.java:793:36:793:43 | source(...) : String | Log4jJndiInjectionTest.java:793:26:793:43 | (...)... | provenance |  Sink:MaD:574 |
-| Log4jJndiInjectionTest.java:794:36:794:43 | source(...) : String | Log4jJndiInjectionTest.java:794:26:794:43 | (...)... | provenance |  Sink:MaD:259 |
-| Log4jJndiInjectionTest.java:794:36:794:43 | source(...) : String | Log4jJndiInjectionTest.java:794:26:794:43 | (...)... | provenance |  Sink:MaD:575 |
-| Log4jJndiInjectionTest.java:797:35:797:42 | source(...) : String | Log4jJndiInjectionTest.java:797:26:797:42 | (...)... | provenance |  Sink:MaD:264 |
-| Log4jJndiInjectionTest.java:797:35:797:42 | source(...) : String | Log4jJndiInjectionTest.java:797:26:797:42 | (...)... | provenance |  Sink:MaD:580 |
-| Log4jJndiInjectionTest.java:798:35:798:42 | source(...) : String | Log4jJndiInjectionTest.java:798:26:798:42 | (...)... | provenance |  Sink:MaD:274 |
-| Log4jJndiInjectionTest.java:798:35:798:42 | source(...) : String | Log4jJndiInjectionTest.java:798:26:798:42 | (...)... | provenance |  Sink:MaD:590 |
-| Log4jJndiInjectionTest.java:799:41:799:63 | {...} : Object[] [[]] : String | Log4jJndiInjectionTest.java:799:41:799:63 | new Object[] | provenance |  Sink:MaD:274 |
-| Log4jJndiInjectionTest.java:799:41:799:63 | {...} : Object[] [[]] : String | Log4jJndiInjectionTest.java:799:41:799:63 | new Object[] | provenance |  Sink:MaD:590 |
+| Log4jJndiInjectionTest.java:732:65:732:72 | source(...) : String | Log4jJndiInjectionTest.java:732:56:732:72 | (...)... | provenance | Sink:MaD:478 |
+| Log4jJndiInjectionTest.java:732:65:732:72 | source(...) : String | Log4jJndiInjectionTest.java:732:56:732:72 | (...)... | provenance | Sink:MaD:477 |
+| Log4jJndiInjectionTest.java:733:50:733:57 | source(...) : String | Log4jJndiInjectionTest.java:733:41:733:57 | (...)... | provenance | Sink:MaD:478 |
+| Log4jJndiInjectionTest.java:733:50:733:57 | source(...) : String | Log4jJndiInjectionTest.java:733:41:733:57 | (...)... | provenance | Sink:MaD:477 |
+| Log4jJndiInjectionTest.java:734:80:734:87 | source(...) : String | Log4jJndiInjectionTest.java:734:71:734:87 | (...)... | provenance | Sink:MaD:480 |
+| Log4jJndiInjectionTest.java:734:80:734:87 | source(...) : String | Log4jJndiInjectionTest.java:734:71:734:87 | (...)... | provenance | Sink:MaD:479 |
+| Log4jJndiInjectionTest.java:735:65:735:72 | source(...) : String | Log4jJndiInjectionTest.java:735:56:735:72 | (...)... | provenance | Sink:MaD:480 |
+| Log4jJndiInjectionTest.java:735:65:735:72 | source(...) : String | Log4jJndiInjectionTest.java:735:56:735:72 | (...)... | provenance | Sink:MaD:479 |
+| Log4jJndiInjectionTest.java:736:50:736:57 | source(...) : String | Log4jJndiInjectionTest.java:736:41:736:57 | (...)... | provenance | Sink:MaD:480 |
+| Log4jJndiInjectionTest.java:736:50:736:57 | source(...) : String | Log4jJndiInjectionTest.java:736:41:736:57 | (...)... | provenance | Sink:MaD:479 |
+| Log4jJndiInjectionTest.java:737:95:737:102 | source(...) : String | Log4jJndiInjectionTest.java:737:86:737:102 | (...)... | provenance | Sink:MaD:482 |
+| Log4jJndiInjectionTest.java:737:95:737:102 | source(...) : String | Log4jJndiInjectionTest.java:737:86:737:102 | (...)... | provenance | Sink:MaD:481 |
+| Log4jJndiInjectionTest.java:738:80:738:87 | source(...) : String | Log4jJndiInjectionTest.java:738:71:738:87 | (...)... | provenance | Sink:MaD:482 |
+| Log4jJndiInjectionTest.java:738:80:738:87 | source(...) : String | Log4jJndiInjectionTest.java:738:71:738:87 | (...)... | provenance | Sink:MaD:481 |
+| Log4jJndiInjectionTest.java:739:65:739:72 | source(...) : String | Log4jJndiInjectionTest.java:739:56:739:72 | (...)... | provenance | Sink:MaD:482 |
+| Log4jJndiInjectionTest.java:739:65:739:72 | source(...) : String | Log4jJndiInjectionTest.java:739:56:739:72 | (...)... | provenance | Sink:MaD:481 |
+| Log4jJndiInjectionTest.java:740:50:740:57 | source(...) : String | Log4jJndiInjectionTest.java:740:41:740:57 | (...)... | provenance | Sink:MaD:482 |
+| Log4jJndiInjectionTest.java:740:50:740:57 | source(...) : String | Log4jJndiInjectionTest.java:740:41:740:57 | (...)... | provenance | Sink:MaD:481 |
+| Log4jJndiInjectionTest.java:741:110:741:117 | source(...) : String | Log4jJndiInjectionTest.java:741:101:741:117 | (...)... | provenance | Sink:MaD:484 |
+| Log4jJndiInjectionTest.java:741:110:741:117 | source(...) : String | Log4jJndiInjectionTest.java:741:101:741:117 | (...)... | provenance | Sink:MaD:483 |
+| Log4jJndiInjectionTest.java:742:95:742:102 | source(...) : String | Log4jJndiInjectionTest.java:742:86:742:102 | (...)... | provenance | Sink:MaD:484 |
+| Log4jJndiInjectionTest.java:742:95:742:102 | source(...) : String | Log4jJndiInjectionTest.java:742:86:742:102 | (...)... | provenance | Sink:MaD:483 |
+| Log4jJndiInjectionTest.java:743:80:743:87 | source(...) : String | Log4jJndiInjectionTest.java:743:71:743:87 | (...)... | provenance | Sink:MaD:484 |
+| Log4jJndiInjectionTest.java:743:80:743:87 | source(...) : String | Log4jJndiInjectionTest.java:743:71:743:87 | (...)... | provenance | Sink:MaD:483 |
+| Log4jJndiInjectionTest.java:744:65:744:72 | source(...) : String | Log4jJndiInjectionTest.java:744:56:744:72 | (...)... | provenance | Sink:MaD:484 |
+| Log4jJndiInjectionTest.java:744:65:744:72 | source(...) : String | Log4jJndiInjectionTest.java:744:56:744:72 | (...)... | provenance | Sink:MaD:483 |
+| Log4jJndiInjectionTest.java:745:50:745:57 | source(...) : String | Log4jJndiInjectionTest.java:745:41:745:57 | (...)... | provenance | Sink:MaD:484 |
+| Log4jJndiInjectionTest.java:745:50:745:57 | source(...) : String | Log4jJndiInjectionTest.java:745:41:745:57 | (...)... | provenance | Sink:MaD:483 |
+| Log4jJndiInjectionTest.java:746:125:746:132 | source(...) : String | Log4jJndiInjectionTest.java:746:116:746:132 | (...)... | provenance | Sink:MaD:486 |
+| Log4jJndiInjectionTest.java:746:125:746:132 | source(...) : String | Log4jJndiInjectionTest.java:746:116:746:132 | (...)... | provenance | Sink:MaD:485 |
+| Log4jJndiInjectionTest.java:747:110:747:117 | source(...) : String | Log4jJndiInjectionTest.java:747:101:747:117 | (...)... | provenance | Sink:MaD:486 |
+| Log4jJndiInjectionTest.java:747:110:747:117 | source(...) : String | Log4jJndiInjectionTest.java:747:101:747:117 | (...)... | provenance | Sink:MaD:485 |
+| Log4jJndiInjectionTest.java:748:95:748:102 | source(...) : String | Log4jJndiInjectionTest.java:748:86:748:102 | (...)... | provenance | Sink:MaD:486 |
+| Log4jJndiInjectionTest.java:748:95:748:102 | source(...) : String | Log4jJndiInjectionTest.java:748:86:748:102 | (...)... | provenance | Sink:MaD:485 |
+| Log4jJndiInjectionTest.java:749:80:749:87 | source(...) : String | Log4jJndiInjectionTest.java:749:71:749:87 | (...)... | provenance | Sink:MaD:486 |
+| Log4jJndiInjectionTest.java:749:80:749:87 | source(...) : String | Log4jJndiInjectionTest.java:749:71:749:87 | (...)... | provenance | Sink:MaD:485 |
+| Log4jJndiInjectionTest.java:750:65:750:72 | source(...) : String | Log4jJndiInjectionTest.java:750:56:750:72 | (...)... | provenance | Sink:MaD:486 |
+| Log4jJndiInjectionTest.java:750:65:750:72 | source(...) : String | Log4jJndiInjectionTest.java:750:56:750:72 | (...)... | provenance | Sink:MaD:485 |
+| Log4jJndiInjectionTest.java:751:50:751:57 | source(...) : String | Log4jJndiInjectionTest.java:751:41:751:57 | (...)... | provenance | Sink:MaD:486 |
+| Log4jJndiInjectionTest.java:751:50:751:57 | source(...) : String | Log4jJndiInjectionTest.java:751:41:751:57 | (...)... | provenance | Sink:MaD:485 |
+| Log4jJndiInjectionTest.java:752:140:752:147 | source(...) : String | Log4jJndiInjectionTest.java:752:131:752:147 | (...)... | provenance | Sink:MaD:488 |
+| Log4jJndiInjectionTest.java:752:140:752:147 | source(...) : String | Log4jJndiInjectionTest.java:752:131:752:147 | (...)... | provenance | Sink:MaD:487 |
+| Log4jJndiInjectionTest.java:753:125:753:132 | source(...) : String | Log4jJndiInjectionTest.java:753:116:753:132 | (...)... | provenance | Sink:MaD:488 |
+| Log4jJndiInjectionTest.java:753:125:753:132 | source(...) : String | Log4jJndiInjectionTest.java:753:116:753:132 | (...)... | provenance | Sink:MaD:487 |
+| Log4jJndiInjectionTest.java:754:110:754:117 | source(...) : String | Log4jJndiInjectionTest.java:754:101:754:117 | (...)... | provenance | Sink:MaD:488 |
+| Log4jJndiInjectionTest.java:754:110:754:117 | source(...) : String | Log4jJndiInjectionTest.java:754:101:754:117 | (...)... | provenance | Sink:MaD:487 |
+| Log4jJndiInjectionTest.java:755:95:755:102 | source(...) : String | Log4jJndiInjectionTest.java:755:86:755:102 | (...)... | provenance | Sink:MaD:488 |
+| Log4jJndiInjectionTest.java:755:95:755:102 | source(...) : String | Log4jJndiInjectionTest.java:755:86:755:102 | (...)... | provenance | Sink:MaD:487 |
+| Log4jJndiInjectionTest.java:756:80:756:87 | source(...) : String | Log4jJndiInjectionTest.java:756:71:756:87 | (...)... | provenance | Sink:MaD:488 |
+| Log4jJndiInjectionTest.java:756:80:756:87 | source(...) : String | Log4jJndiInjectionTest.java:756:71:756:87 | (...)... | provenance | Sink:MaD:487 |
+| Log4jJndiInjectionTest.java:757:65:757:72 | source(...) : String | Log4jJndiInjectionTest.java:757:56:757:72 | (...)... | provenance | Sink:MaD:488 |
+| Log4jJndiInjectionTest.java:757:65:757:72 | source(...) : String | Log4jJndiInjectionTest.java:757:56:757:72 | (...)... | provenance | Sink:MaD:487 |
+| Log4jJndiInjectionTest.java:758:50:758:57 | source(...) : String | Log4jJndiInjectionTest.java:758:41:758:57 | (...)... | provenance | Sink:MaD:488 |
+| Log4jJndiInjectionTest.java:758:50:758:57 | source(...) : String | Log4jJndiInjectionTest.java:758:41:758:57 | (...)... | provenance | Sink:MaD:487 |
+| Log4jJndiInjectionTest.java:759:155:759:162 | source(...) : String | Log4jJndiInjectionTest.java:759:146:759:162 | (...)... | provenance | Sink:MaD:490 |
+| Log4jJndiInjectionTest.java:759:155:759:162 | source(...) : String | Log4jJndiInjectionTest.java:759:146:759:162 | (...)... | provenance | Sink:MaD:489 |
+| Log4jJndiInjectionTest.java:760:140:760:147 | source(...) : String | Log4jJndiInjectionTest.java:760:131:760:147 | (...)... | provenance | Sink:MaD:490 |
+| Log4jJndiInjectionTest.java:760:140:760:147 | source(...) : String | Log4jJndiInjectionTest.java:760:131:760:147 | (...)... | provenance | Sink:MaD:489 |
+| Log4jJndiInjectionTest.java:761:125:761:132 | source(...) : String | Log4jJndiInjectionTest.java:761:116:761:132 | (...)... | provenance | Sink:MaD:490 |
+| Log4jJndiInjectionTest.java:761:125:761:132 | source(...) : String | Log4jJndiInjectionTest.java:761:116:761:132 | (...)... | provenance | Sink:MaD:489 |
+| Log4jJndiInjectionTest.java:762:110:762:117 | source(...) : String | Log4jJndiInjectionTest.java:762:101:762:117 | (...)... | provenance | Sink:MaD:490 |
+| Log4jJndiInjectionTest.java:762:110:762:117 | source(...) : String | Log4jJndiInjectionTest.java:762:101:762:117 | (...)... | provenance | Sink:MaD:489 |
+| Log4jJndiInjectionTest.java:763:95:763:102 | source(...) : String | Log4jJndiInjectionTest.java:763:86:763:102 | (...)... | provenance | Sink:MaD:490 |
+| Log4jJndiInjectionTest.java:763:95:763:102 | source(...) : String | Log4jJndiInjectionTest.java:763:86:763:102 | (...)... | provenance | Sink:MaD:489 |
+| Log4jJndiInjectionTest.java:764:80:764:87 | source(...) : String | Log4jJndiInjectionTest.java:764:71:764:87 | (...)... | provenance | Sink:MaD:490 |
+| Log4jJndiInjectionTest.java:764:80:764:87 | source(...) : String | Log4jJndiInjectionTest.java:764:71:764:87 | (...)... | provenance | Sink:MaD:489 |
+| Log4jJndiInjectionTest.java:765:65:765:72 | source(...) : String | Log4jJndiInjectionTest.java:765:56:765:72 | (...)... | provenance | Sink:MaD:490 |
+| Log4jJndiInjectionTest.java:765:65:765:72 | source(...) : String | Log4jJndiInjectionTest.java:765:56:765:72 | (...)... | provenance | Sink:MaD:489 |
+| Log4jJndiInjectionTest.java:766:50:766:57 | source(...) : String | Log4jJndiInjectionTest.java:766:41:766:57 | (...)... | provenance | Sink:MaD:490 |
+| Log4jJndiInjectionTest.java:766:50:766:57 | source(...) : String | Log4jJndiInjectionTest.java:766:41:766:57 | (...)... | provenance | Sink:MaD:489 |
+| Log4jJndiInjectionTest.java:767:170:767:177 | source(...) : String | Log4jJndiInjectionTest.java:767:161:767:177 | (...)... | provenance | Sink:MaD:492 |
+| Log4jJndiInjectionTest.java:767:170:767:177 | source(...) : String | Log4jJndiInjectionTest.java:767:161:767:177 | (...)... | provenance | Sink:MaD:491 |
+| Log4jJndiInjectionTest.java:768:155:768:162 | source(...) : String | Log4jJndiInjectionTest.java:768:146:768:162 | (...)... | provenance | Sink:MaD:492 |
+| Log4jJndiInjectionTest.java:768:155:768:162 | source(...) : String | Log4jJndiInjectionTest.java:768:146:768:162 | (...)... | provenance | Sink:MaD:491 |
+| Log4jJndiInjectionTest.java:769:140:769:147 | source(...) : String | Log4jJndiInjectionTest.java:769:131:769:147 | (...)... | provenance | Sink:MaD:492 |
+| Log4jJndiInjectionTest.java:769:140:769:147 | source(...) : String | Log4jJndiInjectionTest.java:769:131:769:147 | (...)... | provenance | Sink:MaD:491 |
+| Log4jJndiInjectionTest.java:770:125:770:132 | source(...) : String | Log4jJndiInjectionTest.java:770:116:770:132 | (...)... | provenance | Sink:MaD:492 |
+| Log4jJndiInjectionTest.java:770:125:770:132 | source(...) : String | Log4jJndiInjectionTest.java:770:116:770:132 | (...)... | provenance | Sink:MaD:491 |
+| Log4jJndiInjectionTest.java:771:110:771:117 | source(...) : String | Log4jJndiInjectionTest.java:771:101:771:117 | (...)... | provenance | Sink:MaD:492 |
+| Log4jJndiInjectionTest.java:771:110:771:117 | source(...) : String | Log4jJndiInjectionTest.java:771:101:771:117 | (...)... | provenance | Sink:MaD:491 |
+| Log4jJndiInjectionTest.java:772:95:772:102 | source(...) : String | Log4jJndiInjectionTest.java:772:86:772:102 | (...)... | provenance | Sink:MaD:492 |
+| Log4jJndiInjectionTest.java:772:95:772:102 | source(...) : String | Log4jJndiInjectionTest.java:772:86:772:102 | (...)... | provenance | Sink:MaD:491 |
+| Log4jJndiInjectionTest.java:773:80:773:87 | source(...) : String | Log4jJndiInjectionTest.java:773:71:773:87 | (...)... | provenance | Sink:MaD:492 |
+| Log4jJndiInjectionTest.java:773:80:773:87 | source(...) : String | Log4jJndiInjectionTest.java:773:71:773:87 | (...)... | provenance | Sink:MaD:491 |
+| Log4jJndiInjectionTest.java:774:65:774:72 | source(...) : String | Log4jJndiInjectionTest.java:774:56:774:72 | (...)... | provenance | Sink:MaD:492 |
+| Log4jJndiInjectionTest.java:774:65:774:72 | source(...) : String | Log4jJndiInjectionTest.java:774:56:774:72 | (...)... | provenance | Sink:MaD:491 |
+| Log4jJndiInjectionTest.java:775:50:775:57 | source(...) : String | Log4jJndiInjectionTest.java:775:41:775:57 | (...)... | provenance | Sink:MaD:492 |
+| Log4jJndiInjectionTest.java:775:50:775:57 | source(...) : String | Log4jJndiInjectionTest.java:775:41:775:57 | (...)... | provenance | Sink:MaD:491 |
+| Log4jJndiInjectionTest.java:776:185:776:192 | source(...) : String | Log4jJndiInjectionTest.java:776:176:776:192 | (...)... | provenance | Sink:MaD:494 |
+| Log4jJndiInjectionTest.java:776:185:776:192 | source(...) : String | Log4jJndiInjectionTest.java:776:176:776:192 | (...)... | provenance | Sink:MaD:493 |
+| Log4jJndiInjectionTest.java:777:170:777:177 | source(...) : String | Log4jJndiInjectionTest.java:777:161:777:177 | (...)... | provenance | Sink:MaD:494 |
+| Log4jJndiInjectionTest.java:777:170:777:177 | source(...) : String | Log4jJndiInjectionTest.java:777:161:777:177 | (...)... | provenance | Sink:MaD:493 |
+| Log4jJndiInjectionTest.java:778:155:778:162 | source(...) : String | Log4jJndiInjectionTest.java:778:146:778:162 | (...)... | provenance | Sink:MaD:494 |
+| Log4jJndiInjectionTest.java:778:155:778:162 | source(...) : String | Log4jJndiInjectionTest.java:778:146:778:162 | (...)... | provenance | Sink:MaD:493 |
+| Log4jJndiInjectionTest.java:779:140:779:147 | source(...) : String | Log4jJndiInjectionTest.java:779:131:779:147 | (...)... | provenance | Sink:MaD:494 |
+| Log4jJndiInjectionTest.java:779:140:779:147 | source(...) : String | Log4jJndiInjectionTest.java:779:131:779:147 | (...)... | provenance | Sink:MaD:493 |
+| Log4jJndiInjectionTest.java:780:125:780:132 | source(...) : String | Log4jJndiInjectionTest.java:780:116:780:132 | (...)... | provenance | Sink:MaD:494 |
+| Log4jJndiInjectionTest.java:780:125:780:132 | source(...) : String | Log4jJndiInjectionTest.java:780:116:780:132 | (...)... | provenance | Sink:MaD:493 |
+| Log4jJndiInjectionTest.java:781:110:781:117 | source(...) : String | Log4jJndiInjectionTest.java:781:101:781:117 | (...)... | provenance | Sink:MaD:494 |
+| Log4jJndiInjectionTest.java:781:110:781:117 | source(...) : String | Log4jJndiInjectionTest.java:781:101:781:117 | (...)... | provenance | Sink:MaD:493 |
+| Log4jJndiInjectionTest.java:782:95:782:102 | source(...) : String | Log4jJndiInjectionTest.java:782:86:782:102 | (...)... | provenance | Sink:MaD:494 |
+| Log4jJndiInjectionTest.java:782:95:782:102 | source(...) : String | Log4jJndiInjectionTest.java:782:86:782:102 | (...)... | provenance | Sink:MaD:493 |
+| Log4jJndiInjectionTest.java:783:80:783:87 | source(...) : String | Log4jJndiInjectionTest.java:783:71:783:87 | (...)... | provenance | Sink:MaD:494 |
+| Log4jJndiInjectionTest.java:783:80:783:87 | source(...) : String | Log4jJndiInjectionTest.java:783:71:783:87 | (...)... | provenance | Sink:MaD:493 |
+| Log4jJndiInjectionTest.java:784:65:784:72 | source(...) : String | Log4jJndiInjectionTest.java:784:56:784:72 | (...)... | provenance | Sink:MaD:494 |
+| Log4jJndiInjectionTest.java:784:65:784:72 | source(...) : String | Log4jJndiInjectionTest.java:784:56:784:72 | (...)... | provenance | Sink:MaD:493 |
+| Log4jJndiInjectionTest.java:785:50:785:57 | source(...) : String | Log4jJndiInjectionTest.java:785:41:785:57 | (...)... | provenance | Sink:MaD:494 |
+| Log4jJndiInjectionTest.java:785:50:785:57 | source(...) : String | Log4jJndiInjectionTest.java:785:41:785:57 | (...)... | provenance | Sink:MaD:493 |
+| Log4jJndiInjectionTest.java:786:50:786:57 | source(...) : String | Log4jJndiInjectionTest.java:786:41:786:57 | (...)... | provenance | Sink:MaD:478 |
+| Log4jJndiInjectionTest.java:786:50:786:57 | source(...) : String | Log4jJndiInjectionTest.java:786:41:786:57 | (...)... | provenance | Sink:MaD:477 |
+| Log4jJndiInjectionTest.java:787:70:787:77 | source(...) : String | Log4jJndiInjectionTest.java:787:56:787:77 | (...)... | provenance | Sink:MaD:478 |
+| Log4jJndiInjectionTest.java:787:70:787:77 | source(...) : String | Log4jJndiInjectionTest.java:787:56:787:77 | (...)... | provenance | Sink:MaD:477 |
+| Log4jJndiInjectionTest.java:788:50:788:57 | source(...) : String | Log4jJndiInjectionTest.java:788:41:788:57 | (...)... | provenance | Sink:MaD:498 |
+| Log4jJndiInjectionTest.java:788:50:788:57 | source(...) : String | Log4jJndiInjectionTest.java:788:41:788:57 | (...)... | provenance | Sink:MaD:497 |
+| Log4jJndiInjectionTest.java:789:55:789:62 | source(...) : String | Log4jJndiInjectionTest.java:789:41:789:62 | (...)... | provenance | Sink:MaD:500 |
+| Log4jJndiInjectionTest.java:789:55:789:62 | source(...) : String | Log4jJndiInjectionTest.java:789:41:789:62 | (...)... | provenance | Sink:MaD:499 |
+| Log4jJndiInjectionTest.java:790:55:790:62 | source(...) : String | Log4jJndiInjectionTest.java:790:41:790:62 | (...)... | provenance | Sink:MaD:502 |
+| Log4jJndiInjectionTest.java:790:55:790:62 | source(...) : String | Log4jJndiInjectionTest.java:790:41:790:62 | (...)... | provenance | Sink:MaD:501 |
+| Log4jJndiInjectionTest.java:791:44:791:51 | source(...) : String | Log4jJndiInjectionTest.java:791:26:791:51 | (...)... | provenance | Sink:MaD:508 |
+| Log4jJndiInjectionTest.java:791:44:791:51 | source(...) : String | Log4jJndiInjectionTest.java:791:26:791:51 | (...)... | provenance | Sink:MaD:507 |
+| Log4jJndiInjectionTest.java:792:44:792:51 | source(...) : String | Log4jJndiInjectionTest.java:792:26:792:51 | (...)... | provenance | Sink:MaD:510 |
+| Log4jJndiInjectionTest.java:792:44:792:51 | source(...) : String | Log4jJndiInjectionTest.java:792:26:792:51 | (...)... | provenance | Sink:MaD:509 |
+| Log4jJndiInjectionTest.java:793:36:793:43 | source(...) : String | Log4jJndiInjectionTest.java:793:26:793:43 | (...)... | provenance | Sink:MaD:504 |
+| Log4jJndiInjectionTest.java:793:36:793:43 | source(...) : String | Log4jJndiInjectionTest.java:793:26:793:43 | (...)... | provenance | Sink:MaD:503 |
+| Log4jJndiInjectionTest.java:794:36:794:43 | source(...) : String | Log4jJndiInjectionTest.java:794:26:794:43 | (...)... | provenance | Sink:MaD:506 |
+| Log4jJndiInjectionTest.java:794:36:794:43 | source(...) : String | Log4jJndiInjectionTest.java:794:26:794:43 | (...)... | provenance | Sink:MaD:505 |
+| Log4jJndiInjectionTest.java:797:35:797:42 | source(...) : String | Log4jJndiInjectionTest.java:797:26:797:42 | (...)... | provenance | Sink:MaD:516 |
+| Log4jJndiInjectionTest.java:797:35:797:42 | source(...) : String | Log4jJndiInjectionTest.java:797:26:797:42 | (...)... | provenance | Sink:MaD:515 |
+| Log4jJndiInjectionTest.java:798:35:798:42 | source(...) : String | Log4jJndiInjectionTest.java:798:26:798:42 | (...)... | provenance | Sink:MaD:536 |
+| Log4jJndiInjectionTest.java:798:35:798:42 | source(...) : String | Log4jJndiInjectionTest.java:798:26:798:42 | (...)... | provenance | Sink:MaD:535 |
+| Log4jJndiInjectionTest.java:799:41:799:63 | {...} : Object[] [[]] : String | Log4jJndiInjectionTest.java:799:41:799:63 | new Object[] | provenance | Sink:MaD:536 |
+| Log4jJndiInjectionTest.java:799:41:799:63 | {...} : Object[] [[]] : String | Log4jJndiInjectionTest.java:799:41:799:63 | new Object[] | provenance | Sink:MaD:535 |
 | Log4jJndiInjectionTest.java:799:55:799:62 | source(...) : String | Log4jJndiInjectionTest.java:799:41:799:63 | {...} : Object[] [[]] : String | provenance |  |
-| Log4jJndiInjectionTest.java:800:50:800:57 | source(...) : String | Log4jJndiInjectionTest.java:800:41:800:57 | (...)... | provenance |  Sink:MaD:265 |
-| Log4jJndiInjectionTest.java:800:50:800:57 | source(...) : String | Log4jJndiInjectionTest.java:800:41:800:57 | (...)... | provenance |  Sink:MaD:581 |
-| Log4jJndiInjectionTest.java:801:35:801:42 | source(...) : String | Log4jJndiInjectionTest.java:801:26:801:42 | (...)... | provenance |  Sink:MaD:265 |
-| Log4jJndiInjectionTest.java:801:35:801:42 | source(...) : String | Log4jJndiInjectionTest.java:801:26:801:42 | (...)... | provenance |  Sink:MaD:581 |
-| Log4jJndiInjectionTest.java:802:65:802:72 | source(...) : String | Log4jJndiInjectionTest.java:802:56:802:72 | (...)... | provenance |  Sink:MaD:266 |
-| Log4jJndiInjectionTest.java:802:65:802:72 | source(...) : String | Log4jJndiInjectionTest.java:802:56:802:72 | (...)... | provenance |  Sink:MaD:582 |
-| Log4jJndiInjectionTest.java:803:50:803:57 | source(...) : String | Log4jJndiInjectionTest.java:803:41:803:57 | (...)... | provenance |  Sink:MaD:266 |
-| Log4jJndiInjectionTest.java:803:50:803:57 | source(...) : String | Log4jJndiInjectionTest.java:803:41:803:57 | (...)... | provenance |  Sink:MaD:582 |
-| Log4jJndiInjectionTest.java:804:35:804:42 | source(...) : String | Log4jJndiInjectionTest.java:804:26:804:42 | (...)... | provenance |  Sink:MaD:266 |
-| Log4jJndiInjectionTest.java:804:35:804:42 | source(...) : String | Log4jJndiInjectionTest.java:804:26:804:42 | (...)... | provenance |  Sink:MaD:582 |
-| Log4jJndiInjectionTest.java:805:80:805:87 | source(...) : String | Log4jJndiInjectionTest.java:805:71:805:87 | (...)... | provenance |  Sink:MaD:267 |
-| Log4jJndiInjectionTest.java:805:80:805:87 | source(...) : String | Log4jJndiInjectionTest.java:805:71:805:87 | (...)... | provenance |  Sink:MaD:583 |
-| Log4jJndiInjectionTest.java:806:65:806:72 | source(...) : String | Log4jJndiInjectionTest.java:806:56:806:72 | (...)... | provenance |  Sink:MaD:267 |
-| Log4jJndiInjectionTest.java:806:65:806:72 | source(...) : String | Log4jJndiInjectionTest.java:806:56:806:72 | (...)... | provenance |  Sink:MaD:583 |
-| Log4jJndiInjectionTest.java:807:50:807:57 | source(...) : String | Log4jJndiInjectionTest.java:807:41:807:57 | (...)... | provenance |  Sink:MaD:267 |
-| Log4jJndiInjectionTest.java:807:50:807:57 | source(...) : String | Log4jJndiInjectionTest.java:807:41:807:57 | (...)... | provenance |  Sink:MaD:583 |
-| Log4jJndiInjectionTest.java:808:35:808:42 | source(...) : String | Log4jJndiInjectionTest.java:808:26:808:42 | (...)... | provenance |  Sink:MaD:267 |
-| Log4jJndiInjectionTest.java:808:35:808:42 | source(...) : String | Log4jJndiInjectionTest.java:808:26:808:42 | (...)... | provenance |  Sink:MaD:583 |
-| Log4jJndiInjectionTest.java:809:95:809:102 | source(...) : String | Log4jJndiInjectionTest.java:809:86:809:102 | (...)... | provenance |  Sink:MaD:268 |
-| Log4jJndiInjectionTest.java:809:95:809:102 | source(...) : String | Log4jJndiInjectionTest.java:809:86:809:102 | (...)... | provenance |  Sink:MaD:584 |
-| Log4jJndiInjectionTest.java:810:80:810:87 | source(...) : String | Log4jJndiInjectionTest.java:810:71:810:87 | (...)... | provenance |  Sink:MaD:268 |
-| Log4jJndiInjectionTest.java:810:80:810:87 | source(...) : String | Log4jJndiInjectionTest.java:810:71:810:87 | (...)... | provenance |  Sink:MaD:584 |
-| Log4jJndiInjectionTest.java:811:65:811:72 | source(...) : String | Log4jJndiInjectionTest.java:811:56:811:72 | (...)... | provenance |  Sink:MaD:268 |
-| Log4jJndiInjectionTest.java:811:65:811:72 | source(...) : String | Log4jJndiInjectionTest.java:811:56:811:72 | (...)... | provenance |  Sink:MaD:584 |
-| Log4jJndiInjectionTest.java:812:50:812:57 | source(...) : String | Log4jJndiInjectionTest.java:812:41:812:57 | (...)... | provenance |  Sink:MaD:268 |
-| Log4jJndiInjectionTest.java:812:50:812:57 | source(...) : String | Log4jJndiInjectionTest.java:812:41:812:57 | (...)... | provenance |  Sink:MaD:584 |
-| Log4jJndiInjectionTest.java:813:35:813:42 | source(...) : String | Log4jJndiInjectionTest.java:813:26:813:42 | (...)... | provenance |  Sink:MaD:268 |
-| Log4jJndiInjectionTest.java:813:35:813:42 | source(...) : String | Log4jJndiInjectionTest.java:813:26:813:42 | (...)... | provenance |  Sink:MaD:584 |
-| Log4jJndiInjectionTest.java:814:110:814:117 | source(...) : String | Log4jJndiInjectionTest.java:814:101:814:117 | (...)... | provenance |  Sink:MaD:269 |
-| Log4jJndiInjectionTest.java:814:110:814:117 | source(...) : String | Log4jJndiInjectionTest.java:814:101:814:117 | (...)... | provenance |  Sink:MaD:585 |
-| Log4jJndiInjectionTest.java:815:95:815:102 | source(...) : String | Log4jJndiInjectionTest.java:815:86:815:102 | (...)... | provenance |  Sink:MaD:269 |
-| Log4jJndiInjectionTest.java:815:95:815:102 | source(...) : String | Log4jJndiInjectionTest.java:815:86:815:102 | (...)... | provenance |  Sink:MaD:585 |
-| Log4jJndiInjectionTest.java:816:80:816:87 | source(...) : String | Log4jJndiInjectionTest.java:816:71:816:87 | (...)... | provenance |  Sink:MaD:269 |
-| Log4jJndiInjectionTest.java:816:80:816:87 | source(...) : String | Log4jJndiInjectionTest.java:816:71:816:87 | (...)... | provenance |  Sink:MaD:585 |
-| Log4jJndiInjectionTest.java:817:65:817:72 | source(...) : String | Log4jJndiInjectionTest.java:817:56:817:72 | (...)... | provenance |  Sink:MaD:269 |
-| Log4jJndiInjectionTest.java:817:65:817:72 | source(...) : String | Log4jJndiInjectionTest.java:817:56:817:72 | (...)... | provenance |  Sink:MaD:585 |
-| Log4jJndiInjectionTest.java:818:50:818:57 | source(...) : String | Log4jJndiInjectionTest.java:818:41:818:57 | (...)... | provenance |  Sink:MaD:269 |
-| Log4jJndiInjectionTest.java:818:50:818:57 | source(...) : String | Log4jJndiInjectionTest.java:818:41:818:57 | (...)... | provenance |  Sink:MaD:585 |
-| Log4jJndiInjectionTest.java:819:35:819:42 | source(...) : String | Log4jJndiInjectionTest.java:819:26:819:42 | (...)... | provenance |  Sink:MaD:269 |
-| Log4jJndiInjectionTest.java:819:35:819:42 | source(...) : String | Log4jJndiInjectionTest.java:819:26:819:42 | (...)... | provenance |  Sink:MaD:585 |
-| Log4jJndiInjectionTest.java:820:125:820:132 | source(...) : String | Log4jJndiInjectionTest.java:820:116:820:132 | (...)... | provenance |  Sink:MaD:270 |
-| Log4jJndiInjectionTest.java:820:125:820:132 | source(...) : String | Log4jJndiInjectionTest.java:820:116:820:132 | (...)... | provenance |  Sink:MaD:586 |
-| Log4jJndiInjectionTest.java:821:110:821:117 | source(...) : String | Log4jJndiInjectionTest.java:821:101:821:117 | (...)... | provenance |  Sink:MaD:270 |
-| Log4jJndiInjectionTest.java:821:110:821:117 | source(...) : String | Log4jJndiInjectionTest.java:821:101:821:117 | (...)... | provenance |  Sink:MaD:586 |
-| Log4jJndiInjectionTest.java:822:95:822:102 | source(...) : String | Log4jJndiInjectionTest.java:822:86:822:102 | (...)... | provenance |  Sink:MaD:270 |
-| Log4jJndiInjectionTest.java:822:95:822:102 | source(...) : String | Log4jJndiInjectionTest.java:822:86:822:102 | (...)... | provenance |  Sink:MaD:586 |
-| Log4jJndiInjectionTest.java:823:80:823:87 | source(...) : String | Log4jJndiInjectionTest.java:823:71:823:87 | (...)... | provenance |  Sink:MaD:270 |
-| Log4jJndiInjectionTest.java:823:80:823:87 | source(...) : String | Log4jJndiInjectionTest.java:823:71:823:87 | (...)... | provenance |  Sink:MaD:586 |
-| Log4jJndiInjectionTest.java:824:65:824:72 | source(...) : String | Log4jJndiInjectionTest.java:824:56:824:72 | (...)... | provenance |  Sink:MaD:270 |
-| Log4jJndiInjectionTest.java:824:65:824:72 | source(...) : String | Log4jJndiInjectionTest.java:824:56:824:72 | (...)... | provenance |  Sink:MaD:586 |
-| Log4jJndiInjectionTest.java:825:50:825:57 | source(...) : String | Log4jJndiInjectionTest.java:825:41:825:57 | (...)... | provenance |  Sink:MaD:270 |
-| Log4jJndiInjectionTest.java:825:50:825:57 | source(...) : String | Log4jJndiInjectionTest.java:825:41:825:57 | (...)... | provenance |  Sink:MaD:586 |
-| Log4jJndiInjectionTest.java:826:35:826:42 | source(...) : String | Log4jJndiInjectionTest.java:826:26:826:42 | (...)... | provenance |  Sink:MaD:270 |
-| Log4jJndiInjectionTest.java:826:35:826:42 | source(...) : String | Log4jJndiInjectionTest.java:826:26:826:42 | (...)... | provenance |  Sink:MaD:586 |
-| Log4jJndiInjectionTest.java:827:140:827:147 | source(...) : String | Log4jJndiInjectionTest.java:827:131:827:147 | (...)... | provenance |  Sink:MaD:271 |
-| Log4jJndiInjectionTest.java:827:140:827:147 | source(...) : String | Log4jJndiInjectionTest.java:827:131:827:147 | (...)... | provenance |  Sink:MaD:587 |
-| Log4jJndiInjectionTest.java:828:125:828:132 | source(...) : String | Log4jJndiInjectionTest.java:828:116:828:132 | (...)... | provenance |  Sink:MaD:271 |
-| Log4jJndiInjectionTest.java:828:125:828:132 | source(...) : String | Log4jJndiInjectionTest.java:828:116:828:132 | (...)... | provenance |  Sink:MaD:587 |
-| Log4jJndiInjectionTest.java:829:110:829:117 | source(...) : String | Log4jJndiInjectionTest.java:829:101:829:117 | (...)... | provenance |  Sink:MaD:271 |
-| Log4jJndiInjectionTest.java:829:110:829:117 | source(...) : String | Log4jJndiInjectionTest.java:829:101:829:117 | (...)... | provenance |  Sink:MaD:587 |
-| Log4jJndiInjectionTest.java:830:95:830:102 | source(...) : String | Log4jJndiInjectionTest.java:830:86:830:102 | (...)... | provenance |  Sink:MaD:271 |
-| Log4jJndiInjectionTest.java:830:95:830:102 | source(...) : String | Log4jJndiInjectionTest.java:830:86:830:102 | (...)... | provenance |  Sink:MaD:587 |
-| Log4jJndiInjectionTest.java:831:80:831:87 | source(...) : String | Log4jJndiInjectionTest.java:831:71:831:87 | (...)... | provenance |  Sink:MaD:271 |
-| Log4jJndiInjectionTest.java:831:80:831:87 | source(...) : String | Log4jJndiInjectionTest.java:831:71:831:87 | (...)... | provenance |  Sink:MaD:587 |
-| Log4jJndiInjectionTest.java:832:65:832:72 | source(...) : String | Log4jJndiInjectionTest.java:832:56:832:72 | (...)... | provenance |  Sink:MaD:271 |
-| Log4jJndiInjectionTest.java:832:65:832:72 | source(...) : String | Log4jJndiInjectionTest.java:832:56:832:72 | (...)... | provenance |  Sink:MaD:587 |
-| Log4jJndiInjectionTest.java:833:50:833:57 | source(...) : String | Log4jJndiInjectionTest.java:833:41:833:57 | (...)... | provenance |  Sink:MaD:271 |
-| Log4jJndiInjectionTest.java:833:50:833:57 | source(...) : String | Log4jJndiInjectionTest.java:833:41:833:57 | (...)... | provenance |  Sink:MaD:587 |
-| Log4jJndiInjectionTest.java:834:35:834:42 | source(...) : String | Log4jJndiInjectionTest.java:834:26:834:42 | (...)... | provenance |  Sink:MaD:271 |
-| Log4jJndiInjectionTest.java:834:35:834:42 | source(...) : String | Log4jJndiInjectionTest.java:834:26:834:42 | (...)... | provenance |  Sink:MaD:587 |
-| Log4jJndiInjectionTest.java:835:155:835:162 | source(...) : String | Log4jJndiInjectionTest.java:835:146:835:162 | (...)... | provenance |  Sink:MaD:272 |
-| Log4jJndiInjectionTest.java:835:155:835:162 | source(...) : String | Log4jJndiInjectionTest.java:835:146:835:162 | (...)... | provenance |  Sink:MaD:588 |
-| Log4jJndiInjectionTest.java:836:140:836:147 | source(...) : String | Log4jJndiInjectionTest.java:836:131:836:147 | (...)... | provenance |  Sink:MaD:272 |
-| Log4jJndiInjectionTest.java:836:140:836:147 | source(...) : String | Log4jJndiInjectionTest.java:836:131:836:147 | (...)... | provenance |  Sink:MaD:588 |
-| Log4jJndiInjectionTest.java:837:125:837:132 | source(...) : String | Log4jJndiInjectionTest.java:837:116:837:132 | (...)... | provenance |  Sink:MaD:272 |
-| Log4jJndiInjectionTest.java:837:125:837:132 | source(...) : String | Log4jJndiInjectionTest.java:837:116:837:132 | (...)... | provenance |  Sink:MaD:588 |
-| Log4jJndiInjectionTest.java:838:110:838:117 | source(...) : String | Log4jJndiInjectionTest.java:838:101:838:117 | (...)... | provenance |  Sink:MaD:272 |
-| Log4jJndiInjectionTest.java:838:110:838:117 | source(...) : String | Log4jJndiInjectionTest.java:838:101:838:117 | (...)... | provenance |  Sink:MaD:588 |
-| Log4jJndiInjectionTest.java:839:95:839:102 | source(...) : String | Log4jJndiInjectionTest.java:839:86:839:102 | (...)... | provenance |  Sink:MaD:272 |
-| Log4jJndiInjectionTest.java:839:95:839:102 | source(...) : String | Log4jJndiInjectionTest.java:839:86:839:102 | (...)... | provenance |  Sink:MaD:588 |
-| Log4jJndiInjectionTest.java:840:80:840:87 | source(...) : String | Log4jJndiInjectionTest.java:840:71:840:87 | (...)... | provenance |  Sink:MaD:272 |
-| Log4jJndiInjectionTest.java:840:80:840:87 | source(...) : String | Log4jJndiInjectionTest.java:840:71:840:87 | (...)... | provenance |  Sink:MaD:588 |
-| Log4jJndiInjectionTest.java:841:65:841:72 | source(...) : String | Log4jJndiInjectionTest.java:841:56:841:72 | (...)... | provenance |  Sink:MaD:272 |
-| Log4jJndiInjectionTest.java:841:65:841:72 | source(...) : String | Log4jJndiInjectionTest.java:841:56:841:72 | (...)... | provenance |  Sink:MaD:588 |
-| Log4jJndiInjectionTest.java:842:50:842:57 | source(...) : String | Log4jJndiInjectionTest.java:842:41:842:57 | (...)... | provenance |  Sink:MaD:272 |
-| Log4jJndiInjectionTest.java:842:50:842:57 | source(...) : String | Log4jJndiInjectionTest.java:842:41:842:57 | (...)... | provenance |  Sink:MaD:588 |
-| Log4jJndiInjectionTest.java:843:35:843:42 | source(...) : String | Log4jJndiInjectionTest.java:843:26:843:42 | (...)... | provenance |  Sink:MaD:272 |
-| Log4jJndiInjectionTest.java:843:35:843:42 | source(...) : String | Log4jJndiInjectionTest.java:843:26:843:42 | (...)... | provenance |  Sink:MaD:588 |
-| Log4jJndiInjectionTest.java:844:170:844:177 | source(...) : String | Log4jJndiInjectionTest.java:844:161:844:177 | (...)... | provenance |  Sink:MaD:273 |
-| Log4jJndiInjectionTest.java:844:170:844:177 | source(...) : String | Log4jJndiInjectionTest.java:844:161:844:177 | (...)... | provenance |  Sink:MaD:589 |
-| Log4jJndiInjectionTest.java:845:155:845:162 | source(...) : String | Log4jJndiInjectionTest.java:845:146:845:162 | (...)... | provenance |  Sink:MaD:273 |
-| Log4jJndiInjectionTest.java:845:155:845:162 | source(...) : String | Log4jJndiInjectionTest.java:845:146:845:162 | (...)... | provenance |  Sink:MaD:589 |
-| Log4jJndiInjectionTest.java:846:140:846:147 | source(...) : String | Log4jJndiInjectionTest.java:846:131:846:147 | (...)... | provenance |  Sink:MaD:273 |
-| Log4jJndiInjectionTest.java:846:140:846:147 | source(...) : String | Log4jJndiInjectionTest.java:846:131:846:147 | (...)... | provenance |  Sink:MaD:589 |
-| Log4jJndiInjectionTest.java:847:125:847:132 | source(...) : String | Log4jJndiInjectionTest.java:847:116:847:132 | (...)... | provenance |  Sink:MaD:273 |
-| Log4jJndiInjectionTest.java:847:125:847:132 | source(...) : String | Log4jJndiInjectionTest.java:847:116:847:132 | (...)... | provenance |  Sink:MaD:589 |
-| Log4jJndiInjectionTest.java:848:110:848:117 | source(...) : String | Log4jJndiInjectionTest.java:848:101:848:117 | (...)... | provenance |  Sink:MaD:273 |
-| Log4jJndiInjectionTest.java:848:110:848:117 | source(...) : String | Log4jJndiInjectionTest.java:848:101:848:117 | (...)... | provenance |  Sink:MaD:589 |
-| Log4jJndiInjectionTest.java:849:95:849:102 | source(...) : String | Log4jJndiInjectionTest.java:849:86:849:102 | (...)... | provenance |  Sink:MaD:273 |
-| Log4jJndiInjectionTest.java:849:95:849:102 | source(...) : String | Log4jJndiInjectionTest.java:849:86:849:102 | (...)... | provenance |  Sink:MaD:589 |
-| Log4jJndiInjectionTest.java:850:80:850:87 | source(...) : String | Log4jJndiInjectionTest.java:850:71:850:87 | (...)... | provenance |  Sink:MaD:273 |
-| Log4jJndiInjectionTest.java:850:80:850:87 | source(...) : String | Log4jJndiInjectionTest.java:850:71:850:87 | (...)... | provenance |  Sink:MaD:589 |
-| Log4jJndiInjectionTest.java:851:65:851:72 | source(...) : String | Log4jJndiInjectionTest.java:851:56:851:72 | (...)... | provenance |  Sink:MaD:273 |
-| Log4jJndiInjectionTest.java:851:65:851:72 | source(...) : String | Log4jJndiInjectionTest.java:851:56:851:72 | (...)... | provenance |  Sink:MaD:589 |
-| Log4jJndiInjectionTest.java:852:50:852:57 | source(...) : String | Log4jJndiInjectionTest.java:852:41:852:57 | (...)... | provenance |  Sink:MaD:273 |
-| Log4jJndiInjectionTest.java:852:50:852:57 | source(...) : String | Log4jJndiInjectionTest.java:852:41:852:57 | (...)... | provenance |  Sink:MaD:589 |
-| Log4jJndiInjectionTest.java:853:35:853:42 | source(...) : String | Log4jJndiInjectionTest.java:853:26:853:42 | (...)... | provenance |  Sink:MaD:273 |
-| Log4jJndiInjectionTest.java:853:35:853:42 | source(...) : String | Log4jJndiInjectionTest.java:853:26:853:42 | (...)... | provenance |  Sink:MaD:589 |
-| Log4jJndiInjectionTest.java:854:35:854:42 | source(...) : String | Log4jJndiInjectionTest.java:854:26:854:42 | (...)... | provenance |  Sink:MaD:265 |
-| Log4jJndiInjectionTest.java:854:35:854:42 | source(...) : String | Log4jJndiInjectionTest.java:854:26:854:42 | (...)... | provenance |  Sink:MaD:581 |
-| Log4jJndiInjectionTest.java:855:55:855:62 | source(...) : String | Log4jJndiInjectionTest.java:855:41:855:62 | (...)... | provenance |  Sink:MaD:265 |
-| Log4jJndiInjectionTest.java:855:55:855:62 | source(...) : String | Log4jJndiInjectionTest.java:855:41:855:62 | (...)... | provenance |  Sink:MaD:581 |
-| Log4jJndiInjectionTest.java:856:35:856:42 | source(...) : String | Log4jJndiInjectionTest.java:856:26:856:42 | (...)... | provenance |  Sink:MaD:275 |
-| Log4jJndiInjectionTest.java:856:35:856:42 | source(...) : String | Log4jJndiInjectionTest.java:856:26:856:42 | (...)... | provenance |  Sink:MaD:591 |
-| Log4jJndiInjectionTest.java:857:40:857:47 | source(...) : String | Log4jJndiInjectionTest.java:857:26:857:47 | (...)... | provenance |  Sink:MaD:276 |
-| Log4jJndiInjectionTest.java:857:40:857:47 | source(...) : String | Log4jJndiInjectionTest.java:857:26:857:47 | (...)... | provenance |  Sink:MaD:592 |
-| Log4jJndiInjectionTest.java:858:40:858:47 | source(...) : String | Log4jJndiInjectionTest.java:858:26:858:47 | (...)... | provenance |  Sink:MaD:277 |
-| Log4jJndiInjectionTest.java:858:40:858:47 | source(...) : String | Log4jJndiInjectionTest.java:858:26:858:47 | (...)... | provenance |  Sink:MaD:593 |
-| Log4jJndiInjectionTest.java:859:40:859:47 | source(...) : String | Log4jJndiInjectionTest.java:859:25:859:47 | (...)... | provenance |  Sink:MaD:278 |
-| Log4jJndiInjectionTest.java:859:40:859:47 | source(...) : String | Log4jJndiInjectionTest.java:859:25:859:47 | (...)... | provenance |  Sink:MaD:594 |
-| Log4jJndiInjectionTest.java:860:40:860:47 | source(...) : String | Log4jJndiInjectionTest.java:860:25:860:47 | (...)... | provenance |  Sink:MaD:279 |
-| Log4jJndiInjectionTest.java:860:40:860:47 | source(...) : String | Log4jJndiInjectionTest.java:860:25:860:47 | (...)... | provenance |  Sink:MaD:595 |
-| Log4jJndiInjectionTest.java:861:55:861:62 | source(...) : String | Log4jJndiInjectionTest.java:861:40:861:62 | (...)... | provenance |  Sink:MaD:280 |
-| Log4jJndiInjectionTest.java:861:55:861:62 | source(...) : String | Log4jJndiInjectionTest.java:861:40:861:62 | (...)... | provenance |  Sink:MaD:596 |
-| Log4jJndiInjectionTest.java:862:55:862:62 | source(...) : String | Log4jJndiInjectionTest.java:862:40:862:62 | (...)... | provenance |  Sink:MaD:281 |
-| Log4jJndiInjectionTest.java:862:55:862:62 | source(...) : String | Log4jJndiInjectionTest.java:862:40:862:62 | (...)... | provenance |  Sink:MaD:597 |
-| Log4jJndiInjectionTest.java:863:50:863:57 | source(...) : String | Log4jJndiInjectionTest.java:863:40:863:57 | (...)... | provenance |  Sink:MaD:282 |
-| Log4jJndiInjectionTest.java:863:50:863:57 | source(...) : String | Log4jJndiInjectionTest.java:863:40:863:57 | (...)... | provenance |  Sink:MaD:598 |
-| Log4jJndiInjectionTest.java:864:58:864:65 | source(...) : String | Log4jJndiInjectionTest.java:864:40:864:65 | (...)... | provenance |  Sink:MaD:283 |
-| Log4jJndiInjectionTest.java:864:58:864:65 | source(...) : String | Log4jJndiInjectionTest.java:864:40:864:65 | (...)... | provenance |  Sink:MaD:599 |
-| Log4jJndiInjectionTest.java:865:58:865:65 | source(...) : String | Log4jJndiInjectionTest.java:865:40:865:65 | (...)... | provenance |  Sink:MaD:284 |
-| Log4jJndiInjectionTest.java:865:58:865:65 | source(...) : String | Log4jJndiInjectionTest.java:865:40:865:65 | (...)... | provenance |  Sink:MaD:600 |
-| Log4jJndiInjectionTest.java:867:49:867:56 | source(...) : String | Log4jJndiInjectionTest.java:867:40:867:56 | (...)... | provenance |  Sink:MaD:286 |
-| Log4jJndiInjectionTest.java:867:49:867:56 | source(...) : String | Log4jJndiInjectionTest.java:867:40:867:56 | (...)... | provenance |  Sink:MaD:602 |
-| Log4jJndiInjectionTest.java:868:49:868:56 | source(...) : String | Log4jJndiInjectionTest.java:868:40:868:56 | (...)... | provenance |  Sink:MaD:296 |
-| Log4jJndiInjectionTest.java:868:49:868:56 | source(...) : String | Log4jJndiInjectionTest.java:868:40:868:56 | (...)... | provenance |  Sink:MaD:612 |
-| Log4jJndiInjectionTest.java:869:55:869:77 | {...} : Object[] [[]] : String | Log4jJndiInjectionTest.java:869:55:869:77 | new Object[] | provenance |  Sink:MaD:296 |
-| Log4jJndiInjectionTest.java:869:55:869:77 | {...} : Object[] [[]] : String | Log4jJndiInjectionTest.java:869:55:869:77 | new Object[] | provenance |  Sink:MaD:612 |
+| Log4jJndiInjectionTest.java:800:50:800:57 | source(...) : String | Log4jJndiInjectionTest.java:800:41:800:57 | (...)... | provenance | Sink:MaD:518 |
+| Log4jJndiInjectionTest.java:800:50:800:57 | source(...) : String | Log4jJndiInjectionTest.java:800:41:800:57 | (...)... | provenance | Sink:MaD:517 |
+| Log4jJndiInjectionTest.java:801:35:801:42 | source(...) : String | Log4jJndiInjectionTest.java:801:26:801:42 | (...)... | provenance | Sink:MaD:518 |
+| Log4jJndiInjectionTest.java:801:35:801:42 | source(...) : String | Log4jJndiInjectionTest.java:801:26:801:42 | (...)... | provenance | Sink:MaD:517 |
+| Log4jJndiInjectionTest.java:802:65:802:72 | source(...) : String | Log4jJndiInjectionTest.java:802:56:802:72 | (...)... | provenance | Sink:MaD:520 |
+| Log4jJndiInjectionTest.java:802:65:802:72 | source(...) : String | Log4jJndiInjectionTest.java:802:56:802:72 | (...)... | provenance | Sink:MaD:519 |
+| Log4jJndiInjectionTest.java:803:50:803:57 | source(...) : String | Log4jJndiInjectionTest.java:803:41:803:57 | (...)... | provenance | Sink:MaD:520 |
+| Log4jJndiInjectionTest.java:803:50:803:57 | source(...) : String | Log4jJndiInjectionTest.java:803:41:803:57 | (...)... | provenance | Sink:MaD:519 |
+| Log4jJndiInjectionTest.java:804:35:804:42 | source(...) : String | Log4jJndiInjectionTest.java:804:26:804:42 | (...)... | provenance | Sink:MaD:520 |
+| Log4jJndiInjectionTest.java:804:35:804:42 | source(...) : String | Log4jJndiInjectionTest.java:804:26:804:42 | (...)... | provenance | Sink:MaD:519 |
+| Log4jJndiInjectionTest.java:805:80:805:87 | source(...) : String | Log4jJndiInjectionTest.java:805:71:805:87 | (...)... | provenance | Sink:MaD:522 |
+| Log4jJndiInjectionTest.java:805:80:805:87 | source(...) : String | Log4jJndiInjectionTest.java:805:71:805:87 | (...)... | provenance | Sink:MaD:521 |
+| Log4jJndiInjectionTest.java:806:65:806:72 | source(...) : String | Log4jJndiInjectionTest.java:806:56:806:72 | (...)... | provenance | Sink:MaD:522 |
+| Log4jJndiInjectionTest.java:806:65:806:72 | source(...) : String | Log4jJndiInjectionTest.java:806:56:806:72 | (...)... | provenance | Sink:MaD:521 |
+| Log4jJndiInjectionTest.java:807:50:807:57 | source(...) : String | Log4jJndiInjectionTest.java:807:41:807:57 | (...)... | provenance | Sink:MaD:522 |
+| Log4jJndiInjectionTest.java:807:50:807:57 | source(...) : String | Log4jJndiInjectionTest.java:807:41:807:57 | (...)... | provenance | Sink:MaD:521 |
+| Log4jJndiInjectionTest.java:808:35:808:42 | source(...) : String | Log4jJndiInjectionTest.java:808:26:808:42 | (...)... | provenance | Sink:MaD:522 |
+| Log4jJndiInjectionTest.java:808:35:808:42 | source(...) : String | Log4jJndiInjectionTest.java:808:26:808:42 | (...)... | provenance | Sink:MaD:521 |
+| Log4jJndiInjectionTest.java:809:95:809:102 | source(...) : String | Log4jJndiInjectionTest.java:809:86:809:102 | (...)... | provenance | Sink:MaD:524 |
+| Log4jJndiInjectionTest.java:809:95:809:102 | source(...) : String | Log4jJndiInjectionTest.java:809:86:809:102 | (...)... | provenance | Sink:MaD:523 |
+| Log4jJndiInjectionTest.java:810:80:810:87 | source(...) : String | Log4jJndiInjectionTest.java:810:71:810:87 | (...)... | provenance | Sink:MaD:524 |
+| Log4jJndiInjectionTest.java:810:80:810:87 | source(...) : String | Log4jJndiInjectionTest.java:810:71:810:87 | (...)... | provenance | Sink:MaD:523 |
+| Log4jJndiInjectionTest.java:811:65:811:72 | source(...) : String | Log4jJndiInjectionTest.java:811:56:811:72 | (...)... | provenance | Sink:MaD:524 |
+| Log4jJndiInjectionTest.java:811:65:811:72 | source(...) : String | Log4jJndiInjectionTest.java:811:56:811:72 | (...)... | provenance | Sink:MaD:523 |
+| Log4jJndiInjectionTest.java:812:50:812:57 | source(...) : String | Log4jJndiInjectionTest.java:812:41:812:57 | (...)... | provenance | Sink:MaD:524 |
+| Log4jJndiInjectionTest.java:812:50:812:57 | source(...) : String | Log4jJndiInjectionTest.java:812:41:812:57 | (...)... | provenance | Sink:MaD:523 |
+| Log4jJndiInjectionTest.java:813:35:813:42 | source(...) : String | Log4jJndiInjectionTest.java:813:26:813:42 | (...)... | provenance | Sink:MaD:524 |
+| Log4jJndiInjectionTest.java:813:35:813:42 | source(...) : String | Log4jJndiInjectionTest.java:813:26:813:42 | (...)... | provenance | Sink:MaD:523 |
+| Log4jJndiInjectionTest.java:814:110:814:117 | source(...) : String | Log4jJndiInjectionTest.java:814:101:814:117 | (...)... | provenance | Sink:MaD:526 |
+| Log4jJndiInjectionTest.java:814:110:814:117 | source(...) : String | Log4jJndiInjectionTest.java:814:101:814:117 | (...)... | provenance | Sink:MaD:525 |
+| Log4jJndiInjectionTest.java:815:95:815:102 | source(...) : String | Log4jJndiInjectionTest.java:815:86:815:102 | (...)... | provenance | Sink:MaD:526 |
+| Log4jJndiInjectionTest.java:815:95:815:102 | source(...) : String | Log4jJndiInjectionTest.java:815:86:815:102 | (...)... | provenance | Sink:MaD:525 |
+| Log4jJndiInjectionTest.java:816:80:816:87 | source(...) : String | Log4jJndiInjectionTest.java:816:71:816:87 | (...)... | provenance | Sink:MaD:526 |
+| Log4jJndiInjectionTest.java:816:80:816:87 | source(...) : String | Log4jJndiInjectionTest.java:816:71:816:87 | (...)... | provenance | Sink:MaD:525 |
+| Log4jJndiInjectionTest.java:817:65:817:72 | source(...) : String | Log4jJndiInjectionTest.java:817:56:817:72 | (...)... | provenance | Sink:MaD:526 |
+| Log4jJndiInjectionTest.java:817:65:817:72 | source(...) : String | Log4jJndiInjectionTest.java:817:56:817:72 | (...)... | provenance | Sink:MaD:525 |
+| Log4jJndiInjectionTest.java:818:50:818:57 | source(...) : String | Log4jJndiInjectionTest.java:818:41:818:57 | (...)... | provenance | Sink:MaD:526 |
+| Log4jJndiInjectionTest.java:818:50:818:57 | source(...) : String | Log4jJndiInjectionTest.java:818:41:818:57 | (...)... | provenance | Sink:MaD:525 |
+| Log4jJndiInjectionTest.java:819:35:819:42 | source(...) : String | Log4jJndiInjectionTest.java:819:26:819:42 | (...)... | provenance | Sink:MaD:526 |
+| Log4jJndiInjectionTest.java:819:35:819:42 | source(...) : String | Log4jJndiInjectionTest.java:819:26:819:42 | (...)... | provenance | Sink:MaD:525 |
+| Log4jJndiInjectionTest.java:820:125:820:132 | source(...) : String | Log4jJndiInjectionTest.java:820:116:820:132 | (...)... | provenance | Sink:MaD:528 |
+| Log4jJndiInjectionTest.java:820:125:820:132 | source(...) : String | Log4jJndiInjectionTest.java:820:116:820:132 | (...)... | provenance | Sink:MaD:527 |
+| Log4jJndiInjectionTest.java:821:110:821:117 | source(...) : String | Log4jJndiInjectionTest.java:821:101:821:117 | (...)... | provenance | Sink:MaD:528 |
+| Log4jJndiInjectionTest.java:821:110:821:117 | source(...) : String | Log4jJndiInjectionTest.java:821:101:821:117 | (...)... | provenance | Sink:MaD:527 |
+| Log4jJndiInjectionTest.java:822:95:822:102 | source(...) : String | Log4jJndiInjectionTest.java:822:86:822:102 | (...)... | provenance | Sink:MaD:528 |
+| Log4jJndiInjectionTest.java:822:95:822:102 | source(...) : String | Log4jJndiInjectionTest.java:822:86:822:102 | (...)... | provenance | Sink:MaD:527 |
+| Log4jJndiInjectionTest.java:823:80:823:87 | source(...) : String | Log4jJndiInjectionTest.java:823:71:823:87 | (...)... | provenance | Sink:MaD:528 |
+| Log4jJndiInjectionTest.java:823:80:823:87 | source(...) : String | Log4jJndiInjectionTest.java:823:71:823:87 | (...)... | provenance | Sink:MaD:527 |
+| Log4jJndiInjectionTest.java:824:65:824:72 | source(...) : String | Log4jJndiInjectionTest.java:824:56:824:72 | (...)... | provenance | Sink:MaD:528 |
+| Log4jJndiInjectionTest.java:824:65:824:72 | source(...) : String | Log4jJndiInjectionTest.java:824:56:824:72 | (...)... | provenance | Sink:MaD:527 |
+| Log4jJndiInjectionTest.java:825:50:825:57 | source(...) : String | Log4jJndiInjectionTest.java:825:41:825:57 | (...)... | provenance | Sink:MaD:528 |
+| Log4jJndiInjectionTest.java:825:50:825:57 | source(...) : String | Log4jJndiInjectionTest.java:825:41:825:57 | (...)... | provenance | Sink:MaD:527 |
+| Log4jJndiInjectionTest.java:826:35:826:42 | source(...) : String | Log4jJndiInjectionTest.java:826:26:826:42 | (...)... | provenance | Sink:MaD:528 |
+| Log4jJndiInjectionTest.java:826:35:826:42 | source(...) : String | Log4jJndiInjectionTest.java:826:26:826:42 | (...)... | provenance | Sink:MaD:527 |
+| Log4jJndiInjectionTest.java:827:140:827:147 | source(...) : String | Log4jJndiInjectionTest.java:827:131:827:147 | (...)... | provenance | Sink:MaD:530 |
+| Log4jJndiInjectionTest.java:827:140:827:147 | source(...) : String | Log4jJndiInjectionTest.java:827:131:827:147 | (...)... | provenance | Sink:MaD:529 |
+| Log4jJndiInjectionTest.java:828:125:828:132 | source(...) : String | Log4jJndiInjectionTest.java:828:116:828:132 | (...)... | provenance | Sink:MaD:530 |
+| Log4jJndiInjectionTest.java:828:125:828:132 | source(...) : String | Log4jJndiInjectionTest.java:828:116:828:132 | (...)... | provenance | Sink:MaD:529 |
+| Log4jJndiInjectionTest.java:829:110:829:117 | source(...) : String | Log4jJndiInjectionTest.java:829:101:829:117 | (...)... | provenance | Sink:MaD:530 |
+| Log4jJndiInjectionTest.java:829:110:829:117 | source(...) : String | Log4jJndiInjectionTest.java:829:101:829:117 | (...)... | provenance | Sink:MaD:529 |
+| Log4jJndiInjectionTest.java:830:95:830:102 | source(...) : String | Log4jJndiInjectionTest.java:830:86:830:102 | (...)... | provenance | Sink:MaD:530 |
+| Log4jJndiInjectionTest.java:830:95:830:102 | source(...) : String | Log4jJndiInjectionTest.java:830:86:830:102 | (...)... | provenance | Sink:MaD:529 |
+| Log4jJndiInjectionTest.java:831:80:831:87 | source(...) : String | Log4jJndiInjectionTest.java:831:71:831:87 | (...)... | provenance | Sink:MaD:530 |
+| Log4jJndiInjectionTest.java:831:80:831:87 | source(...) : String | Log4jJndiInjectionTest.java:831:71:831:87 | (...)... | provenance | Sink:MaD:529 |
+| Log4jJndiInjectionTest.java:832:65:832:72 | source(...) : String | Log4jJndiInjectionTest.java:832:56:832:72 | (...)... | provenance | Sink:MaD:530 |
+| Log4jJndiInjectionTest.java:832:65:832:72 | source(...) : String | Log4jJndiInjectionTest.java:832:56:832:72 | (...)... | provenance | Sink:MaD:529 |
+| Log4jJndiInjectionTest.java:833:50:833:57 | source(...) : String | Log4jJndiInjectionTest.java:833:41:833:57 | (...)... | provenance | Sink:MaD:530 |
+| Log4jJndiInjectionTest.java:833:50:833:57 | source(...) : String | Log4jJndiInjectionTest.java:833:41:833:57 | (...)... | provenance | Sink:MaD:529 |
+| Log4jJndiInjectionTest.java:834:35:834:42 | source(...) : String | Log4jJndiInjectionTest.java:834:26:834:42 | (...)... | provenance | Sink:MaD:530 |
+| Log4jJndiInjectionTest.java:834:35:834:42 | source(...) : String | Log4jJndiInjectionTest.java:834:26:834:42 | (...)... | provenance | Sink:MaD:529 |
+| Log4jJndiInjectionTest.java:835:155:835:162 | source(...) : String | Log4jJndiInjectionTest.java:835:146:835:162 | (...)... | provenance | Sink:MaD:532 |
+| Log4jJndiInjectionTest.java:835:155:835:162 | source(...) : String | Log4jJndiInjectionTest.java:835:146:835:162 | (...)... | provenance | Sink:MaD:531 |
+| Log4jJndiInjectionTest.java:836:140:836:147 | source(...) : String | Log4jJndiInjectionTest.java:836:131:836:147 | (...)... | provenance | Sink:MaD:532 |
+| Log4jJndiInjectionTest.java:836:140:836:147 | source(...) : String | Log4jJndiInjectionTest.java:836:131:836:147 | (...)... | provenance | Sink:MaD:531 |
+| Log4jJndiInjectionTest.java:837:125:837:132 | source(...) : String | Log4jJndiInjectionTest.java:837:116:837:132 | (...)... | provenance | Sink:MaD:532 |
+| Log4jJndiInjectionTest.java:837:125:837:132 | source(...) : String | Log4jJndiInjectionTest.java:837:116:837:132 | (...)... | provenance | Sink:MaD:531 |
+| Log4jJndiInjectionTest.java:838:110:838:117 | source(...) : String | Log4jJndiInjectionTest.java:838:101:838:117 | (...)... | provenance | Sink:MaD:532 |
+| Log4jJndiInjectionTest.java:838:110:838:117 | source(...) : String | Log4jJndiInjectionTest.java:838:101:838:117 | (...)... | provenance | Sink:MaD:531 |
+| Log4jJndiInjectionTest.java:839:95:839:102 | source(...) : String | Log4jJndiInjectionTest.java:839:86:839:102 | (...)... | provenance | Sink:MaD:532 |
+| Log4jJndiInjectionTest.java:839:95:839:102 | source(...) : String | Log4jJndiInjectionTest.java:839:86:839:102 | (...)... | provenance | Sink:MaD:531 |
+| Log4jJndiInjectionTest.java:840:80:840:87 | source(...) : String | Log4jJndiInjectionTest.java:840:71:840:87 | (...)... | provenance | Sink:MaD:532 |
+| Log4jJndiInjectionTest.java:840:80:840:87 | source(...) : String | Log4jJndiInjectionTest.java:840:71:840:87 | (...)... | provenance | Sink:MaD:531 |
+| Log4jJndiInjectionTest.java:841:65:841:72 | source(...) : String | Log4jJndiInjectionTest.java:841:56:841:72 | (...)... | provenance | Sink:MaD:532 |
+| Log4jJndiInjectionTest.java:841:65:841:72 | source(...) : String | Log4jJndiInjectionTest.java:841:56:841:72 | (...)... | provenance | Sink:MaD:531 |
+| Log4jJndiInjectionTest.java:842:50:842:57 | source(...) : String | Log4jJndiInjectionTest.java:842:41:842:57 | (...)... | provenance | Sink:MaD:532 |
+| Log4jJndiInjectionTest.java:842:50:842:57 | source(...) : String | Log4jJndiInjectionTest.java:842:41:842:57 | (...)... | provenance | Sink:MaD:531 |
+| Log4jJndiInjectionTest.java:843:35:843:42 | source(...) : String | Log4jJndiInjectionTest.java:843:26:843:42 | (...)... | provenance | Sink:MaD:532 |
+| Log4jJndiInjectionTest.java:843:35:843:42 | source(...) : String | Log4jJndiInjectionTest.java:843:26:843:42 | (...)... | provenance | Sink:MaD:531 |
+| Log4jJndiInjectionTest.java:844:170:844:177 | source(...) : String | Log4jJndiInjectionTest.java:844:161:844:177 | (...)... | provenance | Sink:MaD:534 |
+| Log4jJndiInjectionTest.java:844:170:844:177 | source(...) : String | Log4jJndiInjectionTest.java:844:161:844:177 | (...)... | provenance | Sink:MaD:533 |
+| Log4jJndiInjectionTest.java:845:155:845:162 | source(...) : String | Log4jJndiInjectionTest.java:845:146:845:162 | (...)... | provenance | Sink:MaD:534 |
+| Log4jJndiInjectionTest.java:845:155:845:162 | source(...) : String | Log4jJndiInjectionTest.java:845:146:845:162 | (...)... | provenance | Sink:MaD:533 |
+| Log4jJndiInjectionTest.java:846:140:846:147 | source(...) : String | Log4jJndiInjectionTest.java:846:131:846:147 | (...)... | provenance | Sink:MaD:534 |
+| Log4jJndiInjectionTest.java:846:140:846:147 | source(...) : String | Log4jJndiInjectionTest.java:846:131:846:147 | (...)... | provenance | Sink:MaD:533 |
+| Log4jJndiInjectionTest.java:847:125:847:132 | source(...) : String | Log4jJndiInjectionTest.java:847:116:847:132 | (...)... | provenance | Sink:MaD:534 |
+| Log4jJndiInjectionTest.java:847:125:847:132 | source(...) : String | Log4jJndiInjectionTest.java:847:116:847:132 | (...)... | provenance | Sink:MaD:533 |
+| Log4jJndiInjectionTest.java:848:110:848:117 | source(...) : String | Log4jJndiInjectionTest.java:848:101:848:117 | (...)... | provenance | Sink:MaD:534 |
+| Log4jJndiInjectionTest.java:848:110:848:117 | source(...) : String | Log4jJndiInjectionTest.java:848:101:848:117 | (...)... | provenance | Sink:MaD:533 |
+| Log4jJndiInjectionTest.java:849:95:849:102 | source(...) : String | Log4jJndiInjectionTest.java:849:86:849:102 | (...)... | provenance | Sink:MaD:534 |
+| Log4jJndiInjectionTest.java:849:95:849:102 | source(...) : String | Log4jJndiInjectionTest.java:849:86:849:102 | (...)... | provenance | Sink:MaD:533 |
+| Log4jJndiInjectionTest.java:850:80:850:87 | source(...) : String | Log4jJndiInjectionTest.java:850:71:850:87 | (...)... | provenance | Sink:MaD:534 |
+| Log4jJndiInjectionTest.java:850:80:850:87 | source(...) : String | Log4jJndiInjectionTest.java:850:71:850:87 | (...)... | provenance | Sink:MaD:533 |
+| Log4jJndiInjectionTest.java:851:65:851:72 | source(...) : String | Log4jJndiInjectionTest.java:851:56:851:72 | (...)... | provenance | Sink:MaD:534 |
+| Log4jJndiInjectionTest.java:851:65:851:72 | source(...) : String | Log4jJndiInjectionTest.java:851:56:851:72 | (...)... | provenance | Sink:MaD:533 |
+| Log4jJndiInjectionTest.java:852:50:852:57 | source(...) : String | Log4jJndiInjectionTest.java:852:41:852:57 | (...)... | provenance | Sink:MaD:534 |
+| Log4jJndiInjectionTest.java:852:50:852:57 | source(...) : String | Log4jJndiInjectionTest.java:852:41:852:57 | (...)... | provenance | Sink:MaD:533 |
+| Log4jJndiInjectionTest.java:853:35:853:42 | source(...) : String | Log4jJndiInjectionTest.java:853:26:853:42 | (...)... | provenance | Sink:MaD:534 |
+| Log4jJndiInjectionTest.java:853:35:853:42 | source(...) : String | Log4jJndiInjectionTest.java:853:26:853:42 | (...)... | provenance | Sink:MaD:533 |
+| Log4jJndiInjectionTest.java:854:35:854:42 | source(...) : String | Log4jJndiInjectionTest.java:854:26:854:42 | (...)... | provenance | Sink:MaD:518 |
+| Log4jJndiInjectionTest.java:854:35:854:42 | source(...) : String | Log4jJndiInjectionTest.java:854:26:854:42 | (...)... | provenance | Sink:MaD:517 |
+| Log4jJndiInjectionTest.java:855:55:855:62 | source(...) : String | Log4jJndiInjectionTest.java:855:41:855:62 | (...)... | provenance | Sink:MaD:518 |
+| Log4jJndiInjectionTest.java:855:55:855:62 | source(...) : String | Log4jJndiInjectionTest.java:855:41:855:62 | (...)... | provenance | Sink:MaD:517 |
+| Log4jJndiInjectionTest.java:856:35:856:42 | source(...) : String | Log4jJndiInjectionTest.java:856:26:856:42 | (...)... | provenance | Sink:MaD:538 |
+| Log4jJndiInjectionTest.java:856:35:856:42 | source(...) : String | Log4jJndiInjectionTest.java:856:26:856:42 | (...)... | provenance | Sink:MaD:537 |
+| Log4jJndiInjectionTest.java:857:40:857:47 | source(...) : String | Log4jJndiInjectionTest.java:857:26:857:47 | (...)... | provenance | Sink:MaD:540 |
+| Log4jJndiInjectionTest.java:857:40:857:47 | source(...) : String | Log4jJndiInjectionTest.java:857:26:857:47 | (...)... | provenance | Sink:MaD:539 |
+| Log4jJndiInjectionTest.java:858:40:858:47 | source(...) : String | Log4jJndiInjectionTest.java:858:26:858:47 | (...)... | provenance | Sink:MaD:542 |
+| Log4jJndiInjectionTest.java:858:40:858:47 | source(...) : String | Log4jJndiInjectionTest.java:858:26:858:47 | (...)... | provenance | Sink:MaD:541 |
+| Log4jJndiInjectionTest.java:859:40:859:47 | source(...) : String | Log4jJndiInjectionTest.java:859:25:859:47 | (...)... | provenance | Sink:MaD:544 |
+| Log4jJndiInjectionTest.java:859:40:859:47 | source(...) : String | Log4jJndiInjectionTest.java:859:25:859:47 | (...)... | provenance | Sink:MaD:543 |
+| Log4jJndiInjectionTest.java:860:40:860:47 | source(...) : String | Log4jJndiInjectionTest.java:860:25:860:47 | (...)... | provenance | Sink:MaD:546 |
+| Log4jJndiInjectionTest.java:860:40:860:47 | source(...) : String | Log4jJndiInjectionTest.java:860:25:860:47 | (...)... | provenance | Sink:MaD:545 |
+| Log4jJndiInjectionTest.java:861:55:861:62 | source(...) : String | Log4jJndiInjectionTest.java:861:40:861:62 | (...)... | provenance | Sink:MaD:548 |
+| Log4jJndiInjectionTest.java:861:55:861:62 | source(...) : String | Log4jJndiInjectionTest.java:861:40:861:62 | (...)... | provenance | Sink:MaD:547 |
+| Log4jJndiInjectionTest.java:862:55:862:62 | source(...) : String | Log4jJndiInjectionTest.java:862:40:862:62 | (...)... | provenance | Sink:MaD:550 |
+| Log4jJndiInjectionTest.java:862:55:862:62 | source(...) : String | Log4jJndiInjectionTest.java:862:40:862:62 | (...)... | provenance | Sink:MaD:549 |
+| Log4jJndiInjectionTest.java:863:50:863:57 | source(...) : String | Log4jJndiInjectionTest.java:863:40:863:57 | (...)... | provenance | Sink:MaD:552 |
+| Log4jJndiInjectionTest.java:863:50:863:57 | source(...) : String | Log4jJndiInjectionTest.java:863:40:863:57 | (...)... | provenance | Sink:MaD:551 |
+| Log4jJndiInjectionTest.java:864:58:864:65 | source(...) : String | Log4jJndiInjectionTest.java:864:40:864:65 | (...)... | provenance | Sink:MaD:554 |
+| Log4jJndiInjectionTest.java:864:58:864:65 | source(...) : String | Log4jJndiInjectionTest.java:864:40:864:65 | (...)... | provenance | Sink:MaD:553 |
+| Log4jJndiInjectionTest.java:865:58:865:65 | source(...) : String | Log4jJndiInjectionTest.java:865:40:865:65 | (...)... | provenance | Sink:MaD:556 |
+| Log4jJndiInjectionTest.java:865:58:865:65 | source(...) : String | Log4jJndiInjectionTest.java:865:40:865:65 | (...)... | provenance | Sink:MaD:555 |
+| Log4jJndiInjectionTest.java:867:49:867:56 | source(...) : String | Log4jJndiInjectionTest.java:867:40:867:56 | (...)... | provenance | Sink:MaD:560 |
+| Log4jJndiInjectionTest.java:867:49:867:56 | source(...) : String | Log4jJndiInjectionTest.java:867:40:867:56 | (...)... | provenance | Sink:MaD:559 |
+| Log4jJndiInjectionTest.java:868:49:868:56 | source(...) : String | Log4jJndiInjectionTest.java:868:40:868:56 | (...)... | provenance | Sink:MaD:580 |
+| Log4jJndiInjectionTest.java:868:49:868:56 | source(...) : String | Log4jJndiInjectionTest.java:868:40:868:56 | (...)... | provenance | Sink:MaD:579 |
+| Log4jJndiInjectionTest.java:869:55:869:77 | {...} : Object[] [[]] : String | Log4jJndiInjectionTest.java:869:55:869:77 | new Object[] | provenance | Sink:MaD:580 |
+| Log4jJndiInjectionTest.java:869:55:869:77 | {...} : Object[] [[]] : String | Log4jJndiInjectionTest.java:869:55:869:77 | new Object[] | provenance | Sink:MaD:579 |
 | Log4jJndiInjectionTest.java:869:69:869:76 | source(...) : String | Log4jJndiInjectionTest.java:869:55:869:77 | {...} : Object[] [[]] : String | provenance |  |
-| Log4jJndiInjectionTest.java:870:64:870:71 | source(...) : String | Log4jJndiInjectionTest.java:870:55:870:71 | (...)... | provenance |  Sink:MaD:287 |
-| Log4jJndiInjectionTest.java:870:64:870:71 | source(...) : String | Log4jJndiInjectionTest.java:870:55:870:71 | (...)... | provenance |  Sink:MaD:603 |
-| Log4jJndiInjectionTest.java:871:49:871:56 | source(...) : String | Log4jJndiInjectionTest.java:871:40:871:56 | (...)... | provenance |  Sink:MaD:287 |
-| Log4jJndiInjectionTest.java:871:49:871:56 | source(...) : String | Log4jJndiInjectionTest.java:871:40:871:56 | (...)... | provenance |  Sink:MaD:603 |
-| Log4jJndiInjectionTest.java:872:79:872:86 | source(...) : String | Log4jJndiInjectionTest.java:872:70:872:86 | (...)... | provenance |  Sink:MaD:288 |
-| Log4jJndiInjectionTest.java:872:79:872:86 | source(...) : String | Log4jJndiInjectionTest.java:872:70:872:86 | (...)... | provenance |  Sink:MaD:604 |
-| Log4jJndiInjectionTest.java:873:64:873:71 | source(...) : String | Log4jJndiInjectionTest.java:873:55:873:71 | (...)... | provenance |  Sink:MaD:288 |
-| Log4jJndiInjectionTest.java:873:64:873:71 | source(...) : String | Log4jJndiInjectionTest.java:873:55:873:71 | (...)... | provenance |  Sink:MaD:604 |
-| Log4jJndiInjectionTest.java:874:49:874:56 | source(...) : String | Log4jJndiInjectionTest.java:874:40:874:56 | (...)... | provenance |  Sink:MaD:288 |
-| Log4jJndiInjectionTest.java:874:49:874:56 | source(...) : String | Log4jJndiInjectionTest.java:874:40:874:56 | (...)... | provenance |  Sink:MaD:604 |
-| Log4jJndiInjectionTest.java:875:94:875:101 | source(...) : String | Log4jJndiInjectionTest.java:875:85:875:101 | (...)... | provenance |  Sink:MaD:289 |
-| Log4jJndiInjectionTest.java:875:94:875:101 | source(...) : String | Log4jJndiInjectionTest.java:875:85:875:101 | (...)... | provenance |  Sink:MaD:605 |
-| Log4jJndiInjectionTest.java:876:79:876:86 | source(...) : String | Log4jJndiInjectionTest.java:876:70:876:86 | (...)... | provenance |  Sink:MaD:289 |
-| Log4jJndiInjectionTest.java:876:79:876:86 | source(...) : String | Log4jJndiInjectionTest.java:876:70:876:86 | (...)... | provenance |  Sink:MaD:605 |
-| Log4jJndiInjectionTest.java:877:64:877:71 | source(...) : String | Log4jJndiInjectionTest.java:877:55:877:71 | (...)... | provenance |  Sink:MaD:289 |
-| Log4jJndiInjectionTest.java:877:64:877:71 | source(...) : String | Log4jJndiInjectionTest.java:877:55:877:71 | (...)... | provenance |  Sink:MaD:605 |
-| Log4jJndiInjectionTest.java:878:49:878:56 | source(...) : String | Log4jJndiInjectionTest.java:878:40:878:56 | (...)... | provenance |  Sink:MaD:289 |
-| Log4jJndiInjectionTest.java:878:49:878:56 | source(...) : String | Log4jJndiInjectionTest.java:878:40:878:56 | (...)... | provenance |  Sink:MaD:605 |
-| Log4jJndiInjectionTest.java:879:109:879:116 | source(...) : String | Log4jJndiInjectionTest.java:879:100:879:116 | (...)... | provenance |  Sink:MaD:290 |
-| Log4jJndiInjectionTest.java:879:109:879:116 | source(...) : String | Log4jJndiInjectionTest.java:879:100:879:116 | (...)... | provenance |  Sink:MaD:606 |
-| Log4jJndiInjectionTest.java:880:94:880:101 | source(...) : String | Log4jJndiInjectionTest.java:880:85:880:101 | (...)... | provenance |  Sink:MaD:290 |
-| Log4jJndiInjectionTest.java:880:94:880:101 | source(...) : String | Log4jJndiInjectionTest.java:880:85:880:101 | (...)... | provenance |  Sink:MaD:606 |
-| Log4jJndiInjectionTest.java:881:79:881:86 | source(...) : String | Log4jJndiInjectionTest.java:881:70:881:86 | (...)... | provenance |  Sink:MaD:290 |
-| Log4jJndiInjectionTest.java:881:79:881:86 | source(...) : String | Log4jJndiInjectionTest.java:881:70:881:86 | (...)... | provenance |  Sink:MaD:606 |
-| Log4jJndiInjectionTest.java:882:64:882:71 | source(...) : String | Log4jJndiInjectionTest.java:882:55:882:71 | (...)... | provenance |  Sink:MaD:290 |
-| Log4jJndiInjectionTest.java:882:64:882:71 | source(...) : String | Log4jJndiInjectionTest.java:882:55:882:71 | (...)... | provenance |  Sink:MaD:606 |
-| Log4jJndiInjectionTest.java:883:49:883:56 | source(...) : String | Log4jJndiInjectionTest.java:883:40:883:56 | (...)... | provenance |  Sink:MaD:290 |
-| Log4jJndiInjectionTest.java:883:49:883:56 | source(...) : String | Log4jJndiInjectionTest.java:883:40:883:56 | (...)... | provenance |  Sink:MaD:606 |
-| Log4jJndiInjectionTest.java:884:124:884:131 | source(...) : String | Log4jJndiInjectionTest.java:884:115:884:131 | (...)... | provenance |  Sink:MaD:291 |
-| Log4jJndiInjectionTest.java:884:124:884:131 | source(...) : String | Log4jJndiInjectionTest.java:884:115:884:131 | (...)... | provenance |  Sink:MaD:607 |
-| Log4jJndiInjectionTest.java:885:109:885:116 | source(...) : String | Log4jJndiInjectionTest.java:885:100:885:116 | (...)... | provenance |  Sink:MaD:291 |
-| Log4jJndiInjectionTest.java:885:109:885:116 | source(...) : String | Log4jJndiInjectionTest.java:885:100:885:116 | (...)... | provenance |  Sink:MaD:607 |
-| Log4jJndiInjectionTest.java:886:94:886:101 | source(...) : String | Log4jJndiInjectionTest.java:886:85:886:101 | (...)... | provenance |  Sink:MaD:291 |
-| Log4jJndiInjectionTest.java:886:94:886:101 | source(...) : String | Log4jJndiInjectionTest.java:886:85:886:101 | (...)... | provenance |  Sink:MaD:607 |
-| Log4jJndiInjectionTest.java:887:79:887:86 | source(...) : String | Log4jJndiInjectionTest.java:887:70:887:86 | (...)... | provenance |  Sink:MaD:291 |
-| Log4jJndiInjectionTest.java:887:79:887:86 | source(...) : String | Log4jJndiInjectionTest.java:887:70:887:86 | (...)... | provenance |  Sink:MaD:607 |
-| Log4jJndiInjectionTest.java:888:64:888:71 | source(...) : String | Log4jJndiInjectionTest.java:888:55:888:71 | (...)... | provenance |  Sink:MaD:291 |
-| Log4jJndiInjectionTest.java:888:64:888:71 | source(...) : String | Log4jJndiInjectionTest.java:888:55:888:71 | (...)... | provenance |  Sink:MaD:607 |
-| Log4jJndiInjectionTest.java:889:49:889:56 | source(...) : String | Log4jJndiInjectionTest.java:889:40:889:56 | (...)... | provenance |  Sink:MaD:291 |
-| Log4jJndiInjectionTest.java:889:49:889:56 | source(...) : String | Log4jJndiInjectionTest.java:889:40:889:56 | (...)... | provenance |  Sink:MaD:607 |
-| Log4jJndiInjectionTest.java:890:139:890:146 | source(...) : String | Log4jJndiInjectionTest.java:890:130:890:146 | (...)... | provenance |  Sink:MaD:292 |
-| Log4jJndiInjectionTest.java:890:139:890:146 | source(...) : String | Log4jJndiInjectionTest.java:890:130:890:146 | (...)... | provenance |  Sink:MaD:608 |
-| Log4jJndiInjectionTest.java:891:124:891:131 | source(...) : String | Log4jJndiInjectionTest.java:891:115:891:131 | (...)... | provenance |  Sink:MaD:292 |
-| Log4jJndiInjectionTest.java:891:124:891:131 | source(...) : String | Log4jJndiInjectionTest.java:891:115:891:131 | (...)... | provenance |  Sink:MaD:608 |
-| Log4jJndiInjectionTest.java:892:109:892:116 | source(...) : String | Log4jJndiInjectionTest.java:892:100:892:116 | (...)... | provenance |  Sink:MaD:292 |
-| Log4jJndiInjectionTest.java:892:109:892:116 | source(...) : String | Log4jJndiInjectionTest.java:892:100:892:116 | (...)... | provenance |  Sink:MaD:608 |
-| Log4jJndiInjectionTest.java:893:94:893:101 | source(...) : String | Log4jJndiInjectionTest.java:893:85:893:101 | (...)... | provenance |  Sink:MaD:292 |
-| Log4jJndiInjectionTest.java:893:94:893:101 | source(...) : String | Log4jJndiInjectionTest.java:893:85:893:101 | (...)... | provenance |  Sink:MaD:608 |
-| Log4jJndiInjectionTest.java:894:79:894:86 | source(...) : String | Log4jJndiInjectionTest.java:894:70:894:86 | (...)... | provenance |  Sink:MaD:292 |
-| Log4jJndiInjectionTest.java:894:79:894:86 | source(...) : String | Log4jJndiInjectionTest.java:894:70:894:86 | (...)... | provenance |  Sink:MaD:608 |
-| Log4jJndiInjectionTest.java:895:64:895:71 | source(...) : String | Log4jJndiInjectionTest.java:895:55:895:71 | (...)... | provenance |  Sink:MaD:292 |
-| Log4jJndiInjectionTest.java:895:64:895:71 | source(...) : String | Log4jJndiInjectionTest.java:895:55:895:71 | (...)... | provenance |  Sink:MaD:608 |
-| Log4jJndiInjectionTest.java:896:49:896:56 | source(...) : String | Log4jJndiInjectionTest.java:896:40:896:56 | (...)... | provenance |  Sink:MaD:292 |
-| Log4jJndiInjectionTest.java:896:49:896:56 | source(...) : String | Log4jJndiInjectionTest.java:896:40:896:56 | (...)... | provenance |  Sink:MaD:608 |
-| Log4jJndiInjectionTest.java:897:154:897:161 | source(...) : String | Log4jJndiInjectionTest.java:897:145:897:161 | (...)... | provenance |  Sink:MaD:293 |
-| Log4jJndiInjectionTest.java:897:154:897:161 | source(...) : String | Log4jJndiInjectionTest.java:897:145:897:161 | (...)... | provenance |  Sink:MaD:609 |
-| Log4jJndiInjectionTest.java:898:139:898:146 | source(...) : String | Log4jJndiInjectionTest.java:898:130:898:146 | (...)... | provenance |  Sink:MaD:293 |
-| Log4jJndiInjectionTest.java:898:139:898:146 | source(...) : String | Log4jJndiInjectionTest.java:898:130:898:146 | (...)... | provenance |  Sink:MaD:609 |
-| Log4jJndiInjectionTest.java:899:124:899:131 | source(...) : String | Log4jJndiInjectionTest.java:899:115:899:131 | (...)... | provenance |  Sink:MaD:293 |
-| Log4jJndiInjectionTest.java:899:124:899:131 | source(...) : String | Log4jJndiInjectionTest.java:899:115:899:131 | (...)... | provenance |  Sink:MaD:609 |
-| Log4jJndiInjectionTest.java:900:109:900:116 | source(...) : String | Log4jJndiInjectionTest.java:900:100:900:116 | (...)... | provenance |  Sink:MaD:293 |
-| Log4jJndiInjectionTest.java:900:109:900:116 | source(...) : String | Log4jJndiInjectionTest.java:900:100:900:116 | (...)... | provenance |  Sink:MaD:609 |
-| Log4jJndiInjectionTest.java:901:94:901:101 | source(...) : String | Log4jJndiInjectionTest.java:901:85:901:101 | (...)... | provenance |  Sink:MaD:293 |
-| Log4jJndiInjectionTest.java:901:94:901:101 | source(...) : String | Log4jJndiInjectionTest.java:901:85:901:101 | (...)... | provenance |  Sink:MaD:609 |
-| Log4jJndiInjectionTest.java:902:79:902:86 | source(...) : String | Log4jJndiInjectionTest.java:902:70:902:86 | (...)... | provenance |  Sink:MaD:293 |
-| Log4jJndiInjectionTest.java:902:79:902:86 | source(...) : String | Log4jJndiInjectionTest.java:902:70:902:86 | (...)... | provenance |  Sink:MaD:609 |
-| Log4jJndiInjectionTest.java:903:64:903:71 | source(...) : String | Log4jJndiInjectionTest.java:903:55:903:71 | (...)... | provenance |  Sink:MaD:293 |
-| Log4jJndiInjectionTest.java:903:64:903:71 | source(...) : String | Log4jJndiInjectionTest.java:903:55:903:71 | (...)... | provenance |  Sink:MaD:609 |
-| Log4jJndiInjectionTest.java:904:49:904:56 | source(...) : String | Log4jJndiInjectionTest.java:904:40:904:56 | (...)... | provenance |  Sink:MaD:293 |
-| Log4jJndiInjectionTest.java:904:49:904:56 | source(...) : String | Log4jJndiInjectionTest.java:904:40:904:56 | (...)... | provenance |  Sink:MaD:609 |
-| Log4jJndiInjectionTest.java:905:169:905:176 | source(...) : String | Log4jJndiInjectionTest.java:905:160:905:176 | (...)... | provenance |  Sink:MaD:294 |
-| Log4jJndiInjectionTest.java:905:169:905:176 | source(...) : String | Log4jJndiInjectionTest.java:905:160:905:176 | (...)... | provenance |  Sink:MaD:610 |
-| Log4jJndiInjectionTest.java:906:154:906:161 | source(...) : String | Log4jJndiInjectionTest.java:906:145:906:161 | (...)... | provenance |  Sink:MaD:294 |
-| Log4jJndiInjectionTest.java:906:154:906:161 | source(...) : String | Log4jJndiInjectionTest.java:906:145:906:161 | (...)... | provenance |  Sink:MaD:610 |
-| Log4jJndiInjectionTest.java:907:139:907:146 | source(...) : String | Log4jJndiInjectionTest.java:907:130:907:146 | (...)... | provenance |  Sink:MaD:294 |
-| Log4jJndiInjectionTest.java:907:139:907:146 | source(...) : String | Log4jJndiInjectionTest.java:907:130:907:146 | (...)... | provenance |  Sink:MaD:610 |
-| Log4jJndiInjectionTest.java:908:124:908:131 | source(...) : String | Log4jJndiInjectionTest.java:908:115:908:131 | (...)... | provenance |  Sink:MaD:294 |
-| Log4jJndiInjectionTest.java:908:124:908:131 | source(...) : String | Log4jJndiInjectionTest.java:908:115:908:131 | (...)... | provenance |  Sink:MaD:610 |
-| Log4jJndiInjectionTest.java:909:109:909:116 | source(...) : String | Log4jJndiInjectionTest.java:909:100:909:116 | (...)... | provenance |  Sink:MaD:294 |
-| Log4jJndiInjectionTest.java:909:109:909:116 | source(...) : String | Log4jJndiInjectionTest.java:909:100:909:116 | (...)... | provenance |  Sink:MaD:610 |
-| Log4jJndiInjectionTest.java:910:94:910:101 | source(...) : String | Log4jJndiInjectionTest.java:910:85:910:101 | (...)... | provenance |  Sink:MaD:294 |
-| Log4jJndiInjectionTest.java:910:94:910:101 | source(...) : String | Log4jJndiInjectionTest.java:910:85:910:101 | (...)... | provenance |  Sink:MaD:610 |
-| Log4jJndiInjectionTest.java:911:79:911:86 | source(...) : String | Log4jJndiInjectionTest.java:911:70:911:86 | (...)... | provenance |  Sink:MaD:294 |
-| Log4jJndiInjectionTest.java:911:79:911:86 | source(...) : String | Log4jJndiInjectionTest.java:911:70:911:86 | (...)... | provenance |  Sink:MaD:610 |
-| Log4jJndiInjectionTest.java:912:64:912:71 | source(...) : String | Log4jJndiInjectionTest.java:912:55:912:71 | (...)... | provenance |  Sink:MaD:294 |
-| Log4jJndiInjectionTest.java:912:64:912:71 | source(...) : String | Log4jJndiInjectionTest.java:912:55:912:71 | (...)... | provenance |  Sink:MaD:610 |
-| Log4jJndiInjectionTest.java:913:49:913:56 | source(...) : String | Log4jJndiInjectionTest.java:913:40:913:56 | (...)... | provenance |  Sink:MaD:294 |
-| Log4jJndiInjectionTest.java:913:49:913:56 | source(...) : String | Log4jJndiInjectionTest.java:913:40:913:56 | (...)... | provenance |  Sink:MaD:610 |
-| Log4jJndiInjectionTest.java:914:184:914:191 | source(...) : String | Log4jJndiInjectionTest.java:914:175:914:191 | (...)... | provenance |  Sink:MaD:295 |
-| Log4jJndiInjectionTest.java:914:184:914:191 | source(...) : String | Log4jJndiInjectionTest.java:914:175:914:191 | (...)... | provenance |  Sink:MaD:611 |
-| Log4jJndiInjectionTest.java:915:169:915:176 | source(...) : String | Log4jJndiInjectionTest.java:915:160:915:176 | (...)... | provenance |  Sink:MaD:295 |
-| Log4jJndiInjectionTest.java:915:169:915:176 | source(...) : String | Log4jJndiInjectionTest.java:915:160:915:176 | (...)... | provenance |  Sink:MaD:611 |
-| Log4jJndiInjectionTest.java:916:154:916:161 | source(...) : String | Log4jJndiInjectionTest.java:916:145:916:161 | (...)... | provenance |  Sink:MaD:295 |
-| Log4jJndiInjectionTest.java:916:154:916:161 | source(...) : String | Log4jJndiInjectionTest.java:916:145:916:161 | (...)... | provenance |  Sink:MaD:611 |
-| Log4jJndiInjectionTest.java:917:139:917:146 | source(...) : String | Log4jJndiInjectionTest.java:917:130:917:146 | (...)... | provenance |  Sink:MaD:295 |
-| Log4jJndiInjectionTest.java:917:139:917:146 | source(...) : String | Log4jJndiInjectionTest.java:917:130:917:146 | (...)... | provenance |  Sink:MaD:611 |
-| Log4jJndiInjectionTest.java:918:124:918:131 | source(...) : String | Log4jJndiInjectionTest.java:918:115:918:131 | (...)... | provenance |  Sink:MaD:295 |
-| Log4jJndiInjectionTest.java:918:124:918:131 | source(...) : String | Log4jJndiInjectionTest.java:918:115:918:131 | (...)... | provenance |  Sink:MaD:611 |
-| Log4jJndiInjectionTest.java:919:109:919:116 | source(...) : String | Log4jJndiInjectionTest.java:919:100:919:116 | (...)... | provenance |  Sink:MaD:295 |
-| Log4jJndiInjectionTest.java:919:109:919:116 | source(...) : String | Log4jJndiInjectionTest.java:919:100:919:116 | (...)... | provenance |  Sink:MaD:611 |
-| Log4jJndiInjectionTest.java:920:94:920:101 | source(...) : String | Log4jJndiInjectionTest.java:920:85:920:101 | (...)... | provenance |  Sink:MaD:295 |
-| Log4jJndiInjectionTest.java:920:94:920:101 | source(...) : String | Log4jJndiInjectionTest.java:920:85:920:101 | (...)... | provenance |  Sink:MaD:611 |
-| Log4jJndiInjectionTest.java:921:79:921:86 | source(...) : String | Log4jJndiInjectionTest.java:921:70:921:86 | (...)... | provenance |  Sink:MaD:295 |
-| Log4jJndiInjectionTest.java:921:79:921:86 | source(...) : String | Log4jJndiInjectionTest.java:921:70:921:86 | (...)... | provenance |  Sink:MaD:611 |
-| Log4jJndiInjectionTest.java:922:64:922:71 | source(...) : String | Log4jJndiInjectionTest.java:922:55:922:71 | (...)... | provenance |  Sink:MaD:295 |
-| Log4jJndiInjectionTest.java:922:64:922:71 | source(...) : String | Log4jJndiInjectionTest.java:922:55:922:71 | (...)... | provenance |  Sink:MaD:611 |
-| Log4jJndiInjectionTest.java:923:49:923:56 | source(...) : String | Log4jJndiInjectionTest.java:923:40:923:56 | (...)... | provenance |  Sink:MaD:295 |
-| Log4jJndiInjectionTest.java:923:49:923:56 | source(...) : String | Log4jJndiInjectionTest.java:923:40:923:56 | (...)... | provenance |  Sink:MaD:611 |
-| Log4jJndiInjectionTest.java:924:49:924:56 | source(...) : String | Log4jJndiInjectionTest.java:924:40:924:56 | (...)... | provenance |  Sink:MaD:287 |
-| Log4jJndiInjectionTest.java:924:49:924:56 | source(...) : String | Log4jJndiInjectionTest.java:924:40:924:56 | (...)... | provenance |  Sink:MaD:603 |
-| Log4jJndiInjectionTest.java:925:69:925:76 | source(...) : String | Log4jJndiInjectionTest.java:925:55:925:76 | (...)... | provenance |  Sink:MaD:287 |
-| Log4jJndiInjectionTest.java:925:69:925:76 | source(...) : String | Log4jJndiInjectionTest.java:925:55:925:76 | (...)... | provenance |  Sink:MaD:603 |
-| Log4jJndiInjectionTest.java:926:49:926:56 | source(...) : String | Log4jJndiInjectionTest.java:926:40:926:56 | (...)... | provenance |  Sink:MaD:297 |
-| Log4jJndiInjectionTest.java:926:49:926:56 | source(...) : String | Log4jJndiInjectionTest.java:926:40:926:56 | (...)... | provenance |  Sink:MaD:613 |
-| Log4jJndiInjectionTest.java:927:54:927:61 | source(...) : String | Log4jJndiInjectionTest.java:927:40:927:61 | (...)... | provenance |  Sink:MaD:298 |
-| Log4jJndiInjectionTest.java:927:54:927:61 | source(...) : String | Log4jJndiInjectionTest.java:927:40:927:61 | (...)... | provenance |  Sink:MaD:614 |
-| Log4jJndiInjectionTest.java:928:54:928:61 | source(...) : String | Log4jJndiInjectionTest.java:928:40:928:61 | (...)... | provenance |  Sink:MaD:299 |
-| Log4jJndiInjectionTest.java:928:54:928:61 | source(...) : String | Log4jJndiInjectionTest.java:928:40:928:61 | (...)... | provenance |  Sink:MaD:615 |
-| Log4jJndiInjectionTest.java:929:43:929:50 | source(...) : String | Log4jJndiInjectionTest.java:929:25:929:50 | (...)... | provenance |  Sink:MaD:302 |
-| Log4jJndiInjectionTest.java:929:43:929:50 | source(...) : String | Log4jJndiInjectionTest.java:929:25:929:50 | (...)... | provenance |  Sink:MaD:618 |
-| Log4jJndiInjectionTest.java:930:43:930:50 | source(...) : String | Log4jJndiInjectionTest.java:930:25:930:50 | (...)... | provenance |  Sink:MaD:303 |
-| Log4jJndiInjectionTest.java:930:43:930:50 | source(...) : String | Log4jJndiInjectionTest.java:930:25:930:50 | (...)... | provenance |  Sink:MaD:619 |
-| Log4jJndiInjectionTest.java:931:35:931:42 | source(...) : String | Log4jJndiInjectionTest.java:931:25:931:42 | (...)... | provenance |  Sink:MaD:300 |
-| Log4jJndiInjectionTest.java:931:35:931:42 | source(...) : String | Log4jJndiInjectionTest.java:931:25:931:42 | (...)... | provenance |  Sink:MaD:616 |
-| Log4jJndiInjectionTest.java:932:35:932:42 | source(...) : String | Log4jJndiInjectionTest.java:932:25:932:42 | (...)... | provenance |  Sink:MaD:301 |
-| Log4jJndiInjectionTest.java:932:35:932:42 | source(...) : String | Log4jJndiInjectionTest.java:932:25:932:42 | (...)... | provenance |  Sink:MaD:617 |
-| Log4jJndiInjectionTest.java:935:34:935:41 | source(...) : String | Log4jJndiInjectionTest.java:935:25:935:41 | (...)... | provenance |  Sink:MaD:306 |
-| Log4jJndiInjectionTest.java:935:34:935:41 | source(...) : String | Log4jJndiInjectionTest.java:935:25:935:41 | (...)... | provenance |  Sink:MaD:622 |
-| Log4jJndiInjectionTest.java:936:34:936:41 | source(...) : String | Log4jJndiInjectionTest.java:936:25:936:41 | (...)... | provenance |  Sink:MaD:316 |
-| Log4jJndiInjectionTest.java:936:34:936:41 | source(...) : String | Log4jJndiInjectionTest.java:936:25:936:41 | (...)... | provenance |  Sink:MaD:632 |
-| Log4jJndiInjectionTest.java:937:40:937:62 | {...} : Object[] [[]] : String | Log4jJndiInjectionTest.java:937:40:937:62 | new Object[] | provenance |  Sink:MaD:316 |
-| Log4jJndiInjectionTest.java:937:40:937:62 | {...} : Object[] [[]] : String | Log4jJndiInjectionTest.java:937:40:937:62 | new Object[] | provenance |  Sink:MaD:632 |
+| Log4jJndiInjectionTest.java:870:64:870:71 | source(...) : String | Log4jJndiInjectionTest.java:870:55:870:71 | (...)... | provenance | Sink:MaD:562 |
+| Log4jJndiInjectionTest.java:870:64:870:71 | source(...) : String | Log4jJndiInjectionTest.java:870:55:870:71 | (...)... | provenance | Sink:MaD:561 |
+| Log4jJndiInjectionTest.java:871:49:871:56 | source(...) : String | Log4jJndiInjectionTest.java:871:40:871:56 | (...)... | provenance | Sink:MaD:562 |
+| Log4jJndiInjectionTest.java:871:49:871:56 | source(...) : String | Log4jJndiInjectionTest.java:871:40:871:56 | (...)... | provenance | Sink:MaD:561 |
+| Log4jJndiInjectionTest.java:872:79:872:86 | source(...) : String | Log4jJndiInjectionTest.java:872:70:872:86 | (...)... | provenance | Sink:MaD:564 |
+| Log4jJndiInjectionTest.java:872:79:872:86 | source(...) : String | Log4jJndiInjectionTest.java:872:70:872:86 | (...)... | provenance | Sink:MaD:563 |
+| Log4jJndiInjectionTest.java:873:64:873:71 | source(...) : String | Log4jJndiInjectionTest.java:873:55:873:71 | (...)... | provenance | Sink:MaD:564 |
+| Log4jJndiInjectionTest.java:873:64:873:71 | source(...) : String | Log4jJndiInjectionTest.java:873:55:873:71 | (...)... | provenance | Sink:MaD:563 |
+| Log4jJndiInjectionTest.java:874:49:874:56 | source(...) : String | Log4jJndiInjectionTest.java:874:40:874:56 | (...)... | provenance | Sink:MaD:564 |
+| Log4jJndiInjectionTest.java:874:49:874:56 | source(...) : String | Log4jJndiInjectionTest.java:874:40:874:56 | (...)... | provenance | Sink:MaD:563 |
+| Log4jJndiInjectionTest.java:875:94:875:101 | source(...) : String | Log4jJndiInjectionTest.java:875:85:875:101 | (...)... | provenance | Sink:MaD:566 |
+| Log4jJndiInjectionTest.java:875:94:875:101 | source(...) : String | Log4jJndiInjectionTest.java:875:85:875:101 | (...)... | provenance | Sink:MaD:565 |
+| Log4jJndiInjectionTest.java:876:79:876:86 | source(...) : String | Log4jJndiInjectionTest.java:876:70:876:86 | (...)... | provenance | Sink:MaD:566 |
+| Log4jJndiInjectionTest.java:876:79:876:86 | source(...) : String | Log4jJndiInjectionTest.java:876:70:876:86 | (...)... | provenance | Sink:MaD:565 |
+| Log4jJndiInjectionTest.java:877:64:877:71 | source(...) : String | Log4jJndiInjectionTest.java:877:55:877:71 | (...)... | provenance | Sink:MaD:566 |
+| Log4jJndiInjectionTest.java:877:64:877:71 | source(...) : String | Log4jJndiInjectionTest.java:877:55:877:71 | (...)... | provenance | Sink:MaD:565 |
+| Log4jJndiInjectionTest.java:878:49:878:56 | source(...) : String | Log4jJndiInjectionTest.java:878:40:878:56 | (...)... | provenance | Sink:MaD:566 |
+| Log4jJndiInjectionTest.java:878:49:878:56 | source(...) : String | Log4jJndiInjectionTest.java:878:40:878:56 | (...)... | provenance | Sink:MaD:565 |
+| Log4jJndiInjectionTest.java:879:109:879:116 | source(...) : String | Log4jJndiInjectionTest.java:879:100:879:116 | (...)... | provenance | Sink:MaD:568 |
+| Log4jJndiInjectionTest.java:879:109:879:116 | source(...) : String | Log4jJndiInjectionTest.java:879:100:879:116 | (...)... | provenance | Sink:MaD:567 |
+| Log4jJndiInjectionTest.java:880:94:880:101 | source(...) : String | Log4jJndiInjectionTest.java:880:85:880:101 | (...)... | provenance | Sink:MaD:568 |
+| Log4jJndiInjectionTest.java:880:94:880:101 | source(...) : String | Log4jJndiInjectionTest.java:880:85:880:101 | (...)... | provenance | Sink:MaD:567 |
+| Log4jJndiInjectionTest.java:881:79:881:86 | source(...) : String | Log4jJndiInjectionTest.java:881:70:881:86 | (...)... | provenance | Sink:MaD:568 |
+| Log4jJndiInjectionTest.java:881:79:881:86 | source(...) : String | Log4jJndiInjectionTest.java:881:70:881:86 | (...)... | provenance | Sink:MaD:567 |
+| Log4jJndiInjectionTest.java:882:64:882:71 | source(...) : String | Log4jJndiInjectionTest.java:882:55:882:71 | (...)... | provenance | Sink:MaD:568 |
+| Log4jJndiInjectionTest.java:882:64:882:71 | source(...) : String | Log4jJndiInjectionTest.java:882:55:882:71 | (...)... | provenance | Sink:MaD:567 |
+| Log4jJndiInjectionTest.java:883:49:883:56 | source(...) : String | Log4jJndiInjectionTest.java:883:40:883:56 | (...)... | provenance | Sink:MaD:568 |
+| Log4jJndiInjectionTest.java:883:49:883:56 | source(...) : String | Log4jJndiInjectionTest.java:883:40:883:56 | (...)... | provenance | Sink:MaD:567 |
+| Log4jJndiInjectionTest.java:884:124:884:131 | source(...) : String | Log4jJndiInjectionTest.java:884:115:884:131 | (...)... | provenance | Sink:MaD:570 |
+| Log4jJndiInjectionTest.java:884:124:884:131 | source(...) : String | Log4jJndiInjectionTest.java:884:115:884:131 | (...)... | provenance | Sink:MaD:569 |
+| Log4jJndiInjectionTest.java:885:109:885:116 | source(...) : String | Log4jJndiInjectionTest.java:885:100:885:116 | (...)... | provenance | Sink:MaD:570 |
+| Log4jJndiInjectionTest.java:885:109:885:116 | source(...) : String | Log4jJndiInjectionTest.java:885:100:885:116 | (...)... | provenance | Sink:MaD:569 |
+| Log4jJndiInjectionTest.java:886:94:886:101 | source(...) : String | Log4jJndiInjectionTest.java:886:85:886:101 | (...)... | provenance | Sink:MaD:570 |
+| Log4jJndiInjectionTest.java:886:94:886:101 | source(...) : String | Log4jJndiInjectionTest.java:886:85:886:101 | (...)... | provenance | Sink:MaD:569 |
+| Log4jJndiInjectionTest.java:887:79:887:86 | source(...) : String | Log4jJndiInjectionTest.java:887:70:887:86 | (...)... | provenance | Sink:MaD:570 |
+| Log4jJndiInjectionTest.java:887:79:887:86 | source(...) : String | Log4jJndiInjectionTest.java:887:70:887:86 | (...)... | provenance | Sink:MaD:569 |
+| Log4jJndiInjectionTest.java:888:64:888:71 | source(...) : String | Log4jJndiInjectionTest.java:888:55:888:71 | (...)... | provenance | Sink:MaD:570 |
+| Log4jJndiInjectionTest.java:888:64:888:71 | source(...) : String | Log4jJndiInjectionTest.java:888:55:888:71 | (...)... | provenance | Sink:MaD:569 |
+| Log4jJndiInjectionTest.java:889:49:889:56 | source(...) : String | Log4jJndiInjectionTest.java:889:40:889:56 | (...)... | provenance | Sink:MaD:570 |
+| Log4jJndiInjectionTest.java:889:49:889:56 | source(...) : String | Log4jJndiInjectionTest.java:889:40:889:56 | (...)... | provenance | Sink:MaD:569 |
+| Log4jJndiInjectionTest.java:890:139:890:146 | source(...) : String | Log4jJndiInjectionTest.java:890:130:890:146 | (...)... | provenance | Sink:MaD:572 |
+| Log4jJndiInjectionTest.java:890:139:890:146 | source(...) : String | Log4jJndiInjectionTest.java:890:130:890:146 | (...)... | provenance | Sink:MaD:571 |
+| Log4jJndiInjectionTest.java:891:124:891:131 | source(...) : String | Log4jJndiInjectionTest.java:891:115:891:131 | (...)... | provenance | Sink:MaD:572 |
+| Log4jJndiInjectionTest.java:891:124:891:131 | source(...) : String | Log4jJndiInjectionTest.java:891:115:891:131 | (...)... | provenance | Sink:MaD:571 |
+| Log4jJndiInjectionTest.java:892:109:892:116 | source(...) : String | Log4jJndiInjectionTest.java:892:100:892:116 | (...)... | provenance | Sink:MaD:572 |
+| Log4jJndiInjectionTest.java:892:109:892:116 | source(...) : String | Log4jJndiInjectionTest.java:892:100:892:116 | (...)... | provenance | Sink:MaD:571 |
+| Log4jJndiInjectionTest.java:893:94:893:101 | source(...) : String | Log4jJndiInjectionTest.java:893:85:893:101 | (...)... | provenance | Sink:MaD:572 |
+| Log4jJndiInjectionTest.java:893:94:893:101 | source(...) : String | Log4jJndiInjectionTest.java:893:85:893:101 | (...)... | provenance | Sink:MaD:571 |
+| Log4jJndiInjectionTest.java:894:79:894:86 | source(...) : String | Log4jJndiInjectionTest.java:894:70:894:86 | (...)... | provenance | Sink:MaD:572 |
+| Log4jJndiInjectionTest.java:894:79:894:86 | source(...) : String | Log4jJndiInjectionTest.java:894:70:894:86 | (...)... | provenance | Sink:MaD:571 |
+| Log4jJndiInjectionTest.java:895:64:895:71 | source(...) : String | Log4jJndiInjectionTest.java:895:55:895:71 | (...)... | provenance | Sink:MaD:572 |
+| Log4jJndiInjectionTest.java:895:64:895:71 | source(...) : String | Log4jJndiInjectionTest.java:895:55:895:71 | (...)... | provenance | Sink:MaD:571 |
+| Log4jJndiInjectionTest.java:896:49:896:56 | source(...) : String | Log4jJndiInjectionTest.java:896:40:896:56 | (...)... | provenance | Sink:MaD:572 |
+| Log4jJndiInjectionTest.java:896:49:896:56 | source(...) : String | Log4jJndiInjectionTest.java:896:40:896:56 | (...)... | provenance | Sink:MaD:571 |
+| Log4jJndiInjectionTest.java:897:154:897:161 | source(...) : String | Log4jJndiInjectionTest.java:897:145:897:161 | (...)... | provenance | Sink:MaD:574 |
+| Log4jJndiInjectionTest.java:897:154:897:161 | source(...) : String | Log4jJndiInjectionTest.java:897:145:897:161 | (...)... | provenance | Sink:MaD:573 |
+| Log4jJndiInjectionTest.java:898:139:898:146 | source(...) : String | Log4jJndiInjectionTest.java:898:130:898:146 | (...)... | provenance | Sink:MaD:574 |
+| Log4jJndiInjectionTest.java:898:139:898:146 | source(...) : String | Log4jJndiInjectionTest.java:898:130:898:146 | (...)... | provenance | Sink:MaD:573 |
+| Log4jJndiInjectionTest.java:899:124:899:131 | source(...) : String | Log4jJndiInjectionTest.java:899:115:899:131 | (...)... | provenance | Sink:MaD:574 |
+| Log4jJndiInjectionTest.java:899:124:899:131 | source(...) : String | Log4jJndiInjectionTest.java:899:115:899:131 | (...)... | provenance | Sink:MaD:573 |
+| Log4jJndiInjectionTest.java:900:109:900:116 | source(...) : String | Log4jJndiInjectionTest.java:900:100:900:116 | (...)... | provenance | Sink:MaD:574 |
+| Log4jJndiInjectionTest.java:900:109:900:116 | source(...) : String | Log4jJndiInjectionTest.java:900:100:900:116 | (...)... | provenance | Sink:MaD:573 |
+| Log4jJndiInjectionTest.java:901:94:901:101 | source(...) : String | Log4jJndiInjectionTest.java:901:85:901:101 | (...)... | provenance | Sink:MaD:574 |
+| Log4jJndiInjectionTest.java:901:94:901:101 | source(...) : String | Log4jJndiInjectionTest.java:901:85:901:101 | (...)... | provenance | Sink:MaD:573 |
+| Log4jJndiInjectionTest.java:902:79:902:86 | source(...) : String | Log4jJndiInjectionTest.java:902:70:902:86 | (...)... | provenance | Sink:MaD:574 |
+| Log4jJndiInjectionTest.java:902:79:902:86 | source(...) : String | Log4jJndiInjectionTest.java:902:70:902:86 | (...)... | provenance | Sink:MaD:573 |
+| Log4jJndiInjectionTest.java:903:64:903:71 | source(...) : String | Log4jJndiInjectionTest.java:903:55:903:71 | (...)... | provenance | Sink:MaD:574 |
+| Log4jJndiInjectionTest.java:903:64:903:71 | source(...) : String | Log4jJndiInjectionTest.java:903:55:903:71 | (...)... | provenance | Sink:MaD:573 |
+| Log4jJndiInjectionTest.java:904:49:904:56 | source(...) : String | Log4jJndiInjectionTest.java:904:40:904:56 | (...)... | provenance | Sink:MaD:574 |
+| Log4jJndiInjectionTest.java:904:49:904:56 | source(...) : String | Log4jJndiInjectionTest.java:904:40:904:56 | (...)... | provenance | Sink:MaD:573 |
+| Log4jJndiInjectionTest.java:905:169:905:176 | source(...) : String | Log4jJndiInjectionTest.java:905:160:905:176 | (...)... | provenance | Sink:MaD:576 |
+| Log4jJndiInjectionTest.java:905:169:905:176 | source(...) : String | Log4jJndiInjectionTest.java:905:160:905:176 | (...)... | provenance | Sink:MaD:575 |
+| Log4jJndiInjectionTest.java:906:154:906:161 | source(...) : String | Log4jJndiInjectionTest.java:906:145:906:161 | (...)... | provenance | Sink:MaD:576 |
+| Log4jJndiInjectionTest.java:906:154:906:161 | source(...) : String | Log4jJndiInjectionTest.java:906:145:906:161 | (...)... | provenance | Sink:MaD:575 |
+| Log4jJndiInjectionTest.java:907:139:907:146 | source(...) : String | Log4jJndiInjectionTest.java:907:130:907:146 | (...)... | provenance | Sink:MaD:576 |
+| Log4jJndiInjectionTest.java:907:139:907:146 | source(...) : String | Log4jJndiInjectionTest.java:907:130:907:146 | (...)... | provenance | Sink:MaD:575 |
+| Log4jJndiInjectionTest.java:908:124:908:131 | source(...) : String | Log4jJndiInjectionTest.java:908:115:908:131 | (...)... | provenance | Sink:MaD:576 |
+| Log4jJndiInjectionTest.java:908:124:908:131 | source(...) : String | Log4jJndiInjectionTest.java:908:115:908:131 | (...)... | provenance | Sink:MaD:575 |
+| Log4jJndiInjectionTest.java:909:109:909:116 | source(...) : String | Log4jJndiInjectionTest.java:909:100:909:116 | (...)... | provenance | Sink:MaD:576 |
+| Log4jJndiInjectionTest.java:909:109:909:116 | source(...) : String | Log4jJndiInjectionTest.java:909:100:909:116 | (...)... | provenance | Sink:MaD:575 |
+| Log4jJndiInjectionTest.java:910:94:910:101 | source(...) : String | Log4jJndiInjectionTest.java:910:85:910:101 | (...)... | provenance | Sink:MaD:576 |
+| Log4jJndiInjectionTest.java:910:94:910:101 | source(...) : String | Log4jJndiInjectionTest.java:910:85:910:101 | (...)... | provenance | Sink:MaD:575 |
+| Log4jJndiInjectionTest.java:911:79:911:86 | source(...) : String | Log4jJndiInjectionTest.java:911:70:911:86 | (...)... | provenance | Sink:MaD:576 |
+| Log4jJndiInjectionTest.java:911:79:911:86 | source(...) : String | Log4jJndiInjectionTest.java:911:70:911:86 | (...)... | provenance | Sink:MaD:575 |
+| Log4jJndiInjectionTest.java:912:64:912:71 | source(...) : String | Log4jJndiInjectionTest.java:912:55:912:71 | (...)... | provenance | Sink:MaD:576 |
+| Log4jJndiInjectionTest.java:912:64:912:71 | source(...) : String | Log4jJndiInjectionTest.java:912:55:912:71 | (...)... | provenance | Sink:MaD:575 |
+| Log4jJndiInjectionTest.java:913:49:913:56 | source(...) : String | Log4jJndiInjectionTest.java:913:40:913:56 | (...)... | provenance | Sink:MaD:576 |
+| Log4jJndiInjectionTest.java:913:49:913:56 | source(...) : String | Log4jJndiInjectionTest.java:913:40:913:56 | (...)... | provenance | Sink:MaD:575 |
+| Log4jJndiInjectionTest.java:914:184:914:191 | source(...) : String | Log4jJndiInjectionTest.java:914:175:914:191 | (...)... | provenance | Sink:MaD:578 |
+| Log4jJndiInjectionTest.java:914:184:914:191 | source(...) : String | Log4jJndiInjectionTest.java:914:175:914:191 | (...)... | provenance | Sink:MaD:577 |
+| Log4jJndiInjectionTest.java:915:169:915:176 | source(...) : String | Log4jJndiInjectionTest.java:915:160:915:176 | (...)... | provenance | Sink:MaD:578 |
+| Log4jJndiInjectionTest.java:915:169:915:176 | source(...) : String | Log4jJndiInjectionTest.java:915:160:915:176 | (...)... | provenance | Sink:MaD:577 |
+| Log4jJndiInjectionTest.java:916:154:916:161 | source(...) : String | Log4jJndiInjectionTest.java:916:145:916:161 | (...)... | provenance | Sink:MaD:578 |
+| Log4jJndiInjectionTest.java:916:154:916:161 | source(...) : String | Log4jJndiInjectionTest.java:916:145:916:161 | (...)... | provenance | Sink:MaD:577 |
+| Log4jJndiInjectionTest.java:917:139:917:146 | source(...) : String | Log4jJndiInjectionTest.java:917:130:917:146 | (...)... | provenance | Sink:MaD:578 |
+| Log4jJndiInjectionTest.java:917:139:917:146 | source(...) : String | Log4jJndiInjectionTest.java:917:130:917:146 | (...)... | provenance | Sink:MaD:577 |
+| Log4jJndiInjectionTest.java:918:124:918:131 | source(...) : String | Log4jJndiInjectionTest.java:918:115:918:131 | (...)... | provenance | Sink:MaD:578 |
+| Log4jJndiInjectionTest.java:918:124:918:131 | source(...) : String | Log4jJndiInjectionTest.java:918:115:918:131 | (...)... | provenance | Sink:MaD:577 |
+| Log4jJndiInjectionTest.java:919:109:919:116 | source(...) : String | Log4jJndiInjectionTest.java:919:100:919:116 | (...)... | provenance | Sink:MaD:578 |
+| Log4jJndiInjectionTest.java:919:109:919:116 | source(...) : String | Log4jJndiInjectionTest.java:919:100:919:116 | (...)... | provenance | Sink:MaD:577 |
+| Log4jJndiInjectionTest.java:920:94:920:101 | source(...) : String | Log4jJndiInjectionTest.java:920:85:920:101 | (...)... | provenance | Sink:MaD:578 |
+| Log4jJndiInjectionTest.java:920:94:920:101 | source(...) : String | Log4jJndiInjectionTest.java:920:85:920:101 | (...)... | provenance | Sink:MaD:577 |
+| Log4jJndiInjectionTest.java:921:79:921:86 | source(...) : String | Log4jJndiInjectionTest.java:921:70:921:86 | (...)... | provenance | Sink:MaD:578 |
+| Log4jJndiInjectionTest.java:921:79:921:86 | source(...) : String | Log4jJndiInjectionTest.java:921:70:921:86 | (...)... | provenance | Sink:MaD:577 |
+| Log4jJndiInjectionTest.java:922:64:922:71 | source(...) : String | Log4jJndiInjectionTest.java:922:55:922:71 | (...)... | provenance | Sink:MaD:578 |
+| Log4jJndiInjectionTest.java:922:64:922:71 | source(...) : String | Log4jJndiInjectionTest.java:922:55:922:71 | (...)... | provenance | Sink:MaD:577 |
+| Log4jJndiInjectionTest.java:923:49:923:56 | source(...) : String | Log4jJndiInjectionTest.java:923:40:923:56 | (...)... | provenance | Sink:MaD:578 |
+| Log4jJndiInjectionTest.java:923:49:923:56 | source(...) : String | Log4jJndiInjectionTest.java:923:40:923:56 | (...)... | provenance | Sink:MaD:577 |
+| Log4jJndiInjectionTest.java:924:49:924:56 | source(...) : String | Log4jJndiInjectionTest.java:924:40:924:56 | (...)... | provenance | Sink:MaD:562 |
+| Log4jJndiInjectionTest.java:924:49:924:56 | source(...) : String | Log4jJndiInjectionTest.java:924:40:924:56 | (...)... | provenance | Sink:MaD:561 |
+| Log4jJndiInjectionTest.java:925:69:925:76 | source(...) : String | Log4jJndiInjectionTest.java:925:55:925:76 | (...)... | provenance | Sink:MaD:562 |
+| Log4jJndiInjectionTest.java:925:69:925:76 | source(...) : String | Log4jJndiInjectionTest.java:925:55:925:76 | (...)... | provenance | Sink:MaD:561 |
+| Log4jJndiInjectionTest.java:926:49:926:56 | source(...) : String | Log4jJndiInjectionTest.java:926:40:926:56 | (...)... | provenance | Sink:MaD:582 |
+| Log4jJndiInjectionTest.java:926:49:926:56 | source(...) : String | Log4jJndiInjectionTest.java:926:40:926:56 | (...)... | provenance | Sink:MaD:581 |
+| Log4jJndiInjectionTest.java:927:54:927:61 | source(...) : String | Log4jJndiInjectionTest.java:927:40:927:61 | (...)... | provenance | Sink:MaD:584 |
+| Log4jJndiInjectionTest.java:927:54:927:61 | source(...) : String | Log4jJndiInjectionTest.java:927:40:927:61 | (...)... | provenance | Sink:MaD:583 |
+| Log4jJndiInjectionTest.java:928:54:928:61 | source(...) : String | Log4jJndiInjectionTest.java:928:40:928:61 | (...)... | provenance | Sink:MaD:586 |
+| Log4jJndiInjectionTest.java:928:54:928:61 | source(...) : String | Log4jJndiInjectionTest.java:928:40:928:61 | (...)... | provenance | Sink:MaD:585 |
+| Log4jJndiInjectionTest.java:929:43:929:50 | source(...) : String | Log4jJndiInjectionTest.java:929:25:929:50 | (...)... | provenance | Sink:MaD:592 |
+| Log4jJndiInjectionTest.java:929:43:929:50 | source(...) : String | Log4jJndiInjectionTest.java:929:25:929:50 | (...)... | provenance | Sink:MaD:591 |
+| Log4jJndiInjectionTest.java:930:43:930:50 | source(...) : String | Log4jJndiInjectionTest.java:930:25:930:50 | (...)... | provenance | Sink:MaD:594 |
+| Log4jJndiInjectionTest.java:930:43:930:50 | source(...) : String | Log4jJndiInjectionTest.java:930:25:930:50 | (...)... | provenance | Sink:MaD:593 |
+| Log4jJndiInjectionTest.java:931:35:931:42 | source(...) : String | Log4jJndiInjectionTest.java:931:25:931:42 | (...)... | provenance | Sink:MaD:588 |
+| Log4jJndiInjectionTest.java:931:35:931:42 | source(...) : String | Log4jJndiInjectionTest.java:931:25:931:42 | (...)... | provenance | Sink:MaD:587 |
+| Log4jJndiInjectionTest.java:932:35:932:42 | source(...) : String | Log4jJndiInjectionTest.java:932:25:932:42 | (...)... | provenance | Sink:MaD:590 |
+| Log4jJndiInjectionTest.java:932:35:932:42 | source(...) : String | Log4jJndiInjectionTest.java:932:25:932:42 | (...)... | provenance | Sink:MaD:589 |
+| Log4jJndiInjectionTest.java:935:34:935:41 | source(...) : String | Log4jJndiInjectionTest.java:935:25:935:41 | (...)... | provenance | Sink:MaD:600 |
+| Log4jJndiInjectionTest.java:935:34:935:41 | source(...) : String | Log4jJndiInjectionTest.java:935:25:935:41 | (...)... | provenance | Sink:MaD:599 |
+| Log4jJndiInjectionTest.java:936:34:936:41 | source(...) : String | Log4jJndiInjectionTest.java:936:25:936:41 | (...)... | provenance | Sink:MaD:620 |
+| Log4jJndiInjectionTest.java:936:34:936:41 | source(...) : String | Log4jJndiInjectionTest.java:936:25:936:41 | (...)... | provenance | Sink:MaD:619 |
+| Log4jJndiInjectionTest.java:937:40:937:62 | {...} : Object[] [[]] : String | Log4jJndiInjectionTest.java:937:40:937:62 | new Object[] | provenance | Sink:MaD:620 |
+| Log4jJndiInjectionTest.java:937:40:937:62 | {...} : Object[] [[]] : String | Log4jJndiInjectionTest.java:937:40:937:62 | new Object[] | provenance | Sink:MaD:619 |
 | Log4jJndiInjectionTest.java:937:54:937:61 | source(...) : String | Log4jJndiInjectionTest.java:937:40:937:62 | {...} : Object[] [[]] : String | provenance |  |
-| Log4jJndiInjectionTest.java:938:49:938:56 | source(...) : String | Log4jJndiInjectionTest.java:938:40:938:56 | (...)... | provenance |  Sink:MaD:307 |
-| Log4jJndiInjectionTest.java:938:49:938:56 | source(...) : String | Log4jJndiInjectionTest.java:938:40:938:56 | (...)... | provenance |  Sink:MaD:623 |
-| Log4jJndiInjectionTest.java:939:34:939:41 | source(...) : String | Log4jJndiInjectionTest.java:939:25:939:41 | (...)... | provenance |  Sink:MaD:307 |
-| Log4jJndiInjectionTest.java:939:34:939:41 | source(...) : String | Log4jJndiInjectionTest.java:939:25:939:41 | (...)... | provenance |  Sink:MaD:623 |
-| Log4jJndiInjectionTest.java:940:64:940:71 | source(...) : String | Log4jJndiInjectionTest.java:940:55:940:71 | (...)... | provenance |  Sink:MaD:308 |
-| Log4jJndiInjectionTest.java:940:64:940:71 | source(...) : String | Log4jJndiInjectionTest.java:940:55:940:71 | (...)... | provenance |  Sink:MaD:624 |
-| Log4jJndiInjectionTest.java:941:49:941:56 | source(...) : String | Log4jJndiInjectionTest.java:941:40:941:56 | (...)... | provenance |  Sink:MaD:308 |
-| Log4jJndiInjectionTest.java:941:49:941:56 | source(...) : String | Log4jJndiInjectionTest.java:941:40:941:56 | (...)... | provenance |  Sink:MaD:624 |
-| Log4jJndiInjectionTest.java:942:34:942:41 | source(...) : String | Log4jJndiInjectionTest.java:942:25:942:41 | (...)... | provenance |  Sink:MaD:308 |
-| Log4jJndiInjectionTest.java:942:34:942:41 | source(...) : String | Log4jJndiInjectionTest.java:942:25:942:41 | (...)... | provenance |  Sink:MaD:624 |
-| Log4jJndiInjectionTest.java:943:79:943:86 | source(...) : String | Log4jJndiInjectionTest.java:943:70:943:86 | (...)... | provenance |  Sink:MaD:309 |
-| Log4jJndiInjectionTest.java:943:79:943:86 | source(...) : String | Log4jJndiInjectionTest.java:943:70:943:86 | (...)... | provenance |  Sink:MaD:625 |
-| Log4jJndiInjectionTest.java:944:64:944:71 | source(...) : String | Log4jJndiInjectionTest.java:944:55:944:71 | (...)... | provenance |  Sink:MaD:309 |
-| Log4jJndiInjectionTest.java:944:64:944:71 | source(...) : String | Log4jJndiInjectionTest.java:944:55:944:71 | (...)... | provenance |  Sink:MaD:625 |
-| Log4jJndiInjectionTest.java:945:49:945:56 | source(...) : String | Log4jJndiInjectionTest.java:945:40:945:56 | (...)... | provenance |  Sink:MaD:309 |
-| Log4jJndiInjectionTest.java:945:49:945:56 | source(...) : String | Log4jJndiInjectionTest.java:945:40:945:56 | (...)... | provenance |  Sink:MaD:625 |
-| Log4jJndiInjectionTest.java:946:34:946:41 | source(...) : String | Log4jJndiInjectionTest.java:946:25:946:41 | (...)... | provenance |  Sink:MaD:309 |
-| Log4jJndiInjectionTest.java:946:34:946:41 | source(...) : String | Log4jJndiInjectionTest.java:946:25:946:41 | (...)... | provenance |  Sink:MaD:625 |
-| Log4jJndiInjectionTest.java:947:94:947:101 | source(...) : String | Log4jJndiInjectionTest.java:947:85:947:101 | (...)... | provenance |  Sink:MaD:310 |
-| Log4jJndiInjectionTest.java:947:94:947:101 | source(...) : String | Log4jJndiInjectionTest.java:947:85:947:101 | (...)... | provenance |  Sink:MaD:626 |
-| Log4jJndiInjectionTest.java:948:79:948:86 | source(...) : String | Log4jJndiInjectionTest.java:948:70:948:86 | (...)... | provenance |  Sink:MaD:310 |
-| Log4jJndiInjectionTest.java:948:79:948:86 | source(...) : String | Log4jJndiInjectionTest.java:948:70:948:86 | (...)... | provenance |  Sink:MaD:626 |
-| Log4jJndiInjectionTest.java:949:64:949:71 | source(...) : String | Log4jJndiInjectionTest.java:949:55:949:71 | (...)... | provenance |  Sink:MaD:310 |
-| Log4jJndiInjectionTest.java:949:64:949:71 | source(...) : String | Log4jJndiInjectionTest.java:949:55:949:71 | (...)... | provenance |  Sink:MaD:626 |
-| Log4jJndiInjectionTest.java:950:49:950:56 | source(...) : String | Log4jJndiInjectionTest.java:950:40:950:56 | (...)... | provenance |  Sink:MaD:310 |
-| Log4jJndiInjectionTest.java:950:49:950:56 | source(...) : String | Log4jJndiInjectionTest.java:950:40:950:56 | (...)... | provenance |  Sink:MaD:626 |
-| Log4jJndiInjectionTest.java:951:34:951:41 | source(...) : String | Log4jJndiInjectionTest.java:951:25:951:41 | (...)... | provenance |  Sink:MaD:310 |
-| Log4jJndiInjectionTest.java:951:34:951:41 | source(...) : String | Log4jJndiInjectionTest.java:951:25:951:41 | (...)... | provenance |  Sink:MaD:626 |
-| Log4jJndiInjectionTest.java:952:109:952:116 | source(...) : String | Log4jJndiInjectionTest.java:952:100:952:116 | (...)... | provenance |  Sink:MaD:311 |
-| Log4jJndiInjectionTest.java:952:109:952:116 | source(...) : String | Log4jJndiInjectionTest.java:952:100:952:116 | (...)... | provenance |  Sink:MaD:627 |
-| Log4jJndiInjectionTest.java:953:94:953:101 | source(...) : String | Log4jJndiInjectionTest.java:953:85:953:101 | (...)... | provenance |  Sink:MaD:311 |
-| Log4jJndiInjectionTest.java:953:94:953:101 | source(...) : String | Log4jJndiInjectionTest.java:953:85:953:101 | (...)... | provenance |  Sink:MaD:627 |
-| Log4jJndiInjectionTest.java:954:79:954:86 | source(...) : String | Log4jJndiInjectionTest.java:954:70:954:86 | (...)... | provenance |  Sink:MaD:311 |
-| Log4jJndiInjectionTest.java:954:79:954:86 | source(...) : String | Log4jJndiInjectionTest.java:954:70:954:86 | (...)... | provenance |  Sink:MaD:627 |
-| Log4jJndiInjectionTest.java:955:64:955:71 | source(...) : String | Log4jJndiInjectionTest.java:955:55:955:71 | (...)... | provenance |  Sink:MaD:311 |
-| Log4jJndiInjectionTest.java:955:64:955:71 | source(...) : String | Log4jJndiInjectionTest.java:955:55:955:71 | (...)... | provenance |  Sink:MaD:627 |
-| Log4jJndiInjectionTest.java:956:49:956:56 | source(...) : String | Log4jJndiInjectionTest.java:956:40:956:56 | (...)... | provenance |  Sink:MaD:311 |
-| Log4jJndiInjectionTest.java:956:49:956:56 | source(...) : String | Log4jJndiInjectionTest.java:956:40:956:56 | (...)... | provenance |  Sink:MaD:627 |
-| Log4jJndiInjectionTest.java:957:34:957:41 | source(...) : String | Log4jJndiInjectionTest.java:957:25:957:41 | (...)... | provenance |  Sink:MaD:311 |
-| Log4jJndiInjectionTest.java:957:34:957:41 | source(...) : String | Log4jJndiInjectionTest.java:957:25:957:41 | (...)... | provenance |  Sink:MaD:627 |
-| Log4jJndiInjectionTest.java:958:124:958:131 | source(...) : String | Log4jJndiInjectionTest.java:958:115:958:131 | (...)... | provenance |  Sink:MaD:312 |
-| Log4jJndiInjectionTest.java:958:124:958:131 | source(...) : String | Log4jJndiInjectionTest.java:958:115:958:131 | (...)... | provenance |  Sink:MaD:628 |
-| Log4jJndiInjectionTest.java:959:109:959:116 | source(...) : String | Log4jJndiInjectionTest.java:959:100:959:116 | (...)... | provenance |  Sink:MaD:312 |
-| Log4jJndiInjectionTest.java:959:109:959:116 | source(...) : String | Log4jJndiInjectionTest.java:959:100:959:116 | (...)... | provenance |  Sink:MaD:628 |
-| Log4jJndiInjectionTest.java:960:94:960:101 | source(...) : String | Log4jJndiInjectionTest.java:960:85:960:101 | (...)... | provenance |  Sink:MaD:312 |
-| Log4jJndiInjectionTest.java:960:94:960:101 | source(...) : String | Log4jJndiInjectionTest.java:960:85:960:101 | (...)... | provenance |  Sink:MaD:628 |
-| Log4jJndiInjectionTest.java:961:79:961:86 | source(...) : String | Log4jJndiInjectionTest.java:961:70:961:86 | (...)... | provenance |  Sink:MaD:312 |
-| Log4jJndiInjectionTest.java:961:79:961:86 | source(...) : String | Log4jJndiInjectionTest.java:961:70:961:86 | (...)... | provenance |  Sink:MaD:628 |
-| Log4jJndiInjectionTest.java:962:64:962:71 | source(...) : String | Log4jJndiInjectionTest.java:962:55:962:71 | (...)... | provenance |  Sink:MaD:312 |
-| Log4jJndiInjectionTest.java:962:64:962:71 | source(...) : String | Log4jJndiInjectionTest.java:962:55:962:71 | (...)... | provenance |  Sink:MaD:628 |
-| Log4jJndiInjectionTest.java:963:49:963:56 | source(...) : String | Log4jJndiInjectionTest.java:963:40:963:56 | (...)... | provenance |  Sink:MaD:312 |
-| Log4jJndiInjectionTest.java:963:49:963:56 | source(...) : String | Log4jJndiInjectionTest.java:963:40:963:56 | (...)... | provenance |  Sink:MaD:628 |
-| Log4jJndiInjectionTest.java:964:34:964:41 | source(...) : String | Log4jJndiInjectionTest.java:964:25:964:41 | (...)... | provenance |  Sink:MaD:312 |
-| Log4jJndiInjectionTest.java:964:34:964:41 | source(...) : String | Log4jJndiInjectionTest.java:964:25:964:41 | (...)... | provenance |  Sink:MaD:628 |
-| Log4jJndiInjectionTest.java:965:139:965:146 | source(...) : String | Log4jJndiInjectionTest.java:965:130:965:146 | (...)... | provenance |  Sink:MaD:313 |
-| Log4jJndiInjectionTest.java:965:139:965:146 | source(...) : String | Log4jJndiInjectionTest.java:965:130:965:146 | (...)... | provenance |  Sink:MaD:629 |
-| Log4jJndiInjectionTest.java:966:124:966:131 | source(...) : String | Log4jJndiInjectionTest.java:966:115:966:131 | (...)... | provenance |  Sink:MaD:313 |
-| Log4jJndiInjectionTest.java:966:124:966:131 | source(...) : String | Log4jJndiInjectionTest.java:966:115:966:131 | (...)... | provenance |  Sink:MaD:629 |
-| Log4jJndiInjectionTest.java:967:109:967:116 | source(...) : String | Log4jJndiInjectionTest.java:967:100:967:116 | (...)... | provenance |  Sink:MaD:313 |
-| Log4jJndiInjectionTest.java:967:109:967:116 | source(...) : String | Log4jJndiInjectionTest.java:967:100:967:116 | (...)... | provenance |  Sink:MaD:629 |
-| Log4jJndiInjectionTest.java:968:94:968:101 | source(...) : String | Log4jJndiInjectionTest.java:968:85:968:101 | (...)... | provenance |  Sink:MaD:313 |
-| Log4jJndiInjectionTest.java:968:94:968:101 | source(...) : String | Log4jJndiInjectionTest.java:968:85:968:101 | (...)... | provenance |  Sink:MaD:629 |
-| Log4jJndiInjectionTest.java:969:79:969:86 | source(...) : String | Log4jJndiInjectionTest.java:969:70:969:86 | (...)... | provenance |  Sink:MaD:313 |
-| Log4jJndiInjectionTest.java:969:79:969:86 | source(...) : String | Log4jJndiInjectionTest.java:969:70:969:86 | (...)... | provenance |  Sink:MaD:629 |
-| Log4jJndiInjectionTest.java:970:64:970:71 | source(...) : String | Log4jJndiInjectionTest.java:970:55:970:71 | (...)... | provenance |  Sink:MaD:313 |
-| Log4jJndiInjectionTest.java:970:64:970:71 | source(...) : String | Log4jJndiInjectionTest.java:970:55:970:71 | (...)... | provenance |  Sink:MaD:629 |
-| Log4jJndiInjectionTest.java:971:49:971:56 | source(...) : String | Log4jJndiInjectionTest.java:971:40:971:56 | (...)... | provenance |  Sink:MaD:313 |
-| Log4jJndiInjectionTest.java:971:49:971:56 | source(...) : String | Log4jJndiInjectionTest.java:971:40:971:56 | (...)... | provenance |  Sink:MaD:629 |
-| Log4jJndiInjectionTest.java:972:34:972:41 | source(...) : String | Log4jJndiInjectionTest.java:972:25:972:41 | (...)... | provenance |  Sink:MaD:313 |
-| Log4jJndiInjectionTest.java:972:34:972:41 | source(...) : String | Log4jJndiInjectionTest.java:972:25:972:41 | (...)... | provenance |  Sink:MaD:629 |
-| Log4jJndiInjectionTest.java:973:154:973:161 | source(...) : String | Log4jJndiInjectionTest.java:973:145:973:161 | (...)... | provenance |  Sink:MaD:314 |
-| Log4jJndiInjectionTest.java:973:154:973:161 | source(...) : String | Log4jJndiInjectionTest.java:973:145:973:161 | (...)... | provenance |  Sink:MaD:630 |
-| Log4jJndiInjectionTest.java:974:139:974:146 | source(...) : String | Log4jJndiInjectionTest.java:974:130:974:146 | (...)... | provenance |  Sink:MaD:314 |
-| Log4jJndiInjectionTest.java:974:139:974:146 | source(...) : String | Log4jJndiInjectionTest.java:974:130:974:146 | (...)... | provenance |  Sink:MaD:630 |
-| Log4jJndiInjectionTest.java:975:124:975:131 | source(...) : String | Log4jJndiInjectionTest.java:975:115:975:131 | (...)... | provenance |  Sink:MaD:314 |
-| Log4jJndiInjectionTest.java:975:124:975:131 | source(...) : String | Log4jJndiInjectionTest.java:975:115:975:131 | (...)... | provenance |  Sink:MaD:630 |
-| Log4jJndiInjectionTest.java:976:109:976:116 | source(...) : String | Log4jJndiInjectionTest.java:976:100:976:116 | (...)... | provenance |  Sink:MaD:314 |
-| Log4jJndiInjectionTest.java:976:109:976:116 | source(...) : String | Log4jJndiInjectionTest.java:976:100:976:116 | (...)... | provenance |  Sink:MaD:630 |
-| Log4jJndiInjectionTest.java:977:94:977:101 | source(...) : String | Log4jJndiInjectionTest.java:977:85:977:101 | (...)... | provenance |  Sink:MaD:314 |
-| Log4jJndiInjectionTest.java:977:94:977:101 | source(...) : String | Log4jJndiInjectionTest.java:977:85:977:101 | (...)... | provenance |  Sink:MaD:630 |
-| Log4jJndiInjectionTest.java:978:79:978:86 | source(...) : String | Log4jJndiInjectionTest.java:978:70:978:86 | (...)... | provenance |  Sink:MaD:314 |
-| Log4jJndiInjectionTest.java:978:79:978:86 | source(...) : String | Log4jJndiInjectionTest.java:978:70:978:86 | (...)... | provenance |  Sink:MaD:630 |
-| Log4jJndiInjectionTest.java:979:64:979:71 | source(...) : String | Log4jJndiInjectionTest.java:979:55:979:71 | (...)... | provenance |  Sink:MaD:314 |
-| Log4jJndiInjectionTest.java:979:64:979:71 | source(...) : String | Log4jJndiInjectionTest.java:979:55:979:71 | (...)... | provenance |  Sink:MaD:630 |
-| Log4jJndiInjectionTest.java:980:49:980:56 | source(...) : String | Log4jJndiInjectionTest.java:980:40:980:56 | (...)... | provenance |  Sink:MaD:314 |
-| Log4jJndiInjectionTest.java:980:49:980:56 | source(...) : String | Log4jJndiInjectionTest.java:980:40:980:56 | (...)... | provenance |  Sink:MaD:630 |
-| Log4jJndiInjectionTest.java:981:34:981:41 | source(...) : String | Log4jJndiInjectionTest.java:981:25:981:41 | (...)... | provenance |  Sink:MaD:314 |
-| Log4jJndiInjectionTest.java:981:34:981:41 | source(...) : String | Log4jJndiInjectionTest.java:981:25:981:41 | (...)... | provenance |  Sink:MaD:630 |
-| Log4jJndiInjectionTest.java:982:169:982:176 | source(...) : String | Log4jJndiInjectionTest.java:982:160:982:176 | (...)... | provenance |  Sink:MaD:315 |
-| Log4jJndiInjectionTest.java:982:169:982:176 | source(...) : String | Log4jJndiInjectionTest.java:982:160:982:176 | (...)... | provenance |  Sink:MaD:631 |
-| Log4jJndiInjectionTest.java:983:154:983:161 | source(...) : String | Log4jJndiInjectionTest.java:983:145:983:161 | (...)... | provenance |  Sink:MaD:315 |
-| Log4jJndiInjectionTest.java:983:154:983:161 | source(...) : String | Log4jJndiInjectionTest.java:983:145:983:161 | (...)... | provenance |  Sink:MaD:631 |
-| Log4jJndiInjectionTest.java:984:139:984:146 | source(...) : String | Log4jJndiInjectionTest.java:984:130:984:146 | (...)... | provenance |  Sink:MaD:315 |
-| Log4jJndiInjectionTest.java:984:139:984:146 | source(...) : String | Log4jJndiInjectionTest.java:984:130:984:146 | (...)... | provenance |  Sink:MaD:631 |
-| Log4jJndiInjectionTest.java:985:124:985:131 | source(...) : String | Log4jJndiInjectionTest.java:985:115:985:131 | (...)... | provenance |  Sink:MaD:315 |
-| Log4jJndiInjectionTest.java:985:124:985:131 | source(...) : String | Log4jJndiInjectionTest.java:985:115:985:131 | (...)... | provenance |  Sink:MaD:631 |
-| Log4jJndiInjectionTest.java:986:109:986:116 | source(...) : String | Log4jJndiInjectionTest.java:986:100:986:116 | (...)... | provenance |  Sink:MaD:315 |
-| Log4jJndiInjectionTest.java:986:109:986:116 | source(...) : String | Log4jJndiInjectionTest.java:986:100:986:116 | (...)... | provenance |  Sink:MaD:631 |
-| Log4jJndiInjectionTest.java:987:94:987:101 | source(...) : String | Log4jJndiInjectionTest.java:987:85:987:101 | (...)... | provenance |  Sink:MaD:315 |
-| Log4jJndiInjectionTest.java:987:94:987:101 | source(...) : String | Log4jJndiInjectionTest.java:987:85:987:101 | (...)... | provenance |  Sink:MaD:631 |
-| Log4jJndiInjectionTest.java:988:79:988:86 | source(...) : String | Log4jJndiInjectionTest.java:988:70:988:86 | (...)... | provenance |  Sink:MaD:315 |
-| Log4jJndiInjectionTest.java:988:79:988:86 | source(...) : String | Log4jJndiInjectionTest.java:988:70:988:86 | (...)... | provenance |  Sink:MaD:631 |
-| Log4jJndiInjectionTest.java:989:64:989:71 | source(...) : String | Log4jJndiInjectionTest.java:989:55:989:71 | (...)... | provenance |  Sink:MaD:315 |
-| Log4jJndiInjectionTest.java:989:64:989:71 | source(...) : String | Log4jJndiInjectionTest.java:989:55:989:71 | (...)... | provenance |  Sink:MaD:631 |
-| Log4jJndiInjectionTest.java:990:49:990:56 | source(...) : String | Log4jJndiInjectionTest.java:990:40:990:56 | (...)... | provenance |  Sink:MaD:315 |
-| Log4jJndiInjectionTest.java:990:49:990:56 | source(...) : String | Log4jJndiInjectionTest.java:990:40:990:56 | (...)... | provenance |  Sink:MaD:631 |
-| Log4jJndiInjectionTest.java:991:34:991:41 | source(...) : String | Log4jJndiInjectionTest.java:991:25:991:41 | (...)... | provenance |  Sink:MaD:315 |
-| Log4jJndiInjectionTest.java:991:34:991:41 | source(...) : String | Log4jJndiInjectionTest.java:991:25:991:41 | (...)... | provenance |  Sink:MaD:631 |
-| Log4jJndiInjectionTest.java:992:34:992:41 | source(...) : String | Log4jJndiInjectionTest.java:992:25:992:41 | (...)... | provenance |  Sink:MaD:307 |
-| Log4jJndiInjectionTest.java:992:34:992:41 | source(...) : String | Log4jJndiInjectionTest.java:992:25:992:41 | (...)... | provenance |  Sink:MaD:623 |
-| Log4jJndiInjectionTest.java:993:54:993:61 | source(...) : String | Log4jJndiInjectionTest.java:993:40:993:61 | (...)... | provenance |  Sink:MaD:307 |
-| Log4jJndiInjectionTest.java:993:54:993:61 | source(...) : String | Log4jJndiInjectionTest.java:993:40:993:61 | (...)... | provenance |  Sink:MaD:623 |
-| Log4jJndiInjectionTest.java:994:34:994:41 | source(...) : String | Log4jJndiInjectionTest.java:994:25:994:41 | (...)... | provenance |  Sink:MaD:317 |
-| Log4jJndiInjectionTest.java:994:34:994:41 | source(...) : String | Log4jJndiInjectionTest.java:994:25:994:41 | (...)... | provenance |  Sink:MaD:633 |
-| Log4jJndiInjectionTest.java:995:39:995:46 | source(...) : String | Log4jJndiInjectionTest.java:995:25:995:46 | (...)... | provenance |  Sink:MaD:318 |
-| Log4jJndiInjectionTest.java:995:39:995:46 | source(...) : String | Log4jJndiInjectionTest.java:995:25:995:46 | (...)... | provenance |  Sink:MaD:634 |
-| Log4jJndiInjectionTest.java:996:39:996:46 | source(...) : String | Log4jJndiInjectionTest.java:996:25:996:46 | (...)... | provenance |  Sink:MaD:319 |
-| Log4jJndiInjectionTest.java:996:39:996:46 | source(...) : String | Log4jJndiInjectionTest.java:996:25:996:46 | (...)... | provenance |  Sink:MaD:635 |
-| Log4jJndiInjectionTest.java:998:65:998:72 | source(...) : String | Log4jJndiInjectionTest.java:998:55:998:72 | (...)... | provenance |  Sink:MaD:233 |
-| Log4jJndiInjectionTest.java:998:65:998:72 | source(...) : String | Log4jJndiInjectionTest.java:998:55:998:72 | (...)... | provenance |  Sink:MaD:549 |
-| Log4jJndiInjectionTest.java:999:48:999:55 | source(...) : String | Log4jJndiInjectionTest.java:999:39:999:55 | (...)... | provenance |  Sink:MaD:234 |
-| Log4jJndiInjectionTest.java:999:48:999:55 | source(...) : String | Log4jJndiInjectionTest.java:999:39:999:55 | (...)... | provenance |  Sink:MaD:550 |
-| Log4jJndiInjectionTest.java:1000:45:1000:67 | {...} : Object[] [[]] : String | Log4jJndiInjectionTest.java:1000:45:1000:67 | new Object[] | provenance |  Sink:MaD:234 |
-| Log4jJndiInjectionTest.java:1000:45:1000:67 | {...} : Object[] [[]] : String | Log4jJndiInjectionTest.java:1000:45:1000:67 | new Object[] | provenance |  Sink:MaD:550 |
+| Log4jJndiInjectionTest.java:938:49:938:56 | source(...) : String | Log4jJndiInjectionTest.java:938:40:938:56 | (...)... | provenance | Sink:MaD:602 |
+| Log4jJndiInjectionTest.java:938:49:938:56 | source(...) : String | Log4jJndiInjectionTest.java:938:40:938:56 | (...)... | provenance | Sink:MaD:601 |
+| Log4jJndiInjectionTest.java:939:34:939:41 | source(...) : String | Log4jJndiInjectionTest.java:939:25:939:41 | (...)... | provenance | Sink:MaD:602 |
+| Log4jJndiInjectionTest.java:939:34:939:41 | source(...) : String | Log4jJndiInjectionTest.java:939:25:939:41 | (...)... | provenance | Sink:MaD:601 |
+| Log4jJndiInjectionTest.java:940:64:940:71 | source(...) : String | Log4jJndiInjectionTest.java:940:55:940:71 | (...)... | provenance | Sink:MaD:604 |
+| Log4jJndiInjectionTest.java:940:64:940:71 | source(...) : String | Log4jJndiInjectionTest.java:940:55:940:71 | (...)... | provenance | Sink:MaD:603 |
+| Log4jJndiInjectionTest.java:941:49:941:56 | source(...) : String | Log4jJndiInjectionTest.java:941:40:941:56 | (...)... | provenance | Sink:MaD:604 |
+| Log4jJndiInjectionTest.java:941:49:941:56 | source(...) : String | Log4jJndiInjectionTest.java:941:40:941:56 | (...)... | provenance | Sink:MaD:603 |
+| Log4jJndiInjectionTest.java:942:34:942:41 | source(...) : String | Log4jJndiInjectionTest.java:942:25:942:41 | (...)... | provenance | Sink:MaD:604 |
+| Log4jJndiInjectionTest.java:942:34:942:41 | source(...) : String | Log4jJndiInjectionTest.java:942:25:942:41 | (...)... | provenance | Sink:MaD:603 |
+| Log4jJndiInjectionTest.java:943:79:943:86 | source(...) : String | Log4jJndiInjectionTest.java:943:70:943:86 | (...)... | provenance | Sink:MaD:606 |
+| Log4jJndiInjectionTest.java:943:79:943:86 | source(...) : String | Log4jJndiInjectionTest.java:943:70:943:86 | (...)... | provenance | Sink:MaD:605 |
+| Log4jJndiInjectionTest.java:944:64:944:71 | source(...) : String | Log4jJndiInjectionTest.java:944:55:944:71 | (...)... | provenance | Sink:MaD:606 |
+| Log4jJndiInjectionTest.java:944:64:944:71 | source(...) : String | Log4jJndiInjectionTest.java:944:55:944:71 | (...)... | provenance | Sink:MaD:605 |
+| Log4jJndiInjectionTest.java:945:49:945:56 | source(...) : String | Log4jJndiInjectionTest.java:945:40:945:56 | (...)... | provenance | Sink:MaD:606 |
+| Log4jJndiInjectionTest.java:945:49:945:56 | source(...) : String | Log4jJndiInjectionTest.java:945:40:945:56 | (...)... | provenance | Sink:MaD:605 |
+| Log4jJndiInjectionTest.java:946:34:946:41 | source(...) : String | Log4jJndiInjectionTest.java:946:25:946:41 | (...)... | provenance | Sink:MaD:606 |
+| Log4jJndiInjectionTest.java:946:34:946:41 | source(...) : String | Log4jJndiInjectionTest.java:946:25:946:41 | (...)... | provenance | Sink:MaD:605 |
+| Log4jJndiInjectionTest.java:947:94:947:101 | source(...) : String | Log4jJndiInjectionTest.java:947:85:947:101 | (...)... | provenance | Sink:MaD:608 |
+| Log4jJndiInjectionTest.java:947:94:947:101 | source(...) : String | Log4jJndiInjectionTest.java:947:85:947:101 | (...)... | provenance | Sink:MaD:607 |
+| Log4jJndiInjectionTest.java:948:79:948:86 | source(...) : String | Log4jJndiInjectionTest.java:948:70:948:86 | (...)... | provenance | Sink:MaD:608 |
+| Log4jJndiInjectionTest.java:948:79:948:86 | source(...) : String | Log4jJndiInjectionTest.java:948:70:948:86 | (...)... | provenance | Sink:MaD:607 |
+| Log4jJndiInjectionTest.java:949:64:949:71 | source(...) : String | Log4jJndiInjectionTest.java:949:55:949:71 | (...)... | provenance | Sink:MaD:608 |
+| Log4jJndiInjectionTest.java:949:64:949:71 | source(...) : String | Log4jJndiInjectionTest.java:949:55:949:71 | (...)... | provenance | Sink:MaD:607 |
+| Log4jJndiInjectionTest.java:950:49:950:56 | source(...) : String | Log4jJndiInjectionTest.java:950:40:950:56 | (...)... | provenance | Sink:MaD:608 |
+| Log4jJndiInjectionTest.java:950:49:950:56 | source(...) : String | Log4jJndiInjectionTest.java:950:40:950:56 | (...)... | provenance | Sink:MaD:607 |
+| Log4jJndiInjectionTest.java:951:34:951:41 | source(...) : String | Log4jJndiInjectionTest.java:951:25:951:41 | (...)... | provenance | Sink:MaD:608 |
+| Log4jJndiInjectionTest.java:951:34:951:41 | source(...) : String | Log4jJndiInjectionTest.java:951:25:951:41 | (...)... | provenance | Sink:MaD:607 |
+| Log4jJndiInjectionTest.java:952:109:952:116 | source(...) : String | Log4jJndiInjectionTest.java:952:100:952:116 | (...)... | provenance | Sink:MaD:610 |
+| Log4jJndiInjectionTest.java:952:109:952:116 | source(...) : String | Log4jJndiInjectionTest.java:952:100:952:116 | (...)... | provenance | Sink:MaD:609 |
+| Log4jJndiInjectionTest.java:953:94:953:101 | source(...) : String | Log4jJndiInjectionTest.java:953:85:953:101 | (...)... | provenance | Sink:MaD:610 |
+| Log4jJndiInjectionTest.java:953:94:953:101 | source(...) : String | Log4jJndiInjectionTest.java:953:85:953:101 | (...)... | provenance | Sink:MaD:609 |
+| Log4jJndiInjectionTest.java:954:79:954:86 | source(...) : String | Log4jJndiInjectionTest.java:954:70:954:86 | (...)... | provenance | Sink:MaD:610 |
+| Log4jJndiInjectionTest.java:954:79:954:86 | source(...) : String | Log4jJndiInjectionTest.java:954:70:954:86 | (...)... | provenance | Sink:MaD:609 |
+| Log4jJndiInjectionTest.java:955:64:955:71 | source(...) : String | Log4jJndiInjectionTest.java:955:55:955:71 | (...)... | provenance | Sink:MaD:610 |
+| Log4jJndiInjectionTest.java:955:64:955:71 | source(...) : String | Log4jJndiInjectionTest.java:955:55:955:71 | (...)... | provenance | Sink:MaD:609 |
+| Log4jJndiInjectionTest.java:956:49:956:56 | source(...) : String | Log4jJndiInjectionTest.java:956:40:956:56 | (...)... | provenance | Sink:MaD:610 |
+| Log4jJndiInjectionTest.java:956:49:956:56 | source(...) : String | Log4jJndiInjectionTest.java:956:40:956:56 | (...)... | provenance | Sink:MaD:609 |
+| Log4jJndiInjectionTest.java:957:34:957:41 | source(...) : String | Log4jJndiInjectionTest.java:957:25:957:41 | (...)... | provenance | Sink:MaD:610 |
+| Log4jJndiInjectionTest.java:957:34:957:41 | source(...) : String | Log4jJndiInjectionTest.java:957:25:957:41 | (...)... | provenance | Sink:MaD:609 |
+| Log4jJndiInjectionTest.java:958:124:958:131 | source(...) : String | Log4jJndiInjectionTest.java:958:115:958:131 | (...)... | provenance | Sink:MaD:612 |
+| Log4jJndiInjectionTest.java:958:124:958:131 | source(...) : String | Log4jJndiInjectionTest.java:958:115:958:131 | (...)... | provenance | Sink:MaD:611 |
+| Log4jJndiInjectionTest.java:959:109:959:116 | source(...) : String | Log4jJndiInjectionTest.java:959:100:959:116 | (...)... | provenance | Sink:MaD:612 |
+| Log4jJndiInjectionTest.java:959:109:959:116 | source(...) : String | Log4jJndiInjectionTest.java:959:100:959:116 | (...)... | provenance | Sink:MaD:611 |
+| Log4jJndiInjectionTest.java:960:94:960:101 | source(...) : String | Log4jJndiInjectionTest.java:960:85:960:101 | (...)... | provenance | Sink:MaD:612 |
+| Log4jJndiInjectionTest.java:960:94:960:101 | source(...) : String | Log4jJndiInjectionTest.java:960:85:960:101 | (...)... | provenance | Sink:MaD:611 |
+| Log4jJndiInjectionTest.java:961:79:961:86 | source(...) : String | Log4jJndiInjectionTest.java:961:70:961:86 | (...)... | provenance | Sink:MaD:612 |
+| Log4jJndiInjectionTest.java:961:79:961:86 | source(...) : String | Log4jJndiInjectionTest.java:961:70:961:86 | (...)... | provenance | Sink:MaD:611 |
+| Log4jJndiInjectionTest.java:962:64:962:71 | source(...) : String | Log4jJndiInjectionTest.java:962:55:962:71 | (...)... | provenance | Sink:MaD:612 |
+| Log4jJndiInjectionTest.java:962:64:962:71 | source(...) : String | Log4jJndiInjectionTest.java:962:55:962:71 | (...)... | provenance | Sink:MaD:611 |
+| Log4jJndiInjectionTest.java:963:49:963:56 | source(...) : String | Log4jJndiInjectionTest.java:963:40:963:56 | (...)... | provenance | Sink:MaD:612 |
+| Log4jJndiInjectionTest.java:963:49:963:56 | source(...) : String | Log4jJndiInjectionTest.java:963:40:963:56 | (...)... | provenance | Sink:MaD:611 |
+| Log4jJndiInjectionTest.java:964:34:964:41 | source(...) : String | Log4jJndiInjectionTest.java:964:25:964:41 | (...)... | provenance | Sink:MaD:612 |
+| Log4jJndiInjectionTest.java:964:34:964:41 | source(...) : String | Log4jJndiInjectionTest.java:964:25:964:41 | (...)... | provenance | Sink:MaD:611 |
+| Log4jJndiInjectionTest.java:965:139:965:146 | source(...) : String | Log4jJndiInjectionTest.java:965:130:965:146 | (...)... | provenance | Sink:MaD:614 |
+| Log4jJndiInjectionTest.java:965:139:965:146 | source(...) : String | Log4jJndiInjectionTest.java:965:130:965:146 | (...)... | provenance | Sink:MaD:613 |
+| Log4jJndiInjectionTest.java:966:124:966:131 | source(...) : String | Log4jJndiInjectionTest.java:966:115:966:131 | (...)... | provenance | Sink:MaD:614 |
+| Log4jJndiInjectionTest.java:966:124:966:131 | source(...) : String | Log4jJndiInjectionTest.java:966:115:966:131 | (...)... | provenance | Sink:MaD:613 |
+| Log4jJndiInjectionTest.java:967:109:967:116 | source(...) : String | Log4jJndiInjectionTest.java:967:100:967:116 | (...)... | provenance | Sink:MaD:614 |
+| Log4jJndiInjectionTest.java:967:109:967:116 | source(...) : String | Log4jJndiInjectionTest.java:967:100:967:116 | (...)... | provenance | Sink:MaD:613 |
+| Log4jJndiInjectionTest.java:968:94:968:101 | source(...) : String | Log4jJndiInjectionTest.java:968:85:968:101 | (...)... | provenance | Sink:MaD:614 |
+| Log4jJndiInjectionTest.java:968:94:968:101 | source(...) : String | Log4jJndiInjectionTest.java:968:85:968:101 | (...)... | provenance | Sink:MaD:613 |
+| Log4jJndiInjectionTest.java:969:79:969:86 | source(...) : String | Log4jJndiInjectionTest.java:969:70:969:86 | (...)... | provenance | Sink:MaD:614 |
+| Log4jJndiInjectionTest.java:969:79:969:86 | source(...) : String | Log4jJndiInjectionTest.java:969:70:969:86 | (...)... | provenance | Sink:MaD:613 |
+| Log4jJndiInjectionTest.java:970:64:970:71 | source(...) : String | Log4jJndiInjectionTest.java:970:55:970:71 | (...)... | provenance | Sink:MaD:614 |
+| Log4jJndiInjectionTest.java:970:64:970:71 | source(...) : String | Log4jJndiInjectionTest.java:970:55:970:71 | (...)... | provenance | Sink:MaD:613 |
+| Log4jJndiInjectionTest.java:971:49:971:56 | source(...) : String | Log4jJndiInjectionTest.java:971:40:971:56 | (...)... | provenance | Sink:MaD:614 |
+| Log4jJndiInjectionTest.java:971:49:971:56 | source(...) : String | Log4jJndiInjectionTest.java:971:40:971:56 | (...)... | provenance | Sink:MaD:613 |
+| Log4jJndiInjectionTest.java:972:34:972:41 | source(...) : String | Log4jJndiInjectionTest.java:972:25:972:41 | (...)... | provenance | Sink:MaD:614 |
+| Log4jJndiInjectionTest.java:972:34:972:41 | source(...) : String | Log4jJndiInjectionTest.java:972:25:972:41 | (...)... | provenance | Sink:MaD:613 |
+| Log4jJndiInjectionTest.java:973:154:973:161 | source(...) : String | Log4jJndiInjectionTest.java:973:145:973:161 | (...)... | provenance | Sink:MaD:616 |
+| Log4jJndiInjectionTest.java:973:154:973:161 | source(...) : String | Log4jJndiInjectionTest.java:973:145:973:161 | (...)... | provenance | Sink:MaD:615 |
+| Log4jJndiInjectionTest.java:974:139:974:146 | source(...) : String | Log4jJndiInjectionTest.java:974:130:974:146 | (...)... | provenance | Sink:MaD:616 |
+| Log4jJndiInjectionTest.java:974:139:974:146 | source(...) : String | Log4jJndiInjectionTest.java:974:130:974:146 | (...)... | provenance | Sink:MaD:615 |
+| Log4jJndiInjectionTest.java:975:124:975:131 | source(...) : String | Log4jJndiInjectionTest.java:975:115:975:131 | (...)... | provenance | Sink:MaD:616 |
+| Log4jJndiInjectionTest.java:975:124:975:131 | source(...) : String | Log4jJndiInjectionTest.java:975:115:975:131 | (...)... | provenance | Sink:MaD:615 |
+| Log4jJndiInjectionTest.java:976:109:976:116 | source(...) : String | Log4jJndiInjectionTest.java:976:100:976:116 | (...)... | provenance | Sink:MaD:616 |
+| Log4jJndiInjectionTest.java:976:109:976:116 | source(...) : String | Log4jJndiInjectionTest.java:976:100:976:116 | (...)... | provenance | Sink:MaD:615 |
+| Log4jJndiInjectionTest.java:977:94:977:101 | source(...) : String | Log4jJndiInjectionTest.java:977:85:977:101 | (...)... | provenance | Sink:MaD:616 |
+| Log4jJndiInjectionTest.java:977:94:977:101 | source(...) : String | Log4jJndiInjectionTest.java:977:85:977:101 | (...)... | provenance | Sink:MaD:615 |
+| Log4jJndiInjectionTest.java:978:79:978:86 | source(...) : String | Log4jJndiInjectionTest.java:978:70:978:86 | (...)... | provenance | Sink:MaD:616 |
+| Log4jJndiInjectionTest.java:978:79:978:86 | source(...) : String | Log4jJndiInjectionTest.java:978:70:978:86 | (...)... | provenance | Sink:MaD:615 |
+| Log4jJndiInjectionTest.java:979:64:979:71 | source(...) : String | Log4jJndiInjectionTest.java:979:55:979:71 | (...)... | provenance | Sink:MaD:616 |
+| Log4jJndiInjectionTest.java:979:64:979:71 | source(...) : String | Log4jJndiInjectionTest.java:979:55:979:71 | (...)... | provenance | Sink:MaD:615 |
+| Log4jJndiInjectionTest.java:980:49:980:56 | source(...) : String | Log4jJndiInjectionTest.java:980:40:980:56 | (...)... | provenance | Sink:MaD:616 |
+| Log4jJndiInjectionTest.java:980:49:980:56 | source(...) : String | Log4jJndiInjectionTest.java:980:40:980:56 | (...)... | provenance | Sink:MaD:615 |
+| Log4jJndiInjectionTest.java:981:34:981:41 | source(...) : String | Log4jJndiInjectionTest.java:981:25:981:41 | (...)... | provenance | Sink:MaD:616 |
+| Log4jJndiInjectionTest.java:981:34:981:41 | source(...) : String | Log4jJndiInjectionTest.java:981:25:981:41 | (...)... | provenance | Sink:MaD:615 |
+| Log4jJndiInjectionTest.java:982:169:982:176 | source(...) : String | Log4jJndiInjectionTest.java:982:160:982:176 | (...)... | provenance | Sink:MaD:618 |
+| Log4jJndiInjectionTest.java:982:169:982:176 | source(...) : String | Log4jJndiInjectionTest.java:982:160:982:176 | (...)... | provenance | Sink:MaD:617 |
+| Log4jJndiInjectionTest.java:983:154:983:161 | source(...) : String | Log4jJndiInjectionTest.java:983:145:983:161 | (...)... | provenance | Sink:MaD:618 |
+| Log4jJndiInjectionTest.java:983:154:983:161 | source(...) : String | Log4jJndiInjectionTest.java:983:145:983:161 | (...)... | provenance | Sink:MaD:617 |
+| Log4jJndiInjectionTest.java:984:139:984:146 | source(...) : String | Log4jJndiInjectionTest.java:984:130:984:146 | (...)... | provenance | Sink:MaD:618 |
+| Log4jJndiInjectionTest.java:984:139:984:146 | source(...) : String | Log4jJndiInjectionTest.java:984:130:984:146 | (...)... | provenance | Sink:MaD:617 |
+| Log4jJndiInjectionTest.java:985:124:985:131 | source(...) : String | Log4jJndiInjectionTest.java:985:115:985:131 | (...)... | provenance | Sink:MaD:618 |
+| Log4jJndiInjectionTest.java:985:124:985:131 | source(...) : String | Log4jJndiInjectionTest.java:985:115:985:131 | (...)... | provenance | Sink:MaD:617 |
+| Log4jJndiInjectionTest.java:986:109:986:116 | source(...) : String | Log4jJndiInjectionTest.java:986:100:986:116 | (...)... | provenance | Sink:MaD:618 |
+| Log4jJndiInjectionTest.java:986:109:986:116 | source(...) : String | Log4jJndiInjectionTest.java:986:100:986:116 | (...)... | provenance | Sink:MaD:617 |
+| Log4jJndiInjectionTest.java:987:94:987:101 | source(...) : String | Log4jJndiInjectionTest.java:987:85:987:101 | (...)... | provenance | Sink:MaD:618 |
+| Log4jJndiInjectionTest.java:987:94:987:101 | source(...) : String | Log4jJndiInjectionTest.java:987:85:987:101 | (...)... | provenance | Sink:MaD:617 |
+| Log4jJndiInjectionTest.java:988:79:988:86 | source(...) : String | Log4jJndiInjectionTest.java:988:70:988:86 | (...)... | provenance | Sink:MaD:618 |
+| Log4jJndiInjectionTest.java:988:79:988:86 | source(...) : String | Log4jJndiInjectionTest.java:988:70:988:86 | (...)... | provenance | Sink:MaD:617 |
+| Log4jJndiInjectionTest.java:989:64:989:71 | source(...) : String | Log4jJndiInjectionTest.java:989:55:989:71 | (...)... | provenance | Sink:MaD:618 |
+| Log4jJndiInjectionTest.java:989:64:989:71 | source(...) : String | Log4jJndiInjectionTest.java:989:55:989:71 | (...)... | provenance | Sink:MaD:617 |
+| Log4jJndiInjectionTest.java:990:49:990:56 | source(...) : String | Log4jJndiInjectionTest.java:990:40:990:56 | (...)... | provenance | Sink:MaD:618 |
+| Log4jJndiInjectionTest.java:990:49:990:56 | source(...) : String | Log4jJndiInjectionTest.java:990:40:990:56 | (...)... | provenance | Sink:MaD:617 |
+| Log4jJndiInjectionTest.java:991:34:991:41 | source(...) : String | Log4jJndiInjectionTest.java:991:25:991:41 | (...)... | provenance | Sink:MaD:618 |
+| Log4jJndiInjectionTest.java:991:34:991:41 | source(...) : String | Log4jJndiInjectionTest.java:991:25:991:41 | (...)... | provenance | Sink:MaD:617 |
+| Log4jJndiInjectionTest.java:992:34:992:41 | source(...) : String | Log4jJndiInjectionTest.java:992:25:992:41 | (...)... | provenance | Sink:MaD:602 |
+| Log4jJndiInjectionTest.java:992:34:992:41 | source(...) : String | Log4jJndiInjectionTest.java:992:25:992:41 | (...)... | provenance | Sink:MaD:601 |
+| Log4jJndiInjectionTest.java:993:54:993:61 | source(...) : String | Log4jJndiInjectionTest.java:993:40:993:61 | (...)... | provenance | Sink:MaD:602 |
+| Log4jJndiInjectionTest.java:993:54:993:61 | source(...) : String | Log4jJndiInjectionTest.java:993:40:993:61 | (...)... | provenance | Sink:MaD:601 |
+| Log4jJndiInjectionTest.java:994:34:994:41 | source(...) : String | Log4jJndiInjectionTest.java:994:25:994:41 | (...)... | provenance | Sink:MaD:622 |
+| Log4jJndiInjectionTest.java:994:34:994:41 | source(...) : String | Log4jJndiInjectionTest.java:994:25:994:41 | (...)... | provenance | Sink:MaD:621 |
+| Log4jJndiInjectionTest.java:995:39:995:46 | source(...) : String | Log4jJndiInjectionTest.java:995:25:995:46 | (...)... | provenance | Sink:MaD:624 |
+| Log4jJndiInjectionTest.java:995:39:995:46 | source(...) : String | Log4jJndiInjectionTest.java:995:25:995:46 | (...)... | provenance | Sink:MaD:623 |
+| Log4jJndiInjectionTest.java:996:39:996:46 | source(...) : String | Log4jJndiInjectionTest.java:996:25:996:46 | (...)... | provenance | Sink:MaD:626 |
+| Log4jJndiInjectionTest.java:996:39:996:46 | source(...) : String | Log4jJndiInjectionTest.java:996:25:996:46 | (...)... | provenance | Sink:MaD:625 |
+| Log4jJndiInjectionTest.java:998:65:998:72 | source(...) : String | Log4jJndiInjectionTest.java:998:55:998:72 | (...)... | provenance | Sink:MaD:454 |
+| Log4jJndiInjectionTest.java:998:65:998:72 | source(...) : String | Log4jJndiInjectionTest.java:998:55:998:72 | (...)... | provenance | Sink:MaD:453 |
+| Log4jJndiInjectionTest.java:999:48:999:55 | source(...) : String | Log4jJndiInjectionTest.java:999:39:999:55 | (...)... | provenance | Sink:MaD:456 |
+| Log4jJndiInjectionTest.java:999:48:999:55 | source(...) : String | Log4jJndiInjectionTest.java:999:39:999:55 | (...)... | provenance | Sink:MaD:455 |
+| Log4jJndiInjectionTest.java:1000:45:1000:67 | {...} : Object[] [[]] : String | Log4jJndiInjectionTest.java:1000:45:1000:67 | new Object[] | provenance | Sink:MaD:456 |
+| Log4jJndiInjectionTest.java:1000:45:1000:67 | {...} : Object[] [[]] : String | Log4jJndiInjectionTest.java:1000:45:1000:67 | new Object[] | provenance | Sink:MaD:455 |
 | Log4jJndiInjectionTest.java:1000:59:1000:66 | source(...) : String | Log4jJndiInjectionTest.java:1000:45:1000:67 | {...} : Object[] [[]] : String | provenance |  |
-| Log4jJndiInjectionTest.java:1001:42:1001:49 | source(...) : String | Log4jJndiInjectionTest.java:1001:33:1001:49 | (...)... | provenance |  Sink:MaD:235 |
-| Log4jJndiInjectionTest.java:1001:42:1001:49 | source(...) : String | Log4jJndiInjectionTest.java:1001:33:1001:49 | (...)... | provenance |  Sink:MaD:551 |
-| Log4jJndiInjectionTest.java:1002:39:1002:61 | {...} : Object[] [[]] : String | Log4jJndiInjectionTest.java:1002:39:1002:61 | new Object[] | provenance |  Sink:MaD:235 |
-| Log4jJndiInjectionTest.java:1002:39:1002:61 | {...} : Object[] [[]] : String | Log4jJndiInjectionTest.java:1002:39:1002:61 | new Object[] | provenance |  Sink:MaD:551 |
+| Log4jJndiInjectionTest.java:1001:42:1001:49 | source(...) : String | Log4jJndiInjectionTest.java:1001:33:1001:49 | (...)... | provenance | Sink:MaD:458 |
+| Log4jJndiInjectionTest.java:1001:42:1001:49 | source(...) : String | Log4jJndiInjectionTest.java:1001:33:1001:49 | (...)... | provenance | Sink:MaD:457 |
+| Log4jJndiInjectionTest.java:1002:39:1002:61 | {...} : Object[] [[]] : String | Log4jJndiInjectionTest.java:1002:39:1002:61 | new Object[] | provenance | Sink:MaD:458 |
+| Log4jJndiInjectionTest.java:1002:39:1002:61 | {...} : Object[] [[]] : String | Log4jJndiInjectionTest.java:1002:39:1002:61 | new Object[] | provenance | Sink:MaD:457 |
 | Log4jJndiInjectionTest.java:1002:53:1002:60 | source(...) : String | Log4jJndiInjectionTest.java:1002:39:1002:61 | {...} : Object[] [[]] : String | provenance |  |
-| Log4jJndiInjectionTest.java:1020:40:1020:47 | source(...) : String | Log4jJndiInjectionTest.java:1020:25:1020:47 | (...)... | provenance |  Sink:MaD:9 |
-| Log4jJndiInjectionTest.java:1020:40:1020:47 | source(...) : String | Log4jJndiInjectionTest.java:1020:25:1020:47 | (...)... | provenance |  Sink:MaD:325 |
-| Log4jJndiInjectionTest.java:1021:35:1021:42 | source(...) : String | Log4jJndiInjectionTest.java:1021:25:1021:42 | (...)... | provenance |  Sink:MaD:10 |
-| Log4jJndiInjectionTest.java:1021:35:1021:42 | source(...) : String | Log4jJndiInjectionTest.java:1021:25:1021:42 | (...)... | provenance |  Sink:MaD:326 |
-| Log4jJndiInjectionTest.java:1023:34:1023:41 | source(...) : String | Log4jJndiInjectionTest.java:1023:25:1023:41 | (...)... | provenance |  Sink:MaD:12 |
-| Log4jJndiInjectionTest.java:1023:34:1023:41 | source(...) : String | Log4jJndiInjectionTest.java:1023:25:1023:41 | (...)... | provenance |  Sink:MaD:328 |
-| Log4jJndiInjectionTest.java:1024:34:1024:41 | source(...) : String | Log4jJndiInjectionTest.java:1024:25:1024:41 | (...)... | provenance |  Sink:MaD:22 |
-| Log4jJndiInjectionTest.java:1024:34:1024:41 | source(...) : String | Log4jJndiInjectionTest.java:1024:25:1024:41 | (...)... | provenance |  Sink:MaD:338 |
-| Log4jJndiInjectionTest.java:1025:40:1025:62 | {...} : Object[] [[]] : String | Log4jJndiInjectionTest.java:1025:40:1025:62 | new Object[] | provenance |  Sink:MaD:22 |
-| Log4jJndiInjectionTest.java:1025:40:1025:62 | {...} : Object[] [[]] : String | Log4jJndiInjectionTest.java:1025:40:1025:62 | new Object[] | provenance |  Sink:MaD:338 |
+| Log4jJndiInjectionTest.java:1020:40:1020:47 | source(...) : String | Log4jJndiInjectionTest.java:1020:25:1020:47 | (...)... | provenance | Sink:MaD:6 |
+| Log4jJndiInjectionTest.java:1020:40:1020:47 | source(...) : String | Log4jJndiInjectionTest.java:1020:25:1020:47 | (...)... | provenance | Sink:MaD:5 |
+| Log4jJndiInjectionTest.java:1021:35:1021:42 | source(...) : String | Log4jJndiInjectionTest.java:1021:25:1021:42 | (...)... | provenance | Sink:MaD:8 |
+| Log4jJndiInjectionTest.java:1021:35:1021:42 | source(...) : String | Log4jJndiInjectionTest.java:1021:25:1021:42 | (...)... | provenance | Sink:MaD:7 |
+| Log4jJndiInjectionTest.java:1023:34:1023:41 | source(...) : String | Log4jJndiInjectionTest.java:1023:25:1023:41 | (...)... | provenance | Sink:MaD:12 |
+| Log4jJndiInjectionTest.java:1023:34:1023:41 | source(...) : String | Log4jJndiInjectionTest.java:1023:25:1023:41 | (...)... | provenance | Sink:MaD:11 |
+| Log4jJndiInjectionTest.java:1024:34:1024:41 | source(...) : String | Log4jJndiInjectionTest.java:1024:25:1024:41 | (...)... | provenance | Sink:MaD:32 |
+| Log4jJndiInjectionTest.java:1024:34:1024:41 | source(...) : String | Log4jJndiInjectionTest.java:1024:25:1024:41 | (...)... | provenance | Sink:MaD:31 |
+| Log4jJndiInjectionTest.java:1025:40:1025:62 | {...} : Object[] [[]] : String | Log4jJndiInjectionTest.java:1025:40:1025:62 | new Object[] | provenance | Sink:MaD:32 |
+| Log4jJndiInjectionTest.java:1025:40:1025:62 | {...} : Object[] [[]] : String | Log4jJndiInjectionTest.java:1025:40:1025:62 | new Object[] | provenance | Sink:MaD:31 |
 | Log4jJndiInjectionTest.java:1025:54:1025:61 | source(...) : String | Log4jJndiInjectionTest.java:1025:40:1025:62 | {...} : Object[] [[]] : String | provenance |  |
-| Log4jJndiInjectionTest.java:1028:49:1028:56 | source(...) : String | Log4jJndiInjectionTest.java:1028:40:1028:56 | (...)... | provenance |  Sink:MaD:13 |
-| Log4jJndiInjectionTest.java:1028:49:1028:56 | source(...) : String | Log4jJndiInjectionTest.java:1028:40:1028:56 | (...)... | provenance |  Sink:MaD:329 |
-| Log4jJndiInjectionTest.java:1029:34:1029:41 | source(...) : String | Log4jJndiInjectionTest.java:1029:25:1029:41 | (...)... | provenance |  Sink:MaD:13 |
-| Log4jJndiInjectionTest.java:1029:34:1029:41 | source(...) : String | Log4jJndiInjectionTest.java:1029:25:1029:41 | (...)... | provenance |  Sink:MaD:329 |
-| Log4jJndiInjectionTest.java:1030:64:1030:71 | source(...) : String | Log4jJndiInjectionTest.java:1030:55:1030:71 | (...)... | provenance |  Sink:MaD:14 |
-| Log4jJndiInjectionTest.java:1030:64:1030:71 | source(...) : String | Log4jJndiInjectionTest.java:1030:55:1030:71 | (...)... | provenance |  Sink:MaD:330 |
-| Log4jJndiInjectionTest.java:1031:49:1031:56 | source(...) : String | Log4jJndiInjectionTest.java:1031:40:1031:56 | (...)... | provenance |  Sink:MaD:14 |
-| Log4jJndiInjectionTest.java:1031:49:1031:56 | source(...) : String | Log4jJndiInjectionTest.java:1031:40:1031:56 | (...)... | provenance |  Sink:MaD:330 |
-| Log4jJndiInjectionTest.java:1032:34:1032:41 | source(...) : String | Log4jJndiInjectionTest.java:1032:25:1032:41 | (...)... | provenance |  Sink:MaD:14 |
-| Log4jJndiInjectionTest.java:1032:34:1032:41 | source(...) : String | Log4jJndiInjectionTest.java:1032:25:1032:41 | (...)... | provenance |  Sink:MaD:330 |
-| Log4jJndiInjectionTest.java:1033:79:1033:86 | source(...) : String | Log4jJndiInjectionTest.java:1033:70:1033:86 | (...)... | provenance |  Sink:MaD:15 |
-| Log4jJndiInjectionTest.java:1033:79:1033:86 | source(...) : String | Log4jJndiInjectionTest.java:1033:70:1033:86 | (...)... | provenance |  Sink:MaD:331 |
-| Log4jJndiInjectionTest.java:1034:64:1034:71 | source(...) : String | Log4jJndiInjectionTest.java:1034:55:1034:71 | (...)... | provenance |  Sink:MaD:15 |
-| Log4jJndiInjectionTest.java:1034:64:1034:71 | source(...) : String | Log4jJndiInjectionTest.java:1034:55:1034:71 | (...)... | provenance |  Sink:MaD:331 |
-| Log4jJndiInjectionTest.java:1035:49:1035:56 | source(...) : String | Log4jJndiInjectionTest.java:1035:40:1035:56 | (...)... | provenance |  Sink:MaD:15 |
-| Log4jJndiInjectionTest.java:1035:49:1035:56 | source(...) : String | Log4jJndiInjectionTest.java:1035:40:1035:56 | (...)... | provenance |  Sink:MaD:331 |
-| Log4jJndiInjectionTest.java:1036:34:1036:41 | source(...) : String | Log4jJndiInjectionTest.java:1036:25:1036:41 | (...)... | provenance |  Sink:MaD:15 |
-| Log4jJndiInjectionTest.java:1036:34:1036:41 | source(...) : String | Log4jJndiInjectionTest.java:1036:25:1036:41 | (...)... | provenance |  Sink:MaD:331 |
-| Log4jJndiInjectionTest.java:1037:94:1037:101 | source(...) : String | Log4jJndiInjectionTest.java:1037:85:1037:101 | (...)... | provenance |  Sink:MaD:16 |
-| Log4jJndiInjectionTest.java:1037:94:1037:101 | source(...) : String | Log4jJndiInjectionTest.java:1037:85:1037:101 | (...)... | provenance |  Sink:MaD:332 |
-| Log4jJndiInjectionTest.java:1038:79:1038:86 | source(...) : String | Log4jJndiInjectionTest.java:1038:70:1038:86 | (...)... | provenance |  Sink:MaD:16 |
-| Log4jJndiInjectionTest.java:1038:79:1038:86 | source(...) : String | Log4jJndiInjectionTest.java:1038:70:1038:86 | (...)... | provenance |  Sink:MaD:332 |
-| Log4jJndiInjectionTest.java:1039:64:1039:71 | source(...) : String | Log4jJndiInjectionTest.java:1039:55:1039:71 | (...)... | provenance |  Sink:MaD:16 |
-| Log4jJndiInjectionTest.java:1039:64:1039:71 | source(...) : String | Log4jJndiInjectionTest.java:1039:55:1039:71 | (...)... | provenance |  Sink:MaD:332 |
-| Log4jJndiInjectionTest.java:1040:49:1040:56 | source(...) : String | Log4jJndiInjectionTest.java:1040:40:1040:56 | (...)... | provenance |  Sink:MaD:16 |
-| Log4jJndiInjectionTest.java:1040:49:1040:56 | source(...) : String | Log4jJndiInjectionTest.java:1040:40:1040:56 | (...)... | provenance |  Sink:MaD:332 |
-| Log4jJndiInjectionTest.java:1041:34:1041:41 | source(...) : String | Log4jJndiInjectionTest.java:1041:25:1041:41 | (...)... | provenance |  Sink:MaD:16 |
-| Log4jJndiInjectionTest.java:1041:34:1041:41 | source(...) : String | Log4jJndiInjectionTest.java:1041:25:1041:41 | (...)... | provenance |  Sink:MaD:332 |
-| Log4jJndiInjectionTest.java:1042:109:1042:116 | source(...) : String | Log4jJndiInjectionTest.java:1042:100:1042:116 | (...)... | provenance |  Sink:MaD:17 |
-| Log4jJndiInjectionTest.java:1042:109:1042:116 | source(...) : String | Log4jJndiInjectionTest.java:1042:100:1042:116 | (...)... | provenance |  Sink:MaD:333 |
-| Log4jJndiInjectionTest.java:1043:94:1043:101 | source(...) : String | Log4jJndiInjectionTest.java:1043:85:1043:101 | (...)... | provenance |  Sink:MaD:17 |
-| Log4jJndiInjectionTest.java:1043:94:1043:101 | source(...) : String | Log4jJndiInjectionTest.java:1043:85:1043:101 | (...)... | provenance |  Sink:MaD:333 |
-| Log4jJndiInjectionTest.java:1044:79:1044:86 | source(...) : String | Log4jJndiInjectionTest.java:1044:70:1044:86 | (...)... | provenance |  Sink:MaD:17 |
-| Log4jJndiInjectionTest.java:1044:79:1044:86 | source(...) : String | Log4jJndiInjectionTest.java:1044:70:1044:86 | (...)... | provenance |  Sink:MaD:333 |
-| Log4jJndiInjectionTest.java:1045:64:1045:71 | source(...) : String | Log4jJndiInjectionTest.java:1045:55:1045:71 | (...)... | provenance |  Sink:MaD:17 |
-| Log4jJndiInjectionTest.java:1045:64:1045:71 | source(...) : String | Log4jJndiInjectionTest.java:1045:55:1045:71 | (...)... | provenance |  Sink:MaD:333 |
-| Log4jJndiInjectionTest.java:1046:49:1046:56 | source(...) : String | Log4jJndiInjectionTest.java:1046:40:1046:56 | (...)... | provenance |  Sink:MaD:17 |
-| Log4jJndiInjectionTest.java:1046:49:1046:56 | source(...) : String | Log4jJndiInjectionTest.java:1046:40:1046:56 | (...)... | provenance |  Sink:MaD:333 |
-| Log4jJndiInjectionTest.java:1047:34:1047:41 | source(...) : String | Log4jJndiInjectionTest.java:1047:25:1047:41 | (...)... | provenance |  Sink:MaD:17 |
-| Log4jJndiInjectionTest.java:1047:34:1047:41 | source(...) : String | Log4jJndiInjectionTest.java:1047:25:1047:41 | (...)... | provenance |  Sink:MaD:333 |
-| Log4jJndiInjectionTest.java:1048:124:1048:131 | source(...) : String | Log4jJndiInjectionTest.java:1048:115:1048:131 | (...)... | provenance |  Sink:MaD:18 |
-| Log4jJndiInjectionTest.java:1048:124:1048:131 | source(...) : String | Log4jJndiInjectionTest.java:1048:115:1048:131 | (...)... | provenance |  Sink:MaD:334 |
-| Log4jJndiInjectionTest.java:1049:109:1049:116 | source(...) : String | Log4jJndiInjectionTest.java:1049:100:1049:116 | (...)... | provenance |  Sink:MaD:18 |
-| Log4jJndiInjectionTest.java:1049:109:1049:116 | source(...) : String | Log4jJndiInjectionTest.java:1049:100:1049:116 | (...)... | provenance |  Sink:MaD:334 |
-| Log4jJndiInjectionTest.java:1050:94:1050:101 | source(...) : String | Log4jJndiInjectionTest.java:1050:85:1050:101 | (...)... | provenance |  Sink:MaD:18 |
-| Log4jJndiInjectionTest.java:1050:94:1050:101 | source(...) : String | Log4jJndiInjectionTest.java:1050:85:1050:101 | (...)... | provenance |  Sink:MaD:334 |
-| Log4jJndiInjectionTest.java:1051:79:1051:86 | source(...) : String | Log4jJndiInjectionTest.java:1051:70:1051:86 | (...)... | provenance |  Sink:MaD:18 |
-| Log4jJndiInjectionTest.java:1051:79:1051:86 | source(...) : String | Log4jJndiInjectionTest.java:1051:70:1051:86 | (...)... | provenance |  Sink:MaD:334 |
-| Log4jJndiInjectionTest.java:1052:64:1052:71 | source(...) : String | Log4jJndiInjectionTest.java:1052:55:1052:71 | (...)... | provenance |  Sink:MaD:18 |
-| Log4jJndiInjectionTest.java:1052:64:1052:71 | source(...) : String | Log4jJndiInjectionTest.java:1052:55:1052:71 | (...)... | provenance |  Sink:MaD:334 |
-| Log4jJndiInjectionTest.java:1053:49:1053:56 | source(...) : String | Log4jJndiInjectionTest.java:1053:40:1053:56 | (...)... | provenance |  Sink:MaD:18 |
-| Log4jJndiInjectionTest.java:1053:49:1053:56 | source(...) : String | Log4jJndiInjectionTest.java:1053:40:1053:56 | (...)... | provenance |  Sink:MaD:334 |
-| Log4jJndiInjectionTest.java:1054:34:1054:41 | source(...) : String | Log4jJndiInjectionTest.java:1054:25:1054:41 | (...)... | provenance |  Sink:MaD:18 |
-| Log4jJndiInjectionTest.java:1054:34:1054:41 | source(...) : String | Log4jJndiInjectionTest.java:1054:25:1054:41 | (...)... | provenance |  Sink:MaD:334 |
-| Log4jJndiInjectionTest.java:1055:139:1055:146 | source(...) : String | Log4jJndiInjectionTest.java:1055:130:1055:146 | (...)... | provenance |  Sink:MaD:19 |
-| Log4jJndiInjectionTest.java:1055:139:1055:146 | source(...) : String | Log4jJndiInjectionTest.java:1055:130:1055:146 | (...)... | provenance |  Sink:MaD:335 |
-| Log4jJndiInjectionTest.java:1056:124:1056:131 | source(...) : String | Log4jJndiInjectionTest.java:1056:115:1056:131 | (...)... | provenance |  Sink:MaD:19 |
-| Log4jJndiInjectionTest.java:1056:124:1056:131 | source(...) : String | Log4jJndiInjectionTest.java:1056:115:1056:131 | (...)... | provenance |  Sink:MaD:335 |
-| Log4jJndiInjectionTest.java:1057:109:1057:116 | source(...) : String | Log4jJndiInjectionTest.java:1057:100:1057:116 | (...)... | provenance |  Sink:MaD:19 |
-| Log4jJndiInjectionTest.java:1057:109:1057:116 | source(...) : String | Log4jJndiInjectionTest.java:1057:100:1057:116 | (...)... | provenance |  Sink:MaD:335 |
-| Log4jJndiInjectionTest.java:1058:94:1058:101 | source(...) : String | Log4jJndiInjectionTest.java:1058:85:1058:101 | (...)... | provenance |  Sink:MaD:19 |
-| Log4jJndiInjectionTest.java:1058:94:1058:101 | source(...) : String | Log4jJndiInjectionTest.java:1058:85:1058:101 | (...)... | provenance |  Sink:MaD:335 |
-| Log4jJndiInjectionTest.java:1059:79:1059:86 | source(...) : String | Log4jJndiInjectionTest.java:1059:70:1059:86 | (...)... | provenance |  Sink:MaD:19 |
-| Log4jJndiInjectionTest.java:1059:79:1059:86 | source(...) : String | Log4jJndiInjectionTest.java:1059:70:1059:86 | (...)... | provenance |  Sink:MaD:335 |
-| Log4jJndiInjectionTest.java:1060:64:1060:71 | source(...) : String | Log4jJndiInjectionTest.java:1060:55:1060:71 | (...)... | provenance |  Sink:MaD:19 |
-| Log4jJndiInjectionTest.java:1060:64:1060:71 | source(...) : String | Log4jJndiInjectionTest.java:1060:55:1060:71 | (...)... | provenance |  Sink:MaD:335 |
-| Log4jJndiInjectionTest.java:1061:49:1061:56 | source(...) : String | Log4jJndiInjectionTest.java:1061:40:1061:56 | (...)... | provenance |  Sink:MaD:19 |
-| Log4jJndiInjectionTest.java:1061:49:1061:56 | source(...) : String | Log4jJndiInjectionTest.java:1061:40:1061:56 | (...)... | provenance |  Sink:MaD:335 |
-| Log4jJndiInjectionTest.java:1062:34:1062:41 | source(...) : String | Log4jJndiInjectionTest.java:1062:25:1062:41 | (...)... | provenance |  Sink:MaD:19 |
-| Log4jJndiInjectionTest.java:1062:34:1062:41 | source(...) : String | Log4jJndiInjectionTest.java:1062:25:1062:41 | (...)... | provenance |  Sink:MaD:335 |
-| Log4jJndiInjectionTest.java:1063:154:1063:161 | source(...) : String | Log4jJndiInjectionTest.java:1063:145:1063:161 | (...)... | provenance |  Sink:MaD:20 |
-| Log4jJndiInjectionTest.java:1063:154:1063:161 | source(...) : String | Log4jJndiInjectionTest.java:1063:145:1063:161 | (...)... | provenance |  Sink:MaD:336 |
-| Log4jJndiInjectionTest.java:1064:139:1064:146 | source(...) : String | Log4jJndiInjectionTest.java:1064:130:1064:146 | (...)... | provenance |  Sink:MaD:20 |
-| Log4jJndiInjectionTest.java:1064:139:1064:146 | source(...) : String | Log4jJndiInjectionTest.java:1064:130:1064:146 | (...)... | provenance |  Sink:MaD:336 |
-| Log4jJndiInjectionTest.java:1065:124:1065:131 | source(...) : String | Log4jJndiInjectionTest.java:1065:115:1065:131 | (...)... | provenance |  Sink:MaD:20 |
-| Log4jJndiInjectionTest.java:1065:124:1065:131 | source(...) : String | Log4jJndiInjectionTest.java:1065:115:1065:131 | (...)... | provenance |  Sink:MaD:336 |
-| Log4jJndiInjectionTest.java:1066:109:1066:116 | source(...) : String | Log4jJndiInjectionTest.java:1066:100:1066:116 | (...)... | provenance |  Sink:MaD:20 |
-| Log4jJndiInjectionTest.java:1066:109:1066:116 | source(...) : String | Log4jJndiInjectionTest.java:1066:100:1066:116 | (...)... | provenance |  Sink:MaD:336 |
-| Log4jJndiInjectionTest.java:1067:94:1067:101 | source(...) : String | Log4jJndiInjectionTest.java:1067:85:1067:101 | (...)... | provenance |  Sink:MaD:20 |
-| Log4jJndiInjectionTest.java:1067:94:1067:101 | source(...) : String | Log4jJndiInjectionTest.java:1067:85:1067:101 | (...)... | provenance |  Sink:MaD:336 |
-| Log4jJndiInjectionTest.java:1068:79:1068:86 | source(...) : String | Log4jJndiInjectionTest.java:1068:70:1068:86 | (...)... | provenance |  Sink:MaD:20 |
-| Log4jJndiInjectionTest.java:1068:79:1068:86 | source(...) : String | Log4jJndiInjectionTest.java:1068:70:1068:86 | (...)... | provenance |  Sink:MaD:336 |
-| Log4jJndiInjectionTest.java:1069:64:1069:71 | source(...) : String | Log4jJndiInjectionTest.java:1069:55:1069:71 | (...)... | provenance |  Sink:MaD:20 |
-| Log4jJndiInjectionTest.java:1069:64:1069:71 | source(...) : String | Log4jJndiInjectionTest.java:1069:55:1069:71 | (...)... | provenance |  Sink:MaD:336 |
-| Log4jJndiInjectionTest.java:1070:49:1070:56 | source(...) : String | Log4jJndiInjectionTest.java:1070:40:1070:56 | (...)... | provenance |  Sink:MaD:20 |
-| Log4jJndiInjectionTest.java:1070:49:1070:56 | source(...) : String | Log4jJndiInjectionTest.java:1070:40:1070:56 | (...)... | provenance |  Sink:MaD:336 |
-| Log4jJndiInjectionTest.java:1071:34:1071:41 | source(...) : String | Log4jJndiInjectionTest.java:1071:25:1071:41 | (...)... | provenance |  Sink:MaD:20 |
-| Log4jJndiInjectionTest.java:1071:34:1071:41 | source(...) : String | Log4jJndiInjectionTest.java:1071:25:1071:41 | (...)... | provenance |  Sink:MaD:336 |
-| Log4jJndiInjectionTest.java:1072:169:1072:176 | source(...) : String | Log4jJndiInjectionTest.java:1072:160:1072:176 | (...)... | provenance |  Sink:MaD:21 |
-| Log4jJndiInjectionTest.java:1072:169:1072:176 | source(...) : String | Log4jJndiInjectionTest.java:1072:160:1072:176 | (...)... | provenance |  Sink:MaD:337 |
-| Log4jJndiInjectionTest.java:1073:154:1073:161 | source(...) : String | Log4jJndiInjectionTest.java:1073:145:1073:161 | (...)... | provenance |  Sink:MaD:21 |
-| Log4jJndiInjectionTest.java:1073:154:1073:161 | source(...) : String | Log4jJndiInjectionTest.java:1073:145:1073:161 | (...)... | provenance |  Sink:MaD:337 |
-| Log4jJndiInjectionTest.java:1074:139:1074:146 | source(...) : String | Log4jJndiInjectionTest.java:1074:130:1074:146 | (...)... | provenance |  Sink:MaD:21 |
-| Log4jJndiInjectionTest.java:1074:139:1074:146 | source(...) : String | Log4jJndiInjectionTest.java:1074:130:1074:146 | (...)... | provenance |  Sink:MaD:337 |
-| Log4jJndiInjectionTest.java:1075:124:1075:131 | source(...) : String | Log4jJndiInjectionTest.java:1075:115:1075:131 | (...)... | provenance |  Sink:MaD:21 |
-| Log4jJndiInjectionTest.java:1075:124:1075:131 | source(...) : String | Log4jJndiInjectionTest.java:1075:115:1075:131 | (...)... | provenance |  Sink:MaD:337 |
-| Log4jJndiInjectionTest.java:1076:109:1076:116 | source(...) : String | Log4jJndiInjectionTest.java:1076:100:1076:116 | (...)... | provenance |  Sink:MaD:21 |
-| Log4jJndiInjectionTest.java:1076:109:1076:116 | source(...) : String | Log4jJndiInjectionTest.java:1076:100:1076:116 | (...)... | provenance |  Sink:MaD:337 |
-| Log4jJndiInjectionTest.java:1077:94:1077:101 | source(...) : String | Log4jJndiInjectionTest.java:1077:85:1077:101 | (...)... | provenance |  Sink:MaD:21 |
-| Log4jJndiInjectionTest.java:1077:94:1077:101 | source(...) : String | Log4jJndiInjectionTest.java:1077:85:1077:101 | (...)... | provenance |  Sink:MaD:337 |
-| Log4jJndiInjectionTest.java:1078:79:1078:86 | source(...) : String | Log4jJndiInjectionTest.java:1078:70:1078:86 | (...)... | provenance |  Sink:MaD:21 |
-| Log4jJndiInjectionTest.java:1078:79:1078:86 | source(...) : String | Log4jJndiInjectionTest.java:1078:70:1078:86 | (...)... | provenance |  Sink:MaD:337 |
-| Log4jJndiInjectionTest.java:1079:64:1079:71 | source(...) : String | Log4jJndiInjectionTest.java:1079:55:1079:71 | (...)... | provenance |  Sink:MaD:21 |
-| Log4jJndiInjectionTest.java:1079:64:1079:71 | source(...) : String | Log4jJndiInjectionTest.java:1079:55:1079:71 | (...)... | provenance |  Sink:MaD:337 |
-| Log4jJndiInjectionTest.java:1080:49:1080:56 | source(...) : String | Log4jJndiInjectionTest.java:1080:40:1080:56 | (...)... | provenance |  Sink:MaD:21 |
-| Log4jJndiInjectionTest.java:1080:49:1080:56 | source(...) : String | Log4jJndiInjectionTest.java:1080:40:1080:56 | (...)... | provenance |  Sink:MaD:337 |
-| Log4jJndiInjectionTest.java:1081:34:1081:41 | source(...) : String | Log4jJndiInjectionTest.java:1081:25:1081:41 | (...)... | provenance |  Sink:MaD:21 |
-| Log4jJndiInjectionTest.java:1081:34:1081:41 | source(...) : String | Log4jJndiInjectionTest.java:1081:25:1081:41 | (...)... | provenance |  Sink:MaD:337 |
-| Log4jJndiInjectionTest.java:1083:34:1083:41 | source(...) : String | Log4jJndiInjectionTest.java:1083:25:1083:41 | (...)... | provenance |  Sink:MaD:13 |
-| Log4jJndiInjectionTest.java:1083:34:1083:41 | source(...) : String | Log4jJndiInjectionTest.java:1083:25:1083:41 | (...)... | provenance |  Sink:MaD:329 |
-| Log4jJndiInjectionTest.java:1084:54:1084:61 | source(...) : String | Log4jJndiInjectionTest.java:1084:40:1084:61 | (...)... | provenance |  Sink:MaD:13 |
-| Log4jJndiInjectionTest.java:1084:54:1084:61 | source(...) : String | Log4jJndiInjectionTest.java:1084:40:1084:61 | (...)... | provenance |  Sink:MaD:329 |
-| Log4jJndiInjectionTest.java:1085:39:1085:46 | source(...) : String | Log4jJndiInjectionTest.java:1085:25:1085:46 | (...)... | provenance |  Sink:MaD:11 |
-| Log4jJndiInjectionTest.java:1085:39:1085:46 | source(...) : String | Log4jJndiInjectionTest.java:1085:25:1085:46 | (...)... | provenance |  Sink:MaD:327 |
-| Log4jJndiInjectionTest.java:1088:47:1088:54 | source(...) : String | Log4jJndiInjectionTest.java:1088:38:1088:54 | (...)... | provenance |  Sink:MaD:320 |
-| Log4jJndiInjectionTest.java:1089:53:1089:60 | source(...) : String | Log4jJndiInjectionTest.java:1089:44:1089:60 | (...)... | provenance |  Sink:MaD:322 |
-| Log4jJndiInjectionTest.java:1091:13:1091:15 | map [post update] : HashMap [<map.value>] : String | Log4jJndiInjectionTest.java:1092:34:1092:36 | map | provenance |  Sink:MaD:321 |
-| Log4jJndiInjectionTest.java:1091:28:1091:44 | (...)... : String | Log4jJndiInjectionTest.java:1091:13:1091:15 | map [post update] : HashMap [<map.value>] : String | provenance | MaD:323 |
+| Log4jJndiInjectionTest.java:1028:49:1028:56 | source(...) : String | Log4jJndiInjectionTest.java:1028:40:1028:56 | (...)... | provenance | Sink:MaD:14 |
+| Log4jJndiInjectionTest.java:1028:49:1028:56 | source(...) : String | Log4jJndiInjectionTest.java:1028:40:1028:56 | (...)... | provenance | Sink:MaD:13 |
+| Log4jJndiInjectionTest.java:1029:34:1029:41 | source(...) : String | Log4jJndiInjectionTest.java:1029:25:1029:41 | (...)... | provenance | Sink:MaD:14 |
+| Log4jJndiInjectionTest.java:1029:34:1029:41 | source(...) : String | Log4jJndiInjectionTest.java:1029:25:1029:41 | (...)... | provenance | Sink:MaD:13 |
+| Log4jJndiInjectionTest.java:1030:64:1030:71 | source(...) : String | Log4jJndiInjectionTest.java:1030:55:1030:71 | (...)... | provenance | Sink:MaD:16 |
+| Log4jJndiInjectionTest.java:1030:64:1030:71 | source(...) : String | Log4jJndiInjectionTest.java:1030:55:1030:71 | (...)... | provenance | Sink:MaD:15 |
+| Log4jJndiInjectionTest.java:1031:49:1031:56 | source(...) : String | Log4jJndiInjectionTest.java:1031:40:1031:56 | (...)... | provenance | Sink:MaD:16 |
+| Log4jJndiInjectionTest.java:1031:49:1031:56 | source(...) : String | Log4jJndiInjectionTest.java:1031:40:1031:56 | (...)... | provenance | Sink:MaD:15 |
+| Log4jJndiInjectionTest.java:1032:34:1032:41 | source(...) : String | Log4jJndiInjectionTest.java:1032:25:1032:41 | (...)... | provenance | Sink:MaD:16 |
+| Log4jJndiInjectionTest.java:1032:34:1032:41 | source(...) : String | Log4jJndiInjectionTest.java:1032:25:1032:41 | (...)... | provenance | Sink:MaD:15 |
+| Log4jJndiInjectionTest.java:1033:79:1033:86 | source(...) : String | Log4jJndiInjectionTest.java:1033:70:1033:86 | (...)... | provenance | Sink:MaD:18 |
+| Log4jJndiInjectionTest.java:1033:79:1033:86 | source(...) : String | Log4jJndiInjectionTest.java:1033:70:1033:86 | (...)... | provenance | Sink:MaD:17 |
+| Log4jJndiInjectionTest.java:1034:64:1034:71 | source(...) : String | Log4jJndiInjectionTest.java:1034:55:1034:71 | (...)... | provenance | Sink:MaD:18 |
+| Log4jJndiInjectionTest.java:1034:64:1034:71 | source(...) : String | Log4jJndiInjectionTest.java:1034:55:1034:71 | (...)... | provenance | Sink:MaD:17 |
+| Log4jJndiInjectionTest.java:1035:49:1035:56 | source(...) : String | Log4jJndiInjectionTest.java:1035:40:1035:56 | (...)... | provenance | Sink:MaD:18 |
+| Log4jJndiInjectionTest.java:1035:49:1035:56 | source(...) : String | Log4jJndiInjectionTest.java:1035:40:1035:56 | (...)... | provenance | Sink:MaD:17 |
+| Log4jJndiInjectionTest.java:1036:34:1036:41 | source(...) : String | Log4jJndiInjectionTest.java:1036:25:1036:41 | (...)... | provenance | Sink:MaD:18 |
+| Log4jJndiInjectionTest.java:1036:34:1036:41 | source(...) : String | Log4jJndiInjectionTest.java:1036:25:1036:41 | (...)... | provenance | Sink:MaD:17 |
+| Log4jJndiInjectionTest.java:1037:94:1037:101 | source(...) : String | Log4jJndiInjectionTest.java:1037:85:1037:101 | (...)... | provenance | Sink:MaD:20 |
+| Log4jJndiInjectionTest.java:1037:94:1037:101 | source(...) : String | Log4jJndiInjectionTest.java:1037:85:1037:101 | (...)... | provenance | Sink:MaD:19 |
+| Log4jJndiInjectionTest.java:1038:79:1038:86 | source(...) : String | Log4jJndiInjectionTest.java:1038:70:1038:86 | (...)... | provenance | Sink:MaD:20 |
+| Log4jJndiInjectionTest.java:1038:79:1038:86 | source(...) : String | Log4jJndiInjectionTest.java:1038:70:1038:86 | (...)... | provenance | Sink:MaD:19 |
+| Log4jJndiInjectionTest.java:1039:64:1039:71 | source(...) : String | Log4jJndiInjectionTest.java:1039:55:1039:71 | (...)... | provenance | Sink:MaD:20 |
+| Log4jJndiInjectionTest.java:1039:64:1039:71 | source(...) : String | Log4jJndiInjectionTest.java:1039:55:1039:71 | (...)... | provenance | Sink:MaD:19 |
+| Log4jJndiInjectionTest.java:1040:49:1040:56 | source(...) : String | Log4jJndiInjectionTest.java:1040:40:1040:56 | (...)... | provenance | Sink:MaD:20 |
+| Log4jJndiInjectionTest.java:1040:49:1040:56 | source(...) : String | Log4jJndiInjectionTest.java:1040:40:1040:56 | (...)... | provenance | Sink:MaD:19 |
+| Log4jJndiInjectionTest.java:1041:34:1041:41 | source(...) : String | Log4jJndiInjectionTest.java:1041:25:1041:41 | (...)... | provenance | Sink:MaD:20 |
+| Log4jJndiInjectionTest.java:1041:34:1041:41 | source(...) : String | Log4jJndiInjectionTest.java:1041:25:1041:41 | (...)... | provenance | Sink:MaD:19 |
+| Log4jJndiInjectionTest.java:1042:109:1042:116 | source(...) : String | Log4jJndiInjectionTest.java:1042:100:1042:116 | (...)... | provenance | Sink:MaD:22 |
+| Log4jJndiInjectionTest.java:1042:109:1042:116 | source(...) : String | Log4jJndiInjectionTest.java:1042:100:1042:116 | (...)... | provenance | Sink:MaD:21 |
+| Log4jJndiInjectionTest.java:1043:94:1043:101 | source(...) : String | Log4jJndiInjectionTest.java:1043:85:1043:101 | (...)... | provenance | Sink:MaD:22 |
+| Log4jJndiInjectionTest.java:1043:94:1043:101 | source(...) : String | Log4jJndiInjectionTest.java:1043:85:1043:101 | (...)... | provenance | Sink:MaD:21 |
+| Log4jJndiInjectionTest.java:1044:79:1044:86 | source(...) : String | Log4jJndiInjectionTest.java:1044:70:1044:86 | (...)... | provenance | Sink:MaD:22 |
+| Log4jJndiInjectionTest.java:1044:79:1044:86 | source(...) : String | Log4jJndiInjectionTest.java:1044:70:1044:86 | (...)... | provenance | Sink:MaD:21 |
+| Log4jJndiInjectionTest.java:1045:64:1045:71 | source(...) : String | Log4jJndiInjectionTest.java:1045:55:1045:71 | (...)... | provenance | Sink:MaD:22 |
+| Log4jJndiInjectionTest.java:1045:64:1045:71 | source(...) : String | Log4jJndiInjectionTest.java:1045:55:1045:71 | (...)... | provenance | Sink:MaD:21 |
+| Log4jJndiInjectionTest.java:1046:49:1046:56 | source(...) : String | Log4jJndiInjectionTest.java:1046:40:1046:56 | (...)... | provenance | Sink:MaD:22 |
+| Log4jJndiInjectionTest.java:1046:49:1046:56 | source(...) : String | Log4jJndiInjectionTest.java:1046:40:1046:56 | (...)... | provenance | Sink:MaD:21 |
+| Log4jJndiInjectionTest.java:1047:34:1047:41 | source(...) : String | Log4jJndiInjectionTest.java:1047:25:1047:41 | (...)... | provenance | Sink:MaD:22 |
+| Log4jJndiInjectionTest.java:1047:34:1047:41 | source(...) : String | Log4jJndiInjectionTest.java:1047:25:1047:41 | (...)... | provenance | Sink:MaD:21 |
+| Log4jJndiInjectionTest.java:1048:124:1048:131 | source(...) : String | Log4jJndiInjectionTest.java:1048:115:1048:131 | (...)... | provenance | Sink:MaD:24 |
+| Log4jJndiInjectionTest.java:1048:124:1048:131 | source(...) : String | Log4jJndiInjectionTest.java:1048:115:1048:131 | (...)... | provenance | Sink:MaD:23 |
+| Log4jJndiInjectionTest.java:1049:109:1049:116 | source(...) : String | Log4jJndiInjectionTest.java:1049:100:1049:116 | (...)... | provenance | Sink:MaD:24 |
+| Log4jJndiInjectionTest.java:1049:109:1049:116 | source(...) : String | Log4jJndiInjectionTest.java:1049:100:1049:116 | (...)... | provenance | Sink:MaD:23 |
+| Log4jJndiInjectionTest.java:1050:94:1050:101 | source(...) : String | Log4jJndiInjectionTest.java:1050:85:1050:101 | (...)... | provenance | Sink:MaD:24 |
+| Log4jJndiInjectionTest.java:1050:94:1050:101 | source(...) : String | Log4jJndiInjectionTest.java:1050:85:1050:101 | (...)... | provenance | Sink:MaD:23 |
+| Log4jJndiInjectionTest.java:1051:79:1051:86 | source(...) : String | Log4jJndiInjectionTest.java:1051:70:1051:86 | (...)... | provenance | Sink:MaD:24 |
+| Log4jJndiInjectionTest.java:1051:79:1051:86 | source(...) : String | Log4jJndiInjectionTest.java:1051:70:1051:86 | (...)... | provenance | Sink:MaD:23 |
+| Log4jJndiInjectionTest.java:1052:64:1052:71 | source(...) : String | Log4jJndiInjectionTest.java:1052:55:1052:71 | (...)... | provenance | Sink:MaD:24 |
+| Log4jJndiInjectionTest.java:1052:64:1052:71 | source(...) : String | Log4jJndiInjectionTest.java:1052:55:1052:71 | (...)... | provenance | Sink:MaD:23 |
+| Log4jJndiInjectionTest.java:1053:49:1053:56 | source(...) : String | Log4jJndiInjectionTest.java:1053:40:1053:56 | (...)... | provenance | Sink:MaD:24 |
+| Log4jJndiInjectionTest.java:1053:49:1053:56 | source(...) : String | Log4jJndiInjectionTest.java:1053:40:1053:56 | (...)... | provenance | Sink:MaD:23 |
+| Log4jJndiInjectionTest.java:1054:34:1054:41 | source(...) : String | Log4jJndiInjectionTest.java:1054:25:1054:41 | (...)... | provenance | Sink:MaD:24 |
+| Log4jJndiInjectionTest.java:1054:34:1054:41 | source(...) : String | Log4jJndiInjectionTest.java:1054:25:1054:41 | (...)... | provenance | Sink:MaD:23 |
+| Log4jJndiInjectionTest.java:1055:139:1055:146 | source(...) : String | Log4jJndiInjectionTest.java:1055:130:1055:146 | (...)... | provenance | Sink:MaD:26 |
+| Log4jJndiInjectionTest.java:1055:139:1055:146 | source(...) : String | Log4jJndiInjectionTest.java:1055:130:1055:146 | (...)... | provenance | Sink:MaD:25 |
+| Log4jJndiInjectionTest.java:1056:124:1056:131 | source(...) : String | Log4jJndiInjectionTest.java:1056:115:1056:131 | (...)... | provenance | Sink:MaD:26 |
+| Log4jJndiInjectionTest.java:1056:124:1056:131 | source(...) : String | Log4jJndiInjectionTest.java:1056:115:1056:131 | (...)... | provenance | Sink:MaD:25 |
+| Log4jJndiInjectionTest.java:1057:109:1057:116 | source(...) : String | Log4jJndiInjectionTest.java:1057:100:1057:116 | (...)... | provenance | Sink:MaD:26 |
+| Log4jJndiInjectionTest.java:1057:109:1057:116 | source(...) : String | Log4jJndiInjectionTest.java:1057:100:1057:116 | (...)... | provenance | Sink:MaD:25 |
+| Log4jJndiInjectionTest.java:1058:94:1058:101 | source(...) : String | Log4jJndiInjectionTest.java:1058:85:1058:101 | (...)... | provenance | Sink:MaD:26 |
+| Log4jJndiInjectionTest.java:1058:94:1058:101 | source(...) : String | Log4jJndiInjectionTest.java:1058:85:1058:101 | (...)... | provenance | Sink:MaD:25 |
+| Log4jJndiInjectionTest.java:1059:79:1059:86 | source(...) : String | Log4jJndiInjectionTest.java:1059:70:1059:86 | (...)... | provenance | Sink:MaD:26 |
+| Log4jJndiInjectionTest.java:1059:79:1059:86 | source(...) : String | Log4jJndiInjectionTest.java:1059:70:1059:86 | (...)... | provenance | Sink:MaD:25 |
+| Log4jJndiInjectionTest.java:1060:64:1060:71 | source(...) : String | Log4jJndiInjectionTest.java:1060:55:1060:71 | (...)... | provenance | Sink:MaD:26 |
+| Log4jJndiInjectionTest.java:1060:64:1060:71 | source(...) : String | Log4jJndiInjectionTest.java:1060:55:1060:71 | (...)... | provenance | Sink:MaD:25 |
+| Log4jJndiInjectionTest.java:1061:49:1061:56 | source(...) : String | Log4jJndiInjectionTest.java:1061:40:1061:56 | (...)... | provenance | Sink:MaD:26 |
+| Log4jJndiInjectionTest.java:1061:49:1061:56 | source(...) : String | Log4jJndiInjectionTest.java:1061:40:1061:56 | (...)... | provenance | Sink:MaD:25 |
+| Log4jJndiInjectionTest.java:1062:34:1062:41 | source(...) : String | Log4jJndiInjectionTest.java:1062:25:1062:41 | (...)... | provenance | Sink:MaD:26 |
+| Log4jJndiInjectionTest.java:1062:34:1062:41 | source(...) : String | Log4jJndiInjectionTest.java:1062:25:1062:41 | (...)... | provenance | Sink:MaD:25 |
+| Log4jJndiInjectionTest.java:1063:154:1063:161 | source(...) : String | Log4jJndiInjectionTest.java:1063:145:1063:161 | (...)... | provenance | Sink:MaD:28 |
+| Log4jJndiInjectionTest.java:1063:154:1063:161 | source(...) : String | Log4jJndiInjectionTest.java:1063:145:1063:161 | (...)... | provenance | Sink:MaD:27 |
+| Log4jJndiInjectionTest.java:1064:139:1064:146 | source(...) : String | Log4jJndiInjectionTest.java:1064:130:1064:146 | (...)... | provenance | Sink:MaD:28 |
+| Log4jJndiInjectionTest.java:1064:139:1064:146 | source(...) : String | Log4jJndiInjectionTest.java:1064:130:1064:146 | (...)... | provenance | Sink:MaD:27 |
+| Log4jJndiInjectionTest.java:1065:124:1065:131 | source(...) : String | Log4jJndiInjectionTest.java:1065:115:1065:131 | (...)... | provenance | Sink:MaD:28 |
+| Log4jJndiInjectionTest.java:1065:124:1065:131 | source(...) : String | Log4jJndiInjectionTest.java:1065:115:1065:131 | (...)... | provenance | Sink:MaD:27 |
+| Log4jJndiInjectionTest.java:1066:109:1066:116 | source(...) : String | Log4jJndiInjectionTest.java:1066:100:1066:116 | (...)... | provenance | Sink:MaD:28 |
+| Log4jJndiInjectionTest.java:1066:109:1066:116 | source(...) : String | Log4jJndiInjectionTest.java:1066:100:1066:116 | (...)... | provenance | Sink:MaD:27 |
+| Log4jJndiInjectionTest.java:1067:94:1067:101 | source(...) : String | Log4jJndiInjectionTest.java:1067:85:1067:101 | (...)... | provenance | Sink:MaD:28 |
+| Log4jJndiInjectionTest.java:1067:94:1067:101 | source(...) : String | Log4jJndiInjectionTest.java:1067:85:1067:101 | (...)... | provenance | Sink:MaD:27 |
+| Log4jJndiInjectionTest.java:1068:79:1068:86 | source(...) : String | Log4jJndiInjectionTest.java:1068:70:1068:86 | (...)... | provenance | Sink:MaD:28 |
+| Log4jJndiInjectionTest.java:1068:79:1068:86 | source(...) : String | Log4jJndiInjectionTest.java:1068:70:1068:86 | (...)... | provenance | Sink:MaD:27 |
+| Log4jJndiInjectionTest.java:1069:64:1069:71 | source(...) : String | Log4jJndiInjectionTest.java:1069:55:1069:71 | (...)... | provenance | Sink:MaD:28 |
+| Log4jJndiInjectionTest.java:1069:64:1069:71 | source(...) : String | Log4jJndiInjectionTest.java:1069:55:1069:71 | (...)... | provenance | Sink:MaD:27 |
+| Log4jJndiInjectionTest.java:1070:49:1070:56 | source(...) : String | Log4jJndiInjectionTest.java:1070:40:1070:56 | (...)... | provenance | Sink:MaD:28 |
+| Log4jJndiInjectionTest.java:1070:49:1070:56 | source(...) : String | Log4jJndiInjectionTest.java:1070:40:1070:56 | (...)... | provenance | Sink:MaD:27 |
+| Log4jJndiInjectionTest.java:1071:34:1071:41 | source(...) : String | Log4jJndiInjectionTest.java:1071:25:1071:41 | (...)... | provenance | Sink:MaD:28 |
+| Log4jJndiInjectionTest.java:1071:34:1071:41 | source(...) : String | Log4jJndiInjectionTest.java:1071:25:1071:41 | (...)... | provenance | Sink:MaD:27 |
+| Log4jJndiInjectionTest.java:1072:169:1072:176 | source(...) : String | Log4jJndiInjectionTest.java:1072:160:1072:176 | (...)... | provenance | Sink:MaD:30 |
+| Log4jJndiInjectionTest.java:1072:169:1072:176 | source(...) : String | Log4jJndiInjectionTest.java:1072:160:1072:176 | (...)... | provenance | Sink:MaD:29 |
+| Log4jJndiInjectionTest.java:1073:154:1073:161 | source(...) : String | Log4jJndiInjectionTest.java:1073:145:1073:161 | (...)... | provenance | Sink:MaD:30 |
+| Log4jJndiInjectionTest.java:1073:154:1073:161 | source(...) : String | Log4jJndiInjectionTest.java:1073:145:1073:161 | (...)... | provenance | Sink:MaD:29 |
+| Log4jJndiInjectionTest.java:1074:139:1074:146 | source(...) : String | Log4jJndiInjectionTest.java:1074:130:1074:146 | (...)... | provenance | Sink:MaD:30 |
+| Log4jJndiInjectionTest.java:1074:139:1074:146 | source(...) : String | Log4jJndiInjectionTest.java:1074:130:1074:146 | (...)... | provenance | Sink:MaD:29 |
+| Log4jJndiInjectionTest.java:1075:124:1075:131 | source(...) : String | Log4jJndiInjectionTest.java:1075:115:1075:131 | (...)... | provenance | Sink:MaD:30 |
+| Log4jJndiInjectionTest.java:1075:124:1075:131 | source(...) : String | Log4jJndiInjectionTest.java:1075:115:1075:131 | (...)... | provenance | Sink:MaD:29 |
+| Log4jJndiInjectionTest.java:1076:109:1076:116 | source(...) : String | Log4jJndiInjectionTest.java:1076:100:1076:116 | (...)... | provenance | Sink:MaD:30 |
+| Log4jJndiInjectionTest.java:1076:109:1076:116 | source(...) : String | Log4jJndiInjectionTest.java:1076:100:1076:116 | (...)... | provenance | Sink:MaD:29 |
+| Log4jJndiInjectionTest.java:1077:94:1077:101 | source(...) : String | Log4jJndiInjectionTest.java:1077:85:1077:101 | (...)... | provenance | Sink:MaD:30 |
+| Log4jJndiInjectionTest.java:1077:94:1077:101 | source(...) : String | Log4jJndiInjectionTest.java:1077:85:1077:101 | (...)... | provenance | Sink:MaD:29 |
+| Log4jJndiInjectionTest.java:1078:79:1078:86 | source(...) : String | Log4jJndiInjectionTest.java:1078:70:1078:86 | (...)... | provenance | Sink:MaD:30 |
+| Log4jJndiInjectionTest.java:1078:79:1078:86 | source(...) : String | Log4jJndiInjectionTest.java:1078:70:1078:86 | (...)... | provenance | Sink:MaD:29 |
+| Log4jJndiInjectionTest.java:1079:64:1079:71 | source(...) : String | Log4jJndiInjectionTest.java:1079:55:1079:71 | (...)... | provenance | Sink:MaD:30 |
+| Log4jJndiInjectionTest.java:1079:64:1079:71 | source(...) : String | Log4jJndiInjectionTest.java:1079:55:1079:71 | (...)... | provenance | Sink:MaD:29 |
+| Log4jJndiInjectionTest.java:1080:49:1080:56 | source(...) : String | Log4jJndiInjectionTest.java:1080:40:1080:56 | (...)... | provenance | Sink:MaD:30 |
+| Log4jJndiInjectionTest.java:1080:49:1080:56 | source(...) : String | Log4jJndiInjectionTest.java:1080:40:1080:56 | (...)... | provenance | Sink:MaD:29 |
+| Log4jJndiInjectionTest.java:1081:34:1081:41 | source(...) : String | Log4jJndiInjectionTest.java:1081:25:1081:41 | (...)... | provenance | Sink:MaD:30 |
+| Log4jJndiInjectionTest.java:1081:34:1081:41 | source(...) : String | Log4jJndiInjectionTest.java:1081:25:1081:41 | (...)... | provenance | Sink:MaD:29 |
+| Log4jJndiInjectionTest.java:1083:34:1083:41 | source(...) : String | Log4jJndiInjectionTest.java:1083:25:1083:41 | (...)... | provenance | Sink:MaD:14 |
+| Log4jJndiInjectionTest.java:1083:34:1083:41 | source(...) : String | Log4jJndiInjectionTest.java:1083:25:1083:41 | (...)... | provenance | Sink:MaD:13 |
+| Log4jJndiInjectionTest.java:1084:54:1084:61 | source(...) : String | Log4jJndiInjectionTest.java:1084:40:1084:61 | (...)... | provenance | Sink:MaD:14 |
+| Log4jJndiInjectionTest.java:1084:54:1084:61 | source(...) : String | Log4jJndiInjectionTest.java:1084:40:1084:61 | (...)... | provenance | Sink:MaD:13 |
+| Log4jJndiInjectionTest.java:1085:39:1085:46 | source(...) : String | Log4jJndiInjectionTest.java:1085:25:1085:46 | (...)... | provenance | Sink:MaD:10 |
+| Log4jJndiInjectionTest.java:1085:39:1085:46 | source(...) : String | Log4jJndiInjectionTest.java:1085:25:1085:46 | (...)... | provenance | Sink:MaD:9 |
+| Log4jJndiInjectionTest.java:1088:47:1088:54 | source(...) : String | Log4jJndiInjectionTest.java:1088:38:1088:54 | (...)... | provenance | Sink:MaD:627 |
+| Log4jJndiInjectionTest.java:1089:53:1089:60 | source(...) : String | Log4jJndiInjectionTest.java:1089:44:1089:60 | (...)... | provenance | Sink:MaD:629 |
+| Log4jJndiInjectionTest.java:1091:13:1091:15 | map [post update] : HashMap [<map.value>] : String | Log4jJndiInjectionTest.java:1092:34:1092:36 | map | provenance | Sink:MaD:628 |
+| Log4jJndiInjectionTest.java:1091:28:1091:44 | (...)... : String | Log4jJndiInjectionTest.java:1091:13:1091:15 | map [post update] : HashMap [<map.value>] : String | provenance | MaD:631 |
 | Log4jJndiInjectionTest.java:1091:37:1091:44 | source(...) : String | Log4jJndiInjectionTest.java:1091:28:1091:44 | (...)... : String | provenance |  |
-| Log4jJndiInjectionTest.java:1095:31:1095:88 | with(...) : StringMapMessage | Log4jJndiInjectionTest.java:1096:26:1096:29 | mmsg | provenance |  Sink:MaD:87 |
-| Log4jJndiInjectionTest.java:1095:31:1095:88 | with(...) : StringMapMessage | Log4jJndiInjectionTest.java:1096:26:1096:29 | mmsg | provenance |  Sink:MaD:403 |
-| Log4jJndiInjectionTest.java:1095:71:1095:87 | (...)... : String | Log4jJndiInjectionTest.java:1095:31:1095:88 | with(...) : StringMapMessage | provenance | MaD:4+MaD:3 |
+| Log4jJndiInjectionTest.java:1095:31:1095:88 | with(...) : StringMapMessage | Log4jJndiInjectionTest.java:1096:26:1096:29 | mmsg | provenance | Sink:MaD:162 |
+| Log4jJndiInjectionTest.java:1095:31:1095:88 | with(...) : StringMapMessage | Log4jJndiInjectionTest.java:1096:26:1096:29 | mmsg | provenance | Sink:MaD:161 |
+| Log4jJndiInjectionTest.java:1095:71:1095:87 | (...)... : String | Log4jJndiInjectionTest.java:1095:31:1095:88 | with(...) : StringMapMessage | provenance | MaD:634+MaD:635 |
 | Log4jJndiInjectionTest.java:1095:80:1095:87 | source(...) : String | Log4jJndiInjectionTest.java:1095:71:1095:87 | (...)... : String | provenance |  |
-| Log4jJndiInjectionTest.java:1100:13:1100:16 | mmsg [post update] : StringMapMessage | Log4jJndiInjectionTest.java:1101:26:1101:29 | mmsg | provenance |  Sink:MaD:87 |
-| Log4jJndiInjectionTest.java:1100:13:1100:16 | mmsg [post update] : StringMapMessage | Log4jJndiInjectionTest.java:1101:26:1101:29 | mmsg | provenance |  Sink:MaD:403 |
-| Log4jJndiInjectionTest.java:1100:35:1100:51 | (...)... : String | Log4jJndiInjectionTest.java:1100:13:1100:16 | mmsg [post update] : StringMapMessage | provenance | MaD:4 |
+| Log4jJndiInjectionTest.java:1100:13:1100:16 | mmsg [post update] : StringMapMessage | Log4jJndiInjectionTest.java:1101:26:1101:29 | mmsg | provenance | Sink:MaD:162 |
+| Log4jJndiInjectionTest.java:1100:13:1100:16 | mmsg [post update] : StringMapMessage | Log4jJndiInjectionTest.java:1101:26:1101:29 | mmsg | provenance | Sink:MaD:161 |
+| Log4jJndiInjectionTest.java:1100:35:1100:51 | (...)... : String | Log4jJndiInjectionTest.java:1100:13:1100:16 | mmsg [post update] : StringMapMessage | provenance | MaD:634 |
 | Log4jJndiInjectionTest.java:1100:44:1100:51 | source(...) : String | Log4jJndiInjectionTest.java:1100:35:1100:51 | (...)... : String | provenance |  |
-| Log4jJndiInjectionTest.java:1105:13:1105:16 | mmsg [post update] : StringMapMessage | Log4jJndiInjectionTest.java:1106:26:1106:29 | mmsg | provenance |  Sink:MaD:87 |
-| Log4jJndiInjectionTest.java:1105:13:1105:16 | mmsg [post update] : StringMapMessage | Log4jJndiInjectionTest.java:1106:26:1106:29 | mmsg | provenance |  Sink:MaD:403 |
-| Log4jJndiInjectionTest.java:1105:34:1105:50 | (...)... : String | Log4jJndiInjectionTest.java:1105:13:1105:16 | mmsg [post update] : StringMapMessage | provenance | MaD:1 |
+| Log4jJndiInjectionTest.java:1105:13:1105:16 | mmsg [post update] : StringMapMessage | Log4jJndiInjectionTest.java:1106:26:1106:29 | mmsg | provenance | Sink:MaD:162 |
+| Log4jJndiInjectionTest.java:1105:13:1105:16 | mmsg [post update] : StringMapMessage | Log4jJndiInjectionTest.java:1106:26:1106:29 | mmsg | provenance | Sink:MaD:161 |
+| Log4jJndiInjectionTest.java:1105:34:1105:50 | (...)... : String | Log4jJndiInjectionTest.java:1105:13:1105:16 | mmsg [post update] : StringMapMessage | provenance | MaD:632 |
 | Log4jJndiInjectionTest.java:1105:43:1105:50 | source(...) : String | Log4jJndiInjectionTest.java:1105:34:1105:50 | (...)... : String | provenance |  |
 | Log4jJndiInjectionTest.java:1111:13:1111:15 | map [post update] : HashMap [<map.value>] : String | Log4jJndiInjectionTest.java:1112:25:1112:27 | map : HashMap [<map.value>] : String | provenance |  |
-| Log4jJndiInjectionTest.java:1111:33:1111:49 | (...)... : String | Log4jJndiInjectionTest.java:1111:13:1111:15 | map [post update] : HashMap [<map.value>] : String | provenance | MaD:323 |
+| Log4jJndiInjectionTest.java:1111:33:1111:49 | (...)... : String | Log4jJndiInjectionTest.java:1111:13:1111:15 | map [post update] : HashMap [<map.value>] : String | provenance | MaD:631 |
 | Log4jJndiInjectionTest.java:1111:42:1111:49 | source(...) : String | Log4jJndiInjectionTest.java:1111:33:1111:49 | (...)... : String | provenance |  |
-| Log4jJndiInjectionTest.java:1112:13:1112:16 | mmsg [post update] : StringMapMessage | Log4jJndiInjectionTest.java:1113:26:1113:29 | mmsg | provenance |  Sink:MaD:87 |
-| Log4jJndiInjectionTest.java:1112:13:1112:16 | mmsg [post update] : StringMapMessage | Log4jJndiInjectionTest.java:1113:26:1113:29 | mmsg | provenance |  Sink:MaD:403 |
-| Log4jJndiInjectionTest.java:1112:25:1112:27 | map : HashMap [<map.value>] : String | Log4jJndiInjectionTest.java:1112:13:1112:16 | mmsg [post update] : StringMapMessage | provenance | MaD:2 |
-| Log4jJndiInjectionTest.java:1116:61:1116:68 | source(...) : String | Log4jJndiInjectionTest.java:1116:52:1116:68 | (...)... | provenance |  Sink:MaD:5 |
-| Log4jJndiInjectionTest.java:1117:81:1117:88 | source(...) : String | Log4jJndiInjectionTest.java:1117:72:1117:88 | (...)... | provenance |  Sink:MaD:7 |
-| Log4jJndiInjectionTest.java:1119:13:1119:15 | map [post update] : HashMap [<map.value>] : String | Log4jJndiInjectionTest.java:1120:43:1120:45 | map | provenance |  Sink:MaD:6 |
-| Log4jJndiInjectionTest.java:1119:13:1119:15 | map [post update] : HashMap [<map.value>] : String | Log4jJndiInjectionTest.java:1121:63:1121:65 | map | provenance |  Sink:MaD:8 |
-| Log4jJndiInjectionTest.java:1119:33:1119:49 | (...)... : String | Log4jJndiInjectionTest.java:1119:13:1119:15 | map [post update] : HashMap [<map.value>] : String | provenance | MaD:323 |
+| Log4jJndiInjectionTest.java:1112:13:1112:16 | mmsg [post update] : StringMapMessage | Log4jJndiInjectionTest.java:1113:26:1113:29 | mmsg | provenance | Sink:MaD:162 |
+| Log4jJndiInjectionTest.java:1112:13:1112:16 | mmsg [post update] : StringMapMessage | Log4jJndiInjectionTest.java:1113:26:1113:29 | mmsg | provenance | Sink:MaD:161 |
+| Log4jJndiInjectionTest.java:1112:25:1112:27 | map : HashMap [<map.value>] : String | Log4jJndiInjectionTest.java:1112:13:1112:16 | mmsg [post update] : StringMapMessage | provenance | MaD:633 |
+| Log4jJndiInjectionTest.java:1116:61:1116:68 | source(...) : String | Log4jJndiInjectionTest.java:1116:52:1116:68 | (...)... | provenance | Sink:MaD:3 |
+| Log4jJndiInjectionTest.java:1117:81:1117:88 | source(...) : String | Log4jJndiInjectionTest.java:1117:72:1117:88 | (...)... | provenance | Sink:MaD:1 |
+| Log4jJndiInjectionTest.java:1119:13:1119:15 | map [post update] : HashMap [<map.value>] : String | Log4jJndiInjectionTest.java:1120:43:1120:45 | map | provenance | Sink:MaD:4 |
+| Log4jJndiInjectionTest.java:1119:13:1119:15 | map [post update] : HashMap [<map.value>] : String | Log4jJndiInjectionTest.java:1121:63:1121:65 | map | provenance | Sink:MaD:2 |
+| Log4jJndiInjectionTest.java:1119:33:1119:49 | (...)... : String | Log4jJndiInjectionTest.java:1119:13:1119:15 | map [post update] : HashMap [<map.value>] : String | provenance | MaD:631 |
 | Log4jJndiInjectionTest.java:1119:42:1119:49 | source(...) : String | Log4jJndiInjectionTest.java:1119:33:1119:49 | (...)... : String | provenance |  |
 models
-| 1 | Summary: org.apache.logging.log4j.message; MapMessage; true; put; ; ; Argument[1]; Argument[this]; taint; manual |
-| 2 | Summary: org.apache.logging.log4j.message; MapMessage; true; putAll; ; ; Argument[0].MapValue; Argument[this]; taint; manual |
-| 3 | Summary: org.apache.logging.log4j.message; MapMessage; true; with; ; ; Argument[this]; ReturnValue; value; manual |
-| 4 | Summary: org.apache.logging.log4j.message; MapMessage; true; with; ; ; Argument[1]; Argument[this]; taint; manual |
-| 5 | Sink: org.apache.logging.log4j; CloseableThreadContext; false; put; ; ; Argument[1]; log4j; manual |
-| 6 | Sink: org.apache.logging.log4j; CloseableThreadContext; false; putAll; ; ; Argument[0]; log4j; manual |
-| 7 | Sink: org.apache.logging.log4j; CloseableThreadContext$Instance; false; put; ; ; Argument[1]; log4j; manual |
-| 8 | Sink: org.apache.logging.log4j; CloseableThreadContext$Instance; false; putAll; ; ; Argument[0]; log4j; manual |
-| 9 | Sink: org.apache.logging.log4j; LogBuilder; true; log; (CharSequence); ; Argument[0]; log4j; manual |
-| 10 | Sink: org.apache.logging.log4j; LogBuilder; true; log; (Message); ; Argument[0]; log4j; manual |
-| 11 | Sink: org.apache.logging.log4j; LogBuilder; true; log; (Object); ; Argument[0]; log4j; manual |
+| 1 | Sink: org.apache.logging.log4j; CloseableThreadContext$Instance; false; put; ; ; Argument[1]; log4j; manual |
+| 2 | Sink: org.apache.logging.log4j; CloseableThreadContext$Instance; false; putAll; ; ; Argument[0]; log4j; manual |
+| 3 | Sink: org.apache.logging.log4j; CloseableThreadContext; false; put; ; ; Argument[1]; log4j; manual |
+| 4 | Sink: org.apache.logging.log4j; CloseableThreadContext; false; putAll; ; ; Argument[0]; log4j; manual |
+| 5 | Sink: org.apache.logging.log4j; LogBuilder; true; log; (CharSequence); ; Argument[0]; log-injection; manual |
+| 6 | Sink: org.apache.logging.log4j; LogBuilder; true; log; (CharSequence); ; Argument[0]; log4j; manual |
+| 7 | Sink: org.apache.logging.log4j; LogBuilder; true; log; (Message); ; Argument[0]; log-injection; manual |
+| 8 | Sink: org.apache.logging.log4j; LogBuilder; true; log; (Message); ; Argument[0]; log4j; manual |
+| 9 | Sink: org.apache.logging.log4j; LogBuilder; true; log; (Object); ; Argument[0]; log-injection; manual |
+| 10 | Sink: org.apache.logging.log4j; LogBuilder; true; log; (Object); ; Argument[0]; log4j; manual |
+| 11 | Sink: org.apache.logging.log4j; LogBuilder; true; log; (String); ; Argument[0]; log-injection; manual |
 | 12 | Sink: org.apache.logging.log4j; LogBuilder; true; log; (String); ; Argument[0]; log4j; manual |
-| 13 | Sink: org.apache.logging.log4j; LogBuilder; true; log; (String,Object); ; Argument[0..1]; log4j; manual |
-| 14 | Sink: org.apache.logging.log4j; LogBuilder; true; log; (String,Object,Object); ; Argument[0..2]; log4j; manual |
-| 15 | Sink: org.apache.logging.log4j; LogBuilder; true; log; (String,Object,Object,Object); ; Argument[0..3]; log4j; manual |
-| 16 | Sink: org.apache.logging.log4j; LogBuilder; true; log; (String,Object,Object,Object,Object); ; Argument[0..4]; log4j; manual |
-| 17 | Sink: org.apache.logging.log4j; LogBuilder; true; log; (String,Object,Object,Object,Object,Object); ; Argument[0..5]; log4j; manual |
-| 18 | Sink: org.apache.logging.log4j; LogBuilder; true; log; (String,Object,Object,Object,Object,Object,Object); ; Argument[0..6]; log4j; manual |
-| 19 | Sink: org.apache.logging.log4j; LogBuilder; true; log; (String,Object,Object,Object,Object,Object,Object,Object); ; Argument[0..7]; log4j; manual |
-| 20 | Sink: org.apache.logging.log4j; LogBuilder; true; log; (String,Object,Object,Object,Object,Object,Object,Object,Object); ; Argument[0..8]; log4j; manual |
-| 21 | Sink: org.apache.logging.log4j; LogBuilder; true; log; (String,Object,Object,Object,Object,Object,Object,Object,Object,Object); ; Argument[0..9]; log4j; manual |
-| 22 | Sink: org.apache.logging.log4j; LogBuilder; true; log; (String,Object[]); ; Argument[0..1]; log4j; manual |
-| 23 | Sink: org.apache.logging.log4j; Logger; true; debug; (CharSequence); ; Argument[0]; log4j; manual |
-| 24 | Sink: org.apache.logging.log4j; Logger; true; debug; (CharSequence,Throwable); ; Argument[0]; log4j; manual |
-| 25 | Sink: org.apache.logging.log4j; Logger; true; debug; (Marker,CharSequence); ; Argument[1]; log4j; manual |
-| 26 | Sink: org.apache.logging.log4j; Logger; true; debug; (Marker,CharSequence,Throwable); ; Argument[1]; log4j; manual |
-| 27 | Sink: org.apache.logging.log4j; Logger; true; debug; (Marker,Message); ; Argument[1]; log4j; manual |
-| 28 | Sink: org.apache.logging.log4j; Logger; true; debug; (Marker,MessageSupplier); ; Argument[1]; log4j; manual |
-| 29 | Sink: org.apache.logging.log4j; Logger; true; debug; (Marker,MessageSupplier,Throwable); ; Argument[1]; log4j; manual |
-| 30 | Sink: org.apache.logging.log4j; Logger; true; debug; (Marker,Object); ; Argument[1]; log4j; manual |
-| 31 | Sink: org.apache.logging.log4j; Logger; true; debug; (Marker,String); ; Argument[1]; log4j; manual |
-| 32 | Sink: org.apache.logging.log4j; Logger; true; debug; (Marker,String,Object); ; Argument[1..2]; log4j; manual |
-| 33 | Sink: org.apache.logging.log4j; Logger; true; debug; (Marker,String,Object,Object); ; Argument[1..3]; log4j; manual |
-| 34 | Sink: org.apache.logging.log4j; Logger; true; debug; (Marker,String,Object,Object,Object); ; Argument[1..4]; log4j; manual |
-| 35 | Sink: org.apache.logging.log4j; Logger; true; debug; (Marker,String,Object,Object,Object,Object); ; Argument[1..5]; log4j; manual |
-| 36 | Sink: org.apache.logging.log4j; Logger; true; debug; (Marker,String,Object,Object,Object,Object,Object); ; Argument[1..6]; log4j; manual |
-| 37 | Sink: org.apache.logging.log4j; Logger; true; debug; (Marker,String,Object,Object,Object,Object,Object,Object); ; Argument[1..7]; log4j; manual |
-| 38 | Sink: org.apache.logging.log4j; Logger; true; debug; (Marker,String,Object,Object,Object,Object,Object,Object,Object); ; Argument[1..8]; log4j; manual |
-| 39 | Sink: org.apache.logging.log4j; Logger; true; debug; (Marker,String,Object,Object,Object,Object,Object,Object,Object,Object); ; Argument[1..9]; log4j; manual |
-| 40 | Sink: org.apache.logging.log4j; Logger; true; debug; (Marker,String,Object,Object,Object,Object,Object,Object,Object,Object,Object); ; Argument[1..10]; log4j; manual |
-| 41 | Sink: org.apache.logging.log4j; Logger; true; debug; (Marker,String,Object[]); ; Argument[1..2]; log4j; manual |
-| 42 | Sink: org.apache.logging.log4j; Logger; true; debug; (Marker,String,Throwable); ; Argument[1]; log4j; manual |
-| 43 | Sink: org.apache.logging.log4j; Logger; true; debug; (Marker,Supplier); ; Argument[1]; log4j; manual |
-| 44 | Sink: org.apache.logging.log4j; Logger; true; debug; (Marker,Supplier,Throwable); ; Argument[1]; log4j; manual |
-| 45 | Sink: org.apache.logging.log4j; Logger; true; debug; (Message); ; Argument[0]; log4j; manual |
-| 46 | Sink: org.apache.logging.log4j; Logger; true; debug; (Message,Throwable); ; Argument[0]; log4j; manual |
-| 47 | Sink: org.apache.logging.log4j; Logger; true; debug; (MessageSupplier); ; Argument[0]; log4j; manual |
-| 48 | Sink: org.apache.logging.log4j; Logger; true; debug; (MessageSupplier,Throwable); ; Argument[0]; log4j; manual |
-| 49 | Sink: org.apache.logging.log4j; Logger; true; debug; (Object); ; Argument[0]; log4j; manual |
-| 50 | Sink: org.apache.logging.log4j; Logger; true; debug; (Object,Throwable); ; Argument[0]; log4j; manual |
-| 51 | Sink: org.apache.logging.log4j; Logger; true; debug; (String); ; Argument[0]; log4j; manual |
-| 52 | Sink: org.apache.logging.log4j; Logger; true; debug; (String,Object); ; Argument[0..1]; log4j; manual |
-| 53 | Sink: org.apache.logging.log4j; Logger; true; debug; (String,Object,Object); ; Argument[0..2]; log4j; manual |
-| 54 | Sink: org.apache.logging.log4j; Logger; true; debug; (String,Object,Object,Object); ; Argument[0..3]; log4j; manual |
-| 55 | Sink: org.apache.logging.log4j; Logger; true; debug; (String,Object,Object,Object,Object); ; Argument[0..4]; log4j; manual |
-| 56 | Sink: org.apache.logging.log4j; Logger; true; debug; (String,Object,Object,Object,Object,Object); ; Argument[0..5]; log4j; manual |
-| 57 | Sink: org.apache.logging.log4j; Logger; true; debug; (String,Object,Object,Object,Object,Object,Object); ; Argument[0..6]; log4j; manual |
-| 58 | Sink: org.apache.logging.log4j; Logger; true; debug; (String,Object,Object,Object,Object,Object,Object,Object); ; Argument[0..7]; log4j; manual |
-| 59 | Sink: org.apache.logging.log4j; Logger; true; debug; (String,Object,Object,Object,Object,Object,Object,Object,Object); ; Argument[0..8]; log4j; manual |
-| 60 | Sink: org.apache.logging.log4j; Logger; true; debug; (String,Object,Object,Object,Object,Object,Object,Object,Object,Object); ; Argument[0..9]; log4j; manual |
-| 61 | Sink: org.apache.logging.log4j; Logger; true; debug; (String,Object[]); ; Argument[0..1]; log4j; manual |
-| 62 | Sink: org.apache.logging.log4j; Logger; true; debug; (String,Throwable); ; Argument[0]; log4j; manual |
-| 63 | Sink: org.apache.logging.log4j; Logger; true; debug; (Supplier); ; Argument[0]; log4j; manual |
-| 64 | Sink: org.apache.logging.log4j; Logger; true; debug; (Supplier,Throwable); ; Argument[0]; log4j; manual |
-| 65 | Sink: org.apache.logging.log4j; Logger; true; error; (CharSequence); ; Argument[0]; log4j; manual |
-| 66 | Sink: org.apache.logging.log4j; Logger; true; error; (CharSequence,Throwable); ; Argument[0]; log4j; manual |
-| 67 | Sink: org.apache.logging.log4j; Logger; true; error; (Marker,CharSequence); ; Argument[1]; log4j; manual |
-| 68 | Sink: org.apache.logging.log4j; Logger; true; error; (Marker,CharSequence,Throwable); ; Argument[1]; log4j; manual |
-| 69 | Sink: org.apache.logging.log4j; Logger; true; error; (Marker,Message); ; Argument[1]; log4j; manual |
-| 70 | Sink: org.apache.logging.log4j; Logger; true; error; (Marker,MessageSupplier); ; Argument[1]; log4j; manual |
-| 71 | Sink: org.apache.logging.log4j; Logger; true; error; (Marker,MessageSupplier,Throwable); ; Argument[1]; log4j; manual |
-| 72 | Sink: org.apache.logging.log4j; Logger; true; error; (Marker,Object); ; Argument[1]; log4j; manual |
-| 73 | Sink: org.apache.logging.log4j; Logger; true; error; (Marker,String); ; Argument[1]; log4j; manual |
-| 74 | Sink: org.apache.logging.log4j; Logger; true; error; (Marker,String,Object); ; Argument[1..2]; log4j; manual |
-| 75 | Sink: org.apache.logging.log4j; Logger; true; error; (Marker,String,Object,Object); ; Argument[1..3]; log4j; manual |
-| 76 | Sink: org.apache.logging.log4j; Logger; true; error; (Marker,String,Object,Object,Object); ; Argument[1..4]; log4j; manual |
-| 77 | Sink: org.apache.logging.log4j; Logger; true; error; (Marker,String,Object,Object,Object,Object); ; Argument[1..5]; log4j; manual |
-| 78 | Sink: org.apache.logging.log4j; Logger; true; error; (Marker,String,Object,Object,Object,Object,Object); ; Argument[1..6]; log4j; manual |
-| 79 | Sink: org.apache.logging.log4j; Logger; true; error; (Marker,String,Object,Object,Object,Object,Object,Object); ; Argument[1..7]; log4j; manual |
-| 80 | Sink: org.apache.logging.log4j; Logger; true; error; (Marker,String,Object,Object,Object,Object,Object,Object,Object); ; Argument[1..8]; log4j; manual |
-| 81 | Sink: org.apache.logging.log4j; Logger; true; error; (Marker,String,Object,Object,Object,Object,Object,Object,Object,Object); ; Argument[1..9]; log4j; manual |
-| 82 | Sink: org.apache.logging.log4j; Logger; true; error; (Marker,String,Object,Object,Object,Object,Object,Object,Object,Object,Object); ; Argument[1..10]; log4j; manual |
-| 83 | Sink: org.apache.logging.log4j; Logger; true; error; (Marker,String,Object[]); ; Argument[1..2]; log4j; manual |
-| 84 | Sink: org.apache.logging.log4j; Logger; true; error; (Marker,String,Throwable); ; Argument[1]; log4j; manual |
-| 85 | Sink: org.apache.logging.log4j; Logger; true; error; (Marker,Supplier); ; Argument[1]; log4j; manual |
-| 86 | Sink: org.apache.logging.log4j; Logger; true; error; (Marker,Supplier,Throwable); ; Argument[1]; log4j; manual |
-| 87 | Sink: org.apache.logging.log4j; Logger; true; error; (Message); ; Argument[0]; log4j; manual |
-| 88 | Sink: org.apache.logging.log4j; Logger; true; error; (Message,Throwable); ; Argument[0]; log4j; manual |
-| 89 | Sink: org.apache.logging.log4j; Logger; true; error; (MessageSupplier); ; Argument[0]; log4j; manual |
-| 90 | Sink: org.apache.logging.log4j; Logger; true; error; (MessageSupplier,Throwable); ; Argument[0]; log4j; manual |
-| 91 | Sink: org.apache.logging.log4j; Logger; true; error; (Object); ; Argument[0]; log4j; manual |
-| 92 | Sink: org.apache.logging.log4j; Logger; true; error; (Object,Throwable); ; Argument[0]; log4j; manual |
-| 93 | Sink: org.apache.logging.log4j; Logger; true; error; (String); ; Argument[0]; log4j; manual |
-| 94 | Sink: org.apache.logging.log4j; Logger; true; error; (String,Object); ; Argument[0..1]; log4j; manual |
-| 95 | Sink: org.apache.logging.log4j; Logger; true; error; (String,Object,Object); ; Argument[0..2]; log4j; manual |
-| 96 | Sink: org.apache.logging.log4j; Logger; true; error; (String,Object,Object,Object); ; Argument[0..3]; log4j; manual |
-| 97 | Sink: org.apache.logging.log4j; Logger; true; error; (String,Object,Object,Object,Object); ; Argument[0..4]; log4j; manual |
-| 98 | Sink: org.apache.logging.log4j; Logger; true; error; (String,Object,Object,Object,Object,Object); ; Argument[0..5]; log4j; manual |
-| 99 | Sink: org.apache.logging.log4j; Logger; true; error; (String,Object,Object,Object,Object,Object,Object); ; Argument[0..6]; log4j; manual |
-| 100 | Sink: org.apache.logging.log4j; Logger; true; error; (String,Object,Object,Object,Object,Object,Object,Object); ; Argument[0..7]; log4j; manual |
-| 101 | Sink: org.apache.logging.log4j; Logger; true; error; (String,Object,Object,Object,Object,Object,Object,Object,Object); ; Argument[0..8]; log4j; manual |
-| 102 | Sink: org.apache.logging.log4j; Logger; true; error; (String,Object,Object,Object,Object,Object,Object,Object,Object,Object); ; Argument[0..9]; log4j; manual |
-| 103 | Sink: org.apache.logging.log4j; Logger; true; error; (String,Object[]); ; Argument[0..1]; log4j; manual |
-| 104 | Sink: org.apache.logging.log4j; Logger; true; error; (String,Throwable); ; Argument[0]; log4j; manual |
-| 105 | Sink: org.apache.logging.log4j; Logger; true; error; (Supplier); ; Argument[0]; log4j; manual |
-| 106 | Sink: org.apache.logging.log4j; Logger; true; error; (Supplier,Throwable); ; Argument[0]; log4j; manual |
-| 107 | Sink: org.apache.logging.log4j; Logger; true; fatal; (CharSequence); ; Argument[0]; log4j; manual |
-| 108 | Sink: org.apache.logging.log4j; Logger; true; fatal; (CharSequence,Throwable); ; Argument[0]; log4j; manual |
-| 109 | Sink: org.apache.logging.log4j; Logger; true; fatal; (Marker,CharSequence); ; Argument[1]; log4j; manual |
-| 110 | Sink: org.apache.logging.log4j; Logger; true; fatal; (Marker,CharSequence,Throwable); ; Argument[1]; log4j; manual |
-| 111 | Sink: org.apache.logging.log4j; Logger; true; fatal; (Marker,Message); ; Argument[1]; log4j; manual |
-| 112 | Sink: org.apache.logging.log4j; Logger; true; fatal; (Marker,MessageSupplier); ; Argument[1]; log4j; manual |
-| 113 | Sink: org.apache.logging.log4j; Logger; true; fatal; (Marker,MessageSupplier,Throwable); ; Argument[1]; log4j; manual |
-| 114 | Sink: org.apache.logging.log4j; Logger; true; fatal; (Marker,Object); ; Argument[1]; log4j; manual |
-| 115 | Sink: org.apache.logging.log4j; Logger; true; fatal; (Marker,String); ; Argument[1]; log4j; manual |
-| 116 | Sink: org.apache.logging.log4j; Logger; true; fatal; (Marker,String,Object); ; Argument[1..2]; log4j; manual |
-| 117 | Sink: org.apache.logging.log4j; Logger; true; fatal; (Marker,String,Object,Object); ; Argument[1..3]; log4j; manual |
-| 118 | Sink: org.apache.logging.log4j; Logger; true; fatal; (Marker,String,Object,Object,Object); ; Argument[1..4]; log4j; manual |
-| 119 | Sink: org.apache.logging.log4j; Logger; true; fatal; (Marker,String,Object,Object,Object,Object); ; Argument[1..5]; log4j; manual |
-| 120 | Sink: org.apache.logging.log4j; Logger; true; fatal; (Marker,String,Object,Object,Object,Object,Object); ; Argument[1..6]; log4j; manual |
-| 121 | Sink: org.apache.logging.log4j; Logger; true; fatal; (Marker,String,Object,Object,Object,Object,Object,Object); ; Argument[1..7]; log4j; manual |
-| 122 | Sink: org.apache.logging.log4j; Logger; true; fatal; (Marker,String,Object,Object,Object,Object,Object,Object,Object); ; Argument[1..8]; log4j; manual |
-| 123 | Sink: org.apache.logging.log4j; Logger; true; fatal; (Marker,String,Object,Object,Object,Object,Object,Object,Object,Object); ; Argument[1..9]; log4j; manual |
-| 124 | Sink: org.apache.logging.log4j; Logger; true; fatal; (Marker,String,Object,Object,Object,Object,Object,Object,Object,Object,Object); ; Argument[1..10]; log4j; manual |
-| 125 | Sink: org.apache.logging.log4j; Logger; true; fatal; (Marker,String,Object[]); ; Argument[1..2]; log4j; manual |
-| 126 | Sink: org.apache.logging.log4j; Logger; true; fatal; (Marker,String,Throwable); ; Argument[1]; log4j; manual |
-| 127 | Sink: org.apache.logging.log4j; Logger; true; fatal; (Marker,Supplier); ; Argument[1]; log4j; manual |
-| 128 | Sink: org.apache.logging.log4j; Logger; true; fatal; (Marker,Supplier,Throwable); ; Argument[1]; log4j; manual |
-| 129 | Sink: org.apache.logging.log4j; Logger; true; fatal; (Message); ; Argument[0]; log4j; manual |
-| 130 | Sink: org.apache.logging.log4j; Logger; true; fatal; (Message,Throwable); ; Argument[0]; log4j; manual |
-| 131 | Sink: org.apache.logging.log4j; Logger; true; fatal; (MessageSupplier); ; Argument[0]; log4j; manual |
-| 132 | Sink: org.apache.logging.log4j; Logger; true; fatal; (MessageSupplier,Throwable); ; Argument[0]; log4j; manual |
-| 133 | Sink: org.apache.logging.log4j; Logger; true; fatal; (Object); ; Argument[0]; log4j; manual |
-| 134 | Sink: org.apache.logging.log4j; Logger; true; fatal; (Object,Throwable); ; Argument[0]; log4j; manual |
-| 135 | Sink: org.apache.logging.log4j; Logger; true; fatal; (String); ; Argument[0]; log4j; manual |
-| 136 | Sink: org.apache.logging.log4j; Logger; true; fatal; (String,Object); ; Argument[0..1]; log4j; manual |
-| 137 | Sink: org.apache.logging.log4j; Logger; true; fatal; (String,Object,Object); ; Argument[0..2]; log4j; manual |
-| 138 | Sink: org.apache.logging.log4j; Logger; true; fatal; (String,Object,Object,Object); ; Argument[0..3]; log4j; manual |
-| 139 | Sink: org.apache.logging.log4j; Logger; true; fatal; (String,Object,Object,Object,Object); ; Argument[0..4]; log4j; manual |
-| 140 | Sink: org.apache.logging.log4j; Logger; true; fatal; (String,Object,Object,Object,Object,Object); ; Argument[0..5]; log4j; manual |
-| 141 | Sink: org.apache.logging.log4j; Logger; true; fatal; (String,Object,Object,Object,Object,Object,Object); ; Argument[0..6]; log4j; manual |
-| 142 | Sink: org.apache.logging.log4j; Logger; true; fatal; (String,Object,Object,Object,Object,Object,Object,Object); ; Argument[0..7]; log4j; manual |
-| 143 | Sink: org.apache.logging.log4j; Logger; true; fatal; (String,Object,Object,Object,Object,Object,Object,Object,Object); ; Argument[0..8]; log4j; manual |
-| 144 | Sink: org.apache.logging.log4j; Logger; true; fatal; (String,Object,Object,Object,Object,Object,Object,Object,Object,Object); ; Argument[0..9]; log4j; manual |
-| 145 | Sink: org.apache.logging.log4j; Logger; true; fatal; (String,Object[]); ; Argument[0..1]; log4j; manual |
-| 146 | Sink: org.apache.logging.log4j; Logger; true; fatal; (String,Throwable); ; Argument[0]; log4j; manual |
-| 147 | Sink: org.apache.logging.log4j; Logger; true; fatal; (Supplier); ; Argument[0]; log4j; manual |
-| 148 | Sink: org.apache.logging.log4j; Logger; true; fatal; (Supplier,Throwable); ; Argument[0]; log4j; manual |
-| 149 | Sink: org.apache.logging.log4j; Logger; true; info; (CharSequence); ; Argument[0]; log4j; manual |
-| 150 | Sink: org.apache.logging.log4j; Logger; true; info; (CharSequence,Throwable); ; Argument[0]; log4j; manual |
-| 151 | Sink: org.apache.logging.log4j; Logger; true; info; (Marker,CharSequence); ; Argument[1]; log4j; manual |
-| 152 | Sink: org.apache.logging.log4j; Logger; true; info; (Marker,CharSequence,Throwable); ; Argument[1]; log4j; manual |
-| 153 | Sink: org.apache.logging.log4j; Logger; true; info; (Marker,Message); ; Argument[1]; log4j; manual |
-| 154 | Sink: org.apache.logging.log4j; Logger; true; info; (Marker,MessageSupplier); ; Argument[1]; log4j; manual |
-| 155 | Sink: org.apache.logging.log4j; Logger; true; info; (Marker,MessageSupplier,Throwable); ; Argument[1]; log4j; manual |
-| 156 | Sink: org.apache.logging.log4j; Logger; true; info; (Marker,Object); ; Argument[1]; log4j; manual |
-| 157 | Sink: org.apache.logging.log4j; Logger; true; info; (Marker,String); ; Argument[1]; log4j; manual |
-| 158 | Sink: org.apache.logging.log4j; Logger; true; info; (Marker,String,Object); ; Argument[1..2]; log4j; manual |
-| 159 | Sink: org.apache.logging.log4j; Logger; true; info; (Marker,String,Object,Object); ; Argument[1..3]; log4j; manual |
-| 160 | Sink: org.apache.logging.log4j; Logger; true; info; (Marker,String,Object,Object,Object); ; Argument[1..4]; log4j; manual |
-| 161 | Sink: org.apache.logging.log4j; Logger; true; info; (Marker,String,Object,Object,Object,Object); ; Argument[1..5]; log4j; manual |
-| 162 | Sink: org.apache.logging.log4j; Logger; true; info; (Marker,String,Object,Object,Object,Object,Object); ; Argument[1..6]; log4j; manual |
-| 163 | Sink: org.apache.logging.log4j; Logger; true; info; (Marker,String,Object,Object,Object,Object,Object,Object); ; Argument[1..7]; log4j; manual |
-| 164 | Sink: org.apache.logging.log4j; Logger; true; info; (Marker,String,Object,Object,Object,Object,Object,Object,Object); ; Argument[1..8]; log4j; manual |
-| 165 | Sink: org.apache.logging.log4j; Logger; true; info; (Marker,String,Object,Object,Object,Object,Object,Object,Object,Object); ; Argument[1..9]; log4j; manual |
-| 166 | Sink: org.apache.logging.log4j; Logger; true; info; (Marker,String,Object,Object,Object,Object,Object,Object,Object,Object,Object); ; Argument[1..10]; log4j; manual |
-| 167 | Sink: org.apache.logging.log4j; Logger; true; info; (Marker,String,Object[]); ; Argument[1..2]; log4j; manual |
-| 168 | Sink: org.apache.logging.log4j; Logger; true; info; (Marker,String,Throwable); ; Argument[1]; log4j; manual |
-| 169 | Sink: org.apache.logging.log4j; Logger; true; info; (Marker,Supplier); ; Argument[1]; log4j; manual |
-| 170 | Sink: org.apache.logging.log4j; Logger; true; info; (Marker,Supplier,Throwable); ; Argument[1]; log4j; manual |
-| 171 | Sink: org.apache.logging.log4j; Logger; true; info; (Message); ; Argument[0]; log4j; manual |
-| 172 | Sink: org.apache.logging.log4j; Logger; true; info; (Message,Throwable); ; Argument[0]; log4j; manual |
-| 173 | Sink: org.apache.logging.log4j; Logger; true; info; (MessageSupplier); ; Argument[0]; log4j; manual |
-| 174 | Sink: org.apache.logging.log4j; Logger; true; info; (MessageSupplier,Throwable); ; Argument[0]; log4j; manual |
-| 175 | Sink: org.apache.logging.log4j; Logger; true; info; (Object); ; Argument[0]; log4j; manual |
-| 176 | Sink: org.apache.logging.log4j; Logger; true; info; (Object,Throwable); ; Argument[0]; log4j; manual |
-| 177 | Sink: org.apache.logging.log4j; Logger; true; info; (String); ; Argument[0]; log4j; manual |
-| 178 | Sink: org.apache.logging.log4j; Logger; true; info; (String,Object); ; Argument[0..1]; log4j; manual |
-| 179 | Sink: org.apache.logging.log4j; Logger; true; info; (String,Object,Object); ; Argument[0..2]; log4j; manual |
-| 180 | Sink: org.apache.logging.log4j; Logger; true; info; (String,Object,Object,Object); ; Argument[0..3]; log4j; manual |
-| 181 | Sink: org.apache.logging.log4j; Logger; true; info; (String,Object,Object,Object,Object); ; Argument[0..4]; log4j; manual |
-| 182 | Sink: org.apache.logging.log4j; Logger; true; info; (String,Object,Object,Object,Object,Object); ; Argument[0..5]; log4j; manual |
-| 183 | Sink: org.apache.logging.log4j; Logger; true; info; (String,Object,Object,Object,Object,Object,Object); ; Argument[0..6]; log4j; manual |
-| 184 | Sink: org.apache.logging.log4j; Logger; true; info; (String,Object,Object,Object,Object,Object,Object,Object); ; Argument[0..7]; log4j; manual |
-| 185 | Sink: org.apache.logging.log4j; Logger; true; info; (String,Object,Object,Object,Object,Object,Object,Object,Object); ; Argument[0..8]; log4j; manual |
-| 186 | Sink: org.apache.logging.log4j; Logger; true; info; (String,Object,Object,Object,Object,Object,Object,Object,Object,Object); ; Argument[0..9]; log4j; manual |
-| 187 | Sink: org.apache.logging.log4j; Logger; true; info; (String,Object[]); ; Argument[0..1]; log4j; manual |
-| 188 | Sink: org.apache.logging.log4j; Logger; true; info; (String,Throwable); ; Argument[0]; log4j; manual |
-| 189 | Sink: org.apache.logging.log4j; Logger; true; info; (Supplier); ; Argument[0]; log4j; manual |
-| 190 | Sink: org.apache.logging.log4j; Logger; true; info; (Supplier,Throwable); ; Argument[0]; log4j; manual |
-| 191 | Sink: org.apache.logging.log4j; Logger; true; log; (Level,CharSequence); ; Argument[1]; log4j; manual |
-| 192 | Sink: org.apache.logging.log4j; Logger; true; log; (Level,CharSequence,Throwable); ; Argument[1]; log4j; manual |
-| 193 | Sink: org.apache.logging.log4j; Logger; true; log; (Level,Marker,CharSequence); ; Argument[2]; log4j; manual |
-| 194 | Sink: org.apache.logging.log4j; Logger; true; log; (Level,Marker,CharSequence,Throwable); ; Argument[2]; log4j; manual |
-| 195 | Sink: org.apache.logging.log4j; Logger; true; log; (Level,Marker,Message); ; Argument[2]; log4j; manual |
-| 196 | Sink: org.apache.logging.log4j; Logger; true; log; (Level,Marker,MessageSupplier); ; Argument[2]; log4j; manual |
-| 197 | Sink: org.apache.logging.log4j; Logger; true; log; (Level,Marker,MessageSupplier,Throwable); ; Argument[2]; log4j; manual |
-| 198 | Sink: org.apache.logging.log4j; Logger; true; log; (Level,Marker,Object); ; Argument[2]; log4j; manual |
-| 199 | Sink: org.apache.logging.log4j; Logger; true; log; (Level,Marker,String); ; Argument[2]; log4j; manual |
-| 200 | Sink: org.apache.logging.log4j; Logger; true; log; (Level,Marker,String,Object); ; Argument[2..3]; log4j; manual |
-| 201 | Sink: org.apache.logging.log4j; Logger; true; log; (Level,Marker,String,Object,Object); ; Argument[2..4]; log4j; manual |
-| 202 | Sink: org.apache.logging.log4j; Logger; true; log; (Level,Marker,String,Object,Object,Object); ; Argument[2..5]; log4j; manual |
-| 203 | Sink: org.apache.logging.log4j; Logger; true; log; (Level,Marker,String,Object,Object,Object,Object); ; Argument[2..6]; log4j; manual |
-| 204 | Sink: org.apache.logging.log4j; Logger; true; log; (Level,Marker,String,Object,Object,Object,Object,Object); ; Argument[2..7]; log4j; manual |
-| 205 | Sink: org.apache.logging.log4j; Logger; true; log; (Level,Marker,String,Object,Object,Object,Object,Object,Object); ; Argument[2..8]; log4j; manual |
-| 206 | Sink: org.apache.logging.log4j; Logger; true; log; (Level,Marker,String,Object,Object,Object,Object,Object,Object,Object); ; Argument[2..9]; log4j; manual |
-| 207 | Sink: org.apache.logging.log4j; Logger; true; log; (Level,Marker,String,Object,Object,Object,Object,Object,Object,Object,Object); ; Argument[2..10]; log4j; manual |
-| 208 | Sink: org.apache.logging.log4j; Logger; true; log; (Level,Marker,String,Object,Object,Object,Object,Object,Object,Object,Object,Object); ; Argument[2..11]; log4j; manual |
-| 209 | Sink: org.apache.logging.log4j; Logger; true; log; (Level,Marker,String,Object[]); ; Argument[2..3]; log4j; manual |
-| 210 | Sink: org.apache.logging.log4j; Logger; true; log; (Level,Marker,String,Throwable); ; Argument[2]; log4j; manual |
-| 211 | Sink: org.apache.logging.log4j; Logger; true; log; (Level,Marker,Supplier); ; Argument[2]; log4j; manual |
-| 212 | Sink: org.apache.logging.log4j; Logger; true; log; (Level,Marker,Supplier,Throwable); ; Argument[2]; log4j; manual |
-| 213 | Sink: org.apache.logging.log4j; Logger; true; log; (Level,Message); ; Argument[1]; log4j; manual |
-| 214 | Sink: org.apache.logging.log4j; Logger; true; log; (Level,Message,Throwable); ; Argument[1]; log4j; manual |
-| 215 | Sink: org.apache.logging.log4j; Logger; true; log; (Level,MessageSupplier); ; Argument[1]; log4j; manual |
-| 216 | Sink: org.apache.logging.log4j; Logger; true; log; (Level,MessageSupplier,Throwable); ; Argument[1]; log4j; manual |
-| 217 | Sink: org.apache.logging.log4j; Logger; true; log; (Level,Object); ; Argument[1]; log4j; manual |
-| 218 | Sink: org.apache.logging.log4j; Logger; true; log; (Level,Object,Throwable); ; Argument[1]; log4j; manual |
-| 219 | Sink: org.apache.logging.log4j; Logger; true; log; (Level,String); ; Argument[1]; log4j; manual |
-| 220 | Sink: org.apache.logging.log4j; Logger; true; log; (Level,String,Object); ; Argument[1..2]; log4j; manual |
-| 221 | Sink: org.apache.logging.log4j; Logger; true; log; (Level,String,Object,Object); ; Argument[1..3]; log4j; manual |
-| 222 | Sink: org.apache.logging.log4j; Logger; true; log; (Level,String,Object,Object,Object); ; Argument[1..4]; log4j; manual |
-| 223 | Sink: org.apache.logging.log4j; Logger; true; log; (Level,String,Object,Object,Object,Object); ; Argument[1..5]; log4j; manual |
-| 224 | Sink: org.apache.logging.log4j; Logger; true; log; (Level,String,Object,Object,Object,Object,Object); ; Argument[1..6]; log4j; manual |
-| 225 | Sink: org.apache.logging.log4j; Logger; true; log; (Level,String,Object,Object,Object,Object,Object,Object); ; Argument[1..7]; log4j; manual |
-| 226 | Sink: org.apache.logging.log4j; Logger; true; log; (Level,String,Object,Object,Object,Object,Object,Object,Object); ; Argument[1..8]; log4j; manual |
-| 227 | Sink: org.apache.logging.log4j; Logger; true; log; (Level,String,Object,Object,Object,Object,Object,Object,Object,Object); ; Argument[1..9]; log4j; manual |
-| 228 | Sink: org.apache.logging.log4j; Logger; true; log; (Level,String,Object,Object,Object,Object,Object,Object,Object,Object,Object); ; Argument[1..10]; log4j; manual |
-| 229 | Sink: org.apache.logging.log4j; Logger; true; log; (Level,String,Object[]); ; Argument[1..2]; log4j; manual |
-| 230 | Sink: org.apache.logging.log4j; Logger; true; log; (Level,String,Throwable); ; Argument[1]; log4j; manual |
-| 231 | Sink: org.apache.logging.log4j; Logger; true; log; (Level,Supplier); ; Argument[1]; log4j; manual |
-| 232 | Sink: org.apache.logging.log4j; Logger; true; log; (Level,Supplier,Throwable); ; Argument[1]; log4j; manual |
-| 233 | Sink: org.apache.logging.log4j; Logger; true; logMessage; (Level,Marker,String,StackTraceElement,Message,Throwable); ; Argument[4]; log4j; manual |
-| 234 | Sink: org.apache.logging.log4j; Logger; true; printf; (Level,Marker,String,Object[]); ; Argument[2..3]; log4j; manual |
-| 235 | Sink: org.apache.logging.log4j; Logger; true; printf; (Level,String,Object[]); ; Argument[1..2]; log4j; manual |
-| 236 | Sink: org.apache.logging.log4j; Logger; true; trace; (CharSequence); ; Argument[0]; log4j; manual |
-| 237 | Sink: org.apache.logging.log4j; Logger; true; trace; (CharSequence,Throwable); ; Argument[0]; log4j; manual |
-| 238 | Sink: org.apache.logging.log4j; Logger; true; trace; (Marker,CharSequence); ; Argument[1]; log4j; manual |
-| 239 | Sink: org.apache.logging.log4j; Logger; true; trace; (Marker,CharSequence,Throwable); ; Argument[1]; log4j; manual |
-| 240 | Sink: org.apache.logging.log4j; Logger; true; trace; (Marker,Message); ; Argument[1]; log4j; manual |
-| 241 | Sink: org.apache.logging.log4j; Logger; true; trace; (Marker,MessageSupplier); ; Argument[1]; log4j; manual |
-| 242 | Sink: org.apache.logging.log4j; Logger; true; trace; (Marker,MessageSupplier,Throwable); ; Argument[1]; log4j; manual |
-| 243 | Sink: org.apache.logging.log4j; Logger; true; trace; (Marker,Object); ; Argument[1]; log4j; manual |
-| 244 | Sink: org.apache.logging.log4j; Logger; true; trace; (Marker,String); ; Argument[1]; log4j; manual |
-| 245 | Sink: org.apache.logging.log4j; Logger; true; trace; (Marker,String,Object); ; Argument[1..2]; log4j; manual |
-| 246 | Sink: org.apache.logging.log4j; Logger; true; trace; (Marker,String,Object,Object); ; Argument[1..3]; log4j; manual |
-| 247 | Sink: org.apache.logging.log4j; Logger; true; trace; (Marker,String,Object,Object,Object); ; Argument[1..4]; log4j; manual |
-| 248 | Sink: org.apache.logging.log4j; Logger; true; trace; (Marker,String,Object,Object,Object,Object); ; Argument[1..5]; log4j; manual |
-| 249 | Sink: org.apache.logging.log4j; Logger; true; trace; (Marker,String,Object,Object,Object,Object,Object); ; Argument[1..6]; log4j; manual |
-| 250 | Sink: org.apache.logging.log4j; Logger; true; trace; (Marker,String,Object,Object,Object,Object,Object,Object); ; Argument[1..7]; log4j; manual |
-| 251 | Sink: org.apache.logging.log4j; Logger; true; trace; (Marker,String,Object,Object,Object,Object,Object,Object,Object); ; Argument[1..8]; log4j; manual |
-| 252 | Sink: org.apache.logging.log4j; Logger; true; trace; (Marker,String,Object,Object,Object,Object,Object,Object,Object,Object); ; Argument[1..9]; log4j; manual |
-| 253 | Sink: org.apache.logging.log4j; Logger; true; trace; (Marker,String,Object,Object,Object,Object,Object,Object,Object,Object,Object); ; Argument[1..10]; log4j; manual |
-| 254 | Sink: org.apache.logging.log4j; Logger; true; trace; (Marker,String,Object[]); ; Argument[1..2]; log4j; manual |
-| 255 | Sink: org.apache.logging.log4j; Logger; true; trace; (Marker,String,Throwable); ; Argument[1]; log4j; manual |
-| 256 | Sink: org.apache.logging.log4j; Logger; true; trace; (Marker,Supplier); ; Argument[1]; log4j; manual |
-| 257 | Sink: org.apache.logging.log4j; Logger; true; trace; (Marker,Supplier,Throwable); ; Argument[1]; log4j; manual |
-| 258 | Sink: org.apache.logging.log4j; Logger; true; trace; (Message); ; Argument[0]; log4j; manual |
-| 259 | Sink: org.apache.logging.log4j; Logger; true; trace; (Message,Throwable); ; Argument[0]; log4j; manual |
-| 260 | Sink: org.apache.logging.log4j; Logger; true; trace; (MessageSupplier); ; Argument[0]; log4j; manual |
-| 261 | Sink: org.apache.logging.log4j; Logger; true; trace; (MessageSupplier,Throwable); ; Argument[0]; log4j; manual |
-| 262 | Sink: org.apache.logging.log4j; Logger; true; trace; (Object); ; Argument[0]; log4j; manual |
-| 263 | Sink: org.apache.logging.log4j; Logger; true; trace; (Object,Throwable); ; Argument[0]; log4j; manual |
-| 264 | Sink: org.apache.logging.log4j; Logger; true; trace; (String); ; Argument[0]; log4j; manual |
-| 265 | Sink: org.apache.logging.log4j; Logger; true; trace; (String,Object); ; Argument[0..1]; log4j; manual |
-| 266 | Sink: org.apache.logging.log4j; Logger; true; trace; (String,Object,Object); ; Argument[0..2]; log4j; manual |
-| 267 | Sink: org.apache.logging.log4j; Logger; true; trace; (String,Object,Object,Object); ; Argument[0..3]; log4j; manual |
-| 268 | Sink: org.apache.logging.log4j; Logger; true; trace; (String,Object,Object,Object,Object); ; Argument[0..4]; log4j; manual |
-| 269 | Sink: org.apache.logging.log4j; Logger; true; trace; (String,Object,Object,Object,Object,Object); ; Argument[0..5]; log4j; manual |
-| 270 | Sink: org.apache.logging.log4j; Logger; true; trace; (String,Object,Object,Object,Object,Object,Object); ; Argument[0..6]; log4j; manual |
-| 271 | Sink: org.apache.logging.log4j; Logger; true; trace; (String,Object,Object,Object,Object,Object,Object,Object); ; Argument[0..7]; log4j; manual |
-| 272 | Sink: org.apache.logging.log4j; Logger; true; trace; (String,Object,Object,Object,Object,Object,Object,Object,Object); ; Argument[0..8]; log4j; manual |
-| 273 | Sink: org.apache.logging.log4j; Logger; true; trace; (String,Object,Object,Object,Object,Object,Object,Object,Object,Object); ; Argument[0..9]; log4j; manual |
-| 274 | Sink: org.apache.logging.log4j; Logger; true; trace; (String,Object[]); ; Argument[0..1]; log4j; manual |
-| 275 | Sink: org.apache.logging.log4j; Logger; true; trace; (String,Throwable); ; Argument[0]; log4j; manual |
-| 276 | Sink: org.apache.logging.log4j; Logger; true; trace; (Supplier); ; Argument[0]; log4j; manual |
-| 277 | Sink: org.apache.logging.log4j; Logger; true; trace; (Supplier,Throwable); ; Argument[0]; log4j; manual |
-| 278 | Sink: org.apache.logging.log4j; Logger; true; warn; (CharSequence); ; Argument[0]; log4j; manual |
-| 279 | Sink: org.apache.logging.log4j; Logger; true; warn; (CharSequence,Throwable); ; Argument[0]; log4j; manual |
-| 280 | Sink: org.apache.logging.log4j; Logger; true; warn; (Marker,CharSequence); ; Argument[1]; log4j; manual |
-| 281 | Sink: org.apache.logging.log4j; Logger; true; warn; (Marker,CharSequence,Throwable); ; Argument[1]; log4j; manual |
-| 282 | Sink: org.apache.logging.log4j; Logger; true; warn; (Marker,Message); ; Argument[1]; log4j; manual |
-| 283 | Sink: org.apache.logging.log4j; Logger; true; warn; (Marker,MessageSupplier); ; Argument[1]; log4j; manual |
-| 284 | Sink: org.apache.logging.log4j; Logger; true; warn; (Marker,MessageSupplier,Throwable); ; Argument[1]; log4j; manual |
-| 285 | Sink: org.apache.logging.log4j; Logger; true; warn; (Marker,Object); ; Argument[1]; log4j; manual |
-| 286 | Sink: org.apache.logging.log4j; Logger; true; warn; (Marker,String); ; Argument[1]; log4j; manual |
-| 287 | Sink: org.apache.logging.log4j; Logger; true; warn; (Marker,String,Object); ; Argument[1..2]; log4j; manual |
-| 288 | Sink: org.apache.logging.log4j; Logger; true; warn; (Marker,String,Object,Object); ; Argument[1..3]; log4j; manual |
-| 289 | Sink: org.apache.logging.log4j; Logger; true; warn; (Marker,String,Object,Object,Object); ; Argument[1..4]; log4j; manual |
-| 290 | Sink: org.apache.logging.log4j; Logger; true; warn; (Marker,String,Object,Object,Object,Object); ; Argument[1..5]; log4j; manual |
-| 291 | Sink: org.apache.logging.log4j; Logger; true; warn; (Marker,String,Object,Object,Object,Object,Object); ; Argument[1..6]; log4j; manual |
-| 292 | Sink: org.apache.logging.log4j; Logger; true; warn; (Marker,String,Object,Object,Object,Object,Object,Object); ; Argument[1..7]; log4j; manual |
-| 293 | Sink: org.apache.logging.log4j; Logger; true; warn; (Marker,String,Object,Object,Object,Object,Object,Object,Object); ; Argument[1..8]; log4j; manual |
-| 294 | Sink: org.apache.logging.log4j; Logger; true; warn; (Marker,String,Object,Object,Object,Object,Object,Object,Object,Object); ; Argument[1..9]; log4j; manual |
-| 295 | Sink: org.apache.logging.log4j; Logger; true; warn; (Marker,String,Object,Object,Object,Object,Object,Object,Object,Object,Object); ; Argument[1..10]; log4j; manual |
-| 296 | Sink: org.apache.logging.log4j; Logger; true; warn; (Marker,String,Object[]); ; Argument[1..2]; log4j; manual |
-| 297 | Sink: org.apache.logging.log4j; Logger; true; warn; (Marker,String,Throwable); ; Argument[1]; log4j; manual |
-| 298 | Sink: org.apache.logging.log4j; Logger; true; warn; (Marker,Supplier); ; Argument[1]; log4j; manual |
-| 299 | Sink: org.apache.logging.log4j; Logger; true; warn; (Marker,Supplier,Throwable); ; Argument[1]; log4j; manual |
-| 300 | Sink: org.apache.logging.log4j; Logger; true; warn; (Message); ; Argument[0]; log4j; manual |
-| 301 | Sink: org.apache.logging.log4j; Logger; true; warn; (Message,Throwable); ; Argument[0]; log4j; manual |
-| 302 | Sink: org.apache.logging.log4j; Logger; true; warn; (MessageSupplier); ; Argument[0]; log4j; manual |
-| 303 | Sink: org.apache.logging.log4j; Logger; true; warn; (MessageSupplier,Throwable); ; Argument[0]; log4j; manual |
-| 304 | Sink: org.apache.logging.log4j; Logger; true; warn; (Object); ; Argument[0]; log4j; manual |
-| 305 | Sink: org.apache.logging.log4j; Logger; true; warn; (Object,Throwable); ; Argument[0]; log4j; manual |
-| 306 | Sink: org.apache.logging.log4j; Logger; true; warn; (String); ; Argument[0]; log4j; manual |
-| 307 | Sink: org.apache.logging.log4j; Logger; true; warn; (String,Object); ; Argument[0..1]; log4j; manual |
-| 308 | Sink: org.apache.logging.log4j; Logger; true; warn; (String,Object,Object); ; Argument[0..2]; log4j; manual |
-| 309 | Sink: org.apache.logging.log4j; Logger; true; warn; (String,Object,Object,Object); ; Argument[0..3]; log4j; manual |
-| 310 | Sink: org.apache.logging.log4j; Logger; true; warn; (String,Object,Object,Object,Object); ; Argument[0..4]; log4j; manual |
-| 311 | Sink: org.apache.logging.log4j; Logger; true; warn; (String,Object,Object,Object,Object,Object); ; Argument[0..5]; log4j; manual |
-| 312 | Sink: org.apache.logging.log4j; Logger; true; warn; (String,Object,Object,Object,Object,Object,Object); ; Argument[0..6]; log4j; manual |
-| 313 | Sink: org.apache.logging.log4j; Logger; true; warn; (String,Object,Object,Object,Object,Object,Object,Object); ; Argument[0..7]; log4j; manual |
-| 314 | Sink: org.apache.logging.log4j; Logger; true; warn; (String,Object,Object,Object,Object,Object,Object,Object,Object); ; Argument[0..8]; log4j; manual |
-| 315 | Sink: org.apache.logging.log4j; Logger; true; warn; (String,Object,Object,Object,Object,Object,Object,Object,Object,Object); ; Argument[0..9]; log4j; manual |
-| 316 | Sink: org.apache.logging.log4j; Logger; true; warn; (String,Object[]); ; Argument[0..1]; log4j; manual |
-| 317 | Sink: org.apache.logging.log4j; Logger; true; warn; (String,Throwable); ; Argument[0]; log4j; manual |
-| 318 | Sink: org.apache.logging.log4j; Logger; true; warn; (Supplier); ; Argument[0]; log4j; manual |
-| 319 | Sink: org.apache.logging.log4j; Logger; true; warn; (Supplier,Throwable); ; Argument[0]; log4j; manual |
-| 320 | Sink: org.apache.logging.log4j; ThreadContext; false; put; ; ; Argument[1]; log4j; manual |
-| 321 | Sink: org.apache.logging.log4j; ThreadContext; false; putAll; ; ; Argument[0]; log4j; manual |
-| 322 | Sink: org.apache.logging.log4j; ThreadContext; false; putIfNull; ; ; Argument[1]; log4j; manual |
-| 323 | Summary: java.util; Map; true; put; (Object,Object); ; Argument[1]; Argument[this].MapValue; value; manual |
-| 324 | Source: javax.servlet; ServletRequest; false; getParameter; (String); ; ReturnValue; remote; manual |
-| 325 | Sink: org.apache.logging.log4j; LogBuilder; true; log; (CharSequence); ; Argument[0]; log-injection; manual |
-| 326 | Sink: org.apache.logging.log4j; LogBuilder; true; log; (Message); ; Argument[0]; log-injection; manual |
-| 327 | Sink: org.apache.logging.log4j; LogBuilder; true; log; (Object); ; Argument[0]; log-injection; manual |
-| 328 | Sink: org.apache.logging.log4j; LogBuilder; true; log; (String); ; Argument[0]; log-injection; manual |
-| 329 | Sink: org.apache.logging.log4j; LogBuilder; true; log; (String,Object); ; Argument[0..1]; log-injection; manual |
-| 330 | Sink: org.apache.logging.log4j; LogBuilder; true; log; (String,Object,Object); ; Argument[0..2]; log-injection; manual |
-| 331 | Sink: org.apache.logging.log4j; LogBuilder; true; log; (String,Object,Object,Object); ; Argument[0..3]; log-injection; manual |
-| 332 | Sink: org.apache.logging.log4j; LogBuilder; true; log; (String,Object,Object,Object,Object); ; Argument[0..4]; log-injection; manual |
-| 333 | Sink: org.apache.logging.log4j; LogBuilder; true; log; (String,Object,Object,Object,Object,Object); ; Argument[0..5]; log-injection; manual |
-| 334 | Sink: org.apache.logging.log4j; LogBuilder; true; log; (String,Object,Object,Object,Object,Object,Object); ; Argument[0..6]; log-injection; manual |
-| 335 | Sink: org.apache.logging.log4j; LogBuilder; true; log; (String,Object,Object,Object,Object,Object,Object,Object); ; Argument[0..7]; log-injection; manual |
-| 336 | Sink: org.apache.logging.log4j; LogBuilder; true; log; (String,Object,Object,Object,Object,Object,Object,Object,Object); ; Argument[0..8]; log-injection; manual |
-| 337 | Sink: org.apache.logging.log4j; LogBuilder; true; log; (String,Object,Object,Object,Object,Object,Object,Object,Object,Object); ; Argument[0..9]; log-injection; manual |
-| 338 | Sink: org.apache.logging.log4j; LogBuilder; true; log; (String,Object[]); ; Argument[0..1]; log-injection; manual |
-| 339 | Sink: org.apache.logging.log4j; Logger; true; debug; (CharSequence); ; Argument[0]; log-injection; manual |
-| 340 | Sink: org.apache.logging.log4j; Logger; true; debug; (CharSequence,Throwable); ; Argument[0]; log-injection; manual |
-| 341 | Sink: org.apache.logging.log4j; Logger; true; debug; (Marker,CharSequence); ; Argument[1]; log-injection; manual |
-| 342 | Sink: org.apache.logging.log4j; Logger; true; debug; (Marker,CharSequence,Throwable); ; Argument[1]; log-injection; manual |
-| 343 | Sink: org.apache.logging.log4j; Logger; true; debug; (Marker,Message); ; Argument[1]; log-injection; manual |
-| 344 | Sink: org.apache.logging.log4j; Logger; true; debug; (Marker,MessageSupplier); ; Argument[1]; log-injection; manual |
-| 345 | Sink: org.apache.logging.log4j; Logger; true; debug; (Marker,MessageSupplier,Throwable); ; Argument[1]; log-injection; manual |
-| 346 | Sink: org.apache.logging.log4j; Logger; true; debug; (Marker,Object); ; Argument[1]; log-injection; manual |
-| 347 | Sink: org.apache.logging.log4j; Logger; true; debug; (Marker,String); ; Argument[1]; log-injection; manual |
-| 348 | Sink: org.apache.logging.log4j; Logger; true; debug; (Marker,String,Object); ; Argument[1..2]; log-injection; manual |
-| 349 | Sink: org.apache.logging.log4j; Logger; true; debug; (Marker,String,Object,Object); ; Argument[1..3]; log-injection; manual |
-| 350 | Sink: org.apache.logging.log4j; Logger; true; debug; (Marker,String,Object,Object,Object); ; Argument[1..4]; log-injection; manual |
-| 351 | Sink: org.apache.logging.log4j; Logger; true; debug; (Marker,String,Object,Object,Object,Object); ; Argument[1..5]; log-injection; manual |
-| 352 | Sink: org.apache.logging.log4j; Logger; true; debug; (Marker,String,Object,Object,Object,Object,Object); ; Argument[1..6]; log-injection; manual |
-| 353 | Sink: org.apache.logging.log4j; Logger; true; debug; (Marker,String,Object,Object,Object,Object,Object,Object); ; Argument[1..7]; log-injection; manual |
-| 354 | Sink: org.apache.logging.log4j; Logger; true; debug; (Marker,String,Object,Object,Object,Object,Object,Object,Object); ; Argument[1..8]; log-injection; manual |
-| 355 | Sink: org.apache.logging.log4j; Logger; true; debug; (Marker,String,Object,Object,Object,Object,Object,Object,Object,Object); ; Argument[1..9]; log-injection; manual |
-| 356 | Sink: org.apache.logging.log4j; Logger; true; debug; (Marker,String,Object,Object,Object,Object,Object,Object,Object,Object,Object); ; Argument[1..10]; log-injection; manual |
-| 357 | Sink: org.apache.logging.log4j; Logger; true; debug; (Marker,String,Object[]); ; Argument[1..2]; log-injection; manual |
-| 358 | Sink: org.apache.logging.log4j; Logger; true; debug; (Marker,String,Throwable); ; Argument[1]; log-injection; manual |
-| 359 | Sink: org.apache.logging.log4j; Logger; true; debug; (Marker,Supplier); ; Argument[1]; log-injection; manual |
-| 360 | Sink: org.apache.logging.log4j; Logger; true; debug; (Marker,Supplier,Throwable); ; Argument[1]; log-injection; manual |
-| 361 | Sink: org.apache.logging.log4j; Logger; true; debug; (Message); ; Argument[0]; log-injection; manual |
-| 362 | Sink: org.apache.logging.log4j; Logger; true; debug; (Message,Throwable); ; Argument[0]; log-injection; manual |
-| 363 | Sink: org.apache.logging.log4j; Logger; true; debug; (MessageSupplier); ; Argument[0]; log-injection; manual |
-| 364 | Sink: org.apache.logging.log4j; Logger; true; debug; (MessageSupplier,Throwable); ; Argument[0]; log-injection; manual |
-| 365 | Sink: org.apache.logging.log4j; Logger; true; debug; (Object); ; Argument[0]; log-injection; manual |
-| 366 | Sink: org.apache.logging.log4j; Logger; true; debug; (Object,Throwable); ; Argument[0]; log-injection; manual |
-| 367 | Sink: org.apache.logging.log4j; Logger; true; debug; (String); ; Argument[0]; log-injection; manual |
-| 368 | Sink: org.apache.logging.log4j; Logger; true; debug; (String,Object); ; Argument[0..1]; log-injection; manual |
-| 369 | Sink: org.apache.logging.log4j; Logger; true; debug; (String,Object,Object); ; Argument[0..2]; log-injection; manual |
-| 370 | Sink: org.apache.logging.log4j; Logger; true; debug; (String,Object,Object,Object); ; Argument[0..3]; log-injection; manual |
-| 371 | Sink: org.apache.logging.log4j; Logger; true; debug; (String,Object,Object,Object,Object); ; Argument[0..4]; log-injection; manual |
-| 372 | Sink: org.apache.logging.log4j; Logger; true; debug; (String,Object,Object,Object,Object,Object); ; Argument[0..5]; log-injection; manual |
-| 373 | Sink: org.apache.logging.log4j; Logger; true; debug; (String,Object,Object,Object,Object,Object,Object); ; Argument[0..6]; log-injection; manual |
-| 374 | Sink: org.apache.logging.log4j; Logger; true; debug; (String,Object,Object,Object,Object,Object,Object,Object); ; Argument[0..7]; log-injection; manual |
-| 375 | Sink: org.apache.logging.log4j; Logger; true; debug; (String,Object,Object,Object,Object,Object,Object,Object,Object); ; Argument[0..8]; log-injection; manual |
-| 376 | Sink: org.apache.logging.log4j; Logger; true; debug; (String,Object,Object,Object,Object,Object,Object,Object,Object,Object); ; Argument[0..9]; log-injection; manual |
-| 377 | Sink: org.apache.logging.log4j; Logger; true; debug; (String,Object[]); ; Argument[0..1]; log-injection; manual |
-| 378 | Sink: org.apache.logging.log4j; Logger; true; debug; (String,Throwable); ; Argument[0]; log-injection; manual |
-| 379 | Sink: org.apache.logging.log4j; Logger; true; debug; (Supplier); ; Argument[0]; log-injection; manual |
-| 380 | Sink: org.apache.logging.log4j; Logger; true; debug; (Supplier,Throwable); ; Argument[0]; log-injection; manual |
-| 381 | Sink: org.apache.logging.log4j; Logger; true; error; (CharSequence); ; Argument[0]; log-injection; manual |
-| 382 | Sink: org.apache.logging.log4j; Logger; true; error; (CharSequence,Throwable); ; Argument[0]; log-injection; manual |
-| 383 | Sink: org.apache.logging.log4j; Logger; true; error; (Marker,CharSequence); ; Argument[1]; log-injection; manual |
-| 384 | Sink: org.apache.logging.log4j; Logger; true; error; (Marker,CharSequence,Throwable); ; Argument[1]; log-injection; manual |
-| 385 | Sink: org.apache.logging.log4j; Logger; true; error; (Marker,Message); ; Argument[1]; log-injection; manual |
-| 386 | Sink: org.apache.logging.log4j; Logger; true; error; (Marker,MessageSupplier); ; Argument[1]; log-injection; manual |
-| 387 | Sink: org.apache.logging.log4j; Logger; true; error; (Marker,MessageSupplier,Throwable); ; Argument[1]; log-injection; manual |
-| 388 | Sink: org.apache.logging.log4j; Logger; true; error; (Marker,Object); ; Argument[1]; log-injection; manual |
-| 389 | Sink: org.apache.logging.log4j; Logger; true; error; (Marker,String); ; Argument[1]; log-injection; manual |
-| 390 | Sink: org.apache.logging.log4j; Logger; true; error; (Marker,String,Object); ; Argument[1..2]; log-injection; manual |
-| 391 | Sink: org.apache.logging.log4j; Logger; true; error; (Marker,String,Object,Object); ; Argument[1..3]; log-injection; manual |
-| 392 | Sink: org.apache.logging.log4j; Logger; true; error; (Marker,String,Object,Object,Object); ; Argument[1..4]; log-injection; manual |
-| 393 | Sink: org.apache.logging.log4j; Logger; true; error; (Marker,String,Object,Object,Object,Object); ; Argument[1..5]; log-injection; manual |
-| 394 | Sink: org.apache.logging.log4j; Logger; true; error; (Marker,String,Object,Object,Object,Object,Object); ; Argument[1..6]; log-injection; manual |
-| 395 | Sink: org.apache.logging.log4j; Logger; true; error; (Marker,String,Object,Object,Object,Object,Object,Object); ; Argument[1..7]; log-injection; manual |
-| 396 | Sink: org.apache.logging.log4j; Logger; true; error; (Marker,String,Object,Object,Object,Object,Object,Object,Object); ; Argument[1..8]; log-injection; manual |
-| 397 | Sink: org.apache.logging.log4j; Logger; true; error; (Marker,String,Object,Object,Object,Object,Object,Object,Object,Object); ; Argument[1..9]; log-injection; manual |
-| 398 | Sink: org.apache.logging.log4j; Logger; true; error; (Marker,String,Object,Object,Object,Object,Object,Object,Object,Object,Object); ; Argument[1..10]; log-injection; manual |
-| 399 | Sink: org.apache.logging.log4j; Logger; true; error; (Marker,String,Object[]); ; Argument[1..2]; log-injection; manual |
-| 400 | Sink: org.apache.logging.log4j; Logger; true; error; (Marker,String,Throwable); ; Argument[1]; log-injection; manual |
-| 401 | Sink: org.apache.logging.log4j; Logger; true; error; (Marker,Supplier); ; Argument[1]; log-injection; manual |
-| 402 | Sink: org.apache.logging.log4j; Logger; true; error; (Marker,Supplier,Throwable); ; Argument[1]; log-injection; manual |
-| 403 | Sink: org.apache.logging.log4j; Logger; true; error; (Message); ; Argument[0]; log-injection; manual |
-| 404 | Sink: org.apache.logging.log4j; Logger; true; error; (Message,Throwable); ; Argument[0]; log-injection; manual |
-| 405 | Sink: org.apache.logging.log4j; Logger; true; error; (MessageSupplier); ; Argument[0]; log-injection; manual |
-| 406 | Sink: org.apache.logging.log4j; Logger; true; error; (MessageSupplier,Throwable); ; Argument[0]; log-injection; manual |
-| 407 | Sink: org.apache.logging.log4j; Logger; true; error; (Object); ; Argument[0]; log-injection; manual |
-| 408 | Sink: org.apache.logging.log4j; Logger; true; error; (Object,Throwable); ; Argument[0]; log-injection; manual |
-| 409 | Sink: org.apache.logging.log4j; Logger; true; error; (String); ; Argument[0]; log-injection; manual |
-| 410 | Sink: org.apache.logging.log4j; Logger; true; error; (String,Object); ; Argument[0..1]; log-injection; manual |
-| 411 | Sink: org.apache.logging.log4j; Logger; true; error; (String,Object,Object); ; Argument[0..2]; log-injection; manual |
-| 412 | Sink: org.apache.logging.log4j; Logger; true; error; (String,Object,Object,Object); ; Argument[0..3]; log-injection; manual |
-| 413 | Sink: org.apache.logging.log4j; Logger; true; error; (String,Object,Object,Object,Object); ; Argument[0..4]; log-injection; manual |
-| 414 | Sink: org.apache.logging.log4j; Logger; true; error; (String,Object,Object,Object,Object,Object); ; Argument[0..5]; log-injection; manual |
-| 415 | Sink: org.apache.logging.log4j; Logger; true; error; (String,Object,Object,Object,Object,Object,Object); ; Argument[0..6]; log-injection; manual |
-| 416 | Sink: org.apache.logging.log4j; Logger; true; error; (String,Object,Object,Object,Object,Object,Object,Object); ; Argument[0..7]; log-injection; manual |
-| 417 | Sink: org.apache.logging.log4j; Logger; true; error; (String,Object,Object,Object,Object,Object,Object,Object,Object); ; Argument[0..8]; log-injection; manual |
-| 418 | Sink: org.apache.logging.log4j; Logger; true; error; (String,Object,Object,Object,Object,Object,Object,Object,Object,Object); ; Argument[0..9]; log-injection; manual |
-| 419 | Sink: org.apache.logging.log4j; Logger; true; error; (String,Object[]); ; Argument[0..1]; log-injection; manual |
-| 420 | Sink: org.apache.logging.log4j; Logger; true; error; (String,Throwable); ; Argument[0]; log-injection; manual |
-| 421 | Sink: org.apache.logging.log4j; Logger; true; error; (Supplier); ; Argument[0]; log-injection; manual |
-| 422 | Sink: org.apache.logging.log4j; Logger; true; error; (Supplier,Throwable); ; Argument[0]; log-injection; manual |
-| 423 | Sink: org.apache.logging.log4j; Logger; true; fatal; (CharSequence); ; Argument[0]; log-injection; manual |
-| 424 | Sink: org.apache.logging.log4j; Logger; true; fatal; (CharSequence,Throwable); ; Argument[0]; log-injection; manual |
-| 425 | Sink: org.apache.logging.log4j; Logger; true; fatal; (Marker,CharSequence); ; Argument[1]; log-injection; manual |
-| 426 | Sink: org.apache.logging.log4j; Logger; true; fatal; (Marker,CharSequence,Throwable); ; Argument[1]; log-injection; manual |
-| 427 | Sink: org.apache.logging.log4j; Logger; true; fatal; (Marker,Message); ; Argument[1]; log-injection; manual |
-| 428 | Sink: org.apache.logging.log4j; Logger; true; fatal; (Marker,MessageSupplier); ; Argument[1]; log-injection; manual |
-| 429 | Sink: org.apache.logging.log4j; Logger; true; fatal; (Marker,MessageSupplier,Throwable); ; Argument[1]; log-injection; manual |
-| 430 | Sink: org.apache.logging.log4j; Logger; true; fatal; (Marker,Object); ; Argument[1]; log-injection; manual |
-| 431 | Sink: org.apache.logging.log4j; Logger; true; fatal; (Marker,String); ; Argument[1]; log-injection; manual |
-| 432 | Sink: org.apache.logging.log4j; Logger; true; fatal; (Marker,String,Object); ; Argument[1..2]; log-injection; manual |
-| 433 | Sink: org.apache.logging.log4j; Logger; true; fatal; (Marker,String,Object,Object); ; Argument[1..3]; log-injection; manual |
-| 434 | Sink: org.apache.logging.log4j; Logger; true; fatal; (Marker,String,Object,Object,Object); ; Argument[1..4]; log-injection; manual |
-| 435 | Sink: org.apache.logging.log4j; Logger; true; fatal; (Marker,String,Object,Object,Object,Object); ; Argument[1..5]; log-injection; manual |
-| 436 | Sink: org.apache.logging.log4j; Logger; true; fatal; (Marker,String,Object,Object,Object,Object,Object); ; Argument[1..6]; log-injection; manual |
-| 437 | Sink: org.apache.logging.log4j; Logger; true; fatal; (Marker,String,Object,Object,Object,Object,Object,Object); ; Argument[1..7]; log-injection; manual |
-| 438 | Sink: org.apache.logging.log4j; Logger; true; fatal; (Marker,String,Object,Object,Object,Object,Object,Object,Object); ; Argument[1..8]; log-injection; manual |
-| 439 | Sink: org.apache.logging.log4j; Logger; true; fatal; (Marker,String,Object,Object,Object,Object,Object,Object,Object,Object); ; Argument[1..9]; log-injection; manual |
-| 440 | Sink: org.apache.logging.log4j; Logger; true; fatal; (Marker,String,Object,Object,Object,Object,Object,Object,Object,Object,Object); ; Argument[1..10]; log-injection; manual |
-| 441 | Sink: org.apache.logging.log4j; Logger; true; fatal; (Marker,String,Object[]); ; Argument[1..2]; log-injection; manual |
-| 442 | Sink: org.apache.logging.log4j; Logger; true; fatal; (Marker,String,Throwable); ; Argument[1]; log-injection; manual |
-| 443 | Sink: org.apache.logging.log4j; Logger; true; fatal; (Marker,Supplier); ; Argument[1]; log-injection; manual |
-| 444 | Sink: org.apache.logging.log4j; Logger; true; fatal; (Marker,Supplier,Throwable); ; Argument[1]; log-injection; manual |
-| 445 | Sink: org.apache.logging.log4j; Logger; true; fatal; (Message); ; Argument[0]; log-injection; manual |
-| 446 | Sink: org.apache.logging.log4j; Logger; true; fatal; (Message,Throwable); ; Argument[0]; log-injection; manual |
-| 447 | Sink: org.apache.logging.log4j; Logger; true; fatal; (MessageSupplier); ; Argument[0]; log-injection; manual |
-| 448 | Sink: org.apache.logging.log4j; Logger; true; fatal; (MessageSupplier,Throwable); ; Argument[0]; log-injection; manual |
-| 449 | Sink: org.apache.logging.log4j; Logger; true; fatal; (Object); ; Argument[0]; log-injection; manual |
-| 450 | Sink: org.apache.logging.log4j; Logger; true; fatal; (Object,Throwable); ; Argument[0]; log-injection; manual |
-| 451 | Sink: org.apache.logging.log4j; Logger; true; fatal; (String); ; Argument[0]; log-injection; manual |
-| 452 | Sink: org.apache.logging.log4j; Logger; true; fatal; (String,Object); ; Argument[0..1]; log-injection; manual |
-| 453 | Sink: org.apache.logging.log4j; Logger; true; fatal; (String,Object,Object); ; Argument[0..2]; log-injection; manual |
-| 454 | Sink: org.apache.logging.log4j; Logger; true; fatal; (String,Object,Object,Object); ; Argument[0..3]; log-injection; manual |
-| 455 | Sink: org.apache.logging.log4j; Logger; true; fatal; (String,Object,Object,Object,Object); ; Argument[0..4]; log-injection; manual |
-| 456 | Sink: org.apache.logging.log4j; Logger; true; fatal; (String,Object,Object,Object,Object,Object); ; Argument[0..5]; log-injection; manual |
-| 457 | Sink: org.apache.logging.log4j; Logger; true; fatal; (String,Object,Object,Object,Object,Object,Object); ; Argument[0..6]; log-injection; manual |
-| 458 | Sink: org.apache.logging.log4j; Logger; true; fatal; (String,Object,Object,Object,Object,Object,Object,Object); ; Argument[0..7]; log-injection; manual |
-| 459 | Sink: org.apache.logging.log4j; Logger; true; fatal; (String,Object,Object,Object,Object,Object,Object,Object,Object); ; Argument[0..8]; log-injection; manual |
-| 460 | Sink: org.apache.logging.log4j; Logger; true; fatal; (String,Object,Object,Object,Object,Object,Object,Object,Object,Object); ; Argument[0..9]; log-injection; manual |
-| 461 | Sink: org.apache.logging.log4j; Logger; true; fatal; (String,Object[]); ; Argument[0..1]; log-injection; manual |
-| 462 | Sink: org.apache.logging.log4j; Logger; true; fatal; (String,Throwable); ; Argument[0]; log-injection; manual |
-| 463 | Sink: org.apache.logging.log4j; Logger; true; fatal; (Supplier); ; Argument[0]; log-injection; manual |
-| 464 | Sink: org.apache.logging.log4j; Logger; true; fatal; (Supplier,Throwable); ; Argument[0]; log-injection; manual |
-| 465 | Sink: org.apache.logging.log4j; Logger; true; info; (CharSequence); ; Argument[0]; log-injection; manual |
-| 466 | Sink: org.apache.logging.log4j; Logger; true; info; (CharSequence,Throwable); ; Argument[0]; log-injection; manual |
-| 467 | Sink: org.apache.logging.log4j; Logger; true; info; (Marker,CharSequence); ; Argument[1]; log-injection; manual |
-| 468 | Sink: org.apache.logging.log4j; Logger; true; info; (Marker,CharSequence,Throwable); ; Argument[1]; log-injection; manual |
-| 469 | Sink: org.apache.logging.log4j; Logger; true; info; (Marker,Message); ; Argument[1]; log-injection; manual |
-| 470 | Sink: org.apache.logging.log4j; Logger; true; info; (Marker,MessageSupplier); ; Argument[1]; log-injection; manual |
-| 471 | Sink: org.apache.logging.log4j; Logger; true; info; (Marker,MessageSupplier,Throwable); ; Argument[1]; log-injection; manual |
-| 472 | Sink: org.apache.logging.log4j; Logger; true; info; (Marker,Object); ; Argument[1]; log-injection; manual |
-| 473 | Sink: org.apache.logging.log4j; Logger; true; info; (Marker,String); ; Argument[1]; log-injection; manual |
-| 474 | Sink: org.apache.logging.log4j; Logger; true; info; (Marker,String,Object); ; Argument[1..2]; log-injection; manual |
-| 475 | Sink: org.apache.logging.log4j; Logger; true; info; (Marker,String,Object,Object); ; Argument[1..3]; log-injection; manual |
-| 476 | Sink: org.apache.logging.log4j; Logger; true; info; (Marker,String,Object,Object,Object); ; Argument[1..4]; log-injection; manual |
-| 477 | Sink: org.apache.logging.log4j; Logger; true; info; (Marker,String,Object,Object,Object,Object); ; Argument[1..5]; log-injection; manual |
-| 478 | Sink: org.apache.logging.log4j; Logger; true; info; (Marker,String,Object,Object,Object,Object,Object); ; Argument[1..6]; log-injection; manual |
-| 479 | Sink: org.apache.logging.log4j; Logger; true; info; (Marker,String,Object,Object,Object,Object,Object,Object); ; Argument[1..7]; log-injection; manual |
-| 480 | Sink: org.apache.logging.log4j; Logger; true; info; (Marker,String,Object,Object,Object,Object,Object,Object,Object); ; Argument[1..8]; log-injection; manual |
-| 481 | Sink: org.apache.logging.log4j; Logger; true; info; (Marker,String,Object,Object,Object,Object,Object,Object,Object,Object); ; Argument[1..9]; log-injection; manual |
-| 482 | Sink: org.apache.logging.log4j; Logger; true; info; (Marker,String,Object,Object,Object,Object,Object,Object,Object,Object,Object); ; Argument[1..10]; log-injection; manual |
-| 483 | Sink: org.apache.logging.log4j; Logger; true; info; (Marker,String,Object[]); ; Argument[1..2]; log-injection; manual |
-| 484 | Sink: org.apache.logging.log4j; Logger; true; info; (Marker,String,Throwable); ; Argument[1]; log-injection; manual |
-| 485 | Sink: org.apache.logging.log4j; Logger; true; info; (Marker,Supplier); ; Argument[1]; log-injection; manual |
-| 486 | Sink: org.apache.logging.log4j; Logger; true; info; (Marker,Supplier,Throwable); ; Argument[1]; log-injection; manual |
-| 487 | Sink: org.apache.logging.log4j; Logger; true; info; (Message); ; Argument[0]; log-injection; manual |
-| 488 | Sink: org.apache.logging.log4j; Logger; true; info; (Message,Throwable); ; Argument[0]; log-injection; manual |
-| 489 | Sink: org.apache.logging.log4j; Logger; true; info; (MessageSupplier); ; Argument[0]; log-injection; manual |
-| 490 | Sink: org.apache.logging.log4j; Logger; true; info; (MessageSupplier,Throwable); ; Argument[0]; log-injection; manual |
-| 491 | Sink: org.apache.logging.log4j; Logger; true; info; (Object); ; Argument[0]; log-injection; manual |
-| 492 | Sink: org.apache.logging.log4j; Logger; true; info; (Object,Throwable); ; Argument[0]; log-injection; manual |
-| 493 | Sink: org.apache.logging.log4j; Logger; true; info; (String); ; Argument[0]; log-injection; manual |
-| 494 | Sink: org.apache.logging.log4j; Logger; true; info; (String,Object); ; Argument[0..1]; log-injection; manual |
-| 495 | Sink: org.apache.logging.log4j; Logger; true; info; (String,Object,Object); ; Argument[0..2]; log-injection; manual |
-| 496 | Sink: org.apache.logging.log4j; Logger; true; info; (String,Object,Object,Object); ; Argument[0..3]; log-injection; manual |
-| 497 | Sink: org.apache.logging.log4j; Logger; true; info; (String,Object,Object,Object,Object); ; Argument[0..4]; log-injection; manual |
-| 498 | Sink: org.apache.logging.log4j; Logger; true; info; (String,Object,Object,Object,Object,Object); ; Argument[0..5]; log-injection; manual |
-| 499 | Sink: org.apache.logging.log4j; Logger; true; info; (String,Object,Object,Object,Object,Object,Object); ; Argument[0..6]; log-injection; manual |
-| 500 | Sink: org.apache.logging.log4j; Logger; true; info; (String,Object,Object,Object,Object,Object,Object,Object); ; Argument[0..7]; log-injection; manual |
-| 501 | Sink: org.apache.logging.log4j; Logger; true; info; (String,Object,Object,Object,Object,Object,Object,Object,Object); ; Argument[0..8]; log-injection; manual |
-| 502 | Sink: org.apache.logging.log4j; Logger; true; info; (String,Object,Object,Object,Object,Object,Object,Object,Object,Object); ; Argument[0..9]; log-injection; manual |
-| 503 | Sink: org.apache.logging.log4j; Logger; true; info; (String,Object[]); ; Argument[0..1]; log-injection; manual |
-| 504 | Sink: org.apache.logging.log4j; Logger; true; info; (String,Throwable); ; Argument[0]; log-injection; manual |
-| 505 | Sink: org.apache.logging.log4j; Logger; true; info; (Supplier); ; Argument[0]; log-injection; manual |
-| 506 | Sink: org.apache.logging.log4j; Logger; true; info; (Supplier,Throwable); ; Argument[0]; log-injection; manual |
-| 507 | Sink: org.apache.logging.log4j; Logger; true; log; (Level,CharSequence); ; Argument[1]; log-injection; manual |
-| 508 | Sink: org.apache.logging.log4j; Logger; true; log; (Level,CharSequence,Throwable); ; Argument[1]; log-injection; manual |
-| 509 | Sink: org.apache.logging.log4j; Logger; true; log; (Level,Marker,CharSequence); ; Argument[2]; log-injection; manual |
-| 510 | Sink: org.apache.logging.log4j; Logger; true; log; (Level,Marker,CharSequence,Throwable); ; Argument[2]; log-injection; manual |
-| 511 | Sink: org.apache.logging.log4j; Logger; true; log; (Level,Marker,Message); ; Argument[2]; log-injection; manual |
-| 512 | Sink: org.apache.logging.log4j; Logger; true; log; (Level,Marker,MessageSupplier); ; Argument[2]; log-injection; manual |
-| 513 | Sink: org.apache.logging.log4j; Logger; true; log; (Level,Marker,MessageSupplier,Throwable); ; Argument[2]; log-injection; manual |
-| 514 | Sink: org.apache.logging.log4j; Logger; true; log; (Level,Marker,Object); ; Argument[2]; log-injection; manual |
-| 515 | Sink: org.apache.logging.log4j; Logger; true; log; (Level,Marker,String); ; Argument[2]; log-injection; manual |
-| 516 | Sink: org.apache.logging.log4j; Logger; true; log; (Level,Marker,String,Object); ; Argument[2..3]; log-injection; manual |
-| 517 | Sink: org.apache.logging.log4j; Logger; true; log; (Level,Marker,String,Object,Object); ; Argument[2..4]; log-injection; manual |
-| 518 | Sink: org.apache.logging.log4j; Logger; true; log; (Level,Marker,String,Object,Object,Object); ; Argument[2..5]; log-injection; manual |
-| 519 | Sink: org.apache.logging.log4j; Logger; true; log; (Level,Marker,String,Object,Object,Object,Object); ; Argument[2..6]; log-injection; manual |
-| 520 | Sink: org.apache.logging.log4j; Logger; true; log; (Level,Marker,String,Object,Object,Object,Object,Object); ; Argument[2..7]; log-injection; manual |
-| 521 | Sink: org.apache.logging.log4j; Logger; true; log; (Level,Marker,String,Object,Object,Object,Object,Object,Object); ; Argument[2..8]; log-injection; manual |
-| 522 | Sink: org.apache.logging.log4j; Logger; true; log; (Level,Marker,String,Object,Object,Object,Object,Object,Object,Object); ; Argument[2..9]; log-injection; manual |
-| 523 | Sink: org.apache.logging.log4j; Logger; true; log; (Level,Marker,String,Object,Object,Object,Object,Object,Object,Object,Object); ; Argument[2..10]; log-injection; manual |
-| 524 | Sink: org.apache.logging.log4j; Logger; true; log; (Level,Marker,String,Object,Object,Object,Object,Object,Object,Object,Object,Object); ; Argument[2..11]; log-injection; manual |
-| 525 | Sink: org.apache.logging.log4j; Logger; true; log; (Level,Marker,String,Object[]); ; Argument[2..3]; log-injection; manual |
-| 526 | Sink: org.apache.logging.log4j; Logger; true; log; (Level,Marker,String,Throwable); ; Argument[2]; log-injection; manual |
-| 527 | Sink: org.apache.logging.log4j; Logger; true; log; (Level,Marker,Supplier); ; Argument[2]; log-injection; manual |
-| 528 | Sink: org.apache.logging.log4j; Logger; true; log; (Level,Marker,Supplier,Throwable); ; Argument[2]; log-injection; manual |
-| 529 | Sink: org.apache.logging.log4j; Logger; true; log; (Level,Message); ; Argument[1]; log-injection; manual |
-| 530 | Sink: org.apache.logging.log4j; Logger; true; log; (Level,Message,Throwable); ; Argument[1]; log-injection; manual |
-| 531 | Sink: org.apache.logging.log4j; Logger; true; log; (Level,MessageSupplier); ; Argument[1]; log-injection; manual |
-| 532 | Sink: org.apache.logging.log4j; Logger; true; log; (Level,MessageSupplier,Throwable); ; Argument[1]; log-injection; manual |
-| 533 | Sink: org.apache.logging.log4j; Logger; true; log; (Level,Object); ; Argument[1]; log-injection; manual |
-| 534 | Sink: org.apache.logging.log4j; Logger; true; log; (Level,Object,Throwable); ; Argument[1]; log-injection; manual |
-| 535 | Sink: org.apache.logging.log4j; Logger; true; log; (Level,String); ; Argument[1]; log-injection; manual |
-| 536 | Sink: org.apache.logging.log4j; Logger; true; log; (Level,String,Object); ; Argument[1..2]; log-injection; manual |
-| 537 | Sink: org.apache.logging.log4j; Logger; true; log; (Level,String,Object,Object); ; Argument[1..3]; log-injection; manual |
-| 538 | Sink: org.apache.logging.log4j; Logger; true; log; (Level,String,Object,Object,Object); ; Argument[1..4]; log-injection; manual |
-| 539 | Sink: org.apache.logging.log4j; Logger; true; log; (Level,String,Object,Object,Object,Object); ; Argument[1..5]; log-injection; manual |
-| 540 | Sink: org.apache.logging.log4j; Logger; true; log; (Level,String,Object,Object,Object,Object,Object); ; Argument[1..6]; log-injection; manual |
-| 541 | Sink: org.apache.logging.log4j; Logger; true; log; (Level,String,Object,Object,Object,Object,Object,Object); ; Argument[1..7]; log-injection; manual |
-| 542 | Sink: org.apache.logging.log4j; Logger; true; log; (Level,String,Object,Object,Object,Object,Object,Object,Object); ; Argument[1..8]; log-injection; manual |
-| 543 | Sink: org.apache.logging.log4j; Logger; true; log; (Level,String,Object,Object,Object,Object,Object,Object,Object,Object); ; Argument[1..9]; log-injection; manual |
-| 544 | Sink: org.apache.logging.log4j; Logger; true; log; (Level,String,Object,Object,Object,Object,Object,Object,Object,Object,Object); ; Argument[1..10]; log-injection; manual |
-| 545 | Sink: org.apache.logging.log4j; Logger; true; log; (Level,String,Object[]); ; Argument[1..2]; log-injection; manual |
-| 546 | Sink: org.apache.logging.log4j; Logger; true; log; (Level,String,Throwable); ; Argument[1]; log-injection; manual |
-| 547 | Sink: org.apache.logging.log4j; Logger; true; log; (Level,Supplier); ; Argument[1]; log-injection; manual |
-| 548 | Sink: org.apache.logging.log4j; Logger; true; log; (Level,Supplier,Throwable); ; Argument[1]; log-injection; manual |
-| 549 | Sink: org.apache.logging.log4j; Logger; true; logMessage; (Level,Marker,String,StackTraceElement,Message,Throwable); ; Argument[4]; log-injection; manual |
-| 550 | Sink: org.apache.logging.log4j; Logger; true; printf; (Level,Marker,String,Object[]); ; Argument[2..3]; log-injection; manual |
-| 551 | Sink: org.apache.logging.log4j; Logger; true; printf; (Level,String,Object[]); ; Argument[1..2]; log-injection; manual |
-| 552 | Sink: org.apache.logging.log4j; Logger; true; trace; (CharSequence); ; Argument[0]; log-injection; manual |
-| 553 | Sink: org.apache.logging.log4j; Logger; true; trace; (CharSequence,Throwable); ; Argument[0]; log-injection; manual |
-| 554 | Sink: org.apache.logging.log4j; Logger; true; trace; (Marker,CharSequence); ; Argument[1]; log-injection; manual |
-| 555 | Sink: org.apache.logging.log4j; Logger; true; trace; (Marker,CharSequence,Throwable); ; Argument[1]; log-injection; manual |
-| 556 | Sink: org.apache.logging.log4j; Logger; true; trace; (Marker,Message); ; Argument[1]; log-injection; manual |
-| 557 | Sink: org.apache.logging.log4j; Logger; true; trace; (Marker,MessageSupplier); ; Argument[1]; log-injection; manual |
-| 558 | Sink: org.apache.logging.log4j; Logger; true; trace; (Marker,MessageSupplier,Throwable); ; Argument[1]; log-injection; manual |
-| 559 | Sink: org.apache.logging.log4j; Logger; true; trace; (Marker,Object); ; Argument[1]; log-injection; manual |
-| 560 | Sink: org.apache.logging.log4j; Logger; true; trace; (Marker,String); ; Argument[1]; log-injection; manual |
-| 561 | Sink: org.apache.logging.log4j; Logger; true; trace; (Marker,String,Object); ; Argument[1..2]; log-injection; manual |
-| 562 | Sink: org.apache.logging.log4j; Logger; true; trace; (Marker,String,Object,Object); ; Argument[1..3]; log-injection; manual |
-| 563 | Sink: org.apache.logging.log4j; Logger; true; trace; (Marker,String,Object,Object,Object); ; Argument[1..4]; log-injection; manual |
-| 564 | Sink: org.apache.logging.log4j; Logger; true; trace; (Marker,String,Object,Object,Object,Object); ; Argument[1..5]; log-injection; manual |
-| 565 | Sink: org.apache.logging.log4j; Logger; true; trace; (Marker,String,Object,Object,Object,Object,Object); ; Argument[1..6]; log-injection; manual |
-| 566 | Sink: org.apache.logging.log4j; Logger; true; trace; (Marker,String,Object,Object,Object,Object,Object,Object); ; Argument[1..7]; log-injection; manual |
-| 567 | Sink: org.apache.logging.log4j; Logger; true; trace; (Marker,String,Object,Object,Object,Object,Object,Object,Object); ; Argument[1..8]; log-injection; manual |
-| 568 | Sink: org.apache.logging.log4j; Logger; true; trace; (Marker,String,Object,Object,Object,Object,Object,Object,Object,Object); ; Argument[1..9]; log-injection; manual |
-| 569 | Sink: org.apache.logging.log4j; Logger; true; trace; (Marker,String,Object,Object,Object,Object,Object,Object,Object,Object,Object); ; Argument[1..10]; log-injection; manual |
-| 570 | Sink: org.apache.logging.log4j; Logger; true; trace; (Marker,String,Object[]); ; Argument[1..2]; log-injection; manual |
-| 571 | Sink: org.apache.logging.log4j; Logger; true; trace; (Marker,String,Throwable); ; Argument[1]; log-injection; manual |
-| 572 | Sink: org.apache.logging.log4j; Logger; true; trace; (Marker,Supplier); ; Argument[1]; log-injection; manual |
-| 573 | Sink: org.apache.logging.log4j; Logger; true; trace; (Marker,Supplier,Throwable); ; Argument[1]; log-injection; manual |
-| 574 | Sink: org.apache.logging.log4j; Logger; true; trace; (Message); ; Argument[0]; log-injection; manual |
-| 575 | Sink: org.apache.logging.log4j; Logger; true; trace; (Message,Throwable); ; Argument[0]; log-injection; manual |
-| 576 | Sink: org.apache.logging.log4j; Logger; true; trace; (MessageSupplier); ; Argument[0]; log-injection; manual |
-| 577 | Sink: org.apache.logging.log4j; Logger; true; trace; (MessageSupplier,Throwable); ; Argument[0]; log-injection; manual |
-| 578 | Sink: org.apache.logging.log4j; Logger; true; trace; (Object); ; Argument[0]; log-injection; manual |
-| 579 | Sink: org.apache.logging.log4j; Logger; true; trace; (Object,Throwable); ; Argument[0]; log-injection; manual |
-| 580 | Sink: org.apache.logging.log4j; Logger; true; trace; (String); ; Argument[0]; log-injection; manual |
-| 581 | Sink: org.apache.logging.log4j; Logger; true; trace; (String,Object); ; Argument[0..1]; log-injection; manual |
-| 582 | Sink: org.apache.logging.log4j; Logger; true; trace; (String,Object,Object); ; Argument[0..2]; log-injection; manual |
-| 583 | Sink: org.apache.logging.log4j; Logger; true; trace; (String,Object,Object,Object); ; Argument[0..3]; log-injection; manual |
-| 584 | Sink: org.apache.logging.log4j; Logger; true; trace; (String,Object,Object,Object,Object); ; Argument[0..4]; log-injection; manual |
-| 585 | Sink: org.apache.logging.log4j; Logger; true; trace; (String,Object,Object,Object,Object,Object); ; Argument[0..5]; log-injection; manual |
-| 586 | Sink: org.apache.logging.log4j; Logger; true; trace; (String,Object,Object,Object,Object,Object,Object); ; Argument[0..6]; log-injection; manual |
-| 587 | Sink: org.apache.logging.log4j; Logger; true; trace; (String,Object,Object,Object,Object,Object,Object,Object); ; Argument[0..7]; log-injection; manual |
-| 588 | Sink: org.apache.logging.log4j; Logger; true; trace; (String,Object,Object,Object,Object,Object,Object,Object,Object); ; Argument[0..8]; log-injection; manual |
-| 589 | Sink: org.apache.logging.log4j; Logger; true; trace; (String,Object,Object,Object,Object,Object,Object,Object,Object,Object); ; Argument[0..9]; log-injection; manual |
-| 590 | Sink: org.apache.logging.log4j; Logger; true; trace; (String,Object[]); ; Argument[0..1]; log-injection; manual |
-| 591 | Sink: org.apache.logging.log4j; Logger; true; trace; (String,Throwable); ; Argument[0]; log-injection; manual |
-| 592 | Sink: org.apache.logging.log4j; Logger; true; trace; (Supplier); ; Argument[0]; log-injection; manual |
-| 593 | Sink: org.apache.logging.log4j; Logger; true; trace; (Supplier,Throwable); ; Argument[0]; log-injection; manual |
-| 594 | Sink: org.apache.logging.log4j; Logger; true; warn; (CharSequence); ; Argument[0]; log-injection; manual |
-| 595 | Sink: org.apache.logging.log4j; Logger; true; warn; (CharSequence,Throwable); ; Argument[0]; log-injection; manual |
-| 596 | Sink: org.apache.logging.log4j; Logger; true; warn; (Marker,CharSequence); ; Argument[1]; log-injection; manual |
-| 597 | Sink: org.apache.logging.log4j; Logger; true; warn; (Marker,CharSequence,Throwable); ; Argument[1]; log-injection; manual |
-| 598 | Sink: org.apache.logging.log4j; Logger; true; warn; (Marker,Message); ; Argument[1]; log-injection; manual |
-| 599 | Sink: org.apache.logging.log4j; Logger; true; warn; (Marker,MessageSupplier); ; Argument[1]; log-injection; manual |
-| 600 | Sink: org.apache.logging.log4j; Logger; true; warn; (Marker,MessageSupplier,Throwable); ; Argument[1]; log-injection; manual |
-| 601 | Sink: org.apache.logging.log4j; Logger; true; warn; (Marker,Object); ; Argument[1]; log-injection; manual |
-| 602 | Sink: org.apache.logging.log4j; Logger; true; warn; (Marker,String); ; Argument[1]; log-injection; manual |
-| 603 | Sink: org.apache.logging.log4j; Logger; true; warn; (Marker,String,Object); ; Argument[1..2]; log-injection; manual |
-| 604 | Sink: org.apache.logging.log4j; Logger; true; warn; (Marker,String,Object,Object); ; Argument[1..3]; log-injection; manual |
-| 605 | Sink: org.apache.logging.log4j; Logger; true; warn; (Marker,String,Object,Object,Object); ; Argument[1..4]; log-injection; manual |
-| 606 | Sink: org.apache.logging.log4j; Logger; true; warn; (Marker,String,Object,Object,Object,Object); ; Argument[1..5]; log-injection; manual |
-| 607 | Sink: org.apache.logging.log4j; Logger; true; warn; (Marker,String,Object,Object,Object,Object,Object); ; Argument[1..6]; log-injection; manual |
-| 608 | Sink: org.apache.logging.log4j; Logger; true; warn; (Marker,String,Object,Object,Object,Object,Object,Object); ; Argument[1..7]; log-injection; manual |
-| 609 | Sink: org.apache.logging.log4j; Logger; true; warn; (Marker,String,Object,Object,Object,Object,Object,Object,Object); ; Argument[1..8]; log-injection; manual |
-| 610 | Sink: org.apache.logging.log4j; Logger; true; warn; (Marker,String,Object,Object,Object,Object,Object,Object,Object,Object); ; Argument[1..9]; log-injection; manual |
-| 611 | Sink: org.apache.logging.log4j; Logger; true; warn; (Marker,String,Object,Object,Object,Object,Object,Object,Object,Object,Object); ; Argument[1..10]; log-injection; manual |
-| 612 | Sink: org.apache.logging.log4j; Logger; true; warn; (Marker,String,Object[]); ; Argument[1..2]; log-injection; manual |
-| 613 | Sink: org.apache.logging.log4j; Logger; true; warn; (Marker,String,Throwable); ; Argument[1]; log-injection; manual |
-| 614 | Sink: org.apache.logging.log4j; Logger; true; warn; (Marker,Supplier); ; Argument[1]; log-injection; manual |
-| 615 | Sink: org.apache.logging.log4j; Logger; true; warn; (Marker,Supplier,Throwable); ; Argument[1]; log-injection; manual |
-| 616 | Sink: org.apache.logging.log4j; Logger; true; warn; (Message); ; Argument[0]; log-injection; manual |
-| 617 | Sink: org.apache.logging.log4j; Logger; true; warn; (Message,Throwable); ; Argument[0]; log-injection; manual |
-| 618 | Sink: org.apache.logging.log4j; Logger; true; warn; (MessageSupplier); ; Argument[0]; log-injection; manual |
-| 619 | Sink: org.apache.logging.log4j; Logger; true; warn; (MessageSupplier,Throwable); ; Argument[0]; log-injection; manual |
-| 620 | Sink: org.apache.logging.log4j; Logger; true; warn; (Object); ; Argument[0]; log-injection; manual |
-| 621 | Sink: org.apache.logging.log4j; Logger; true; warn; (Object,Throwable); ; Argument[0]; log-injection; manual |
-| 622 | Sink: org.apache.logging.log4j; Logger; true; warn; (String); ; Argument[0]; log-injection; manual |
-| 623 | Sink: org.apache.logging.log4j; Logger; true; warn; (String,Object); ; Argument[0..1]; log-injection; manual |
-| 624 | Sink: org.apache.logging.log4j; Logger; true; warn; (String,Object,Object); ; Argument[0..2]; log-injection; manual |
-| 625 | Sink: org.apache.logging.log4j; Logger; true; warn; (String,Object,Object,Object); ; Argument[0..3]; log-injection; manual |
-| 626 | Sink: org.apache.logging.log4j; Logger; true; warn; (String,Object,Object,Object,Object); ; Argument[0..4]; log-injection; manual |
-| 627 | Sink: org.apache.logging.log4j; Logger; true; warn; (String,Object,Object,Object,Object,Object); ; Argument[0..5]; log-injection; manual |
-| 628 | Sink: org.apache.logging.log4j; Logger; true; warn; (String,Object,Object,Object,Object,Object,Object); ; Argument[0..6]; log-injection; manual |
-| 629 | Sink: org.apache.logging.log4j; Logger; true; warn; (String,Object,Object,Object,Object,Object,Object,Object); ; Argument[0..7]; log-injection; manual |
-| 630 | Sink: org.apache.logging.log4j; Logger; true; warn; (String,Object,Object,Object,Object,Object,Object,Object,Object); ; Argument[0..8]; log-injection; manual |
-| 631 | Sink: org.apache.logging.log4j; Logger; true; warn; (String,Object,Object,Object,Object,Object,Object,Object,Object,Object); ; Argument[0..9]; log-injection; manual |
-| 632 | Sink: org.apache.logging.log4j; Logger; true; warn; (String,Object[]); ; Argument[0..1]; log-injection; manual |
-| 633 | Sink: org.apache.logging.log4j; Logger; true; warn; (String,Throwable); ; Argument[0]; log-injection; manual |
-| 634 | Sink: org.apache.logging.log4j; Logger; true; warn; (Supplier); ; Argument[0]; log-injection; manual |
-| 635 | Sink: org.apache.logging.log4j; Logger; true; warn; (Supplier,Throwable); ; Argument[0]; log-injection; manual |
+| 13 | Sink: org.apache.logging.log4j; LogBuilder; true; log; (String,Object); ; Argument[0..1]; log-injection; manual |
+| 14 | Sink: org.apache.logging.log4j; LogBuilder; true; log; (String,Object); ; Argument[0..1]; log4j; manual |
+| 15 | Sink: org.apache.logging.log4j; LogBuilder; true; log; (String,Object,Object); ; Argument[0..2]; log-injection; manual |
+| 16 | Sink: org.apache.logging.log4j; LogBuilder; true; log; (String,Object,Object); ; Argument[0..2]; log4j; manual |
+| 17 | Sink: org.apache.logging.log4j; LogBuilder; true; log; (String,Object,Object,Object); ; Argument[0..3]; log-injection; manual |
+| 18 | Sink: org.apache.logging.log4j; LogBuilder; true; log; (String,Object,Object,Object); ; Argument[0..3]; log4j; manual |
+| 19 | Sink: org.apache.logging.log4j; LogBuilder; true; log; (String,Object,Object,Object,Object); ; Argument[0..4]; log-injection; manual |
+| 20 | Sink: org.apache.logging.log4j; LogBuilder; true; log; (String,Object,Object,Object,Object); ; Argument[0..4]; log4j; manual |
+| 21 | Sink: org.apache.logging.log4j; LogBuilder; true; log; (String,Object,Object,Object,Object,Object); ; Argument[0..5]; log-injection; manual |
+| 22 | Sink: org.apache.logging.log4j; LogBuilder; true; log; (String,Object,Object,Object,Object,Object); ; Argument[0..5]; log4j; manual |
+| 23 | Sink: org.apache.logging.log4j; LogBuilder; true; log; (String,Object,Object,Object,Object,Object,Object); ; Argument[0..6]; log-injection; manual |
+| 24 | Sink: org.apache.logging.log4j; LogBuilder; true; log; (String,Object,Object,Object,Object,Object,Object); ; Argument[0..6]; log4j; manual |
+| 25 | Sink: org.apache.logging.log4j; LogBuilder; true; log; (String,Object,Object,Object,Object,Object,Object,Object); ; Argument[0..7]; log-injection; manual |
+| 26 | Sink: org.apache.logging.log4j; LogBuilder; true; log; (String,Object,Object,Object,Object,Object,Object,Object); ; Argument[0..7]; log4j; manual |
+| 27 | Sink: org.apache.logging.log4j; LogBuilder; true; log; (String,Object,Object,Object,Object,Object,Object,Object,Object); ; Argument[0..8]; log-injection; manual |
+| 28 | Sink: org.apache.logging.log4j; LogBuilder; true; log; (String,Object,Object,Object,Object,Object,Object,Object,Object); ; Argument[0..8]; log4j; manual |
+| 29 | Sink: org.apache.logging.log4j; LogBuilder; true; log; (String,Object,Object,Object,Object,Object,Object,Object,Object,Object); ; Argument[0..9]; log-injection; manual |
+| 30 | Sink: org.apache.logging.log4j; LogBuilder; true; log; (String,Object,Object,Object,Object,Object,Object,Object,Object,Object); ; Argument[0..9]; log4j; manual |
+| 31 | Sink: org.apache.logging.log4j; LogBuilder; true; log; (String,Object[]); ; Argument[0..1]; log-injection; manual |
+| 32 | Sink: org.apache.logging.log4j; LogBuilder; true; log; (String,Object[]); ; Argument[0..1]; log4j; manual |
+| 33 | Sink: org.apache.logging.log4j; Logger; true; debug; (CharSequence); ; Argument[0]; log-injection; manual |
+| 34 | Sink: org.apache.logging.log4j; Logger; true; debug; (CharSequence); ; Argument[0]; log4j; manual |
+| 35 | Sink: org.apache.logging.log4j; Logger; true; debug; (CharSequence,Throwable); ; Argument[0]; log-injection; manual |
+| 36 | Sink: org.apache.logging.log4j; Logger; true; debug; (CharSequence,Throwable); ; Argument[0]; log4j; manual |
+| 37 | Sink: org.apache.logging.log4j; Logger; true; debug; (Marker,CharSequence); ; Argument[1]; log-injection; manual |
+| 38 | Sink: org.apache.logging.log4j; Logger; true; debug; (Marker,CharSequence); ; Argument[1]; log4j; manual |
+| 39 | Sink: org.apache.logging.log4j; Logger; true; debug; (Marker,CharSequence,Throwable); ; Argument[1]; log-injection; manual |
+| 40 | Sink: org.apache.logging.log4j; Logger; true; debug; (Marker,CharSequence,Throwable); ; Argument[1]; log4j; manual |
+| 41 | Sink: org.apache.logging.log4j; Logger; true; debug; (Marker,Message); ; Argument[1]; log-injection; manual |
+| 42 | Sink: org.apache.logging.log4j; Logger; true; debug; (Marker,Message); ; Argument[1]; log4j; manual |
+| 43 | Sink: org.apache.logging.log4j; Logger; true; debug; (Marker,MessageSupplier); ; Argument[1]; log-injection; manual |
+| 44 | Sink: org.apache.logging.log4j; Logger; true; debug; (Marker,MessageSupplier); ; Argument[1]; log4j; manual |
+| 45 | Sink: org.apache.logging.log4j; Logger; true; debug; (Marker,MessageSupplier,Throwable); ; Argument[1]; log-injection; manual |
+| 46 | Sink: org.apache.logging.log4j; Logger; true; debug; (Marker,MessageSupplier,Throwable); ; Argument[1]; log4j; manual |
+| 47 | Sink: org.apache.logging.log4j; Logger; true; debug; (Marker,Object); ; Argument[1]; log-injection; manual |
+| 48 | Sink: org.apache.logging.log4j; Logger; true; debug; (Marker,Object); ; Argument[1]; log4j; manual |
+| 49 | Sink: org.apache.logging.log4j; Logger; true; debug; (Marker,String); ; Argument[1]; log-injection; manual |
+| 50 | Sink: org.apache.logging.log4j; Logger; true; debug; (Marker,String); ; Argument[1]; log4j; manual |
+| 51 | Sink: org.apache.logging.log4j; Logger; true; debug; (Marker,String,Object); ; Argument[1..2]; log-injection; manual |
+| 52 | Sink: org.apache.logging.log4j; Logger; true; debug; (Marker,String,Object); ; Argument[1..2]; log4j; manual |
+| 53 | Sink: org.apache.logging.log4j; Logger; true; debug; (Marker,String,Object,Object); ; Argument[1..3]; log-injection; manual |
+| 54 | Sink: org.apache.logging.log4j; Logger; true; debug; (Marker,String,Object,Object); ; Argument[1..3]; log4j; manual |
+| 55 | Sink: org.apache.logging.log4j; Logger; true; debug; (Marker,String,Object,Object,Object); ; Argument[1..4]; log-injection; manual |
+| 56 | Sink: org.apache.logging.log4j; Logger; true; debug; (Marker,String,Object,Object,Object); ; Argument[1..4]; log4j; manual |
+| 57 | Sink: org.apache.logging.log4j; Logger; true; debug; (Marker,String,Object,Object,Object,Object); ; Argument[1..5]; log-injection; manual |
+| 58 | Sink: org.apache.logging.log4j; Logger; true; debug; (Marker,String,Object,Object,Object,Object); ; Argument[1..5]; log4j; manual |
+| 59 | Sink: org.apache.logging.log4j; Logger; true; debug; (Marker,String,Object,Object,Object,Object,Object); ; Argument[1..6]; log-injection; manual |
+| 60 | Sink: org.apache.logging.log4j; Logger; true; debug; (Marker,String,Object,Object,Object,Object,Object); ; Argument[1..6]; log4j; manual |
+| 61 | Sink: org.apache.logging.log4j; Logger; true; debug; (Marker,String,Object,Object,Object,Object,Object,Object); ; Argument[1..7]; log-injection; manual |
+| 62 | Sink: org.apache.logging.log4j; Logger; true; debug; (Marker,String,Object,Object,Object,Object,Object,Object); ; Argument[1..7]; log4j; manual |
+| 63 | Sink: org.apache.logging.log4j; Logger; true; debug; (Marker,String,Object,Object,Object,Object,Object,Object,Object); ; Argument[1..8]; log-injection; manual |
+| 64 | Sink: org.apache.logging.log4j; Logger; true; debug; (Marker,String,Object,Object,Object,Object,Object,Object,Object); ; Argument[1..8]; log4j; manual |
+| 65 | Sink: org.apache.logging.log4j; Logger; true; debug; (Marker,String,Object,Object,Object,Object,Object,Object,Object,Object); ; Argument[1..9]; log-injection; manual |
+| 66 | Sink: org.apache.logging.log4j; Logger; true; debug; (Marker,String,Object,Object,Object,Object,Object,Object,Object,Object); ; Argument[1..9]; log4j; manual |
+| 67 | Sink: org.apache.logging.log4j; Logger; true; debug; (Marker,String,Object,Object,Object,Object,Object,Object,Object,Object,Object); ; Argument[1..10]; log-injection; manual |
+| 68 | Sink: org.apache.logging.log4j; Logger; true; debug; (Marker,String,Object,Object,Object,Object,Object,Object,Object,Object,Object); ; Argument[1..10]; log4j; manual |
+| 69 | Sink: org.apache.logging.log4j; Logger; true; debug; (Marker,String,Object[]); ; Argument[1..2]; log-injection; manual |
+| 70 | Sink: org.apache.logging.log4j; Logger; true; debug; (Marker,String,Object[]); ; Argument[1..2]; log4j; manual |
+| 71 | Sink: org.apache.logging.log4j; Logger; true; debug; (Marker,String,Throwable); ; Argument[1]; log-injection; manual |
+| 72 | Sink: org.apache.logging.log4j; Logger; true; debug; (Marker,String,Throwable); ; Argument[1]; log4j; manual |
+| 73 | Sink: org.apache.logging.log4j; Logger; true; debug; (Marker,Supplier); ; Argument[1]; log-injection; manual |
+| 74 | Sink: org.apache.logging.log4j; Logger; true; debug; (Marker,Supplier); ; Argument[1]; log4j; manual |
+| 75 | Sink: org.apache.logging.log4j; Logger; true; debug; (Marker,Supplier,Throwable); ; Argument[1]; log-injection; manual |
+| 76 | Sink: org.apache.logging.log4j; Logger; true; debug; (Marker,Supplier,Throwable); ; Argument[1]; log4j; manual |
+| 77 | Sink: org.apache.logging.log4j; Logger; true; debug; (Message); ; Argument[0]; log-injection; manual |
+| 78 | Sink: org.apache.logging.log4j; Logger; true; debug; (Message); ; Argument[0]; log4j; manual |
+| 79 | Sink: org.apache.logging.log4j; Logger; true; debug; (Message,Throwable); ; Argument[0]; log-injection; manual |
+| 80 | Sink: org.apache.logging.log4j; Logger; true; debug; (Message,Throwable); ; Argument[0]; log4j; manual |
+| 81 | Sink: org.apache.logging.log4j; Logger; true; debug; (MessageSupplier); ; Argument[0]; log-injection; manual |
+| 82 | Sink: org.apache.logging.log4j; Logger; true; debug; (MessageSupplier); ; Argument[0]; log4j; manual |
+| 83 | Sink: org.apache.logging.log4j; Logger; true; debug; (MessageSupplier,Throwable); ; Argument[0]; log-injection; manual |
+| 84 | Sink: org.apache.logging.log4j; Logger; true; debug; (MessageSupplier,Throwable); ; Argument[0]; log4j; manual |
+| 85 | Sink: org.apache.logging.log4j; Logger; true; debug; (Object); ; Argument[0]; log-injection; manual |
+| 86 | Sink: org.apache.logging.log4j; Logger; true; debug; (Object); ; Argument[0]; log4j; manual |
+| 87 | Sink: org.apache.logging.log4j; Logger; true; debug; (Object,Throwable); ; Argument[0]; log-injection; manual |
+| 88 | Sink: org.apache.logging.log4j; Logger; true; debug; (Object,Throwable); ; Argument[0]; log4j; manual |
+| 89 | Sink: org.apache.logging.log4j; Logger; true; debug; (String); ; Argument[0]; log-injection; manual |
+| 90 | Sink: org.apache.logging.log4j; Logger; true; debug; (String); ; Argument[0]; log4j; manual |
+| 91 | Sink: org.apache.logging.log4j; Logger; true; debug; (String,Object); ; Argument[0..1]; log-injection; manual |
+| 92 | Sink: org.apache.logging.log4j; Logger; true; debug; (String,Object); ; Argument[0..1]; log4j; manual |
+| 93 | Sink: org.apache.logging.log4j; Logger; true; debug; (String,Object,Object); ; Argument[0..2]; log-injection; manual |
+| 94 | Sink: org.apache.logging.log4j; Logger; true; debug; (String,Object,Object); ; Argument[0..2]; log4j; manual |
+| 95 | Sink: org.apache.logging.log4j; Logger; true; debug; (String,Object,Object,Object); ; Argument[0..3]; log-injection; manual |
+| 96 | Sink: org.apache.logging.log4j; Logger; true; debug; (String,Object,Object,Object); ; Argument[0..3]; log4j; manual |
+| 97 | Sink: org.apache.logging.log4j; Logger; true; debug; (String,Object,Object,Object,Object); ; Argument[0..4]; log-injection; manual |
+| 98 | Sink: org.apache.logging.log4j; Logger; true; debug; (String,Object,Object,Object,Object); ; Argument[0..4]; log4j; manual |
+| 99 | Sink: org.apache.logging.log4j; Logger; true; debug; (String,Object,Object,Object,Object,Object); ; Argument[0..5]; log-injection; manual |
+| 100 | Sink: org.apache.logging.log4j; Logger; true; debug; (String,Object,Object,Object,Object,Object); ; Argument[0..5]; log4j; manual |
+| 101 | Sink: org.apache.logging.log4j; Logger; true; debug; (String,Object,Object,Object,Object,Object,Object); ; Argument[0..6]; log-injection; manual |
+| 102 | Sink: org.apache.logging.log4j; Logger; true; debug; (String,Object,Object,Object,Object,Object,Object); ; Argument[0..6]; log4j; manual |
+| 103 | Sink: org.apache.logging.log4j; Logger; true; debug; (String,Object,Object,Object,Object,Object,Object,Object); ; Argument[0..7]; log-injection; manual |
+| 104 | Sink: org.apache.logging.log4j; Logger; true; debug; (String,Object,Object,Object,Object,Object,Object,Object); ; Argument[0..7]; log4j; manual |
+| 105 | Sink: org.apache.logging.log4j; Logger; true; debug; (String,Object,Object,Object,Object,Object,Object,Object,Object); ; Argument[0..8]; log-injection; manual |
+| 106 | Sink: org.apache.logging.log4j; Logger; true; debug; (String,Object,Object,Object,Object,Object,Object,Object,Object); ; Argument[0..8]; log4j; manual |
+| 107 | Sink: org.apache.logging.log4j; Logger; true; debug; (String,Object,Object,Object,Object,Object,Object,Object,Object,Object); ; Argument[0..9]; log-injection; manual |
+| 108 | Sink: org.apache.logging.log4j; Logger; true; debug; (String,Object,Object,Object,Object,Object,Object,Object,Object,Object); ; Argument[0..9]; log4j; manual |
+| 109 | Sink: org.apache.logging.log4j; Logger; true; debug; (String,Object[]); ; Argument[0..1]; log-injection; manual |
+| 110 | Sink: org.apache.logging.log4j; Logger; true; debug; (String,Object[]); ; Argument[0..1]; log4j; manual |
+| 111 | Sink: org.apache.logging.log4j; Logger; true; debug; (String,Throwable); ; Argument[0]; log-injection; manual |
+| 112 | Sink: org.apache.logging.log4j; Logger; true; debug; (String,Throwable); ; Argument[0]; log4j; manual |
+| 113 | Sink: org.apache.logging.log4j; Logger; true; debug; (Supplier); ; Argument[0]; log-injection; manual |
+| 114 | Sink: org.apache.logging.log4j; Logger; true; debug; (Supplier); ; Argument[0]; log4j; manual |
+| 115 | Sink: org.apache.logging.log4j; Logger; true; debug; (Supplier,Throwable); ; Argument[0]; log-injection; manual |
+| 116 | Sink: org.apache.logging.log4j; Logger; true; debug; (Supplier,Throwable); ; Argument[0]; log4j; manual |
+| 117 | Sink: org.apache.logging.log4j; Logger; true; error; (CharSequence); ; Argument[0]; log-injection; manual |
+| 118 | Sink: org.apache.logging.log4j; Logger; true; error; (CharSequence); ; Argument[0]; log4j; manual |
+| 119 | Sink: org.apache.logging.log4j; Logger; true; error; (CharSequence,Throwable); ; Argument[0]; log-injection; manual |
+| 120 | Sink: org.apache.logging.log4j; Logger; true; error; (CharSequence,Throwable); ; Argument[0]; log4j; manual |
+| 121 | Sink: org.apache.logging.log4j; Logger; true; error; (Marker,CharSequence); ; Argument[1]; log-injection; manual |
+| 122 | Sink: org.apache.logging.log4j; Logger; true; error; (Marker,CharSequence); ; Argument[1]; log4j; manual |
+| 123 | Sink: org.apache.logging.log4j; Logger; true; error; (Marker,CharSequence,Throwable); ; Argument[1]; log-injection; manual |
+| 124 | Sink: org.apache.logging.log4j; Logger; true; error; (Marker,CharSequence,Throwable); ; Argument[1]; log4j; manual |
+| 125 | Sink: org.apache.logging.log4j; Logger; true; error; (Marker,Message); ; Argument[1]; log-injection; manual |
+| 126 | Sink: org.apache.logging.log4j; Logger; true; error; (Marker,Message); ; Argument[1]; log4j; manual |
+| 127 | Sink: org.apache.logging.log4j; Logger; true; error; (Marker,MessageSupplier); ; Argument[1]; log-injection; manual |
+| 128 | Sink: org.apache.logging.log4j; Logger; true; error; (Marker,MessageSupplier); ; Argument[1]; log4j; manual |
+| 129 | Sink: org.apache.logging.log4j; Logger; true; error; (Marker,MessageSupplier,Throwable); ; Argument[1]; log-injection; manual |
+| 130 | Sink: org.apache.logging.log4j; Logger; true; error; (Marker,MessageSupplier,Throwable); ; Argument[1]; log4j; manual |
+| 131 | Sink: org.apache.logging.log4j; Logger; true; error; (Marker,Object); ; Argument[1]; log-injection; manual |
+| 132 | Sink: org.apache.logging.log4j; Logger; true; error; (Marker,Object); ; Argument[1]; log4j; manual |
+| 133 | Sink: org.apache.logging.log4j; Logger; true; error; (Marker,String); ; Argument[1]; log-injection; manual |
+| 134 | Sink: org.apache.logging.log4j; Logger; true; error; (Marker,String); ; Argument[1]; log4j; manual |
+| 135 | Sink: org.apache.logging.log4j; Logger; true; error; (Marker,String,Object); ; Argument[1..2]; log-injection; manual |
+| 136 | Sink: org.apache.logging.log4j; Logger; true; error; (Marker,String,Object); ; Argument[1..2]; log4j; manual |
+| 137 | Sink: org.apache.logging.log4j; Logger; true; error; (Marker,String,Object,Object); ; Argument[1..3]; log-injection; manual |
+| 138 | Sink: org.apache.logging.log4j; Logger; true; error; (Marker,String,Object,Object); ; Argument[1..3]; log4j; manual |
+| 139 | Sink: org.apache.logging.log4j; Logger; true; error; (Marker,String,Object,Object,Object); ; Argument[1..4]; log-injection; manual |
+| 140 | Sink: org.apache.logging.log4j; Logger; true; error; (Marker,String,Object,Object,Object); ; Argument[1..4]; log4j; manual |
+| 141 | Sink: org.apache.logging.log4j; Logger; true; error; (Marker,String,Object,Object,Object,Object); ; Argument[1..5]; log-injection; manual |
+| 142 | Sink: org.apache.logging.log4j; Logger; true; error; (Marker,String,Object,Object,Object,Object); ; Argument[1..5]; log4j; manual |
+| 143 | Sink: org.apache.logging.log4j; Logger; true; error; (Marker,String,Object,Object,Object,Object,Object); ; Argument[1..6]; log-injection; manual |
+| 144 | Sink: org.apache.logging.log4j; Logger; true; error; (Marker,String,Object,Object,Object,Object,Object); ; Argument[1..6]; log4j; manual |
+| 145 | Sink: org.apache.logging.log4j; Logger; true; error; (Marker,String,Object,Object,Object,Object,Object,Object); ; Argument[1..7]; log-injection; manual |
+| 146 | Sink: org.apache.logging.log4j; Logger; true; error; (Marker,String,Object,Object,Object,Object,Object,Object); ; Argument[1..7]; log4j; manual |
+| 147 | Sink: org.apache.logging.log4j; Logger; true; error; (Marker,String,Object,Object,Object,Object,Object,Object,Object); ; Argument[1..8]; log-injection; manual |
+| 148 | Sink: org.apache.logging.log4j; Logger; true; error; (Marker,String,Object,Object,Object,Object,Object,Object,Object); ; Argument[1..8]; log4j; manual |
+| 149 | Sink: org.apache.logging.log4j; Logger; true; error; (Marker,String,Object,Object,Object,Object,Object,Object,Object,Object); ; Argument[1..9]; log-injection; manual |
+| 150 | Sink: org.apache.logging.log4j; Logger; true; error; (Marker,String,Object,Object,Object,Object,Object,Object,Object,Object); ; Argument[1..9]; log4j; manual |
+| 151 | Sink: org.apache.logging.log4j; Logger; true; error; (Marker,String,Object,Object,Object,Object,Object,Object,Object,Object,Object); ; Argument[1..10]; log-injection; manual |
+| 152 | Sink: org.apache.logging.log4j; Logger; true; error; (Marker,String,Object,Object,Object,Object,Object,Object,Object,Object,Object); ; Argument[1..10]; log4j; manual |
+| 153 | Sink: org.apache.logging.log4j; Logger; true; error; (Marker,String,Object[]); ; Argument[1..2]; log-injection; manual |
+| 154 | Sink: org.apache.logging.log4j; Logger; true; error; (Marker,String,Object[]); ; Argument[1..2]; log4j; manual |
+| 155 | Sink: org.apache.logging.log4j; Logger; true; error; (Marker,String,Throwable); ; Argument[1]; log-injection; manual |
+| 156 | Sink: org.apache.logging.log4j; Logger; true; error; (Marker,String,Throwable); ; Argument[1]; log4j; manual |
+| 157 | Sink: org.apache.logging.log4j; Logger; true; error; (Marker,Supplier); ; Argument[1]; log-injection; manual |
+| 158 | Sink: org.apache.logging.log4j; Logger; true; error; (Marker,Supplier); ; Argument[1]; log4j; manual |
+| 159 | Sink: org.apache.logging.log4j; Logger; true; error; (Marker,Supplier,Throwable); ; Argument[1]; log-injection; manual |
+| 160 | Sink: org.apache.logging.log4j; Logger; true; error; (Marker,Supplier,Throwable); ; Argument[1]; log4j; manual |
+| 161 | Sink: org.apache.logging.log4j; Logger; true; error; (Message); ; Argument[0]; log-injection; manual |
+| 162 | Sink: org.apache.logging.log4j; Logger; true; error; (Message); ; Argument[0]; log4j; manual |
+| 163 | Sink: org.apache.logging.log4j; Logger; true; error; (Message,Throwable); ; Argument[0]; log-injection; manual |
+| 164 | Sink: org.apache.logging.log4j; Logger; true; error; (Message,Throwable); ; Argument[0]; log4j; manual |
+| 165 | Sink: org.apache.logging.log4j; Logger; true; error; (MessageSupplier); ; Argument[0]; log-injection; manual |
+| 166 | Sink: org.apache.logging.log4j; Logger; true; error; (MessageSupplier); ; Argument[0]; log4j; manual |
+| 167 | Sink: org.apache.logging.log4j; Logger; true; error; (MessageSupplier,Throwable); ; Argument[0]; log-injection; manual |
+| 168 | Sink: org.apache.logging.log4j; Logger; true; error; (MessageSupplier,Throwable); ; Argument[0]; log4j; manual |
+| 169 | Sink: org.apache.logging.log4j; Logger; true; error; (Object); ; Argument[0]; log-injection; manual |
+| 170 | Sink: org.apache.logging.log4j; Logger; true; error; (Object); ; Argument[0]; log4j; manual |
+| 171 | Sink: org.apache.logging.log4j; Logger; true; error; (Object,Throwable); ; Argument[0]; log-injection; manual |
+| 172 | Sink: org.apache.logging.log4j; Logger; true; error; (Object,Throwable); ; Argument[0]; log4j; manual |
+| 173 | Sink: org.apache.logging.log4j; Logger; true; error; (String); ; Argument[0]; log-injection; manual |
+| 174 | Sink: org.apache.logging.log4j; Logger; true; error; (String); ; Argument[0]; log4j; manual |
+| 175 | Sink: org.apache.logging.log4j; Logger; true; error; (String,Object); ; Argument[0..1]; log-injection; manual |
+| 176 | Sink: org.apache.logging.log4j; Logger; true; error; (String,Object); ; Argument[0..1]; log4j; manual |
+| 177 | Sink: org.apache.logging.log4j; Logger; true; error; (String,Object,Object); ; Argument[0..2]; log-injection; manual |
+| 178 | Sink: org.apache.logging.log4j; Logger; true; error; (String,Object,Object); ; Argument[0..2]; log4j; manual |
+| 179 | Sink: org.apache.logging.log4j; Logger; true; error; (String,Object,Object,Object); ; Argument[0..3]; log-injection; manual |
+| 180 | Sink: org.apache.logging.log4j; Logger; true; error; (String,Object,Object,Object); ; Argument[0..3]; log4j; manual |
+| 181 | Sink: org.apache.logging.log4j; Logger; true; error; (String,Object,Object,Object,Object); ; Argument[0..4]; log-injection; manual |
+| 182 | Sink: org.apache.logging.log4j; Logger; true; error; (String,Object,Object,Object,Object); ; Argument[0..4]; log4j; manual |
+| 183 | Sink: org.apache.logging.log4j; Logger; true; error; (String,Object,Object,Object,Object,Object); ; Argument[0..5]; log-injection; manual |
+| 184 | Sink: org.apache.logging.log4j; Logger; true; error; (String,Object,Object,Object,Object,Object); ; Argument[0..5]; log4j; manual |
+| 185 | Sink: org.apache.logging.log4j; Logger; true; error; (String,Object,Object,Object,Object,Object,Object); ; Argument[0..6]; log-injection; manual |
+| 186 | Sink: org.apache.logging.log4j; Logger; true; error; (String,Object,Object,Object,Object,Object,Object); ; Argument[0..6]; log4j; manual |
+| 187 | Sink: org.apache.logging.log4j; Logger; true; error; (String,Object,Object,Object,Object,Object,Object,Object); ; Argument[0..7]; log-injection; manual |
+| 188 | Sink: org.apache.logging.log4j; Logger; true; error; (String,Object,Object,Object,Object,Object,Object,Object); ; Argument[0..7]; log4j; manual |
+| 189 | Sink: org.apache.logging.log4j; Logger; true; error; (String,Object,Object,Object,Object,Object,Object,Object,Object); ; Argument[0..8]; log-injection; manual |
+| 190 | Sink: org.apache.logging.log4j; Logger; true; error; (String,Object,Object,Object,Object,Object,Object,Object,Object); ; Argument[0..8]; log4j; manual |
+| 191 | Sink: org.apache.logging.log4j; Logger; true; error; (String,Object,Object,Object,Object,Object,Object,Object,Object,Object); ; Argument[0..9]; log-injection; manual |
+| 192 | Sink: org.apache.logging.log4j; Logger; true; error; (String,Object,Object,Object,Object,Object,Object,Object,Object,Object); ; Argument[0..9]; log4j; manual |
+| 193 | Sink: org.apache.logging.log4j; Logger; true; error; (String,Object[]); ; Argument[0..1]; log-injection; manual |
+| 194 | Sink: org.apache.logging.log4j; Logger; true; error; (String,Object[]); ; Argument[0..1]; log4j; manual |
+| 195 | Sink: org.apache.logging.log4j; Logger; true; error; (String,Throwable); ; Argument[0]; log-injection; manual |
+| 196 | Sink: org.apache.logging.log4j; Logger; true; error; (String,Throwable); ; Argument[0]; log4j; manual |
+| 197 | Sink: org.apache.logging.log4j; Logger; true; error; (Supplier); ; Argument[0]; log-injection; manual |
+| 198 | Sink: org.apache.logging.log4j; Logger; true; error; (Supplier); ; Argument[0]; log4j; manual |
+| 199 | Sink: org.apache.logging.log4j; Logger; true; error; (Supplier,Throwable); ; Argument[0]; log-injection; manual |
+| 200 | Sink: org.apache.logging.log4j; Logger; true; error; (Supplier,Throwable); ; Argument[0]; log4j; manual |
+| 201 | Sink: org.apache.logging.log4j; Logger; true; fatal; (CharSequence); ; Argument[0]; log-injection; manual |
+| 202 | Sink: org.apache.logging.log4j; Logger; true; fatal; (CharSequence); ; Argument[0]; log4j; manual |
+| 203 | Sink: org.apache.logging.log4j; Logger; true; fatal; (CharSequence,Throwable); ; Argument[0]; log-injection; manual |
+| 204 | Sink: org.apache.logging.log4j; Logger; true; fatal; (CharSequence,Throwable); ; Argument[0]; log4j; manual |
+| 205 | Sink: org.apache.logging.log4j; Logger; true; fatal; (Marker,CharSequence); ; Argument[1]; log-injection; manual |
+| 206 | Sink: org.apache.logging.log4j; Logger; true; fatal; (Marker,CharSequence); ; Argument[1]; log4j; manual |
+| 207 | Sink: org.apache.logging.log4j; Logger; true; fatal; (Marker,CharSequence,Throwable); ; Argument[1]; log-injection; manual |
+| 208 | Sink: org.apache.logging.log4j; Logger; true; fatal; (Marker,CharSequence,Throwable); ; Argument[1]; log4j; manual |
+| 209 | Sink: org.apache.logging.log4j; Logger; true; fatal; (Marker,Message); ; Argument[1]; log-injection; manual |
+| 210 | Sink: org.apache.logging.log4j; Logger; true; fatal; (Marker,Message); ; Argument[1]; log4j; manual |
+| 211 | Sink: org.apache.logging.log4j; Logger; true; fatal; (Marker,MessageSupplier); ; Argument[1]; log-injection; manual |
+| 212 | Sink: org.apache.logging.log4j; Logger; true; fatal; (Marker,MessageSupplier); ; Argument[1]; log4j; manual |
+| 213 | Sink: org.apache.logging.log4j; Logger; true; fatal; (Marker,MessageSupplier,Throwable); ; Argument[1]; log-injection; manual |
+| 214 | Sink: org.apache.logging.log4j; Logger; true; fatal; (Marker,MessageSupplier,Throwable); ; Argument[1]; log4j; manual |
+| 215 | Sink: org.apache.logging.log4j; Logger; true; fatal; (Marker,Object); ; Argument[1]; log-injection; manual |
+| 216 | Sink: org.apache.logging.log4j; Logger; true; fatal; (Marker,Object); ; Argument[1]; log4j; manual |
+| 217 | Sink: org.apache.logging.log4j; Logger; true; fatal; (Marker,String); ; Argument[1]; log-injection; manual |
+| 218 | Sink: org.apache.logging.log4j; Logger; true; fatal; (Marker,String); ; Argument[1]; log4j; manual |
+| 219 | Sink: org.apache.logging.log4j; Logger; true; fatal; (Marker,String,Object); ; Argument[1..2]; log-injection; manual |
+| 220 | Sink: org.apache.logging.log4j; Logger; true; fatal; (Marker,String,Object); ; Argument[1..2]; log4j; manual |
+| 221 | Sink: org.apache.logging.log4j; Logger; true; fatal; (Marker,String,Object,Object); ; Argument[1..3]; log-injection; manual |
+| 222 | Sink: org.apache.logging.log4j; Logger; true; fatal; (Marker,String,Object,Object); ; Argument[1..3]; log4j; manual |
+| 223 | Sink: org.apache.logging.log4j; Logger; true; fatal; (Marker,String,Object,Object,Object); ; Argument[1..4]; log-injection; manual |
+| 224 | Sink: org.apache.logging.log4j; Logger; true; fatal; (Marker,String,Object,Object,Object); ; Argument[1..4]; log4j; manual |
+| 225 | Sink: org.apache.logging.log4j; Logger; true; fatal; (Marker,String,Object,Object,Object,Object); ; Argument[1..5]; log-injection; manual |
+| 226 | Sink: org.apache.logging.log4j; Logger; true; fatal; (Marker,String,Object,Object,Object,Object); ; Argument[1..5]; log4j; manual |
+| 227 | Sink: org.apache.logging.log4j; Logger; true; fatal; (Marker,String,Object,Object,Object,Object,Object); ; Argument[1..6]; log-injection; manual |
+| 228 | Sink: org.apache.logging.log4j; Logger; true; fatal; (Marker,String,Object,Object,Object,Object,Object); ; Argument[1..6]; log4j; manual |
+| 229 | Sink: org.apache.logging.log4j; Logger; true; fatal; (Marker,String,Object,Object,Object,Object,Object,Object); ; Argument[1..7]; log-injection; manual |
+| 230 | Sink: org.apache.logging.log4j; Logger; true; fatal; (Marker,String,Object,Object,Object,Object,Object,Object); ; Argument[1..7]; log4j; manual |
+| 231 | Sink: org.apache.logging.log4j; Logger; true; fatal; (Marker,String,Object,Object,Object,Object,Object,Object,Object); ; Argument[1..8]; log-injection; manual |
+| 232 | Sink: org.apache.logging.log4j; Logger; true; fatal; (Marker,String,Object,Object,Object,Object,Object,Object,Object); ; Argument[1..8]; log4j; manual |
+| 233 | Sink: org.apache.logging.log4j; Logger; true; fatal; (Marker,String,Object,Object,Object,Object,Object,Object,Object,Object); ; Argument[1..9]; log-injection; manual |
+| 234 | Sink: org.apache.logging.log4j; Logger; true; fatal; (Marker,String,Object,Object,Object,Object,Object,Object,Object,Object); ; Argument[1..9]; log4j; manual |
+| 235 | Sink: org.apache.logging.log4j; Logger; true; fatal; (Marker,String,Object,Object,Object,Object,Object,Object,Object,Object,Object); ; Argument[1..10]; log-injection; manual |
+| 236 | Sink: org.apache.logging.log4j; Logger; true; fatal; (Marker,String,Object,Object,Object,Object,Object,Object,Object,Object,Object); ; Argument[1..10]; log4j; manual |
+| 237 | Sink: org.apache.logging.log4j; Logger; true; fatal; (Marker,String,Object[]); ; Argument[1..2]; log-injection; manual |
+| 238 | Sink: org.apache.logging.log4j; Logger; true; fatal; (Marker,String,Object[]); ; Argument[1..2]; log4j; manual |
+| 239 | Sink: org.apache.logging.log4j; Logger; true; fatal; (Marker,String,Throwable); ; Argument[1]; log-injection; manual |
+| 240 | Sink: org.apache.logging.log4j; Logger; true; fatal; (Marker,String,Throwable); ; Argument[1]; log4j; manual |
+| 241 | Sink: org.apache.logging.log4j; Logger; true; fatal; (Marker,Supplier); ; Argument[1]; log-injection; manual |
+| 242 | Sink: org.apache.logging.log4j; Logger; true; fatal; (Marker,Supplier); ; Argument[1]; log4j; manual |
+| 243 | Sink: org.apache.logging.log4j; Logger; true; fatal; (Marker,Supplier,Throwable); ; Argument[1]; log-injection; manual |
+| 244 | Sink: org.apache.logging.log4j; Logger; true; fatal; (Marker,Supplier,Throwable); ; Argument[1]; log4j; manual |
+| 245 | Sink: org.apache.logging.log4j; Logger; true; fatal; (Message); ; Argument[0]; log-injection; manual |
+| 246 | Sink: org.apache.logging.log4j; Logger; true; fatal; (Message); ; Argument[0]; log4j; manual |
+| 247 | Sink: org.apache.logging.log4j; Logger; true; fatal; (Message,Throwable); ; Argument[0]; log-injection; manual |
+| 248 | Sink: org.apache.logging.log4j; Logger; true; fatal; (Message,Throwable); ; Argument[0]; log4j; manual |
+| 249 | Sink: org.apache.logging.log4j; Logger; true; fatal; (MessageSupplier); ; Argument[0]; log-injection; manual |
+| 250 | Sink: org.apache.logging.log4j; Logger; true; fatal; (MessageSupplier); ; Argument[0]; log4j; manual |
+| 251 | Sink: org.apache.logging.log4j; Logger; true; fatal; (MessageSupplier,Throwable); ; Argument[0]; log-injection; manual |
+| 252 | Sink: org.apache.logging.log4j; Logger; true; fatal; (MessageSupplier,Throwable); ; Argument[0]; log4j; manual |
+| 253 | Sink: org.apache.logging.log4j; Logger; true; fatal; (Object); ; Argument[0]; log-injection; manual |
+| 254 | Sink: org.apache.logging.log4j; Logger; true; fatal; (Object); ; Argument[0]; log4j; manual |
+| 255 | Sink: org.apache.logging.log4j; Logger; true; fatal; (Object,Throwable); ; Argument[0]; log-injection; manual |
+| 256 | Sink: org.apache.logging.log4j; Logger; true; fatal; (Object,Throwable); ; Argument[0]; log4j; manual |
+| 257 | Sink: org.apache.logging.log4j; Logger; true; fatal; (String); ; Argument[0]; log-injection; manual |
+| 258 | Sink: org.apache.logging.log4j; Logger; true; fatal; (String); ; Argument[0]; log4j; manual |
+| 259 | Sink: org.apache.logging.log4j; Logger; true; fatal; (String,Object); ; Argument[0..1]; log-injection; manual |
+| 260 | Sink: org.apache.logging.log4j; Logger; true; fatal; (String,Object); ; Argument[0..1]; log4j; manual |
+| 261 | Sink: org.apache.logging.log4j; Logger; true; fatal; (String,Object,Object); ; Argument[0..2]; log-injection; manual |
+| 262 | Sink: org.apache.logging.log4j; Logger; true; fatal; (String,Object,Object); ; Argument[0..2]; log4j; manual |
+| 263 | Sink: org.apache.logging.log4j; Logger; true; fatal; (String,Object,Object,Object); ; Argument[0..3]; log-injection; manual |
+| 264 | Sink: org.apache.logging.log4j; Logger; true; fatal; (String,Object,Object,Object); ; Argument[0..3]; log4j; manual |
+| 265 | Sink: org.apache.logging.log4j; Logger; true; fatal; (String,Object,Object,Object,Object); ; Argument[0..4]; log-injection; manual |
+| 266 | Sink: org.apache.logging.log4j; Logger; true; fatal; (String,Object,Object,Object,Object); ; Argument[0..4]; log4j; manual |
+| 267 | Sink: org.apache.logging.log4j; Logger; true; fatal; (String,Object,Object,Object,Object,Object); ; Argument[0..5]; log-injection; manual |
+| 268 | Sink: org.apache.logging.log4j; Logger; true; fatal; (String,Object,Object,Object,Object,Object); ; Argument[0..5]; log4j; manual |
+| 269 | Sink: org.apache.logging.log4j; Logger; true; fatal; (String,Object,Object,Object,Object,Object,Object); ; Argument[0..6]; log-injection; manual |
+| 270 | Sink: org.apache.logging.log4j; Logger; true; fatal; (String,Object,Object,Object,Object,Object,Object); ; Argument[0..6]; log4j; manual |
+| 271 | Sink: org.apache.logging.log4j; Logger; true; fatal; (String,Object,Object,Object,Object,Object,Object,Object); ; Argument[0..7]; log-injection; manual |
+| 272 | Sink: org.apache.logging.log4j; Logger; true; fatal; (String,Object,Object,Object,Object,Object,Object,Object); ; Argument[0..7]; log4j; manual |
+| 273 | Sink: org.apache.logging.log4j; Logger; true; fatal; (String,Object,Object,Object,Object,Object,Object,Object,Object); ; Argument[0..8]; log-injection; manual |
+| 274 | Sink: org.apache.logging.log4j; Logger; true; fatal; (String,Object,Object,Object,Object,Object,Object,Object,Object); ; Argument[0..8]; log4j; manual |
+| 275 | Sink: org.apache.logging.log4j; Logger; true; fatal; (String,Object,Object,Object,Object,Object,Object,Object,Object,Object); ; Argument[0..9]; log-injection; manual |
+| 276 | Sink: org.apache.logging.log4j; Logger; true; fatal; (String,Object,Object,Object,Object,Object,Object,Object,Object,Object); ; Argument[0..9]; log4j; manual |
+| 277 | Sink: org.apache.logging.log4j; Logger; true; fatal; (String,Object[]); ; Argument[0..1]; log-injection; manual |
+| 278 | Sink: org.apache.logging.log4j; Logger; true; fatal; (String,Object[]); ; Argument[0..1]; log4j; manual |
+| 279 | Sink: org.apache.logging.log4j; Logger; true; fatal; (String,Throwable); ; Argument[0]; log-injection; manual |
+| 280 | Sink: org.apache.logging.log4j; Logger; true; fatal; (String,Throwable); ; Argument[0]; log4j; manual |
+| 281 | Sink: org.apache.logging.log4j; Logger; true; fatal; (Supplier); ; Argument[0]; log-injection; manual |
+| 282 | Sink: org.apache.logging.log4j; Logger; true; fatal; (Supplier); ; Argument[0]; log4j; manual |
+| 283 | Sink: org.apache.logging.log4j; Logger; true; fatal; (Supplier,Throwable); ; Argument[0]; log-injection; manual |
+| 284 | Sink: org.apache.logging.log4j; Logger; true; fatal; (Supplier,Throwable); ; Argument[0]; log4j; manual |
+| 285 | Sink: org.apache.logging.log4j; Logger; true; info; (CharSequence); ; Argument[0]; log-injection; manual |
+| 286 | Sink: org.apache.logging.log4j; Logger; true; info; (CharSequence); ; Argument[0]; log4j; manual |
+| 287 | Sink: org.apache.logging.log4j; Logger; true; info; (CharSequence,Throwable); ; Argument[0]; log-injection; manual |
+| 288 | Sink: org.apache.logging.log4j; Logger; true; info; (CharSequence,Throwable); ; Argument[0]; log4j; manual |
+| 289 | Sink: org.apache.logging.log4j; Logger; true; info; (Marker,CharSequence); ; Argument[1]; log-injection; manual |
+| 290 | Sink: org.apache.logging.log4j; Logger; true; info; (Marker,CharSequence); ; Argument[1]; log4j; manual |
+| 291 | Sink: org.apache.logging.log4j; Logger; true; info; (Marker,CharSequence,Throwable); ; Argument[1]; log-injection; manual |
+| 292 | Sink: org.apache.logging.log4j; Logger; true; info; (Marker,CharSequence,Throwable); ; Argument[1]; log4j; manual |
+| 293 | Sink: org.apache.logging.log4j; Logger; true; info; (Marker,Message); ; Argument[1]; log-injection; manual |
+| 294 | Sink: org.apache.logging.log4j; Logger; true; info; (Marker,Message); ; Argument[1]; log4j; manual |
+| 295 | Sink: org.apache.logging.log4j; Logger; true; info; (Marker,MessageSupplier); ; Argument[1]; log-injection; manual |
+| 296 | Sink: org.apache.logging.log4j; Logger; true; info; (Marker,MessageSupplier); ; Argument[1]; log4j; manual |
+| 297 | Sink: org.apache.logging.log4j; Logger; true; info; (Marker,MessageSupplier,Throwable); ; Argument[1]; log-injection; manual |
+| 298 | Sink: org.apache.logging.log4j; Logger; true; info; (Marker,MessageSupplier,Throwable); ; Argument[1]; log4j; manual |
+| 299 | Sink: org.apache.logging.log4j; Logger; true; info; (Marker,Object); ; Argument[1]; log-injection; manual |
+| 300 | Sink: org.apache.logging.log4j; Logger; true; info; (Marker,Object); ; Argument[1]; log4j; manual |
+| 301 | Sink: org.apache.logging.log4j; Logger; true; info; (Marker,String); ; Argument[1]; log-injection; manual |
+| 302 | Sink: org.apache.logging.log4j; Logger; true; info; (Marker,String); ; Argument[1]; log4j; manual |
+| 303 | Sink: org.apache.logging.log4j; Logger; true; info; (Marker,String,Object); ; Argument[1..2]; log-injection; manual |
+| 304 | Sink: org.apache.logging.log4j; Logger; true; info; (Marker,String,Object); ; Argument[1..2]; log4j; manual |
+| 305 | Sink: org.apache.logging.log4j; Logger; true; info; (Marker,String,Object,Object); ; Argument[1..3]; log-injection; manual |
+| 306 | Sink: org.apache.logging.log4j; Logger; true; info; (Marker,String,Object,Object); ; Argument[1..3]; log4j; manual |
+| 307 | Sink: org.apache.logging.log4j; Logger; true; info; (Marker,String,Object,Object,Object); ; Argument[1..4]; log-injection; manual |
+| 308 | Sink: org.apache.logging.log4j; Logger; true; info; (Marker,String,Object,Object,Object); ; Argument[1..4]; log4j; manual |
+| 309 | Sink: org.apache.logging.log4j; Logger; true; info; (Marker,String,Object,Object,Object,Object); ; Argument[1..5]; log-injection; manual |
+| 310 | Sink: org.apache.logging.log4j; Logger; true; info; (Marker,String,Object,Object,Object,Object); ; Argument[1..5]; log4j; manual |
+| 311 | Sink: org.apache.logging.log4j; Logger; true; info; (Marker,String,Object,Object,Object,Object,Object); ; Argument[1..6]; log-injection; manual |
+| 312 | Sink: org.apache.logging.log4j; Logger; true; info; (Marker,String,Object,Object,Object,Object,Object); ; Argument[1..6]; log4j; manual |
+| 313 | Sink: org.apache.logging.log4j; Logger; true; info; (Marker,String,Object,Object,Object,Object,Object,Object); ; Argument[1..7]; log-injection; manual |
+| 314 | Sink: org.apache.logging.log4j; Logger; true; info; (Marker,String,Object,Object,Object,Object,Object,Object); ; Argument[1..7]; log4j; manual |
+| 315 | Sink: org.apache.logging.log4j; Logger; true; info; (Marker,String,Object,Object,Object,Object,Object,Object,Object); ; Argument[1..8]; log-injection; manual |
+| 316 | Sink: org.apache.logging.log4j; Logger; true; info; (Marker,String,Object,Object,Object,Object,Object,Object,Object); ; Argument[1..8]; log4j; manual |
+| 317 | Sink: org.apache.logging.log4j; Logger; true; info; (Marker,String,Object,Object,Object,Object,Object,Object,Object,Object); ; Argument[1..9]; log-injection; manual |
+| 318 | Sink: org.apache.logging.log4j; Logger; true; info; (Marker,String,Object,Object,Object,Object,Object,Object,Object,Object); ; Argument[1..9]; log4j; manual |
+| 319 | Sink: org.apache.logging.log4j; Logger; true; info; (Marker,String,Object,Object,Object,Object,Object,Object,Object,Object,Object); ; Argument[1..10]; log-injection; manual |
+| 320 | Sink: org.apache.logging.log4j; Logger; true; info; (Marker,String,Object,Object,Object,Object,Object,Object,Object,Object,Object); ; Argument[1..10]; log4j; manual |
+| 321 | Sink: org.apache.logging.log4j; Logger; true; info; (Marker,String,Object[]); ; Argument[1..2]; log-injection; manual |
+| 322 | Sink: org.apache.logging.log4j; Logger; true; info; (Marker,String,Object[]); ; Argument[1..2]; log4j; manual |
+| 323 | Sink: org.apache.logging.log4j; Logger; true; info; (Marker,String,Throwable); ; Argument[1]; log-injection; manual |
+| 324 | Sink: org.apache.logging.log4j; Logger; true; info; (Marker,String,Throwable); ; Argument[1]; log4j; manual |
+| 325 | Sink: org.apache.logging.log4j; Logger; true; info; (Marker,Supplier); ; Argument[1]; log-injection; manual |
+| 326 | Sink: org.apache.logging.log4j; Logger; true; info; (Marker,Supplier); ; Argument[1]; log4j; manual |
+| 327 | Sink: org.apache.logging.log4j; Logger; true; info; (Marker,Supplier,Throwable); ; Argument[1]; log-injection; manual |
+| 328 | Sink: org.apache.logging.log4j; Logger; true; info; (Marker,Supplier,Throwable); ; Argument[1]; log4j; manual |
+| 329 | Sink: org.apache.logging.log4j; Logger; true; info; (Message); ; Argument[0]; log-injection; manual |
+| 330 | Sink: org.apache.logging.log4j; Logger; true; info; (Message); ; Argument[0]; log4j; manual |
+| 331 | Sink: org.apache.logging.log4j; Logger; true; info; (Message,Throwable); ; Argument[0]; log-injection; manual |
+| 332 | Sink: org.apache.logging.log4j; Logger; true; info; (Message,Throwable); ; Argument[0]; log4j; manual |
+| 333 | Sink: org.apache.logging.log4j; Logger; true; info; (MessageSupplier); ; Argument[0]; log-injection; manual |
+| 334 | Sink: org.apache.logging.log4j; Logger; true; info; (MessageSupplier); ; Argument[0]; log4j; manual |
+| 335 | Sink: org.apache.logging.log4j; Logger; true; info; (MessageSupplier,Throwable); ; Argument[0]; log-injection; manual |
+| 336 | Sink: org.apache.logging.log4j; Logger; true; info; (MessageSupplier,Throwable); ; Argument[0]; log4j; manual |
+| 337 | Sink: org.apache.logging.log4j; Logger; true; info; (Object); ; Argument[0]; log-injection; manual |
+| 338 | Sink: org.apache.logging.log4j; Logger; true; info; (Object); ; Argument[0]; log4j; manual |
+| 339 | Sink: org.apache.logging.log4j; Logger; true; info; (Object,Throwable); ; Argument[0]; log-injection; manual |
+| 340 | Sink: org.apache.logging.log4j; Logger; true; info; (Object,Throwable); ; Argument[0]; log4j; manual |
+| 341 | Sink: org.apache.logging.log4j; Logger; true; info; (String); ; Argument[0]; log-injection; manual |
+| 342 | Sink: org.apache.logging.log4j; Logger; true; info; (String); ; Argument[0]; log4j; manual |
+| 343 | Sink: org.apache.logging.log4j; Logger; true; info; (String,Object); ; Argument[0..1]; log-injection; manual |
+| 344 | Sink: org.apache.logging.log4j; Logger; true; info; (String,Object); ; Argument[0..1]; log4j; manual |
+| 345 | Sink: org.apache.logging.log4j; Logger; true; info; (String,Object,Object); ; Argument[0..2]; log-injection; manual |
+| 346 | Sink: org.apache.logging.log4j; Logger; true; info; (String,Object,Object); ; Argument[0..2]; log4j; manual |
+| 347 | Sink: org.apache.logging.log4j; Logger; true; info; (String,Object,Object,Object); ; Argument[0..3]; log-injection; manual |
+| 348 | Sink: org.apache.logging.log4j; Logger; true; info; (String,Object,Object,Object); ; Argument[0..3]; log4j; manual |
+| 349 | Sink: org.apache.logging.log4j; Logger; true; info; (String,Object,Object,Object,Object); ; Argument[0..4]; log-injection; manual |
+| 350 | Sink: org.apache.logging.log4j; Logger; true; info; (String,Object,Object,Object,Object); ; Argument[0..4]; log4j; manual |
+| 351 | Sink: org.apache.logging.log4j; Logger; true; info; (String,Object,Object,Object,Object,Object); ; Argument[0..5]; log-injection; manual |
+| 352 | Sink: org.apache.logging.log4j; Logger; true; info; (String,Object,Object,Object,Object,Object); ; Argument[0..5]; log4j; manual |
+| 353 | Sink: org.apache.logging.log4j; Logger; true; info; (String,Object,Object,Object,Object,Object,Object); ; Argument[0..6]; log-injection; manual |
+| 354 | Sink: org.apache.logging.log4j; Logger; true; info; (String,Object,Object,Object,Object,Object,Object); ; Argument[0..6]; log4j; manual |
+| 355 | Sink: org.apache.logging.log4j; Logger; true; info; (String,Object,Object,Object,Object,Object,Object,Object); ; Argument[0..7]; log-injection; manual |
+| 356 | Sink: org.apache.logging.log4j; Logger; true; info; (String,Object,Object,Object,Object,Object,Object,Object); ; Argument[0..7]; log4j; manual |
+| 357 | Sink: org.apache.logging.log4j; Logger; true; info; (String,Object,Object,Object,Object,Object,Object,Object,Object); ; Argument[0..8]; log-injection; manual |
+| 358 | Sink: org.apache.logging.log4j; Logger; true; info; (String,Object,Object,Object,Object,Object,Object,Object,Object); ; Argument[0..8]; log4j; manual |
+| 359 | Sink: org.apache.logging.log4j; Logger; true; info; (String,Object,Object,Object,Object,Object,Object,Object,Object,Object); ; Argument[0..9]; log-injection; manual |
+| 360 | Sink: org.apache.logging.log4j; Logger; true; info; (String,Object,Object,Object,Object,Object,Object,Object,Object,Object); ; Argument[0..9]; log4j; manual |
+| 361 | Sink: org.apache.logging.log4j; Logger; true; info; (String,Object[]); ; Argument[0..1]; log-injection; manual |
+| 362 | Sink: org.apache.logging.log4j; Logger; true; info; (String,Object[]); ; Argument[0..1]; log4j; manual |
+| 363 | Sink: org.apache.logging.log4j; Logger; true; info; (String,Throwable); ; Argument[0]; log-injection; manual |
+| 364 | Sink: org.apache.logging.log4j; Logger; true; info; (String,Throwable); ; Argument[0]; log4j; manual |
+| 365 | Sink: org.apache.logging.log4j; Logger; true; info; (Supplier); ; Argument[0]; log-injection; manual |
+| 366 | Sink: org.apache.logging.log4j; Logger; true; info; (Supplier); ; Argument[0]; log4j; manual |
+| 367 | Sink: org.apache.logging.log4j; Logger; true; info; (Supplier,Throwable); ; Argument[0]; log-injection; manual |
+| 368 | Sink: org.apache.logging.log4j; Logger; true; info; (Supplier,Throwable); ; Argument[0]; log4j; manual |
+| 369 | Sink: org.apache.logging.log4j; Logger; true; log; (Level,CharSequence); ; Argument[1]; log-injection; manual |
+| 370 | Sink: org.apache.logging.log4j; Logger; true; log; (Level,CharSequence); ; Argument[1]; log4j; manual |
+| 371 | Sink: org.apache.logging.log4j; Logger; true; log; (Level,CharSequence,Throwable); ; Argument[1]; log-injection; manual |
+| 372 | Sink: org.apache.logging.log4j; Logger; true; log; (Level,CharSequence,Throwable); ; Argument[1]; log4j; manual |
+| 373 | Sink: org.apache.logging.log4j; Logger; true; log; (Level,Marker,CharSequence); ; Argument[2]; log-injection; manual |
+| 374 | Sink: org.apache.logging.log4j; Logger; true; log; (Level,Marker,CharSequence); ; Argument[2]; log4j; manual |
+| 375 | Sink: org.apache.logging.log4j; Logger; true; log; (Level,Marker,CharSequence,Throwable); ; Argument[2]; log-injection; manual |
+| 376 | Sink: org.apache.logging.log4j; Logger; true; log; (Level,Marker,CharSequence,Throwable); ; Argument[2]; log4j; manual |
+| 377 | Sink: org.apache.logging.log4j; Logger; true; log; (Level,Marker,Message); ; Argument[2]; log-injection; manual |
+| 378 | Sink: org.apache.logging.log4j; Logger; true; log; (Level,Marker,Message); ; Argument[2]; log4j; manual |
+| 379 | Sink: org.apache.logging.log4j; Logger; true; log; (Level,Marker,MessageSupplier); ; Argument[2]; log-injection; manual |
+| 380 | Sink: org.apache.logging.log4j; Logger; true; log; (Level,Marker,MessageSupplier); ; Argument[2]; log4j; manual |
+| 381 | Sink: org.apache.logging.log4j; Logger; true; log; (Level,Marker,MessageSupplier,Throwable); ; Argument[2]; log-injection; manual |
+| 382 | Sink: org.apache.logging.log4j; Logger; true; log; (Level,Marker,MessageSupplier,Throwable); ; Argument[2]; log4j; manual |
+| 383 | Sink: org.apache.logging.log4j; Logger; true; log; (Level,Marker,Object); ; Argument[2]; log-injection; manual |
+| 384 | Sink: org.apache.logging.log4j; Logger; true; log; (Level,Marker,Object); ; Argument[2]; log4j; manual |
+| 385 | Sink: org.apache.logging.log4j; Logger; true; log; (Level,Marker,String); ; Argument[2]; log-injection; manual |
+| 386 | Sink: org.apache.logging.log4j; Logger; true; log; (Level,Marker,String); ; Argument[2]; log4j; manual |
+| 387 | Sink: org.apache.logging.log4j; Logger; true; log; (Level,Marker,String,Object); ; Argument[2..3]; log-injection; manual |
+| 388 | Sink: org.apache.logging.log4j; Logger; true; log; (Level,Marker,String,Object); ; Argument[2..3]; log4j; manual |
+| 389 | Sink: org.apache.logging.log4j; Logger; true; log; (Level,Marker,String,Object,Object); ; Argument[2..4]; log-injection; manual |
+| 390 | Sink: org.apache.logging.log4j; Logger; true; log; (Level,Marker,String,Object,Object); ; Argument[2..4]; log4j; manual |
+| 391 | Sink: org.apache.logging.log4j; Logger; true; log; (Level,Marker,String,Object,Object,Object); ; Argument[2..5]; log-injection; manual |
+| 392 | Sink: org.apache.logging.log4j; Logger; true; log; (Level,Marker,String,Object,Object,Object); ; Argument[2..5]; log4j; manual |
+| 393 | Sink: org.apache.logging.log4j; Logger; true; log; (Level,Marker,String,Object,Object,Object,Object); ; Argument[2..6]; log-injection; manual |
+| 394 | Sink: org.apache.logging.log4j; Logger; true; log; (Level,Marker,String,Object,Object,Object,Object); ; Argument[2..6]; log4j; manual |
+| 395 | Sink: org.apache.logging.log4j; Logger; true; log; (Level,Marker,String,Object,Object,Object,Object,Object); ; Argument[2..7]; log-injection; manual |
+| 396 | Sink: org.apache.logging.log4j; Logger; true; log; (Level,Marker,String,Object,Object,Object,Object,Object); ; Argument[2..7]; log4j; manual |
+| 397 | Sink: org.apache.logging.log4j; Logger; true; log; (Level,Marker,String,Object,Object,Object,Object,Object,Object); ; Argument[2..8]; log-injection; manual |
+| 398 | Sink: org.apache.logging.log4j; Logger; true; log; (Level,Marker,String,Object,Object,Object,Object,Object,Object); ; Argument[2..8]; log4j; manual |
+| 399 | Sink: org.apache.logging.log4j; Logger; true; log; (Level,Marker,String,Object,Object,Object,Object,Object,Object,Object); ; Argument[2..9]; log-injection; manual |
+| 400 | Sink: org.apache.logging.log4j; Logger; true; log; (Level,Marker,String,Object,Object,Object,Object,Object,Object,Object); ; Argument[2..9]; log4j; manual |
+| 401 | Sink: org.apache.logging.log4j; Logger; true; log; (Level,Marker,String,Object,Object,Object,Object,Object,Object,Object,Object); ; Argument[2..10]; log-injection; manual |
+| 402 | Sink: org.apache.logging.log4j; Logger; true; log; (Level,Marker,String,Object,Object,Object,Object,Object,Object,Object,Object); ; Argument[2..10]; log4j; manual |
+| 403 | Sink: org.apache.logging.log4j; Logger; true; log; (Level,Marker,String,Object,Object,Object,Object,Object,Object,Object,Object,Object); ; Argument[2..11]; log-injection; manual |
+| 404 | Sink: org.apache.logging.log4j; Logger; true; log; (Level,Marker,String,Object,Object,Object,Object,Object,Object,Object,Object,Object); ; Argument[2..11]; log4j; manual |
+| 405 | Sink: org.apache.logging.log4j; Logger; true; log; (Level,Marker,String,Object[]); ; Argument[2..3]; log-injection; manual |
+| 406 | Sink: org.apache.logging.log4j; Logger; true; log; (Level,Marker,String,Object[]); ; Argument[2..3]; log4j; manual |
+| 407 | Sink: org.apache.logging.log4j; Logger; true; log; (Level,Marker,String,Throwable); ; Argument[2]; log-injection; manual |
+| 408 | Sink: org.apache.logging.log4j; Logger; true; log; (Level,Marker,String,Throwable); ; Argument[2]; log4j; manual |
+| 409 | Sink: org.apache.logging.log4j; Logger; true; log; (Level,Marker,Supplier); ; Argument[2]; log-injection; manual |
+| 410 | Sink: org.apache.logging.log4j; Logger; true; log; (Level,Marker,Supplier); ; Argument[2]; log4j; manual |
+| 411 | Sink: org.apache.logging.log4j; Logger; true; log; (Level,Marker,Supplier,Throwable); ; Argument[2]; log-injection; manual |
+| 412 | Sink: org.apache.logging.log4j; Logger; true; log; (Level,Marker,Supplier,Throwable); ; Argument[2]; log4j; manual |
+| 413 | Sink: org.apache.logging.log4j; Logger; true; log; (Level,Message); ; Argument[1]; log-injection; manual |
+| 414 | Sink: org.apache.logging.log4j; Logger; true; log; (Level,Message); ; Argument[1]; log4j; manual |
+| 415 | Sink: org.apache.logging.log4j; Logger; true; log; (Level,Message,Throwable); ; Argument[1]; log-injection; manual |
+| 416 | Sink: org.apache.logging.log4j; Logger; true; log; (Level,Message,Throwable); ; Argument[1]; log4j; manual |
+| 417 | Sink: org.apache.logging.log4j; Logger; true; log; (Level,MessageSupplier); ; Argument[1]; log-injection; manual |
+| 418 | Sink: org.apache.logging.log4j; Logger; true; log; (Level,MessageSupplier); ; Argument[1]; log4j; manual |
+| 419 | Sink: org.apache.logging.log4j; Logger; true; log; (Level,MessageSupplier,Throwable); ; Argument[1]; log-injection; manual |
+| 420 | Sink: org.apache.logging.log4j; Logger; true; log; (Level,MessageSupplier,Throwable); ; Argument[1]; log4j; manual |
+| 421 | Sink: org.apache.logging.log4j; Logger; true; log; (Level,Object); ; Argument[1]; log-injection; manual |
+| 422 | Sink: org.apache.logging.log4j; Logger; true; log; (Level,Object); ; Argument[1]; log4j; manual |
+| 423 | Sink: org.apache.logging.log4j; Logger; true; log; (Level,Object,Throwable); ; Argument[1]; log-injection; manual |
+| 424 | Sink: org.apache.logging.log4j; Logger; true; log; (Level,Object,Throwable); ; Argument[1]; log4j; manual |
+| 425 | Sink: org.apache.logging.log4j; Logger; true; log; (Level,String); ; Argument[1]; log-injection; manual |
+| 426 | Sink: org.apache.logging.log4j; Logger; true; log; (Level,String); ; Argument[1]; log4j; manual |
+| 427 | Sink: org.apache.logging.log4j; Logger; true; log; (Level,String,Object); ; Argument[1..2]; log-injection; manual |
+| 428 | Sink: org.apache.logging.log4j; Logger; true; log; (Level,String,Object); ; Argument[1..2]; log4j; manual |
+| 429 | Sink: org.apache.logging.log4j; Logger; true; log; (Level,String,Object,Object); ; Argument[1..3]; log-injection; manual |
+| 430 | Sink: org.apache.logging.log4j; Logger; true; log; (Level,String,Object,Object); ; Argument[1..3]; log4j; manual |
+| 431 | Sink: org.apache.logging.log4j; Logger; true; log; (Level,String,Object,Object,Object); ; Argument[1..4]; log-injection; manual |
+| 432 | Sink: org.apache.logging.log4j; Logger; true; log; (Level,String,Object,Object,Object); ; Argument[1..4]; log4j; manual |
+| 433 | Sink: org.apache.logging.log4j; Logger; true; log; (Level,String,Object,Object,Object,Object); ; Argument[1..5]; log-injection; manual |
+| 434 | Sink: org.apache.logging.log4j; Logger; true; log; (Level,String,Object,Object,Object,Object); ; Argument[1..5]; log4j; manual |
+| 435 | Sink: org.apache.logging.log4j; Logger; true; log; (Level,String,Object,Object,Object,Object,Object); ; Argument[1..6]; log-injection; manual |
+| 436 | Sink: org.apache.logging.log4j; Logger; true; log; (Level,String,Object,Object,Object,Object,Object); ; Argument[1..6]; log4j; manual |
+| 437 | Sink: org.apache.logging.log4j; Logger; true; log; (Level,String,Object,Object,Object,Object,Object,Object); ; Argument[1..7]; log-injection; manual |
+| 438 | Sink: org.apache.logging.log4j; Logger; true; log; (Level,String,Object,Object,Object,Object,Object,Object); ; Argument[1..7]; log4j; manual |
+| 439 | Sink: org.apache.logging.log4j; Logger; true; log; (Level,String,Object,Object,Object,Object,Object,Object,Object); ; Argument[1..8]; log-injection; manual |
+| 440 | Sink: org.apache.logging.log4j; Logger; true; log; (Level,String,Object,Object,Object,Object,Object,Object,Object); ; Argument[1..8]; log4j; manual |
+| 441 | Sink: org.apache.logging.log4j; Logger; true; log; (Level,String,Object,Object,Object,Object,Object,Object,Object,Object); ; Argument[1..9]; log-injection; manual |
+| 442 | Sink: org.apache.logging.log4j; Logger; true; log; (Level,String,Object,Object,Object,Object,Object,Object,Object,Object); ; Argument[1..9]; log4j; manual |
+| 443 | Sink: org.apache.logging.log4j; Logger; true; log; (Level,String,Object,Object,Object,Object,Object,Object,Object,Object,Object); ; Argument[1..10]; log-injection; manual |
+| 444 | Sink: org.apache.logging.log4j; Logger; true; log; (Level,String,Object,Object,Object,Object,Object,Object,Object,Object,Object); ; Argument[1..10]; log4j; manual |
+| 445 | Sink: org.apache.logging.log4j; Logger; true; log; (Level,String,Object[]); ; Argument[1..2]; log-injection; manual |
+| 446 | Sink: org.apache.logging.log4j; Logger; true; log; (Level,String,Object[]); ; Argument[1..2]; log4j; manual |
+| 447 | Sink: org.apache.logging.log4j; Logger; true; log; (Level,String,Throwable); ; Argument[1]; log-injection; manual |
+| 448 | Sink: org.apache.logging.log4j; Logger; true; log; (Level,String,Throwable); ; Argument[1]; log4j; manual |
+| 449 | Sink: org.apache.logging.log4j; Logger; true; log; (Level,Supplier); ; Argument[1]; log-injection; manual |
+| 450 | Sink: org.apache.logging.log4j; Logger; true; log; (Level,Supplier); ; Argument[1]; log4j; manual |
+| 451 | Sink: org.apache.logging.log4j; Logger; true; log; (Level,Supplier,Throwable); ; Argument[1]; log-injection; manual |
+| 452 | Sink: org.apache.logging.log4j; Logger; true; log; (Level,Supplier,Throwable); ; Argument[1]; log4j; manual |
+| 453 | Sink: org.apache.logging.log4j; Logger; true; logMessage; (Level,Marker,String,StackTraceElement,Message,Throwable); ; Argument[4]; log-injection; manual |
+| 454 | Sink: org.apache.logging.log4j; Logger; true; logMessage; (Level,Marker,String,StackTraceElement,Message,Throwable); ; Argument[4]; log4j; manual |
+| 455 | Sink: org.apache.logging.log4j; Logger; true; printf; (Level,Marker,String,Object[]); ; Argument[2..3]; log-injection; manual |
+| 456 | Sink: org.apache.logging.log4j; Logger; true; printf; (Level,Marker,String,Object[]); ; Argument[2..3]; log4j; manual |
+| 457 | Sink: org.apache.logging.log4j; Logger; true; printf; (Level,String,Object[]); ; Argument[1..2]; log-injection; manual |
+| 458 | Sink: org.apache.logging.log4j; Logger; true; printf; (Level,String,Object[]); ; Argument[1..2]; log4j; manual |
+| 459 | Sink: org.apache.logging.log4j; Logger; true; trace; (CharSequence); ; Argument[0]; log-injection; manual |
+| 460 | Sink: org.apache.logging.log4j; Logger; true; trace; (CharSequence); ; Argument[0]; log4j; manual |
+| 461 | Sink: org.apache.logging.log4j; Logger; true; trace; (CharSequence,Throwable); ; Argument[0]; log-injection; manual |
+| 462 | Sink: org.apache.logging.log4j; Logger; true; trace; (CharSequence,Throwable); ; Argument[0]; log4j; manual |
+| 463 | Sink: org.apache.logging.log4j; Logger; true; trace; (Marker,CharSequence); ; Argument[1]; log-injection; manual |
+| 464 | Sink: org.apache.logging.log4j; Logger; true; trace; (Marker,CharSequence); ; Argument[1]; log4j; manual |
+| 465 | Sink: org.apache.logging.log4j; Logger; true; trace; (Marker,CharSequence,Throwable); ; Argument[1]; log-injection; manual |
+| 466 | Sink: org.apache.logging.log4j; Logger; true; trace; (Marker,CharSequence,Throwable); ; Argument[1]; log4j; manual |
+| 467 | Sink: org.apache.logging.log4j; Logger; true; trace; (Marker,Message); ; Argument[1]; log-injection; manual |
+| 468 | Sink: org.apache.logging.log4j; Logger; true; trace; (Marker,Message); ; Argument[1]; log4j; manual |
+| 469 | Sink: org.apache.logging.log4j; Logger; true; trace; (Marker,MessageSupplier); ; Argument[1]; log-injection; manual |
+| 470 | Sink: org.apache.logging.log4j; Logger; true; trace; (Marker,MessageSupplier); ; Argument[1]; log4j; manual |
+| 471 | Sink: org.apache.logging.log4j; Logger; true; trace; (Marker,MessageSupplier,Throwable); ; Argument[1]; log-injection; manual |
+| 472 | Sink: org.apache.logging.log4j; Logger; true; trace; (Marker,MessageSupplier,Throwable); ; Argument[1]; log4j; manual |
+| 473 | Sink: org.apache.logging.log4j; Logger; true; trace; (Marker,Object); ; Argument[1]; log-injection; manual |
+| 474 | Sink: org.apache.logging.log4j; Logger; true; trace; (Marker,Object); ; Argument[1]; log4j; manual |
+| 475 | Sink: org.apache.logging.log4j; Logger; true; trace; (Marker,String); ; Argument[1]; log-injection; manual |
+| 476 | Sink: org.apache.logging.log4j; Logger; true; trace; (Marker,String); ; Argument[1]; log4j; manual |
+| 477 | Sink: org.apache.logging.log4j; Logger; true; trace; (Marker,String,Object); ; Argument[1..2]; log-injection; manual |
+| 478 | Sink: org.apache.logging.log4j; Logger; true; trace; (Marker,String,Object); ; Argument[1..2]; log4j; manual |
+| 479 | Sink: org.apache.logging.log4j; Logger; true; trace; (Marker,String,Object,Object); ; Argument[1..3]; log-injection; manual |
+| 480 | Sink: org.apache.logging.log4j; Logger; true; trace; (Marker,String,Object,Object); ; Argument[1..3]; log4j; manual |
+| 481 | Sink: org.apache.logging.log4j; Logger; true; trace; (Marker,String,Object,Object,Object); ; Argument[1..4]; log-injection; manual |
+| 482 | Sink: org.apache.logging.log4j; Logger; true; trace; (Marker,String,Object,Object,Object); ; Argument[1..4]; log4j; manual |
+| 483 | Sink: org.apache.logging.log4j; Logger; true; trace; (Marker,String,Object,Object,Object,Object); ; Argument[1..5]; log-injection; manual |
+| 484 | Sink: org.apache.logging.log4j; Logger; true; trace; (Marker,String,Object,Object,Object,Object); ; Argument[1..5]; log4j; manual |
+| 485 | Sink: org.apache.logging.log4j; Logger; true; trace; (Marker,String,Object,Object,Object,Object,Object); ; Argument[1..6]; log-injection; manual |
+| 486 | Sink: org.apache.logging.log4j; Logger; true; trace; (Marker,String,Object,Object,Object,Object,Object); ; Argument[1..6]; log4j; manual |
+| 487 | Sink: org.apache.logging.log4j; Logger; true; trace; (Marker,String,Object,Object,Object,Object,Object,Object); ; Argument[1..7]; log-injection; manual |
+| 488 | Sink: org.apache.logging.log4j; Logger; true; trace; (Marker,String,Object,Object,Object,Object,Object,Object); ; Argument[1..7]; log4j; manual |
+| 489 | Sink: org.apache.logging.log4j; Logger; true; trace; (Marker,String,Object,Object,Object,Object,Object,Object,Object); ; Argument[1..8]; log-injection; manual |
+| 490 | Sink: org.apache.logging.log4j; Logger; true; trace; (Marker,String,Object,Object,Object,Object,Object,Object,Object); ; Argument[1..8]; log4j; manual |
+| 491 | Sink: org.apache.logging.log4j; Logger; true; trace; (Marker,String,Object,Object,Object,Object,Object,Object,Object,Object); ; Argument[1..9]; log-injection; manual |
+| 492 | Sink: org.apache.logging.log4j; Logger; true; trace; (Marker,String,Object,Object,Object,Object,Object,Object,Object,Object); ; Argument[1..9]; log4j; manual |
+| 493 | Sink: org.apache.logging.log4j; Logger; true; trace; (Marker,String,Object,Object,Object,Object,Object,Object,Object,Object,Object); ; Argument[1..10]; log-injection; manual |
+| 494 | Sink: org.apache.logging.log4j; Logger; true; trace; (Marker,String,Object,Object,Object,Object,Object,Object,Object,Object,Object); ; Argument[1..10]; log4j; manual |
+| 495 | Sink: org.apache.logging.log4j; Logger; true; trace; (Marker,String,Object[]); ; Argument[1..2]; log-injection; manual |
+| 496 | Sink: org.apache.logging.log4j; Logger; true; trace; (Marker,String,Object[]); ; Argument[1..2]; log4j; manual |
+| 497 | Sink: org.apache.logging.log4j; Logger; true; trace; (Marker,String,Throwable); ; Argument[1]; log-injection; manual |
+| 498 | Sink: org.apache.logging.log4j; Logger; true; trace; (Marker,String,Throwable); ; Argument[1]; log4j; manual |
+| 499 | Sink: org.apache.logging.log4j; Logger; true; trace; (Marker,Supplier); ; Argument[1]; log-injection; manual |
+| 500 | Sink: org.apache.logging.log4j; Logger; true; trace; (Marker,Supplier); ; Argument[1]; log4j; manual |
+| 501 | Sink: org.apache.logging.log4j; Logger; true; trace; (Marker,Supplier,Throwable); ; Argument[1]; log-injection; manual |
+| 502 | Sink: org.apache.logging.log4j; Logger; true; trace; (Marker,Supplier,Throwable); ; Argument[1]; log4j; manual |
+| 503 | Sink: org.apache.logging.log4j; Logger; true; trace; (Message); ; Argument[0]; log-injection; manual |
+| 504 | Sink: org.apache.logging.log4j; Logger; true; trace; (Message); ; Argument[0]; log4j; manual |
+| 505 | Sink: org.apache.logging.log4j; Logger; true; trace; (Message,Throwable); ; Argument[0]; log-injection; manual |
+| 506 | Sink: org.apache.logging.log4j; Logger; true; trace; (Message,Throwable); ; Argument[0]; log4j; manual |
+| 507 | Sink: org.apache.logging.log4j; Logger; true; trace; (MessageSupplier); ; Argument[0]; log-injection; manual |
+| 508 | Sink: org.apache.logging.log4j; Logger; true; trace; (MessageSupplier); ; Argument[0]; log4j; manual |
+| 509 | Sink: org.apache.logging.log4j; Logger; true; trace; (MessageSupplier,Throwable); ; Argument[0]; log-injection; manual |
+| 510 | Sink: org.apache.logging.log4j; Logger; true; trace; (MessageSupplier,Throwable); ; Argument[0]; log4j; manual |
+| 511 | Sink: org.apache.logging.log4j; Logger; true; trace; (Object); ; Argument[0]; log-injection; manual |
+| 512 | Sink: org.apache.logging.log4j; Logger; true; trace; (Object); ; Argument[0]; log4j; manual |
+| 513 | Sink: org.apache.logging.log4j; Logger; true; trace; (Object,Throwable); ; Argument[0]; log-injection; manual |
+| 514 | Sink: org.apache.logging.log4j; Logger; true; trace; (Object,Throwable); ; Argument[0]; log4j; manual |
+| 515 | Sink: org.apache.logging.log4j; Logger; true; trace; (String); ; Argument[0]; log-injection; manual |
+| 516 | Sink: org.apache.logging.log4j; Logger; true; trace; (String); ; Argument[0]; log4j; manual |
+| 517 | Sink: org.apache.logging.log4j; Logger; true; trace; (String,Object); ; Argument[0..1]; log-injection; manual |
+| 518 | Sink: org.apache.logging.log4j; Logger; true; trace; (String,Object); ; Argument[0..1]; log4j; manual |
+| 519 | Sink: org.apache.logging.log4j; Logger; true; trace; (String,Object,Object); ; Argument[0..2]; log-injection; manual |
+| 520 | Sink: org.apache.logging.log4j; Logger; true; trace; (String,Object,Object); ; Argument[0..2]; log4j; manual |
+| 521 | Sink: org.apache.logging.log4j; Logger; true; trace; (String,Object,Object,Object); ; Argument[0..3]; log-injection; manual |
+| 522 | Sink: org.apache.logging.log4j; Logger; true; trace; (String,Object,Object,Object); ; Argument[0..3]; log4j; manual |
+| 523 | Sink: org.apache.logging.log4j; Logger; true; trace; (String,Object,Object,Object,Object); ; Argument[0..4]; log-injection; manual |
+| 524 | Sink: org.apache.logging.log4j; Logger; true; trace; (String,Object,Object,Object,Object); ; Argument[0..4]; log4j; manual |
+| 525 | Sink: org.apache.logging.log4j; Logger; true; trace; (String,Object,Object,Object,Object,Object); ; Argument[0..5]; log-injection; manual |
+| 526 | Sink: org.apache.logging.log4j; Logger; true; trace; (String,Object,Object,Object,Object,Object); ; Argument[0..5]; log4j; manual |
+| 527 | Sink: org.apache.logging.log4j; Logger; true; trace; (String,Object,Object,Object,Object,Object,Object); ; Argument[0..6]; log-injection; manual |
+| 528 | Sink: org.apache.logging.log4j; Logger; true; trace; (String,Object,Object,Object,Object,Object,Object); ; Argument[0..6]; log4j; manual |
+| 529 | Sink: org.apache.logging.log4j; Logger; true; trace; (String,Object,Object,Object,Object,Object,Object,Object); ; Argument[0..7]; log-injection; manual |
+| 530 | Sink: org.apache.logging.log4j; Logger; true; trace; (String,Object,Object,Object,Object,Object,Object,Object); ; Argument[0..7]; log4j; manual |
+| 531 | Sink: org.apache.logging.log4j; Logger; true; trace; (String,Object,Object,Object,Object,Object,Object,Object,Object); ; Argument[0..8]; log-injection; manual |
+| 532 | Sink: org.apache.logging.log4j; Logger; true; trace; (String,Object,Object,Object,Object,Object,Object,Object,Object); ; Argument[0..8]; log4j; manual |
+| 533 | Sink: org.apache.logging.log4j; Logger; true; trace; (String,Object,Object,Object,Object,Object,Object,Object,Object,Object); ; Argument[0..9]; log-injection; manual |
+| 534 | Sink: org.apache.logging.log4j; Logger; true; trace; (String,Object,Object,Object,Object,Object,Object,Object,Object,Object); ; Argument[0..9]; log4j; manual |
+| 535 | Sink: org.apache.logging.log4j; Logger; true; trace; (String,Object[]); ; Argument[0..1]; log-injection; manual |
+| 536 | Sink: org.apache.logging.log4j; Logger; true; trace; (String,Object[]); ; Argument[0..1]; log4j; manual |
+| 537 | Sink: org.apache.logging.log4j; Logger; true; trace; (String,Throwable); ; Argument[0]; log-injection; manual |
+| 538 | Sink: org.apache.logging.log4j; Logger; true; trace; (String,Throwable); ; Argument[0]; log4j; manual |
+| 539 | Sink: org.apache.logging.log4j; Logger; true; trace; (Supplier); ; Argument[0]; log-injection; manual |
+| 540 | Sink: org.apache.logging.log4j; Logger; true; trace; (Supplier); ; Argument[0]; log4j; manual |
+| 541 | Sink: org.apache.logging.log4j; Logger; true; trace; (Supplier,Throwable); ; Argument[0]; log-injection; manual |
+| 542 | Sink: org.apache.logging.log4j; Logger; true; trace; (Supplier,Throwable); ; Argument[0]; log4j; manual |
+| 543 | Sink: org.apache.logging.log4j; Logger; true; warn; (CharSequence); ; Argument[0]; log-injection; manual |
+| 544 | Sink: org.apache.logging.log4j; Logger; true; warn; (CharSequence); ; Argument[0]; log4j; manual |
+| 545 | Sink: org.apache.logging.log4j; Logger; true; warn; (CharSequence,Throwable); ; Argument[0]; log-injection; manual |
+| 546 | Sink: org.apache.logging.log4j; Logger; true; warn; (CharSequence,Throwable); ; Argument[0]; log4j; manual |
+| 547 | Sink: org.apache.logging.log4j; Logger; true; warn; (Marker,CharSequence); ; Argument[1]; log-injection; manual |
+| 548 | Sink: org.apache.logging.log4j; Logger; true; warn; (Marker,CharSequence); ; Argument[1]; log4j; manual |
+| 549 | Sink: org.apache.logging.log4j; Logger; true; warn; (Marker,CharSequence,Throwable); ; Argument[1]; log-injection; manual |
+| 550 | Sink: org.apache.logging.log4j; Logger; true; warn; (Marker,CharSequence,Throwable); ; Argument[1]; log4j; manual |
+| 551 | Sink: org.apache.logging.log4j; Logger; true; warn; (Marker,Message); ; Argument[1]; log-injection; manual |
+| 552 | Sink: org.apache.logging.log4j; Logger; true; warn; (Marker,Message); ; Argument[1]; log4j; manual |
+| 553 | Sink: org.apache.logging.log4j; Logger; true; warn; (Marker,MessageSupplier); ; Argument[1]; log-injection; manual |
+| 554 | Sink: org.apache.logging.log4j; Logger; true; warn; (Marker,MessageSupplier); ; Argument[1]; log4j; manual |
+| 555 | Sink: org.apache.logging.log4j; Logger; true; warn; (Marker,MessageSupplier,Throwable); ; Argument[1]; log-injection; manual |
+| 556 | Sink: org.apache.logging.log4j; Logger; true; warn; (Marker,MessageSupplier,Throwable); ; Argument[1]; log4j; manual |
+| 557 | Sink: org.apache.logging.log4j; Logger; true; warn; (Marker,Object); ; Argument[1]; log-injection; manual |
+| 558 | Sink: org.apache.logging.log4j; Logger; true; warn; (Marker,Object); ; Argument[1]; log4j; manual |
+| 559 | Sink: org.apache.logging.log4j; Logger; true; warn; (Marker,String); ; Argument[1]; log-injection; manual |
+| 560 | Sink: org.apache.logging.log4j; Logger; true; warn; (Marker,String); ; Argument[1]; log4j; manual |
+| 561 | Sink: org.apache.logging.log4j; Logger; true; warn; (Marker,String,Object); ; Argument[1..2]; log-injection; manual |
+| 562 | Sink: org.apache.logging.log4j; Logger; true; warn; (Marker,String,Object); ; Argument[1..2]; log4j; manual |
+| 563 | Sink: org.apache.logging.log4j; Logger; true; warn; (Marker,String,Object,Object); ; Argument[1..3]; log-injection; manual |
+| 564 | Sink: org.apache.logging.log4j; Logger; true; warn; (Marker,String,Object,Object); ; Argument[1..3]; log4j; manual |
+| 565 | Sink: org.apache.logging.log4j; Logger; true; warn; (Marker,String,Object,Object,Object); ; Argument[1..4]; log-injection; manual |
+| 566 | Sink: org.apache.logging.log4j; Logger; true; warn; (Marker,String,Object,Object,Object); ; Argument[1..4]; log4j; manual |
+| 567 | Sink: org.apache.logging.log4j; Logger; true; warn; (Marker,String,Object,Object,Object,Object); ; Argument[1..5]; log-injection; manual |
+| 568 | Sink: org.apache.logging.log4j; Logger; true; warn; (Marker,String,Object,Object,Object,Object); ; Argument[1..5]; log4j; manual |
+| 569 | Sink: org.apache.logging.log4j; Logger; true; warn; (Marker,String,Object,Object,Object,Object,Object); ; Argument[1..6]; log-injection; manual |
+| 570 | Sink: org.apache.logging.log4j; Logger; true; warn; (Marker,String,Object,Object,Object,Object,Object); ; Argument[1..6]; log4j; manual |
+| 571 | Sink: org.apache.logging.log4j; Logger; true; warn; (Marker,String,Object,Object,Object,Object,Object,Object); ; Argument[1..7]; log-injection; manual |
+| 572 | Sink: org.apache.logging.log4j; Logger; true; warn; (Marker,String,Object,Object,Object,Object,Object,Object); ; Argument[1..7]; log4j; manual |
+| 573 | Sink: org.apache.logging.log4j; Logger; true; warn; (Marker,String,Object,Object,Object,Object,Object,Object,Object); ; Argument[1..8]; log-injection; manual |
+| 574 | Sink: org.apache.logging.log4j; Logger; true; warn; (Marker,String,Object,Object,Object,Object,Object,Object,Object); ; Argument[1..8]; log4j; manual |
+| 575 | Sink: org.apache.logging.log4j; Logger; true; warn; (Marker,String,Object,Object,Object,Object,Object,Object,Object,Object); ; Argument[1..9]; log-injection; manual |
+| 576 | Sink: org.apache.logging.log4j; Logger; true; warn; (Marker,String,Object,Object,Object,Object,Object,Object,Object,Object); ; Argument[1..9]; log4j; manual |
+| 577 | Sink: org.apache.logging.log4j; Logger; true; warn; (Marker,String,Object,Object,Object,Object,Object,Object,Object,Object,Object); ; Argument[1..10]; log-injection; manual |
+| 578 | Sink: org.apache.logging.log4j; Logger; true; warn; (Marker,String,Object,Object,Object,Object,Object,Object,Object,Object,Object); ; Argument[1..10]; log4j; manual |
+| 579 | Sink: org.apache.logging.log4j; Logger; true; warn; (Marker,String,Object[]); ; Argument[1..2]; log-injection; manual |
+| 580 | Sink: org.apache.logging.log4j; Logger; true; warn; (Marker,String,Object[]); ; Argument[1..2]; log4j; manual |
+| 581 | Sink: org.apache.logging.log4j; Logger; true; warn; (Marker,String,Throwable); ; Argument[1]; log-injection; manual |
+| 582 | Sink: org.apache.logging.log4j; Logger; true; warn; (Marker,String,Throwable); ; Argument[1]; log4j; manual |
+| 583 | Sink: org.apache.logging.log4j; Logger; true; warn; (Marker,Supplier); ; Argument[1]; log-injection; manual |
+| 584 | Sink: org.apache.logging.log4j; Logger; true; warn; (Marker,Supplier); ; Argument[1]; log4j; manual |
+| 585 | Sink: org.apache.logging.log4j; Logger; true; warn; (Marker,Supplier,Throwable); ; Argument[1]; log-injection; manual |
+| 586 | Sink: org.apache.logging.log4j; Logger; true; warn; (Marker,Supplier,Throwable); ; Argument[1]; log4j; manual |
+| 587 | Sink: org.apache.logging.log4j; Logger; true; warn; (Message); ; Argument[0]; log-injection; manual |
+| 588 | Sink: org.apache.logging.log4j; Logger; true; warn; (Message); ; Argument[0]; log4j; manual |
+| 589 | Sink: org.apache.logging.log4j; Logger; true; warn; (Message,Throwable); ; Argument[0]; log-injection; manual |
+| 590 | Sink: org.apache.logging.log4j; Logger; true; warn; (Message,Throwable); ; Argument[0]; log4j; manual |
+| 591 | Sink: org.apache.logging.log4j; Logger; true; warn; (MessageSupplier); ; Argument[0]; log-injection; manual |
+| 592 | Sink: org.apache.logging.log4j; Logger; true; warn; (MessageSupplier); ; Argument[0]; log4j; manual |
+| 593 | Sink: org.apache.logging.log4j; Logger; true; warn; (MessageSupplier,Throwable); ; Argument[0]; log-injection; manual |
+| 594 | Sink: org.apache.logging.log4j; Logger; true; warn; (MessageSupplier,Throwable); ; Argument[0]; log4j; manual |
+| 595 | Sink: org.apache.logging.log4j; Logger; true; warn; (Object); ; Argument[0]; log-injection; manual |
+| 596 | Sink: org.apache.logging.log4j; Logger; true; warn; (Object); ; Argument[0]; log4j; manual |
+| 597 | Sink: org.apache.logging.log4j; Logger; true; warn; (Object,Throwable); ; Argument[0]; log-injection; manual |
+| 598 | Sink: org.apache.logging.log4j; Logger; true; warn; (Object,Throwable); ; Argument[0]; log4j; manual |
+| 599 | Sink: org.apache.logging.log4j; Logger; true; warn; (String); ; Argument[0]; log-injection; manual |
+| 600 | Sink: org.apache.logging.log4j; Logger; true; warn; (String); ; Argument[0]; log4j; manual |
+| 601 | Sink: org.apache.logging.log4j; Logger; true; warn; (String,Object); ; Argument[0..1]; log-injection; manual |
+| 602 | Sink: org.apache.logging.log4j; Logger; true; warn; (String,Object); ; Argument[0..1]; log4j; manual |
+| 603 | Sink: org.apache.logging.log4j; Logger; true; warn; (String,Object,Object); ; Argument[0..2]; log-injection; manual |
+| 604 | Sink: org.apache.logging.log4j; Logger; true; warn; (String,Object,Object); ; Argument[0..2]; log4j; manual |
+| 605 | Sink: org.apache.logging.log4j; Logger; true; warn; (String,Object,Object,Object); ; Argument[0..3]; log-injection; manual |
+| 606 | Sink: org.apache.logging.log4j; Logger; true; warn; (String,Object,Object,Object); ; Argument[0..3]; log4j; manual |
+| 607 | Sink: org.apache.logging.log4j; Logger; true; warn; (String,Object,Object,Object,Object); ; Argument[0..4]; log-injection; manual |
+| 608 | Sink: org.apache.logging.log4j; Logger; true; warn; (String,Object,Object,Object,Object); ; Argument[0..4]; log4j; manual |
+| 609 | Sink: org.apache.logging.log4j; Logger; true; warn; (String,Object,Object,Object,Object,Object); ; Argument[0..5]; log-injection; manual |
+| 610 | Sink: org.apache.logging.log4j; Logger; true; warn; (String,Object,Object,Object,Object,Object); ; Argument[0..5]; log4j; manual |
+| 611 | Sink: org.apache.logging.log4j; Logger; true; warn; (String,Object,Object,Object,Object,Object,Object); ; Argument[0..6]; log-injection; manual |
+| 612 | Sink: org.apache.logging.log4j; Logger; true; warn; (String,Object,Object,Object,Object,Object,Object); ; Argument[0..6]; log4j; manual |
+| 613 | Sink: org.apache.logging.log4j; Logger; true; warn; (String,Object,Object,Object,Object,Object,Object,Object); ; Argument[0..7]; log-injection; manual |
+| 614 | Sink: org.apache.logging.log4j; Logger; true; warn; (String,Object,Object,Object,Object,Object,Object,Object); ; Argument[0..7]; log4j; manual |
+| 615 | Sink: org.apache.logging.log4j; Logger; true; warn; (String,Object,Object,Object,Object,Object,Object,Object,Object); ; Argument[0..8]; log-injection; manual |
+| 616 | Sink: org.apache.logging.log4j; Logger; true; warn; (String,Object,Object,Object,Object,Object,Object,Object,Object); ; Argument[0..8]; log4j; manual |
+| 617 | Sink: org.apache.logging.log4j; Logger; true; warn; (String,Object,Object,Object,Object,Object,Object,Object,Object,Object); ; Argument[0..9]; log-injection; manual |
+| 618 | Sink: org.apache.logging.log4j; Logger; true; warn; (String,Object,Object,Object,Object,Object,Object,Object,Object,Object); ; Argument[0..9]; log4j; manual |
+| 619 | Sink: org.apache.logging.log4j; Logger; true; warn; (String,Object[]); ; Argument[0..1]; log-injection; manual |
+| 620 | Sink: org.apache.logging.log4j; Logger; true; warn; (String,Object[]); ; Argument[0..1]; log4j; manual |
+| 621 | Sink: org.apache.logging.log4j; Logger; true; warn; (String,Throwable); ; Argument[0]; log-injection; manual |
+| 622 | Sink: org.apache.logging.log4j; Logger; true; warn; (String,Throwable); ; Argument[0]; log4j; manual |
+| 623 | Sink: org.apache.logging.log4j; Logger; true; warn; (Supplier); ; Argument[0]; log-injection; manual |
+| 624 | Sink: org.apache.logging.log4j; Logger; true; warn; (Supplier); ; Argument[0]; log4j; manual |
+| 625 | Sink: org.apache.logging.log4j; Logger; true; warn; (Supplier,Throwable); ; Argument[0]; log-injection; manual |
+| 626 | Sink: org.apache.logging.log4j; Logger; true; warn; (Supplier,Throwable); ; Argument[0]; log4j; manual |
+| 627 | Sink: org.apache.logging.log4j; ThreadContext; false; put; ; ; Argument[1]; log4j; manual |
+| 628 | Sink: org.apache.logging.log4j; ThreadContext; false; putAll; ; ; Argument[0]; log4j; manual |
+| 629 | Sink: org.apache.logging.log4j; ThreadContext; false; putIfNull; ; ; Argument[1]; log4j; manual |
+| 630 | Source: javax.servlet; ServletRequest; false; getParameter; (String); ; ReturnValue; remote; manual |
+| 631 | Summary: java.util; Map; true; put; (Object,Object); ; Argument[1]; Argument[this].MapValue; value; manual |
+| 632 | Summary: org.apache.logging.log4j.message; MapMessage; true; put; ; ; Argument[1]; Argument[this]; taint; manual |
+| 633 | Summary: org.apache.logging.log4j.message; MapMessage; true; putAll; ; ; Argument[0].MapValue; Argument[this]; taint; manual |
+| 634 | Summary: org.apache.logging.log4j.message; MapMessage; true; with; ; ; Argument[1]; Argument[this]; taint; manual |
+| 635 | Summary: org.apache.logging.log4j.message; MapMessage; true; with; ; ; Argument[this]; ReturnValue; value; manual |
 nodes
 | Log4jJndiInjectionTest.java:24:16:24:45 | getParameter(...) : String | semmle.label | getParameter(...) : String |
 | Log4jJndiInjectionTest.java:31:26:31:48 | (...)... | semmle.label | (...)... |
diff --git a/java/ql/test/experimental/query-tests/security/CWE-073/FilePathInjection.expected b/java/ql/test/experimental/query-tests/security/CWE-073/FilePathInjection.expected
index 03ad04a91fb..84860adbe72 100644
--- a/java/ql/test/experimental/query-tests/security/CWE-073/FilePathInjection.expected
+++ b/java/ql/test/experimental/query-tests/security/CWE-073/FilePathInjection.expected
@@ -5,22 +5,22 @@
 | FilePathInjection.java:182:30:182:33 | file | FilePathInjection.java:205:17:205:44 | getParameter(...) : String | FilePathInjection.java:182:30:182:33 | file | External control of file name or path due to $@. | FilePathInjection.java:205:17:205:44 | getParameter(...) | user-provided value |
 | FilePathInjection.java:210:23:210:26 | file | FilePathInjection.java:205:17:205:44 | getParameter(...) : String | FilePathInjection.java:210:23:210:26 | file | External control of file name or path due to $@. | FilePathInjection.java:205:17:205:44 | getParameter(...) | user-provided value |
 edges
-| FilePathInjection.java:21:21:21:34 | getPara(...) : String | FilePathInjection.java:26:47:26:59 | finalFilePath | provenance | Src:MaD:1  Sink:MaD:4 |
-| FilePathInjection.java:64:21:64:34 | getPara(...) : String | FilePathInjection.java:72:47:72:59 | finalFilePath | provenance | Src:MaD:1 AdditionalValueStep Sink:MaD:4 |
-| FilePathInjection.java:87:21:87:34 | getPara(...) : String | FilePathInjection.java:95:47:95:59 | finalFilePath | provenance | Src:MaD:1 AdditionalValueStep Sink:MaD:4 |
-| FilePathInjection.java:177:50:177:58 | file : File | FilePathInjection.java:182:30:182:33 | file | provenance |  Sink:MaD:3 |
-| FilePathInjection.java:205:17:205:44 | getParameter(...) : String | FilePathInjection.java:209:24:209:31 | filePath : String | provenance | Src:MaD:6  |
-| FilePathInjection.java:209:15:209:32 | new File(...) : File | FilePathInjection.java:210:23:210:26 | file | provenance |  Sink:MaD:2 |
+| FilePathInjection.java:21:21:21:34 | getPara(...) : String | FilePathInjection.java:26:47:26:59 | finalFilePath | provenance | Src:MaD:4 Sink:MaD:3 |
+| FilePathInjection.java:64:21:64:34 | getPara(...) : String | FilePathInjection.java:72:47:72:59 | finalFilePath | provenance | Src:MaD:4 AdditionalValueStep Sink:MaD:3 |
+| FilePathInjection.java:87:21:87:34 | getPara(...) : String | FilePathInjection.java:95:47:95:59 | finalFilePath | provenance | Src:MaD:4 AdditionalValueStep Sink:MaD:3 |
+| FilePathInjection.java:177:50:177:58 | file : File | FilePathInjection.java:182:30:182:33 | file | provenance | Sink:MaD:2 |
+| FilePathInjection.java:205:17:205:44 | getParameter(...) : String | FilePathInjection.java:209:24:209:31 | filePath : String | provenance | Src:MaD:5  |
+| FilePathInjection.java:209:15:209:32 | new File(...) : File | FilePathInjection.java:210:23:210:26 | file | provenance | Sink:MaD:1 |
 | FilePathInjection.java:209:15:209:32 | new File(...) : File | FilePathInjection.java:217:19:217:22 | file : File | provenance |  |
-| FilePathInjection.java:209:24:209:31 | filePath : String | FilePathInjection.java:209:15:209:32 | new File(...) : File | provenance | MaD:5 |
+| FilePathInjection.java:209:24:209:31 | filePath : String | FilePathInjection.java:209:15:209:32 | new File(...) : File | provenance | MaD:6 |
 | FilePathInjection.java:217:19:217:22 | file : File | FilePathInjection.java:177:50:177:58 | file : File | provenance |  |
 models
-| 1 | Source: com.jfinal.core; Controller; true; getPara; ; ; ReturnValue; remote; manual |
-| 2 | Sink: java.io; File; true; exists; (); ; Argument[this]; path-injection; manual |
-| 3 | Sink: java.io; FileInputStream; true; FileInputStream; (File); ; Argument[0]; path-injection; ai-manual |
-| 4 | Sink: java.io; FileOutputStream; false; FileOutputStream; ; ; Argument[0]; path-injection; manual |
-| 5 | Summary: java.io; File; false; File; ; ; Argument[0]; Argument[this]; taint; manual |
-| 6 | Source: javax.servlet; ServletRequest; false; getParameter; (String); ; ReturnValue; remote; manual |
+| 1 | Sink: java.io; File; true; exists; (); ; Argument[this]; path-injection; manual |
+| 2 | Sink: java.io; FileInputStream; true; FileInputStream; (File); ; Argument[0]; path-injection; ai-manual |
+| 3 | Sink: java.io; FileOutputStream; false; FileOutputStream; ; ; Argument[0]; path-injection; manual |
+| 4 | Source: com.jfinal.core; Controller; true; getPara; ; ; ReturnValue; remote; manual |
+| 5 | Source: javax.servlet; ServletRequest; false; getParameter; (String); ; ReturnValue; remote; manual |
+| 6 | Summary: java.io; File; false; File; ; ; Argument[0]; Argument[this]; taint; manual |
 nodes
 | FilePathInjection.java:21:21:21:34 | getPara(...) : String | semmle.label | getPara(...) : String |
 | FilePathInjection.java:26:47:26:59 | finalFilePath | semmle.label | finalFilePath |
diff --git a/java/ql/test/experimental/query-tests/security/CWE-078/CommandInjectionRuntimeExecLocal.expected b/java/ql/test/experimental/query-tests/security/CWE-078/CommandInjectionRuntimeExecLocal.expected
index 2065f7b0085..03100494816 100644
--- a/java/ql/test/experimental/query-tests/security/CWE-078/CommandInjectionRuntimeExecLocal.expected
+++ b/java/ql/test/experimental/query-tests/security/CWE-078/CommandInjectionRuntimeExecLocal.expected
@@ -8,24 +8,23 @@ edges
 | RuntimeExecTest.java:17:25:17:51 | getenv(...) : String | RuntimeExecTest.java:25:66:25:71 | script : String | provenance | Src:MaD:2  |
 | RuntimeExecTest.java:17:25:17:51 | getenv(...) : String | RuntimeExecTest.java:31:36:31:41 | script : String | provenance | Src:MaD:2  |
 | RuntimeExecTest.java:17:25:17:51 | getenv(...) : String | RuntimeExecTest.java:38:52:38:57 | script : String | provenance | Src:MaD:2  |
-| RuntimeExecTest.java:22:43:22:73 | {...} : String[] [[]] : String | RuntimeExecTest.java:22:43:22:73 | new String[] | provenance |  Sink:MaD:1 |
+| RuntimeExecTest.java:22:43:22:73 | {...} : String[] [[]] : String | RuntimeExecTest.java:22:43:22:73 | new String[] | provenance | Sink:MaD:1 |
 | RuntimeExecTest.java:22:67:22:72 | script : String | RuntimeExecTest.java:22:43:22:73 | {...} : String[] [[]] : String | provenance |  |
-| RuntimeExecTest.java:25:42:25:72 | {...} : String[] [[]] : String | RuntimeExecTest.java:26:43:26:55 | commandArray1 | provenance |  Sink:MaD:1 |
+| RuntimeExecTest.java:25:42:25:72 | {...} : String[] [[]] : String | RuntimeExecTest.java:26:43:26:55 | commandArray1 | provenance | Sink:MaD:1 |
 | RuntimeExecTest.java:25:66:25:71 | script : String | RuntimeExecTest.java:25:42:25:72 | {...} : String[] [[]] : String | provenance |  |
-| RuntimeExecTest.java:31:17:31:29 | commandArray2 [post update] : String[] [[]] : String | RuntimeExecTest.java:32:43:32:55 | commandArray2 | provenance |  Sink:MaD:1 |
+| RuntimeExecTest.java:31:17:31:29 | commandArray2 [post update] : String[] [[]] : String | RuntimeExecTest.java:32:43:32:55 | commandArray2 | provenance | Sink:MaD:1 |
 | RuntimeExecTest.java:31:36:31:41 | script : String | RuntimeExecTest.java:31:17:31:29 | commandArray2 [post update] : String[] [[]] : String | provenance |  |
-| RuntimeExecTest.java:36:21:39:21 | concat(...) : Stream [<element>] : String | RuntimeExecTest.java:36:21:39:44 | toArray(...) : String[] [[]] : String | provenance | MaD:5 |
-| RuntimeExecTest.java:36:21:39:44 | toArray(...) : String[] [[]] : String | RuntimeExecTest.java:36:21:39:44 | toArray(...) | provenance |  Sink:MaD:1 |
-| RuntimeExecTest.java:38:25:38:59 | stream(...) : Stream [<element>] : String | RuntimeExecTest.java:36:21:39:21 | concat(...) : Stream [<element>] : String | provenance | MaD:4 |
-| RuntimeExecTest.java:38:39:38:58 | new String[] : String[] [[]] : String | RuntimeExecTest.java:38:25:38:59 | stream(...) : Stream [<element>] : String | provenance | MaD:3 |
+| RuntimeExecTest.java:36:21:39:21 | concat(...) : Stream [<element>] : String | RuntimeExecTest.java:36:21:39:44 | toArray(...) | provenance | MaD:4 Sink:MaD:1 |
+| RuntimeExecTest.java:38:25:38:59 | stream(...) : Stream [<element>] : String | RuntimeExecTest.java:36:21:39:21 | concat(...) : Stream [<element>] : String | provenance | MaD:3 |
+| RuntimeExecTest.java:38:39:38:58 | new String[] : String[] [[]] : String | RuntimeExecTest.java:38:25:38:59 | stream(...) : Stream [<element>] : String | provenance | MaD:5 |
 | RuntimeExecTest.java:38:39:38:58 | {...} : String[] [[]] : String | RuntimeExecTest.java:38:39:38:58 | new String[] : String[] [[]] : String | provenance |  |
 | RuntimeExecTest.java:38:52:38:57 | script : String | RuntimeExecTest.java:38:39:38:58 | {...} : String[] [[]] : String | provenance |  |
 models
 | 1 | Sink: java.lang; Runtime; true; exec; (String[]); ; Argument[0]; command-injection; ai-manual |
 | 2 | Source: java.lang; System; false; getenv; ; ; ReturnValue; environment; manual |
-| 3 | Summary: java.util; Arrays; false; stream; ; ; Argument[0].ArrayElement; ReturnValue.Element; value; manual |
-| 4 | Summary: java.util.stream; Stream; true; concat; (Stream,Stream); ; Argument[0..1].Element; ReturnValue.Element; value; manual |
-| 5 | Summary: java.util.stream; Stream; true; toArray; ; ; Argument[this].Element; ReturnValue.ArrayElement; value; manual |
+| 3 | Summary: java.util.stream; Stream; true; concat; (Stream,Stream); ; Argument[0..1].Element; ReturnValue.Element; value; manual |
+| 4 | Summary: java.util.stream; Stream; true; toArray; ; ; Argument[this].Element; ReturnValue.ArrayElement; value; manual |
+| 5 | Summary: java.util; Arrays; false; stream; ; ; Argument[0].ArrayElement; ReturnValue.Element; value; manual |
 nodes
 | RuntimeExecTest.java:17:25:17:51 | getenv(...) : String | semmle.label | getenv(...) : String |
 | RuntimeExecTest.java:22:43:22:73 | new String[] | semmle.label | new String[] |
@@ -39,7 +38,6 @@ nodes
 | RuntimeExecTest.java:32:43:32:55 | commandArray2 | semmle.label | commandArray2 |
 | RuntimeExecTest.java:36:21:39:21 | concat(...) : Stream [<element>] : String | semmle.label | concat(...) : Stream [<element>] : String |
 | RuntimeExecTest.java:36:21:39:44 | toArray(...) | semmle.label | toArray(...) |
-| RuntimeExecTest.java:36:21:39:44 | toArray(...) : String[] [[]] : String | semmle.label | toArray(...) : String[] [[]] : String |
 | RuntimeExecTest.java:38:25:38:59 | stream(...) : Stream [<element>] : String | semmle.label | stream(...) : Stream [<element>] : String |
 | RuntimeExecTest.java:38:39:38:58 | new String[] : String[] [[]] : String | semmle.label | new String[] : String[] [[]] : String |
 | RuntimeExecTest.java:38:39:38:58 | {...} : String[] [[]] : String | semmle.label | {...} : String[] [[]] : String |
diff --git a/java/ql/test/experimental/query-tests/security/CWE-078/ExecTainted.expected b/java/ql/test/experimental/query-tests/security/CWE-078/ExecTainted.expected
index 152b82d25af..b585938fbf5 100644
--- a/java/ql/test/experimental/query-tests/security/CWE-078/ExecTainted.expected
+++ b/java/ql/test/experimental/query-tests/security/CWE-078/ExecTainted.expected
@@ -2,8 +2,8 @@
 | JSchOSInjectionTest.java:27:52:27:68 | ... + ... | JSchOSInjectionTest.java:14:30:14:60 | getParameter(...) : String | JSchOSInjectionTest.java:27:52:27:68 | ... + ... | This command line depends on a $@. | JSchOSInjectionTest.java:14:30:14:60 | getParameter(...) | user-provided value |
 | JSchOSInjectionTest.java:53:36:53:52 | ... + ... | JSchOSInjectionTest.java:40:30:40:60 | getParameter(...) : String | JSchOSInjectionTest.java:53:36:53:52 | ... + ... | This command line depends on a $@. | JSchOSInjectionTest.java:40:30:40:60 | getParameter(...) | user-provided value |
 edges
-| JSchOSInjectionTest.java:14:30:14:60 | getParameter(...) : String | JSchOSInjectionTest.java:27:52:27:68 | ... + ... | provenance | Src:MaD:2  Sink:MaD:1 |
-| JSchOSInjectionTest.java:40:30:40:60 | getParameter(...) : String | JSchOSInjectionTest.java:53:36:53:52 | ... + ... | provenance | Src:MaD:2  Sink:MaD:1 |
+| JSchOSInjectionTest.java:14:30:14:60 | getParameter(...) : String | JSchOSInjectionTest.java:27:52:27:68 | ... + ... | provenance | Src:MaD:2 Sink:MaD:1 |
+| JSchOSInjectionTest.java:40:30:40:60 | getParameter(...) : String | JSchOSInjectionTest.java:53:36:53:52 | ... + ... | provenance | Src:MaD:2 Sink:MaD:1 |
 models
 | 1 | Sink: com.jcraft.jsch; ChannelExec; true; setCommand; ; ; Argument[0]; command-injection; manual |
 | 2 | Source: javax.servlet; ServletRequest; false; getParameter; (String); ; ReturnValue; remote; manual |
diff --git a/java/ql/test/experimental/query-tests/security/CWE-094/JakartaExpressionInjection.expected b/java/ql/test/experimental/query-tests/security/CWE-094/JakartaExpressionInjection.expected
index 84c910f72a3..622bc3f38e9 100644
--- a/java/ql/test/experimental/query-tests/security/CWE-094/JakartaExpressionInjection.expected
+++ b/java/ql/test/experimental/query-tests/security/CWE-094/JakartaExpressionInjection.expected
@@ -8,10 +8,10 @@
 | JakartaExpressionInjection.java:89:13:89:13 | e | JakartaExpressionInjection.java:23:25:23:47 | getInputStream(...) : InputStream | JakartaExpressionInjection.java:89:13:89:13 | e | Jakarta Expression Language injection from $@. | JakartaExpressionInjection.java:23:25:23:47 | getInputStream(...) | this user input |
 | JakartaExpressionInjection.java:99:13:99:13 | e | JakartaExpressionInjection.java:23:25:23:47 | getInputStream(...) : InputStream | JakartaExpressionInjection.java:99:13:99:13 | e | Jakarta Expression Language injection from $@. | JakartaExpressionInjection.java:23:25:23:47 | getInputStream(...) | this user input |
 edges
-| JakartaExpressionInjection.java:23:25:23:47 | getInputStream(...) : InputStream | JakartaExpressionInjection.java:23:54:23:58 | bytes [post update] : byte[] | provenance | Src:MaD:3 MaD:1 |
+| JakartaExpressionInjection.java:23:25:23:47 | getInputStream(...) : InputStream | JakartaExpressionInjection.java:23:54:23:58 | bytes [post update] : byte[] | provenance | Src:MaD:1 MaD:2 |
 | JakartaExpressionInjection.java:23:54:23:58 | bytes [post update] : byte[] | JakartaExpressionInjection.java:24:48:24:52 | bytes : byte[] | provenance |  |
 | JakartaExpressionInjection.java:24:37:24:59 | new String(...) : String | JakartaExpressionInjection.java:25:31:25:40 | expression : String | provenance |  |
-| JakartaExpressionInjection.java:24:48:24:52 | bytes : byte[] | JakartaExpressionInjection.java:24:37:24:59 | new String(...) : String | provenance | MaD:2 |
+| JakartaExpressionInjection.java:24:48:24:52 | bytes : byte[] | JakartaExpressionInjection.java:24:37:24:59 | new String(...) : String | provenance | MaD:3 |
 | JakartaExpressionInjection.java:25:31:25:40 | expression : String | JakartaExpressionInjection.java:32:24:32:33 | expression : String | provenance |  |
 | JakartaExpressionInjection.java:25:31:25:40 | expression : String | JakartaExpressionInjection.java:40:24:40:33 | expression : String | provenance |  |
 | JakartaExpressionInjection.java:25:31:25:40 | expression : String | JakartaExpressionInjection.java:48:24:48:33 | expression : String | provenance |  |
@@ -39,9 +39,9 @@ edges
 | JakartaExpressionInjection.java:98:34:98:112 | createMethodExpression(...) : MethodExpression | JakartaExpressionInjection.java:99:13:99:13 | e | provenance |  |
 | JakartaExpressionInjection.java:98:74:98:83 | expression : String | JakartaExpressionInjection.java:98:34:98:112 | createMethodExpression(...) : MethodExpression | provenance | Config |
 models
-| 1 | Summary: java.io; InputStream; true; read; (byte[]); ; Argument[this]; Argument[0]; taint; manual |
-| 2 | Summary: java.lang; String; false; String; ; ; Argument[0]; Argument[this]; taint; manual |
-| 3 | Source: java.net; Socket; false; getInputStream; (); ; ReturnValue; remote; manual |
+| 1 | Source: java.net; Socket; false; getInputStream; (); ; ReturnValue; remote; manual |
+| 2 | Summary: java.io; InputStream; true; read; (byte[]); ; Argument[this]; Argument[0]; taint; manual |
+| 3 | Summary: java.lang; String; false; String; ; ; Argument[0]; Argument[this]; taint; manual |
 nodes
 | JakartaExpressionInjection.java:23:25:23:47 | getInputStream(...) : InputStream | semmle.label | getInputStream(...) : InputStream |
 | JakartaExpressionInjection.java:23:54:23:58 | bytes [post update] : byte[] | semmle.label | bytes [post update] : byte[] |
diff --git a/java/ql/test/experimental/query-tests/security/CWE-094/JythonInjection.expected b/java/ql/test/experimental/query-tests/security/CWE-094/JythonInjection.expected
index 41856b2bb30..d8eee3aed77 100644
--- a/java/ql/test/experimental/query-tests/security/CWE-094/JythonInjection.expected
+++ b/java/ql/test/experimental/query-tests/security/CWE-094/JythonInjection.expected
@@ -5,14 +5,14 @@
 | JythonInjection.java:106:29:106:134 | makeCode(...) | JythonInjection.java:97:23:97:50 | getParameter(...) : String | JythonInjection.java:106:61:106:75 | getBytes(...) | Jython evaluate $@. | JythonInjection.java:97:23:97:50 | getParameter(...) | user input |
 | JythonInjection.java:131:29:131:109 | compile(...) | JythonInjection.java:131:40:131:63 | getInputStream(...) | JythonInjection.java:131:40:131:63 | getInputStream(...) | Jython evaluate $@. | JythonInjection.java:131:40:131:63 | getInputStream(...) | user input |
 edges
-| JythonInjection.java:28:23:28:50 | getParameter(...) : String | JythonInjection.java:36:30:36:33 | code | provenance | Src:MaD:2  |
-| JythonInjection.java:53:23:53:50 | getParameter(...) : String | JythonInjection.java:58:44:58:47 | code | provenance | Src:MaD:2  |
-| JythonInjection.java:73:23:73:50 | getParameter(...) : String | JythonInjection.java:81:35:81:38 | code | provenance | Src:MaD:2  |
-| JythonInjection.java:97:23:97:50 | getParameter(...) : String | JythonInjection.java:106:61:106:64 | code : String | provenance | Src:MaD:2  |
-| JythonInjection.java:106:61:106:64 | code : String | JythonInjection.java:106:61:106:75 | getBytes(...) | provenance | MaD:1 |
+| JythonInjection.java:28:23:28:50 | getParameter(...) : String | JythonInjection.java:36:30:36:33 | code | provenance | Src:MaD:1  |
+| JythonInjection.java:53:23:53:50 | getParameter(...) : String | JythonInjection.java:58:44:58:47 | code | provenance | Src:MaD:1  |
+| JythonInjection.java:73:23:73:50 | getParameter(...) : String | JythonInjection.java:81:35:81:38 | code | provenance | Src:MaD:1  |
+| JythonInjection.java:97:23:97:50 | getParameter(...) : String | JythonInjection.java:106:61:106:64 | code : String | provenance | Src:MaD:1  |
+| JythonInjection.java:106:61:106:64 | code : String | JythonInjection.java:106:61:106:75 | getBytes(...) | provenance | MaD:2 |
 models
-| 1 | Summary: java.lang; String; false; getBytes; ; ; Argument[this]; ReturnValue; taint; manual |
-| 2 | Source: javax.servlet; ServletRequest; false; getParameter; (String); ; ReturnValue; remote; manual |
+| 1 | Source: javax.servlet; ServletRequest; false; getParameter; (String); ; ReturnValue; remote; manual |
+| 2 | Summary: java.lang; String; false; getBytes; ; ; Argument[this]; ReturnValue; taint; manual |
 nodes
 | JythonInjection.java:28:23:28:50 | getParameter(...) : String | semmle.label | getParameter(...) : String |
 | JythonInjection.java:36:30:36:33 | code | semmle.label | code |
diff --git a/java/ql/test/experimental/query-tests/security/CWE-094/ScriptInjection.expected b/java/ql/test/experimental/query-tests/security/CWE-094/ScriptInjection.expected
index bd95ac70e15..ac0bb19a91f 100644
--- a/java/ql/test/experimental/query-tests/security/CWE-094/ScriptInjection.expected
+++ b/java/ql/test/experimental/query-tests/security/CWE-094/ScriptInjection.expected
@@ -9,22 +9,22 @@
 | ScriptEngineTest.java:52:27:52:47 | compile(...) | ScriptEngineTest.java:91:18:91:45 | getParameter(...) : String | ScriptEngineTest.java:52:42:52:46 | input | Java Script Engine evaluate $@. | ScriptEngineTest.java:91:18:91:45 | getParameter(...) | user input |
 | ScriptEngineTest.java:59:20:59:56 | getProgram(...) | ScriptEngineTest.java:91:18:91:45 | getParameter(...) : String | ScriptEngineTest.java:59:51:59:55 | input | Java Script Engine evaluate $@. | ScriptEngineTest.java:91:18:91:45 | getParameter(...) | user input |
 edges
-| RhinoServlet.java:28:23:28:50 | getParameter(...) : String | RhinoServlet.java:32:55:32:58 | code | provenance | Src:MaD:2  |
-| RhinoServlet.java:81:23:81:50 | getParameter(...) : String | RhinoServlet.java:83:54:83:57 | code | provenance | Src:MaD:2  |
-| RhinoServlet.java:88:23:88:50 | getParameter(...) : String | RhinoServlet.java:89:74:89:77 | code : String | provenance | Src:MaD:2  |
-| RhinoServlet.java:89:74:89:77 | code : String | RhinoServlet.java:89:74:89:88 | getBytes(...) | provenance | MaD:1 |
+| RhinoServlet.java:28:23:28:50 | getParameter(...) : String | RhinoServlet.java:32:55:32:58 | code | provenance | Src:MaD:1  |
+| RhinoServlet.java:81:23:81:50 | getParameter(...) : String | RhinoServlet.java:83:54:83:57 | code | provenance | Src:MaD:1  |
+| RhinoServlet.java:88:23:88:50 | getParameter(...) : String | RhinoServlet.java:89:74:89:77 | code : String | provenance | Src:MaD:1  |
+| RhinoServlet.java:89:74:89:77 | code : String | RhinoServlet.java:89:74:89:88 | getBytes(...) | provenance | MaD:2 |
 | ScriptEngineTest.java:20:44:20:55 | input : String | ScriptEngineTest.java:24:37:24:41 | input | provenance |  |
 | ScriptEngineTest.java:27:51:27:62 | input : String | ScriptEngineTest.java:31:31:31:35 | input | provenance |  |
 | ScriptEngineTest.java:35:58:35:69 | input : String | ScriptEngineTest.java:39:31:39:35 | input | provenance |  |
 | ScriptEngineTest.java:42:46:42:57 | input : String | ScriptEngineTest.java:46:31:46:35 | input | provenance |  |
 | ScriptEngineTest.java:49:41:49:52 | input : String | ScriptEngineTest.java:52:42:52:46 | input | provenance |  |
 | ScriptEngineTest.java:56:41:56:52 | input : String | ScriptEngineTest.java:59:51:59:55 | input | provenance |  |
-| ScriptEngineTest.java:91:18:91:45 | getParameter(...) : String | ScriptEngineTest.java:93:57:93:60 | code : String | provenance | Src:MaD:2  |
-| ScriptEngineTest.java:91:18:91:45 | getParameter(...) : String | ScriptEngineTest.java:94:64:94:67 | code : String | provenance | Src:MaD:2  |
-| ScriptEngineTest.java:91:18:91:45 | getParameter(...) : String | ScriptEngineTest.java:95:71:95:74 | code : String | provenance | Src:MaD:2  |
-| ScriptEngineTest.java:91:18:91:45 | getParameter(...) : String | ScriptEngineTest.java:96:59:96:62 | code : String | provenance | Src:MaD:2  |
-| ScriptEngineTest.java:91:18:91:45 | getParameter(...) : String | ScriptEngineTest.java:97:54:97:57 | code : String | provenance | Src:MaD:2  |
-| ScriptEngineTest.java:91:18:91:45 | getParameter(...) : String | ScriptEngineTest.java:98:54:98:57 | code : String | provenance | Src:MaD:2  |
+| ScriptEngineTest.java:91:18:91:45 | getParameter(...) : String | ScriptEngineTest.java:93:57:93:60 | code : String | provenance | Src:MaD:1  |
+| ScriptEngineTest.java:91:18:91:45 | getParameter(...) : String | ScriptEngineTest.java:94:64:94:67 | code : String | provenance | Src:MaD:1  |
+| ScriptEngineTest.java:91:18:91:45 | getParameter(...) : String | ScriptEngineTest.java:95:71:95:74 | code : String | provenance | Src:MaD:1  |
+| ScriptEngineTest.java:91:18:91:45 | getParameter(...) : String | ScriptEngineTest.java:96:59:96:62 | code : String | provenance | Src:MaD:1  |
+| ScriptEngineTest.java:91:18:91:45 | getParameter(...) : String | ScriptEngineTest.java:97:54:97:57 | code : String | provenance | Src:MaD:1  |
+| ScriptEngineTest.java:91:18:91:45 | getParameter(...) : String | ScriptEngineTest.java:98:54:98:57 | code : String | provenance | Src:MaD:1  |
 | ScriptEngineTest.java:93:57:93:60 | code : String | ScriptEngineTest.java:20:44:20:55 | input : String | provenance |  |
 | ScriptEngineTest.java:94:64:94:67 | code : String | ScriptEngineTest.java:27:51:27:62 | input : String | provenance |  |
 | ScriptEngineTest.java:95:71:95:74 | code : String | ScriptEngineTest.java:35:58:35:69 | input : String | provenance |  |
@@ -32,8 +32,8 @@ edges
 | ScriptEngineTest.java:97:54:97:57 | code : String | ScriptEngineTest.java:49:41:49:52 | input : String | provenance |  |
 | ScriptEngineTest.java:98:54:98:57 | code : String | ScriptEngineTest.java:56:41:56:52 | input : String | provenance |  |
 models
-| 1 | Summary: java.lang; String; false; getBytes; ; ; Argument[this]; ReturnValue; taint; manual |
-| 2 | Source: javax.servlet; ServletRequest; false; getParameter; (String); ; ReturnValue; remote; manual |
+| 1 | Source: javax.servlet; ServletRequest; false; getParameter; (String); ; ReturnValue; remote; manual |
+| 2 | Summary: java.lang; String; false; getBytes; ; ; Argument[this]; ReturnValue; taint; manual |
 nodes
 | RhinoServlet.java:28:23:28:50 | getParameter(...) : String | semmle.label | getParameter(...) : String |
 | RhinoServlet.java:32:55:32:58 | code | semmle.label | code |
diff --git a/java/ql/test/experimental/query-tests/security/CWE-1004/SensitiveCookieNotHttpOnly.expected b/java/ql/test/experimental/query-tests/security/CWE-1004/SensitiveCookieNotHttpOnly.expected
index 8b27d9f7e2a..2a08cf5482b 100644
--- a/java/ql/test/experimental/query-tests/security/CWE-1004/SensitiveCookieNotHttpOnly.expected
+++ b/java/ql/test/experimental/query-tests/security/CWE-1004/SensitiveCookieNotHttpOnly.expected
@@ -11,26 +11,26 @@
 | SensitiveCookieNotHttpOnly.java:111:28:111:33 | cookie | SensitiveCookieNotHttpOnly.java:88:35:88:51 | "Presto-UI-Token" : String | SensitiveCookieNotHttpOnly.java:111:28:111:33 | cookie | $@ doesn't have the HttpOnly flag set. | SensitiveCookieNotHttpOnly.java:88:35:88:51 | "Presto-UI-Token" | This sensitive cookie |
 edges
 | SensitiveCookieNotHttpOnly.java:24:33:24:43 | "jwt_token" : String | SensitiveCookieNotHttpOnly.java:25:39:25:52 | tokenCookieStr : String | provenance |  |
-| SensitiveCookieNotHttpOnly.java:25:28:25:64 | new Cookie(...) : Cookie | SensitiveCookieNotHttpOnly.java:31:28:31:36 | jwtCookie | provenance |  Sink:MaD:1 |
+| SensitiveCookieNotHttpOnly.java:25:28:25:64 | new Cookie(...) : Cookie | SensitiveCookieNotHttpOnly.java:31:28:31:36 | jwtCookie | provenance | Sink:MaD:1 |
 | SensitiveCookieNotHttpOnly.java:25:39:25:52 | tokenCookieStr : String | SensitiveCookieNotHttpOnly.java:25:28:25:64 | new Cookie(...) : Cookie | provenance | Config |
 | SensitiveCookieNotHttpOnly.java:25:39:25:52 | tokenCookieStr : String | SensitiveCookieNotHttpOnly.java:25:28:25:64 | new Cookie(...) : Cookie | provenance | MaD:4 |
-| SensitiveCookieNotHttpOnly.java:42:42:42:49 | "token=" : String | SensitiveCookieNotHttpOnly.java:42:42:42:69 | ... + ... | provenance |  Sink:MaD:2 |
-| SensitiveCookieNotHttpOnly.java:42:42:42:57 | ... + ... : String | SensitiveCookieNotHttpOnly.java:42:42:42:69 | ... + ... | provenance |  Sink:MaD:2 |
+| SensitiveCookieNotHttpOnly.java:42:42:42:49 | "token=" : String | SensitiveCookieNotHttpOnly.java:42:42:42:69 | ... + ... | provenance | Sink:MaD:2 |
+| SensitiveCookieNotHttpOnly.java:42:42:42:57 | ... + ... : String | SensitiveCookieNotHttpOnly.java:42:42:42:69 | ... + ... | provenance | Sink:MaD:2 |
 | SensitiveCookieNotHttpOnly.java:52:42:52:113 | new NewCookie(...) : NewCookie | SensitiveCookieNotHttpOnly.java:52:42:52:124 | toString(...) | provenance | MaD:5 Sink:MaD:3 |
 | SensitiveCookieNotHttpOnly.java:52:56:52:75 | "session-access-key" : String | SensitiveCookieNotHttpOnly.java:52:42:52:113 | new NewCookie(...) : NewCookie | provenance | MaD:6 |
 | SensitiveCookieNotHttpOnly.java:63:37:63:115 | new NewCookie(...) : NewCookie | SensitiveCookieNotHttpOnly.java:64:25:64:39 | accessKeyCookie : NewCookie | provenance |  |
 | SensitiveCookieNotHttpOnly.java:63:51:63:70 | "session-access-key" : String | SensitiveCookieNotHttpOnly.java:63:37:63:115 | new NewCookie(...) : NewCookie | provenance | MaD:6 |
 | SensitiveCookieNotHttpOnly.java:64:25:64:39 | accessKeyCookie : NewCookie | SensitiveCookieNotHttpOnly.java:64:25:64:50 | toString(...) : String | provenance | MaD:5 |
-| SensitiveCookieNotHttpOnly.java:64:25:64:50 | toString(...) : String | SensitiveCookieNotHttpOnly.java:65:42:65:47 | keyStr | provenance |  Sink:MaD:3 |
-| SensitiveCookieNotHttpOnly.java:70:28:70:35 | "token=" : String | SensitiveCookieNotHttpOnly.java:71:42:71:50 | secString | provenance |  Sink:MaD:2 |
-| SensitiveCookieNotHttpOnly.java:70:28:70:43 | ... + ... : String | SensitiveCookieNotHttpOnly.java:71:42:71:50 | secString | provenance |  Sink:MaD:2 |
-| SensitiveCookieNotHttpOnly.java:70:28:70:55 | ... + ... : String | SensitiveCookieNotHttpOnly.java:71:42:71:50 | secString | provenance |  Sink:MaD:2 |
+| SensitiveCookieNotHttpOnly.java:64:25:64:50 | toString(...) : String | SensitiveCookieNotHttpOnly.java:65:42:65:47 | keyStr | provenance | Sink:MaD:3 |
+| SensitiveCookieNotHttpOnly.java:70:28:70:35 | "token=" : String | SensitiveCookieNotHttpOnly.java:71:42:71:50 | secString | provenance | Sink:MaD:2 |
+| SensitiveCookieNotHttpOnly.java:70:28:70:43 | ... + ... : String | SensitiveCookieNotHttpOnly.java:71:42:71:50 | secString | provenance | Sink:MaD:2 |
+| SensitiveCookieNotHttpOnly.java:70:28:70:55 | ... + ... : String | SensitiveCookieNotHttpOnly.java:71:42:71:50 | secString | provenance | Sink:MaD:2 |
 | SensitiveCookieNotHttpOnly.java:88:35:88:51 | "Presto-UI-Token" : String | SensitiveCookieNotHttpOnly.java:89:36:89:51 | PRESTO_UI_COOKIE : String | provenance |  |
 | SensitiveCookieNotHttpOnly.java:89:25:89:57 | new Cookie(...) : Cookie | SensitiveCookieNotHttpOnly.java:91:16:91:21 | cookie : Cookie | provenance |  |
 | SensitiveCookieNotHttpOnly.java:89:36:89:51 | PRESTO_UI_COOKIE : String | SensitiveCookieNotHttpOnly.java:89:25:89:57 | new Cookie(...) : Cookie | provenance | Config |
 | SensitiveCookieNotHttpOnly.java:89:36:89:51 | PRESTO_UI_COOKIE : String | SensitiveCookieNotHttpOnly.java:89:25:89:57 | new Cookie(...) : Cookie | provenance | MaD:4 |
 | SensitiveCookieNotHttpOnly.java:91:16:91:21 | cookie : Cookie | SensitiveCookieNotHttpOnly.java:110:25:110:64 | createAuthenticationCookie(...) : Cookie | provenance |  |
-| SensitiveCookieNotHttpOnly.java:110:25:110:64 | createAuthenticationCookie(...) : Cookie | SensitiveCookieNotHttpOnly.java:111:28:111:33 | cookie | provenance |  Sink:MaD:1 |
+| SensitiveCookieNotHttpOnly.java:110:25:110:64 | createAuthenticationCookie(...) : Cookie | SensitiveCookieNotHttpOnly.java:111:28:111:33 | cookie | provenance | Sink:MaD:1 |
 models
 | 1 | Sink: javax.servlet.http; HttpServletResponse; false; addCookie; ; ; Argument[0]; response-splitting; manual |
 | 2 | Sink: javax.servlet.http; HttpServletResponse; false; addHeader; ; ; Argument[0..1]; response-splitting; manual |
diff --git a/java/ql/test/experimental/query-tests/security/CWE-200/InsecureWebResourceResponse.expected b/java/ql/test/experimental/query-tests/security/CWE-200/InsecureWebResourceResponse.expected
index f5738446a08..7d140ab379a 100644
--- a/java/ql/test/experimental/query-tests/security/CWE-200/InsecureWebResourceResponse.expected
+++ b/java/ql/test/experimental/query-tests/security/CWE-200/InsecureWebResourceResponse.expected
@@ -26,10 +26,10 @@ edges
 | InsecureWebResourceResponse.java:59:34:59:43 | url : String | InsecureWebResourceResponse.java:75:20:75:22 | url : String | provenance |  |
 | InsecureWebResourceResponse.java:63:77:63:86 | url : String | InsecureWebResourceResponse.java:65:41:65:43 | url : String | provenance |  |
 | InsecureWebResourceResponse.java:65:31:65:44 | parse(...) : Uri | InsecureWebResourceResponse.java:66:71:66:73 | uri : Uri | provenance |  |
-| InsecureWebResourceResponse.java:65:41:65:43 | url : String | InsecureWebResourceResponse.java:65:31:65:44 | parse(...) : Uri | provenance | MaD:4 |
+| InsecureWebResourceResponse.java:65:41:65:43 | url : String | InsecureWebResourceResponse.java:65:31:65:44 | parse(...) : Uri | provenance | MaD:2 |
 | InsecureWebResourceResponse.java:66:51:66:84 | new FileInputStream(...) : FileInputStream | InsecureWebResourceResponse.java:68:71:68:81 | inputStream | provenance |  |
-| InsecureWebResourceResponse.java:66:71:66:73 | uri : Uri | InsecureWebResourceResponse.java:66:71:66:83 | getPath(...) : String | provenance | MaD:3 |
-| InsecureWebResourceResponse.java:66:71:66:83 | getPath(...) : String | InsecureWebResourceResponse.java:66:51:66:84 | new FileInputStream(...) : FileInputStream | provenance | MaD:6 |
+| InsecureWebResourceResponse.java:66:71:66:73 | uri : Uri | InsecureWebResourceResponse.java:66:71:66:83 | getPath(...) : String | provenance | MaD:4 |
+| InsecureWebResourceResponse.java:66:71:66:83 | getPath(...) : String | InsecureWebResourceResponse.java:66:51:66:84 | new FileInputStream(...) : FileInputStream | provenance | MaD:7 |
 | InsecureWebResourceResponse.java:75:20:75:22 | url : String | InsecureWebResourceResponse.java:63:77:63:86 | url : String | provenance | AdditionalTaintStep |
 | InsecureWebResourceResponse.java:75:20:75:22 | url : String | InsecureWebResourceResponse.java:84:77:84:86 | url : String | provenance | AdditionalTaintStep |
 | InsecureWebResourceResponse.java:75:20:75:22 | url : String | InsecureWebResourceResponse.java:110:77:110:86 | url : String | provenance | AdditionalTaintStep |
@@ -38,12 +38,12 @@ edges
 | InsecureWebResourceResponse.java:80:34:80:43 | url : String | InsecureWebResourceResponse.java:101:20:101:22 | url : String | provenance |  |
 | InsecureWebResourceResponse.java:84:77:84:86 | url : String | InsecureWebResourceResponse.java:86:41:86:43 | url : String | provenance |  |
 | InsecureWebResourceResponse.java:86:31:86:44 | parse(...) : Uri | InsecureWebResourceResponse.java:88:66:88:68 | uri : Uri | provenance |  |
-| InsecureWebResourceResponse.java:86:41:86:43 | url : String | InsecureWebResourceResponse.java:86:31:86:44 | parse(...) : Uri | provenance | MaD:4 |
+| InsecureWebResourceResponse.java:86:41:86:43 | url : String | InsecureWebResourceResponse.java:86:31:86:44 | parse(...) : Uri | provenance | MaD:2 |
 | InsecureWebResourceResponse.java:88:42:88:90 | new File(...) : File | InsecureWebResourceResponse.java:89:75:89:83 | cacheFile : File | provenance |  |
-| InsecureWebResourceResponse.java:88:66:88:68 | uri : Uri | InsecureWebResourceResponse.java:88:66:88:89 | getLastPathSegment(...) : String | provenance | MaD:2 |
-| InsecureWebResourceResponse.java:88:66:88:89 | getLastPathSegment(...) : String | InsecureWebResourceResponse.java:88:42:88:90 | new File(...) : File | provenance | MaD:7 |
+| InsecureWebResourceResponse.java:88:66:88:68 | uri : Uri | InsecureWebResourceResponse.java:88:66:88:89 | getLastPathSegment(...) : String | provenance | MaD:3 |
+| InsecureWebResourceResponse.java:88:66:88:89 | getLastPathSegment(...) : String | InsecureWebResourceResponse.java:88:42:88:90 | new File(...) : File | provenance | MaD:6 |
 | InsecureWebResourceResponse.java:89:55:89:84 | new FileInputStream(...) : FileInputStream | InsecureWebResourceResponse.java:91:75:91:85 | inputStream | provenance |  |
-| InsecureWebResourceResponse.java:89:75:89:83 | cacheFile : File | InsecureWebResourceResponse.java:89:55:89:84 | new FileInputStream(...) : FileInputStream | provenance | MaD:6 |
+| InsecureWebResourceResponse.java:89:75:89:83 | cacheFile : File | InsecureWebResourceResponse.java:89:55:89:84 | new FileInputStream(...) : FileInputStream | provenance | MaD:7 |
 | InsecureWebResourceResponse.java:101:20:101:22 | url : String | InsecureWebResourceResponse.java:63:77:63:86 | url : String | provenance | AdditionalTaintStep |
 | InsecureWebResourceResponse.java:101:20:101:22 | url : String | InsecureWebResourceResponse.java:84:77:84:86 | url : String | provenance | AdditionalTaintStep |
 | InsecureWebResourceResponse.java:101:20:101:22 | url : String | InsecureWebResourceResponse.java:110:77:110:86 | url : String | provenance | AdditionalTaintStep |
@@ -52,13 +52,13 @@ edges
 | InsecureWebResourceResponse.java:106:34:106:43 | url : String | InsecureWebResourceResponse.java:127:20:127:22 | url : String | provenance |  |
 | InsecureWebResourceResponse.java:110:77:110:86 | url : String | InsecureWebResourceResponse.java:112:41:112:43 | url : String | provenance |  |
 | InsecureWebResourceResponse.java:112:31:112:44 | parse(...) : Uri | InsecureWebResourceResponse.java:113:35:113:37 | uri : Uri | provenance |  |
-| InsecureWebResourceResponse.java:112:41:112:43 | url : String | InsecureWebResourceResponse.java:112:31:112:44 | parse(...) : Uri | provenance | MaD:4 |
-| InsecureWebResourceResponse.java:113:35:113:37 | uri : Uri | InsecureWebResourceResponse.java:113:35:113:47 | getPath(...) : String | provenance | MaD:3 |
+| InsecureWebResourceResponse.java:112:41:112:43 | url : String | InsecureWebResourceResponse.java:112:31:112:44 | parse(...) : Uri | provenance | MaD:2 |
+| InsecureWebResourceResponse.java:113:35:113:37 | uri : Uri | InsecureWebResourceResponse.java:113:35:113:47 | getPath(...) : String | provenance | MaD:4 |
 | InsecureWebResourceResponse.java:113:35:113:47 | getPath(...) : String | InsecureWebResourceResponse.java:113:35:113:60 | substring(...) : String | provenance | MaD:8 |
 | InsecureWebResourceResponse.java:113:35:113:60 | substring(...) : String | InsecureWebResourceResponse.java:115:75:115:78 | path : String | provenance |  |
 | InsecureWebResourceResponse.java:115:55:115:108 | new FileInputStream(...) : FileInputStream | InsecureWebResourceResponse.java:117:75:117:85 | inputStream | provenance |  |
 | InsecureWebResourceResponse.java:115:75:115:78 | path : String | InsecureWebResourceResponse.java:115:75:115:107 | substring(...) : String | provenance | MaD:8 |
-| InsecureWebResourceResponse.java:115:75:115:107 | substring(...) : String | InsecureWebResourceResponse.java:115:55:115:108 | new FileInputStream(...) : FileInputStream | provenance | MaD:6 |
+| InsecureWebResourceResponse.java:115:75:115:107 | substring(...) : String | InsecureWebResourceResponse.java:115:55:115:108 | new FileInputStream(...) : FileInputStream | provenance | MaD:7 |
 | InsecureWebResourceResponse.java:127:20:127:22 | url : String | InsecureWebResourceResponse.java:63:77:63:86 | url : String | provenance | AdditionalTaintStep |
 | InsecureWebResourceResponse.java:127:20:127:22 | url : String | InsecureWebResourceResponse.java:84:77:84:86 | url : String | provenance | AdditionalTaintStep |
 | InsecureWebResourceResponse.java:127:20:127:22 | url : String | InsecureWebResourceResponse.java:110:77:110:86 | url : String | provenance | AdditionalTaintStep |
@@ -87,10 +87,10 @@ edges
 | InsecureWebResourceResponse.java:194:31:194:37 | request : WebResourceRequest | InsecureWebResourceResponse.java:194:31:194:46 | getUrl(...) : Uri | provenance | MaD:5 |
 | InsecureWebResourceResponse.java:194:31:194:46 | getUrl(...) : Uri | InsecureWebResourceResponse.java:196:66:196:68 | uri : Uri | provenance |  |
 | InsecureWebResourceResponse.java:196:42:196:90 | new File(...) : File | InsecureWebResourceResponse.java:197:75:197:83 | cacheFile : File | provenance |  |
-| InsecureWebResourceResponse.java:196:66:196:68 | uri : Uri | InsecureWebResourceResponse.java:196:66:196:89 | getLastPathSegment(...) : String | provenance | MaD:2 |
-| InsecureWebResourceResponse.java:196:66:196:89 | getLastPathSegment(...) : String | InsecureWebResourceResponse.java:196:42:196:90 | new File(...) : File | provenance | MaD:7 |
+| InsecureWebResourceResponse.java:196:66:196:68 | uri : Uri | InsecureWebResourceResponse.java:196:66:196:89 | getLastPathSegment(...) : String | provenance | MaD:3 |
+| InsecureWebResourceResponse.java:196:66:196:89 | getLastPathSegment(...) : String | InsecureWebResourceResponse.java:196:42:196:90 | new File(...) : File | provenance | MaD:6 |
 | InsecureWebResourceResponse.java:197:55:197:84 | new FileInputStream(...) : FileInputStream | InsecureWebResourceResponse.java:199:75:199:85 | inputStream | provenance |  |
-| InsecureWebResourceResponse.java:197:75:197:83 | cacheFile : File | InsecureWebResourceResponse.java:197:55:197:84 | new FileInputStream(...) : FileInputStream | provenance | MaD:6 |
+| InsecureWebResourceResponse.java:197:75:197:83 | cacheFile : File | InsecureWebResourceResponse.java:197:55:197:84 | new FileInputStream(...) : FileInputStream | provenance | MaD:7 |
 | InsecureWebResourceResponse.java:209:20:209:22 | url : String | InsecureWebResourceResponse.java:63:77:63:86 | url : String | provenance | AdditionalTaintStep |
 | InsecureWebResourceResponse.java:209:20:209:22 | url : String | InsecureWebResourceResponse.java:84:77:84:86 | url : String | provenance | AdditionalTaintStep |
 | InsecureWebResourceResponse.java:209:20:209:22 | url : String | InsecureWebResourceResponse.java:110:77:110:86 | url : String | provenance | AdditionalTaintStep |
@@ -104,10 +104,10 @@ edges
 | InsecureWebResourceResponse.java:226:20:226:22 | url : String | InsecureWebResourceResponse.java:232:69:232:78 | url : String | provenance | AdditionalTaintStep |
 | InsecureWebResourceResponse.java:232:69:232:78 | url : String | InsecureWebResourceResponse.java:234:33:234:35 | url : String | provenance |  |
 | InsecureWebResourceResponse.java:234:23:234:36 | parse(...) : Uri | InsecureWebResourceResponse.java:235:63:235:65 | uri : Uri | provenance |  |
-| InsecureWebResourceResponse.java:234:33:234:35 | url : String | InsecureWebResourceResponse.java:234:23:234:36 | parse(...) : Uri | provenance | MaD:4 |
+| InsecureWebResourceResponse.java:234:33:234:35 | url : String | InsecureWebResourceResponse.java:234:23:234:36 | parse(...) : Uri | provenance | MaD:2 |
 | InsecureWebResourceResponse.java:235:43:235:76 | new FileInputStream(...) : FileInputStream | InsecureWebResourceResponse.java:237:63:237:73 | inputStream | provenance |  |
-| InsecureWebResourceResponse.java:235:63:235:65 | uri : Uri | InsecureWebResourceResponse.java:235:63:235:75 | getPath(...) : String | provenance | MaD:3 |
-| InsecureWebResourceResponse.java:235:63:235:75 | getPath(...) : String | InsecureWebResourceResponse.java:235:43:235:76 | new FileInputStream(...) : FileInputStream | provenance | MaD:6 |
+| InsecureWebResourceResponse.java:235:63:235:65 | uri : Uri | InsecureWebResourceResponse.java:235:63:235:75 | getPath(...) : String | provenance | MaD:4 |
+| InsecureWebResourceResponse.java:235:63:235:75 | getPath(...) : String | InsecureWebResourceResponse.java:235:43:235:76 | new FileInputStream(...) : FileInputStream | provenance | MaD:7 |
 | InsecureWebViewActivity.java:27:27:27:37 | getIntent(...) : Intent | InsecureWebViewActivity.java:27:27:27:64 | getStringExtra(...) : String | provenance | MaD:1 |
 | InsecureWebViewActivity.java:27:27:27:64 | getStringExtra(...) : String | InsecureWebViewActivity.java:28:20:28:27 | inputUrl : String | provenance |  |
 | InsecureWebViewActivity.java:28:20:28:27 | inputUrl : String | InsecureWebViewActivity.java:42:28:42:37 | url : String | provenance |  |
@@ -115,18 +115,18 @@ edges
 | InsecureWebViewActivity.java:43:25:43:27 | url : String | InsecureWebViewActivity.java:53:77:53:86 | url : String | provenance | AdditionalTaintStep |
 | InsecureWebViewActivity.java:53:77:53:86 | url : String | InsecureWebViewActivity.java:55:41:55:43 | url : String | provenance |  |
 | InsecureWebViewActivity.java:55:31:55:44 | parse(...) : Uri | InsecureWebViewActivity.java:56:71:56:73 | uri : Uri | provenance |  |
-| InsecureWebViewActivity.java:55:41:55:43 | url : String | InsecureWebViewActivity.java:55:31:55:44 | parse(...) : Uri | provenance | MaD:4 |
+| InsecureWebViewActivity.java:55:41:55:43 | url : String | InsecureWebViewActivity.java:55:31:55:44 | parse(...) : Uri | provenance | MaD:2 |
 | InsecureWebViewActivity.java:56:51:56:84 | new FileInputStream(...) : FileInputStream | InsecureWebViewActivity.java:58:71:58:81 | inputStream | provenance |  |
-| InsecureWebViewActivity.java:56:71:56:73 | uri : Uri | InsecureWebViewActivity.java:56:71:56:83 | getPath(...) : String | provenance | MaD:3 |
-| InsecureWebViewActivity.java:56:71:56:83 | getPath(...) : String | InsecureWebViewActivity.java:56:51:56:84 | new FileInputStream(...) : FileInputStream | provenance | MaD:6 |
+| InsecureWebViewActivity.java:56:71:56:73 | uri : Uri | InsecureWebViewActivity.java:56:71:56:83 | getPath(...) : String | provenance | MaD:4 |
+| InsecureWebViewActivity.java:56:71:56:83 | getPath(...) : String | InsecureWebViewActivity.java:56:51:56:84 | new FileInputStream(...) : FileInputStream | provenance | MaD:7 |
 models
 | 1 | Summary: android.content; Intent; true; getStringExtra; (String); ; Argument[this].SyntheticField[android.content.Intent.extras].MapValue; ReturnValue; value; manual |
-| 2 | Summary: android.net; Uri; true; getLastPathSegment; ; ; Argument[this]; ReturnValue; taint; manual |
-| 3 | Summary: android.net; Uri; true; getPath; ; ; Argument[this]; ReturnValue; taint; manual |
-| 4 | Summary: android.net; Uri; false; parse; ; ; Argument[0]; ReturnValue; taint; manual |
+| 2 | Summary: android.net; Uri; false; parse; ; ; Argument[0]; ReturnValue; taint; manual |
+| 3 | Summary: android.net; Uri; true; getLastPathSegment; ; ; Argument[this]; ReturnValue; taint; manual |
+| 4 | Summary: android.net; Uri; true; getPath; ; ; Argument[this]; ReturnValue; taint; manual |
 | 5 | Summary: android.webkit; WebResourceRequest; false; getUrl; ; ; Argument[this]; ReturnValue; taint; manual |
-| 6 | Summary: java.io; FileInputStream; true; FileInputStream; ; ; Argument[0]; Argument[this]; taint; manual |
-| 7 | Summary: java.io; File; false; File; ; ; Argument[1]; Argument[this]; taint; manual |
+| 6 | Summary: java.io; File; false; File; ; ; Argument[1]; Argument[this]; taint; manual |
+| 7 | Summary: java.io; FileInputStream; true; FileInputStream; ; ; Argument[0]; Argument[this]; taint; manual |
 | 8 | Summary: java.lang; String; false; substring; ; ; Argument[this]; ReturnValue; taint; manual |
 nodes
 | InsecureWebResourceResponse.java:28:27:28:37 | getIntent(...) : Intent | semmle.label | getIntent(...) : Intent |
diff --git a/java/ql/test/experimental/query-tests/security/CWE-200/SensitiveAndroidFileLeak.expected b/java/ql/test/experimental/query-tests/security/CWE-200/SensitiveAndroidFileLeak.expected
index 4282361f89e..a8d405215e1 100644
--- a/java/ql/test/experimental/query-tests/security/CWE-200/SensitiveAndroidFileLeak.expected
+++ b/java/ql/test/experimental/query-tests/security/CWE-200/SensitiveAndroidFileLeak.expected
@@ -4,7 +4,7 @@
 | LeakFileActivity.java:21:58:21:82 | getPath(...) | LeakFileActivity.java:14:35:14:38 | data : Intent | LeakFileActivity.java:21:58:21:82 | getPath(...) | Leaking arbitrary Android file from $@. | LeakFileActivity.java:14:35:14:38 | data | this user input |
 edges
 | FileService.java:20:31:20:43 | intent : Intent | FileService.java:21:28:21:33 | intent : Intent | provenance |  |
-| FileService.java:21:28:21:33 | intent : Intent | FileService.java:21:28:21:64 | getStringExtra(...) : String | provenance | MaD:2 |
+| FileService.java:21:28:21:33 | intent : Intent | FileService.java:21:28:21:64 | getStringExtra(...) : String | provenance | MaD:4 |
 | FileService.java:21:28:21:64 | getStringExtra(...) : String | FileService.java:25:42:25:50 | localPath : String | provenance |  |
 | FileService.java:25:13:25:51 | makeParamsToExecute(...) : Object[] [[]] : String | FileService.java:40:41:40:55 | params : Object[] | provenance | Config |
 | FileService.java:25:42:25:50 | localPath : String | FileService.java:25:13:25:51 | makeParamsToExecute(...) : Object[] [[]] : String | provenance |  |
@@ -13,21 +13,21 @@ edges
 | FileService.java:34:20:36:13 | {...} : Object[] [[]] : String | FileService.java:34:20:36:13 | new Object[] : Object[] [[]] : String | provenance |  |
 | FileService.java:35:17:35:25 | sourceUri : String | FileService.java:34:20:36:13 | {...} : Object[] [[]] : String | provenance |  |
 | FileService.java:40:41:40:55 | params : Object[] | FileService.java:44:33:44:52 | (...)... : String[] | provenance |  |
-| FileService.java:44:33:44:52 | (...)... : String[] | FileService.java:45:53:45:59 | ...[...] | provenance |  Sink:MaD:4 |
+| FileService.java:44:33:44:52 | (...)... : String[] | FileService.java:45:53:45:59 | ...[...] | provenance | Sink:MaD:1 |
 | LeakFileActivity2.java:15:13:15:18 | intent : Intent | LeakFileActivity2.java:16:26:16:31 | intent : Intent | provenance |  |
 | LeakFileActivity2.java:16:26:16:31 | intent : Intent | FileService.java:20:31:20:43 | intent : Intent | provenance |  |
 | LeakFileActivity2.java:16:26:16:31 | intent : Intent | FileService.java:20:31:20:43 | intent : Intent | provenance | Config |
 | LeakFileActivity.java:14:35:14:38 | data : Intent | LeakFileActivity.java:18:40:18:59 | contentIntent : Intent | provenance |  |
 | LeakFileActivity.java:18:40:18:59 | contentIntent : Intent | LeakFileActivity.java:19:31:19:43 | contentIntent : Intent | provenance |  |
-| LeakFileActivity.java:19:31:19:43 | contentIntent : Intent | LeakFileActivity.java:19:31:19:53 | getData(...) : Uri | provenance | MaD:1 |
+| LeakFileActivity.java:19:31:19:43 | contentIntent : Intent | LeakFileActivity.java:19:31:19:53 | getData(...) : Uri | provenance | MaD:3 |
 | LeakFileActivity.java:19:31:19:53 | getData(...) : Uri | LeakFileActivity.java:21:58:21:72 | streamsToUpload : Uri | provenance |  |
-| LeakFileActivity.java:21:58:21:72 | streamsToUpload : Uri | LeakFileActivity.java:21:58:21:82 | getPath(...) | provenance | MaD:3 Sink:MaD:5 |
+| LeakFileActivity.java:21:58:21:72 | streamsToUpload : Uri | LeakFileActivity.java:21:58:21:82 | getPath(...) | provenance | MaD:5 Sink:MaD:2 |
 models
-| 1 | Summary: android.content; Intent; true; getData; ; ; Argument[this].SyntheticField[android.content.Intent.data]; ReturnValue; value; manual |
-| 2 | Summary: android.content; Intent; true; getStringExtra; (String); ; Argument[this].SyntheticField[android.content.Intent.extras].MapValue; ReturnValue; value; manual |
-| 3 | Summary: android.net; Uri; true; getPath; ; ; Argument[this]; ReturnValue; taint; manual |
-| 4 | Sink: java.io; FileOutputStream; false; FileOutputStream; ; ; Argument[0]; path-injection; manual |
-| 5 | Sink: java.io; RandomAccessFile; false; RandomAccessFile; ; ; Argument[0]; path-injection; manual |
+| 1 | Sink: java.io; FileOutputStream; false; FileOutputStream; ; ; Argument[0]; path-injection; manual |
+| 2 | Sink: java.io; RandomAccessFile; false; RandomAccessFile; ; ; Argument[0]; path-injection; manual |
+| 3 | Summary: android.content; Intent; true; getData; ; ; Argument[this].SyntheticField[android.content.Intent.data]; ReturnValue; value; manual |
+| 4 | Summary: android.content; Intent; true; getStringExtra; (String); ; Argument[this].SyntheticField[android.content.Intent.extras].MapValue; ReturnValue; value; manual |
+| 5 | Summary: android.net; Uri; true; getPath; ; ; Argument[this]; ReturnValue; taint; manual |
 nodes
 | FileService.java:20:31:20:43 | intent : Intent | semmle.label | intent : Intent |
 | FileService.java:21:28:21:33 | intent : Intent | semmle.label | intent : Intent |
diff --git a/java/ql/test/experimental/query-tests/security/CWE-346/UnvalidatedCors.expected b/java/ql/test/experimental/query-tests/security/CWE-346/UnvalidatedCors.expected
index e2c122dc37c..d9e250bab71 100644
--- a/java/ql/test/experimental/query-tests/security/CWE-346/UnvalidatedCors.expected
+++ b/java/ql/test/experimental/query-tests/security/CWE-346/UnvalidatedCors.expected
@@ -1,10 +1,10 @@
 #select
 | UnvalidatedCors.java:27:67:27:69 | url | UnvalidatedCors.java:21:22:21:48 | getHeader(...) : String | UnvalidatedCors.java:27:67:27:69 | url | CORS header is being set using user controlled value $@. | UnvalidatedCors.java:21:22:21:48 | getHeader(...) | user-provided value |
 edges
-| UnvalidatedCors.java:21:22:21:48 | getHeader(...) : String | UnvalidatedCors.java:27:67:27:69 | url | provenance | Src:MaD:1  Sink:MaD:2 |
+| UnvalidatedCors.java:21:22:21:48 | getHeader(...) : String | UnvalidatedCors.java:27:67:27:69 | url | provenance | Src:MaD:2 Sink:MaD:1 |
 models
-| 1 | Source: javax.servlet.http; HttpServletRequest; false; getHeader; (String); ; ReturnValue; remote; manual |
-| 2 | Sink: javax.servlet.http; HttpServletResponse; false; addHeader; ; ; Argument[0..1]; response-splitting; manual |
+| 1 | Sink: javax.servlet.http; HttpServletResponse; false; addHeader; ; ; Argument[0..1]; response-splitting; manual |
+| 2 | Source: javax.servlet.http; HttpServletRequest; false; getHeader; (String); ; ReturnValue; remote; manual |
 nodes
 | UnvalidatedCors.java:21:22:21:48 | getHeader(...) : String | semmle.label | getHeader(...) : String |
 | UnvalidatedCors.java:27:67:27:69 | url | semmle.label | url |
diff --git a/java/ql/test/experimental/query-tests/security/CWE-347/Auth0NoVerifier.expected b/java/ql/test/experimental/query-tests/security/CWE-347/Auth0NoVerifier.expected
index 3d91060cc31..1b4b57f2205 100644
--- a/java/ql/test/experimental/query-tests/security/CWE-347/Auth0NoVerifier.expected
+++ b/java/ql/test/experimental/query-tests/security/CWE-347/Auth0NoVerifier.expected
@@ -2,23 +2,23 @@
 | JwtNoVerifier.java:91:45:91:69 | getClaim(...) | JwtNoVerifier.java:44:28:44:55 | getParameter(...) : String | JwtNoVerifier.java:91:45:91:69 | getClaim(...) | This parses a $@, but the signature is not verified. | JwtNoVerifier.java:44:28:44:55 | getParameter(...) | JWT |
 | JwtNoVerifier.java:91:45:91:69 | getClaim(...) | JwtNoVerifier.java:58:37:58:62 | getCredentials(...) : Object | JwtNoVerifier.java:91:45:91:69 | getClaim(...) | This parses a $@, but the signature is not verified. | JwtNoVerifier.java:58:37:58:62 | getCredentials(...) | JWT |
 edges
-| JwtNoVerifier.java:44:28:44:55 | getParameter(...) : String | JwtNoVerifier.java:45:39:45:47 | JwtToken1 : String | provenance | Src:MaD:4  |
+| JwtNoVerifier.java:44:28:44:55 | getParameter(...) : String | JwtNoVerifier.java:45:39:45:47 | JwtToken1 : String | provenance | Src:MaD:1  |
 | JwtNoVerifier.java:45:39:45:47 | JwtToken1 : String | JwtNoVerifier.java:89:38:89:55 | token : String | provenance |  |
 | JwtNoVerifier.java:58:28:58:62 | (...)... : String | JwtNoVerifier.java:59:32:59:40 | JwtToken3 : String | provenance |  |
-| JwtNoVerifier.java:58:37:58:62 | getCredentials(...) : Object | JwtNoVerifier.java:58:28:58:62 | (...)... : String | provenance | Src:MaD:1  |
+| JwtNoVerifier.java:58:37:58:62 | getCredentials(...) : Object | JwtNoVerifier.java:58:28:58:62 | (...)... : String | provenance | Src:MaD:2  |
 | JwtNoVerifier.java:59:32:59:40 | JwtToken3 : String | JwtNoVerifier.java:89:38:89:55 | token : String | provenance |  |
 | JwtNoVerifier.java:89:38:89:55 | token : String | JwtNoVerifier.java:90:37:90:41 | token : String | provenance |  |
 | JwtNoVerifier.java:90:26:90:42 | decode(...) : DecodedJWT | JwtNoVerifier.java:91:28:91:30 | jwt : DecodedJWT | provenance |  |
 | JwtNoVerifier.java:90:37:90:41 | token : String | JwtNoVerifier.java:90:26:90:42 | decode(...) : DecodedJWT | provenance | Config |
-| JwtNoVerifier.java:91:16:91:31 | of(...) : Optional [<element>] : DecodedJWT | JwtNoVerifier.java:91:37:91:40 | item : DecodedJWT | provenance | MaD:2 |
-| JwtNoVerifier.java:91:28:91:30 | jwt : DecodedJWT | JwtNoVerifier.java:91:16:91:31 | of(...) : Optional [<element>] : DecodedJWT | provenance | MaD:3 |
+| JwtNoVerifier.java:91:16:91:31 | of(...) : Optional [<element>] : DecodedJWT | JwtNoVerifier.java:91:37:91:40 | item : DecodedJWT | provenance | MaD:3 |
+| JwtNoVerifier.java:91:28:91:30 | jwt : DecodedJWT | JwtNoVerifier.java:91:16:91:31 | of(...) : Optional [<element>] : DecodedJWT | provenance | MaD:4 |
 | JwtNoVerifier.java:91:37:91:40 | item : DecodedJWT | JwtNoVerifier.java:91:45:91:48 | item : DecodedJWT | provenance |  |
 | JwtNoVerifier.java:91:45:91:48 | item : DecodedJWT | JwtNoVerifier.java:91:45:91:69 | getClaim(...) | provenance | Config |
 models
-| 1 | Source: org.apache.shiro.authc; AuthenticationToken; true; getCredentials; (); ; ReturnValue; remote; manual |
-| 2 | Summary: java.util; Optional; false; map; ; ; Argument[this].Element; Argument[0].Parameter[0]; value; manual |
-| 3 | Summary: java.util; Optional; false; of; ; ; Argument[0]; ReturnValue.Element; value; manual |
-| 4 | Source: javax.servlet; ServletRequest; false; getParameter; (String); ; ReturnValue; remote; manual |
+| 1 | Source: javax.servlet; ServletRequest; false; getParameter; (String); ; ReturnValue; remote; manual |
+| 2 | Source: org.apache.shiro.authc; AuthenticationToken; true; getCredentials; (); ; ReturnValue; remote; manual |
+| 3 | Summary: java.util; Optional; false; map; ; ; Argument[this].Element; Argument[0].Parameter[0]; value; manual |
+| 4 | Summary: java.util; Optional; false; of; ; ; Argument[0]; ReturnValue.Element; value; manual |
 nodes
 | JwtNoVerifier.java:44:28:44:55 | getParameter(...) : String | semmle.label | getParameter(...) : String |
 | JwtNoVerifier.java:45:39:45:47 | JwtToken1 : String | semmle.label | JwtToken1 : String |
diff --git a/java/ql/test/experimental/query-tests/security/CWE-348/ClientSuppliedIpUsedInSecurityCheck.expected b/java/ql/test/experimental/query-tests/security/CWE-348/ClientSuppliedIpUsedInSecurityCheck.expected
index ac8c147f606..c3114de8887 100644
--- a/java/ql/test/experimental/query-tests/security/CWE-348/ClientSuppliedIpUsedInSecurityCheck.expected
+++ b/java/ql/test/experimental/query-tests/security/CWE-348/ClientSuppliedIpUsedInSecurityCheck.expected
@@ -4,14 +4,14 @@
 edges
 | ClientSuppliedIpUsedInSecurityCheck.java:16:21:16:33 | getClientIP(...) : String | ClientSuppliedIpUsedInSecurityCheck.java:17:37:17:38 | ip | provenance |  |
 | ClientSuppliedIpUsedInSecurityCheck.java:24:21:24:33 | getClientIP(...) : String | ClientSuppliedIpUsedInSecurityCheck.java:25:33:25:34 | ip | provenance |  |
-| ClientSuppliedIpUsedInSecurityCheck.java:43:27:43:62 | getHeader(...) : String | ClientSuppliedIpUsedInSecurityCheck.java:47:16:47:23 | xfHeader : String | provenance | Src:MaD:2  |
-| ClientSuppliedIpUsedInSecurityCheck.java:47:16:47:23 | xfHeader : String | ClientSuppliedIpUsedInSecurityCheck.java:47:16:47:34 | split(...) : String[] | provenance | MaD:1 |
+| ClientSuppliedIpUsedInSecurityCheck.java:43:27:43:62 | getHeader(...) : String | ClientSuppliedIpUsedInSecurityCheck.java:47:16:47:23 | xfHeader : String | provenance | Src:MaD:1  |
+| ClientSuppliedIpUsedInSecurityCheck.java:47:16:47:23 | xfHeader : String | ClientSuppliedIpUsedInSecurityCheck.java:47:16:47:34 | split(...) : String[] | provenance | MaD:2 |
 | ClientSuppliedIpUsedInSecurityCheck.java:47:16:47:34 | split(...) : String[] | ClientSuppliedIpUsedInSecurityCheck.java:47:16:47:37 | ...[...] : String | provenance |  |
 | ClientSuppliedIpUsedInSecurityCheck.java:47:16:47:37 | ...[...] : String | ClientSuppliedIpUsedInSecurityCheck.java:16:21:16:33 | getClientIP(...) : String | provenance |  |
 | ClientSuppliedIpUsedInSecurityCheck.java:47:16:47:37 | ...[...] : String | ClientSuppliedIpUsedInSecurityCheck.java:24:21:24:33 | getClientIP(...) : String | provenance |  |
 models
-| 1 | Summary: java.lang; String; false; split; ; ; Argument[this]; ReturnValue; taint; manual |
-| 2 | Source: javax.servlet.http; HttpServletRequest; false; getHeader; (String); ; ReturnValue; remote; manual |
+| 1 | Source: javax.servlet.http; HttpServletRequest; false; getHeader; (String); ; ReturnValue; remote; manual |
+| 2 | Summary: java.lang; String; false; split; ; ; Argument[this]; ReturnValue; taint; manual |
 nodes
 | ClientSuppliedIpUsedInSecurityCheck.java:16:21:16:33 | getClientIP(...) : String | semmle.label | getClientIP(...) : String |
 | ClientSuppliedIpUsedInSecurityCheck.java:17:37:17:38 | ip | semmle.label | ip |
diff --git a/java/ql/test/experimental/query-tests/security/CWE-352/JsonpInjection.expected b/java/ql/test/experimental/query-tests/security/CWE-352/JsonpInjection.expected
index 67ac9bfa98c..50c5b7bbd41 100644
--- a/java/ql/test/experimental/query-tests/security/CWE-352/JsonpInjection.expected
+++ b/java/ql/test/experimental/query-tests/security/CWE-352/JsonpInjection.expected
@@ -11,8 +11,8 @@ edges
 | JsonpController.java:44:32:44:68 | getParameter(...) : String | JsonpController.java:46:16:46:24 | resultStr | provenance | Src:MaD:2  |
 | JsonpController.java:53:32:53:68 | getParameter(...) : String | JsonpController.java:56:16:56:24 | resultStr | provenance | Src:MaD:2  |
 | JsonpController.java:63:32:63:68 | getParameter(...) : String | JsonpController.java:66:16:66:24 | resultStr | provenance | Src:MaD:2  |
-| JsonpController.java:73:32:73:68 | getParameter(...) : String | JsonpController.java:80:20:80:28 | resultStr | provenance | Src:MaD:2  Sink:MaD:1 |
-| JsonpController.java:87:32:87:68 | getParameter(...) : String | JsonpController.java:94:20:94:28 | resultStr | provenance | Src:MaD:2  Sink:MaD:1 |
+| JsonpController.java:73:32:73:68 | getParameter(...) : String | JsonpController.java:80:20:80:28 | resultStr | provenance | Src:MaD:2 Sink:MaD:1 |
+| JsonpController.java:87:32:87:68 | getParameter(...) : String | JsonpController.java:94:20:94:28 | resultStr | provenance | Src:MaD:2 Sink:MaD:1 |
 | JsonpController.java:101:32:101:68 | getParameter(...) : String | JsonpController.java:105:16:105:24 | resultStr | provenance | Src:MaD:2  |
 models
 | 1 | Sink: java.io; PrintWriter; false; println; ; ; Argument[0]; file-content-store; manual |
diff --git a/java/ql/test/experimental/query-tests/security/CWE-400/LocalThreadResourceAbuse.expected b/java/ql/test/experimental/query-tests/security/CWE-400/LocalThreadResourceAbuse.expected
index 7dfe692d2de..704257add90 100644
--- a/java/ql/test/experimental/query-tests/security/CWE-400/LocalThreadResourceAbuse.expected
+++ b/java/ql/test/experimental/query-tests/security/CWE-400/LocalThreadResourceAbuse.expected
@@ -9,7 +9,7 @@ edges
 | ThreadResourceAbuse.java:67:4:67:7 | this [post update] : UncheckedSyncAction [waitTime] : Number | ThreadResourceAbuse.java:66:10:66:28 | parameter this [Return] : UncheckedSyncAction [waitTime] : Number | provenance |  |
 | ThreadResourceAbuse.java:67:20:67:27 | waitTime : Number | ThreadResourceAbuse.java:67:4:67:7 | this [post update] : UncheckedSyncAction [waitTime] : Number | provenance |  |
 | ThreadResourceAbuse.java:71:15:71:17 | parameter this : UncheckedSyncAction [waitTime] : Number | ThreadResourceAbuse.java:74:18:74:25 | this <.field> : UncheckedSyncAction [waitTime] : Number | provenance |  |
-| ThreadResourceAbuse.java:74:18:74:25 | this <.field> : UncheckedSyncAction [waitTime] : Number | ThreadResourceAbuse.java:74:18:74:25 | waitTime | provenance |  Sink:MaD:1 |
+| ThreadResourceAbuse.java:74:18:74:25 | this <.field> : UncheckedSyncAction [waitTime] : Number | ThreadResourceAbuse.java:74:18:74:25 | waitTime | provenance | Sink:MaD:1 |
 models
 | 1 | Sink: java.lang; Thread; true; sleep; ; ; Argument[0]; thread-pause; manual |
 nodes
diff --git a/java/ql/test/experimental/query-tests/security/CWE-400/ThreadResourceAbuse.expected b/java/ql/test/experimental/query-tests/security/CWE-400/ThreadResourceAbuse.expected
index 1d490673c55..a17bcbd2c7e 100644
--- a/java/ql/test/experimental/query-tests/security/CWE-400/ThreadResourceAbuse.expected
+++ b/java/ql/test/experimental/query-tests/security/CWE-400/ThreadResourceAbuse.expected
@@ -19,7 +19,7 @@ edges
 | ThreadResourceAbuse.java:67:4:67:7 | this [post update] : UncheckedSyncAction [waitTime] : Number | ThreadResourceAbuse.java:66:10:66:28 | parameter this [Return] : UncheckedSyncAction [waitTime] : Number | provenance |  |
 | ThreadResourceAbuse.java:67:20:67:27 | waitTime : Number | ThreadResourceAbuse.java:67:4:67:7 | this [post update] : UncheckedSyncAction [waitTime] : Number | provenance |  |
 | ThreadResourceAbuse.java:71:15:71:17 | parameter this : UncheckedSyncAction [waitTime] : Number | ThreadResourceAbuse.java:74:18:74:25 | this <.field> : UncheckedSyncAction [waitTime] : Number | provenance |  |
-| ThreadResourceAbuse.java:74:18:74:25 | this <.field> : UncheckedSyncAction [waitTime] : Number | ThreadResourceAbuse.java:74:18:74:25 | waitTime | provenance |  Sink:MaD:1 |
+| ThreadResourceAbuse.java:74:18:74:25 | this <.field> : UncheckedSyncAction [waitTime] : Number | ThreadResourceAbuse.java:74:18:74:25 | waitTime | provenance | Sink:MaD:1 |
 | ThreadResourceAbuse.java:141:27:141:43 | getValue(...) : String | ThreadResourceAbuse.java:144:34:144:42 | delayTime | provenance | Src:MaD:3 TaintPreservingCallable Sink:MaD:2 |
 | ThreadResourceAbuse.java:172:19:172:50 | getHeader(...) : String | ThreadResourceAbuse.java:176:17:176:26 | retryAfter | provenance | Src:MaD:4 TaintPreservingCallable Sink:MaD:1 |
 | ThreadResourceAbuse.java:206:28:206:56 | getParameter(...) : String | ThreadResourceAbuse.java:209:49:209:59 | uploadDelay : Number | provenance | Src:MaD:5 TaintPreservingCallable |
@@ -30,7 +30,7 @@ edges
 | ThreadResourceAbuse.java:219:17:219:26 | retryAfter : Number | ThreadResourceAbuse.java:219:17:219:33 | ... * ... | provenance | Config Sink:MaD:1 |
 | ThreadResourceAbuse.java:227:19:227:50 | getHeader(...) : String | ThreadResourceAbuse.java:230:3:230:12 | retryAfter : Number | provenance | Src:MaD:4 TaintPreservingCallable |
 | ThreadResourceAbuse.java:230:3:230:12 | retryAfter : Number | ThreadResourceAbuse.java:230:3:230:20 | ...*=... : Number | provenance | Config |
-| ThreadResourceAbuse.java:230:3:230:20 | ...*=... : Number | ThreadResourceAbuse.java:233:17:233:26 | retryAfter | provenance |  Sink:MaD:1 |
+| ThreadResourceAbuse.java:230:3:230:20 | ...*=... : Number | ThreadResourceAbuse.java:233:17:233:26 | retryAfter | provenance | Sink:MaD:1 |
 | UploadListener.java:15:24:15:44 | sleepMilliseconds : Number | UploadListener.java:16:17:16:33 | sleepMilliseconds : Number | provenance |  |
 | UploadListener.java:16:3:16:13 | this <.field> [post update] : UploadListener [slowUploads] : Number | UploadListener.java:15:9:15:22 | parameter this [Return] : UploadListener [slowUploads] : Number | provenance |  |
 | UploadListener.java:16:17:16:33 | sleepMilliseconds : Number | UploadListener.java:16:3:16:13 | this <.field> [post update] : UploadListener [slowUploads] : Number | provenance |  |
@@ -38,9 +38,9 @@ edges
 | UploadListener.java:29:3:29:11 | this <.field> : UploadListener [slowUploads] : Number | UploadListener.java:30:3:30:15 | this <.field> : UploadListener [slowUploads] : Number | provenance |  |
 | UploadListener.java:30:3:30:15 | this <.field> : UploadListener [slowUploads] : Number | UploadListener.java:33:7:33:17 | this <.field> : UploadListener [slowUploads] : Number | provenance |  |
 | UploadListener.java:30:3:30:15 | this <.field> : UploadListener [slowUploads] : Number | UploadListener.java:35:18:35:28 | this <.field> : UploadListener [slowUploads] : Number | provenance |  |
-| UploadListener.java:33:7:33:17 | slowUploads : Number | UploadListener.java:35:18:35:28 | slowUploads | provenance |  Sink:MaD:1 |
+| UploadListener.java:33:7:33:17 | slowUploads : Number | UploadListener.java:35:18:35:28 | slowUploads | provenance | Sink:MaD:1 |
 | UploadListener.java:33:7:33:17 | this <.field> : UploadListener [slowUploads] : Number | UploadListener.java:33:7:33:17 | slowUploads : Number | provenance |  |
-| UploadListener.java:35:18:35:28 | this <.field> : UploadListener [slowUploads] : Number | UploadListener.java:35:18:35:28 | slowUploads | provenance |  Sink:MaD:1 |
+| UploadListener.java:35:18:35:28 | this <.field> : UploadListener [slowUploads] : Number | UploadListener.java:35:18:35:28 | slowUploads | provenance | Sink:MaD:1 |
 models
 | 1 | Sink: java.lang; Thread; true; sleep; ; ; Argument[0]; thread-pause; manual |
 | 2 | Sink: java.util.concurrent; TimeUnit; true; sleep; ; ; Argument[0]; thread-pause; manual |
diff --git a/java/ql/test/experimental/query-tests/security/CWE-470/UnsafeReflection.expected b/java/ql/test/experimental/query-tests/security/CWE-470/UnsafeReflection.expected
index 82f16470f60..cd5b70356b3 100644
--- a/java/ql/test/experimental/query-tests/security/CWE-470/UnsafeReflection.expected
+++ b/java/ql/test/experimental/query-tests/security/CWE-470/UnsafeReflection.expected
@@ -3,14 +3,14 @@
 | UnsafeReflection.java:39:13:39:41 | ...[...] | UnsafeReflection.java:33:28:33:60 | getParameter(...) : String | UnsafeReflection.java:39:13:39:41 | ...[...] | Unsafe reflection of $@. | UnsafeReflection.java:33:28:33:60 | getParameter(...) | user input |
 | UnsafeReflection.java:119:21:119:26 | method | UnsafeReflection.java:46:24:46:82 | beanIdOrClassName : String | UnsafeReflection.java:119:21:119:26 | method | Unsafe reflection of $@. | UnsafeReflection.java:46:24:46:82 | beanIdOrClassName | user input |
 edges
-| UnsafeReflection.java:21:28:21:60 | getParameter(...) : String | UnsafeReflection.java:24:41:24:49 | className : String | provenance | Src:MaD:2  |
-| UnsafeReflection.java:22:33:22:70 | getParameter(...) : String | UnsafeReflection.java:25:76:25:89 | parameterValue | provenance | Src:MaD:2  |
+| UnsafeReflection.java:21:28:21:60 | getParameter(...) : String | UnsafeReflection.java:24:41:24:49 | className : String | provenance | Src:MaD:1  |
+| UnsafeReflection.java:22:33:22:70 | getParameter(...) : String | UnsafeReflection.java:25:76:25:89 | parameterValue | provenance | Src:MaD:1  |
 | UnsafeReflection.java:24:27:24:50 | forName(...) : Class | UnsafeReflection.java:25:29:25:33 | clazz : Class | provenance |  |
 | UnsafeReflection.java:24:41:24:49 | className : String | UnsafeReflection.java:24:27:24:50 | forName(...) : Class | provenance | Config |
 | UnsafeReflection.java:25:29:25:33 | clazz : Class | UnsafeReflection.java:25:29:25:59 | getDeclaredConstructors(...) : Constructor[] | provenance | Config |
 | UnsafeReflection.java:25:29:25:59 | getDeclaredConstructors(...) : Constructor[] | UnsafeReflection.java:25:29:25:62 | ...[...] | provenance |  |
-| UnsafeReflection.java:33:28:33:60 | getParameter(...) : String | UnsafeReflection.java:37:49:37:57 | className : String | provenance | Src:MaD:2  |
-| UnsafeReflection.java:34:33:34:70 | getParameter(...) : String | UnsafeReflection.java:39:58:39:71 | parameterValue | provenance | Src:MaD:2  |
+| UnsafeReflection.java:33:28:33:60 | getParameter(...) : String | UnsafeReflection.java:37:49:37:57 | className : String | provenance | Src:MaD:1  |
+| UnsafeReflection.java:34:33:34:70 | getParameter(...) : String | UnsafeReflection.java:39:58:39:71 | parameterValue | provenance | Src:MaD:1  |
 | UnsafeReflection.java:37:27:37:58 | loadClass(...) : Class | UnsafeReflection.java:38:29:38:33 | clazz : Class | provenance |  |
 | UnsafeReflection.java:37:49:37:57 | className : String | UnsafeReflection.java:37:27:37:58 | loadClass(...) : Class | provenance | Config |
 | UnsafeReflection.java:38:29:38:33 | clazz : Class | UnsafeReflection.java:38:29:38:47 | newInstance(...) : Object | provenance | Config |
@@ -21,13 +21,13 @@ edges
 | UnsafeReflection.java:46:24:46:82 | beanIdOrClassName : String | UnsafeReflection.java:53:30:53:46 | beanIdOrClassName : String | provenance |  |
 | UnsafeReflection.java:46:132:46:168 | body : Map | UnsafeReflection.java:49:37:49:40 | body : Map | provenance |  |
 | UnsafeReflection.java:49:23:49:59 | (...)... : List | UnsafeReflection.java:53:67:53:73 | rawData : List | provenance |  |
-| UnsafeReflection.java:49:37:49:40 | body : Map | UnsafeReflection.java:49:37:49:59 | get(...) : Object | provenance | MaD:1 |
+| UnsafeReflection.java:49:37:49:40 | body : Map | UnsafeReflection.java:49:37:49:59 | get(...) : Object | provenance | MaD:2 |
 | UnsafeReflection.java:49:37:49:59 | get(...) : Object | UnsafeReflection.java:49:23:49:59 | (...)... : List | provenance |  |
 | UnsafeReflection.java:53:30:53:46 | beanIdOrClassName : String | UnsafeReflection.java:104:34:104:57 | beanIdOrClassName : String | provenance |  |
 | UnsafeReflection.java:53:67:53:73 | rawData : List | UnsafeReflection.java:104:102:104:118 | data : List | provenance |  |
-| UnsafeReflection.java:62:33:62:70 | getParameter(...) : String | UnsafeReflection.java:68:76:68:89 | parameterValue | provenance | Src:MaD:2  |
-| UnsafeReflection.java:77:33:77:70 | getParameter(...) : String | UnsafeReflection.java:83:76:83:89 | parameterValue | provenance | Src:MaD:2  |
-| UnsafeReflection.java:92:33:92:70 | getParameter(...) : String | UnsafeReflection.java:98:76:98:89 | parameterValue | provenance | Src:MaD:2  |
+| UnsafeReflection.java:62:33:62:70 | getParameter(...) : String | UnsafeReflection.java:68:76:68:89 | parameterValue | provenance | Src:MaD:1  |
+| UnsafeReflection.java:77:33:77:70 | getParameter(...) : String | UnsafeReflection.java:83:76:83:89 | parameterValue | provenance | Src:MaD:1  |
+| UnsafeReflection.java:92:33:92:70 | getParameter(...) : String | UnsafeReflection.java:98:76:98:89 | parameterValue | provenance | Src:MaD:1  |
 | UnsafeReflection.java:104:34:104:57 | beanIdOrClassName : String | UnsafeReflection.java:108:39:108:55 | beanIdOrClassName : String | provenance |  |
 | UnsafeReflection.java:104:102:104:118 | data : List | UnsafeReflection.java:119:41:119:44 | data | provenance |  |
 | UnsafeReflection.java:108:25:108:56 | forName(...) : Class | UnsafeReflection.java:109:31:109:39 | beanClass : Class | provenance |  |
@@ -39,8 +39,8 @@ edges
 | UnsafeReflection.java:113:30:113:44 | getClass(...) : Class | UnsafeReflection.java:113:30:113:57 | getMethods(...) : Method[] | provenance | Config |
 | UnsafeReflection.java:113:30:113:57 | getMethods(...) : Method[] | UnsafeReflection.java:119:21:119:26 | method | provenance |  |
 models
-| 1 | Summary: java.util; Map; true; get; ; ; Argument[this].MapValue; ReturnValue; value; manual |
-| 2 | Source: javax.servlet; ServletRequest; false; getParameter; (String); ; ReturnValue; remote; manual |
+| 1 | Source: javax.servlet; ServletRequest; false; getParameter; (String); ; ReturnValue; remote; manual |
+| 2 | Summary: java.util; Map; true; get; ; ; Argument[this].MapValue; ReturnValue; value; manual |
 nodes
 | UnsafeReflection.java:21:28:21:60 | getParameter(...) : String | semmle.label | getParameter(...) : String |
 | UnsafeReflection.java:22:33:22:70 | getParameter(...) : String | semmle.label | getParameter(...) : String |
diff --git a/java/ql/test/experimental/query-tests/security/CWE-598/SensitiveGetQuery.expected b/java/ql/test/experimental/query-tests/security/CWE-598/SensitiveGetQuery.expected
index 4c2f2b01492..4af7d84cdcd 100644
--- a/java/ql/test/experimental/query-tests/security/CWE-598/SensitiveGetQuery.expected
+++ b/java/ql/test/experimental/query-tests/security/CWE-598/SensitiveGetQuery.expected
@@ -6,25 +6,25 @@
 | SensitiveGetQuery.java:14:29:14:36 | password | SensitiveGetQuery.java:12:21:12:52 | getParameter(...) : String | SensitiveGetQuery.java:14:29:14:36 | password | $@ uses the GET request method to transmit sensitive information. | SensitiveGetQuery.java:12:21:12:52 | getParameter(...) | This request |
 | SensitiveGetQuery.java:18:61:18:68 | password | SensitiveGetQuery.java:12:21:12:52 | getParameter(...) : String | SensitiveGetQuery.java:18:61:18:68 | password | $@ uses the GET request method to transmit sensitive information. | SensitiveGetQuery.java:12:21:12:52 | getParameter(...) | This request |
 edges
-| SensitiveGetQuery2.java:12:13:12:37 | getParameterMap(...) : Map | SensitiveGetQuery2.java:14:30:14:32 | map : Map | provenance | Src:MaD:3  |
+| SensitiveGetQuery2.java:12:13:12:37 | getParameterMap(...) : Map | SensitiveGetQuery2.java:14:30:14:32 | map : Map | provenance | Src:MaD:2  |
 | SensitiveGetQuery2.java:14:21:14:48 | (...)... : String | SensitiveGetQuery2.java:15:29:15:36 | password | provenance |  |
 | SensitiveGetQuery2.java:14:21:14:48 | (...)... : String | SensitiveGetQuery2.java:15:29:15:36 | password : String | provenance |  |
-| SensitiveGetQuery2.java:14:30:14:32 | map : Map | SensitiveGetQuery2.java:14:30:14:48 | get(...) : Object | provenance | MaD:1 |
+| SensitiveGetQuery2.java:14:30:14:32 | map : Map | SensitiveGetQuery2.java:14:30:14:48 | get(...) : Object | provenance | MaD:3 |
 | SensitiveGetQuery2.java:14:30:14:48 | get(...) : Object | SensitiveGetQuery2.java:14:21:14:48 | (...)... : String | provenance |  |
 | SensitiveGetQuery2.java:15:29:15:36 | password : String | SensitiveGetQuery2.java:18:40:18:54 | password : String | provenance |  |
 | SensitiveGetQuery2.java:18:40:18:54 | password : String | SensitiveGetQuery2.java:19:61:19:68 | password | provenance |  |
 | SensitiveGetQuery3.java:12:21:12:60 | getRequestParameter(...) : String | SensitiveGetQuery3.java:13:57:13:64 | password | provenance |  |
-| SensitiveGetQuery3.java:17:10:17:40 | getParameter(...) : String | SensitiveGetQuery3.java:12:21:12:60 | getRequestParameter(...) : String | provenance | Src:MaD:2  |
+| SensitiveGetQuery3.java:17:10:17:40 | getParameter(...) : String | SensitiveGetQuery3.java:12:21:12:60 | getRequestParameter(...) : String | provenance | Src:MaD:1  |
 | SensitiveGetQuery4.java:14:24:14:66 | getRequestParameter(...) : String | SensitiveGetQuery4.java:16:37:16:47 | accessToken | provenance |  |
-| SensitiveGetQuery4.java:20:10:20:40 | getParameter(...) : String | SensitiveGetQuery4.java:14:24:14:66 | getRequestParameter(...) : String | provenance | Src:MaD:2  |
-| SensitiveGetQuery.java:12:21:12:52 | getParameter(...) : String | SensitiveGetQuery.java:14:29:14:36 | password | provenance | Src:MaD:2  |
-| SensitiveGetQuery.java:12:21:12:52 | getParameter(...) : String | SensitiveGetQuery.java:14:29:14:36 | password : String | provenance | Src:MaD:2  |
+| SensitiveGetQuery4.java:20:10:20:40 | getParameter(...) : String | SensitiveGetQuery4.java:14:24:14:66 | getRequestParameter(...) : String | provenance | Src:MaD:1  |
+| SensitiveGetQuery.java:12:21:12:52 | getParameter(...) : String | SensitiveGetQuery.java:14:29:14:36 | password | provenance | Src:MaD:1  |
+| SensitiveGetQuery.java:12:21:12:52 | getParameter(...) : String | SensitiveGetQuery.java:14:29:14:36 | password : String | provenance | Src:MaD:1  |
 | SensitiveGetQuery.java:14:29:14:36 | password : String | SensitiveGetQuery.java:17:40:17:54 | password : String | provenance |  |
 | SensitiveGetQuery.java:17:40:17:54 | password : String | SensitiveGetQuery.java:18:61:18:68 | password | provenance |  |
 models
-| 1 | Summary: java.util; Map; true; get; ; ; Argument[this].MapValue; ReturnValue; value; manual |
-| 2 | Source: javax.servlet; ServletRequest; false; getParameter; (String); ; ReturnValue; remote; manual |
-| 3 | Source: javax.servlet; ServletRequest; false; getParameterMap; (); ; ReturnValue; remote; manual |
+| 1 | Source: javax.servlet; ServletRequest; false; getParameter; (String); ; ReturnValue; remote; manual |
+| 2 | Source: javax.servlet; ServletRequest; false; getParameterMap; (); ; ReturnValue; remote; manual |
+| 3 | Summary: java.util; Map; true; get; ; ; Argument[this].MapValue; ReturnValue; value; manual |
 nodes
 | SensitiveGetQuery2.java:12:13:12:37 | getParameterMap(...) : Map | semmle.label | getParameterMap(...) : Map |
 | SensitiveGetQuery2.java:14:21:14:48 | (...)... : String | semmle.label | (...)... : String |
diff --git a/java/ql/test/experimental/query-tests/security/CWE-625/PermissiveDotRegex.expected b/java/ql/test/experimental/query-tests/security/CWE-625/PermissiveDotRegex.expected
index 424cbc58af8..fd024bde128 100644
--- a/java/ql/test/experimental/query-tests/security/CWE-625/PermissiveDotRegex.expected
+++ b/java/ql/test/experimental/query-tests/security/CWE-625/PermissiveDotRegex.expected
@@ -7,37 +7,37 @@
 | DotRegexSpring.java:23:25:23:28 | path | DotRegexSpring.java:20:26:20:50 | path : String | DotRegexSpring.java:23:25:23:28 | path | Potentially authentication bypass due to $@. | DotRegexSpring.java:20:26:20:50 | path | user-provided value |
 | DotRegexSpring.java:40:25:40:28 | path | DotRegexSpring.java:37:40:37:64 | path : String | DotRegexSpring.java:40:25:40:28 | path | Potentially authentication bypass due to $@. | DotRegexSpring.java:37:40:37:64 | path | user-provided value |
 edges
+| DotRegexFilter.java:29:19:29:43 | getPathInfo(...) : String | DotRegexFilter.java:32:25:32:30 | source | provenance | Src:MaD:2  |
 | DotRegexFilter.java:29:19:29:43 | getPathInfo(...) : String | DotRegexFilter.java:32:25:32:30 | source | provenance | Src:MaD:1  |
-| DotRegexFilter.java:29:19:29:43 | getPathInfo(...) : String | DotRegexFilter.java:32:25:32:30 | source | provenance | Src:MaD:4  |
+| DotRegexServlet.java:19:19:19:39 | getPathInfo(...) : String | DotRegexServlet.java:22:25:22:30 | source | provenance | Src:MaD:2  |
 | DotRegexServlet.java:19:19:19:39 | getPathInfo(...) : String | DotRegexServlet.java:22:25:22:30 | source | provenance | Src:MaD:1  |
-| DotRegexServlet.java:19:19:19:39 | getPathInfo(...) : String | DotRegexServlet.java:22:25:22:30 | source | provenance | Src:MaD:4  |
-| DotRegexServlet.java:57:19:57:41 | getRequestURI(...) : String | DotRegexServlet.java:59:21:59:26 | source | provenance | Src:MaD:2  |
-| DotRegexServlet.java:57:19:57:41 | getRequestURI(...) : String | DotRegexServlet.java:59:21:59:26 | source | provenance | Src:MaD:5  |
+| DotRegexServlet.java:57:19:57:41 | getRequestURI(...) : String | DotRegexServlet.java:59:21:59:26 | source | provenance | Src:MaD:4  |
+| DotRegexServlet.java:57:19:57:41 | getRequestURI(...) : String | DotRegexServlet.java:59:21:59:26 | source | provenance | Src:MaD:3  |
+| DotRegexServlet.java:75:19:75:39 | getPathInfo(...) : String | DotRegexServlet.java:77:56:77:61 | source | provenance | Src:MaD:2  |
 | DotRegexServlet.java:75:19:75:39 | getPathInfo(...) : String | DotRegexServlet.java:77:56:77:61 | source | provenance | Src:MaD:1  |
-| DotRegexServlet.java:75:19:75:39 | getPathInfo(...) : String | DotRegexServlet.java:77:56:77:61 | source | provenance | Src:MaD:4  |
+| DotRegexServlet.java:112:19:112:39 | getPathInfo(...) : String | DotRegexServlet.java:115:25:115:30 | source | provenance | Src:MaD:2  |
 | DotRegexServlet.java:112:19:112:39 | getPathInfo(...) : String | DotRegexServlet.java:115:25:115:30 | source | provenance | Src:MaD:1  |
-| DotRegexServlet.java:112:19:112:39 | getPathInfo(...) : String | DotRegexServlet.java:115:25:115:30 | source | provenance | Src:MaD:4  |
 | DotRegexSpring.java:20:26:20:50 | path : String | DotRegexSpring.java:22:21:22:24 | path : String | provenance |  |
 | DotRegexSpring.java:22:10:22:25 | decodePath(...) : String | DotRegexSpring.java:23:25:23:28 | path | provenance |  |
 | DotRegexSpring.java:22:21:22:24 | path : String | DotRegexSpring.java:22:10:22:25 | decodePath(...) : String | provenance |  |
-| DotRegexSpring.java:22:21:22:24 | path : String | DotRegexSpring.java:22:10:22:25 | decodePath(...) : String | provenance | MaD:3 |
+| DotRegexSpring.java:22:21:22:24 | path : String | DotRegexSpring.java:22:10:22:25 | decodePath(...) : String | provenance | MaD:5 |
 | DotRegexSpring.java:22:21:22:24 | path : String | DotRegexSpring.java:69:28:69:38 | path : String | provenance |  |
 | DotRegexSpring.java:37:40:37:64 | path : String | DotRegexSpring.java:39:21:39:24 | path : String | provenance |  |
 | DotRegexSpring.java:39:10:39:25 | decodePath(...) : String | DotRegexSpring.java:40:25:40:28 | path | provenance |  |
 | DotRegexSpring.java:39:21:39:24 | path : String | DotRegexSpring.java:39:10:39:25 | decodePath(...) : String | provenance |  |
-| DotRegexSpring.java:39:21:39:24 | path : String | DotRegexSpring.java:39:10:39:25 | decodePath(...) : String | provenance | MaD:3 |
+| DotRegexSpring.java:39:21:39:24 | path : String | DotRegexSpring.java:39:10:39:25 | decodePath(...) : String | provenance | MaD:5 |
 | DotRegexSpring.java:39:21:39:24 | path : String | DotRegexSpring.java:69:28:69:38 | path : String | provenance |  |
 | DotRegexSpring.java:69:28:69:38 | path : String | DotRegexSpring.java:71:29:71:32 | path : String | provenance |  |
 | DotRegexSpring.java:69:28:69:38 | path : String | DotRegexSpring.java:73:10:73:13 | path : String | provenance |  |
 | DotRegexSpring.java:71:11:71:42 | decode(...) : String | DotRegexSpring.java:71:29:71:32 | path : String | provenance |  |
 | DotRegexSpring.java:71:11:71:42 | decode(...) : String | DotRegexSpring.java:73:10:73:13 | path : String | provenance |  |
-| DotRegexSpring.java:71:29:71:32 | path : String | DotRegexSpring.java:71:11:71:42 | decode(...) : String | provenance | MaD:3 |
+| DotRegexSpring.java:71:29:71:32 | path : String | DotRegexSpring.java:71:11:71:42 | decode(...) : String | provenance | MaD:5 |
 models
-| 1 | Source: javax.servlet.http; HttpServletRequest; false; getPathInfo; (); ; ReturnValue; uri-path; manual |
-| 2 | Source: javax.servlet.http; HttpServletRequest; false; getRequestURI; (); ; ReturnValue; uri-path; manual |
-| 3 | Summary: java.net; URLDecoder; false; decode; ; ; Argument[0]; ReturnValue; taint; manual |
-| 4 | Source: javax.servlet.http; HttpServletRequest; false; getPathInfo; (); ; ReturnValue; remote; manual |
-| 5 | Source: javax.servlet.http; HttpServletRequest; false; getRequestURI; (); ; ReturnValue; remote; manual |
+| 1 | Source: javax.servlet.http; HttpServletRequest; false; getPathInfo; (); ; ReturnValue; remote; manual |
+| 2 | Source: javax.servlet.http; HttpServletRequest; false; getPathInfo; (); ; ReturnValue; uri-path; manual |
+| 3 | Source: javax.servlet.http; HttpServletRequest; false; getRequestURI; (); ; ReturnValue; remote; manual |
+| 4 | Source: javax.servlet.http; HttpServletRequest; false; getRequestURI; (); ; ReturnValue; uri-path; manual |
+| 5 | Summary: java.net; URLDecoder; false; decode; ; ; Argument[0]; ReturnValue; taint; manual |
 nodes
 | DotRegexFilter.java:29:19:29:43 | getPathInfo(...) : String | semmle.label | getPathInfo(...) : String |
 | DotRegexFilter.java:32:25:32:30 | source | semmle.label | source |
diff --git a/java/ql/test/experimental/query-tests/security/CWE-652/XQueryInjection.expected b/java/ql/test/experimental/query-tests/security/CWE-652/XQueryInjection.expected
index a1c6b0770e8..9c13e08082b 100644
--- a/java/ql/test/experimental/query-tests/security/CWE-652/XQueryInjection.expected
+++ b/java/ql/test/experimental/query-tests/security/CWE-652/XQueryInjection.expected
@@ -10,38 +10,38 @@
 | XQueryInjection.java:155:29:155:32 | name | XQueryInjection.java:150:23:150:50 | getParameter(...) : String | XQueryInjection.java:155:29:155:32 | name | XQuery query might include code from $@. | XQueryInjection.java:150:23:150:50 | getParameter(...) | this user input |
 | XQueryInjection.java:159:29:159:30 | br | XQueryInjection.java:157:26:157:49 | getInputStream(...) : ServletInputStream | XQueryInjection.java:159:29:159:30 | br | XQuery query might include code from $@. | XQueryInjection.java:157:26:157:49 | getInputStream(...) | this user input |
 edges
-| XQueryInjection.java:45:23:45:50 | getParameter(...) : String | XQueryInjection.java:50:60:50:64 | query : String | provenance | Src:MaD:4  |
+| XQueryInjection.java:45:23:45:50 | getParameter(...) : String | XQueryInjection.java:50:60:50:64 | query : String | provenance | Src:MaD:2  |
 | XQueryInjection.java:50:37:50:65 | prepareExpression(...) : XQPreparedExpression | XQueryInjection.java:51:35:51:38 | xqpe | provenance |  |
 | XQueryInjection.java:50:60:50:64 | query : String | XQueryInjection.java:50:37:50:65 | prepareExpression(...) : XQPreparedExpression | provenance | Config |
-| XQueryInjection.java:59:23:59:50 | getParameter(...) : String | XQueryInjection.java:65:53:65:57 | query | provenance | Src:MaD:4  |
+| XQueryInjection.java:59:23:59:50 | getParameter(...) : String | XQueryInjection.java:65:53:65:57 | query | provenance | Src:MaD:2  |
 | XQueryInjection.java:73:32:73:59 | nameStr : String | XQueryInjection.java:78:60:78:64 | query : String | provenance |  |
 | XQueryInjection.java:78:37:78:65 | prepareExpression(...) : XQPreparedExpression | XQueryInjection.java:79:35:79:38 | xqpe | provenance |  |
 | XQueryInjection.java:78:60:78:64 | query : String | XQueryInjection.java:78:37:78:65 | prepareExpression(...) : XQPreparedExpression | provenance | Config |
 | XQueryInjection.java:86:33:86:60 | nameStr : String | XQueryInjection.java:92:53:92:57 | query | provenance |  |
-| XQueryInjection.java:100:28:100:51 | getInputStream(...) : ServletInputStream | XQueryInjection.java:103:60:103:63 | name : ServletInputStream | provenance | Src:MaD:3  |
+| XQueryInjection.java:100:28:100:51 | getInputStream(...) : ServletInputStream | XQueryInjection.java:103:60:103:63 | name : ServletInputStream | provenance | Src:MaD:1  |
 | XQueryInjection.java:103:37:103:64 | prepareExpression(...) : XQPreparedExpression | XQueryInjection.java:104:35:104:38 | xqpe | provenance |  |
 | XQueryInjection.java:103:60:103:63 | name : ServletInputStream | XQueryInjection.java:103:37:103:64 | prepareExpression(...) : XQPreparedExpression | provenance | Config |
-| XQueryInjection.java:112:28:112:51 | getInputStream(...) : ServletInputStream | XQueryInjection.java:116:53:116:56 | name | provenance | Src:MaD:3  |
-| XQueryInjection.java:124:28:124:51 | getInputStream(...) : ServletInputStream | XQueryInjection.java:125:70:125:73 | name : ServletInputStream | provenance | Src:MaD:3  |
+| XQueryInjection.java:112:28:112:51 | getInputStream(...) : ServletInputStream | XQueryInjection.java:116:53:116:56 | name | provenance | Src:MaD:1  |
+| XQueryInjection.java:124:28:124:51 | getInputStream(...) : ServletInputStream | XQueryInjection.java:125:70:125:73 | name : ServletInputStream | provenance | Src:MaD:1  |
 | XQueryInjection.java:125:29:125:75 | new BufferedReader(...) : BufferedReader | XQueryInjection.java:128:60:128:61 | br : BufferedReader | provenance |  |
-| XQueryInjection.java:125:48:125:74 | new InputStreamReader(...) : InputStreamReader | XQueryInjection.java:125:29:125:75 | new BufferedReader(...) : BufferedReader | provenance | MaD:1 |
-| XQueryInjection.java:125:70:125:73 | name : ServletInputStream | XQueryInjection.java:125:48:125:74 | new InputStreamReader(...) : InputStreamReader | provenance | MaD:2 |
+| XQueryInjection.java:125:48:125:74 | new InputStreamReader(...) : InputStreamReader | XQueryInjection.java:125:29:125:75 | new BufferedReader(...) : BufferedReader | provenance | MaD:3 |
+| XQueryInjection.java:125:70:125:73 | name : ServletInputStream | XQueryInjection.java:125:48:125:74 | new InputStreamReader(...) : InputStreamReader | provenance | MaD:4 |
 | XQueryInjection.java:128:37:128:62 | prepareExpression(...) : XQPreparedExpression | XQueryInjection.java:129:35:129:38 | xqpe | provenance |  |
 | XQueryInjection.java:128:60:128:61 | br : BufferedReader | XQueryInjection.java:128:37:128:62 | prepareExpression(...) : XQPreparedExpression | provenance | Config |
-| XQueryInjection.java:137:28:137:51 | getInputStream(...) : ServletInputStream | XQueryInjection.java:138:70:138:73 | name : ServletInputStream | provenance | Src:MaD:3  |
+| XQueryInjection.java:137:28:137:51 | getInputStream(...) : ServletInputStream | XQueryInjection.java:138:70:138:73 | name : ServletInputStream | provenance | Src:MaD:1  |
 | XQueryInjection.java:138:29:138:75 | new BufferedReader(...) : BufferedReader | XQueryInjection.java:142:53:142:54 | br | provenance |  |
-| XQueryInjection.java:138:48:138:74 | new InputStreamReader(...) : InputStreamReader | XQueryInjection.java:138:29:138:75 | new BufferedReader(...) : BufferedReader | provenance | MaD:1 |
-| XQueryInjection.java:138:70:138:73 | name : ServletInputStream | XQueryInjection.java:138:48:138:74 | new InputStreamReader(...) : InputStreamReader | provenance | MaD:2 |
-| XQueryInjection.java:150:23:150:50 | getParameter(...) : String | XQueryInjection.java:155:29:155:32 | name | provenance | Src:MaD:4  |
-| XQueryInjection.java:157:26:157:49 | getInputStream(...) : ServletInputStream | XQueryInjection.java:158:70:158:71 | is : ServletInputStream | provenance | Src:MaD:3  |
+| XQueryInjection.java:138:48:138:74 | new InputStreamReader(...) : InputStreamReader | XQueryInjection.java:138:29:138:75 | new BufferedReader(...) : BufferedReader | provenance | MaD:3 |
+| XQueryInjection.java:138:70:138:73 | name : ServletInputStream | XQueryInjection.java:138:48:138:74 | new InputStreamReader(...) : InputStreamReader | provenance | MaD:4 |
+| XQueryInjection.java:150:23:150:50 | getParameter(...) : String | XQueryInjection.java:155:29:155:32 | name | provenance | Src:MaD:2  |
+| XQueryInjection.java:157:26:157:49 | getInputStream(...) : ServletInputStream | XQueryInjection.java:158:70:158:71 | is : ServletInputStream | provenance | Src:MaD:1  |
 | XQueryInjection.java:158:29:158:73 | new BufferedReader(...) : BufferedReader | XQueryInjection.java:159:29:159:30 | br | provenance |  |
-| XQueryInjection.java:158:48:158:72 | new InputStreamReader(...) : InputStreamReader | XQueryInjection.java:158:29:158:73 | new BufferedReader(...) : BufferedReader | provenance | MaD:1 |
-| XQueryInjection.java:158:70:158:71 | is : ServletInputStream | XQueryInjection.java:158:48:158:72 | new InputStreamReader(...) : InputStreamReader | provenance | MaD:2 |
+| XQueryInjection.java:158:48:158:72 | new InputStreamReader(...) : InputStreamReader | XQueryInjection.java:158:29:158:73 | new BufferedReader(...) : BufferedReader | provenance | MaD:3 |
+| XQueryInjection.java:158:70:158:71 | is : ServletInputStream | XQueryInjection.java:158:48:158:72 | new InputStreamReader(...) : InputStreamReader | provenance | MaD:4 |
 models
-| 1 | Summary: java.io; BufferedReader; false; BufferedReader; ; ; Argument[0]; Argument[this]; taint; manual |
-| 2 | Summary: java.io; InputStreamReader; false; InputStreamReader; ; ; Argument[0]; Argument[this]; taint; manual |
-| 3 | Source: javax.servlet; ServletRequest; false; getInputStream; (); ; ReturnValue; remote; manual |
-| 4 | Source: javax.servlet; ServletRequest; false; getParameter; (String); ; ReturnValue; remote; manual |
+| 1 | Source: javax.servlet; ServletRequest; false; getInputStream; (); ; ReturnValue; remote; manual |
+| 2 | Source: javax.servlet; ServletRequest; false; getParameter; (String); ; ReturnValue; remote; manual |
+| 3 | Summary: java.io; BufferedReader; false; BufferedReader; ; ; Argument[0]; Argument[this]; taint; manual |
+| 4 | Summary: java.io; InputStreamReader; false; InputStreamReader; ; ; Argument[0]; Argument[this]; taint; manual |
 nodes
 | XQueryInjection.java:45:23:45:50 | getParameter(...) : String | semmle.label | getParameter(...) : String |
 | XQueryInjection.java:50:37:50:65 | prepareExpression(...) : XQPreparedExpression | semmle.label | prepareExpression(...) : XQPreparedExpression |
diff --git a/java/ql/test/ext/TestModels/test.expected b/java/ql/test/ext/TestModels/test.expected
index 37ba913c808..fa382e028b9 100644
--- a/java/ql/test/ext/TestModels/test.expected
+++ b/java/ql/test/ext/TestModels/test.expected
@@ -1,228 +1,228 @@
 models
-| 1 | Summary: java.awt; Container; true; add; (Component); ; Argument[0]; ReturnValue; value; manual |
-| 2 | Summary: java.io; File; true; getName; (); ; Argument[this]; ReturnValue; taint; manual |
-| 3 | Summary: java.io; File; true; getParentFile; (); ; Argument[this]; ReturnValue; taint; manual |
-| 4 | Summary: java.io; File; true; getPath; (); ; Argument[this]; ReturnValue; taint; manual |
-| 5 | Summary: java.io; IOException; false; IOException; (String); ; Argument[0]; Argument[this].SyntheticField[java.lang.Throwable.message]; value; manual |
-| 6 | Summary: java.io; StringWriter; false; toString; (); ; Argument[this]; ReturnValue; taint; manual |
-| 7 | Summary: java.io; UncheckedIOException; false; UncheckedIOException; (IOException); ; Argument[0]; Argument[this].SyntheticField[java.lang.Throwable.cause]; value; manual |
-| 8 | Summary: java.lang; AbstractStringBuilder; true; delete; (int,int); ; Argument[this]; ReturnValue; value; manual |
-| 9 | Summary: java.lang; AssertionError; false; AssertionError; (Object); ; Argument[0]; Argument[this].SyntheticField[java.lang.Throwable.message]; value; manual |
-| 10 | Summary: java.lang; CharSequence; true; charAt; ; ; Argument[this]; ReturnValue; taint; manual |
-| 11 | Summary: java.lang; Class; false; cast; (Object); ; Argument[0]; ReturnValue; value; manual |
-| 12 | Summary: java.lang; Exception; false; Exception; (String); ; Argument[0]; Argument[this].SyntheticField[java.lang.Throwable.message]; value; manual |
-| 13 | Summary: java.lang; Exception; false; Exception; (String,Throwable); ; Argument[0]; Argument[this].SyntheticField[java.lang.Throwable.message]; value; manual |
-| 14 | Summary: java.lang; Exception; false; Exception; (String,Throwable); ; Argument[1]; Argument[this].SyntheticField[java.lang.Throwable.cause]; value; manual |
-| 15 | Summary: java.lang; IllegalArgumentException; false; IllegalArgumentException; (String); ; Argument[0]; Argument[this].SyntheticField[java.lang.Throwable.message]; value; manual |
-| 16 | Summary: java.lang; IllegalStateException; false; IllegalStateException; (String); ; Argument[0]; Argument[this].SyntheticField[java.lang.Throwable.message]; value; manual |
-| 17 | Summary: java.lang; IndexOutOfBoundsException; false; IndexOutOfBoundsException; (String); ; Argument[0]; Argument[this].SyntheticField[java.lang.Throwable.message]; value; manual |
-| 18 | Summary: java.lang; NullPointerException; false; NullPointerException; (String); ; Argument[0]; Argument[this].SyntheticField[java.lang.Throwable.message]; value; manual |
-| 19 | Summary: java.lang; RuntimeException; false; RuntimeException; (String); ; Argument[0]; Argument[this].SyntheticField[java.lang.Throwable.message]; value; manual |
-| 20 | Summary: java.lang; RuntimeException; false; RuntimeException; (String,Throwable); ; Argument[0]; Argument[this].SyntheticField[java.lang.Throwable.message]; value; manual |
-| 21 | Summary: java.lang; RuntimeException; false; RuntimeException; (String,Throwable); ; Argument[1]; Argument[this].SyntheticField[java.lang.Throwable.cause]; value; manual |
-| 22 | Summary: java.lang; RuntimeException; false; RuntimeException; (Throwable); ; Argument[0]; Argument[this].SyntheticField[java.lang.Throwable.cause]; value; manual |
-| 23 | Summary: java.lang; Thread; false; Thread; (Runnable); ; Argument[0]; Argument[this]; taint; manual |
-| 24 | Summary: java.lang; Thread; false; Thread; (String); ; Argument[0]; Argument[this].SyntheticField[java.lang.Thread.name]; value; manual |
-| 25 | Summary: java.lang; Thread; true; getName; (); ; Argument[this].SyntheticField[java.lang.Thread.name]; ReturnValue; value; manual |
-| 26 | Summary: java.lang; ThreadLocal; true; get; (); ; Argument[this].SyntheticField[java.lang.ThreadLocal.value]; ReturnValue; value; manual |
-| 27 | Summary: java.lang; ThreadLocal; true; set; (Object); ; Argument[0]; Argument[this].SyntheticField[java.lang.ThreadLocal.value]; value; manual |
-| 28 | Summary: java.lang; Throwable; false; Throwable; (String); ; Argument[0]; Argument[this].SyntheticField[java.lang.Throwable.message]; value; manual |
-| 29 | Summary: java.lang; Throwable; false; Throwable; (Throwable); ; Argument[0]; Argument[this].SyntheticField[java.lang.Throwable.cause]; value; manual |
-| 30 | Summary: java.lang; Throwable; true; getCause; (); ; Argument[this].SyntheticField[java.lang.Throwable.cause]; ReturnValue; value; manual |
-| 31 | Summary: java.lang; Throwable; true; getMessage; (); ; Argument[this].SyntheticField[java.lang.Throwable.message]; ReturnValue; value; manual |
+| 1 | Summary: generatedtest; Test; false; newWithMapValueDefault; (Object); ; Argument[0]; ReturnValue.MapValue; value; manual |
+| 2 | Summary: java.awt; Container; true; add; (Component); ; Argument[0]; ReturnValue; value; manual |
+| 3 | Summary: java.io; File; true; getName; (); ; Argument[this]; ReturnValue; taint; manual |
+| 4 | Summary: java.io; File; true; getParentFile; (); ; Argument[this]; ReturnValue; taint; manual |
+| 5 | Summary: java.io; File; true; getPath; (); ; Argument[this]; ReturnValue; taint; manual |
+| 6 | Summary: java.io; IOException; false; IOException; (String); ; Argument[0]; Argument[this].SyntheticField[java.lang.Throwable.message]; value; manual |
+| 7 | Summary: java.io; StringWriter; false; toString; (); ; Argument[this]; ReturnValue; taint; manual |
+| 8 | Summary: java.io; UncheckedIOException; false; UncheckedIOException; (IOException); ; Argument[0]; Argument[this].SyntheticField[java.lang.Throwable.cause]; value; manual |
+| 9 | Summary: java.lang; AbstractStringBuilder; true; delete; (int,int); ; Argument[this]; ReturnValue; value; manual |
+| 10 | Summary: java.lang; AssertionError; false; AssertionError; (Object); ; Argument[0]; Argument[this].SyntheticField[java.lang.Throwable.message]; value; manual |
+| 11 | Summary: java.lang; CharSequence; true; charAt; ; ; Argument[this]; ReturnValue; taint; manual |
+| 12 | Summary: java.lang; Class; false; cast; (Object); ; Argument[0]; ReturnValue; value; manual |
+| 13 | Summary: java.lang; Exception; false; Exception; (String); ; Argument[0]; Argument[this].SyntheticField[java.lang.Throwable.message]; value; manual |
+| 14 | Summary: java.lang; Exception; false; Exception; (String,Throwable); ; Argument[0]; Argument[this].SyntheticField[java.lang.Throwable.message]; value; manual |
+| 15 | Summary: java.lang; Exception; false; Exception; (String,Throwable); ; Argument[1]; Argument[this].SyntheticField[java.lang.Throwable.cause]; value; manual |
+| 16 | Summary: java.lang; IllegalArgumentException; false; IllegalArgumentException; (String); ; Argument[0]; Argument[this].SyntheticField[java.lang.Throwable.message]; value; manual |
+| 17 | Summary: java.lang; IllegalStateException; false; IllegalStateException; (String); ; Argument[0]; Argument[this].SyntheticField[java.lang.Throwable.message]; value; manual |
+| 18 | Summary: java.lang; IndexOutOfBoundsException; false; IndexOutOfBoundsException; (String); ; Argument[0]; Argument[this].SyntheticField[java.lang.Throwable.message]; value; manual |
+| 19 | Summary: java.lang; NullPointerException; false; NullPointerException; (String); ; Argument[0]; Argument[this].SyntheticField[java.lang.Throwable.message]; value; manual |
+| 20 | Summary: java.lang; RuntimeException; false; RuntimeException; (String); ; Argument[0]; Argument[this].SyntheticField[java.lang.Throwable.message]; value; manual |
+| 21 | Summary: java.lang; RuntimeException; false; RuntimeException; (String,Throwable); ; Argument[0]; Argument[this].SyntheticField[java.lang.Throwable.message]; value; manual |
+| 22 | Summary: java.lang; RuntimeException; false; RuntimeException; (String,Throwable); ; Argument[1]; Argument[this].SyntheticField[java.lang.Throwable.cause]; value; manual |
+| 23 | Summary: java.lang; RuntimeException; false; RuntimeException; (Throwable); ; Argument[0]; Argument[this].SyntheticField[java.lang.Throwable.cause]; value; manual |
+| 24 | Summary: java.lang; Thread; false; Thread; (Runnable); ; Argument[0]; Argument[this]; taint; manual |
+| 25 | Summary: java.lang; Thread; false; Thread; (String); ; Argument[0]; Argument[this].SyntheticField[java.lang.Thread.name]; value; manual |
+| 26 | Summary: java.lang; Thread; true; getName; (); ; Argument[this].SyntheticField[java.lang.Thread.name]; ReturnValue; value; manual |
+| 27 | Summary: java.lang; ThreadLocal; true; get; (); ; Argument[this].SyntheticField[java.lang.ThreadLocal.value]; ReturnValue; value; manual |
+| 28 | Summary: java.lang; ThreadLocal; true; set; (Object); ; Argument[0]; Argument[this].SyntheticField[java.lang.ThreadLocal.value]; value; manual |
+| 29 | Summary: java.lang; Throwable; false; Throwable; (String); ; Argument[0]; Argument[this].SyntheticField[java.lang.Throwable.message]; value; manual |
+| 30 | Summary: java.lang; Throwable; false; Throwable; (Throwable); ; Argument[0]; Argument[this].SyntheticField[java.lang.Throwable.cause]; value; manual |
+| 31 | Summary: java.lang; Throwable; true; getCause; (); ; Argument[this].SyntheticField[java.lang.Throwable.cause]; ReturnValue; value; manual |
 | 32 | Summary: java.lang; Throwable; true; getLocalizedMessage; (); ; Argument[this].SyntheticField[java.lang.Throwable.message]; ReturnValue; value; manual |
-| 33 | Summary: java.lang; Throwable; true; toString; (); ; Argument[this].SyntheticField[java.lang.Throwable.message]; ReturnValue; taint; manual |
-| 34 | Summary: java.lang; UnsupportedOperationException; false; UnsupportedOperationException; (String); ; Argument[0]; Argument[this].SyntheticField[java.lang.Throwable.message]; value; manual |
-| 35 | Summary: java.net; URL; false; toURI; ; ; Argument[this]; ReturnValue; taint; manual |
-| 36 | Summary: java.nio.file; Path; true; getFileName; ; ; Argument[this]; ReturnValue; taint; manual |
-| 37 | Summary: java.sql; ResultSet; true; getString; (String); ; Argument[this]; ReturnValue; taint; manual |
-| 38 | Summary: java.util.concurrent.atomic; AtomicReference; false; AtomicReference; (Object); ; Argument[0]; Argument[this].SyntheticField[java.util.concurrent.atomic.AtomicReference.value]; value; manual |
-| 39 | Summary: java.util.concurrent.atomic; AtomicReference; false; get; (); ; Argument[this].SyntheticField[java.util.concurrent.atomic.AtomicReference.value]; ReturnValue; value; manual |
-| 40 | Summary: java.util.concurrent.atomic; AtomicReference; false; set; (Object); ; Argument[0]; Argument[this].SyntheticField[java.util.concurrent.atomic.AtomicReference.value]; value; manual |
-| 41 | Summary: java.util.concurrent; CompletableFuture; false; complete; (Object); ; Argument[0]; Argument[this].SyntheticField[java.util.concurrent.Future.value]; value; manual |
-| 42 | Summary: java.util.concurrent; CompletableFuture; false; completedFuture; (Object); ; Argument[0]; ReturnValue.SyntheticField[java.util.concurrent.Future.value]; value; manual |
-| 43 | Summary: java.util.concurrent; CompletableFuture; false; join; (); ; Argument[this].SyntheticField[java.util.concurrent.Future.value]; ReturnValue; value; manual |
-| 44 | Summary: java.util.concurrent; CompletionStage; false; toCompletableFuture; (); ; Argument[this]; ReturnValue; taint; manual |
-| 45 | Summary: java.util.concurrent; ExecutorService; true; submit; (Runnable); ; Argument[0]; ReturnValue; taint; manual |
-| 46 | Summary: java.util.concurrent; Future; true; get; (); ; Argument[this].SyntheticField[java.util.concurrent.Future.value]; ReturnValue; value; manual |
-| 47 | Summary: java.util.logging; Logger; false; getLogger; (String); ; Argument[0]; ReturnValue.SyntheticField[java.util.logging.Logger.name]; value; manual |
-| 48 | Summary: java.util.logging; Logger; false; getName; (); ; Argument[this].SyntheticField[java.util.logging.Logger.name]; ReturnValue; value; manual |
-| 49 | Summary: java.util; EventObject; false; EventObject; (Object); ; Argument[0]; Argument[this].Field[java.util.EventObject.source]; value; manual |
-| 50 | Summary: java.util; EventObject; true; getSource; (); ; Argument[this].Field[java.util.EventObject.source]; ReturnValue; value; manual |
-| 51 | Summary: java.util; ResourceBundle; true; getString; (String); ; Argument[this].MapValue; ReturnValue; value; manual |
-| 52 | Summary: java.util; StringJoiner; false; add; (CharSequence); ; Argument[this]; ReturnValue; value; manual |
-| 53 | Summary: java.util; StringJoiner; false; add; (CharSequence); ; Argument[0]; Argument[this]; taint; manual |
-| 54 | Summary: java.util.regex; Pattern; false; compile; (String); ; Argument[0]; ReturnValue; taint; manual |
-| 55 | Summary: generatedtest; Test; false; newWithMapValueDefault; (Object); ; Argument[0]; ReturnValue.MapValue; value; manual |
+| 33 | Summary: java.lang; Throwable; true; getMessage; (); ; Argument[this].SyntheticField[java.lang.Throwable.message]; ReturnValue; value; manual |
+| 34 | Summary: java.lang; Throwable; true; toString; (); ; Argument[this].SyntheticField[java.lang.Throwable.message]; ReturnValue; taint; manual |
+| 35 | Summary: java.lang; UnsupportedOperationException; false; UnsupportedOperationException; (String); ; Argument[0]; Argument[this].SyntheticField[java.lang.Throwable.message]; value; manual |
+| 36 | Summary: java.net; URL; false; toURI; ; ; Argument[this]; ReturnValue; taint; manual |
+| 37 | Summary: java.nio.file; Path; true; getFileName; ; ; Argument[this]; ReturnValue; taint; manual |
+| 38 | Summary: java.sql; ResultSet; true; getString; (String); ; Argument[this]; ReturnValue; taint; manual |
+| 39 | Summary: java.util.concurrent.atomic; AtomicReference; false; AtomicReference; (Object); ; Argument[0]; Argument[this].SyntheticField[java.util.concurrent.atomic.AtomicReference.value]; value; manual |
+| 40 | Summary: java.util.concurrent.atomic; AtomicReference; false; get; (); ; Argument[this].SyntheticField[java.util.concurrent.atomic.AtomicReference.value]; ReturnValue; value; manual |
+| 41 | Summary: java.util.concurrent.atomic; AtomicReference; false; set; (Object); ; Argument[0]; Argument[this].SyntheticField[java.util.concurrent.atomic.AtomicReference.value]; value; manual |
+| 42 | Summary: java.util.concurrent; CompletableFuture; false; complete; (Object); ; Argument[0]; Argument[this].SyntheticField[java.util.concurrent.Future.value]; value; manual |
+| 43 | Summary: java.util.concurrent; CompletableFuture; false; completedFuture; (Object); ; Argument[0]; ReturnValue.SyntheticField[java.util.concurrent.Future.value]; value; manual |
+| 44 | Summary: java.util.concurrent; CompletableFuture; false; join; (); ; Argument[this].SyntheticField[java.util.concurrent.Future.value]; ReturnValue; value; manual |
+| 45 | Summary: java.util.concurrent; CompletionStage; false; toCompletableFuture; (); ; Argument[this]; ReturnValue; taint; manual |
+| 46 | Summary: java.util.concurrent; ExecutorService; true; submit; (Runnable); ; Argument[0]; ReturnValue; taint; manual |
+| 47 | Summary: java.util.concurrent; Future; true; get; (); ; Argument[this].SyntheticField[java.util.concurrent.Future.value]; ReturnValue; value; manual |
+| 48 | Summary: java.util.logging; Logger; false; getLogger; (String); ; Argument[0]; ReturnValue.SyntheticField[java.util.logging.Logger.name]; value; manual |
+| 49 | Summary: java.util.logging; Logger; false; getName; (); ; Argument[this].SyntheticField[java.util.logging.Logger.name]; ReturnValue; value; manual |
+| 50 | Summary: java.util.regex; Pattern; false; compile; (String); ; Argument[0]; ReturnValue; taint; manual |
+| 51 | Summary: java.util; EventObject; false; EventObject; (Object); ; Argument[0]; Argument[this].Field[java.util.EventObject.source]; value; manual |
+| 52 | Summary: java.util; EventObject; true; getSource; (); ; Argument[this].Field[java.util.EventObject.source]; ReturnValue; value; manual |
+| 53 | Summary: java.util; ResourceBundle; true; getString; (String); ; Argument[this].MapValue; ReturnValue; value; manual |
+| 54 | Summary: java.util; StringJoiner; false; add; (CharSequence); ; Argument[0]; Argument[this]; taint; manual |
+| 55 | Summary: java.util; StringJoiner; false; add; (CharSequence); ; Argument[this]; ReturnValue; value; manual |
 edges
 | Test.java:35:28:35:65 | new RuntimeException(...) : RuntimeException [java.lang.Throwable.message] : String | Test.java:36:26:36:27 | e1 : RuntimeException [java.lang.Throwable.message] : String | provenance |  |
-| Test.java:35:49:35:64 | (...)... : String | Test.java:35:28:35:65 | new RuntimeException(...) : RuntimeException [java.lang.Throwable.message] : String | provenance | MaD:19 |
+| Test.java:35:49:35:64 | (...)... : String | Test.java:35:28:35:65 | new RuntimeException(...) : RuntimeException [java.lang.Throwable.message] : String | provenance | MaD:20 |
 | Test.java:35:57:35:64 | source(...) : Object | Test.java:35:49:35:64 | (...)... : String | provenance |  |
-| Test.java:36:26:36:27 | e1 : RuntimeException [java.lang.Throwable.message] : String | Test.java:36:26:36:40 | getMessage(...) : String | provenance | MaD:31 |
+| Test.java:36:26:36:27 | e1 : RuntimeException [java.lang.Throwable.message] : String | Test.java:36:26:36:40 | getMessage(...) : String | provenance | MaD:33 |
 | Test.java:36:26:36:40 | getMessage(...) : String | Test.java:36:18:36:40 | (...)... | provenance |  |
 | Test.java:38:28:38:68 | new RuntimeException(...) : RuntimeException [java.lang.Throwable.cause] : Throwable | Test.java:39:29:39:30 | e2 : RuntimeException [java.lang.Throwable.cause] : Throwable | provenance |  |
-| Test.java:38:49:38:67 | (...)... : Throwable | Test.java:38:28:38:68 | new RuntimeException(...) : RuntimeException [java.lang.Throwable.cause] : Throwable | provenance | MaD:22 |
+| Test.java:38:49:38:67 | (...)... : Throwable | Test.java:38:28:38:68 | new RuntimeException(...) : RuntimeException [java.lang.Throwable.cause] : Throwable | provenance | MaD:23 |
 | Test.java:38:60:38:67 | source(...) : Object | Test.java:38:49:38:67 | (...)... : Throwable | provenance |  |
-| Test.java:39:29:39:30 | e2 : RuntimeException [java.lang.Throwable.cause] : Throwable | Test.java:39:29:39:41 | getCause(...) : Throwable | provenance | MaD:30 |
+| Test.java:39:29:39:30 | e2 : RuntimeException [java.lang.Throwable.cause] : Throwable | Test.java:39:29:39:41 | getCause(...) : Throwable | provenance | MaD:31 |
 | Test.java:39:29:39:41 | getCause(...) : Throwable | Test.java:39:18:39:41 | (...)... | provenance |  |
 | Test.java:41:28:41:73 | new IllegalArgumentException(...) : IllegalArgumentException [java.lang.Throwable.message] : String | Test.java:42:26:42:27 | e3 : IllegalArgumentException [java.lang.Throwable.message] : String | provenance |  |
-| Test.java:41:57:41:72 | (...)... : String | Test.java:41:28:41:73 | new IllegalArgumentException(...) : IllegalArgumentException [java.lang.Throwable.message] : String | provenance | MaD:15 |
+| Test.java:41:57:41:72 | (...)... : String | Test.java:41:28:41:73 | new IllegalArgumentException(...) : IllegalArgumentException [java.lang.Throwable.message] : String | provenance | MaD:16 |
 | Test.java:41:65:41:72 | source(...) : Object | Test.java:41:57:41:72 | (...)... : String | provenance |  |
-| Test.java:42:26:42:27 | e3 : IllegalArgumentException [java.lang.Throwable.message] : String | Test.java:42:26:42:40 | getMessage(...) : String | provenance | MaD:31 |
+| Test.java:42:26:42:27 | e3 : IllegalArgumentException [java.lang.Throwable.message] : String | Test.java:42:26:42:40 | getMessage(...) : String | provenance | MaD:33 |
 | Test.java:42:26:42:40 | getMessage(...) : String | Test.java:42:18:42:40 | (...)... | provenance |  |
 | Test.java:44:28:44:70 | new IllegalStateException(...) : IllegalStateException [java.lang.Throwable.message] : String | Test.java:45:26:45:27 | e4 : IllegalStateException [java.lang.Throwable.message] : String | provenance |  |
-| Test.java:44:54:44:69 | (...)... : String | Test.java:44:28:44:70 | new IllegalStateException(...) : IllegalStateException [java.lang.Throwable.message] : String | provenance | MaD:16 |
+| Test.java:44:54:44:69 | (...)... : String | Test.java:44:28:44:70 | new IllegalStateException(...) : IllegalStateException [java.lang.Throwable.message] : String | provenance | MaD:17 |
 | Test.java:44:62:44:69 | source(...) : Object | Test.java:44:54:44:69 | (...)... : String | provenance |  |
-| Test.java:45:26:45:27 | e4 : IllegalStateException [java.lang.Throwable.message] : String | Test.java:45:26:45:40 | getMessage(...) : String | provenance | MaD:31 |
+| Test.java:45:26:45:27 | e4 : IllegalStateException [java.lang.Throwable.message] : String | Test.java:45:26:45:40 | getMessage(...) : String | provenance | MaD:33 |
 | Test.java:45:26:45:40 | getMessage(...) : String | Test.java:45:18:45:40 | (...)... | provenance |  |
 | Test.java:47:28:47:78 | new UnsupportedOperationException(...) : UnsupportedOperationException [java.lang.Throwable.message] : String | Test.java:48:26:48:27 | e5 : UnsupportedOperationException [java.lang.Throwable.message] : String | provenance |  |
-| Test.java:47:62:47:77 | (...)... : String | Test.java:47:28:47:78 | new UnsupportedOperationException(...) : UnsupportedOperationException [java.lang.Throwable.message] : String | provenance | MaD:34 |
+| Test.java:47:62:47:77 | (...)... : String | Test.java:47:28:47:78 | new UnsupportedOperationException(...) : UnsupportedOperationException [java.lang.Throwable.message] : String | provenance | MaD:35 |
 | Test.java:47:70:47:77 | source(...) : Object | Test.java:47:62:47:77 | (...)... : String | provenance |  |
-| Test.java:48:26:48:27 | e5 : UnsupportedOperationException [java.lang.Throwable.message] : String | Test.java:48:26:48:40 | getMessage(...) : String | provenance | MaD:31 |
+| Test.java:48:26:48:27 | e5 : UnsupportedOperationException [java.lang.Throwable.message] : String | Test.java:48:26:48:40 | getMessage(...) : String | provenance | MaD:33 |
 | Test.java:48:26:48:40 | getMessage(...) : String | Test.java:48:18:48:40 | (...)... | provenance |  |
 | Test.java:50:27:50:60 | new Throwable(...) : Throwable [java.lang.Throwable.cause] : Throwable | Test.java:51:29:51:29 | t : Throwable [java.lang.Throwable.cause] : Throwable | provenance |  |
-| Test.java:50:41:50:59 | (...)... : Throwable | Test.java:50:27:50:60 | new Throwable(...) : Throwable [java.lang.Throwable.cause] : Throwable | provenance | MaD:29 |
+| Test.java:50:41:50:59 | (...)... : Throwable | Test.java:50:27:50:60 | new Throwable(...) : Throwable [java.lang.Throwable.cause] : Throwable | provenance | MaD:30 |
 | Test.java:50:52:50:59 | source(...) : Object | Test.java:50:41:50:59 | (...)... : Throwable | provenance |  |
-| Test.java:51:29:51:29 | t : Throwable [java.lang.Throwable.cause] : Throwable | Test.java:51:29:51:40 | getCause(...) : Throwable | provenance | MaD:30 |
+| Test.java:51:29:51:29 | t : Throwable [java.lang.Throwable.cause] : Throwable | Test.java:51:29:51:40 | getCause(...) : Throwable | provenance | MaD:31 |
 | Test.java:51:29:51:40 | getCause(...) : Throwable | Test.java:51:18:51:40 | (...)... | provenance |  |
 | Test.java:53:25:53:40 | (...)... : String | Test.java:55:18:55:19 | s2 : String | provenance |  |
 | Test.java:53:33:53:40 | source(...) : Object | Test.java:53:25:53:40 | (...)... : String | provenance |  |
-| Test.java:55:18:55:19 | s2 : String | Test.java:55:18:55:29 | charAt(...) | provenance | MaD:10 |
+| Test.java:55:18:55:19 | s2 : String | Test.java:55:18:55:29 | charAt(...) | provenance | MaD:11 |
 | Test.java:57:28:57:46 | (...)... : ResultSet | Test.java:58:18:58:19 | rs : ResultSet | provenance |  |
 | Test.java:57:39:57:46 | source(...) : Object | Test.java:57:28:57:46 | (...)... : ResultSet | provenance |  |
-| Test.java:58:18:58:19 | rs : ResultSet | Test.java:58:18:58:33 | getString(...) | provenance | MaD:37 |
+| Test.java:58:18:58:19 | rs : ResultSet | Test.java:58:18:58:33 | getString(...) | provenance | MaD:38 |
 | Test.java:64:28:64:60 | new IOException(...) : IOException [java.lang.Throwable.message] : String | Test.java:65:26:65:27 | e1 : IOException [java.lang.Throwable.message] : String | provenance |  |
-| Test.java:64:44:64:59 | (...)... : String | Test.java:64:28:64:60 | new IOException(...) : IOException [java.lang.Throwable.message] : String | provenance | MaD:5 |
+| Test.java:64:44:64:59 | (...)... : String | Test.java:64:28:64:60 | new IOException(...) : IOException [java.lang.Throwable.message] : String | provenance | MaD:6 |
 | Test.java:64:52:64:59 | source(...) : Object | Test.java:64:44:64:59 | (...)... : String | provenance |  |
-| Test.java:65:26:65:27 | e1 : IOException [java.lang.Throwable.message] : String | Test.java:65:26:65:40 | getMessage(...) : String | provenance | MaD:31 |
+| Test.java:65:26:65:27 | e1 : IOException [java.lang.Throwable.message] : String | Test.java:65:26:65:40 | getMessage(...) : String | provenance | MaD:33 |
 | Test.java:65:26:65:40 | getMessage(...) : String | Test.java:65:18:65:40 | (...)... | provenance |  |
 | Test.java:67:22:67:35 | (...)... : File | Test.java:68:18:68:18 | f : File | provenance |  |
 | Test.java:67:28:67:35 | source(...) : Object | Test.java:67:22:67:35 | (...)... : File | provenance |  |
-| Test.java:68:18:68:18 | f : File | Test.java:68:18:68:28 | getName(...) | provenance | MaD:2 |
+| Test.java:68:18:68:18 | f : File | Test.java:68:18:68:28 | getName(...) | provenance | MaD:3 |
 | Test.java:71:28:71:58 | new Exception(...) : Exception [java.lang.Throwable.message] : String | Test.java:72:26:72:27 | e2 : Exception [java.lang.Throwable.message] : String | provenance |  |
-| Test.java:71:42:71:57 | (...)... : String | Test.java:71:28:71:58 | new Exception(...) : Exception [java.lang.Throwable.message] : String | provenance | MaD:12 |
+| Test.java:71:42:71:57 | (...)... : String | Test.java:71:28:71:58 | new Exception(...) : Exception [java.lang.Throwable.message] : String | provenance | MaD:13 |
 | Test.java:71:50:71:57 | source(...) : Object | Test.java:71:42:71:57 | (...)... : String | provenance |  |
-| Test.java:72:26:72:27 | e2 : Exception [java.lang.Throwable.message] : String | Test.java:72:26:72:40 | getMessage(...) : String | provenance | MaD:31 |
+| Test.java:72:26:72:27 | e2 : Exception [java.lang.Throwable.message] : String | Test.java:72:26:72:40 | getMessage(...) : String | provenance | MaD:33 |
 | Test.java:72:26:72:40 | getMessage(...) : String | Test.java:72:18:72:40 | (...)... | provenance |  |
 | Test.java:74:28:74:74 | new IndexOutOfBoundsException(...) : IndexOutOfBoundsException [java.lang.Throwable.message] : String | Test.java:75:26:75:27 | e3 : IndexOutOfBoundsException [java.lang.Throwable.message] : String | provenance |  |
-| Test.java:74:58:74:73 | (...)... : String | Test.java:74:28:74:74 | new IndexOutOfBoundsException(...) : IndexOutOfBoundsException [java.lang.Throwable.message] : String | provenance | MaD:17 |
+| Test.java:74:58:74:73 | (...)... : String | Test.java:74:28:74:74 | new IndexOutOfBoundsException(...) : IndexOutOfBoundsException [java.lang.Throwable.message] : String | provenance | MaD:18 |
 | Test.java:74:66:74:73 | source(...) : Object | Test.java:74:58:74:73 | (...)... : String | provenance |  |
-| Test.java:75:26:75:27 | e3 : IndexOutOfBoundsException [java.lang.Throwable.message] : String | Test.java:75:26:75:40 | getMessage(...) : String | provenance | MaD:31 |
+| Test.java:75:26:75:27 | e3 : IndexOutOfBoundsException [java.lang.Throwable.message] : String | Test.java:75:26:75:40 | getMessage(...) : String | provenance | MaD:33 |
 | Test.java:75:26:75:40 | getMessage(...) : String | Test.java:75:18:75:40 | (...)... | provenance |  |
 | Test.java:77:28:77:86 | new RuntimeException(...) : RuntimeException [java.lang.Throwable.cause] : Throwable | Test.java:79:29:79:30 | e4 : RuntimeException [java.lang.Throwable.cause] : Throwable | provenance |  |
 | Test.java:77:28:77:86 | new RuntimeException(...) : RuntimeException [java.lang.Throwable.message] : String | Test.java:78:26:78:27 | e4 : RuntimeException [java.lang.Throwable.message] : String | provenance |  |
-| Test.java:77:49:77:64 | (...)... : String | Test.java:77:28:77:86 | new RuntimeException(...) : RuntimeException [java.lang.Throwable.message] : String | provenance | MaD:20 |
+| Test.java:77:49:77:64 | (...)... : String | Test.java:77:28:77:86 | new RuntimeException(...) : RuntimeException [java.lang.Throwable.message] : String | provenance | MaD:21 |
 | Test.java:77:57:77:64 | source(...) : Object | Test.java:77:49:77:64 | (...)... : String | provenance |  |
-| Test.java:77:67:77:85 | (...)... : Throwable | Test.java:77:28:77:86 | new RuntimeException(...) : RuntimeException [java.lang.Throwable.cause] : Throwable | provenance | MaD:21 |
+| Test.java:77:67:77:85 | (...)... : Throwable | Test.java:77:28:77:86 | new RuntimeException(...) : RuntimeException [java.lang.Throwable.cause] : Throwable | provenance | MaD:22 |
 | Test.java:77:78:77:85 | source(...) : Object | Test.java:77:67:77:85 | (...)... : Throwable | provenance |  |
-| Test.java:78:26:78:27 | e4 : RuntimeException [java.lang.Throwable.message] : String | Test.java:78:26:78:40 | getMessage(...) : String | provenance | MaD:31 |
+| Test.java:78:26:78:27 | e4 : RuntimeException [java.lang.Throwable.message] : String | Test.java:78:26:78:40 | getMessage(...) : String | provenance | MaD:33 |
 | Test.java:78:26:78:40 | getMessage(...) : String | Test.java:78:18:78:40 | (...)... | provenance |  |
-| Test.java:79:29:79:30 | e4 : RuntimeException [java.lang.Throwable.cause] : Throwable | Test.java:79:29:79:41 | getCause(...) : Throwable | provenance | MaD:30 |
+| Test.java:79:29:79:30 | e4 : RuntimeException [java.lang.Throwable.cause] : Throwable | Test.java:79:29:79:41 | getCause(...) : Throwable | provenance | MaD:31 |
 | Test.java:79:29:79:41 | getCause(...) : Throwable | Test.java:79:18:79:41 | (...)... | provenance |  |
 | Test.java:88:34:88:62 | new AtomicReference<>(...) : AtomicReference [java.util.concurrent.atomic.AtomicReference.value] : Object | Test.java:89:18:89:19 | ar : AtomicReference [java.util.concurrent.atomic.AtomicReference.value] : Object | provenance |  |
-| Test.java:88:54:88:61 | source(...) : Object | Test.java:88:34:88:62 | new AtomicReference<>(...) : AtomicReference [java.util.concurrent.atomic.AtomicReference.value] : Object | provenance | MaD:38 |
-| Test.java:89:18:89:19 | ar : AtomicReference [java.util.concurrent.atomic.AtomicReference.value] : Object | Test.java:89:18:89:25 | get(...) | provenance | MaD:39 |
-| Test.java:93:26:93:47 | (...)... : CharSequence | Test.java:93:18:93:48 | add(...) | provenance | MaD:53+MaD:52 |
+| Test.java:88:54:88:61 | source(...) : Object | Test.java:88:34:88:62 | new AtomicReference<>(...) : AtomicReference [java.util.concurrent.atomic.AtomicReference.value] : Object | provenance | MaD:39 |
+| Test.java:89:18:89:19 | ar : AtomicReference [java.util.concurrent.atomic.AtomicReference.value] : Object | Test.java:89:18:89:25 | get(...) | provenance | MaD:40 |
+| Test.java:93:26:93:47 | (...)... : CharSequence | Test.java:93:18:93:48 | add(...) | provenance | MaD:54+MaD:55 |
 | Test.java:93:40:93:47 | source(...) : Object | Test.java:93:26:93:47 | (...)... : CharSequence | provenance |  |
 | Test.java:95:32:95:53 | (...)... : StringJoiner | Test.java:96:18:96:20 | sj2 : StringJoiner | provenance |  |
 | Test.java:95:46:95:53 | source(...) : Object | Test.java:95:32:95:53 | (...)... : StringJoiner | provenance |  |
-| Test.java:96:18:96:20 | sj2 : StringJoiner | Test.java:96:18:96:32 | add(...) | provenance | MaD:52 |
-| Test.java:104:32:104:50 | (...)... : Component | Test.java:104:18:104:51 | add(...) | provenance | MaD:1 |
+| Test.java:96:18:96:20 | sj2 : StringJoiner | Test.java:96:18:96:32 | add(...) | provenance | MaD:55 |
+| Test.java:104:32:104:50 | (...)... : Component | Test.java:104:18:104:51 | add(...) | provenance | MaD:2 |
 | Test.java:104:43:104:50 | source(...) : Object | Test.java:104:32:104:50 | (...)... : Component | provenance |  |
 | Test.java:107:23:107:36 | (...)... : File | Test.java:108:18:108:19 | f1 : File | provenance |  |
 | Test.java:107:29:107:36 | source(...) : Object | Test.java:107:23:107:36 | (...)... : File | provenance |  |
-| Test.java:108:18:108:19 | f1 : File | Test.java:108:18:108:35 | getParentFile(...) | provenance | MaD:3 |
+| Test.java:108:18:108:19 | f1 : File | Test.java:108:18:108:35 | getParentFile(...) | provenance | MaD:4 |
 | Test.java:110:23:110:36 | (...)... : File | Test.java:111:18:111:19 | f2 : File | provenance |  |
 | Test.java:110:29:110:36 | source(...) : Object | Test.java:110:23:110:36 | (...)... : File | provenance |  |
-| Test.java:111:18:111:19 | f2 : File | Test.java:111:18:111:29 | getPath(...) | provenance | MaD:4 |
+| Test.java:111:18:111:19 | f2 : File | Test.java:111:18:111:29 | getPath(...) | provenance | MaD:5 |
 | Test.java:113:31:113:52 | (...)... : StringWriter | Test.java:114:18:114:19 | sw : StringWriter | provenance |  |
 | Test.java:113:31:113:52 | (...)... : StringWriter | Test.java:114:18:114:30 | toString(...) | provenance | %StringWriter |
 | Test.java:113:45:113:52 | source(...) : Object | Test.java:113:31:113:52 | (...)... : StringWriter | provenance |  |
-| Test.java:114:18:114:19 | sw : StringWriter | Test.java:114:18:114:30 | toString(...) | provenance | MaD:6 |
+| Test.java:114:18:114:19 | sw : StringWriter | Test.java:114:18:114:30 | toString(...) | provenance | MaD:7 |
 | Test.java:116:27:116:73 | new UncheckedIOException(...) : UncheckedIOException [java.lang.Throwable.cause] : IOException | Test.java:117:29:117:29 | e : UncheckedIOException [java.lang.Throwable.cause] : IOException | provenance |  |
-| Test.java:116:52:116:72 | (...)... : IOException | Test.java:116:27:116:73 | new UncheckedIOException(...) : UncheckedIOException [java.lang.Throwable.cause] : IOException | provenance | MaD:7 |
+| Test.java:116:52:116:72 | (...)... : IOException | Test.java:116:27:116:73 | new UncheckedIOException(...) : UncheckedIOException [java.lang.Throwable.cause] : IOException | provenance | MaD:8 |
 | Test.java:116:65:116:72 | source(...) : Object | Test.java:116:52:116:72 | (...)... : IOException | provenance |  |
-| Test.java:117:29:117:29 | e : UncheckedIOException [java.lang.Throwable.cause] : IOException | Test.java:117:29:117:40 | getCause(...) : IOException | provenance | MaD:30 |
+| Test.java:117:29:117:29 | e : UncheckedIOException [java.lang.Throwable.cause] : IOException | Test.java:117:29:117:40 | getCause(...) : IOException | provenance | MaD:31 |
 | Test.java:117:29:117:40 | getCause(...) : IOException | Test.java:117:18:117:40 | (...)... | provenance |  |
 | Test.java:120:23:120:35 | (...)... : URL | Test.java:121:18:121:20 | url : URL | provenance |  |
 | Test.java:120:28:120:35 | source(...) : Object | Test.java:120:23:120:35 | (...)... : URL | provenance |  |
-| Test.java:121:18:121:20 | url : URL | Test.java:121:18:121:28 | toURI(...) | provenance | MaD:35 |
+| Test.java:121:18:121:20 | url : URL | Test.java:121:18:121:28 | toURI(...) | provenance | MaD:36 |
 | Test.java:124:22:124:35 | (...)... : Path | Test.java:125:18:125:18 | p : Path | provenance |  |
 | Test.java:124:28:124:35 | source(...) : Object | Test.java:124:22:124:35 | (...)... : Path | provenance |  |
-| Test.java:125:18:125:18 | p : Path | Test.java:125:18:125:32 | getFileName(...) | provenance | MaD:36 |
+| Test.java:125:18:125:18 | p : Path | Test.java:125:18:125:32 | getFileName(...) | provenance | MaD:37 |
 | Test.java:129:13:129:14 | ar [post update] : AtomicReference [java.util.concurrent.atomic.AtomicReference.value] : Object | Test.java:130:18:130:19 | ar : AtomicReference [java.util.concurrent.atomic.AtomicReference.value] : Object | provenance |  |
-| Test.java:129:20:129:27 | source(...) : Object | Test.java:129:13:129:14 | ar [post update] : AtomicReference [java.util.concurrent.atomic.AtomicReference.value] : Object | provenance | MaD:40 |
-| Test.java:130:18:130:19 | ar : AtomicReference [java.util.concurrent.atomic.AtomicReference.value] : Object | Test.java:130:18:130:25 | get(...) | provenance | MaD:39 |
-| Test.java:135:29:135:46 | (...)... : Runnable | Test.java:135:18:135:47 | submit(...) | provenance | MaD:45 |
+| Test.java:129:20:129:27 | source(...) : Object | Test.java:129:13:129:14 | ar [post update] : AtomicReference [java.util.concurrent.atomic.AtomicReference.value] : Object | provenance | MaD:41 |
+| Test.java:130:18:130:19 | ar : AtomicReference [java.util.concurrent.atomic.AtomicReference.value] : Object | Test.java:130:18:130:25 | get(...) | provenance | MaD:40 |
+| Test.java:135:29:135:46 | (...)... : Runnable | Test.java:135:18:135:47 | submit(...) | provenance | MaD:46 |
 | Test.java:135:39:135:46 | source(...) : Object | Test.java:135:29:135:46 | (...)... : Runnable | provenance |  |
 | Test.java:137:34:137:58 | (...)... : CompletionStage | Test.java:138:18:138:19 | cs : CompletionStage | provenance |  |
 | Test.java:137:51:137:58 | source(...) : Object | Test.java:137:34:137:58 | (...)... : CompletionStage | provenance |  |
-| Test.java:138:18:138:19 | cs : CompletionStage | Test.java:138:18:138:41 | toCompletableFuture(...) | provenance | MaD:44 |
+| Test.java:138:18:138:19 | cs : CompletionStage | Test.java:138:18:138:41 | toCompletableFuture(...) | provenance | MaD:45 |
 | Test.java:141:13:141:15 | cf1 [post update] : CompletableFuture [java.util.concurrent.Future.value] : Object | Test.java:142:18:142:20 | cf1 : CompletableFuture [java.util.concurrent.Future.value] : Object | provenance |  |
 | Test.java:141:13:141:15 | cf1 [post update] : CompletableFuture [java.util.concurrent.Future.value] : Object | Test.java:143:18:143:20 | cf1 : CompletableFuture [java.util.concurrent.Future.value] : Object | provenance |  |
-| Test.java:141:26:141:33 | source(...) : Object | Test.java:141:13:141:15 | cf1 [post update] : CompletableFuture [java.util.concurrent.Future.value] : Object | provenance | MaD:41 |
-| Test.java:142:18:142:20 | cf1 : CompletableFuture [java.util.concurrent.Future.value] : Object | Test.java:142:18:142:26 | get(...) | provenance | MaD:46 |
-| Test.java:143:18:143:20 | cf1 : CompletableFuture [java.util.concurrent.Future.value] : Object | Test.java:143:18:143:27 | join(...) | provenance | MaD:43 |
+| Test.java:141:26:141:33 | source(...) : Object | Test.java:141:13:141:15 | cf1 [post update] : CompletableFuture [java.util.concurrent.Future.value] : Object | provenance | MaD:42 |
+| Test.java:142:18:142:20 | cf1 : CompletableFuture [java.util.concurrent.Future.value] : Object | Test.java:142:18:142:26 | get(...) | provenance | MaD:47 |
+| Test.java:143:18:143:20 | cf1 : CompletableFuture [java.util.concurrent.Future.value] : Object | Test.java:143:18:143:27 | join(...) | provenance | MaD:44 |
 | Test.java:145:37:145:79 | completedFuture(...) : CompletableFuture [java.util.concurrent.Future.value] : Object | Test.java:146:18:146:20 | cf2 : CompletableFuture [java.util.concurrent.Future.value] : Object | provenance |  |
 | Test.java:145:37:145:79 | completedFuture(...) : CompletableFuture [java.util.concurrent.Future.value] : Object | Test.java:147:18:147:20 | cf2 : CompletableFuture [java.util.concurrent.Future.value] : Object | provenance |  |
-| Test.java:145:71:145:78 | source(...) : Object | Test.java:145:37:145:79 | completedFuture(...) : CompletableFuture [java.util.concurrent.Future.value] : Object | provenance | MaD:42 |
-| Test.java:146:18:146:20 | cf2 : CompletableFuture [java.util.concurrent.Future.value] : Object | Test.java:146:18:146:26 | get(...) | provenance | MaD:46 |
-| Test.java:147:18:147:20 | cf2 : CompletableFuture [java.util.concurrent.Future.value] : Object | Test.java:147:18:147:27 | join(...) | provenance | MaD:43 |
+| Test.java:145:71:145:78 | source(...) : Object | Test.java:145:37:145:79 | completedFuture(...) : CompletableFuture [java.util.concurrent.Future.value] : Object | provenance | MaD:43 |
+| Test.java:146:18:146:20 | cf2 : CompletableFuture [java.util.concurrent.Future.value] : Object | Test.java:146:18:146:26 | get(...) | provenance | MaD:47 |
+| Test.java:147:18:147:20 | cf2 : CompletableFuture [java.util.concurrent.Future.value] : Object | Test.java:147:18:147:27 | join(...) | provenance | MaD:44 |
 | Test.java:150:29:150:62 | getLogger(...) : Logger [java.util.logging.Logger.name] : String | Test.java:151:18:151:23 | logger : Logger [java.util.logging.Logger.name] : String | provenance |  |
-| Test.java:150:46:150:61 | (...)... : String | Test.java:150:29:150:62 | getLogger(...) : Logger [java.util.logging.Logger.name] : String | provenance | MaD:47 |
+| Test.java:150:46:150:61 | (...)... : String | Test.java:150:29:150:62 | getLogger(...) : Logger [java.util.logging.Logger.name] : String | provenance | MaD:48 |
 | Test.java:150:54:150:61 | source(...) : Object | Test.java:150:46:150:61 | (...)... : String | provenance |  |
-| Test.java:151:18:151:23 | logger : Logger [java.util.logging.Logger.name] : String | Test.java:151:18:151:33 | getName(...) | provenance | MaD:48 |
+| Test.java:151:18:151:23 | logger : Logger [java.util.logging.Logger.name] : String | Test.java:151:18:151:33 | getName(...) | provenance | MaD:49 |
 | Test.java:154:31:154:63 | compile(...) : Pattern | Test.java:155:18:155:24 | pattern | provenance |  |
-| Test.java:154:47:154:62 | (...)... : String | Test.java:154:31:154:63 | compile(...) : Pattern | provenance | MaD:54 |
+| Test.java:154:47:154:62 | (...)... : String | Test.java:154:31:154:63 | compile(...) : Pattern | provenance | MaD:50 |
 | Test.java:154:55:154:62 | source(...) : Object | Test.java:154:47:154:62 | (...)... : String | provenance |  |
 | Test.java:158:36:158:60 | new EventObject(...) : EventObject [source] : Object | Test.java:159:18:159:25 | eventObj : EventObject [source] : Object | provenance |  |
-| Test.java:158:52:158:59 | source(...) : Object | Test.java:158:36:158:60 | new EventObject(...) : EventObject [source] : Object | provenance | MaD:49 |
-| Test.java:159:18:159:25 | eventObj : EventObject [source] : Object | Test.java:159:18:159:37 | getSource(...) | provenance | MaD:50 |
+| Test.java:158:52:158:59 | source(...) : Object | Test.java:158:36:158:60 | new EventObject(...) : EventObject [source] : Object | provenance | MaD:51 |
+| Test.java:159:18:159:25 | eventObj : EventObject [source] : Object | Test.java:159:18:159:37 | getSource(...) | provenance | MaD:52 |
 | Test.java:163:33:163:80 | (...)... : ResourceBundle [<map.value>] : Object | Test.java:164:19:164:20 | in : ResourceBundle [<map.value>] : Object | provenance |  |
 | Test.java:163:49:163:80 | newWithMapValueDefault(...) : Object [<map.value>] : Object | Test.java:163:33:163:80 | (...)... : ResourceBundle [<map.value>] : Object | provenance |  |
-| Test.java:163:72:163:79 | source(...) : Object | Test.java:163:49:163:80 | newWithMapValueDefault(...) : Object [<map.value>] : Object | provenance | MaD:55 |
-| Test.java:164:19:164:20 | in : ResourceBundle [<map.value>] : Object | Test.java:164:19:164:36 | getString(...) : String | provenance | MaD:51 |
+| Test.java:163:72:163:79 | source(...) : Object | Test.java:163:49:163:80 | newWithMapValueDefault(...) : Object [<map.value>] : Object | provenance | MaD:1 |
+| Test.java:164:19:164:20 | in : ResourceBundle [<map.value>] : Object | Test.java:164:19:164:36 | getString(...) : String | provenance | MaD:53 |
 | Test.java:164:19:164:36 | getString(...) : String | Test.java:165:18:165:20 | out | provenance |  |
 | Test.java:168:40:168:67 | new AssertionError(...) : AssertionError [java.lang.Throwable.message] : Object | Test.java:169:26:169:34 | assertErr : AssertionError [java.lang.Throwable.message] : Object | provenance |  |
-| Test.java:168:59:168:66 | source(...) : Object | Test.java:168:40:168:67 | new AssertionError(...) : AssertionError [java.lang.Throwable.message] : Object | provenance | MaD:9 |
-| Test.java:169:26:169:34 | assertErr : AssertionError [java.lang.Throwable.message] : Object | Test.java:169:26:169:47 | getMessage(...) : String | provenance | MaD:31 |
+| Test.java:168:59:168:66 | source(...) : Object | Test.java:168:40:168:67 | new AssertionError(...) : AssertionError [java.lang.Throwable.message] : Object | provenance | MaD:10 |
+| Test.java:169:26:169:34 | assertErr : AssertionError [java.lang.Throwable.message] : Object | Test.java:169:26:169:47 | getMessage(...) : String | provenance | MaD:33 |
 | Test.java:169:26:169:47 | getMessage(...) : String | Test.java:169:18:169:47 | (...)... | provenance |  |
-| Test.java:171:34:171:41 | source(...) : Object | Test.java:171:18:171:42 | cast(...) | provenance | MaD:11 |
+| Test.java:171:34:171:41 | source(...) : Object | Test.java:171:18:171:42 | cast(...) | provenance | MaD:12 |
 | Test.java:173:32:173:83 | new Exception(...) : Exception [java.lang.Throwable.cause] : Throwable | Test.java:175:29:175:34 | excep1 : Exception [java.lang.Throwable.cause] : Throwable | provenance |  |
 | Test.java:173:32:173:83 | new Exception(...) : Exception [java.lang.Throwable.message] : String | Test.java:174:26:174:31 | excep1 : Exception [java.lang.Throwable.message] : String | provenance |  |
-| Test.java:173:46:173:61 | (...)... : String | Test.java:173:32:173:83 | new Exception(...) : Exception [java.lang.Throwable.message] : String | provenance | MaD:13 |
+| Test.java:173:46:173:61 | (...)... : String | Test.java:173:32:173:83 | new Exception(...) : Exception [java.lang.Throwable.message] : String | provenance | MaD:14 |
 | Test.java:173:54:173:61 | source(...) : Object | Test.java:173:46:173:61 | (...)... : String | provenance |  |
-| Test.java:173:64:173:82 | (...)... : Throwable | Test.java:173:32:173:83 | new Exception(...) : Exception [java.lang.Throwable.cause] : Throwable | provenance | MaD:14 |
+| Test.java:173:64:173:82 | (...)... : Throwable | Test.java:173:32:173:83 | new Exception(...) : Exception [java.lang.Throwable.cause] : Throwable | provenance | MaD:15 |
 | Test.java:173:75:173:82 | source(...) : Object | Test.java:173:64:173:82 | (...)... : Throwable | provenance |  |
-| Test.java:174:26:174:31 | excep1 : Exception [java.lang.Throwable.message] : String | Test.java:174:26:174:44 | getMessage(...) : String | provenance | MaD:31 |
+| Test.java:174:26:174:31 | excep1 : Exception [java.lang.Throwable.message] : String | Test.java:174:26:174:44 | getMessage(...) : String | provenance | MaD:33 |
 | Test.java:174:26:174:44 | getMessage(...) : String | Test.java:174:18:174:44 | (...)... | provenance |  |
-| Test.java:175:29:175:34 | excep1 : Exception [java.lang.Throwable.cause] : Throwable | Test.java:175:29:175:45 | getCause(...) : Throwable | provenance | MaD:30 |
+| Test.java:175:29:175:34 | excep1 : Exception [java.lang.Throwable.cause] : Throwable | Test.java:175:29:175:45 | getCause(...) : Throwable | provenance | MaD:31 |
 | Test.java:175:29:175:45 | getCause(...) : Throwable | Test.java:175:18:175:45 | (...)... | provenance |  |
 | Test.java:177:32:177:73 | new NullPointerException(...) : NullPointerException [java.lang.Throwable.message] : String | Test.java:178:26:178:31 | excep2 : NullPointerException [java.lang.Throwable.message] : String | provenance |  |
-| Test.java:177:57:177:72 | (...)... : String | Test.java:177:32:177:73 | new NullPointerException(...) : NullPointerException [java.lang.Throwable.message] : String | provenance | MaD:18 |
+| Test.java:177:57:177:72 | (...)... : String | Test.java:177:32:177:73 | new NullPointerException(...) : NullPointerException [java.lang.Throwable.message] : String | provenance | MaD:19 |
 | Test.java:177:65:177:72 | source(...) : Object | Test.java:177:57:177:72 | (...)... : String | provenance |  |
-| Test.java:178:26:178:31 | excep2 : NullPointerException [java.lang.Throwable.message] : String | Test.java:178:26:178:44 | getMessage(...) : String | provenance | MaD:31 |
+| Test.java:178:26:178:31 | excep2 : NullPointerException [java.lang.Throwable.message] : String | Test.java:178:26:178:44 | getMessage(...) : String | provenance | MaD:33 |
 | Test.java:178:26:178:44 | getMessage(...) : String | Test.java:178:18:178:44 | (...)... | provenance |  |
 | Test.java:180:32:180:54 | (...)... : StringBuilder | Test.java:181:18:181:19 | sb : StringBuilder | provenance |  |
 | Test.java:180:47:180:54 | source(...) : Object | Test.java:180:32:180:54 | (...)... : StringBuilder | provenance |  |
-| Test.java:181:18:181:19 | sb : StringBuilder | Test.java:181:18:181:32 | delete(...) | provenance | MaD:8 |
+| Test.java:181:18:181:19 | sb : StringBuilder | Test.java:181:18:181:32 | delete(...) | provenance | MaD:9 |
 | Test.java:183:30:183:59 | new Thread(...) : Thread | Test.java:184:18:184:24 | thread1 | provenance |  |
-| Test.java:183:41:183:58 | (...)... : Runnable | Test.java:183:30:183:59 | new Thread(...) : Thread | provenance | MaD:23 |
+| Test.java:183:41:183:58 | (...)... : Runnable | Test.java:183:30:183:59 | new Thread(...) : Thread | provenance | MaD:24 |
 | Test.java:183:51:183:58 | source(...) : Object | Test.java:183:41:183:58 | (...)... : Runnable | provenance |  |
 | Test.java:186:30:186:57 | new Thread(...) : Thread [java.lang.Thread.name] : String | Test.java:187:18:187:24 | thread2 : Thread [java.lang.Thread.name] : String | provenance |  |
-| Test.java:186:41:186:56 | (...)... : String | Test.java:186:30:186:57 | new Thread(...) : Thread [java.lang.Thread.name] : String | provenance | MaD:24 |
+| Test.java:186:41:186:56 | (...)... : String | Test.java:186:30:186:57 | new Thread(...) : Thread [java.lang.Thread.name] : String | provenance | MaD:25 |
 | Test.java:186:49:186:56 | source(...) : Object | Test.java:186:41:186:56 | (...)... : String | provenance |  |
-| Test.java:187:18:187:24 | thread2 : Thread [java.lang.Thread.name] : String | Test.java:187:18:187:34 | getName(...) | provenance | MaD:25 |
+| Test.java:187:18:187:24 | thread2 : Thread [java.lang.Thread.name] : String | Test.java:187:18:187:34 | getName(...) | provenance | MaD:26 |
 | Test.java:190:13:190:21 | threadloc [post update] : ThreadLocal [java.lang.ThreadLocal.value] : Object | Test.java:191:18:191:26 | threadloc : ThreadLocal [java.lang.ThreadLocal.value] : Object | provenance |  |
-| Test.java:190:27:190:34 | source(...) : Object | Test.java:190:13:190:21 | threadloc [post update] : ThreadLocal [java.lang.ThreadLocal.value] : Object | provenance | MaD:27 |
-| Test.java:191:18:191:26 | threadloc : ThreadLocal [java.lang.ThreadLocal.value] : Object | Test.java:191:18:191:32 | get(...) | provenance | MaD:26 |
+| Test.java:190:27:190:34 | source(...) : Object | Test.java:190:13:190:21 | threadloc [post update] : ThreadLocal [java.lang.ThreadLocal.value] : Object | provenance | MaD:28 |
+| Test.java:191:18:191:26 | threadloc : ThreadLocal [java.lang.ThreadLocal.value] : Object | Test.java:191:18:191:32 | get(...) | provenance | MaD:27 |
 | Test.java:193:28:193:58 | new Throwable(...) : Throwable [java.lang.Throwable.message] : String | Test.java:194:26:194:27 | th : Throwable [java.lang.Throwable.message] : String | provenance |  |
 | Test.java:193:28:193:58 | new Throwable(...) : Throwable [java.lang.Throwable.message] : String | Test.java:195:18:195:19 | th : Throwable [java.lang.Throwable.message] : String | provenance |  |
-| Test.java:193:42:193:57 | (...)... : String | Test.java:193:28:193:58 | new Throwable(...) : Throwable [java.lang.Throwable.message] : String | provenance | MaD:28 |
+| Test.java:193:42:193:57 | (...)... : String | Test.java:193:28:193:58 | new Throwable(...) : Throwable [java.lang.Throwable.message] : String | provenance | MaD:29 |
 | Test.java:193:50:193:57 | source(...) : Object | Test.java:193:42:193:57 | (...)... : String | provenance |  |
 | Test.java:194:26:194:27 | th : Throwable [java.lang.Throwable.message] : String | Test.java:194:26:194:49 | getLocalizedMessage(...) : String | provenance | MaD:32 |
 | Test.java:194:26:194:49 | getLocalizedMessage(...) : String | Test.java:194:18:194:49 | (...)... | provenance |  |
-| Test.java:195:18:195:19 | th : Throwable [java.lang.Throwable.message] : String | Test.java:195:18:195:30 | toString(...) | provenance | MaD:33 |
+| Test.java:195:18:195:19 | th : Throwable [java.lang.Throwable.message] : String | Test.java:195:18:195:30 | toString(...) | provenance | MaD:34 |
 nodes
 | Test.java:35:28:35:65 | new RuntimeException(...) : RuntimeException [java.lang.Throwable.message] : String | semmle.label | new RuntimeException(...) : RuntimeException [java.lang.Throwable.message] : String |
 | Test.java:35:49:35:64 | (...)... : String | semmle.label | (...)... : String |
diff --git a/java/ql/test/ext/TopJdkApis/TopJdkApisTest.expected b/java/ql/test/ext/TopJdkApis/TopJdkApisTest.expected
index f289ad7feb7..b5e3960f1b4 100644
--- a/java/ql/test/ext/TopJdkApis/TopJdkApisTest.expected
+++ b/java/ql/test/ext/TopJdkApis/TopJdkApisTest.expected
@@ -1,3 +1,4 @@
+| java.lang.Object#toString() | no manual model |
 | java.lang.Runnable#run() | no manual model |
 | java.util.Comparator#comparing(Function) | no manual model |
 | java.util.function.BiConsumer#accept(Object,Object) | no manual model |
diff --git a/java/ql/test/library-tests/MemberRefExpr/parameters.expected b/java/ql/test/library-tests/MemberRefExpr/parameters.expected
new file mode 100644
index 00000000000..2981f022fef
--- /dev/null
+++ b/java/ql/test/library-tests/MemberRefExpr/parameters.expected
@@ -0,0 +1,10 @@
+| Test.java:3:22:3:24 | o |
+| Test.java:7:22:7:26 | i |
+| Test.java:45:22:45:26 | s |
+| Test.java:49:29:49:42 | this |
+| Test.java:50:29:50:42 | this |
+| Test.java:51:29:51:39 | this |
+| Test.java:52:40:52:64 | this |
+| Test.java:70:13:70:22 | length |
+| Test.java:71:13:71:26 | length |
+| Test.java:75:31:75:47 | this |
diff --git a/java/ql/test/library-tests/MemberRefExpr/parameters.ql b/java/ql/test/library-tests/MemberRefExpr/parameters.ql
new file mode 100644
index 00000000000..d4b8690b485
--- /dev/null
+++ b/java/ql/test/library-tests/MemberRefExpr/parameters.ql
@@ -0,0 +1,5 @@
+import java
+
+from Parameter p
+where p.fromSource()
+select p
diff --git a/java/ql/test/library-tests/dataflow/collections/containerflow.expected b/java/ql/test/library-tests/dataflow/collections/containerflow.expected
index 384f23c95b6..84c24154fb4 100644
--- a/java/ql/test/library-tests/dataflow/collections/containerflow.expected
+++ b/java/ql/test/library-tests/dataflow/collections/containerflow.expected
@@ -1,347 +1,347 @@
 models
-| 1 | Summary: java.lang; Iterable; true; iterator; (); ; Argument[this].Element; ReturnValue.Element; value; manual |
-| 2 | Summary: java.lang; Iterable; true; spliterator; (); ; Argument[this].Element; ReturnValue.Element; value; manual |
-| 3 | Summary: java.util.concurrent; BlockingDeque; true; offerFirst; (Object,long,TimeUnit); ; Argument[0]; Argument[this].Element; value; manual |
-| 4 | Summary: java.util.concurrent; BlockingDeque; true; offerLast; (Object,long,TimeUnit); ; Argument[0]; Argument[this].Element; value; manual |
-| 5 | Summary: java.util.concurrent; BlockingDeque; true; pollFirst; (long,TimeUnit); ; Argument[this].Element; ReturnValue; value; manual |
-| 6 | Summary: java.util.concurrent; BlockingDeque; true; pollLast; (long,TimeUnit); ; Argument[this].Element; ReturnValue; value; manual |
-| 7 | Summary: java.util.concurrent; BlockingDeque; true; putFirst; (Object); ; Argument[0]; Argument[this].Element; value; manual |
-| 8 | Summary: java.util.concurrent; BlockingDeque; true; putLast; (Object); ; Argument[0]; Argument[this].Element; value; manual |
-| 9 | Summary: java.util.concurrent; BlockingDeque; true; takeFirst; (); ; Argument[this].Element; ReturnValue; value; manual |
-| 10 | Summary: java.util.concurrent; BlockingDeque; true; takeLast; (); ; Argument[this].Element; ReturnValue; value; manual |
-| 11 | Summary: java.util.concurrent; BlockingQueue; true; drainTo; (Collection); ; Argument[this].Element; Argument[0].Element; value; manual |
-| 12 | Summary: java.util.concurrent; BlockingQueue; true; drainTo; (Collection,int); ; Argument[this].Element; Argument[0].Element; value; manual |
-| 13 | Summary: java.util.concurrent; BlockingQueue; true; offer; (Object,long,TimeUnit); ; Argument[0]; Argument[this].Element; value; manual |
-| 14 | Summary: java.util.concurrent; BlockingQueue; true; poll; (long,TimeUnit); ; Argument[this].Element; ReturnValue; value; manual |
-| 15 | Summary: java.util.concurrent; BlockingQueue; true; put; (Object); ; Argument[0]; Argument[this].Element; value; manual |
-| 16 | Summary: java.util.concurrent; BlockingQueue; true; take; (); ; Argument[this].Element; ReturnValue; value; manual |
-| 17 | Summary: java.util.concurrent; ConcurrentHashMap; true; elements; (); ; Argument[this].MapValue; ReturnValue.Element; value; manual |
-| 18 | Summary: java.util.concurrent; TransferQueue; true; transfer; (Object); ; Argument[0]; Argument[this].Element; value; manual |
-| 19 | Summary: java.util.concurrent; TransferQueue; true; tryTransfer; (Object); ; Argument[0]; Argument[this].Element; value; manual |
-| 20 | Summary: java.util.concurrent; TransferQueue; true; tryTransfer; (Object,long,TimeUnit); ; Argument[0]; Argument[this].Element; value; manual |
-| 21 | Summary: java.util; AbstractMap$SimpleEntry; false; SimpleEntry; (Map$Entry); ; Argument[0].MapKey; Argument[this].MapKey; value; manual |
-| 22 | Summary: java.util; AbstractMap$SimpleEntry; false; SimpleEntry; (Map$Entry); ; Argument[0].MapValue; Argument[this].MapValue; value; manual |
-| 23 | Summary: java.util; AbstractMap$SimpleEntry; false; SimpleEntry; (Object,Object); ; Argument[0]; Argument[this].MapKey; value; manual |
-| 24 | Summary: java.util; AbstractMap$SimpleEntry; false; SimpleEntry; (Object,Object); ; Argument[1]; Argument[this].MapValue; value; manual |
-| 25 | Summary: java.util; AbstractMap$SimpleImmutableEntry; false; SimpleImmutableEntry; (Map$Entry); ; Argument[0].MapKey; Argument[this].MapKey; value; manual |
-| 26 | Summary: java.util; AbstractMap$SimpleImmutableEntry; false; SimpleImmutableEntry; (Map$Entry); ; Argument[0].MapValue; Argument[this].MapValue; value; manual |
-| 27 | Summary: java.util; ArrayDeque; false; ArrayDeque; (Collection); ; Argument[0].Element; Argument[this].Element; value; manual |
-| 28 | Summary: java.util; ArrayList; false; ArrayList; (Collection); ; Argument[0].Element; Argument[this].Element; value; manual |
-| 29 | Summary: java.util; Arrays; false; asList; ; ; Argument[0].ArrayElement; ReturnValue.Element; value; manual |
-| 30 | Summary: java.util; Arrays; false; copyOf; ; ; Argument[0].ArrayElement; ReturnValue.ArrayElement; value; manual |
-| 31 | Summary: java.util; Arrays; false; copyOfRange; ; ; Argument[0].ArrayElement; ReturnValue.ArrayElement; value; manual |
-| 32 | Summary: java.util; Arrays; false; fill; (Object[],Object); ; Argument[1]; Argument[0].ArrayElement; value; manual |
-| 33 | Summary: java.util; Arrays; false; fill; (Object[],int,int,Object); ; Argument[3]; Argument[0].ArrayElement; value; manual |
-| 34 | Summary: java.util; Arrays; false; fill; (boolean[],boolean); ; Argument[1]; Argument[0].ArrayElement; value; manual |
-| 35 | Summary: java.util; Arrays; false; fill; (boolean[],int,int,boolean); ; Argument[3]; Argument[0].ArrayElement; value; manual |
-| 36 | Summary: java.util; Arrays; false; fill; (byte[],byte); ; Argument[1]; Argument[0].ArrayElement; value; manual |
-| 37 | Summary: java.util; Arrays; false; fill; (byte[],int,int,byte); ; Argument[3]; Argument[0].ArrayElement; value; manual |
-| 38 | Summary: java.util; Arrays; false; fill; (char[],char); ; Argument[1]; Argument[0].ArrayElement; value; manual |
-| 39 | Summary: java.util; Arrays; false; fill; (char[],int,int,char); ; Argument[3]; Argument[0].ArrayElement; value; manual |
-| 40 | Summary: java.util; Arrays; false; fill; (double[],double); ; Argument[1]; Argument[0].ArrayElement; value; manual |
-| 41 | Summary: java.util; Arrays; false; fill; (double[],int,int,double); ; Argument[3]; Argument[0].ArrayElement; value; manual |
-| 42 | Summary: java.util; Arrays; false; fill; (float[],float); ; Argument[1]; Argument[0].ArrayElement; value; manual |
-| 43 | Summary: java.util; Arrays; false; fill; (float[],int,int,float); ; Argument[3]; Argument[0].ArrayElement; value; manual |
-| 44 | Summary: java.util; Arrays; false; fill; (int[],int); ; Argument[1]; Argument[0].ArrayElement; value; manual |
-| 45 | Summary: java.util; Arrays; false; fill; (int[],int,int,int); ; Argument[3]; Argument[0].ArrayElement; value; manual |
-| 46 | Summary: java.util; Arrays; false; fill; (long[],int,int,long); ; Argument[3]; Argument[0].ArrayElement; value; manual |
-| 47 | Summary: java.util; Arrays; false; fill; (long[],long); ; Argument[1]; Argument[0].ArrayElement; value; manual |
-| 48 | Summary: java.util; Arrays; false; fill; (short[],int,int,short); ; Argument[3]; Argument[0].ArrayElement; value; manual |
-| 49 | Summary: java.util; Arrays; false; fill; (short[],short); ; Argument[1]; Argument[0].ArrayElement; value; manual |
-| 50 | Summary: java.util; Arrays; false; spliterator; ; ; Argument[0].ArrayElement; ReturnValue.Element; value; manual |
-| 51 | Summary: java.util; Arrays; false; stream; ; ; Argument[0].ArrayElement; ReturnValue.Element; value; manual |
-| 52 | Summary: java.util; Collection; true; add; ; ; Argument[0]; Argument[this].Element; value; manual |
-| 53 | Summary: java.util; Collection; true; addAll; ; ; Argument[0].Element; Argument[this].Element; value; manual |
-| 54 | Summary: java.util; Collection; true; parallelStream; (); ; Argument[this].Element; ReturnValue.Element; value; manual |
-| 55 | Summary: java.util; Collection; true; stream; (); ; Argument[this].Element; ReturnValue.Element; value; manual |
-| 56 | Summary: java.util; Collection; true; toArray; ; ; Argument[this].Element; Argument[0].ArrayElement; value; manual |
-| 57 | Summary: java.util; Collection; true; toArray; ; ; Argument[this].Element; ReturnValue.ArrayElement; value; manual |
-| 58 | Summary: java.util; Collections; false; addAll; (Collection,Object[]); ; Argument[1].ArrayElement; Argument[0].Element; value; manual |
-| 59 | Summary: java.util; Collections; false; checkedCollection; (Collection,Class); ; Argument[0].Element; ReturnValue.Element; value; manual |
-| 60 | Summary: java.util; Collections; false; checkedList; (List,Class); ; Argument[0].Element; ReturnValue.Element; value; manual |
-| 61 | Summary: java.util; Collections; false; checkedMap; (Map,Class,Class); ; Argument[0].MapKey; ReturnValue.MapKey; value; manual |
-| 62 | Summary: java.util; Collections; false; checkedMap; (Map,Class,Class); ; Argument[0].MapValue; ReturnValue.MapValue; value; manual |
-| 63 | Summary: java.util; Collections; false; checkedNavigableMap; (NavigableMap,Class,Class); ; Argument[0].MapKey; ReturnValue.MapKey; value; manual |
-| 64 | Summary: java.util; Collections; false; checkedNavigableMap; (NavigableMap,Class,Class); ; Argument[0].MapValue; ReturnValue.MapValue; value; manual |
-| 65 | Summary: java.util; Collections; false; checkedNavigableSet; (NavigableSet,Class); ; Argument[0].Element; ReturnValue.Element; value; manual |
-| 66 | Summary: java.util; Collections; false; checkedSet; (Set,Class); ; Argument[0].Element; ReturnValue.Element; value; manual |
-| 67 | Summary: java.util; Collections; false; checkedSortedMap; (SortedMap,Class,Class); ; Argument[0].MapKey; ReturnValue.MapKey; value; manual |
-| 68 | Summary: java.util; Collections; false; checkedSortedMap; (SortedMap,Class,Class); ; Argument[0].MapValue; ReturnValue.MapValue; value; manual |
-| 69 | Summary: java.util; Collections; false; checkedSortedSet; (SortedSet,Class); ; Argument[0].Element; ReturnValue.Element; value; manual |
-| 70 | Summary: java.util; Collections; false; copy; (List,List); ; Argument[1].Element; Argument[0].Element; value; manual |
-| 71 | Summary: java.util; Collections; false; enumeration; (Collection); ; Argument[0].Element; ReturnValue.Element; value; manual |
-| 72 | Summary: java.util; Collections; false; fill; (List,Object); ; Argument[1]; Argument[0].Element; value; manual |
-| 73 | Summary: java.util; Collections; false; list; (Enumeration); ; Argument[0].Element; ReturnValue.Element; value; manual |
-| 74 | Summary: java.util; Collections; false; max; ; ; Argument[0].Element; ReturnValue; value; manual |
-| 75 | Summary: java.util; Collections; false; min; ; ; Argument[0].Element; ReturnValue; value; manual |
-| 76 | Summary: java.util; Collections; false; nCopies; (int,Object); ; Argument[1]; ReturnValue.Element; value; manual |
-| 77 | Summary: java.util; Collections; false; replaceAll; (List,Object,Object); ; Argument[2]; Argument[0].Element; value; manual |
-| 78 | Summary: java.util; Collections; false; singleton; (Object); ; Argument[0]; ReturnValue.Element; value; manual |
-| 79 | Summary: java.util; Collections; false; singletonList; (Object); ; Argument[0]; ReturnValue.Element; value; manual |
-| 80 | Summary: java.util; Collections; false; singletonMap; (Object,Object); ; Argument[0]; ReturnValue.MapKey; value; manual |
-| 81 | Summary: java.util; Collections; false; singletonMap; (Object,Object); ; Argument[1]; ReturnValue.MapValue; value; manual |
-| 82 | Summary: java.util; Collections; false; synchronizedCollection; (Collection); ; Argument[0].Element; ReturnValue.Element; value; manual |
-| 83 | Summary: java.util; Collections; false; synchronizedList; (List); ; Argument[0].Element; ReturnValue.Element; value; manual |
-| 84 | Summary: java.util; Collections; false; synchronizedMap; (Map); ; Argument[0].MapKey; ReturnValue.MapKey; value; manual |
-| 85 | Summary: java.util; Collections; false; synchronizedMap; (Map); ; Argument[0].MapValue; ReturnValue.MapValue; value; manual |
-| 86 | Summary: java.util; Collections; false; synchronizedNavigableMap; (NavigableMap); ; Argument[0].MapKey; ReturnValue.MapKey; value; manual |
-| 87 | Summary: java.util; Collections; false; synchronizedNavigableMap; (NavigableMap); ; Argument[0].MapValue; ReturnValue.MapValue; value; manual |
-| 88 | Summary: java.util; Collections; false; synchronizedNavigableSet; (NavigableSet); ; Argument[0].Element; ReturnValue.Element; value; manual |
-| 89 | Summary: java.util; Collections; false; synchronizedSet; (Set); ; Argument[0].Element; ReturnValue.Element; value; manual |
-| 90 | Summary: java.util; Collections; false; synchronizedSortedMap; (SortedMap); ; Argument[0].MapKey; ReturnValue.MapKey; value; manual |
-| 91 | Summary: java.util; Collections; false; synchronizedSortedMap; (SortedMap); ; Argument[0].MapValue; ReturnValue.MapValue; value; manual |
-| 92 | Summary: java.util; Collections; false; synchronizedSortedSet; (SortedSet); ; Argument[0].Element; ReturnValue.Element; value; manual |
-| 93 | Summary: java.util; Collections; false; unmodifiableCollection; (Collection); ; Argument[0].Element; ReturnValue.Element; value; manual |
-| 94 | Summary: java.util; Collections; false; unmodifiableList; (List); ; Argument[0].Element; ReturnValue.Element; value; manual |
-| 95 | Summary: java.util; Collections; false; unmodifiableMap; (Map); ; Argument[0].MapKey; ReturnValue.MapKey; value; manual |
-| 96 | Summary: java.util; Collections; false; unmodifiableMap; (Map); ; Argument[0].MapValue; ReturnValue.MapValue; value; manual |
-| 97 | Summary: java.util; Collections; false; unmodifiableNavigableMap; (NavigableMap); ; Argument[0].MapKey; ReturnValue.MapKey; value; manual |
-| 98 | Summary: java.util; Collections; false; unmodifiableNavigableMap; (NavigableMap); ; Argument[0].MapValue; ReturnValue.MapValue; value; manual |
-| 99 | Summary: java.util; Collections; false; unmodifiableNavigableSet; (NavigableSet); ; Argument[0].Element; ReturnValue.Element; value; manual |
-| 100 | Summary: java.util; Collections; false; unmodifiableSequencedCollection; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
-| 101 | Summary: java.util; Collections; false; unmodifiableSequencedMap; ; ; Argument[0].MapKey; ReturnValue.MapKey; value; manual |
-| 102 | Summary: java.util; Collections; false; unmodifiableSequencedMap; ; ; Argument[0].MapValue; ReturnValue.MapValue; value; manual |
-| 103 | Summary: java.util; Collections; false; unmodifiableSequencedSet; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
-| 104 | Summary: java.util; Collections; false; unmodifiableSet; (Set); ; Argument[0].Element; ReturnValue.Element; value; manual |
-| 105 | Summary: java.util; Collections; false; unmodifiableSortedMap; (SortedMap); ; Argument[0].MapKey; ReturnValue.MapKey; value; manual |
-| 106 | Summary: java.util; Collections; false; unmodifiableSortedMap; (SortedMap); ; Argument[0].MapValue; ReturnValue.MapValue; value; manual |
-| 107 | Summary: java.util; Collections; false; unmodifiableSortedSet; (SortedSet); ; Argument[0].Element; ReturnValue.Element; value; manual |
-| 108 | Summary: java.util; Deque; true; addFirst; (Object); ; Argument[0]; Argument[this].Element; value; manual |
-| 109 | Summary: java.util; Deque; true; addLast; (Object); ; Argument[0]; Argument[this].Element; value; manual |
-| 110 | Summary: java.util; Deque; true; descendingIterator; (); ; Argument[this].Element; ReturnValue.Element; value; manual |
-| 111 | Summary: java.util; Deque; true; getFirst; (); ; Argument[this].Element; ReturnValue; value; manual |
-| 112 | Summary: java.util; Deque; true; getLast; (); ; Argument[this].Element; ReturnValue; value; manual |
-| 113 | Summary: java.util; Deque; true; offerFirst; (Object); ; Argument[0]; Argument[this].Element; value; manual |
-| 114 | Summary: java.util; Deque; true; offerLast; (Object); ; Argument[0]; Argument[this].Element; value; manual |
-| 115 | Summary: java.util; Deque; true; peekFirst; (); ; Argument[this].Element; ReturnValue; value; manual |
-| 116 | Summary: java.util; Deque; true; peekLast; (); ; Argument[this].Element; ReturnValue; value; manual |
-| 117 | Summary: java.util; Deque; true; pollFirst; (); ; Argument[this].Element; ReturnValue; value; manual |
-| 118 | Summary: java.util; Deque; true; pollLast; (); ; Argument[this].Element; ReturnValue; value; manual |
-| 119 | Summary: java.util; Deque; true; pop; (); ; Argument[this].Element; ReturnValue; value; manual |
-| 120 | Summary: java.util; Deque; true; push; (Object); ; Argument[0]; Argument[this].Element; value; manual |
-| 121 | Summary: java.util; Deque; true; removeFirst; (); ; Argument[this].Element; ReturnValue; value; manual |
-| 122 | Summary: java.util; Deque; true; removeLast; (); ; Argument[this].Element; ReturnValue; value; manual |
-| 123 | Summary: java.util; Dictionary; true; elements; (); ; Argument[this].MapValue; ReturnValue.Element; value; manual |
-| 124 | Summary: java.util; Dictionary; true; get; (Object); ; Argument[this].MapValue; ReturnValue; value; manual |
-| 125 | Summary: java.util; Dictionary; true; keys; (); ; Argument[this].MapKey; ReturnValue.Element; value; manual |
-| 126 | Summary: java.util; Dictionary; true; put; (Object,Object); ; Argument[this].MapValue; ReturnValue; value; manual |
-| 127 | Summary: java.util; Dictionary; true; put; (Object,Object); ; Argument[0]; Argument[this].MapKey; value; manual |
-| 128 | Summary: java.util; Dictionary; true; put; (Object,Object); ; Argument[1]; Argument[this].MapValue; value; manual |
-| 129 | Summary: java.util; Dictionary; true; remove; (Object); ; Argument[this].MapValue; ReturnValue; value; manual |
-| 130 | Summary: java.util; EnumMap; false; EnumMap; (EnumMap); ; Argument[0].MapKey; Argument[this].MapKey; value; manual |
-| 131 | Summary: java.util; EnumMap; false; EnumMap; (EnumMap); ; Argument[0].MapValue; Argument[this].MapValue; value; manual |
-| 132 | Summary: java.util; EnumMap; false; EnumMap; (Map); ; Argument[0].MapKey; Argument[this].MapKey; value; manual |
-| 133 | Summary: java.util; EnumMap; false; EnumMap; (Map); ; Argument[0].MapValue; Argument[this].MapValue; value; manual |
-| 134 | Summary: java.util; Enumeration; true; asIterator; ; ; Argument[this].Element; ReturnValue.Element; value; manual |
-| 135 | Summary: java.util; Enumeration; true; nextElement; ; ; Argument[this].Element; ReturnValue; value; manual |
-| 136 | Summary: java.util; HashMap; false; HashMap; (Map); ; Argument[0].MapKey; Argument[this].MapKey; value; manual |
-| 137 | Summary: java.util; HashMap; false; HashMap; (Map); ; Argument[0].MapValue; Argument[this].MapValue; value; manual |
-| 138 | Summary: java.util; HashSet; false; HashSet; (Collection); ; Argument[0].Element; Argument[this].Element; value; manual |
-| 139 | Summary: java.util; Hashtable; false; Hashtable; (Map); ; Argument[0].MapKey; Argument[this].MapKey; value; manual |
-| 140 | Summary: java.util; Hashtable; false; Hashtable; (Map); ; Argument[0].MapValue; Argument[this].MapValue; value; manual |
-| 141 | Summary: java.util; IdentityHashMap; false; IdentityHashMap; (Map); ; Argument[0].MapKey; Argument[this].MapKey; value; manual |
-| 142 | Summary: java.util; IdentityHashMap; false; IdentityHashMap; (Map); ; Argument[0].MapValue; Argument[this].MapValue; value; manual |
-| 143 | Summary: java.util; Iterator; true; next; ; ; Argument[this].Element; ReturnValue; value; manual |
-| 144 | Summary: java.util; LinkedHashMap; false; LinkedHashMap; (Map); ; Argument[0].MapKey; Argument[this].MapKey; value; manual |
-| 145 | Summary: java.util; LinkedHashMap; false; LinkedHashMap; (Map); ; Argument[0].MapValue; Argument[this].MapValue; value; manual |
-| 146 | Summary: java.util; LinkedHashSet; false; LinkedHashSet; (Collection); ; Argument[0].Element; Argument[this].Element; value; manual |
-| 147 | Summary: java.util; LinkedList; false; LinkedList; (Collection); ; Argument[0].Element; Argument[this].Element; value; manual |
-| 148 | Summary: java.util; List; true; add; (int,Object); ; Argument[1]; Argument[this].Element; value; manual |
-| 149 | Summary: java.util; List; true; addAll; (int,Collection); ; Argument[1].WithElement; Argument[this]; value; manual |
-| 150 | Summary: java.util; List; true; clear; (); ; Argument[this].WithoutElement; Argument[this]; value; manual |
-| 151 | Summary: java.util; List; false; copyOf; (Collection); ; Argument[0].Element; ReturnValue.Element; value; manual |
-| 152 | Summary: java.util; List; true; get; (int); ; Argument[this].Element; ReturnValue; value; manual |
-| 153 | Summary: java.util; List; true; listIterator; ; ; Argument[this].Element; ReturnValue.Element; value; manual |
-| 154 | Summary: java.util; List; false; of; (Object); ; Argument[0]; ReturnValue.Element; value; manual |
-| 155 | Summary: java.util; List; false; of; (Object,Object); ; Argument[0..1]; ReturnValue.Element; value; manual |
-| 156 | Summary: java.util; List; false; of; (Object,Object,Object); ; Argument[0..2]; ReturnValue.Element; value; manual |
-| 157 | Summary: java.util; List; false; of; (Object,Object,Object,Object); ; Argument[0..3]; ReturnValue.Element; value; manual |
-| 158 | Summary: java.util; List; false; of; (Object,Object,Object,Object,Object); ; Argument[0..4]; ReturnValue.Element; value; manual |
-| 159 | Summary: java.util; List; false; of; (Object,Object,Object,Object,Object,Object); ; Argument[0..5]; ReturnValue.Element; value; manual |
-| 160 | Summary: java.util; List; false; of; (Object,Object,Object,Object,Object,Object,Object); ; Argument[0..6]; ReturnValue.Element; value; manual |
-| 161 | Summary: java.util; List; false; of; (Object,Object,Object,Object,Object,Object,Object,Object); ; Argument[0..7]; ReturnValue.Element; value; manual |
-| 162 | Summary: java.util; List; false; of; (Object,Object,Object,Object,Object,Object,Object,Object,Object); ; Argument[0..8]; ReturnValue.Element; value; manual |
-| 163 | Summary: java.util; List; false; of; (Object,Object,Object,Object,Object,Object,Object,Object,Object,Object); ; Argument[0..9]; ReturnValue.Element; value; manual |
-| 164 | Summary: java.util; List; false; of; (Object[]); ; Argument[0].ArrayElement; ReturnValue.Element; value; manual |
-| 165 | Summary: java.util; List; true; remove; (int); ; Argument[this].Element; ReturnValue; value; manual |
-| 166 | Summary: java.util; List; true; set; (int,Object); ; Argument[this].Element; ReturnValue; value; manual |
-| 167 | Summary: java.util; List; true; set; (int,Object); ; Argument[1]; Argument[this].Element; value; manual |
-| 168 | Summary: java.util; List; true; subList; ; ; Argument[this].Element; ReturnValue.Element; value; manual |
-| 169 | Summary: java.util; ListIterator; true; add; (Object); ; Argument[0]; Argument[this].Element; value; manual |
-| 170 | Summary: java.util; ListIterator; true; previous; ; ; Argument[this].Element; ReturnValue; value; manual |
-| 171 | Summary: java.util; ListIterator; true; set; (Object); ; Argument[0]; Argument[this].Element; value; manual |
-| 172 | Summary: java.util; Map; true; computeIfAbsent; ; ; Argument[this].MapValue; ReturnValue; value; manual |
-| 173 | Summary: java.util; Map; true; computeIfAbsent; ; ; Argument[1].ReturnValue; Argument[this].MapValue; value; manual |
-| 174 | Summary: java.util; Map; true; computeIfAbsent; ; ; Argument[1].ReturnValue; ReturnValue; value; manual |
-| 175 | Summary: java.util; Map; false; copyOf; (Map); ; Argument[0].MapKey; ReturnValue.MapKey; value; manual |
-| 176 | Summary: java.util; Map; false; copyOf; (Map); ; Argument[0].MapValue; ReturnValue.MapValue; value; manual |
-| 177 | Summary: java.util; Map; false; entry; (Object,Object); ; Argument[0]; ReturnValue.MapKey; value; manual |
-| 178 | Summary: java.util; Map; false; entry; (Object,Object); ; Argument[1]; ReturnValue.MapValue; value; manual |
-| 179 | Summary: java.util; Map; true; entrySet; ; ; Argument[this].MapKey; ReturnValue.Element.MapKey; value; manual |
-| 180 | Summary: java.util; Map; true; entrySet; ; ; Argument[this].MapValue; ReturnValue.Element.MapValue; value; manual |
-| 181 | Summary: java.util; Map; true; get; ; ; Argument[this].MapValue; ReturnValue; value; manual |
-| 182 | Summary: java.util; Map; true; getOrDefault; ; ; Argument[this].MapValue; ReturnValue; value; manual |
-| 183 | Summary: java.util; Map; true; getOrDefault; ; ; Argument[1]; ReturnValue; value; manual |
-| 184 | Summary: java.util; Map; true; keySet; (); ; Argument[this].MapKey; ReturnValue.Element; value; manual |
-| 185 | Summary: java.util; Map; true; merge; (Object,Object,BiFunction); ; Argument[1]; Argument[this].MapValue; value; manual |
-| 186 | Summary: java.util; Map; false; of; ; ; Argument[0]; ReturnValue.MapKey; value; manual |
-| 187 | Summary: java.util; Map; false; of; ; ; Argument[10]; ReturnValue.MapKey; value; manual |
-| 188 | Summary: java.util; Map; false; of; ; ; Argument[11]; ReturnValue.MapValue; value; manual |
-| 189 | Summary: java.util; Map; false; of; ; ; Argument[12]; ReturnValue.MapKey; value; manual |
-| 190 | Summary: java.util; Map; false; of; ; ; Argument[13]; ReturnValue.MapValue; value; manual |
-| 191 | Summary: java.util; Map; false; of; ; ; Argument[14]; ReturnValue.MapKey; value; manual |
-| 192 | Summary: java.util; Map; false; of; ; ; Argument[15]; ReturnValue.MapValue; value; manual |
-| 193 | Summary: java.util; Map; false; of; ; ; Argument[16]; ReturnValue.MapKey; value; manual |
-| 194 | Summary: java.util; Map; false; of; ; ; Argument[17]; ReturnValue.MapValue; value; manual |
-| 195 | Summary: java.util; Map; false; of; ; ; Argument[18]; ReturnValue.MapKey; value; manual |
-| 196 | Summary: java.util; Map; false; of; ; ; Argument[19]; ReturnValue.MapValue; value; manual |
-| 197 | Summary: java.util; Map; false; of; ; ; Argument[1]; ReturnValue.MapValue; value; manual |
-| 198 | Summary: java.util; Map; false; of; ; ; Argument[2]; ReturnValue.MapKey; value; manual |
-| 199 | Summary: java.util; Map; false; of; ; ; Argument[3]; ReturnValue.MapValue; value; manual |
-| 200 | Summary: java.util; Map; false; of; ; ; Argument[4]; ReturnValue.MapKey; value; manual |
-| 201 | Summary: java.util; Map; false; of; ; ; Argument[5]; ReturnValue.MapValue; value; manual |
-| 202 | Summary: java.util; Map; false; of; ; ; Argument[6]; ReturnValue.MapKey; value; manual |
-| 203 | Summary: java.util; Map; false; of; ; ; Argument[7]; ReturnValue.MapValue; value; manual |
-| 204 | Summary: java.util; Map; false; of; ; ; Argument[8]; ReturnValue.MapKey; value; manual |
-| 205 | Summary: java.util; Map; false; of; ; ; Argument[9]; ReturnValue.MapValue; value; manual |
-| 206 | Summary: java.util; Map; false; ofEntries; ; ; Argument[0].ArrayElement.MapKey; ReturnValue.MapKey; value; manual |
-| 207 | Summary: java.util; Map; false; ofEntries; ; ; Argument[0].ArrayElement.MapValue; ReturnValue.MapValue; value; manual |
-| 208 | Summary: java.util; Map; true; put; (Object,Object); ; Argument[this].MapValue; ReturnValue; value; manual |
-| 209 | Summary: java.util; Map; true; put; (Object,Object); ; Argument[0]; Argument[this].MapKey; value; manual |
-| 210 | Summary: java.util; Map; true; put; (Object,Object); ; Argument[1]; Argument[this].MapValue; value; manual |
-| 211 | Summary: java.util; Map; true; putAll; (Map); ; Argument[0].MapKey; Argument[this].MapKey; value; manual |
-| 212 | Summary: java.util; Map; true; putAll; (Map); ; Argument[0].MapValue; Argument[this].MapValue; value; manual |
-| 213 | Summary: java.util; Map; true; putIfAbsent; ; ; Argument[this].MapValue; ReturnValue; value; manual |
-| 214 | Summary: java.util; Map; true; putIfAbsent; ; ; Argument[0]; Argument[this].MapKey; value; manual |
-| 215 | Summary: java.util; Map; true; putIfAbsent; ; ; Argument[1]; Argument[this].MapValue; value; manual |
-| 216 | Summary: java.util; Map; true; remove; (Object); ; Argument[this].MapValue; ReturnValue; value; manual |
-| 217 | Summary: java.util; Map; true; replace; (Object,Object); ; Argument[this].MapValue; ReturnValue; value; manual |
-| 218 | Summary: java.util; Map; true; replace; (Object,Object); ; Argument[0]; Argument[this].MapKey; value; manual |
-| 219 | Summary: java.util; Map; true; replace; (Object,Object); ; Argument[1]; Argument[this].MapValue; value; manual |
-| 220 | Summary: java.util; Map; true; replace; (Object,Object,Object); ; Argument[0]; Argument[this].MapKey; value; manual |
-| 221 | Summary: java.util; Map; true; replace; (Object,Object,Object); ; Argument[2]; Argument[this].MapValue; value; manual |
-| 222 | Summary: java.util; Map; true; values; (); ; Argument[this].MapValue; ReturnValue.Element; value; manual |
-| 223 | Summary: java.util; Map$Entry; true; getKey; ; ; Argument[this].MapKey; ReturnValue; value; manual |
-| 224 | Summary: java.util; Map$Entry; true; getValue; ; ; Argument[this].MapValue; ReturnValue; value; manual |
-| 225 | Summary: java.util; Map$Entry; true; setValue; ; ; Argument[this].MapValue; ReturnValue; value; manual |
-| 226 | Summary: java.util; Map$Entry; true; setValue; ; ; Argument[0]; Argument[this].MapValue; value; manual |
-| 227 | Summary: java.util; NavigableMap; true; ceilingEntry; (Object); ; Argument[this].MapKey; ReturnValue.MapKey; value; manual |
-| 228 | Summary: java.util; NavigableMap; true; ceilingEntry; (Object); ; Argument[this].MapValue; ReturnValue.MapValue; value; manual |
-| 229 | Summary: java.util; NavigableMap; true; descendingMap; (); ; Argument[this].MapKey; ReturnValue.MapKey; value; manual |
-| 230 | Summary: java.util; NavigableMap; true; descendingMap; (); ; Argument[this].MapValue; ReturnValue.MapValue; value; manual |
-| 231 | Summary: java.util; NavigableMap; true; firstEntry; (); ; Argument[this].MapKey; ReturnValue.MapKey; value; manual |
-| 232 | Summary: java.util; NavigableMap; true; firstEntry; (); ; Argument[this].MapValue; ReturnValue.MapValue; value; manual |
-| 233 | Summary: java.util; NavigableMap; true; floorEntry; (Object); ; Argument[this].MapKey; ReturnValue.MapKey; value; manual |
-| 234 | Summary: java.util; NavigableMap; true; floorEntry; (Object); ; Argument[this].MapValue; ReturnValue.MapValue; value; manual |
-| 235 | Summary: java.util; NavigableMap; true; headMap; (Object,boolean); ; Argument[this].MapKey; ReturnValue.MapKey; value; manual |
-| 236 | Summary: java.util; NavigableMap; true; headMap; (Object,boolean); ; Argument[this].MapValue; ReturnValue.MapValue; value; manual |
-| 237 | Summary: java.util; NavigableMap; true; higherEntry; (Object); ; Argument[this].MapKey; ReturnValue.MapKey; value; manual |
-| 238 | Summary: java.util; NavigableMap; true; higherEntry; (Object); ; Argument[this].MapValue; ReturnValue.MapValue; value; manual |
-| 239 | Summary: java.util; NavigableMap; true; lastEntry; (); ; Argument[this].MapKey; ReturnValue.MapKey; value; manual |
-| 240 | Summary: java.util; NavigableMap; true; lastEntry; (); ; Argument[this].MapValue; ReturnValue.MapValue; value; manual |
-| 241 | Summary: java.util; NavigableMap; true; lowerEntry; (Object); ; Argument[this].MapKey; ReturnValue.MapKey; value; manual |
-| 242 | Summary: java.util; NavigableMap; true; lowerEntry; (Object); ; Argument[this].MapValue; ReturnValue.MapValue; value; manual |
-| 243 | Summary: java.util; NavigableMap; true; pollFirstEntry; (); ; Argument[this].MapKey; ReturnValue.MapKey; value; manual |
-| 244 | Summary: java.util; NavigableMap; true; pollFirstEntry; (); ; Argument[this].MapValue; ReturnValue.MapValue; value; manual |
-| 245 | Summary: java.util; NavigableMap; true; pollLastEntry; (); ; Argument[this].MapKey; ReturnValue.MapKey; value; manual |
-| 246 | Summary: java.util; NavigableMap; true; pollLastEntry; (); ; Argument[this].MapValue; ReturnValue.MapValue; value; manual |
-| 247 | Summary: java.util; NavigableMap; true; subMap; (Object,boolean,Object,boolean); ; Argument[this].MapKey; ReturnValue.MapKey; value; manual |
-| 248 | Summary: java.util; NavigableMap; true; subMap; (Object,boolean,Object,boolean); ; Argument[this].MapValue; ReturnValue.MapValue; value; manual |
-| 249 | Summary: java.util; NavigableMap; true; tailMap; (Object,boolean); ; Argument[this].MapKey; ReturnValue.MapKey; value; manual |
-| 250 | Summary: java.util; NavigableMap; true; tailMap; (Object,boolean); ; Argument[this].MapValue; ReturnValue.MapValue; value; manual |
-| 251 | Summary: java.util; NavigableSet; true; ceiling; (Object); ; Argument[this].Element; ReturnValue; value; manual |
-| 252 | Summary: java.util; NavigableSet; true; descendingIterator; (); ; Argument[this].Element; ReturnValue.Element; value; manual |
-| 253 | Summary: java.util; NavigableSet; true; descendingSet; (); ; Argument[this].Element; ReturnValue.Element; value; manual |
-| 254 | Summary: java.util; NavigableSet; true; floor; (Object); ; Argument[this].Element; ReturnValue; value; manual |
-| 255 | Summary: java.util; NavigableSet; true; headSet; (Object,boolean); ; Argument[this].Element; ReturnValue.Element; value; manual |
-| 256 | Summary: java.util; NavigableSet; true; higher; (Object); ; Argument[this].Element; ReturnValue; value; manual |
-| 257 | Summary: java.util; NavigableSet; true; lower; (Object); ; Argument[this].Element; ReturnValue; value; manual |
-| 258 | Summary: java.util; NavigableSet; true; pollFirst; (); ; Argument[this].Element; ReturnValue; value; manual |
-| 259 | Summary: java.util; NavigableSet; true; pollLast; (); ; Argument[this].Element; ReturnValue; value; manual |
-| 260 | Summary: java.util; NavigableSet; true; subSet; (Object,boolean,Object,boolean); ; Argument[this].Element; ReturnValue.Element; value; manual |
-| 261 | Summary: java.util; NavigableSet; true; tailSet; (Object,boolean); ; Argument[this].Element; ReturnValue.Element; value; manual |
-| 262 | Summary: java.util; PriorityQueue; false; PriorityQueue; (Collection); ; Argument[0].Element; Argument[this].Element; value; manual |
-| 263 | Summary: java.util; PriorityQueue; false; PriorityQueue; (PriorityQueue); ; Argument[0].Element; Argument[this].Element; value; manual |
-| 264 | Summary: java.util; PriorityQueue; false; PriorityQueue; (SortedSet); ; Argument[0].Element; Argument[this].Element; value; manual |
-| 265 | Summary: java.util; Queue; true; element; (); ; Argument[this].Element; ReturnValue; value; manual |
-| 266 | Summary: java.util; Queue; true; offer; (Object); ; Argument[0]; Argument[this].Element; value; manual |
-| 267 | Summary: java.util; Queue; true; peek; (); ; Argument[this].Element; ReturnValue; value; manual |
-| 268 | Summary: java.util; Queue; true; poll; (); ; Argument[this].Element; ReturnValue; value; manual |
-| 269 | Summary: java.util; Queue; true; remove; (); ; Argument[this].Element; ReturnValue; value; manual |
-| 270 | Summary: java.util; SequencedCollection; true; addFirst; ; ; Argument[0]; Argument[this].Element; value; manual |
-| 271 | Summary: java.util; SequencedCollection; true; addLast; ; ; Argument[0]; Argument[this].Element; value; manual |
-| 272 | Summary: java.util; SequencedCollection; true; getFirst; ; ; Argument[this].Element; ReturnValue; value; manual |
-| 273 | Summary: java.util; SequencedCollection; true; getLast; ; ; Argument[this].Element; ReturnValue; value; manual |
-| 274 | Summary: java.util; SequencedCollection; true; removeFirst; ; ; Argument[this].Element; ReturnValue; value; manual |
-| 275 | Summary: java.util; SequencedCollection; true; removeLast; ; ; Argument[this].Element; ReturnValue; value; manual |
-| 276 | Summary: java.util; SequencedCollection; true; reversed; ; ; Argument[this].Element; ReturnValue.Element; value; manual |
-| 277 | Summary: java.util; SequencedMap; true; firstEntry; ; ; Argument[this].MapKey; ReturnValue.MapKey; value; manual |
-| 278 | Summary: java.util; SequencedMap; true; firstEntry; ; ; Argument[this].MapValue; ReturnValue.MapValue; value; manual |
-| 279 | Summary: java.util; SequencedMap; true; lastEntry; ; ; Argument[this].MapKey; ReturnValue.MapKey; value; manual |
-| 280 | Summary: java.util; SequencedMap; true; lastEntry; ; ; Argument[this].MapValue; ReturnValue.MapValue; value; manual |
-| 281 | Summary: java.util; SequencedMap; true; pollFirstEntry; ; ; Argument[this].MapKey; ReturnValue.MapKey; value; manual |
-| 282 | Summary: java.util; SequencedMap; true; pollFirstEntry; ; ; Argument[this].MapValue; ReturnValue.MapValue; value; manual |
-| 283 | Summary: java.util; SequencedMap; true; pollLastEntry; ; ; Argument[this].MapKey; ReturnValue.MapKey; value; manual |
-| 284 | Summary: java.util; SequencedMap; true; pollLastEntry; ; ; Argument[this].MapValue; ReturnValue.MapValue; value; manual |
-| 285 | Summary: java.util; SequencedMap; true; putFirst; ; ; Argument[this].MapValue; ReturnValue; value; manual |
-| 286 | Summary: java.util; SequencedMap; true; putFirst; ; ; Argument[0]; Argument[this].MapKey; value; manual |
-| 287 | Summary: java.util; SequencedMap; true; putFirst; ; ; Argument[1]; Argument[this].MapValue; value; manual |
-| 288 | Summary: java.util; SequencedMap; true; putLast; ; ; Argument[this].MapValue; ReturnValue; value; manual |
-| 289 | Summary: java.util; SequencedMap; true; putLast; ; ; Argument[0]; Argument[this].MapKey; value; manual |
-| 290 | Summary: java.util; SequencedMap; true; putLast; ; ; Argument[1]; Argument[this].MapValue; value; manual |
-| 291 | Summary: java.util; SequencedMap; true; reversed; ; ; Argument[this].MapKey; ReturnValue.MapKey; value; manual |
-| 292 | Summary: java.util; SequencedMap; true; reversed; ; ; Argument[this].MapValue; ReturnValue.MapValue; value; manual |
-| 293 | Summary: java.util; SequencedMap; true; sequencedEntrySet; ; ; Argument[this].MapKey; ReturnValue.Element.MapKey; value; manual |
-| 294 | Summary: java.util; SequencedMap; true; sequencedEntrySet; ; ; Argument[this].MapValue; ReturnValue.Element.MapValue; value; manual |
-| 295 | Summary: java.util; SequencedMap; true; sequencedKeySet; ; ; Argument[this].MapKey; ReturnValue.Element; value; manual |
-| 296 | Summary: java.util; SequencedMap; true; sequencedValues; ; ; Argument[this].MapValue; ReturnValue.Element; value; manual |
-| 297 | Summary: java.util; SequencedSet; true; reversed; ; ; Argument[this].Element; ReturnValue.Element; value; manual |
-| 298 | Summary: java.util; Set; false; copyOf; (Collection); ; Argument[0].Element; ReturnValue.Element; value; manual |
-| 299 | Summary: java.util; Set; false; clear; (); ; Argument[this].WithoutElement; Argument[this]; value; manual |
-| 300 | Summary: java.util; Set; false; of; (Object); ; Argument[0]; ReturnValue.Element; value; manual |
-| 301 | Summary: java.util; Set; false; of; (Object,Object); ; Argument[0..1]; ReturnValue.Element; value; manual |
-| 302 | Summary: java.util; Set; false; of; (Object,Object,Object); ; Argument[0..2]; ReturnValue.Element; value; manual |
-| 303 | Summary: java.util; Set; false; of; (Object,Object,Object,Object); ; Argument[0..3]; ReturnValue.Element; value; manual |
-| 304 | Summary: java.util; Set; false; of; (Object,Object,Object,Object,Object); ; Argument[0..4]; ReturnValue.Element; value; manual |
-| 305 | Summary: java.util; Set; false; of; (Object,Object,Object,Object,Object,Object); ; Argument[0..5]; ReturnValue.Element; value; manual |
-| 306 | Summary: java.util; Set; false; of; (Object,Object,Object,Object,Object,Object,Object); ; Argument[0..6]; ReturnValue.Element; value; manual |
-| 307 | Summary: java.util; Set; false; of; (Object,Object,Object,Object,Object,Object,Object,Object); ; Argument[0..7]; ReturnValue.Element; value; manual |
-| 308 | Summary: java.util; Set; false; of; (Object,Object,Object,Object,Object,Object,Object,Object,Object); ; Argument[0..8]; ReturnValue.Element; value; manual |
-| 309 | Summary: java.util; Set; false; of; (Object,Object,Object,Object,Object,Object,Object,Object,Object,Object); ; Argument[0..9]; ReturnValue.Element; value; manual |
-| 310 | Summary: java.util; Set; false; of; (Object[]); ; Argument[0].ArrayElement; ReturnValue.Element; value; manual |
-| 311 | Summary: java.util; SortedMap; true; headMap; (Object); ; Argument[this].MapKey; ReturnValue.MapKey; value; manual |
-| 312 | Summary: java.util; SortedMap; true; headMap; (Object); ; Argument[this].MapValue; ReturnValue.MapValue; value; manual |
-| 313 | Summary: java.util; SortedMap; true; subMap; (Object,Object); ; Argument[this].MapKey; ReturnValue.MapKey; value; manual |
-| 314 | Summary: java.util; SortedMap; true; subMap; (Object,Object); ; Argument[this].MapValue; ReturnValue.MapValue; value; manual |
-| 315 | Summary: java.util; SortedMap; true; tailMap; (Object); ; Argument[this].MapKey; ReturnValue.MapKey; value; manual |
-| 316 | Summary: java.util; SortedMap; true; tailMap; (Object); ; Argument[this].MapValue; ReturnValue.MapValue; value; manual |
-| 317 | Summary: java.util; SortedSet; true; first; (); ; Argument[this].Element; ReturnValue; value; manual |
-| 318 | Summary: java.util; SortedSet; true; headSet; (Object); ; Argument[this].Element; ReturnValue.Element; value; manual |
-| 319 | Summary: java.util; SortedSet; true; last; (); ; Argument[this].Element; ReturnValue; value; manual |
-| 320 | Summary: java.util; SortedSet; true; subSet; (Object,Object); ; Argument[this].Element; ReturnValue.Element; value; manual |
-| 321 | Summary: java.util; SortedSet; true; tailSet; (Object); ; Argument[this].Element; ReturnValue.Element; value; manual |
-| 322 | Summary: java.util; Stack; true; peek; (); ; Argument[this].Element; ReturnValue; value; manual |
-| 323 | Summary: java.util; Stack; true; pop; (); ; Argument[this].Element; ReturnValue; value; manual |
-| 324 | Summary: java.util; Stack; true; push; (Object); ; Argument[0]; Argument[this].Element; value; manual |
-| 325 | Summary: java.util; TreeMap; false; TreeMap; (Map); ; Argument[0].MapKey; Argument[this].MapKey; value; manual |
-| 326 | Summary: java.util; TreeMap; false; TreeMap; (Map); ; Argument[0].MapValue; Argument[this].MapValue; value; manual |
-| 327 | Summary: java.util; TreeMap; false; TreeMap; (SortedMap); ; Argument[0].MapKey; Argument[this].MapKey; value; manual |
-| 328 | Summary: java.util; TreeMap; false; TreeMap; (SortedMap); ; Argument[0].MapValue; Argument[this].MapValue; value; manual |
-| 329 | Summary: java.util; TreeSet; false; TreeSet; (Collection); ; Argument[0].Element; Argument[this].Element; value; manual |
-| 330 | Summary: java.util; TreeSet; false; TreeSet; (SortedSet); ; Argument[0].Element; Argument[this].Element; value; manual |
-| 331 | Summary: java.util; Vector; false; Vector; (Collection); ; Argument[0].Element; Argument[this].Element; value; manual |
-| 332 | Summary: java.util; Vector; true; addElement; (Object); ; Argument[0]; Argument[this].Element; value; manual |
-| 333 | Summary: java.util; Vector; true; copyInto; (Object[]); ; Argument[this].Element; Argument[0].ArrayElement; value; manual |
-| 334 | Summary: java.util; Vector; true; elementAt; (int); ; Argument[this].Element; ReturnValue; value; manual |
-| 335 | Summary: java.util; Vector; true; elements; (); ; Argument[this].Element; ReturnValue.Element; value; manual |
-| 336 | Summary: java.util; Vector; true; firstElement; (); ; Argument[this].Element; ReturnValue; value; manual |
-| 337 | Summary: java.util; Vector; true; insertElementAt; (Object,int); ; Argument[0]; Argument[this].Element; value; manual |
-| 338 | Summary: java.util; Vector; true; lastElement; (); ; Argument[this].Element; ReturnValue; value; manual |
-| 339 | Summary: java.util; Vector; true; setElementAt; (Object,int); ; Argument[0]; Argument[this].Element; value; manual |
-| 340 | Summary: java.util; WeakHashMap; false; WeakHashMap; (Map); ; Argument[0].MapKey; Argument[this].MapKey; value; manual |
-| 341 | Summary: java.util; WeakHashMap; false; WeakHashMap; (Map); ; Argument[0].MapValue; Argument[this].MapValue; value; manual |
-| 342 | Summary: ; B; false; readElement; (Spliterator); ; Argument[0].Element; ReturnValue; value; manual |
-| 343 | Summary: ; B; false; readElement; (Stream); ; Argument[0].Element; ReturnValue; value; manual |
+| 1 | Summary: ; B; false; readElement; (Spliterator); ; Argument[0].Element; ReturnValue; value; manual |
+| 2 | Summary: ; B; false; readElement; (Stream); ; Argument[0].Element; ReturnValue; value; manual |
+| 3 | Summary: java.lang; Iterable; true; iterator; (); ; Argument[this].Element; ReturnValue.Element; value; manual |
+| 4 | Summary: java.lang; Iterable; true; spliterator; (); ; Argument[this].Element; ReturnValue.Element; value; manual |
+| 5 | Summary: java.util.concurrent; BlockingDeque; true; offerFirst; (Object,long,TimeUnit); ; Argument[0]; Argument[this].Element; value; manual |
+| 6 | Summary: java.util.concurrent; BlockingDeque; true; offerLast; (Object,long,TimeUnit); ; Argument[0]; Argument[this].Element; value; manual |
+| 7 | Summary: java.util.concurrent; BlockingDeque; true; pollFirst; (long,TimeUnit); ; Argument[this].Element; ReturnValue; value; manual |
+| 8 | Summary: java.util.concurrent; BlockingDeque; true; pollLast; (long,TimeUnit); ; Argument[this].Element; ReturnValue; value; manual |
+| 9 | Summary: java.util.concurrent; BlockingDeque; true; putFirst; (Object); ; Argument[0]; Argument[this].Element; value; manual |
+| 10 | Summary: java.util.concurrent; BlockingDeque; true; putLast; (Object); ; Argument[0]; Argument[this].Element; value; manual |
+| 11 | Summary: java.util.concurrent; BlockingDeque; true; takeFirst; (); ; Argument[this].Element; ReturnValue; value; manual |
+| 12 | Summary: java.util.concurrent; BlockingDeque; true; takeLast; (); ; Argument[this].Element; ReturnValue; value; manual |
+| 13 | Summary: java.util.concurrent; BlockingQueue; true; drainTo; (Collection); ; Argument[this].Element; Argument[0].Element; value; manual |
+| 14 | Summary: java.util.concurrent; BlockingQueue; true; drainTo; (Collection,int); ; Argument[this].Element; Argument[0].Element; value; manual |
+| 15 | Summary: java.util.concurrent; BlockingQueue; true; offer; (Object,long,TimeUnit); ; Argument[0]; Argument[this].Element; value; manual |
+| 16 | Summary: java.util.concurrent; BlockingQueue; true; poll; (long,TimeUnit); ; Argument[this].Element; ReturnValue; value; manual |
+| 17 | Summary: java.util.concurrent; BlockingQueue; true; put; (Object); ; Argument[0]; Argument[this].Element; value; manual |
+| 18 | Summary: java.util.concurrent; BlockingQueue; true; take; (); ; Argument[this].Element; ReturnValue; value; manual |
+| 19 | Summary: java.util.concurrent; ConcurrentHashMap; true; elements; (); ; Argument[this].MapValue; ReturnValue.Element; value; manual |
+| 20 | Summary: java.util.concurrent; TransferQueue; true; transfer; (Object); ; Argument[0]; Argument[this].Element; value; manual |
+| 21 | Summary: java.util.concurrent; TransferQueue; true; tryTransfer; (Object); ; Argument[0]; Argument[this].Element; value; manual |
+| 22 | Summary: java.util.concurrent; TransferQueue; true; tryTransfer; (Object,long,TimeUnit); ; Argument[0]; Argument[this].Element; value; manual |
+| 23 | Summary: java.util; AbstractMap$SimpleEntry; false; SimpleEntry; (Map$Entry); ; Argument[0].MapKey; Argument[this].MapKey; value; manual |
+| 24 | Summary: java.util; AbstractMap$SimpleEntry; false; SimpleEntry; (Map$Entry); ; Argument[0].MapValue; Argument[this].MapValue; value; manual |
+| 25 | Summary: java.util; AbstractMap$SimpleEntry; false; SimpleEntry; (Object,Object); ; Argument[0]; Argument[this].MapKey; value; manual |
+| 26 | Summary: java.util; AbstractMap$SimpleEntry; false; SimpleEntry; (Object,Object); ; Argument[1]; Argument[this].MapValue; value; manual |
+| 27 | Summary: java.util; AbstractMap$SimpleImmutableEntry; false; SimpleImmutableEntry; (Map$Entry); ; Argument[0].MapKey; Argument[this].MapKey; value; manual |
+| 28 | Summary: java.util; AbstractMap$SimpleImmutableEntry; false; SimpleImmutableEntry; (Map$Entry); ; Argument[0].MapValue; Argument[this].MapValue; value; manual |
+| 29 | Summary: java.util; ArrayDeque; false; ArrayDeque; (Collection); ; Argument[0].Element; Argument[this].Element; value; manual |
+| 30 | Summary: java.util; ArrayList; false; ArrayList; (Collection); ; Argument[0].Element; Argument[this].Element; value; manual |
+| 31 | Summary: java.util; Arrays; false; asList; ; ; Argument[0].ArrayElement; ReturnValue.Element; value; manual |
+| 32 | Summary: java.util; Arrays; false; copyOf; ; ; Argument[0].ArrayElement; ReturnValue.ArrayElement; value; manual |
+| 33 | Summary: java.util; Arrays; false; copyOfRange; ; ; Argument[0].ArrayElement; ReturnValue.ArrayElement; value; manual |
+| 34 | Summary: java.util; Arrays; false; fill; (Object[],Object); ; Argument[1]; Argument[0].ArrayElement; value; manual |
+| 35 | Summary: java.util; Arrays; false; fill; (Object[],int,int,Object); ; Argument[3]; Argument[0].ArrayElement; value; manual |
+| 36 | Summary: java.util; Arrays; false; fill; (boolean[],boolean); ; Argument[1]; Argument[0].ArrayElement; value; manual |
+| 37 | Summary: java.util; Arrays; false; fill; (boolean[],int,int,boolean); ; Argument[3]; Argument[0].ArrayElement; value; manual |
+| 38 | Summary: java.util; Arrays; false; fill; (byte[],byte); ; Argument[1]; Argument[0].ArrayElement; value; manual |
+| 39 | Summary: java.util; Arrays; false; fill; (byte[],int,int,byte); ; Argument[3]; Argument[0].ArrayElement; value; manual |
+| 40 | Summary: java.util; Arrays; false; fill; (char[],char); ; Argument[1]; Argument[0].ArrayElement; value; manual |
+| 41 | Summary: java.util; Arrays; false; fill; (char[],int,int,char); ; Argument[3]; Argument[0].ArrayElement; value; manual |
+| 42 | Summary: java.util; Arrays; false; fill; (double[],double); ; Argument[1]; Argument[0].ArrayElement; value; manual |
+| 43 | Summary: java.util; Arrays; false; fill; (double[],int,int,double); ; Argument[3]; Argument[0].ArrayElement; value; manual |
+| 44 | Summary: java.util; Arrays; false; fill; (float[],float); ; Argument[1]; Argument[0].ArrayElement; value; manual |
+| 45 | Summary: java.util; Arrays; false; fill; (float[],int,int,float); ; Argument[3]; Argument[0].ArrayElement; value; manual |
+| 46 | Summary: java.util; Arrays; false; fill; (int[],int); ; Argument[1]; Argument[0].ArrayElement; value; manual |
+| 47 | Summary: java.util; Arrays; false; fill; (int[],int,int,int); ; Argument[3]; Argument[0].ArrayElement; value; manual |
+| 48 | Summary: java.util; Arrays; false; fill; (long[],int,int,long); ; Argument[3]; Argument[0].ArrayElement; value; manual |
+| 49 | Summary: java.util; Arrays; false; fill; (long[],long); ; Argument[1]; Argument[0].ArrayElement; value; manual |
+| 50 | Summary: java.util; Arrays; false; fill; (short[],int,int,short); ; Argument[3]; Argument[0].ArrayElement; value; manual |
+| 51 | Summary: java.util; Arrays; false; fill; (short[],short); ; Argument[1]; Argument[0].ArrayElement; value; manual |
+| 52 | Summary: java.util; Arrays; false; spliterator; ; ; Argument[0].ArrayElement; ReturnValue.Element; value; manual |
+| 53 | Summary: java.util; Arrays; false; stream; ; ; Argument[0].ArrayElement; ReturnValue.Element; value; manual |
+| 54 | Summary: java.util; Collection; true; add; ; ; Argument[0]; Argument[this].Element; value; manual |
+| 55 | Summary: java.util; Collection; true; addAll; ; ; Argument[0].Element; Argument[this].Element; value; manual |
+| 56 | Summary: java.util; Collection; true; parallelStream; (); ; Argument[this].Element; ReturnValue.Element; value; manual |
+| 57 | Summary: java.util; Collection; true; stream; (); ; Argument[this].Element; ReturnValue.Element; value; manual |
+| 58 | Summary: java.util; Collection; true; toArray; ; ; Argument[this].Element; Argument[0].ArrayElement; value; manual |
+| 59 | Summary: java.util; Collection; true; toArray; ; ; Argument[this].Element; ReturnValue.ArrayElement; value; manual |
+| 60 | Summary: java.util; Collections; false; addAll; (Collection,Object[]); ; Argument[1].ArrayElement; Argument[0].Element; value; manual |
+| 61 | Summary: java.util; Collections; false; checkedCollection; (Collection,Class); ; Argument[0].Element; ReturnValue.Element; value; manual |
+| 62 | Summary: java.util; Collections; false; checkedList; (List,Class); ; Argument[0].Element; ReturnValue.Element; value; manual |
+| 63 | Summary: java.util; Collections; false; checkedMap; (Map,Class,Class); ; Argument[0].MapKey; ReturnValue.MapKey; value; manual |
+| 64 | Summary: java.util; Collections; false; checkedMap; (Map,Class,Class); ; Argument[0].MapValue; ReturnValue.MapValue; value; manual |
+| 65 | Summary: java.util; Collections; false; checkedNavigableMap; (NavigableMap,Class,Class); ; Argument[0].MapKey; ReturnValue.MapKey; value; manual |
+| 66 | Summary: java.util; Collections; false; checkedNavigableMap; (NavigableMap,Class,Class); ; Argument[0].MapValue; ReturnValue.MapValue; value; manual |
+| 67 | Summary: java.util; Collections; false; checkedNavigableSet; (NavigableSet,Class); ; Argument[0].Element; ReturnValue.Element; value; manual |
+| 68 | Summary: java.util; Collections; false; checkedSet; (Set,Class); ; Argument[0].Element; ReturnValue.Element; value; manual |
+| 69 | Summary: java.util; Collections; false; checkedSortedMap; (SortedMap,Class,Class); ; Argument[0].MapKey; ReturnValue.MapKey; value; manual |
+| 70 | Summary: java.util; Collections; false; checkedSortedMap; (SortedMap,Class,Class); ; Argument[0].MapValue; ReturnValue.MapValue; value; manual |
+| 71 | Summary: java.util; Collections; false; checkedSortedSet; (SortedSet,Class); ; Argument[0].Element; ReturnValue.Element; value; manual |
+| 72 | Summary: java.util; Collections; false; copy; (List,List); ; Argument[1].Element; Argument[0].Element; value; manual |
+| 73 | Summary: java.util; Collections; false; enumeration; (Collection); ; Argument[0].Element; ReturnValue.Element; value; manual |
+| 74 | Summary: java.util; Collections; false; fill; (List,Object); ; Argument[1]; Argument[0].Element; value; manual |
+| 75 | Summary: java.util; Collections; false; list; (Enumeration); ; Argument[0].Element; ReturnValue.Element; value; manual |
+| 76 | Summary: java.util; Collections; false; max; ; ; Argument[0].Element; ReturnValue; value; manual |
+| 77 | Summary: java.util; Collections; false; min; ; ; Argument[0].Element; ReturnValue; value; manual |
+| 78 | Summary: java.util; Collections; false; nCopies; (int,Object); ; Argument[1]; ReturnValue.Element; value; manual |
+| 79 | Summary: java.util; Collections; false; replaceAll; (List,Object,Object); ; Argument[2]; Argument[0].Element; value; manual |
+| 80 | Summary: java.util; Collections; false; singleton; (Object); ; Argument[0]; ReturnValue.Element; value; manual |
+| 81 | Summary: java.util; Collections; false; singletonList; (Object); ; Argument[0]; ReturnValue.Element; value; manual |
+| 82 | Summary: java.util; Collections; false; singletonMap; (Object,Object); ; Argument[0]; ReturnValue.MapKey; value; manual |
+| 83 | Summary: java.util; Collections; false; singletonMap; (Object,Object); ; Argument[1]; ReturnValue.MapValue; value; manual |
+| 84 | Summary: java.util; Collections; false; synchronizedCollection; (Collection); ; Argument[0].Element; ReturnValue.Element; value; manual |
+| 85 | Summary: java.util; Collections; false; synchronizedList; (List); ; Argument[0].Element; ReturnValue.Element; value; manual |
+| 86 | Summary: java.util; Collections; false; synchronizedMap; (Map); ; Argument[0].MapKey; ReturnValue.MapKey; value; manual |
+| 87 | Summary: java.util; Collections; false; synchronizedMap; (Map); ; Argument[0].MapValue; ReturnValue.MapValue; value; manual |
+| 88 | Summary: java.util; Collections; false; synchronizedNavigableMap; (NavigableMap); ; Argument[0].MapKey; ReturnValue.MapKey; value; manual |
+| 89 | Summary: java.util; Collections; false; synchronizedNavigableMap; (NavigableMap); ; Argument[0].MapValue; ReturnValue.MapValue; value; manual |
+| 90 | Summary: java.util; Collections; false; synchronizedNavigableSet; (NavigableSet); ; Argument[0].Element; ReturnValue.Element; value; manual |
+| 91 | Summary: java.util; Collections; false; synchronizedSet; (Set); ; Argument[0].Element; ReturnValue.Element; value; manual |
+| 92 | Summary: java.util; Collections; false; synchronizedSortedMap; (SortedMap); ; Argument[0].MapKey; ReturnValue.MapKey; value; manual |
+| 93 | Summary: java.util; Collections; false; synchronizedSortedMap; (SortedMap); ; Argument[0].MapValue; ReturnValue.MapValue; value; manual |
+| 94 | Summary: java.util; Collections; false; synchronizedSortedSet; (SortedSet); ; Argument[0].Element; ReturnValue.Element; value; manual |
+| 95 | Summary: java.util; Collections; false; unmodifiableCollection; (Collection); ; Argument[0].Element; ReturnValue.Element; value; manual |
+| 96 | Summary: java.util; Collections; false; unmodifiableList; (List); ; Argument[0].Element; ReturnValue.Element; value; manual |
+| 97 | Summary: java.util; Collections; false; unmodifiableMap; (Map); ; Argument[0].MapKey; ReturnValue.MapKey; value; manual |
+| 98 | Summary: java.util; Collections; false; unmodifiableMap; (Map); ; Argument[0].MapValue; ReturnValue.MapValue; value; manual |
+| 99 | Summary: java.util; Collections; false; unmodifiableNavigableMap; (NavigableMap); ; Argument[0].MapKey; ReturnValue.MapKey; value; manual |
+| 100 | Summary: java.util; Collections; false; unmodifiableNavigableMap; (NavigableMap); ; Argument[0].MapValue; ReturnValue.MapValue; value; manual |
+| 101 | Summary: java.util; Collections; false; unmodifiableNavigableSet; (NavigableSet); ; Argument[0].Element; ReturnValue.Element; value; manual |
+| 102 | Summary: java.util; Collections; false; unmodifiableSequencedCollection; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
+| 103 | Summary: java.util; Collections; false; unmodifiableSequencedMap; ; ; Argument[0].MapKey; ReturnValue.MapKey; value; manual |
+| 104 | Summary: java.util; Collections; false; unmodifiableSequencedMap; ; ; Argument[0].MapValue; ReturnValue.MapValue; value; manual |
+| 105 | Summary: java.util; Collections; false; unmodifiableSequencedSet; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
+| 106 | Summary: java.util; Collections; false; unmodifiableSet; (Set); ; Argument[0].Element; ReturnValue.Element; value; manual |
+| 107 | Summary: java.util; Collections; false; unmodifiableSortedMap; (SortedMap); ; Argument[0].MapKey; ReturnValue.MapKey; value; manual |
+| 108 | Summary: java.util; Collections; false; unmodifiableSortedMap; (SortedMap); ; Argument[0].MapValue; ReturnValue.MapValue; value; manual |
+| 109 | Summary: java.util; Collections; false; unmodifiableSortedSet; (SortedSet); ; Argument[0].Element; ReturnValue.Element; value; manual |
+| 110 | Summary: java.util; Deque; true; addFirst; (Object); ; Argument[0]; Argument[this].Element; value; manual |
+| 111 | Summary: java.util; Deque; true; addLast; (Object); ; Argument[0]; Argument[this].Element; value; manual |
+| 112 | Summary: java.util; Deque; true; descendingIterator; (); ; Argument[this].Element; ReturnValue.Element; value; manual |
+| 113 | Summary: java.util; Deque; true; getFirst; (); ; Argument[this].Element; ReturnValue; value; manual |
+| 114 | Summary: java.util; Deque; true; getLast; (); ; Argument[this].Element; ReturnValue; value; manual |
+| 115 | Summary: java.util; Deque; true; offerFirst; (Object); ; Argument[0]; Argument[this].Element; value; manual |
+| 116 | Summary: java.util; Deque; true; offerLast; (Object); ; Argument[0]; Argument[this].Element; value; manual |
+| 117 | Summary: java.util; Deque; true; peekFirst; (); ; Argument[this].Element; ReturnValue; value; manual |
+| 118 | Summary: java.util; Deque; true; peekLast; (); ; Argument[this].Element; ReturnValue; value; manual |
+| 119 | Summary: java.util; Deque; true; pollFirst; (); ; Argument[this].Element; ReturnValue; value; manual |
+| 120 | Summary: java.util; Deque; true; pollLast; (); ; Argument[this].Element; ReturnValue; value; manual |
+| 121 | Summary: java.util; Deque; true; pop; (); ; Argument[this].Element; ReturnValue; value; manual |
+| 122 | Summary: java.util; Deque; true; push; (Object); ; Argument[0]; Argument[this].Element; value; manual |
+| 123 | Summary: java.util; Deque; true; removeFirst; (); ; Argument[this].Element; ReturnValue; value; manual |
+| 124 | Summary: java.util; Deque; true; removeLast; (); ; Argument[this].Element; ReturnValue; value; manual |
+| 125 | Summary: java.util; Dictionary; true; elements; (); ; Argument[this].MapValue; ReturnValue.Element; value; manual |
+| 126 | Summary: java.util; Dictionary; true; get; (Object); ; Argument[this].MapValue; ReturnValue; value; manual |
+| 127 | Summary: java.util; Dictionary; true; keys; (); ; Argument[this].MapKey; ReturnValue.Element; value; manual |
+| 128 | Summary: java.util; Dictionary; true; put; (Object,Object); ; Argument[0]; Argument[this].MapKey; value; manual |
+| 129 | Summary: java.util; Dictionary; true; put; (Object,Object); ; Argument[1]; Argument[this].MapValue; value; manual |
+| 130 | Summary: java.util; Dictionary; true; put; (Object,Object); ; Argument[this].MapValue; ReturnValue; value; manual |
+| 131 | Summary: java.util; Dictionary; true; remove; (Object); ; Argument[this].MapValue; ReturnValue; value; manual |
+| 132 | Summary: java.util; EnumMap; false; EnumMap; (EnumMap); ; Argument[0].MapKey; Argument[this].MapKey; value; manual |
+| 133 | Summary: java.util; EnumMap; false; EnumMap; (EnumMap); ; Argument[0].MapValue; Argument[this].MapValue; value; manual |
+| 134 | Summary: java.util; EnumMap; false; EnumMap; (Map); ; Argument[0].MapKey; Argument[this].MapKey; value; manual |
+| 135 | Summary: java.util; EnumMap; false; EnumMap; (Map); ; Argument[0].MapValue; Argument[this].MapValue; value; manual |
+| 136 | Summary: java.util; Enumeration; true; asIterator; ; ; Argument[this].Element; ReturnValue.Element; value; manual |
+| 137 | Summary: java.util; Enumeration; true; nextElement; ; ; Argument[this].Element; ReturnValue; value; manual |
+| 138 | Summary: java.util; HashMap; false; HashMap; (Map); ; Argument[0].MapKey; Argument[this].MapKey; value; manual |
+| 139 | Summary: java.util; HashMap; false; HashMap; (Map); ; Argument[0].MapValue; Argument[this].MapValue; value; manual |
+| 140 | Summary: java.util; HashSet; false; HashSet; (Collection); ; Argument[0].Element; Argument[this].Element; value; manual |
+| 141 | Summary: java.util; Hashtable; false; Hashtable; (Map); ; Argument[0].MapKey; Argument[this].MapKey; value; manual |
+| 142 | Summary: java.util; Hashtable; false; Hashtable; (Map); ; Argument[0].MapValue; Argument[this].MapValue; value; manual |
+| 143 | Summary: java.util; IdentityHashMap; false; IdentityHashMap; (Map); ; Argument[0].MapKey; Argument[this].MapKey; value; manual |
+| 144 | Summary: java.util; IdentityHashMap; false; IdentityHashMap; (Map); ; Argument[0].MapValue; Argument[this].MapValue; value; manual |
+| 145 | Summary: java.util; Iterator; true; next; ; ; Argument[this].Element; ReturnValue; value; manual |
+| 146 | Summary: java.util; LinkedHashMap; false; LinkedHashMap; (Map); ; Argument[0].MapKey; Argument[this].MapKey; value; manual |
+| 147 | Summary: java.util; LinkedHashMap; false; LinkedHashMap; (Map); ; Argument[0].MapValue; Argument[this].MapValue; value; manual |
+| 148 | Summary: java.util; LinkedHashSet; false; LinkedHashSet; (Collection); ; Argument[0].Element; Argument[this].Element; value; manual |
+| 149 | Summary: java.util; LinkedList; false; LinkedList; (Collection); ; Argument[0].Element; Argument[this].Element; value; manual |
+| 150 | Summary: java.util; List; false; copyOf; (Collection); ; Argument[0].Element; ReturnValue.Element; value; manual |
+| 151 | Summary: java.util; List; false; of; (Object); ; Argument[0]; ReturnValue.Element; value; manual |
+| 152 | Summary: java.util; List; false; of; (Object,Object); ; Argument[0..1]; ReturnValue.Element; value; manual |
+| 153 | Summary: java.util; List; false; of; (Object,Object,Object); ; Argument[0..2]; ReturnValue.Element; value; manual |
+| 154 | Summary: java.util; List; false; of; (Object,Object,Object,Object); ; Argument[0..3]; ReturnValue.Element; value; manual |
+| 155 | Summary: java.util; List; false; of; (Object,Object,Object,Object,Object); ; Argument[0..4]; ReturnValue.Element; value; manual |
+| 156 | Summary: java.util; List; false; of; (Object,Object,Object,Object,Object,Object); ; Argument[0..5]; ReturnValue.Element; value; manual |
+| 157 | Summary: java.util; List; false; of; (Object,Object,Object,Object,Object,Object,Object); ; Argument[0..6]; ReturnValue.Element; value; manual |
+| 158 | Summary: java.util; List; false; of; (Object,Object,Object,Object,Object,Object,Object,Object); ; Argument[0..7]; ReturnValue.Element; value; manual |
+| 159 | Summary: java.util; List; false; of; (Object,Object,Object,Object,Object,Object,Object,Object,Object); ; Argument[0..8]; ReturnValue.Element; value; manual |
+| 160 | Summary: java.util; List; false; of; (Object,Object,Object,Object,Object,Object,Object,Object,Object,Object); ; Argument[0..9]; ReturnValue.Element; value; manual |
+| 161 | Summary: java.util; List; false; of; (Object[]); ; Argument[0].ArrayElement; ReturnValue.Element; value; manual |
+| 162 | Summary: java.util; List; true; add; (int,Object); ; Argument[1]; Argument[this].Element; value; manual |
+| 163 | Summary: java.util; List; true; addAll; (int,Collection); ; Argument[1].WithElement; Argument[this]; value; manual |
+| 164 | Summary: java.util; List; true; clear; (); ; Argument[this].WithoutElement; Argument[this]; value; manual |
+| 165 | Summary: java.util; List; true; get; (int); ; Argument[this].Element; ReturnValue; value; manual |
+| 166 | Summary: java.util; List; true; listIterator; ; ; Argument[this].Element; ReturnValue.Element; value; manual |
+| 167 | Summary: java.util; List; true; remove; (int); ; Argument[this].Element; ReturnValue; value; manual |
+| 168 | Summary: java.util; List; true; set; (int,Object); ; Argument[1]; Argument[this].Element; value; manual |
+| 169 | Summary: java.util; List; true; set; (int,Object); ; Argument[this].Element; ReturnValue; value; manual |
+| 170 | Summary: java.util; List; true; subList; ; ; Argument[this].Element; ReturnValue.Element; value; manual |
+| 171 | Summary: java.util; ListIterator; true; add; (Object); ; Argument[0]; Argument[this].Element; value; manual |
+| 172 | Summary: java.util; ListIterator; true; previous; ; ; Argument[this].Element; ReturnValue; value; manual |
+| 173 | Summary: java.util; ListIterator; true; set; (Object); ; Argument[0]; Argument[this].Element; value; manual |
+| 174 | Summary: java.util; Map$Entry; true; getKey; ; ; Argument[this].MapKey; ReturnValue; value; manual |
+| 175 | Summary: java.util; Map$Entry; true; getValue; ; ; Argument[this].MapValue; ReturnValue; value; manual |
+| 176 | Summary: java.util; Map$Entry; true; setValue; ; ; Argument[0]; Argument[this].MapValue; value; manual |
+| 177 | Summary: java.util; Map$Entry; true; setValue; ; ; Argument[this].MapValue; ReturnValue; value; manual |
+| 178 | Summary: java.util; Map; false; copyOf; (Map); ; Argument[0].MapKey; ReturnValue.MapKey; value; manual |
+| 179 | Summary: java.util; Map; false; copyOf; (Map); ; Argument[0].MapValue; ReturnValue.MapValue; value; manual |
+| 180 | Summary: java.util; Map; false; entry; (Object,Object); ; Argument[0]; ReturnValue.MapKey; value; manual |
+| 181 | Summary: java.util; Map; false; entry; (Object,Object); ; Argument[1]; ReturnValue.MapValue; value; manual |
+| 182 | Summary: java.util; Map; false; of; ; ; Argument[0]; ReturnValue.MapKey; value; manual |
+| 183 | Summary: java.util; Map; false; of; ; ; Argument[10]; ReturnValue.MapKey; value; manual |
+| 184 | Summary: java.util; Map; false; of; ; ; Argument[11]; ReturnValue.MapValue; value; manual |
+| 185 | Summary: java.util; Map; false; of; ; ; Argument[12]; ReturnValue.MapKey; value; manual |
+| 186 | Summary: java.util; Map; false; of; ; ; Argument[13]; ReturnValue.MapValue; value; manual |
+| 187 | Summary: java.util; Map; false; of; ; ; Argument[14]; ReturnValue.MapKey; value; manual |
+| 188 | Summary: java.util; Map; false; of; ; ; Argument[15]; ReturnValue.MapValue; value; manual |
+| 189 | Summary: java.util; Map; false; of; ; ; Argument[16]; ReturnValue.MapKey; value; manual |
+| 190 | Summary: java.util; Map; false; of; ; ; Argument[17]; ReturnValue.MapValue; value; manual |
+| 191 | Summary: java.util; Map; false; of; ; ; Argument[18]; ReturnValue.MapKey; value; manual |
+| 192 | Summary: java.util; Map; false; of; ; ; Argument[19]; ReturnValue.MapValue; value; manual |
+| 193 | Summary: java.util; Map; false; of; ; ; Argument[1]; ReturnValue.MapValue; value; manual |
+| 194 | Summary: java.util; Map; false; of; ; ; Argument[2]; ReturnValue.MapKey; value; manual |
+| 195 | Summary: java.util; Map; false; of; ; ; Argument[3]; ReturnValue.MapValue; value; manual |
+| 196 | Summary: java.util; Map; false; of; ; ; Argument[4]; ReturnValue.MapKey; value; manual |
+| 197 | Summary: java.util; Map; false; of; ; ; Argument[5]; ReturnValue.MapValue; value; manual |
+| 198 | Summary: java.util; Map; false; of; ; ; Argument[6]; ReturnValue.MapKey; value; manual |
+| 199 | Summary: java.util; Map; false; of; ; ; Argument[7]; ReturnValue.MapValue; value; manual |
+| 200 | Summary: java.util; Map; false; of; ; ; Argument[8]; ReturnValue.MapKey; value; manual |
+| 201 | Summary: java.util; Map; false; of; ; ; Argument[9]; ReturnValue.MapValue; value; manual |
+| 202 | Summary: java.util; Map; false; ofEntries; ; ; Argument[0].ArrayElement.MapKey; ReturnValue.MapKey; value; manual |
+| 203 | Summary: java.util; Map; false; ofEntries; ; ; Argument[0].ArrayElement.MapValue; ReturnValue.MapValue; value; manual |
+| 204 | Summary: java.util; Map; true; computeIfAbsent; ; ; Argument[1].ReturnValue; Argument[this].MapValue; value; manual |
+| 205 | Summary: java.util; Map; true; computeIfAbsent; ; ; Argument[1].ReturnValue; ReturnValue; value; manual |
+| 206 | Summary: java.util; Map; true; computeIfAbsent; ; ; Argument[this].MapValue; ReturnValue; value; manual |
+| 207 | Summary: java.util; Map; true; entrySet; ; ; Argument[this].MapKey; ReturnValue.Element.MapKey; value; manual |
+| 208 | Summary: java.util; Map; true; entrySet; ; ; Argument[this].MapValue; ReturnValue.Element.MapValue; value; manual |
+| 209 | Summary: java.util; Map; true; get; ; ; Argument[this].MapValue; ReturnValue; value; manual |
+| 210 | Summary: java.util; Map; true; getOrDefault; ; ; Argument[1]; ReturnValue; value; manual |
+| 211 | Summary: java.util; Map; true; getOrDefault; ; ; Argument[this].MapValue; ReturnValue; value; manual |
+| 212 | Summary: java.util; Map; true; keySet; (); ; Argument[this].MapKey; ReturnValue.Element; value; manual |
+| 213 | Summary: java.util; Map; true; merge; (Object,Object,BiFunction); ; Argument[1]; Argument[this].MapValue; value; manual |
+| 214 | Summary: java.util; Map; true; put; (Object,Object); ; Argument[0]; Argument[this].MapKey; value; manual |
+| 215 | Summary: java.util; Map; true; put; (Object,Object); ; Argument[1]; Argument[this].MapValue; value; manual |
+| 216 | Summary: java.util; Map; true; put; (Object,Object); ; Argument[this].MapValue; ReturnValue; value; manual |
+| 217 | Summary: java.util; Map; true; putAll; (Map); ; Argument[0].MapKey; Argument[this].MapKey; value; manual |
+| 218 | Summary: java.util; Map; true; putAll; (Map); ; Argument[0].MapValue; Argument[this].MapValue; value; manual |
+| 219 | Summary: java.util; Map; true; putIfAbsent; ; ; Argument[0]; Argument[this].MapKey; value; manual |
+| 220 | Summary: java.util; Map; true; putIfAbsent; ; ; Argument[1]; Argument[this].MapValue; value; manual |
+| 221 | Summary: java.util; Map; true; putIfAbsent; ; ; Argument[this].MapValue; ReturnValue; value; manual |
+| 222 | Summary: java.util; Map; true; remove; (Object); ; Argument[this].MapValue; ReturnValue; value; manual |
+| 223 | Summary: java.util; Map; true; replace; (Object,Object); ; Argument[0]; Argument[this].MapKey; value; manual |
+| 224 | Summary: java.util; Map; true; replace; (Object,Object); ; Argument[1]; Argument[this].MapValue; value; manual |
+| 225 | Summary: java.util; Map; true; replace; (Object,Object); ; Argument[this].MapValue; ReturnValue; value; manual |
+| 226 | Summary: java.util; Map; true; replace; (Object,Object,Object); ; Argument[0]; Argument[this].MapKey; value; manual |
+| 227 | Summary: java.util; Map; true; replace; (Object,Object,Object); ; Argument[2]; Argument[this].MapValue; value; manual |
+| 228 | Summary: java.util; Map; true; values; (); ; Argument[this].MapValue; ReturnValue.Element; value; manual |
+| 229 | Summary: java.util; NavigableMap; true; ceilingEntry; (Object); ; Argument[this].MapKey; ReturnValue.MapKey; value; manual |
+| 230 | Summary: java.util; NavigableMap; true; ceilingEntry; (Object); ; Argument[this].MapValue; ReturnValue.MapValue; value; manual |
+| 231 | Summary: java.util; NavigableMap; true; descendingMap; (); ; Argument[this].MapKey; ReturnValue.MapKey; value; manual |
+| 232 | Summary: java.util; NavigableMap; true; descendingMap; (); ; Argument[this].MapValue; ReturnValue.MapValue; value; manual |
+| 233 | Summary: java.util; NavigableMap; true; firstEntry; (); ; Argument[this].MapKey; ReturnValue.MapKey; value; manual |
+| 234 | Summary: java.util; NavigableMap; true; firstEntry; (); ; Argument[this].MapValue; ReturnValue.MapValue; value; manual |
+| 235 | Summary: java.util; NavigableMap; true; floorEntry; (Object); ; Argument[this].MapKey; ReturnValue.MapKey; value; manual |
+| 236 | Summary: java.util; NavigableMap; true; floorEntry; (Object); ; Argument[this].MapValue; ReturnValue.MapValue; value; manual |
+| 237 | Summary: java.util; NavigableMap; true; headMap; (Object,boolean); ; Argument[this].MapKey; ReturnValue.MapKey; value; manual |
+| 238 | Summary: java.util; NavigableMap; true; headMap; (Object,boolean); ; Argument[this].MapValue; ReturnValue.MapValue; value; manual |
+| 239 | Summary: java.util; NavigableMap; true; higherEntry; (Object); ; Argument[this].MapKey; ReturnValue.MapKey; value; manual |
+| 240 | Summary: java.util; NavigableMap; true; higherEntry; (Object); ; Argument[this].MapValue; ReturnValue.MapValue; value; manual |
+| 241 | Summary: java.util; NavigableMap; true; lastEntry; (); ; Argument[this].MapKey; ReturnValue.MapKey; value; manual |
+| 242 | Summary: java.util; NavigableMap; true; lastEntry; (); ; Argument[this].MapValue; ReturnValue.MapValue; value; manual |
+| 243 | Summary: java.util; NavigableMap; true; lowerEntry; (Object); ; Argument[this].MapKey; ReturnValue.MapKey; value; manual |
+| 244 | Summary: java.util; NavigableMap; true; lowerEntry; (Object); ; Argument[this].MapValue; ReturnValue.MapValue; value; manual |
+| 245 | Summary: java.util; NavigableMap; true; pollFirstEntry; (); ; Argument[this].MapKey; ReturnValue.MapKey; value; manual |
+| 246 | Summary: java.util; NavigableMap; true; pollFirstEntry; (); ; Argument[this].MapValue; ReturnValue.MapValue; value; manual |
+| 247 | Summary: java.util; NavigableMap; true; pollLastEntry; (); ; Argument[this].MapKey; ReturnValue.MapKey; value; manual |
+| 248 | Summary: java.util; NavigableMap; true; pollLastEntry; (); ; Argument[this].MapValue; ReturnValue.MapValue; value; manual |
+| 249 | Summary: java.util; NavigableMap; true; subMap; (Object,boolean,Object,boolean); ; Argument[this].MapKey; ReturnValue.MapKey; value; manual |
+| 250 | Summary: java.util; NavigableMap; true; subMap; (Object,boolean,Object,boolean); ; Argument[this].MapValue; ReturnValue.MapValue; value; manual |
+| 251 | Summary: java.util; NavigableMap; true; tailMap; (Object,boolean); ; Argument[this].MapKey; ReturnValue.MapKey; value; manual |
+| 252 | Summary: java.util; NavigableMap; true; tailMap; (Object,boolean); ; Argument[this].MapValue; ReturnValue.MapValue; value; manual |
+| 253 | Summary: java.util; NavigableSet; true; ceiling; (Object); ; Argument[this].Element; ReturnValue; value; manual |
+| 254 | Summary: java.util; NavigableSet; true; descendingIterator; (); ; Argument[this].Element; ReturnValue.Element; value; manual |
+| 255 | Summary: java.util; NavigableSet; true; descendingSet; (); ; Argument[this].Element; ReturnValue.Element; value; manual |
+| 256 | Summary: java.util; NavigableSet; true; floor; (Object); ; Argument[this].Element; ReturnValue; value; manual |
+| 257 | Summary: java.util; NavigableSet; true; headSet; (Object,boolean); ; Argument[this].Element; ReturnValue.Element; value; manual |
+| 258 | Summary: java.util; NavigableSet; true; higher; (Object); ; Argument[this].Element; ReturnValue; value; manual |
+| 259 | Summary: java.util; NavigableSet; true; lower; (Object); ; Argument[this].Element; ReturnValue; value; manual |
+| 260 | Summary: java.util; NavigableSet; true; pollFirst; (); ; Argument[this].Element; ReturnValue; value; manual |
+| 261 | Summary: java.util; NavigableSet; true; pollLast; (); ; Argument[this].Element; ReturnValue; value; manual |
+| 262 | Summary: java.util; NavigableSet; true; subSet; (Object,boolean,Object,boolean); ; Argument[this].Element; ReturnValue.Element; value; manual |
+| 263 | Summary: java.util; NavigableSet; true; tailSet; (Object,boolean); ; Argument[this].Element; ReturnValue.Element; value; manual |
+| 264 | Summary: java.util; PriorityQueue; false; PriorityQueue; (Collection); ; Argument[0].Element; Argument[this].Element; value; manual |
+| 265 | Summary: java.util; PriorityQueue; false; PriorityQueue; (PriorityQueue); ; Argument[0].Element; Argument[this].Element; value; manual |
+| 266 | Summary: java.util; PriorityQueue; false; PriorityQueue; (SortedSet); ; Argument[0].Element; Argument[this].Element; value; manual |
+| 267 | Summary: java.util; Queue; true; element; (); ; Argument[this].Element; ReturnValue; value; manual |
+| 268 | Summary: java.util; Queue; true; offer; (Object); ; Argument[0]; Argument[this].Element; value; manual |
+| 269 | Summary: java.util; Queue; true; peek; (); ; Argument[this].Element; ReturnValue; value; manual |
+| 270 | Summary: java.util; Queue; true; poll; (); ; Argument[this].Element; ReturnValue; value; manual |
+| 271 | Summary: java.util; Queue; true; remove; (); ; Argument[this].Element; ReturnValue; value; manual |
+| 272 | Summary: java.util; SequencedCollection; true; addFirst; ; ; Argument[0]; Argument[this].Element; value; manual |
+| 273 | Summary: java.util; SequencedCollection; true; addLast; ; ; Argument[0]; Argument[this].Element; value; manual |
+| 274 | Summary: java.util; SequencedCollection; true; getFirst; ; ; Argument[this].Element; ReturnValue; value; manual |
+| 275 | Summary: java.util; SequencedCollection; true; getLast; ; ; Argument[this].Element; ReturnValue; value; manual |
+| 276 | Summary: java.util; SequencedCollection; true; removeFirst; ; ; Argument[this].Element; ReturnValue; value; manual |
+| 277 | Summary: java.util; SequencedCollection; true; removeLast; ; ; Argument[this].Element; ReturnValue; value; manual |
+| 278 | Summary: java.util; SequencedCollection; true; reversed; ; ; Argument[this].Element; ReturnValue.Element; value; manual |
+| 279 | Summary: java.util; SequencedMap; true; firstEntry; ; ; Argument[this].MapKey; ReturnValue.MapKey; value; manual |
+| 280 | Summary: java.util; SequencedMap; true; firstEntry; ; ; Argument[this].MapValue; ReturnValue.MapValue; value; manual |
+| 281 | Summary: java.util; SequencedMap; true; lastEntry; ; ; Argument[this].MapKey; ReturnValue.MapKey; value; manual |
+| 282 | Summary: java.util; SequencedMap; true; lastEntry; ; ; Argument[this].MapValue; ReturnValue.MapValue; value; manual |
+| 283 | Summary: java.util; SequencedMap; true; pollFirstEntry; ; ; Argument[this].MapKey; ReturnValue.MapKey; value; manual |
+| 284 | Summary: java.util; SequencedMap; true; pollFirstEntry; ; ; Argument[this].MapValue; ReturnValue.MapValue; value; manual |
+| 285 | Summary: java.util; SequencedMap; true; pollLastEntry; ; ; Argument[this].MapKey; ReturnValue.MapKey; value; manual |
+| 286 | Summary: java.util; SequencedMap; true; pollLastEntry; ; ; Argument[this].MapValue; ReturnValue.MapValue; value; manual |
+| 287 | Summary: java.util; SequencedMap; true; putFirst; ; ; Argument[0]; Argument[this].MapKey; value; manual |
+| 288 | Summary: java.util; SequencedMap; true; putFirst; ; ; Argument[1]; Argument[this].MapValue; value; manual |
+| 289 | Summary: java.util; SequencedMap; true; putFirst; ; ; Argument[this].MapValue; ReturnValue; value; manual |
+| 290 | Summary: java.util; SequencedMap; true; putLast; ; ; Argument[0]; Argument[this].MapKey; value; manual |
+| 291 | Summary: java.util; SequencedMap; true; putLast; ; ; Argument[1]; Argument[this].MapValue; value; manual |
+| 292 | Summary: java.util; SequencedMap; true; putLast; ; ; Argument[this].MapValue; ReturnValue; value; manual |
+| 293 | Summary: java.util; SequencedMap; true; reversed; ; ; Argument[this].MapKey; ReturnValue.MapKey; value; manual |
+| 294 | Summary: java.util; SequencedMap; true; reversed; ; ; Argument[this].MapValue; ReturnValue.MapValue; value; manual |
+| 295 | Summary: java.util; SequencedMap; true; sequencedEntrySet; ; ; Argument[this].MapKey; ReturnValue.Element.MapKey; value; manual |
+| 296 | Summary: java.util; SequencedMap; true; sequencedEntrySet; ; ; Argument[this].MapValue; ReturnValue.Element.MapValue; value; manual |
+| 297 | Summary: java.util; SequencedMap; true; sequencedKeySet; ; ; Argument[this].MapKey; ReturnValue.Element; value; manual |
+| 298 | Summary: java.util; SequencedMap; true; sequencedValues; ; ; Argument[this].MapValue; ReturnValue.Element; value; manual |
+| 299 | Summary: java.util; SequencedSet; true; reversed; ; ; Argument[this].Element; ReturnValue.Element; value; manual |
+| 300 | Summary: java.util; Set; false; copyOf; (Collection); ; Argument[0].Element; ReturnValue.Element; value; manual |
+| 301 | Summary: java.util; Set; false; of; (Object); ; Argument[0]; ReturnValue.Element; value; manual |
+| 302 | Summary: java.util; Set; false; of; (Object,Object); ; Argument[0..1]; ReturnValue.Element; value; manual |
+| 303 | Summary: java.util; Set; false; of; (Object,Object,Object); ; Argument[0..2]; ReturnValue.Element; value; manual |
+| 304 | Summary: java.util; Set; false; of; (Object,Object,Object,Object); ; Argument[0..3]; ReturnValue.Element; value; manual |
+| 305 | Summary: java.util; Set; false; of; (Object,Object,Object,Object,Object); ; Argument[0..4]; ReturnValue.Element; value; manual |
+| 306 | Summary: java.util; Set; false; of; (Object,Object,Object,Object,Object,Object); ; Argument[0..5]; ReturnValue.Element; value; manual |
+| 307 | Summary: java.util; Set; false; of; (Object,Object,Object,Object,Object,Object,Object); ; Argument[0..6]; ReturnValue.Element; value; manual |
+| 308 | Summary: java.util; Set; false; of; (Object,Object,Object,Object,Object,Object,Object,Object); ; Argument[0..7]; ReturnValue.Element; value; manual |
+| 309 | Summary: java.util; Set; false; of; (Object,Object,Object,Object,Object,Object,Object,Object,Object); ; Argument[0..8]; ReturnValue.Element; value; manual |
+| 310 | Summary: java.util; Set; false; of; (Object,Object,Object,Object,Object,Object,Object,Object,Object,Object); ; Argument[0..9]; ReturnValue.Element; value; manual |
+| 311 | Summary: java.util; Set; false; of; (Object[]); ; Argument[0].ArrayElement; ReturnValue.Element; value; manual |
+| 312 | Summary: java.util; Set; true; clear; (); ; Argument[this].WithoutElement; Argument[this]; value; manual |
+| 313 | Summary: java.util; SortedMap; true; headMap; (Object); ; Argument[this].MapKey; ReturnValue.MapKey; value; manual |
+| 314 | Summary: java.util; SortedMap; true; headMap; (Object); ; Argument[this].MapValue; ReturnValue.MapValue; value; manual |
+| 315 | Summary: java.util; SortedMap; true; subMap; (Object,Object); ; Argument[this].MapKey; ReturnValue.MapKey; value; manual |
+| 316 | Summary: java.util; SortedMap; true; subMap; (Object,Object); ; Argument[this].MapValue; ReturnValue.MapValue; value; manual |
+| 317 | Summary: java.util; SortedMap; true; tailMap; (Object); ; Argument[this].MapKey; ReturnValue.MapKey; value; manual |
+| 318 | Summary: java.util; SortedMap; true; tailMap; (Object); ; Argument[this].MapValue; ReturnValue.MapValue; value; manual |
+| 319 | Summary: java.util; SortedSet; true; first; (); ; Argument[this].Element; ReturnValue; value; manual |
+| 320 | Summary: java.util; SortedSet; true; headSet; (Object); ; Argument[this].Element; ReturnValue.Element; value; manual |
+| 321 | Summary: java.util; SortedSet; true; last; (); ; Argument[this].Element; ReturnValue; value; manual |
+| 322 | Summary: java.util; SortedSet; true; subSet; (Object,Object); ; Argument[this].Element; ReturnValue.Element; value; manual |
+| 323 | Summary: java.util; SortedSet; true; tailSet; (Object); ; Argument[this].Element; ReturnValue.Element; value; manual |
+| 324 | Summary: java.util; Stack; true; peek; (); ; Argument[this].Element; ReturnValue; value; manual |
+| 325 | Summary: java.util; Stack; true; pop; (); ; Argument[this].Element; ReturnValue; value; manual |
+| 326 | Summary: java.util; Stack; true; push; (Object); ; Argument[0]; Argument[this].Element; value; manual |
+| 327 | Summary: java.util; TreeMap; false; TreeMap; (Map); ; Argument[0].MapKey; Argument[this].MapKey; value; manual |
+| 328 | Summary: java.util; TreeMap; false; TreeMap; (Map); ; Argument[0].MapValue; Argument[this].MapValue; value; manual |
+| 329 | Summary: java.util; TreeMap; false; TreeMap; (SortedMap); ; Argument[0].MapKey; Argument[this].MapKey; value; manual |
+| 330 | Summary: java.util; TreeMap; false; TreeMap; (SortedMap); ; Argument[0].MapValue; Argument[this].MapValue; value; manual |
+| 331 | Summary: java.util; TreeSet; false; TreeSet; (Collection); ; Argument[0].Element; Argument[this].Element; value; manual |
+| 332 | Summary: java.util; TreeSet; false; TreeSet; (SortedSet); ; Argument[0].Element; Argument[this].Element; value; manual |
+| 333 | Summary: java.util; Vector; false; Vector; (Collection); ; Argument[0].Element; Argument[this].Element; value; manual |
+| 334 | Summary: java.util; Vector; true; addElement; (Object); ; Argument[0]; Argument[this].Element; value; manual |
+| 335 | Summary: java.util; Vector; true; copyInto; (Object[]); ; Argument[this].Element; Argument[0].ArrayElement; value; manual |
+| 336 | Summary: java.util; Vector; true; elementAt; (int); ; Argument[this].Element; ReturnValue; value; manual |
+| 337 | Summary: java.util; Vector; true; elements; (); ; Argument[this].Element; ReturnValue.Element; value; manual |
+| 338 | Summary: java.util; Vector; true; firstElement; (); ; Argument[this].Element; ReturnValue; value; manual |
+| 339 | Summary: java.util; Vector; true; insertElementAt; (Object,int); ; Argument[0]; Argument[this].Element; value; manual |
+| 340 | Summary: java.util; Vector; true; lastElement; (); ; Argument[this].Element; ReturnValue; value; manual |
+| 341 | Summary: java.util; Vector; true; setElementAt; (Object,int); ; Argument[0]; Argument[this].Element; value; manual |
+| 342 | Summary: java.util; WeakHashMap; false; WeakHashMap; (Map); ; Argument[0].MapKey; Argument[this].MapKey; value; manual |
+| 343 | Summary: java.util; WeakHashMap; false; WeakHashMap; (Map); ; Argument[0].MapValue; Argument[this].MapValue; value; manual |
 edges
 | B.java:11:37:11:46 | obj : Map [<map.value>] : Object | B.java:11:72:11:74 | obj : Map [<map.value>] : Object | provenance |  |
 | B.java:11:37:11:46 | obj : Object | B.java:11:72:11:74 | obj : Object | provenance |  |
@@ -371,23 +371,23 @@ edges
 | B.java:22:34:22:45 | obj : double[] [[]] : Number | B.java:22:57:22:59 | obj : double[] [[]] : Number | provenance |  |
 | B.java:22:57:22:59 | obj : double[] [[]] : Number | B.java:22:57:22:62 | ...[...] : Number | provenance |  |
 | B.java:24:39:24:43 | obj : Object | B.java:24:63:24:65 | obj : Object | provenance |  |
-| B.java:24:63:24:65 | obj : Object | B.java:24:55:24:66 | of(...) : List [<element>] : Object | provenance | MaD:154 |
+| B.java:24:63:24:65 | obj : Object | B.java:24:55:24:66 | of(...) : List [<element>] : Object | provenance | MaD:151 |
 | B.java:25:53:25:57 | obj : Object | B.java:25:98:25:100 | obj : Object | provenance |  |
 | B.java:25:92:25:92 | v [post update] : Vector [<element>] : Object | B.java:25:111:25:111 | v : Vector [<element>] : Object | provenance |  |
-| B.java:25:98:25:100 | obj : Object | B.java:25:92:25:92 | v [post update] : Vector [<element>] : Object | provenance | MaD:52 |
-| B.java:25:111:25:111 | v : Vector [<element>] : Object | B.java:25:111:25:122 | elements(...) : Enumeration [<element>] : Object | provenance | MaD:335 |
+| B.java:25:98:25:100 | obj : Object | B.java:25:92:25:92 | v [post update] : Vector [<element>] : Object | provenance | MaD:54 |
+| B.java:25:111:25:111 | v : Vector [<element>] : Object | B.java:25:111:25:122 | elements(...) : Enumeration [<element>] : Object | provenance | MaD:337 |
 | B.java:26:49:26:53 | obj : Object | B.java:26:96:26:98 | obj : Object | provenance |  |
 | B.java:26:90:26:90 | s [post update] : TreeSet [<element>] : Object | B.java:26:109:26:109 | s : TreeSet [<element>] : Object | provenance |  |
-| B.java:26:96:26:98 | obj : Object | B.java:26:90:26:90 | s [post update] : TreeSet [<element>] : Object | provenance | MaD:52 |
+| B.java:26:96:26:98 | obj : Object | B.java:26:90:26:90 | s [post update] : TreeSet [<element>] : Object | provenance | MaD:54 |
 | B.java:27:41:27:45 | obj : Object | B.java:27:85:27:87 | obj : Object | provenance |  |
 | B.java:27:78:27:78 | s [post update] : Stack [<element>] : Object | B.java:27:98:27:98 | s : Stack [<element>] : Object | provenance |  |
-| B.java:27:85:27:87 | obj : Object | B.java:27:78:27:78 | s [post update] : Stack [<element>] : Object | provenance | MaD:324 |
+| B.java:27:85:27:87 | obj : Object | B.java:27:78:27:78 | s [post update] : Stack [<element>] : Object | provenance | MaD:326 |
 | B.java:28:57:28:61 | obj : Object | B.java:28:128:28:130 | obj : Object | provenance |  |
 | B.java:28:122:28:122 | q [post update] : LinkedBlockingDeque [<element>] : Object | B.java:28:141:28:141 | q : LinkedBlockingDeque [<element>] : Object | provenance |  |
-| B.java:28:128:28:130 | obj : Object | B.java:28:122:28:122 | q [post update] : LinkedBlockingDeque [<element>] : Object | provenance | MaD:52 |
+| B.java:28:128:28:130 | obj : Object | B.java:28:122:28:122 | q [post update] : LinkedBlockingDeque [<element>] : Object | provenance | MaD:54 |
 | B.java:29:55:29:59 | obj : Object | B.java:29:79:29:81 | obj : Object | provenance |  |
-| B.java:29:71:29:82 | of(...) : List [<element>] : Object | B.java:29:71:29:97 | listIterator(...) : ListIterator [<element>] : Object | provenance | MaD:153 |
-| B.java:29:79:29:81 | obj : Object | B.java:29:71:29:82 | of(...) : List [<element>] : Object | provenance | MaD:154 |
+| B.java:29:71:29:82 | of(...) : List [<element>] : Object | B.java:29:71:29:97 | listIterator(...) : ListIterator [<element>] : Object | provenance | MaD:166 |
+| B.java:29:79:29:81 | obj : Object | B.java:29:71:29:82 | of(...) : List [<element>] : Object | provenance | MaD:151 |
 | B.java:31:28:31:42 | obj : ArrayList [<element>] : Object | B.java:31:54:31:56 | obj : ArrayList [<element>] : Object | provenance |  |
 | B.java:31:28:31:42 | obj : BlockingDeque [<element>] : Object | B.java:31:54:31:56 | obj : BlockingDeque [<element>] : Object | provenance |  |
 | B.java:31:28:31:42 | obj : BlockingQueue [<element>] : Object | B.java:31:54:31:56 | obj : BlockingQueue [<element>] : Object | provenance |  |
@@ -407,2380 +407,2380 @@ edges
 | B.java:31:28:31:42 | obj : Stack [<element>] : Object | B.java:31:54:31:56 | obj : Stack [<element>] : Object | provenance |  |
 | B.java:31:28:31:42 | obj : TransferQueue [<element>] : Object | B.java:31:54:31:56 | obj : TransferQueue [<element>] : Object | provenance |  |
 | B.java:31:28:31:42 | obj : Vector [<element>] : Object | B.java:31:54:31:56 | obj : Vector [<element>] : Object | provenance |  |
-| B.java:31:54:31:56 | obj : ArrayList [<element>] : Object | B.java:31:54:31:67 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:1 |
-| B.java:31:54:31:56 | obj : BlockingDeque [<element>] : Object | B.java:31:54:31:67 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:1 |
-| B.java:31:54:31:56 | obj : BlockingQueue [<element>] : Object | B.java:31:54:31:67 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:1 |
-| B.java:31:54:31:56 | obj : Collection [<element>] : Object | B.java:31:54:31:67 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:1 |
-| B.java:31:54:31:56 | obj : Deque [<element>] : Object | B.java:31:54:31:67 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:1 |
-| B.java:31:54:31:56 | obj : List [<element>] : Object | B.java:31:54:31:67 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:1 |
-| B.java:31:54:31:56 | obj : NavigableSet [<element>] : Object | B.java:31:54:31:67 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:1 |
-| B.java:31:54:31:56 | obj : Queue [<element>] : Object | B.java:31:54:31:67 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:1 |
-| B.java:31:54:31:56 | obj : SequencedCollection [<element>] : Object | B.java:31:54:31:67 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:1 |
-| B.java:31:54:31:56 | obj : SequencedSet [<element>, <map.key>] : Object | B.java:31:54:31:67 | iterator(...) : Iterator [<element>, <map.key>] : Object | provenance | MaD:1 |
-| B.java:31:54:31:56 | obj : SequencedSet [<element>, <map.value>] : Object | B.java:31:54:31:67 | iterator(...) : Iterator [<element>, <map.value>] : Object | provenance | MaD:1 |
-| B.java:31:54:31:56 | obj : SequencedSet [<element>] : Object | B.java:31:54:31:67 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:1 |
-| B.java:31:54:31:56 | obj : Set [<element>, <map.key>] : Object | B.java:31:54:31:67 | iterator(...) : Iterator [<element>, <map.key>] : Object | provenance | MaD:1 |
-| B.java:31:54:31:56 | obj : Set [<element>, <map.value>] : Object | B.java:31:54:31:67 | iterator(...) : Iterator [<element>, <map.value>] : Object | provenance | MaD:1 |
-| B.java:31:54:31:56 | obj : Set [<element>] : Object | B.java:31:54:31:67 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:1 |
-| B.java:31:54:31:56 | obj : SortedSet [<element>] : Object | B.java:31:54:31:67 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:1 |
-| B.java:31:54:31:56 | obj : Stack [<element>] : Object | B.java:31:54:31:67 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:1 |
-| B.java:31:54:31:56 | obj : TransferQueue [<element>] : Object | B.java:31:54:31:67 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:1 |
-| B.java:31:54:31:56 | obj : Vector [<element>] : Object | B.java:31:54:31:67 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:1 |
-| B.java:31:54:31:67 | iterator(...) : Iterator [<element>, <map.key>] : Object | B.java:31:54:31:74 | next(...) : Object [<map.key>] : Object | provenance | MaD:143 |
-| B.java:31:54:31:67 | iterator(...) : Iterator [<element>, <map.key>] : Object | B.java:31:54:31:74 | next(...) : Object [<map.key>] : Object | provenance | MaD:143 |
-| B.java:31:54:31:67 | iterator(...) : Iterator [<element>, <map.value>] : Object | B.java:31:54:31:74 | next(...) : Object [<map.value>] : Object | provenance | MaD:143 |
-| B.java:31:54:31:67 | iterator(...) : Iterator [<element>, <map.value>] : Object | B.java:31:54:31:74 | next(...) : Object [<map.value>] : Object | provenance | MaD:143 |
-| B.java:31:54:31:67 | iterator(...) : Iterator [<element>] : Object | B.java:31:54:31:74 | next(...) : Object | provenance | MaD:143 |
-| B.java:31:54:31:67 | iterator(...) : Iterator [<element>] : Object | B.java:31:54:31:74 | next(...) : Object | provenance | MaD:143 |
-| B.java:31:54:31:67 | iterator(...) : Iterator [<element>] : Object | B.java:31:54:31:74 | next(...) : Object | provenance | MaD:143 |
-| B.java:31:54:31:67 | iterator(...) : Iterator [<element>] : Object | B.java:31:54:31:74 | next(...) : Object | provenance | MaD:143 |
-| B.java:31:54:31:67 | iterator(...) : Iterator [<element>] : Object | B.java:31:54:31:74 | next(...) : Object | provenance | MaD:143 |
-| B.java:31:54:31:67 | iterator(...) : Iterator [<element>] : Object | B.java:31:54:31:74 | next(...) : Object | provenance | MaD:143 |
-| B.java:31:54:31:67 | iterator(...) : Iterator [<element>] : Object | B.java:31:54:31:74 | next(...) : Object | provenance | MaD:143 |
-| B.java:31:54:31:67 | iterator(...) : Iterator [<element>] : Object | B.java:31:54:31:74 | next(...) : Object | provenance | MaD:143 |
-| B.java:31:54:31:67 | iterator(...) : Iterator [<element>] : Object | B.java:31:54:31:74 | next(...) : Object | provenance | MaD:143 |
-| B.java:31:54:31:67 | iterator(...) : Iterator [<element>] : Object | B.java:31:54:31:74 | next(...) : Object | provenance | MaD:143 |
-| B.java:31:54:31:67 | iterator(...) : Iterator [<element>] : Object | B.java:31:54:31:74 | next(...) : Object | provenance | MaD:143 |
-| B.java:31:54:31:67 | iterator(...) : Iterator [<element>] : Object | B.java:31:54:31:74 | next(...) : Object | provenance | MaD:143 |
-| B.java:31:54:31:67 | iterator(...) : Iterator [<element>] : Object | B.java:31:54:31:74 | next(...) : Object | provenance | MaD:143 |
-| B.java:31:54:31:67 | iterator(...) : Iterator [<element>] : Object | B.java:31:54:31:74 | next(...) : Object | provenance | MaD:143 |
-| B.java:31:54:31:67 | iterator(...) : Iterator [<element>] : Object | B.java:31:54:31:74 | next(...) : Object | provenance | MaD:143 |
+| B.java:31:54:31:56 | obj : ArrayList [<element>] : Object | B.java:31:54:31:67 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:3 |
+| B.java:31:54:31:56 | obj : BlockingDeque [<element>] : Object | B.java:31:54:31:67 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:3 |
+| B.java:31:54:31:56 | obj : BlockingQueue [<element>] : Object | B.java:31:54:31:67 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:3 |
+| B.java:31:54:31:56 | obj : Collection [<element>] : Object | B.java:31:54:31:67 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:3 |
+| B.java:31:54:31:56 | obj : Deque [<element>] : Object | B.java:31:54:31:67 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:3 |
+| B.java:31:54:31:56 | obj : List [<element>] : Object | B.java:31:54:31:67 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:3 |
+| B.java:31:54:31:56 | obj : NavigableSet [<element>] : Object | B.java:31:54:31:67 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:3 |
+| B.java:31:54:31:56 | obj : Queue [<element>] : Object | B.java:31:54:31:67 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:3 |
+| B.java:31:54:31:56 | obj : SequencedCollection [<element>] : Object | B.java:31:54:31:67 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:3 |
+| B.java:31:54:31:56 | obj : SequencedSet [<element>, <map.key>] : Object | B.java:31:54:31:67 | iterator(...) : Iterator [<element>, <map.key>] : Object | provenance | MaD:3 |
+| B.java:31:54:31:56 | obj : SequencedSet [<element>, <map.value>] : Object | B.java:31:54:31:67 | iterator(...) : Iterator [<element>, <map.value>] : Object | provenance | MaD:3 |
+| B.java:31:54:31:56 | obj : SequencedSet [<element>] : Object | B.java:31:54:31:67 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:3 |
+| B.java:31:54:31:56 | obj : Set [<element>, <map.key>] : Object | B.java:31:54:31:67 | iterator(...) : Iterator [<element>, <map.key>] : Object | provenance | MaD:3 |
+| B.java:31:54:31:56 | obj : Set [<element>, <map.value>] : Object | B.java:31:54:31:67 | iterator(...) : Iterator [<element>, <map.value>] : Object | provenance | MaD:3 |
+| B.java:31:54:31:56 | obj : Set [<element>] : Object | B.java:31:54:31:67 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:3 |
+| B.java:31:54:31:56 | obj : SortedSet [<element>] : Object | B.java:31:54:31:67 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:3 |
+| B.java:31:54:31:56 | obj : Stack [<element>] : Object | B.java:31:54:31:67 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:3 |
+| B.java:31:54:31:56 | obj : TransferQueue [<element>] : Object | B.java:31:54:31:67 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:3 |
+| B.java:31:54:31:56 | obj : Vector [<element>] : Object | B.java:31:54:31:67 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:3 |
+| B.java:31:54:31:67 | iterator(...) : Iterator [<element>, <map.key>] : Object | B.java:31:54:31:74 | next(...) : Object [<map.key>] : Object | provenance | MaD:145 |
+| B.java:31:54:31:67 | iterator(...) : Iterator [<element>, <map.key>] : Object | B.java:31:54:31:74 | next(...) : Object [<map.key>] : Object | provenance | MaD:145 |
+| B.java:31:54:31:67 | iterator(...) : Iterator [<element>, <map.value>] : Object | B.java:31:54:31:74 | next(...) : Object [<map.value>] : Object | provenance | MaD:145 |
+| B.java:31:54:31:67 | iterator(...) : Iterator [<element>, <map.value>] : Object | B.java:31:54:31:74 | next(...) : Object [<map.value>] : Object | provenance | MaD:145 |
+| B.java:31:54:31:67 | iterator(...) : Iterator [<element>] : Object | B.java:31:54:31:74 | next(...) : Object | provenance | MaD:145 |
+| B.java:31:54:31:67 | iterator(...) : Iterator [<element>] : Object | B.java:31:54:31:74 | next(...) : Object | provenance | MaD:145 |
+| B.java:31:54:31:67 | iterator(...) : Iterator [<element>] : Object | B.java:31:54:31:74 | next(...) : Object | provenance | MaD:145 |
+| B.java:31:54:31:67 | iterator(...) : Iterator [<element>] : Object | B.java:31:54:31:74 | next(...) : Object | provenance | MaD:145 |
+| B.java:31:54:31:67 | iterator(...) : Iterator [<element>] : Object | B.java:31:54:31:74 | next(...) : Object | provenance | MaD:145 |
+| B.java:31:54:31:67 | iterator(...) : Iterator [<element>] : Object | B.java:31:54:31:74 | next(...) : Object | provenance | MaD:145 |
+| B.java:31:54:31:67 | iterator(...) : Iterator [<element>] : Object | B.java:31:54:31:74 | next(...) : Object | provenance | MaD:145 |
+| B.java:31:54:31:67 | iterator(...) : Iterator [<element>] : Object | B.java:31:54:31:74 | next(...) : Object | provenance | MaD:145 |
+| B.java:31:54:31:67 | iterator(...) : Iterator [<element>] : Object | B.java:31:54:31:74 | next(...) : Object | provenance | MaD:145 |
+| B.java:31:54:31:67 | iterator(...) : Iterator [<element>] : Object | B.java:31:54:31:74 | next(...) : Object | provenance | MaD:145 |
+| B.java:31:54:31:67 | iterator(...) : Iterator [<element>] : Object | B.java:31:54:31:74 | next(...) : Object | provenance | MaD:145 |
+| B.java:31:54:31:67 | iterator(...) : Iterator [<element>] : Object | B.java:31:54:31:74 | next(...) : Object | provenance | MaD:145 |
+| B.java:31:54:31:67 | iterator(...) : Iterator [<element>] : Object | B.java:31:54:31:74 | next(...) : Object | provenance | MaD:145 |
+| B.java:31:54:31:67 | iterator(...) : Iterator [<element>] : Object | B.java:31:54:31:74 | next(...) : Object | provenance | MaD:145 |
+| B.java:31:54:31:67 | iterator(...) : Iterator [<element>] : Object | B.java:31:54:31:74 | next(...) : Object | provenance | MaD:145 |
 | B.java:32:28:32:42 | obj : Iterator [<element>] : Object | B.java:32:54:32:56 | obj : Iterator [<element>] : Object | provenance |  |
 | B.java:32:28:32:42 | obj : ListIterator [<element>] : Object | B.java:32:54:32:56 | obj : ListIterator [<element>] : Object | provenance |  |
-| B.java:32:54:32:56 | obj : Iterator [<element>] : Object | B.java:32:54:32:63 | next(...) : Object | provenance | MaD:143 |
-| B.java:32:54:32:56 | obj : ListIterator [<element>] : Object | B.java:32:54:32:63 | next(...) : Object | provenance | MaD:143 |
+| B.java:32:54:32:56 | obj : Iterator [<element>] : Object | B.java:32:54:32:63 | next(...) : Object | provenance | MaD:145 |
+| B.java:32:54:32:56 | obj : ListIterator [<element>] : Object | B.java:32:54:32:63 | next(...) : Object | provenance | MaD:145 |
 | B.java:35:28:35:45 | obj : Enumeration [<element>] : Object | B.java:35:57:35:59 | obj : Enumeration [<element>] : Object | provenance |  |
-| B.java:35:57:35:59 | obj : Enumeration [<element>] : Object | B.java:35:57:35:73 | nextElement(...) : Object | provenance | MaD:135 |
+| B.java:35:57:35:59 | obj : Enumeration [<element>] : Object | B.java:35:57:35:73 | nextElement(...) : Object | provenance | MaD:137 |
 | B.java:37:48:37:52 | obj : Object | B.java:37:74:37:76 | obj : Object | provenance |  |
-| B.java:37:74:37:76 | obj : Object | B.java:37:64:37:82 | entry(...) : Entry [<map.key>] : Object | provenance | MaD:177 |
+| B.java:37:74:37:76 | obj : Object | B.java:37:64:37:82 | entry(...) : Entry [<map.key>] : Object | provenance | MaD:180 |
 | B.java:38:37:38:41 | obj : Object | B.java:38:85:38:87 | obj : Object | provenance |  |
 | B.java:38:79:38:79 | m [post update] : TreeMap [<map.key>] : Object | B.java:38:103:38:103 | m : TreeMap [<map.key>] : Object | provenance |  |
-| B.java:38:85:38:87 | obj : Object | B.java:38:79:38:79 | m [post update] : TreeMap [<map.key>] : Object | provenance | MaD:209 |
+| B.java:38:85:38:87 | obj : Object | B.java:38:79:38:79 | m [post update] : TreeMap [<map.key>] : Object | provenance | MaD:214 |
 | B.java:40:50:40:54 | obj : Object | B.java:40:81:40:83 | obj : Object | provenance |  |
-| B.java:40:81:40:83 | obj : Object | B.java:40:66:40:84 | entry(...) : Entry [<map.value>] : Object | provenance | MaD:178 |
+| B.java:40:81:40:83 | obj : Object | B.java:40:66:40:84 | entry(...) : Entry [<map.value>] : Object | provenance | MaD:181 |
 | B.java:41:39:41:43 | obj : Object | B.java:41:126:41:128 | obj : Object | provenance |  |
 | B.java:41:115:41:115 | m [post update] : Map [<map.value>] : Object | B.java:41:139:41:139 | m : Map [<map.value>] : Object | provenance |  |
-| B.java:41:126:41:128 | obj : Object | B.java:41:115:41:115 | m [post update] : Map [<map.value>] : Object | provenance | MaD:210 |
+| B.java:41:126:41:128 | obj : Object | B.java:41:115:41:115 | m [post update] : Map [<map.value>] : Object | provenance | MaD:215 |
 | B.java:43:29:43:46 | obj : Entry [<map.key>] : Object | B.java:43:58:43:60 | obj : Entry [<map.key>] : Object | provenance |  |
-| B.java:43:58:43:60 | obj : Entry [<map.key>] : Object | B.java:43:58:43:69 | getKey(...) : Object | provenance | MaD:223 |
+| B.java:43:58:43:60 | obj : Entry [<map.key>] : Object | B.java:43:58:43:69 | getKey(...) : Object | provenance | MaD:174 |
 | B.java:44:29:44:40 | obj : Map [<map.key>] : Object | B.java:44:52:44:54 | obj : Map [<map.key>] : Object | provenance |  |
 | B.java:44:29:44:40 | obj : NavigableMap [<map.key>] : Object | B.java:44:52:44:54 | obj : NavigableMap [<map.key>] : Object | provenance |  |
 | B.java:44:29:44:40 | obj : SequencedMap [<map.key>] : Object | B.java:44:52:44:54 | obj : SequencedMap [<map.key>] : Object | provenance |  |
 | B.java:44:29:44:40 | obj : SortedMap [<map.key>] : Object | B.java:44:52:44:54 | obj : SortedMap [<map.key>] : Object | provenance |  |
-| B.java:44:52:44:54 | obj : Map [<map.key>] : Object | B.java:44:52:44:63 | keySet(...) : Set [<element>] : Object | provenance | MaD:184 |
-| B.java:44:52:44:54 | obj : NavigableMap [<map.key>] : Object | B.java:44:52:44:63 | keySet(...) : Set [<element>] : Object | provenance | MaD:184 |
-| B.java:44:52:44:54 | obj : SequencedMap [<map.key>] : Object | B.java:44:52:44:63 | keySet(...) : Set [<element>] : Object | provenance | MaD:184 |
-| B.java:44:52:44:54 | obj : SortedMap [<map.key>] : Object | B.java:44:52:44:63 | keySet(...) : Set [<element>] : Object | provenance | MaD:184 |
-| B.java:44:52:44:63 | keySet(...) : Set [<element>] : Object | B.java:44:52:44:74 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:1 |
-| B.java:44:52:44:63 | keySet(...) : Set [<element>] : Object | B.java:44:52:44:74 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:1 |
-| B.java:44:52:44:63 | keySet(...) : Set [<element>] : Object | B.java:44:52:44:74 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:1 |
-| B.java:44:52:44:63 | keySet(...) : Set [<element>] : Object | B.java:44:52:44:74 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:1 |
-| B.java:44:52:44:74 | iterator(...) : Iterator [<element>] : Object | B.java:44:52:44:81 | next(...) : Object | provenance | MaD:143 |
-| B.java:44:52:44:74 | iterator(...) : Iterator [<element>] : Object | B.java:44:52:44:81 | next(...) : Object | provenance | MaD:143 |
-| B.java:44:52:44:74 | iterator(...) : Iterator [<element>] : Object | B.java:44:52:44:81 | next(...) : Object | provenance | MaD:143 |
-| B.java:44:52:44:74 | iterator(...) : Iterator [<element>] : Object | B.java:44:52:44:81 | next(...) : Object | provenance | MaD:143 |
+| B.java:44:52:44:54 | obj : Map [<map.key>] : Object | B.java:44:52:44:63 | keySet(...) : Set [<element>] : Object | provenance | MaD:212 |
+| B.java:44:52:44:54 | obj : NavigableMap [<map.key>] : Object | B.java:44:52:44:63 | keySet(...) : Set [<element>] : Object | provenance | MaD:212 |
+| B.java:44:52:44:54 | obj : SequencedMap [<map.key>] : Object | B.java:44:52:44:63 | keySet(...) : Set [<element>] : Object | provenance | MaD:212 |
+| B.java:44:52:44:54 | obj : SortedMap [<map.key>] : Object | B.java:44:52:44:63 | keySet(...) : Set [<element>] : Object | provenance | MaD:212 |
+| B.java:44:52:44:63 | keySet(...) : Set [<element>] : Object | B.java:44:52:44:74 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:3 |
+| B.java:44:52:44:63 | keySet(...) : Set [<element>] : Object | B.java:44:52:44:74 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:3 |
+| B.java:44:52:44:63 | keySet(...) : Set [<element>] : Object | B.java:44:52:44:74 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:3 |
+| B.java:44:52:44:63 | keySet(...) : Set [<element>] : Object | B.java:44:52:44:74 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:3 |
+| B.java:44:52:44:74 | iterator(...) : Iterator [<element>] : Object | B.java:44:52:44:81 | next(...) : Object | provenance | MaD:145 |
+| B.java:44:52:44:74 | iterator(...) : Iterator [<element>] : Object | B.java:44:52:44:81 | next(...) : Object | provenance | MaD:145 |
+| B.java:44:52:44:74 | iterator(...) : Iterator [<element>] : Object | B.java:44:52:44:81 | next(...) : Object | provenance | MaD:145 |
+| B.java:44:52:44:74 | iterator(...) : Iterator [<element>] : Object | B.java:44:52:44:81 | next(...) : Object | provenance | MaD:145 |
 | B.java:45:29:45:47 | obj : Dictionary [<map.key>] : Object | B.java:45:59:45:61 | obj : Dictionary [<map.key>] : Object | provenance |  |
-| B.java:45:59:45:61 | obj : Dictionary [<map.key>] : Object | B.java:45:59:45:68 | keys(...) : Enumeration [<element>] : Object | provenance | MaD:125 |
-| B.java:45:59:45:68 | keys(...) : Enumeration [<element>] : Object | B.java:45:59:45:82 | nextElement(...) : Object | provenance | MaD:135 |
+| B.java:45:59:45:61 | obj : Dictionary [<map.key>] : Object | B.java:45:59:45:68 | keys(...) : Enumeration [<element>] : Object | provenance | MaD:127 |
+| B.java:45:59:45:68 | keys(...) : Enumeration [<element>] : Object | B.java:45:59:45:82 | nextElement(...) : Object | provenance | MaD:137 |
 | B.java:47:31:47:48 | obj : Entry [<map.value>] : Object | B.java:47:60:47:62 | obj : Entry [<map.value>] : Object | provenance |  |
-| B.java:47:60:47:62 | obj : Entry [<map.value>] : Object | B.java:47:60:47:73 | getValue(...) : Object | provenance | MaD:224 |
+| B.java:47:60:47:62 | obj : Entry [<map.value>] : Object | B.java:47:60:47:73 | getValue(...) : Object | provenance | MaD:175 |
 | B.java:48:31:48:42 | obj : Map [<map.value>] : Object | B.java:48:54:48:56 | obj : Map [<map.value>] : Object | provenance |  |
 | B.java:48:31:48:42 | obj : NavigableMap [<map.value>] : Object | B.java:48:54:48:56 | obj : NavigableMap [<map.value>] : Object | provenance |  |
 | B.java:48:31:48:42 | obj : SequencedMap [<map.value>] : Object | B.java:48:54:48:56 | obj : SequencedMap [<map.value>] : Object | provenance |  |
 | B.java:48:31:48:42 | obj : SortedMap [<map.value>] : Object | B.java:48:54:48:56 | obj : SortedMap [<map.value>] : Object | provenance |  |
-| B.java:48:54:48:56 | obj : Map [<map.value>] : Object | B.java:48:54:48:66 | get(...) : Object | provenance | MaD:181 |
-| B.java:48:54:48:56 | obj : NavigableMap [<map.value>] : Object | B.java:48:54:48:66 | get(...) : Object | provenance | MaD:181 |
-| B.java:48:54:48:56 | obj : SequencedMap [<map.value>] : Object | B.java:48:54:48:66 | get(...) : Object | provenance | MaD:181 |
-| B.java:48:54:48:56 | obj : SortedMap [<map.value>] : Object | B.java:48:54:48:66 | get(...) : Object | provenance | MaD:181 |
+| B.java:48:54:48:56 | obj : Map [<map.value>] : Object | B.java:48:54:48:66 | get(...) : Object | provenance | MaD:209 |
+| B.java:48:54:48:56 | obj : NavigableMap [<map.value>] : Object | B.java:48:54:48:66 | get(...) : Object | provenance | MaD:209 |
+| B.java:48:54:48:56 | obj : SequencedMap [<map.value>] : Object | B.java:48:54:48:66 | get(...) : Object | provenance | MaD:209 |
+| B.java:48:54:48:56 | obj : SortedMap [<map.value>] : Object | B.java:48:54:48:66 | get(...) : Object | provenance | MaD:209 |
 | B.java:49:31:49:49 | obj : Dictionary [<map.value>] : Object | B.java:49:61:49:63 | obj : Dictionary [<map.value>] : Object | provenance |  |
-| B.java:49:61:49:63 | obj : Dictionary [<map.value>] : Object | B.java:49:61:49:73 | get(...) : Object | provenance | MaD:124 |
+| B.java:49:61:49:63 | obj : Dictionary [<map.value>] : Object | B.java:49:61:49:73 | get(...) : Object | provenance | MaD:126 |
 | B.java:55:19:55:44 | storeMapKeyEntry(...) : Entry [<map.key>] : Object | B.java:55:54:55:66 | (...)... : Entry [<map.key>] : Object | provenance |  |
 | B.java:55:36:55:43 | source(...) : Object | B.java:37:48:37:52 | obj : Object | provenance |  |
-| B.java:55:36:55:43 | source(...) : Object | B.java:55:19:55:44 | storeMapKeyEntry(...) : Entry [<map.key>] : Object | provenance | MaD:177 |
+| B.java:55:36:55:43 | source(...) : Object | B.java:55:19:55:44 | storeMapKeyEntry(...) : Entry [<map.key>] : Object | provenance | MaD:180 |
 | B.java:55:53:55:76 | getKey(...) : Object | B.java:55:84:55:86 | out | provenance |  |
-| B.java:55:54:55:66 | (...)... : Entry [<map.key>] : Object | B.java:55:53:55:76 | getKey(...) : Object | provenance | MaD:223 |
+| B.java:55:54:55:66 | (...)... : Entry [<map.key>] : Object | B.java:55:53:55:76 | getKey(...) : Object | provenance | MaD:174 |
 | B.java:60:19:60:46 | storeMapValueEntry(...) : Entry [<map.value>] : Object | B.java:60:56:60:68 | (...)... : Entry [<map.value>] : Object | provenance |  |
 | B.java:60:38:60:45 | source(...) : Object | B.java:40:50:40:54 | obj : Object | provenance |  |
-| B.java:60:38:60:45 | source(...) : Object | B.java:60:19:60:46 | storeMapValueEntry(...) : Entry [<map.value>] : Object | provenance | MaD:178 |
+| B.java:60:38:60:45 | source(...) : Object | B.java:60:19:60:46 | storeMapValueEntry(...) : Entry [<map.value>] : Object | provenance | MaD:181 |
 | B.java:60:55:60:80 | getValue(...) : Object | B.java:60:88:60:90 | out | provenance |  |
-| B.java:60:56:60:68 | (...)... : Entry [<map.value>] : Object | B.java:60:55:60:80 | getValue(...) : Object | provenance | MaD:224 |
+| B.java:60:56:60:68 | (...)... : Entry [<map.value>] : Object | B.java:60:55:60:80 | getValue(...) : Object | provenance | MaD:175 |
 | B.java:65:19:65:46 | storeMapValueEntry(...) : Entry [<map.value>] : Object | B.java:65:56:65:68 | (...)... : Entry [<map.value>] : Object | provenance |  |
 | B.java:65:38:65:45 | source(...) : Object | B.java:40:50:40:54 | obj : Object | provenance |  |
-| B.java:65:38:65:45 | source(...) : Object | B.java:65:19:65:46 | storeMapValueEntry(...) : Entry [<map.value>] : Object | provenance | MaD:178 |
+| B.java:65:38:65:45 | source(...) : Object | B.java:65:19:65:46 | storeMapValueEntry(...) : Entry [<map.value>] : Object | provenance | MaD:181 |
 | B.java:65:55:65:84 | setValue(...) : Object | B.java:65:92:65:94 | out | provenance |  |
-| B.java:65:56:65:68 | (...)... : Entry [<map.value>] : Object | B.java:65:55:65:84 | setValue(...) : Object | provenance | MaD:225 |
+| B.java:65:56:65:68 | (...)... : Entry [<map.value>] : Object | B.java:65:55:65:84 | setValue(...) : Object | provenance | MaD:177 |
 | B.java:70:19:70:26 | source(...) : Object | B.java:70:42:70:43 | in : Object | provenance |  |
 | B.java:70:29:70:31 | out [post update] : Entry [<map.value>] : Object | B.java:70:65:70:67 | out : Entry [<map.value>] : Object | provenance |  |
-| B.java:70:42:70:43 | in : Object | B.java:70:29:70:31 | out [post update] : Entry [<map.value>] : Object | provenance | MaD:226 |
+| B.java:70:42:70:43 | in : Object | B.java:70:29:70:31 | out [post update] : Entry [<map.value>] : Object | provenance | MaD:176 |
 | B.java:70:65:70:67 | out : Entry [<map.value>] : Object | B.java:47:31:47:48 | obj : Entry [<map.value>] : Object | provenance |  |
-| B.java:70:65:70:67 | out : Entry [<map.value>] : Object | B.java:70:52:70:68 | readMapValue(...) | provenance | MaD:224 |
+| B.java:70:65:70:67 | out : Entry [<map.value>] : Object | B.java:70:52:70:68 | readMapValue(...) | provenance | MaD:175 |
 | B.java:75:21:75:46 | storeElementList(...) : List [<element>] : Object | B.java:75:55:75:56 | in : List [<element>] : Object | provenance |  |
 | B.java:75:38:75:45 | source(...) : Object | B.java:24:39:24:43 | obj : Object | provenance |  |
-| B.java:75:38:75:45 | source(...) : Object | B.java:75:21:75:46 | storeElementList(...) : List [<element>] : Object | provenance | MaD:154 |
-| B.java:75:55:75:56 | in : List [<element>] : Object | B.java:75:55:75:67 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:1 |
+| B.java:75:38:75:45 | source(...) : Object | B.java:75:21:75:46 | storeElementList(...) : List [<element>] : Object | provenance | MaD:151 |
+| B.java:75:55:75:56 | in : List [<element>] : Object | B.java:75:55:75:67 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:3 |
 | B.java:75:55:75:67 | iterator(...) : Iterator [<element>] : Object | B.java:75:87:75:89 | out : Iterator [<element>] : Object | provenance |  |
 | B.java:75:87:75:89 | out : Iterator [<element>] : Object | B.java:32:28:32:42 | obj : Iterator [<element>] : Object | provenance |  |
-| B.java:75:87:75:89 | out : Iterator [<element>] : Object | B.java:75:75:75:90 | readElement(...) | provenance | MaD:143 |
+| B.java:75:87:75:89 | out : Iterator [<element>] : Object | B.java:75:75:75:90 | readElement(...) | provenance | MaD:145 |
 | B.java:80:21:80:46 | storeElementList(...) : List [<element>] : Object | B.java:80:55:80:56 | in : List [<element>] : Object | provenance |  |
 | B.java:80:38:80:45 | source(...) : Object | B.java:24:39:24:43 | obj : Object | provenance |  |
-| B.java:80:38:80:45 | source(...) : Object | B.java:80:21:80:46 | storeElementList(...) : List [<element>] : Object | provenance | MaD:154 |
-| B.java:80:55:80:56 | in : List [<element>] : Object | B.java:80:55:80:70 | spliterator(...) : Spliterator [<element>] : Object | provenance | MaD:2 |
+| B.java:80:38:80:45 | source(...) : Object | B.java:80:21:80:46 | storeElementList(...) : List [<element>] : Object | provenance | MaD:151 |
+| B.java:80:55:80:56 | in : List [<element>] : Object | B.java:80:55:80:70 | spliterator(...) : Spliterator [<element>] : Object | provenance | MaD:4 |
 | B.java:80:55:80:70 | spliterator(...) : Spliterator [<element>] : Object | B.java:80:90:80:92 | out : Spliterator [<element>] : Object | provenance |  |
-| B.java:80:90:80:92 | out : Spliterator [<element>] : Object | B.java:80:78:80:93 | readElement(...) | provenance | MaD:342 |
+| B.java:80:90:80:92 | out : Spliterator [<element>] : Object | B.java:80:78:80:93 | readElement(...) | provenance | MaD:1 |
 | B.java:85:21:85:54 | storeElementListIterator(...) : ListIterator [<element>] : Object | B.java:85:63:85:64 | in : ListIterator [<element>] : Object | provenance |  |
 | B.java:85:46:85:53 | source(...) : Object | B.java:29:55:29:59 | obj : Object | provenance |  |
-| B.java:85:46:85:53 | source(...) : Object | B.java:85:21:85:54 | storeElementListIterator(...) : ListIterator [<element>] : Object | provenance | MaD:154 |
-| B.java:85:63:85:64 | in : ListIterator [<element>] : Object | B.java:85:63:85:71 | next(...) : Object | provenance | MaD:143 |
+| B.java:85:46:85:53 | source(...) : Object | B.java:85:21:85:54 | storeElementListIterator(...) : ListIterator [<element>] : Object | provenance | MaD:151 |
+| B.java:85:63:85:64 | in : ListIterator [<element>] : Object | B.java:85:63:85:71 | next(...) : Object | provenance | MaD:145 |
 | B.java:85:63:85:71 | next(...) : Object | B.java:85:79:85:81 | out | provenance |  |
 | B.java:90:25:90:58 | storeElementListIterator(...) : ListIterator [<element>] : Object | B.java:90:67:90:68 | in : ListIterator [<element>] : Object | provenance |  |
 | B.java:90:50:90:57 | source(...) : Object | B.java:29:55:29:59 | obj : Object | provenance |  |
-| B.java:90:50:90:57 | source(...) : Object | B.java:90:25:90:58 | storeElementListIterator(...) : ListIterator [<element>] : Object | provenance | MaD:154 |
-| B.java:90:67:90:68 | in : ListIterator [<element>] : Object | B.java:90:67:90:79 | previous(...) : Object | provenance | MaD:170 |
+| B.java:90:50:90:57 | source(...) : Object | B.java:90:25:90:58 | storeElementListIterator(...) : ListIterator [<element>] : Object | provenance | MaD:151 |
+| B.java:90:67:90:68 | in : ListIterator [<element>] : Object | B.java:90:67:90:79 | previous(...) : Object | provenance | MaD:172 |
 | B.java:90:67:90:79 | previous(...) : Object | B.java:90:87:90:89 | out | provenance |  |
 | B.java:95:19:95:26 | source(...) : Object | B.java:95:37:95:38 | in : Object | provenance |  |
 | B.java:95:29:95:31 | out [post update] : ListIterator [<element>] : Object | B.java:95:59:95:61 | out : ListIterator [<element>] : Object | provenance |  |
-| B.java:95:37:95:38 | in : Object | B.java:95:29:95:31 | out [post update] : ListIterator [<element>] : Object | provenance | MaD:169 |
+| B.java:95:37:95:38 | in : Object | B.java:95:29:95:31 | out [post update] : ListIterator [<element>] : Object | provenance | MaD:171 |
 | B.java:95:59:95:61 | out : ListIterator [<element>] : Object | B.java:32:28:32:42 | obj : ListIterator [<element>] : Object | provenance |  |
-| B.java:95:59:95:61 | out : ListIterator [<element>] : Object | B.java:95:47:95:62 | readElement(...) | provenance | MaD:143 |
+| B.java:95:59:95:61 | out : ListIterator [<element>] : Object | B.java:95:47:95:62 | readElement(...) | provenance | MaD:145 |
 | B.java:100:19:100:26 | source(...) : Object | B.java:100:37:100:38 | in : Object | provenance |  |
 | B.java:100:29:100:31 | out [post update] : ListIterator [<element>] : Object | B.java:100:59:100:61 | out : ListIterator [<element>] : Object | provenance |  |
-| B.java:100:37:100:38 | in : Object | B.java:100:29:100:31 | out [post update] : ListIterator [<element>] : Object | provenance | MaD:171 |
+| B.java:100:37:100:38 | in : Object | B.java:100:29:100:31 | out [post update] : ListIterator [<element>] : Object | provenance | MaD:173 |
 | B.java:100:59:100:61 | out : ListIterator [<element>] : Object | B.java:32:28:32:42 | obj : ListIterator [<element>] : Object | provenance |  |
-| B.java:100:59:100:61 | out : ListIterator [<element>] : Object | B.java:100:47:100:62 | readElement(...) | provenance | MaD:143 |
+| B.java:100:59:100:61 | out : ListIterator [<element>] : Object | B.java:100:47:100:62 | readElement(...) | provenance | MaD:145 |
 | B.java:105:24:105:56 | storeElementEnumeration(...) : Enumeration [<element>] : Object | B.java:105:65:105:66 | in : Enumeration [<element>] : Object | provenance |  |
 | B.java:105:48:105:55 | source(...) : Object | B.java:25:53:25:57 | obj : Object | provenance |  |
-| B.java:105:48:105:55 | source(...) : Object | B.java:105:24:105:56 | storeElementEnumeration(...) : Enumeration [<element>] : Object | provenance | MaD:52 |
-| B.java:105:65:105:66 | in : Enumeration [<element>] : Object | B.java:105:65:105:79 | asIterator(...) : Iterator [<element>] : Object | provenance | MaD:134 |
+| B.java:105:48:105:55 | source(...) : Object | B.java:105:24:105:56 | storeElementEnumeration(...) : Enumeration [<element>] : Object | provenance | MaD:54 |
+| B.java:105:65:105:66 | in : Enumeration [<element>] : Object | B.java:105:65:105:79 | asIterator(...) : Iterator [<element>] : Object | provenance | MaD:136 |
 | B.java:105:65:105:79 | asIterator(...) : Iterator [<element>] : Object | B.java:105:99:105:101 | out : Iterator [<element>] : Object | provenance |  |
 | B.java:105:99:105:101 | out : Iterator [<element>] : Object | B.java:32:28:32:42 | obj : Iterator [<element>] : Object | provenance |  |
-| B.java:105:99:105:101 | out : Iterator [<element>] : Object | B.java:105:87:105:102 | readElement(...) | provenance | MaD:143 |
+| B.java:105:99:105:101 | out : Iterator [<element>] : Object | B.java:105:87:105:102 | readElement(...) | provenance | MaD:145 |
 | B.java:110:24:110:56 | storeElementEnumeration(...) : Enumeration [<element>] : Object | B.java:110:65:110:66 | in : Enumeration [<element>] : Object | provenance |  |
 | B.java:110:48:110:55 | source(...) : Object | B.java:25:53:25:57 | obj : Object | provenance |  |
-| B.java:110:48:110:55 | source(...) : Object | B.java:110:24:110:56 | storeElementEnumeration(...) : Enumeration [<element>] : Object | provenance | MaD:52 |
-| B.java:110:65:110:66 | in : Enumeration [<element>] : Object | B.java:110:65:110:80 | nextElement(...) : Object | provenance | MaD:135 |
+| B.java:110:48:110:55 | source(...) : Object | B.java:110:24:110:56 | storeElementEnumeration(...) : Enumeration [<element>] : Object | provenance | MaD:54 |
+| B.java:110:65:110:66 | in : Enumeration [<element>] : Object | B.java:110:65:110:80 | nextElement(...) : Object | provenance | MaD:137 |
 | B.java:110:65:110:80 | nextElement(...) : Object | B.java:110:88:110:90 | out | provenance |  |
 | B.java:115:19:115:41 | storeMapValue(...) : Map [<map.value>] : Object | B.java:115:51:115:57 | (...)... : Map [<map.value>] : Object | provenance |  |
 | B.java:115:33:115:40 | source(...) : Object | B.java:41:39:41:43 | obj : Object | provenance |  |
-| B.java:115:33:115:40 | source(...) : Object | B.java:115:19:115:41 | storeMapValue(...) : Map [<map.value>] : Object | provenance | MaD:210 |
+| B.java:115:33:115:40 | source(...) : Object | B.java:115:19:115:41 | storeMapValue(...) : Map [<map.value>] : Object | provenance | MaD:215 |
 | B.java:115:50:115:85 | computeIfAbsent(...) : Object | B.java:115:93:115:95 | out | provenance |  |
-| B.java:115:51:115:57 | (...)... : Map [<map.value>] : Object | B.java:115:50:115:85 | computeIfAbsent(...) : Object | provenance | MaD:172 |
+| B.java:115:51:115:57 | (...)... : Map [<map.value>] : Object | B.java:115:50:115:85 | computeIfAbsent(...) : Object | provenance | MaD:206 |
 | B.java:119:20:119:66 | computeIfAbsent(...) : Object | B.java:119:74:119:76 | out | provenance |  |
-| B.java:119:58:119:65 | source(...) : Object | B.java:119:20:119:66 | computeIfAbsent(...) : Object | provenance | MaD:174 |
+| B.java:119:58:119:65 | source(...) : Object | B.java:119:20:119:66 | computeIfAbsent(...) : Object | provenance | MaD:205 |
 | B.java:124:7:124:9 | out [post update] : Map [<map.value>] : Object | B.java:124:66:124:68 | out : Map [<map.value>] : Object | provenance |  |
-| B.java:124:37:124:44 | source(...) : Object | B.java:124:7:124:9 | out [post update] : Map [<map.value>] : Object | provenance | MaD:173 |
+| B.java:124:37:124:44 | source(...) : Object | B.java:124:7:124:9 | out [post update] : Map [<map.value>] : Object | provenance | MaD:204 |
 | B.java:124:66:124:68 | out : Map [<map.value>] : Object | B.java:48:31:48:42 | obj : Map [<map.value>] : Object | provenance |  |
-| B.java:124:66:124:68 | out : Map [<map.value>] : Object | B.java:124:53:124:69 | readMapValue(...) | provenance | MaD:181 |
+| B.java:124:66:124:68 | out : Map [<map.value>] : Object | B.java:124:53:124:69 | readMapValue(...) | provenance | MaD:209 |
 | B.java:129:19:129:41 | storeMapValue(...) : Map [<map.value>] : Object | B.java:129:51:129:57 | (...)... : Map [<map.value>] : Object | provenance |  |
 | B.java:129:33:129:40 | source(...) : Object | B.java:41:39:41:43 | obj : Object | provenance |  |
-| B.java:129:33:129:40 | source(...) : Object | B.java:129:19:129:41 | storeMapValue(...) : Map [<map.value>] : Object | provenance | MaD:210 |
+| B.java:129:33:129:40 | source(...) : Object | B.java:129:19:129:41 | storeMapValue(...) : Map [<map.value>] : Object | provenance | MaD:215 |
 | B.java:129:50:129:69 | entrySet(...) : Set [<element>, <map.value>] : Object | B.java:129:102:129:104 | out : Set [<element>, <map.value>] : Object | provenance |  |
-| B.java:129:51:129:57 | (...)... : Map [<map.value>] : Object | B.java:129:50:129:69 | entrySet(...) : Set [<element>, <map.value>] : Object | provenance | MaD:180 |
+| B.java:129:51:129:57 | (...)... : Map [<map.value>] : Object | B.java:129:50:129:69 | entrySet(...) : Set [<element>, <map.value>] : Object | provenance | MaD:208 |
 | B.java:129:90:129:105 | readElement(...) : Entry [<map.value>] : Object | B.java:47:31:47:48 | obj : Entry [<map.value>] : Object | provenance |  |
-| B.java:129:90:129:105 | readElement(...) : Entry [<map.value>] : Object | B.java:129:77:129:106 | readMapValue(...) | provenance | MaD:224 |
+| B.java:129:90:129:105 | readElement(...) : Entry [<map.value>] : Object | B.java:129:77:129:106 | readMapValue(...) | provenance | MaD:175 |
 | B.java:129:102:129:104 | out : Set [<element>, <map.value>] : Object | B.java:31:28:31:42 | obj : Set [<element>, <map.value>] : Object | provenance |  |
-| B.java:129:102:129:104 | out : Set [<element>, <map.value>] : Object | B.java:129:90:129:105 | readElement(...) : Entry [<map.value>] : Object | provenance | MaD:1 |
+| B.java:129:102:129:104 | out : Set [<element>, <map.value>] : Object | B.java:129:90:129:105 | readElement(...) : Entry [<map.value>] : Object | provenance | MaD:3 |
 | B.java:134:19:134:39 | storeMapKey(...) : TreeMap [<map.key>] : Object | B.java:134:49:134:55 | (...)... : TreeMap [<map.key>] : Object | provenance |  |
 | B.java:134:31:134:38 | source(...) : Object | B.java:38:37:38:41 | obj : Object | provenance |  |
-| B.java:134:31:134:38 | source(...) : Object | B.java:134:19:134:39 | storeMapKey(...) : TreeMap [<map.key>] : Object | provenance | MaD:209 |
+| B.java:134:31:134:38 | source(...) : Object | B.java:134:19:134:39 | storeMapKey(...) : TreeMap [<map.key>] : Object | provenance | MaD:214 |
 | B.java:134:48:134:67 | entrySet(...) : Set [<element>, <map.key>] : Object | B.java:134:98:134:100 | out : Set [<element>, <map.key>] : Object | provenance |  |
-| B.java:134:49:134:55 | (...)... : TreeMap [<map.key>] : Object | B.java:134:48:134:67 | entrySet(...) : Set [<element>, <map.key>] : Object | provenance | MaD:179 |
+| B.java:134:49:134:55 | (...)... : TreeMap [<map.key>] : Object | B.java:134:48:134:67 | entrySet(...) : Set [<element>, <map.key>] : Object | provenance | MaD:207 |
 | B.java:134:86:134:101 | readElement(...) : Entry [<map.key>] : Object | B.java:43:29:43:46 | obj : Entry [<map.key>] : Object | provenance |  |
-| B.java:134:86:134:101 | readElement(...) : Entry [<map.key>] : Object | B.java:134:75:134:102 | readMapKey(...) | provenance | MaD:223 |
+| B.java:134:86:134:101 | readElement(...) : Entry [<map.key>] : Object | B.java:134:75:134:102 | readMapKey(...) | provenance | MaD:174 |
 | B.java:134:98:134:100 | out : Set [<element>, <map.key>] : Object | B.java:31:28:31:42 | obj : Set [<element>, <map.key>] : Object | provenance |  |
-| B.java:134:98:134:100 | out : Set [<element>, <map.key>] : Object | B.java:134:86:134:101 | readElement(...) : Entry [<map.key>] : Object | provenance | MaD:1 |
+| B.java:134:98:134:100 | out : Set [<element>, <map.key>] : Object | B.java:134:86:134:101 | readElement(...) : Entry [<map.key>] : Object | provenance | MaD:3 |
 | B.java:139:19:139:41 | storeMapValue(...) : Map [<map.value>] : Object | B.java:139:51:139:57 | (...)... : Map [<map.value>] : Object | provenance |  |
 | B.java:139:33:139:40 | source(...) : Object | B.java:41:39:41:43 | obj : Object | provenance |  |
-| B.java:139:33:139:40 | source(...) : Object | B.java:139:19:139:41 | storeMapValue(...) : Map [<map.value>] : Object | provenance | MaD:210 |
+| B.java:139:33:139:40 | source(...) : Object | B.java:139:19:139:41 | storeMapValue(...) : Map [<map.value>] : Object | provenance | MaD:215 |
 | B.java:139:50:139:68 | get(...) : Object | B.java:139:76:139:78 | out | provenance |  |
-| B.java:139:51:139:57 | (...)... : Map [<map.value>] : Object | B.java:139:50:139:68 | get(...) : Object | provenance | MaD:181 |
+| B.java:139:51:139:57 | (...)... : Map [<map.value>] : Object | B.java:139:50:139:68 | get(...) : Object | provenance | MaD:209 |
 | B.java:144:19:144:41 | storeMapValue(...) : Map [<map.value>] : Object | B.java:144:51:144:57 | (...)... : Map [<map.value>] : Object | provenance |  |
 | B.java:144:33:144:40 | source(...) : Object | B.java:41:39:41:43 | obj : Object | provenance |  |
-| B.java:144:33:144:40 | source(...) : Object | B.java:144:19:144:41 | storeMapValue(...) : Map [<map.value>] : Object | provenance | MaD:210 |
+| B.java:144:33:144:40 | source(...) : Object | B.java:144:19:144:41 | storeMapValue(...) : Map [<map.value>] : Object | provenance | MaD:215 |
 | B.java:144:50:144:82 | getOrDefault(...) : Object | B.java:144:90:144:92 | out | provenance |  |
-| B.java:144:51:144:57 | (...)... : Map [<map.value>] : Object | B.java:144:50:144:82 | getOrDefault(...) : Object | provenance | MaD:182 |
+| B.java:144:51:144:57 | (...)... : Map [<map.value>] : Object | B.java:144:50:144:82 | getOrDefault(...) : Object | provenance | MaD:211 |
 | B.java:149:19:149:26 | source(...) : Object | B.java:149:65:149:66 | in : Object | provenance |  |
 | B.java:149:35:149:67 | getOrDefault(...) : Object | B.java:149:75:149:77 | out | provenance |  |
-| B.java:149:65:149:66 | in : Object | B.java:149:35:149:67 | getOrDefault(...) : Object | provenance | MaD:183 |
+| B.java:149:65:149:66 | in : Object | B.java:149:35:149:67 | getOrDefault(...) : Object | provenance | MaD:210 |
 | B.java:154:19:154:41 | storeMapValue(...) : Map [<map.value>] : Object | B.java:154:51:154:57 | (...)... : Map [<map.value>] : Object | provenance |  |
 | B.java:154:33:154:40 | source(...) : Object | B.java:41:39:41:43 | obj : Object | provenance |  |
-| B.java:154:33:154:40 | source(...) : Object | B.java:154:19:154:41 | storeMapValue(...) : Map [<map.value>] : Object | provenance | MaD:210 |
+| B.java:154:33:154:40 | source(...) : Object | B.java:154:19:154:41 | storeMapValue(...) : Map [<map.value>] : Object | provenance | MaD:215 |
 | B.java:154:50:154:73 | put(...) : Object | B.java:154:81:154:83 | out | provenance |  |
-| B.java:154:51:154:57 | (...)... : Map [<map.value>] : Object | B.java:154:50:154:73 | put(...) : Object | provenance | MaD:208 |
+| B.java:154:51:154:57 | (...)... : Map [<map.value>] : Object | B.java:154:50:154:73 | put(...) : Object | provenance | MaD:216 |
 | B.java:159:19:159:26 | source(...) : Object | B.java:159:37:159:38 | in : Object | provenance |  |
 | B.java:159:29:159:31 | out [post update] : Map [<map.key>] : Object | B.java:159:63:159:65 | out : Map [<map.key>] : Object | provenance |  |
-| B.java:159:37:159:38 | in : Object | B.java:159:29:159:31 | out [post update] : Map [<map.key>] : Object | provenance | MaD:209 |
+| B.java:159:37:159:38 | in : Object | B.java:159:29:159:31 | out [post update] : Map [<map.key>] : Object | provenance | MaD:214 |
 | B.java:159:63:159:65 | out : Map [<map.key>] : Object | B.java:44:29:44:40 | obj : Map [<map.key>] : Object | provenance |  |
-| B.java:159:63:159:65 | out : Map [<map.key>] : Object | B.java:159:52:159:66 | readMapKey(...) | provenance | MaD:184 |
+| B.java:159:63:159:65 | out : Map [<map.key>] : Object | B.java:159:52:159:66 | readMapKey(...) | provenance | MaD:212 |
 | B.java:164:19:164:26 | source(...) : Object | B.java:164:42:164:43 | in : Object | provenance |  |
 | B.java:164:29:164:31 | out [post update] : Map [<map.value>] : Object | B.java:164:65:164:67 | out : Map [<map.value>] : Object | provenance |  |
-| B.java:164:42:164:43 | in : Object | B.java:164:29:164:31 | out [post update] : Map [<map.value>] : Object | provenance | MaD:210 |
+| B.java:164:42:164:43 | in : Object | B.java:164:29:164:31 | out [post update] : Map [<map.value>] : Object | provenance | MaD:215 |
 | B.java:164:65:164:67 | out : Map [<map.value>] : Object | B.java:48:31:48:42 | obj : Map [<map.value>] : Object | provenance |  |
-| B.java:164:65:164:67 | out : Map [<map.value>] : Object | B.java:164:52:164:68 | readMapValue(...) | provenance | MaD:181 |
+| B.java:164:65:164:67 | out : Map [<map.value>] : Object | B.java:164:52:164:68 | readMapValue(...) | provenance | MaD:209 |
 | B.java:169:19:169:41 | storeMapValue(...) : Map [<map.value>] : Object | B.java:169:51:169:57 | (...)... : Map [<map.value>] : Object | provenance |  |
 | B.java:169:33:169:40 | source(...) : Object | B.java:41:39:41:43 | obj : Object | provenance |  |
-| B.java:169:33:169:40 | source(...) : Object | B.java:169:19:169:41 | storeMapValue(...) : Map [<map.value>] : Object | provenance | MaD:210 |
+| B.java:169:33:169:40 | source(...) : Object | B.java:169:19:169:41 | storeMapValue(...) : Map [<map.value>] : Object | provenance | MaD:215 |
 | B.java:169:50:169:81 | putIfAbsent(...) : Object | B.java:169:89:169:91 | out | provenance |  |
-| B.java:169:51:169:57 | (...)... : Map [<map.value>] : Object | B.java:169:50:169:81 | putIfAbsent(...) : Object | provenance | MaD:213 |
+| B.java:169:51:169:57 | (...)... : Map [<map.value>] : Object | B.java:169:50:169:81 | putIfAbsent(...) : Object | provenance | MaD:221 |
 | B.java:174:19:174:26 | source(...) : Object | B.java:174:45:174:46 | in : Object | provenance |  |
 | B.java:174:29:174:31 | out [post update] : Map [<map.key>] : Object | B.java:174:71:174:73 | out : Map [<map.key>] : Object | provenance |  |
-| B.java:174:45:174:46 | in : Object | B.java:174:29:174:31 | out [post update] : Map [<map.key>] : Object | provenance | MaD:214 |
+| B.java:174:45:174:46 | in : Object | B.java:174:29:174:31 | out [post update] : Map [<map.key>] : Object | provenance | MaD:219 |
 | B.java:174:71:174:73 | out : Map [<map.key>] : Object | B.java:44:29:44:40 | obj : Map [<map.key>] : Object | provenance |  |
-| B.java:174:71:174:73 | out : Map [<map.key>] : Object | B.java:174:60:174:74 | readMapKey(...) | provenance | MaD:184 |
+| B.java:174:71:174:73 | out : Map [<map.key>] : Object | B.java:174:60:174:74 | readMapKey(...) | provenance | MaD:212 |
 | B.java:179:19:179:26 | source(...) : Object | B.java:179:50:179:51 | in : Object | provenance |  |
 | B.java:179:29:179:31 | out [post update] : Map [<map.value>] : Object | B.java:179:73:179:75 | out : Map [<map.value>] : Object | provenance |  |
-| B.java:179:50:179:51 | in : Object | B.java:179:29:179:31 | out [post update] : Map [<map.value>] : Object | provenance | MaD:215 |
+| B.java:179:50:179:51 | in : Object | B.java:179:29:179:31 | out [post update] : Map [<map.value>] : Object | provenance | MaD:220 |
 | B.java:179:73:179:75 | out : Map [<map.value>] : Object | B.java:48:31:48:42 | obj : Map [<map.value>] : Object | provenance |  |
-| B.java:179:73:179:75 | out : Map [<map.value>] : Object | B.java:179:60:179:76 | readMapValue(...) | provenance | MaD:181 |
+| B.java:179:73:179:75 | out : Map [<map.value>] : Object | B.java:179:60:179:76 | readMapValue(...) | provenance | MaD:209 |
 | B.java:184:19:184:41 | storeMapValue(...) : Map [<map.value>] : Object | B.java:184:51:184:57 | (...)... : Map [<map.value>] : Object | provenance |  |
 | B.java:184:33:184:40 | source(...) : Object | B.java:41:39:41:43 | obj : Object | provenance |  |
-| B.java:184:33:184:40 | source(...) : Object | B.java:184:19:184:41 | storeMapValue(...) : Map [<map.value>] : Object | provenance | MaD:210 |
+| B.java:184:33:184:40 | source(...) : Object | B.java:184:19:184:41 | storeMapValue(...) : Map [<map.value>] : Object | provenance | MaD:215 |
 | B.java:184:50:184:71 | remove(...) : Object | B.java:184:79:184:81 | out | provenance |  |
-| B.java:184:51:184:57 | (...)... : Map [<map.value>] : Object | B.java:184:50:184:71 | remove(...) : Object | provenance | MaD:216 |
+| B.java:184:51:184:57 | (...)... : Map [<map.value>] : Object | B.java:184:50:184:71 | remove(...) : Object | provenance | MaD:222 |
 | B.java:189:19:189:41 | storeMapValue(...) : Map [<map.value>] : Object | B.java:189:51:189:57 | (...)... : Map [<map.value>] : Object | provenance |  |
 | B.java:189:33:189:40 | source(...) : Object | B.java:41:39:41:43 | obj : Object | provenance |  |
-| B.java:189:33:189:40 | source(...) : Object | B.java:189:19:189:41 | storeMapValue(...) : Map [<map.value>] : Object | provenance | MaD:210 |
+| B.java:189:33:189:40 | source(...) : Object | B.java:189:19:189:41 | storeMapValue(...) : Map [<map.value>] : Object | provenance | MaD:215 |
 | B.java:189:50:189:77 | replace(...) : Object | B.java:189:85:189:87 | out | provenance |  |
-| B.java:189:51:189:57 | (...)... : Map [<map.value>] : Object | B.java:189:50:189:77 | replace(...) : Object | provenance | MaD:217 |
+| B.java:189:51:189:57 | (...)... : Map [<map.value>] : Object | B.java:189:50:189:77 | replace(...) : Object | provenance | MaD:225 |
 | B.java:194:19:194:26 | source(...) : Object | B.java:194:41:194:42 | in : Object | provenance |  |
 | B.java:194:29:194:31 | out [post update] : Map [<map.key>] : Object | B.java:194:67:194:69 | out : Map [<map.key>] : Object | provenance |  |
-| B.java:194:41:194:42 | in : Object | B.java:194:29:194:31 | out [post update] : Map [<map.key>] : Object | provenance | MaD:218 |
+| B.java:194:41:194:42 | in : Object | B.java:194:29:194:31 | out [post update] : Map [<map.key>] : Object | provenance | MaD:223 |
 | B.java:194:67:194:69 | out : Map [<map.key>] : Object | B.java:44:29:44:40 | obj : Map [<map.key>] : Object | provenance |  |
-| B.java:194:67:194:69 | out : Map [<map.key>] : Object | B.java:194:56:194:70 | readMapKey(...) | provenance | MaD:184 |
+| B.java:194:67:194:69 | out : Map [<map.key>] : Object | B.java:194:56:194:70 | readMapKey(...) | provenance | MaD:212 |
 | B.java:199:19:199:26 | source(...) : Object | B.java:199:46:199:47 | in : Object | provenance |  |
 | B.java:199:29:199:31 | out [post update] : Map [<map.value>] : Object | B.java:199:69:199:71 | out : Map [<map.value>] : Object | provenance |  |
-| B.java:199:46:199:47 | in : Object | B.java:199:29:199:31 | out [post update] : Map [<map.value>] : Object | provenance | MaD:219 |
+| B.java:199:46:199:47 | in : Object | B.java:199:29:199:31 | out [post update] : Map [<map.value>] : Object | provenance | MaD:224 |
 | B.java:199:69:199:71 | out : Map [<map.value>] : Object | B.java:48:31:48:42 | obj : Map [<map.value>] : Object | provenance |  |
-| B.java:199:69:199:71 | out : Map [<map.value>] : Object | B.java:199:56:199:72 | readMapValue(...) | provenance | MaD:181 |
+| B.java:199:69:199:71 | out : Map [<map.value>] : Object | B.java:199:56:199:72 | readMapValue(...) | provenance | MaD:209 |
 | B.java:204:19:204:26 | source(...) : Object | B.java:204:41:204:42 | in : Object | provenance |  |
 | B.java:204:29:204:31 | out [post update] : Map [<map.key>] : Object | B.java:204:72:204:74 | out : Map [<map.key>] : Object | provenance |  |
-| B.java:204:41:204:42 | in : Object | B.java:204:29:204:31 | out [post update] : Map [<map.key>] : Object | provenance | MaD:220 |
+| B.java:204:41:204:42 | in : Object | B.java:204:29:204:31 | out [post update] : Map [<map.key>] : Object | provenance | MaD:226 |
 | B.java:204:72:204:74 | out : Map [<map.key>] : Object | B.java:44:29:44:40 | obj : Map [<map.key>] : Object | provenance |  |
-| B.java:204:72:204:74 | out : Map [<map.key>] : Object | B.java:204:61:204:75 | readMapKey(...) | provenance | MaD:184 |
+| B.java:204:72:204:74 | out : Map [<map.key>] : Object | B.java:204:61:204:75 | readMapKey(...) | provenance | MaD:212 |
 | B.java:209:19:209:26 | source(...) : Object | B.java:209:51:209:52 | in : Object | provenance |  |
 | B.java:209:29:209:31 | out [post update] : Map [<map.value>] : Object | B.java:209:74:209:76 | out : Map [<map.value>] : Object | provenance |  |
-| B.java:209:51:209:52 | in : Object | B.java:209:29:209:31 | out [post update] : Map [<map.value>] : Object | provenance | MaD:221 |
+| B.java:209:51:209:52 | in : Object | B.java:209:29:209:31 | out [post update] : Map [<map.value>] : Object | provenance | MaD:227 |
 | B.java:209:74:209:76 | out : Map [<map.value>] : Object | B.java:48:31:48:42 | obj : Map [<map.value>] : Object | provenance |  |
-| B.java:209:74:209:76 | out : Map [<map.value>] : Object | B.java:209:61:209:77 | readMapValue(...) | provenance | MaD:181 |
+| B.java:209:74:209:76 | out : Map [<map.value>] : Object | B.java:209:61:209:77 | readMapValue(...) | provenance | MaD:209 |
 | B.java:214:19:214:39 | storeMapKey(...) : TreeMap [<map.key>] : Object | B.java:214:49:214:55 | (...)... : TreeMap [<map.key>] : Object | provenance |  |
 | B.java:214:31:214:38 | source(...) : Object | B.java:38:37:38:41 | obj : Object | provenance |  |
-| B.java:214:31:214:38 | source(...) : Object | B.java:214:19:214:39 | storeMapKey(...) : TreeMap [<map.key>] : Object | provenance | MaD:209 |
+| B.java:214:31:214:38 | source(...) : Object | B.java:214:19:214:39 | storeMapKey(...) : TreeMap [<map.key>] : Object | provenance | MaD:214 |
 | B.java:214:48:214:65 | keySet(...) : Set [<element>] : Object | B.java:214:85:214:87 | out : Set [<element>] : Object | provenance |  |
-| B.java:214:49:214:55 | (...)... : TreeMap [<map.key>] : Object | B.java:214:48:214:65 | keySet(...) : Set [<element>] : Object | provenance | MaD:184 |
+| B.java:214:49:214:55 | (...)... : TreeMap [<map.key>] : Object | B.java:214:48:214:65 | keySet(...) : Set [<element>] : Object | provenance | MaD:212 |
 | B.java:214:85:214:87 | out : Set [<element>] : Object | B.java:31:28:31:42 | obj : Set [<element>] : Object | provenance |  |
-| B.java:214:85:214:87 | out : Set [<element>] : Object | B.java:214:73:214:88 | readElement(...) | provenance | MaD:1 |
+| B.java:214:85:214:87 | out : Set [<element>] : Object | B.java:214:73:214:88 | readElement(...) | provenance | MaD:3 |
 | B.java:219:19:219:41 | storeMapValue(...) : Map [<map.value>] : Object | B.java:219:51:219:57 | (...)... : Map [<map.value>] : Object | provenance |  |
 | B.java:219:33:219:40 | source(...) : Object | B.java:41:39:41:43 | obj : Object | provenance |  |
-| B.java:219:33:219:40 | source(...) : Object | B.java:219:19:219:41 | storeMapValue(...) : Map [<map.value>] : Object | provenance | MaD:210 |
+| B.java:219:33:219:40 | source(...) : Object | B.java:219:19:219:41 | storeMapValue(...) : Map [<map.value>] : Object | provenance | MaD:215 |
 | B.java:219:50:219:67 | values(...) : Collection [<element>] : Object | B.java:219:87:219:89 | out : Collection [<element>] : Object | provenance |  |
-| B.java:219:51:219:57 | (...)... : Map [<map.value>] : Object | B.java:219:50:219:67 | values(...) : Collection [<element>] : Object | provenance | MaD:222 |
+| B.java:219:51:219:57 | (...)... : Map [<map.value>] : Object | B.java:219:50:219:67 | values(...) : Collection [<element>] : Object | provenance | MaD:228 |
 | B.java:219:87:219:89 | out : Collection [<element>] : Object | B.java:31:28:31:42 | obj : Collection [<element>] : Object | provenance |  |
-| B.java:219:87:219:89 | out : Collection [<element>] : Object | B.java:219:75:219:90 | readElement(...) | provenance | MaD:1 |
+| B.java:219:87:219:89 | out : Collection [<element>] : Object | B.java:219:75:219:90 | readElement(...) | provenance | MaD:3 |
 | B.java:224:19:224:26 | source(...) : Object | B.java:224:44:224:45 | in : Object | provenance |  |
 | B.java:224:29:224:31 | out [post update] : Map [<map.value>] : Object | B.java:224:72:224:74 | out : Map [<map.value>] : Object | provenance |  |
-| B.java:224:44:224:45 | in : Object | B.java:224:29:224:31 | out [post update] : Map [<map.value>] : Object | provenance | MaD:185 |
+| B.java:224:44:224:45 | in : Object | B.java:224:29:224:31 | out [post update] : Map [<map.value>] : Object | provenance | MaD:213 |
 | B.java:224:72:224:74 | out : Map [<map.value>] : Object | B.java:48:31:48:42 | obj : Map [<map.value>] : Object | provenance |  |
-| B.java:224:72:224:74 | out : Map [<map.value>] : Object | B.java:224:59:224:75 | readMapValue(...) | provenance | MaD:181 |
+| B.java:224:72:224:74 | out : Map [<map.value>] : Object | B.java:224:59:224:75 | readMapValue(...) | provenance | MaD:209 |
 | B.java:229:19:229:39 | storeMapKey(...) : TreeMap [<map.key>] : Object | B.java:229:53:229:59 | (...)... : TreeMap [<map.key>] : Object | provenance |  |
 | B.java:229:31:229:38 | source(...) : Object | B.java:38:37:38:41 | obj : Object | provenance |  |
-| B.java:229:31:229:38 | source(...) : Object | B.java:229:19:229:39 | storeMapKey(...) : TreeMap [<map.key>] : Object | provenance | MaD:209 |
+| B.java:229:31:229:38 | source(...) : Object | B.java:229:19:229:39 | storeMapKey(...) : TreeMap [<map.key>] : Object | provenance | MaD:214 |
 | B.java:229:42:229:44 | out [post update] : Map [<map.key>] : Object | B.java:229:79:229:81 | out : Map [<map.key>] : Object | provenance |  |
-| B.java:229:53:229:59 | (...)... : TreeMap [<map.key>] : Object | B.java:229:42:229:44 | out [post update] : Map [<map.key>] : Object | provenance | MaD:211 |
+| B.java:229:53:229:59 | (...)... : TreeMap [<map.key>] : Object | B.java:229:42:229:44 | out [post update] : Map [<map.key>] : Object | provenance | MaD:217 |
 | B.java:229:79:229:81 | out : Map [<map.key>] : Object | B.java:44:29:44:40 | obj : Map [<map.key>] : Object | provenance |  |
-| B.java:229:79:229:81 | out : Map [<map.key>] : Object | B.java:229:68:229:82 | readMapKey(...) | provenance | MaD:184 |
+| B.java:229:79:229:81 | out : Map [<map.key>] : Object | B.java:229:68:229:82 | readMapKey(...) | provenance | MaD:212 |
 | B.java:234:19:234:41 | storeMapValue(...) : Map [<map.value>] : Object | B.java:234:55:234:61 | (...)... : Map [<map.value>] : Object | provenance |  |
 | B.java:234:33:234:40 | source(...) : Object | B.java:41:39:41:43 | obj : Object | provenance |  |
-| B.java:234:33:234:40 | source(...) : Object | B.java:234:19:234:41 | storeMapValue(...) : Map [<map.value>] : Object | provenance | MaD:210 |
+| B.java:234:33:234:40 | source(...) : Object | B.java:234:19:234:41 | storeMapValue(...) : Map [<map.value>] : Object | provenance | MaD:215 |
 | B.java:234:44:234:46 | out [post update] : Map [<map.value>] : Object | B.java:234:83:234:85 | out : Map [<map.value>] : Object | provenance |  |
-| B.java:234:55:234:61 | (...)... : Map [<map.value>] : Object | B.java:234:44:234:46 | out [post update] : Map [<map.value>] : Object | provenance | MaD:212 |
+| B.java:234:55:234:61 | (...)... : Map [<map.value>] : Object | B.java:234:44:234:46 | out [post update] : Map [<map.value>] : Object | provenance | MaD:218 |
 | B.java:234:83:234:85 | out : Map [<map.value>] : Object | B.java:48:31:48:42 | obj : Map [<map.value>] : Object | provenance |  |
-| B.java:234:83:234:85 | out : Map [<map.value>] : Object | B.java:234:70:234:86 | readMapValue(...) | provenance | MaD:181 |
+| B.java:234:83:234:85 | out : Map [<map.value>] : Object | B.java:234:70:234:86 | readMapValue(...) | provenance | MaD:209 |
 | B.java:239:23:239:48 | storeElementList(...) : List [<element>] : Object | B.java:239:57:239:58 | in : List [<element>] : Object | provenance |  |
 | B.java:239:40:239:47 | source(...) : Object | B.java:24:39:24:43 | obj : Object | provenance |  |
-| B.java:239:40:239:47 | source(...) : Object | B.java:239:23:239:48 | storeElementList(...) : List [<element>] : Object | provenance | MaD:154 |
-| B.java:239:57:239:58 | in : List [<element>] : Object | B.java:239:57:239:75 | parallelStream(...) : Stream [<element>] : Object | provenance | MaD:54 |
+| B.java:239:40:239:47 | source(...) : Object | B.java:239:23:239:48 | storeElementList(...) : List [<element>] : Object | provenance | MaD:151 |
+| B.java:239:57:239:58 | in : List [<element>] : Object | B.java:239:57:239:75 | parallelStream(...) : Stream [<element>] : Object | provenance | MaD:56 |
 | B.java:239:57:239:75 | parallelStream(...) : Stream [<element>] : Object | B.java:239:95:239:97 | out : Stream [<element>] : Object | provenance |  |
-| B.java:239:95:239:97 | out : Stream [<element>] : Object | B.java:239:83:239:98 | readElement(...) | provenance | MaD:343 |
+| B.java:239:95:239:97 | out : Stream [<element>] : Object | B.java:239:83:239:98 | readElement(...) | provenance | MaD:2 |
 | B.java:244:23:244:48 | storeElementList(...) : List [<element>] : Object | B.java:244:57:244:58 | in : List [<element>] : Object | provenance |  |
 | B.java:244:40:244:47 | source(...) : Object | B.java:24:39:24:43 | obj : Object | provenance |  |
-| B.java:244:40:244:47 | source(...) : Object | B.java:244:23:244:48 | storeElementList(...) : List [<element>] : Object | provenance | MaD:154 |
-| B.java:244:57:244:58 | in : List [<element>] : Object | B.java:244:57:244:67 | stream(...) : Stream [<element>] : Object | provenance | MaD:55 |
+| B.java:244:40:244:47 | source(...) : Object | B.java:244:23:244:48 | storeElementList(...) : List [<element>] : Object | provenance | MaD:151 |
+| B.java:244:57:244:58 | in : List [<element>] : Object | B.java:244:57:244:67 | stream(...) : Stream [<element>] : Object | provenance | MaD:57 |
 | B.java:244:57:244:67 | stream(...) : Stream [<element>] : Object | B.java:244:87:244:89 | out : Stream [<element>] : Object | provenance |  |
-| B.java:244:87:244:89 | out : Stream [<element>] : Object | B.java:244:75:244:90 | readElement(...) | provenance | MaD:343 |
+| B.java:244:87:244:89 | out : Stream [<element>] : Object | B.java:244:75:244:90 | readElement(...) | provenance | MaD:2 |
 | B.java:249:23:249:48 | storeElementList(...) : List [<element>] : Object | B.java:249:57:249:58 | in : List [<element>] : Object | provenance |  |
 | B.java:249:40:249:47 | source(...) : Object | B.java:24:39:24:43 | obj : Object | provenance |  |
-| B.java:249:40:249:47 | source(...) : Object | B.java:249:23:249:48 | storeElementList(...) : List [<element>] : Object | provenance | MaD:154 |
-| B.java:249:57:249:58 | in : List [<element>] : Object | B.java:249:57:249:68 | toArray(...) : Object[] [[]] : Object | provenance | MaD:57 |
+| B.java:249:40:249:47 | source(...) : Object | B.java:249:23:249:48 | storeElementList(...) : List [<element>] : Object | provenance | MaD:151 |
+| B.java:249:57:249:58 | in : List [<element>] : Object | B.java:249:57:249:68 | toArray(...) : Object[] [[]] : Object | provenance | MaD:59 |
 | B.java:249:57:249:68 | toArray(...) : Object[] [[]] : Object | B.java:249:93:249:95 | out : Object[] [[]] : Object | provenance |  |
 | B.java:249:93:249:95 | out : Object[] [[]] : Object | B.java:14:34:14:45 | obj : Object[] [[]] : Object | provenance |  |
 | B.java:249:93:249:95 | out : Object[] [[]] : Object | B.java:249:76:249:96 | readArrayElement(...) | provenance |  |
 | B.java:254:23:254:48 | storeElementList(...) : List [<element>] : Object | B.java:254:51:254:52 | in : List [<element>] : Object | provenance |  |
 | B.java:254:40:254:47 | source(...) : Object | B.java:24:39:24:43 | obj : Object | provenance |  |
-| B.java:254:40:254:47 | source(...) : Object | B.java:254:23:254:48 | storeElementList(...) : List [<element>] : Object | provenance | MaD:154 |
-| B.java:254:51:254:52 | in : List [<element>] : Object | B.java:254:62:254:64 | out [post update] : Object[] [[]] : Object | provenance | MaD:56 |
+| B.java:254:40:254:47 | source(...) : Object | B.java:254:23:254:48 | storeElementList(...) : List [<element>] : Object | provenance | MaD:151 |
+| B.java:254:51:254:52 | in : List [<element>] : Object | B.java:254:62:254:64 | out [post update] : Object[] [[]] : Object | provenance | MaD:58 |
 | B.java:254:62:254:64 | out [post update] : Object[] [[]] : Object | B.java:254:90:254:92 | out : Object[] [[]] : Object | provenance |  |
 | B.java:254:90:254:92 | out : Object[] [[]] : Object | B.java:14:34:14:45 | obj : Object[] [[]] : Object | provenance |  |
 | B.java:254:90:254:92 | out : Object[] [[]] : Object | B.java:254:73:254:93 | readArrayElement(...) | provenance |  |
 | B.java:259:19:259:26 | source(...) : Object | B.java:259:37:259:38 | in : Object | provenance |  |
 | B.java:259:29:259:31 | out [post update] : Collection [<element>] : Object | B.java:259:59:259:61 | out : Collection [<element>] : Object | provenance |  |
-| B.java:259:37:259:38 | in : Object | B.java:259:29:259:31 | out [post update] : Collection [<element>] : Object | provenance | MaD:52 |
+| B.java:259:37:259:38 | in : Object | B.java:259:29:259:31 | out [post update] : Collection [<element>] : Object | provenance | MaD:54 |
 | B.java:259:59:259:61 | out : Collection [<element>] : Object | B.java:31:28:31:42 | obj : Collection [<element>] : Object | provenance |  |
-| B.java:259:59:259:61 | out : Collection [<element>] : Object | B.java:259:47:259:62 | readElement(...) | provenance | MaD:1 |
+| B.java:259:59:259:61 | out : Collection [<element>] : Object | B.java:259:47:259:62 | readElement(...) | provenance | MaD:3 |
 | B.java:264:23:264:48 | storeElementList(...) : List [<element>] : Object | B.java:264:62:264:63 | in : List [<element>] : Object | provenance |  |
 | B.java:264:40:264:47 | source(...) : Object | B.java:24:39:24:43 | obj : Object | provenance |  |
-| B.java:264:40:264:47 | source(...) : Object | B.java:264:23:264:48 | storeElementList(...) : List [<element>] : Object | provenance | MaD:154 |
+| B.java:264:40:264:47 | source(...) : Object | B.java:264:23:264:48 | storeElementList(...) : List [<element>] : Object | provenance | MaD:151 |
 | B.java:264:51:264:53 | out [post update] : Collection [<element>] : Object | B.java:264:84:264:86 | out : Collection [<element>] : Object | provenance |  |
-| B.java:264:62:264:63 | in : List [<element>] : Object | B.java:264:51:264:53 | out [post update] : Collection [<element>] : Object | provenance | MaD:53 |
+| B.java:264:62:264:63 | in : List [<element>] : Object | B.java:264:51:264:53 | out [post update] : Collection [<element>] : Object | provenance | MaD:55 |
 | B.java:264:84:264:86 | out : Collection [<element>] : Object | B.java:31:28:31:42 | obj : Collection [<element>] : Object | provenance |  |
-| B.java:264:84:264:86 | out : Collection [<element>] : Object | B.java:264:72:264:87 | readElement(...) | provenance | MaD:1 |
+| B.java:264:84:264:86 | out : Collection [<element>] : Object | B.java:264:72:264:87 | readElement(...) | provenance | MaD:3 |
 | B.java:269:17:269:42 | storeElementList(...) : List [<element>] : Object | B.java:269:51:269:52 | in : List [<element>] : Object | provenance |  |
 | B.java:269:34:269:41 | source(...) : Object | B.java:24:39:24:43 | obj : Object | provenance |  |
-| B.java:269:34:269:41 | source(...) : Object | B.java:269:17:269:42 | storeElementList(...) : List [<element>] : Object | provenance | MaD:154 |
-| B.java:269:51:269:52 | in : List [<element>] : Object | B.java:269:51:269:59 | get(...) : Object | provenance | MaD:152 |
+| B.java:269:34:269:41 | source(...) : Object | B.java:269:17:269:42 | storeElementList(...) : List [<element>] : Object | provenance | MaD:151 |
+| B.java:269:51:269:52 | in : List [<element>] : Object | B.java:269:51:269:59 | get(...) : Object | provenance | MaD:165 |
 | B.java:269:51:269:59 | get(...) : Object | B.java:269:67:269:69 | out | provenance |  |
 | B.java:274:17:274:42 | storeElementList(...) : List [<element>] : Object | B.java:274:51:274:52 | in : List [<element>] : Object | provenance |  |
 | B.java:274:34:274:41 | source(...) : Object | B.java:24:39:24:43 | obj : Object | provenance |  |
-| B.java:274:34:274:41 | source(...) : Object | B.java:274:17:274:42 | storeElementList(...) : List [<element>] : Object | provenance | MaD:154 |
-| B.java:274:51:274:52 | in : List [<element>] : Object | B.java:274:51:274:67 | listIterator(...) : ListIterator [<element>] : Object | provenance | MaD:153 |
+| B.java:274:34:274:41 | source(...) : Object | B.java:274:17:274:42 | storeElementList(...) : List [<element>] : Object | provenance | MaD:151 |
+| B.java:274:51:274:52 | in : List [<element>] : Object | B.java:274:51:274:67 | listIterator(...) : ListIterator [<element>] : Object | provenance | MaD:166 |
 | B.java:274:51:274:67 | listIterator(...) : ListIterator [<element>] : Object | B.java:274:87:274:89 | out : ListIterator [<element>] : Object | provenance |  |
 | B.java:274:87:274:89 | out : ListIterator [<element>] : Object | B.java:32:28:32:42 | obj : ListIterator [<element>] : Object | provenance |  |
-| B.java:274:87:274:89 | out : ListIterator [<element>] : Object | B.java:274:75:274:90 | readElement(...) | provenance | MaD:143 |
+| B.java:274:87:274:89 | out : ListIterator [<element>] : Object | B.java:274:75:274:90 | readElement(...) | provenance | MaD:145 |
 | B.java:279:17:279:42 | storeElementList(...) : List [<element>] : Object | B.java:279:51:279:52 | in : List [<element>] : Object | provenance |  |
 | B.java:279:34:279:41 | source(...) : Object | B.java:24:39:24:43 | obj : Object | provenance |  |
-| B.java:279:34:279:41 | source(...) : Object | B.java:279:17:279:42 | storeElementList(...) : List [<element>] : Object | provenance | MaD:154 |
-| B.java:279:51:279:52 | in : List [<element>] : Object | B.java:279:51:279:62 | remove(...) : Object | provenance | MaD:165 |
+| B.java:279:34:279:41 | source(...) : Object | B.java:279:17:279:42 | storeElementList(...) : List [<element>] : Object | provenance | MaD:151 |
+| B.java:279:51:279:52 | in : List [<element>] : Object | B.java:279:51:279:62 | remove(...) : Object | provenance | MaD:167 |
 | B.java:279:51:279:62 | remove(...) : Object | B.java:279:70:279:72 | out | provenance |  |
 | B.java:284:17:284:42 | storeElementList(...) : List [<element>] : Object | B.java:284:51:284:52 | in : List [<element>] : Object | provenance |  |
 | B.java:284:34:284:41 | source(...) : Object | B.java:24:39:24:43 | obj : Object | provenance |  |
-| B.java:284:34:284:41 | source(...) : Object | B.java:284:17:284:42 | storeElementList(...) : List [<element>] : Object | provenance | MaD:154 |
-| B.java:284:51:284:52 | in : List [<element>] : Object | B.java:284:51:284:64 | set(...) : Object | provenance | MaD:166 |
+| B.java:284:34:284:41 | source(...) : Object | B.java:284:17:284:42 | storeElementList(...) : List [<element>] : Object | provenance | MaD:151 |
+| B.java:284:51:284:52 | in : List [<element>] : Object | B.java:284:51:284:64 | set(...) : Object | provenance | MaD:169 |
 | B.java:284:51:284:64 | set(...) : Object | B.java:284:72:284:74 | out | provenance |  |
 | B.java:289:19:289:26 | source(...) : Object | B.java:289:39:289:40 | in : Object | provenance |  |
 | B.java:289:29:289:31 | out [post update] : List [<element>] : Object | B.java:289:61:289:63 | out : List [<element>] : Object | provenance |  |
-| B.java:289:39:289:40 | in : Object | B.java:289:29:289:31 | out [post update] : List [<element>] : Object | provenance | MaD:167 |
+| B.java:289:39:289:40 | in : Object | B.java:289:29:289:31 | out [post update] : List [<element>] : Object | provenance | MaD:168 |
 | B.java:289:61:289:63 | out : List [<element>] : Object | B.java:31:28:31:42 | obj : List [<element>] : Object | provenance |  |
-| B.java:289:61:289:63 | out : List [<element>] : Object | B.java:289:49:289:64 | readElement(...) | provenance | MaD:1 |
+| B.java:289:61:289:63 | out : List [<element>] : Object | B.java:289:49:289:64 | readElement(...) | provenance | MaD:3 |
 | B.java:294:17:294:42 | storeElementList(...) : List [<element>] : Object | B.java:294:51:294:52 | in : List [<element>] : Object | provenance |  |
 | B.java:294:34:294:41 | source(...) : Object | B.java:24:39:24:43 | obj : Object | provenance |  |
-| B.java:294:34:294:41 | source(...) : Object | B.java:294:17:294:42 | storeElementList(...) : List [<element>] : Object | provenance | MaD:154 |
-| B.java:294:51:294:52 | in : List [<element>] : Object | B.java:294:51:294:65 | subList(...) : List [<element>] : Object | provenance | MaD:168 |
+| B.java:294:34:294:41 | source(...) : Object | B.java:294:17:294:42 | storeElementList(...) : List [<element>] : Object | provenance | MaD:151 |
+| B.java:294:51:294:52 | in : List [<element>] : Object | B.java:294:51:294:65 | subList(...) : List [<element>] : Object | provenance | MaD:170 |
 | B.java:294:51:294:65 | subList(...) : List [<element>] : Object | B.java:294:85:294:87 | out : List [<element>] : Object | provenance |  |
 | B.java:294:85:294:87 | out : List [<element>] : Object | B.java:31:28:31:42 | obj : List [<element>] : Object | provenance |  |
-| B.java:294:85:294:87 | out : List [<element>] : Object | B.java:294:73:294:88 | readElement(...) | provenance | MaD:1 |
+| B.java:294:85:294:87 | out : List [<element>] : Object | B.java:294:73:294:88 | readElement(...) | provenance | MaD:3 |
 | B.java:299:19:299:26 | source(...) : Object | B.java:299:39:299:40 | in : Object | provenance |  |
 | B.java:299:29:299:31 | out [post update] : List [<element>] : Object | B.java:299:61:299:63 | out : List [<element>] : Object | provenance |  |
-| B.java:299:39:299:40 | in : Object | B.java:299:29:299:31 | out [post update] : List [<element>] : Object | provenance | MaD:148 |
+| B.java:299:39:299:40 | in : Object | B.java:299:29:299:31 | out [post update] : List [<element>] : Object | provenance | MaD:162 |
 | B.java:299:61:299:63 | out : List [<element>] : Object | B.java:31:28:31:42 | obj : List [<element>] : Object | provenance |  |
-| B.java:299:61:299:63 | out : List [<element>] : Object | B.java:299:49:299:64 | readElement(...) | provenance | MaD:1 |
+| B.java:299:61:299:63 | out : List [<element>] : Object | B.java:299:49:299:64 | readElement(...) | provenance | MaD:3 |
 | B.java:304:23:304:48 | storeElementList(...) : List [<element>] : Object | B.java:304:64:304:65 | in : List [<element>] : Object | provenance |  |
 | B.java:304:40:304:47 | source(...) : Object | B.java:24:39:24:43 | obj : Object | provenance |  |
-| B.java:304:40:304:47 | source(...) : Object | B.java:304:23:304:48 | storeElementList(...) : List [<element>] : Object | provenance | MaD:154 |
+| B.java:304:40:304:47 | source(...) : Object | B.java:304:23:304:48 | storeElementList(...) : List [<element>] : Object | provenance | MaD:151 |
 | B.java:304:51:304:53 | out [post update] : List [<element>] : Object | B.java:304:86:304:88 | out : List [<element>] : Object | provenance |  |
-| B.java:304:64:304:65 | in : List [<element>] : Object | B.java:304:51:304:53 | out [post update] : List [<element>] : Object | provenance | MaD:149 |
+| B.java:304:64:304:65 | in : List [<element>] : Object | B.java:304:51:304:53 | out [post update] : List [<element>] : Object | provenance | MaD:163 |
 | B.java:304:86:304:88 | out : List [<element>] : Object | B.java:31:28:31:42 | obj : List [<element>] : Object | provenance |  |
-| B.java:304:86:304:88 | out : List [<element>] : Object | B.java:304:74:304:89 | readElement(...) | provenance | MaD:1 |
+| B.java:304:86:304:88 | out : List [<element>] : Object | B.java:304:74:304:89 | readElement(...) | provenance | MaD:3 |
 | B.java:314:17:314:30 | (...)... : List | B.java:314:43:314:45 | out : List | provenance |  |
 | B.java:314:23:314:30 | source(...) : Object | B.java:314:17:314:30 | (...)... : List | provenance |  |
-| B.java:314:43:314:45 | out : List | B.java:314:43:314:45 | out [post update] : List | provenance | MaD:150 |
+| B.java:314:43:314:45 | out : List | B.java:314:43:314:45 | out [post update] : List | provenance | MaD:164 |
 | B.java:314:43:314:45 | out [post update] : List | B.java:314:61:314:63 | out | provenance |  |
 | B.java:319:19:319:45 | storeElementStack(...) : Stack [<element>] : Object | B.java:319:54:319:55 | in : Stack [<element>] : Object | provenance |  |
 | B.java:319:37:319:44 | source(...) : Object | B.java:27:41:27:45 | obj : Object | provenance |  |
-| B.java:319:37:319:44 | source(...) : Object | B.java:319:19:319:45 | storeElementStack(...) : Stack [<element>] : Object | provenance | MaD:324 |
-| B.java:319:54:319:55 | in : Stack [<element>] : Object | B.java:319:54:319:68 | elementAt(...) : Object | provenance | MaD:334 |
+| B.java:319:37:319:44 | source(...) : Object | B.java:319:19:319:45 | storeElementStack(...) : Stack [<element>] : Object | provenance | MaD:326 |
+| B.java:319:54:319:55 | in : Stack [<element>] : Object | B.java:319:54:319:68 | elementAt(...) : Object | provenance | MaD:336 |
 | B.java:319:54:319:68 | elementAt(...) : Object | B.java:319:76:319:78 | out | provenance |  |
 | B.java:324:19:324:45 | storeElementStack(...) : Stack [<element>] : Object | B.java:324:54:324:55 | in : Stack [<element>] : Object | provenance |  |
 | B.java:324:37:324:44 | source(...) : Object | B.java:27:41:27:45 | obj : Object | provenance |  |
-| B.java:324:37:324:44 | source(...) : Object | B.java:324:19:324:45 | storeElementStack(...) : Stack [<element>] : Object | provenance | MaD:324 |
-| B.java:324:54:324:55 | in : Stack [<element>] : Object | B.java:324:54:324:66 | elements(...) : Enumeration [<element>] : Object | provenance | MaD:335 |
+| B.java:324:37:324:44 | source(...) : Object | B.java:324:19:324:45 | storeElementStack(...) : Stack [<element>] : Object | provenance | MaD:326 |
+| B.java:324:54:324:55 | in : Stack [<element>] : Object | B.java:324:54:324:66 | elements(...) : Enumeration [<element>] : Object | provenance | MaD:337 |
 | B.java:324:54:324:66 | elements(...) : Enumeration [<element>] : Object | B.java:324:86:324:88 | out : Enumeration [<element>] : Object | provenance |  |
 | B.java:324:86:324:88 | out : Enumeration [<element>] : Object | B.java:35:28:35:45 | obj : Enumeration [<element>] : Object | provenance |  |
-| B.java:324:86:324:88 | out : Enumeration [<element>] : Object | B.java:324:74:324:89 | readElement(...) | provenance | MaD:135 |
+| B.java:324:86:324:88 | out : Enumeration [<element>] : Object | B.java:324:74:324:89 | readElement(...) | provenance | MaD:137 |
 | B.java:329:19:329:45 | storeElementStack(...) : Stack [<element>] : Object | B.java:329:54:329:55 | in : Stack [<element>] : Object | provenance |  |
 | B.java:329:37:329:44 | source(...) : Object | B.java:27:41:27:45 | obj : Object | provenance |  |
-| B.java:329:37:329:44 | source(...) : Object | B.java:329:19:329:45 | storeElementStack(...) : Stack [<element>] : Object | provenance | MaD:324 |
-| B.java:329:54:329:55 | in : Stack [<element>] : Object | B.java:329:54:329:70 | firstElement(...) : Object | provenance | MaD:336 |
+| B.java:329:37:329:44 | source(...) : Object | B.java:329:19:329:45 | storeElementStack(...) : Stack [<element>] : Object | provenance | MaD:326 |
+| B.java:329:54:329:55 | in : Stack [<element>] : Object | B.java:329:54:329:70 | firstElement(...) : Object | provenance | MaD:338 |
 | B.java:329:54:329:70 | firstElement(...) : Object | B.java:329:78:329:80 | out | provenance |  |
 | B.java:334:19:334:45 | storeElementStack(...) : Stack [<element>] : Object | B.java:334:54:334:55 | in : Stack [<element>] : Object | provenance |  |
 | B.java:334:37:334:44 | source(...) : Object | B.java:27:41:27:45 | obj : Object | provenance |  |
-| B.java:334:37:334:44 | source(...) : Object | B.java:334:19:334:45 | storeElementStack(...) : Stack [<element>] : Object | provenance | MaD:324 |
-| B.java:334:54:334:55 | in : Stack [<element>] : Object | B.java:334:54:334:69 | lastElement(...) : Object | provenance | MaD:338 |
+| B.java:334:37:334:44 | source(...) : Object | B.java:334:19:334:45 | storeElementStack(...) : Stack [<element>] : Object | provenance | MaD:326 |
+| B.java:334:54:334:55 | in : Stack [<element>] : Object | B.java:334:54:334:69 | lastElement(...) : Object | provenance | MaD:340 |
 | B.java:334:54:334:69 | lastElement(...) : Object | B.java:334:77:334:79 | out | provenance |  |
 | B.java:339:19:339:26 | source(...) : Object | B.java:339:44:339:45 | in : Object | provenance |  |
 | B.java:339:29:339:31 | out [post update] : Vector [<element>] : Object | B.java:339:66:339:68 | out : Vector [<element>] : Object | provenance |  |
-| B.java:339:44:339:45 | in : Object | B.java:339:29:339:31 | out [post update] : Vector [<element>] : Object | provenance | MaD:332 |
+| B.java:339:44:339:45 | in : Object | B.java:339:29:339:31 | out [post update] : Vector [<element>] : Object | provenance | MaD:334 |
 | B.java:339:66:339:68 | out : Vector [<element>] : Object | B.java:31:28:31:42 | obj : Vector [<element>] : Object | provenance |  |
-| B.java:339:66:339:68 | out : Vector [<element>] : Object | B.java:339:54:339:69 | readElement(...) | provenance | MaD:1 |
+| B.java:339:66:339:68 | out : Vector [<element>] : Object | B.java:339:54:339:69 | readElement(...) | provenance | MaD:3 |
 | B.java:344:19:344:26 | source(...) : Object | B.java:344:49:344:50 | in : Object | provenance |  |
 | B.java:344:29:344:31 | out [post update] : Vector [<element>] : Object | B.java:344:73:344:75 | out : Vector [<element>] : Object | provenance |  |
-| B.java:344:49:344:50 | in : Object | B.java:344:29:344:31 | out [post update] : Vector [<element>] : Object | provenance | MaD:337 |
+| B.java:344:49:344:50 | in : Object | B.java:344:29:344:31 | out [post update] : Vector [<element>] : Object | provenance | MaD:339 |
 | B.java:344:73:344:75 | out : Vector [<element>] : Object | B.java:31:28:31:42 | obj : Vector [<element>] : Object | provenance |  |
-| B.java:344:73:344:75 | out : Vector [<element>] : Object | B.java:344:61:344:76 | readElement(...) | provenance | MaD:1 |
+| B.java:344:73:344:75 | out : Vector [<element>] : Object | B.java:344:61:344:76 | readElement(...) | provenance | MaD:3 |
 | B.java:349:19:349:26 | source(...) : Object | B.java:349:46:349:47 | in : Object | provenance |  |
 | B.java:349:29:349:31 | out [post update] : Vector [<element>] : Object | B.java:349:70:349:72 | out : Vector [<element>] : Object | provenance |  |
-| B.java:349:46:349:47 | in : Object | B.java:349:29:349:31 | out [post update] : Vector [<element>] : Object | provenance | MaD:339 |
+| B.java:349:46:349:47 | in : Object | B.java:349:29:349:31 | out [post update] : Vector [<element>] : Object | provenance | MaD:341 |
 | B.java:349:70:349:72 | out : Vector [<element>] : Object | B.java:31:28:31:42 | obj : Vector [<element>] : Object | provenance |  |
-| B.java:349:70:349:72 | out : Vector [<element>] : Object | B.java:349:58:349:73 | readElement(...) | provenance | MaD:1 |
+| B.java:349:70:349:72 | out : Vector [<element>] : Object | B.java:349:58:349:73 | readElement(...) | provenance | MaD:3 |
 | B.java:354:19:354:45 | storeElementStack(...) : Stack [<element>] : Object | B.java:354:48:354:49 | in : Stack [<element>] : Object | provenance |  |
 | B.java:354:37:354:44 | source(...) : Object | B.java:27:41:27:45 | obj : Object | provenance |  |
-| B.java:354:37:354:44 | source(...) : Object | B.java:354:19:354:45 | storeElementStack(...) : Stack [<element>] : Object | provenance | MaD:324 |
-| B.java:354:48:354:49 | in : Stack [<element>] : Object | B.java:354:60:354:62 | out [post update] : Object[] [[]] : Object | provenance | MaD:333 |
+| B.java:354:37:354:44 | source(...) : Object | B.java:354:19:354:45 | storeElementStack(...) : Stack [<element>] : Object | provenance | MaD:326 |
+| B.java:354:48:354:49 | in : Stack [<element>] : Object | B.java:354:60:354:62 | out [post update] : Object[] [[]] : Object | provenance | MaD:335 |
 | B.java:354:60:354:62 | out [post update] : Object[] [[]] : Object | B.java:354:88:354:90 | out : Object[] [[]] : Object | provenance |  |
 | B.java:354:88:354:90 | out : Object[] [[]] : Object | B.java:14:34:14:45 | obj : Object[] [[]] : Object | provenance |  |
 | B.java:354:88:354:90 | out : Object[] [[]] : Object | B.java:354:71:354:91 | readArrayElement(...) | provenance |  |
 | B.java:359:18:359:44 | storeElementStack(...) : Stack [<element>] : Object | B.java:359:53:359:54 | in : Stack [<element>] : Object | provenance |  |
 | B.java:359:36:359:43 | source(...) : Object | B.java:27:41:27:45 | obj : Object | provenance |  |
-| B.java:359:36:359:43 | source(...) : Object | B.java:359:18:359:44 | storeElementStack(...) : Stack [<element>] : Object | provenance | MaD:324 |
-| B.java:359:53:359:54 | in : Stack [<element>] : Object | B.java:359:53:359:61 | peek(...) : Object | provenance | MaD:322 |
+| B.java:359:36:359:43 | source(...) : Object | B.java:359:18:359:44 | storeElementStack(...) : Stack [<element>] : Object | provenance | MaD:326 |
+| B.java:359:53:359:54 | in : Stack [<element>] : Object | B.java:359:53:359:61 | peek(...) : Object | provenance | MaD:324 |
 | B.java:359:53:359:61 | peek(...) : Object | B.java:359:69:359:71 | out | provenance |  |
 | B.java:364:18:364:44 | storeElementStack(...) : Stack [<element>] : Object | B.java:364:53:364:54 | in : Stack [<element>] : Object | provenance |  |
 | B.java:364:36:364:43 | source(...) : Object | B.java:27:41:27:45 | obj : Object | provenance |  |
-| B.java:364:36:364:43 | source(...) : Object | B.java:364:18:364:44 | storeElementStack(...) : Stack [<element>] : Object | provenance | MaD:324 |
-| B.java:364:53:364:54 | in : Stack [<element>] : Object | B.java:364:53:364:60 | pop(...) : Object | provenance | MaD:323 |
+| B.java:364:36:364:43 | source(...) : Object | B.java:364:18:364:44 | storeElementStack(...) : Stack [<element>] : Object | provenance | MaD:326 |
+| B.java:364:53:364:54 | in : Stack [<element>] : Object | B.java:364:53:364:60 | pop(...) : Object | provenance | MaD:325 |
 | B.java:364:53:364:60 | pop(...) : Object | B.java:364:68:364:70 | out | provenance |  |
 | B.java:369:19:369:26 | source(...) : Object | B.java:369:38:369:39 | in : Object | provenance |  |
 | B.java:369:29:369:31 | out [post update] : Stack [<element>] : Object | B.java:369:60:369:62 | out : Stack [<element>] : Object | provenance |  |
-| B.java:369:38:369:39 | in : Object | B.java:369:29:369:31 | out [post update] : Stack [<element>] : Object | provenance | MaD:324 |
+| B.java:369:38:369:39 | in : Object | B.java:369:29:369:31 | out [post update] : Stack [<element>] : Object | provenance | MaD:326 |
 | B.java:369:60:369:62 | out : Stack [<element>] : Object | B.java:31:28:31:42 | obj : Stack [<element>] : Object | provenance |  |
-| B.java:369:60:369:62 | out : Stack [<element>] : Object | B.java:369:48:369:63 | readElement(...) | provenance | MaD:1 |
+| B.java:369:60:369:62 | out : Stack [<element>] : Object | B.java:369:48:369:63 | readElement(...) | provenance | MaD:3 |
 | B.java:374:18:374:52 | storeElementBlockingDeque(...) : LinkedBlockingDeque [<element>] : Object | B.java:374:61:374:62 | in : LinkedBlockingDeque [<element>] : Object | provenance |  |
 | B.java:374:44:374:51 | source(...) : Object | B.java:28:57:28:61 | obj : Object | provenance |  |
-| B.java:374:44:374:51 | source(...) : Object | B.java:374:18:374:52 | storeElementBlockingDeque(...) : LinkedBlockingDeque [<element>] : Object | provenance | MaD:52 |
-| B.java:374:61:374:62 | in : LinkedBlockingDeque [<element>] : Object | B.java:374:61:374:72 | element(...) : Object | provenance | MaD:265 |
+| B.java:374:44:374:51 | source(...) : Object | B.java:374:18:374:52 | storeElementBlockingDeque(...) : LinkedBlockingDeque [<element>] : Object | provenance | MaD:54 |
+| B.java:374:61:374:62 | in : LinkedBlockingDeque [<element>] : Object | B.java:374:61:374:72 | element(...) : Object | provenance | MaD:267 |
 | B.java:374:61:374:72 | element(...) : Object | B.java:374:80:374:82 | out | provenance |  |
 | B.java:379:18:379:52 | storeElementBlockingDeque(...) : LinkedBlockingDeque [<element>] : Object | B.java:379:61:379:62 | in : LinkedBlockingDeque [<element>] : Object | provenance |  |
 | B.java:379:44:379:51 | source(...) : Object | B.java:28:57:28:61 | obj : Object | provenance |  |
-| B.java:379:44:379:51 | source(...) : Object | B.java:379:18:379:52 | storeElementBlockingDeque(...) : LinkedBlockingDeque [<element>] : Object | provenance | MaD:52 |
-| B.java:379:61:379:62 | in : LinkedBlockingDeque [<element>] : Object | B.java:379:61:379:69 | peek(...) : Object | provenance | MaD:267 |
+| B.java:379:44:379:51 | source(...) : Object | B.java:379:18:379:52 | storeElementBlockingDeque(...) : LinkedBlockingDeque [<element>] : Object | provenance | MaD:54 |
+| B.java:379:61:379:62 | in : LinkedBlockingDeque [<element>] : Object | B.java:379:61:379:69 | peek(...) : Object | provenance | MaD:269 |
 | B.java:379:61:379:69 | peek(...) : Object | B.java:379:77:379:79 | out | provenance |  |
 | B.java:384:18:384:52 | storeElementBlockingDeque(...) : LinkedBlockingDeque [<element>] : Object | B.java:384:61:384:62 | in : LinkedBlockingDeque [<element>] : Object | provenance |  |
 | B.java:384:44:384:51 | source(...) : Object | B.java:28:57:28:61 | obj : Object | provenance |  |
-| B.java:384:44:384:51 | source(...) : Object | B.java:384:18:384:52 | storeElementBlockingDeque(...) : LinkedBlockingDeque [<element>] : Object | provenance | MaD:52 |
-| B.java:384:61:384:62 | in : LinkedBlockingDeque [<element>] : Object | B.java:384:61:384:69 | poll(...) : Object | provenance | MaD:268 |
+| B.java:384:44:384:51 | source(...) : Object | B.java:384:18:384:52 | storeElementBlockingDeque(...) : LinkedBlockingDeque [<element>] : Object | provenance | MaD:54 |
+| B.java:384:61:384:62 | in : LinkedBlockingDeque [<element>] : Object | B.java:384:61:384:69 | poll(...) : Object | provenance | MaD:270 |
 | B.java:384:61:384:69 | poll(...) : Object | B.java:384:77:384:79 | out | provenance |  |
 | B.java:389:18:389:52 | storeElementBlockingDeque(...) : LinkedBlockingDeque [<element>] : Object | B.java:389:61:389:62 | in : LinkedBlockingDeque [<element>] : Object | provenance |  |
 | B.java:389:44:389:51 | source(...) : Object | B.java:28:57:28:61 | obj : Object | provenance |  |
-| B.java:389:44:389:51 | source(...) : Object | B.java:389:18:389:52 | storeElementBlockingDeque(...) : LinkedBlockingDeque [<element>] : Object | provenance | MaD:52 |
-| B.java:389:61:389:62 | in : LinkedBlockingDeque [<element>] : Object | B.java:389:61:389:71 | remove(...) : Object | provenance | MaD:269 |
+| B.java:389:44:389:51 | source(...) : Object | B.java:389:18:389:52 | storeElementBlockingDeque(...) : LinkedBlockingDeque [<element>] : Object | provenance | MaD:54 |
+| B.java:389:61:389:62 | in : LinkedBlockingDeque [<element>] : Object | B.java:389:61:389:71 | remove(...) : Object | provenance | MaD:271 |
 | B.java:389:61:389:71 | remove(...) : Object | B.java:389:79:389:81 | out | provenance |  |
 | B.java:394:19:394:26 | source(...) : Object | B.java:394:39:394:40 | in : Object | provenance |  |
 | B.java:394:29:394:31 | out [post update] : Queue [<element>] : Object | B.java:394:61:394:63 | out : Queue [<element>] : Object | provenance |  |
-| B.java:394:39:394:40 | in : Object | B.java:394:29:394:31 | out [post update] : Queue [<element>] : Object | provenance | MaD:266 |
+| B.java:394:39:394:40 | in : Object | B.java:394:29:394:31 | out [post update] : Queue [<element>] : Object | provenance | MaD:268 |
 | B.java:394:61:394:63 | out : Queue [<element>] : Object | B.java:31:28:31:42 | obj : Queue [<element>] : Object | provenance |  |
-| B.java:394:61:394:63 | out : Queue [<element>] : Object | B.java:394:49:394:64 | readElement(...) | provenance | MaD:1 |
+| B.java:394:61:394:63 | out : Queue [<element>] : Object | B.java:394:49:394:64 | readElement(...) | provenance | MaD:3 |
 | B.java:399:18:399:52 | storeElementBlockingDeque(...) : LinkedBlockingDeque [<element>] : Object | B.java:399:61:399:62 | in : LinkedBlockingDeque [<element>] : Object | provenance |  |
 | B.java:399:44:399:51 | source(...) : Object | B.java:28:57:28:61 | obj : Object | provenance |  |
-| B.java:399:44:399:51 | source(...) : Object | B.java:399:18:399:52 | storeElementBlockingDeque(...) : LinkedBlockingDeque [<element>] : Object | provenance | MaD:52 |
-| B.java:399:61:399:62 | in : LinkedBlockingDeque [<element>] : Object | B.java:399:61:399:83 | descendingIterator(...) : Iterator [<element>] : Object | provenance | MaD:110 |
+| B.java:399:44:399:51 | source(...) : Object | B.java:399:18:399:52 | storeElementBlockingDeque(...) : LinkedBlockingDeque [<element>] : Object | provenance | MaD:54 |
+| B.java:399:61:399:62 | in : LinkedBlockingDeque [<element>] : Object | B.java:399:61:399:83 | descendingIterator(...) : Iterator [<element>] : Object | provenance | MaD:112 |
 | B.java:399:61:399:83 | descendingIterator(...) : Iterator [<element>] : Object | B.java:399:103:399:105 | out : Iterator [<element>] : Object | provenance |  |
 | B.java:399:103:399:105 | out : Iterator [<element>] : Object | B.java:32:28:32:42 | obj : Iterator [<element>] : Object | provenance |  |
-| B.java:399:103:399:105 | out : Iterator [<element>] : Object | B.java:399:91:399:106 | readElement(...) | provenance | MaD:143 |
+| B.java:399:103:399:105 | out : Iterator [<element>] : Object | B.java:399:91:399:106 | readElement(...) | provenance | MaD:145 |
 | B.java:404:18:404:52 | storeElementBlockingDeque(...) : LinkedBlockingDeque [<element>] : Object | B.java:404:61:404:62 | in : LinkedBlockingDeque [<element>] : Object | provenance |  |
 | B.java:404:44:404:51 | source(...) : Object | B.java:28:57:28:61 | obj : Object | provenance |  |
-| B.java:404:44:404:51 | source(...) : Object | B.java:404:18:404:52 | storeElementBlockingDeque(...) : LinkedBlockingDeque [<element>] : Object | provenance | MaD:52 |
-| B.java:404:61:404:62 | in : LinkedBlockingDeque [<element>] : Object | B.java:404:61:404:73 | getFirst(...) : Object | provenance | MaD:111 |
-| B.java:404:61:404:62 | in : LinkedBlockingDeque [<element>] : Object | B.java:404:61:404:73 | getFirst(...) : Object | provenance | MaD:272 |
+| B.java:404:44:404:51 | source(...) : Object | B.java:404:18:404:52 | storeElementBlockingDeque(...) : LinkedBlockingDeque [<element>] : Object | provenance | MaD:54 |
+| B.java:404:61:404:62 | in : LinkedBlockingDeque [<element>] : Object | B.java:404:61:404:73 | getFirst(...) : Object | provenance | MaD:113 |
+| B.java:404:61:404:62 | in : LinkedBlockingDeque [<element>] : Object | B.java:404:61:404:73 | getFirst(...) : Object | provenance | MaD:274 |
 | B.java:404:61:404:73 | getFirst(...) : Object | B.java:404:81:404:83 | out | provenance |  |
 | B.java:409:18:409:52 | storeElementBlockingDeque(...) : LinkedBlockingDeque [<element>] : Object | B.java:409:61:409:62 | in : LinkedBlockingDeque [<element>] : Object | provenance |  |
 | B.java:409:44:409:51 | source(...) : Object | B.java:28:57:28:61 | obj : Object | provenance |  |
-| B.java:409:44:409:51 | source(...) : Object | B.java:409:18:409:52 | storeElementBlockingDeque(...) : LinkedBlockingDeque [<element>] : Object | provenance | MaD:52 |
-| B.java:409:61:409:62 | in : LinkedBlockingDeque [<element>] : Object | B.java:409:61:409:72 | getLast(...) : Object | provenance | MaD:112 |
-| B.java:409:61:409:62 | in : LinkedBlockingDeque [<element>] : Object | B.java:409:61:409:72 | getLast(...) : Object | provenance | MaD:273 |
+| B.java:409:44:409:51 | source(...) : Object | B.java:409:18:409:52 | storeElementBlockingDeque(...) : LinkedBlockingDeque [<element>] : Object | provenance | MaD:54 |
+| B.java:409:61:409:62 | in : LinkedBlockingDeque [<element>] : Object | B.java:409:61:409:72 | getLast(...) : Object | provenance | MaD:114 |
+| B.java:409:61:409:62 | in : LinkedBlockingDeque [<element>] : Object | B.java:409:61:409:72 | getLast(...) : Object | provenance | MaD:275 |
 | B.java:409:61:409:72 | getLast(...) : Object | B.java:409:80:409:82 | out | provenance |  |
 | B.java:414:18:414:52 | storeElementBlockingDeque(...) : LinkedBlockingDeque [<element>] : Object | B.java:414:61:414:62 | in : LinkedBlockingDeque [<element>] : Object | provenance |  |
 | B.java:414:44:414:51 | source(...) : Object | B.java:28:57:28:61 | obj : Object | provenance |  |
-| B.java:414:44:414:51 | source(...) : Object | B.java:414:18:414:52 | storeElementBlockingDeque(...) : LinkedBlockingDeque [<element>] : Object | provenance | MaD:52 |
-| B.java:414:61:414:62 | in : LinkedBlockingDeque [<element>] : Object | B.java:414:61:414:74 | peekFirst(...) : Object | provenance | MaD:115 |
+| B.java:414:44:414:51 | source(...) : Object | B.java:414:18:414:52 | storeElementBlockingDeque(...) : LinkedBlockingDeque [<element>] : Object | provenance | MaD:54 |
+| B.java:414:61:414:62 | in : LinkedBlockingDeque [<element>] : Object | B.java:414:61:414:74 | peekFirst(...) : Object | provenance | MaD:117 |
 | B.java:414:61:414:74 | peekFirst(...) : Object | B.java:414:82:414:84 | out | provenance |  |
 | B.java:419:18:419:52 | storeElementBlockingDeque(...) : LinkedBlockingDeque [<element>] : Object | B.java:419:61:419:62 | in : LinkedBlockingDeque [<element>] : Object | provenance |  |
 | B.java:419:44:419:51 | source(...) : Object | B.java:28:57:28:61 | obj : Object | provenance |  |
-| B.java:419:44:419:51 | source(...) : Object | B.java:419:18:419:52 | storeElementBlockingDeque(...) : LinkedBlockingDeque [<element>] : Object | provenance | MaD:52 |
-| B.java:419:61:419:62 | in : LinkedBlockingDeque [<element>] : Object | B.java:419:61:419:73 | peekLast(...) : Object | provenance | MaD:116 |
+| B.java:419:44:419:51 | source(...) : Object | B.java:419:18:419:52 | storeElementBlockingDeque(...) : LinkedBlockingDeque [<element>] : Object | provenance | MaD:54 |
+| B.java:419:61:419:62 | in : LinkedBlockingDeque [<element>] : Object | B.java:419:61:419:73 | peekLast(...) : Object | provenance | MaD:118 |
 | B.java:419:61:419:73 | peekLast(...) : Object | B.java:419:81:419:83 | out | provenance |  |
 | B.java:424:18:424:52 | storeElementBlockingDeque(...) : LinkedBlockingDeque [<element>] : Object | B.java:424:61:424:62 | in : LinkedBlockingDeque [<element>] : Object | provenance |  |
 | B.java:424:44:424:51 | source(...) : Object | B.java:28:57:28:61 | obj : Object | provenance |  |
-| B.java:424:44:424:51 | source(...) : Object | B.java:424:18:424:52 | storeElementBlockingDeque(...) : LinkedBlockingDeque [<element>] : Object | provenance | MaD:52 |
-| B.java:424:61:424:62 | in : LinkedBlockingDeque [<element>] : Object | B.java:424:61:424:74 | pollFirst(...) : Object | provenance | MaD:117 |
+| B.java:424:44:424:51 | source(...) : Object | B.java:424:18:424:52 | storeElementBlockingDeque(...) : LinkedBlockingDeque [<element>] : Object | provenance | MaD:54 |
+| B.java:424:61:424:62 | in : LinkedBlockingDeque [<element>] : Object | B.java:424:61:424:74 | pollFirst(...) : Object | provenance | MaD:119 |
 | B.java:424:61:424:74 | pollFirst(...) : Object | B.java:424:82:424:84 | out | provenance |  |
 | B.java:429:18:429:52 | storeElementBlockingDeque(...) : LinkedBlockingDeque [<element>] : Object | B.java:429:61:429:62 | in : LinkedBlockingDeque [<element>] : Object | provenance |  |
 | B.java:429:44:429:51 | source(...) : Object | B.java:28:57:28:61 | obj : Object | provenance |  |
-| B.java:429:44:429:51 | source(...) : Object | B.java:429:18:429:52 | storeElementBlockingDeque(...) : LinkedBlockingDeque [<element>] : Object | provenance | MaD:52 |
-| B.java:429:61:429:62 | in : LinkedBlockingDeque [<element>] : Object | B.java:429:61:429:73 | pollLast(...) : Object | provenance | MaD:118 |
+| B.java:429:44:429:51 | source(...) : Object | B.java:429:18:429:52 | storeElementBlockingDeque(...) : LinkedBlockingDeque [<element>] : Object | provenance | MaD:54 |
+| B.java:429:61:429:62 | in : LinkedBlockingDeque [<element>] : Object | B.java:429:61:429:73 | pollLast(...) : Object | provenance | MaD:120 |
 | B.java:429:61:429:73 | pollLast(...) : Object | B.java:429:81:429:83 | out | provenance |  |
 | B.java:434:18:434:52 | storeElementBlockingDeque(...) : LinkedBlockingDeque [<element>] : Object | B.java:434:61:434:62 | in : LinkedBlockingDeque [<element>] : Object | provenance |  |
 | B.java:434:44:434:51 | source(...) : Object | B.java:28:57:28:61 | obj : Object | provenance |  |
-| B.java:434:44:434:51 | source(...) : Object | B.java:434:18:434:52 | storeElementBlockingDeque(...) : LinkedBlockingDeque [<element>] : Object | provenance | MaD:52 |
-| B.java:434:61:434:62 | in : LinkedBlockingDeque [<element>] : Object | B.java:434:61:434:68 | pop(...) : Object | provenance | MaD:119 |
+| B.java:434:44:434:51 | source(...) : Object | B.java:434:18:434:52 | storeElementBlockingDeque(...) : LinkedBlockingDeque [<element>] : Object | provenance | MaD:54 |
+| B.java:434:61:434:62 | in : LinkedBlockingDeque [<element>] : Object | B.java:434:61:434:68 | pop(...) : Object | provenance | MaD:121 |
 | B.java:434:61:434:68 | pop(...) : Object | B.java:434:76:434:78 | out | provenance |  |
 | B.java:439:18:439:52 | storeElementBlockingDeque(...) : LinkedBlockingDeque [<element>] : Object | B.java:439:61:439:62 | in : LinkedBlockingDeque [<element>] : Object | provenance |  |
 | B.java:439:44:439:51 | source(...) : Object | B.java:28:57:28:61 | obj : Object | provenance |  |
-| B.java:439:44:439:51 | source(...) : Object | B.java:439:18:439:52 | storeElementBlockingDeque(...) : LinkedBlockingDeque [<element>] : Object | provenance | MaD:52 |
-| B.java:439:61:439:62 | in : LinkedBlockingDeque [<element>] : Object | B.java:439:61:439:76 | removeFirst(...) : Object | provenance | MaD:121 |
-| B.java:439:61:439:62 | in : LinkedBlockingDeque [<element>] : Object | B.java:439:61:439:76 | removeFirst(...) : Object | provenance | MaD:274 |
+| B.java:439:44:439:51 | source(...) : Object | B.java:439:18:439:52 | storeElementBlockingDeque(...) : LinkedBlockingDeque [<element>] : Object | provenance | MaD:54 |
+| B.java:439:61:439:62 | in : LinkedBlockingDeque [<element>] : Object | B.java:439:61:439:76 | removeFirst(...) : Object | provenance | MaD:123 |
+| B.java:439:61:439:62 | in : LinkedBlockingDeque [<element>] : Object | B.java:439:61:439:76 | removeFirst(...) : Object | provenance | MaD:276 |
 | B.java:439:61:439:76 | removeFirst(...) : Object | B.java:439:84:439:86 | out | provenance |  |
 | B.java:444:18:444:52 | storeElementBlockingDeque(...) : LinkedBlockingDeque [<element>] : Object | B.java:444:61:444:62 | in : LinkedBlockingDeque [<element>] : Object | provenance |  |
 | B.java:444:44:444:51 | source(...) : Object | B.java:28:57:28:61 | obj : Object | provenance |  |
-| B.java:444:44:444:51 | source(...) : Object | B.java:444:18:444:52 | storeElementBlockingDeque(...) : LinkedBlockingDeque [<element>] : Object | provenance | MaD:52 |
-| B.java:444:61:444:62 | in : LinkedBlockingDeque [<element>] : Object | B.java:444:61:444:75 | removeLast(...) : Object | provenance | MaD:122 |
-| B.java:444:61:444:62 | in : LinkedBlockingDeque [<element>] : Object | B.java:444:61:444:75 | removeLast(...) : Object | provenance | MaD:275 |
+| B.java:444:44:444:51 | source(...) : Object | B.java:444:18:444:52 | storeElementBlockingDeque(...) : LinkedBlockingDeque [<element>] : Object | provenance | MaD:54 |
+| B.java:444:61:444:62 | in : LinkedBlockingDeque [<element>] : Object | B.java:444:61:444:75 | removeLast(...) : Object | provenance | MaD:124 |
+| B.java:444:61:444:62 | in : LinkedBlockingDeque [<element>] : Object | B.java:444:61:444:75 | removeLast(...) : Object | provenance | MaD:277 |
 | B.java:444:61:444:75 | removeLast(...) : Object | B.java:444:83:444:85 | out | provenance |  |
 | B.java:449:19:449:26 | source(...) : Object | B.java:449:38:449:39 | in : Object | provenance |  |
 | B.java:449:29:449:31 | out [post update] : Deque [<element>] : Object | B.java:449:60:449:62 | out : Deque [<element>] : Object | provenance |  |
-| B.java:449:38:449:39 | in : Object | B.java:449:29:449:31 | out [post update] : Deque [<element>] : Object | provenance | MaD:120 |
+| B.java:449:38:449:39 | in : Object | B.java:449:29:449:31 | out [post update] : Deque [<element>] : Object | provenance | MaD:122 |
 | B.java:449:60:449:62 | out : Deque [<element>] : Object | B.java:31:28:31:42 | obj : Deque [<element>] : Object | provenance |  |
-| B.java:449:60:449:62 | out : Deque [<element>] : Object | B.java:449:48:449:63 | readElement(...) | provenance | MaD:1 |
+| B.java:449:60:449:62 | out : Deque [<element>] : Object | B.java:449:48:449:63 | readElement(...) | provenance | MaD:3 |
 | B.java:454:19:454:26 | source(...) : Object | B.java:454:43:454:44 | in : Object | provenance |  |
 | B.java:454:29:454:31 | out [post update] : Deque [<element>] : Object | B.java:454:65:454:67 | out : Deque [<element>] : Object | provenance |  |
-| B.java:454:43:454:44 | in : Object | B.java:454:29:454:31 | out [post update] : Deque [<element>] : Object | provenance | MaD:114 |
+| B.java:454:43:454:44 | in : Object | B.java:454:29:454:31 | out [post update] : Deque [<element>] : Object | provenance | MaD:116 |
 | B.java:454:65:454:67 | out : Deque [<element>] : Object | B.java:31:28:31:42 | obj : Deque [<element>] : Object | provenance |  |
-| B.java:454:65:454:67 | out : Deque [<element>] : Object | B.java:454:53:454:68 | readElement(...) | provenance | MaD:1 |
+| B.java:454:65:454:67 | out : Deque [<element>] : Object | B.java:454:53:454:68 | readElement(...) | provenance | MaD:3 |
 | B.java:459:19:459:26 | source(...) : Object | B.java:459:44:459:45 | in : Object | provenance |  |
 | B.java:459:29:459:31 | out [post update] : Deque [<element>] : Object | B.java:459:66:459:68 | out : Deque [<element>] : Object | provenance |  |
-| B.java:459:44:459:45 | in : Object | B.java:459:29:459:31 | out [post update] : Deque [<element>] : Object | provenance | MaD:113 |
+| B.java:459:44:459:45 | in : Object | B.java:459:29:459:31 | out [post update] : Deque [<element>] : Object | provenance | MaD:115 |
 | B.java:459:66:459:68 | out : Deque [<element>] : Object | B.java:31:28:31:42 | obj : Deque [<element>] : Object | provenance |  |
-| B.java:459:66:459:68 | out : Deque [<element>] : Object | B.java:459:54:459:69 | readElement(...) | provenance | MaD:1 |
+| B.java:459:66:459:68 | out : Deque [<element>] : Object | B.java:459:54:459:69 | readElement(...) | provenance | MaD:3 |
 | B.java:464:19:464:26 | source(...) : Object | B.java:464:41:464:42 | in : Object | provenance |  |
 | B.java:464:29:464:31 | out [post update] : Deque [<element>] : Object | B.java:464:63:464:65 | out : Deque [<element>] : Object | provenance |  |
-| B.java:464:41:464:42 | in : Object | B.java:464:29:464:31 | out [post update] : Deque [<element>] : Object | provenance | MaD:109 |
-| B.java:464:41:464:42 | in : Object | B.java:464:29:464:31 | out [post update] : Deque [<element>] : Object | provenance | MaD:271 |
+| B.java:464:41:464:42 | in : Object | B.java:464:29:464:31 | out [post update] : Deque [<element>] : Object | provenance | MaD:111 |
+| B.java:464:41:464:42 | in : Object | B.java:464:29:464:31 | out [post update] : Deque [<element>] : Object | provenance | MaD:273 |
 | B.java:464:63:464:65 | out : Deque [<element>] : Object | B.java:31:28:31:42 | obj : Deque [<element>] : Object | provenance |  |
-| B.java:464:63:464:65 | out : Deque [<element>] : Object | B.java:464:51:464:66 | readElement(...) | provenance | MaD:1 |
+| B.java:464:63:464:65 | out : Deque [<element>] : Object | B.java:464:51:464:66 | readElement(...) | provenance | MaD:3 |
 | B.java:469:19:469:26 | source(...) : Object | B.java:469:42:469:43 | in : Object | provenance |  |
 | B.java:469:29:469:31 | out [post update] : Deque [<element>] : Object | B.java:469:64:469:66 | out : Deque [<element>] : Object | provenance |  |
-| B.java:469:42:469:43 | in : Object | B.java:469:29:469:31 | out [post update] : Deque [<element>] : Object | provenance | MaD:108 |
-| B.java:469:42:469:43 | in : Object | B.java:469:29:469:31 | out [post update] : Deque [<element>] : Object | provenance | MaD:270 |
+| B.java:469:42:469:43 | in : Object | B.java:469:29:469:31 | out [post update] : Deque [<element>] : Object | provenance | MaD:110 |
+| B.java:469:42:469:43 | in : Object | B.java:469:29:469:31 | out [post update] : Deque [<element>] : Object | provenance | MaD:272 |
 | B.java:469:64:469:66 | out : Deque [<element>] : Object | B.java:31:28:31:42 | obj : Deque [<element>] : Object | provenance |  |
-| B.java:469:64:469:66 | out : Deque [<element>] : Object | B.java:469:52:469:67 | readElement(...) | provenance | MaD:1 |
+| B.java:469:64:469:66 | out : Deque [<element>] : Object | B.java:469:52:469:67 | readElement(...) | provenance | MaD:3 |
 | B.java:474:26:474:60 | storeElementBlockingDeque(...) : LinkedBlockingDeque [<element>] : Object | B.java:474:69:474:70 | in : LinkedBlockingDeque [<element>] : Object | provenance |  |
 | B.java:474:52:474:59 | source(...) : Object | B.java:28:57:28:61 | obj : Object | provenance |  |
-| B.java:474:52:474:59 | source(...) : Object | B.java:474:26:474:60 | storeElementBlockingDeque(...) : LinkedBlockingDeque [<element>] : Object | provenance | MaD:52 |
-| B.java:474:69:474:70 | in : LinkedBlockingDeque [<element>] : Object | B.java:474:69:474:88 | pollFirst(...) : Object | provenance | MaD:5 |
+| B.java:474:52:474:59 | source(...) : Object | B.java:474:26:474:60 | storeElementBlockingDeque(...) : LinkedBlockingDeque [<element>] : Object | provenance | MaD:54 |
+| B.java:474:69:474:70 | in : LinkedBlockingDeque [<element>] : Object | B.java:474:69:474:88 | pollFirst(...) : Object | provenance | MaD:7 |
 | B.java:474:69:474:88 | pollFirst(...) : Object | B.java:474:96:474:98 | out | provenance |  |
 | B.java:479:26:479:60 | storeElementBlockingDeque(...) : LinkedBlockingDeque [<element>] : Object | B.java:479:69:479:70 | in : LinkedBlockingDeque [<element>] : Object | provenance |  |
 | B.java:479:52:479:59 | source(...) : Object | B.java:28:57:28:61 | obj : Object | provenance |  |
-| B.java:479:52:479:59 | source(...) : Object | B.java:479:26:479:60 | storeElementBlockingDeque(...) : LinkedBlockingDeque [<element>] : Object | provenance | MaD:52 |
-| B.java:479:69:479:70 | in : LinkedBlockingDeque [<element>] : Object | B.java:479:69:479:87 | pollLast(...) : Object | provenance | MaD:6 |
+| B.java:479:52:479:59 | source(...) : Object | B.java:479:26:479:60 | storeElementBlockingDeque(...) : LinkedBlockingDeque [<element>] : Object | provenance | MaD:54 |
+| B.java:479:69:479:70 | in : LinkedBlockingDeque [<element>] : Object | B.java:479:69:479:87 | pollLast(...) : Object | provenance | MaD:8 |
 | B.java:479:69:479:87 | pollLast(...) : Object | B.java:479:95:479:97 | out | provenance |  |
 | B.java:484:26:484:60 | storeElementBlockingDeque(...) : LinkedBlockingDeque [<element>] : Object | B.java:484:69:484:70 | in : LinkedBlockingDeque [<element>] : Object | provenance |  |
 | B.java:484:52:484:59 | source(...) : Object | B.java:28:57:28:61 | obj : Object | provenance |  |
-| B.java:484:52:484:59 | source(...) : Object | B.java:484:26:484:60 | storeElementBlockingDeque(...) : LinkedBlockingDeque [<element>] : Object | provenance | MaD:52 |
-| B.java:484:69:484:70 | in : LinkedBlockingDeque [<element>] : Object | B.java:484:69:484:82 | takeFirst(...) : Object | provenance | MaD:9 |
+| B.java:484:52:484:59 | source(...) : Object | B.java:484:26:484:60 | storeElementBlockingDeque(...) : LinkedBlockingDeque [<element>] : Object | provenance | MaD:54 |
+| B.java:484:69:484:70 | in : LinkedBlockingDeque [<element>] : Object | B.java:484:69:484:82 | takeFirst(...) : Object | provenance | MaD:11 |
 | B.java:484:69:484:82 | takeFirst(...) : Object | B.java:484:90:484:92 | out | provenance |  |
 | B.java:489:26:489:60 | storeElementBlockingDeque(...) : LinkedBlockingDeque [<element>] : Object | B.java:489:69:489:70 | in : LinkedBlockingDeque [<element>] : Object | provenance |  |
 | B.java:489:52:489:59 | source(...) : Object | B.java:28:57:28:61 | obj : Object | provenance |  |
-| B.java:489:52:489:59 | source(...) : Object | B.java:489:26:489:60 | storeElementBlockingDeque(...) : LinkedBlockingDeque [<element>] : Object | provenance | MaD:52 |
-| B.java:489:69:489:70 | in : LinkedBlockingDeque [<element>] : Object | B.java:489:69:489:81 | takeLast(...) : Object | provenance | MaD:10 |
+| B.java:489:52:489:59 | source(...) : Object | B.java:489:26:489:60 | storeElementBlockingDeque(...) : LinkedBlockingDeque [<element>] : Object | provenance | MaD:54 |
+| B.java:489:69:489:70 | in : LinkedBlockingDeque [<element>] : Object | B.java:489:69:489:81 | takeLast(...) : Object | provenance | MaD:12 |
 | B.java:489:69:489:81 | takeLast(...) : Object | B.java:489:89:489:91 | out | provenance |  |
 | B.java:494:26:494:60 | storeElementBlockingDeque(...) : LinkedBlockingDeque [<element>] : Object | B.java:494:69:494:70 | in : LinkedBlockingDeque [<element>] : Object | provenance |  |
 | B.java:494:52:494:59 | source(...) : Object | B.java:28:57:28:61 | obj : Object | provenance |  |
-| B.java:494:52:494:59 | source(...) : Object | B.java:494:26:494:60 | storeElementBlockingDeque(...) : LinkedBlockingDeque [<element>] : Object | provenance | MaD:52 |
-| B.java:494:69:494:70 | in : LinkedBlockingDeque [<element>] : Object | B.java:494:69:494:83 | poll(...) : Object | provenance | MaD:14 |
+| B.java:494:52:494:59 | source(...) : Object | B.java:494:26:494:60 | storeElementBlockingDeque(...) : LinkedBlockingDeque [<element>] : Object | provenance | MaD:54 |
+| B.java:494:69:494:70 | in : LinkedBlockingDeque [<element>] : Object | B.java:494:69:494:83 | poll(...) : Object | provenance | MaD:16 |
 | B.java:494:69:494:83 | poll(...) : Object | B.java:494:91:494:93 | out | provenance |  |
 | B.java:499:26:499:60 | storeElementBlockingDeque(...) : LinkedBlockingDeque [<element>] : Object | B.java:499:69:499:70 | in : LinkedBlockingDeque [<element>] : Object | provenance |  |
 | B.java:499:52:499:59 | source(...) : Object | B.java:28:57:28:61 | obj : Object | provenance |  |
-| B.java:499:52:499:59 | source(...) : Object | B.java:499:26:499:60 | storeElementBlockingDeque(...) : LinkedBlockingDeque [<element>] : Object | provenance | MaD:52 |
-| B.java:499:69:499:70 | in : LinkedBlockingDeque [<element>] : Object | B.java:499:69:499:77 | take(...) : Object | provenance | MaD:16 |
+| B.java:499:52:499:59 | source(...) : Object | B.java:499:26:499:60 | storeElementBlockingDeque(...) : LinkedBlockingDeque [<element>] : Object | provenance | MaD:54 |
+| B.java:499:69:499:70 | in : LinkedBlockingDeque [<element>] : Object | B.java:499:69:499:77 | take(...) : Object | provenance | MaD:18 |
 | B.java:499:69:499:77 | take(...) : Object | B.java:499:85:499:87 | out | provenance |  |
 | B.java:504:19:504:26 | source(...) : Object | B.java:504:39:504:40 | in : Object | provenance |  |
 | B.java:504:29:504:31 | out [post update] : BlockingQueue [<element>] : Object | B.java:504:68:504:70 | out : BlockingQueue [<element>] : Object | provenance |  |
-| B.java:504:39:504:40 | in : Object | B.java:504:29:504:31 | out [post update] : BlockingQueue [<element>] : Object | provenance | MaD:13 |
+| B.java:504:39:504:40 | in : Object | B.java:504:29:504:31 | out [post update] : BlockingQueue [<element>] : Object | provenance | MaD:15 |
 | B.java:504:68:504:70 | out : BlockingQueue [<element>] : Object | B.java:31:28:31:42 | obj : BlockingQueue [<element>] : Object | provenance |  |
-| B.java:504:68:504:70 | out : BlockingQueue [<element>] : Object | B.java:504:56:504:71 | readElement(...) | provenance | MaD:1 |
+| B.java:504:68:504:70 | out : BlockingQueue [<element>] : Object | B.java:504:56:504:71 | readElement(...) | provenance | MaD:3 |
 | B.java:509:19:509:26 | source(...) : Object | B.java:509:37:509:38 | in : Object | provenance |  |
 | B.java:509:29:509:31 | out [post update] : BlockingQueue [<element>] : Object | B.java:509:59:509:61 | out : BlockingQueue [<element>] : Object | provenance |  |
-| B.java:509:37:509:38 | in : Object | B.java:509:29:509:31 | out [post update] : BlockingQueue [<element>] : Object | provenance | MaD:15 |
+| B.java:509:37:509:38 | in : Object | B.java:509:29:509:31 | out [post update] : BlockingQueue [<element>] : Object | provenance | MaD:17 |
 | B.java:509:59:509:61 | out : BlockingQueue [<element>] : Object | B.java:31:28:31:42 | obj : BlockingQueue [<element>] : Object | provenance |  |
-| B.java:509:59:509:61 | out : BlockingQueue [<element>] : Object | B.java:509:47:509:62 | readElement(...) | provenance | MaD:1 |
+| B.java:509:59:509:61 | out : BlockingQueue [<element>] : Object | B.java:509:47:509:62 | readElement(...) | provenance | MaD:3 |
 | B.java:514:19:514:26 | source(...) : Object | B.java:514:43:514:44 | in : Object | provenance |  |
 | B.java:514:29:514:31 | out [post update] : BlockingDeque [<element>] : Object | B.java:514:72:514:74 | out : BlockingDeque [<element>] : Object | provenance |  |
-| B.java:514:43:514:44 | in : Object | B.java:514:29:514:31 | out [post update] : BlockingDeque [<element>] : Object | provenance | MaD:4 |
+| B.java:514:43:514:44 | in : Object | B.java:514:29:514:31 | out [post update] : BlockingDeque [<element>] : Object | provenance | MaD:6 |
 | B.java:514:72:514:74 | out : BlockingDeque [<element>] : Object | B.java:31:28:31:42 | obj : BlockingDeque [<element>] : Object | provenance |  |
-| B.java:514:72:514:74 | out : BlockingDeque [<element>] : Object | B.java:514:60:514:75 | readElement(...) | provenance | MaD:1 |
+| B.java:514:72:514:74 | out : BlockingDeque [<element>] : Object | B.java:514:60:514:75 | readElement(...) | provenance | MaD:3 |
 | B.java:519:19:519:26 | source(...) : Object | B.java:519:44:519:45 | in : Object | provenance |  |
 | B.java:519:29:519:31 | out [post update] : BlockingDeque [<element>] : Object | B.java:519:73:519:75 | out : BlockingDeque [<element>] : Object | provenance |  |
-| B.java:519:44:519:45 | in : Object | B.java:519:29:519:31 | out [post update] : BlockingDeque [<element>] : Object | provenance | MaD:3 |
+| B.java:519:44:519:45 | in : Object | B.java:519:29:519:31 | out [post update] : BlockingDeque [<element>] : Object | provenance | MaD:5 |
 | B.java:519:73:519:75 | out : BlockingDeque [<element>] : Object | B.java:31:28:31:42 | obj : BlockingDeque [<element>] : Object | provenance |  |
-| B.java:519:73:519:75 | out : BlockingDeque [<element>] : Object | B.java:519:61:519:76 | readElement(...) | provenance | MaD:1 |
+| B.java:519:73:519:75 | out : BlockingDeque [<element>] : Object | B.java:519:61:519:76 | readElement(...) | provenance | MaD:3 |
 | B.java:524:19:524:26 | source(...) : Object | B.java:524:41:524:42 | in : Object | provenance |  |
 | B.java:524:29:524:31 | out [post update] : BlockingDeque [<element>] : Object | B.java:524:63:524:65 | out : BlockingDeque [<element>] : Object | provenance |  |
-| B.java:524:41:524:42 | in : Object | B.java:524:29:524:31 | out [post update] : BlockingDeque [<element>] : Object | provenance | MaD:8 |
+| B.java:524:41:524:42 | in : Object | B.java:524:29:524:31 | out [post update] : BlockingDeque [<element>] : Object | provenance | MaD:10 |
 | B.java:524:63:524:65 | out : BlockingDeque [<element>] : Object | B.java:31:28:31:42 | obj : BlockingDeque [<element>] : Object | provenance |  |
-| B.java:524:63:524:65 | out : BlockingDeque [<element>] : Object | B.java:524:51:524:66 | readElement(...) | provenance | MaD:1 |
+| B.java:524:63:524:65 | out : BlockingDeque [<element>] : Object | B.java:524:51:524:66 | readElement(...) | provenance | MaD:3 |
 | B.java:529:19:529:26 | source(...) : Object | B.java:529:42:529:43 | in : Object | provenance |  |
 | B.java:529:29:529:31 | out [post update] : BlockingDeque [<element>] : Object | B.java:529:64:529:66 | out : BlockingDeque [<element>] : Object | provenance |  |
-| B.java:529:42:529:43 | in : Object | B.java:529:29:529:31 | out [post update] : BlockingDeque [<element>] : Object | provenance | MaD:7 |
+| B.java:529:42:529:43 | in : Object | B.java:529:29:529:31 | out [post update] : BlockingDeque [<element>] : Object | provenance | MaD:9 |
 | B.java:529:64:529:66 | out : BlockingDeque [<element>] : Object | B.java:31:28:31:42 | obj : BlockingDeque [<element>] : Object | provenance |  |
-| B.java:529:64:529:66 | out : BlockingDeque [<element>] : Object | B.java:529:52:529:67 | readElement(...) | provenance | MaD:1 |
+| B.java:529:64:529:66 | out : BlockingDeque [<element>] : Object | B.java:529:52:529:67 | readElement(...) | provenance | MaD:3 |
 | B.java:534:26:534:60 | storeElementBlockingDeque(...) : LinkedBlockingDeque [<element>] : Object | B.java:534:63:534:64 | in : LinkedBlockingDeque [<element>] : Object | provenance |  |
 | B.java:534:52:534:59 | source(...) : Object | B.java:28:57:28:61 | obj : Object | provenance |  |
-| B.java:534:52:534:59 | source(...) : Object | B.java:534:26:534:60 | storeElementBlockingDeque(...) : LinkedBlockingDeque [<element>] : Object | provenance | MaD:52 |
-| B.java:534:63:534:64 | in : LinkedBlockingDeque [<element>] : Object | B.java:534:74:534:76 | out [post update] : Collection [<element>] : Object | provenance | MaD:12 |
+| B.java:534:52:534:59 | source(...) : Object | B.java:534:26:534:60 | storeElementBlockingDeque(...) : LinkedBlockingDeque [<element>] : Object | provenance | MaD:54 |
+| B.java:534:63:534:64 | in : LinkedBlockingDeque [<element>] : Object | B.java:534:74:534:76 | out [post update] : Collection [<element>] : Object | provenance | MaD:14 |
 | B.java:534:74:534:76 | out [post update] : Collection [<element>] : Object | B.java:534:99:534:101 | out : Collection [<element>] : Object | provenance |  |
 | B.java:534:99:534:101 | out : Collection [<element>] : Object | B.java:31:28:31:42 | obj : Collection [<element>] : Object | provenance |  |
-| B.java:534:99:534:101 | out : Collection [<element>] : Object | B.java:534:87:534:102 | readElement(...) | provenance | MaD:1 |
+| B.java:534:99:534:101 | out : Collection [<element>] : Object | B.java:534:87:534:102 | readElement(...) | provenance | MaD:3 |
 | B.java:539:26:539:60 | storeElementBlockingDeque(...) : LinkedBlockingDeque [<element>] : Object | B.java:539:63:539:64 | in : LinkedBlockingDeque [<element>] : Object | provenance |  |
 | B.java:539:52:539:59 | source(...) : Object | B.java:28:57:28:61 | obj : Object | provenance |  |
-| B.java:539:52:539:59 | source(...) : Object | B.java:539:26:539:60 | storeElementBlockingDeque(...) : LinkedBlockingDeque [<element>] : Object | provenance | MaD:52 |
-| B.java:539:63:539:64 | in : LinkedBlockingDeque [<element>] : Object | B.java:539:74:539:76 | out [post update] : Collection [<element>] : Object | provenance | MaD:11 |
+| B.java:539:52:539:59 | source(...) : Object | B.java:539:26:539:60 | storeElementBlockingDeque(...) : LinkedBlockingDeque [<element>] : Object | provenance | MaD:54 |
+| B.java:539:63:539:64 | in : LinkedBlockingDeque [<element>] : Object | B.java:539:74:539:76 | out [post update] : Collection [<element>] : Object | provenance | MaD:13 |
 | B.java:539:74:539:76 | out [post update] : Collection [<element>] : Object | B.java:539:97:539:99 | out : Collection [<element>] : Object | provenance |  |
 | B.java:539:97:539:99 | out : Collection [<element>] : Object | B.java:31:28:31:42 | obj : Collection [<element>] : Object | provenance |  |
-| B.java:539:97:539:99 | out : Collection [<element>] : Object | B.java:539:85:539:100 | readElement(...) | provenance | MaD:1 |
+| B.java:539:97:539:99 | out : Collection [<element>] : Object | B.java:539:85:539:100 | readElement(...) | provenance | MaD:3 |
 | B.java:544:19:544:41 | storeMapValue(...) : Map [<map.value>] : Object | B.java:544:51:544:71 | (...)... : ConcurrentHashMap [<map.value>] : Object | provenance |  |
 | B.java:544:33:544:40 | source(...) : Object | B.java:41:39:41:43 | obj : Object | provenance |  |
-| B.java:544:33:544:40 | source(...) : Object | B.java:544:19:544:41 | storeMapValue(...) : Map [<map.value>] : Object | provenance | MaD:210 |
+| B.java:544:33:544:40 | source(...) : Object | B.java:544:19:544:41 | storeMapValue(...) : Map [<map.value>] : Object | provenance | MaD:215 |
 | B.java:544:50:544:83 | elements(...) : Enumeration [<element>] : Object | B.java:544:103:544:105 | out : Enumeration [<element>] : Object | provenance |  |
-| B.java:544:51:544:71 | (...)... : ConcurrentHashMap [<map.value>] : Object | B.java:544:50:544:83 | elements(...) : Enumeration [<element>] : Object | provenance | MaD:17 |
+| B.java:544:51:544:71 | (...)... : ConcurrentHashMap [<map.value>] : Object | B.java:544:50:544:83 | elements(...) : Enumeration [<element>] : Object | provenance | MaD:19 |
 | B.java:544:103:544:105 | out : Enumeration [<element>] : Object | B.java:35:28:35:45 | obj : Enumeration [<element>] : Object | provenance |  |
-| B.java:544:103:544:105 | out : Enumeration [<element>] : Object | B.java:544:91:544:106 | readElement(...) | provenance | MaD:135 |
+| B.java:544:103:544:105 | out : Enumeration [<element>] : Object | B.java:544:91:544:106 | readElement(...) | provenance | MaD:137 |
 | B.java:549:19:549:41 | storeMapValue(...) : Map [<map.value>] : Object | B.java:549:51:549:64 | (...)... : Map [<map.value>] : Object | provenance |  |
 | B.java:549:33:549:40 | source(...) : Object | B.java:41:39:41:43 | obj : Object | provenance |  |
-| B.java:549:33:549:40 | source(...) : Object | B.java:549:19:549:41 | storeMapValue(...) : Map [<map.value>] : Object | provenance | MaD:210 |
+| B.java:549:33:549:40 | source(...) : Object | B.java:549:19:549:41 | storeMapValue(...) : Map [<map.value>] : Object | provenance | MaD:215 |
 | B.java:549:50:549:76 | elements(...) : Enumeration [<element>] : Object | B.java:549:96:549:98 | out : Enumeration [<element>] : Object | provenance |  |
-| B.java:549:51:549:64 | (...)... : Map [<map.value>] : Object | B.java:549:50:549:76 | elements(...) : Enumeration [<element>] : Object | provenance | MaD:123 |
+| B.java:549:51:549:64 | (...)... : Map [<map.value>] : Object | B.java:549:50:549:76 | elements(...) : Enumeration [<element>] : Object | provenance | MaD:125 |
 | B.java:549:96:549:98 | out : Enumeration [<element>] : Object | B.java:35:28:35:45 | obj : Enumeration [<element>] : Object | provenance |  |
-| B.java:549:96:549:98 | out : Enumeration [<element>] : Object | B.java:549:84:549:99 | readElement(...) | provenance | MaD:135 |
+| B.java:549:96:549:98 | out : Enumeration [<element>] : Object | B.java:549:84:549:99 | readElement(...) | provenance | MaD:137 |
 | B.java:554:19:554:41 | storeMapValue(...) : Map [<map.value>] : Object | B.java:554:51:554:64 | (...)... : Map [<map.value>] : Object | provenance |  |
 | B.java:554:33:554:40 | source(...) : Object | B.java:41:39:41:43 | obj : Object | provenance |  |
-| B.java:554:33:554:40 | source(...) : Object | B.java:554:19:554:41 | storeMapValue(...) : Map [<map.value>] : Object | provenance | MaD:210 |
+| B.java:554:33:554:40 | source(...) : Object | B.java:554:19:554:41 | storeMapValue(...) : Map [<map.value>] : Object | provenance | MaD:215 |
 | B.java:554:50:554:75 | get(...) : Object | B.java:554:83:554:85 | out | provenance |  |
-| B.java:554:51:554:64 | (...)... : Map [<map.value>] : Object | B.java:554:50:554:75 | get(...) : Object | provenance | MaD:124 |
+| B.java:554:51:554:64 | (...)... : Map [<map.value>] : Object | B.java:554:50:554:75 | get(...) : Object | provenance | MaD:126 |
 | B.java:559:19:559:41 | storeMapValue(...) : Map [<map.value>] : Object | B.java:559:51:559:64 | (...)... : Map [<map.value>] : Object | provenance |  |
 | B.java:559:33:559:40 | source(...) : Object | B.java:41:39:41:43 | obj : Object | provenance |  |
-| B.java:559:33:559:40 | source(...) : Object | B.java:559:19:559:41 | storeMapValue(...) : Map [<map.value>] : Object | provenance | MaD:210 |
+| B.java:559:33:559:40 | source(...) : Object | B.java:559:19:559:41 | storeMapValue(...) : Map [<map.value>] : Object | provenance | MaD:215 |
 | B.java:559:50:559:80 | put(...) : Object | B.java:559:88:559:90 | out | provenance |  |
-| B.java:559:51:559:64 | (...)... : Map [<map.value>] : Object | B.java:559:50:559:80 | put(...) : Object | provenance | MaD:126 |
+| B.java:559:51:559:64 | (...)... : Map [<map.value>] : Object | B.java:559:50:559:80 | put(...) : Object | provenance | MaD:130 |
 | B.java:564:19:564:26 | source(...) : Object | B.java:564:37:564:38 | in : Object | provenance |  |
 | B.java:564:29:564:31 | out [post update] : Dictionary [<map.key>] : Object | B.java:564:63:564:65 | out : Dictionary [<map.key>] : Object | provenance |  |
-| B.java:564:37:564:38 | in : Object | B.java:564:29:564:31 | out [post update] : Dictionary [<map.key>] : Object | provenance | MaD:127 |
+| B.java:564:37:564:38 | in : Object | B.java:564:29:564:31 | out [post update] : Dictionary [<map.key>] : Object | provenance | MaD:128 |
 | B.java:564:63:564:65 | out : Dictionary [<map.key>] : Object | B.java:45:29:45:47 | obj : Dictionary [<map.key>] : Object | provenance |  |
-| B.java:564:63:564:65 | out : Dictionary [<map.key>] : Object | B.java:564:52:564:66 | readMapKey(...) | provenance | MaD:125 |
+| B.java:564:63:564:65 | out : Dictionary [<map.key>] : Object | B.java:564:52:564:66 | readMapKey(...) | provenance | MaD:127 |
 | B.java:569:19:569:26 | source(...) : Object | B.java:569:42:569:43 | in : Object | provenance |  |
 | B.java:569:29:569:31 | out [post update] : Dictionary [<map.value>] : Object | B.java:569:65:569:67 | out : Dictionary [<map.value>] : Object | provenance |  |
-| B.java:569:42:569:43 | in : Object | B.java:569:29:569:31 | out [post update] : Dictionary [<map.value>] : Object | provenance | MaD:128 |
+| B.java:569:42:569:43 | in : Object | B.java:569:29:569:31 | out [post update] : Dictionary [<map.value>] : Object | provenance | MaD:129 |
 | B.java:569:65:569:67 | out : Dictionary [<map.value>] : Object | B.java:49:31:49:49 | obj : Dictionary [<map.value>] : Object | provenance |  |
-| B.java:569:65:569:67 | out : Dictionary [<map.value>] : Object | B.java:569:52:569:68 | readMapValue(...) | provenance | MaD:124 |
+| B.java:569:65:569:67 | out : Dictionary [<map.value>] : Object | B.java:569:52:569:68 | readMapValue(...) | provenance | MaD:126 |
 | B.java:574:19:574:41 | storeMapValue(...) : Map [<map.value>] : Object | B.java:574:51:574:64 | (...)... : Map [<map.value>] : Object | provenance |  |
 | B.java:574:33:574:40 | source(...) : Object | B.java:41:39:41:43 | obj : Object | provenance |  |
-| B.java:574:33:574:40 | source(...) : Object | B.java:574:19:574:41 | storeMapValue(...) : Map [<map.value>] : Object | provenance | MaD:210 |
+| B.java:574:33:574:40 | source(...) : Object | B.java:574:19:574:41 | storeMapValue(...) : Map [<map.value>] : Object | provenance | MaD:215 |
 | B.java:574:50:574:78 | remove(...) : Object | B.java:574:86:574:88 | out | provenance |  |
-| B.java:574:51:574:64 | (...)... : Map [<map.value>] : Object | B.java:574:50:574:78 | remove(...) : Object | provenance | MaD:129 |
+| B.java:574:51:574:64 | (...)... : Map [<map.value>] : Object | B.java:574:50:574:78 | remove(...) : Object | provenance | MaD:131 |
 | B.java:579:19:579:39 | storeMapKey(...) : TreeMap [<map.key>] : Object | B.java:579:49:579:64 | (...)... : TreeMap [<map.key>] : Object | provenance |  |
 | B.java:579:31:579:38 | source(...) : Object | B.java:38:37:38:41 | obj : Object | provenance |  |
-| B.java:579:31:579:38 | source(...) : Object | B.java:579:19:579:39 | storeMapKey(...) : TreeMap [<map.key>] : Object | provenance | MaD:209 |
+| B.java:579:31:579:38 | source(...) : Object | B.java:579:19:579:39 | storeMapKey(...) : TreeMap [<map.key>] : Object | provenance | MaD:214 |
 | B.java:579:48:579:84 | ceilingEntry(...) : Entry [<map.key>] : Object | B.java:579:103:579:105 | out : Entry [<map.key>] : Object | provenance |  |
-| B.java:579:49:579:64 | (...)... : TreeMap [<map.key>] : Object | B.java:579:48:579:84 | ceilingEntry(...) : Entry [<map.key>] : Object | provenance | MaD:227 |
+| B.java:579:49:579:64 | (...)... : TreeMap [<map.key>] : Object | B.java:579:48:579:84 | ceilingEntry(...) : Entry [<map.key>] : Object | provenance | MaD:229 |
 | B.java:579:103:579:105 | out : Entry [<map.key>] : Object | B.java:43:29:43:46 | obj : Entry [<map.key>] : Object | provenance |  |
-| B.java:579:103:579:105 | out : Entry [<map.key>] : Object | B.java:579:92:579:106 | readMapKey(...) | provenance | MaD:223 |
+| B.java:579:103:579:105 | out : Entry [<map.key>] : Object | B.java:579:92:579:106 | readMapKey(...) | provenance | MaD:174 |
 | B.java:584:19:584:41 | storeMapValue(...) : Map [<map.value>] : Object | B.java:584:51:584:66 | (...)... : NavigableMap [<map.value>] : Object | provenance |  |
 | B.java:584:33:584:40 | source(...) : Object | B.java:41:39:41:43 | obj : Object | provenance |  |
-| B.java:584:33:584:40 | source(...) : Object | B.java:584:19:584:41 | storeMapValue(...) : Map [<map.value>] : Object | provenance | MaD:210 |
+| B.java:584:33:584:40 | source(...) : Object | B.java:584:19:584:41 | storeMapValue(...) : Map [<map.value>] : Object | provenance | MaD:215 |
 | B.java:584:50:584:86 | ceilingEntry(...) : Entry [<map.value>] : Object | B.java:584:107:584:109 | out : Entry [<map.value>] : Object | provenance |  |
-| B.java:584:51:584:66 | (...)... : NavigableMap [<map.value>] : Object | B.java:584:50:584:86 | ceilingEntry(...) : Entry [<map.value>] : Object | provenance | MaD:228 |
+| B.java:584:51:584:66 | (...)... : NavigableMap [<map.value>] : Object | B.java:584:50:584:86 | ceilingEntry(...) : Entry [<map.value>] : Object | provenance | MaD:230 |
 | B.java:584:107:584:109 | out : Entry [<map.value>] : Object | B.java:47:31:47:48 | obj : Entry [<map.value>] : Object | provenance |  |
-| B.java:584:107:584:109 | out : Entry [<map.value>] : Object | B.java:584:94:584:110 | readMapValue(...) | provenance | MaD:224 |
+| B.java:584:107:584:109 | out : Entry [<map.value>] : Object | B.java:584:94:584:110 | readMapValue(...) | provenance | MaD:175 |
 | B.java:589:19:589:39 | storeMapKey(...) : TreeMap [<map.key>] : Object | B.java:589:49:589:64 | (...)... : TreeMap [<map.key>] : Object | provenance |  |
 | B.java:589:31:589:38 | source(...) : Object | B.java:38:37:38:41 | obj : Object | provenance |  |
-| B.java:589:31:589:38 | source(...) : Object | B.java:589:19:589:39 | storeMapKey(...) : TreeMap [<map.key>] : Object | provenance | MaD:209 |
+| B.java:589:31:589:38 | source(...) : Object | B.java:589:19:589:39 | storeMapKey(...) : TreeMap [<map.key>] : Object | provenance | MaD:214 |
 | B.java:589:48:589:81 | descendingMap(...) : NavigableMap [<map.key>] : Object | B.java:589:100:589:102 | out : NavigableMap [<map.key>] : Object | provenance |  |
-| B.java:589:49:589:64 | (...)... : TreeMap [<map.key>] : Object | B.java:589:48:589:81 | descendingMap(...) : NavigableMap [<map.key>] : Object | provenance | MaD:229 |
+| B.java:589:49:589:64 | (...)... : TreeMap [<map.key>] : Object | B.java:589:48:589:81 | descendingMap(...) : NavigableMap [<map.key>] : Object | provenance | MaD:231 |
 | B.java:589:100:589:102 | out : NavigableMap [<map.key>] : Object | B.java:44:29:44:40 | obj : NavigableMap [<map.key>] : Object | provenance |  |
-| B.java:589:100:589:102 | out : NavigableMap [<map.key>] : Object | B.java:589:89:589:103 | readMapKey(...) | provenance | MaD:184 |
+| B.java:589:100:589:102 | out : NavigableMap [<map.key>] : Object | B.java:589:89:589:103 | readMapKey(...) | provenance | MaD:212 |
 | B.java:594:19:594:41 | storeMapValue(...) : Map [<map.value>] : Object | B.java:594:51:594:66 | (...)... : NavigableMap [<map.value>] : Object | provenance |  |
 | B.java:594:33:594:40 | source(...) : Object | B.java:41:39:41:43 | obj : Object | provenance |  |
-| B.java:594:33:594:40 | source(...) : Object | B.java:594:19:594:41 | storeMapValue(...) : Map [<map.value>] : Object | provenance | MaD:210 |
+| B.java:594:33:594:40 | source(...) : Object | B.java:594:19:594:41 | storeMapValue(...) : Map [<map.value>] : Object | provenance | MaD:215 |
 | B.java:594:50:594:83 | descendingMap(...) : NavigableMap [<map.value>] : Object | B.java:594:104:594:106 | out : NavigableMap [<map.value>] : Object | provenance |  |
-| B.java:594:51:594:66 | (...)... : NavigableMap [<map.value>] : Object | B.java:594:50:594:83 | descendingMap(...) : NavigableMap [<map.value>] : Object | provenance | MaD:230 |
+| B.java:594:51:594:66 | (...)... : NavigableMap [<map.value>] : Object | B.java:594:50:594:83 | descendingMap(...) : NavigableMap [<map.value>] : Object | provenance | MaD:232 |
 | B.java:594:104:594:106 | out : NavigableMap [<map.value>] : Object | B.java:48:31:48:42 | obj : NavigableMap [<map.value>] : Object | provenance |  |
-| B.java:594:104:594:106 | out : NavigableMap [<map.value>] : Object | B.java:594:91:594:107 | readMapValue(...) | provenance | MaD:181 |
+| B.java:594:104:594:106 | out : NavigableMap [<map.value>] : Object | B.java:594:91:594:107 | readMapValue(...) | provenance | MaD:209 |
 | B.java:599:19:599:39 | storeMapKey(...) : TreeMap [<map.key>] : Object | B.java:599:49:599:64 | (...)... : TreeMap [<map.key>] : Object | provenance |  |
 | B.java:599:31:599:38 | source(...) : Object | B.java:38:37:38:41 | obj : Object | provenance |  |
-| B.java:599:31:599:38 | source(...) : Object | B.java:599:19:599:39 | storeMapKey(...) : TreeMap [<map.key>] : Object | provenance | MaD:209 |
+| B.java:599:31:599:38 | source(...) : Object | B.java:599:19:599:39 | storeMapKey(...) : TreeMap [<map.key>] : Object | provenance | MaD:214 |
 | B.java:599:48:599:78 | firstEntry(...) : Entry [<map.key>] : Object | B.java:599:97:599:99 | out : Entry [<map.key>] : Object | provenance |  |
-| B.java:599:49:599:64 | (...)... : TreeMap [<map.key>] : Object | B.java:599:48:599:78 | firstEntry(...) : Entry [<map.key>] : Object | provenance | MaD:231 |
-| B.java:599:49:599:64 | (...)... : TreeMap [<map.key>] : Object | B.java:599:48:599:78 | firstEntry(...) : Entry [<map.key>] : Object | provenance | MaD:277 |
+| B.java:599:49:599:64 | (...)... : TreeMap [<map.key>] : Object | B.java:599:48:599:78 | firstEntry(...) : Entry [<map.key>] : Object | provenance | MaD:233 |
+| B.java:599:49:599:64 | (...)... : TreeMap [<map.key>] : Object | B.java:599:48:599:78 | firstEntry(...) : Entry [<map.key>] : Object | provenance | MaD:279 |
 | B.java:599:97:599:99 | out : Entry [<map.key>] : Object | B.java:43:29:43:46 | obj : Entry [<map.key>] : Object | provenance |  |
-| B.java:599:97:599:99 | out : Entry [<map.key>] : Object | B.java:599:86:599:100 | readMapKey(...) | provenance | MaD:223 |
+| B.java:599:97:599:99 | out : Entry [<map.key>] : Object | B.java:599:86:599:100 | readMapKey(...) | provenance | MaD:174 |
 | B.java:604:19:604:41 | storeMapValue(...) : Map [<map.value>] : Object | B.java:604:51:604:66 | (...)... : NavigableMap [<map.value>] : Object | provenance |  |
 | B.java:604:33:604:40 | source(...) : Object | B.java:41:39:41:43 | obj : Object | provenance |  |
-| B.java:604:33:604:40 | source(...) : Object | B.java:604:19:604:41 | storeMapValue(...) : Map [<map.value>] : Object | provenance | MaD:210 |
+| B.java:604:33:604:40 | source(...) : Object | B.java:604:19:604:41 | storeMapValue(...) : Map [<map.value>] : Object | provenance | MaD:215 |
 | B.java:604:50:604:80 | firstEntry(...) : Entry [<map.value>] : Object | B.java:604:101:604:103 | out : Entry [<map.value>] : Object | provenance |  |
-| B.java:604:51:604:66 | (...)... : NavigableMap [<map.value>] : Object | B.java:604:50:604:80 | firstEntry(...) : Entry [<map.value>] : Object | provenance | MaD:232 |
-| B.java:604:51:604:66 | (...)... : NavigableMap [<map.value>] : Object | B.java:604:50:604:80 | firstEntry(...) : Entry [<map.value>] : Object | provenance | MaD:278 |
+| B.java:604:51:604:66 | (...)... : NavigableMap [<map.value>] : Object | B.java:604:50:604:80 | firstEntry(...) : Entry [<map.value>] : Object | provenance | MaD:234 |
+| B.java:604:51:604:66 | (...)... : NavigableMap [<map.value>] : Object | B.java:604:50:604:80 | firstEntry(...) : Entry [<map.value>] : Object | provenance | MaD:280 |
 | B.java:604:101:604:103 | out : Entry [<map.value>] : Object | B.java:47:31:47:48 | obj : Entry [<map.value>] : Object | provenance |  |
-| B.java:604:101:604:103 | out : Entry [<map.value>] : Object | B.java:604:88:604:104 | readMapValue(...) | provenance | MaD:224 |
+| B.java:604:101:604:103 | out : Entry [<map.value>] : Object | B.java:604:88:604:104 | readMapValue(...) | provenance | MaD:175 |
 | B.java:609:19:609:39 | storeMapKey(...) : TreeMap [<map.key>] : Object | B.java:609:49:609:64 | (...)... : TreeMap [<map.key>] : Object | provenance |  |
 | B.java:609:31:609:38 | source(...) : Object | B.java:38:37:38:41 | obj : Object | provenance |  |
-| B.java:609:31:609:38 | source(...) : Object | B.java:609:19:609:39 | storeMapKey(...) : TreeMap [<map.key>] : Object | provenance | MaD:209 |
+| B.java:609:31:609:38 | source(...) : Object | B.java:609:19:609:39 | storeMapKey(...) : TreeMap [<map.key>] : Object | provenance | MaD:214 |
 | B.java:609:48:609:82 | floorEntry(...) : Entry [<map.key>] : Object | B.java:609:101:609:103 | out : Entry [<map.key>] : Object | provenance |  |
-| B.java:609:49:609:64 | (...)... : TreeMap [<map.key>] : Object | B.java:609:48:609:82 | floorEntry(...) : Entry [<map.key>] : Object | provenance | MaD:233 |
+| B.java:609:49:609:64 | (...)... : TreeMap [<map.key>] : Object | B.java:609:48:609:82 | floorEntry(...) : Entry [<map.key>] : Object | provenance | MaD:235 |
 | B.java:609:101:609:103 | out : Entry [<map.key>] : Object | B.java:43:29:43:46 | obj : Entry [<map.key>] : Object | provenance |  |
-| B.java:609:101:609:103 | out : Entry [<map.key>] : Object | B.java:609:90:609:104 | readMapKey(...) | provenance | MaD:223 |
+| B.java:609:101:609:103 | out : Entry [<map.key>] : Object | B.java:609:90:609:104 | readMapKey(...) | provenance | MaD:174 |
 | B.java:614:19:614:41 | storeMapValue(...) : Map [<map.value>] : Object | B.java:614:51:614:66 | (...)... : NavigableMap [<map.value>] : Object | provenance |  |
 | B.java:614:33:614:40 | source(...) : Object | B.java:41:39:41:43 | obj : Object | provenance |  |
-| B.java:614:33:614:40 | source(...) : Object | B.java:614:19:614:41 | storeMapValue(...) : Map [<map.value>] : Object | provenance | MaD:210 |
+| B.java:614:33:614:40 | source(...) : Object | B.java:614:19:614:41 | storeMapValue(...) : Map [<map.value>] : Object | provenance | MaD:215 |
 | B.java:614:50:614:84 | floorEntry(...) : Entry [<map.value>] : Object | B.java:614:105:614:107 | out : Entry [<map.value>] : Object | provenance |  |
-| B.java:614:51:614:66 | (...)... : NavigableMap [<map.value>] : Object | B.java:614:50:614:84 | floorEntry(...) : Entry [<map.value>] : Object | provenance | MaD:234 |
+| B.java:614:51:614:66 | (...)... : NavigableMap [<map.value>] : Object | B.java:614:50:614:84 | floorEntry(...) : Entry [<map.value>] : Object | provenance | MaD:236 |
 | B.java:614:105:614:107 | out : Entry [<map.value>] : Object | B.java:47:31:47:48 | obj : Entry [<map.value>] : Object | provenance |  |
-| B.java:614:105:614:107 | out : Entry [<map.value>] : Object | B.java:614:92:614:108 | readMapValue(...) | provenance | MaD:224 |
+| B.java:614:105:614:107 | out : Entry [<map.value>] : Object | B.java:614:92:614:108 | readMapValue(...) | provenance | MaD:175 |
 | B.java:619:19:619:39 | storeMapKey(...) : TreeMap [<map.key>] : Object | B.java:619:49:619:64 | (...)... : TreeMap [<map.key>] : Object | provenance |  |
 | B.java:619:31:619:38 | source(...) : Object | B.java:38:37:38:41 | obj : Object | provenance |  |
-| B.java:619:31:619:38 | source(...) : Object | B.java:619:19:619:39 | storeMapKey(...) : TreeMap [<map.key>] : Object | provenance | MaD:209 |
+| B.java:619:31:619:38 | source(...) : Object | B.java:619:19:619:39 | storeMapKey(...) : TreeMap [<map.key>] : Object | provenance | MaD:214 |
 | B.java:619:48:619:84 | headMap(...) : NavigableMap [<map.key>] : Object | B.java:619:103:619:105 | out : NavigableMap [<map.key>] : Object | provenance |  |
-| B.java:619:49:619:64 | (...)... : TreeMap [<map.key>] : Object | B.java:619:48:619:84 | headMap(...) : NavigableMap [<map.key>] : Object | provenance | MaD:235 |
+| B.java:619:49:619:64 | (...)... : TreeMap [<map.key>] : Object | B.java:619:48:619:84 | headMap(...) : NavigableMap [<map.key>] : Object | provenance | MaD:237 |
 | B.java:619:103:619:105 | out : NavigableMap [<map.key>] : Object | B.java:44:29:44:40 | obj : NavigableMap [<map.key>] : Object | provenance |  |
-| B.java:619:103:619:105 | out : NavigableMap [<map.key>] : Object | B.java:619:92:619:106 | readMapKey(...) | provenance | MaD:184 |
+| B.java:619:103:619:105 | out : NavigableMap [<map.key>] : Object | B.java:619:92:619:106 | readMapKey(...) | provenance | MaD:212 |
 | B.java:624:19:624:41 | storeMapValue(...) : Map [<map.value>] : Object | B.java:624:51:624:66 | (...)... : NavigableMap [<map.value>] : Object | provenance |  |
 | B.java:624:33:624:40 | source(...) : Object | B.java:41:39:41:43 | obj : Object | provenance |  |
-| B.java:624:33:624:40 | source(...) : Object | B.java:624:19:624:41 | storeMapValue(...) : Map [<map.value>] : Object | provenance | MaD:210 |
+| B.java:624:33:624:40 | source(...) : Object | B.java:624:19:624:41 | storeMapValue(...) : Map [<map.value>] : Object | provenance | MaD:215 |
 | B.java:624:50:624:86 | headMap(...) : NavigableMap [<map.value>] : Object | B.java:624:107:624:109 | out : NavigableMap [<map.value>] : Object | provenance |  |
-| B.java:624:51:624:66 | (...)... : NavigableMap [<map.value>] : Object | B.java:624:50:624:86 | headMap(...) : NavigableMap [<map.value>] : Object | provenance | MaD:236 |
+| B.java:624:51:624:66 | (...)... : NavigableMap [<map.value>] : Object | B.java:624:50:624:86 | headMap(...) : NavigableMap [<map.value>] : Object | provenance | MaD:238 |
 | B.java:624:107:624:109 | out : NavigableMap [<map.value>] : Object | B.java:48:31:48:42 | obj : NavigableMap [<map.value>] : Object | provenance |  |
-| B.java:624:107:624:109 | out : NavigableMap [<map.value>] : Object | B.java:624:94:624:110 | readMapValue(...) | provenance | MaD:181 |
+| B.java:624:107:624:109 | out : NavigableMap [<map.value>] : Object | B.java:624:94:624:110 | readMapValue(...) | provenance | MaD:209 |
 | B.java:629:19:629:39 | storeMapKey(...) : TreeMap [<map.key>] : Object | B.java:629:49:629:64 | (...)... : TreeMap [<map.key>] : Object | provenance |  |
 | B.java:629:31:629:38 | source(...) : Object | B.java:38:37:38:41 | obj : Object | provenance |  |
-| B.java:629:31:629:38 | source(...) : Object | B.java:629:19:629:39 | storeMapKey(...) : TreeMap [<map.key>] : Object | provenance | MaD:209 |
+| B.java:629:31:629:38 | source(...) : Object | B.java:629:19:629:39 | storeMapKey(...) : TreeMap [<map.key>] : Object | provenance | MaD:214 |
 | B.java:629:48:629:83 | higherEntry(...) : Entry [<map.key>] : Object | B.java:629:102:629:104 | out : Entry [<map.key>] : Object | provenance |  |
-| B.java:629:49:629:64 | (...)... : TreeMap [<map.key>] : Object | B.java:629:48:629:83 | higherEntry(...) : Entry [<map.key>] : Object | provenance | MaD:237 |
+| B.java:629:49:629:64 | (...)... : TreeMap [<map.key>] : Object | B.java:629:48:629:83 | higherEntry(...) : Entry [<map.key>] : Object | provenance | MaD:239 |
 | B.java:629:102:629:104 | out : Entry [<map.key>] : Object | B.java:43:29:43:46 | obj : Entry [<map.key>] : Object | provenance |  |
-| B.java:629:102:629:104 | out : Entry [<map.key>] : Object | B.java:629:91:629:105 | readMapKey(...) | provenance | MaD:223 |
+| B.java:629:102:629:104 | out : Entry [<map.key>] : Object | B.java:629:91:629:105 | readMapKey(...) | provenance | MaD:174 |
 | B.java:634:19:634:41 | storeMapValue(...) : Map [<map.value>] : Object | B.java:634:51:634:66 | (...)... : NavigableMap [<map.value>] : Object | provenance |  |
 | B.java:634:33:634:40 | source(...) : Object | B.java:41:39:41:43 | obj : Object | provenance |  |
-| B.java:634:33:634:40 | source(...) : Object | B.java:634:19:634:41 | storeMapValue(...) : Map [<map.value>] : Object | provenance | MaD:210 |
+| B.java:634:33:634:40 | source(...) : Object | B.java:634:19:634:41 | storeMapValue(...) : Map [<map.value>] : Object | provenance | MaD:215 |
 | B.java:634:50:634:85 | higherEntry(...) : Entry [<map.value>] : Object | B.java:634:106:634:108 | out : Entry [<map.value>] : Object | provenance |  |
-| B.java:634:51:634:66 | (...)... : NavigableMap [<map.value>] : Object | B.java:634:50:634:85 | higherEntry(...) : Entry [<map.value>] : Object | provenance | MaD:238 |
+| B.java:634:51:634:66 | (...)... : NavigableMap [<map.value>] : Object | B.java:634:50:634:85 | higherEntry(...) : Entry [<map.value>] : Object | provenance | MaD:240 |
 | B.java:634:106:634:108 | out : Entry [<map.value>] : Object | B.java:47:31:47:48 | obj : Entry [<map.value>] : Object | provenance |  |
-| B.java:634:106:634:108 | out : Entry [<map.value>] : Object | B.java:634:93:634:109 | readMapValue(...) | provenance | MaD:224 |
+| B.java:634:106:634:108 | out : Entry [<map.value>] : Object | B.java:634:93:634:109 | readMapValue(...) | provenance | MaD:175 |
 | B.java:639:19:639:39 | storeMapKey(...) : TreeMap [<map.key>] : Object | B.java:639:49:639:64 | (...)... : TreeMap [<map.key>] : Object | provenance |  |
 | B.java:639:31:639:38 | source(...) : Object | B.java:38:37:38:41 | obj : Object | provenance |  |
-| B.java:639:31:639:38 | source(...) : Object | B.java:639:19:639:39 | storeMapKey(...) : TreeMap [<map.key>] : Object | provenance | MaD:209 |
+| B.java:639:31:639:38 | source(...) : Object | B.java:639:19:639:39 | storeMapKey(...) : TreeMap [<map.key>] : Object | provenance | MaD:214 |
 | B.java:639:48:639:77 | lastEntry(...) : Entry [<map.key>] : Object | B.java:639:96:639:98 | out : Entry [<map.key>] : Object | provenance |  |
-| B.java:639:49:639:64 | (...)... : TreeMap [<map.key>] : Object | B.java:639:48:639:77 | lastEntry(...) : Entry [<map.key>] : Object | provenance | MaD:239 |
-| B.java:639:49:639:64 | (...)... : TreeMap [<map.key>] : Object | B.java:639:48:639:77 | lastEntry(...) : Entry [<map.key>] : Object | provenance | MaD:279 |
+| B.java:639:49:639:64 | (...)... : TreeMap [<map.key>] : Object | B.java:639:48:639:77 | lastEntry(...) : Entry [<map.key>] : Object | provenance | MaD:241 |
+| B.java:639:49:639:64 | (...)... : TreeMap [<map.key>] : Object | B.java:639:48:639:77 | lastEntry(...) : Entry [<map.key>] : Object | provenance | MaD:281 |
 | B.java:639:96:639:98 | out : Entry [<map.key>] : Object | B.java:43:29:43:46 | obj : Entry [<map.key>] : Object | provenance |  |
-| B.java:639:96:639:98 | out : Entry [<map.key>] : Object | B.java:639:85:639:99 | readMapKey(...) | provenance | MaD:223 |
+| B.java:639:96:639:98 | out : Entry [<map.key>] : Object | B.java:639:85:639:99 | readMapKey(...) | provenance | MaD:174 |
 | B.java:644:19:644:41 | storeMapValue(...) : Map [<map.value>] : Object | B.java:644:51:644:66 | (...)... : NavigableMap [<map.value>] : Object | provenance |  |
 | B.java:644:33:644:40 | source(...) : Object | B.java:41:39:41:43 | obj : Object | provenance |  |
-| B.java:644:33:644:40 | source(...) : Object | B.java:644:19:644:41 | storeMapValue(...) : Map [<map.value>] : Object | provenance | MaD:210 |
+| B.java:644:33:644:40 | source(...) : Object | B.java:644:19:644:41 | storeMapValue(...) : Map [<map.value>] : Object | provenance | MaD:215 |
 | B.java:644:50:644:79 | lastEntry(...) : Entry [<map.value>] : Object | B.java:644:100:644:102 | out : Entry [<map.value>] : Object | provenance |  |
-| B.java:644:51:644:66 | (...)... : NavigableMap [<map.value>] : Object | B.java:644:50:644:79 | lastEntry(...) : Entry [<map.value>] : Object | provenance | MaD:240 |
-| B.java:644:51:644:66 | (...)... : NavigableMap [<map.value>] : Object | B.java:644:50:644:79 | lastEntry(...) : Entry [<map.value>] : Object | provenance | MaD:280 |
+| B.java:644:51:644:66 | (...)... : NavigableMap [<map.value>] : Object | B.java:644:50:644:79 | lastEntry(...) : Entry [<map.value>] : Object | provenance | MaD:242 |
+| B.java:644:51:644:66 | (...)... : NavigableMap [<map.value>] : Object | B.java:644:50:644:79 | lastEntry(...) : Entry [<map.value>] : Object | provenance | MaD:282 |
 | B.java:644:100:644:102 | out : Entry [<map.value>] : Object | B.java:47:31:47:48 | obj : Entry [<map.value>] : Object | provenance |  |
-| B.java:644:100:644:102 | out : Entry [<map.value>] : Object | B.java:644:87:644:103 | readMapValue(...) | provenance | MaD:224 |
+| B.java:644:100:644:102 | out : Entry [<map.value>] : Object | B.java:644:87:644:103 | readMapValue(...) | provenance | MaD:175 |
 | B.java:649:19:649:39 | storeMapKey(...) : TreeMap [<map.key>] : Object | B.java:649:49:649:64 | (...)... : TreeMap [<map.key>] : Object | provenance |  |
 | B.java:649:31:649:38 | source(...) : Object | B.java:38:37:38:41 | obj : Object | provenance |  |
-| B.java:649:31:649:38 | source(...) : Object | B.java:649:19:649:39 | storeMapKey(...) : TreeMap [<map.key>] : Object | provenance | MaD:209 |
+| B.java:649:31:649:38 | source(...) : Object | B.java:649:19:649:39 | storeMapKey(...) : TreeMap [<map.key>] : Object | provenance | MaD:214 |
 | B.java:649:48:649:82 | lowerEntry(...) : Entry [<map.key>] : Object | B.java:649:101:649:103 | out : Entry [<map.key>] : Object | provenance |  |
-| B.java:649:49:649:64 | (...)... : TreeMap [<map.key>] : Object | B.java:649:48:649:82 | lowerEntry(...) : Entry [<map.key>] : Object | provenance | MaD:241 |
+| B.java:649:49:649:64 | (...)... : TreeMap [<map.key>] : Object | B.java:649:48:649:82 | lowerEntry(...) : Entry [<map.key>] : Object | provenance | MaD:243 |
 | B.java:649:101:649:103 | out : Entry [<map.key>] : Object | B.java:43:29:43:46 | obj : Entry [<map.key>] : Object | provenance |  |
-| B.java:649:101:649:103 | out : Entry [<map.key>] : Object | B.java:649:90:649:104 | readMapKey(...) | provenance | MaD:223 |
+| B.java:649:101:649:103 | out : Entry [<map.key>] : Object | B.java:649:90:649:104 | readMapKey(...) | provenance | MaD:174 |
 | B.java:654:19:654:41 | storeMapValue(...) : Map [<map.value>] : Object | B.java:654:51:654:66 | (...)... : NavigableMap [<map.value>] : Object | provenance |  |
 | B.java:654:33:654:40 | source(...) : Object | B.java:41:39:41:43 | obj : Object | provenance |  |
-| B.java:654:33:654:40 | source(...) : Object | B.java:654:19:654:41 | storeMapValue(...) : Map [<map.value>] : Object | provenance | MaD:210 |
+| B.java:654:33:654:40 | source(...) : Object | B.java:654:19:654:41 | storeMapValue(...) : Map [<map.value>] : Object | provenance | MaD:215 |
 | B.java:654:50:654:84 | lowerEntry(...) : Entry [<map.value>] : Object | B.java:654:105:654:107 | out : Entry [<map.value>] : Object | provenance |  |
-| B.java:654:51:654:66 | (...)... : NavigableMap [<map.value>] : Object | B.java:654:50:654:84 | lowerEntry(...) : Entry [<map.value>] : Object | provenance | MaD:242 |
+| B.java:654:51:654:66 | (...)... : NavigableMap [<map.value>] : Object | B.java:654:50:654:84 | lowerEntry(...) : Entry [<map.value>] : Object | provenance | MaD:244 |
 | B.java:654:105:654:107 | out : Entry [<map.value>] : Object | B.java:47:31:47:48 | obj : Entry [<map.value>] : Object | provenance |  |
-| B.java:654:105:654:107 | out : Entry [<map.value>] : Object | B.java:654:92:654:108 | readMapValue(...) | provenance | MaD:224 |
+| B.java:654:105:654:107 | out : Entry [<map.value>] : Object | B.java:654:92:654:108 | readMapValue(...) | provenance | MaD:175 |
 | B.java:659:19:659:39 | storeMapKey(...) : TreeMap [<map.key>] : Object | B.java:659:49:659:64 | (...)... : TreeMap [<map.key>] : Object | provenance |  |
 | B.java:659:31:659:38 | source(...) : Object | B.java:38:37:38:41 | obj : Object | provenance |  |
-| B.java:659:31:659:38 | source(...) : Object | B.java:659:19:659:39 | storeMapKey(...) : TreeMap [<map.key>] : Object | provenance | MaD:209 |
+| B.java:659:31:659:38 | source(...) : Object | B.java:659:19:659:39 | storeMapKey(...) : TreeMap [<map.key>] : Object | provenance | MaD:214 |
 | B.java:659:48:659:82 | pollFirstEntry(...) : Entry [<map.key>] : Object | B.java:659:101:659:103 | out : Entry [<map.key>] : Object | provenance |  |
-| B.java:659:49:659:64 | (...)... : TreeMap [<map.key>] : Object | B.java:659:48:659:82 | pollFirstEntry(...) : Entry [<map.key>] : Object | provenance | MaD:243 |
-| B.java:659:49:659:64 | (...)... : TreeMap [<map.key>] : Object | B.java:659:48:659:82 | pollFirstEntry(...) : Entry [<map.key>] : Object | provenance | MaD:281 |
+| B.java:659:49:659:64 | (...)... : TreeMap [<map.key>] : Object | B.java:659:48:659:82 | pollFirstEntry(...) : Entry [<map.key>] : Object | provenance | MaD:245 |
+| B.java:659:49:659:64 | (...)... : TreeMap [<map.key>] : Object | B.java:659:48:659:82 | pollFirstEntry(...) : Entry [<map.key>] : Object | provenance | MaD:283 |
 | B.java:659:101:659:103 | out : Entry [<map.key>] : Object | B.java:43:29:43:46 | obj : Entry [<map.key>] : Object | provenance |  |
-| B.java:659:101:659:103 | out : Entry [<map.key>] : Object | B.java:659:90:659:104 | readMapKey(...) | provenance | MaD:223 |
+| B.java:659:101:659:103 | out : Entry [<map.key>] : Object | B.java:659:90:659:104 | readMapKey(...) | provenance | MaD:174 |
 | B.java:664:19:664:41 | storeMapValue(...) : Map [<map.value>] : Object | B.java:664:51:664:66 | (...)... : NavigableMap [<map.value>] : Object | provenance |  |
 | B.java:664:33:664:40 | source(...) : Object | B.java:41:39:41:43 | obj : Object | provenance |  |
-| B.java:664:33:664:40 | source(...) : Object | B.java:664:19:664:41 | storeMapValue(...) : Map [<map.value>] : Object | provenance | MaD:210 |
+| B.java:664:33:664:40 | source(...) : Object | B.java:664:19:664:41 | storeMapValue(...) : Map [<map.value>] : Object | provenance | MaD:215 |
 | B.java:664:50:664:84 | pollFirstEntry(...) : Entry [<map.value>] : Object | B.java:664:105:664:107 | out : Entry [<map.value>] : Object | provenance |  |
-| B.java:664:51:664:66 | (...)... : NavigableMap [<map.value>] : Object | B.java:664:50:664:84 | pollFirstEntry(...) : Entry [<map.value>] : Object | provenance | MaD:244 |
-| B.java:664:51:664:66 | (...)... : NavigableMap [<map.value>] : Object | B.java:664:50:664:84 | pollFirstEntry(...) : Entry [<map.value>] : Object | provenance | MaD:282 |
+| B.java:664:51:664:66 | (...)... : NavigableMap [<map.value>] : Object | B.java:664:50:664:84 | pollFirstEntry(...) : Entry [<map.value>] : Object | provenance | MaD:246 |
+| B.java:664:51:664:66 | (...)... : NavigableMap [<map.value>] : Object | B.java:664:50:664:84 | pollFirstEntry(...) : Entry [<map.value>] : Object | provenance | MaD:284 |
 | B.java:664:105:664:107 | out : Entry [<map.value>] : Object | B.java:47:31:47:48 | obj : Entry [<map.value>] : Object | provenance |  |
-| B.java:664:105:664:107 | out : Entry [<map.value>] : Object | B.java:664:92:664:108 | readMapValue(...) | provenance | MaD:224 |
+| B.java:664:105:664:107 | out : Entry [<map.value>] : Object | B.java:664:92:664:108 | readMapValue(...) | provenance | MaD:175 |
 | B.java:669:19:669:39 | storeMapKey(...) : TreeMap [<map.key>] : Object | B.java:669:49:669:64 | (...)... : TreeMap [<map.key>] : Object | provenance |  |
 | B.java:669:31:669:38 | source(...) : Object | B.java:38:37:38:41 | obj : Object | provenance |  |
-| B.java:669:31:669:38 | source(...) : Object | B.java:669:19:669:39 | storeMapKey(...) : TreeMap [<map.key>] : Object | provenance | MaD:209 |
+| B.java:669:31:669:38 | source(...) : Object | B.java:669:19:669:39 | storeMapKey(...) : TreeMap [<map.key>] : Object | provenance | MaD:214 |
 | B.java:669:48:669:81 | pollLastEntry(...) : Entry [<map.key>] : Object | B.java:669:100:669:102 | out : Entry [<map.key>] : Object | provenance |  |
-| B.java:669:49:669:64 | (...)... : TreeMap [<map.key>] : Object | B.java:669:48:669:81 | pollLastEntry(...) : Entry [<map.key>] : Object | provenance | MaD:245 |
-| B.java:669:49:669:64 | (...)... : TreeMap [<map.key>] : Object | B.java:669:48:669:81 | pollLastEntry(...) : Entry [<map.key>] : Object | provenance | MaD:283 |
+| B.java:669:49:669:64 | (...)... : TreeMap [<map.key>] : Object | B.java:669:48:669:81 | pollLastEntry(...) : Entry [<map.key>] : Object | provenance | MaD:247 |
+| B.java:669:49:669:64 | (...)... : TreeMap [<map.key>] : Object | B.java:669:48:669:81 | pollLastEntry(...) : Entry [<map.key>] : Object | provenance | MaD:285 |
 | B.java:669:100:669:102 | out : Entry [<map.key>] : Object | B.java:43:29:43:46 | obj : Entry [<map.key>] : Object | provenance |  |
-| B.java:669:100:669:102 | out : Entry [<map.key>] : Object | B.java:669:89:669:103 | readMapKey(...) | provenance | MaD:223 |
+| B.java:669:100:669:102 | out : Entry [<map.key>] : Object | B.java:669:89:669:103 | readMapKey(...) | provenance | MaD:174 |
 | B.java:674:19:674:41 | storeMapValue(...) : Map [<map.value>] : Object | B.java:674:51:674:66 | (...)... : NavigableMap [<map.value>] : Object | provenance |  |
 | B.java:674:33:674:40 | source(...) : Object | B.java:41:39:41:43 | obj : Object | provenance |  |
-| B.java:674:33:674:40 | source(...) : Object | B.java:674:19:674:41 | storeMapValue(...) : Map [<map.value>] : Object | provenance | MaD:210 |
+| B.java:674:33:674:40 | source(...) : Object | B.java:674:19:674:41 | storeMapValue(...) : Map [<map.value>] : Object | provenance | MaD:215 |
 | B.java:674:50:674:83 | pollLastEntry(...) : Entry [<map.value>] : Object | B.java:674:104:674:106 | out : Entry [<map.value>] : Object | provenance |  |
-| B.java:674:51:674:66 | (...)... : NavigableMap [<map.value>] : Object | B.java:674:50:674:83 | pollLastEntry(...) : Entry [<map.value>] : Object | provenance | MaD:246 |
-| B.java:674:51:674:66 | (...)... : NavigableMap [<map.value>] : Object | B.java:674:50:674:83 | pollLastEntry(...) : Entry [<map.value>] : Object | provenance | MaD:284 |
+| B.java:674:51:674:66 | (...)... : NavigableMap [<map.value>] : Object | B.java:674:50:674:83 | pollLastEntry(...) : Entry [<map.value>] : Object | provenance | MaD:248 |
+| B.java:674:51:674:66 | (...)... : NavigableMap [<map.value>] : Object | B.java:674:50:674:83 | pollLastEntry(...) : Entry [<map.value>] : Object | provenance | MaD:286 |
 | B.java:674:104:674:106 | out : Entry [<map.value>] : Object | B.java:47:31:47:48 | obj : Entry [<map.value>] : Object | provenance |  |
-| B.java:674:104:674:106 | out : Entry [<map.value>] : Object | B.java:674:91:674:107 | readMapValue(...) | provenance | MaD:224 |
+| B.java:674:104:674:106 | out : Entry [<map.value>] : Object | B.java:674:91:674:107 | readMapValue(...) | provenance | MaD:175 |
 | B.java:679:19:679:39 | storeMapKey(...) : TreeMap [<map.key>] : Object | B.java:679:49:679:64 | (...)... : TreeMap [<map.key>] : Object | provenance |  |
 | B.java:679:31:679:38 | source(...) : Object | B.java:38:37:38:41 | obj : Object | provenance |  |
-| B.java:679:31:679:38 | source(...) : Object | B.java:679:19:679:39 | storeMapKey(...) : TreeMap [<map.key>] : Object | provenance | MaD:209 |
+| B.java:679:31:679:38 | source(...) : Object | B.java:679:19:679:39 | storeMapKey(...) : TreeMap [<map.key>] : Object | provenance | MaD:214 |
 | B.java:679:48:679:93 | subMap(...) : NavigableMap [<map.key>] : Object | B.java:679:112:679:114 | out : NavigableMap [<map.key>] : Object | provenance |  |
-| B.java:679:49:679:64 | (...)... : TreeMap [<map.key>] : Object | B.java:679:48:679:93 | subMap(...) : NavigableMap [<map.key>] : Object | provenance | MaD:247 |
+| B.java:679:49:679:64 | (...)... : TreeMap [<map.key>] : Object | B.java:679:48:679:93 | subMap(...) : NavigableMap [<map.key>] : Object | provenance | MaD:249 |
 | B.java:679:112:679:114 | out : NavigableMap [<map.key>] : Object | B.java:44:29:44:40 | obj : NavigableMap [<map.key>] : Object | provenance |  |
-| B.java:679:112:679:114 | out : NavigableMap [<map.key>] : Object | B.java:679:101:679:115 | readMapKey(...) | provenance | MaD:184 |
+| B.java:679:112:679:114 | out : NavigableMap [<map.key>] : Object | B.java:679:101:679:115 | readMapKey(...) | provenance | MaD:212 |
 | B.java:684:19:684:41 | storeMapValue(...) : Map [<map.value>] : Object | B.java:684:51:684:66 | (...)... : NavigableMap [<map.value>] : Object | provenance |  |
 | B.java:684:33:684:40 | source(...) : Object | B.java:41:39:41:43 | obj : Object | provenance |  |
-| B.java:684:33:684:40 | source(...) : Object | B.java:684:19:684:41 | storeMapValue(...) : Map [<map.value>] : Object | provenance | MaD:210 |
+| B.java:684:33:684:40 | source(...) : Object | B.java:684:19:684:41 | storeMapValue(...) : Map [<map.value>] : Object | provenance | MaD:215 |
 | B.java:684:50:684:95 | subMap(...) : NavigableMap [<map.value>] : Object | B.java:684:116:684:118 | out : NavigableMap [<map.value>] : Object | provenance |  |
-| B.java:684:51:684:66 | (...)... : NavigableMap [<map.value>] : Object | B.java:684:50:684:95 | subMap(...) : NavigableMap [<map.value>] : Object | provenance | MaD:248 |
+| B.java:684:51:684:66 | (...)... : NavigableMap [<map.value>] : Object | B.java:684:50:684:95 | subMap(...) : NavigableMap [<map.value>] : Object | provenance | MaD:250 |
 | B.java:684:116:684:118 | out : NavigableMap [<map.value>] : Object | B.java:48:31:48:42 | obj : NavigableMap [<map.value>] : Object | provenance |  |
-| B.java:684:116:684:118 | out : NavigableMap [<map.value>] : Object | B.java:684:103:684:119 | readMapValue(...) | provenance | MaD:181 |
+| B.java:684:116:684:118 | out : NavigableMap [<map.value>] : Object | B.java:684:103:684:119 | readMapValue(...) | provenance | MaD:209 |
 | B.java:689:19:689:39 | storeMapKey(...) : TreeMap [<map.key>] : Object | B.java:689:49:689:64 | (...)... : TreeMap [<map.key>] : Object | provenance |  |
 | B.java:689:31:689:38 | source(...) : Object | B.java:38:37:38:41 | obj : Object | provenance |  |
-| B.java:689:31:689:38 | source(...) : Object | B.java:689:19:689:39 | storeMapKey(...) : TreeMap [<map.key>] : Object | provenance | MaD:209 |
+| B.java:689:31:689:38 | source(...) : Object | B.java:689:19:689:39 | storeMapKey(...) : TreeMap [<map.key>] : Object | provenance | MaD:214 |
 | B.java:689:48:689:84 | tailMap(...) : NavigableMap [<map.key>] : Object | B.java:689:103:689:105 | out : NavigableMap [<map.key>] : Object | provenance |  |
-| B.java:689:49:689:64 | (...)... : TreeMap [<map.key>] : Object | B.java:689:48:689:84 | tailMap(...) : NavigableMap [<map.key>] : Object | provenance | MaD:249 |
+| B.java:689:49:689:64 | (...)... : TreeMap [<map.key>] : Object | B.java:689:48:689:84 | tailMap(...) : NavigableMap [<map.key>] : Object | provenance | MaD:251 |
 | B.java:689:103:689:105 | out : NavigableMap [<map.key>] : Object | B.java:44:29:44:40 | obj : NavigableMap [<map.key>] : Object | provenance |  |
-| B.java:689:103:689:105 | out : NavigableMap [<map.key>] : Object | B.java:689:92:689:106 | readMapKey(...) | provenance | MaD:184 |
+| B.java:689:103:689:105 | out : NavigableMap [<map.key>] : Object | B.java:689:92:689:106 | readMapKey(...) | provenance | MaD:212 |
 | B.java:694:19:694:41 | storeMapValue(...) : Map [<map.value>] : Object | B.java:694:51:694:66 | (...)... : NavigableMap [<map.value>] : Object | provenance |  |
 | B.java:694:33:694:40 | source(...) : Object | B.java:41:39:41:43 | obj : Object | provenance |  |
-| B.java:694:33:694:40 | source(...) : Object | B.java:694:19:694:41 | storeMapValue(...) : Map [<map.value>] : Object | provenance | MaD:210 |
+| B.java:694:33:694:40 | source(...) : Object | B.java:694:19:694:41 | storeMapValue(...) : Map [<map.value>] : Object | provenance | MaD:215 |
 | B.java:694:50:694:86 | tailMap(...) : NavigableMap [<map.value>] : Object | B.java:694:107:694:109 | out : NavigableMap [<map.value>] : Object | provenance |  |
-| B.java:694:51:694:66 | (...)... : NavigableMap [<map.value>] : Object | B.java:694:50:694:86 | tailMap(...) : NavigableMap [<map.value>] : Object | provenance | MaD:250 |
+| B.java:694:51:694:66 | (...)... : NavigableMap [<map.value>] : Object | B.java:694:50:694:86 | tailMap(...) : NavigableMap [<map.value>] : Object | provenance | MaD:252 |
 | B.java:694:107:694:109 | out : NavigableMap [<map.value>] : Object | B.java:48:31:48:42 | obj : NavigableMap [<map.value>] : Object | provenance |  |
-| B.java:694:107:694:109 | out : NavigableMap [<map.value>] : Object | B.java:694:94:694:110 | readMapValue(...) | provenance | MaD:181 |
+| B.java:694:107:694:109 | out : NavigableMap [<map.value>] : Object | B.java:694:94:694:110 | readMapValue(...) | provenance | MaD:209 |
 | B.java:699:25:699:52 | storeElementNavSet(...) : TreeSet [<element>] : Object | B.java:699:61:699:62 | in : TreeSet [<element>] : Object | provenance |  |
 | B.java:699:44:699:51 | source(...) : Object | B.java:26:49:26:53 | obj : Object | provenance |  |
-| B.java:699:44:699:51 | source(...) : Object | B.java:699:25:699:52 | storeElementNavSet(...) : TreeSet [<element>] : Object | provenance | MaD:52 |
-| B.java:699:61:699:62 | in : TreeSet [<element>] : Object | B.java:699:61:699:76 | ceiling(...) : Object | provenance | MaD:251 |
+| B.java:699:44:699:51 | source(...) : Object | B.java:699:25:699:52 | storeElementNavSet(...) : TreeSet [<element>] : Object | provenance | MaD:54 |
+| B.java:699:61:699:62 | in : TreeSet [<element>] : Object | B.java:699:61:699:76 | ceiling(...) : Object | provenance | MaD:253 |
 | B.java:699:61:699:76 | ceiling(...) : Object | B.java:699:84:699:86 | out | provenance |  |
 | B.java:704:25:704:52 | storeElementNavSet(...) : TreeSet [<element>] : Object | B.java:704:61:704:62 | in : TreeSet [<element>] : Object | provenance |  |
 | B.java:704:44:704:51 | source(...) : Object | B.java:26:49:26:53 | obj : Object | provenance |  |
-| B.java:704:44:704:51 | source(...) : Object | B.java:704:25:704:52 | storeElementNavSet(...) : TreeSet [<element>] : Object | provenance | MaD:52 |
-| B.java:704:61:704:62 | in : TreeSet [<element>] : Object | B.java:704:61:704:83 | descendingIterator(...) : Iterator [<element>] : Object | provenance | MaD:252 |
+| B.java:704:44:704:51 | source(...) : Object | B.java:704:25:704:52 | storeElementNavSet(...) : TreeSet [<element>] : Object | provenance | MaD:54 |
+| B.java:704:61:704:62 | in : TreeSet [<element>] : Object | B.java:704:61:704:83 | descendingIterator(...) : Iterator [<element>] : Object | provenance | MaD:254 |
 | B.java:704:61:704:83 | descendingIterator(...) : Iterator [<element>] : Object | B.java:704:103:704:105 | out : Iterator [<element>] : Object | provenance |  |
 | B.java:704:103:704:105 | out : Iterator [<element>] : Object | B.java:32:28:32:42 | obj : Iterator [<element>] : Object | provenance |  |
-| B.java:704:103:704:105 | out : Iterator [<element>] : Object | B.java:704:91:704:106 | readElement(...) | provenance | MaD:143 |
+| B.java:704:103:704:105 | out : Iterator [<element>] : Object | B.java:704:91:704:106 | readElement(...) | provenance | MaD:145 |
 | B.java:709:25:709:52 | storeElementNavSet(...) : TreeSet [<element>] : Object | B.java:709:61:709:62 | in : TreeSet [<element>] : Object | provenance |  |
 | B.java:709:44:709:51 | source(...) : Object | B.java:26:49:26:53 | obj : Object | provenance |  |
-| B.java:709:44:709:51 | source(...) : Object | B.java:709:25:709:52 | storeElementNavSet(...) : TreeSet [<element>] : Object | provenance | MaD:52 |
-| B.java:709:61:709:62 | in : TreeSet [<element>] : Object | B.java:709:61:709:78 | descendingSet(...) : NavigableSet [<element>] : Object | provenance | MaD:253 |
+| B.java:709:44:709:51 | source(...) : Object | B.java:709:25:709:52 | storeElementNavSet(...) : TreeSet [<element>] : Object | provenance | MaD:54 |
+| B.java:709:61:709:62 | in : TreeSet [<element>] : Object | B.java:709:61:709:78 | descendingSet(...) : NavigableSet [<element>] : Object | provenance | MaD:255 |
 | B.java:709:61:709:78 | descendingSet(...) : NavigableSet [<element>] : Object | B.java:709:98:709:100 | out : NavigableSet [<element>] : Object | provenance |  |
 | B.java:709:98:709:100 | out : NavigableSet [<element>] : Object | B.java:31:28:31:42 | obj : NavigableSet [<element>] : Object | provenance |  |
-| B.java:709:98:709:100 | out : NavigableSet [<element>] : Object | B.java:709:86:709:101 | readElement(...) | provenance | MaD:1 |
+| B.java:709:98:709:100 | out : NavigableSet [<element>] : Object | B.java:709:86:709:101 | readElement(...) | provenance | MaD:3 |
 | B.java:714:25:714:52 | storeElementNavSet(...) : TreeSet [<element>] : Object | B.java:714:61:714:62 | in : TreeSet [<element>] : Object | provenance |  |
 | B.java:714:44:714:51 | source(...) : Object | B.java:26:49:26:53 | obj : Object | provenance |  |
-| B.java:714:44:714:51 | source(...) : Object | B.java:714:25:714:52 | storeElementNavSet(...) : TreeSet [<element>] : Object | provenance | MaD:52 |
-| B.java:714:61:714:62 | in : TreeSet [<element>] : Object | B.java:714:61:714:74 | floor(...) : Object | provenance | MaD:254 |
+| B.java:714:44:714:51 | source(...) : Object | B.java:714:25:714:52 | storeElementNavSet(...) : TreeSet [<element>] : Object | provenance | MaD:54 |
+| B.java:714:61:714:62 | in : TreeSet [<element>] : Object | B.java:714:61:714:74 | floor(...) : Object | provenance | MaD:256 |
 | B.java:714:61:714:74 | floor(...) : Object | B.java:714:82:714:84 | out | provenance |  |
 | B.java:719:25:719:52 | storeElementNavSet(...) : TreeSet [<element>] : Object | B.java:719:61:719:62 | in : TreeSet [<element>] : Object | provenance |  |
 | B.java:719:44:719:51 | source(...) : Object | B.java:26:49:26:53 | obj : Object | provenance |  |
-| B.java:719:44:719:51 | source(...) : Object | B.java:719:25:719:52 | storeElementNavSet(...) : TreeSet [<element>] : Object | provenance | MaD:52 |
-| B.java:719:61:719:62 | in : TreeSet [<element>] : Object | B.java:719:61:719:81 | headSet(...) : NavigableSet [<element>] : Object | provenance | MaD:255 |
+| B.java:719:44:719:51 | source(...) : Object | B.java:719:25:719:52 | storeElementNavSet(...) : TreeSet [<element>] : Object | provenance | MaD:54 |
+| B.java:719:61:719:62 | in : TreeSet [<element>] : Object | B.java:719:61:719:81 | headSet(...) : NavigableSet [<element>] : Object | provenance | MaD:257 |
 | B.java:719:61:719:81 | headSet(...) : NavigableSet [<element>] : Object | B.java:719:101:719:103 | out : NavigableSet [<element>] : Object | provenance |  |
 | B.java:719:101:719:103 | out : NavigableSet [<element>] : Object | B.java:31:28:31:42 | obj : NavigableSet [<element>] : Object | provenance |  |
-| B.java:719:101:719:103 | out : NavigableSet [<element>] : Object | B.java:719:89:719:104 | readElement(...) | provenance | MaD:1 |
+| B.java:719:101:719:103 | out : NavigableSet [<element>] : Object | B.java:719:89:719:104 | readElement(...) | provenance | MaD:3 |
 | B.java:724:25:724:52 | storeElementNavSet(...) : TreeSet [<element>] : Object | B.java:724:61:724:62 | in : TreeSet [<element>] : Object | provenance |  |
 | B.java:724:44:724:51 | source(...) : Object | B.java:26:49:26:53 | obj : Object | provenance |  |
-| B.java:724:44:724:51 | source(...) : Object | B.java:724:25:724:52 | storeElementNavSet(...) : TreeSet [<element>] : Object | provenance | MaD:52 |
-| B.java:724:61:724:62 | in : TreeSet [<element>] : Object | B.java:724:61:724:75 | higher(...) : Object | provenance | MaD:256 |
+| B.java:724:44:724:51 | source(...) : Object | B.java:724:25:724:52 | storeElementNavSet(...) : TreeSet [<element>] : Object | provenance | MaD:54 |
+| B.java:724:61:724:62 | in : TreeSet [<element>] : Object | B.java:724:61:724:75 | higher(...) : Object | provenance | MaD:258 |
 | B.java:724:61:724:75 | higher(...) : Object | B.java:724:83:724:85 | out | provenance |  |
 | B.java:729:25:729:52 | storeElementNavSet(...) : TreeSet [<element>] : Object | B.java:729:61:729:62 | in : TreeSet [<element>] : Object | provenance |  |
 | B.java:729:44:729:51 | source(...) : Object | B.java:26:49:26:53 | obj : Object | provenance |  |
-| B.java:729:44:729:51 | source(...) : Object | B.java:729:25:729:52 | storeElementNavSet(...) : TreeSet [<element>] : Object | provenance | MaD:52 |
-| B.java:729:61:729:62 | in : TreeSet [<element>] : Object | B.java:729:61:729:74 | lower(...) : Object | provenance | MaD:257 |
+| B.java:729:44:729:51 | source(...) : Object | B.java:729:25:729:52 | storeElementNavSet(...) : TreeSet [<element>] : Object | provenance | MaD:54 |
+| B.java:729:61:729:62 | in : TreeSet [<element>] : Object | B.java:729:61:729:74 | lower(...) : Object | provenance | MaD:259 |
 | B.java:729:61:729:74 | lower(...) : Object | B.java:729:82:729:84 | out | provenance |  |
 | B.java:734:25:734:52 | storeElementNavSet(...) : TreeSet [<element>] : Object | B.java:734:61:734:62 | in : TreeSet [<element>] : Object | provenance |  |
 | B.java:734:44:734:51 | source(...) : Object | B.java:26:49:26:53 | obj : Object | provenance |  |
-| B.java:734:44:734:51 | source(...) : Object | B.java:734:25:734:52 | storeElementNavSet(...) : TreeSet [<element>] : Object | provenance | MaD:52 |
-| B.java:734:61:734:62 | in : TreeSet [<element>] : Object | B.java:734:61:734:74 | pollFirst(...) : Object | provenance | MaD:258 |
+| B.java:734:44:734:51 | source(...) : Object | B.java:734:25:734:52 | storeElementNavSet(...) : TreeSet [<element>] : Object | provenance | MaD:54 |
+| B.java:734:61:734:62 | in : TreeSet [<element>] : Object | B.java:734:61:734:74 | pollFirst(...) : Object | provenance | MaD:260 |
 | B.java:734:61:734:74 | pollFirst(...) : Object | B.java:734:82:734:84 | out | provenance |  |
 | B.java:739:25:739:52 | storeElementNavSet(...) : TreeSet [<element>] : Object | B.java:739:61:739:62 | in : TreeSet [<element>] : Object | provenance |  |
 | B.java:739:44:739:51 | source(...) : Object | B.java:26:49:26:53 | obj : Object | provenance |  |
-| B.java:739:44:739:51 | source(...) : Object | B.java:739:25:739:52 | storeElementNavSet(...) : TreeSet [<element>] : Object | provenance | MaD:52 |
-| B.java:739:61:739:62 | in : TreeSet [<element>] : Object | B.java:739:61:739:73 | pollLast(...) : Object | provenance | MaD:259 |
+| B.java:739:44:739:51 | source(...) : Object | B.java:739:25:739:52 | storeElementNavSet(...) : TreeSet [<element>] : Object | provenance | MaD:54 |
+| B.java:739:61:739:62 | in : TreeSet [<element>] : Object | B.java:739:61:739:73 | pollLast(...) : Object | provenance | MaD:261 |
 | B.java:739:61:739:73 | pollLast(...) : Object | B.java:739:81:739:83 | out | provenance |  |
 | B.java:744:25:744:52 | storeElementNavSet(...) : TreeSet [<element>] : Object | B.java:744:61:744:62 | in : TreeSet [<element>] : Object | provenance |  |
 | B.java:744:44:744:51 | source(...) : Object | B.java:26:49:26:53 | obj : Object | provenance |  |
-| B.java:744:44:744:51 | source(...) : Object | B.java:744:25:744:52 | storeElementNavSet(...) : TreeSet [<element>] : Object | provenance | MaD:52 |
-| B.java:744:61:744:62 | in : TreeSet [<element>] : Object | B.java:744:61:744:90 | subSet(...) : NavigableSet [<element>] : Object | provenance | MaD:260 |
+| B.java:744:44:744:51 | source(...) : Object | B.java:744:25:744:52 | storeElementNavSet(...) : TreeSet [<element>] : Object | provenance | MaD:54 |
+| B.java:744:61:744:62 | in : TreeSet [<element>] : Object | B.java:744:61:744:90 | subSet(...) : NavigableSet [<element>] : Object | provenance | MaD:262 |
 | B.java:744:61:744:90 | subSet(...) : NavigableSet [<element>] : Object | B.java:744:110:744:112 | out : NavigableSet [<element>] : Object | provenance |  |
 | B.java:744:110:744:112 | out : NavigableSet [<element>] : Object | B.java:31:28:31:42 | obj : NavigableSet [<element>] : Object | provenance |  |
-| B.java:744:110:744:112 | out : NavigableSet [<element>] : Object | B.java:744:98:744:113 | readElement(...) | provenance | MaD:1 |
+| B.java:744:110:744:112 | out : NavigableSet [<element>] : Object | B.java:744:98:744:113 | readElement(...) | provenance | MaD:3 |
 | B.java:749:25:749:52 | storeElementNavSet(...) : TreeSet [<element>] : Object | B.java:749:61:749:62 | in : TreeSet [<element>] : Object | provenance |  |
 | B.java:749:44:749:51 | source(...) : Object | B.java:26:49:26:53 | obj : Object | provenance |  |
-| B.java:749:44:749:51 | source(...) : Object | B.java:749:25:749:52 | storeElementNavSet(...) : TreeSet [<element>] : Object | provenance | MaD:52 |
-| B.java:749:61:749:62 | in : TreeSet [<element>] : Object | B.java:749:61:749:81 | tailSet(...) : NavigableSet [<element>] : Object | provenance | MaD:261 |
+| B.java:749:44:749:51 | source(...) : Object | B.java:749:25:749:52 | storeElementNavSet(...) : TreeSet [<element>] : Object | provenance | MaD:54 |
+| B.java:749:61:749:62 | in : TreeSet [<element>] : Object | B.java:749:61:749:81 | tailSet(...) : NavigableSet [<element>] : Object | provenance | MaD:263 |
 | B.java:749:61:749:81 | tailSet(...) : NavigableSet [<element>] : Object | B.java:749:101:749:103 | out : NavigableSet [<element>] : Object | provenance |  |
 | B.java:749:101:749:103 | out : NavigableSet [<element>] : Object | B.java:31:28:31:42 | obj : NavigableSet [<element>] : Object | provenance |  |
-| B.java:749:101:749:103 | out : NavigableSet [<element>] : Object | B.java:749:89:749:104 | readElement(...) | provenance | MaD:1 |
+| B.java:749:101:749:103 | out : NavigableSet [<element>] : Object | B.java:749:89:749:104 | readElement(...) | provenance | MaD:3 |
 | B.java:754:19:754:39 | storeMapKey(...) : TreeMap [<map.key>] : Object | B.java:754:49:754:61 | (...)... : TreeMap [<map.key>] : Object | provenance |  |
 | B.java:754:31:754:38 | source(...) : Object | B.java:38:37:38:41 | obj : Object | provenance |  |
-| B.java:754:31:754:38 | source(...) : Object | B.java:754:19:754:39 | storeMapKey(...) : TreeMap [<map.key>] : Object | provenance | MaD:209 |
+| B.java:754:31:754:38 | source(...) : Object | B.java:754:19:754:39 | storeMapKey(...) : TreeMap [<map.key>] : Object | provenance | MaD:214 |
 | B.java:754:48:754:76 | headMap(...) : SortedMap [<map.key>] : Object | B.java:754:95:754:97 | out : SortedMap [<map.key>] : Object | provenance |  |
-| B.java:754:49:754:61 | (...)... : TreeMap [<map.key>] : Object | B.java:754:48:754:76 | headMap(...) : SortedMap [<map.key>] : Object | provenance | MaD:311 |
+| B.java:754:49:754:61 | (...)... : TreeMap [<map.key>] : Object | B.java:754:48:754:76 | headMap(...) : SortedMap [<map.key>] : Object | provenance | MaD:313 |
 | B.java:754:95:754:97 | out : SortedMap [<map.key>] : Object | B.java:44:29:44:40 | obj : SortedMap [<map.key>] : Object | provenance |  |
-| B.java:754:95:754:97 | out : SortedMap [<map.key>] : Object | B.java:754:84:754:98 | readMapKey(...) | provenance | MaD:184 |
+| B.java:754:95:754:97 | out : SortedMap [<map.key>] : Object | B.java:754:84:754:98 | readMapKey(...) | provenance | MaD:212 |
 | B.java:759:19:759:41 | storeMapValue(...) : Map [<map.value>] : Object | B.java:759:51:759:63 | (...)... : SortedMap [<map.value>] : Object | provenance |  |
 | B.java:759:33:759:40 | source(...) : Object | B.java:41:39:41:43 | obj : Object | provenance |  |
-| B.java:759:33:759:40 | source(...) : Object | B.java:759:19:759:41 | storeMapValue(...) : Map [<map.value>] : Object | provenance | MaD:210 |
+| B.java:759:33:759:40 | source(...) : Object | B.java:759:19:759:41 | storeMapValue(...) : Map [<map.value>] : Object | provenance | MaD:215 |
 | B.java:759:50:759:78 | headMap(...) : SortedMap [<map.value>] : Object | B.java:759:99:759:101 | out : SortedMap [<map.value>] : Object | provenance |  |
-| B.java:759:51:759:63 | (...)... : SortedMap [<map.value>] : Object | B.java:759:50:759:78 | headMap(...) : SortedMap [<map.value>] : Object | provenance | MaD:312 |
+| B.java:759:51:759:63 | (...)... : SortedMap [<map.value>] : Object | B.java:759:50:759:78 | headMap(...) : SortedMap [<map.value>] : Object | provenance | MaD:314 |
 | B.java:759:99:759:101 | out : SortedMap [<map.value>] : Object | B.java:48:31:48:42 | obj : SortedMap [<map.value>] : Object | provenance |  |
-| B.java:759:99:759:101 | out : SortedMap [<map.value>] : Object | B.java:759:86:759:102 | readMapValue(...) | provenance | MaD:181 |
+| B.java:759:99:759:101 | out : SortedMap [<map.value>] : Object | B.java:759:86:759:102 | readMapValue(...) | provenance | MaD:209 |
 | B.java:764:19:764:39 | storeMapKey(...) : TreeMap [<map.key>] : Object | B.java:764:49:764:61 | (...)... : TreeMap [<map.key>] : Object | provenance |  |
 | B.java:764:31:764:38 | source(...) : Object | B.java:38:37:38:41 | obj : Object | provenance |  |
-| B.java:764:31:764:38 | source(...) : Object | B.java:764:19:764:39 | storeMapKey(...) : TreeMap [<map.key>] : Object | provenance | MaD:209 |
+| B.java:764:31:764:38 | source(...) : Object | B.java:764:19:764:39 | storeMapKey(...) : TreeMap [<map.key>] : Object | provenance | MaD:214 |
 | B.java:764:48:764:80 | subMap(...) : SortedMap [<map.key>] : Object | B.java:764:99:764:101 | out : SortedMap [<map.key>] : Object | provenance |  |
-| B.java:764:49:764:61 | (...)... : TreeMap [<map.key>] : Object | B.java:764:48:764:80 | subMap(...) : SortedMap [<map.key>] : Object | provenance | MaD:313 |
+| B.java:764:49:764:61 | (...)... : TreeMap [<map.key>] : Object | B.java:764:48:764:80 | subMap(...) : SortedMap [<map.key>] : Object | provenance | MaD:315 |
 | B.java:764:99:764:101 | out : SortedMap [<map.key>] : Object | B.java:44:29:44:40 | obj : SortedMap [<map.key>] : Object | provenance |  |
-| B.java:764:99:764:101 | out : SortedMap [<map.key>] : Object | B.java:764:88:764:102 | readMapKey(...) | provenance | MaD:184 |
+| B.java:764:99:764:101 | out : SortedMap [<map.key>] : Object | B.java:764:88:764:102 | readMapKey(...) | provenance | MaD:212 |
 | B.java:769:19:769:41 | storeMapValue(...) : Map [<map.value>] : Object | B.java:769:51:769:63 | (...)... : SortedMap [<map.value>] : Object | provenance |  |
 | B.java:769:33:769:40 | source(...) : Object | B.java:41:39:41:43 | obj : Object | provenance |  |
-| B.java:769:33:769:40 | source(...) : Object | B.java:769:19:769:41 | storeMapValue(...) : Map [<map.value>] : Object | provenance | MaD:210 |
+| B.java:769:33:769:40 | source(...) : Object | B.java:769:19:769:41 | storeMapValue(...) : Map [<map.value>] : Object | provenance | MaD:215 |
 | B.java:769:50:769:82 | subMap(...) : SortedMap [<map.value>] : Object | B.java:769:103:769:105 | out : SortedMap [<map.value>] : Object | provenance |  |
-| B.java:769:51:769:63 | (...)... : SortedMap [<map.value>] : Object | B.java:769:50:769:82 | subMap(...) : SortedMap [<map.value>] : Object | provenance | MaD:314 |
+| B.java:769:51:769:63 | (...)... : SortedMap [<map.value>] : Object | B.java:769:50:769:82 | subMap(...) : SortedMap [<map.value>] : Object | provenance | MaD:316 |
 | B.java:769:103:769:105 | out : SortedMap [<map.value>] : Object | B.java:48:31:48:42 | obj : SortedMap [<map.value>] : Object | provenance |  |
-| B.java:769:103:769:105 | out : SortedMap [<map.value>] : Object | B.java:769:90:769:106 | readMapValue(...) | provenance | MaD:181 |
+| B.java:769:103:769:105 | out : SortedMap [<map.value>] : Object | B.java:769:90:769:106 | readMapValue(...) | provenance | MaD:209 |
 | B.java:774:19:774:39 | storeMapKey(...) : TreeMap [<map.key>] : Object | B.java:774:49:774:61 | (...)... : TreeMap [<map.key>] : Object | provenance |  |
 | B.java:774:31:774:38 | source(...) : Object | B.java:38:37:38:41 | obj : Object | provenance |  |
-| B.java:774:31:774:38 | source(...) : Object | B.java:774:19:774:39 | storeMapKey(...) : TreeMap [<map.key>] : Object | provenance | MaD:209 |
+| B.java:774:31:774:38 | source(...) : Object | B.java:774:19:774:39 | storeMapKey(...) : TreeMap [<map.key>] : Object | provenance | MaD:214 |
 | B.java:774:48:774:76 | tailMap(...) : SortedMap [<map.key>] : Object | B.java:774:95:774:97 | out : SortedMap [<map.key>] : Object | provenance |  |
-| B.java:774:49:774:61 | (...)... : TreeMap [<map.key>] : Object | B.java:774:48:774:76 | tailMap(...) : SortedMap [<map.key>] : Object | provenance | MaD:315 |
+| B.java:774:49:774:61 | (...)... : TreeMap [<map.key>] : Object | B.java:774:48:774:76 | tailMap(...) : SortedMap [<map.key>] : Object | provenance | MaD:317 |
 | B.java:774:95:774:97 | out : SortedMap [<map.key>] : Object | B.java:44:29:44:40 | obj : SortedMap [<map.key>] : Object | provenance |  |
-| B.java:774:95:774:97 | out : SortedMap [<map.key>] : Object | B.java:774:84:774:98 | readMapKey(...) | provenance | MaD:184 |
+| B.java:774:95:774:97 | out : SortedMap [<map.key>] : Object | B.java:774:84:774:98 | readMapKey(...) | provenance | MaD:212 |
 | B.java:779:19:779:41 | storeMapValue(...) : Map [<map.value>] : Object | B.java:779:51:779:63 | (...)... : SortedMap [<map.value>] : Object | provenance |  |
 | B.java:779:33:779:40 | source(...) : Object | B.java:41:39:41:43 | obj : Object | provenance |  |
-| B.java:779:33:779:40 | source(...) : Object | B.java:779:19:779:41 | storeMapValue(...) : Map [<map.value>] : Object | provenance | MaD:210 |
+| B.java:779:33:779:40 | source(...) : Object | B.java:779:19:779:41 | storeMapValue(...) : Map [<map.value>] : Object | provenance | MaD:215 |
 | B.java:779:50:779:78 | tailMap(...) : SortedMap [<map.value>] : Object | B.java:779:99:779:101 | out : SortedMap [<map.value>] : Object | provenance |  |
-| B.java:779:51:779:63 | (...)... : SortedMap [<map.value>] : Object | B.java:779:50:779:78 | tailMap(...) : SortedMap [<map.value>] : Object | provenance | MaD:316 |
+| B.java:779:51:779:63 | (...)... : SortedMap [<map.value>] : Object | B.java:779:50:779:78 | tailMap(...) : SortedMap [<map.value>] : Object | provenance | MaD:318 |
 | B.java:779:99:779:101 | out : SortedMap [<map.value>] : Object | B.java:48:31:48:42 | obj : SortedMap [<map.value>] : Object | provenance |  |
-| B.java:779:99:779:101 | out : SortedMap [<map.value>] : Object | B.java:779:86:779:102 | readMapValue(...) | provenance | MaD:181 |
+| B.java:779:99:779:101 | out : SortedMap [<map.value>] : Object | B.java:779:86:779:102 | readMapValue(...) | provenance | MaD:209 |
 | B.java:784:22:784:49 | storeElementNavSet(...) : TreeSet [<element>] : Object | B.java:784:58:784:59 | in : TreeSet [<element>] : Object | provenance |  |
 | B.java:784:41:784:48 | source(...) : Object | B.java:26:49:26:53 | obj : Object | provenance |  |
-| B.java:784:41:784:48 | source(...) : Object | B.java:784:22:784:49 | storeElementNavSet(...) : TreeSet [<element>] : Object | provenance | MaD:52 |
-| B.java:784:58:784:59 | in : TreeSet [<element>] : Object | B.java:784:58:784:67 | first(...) : Object | provenance | MaD:317 |
+| B.java:784:41:784:48 | source(...) : Object | B.java:784:22:784:49 | storeElementNavSet(...) : TreeSet [<element>] : Object | provenance | MaD:54 |
+| B.java:784:58:784:59 | in : TreeSet [<element>] : Object | B.java:784:58:784:67 | first(...) : Object | provenance | MaD:319 |
 | B.java:784:58:784:67 | first(...) : Object | B.java:784:75:784:77 | out | provenance |  |
 | B.java:789:22:789:49 | storeElementNavSet(...) : TreeSet [<element>] : Object | B.java:789:58:789:59 | in : TreeSet [<element>] : Object | provenance |  |
 | B.java:789:41:789:48 | source(...) : Object | B.java:26:49:26:53 | obj : Object | provenance |  |
-| B.java:789:41:789:48 | source(...) : Object | B.java:789:22:789:49 | storeElementNavSet(...) : TreeSet [<element>] : Object | provenance | MaD:52 |
-| B.java:789:58:789:59 | in : TreeSet [<element>] : Object | B.java:789:58:789:73 | headSet(...) : SortedSet [<element>] : Object | provenance | MaD:318 |
+| B.java:789:41:789:48 | source(...) : Object | B.java:789:22:789:49 | storeElementNavSet(...) : TreeSet [<element>] : Object | provenance | MaD:54 |
+| B.java:789:58:789:59 | in : TreeSet [<element>] : Object | B.java:789:58:789:73 | headSet(...) : SortedSet [<element>] : Object | provenance | MaD:320 |
 | B.java:789:58:789:73 | headSet(...) : SortedSet [<element>] : Object | B.java:789:93:789:95 | out : SortedSet [<element>] : Object | provenance |  |
 | B.java:789:93:789:95 | out : SortedSet [<element>] : Object | B.java:31:28:31:42 | obj : SortedSet [<element>] : Object | provenance |  |
-| B.java:789:93:789:95 | out : SortedSet [<element>] : Object | B.java:789:81:789:96 | readElement(...) | provenance | MaD:1 |
+| B.java:789:93:789:95 | out : SortedSet [<element>] : Object | B.java:789:81:789:96 | readElement(...) | provenance | MaD:3 |
 | B.java:794:22:794:49 | storeElementNavSet(...) : TreeSet [<element>] : Object | B.java:794:58:794:59 | in : TreeSet [<element>] : Object | provenance |  |
 | B.java:794:41:794:48 | source(...) : Object | B.java:26:49:26:53 | obj : Object | provenance |  |
-| B.java:794:41:794:48 | source(...) : Object | B.java:794:22:794:49 | storeElementNavSet(...) : TreeSet [<element>] : Object | provenance | MaD:52 |
-| B.java:794:58:794:59 | in : TreeSet [<element>] : Object | B.java:794:58:794:66 | last(...) : Object | provenance | MaD:319 |
+| B.java:794:41:794:48 | source(...) : Object | B.java:794:22:794:49 | storeElementNavSet(...) : TreeSet [<element>] : Object | provenance | MaD:54 |
+| B.java:794:58:794:59 | in : TreeSet [<element>] : Object | B.java:794:58:794:66 | last(...) : Object | provenance | MaD:321 |
 | B.java:794:58:794:66 | last(...) : Object | B.java:794:74:794:76 | out | provenance |  |
 | B.java:799:22:799:49 | storeElementNavSet(...) : TreeSet [<element>] : Object | B.java:799:58:799:59 | in : TreeSet [<element>] : Object | provenance |  |
 | B.java:799:41:799:48 | source(...) : Object | B.java:26:49:26:53 | obj : Object | provenance |  |
-| B.java:799:41:799:48 | source(...) : Object | B.java:799:22:799:49 | storeElementNavSet(...) : TreeSet [<element>] : Object | provenance | MaD:52 |
-| B.java:799:58:799:59 | in : TreeSet [<element>] : Object | B.java:799:58:799:77 | subSet(...) : SortedSet [<element>] : Object | provenance | MaD:320 |
+| B.java:799:41:799:48 | source(...) : Object | B.java:799:22:799:49 | storeElementNavSet(...) : TreeSet [<element>] : Object | provenance | MaD:54 |
+| B.java:799:58:799:59 | in : TreeSet [<element>] : Object | B.java:799:58:799:77 | subSet(...) : SortedSet [<element>] : Object | provenance | MaD:322 |
 | B.java:799:58:799:77 | subSet(...) : SortedSet [<element>] : Object | B.java:799:97:799:99 | out : SortedSet [<element>] : Object | provenance |  |
 | B.java:799:97:799:99 | out : SortedSet [<element>] : Object | B.java:31:28:31:42 | obj : SortedSet [<element>] : Object | provenance |  |
-| B.java:799:97:799:99 | out : SortedSet [<element>] : Object | B.java:799:85:799:100 | readElement(...) | provenance | MaD:1 |
+| B.java:799:97:799:99 | out : SortedSet [<element>] : Object | B.java:799:85:799:100 | readElement(...) | provenance | MaD:3 |
 | B.java:804:22:804:49 | storeElementNavSet(...) : TreeSet [<element>] : Object | B.java:804:58:804:59 | in : TreeSet [<element>] : Object | provenance |  |
 | B.java:804:41:804:48 | source(...) : Object | B.java:26:49:26:53 | obj : Object | provenance |  |
-| B.java:804:41:804:48 | source(...) : Object | B.java:804:22:804:49 | storeElementNavSet(...) : TreeSet [<element>] : Object | provenance | MaD:52 |
-| B.java:804:58:804:59 | in : TreeSet [<element>] : Object | B.java:804:58:804:73 | tailSet(...) : SortedSet [<element>] : Object | provenance | MaD:321 |
+| B.java:804:41:804:48 | source(...) : Object | B.java:804:22:804:49 | storeElementNavSet(...) : TreeSet [<element>] : Object | provenance | MaD:54 |
+| B.java:804:58:804:59 | in : TreeSet [<element>] : Object | B.java:804:58:804:73 | tailSet(...) : SortedSet [<element>] : Object | provenance | MaD:323 |
 | B.java:804:58:804:73 | tailSet(...) : SortedSet [<element>] : Object | B.java:804:93:804:95 | out : SortedSet [<element>] : Object | provenance |  |
 | B.java:804:93:804:95 | out : SortedSet [<element>] : Object | B.java:31:28:31:42 | obj : SortedSet [<element>] : Object | provenance |  |
-| B.java:804:93:804:95 | out : SortedSet [<element>] : Object | B.java:804:81:804:96 | readElement(...) | provenance | MaD:1 |
+| B.java:804:93:804:95 | out : SortedSet [<element>] : Object | B.java:804:81:804:96 | readElement(...) | provenance | MaD:3 |
 | B.java:809:19:809:26 | source(...) : Object | B.java:809:45:809:46 | in : Object | provenance |  |
 | B.java:809:29:809:31 | out [post update] : TransferQueue [<element>] : Object | B.java:809:74:809:76 | out : TransferQueue [<element>] : Object | provenance |  |
-| B.java:809:45:809:46 | in : Object | B.java:809:29:809:31 | out [post update] : TransferQueue [<element>] : Object | provenance | MaD:20 |
+| B.java:809:45:809:46 | in : Object | B.java:809:29:809:31 | out [post update] : TransferQueue [<element>] : Object | provenance | MaD:22 |
 | B.java:809:74:809:76 | out : TransferQueue [<element>] : Object | B.java:31:28:31:42 | obj : TransferQueue [<element>] : Object | provenance |  |
-| B.java:809:74:809:76 | out : TransferQueue [<element>] : Object | B.java:809:62:809:77 | readElement(...) | provenance | MaD:1 |
+| B.java:809:74:809:76 | out : TransferQueue [<element>] : Object | B.java:809:62:809:77 | readElement(...) | provenance | MaD:3 |
 | B.java:814:19:814:26 | source(...) : Object | B.java:814:42:814:43 | in : Object | provenance |  |
 | B.java:814:29:814:31 | out [post update] : TransferQueue [<element>] : Object | B.java:814:64:814:66 | out : TransferQueue [<element>] : Object | provenance |  |
-| B.java:814:42:814:43 | in : Object | B.java:814:29:814:31 | out [post update] : TransferQueue [<element>] : Object | provenance | MaD:18 |
+| B.java:814:42:814:43 | in : Object | B.java:814:29:814:31 | out [post update] : TransferQueue [<element>] : Object | provenance | MaD:20 |
 | B.java:814:64:814:66 | out : TransferQueue [<element>] : Object | B.java:31:28:31:42 | obj : TransferQueue [<element>] : Object | provenance |  |
-| B.java:814:64:814:66 | out : TransferQueue [<element>] : Object | B.java:814:52:814:67 | readElement(...) | provenance | MaD:1 |
+| B.java:814:64:814:66 | out : TransferQueue [<element>] : Object | B.java:814:52:814:67 | readElement(...) | provenance | MaD:3 |
 | B.java:819:19:819:26 | source(...) : Object | B.java:819:45:819:46 | in : Object | provenance |  |
 | B.java:819:29:819:31 | out [post update] : TransferQueue [<element>] : Object | B.java:819:67:819:69 | out : TransferQueue [<element>] : Object | provenance |  |
-| B.java:819:45:819:46 | in : Object | B.java:819:29:819:31 | out [post update] : TransferQueue [<element>] : Object | provenance | MaD:19 |
+| B.java:819:45:819:46 | in : Object | B.java:819:29:819:31 | out [post update] : TransferQueue [<element>] : Object | provenance | MaD:21 |
 | B.java:819:67:819:69 | out : TransferQueue [<element>] : Object | B.java:31:28:31:42 | obj : TransferQueue [<element>] : Object | provenance |  |
-| B.java:819:67:819:69 | out : TransferQueue [<element>] : Object | B.java:819:55:819:70 | readElement(...) | provenance | MaD:1 |
+| B.java:819:67:819:69 | out : TransferQueue [<element>] : Object | B.java:819:55:819:70 | readElement(...) | provenance | MaD:3 |
 | B.java:824:23:824:48 | storeElementList(...) : List [<element>] : Object | B.java:824:69:824:70 | in : List [<element>] : Object | provenance |  |
 | B.java:824:40:824:47 | source(...) : Object | B.java:24:39:24:43 | obj : Object | provenance |  |
-| B.java:824:40:824:47 | source(...) : Object | B.java:824:23:824:48 | storeElementList(...) : List [<element>] : Object | provenance | MaD:154 |
+| B.java:824:40:824:47 | source(...) : Object | B.java:824:23:824:48 | storeElementList(...) : List [<element>] : Object | provenance | MaD:151 |
 | B.java:824:57:824:71 | copyOf(...) : List [<element>] : Object | B.java:824:91:824:93 | out : List [<element>] : Object | provenance |  |
-| B.java:824:69:824:70 | in : List [<element>] : Object | B.java:824:57:824:71 | copyOf(...) : List [<element>] : Object | provenance | MaD:151 |
+| B.java:824:69:824:70 | in : List [<element>] : Object | B.java:824:57:824:71 | copyOf(...) : List [<element>] : Object | provenance | MaD:150 |
 | B.java:824:91:824:93 | out : List [<element>] : Object | B.java:31:28:31:42 | obj : List [<element>] : Object | provenance |  |
-| B.java:824:91:824:93 | out : List [<element>] : Object | B.java:824:79:824:94 | readElement(...) | provenance | MaD:1 |
+| B.java:824:91:824:93 | out : List [<element>] : Object | B.java:824:79:824:94 | readElement(...) | provenance | MaD:3 |
 | B.java:829:21:829:47 | storeArrayElement(...) : Object[] [[]] : Object | B.java:829:64:829:65 | in : Object[] [[]] : Object | provenance |  |
 | B.java:829:39:829:46 | source(...) : Object | B.java:11:37:11:46 | obj : Object | provenance |  |
 | B.java:829:39:829:46 | source(...) : Object | B.java:829:21:829:47 | storeArrayElement(...) : Object[] [[]] : Object | provenance |  |
 | B.java:829:56:829:66 | of(...) : List [<element>] : Object | B.java:829:86:829:88 | out : List [<element>] : Object | provenance |  |
-| B.java:829:64:829:65 | in : Object[] [[]] : Object | B.java:829:56:829:66 | of(...) : List [<element>] : Object | provenance | MaD:164 |
+| B.java:829:64:829:65 | in : Object[] [[]] : Object | B.java:829:56:829:66 | of(...) : List [<element>] : Object | provenance | MaD:161 |
 | B.java:829:86:829:88 | out : List [<element>] : Object | B.java:31:28:31:42 | obj : List [<element>] : Object | provenance |  |
-| B.java:829:86:829:88 | out : List [<element>] : Object | B.java:829:74:829:89 | readElement(...) | provenance | MaD:1 |
+| B.java:829:86:829:88 | out : List [<element>] : Object | B.java:829:74:829:89 | readElement(...) | provenance | MaD:3 |
 | B.java:834:19:834:26 | source(...) : Object | B.java:834:43:834:44 | in : Object | provenance |  |
 | B.java:834:35:834:45 | of(...) : List [<element>] : Object | B.java:834:65:834:67 | out : List [<element>] : Object | provenance |  |
-| B.java:834:43:834:44 | in : Object | B.java:834:35:834:45 | of(...) : List [<element>] : Object | provenance | MaD:154 |
+| B.java:834:43:834:44 | in : Object | B.java:834:35:834:45 | of(...) : List [<element>] : Object | provenance | MaD:151 |
 | B.java:834:65:834:67 | out : List [<element>] : Object | B.java:31:28:31:42 | obj : List [<element>] : Object | provenance |  |
-| B.java:834:65:834:67 | out : List [<element>] : Object | B.java:834:53:834:68 | readElement(...) | provenance | MaD:1 |
+| B.java:834:65:834:67 | out : List [<element>] : Object | B.java:834:53:834:68 | readElement(...) | provenance | MaD:3 |
 | B.java:839:19:839:26 | source(...) : Object | B.java:839:43:839:44 | in : Object | provenance |  |
 | B.java:839:35:839:50 | of(...) : List [<element>] : Object | B.java:839:70:839:72 | out : List [<element>] : Object | provenance |  |
-| B.java:839:43:839:44 | in : Object | B.java:839:35:839:50 | of(...) : List [<element>] : Object | provenance | MaD:155 |
+| B.java:839:43:839:44 | in : Object | B.java:839:35:839:50 | of(...) : List [<element>] : Object | provenance | MaD:152 |
 | B.java:839:70:839:72 | out : List [<element>] : Object | B.java:31:28:31:42 | obj : List [<element>] : Object | provenance |  |
-| B.java:839:70:839:72 | out : List [<element>] : Object | B.java:839:58:839:73 | readElement(...) | provenance | MaD:1 |
+| B.java:839:70:839:72 | out : List [<element>] : Object | B.java:839:58:839:73 | readElement(...) | provenance | MaD:3 |
 | B.java:844:19:844:26 | source(...) : Object | B.java:844:48:844:49 | in : Object | provenance |  |
 | B.java:844:35:844:50 | of(...) : List [<element>] : Object | B.java:844:70:844:72 | out : List [<element>] : Object | provenance |  |
-| B.java:844:48:844:49 | in : Object | B.java:844:35:844:50 | of(...) : List [<element>] : Object | provenance | MaD:155 |
+| B.java:844:48:844:49 | in : Object | B.java:844:35:844:50 | of(...) : List [<element>] : Object | provenance | MaD:152 |
 | B.java:844:70:844:72 | out : List [<element>] : Object | B.java:31:28:31:42 | obj : List [<element>] : Object | provenance |  |
-| B.java:844:70:844:72 | out : List [<element>] : Object | B.java:844:58:844:73 | readElement(...) | provenance | MaD:1 |
+| B.java:844:70:844:72 | out : List [<element>] : Object | B.java:844:58:844:73 | readElement(...) | provenance | MaD:3 |
 | B.java:849:19:849:26 | source(...) : Object | B.java:849:43:849:44 | in : Object | provenance |  |
 | B.java:849:35:849:55 | of(...) : List [<element>] : Object | B.java:849:75:849:77 | out : List [<element>] : Object | provenance |  |
-| B.java:849:43:849:44 | in : Object | B.java:849:35:849:55 | of(...) : List [<element>] : Object | provenance | MaD:156 |
+| B.java:849:43:849:44 | in : Object | B.java:849:35:849:55 | of(...) : List [<element>] : Object | provenance | MaD:153 |
 | B.java:849:75:849:77 | out : List [<element>] : Object | B.java:31:28:31:42 | obj : List [<element>] : Object | provenance |  |
-| B.java:849:75:849:77 | out : List [<element>] : Object | B.java:849:63:849:78 | readElement(...) | provenance | MaD:1 |
+| B.java:849:75:849:77 | out : List [<element>] : Object | B.java:849:63:849:78 | readElement(...) | provenance | MaD:3 |
 | B.java:854:19:854:26 | source(...) : Object | B.java:854:48:854:49 | in : Object | provenance |  |
 | B.java:854:35:854:55 | of(...) : List [<element>] : Object | B.java:854:75:854:77 | out : List [<element>] : Object | provenance |  |
-| B.java:854:48:854:49 | in : Object | B.java:854:35:854:55 | of(...) : List [<element>] : Object | provenance | MaD:156 |
+| B.java:854:48:854:49 | in : Object | B.java:854:35:854:55 | of(...) : List [<element>] : Object | provenance | MaD:153 |
 | B.java:854:75:854:77 | out : List [<element>] : Object | B.java:31:28:31:42 | obj : List [<element>] : Object | provenance |  |
-| B.java:854:75:854:77 | out : List [<element>] : Object | B.java:854:63:854:78 | readElement(...) | provenance | MaD:1 |
+| B.java:854:75:854:77 | out : List [<element>] : Object | B.java:854:63:854:78 | readElement(...) | provenance | MaD:3 |
 | B.java:859:19:859:26 | source(...) : Object | B.java:859:53:859:54 | in : Object | provenance |  |
 | B.java:859:35:859:55 | of(...) : List [<element>] : Object | B.java:859:75:859:77 | out : List [<element>] : Object | provenance |  |
-| B.java:859:53:859:54 | in : Object | B.java:859:35:859:55 | of(...) : List [<element>] : Object | provenance | MaD:156 |
+| B.java:859:53:859:54 | in : Object | B.java:859:35:859:55 | of(...) : List [<element>] : Object | provenance | MaD:153 |
 | B.java:859:75:859:77 | out : List [<element>] : Object | B.java:31:28:31:42 | obj : List [<element>] : Object | provenance |  |
-| B.java:859:75:859:77 | out : List [<element>] : Object | B.java:859:63:859:78 | readElement(...) | provenance | MaD:1 |
+| B.java:859:75:859:77 | out : List [<element>] : Object | B.java:859:63:859:78 | readElement(...) | provenance | MaD:3 |
 | B.java:864:19:864:26 | source(...) : Object | B.java:864:43:864:44 | in : Object | provenance |  |
 | B.java:864:35:864:60 | of(...) : List [<element>] : Object | B.java:864:80:864:82 | out : List [<element>] : Object | provenance |  |
-| B.java:864:43:864:44 | in : Object | B.java:864:35:864:60 | of(...) : List [<element>] : Object | provenance | MaD:157 |
+| B.java:864:43:864:44 | in : Object | B.java:864:35:864:60 | of(...) : List [<element>] : Object | provenance | MaD:154 |
 | B.java:864:80:864:82 | out : List [<element>] : Object | B.java:31:28:31:42 | obj : List [<element>] : Object | provenance |  |
-| B.java:864:80:864:82 | out : List [<element>] : Object | B.java:864:68:864:83 | readElement(...) | provenance | MaD:1 |
+| B.java:864:80:864:82 | out : List [<element>] : Object | B.java:864:68:864:83 | readElement(...) | provenance | MaD:3 |
 | B.java:869:19:869:26 | source(...) : Object | B.java:869:48:869:49 | in : Object | provenance |  |
 | B.java:869:35:869:60 | of(...) : List [<element>] : Object | B.java:869:80:869:82 | out : List [<element>] : Object | provenance |  |
-| B.java:869:48:869:49 | in : Object | B.java:869:35:869:60 | of(...) : List [<element>] : Object | provenance | MaD:157 |
+| B.java:869:48:869:49 | in : Object | B.java:869:35:869:60 | of(...) : List [<element>] : Object | provenance | MaD:154 |
 | B.java:869:80:869:82 | out : List [<element>] : Object | B.java:31:28:31:42 | obj : List [<element>] : Object | provenance |  |
-| B.java:869:80:869:82 | out : List [<element>] : Object | B.java:869:68:869:83 | readElement(...) | provenance | MaD:1 |
+| B.java:869:80:869:82 | out : List [<element>] : Object | B.java:869:68:869:83 | readElement(...) | provenance | MaD:3 |
 | B.java:874:19:874:26 | source(...) : Object | B.java:874:53:874:54 | in : Object | provenance |  |
 | B.java:874:35:874:60 | of(...) : List [<element>] : Object | B.java:874:80:874:82 | out : List [<element>] : Object | provenance |  |
-| B.java:874:53:874:54 | in : Object | B.java:874:35:874:60 | of(...) : List [<element>] : Object | provenance | MaD:157 |
+| B.java:874:53:874:54 | in : Object | B.java:874:35:874:60 | of(...) : List [<element>] : Object | provenance | MaD:154 |
 | B.java:874:80:874:82 | out : List [<element>] : Object | B.java:31:28:31:42 | obj : List [<element>] : Object | provenance |  |
-| B.java:874:80:874:82 | out : List [<element>] : Object | B.java:874:68:874:83 | readElement(...) | provenance | MaD:1 |
+| B.java:874:80:874:82 | out : List [<element>] : Object | B.java:874:68:874:83 | readElement(...) | provenance | MaD:3 |
 | B.java:879:19:879:26 | source(...) : Object | B.java:879:58:879:59 | in : Object | provenance |  |
 | B.java:879:35:879:60 | of(...) : List [<element>] : Object | B.java:879:80:879:82 | out : List [<element>] : Object | provenance |  |
-| B.java:879:58:879:59 | in : Object | B.java:879:35:879:60 | of(...) : List [<element>] : Object | provenance | MaD:157 |
+| B.java:879:58:879:59 | in : Object | B.java:879:35:879:60 | of(...) : List [<element>] : Object | provenance | MaD:154 |
 | B.java:879:80:879:82 | out : List [<element>] : Object | B.java:31:28:31:42 | obj : List [<element>] : Object | provenance |  |
-| B.java:879:80:879:82 | out : List [<element>] : Object | B.java:879:68:879:83 | readElement(...) | provenance | MaD:1 |
+| B.java:879:80:879:82 | out : List [<element>] : Object | B.java:879:68:879:83 | readElement(...) | provenance | MaD:3 |
 | B.java:884:19:884:26 | source(...) : Object | B.java:884:43:884:44 | in : Object | provenance |  |
 | B.java:884:35:884:65 | of(...) : List [<element>] : Object | B.java:884:85:884:87 | out : List [<element>] : Object | provenance |  |
-| B.java:884:43:884:44 | in : Object | B.java:884:35:884:65 | of(...) : List [<element>] : Object | provenance | MaD:158 |
+| B.java:884:43:884:44 | in : Object | B.java:884:35:884:65 | of(...) : List [<element>] : Object | provenance | MaD:155 |
 | B.java:884:85:884:87 | out : List [<element>] : Object | B.java:31:28:31:42 | obj : List [<element>] : Object | provenance |  |
-| B.java:884:85:884:87 | out : List [<element>] : Object | B.java:884:73:884:88 | readElement(...) | provenance | MaD:1 |
+| B.java:884:85:884:87 | out : List [<element>] : Object | B.java:884:73:884:88 | readElement(...) | provenance | MaD:3 |
 | B.java:889:19:889:26 | source(...) : Object | B.java:889:48:889:49 | in : Object | provenance |  |
 | B.java:889:35:889:65 | of(...) : List [<element>] : Object | B.java:889:85:889:87 | out : List [<element>] : Object | provenance |  |
-| B.java:889:48:889:49 | in : Object | B.java:889:35:889:65 | of(...) : List [<element>] : Object | provenance | MaD:158 |
+| B.java:889:48:889:49 | in : Object | B.java:889:35:889:65 | of(...) : List [<element>] : Object | provenance | MaD:155 |
 | B.java:889:85:889:87 | out : List [<element>] : Object | B.java:31:28:31:42 | obj : List [<element>] : Object | provenance |  |
-| B.java:889:85:889:87 | out : List [<element>] : Object | B.java:889:73:889:88 | readElement(...) | provenance | MaD:1 |
+| B.java:889:85:889:87 | out : List [<element>] : Object | B.java:889:73:889:88 | readElement(...) | provenance | MaD:3 |
 | B.java:894:19:894:26 | source(...) : Object | B.java:894:53:894:54 | in : Object | provenance |  |
 | B.java:894:35:894:65 | of(...) : List [<element>] : Object | B.java:894:85:894:87 | out : List [<element>] : Object | provenance |  |
-| B.java:894:53:894:54 | in : Object | B.java:894:35:894:65 | of(...) : List [<element>] : Object | provenance | MaD:158 |
+| B.java:894:53:894:54 | in : Object | B.java:894:35:894:65 | of(...) : List [<element>] : Object | provenance | MaD:155 |
 | B.java:894:85:894:87 | out : List [<element>] : Object | B.java:31:28:31:42 | obj : List [<element>] : Object | provenance |  |
-| B.java:894:85:894:87 | out : List [<element>] : Object | B.java:894:73:894:88 | readElement(...) | provenance | MaD:1 |
+| B.java:894:85:894:87 | out : List [<element>] : Object | B.java:894:73:894:88 | readElement(...) | provenance | MaD:3 |
 | B.java:899:19:899:26 | source(...) : Object | B.java:899:58:899:59 | in : Object | provenance |  |
 | B.java:899:35:899:65 | of(...) : List [<element>] : Object | B.java:899:85:899:87 | out : List [<element>] : Object | provenance |  |
-| B.java:899:58:899:59 | in : Object | B.java:899:35:899:65 | of(...) : List [<element>] : Object | provenance | MaD:158 |
+| B.java:899:58:899:59 | in : Object | B.java:899:35:899:65 | of(...) : List [<element>] : Object | provenance | MaD:155 |
 | B.java:899:85:899:87 | out : List [<element>] : Object | B.java:31:28:31:42 | obj : List [<element>] : Object | provenance |  |
-| B.java:899:85:899:87 | out : List [<element>] : Object | B.java:899:73:899:88 | readElement(...) | provenance | MaD:1 |
+| B.java:899:85:899:87 | out : List [<element>] : Object | B.java:899:73:899:88 | readElement(...) | provenance | MaD:3 |
 | B.java:904:19:904:26 | source(...) : Object | B.java:904:63:904:64 | in : Object | provenance |  |
 | B.java:904:35:904:65 | of(...) : List [<element>] : Object | B.java:904:85:904:87 | out : List [<element>] : Object | provenance |  |
-| B.java:904:63:904:64 | in : Object | B.java:904:35:904:65 | of(...) : List [<element>] : Object | provenance | MaD:158 |
+| B.java:904:63:904:64 | in : Object | B.java:904:35:904:65 | of(...) : List [<element>] : Object | provenance | MaD:155 |
 | B.java:904:85:904:87 | out : List [<element>] : Object | B.java:31:28:31:42 | obj : List [<element>] : Object | provenance |  |
-| B.java:904:85:904:87 | out : List [<element>] : Object | B.java:904:73:904:88 | readElement(...) | provenance | MaD:1 |
+| B.java:904:85:904:87 | out : List [<element>] : Object | B.java:904:73:904:88 | readElement(...) | provenance | MaD:3 |
 | B.java:909:19:909:26 | source(...) : Object | B.java:909:43:909:44 | in : Object | provenance |  |
 | B.java:909:35:909:70 | of(...) : List [<element>] : Object | B.java:909:90:909:92 | out : List [<element>] : Object | provenance |  |
-| B.java:909:43:909:44 | in : Object | B.java:909:35:909:70 | of(...) : List [<element>] : Object | provenance | MaD:159 |
+| B.java:909:43:909:44 | in : Object | B.java:909:35:909:70 | of(...) : List [<element>] : Object | provenance | MaD:156 |
 | B.java:909:90:909:92 | out : List [<element>] : Object | B.java:31:28:31:42 | obj : List [<element>] : Object | provenance |  |
-| B.java:909:90:909:92 | out : List [<element>] : Object | B.java:909:78:909:93 | readElement(...) | provenance | MaD:1 |
+| B.java:909:90:909:92 | out : List [<element>] : Object | B.java:909:78:909:93 | readElement(...) | provenance | MaD:3 |
 | B.java:914:19:914:26 | source(...) : Object | B.java:914:48:914:49 | in : Object | provenance |  |
 | B.java:914:35:914:70 | of(...) : List [<element>] : Object | B.java:914:90:914:92 | out : List [<element>] : Object | provenance |  |
-| B.java:914:48:914:49 | in : Object | B.java:914:35:914:70 | of(...) : List [<element>] : Object | provenance | MaD:159 |
+| B.java:914:48:914:49 | in : Object | B.java:914:35:914:70 | of(...) : List [<element>] : Object | provenance | MaD:156 |
 | B.java:914:90:914:92 | out : List [<element>] : Object | B.java:31:28:31:42 | obj : List [<element>] : Object | provenance |  |
-| B.java:914:90:914:92 | out : List [<element>] : Object | B.java:914:78:914:93 | readElement(...) | provenance | MaD:1 |
+| B.java:914:90:914:92 | out : List [<element>] : Object | B.java:914:78:914:93 | readElement(...) | provenance | MaD:3 |
 | B.java:919:19:919:26 | source(...) : Object | B.java:919:53:919:54 | in : Object | provenance |  |
 | B.java:919:35:919:70 | of(...) : List [<element>] : Object | B.java:919:90:919:92 | out : List [<element>] : Object | provenance |  |
-| B.java:919:53:919:54 | in : Object | B.java:919:35:919:70 | of(...) : List [<element>] : Object | provenance | MaD:159 |
+| B.java:919:53:919:54 | in : Object | B.java:919:35:919:70 | of(...) : List [<element>] : Object | provenance | MaD:156 |
 | B.java:919:90:919:92 | out : List [<element>] : Object | B.java:31:28:31:42 | obj : List [<element>] : Object | provenance |  |
-| B.java:919:90:919:92 | out : List [<element>] : Object | B.java:919:78:919:93 | readElement(...) | provenance | MaD:1 |
+| B.java:919:90:919:92 | out : List [<element>] : Object | B.java:919:78:919:93 | readElement(...) | provenance | MaD:3 |
 | B.java:924:19:924:26 | source(...) : Object | B.java:924:58:924:59 | in : Object | provenance |  |
 | B.java:924:35:924:70 | of(...) : List [<element>] : Object | B.java:924:90:924:92 | out : List [<element>] : Object | provenance |  |
-| B.java:924:58:924:59 | in : Object | B.java:924:35:924:70 | of(...) : List [<element>] : Object | provenance | MaD:159 |
+| B.java:924:58:924:59 | in : Object | B.java:924:35:924:70 | of(...) : List [<element>] : Object | provenance | MaD:156 |
 | B.java:924:90:924:92 | out : List [<element>] : Object | B.java:31:28:31:42 | obj : List [<element>] : Object | provenance |  |
-| B.java:924:90:924:92 | out : List [<element>] : Object | B.java:924:78:924:93 | readElement(...) | provenance | MaD:1 |
+| B.java:924:90:924:92 | out : List [<element>] : Object | B.java:924:78:924:93 | readElement(...) | provenance | MaD:3 |
 | B.java:929:19:929:26 | source(...) : Object | B.java:929:63:929:64 | in : Object | provenance |  |
 | B.java:929:35:929:70 | of(...) : List [<element>] : Object | B.java:929:90:929:92 | out : List [<element>] : Object | provenance |  |
-| B.java:929:63:929:64 | in : Object | B.java:929:35:929:70 | of(...) : List [<element>] : Object | provenance | MaD:159 |
+| B.java:929:63:929:64 | in : Object | B.java:929:35:929:70 | of(...) : List [<element>] : Object | provenance | MaD:156 |
 | B.java:929:90:929:92 | out : List [<element>] : Object | B.java:31:28:31:42 | obj : List [<element>] : Object | provenance |  |
-| B.java:929:90:929:92 | out : List [<element>] : Object | B.java:929:78:929:93 | readElement(...) | provenance | MaD:1 |
+| B.java:929:90:929:92 | out : List [<element>] : Object | B.java:929:78:929:93 | readElement(...) | provenance | MaD:3 |
 | B.java:934:19:934:26 | source(...) : Object | B.java:934:68:934:69 | in : Object | provenance |  |
 | B.java:934:35:934:70 | of(...) : List [<element>] : Object | B.java:934:90:934:92 | out : List [<element>] : Object | provenance |  |
-| B.java:934:68:934:69 | in : Object | B.java:934:35:934:70 | of(...) : List [<element>] : Object | provenance | MaD:159 |
+| B.java:934:68:934:69 | in : Object | B.java:934:35:934:70 | of(...) : List [<element>] : Object | provenance | MaD:156 |
 | B.java:934:90:934:92 | out : List [<element>] : Object | B.java:31:28:31:42 | obj : List [<element>] : Object | provenance |  |
-| B.java:934:90:934:92 | out : List [<element>] : Object | B.java:934:78:934:93 | readElement(...) | provenance | MaD:1 |
+| B.java:934:90:934:92 | out : List [<element>] : Object | B.java:934:78:934:93 | readElement(...) | provenance | MaD:3 |
 | B.java:939:19:939:26 | source(...) : Object | B.java:939:43:939:44 | in : Object | provenance |  |
 | B.java:939:35:939:75 | of(...) : List [<element>] : Object | B.java:939:95:939:97 | out : List [<element>] : Object | provenance |  |
-| B.java:939:43:939:44 | in : Object | B.java:939:35:939:75 | of(...) : List [<element>] : Object | provenance | MaD:160 |
+| B.java:939:43:939:44 | in : Object | B.java:939:35:939:75 | of(...) : List [<element>] : Object | provenance | MaD:157 |
 | B.java:939:95:939:97 | out : List [<element>] : Object | B.java:31:28:31:42 | obj : List [<element>] : Object | provenance |  |
-| B.java:939:95:939:97 | out : List [<element>] : Object | B.java:939:83:939:98 | readElement(...) | provenance | MaD:1 |
+| B.java:939:95:939:97 | out : List [<element>] : Object | B.java:939:83:939:98 | readElement(...) | provenance | MaD:3 |
 | B.java:944:19:944:26 | source(...) : Object | B.java:944:48:944:49 | in : Object | provenance |  |
 | B.java:944:35:944:75 | of(...) : List [<element>] : Object | B.java:944:95:944:97 | out : List [<element>] : Object | provenance |  |
-| B.java:944:48:944:49 | in : Object | B.java:944:35:944:75 | of(...) : List [<element>] : Object | provenance | MaD:160 |
+| B.java:944:48:944:49 | in : Object | B.java:944:35:944:75 | of(...) : List [<element>] : Object | provenance | MaD:157 |
 | B.java:944:95:944:97 | out : List [<element>] : Object | B.java:31:28:31:42 | obj : List [<element>] : Object | provenance |  |
-| B.java:944:95:944:97 | out : List [<element>] : Object | B.java:944:83:944:98 | readElement(...) | provenance | MaD:1 |
+| B.java:944:95:944:97 | out : List [<element>] : Object | B.java:944:83:944:98 | readElement(...) | provenance | MaD:3 |
 | B.java:949:19:949:26 | source(...) : Object | B.java:949:53:949:54 | in : Object | provenance |  |
 | B.java:949:35:949:75 | of(...) : List [<element>] : Object | B.java:949:95:949:97 | out : List [<element>] : Object | provenance |  |
-| B.java:949:53:949:54 | in : Object | B.java:949:35:949:75 | of(...) : List [<element>] : Object | provenance | MaD:160 |
+| B.java:949:53:949:54 | in : Object | B.java:949:35:949:75 | of(...) : List [<element>] : Object | provenance | MaD:157 |
 | B.java:949:95:949:97 | out : List [<element>] : Object | B.java:31:28:31:42 | obj : List [<element>] : Object | provenance |  |
-| B.java:949:95:949:97 | out : List [<element>] : Object | B.java:949:83:949:98 | readElement(...) | provenance | MaD:1 |
+| B.java:949:95:949:97 | out : List [<element>] : Object | B.java:949:83:949:98 | readElement(...) | provenance | MaD:3 |
 | B.java:954:19:954:26 | source(...) : Object | B.java:954:58:954:59 | in : Object | provenance |  |
 | B.java:954:35:954:75 | of(...) : List [<element>] : Object | B.java:954:95:954:97 | out : List [<element>] : Object | provenance |  |
-| B.java:954:58:954:59 | in : Object | B.java:954:35:954:75 | of(...) : List [<element>] : Object | provenance | MaD:160 |
+| B.java:954:58:954:59 | in : Object | B.java:954:35:954:75 | of(...) : List [<element>] : Object | provenance | MaD:157 |
 | B.java:954:95:954:97 | out : List [<element>] : Object | B.java:31:28:31:42 | obj : List [<element>] : Object | provenance |  |
-| B.java:954:95:954:97 | out : List [<element>] : Object | B.java:954:83:954:98 | readElement(...) | provenance | MaD:1 |
+| B.java:954:95:954:97 | out : List [<element>] : Object | B.java:954:83:954:98 | readElement(...) | provenance | MaD:3 |
 | B.java:959:19:959:26 | source(...) : Object | B.java:959:63:959:64 | in : Object | provenance |  |
 | B.java:959:35:959:75 | of(...) : List [<element>] : Object | B.java:959:95:959:97 | out : List [<element>] : Object | provenance |  |
-| B.java:959:63:959:64 | in : Object | B.java:959:35:959:75 | of(...) : List [<element>] : Object | provenance | MaD:160 |
+| B.java:959:63:959:64 | in : Object | B.java:959:35:959:75 | of(...) : List [<element>] : Object | provenance | MaD:157 |
 | B.java:959:95:959:97 | out : List [<element>] : Object | B.java:31:28:31:42 | obj : List [<element>] : Object | provenance |  |
-| B.java:959:95:959:97 | out : List [<element>] : Object | B.java:959:83:959:98 | readElement(...) | provenance | MaD:1 |
+| B.java:959:95:959:97 | out : List [<element>] : Object | B.java:959:83:959:98 | readElement(...) | provenance | MaD:3 |
 | B.java:964:19:964:26 | source(...) : Object | B.java:964:68:964:69 | in : Object | provenance |  |
 | B.java:964:35:964:75 | of(...) : List [<element>] : Object | B.java:964:95:964:97 | out : List [<element>] : Object | provenance |  |
-| B.java:964:68:964:69 | in : Object | B.java:964:35:964:75 | of(...) : List [<element>] : Object | provenance | MaD:160 |
+| B.java:964:68:964:69 | in : Object | B.java:964:35:964:75 | of(...) : List [<element>] : Object | provenance | MaD:157 |
 | B.java:964:95:964:97 | out : List [<element>] : Object | B.java:31:28:31:42 | obj : List [<element>] : Object | provenance |  |
-| B.java:964:95:964:97 | out : List [<element>] : Object | B.java:964:83:964:98 | readElement(...) | provenance | MaD:1 |
+| B.java:964:95:964:97 | out : List [<element>] : Object | B.java:964:83:964:98 | readElement(...) | provenance | MaD:3 |
 | B.java:969:19:969:26 | source(...) : Object | B.java:969:73:969:74 | in : Object | provenance |  |
 | B.java:969:35:969:75 | of(...) : List [<element>] : Object | B.java:969:95:969:97 | out : List [<element>] : Object | provenance |  |
-| B.java:969:73:969:74 | in : Object | B.java:969:35:969:75 | of(...) : List [<element>] : Object | provenance | MaD:160 |
+| B.java:969:73:969:74 | in : Object | B.java:969:35:969:75 | of(...) : List [<element>] : Object | provenance | MaD:157 |
 | B.java:969:95:969:97 | out : List [<element>] : Object | B.java:31:28:31:42 | obj : List [<element>] : Object | provenance |  |
-| B.java:969:95:969:97 | out : List [<element>] : Object | B.java:969:83:969:98 | readElement(...) | provenance | MaD:1 |
+| B.java:969:95:969:97 | out : List [<element>] : Object | B.java:969:83:969:98 | readElement(...) | provenance | MaD:3 |
 | B.java:974:19:974:26 | source(...) : Object | B.java:974:43:974:44 | in : Object | provenance |  |
 | B.java:974:35:974:80 | of(...) : List [<element>] : Object | B.java:974:100:974:102 | out : List [<element>] : Object | provenance |  |
-| B.java:974:43:974:44 | in : Object | B.java:974:35:974:80 | of(...) : List [<element>] : Object | provenance | MaD:161 |
+| B.java:974:43:974:44 | in : Object | B.java:974:35:974:80 | of(...) : List [<element>] : Object | provenance | MaD:158 |
 | B.java:974:100:974:102 | out : List [<element>] : Object | B.java:31:28:31:42 | obj : List [<element>] : Object | provenance |  |
-| B.java:974:100:974:102 | out : List [<element>] : Object | B.java:974:88:974:103 | readElement(...) | provenance | MaD:1 |
+| B.java:974:100:974:102 | out : List [<element>] : Object | B.java:974:88:974:103 | readElement(...) | provenance | MaD:3 |
 | B.java:979:19:979:26 | source(...) : Object | B.java:979:48:979:49 | in : Object | provenance |  |
 | B.java:979:35:979:80 | of(...) : List [<element>] : Object | B.java:979:100:979:102 | out : List [<element>] : Object | provenance |  |
-| B.java:979:48:979:49 | in : Object | B.java:979:35:979:80 | of(...) : List [<element>] : Object | provenance | MaD:161 |
+| B.java:979:48:979:49 | in : Object | B.java:979:35:979:80 | of(...) : List [<element>] : Object | provenance | MaD:158 |
 | B.java:979:100:979:102 | out : List [<element>] : Object | B.java:31:28:31:42 | obj : List [<element>] : Object | provenance |  |
-| B.java:979:100:979:102 | out : List [<element>] : Object | B.java:979:88:979:103 | readElement(...) | provenance | MaD:1 |
+| B.java:979:100:979:102 | out : List [<element>] : Object | B.java:979:88:979:103 | readElement(...) | provenance | MaD:3 |
 | B.java:984:19:984:26 | source(...) : Object | B.java:984:53:984:54 | in : Object | provenance |  |
 | B.java:984:35:984:80 | of(...) : List [<element>] : Object | B.java:984:100:984:102 | out : List [<element>] : Object | provenance |  |
-| B.java:984:53:984:54 | in : Object | B.java:984:35:984:80 | of(...) : List [<element>] : Object | provenance | MaD:161 |
+| B.java:984:53:984:54 | in : Object | B.java:984:35:984:80 | of(...) : List [<element>] : Object | provenance | MaD:158 |
 | B.java:984:100:984:102 | out : List [<element>] : Object | B.java:31:28:31:42 | obj : List [<element>] : Object | provenance |  |
-| B.java:984:100:984:102 | out : List [<element>] : Object | B.java:984:88:984:103 | readElement(...) | provenance | MaD:1 |
+| B.java:984:100:984:102 | out : List [<element>] : Object | B.java:984:88:984:103 | readElement(...) | provenance | MaD:3 |
 | B.java:989:19:989:26 | source(...) : Object | B.java:989:58:989:59 | in : Object | provenance |  |
 | B.java:989:35:989:80 | of(...) : List [<element>] : Object | B.java:989:100:989:102 | out : List [<element>] : Object | provenance |  |
-| B.java:989:58:989:59 | in : Object | B.java:989:35:989:80 | of(...) : List [<element>] : Object | provenance | MaD:161 |
+| B.java:989:58:989:59 | in : Object | B.java:989:35:989:80 | of(...) : List [<element>] : Object | provenance | MaD:158 |
 | B.java:989:100:989:102 | out : List [<element>] : Object | B.java:31:28:31:42 | obj : List [<element>] : Object | provenance |  |
-| B.java:989:100:989:102 | out : List [<element>] : Object | B.java:989:88:989:103 | readElement(...) | provenance | MaD:1 |
+| B.java:989:100:989:102 | out : List [<element>] : Object | B.java:989:88:989:103 | readElement(...) | provenance | MaD:3 |
 | B.java:994:19:994:26 | source(...) : Object | B.java:994:63:994:64 | in : Object | provenance |  |
 | B.java:994:35:994:80 | of(...) : List [<element>] : Object | B.java:994:100:994:102 | out : List [<element>] : Object | provenance |  |
-| B.java:994:63:994:64 | in : Object | B.java:994:35:994:80 | of(...) : List [<element>] : Object | provenance | MaD:161 |
+| B.java:994:63:994:64 | in : Object | B.java:994:35:994:80 | of(...) : List [<element>] : Object | provenance | MaD:158 |
 | B.java:994:100:994:102 | out : List [<element>] : Object | B.java:31:28:31:42 | obj : List [<element>] : Object | provenance |  |
-| B.java:994:100:994:102 | out : List [<element>] : Object | B.java:994:88:994:103 | readElement(...) | provenance | MaD:1 |
+| B.java:994:100:994:102 | out : List [<element>] : Object | B.java:994:88:994:103 | readElement(...) | provenance | MaD:3 |
 | B.java:999:19:999:26 | source(...) : Object | B.java:999:68:999:69 | in : Object | provenance |  |
 | B.java:999:35:999:80 | of(...) : List [<element>] : Object | B.java:999:100:999:102 | out : List [<element>] : Object | provenance |  |
-| B.java:999:68:999:69 | in : Object | B.java:999:35:999:80 | of(...) : List [<element>] : Object | provenance | MaD:161 |
+| B.java:999:68:999:69 | in : Object | B.java:999:35:999:80 | of(...) : List [<element>] : Object | provenance | MaD:158 |
 | B.java:999:100:999:102 | out : List [<element>] : Object | B.java:31:28:31:42 | obj : List [<element>] : Object | provenance |  |
-| B.java:999:100:999:102 | out : List [<element>] : Object | B.java:999:88:999:103 | readElement(...) | provenance | MaD:1 |
+| B.java:999:100:999:102 | out : List [<element>] : Object | B.java:999:88:999:103 | readElement(...) | provenance | MaD:3 |
 | B.java:1004:19:1004:26 | source(...) : Object | B.java:1004:73:1004:74 | in : Object | provenance |  |
 | B.java:1004:35:1004:80 | of(...) : List [<element>] : Object | B.java:1004:100:1004:102 | out : List [<element>] : Object | provenance |  |
-| B.java:1004:73:1004:74 | in : Object | B.java:1004:35:1004:80 | of(...) : List [<element>] : Object | provenance | MaD:161 |
+| B.java:1004:73:1004:74 | in : Object | B.java:1004:35:1004:80 | of(...) : List [<element>] : Object | provenance | MaD:158 |
 | B.java:1004:100:1004:102 | out : List [<element>] : Object | B.java:31:28:31:42 | obj : List [<element>] : Object | provenance |  |
-| B.java:1004:100:1004:102 | out : List [<element>] : Object | B.java:1004:88:1004:103 | readElement(...) | provenance | MaD:1 |
+| B.java:1004:100:1004:102 | out : List [<element>] : Object | B.java:1004:88:1004:103 | readElement(...) | provenance | MaD:3 |
 | B.java:1009:19:1009:26 | source(...) : Object | B.java:1009:78:1009:79 | in : Object | provenance |  |
 | B.java:1009:35:1009:80 | of(...) : List [<element>] : Object | B.java:1009:100:1009:102 | out : List [<element>] : Object | provenance |  |
-| B.java:1009:78:1009:79 | in : Object | B.java:1009:35:1009:80 | of(...) : List [<element>] : Object | provenance | MaD:161 |
+| B.java:1009:78:1009:79 | in : Object | B.java:1009:35:1009:80 | of(...) : List [<element>] : Object | provenance | MaD:158 |
 | B.java:1009:100:1009:102 | out : List [<element>] : Object | B.java:31:28:31:42 | obj : List [<element>] : Object | provenance |  |
-| B.java:1009:100:1009:102 | out : List [<element>] : Object | B.java:1009:88:1009:103 | readElement(...) | provenance | MaD:1 |
+| B.java:1009:100:1009:102 | out : List [<element>] : Object | B.java:1009:88:1009:103 | readElement(...) | provenance | MaD:3 |
 | B.java:1014:19:1014:26 | source(...) : Object | B.java:1014:43:1014:44 | in : Object | provenance |  |
 | B.java:1014:35:1014:85 | of(...) : List [<element>] : Object | B.java:1014:105:1014:107 | out : List [<element>] : Object | provenance |  |
-| B.java:1014:43:1014:44 | in : Object | B.java:1014:35:1014:85 | of(...) : List [<element>] : Object | provenance | MaD:162 |
+| B.java:1014:43:1014:44 | in : Object | B.java:1014:35:1014:85 | of(...) : List [<element>] : Object | provenance | MaD:159 |
 | B.java:1014:105:1014:107 | out : List [<element>] : Object | B.java:31:28:31:42 | obj : List [<element>] : Object | provenance |  |
-| B.java:1014:105:1014:107 | out : List [<element>] : Object | B.java:1014:93:1014:108 | readElement(...) | provenance | MaD:1 |
+| B.java:1014:105:1014:107 | out : List [<element>] : Object | B.java:1014:93:1014:108 | readElement(...) | provenance | MaD:3 |
 | B.java:1019:19:1019:26 | source(...) : Object | B.java:1019:48:1019:49 | in : Object | provenance |  |
 | B.java:1019:35:1019:85 | of(...) : List [<element>] : Object | B.java:1019:105:1019:107 | out : List [<element>] : Object | provenance |  |
-| B.java:1019:48:1019:49 | in : Object | B.java:1019:35:1019:85 | of(...) : List [<element>] : Object | provenance | MaD:162 |
+| B.java:1019:48:1019:49 | in : Object | B.java:1019:35:1019:85 | of(...) : List [<element>] : Object | provenance | MaD:159 |
 | B.java:1019:105:1019:107 | out : List [<element>] : Object | B.java:31:28:31:42 | obj : List [<element>] : Object | provenance |  |
-| B.java:1019:105:1019:107 | out : List [<element>] : Object | B.java:1019:93:1019:108 | readElement(...) | provenance | MaD:1 |
+| B.java:1019:105:1019:107 | out : List [<element>] : Object | B.java:1019:93:1019:108 | readElement(...) | provenance | MaD:3 |
 | B.java:1024:19:1024:26 | source(...) : Object | B.java:1024:53:1024:54 | in : Object | provenance |  |
 | B.java:1024:35:1024:85 | of(...) : List [<element>] : Object | B.java:1024:105:1024:107 | out : List [<element>] : Object | provenance |  |
-| B.java:1024:53:1024:54 | in : Object | B.java:1024:35:1024:85 | of(...) : List [<element>] : Object | provenance | MaD:162 |
+| B.java:1024:53:1024:54 | in : Object | B.java:1024:35:1024:85 | of(...) : List [<element>] : Object | provenance | MaD:159 |
 | B.java:1024:105:1024:107 | out : List [<element>] : Object | B.java:31:28:31:42 | obj : List [<element>] : Object | provenance |  |
-| B.java:1024:105:1024:107 | out : List [<element>] : Object | B.java:1024:93:1024:108 | readElement(...) | provenance | MaD:1 |
+| B.java:1024:105:1024:107 | out : List [<element>] : Object | B.java:1024:93:1024:108 | readElement(...) | provenance | MaD:3 |
 | B.java:1029:19:1029:26 | source(...) : Object | B.java:1029:58:1029:59 | in : Object | provenance |  |
 | B.java:1029:35:1029:85 | of(...) : List [<element>] : Object | B.java:1029:105:1029:107 | out : List [<element>] : Object | provenance |  |
-| B.java:1029:58:1029:59 | in : Object | B.java:1029:35:1029:85 | of(...) : List [<element>] : Object | provenance | MaD:162 |
+| B.java:1029:58:1029:59 | in : Object | B.java:1029:35:1029:85 | of(...) : List [<element>] : Object | provenance | MaD:159 |
 | B.java:1029:105:1029:107 | out : List [<element>] : Object | B.java:31:28:31:42 | obj : List [<element>] : Object | provenance |  |
-| B.java:1029:105:1029:107 | out : List [<element>] : Object | B.java:1029:93:1029:108 | readElement(...) | provenance | MaD:1 |
+| B.java:1029:105:1029:107 | out : List [<element>] : Object | B.java:1029:93:1029:108 | readElement(...) | provenance | MaD:3 |
 | B.java:1034:19:1034:26 | source(...) : Object | B.java:1034:63:1034:64 | in : Object | provenance |  |
 | B.java:1034:35:1034:85 | of(...) : List [<element>] : Object | B.java:1034:105:1034:107 | out : List [<element>] : Object | provenance |  |
-| B.java:1034:63:1034:64 | in : Object | B.java:1034:35:1034:85 | of(...) : List [<element>] : Object | provenance | MaD:162 |
+| B.java:1034:63:1034:64 | in : Object | B.java:1034:35:1034:85 | of(...) : List [<element>] : Object | provenance | MaD:159 |
 | B.java:1034:105:1034:107 | out : List [<element>] : Object | B.java:31:28:31:42 | obj : List [<element>] : Object | provenance |  |
-| B.java:1034:105:1034:107 | out : List [<element>] : Object | B.java:1034:93:1034:108 | readElement(...) | provenance | MaD:1 |
+| B.java:1034:105:1034:107 | out : List [<element>] : Object | B.java:1034:93:1034:108 | readElement(...) | provenance | MaD:3 |
 | B.java:1039:19:1039:26 | source(...) : Object | B.java:1039:68:1039:69 | in : Object | provenance |  |
 | B.java:1039:35:1039:85 | of(...) : List [<element>] : Object | B.java:1039:105:1039:107 | out : List [<element>] : Object | provenance |  |
-| B.java:1039:68:1039:69 | in : Object | B.java:1039:35:1039:85 | of(...) : List [<element>] : Object | provenance | MaD:162 |
+| B.java:1039:68:1039:69 | in : Object | B.java:1039:35:1039:85 | of(...) : List [<element>] : Object | provenance | MaD:159 |
 | B.java:1039:105:1039:107 | out : List [<element>] : Object | B.java:31:28:31:42 | obj : List [<element>] : Object | provenance |  |
-| B.java:1039:105:1039:107 | out : List [<element>] : Object | B.java:1039:93:1039:108 | readElement(...) | provenance | MaD:1 |
+| B.java:1039:105:1039:107 | out : List [<element>] : Object | B.java:1039:93:1039:108 | readElement(...) | provenance | MaD:3 |
 | B.java:1044:19:1044:26 | source(...) : Object | B.java:1044:73:1044:74 | in : Object | provenance |  |
 | B.java:1044:35:1044:85 | of(...) : List [<element>] : Object | B.java:1044:105:1044:107 | out : List [<element>] : Object | provenance |  |
-| B.java:1044:73:1044:74 | in : Object | B.java:1044:35:1044:85 | of(...) : List [<element>] : Object | provenance | MaD:162 |
+| B.java:1044:73:1044:74 | in : Object | B.java:1044:35:1044:85 | of(...) : List [<element>] : Object | provenance | MaD:159 |
 | B.java:1044:105:1044:107 | out : List [<element>] : Object | B.java:31:28:31:42 | obj : List [<element>] : Object | provenance |  |
-| B.java:1044:105:1044:107 | out : List [<element>] : Object | B.java:1044:93:1044:108 | readElement(...) | provenance | MaD:1 |
+| B.java:1044:105:1044:107 | out : List [<element>] : Object | B.java:1044:93:1044:108 | readElement(...) | provenance | MaD:3 |
 | B.java:1049:19:1049:26 | source(...) : Object | B.java:1049:78:1049:79 | in : Object | provenance |  |
 | B.java:1049:35:1049:85 | of(...) : List [<element>] : Object | B.java:1049:105:1049:107 | out : List [<element>] : Object | provenance |  |
-| B.java:1049:78:1049:79 | in : Object | B.java:1049:35:1049:85 | of(...) : List [<element>] : Object | provenance | MaD:162 |
+| B.java:1049:78:1049:79 | in : Object | B.java:1049:35:1049:85 | of(...) : List [<element>] : Object | provenance | MaD:159 |
 | B.java:1049:105:1049:107 | out : List [<element>] : Object | B.java:31:28:31:42 | obj : List [<element>] : Object | provenance |  |
-| B.java:1049:105:1049:107 | out : List [<element>] : Object | B.java:1049:93:1049:108 | readElement(...) | provenance | MaD:1 |
+| B.java:1049:105:1049:107 | out : List [<element>] : Object | B.java:1049:93:1049:108 | readElement(...) | provenance | MaD:3 |
 | B.java:1054:19:1054:26 | source(...) : Object | B.java:1054:83:1054:84 | in : Object | provenance |  |
 | B.java:1054:35:1054:85 | of(...) : List [<element>] : Object | B.java:1054:105:1054:107 | out : List [<element>] : Object | provenance |  |
-| B.java:1054:83:1054:84 | in : Object | B.java:1054:35:1054:85 | of(...) : List [<element>] : Object | provenance | MaD:162 |
+| B.java:1054:83:1054:84 | in : Object | B.java:1054:35:1054:85 | of(...) : List [<element>] : Object | provenance | MaD:159 |
 | B.java:1054:105:1054:107 | out : List [<element>] : Object | B.java:31:28:31:42 | obj : List [<element>] : Object | provenance |  |
-| B.java:1054:105:1054:107 | out : List [<element>] : Object | B.java:1054:93:1054:108 | readElement(...) | provenance | MaD:1 |
+| B.java:1054:105:1054:107 | out : List [<element>] : Object | B.java:1054:93:1054:108 | readElement(...) | provenance | MaD:3 |
 | B.java:1059:19:1059:26 | source(...) : Object | B.java:1059:43:1059:44 | in : Object | provenance |  |
 | B.java:1059:35:1059:90 | of(...) : List [<element>] : Object | B.java:1059:110:1059:112 | out : List [<element>] : Object | provenance |  |
-| B.java:1059:43:1059:44 | in : Object | B.java:1059:35:1059:90 | of(...) : List [<element>] : Object | provenance | MaD:163 |
+| B.java:1059:43:1059:44 | in : Object | B.java:1059:35:1059:90 | of(...) : List [<element>] : Object | provenance | MaD:160 |
 | B.java:1059:110:1059:112 | out : List [<element>] : Object | B.java:31:28:31:42 | obj : List [<element>] : Object | provenance |  |
-| B.java:1059:110:1059:112 | out : List [<element>] : Object | B.java:1059:98:1059:113 | readElement(...) | provenance | MaD:1 |
+| B.java:1059:110:1059:112 | out : List [<element>] : Object | B.java:1059:98:1059:113 | readElement(...) | provenance | MaD:3 |
 | B.java:1064:19:1064:26 | source(...) : Object | B.java:1064:48:1064:49 | in : Object | provenance |  |
 | B.java:1064:35:1064:90 | of(...) : List [<element>] : Object | B.java:1064:110:1064:112 | out : List [<element>] : Object | provenance |  |
-| B.java:1064:48:1064:49 | in : Object | B.java:1064:35:1064:90 | of(...) : List [<element>] : Object | provenance | MaD:163 |
+| B.java:1064:48:1064:49 | in : Object | B.java:1064:35:1064:90 | of(...) : List [<element>] : Object | provenance | MaD:160 |
 | B.java:1064:110:1064:112 | out : List [<element>] : Object | B.java:31:28:31:42 | obj : List [<element>] : Object | provenance |  |
-| B.java:1064:110:1064:112 | out : List [<element>] : Object | B.java:1064:98:1064:113 | readElement(...) | provenance | MaD:1 |
+| B.java:1064:110:1064:112 | out : List [<element>] : Object | B.java:1064:98:1064:113 | readElement(...) | provenance | MaD:3 |
 | B.java:1069:19:1069:26 | source(...) : Object | B.java:1069:53:1069:54 | in : Object | provenance |  |
 | B.java:1069:35:1069:90 | of(...) : List [<element>] : Object | B.java:1069:110:1069:112 | out : List [<element>] : Object | provenance |  |
-| B.java:1069:53:1069:54 | in : Object | B.java:1069:35:1069:90 | of(...) : List [<element>] : Object | provenance | MaD:163 |
+| B.java:1069:53:1069:54 | in : Object | B.java:1069:35:1069:90 | of(...) : List [<element>] : Object | provenance | MaD:160 |
 | B.java:1069:110:1069:112 | out : List [<element>] : Object | B.java:31:28:31:42 | obj : List [<element>] : Object | provenance |  |
-| B.java:1069:110:1069:112 | out : List [<element>] : Object | B.java:1069:98:1069:113 | readElement(...) | provenance | MaD:1 |
+| B.java:1069:110:1069:112 | out : List [<element>] : Object | B.java:1069:98:1069:113 | readElement(...) | provenance | MaD:3 |
 | B.java:1074:19:1074:26 | source(...) : Object | B.java:1074:58:1074:59 | in : Object | provenance |  |
 | B.java:1074:35:1074:90 | of(...) : List [<element>] : Object | B.java:1074:110:1074:112 | out : List [<element>] : Object | provenance |  |
-| B.java:1074:58:1074:59 | in : Object | B.java:1074:35:1074:90 | of(...) : List [<element>] : Object | provenance | MaD:163 |
+| B.java:1074:58:1074:59 | in : Object | B.java:1074:35:1074:90 | of(...) : List [<element>] : Object | provenance | MaD:160 |
 | B.java:1074:110:1074:112 | out : List [<element>] : Object | B.java:31:28:31:42 | obj : List [<element>] : Object | provenance |  |
-| B.java:1074:110:1074:112 | out : List [<element>] : Object | B.java:1074:98:1074:113 | readElement(...) | provenance | MaD:1 |
+| B.java:1074:110:1074:112 | out : List [<element>] : Object | B.java:1074:98:1074:113 | readElement(...) | provenance | MaD:3 |
 | B.java:1079:19:1079:26 | source(...) : Object | B.java:1079:63:1079:64 | in : Object | provenance |  |
 | B.java:1079:35:1079:90 | of(...) : List [<element>] : Object | B.java:1079:110:1079:112 | out : List [<element>] : Object | provenance |  |
-| B.java:1079:63:1079:64 | in : Object | B.java:1079:35:1079:90 | of(...) : List [<element>] : Object | provenance | MaD:163 |
+| B.java:1079:63:1079:64 | in : Object | B.java:1079:35:1079:90 | of(...) : List [<element>] : Object | provenance | MaD:160 |
 | B.java:1079:110:1079:112 | out : List [<element>] : Object | B.java:31:28:31:42 | obj : List [<element>] : Object | provenance |  |
-| B.java:1079:110:1079:112 | out : List [<element>] : Object | B.java:1079:98:1079:113 | readElement(...) | provenance | MaD:1 |
+| B.java:1079:110:1079:112 | out : List [<element>] : Object | B.java:1079:98:1079:113 | readElement(...) | provenance | MaD:3 |
 | B.java:1084:19:1084:26 | source(...) : Object | B.java:1084:68:1084:69 | in : Object | provenance |  |
 | B.java:1084:35:1084:90 | of(...) : List [<element>] : Object | B.java:1084:110:1084:112 | out : List [<element>] : Object | provenance |  |
-| B.java:1084:68:1084:69 | in : Object | B.java:1084:35:1084:90 | of(...) : List [<element>] : Object | provenance | MaD:163 |
+| B.java:1084:68:1084:69 | in : Object | B.java:1084:35:1084:90 | of(...) : List [<element>] : Object | provenance | MaD:160 |
 | B.java:1084:110:1084:112 | out : List [<element>] : Object | B.java:31:28:31:42 | obj : List [<element>] : Object | provenance |  |
-| B.java:1084:110:1084:112 | out : List [<element>] : Object | B.java:1084:98:1084:113 | readElement(...) | provenance | MaD:1 |
+| B.java:1084:110:1084:112 | out : List [<element>] : Object | B.java:1084:98:1084:113 | readElement(...) | provenance | MaD:3 |
 | B.java:1089:19:1089:26 | source(...) : Object | B.java:1089:73:1089:74 | in : Object | provenance |  |
 | B.java:1089:35:1089:90 | of(...) : List [<element>] : Object | B.java:1089:110:1089:112 | out : List [<element>] : Object | provenance |  |
-| B.java:1089:73:1089:74 | in : Object | B.java:1089:35:1089:90 | of(...) : List [<element>] : Object | provenance | MaD:163 |
+| B.java:1089:73:1089:74 | in : Object | B.java:1089:35:1089:90 | of(...) : List [<element>] : Object | provenance | MaD:160 |
 | B.java:1089:110:1089:112 | out : List [<element>] : Object | B.java:31:28:31:42 | obj : List [<element>] : Object | provenance |  |
-| B.java:1089:110:1089:112 | out : List [<element>] : Object | B.java:1089:98:1089:113 | readElement(...) | provenance | MaD:1 |
+| B.java:1089:110:1089:112 | out : List [<element>] : Object | B.java:1089:98:1089:113 | readElement(...) | provenance | MaD:3 |
 | B.java:1094:19:1094:26 | source(...) : Object | B.java:1094:78:1094:79 | in : Object | provenance |  |
 | B.java:1094:35:1094:90 | of(...) : List [<element>] : Object | B.java:1094:110:1094:112 | out : List [<element>] : Object | provenance |  |
-| B.java:1094:78:1094:79 | in : Object | B.java:1094:35:1094:90 | of(...) : List [<element>] : Object | provenance | MaD:163 |
+| B.java:1094:78:1094:79 | in : Object | B.java:1094:35:1094:90 | of(...) : List [<element>] : Object | provenance | MaD:160 |
 | B.java:1094:110:1094:112 | out : List [<element>] : Object | B.java:31:28:31:42 | obj : List [<element>] : Object | provenance |  |
-| B.java:1094:110:1094:112 | out : List [<element>] : Object | B.java:1094:98:1094:113 | readElement(...) | provenance | MaD:1 |
+| B.java:1094:110:1094:112 | out : List [<element>] : Object | B.java:1094:98:1094:113 | readElement(...) | provenance | MaD:3 |
 | B.java:1099:19:1099:26 | source(...) : Object | B.java:1099:83:1099:84 | in : Object | provenance |  |
 | B.java:1099:35:1099:90 | of(...) : List [<element>] : Object | B.java:1099:110:1099:112 | out : List [<element>] : Object | provenance |  |
-| B.java:1099:83:1099:84 | in : Object | B.java:1099:35:1099:90 | of(...) : List [<element>] : Object | provenance | MaD:163 |
+| B.java:1099:83:1099:84 | in : Object | B.java:1099:35:1099:90 | of(...) : List [<element>] : Object | provenance | MaD:160 |
 | B.java:1099:110:1099:112 | out : List [<element>] : Object | B.java:31:28:31:42 | obj : List [<element>] : Object | provenance |  |
-| B.java:1099:110:1099:112 | out : List [<element>] : Object | B.java:1099:98:1099:113 | readElement(...) | provenance | MaD:1 |
+| B.java:1099:110:1099:112 | out : List [<element>] : Object | B.java:1099:98:1099:113 | readElement(...) | provenance | MaD:3 |
 | B.java:1104:19:1104:26 | source(...) : Object | B.java:1104:88:1104:89 | in : Object | provenance |  |
 | B.java:1104:35:1104:90 | of(...) : List [<element>] : Object | B.java:1104:110:1104:112 | out : List [<element>] : Object | provenance |  |
-| B.java:1104:88:1104:89 | in : Object | B.java:1104:35:1104:90 | of(...) : List [<element>] : Object | provenance | MaD:163 |
+| B.java:1104:88:1104:89 | in : Object | B.java:1104:35:1104:90 | of(...) : List [<element>] : Object | provenance | MaD:160 |
 | B.java:1104:110:1104:112 | out : List [<element>] : Object | B.java:31:28:31:42 | obj : List [<element>] : Object | provenance |  |
-| B.java:1104:110:1104:112 | out : List [<element>] : Object | B.java:1104:98:1104:113 | readElement(...) | provenance | MaD:1 |
+| B.java:1104:110:1104:112 | out : List [<element>] : Object | B.java:1104:98:1104:113 | readElement(...) | provenance | MaD:3 |
 | B.java:1109:19:1109:39 | storeMapKey(...) : TreeMap [<map.key>] : Object | B.java:1109:59:1109:65 | (...)... : TreeMap [<map.key>] : Object | provenance |  |
 | B.java:1109:31:1109:38 | source(...) : Object | B.java:38:37:38:41 | obj : Object | provenance |  |
-| B.java:1109:31:1109:38 | source(...) : Object | B.java:1109:19:1109:39 | storeMapKey(...) : TreeMap [<map.key>] : Object | provenance | MaD:209 |
+| B.java:1109:31:1109:38 | source(...) : Object | B.java:1109:19:1109:39 | storeMapKey(...) : TreeMap [<map.key>] : Object | provenance | MaD:214 |
 | B.java:1109:48:1109:66 | copyOf(...) : Map [<map.key>] : Object | B.java:1109:85:1109:87 | out : Map [<map.key>] : Object | provenance |  |
-| B.java:1109:59:1109:65 | (...)... : TreeMap [<map.key>] : Object | B.java:1109:48:1109:66 | copyOf(...) : Map [<map.key>] : Object | provenance | MaD:175 |
+| B.java:1109:59:1109:65 | (...)... : TreeMap [<map.key>] : Object | B.java:1109:48:1109:66 | copyOf(...) : Map [<map.key>] : Object | provenance | MaD:178 |
 | B.java:1109:85:1109:87 | out : Map [<map.key>] : Object | B.java:44:29:44:40 | obj : Map [<map.key>] : Object | provenance |  |
-| B.java:1109:85:1109:87 | out : Map [<map.key>] : Object | B.java:1109:74:1109:88 | readMapKey(...) | provenance | MaD:184 |
+| B.java:1109:85:1109:87 | out : Map [<map.key>] : Object | B.java:1109:74:1109:88 | readMapKey(...) | provenance | MaD:212 |
 | B.java:1114:19:1114:41 | storeMapValue(...) : Map [<map.value>] : Object | B.java:1114:61:1114:67 | (...)... : Map [<map.value>] : Object | provenance |  |
 | B.java:1114:33:1114:40 | source(...) : Object | B.java:41:39:41:43 | obj : Object | provenance |  |
-| B.java:1114:33:1114:40 | source(...) : Object | B.java:1114:19:1114:41 | storeMapValue(...) : Map [<map.value>] : Object | provenance | MaD:210 |
+| B.java:1114:33:1114:40 | source(...) : Object | B.java:1114:19:1114:41 | storeMapValue(...) : Map [<map.value>] : Object | provenance | MaD:215 |
 | B.java:1114:50:1114:68 | copyOf(...) : Map [<map.value>] : Object | B.java:1114:89:1114:91 | out : Map [<map.value>] : Object | provenance |  |
-| B.java:1114:61:1114:67 | (...)... : Map [<map.value>] : Object | B.java:1114:50:1114:68 | copyOf(...) : Map [<map.value>] : Object | provenance | MaD:176 |
+| B.java:1114:61:1114:67 | (...)... : Map [<map.value>] : Object | B.java:1114:50:1114:68 | copyOf(...) : Map [<map.value>] : Object | provenance | MaD:179 |
 | B.java:1114:89:1114:91 | out : Map [<map.value>] : Object | B.java:48:31:48:42 | obj : Map [<map.value>] : Object | provenance |  |
-| B.java:1114:89:1114:91 | out : Map [<map.value>] : Object | B.java:1114:76:1114:92 | readMapValue(...) | provenance | MaD:181 |
+| B.java:1114:89:1114:91 | out : Map [<map.value>] : Object | B.java:1114:76:1114:92 | readMapValue(...) | provenance | MaD:209 |
 | B.java:1119:19:1119:26 | source(...) : Object | B.java:1119:45:1119:46 | in : Object | provenance |  |
 | B.java:1119:35:1119:52 | entry(...) : Entry [<map.key>] : Object | B.java:1119:71:1119:73 | out : Entry [<map.key>] : Object | provenance |  |
-| B.java:1119:45:1119:46 | in : Object | B.java:1119:35:1119:52 | entry(...) : Entry [<map.key>] : Object | provenance | MaD:177 |
+| B.java:1119:45:1119:46 | in : Object | B.java:1119:35:1119:52 | entry(...) : Entry [<map.key>] : Object | provenance | MaD:180 |
 | B.java:1119:71:1119:73 | out : Entry [<map.key>] : Object | B.java:43:29:43:46 | obj : Entry [<map.key>] : Object | provenance |  |
-| B.java:1119:71:1119:73 | out : Entry [<map.key>] : Object | B.java:1119:60:1119:74 | readMapKey(...) | provenance | MaD:223 |
+| B.java:1119:71:1119:73 | out : Entry [<map.key>] : Object | B.java:1119:60:1119:74 | readMapKey(...) | provenance | MaD:174 |
 | B.java:1124:19:1124:26 | source(...) : Object | B.java:1124:50:1124:51 | in : Object | provenance |  |
 | B.java:1124:35:1124:52 | entry(...) : Entry [<map.value>] : Object | B.java:1124:73:1124:75 | out : Entry [<map.value>] : Object | provenance |  |
-| B.java:1124:50:1124:51 | in : Object | B.java:1124:35:1124:52 | entry(...) : Entry [<map.value>] : Object | provenance | MaD:178 |
+| B.java:1124:50:1124:51 | in : Object | B.java:1124:35:1124:52 | entry(...) : Entry [<map.value>] : Object | provenance | MaD:181 |
 | B.java:1124:73:1124:75 | out : Entry [<map.value>] : Object | B.java:47:31:47:48 | obj : Entry [<map.value>] : Object | provenance |  |
-| B.java:1124:73:1124:75 | out : Entry [<map.value>] : Object | B.java:1124:60:1124:76 | readMapValue(...) | provenance | MaD:224 |
+| B.java:1124:73:1124:75 | out : Entry [<map.value>] : Object | B.java:1124:60:1124:76 | readMapValue(...) | provenance | MaD:175 |
 | B.java:1129:19:1129:26 | source(...) : Object | B.java:1129:42:1129:43 | in : Object | provenance |  |
 | B.java:1129:35:1129:49 | of(...) : Map [<map.key>] : Object | B.java:1129:68:1129:70 | out : Map [<map.key>] : Object | provenance |  |
-| B.java:1129:42:1129:43 | in : Object | B.java:1129:35:1129:49 | of(...) : Map [<map.key>] : Object | provenance | MaD:186 |
+| B.java:1129:42:1129:43 | in : Object | B.java:1129:35:1129:49 | of(...) : Map [<map.key>] : Object | provenance | MaD:182 |
 | B.java:1129:68:1129:70 | out : Map [<map.key>] : Object | B.java:44:29:44:40 | obj : Map [<map.key>] : Object | provenance |  |
-| B.java:1129:68:1129:70 | out : Map [<map.key>] : Object | B.java:1129:57:1129:71 | readMapKey(...) | provenance | MaD:184 |
+| B.java:1129:68:1129:70 | out : Map [<map.key>] : Object | B.java:1129:57:1129:71 | readMapKey(...) | provenance | MaD:212 |
 | B.java:1134:19:1134:26 | source(...) : Object | B.java:1134:47:1134:48 | in : Object | provenance |  |
 | B.java:1134:35:1134:49 | of(...) : Map [<map.value>] : Object | B.java:1134:70:1134:72 | out : Map [<map.value>] : Object | provenance |  |
-| B.java:1134:47:1134:48 | in : Object | B.java:1134:35:1134:49 | of(...) : Map [<map.value>] : Object | provenance | MaD:197 |
+| B.java:1134:47:1134:48 | in : Object | B.java:1134:35:1134:49 | of(...) : Map [<map.value>] : Object | provenance | MaD:193 |
 | B.java:1134:70:1134:72 | out : Map [<map.value>] : Object | B.java:48:31:48:42 | obj : Map [<map.value>] : Object | provenance |  |
-| B.java:1134:70:1134:72 | out : Map [<map.value>] : Object | B.java:1134:57:1134:73 | readMapValue(...) | provenance | MaD:181 |
+| B.java:1134:70:1134:72 | out : Map [<map.value>] : Object | B.java:1134:57:1134:73 | readMapValue(...) | provenance | MaD:209 |
 | B.java:1139:19:1139:26 | source(...) : Object | B.java:1139:52:1139:53 | in : Object | provenance |  |
 | B.java:1139:35:1139:59 | of(...) : Map [<map.key>] : Object | B.java:1139:78:1139:80 | out : Map [<map.key>] : Object | provenance |  |
-| B.java:1139:52:1139:53 | in : Object | B.java:1139:35:1139:59 | of(...) : Map [<map.key>] : Object | provenance | MaD:198 |
+| B.java:1139:52:1139:53 | in : Object | B.java:1139:35:1139:59 | of(...) : Map [<map.key>] : Object | provenance | MaD:194 |
 | B.java:1139:78:1139:80 | out : Map [<map.key>] : Object | B.java:44:29:44:40 | obj : Map [<map.key>] : Object | provenance |  |
-| B.java:1139:78:1139:80 | out : Map [<map.key>] : Object | B.java:1139:67:1139:81 | readMapKey(...) | provenance | MaD:184 |
+| B.java:1139:78:1139:80 | out : Map [<map.key>] : Object | B.java:1139:67:1139:81 | readMapKey(...) | provenance | MaD:212 |
 | B.java:1144:19:1144:26 | source(...) : Object | B.java:1144:57:1144:58 | in : Object | provenance |  |
 | B.java:1144:35:1144:59 | of(...) : Map [<map.value>] : Object | B.java:1144:80:1144:82 | out : Map [<map.value>] : Object | provenance |  |
-| B.java:1144:57:1144:58 | in : Object | B.java:1144:35:1144:59 | of(...) : Map [<map.value>] : Object | provenance | MaD:199 |
+| B.java:1144:57:1144:58 | in : Object | B.java:1144:35:1144:59 | of(...) : Map [<map.value>] : Object | provenance | MaD:195 |
 | B.java:1144:80:1144:82 | out : Map [<map.value>] : Object | B.java:48:31:48:42 | obj : Map [<map.value>] : Object | provenance |  |
-| B.java:1144:80:1144:82 | out : Map [<map.value>] : Object | B.java:1144:67:1144:83 | readMapValue(...) | provenance | MaD:181 |
+| B.java:1144:80:1144:82 | out : Map [<map.value>] : Object | B.java:1144:67:1144:83 | readMapValue(...) | provenance | MaD:209 |
 | B.java:1149:19:1149:26 | source(...) : Object | B.java:1149:62:1149:63 | in : Object | provenance |  |
 | B.java:1149:35:1149:69 | of(...) : Map [<map.key>] : Object | B.java:1149:88:1149:90 | out : Map [<map.key>] : Object | provenance |  |
-| B.java:1149:62:1149:63 | in : Object | B.java:1149:35:1149:69 | of(...) : Map [<map.key>] : Object | provenance | MaD:200 |
+| B.java:1149:62:1149:63 | in : Object | B.java:1149:35:1149:69 | of(...) : Map [<map.key>] : Object | provenance | MaD:196 |
 | B.java:1149:88:1149:90 | out : Map [<map.key>] : Object | B.java:44:29:44:40 | obj : Map [<map.key>] : Object | provenance |  |
-| B.java:1149:88:1149:90 | out : Map [<map.key>] : Object | B.java:1149:77:1149:91 | readMapKey(...) | provenance | MaD:184 |
+| B.java:1149:88:1149:90 | out : Map [<map.key>] : Object | B.java:1149:77:1149:91 | readMapKey(...) | provenance | MaD:212 |
 | B.java:1154:19:1154:26 | source(...) : Object | B.java:1154:67:1154:68 | in : Object | provenance |  |
 | B.java:1154:35:1154:69 | of(...) : Map [<map.value>] : Object | B.java:1154:90:1154:92 | out : Map [<map.value>] : Object | provenance |  |
-| B.java:1154:67:1154:68 | in : Object | B.java:1154:35:1154:69 | of(...) : Map [<map.value>] : Object | provenance | MaD:201 |
+| B.java:1154:67:1154:68 | in : Object | B.java:1154:35:1154:69 | of(...) : Map [<map.value>] : Object | provenance | MaD:197 |
 | B.java:1154:90:1154:92 | out : Map [<map.value>] : Object | B.java:48:31:48:42 | obj : Map [<map.value>] : Object | provenance |  |
-| B.java:1154:90:1154:92 | out : Map [<map.value>] : Object | B.java:1154:77:1154:93 | readMapValue(...) | provenance | MaD:181 |
+| B.java:1154:90:1154:92 | out : Map [<map.value>] : Object | B.java:1154:77:1154:93 | readMapValue(...) | provenance | MaD:209 |
 | B.java:1159:19:1159:26 | source(...) : Object | B.java:1159:72:1159:73 | in : Object | provenance |  |
 | B.java:1159:35:1159:79 | of(...) : Map [<map.key>] : Object | B.java:1159:98:1159:100 | out : Map [<map.key>] : Object | provenance |  |
-| B.java:1159:72:1159:73 | in : Object | B.java:1159:35:1159:79 | of(...) : Map [<map.key>] : Object | provenance | MaD:202 |
+| B.java:1159:72:1159:73 | in : Object | B.java:1159:35:1159:79 | of(...) : Map [<map.key>] : Object | provenance | MaD:198 |
 | B.java:1159:98:1159:100 | out : Map [<map.key>] : Object | B.java:44:29:44:40 | obj : Map [<map.key>] : Object | provenance |  |
-| B.java:1159:98:1159:100 | out : Map [<map.key>] : Object | B.java:1159:87:1159:101 | readMapKey(...) | provenance | MaD:184 |
+| B.java:1159:98:1159:100 | out : Map [<map.key>] : Object | B.java:1159:87:1159:101 | readMapKey(...) | provenance | MaD:212 |
 | B.java:1164:19:1164:26 | source(...) : Object | B.java:1164:77:1164:78 | in : Object | provenance |  |
 | B.java:1164:35:1164:79 | of(...) : Map [<map.value>] : Object | B.java:1164:100:1164:102 | out : Map [<map.value>] : Object | provenance |  |
-| B.java:1164:77:1164:78 | in : Object | B.java:1164:35:1164:79 | of(...) : Map [<map.value>] : Object | provenance | MaD:203 |
+| B.java:1164:77:1164:78 | in : Object | B.java:1164:35:1164:79 | of(...) : Map [<map.value>] : Object | provenance | MaD:199 |
 | B.java:1164:100:1164:102 | out : Map [<map.value>] : Object | B.java:48:31:48:42 | obj : Map [<map.value>] : Object | provenance |  |
-| B.java:1164:100:1164:102 | out : Map [<map.value>] : Object | B.java:1164:87:1164:103 | readMapValue(...) | provenance | MaD:181 |
+| B.java:1164:100:1164:102 | out : Map [<map.value>] : Object | B.java:1164:87:1164:103 | readMapValue(...) | provenance | MaD:209 |
 | B.java:1169:19:1169:26 | source(...) : Object | B.java:1169:82:1169:83 | in : Object | provenance |  |
 | B.java:1169:35:1169:89 | of(...) : Map [<map.key>] : Object | B.java:1169:108:1169:110 | out : Map [<map.key>] : Object | provenance |  |
-| B.java:1169:82:1169:83 | in : Object | B.java:1169:35:1169:89 | of(...) : Map [<map.key>] : Object | provenance | MaD:204 |
+| B.java:1169:82:1169:83 | in : Object | B.java:1169:35:1169:89 | of(...) : Map [<map.key>] : Object | provenance | MaD:200 |
 | B.java:1169:108:1169:110 | out : Map [<map.key>] : Object | B.java:44:29:44:40 | obj : Map [<map.key>] : Object | provenance |  |
-| B.java:1169:108:1169:110 | out : Map [<map.key>] : Object | B.java:1169:97:1169:111 | readMapKey(...) | provenance | MaD:184 |
+| B.java:1169:108:1169:110 | out : Map [<map.key>] : Object | B.java:1169:97:1169:111 | readMapKey(...) | provenance | MaD:212 |
 | B.java:1174:19:1174:26 | source(...) : Object | B.java:1174:87:1174:88 | in : Object | provenance |  |
 | B.java:1174:35:1174:89 | of(...) : Map [<map.value>] : Object | B.java:1174:110:1174:112 | out : Map [<map.value>] : Object | provenance |  |
-| B.java:1174:87:1174:88 | in : Object | B.java:1174:35:1174:89 | of(...) : Map [<map.value>] : Object | provenance | MaD:205 |
+| B.java:1174:87:1174:88 | in : Object | B.java:1174:35:1174:89 | of(...) : Map [<map.value>] : Object | provenance | MaD:201 |
 | B.java:1174:110:1174:112 | out : Map [<map.value>] : Object | B.java:48:31:48:42 | obj : Map [<map.value>] : Object | provenance |  |
-| B.java:1174:110:1174:112 | out : Map [<map.value>] : Object | B.java:1174:97:1174:113 | readMapValue(...) | provenance | MaD:181 |
+| B.java:1174:110:1174:112 | out : Map [<map.value>] : Object | B.java:1174:97:1174:113 | readMapValue(...) | provenance | MaD:209 |
 | B.java:1179:19:1179:26 | source(...) : Object | B.java:1179:92:1179:93 | in : Object | provenance |  |
 | B.java:1179:35:1179:99 | of(...) : Map [<map.key>] : Object | B.java:1179:118:1179:120 | out : Map [<map.key>] : Object | provenance |  |
-| B.java:1179:92:1179:93 | in : Object | B.java:1179:35:1179:99 | of(...) : Map [<map.key>] : Object | provenance | MaD:187 |
+| B.java:1179:92:1179:93 | in : Object | B.java:1179:35:1179:99 | of(...) : Map [<map.key>] : Object | provenance | MaD:183 |
 | B.java:1179:118:1179:120 | out : Map [<map.key>] : Object | B.java:44:29:44:40 | obj : Map [<map.key>] : Object | provenance |  |
-| B.java:1179:118:1179:120 | out : Map [<map.key>] : Object | B.java:1179:107:1179:121 | readMapKey(...) | provenance | MaD:184 |
+| B.java:1179:118:1179:120 | out : Map [<map.key>] : Object | B.java:1179:107:1179:121 | readMapKey(...) | provenance | MaD:212 |
 | B.java:1184:19:1184:26 | source(...) : Object | B.java:1184:97:1184:98 | in : Object | provenance |  |
 | B.java:1184:35:1184:99 | of(...) : Map [<map.value>] : Object | B.java:1184:120:1184:122 | out : Map [<map.value>] : Object | provenance |  |
-| B.java:1184:97:1184:98 | in : Object | B.java:1184:35:1184:99 | of(...) : Map [<map.value>] : Object | provenance | MaD:188 |
+| B.java:1184:97:1184:98 | in : Object | B.java:1184:35:1184:99 | of(...) : Map [<map.value>] : Object | provenance | MaD:184 |
 | B.java:1184:120:1184:122 | out : Map [<map.value>] : Object | B.java:48:31:48:42 | obj : Map [<map.value>] : Object | provenance |  |
-| B.java:1184:120:1184:122 | out : Map [<map.value>] : Object | B.java:1184:107:1184:123 | readMapValue(...) | provenance | MaD:181 |
+| B.java:1184:120:1184:122 | out : Map [<map.value>] : Object | B.java:1184:107:1184:123 | readMapValue(...) | provenance | MaD:209 |
 | B.java:1189:19:1189:26 | source(...) : Object | B.java:1189:102:1189:103 | in : Object | provenance |  |
 | B.java:1189:35:1189:109 | of(...) : Map [<map.key>] : Object | B.java:1189:128:1189:130 | out : Map [<map.key>] : Object | provenance |  |
-| B.java:1189:102:1189:103 | in : Object | B.java:1189:35:1189:109 | of(...) : Map [<map.key>] : Object | provenance | MaD:189 |
+| B.java:1189:102:1189:103 | in : Object | B.java:1189:35:1189:109 | of(...) : Map [<map.key>] : Object | provenance | MaD:185 |
 | B.java:1189:128:1189:130 | out : Map [<map.key>] : Object | B.java:44:29:44:40 | obj : Map [<map.key>] : Object | provenance |  |
-| B.java:1189:128:1189:130 | out : Map [<map.key>] : Object | B.java:1189:117:1189:131 | readMapKey(...) | provenance | MaD:184 |
+| B.java:1189:128:1189:130 | out : Map [<map.key>] : Object | B.java:1189:117:1189:131 | readMapKey(...) | provenance | MaD:212 |
 | B.java:1194:19:1194:26 | source(...) : Object | B.java:1194:107:1194:108 | in : Object | provenance |  |
 | B.java:1194:35:1194:109 | of(...) : Map [<map.value>] : Object | B.java:1194:130:1194:132 | out : Map [<map.value>] : Object | provenance |  |
-| B.java:1194:107:1194:108 | in : Object | B.java:1194:35:1194:109 | of(...) : Map [<map.value>] : Object | provenance | MaD:190 |
+| B.java:1194:107:1194:108 | in : Object | B.java:1194:35:1194:109 | of(...) : Map [<map.value>] : Object | provenance | MaD:186 |
 | B.java:1194:130:1194:132 | out : Map [<map.value>] : Object | B.java:48:31:48:42 | obj : Map [<map.value>] : Object | provenance |  |
-| B.java:1194:130:1194:132 | out : Map [<map.value>] : Object | B.java:1194:117:1194:133 | readMapValue(...) | provenance | MaD:181 |
+| B.java:1194:130:1194:132 | out : Map [<map.value>] : Object | B.java:1194:117:1194:133 | readMapValue(...) | provenance | MaD:209 |
 | B.java:1199:19:1199:26 | source(...) : Object | B.java:1199:112:1199:113 | in : Object | provenance |  |
 | B.java:1199:35:1199:119 | of(...) : Map [<map.key>] : Object | B.java:1199:138:1199:140 | out : Map [<map.key>] : Object | provenance |  |
-| B.java:1199:112:1199:113 | in : Object | B.java:1199:35:1199:119 | of(...) : Map [<map.key>] : Object | provenance | MaD:191 |
+| B.java:1199:112:1199:113 | in : Object | B.java:1199:35:1199:119 | of(...) : Map [<map.key>] : Object | provenance | MaD:187 |
 | B.java:1199:138:1199:140 | out : Map [<map.key>] : Object | B.java:44:29:44:40 | obj : Map [<map.key>] : Object | provenance |  |
-| B.java:1199:138:1199:140 | out : Map [<map.key>] : Object | B.java:1199:127:1199:141 | readMapKey(...) | provenance | MaD:184 |
+| B.java:1199:138:1199:140 | out : Map [<map.key>] : Object | B.java:1199:127:1199:141 | readMapKey(...) | provenance | MaD:212 |
 | B.java:1204:19:1204:26 | source(...) : Object | B.java:1204:117:1204:118 | in : Object | provenance |  |
 | B.java:1204:35:1204:119 | of(...) : Map [<map.value>] : Object | B.java:1204:140:1204:142 | out : Map [<map.value>] : Object | provenance |  |
-| B.java:1204:117:1204:118 | in : Object | B.java:1204:35:1204:119 | of(...) : Map [<map.value>] : Object | provenance | MaD:192 |
+| B.java:1204:117:1204:118 | in : Object | B.java:1204:35:1204:119 | of(...) : Map [<map.value>] : Object | provenance | MaD:188 |
 | B.java:1204:140:1204:142 | out : Map [<map.value>] : Object | B.java:48:31:48:42 | obj : Map [<map.value>] : Object | provenance |  |
-| B.java:1204:140:1204:142 | out : Map [<map.value>] : Object | B.java:1204:127:1204:143 | readMapValue(...) | provenance | MaD:181 |
+| B.java:1204:140:1204:142 | out : Map [<map.value>] : Object | B.java:1204:127:1204:143 | readMapValue(...) | provenance | MaD:209 |
 | B.java:1209:19:1209:26 | source(...) : Object | B.java:1209:122:1209:123 | in : Object | provenance |  |
 | B.java:1209:35:1209:129 | of(...) : Map [<map.key>] : Object | B.java:1209:148:1209:150 | out : Map [<map.key>] : Object | provenance |  |
-| B.java:1209:122:1209:123 | in : Object | B.java:1209:35:1209:129 | of(...) : Map [<map.key>] : Object | provenance | MaD:193 |
+| B.java:1209:122:1209:123 | in : Object | B.java:1209:35:1209:129 | of(...) : Map [<map.key>] : Object | provenance | MaD:189 |
 | B.java:1209:148:1209:150 | out : Map [<map.key>] : Object | B.java:44:29:44:40 | obj : Map [<map.key>] : Object | provenance |  |
-| B.java:1209:148:1209:150 | out : Map [<map.key>] : Object | B.java:1209:137:1209:151 | readMapKey(...) | provenance | MaD:184 |
+| B.java:1209:148:1209:150 | out : Map [<map.key>] : Object | B.java:1209:137:1209:151 | readMapKey(...) | provenance | MaD:212 |
 | B.java:1214:19:1214:26 | source(...) : Object | B.java:1214:127:1214:128 | in : Object | provenance |  |
 | B.java:1214:35:1214:129 | of(...) : Map [<map.value>] : Object | B.java:1214:150:1214:152 | out : Map [<map.value>] : Object | provenance |  |
-| B.java:1214:127:1214:128 | in : Object | B.java:1214:35:1214:129 | of(...) : Map [<map.value>] : Object | provenance | MaD:194 |
+| B.java:1214:127:1214:128 | in : Object | B.java:1214:35:1214:129 | of(...) : Map [<map.value>] : Object | provenance | MaD:190 |
 | B.java:1214:150:1214:152 | out : Map [<map.value>] : Object | B.java:48:31:48:42 | obj : Map [<map.value>] : Object | provenance |  |
-| B.java:1214:150:1214:152 | out : Map [<map.value>] : Object | B.java:1214:137:1214:153 | readMapValue(...) | provenance | MaD:181 |
+| B.java:1214:150:1214:152 | out : Map [<map.value>] : Object | B.java:1214:137:1214:153 | readMapValue(...) | provenance | MaD:209 |
 | B.java:1219:19:1219:26 | source(...) : Object | B.java:1219:132:1219:133 | in : Object | provenance |  |
 | B.java:1219:35:1219:139 | of(...) : Map [<map.key>] : Object | B.java:1219:158:1219:160 | out : Map [<map.key>] : Object | provenance |  |
-| B.java:1219:132:1219:133 | in : Object | B.java:1219:35:1219:139 | of(...) : Map [<map.key>] : Object | provenance | MaD:195 |
+| B.java:1219:132:1219:133 | in : Object | B.java:1219:35:1219:139 | of(...) : Map [<map.key>] : Object | provenance | MaD:191 |
 | B.java:1219:158:1219:160 | out : Map [<map.key>] : Object | B.java:44:29:44:40 | obj : Map [<map.key>] : Object | provenance |  |
-| B.java:1219:158:1219:160 | out : Map [<map.key>] : Object | B.java:1219:147:1219:161 | readMapKey(...) | provenance | MaD:184 |
+| B.java:1219:158:1219:160 | out : Map [<map.key>] : Object | B.java:1219:147:1219:161 | readMapKey(...) | provenance | MaD:212 |
 | B.java:1224:19:1224:26 | source(...) : Object | B.java:1224:137:1224:138 | in : Object | provenance |  |
 | B.java:1224:35:1224:139 | of(...) : Map [<map.value>] : Object | B.java:1224:160:1224:162 | out : Map [<map.value>] : Object | provenance |  |
-| B.java:1224:137:1224:138 | in : Object | B.java:1224:35:1224:139 | of(...) : Map [<map.value>] : Object | provenance | MaD:196 |
+| B.java:1224:137:1224:138 | in : Object | B.java:1224:35:1224:139 | of(...) : Map [<map.value>] : Object | provenance | MaD:192 |
 | B.java:1224:160:1224:162 | out : Map [<map.value>] : Object | B.java:48:31:48:42 | obj : Map [<map.value>] : Object | provenance |  |
-| B.java:1224:160:1224:162 | out : Map [<map.value>] : Object | B.java:1224:147:1224:163 | readMapValue(...) | provenance | MaD:181 |
+| B.java:1224:160:1224:162 | out : Map [<map.value>] : Object | B.java:1224:147:1224:163 | readMapValue(...) | provenance | MaD:209 |
 | B.java:1229:21:1229:60 | storeArrayElement(...) : Object[] [[], <map.key>] : Object | B.java:1229:83:1229:97 | (...)... : Entry[] [[], <map.key>] : Object | provenance |  |
 | B.java:1229:39:1229:59 | storeMapKey(...) : TreeMap [<map.key>] : Object | B.java:11:37:11:46 | obj : TreeMap [<map.key>] : Object | provenance |  |
 | B.java:1229:39:1229:59 | storeMapKey(...) : TreeMap [<map.key>] : Object | B.java:1229:21:1229:60 | storeArrayElement(...) : Object[] [[], <map.key>] : Object | provenance |  |
 | B.java:1229:51:1229:58 | source(...) : Object | B.java:38:37:38:41 | obj : Object | provenance |  |
-| B.java:1229:51:1229:58 | source(...) : Object | B.java:1229:39:1229:59 | storeMapKey(...) : TreeMap [<map.key>] : Object | provenance | MaD:209 |
+| B.java:1229:51:1229:58 | source(...) : Object | B.java:1229:39:1229:59 | storeMapKey(...) : TreeMap [<map.key>] : Object | provenance | MaD:214 |
 | B.java:1229:69:1229:98 | ofEntries(...) : Map [<map.key>] : Object | B.java:1229:117:1229:119 | out : Map [<map.key>] : Object | provenance |  |
-| B.java:1229:83:1229:97 | (...)... : Entry[] [[], <map.key>] : Object | B.java:1229:69:1229:98 | ofEntries(...) : Map [<map.key>] : Object | provenance | MaD:206 |
+| B.java:1229:83:1229:97 | (...)... : Entry[] [[], <map.key>] : Object | B.java:1229:69:1229:98 | ofEntries(...) : Map [<map.key>] : Object | provenance | MaD:202 |
 | B.java:1229:117:1229:119 | out : Map [<map.key>] : Object | B.java:44:29:44:40 | obj : Map [<map.key>] : Object | provenance |  |
-| B.java:1229:117:1229:119 | out : Map [<map.key>] : Object | B.java:1229:106:1229:120 | readMapKey(...) | provenance | MaD:184 |
+| B.java:1229:117:1229:119 | out : Map [<map.key>] : Object | B.java:1229:106:1229:120 | readMapKey(...) | provenance | MaD:212 |
 | B.java:1234:21:1234:62 | storeArrayElement(...) : Object[] [[], <map.value>] : Object | B.java:1234:85:1234:99 | (...)... : Entry[] [[], <map.value>] : Object | provenance |  |
 | B.java:1234:39:1234:61 | storeMapValue(...) : Map [<map.value>] : Object | B.java:11:37:11:46 | obj : Map [<map.value>] : Object | provenance |  |
 | B.java:1234:39:1234:61 | storeMapValue(...) : Map [<map.value>] : Object | B.java:1234:21:1234:62 | storeArrayElement(...) : Object[] [[], <map.value>] : Object | provenance |  |
 | B.java:1234:53:1234:60 | source(...) : Object | B.java:41:39:41:43 | obj : Object | provenance |  |
-| B.java:1234:53:1234:60 | source(...) : Object | B.java:1234:39:1234:61 | storeMapValue(...) : Map [<map.value>] : Object | provenance | MaD:210 |
+| B.java:1234:53:1234:60 | source(...) : Object | B.java:1234:39:1234:61 | storeMapValue(...) : Map [<map.value>] : Object | provenance | MaD:215 |
 | B.java:1234:71:1234:100 | ofEntries(...) : Map [<map.value>] : Object | B.java:1234:121:1234:123 | out : Map [<map.value>] : Object | provenance |  |
-| B.java:1234:85:1234:99 | (...)... : Entry[] [[], <map.value>] : Object | B.java:1234:71:1234:100 | ofEntries(...) : Map [<map.value>] : Object | provenance | MaD:207 |
+| B.java:1234:85:1234:99 | (...)... : Entry[] [[], <map.value>] : Object | B.java:1234:71:1234:100 | ofEntries(...) : Map [<map.value>] : Object | provenance | MaD:203 |
 | B.java:1234:121:1234:123 | out : Map [<map.value>] : Object | B.java:48:31:48:42 | obj : Map [<map.value>] : Object | provenance |  |
-| B.java:1234:121:1234:123 | out : Map [<map.value>] : Object | B.java:1234:108:1234:124 | readMapValue(...) | provenance | MaD:181 |
+| B.java:1234:121:1234:123 | out : Map [<map.value>] : Object | B.java:1234:108:1234:124 | readMapValue(...) | provenance | MaD:209 |
 | B.java:1244:16:1244:28 | (...)... : Set | B.java:1244:41:1244:43 | out : Set | provenance |  |
 | B.java:1244:21:1244:28 | source(...) : Object | B.java:1244:16:1244:28 | (...)... : Set | provenance |  |
-| B.java:1244:41:1244:43 | out : Set | B.java:1244:41:1244:43 | out [post update] : Set | provenance | MaD:299 |
+| B.java:1244:41:1244:43 | out : Set | B.java:1244:41:1244:43 | out [post update] : Set | provenance | MaD:312 |
 | B.java:1244:41:1244:43 | out [post update] : Set | B.java:1244:59:1244:61 | out | provenance |  |
 | B.java:1249:23:1249:48 | storeElementList(...) : List [<element>] : Object | B.java:1249:68:1249:69 | in : List [<element>] : Object | provenance |  |
 | B.java:1249:40:1249:47 | source(...) : Object | B.java:24:39:24:43 | obj : Object | provenance |  |
-| B.java:1249:40:1249:47 | source(...) : Object | B.java:1249:23:1249:48 | storeElementList(...) : List [<element>] : Object | provenance | MaD:154 |
+| B.java:1249:40:1249:47 | source(...) : Object | B.java:1249:23:1249:48 | storeElementList(...) : List [<element>] : Object | provenance | MaD:151 |
 | B.java:1249:57:1249:70 | copyOf(...) : Set [<element>] : Object | B.java:1249:90:1249:92 | out : Set [<element>] : Object | provenance |  |
-| B.java:1249:68:1249:69 | in : List [<element>] : Object | B.java:1249:57:1249:70 | copyOf(...) : Set [<element>] : Object | provenance | MaD:298 |
+| B.java:1249:68:1249:69 | in : List [<element>] : Object | B.java:1249:57:1249:70 | copyOf(...) : Set [<element>] : Object | provenance | MaD:300 |
 | B.java:1249:90:1249:92 | out : Set [<element>] : Object | B.java:31:28:31:42 | obj : Set [<element>] : Object | provenance |  |
-| B.java:1249:90:1249:92 | out : Set [<element>] : Object | B.java:1249:78:1249:93 | readElement(...) | provenance | MaD:1 |
+| B.java:1249:90:1249:92 | out : Set [<element>] : Object | B.java:1249:78:1249:93 | readElement(...) | provenance | MaD:3 |
 | B.java:1254:21:1254:47 | storeArrayElement(...) : Object[] [[]] : Object | B.java:1254:63:1254:64 | in : Object[] [[]] : Object | provenance |  |
 | B.java:1254:39:1254:46 | source(...) : Object | B.java:11:37:11:46 | obj : Object | provenance |  |
 | B.java:1254:39:1254:46 | source(...) : Object | B.java:1254:21:1254:47 | storeArrayElement(...) : Object[] [[]] : Object | provenance |  |
 | B.java:1254:56:1254:65 | of(...) : Set [<element>] : Object | B.java:1254:85:1254:87 | out : Set [<element>] : Object | provenance |  |
-| B.java:1254:63:1254:64 | in : Object[] [[]] : Object | B.java:1254:56:1254:65 | of(...) : Set [<element>] : Object | provenance | MaD:310 |
+| B.java:1254:63:1254:64 | in : Object[] [[]] : Object | B.java:1254:56:1254:65 | of(...) : Set [<element>] : Object | provenance | MaD:311 |
 | B.java:1254:85:1254:87 | out : Set [<element>] : Object | B.java:31:28:31:42 | obj : Set [<element>] : Object | provenance |  |
-| B.java:1254:85:1254:87 | out : Set [<element>] : Object | B.java:1254:73:1254:88 | readElement(...) | provenance | MaD:1 |
+| B.java:1254:85:1254:87 | out : Set [<element>] : Object | B.java:1254:73:1254:88 | readElement(...) | provenance | MaD:3 |
 | B.java:1259:19:1259:26 | source(...) : Object | B.java:1259:42:1259:43 | in : Object | provenance |  |
 | B.java:1259:35:1259:44 | of(...) : Set [<element>] : Object | B.java:1259:64:1259:66 | out : Set [<element>] : Object | provenance |  |
-| B.java:1259:42:1259:43 | in : Object | B.java:1259:35:1259:44 | of(...) : Set [<element>] : Object | provenance | MaD:300 |
+| B.java:1259:42:1259:43 | in : Object | B.java:1259:35:1259:44 | of(...) : Set [<element>] : Object | provenance | MaD:301 |
 | B.java:1259:64:1259:66 | out : Set [<element>] : Object | B.java:31:28:31:42 | obj : Set [<element>] : Object | provenance |  |
-| B.java:1259:64:1259:66 | out : Set [<element>] : Object | B.java:1259:52:1259:67 | readElement(...) | provenance | MaD:1 |
+| B.java:1259:64:1259:66 | out : Set [<element>] : Object | B.java:1259:52:1259:67 | readElement(...) | provenance | MaD:3 |
 | B.java:1264:19:1264:26 | source(...) : Object | B.java:1264:42:1264:43 | in : Object | provenance |  |
 | B.java:1264:35:1264:49 | of(...) : Set [<element>] : Object | B.java:1264:69:1264:71 | out : Set [<element>] : Object | provenance |  |
-| B.java:1264:42:1264:43 | in : Object | B.java:1264:35:1264:49 | of(...) : Set [<element>] : Object | provenance | MaD:301 |
+| B.java:1264:42:1264:43 | in : Object | B.java:1264:35:1264:49 | of(...) : Set [<element>] : Object | provenance | MaD:302 |
 | B.java:1264:69:1264:71 | out : Set [<element>] : Object | B.java:31:28:31:42 | obj : Set [<element>] : Object | provenance |  |
-| B.java:1264:69:1264:71 | out : Set [<element>] : Object | B.java:1264:57:1264:72 | readElement(...) | provenance | MaD:1 |
+| B.java:1264:69:1264:71 | out : Set [<element>] : Object | B.java:1264:57:1264:72 | readElement(...) | provenance | MaD:3 |
 | B.java:1269:19:1269:26 | source(...) : Object | B.java:1269:47:1269:48 | in : Object | provenance |  |
 | B.java:1269:35:1269:49 | of(...) : Set [<element>] : Object | B.java:1269:69:1269:71 | out : Set [<element>] : Object | provenance |  |
-| B.java:1269:47:1269:48 | in : Object | B.java:1269:35:1269:49 | of(...) : Set [<element>] : Object | provenance | MaD:301 |
+| B.java:1269:47:1269:48 | in : Object | B.java:1269:35:1269:49 | of(...) : Set [<element>] : Object | provenance | MaD:302 |
 | B.java:1269:69:1269:71 | out : Set [<element>] : Object | B.java:31:28:31:42 | obj : Set [<element>] : Object | provenance |  |
-| B.java:1269:69:1269:71 | out : Set [<element>] : Object | B.java:1269:57:1269:72 | readElement(...) | provenance | MaD:1 |
+| B.java:1269:69:1269:71 | out : Set [<element>] : Object | B.java:1269:57:1269:72 | readElement(...) | provenance | MaD:3 |
 | B.java:1274:19:1274:26 | source(...) : Object | B.java:1274:42:1274:43 | in : Object | provenance |  |
 | B.java:1274:35:1274:54 | of(...) : Set [<element>] : Object | B.java:1274:74:1274:76 | out : Set [<element>] : Object | provenance |  |
-| B.java:1274:42:1274:43 | in : Object | B.java:1274:35:1274:54 | of(...) : Set [<element>] : Object | provenance | MaD:302 |
+| B.java:1274:42:1274:43 | in : Object | B.java:1274:35:1274:54 | of(...) : Set [<element>] : Object | provenance | MaD:303 |
 | B.java:1274:74:1274:76 | out : Set [<element>] : Object | B.java:31:28:31:42 | obj : Set [<element>] : Object | provenance |  |
-| B.java:1274:74:1274:76 | out : Set [<element>] : Object | B.java:1274:62:1274:77 | readElement(...) | provenance | MaD:1 |
+| B.java:1274:74:1274:76 | out : Set [<element>] : Object | B.java:1274:62:1274:77 | readElement(...) | provenance | MaD:3 |
 | B.java:1279:19:1279:26 | source(...) : Object | B.java:1279:47:1279:48 | in : Object | provenance |  |
 | B.java:1279:35:1279:54 | of(...) : Set [<element>] : Object | B.java:1279:74:1279:76 | out : Set [<element>] : Object | provenance |  |
-| B.java:1279:47:1279:48 | in : Object | B.java:1279:35:1279:54 | of(...) : Set [<element>] : Object | provenance | MaD:302 |
+| B.java:1279:47:1279:48 | in : Object | B.java:1279:35:1279:54 | of(...) : Set [<element>] : Object | provenance | MaD:303 |
 | B.java:1279:74:1279:76 | out : Set [<element>] : Object | B.java:31:28:31:42 | obj : Set [<element>] : Object | provenance |  |
-| B.java:1279:74:1279:76 | out : Set [<element>] : Object | B.java:1279:62:1279:77 | readElement(...) | provenance | MaD:1 |
+| B.java:1279:74:1279:76 | out : Set [<element>] : Object | B.java:1279:62:1279:77 | readElement(...) | provenance | MaD:3 |
 | B.java:1284:19:1284:26 | source(...) : Object | B.java:1284:52:1284:53 | in : Object | provenance |  |
 | B.java:1284:35:1284:54 | of(...) : Set [<element>] : Object | B.java:1284:74:1284:76 | out : Set [<element>] : Object | provenance |  |
-| B.java:1284:52:1284:53 | in : Object | B.java:1284:35:1284:54 | of(...) : Set [<element>] : Object | provenance | MaD:302 |
+| B.java:1284:52:1284:53 | in : Object | B.java:1284:35:1284:54 | of(...) : Set [<element>] : Object | provenance | MaD:303 |
 | B.java:1284:74:1284:76 | out : Set [<element>] : Object | B.java:31:28:31:42 | obj : Set [<element>] : Object | provenance |  |
-| B.java:1284:74:1284:76 | out : Set [<element>] : Object | B.java:1284:62:1284:77 | readElement(...) | provenance | MaD:1 |
+| B.java:1284:74:1284:76 | out : Set [<element>] : Object | B.java:1284:62:1284:77 | readElement(...) | provenance | MaD:3 |
 | B.java:1289:19:1289:26 | source(...) : Object | B.java:1289:42:1289:43 | in : Object | provenance |  |
 | B.java:1289:35:1289:59 | of(...) : Set [<element>] : Object | B.java:1289:79:1289:81 | out : Set [<element>] : Object | provenance |  |
-| B.java:1289:42:1289:43 | in : Object | B.java:1289:35:1289:59 | of(...) : Set [<element>] : Object | provenance | MaD:303 |
+| B.java:1289:42:1289:43 | in : Object | B.java:1289:35:1289:59 | of(...) : Set [<element>] : Object | provenance | MaD:304 |
 | B.java:1289:79:1289:81 | out : Set [<element>] : Object | B.java:31:28:31:42 | obj : Set [<element>] : Object | provenance |  |
-| B.java:1289:79:1289:81 | out : Set [<element>] : Object | B.java:1289:67:1289:82 | readElement(...) | provenance | MaD:1 |
+| B.java:1289:79:1289:81 | out : Set [<element>] : Object | B.java:1289:67:1289:82 | readElement(...) | provenance | MaD:3 |
 | B.java:1294:19:1294:26 | source(...) : Object | B.java:1294:47:1294:48 | in : Object | provenance |  |
 | B.java:1294:35:1294:59 | of(...) : Set [<element>] : Object | B.java:1294:79:1294:81 | out : Set [<element>] : Object | provenance |  |
-| B.java:1294:47:1294:48 | in : Object | B.java:1294:35:1294:59 | of(...) : Set [<element>] : Object | provenance | MaD:303 |
+| B.java:1294:47:1294:48 | in : Object | B.java:1294:35:1294:59 | of(...) : Set [<element>] : Object | provenance | MaD:304 |
 | B.java:1294:79:1294:81 | out : Set [<element>] : Object | B.java:31:28:31:42 | obj : Set [<element>] : Object | provenance |  |
-| B.java:1294:79:1294:81 | out : Set [<element>] : Object | B.java:1294:67:1294:82 | readElement(...) | provenance | MaD:1 |
+| B.java:1294:79:1294:81 | out : Set [<element>] : Object | B.java:1294:67:1294:82 | readElement(...) | provenance | MaD:3 |
 | B.java:1299:19:1299:26 | source(...) : Object | B.java:1299:52:1299:53 | in : Object | provenance |  |
 | B.java:1299:35:1299:59 | of(...) : Set [<element>] : Object | B.java:1299:79:1299:81 | out : Set [<element>] : Object | provenance |  |
-| B.java:1299:52:1299:53 | in : Object | B.java:1299:35:1299:59 | of(...) : Set [<element>] : Object | provenance | MaD:303 |
+| B.java:1299:52:1299:53 | in : Object | B.java:1299:35:1299:59 | of(...) : Set [<element>] : Object | provenance | MaD:304 |
 | B.java:1299:79:1299:81 | out : Set [<element>] : Object | B.java:31:28:31:42 | obj : Set [<element>] : Object | provenance |  |
-| B.java:1299:79:1299:81 | out : Set [<element>] : Object | B.java:1299:67:1299:82 | readElement(...) | provenance | MaD:1 |
+| B.java:1299:79:1299:81 | out : Set [<element>] : Object | B.java:1299:67:1299:82 | readElement(...) | provenance | MaD:3 |
 | B.java:1304:19:1304:26 | source(...) : Object | B.java:1304:57:1304:58 | in : Object | provenance |  |
 | B.java:1304:35:1304:59 | of(...) : Set [<element>] : Object | B.java:1304:79:1304:81 | out : Set [<element>] : Object | provenance |  |
-| B.java:1304:57:1304:58 | in : Object | B.java:1304:35:1304:59 | of(...) : Set [<element>] : Object | provenance | MaD:303 |
+| B.java:1304:57:1304:58 | in : Object | B.java:1304:35:1304:59 | of(...) : Set [<element>] : Object | provenance | MaD:304 |
 | B.java:1304:79:1304:81 | out : Set [<element>] : Object | B.java:31:28:31:42 | obj : Set [<element>] : Object | provenance |  |
-| B.java:1304:79:1304:81 | out : Set [<element>] : Object | B.java:1304:67:1304:82 | readElement(...) | provenance | MaD:1 |
+| B.java:1304:79:1304:81 | out : Set [<element>] : Object | B.java:1304:67:1304:82 | readElement(...) | provenance | MaD:3 |
 | B.java:1309:19:1309:26 | source(...) : Object | B.java:1309:42:1309:43 | in : Object | provenance |  |
 | B.java:1309:35:1309:64 | of(...) : Set [<element>] : Object | B.java:1309:84:1309:86 | out : Set [<element>] : Object | provenance |  |
-| B.java:1309:42:1309:43 | in : Object | B.java:1309:35:1309:64 | of(...) : Set [<element>] : Object | provenance | MaD:304 |
+| B.java:1309:42:1309:43 | in : Object | B.java:1309:35:1309:64 | of(...) : Set [<element>] : Object | provenance | MaD:305 |
 | B.java:1309:84:1309:86 | out : Set [<element>] : Object | B.java:31:28:31:42 | obj : Set [<element>] : Object | provenance |  |
-| B.java:1309:84:1309:86 | out : Set [<element>] : Object | B.java:1309:72:1309:87 | readElement(...) | provenance | MaD:1 |
+| B.java:1309:84:1309:86 | out : Set [<element>] : Object | B.java:1309:72:1309:87 | readElement(...) | provenance | MaD:3 |
 | B.java:1314:19:1314:26 | source(...) : Object | B.java:1314:47:1314:48 | in : Object | provenance |  |
 | B.java:1314:35:1314:64 | of(...) : Set [<element>] : Object | B.java:1314:84:1314:86 | out : Set [<element>] : Object | provenance |  |
-| B.java:1314:47:1314:48 | in : Object | B.java:1314:35:1314:64 | of(...) : Set [<element>] : Object | provenance | MaD:304 |
+| B.java:1314:47:1314:48 | in : Object | B.java:1314:35:1314:64 | of(...) : Set [<element>] : Object | provenance | MaD:305 |
 | B.java:1314:84:1314:86 | out : Set [<element>] : Object | B.java:31:28:31:42 | obj : Set [<element>] : Object | provenance |  |
-| B.java:1314:84:1314:86 | out : Set [<element>] : Object | B.java:1314:72:1314:87 | readElement(...) | provenance | MaD:1 |
+| B.java:1314:84:1314:86 | out : Set [<element>] : Object | B.java:1314:72:1314:87 | readElement(...) | provenance | MaD:3 |
 | B.java:1319:19:1319:26 | source(...) : Object | B.java:1319:52:1319:53 | in : Object | provenance |  |
 | B.java:1319:35:1319:64 | of(...) : Set [<element>] : Object | B.java:1319:84:1319:86 | out : Set [<element>] : Object | provenance |  |
-| B.java:1319:52:1319:53 | in : Object | B.java:1319:35:1319:64 | of(...) : Set [<element>] : Object | provenance | MaD:304 |
+| B.java:1319:52:1319:53 | in : Object | B.java:1319:35:1319:64 | of(...) : Set [<element>] : Object | provenance | MaD:305 |
 | B.java:1319:84:1319:86 | out : Set [<element>] : Object | B.java:31:28:31:42 | obj : Set [<element>] : Object | provenance |  |
-| B.java:1319:84:1319:86 | out : Set [<element>] : Object | B.java:1319:72:1319:87 | readElement(...) | provenance | MaD:1 |
+| B.java:1319:84:1319:86 | out : Set [<element>] : Object | B.java:1319:72:1319:87 | readElement(...) | provenance | MaD:3 |
 | B.java:1324:19:1324:26 | source(...) : Object | B.java:1324:57:1324:58 | in : Object | provenance |  |
 | B.java:1324:35:1324:64 | of(...) : Set [<element>] : Object | B.java:1324:84:1324:86 | out : Set [<element>] : Object | provenance |  |
-| B.java:1324:57:1324:58 | in : Object | B.java:1324:35:1324:64 | of(...) : Set [<element>] : Object | provenance | MaD:304 |
+| B.java:1324:57:1324:58 | in : Object | B.java:1324:35:1324:64 | of(...) : Set [<element>] : Object | provenance | MaD:305 |
 | B.java:1324:84:1324:86 | out : Set [<element>] : Object | B.java:31:28:31:42 | obj : Set [<element>] : Object | provenance |  |
-| B.java:1324:84:1324:86 | out : Set [<element>] : Object | B.java:1324:72:1324:87 | readElement(...) | provenance | MaD:1 |
+| B.java:1324:84:1324:86 | out : Set [<element>] : Object | B.java:1324:72:1324:87 | readElement(...) | provenance | MaD:3 |
 | B.java:1329:19:1329:26 | source(...) : Object | B.java:1329:62:1329:63 | in : Object | provenance |  |
 | B.java:1329:35:1329:64 | of(...) : Set [<element>] : Object | B.java:1329:84:1329:86 | out : Set [<element>] : Object | provenance |  |
-| B.java:1329:62:1329:63 | in : Object | B.java:1329:35:1329:64 | of(...) : Set [<element>] : Object | provenance | MaD:304 |
+| B.java:1329:62:1329:63 | in : Object | B.java:1329:35:1329:64 | of(...) : Set [<element>] : Object | provenance | MaD:305 |
 | B.java:1329:84:1329:86 | out : Set [<element>] : Object | B.java:31:28:31:42 | obj : Set [<element>] : Object | provenance |  |
-| B.java:1329:84:1329:86 | out : Set [<element>] : Object | B.java:1329:72:1329:87 | readElement(...) | provenance | MaD:1 |
+| B.java:1329:84:1329:86 | out : Set [<element>] : Object | B.java:1329:72:1329:87 | readElement(...) | provenance | MaD:3 |
 | B.java:1334:19:1334:26 | source(...) : Object | B.java:1334:42:1334:43 | in : Object | provenance |  |
 | B.java:1334:35:1334:69 | of(...) : Set [<element>] : Object | B.java:1334:89:1334:91 | out : Set [<element>] : Object | provenance |  |
-| B.java:1334:42:1334:43 | in : Object | B.java:1334:35:1334:69 | of(...) : Set [<element>] : Object | provenance | MaD:305 |
+| B.java:1334:42:1334:43 | in : Object | B.java:1334:35:1334:69 | of(...) : Set [<element>] : Object | provenance | MaD:306 |
 | B.java:1334:89:1334:91 | out : Set [<element>] : Object | B.java:31:28:31:42 | obj : Set [<element>] : Object | provenance |  |
-| B.java:1334:89:1334:91 | out : Set [<element>] : Object | B.java:1334:77:1334:92 | readElement(...) | provenance | MaD:1 |
+| B.java:1334:89:1334:91 | out : Set [<element>] : Object | B.java:1334:77:1334:92 | readElement(...) | provenance | MaD:3 |
 | B.java:1339:19:1339:26 | source(...) : Object | B.java:1339:47:1339:48 | in : Object | provenance |  |
 | B.java:1339:35:1339:69 | of(...) : Set [<element>] : Object | B.java:1339:89:1339:91 | out : Set [<element>] : Object | provenance |  |
-| B.java:1339:47:1339:48 | in : Object | B.java:1339:35:1339:69 | of(...) : Set [<element>] : Object | provenance | MaD:305 |
+| B.java:1339:47:1339:48 | in : Object | B.java:1339:35:1339:69 | of(...) : Set [<element>] : Object | provenance | MaD:306 |
 | B.java:1339:89:1339:91 | out : Set [<element>] : Object | B.java:31:28:31:42 | obj : Set [<element>] : Object | provenance |  |
-| B.java:1339:89:1339:91 | out : Set [<element>] : Object | B.java:1339:77:1339:92 | readElement(...) | provenance | MaD:1 |
+| B.java:1339:89:1339:91 | out : Set [<element>] : Object | B.java:1339:77:1339:92 | readElement(...) | provenance | MaD:3 |
 | B.java:1344:19:1344:26 | source(...) : Object | B.java:1344:52:1344:53 | in : Object | provenance |  |
 | B.java:1344:35:1344:69 | of(...) : Set [<element>] : Object | B.java:1344:89:1344:91 | out : Set [<element>] : Object | provenance |  |
-| B.java:1344:52:1344:53 | in : Object | B.java:1344:35:1344:69 | of(...) : Set [<element>] : Object | provenance | MaD:305 |
+| B.java:1344:52:1344:53 | in : Object | B.java:1344:35:1344:69 | of(...) : Set [<element>] : Object | provenance | MaD:306 |
 | B.java:1344:89:1344:91 | out : Set [<element>] : Object | B.java:31:28:31:42 | obj : Set [<element>] : Object | provenance |  |
-| B.java:1344:89:1344:91 | out : Set [<element>] : Object | B.java:1344:77:1344:92 | readElement(...) | provenance | MaD:1 |
+| B.java:1344:89:1344:91 | out : Set [<element>] : Object | B.java:1344:77:1344:92 | readElement(...) | provenance | MaD:3 |
 | B.java:1349:19:1349:26 | source(...) : Object | B.java:1349:57:1349:58 | in : Object | provenance |  |
 | B.java:1349:35:1349:69 | of(...) : Set [<element>] : Object | B.java:1349:89:1349:91 | out : Set [<element>] : Object | provenance |  |
-| B.java:1349:57:1349:58 | in : Object | B.java:1349:35:1349:69 | of(...) : Set [<element>] : Object | provenance | MaD:305 |
+| B.java:1349:57:1349:58 | in : Object | B.java:1349:35:1349:69 | of(...) : Set [<element>] : Object | provenance | MaD:306 |
 | B.java:1349:89:1349:91 | out : Set [<element>] : Object | B.java:31:28:31:42 | obj : Set [<element>] : Object | provenance |  |
-| B.java:1349:89:1349:91 | out : Set [<element>] : Object | B.java:1349:77:1349:92 | readElement(...) | provenance | MaD:1 |
+| B.java:1349:89:1349:91 | out : Set [<element>] : Object | B.java:1349:77:1349:92 | readElement(...) | provenance | MaD:3 |
 | B.java:1354:19:1354:26 | source(...) : Object | B.java:1354:62:1354:63 | in : Object | provenance |  |
 | B.java:1354:35:1354:69 | of(...) : Set [<element>] : Object | B.java:1354:89:1354:91 | out : Set [<element>] : Object | provenance |  |
-| B.java:1354:62:1354:63 | in : Object | B.java:1354:35:1354:69 | of(...) : Set [<element>] : Object | provenance | MaD:305 |
+| B.java:1354:62:1354:63 | in : Object | B.java:1354:35:1354:69 | of(...) : Set [<element>] : Object | provenance | MaD:306 |
 | B.java:1354:89:1354:91 | out : Set [<element>] : Object | B.java:31:28:31:42 | obj : Set [<element>] : Object | provenance |  |
-| B.java:1354:89:1354:91 | out : Set [<element>] : Object | B.java:1354:77:1354:92 | readElement(...) | provenance | MaD:1 |
+| B.java:1354:89:1354:91 | out : Set [<element>] : Object | B.java:1354:77:1354:92 | readElement(...) | provenance | MaD:3 |
 | B.java:1359:19:1359:26 | source(...) : Object | B.java:1359:67:1359:68 | in : Object | provenance |  |
 | B.java:1359:35:1359:69 | of(...) : Set [<element>] : Object | B.java:1359:89:1359:91 | out : Set [<element>] : Object | provenance |  |
-| B.java:1359:67:1359:68 | in : Object | B.java:1359:35:1359:69 | of(...) : Set [<element>] : Object | provenance | MaD:305 |
+| B.java:1359:67:1359:68 | in : Object | B.java:1359:35:1359:69 | of(...) : Set [<element>] : Object | provenance | MaD:306 |
 | B.java:1359:89:1359:91 | out : Set [<element>] : Object | B.java:31:28:31:42 | obj : Set [<element>] : Object | provenance |  |
-| B.java:1359:89:1359:91 | out : Set [<element>] : Object | B.java:1359:77:1359:92 | readElement(...) | provenance | MaD:1 |
+| B.java:1359:89:1359:91 | out : Set [<element>] : Object | B.java:1359:77:1359:92 | readElement(...) | provenance | MaD:3 |
 | B.java:1364:19:1364:26 | source(...) : Object | B.java:1364:42:1364:43 | in : Object | provenance |  |
 | B.java:1364:35:1364:74 | of(...) : Set [<element>] : Object | B.java:1364:94:1364:96 | out : Set [<element>] : Object | provenance |  |
-| B.java:1364:42:1364:43 | in : Object | B.java:1364:35:1364:74 | of(...) : Set [<element>] : Object | provenance | MaD:306 |
+| B.java:1364:42:1364:43 | in : Object | B.java:1364:35:1364:74 | of(...) : Set [<element>] : Object | provenance | MaD:307 |
 | B.java:1364:94:1364:96 | out : Set [<element>] : Object | B.java:31:28:31:42 | obj : Set [<element>] : Object | provenance |  |
-| B.java:1364:94:1364:96 | out : Set [<element>] : Object | B.java:1364:82:1364:97 | readElement(...) | provenance | MaD:1 |
+| B.java:1364:94:1364:96 | out : Set [<element>] : Object | B.java:1364:82:1364:97 | readElement(...) | provenance | MaD:3 |
 | B.java:1369:19:1369:26 | source(...) : Object | B.java:1369:47:1369:48 | in : Object | provenance |  |
 | B.java:1369:35:1369:74 | of(...) : Set [<element>] : Object | B.java:1369:94:1369:96 | out : Set [<element>] : Object | provenance |  |
-| B.java:1369:47:1369:48 | in : Object | B.java:1369:35:1369:74 | of(...) : Set [<element>] : Object | provenance | MaD:306 |
+| B.java:1369:47:1369:48 | in : Object | B.java:1369:35:1369:74 | of(...) : Set [<element>] : Object | provenance | MaD:307 |
 | B.java:1369:94:1369:96 | out : Set [<element>] : Object | B.java:31:28:31:42 | obj : Set [<element>] : Object | provenance |  |
-| B.java:1369:94:1369:96 | out : Set [<element>] : Object | B.java:1369:82:1369:97 | readElement(...) | provenance | MaD:1 |
+| B.java:1369:94:1369:96 | out : Set [<element>] : Object | B.java:1369:82:1369:97 | readElement(...) | provenance | MaD:3 |
 | B.java:1374:19:1374:26 | source(...) : Object | B.java:1374:52:1374:53 | in : Object | provenance |  |
 | B.java:1374:35:1374:74 | of(...) : Set [<element>] : Object | B.java:1374:94:1374:96 | out : Set [<element>] : Object | provenance |  |
-| B.java:1374:52:1374:53 | in : Object | B.java:1374:35:1374:74 | of(...) : Set [<element>] : Object | provenance | MaD:306 |
+| B.java:1374:52:1374:53 | in : Object | B.java:1374:35:1374:74 | of(...) : Set [<element>] : Object | provenance | MaD:307 |
 | B.java:1374:94:1374:96 | out : Set [<element>] : Object | B.java:31:28:31:42 | obj : Set [<element>] : Object | provenance |  |
-| B.java:1374:94:1374:96 | out : Set [<element>] : Object | B.java:1374:82:1374:97 | readElement(...) | provenance | MaD:1 |
+| B.java:1374:94:1374:96 | out : Set [<element>] : Object | B.java:1374:82:1374:97 | readElement(...) | provenance | MaD:3 |
 | B.java:1379:19:1379:26 | source(...) : Object | B.java:1379:57:1379:58 | in : Object | provenance |  |
 | B.java:1379:35:1379:74 | of(...) : Set [<element>] : Object | B.java:1379:94:1379:96 | out : Set [<element>] : Object | provenance |  |
-| B.java:1379:57:1379:58 | in : Object | B.java:1379:35:1379:74 | of(...) : Set [<element>] : Object | provenance | MaD:306 |
+| B.java:1379:57:1379:58 | in : Object | B.java:1379:35:1379:74 | of(...) : Set [<element>] : Object | provenance | MaD:307 |
 | B.java:1379:94:1379:96 | out : Set [<element>] : Object | B.java:31:28:31:42 | obj : Set [<element>] : Object | provenance |  |
-| B.java:1379:94:1379:96 | out : Set [<element>] : Object | B.java:1379:82:1379:97 | readElement(...) | provenance | MaD:1 |
+| B.java:1379:94:1379:96 | out : Set [<element>] : Object | B.java:1379:82:1379:97 | readElement(...) | provenance | MaD:3 |
 | B.java:1384:19:1384:26 | source(...) : Object | B.java:1384:62:1384:63 | in : Object | provenance |  |
 | B.java:1384:35:1384:74 | of(...) : Set [<element>] : Object | B.java:1384:94:1384:96 | out : Set [<element>] : Object | provenance |  |
-| B.java:1384:62:1384:63 | in : Object | B.java:1384:35:1384:74 | of(...) : Set [<element>] : Object | provenance | MaD:306 |
+| B.java:1384:62:1384:63 | in : Object | B.java:1384:35:1384:74 | of(...) : Set [<element>] : Object | provenance | MaD:307 |
 | B.java:1384:94:1384:96 | out : Set [<element>] : Object | B.java:31:28:31:42 | obj : Set [<element>] : Object | provenance |  |
-| B.java:1384:94:1384:96 | out : Set [<element>] : Object | B.java:1384:82:1384:97 | readElement(...) | provenance | MaD:1 |
+| B.java:1384:94:1384:96 | out : Set [<element>] : Object | B.java:1384:82:1384:97 | readElement(...) | provenance | MaD:3 |
 | B.java:1389:19:1389:26 | source(...) : Object | B.java:1389:67:1389:68 | in : Object | provenance |  |
 | B.java:1389:35:1389:74 | of(...) : Set [<element>] : Object | B.java:1389:94:1389:96 | out : Set [<element>] : Object | provenance |  |
-| B.java:1389:67:1389:68 | in : Object | B.java:1389:35:1389:74 | of(...) : Set [<element>] : Object | provenance | MaD:306 |
+| B.java:1389:67:1389:68 | in : Object | B.java:1389:35:1389:74 | of(...) : Set [<element>] : Object | provenance | MaD:307 |
 | B.java:1389:94:1389:96 | out : Set [<element>] : Object | B.java:31:28:31:42 | obj : Set [<element>] : Object | provenance |  |
-| B.java:1389:94:1389:96 | out : Set [<element>] : Object | B.java:1389:82:1389:97 | readElement(...) | provenance | MaD:1 |
+| B.java:1389:94:1389:96 | out : Set [<element>] : Object | B.java:1389:82:1389:97 | readElement(...) | provenance | MaD:3 |
 | B.java:1394:19:1394:26 | source(...) : Object | B.java:1394:72:1394:73 | in : Object | provenance |  |
 | B.java:1394:35:1394:74 | of(...) : Set [<element>] : Object | B.java:1394:94:1394:96 | out : Set [<element>] : Object | provenance |  |
-| B.java:1394:72:1394:73 | in : Object | B.java:1394:35:1394:74 | of(...) : Set [<element>] : Object | provenance | MaD:306 |
+| B.java:1394:72:1394:73 | in : Object | B.java:1394:35:1394:74 | of(...) : Set [<element>] : Object | provenance | MaD:307 |
 | B.java:1394:94:1394:96 | out : Set [<element>] : Object | B.java:31:28:31:42 | obj : Set [<element>] : Object | provenance |  |
-| B.java:1394:94:1394:96 | out : Set [<element>] : Object | B.java:1394:82:1394:97 | readElement(...) | provenance | MaD:1 |
+| B.java:1394:94:1394:96 | out : Set [<element>] : Object | B.java:1394:82:1394:97 | readElement(...) | provenance | MaD:3 |
 | B.java:1399:19:1399:26 | source(...) : Object | B.java:1399:42:1399:43 | in : Object | provenance |  |
 | B.java:1399:35:1399:79 | of(...) : Set [<element>] : Object | B.java:1399:99:1399:101 | out : Set [<element>] : Object | provenance |  |
-| B.java:1399:42:1399:43 | in : Object | B.java:1399:35:1399:79 | of(...) : Set [<element>] : Object | provenance | MaD:307 |
+| B.java:1399:42:1399:43 | in : Object | B.java:1399:35:1399:79 | of(...) : Set [<element>] : Object | provenance | MaD:308 |
 | B.java:1399:99:1399:101 | out : Set [<element>] : Object | B.java:31:28:31:42 | obj : Set [<element>] : Object | provenance |  |
-| B.java:1399:99:1399:101 | out : Set [<element>] : Object | B.java:1399:87:1399:102 | readElement(...) | provenance | MaD:1 |
+| B.java:1399:99:1399:101 | out : Set [<element>] : Object | B.java:1399:87:1399:102 | readElement(...) | provenance | MaD:3 |
 | B.java:1404:19:1404:26 | source(...) : Object | B.java:1404:47:1404:48 | in : Object | provenance |  |
 | B.java:1404:35:1404:79 | of(...) : Set [<element>] : Object | B.java:1404:99:1404:101 | out : Set [<element>] : Object | provenance |  |
-| B.java:1404:47:1404:48 | in : Object | B.java:1404:35:1404:79 | of(...) : Set [<element>] : Object | provenance | MaD:307 |
+| B.java:1404:47:1404:48 | in : Object | B.java:1404:35:1404:79 | of(...) : Set [<element>] : Object | provenance | MaD:308 |
 | B.java:1404:99:1404:101 | out : Set [<element>] : Object | B.java:31:28:31:42 | obj : Set [<element>] : Object | provenance |  |
-| B.java:1404:99:1404:101 | out : Set [<element>] : Object | B.java:1404:87:1404:102 | readElement(...) | provenance | MaD:1 |
+| B.java:1404:99:1404:101 | out : Set [<element>] : Object | B.java:1404:87:1404:102 | readElement(...) | provenance | MaD:3 |
 | B.java:1409:19:1409:26 | source(...) : Object | B.java:1409:52:1409:53 | in : Object | provenance |  |
 | B.java:1409:35:1409:79 | of(...) : Set [<element>] : Object | B.java:1409:99:1409:101 | out : Set [<element>] : Object | provenance |  |
-| B.java:1409:52:1409:53 | in : Object | B.java:1409:35:1409:79 | of(...) : Set [<element>] : Object | provenance | MaD:307 |
+| B.java:1409:52:1409:53 | in : Object | B.java:1409:35:1409:79 | of(...) : Set [<element>] : Object | provenance | MaD:308 |
 | B.java:1409:99:1409:101 | out : Set [<element>] : Object | B.java:31:28:31:42 | obj : Set [<element>] : Object | provenance |  |
-| B.java:1409:99:1409:101 | out : Set [<element>] : Object | B.java:1409:87:1409:102 | readElement(...) | provenance | MaD:1 |
+| B.java:1409:99:1409:101 | out : Set [<element>] : Object | B.java:1409:87:1409:102 | readElement(...) | provenance | MaD:3 |
 | B.java:1414:19:1414:26 | source(...) : Object | B.java:1414:57:1414:58 | in : Object | provenance |  |
 | B.java:1414:35:1414:79 | of(...) : Set [<element>] : Object | B.java:1414:99:1414:101 | out : Set [<element>] : Object | provenance |  |
-| B.java:1414:57:1414:58 | in : Object | B.java:1414:35:1414:79 | of(...) : Set [<element>] : Object | provenance | MaD:307 |
+| B.java:1414:57:1414:58 | in : Object | B.java:1414:35:1414:79 | of(...) : Set [<element>] : Object | provenance | MaD:308 |
 | B.java:1414:99:1414:101 | out : Set [<element>] : Object | B.java:31:28:31:42 | obj : Set [<element>] : Object | provenance |  |
-| B.java:1414:99:1414:101 | out : Set [<element>] : Object | B.java:1414:87:1414:102 | readElement(...) | provenance | MaD:1 |
+| B.java:1414:99:1414:101 | out : Set [<element>] : Object | B.java:1414:87:1414:102 | readElement(...) | provenance | MaD:3 |
 | B.java:1419:19:1419:26 | source(...) : Object | B.java:1419:62:1419:63 | in : Object | provenance |  |
 | B.java:1419:35:1419:79 | of(...) : Set [<element>] : Object | B.java:1419:99:1419:101 | out : Set [<element>] : Object | provenance |  |
-| B.java:1419:62:1419:63 | in : Object | B.java:1419:35:1419:79 | of(...) : Set [<element>] : Object | provenance | MaD:307 |
+| B.java:1419:62:1419:63 | in : Object | B.java:1419:35:1419:79 | of(...) : Set [<element>] : Object | provenance | MaD:308 |
 | B.java:1419:99:1419:101 | out : Set [<element>] : Object | B.java:31:28:31:42 | obj : Set [<element>] : Object | provenance |  |
-| B.java:1419:99:1419:101 | out : Set [<element>] : Object | B.java:1419:87:1419:102 | readElement(...) | provenance | MaD:1 |
+| B.java:1419:99:1419:101 | out : Set [<element>] : Object | B.java:1419:87:1419:102 | readElement(...) | provenance | MaD:3 |
 | B.java:1424:19:1424:26 | source(...) : Object | B.java:1424:67:1424:68 | in : Object | provenance |  |
 | B.java:1424:35:1424:79 | of(...) : Set [<element>] : Object | B.java:1424:99:1424:101 | out : Set [<element>] : Object | provenance |  |
-| B.java:1424:67:1424:68 | in : Object | B.java:1424:35:1424:79 | of(...) : Set [<element>] : Object | provenance | MaD:307 |
+| B.java:1424:67:1424:68 | in : Object | B.java:1424:35:1424:79 | of(...) : Set [<element>] : Object | provenance | MaD:308 |
 | B.java:1424:99:1424:101 | out : Set [<element>] : Object | B.java:31:28:31:42 | obj : Set [<element>] : Object | provenance |  |
-| B.java:1424:99:1424:101 | out : Set [<element>] : Object | B.java:1424:87:1424:102 | readElement(...) | provenance | MaD:1 |
+| B.java:1424:99:1424:101 | out : Set [<element>] : Object | B.java:1424:87:1424:102 | readElement(...) | provenance | MaD:3 |
 | B.java:1429:19:1429:26 | source(...) : Object | B.java:1429:72:1429:73 | in : Object | provenance |  |
 | B.java:1429:35:1429:79 | of(...) : Set [<element>] : Object | B.java:1429:99:1429:101 | out : Set [<element>] : Object | provenance |  |
-| B.java:1429:72:1429:73 | in : Object | B.java:1429:35:1429:79 | of(...) : Set [<element>] : Object | provenance | MaD:307 |
+| B.java:1429:72:1429:73 | in : Object | B.java:1429:35:1429:79 | of(...) : Set [<element>] : Object | provenance | MaD:308 |
 | B.java:1429:99:1429:101 | out : Set [<element>] : Object | B.java:31:28:31:42 | obj : Set [<element>] : Object | provenance |  |
-| B.java:1429:99:1429:101 | out : Set [<element>] : Object | B.java:1429:87:1429:102 | readElement(...) | provenance | MaD:1 |
+| B.java:1429:99:1429:101 | out : Set [<element>] : Object | B.java:1429:87:1429:102 | readElement(...) | provenance | MaD:3 |
 | B.java:1434:19:1434:26 | source(...) : Object | B.java:1434:77:1434:78 | in : Object | provenance |  |
 | B.java:1434:35:1434:79 | of(...) : Set [<element>] : Object | B.java:1434:99:1434:101 | out : Set [<element>] : Object | provenance |  |
-| B.java:1434:77:1434:78 | in : Object | B.java:1434:35:1434:79 | of(...) : Set [<element>] : Object | provenance | MaD:307 |
+| B.java:1434:77:1434:78 | in : Object | B.java:1434:35:1434:79 | of(...) : Set [<element>] : Object | provenance | MaD:308 |
 | B.java:1434:99:1434:101 | out : Set [<element>] : Object | B.java:31:28:31:42 | obj : Set [<element>] : Object | provenance |  |
-| B.java:1434:99:1434:101 | out : Set [<element>] : Object | B.java:1434:87:1434:102 | readElement(...) | provenance | MaD:1 |
+| B.java:1434:99:1434:101 | out : Set [<element>] : Object | B.java:1434:87:1434:102 | readElement(...) | provenance | MaD:3 |
 | B.java:1439:19:1439:26 | source(...) : Object | B.java:1439:42:1439:43 | in : Object | provenance |  |
 | B.java:1439:35:1439:84 | of(...) : Set [<element>] : Object | B.java:1439:104:1439:106 | out : Set [<element>] : Object | provenance |  |
-| B.java:1439:42:1439:43 | in : Object | B.java:1439:35:1439:84 | of(...) : Set [<element>] : Object | provenance | MaD:308 |
+| B.java:1439:42:1439:43 | in : Object | B.java:1439:35:1439:84 | of(...) : Set [<element>] : Object | provenance | MaD:309 |
 | B.java:1439:104:1439:106 | out : Set [<element>] : Object | B.java:31:28:31:42 | obj : Set [<element>] : Object | provenance |  |
-| B.java:1439:104:1439:106 | out : Set [<element>] : Object | B.java:1439:92:1439:107 | readElement(...) | provenance | MaD:1 |
+| B.java:1439:104:1439:106 | out : Set [<element>] : Object | B.java:1439:92:1439:107 | readElement(...) | provenance | MaD:3 |
 | B.java:1444:19:1444:26 | source(...) : Object | B.java:1444:47:1444:48 | in : Object | provenance |  |
 | B.java:1444:35:1444:84 | of(...) : Set [<element>] : Object | B.java:1444:104:1444:106 | out : Set [<element>] : Object | provenance |  |
-| B.java:1444:47:1444:48 | in : Object | B.java:1444:35:1444:84 | of(...) : Set [<element>] : Object | provenance | MaD:308 |
+| B.java:1444:47:1444:48 | in : Object | B.java:1444:35:1444:84 | of(...) : Set [<element>] : Object | provenance | MaD:309 |
 | B.java:1444:104:1444:106 | out : Set [<element>] : Object | B.java:31:28:31:42 | obj : Set [<element>] : Object | provenance |  |
-| B.java:1444:104:1444:106 | out : Set [<element>] : Object | B.java:1444:92:1444:107 | readElement(...) | provenance | MaD:1 |
+| B.java:1444:104:1444:106 | out : Set [<element>] : Object | B.java:1444:92:1444:107 | readElement(...) | provenance | MaD:3 |
 | B.java:1449:19:1449:26 | source(...) : Object | B.java:1449:52:1449:53 | in : Object | provenance |  |
 | B.java:1449:35:1449:84 | of(...) : Set [<element>] : Object | B.java:1449:104:1449:106 | out : Set [<element>] : Object | provenance |  |
-| B.java:1449:52:1449:53 | in : Object | B.java:1449:35:1449:84 | of(...) : Set [<element>] : Object | provenance | MaD:308 |
+| B.java:1449:52:1449:53 | in : Object | B.java:1449:35:1449:84 | of(...) : Set [<element>] : Object | provenance | MaD:309 |
 | B.java:1449:104:1449:106 | out : Set [<element>] : Object | B.java:31:28:31:42 | obj : Set [<element>] : Object | provenance |  |
-| B.java:1449:104:1449:106 | out : Set [<element>] : Object | B.java:1449:92:1449:107 | readElement(...) | provenance | MaD:1 |
+| B.java:1449:104:1449:106 | out : Set [<element>] : Object | B.java:1449:92:1449:107 | readElement(...) | provenance | MaD:3 |
 | B.java:1454:19:1454:26 | source(...) : Object | B.java:1454:57:1454:58 | in : Object | provenance |  |
 | B.java:1454:35:1454:84 | of(...) : Set [<element>] : Object | B.java:1454:104:1454:106 | out : Set [<element>] : Object | provenance |  |
-| B.java:1454:57:1454:58 | in : Object | B.java:1454:35:1454:84 | of(...) : Set [<element>] : Object | provenance | MaD:308 |
+| B.java:1454:57:1454:58 | in : Object | B.java:1454:35:1454:84 | of(...) : Set [<element>] : Object | provenance | MaD:309 |
 | B.java:1454:104:1454:106 | out : Set [<element>] : Object | B.java:31:28:31:42 | obj : Set [<element>] : Object | provenance |  |
-| B.java:1454:104:1454:106 | out : Set [<element>] : Object | B.java:1454:92:1454:107 | readElement(...) | provenance | MaD:1 |
+| B.java:1454:104:1454:106 | out : Set [<element>] : Object | B.java:1454:92:1454:107 | readElement(...) | provenance | MaD:3 |
 | B.java:1459:19:1459:26 | source(...) : Object | B.java:1459:62:1459:63 | in : Object | provenance |  |
 | B.java:1459:35:1459:84 | of(...) : Set [<element>] : Object | B.java:1459:104:1459:106 | out : Set [<element>] : Object | provenance |  |
-| B.java:1459:62:1459:63 | in : Object | B.java:1459:35:1459:84 | of(...) : Set [<element>] : Object | provenance | MaD:308 |
+| B.java:1459:62:1459:63 | in : Object | B.java:1459:35:1459:84 | of(...) : Set [<element>] : Object | provenance | MaD:309 |
 | B.java:1459:104:1459:106 | out : Set [<element>] : Object | B.java:31:28:31:42 | obj : Set [<element>] : Object | provenance |  |
-| B.java:1459:104:1459:106 | out : Set [<element>] : Object | B.java:1459:92:1459:107 | readElement(...) | provenance | MaD:1 |
+| B.java:1459:104:1459:106 | out : Set [<element>] : Object | B.java:1459:92:1459:107 | readElement(...) | provenance | MaD:3 |
 | B.java:1464:19:1464:26 | source(...) : Object | B.java:1464:67:1464:68 | in : Object | provenance |  |
 | B.java:1464:35:1464:84 | of(...) : Set [<element>] : Object | B.java:1464:104:1464:106 | out : Set [<element>] : Object | provenance |  |
-| B.java:1464:67:1464:68 | in : Object | B.java:1464:35:1464:84 | of(...) : Set [<element>] : Object | provenance | MaD:308 |
+| B.java:1464:67:1464:68 | in : Object | B.java:1464:35:1464:84 | of(...) : Set [<element>] : Object | provenance | MaD:309 |
 | B.java:1464:104:1464:106 | out : Set [<element>] : Object | B.java:31:28:31:42 | obj : Set [<element>] : Object | provenance |  |
-| B.java:1464:104:1464:106 | out : Set [<element>] : Object | B.java:1464:92:1464:107 | readElement(...) | provenance | MaD:1 |
+| B.java:1464:104:1464:106 | out : Set [<element>] : Object | B.java:1464:92:1464:107 | readElement(...) | provenance | MaD:3 |
 | B.java:1469:19:1469:26 | source(...) : Object | B.java:1469:72:1469:73 | in : Object | provenance |  |
 | B.java:1469:35:1469:84 | of(...) : Set [<element>] : Object | B.java:1469:104:1469:106 | out : Set [<element>] : Object | provenance |  |
-| B.java:1469:72:1469:73 | in : Object | B.java:1469:35:1469:84 | of(...) : Set [<element>] : Object | provenance | MaD:308 |
+| B.java:1469:72:1469:73 | in : Object | B.java:1469:35:1469:84 | of(...) : Set [<element>] : Object | provenance | MaD:309 |
 | B.java:1469:104:1469:106 | out : Set [<element>] : Object | B.java:31:28:31:42 | obj : Set [<element>] : Object | provenance |  |
-| B.java:1469:104:1469:106 | out : Set [<element>] : Object | B.java:1469:92:1469:107 | readElement(...) | provenance | MaD:1 |
+| B.java:1469:104:1469:106 | out : Set [<element>] : Object | B.java:1469:92:1469:107 | readElement(...) | provenance | MaD:3 |
 | B.java:1474:19:1474:26 | source(...) : Object | B.java:1474:77:1474:78 | in : Object | provenance |  |
 | B.java:1474:35:1474:84 | of(...) : Set [<element>] : Object | B.java:1474:104:1474:106 | out : Set [<element>] : Object | provenance |  |
-| B.java:1474:77:1474:78 | in : Object | B.java:1474:35:1474:84 | of(...) : Set [<element>] : Object | provenance | MaD:308 |
+| B.java:1474:77:1474:78 | in : Object | B.java:1474:35:1474:84 | of(...) : Set [<element>] : Object | provenance | MaD:309 |
 | B.java:1474:104:1474:106 | out : Set [<element>] : Object | B.java:31:28:31:42 | obj : Set [<element>] : Object | provenance |  |
-| B.java:1474:104:1474:106 | out : Set [<element>] : Object | B.java:1474:92:1474:107 | readElement(...) | provenance | MaD:1 |
+| B.java:1474:104:1474:106 | out : Set [<element>] : Object | B.java:1474:92:1474:107 | readElement(...) | provenance | MaD:3 |
 | B.java:1479:19:1479:26 | source(...) : Object | B.java:1479:82:1479:83 | in : Object | provenance |  |
 | B.java:1479:35:1479:84 | of(...) : Set [<element>] : Object | B.java:1479:104:1479:106 | out : Set [<element>] : Object | provenance |  |
-| B.java:1479:82:1479:83 | in : Object | B.java:1479:35:1479:84 | of(...) : Set [<element>] : Object | provenance | MaD:308 |
+| B.java:1479:82:1479:83 | in : Object | B.java:1479:35:1479:84 | of(...) : Set [<element>] : Object | provenance | MaD:309 |
 | B.java:1479:104:1479:106 | out : Set [<element>] : Object | B.java:31:28:31:42 | obj : Set [<element>] : Object | provenance |  |
-| B.java:1479:104:1479:106 | out : Set [<element>] : Object | B.java:1479:92:1479:107 | readElement(...) | provenance | MaD:1 |
+| B.java:1479:104:1479:106 | out : Set [<element>] : Object | B.java:1479:92:1479:107 | readElement(...) | provenance | MaD:3 |
 | B.java:1484:19:1484:26 | source(...) : Object | B.java:1484:42:1484:43 | in : Object | provenance |  |
 | B.java:1484:35:1484:89 | of(...) : Set [<element>] : Object | B.java:1484:109:1484:111 | out : Set [<element>] : Object | provenance |  |
-| B.java:1484:42:1484:43 | in : Object | B.java:1484:35:1484:89 | of(...) : Set [<element>] : Object | provenance | MaD:309 |
+| B.java:1484:42:1484:43 | in : Object | B.java:1484:35:1484:89 | of(...) : Set [<element>] : Object | provenance | MaD:310 |
 | B.java:1484:109:1484:111 | out : Set [<element>] : Object | B.java:31:28:31:42 | obj : Set [<element>] : Object | provenance |  |
-| B.java:1484:109:1484:111 | out : Set [<element>] : Object | B.java:1484:97:1484:112 | readElement(...) | provenance | MaD:1 |
+| B.java:1484:109:1484:111 | out : Set [<element>] : Object | B.java:1484:97:1484:112 | readElement(...) | provenance | MaD:3 |
 | B.java:1489:19:1489:26 | source(...) : Object | B.java:1489:47:1489:48 | in : Object | provenance |  |
 | B.java:1489:35:1489:89 | of(...) : Set [<element>] : Object | B.java:1489:109:1489:111 | out : Set [<element>] : Object | provenance |  |
-| B.java:1489:47:1489:48 | in : Object | B.java:1489:35:1489:89 | of(...) : Set [<element>] : Object | provenance | MaD:309 |
+| B.java:1489:47:1489:48 | in : Object | B.java:1489:35:1489:89 | of(...) : Set [<element>] : Object | provenance | MaD:310 |
 | B.java:1489:109:1489:111 | out : Set [<element>] : Object | B.java:31:28:31:42 | obj : Set [<element>] : Object | provenance |  |
-| B.java:1489:109:1489:111 | out : Set [<element>] : Object | B.java:1489:97:1489:112 | readElement(...) | provenance | MaD:1 |
+| B.java:1489:109:1489:111 | out : Set [<element>] : Object | B.java:1489:97:1489:112 | readElement(...) | provenance | MaD:3 |
 | B.java:1494:19:1494:26 | source(...) : Object | B.java:1494:52:1494:53 | in : Object | provenance |  |
 | B.java:1494:35:1494:89 | of(...) : Set [<element>] : Object | B.java:1494:109:1494:111 | out : Set [<element>] : Object | provenance |  |
-| B.java:1494:52:1494:53 | in : Object | B.java:1494:35:1494:89 | of(...) : Set [<element>] : Object | provenance | MaD:309 |
+| B.java:1494:52:1494:53 | in : Object | B.java:1494:35:1494:89 | of(...) : Set [<element>] : Object | provenance | MaD:310 |
 | B.java:1494:109:1494:111 | out : Set [<element>] : Object | B.java:31:28:31:42 | obj : Set [<element>] : Object | provenance |  |
-| B.java:1494:109:1494:111 | out : Set [<element>] : Object | B.java:1494:97:1494:112 | readElement(...) | provenance | MaD:1 |
+| B.java:1494:109:1494:111 | out : Set [<element>] : Object | B.java:1494:97:1494:112 | readElement(...) | provenance | MaD:3 |
 | B.java:1499:19:1499:26 | source(...) : Object | B.java:1499:57:1499:58 | in : Object | provenance |  |
 | B.java:1499:35:1499:89 | of(...) : Set [<element>] : Object | B.java:1499:109:1499:111 | out : Set [<element>] : Object | provenance |  |
-| B.java:1499:57:1499:58 | in : Object | B.java:1499:35:1499:89 | of(...) : Set [<element>] : Object | provenance | MaD:309 |
+| B.java:1499:57:1499:58 | in : Object | B.java:1499:35:1499:89 | of(...) : Set [<element>] : Object | provenance | MaD:310 |
 | B.java:1499:109:1499:111 | out : Set [<element>] : Object | B.java:31:28:31:42 | obj : Set [<element>] : Object | provenance |  |
-| B.java:1499:109:1499:111 | out : Set [<element>] : Object | B.java:1499:97:1499:112 | readElement(...) | provenance | MaD:1 |
+| B.java:1499:109:1499:111 | out : Set [<element>] : Object | B.java:1499:97:1499:112 | readElement(...) | provenance | MaD:3 |
 | B.java:1504:19:1504:26 | source(...) : Object | B.java:1504:62:1504:63 | in : Object | provenance |  |
 | B.java:1504:35:1504:89 | of(...) : Set [<element>] : Object | B.java:1504:109:1504:111 | out : Set [<element>] : Object | provenance |  |
-| B.java:1504:62:1504:63 | in : Object | B.java:1504:35:1504:89 | of(...) : Set [<element>] : Object | provenance | MaD:309 |
+| B.java:1504:62:1504:63 | in : Object | B.java:1504:35:1504:89 | of(...) : Set [<element>] : Object | provenance | MaD:310 |
 | B.java:1504:109:1504:111 | out : Set [<element>] : Object | B.java:31:28:31:42 | obj : Set [<element>] : Object | provenance |  |
-| B.java:1504:109:1504:111 | out : Set [<element>] : Object | B.java:1504:97:1504:112 | readElement(...) | provenance | MaD:1 |
+| B.java:1504:109:1504:111 | out : Set [<element>] : Object | B.java:1504:97:1504:112 | readElement(...) | provenance | MaD:3 |
 | B.java:1509:19:1509:26 | source(...) : Object | B.java:1509:67:1509:68 | in : Object | provenance |  |
 | B.java:1509:35:1509:89 | of(...) : Set [<element>] : Object | B.java:1509:109:1509:111 | out : Set [<element>] : Object | provenance |  |
-| B.java:1509:67:1509:68 | in : Object | B.java:1509:35:1509:89 | of(...) : Set [<element>] : Object | provenance | MaD:309 |
+| B.java:1509:67:1509:68 | in : Object | B.java:1509:35:1509:89 | of(...) : Set [<element>] : Object | provenance | MaD:310 |
 | B.java:1509:109:1509:111 | out : Set [<element>] : Object | B.java:31:28:31:42 | obj : Set [<element>] : Object | provenance |  |
-| B.java:1509:109:1509:111 | out : Set [<element>] : Object | B.java:1509:97:1509:112 | readElement(...) | provenance | MaD:1 |
+| B.java:1509:109:1509:111 | out : Set [<element>] : Object | B.java:1509:97:1509:112 | readElement(...) | provenance | MaD:3 |
 | B.java:1514:19:1514:26 | source(...) : Object | B.java:1514:72:1514:73 | in : Object | provenance |  |
 | B.java:1514:35:1514:89 | of(...) : Set [<element>] : Object | B.java:1514:109:1514:111 | out : Set [<element>] : Object | provenance |  |
-| B.java:1514:72:1514:73 | in : Object | B.java:1514:35:1514:89 | of(...) : Set [<element>] : Object | provenance | MaD:309 |
+| B.java:1514:72:1514:73 | in : Object | B.java:1514:35:1514:89 | of(...) : Set [<element>] : Object | provenance | MaD:310 |
 | B.java:1514:109:1514:111 | out : Set [<element>] : Object | B.java:31:28:31:42 | obj : Set [<element>] : Object | provenance |  |
-| B.java:1514:109:1514:111 | out : Set [<element>] : Object | B.java:1514:97:1514:112 | readElement(...) | provenance | MaD:1 |
+| B.java:1514:109:1514:111 | out : Set [<element>] : Object | B.java:1514:97:1514:112 | readElement(...) | provenance | MaD:3 |
 | B.java:1519:19:1519:26 | source(...) : Object | B.java:1519:77:1519:78 | in : Object | provenance |  |
 | B.java:1519:35:1519:89 | of(...) : Set [<element>] : Object | B.java:1519:109:1519:111 | out : Set [<element>] : Object | provenance |  |
-| B.java:1519:77:1519:78 | in : Object | B.java:1519:35:1519:89 | of(...) : Set [<element>] : Object | provenance | MaD:309 |
+| B.java:1519:77:1519:78 | in : Object | B.java:1519:35:1519:89 | of(...) : Set [<element>] : Object | provenance | MaD:310 |
 | B.java:1519:109:1519:111 | out : Set [<element>] : Object | B.java:31:28:31:42 | obj : Set [<element>] : Object | provenance |  |
-| B.java:1519:109:1519:111 | out : Set [<element>] : Object | B.java:1519:97:1519:112 | readElement(...) | provenance | MaD:1 |
+| B.java:1519:109:1519:111 | out : Set [<element>] : Object | B.java:1519:97:1519:112 | readElement(...) | provenance | MaD:3 |
 | B.java:1524:19:1524:26 | source(...) : Object | B.java:1524:82:1524:83 | in : Object | provenance |  |
 | B.java:1524:35:1524:89 | of(...) : Set [<element>] : Object | B.java:1524:109:1524:111 | out : Set [<element>] : Object | provenance |  |
-| B.java:1524:82:1524:83 | in : Object | B.java:1524:35:1524:89 | of(...) : Set [<element>] : Object | provenance | MaD:309 |
+| B.java:1524:82:1524:83 | in : Object | B.java:1524:35:1524:89 | of(...) : Set [<element>] : Object | provenance | MaD:310 |
 | B.java:1524:109:1524:111 | out : Set [<element>] : Object | B.java:31:28:31:42 | obj : Set [<element>] : Object | provenance |  |
-| B.java:1524:109:1524:111 | out : Set [<element>] : Object | B.java:1524:97:1524:112 | readElement(...) | provenance | MaD:1 |
+| B.java:1524:109:1524:111 | out : Set [<element>] : Object | B.java:1524:97:1524:112 | readElement(...) | provenance | MaD:3 |
 | B.java:1529:19:1529:26 | source(...) : Object | B.java:1529:87:1529:88 | in : Object | provenance |  |
 | B.java:1529:35:1529:89 | of(...) : Set [<element>] : Object | B.java:1529:109:1529:111 | out : Set [<element>] : Object | provenance |  |
-| B.java:1529:87:1529:88 | in : Object | B.java:1529:35:1529:89 | of(...) : Set [<element>] : Object | provenance | MaD:309 |
+| B.java:1529:87:1529:88 | in : Object | B.java:1529:35:1529:89 | of(...) : Set [<element>] : Object | provenance | MaD:310 |
 | B.java:1529:109:1529:111 | out : Set [<element>] : Object | B.java:31:28:31:42 | obj : Set [<element>] : Object | provenance |  |
-| B.java:1529:109:1529:111 | out : Set [<element>] : Object | B.java:1529:97:1529:112 | readElement(...) | provenance | MaD:1 |
+| B.java:1529:109:1529:111 | out : Set [<element>] : Object | B.java:1529:97:1529:112 | readElement(...) | provenance | MaD:3 |
 | B.java:1534:21:1534:47 | storeArrayElement(...) : Object[] [[]] : Object | B.java:1534:78:1534:79 | in : Object[] [[]] : Object | provenance |  |
 | B.java:1534:39:1534:46 | source(...) : Object | B.java:11:37:11:46 | obj : Object | provenance |  |
 | B.java:1534:39:1534:46 | source(...) : Object | B.java:1534:21:1534:47 | storeArrayElement(...) : Object[] [[]] : Object | provenance |  |
 | B.java:1534:56:1534:80 | stream(...) : Stream [<element>] : Object | B.java:1534:100:1534:102 | out : Stream [<element>] : Object | provenance |  |
-| B.java:1534:78:1534:79 | in : Object[] [[]] : Object | B.java:1534:56:1534:80 | stream(...) : Stream [<element>] : Object | provenance | MaD:51 |
-| B.java:1534:100:1534:102 | out : Stream [<element>] : Object | B.java:1534:88:1534:103 | readElement(...) | provenance | MaD:343 |
+| B.java:1534:78:1534:79 | in : Object[] [[]] : Object | B.java:1534:56:1534:80 | stream(...) : Stream [<element>] : Object | provenance | MaD:53 |
+| B.java:1534:100:1534:102 | out : Stream [<element>] : Object | B.java:1534:88:1534:103 | readElement(...) | provenance | MaD:2 |
 | B.java:1539:21:1539:47 | storeArrayElement(...) : Object[] [[]] : Object | B.java:1539:83:1539:84 | in : Object[] [[]] : Object | provenance |  |
 | B.java:1539:39:1539:46 | source(...) : Object | B.java:11:37:11:46 | obj : Object | provenance |  |
 | B.java:1539:39:1539:46 | source(...) : Object | B.java:1539:21:1539:47 | storeArrayElement(...) : Object[] [[]] : Object | provenance |  |
 | B.java:1539:56:1539:85 | spliterator(...) : Spliterator [<element>] : Object | B.java:1539:105:1539:107 | out : Spliterator [<element>] : Object | provenance |  |
-| B.java:1539:83:1539:84 | in : Object[] [[]] : Object | B.java:1539:56:1539:85 | spliterator(...) : Spliterator [<element>] : Object | provenance | MaD:50 |
-| B.java:1539:105:1539:107 | out : Spliterator [<element>] : Object | B.java:1539:93:1539:108 | readElement(...) | provenance | MaD:342 |
+| B.java:1539:83:1539:84 | in : Object[] [[]] : Object | B.java:1539:56:1539:85 | spliterator(...) : Spliterator [<element>] : Object | provenance | MaD:52 |
+| B.java:1539:105:1539:107 | out : Spliterator [<element>] : Object | B.java:1539:93:1539:108 | readElement(...) | provenance | MaD:1 |
 | B.java:1544:21:1544:47 | storeArrayElement(...) : Object[] [[]] : Object | B.java:1544:83:1544:84 | in : Object[] [[]] : Object | provenance |  |
 | B.java:1544:39:1544:46 | source(...) : Object | B.java:11:37:11:46 | obj : Object | provenance |  |
 | B.java:1544:39:1544:46 | source(...) : Object | B.java:1544:21:1544:47 | storeArrayElement(...) : Object[] [[]] : Object | provenance |  |
 | B.java:1544:56:1544:89 | copyOfRange(...) : Object[] [[]] : Object | B.java:1544:114:1544:116 | out : Object[] [[]] : Object | provenance |  |
-| B.java:1544:83:1544:84 | in : Object[] [[]] : Object | B.java:1544:56:1544:89 | copyOfRange(...) : Object[] [[]] : Object | provenance | MaD:31 |
+| B.java:1544:83:1544:84 | in : Object[] [[]] : Object | B.java:1544:56:1544:89 | copyOfRange(...) : Object[] [[]] : Object | provenance | MaD:33 |
 | B.java:1544:114:1544:116 | out : Object[] [[]] : Object | B.java:14:34:14:45 | obj : Object[] [[]] : Object | provenance |  |
 | B.java:1544:114:1544:116 | out : Object[] [[]] : Object | B.java:1544:97:1544:117 | readArrayElement(...) | provenance |  |
 | B.java:1549:21:1549:47 | storeArrayElement(...) : Object[] [[]] : Object | B.java:1549:78:1549:79 | in : Object[] [[]] : Object | provenance |  |
 | B.java:1549:39:1549:46 | source(...) : Object | B.java:11:37:11:46 | obj : Object | provenance |  |
 | B.java:1549:39:1549:46 | source(...) : Object | B.java:1549:21:1549:47 | storeArrayElement(...) : Object[] [[]] : Object | provenance |  |
 | B.java:1549:56:1549:82 | copyOf(...) : Object[] [[]] : Object | B.java:1549:107:1549:109 | out : Object[] [[]] : Object | provenance |  |
-| B.java:1549:78:1549:79 | in : Object[] [[]] : Object | B.java:1549:56:1549:82 | copyOf(...) : Object[] [[]] : Object | provenance | MaD:30 |
+| B.java:1549:78:1549:79 | in : Object[] [[]] : Object | B.java:1549:56:1549:82 | copyOf(...) : Object[] [[]] : Object | provenance | MaD:32 |
 | B.java:1549:107:1549:109 | out : Object[] [[]] : Object | B.java:14:34:14:45 | obj : Object[] [[]] : Object | provenance |  |
 | B.java:1549:107:1549:109 | out : Object[] [[]] : Object | B.java:1549:90:1549:110 | readArrayElement(...) | provenance |  |
 | B.java:1554:24:1554:56 | storeElementEnumeration(...) : Enumeration [<element>] : Object | B.java:1554:90:1554:91 | in : Enumeration [<element>] : Object | provenance |  |
 | B.java:1554:48:1554:55 | source(...) : Object | B.java:25:53:25:57 | obj : Object | provenance |  |
-| B.java:1554:48:1554:55 | source(...) : Object | B.java:1554:24:1554:56 | storeElementEnumeration(...) : Enumeration [<element>] : Object | provenance | MaD:52 |
+| B.java:1554:48:1554:55 | source(...) : Object | B.java:1554:24:1554:56 | storeElementEnumeration(...) : Enumeration [<element>] : Object | provenance | MaD:54 |
 | B.java:1554:65:1554:92 | list(...) : ArrayList [<element>] : Object | B.java:1554:112:1554:114 | out : ArrayList [<element>] : Object | provenance |  |
-| B.java:1554:90:1554:91 | in : Enumeration [<element>] : Object | B.java:1554:65:1554:92 | list(...) : ArrayList [<element>] : Object | provenance | MaD:73 |
+| B.java:1554:90:1554:91 | in : Enumeration [<element>] : Object | B.java:1554:65:1554:92 | list(...) : ArrayList [<element>] : Object | provenance | MaD:75 |
 | B.java:1554:112:1554:114 | out : ArrayList [<element>] : Object | B.java:31:28:31:42 | obj : ArrayList [<element>] : Object | provenance |  |
-| B.java:1554:112:1554:114 | out : ArrayList [<element>] : Object | B.java:1554:100:1554:115 | readElement(...) | provenance | MaD:1 |
+| B.java:1554:112:1554:114 | out : ArrayList [<element>] : Object | B.java:1554:100:1554:115 | readElement(...) | provenance | MaD:3 |
 | B.java:1559:23:1559:48 | storeElementList(...) : List [<element>] : Object | B.java:1559:89:1559:90 | in : List [<element>] : Object | provenance |  |
 | B.java:1559:40:1559:47 | source(...) : Object | B.java:24:39:24:43 | obj : Object | provenance |  |
-| B.java:1559:40:1559:47 | source(...) : Object | B.java:1559:23:1559:48 | storeElementList(...) : List [<element>] : Object | provenance | MaD:154 |
+| B.java:1559:40:1559:47 | source(...) : Object | B.java:1559:23:1559:48 | storeElementList(...) : List [<element>] : Object | provenance | MaD:151 |
 | B.java:1559:57:1559:91 | enumeration(...) : Enumeration [<element>] : Object | B.java:1559:111:1559:113 | out : Enumeration [<element>] : Object | provenance |  |
-| B.java:1559:89:1559:90 | in : List [<element>] : Object | B.java:1559:57:1559:91 | enumeration(...) : Enumeration [<element>] : Object | provenance | MaD:71 |
+| B.java:1559:89:1559:90 | in : List [<element>] : Object | B.java:1559:57:1559:91 | enumeration(...) : Enumeration [<element>] : Object | provenance | MaD:73 |
 | B.java:1559:111:1559:113 | out : Enumeration [<element>] : Object | B.java:35:28:35:45 | obj : Enumeration [<element>] : Object | provenance |  |
-| B.java:1559:111:1559:113 | out : Enumeration [<element>] : Object | B.java:1559:99:1559:114 | readElement(...) | provenance | MaD:135 |
+| B.java:1559:111:1559:113 | out : Enumeration [<element>] : Object | B.java:1559:99:1559:114 | readElement(...) | provenance | MaD:137 |
 | B.java:1564:19:1564:26 | source(...) : Object | B.java:1564:65:1564:66 | in : Object | provenance |  |
 | B.java:1564:35:1564:67 | nCopies(...) : List [<element>] : Object | B.java:1564:87:1564:89 | out : List [<element>] : Object | provenance |  |
-| B.java:1564:65:1564:66 | in : Object | B.java:1564:35:1564:67 | nCopies(...) : List [<element>] : Object | provenance | MaD:76 |
+| B.java:1564:65:1564:66 | in : Object | B.java:1564:35:1564:67 | nCopies(...) : List [<element>] : Object | provenance | MaD:78 |
 | B.java:1564:87:1564:89 | out : List [<element>] : Object | B.java:31:28:31:42 | obj : List [<element>] : Object | provenance |  |
-| B.java:1564:87:1564:89 | out : List [<element>] : Object | B.java:1564:75:1564:90 | readElement(...) | provenance | MaD:1 |
+| B.java:1564:87:1564:89 | out : List [<element>] : Object | B.java:1564:75:1564:90 | readElement(...) | provenance | MaD:3 |
 | B.java:1569:19:1569:26 | source(...) : Object | B.java:1569:68:1569:69 | in : Object | provenance |  |
 | B.java:1569:35:1569:75 | singletonMap(...) : Map [<map.key>] : Object | B.java:1569:94:1569:96 | out : Map [<map.key>] : Object | provenance |  |
-| B.java:1569:68:1569:69 | in : Object | B.java:1569:35:1569:75 | singletonMap(...) : Map [<map.key>] : Object | provenance | MaD:80 |
+| B.java:1569:68:1569:69 | in : Object | B.java:1569:35:1569:75 | singletonMap(...) : Map [<map.key>] : Object | provenance | MaD:82 |
 | B.java:1569:94:1569:96 | out : Map [<map.key>] : Object | B.java:44:29:44:40 | obj : Map [<map.key>] : Object | provenance |  |
-| B.java:1569:94:1569:96 | out : Map [<map.key>] : Object | B.java:1569:83:1569:97 | readMapKey(...) | provenance | MaD:184 |
+| B.java:1569:94:1569:96 | out : Map [<map.key>] : Object | B.java:1569:83:1569:97 | readMapKey(...) | provenance | MaD:212 |
 | B.java:1574:19:1574:26 | source(...) : Object | B.java:1574:73:1574:74 | in : Object | provenance |  |
 | B.java:1574:35:1574:75 | singletonMap(...) : Map [<map.value>] : Object | B.java:1574:96:1574:98 | out : Map [<map.value>] : Object | provenance |  |
-| B.java:1574:73:1574:74 | in : Object | B.java:1574:35:1574:75 | singletonMap(...) : Map [<map.value>] : Object | provenance | MaD:81 |
+| B.java:1574:73:1574:74 | in : Object | B.java:1574:35:1574:75 | singletonMap(...) : Map [<map.value>] : Object | provenance | MaD:83 |
 | B.java:1574:96:1574:98 | out : Map [<map.value>] : Object | B.java:48:31:48:42 | obj : Map [<map.value>] : Object | provenance |  |
-| B.java:1574:96:1574:98 | out : Map [<map.value>] : Object | B.java:1574:83:1574:99 | readMapValue(...) | provenance | MaD:181 |
+| B.java:1574:96:1574:98 | out : Map [<map.value>] : Object | B.java:1574:83:1574:99 | readMapValue(...) | provenance | MaD:209 |
 | B.java:1579:19:1579:26 | source(...) : Object | B.java:1579:69:1579:70 | in : Object | provenance |  |
 | B.java:1579:35:1579:71 | singletonList(...) : List [<element>] : Object | B.java:1579:91:1579:93 | out : List [<element>] : Object | provenance |  |
-| B.java:1579:69:1579:70 | in : Object | B.java:1579:35:1579:71 | singletonList(...) : List [<element>] : Object | provenance | MaD:79 |
+| B.java:1579:69:1579:70 | in : Object | B.java:1579:35:1579:71 | singletonList(...) : List [<element>] : Object | provenance | MaD:81 |
 | B.java:1579:91:1579:93 | out : List [<element>] : Object | B.java:31:28:31:42 | obj : List [<element>] : Object | provenance |  |
-| B.java:1579:91:1579:93 | out : List [<element>] : Object | B.java:1579:79:1579:94 | readElement(...) | provenance | MaD:1 |
+| B.java:1579:91:1579:93 | out : List [<element>] : Object | B.java:1579:79:1579:94 | readElement(...) | provenance | MaD:3 |
 | B.java:1584:19:1584:26 | source(...) : Object | B.java:1584:65:1584:66 | in : Object | provenance |  |
 | B.java:1584:35:1584:67 | singleton(...) : Set [<element>] : Object | B.java:1584:87:1584:89 | out : Set [<element>] : Object | provenance |  |
-| B.java:1584:65:1584:66 | in : Object | B.java:1584:35:1584:67 | singleton(...) : Set [<element>] : Object | provenance | MaD:78 |
+| B.java:1584:65:1584:66 | in : Object | B.java:1584:35:1584:67 | singleton(...) : Set [<element>] : Object | provenance | MaD:80 |
 | B.java:1584:87:1584:89 | out : Set [<element>] : Object | B.java:31:28:31:42 | obj : Set [<element>] : Object | provenance |  |
-| B.java:1584:87:1584:89 | out : Set [<element>] : Object | B.java:1584:75:1584:90 | readElement(...) | provenance | MaD:1 |
+| B.java:1584:87:1584:89 | out : Set [<element>] : Object | B.java:1584:75:1584:90 | readElement(...) | provenance | MaD:3 |
 | B.java:1589:19:1589:39 | storeMapKey(...) : TreeMap [<map.key>] : Object | B.java:1589:88:1589:103 | (...)... : TreeMap [<map.key>] : Object | provenance |  |
 | B.java:1589:31:1589:38 | source(...) : Object | B.java:38:37:38:41 | obj : Object | provenance |  |
-| B.java:1589:31:1589:38 | source(...) : Object | B.java:1589:19:1589:39 | storeMapKey(...) : TreeMap [<map.key>] : Object | provenance | MaD:209 |
+| B.java:1589:31:1589:38 | source(...) : Object | B.java:1589:19:1589:39 | storeMapKey(...) : TreeMap [<map.key>] : Object | provenance | MaD:214 |
 | B.java:1589:48:1589:114 | checkedNavigableMap(...) : NavigableMap [<map.key>] : Object | B.java:1589:133:1589:135 | out : NavigableMap [<map.key>] : Object | provenance |  |
-| B.java:1589:88:1589:103 | (...)... : TreeMap [<map.key>] : Object | B.java:1589:48:1589:114 | checkedNavigableMap(...) : NavigableMap [<map.key>] : Object | provenance | MaD:63 |
+| B.java:1589:88:1589:103 | (...)... : TreeMap [<map.key>] : Object | B.java:1589:48:1589:114 | checkedNavigableMap(...) : NavigableMap [<map.key>] : Object | provenance | MaD:65 |
 | B.java:1589:133:1589:135 | out : NavigableMap [<map.key>] : Object | B.java:44:29:44:40 | obj : NavigableMap [<map.key>] : Object | provenance |  |
-| B.java:1589:133:1589:135 | out : NavigableMap [<map.key>] : Object | B.java:1589:122:1589:136 | readMapKey(...) | provenance | MaD:184 |
+| B.java:1589:133:1589:135 | out : NavigableMap [<map.key>] : Object | B.java:1589:122:1589:136 | readMapKey(...) | provenance | MaD:212 |
 | B.java:1594:19:1594:41 | storeMapValue(...) : Map [<map.value>] : Object | B.java:1594:90:1594:105 | (...)... : NavigableMap [<map.value>] : Object | provenance |  |
 | B.java:1594:33:1594:40 | source(...) : Object | B.java:41:39:41:43 | obj : Object | provenance |  |
-| B.java:1594:33:1594:40 | source(...) : Object | B.java:1594:19:1594:41 | storeMapValue(...) : Map [<map.value>] : Object | provenance | MaD:210 |
+| B.java:1594:33:1594:40 | source(...) : Object | B.java:1594:19:1594:41 | storeMapValue(...) : Map [<map.value>] : Object | provenance | MaD:215 |
 | B.java:1594:50:1594:116 | checkedNavigableMap(...) : NavigableMap [<map.value>] : Object | B.java:1594:137:1594:139 | out : NavigableMap [<map.value>] : Object | provenance |  |
-| B.java:1594:90:1594:105 | (...)... : NavigableMap [<map.value>] : Object | B.java:1594:50:1594:116 | checkedNavigableMap(...) : NavigableMap [<map.value>] : Object | provenance | MaD:64 |
+| B.java:1594:90:1594:105 | (...)... : NavigableMap [<map.value>] : Object | B.java:1594:50:1594:116 | checkedNavigableMap(...) : NavigableMap [<map.value>] : Object | provenance | MaD:66 |
 | B.java:1594:137:1594:139 | out : NavigableMap [<map.value>] : Object | B.java:48:31:48:42 | obj : NavigableMap [<map.value>] : Object | provenance |  |
-| B.java:1594:137:1594:139 | out : NavigableMap [<map.value>] : Object | B.java:1594:124:1594:140 | readMapValue(...) | provenance | MaD:181 |
+| B.java:1594:137:1594:139 | out : NavigableMap [<map.value>] : Object | B.java:1594:124:1594:140 | readMapValue(...) | provenance | MaD:209 |
 | B.java:1599:19:1599:39 | storeMapKey(...) : TreeMap [<map.key>] : Object | B.java:1599:85:1599:97 | (...)... : TreeMap [<map.key>] : Object | provenance |  |
 | B.java:1599:31:1599:38 | source(...) : Object | B.java:38:37:38:41 | obj : Object | provenance |  |
-| B.java:1599:31:1599:38 | source(...) : Object | B.java:1599:19:1599:39 | storeMapKey(...) : TreeMap [<map.key>] : Object | provenance | MaD:209 |
+| B.java:1599:31:1599:38 | source(...) : Object | B.java:1599:19:1599:39 | storeMapKey(...) : TreeMap [<map.key>] : Object | provenance | MaD:214 |
 | B.java:1599:48:1599:108 | checkedSortedMap(...) : SortedMap [<map.key>] : Object | B.java:1599:127:1599:129 | out : SortedMap [<map.key>] : Object | provenance |  |
-| B.java:1599:85:1599:97 | (...)... : TreeMap [<map.key>] : Object | B.java:1599:48:1599:108 | checkedSortedMap(...) : SortedMap [<map.key>] : Object | provenance | MaD:67 |
+| B.java:1599:85:1599:97 | (...)... : TreeMap [<map.key>] : Object | B.java:1599:48:1599:108 | checkedSortedMap(...) : SortedMap [<map.key>] : Object | provenance | MaD:69 |
 | B.java:1599:127:1599:129 | out : SortedMap [<map.key>] : Object | B.java:44:29:44:40 | obj : SortedMap [<map.key>] : Object | provenance |  |
-| B.java:1599:127:1599:129 | out : SortedMap [<map.key>] : Object | B.java:1599:116:1599:130 | readMapKey(...) | provenance | MaD:184 |
+| B.java:1599:127:1599:129 | out : SortedMap [<map.key>] : Object | B.java:1599:116:1599:130 | readMapKey(...) | provenance | MaD:212 |
 | B.java:1604:19:1604:41 | storeMapValue(...) : Map [<map.value>] : Object | B.java:1604:87:1604:99 | (...)... : SortedMap [<map.value>] : Object | provenance |  |
 | B.java:1604:33:1604:40 | source(...) : Object | B.java:41:39:41:43 | obj : Object | provenance |  |
-| B.java:1604:33:1604:40 | source(...) : Object | B.java:1604:19:1604:41 | storeMapValue(...) : Map [<map.value>] : Object | provenance | MaD:210 |
+| B.java:1604:33:1604:40 | source(...) : Object | B.java:1604:19:1604:41 | storeMapValue(...) : Map [<map.value>] : Object | provenance | MaD:215 |
 | B.java:1604:50:1604:110 | checkedSortedMap(...) : SortedMap [<map.value>] : Object | B.java:1604:131:1604:133 | out : SortedMap [<map.value>] : Object | provenance |  |
-| B.java:1604:87:1604:99 | (...)... : SortedMap [<map.value>] : Object | B.java:1604:50:1604:110 | checkedSortedMap(...) : SortedMap [<map.value>] : Object | provenance | MaD:68 |
+| B.java:1604:87:1604:99 | (...)... : SortedMap [<map.value>] : Object | B.java:1604:50:1604:110 | checkedSortedMap(...) : SortedMap [<map.value>] : Object | provenance | MaD:70 |
 | B.java:1604:131:1604:133 | out : SortedMap [<map.value>] : Object | B.java:48:31:48:42 | obj : SortedMap [<map.value>] : Object | provenance |  |
-| B.java:1604:131:1604:133 | out : SortedMap [<map.value>] : Object | B.java:1604:118:1604:134 | readMapValue(...) | provenance | MaD:181 |
+| B.java:1604:131:1604:133 | out : SortedMap [<map.value>] : Object | B.java:1604:118:1604:134 | readMapValue(...) | provenance | MaD:209 |
 | B.java:1609:19:1609:39 | storeMapKey(...) : TreeMap [<map.key>] : Object | B.java:1609:79:1609:85 | (...)... : TreeMap [<map.key>] : Object | provenance |  |
 | B.java:1609:31:1609:38 | source(...) : Object | B.java:38:37:38:41 | obj : Object | provenance |  |
-| B.java:1609:31:1609:38 | source(...) : Object | B.java:1609:19:1609:39 | storeMapKey(...) : TreeMap [<map.key>] : Object | provenance | MaD:209 |
+| B.java:1609:31:1609:38 | source(...) : Object | B.java:1609:19:1609:39 | storeMapKey(...) : TreeMap [<map.key>] : Object | provenance | MaD:214 |
 | B.java:1609:48:1609:96 | checkedMap(...) : Map [<map.key>] : Object | B.java:1609:115:1609:117 | out : Map [<map.key>] : Object | provenance |  |
-| B.java:1609:79:1609:85 | (...)... : TreeMap [<map.key>] : Object | B.java:1609:48:1609:96 | checkedMap(...) : Map [<map.key>] : Object | provenance | MaD:61 |
+| B.java:1609:79:1609:85 | (...)... : TreeMap [<map.key>] : Object | B.java:1609:48:1609:96 | checkedMap(...) : Map [<map.key>] : Object | provenance | MaD:63 |
 | B.java:1609:115:1609:117 | out : Map [<map.key>] : Object | B.java:44:29:44:40 | obj : Map [<map.key>] : Object | provenance |  |
-| B.java:1609:115:1609:117 | out : Map [<map.key>] : Object | B.java:1609:104:1609:118 | readMapKey(...) | provenance | MaD:184 |
+| B.java:1609:115:1609:117 | out : Map [<map.key>] : Object | B.java:1609:104:1609:118 | readMapKey(...) | provenance | MaD:212 |
 | B.java:1614:19:1614:41 | storeMapValue(...) : Map [<map.value>] : Object | B.java:1614:81:1614:87 | (...)... : Map [<map.value>] : Object | provenance |  |
 | B.java:1614:33:1614:40 | source(...) : Object | B.java:41:39:41:43 | obj : Object | provenance |  |
-| B.java:1614:33:1614:40 | source(...) : Object | B.java:1614:19:1614:41 | storeMapValue(...) : Map [<map.value>] : Object | provenance | MaD:210 |
+| B.java:1614:33:1614:40 | source(...) : Object | B.java:1614:19:1614:41 | storeMapValue(...) : Map [<map.value>] : Object | provenance | MaD:215 |
 | B.java:1614:50:1614:98 | checkedMap(...) : Map [<map.value>] : Object | B.java:1614:119:1614:121 | out : Map [<map.value>] : Object | provenance |  |
-| B.java:1614:81:1614:87 | (...)... : Map [<map.value>] : Object | B.java:1614:50:1614:98 | checkedMap(...) : Map [<map.value>] : Object | provenance | MaD:62 |
+| B.java:1614:81:1614:87 | (...)... : Map [<map.value>] : Object | B.java:1614:50:1614:98 | checkedMap(...) : Map [<map.value>] : Object | provenance | MaD:64 |
 | B.java:1614:119:1614:121 | out : Map [<map.value>] : Object | B.java:48:31:48:42 | obj : Map [<map.value>] : Object | provenance |  |
-| B.java:1614:119:1614:121 | out : Map [<map.value>] : Object | B.java:1614:106:1614:122 | readMapValue(...) | provenance | MaD:181 |
+| B.java:1614:119:1614:121 | out : Map [<map.value>] : Object | B.java:1614:106:1614:122 | readMapValue(...) | provenance | MaD:209 |
 | B.java:1619:17:1619:42 | storeElementList(...) : List [<element>] : Object | B.java:1619:83:1619:84 | in : List [<element>] : Object | provenance |  |
 | B.java:1619:34:1619:41 | source(...) : Object | B.java:24:39:24:43 | obj : Object | provenance |  |
-| B.java:1619:34:1619:41 | source(...) : Object | B.java:1619:17:1619:42 | storeElementList(...) : List [<element>] : Object | provenance | MaD:154 |
+| B.java:1619:34:1619:41 | source(...) : Object | B.java:1619:17:1619:42 | storeElementList(...) : List [<element>] : Object | provenance | MaD:151 |
 | B.java:1619:51:1619:90 | checkedList(...) : List [<element>] : Object | B.java:1619:110:1619:112 | out : List [<element>] : Object | provenance |  |
-| B.java:1619:83:1619:84 | in : List [<element>] : Object | B.java:1619:51:1619:90 | checkedList(...) : List [<element>] : Object | provenance | MaD:60 |
+| B.java:1619:83:1619:84 | in : List [<element>] : Object | B.java:1619:51:1619:90 | checkedList(...) : List [<element>] : Object | provenance | MaD:62 |
 | B.java:1619:110:1619:112 | out : List [<element>] : Object | B.java:31:28:31:42 | obj : List [<element>] : Object | provenance |  |
-| B.java:1619:110:1619:112 | out : List [<element>] : Object | B.java:1619:98:1619:113 | readElement(...) | provenance | MaD:1 |
+| B.java:1619:110:1619:112 | out : List [<element>] : Object | B.java:1619:98:1619:113 | readElement(...) | provenance | MaD:3 |
 | B.java:1624:25:1624:52 | storeElementNavSet(...) : TreeSet [<element>] : Object | B.java:1624:101:1624:102 | in : TreeSet [<element>] : Object | provenance |  |
 | B.java:1624:44:1624:51 | source(...) : Object | B.java:26:49:26:53 | obj : Object | provenance |  |
-| B.java:1624:44:1624:51 | source(...) : Object | B.java:1624:25:1624:52 | storeElementNavSet(...) : TreeSet [<element>] : Object | provenance | MaD:52 |
+| B.java:1624:44:1624:51 | source(...) : Object | B.java:1624:25:1624:52 | storeElementNavSet(...) : TreeSet [<element>] : Object | provenance | MaD:54 |
 | B.java:1624:61:1624:108 | checkedNavigableSet(...) : NavigableSet [<element>] : Object | B.java:1624:128:1624:130 | out : NavigableSet [<element>] : Object | provenance |  |
-| B.java:1624:101:1624:102 | in : TreeSet [<element>] : Object | B.java:1624:61:1624:108 | checkedNavigableSet(...) : NavigableSet [<element>] : Object | provenance | MaD:65 |
+| B.java:1624:101:1624:102 | in : TreeSet [<element>] : Object | B.java:1624:61:1624:108 | checkedNavigableSet(...) : NavigableSet [<element>] : Object | provenance | MaD:67 |
 | B.java:1624:128:1624:130 | out : NavigableSet [<element>] : Object | B.java:31:28:31:42 | obj : NavigableSet [<element>] : Object | provenance |  |
-| B.java:1624:128:1624:130 | out : NavigableSet [<element>] : Object | B.java:1624:116:1624:131 | readElement(...) | provenance | MaD:1 |
+| B.java:1624:128:1624:130 | out : NavigableSet [<element>] : Object | B.java:1624:116:1624:131 | readElement(...) | provenance | MaD:3 |
 | B.java:1629:22:1629:49 | storeElementNavSet(...) : TreeSet [<element>] : Object | B.java:1629:95:1629:96 | in : TreeSet [<element>] : Object | provenance |  |
 | B.java:1629:41:1629:48 | source(...) : Object | B.java:26:49:26:53 | obj : Object | provenance |  |
-| B.java:1629:41:1629:48 | source(...) : Object | B.java:1629:22:1629:49 | storeElementNavSet(...) : TreeSet [<element>] : Object | provenance | MaD:52 |
+| B.java:1629:41:1629:48 | source(...) : Object | B.java:1629:22:1629:49 | storeElementNavSet(...) : TreeSet [<element>] : Object | provenance | MaD:54 |
 | B.java:1629:58:1629:102 | checkedSortedSet(...) : SortedSet [<element>] : Object | B.java:1629:122:1629:124 | out : SortedSet [<element>] : Object | provenance |  |
-| B.java:1629:95:1629:96 | in : TreeSet [<element>] : Object | B.java:1629:58:1629:102 | checkedSortedSet(...) : SortedSet [<element>] : Object | provenance | MaD:69 |
+| B.java:1629:95:1629:96 | in : TreeSet [<element>] : Object | B.java:1629:58:1629:102 | checkedSortedSet(...) : SortedSet [<element>] : Object | provenance | MaD:71 |
 | B.java:1629:122:1629:124 | out : SortedSet [<element>] : Object | B.java:31:28:31:42 | obj : SortedSet [<element>] : Object | provenance |  |
-| B.java:1629:122:1629:124 | out : SortedSet [<element>] : Object | B.java:1629:110:1629:125 | readElement(...) | provenance | MaD:1 |
+| B.java:1629:122:1629:124 | out : SortedSet [<element>] : Object | B.java:1629:110:1629:125 | readElement(...) | provenance | MaD:3 |
 | B.java:1634:16:1634:43 | storeElementNavSet(...) : TreeSet [<element>] : Object | B.java:1634:83:1634:84 | in : TreeSet [<element>] : Object | provenance |  |
 | B.java:1634:35:1634:42 | source(...) : Object | B.java:26:49:26:53 | obj : Object | provenance |  |
-| B.java:1634:35:1634:42 | source(...) : Object | B.java:1634:16:1634:43 | storeElementNavSet(...) : TreeSet [<element>] : Object | provenance | MaD:52 |
+| B.java:1634:35:1634:42 | source(...) : Object | B.java:1634:16:1634:43 | storeElementNavSet(...) : TreeSet [<element>] : Object | provenance | MaD:54 |
 | B.java:1634:52:1634:90 | checkedSet(...) : Set [<element>] : Object | B.java:1634:110:1634:112 | out : Set [<element>] : Object | provenance |  |
-| B.java:1634:83:1634:84 | in : TreeSet [<element>] : Object | B.java:1634:52:1634:90 | checkedSet(...) : Set [<element>] : Object | provenance | MaD:66 |
+| B.java:1634:83:1634:84 | in : TreeSet [<element>] : Object | B.java:1634:52:1634:90 | checkedSet(...) : Set [<element>] : Object | provenance | MaD:68 |
 | B.java:1634:110:1634:112 | out : Set [<element>] : Object | B.java:31:28:31:42 | obj : Set [<element>] : Object | provenance |  |
-| B.java:1634:110:1634:112 | out : Set [<element>] : Object | B.java:1634:98:1634:113 | readElement(...) | provenance | MaD:1 |
+| B.java:1634:110:1634:112 | out : Set [<element>] : Object | B.java:1634:98:1634:113 | readElement(...) | provenance | MaD:3 |
 | B.java:1639:23:1639:48 | storeElementList(...) : List [<element>] : Object | B.java:1639:95:1639:96 | in : List [<element>] : Object | provenance |  |
 | B.java:1639:40:1639:47 | source(...) : Object | B.java:24:39:24:43 | obj : Object | provenance |  |
-| B.java:1639:40:1639:47 | source(...) : Object | B.java:1639:23:1639:48 | storeElementList(...) : List [<element>] : Object | provenance | MaD:154 |
+| B.java:1639:40:1639:47 | source(...) : Object | B.java:1639:23:1639:48 | storeElementList(...) : List [<element>] : Object | provenance | MaD:151 |
 | B.java:1639:57:1639:102 | checkedCollection(...) : Collection [<element>] : Object | B.java:1639:122:1639:124 | out : Collection [<element>] : Object | provenance |  |
-| B.java:1639:95:1639:96 | in : List [<element>] : Object | B.java:1639:57:1639:102 | checkedCollection(...) : Collection [<element>] : Object | provenance | MaD:59 |
+| B.java:1639:95:1639:96 | in : List [<element>] : Object | B.java:1639:57:1639:102 | checkedCollection(...) : Collection [<element>] : Object | provenance | MaD:61 |
 | B.java:1639:122:1639:124 | out : Collection [<element>] : Object | B.java:31:28:31:42 | obj : Collection [<element>] : Object | provenance |  |
-| B.java:1639:122:1639:124 | out : Collection [<element>] : Object | B.java:1639:110:1639:125 | readElement(...) | provenance | MaD:1 |
+| B.java:1639:122:1639:124 | out : Collection [<element>] : Object | B.java:1639:110:1639:125 | readElement(...) | provenance | MaD:3 |
 | B.java:1644:19:1644:39 | storeMapKey(...) : TreeMap [<map.key>] : Object | B.java:1644:93:1644:108 | (...)... : TreeMap [<map.key>] : Object | provenance |  |
 | B.java:1644:31:1644:38 | source(...) : Object | B.java:38:37:38:41 | obj : Object | provenance |  |
-| B.java:1644:31:1644:38 | source(...) : Object | B.java:1644:19:1644:39 | storeMapKey(...) : TreeMap [<map.key>] : Object | provenance | MaD:209 |
+| B.java:1644:31:1644:38 | source(...) : Object | B.java:1644:19:1644:39 | storeMapKey(...) : TreeMap [<map.key>] : Object | provenance | MaD:214 |
 | B.java:1644:48:1644:109 | synchronizedNavigableMap(...) : NavigableMap [<map.key>] : Object | B.java:1644:128:1644:130 | out : NavigableMap [<map.key>] : Object | provenance |  |
-| B.java:1644:93:1644:108 | (...)... : TreeMap [<map.key>] : Object | B.java:1644:48:1644:109 | synchronizedNavigableMap(...) : NavigableMap [<map.key>] : Object | provenance | MaD:86 |
+| B.java:1644:93:1644:108 | (...)... : TreeMap [<map.key>] : Object | B.java:1644:48:1644:109 | synchronizedNavigableMap(...) : NavigableMap [<map.key>] : Object | provenance | MaD:88 |
 | B.java:1644:128:1644:130 | out : NavigableMap [<map.key>] : Object | B.java:44:29:44:40 | obj : NavigableMap [<map.key>] : Object | provenance |  |
-| B.java:1644:128:1644:130 | out : NavigableMap [<map.key>] : Object | B.java:1644:117:1644:131 | readMapKey(...) | provenance | MaD:184 |
+| B.java:1644:128:1644:130 | out : NavigableMap [<map.key>] : Object | B.java:1644:117:1644:131 | readMapKey(...) | provenance | MaD:212 |
 | B.java:1649:19:1649:41 | storeMapValue(...) : Map [<map.value>] : Object | B.java:1649:95:1649:110 | (...)... : NavigableMap [<map.value>] : Object | provenance |  |
 | B.java:1649:33:1649:40 | source(...) : Object | B.java:41:39:41:43 | obj : Object | provenance |  |
-| B.java:1649:33:1649:40 | source(...) : Object | B.java:1649:19:1649:41 | storeMapValue(...) : Map [<map.value>] : Object | provenance | MaD:210 |
+| B.java:1649:33:1649:40 | source(...) : Object | B.java:1649:19:1649:41 | storeMapValue(...) : Map [<map.value>] : Object | provenance | MaD:215 |
 | B.java:1649:50:1649:111 | synchronizedNavigableMap(...) : NavigableMap [<map.value>] : Object | B.java:1649:132:1649:134 | out : NavigableMap [<map.value>] : Object | provenance |  |
-| B.java:1649:95:1649:110 | (...)... : NavigableMap [<map.value>] : Object | B.java:1649:50:1649:111 | synchronizedNavigableMap(...) : NavigableMap [<map.value>] : Object | provenance | MaD:87 |
+| B.java:1649:95:1649:110 | (...)... : NavigableMap [<map.value>] : Object | B.java:1649:50:1649:111 | synchronizedNavigableMap(...) : NavigableMap [<map.value>] : Object | provenance | MaD:89 |
 | B.java:1649:132:1649:134 | out : NavigableMap [<map.value>] : Object | B.java:48:31:48:42 | obj : NavigableMap [<map.value>] : Object | provenance |  |
-| B.java:1649:132:1649:134 | out : NavigableMap [<map.value>] : Object | B.java:1649:119:1649:135 | readMapValue(...) | provenance | MaD:181 |
+| B.java:1649:132:1649:134 | out : NavigableMap [<map.value>] : Object | B.java:1649:119:1649:135 | readMapValue(...) | provenance | MaD:209 |
 | B.java:1654:19:1654:39 | storeMapKey(...) : TreeMap [<map.key>] : Object | B.java:1654:90:1654:102 | (...)... : TreeMap [<map.key>] : Object | provenance |  |
 | B.java:1654:31:1654:38 | source(...) : Object | B.java:38:37:38:41 | obj : Object | provenance |  |
-| B.java:1654:31:1654:38 | source(...) : Object | B.java:1654:19:1654:39 | storeMapKey(...) : TreeMap [<map.key>] : Object | provenance | MaD:209 |
+| B.java:1654:31:1654:38 | source(...) : Object | B.java:1654:19:1654:39 | storeMapKey(...) : TreeMap [<map.key>] : Object | provenance | MaD:214 |
 | B.java:1654:48:1654:103 | synchronizedSortedMap(...) : SortedMap [<map.key>] : Object | B.java:1654:122:1654:124 | out : SortedMap [<map.key>] : Object | provenance |  |
-| B.java:1654:90:1654:102 | (...)... : TreeMap [<map.key>] : Object | B.java:1654:48:1654:103 | synchronizedSortedMap(...) : SortedMap [<map.key>] : Object | provenance | MaD:90 |
+| B.java:1654:90:1654:102 | (...)... : TreeMap [<map.key>] : Object | B.java:1654:48:1654:103 | synchronizedSortedMap(...) : SortedMap [<map.key>] : Object | provenance | MaD:92 |
 | B.java:1654:122:1654:124 | out : SortedMap [<map.key>] : Object | B.java:44:29:44:40 | obj : SortedMap [<map.key>] : Object | provenance |  |
-| B.java:1654:122:1654:124 | out : SortedMap [<map.key>] : Object | B.java:1654:111:1654:125 | readMapKey(...) | provenance | MaD:184 |
+| B.java:1654:122:1654:124 | out : SortedMap [<map.key>] : Object | B.java:1654:111:1654:125 | readMapKey(...) | provenance | MaD:212 |
 | B.java:1659:19:1659:41 | storeMapValue(...) : Map [<map.value>] : Object | B.java:1659:92:1659:104 | (...)... : SortedMap [<map.value>] : Object | provenance |  |
 | B.java:1659:33:1659:40 | source(...) : Object | B.java:41:39:41:43 | obj : Object | provenance |  |
-| B.java:1659:33:1659:40 | source(...) : Object | B.java:1659:19:1659:41 | storeMapValue(...) : Map [<map.value>] : Object | provenance | MaD:210 |
+| B.java:1659:33:1659:40 | source(...) : Object | B.java:1659:19:1659:41 | storeMapValue(...) : Map [<map.value>] : Object | provenance | MaD:215 |
 | B.java:1659:50:1659:105 | synchronizedSortedMap(...) : SortedMap [<map.value>] : Object | B.java:1659:126:1659:128 | out : SortedMap [<map.value>] : Object | provenance |  |
-| B.java:1659:92:1659:104 | (...)... : SortedMap [<map.value>] : Object | B.java:1659:50:1659:105 | synchronizedSortedMap(...) : SortedMap [<map.value>] : Object | provenance | MaD:91 |
+| B.java:1659:92:1659:104 | (...)... : SortedMap [<map.value>] : Object | B.java:1659:50:1659:105 | synchronizedSortedMap(...) : SortedMap [<map.value>] : Object | provenance | MaD:93 |
 | B.java:1659:126:1659:128 | out : SortedMap [<map.value>] : Object | B.java:48:31:48:42 | obj : SortedMap [<map.value>] : Object | provenance |  |
-| B.java:1659:126:1659:128 | out : SortedMap [<map.value>] : Object | B.java:1659:113:1659:129 | readMapValue(...) | provenance | MaD:181 |
+| B.java:1659:126:1659:128 | out : SortedMap [<map.value>] : Object | B.java:1659:113:1659:129 | readMapValue(...) | provenance | MaD:209 |
 | B.java:1664:19:1664:39 | storeMapKey(...) : TreeMap [<map.key>] : Object | B.java:1664:84:1664:90 | (...)... : TreeMap [<map.key>] : Object | provenance |  |
 | B.java:1664:31:1664:38 | source(...) : Object | B.java:38:37:38:41 | obj : Object | provenance |  |
-| B.java:1664:31:1664:38 | source(...) : Object | B.java:1664:19:1664:39 | storeMapKey(...) : TreeMap [<map.key>] : Object | provenance | MaD:209 |
+| B.java:1664:31:1664:38 | source(...) : Object | B.java:1664:19:1664:39 | storeMapKey(...) : TreeMap [<map.key>] : Object | provenance | MaD:214 |
 | B.java:1664:48:1664:91 | synchronizedMap(...) : Map [<map.key>] : Object | B.java:1664:110:1664:112 | out : Map [<map.key>] : Object | provenance |  |
-| B.java:1664:84:1664:90 | (...)... : TreeMap [<map.key>] : Object | B.java:1664:48:1664:91 | synchronizedMap(...) : Map [<map.key>] : Object | provenance | MaD:84 |
+| B.java:1664:84:1664:90 | (...)... : TreeMap [<map.key>] : Object | B.java:1664:48:1664:91 | synchronizedMap(...) : Map [<map.key>] : Object | provenance | MaD:86 |
 | B.java:1664:110:1664:112 | out : Map [<map.key>] : Object | B.java:44:29:44:40 | obj : Map [<map.key>] : Object | provenance |  |
-| B.java:1664:110:1664:112 | out : Map [<map.key>] : Object | B.java:1664:99:1664:113 | readMapKey(...) | provenance | MaD:184 |
+| B.java:1664:110:1664:112 | out : Map [<map.key>] : Object | B.java:1664:99:1664:113 | readMapKey(...) | provenance | MaD:212 |
 | B.java:1669:19:1669:41 | storeMapValue(...) : Map [<map.value>] : Object | B.java:1669:86:1669:92 | (...)... : Map [<map.value>] : Object | provenance |  |
 | B.java:1669:33:1669:40 | source(...) : Object | B.java:41:39:41:43 | obj : Object | provenance |  |
-| B.java:1669:33:1669:40 | source(...) : Object | B.java:1669:19:1669:41 | storeMapValue(...) : Map [<map.value>] : Object | provenance | MaD:210 |
+| B.java:1669:33:1669:40 | source(...) : Object | B.java:1669:19:1669:41 | storeMapValue(...) : Map [<map.value>] : Object | provenance | MaD:215 |
 | B.java:1669:50:1669:93 | synchronizedMap(...) : Map [<map.value>] : Object | B.java:1669:114:1669:116 | out : Map [<map.value>] : Object | provenance |  |
-| B.java:1669:86:1669:92 | (...)... : Map [<map.value>] : Object | B.java:1669:50:1669:93 | synchronizedMap(...) : Map [<map.value>] : Object | provenance | MaD:85 |
+| B.java:1669:86:1669:92 | (...)... : Map [<map.value>] : Object | B.java:1669:50:1669:93 | synchronizedMap(...) : Map [<map.value>] : Object | provenance | MaD:87 |
 | B.java:1669:114:1669:116 | out : Map [<map.value>] : Object | B.java:48:31:48:42 | obj : Map [<map.value>] : Object | provenance |  |
-| B.java:1669:114:1669:116 | out : Map [<map.value>] : Object | B.java:1669:101:1669:117 | readMapValue(...) | provenance | MaD:181 |
+| B.java:1669:114:1669:116 | out : Map [<map.value>] : Object | B.java:1669:101:1669:117 | readMapValue(...) | provenance | MaD:209 |
 | B.java:1674:17:1674:42 | storeElementList(...) : List [<element>] : Object | B.java:1674:88:1674:89 | in : List [<element>] : Object | provenance |  |
 | B.java:1674:34:1674:41 | source(...) : Object | B.java:24:39:24:43 | obj : Object | provenance |  |
-| B.java:1674:34:1674:41 | source(...) : Object | B.java:1674:17:1674:42 | storeElementList(...) : List [<element>] : Object | provenance | MaD:154 |
+| B.java:1674:34:1674:41 | source(...) : Object | B.java:1674:17:1674:42 | storeElementList(...) : List [<element>] : Object | provenance | MaD:151 |
 | B.java:1674:51:1674:90 | synchronizedList(...) : List [<element>] : Object | B.java:1674:110:1674:112 | out : List [<element>] : Object | provenance |  |
-| B.java:1674:88:1674:89 | in : List [<element>] : Object | B.java:1674:51:1674:90 | synchronizedList(...) : List [<element>] : Object | provenance | MaD:83 |
+| B.java:1674:88:1674:89 | in : List [<element>] : Object | B.java:1674:51:1674:90 | synchronizedList(...) : List [<element>] : Object | provenance | MaD:85 |
 | B.java:1674:110:1674:112 | out : List [<element>] : Object | B.java:31:28:31:42 | obj : List [<element>] : Object | provenance |  |
-| B.java:1674:110:1674:112 | out : List [<element>] : Object | B.java:1674:98:1674:113 | readElement(...) | provenance | MaD:1 |
+| B.java:1674:110:1674:112 | out : List [<element>] : Object | B.java:1674:98:1674:113 | readElement(...) | provenance | MaD:3 |
 | B.java:1679:25:1679:52 | storeElementNavSet(...) : TreeSet [<element>] : Object | B.java:1679:106:1679:107 | in : TreeSet [<element>] : Object | provenance |  |
 | B.java:1679:44:1679:51 | source(...) : Object | B.java:26:49:26:53 | obj : Object | provenance |  |
-| B.java:1679:44:1679:51 | source(...) : Object | B.java:1679:25:1679:52 | storeElementNavSet(...) : TreeSet [<element>] : Object | provenance | MaD:52 |
+| B.java:1679:44:1679:51 | source(...) : Object | B.java:1679:25:1679:52 | storeElementNavSet(...) : TreeSet [<element>] : Object | provenance | MaD:54 |
 | B.java:1679:61:1679:108 | synchronizedNavigableSet(...) : NavigableSet [<element>] : Object | B.java:1679:128:1679:130 | out : NavigableSet [<element>] : Object | provenance |  |
-| B.java:1679:106:1679:107 | in : TreeSet [<element>] : Object | B.java:1679:61:1679:108 | synchronizedNavigableSet(...) : NavigableSet [<element>] : Object | provenance | MaD:88 |
+| B.java:1679:106:1679:107 | in : TreeSet [<element>] : Object | B.java:1679:61:1679:108 | synchronizedNavigableSet(...) : NavigableSet [<element>] : Object | provenance | MaD:90 |
 | B.java:1679:128:1679:130 | out : NavigableSet [<element>] : Object | B.java:31:28:31:42 | obj : NavigableSet [<element>] : Object | provenance |  |
-| B.java:1679:128:1679:130 | out : NavigableSet [<element>] : Object | B.java:1679:116:1679:131 | readElement(...) | provenance | MaD:1 |
+| B.java:1679:128:1679:130 | out : NavigableSet [<element>] : Object | B.java:1679:116:1679:131 | readElement(...) | provenance | MaD:3 |
 | B.java:1684:22:1684:49 | storeElementNavSet(...) : TreeSet [<element>] : Object | B.java:1684:100:1684:101 | in : TreeSet [<element>] : Object | provenance |  |
 | B.java:1684:41:1684:48 | source(...) : Object | B.java:26:49:26:53 | obj : Object | provenance |  |
-| B.java:1684:41:1684:48 | source(...) : Object | B.java:1684:22:1684:49 | storeElementNavSet(...) : TreeSet [<element>] : Object | provenance | MaD:52 |
+| B.java:1684:41:1684:48 | source(...) : Object | B.java:1684:22:1684:49 | storeElementNavSet(...) : TreeSet [<element>] : Object | provenance | MaD:54 |
 | B.java:1684:58:1684:102 | synchronizedSortedSet(...) : SortedSet [<element>] : Object | B.java:1684:122:1684:124 | out : SortedSet [<element>] : Object | provenance |  |
-| B.java:1684:100:1684:101 | in : TreeSet [<element>] : Object | B.java:1684:58:1684:102 | synchronizedSortedSet(...) : SortedSet [<element>] : Object | provenance | MaD:92 |
+| B.java:1684:100:1684:101 | in : TreeSet [<element>] : Object | B.java:1684:58:1684:102 | synchronizedSortedSet(...) : SortedSet [<element>] : Object | provenance | MaD:94 |
 | B.java:1684:122:1684:124 | out : SortedSet [<element>] : Object | B.java:31:28:31:42 | obj : SortedSet [<element>] : Object | provenance |  |
-| B.java:1684:122:1684:124 | out : SortedSet [<element>] : Object | B.java:1684:110:1684:125 | readElement(...) | provenance | MaD:1 |
+| B.java:1684:122:1684:124 | out : SortedSet [<element>] : Object | B.java:1684:110:1684:125 | readElement(...) | provenance | MaD:3 |
 | B.java:1689:16:1689:43 | storeElementNavSet(...) : TreeSet [<element>] : Object | B.java:1689:88:1689:89 | in : TreeSet [<element>] : Object | provenance |  |
 | B.java:1689:35:1689:42 | source(...) : Object | B.java:26:49:26:53 | obj : Object | provenance |  |
-| B.java:1689:35:1689:42 | source(...) : Object | B.java:1689:16:1689:43 | storeElementNavSet(...) : TreeSet [<element>] : Object | provenance | MaD:52 |
+| B.java:1689:35:1689:42 | source(...) : Object | B.java:1689:16:1689:43 | storeElementNavSet(...) : TreeSet [<element>] : Object | provenance | MaD:54 |
 | B.java:1689:52:1689:90 | synchronizedSet(...) : Set [<element>] : Object | B.java:1689:110:1689:112 | out : Set [<element>] : Object | provenance |  |
-| B.java:1689:88:1689:89 | in : TreeSet [<element>] : Object | B.java:1689:52:1689:90 | synchronizedSet(...) : Set [<element>] : Object | provenance | MaD:89 |
+| B.java:1689:88:1689:89 | in : TreeSet [<element>] : Object | B.java:1689:52:1689:90 | synchronizedSet(...) : Set [<element>] : Object | provenance | MaD:91 |
 | B.java:1689:110:1689:112 | out : Set [<element>] : Object | B.java:31:28:31:42 | obj : Set [<element>] : Object | provenance |  |
-| B.java:1689:110:1689:112 | out : Set [<element>] : Object | B.java:1689:98:1689:113 | readElement(...) | provenance | MaD:1 |
+| B.java:1689:110:1689:112 | out : Set [<element>] : Object | B.java:1689:98:1689:113 | readElement(...) | provenance | MaD:3 |
 | B.java:1694:23:1694:48 | storeElementList(...) : List [<element>] : Object | B.java:1694:100:1694:101 | in : List [<element>] : Object | provenance |  |
 | B.java:1694:40:1694:47 | source(...) : Object | B.java:24:39:24:43 | obj : Object | provenance |  |
-| B.java:1694:40:1694:47 | source(...) : Object | B.java:1694:23:1694:48 | storeElementList(...) : List [<element>] : Object | provenance | MaD:154 |
+| B.java:1694:40:1694:47 | source(...) : Object | B.java:1694:23:1694:48 | storeElementList(...) : List [<element>] : Object | provenance | MaD:151 |
 | B.java:1694:57:1694:102 | synchronizedCollection(...) : Collection [<element>] : Object | B.java:1694:122:1694:124 | out : Collection [<element>] : Object | provenance |  |
-| B.java:1694:100:1694:101 | in : List [<element>] : Object | B.java:1694:57:1694:102 | synchronizedCollection(...) : Collection [<element>] : Object | provenance | MaD:82 |
+| B.java:1694:100:1694:101 | in : List [<element>] : Object | B.java:1694:57:1694:102 | synchronizedCollection(...) : Collection [<element>] : Object | provenance | MaD:84 |
 | B.java:1694:122:1694:124 | out : Collection [<element>] : Object | B.java:31:28:31:42 | obj : Collection [<element>] : Object | provenance |  |
-| B.java:1694:122:1694:124 | out : Collection [<element>] : Object | B.java:1694:110:1694:125 | readElement(...) | provenance | MaD:1 |
+| B.java:1694:122:1694:124 | out : Collection [<element>] : Object | B.java:1694:110:1694:125 | readElement(...) | provenance | MaD:3 |
 | B.java:1699:19:1699:39 | storeMapKey(...) : TreeMap [<map.key>] : Object | B.java:1699:93:1699:108 | (...)... : TreeMap [<map.key>] : Object | provenance |  |
 | B.java:1699:31:1699:38 | source(...) : Object | B.java:38:37:38:41 | obj : Object | provenance |  |
-| B.java:1699:31:1699:38 | source(...) : Object | B.java:1699:19:1699:39 | storeMapKey(...) : TreeMap [<map.key>] : Object | provenance | MaD:209 |
+| B.java:1699:31:1699:38 | source(...) : Object | B.java:1699:19:1699:39 | storeMapKey(...) : TreeMap [<map.key>] : Object | provenance | MaD:214 |
 | B.java:1699:48:1699:109 | unmodifiableNavigableMap(...) : NavigableMap [<map.key>] : Object | B.java:1699:128:1699:130 | out : NavigableMap [<map.key>] : Object | provenance |  |
-| B.java:1699:93:1699:108 | (...)... : TreeMap [<map.key>] : Object | B.java:1699:48:1699:109 | unmodifiableNavigableMap(...) : NavigableMap [<map.key>] : Object | provenance | MaD:97 |
+| B.java:1699:93:1699:108 | (...)... : TreeMap [<map.key>] : Object | B.java:1699:48:1699:109 | unmodifiableNavigableMap(...) : NavigableMap [<map.key>] : Object | provenance | MaD:99 |
 | B.java:1699:128:1699:130 | out : NavigableMap [<map.key>] : Object | B.java:44:29:44:40 | obj : NavigableMap [<map.key>] : Object | provenance |  |
-| B.java:1699:128:1699:130 | out : NavigableMap [<map.key>] : Object | B.java:1699:117:1699:131 | readMapKey(...) | provenance | MaD:184 |
+| B.java:1699:128:1699:130 | out : NavigableMap [<map.key>] : Object | B.java:1699:117:1699:131 | readMapKey(...) | provenance | MaD:212 |
 | B.java:1704:19:1704:41 | storeMapValue(...) : Map [<map.value>] : Object | B.java:1704:95:1704:110 | (...)... : NavigableMap [<map.value>] : Object | provenance |  |
 | B.java:1704:33:1704:40 | source(...) : Object | B.java:41:39:41:43 | obj : Object | provenance |  |
-| B.java:1704:33:1704:40 | source(...) : Object | B.java:1704:19:1704:41 | storeMapValue(...) : Map [<map.value>] : Object | provenance | MaD:210 |
+| B.java:1704:33:1704:40 | source(...) : Object | B.java:1704:19:1704:41 | storeMapValue(...) : Map [<map.value>] : Object | provenance | MaD:215 |
 | B.java:1704:50:1704:111 | unmodifiableNavigableMap(...) : NavigableMap [<map.value>] : Object | B.java:1704:132:1704:134 | out : NavigableMap [<map.value>] : Object | provenance |  |
-| B.java:1704:95:1704:110 | (...)... : NavigableMap [<map.value>] : Object | B.java:1704:50:1704:111 | unmodifiableNavigableMap(...) : NavigableMap [<map.value>] : Object | provenance | MaD:98 |
+| B.java:1704:95:1704:110 | (...)... : NavigableMap [<map.value>] : Object | B.java:1704:50:1704:111 | unmodifiableNavigableMap(...) : NavigableMap [<map.value>] : Object | provenance | MaD:100 |
 | B.java:1704:132:1704:134 | out : NavigableMap [<map.value>] : Object | B.java:48:31:48:42 | obj : NavigableMap [<map.value>] : Object | provenance |  |
-| B.java:1704:132:1704:134 | out : NavigableMap [<map.value>] : Object | B.java:1704:119:1704:135 | readMapValue(...) | provenance | MaD:181 |
+| B.java:1704:132:1704:134 | out : NavigableMap [<map.value>] : Object | B.java:1704:119:1704:135 | readMapValue(...) | provenance | MaD:209 |
 | B.java:1709:19:1709:39 | storeMapKey(...) : TreeMap [<map.key>] : Object | B.java:1709:90:1709:102 | (...)... : TreeMap [<map.key>] : Object | provenance |  |
 | B.java:1709:31:1709:38 | source(...) : Object | B.java:38:37:38:41 | obj : Object | provenance |  |
-| B.java:1709:31:1709:38 | source(...) : Object | B.java:1709:19:1709:39 | storeMapKey(...) : TreeMap [<map.key>] : Object | provenance | MaD:209 |
+| B.java:1709:31:1709:38 | source(...) : Object | B.java:1709:19:1709:39 | storeMapKey(...) : TreeMap [<map.key>] : Object | provenance | MaD:214 |
 | B.java:1709:48:1709:103 | unmodifiableSortedMap(...) : SortedMap [<map.key>] : Object | B.java:1709:122:1709:124 | out : SortedMap [<map.key>] : Object | provenance |  |
-| B.java:1709:90:1709:102 | (...)... : TreeMap [<map.key>] : Object | B.java:1709:48:1709:103 | unmodifiableSortedMap(...) : SortedMap [<map.key>] : Object | provenance | MaD:105 |
+| B.java:1709:90:1709:102 | (...)... : TreeMap [<map.key>] : Object | B.java:1709:48:1709:103 | unmodifiableSortedMap(...) : SortedMap [<map.key>] : Object | provenance | MaD:107 |
 | B.java:1709:122:1709:124 | out : SortedMap [<map.key>] : Object | B.java:44:29:44:40 | obj : SortedMap [<map.key>] : Object | provenance |  |
-| B.java:1709:122:1709:124 | out : SortedMap [<map.key>] : Object | B.java:1709:111:1709:125 | readMapKey(...) | provenance | MaD:184 |
+| B.java:1709:122:1709:124 | out : SortedMap [<map.key>] : Object | B.java:1709:111:1709:125 | readMapKey(...) | provenance | MaD:212 |
 | B.java:1714:19:1714:41 | storeMapValue(...) : Map [<map.value>] : Object | B.java:1714:92:1714:104 | (...)... : SortedMap [<map.value>] : Object | provenance |  |
 | B.java:1714:33:1714:40 | source(...) : Object | B.java:41:39:41:43 | obj : Object | provenance |  |
-| B.java:1714:33:1714:40 | source(...) : Object | B.java:1714:19:1714:41 | storeMapValue(...) : Map [<map.value>] : Object | provenance | MaD:210 |
+| B.java:1714:33:1714:40 | source(...) : Object | B.java:1714:19:1714:41 | storeMapValue(...) : Map [<map.value>] : Object | provenance | MaD:215 |
 | B.java:1714:50:1714:105 | unmodifiableSortedMap(...) : SortedMap [<map.value>] : Object | B.java:1714:126:1714:128 | out : SortedMap [<map.value>] : Object | provenance |  |
-| B.java:1714:92:1714:104 | (...)... : SortedMap [<map.value>] : Object | B.java:1714:50:1714:105 | unmodifiableSortedMap(...) : SortedMap [<map.value>] : Object | provenance | MaD:106 |
+| B.java:1714:92:1714:104 | (...)... : SortedMap [<map.value>] : Object | B.java:1714:50:1714:105 | unmodifiableSortedMap(...) : SortedMap [<map.value>] : Object | provenance | MaD:108 |
 | B.java:1714:126:1714:128 | out : SortedMap [<map.value>] : Object | B.java:48:31:48:42 | obj : SortedMap [<map.value>] : Object | provenance |  |
-| B.java:1714:126:1714:128 | out : SortedMap [<map.value>] : Object | B.java:1714:113:1714:129 | readMapValue(...) | provenance | MaD:181 |
+| B.java:1714:126:1714:128 | out : SortedMap [<map.value>] : Object | B.java:1714:113:1714:129 | readMapValue(...) | provenance | MaD:209 |
 | B.java:1719:19:1719:39 | storeMapKey(...) : TreeMap [<map.key>] : Object | B.java:1719:84:1719:90 | (...)... : TreeMap [<map.key>] : Object | provenance |  |
 | B.java:1719:31:1719:38 | source(...) : Object | B.java:38:37:38:41 | obj : Object | provenance |  |
-| B.java:1719:31:1719:38 | source(...) : Object | B.java:1719:19:1719:39 | storeMapKey(...) : TreeMap [<map.key>] : Object | provenance | MaD:209 |
+| B.java:1719:31:1719:38 | source(...) : Object | B.java:1719:19:1719:39 | storeMapKey(...) : TreeMap [<map.key>] : Object | provenance | MaD:214 |
 | B.java:1719:48:1719:91 | unmodifiableMap(...) : Map [<map.key>] : Object | B.java:1719:110:1719:112 | out : Map [<map.key>] : Object | provenance |  |
-| B.java:1719:84:1719:90 | (...)... : TreeMap [<map.key>] : Object | B.java:1719:48:1719:91 | unmodifiableMap(...) : Map [<map.key>] : Object | provenance | MaD:95 |
+| B.java:1719:84:1719:90 | (...)... : TreeMap [<map.key>] : Object | B.java:1719:48:1719:91 | unmodifiableMap(...) : Map [<map.key>] : Object | provenance | MaD:97 |
 | B.java:1719:110:1719:112 | out : Map [<map.key>] : Object | B.java:44:29:44:40 | obj : Map [<map.key>] : Object | provenance |  |
-| B.java:1719:110:1719:112 | out : Map [<map.key>] : Object | B.java:1719:99:1719:113 | readMapKey(...) | provenance | MaD:184 |
+| B.java:1719:110:1719:112 | out : Map [<map.key>] : Object | B.java:1719:99:1719:113 | readMapKey(...) | provenance | MaD:212 |
 | B.java:1724:19:1724:41 | storeMapValue(...) : Map [<map.value>] : Object | B.java:1724:86:1724:92 | (...)... : Map [<map.value>] : Object | provenance |  |
 | B.java:1724:33:1724:40 | source(...) : Object | B.java:41:39:41:43 | obj : Object | provenance |  |
-| B.java:1724:33:1724:40 | source(...) : Object | B.java:1724:19:1724:41 | storeMapValue(...) : Map [<map.value>] : Object | provenance | MaD:210 |
+| B.java:1724:33:1724:40 | source(...) : Object | B.java:1724:19:1724:41 | storeMapValue(...) : Map [<map.value>] : Object | provenance | MaD:215 |
 | B.java:1724:50:1724:93 | unmodifiableMap(...) : Map [<map.value>] : Object | B.java:1724:114:1724:116 | out : Map [<map.value>] : Object | provenance |  |
-| B.java:1724:86:1724:92 | (...)... : Map [<map.value>] : Object | B.java:1724:50:1724:93 | unmodifiableMap(...) : Map [<map.value>] : Object | provenance | MaD:96 |
+| B.java:1724:86:1724:92 | (...)... : Map [<map.value>] : Object | B.java:1724:50:1724:93 | unmodifiableMap(...) : Map [<map.value>] : Object | provenance | MaD:98 |
 | B.java:1724:114:1724:116 | out : Map [<map.value>] : Object | B.java:48:31:48:42 | obj : Map [<map.value>] : Object | provenance |  |
-| B.java:1724:114:1724:116 | out : Map [<map.value>] : Object | B.java:1724:101:1724:117 | readMapValue(...) | provenance | MaD:181 |
+| B.java:1724:114:1724:116 | out : Map [<map.value>] : Object | B.java:1724:101:1724:117 | readMapValue(...) | provenance | MaD:209 |
 | B.java:1729:17:1729:42 | storeElementList(...) : List [<element>] : Object | B.java:1729:88:1729:89 | in : List [<element>] : Object | provenance |  |
 | B.java:1729:34:1729:41 | source(...) : Object | B.java:24:39:24:43 | obj : Object | provenance |  |
-| B.java:1729:34:1729:41 | source(...) : Object | B.java:1729:17:1729:42 | storeElementList(...) : List [<element>] : Object | provenance | MaD:154 |
+| B.java:1729:34:1729:41 | source(...) : Object | B.java:1729:17:1729:42 | storeElementList(...) : List [<element>] : Object | provenance | MaD:151 |
 | B.java:1729:51:1729:90 | unmodifiableList(...) : List [<element>] : Object | B.java:1729:110:1729:112 | out : List [<element>] : Object | provenance |  |
-| B.java:1729:88:1729:89 | in : List [<element>] : Object | B.java:1729:51:1729:90 | unmodifiableList(...) : List [<element>] : Object | provenance | MaD:94 |
+| B.java:1729:88:1729:89 | in : List [<element>] : Object | B.java:1729:51:1729:90 | unmodifiableList(...) : List [<element>] : Object | provenance | MaD:96 |
 | B.java:1729:110:1729:112 | out : List [<element>] : Object | B.java:31:28:31:42 | obj : List [<element>] : Object | provenance |  |
-| B.java:1729:110:1729:112 | out : List [<element>] : Object | B.java:1729:98:1729:113 | readElement(...) | provenance | MaD:1 |
+| B.java:1729:110:1729:112 | out : List [<element>] : Object | B.java:1729:98:1729:113 | readElement(...) | provenance | MaD:3 |
 | B.java:1734:25:1734:52 | storeElementNavSet(...) : TreeSet [<element>] : Object | B.java:1734:106:1734:107 | in : TreeSet [<element>] : Object | provenance |  |
 | B.java:1734:44:1734:51 | source(...) : Object | B.java:26:49:26:53 | obj : Object | provenance |  |
-| B.java:1734:44:1734:51 | source(...) : Object | B.java:1734:25:1734:52 | storeElementNavSet(...) : TreeSet [<element>] : Object | provenance | MaD:52 |
+| B.java:1734:44:1734:51 | source(...) : Object | B.java:1734:25:1734:52 | storeElementNavSet(...) : TreeSet [<element>] : Object | provenance | MaD:54 |
 | B.java:1734:61:1734:108 | unmodifiableNavigableSet(...) : NavigableSet [<element>] : Object | B.java:1734:128:1734:130 | out : NavigableSet [<element>] : Object | provenance |  |
-| B.java:1734:106:1734:107 | in : TreeSet [<element>] : Object | B.java:1734:61:1734:108 | unmodifiableNavigableSet(...) : NavigableSet [<element>] : Object | provenance | MaD:99 |
+| B.java:1734:106:1734:107 | in : TreeSet [<element>] : Object | B.java:1734:61:1734:108 | unmodifiableNavigableSet(...) : NavigableSet [<element>] : Object | provenance | MaD:101 |
 | B.java:1734:128:1734:130 | out : NavigableSet [<element>] : Object | B.java:31:28:31:42 | obj : NavigableSet [<element>] : Object | provenance |  |
-| B.java:1734:128:1734:130 | out : NavigableSet [<element>] : Object | B.java:1734:116:1734:131 | readElement(...) | provenance | MaD:1 |
+| B.java:1734:128:1734:130 | out : NavigableSet [<element>] : Object | B.java:1734:116:1734:131 | readElement(...) | provenance | MaD:3 |
 | B.java:1739:22:1739:49 | storeElementNavSet(...) : TreeSet [<element>] : Object | B.java:1739:100:1739:101 | in : TreeSet [<element>] : Object | provenance |  |
 | B.java:1739:41:1739:48 | source(...) : Object | B.java:26:49:26:53 | obj : Object | provenance |  |
-| B.java:1739:41:1739:48 | source(...) : Object | B.java:1739:22:1739:49 | storeElementNavSet(...) : TreeSet [<element>] : Object | provenance | MaD:52 |
+| B.java:1739:41:1739:48 | source(...) : Object | B.java:1739:22:1739:49 | storeElementNavSet(...) : TreeSet [<element>] : Object | provenance | MaD:54 |
 | B.java:1739:58:1739:102 | unmodifiableSortedSet(...) : SortedSet [<element>] : Object | B.java:1739:122:1739:124 | out : SortedSet [<element>] : Object | provenance |  |
-| B.java:1739:100:1739:101 | in : TreeSet [<element>] : Object | B.java:1739:58:1739:102 | unmodifiableSortedSet(...) : SortedSet [<element>] : Object | provenance | MaD:107 |
+| B.java:1739:100:1739:101 | in : TreeSet [<element>] : Object | B.java:1739:58:1739:102 | unmodifiableSortedSet(...) : SortedSet [<element>] : Object | provenance | MaD:109 |
 | B.java:1739:122:1739:124 | out : SortedSet [<element>] : Object | B.java:31:28:31:42 | obj : SortedSet [<element>] : Object | provenance |  |
-| B.java:1739:122:1739:124 | out : SortedSet [<element>] : Object | B.java:1739:110:1739:125 | readElement(...) | provenance | MaD:1 |
+| B.java:1739:122:1739:124 | out : SortedSet [<element>] : Object | B.java:1739:110:1739:125 | readElement(...) | provenance | MaD:3 |
 | B.java:1744:16:1744:43 | storeElementNavSet(...) : TreeSet [<element>] : Object | B.java:1744:88:1744:89 | in : TreeSet [<element>] : Object | provenance |  |
 | B.java:1744:35:1744:42 | source(...) : Object | B.java:26:49:26:53 | obj : Object | provenance |  |
-| B.java:1744:35:1744:42 | source(...) : Object | B.java:1744:16:1744:43 | storeElementNavSet(...) : TreeSet [<element>] : Object | provenance | MaD:52 |
+| B.java:1744:35:1744:42 | source(...) : Object | B.java:1744:16:1744:43 | storeElementNavSet(...) : TreeSet [<element>] : Object | provenance | MaD:54 |
 | B.java:1744:52:1744:90 | unmodifiableSet(...) : Set [<element>] : Object | B.java:1744:110:1744:112 | out : Set [<element>] : Object | provenance |  |
-| B.java:1744:88:1744:89 | in : TreeSet [<element>] : Object | B.java:1744:52:1744:90 | unmodifiableSet(...) : Set [<element>] : Object | provenance | MaD:104 |
+| B.java:1744:88:1744:89 | in : TreeSet [<element>] : Object | B.java:1744:52:1744:90 | unmodifiableSet(...) : Set [<element>] : Object | provenance | MaD:106 |
 | B.java:1744:110:1744:112 | out : Set [<element>] : Object | B.java:31:28:31:42 | obj : Set [<element>] : Object | provenance |  |
-| B.java:1744:110:1744:112 | out : Set [<element>] : Object | B.java:1744:98:1744:113 | readElement(...) | provenance | MaD:1 |
+| B.java:1744:110:1744:112 | out : Set [<element>] : Object | B.java:1744:98:1744:113 | readElement(...) | provenance | MaD:3 |
 | B.java:1749:23:1749:48 | storeElementList(...) : List [<element>] : Object | B.java:1749:100:1749:101 | in : List [<element>] : Object | provenance |  |
 | B.java:1749:40:1749:47 | source(...) : Object | B.java:24:39:24:43 | obj : Object | provenance |  |
-| B.java:1749:40:1749:47 | source(...) : Object | B.java:1749:23:1749:48 | storeElementList(...) : List [<element>] : Object | provenance | MaD:154 |
+| B.java:1749:40:1749:47 | source(...) : Object | B.java:1749:23:1749:48 | storeElementList(...) : List [<element>] : Object | provenance | MaD:151 |
 | B.java:1749:57:1749:102 | unmodifiableCollection(...) : Collection [<element>] : Object | B.java:1749:122:1749:124 | out : Collection [<element>] : Object | provenance |  |
-| B.java:1749:100:1749:101 | in : List [<element>] : Object | B.java:1749:57:1749:102 | unmodifiableCollection(...) : Collection [<element>] : Object | provenance | MaD:93 |
+| B.java:1749:100:1749:101 | in : List [<element>] : Object | B.java:1749:57:1749:102 | unmodifiableCollection(...) : Collection [<element>] : Object | provenance | MaD:95 |
 | B.java:1749:122:1749:124 | out : Collection [<element>] : Object | B.java:31:28:31:42 | obj : Collection [<element>] : Object | provenance |  |
-| B.java:1749:122:1749:124 | out : Collection [<element>] : Object | B.java:1749:110:1749:125 | readElement(...) | provenance | MaD:1 |
+| B.java:1749:122:1749:124 | out : Collection [<element>] : Object | B.java:1749:110:1749:125 | readElement(...) | provenance | MaD:3 |
 | B.java:1754:23:1754:48 | storeElementList(...) : List [<element>] : Object | B.java:1754:81:1754:82 | in : List [<element>] : Object | provenance |  |
 | B.java:1754:40:1754:47 | source(...) : Object | B.java:24:39:24:43 | obj : Object | provenance |  |
-| B.java:1754:40:1754:47 | source(...) : Object | B.java:1754:23:1754:48 | storeElementList(...) : List [<element>] : Object | provenance | MaD:154 |
+| B.java:1754:40:1754:47 | source(...) : Object | B.java:1754:23:1754:48 | storeElementList(...) : List [<element>] : Object | provenance | MaD:151 |
 | B.java:1754:57:1754:83 | max(...) : Comparable | B.java:1754:91:1754:93 | out | provenance |  |
-| B.java:1754:81:1754:82 | in : List [<element>] : Object | B.java:1754:57:1754:83 | max(...) : Comparable | provenance | MaD:74 |
+| B.java:1754:81:1754:82 | in : List [<element>] : Object | B.java:1754:57:1754:83 | max(...) : Comparable | provenance | MaD:76 |
 | B.java:1759:23:1759:48 | storeElementList(...) : List [<element>] : Object | B.java:1759:81:1759:82 | in : List [<element>] : Object | provenance |  |
 | B.java:1759:40:1759:47 | source(...) : Object | B.java:24:39:24:43 | obj : Object | provenance |  |
-| B.java:1759:40:1759:47 | source(...) : Object | B.java:1759:23:1759:48 | storeElementList(...) : List [<element>] : Object | provenance | MaD:154 |
+| B.java:1759:40:1759:47 | source(...) : Object | B.java:1759:23:1759:48 | storeElementList(...) : List [<element>] : Object | provenance | MaD:151 |
 | B.java:1759:57:1759:83 | min(...) : Comparable | B.java:1759:91:1759:93 | out | provenance |  |
-| B.java:1759:81:1759:82 | in : List [<element>] : Object | B.java:1759:57:1759:83 | min(...) : Comparable | provenance | MaD:75 |
+| B.java:1759:81:1759:82 | in : List [<element>] : Object | B.java:1759:57:1759:83 | min(...) : Comparable | provenance | MaD:77 |
 | B.java:1764:19:1764:26 | source(...) : Object | B.java:1764:57:1764:58 | in : Object | provenance |  |
 | B.java:1764:49:1764:51 | out [post update] : Object[] [[]] : Object | B.java:1764:84:1764:86 | out : Object[] [[]] : Object | provenance |  |
-| B.java:1764:57:1764:58 | in : Object | B.java:1764:49:1764:51 | out [post update] : Object[] [[]] : Object | provenance | MaD:33 |
+| B.java:1764:57:1764:58 | in : Object | B.java:1764:49:1764:51 | out [post update] : Object[] [[]] : Object | provenance | MaD:35 |
 | B.java:1764:84:1764:86 | out : Object[] [[]] : Object | B.java:14:34:14:45 | obj : Object[] [[]] : Object | provenance |  |
 | B.java:1764:84:1764:86 | out : Object[] [[]] : Object | B.java:1764:67:1764:87 | readArrayElement(...) | provenance |  |
 | B.java:1769:19:1769:26 | source(...) : Object | B.java:1769:53:1769:54 | in : Object | provenance |  |
 | B.java:1769:49:1769:51 | out [post update] : Object[] [[]] : Object | B.java:1769:80:1769:82 | out : Object[] [[]] : Object | provenance |  |
-| B.java:1769:53:1769:54 | in : Object | B.java:1769:49:1769:51 | out [post update] : Object[] [[]] : Object | provenance | MaD:32 |
+| B.java:1769:53:1769:54 | in : Object | B.java:1769:49:1769:51 | out [post update] : Object[] [[]] : Object | provenance | MaD:34 |
 | B.java:1769:80:1769:82 | out : Object[] [[]] : Object | B.java:14:34:14:45 | obj : Object[] [[]] : Object | provenance |  |
 | B.java:1769:80:1769:82 | out : Object[] [[]] : Object | B.java:1769:63:1769:83 | readArrayElement(...) | provenance |  |
 | B.java:1774:18:1774:32 | (...)... : Number | B.java:1774:63:1774:64 | in : Number | provenance |  |
 | B.java:1774:25:1774:32 | source(...) : Object | B.java:1774:18:1774:32 | (...)... : Number | provenance |  |
 | B.java:1774:55:1774:57 | out [post update] : float[] [[]] : Number | B.java:1774:90:1774:92 | out : float[] [[]] : Number | provenance |  |
-| B.java:1774:63:1774:64 | in : Number | B.java:1774:55:1774:57 | out [post update] : float[] [[]] : Number | provenance | MaD:43 |
+| B.java:1774:63:1774:64 | in : Number | B.java:1774:55:1774:57 | out [post update] : float[] [[]] : Number | provenance | MaD:45 |
 | B.java:1774:90:1774:92 | out : float[] [[]] : Number | B.java:21:33:21:43 | obj : float[] [[]] : Number | provenance |  |
 | B.java:1774:90:1774:92 | out : float[] [[]] : Number | B.java:1774:73:1774:93 | readArrayElement(...) | provenance |  |
 | B.java:1779:18:1779:32 | (...)... : Number | B.java:1779:59:1779:60 | in : Number | provenance |  |
 | B.java:1779:25:1779:32 | source(...) : Object | B.java:1779:18:1779:32 | (...)... : Number | provenance |  |
 | B.java:1779:55:1779:57 | out [post update] : float[] [[]] : Number | B.java:1779:86:1779:88 | out : float[] [[]] : Number | provenance |  |
-| B.java:1779:59:1779:60 | in : Number | B.java:1779:55:1779:57 | out [post update] : float[] [[]] : Number | provenance | MaD:42 |
+| B.java:1779:59:1779:60 | in : Number | B.java:1779:55:1779:57 | out [post update] : float[] [[]] : Number | provenance | MaD:44 |
 | B.java:1779:86:1779:88 | out : float[] [[]] : Number | B.java:21:33:21:43 | obj : float[] [[]] : Number | provenance |  |
 | B.java:1779:86:1779:88 | out : float[] [[]] : Number | B.java:1779:69:1779:89 | readArrayElement(...) | provenance |  |
 | B.java:1784:19:1784:34 | (...)... : Number | B.java:1784:65:1784:66 | in : Number | provenance |  |
 | B.java:1784:27:1784:34 | source(...) : Object | B.java:1784:19:1784:34 | (...)... : Number | provenance |  |
 | B.java:1784:57:1784:59 | out [post update] : double[] [[]] : Number | B.java:1784:92:1784:94 | out : double[] [[]] : Number | provenance |  |
-| B.java:1784:65:1784:66 | in : Number | B.java:1784:57:1784:59 | out [post update] : double[] [[]] : Number | provenance | MaD:41 |
+| B.java:1784:65:1784:66 | in : Number | B.java:1784:57:1784:59 | out [post update] : double[] [[]] : Number | provenance | MaD:43 |
 | B.java:1784:92:1784:94 | out : double[] [[]] : Number | B.java:22:34:22:45 | obj : double[] [[]] : Number | provenance |  |
 | B.java:1784:92:1784:94 | out : double[] [[]] : Number | B.java:1784:75:1784:95 | readArrayElement(...) | provenance |  |
 | B.java:1789:19:1789:34 | (...)... : Number | B.java:1789:61:1789:62 | in : Number | provenance |  |
 | B.java:1789:27:1789:34 | source(...) : Object | B.java:1789:19:1789:34 | (...)... : Number | provenance |  |
 | B.java:1789:57:1789:59 | out [post update] : double[] [[]] : Number | B.java:1789:88:1789:90 | out : double[] [[]] : Number | provenance |  |
-| B.java:1789:61:1789:62 | in : Number | B.java:1789:57:1789:59 | out [post update] : double[] [[]] : Number | provenance | MaD:40 |
+| B.java:1789:61:1789:62 | in : Number | B.java:1789:57:1789:59 | out [post update] : double[] [[]] : Number | provenance | MaD:42 |
 | B.java:1789:88:1789:90 | out : double[] [[]] : Number | B.java:22:34:22:45 | obj : double[] [[]] : Number | provenance |  |
 | B.java:1789:88:1789:90 | out : double[] [[]] : Number | B.java:1789:71:1789:91 | readArrayElement(...) | provenance |  |
 | B.java:1794:20:1794:36 | (...)... : Boolean | B.java:1794:67:1794:68 | in : Boolean | provenance |  |
 | B.java:1794:29:1794:36 | source(...) : Object | B.java:1794:20:1794:36 | (...)... : Boolean | provenance |  |
 | B.java:1794:59:1794:61 | out [post update] : boolean[] [[]] : Boolean | B.java:1794:94:1794:96 | out : boolean[] [[]] : Boolean | provenance |  |
-| B.java:1794:67:1794:68 | in : Boolean | B.java:1794:59:1794:61 | out [post update] : boolean[] [[]] : Boolean | provenance | MaD:35 |
+| B.java:1794:67:1794:68 | in : Boolean | B.java:1794:59:1794:61 | out [post update] : boolean[] [[]] : Boolean | provenance | MaD:37 |
 | B.java:1794:94:1794:96 | out : boolean[] [[]] : Boolean | B.java:15:35:15:47 | obj : boolean[] [[]] : Boolean | provenance |  |
 | B.java:1794:94:1794:96 | out : boolean[] [[]] : Boolean | B.java:1794:77:1794:97 | readArrayElement(...) | provenance |  |
 | B.java:1799:20:1799:36 | (...)... : Boolean | B.java:1799:63:1799:64 | in : Boolean | provenance |  |
 | B.java:1799:29:1799:36 | source(...) : Object | B.java:1799:20:1799:36 | (...)... : Boolean | provenance |  |
 | B.java:1799:59:1799:61 | out [post update] : boolean[] [[]] : Boolean | B.java:1799:90:1799:92 | out : boolean[] [[]] : Boolean | provenance |  |
-| B.java:1799:63:1799:64 | in : Boolean | B.java:1799:59:1799:61 | out [post update] : boolean[] [[]] : Boolean | provenance | MaD:34 |
+| B.java:1799:63:1799:64 | in : Boolean | B.java:1799:59:1799:61 | out [post update] : boolean[] [[]] : Boolean | provenance | MaD:36 |
 | B.java:1799:90:1799:92 | out : boolean[] [[]] : Boolean | B.java:15:35:15:47 | obj : boolean[] [[]] : Boolean | provenance |  |
 | B.java:1799:90:1799:92 | out : boolean[] [[]] : Boolean | B.java:1799:73:1799:93 | readArrayElement(...) | provenance |  |
 | B.java:1804:17:1804:30 | (...)... : Number | B.java:1804:61:1804:62 | in : Number | provenance |  |
 | B.java:1804:23:1804:30 | source(...) : Object | B.java:1804:17:1804:30 | (...)... : Number | provenance |  |
 | B.java:1804:53:1804:55 | out [post update] : byte[] [[]] : Number | B.java:1804:88:1804:90 | out : byte[] [[]] : Number | provenance |  |
-| B.java:1804:61:1804:62 | in : Number | B.java:1804:53:1804:55 | out [post update] : byte[] [[]] : Number | provenance | MaD:37 |
+| B.java:1804:61:1804:62 | in : Number | B.java:1804:53:1804:55 | out [post update] : byte[] [[]] : Number | provenance | MaD:39 |
 | B.java:1804:88:1804:90 | out : byte[] [[]] : Number | B.java:16:32:16:41 | obj : byte[] [[]] : Number | provenance |  |
 | B.java:1804:88:1804:90 | out : byte[] [[]] : Number | B.java:1804:71:1804:91 | readArrayElement(...) | provenance |  |
 | B.java:1809:17:1809:30 | (...)... : Number | B.java:1809:57:1809:58 | in : Number | provenance |  |
 | B.java:1809:23:1809:30 | source(...) : Object | B.java:1809:17:1809:30 | (...)... : Number | provenance |  |
 | B.java:1809:53:1809:55 | out [post update] : byte[] [[]] : Number | B.java:1809:84:1809:86 | out : byte[] [[]] : Number | provenance |  |
-| B.java:1809:57:1809:58 | in : Number | B.java:1809:53:1809:55 | out [post update] : byte[] [[]] : Number | provenance | MaD:36 |
+| B.java:1809:57:1809:58 | in : Number | B.java:1809:53:1809:55 | out [post update] : byte[] [[]] : Number | provenance | MaD:38 |
 | B.java:1809:84:1809:86 | out : byte[] [[]] : Number | B.java:16:32:16:41 | obj : byte[] [[]] : Number | provenance |  |
 | B.java:1809:84:1809:86 | out : byte[] [[]] : Number | B.java:1809:67:1809:87 | readArrayElement(...) | provenance |  |
 | B.java:1814:17:1814:35 | (...)... : Number | B.java:1814:66:1814:67 | in : Number | provenance |  |
 | B.java:1814:28:1814:35 | source(...) : Object | B.java:1814:17:1814:35 | (...)... : Number | provenance |  |
 | B.java:1814:58:1814:60 | out [post update] : char[] [[]] : Number | B.java:1814:93:1814:95 | out : char[] [[]] : Number | provenance |  |
-| B.java:1814:66:1814:67 | in : Number | B.java:1814:58:1814:60 | out [post update] : char[] [[]] : Number | provenance | MaD:39 |
+| B.java:1814:66:1814:67 | in : Number | B.java:1814:58:1814:60 | out [post update] : char[] [[]] : Number | provenance | MaD:41 |
 | B.java:1814:93:1814:95 | out : char[] [[]] : Number | B.java:17:32:17:41 | obj : char[] [[]] : Number | provenance |  |
 | B.java:1814:93:1814:95 | out : char[] [[]] : Number | B.java:1814:76:1814:96 | readArrayElement(...) | provenance |  |
 | B.java:1819:17:1819:35 | (...)... : Number | B.java:1819:62:1819:63 | in : Number | provenance |  |
 | B.java:1819:28:1819:35 | source(...) : Object | B.java:1819:17:1819:35 | (...)... : Number | provenance |  |
 | B.java:1819:58:1819:60 | out [post update] : char[] [[]] : Number | B.java:1819:89:1819:91 | out : char[] [[]] : Number | provenance |  |
-| B.java:1819:62:1819:63 | in : Number | B.java:1819:58:1819:60 | out [post update] : char[] [[]] : Number | provenance | MaD:38 |
+| B.java:1819:62:1819:63 | in : Number | B.java:1819:58:1819:60 | out [post update] : char[] [[]] : Number | provenance | MaD:40 |
 | B.java:1819:89:1819:91 | out : char[] [[]] : Number | B.java:17:32:17:41 | obj : char[] [[]] : Number | provenance |  |
 | B.java:1819:89:1819:91 | out : char[] [[]] : Number | B.java:1819:72:1819:92 | readArrayElement(...) | provenance |  |
 | B.java:1824:18:1824:32 | (...)... : Number | B.java:1824:63:1824:64 | in : Number | provenance |  |
 | B.java:1824:25:1824:32 | source(...) : Object | B.java:1824:18:1824:32 | (...)... : Number | provenance |  |
 | B.java:1824:55:1824:57 | out [post update] : short[] [[]] : Number | B.java:1824:90:1824:92 | out : short[] [[]] : Number | provenance |  |
-| B.java:1824:63:1824:64 | in : Number | B.java:1824:55:1824:57 | out [post update] : short[] [[]] : Number | provenance | MaD:48 |
+| B.java:1824:63:1824:64 | in : Number | B.java:1824:55:1824:57 | out [post update] : short[] [[]] : Number | provenance | MaD:50 |
 | B.java:1824:90:1824:92 | out : short[] [[]] : Number | B.java:18:33:18:43 | obj : short[] [[]] : Number | provenance |  |
 | B.java:1824:90:1824:92 | out : short[] [[]] : Number | B.java:1824:73:1824:93 | readArrayElement(...) | provenance |  |
 | B.java:1829:18:1829:32 | (...)... : Number | B.java:1829:59:1829:60 | in : Number | provenance |  |
 | B.java:1829:25:1829:32 | source(...) : Object | B.java:1829:18:1829:32 | (...)... : Number | provenance |  |
 | B.java:1829:55:1829:57 | out [post update] : short[] [[]] : Number | B.java:1829:86:1829:88 | out : short[] [[]] : Number | provenance |  |
-| B.java:1829:59:1829:60 | in : Number | B.java:1829:55:1829:57 | out [post update] : short[] [[]] : Number | provenance | MaD:49 |
+| B.java:1829:59:1829:60 | in : Number | B.java:1829:55:1829:57 | out [post update] : short[] [[]] : Number | provenance | MaD:51 |
 | B.java:1829:86:1829:88 | out : short[] [[]] : Number | B.java:18:33:18:43 | obj : short[] [[]] : Number | provenance |  |
 | B.java:1829:86:1829:88 | out : short[] [[]] : Number | B.java:1829:69:1829:89 | readArrayElement(...) | provenance |  |
 | B.java:1834:16:1834:32 | (...)... : Number | B.java:1834:63:1834:64 | in : Number | provenance |  |
 | B.java:1834:25:1834:32 | source(...) : Object | B.java:1834:16:1834:32 | (...)... : Number | provenance |  |
 | B.java:1834:55:1834:57 | out [post update] : int[] [[]] : Number | B.java:1834:90:1834:92 | out : int[] [[]] : Number | provenance |  |
-| B.java:1834:63:1834:64 | in : Number | B.java:1834:55:1834:57 | out [post update] : int[] [[]] : Number | provenance | MaD:45 |
+| B.java:1834:63:1834:64 | in : Number | B.java:1834:55:1834:57 | out [post update] : int[] [[]] : Number | provenance | MaD:47 |
 | B.java:1834:90:1834:92 | out : int[] [[]] : Number | B.java:19:31:19:39 | obj : int[] [[]] : Number | provenance |  |
 | B.java:1834:90:1834:92 | out : int[] [[]] : Number | B.java:1834:73:1834:93 | readArrayElement(...) | provenance |  |
 | B.java:1839:16:1839:32 | (...)... : Number | B.java:1839:59:1839:60 | in : Number | provenance |  |
 | B.java:1839:25:1839:32 | source(...) : Object | B.java:1839:16:1839:32 | (...)... : Number | provenance |  |
 | B.java:1839:55:1839:57 | out [post update] : int[] [[]] : Number | B.java:1839:86:1839:88 | out : int[] [[]] : Number | provenance |  |
-| B.java:1839:59:1839:60 | in : Number | B.java:1839:55:1839:57 | out [post update] : int[] [[]] : Number | provenance | MaD:44 |
+| B.java:1839:59:1839:60 | in : Number | B.java:1839:55:1839:57 | out [post update] : int[] [[]] : Number | provenance | MaD:46 |
 | B.java:1839:86:1839:88 | out : int[] [[]] : Number | B.java:19:31:19:39 | obj : int[] [[]] : Number | provenance |  |
 | B.java:1839:86:1839:88 | out : int[] [[]] : Number | B.java:1839:69:1839:89 | readArrayElement(...) | provenance |  |
 | B.java:1844:17:1844:30 | (...)... : Number | B.java:1844:61:1844:62 | in : Number | provenance |  |
 | B.java:1844:23:1844:30 | source(...) : Object | B.java:1844:17:1844:30 | (...)... : Number | provenance |  |
 | B.java:1844:53:1844:55 | out [post update] : long[] [[]] : Number | B.java:1844:88:1844:90 | out : long[] [[]] : Number | provenance |  |
-| B.java:1844:61:1844:62 | in : Number | B.java:1844:53:1844:55 | out [post update] : long[] [[]] : Number | provenance | MaD:46 |
+| B.java:1844:61:1844:62 | in : Number | B.java:1844:53:1844:55 | out [post update] : long[] [[]] : Number | provenance | MaD:48 |
 | B.java:1844:88:1844:90 | out : long[] [[]] : Number | B.java:20:32:20:41 | obj : long[] [[]] : Number | provenance |  |
 | B.java:1844:88:1844:90 | out : long[] [[]] : Number | B.java:1844:71:1844:91 | readArrayElement(...) | provenance |  |
 | B.java:1849:17:1849:30 | (...)... : Number | B.java:1849:57:1849:58 | in : Number | provenance |  |
 | B.java:1849:23:1849:30 | source(...) : Object | B.java:1849:17:1849:30 | (...)... : Number | provenance |  |
 | B.java:1849:53:1849:55 | out [post update] : long[] [[]] : Number | B.java:1849:84:1849:86 | out : long[] [[]] : Number | provenance |  |
-| B.java:1849:57:1849:58 | in : Number | B.java:1849:53:1849:55 | out [post update] : long[] [[]] : Number | provenance | MaD:47 |
+| B.java:1849:57:1849:58 | in : Number | B.java:1849:53:1849:55 | out [post update] : long[] [[]] : Number | provenance | MaD:49 |
 | B.java:1849:84:1849:86 | out : long[] [[]] : Number | B.java:20:32:20:41 | obj : long[] [[]] : Number | provenance |  |
 | B.java:1849:84:1849:86 | out : long[] [[]] : Number | B.java:1849:67:1849:87 | readArrayElement(...) | provenance |  |
 | B.java:1854:19:1854:26 | source(...) : Object | B.java:1854:69:1854:70 | in : Object | provenance |  |
 | B.java:1854:60:1854:62 | out [post update] : List [<element>] : Object | B.java:1854:91:1854:93 | out : List [<element>] : Object | provenance |  |
-| B.java:1854:69:1854:70 | in : Object | B.java:1854:60:1854:62 | out [post update] : List [<element>] : Object | provenance | MaD:77 |
+| B.java:1854:69:1854:70 | in : Object | B.java:1854:60:1854:62 | out [post update] : List [<element>] : Object | provenance | MaD:79 |
 | B.java:1854:91:1854:93 | out : List [<element>] : Object | B.java:31:28:31:42 | obj : List [<element>] : Object | provenance |  |
-| B.java:1854:91:1854:93 | out : List [<element>] : Object | B.java:1854:79:1854:94 | readElement(...) | provenance | MaD:1 |
+| B.java:1854:91:1854:93 | out : List [<element>] : Object | B.java:1854:79:1854:94 | readElement(...) | provenance | MaD:3 |
 | B.java:1859:17:1859:42 | storeElementList(...) : List [<element>] : Object | B.java:1859:74:1859:75 | in : List [<element>] : Object | provenance |  |
 | B.java:1859:34:1859:41 | source(...) : Object | B.java:24:39:24:43 | obj : Object | provenance |  |
-| B.java:1859:34:1859:41 | source(...) : Object | B.java:1859:17:1859:42 | storeElementList(...) : List [<element>] : Object | provenance | MaD:154 |
+| B.java:1859:34:1859:41 | source(...) : Object | B.java:1859:17:1859:42 | storeElementList(...) : List [<element>] : Object | provenance | MaD:151 |
 | B.java:1859:70:1859:72 | out [post update] : List [<element>] : Object | B.java:1859:96:1859:98 | out : List [<element>] : Object | provenance |  |
-| B.java:1859:74:1859:75 | in : List [<element>] : Object | B.java:1859:70:1859:72 | out [post update] : List [<element>] : Object | provenance | MaD:70 |
+| B.java:1859:74:1859:75 | in : List [<element>] : Object | B.java:1859:70:1859:72 | out [post update] : List [<element>] : Object | provenance | MaD:72 |
 | B.java:1859:96:1859:98 | out : List [<element>] : Object | B.java:31:28:31:42 | obj : List [<element>] : Object | provenance |  |
-| B.java:1859:96:1859:98 | out : List [<element>] : Object | B.java:1859:84:1859:99 | readElement(...) | provenance | MaD:1 |
+| B.java:1859:96:1859:98 | out : List [<element>] : Object | B.java:1859:84:1859:99 | readElement(...) | provenance | MaD:3 |
 | B.java:1864:19:1864:26 | source(...) : Object | B.java:1864:58:1864:59 | in : Object | provenance |  |
 | B.java:1864:54:1864:56 | out [post update] : List [<element>] : Object | B.java:1864:80:1864:82 | out : List [<element>] : Object | provenance |  |
-| B.java:1864:58:1864:59 | in : Object | B.java:1864:54:1864:56 | out [post update] : List [<element>] : Object | provenance | MaD:72 |
+| B.java:1864:58:1864:59 | in : Object | B.java:1864:54:1864:56 | out [post update] : List [<element>] : Object | provenance | MaD:74 |
 | B.java:1864:80:1864:82 | out : List [<element>] : Object | B.java:31:28:31:42 | obj : List [<element>] : Object | provenance |  |
-| B.java:1864:80:1864:82 | out : List [<element>] : Object | B.java:1864:68:1864:83 | readElement(...) | provenance | MaD:1 |
+| B.java:1864:80:1864:82 | out : List [<element>] : Object | B.java:1864:68:1864:83 | readElement(...) | provenance | MaD:3 |
 | B.java:1869:21:1869:47 | storeArrayElement(...) : Object[] [[]] : Object | B.java:1869:78:1869:79 | in : Object[] [[]] : Object | provenance |  |
 | B.java:1869:39:1869:46 | source(...) : Object | B.java:11:37:11:46 | obj : Object | provenance |  |
 | B.java:1869:39:1869:46 | source(...) : Object | B.java:1869:21:1869:47 | storeArrayElement(...) : Object[] [[]] : Object | provenance |  |
 | B.java:1869:56:1869:80 | asList(...) : List [<element>] : Object | B.java:1869:100:1869:102 | out : List [<element>] : Object | provenance |  |
-| B.java:1869:78:1869:79 | in : Object[] [[]] : Object | B.java:1869:56:1869:80 | asList(...) : List [<element>] : Object | provenance | MaD:29 |
+| B.java:1869:78:1869:79 | in : Object[] [[]] : Object | B.java:1869:56:1869:80 | asList(...) : List [<element>] : Object | provenance | MaD:31 |
 | B.java:1869:100:1869:102 | out : List [<element>] : Object | B.java:31:28:31:42 | obj : List [<element>] : Object | provenance |  |
-| B.java:1869:100:1869:102 | out : List [<element>] : Object | B.java:1869:88:1869:103 | readElement(...) | provenance | MaD:1 |
+| B.java:1869:100:1869:102 | out : List [<element>] : Object | B.java:1869:88:1869:103 | readElement(...) | provenance | MaD:3 |
 | B.java:1874:21:1874:47 | storeArrayElement(...) : Object[] [[]] : Object | B.java:1874:81:1874:82 | in : Object[] [[]] : Object | provenance |  |
 | B.java:1874:39:1874:46 | source(...) : Object | B.java:11:37:11:46 | obj : Object | provenance |  |
 | B.java:1874:39:1874:46 | source(...) : Object | B.java:1874:21:1874:47 | storeArrayElement(...) : Object[] [[]] : Object | provenance |  |
 | B.java:1874:77:1874:79 | out [post update] : Collection [<element>] : Object | B.java:1874:103:1874:105 | out : Collection [<element>] : Object | provenance |  |
-| B.java:1874:81:1874:82 | in : Object[] [[]] : Object | B.java:1874:77:1874:79 | out [post update] : Collection [<element>] : Object | provenance | MaD:58 |
+| B.java:1874:81:1874:82 | in : Object[] [[]] : Object | B.java:1874:77:1874:79 | out [post update] : Collection [<element>] : Object | provenance | MaD:60 |
 | B.java:1874:103:1874:105 | out : Collection [<element>] : Object | B.java:31:28:31:42 | obj : Collection [<element>] : Object | provenance |  |
-| B.java:1874:103:1874:105 | out : Collection [<element>] : Object | B.java:1874:91:1874:106 | readElement(...) | provenance | MaD:1 |
+| B.java:1874:103:1874:105 | out : Collection [<element>] : Object | B.java:1874:91:1874:106 | readElement(...) | provenance | MaD:3 |
 | B.java:1880:19:1880:26 | source(...) : Object | B.java:1880:42:1880:43 | in : Object | provenance |  |
 | B.java:1880:29:1880:31 | out [post update] : SequencedCollection [<element>] : Object | B.java:1880:64:1880:66 | out : SequencedCollection [<element>] : Object | provenance |  |
-| B.java:1880:42:1880:43 | in : Object | B.java:1880:29:1880:31 | out [post update] : SequencedCollection [<element>] : Object | provenance | MaD:270 |
+| B.java:1880:42:1880:43 | in : Object | B.java:1880:29:1880:31 | out [post update] : SequencedCollection [<element>] : Object | provenance | MaD:272 |
 | B.java:1880:64:1880:66 | out : SequencedCollection [<element>] : Object | B.java:31:28:31:42 | obj : SequencedCollection [<element>] : Object | provenance |  |
-| B.java:1880:64:1880:66 | out : SequencedCollection [<element>] : Object | B.java:1880:52:1880:67 | readElement(...) | provenance | MaD:1 |
+| B.java:1880:64:1880:66 | out : SequencedCollection [<element>] : Object | B.java:1880:52:1880:67 | readElement(...) | provenance | MaD:3 |
 | B.java:1885:19:1885:26 | source(...) : Object | B.java:1885:41:1885:42 | in : Object | provenance |  |
 | B.java:1885:29:1885:31 | out [post update] : SequencedCollection [<element>] : Object | B.java:1885:63:1885:65 | out : SequencedCollection [<element>] : Object | provenance |  |
-| B.java:1885:41:1885:42 | in : Object | B.java:1885:29:1885:31 | out [post update] : SequencedCollection [<element>] : Object | provenance | MaD:271 |
+| B.java:1885:41:1885:42 | in : Object | B.java:1885:29:1885:31 | out [post update] : SequencedCollection [<element>] : Object | provenance | MaD:273 |
 | B.java:1885:63:1885:65 | out : SequencedCollection [<element>] : Object | B.java:31:28:31:42 | obj : SequencedCollection [<element>] : Object | provenance |  |
-| B.java:1885:63:1885:65 | out : SequencedCollection [<element>] : Object | B.java:1885:51:1885:66 | readElement(...) | provenance | MaD:1 |
+| B.java:1885:63:1885:65 | out : SequencedCollection [<element>] : Object | B.java:1885:51:1885:66 | readElement(...) | provenance | MaD:3 |
 | B.java:1890:32:1890:57 | storeElementList(...) : List [<element>] : Object | B.java:1890:66:1890:67 | in : List [<element>] : Object | provenance |  |
 | B.java:1890:49:1890:56 | source(...) : Object | B.java:24:39:24:43 | obj : Object | provenance |  |
-| B.java:1890:49:1890:56 | source(...) : Object | B.java:1890:32:1890:57 | storeElementList(...) : List [<element>] : Object | provenance | MaD:154 |
-| B.java:1890:66:1890:67 | in : List [<element>] : Object | B.java:1890:66:1890:78 | getFirst(...) : Object | provenance | MaD:272 |
+| B.java:1890:49:1890:56 | source(...) : Object | B.java:1890:32:1890:57 | storeElementList(...) : List [<element>] : Object | provenance | MaD:151 |
+| B.java:1890:66:1890:67 | in : List [<element>] : Object | B.java:1890:66:1890:78 | getFirst(...) : Object | provenance | MaD:274 |
 | B.java:1890:66:1890:78 | getFirst(...) : Object | B.java:1890:86:1890:88 | out | provenance |  |
 | B.java:1895:32:1895:57 | storeElementList(...) : List [<element>] : Object | B.java:1895:66:1895:67 | in : List [<element>] : Object | provenance |  |
 | B.java:1895:49:1895:56 | source(...) : Object | B.java:24:39:24:43 | obj : Object | provenance |  |
-| B.java:1895:49:1895:56 | source(...) : Object | B.java:1895:32:1895:57 | storeElementList(...) : List [<element>] : Object | provenance | MaD:154 |
-| B.java:1895:66:1895:67 | in : List [<element>] : Object | B.java:1895:66:1895:77 | getLast(...) : Object | provenance | MaD:273 |
+| B.java:1895:49:1895:56 | source(...) : Object | B.java:1895:32:1895:57 | storeElementList(...) : List [<element>] : Object | provenance | MaD:151 |
+| B.java:1895:66:1895:67 | in : List [<element>] : Object | B.java:1895:66:1895:77 | getLast(...) : Object | provenance | MaD:275 |
 | B.java:1895:66:1895:77 | getLast(...) : Object | B.java:1895:85:1895:87 | out | provenance |  |
 | B.java:1900:32:1900:57 | storeElementList(...) : List [<element>] : Object | B.java:1900:66:1900:67 | in : List [<element>] : Object | provenance |  |
 | B.java:1900:49:1900:56 | source(...) : Object | B.java:24:39:24:43 | obj : Object | provenance |  |
-| B.java:1900:49:1900:56 | source(...) : Object | B.java:1900:32:1900:57 | storeElementList(...) : List [<element>] : Object | provenance | MaD:154 |
-| B.java:1900:66:1900:67 | in : List [<element>] : Object | B.java:1900:66:1900:81 | removeFirst(...) : Object | provenance | MaD:274 |
+| B.java:1900:49:1900:56 | source(...) : Object | B.java:1900:32:1900:57 | storeElementList(...) : List [<element>] : Object | provenance | MaD:151 |
+| B.java:1900:66:1900:67 | in : List [<element>] : Object | B.java:1900:66:1900:81 | removeFirst(...) : Object | provenance | MaD:276 |
 | B.java:1900:66:1900:81 | removeFirst(...) : Object | B.java:1900:89:1900:91 | out | provenance |  |
 | B.java:1905:32:1905:57 | storeElementList(...) : List [<element>] : Object | B.java:1905:66:1905:67 | in : List [<element>] : Object | provenance |  |
 | B.java:1905:49:1905:56 | source(...) : Object | B.java:24:39:24:43 | obj : Object | provenance |  |
-| B.java:1905:49:1905:56 | source(...) : Object | B.java:1905:32:1905:57 | storeElementList(...) : List [<element>] : Object | provenance | MaD:154 |
-| B.java:1905:66:1905:67 | in : List [<element>] : Object | B.java:1905:66:1905:80 | removeLast(...) : Object | provenance | MaD:275 |
+| B.java:1905:49:1905:56 | source(...) : Object | B.java:1905:32:1905:57 | storeElementList(...) : List [<element>] : Object | provenance | MaD:151 |
+| B.java:1905:66:1905:67 | in : List [<element>] : Object | B.java:1905:66:1905:80 | removeLast(...) : Object | provenance | MaD:277 |
 | B.java:1905:66:1905:80 | removeLast(...) : Object | B.java:1905:88:1905:90 | out | provenance |  |
 | B.java:1910:32:1910:57 | storeElementList(...) : List [<element>] : Object | B.java:1910:66:1910:67 | in : List [<element>] : Object | provenance |  |
 | B.java:1910:49:1910:56 | source(...) : Object | B.java:24:39:24:43 | obj : Object | provenance |  |
-| B.java:1910:49:1910:56 | source(...) : Object | B.java:1910:32:1910:57 | storeElementList(...) : List [<element>] : Object | provenance | MaD:154 |
-| B.java:1910:66:1910:67 | in : List [<element>] : Object | B.java:1910:66:1910:78 | reversed(...) : SequencedCollection [<element>] : Object | provenance | MaD:276 |
+| B.java:1910:49:1910:56 | source(...) : Object | B.java:1910:32:1910:57 | storeElementList(...) : List [<element>] : Object | provenance | MaD:151 |
+| B.java:1910:66:1910:67 | in : List [<element>] : Object | B.java:1910:66:1910:78 | reversed(...) : SequencedCollection [<element>] : Object | provenance | MaD:278 |
 | B.java:1910:66:1910:78 | reversed(...) : SequencedCollection [<element>] : Object | B.java:1910:98:1910:100 | out : SequencedCollection [<element>] : Object | provenance |  |
 | B.java:1910:98:1910:100 | out : SequencedCollection [<element>] : Object | B.java:31:28:31:42 | obj : SequencedCollection [<element>] : Object | provenance |  |
-| B.java:1910:98:1910:100 | out : SequencedCollection [<element>] : Object | B.java:1910:86:1910:101 | readElement(...) | provenance | MaD:1 |
+| B.java:1910:98:1910:100 | out : SequencedCollection [<element>] : Object | B.java:1910:86:1910:101 | readElement(...) | provenance | MaD:3 |
 | B.java:1915:25:1915:59 | (...)... : TreeMap [<map.key>] : Object | B.java:1915:68:1915:69 | in : TreeMap [<map.key>] : Object | provenance |  |
 | B.java:1915:39:1915:59 | storeMapKey(...) : TreeMap [<map.key>] : Object | B.java:1915:25:1915:59 | (...)... : TreeMap [<map.key>] : Object | provenance |  |
 | B.java:1915:51:1915:58 | source(...) : Object | B.java:38:37:38:41 | obj : Object | provenance |  |
-| B.java:1915:51:1915:58 | source(...) : Object | B.java:1915:39:1915:59 | storeMapKey(...) : TreeMap [<map.key>] : Object | provenance | MaD:209 |
-| B.java:1915:68:1915:69 | in : TreeMap [<map.key>] : Object | B.java:1915:68:1915:82 | firstEntry(...) : Entry [<map.key>] : Object | provenance | MaD:277 |
+| B.java:1915:51:1915:58 | source(...) : Object | B.java:1915:39:1915:59 | storeMapKey(...) : TreeMap [<map.key>] : Object | provenance | MaD:214 |
+| B.java:1915:68:1915:69 | in : TreeMap [<map.key>] : Object | B.java:1915:68:1915:82 | firstEntry(...) : Entry [<map.key>] : Object | provenance | MaD:279 |
 | B.java:1915:68:1915:82 | firstEntry(...) : Entry [<map.key>] : Object | B.java:1915:101:1915:103 | out : Entry [<map.key>] : Object | provenance |  |
 | B.java:1915:101:1915:103 | out : Entry [<map.key>] : Object | B.java:43:29:43:46 | obj : Entry [<map.key>] : Object | provenance |  |
-| B.java:1915:101:1915:103 | out : Entry [<map.key>] : Object | B.java:1915:90:1915:104 | readMapKey(...) | provenance | MaD:223 |
+| B.java:1915:101:1915:103 | out : Entry [<map.key>] : Object | B.java:1915:90:1915:104 | readMapKey(...) | provenance | MaD:174 |
 | B.java:1920:25:1920:59 | (...)... : TreeMap [<map.key>] : Object | B.java:1920:68:1920:69 | in : TreeMap [<map.key>] : Object | provenance |  |
 | B.java:1920:39:1920:59 | storeMapKey(...) : TreeMap [<map.key>] : Object | B.java:1920:25:1920:59 | (...)... : TreeMap [<map.key>] : Object | provenance |  |
 | B.java:1920:51:1920:58 | source(...) : Object | B.java:38:37:38:41 | obj : Object | provenance |  |
-| B.java:1920:51:1920:58 | source(...) : Object | B.java:1920:39:1920:59 | storeMapKey(...) : TreeMap [<map.key>] : Object | provenance | MaD:209 |
-| B.java:1920:68:1920:69 | in : TreeMap [<map.key>] : Object | B.java:1920:68:1920:81 | lastEntry(...) : Entry [<map.key>] : Object | provenance | MaD:279 |
+| B.java:1920:51:1920:58 | source(...) : Object | B.java:1920:39:1920:59 | storeMapKey(...) : TreeMap [<map.key>] : Object | provenance | MaD:214 |
+| B.java:1920:68:1920:69 | in : TreeMap [<map.key>] : Object | B.java:1920:68:1920:81 | lastEntry(...) : Entry [<map.key>] : Object | provenance | MaD:281 |
 | B.java:1920:68:1920:81 | lastEntry(...) : Entry [<map.key>] : Object | B.java:1920:100:1920:102 | out : Entry [<map.key>] : Object | provenance |  |
 | B.java:1920:100:1920:102 | out : Entry [<map.key>] : Object | B.java:43:29:43:46 | obj : Entry [<map.key>] : Object | provenance |  |
-| B.java:1920:100:1920:102 | out : Entry [<map.key>] : Object | B.java:1920:89:1920:103 | readMapKey(...) | provenance | MaD:223 |
+| B.java:1920:100:1920:102 | out : Entry [<map.key>] : Object | B.java:1920:89:1920:103 | readMapKey(...) | provenance | MaD:174 |
 | B.java:1925:25:1925:59 | (...)... : TreeMap [<map.key>] : Object | B.java:1925:68:1925:69 | in : TreeMap [<map.key>] : Object | provenance |  |
 | B.java:1925:39:1925:59 | storeMapKey(...) : TreeMap [<map.key>] : Object | B.java:1925:25:1925:59 | (...)... : TreeMap [<map.key>] : Object | provenance |  |
 | B.java:1925:51:1925:58 | source(...) : Object | B.java:38:37:38:41 | obj : Object | provenance |  |
-| B.java:1925:51:1925:58 | source(...) : Object | B.java:1925:39:1925:59 | storeMapKey(...) : TreeMap [<map.key>] : Object | provenance | MaD:209 |
-| B.java:1925:68:1925:69 | in : TreeMap [<map.key>] : Object | B.java:1925:68:1925:86 | pollFirstEntry(...) : Entry [<map.key>] : Object | provenance | MaD:281 |
+| B.java:1925:51:1925:58 | source(...) : Object | B.java:1925:39:1925:59 | storeMapKey(...) : TreeMap [<map.key>] : Object | provenance | MaD:214 |
+| B.java:1925:68:1925:69 | in : TreeMap [<map.key>] : Object | B.java:1925:68:1925:86 | pollFirstEntry(...) : Entry [<map.key>] : Object | provenance | MaD:283 |
 | B.java:1925:68:1925:86 | pollFirstEntry(...) : Entry [<map.key>] : Object | B.java:1925:105:1925:107 | out : Entry [<map.key>] : Object | provenance |  |
 | B.java:1925:105:1925:107 | out : Entry [<map.key>] : Object | B.java:43:29:43:46 | obj : Entry [<map.key>] : Object | provenance |  |
-| B.java:1925:105:1925:107 | out : Entry [<map.key>] : Object | B.java:1925:94:1925:108 | readMapKey(...) | provenance | MaD:223 |
+| B.java:1925:105:1925:107 | out : Entry [<map.key>] : Object | B.java:1925:94:1925:108 | readMapKey(...) | provenance | MaD:174 |
 | B.java:1930:25:1930:59 | (...)... : TreeMap [<map.key>] : Object | B.java:1930:68:1930:69 | in : TreeMap [<map.key>] : Object | provenance |  |
 | B.java:1930:39:1930:59 | storeMapKey(...) : TreeMap [<map.key>] : Object | B.java:1930:25:1930:59 | (...)... : TreeMap [<map.key>] : Object | provenance |  |
 | B.java:1930:51:1930:58 | source(...) : Object | B.java:38:37:38:41 | obj : Object | provenance |  |
-| B.java:1930:51:1930:58 | source(...) : Object | B.java:1930:39:1930:59 | storeMapKey(...) : TreeMap [<map.key>] : Object | provenance | MaD:209 |
-| B.java:1930:68:1930:69 | in : TreeMap [<map.key>] : Object | B.java:1930:68:1930:85 | pollLastEntry(...) : Entry [<map.key>] : Object | provenance | MaD:283 |
+| B.java:1930:51:1930:58 | source(...) : Object | B.java:1930:39:1930:59 | storeMapKey(...) : TreeMap [<map.key>] : Object | provenance | MaD:214 |
+| B.java:1930:68:1930:69 | in : TreeMap [<map.key>] : Object | B.java:1930:68:1930:85 | pollLastEntry(...) : Entry [<map.key>] : Object | provenance | MaD:285 |
 | B.java:1930:68:1930:85 | pollLastEntry(...) : Entry [<map.key>] : Object | B.java:1930:104:1930:106 | out : Entry [<map.key>] : Object | provenance |  |
 | B.java:1930:104:1930:106 | out : Entry [<map.key>] : Object | B.java:43:29:43:46 | obj : Entry [<map.key>] : Object | provenance |  |
-| B.java:1930:104:1930:106 | out : Entry [<map.key>] : Object | B.java:1930:93:1930:107 | readMapKey(...) | provenance | MaD:223 |
+| B.java:1930:104:1930:106 | out : Entry [<map.key>] : Object | B.java:1930:93:1930:107 | readMapKey(...) | provenance | MaD:174 |
 | B.java:1935:25:1935:61 | (...)... : SequencedMap [<map.value>] : Object | B.java:1935:70:1935:71 | in : SequencedMap [<map.value>] : Object | provenance |  |
 | B.java:1935:39:1935:61 | storeMapValue(...) : Map [<map.value>] : Object | B.java:1935:25:1935:61 | (...)... : SequencedMap [<map.value>] : Object | provenance |  |
 | B.java:1935:53:1935:60 | source(...) : Object | B.java:41:39:41:43 | obj : Object | provenance |  |
-| B.java:1935:53:1935:60 | source(...) : Object | B.java:1935:39:1935:61 | storeMapValue(...) : Map [<map.value>] : Object | provenance | MaD:210 |
-| B.java:1935:70:1935:71 | in : SequencedMap [<map.value>] : Object | B.java:1935:70:1935:92 | putFirst(...) : Object | provenance | MaD:285 |
+| B.java:1935:53:1935:60 | source(...) : Object | B.java:1935:39:1935:61 | storeMapValue(...) : Map [<map.value>] : Object | provenance | MaD:215 |
+| B.java:1935:70:1935:71 | in : SequencedMap [<map.value>] : Object | B.java:1935:70:1935:92 | putFirst(...) : Object | provenance | MaD:289 |
 | B.java:1935:70:1935:92 | putFirst(...) : Object | B.java:1935:100:1935:102 | out | provenance |  |
 | B.java:1940:19:1940:26 | source(...) : Object | B.java:1940:42:1940:43 | in : Object | provenance |  |
 | B.java:1940:29:1940:31 | out [post update] : SequencedMap [<map.key>] : Object | B.java:1940:69:1940:71 | out : SequencedMap [<map.key>] : Object | provenance |  |
-| B.java:1940:42:1940:43 | in : Object | B.java:1940:29:1940:31 | out [post update] : SequencedMap [<map.key>] : Object | provenance | MaD:286 |
+| B.java:1940:42:1940:43 | in : Object | B.java:1940:29:1940:31 | out [post update] : SequencedMap [<map.key>] : Object | provenance | MaD:287 |
 | B.java:1940:69:1940:71 | out : SequencedMap [<map.key>] : Object | B.java:44:29:44:40 | obj : SequencedMap [<map.key>] : Object | provenance |  |
-| B.java:1940:69:1940:71 | out : SequencedMap [<map.key>] : Object | B.java:1940:58:1940:72 | readMapKey(...) | provenance | MaD:184 |
+| B.java:1940:69:1940:71 | out : SequencedMap [<map.key>] : Object | B.java:1940:58:1940:72 | readMapKey(...) | provenance | MaD:212 |
 | B.java:1945:25:1945:61 | (...)... : SequencedMap [<map.value>] : Object | B.java:1945:70:1945:71 | in : SequencedMap [<map.value>] : Object | provenance |  |
 | B.java:1945:39:1945:61 | storeMapValue(...) : Map [<map.value>] : Object | B.java:1945:25:1945:61 | (...)... : SequencedMap [<map.value>] : Object | provenance |  |
 | B.java:1945:53:1945:60 | source(...) : Object | B.java:41:39:41:43 | obj : Object | provenance |  |
-| B.java:1945:53:1945:60 | source(...) : Object | B.java:1945:39:1945:61 | storeMapValue(...) : Map [<map.value>] : Object | provenance | MaD:210 |
-| B.java:1945:70:1945:71 | in : SequencedMap [<map.value>] : Object | B.java:1945:70:1945:91 | putLast(...) : Object | provenance | MaD:288 |
+| B.java:1945:53:1945:60 | source(...) : Object | B.java:1945:39:1945:61 | storeMapValue(...) : Map [<map.value>] : Object | provenance | MaD:215 |
+| B.java:1945:70:1945:71 | in : SequencedMap [<map.value>] : Object | B.java:1945:70:1945:91 | putLast(...) : Object | provenance | MaD:292 |
 | B.java:1945:70:1945:91 | putLast(...) : Object | B.java:1945:99:1945:101 | out | provenance |  |
 | B.java:1950:19:1950:26 | source(...) : Object | B.java:1950:41:1950:42 | in : Object | provenance |  |
 | B.java:1950:29:1950:31 | out [post update] : SequencedMap [<map.key>] : Object | B.java:1950:68:1950:70 | out : SequencedMap [<map.key>] : Object | provenance |  |
-| B.java:1950:41:1950:42 | in : Object | B.java:1950:29:1950:31 | out [post update] : SequencedMap [<map.key>] : Object | provenance | MaD:289 |
+| B.java:1950:41:1950:42 | in : Object | B.java:1950:29:1950:31 | out [post update] : SequencedMap [<map.key>] : Object | provenance | MaD:290 |
 | B.java:1950:68:1950:70 | out : SequencedMap [<map.key>] : Object | B.java:44:29:44:40 | obj : SequencedMap [<map.key>] : Object | provenance |  |
-| B.java:1950:68:1950:70 | out : SequencedMap [<map.key>] : Object | B.java:1950:57:1950:71 | readMapKey(...) | provenance | MaD:184 |
+| B.java:1950:68:1950:70 | out : SequencedMap [<map.key>] : Object | B.java:1950:57:1950:71 | readMapKey(...) | provenance | MaD:212 |
 | B.java:1955:25:1955:59 | (...)... : TreeMap [<map.key>] : Object | B.java:1955:68:1955:69 | in : TreeMap [<map.key>] : Object | provenance |  |
 | B.java:1955:39:1955:59 | storeMapKey(...) : TreeMap [<map.key>] : Object | B.java:1955:25:1955:59 | (...)... : TreeMap [<map.key>] : Object | provenance |  |
 | B.java:1955:51:1955:58 | source(...) : Object | B.java:38:37:38:41 | obj : Object | provenance |  |
-| B.java:1955:51:1955:58 | source(...) : Object | B.java:1955:39:1955:59 | storeMapKey(...) : TreeMap [<map.key>] : Object | provenance | MaD:209 |
-| B.java:1955:68:1955:69 | in : TreeMap [<map.key>] : Object | B.java:1955:68:1955:80 | reversed(...) : SequencedMap [<map.key>] : Object | provenance | MaD:291 |
+| B.java:1955:51:1955:58 | source(...) : Object | B.java:1955:39:1955:59 | storeMapKey(...) : TreeMap [<map.key>] : Object | provenance | MaD:214 |
+| B.java:1955:68:1955:69 | in : TreeMap [<map.key>] : Object | B.java:1955:68:1955:80 | reversed(...) : SequencedMap [<map.key>] : Object | provenance | MaD:293 |
 | B.java:1955:68:1955:80 | reversed(...) : SequencedMap [<map.key>] : Object | B.java:1955:99:1955:101 | out : SequencedMap [<map.key>] : Object | provenance |  |
 | B.java:1955:99:1955:101 | out : SequencedMap [<map.key>] : Object | B.java:44:29:44:40 | obj : SequencedMap [<map.key>] : Object | provenance |  |
-| B.java:1955:99:1955:101 | out : SequencedMap [<map.key>] : Object | B.java:1955:88:1955:102 | readMapKey(...) | provenance | MaD:184 |
+| B.java:1955:99:1955:101 | out : SequencedMap [<map.key>] : Object | B.java:1955:88:1955:102 | readMapKey(...) | provenance | MaD:212 |
 | B.java:1960:25:1960:59 | (...)... : TreeMap [<map.key>] : Object | B.java:1960:68:1960:69 | in : TreeMap [<map.key>] : Object | provenance |  |
 | B.java:1960:39:1960:59 | storeMapKey(...) : TreeMap [<map.key>] : Object | B.java:1960:25:1960:59 | (...)... : TreeMap [<map.key>] : Object | provenance |  |
 | B.java:1960:51:1960:58 | source(...) : Object | B.java:38:37:38:41 | obj : Object | provenance |  |
-| B.java:1960:51:1960:58 | source(...) : Object | B.java:1960:39:1960:59 | storeMapKey(...) : TreeMap [<map.key>] : Object | provenance | MaD:209 |
-| B.java:1960:68:1960:69 | in : TreeMap [<map.key>] : Object | B.java:1960:68:1960:89 | sequencedEntrySet(...) : SequencedSet [<element>, <map.key>] : Object | provenance | MaD:293 |
+| B.java:1960:51:1960:58 | source(...) : Object | B.java:1960:39:1960:59 | storeMapKey(...) : TreeMap [<map.key>] : Object | provenance | MaD:214 |
+| B.java:1960:68:1960:69 | in : TreeMap [<map.key>] : Object | B.java:1960:68:1960:89 | sequencedEntrySet(...) : SequencedSet [<element>, <map.key>] : Object | provenance | MaD:295 |
 | B.java:1960:68:1960:89 | sequencedEntrySet(...) : SequencedSet [<element>, <map.key>] : Object | B.java:1960:120:1960:122 | out : SequencedSet [<element>, <map.key>] : Object | provenance |  |
 | B.java:1960:108:1960:123 | readElement(...) : Entry [<map.key>] : Object | B.java:43:29:43:46 | obj : Entry [<map.key>] : Object | provenance |  |
-| B.java:1960:108:1960:123 | readElement(...) : Entry [<map.key>] : Object | B.java:1960:97:1960:124 | readMapKey(...) | provenance | MaD:223 |
+| B.java:1960:108:1960:123 | readElement(...) : Entry [<map.key>] : Object | B.java:1960:97:1960:124 | readMapKey(...) | provenance | MaD:174 |
 | B.java:1960:120:1960:122 | out : SequencedSet [<element>, <map.key>] : Object | B.java:31:28:31:42 | obj : SequencedSet [<element>, <map.key>] : Object | provenance |  |
-| B.java:1960:120:1960:122 | out : SequencedSet [<element>, <map.key>] : Object | B.java:1960:108:1960:123 | readElement(...) : Entry [<map.key>] : Object | provenance | MaD:1 |
+| B.java:1960:120:1960:122 | out : SequencedSet [<element>, <map.key>] : Object | B.java:1960:108:1960:123 | readElement(...) : Entry [<map.key>] : Object | provenance | MaD:3 |
 | B.java:1965:25:1965:61 | (...)... : SequencedMap [<map.value>] : Object | B.java:1965:70:1965:71 | in : SequencedMap [<map.value>] : Object | provenance |  |
 | B.java:1965:39:1965:61 | storeMapValue(...) : Map [<map.value>] : Object | B.java:1965:25:1965:61 | (...)... : SequencedMap [<map.value>] : Object | provenance |  |
 | B.java:1965:53:1965:60 | source(...) : Object | B.java:41:39:41:43 | obj : Object | provenance |  |
-| B.java:1965:53:1965:60 | source(...) : Object | B.java:1965:39:1965:61 | storeMapValue(...) : Map [<map.value>] : Object | provenance | MaD:210 |
-| B.java:1965:70:1965:71 | in : SequencedMap [<map.value>] : Object | B.java:1965:70:1965:84 | firstEntry(...) : Entry [<map.value>] : Object | provenance | MaD:278 |
+| B.java:1965:53:1965:60 | source(...) : Object | B.java:1965:39:1965:61 | storeMapValue(...) : Map [<map.value>] : Object | provenance | MaD:215 |
+| B.java:1965:70:1965:71 | in : SequencedMap [<map.value>] : Object | B.java:1965:70:1965:84 | firstEntry(...) : Entry [<map.value>] : Object | provenance | MaD:280 |
 | B.java:1965:70:1965:84 | firstEntry(...) : Entry [<map.value>] : Object | B.java:1965:105:1965:107 | out : Entry [<map.value>] : Object | provenance |  |
 | B.java:1965:105:1965:107 | out : Entry [<map.value>] : Object | B.java:47:31:47:48 | obj : Entry [<map.value>] : Object | provenance |  |
-| B.java:1965:105:1965:107 | out : Entry [<map.value>] : Object | B.java:1965:92:1965:108 | readMapValue(...) | provenance | MaD:224 |
+| B.java:1965:105:1965:107 | out : Entry [<map.value>] : Object | B.java:1965:92:1965:108 | readMapValue(...) | provenance | MaD:175 |
 | B.java:1970:25:1970:61 | (...)... : SequencedMap [<map.value>] : Object | B.java:1970:70:1970:71 | in : SequencedMap [<map.value>] : Object | provenance |  |
 | B.java:1970:39:1970:61 | storeMapValue(...) : Map [<map.value>] : Object | B.java:1970:25:1970:61 | (...)... : SequencedMap [<map.value>] : Object | provenance |  |
 | B.java:1970:53:1970:60 | source(...) : Object | B.java:41:39:41:43 | obj : Object | provenance |  |
-| B.java:1970:53:1970:60 | source(...) : Object | B.java:1970:39:1970:61 | storeMapValue(...) : Map [<map.value>] : Object | provenance | MaD:210 |
-| B.java:1970:70:1970:71 | in : SequencedMap [<map.value>] : Object | B.java:1970:70:1970:83 | lastEntry(...) : Entry [<map.value>] : Object | provenance | MaD:280 |
+| B.java:1970:53:1970:60 | source(...) : Object | B.java:1970:39:1970:61 | storeMapValue(...) : Map [<map.value>] : Object | provenance | MaD:215 |
+| B.java:1970:70:1970:71 | in : SequencedMap [<map.value>] : Object | B.java:1970:70:1970:83 | lastEntry(...) : Entry [<map.value>] : Object | provenance | MaD:282 |
 | B.java:1970:70:1970:83 | lastEntry(...) : Entry [<map.value>] : Object | B.java:1970:104:1970:106 | out : Entry [<map.value>] : Object | provenance |  |
 | B.java:1970:104:1970:106 | out : Entry [<map.value>] : Object | B.java:47:31:47:48 | obj : Entry [<map.value>] : Object | provenance |  |
-| B.java:1970:104:1970:106 | out : Entry [<map.value>] : Object | B.java:1970:91:1970:107 | readMapValue(...) | provenance | MaD:224 |
+| B.java:1970:104:1970:106 | out : Entry [<map.value>] : Object | B.java:1970:91:1970:107 | readMapValue(...) | provenance | MaD:175 |
 | B.java:1975:25:1975:61 | (...)... : SequencedMap [<map.value>] : Object | B.java:1975:70:1975:71 | in : SequencedMap [<map.value>] : Object | provenance |  |
 | B.java:1975:39:1975:61 | storeMapValue(...) : Map [<map.value>] : Object | B.java:1975:25:1975:61 | (...)... : SequencedMap [<map.value>] : Object | provenance |  |
 | B.java:1975:53:1975:60 | source(...) : Object | B.java:41:39:41:43 | obj : Object | provenance |  |
-| B.java:1975:53:1975:60 | source(...) : Object | B.java:1975:39:1975:61 | storeMapValue(...) : Map [<map.value>] : Object | provenance | MaD:210 |
-| B.java:1975:70:1975:71 | in : SequencedMap [<map.value>] : Object | B.java:1975:70:1975:88 | pollFirstEntry(...) : Entry [<map.value>] : Object | provenance | MaD:282 |
+| B.java:1975:53:1975:60 | source(...) : Object | B.java:1975:39:1975:61 | storeMapValue(...) : Map [<map.value>] : Object | provenance | MaD:215 |
+| B.java:1975:70:1975:71 | in : SequencedMap [<map.value>] : Object | B.java:1975:70:1975:88 | pollFirstEntry(...) : Entry [<map.value>] : Object | provenance | MaD:284 |
 | B.java:1975:70:1975:88 | pollFirstEntry(...) : Entry [<map.value>] : Object | B.java:1975:109:1975:111 | out : Entry [<map.value>] : Object | provenance |  |
 | B.java:1975:109:1975:111 | out : Entry [<map.value>] : Object | B.java:47:31:47:48 | obj : Entry [<map.value>] : Object | provenance |  |
-| B.java:1975:109:1975:111 | out : Entry [<map.value>] : Object | B.java:1975:96:1975:112 | readMapValue(...) | provenance | MaD:224 |
+| B.java:1975:109:1975:111 | out : Entry [<map.value>] : Object | B.java:1975:96:1975:112 | readMapValue(...) | provenance | MaD:175 |
 | B.java:1980:25:1980:61 | (...)... : SequencedMap [<map.value>] : Object | B.java:1980:70:1980:71 | in : SequencedMap [<map.value>] : Object | provenance |  |
 | B.java:1980:39:1980:61 | storeMapValue(...) : Map [<map.value>] : Object | B.java:1980:25:1980:61 | (...)... : SequencedMap [<map.value>] : Object | provenance |  |
 | B.java:1980:53:1980:60 | source(...) : Object | B.java:41:39:41:43 | obj : Object | provenance |  |
-| B.java:1980:53:1980:60 | source(...) : Object | B.java:1980:39:1980:61 | storeMapValue(...) : Map [<map.value>] : Object | provenance | MaD:210 |
-| B.java:1980:70:1980:71 | in : SequencedMap [<map.value>] : Object | B.java:1980:70:1980:87 | pollLastEntry(...) : Entry [<map.value>] : Object | provenance | MaD:284 |
+| B.java:1980:53:1980:60 | source(...) : Object | B.java:1980:39:1980:61 | storeMapValue(...) : Map [<map.value>] : Object | provenance | MaD:215 |
+| B.java:1980:70:1980:71 | in : SequencedMap [<map.value>] : Object | B.java:1980:70:1980:87 | pollLastEntry(...) : Entry [<map.value>] : Object | provenance | MaD:286 |
 | B.java:1980:70:1980:87 | pollLastEntry(...) : Entry [<map.value>] : Object | B.java:1980:108:1980:110 | out : Entry [<map.value>] : Object | provenance |  |
 | B.java:1980:108:1980:110 | out : Entry [<map.value>] : Object | B.java:47:31:47:48 | obj : Entry [<map.value>] : Object | provenance |  |
-| B.java:1980:108:1980:110 | out : Entry [<map.value>] : Object | B.java:1980:95:1980:111 | readMapValue(...) | provenance | MaD:224 |
+| B.java:1980:108:1980:110 | out : Entry [<map.value>] : Object | B.java:1980:95:1980:111 | readMapValue(...) | provenance | MaD:175 |
 | B.java:1985:19:1985:26 | source(...) : Object | B.java:1985:48:1985:49 | in : Object | provenance |  |
 | B.java:1985:29:1985:31 | out [post update] : SequencedMap [<map.value>] : Object | B.java:1985:71:1985:73 | out : SequencedMap [<map.value>] : Object | provenance |  |
-| B.java:1985:48:1985:49 | in : Object | B.java:1985:29:1985:31 | out [post update] : SequencedMap [<map.value>] : Object | provenance | MaD:287 |
+| B.java:1985:48:1985:49 | in : Object | B.java:1985:29:1985:31 | out [post update] : SequencedMap [<map.value>] : Object | provenance | MaD:288 |
 | B.java:1985:71:1985:73 | out : SequencedMap [<map.value>] : Object | B.java:48:31:48:42 | obj : SequencedMap [<map.value>] : Object | provenance |  |
-| B.java:1985:71:1985:73 | out : SequencedMap [<map.value>] : Object | B.java:1985:58:1985:74 | readMapValue(...) | provenance | MaD:181 |
+| B.java:1985:71:1985:73 | out : SequencedMap [<map.value>] : Object | B.java:1985:58:1985:74 | readMapValue(...) | provenance | MaD:209 |
 | B.java:1990:19:1990:26 | source(...) : Object | B.java:1990:47:1990:48 | in : Object | provenance |  |
 | B.java:1990:29:1990:31 | out [post update] : SequencedMap [<map.value>] : Object | B.java:1990:70:1990:72 | out : SequencedMap [<map.value>] : Object | provenance |  |
-| B.java:1990:47:1990:48 | in : Object | B.java:1990:29:1990:31 | out [post update] : SequencedMap [<map.value>] : Object | provenance | MaD:290 |
+| B.java:1990:47:1990:48 | in : Object | B.java:1990:29:1990:31 | out [post update] : SequencedMap [<map.value>] : Object | provenance | MaD:291 |
 | B.java:1990:70:1990:72 | out : SequencedMap [<map.value>] : Object | B.java:48:31:48:42 | obj : SequencedMap [<map.value>] : Object | provenance |  |
-| B.java:1990:70:1990:72 | out : SequencedMap [<map.value>] : Object | B.java:1990:57:1990:73 | readMapValue(...) | provenance | MaD:181 |
+| B.java:1990:70:1990:72 | out : SequencedMap [<map.value>] : Object | B.java:1990:57:1990:73 | readMapValue(...) | provenance | MaD:209 |
 | B.java:1995:25:1995:61 | (...)... : SequencedMap [<map.value>] : Object | B.java:1995:70:1995:71 | in : SequencedMap [<map.value>] : Object | provenance |  |
 | B.java:1995:39:1995:61 | storeMapValue(...) : Map [<map.value>] : Object | B.java:1995:25:1995:61 | (...)... : SequencedMap [<map.value>] : Object | provenance |  |
 | B.java:1995:53:1995:60 | source(...) : Object | B.java:41:39:41:43 | obj : Object | provenance |  |
-| B.java:1995:53:1995:60 | source(...) : Object | B.java:1995:39:1995:61 | storeMapValue(...) : Map [<map.value>] : Object | provenance | MaD:210 |
-| B.java:1995:70:1995:71 | in : SequencedMap [<map.value>] : Object | B.java:1995:70:1995:82 | reversed(...) : SequencedMap [<map.value>] : Object | provenance | MaD:292 |
+| B.java:1995:53:1995:60 | source(...) : Object | B.java:1995:39:1995:61 | storeMapValue(...) : Map [<map.value>] : Object | provenance | MaD:215 |
+| B.java:1995:70:1995:71 | in : SequencedMap [<map.value>] : Object | B.java:1995:70:1995:82 | reversed(...) : SequencedMap [<map.value>] : Object | provenance | MaD:294 |
 | B.java:1995:70:1995:82 | reversed(...) : SequencedMap [<map.value>] : Object | B.java:1995:103:1995:105 | out : SequencedMap [<map.value>] : Object | provenance |  |
 | B.java:1995:103:1995:105 | out : SequencedMap [<map.value>] : Object | B.java:48:31:48:42 | obj : SequencedMap [<map.value>] : Object | provenance |  |
-| B.java:1995:103:1995:105 | out : SequencedMap [<map.value>] : Object | B.java:1995:90:1995:106 | readMapValue(...) | provenance | MaD:181 |
+| B.java:1995:103:1995:105 | out : SequencedMap [<map.value>] : Object | B.java:1995:90:1995:106 | readMapValue(...) | provenance | MaD:209 |
 | B.java:2000:25:2000:61 | (...)... : SequencedMap [<map.value>] : Object | B.java:2000:70:2000:71 | in : SequencedMap [<map.value>] : Object | provenance |  |
 | B.java:2000:39:2000:61 | storeMapValue(...) : Map [<map.value>] : Object | B.java:2000:25:2000:61 | (...)... : SequencedMap [<map.value>] : Object | provenance |  |
 | B.java:2000:53:2000:60 | source(...) : Object | B.java:41:39:41:43 | obj : Object | provenance |  |
-| B.java:2000:53:2000:60 | source(...) : Object | B.java:2000:39:2000:61 | storeMapValue(...) : Map [<map.value>] : Object | provenance | MaD:210 |
-| B.java:2000:70:2000:71 | in : SequencedMap [<map.value>] : Object | B.java:2000:70:2000:91 | sequencedEntrySet(...) : SequencedSet [<element>, <map.value>] : Object | provenance | MaD:294 |
+| B.java:2000:53:2000:60 | source(...) : Object | B.java:2000:39:2000:61 | storeMapValue(...) : Map [<map.value>] : Object | provenance | MaD:215 |
+| B.java:2000:70:2000:71 | in : SequencedMap [<map.value>] : Object | B.java:2000:70:2000:91 | sequencedEntrySet(...) : SequencedSet [<element>, <map.value>] : Object | provenance | MaD:296 |
 | B.java:2000:70:2000:91 | sequencedEntrySet(...) : SequencedSet [<element>, <map.value>] : Object | B.java:2000:124:2000:126 | out : SequencedSet [<element>, <map.value>] : Object | provenance |  |
 | B.java:2000:112:2000:127 | readElement(...) : Entry [<map.value>] : Object | B.java:47:31:47:48 | obj : Entry [<map.value>] : Object | provenance |  |
-| B.java:2000:112:2000:127 | readElement(...) : Entry [<map.value>] : Object | B.java:2000:99:2000:128 | readMapValue(...) | provenance | MaD:224 |
+| B.java:2000:112:2000:127 | readElement(...) : Entry [<map.value>] : Object | B.java:2000:99:2000:128 | readMapValue(...) | provenance | MaD:175 |
 | B.java:2000:124:2000:126 | out : SequencedSet [<element>, <map.value>] : Object | B.java:31:28:31:42 | obj : SequencedSet [<element>, <map.value>] : Object | provenance |  |
-| B.java:2000:124:2000:126 | out : SequencedSet [<element>, <map.value>] : Object | B.java:2000:112:2000:127 | readElement(...) : Entry [<map.value>] : Object | provenance | MaD:1 |
+| B.java:2000:124:2000:126 | out : SequencedSet [<element>, <map.value>] : Object | B.java:2000:112:2000:127 | readElement(...) : Entry [<map.value>] : Object | provenance | MaD:3 |
 | B.java:2005:25:2005:59 | (...)... : TreeMap [<map.key>] : Object | B.java:2005:68:2005:69 | in : TreeMap [<map.key>] : Object | provenance |  |
 | B.java:2005:39:2005:59 | storeMapKey(...) : TreeMap [<map.key>] : Object | B.java:2005:25:2005:59 | (...)... : TreeMap [<map.key>] : Object | provenance |  |
 | B.java:2005:51:2005:58 | source(...) : Object | B.java:38:37:38:41 | obj : Object | provenance |  |
-| B.java:2005:51:2005:58 | source(...) : Object | B.java:2005:39:2005:59 | storeMapKey(...) : TreeMap [<map.key>] : Object | provenance | MaD:209 |
-| B.java:2005:68:2005:69 | in : TreeMap [<map.key>] : Object | B.java:2005:68:2005:87 | sequencedKeySet(...) : SequencedSet [<element>] : Object | provenance | MaD:295 |
+| B.java:2005:51:2005:58 | source(...) : Object | B.java:2005:39:2005:59 | storeMapKey(...) : TreeMap [<map.key>] : Object | provenance | MaD:214 |
+| B.java:2005:68:2005:69 | in : TreeMap [<map.key>] : Object | B.java:2005:68:2005:87 | sequencedKeySet(...) : SequencedSet [<element>] : Object | provenance | MaD:297 |
 | B.java:2005:68:2005:87 | sequencedKeySet(...) : SequencedSet [<element>] : Object | B.java:2005:107:2005:109 | out : SequencedSet [<element>] : Object | provenance |  |
 | B.java:2005:107:2005:109 | out : SequencedSet [<element>] : Object | B.java:31:28:31:42 | obj : SequencedSet [<element>] : Object | provenance |  |
-| B.java:2005:107:2005:109 | out : SequencedSet [<element>] : Object | B.java:2005:95:2005:110 | readElement(...) | provenance | MaD:1 |
+| B.java:2005:107:2005:109 | out : SequencedSet [<element>] : Object | B.java:2005:95:2005:110 | readElement(...) | provenance | MaD:3 |
 | B.java:2010:25:2010:61 | (...)... : SequencedMap [<map.value>] : Object | B.java:2010:70:2010:71 | in : SequencedMap [<map.value>] : Object | provenance |  |
 | B.java:2010:39:2010:61 | storeMapValue(...) : Map [<map.value>] : Object | B.java:2010:25:2010:61 | (...)... : SequencedMap [<map.value>] : Object | provenance |  |
 | B.java:2010:53:2010:60 | source(...) : Object | B.java:41:39:41:43 | obj : Object | provenance |  |
-| B.java:2010:53:2010:60 | source(...) : Object | B.java:2010:39:2010:61 | storeMapValue(...) : Map [<map.value>] : Object | provenance | MaD:210 |
-| B.java:2010:70:2010:71 | in : SequencedMap [<map.value>] : Object | B.java:2010:70:2010:89 | sequencedValues(...) : SequencedCollection [<element>] : Object | provenance | MaD:296 |
+| B.java:2010:53:2010:60 | source(...) : Object | B.java:2010:39:2010:61 | storeMapValue(...) : Map [<map.value>] : Object | provenance | MaD:215 |
+| B.java:2010:70:2010:71 | in : SequencedMap [<map.value>] : Object | B.java:2010:70:2010:89 | sequencedValues(...) : SequencedCollection [<element>] : Object | provenance | MaD:298 |
 | B.java:2010:70:2010:89 | sequencedValues(...) : SequencedCollection [<element>] : Object | B.java:2010:109:2010:111 | out : SequencedCollection [<element>] : Object | provenance |  |
 | B.java:2010:109:2010:111 | out : SequencedCollection [<element>] : Object | B.java:31:28:31:42 | obj : SequencedCollection [<element>] : Object | provenance |  |
-| B.java:2010:109:2010:111 | out : SequencedCollection [<element>] : Object | B.java:2010:97:2010:112 | readElement(...) | provenance | MaD:1 |
+| B.java:2010:109:2010:111 | out : SequencedCollection [<element>] : Object | B.java:2010:97:2010:112 | readElement(...) | provenance | MaD:3 |
 | B.java:2015:25:2015:52 | storeElementNavSet(...) : TreeSet [<element>] : Object | B.java:2015:61:2015:62 | in : TreeSet [<element>] : Object | provenance |  |
 | B.java:2015:44:2015:51 | source(...) : Object | B.java:26:49:26:53 | obj : Object | provenance |  |
-| B.java:2015:44:2015:51 | source(...) : Object | B.java:2015:25:2015:52 | storeElementNavSet(...) : TreeSet [<element>] : Object | provenance | MaD:52 |
-| B.java:2015:61:2015:62 | in : TreeSet [<element>] : Object | B.java:2015:61:2015:73 | reversed(...) : SequencedSet [<element>] : Object | provenance | MaD:276 |
-| B.java:2015:61:2015:62 | in : TreeSet [<element>] : Object | B.java:2015:61:2015:73 | reversed(...) : SequencedSet [<element>] : Object | provenance | MaD:297 |
+| B.java:2015:44:2015:51 | source(...) : Object | B.java:2015:25:2015:52 | storeElementNavSet(...) : TreeSet [<element>] : Object | provenance | MaD:54 |
+| B.java:2015:61:2015:62 | in : TreeSet [<element>] : Object | B.java:2015:61:2015:73 | reversed(...) : SequencedSet [<element>] : Object | provenance | MaD:278 |
+| B.java:2015:61:2015:62 | in : TreeSet [<element>] : Object | B.java:2015:61:2015:73 | reversed(...) : SequencedSet [<element>] : Object | provenance | MaD:299 |
 | B.java:2015:61:2015:73 | reversed(...) : SequencedSet [<element>] : Object | B.java:2015:93:2015:95 | out : SequencedSet [<element>] : Object | provenance |  |
 | B.java:2015:93:2015:95 | out : SequencedSet [<element>] : Object | B.java:31:28:31:42 | obj : SequencedSet [<element>] : Object | provenance |  |
-| B.java:2015:93:2015:95 | out : SequencedSet [<element>] : Object | B.java:2015:81:2015:96 | readElement(...) | provenance | MaD:1 |
+| B.java:2015:93:2015:95 | out : SequencedSet [<element>] : Object | B.java:2015:81:2015:96 | readElement(...) | provenance | MaD:3 |
 | B.java:2020:32:2020:57 | storeElementList(...) : List [<element>] : Object | B.java:2020:110:2020:111 | in : List [<element>] : Object | provenance |  |
 | B.java:2020:49:2020:56 | source(...) : Object | B.java:24:39:24:43 | obj : Object | provenance |  |
-| B.java:2020:49:2020:56 | source(...) : Object | B.java:2020:32:2020:57 | storeElementList(...) : List [<element>] : Object | provenance | MaD:154 |
+| B.java:2020:49:2020:56 | source(...) : Object | B.java:2020:32:2020:57 | storeElementList(...) : List [<element>] : Object | provenance | MaD:151 |
 | B.java:2020:66:2020:112 | unmodifiableSequencedCollection(...) : SequencedCollection [<element>] : Object | B.java:2020:132:2020:134 | out : SequencedCollection [<element>] : Object | provenance |  |
-| B.java:2020:110:2020:111 | in : List [<element>] : Object | B.java:2020:66:2020:112 | unmodifiableSequencedCollection(...) : SequencedCollection [<element>] : Object | provenance | MaD:100 |
+| B.java:2020:110:2020:111 | in : List [<element>] : Object | B.java:2020:66:2020:112 | unmodifiableSequencedCollection(...) : SequencedCollection [<element>] : Object | provenance | MaD:102 |
 | B.java:2020:132:2020:134 | out : SequencedCollection [<element>] : Object | B.java:31:28:31:42 | obj : SequencedCollection [<element>] : Object | provenance |  |
-| B.java:2020:132:2020:134 | out : SequencedCollection [<element>] : Object | B.java:2020:120:2020:135 | readElement(...) | provenance | MaD:1 |
+| B.java:2020:132:2020:134 | out : SequencedCollection [<element>] : Object | B.java:2020:120:2020:135 | readElement(...) | provenance | MaD:3 |
 | B.java:2025:25:2025:59 | (...)... : TreeMap [<map.key>] : Object | B.java:2025:105:2025:106 | in : TreeMap [<map.key>] : Object | provenance |  |
 | B.java:2025:39:2025:59 | storeMapKey(...) : TreeMap [<map.key>] : Object | B.java:2025:25:2025:59 | (...)... : TreeMap [<map.key>] : Object | provenance |  |
 | B.java:2025:51:2025:58 | source(...) : Object | B.java:38:37:38:41 | obj : Object | provenance |  |
-| B.java:2025:51:2025:58 | source(...) : Object | B.java:2025:39:2025:59 | storeMapKey(...) : TreeMap [<map.key>] : Object | provenance | MaD:209 |
+| B.java:2025:51:2025:58 | source(...) : Object | B.java:2025:39:2025:59 | storeMapKey(...) : TreeMap [<map.key>] : Object | provenance | MaD:214 |
 | B.java:2025:68:2025:107 | unmodifiableSequencedMap(...) : SequencedMap [<map.key>] : Object | B.java:2025:126:2025:128 | out : SequencedMap [<map.key>] : Object | provenance |  |
-| B.java:2025:105:2025:106 | in : TreeMap [<map.key>] : Object | B.java:2025:68:2025:107 | unmodifiableSequencedMap(...) : SequencedMap [<map.key>] : Object | provenance | MaD:101 |
+| B.java:2025:105:2025:106 | in : TreeMap [<map.key>] : Object | B.java:2025:68:2025:107 | unmodifiableSequencedMap(...) : SequencedMap [<map.key>] : Object | provenance | MaD:103 |
 | B.java:2025:126:2025:128 | out : SequencedMap [<map.key>] : Object | B.java:44:29:44:40 | obj : SequencedMap [<map.key>] : Object | provenance |  |
-| B.java:2025:126:2025:128 | out : SequencedMap [<map.key>] : Object | B.java:2025:115:2025:129 | readMapKey(...) | provenance | MaD:184 |
+| B.java:2025:126:2025:128 | out : SequencedMap [<map.key>] : Object | B.java:2025:115:2025:129 | readMapKey(...) | provenance | MaD:212 |
 | B.java:2030:25:2030:61 | (...)... : SequencedMap [<map.value>] : Object | B.java:2030:107:2030:108 | in : SequencedMap [<map.value>] : Object | provenance |  |
 | B.java:2030:39:2030:61 | storeMapValue(...) : Map [<map.value>] : Object | B.java:2030:25:2030:61 | (...)... : SequencedMap [<map.value>] : Object | provenance |  |
 | B.java:2030:53:2030:60 | source(...) : Object | B.java:41:39:41:43 | obj : Object | provenance |  |
-| B.java:2030:53:2030:60 | source(...) : Object | B.java:2030:39:2030:61 | storeMapValue(...) : Map [<map.value>] : Object | provenance | MaD:210 |
+| B.java:2030:53:2030:60 | source(...) : Object | B.java:2030:39:2030:61 | storeMapValue(...) : Map [<map.value>] : Object | provenance | MaD:215 |
 | B.java:2030:70:2030:109 | unmodifiableSequencedMap(...) : SequencedMap [<map.value>] : Object | B.java:2030:130:2030:132 | out : SequencedMap [<map.value>] : Object | provenance |  |
-| B.java:2030:107:2030:108 | in : SequencedMap [<map.value>] : Object | B.java:2030:70:2030:109 | unmodifiableSequencedMap(...) : SequencedMap [<map.value>] : Object | provenance | MaD:102 |
+| B.java:2030:107:2030:108 | in : SequencedMap [<map.value>] : Object | B.java:2030:70:2030:109 | unmodifiableSequencedMap(...) : SequencedMap [<map.value>] : Object | provenance | MaD:104 |
 | B.java:2030:130:2030:132 | out : SequencedMap [<map.value>] : Object | B.java:48:31:48:42 | obj : SequencedMap [<map.value>] : Object | provenance |  |
-| B.java:2030:130:2030:132 | out : SequencedMap [<map.value>] : Object | B.java:2030:117:2030:133 | readMapValue(...) | provenance | MaD:181 |
+| B.java:2030:130:2030:132 | out : SequencedMap [<map.value>] : Object | B.java:2030:117:2030:133 | readMapValue(...) | provenance | MaD:209 |
 | B.java:2035:25:2035:52 | storeElementNavSet(...) : TreeSet [<element>] : Object | B.java:2035:98:2035:99 | in : TreeSet [<element>] : Object | provenance |  |
 | B.java:2035:44:2035:51 | source(...) : Object | B.java:26:49:26:53 | obj : Object | provenance |  |
-| B.java:2035:44:2035:51 | source(...) : Object | B.java:2035:25:2035:52 | storeElementNavSet(...) : TreeSet [<element>] : Object | provenance | MaD:52 |
+| B.java:2035:44:2035:51 | source(...) : Object | B.java:2035:25:2035:52 | storeElementNavSet(...) : TreeSet [<element>] : Object | provenance | MaD:54 |
 | B.java:2035:61:2035:100 | unmodifiableSequencedSet(...) : SequencedSet [<element>] : Object | B.java:2035:120:2035:122 | out : SequencedSet [<element>] : Object | provenance |  |
-| B.java:2035:98:2035:99 | in : TreeSet [<element>] : Object | B.java:2035:61:2035:100 | unmodifiableSequencedSet(...) : SequencedSet [<element>] : Object | provenance | MaD:103 |
+| B.java:2035:98:2035:99 | in : TreeSet [<element>] : Object | B.java:2035:61:2035:100 | unmodifiableSequencedSet(...) : SequencedSet [<element>] : Object | provenance | MaD:105 |
 | B.java:2035:120:2035:122 | out : SequencedSet [<element>] : Object | B.java:31:28:31:42 | obj : SequencedSet [<element>] : Object | provenance |  |
-| B.java:2035:120:2035:122 | out : SequencedSet [<element>] : Object | B.java:2035:108:2035:123 | readElement(...) | provenance | MaD:1 |
+| B.java:2035:120:2035:122 | out : SequencedSet [<element>] : Object | B.java:2035:108:2035:123 | readElement(...) | provenance | MaD:3 |
 | Constructors.java:28:20:28:39 | container : ArrayDeque [<element>] : Object | Constructors.java:28:51:28:59 | container : ArrayDeque [<element>] : Object | provenance |  |
 | Constructors.java:28:20:28:39 | container : ArrayList [<element>] : Object | Constructors.java:28:51:28:59 | container : ArrayList [<element>] : Object | provenance |  |
 | Constructors.java:28:20:28:39 | container : HashSet [<element>] : Object | Constructors.java:28:51:28:59 | container : HashSet [<element>] : Object | provenance |  |
@@ -2789,22 +2789,22 @@ edges
 | Constructors.java:28:20:28:39 | container : PriorityQueue [<element>] : Object | Constructors.java:28:51:28:59 | container : PriorityQueue [<element>] : Object | provenance |  |
 | Constructors.java:28:20:28:39 | container : TreeSet [<element>] : Object | Constructors.java:28:51:28:59 | container : TreeSet [<element>] : Object | provenance |  |
 | Constructors.java:28:20:28:39 | container : Vector [<element>] : Object | Constructors.java:28:51:28:59 | container : Vector [<element>] : Object | provenance |  |
-| Constructors.java:28:51:28:59 | container : ArrayDeque [<element>] : Object | Constructors.java:28:51:28:70 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:1 |
-| Constructors.java:28:51:28:59 | container : ArrayList [<element>] : Object | Constructors.java:28:51:28:70 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:1 |
-| Constructors.java:28:51:28:59 | container : HashSet [<element>] : Object | Constructors.java:28:51:28:70 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:1 |
-| Constructors.java:28:51:28:59 | container : LinkedHashSet [<element>] : Object | Constructors.java:28:51:28:70 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:1 |
-| Constructors.java:28:51:28:59 | container : LinkedList [<element>] : Object | Constructors.java:28:51:28:70 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:1 |
-| Constructors.java:28:51:28:59 | container : PriorityQueue [<element>] : Object | Constructors.java:28:51:28:70 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:1 |
-| Constructors.java:28:51:28:59 | container : TreeSet [<element>] : Object | Constructors.java:28:51:28:70 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:1 |
-| Constructors.java:28:51:28:59 | container : Vector [<element>] : Object | Constructors.java:28:51:28:70 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:1 |
-| Constructors.java:28:51:28:70 | iterator(...) : Iterator [<element>] : Object | Constructors.java:28:51:28:77 | next(...) : Object | provenance | MaD:143 |
-| Constructors.java:28:51:28:70 | iterator(...) : Iterator [<element>] : Object | Constructors.java:28:51:28:77 | next(...) : Object | provenance | MaD:143 |
-| Constructors.java:28:51:28:70 | iterator(...) : Iterator [<element>] : Object | Constructors.java:28:51:28:77 | next(...) : Object | provenance | MaD:143 |
-| Constructors.java:28:51:28:70 | iterator(...) : Iterator [<element>] : Object | Constructors.java:28:51:28:77 | next(...) : Object | provenance | MaD:143 |
-| Constructors.java:28:51:28:70 | iterator(...) : Iterator [<element>] : Object | Constructors.java:28:51:28:77 | next(...) : Object | provenance | MaD:143 |
-| Constructors.java:28:51:28:70 | iterator(...) : Iterator [<element>] : Object | Constructors.java:28:51:28:77 | next(...) : Object | provenance | MaD:143 |
-| Constructors.java:28:51:28:70 | iterator(...) : Iterator [<element>] : Object | Constructors.java:28:51:28:77 | next(...) : Object | provenance | MaD:143 |
-| Constructors.java:28:51:28:70 | iterator(...) : Iterator [<element>] : Object | Constructors.java:28:51:28:77 | next(...) : Object | provenance | MaD:143 |
+| Constructors.java:28:51:28:59 | container : ArrayDeque [<element>] : Object | Constructors.java:28:51:28:70 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:3 |
+| Constructors.java:28:51:28:59 | container : ArrayList [<element>] : Object | Constructors.java:28:51:28:70 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:3 |
+| Constructors.java:28:51:28:59 | container : HashSet [<element>] : Object | Constructors.java:28:51:28:70 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:3 |
+| Constructors.java:28:51:28:59 | container : LinkedHashSet [<element>] : Object | Constructors.java:28:51:28:70 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:3 |
+| Constructors.java:28:51:28:59 | container : LinkedList [<element>] : Object | Constructors.java:28:51:28:70 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:3 |
+| Constructors.java:28:51:28:59 | container : PriorityQueue [<element>] : Object | Constructors.java:28:51:28:70 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:3 |
+| Constructors.java:28:51:28:59 | container : TreeSet [<element>] : Object | Constructors.java:28:51:28:70 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:3 |
+| Constructors.java:28:51:28:59 | container : Vector [<element>] : Object | Constructors.java:28:51:28:70 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:3 |
+| Constructors.java:28:51:28:70 | iterator(...) : Iterator [<element>] : Object | Constructors.java:28:51:28:77 | next(...) : Object | provenance | MaD:145 |
+| Constructors.java:28:51:28:70 | iterator(...) : Iterator [<element>] : Object | Constructors.java:28:51:28:77 | next(...) : Object | provenance | MaD:145 |
+| Constructors.java:28:51:28:70 | iterator(...) : Iterator [<element>] : Object | Constructors.java:28:51:28:77 | next(...) : Object | provenance | MaD:145 |
+| Constructors.java:28:51:28:70 | iterator(...) : Iterator [<element>] : Object | Constructors.java:28:51:28:77 | next(...) : Object | provenance | MaD:145 |
+| Constructors.java:28:51:28:70 | iterator(...) : Iterator [<element>] : Object | Constructors.java:28:51:28:77 | next(...) : Object | provenance | MaD:145 |
+| Constructors.java:28:51:28:70 | iterator(...) : Iterator [<element>] : Object | Constructors.java:28:51:28:77 | next(...) : Object | provenance | MaD:145 |
+| Constructors.java:28:51:28:70 | iterator(...) : Iterator [<element>] : Object | Constructors.java:28:51:28:77 | next(...) : Object | provenance | MaD:145 |
+| Constructors.java:28:51:28:70 | iterator(...) : Iterator [<element>] : Object | Constructors.java:28:51:28:77 | next(...) : Object | provenance | MaD:145 |
 | Constructors.java:29:19:29:31 | container : EnumMap [<map.key>] : Object | Constructors.java:29:43:29:51 | container : EnumMap [<map.key>] : Object | provenance |  |
 | Constructors.java:29:19:29:31 | container : HashMap [<map.key>] : Object | Constructors.java:29:43:29:51 | container : HashMap [<map.key>] : Object | provenance |  |
 | Constructors.java:29:19:29:31 | container : Hashtable [<map.key>] : Object | Constructors.java:29:43:29:51 | container : Hashtable [<map.key>] : Object | provenance |  |
@@ -2812,27 +2812,27 @@ edges
 | Constructors.java:29:19:29:31 | container : LinkedHashMap [<map.key>] : Object | Constructors.java:29:43:29:51 | container : LinkedHashMap [<map.key>] : Object | provenance |  |
 | Constructors.java:29:19:29:31 | container : TreeMap [<map.key>] : Object | Constructors.java:29:43:29:51 | container : TreeMap [<map.key>] : Object | provenance |  |
 | Constructors.java:29:19:29:31 | container : WeakHashMap [<map.key>] : Object | Constructors.java:29:43:29:51 | container : WeakHashMap [<map.key>] : Object | provenance |  |
-| Constructors.java:29:43:29:51 | container : EnumMap [<map.key>] : Object | Constructors.java:29:43:29:60 | keySet(...) : Set [<element>] : Object | provenance | MaD:184 |
-| Constructors.java:29:43:29:51 | container : HashMap [<map.key>] : Object | Constructors.java:29:43:29:60 | keySet(...) : Set [<element>] : Object | provenance | MaD:184 |
-| Constructors.java:29:43:29:51 | container : Hashtable [<map.key>] : Object | Constructors.java:29:43:29:60 | keySet(...) : Set [<element>] : Object | provenance | MaD:184 |
-| Constructors.java:29:43:29:51 | container : IdentityHashMap [<map.key>] : Object | Constructors.java:29:43:29:60 | keySet(...) : Set [<element>] : Object | provenance | MaD:184 |
-| Constructors.java:29:43:29:51 | container : LinkedHashMap [<map.key>] : Object | Constructors.java:29:43:29:60 | keySet(...) : Set [<element>] : Object | provenance | MaD:184 |
-| Constructors.java:29:43:29:51 | container : TreeMap [<map.key>] : Object | Constructors.java:29:43:29:60 | keySet(...) : Set [<element>] : Object | provenance | MaD:184 |
-| Constructors.java:29:43:29:51 | container : WeakHashMap [<map.key>] : Object | Constructors.java:29:43:29:60 | keySet(...) : Set [<element>] : Object | provenance | MaD:184 |
-| Constructors.java:29:43:29:60 | keySet(...) : Set [<element>] : Object | Constructors.java:29:43:29:71 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:1 |
-| Constructors.java:29:43:29:60 | keySet(...) : Set [<element>] : Object | Constructors.java:29:43:29:71 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:1 |
-| Constructors.java:29:43:29:60 | keySet(...) : Set [<element>] : Object | Constructors.java:29:43:29:71 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:1 |
-| Constructors.java:29:43:29:60 | keySet(...) : Set [<element>] : Object | Constructors.java:29:43:29:71 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:1 |
-| Constructors.java:29:43:29:60 | keySet(...) : Set [<element>] : Object | Constructors.java:29:43:29:71 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:1 |
-| Constructors.java:29:43:29:60 | keySet(...) : Set [<element>] : Object | Constructors.java:29:43:29:71 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:1 |
-| Constructors.java:29:43:29:60 | keySet(...) : Set [<element>] : Object | Constructors.java:29:43:29:71 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:1 |
-| Constructors.java:29:43:29:71 | iterator(...) : Iterator [<element>] : Object | Constructors.java:29:43:29:78 | next(...) : Object | provenance | MaD:143 |
-| Constructors.java:29:43:29:71 | iterator(...) : Iterator [<element>] : Object | Constructors.java:29:43:29:78 | next(...) : Object | provenance | MaD:143 |
-| Constructors.java:29:43:29:71 | iterator(...) : Iterator [<element>] : Object | Constructors.java:29:43:29:78 | next(...) : Object | provenance | MaD:143 |
-| Constructors.java:29:43:29:71 | iterator(...) : Iterator [<element>] : Object | Constructors.java:29:43:29:78 | next(...) : Object | provenance | MaD:143 |
-| Constructors.java:29:43:29:71 | iterator(...) : Iterator [<element>] : Object | Constructors.java:29:43:29:78 | next(...) : Object | provenance | MaD:143 |
-| Constructors.java:29:43:29:71 | iterator(...) : Iterator [<element>] : Object | Constructors.java:29:43:29:78 | next(...) : Object | provenance | MaD:143 |
-| Constructors.java:29:43:29:71 | iterator(...) : Iterator [<element>] : Object | Constructors.java:29:43:29:78 | next(...) : Object | provenance | MaD:143 |
+| Constructors.java:29:43:29:51 | container : EnumMap [<map.key>] : Object | Constructors.java:29:43:29:60 | keySet(...) : Set [<element>] : Object | provenance | MaD:212 |
+| Constructors.java:29:43:29:51 | container : HashMap [<map.key>] : Object | Constructors.java:29:43:29:60 | keySet(...) : Set [<element>] : Object | provenance | MaD:212 |
+| Constructors.java:29:43:29:51 | container : Hashtable [<map.key>] : Object | Constructors.java:29:43:29:60 | keySet(...) : Set [<element>] : Object | provenance | MaD:212 |
+| Constructors.java:29:43:29:51 | container : IdentityHashMap [<map.key>] : Object | Constructors.java:29:43:29:60 | keySet(...) : Set [<element>] : Object | provenance | MaD:212 |
+| Constructors.java:29:43:29:51 | container : LinkedHashMap [<map.key>] : Object | Constructors.java:29:43:29:60 | keySet(...) : Set [<element>] : Object | provenance | MaD:212 |
+| Constructors.java:29:43:29:51 | container : TreeMap [<map.key>] : Object | Constructors.java:29:43:29:60 | keySet(...) : Set [<element>] : Object | provenance | MaD:212 |
+| Constructors.java:29:43:29:51 | container : WeakHashMap [<map.key>] : Object | Constructors.java:29:43:29:60 | keySet(...) : Set [<element>] : Object | provenance | MaD:212 |
+| Constructors.java:29:43:29:60 | keySet(...) : Set [<element>] : Object | Constructors.java:29:43:29:71 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:3 |
+| Constructors.java:29:43:29:60 | keySet(...) : Set [<element>] : Object | Constructors.java:29:43:29:71 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:3 |
+| Constructors.java:29:43:29:60 | keySet(...) : Set [<element>] : Object | Constructors.java:29:43:29:71 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:3 |
+| Constructors.java:29:43:29:60 | keySet(...) : Set [<element>] : Object | Constructors.java:29:43:29:71 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:3 |
+| Constructors.java:29:43:29:60 | keySet(...) : Set [<element>] : Object | Constructors.java:29:43:29:71 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:3 |
+| Constructors.java:29:43:29:60 | keySet(...) : Set [<element>] : Object | Constructors.java:29:43:29:71 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:3 |
+| Constructors.java:29:43:29:60 | keySet(...) : Set [<element>] : Object | Constructors.java:29:43:29:71 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:3 |
+| Constructors.java:29:43:29:71 | iterator(...) : Iterator [<element>] : Object | Constructors.java:29:43:29:78 | next(...) : Object | provenance | MaD:145 |
+| Constructors.java:29:43:29:71 | iterator(...) : Iterator [<element>] : Object | Constructors.java:29:43:29:78 | next(...) : Object | provenance | MaD:145 |
+| Constructors.java:29:43:29:71 | iterator(...) : Iterator [<element>] : Object | Constructors.java:29:43:29:78 | next(...) : Object | provenance | MaD:145 |
+| Constructors.java:29:43:29:71 | iterator(...) : Iterator [<element>] : Object | Constructors.java:29:43:29:78 | next(...) : Object | provenance | MaD:145 |
+| Constructors.java:29:43:29:71 | iterator(...) : Iterator [<element>] : Object | Constructors.java:29:43:29:78 | next(...) : Object | provenance | MaD:145 |
+| Constructors.java:29:43:29:71 | iterator(...) : Iterator [<element>] : Object | Constructors.java:29:43:29:78 | next(...) : Object | provenance | MaD:145 |
+| Constructors.java:29:43:29:71 | iterator(...) : Iterator [<element>] : Object | Constructors.java:29:43:29:78 | next(...) : Object | provenance | MaD:145 |
 | Constructors.java:30:21:30:33 | container : EnumMap [<map.value>] : Object | Constructors.java:30:45:30:53 | container : EnumMap [<map.value>] : Object | provenance |  |
 | Constructors.java:30:21:30:33 | container : HashMap [<map.value>] : Object | Constructors.java:30:45:30:53 | container : HashMap [<map.value>] : Object | provenance |  |
 | Constructors.java:30:21:30:33 | container : Hashtable [<map.value>] : Object | Constructors.java:30:45:30:53 | container : Hashtable [<map.value>] : Object | provenance |  |
@@ -2840,236 +2840,236 @@ edges
 | Constructors.java:30:21:30:33 | container : LinkedHashMap [<map.value>] : Object | Constructors.java:30:45:30:53 | container : LinkedHashMap [<map.value>] : Object | provenance |  |
 | Constructors.java:30:21:30:33 | container : TreeMap [<map.value>] : Object | Constructors.java:30:45:30:53 | container : TreeMap [<map.value>] : Object | provenance |  |
 | Constructors.java:30:21:30:33 | container : WeakHashMap [<map.value>] : Object | Constructors.java:30:45:30:53 | container : WeakHashMap [<map.value>] : Object | provenance |  |
-| Constructors.java:30:45:30:53 | container : EnumMap [<map.value>] : Object | Constructors.java:30:45:30:63 | get(...) : Object | provenance | MaD:181 |
-| Constructors.java:30:45:30:53 | container : HashMap [<map.value>] : Object | Constructors.java:30:45:30:63 | get(...) : Object | provenance | MaD:181 |
-| Constructors.java:30:45:30:53 | container : Hashtable [<map.value>] : Object | Constructors.java:30:45:30:63 | get(...) : Object | provenance | MaD:181 |
-| Constructors.java:30:45:30:53 | container : IdentityHashMap [<map.value>] : Object | Constructors.java:30:45:30:63 | get(...) : Object | provenance | MaD:181 |
-| Constructors.java:30:45:30:53 | container : LinkedHashMap [<map.value>] : Object | Constructors.java:30:45:30:63 | get(...) : Object | provenance | MaD:181 |
-| Constructors.java:30:45:30:53 | container : TreeMap [<map.value>] : Object | Constructors.java:30:45:30:63 | get(...) : Object | provenance | MaD:181 |
-| Constructors.java:30:45:30:53 | container : WeakHashMap [<map.value>] : Object | Constructors.java:30:45:30:63 | get(...) : Object | provenance | MaD:181 |
+| Constructors.java:30:45:30:53 | container : EnumMap [<map.value>] : Object | Constructors.java:30:45:30:63 | get(...) : Object | provenance | MaD:209 |
+| Constructors.java:30:45:30:53 | container : HashMap [<map.value>] : Object | Constructors.java:30:45:30:63 | get(...) : Object | provenance | MaD:209 |
+| Constructors.java:30:45:30:53 | container : Hashtable [<map.value>] : Object | Constructors.java:30:45:30:63 | get(...) : Object | provenance | MaD:209 |
+| Constructors.java:30:45:30:53 | container : IdentityHashMap [<map.value>] : Object | Constructors.java:30:45:30:63 | get(...) : Object | provenance | MaD:209 |
+| Constructors.java:30:45:30:53 | container : LinkedHashMap [<map.value>] : Object | Constructors.java:30:45:30:63 | get(...) : Object | provenance | MaD:209 |
+| Constructors.java:30:45:30:53 | container : TreeMap [<map.value>] : Object | Constructors.java:30:45:30:63 | get(...) : Object | provenance | MaD:209 |
+| Constructors.java:30:45:30:53 | container : WeakHashMap [<map.value>] : Object | Constructors.java:30:45:30:63 | get(...) : Object | provenance | MaD:209 |
 | Constructors.java:31:19:31:37 | container : SimpleEntry [<map.key>] : Object | Constructors.java:31:49:31:57 | container : SimpleEntry [<map.key>] : Object | provenance |  |
 | Constructors.java:31:19:31:37 | container : SimpleImmutableEntry [<map.key>] : Object | Constructors.java:31:49:31:57 | container : SimpleImmutableEntry [<map.key>] : Object | provenance |  |
-| Constructors.java:31:49:31:57 | container : SimpleEntry [<map.key>] : Object | Constructors.java:31:49:31:66 | getKey(...) : Object | provenance | MaD:223 |
-| Constructors.java:31:49:31:57 | container : SimpleImmutableEntry [<map.key>] : Object | Constructors.java:31:49:31:66 | getKey(...) : Object | provenance | MaD:223 |
+| Constructors.java:31:49:31:57 | container : SimpleEntry [<map.key>] : Object | Constructors.java:31:49:31:66 | getKey(...) : Object | provenance | MaD:174 |
+| Constructors.java:31:49:31:57 | container : SimpleImmutableEntry [<map.key>] : Object | Constructors.java:31:49:31:66 | getKey(...) : Object | provenance | MaD:174 |
 | Constructors.java:32:21:32:39 | container : SimpleEntry [<map.value>] : Object | Constructors.java:32:51:32:59 | container : SimpleEntry [<map.value>] : Object | provenance |  |
 | Constructors.java:32:21:32:39 | container : SimpleImmutableEntry [<map.value>] : Object | Constructors.java:32:51:32:59 | container : SimpleImmutableEntry [<map.value>] : Object | provenance |  |
-| Constructors.java:32:51:32:59 | container : SimpleEntry [<map.value>] : Object | Constructors.java:32:51:32:70 | getValue(...) : Object | provenance | MaD:224 |
-| Constructors.java:32:51:32:59 | container : SimpleImmutableEntry [<map.value>] : Object | Constructors.java:32:51:32:70 | getValue(...) : Object | provenance | MaD:224 |
+| Constructors.java:32:51:32:59 | container : SimpleEntry [<map.value>] : Object | Constructors.java:32:51:32:70 | getValue(...) : Object | provenance | MaD:175 |
+| Constructors.java:32:51:32:59 | container : SimpleImmutableEntry [<map.value>] : Object | Constructors.java:32:51:32:70 | getValue(...) : Object | provenance | MaD:175 |
 | Constructors.java:41:19:41:61 | new SimpleEntry<>(...) : SimpleEntry [<map.key>] : Object | Constructors.java:42:38:42:39 | in : SimpleEntry [<map.key>] : Object | provenance |  |
-| Constructors.java:41:47:41:54 | source(...) : Object | Constructors.java:41:19:41:61 | new SimpleEntry<>(...) : SimpleEntry [<map.key>] : Object | provenance | MaD:23 |
+| Constructors.java:41:47:41:54 | source(...) : Object | Constructors.java:41:19:41:61 | new SimpleEntry<>(...) : SimpleEntry [<map.key>] : Object | provenance | MaD:25 |
 | Constructors.java:42:10:42:40 | new SimpleEntry<>(...) : SimpleEntry [<map.key>] : Object | Constructors.java:43:19:43:21 | out : SimpleEntry [<map.key>] : Object | provenance |  |
-| Constructors.java:42:38:42:39 | in : SimpleEntry [<map.key>] : Object | Constructors.java:42:10:42:40 | new SimpleEntry<>(...) : SimpleEntry [<map.key>] : Object | provenance | MaD:21 |
+| Constructors.java:42:38:42:39 | in : SimpleEntry [<map.key>] : Object | Constructors.java:42:10:42:40 | new SimpleEntry<>(...) : SimpleEntry [<map.key>] : Object | provenance | MaD:23 |
 | Constructors.java:43:19:43:21 | out : SimpleEntry [<map.key>] : Object | Constructors.java:31:19:31:37 | container : SimpleEntry [<map.key>] : Object | provenance |  |
-| Constructors.java:43:19:43:21 | out : SimpleEntry [<map.key>] : Object | Constructors.java:43:9:43:22 | getMapKey(...) | provenance | MaD:223 |
+| Constructors.java:43:19:43:21 | out : SimpleEntry [<map.key>] : Object | Constructors.java:43:9:43:22 | getMapKey(...) | provenance | MaD:174 |
 | Constructors.java:48:19:48:61 | new SimpleEntry<>(...) : SimpleEntry [<map.value>] : Object | Constructors.java:49:38:49:39 | in : SimpleEntry [<map.value>] : Object | provenance |  |
-| Constructors.java:48:53:48:60 | source(...) : Object | Constructors.java:48:19:48:61 | new SimpleEntry<>(...) : SimpleEntry [<map.value>] : Object | provenance | MaD:24 |
+| Constructors.java:48:53:48:60 | source(...) : Object | Constructors.java:48:19:48:61 | new SimpleEntry<>(...) : SimpleEntry [<map.value>] : Object | provenance | MaD:26 |
 | Constructors.java:49:10:49:40 | new SimpleEntry<>(...) : SimpleEntry [<map.value>] : Object | Constructors.java:50:21:50:23 | out : SimpleEntry [<map.value>] : Object | provenance |  |
-| Constructors.java:49:38:49:39 | in : SimpleEntry [<map.value>] : Object | Constructors.java:49:10:49:40 | new SimpleEntry<>(...) : SimpleEntry [<map.value>] : Object | provenance | MaD:22 |
+| Constructors.java:49:38:49:39 | in : SimpleEntry [<map.value>] : Object | Constructors.java:49:10:49:40 | new SimpleEntry<>(...) : SimpleEntry [<map.value>] : Object | provenance | MaD:24 |
 | Constructors.java:50:21:50:23 | out : SimpleEntry [<map.value>] : Object | Constructors.java:32:21:32:39 | container : SimpleEntry [<map.value>] : Object | provenance |  |
-| Constructors.java:50:21:50:23 | out : SimpleEntry [<map.value>] : Object | Constructors.java:50:9:50:24 | getMapValue(...) | provenance | MaD:224 |
+| Constructors.java:50:21:50:23 | out : SimpleEntry [<map.value>] : Object | Constructors.java:50:9:50:24 | getMapValue(...) | provenance | MaD:175 |
 | Constructors.java:55:16:55:23 | source(...) : Object | Constructors.java:56:38:56:39 | in : Object | provenance |  |
 | Constructors.java:56:10:56:46 | new SimpleEntry<>(...) : SimpleEntry [<map.key>] : Object | Constructors.java:57:19:57:21 | out : SimpleEntry [<map.key>] : Object | provenance |  |
-| Constructors.java:56:38:56:39 | in : Object | Constructors.java:56:10:56:46 | new SimpleEntry<>(...) : SimpleEntry [<map.key>] : Object | provenance | MaD:23 |
+| Constructors.java:56:38:56:39 | in : Object | Constructors.java:56:10:56:46 | new SimpleEntry<>(...) : SimpleEntry [<map.key>] : Object | provenance | MaD:25 |
 | Constructors.java:57:19:57:21 | out : SimpleEntry [<map.key>] : Object | Constructors.java:31:19:31:37 | container : SimpleEntry [<map.key>] : Object | provenance |  |
-| Constructors.java:57:19:57:21 | out : SimpleEntry [<map.key>] : Object | Constructors.java:57:9:57:22 | getMapKey(...) | provenance | MaD:223 |
+| Constructors.java:57:19:57:21 | out : SimpleEntry [<map.key>] : Object | Constructors.java:57:9:57:22 | getMapKey(...) | provenance | MaD:174 |
 | Constructors.java:62:16:62:23 | source(...) : Object | Constructors.java:63:44:63:45 | in : Object | provenance |  |
 | Constructors.java:63:10:63:46 | new SimpleEntry<>(...) : SimpleEntry [<map.value>] : Object | Constructors.java:64:21:64:23 | out : SimpleEntry [<map.value>] : Object | provenance |  |
-| Constructors.java:63:44:63:45 | in : Object | Constructors.java:63:10:63:46 | new SimpleEntry<>(...) : SimpleEntry [<map.value>] : Object | provenance | MaD:24 |
+| Constructors.java:63:44:63:45 | in : Object | Constructors.java:63:10:63:46 | new SimpleEntry<>(...) : SimpleEntry [<map.value>] : Object | provenance | MaD:26 |
 | Constructors.java:64:21:64:23 | out : SimpleEntry [<map.value>] : Object | Constructors.java:32:21:32:39 | container : SimpleEntry [<map.value>] : Object | provenance |  |
-| Constructors.java:64:21:64:23 | out : SimpleEntry [<map.value>] : Object | Constructors.java:64:9:64:24 | getMapValue(...) | provenance | MaD:224 |
+| Constructors.java:64:21:64:23 | out : SimpleEntry [<map.value>] : Object | Constructors.java:64:9:64:24 | getMapValue(...) | provenance | MaD:175 |
 | Constructors.java:69:19:69:61 | new SimpleEntry<>(...) : SimpleEntry [<map.key>] : Object | Constructors.java:70:47:70:48 | in : SimpleEntry [<map.key>] : Object | provenance |  |
-| Constructors.java:69:47:69:54 | source(...) : Object | Constructors.java:69:19:69:61 | new SimpleEntry<>(...) : SimpleEntry [<map.key>] : Object | provenance | MaD:23 |
+| Constructors.java:69:47:69:54 | source(...) : Object | Constructors.java:69:19:69:61 | new SimpleEntry<>(...) : SimpleEntry [<map.key>] : Object | provenance | MaD:25 |
 | Constructors.java:70:10:70:49 | new SimpleImmutableEntry<>(...) : SimpleImmutableEntry [<map.key>] : Object | Constructors.java:71:19:71:21 | out : SimpleImmutableEntry [<map.key>] : Object | provenance |  |
-| Constructors.java:70:47:70:48 | in : SimpleEntry [<map.key>] : Object | Constructors.java:70:10:70:49 | new SimpleImmutableEntry<>(...) : SimpleImmutableEntry [<map.key>] : Object | provenance | MaD:25 |
+| Constructors.java:70:47:70:48 | in : SimpleEntry [<map.key>] : Object | Constructors.java:70:10:70:49 | new SimpleImmutableEntry<>(...) : SimpleImmutableEntry [<map.key>] : Object | provenance | MaD:27 |
 | Constructors.java:71:19:71:21 | out : SimpleImmutableEntry [<map.key>] : Object | Constructors.java:31:19:31:37 | container : SimpleImmutableEntry [<map.key>] : Object | provenance |  |
-| Constructors.java:71:19:71:21 | out : SimpleImmutableEntry [<map.key>] : Object | Constructors.java:71:9:71:22 | getMapKey(...) | provenance | MaD:223 |
+| Constructors.java:71:19:71:21 | out : SimpleImmutableEntry [<map.key>] : Object | Constructors.java:71:9:71:22 | getMapKey(...) | provenance | MaD:174 |
 | Constructors.java:76:19:76:61 | new SimpleEntry<>(...) : SimpleEntry [<map.value>] : Object | Constructors.java:77:47:77:48 | in : SimpleEntry [<map.value>] : Object | provenance |  |
-| Constructors.java:76:53:76:60 | source(...) : Object | Constructors.java:76:19:76:61 | new SimpleEntry<>(...) : SimpleEntry [<map.value>] : Object | provenance | MaD:24 |
+| Constructors.java:76:53:76:60 | source(...) : Object | Constructors.java:76:19:76:61 | new SimpleEntry<>(...) : SimpleEntry [<map.value>] : Object | provenance | MaD:26 |
 | Constructors.java:77:10:77:49 | new SimpleImmutableEntry<>(...) : SimpleImmutableEntry [<map.value>] : Object | Constructors.java:78:21:78:23 | out : SimpleImmutableEntry [<map.value>] : Object | provenance |  |
-| Constructors.java:77:47:77:48 | in : SimpleEntry [<map.value>] : Object | Constructors.java:77:10:77:49 | new SimpleImmutableEntry<>(...) : SimpleImmutableEntry [<map.value>] : Object | provenance | MaD:26 |
+| Constructors.java:77:47:77:48 | in : SimpleEntry [<map.value>] : Object | Constructors.java:77:10:77:49 | new SimpleImmutableEntry<>(...) : SimpleImmutableEntry [<map.value>] : Object | provenance | MaD:28 |
 | Constructors.java:78:21:78:23 | out : SimpleImmutableEntry [<map.value>] : Object | Constructors.java:32:21:32:39 | container : SimpleImmutableEntry [<map.value>] : Object | provenance |  |
-| Constructors.java:78:21:78:23 | out : SimpleImmutableEntry [<map.value>] : Object | Constructors.java:78:9:78:24 | getMapValue(...) | provenance | MaD:224 |
+| Constructors.java:78:21:78:23 | out : SimpleImmutableEntry [<map.value>] : Object | Constructors.java:78:9:78:24 | getMapValue(...) | provenance | MaD:175 |
 | Constructors.java:83:20:83:36 | of(...) : List [<element>] : Object | Constructors.java:84:25:84:26 | in : List [<element>] : Object | provenance |  |
-| Constructors.java:83:28:83:35 | source(...) : Object | Constructors.java:83:20:83:36 | of(...) : List [<element>] : Object | provenance | MaD:154 |
+| Constructors.java:83:28:83:35 | source(...) : Object | Constructors.java:83:20:83:36 | of(...) : List [<element>] : Object | provenance | MaD:151 |
 | Constructors.java:84:10:84:27 | new ArrayDeque<>(...) : ArrayDeque [<element>] : Object | Constructors.java:85:20:85:22 | out : ArrayDeque [<element>] : Object | provenance |  |
-| Constructors.java:84:25:84:26 | in : List [<element>] : Object | Constructors.java:84:10:84:27 | new ArrayDeque<>(...) : ArrayDeque [<element>] : Object | provenance | MaD:27 |
+| Constructors.java:84:25:84:26 | in : List [<element>] : Object | Constructors.java:84:10:84:27 | new ArrayDeque<>(...) : ArrayDeque [<element>] : Object | provenance | MaD:29 |
 | Constructors.java:85:20:85:22 | out : ArrayDeque [<element>] : Object | Constructors.java:28:20:28:39 | container : ArrayDeque [<element>] : Object | provenance |  |
-| Constructors.java:85:20:85:22 | out : ArrayDeque [<element>] : Object | Constructors.java:85:9:85:23 | getElement(...) | provenance | MaD:1 |
+| Constructors.java:85:20:85:22 | out : ArrayDeque [<element>] : Object | Constructors.java:85:9:85:23 | getElement(...) | provenance | MaD:3 |
 | Constructors.java:90:20:90:36 | of(...) : List [<element>] : Object | Constructors.java:91:24:91:25 | in : List [<element>] : Object | provenance |  |
-| Constructors.java:90:28:90:35 | source(...) : Object | Constructors.java:90:20:90:36 | of(...) : List [<element>] : Object | provenance | MaD:154 |
+| Constructors.java:90:28:90:35 | source(...) : Object | Constructors.java:90:20:90:36 | of(...) : List [<element>] : Object | provenance | MaD:151 |
 | Constructors.java:91:10:91:26 | new ArrayList<>(...) : ArrayList [<element>] : Object | Constructors.java:92:20:92:22 | out : ArrayList [<element>] : Object | provenance |  |
-| Constructors.java:91:24:91:25 | in : List [<element>] : Object | Constructors.java:91:10:91:26 | new ArrayList<>(...) : ArrayList [<element>] : Object | provenance | MaD:28 |
+| Constructors.java:91:24:91:25 | in : List [<element>] : Object | Constructors.java:91:10:91:26 | new ArrayList<>(...) : ArrayList [<element>] : Object | provenance | MaD:30 |
 | Constructors.java:92:20:92:22 | out : ArrayList [<element>] : Object | Constructors.java:28:20:28:39 | container : ArrayList [<element>] : Object | provenance |  |
-| Constructors.java:92:20:92:22 | out : ArrayList [<element>] : Object | Constructors.java:92:9:92:23 | getElement(...) | provenance | MaD:1 |
+| Constructors.java:92:20:92:22 | out : ArrayList [<element>] : Object | Constructors.java:92:9:92:23 | getElement(...) | provenance | MaD:3 |
 | Constructors.java:97:17:97:51 | new EnumMap<>(...) : EnumMap [<map.key>] : Object | Constructors.java:98:22:98:23 | in : EnumMap [<map.key>] : Object | provenance |  |
-| Constructors.java:97:29:97:50 | of(...) : Map [<map.key>] : Object | Constructors.java:97:17:97:51 | new EnumMap<>(...) : EnumMap [<map.key>] : Object | provenance | MaD:132 |
-| Constructors.java:97:36:97:43 | source(...) : Object | Constructors.java:97:29:97:50 | of(...) : Map [<map.key>] : Object | provenance | MaD:186 |
+| Constructors.java:97:29:97:50 | of(...) : Map [<map.key>] : Object | Constructors.java:97:17:97:51 | new EnumMap<>(...) : EnumMap [<map.key>] : Object | provenance | MaD:134 |
+| Constructors.java:97:36:97:43 | source(...) : Object | Constructors.java:97:29:97:50 | of(...) : Map [<map.key>] : Object | provenance | MaD:182 |
 | Constructors.java:98:10:98:24 | new EnumMap<>(...) : EnumMap [<map.key>] : Object | Constructors.java:99:19:99:21 | out : EnumMap [<map.key>] : Object | provenance |  |
-| Constructors.java:98:22:98:23 | in : EnumMap [<map.key>] : Object | Constructors.java:98:10:98:24 | new EnumMap<>(...) : EnumMap [<map.key>] : Object | provenance | MaD:130 |
+| Constructors.java:98:22:98:23 | in : EnumMap [<map.key>] : Object | Constructors.java:98:10:98:24 | new EnumMap<>(...) : EnumMap [<map.key>] : Object | provenance | MaD:132 |
 | Constructors.java:99:19:99:21 | out : EnumMap [<map.key>] : Object | Constructors.java:29:19:29:31 | container : EnumMap [<map.key>] : Object | provenance |  |
-| Constructors.java:99:19:99:21 | out : EnumMap [<map.key>] : Object | Constructors.java:99:9:99:22 | getMapKey(...) | provenance | MaD:184 |
+| Constructors.java:99:19:99:21 | out : EnumMap [<map.key>] : Object | Constructors.java:99:9:99:22 | getMapKey(...) | provenance | MaD:212 |
 | Constructors.java:104:17:104:51 | new EnumMap<>(...) : EnumMap [<map.value>] : Object | Constructors.java:105:22:105:23 | in : EnumMap [<map.value>] : Object | provenance |  |
-| Constructors.java:104:29:104:50 | of(...) : Map [<map.value>] : Object | Constructors.java:104:17:104:51 | new EnumMap<>(...) : EnumMap [<map.value>] : Object | provenance | MaD:133 |
-| Constructors.java:104:42:104:49 | source(...) : Object | Constructors.java:104:29:104:50 | of(...) : Map [<map.value>] : Object | provenance | MaD:197 |
+| Constructors.java:104:29:104:50 | of(...) : Map [<map.value>] : Object | Constructors.java:104:17:104:51 | new EnumMap<>(...) : EnumMap [<map.value>] : Object | provenance | MaD:135 |
+| Constructors.java:104:42:104:49 | source(...) : Object | Constructors.java:104:29:104:50 | of(...) : Map [<map.value>] : Object | provenance | MaD:193 |
 | Constructors.java:105:10:105:24 | new EnumMap<>(...) : EnumMap [<map.value>] : Object | Constructors.java:106:21:106:23 | out : EnumMap [<map.value>] : Object | provenance |  |
-| Constructors.java:105:22:105:23 | in : EnumMap [<map.value>] : Object | Constructors.java:105:10:105:24 | new EnumMap<>(...) : EnumMap [<map.value>] : Object | provenance | MaD:131 |
+| Constructors.java:105:22:105:23 | in : EnumMap [<map.value>] : Object | Constructors.java:105:10:105:24 | new EnumMap<>(...) : EnumMap [<map.value>] : Object | provenance | MaD:133 |
 | Constructors.java:106:21:106:23 | out : EnumMap [<map.value>] : Object | Constructors.java:30:21:30:33 | container : EnumMap [<map.value>] : Object | provenance |  |
-| Constructors.java:106:21:106:23 | out : EnumMap [<map.value>] : Object | Constructors.java:106:9:106:24 | getMapValue(...) | provenance | MaD:181 |
+| Constructors.java:106:21:106:23 | out : EnumMap [<map.value>] : Object | Constructors.java:106:9:106:24 | getMapValue(...) | provenance | MaD:209 |
 | Constructors.java:111:13:111:34 | of(...) : Map [<map.key>] : Object | Constructors.java:112:22:112:23 | in : Map [<map.key>] : Object | provenance |  |
-| Constructors.java:111:20:111:27 | source(...) : Object | Constructors.java:111:13:111:34 | of(...) : Map [<map.key>] : Object | provenance | MaD:186 |
+| Constructors.java:111:20:111:27 | source(...) : Object | Constructors.java:111:13:111:34 | of(...) : Map [<map.key>] : Object | provenance | MaD:182 |
 | Constructors.java:112:10:112:24 | new EnumMap<>(...) : EnumMap [<map.key>] : Object | Constructors.java:113:19:113:21 | out : EnumMap [<map.key>] : Object | provenance |  |
-| Constructors.java:112:22:112:23 | in : Map [<map.key>] : Object | Constructors.java:112:10:112:24 | new EnumMap<>(...) : EnumMap [<map.key>] : Object | provenance | MaD:132 |
+| Constructors.java:112:22:112:23 | in : Map [<map.key>] : Object | Constructors.java:112:10:112:24 | new EnumMap<>(...) : EnumMap [<map.key>] : Object | provenance | MaD:134 |
 | Constructors.java:113:19:113:21 | out : EnumMap [<map.key>] : Object | Constructors.java:29:19:29:31 | container : EnumMap [<map.key>] : Object | provenance |  |
-| Constructors.java:113:19:113:21 | out : EnumMap [<map.key>] : Object | Constructors.java:113:9:113:22 | getMapKey(...) | provenance | MaD:184 |
+| Constructors.java:113:19:113:21 | out : EnumMap [<map.key>] : Object | Constructors.java:113:9:113:22 | getMapKey(...) | provenance | MaD:212 |
 | Constructors.java:118:13:118:34 | of(...) : Map [<map.value>] : Object | Constructors.java:119:22:119:23 | in : Map [<map.value>] : Object | provenance |  |
-| Constructors.java:118:26:118:33 | source(...) : Object | Constructors.java:118:13:118:34 | of(...) : Map [<map.value>] : Object | provenance | MaD:197 |
+| Constructors.java:118:26:118:33 | source(...) : Object | Constructors.java:118:13:118:34 | of(...) : Map [<map.value>] : Object | provenance | MaD:193 |
 | Constructors.java:119:10:119:24 | new EnumMap<>(...) : EnumMap [<map.value>] : Object | Constructors.java:120:21:120:23 | out : EnumMap [<map.value>] : Object | provenance |  |
-| Constructors.java:119:22:119:23 | in : Map [<map.value>] : Object | Constructors.java:119:10:119:24 | new EnumMap<>(...) : EnumMap [<map.value>] : Object | provenance | MaD:133 |
+| Constructors.java:119:22:119:23 | in : Map [<map.value>] : Object | Constructors.java:119:10:119:24 | new EnumMap<>(...) : EnumMap [<map.value>] : Object | provenance | MaD:135 |
 | Constructors.java:120:21:120:23 | out : EnumMap [<map.value>] : Object | Constructors.java:30:21:30:33 | container : EnumMap [<map.value>] : Object | provenance |  |
-| Constructors.java:120:21:120:23 | out : EnumMap [<map.value>] : Object | Constructors.java:120:9:120:24 | getMapValue(...) | provenance | MaD:181 |
+| Constructors.java:120:21:120:23 | out : EnumMap [<map.value>] : Object | Constructors.java:120:9:120:24 | getMapValue(...) | provenance | MaD:209 |
 | Constructors.java:125:13:125:34 | of(...) : Map [<map.key>] : Object | Constructors.java:126:22:126:23 | in : Map [<map.key>] : Object | provenance |  |
-| Constructors.java:125:20:125:27 | source(...) : Object | Constructors.java:125:13:125:34 | of(...) : Map [<map.key>] : Object | provenance | MaD:186 |
+| Constructors.java:125:20:125:27 | source(...) : Object | Constructors.java:125:13:125:34 | of(...) : Map [<map.key>] : Object | provenance | MaD:182 |
 | Constructors.java:126:10:126:24 | new HashMap<>(...) : HashMap [<map.key>] : Object | Constructors.java:127:19:127:21 | out : HashMap [<map.key>] : Object | provenance |  |
-| Constructors.java:126:22:126:23 | in : Map [<map.key>] : Object | Constructors.java:126:10:126:24 | new HashMap<>(...) : HashMap [<map.key>] : Object | provenance | MaD:136 |
+| Constructors.java:126:22:126:23 | in : Map [<map.key>] : Object | Constructors.java:126:10:126:24 | new HashMap<>(...) : HashMap [<map.key>] : Object | provenance | MaD:138 |
 | Constructors.java:127:19:127:21 | out : HashMap [<map.key>] : Object | Constructors.java:29:19:29:31 | container : HashMap [<map.key>] : Object | provenance |  |
-| Constructors.java:127:19:127:21 | out : HashMap [<map.key>] : Object | Constructors.java:127:9:127:22 | getMapKey(...) | provenance | MaD:184 |
+| Constructors.java:127:19:127:21 | out : HashMap [<map.key>] : Object | Constructors.java:127:9:127:22 | getMapKey(...) | provenance | MaD:212 |
 | Constructors.java:132:13:132:34 | of(...) : Map [<map.value>] : Object | Constructors.java:133:22:133:23 | in : Map [<map.value>] : Object | provenance |  |
-| Constructors.java:132:26:132:33 | source(...) : Object | Constructors.java:132:13:132:34 | of(...) : Map [<map.value>] : Object | provenance | MaD:197 |
+| Constructors.java:132:26:132:33 | source(...) : Object | Constructors.java:132:13:132:34 | of(...) : Map [<map.value>] : Object | provenance | MaD:193 |
 | Constructors.java:133:10:133:24 | new HashMap<>(...) : HashMap [<map.value>] : Object | Constructors.java:134:21:134:23 | out : HashMap [<map.value>] : Object | provenance |  |
-| Constructors.java:133:22:133:23 | in : Map [<map.value>] : Object | Constructors.java:133:10:133:24 | new HashMap<>(...) : HashMap [<map.value>] : Object | provenance | MaD:137 |
+| Constructors.java:133:22:133:23 | in : Map [<map.value>] : Object | Constructors.java:133:10:133:24 | new HashMap<>(...) : HashMap [<map.value>] : Object | provenance | MaD:139 |
 | Constructors.java:134:21:134:23 | out : HashMap [<map.value>] : Object | Constructors.java:30:21:30:33 | container : HashMap [<map.value>] : Object | provenance |  |
-| Constructors.java:134:21:134:23 | out : HashMap [<map.value>] : Object | Constructors.java:134:9:134:24 | getMapValue(...) | provenance | MaD:181 |
+| Constructors.java:134:21:134:23 | out : HashMap [<map.value>] : Object | Constructors.java:134:9:134:24 | getMapValue(...) | provenance | MaD:209 |
 | Constructors.java:139:20:139:36 | of(...) : List [<element>] : Object | Constructors.java:140:22:140:23 | in : List [<element>] : Object | provenance |  |
-| Constructors.java:139:28:139:35 | source(...) : Object | Constructors.java:139:20:139:36 | of(...) : List [<element>] : Object | provenance | MaD:154 |
+| Constructors.java:139:28:139:35 | source(...) : Object | Constructors.java:139:20:139:36 | of(...) : List [<element>] : Object | provenance | MaD:151 |
 | Constructors.java:140:10:140:24 | new HashSet<>(...) : HashSet [<element>] : Object | Constructors.java:141:20:141:22 | out : HashSet [<element>] : Object | provenance |  |
-| Constructors.java:140:22:140:23 | in : List [<element>] : Object | Constructors.java:140:10:140:24 | new HashSet<>(...) : HashSet [<element>] : Object | provenance | MaD:138 |
+| Constructors.java:140:22:140:23 | in : List [<element>] : Object | Constructors.java:140:10:140:24 | new HashSet<>(...) : HashSet [<element>] : Object | provenance | MaD:140 |
 | Constructors.java:141:20:141:22 | out : HashSet [<element>] : Object | Constructors.java:28:20:28:39 | container : HashSet [<element>] : Object | provenance |  |
-| Constructors.java:141:20:141:22 | out : HashSet [<element>] : Object | Constructors.java:141:9:141:23 | getElement(...) | provenance | MaD:1 |
+| Constructors.java:141:20:141:22 | out : HashSet [<element>] : Object | Constructors.java:141:9:141:23 | getElement(...) | provenance | MaD:3 |
 | Constructors.java:146:13:146:34 | of(...) : Map [<map.key>] : Object | Constructors.java:147:24:147:25 | in : Map [<map.key>] : Object | provenance |  |
-| Constructors.java:146:20:146:27 | source(...) : Object | Constructors.java:146:13:146:34 | of(...) : Map [<map.key>] : Object | provenance | MaD:186 |
+| Constructors.java:146:20:146:27 | source(...) : Object | Constructors.java:146:13:146:34 | of(...) : Map [<map.key>] : Object | provenance | MaD:182 |
 | Constructors.java:147:10:147:26 | new Hashtable<>(...) : Hashtable [<map.key>] : Object | Constructors.java:148:19:148:21 | out : Hashtable [<map.key>] : Object | provenance |  |
-| Constructors.java:147:24:147:25 | in : Map [<map.key>] : Object | Constructors.java:147:10:147:26 | new Hashtable<>(...) : Hashtable [<map.key>] : Object | provenance | MaD:139 |
+| Constructors.java:147:24:147:25 | in : Map [<map.key>] : Object | Constructors.java:147:10:147:26 | new Hashtable<>(...) : Hashtable [<map.key>] : Object | provenance | MaD:141 |
 | Constructors.java:148:19:148:21 | out : Hashtable [<map.key>] : Object | Constructors.java:29:19:29:31 | container : Hashtable [<map.key>] : Object | provenance |  |
-| Constructors.java:148:19:148:21 | out : Hashtable [<map.key>] : Object | Constructors.java:148:9:148:22 | getMapKey(...) | provenance | MaD:184 |
+| Constructors.java:148:19:148:21 | out : Hashtable [<map.key>] : Object | Constructors.java:148:9:148:22 | getMapKey(...) | provenance | MaD:212 |
 | Constructors.java:153:13:153:34 | of(...) : Map [<map.value>] : Object | Constructors.java:154:24:154:25 | in : Map [<map.value>] : Object | provenance |  |
-| Constructors.java:153:26:153:33 | source(...) : Object | Constructors.java:153:13:153:34 | of(...) : Map [<map.value>] : Object | provenance | MaD:197 |
+| Constructors.java:153:26:153:33 | source(...) : Object | Constructors.java:153:13:153:34 | of(...) : Map [<map.value>] : Object | provenance | MaD:193 |
 | Constructors.java:154:10:154:26 | new Hashtable<>(...) : Hashtable [<map.value>] : Object | Constructors.java:155:21:155:23 | out : Hashtable [<map.value>] : Object | provenance |  |
-| Constructors.java:154:24:154:25 | in : Map [<map.value>] : Object | Constructors.java:154:10:154:26 | new Hashtable<>(...) : Hashtable [<map.value>] : Object | provenance | MaD:140 |
+| Constructors.java:154:24:154:25 | in : Map [<map.value>] : Object | Constructors.java:154:10:154:26 | new Hashtable<>(...) : Hashtable [<map.value>] : Object | provenance | MaD:142 |
 | Constructors.java:155:21:155:23 | out : Hashtable [<map.value>] : Object | Constructors.java:30:21:30:33 | container : Hashtable [<map.value>] : Object | provenance |  |
-| Constructors.java:155:21:155:23 | out : Hashtable [<map.value>] : Object | Constructors.java:155:9:155:24 | getMapValue(...) | provenance | MaD:181 |
+| Constructors.java:155:21:155:23 | out : Hashtable [<map.value>] : Object | Constructors.java:155:9:155:24 | getMapValue(...) | provenance | MaD:209 |
 | Constructors.java:160:13:160:34 | of(...) : Map [<map.key>] : Object | Constructors.java:161:30:161:31 | in : Map [<map.key>] : Object | provenance |  |
-| Constructors.java:160:20:160:27 | source(...) : Object | Constructors.java:160:13:160:34 | of(...) : Map [<map.key>] : Object | provenance | MaD:186 |
+| Constructors.java:160:20:160:27 | source(...) : Object | Constructors.java:160:13:160:34 | of(...) : Map [<map.key>] : Object | provenance | MaD:182 |
 | Constructors.java:161:10:161:32 | new IdentityHashMap<>(...) : IdentityHashMap [<map.key>] : Object | Constructors.java:162:19:162:21 | out : IdentityHashMap [<map.key>] : Object | provenance |  |
-| Constructors.java:161:30:161:31 | in : Map [<map.key>] : Object | Constructors.java:161:10:161:32 | new IdentityHashMap<>(...) : IdentityHashMap [<map.key>] : Object | provenance | MaD:141 |
+| Constructors.java:161:30:161:31 | in : Map [<map.key>] : Object | Constructors.java:161:10:161:32 | new IdentityHashMap<>(...) : IdentityHashMap [<map.key>] : Object | provenance | MaD:143 |
 | Constructors.java:162:19:162:21 | out : IdentityHashMap [<map.key>] : Object | Constructors.java:29:19:29:31 | container : IdentityHashMap [<map.key>] : Object | provenance |  |
-| Constructors.java:162:19:162:21 | out : IdentityHashMap [<map.key>] : Object | Constructors.java:162:9:162:22 | getMapKey(...) | provenance | MaD:184 |
+| Constructors.java:162:19:162:21 | out : IdentityHashMap [<map.key>] : Object | Constructors.java:162:9:162:22 | getMapKey(...) | provenance | MaD:212 |
 | Constructors.java:167:13:167:34 | of(...) : Map [<map.value>] : Object | Constructors.java:168:30:168:31 | in : Map [<map.value>] : Object | provenance |  |
-| Constructors.java:167:26:167:33 | source(...) : Object | Constructors.java:167:13:167:34 | of(...) : Map [<map.value>] : Object | provenance | MaD:197 |
+| Constructors.java:167:26:167:33 | source(...) : Object | Constructors.java:167:13:167:34 | of(...) : Map [<map.value>] : Object | provenance | MaD:193 |
 | Constructors.java:168:10:168:32 | new IdentityHashMap<>(...) : IdentityHashMap [<map.value>] : Object | Constructors.java:169:21:169:23 | out : IdentityHashMap [<map.value>] : Object | provenance |  |
-| Constructors.java:168:30:168:31 | in : Map [<map.value>] : Object | Constructors.java:168:10:168:32 | new IdentityHashMap<>(...) : IdentityHashMap [<map.value>] : Object | provenance | MaD:142 |
+| Constructors.java:168:30:168:31 | in : Map [<map.value>] : Object | Constructors.java:168:10:168:32 | new IdentityHashMap<>(...) : IdentityHashMap [<map.value>] : Object | provenance | MaD:144 |
 | Constructors.java:169:21:169:23 | out : IdentityHashMap [<map.value>] : Object | Constructors.java:30:21:30:33 | container : IdentityHashMap [<map.value>] : Object | provenance |  |
-| Constructors.java:169:21:169:23 | out : IdentityHashMap [<map.value>] : Object | Constructors.java:169:9:169:24 | getMapValue(...) | provenance | MaD:181 |
+| Constructors.java:169:21:169:23 | out : IdentityHashMap [<map.value>] : Object | Constructors.java:169:9:169:24 | getMapValue(...) | provenance | MaD:209 |
 | Constructors.java:174:13:174:34 | of(...) : Map [<map.key>] : Object | Constructors.java:175:28:175:29 | in : Map [<map.key>] : Object | provenance |  |
-| Constructors.java:174:20:174:27 | source(...) : Object | Constructors.java:174:13:174:34 | of(...) : Map [<map.key>] : Object | provenance | MaD:186 |
+| Constructors.java:174:20:174:27 | source(...) : Object | Constructors.java:174:13:174:34 | of(...) : Map [<map.key>] : Object | provenance | MaD:182 |
 | Constructors.java:175:10:175:30 | new LinkedHashMap<>(...) : LinkedHashMap [<map.key>] : Object | Constructors.java:176:19:176:21 | out : LinkedHashMap [<map.key>] : Object | provenance |  |
-| Constructors.java:175:28:175:29 | in : Map [<map.key>] : Object | Constructors.java:175:10:175:30 | new LinkedHashMap<>(...) : LinkedHashMap [<map.key>] : Object | provenance | MaD:144 |
+| Constructors.java:175:28:175:29 | in : Map [<map.key>] : Object | Constructors.java:175:10:175:30 | new LinkedHashMap<>(...) : LinkedHashMap [<map.key>] : Object | provenance | MaD:146 |
 | Constructors.java:176:19:176:21 | out : LinkedHashMap [<map.key>] : Object | Constructors.java:29:19:29:31 | container : LinkedHashMap [<map.key>] : Object | provenance |  |
-| Constructors.java:176:19:176:21 | out : LinkedHashMap [<map.key>] : Object | Constructors.java:176:9:176:22 | getMapKey(...) | provenance | MaD:184 |
+| Constructors.java:176:19:176:21 | out : LinkedHashMap [<map.key>] : Object | Constructors.java:176:9:176:22 | getMapKey(...) | provenance | MaD:212 |
 | Constructors.java:181:13:181:34 | of(...) : Map [<map.value>] : Object | Constructors.java:182:28:182:29 | in : Map [<map.value>] : Object | provenance |  |
-| Constructors.java:181:26:181:33 | source(...) : Object | Constructors.java:181:13:181:34 | of(...) : Map [<map.value>] : Object | provenance | MaD:197 |
+| Constructors.java:181:26:181:33 | source(...) : Object | Constructors.java:181:13:181:34 | of(...) : Map [<map.value>] : Object | provenance | MaD:193 |
 | Constructors.java:182:10:182:30 | new LinkedHashMap<>(...) : LinkedHashMap [<map.value>] : Object | Constructors.java:183:21:183:23 | out : LinkedHashMap [<map.value>] : Object | provenance |  |
-| Constructors.java:182:28:182:29 | in : Map [<map.value>] : Object | Constructors.java:182:10:182:30 | new LinkedHashMap<>(...) : LinkedHashMap [<map.value>] : Object | provenance | MaD:145 |
+| Constructors.java:182:28:182:29 | in : Map [<map.value>] : Object | Constructors.java:182:10:182:30 | new LinkedHashMap<>(...) : LinkedHashMap [<map.value>] : Object | provenance | MaD:147 |
 | Constructors.java:183:21:183:23 | out : LinkedHashMap [<map.value>] : Object | Constructors.java:30:21:30:33 | container : LinkedHashMap [<map.value>] : Object | provenance |  |
-| Constructors.java:183:21:183:23 | out : LinkedHashMap [<map.value>] : Object | Constructors.java:183:9:183:24 | getMapValue(...) | provenance | MaD:181 |
+| Constructors.java:183:21:183:23 | out : LinkedHashMap [<map.value>] : Object | Constructors.java:183:9:183:24 | getMapValue(...) | provenance | MaD:209 |
 | Constructors.java:188:20:188:36 | of(...) : List [<element>] : Object | Constructors.java:189:28:189:29 | in : List [<element>] : Object | provenance |  |
-| Constructors.java:188:28:188:35 | source(...) : Object | Constructors.java:188:20:188:36 | of(...) : List [<element>] : Object | provenance | MaD:154 |
+| Constructors.java:188:28:188:35 | source(...) : Object | Constructors.java:188:20:188:36 | of(...) : List [<element>] : Object | provenance | MaD:151 |
 | Constructors.java:189:10:189:30 | new LinkedHashSet<>(...) : LinkedHashSet [<element>] : Object | Constructors.java:190:20:190:22 | out : LinkedHashSet [<element>] : Object | provenance |  |
-| Constructors.java:189:28:189:29 | in : List [<element>] : Object | Constructors.java:189:10:189:30 | new LinkedHashSet<>(...) : LinkedHashSet [<element>] : Object | provenance | MaD:146 |
+| Constructors.java:189:28:189:29 | in : List [<element>] : Object | Constructors.java:189:10:189:30 | new LinkedHashSet<>(...) : LinkedHashSet [<element>] : Object | provenance | MaD:148 |
 | Constructors.java:190:20:190:22 | out : LinkedHashSet [<element>] : Object | Constructors.java:28:20:28:39 | container : LinkedHashSet [<element>] : Object | provenance |  |
-| Constructors.java:190:20:190:22 | out : LinkedHashSet [<element>] : Object | Constructors.java:190:9:190:23 | getElement(...) | provenance | MaD:1 |
+| Constructors.java:190:20:190:22 | out : LinkedHashSet [<element>] : Object | Constructors.java:190:9:190:23 | getElement(...) | provenance | MaD:3 |
 | Constructors.java:195:20:195:36 | of(...) : List [<element>] : Object | Constructors.java:196:25:196:26 | in : List [<element>] : Object | provenance |  |
-| Constructors.java:195:28:195:35 | source(...) : Object | Constructors.java:195:20:195:36 | of(...) : List [<element>] : Object | provenance | MaD:154 |
+| Constructors.java:195:28:195:35 | source(...) : Object | Constructors.java:195:20:195:36 | of(...) : List [<element>] : Object | provenance | MaD:151 |
 | Constructors.java:196:10:196:27 | new LinkedList<>(...) : LinkedList [<element>] : Object | Constructors.java:197:20:197:22 | out : LinkedList [<element>] : Object | provenance |  |
-| Constructors.java:196:25:196:26 | in : List [<element>] : Object | Constructors.java:196:10:196:27 | new LinkedList<>(...) : LinkedList [<element>] : Object | provenance | MaD:147 |
+| Constructors.java:196:25:196:26 | in : List [<element>] : Object | Constructors.java:196:10:196:27 | new LinkedList<>(...) : LinkedList [<element>] : Object | provenance | MaD:149 |
 | Constructors.java:197:20:197:22 | out : LinkedList [<element>] : Object | Constructors.java:28:20:28:39 | container : LinkedList [<element>] : Object | provenance |  |
-| Constructors.java:197:20:197:22 | out : LinkedList [<element>] : Object | Constructors.java:197:9:197:23 | getElement(...) | provenance | MaD:1 |
+| Constructors.java:197:20:197:22 | out : LinkedList [<element>] : Object | Constructors.java:197:9:197:23 | getElement(...) | provenance | MaD:3 |
 | Constructors.java:202:20:202:36 | of(...) : List [<element>] : Object | Constructors.java:203:28:203:29 | in : List [<element>] : Object | provenance |  |
-| Constructors.java:202:28:202:35 | source(...) : Object | Constructors.java:202:20:202:36 | of(...) : List [<element>] : Object | provenance | MaD:154 |
+| Constructors.java:202:28:202:35 | source(...) : Object | Constructors.java:202:20:202:36 | of(...) : List [<element>] : Object | provenance | MaD:151 |
 | Constructors.java:203:10:203:30 | new PriorityQueue<>(...) : PriorityQueue [<element>] : Object | Constructors.java:204:20:204:22 | out : PriorityQueue [<element>] : Object | provenance |  |
-| Constructors.java:203:28:203:29 | in : List [<element>] : Object | Constructors.java:203:10:203:30 | new PriorityQueue<>(...) : PriorityQueue [<element>] : Object | provenance | MaD:262 |
+| Constructors.java:203:28:203:29 | in : List [<element>] : Object | Constructors.java:203:10:203:30 | new PriorityQueue<>(...) : PriorityQueue [<element>] : Object | provenance | MaD:264 |
 | Constructors.java:204:20:204:22 | out : PriorityQueue [<element>] : Object | Constructors.java:28:20:28:39 | container : PriorityQueue [<element>] : Object | provenance |  |
-| Constructors.java:204:20:204:22 | out : PriorityQueue [<element>] : Object | Constructors.java:204:9:204:23 | getElement(...) | provenance | MaD:1 |
+| Constructors.java:204:20:204:22 | out : PriorityQueue [<element>] : Object | Constructors.java:204:9:204:23 | getElement(...) | provenance | MaD:3 |
 | Constructors.java:209:23:209:58 | new PriorityQueue<>(...) : PriorityQueue [<element>] : Object | Constructors.java:210:28:210:29 | in : PriorityQueue [<element>] : Object | provenance |  |
-| Constructors.java:209:41:209:57 | of(...) : List [<element>] : Object | Constructors.java:209:23:209:58 | new PriorityQueue<>(...) : PriorityQueue [<element>] : Object | provenance | MaD:262 |
-| Constructors.java:209:49:209:56 | source(...) : Object | Constructors.java:209:41:209:57 | of(...) : List [<element>] : Object | provenance | MaD:154 |
+| Constructors.java:209:41:209:57 | of(...) : List [<element>] : Object | Constructors.java:209:23:209:58 | new PriorityQueue<>(...) : PriorityQueue [<element>] : Object | provenance | MaD:264 |
+| Constructors.java:209:49:209:56 | source(...) : Object | Constructors.java:209:41:209:57 | of(...) : List [<element>] : Object | provenance | MaD:151 |
 | Constructors.java:210:10:210:30 | new PriorityQueue<>(...) : PriorityQueue [<element>] : Object | Constructors.java:211:20:211:22 | out : PriorityQueue [<element>] : Object | provenance |  |
-| Constructors.java:210:28:210:29 | in : PriorityQueue [<element>] : Object | Constructors.java:210:10:210:30 | new PriorityQueue<>(...) : PriorityQueue [<element>] : Object | provenance | MaD:263 |
+| Constructors.java:210:28:210:29 | in : PriorityQueue [<element>] : Object | Constructors.java:210:10:210:30 | new PriorityQueue<>(...) : PriorityQueue [<element>] : Object | provenance | MaD:265 |
 | Constructors.java:211:20:211:22 | out : PriorityQueue [<element>] : Object | Constructors.java:28:20:28:39 | container : PriorityQueue [<element>] : Object | provenance |  |
-| Constructors.java:211:20:211:22 | out : PriorityQueue [<element>] : Object | Constructors.java:211:9:211:23 | getElement(...) | provenance | MaD:1 |
+| Constructors.java:211:20:211:22 | out : PriorityQueue [<element>] : Object | Constructors.java:211:9:211:23 | getElement(...) | provenance | MaD:3 |
 | Constructors.java:216:19:216:48 | new TreeSet<>(...) : TreeSet [<element>] : Object | Constructors.java:217:28:217:29 | in : TreeSet [<element>] : Object | provenance |  |
-| Constructors.java:216:31:216:47 | of(...) : List [<element>] : Object | Constructors.java:216:19:216:48 | new TreeSet<>(...) : TreeSet [<element>] : Object | provenance | MaD:329 |
-| Constructors.java:216:39:216:46 | source(...) : Object | Constructors.java:216:31:216:47 | of(...) : List [<element>] : Object | provenance | MaD:154 |
+| Constructors.java:216:31:216:47 | of(...) : List [<element>] : Object | Constructors.java:216:19:216:48 | new TreeSet<>(...) : TreeSet [<element>] : Object | provenance | MaD:331 |
+| Constructors.java:216:39:216:46 | source(...) : Object | Constructors.java:216:31:216:47 | of(...) : List [<element>] : Object | provenance | MaD:151 |
 | Constructors.java:217:10:217:30 | new PriorityQueue<>(...) : PriorityQueue [<element>] : Object | Constructors.java:218:20:218:22 | out : PriorityQueue [<element>] : Object | provenance |  |
-| Constructors.java:217:28:217:29 | in : TreeSet [<element>] : Object | Constructors.java:217:10:217:30 | new PriorityQueue<>(...) : PriorityQueue [<element>] : Object | provenance | MaD:264 |
+| Constructors.java:217:28:217:29 | in : TreeSet [<element>] : Object | Constructors.java:217:10:217:30 | new PriorityQueue<>(...) : PriorityQueue [<element>] : Object | provenance | MaD:266 |
 | Constructors.java:218:20:218:22 | out : PriorityQueue [<element>] : Object | Constructors.java:28:20:28:39 | container : PriorityQueue [<element>] : Object | provenance |  |
-| Constructors.java:218:20:218:22 | out : PriorityQueue [<element>] : Object | Constructors.java:218:9:218:23 | getElement(...) | provenance | MaD:1 |
+| Constructors.java:218:20:218:22 | out : PriorityQueue [<element>] : Object | Constructors.java:218:9:218:23 | getElement(...) | provenance | MaD:3 |
 | Constructors.java:223:13:223:34 | of(...) : Map [<map.key>] : Object | Constructors.java:224:22:224:23 | in : Map [<map.key>] : Object | provenance |  |
-| Constructors.java:223:20:223:27 | source(...) : Object | Constructors.java:223:13:223:34 | of(...) : Map [<map.key>] : Object | provenance | MaD:186 |
+| Constructors.java:223:20:223:27 | source(...) : Object | Constructors.java:223:13:223:34 | of(...) : Map [<map.key>] : Object | provenance | MaD:182 |
 | Constructors.java:224:10:224:24 | new TreeMap<>(...) : TreeMap [<map.key>] : Object | Constructors.java:225:19:225:21 | out : TreeMap [<map.key>] : Object | provenance |  |
-| Constructors.java:224:22:224:23 | in : Map [<map.key>] : Object | Constructors.java:224:10:224:24 | new TreeMap<>(...) : TreeMap [<map.key>] : Object | provenance | MaD:325 |
+| Constructors.java:224:22:224:23 | in : Map [<map.key>] : Object | Constructors.java:224:10:224:24 | new TreeMap<>(...) : TreeMap [<map.key>] : Object | provenance | MaD:327 |
 | Constructors.java:225:19:225:21 | out : TreeMap [<map.key>] : Object | Constructors.java:29:19:29:31 | container : TreeMap [<map.key>] : Object | provenance |  |
-| Constructors.java:225:19:225:21 | out : TreeMap [<map.key>] : Object | Constructors.java:225:9:225:22 | getMapKey(...) | provenance | MaD:184 |
+| Constructors.java:225:19:225:21 | out : TreeMap [<map.key>] : Object | Constructors.java:225:9:225:22 | getMapKey(...) | provenance | MaD:212 |
 | Constructors.java:230:13:230:34 | of(...) : Map [<map.value>] : Object | Constructors.java:231:22:231:23 | in : Map [<map.value>] : Object | provenance |  |
-| Constructors.java:230:26:230:33 | source(...) : Object | Constructors.java:230:13:230:34 | of(...) : Map [<map.value>] : Object | provenance | MaD:197 |
+| Constructors.java:230:26:230:33 | source(...) : Object | Constructors.java:230:13:230:34 | of(...) : Map [<map.value>] : Object | provenance | MaD:193 |
 | Constructors.java:231:10:231:24 | new TreeMap<>(...) : TreeMap [<map.value>] : Object | Constructors.java:232:21:232:23 | out : TreeMap [<map.value>] : Object | provenance |  |
-| Constructors.java:231:22:231:23 | in : Map [<map.value>] : Object | Constructors.java:231:10:231:24 | new TreeMap<>(...) : TreeMap [<map.value>] : Object | provenance | MaD:326 |
+| Constructors.java:231:22:231:23 | in : Map [<map.value>] : Object | Constructors.java:231:10:231:24 | new TreeMap<>(...) : TreeMap [<map.value>] : Object | provenance | MaD:328 |
 | Constructors.java:232:21:232:23 | out : TreeMap [<map.value>] : Object | Constructors.java:30:21:30:33 | container : TreeMap [<map.value>] : Object | provenance |  |
-| Constructors.java:232:21:232:23 | out : TreeMap [<map.value>] : Object | Constructors.java:232:9:232:24 | getMapValue(...) | provenance | MaD:181 |
+| Constructors.java:232:21:232:23 | out : TreeMap [<map.value>] : Object | Constructors.java:232:9:232:24 | getMapValue(...) | provenance | MaD:209 |
 | Constructors.java:237:19:237:53 | new TreeMap<>(...) : TreeMap [<map.key>] : Object | Constructors.java:238:22:238:23 | in : TreeMap [<map.key>] : Object | provenance |  |
-| Constructors.java:237:31:237:52 | of(...) : Map [<map.key>] : Object | Constructors.java:237:19:237:53 | new TreeMap<>(...) : TreeMap [<map.key>] : Object | provenance | MaD:325 |
-| Constructors.java:237:38:237:45 | source(...) : Object | Constructors.java:237:31:237:52 | of(...) : Map [<map.key>] : Object | provenance | MaD:186 |
+| Constructors.java:237:31:237:52 | of(...) : Map [<map.key>] : Object | Constructors.java:237:19:237:53 | new TreeMap<>(...) : TreeMap [<map.key>] : Object | provenance | MaD:327 |
+| Constructors.java:237:38:237:45 | source(...) : Object | Constructors.java:237:31:237:52 | of(...) : Map [<map.key>] : Object | provenance | MaD:182 |
 | Constructors.java:238:10:238:24 | new TreeMap<>(...) : TreeMap [<map.key>] : Object | Constructors.java:239:19:239:21 | out : TreeMap [<map.key>] : Object | provenance |  |
-| Constructors.java:238:22:238:23 | in : TreeMap [<map.key>] : Object | Constructors.java:238:10:238:24 | new TreeMap<>(...) : TreeMap [<map.key>] : Object | provenance | MaD:327 |
+| Constructors.java:238:22:238:23 | in : TreeMap [<map.key>] : Object | Constructors.java:238:10:238:24 | new TreeMap<>(...) : TreeMap [<map.key>] : Object | provenance | MaD:329 |
 | Constructors.java:239:19:239:21 | out : TreeMap [<map.key>] : Object | Constructors.java:29:19:29:31 | container : TreeMap [<map.key>] : Object | provenance |  |
-| Constructors.java:239:19:239:21 | out : TreeMap [<map.key>] : Object | Constructors.java:239:9:239:22 | getMapKey(...) | provenance | MaD:184 |
+| Constructors.java:239:19:239:21 | out : TreeMap [<map.key>] : Object | Constructors.java:239:9:239:22 | getMapKey(...) | provenance | MaD:212 |
 | Constructors.java:244:19:244:53 | new TreeMap<>(...) : TreeMap [<map.value>] : Object | Constructors.java:245:22:245:23 | in : TreeMap [<map.value>] : Object | provenance |  |
-| Constructors.java:244:31:244:52 | of(...) : Map [<map.value>] : Object | Constructors.java:244:19:244:53 | new TreeMap<>(...) : TreeMap [<map.value>] : Object | provenance | MaD:326 |
-| Constructors.java:244:44:244:51 | source(...) : Object | Constructors.java:244:31:244:52 | of(...) : Map [<map.value>] : Object | provenance | MaD:197 |
+| Constructors.java:244:31:244:52 | of(...) : Map [<map.value>] : Object | Constructors.java:244:19:244:53 | new TreeMap<>(...) : TreeMap [<map.value>] : Object | provenance | MaD:328 |
+| Constructors.java:244:44:244:51 | source(...) : Object | Constructors.java:244:31:244:52 | of(...) : Map [<map.value>] : Object | provenance | MaD:193 |
 | Constructors.java:245:10:245:24 | new TreeMap<>(...) : TreeMap [<map.value>] : Object | Constructors.java:246:21:246:23 | out : TreeMap [<map.value>] : Object | provenance |  |
-| Constructors.java:245:22:245:23 | in : TreeMap [<map.value>] : Object | Constructors.java:245:10:245:24 | new TreeMap<>(...) : TreeMap [<map.value>] : Object | provenance | MaD:328 |
+| Constructors.java:245:22:245:23 | in : TreeMap [<map.value>] : Object | Constructors.java:245:10:245:24 | new TreeMap<>(...) : TreeMap [<map.value>] : Object | provenance | MaD:330 |
 | Constructors.java:246:21:246:23 | out : TreeMap [<map.value>] : Object | Constructors.java:30:21:30:33 | container : TreeMap [<map.value>] : Object | provenance |  |
-| Constructors.java:246:21:246:23 | out : TreeMap [<map.value>] : Object | Constructors.java:246:9:246:24 | getMapValue(...) | provenance | MaD:181 |
+| Constructors.java:246:21:246:23 | out : TreeMap [<map.value>] : Object | Constructors.java:246:9:246:24 | getMapValue(...) | provenance | MaD:209 |
 | Constructors.java:251:20:251:36 | of(...) : List [<element>] : Object | Constructors.java:252:22:252:23 | in : List [<element>] : Object | provenance |  |
-| Constructors.java:251:28:251:35 | source(...) : Object | Constructors.java:251:20:251:36 | of(...) : List [<element>] : Object | provenance | MaD:154 |
+| Constructors.java:251:28:251:35 | source(...) : Object | Constructors.java:251:20:251:36 | of(...) : List [<element>] : Object | provenance | MaD:151 |
 | Constructors.java:252:10:252:24 | new TreeSet<>(...) : TreeSet [<element>] : Object | Constructors.java:253:20:253:22 | out : TreeSet [<element>] : Object | provenance |  |
-| Constructors.java:252:22:252:23 | in : List [<element>] : Object | Constructors.java:252:10:252:24 | new TreeSet<>(...) : TreeSet [<element>] : Object | provenance | MaD:329 |
+| Constructors.java:252:22:252:23 | in : List [<element>] : Object | Constructors.java:252:10:252:24 | new TreeSet<>(...) : TreeSet [<element>] : Object | provenance | MaD:331 |
 | Constructors.java:253:20:253:22 | out : TreeSet [<element>] : Object | Constructors.java:28:20:28:39 | container : TreeSet [<element>] : Object | provenance |  |
-| Constructors.java:253:20:253:22 | out : TreeSet [<element>] : Object | Constructors.java:253:9:253:23 | getElement(...) | provenance | MaD:1 |
+| Constructors.java:253:20:253:22 | out : TreeSet [<element>] : Object | Constructors.java:253:9:253:23 | getElement(...) | provenance | MaD:3 |
 | Constructors.java:258:19:258:48 | new TreeSet<>(...) : TreeSet [<element>] : Object | Constructors.java:259:22:259:23 | in : TreeSet [<element>] : Object | provenance |  |
-| Constructors.java:258:31:258:47 | of(...) : List [<element>] : Object | Constructors.java:258:19:258:48 | new TreeSet<>(...) : TreeSet [<element>] : Object | provenance | MaD:329 |
-| Constructors.java:258:39:258:46 | source(...) : Object | Constructors.java:258:31:258:47 | of(...) : List [<element>] : Object | provenance | MaD:154 |
+| Constructors.java:258:31:258:47 | of(...) : List [<element>] : Object | Constructors.java:258:19:258:48 | new TreeSet<>(...) : TreeSet [<element>] : Object | provenance | MaD:331 |
+| Constructors.java:258:39:258:46 | source(...) : Object | Constructors.java:258:31:258:47 | of(...) : List [<element>] : Object | provenance | MaD:151 |
 | Constructors.java:259:10:259:24 | new TreeSet<>(...) : TreeSet [<element>] : Object | Constructors.java:260:20:260:22 | out : TreeSet [<element>] : Object | provenance |  |
-| Constructors.java:259:22:259:23 | in : TreeSet [<element>] : Object | Constructors.java:259:10:259:24 | new TreeSet<>(...) : TreeSet [<element>] : Object | provenance | MaD:330 |
+| Constructors.java:259:22:259:23 | in : TreeSet [<element>] : Object | Constructors.java:259:10:259:24 | new TreeSet<>(...) : TreeSet [<element>] : Object | provenance | MaD:332 |
 | Constructors.java:260:20:260:22 | out : TreeSet [<element>] : Object | Constructors.java:28:20:28:39 | container : TreeSet [<element>] : Object | provenance |  |
-| Constructors.java:260:20:260:22 | out : TreeSet [<element>] : Object | Constructors.java:260:9:260:23 | getElement(...) | provenance | MaD:1 |
+| Constructors.java:260:20:260:22 | out : TreeSet [<element>] : Object | Constructors.java:260:9:260:23 | getElement(...) | provenance | MaD:3 |
 | Constructors.java:265:20:265:36 | of(...) : List [<element>] : Object | Constructors.java:266:21:266:22 | in : List [<element>] : Object | provenance |  |
-| Constructors.java:265:28:265:35 | source(...) : Object | Constructors.java:265:20:265:36 | of(...) : List [<element>] : Object | provenance | MaD:154 |
+| Constructors.java:265:28:265:35 | source(...) : Object | Constructors.java:265:20:265:36 | of(...) : List [<element>] : Object | provenance | MaD:151 |
 | Constructors.java:266:10:266:23 | new Vector<>(...) : Vector [<element>] : Object | Constructors.java:267:20:267:22 | out : Vector [<element>] : Object | provenance |  |
-| Constructors.java:266:21:266:22 | in : List [<element>] : Object | Constructors.java:266:10:266:23 | new Vector<>(...) : Vector [<element>] : Object | provenance | MaD:331 |
+| Constructors.java:266:21:266:22 | in : List [<element>] : Object | Constructors.java:266:10:266:23 | new Vector<>(...) : Vector [<element>] : Object | provenance | MaD:333 |
 | Constructors.java:267:20:267:22 | out : Vector [<element>] : Object | Constructors.java:28:20:28:39 | container : Vector [<element>] : Object | provenance |  |
-| Constructors.java:267:20:267:22 | out : Vector [<element>] : Object | Constructors.java:267:9:267:23 | getElement(...) | provenance | MaD:1 |
+| Constructors.java:267:20:267:22 | out : Vector [<element>] : Object | Constructors.java:267:9:267:23 | getElement(...) | provenance | MaD:3 |
 | Constructors.java:272:13:272:34 | of(...) : Map [<map.key>] : Object | Constructors.java:273:26:273:27 | in : Map [<map.key>] : Object | provenance |  |
-| Constructors.java:272:20:272:27 | source(...) : Object | Constructors.java:272:13:272:34 | of(...) : Map [<map.key>] : Object | provenance | MaD:186 |
+| Constructors.java:272:20:272:27 | source(...) : Object | Constructors.java:272:13:272:34 | of(...) : Map [<map.key>] : Object | provenance | MaD:182 |
 | Constructors.java:273:10:273:28 | new WeakHashMap<>(...) : WeakHashMap [<map.key>] : Object | Constructors.java:274:19:274:21 | out : WeakHashMap [<map.key>] : Object | provenance |  |
-| Constructors.java:273:26:273:27 | in : Map [<map.key>] : Object | Constructors.java:273:10:273:28 | new WeakHashMap<>(...) : WeakHashMap [<map.key>] : Object | provenance | MaD:340 |
+| Constructors.java:273:26:273:27 | in : Map [<map.key>] : Object | Constructors.java:273:10:273:28 | new WeakHashMap<>(...) : WeakHashMap [<map.key>] : Object | provenance | MaD:342 |
 | Constructors.java:274:19:274:21 | out : WeakHashMap [<map.key>] : Object | Constructors.java:29:19:29:31 | container : WeakHashMap [<map.key>] : Object | provenance |  |
-| Constructors.java:274:19:274:21 | out : WeakHashMap [<map.key>] : Object | Constructors.java:274:9:274:22 | getMapKey(...) | provenance | MaD:184 |
+| Constructors.java:274:19:274:21 | out : WeakHashMap [<map.key>] : Object | Constructors.java:274:9:274:22 | getMapKey(...) | provenance | MaD:212 |
 | Constructors.java:279:13:279:34 | of(...) : Map [<map.value>] : Object | Constructors.java:280:26:280:27 | in : Map [<map.value>] : Object | provenance |  |
-| Constructors.java:279:26:279:33 | source(...) : Object | Constructors.java:279:13:279:34 | of(...) : Map [<map.value>] : Object | provenance | MaD:197 |
+| Constructors.java:279:26:279:33 | source(...) : Object | Constructors.java:279:13:279:34 | of(...) : Map [<map.value>] : Object | provenance | MaD:193 |
 | Constructors.java:280:10:280:28 | new WeakHashMap<>(...) : WeakHashMap [<map.value>] : Object | Constructors.java:281:21:281:23 | out : WeakHashMap [<map.value>] : Object | provenance |  |
-| Constructors.java:280:26:280:27 | in : Map [<map.value>] : Object | Constructors.java:280:10:280:28 | new WeakHashMap<>(...) : WeakHashMap [<map.value>] : Object | provenance | MaD:341 |
+| Constructors.java:280:26:280:27 | in : Map [<map.value>] : Object | Constructors.java:280:10:280:28 | new WeakHashMap<>(...) : WeakHashMap [<map.value>] : Object | provenance | MaD:343 |
 | Constructors.java:281:21:281:23 | out : WeakHashMap [<map.value>] : Object | Constructors.java:30:21:30:33 | container : WeakHashMap [<map.value>] : Object | provenance |  |
-| Constructors.java:281:21:281:23 | out : WeakHashMap [<map.value>] : Object | Constructors.java:281:9:281:24 | getMapValue(...) | provenance | MaD:181 |
+| Constructors.java:281:21:281:23 | out : WeakHashMap [<map.value>] : Object | Constructors.java:281:9:281:24 | getMapValue(...) | provenance | MaD:209 |
 nodes
 | B.java:11:37:11:46 | obj : Map [<map.value>] : Object | semmle.label | obj : Map [<map.value>] : Object |
 | B.java:11:37:11:46 | obj : Object | semmle.label | obj : Object |
diff --git a/java/ql/test/library-tests/dataflow/entrypoint-types/EntryPointTypesTest.ql b/java/ql/test/library-tests/dataflow/entrypoint-types/EntryPointTypesTest.ql
index 73dc7d8b30a..9ef1e3867d2 100644
--- a/java/ql/test/library-tests/dataflow/entrypoint-types/EntryPointTypesTest.ql
+++ b/java/ql/test/library-tests/dataflow/entrypoint-types/EntryPointTypesTest.ql
@@ -9,7 +9,7 @@ class TestRemoteFlowSource extends RemoteFlowSource {
 }
 
 module TaintFlowConfig implements DataFlow::ConfigSig {
-  predicate isSource(DataFlow::Node n) { n instanceof ThreatModelFlowSource }
+  predicate isSource(DataFlow::Node n) { n instanceof ActiveThreatModelSource }
 
   predicate isSink(DataFlow::Node n) {
     exists(MethodCall ma | ma.getMethod().hasName("sink") | n.asExpr() = ma.getAnArgument())
diff --git a/java/ql/test/library-tests/dataflow/external-models/C.java b/java/ql/test/library-tests/dataflow/external-models/C.java
index 79d43480703..5dbf5381858 100644
--- a/java/ql/test/library-tests/dataflow/external-models/C.java
+++ b/java/ql/test/library-tests/dataflow/external-models/C.java
@@ -54,6 +54,8 @@ public class C {
     // The summary for the parameter is ignored, because it is generated and
     // because there is a manual neutral summary model for this callable.
     lib.apiStepArgQualGeneratedIgnored(arg1);
+
+    lib.getValue();
   }
 
   void fooPossibleLibraryDispatch(Library lib) {
diff --git a/java/ql/test/library-tests/dataflow/external-models/steps.expected b/java/ql/test/library-tests/dataflow/external-models/steps.expected
index 37d38018502..e38f200fcf9 100644
--- a/java/ql/test/library-tests/dataflow/external-models/steps.expected
+++ b/java/ql/test/library-tests/dataflow/external-models/steps.expected
@@ -11,4 +11,5 @@ invalidModelRow
 | C.java:44:32:44:35 | arg1 | C.java:44:5:44:36 | apiStepArgResGenerated(...) |
 | C.java:50:45:50:48 | arg2 | C.java:50:5:50:49 | apiStepArgResGeneratedIgnored(...) |
 | C.java:52:33:52:36 | arg1 | C.java:52:5:52:7 | lib [post update] |
-| C.java:62:12:62:15 | arg1 | C.java:62:5:62:16 | id(...) |
+| C.java:58:5:58:7 | lib | C.java:58:5:58:18 | getValue(...) |
+| C.java:64:12:64:15 | arg1 | C.java:64:5:64:16 | id(...) |
diff --git a/java/ql/test/library-tests/dataflow/external-models/steps.ext.yml b/java/ql/test/library-tests/dataflow/external-models/steps.ext.yml
index a0f01e48d51..d37716bb542 100644
--- a/java/ql/test/library-tests/dataflow/external-models/steps.ext.yml
+++ b/java/ql/test/library-tests/dataflow/external-models/steps.ext.yml
@@ -16,6 +16,7 @@ extensions:
       - ["my.qltest.external", "Library", False, "apiStepArgQualGenerated", "(Object)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["my.qltest.external", "Library", False, "apiStepArgQualGeneratedIgnored", "(Object)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["my.qltest.external", "Library", False, "id", "(Object)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["my.qltest.external", "Library", False, "getValue", "()", "", "Argument[this]", "ReturnValue", "taint", "dfc-generated"]
   - addsTo:
       pack: codeql/java-all
       extensible: neutralModel
diff --git a/java/ql/test/library-tests/dataflow/external-models/stubs/Library.java b/java/ql/test/library-tests/dataflow/external-models/stubs/Library.java
index 2515c8aebfa..27efccbb4ed 100644
--- a/java/ql/test/library-tests/dataflow/external-models/stubs/Library.java
+++ b/java/ql/test/library-tests/dataflow/external-models/stubs/Library.java
@@ -20,4 +20,8 @@ public class Library {
   public Object id(Object x) {
     return null;
   }
+
+  public Object getValue() {
+    return null;
+  }
 }
diff --git a/java/ql/test/library-tests/dataflow/taint-format/test.expected b/java/ql/test/library-tests/dataflow/taint-format/test.expected
index 15e37b39dee..272e0ada147 100644
--- a/java/ql/test/library-tests/dataflow/taint-format/test.expected
+++ b/java/ql/test/library-tests/dataflow/taint-format/test.expected
@@ -1,48 +1,38 @@
 models
-| 1 | Summary: java.util; Formatter; false; Formatter; (Appendable); ; Argument[0]; Argument[this]; taint; df-generated |
-| 2 | Summary: java.util; Formatter; false; format; (String,Object[]); ; Argument[1].ArrayElement; ReturnValue; taint; df-generated |
-| 3 | Summary: java.util; Formatter; false; format; (String,Object[]); ; Argument[this]; ReturnValue; taint; df-generated |
-| 4 | Summary: java.lang; AbstractStringBuilder; true; append; ; ; Argument[this]; ReturnValue; value; manual |
-| 5 | Summary: java.lang; AbstractStringBuilder; true; append; ; ; Argument[0]; Argument[this]; taint; manual |
-| 6 | Summary: java.lang; CharSequence; true; toString; ; ; Argument[this]; ReturnValue; taint; manual |
-| 7 | Summary: java.lang; String; false; format; (String,Object[]); ; Argument[1].ArrayElement; ReturnValue; taint; manual |
-| 8 | Summary: java.lang; String; false; formatted; (Object[]); ; Argument[this]; ReturnValue; taint; manual |
-| 9 | Summary: java.lang; String; false; formatted; (Object[]); ; Argument[0].ArrayElement; ReturnValue; taint; manual |
+| 1 | Summary: java.lang; AbstractStringBuilder; true; append; ; ; Argument[0]; Argument[this]; taint; manual |
+| 2 | Summary: java.lang; AbstractStringBuilder; true; append; ; ; Argument[this]; ReturnValue; value; manual |
+| 3 | Summary: java.lang; CharSequence; true; toString; ; ; Argument[this]; ReturnValue; taint; manual |
+| 4 | Summary: java.lang; String; false; format; (String,Object[]); ; Argument[1].ArrayElement; ReturnValue; taint; manual |
+| 5 | Summary: java.lang; String; false; formatted; (Object[]); ; Argument[0].ArrayElement; ReturnValue; taint; manual |
+| 6 | Summary: java.lang; String; false; formatted; (Object[]); ; Argument[this]; ReturnValue; taint; manual |
+| 7 | Summary: java.util; Formatter; false; format; (String,Object[]); ; Argument[this]; ReturnValue; value; dfc-generated |
 edges
 | A.java:12:22:12:29 | source(...) : String | A.java:15:14:15:16 | bad : String | provenance |  |
 | A.java:12:22:12:29 | source(...) : String | A.java:16:34:16:36 | bad : String | provenance |  |
 | A.java:12:22:12:29 | source(...) : String | A.java:17:36:17:38 | bad : String | provenance |  |
 | A.java:12:22:12:29 | source(...) : String | A.java:19:107:19:109 | bad : String | provenance |  |
-| A.java:15:14:15:16 | bad : String | A.java:15:14:15:32 | formatted(...) | provenance | MaD:8 |
-| A.java:16:14:16:48 | new ..[] { .. } : Object[] [[]] : String | A.java:16:14:16:48 | formatted(...) | provenance | MaD:9 |
+| A.java:15:14:15:16 | bad : String | A.java:15:14:15:32 | formatted(...) | provenance | MaD:6 |
+| A.java:16:14:16:48 | new ..[] { .. } : Object[] [[]] : String | A.java:16:14:16:48 | formatted(...) | provenance | MaD:5 |
 | A.java:16:34:16:36 | bad : String | A.java:16:14:16:48 | new ..[] { .. } : Object[] [[]] : String | provenance |  |
-| A.java:17:14:17:45 | new ..[] { .. } : Object[] [[]] : String | A.java:17:14:17:45 | format(...) | provenance | MaD:7 |
+| A.java:17:14:17:45 | new ..[] { .. } : Object[] [[]] : String | A.java:17:14:17:45 | format(...) | provenance | MaD:4 |
 | A.java:17:36:17:38 | bad : String | A.java:17:14:17:45 | new ..[] { .. } : Object[] [[]] : String | provenance |  |
-| A.java:19:14:19:110 | new ..[] { .. } : Object[] [[]] : String | A.java:19:14:19:110 | format(...) | provenance | MaD:7 |
+| A.java:19:14:19:110 | new ..[] { .. } : Object[] [[]] : String | A.java:19:14:19:110 | format(...) | provenance | MaD:4 |
 | A.java:19:107:19:109 | bad : String | A.java:19:14:19:110 | new ..[] { .. } : Object[] [[]] : String | provenance |  |
 | A.java:23:22:23:29 | source(...) : String | A.java:27:14:27:32 | format(...) | provenance | TaintPreservingCallable |
-| A.java:23:22:23:29 | source(...) : String | A.java:27:29:27:31 | bad : String | provenance |  |
 | A.java:23:22:23:29 | source(...) : String | A.java:28:14:28:25 | toString(...) | provenance | TaintPreservingCallable |
-| A.java:27:14:27:32 | new ..[] { .. } : Object[] [[]] : String | A.java:27:14:27:32 | format(...) | provenance | MaD:2 |
-| A.java:27:29:27:31 | bad : String | A.java:27:14:27:32 | new ..[] { .. } : Object[] [[]] : String | provenance |  |
 | A.java:32:22:32:29 | source(...) : String | A.java:36:14:36:15 | sb : StringBuilder | provenance | formatStep |
 | A.java:32:22:32:29 | source(...) : String | A.java:37:14:37:32 | format(...) | provenance | TaintPreservingCallable |
-| A.java:32:22:32:29 | source(...) : String | A.java:37:29:37:31 | bad : String | provenance |  |
 | A.java:32:22:32:29 | source(...) : String | A.java:38:14:38:15 | sb : StringBuilder | provenance | formatStep |
-| A.java:36:14:36:15 | sb : StringBuilder | A.java:36:14:36:26 | toString(...) | provenance | MaD:6 |
-| A.java:37:14:37:32 | new ..[] { .. } : Object[] [[]] : String | A.java:37:14:37:32 | format(...) | provenance | MaD:2 |
-| A.java:37:29:37:31 | bad : String | A.java:37:14:37:32 | new ..[] { .. } : Object[] [[]] : String | provenance |  |
-| A.java:38:14:38:15 | sb : StringBuilder | A.java:38:14:38:26 | toString(...) | provenance | MaD:6 |
+| A.java:36:14:36:15 | sb : StringBuilder | A.java:36:14:36:26 | toString(...) | provenance | MaD:3 |
+| A.java:38:14:38:15 | sb : StringBuilder | A.java:38:14:38:26 | toString(...) | provenance | MaD:3 |
 | A.java:42:22:42:29 | source(...) : String | A.java:45:24:45:26 | bad : String | provenance |  |
 | A.java:45:14:45:15 | sb [post update] : StringBuilder | A.java:47:14:47:30 | new Formatter(...) : Formatter | provenance | TaintPreservingCallable |
 | A.java:45:14:45:15 | sb [post update] : StringBuilder | A.java:47:14:47:54 | toString(...) | provenance | TaintPreservingCallable |
-| A.java:45:14:45:15 | sb [post update] : StringBuilder | A.java:47:28:47:29 | sb : StringBuilder | provenance |  |
-| A.java:45:24:45:26 | bad : String | A.java:45:14:45:15 | sb [post update] : StringBuilder | provenance | MaD:5 |
-| A.java:45:24:45:26 | bad : String | A.java:45:14:45:27 | append(...) | provenance | MaD:5+MaD:4 |
-| A.java:47:14:47:30 | new Formatter(...) : Formatter | A.java:47:14:47:43 | format(...) : Formatter | provenance | MaD:3 |
+| A.java:45:24:45:26 | bad : String | A.java:45:14:45:15 | sb [post update] : StringBuilder | provenance | MaD:1 |
+| A.java:45:24:45:26 | bad : String | A.java:45:14:45:27 | append(...) | provenance | MaD:1+MaD:2 |
+| A.java:47:14:47:30 | new Formatter(...) : Formatter | A.java:47:14:47:43 | format(...) : Formatter | provenance | MaD:7 |
 | A.java:47:14:47:30 | new Formatter(...) : Formatter | A.java:47:14:47:54 | toString(...) | provenance | TaintPreservingCallable |
 | A.java:47:14:47:43 | format(...) : Formatter | A.java:47:14:47:54 | toString(...) | provenance | TaintPreservingCallable |
-| A.java:47:28:47:29 | sb : StringBuilder | A.java:47:14:47:30 | new Formatter(...) : Formatter | provenance | MaD:1 |
 nodes
 | A.java:12:22:12:29 | source(...) : String | semmle.label | source(...) : String |
 | A.java:15:14:15:16 | bad : String | semmle.label | bad : String |
@@ -58,15 +48,11 @@ nodes
 | A.java:19:107:19:109 | bad : String | semmle.label | bad : String |
 | A.java:23:22:23:29 | source(...) : String | semmle.label | source(...) : String |
 | A.java:27:14:27:32 | format(...) | semmle.label | format(...) |
-| A.java:27:14:27:32 | new ..[] { .. } : Object[] [[]] : String | semmle.label | new ..[] { .. } : Object[] [[]] : String |
-| A.java:27:29:27:31 | bad : String | semmle.label | bad : String |
 | A.java:28:14:28:25 | toString(...) | semmle.label | toString(...) |
 | A.java:32:22:32:29 | source(...) : String | semmle.label | source(...) : String |
 | A.java:36:14:36:15 | sb : StringBuilder | semmle.label | sb : StringBuilder |
 | A.java:36:14:36:26 | toString(...) | semmle.label | toString(...) |
 | A.java:37:14:37:32 | format(...) | semmle.label | format(...) |
-| A.java:37:14:37:32 | new ..[] { .. } : Object[] [[]] : String | semmle.label | new ..[] { .. } : Object[] [[]] : String |
-| A.java:37:29:37:31 | bad : String | semmle.label | bad : String |
 | A.java:38:14:38:15 | sb : StringBuilder | semmle.label | sb : StringBuilder |
 | A.java:38:14:38:26 | toString(...) | semmle.label | toString(...) |
 | A.java:42:22:42:29 | source(...) : String | semmle.label | source(...) : String |
@@ -76,6 +62,5 @@ nodes
 | A.java:47:14:47:30 | new Formatter(...) : Formatter | semmle.label | new Formatter(...) : Formatter |
 | A.java:47:14:47:43 | format(...) : Formatter | semmle.label | format(...) : Formatter |
 | A.java:47:14:47:54 | toString(...) | semmle.label | toString(...) |
-| A.java:47:28:47:29 | sb : StringBuilder | semmle.label | sb : StringBuilder |
 subpaths
 testFailures
diff --git a/java/ql/test/library-tests/dataflow/taint-jackson/dataFlow.expected b/java/ql/test/library-tests/dataflow/taint-jackson/dataFlow.expected
index 6a9b5cc5a54..a39b92745c6 100644
--- a/java/ql/test/library-tests/dataflow/taint-jackson/dataFlow.expected
+++ b/java/ql/test/library-tests/dataflow/taint-jackson/dataFlow.expected
@@ -1,7 +1,7 @@
 models
 | 1 | Summary: com.fasterxml.jackson.databind; ObjectMapper; true; convertValue; ; ; Argument[0]; ReturnValue; taint; manual |
-| 2 | Summary: com.fasterxml.jackson.databind; ObjectMapper; true; valueToTree; ; ; Argument[0].MapValue; ReturnValue; taint; manual |
-| 3 | Summary: com.fasterxml.jackson.databind; ObjectMapper; true; valueToTree; ; ; Argument[0].MapValue.Element; ReturnValue; taint; manual |
+| 2 | Summary: com.fasterxml.jackson.databind; ObjectMapper; true; valueToTree; ; ; Argument[0].MapValue.Element; ReturnValue; taint; manual |
+| 3 | Summary: com.fasterxml.jackson.databind; ObjectMapper; true; valueToTree; ; ; Argument[0].MapValue; ReturnValue; taint; manual |
 | 4 | Summary: java.io; FileOutputStream; true; FileOutputStream; (File); ; Argument[0]; Argument[this]; taint; df-generated |
 | 5 | Summary: java.lang; String; false; String; ; ; Argument[0]; Argument[this]; taint; manual |
 | 6 | Summary: java.util; Iterator; true; next; ; ; Argument[this].Element; ReturnValue; value; manual |
diff --git a/java/ql/test/library-tests/dataflow/threat-models/Test.qll b/java/ql/test/library-tests/dataflow/threat-models/Test.qll
index a0d85680270..742cea3dda6 100644
--- a/java/ql/test/library-tests/dataflow/threat-models/Test.qll
+++ b/java/ql/test/library-tests/dataflow/threat-models/Test.qll
@@ -5,7 +5,7 @@ private import semmle.code.java.dataflow.FlowSources
 private import semmle.code.java.dataflow.TaintTracking
 
 private module ThreatModelConfig implements DataFlow::ConfigSig {
-  predicate isSource(DataFlow::Node source) { source instanceof ThreatModelFlowSource }
+  predicate isSource(DataFlow::Node source) { source instanceof ActiveThreatModelSource }
 
   predicate isSink(DataFlow::Node sink) { sinkNode(sink, _) }
 }
diff --git a/java/ql/test/library-tests/dataflow/threat-models/threat-models-flowtest1.expected b/java/ql/test/library-tests/dataflow/threat-models/threat-models-flowtest1.expected
index e0b87b908d9..ca25eff9c90 100644
--- a/java/ql/test/library-tests/dataflow/threat-models/threat-models-flowtest1.expected
+++ b/java/ql/test/library-tests/dataflow/threat-models/threat-models-flowtest1.expected
@@ -1,20 +1,20 @@
 models
-| 1 | Summary: java.io; InputStream; true; read; (byte[]); ; Argument[this]; Argument[0]; taint; manual |
-| 2 | Summary: java.lang; String; false; String; ; ; Argument[0]; Argument[this]; taint; manual |
+| 1 | Sink: java.sql; Statement; true; executeUpdate; ; ; Argument[0]; sql-injection; manual |
+| 2 | Sink: java.util.logging; Logger; true; severe; ; ; Argument[0]; log-injection; manual |
 | 3 | Source: java.net; Socket; false; getInputStream; (); ; ReturnValue; remote; manual |
-| 4 | Sink: java.sql; Statement; true; executeUpdate; ; ; Argument[0]; sql-injection; manual |
-| 5 | Sink: java.util.logging; Logger; true; severe; ; ; Argument[0]; log-injection; manual |
+| 4 | Summary: java.io; InputStream; true; read; (byte[]); ; Argument[this]; Argument[0]; taint; manual |
+| 5 | Summary: java.lang; String; false; String; ; ; Argument[0]; Argument[this]; taint; manual |
 edges
 | Test.java:10:31:10:41 | data : byte[] | Test.java:11:23:11:26 | data : byte[] | provenance |  |
-| Test.java:11:23:11:26 | data : byte[] | Test.java:11:12:11:51 | new String(...) : String | provenance | MaD:2 |
-| Test.java:19:5:19:25 | getInputStream(...) : InputStream | Test.java:19:32:19:35 | data [post update] : byte[] | provenance | Src:MaD:3 MaD:1 |
+| Test.java:11:23:11:26 | data : byte[] | Test.java:11:12:11:51 | new String(...) : String | provenance | MaD:5 |
+| Test.java:19:5:19:25 | getInputStream(...) : InputStream | Test.java:19:32:19:35 | data [post update] : byte[] | provenance | Src:MaD:3 MaD:4 |
 | Test.java:19:32:19:35 | data [post update] : byte[] | Test.java:22:49:22:52 | data : byte[] | provenance |  |
 | Test.java:19:32:19:35 | data [post update] : byte[] | Test.java:25:69:25:72 | data : byte[] | provenance |  |
 | Test.java:22:49:22:52 | data : byte[] | Test.java:10:31:10:41 | data : byte[] | provenance |  |
-| Test.java:22:49:22:52 | data : byte[] | Test.java:22:36:22:53 | byteToString(...) | provenance | MaD:2 Sink:MaD:5 |
-| Test.java:25:56:25:73 | byteToString(...) : String | Test.java:25:26:25:80 | ... + ... | provenance |  Sink:MaD:4 |
+| Test.java:22:49:22:52 | data : byte[] | Test.java:22:36:22:53 | byteToString(...) | provenance | MaD:5 Sink:MaD:2 |
+| Test.java:25:56:25:73 | byteToString(...) : String | Test.java:25:26:25:80 | ... + ... | provenance | Sink:MaD:1 |
 | Test.java:25:69:25:72 | data : byte[] | Test.java:10:31:10:41 | data : byte[] | provenance |  |
-| Test.java:25:69:25:72 | data : byte[] | Test.java:25:56:25:73 | byteToString(...) : String | provenance | MaD:2 |
+| Test.java:25:69:25:72 | data : byte[] | Test.java:25:56:25:73 | byteToString(...) : String | provenance | MaD:5 |
 nodes
 | Test.java:10:31:10:41 | data : byte[] | semmle.label | data : byte[] |
 | Test.java:11:12:11:51 | new String(...) : String | semmle.label | new String(...) : String |
diff --git a/java/ql/test/library-tests/dataflow/threat-models/threat-models-flowtest2.expected b/java/ql/test/library-tests/dataflow/threat-models/threat-models-flowtest2.expected
index 52404f03414..262e00205ce 100644
--- a/java/ql/test/library-tests/dataflow/threat-models/threat-models-flowtest2.expected
+++ b/java/ql/test/library-tests/dataflow/threat-models/threat-models-flowtest2.expected
@@ -1,23 +1,23 @@
 models
-| 1 | Summary: java.io; InputStream; true; read; (byte[]); ; Argument[this]; Argument[0]; taint; manual |
-| 2 | Summary: java.lang; String; false; String; ; ; Argument[0]; Argument[this]; taint; manual |
+| 1 | Sink: java.sql; Statement; true; executeUpdate; ; ; Argument[0]; sql-injection; manual |
+| 2 | Sink: java.util.logging; Logger; true; severe; ; ; Argument[0]; log-injection; manual |
 | 3 | Source: java.net; Socket; false; getInputStream; (); ; ReturnValue; remote; manual |
-| 4 | Sink: java.sql; Statement; true; executeUpdate; ; ; Argument[0]; sql-injection; manual |
-| 5 | Sink: java.util.logging; Logger; true; severe; ; ; Argument[0]; log-injection; manual |
-| 6 | Source: testlib; TestSources; false; executeQuery; (String); ; ReturnValue; database; manual |
+| 4 | Source: testlib; TestSources; false; executeQuery; (String); ; ReturnValue; database; manual |
+| 5 | Summary: java.io; InputStream; true; read; (byte[]); ; Argument[this]; Argument[0]; taint; manual |
+| 6 | Summary: java.lang; String; false; String; ; ; Argument[0]; Argument[this]; taint; manual |
 edges
 | Test.java:10:31:10:41 | data : byte[] | Test.java:11:23:11:26 | data : byte[] | provenance |  |
-| Test.java:11:23:11:26 | data : byte[] | Test.java:11:12:11:51 | new String(...) : String | provenance | MaD:2 |
-| Test.java:19:5:19:25 | getInputStream(...) : InputStream | Test.java:19:32:19:35 | data [post update] : byte[] | provenance | Src:MaD:3 MaD:1 |
+| Test.java:11:23:11:26 | data : byte[] | Test.java:11:12:11:51 | new String(...) : String | provenance | MaD:6 |
+| Test.java:19:5:19:25 | getInputStream(...) : InputStream | Test.java:19:32:19:35 | data [post update] : byte[] | provenance | Src:MaD:3 MaD:5 |
 | Test.java:19:32:19:35 | data [post update] : byte[] | Test.java:22:49:22:52 | data : byte[] | provenance |  |
 | Test.java:19:32:19:35 | data [post update] : byte[] | Test.java:25:69:25:72 | data : byte[] | provenance |  |
 | Test.java:22:49:22:52 | data : byte[] | Test.java:10:31:10:41 | data : byte[] | provenance |  |
-| Test.java:22:49:22:52 | data : byte[] | Test.java:22:36:22:53 | byteToString(...) | provenance | MaD:2 Sink:MaD:5 |
-| Test.java:25:56:25:73 | byteToString(...) : String | Test.java:25:26:25:80 | ... + ... | provenance |  Sink:MaD:4 |
+| Test.java:22:49:22:52 | data : byte[] | Test.java:22:36:22:53 | byteToString(...) | provenance | MaD:6 Sink:MaD:2 |
+| Test.java:25:56:25:73 | byteToString(...) : String | Test.java:25:26:25:80 | ... + ... | provenance | Sink:MaD:1 |
 | Test.java:25:69:25:72 | data : byte[] | Test.java:10:31:10:41 | data : byte[] | provenance |  |
-| Test.java:25:69:25:72 | data : byte[] | Test.java:25:56:25:73 | byteToString(...) : String | provenance | MaD:2 |
-| Test.java:30:21:30:61 | executeQuery(...) : String | Test.java:33:26:33:68 | ... + ... | provenance | Src:MaD:6  Sink:MaD:4 |
-| Test.java:30:21:30:61 | executeQuery(...) : String | Test.java:36:36:36:41 | result | provenance | Src:MaD:6  Sink:MaD:5 |
+| Test.java:25:69:25:72 | data : byte[] | Test.java:25:56:25:73 | byteToString(...) : String | provenance | MaD:6 |
+| Test.java:30:21:30:61 | executeQuery(...) : String | Test.java:33:26:33:68 | ... + ... | provenance | Src:MaD:4 Sink:MaD:1 |
+| Test.java:30:21:30:61 | executeQuery(...) : String | Test.java:36:36:36:41 | result | provenance | Src:MaD:4 Sink:MaD:2 |
 nodes
 | Test.java:10:31:10:41 | data : byte[] | semmle.label | data : byte[] |
 | Test.java:11:12:11:51 | new String(...) : String | semmle.label | new String(...) : String |
diff --git a/java/ql/test/library-tests/dataflow/threat-models/threat-models-flowtest3.expected b/java/ql/test/library-tests/dataflow/threat-models/threat-models-flowtest3.expected
index 340a65d94fc..695aaa71395 100644
--- a/java/ql/test/library-tests/dataflow/threat-models/threat-models-flowtest3.expected
+++ b/java/ql/test/library-tests/dataflow/threat-models/threat-models-flowtest3.expected
@@ -1,34 +1,34 @@
 models
-| 1 | Summary: java.io; InputStream; true; read; (byte[]); ; Argument[this]; Argument[0]; taint; manual |
-| 2 | Summary: java.lang; String; false; String; ; ; Argument[0]; Argument[this]; taint; manual |
+| 1 | Sink: java.sql; Statement; true; executeUpdate; ; ; Argument[0]; sql-injection; manual |
+| 2 | Sink: java.util.logging; Logger; true; severe; ; ; Argument[0]; log-injection; manual |
 | 3 | Source: java.net; Socket; false; getInputStream; (); ; ReturnValue; remote; manual |
-| 4 | Sink: java.sql; Statement; true; executeUpdate; ; ; Argument[0]; sql-injection; manual |
-| 5 | Sink: java.util.logging; Logger; true; severe; ; ; Argument[0]; log-injection; manual |
-| 6 | Source: testlib; TestSources; false; executeQuery; (String); ; ReturnValue; database; manual |
-| 7 | Source: testlib; TestSources; false; readEnv; (String); ; ReturnValue; environment; manual |
+| 4 | Source: testlib; TestSources; false; executeQuery; (String); ; ReturnValue; database; manual |
+| 5 | Source: testlib; TestSources; false; readEnv; (String); ; ReturnValue; environment; manual |
+| 6 | Summary: java.io; InputStream; true; read; (byte[]); ; Argument[this]; Argument[0]; taint; manual |
+| 7 | Summary: java.lang; String; false; String; ; ; Argument[0]; Argument[this]; taint; manual |
 edges
 | Test.java:10:31:10:41 | data : byte[] | Test.java:11:23:11:26 | data : byte[] | provenance |  |
-| Test.java:11:23:11:26 | data : byte[] | Test.java:11:12:11:51 | new String(...) : String | provenance | MaD:2 |
-| Test.java:19:5:19:25 | getInputStream(...) : InputStream | Test.java:19:32:19:35 | data [post update] : byte[] | provenance | Src:MaD:3 MaD:1 |
+| Test.java:11:23:11:26 | data : byte[] | Test.java:11:12:11:51 | new String(...) : String | provenance | MaD:7 |
+| Test.java:19:5:19:25 | getInputStream(...) : InputStream | Test.java:19:32:19:35 | data [post update] : byte[] | provenance | Src:MaD:3 MaD:6 |
 | Test.java:19:32:19:35 | data [post update] : byte[] | Test.java:22:49:22:52 | data : byte[] | provenance |  |
 | Test.java:19:32:19:35 | data [post update] : byte[] | Test.java:25:69:25:72 | data : byte[] | provenance |  |
 | Test.java:22:49:22:52 | data : byte[] | Test.java:10:31:10:41 | data : byte[] | provenance |  |
-| Test.java:22:49:22:52 | data : byte[] | Test.java:22:36:22:53 | byteToString(...) | provenance | MaD:2 Sink:MaD:5 |
-| Test.java:25:56:25:73 | byteToString(...) : String | Test.java:25:26:25:80 | ... + ... | provenance |  Sink:MaD:4 |
+| Test.java:22:49:22:52 | data : byte[] | Test.java:22:36:22:53 | byteToString(...) | provenance | MaD:7 Sink:MaD:2 |
+| Test.java:25:56:25:73 | byteToString(...) : String | Test.java:25:26:25:80 | ... + ... | provenance | Sink:MaD:1 |
 | Test.java:25:69:25:72 | data : byte[] | Test.java:10:31:10:41 | data : byte[] | provenance |  |
-| Test.java:25:69:25:72 | data : byte[] | Test.java:25:56:25:73 | byteToString(...) : String | provenance | MaD:2 |
-| Test.java:30:21:30:61 | executeQuery(...) : String | Test.java:33:26:33:68 | ... + ... | provenance | Src:MaD:6  Sink:MaD:4 |
-| Test.java:30:21:30:61 | executeQuery(...) : String | Test.java:36:36:36:41 | result | provenance | Src:MaD:6  Sink:MaD:5 |
-| Test.java:41:21:41:49 | readEnv(...) : String | Test.java:44:26:44:68 | ... + ... | provenance | Src:MaD:7  Sink:MaD:4 |
-| Test.java:41:21:41:49 | readEnv(...) : String | Test.java:47:36:47:41 | result | provenance | Src:MaD:7  Sink:MaD:5 |
-| Test.java:64:5:64:13 | System.in : InputStream | Test.java:64:20:64:23 | data [post update] : byte[] | provenance | MaD:1 |
+| Test.java:25:69:25:72 | data : byte[] | Test.java:25:56:25:73 | byteToString(...) : String | provenance | MaD:7 |
+| Test.java:30:21:30:61 | executeQuery(...) : String | Test.java:33:26:33:68 | ... + ... | provenance | Src:MaD:4 Sink:MaD:1 |
+| Test.java:30:21:30:61 | executeQuery(...) : String | Test.java:36:36:36:41 | result | provenance | Src:MaD:4 Sink:MaD:2 |
+| Test.java:41:21:41:49 | readEnv(...) : String | Test.java:44:26:44:68 | ... + ... | provenance | Src:MaD:5 Sink:MaD:1 |
+| Test.java:41:21:41:49 | readEnv(...) : String | Test.java:47:36:47:41 | result | provenance | Src:MaD:5 Sink:MaD:2 |
+| Test.java:64:5:64:13 | System.in : InputStream | Test.java:64:20:64:23 | data [post update] : byte[] | provenance | MaD:6 |
 | Test.java:64:20:64:23 | data [post update] : byte[] | Test.java:67:69:67:72 | data : byte[] | provenance |  |
 | Test.java:64:20:64:23 | data [post update] : byte[] | Test.java:70:49:70:52 | data : byte[] | provenance |  |
-| Test.java:67:56:67:73 | byteToString(...) : String | Test.java:67:26:67:80 | ... + ... | provenance |  Sink:MaD:4 |
+| Test.java:67:56:67:73 | byteToString(...) : String | Test.java:67:26:67:80 | ... + ... | provenance | Sink:MaD:1 |
 | Test.java:67:69:67:72 | data : byte[] | Test.java:10:31:10:41 | data : byte[] | provenance |  |
-| Test.java:67:69:67:72 | data : byte[] | Test.java:67:56:67:73 | byteToString(...) : String | provenance | MaD:2 |
+| Test.java:67:69:67:72 | data : byte[] | Test.java:67:56:67:73 | byteToString(...) : String | provenance | MaD:7 |
 | Test.java:70:49:70:52 | data : byte[] | Test.java:10:31:10:41 | data : byte[] | provenance |  |
-| Test.java:70:49:70:52 | data : byte[] | Test.java:70:36:70:53 | byteToString(...) | provenance | MaD:2 Sink:MaD:5 |
+| Test.java:70:49:70:52 | data : byte[] | Test.java:70:36:70:53 | byteToString(...) | provenance | MaD:7 Sink:MaD:2 |
 nodes
 | Test.java:10:31:10:41 | data : byte[] | semmle.label | data : byte[] |
 | Test.java:11:12:11:51 | new String(...) : String | semmle.label | new String(...) : String |
diff --git a/java/ql/test/library-tests/dataflow/threat-models/threat-models-flowtest4.expected b/java/ql/test/library-tests/dataflow/threat-models/threat-models-flowtest4.expected
index 7e84fde91e3..bc3ccdcbeef 100644
--- a/java/ql/test/library-tests/dataflow/threat-models/threat-models-flowtest4.expected
+++ b/java/ql/test/library-tests/dataflow/threat-models/threat-models-flowtest4.expected
@@ -1,37 +1,37 @@
 models
-| 1 | Summary: java.io; InputStream; true; read; (byte[]); ; Argument[this]; Argument[0]; taint; manual |
-| 2 | Summary: java.lang; String; false; String; ; ; Argument[0]; Argument[this]; taint; manual |
+| 1 | Sink: java.sql; Statement; true; executeUpdate; ; ; Argument[0]; sql-injection; manual |
+| 2 | Sink: java.util.logging; Logger; true; severe; ; ; Argument[0]; log-injection; manual |
 | 3 | Source: java.net; Socket; false; getInputStream; (); ; ReturnValue; remote; manual |
-| 4 | Sink: java.sql; Statement; true; executeUpdate; ; ; Argument[0]; sql-injection; manual |
-| 5 | Sink: java.util.logging; Logger; true; severe; ; ; Argument[0]; log-injection; manual |
-| 6 | Source: testlib; TestSources; false; executeQuery; (String); ; ReturnValue; database; manual |
-| 7 | Source: testlib; TestSources; false; readEnv; (String); ; ReturnValue; environment; manual |
-| 8 | Source: testlib; TestSources; false; getCustom; (String); ; ReturnValue; custom; manual |
+| 4 | Source: testlib; TestSources; false; executeQuery; (String); ; ReturnValue; database; manual |
+| 5 | Source: testlib; TestSources; false; getCustom; (String); ; ReturnValue; custom; manual |
+| 6 | Source: testlib; TestSources; false; readEnv; (String); ; ReturnValue; environment; manual |
+| 7 | Summary: java.io; InputStream; true; read; (byte[]); ; Argument[this]; Argument[0]; taint; manual |
+| 8 | Summary: java.lang; String; false; String; ; ; Argument[0]; Argument[this]; taint; manual |
 edges
 | Test.java:10:31:10:41 | data : byte[] | Test.java:11:23:11:26 | data : byte[] | provenance |  |
-| Test.java:11:23:11:26 | data : byte[] | Test.java:11:12:11:51 | new String(...) : String | provenance | MaD:2 |
-| Test.java:19:5:19:25 | getInputStream(...) : InputStream | Test.java:19:32:19:35 | data [post update] : byte[] | provenance | Src:MaD:3 MaD:1 |
+| Test.java:11:23:11:26 | data : byte[] | Test.java:11:12:11:51 | new String(...) : String | provenance | MaD:8 |
+| Test.java:19:5:19:25 | getInputStream(...) : InputStream | Test.java:19:32:19:35 | data [post update] : byte[] | provenance | Src:MaD:3 MaD:7 |
 | Test.java:19:32:19:35 | data [post update] : byte[] | Test.java:22:49:22:52 | data : byte[] | provenance |  |
 | Test.java:19:32:19:35 | data [post update] : byte[] | Test.java:25:69:25:72 | data : byte[] | provenance |  |
 | Test.java:22:49:22:52 | data : byte[] | Test.java:10:31:10:41 | data : byte[] | provenance |  |
-| Test.java:22:49:22:52 | data : byte[] | Test.java:22:36:22:53 | byteToString(...) | provenance | MaD:2 Sink:MaD:5 |
-| Test.java:25:56:25:73 | byteToString(...) : String | Test.java:25:26:25:80 | ... + ... | provenance |  Sink:MaD:4 |
+| Test.java:22:49:22:52 | data : byte[] | Test.java:22:36:22:53 | byteToString(...) | provenance | MaD:8 Sink:MaD:2 |
+| Test.java:25:56:25:73 | byteToString(...) : String | Test.java:25:26:25:80 | ... + ... | provenance | Sink:MaD:1 |
 | Test.java:25:69:25:72 | data : byte[] | Test.java:10:31:10:41 | data : byte[] | provenance |  |
-| Test.java:25:69:25:72 | data : byte[] | Test.java:25:56:25:73 | byteToString(...) : String | provenance | MaD:2 |
-| Test.java:30:21:30:61 | executeQuery(...) : String | Test.java:33:26:33:68 | ... + ... | provenance | Src:MaD:6  Sink:MaD:4 |
-| Test.java:30:21:30:61 | executeQuery(...) : String | Test.java:36:36:36:41 | result | provenance | Src:MaD:6  Sink:MaD:5 |
-| Test.java:41:21:41:49 | readEnv(...) : String | Test.java:44:26:44:68 | ... + ... | provenance | Src:MaD:7  Sink:MaD:4 |
-| Test.java:41:21:41:49 | readEnv(...) : String | Test.java:47:36:47:41 | result | provenance | Src:MaD:7  Sink:MaD:5 |
-| Test.java:52:21:52:47 | getCustom(...) : String | Test.java:55:26:55:68 | ... + ... | provenance | Src:MaD:8  Sink:MaD:4 |
-| Test.java:52:21:52:47 | getCustom(...) : String | Test.java:58:36:58:41 | result | provenance | Src:MaD:8  Sink:MaD:5 |
-| Test.java:64:5:64:13 | System.in : InputStream | Test.java:64:20:64:23 | data [post update] : byte[] | provenance | MaD:1 |
+| Test.java:25:69:25:72 | data : byte[] | Test.java:25:56:25:73 | byteToString(...) : String | provenance | MaD:8 |
+| Test.java:30:21:30:61 | executeQuery(...) : String | Test.java:33:26:33:68 | ... + ... | provenance | Src:MaD:4 Sink:MaD:1 |
+| Test.java:30:21:30:61 | executeQuery(...) : String | Test.java:36:36:36:41 | result | provenance | Src:MaD:4 Sink:MaD:2 |
+| Test.java:41:21:41:49 | readEnv(...) : String | Test.java:44:26:44:68 | ... + ... | provenance | Src:MaD:6 Sink:MaD:1 |
+| Test.java:41:21:41:49 | readEnv(...) : String | Test.java:47:36:47:41 | result | provenance | Src:MaD:6 Sink:MaD:2 |
+| Test.java:52:21:52:47 | getCustom(...) : String | Test.java:55:26:55:68 | ... + ... | provenance | Src:MaD:5 Sink:MaD:1 |
+| Test.java:52:21:52:47 | getCustom(...) : String | Test.java:58:36:58:41 | result | provenance | Src:MaD:5 Sink:MaD:2 |
+| Test.java:64:5:64:13 | System.in : InputStream | Test.java:64:20:64:23 | data [post update] : byte[] | provenance | MaD:7 |
 | Test.java:64:20:64:23 | data [post update] : byte[] | Test.java:67:69:67:72 | data : byte[] | provenance |  |
 | Test.java:64:20:64:23 | data [post update] : byte[] | Test.java:70:49:70:52 | data : byte[] | provenance |  |
-| Test.java:67:56:67:73 | byteToString(...) : String | Test.java:67:26:67:80 | ... + ... | provenance |  Sink:MaD:4 |
+| Test.java:67:56:67:73 | byteToString(...) : String | Test.java:67:26:67:80 | ... + ... | provenance | Sink:MaD:1 |
 | Test.java:67:69:67:72 | data : byte[] | Test.java:10:31:10:41 | data : byte[] | provenance |  |
-| Test.java:67:69:67:72 | data : byte[] | Test.java:67:56:67:73 | byteToString(...) : String | provenance | MaD:2 |
+| Test.java:67:69:67:72 | data : byte[] | Test.java:67:56:67:73 | byteToString(...) : String | provenance | MaD:8 |
 | Test.java:70:49:70:52 | data : byte[] | Test.java:10:31:10:41 | data : byte[] | provenance |  |
-| Test.java:70:49:70:52 | data : byte[] | Test.java:70:36:70:53 | byteToString(...) | provenance | MaD:2 Sink:MaD:5 |
+| Test.java:70:49:70:52 | data : byte[] | Test.java:70:36:70:53 | byteToString(...) | provenance | MaD:8 Sink:MaD:2 |
 nodes
 | Test.java:10:31:10:41 | data : byte[] | semmle.label | data : byte[] |
 | Test.java:11:12:11:51 | new String(...) : String | semmle.label | new String(...) : String |
diff --git a/java/ql/test/library-tests/dataflow/threat-models/threat-models-flowtest5.expected b/java/ql/test/library-tests/dataflow/threat-models/threat-models-flowtest5.expected
index 7ddb209938f..5a1496adf18 100644
--- a/java/ql/test/library-tests/dataflow/threat-models/threat-models-flowtest5.expected
+++ b/java/ql/test/library-tests/dataflow/threat-models/threat-models-flowtest5.expected
@@ -1,31 +1,31 @@
 models
-| 1 | Summary: java.io; InputStream; true; read; (byte[]); ; Argument[this]; Argument[0]; taint; manual |
-| 2 | Summary: java.lang; String; false; String; ; ; Argument[0]; Argument[this]; taint; manual |
+| 1 | Sink: java.sql; Statement; true; executeUpdate; ; ; Argument[0]; sql-injection; manual |
+| 2 | Sink: java.util.logging; Logger; true; severe; ; ; Argument[0]; log-injection; manual |
 | 3 | Source: java.net; Socket; false; getInputStream; (); ; ReturnValue; remote; manual |
-| 4 | Sink: java.sql; Statement; true; executeUpdate; ; ; Argument[0]; sql-injection; manual |
-| 5 | Sink: java.util.logging; Logger; true; severe; ; ; Argument[0]; log-injection; manual |
-| 6 | Source: testlib; TestSources; false; readEnv; (String); ; ReturnValue; environment; manual |
+| 4 | Source: testlib; TestSources; false; readEnv; (String); ; ReturnValue; environment; manual |
+| 5 | Summary: java.io; InputStream; true; read; (byte[]); ; Argument[this]; Argument[0]; taint; manual |
+| 6 | Summary: java.lang; String; false; String; ; ; Argument[0]; Argument[this]; taint; manual |
 edges
 | Test.java:10:31:10:41 | data : byte[] | Test.java:11:23:11:26 | data : byte[] | provenance |  |
-| Test.java:11:23:11:26 | data : byte[] | Test.java:11:12:11:51 | new String(...) : String | provenance | MaD:2 |
-| Test.java:19:5:19:25 | getInputStream(...) : InputStream | Test.java:19:32:19:35 | data [post update] : byte[] | provenance | Src:MaD:3 MaD:1 |
+| Test.java:11:23:11:26 | data : byte[] | Test.java:11:12:11:51 | new String(...) : String | provenance | MaD:6 |
+| Test.java:19:5:19:25 | getInputStream(...) : InputStream | Test.java:19:32:19:35 | data [post update] : byte[] | provenance | Src:MaD:3 MaD:5 |
 | Test.java:19:32:19:35 | data [post update] : byte[] | Test.java:22:49:22:52 | data : byte[] | provenance |  |
 | Test.java:19:32:19:35 | data [post update] : byte[] | Test.java:25:69:25:72 | data : byte[] | provenance |  |
 | Test.java:22:49:22:52 | data : byte[] | Test.java:10:31:10:41 | data : byte[] | provenance |  |
-| Test.java:22:49:22:52 | data : byte[] | Test.java:22:36:22:53 | byteToString(...) | provenance | MaD:2 Sink:MaD:5 |
-| Test.java:25:56:25:73 | byteToString(...) : String | Test.java:25:26:25:80 | ... + ... | provenance |  Sink:MaD:4 |
+| Test.java:22:49:22:52 | data : byte[] | Test.java:22:36:22:53 | byteToString(...) | provenance | MaD:6 Sink:MaD:2 |
+| Test.java:25:56:25:73 | byteToString(...) : String | Test.java:25:26:25:80 | ... + ... | provenance | Sink:MaD:1 |
 | Test.java:25:69:25:72 | data : byte[] | Test.java:10:31:10:41 | data : byte[] | provenance |  |
-| Test.java:25:69:25:72 | data : byte[] | Test.java:25:56:25:73 | byteToString(...) : String | provenance | MaD:2 |
-| Test.java:41:21:41:49 | readEnv(...) : String | Test.java:44:26:44:68 | ... + ... | provenance | Src:MaD:6  Sink:MaD:4 |
-| Test.java:41:21:41:49 | readEnv(...) : String | Test.java:47:36:47:41 | result | provenance | Src:MaD:6  Sink:MaD:5 |
-| Test.java:64:5:64:13 | System.in : InputStream | Test.java:64:20:64:23 | data [post update] : byte[] | provenance | MaD:1 |
+| Test.java:25:69:25:72 | data : byte[] | Test.java:25:56:25:73 | byteToString(...) : String | provenance | MaD:6 |
+| Test.java:41:21:41:49 | readEnv(...) : String | Test.java:44:26:44:68 | ... + ... | provenance | Src:MaD:4 Sink:MaD:1 |
+| Test.java:41:21:41:49 | readEnv(...) : String | Test.java:47:36:47:41 | result | provenance | Src:MaD:4 Sink:MaD:2 |
+| Test.java:64:5:64:13 | System.in : InputStream | Test.java:64:20:64:23 | data [post update] : byte[] | provenance | MaD:5 |
 | Test.java:64:20:64:23 | data [post update] : byte[] | Test.java:67:69:67:72 | data : byte[] | provenance |  |
 | Test.java:64:20:64:23 | data [post update] : byte[] | Test.java:70:49:70:52 | data : byte[] | provenance |  |
-| Test.java:67:56:67:73 | byteToString(...) : String | Test.java:67:26:67:80 | ... + ... | provenance |  Sink:MaD:4 |
+| Test.java:67:56:67:73 | byteToString(...) : String | Test.java:67:26:67:80 | ... + ... | provenance | Sink:MaD:1 |
 | Test.java:67:69:67:72 | data : byte[] | Test.java:10:31:10:41 | data : byte[] | provenance |  |
-| Test.java:67:69:67:72 | data : byte[] | Test.java:67:56:67:73 | byteToString(...) : String | provenance | MaD:2 |
+| Test.java:67:69:67:72 | data : byte[] | Test.java:67:56:67:73 | byteToString(...) : String | provenance | MaD:6 |
 | Test.java:70:49:70:52 | data : byte[] | Test.java:10:31:10:41 | data : byte[] | provenance |  |
-| Test.java:70:49:70:52 | data : byte[] | Test.java:70:36:70:53 | byteToString(...) | provenance | MaD:2 Sink:MaD:5 |
+| Test.java:70:49:70:52 | data : byte[] | Test.java:70:36:70:53 | byteToString(...) | provenance | MaD:6 Sink:MaD:2 |
 nodes
 | Test.java:10:31:10:41 | data : byte[] | semmle.label | data : byte[] |
 | Test.java:11:12:11:51 | new String(...) : String | semmle.label | new String(...) : String |
diff --git a/java/ql/test/library-tests/dataflow/threat-models/threat-models-flowtest6.expected b/java/ql/test/library-tests/dataflow/threat-models/threat-models-flowtest6.expected
index 864d0333f9d..8939d7050f5 100644
--- a/java/ql/test/library-tests/dataflow/threat-models/threat-models-flowtest6.expected
+++ b/java/ql/test/library-tests/dataflow/threat-models/threat-models-flowtest6.expected
@@ -1,31 +1,31 @@
 models
-| 1 | Summary: java.io; InputStream; true; read; (byte[]); ; Argument[this]; Argument[0]; taint; manual |
-| 2 | Summary: java.lang; String; false; String; ; ; Argument[0]; Argument[this]; taint; manual |
+| 1 | Sink: java.sql; Statement; true; executeUpdate; ; ; Argument[0]; sql-injection; manual |
+| 2 | Sink: java.util.logging; Logger; true; severe; ; ; Argument[0]; log-injection; manual |
 | 3 | Source: java.net; Socket; false; getInputStream; (); ; ReturnValue; remote; manual |
-| 4 | Sink: java.sql; Statement; true; executeUpdate; ; ; Argument[0]; sql-injection; manual |
-| 5 | Sink: java.util.logging; Logger; true; severe; ; ; Argument[0]; log-injection; manual |
-| 6 | Source: testlib; TestSources; false; executeQuery; (String); ; ReturnValue; database; manual |
+| 4 | Source: testlib; TestSources; false; executeQuery; (String); ; ReturnValue; database; manual |
+| 5 | Summary: java.io; InputStream; true; read; (byte[]); ; Argument[this]; Argument[0]; taint; manual |
+| 6 | Summary: java.lang; String; false; String; ; ; Argument[0]; Argument[this]; taint; manual |
 edges
 | Test.java:10:31:10:41 | data : byte[] | Test.java:11:23:11:26 | data : byte[] | provenance |  |
-| Test.java:11:23:11:26 | data : byte[] | Test.java:11:12:11:51 | new String(...) : String | provenance | MaD:2 |
-| Test.java:19:5:19:25 | getInputStream(...) : InputStream | Test.java:19:32:19:35 | data [post update] : byte[] | provenance | Src:MaD:3 MaD:1 |
+| Test.java:11:23:11:26 | data : byte[] | Test.java:11:12:11:51 | new String(...) : String | provenance | MaD:6 |
+| Test.java:19:5:19:25 | getInputStream(...) : InputStream | Test.java:19:32:19:35 | data [post update] : byte[] | provenance | Src:MaD:3 MaD:5 |
 | Test.java:19:32:19:35 | data [post update] : byte[] | Test.java:22:49:22:52 | data : byte[] | provenance |  |
 | Test.java:19:32:19:35 | data [post update] : byte[] | Test.java:25:69:25:72 | data : byte[] | provenance |  |
 | Test.java:22:49:22:52 | data : byte[] | Test.java:10:31:10:41 | data : byte[] | provenance |  |
-| Test.java:22:49:22:52 | data : byte[] | Test.java:22:36:22:53 | byteToString(...) | provenance | MaD:2 Sink:MaD:5 |
-| Test.java:25:56:25:73 | byteToString(...) : String | Test.java:25:26:25:80 | ... + ... | provenance |  Sink:MaD:4 |
+| Test.java:22:49:22:52 | data : byte[] | Test.java:22:36:22:53 | byteToString(...) | provenance | MaD:6 Sink:MaD:2 |
+| Test.java:25:56:25:73 | byteToString(...) : String | Test.java:25:26:25:80 | ... + ... | provenance | Sink:MaD:1 |
 | Test.java:25:69:25:72 | data : byte[] | Test.java:10:31:10:41 | data : byte[] | provenance |  |
-| Test.java:25:69:25:72 | data : byte[] | Test.java:25:56:25:73 | byteToString(...) : String | provenance | MaD:2 |
-| Test.java:30:21:30:61 | executeQuery(...) : String | Test.java:33:26:33:68 | ... + ... | provenance | Src:MaD:6  Sink:MaD:4 |
-| Test.java:30:21:30:61 | executeQuery(...) : String | Test.java:36:36:36:41 | result | provenance | Src:MaD:6  Sink:MaD:5 |
-| Test.java:64:5:64:13 | System.in : InputStream | Test.java:64:20:64:23 | data [post update] : byte[] | provenance | MaD:1 |
+| Test.java:25:69:25:72 | data : byte[] | Test.java:25:56:25:73 | byteToString(...) : String | provenance | MaD:6 |
+| Test.java:30:21:30:61 | executeQuery(...) : String | Test.java:33:26:33:68 | ... + ... | provenance | Src:MaD:4 Sink:MaD:1 |
+| Test.java:30:21:30:61 | executeQuery(...) : String | Test.java:36:36:36:41 | result | provenance | Src:MaD:4 Sink:MaD:2 |
+| Test.java:64:5:64:13 | System.in : InputStream | Test.java:64:20:64:23 | data [post update] : byte[] | provenance | MaD:5 |
 | Test.java:64:20:64:23 | data [post update] : byte[] | Test.java:67:69:67:72 | data : byte[] | provenance |  |
 | Test.java:64:20:64:23 | data [post update] : byte[] | Test.java:70:49:70:52 | data : byte[] | provenance |  |
-| Test.java:67:56:67:73 | byteToString(...) : String | Test.java:67:26:67:80 | ... + ... | provenance |  Sink:MaD:4 |
+| Test.java:67:56:67:73 | byteToString(...) : String | Test.java:67:26:67:80 | ... + ... | provenance | Sink:MaD:1 |
 | Test.java:67:69:67:72 | data : byte[] | Test.java:10:31:10:41 | data : byte[] | provenance |  |
-| Test.java:67:69:67:72 | data : byte[] | Test.java:67:56:67:73 | byteToString(...) : String | provenance | MaD:2 |
+| Test.java:67:69:67:72 | data : byte[] | Test.java:67:56:67:73 | byteToString(...) : String | provenance | MaD:6 |
 | Test.java:70:49:70:52 | data : byte[] | Test.java:10:31:10:41 | data : byte[] | provenance |  |
-| Test.java:70:49:70:52 | data : byte[] | Test.java:70:36:70:53 | byteToString(...) | provenance | MaD:2 Sink:MaD:5 |
+| Test.java:70:49:70:52 | data : byte[] | Test.java:70:36:70:53 | byteToString(...) | provenance | MaD:6 Sink:MaD:2 |
 nodes
 | Test.java:10:31:10:41 | data : byte[] | semmle.label | data : byte[] |
 | Test.java:11:12:11:51 | new String(...) : String | semmle.label | new String(...) : String |
diff --git a/java/ql/test/library-tests/frameworks/JaxWs/JaxRsFlow.ql b/java/ql/test/library-tests/frameworks/JaxWs/JaxRsFlow.ql
index d7d94430486..348956f2498 100644
--- a/java/ql/test/library-tests/frameworks/JaxWs/JaxRsFlow.ql
+++ b/java/ql/test/library-tests/frameworks/JaxWs/JaxRsFlow.ql
@@ -7,7 +7,7 @@ module Config implements DataFlow::ConfigSig {
   predicate isSource(DataFlow::Node node) {
     DefaultFlowConfig::isSource(node)
     or
-    node instanceof ThreatModelFlowSource
+    node instanceof ActiveThreatModelSource
   }
 
   predicate isSink = DefaultFlowConfig::isSink/1;
diff --git a/java/ql/test/library-tests/frameworks/JaxWs/UrlRedirect.expected b/java/ql/test/library-tests/frameworks/JaxWs/UrlRedirect.expected
index d71923da4b5..3ec0e9f99c0 100644
--- a/java/ql/test/library-tests/frameworks/JaxWs/UrlRedirect.expected
+++ b/java/ql/test/library-tests/frameworks/JaxWs/UrlRedirect.expected
@@ -4,17 +4,17 @@
 | UrlRedirectJax.java:10:24:10:62 | new URI(...) | UrlRedirectJax.java:10:32:10:61 | getParameter(...) : String | UrlRedirectJax.java:10:24:10:62 | new URI(...) | Untrusted URL redirection depends on a $@. | UrlRedirectJax.java:10:32:10:61 | getParameter(...) | user-provided value |
 | UrlRedirectJax.java:13:33:13:71 | new URI(...) | UrlRedirectJax.java:13:41:13:70 | getParameter(...) : String | UrlRedirectJax.java:13:33:13:71 | new URI(...) | Untrusted URL redirection depends on a $@. | UrlRedirectJax.java:13:41:13:70 | getParameter(...) | user-provided value |
 edges
-| UrlRedirectJakarta.java:10:32:10:61 | getParameter(...) : String | UrlRedirectJakarta.java:10:24:10:62 | new URI(...) | provenance | Src:MaD:4 MaD:3 Sink:MaD:1 |
-| UrlRedirectJakarta.java:13:41:13:70 | getParameter(...) : String | UrlRedirectJakarta.java:13:33:13:71 | new URI(...) | provenance | Src:MaD:4 MaD:3 Sink:MaD:2 |
-| UrlRedirectJax.java:10:32:10:61 | getParameter(...) : String | UrlRedirectJax.java:10:24:10:62 | new URI(...) | provenance | Src:MaD:4 MaD:3 Sink:MaD:5 |
-| UrlRedirectJax.java:13:41:13:70 | getParameter(...) : String | UrlRedirectJax.java:13:33:13:71 | new URI(...) | provenance | Src:MaD:4 MaD:3 Sink:MaD:6 |
+| UrlRedirectJakarta.java:10:32:10:61 | getParameter(...) : String | UrlRedirectJakarta.java:10:24:10:62 | new URI(...) | provenance | Src:MaD:5 MaD:6 Sink:MaD:1 |
+| UrlRedirectJakarta.java:13:41:13:70 | getParameter(...) : String | UrlRedirectJakarta.java:13:33:13:71 | new URI(...) | provenance | Src:MaD:5 MaD:6 Sink:MaD:2 |
+| UrlRedirectJax.java:10:32:10:61 | getParameter(...) : String | UrlRedirectJax.java:10:24:10:62 | new URI(...) | provenance | Src:MaD:5 MaD:6 Sink:MaD:3 |
+| UrlRedirectJax.java:13:41:13:70 | getParameter(...) : String | UrlRedirectJax.java:13:33:13:71 | new URI(...) | provenance | Src:MaD:5 MaD:6 Sink:MaD:4 |
 models
 | 1 | Sink: jakarta.ws.rs.core; Response; true; seeOther; ; ; Argument[0]; url-redirection; manual |
 | 2 | Sink: jakarta.ws.rs.core; Response; true; temporaryRedirect; ; ; Argument[0]; url-redirection; manual |
-| 3 | Summary: java.net; URI; false; URI; (String); ; Argument[0]; Argument[this]; taint; manual |
-| 4 | Source: javax.servlet; ServletRequest; false; getParameter; (String); ; ReturnValue; remote; manual |
-| 5 | Sink: javax.ws.rs.core; Response; true; seeOther; ; ; Argument[0]; url-redirection; manual |
-| 6 | Sink: javax.ws.rs.core; Response; true; temporaryRedirect; ; ; Argument[0]; url-redirection; manual |
+| 3 | Sink: javax.ws.rs.core; Response; true; seeOther; ; ; Argument[0]; url-redirection; manual |
+| 4 | Sink: javax.ws.rs.core; Response; true; temporaryRedirect; ; ; Argument[0]; url-redirection; manual |
+| 5 | Source: javax.servlet; ServletRequest; false; getParameter; (String); ; ReturnValue; remote; manual |
+| 6 | Summary: java.net; URI; false; URI; (String); ; Argument[0]; Argument[this]; taint; manual |
 nodes
 | UrlRedirectJakarta.java:10:24:10:62 | new URI(...) | semmle.label | new URI(...) |
 | UrlRedirectJakarta.java:10:32:10:61 | getParameter(...) : String | semmle.label | getParameter(...) : String |
diff --git a/java/ql/test/library-tests/frameworks/android/content-provider-summaries/test.expected b/java/ql/test/library-tests/frameworks/android/content-provider-summaries/test.expected
index b7de62c4fb8..07b4e0d46c9 100644
--- a/java/ql/test/library-tests/frameworks/android/content-provider-summaries/test.expected
+++ b/java/ql/test/library-tests/frameworks/android/content-provider-summaries/test.expected
@@ -7,29 +7,29 @@ models
 | 6 | Summary: android.content; ContentProviderClient; true; insert; ; ; Argument[this]; ReturnValue; taint; manual |
 | 7 | Summary: android.content; ContentProviderClient; true; query; ; ; Argument[this]; ReturnValue; taint; manual |
 | 8 | Summary: android.content; ContentProviderClient; true; uncanonicalize; ; ; Argument[this]; ReturnValue; taint; manual |
-| 9 | Summary: android.content; ContentProviderOperation; false; apply; ; ; Argument[this]; ReturnValue; taint; manual |
-| 10 | Summary: android.content; ContentProviderOperation; false; apply; ; ; Argument[0]; ReturnValue; taint; manual |
-| 11 | Summary: android.content; ContentProviderOperation; false; getUri; ; ; Argument[this]; ReturnValue; taint; manual |
-| 12 | Summary: android.content; ContentProviderOperation; false; newAssertQuery; ; ; Argument[0]; ReturnValue; taint; manual |
-| 13 | Summary: android.content; ContentProviderOperation; false; newCall; ; ; Argument[0]; ReturnValue; taint; manual |
-| 14 | Summary: android.content; ContentProviderOperation; false; newDelete; ; ; Argument[0]; ReturnValue; taint; manual |
-| 15 | Summary: android.content; ContentProviderOperation; false; newInsert; ; ; Argument[0]; ReturnValue; taint; manual |
-| 16 | Summary: android.content; ContentProviderOperation; false; newUpdate; ; ; Argument[0]; ReturnValue; taint; manual |
-| 17 | Summary: android.content; ContentProviderOperation; false; resolveExtrasBackReferences; ; ; Argument[0]; ReturnValue; taint; manual |
-| 18 | Summary: android.content; ContentProviderOperation; false; resolveSelectionArgsBackReferences; ; ; Argument[0]; ReturnValue; taint; manual |
-| 19 | Summary: android.content; ContentProviderOperation; false; resolveValueBackReferences; ; ; Argument[0]; ReturnValue; taint; manual |
-| 20 | Summary: android.content; ContentProviderOperation$Builder; false; build; ; ; Argument[this]; ReturnValue; taint; manual |
-| 21 | Summary: android.content; ContentProviderOperation$Builder; false; withExceptionAllowed; ; ; Argument[this]; ReturnValue; value; manual |
-| 22 | Summary: android.content; ContentProviderOperation$Builder; false; withExpectedCount; ; ; Argument[this]; ReturnValue; value; manual |
-| 23 | Summary: android.content; ContentProviderOperation$Builder; false; withExtra; ; ; Argument[this]; ReturnValue; value; manual |
-| 24 | Summary: android.content; ContentProviderOperation$Builder; false; withExtraBackReference; ; ; Argument[this]; ReturnValue; value; manual |
-| 25 | Summary: android.content; ContentProviderOperation$Builder; false; withExtras; ; ; Argument[this]; ReturnValue; value; manual |
-| 26 | Summary: android.content; ContentProviderOperation$Builder; false; withSelection; ; ; Argument[this]; ReturnValue; value; manual |
-| 27 | Summary: android.content; ContentProviderOperation$Builder; false; withSelectionBackReference; ; ; Argument[this]; ReturnValue; value; manual |
-| 28 | Summary: android.content; ContentProviderOperation$Builder; false; withValue; ; ; Argument[this]; ReturnValue; value; manual |
-| 29 | Summary: android.content; ContentProviderOperation$Builder; false; withValueBackReference; ; ; Argument[this]; ReturnValue; value; manual |
-| 30 | Summary: android.content; ContentProviderOperation$Builder; false; withValues; ; ; Argument[this]; ReturnValue; value; manual |
-| 31 | Summary: android.content; ContentProviderOperation$Builder; false; withYieldAllowed; ; ; Argument[this]; ReturnValue; value; manual |
+| 9 | Summary: android.content; ContentProviderOperation$Builder; false; build; ; ; Argument[this]; ReturnValue; taint; manual |
+| 10 | Summary: android.content; ContentProviderOperation$Builder; false; withExceptionAllowed; ; ; Argument[this]; ReturnValue; value; manual |
+| 11 | Summary: android.content; ContentProviderOperation$Builder; false; withExpectedCount; ; ; Argument[this]; ReturnValue; value; manual |
+| 12 | Summary: android.content; ContentProviderOperation$Builder; false; withExtra; ; ; Argument[this]; ReturnValue; value; manual |
+| 13 | Summary: android.content; ContentProviderOperation$Builder; false; withExtraBackReference; ; ; Argument[this]; ReturnValue; value; manual |
+| 14 | Summary: android.content; ContentProviderOperation$Builder; false; withExtras; ; ; Argument[this]; ReturnValue; value; manual |
+| 15 | Summary: android.content; ContentProviderOperation$Builder; false; withSelection; ; ; Argument[this]; ReturnValue; value; manual |
+| 16 | Summary: android.content; ContentProviderOperation$Builder; false; withSelectionBackReference; ; ; Argument[this]; ReturnValue; value; manual |
+| 17 | Summary: android.content; ContentProviderOperation$Builder; false; withValue; ; ; Argument[this]; ReturnValue; value; manual |
+| 18 | Summary: android.content; ContentProviderOperation$Builder; false; withValueBackReference; ; ; Argument[this]; ReturnValue; value; manual |
+| 19 | Summary: android.content; ContentProviderOperation$Builder; false; withValues; ; ; Argument[this]; ReturnValue; value; manual |
+| 20 | Summary: android.content; ContentProviderOperation$Builder; false; withYieldAllowed; ; ; Argument[this]; ReturnValue; value; manual |
+| 21 | Summary: android.content; ContentProviderOperation; false; apply; ; ; Argument[0]; ReturnValue; taint; manual |
+| 22 | Summary: android.content; ContentProviderOperation; false; apply; ; ; Argument[this]; ReturnValue; taint; manual |
+| 23 | Summary: android.content; ContentProviderOperation; false; getUri; ; ; Argument[this]; ReturnValue; taint; manual |
+| 24 | Summary: android.content; ContentProviderOperation; false; newAssertQuery; ; ; Argument[0]; ReturnValue; taint; manual |
+| 25 | Summary: android.content; ContentProviderOperation; false; newCall; ; ; Argument[0]; ReturnValue; taint; manual |
+| 26 | Summary: android.content; ContentProviderOperation; false; newDelete; ; ; Argument[0]; ReturnValue; taint; manual |
+| 27 | Summary: android.content; ContentProviderOperation; false; newInsert; ; ; Argument[0]; ReturnValue; taint; manual |
+| 28 | Summary: android.content; ContentProviderOperation; false; newUpdate; ; ; Argument[0]; ReturnValue; taint; manual |
+| 29 | Summary: android.content; ContentProviderOperation; false; resolveExtrasBackReferences; ; ; Argument[0]; ReturnValue; taint; manual |
+| 30 | Summary: android.content; ContentProviderOperation; false; resolveSelectionArgsBackReferences; ; ; Argument[0]; ReturnValue; taint; manual |
+| 31 | Summary: android.content; ContentProviderOperation; false; resolveValueBackReferences; ; ; Argument[0]; ReturnValue; taint; manual |
 | 32 | Summary: android.content; ContentProviderResult; false; ContentProviderResult; (Bundle); ; Argument[0]; Argument[this].Field[android.content.ContentProviderResult.extras]; value; manual |
 | 33 | Summary: android.content; ContentProviderResult; false; ContentProviderResult; (Parcel); ; Argument[0]; Argument[this]; taint; manual |
 | 34 | Summary: android.content; ContentProviderResult; false; ContentProviderResult; (Throwable); ; Argument[0]; Argument[this].Field[android.content.ContentProviderResult.exception]; value; manual |
@@ -42,9 +42,9 @@ models
 | 41 | Summary: android.content; ContentResolver; true; getStreamTypes; ; ; Argument[0]; ReturnValue; taint; manual |
 | 42 | Summary: android.content; ContentResolver; true; getType; ; ; Argument[0]; ReturnValue; taint; manual |
 | 43 | Summary: android.content; ContentResolver; true; insert; ; ; Argument[0]; ReturnValue; taint; manual |
-| 44 | Summary: android.content; ContentResolver; true; query; ; ; Argument[0]; ReturnValue; taint; manual |
-| 45 | Summary: android.content; ContentResolver; true; query; (Uri,String[],String,String[],String); ; Argument[0]; ReturnValue; taint; manual |
-| 46 | Summary: android.content; ContentResolver; true; query; (Uri,String[],String,String[],String,CancellationSignal); ; Argument[0]; ReturnValue; taint; manual |
+| 44 | Summary: android.content; ContentResolver; true; query; (Uri,String[],String,String[],String); ; Argument[0]; ReturnValue; taint; manual |
+| 45 | Summary: android.content; ContentResolver; true; query; (Uri,String[],String,String[],String,CancellationSignal); ; Argument[0]; ReturnValue; taint; manual |
+| 46 | Summary: android.content; ContentResolver; true; query; ; ; Argument[0]; ReturnValue; taint; manual |
 | 47 | Summary: android.content; ContentResolver; true; uncanonicalize; ; ; Argument[0]; ReturnValue; taint; manual |
 | 48 | Summary: android.content; ContentResolver; true; wrap; ; ; Argument[0]; ReturnValue; taint; manual |
 | 49 | Summary: android.content; ContentValues; false; put; ; ; Argument[0]; Argument[this].MapKey; value; manual |
@@ -60,10 +60,10 @@ models
 | 59 | Summary: android.database; Cursor; true; getNotificationUris; ; ; Argument[this]; ReturnValue; taint; manual |
 | 60 | Summary: android.database; Cursor; true; getString; ; ; Argument[this]; ReturnValue; taint; manual |
 | 61 | Summary: android.database; Cursor; true; respond; ; ; Argument[this]; ReturnValue; taint; manual |
-| 62 | Summary: generatedtest; Test; false; newWithMapValueDefault; (Object); ; Argument[0]; ReturnValue.MapValue; value; manual |
-| 63 | Summary: generatedtest; Test; false; newWithMapKeyDefault; (Object); ; Argument[0]; ReturnValue.MapKey; value; manual |
-| 64 | Summary: generatedtest; Test; false; getMapValueDefault; (Object); ; Argument[0].MapValue; ReturnValue; value; manual |
-| 65 | Summary: generatedtest; Test; false; getMapKeyDefault; (Object); ; Argument[0].MapKey; ReturnValue; value; manual |
+| 62 | Summary: generatedtest; Test; false; getMapKeyDefault; (Object); ; Argument[0].MapKey; ReturnValue; value; manual |
+| 63 | Summary: generatedtest; Test; false; getMapValueDefault; (Object); ; Argument[0].MapValue; ReturnValue; value; manual |
+| 64 | Summary: generatedtest; Test; false; newWithMapKeyDefault; (Object); ; Argument[0]; ReturnValue.MapKey; value; manual |
+| 65 | Summary: generatedtest; Test; false; newWithMapValueDefault; (Object); ; Argument[0]; ReturnValue.MapValue; value; manual |
 edges
 | Test.java:47:31:47:62 | (...)... : ContentProviderClient | Test.java:48:10:48:11 | in : ContentProviderClient | provenance |  |
 | Test.java:47:55:47:62 | source(...) : Object | Test.java:47:31:47:62 | (...)... : ContentProviderClient | provenance |  |
@@ -119,108 +119,108 @@ edges
 | Test.java:132:10:132:32 | uncanonicalize(...) : Uri | Test.java:133:9:133:11 | out | provenance |  |
 | Test.java:138:42:138:84 | (...)... : Builder | Test.java:139:10:139:11 | in : Builder | provenance |  |
 | Test.java:138:77:138:84 | source(...) : Object | Test.java:138:42:138:84 | (...)... : Builder | provenance |  |
-| Test.java:139:10:139:11 | in : Builder | Test.java:139:10:139:19 | build(...) : ContentProviderOperation | provenance | MaD:20 |
+| Test.java:139:10:139:11 | in : Builder | Test.java:139:10:139:19 | build(...) : ContentProviderOperation | provenance | MaD:9 |
 | Test.java:139:10:139:19 | build(...) : ContentProviderOperation | Test.java:140:9:140:11 | out | provenance |  |
 | Test.java:145:42:145:84 | (...)... : Builder | Test.java:146:10:146:11 | in : Builder | provenance |  |
 | Test.java:145:77:145:84 | source(...) : Object | Test.java:145:42:145:84 | (...)... : Builder | provenance |  |
-| Test.java:146:10:146:11 | in : Builder | Test.java:146:10:146:39 | withExceptionAllowed(...) : Builder | provenance | MaD:21 |
+| Test.java:146:10:146:11 | in : Builder | Test.java:146:10:146:39 | withExceptionAllowed(...) : Builder | provenance | MaD:10 |
 | Test.java:146:10:146:39 | withExceptionAllowed(...) : Builder | Test.java:147:9:147:11 | out | provenance |  |
 | Test.java:152:42:152:84 | (...)... : Builder | Test.java:153:10:153:11 | in : Builder | provenance |  |
 | Test.java:152:77:152:84 | source(...) : Object | Test.java:152:42:152:84 | (...)... : Builder | provenance |  |
-| Test.java:153:10:153:11 | in : Builder | Test.java:153:10:153:32 | withExpectedCount(...) : Builder | provenance | MaD:22 |
+| Test.java:153:10:153:11 | in : Builder | Test.java:153:10:153:32 | withExpectedCount(...) : Builder | provenance | MaD:11 |
 | Test.java:153:10:153:32 | withExpectedCount(...) : Builder | Test.java:154:9:154:11 | out | provenance |  |
 | Test.java:159:42:159:84 | (...)... : Builder | Test.java:160:10:160:11 | in : Builder | provenance |  |
 | Test.java:159:77:159:84 | source(...) : Object | Test.java:159:42:159:84 | (...)... : Builder | provenance |  |
-| Test.java:160:10:160:11 | in : Builder | Test.java:160:10:160:33 | withExtra(...) : Builder | provenance | MaD:23 |
+| Test.java:160:10:160:11 | in : Builder | Test.java:160:10:160:33 | withExtra(...) : Builder | provenance | MaD:12 |
 | Test.java:160:10:160:33 | withExtra(...) : Builder | Test.java:161:9:161:11 | out | provenance |  |
 | Test.java:166:42:166:84 | (...)... : Builder | Test.java:167:10:167:11 | in : Builder | provenance |  |
 | Test.java:166:77:166:84 | source(...) : Object | Test.java:166:42:166:84 | (...)... : Builder | provenance |  |
-| Test.java:167:10:167:11 | in : Builder | Test.java:167:10:167:43 | withExtraBackReference(...) : Builder | provenance | MaD:24 |
+| Test.java:167:10:167:11 | in : Builder | Test.java:167:10:167:43 | withExtraBackReference(...) : Builder | provenance | MaD:13 |
 | Test.java:167:10:167:43 | withExtraBackReference(...) : Builder | Test.java:168:9:168:11 | out | provenance |  |
 | Test.java:173:42:173:84 | (...)... : Builder | Test.java:174:10:174:11 | in : Builder | provenance |  |
 | Test.java:173:77:173:84 | source(...) : Object | Test.java:173:42:173:84 | (...)... : Builder | provenance |  |
-| Test.java:174:10:174:11 | in : Builder | Test.java:174:10:174:49 | withExtraBackReference(...) : Builder | provenance | MaD:24 |
+| Test.java:174:10:174:11 | in : Builder | Test.java:174:10:174:49 | withExtraBackReference(...) : Builder | provenance | MaD:13 |
 | Test.java:174:10:174:49 | withExtraBackReference(...) : Builder | Test.java:175:9:175:11 | out | provenance |  |
 | Test.java:180:42:180:84 | (...)... : Builder | Test.java:181:10:181:11 | in : Builder | provenance |  |
 | Test.java:180:77:180:84 | source(...) : Object | Test.java:180:42:180:84 | (...)... : Builder | provenance |  |
-| Test.java:181:10:181:11 | in : Builder | Test.java:181:10:181:28 | withExtras(...) : Builder | provenance | MaD:25 |
+| Test.java:181:10:181:11 | in : Builder | Test.java:181:10:181:28 | withExtras(...) : Builder | provenance | MaD:14 |
 | Test.java:181:10:181:28 | withExtras(...) : Builder | Test.java:182:9:182:11 | out | provenance |  |
 | Test.java:187:42:187:84 | (...)... : Builder | Test.java:188:10:188:11 | in : Builder | provenance |  |
 | Test.java:187:77:187:84 | source(...) : Object | Test.java:187:42:187:84 | (...)... : Builder | provenance |  |
-| Test.java:188:10:188:11 | in : Builder | Test.java:188:10:188:37 | withSelection(...) : Builder | provenance | MaD:26 |
+| Test.java:188:10:188:11 | in : Builder | Test.java:188:10:188:37 | withSelection(...) : Builder | provenance | MaD:15 |
 | Test.java:188:10:188:37 | withSelection(...) : Builder | Test.java:189:9:189:11 | out | provenance |  |
 | Test.java:194:42:194:84 | (...)... : Builder | Test.java:195:10:195:11 | in : Builder | provenance |  |
 | Test.java:194:77:194:84 | source(...) : Object | Test.java:194:42:194:84 | (...)... : Builder | provenance |  |
-| Test.java:195:10:195:11 | in : Builder | Test.java:195:10:195:44 | withSelectionBackReference(...) : Builder | provenance | MaD:27 |
+| Test.java:195:10:195:11 | in : Builder | Test.java:195:10:195:44 | withSelectionBackReference(...) : Builder | provenance | MaD:16 |
 | Test.java:195:10:195:44 | withSelectionBackReference(...) : Builder | Test.java:196:9:196:11 | out | provenance |  |
 | Test.java:201:42:201:84 | (...)... : Builder | Test.java:202:10:202:11 | in : Builder | provenance |  |
 | Test.java:201:77:201:84 | source(...) : Object | Test.java:201:42:201:84 | (...)... : Builder | provenance |  |
-| Test.java:202:10:202:11 | in : Builder | Test.java:202:10:202:50 | withSelectionBackReference(...) : Builder | provenance | MaD:27 |
+| Test.java:202:10:202:11 | in : Builder | Test.java:202:10:202:50 | withSelectionBackReference(...) : Builder | provenance | MaD:16 |
 | Test.java:202:10:202:50 | withSelectionBackReference(...) : Builder | Test.java:203:9:203:11 | out | provenance |  |
 | Test.java:208:42:208:84 | (...)... : Builder | Test.java:209:10:209:11 | in : Builder | provenance |  |
 | Test.java:208:77:208:84 | source(...) : Object | Test.java:208:42:208:84 | (...)... : Builder | provenance |  |
-| Test.java:209:10:209:11 | in : Builder | Test.java:209:10:209:33 | withValue(...) : Builder | provenance | MaD:28 |
+| Test.java:209:10:209:11 | in : Builder | Test.java:209:10:209:33 | withValue(...) : Builder | provenance | MaD:17 |
 | Test.java:209:10:209:33 | withValue(...) : Builder | Test.java:210:9:210:11 | out | provenance |  |
 | Test.java:215:42:215:84 | (...)... : Builder | Test.java:216:10:216:11 | in : Builder | provenance |  |
 | Test.java:215:77:215:84 | source(...) : Object | Test.java:215:42:215:84 | (...)... : Builder | provenance |  |
-| Test.java:216:10:216:11 | in : Builder | Test.java:216:10:216:43 | withValueBackReference(...) : Builder | provenance | MaD:29 |
+| Test.java:216:10:216:11 | in : Builder | Test.java:216:10:216:43 | withValueBackReference(...) : Builder | provenance | MaD:18 |
 | Test.java:216:10:216:43 | withValueBackReference(...) : Builder | Test.java:217:9:217:11 | out | provenance |  |
 | Test.java:222:42:222:84 | (...)... : Builder | Test.java:223:10:223:11 | in : Builder | provenance |  |
 | Test.java:222:77:222:84 | source(...) : Object | Test.java:222:42:222:84 | (...)... : Builder | provenance |  |
-| Test.java:223:10:223:11 | in : Builder | Test.java:223:10:223:49 | withValueBackReference(...) : Builder | provenance | MaD:29 |
+| Test.java:223:10:223:11 | in : Builder | Test.java:223:10:223:49 | withValueBackReference(...) : Builder | provenance | MaD:18 |
 | Test.java:223:10:223:49 | withValueBackReference(...) : Builder | Test.java:224:9:224:11 | out | provenance |  |
 | Test.java:229:42:229:84 | (...)... : Builder | Test.java:230:10:230:11 | in : Builder | provenance |  |
 | Test.java:229:77:229:84 | source(...) : Object | Test.java:229:42:229:84 | (...)... : Builder | provenance |  |
-| Test.java:230:10:230:11 | in : Builder | Test.java:230:10:230:28 | withValues(...) : Builder | provenance | MaD:30 |
+| Test.java:230:10:230:11 | in : Builder | Test.java:230:10:230:28 | withValues(...) : Builder | provenance | MaD:19 |
 | Test.java:230:10:230:28 | withValues(...) : Builder | Test.java:231:9:231:11 | out | provenance |  |
 | Test.java:236:42:236:84 | (...)... : Builder | Test.java:237:10:237:11 | in : Builder | provenance |  |
 | Test.java:236:77:236:84 | source(...) : Object | Test.java:236:42:236:84 | (...)... : Builder | provenance |  |
-| Test.java:237:10:237:11 | in : Builder | Test.java:237:10:237:35 | withYieldAllowed(...) : Builder | provenance | MaD:31 |
+| Test.java:237:10:237:11 | in : Builder | Test.java:237:10:237:35 | withYieldAllowed(...) : Builder | provenance | MaD:20 |
 | Test.java:237:10:237:35 | withYieldAllowed(...) : Builder | Test.java:238:9:238:11 | out | provenance |  |
 | Test.java:243:34:243:68 | (...)... : ContentProviderOperation | Test.java:244:10:244:11 | in : ContentProviderOperation | provenance |  |
 | Test.java:243:61:243:68 | source(...) : Object | Test.java:243:34:243:68 | (...)... : ContentProviderOperation | provenance |  |
-| Test.java:244:10:244:11 | in : ContentProviderOperation | Test.java:244:10:244:32 | apply(...) : ContentProviderResult | provenance | MaD:9 |
+| Test.java:244:10:244:11 | in : ContentProviderOperation | Test.java:244:10:244:32 | apply(...) : ContentProviderResult | provenance | MaD:22 |
 | Test.java:244:10:244:32 | apply(...) : ContentProviderResult | Test.java:245:9:245:11 | out | provenance |  |
 | Test.java:250:25:250:50 | (...)... : ContentProvider | Test.java:252:25:252:26 | in : ContentProvider | provenance |  |
 | Test.java:250:43:250:50 | source(...) : Object | Test.java:250:25:250:50 | (...)... : ContentProvider | provenance |  |
 | Test.java:252:10:252:36 | apply(...) : ContentProviderResult | Test.java:253:9:253:11 | out | provenance |  |
-| Test.java:252:25:252:26 | in : ContentProvider | Test.java:252:10:252:36 | apply(...) : ContentProviderResult | provenance | MaD:10 |
+| Test.java:252:25:252:26 | in : ContentProvider | Test.java:252:10:252:36 | apply(...) : ContentProviderResult | provenance | MaD:21 |
 | Test.java:258:34:258:68 | (...)... : ContentProviderOperation | Test.java:259:10:259:11 | in : ContentProviderOperation | provenance |  |
 | Test.java:258:61:258:68 | source(...) : Object | Test.java:258:34:258:68 | (...)... : ContentProviderOperation | provenance |  |
-| Test.java:259:10:259:11 | in : ContentProviderOperation | Test.java:259:10:259:20 | getUri(...) : Uri | provenance | MaD:11 |
+| Test.java:259:10:259:11 | in : ContentProviderOperation | Test.java:259:10:259:20 | getUri(...) : Uri | provenance | MaD:23 |
 | Test.java:259:10:259:20 | getUri(...) : Uri | Test.java:260:9:260:11 | out | provenance |  |
 | Test.java:265:13:265:26 | (...)... : Uri | Test.java:266:50:266:51 | in : Uri | provenance |  |
 | Test.java:265:19:265:26 | source(...) : Object | Test.java:265:13:265:26 | (...)... : Uri | provenance |  |
 | Test.java:266:10:266:52 | newAssertQuery(...) : Builder | Test.java:267:9:267:11 | out | provenance |  |
-| Test.java:266:50:266:51 | in : Uri | Test.java:266:10:266:52 | newAssertQuery(...) : Builder | provenance | MaD:12 |
+| Test.java:266:50:266:51 | in : Uri | Test.java:266:10:266:52 | newAssertQuery(...) : Builder | provenance | MaD:24 |
 | Test.java:272:13:272:26 | (...)... : Uri | Test.java:273:43:273:44 | in : Uri | provenance |  |
 | Test.java:272:19:272:26 | source(...) : Object | Test.java:272:13:272:26 | (...)... : Uri | provenance |  |
 | Test.java:273:10:273:57 | newCall(...) : Builder | Test.java:274:9:274:11 | out | provenance |  |
-| Test.java:273:43:273:44 | in : Uri | Test.java:273:10:273:57 | newCall(...) : Builder | provenance | MaD:13 |
+| Test.java:273:43:273:44 | in : Uri | Test.java:273:10:273:57 | newCall(...) : Builder | provenance | MaD:25 |
 | Test.java:279:13:279:26 | (...)... : Uri | Test.java:280:45:280:46 | in : Uri | provenance |  |
 | Test.java:279:19:279:26 | source(...) : Object | Test.java:279:13:279:26 | (...)... : Uri | provenance |  |
 | Test.java:280:10:280:47 | newDelete(...) : Builder | Test.java:281:9:281:11 | out | provenance |  |
-| Test.java:280:45:280:46 | in : Uri | Test.java:280:10:280:47 | newDelete(...) : Builder | provenance | MaD:14 |
+| Test.java:280:45:280:46 | in : Uri | Test.java:280:10:280:47 | newDelete(...) : Builder | provenance | MaD:26 |
 | Test.java:286:13:286:26 | (...)... : Uri | Test.java:287:45:287:46 | in : Uri | provenance |  |
 | Test.java:286:19:286:26 | source(...) : Object | Test.java:286:13:286:26 | (...)... : Uri | provenance |  |
 | Test.java:287:10:287:47 | newInsert(...) : Builder | Test.java:288:9:288:11 | out | provenance |  |
-| Test.java:287:45:287:46 | in : Uri | Test.java:287:10:287:47 | newInsert(...) : Builder | provenance | MaD:15 |
+| Test.java:287:45:287:46 | in : Uri | Test.java:287:10:287:47 | newInsert(...) : Builder | provenance | MaD:27 |
 | Test.java:293:13:293:26 | (...)... : Uri | Test.java:294:45:294:46 | in : Uri | provenance |  |
 | Test.java:293:19:293:26 | source(...) : Object | Test.java:293:13:293:26 | (...)... : Uri | provenance |  |
 | Test.java:294:10:294:47 | newUpdate(...) : Builder | Test.java:295:9:295:11 | out | provenance |  |
-| Test.java:294:45:294:46 | in : Uri | Test.java:294:10:294:47 | newUpdate(...) : Builder | provenance | MaD:16 |
+| Test.java:294:45:294:46 | in : Uri | Test.java:294:10:294:47 | newUpdate(...) : Builder | provenance | MaD:28 |
 | Test.java:300:33:300:66 | (...)... : ContentProviderResult[] | Test.java:302:47:302:48 | in : ContentProviderResult[] | provenance |  |
 | Test.java:300:59:300:66 | source(...) : Object | Test.java:300:33:300:66 | (...)... : ContentProviderResult[] | provenance |  |
 | Test.java:302:10:302:52 | resolveExtrasBackReferences(...) : Bundle | Test.java:303:9:303:11 | out | provenance |  |
-| Test.java:302:47:302:48 | in : ContentProviderResult[] | Test.java:302:10:302:52 | resolveExtrasBackReferences(...) : Bundle | provenance | MaD:17 |
+| Test.java:302:47:302:48 | in : ContentProviderResult[] | Test.java:302:10:302:52 | resolveExtrasBackReferences(...) : Bundle | provenance | MaD:29 |
 | Test.java:308:33:308:66 | (...)... : ContentProviderResult[] | Test.java:310:54:310:55 | in : ContentProviderResult[] | provenance |  |
 | Test.java:308:59:308:66 | source(...) : Object | Test.java:308:33:308:66 | (...)... : ContentProviderResult[] | provenance |  |
 | Test.java:310:10:310:59 | resolveSelectionArgsBackReferences(...) : String[] | Test.java:311:9:311:11 | out | provenance |  |
-| Test.java:310:54:310:55 | in : ContentProviderResult[] | Test.java:310:10:310:59 | resolveSelectionArgsBackReferences(...) : String[] | provenance | MaD:18 |
+| Test.java:310:54:310:55 | in : ContentProviderResult[] | Test.java:310:10:310:59 | resolveSelectionArgsBackReferences(...) : String[] | provenance | MaD:30 |
 | Test.java:316:33:316:66 | (...)... : ContentProviderResult[] | Test.java:318:46:318:47 | in : ContentProviderResult[] | provenance |  |
 | Test.java:316:59:316:66 | source(...) : Object | Test.java:316:33:316:66 | (...)... : ContentProviderResult[] | provenance |  |
 | Test.java:318:10:318:51 | resolveValueBackReferences(...) : ContentValues | Test.java:319:9:319:11 | out | provenance |  |
-| Test.java:318:46:318:47 | in : ContentProviderResult[] | Test.java:318:10:318:51 | resolveValueBackReferences(...) : ContentValues | provenance | MaD:19 |
+| Test.java:318:46:318:47 | in : ContentProviderResult[] | Test.java:318:10:318:51 | resolveValueBackReferences(...) : ContentValues | provenance | MaD:31 |
 | Test.java:324:16:324:32 | (...)... : Bundle | Test.java:325:36:325:37 | in : Bundle | provenance |  |
 | Test.java:324:25:324:32 | source(...) : Object | Test.java:324:16:324:32 | (...)... : Bundle | provenance |  |
 | Test.java:325:10:325:38 | new ContentProviderResult(...) : ContentProviderResult [extras] : Bundle | Test.java:326:9:326:11 | out : ContentProviderResult [extras] : Bundle | provenance |  |
@@ -291,16 +291,16 @@ edges
 | Test.java:448:13:448:26 | (...)... : Uri | Test.java:450:25:450:26 | in : Uri | provenance |  |
 | Test.java:448:19:448:26 | source(...) : Object | Test.java:448:13:448:26 | (...)... : Uri | provenance |  |
 | Test.java:450:10:450:45 | query(...) : Cursor | Test.java:451:9:451:11 | out | provenance |  |
-| Test.java:450:25:450:26 | in : Uri | Test.java:450:10:450:45 | query(...) : Cursor | provenance | MaD:44 |
+| Test.java:450:25:450:26 | in : Uri | Test.java:450:10:450:45 | query(...) : Cursor | provenance | MaD:46 |
 | Test.java:456:13:456:26 | (...)... : Uri | Test.java:458:25:458:26 | in : Uri | provenance |  |
 | Test.java:456:19:456:26 | source(...) : Object | Test.java:456:13:456:26 | (...)... : Uri | provenance |  |
 | Test.java:458:10:458:51 | query(...) : Cursor | Test.java:459:9:459:11 | out | provenance |  |
 | Test.java:458:25:458:26 | in : Uri | Test.java:458:10:458:51 | query(...) : Cursor | provenance | MaD:44 |
-| Test.java:458:25:458:26 | in : Uri | Test.java:458:10:458:51 | query(...) : Cursor | provenance | MaD:45 |
+| Test.java:458:25:458:26 | in : Uri | Test.java:458:10:458:51 | query(...) : Cursor | provenance | MaD:46 |
 | Test.java:464:13:464:26 | (...)... : Uri | Test.java:466:25:466:26 | in : Uri | provenance |  |
 | Test.java:464:19:464:26 | source(...) : Object | Test.java:464:13:464:26 | (...)... : Uri | provenance |  |
 | Test.java:466:10:466:57 | query(...) : Cursor | Test.java:467:9:467:11 | out | provenance |  |
-| Test.java:466:25:466:26 | in : Uri | Test.java:466:10:466:57 | query(...) : Cursor | provenance | MaD:44 |
+| Test.java:466:25:466:26 | in : Uri | Test.java:466:10:466:57 | query(...) : Cursor | provenance | MaD:45 |
 | Test.java:466:25:466:26 | in : Uri | Test.java:466:10:466:57 | query(...) : Cursor | provenance | MaD:46 |
 | Test.java:472:13:472:26 | (...)... : Uri | Test.java:474:34:474:35 | in : Uri | provenance |  |
 | Test.java:472:19:472:26 | source(...) : Object | Test.java:472:13:472:26 | (...)... : Uri | provenance |  |
@@ -318,104 +318,104 @@ edges
 | Test.java:494:25:494:32 | source(...) : Object | Test.java:494:16:494:32 | (...)... : String | provenance |  |
 | Test.java:495:4:495:6 | out [post update] : ContentValues [<map.key>] : String | Test.java:496:26:496:28 | out : ContentValues [<map.key>] : String | provenance |  |
 | Test.java:495:12:495:13 | in : String | Test.java:495:4:495:6 | out [post update] : ContentValues [<map.key>] : String | provenance | MaD:49 |
-| Test.java:496:26:496:28 | out : ContentValues [<map.key>] : String | Test.java:496:9:496:29 | getMapKeyDefault(...) | provenance | MaD:65 |
+| Test.java:496:26:496:28 | out : ContentValues [<map.key>] : String | Test.java:496:9:496:29 | getMapKeyDefault(...) | provenance | MaD:62 |
 | Test.java:501:16:501:32 | (...)... : String | Test.java:502:12:502:13 | in : String | provenance |  |
 | Test.java:501:25:501:32 | source(...) : Object | Test.java:501:16:501:32 | (...)... : String | provenance |  |
 | Test.java:502:4:502:6 | out [post update] : ContentValues [<map.key>] : String | Test.java:503:26:503:28 | out : ContentValues [<map.key>] : String | provenance |  |
 | Test.java:502:12:502:13 | in : String | Test.java:502:4:502:6 | out [post update] : ContentValues [<map.key>] : String | provenance | MaD:49 |
-| Test.java:503:26:503:28 | out : ContentValues [<map.key>] : String | Test.java:503:9:503:29 | getMapKeyDefault(...) | provenance | MaD:65 |
+| Test.java:503:26:503:28 | out : ContentValues [<map.key>] : String | Test.java:503:9:503:29 | getMapKeyDefault(...) | provenance | MaD:62 |
 | Test.java:508:16:508:32 | (...)... : String | Test.java:509:12:509:13 | in : String | provenance |  |
 | Test.java:508:25:508:32 | source(...) : Object | Test.java:508:16:508:32 | (...)... : String | provenance |  |
 | Test.java:509:4:509:6 | out [post update] : ContentValues [<map.key>] : String | Test.java:510:26:510:28 | out : ContentValues [<map.key>] : String | provenance |  |
 | Test.java:509:12:509:13 | in : String | Test.java:509:4:509:6 | out [post update] : ContentValues [<map.key>] : String | provenance | MaD:49 |
-| Test.java:510:26:510:28 | out : ContentValues [<map.key>] : String | Test.java:510:9:510:29 | getMapKeyDefault(...) | provenance | MaD:65 |
+| Test.java:510:26:510:28 | out : ContentValues [<map.key>] : String | Test.java:510:9:510:29 | getMapKeyDefault(...) | provenance | MaD:62 |
 | Test.java:515:16:515:32 | (...)... : String | Test.java:516:12:516:13 | in : String | provenance |  |
 | Test.java:515:25:515:32 | source(...) : Object | Test.java:515:16:515:32 | (...)... : String | provenance |  |
 | Test.java:516:4:516:6 | out [post update] : ContentValues [<map.key>] : String | Test.java:517:26:517:28 | out : ContentValues [<map.key>] : String | provenance |  |
 | Test.java:516:12:516:13 | in : String | Test.java:516:4:516:6 | out [post update] : ContentValues [<map.key>] : String | provenance | MaD:49 |
-| Test.java:517:26:517:28 | out : ContentValues [<map.key>] : String | Test.java:517:9:517:29 | getMapKeyDefault(...) | provenance | MaD:65 |
+| Test.java:517:26:517:28 | out : ContentValues [<map.key>] : String | Test.java:517:9:517:29 | getMapKeyDefault(...) | provenance | MaD:62 |
 | Test.java:522:16:522:32 | (...)... : String | Test.java:523:12:523:13 | in : String | provenance |  |
 | Test.java:522:25:522:32 | source(...) : Object | Test.java:522:16:522:32 | (...)... : String | provenance |  |
 | Test.java:523:4:523:6 | out [post update] : ContentValues [<map.key>] : String | Test.java:524:26:524:28 | out : ContentValues [<map.key>] : String | provenance |  |
 | Test.java:523:12:523:13 | in : String | Test.java:523:4:523:6 | out [post update] : ContentValues [<map.key>] : String | provenance | MaD:49 |
-| Test.java:524:26:524:28 | out : ContentValues [<map.key>] : String | Test.java:524:9:524:29 | getMapKeyDefault(...) | provenance | MaD:65 |
+| Test.java:524:26:524:28 | out : ContentValues [<map.key>] : String | Test.java:524:9:524:29 | getMapKeyDefault(...) | provenance | MaD:62 |
 | Test.java:529:16:529:32 | (...)... : String | Test.java:530:12:530:13 | in : String | provenance |  |
 | Test.java:529:25:529:32 | source(...) : Object | Test.java:529:16:529:32 | (...)... : String | provenance |  |
 | Test.java:530:4:530:6 | out [post update] : ContentValues [<map.key>] : String | Test.java:531:26:531:28 | out : ContentValues [<map.key>] : String | provenance |  |
 | Test.java:530:12:530:13 | in : String | Test.java:530:4:530:6 | out [post update] : ContentValues [<map.key>] : String | provenance | MaD:49 |
-| Test.java:531:26:531:28 | out : ContentValues [<map.key>] : String | Test.java:531:9:531:29 | getMapKeyDefault(...) | provenance | MaD:65 |
+| Test.java:531:26:531:28 | out : ContentValues [<map.key>] : String | Test.java:531:9:531:29 | getMapKeyDefault(...) | provenance | MaD:62 |
 | Test.java:536:16:536:32 | (...)... : String | Test.java:537:12:537:13 | in : String | provenance |  |
 | Test.java:536:25:536:32 | source(...) : Object | Test.java:536:16:536:32 | (...)... : String | provenance |  |
 | Test.java:537:4:537:6 | out [post update] : ContentValues [<map.key>] : String | Test.java:538:26:538:28 | out : ContentValues [<map.key>] : String | provenance |  |
 | Test.java:537:12:537:13 | in : String | Test.java:537:4:537:6 | out [post update] : ContentValues [<map.key>] : String | provenance | MaD:49 |
-| Test.java:538:26:538:28 | out : ContentValues [<map.key>] : String | Test.java:538:9:538:29 | getMapKeyDefault(...) | provenance | MaD:65 |
+| Test.java:538:26:538:28 | out : ContentValues [<map.key>] : String | Test.java:538:9:538:29 | getMapKeyDefault(...) | provenance | MaD:62 |
 | Test.java:543:16:543:32 | (...)... : String | Test.java:544:12:544:13 | in : String | provenance |  |
 | Test.java:543:25:543:32 | source(...) : Object | Test.java:543:16:543:32 | (...)... : String | provenance |  |
 | Test.java:544:4:544:6 | out [post update] : ContentValues [<map.key>] : String | Test.java:545:26:545:28 | out : ContentValues [<map.key>] : String | provenance |  |
 | Test.java:544:12:544:13 | in : String | Test.java:544:4:544:6 | out [post update] : ContentValues [<map.key>] : String | provenance | MaD:49 |
-| Test.java:545:26:545:28 | out : ContentValues [<map.key>] : String | Test.java:545:9:545:29 | getMapKeyDefault(...) | provenance | MaD:65 |
+| Test.java:545:26:545:28 | out : ContentValues [<map.key>] : String | Test.java:545:9:545:29 | getMapKeyDefault(...) | provenance | MaD:62 |
 | Test.java:550:16:550:32 | (...)... : String | Test.java:551:12:551:13 | in : String | provenance |  |
 | Test.java:550:25:550:32 | source(...) : Object | Test.java:550:16:550:32 | (...)... : String | provenance |  |
 | Test.java:551:4:551:6 | out [post update] : ContentValues [<map.key>] : String | Test.java:552:26:552:28 | out : ContentValues [<map.key>] : String | provenance |  |
 | Test.java:551:12:551:13 | in : String | Test.java:551:4:551:6 | out [post update] : ContentValues [<map.key>] : String | provenance | MaD:49 |
-| Test.java:552:26:552:28 | out : ContentValues [<map.key>] : String | Test.java:552:9:552:29 | getMapKeyDefault(...) | provenance | MaD:65 |
+| Test.java:552:26:552:28 | out : ContentValues [<map.key>] : String | Test.java:552:9:552:29 | getMapKeyDefault(...) | provenance | MaD:62 |
 | Test.java:557:17:557:34 | (...)... : Boolean | Test.java:558:27:558:28 | in : Boolean | provenance |  |
 | Test.java:557:27:557:34 | source(...) : Object | Test.java:557:17:557:34 | (...)... : Boolean | provenance |  |
 | Test.java:558:4:558:6 | out [post update] : ContentValues [<map.value>] : Boolean | Test.java:559:28:559:30 | out : ContentValues [<map.value>] : Boolean | provenance |  |
 | Test.java:558:27:558:28 | in : Boolean | Test.java:558:4:558:6 | out [post update] : ContentValues [<map.value>] : Boolean | provenance | MaD:50 |
-| Test.java:559:28:559:30 | out : ContentValues [<map.value>] : Boolean | Test.java:559:9:559:31 | getMapValueDefault(...) | provenance | MaD:64 |
+| Test.java:559:28:559:30 | out : ContentValues [<map.value>] : Boolean | Test.java:559:9:559:31 | getMapValueDefault(...) | provenance | MaD:63 |
 | Test.java:564:14:564:28 | (...)... : Number | Test.java:565:27:565:28 | in : Number | provenance |  |
 | Test.java:564:21:564:28 | source(...) : Object | Test.java:564:14:564:28 | (...)... : Number | provenance |  |
 | Test.java:565:4:565:6 | out [post update] : ContentValues [<map.value>] : Number | Test.java:566:28:566:30 | out : ContentValues [<map.value>] : Number | provenance |  |
 | Test.java:565:27:565:28 | in : Number | Test.java:565:4:565:6 | out [post update] : ContentValues [<map.value>] : Number | provenance | MaD:50 |
-| Test.java:566:28:566:30 | out : ContentValues [<map.value>] : Number | Test.java:566:9:566:31 | getMapValueDefault(...) | provenance | MaD:64 |
+| Test.java:566:28:566:30 | out : ContentValues [<map.value>] : Number | Test.java:566:9:566:31 | getMapValueDefault(...) | provenance | MaD:63 |
 | Test.java:571:16:571:32 | (...)... : Number | Test.java:572:27:572:28 | in : Number | provenance |  |
 | Test.java:571:25:571:32 | source(...) : Object | Test.java:571:16:571:32 | (...)... : Number | provenance |  |
 | Test.java:572:4:572:6 | out [post update] : ContentValues [<map.value>] : Number | Test.java:573:28:573:30 | out : ContentValues [<map.value>] : Number | provenance |  |
 | Test.java:572:27:572:28 | in : Number | Test.java:572:4:572:6 | out [post update] : ContentValues [<map.value>] : Number | provenance | MaD:50 |
-| Test.java:573:28:573:30 | out : ContentValues [<map.value>] : Number | Test.java:573:9:573:31 | getMapValueDefault(...) | provenance | MaD:64 |
+| Test.java:573:28:573:30 | out : ContentValues [<map.value>] : Number | Test.java:573:9:573:31 | getMapValueDefault(...) | provenance | MaD:63 |
 | Test.java:578:15:578:30 | (...)... : Number | Test.java:579:27:579:28 | in : Number | provenance |  |
 | Test.java:578:23:578:30 | source(...) : Object | Test.java:578:15:578:30 | (...)... : Number | provenance |  |
 | Test.java:579:4:579:6 | out [post update] : ContentValues [<map.value>] : Number | Test.java:580:28:580:30 | out : ContentValues [<map.value>] : Number | provenance |  |
 | Test.java:579:27:579:28 | in : Number | Test.java:579:4:579:6 | out [post update] : ContentValues [<map.value>] : Number | provenance | MaD:50 |
-| Test.java:580:28:580:30 | out : ContentValues [<map.value>] : Number | Test.java:580:9:580:31 | getMapValueDefault(...) | provenance | MaD:64 |
+| Test.java:580:28:580:30 | out : ContentValues [<map.value>] : Number | Test.java:580:9:580:31 | getMapValueDefault(...) | provenance | MaD:63 |
 | Test.java:585:17:585:34 | (...)... : Number | Test.java:586:27:586:28 | in : Number | provenance |  |
 | Test.java:585:27:585:34 | source(...) : Object | Test.java:585:17:585:34 | (...)... : Number | provenance |  |
 | Test.java:586:4:586:6 | out [post update] : ContentValues [<map.value>] : Number | Test.java:587:28:587:30 | out : ContentValues [<map.value>] : Number | provenance |  |
 | Test.java:586:27:586:28 | in : Number | Test.java:586:4:586:6 | out [post update] : ContentValues [<map.value>] : Number | provenance | MaD:50 |
-| Test.java:587:28:587:30 | out : ContentValues [<map.value>] : Number | Test.java:587:9:587:31 | getMapValueDefault(...) | provenance | MaD:64 |
+| Test.java:587:28:587:30 | out : ContentValues [<map.value>] : Number | Test.java:587:9:587:31 | getMapValueDefault(...) | provenance | MaD:63 |
 | Test.java:592:14:592:28 | (...)... : Number | Test.java:593:27:593:28 | in : Number | provenance |  |
 | Test.java:592:21:592:28 | source(...) : Object | Test.java:592:14:592:28 | (...)... : Number | provenance |  |
 | Test.java:593:4:593:6 | out [post update] : ContentValues [<map.value>] : Number | Test.java:594:28:594:30 | out : ContentValues [<map.value>] : Number | provenance |  |
 | Test.java:593:27:593:28 | in : Number | Test.java:593:4:593:6 | out [post update] : ContentValues [<map.value>] : Number | provenance | MaD:50 |
-| Test.java:594:28:594:30 | out : ContentValues [<map.value>] : Number | Test.java:594:9:594:31 | getMapValueDefault(...) | provenance | MaD:64 |
+| Test.java:594:28:594:30 | out : ContentValues [<map.value>] : Number | Test.java:594:9:594:31 | getMapValueDefault(...) | provenance | MaD:63 |
 | Test.java:599:15:599:30 | (...)... : Number | Test.java:600:27:600:28 | in : Number | provenance |  |
 | Test.java:599:23:599:30 | source(...) : Object | Test.java:599:15:599:30 | (...)... : Number | provenance |  |
 | Test.java:600:4:600:6 | out [post update] : ContentValues [<map.value>] : Number | Test.java:601:28:601:30 | out : ContentValues [<map.value>] : Number | provenance |  |
 | Test.java:600:27:600:28 | in : Number | Test.java:600:4:600:6 | out [post update] : ContentValues [<map.value>] : Number | provenance | MaD:50 |
-| Test.java:601:28:601:30 | out : ContentValues [<map.value>] : Number | Test.java:601:9:601:31 | getMapValueDefault(...) | provenance | MaD:64 |
+| Test.java:601:28:601:30 | out : ContentValues [<map.value>] : Number | Test.java:601:9:601:31 | getMapValueDefault(...) | provenance | MaD:63 |
 | Test.java:606:16:606:32 | (...)... : String | Test.java:607:27:607:28 | in : String | provenance |  |
 | Test.java:606:25:606:32 | source(...) : Object | Test.java:606:16:606:32 | (...)... : String | provenance |  |
 | Test.java:607:4:607:6 | out [post update] : ContentValues [<map.value>] : String | Test.java:608:28:608:30 | out : ContentValues [<map.value>] : String | provenance |  |
 | Test.java:607:27:607:28 | in : String | Test.java:607:4:607:6 | out [post update] : ContentValues [<map.value>] : String | provenance | MaD:50 |
-| Test.java:608:28:608:30 | out : ContentValues [<map.value>] : String | Test.java:608:9:608:31 | getMapValueDefault(...) | provenance | MaD:64 |
+| Test.java:608:28:608:30 | out : ContentValues [<map.value>] : String | Test.java:608:9:608:31 | getMapValueDefault(...) | provenance | MaD:63 |
 | Test.java:613:16:613:32 | (...)... : byte[] | Test.java:614:27:614:28 | in : byte[] | provenance |  |
 | Test.java:613:25:613:32 | source(...) : Object | Test.java:613:16:613:32 | (...)... : byte[] | provenance |  |
 | Test.java:614:4:614:6 | out [post update] : ContentValues [<map.value>] : byte[] | Test.java:615:28:615:30 | out : ContentValues [<map.value>] : byte[] | provenance |  |
 | Test.java:614:27:614:28 | in : byte[] | Test.java:614:4:614:6 | out [post update] : ContentValues [<map.value>] : byte[] | provenance | MaD:50 |
-| Test.java:615:28:615:30 | out : ContentValues [<map.value>] : byte[] | Test.java:615:9:615:31 | getMapValueDefault(...) | provenance | MaD:64 |
+| Test.java:615:28:615:30 | out : ContentValues [<map.value>] : byte[] | Test.java:615:9:615:31 | getMapValueDefault(...) | provenance | MaD:63 |
 | Test.java:620:23:620:68 | (...)... : ContentValues [<map.key>] : Object | Test.java:621:15:621:16 | in : ContentValues [<map.key>] : Object | provenance |  |
 | Test.java:620:39:620:68 | newWithMapKeyDefault(...) : Object [<map.key>] : Object | Test.java:620:23:620:68 | (...)... : ContentValues [<map.key>] : Object | provenance |  |
-| Test.java:620:60:620:67 | source(...) : Object | Test.java:620:39:620:68 | newWithMapKeyDefault(...) : Object [<map.key>] : Object | provenance | MaD:63 |
+| Test.java:620:60:620:67 | source(...) : Object | Test.java:620:39:620:68 | newWithMapKeyDefault(...) : Object [<map.key>] : Object | provenance | MaD:64 |
 | Test.java:621:4:621:6 | out [post update] : ContentValues [<map.key>] : Object | Test.java:622:26:622:28 | out : ContentValues [<map.key>] : Object | provenance |  |
 | Test.java:621:15:621:16 | in : ContentValues [<map.key>] : Object | Test.java:621:4:621:6 | out [post update] : ContentValues [<map.key>] : Object | provenance | MaD:51 |
-| Test.java:622:26:622:28 | out : ContentValues [<map.key>] : Object | Test.java:622:9:622:29 | getMapKeyDefault(...) | provenance | MaD:65 |
+| Test.java:622:26:622:28 | out : ContentValues [<map.key>] : Object | Test.java:622:9:622:29 | getMapKeyDefault(...) | provenance | MaD:62 |
 | Test.java:627:23:627:70 | (...)... : ContentValues [<map.value>] : Object | Test.java:628:15:628:16 | in : ContentValues [<map.value>] : Object | provenance |  |
 | Test.java:627:39:627:70 | newWithMapValueDefault(...) : Object [<map.value>] : Object | Test.java:627:23:627:70 | (...)... : ContentValues [<map.value>] : Object | provenance |  |
-| Test.java:627:62:627:69 | source(...) : Object | Test.java:627:39:627:70 | newWithMapValueDefault(...) : Object [<map.value>] : Object | provenance | MaD:62 |
+| Test.java:627:62:627:69 | source(...) : Object | Test.java:627:39:627:70 | newWithMapValueDefault(...) : Object [<map.value>] : Object | provenance | MaD:65 |
 | Test.java:628:4:628:6 | out [post update] : ContentValues [<map.value>] : Object | Test.java:629:28:629:30 | out : ContentValues [<map.value>] : Object | provenance |  |
 | Test.java:628:15:628:16 | in : ContentValues [<map.value>] : Object | Test.java:628:4:628:6 | out [post update] : ContentValues [<map.value>] : Object | provenance | MaD:52 |
-| Test.java:629:28:629:30 | out : ContentValues [<map.value>] : Object | Test.java:629:9:629:31 | getMapValueDefault(...) | provenance | MaD:64 |
+| Test.java:629:28:629:30 | out : ContentValues [<map.value>] : Object | Test.java:629:9:629:31 | getMapValueDefault(...) | provenance | MaD:63 |
 | Test.java:634:16:634:32 | (...)... : Cursor | Test.java:635:4:635:5 | in : Cursor | provenance |  |
 | Test.java:634:25:634:32 | source(...) : Object | Test.java:634:16:634:32 | (...)... : Cursor | provenance |  |
 | Test.java:635:4:635:5 | in : Cursor | Test.java:635:29:635:31 | out [post update] : CharArrayBuffer | provenance | MaD:53 |
diff --git a/java/ql/test/library-tests/frameworks/android/content-provider/test.ql b/java/ql/test/library-tests/frameworks/android/content-provider/test.ql
index 8293f7f4ff4..b83f43911bd 100644
--- a/java/ql/test/library-tests/frameworks/android/content-provider/test.ql
+++ b/java/ql/test/library-tests/frameworks/android/content-provider/test.ql
@@ -3,7 +3,7 @@ import semmle.code.java.dataflow.FlowSources
 import TestUtilities.InlineFlowTest
 
 module ProviderTaintFlowConfig implements DataFlow::ConfigSig {
-  predicate isSource(DataFlow::Node n) { n instanceof ThreatModelFlowSource }
+  predicate isSource(DataFlow::Node n) { n instanceof ActiveThreatModelSource }
 
   predicate isSink(DataFlow::Node n) { DefaultFlowConfig::isSink(n) }
 
diff --git a/java/ql/test/library-tests/frameworks/android/external-storage/test.ql b/java/ql/test/library-tests/frameworks/android/external-storage/test.ql
index 89a353eedc9..042f7b30390 100644
--- a/java/ql/test/library-tests/frameworks/android/external-storage/test.ql
+++ b/java/ql/test/library-tests/frameworks/android/external-storage/test.ql
@@ -4,7 +4,7 @@ import semmle.code.java.dataflow.FlowSources
 import TestUtilities.InlineFlowTest
 
 module Config implements DataFlow::ConfigSig {
-  predicate isSource(DataFlow::Node src) { src instanceof ThreatModelFlowSource }
+  predicate isSource(DataFlow::Node src) { src instanceof ActiveThreatModelSource }
 
   predicate isSink(DataFlow::Node sink) {
     sink.asExpr().(Argument).getCall().getCallee().hasName("sink")
diff --git a/java/ql/test/library-tests/frameworks/android/flow-steps/test.expected b/java/ql/test/library-tests/frameworks/android/flow-steps/test.expected
index 44c86d41d03..e00e9d3df04 100644
--- a/java/ql/test/library-tests/frameworks/android/flow-steps/test.expected
+++ b/java/ql/test/library-tests/frameworks/android/flow-steps/test.expected
@@ -23,8 +23,8 @@ models
 | 22 | Summary: android.os; Parcel; false; readMap; ; ; Argument[this]; Argument[0]; taint; manual |
 | 23 | Summary: android.os; Parcel; false; readParcelable; ; ; Argument[this]; ReturnValue; taint; manual |
 | 24 | Summary: android.os; Parcel; false; readParcelableArray; ; ; Argument[this]; ReturnValue; taint; manual |
-| 25 | Summary: android.os; Parcel; false; readParcelableList; ; ; Argument[this]; Argument[0]; taint; manual |
-| 26 | Summary: android.os; Parcel; false; readParcelableList; ; ; Argument[0]; ReturnValue; value; manual |
+| 25 | Summary: android.os; Parcel; false; readParcelableList; ; ; Argument[0]; ReturnValue; value; manual |
+| 26 | Summary: android.os; Parcel; false; readParcelableList; ; ; Argument[this]; Argument[0]; taint; manual |
 | 27 | Summary: android.os; Parcel; false; readPersistableBundle; ; ; Argument[this]; ReturnValue; taint; manual |
 | 28 | Summary: android.os; Parcel; false; readSerializable; ; ; Argument[this]; ReturnValue; taint; manual |
 | 29 | Summary: android.os; Parcel; false; readSize; ; ; Argument[this]; ReturnValue; taint; manual |
@@ -142,12 +142,12 @@ edges
 | Test.java:201:10:201:37 | readParcelableArray(...) : Parcelable[] | Test.java:202:9:202:11 | out | provenance |  |
 | Test.java:207:16:207:31 | (...)... : Parcel | Test.java:208:4:208:5 | in : Parcel | provenance |  |
 | Test.java:207:24:207:31 | source(...) : Object | Test.java:207:16:207:31 | (...)... : Parcel | provenance |  |
-| Test.java:208:4:208:5 | in : Parcel | Test.java:208:26:208:28 | out [post update] : List | provenance | MaD:25 |
+| Test.java:208:4:208:5 | in : Parcel | Test.java:208:26:208:28 | out [post update] : List | provenance | MaD:26 |
 | Test.java:208:26:208:28 | out [post update] : List | Test.java:209:9:209:11 | out | provenance |  |
 | Test.java:214:14:214:27 | (...)... : List | Test.java:216:38:216:39 | in : List | provenance |  |
 | Test.java:214:20:214:27 | source(...) : Object | Test.java:214:14:214:27 | (...)... : List | provenance |  |
 | Test.java:216:10:216:46 | readParcelableList(...) : List | Test.java:217:9:217:11 | out | provenance |  |
-| Test.java:216:38:216:39 | in : List | Test.java:216:10:216:46 | readParcelableList(...) : List | provenance | MaD:26 |
+| Test.java:216:38:216:39 | in : List | Test.java:216:10:216:46 | readParcelableList(...) : List | provenance | MaD:25 |
 | Test.java:222:16:222:31 | (...)... : Parcel | Test.java:223:10:223:11 | in : Parcel | provenance |  |
 | Test.java:222:24:222:31 | source(...) : Object | Test.java:222:16:222:31 | (...)... : Parcel | provenance |  |
 | Test.java:223:10:223:11 | in : Parcel | Test.java:223:10:223:39 | readPersistableBundle(...) : PersistableBundle | provenance | MaD:27 |
diff --git a/java/ql/test/library-tests/frameworks/android/intent/test.expected b/java/ql/test/library-tests/frameworks/android/intent/test.expected
index 6d35c543c5f..6e840c4f235 100644
--- a/java/ql/test/library-tests/frameworks/android/intent/test.expected
+++ b/java/ql/test/library-tests/frameworks/android/intent/test.expected
@@ -11,90 +11,90 @@ models
 | 10 | Summary: android.content; ComponentName; false; getPackageName; ; ; Argument[this]; ReturnValue; taint; manual |
 | 11 | Summary: android.content; ComponentName; false; getShortClassName; ; ; Argument[this]; ReturnValue; taint; manual |
 | 12 | Summary: android.content; ComponentName; false; unflattenFromString; ; ; Argument[0]; ReturnValue; taint; manual |
-| 13 | Summary: android.content; Intent; true; Intent; (Context,Class); ; Argument[1]; Argument[this]; taint; manual |
-| 14 | Summary: android.content; Intent; true; Intent; (Intent); ; Argument[0]; Argument[this]; taint; manual |
-| 15 | Summary: android.content; Intent; false; Intent; (Intent); ; Argument[0].SyntheticField[android.content.Intent.extras].MapKey; Argument[this].SyntheticField[android.content.Intent.extras].MapKey; value; manual |
-| 16 | Summary: android.content; Intent; false; Intent; (Intent); ; Argument[0].SyntheticField[android.content.Intent.extras].MapValue; Argument[this].SyntheticField[android.content.Intent.extras].MapValue; value; manual |
-| 17 | Summary: android.content; Intent; false; Intent; (String,Uri); ; Argument[1]; Argument[this].SyntheticField[android.content.Intent.data]; value; manual |
-| 18 | Summary: android.content; Intent; false; Intent; (String,Uri,Context,Class); ; Argument[1]; Argument[this].SyntheticField[android.content.Intent.data]; value; manual |
-| 19 | Summary: android.content; Intent; true; Intent; (String,Uri,Context,Class); ; Argument[3]; Argument[this]; taint; manual |
-| 20 | Summary: android.content; Intent; true; addCategory; ; ; Argument[this]; ReturnValue; value; manual |
-| 21 | Summary: android.content; Intent; true; addFlags; ; ; Argument[this]; ReturnValue; value; manual |
-| 22 | Summary: android.content; Intent; false; createChooser; ; ; Argument[0..2]; ReturnValue.SyntheticField[android.content.Intent.extras].MapValue; value; manual |
-| 23 | Summary: android.content; Intent; true; getBundleExtra; (String); ; Argument[this].SyntheticField[android.content.Intent.extras].MapValue; ReturnValue; value; manual |
-| 24 | Summary: android.content; Intent; true; getByteArrayExtra; (String); ; Argument[this].SyntheticField[android.content.Intent.extras].MapValue; ReturnValue; value; manual |
-| 25 | Summary: android.content; Intent; true; getCharArrayExtra; (String); ; Argument[this].SyntheticField[android.content.Intent.extras].MapValue; ReturnValue; value; manual |
-| 26 | Summary: android.content; Intent; true; getCharSequenceArrayExtra; (String); ; Argument[this].SyntheticField[android.content.Intent.extras].MapValue; ReturnValue; value; manual |
-| 27 | Summary: android.content; Intent; true; getCharSequenceArrayListExtra; (String); ; Argument[this].SyntheticField[android.content.Intent.extras].MapValue; ReturnValue; value; manual |
-| 28 | Summary: android.content; Intent; true; getCharSequenceExtra; (String); ; Argument[this].SyntheticField[android.content.Intent.extras].MapValue; ReturnValue; value; manual |
-| 29 | Summary: android.content; Intent; true; getData; ; ; Argument[this].SyntheticField[android.content.Intent.data]; ReturnValue; value; manual |
-| 30 | Summary: android.content; Intent; true; getDataString; ; ; Argument[this].SyntheticField[android.content.Intent.data]; ReturnValue; taint; manual |
-| 31 | Summary: android.content; Intent; true; getExtras; (); ; Argument[this].SyntheticField[android.content.Intent.extras]; ReturnValue; value; manual |
-| 32 | Summary: android.content; Intent; false; getIntent; ; ; Argument[0]; ReturnValue.SyntheticField[android.content.Intent.data]; taint; manual |
-| 33 | Summary: android.content; Intent; true; getIntent; (String); ; Argument[0]; ReturnValue; taint; manual |
-| 34 | Summary: android.content; Intent; false; getIntentOld; ; ; Argument[0]; ReturnValue.SyntheticField[android.content.Intent.data]; taint; manual |
-| 35 | Summary: android.content; Intent; true; getIntentOld; (String); ; Argument[0]; ReturnValue; taint; manual |
-| 36 | Summary: android.content; Intent; true; getParcelableArrayExtra; (String); ; Argument[this].SyntheticField[android.content.Intent.extras].MapValue; ReturnValue; value; manual |
-| 37 | Summary: android.content; Intent; true; getParcelableArrayListExtra; (String); ; Argument[this].SyntheticField[android.content.Intent.extras].MapValue; ReturnValue; value; manual |
-| 38 | Summary: android.content; Intent; true; getParcelableExtra; (String); ; Argument[this].SyntheticField[android.content.Intent.extras].MapValue; ReturnValue; value; manual |
-| 39 | Summary: android.content; Intent; true; getSerializableExtra; (String); ; Argument[this].SyntheticField[android.content.Intent.extras].MapValue; ReturnValue; value; manual |
-| 40 | Summary: android.content; Intent; true; getStringArrayExtra; (String); ; Argument[this].SyntheticField[android.content.Intent.extras].MapValue; ReturnValue; value; manual |
-| 41 | Summary: android.content; Intent; true; getStringArrayListExtra; (String); ; Argument[this].SyntheticField[android.content.Intent.extras].MapValue; ReturnValue; value; manual |
-| 42 | Summary: android.content; Intent; true; getStringExtra; (String); ; Argument[this].SyntheticField[android.content.Intent.extras].MapValue; ReturnValue; value; manual |
-| 43 | Summary: android.content; Intent; false; parseUri; ; ; Argument[0]; ReturnValue.SyntheticField[android.content.Intent.data]; taint; manual |
+| 13 | Summary: android.content; Intent; false; Intent; (Intent); ; Argument[0].SyntheticField[android.content.Intent.extras].MapKey; Argument[this].SyntheticField[android.content.Intent.extras].MapKey; value; manual |
+| 14 | Summary: android.content; Intent; false; Intent; (Intent); ; Argument[0].SyntheticField[android.content.Intent.extras].MapValue; Argument[this].SyntheticField[android.content.Intent.extras].MapValue; value; manual |
+| 15 | Summary: android.content; Intent; false; Intent; (String,Uri); ; Argument[1]; Argument[this].SyntheticField[android.content.Intent.data]; value; manual |
+| 16 | Summary: android.content; Intent; false; Intent; (String,Uri,Context,Class); ; Argument[1]; Argument[this].SyntheticField[android.content.Intent.data]; value; manual |
+| 17 | Summary: android.content; Intent; false; createChooser; ; ; Argument[0..2]; ReturnValue.SyntheticField[android.content.Intent.extras].MapValue; value; manual |
+| 18 | Summary: android.content; Intent; false; getIntent; ; ; Argument[0]; ReturnValue.SyntheticField[android.content.Intent.data]; taint; manual |
+| 19 | Summary: android.content; Intent; false; getIntentOld; ; ; Argument[0]; ReturnValue.SyntheticField[android.content.Intent.data]; taint; manual |
+| 20 | Summary: android.content; Intent; false; parseUri; ; ; Argument[0]; ReturnValue.SyntheticField[android.content.Intent.data]; taint; manual |
+| 21 | Summary: android.content; Intent; true; Intent; (Context,Class); ; Argument[1]; Argument[this]; taint; manual |
+| 22 | Summary: android.content; Intent; true; Intent; (Intent); ; Argument[0]; Argument[this]; taint; manual |
+| 23 | Summary: android.content; Intent; true; Intent; (String,Uri,Context,Class); ; Argument[3]; Argument[this]; taint; manual |
+| 24 | Summary: android.content; Intent; true; addCategory; ; ; Argument[this]; ReturnValue; value; manual |
+| 25 | Summary: android.content; Intent; true; addFlags; ; ; Argument[this]; ReturnValue; value; manual |
+| 26 | Summary: android.content; Intent; true; getBundleExtra; (String); ; Argument[this].SyntheticField[android.content.Intent.extras].MapValue; ReturnValue; value; manual |
+| 27 | Summary: android.content; Intent; true; getByteArrayExtra; (String); ; Argument[this].SyntheticField[android.content.Intent.extras].MapValue; ReturnValue; value; manual |
+| 28 | Summary: android.content; Intent; true; getCharArrayExtra; (String); ; Argument[this].SyntheticField[android.content.Intent.extras].MapValue; ReturnValue; value; manual |
+| 29 | Summary: android.content; Intent; true; getCharSequenceArrayExtra; (String); ; Argument[this].SyntheticField[android.content.Intent.extras].MapValue; ReturnValue; value; manual |
+| 30 | Summary: android.content; Intent; true; getCharSequenceArrayListExtra; (String); ; Argument[this].SyntheticField[android.content.Intent.extras].MapValue; ReturnValue; value; manual |
+| 31 | Summary: android.content; Intent; true; getCharSequenceExtra; (String); ; Argument[this].SyntheticField[android.content.Intent.extras].MapValue; ReturnValue; value; manual |
+| 32 | Summary: android.content; Intent; true; getData; ; ; Argument[this].SyntheticField[android.content.Intent.data]; ReturnValue; value; manual |
+| 33 | Summary: android.content; Intent; true; getDataString; ; ; Argument[this].SyntheticField[android.content.Intent.data]; ReturnValue; taint; manual |
+| 34 | Summary: android.content; Intent; true; getExtras; (); ; Argument[this].SyntheticField[android.content.Intent.extras]; ReturnValue; value; manual |
+| 35 | Summary: android.content; Intent; true; getIntent; (String); ; Argument[0]; ReturnValue; taint; manual |
+| 36 | Summary: android.content; Intent; true; getIntentOld; (String); ; Argument[0]; ReturnValue; taint; manual |
+| 37 | Summary: android.content; Intent; true; getParcelableArrayExtra; (String); ; Argument[this].SyntheticField[android.content.Intent.extras].MapValue; ReturnValue; value; manual |
+| 38 | Summary: android.content; Intent; true; getParcelableArrayListExtra; (String); ; Argument[this].SyntheticField[android.content.Intent.extras].MapValue; ReturnValue; value; manual |
+| 39 | Summary: android.content; Intent; true; getParcelableExtra; (String); ; Argument[this].SyntheticField[android.content.Intent.extras].MapValue; ReturnValue; value; manual |
+| 40 | Summary: android.content; Intent; true; getSerializableExtra; (String); ; Argument[this].SyntheticField[android.content.Intent.extras].MapValue; ReturnValue; value; manual |
+| 41 | Summary: android.content; Intent; true; getStringArrayExtra; (String); ; Argument[this].SyntheticField[android.content.Intent.extras].MapValue; ReturnValue; value; manual |
+| 42 | Summary: android.content; Intent; true; getStringArrayListExtra; (String); ; Argument[this].SyntheticField[android.content.Intent.extras].MapValue; ReturnValue; value; manual |
+| 43 | Summary: android.content; Intent; true; getStringExtra; (String); ; Argument[this].SyntheticField[android.content.Intent.extras].MapValue; ReturnValue; value; manual |
 | 44 | Summary: android.content; Intent; true; parseUri; (String,int); ; Argument[0]; ReturnValue; taint; manual |
-| 45 | Summary: android.content; Intent; true; putCharSequenceArrayListExtra; ; ; Argument[this]; ReturnValue; value; manual |
-| 46 | Summary: android.content; Intent; true; putCharSequenceArrayListExtra; ; ; Argument[0]; Argument[this].SyntheticField[android.content.Intent.extras].MapKey; value; manual |
-| 47 | Summary: android.content; Intent; true; putCharSequenceArrayListExtra; ; ; Argument[1]; Argument[this].SyntheticField[android.content.Intent.extras].MapValue; value; manual |
-| 48 | Summary: android.content; Intent; true; putExtra; ; ; Argument[this]; ReturnValue; value; manual |
-| 49 | Summary: android.content; Intent; true; putExtra; ; ; Argument[0]; Argument[this].SyntheticField[android.content.Intent.extras].MapKey; value; manual |
-| 50 | Summary: android.content; Intent; true; putExtra; ; ; Argument[1]; Argument[this].SyntheticField[android.content.Intent.extras].MapValue; value; manual |
-| 51 | Summary: android.content; Intent; true; putExtras; (Bundle); ; Argument[this]; ReturnValue; value; manual |
-| 52 | Summary: android.content; Intent; true; putExtras; (Bundle); ; Argument[0].MapKey; Argument[this].SyntheticField[android.content.Intent.extras].MapKey; value; manual |
-| 53 | Summary: android.content; Intent; true; putExtras; (Bundle); ; Argument[0].MapValue; Argument[this].SyntheticField[android.content.Intent.extras].MapValue; value; manual |
-| 54 | Summary: android.content; Intent; true; putExtras; (Intent); ; Argument[this]; ReturnValue; value; manual |
-| 55 | Summary: android.content; Intent; true; putExtras; (Intent); ; Argument[0].SyntheticField[android.content.Intent.extras].MapKey; Argument[this].SyntheticField[android.content.Intent.extras].MapKey; value; manual |
-| 56 | Summary: android.content; Intent; true; putExtras; (Intent); ; Argument[0].SyntheticField[android.content.Intent.extras].MapValue; Argument[this].SyntheticField[android.content.Intent.extras].MapValue; value; manual |
-| 57 | Summary: android.content; Intent; true; putIntegerArrayListExtra; ; ; Argument[this]; ReturnValue; value; manual |
-| 58 | Summary: android.content; Intent; true; putIntegerArrayListExtra; ; ; Argument[0]; Argument[this].SyntheticField[android.content.Intent.extras].MapKey; value; manual |
-| 59 | Summary: android.content; Intent; true; putParcelableArrayListExtra; ; ; Argument[this]; ReturnValue; value; manual |
-| 60 | Summary: android.content; Intent; true; putParcelableArrayListExtra; ; ; Argument[0]; Argument[this].SyntheticField[android.content.Intent.extras].MapKey; value; manual |
-| 61 | Summary: android.content; Intent; true; putParcelableArrayListExtra; ; ; Argument[1]; Argument[this].SyntheticField[android.content.Intent.extras].MapValue; value; manual |
-| 62 | Summary: android.content; Intent; true; putStringArrayListExtra; ; ; Argument[this]; ReturnValue; value; manual |
-| 63 | Summary: android.content; Intent; true; putStringArrayListExtra; ; ; Argument[0]; Argument[this].SyntheticField[android.content.Intent.extras].MapKey; value; manual |
-| 64 | Summary: android.content; Intent; true; putStringArrayListExtra; ; ; Argument[1]; Argument[this].SyntheticField[android.content.Intent.extras].MapValue; value; manual |
-| 65 | Summary: android.content; Intent; true; replaceExtras; (Bundle); ; Argument[this]; ReturnValue; value; manual |
-| 66 | Summary: android.content; Intent; true; replaceExtras; (Bundle); ; Argument[0].MapKey; Argument[this].SyntheticField[android.content.Intent.extras].MapKey; value; manual |
-| 67 | Summary: android.content; Intent; true; replaceExtras; (Bundle); ; Argument[0].MapValue; Argument[this].SyntheticField[android.content.Intent.extras].MapValue; value; manual |
-| 68 | Summary: android.content; Intent; true; replaceExtras; (Intent); ; Argument[this]; ReturnValue; value; manual |
-| 69 | Summary: android.content; Intent; true; replaceExtras; (Intent); ; Argument[0].SyntheticField[android.content.Intent.extras].MapKey; Argument[this].SyntheticField[android.content.Intent.extras].MapKey; value; manual |
-| 70 | Summary: android.content; Intent; true; replaceExtras; (Intent); ; Argument[0].SyntheticField[android.content.Intent.extras].MapValue; Argument[this].SyntheticField[android.content.Intent.extras].MapValue; value; manual |
+| 45 | Summary: android.content; Intent; true; putCharSequenceArrayListExtra; ; ; Argument[0]; Argument[this].SyntheticField[android.content.Intent.extras].MapKey; value; manual |
+| 46 | Summary: android.content; Intent; true; putCharSequenceArrayListExtra; ; ; Argument[1]; Argument[this].SyntheticField[android.content.Intent.extras].MapValue; value; manual |
+| 47 | Summary: android.content; Intent; true; putCharSequenceArrayListExtra; ; ; Argument[this]; ReturnValue; value; manual |
+| 48 | Summary: android.content; Intent; true; putExtra; ; ; Argument[0]; Argument[this].SyntheticField[android.content.Intent.extras].MapKey; value; manual |
+| 49 | Summary: android.content; Intent; true; putExtra; ; ; Argument[1]; Argument[this].SyntheticField[android.content.Intent.extras].MapValue; value; manual |
+| 50 | Summary: android.content; Intent; true; putExtra; ; ; Argument[this]; ReturnValue; value; manual |
+| 51 | Summary: android.content; Intent; true; putExtras; (Bundle); ; Argument[0].MapKey; Argument[this].SyntheticField[android.content.Intent.extras].MapKey; value; manual |
+| 52 | Summary: android.content; Intent; true; putExtras; (Bundle); ; Argument[0].MapValue; Argument[this].SyntheticField[android.content.Intent.extras].MapValue; value; manual |
+| 53 | Summary: android.content; Intent; true; putExtras; (Bundle); ; Argument[this]; ReturnValue; value; manual |
+| 54 | Summary: android.content; Intent; true; putExtras; (Intent); ; Argument[0].SyntheticField[android.content.Intent.extras].MapKey; Argument[this].SyntheticField[android.content.Intent.extras].MapKey; value; manual |
+| 55 | Summary: android.content; Intent; true; putExtras; (Intent); ; Argument[0].SyntheticField[android.content.Intent.extras].MapValue; Argument[this].SyntheticField[android.content.Intent.extras].MapValue; value; manual |
+| 56 | Summary: android.content; Intent; true; putExtras; (Intent); ; Argument[this]; ReturnValue; value; manual |
+| 57 | Summary: android.content; Intent; true; putIntegerArrayListExtra; ; ; Argument[0]; Argument[this].SyntheticField[android.content.Intent.extras].MapKey; value; manual |
+| 58 | Summary: android.content; Intent; true; putIntegerArrayListExtra; ; ; Argument[this]; ReturnValue; value; manual |
+| 59 | Summary: android.content; Intent; true; putParcelableArrayListExtra; ; ; Argument[0]; Argument[this].SyntheticField[android.content.Intent.extras].MapKey; value; manual |
+| 60 | Summary: android.content; Intent; true; putParcelableArrayListExtra; ; ; Argument[1]; Argument[this].SyntheticField[android.content.Intent.extras].MapValue; value; manual |
+| 61 | Summary: android.content; Intent; true; putParcelableArrayListExtra; ; ; Argument[this]; ReturnValue; value; manual |
+| 62 | Summary: android.content; Intent; true; putStringArrayListExtra; ; ; Argument[0]; Argument[this].SyntheticField[android.content.Intent.extras].MapKey; value; manual |
+| 63 | Summary: android.content; Intent; true; putStringArrayListExtra; ; ; Argument[1]; Argument[this].SyntheticField[android.content.Intent.extras].MapValue; value; manual |
+| 64 | Summary: android.content; Intent; true; putStringArrayListExtra; ; ; Argument[this]; ReturnValue; value; manual |
+| 65 | Summary: android.content; Intent; true; replaceExtras; (Bundle); ; Argument[0].MapKey; Argument[this].SyntheticField[android.content.Intent.extras].MapKey; value; manual |
+| 66 | Summary: android.content; Intent; true; replaceExtras; (Bundle); ; Argument[0].MapValue; Argument[this].SyntheticField[android.content.Intent.extras].MapValue; value; manual |
+| 67 | Summary: android.content; Intent; true; replaceExtras; (Bundle); ; Argument[this]; ReturnValue; value; manual |
+| 68 | Summary: android.content; Intent; true; replaceExtras; (Intent); ; Argument[0].SyntheticField[android.content.Intent.extras].MapKey; Argument[this].SyntheticField[android.content.Intent.extras].MapKey; value; manual |
+| 69 | Summary: android.content; Intent; true; replaceExtras; (Intent); ; Argument[0].SyntheticField[android.content.Intent.extras].MapValue; Argument[this].SyntheticField[android.content.Intent.extras].MapValue; value; manual |
+| 70 | Summary: android.content; Intent; true; replaceExtras; (Intent); ; Argument[this]; ReturnValue; value; manual |
 | 71 | Summary: android.content; Intent; true; setAction; ; ; Argument[this]; ReturnValue; value; manual |
-| 72 | Summary: android.content; Intent; true; setClass; ; ; Argument[this]; ReturnValue; value; manual |
-| 73 | Summary: android.content; Intent; true; setClass; ; ; Argument[1]; Argument[this]; taint; manual |
-| 74 | Summary: android.content; Intent; true; setClassName; ; ; Argument[this]; ReturnValue; value; manual |
-| 75 | Summary: android.content; Intent; true; setClassName; (Context,String); ; Argument[1]; Argument[this]; taint; manual |
-| 76 | Summary: android.content; Intent; true; setClassName; (String,String); ; Argument[0..1]; Argument[this]; taint; manual |
-| 77 | Summary: android.content; Intent; true; setComponent; ; ; Argument[this]; ReturnValue; value; manual |
-| 78 | Summary: android.content; Intent; true; setComponent; ; ; Argument[0]; Argument[this]; taint; manual |
-| 79 | Summary: android.content; Intent; true; setData; ; ; Argument[this]; ReturnValue; value; manual |
-| 80 | Summary: android.content; Intent; true; setData; ; ; Argument[0]; Argument[this].SyntheticField[android.content.Intent.data]; value; manual |
-| 81 | Summary: android.content; Intent; true; setDataAndNormalize; ; ; Argument[this]; ReturnValue; value; manual |
-| 82 | Summary: android.content; Intent; true; setDataAndNormalize; ; ; Argument[0]; Argument[this].SyntheticField[android.content.Intent.data]; value; manual |
-| 83 | Summary: android.content; Intent; true; setDataAndType; ; ; Argument[this]; ReturnValue; value; manual |
-| 84 | Summary: android.content; Intent; true; setDataAndType; ; ; Argument[0]; Argument[this].SyntheticField[android.content.Intent.data]; value; manual |
-| 85 | Summary: android.content; Intent; true; setDataAndTypeAndNormalize; ; ; Argument[this]; ReturnValue; value; manual |
-| 86 | Summary: android.content; Intent; true; setDataAndTypeAndNormalize; ; ; Argument[0]; Argument[this].SyntheticField[android.content.Intent.data]; value; manual |
+| 72 | Summary: android.content; Intent; true; setClass; ; ; Argument[1]; Argument[this]; taint; manual |
+| 73 | Summary: android.content; Intent; true; setClass; ; ; Argument[this]; ReturnValue; value; manual |
+| 74 | Summary: android.content; Intent; true; setClassName; (Context,String); ; Argument[1]; Argument[this]; taint; manual |
+| 75 | Summary: android.content; Intent; true; setClassName; (String,String); ; Argument[0..1]; Argument[this]; taint; manual |
+| 76 | Summary: android.content; Intent; true; setClassName; ; ; Argument[this]; ReturnValue; value; manual |
+| 77 | Summary: android.content; Intent; true; setComponent; ; ; Argument[0]; Argument[this]; taint; manual |
+| 78 | Summary: android.content; Intent; true; setComponent; ; ; Argument[this]; ReturnValue; value; manual |
+| 79 | Summary: android.content; Intent; true; setData; ; ; Argument[0]; Argument[this].SyntheticField[android.content.Intent.data]; value; manual |
+| 80 | Summary: android.content; Intent; true; setData; ; ; Argument[this]; ReturnValue; value; manual |
+| 81 | Summary: android.content; Intent; true; setDataAndNormalize; ; ; Argument[0]; Argument[this].SyntheticField[android.content.Intent.data]; value; manual |
+| 82 | Summary: android.content; Intent; true; setDataAndNormalize; ; ; Argument[this]; ReturnValue; value; manual |
+| 83 | Summary: android.content; Intent; true; setDataAndType; ; ; Argument[0]; Argument[this].SyntheticField[android.content.Intent.data]; value; manual |
+| 84 | Summary: android.content; Intent; true; setDataAndType; ; ; Argument[this]; ReturnValue; value; manual |
+| 85 | Summary: android.content; Intent; true; setDataAndTypeAndNormalize; ; ; Argument[0]; Argument[this].SyntheticField[android.content.Intent.data]; value; manual |
+| 86 | Summary: android.content; Intent; true; setDataAndTypeAndNormalize; ; ; Argument[this]; ReturnValue; value; manual |
 | 87 | Summary: android.content; Intent; true; setFlags; ; ; Argument[this]; ReturnValue; value; manual |
 | 88 | Summary: android.content; Intent; true; setIdentifier; ; ; Argument[this]; ReturnValue; value; manual |
-| 89 | Summary: android.content; Intent; true; setPackage; ; ; Argument[this]; ReturnValue; value; manual |
-| 90 | Summary: android.content; Intent; true; setPackage; ; ; Argument[0]; Argument[this]; taint; manual |
+| 89 | Summary: android.content; Intent; true; setPackage; ; ; Argument[0]; Argument[this]; taint; manual |
+| 90 | Summary: android.content; Intent; true; setPackage; ; ; Argument[this]; ReturnValue; value; manual |
 | 91 | Summary: android.content; Intent; true; setType; ; ; Argument[this]; ReturnValue; value; manual |
 | 92 | Summary: android.content; Intent; true; setTypeAndNormalize; ; ; Argument[this]; ReturnValue; value; manual |
 | 93 | Summary: android.os; BaseBundle; true; get; (String); ; Argument[this].MapValue; ReturnValue; value; manual |
 | 94 | Summary: android.os; BaseBundle; true; getString; (String); ; Argument[this].MapValue; ReturnValue; value; manual |
-| 95 | Summary: android.os; BaseBundle; true; getString; (String,String); ; Argument[this].MapValue; ReturnValue; value; manual |
-| 96 | Summary: android.os; BaseBundle; true; getString; (String,String); ; Argument[1]; ReturnValue; value; manual |
+| 95 | Summary: android.os; BaseBundle; true; getString; (String,String); ; Argument[1]; ReturnValue; value; manual |
+| 96 | Summary: android.os; BaseBundle; true; getString; (String,String); ; Argument[this].MapValue; ReturnValue; value; manual |
 | 97 | Summary: android.os; BaseBundle; true; getStringArray; (String); ; Argument[this].MapValue; ReturnValue; value; manual |
 | 98 | Summary: android.os; BaseBundle; true; keySet; (); ; Argument[this].MapKey; ReturnValue.Element; value; manual |
 | 99 | Summary: android.os; BaseBundle; true; putAll; (PersistableBundle); ; Argument[0].MapKey; Argument[this].MapKey; value; manual |
@@ -124,8 +124,8 @@ models
 | 123 | Summary: android.os; Bundle; true; getByteArray; (String); ; Argument[this].MapValue; ReturnValue; value; manual |
 | 124 | Summary: android.os; Bundle; true; getCharArray; (String); ; Argument[this].MapValue; ReturnValue; value; manual |
 | 125 | Summary: android.os; Bundle; true; getCharSequence; (String); ; Argument[this].MapValue; ReturnValue; value; manual |
-| 126 | Summary: android.os; Bundle; true; getCharSequence; (String,CharSequence); ; Argument[this].MapValue; ReturnValue; value; manual |
-| 127 | Summary: android.os; Bundle; true; getCharSequence; (String,CharSequence); ; Argument[1]; ReturnValue; value; manual |
+| 126 | Summary: android.os; Bundle; true; getCharSequence; (String,CharSequence); ; Argument[1]; ReturnValue; value; manual |
+| 127 | Summary: android.os; Bundle; true; getCharSequence; (String,CharSequence); ; Argument[this].MapValue; ReturnValue; value; manual |
 | 128 | Summary: android.os; Bundle; true; getCharSequenceArray; (String); ; Argument[this].MapValue; ReturnValue; value; manual |
 | 129 | Summary: android.os; Bundle; true; getCharSequenceArrayList; (String); ; Argument[this].MapValue; ReturnValue; value; manual |
 | 130 | Summary: android.os; Bundle; true; getParcelable; (String); ; Argument[this].MapValue; ReturnValue; value; manual |
@@ -173,16 +173,16 @@ models
 | 172 | Summary: android.os; Bundle; true; putStringArrayList; ; ; Argument[1]; Argument[this].MapValue; value; manual |
 | 173 | Summary: android.os; Bundle; true; readFromParcel; ; ; Argument[0]; Argument[this].MapKey; taint; manual |
 | 174 | Summary: android.os; Bundle; true; readFromParcel; ; ; Argument[0]; Argument[this].MapValue; taint; manual |
-| 175 | Summary: java.lang; Iterable; true; iterator; (); ; Argument[this].Element; ReturnValue.Element; value; manual |
-| 176 | Summary: java.util; Iterator; true; next; ; ; Argument[this].Element; ReturnValue; value; manual |
-| 177 | Summary: generatedtest; Test; false; newBundleWithMapValue; (Object); ; Argument[0]; ReturnValue.MapValue; value; manual |
-| 178 | Summary: generatedtest; Test; false; newPersistableBundleWithMapValue; (Object); ; Argument[0]; ReturnValue.MapValue; value; manual |
-| 179 | Summary: generatedtest; Test; false; getMapValue; (BaseBundle); ; Argument[0].MapValue; ReturnValue; value; manual |
-| 180 | Summary: generatedtest; Test; false; newWithIntent_extras; (Bundle); ; Argument[0]; ReturnValue.SyntheticField[android.content.Intent.extras]; value; manual |
+| 175 | Summary: generatedtest; Test; false; getMapValue; (BaseBundle); ; Argument[0].MapValue; ReturnValue; value; manual |
+| 176 | Summary: generatedtest; Test; false; newBundleWithMapValue; (Object); ; Argument[0]; ReturnValue.MapValue; value; manual |
+| 177 | Summary: generatedtest; Test; false; newPersistableBundleWithMapValue; (Object); ; Argument[0]; ReturnValue.MapValue; value; manual |
+| 178 | Summary: generatedtest; Test; false; newWithIntent_extras; (Bundle); ; Argument[0]; ReturnValue.SyntheticField[android.content.Intent.extras]; value; manual |
+| 179 | Summary: java.lang; Iterable; true; iterator; (); ; Argument[this].Element; ReturnValue.Element; value; manual |
+| 180 | Summary: java.util; Iterator; true; next; ; ; Argument[this].Element; ReturnValue; value; manual |
 edges
 | Test.java:22:19:22:32 | it : Set [<element>] : String | Test.java:22:44:22:45 | it : Set [<element>] : String | provenance |  |
-| Test.java:22:44:22:45 | it : Set [<element>] : String | Test.java:22:44:22:56 | iterator(...) : Iterator [<element>] : String | provenance | MaD:175 |
-| Test.java:22:44:22:56 | iterator(...) : Iterator [<element>] : String | Test.java:22:44:22:63 | next(...) : String | provenance | MaD:176 |
+| Test.java:22:44:22:45 | it : Set [<element>] : String | Test.java:22:44:22:56 | iterator(...) : Iterator [<element>] : String | provenance | MaD:179 |
+| Test.java:22:44:22:56 | iterator(...) : Iterator [<element>] : String | Test.java:22:44:22:63 | next(...) : String | provenance | MaD:180 |
 | Test.java:23:26:23:33 | i : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:23:45:23:45 | i : Intent [android.content.Intent.extras, <map.key>] : String | provenance |  |
 | Test.java:23:26:23:33 | i : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:23:45:23:45 | i : Intent [android.content.Intent.extras, <map.key>] : String | provenance |  |
 | Test.java:23:26:23:33 | i : Intent [android.content.Intent.extras, <map.value>] : ArrayList | Test.java:23:45:23:45 | i : Intent [android.content.Intent.extras, <map.value>] : ArrayList | provenance |  |
@@ -229,66 +229,66 @@ edges
 | Test.java:23:26:23:33 | i : Intent [android.content.Intent.extras, <map.value>] : long[] | Test.java:23:45:23:45 | i : Intent [android.content.Intent.extras, <map.value>] : long[] | provenance |  |
 | Test.java:23:26:23:33 | i : Intent [android.content.Intent.extras, <map.value>] : short[] | Test.java:23:45:23:45 | i : Intent [android.content.Intent.extras, <map.value>] : short[] | provenance |  |
 | Test.java:23:26:23:33 | i : Intent [android.content.Intent.extras, <map.value>] : short[] | Test.java:23:45:23:45 | i : Intent [android.content.Intent.extras, <map.value>] : short[] | provenance |  |
-| Test.java:23:45:23:45 | i : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:23:45:23:57 | getExtras(...) : Bundle [<map.key>] : String | provenance | MaD:31 |
-| Test.java:23:45:23:45 | i : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:23:45:23:57 | getExtras(...) : Bundle [<map.key>] : String | provenance | MaD:31 |
-| Test.java:23:45:23:45 | i : Intent [android.content.Intent.extras, <map.value>] : ArrayList | Test.java:23:45:23:57 | getExtras(...) : Bundle [<map.value>] : ArrayList | provenance | MaD:31 |
-| Test.java:23:45:23:45 | i : Intent [android.content.Intent.extras, <map.value>] : ArrayList | Test.java:23:45:23:57 | getExtras(...) : Bundle [<map.value>] : ArrayList | provenance | MaD:31 |
-| Test.java:23:45:23:45 | i : Intent [android.content.Intent.extras, <map.value>] : Boolean | Test.java:23:45:23:57 | getExtras(...) : Bundle [<map.value>] : Boolean | provenance | MaD:31 |
-| Test.java:23:45:23:45 | i : Intent [android.content.Intent.extras, <map.value>] : Boolean | Test.java:23:45:23:57 | getExtras(...) : Bundle [<map.value>] : Boolean | provenance | MaD:31 |
-| Test.java:23:45:23:45 | i : Intent [android.content.Intent.extras, <map.value>] : Bundle | Test.java:23:45:23:57 | getExtras(...) : Bundle [<map.value>] : Bundle | provenance | MaD:31 |
-| Test.java:23:45:23:45 | i : Intent [android.content.Intent.extras, <map.value>] : Bundle | Test.java:23:45:23:57 | getExtras(...) : Bundle [<map.value>] : Bundle | provenance | MaD:31 |
-| Test.java:23:45:23:45 | i : Intent [android.content.Intent.extras, <map.value>] : CharSequence | Test.java:23:45:23:57 | getExtras(...) : Bundle [<map.value>] : CharSequence | provenance | MaD:31 |
-| Test.java:23:45:23:45 | i : Intent [android.content.Intent.extras, <map.value>] : CharSequence | Test.java:23:45:23:57 | getExtras(...) : Bundle [<map.value>] : CharSequence | provenance | MaD:31 |
-| Test.java:23:45:23:45 | i : Intent [android.content.Intent.extras, <map.value>] : CharSequence[] | Test.java:23:45:23:57 | getExtras(...) : Bundle [<map.value>] : CharSequence[] | provenance | MaD:31 |
-| Test.java:23:45:23:45 | i : Intent [android.content.Intent.extras, <map.value>] : CharSequence[] | Test.java:23:45:23:57 | getExtras(...) : Bundle [<map.value>] : CharSequence[] | provenance | MaD:31 |
-| Test.java:23:45:23:45 | i : Intent [android.content.Intent.extras, <map.value>] : Intent | Test.java:23:45:23:57 | getExtras(...) : Bundle [<map.value>] : Intent | provenance | MaD:31 |
-| Test.java:23:45:23:45 | i : Intent [android.content.Intent.extras, <map.value>] : Intent | Test.java:23:45:23:57 | getExtras(...) : Bundle [<map.value>] : Intent | provenance | MaD:31 |
-| Test.java:23:45:23:45 | i : Intent [android.content.Intent.extras, <map.value>] : IntentSender | Test.java:23:45:23:57 | getExtras(...) : Bundle [<map.value>] : IntentSender | provenance | MaD:31 |
-| Test.java:23:45:23:45 | i : Intent [android.content.Intent.extras, <map.value>] : IntentSender | Test.java:23:45:23:57 | getExtras(...) : Bundle [<map.value>] : IntentSender | provenance | MaD:31 |
-| Test.java:23:45:23:45 | i : Intent [android.content.Intent.extras, <map.value>] : Number | Test.java:23:45:23:57 | getExtras(...) : Bundle [<map.value>] : Number | provenance | MaD:31 |
-| Test.java:23:45:23:45 | i : Intent [android.content.Intent.extras, <map.value>] : Number | Test.java:23:45:23:57 | getExtras(...) : Bundle [<map.value>] : Number | provenance | MaD:31 |
-| Test.java:23:45:23:45 | i : Intent [android.content.Intent.extras, <map.value>] : Object | Test.java:23:45:23:57 | getExtras(...) : Bundle [<map.value>] : Object | provenance | MaD:31 |
-| Test.java:23:45:23:45 | i : Intent [android.content.Intent.extras, <map.value>] : Object | Test.java:23:45:23:57 | getExtras(...) : Bundle [<map.value>] : Object | provenance | MaD:31 |
-| Test.java:23:45:23:45 | i : Intent [android.content.Intent.extras, <map.value>] : Parcelable | Test.java:23:45:23:57 | getExtras(...) : Bundle [<map.value>] : Parcelable | provenance | MaD:31 |
-| Test.java:23:45:23:45 | i : Intent [android.content.Intent.extras, <map.value>] : Parcelable | Test.java:23:45:23:57 | getExtras(...) : Bundle [<map.value>] : Parcelable | provenance | MaD:31 |
-| Test.java:23:45:23:45 | i : Intent [android.content.Intent.extras, <map.value>] : Parcelable[] | Test.java:23:45:23:57 | getExtras(...) : Bundle [<map.value>] : Parcelable[] | provenance | MaD:31 |
-| Test.java:23:45:23:45 | i : Intent [android.content.Intent.extras, <map.value>] : Parcelable[] | Test.java:23:45:23:57 | getExtras(...) : Bundle [<map.value>] : Parcelable[] | provenance | MaD:31 |
-| Test.java:23:45:23:45 | i : Intent [android.content.Intent.extras, <map.value>] : Serializable | Test.java:23:45:23:57 | getExtras(...) : Bundle [<map.value>] : Serializable | provenance | MaD:31 |
-| Test.java:23:45:23:45 | i : Intent [android.content.Intent.extras, <map.value>] : Serializable | Test.java:23:45:23:57 | getExtras(...) : Bundle [<map.value>] : Serializable | provenance | MaD:31 |
-| Test.java:23:45:23:45 | i : Intent [android.content.Intent.extras, <map.value>] : String | Test.java:23:45:23:57 | getExtras(...) : Bundle [<map.value>] : String | provenance | MaD:31 |
-| Test.java:23:45:23:45 | i : Intent [android.content.Intent.extras, <map.value>] : String | Test.java:23:45:23:57 | getExtras(...) : Bundle [<map.value>] : String | provenance | MaD:31 |
-| Test.java:23:45:23:45 | i : Intent [android.content.Intent.extras, <map.value>] : String[] | Test.java:23:45:23:57 | getExtras(...) : Bundle [<map.value>] : String[] | provenance | MaD:31 |
-| Test.java:23:45:23:45 | i : Intent [android.content.Intent.extras, <map.value>] : String[] | Test.java:23:45:23:57 | getExtras(...) : Bundle [<map.value>] : String[] | provenance | MaD:31 |
-| Test.java:23:45:23:45 | i : Intent [android.content.Intent.extras, <map.value>] : boolean[] | Test.java:23:45:23:57 | getExtras(...) : Bundle [<map.value>] : boolean[] | provenance | MaD:31 |
-| Test.java:23:45:23:45 | i : Intent [android.content.Intent.extras, <map.value>] : boolean[] | Test.java:23:45:23:57 | getExtras(...) : Bundle [<map.value>] : boolean[] | provenance | MaD:31 |
-| Test.java:23:45:23:45 | i : Intent [android.content.Intent.extras, <map.value>] : byte[] | Test.java:23:45:23:57 | getExtras(...) : Bundle [<map.value>] : byte[] | provenance | MaD:31 |
-| Test.java:23:45:23:45 | i : Intent [android.content.Intent.extras, <map.value>] : byte[] | Test.java:23:45:23:57 | getExtras(...) : Bundle [<map.value>] : byte[] | provenance | MaD:31 |
-| Test.java:23:45:23:45 | i : Intent [android.content.Intent.extras, <map.value>] : char[] | Test.java:23:45:23:57 | getExtras(...) : Bundle [<map.value>] : char[] | provenance | MaD:31 |
-| Test.java:23:45:23:45 | i : Intent [android.content.Intent.extras, <map.value>] : char[] | Test.java:23:45:23:57 | getExtras(...) : Bundle [<map.value>] : char[] | provenance | MaD:31 |
-| Test.java:23:45:23:45 | i : Intent [android.content.Intent.extras, <map.value>] : double[] | Test.java:23:45:23:57 | getExtras(...) : Bundle [<map.value>] : double[] | provenance | MaD:31 |
-| Test.java:23:45:23:45 | i : Intent [android.content.Intent.extras, <map.value>] : double[] | Test.java:23:45:23:57 | getExtras(...) : Bundle [<map.value>] : double[] | provenance | MaD:31 |
-| Test.java:23:45:23:45 | i : Intent [android.content.Intent.extras, <map.value>] : float[] | Test.java:23:45:23:57 | getExtras(...) : Bundle [<map.value>] : float[] | provenance | MaD:31 |
-| Test.java:23:45:23:45 | i : Intent [android.content.Intent.extras, <map.value>] : float[] | Test.java:23:45:23:57 | getExtras(...) : Bundle [<map.value>] : float[] | provenance | MaD:31 |
-| Test.java:23:45:23:45 | i : Intent [android.content.Intent.extras, <map.value>] : int[] | Test.java:23:45:23:57 | getExtras(...) : Bundle [<map.value>] : int[] | provenance | MaD:31 |
-| Test.java:23:45:23:45 | i : Intent [android.content.Intent.extras, <map.value>] : int[] | Test.java:23:45:23:57 | getExtras(...) : Bundle [<map.value>] : int[] | provenance | MaD:31 |
-| Test.java:23:45:23:45 | i : Intent [android.content.Intent.extras, <map.value>] : long[] | Test.java:23:45:23:57 | getExtras(...) : Bundle [<map.value>] : long[] | provenance | MaD:31 |
-| Test.java:23:45:23:45 | i : Intent [android.content.Intent.extras, <map.value>] : long[] | Test.java:23:45:23:57 | getExtras(...) : Bundle [<map.value>] : long[] | provenance | MaD:31 |
-| Test.java:23:45:23:45 | i : Intent [android.content.Intent.extras, <map.value>] : short[] | Test.java:23:45:23:57 | getExtras(...) : Bundle [<map.value>] : short[] | provenance | MaD:31 |
-| Test.java:23:45:23:45 | i : Intent [android.content.Intent.extras, <map.value>] : short[] | Test.java:23:45:23:57 | getExtras(...) : Bundle [<map.value>] : short[] | provenance | MaD:31 |
+| Test.java:23:45:23:45 | i : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:23:45:23:57 | getExtras(...) : Bundle [<map.key>] : String | provenance | MaD:34 |
+| Test.java:23:45:23:45 | i : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:23:45:23:57 | getExtras(...) : Bundle [<map.key>] : String | provenance | MaD:34 |
+| Test.java:23:45:23:45 | i : Intent [android.content.Intent.extras, <map.value>] : ArrayList | Test.java:23:45:23:57 | getExtras(...) : Bundle [<map.value>] : ArrayList | provenance | MaD:34 |
+| Test.java:23:45:23:45 | i : Intent [android.content.Intent.extras, <map.value>] : ArrayList | Test.java:23:45:23:57 | getExtras(...) : Bundle [<map.value>] : ArrayList | provenance | MaD:34 |
+| Test.java:23:45:23:45 | i : Intent [android.content.Intent.extras, <map.value>] : Boolean | Test.java:23:45:23:57 | getExtras(...) : Bundle [<map.value>] : Boolean | provenance | MaD:34 |
+| Test.java:23:45:23:45 | i : Intent [android.content.Intent.extras, <map.value>] : Boolean | Test.java:23:45:23:57 | getExtras(...) : Bundle [<map.value>] : Boolean | provenance | MaD:34 |
+| Test.java:23:45:23:45 | i : Intent [android.content.Intent.extras, <map.value>] : Bundle | Test.java:23:45:23:57 | getExtras(...) : Bundle [<map.value>] : Bundle | provenance | MaD:34 |
+| Test.java:23:45:23:45 | i : Intent [android.content.Intent.extras, <map.value>] : Bundle | Test.java:23:45:23:57 | getExtras(...) : Bundle [<map.value>] : Bundle | provenance | MaD:34 |
+| Test.java:23:45:23:45 | i : Intent [android.content.Intent.extras, <map.value>] : CharSequence | Test.java:23:45:23:57 | getExtras(...) : Bundle [<map.value>] : CharSequence | provenance | MaD:34 |
+| Test.java:23:45:23:45 | i : Intent [android.content.Intent.extras, <map.value>] : CharSequence | Test.java:23:45:23:57 | getExtras(...) : Bundle [<map.value>] : CharSequence | provenance | MaD:34 |
+| Test.java:23:45:23:45 | i : Intent [android.content.Intent.extras, <map.value>] : CharSequence[] | Test.java:23:45:23:57 | getExtras(...) : Bundle [<map.value>] : CharSequence[] | provenance | MaD:34 |
+| Test.java:23:45:23:45 | i : Intent [android.content.Intent.extras, <map.value>] : CharSequence[] | Test.java:23:45:23:57 | getExtras(...) : Bundle [<map.value>] : CharSequence[] | provenance | MaD:34 |
+| Test.java:23:45:23:45 | i : Intent [android.content.Intent.extras, <map.value>] : Intent | Test.java:23:45:23:57 | getExtras(...) : Bundle [<map.value>] : Intent | provenance | MaD:34 |
+| Test.java:23:45:23:45 | i : Intent [android.content.Intent.extras, <map.value>] : Intent | Test.java:23:45:23:57 | getExtras(...) : Bundle [<map.value>] : Intent | provenance | MaD:34 |
+| Test.java:23:45:23:45 | i : Intent [android.content.Intent.extras, <map.value>] : IntentSender | Test.java:23:45:23:57 | getExtras(...) : Bundle [<map.value>] : IntentSender | provenance | MaD:34 |
+| Test.java:23:45:23:45 | i : Intent [android.content.Intent.extras, <map.value>] : IntentSender | Test.java:23:45:23:57 | getExtras(...) : Bundle [<map.value>] : IntentSender | provenance | MaD:34 |
+| Test.java:23:45:23:45 | i : Intent [android.content.Intent.extras, <map.value>] : Number | Test.java:23:45:23:57 | getExtras(...) : Bundle [<map.value>] : Number | provenance | MaD:34 |
+| Test.java:23:45:23:45 | i : Intent [android.content.Intent.extras, <map.value>] : Number | Test.java:23:45:23:57 | getExtras(...) : Bundle [<map.value>] : Number | provenance | MaD:34 |
+| Test.java:23:45:23:45 | i : Intent [android.content.Intent.extras, <map.value>] : Object | Test.java:23:45:23:57 | getExtras(...) : Bundle [<map.value>] : Object | provenance | MaD:34 |
+| Test.java:23:45:23:45 | i : Intent [android.content.Intent.extras, <map.value>] : Object | Test.java:23:45:23:57 | getExtras(...) : Bundle [<map.value>] : Object | provenance | MaD:34 |
+| Test.java:23:45:23:45 | i : Intent [android.content.Intent.extras, <map.value>] : Parcelable | Test.java:23:45:23:57 | getExtras(...) : Bundle [<map.value>] : Parcelable | provenance | MaD:34 |
+| Test.java:23:45:23:45 | i : Intent [android.content.Intent.extras, <map.value>] : Parcelable | Test.java:23:45:23:57 | getExtras(...) : Bundle [<map.value>] : Parcelable | provenance | MaD:34 |
+| Test.java:23:45:23:45 | i : Intent [android.content.Intent.extras, <map.value>] : Parcelable[] | Test.java:23:45:23:57 | getExtras(...) : Bundle [<map.value>] : Parcelable[] | provenance | MaD:34 |
+| Test.java:23:45:23:45 | i : Intent [android.content.Intent.extras, <map.value>] : Parcelable[] | Test.java:23:45:23:57 | getExtras(...) : Bundle [<map.value>] : Parcelable[] | provenance | MaD:34 |
+| Test.java:23:45:23:45 | i : Intent [android.content.Intent.extras, <map.value>] : Serializable | Test.java:23:45:23:57 | getExtras(...) : Bundle [<map.value>] : Serializable | provenance | MaD:34 |
+| Test.java:23:45:23:45 | i : Intent [android.content.Intent.extras, <map.value>] : Serializable | Test.java:23:45:23:57 | getExtras(...) : Bundle [<map.value>] : Serializable | provenance | MaD:34 |
+| Test.java:23:45:23:45 | i : Intent [android.content.Intent.extras, <map.value>] : String | Test.java:23:45:23:57 | getExtras(...) : Bundle [<map.value>] : String | provenance | MaD:34 |
+| Test.java:23:45:23:45 | i : Intent [android.content.Intent.extras, <map.value>] : String | Test.java:23:45:23:57 | getExtras(...) : Bundle [<map.value>] : String | provenance | MaD:34 |
+| Test.java:23:45:23:45 | i : Intent [android.content.Intent.extras, <map.value>] : String[] | Test.java:23:45:23:57 | getExtras(...) : Bundle [<map.value>] : String[] | provenance | MaD:34 |
+| Test.java:23:45:23:45 | i : Intent [android.content.Intent.extras, <map.value>] : String[] | Test.java:23:45:23:57 | getExtras(...) : Bundle [<map.value>] : String[] | provenance | MaD:34 |
+| Test.java:23:45:23:45 | i : Intent [android.content.Intent.extras, <map.value>] : boolean[] | Test.java:23:45:23:57 | getExtras(...) : Bundle [<map.value>] : boolean[] | provenance | MaD:34 |
+| Test.java:23:45:23:45 | i : Intent [android.content.Intent.extras, <map.value>] : boolean[] | Test.java:23:45:23:57 | getExtras(...) : Bundle [<map.value>] : boolean[] | provenance | MaD:34 |
+| Test.java:23:45:23:45 | i : Intent [android.content.Intent.extras, <map.value>] : byte[] | Test.java:23:45:23:57 | getExtras(...) : Bundle [<map.value>] : byte[] | provenance | MaD:34 |
+| Test.java:23:45:23:45 | i : Intent [android.content.Intent.extras, <map.value>] : byte[] | Test.java:23:45:23:57 | getExtras(...) : Bundle [<map.value>] : byte[] | provenance | MaD:34 |
+| Test.java:23:45:23:45 | i : Intent [android.content.Intent.extras, <map.value>] : char[] | Test.java:23:45:23:57 | getExtras(...) : Bundle [<map.value>] : char[] | provenance | MaD:34 |
+| Test.java:23:45:23:45 | i : Intent [android.content.Intent.extras, <map.value>] : char[] | Test.java:23:45:23:57 | getExtras(...) : Bundle [<map.value>] : char[] | provenance | MaD:34 |
+| Test.java:23:45:23:45 | i : Intent [android.content.Intent.extras, <map.value>] : double[] | Test.java:23:45:23:57 | getExtras(...) : Bundle [<map.value>] : double[] | provenance | MaD:34 |
+| Test.java:23:45:23:45 | i : Intent [android.content.Intent.extras, <map.value>] : double[] | Test.java:23:45:23:57 | getExtras(...) : Bundle [<map.value>] : double[] | provenance | MaD:34 |
+| Test.java:23:45:23:45 | i : Intent [android.content.Intent.extras, <map.value>] : float[] | Test.java:23:45:23:57 | getExtras(...) : Bundle [<map.value>] : float[] | provenance | MaD:34 |
+| Test.java:23:45:23:45 | i : Intent [android.content.Intent.extras, <map.value>] : float[] | Test.java:23:45:23:57 | getExtras(...) : Bundle [<map.value>] : float[] | provenance | MaD:34 |
+| Test.java:23:45:23:45 | i : Intent [android.content.Intent.extras, <map.value>] : int[] | Test.java:23:45:23:57 | getExtras(...) : Bundle [<map.value>] : int[] | provenance | MaD:34 |
+| Test.java:23:45:23:45 | i : Intent [android.content.Intent.extras, <map.value>] : int[] | Test.java:23:45:23:57 | getExtras(...) : Bundle [<map.value>] : int[] | provenance | MaD:34 |
+| Test.java:23:45:23:45 | i : Intent [android.content.Intent.extras, <map.value>] : long[] | Test.java:23:45:23:57 | getExtras(...) : Bundle [<map.value>] : long[] | provenance | MaD:34 |
+| Test.java:23:45:23:45 | i : Intent [android.content.Intent.extras, <map.value>] : long[] | Test.java:23:45:23:57 | getExtras(...) : Bundle [<map.value>] : long[] | provenance | MaD:34 |
+| Test.java:23:45:23:45 | i : Intent [android.content.Intent.extras, <map.value>] : short[] | Test.java:23:45:23:57 | getExtras(...) : Bundle [<map.value>] : short[] | provenance | MaD:34 |
+| Test.java:23:45:23:45 | i : Intent [android.content.Intent.extras, <map.value>] : short[] | Test.java:23:45:23:57 | getExtras(...) : Bundle [<map.value>] : short[] | provenance | MaD:34 |
 | Test.java:24:19:24:30 | b : BaseBundle [<map.key>] : String | Test.java:24:42:24:42 | b : BaseBundle [<map.key>] : String | provenance |  |
 | Test.java:24:19:24:30 | b : Bundle [<map.key>] : Object | Test.java:24:42:24:42 | b : Bundle [<map.key>] : Object | provenance |  |
 | Test.java:24:19:24:30 | b : Bundle [<map.key>] : String | Test.java:24:42:24:42 | b : Bundle [<map.key>] : String | provenance |  |
 | Test.java:24:42:24:42 | b : BaseBundle [<map.key>] : String | Test.java:24:42:24:51 | keySet(...) : Set [<element>] : String | provenance | MaD:98 |
 | Test.java:24:42:24:42 | b : Bundle [<map.key>] : Object | Test.java:24:42:24:51 | keySet(...) : Set [<element>] : Object | provenance | MaD:98 |
 | Test.java:24:42:24:42 | b : Bundle [<map.key>] : String | Test.java:24:42:24:51 | keySet(...) : Set [<element>] : String | provenance | MaD:98 |
-| Test.java:24:42:24:51 | keySet(...) : Set [<element>] : Object | Test.java:24:42:24:62 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:175 |
-| Test.java:24:42:24:51 | keySet(...) : Set [<element>] : String | Test.java:24:42:24:62 | iterator(...) : Iterator [<element>] : String | provenance | MaD:175 |
-| Test.java:24:42:24:51 | keySet(...) : Set [<element>] : String | Test.java:24:42:24:62 | iterator(...) : Iterator [<element>] : String | provenance | MaD:175 |
-| Test.java:24:42:24:62 | iterator(...) : Iterator [<element>] : Object | Test.java:24:42:24:69 | next(...) : String | provenance | MaD:176 |
-| Test.java:24:42:24:62 | iterator(...) : Iterator [<element>] : String | Test.java:24:42:24:69 | next(...) : String | provenance | MaD:176 |
-| Test.java:24:42:24:62 | iterator(...) : Iterator [<element>] : String | Test.java:24:42:24:69 | next(...) : String | provenance | MaD:176 |
+| Test.java:24:42:24:51 | keySet(...) : Set [<element>] : Object | Test.java:24:42:24:62 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:179 |
+| Test.java:24:42:24:51 | keySet(...) : Set [<element>] : String | Test.java:24:42:24:62 | iterator(...) : Iterator [<element>] : String | provenance | MaD:179 |
+| Test.java:24:42:24:51 | keySet(...) : Set [<element>] : String | Test.java:24:42:24:62 | iterator(...) : Iterator [<element>] : String | provenance | MaD:179 |
+| Test.java:24:42:24:62 | iterator(...) : Iterator [<element>] : Object | Test.java:24:42:24:69 | next(...) : String | provenance | MaD:180 |
+| Test.java:24:42:24:62 | iterator(...) : Iterator [<element>] : String | Test.java:24:42:24:69 | next(...) : String | provenance | MaD:180 |
+| Test.java:24:42:24:62 | iterator(...) : Iterator [<element>] : String | Test.java:24:42:24:69 | next(...) : String | provenance | MaD:180 |
 | Test.java:27:28:27:35 | data : Uri | Test.java:27:67:27:70 | data : Uri | provenance |  |
-| Test.java:27:67:27:70 | data : Uri | Test.java:27:47:27:71 | new Intent(...) : Intent [android.content.Intent.data] : Uri | provenance | MaD:17 |
+| Test.java:27:67:27:70 | data : Uri | Test.java:27:47:27:71 | new Intent(...) : Intent [android.content.Intent.data] : Uri | provenance | MaD:15 |
 | Test.java:28:29:28:36 | k : String | Test.java:28:75:28:75 | k : String | provenance |  |
 | Test.java:28:66:28:66 | b [post update] : Bundle [<map.key>] : String | Test.java:28:89:28:89 | b : Bundle [<map.key>] : String | provenance |  |
 | Test.java:28:75:28:75 | k : String | Test.java:28:66:28:66 | b [post update] : Bundle [<map.key>] : String | provenance | MaD:105 |
@@ -296,885 +296,885 @@ edges
 | Test.java:29:110:29:110 | b [post update] : PersistableBundle [<map.key>] : String | Test.java:29:133:29:133 | b : PersistableBundle [<map.key>] : String | provenance |  |
 | Test.java:29:119:29:119 | k : String | Test.java:29:110:29:110 | b [post update] : PersistableBundle [<map.key>] : String | provenance | MaD:105 |
 | Test.java:32:14:32:26 | intent : Intent [android.content.Intent.data] : Uri | Test.java:32:38:32:43 | intent : Intent [android.content.Intent.data] : Uri | provenance |  |
-| Test.java:32:38:32:43 | intent : Intent [android.content.Intent.data] : Uri | Test.java:32:38:32:53 | getData(...) : Uri | provenance | MaD:29 |
+| Test.java:32:38:32:43 | intent : Intent [android.content.Intent.data] : Uri | Test.java:32:38:32:53 | getData(...) : Uri | provenance | MaD:32 |
 | Test.java:41:16:41:74 | (...)... : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:42:21:42:22 | in : Intent [android.content.Intent.extras, <map.key>] : String | provenance |  |
 | Test.java:41:24:41:74 | newWithIntent_extras(...) : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:41:16:41:74 | (...)... : Intent [android.content.Intent.extras, <map.key>] : String | provenance |  |
-| Test.java:41:45:41:73 | newBundleWithMapKey(...) : Bundle [<map.key>] : String | Test.java:41:24:41:74 | newWithIntent_extras(...) : Intent [android.content.Intent.extras, <map.key>] : String | provenance | MaD:180 |
+| Test.java:41:45:41:73 | newBundleWithMapKey(...) : Bundle [<map.key>] : String | Test.java:41:24:41:74 | newWithIntent_extras(...) : Intent [android.content.Intent.extras, <map.key>] : String | provenance | MaD:178 |
 | Test.java:41:65:41:72 | source(...) : String | Test.java:28:29:28:36 | k : String | provenance |  |
 | Test.java:41:65:41:72 | source(...) : String | Test.java:41:45:41:73 | newBundleWithMapKey(...) : Bundle [<map.key>] : String | provenance | MaD:105 |
 | Test.java:42:10:42:23 | new Intent(...) : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:43:36:43:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | provenance |  |
 | Test.java:42:10:42:23 | new Intent(...) : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:43:36:43:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | provenance |  |
-| Test.java:42:21:42:22 | in : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:42:10:42:23 | new Intent(...) : Intent [android.content.Intent.extras, <map.key>] : String | provenance | MaD:15 |
-| Test.java:42:21:42:22 | in : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:42:10:42:23 | new Intent(...) : Intent [android.content.Intent.extras, <map.key>] : String | provenance | MaD:15 |
+| Test.java:42:21:42:22 | in : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:42:10:42:23 | new Intent(...) : Intent [android.content.Intent.extras, <map.key>] : String | provenance | MaD:13 |
+| Test.java:42:21:42:22 | in : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:42:10:42:23 | new Intent(...) : Intent [android.content.Intent.extras, <map.key>] : String | provenance | MaD:13 |
 | Test.java:43:19:43:39 | getIntent_extras(...) : Bundle [<map.key>] : String | Test.java:24:19:24:30 | b : Bundle [<map.key>] : String | provenance |  |
 | Test.java:43:19:43:39 | getIntent_extras(...) : Bundle [<map.key>] : String | Test.java:43:9:43:40 | getMapKey(...) | provenance | MaD:98 |
 | Test.java:43:36:43:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:23:26:23:33 | i : Intent [android.content.Intent.extras, <map.key>] : String | provenance |  |
 | Test.java:43:36:43:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:23:26:23:33 | i : Intent [android.content.Intent.extras, <map.key>] : String | provenance |  |
-| Test.java:43:36:43:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:43:19:43:39 | getIntent_extras(...) : Bundle [<map.key>] : String | provenance | MaD:31 |
-| Test.java:43:36:43:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:43:19:43:39 | getIntent_extras(...) : Bundle [<map.key>] : String | provenance | MaD:31 |
+| Test.java:43:36:43:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:43:19:43:39 | getIntent_extras(...) : Bundle [<map.key>] : String | provenance | MaD:34 |
+| Test.java:43:36:43:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:43:19:43:39 | getIntent_extras(...) : Bundle [<map.key>] : String | provenance | MaD:34 |
 | Test.java:48:16:48:76 | (...)... : Intent [android.content.Intent.extras, <map.value>] : Object | Test.java:49:21:49:22 | in : Intent [android.content.Intent.extras, <map.value>] : Object | provenance |  |
 | Test.java:48:24:48:76 | newWithIntent_extras(...) : Intent [android.content.Intent.extras, <map.value>] : Object | Test.java:48:16:48:76 | (...)... : Intent [android.content.Intent.extras, <map.value>] : Object | provenance |  |
-| Test.java:48:45:48:75 | newBundleWithMapValue(...) : Bundle [<map.value>] : Object | Test.java:48:24:48:76 | newWithIntent_extras(...) : Intent [android.content.Intent.extras, <map.value>] : Object | provenance | MaD:180 |
-| Test.java:48:67:48:74 | source(...) : Object | Test.java:48:45:48:75 | newBundleWithMapValue(...) : Bundle [<map.value>] : Object | provenance | MaD:177 |
+| Test.java:48:45:48:75 | newBundleWithMapValue(...) : Bundle [<map.value>] : Object | Test.java:48:24:48:76 | newWithIntent_extras(...) : Intent [android.content.Intent.extras, <map.value>] : Object | provenance | MaD:178 |
+| Test.java:48:67:48:74 | source(...) : Object | Test.java:48:45:48:75 | newBundleWithMapValue(...) : Bundle [<map.value>] : Object | provenance | MaD:176 |
 | Test.java:49:10:49:23 | new Intent(...) : Intent [android.content.Intent.extras, <map.value>] : Object | Test.java:50:38:50:40 | out : Intent [android.content.Intent.extras, <map.value>] : Object | provenance |  |
 | Test.java:49:10:49:23 | new Intent(...) : Intent [android.content.Intent.extras, <map.value>] : Object | Test.java:50:38:50:40 | out : Intent [android.content.Intent.extras, <map.value>] : Object | provenance |  |
-| Test.java:49:21:49:22 | in : Intent [android.content.Intent.extras, <map.value>] : Object | Test.java:49:10:49:23 | new Intent(...) : Intent [android.content.Intent.extras, <map.value>] : Object | provenance | MaD:16 |
-| Test.java:49:21:49:22 | in : Intent [android.content.Intent.extras, <map.value>] : Object | Test.java:49:10:49:23 | new Intent(...) : Intent [android.content.Intent.extras, <map.value>] : Object | provenance | MaD:16 |
-| Test.java:50:21:50:41 | getIntent_extras(...) : Bundle [<map.value>] : Object | Test.java:50:9:50:42 | getMapValue(...) | provenance | MaD:179 |
+| Test.java:49:21:49:22 | in : Intent [android.content.Intent.extras, <map.value>] : Object | Test.java:49:10:49:23 | new Intent(...) : Intent [android.content.Intent.extras, <map.value>] : Object | provenance | MaD:14 |
+| Test.java:49:21:49:22 | in : Intent [android.content.Intent.extras, <map.value>] : Object | Test.java:49:10:49:23 | new Intent(...) : Intent [android.content.Intent.extras, <map.value>] : Object | provenance | MaD:14 |
+| Test.java:50:21:50:41 | getIntent_extras(...) : Bundle [<map.value>] : Object | Test.java:50:9:50:42 | getMapValue(...) | provenance | MaD:175 |
 | Test.java:50:38:50:40 | out : Intent [android.content.Intent.extras, <map.value>] : Object | Test.java:23:26:23:33 | i : Intent [android.content.Intent.extras, <map.value>] : Object | provenance |  |
 | Test.java:50:38:50:40 | out : Intent [android.content.Intent.extras, <map.value>] : Object | Test.java:23:26:23:33 | i : Intent [android.content.Intent.extras, <map.value>] : Object | provenance |  |
-| Test.java:50:38:50:40 | out : Intent [android.content.Intent.extras, <map.value>] : Object | Test.java:50:21:50:41 | getIntent_extras(...) : Bundle [<map.value>] : Object | provenance | MaD:31 |
-| Test.java:50:38:50:40 | out : Intent [android.content.Intent.extras, <map.value>] : Object | Test.java:50:21:50:41 | getIntent_extras(...) : Bundle [<map.value>] : Object | provenance | MaD:31 |
+| Test.java:50:38:50:40 | out : Intent [android.content.Intent.extras, <map.value>] : Object | Test.java:50:21:50:41 | getIntent_extras(...) : Bundle [<map.value>] : Object | provenance | MaD:34 |
+| Test.java:50:38:50:40 | out : Intent [android.content.Intent.extras, <map.value>] : Object | Test.java:50:21:50:41 | getIntent_extras(...) : Bundle [<map.value>] : Object | provenance | MaD:34 |
 | Test.java:55:13:55:25 | (...)... : Uri | Test.java:56:27:56:28 | in : Uri | provenance |  |
 | Test.java:55:18:55:25 | source(...) : Object | Test.java:55:13:55:25 | (...)... : Uri | provenance |  |
 | Test.java:56:10:56:29 | new Intent(...) : Intent [android.content.Intent.data] : Uri | Test.java:57:17:57:19 | out : Intent [android.content.Intent.data] : Uri | provenance |  |
-| Test.java:56:27:56:28 | in : Uri | Test.java:56:10:56:29 | new Intent(...) : Intent [android.content.Intent.data] : Uri | provenance | MaD:17 |
+| Test.java:56:27:56:28 | in : Uri | Test.java:56:10:56:29 | new Intent(...) : Intent [android.content.Intent.data] : Uri | provenance | MaD:15 |
 | Test.java:57:17:57:19 | out : Intent [android.content.Intent.data] : Uri | Test.java:32:14:32:26 | intent : Intent [android.content.Intent.data] : Uri | provenance |  |
-| Test.java:57:17:57:19 | out : Intent [android.content.Intent.data] : Uri | Test.java:57:9:57:20 | getData(...) | provenance | MaD:29 |
+| Test.java:57:17:57:19 | out : Intent [android.content.Intent.data] : Uri | Test.java:57:9:57:20 | getData(...) | provenance | MaD:32 |
 | Test.java:62:13:62:25 | (...)... : Uri | Test.java:63:27:63:28 | in : Uri | provenance |  |
 | Test.java:62:18:62:25 | source(...) : Object | Test.java:62:13:62:25 | (...)... : Uri | provenance |  |
 | Test.java:63:10:63:41 | new Intent(...) : Intent [android.content.Intent.data] : Uri | Test.java:64:17:64:19 | out : Intent [android.content.Intent.data] : Uri | provenance |  |
-| Test.java:63:27:63:28 | in : Uri | Test.java:63:10:63:41 | new Intent(...) : Intent [android.content.Intent.data] : Uri | provenance | MaD:18 |
+| Test.java:63:27:63:28 | in : Uri | Test.java:63:10:63:41 | new Intent(...) : Intent [android.content.Intent.data] : Uri | provenance | MaD:16 |
 | Test.java:64:17:64:19 | out : Intent [android.content.Intent.data] : Uri | Test.java:32:14:32:26 | intent : Intent [android.content.Intent.data] : Uri | provenance |  |
-| Test.java:64:17:64:19 | out : Intent [android.content.Intent.data] : Uri | Test.java:64:9:64:20 | getData(...) | provenance | MaD:29 |
+| Test.java:64:17:64:19 | out : Intent [android.content.Intent.data] : Uri | Test.java:64:9:64:20 | getData(...) | provenance | MaD:32 |
 | Test.java:69:16:69:31 | (...)... : Intent | Test.java:70:10:70:11 | in : Intent | provenance |  |
 | Test.java:69:24:69:31 | source(...) : Object | Test.java:69:16:69:31 | (...)... : Intent | provenance |  |
-| Test.java:70:10:70:11 | in : Intent | Test.java:70:10:70:29 | addCategory(...) : Intent | provenance | MaD:20 |
+| Test.java:70:10:70:11 | in : Intent | Test.java:70:10:70:29 | addCategory(...) : Intent | provenance | MaD:24 |
 | Test.java:70:10:70:29 | addCategory(...) : Intent | Test.java:71:9:71:11 | out | provenance |  |
 | Test.java:76:16:76:31 | (...)... : Intent | Test.java:77:10:77:11 | in : Intent | provenance |  |
 | Test.java:76:24:76:31 | source(...) : Object | Test.java:76:16:76:31 | (...)... : Intent | provenance |  |
-| Test.java:77:10:77:11 | in : Intent | Test.java:77:10:77:23 | addFlags(...) : Intent | provenance | MaD:21 |
+| Test.java:77:10:77:11 | in : Intent | Test.java:77:10:77:23 | addFlags(...) : Intent | provenance | MaD:25 |
 | Test.java:77:10:77:23 | addFlags(...) : Intent | Test.java:78:9:78:11 | out | provenance |  |
 | Test.java:83:22:83:43 | (...)... : CharSequence | Test.java:84:37:84:38 | in : CharSequence | provenance |  |
 | Test.java:83:36:83:43 | source(...) : Object | Test.java:83:22:83:43 | (...)... : CharSequence | provenance |  |
 | Test.java:84:10:84:45 | createChooser(...) : Intent [android.content.Intent.extras, <map.value>] : CharSequence | Test.java:85:38:85:40 | out : Intent [android.content.Intent.extras, <map.value>] : CharSequence | provenance |  |
 | Test.java:84:10:84:45 | createChooser(...) : Intent [android.content.Intent.extras, <map.value>] : CharSequence | Test.java:85:38:85:40 | out : Intent [android.content.Intent.extras, <map.value>] : CharSequence | provenance |  |
-| Test.java:84:37:84:38 | in : CharSequence | Test.java:84:10:84:45 | createChooser(...) : Intent [android.content.Intent.extras, <map.value>] : CharSequence | provenance | MaD:22 |
-| Test.java:84:37:84:38 | in : CharSequence | Test.java:84:10:84:45 | createChooser(...) : Intent [android.content.Intent.extras, <map.value>] : CharSequence | provenance | MaD:22 |
-| Test.java:85:21:85:41 | getIntent_extras(...) : Bundle [<map.value>] : CharSequence | Test.java:85:9:85:42 | getMapValue(...) | provenance | MaD:179 |
+| Test.java:84:37:84:38 | in : CharSequence | Test.java:84:10:84:45 | createChooser(...) : Intent [android.content.Intent.extras, <map.value>] : CharSequence | provenance | MaD:17 |
+| Test.java:84:37:84:38 | in : CharSequence | Test.java:84:10:84:45 | createChooser(...) : Intent [android.content.Intent.extras, <map.value>] : CharSequence | provenance | MaD:17 |
+| Test.java:85:21:85:41 | getIntent_extras(...) : Bundle [<map.value>] : CharSequence | Test.java:85:9:85:42 | getMapValue(...) | provenance | MaD:175 |
 | Test.java:85:38:85:40 | out : Intent [android.content.Intent.extras, <map.value>] : CharSequence | Test.java:23:26:23:33 | i : Intent [android.content.Intent.extras, <map.value>] : CharSequence | provenance |  |
 | Test.java:85:38:85:40 | out : Intent [android.content.Intent.extras, <map.value>] : CharSequence | Test.java:23:26:23:33 | i : Intent [android.content.Intent.extras, <map.value>] : CharSequence | provenance |  |
-| Test.java:85:38:85:40 | out : Intent [android.content.Intent.extras, <map.value>] : CharSequence | Test.java:85:21:85:41 | getIntent_extras(...) : Bundle [<map.value>] : CharSequence | provenance | MaD:31 |
-| Test.java:85:38:85:40 | out : Intent [android.content.Intent.extras, <map.value>] : CharSequence | Test.java:85:21:85:41 | getIntent_extras(...) : Bundle [<map.value>] : CharSequence | provenance | MaD:31 |
+| Test.java:85:38:85:40 | out : Intent [android.content.Intent.extras, <map.value>] : CharSequence | Test.java:85:21:85:41 | getIntent_extras(...) : Bundle [<map.value>] : CharSequence | provenance | MaD:34 |
+| Test.java:85:38:85:40 | out : Intent [android.content.Intent.extras, <map.value>] : CharSequence | Test.java:85:21:85:41 | getIntent_extras(...) : Bundle [<map.value>] : CharSequence | provenance | MaD:34 |
 | Test.java:90:22:90:43 | (...)... : IntentSender | Test.java:91:43:91:44 | in : IntentSender | provenance |  |
 | Test.java:90:36:90:43 | source(...) : Object | Test.java:90:22:90:43 | (...)... : IntentSender | provenance |  |
 | Test.java:91:10:91:45 | createChooser(...) : Intent [android.content.Intent.extras, <map.value>] : IntentSender | Test.java:92:38:92:40 | out : Intent [android.content.Intent.extras, <map.value>] : IntentSender | provenance |  |
 | Test.java:91:10:91:45 | createChooser(...) : Intent [android.content.Intent.extras, <map.value>] : IntentSender | Test.java:92:38:92:40 | out : Intent [android.content.Intent.extras, <map.value>] : IntentSender | provenance |  |
-| Test.java:91:43:91:44 | in : IntentSender | Test.java:91:10:91:45 | createChooser(...) : Intent [android.content.Intent.extras, <map.value>] : IntentSender | provenance | MaD:22 |
-| Test.java:91:43:91:44 | in : IntentSender | Test.java:91:10:91:45 | createChooser(...) : Intent [android.content.Intent.extras, <map.value>] : IntentSender | provenance | MaD:22 |
-| Test.java:92:21:92:41 | getIntent_extras(...) : Bundle [<map.value>] : IntentSender | Test.java:92:9:92:42 | getMapValue(...) | provenance | MaD:179 |
+| Test.java:91:43:91:44 | in : IntentSender | Test.java:91:10:91:45 | createChooser(...) : Intent [android.content.Intent.extras, <map.value>] : IntentSender | provenance | MaD:17 |
+| Test.java:91:43:91:44 | in : IntentSender | Test.java:91:10:91:45 | createChooser(...) : Intent [android.content.Intent.extras, <map.value>] : IntentSender | provenance | MaD:17 |
+| Test.java:92:21:92:41 | getIntent_extras(...) : Bundle [<map.value>] : IntentSender | Test.java:92:9:92:42 | getMapValue(...) | provenance | MaD:175 |
 | Test.java:92:38:92:40 | out : Intent [android.content.Intent.extras, <map.value>] : IntentSender | Test.java:23:26:23:33 | i : Intent [android.content.Intent.extras, <map.value>] : IntentSender | provenance |  |
 | Test.java:92:38:92:40 | out : Intent [android.content.Intent.extras, <map.value>] : IntentSender | Test.java:23:26:23:33 | i : Intent [android.content.Intent.extras, <map.value>] : IntentSender | provenance |  |
-| Test.java:92:38:92:40 | out : Intent [android.content.Intent.extras, <map.value>] : IntentSender | Test.java:92:21:92:41 | getIntent_extras(...) : Bundle [<map.value>] : IntentSender | provenance | MaD:31 |
-| Test.java:92:38:92:40 | out : Intent [android.content.Intent.extras, <map.value>] : IntentSender | Test.java:92:21:92:41 | getIntent_extras(...) : Bundle [<map.value>] : IntentSender | provenance | MaD:31 |
+| Test.java:92:38:92:40 | out : Intent [android.content.Intent.extras, <map.value>] : IntentSender | Test.java:92:21:92:41 | getIntent_extras(...) : Bundle [<map.value>] : IntentSender | provenance | MaD:34 |
+| Test.java:92:38:92:40 | out : Intent [android.content.Intent.extras, <map.value>] : IntentSender | Test.java:92:21:92:41 | getIntent_extras(...) : Bundle [<map.value>] : IntentSender | provenance | MaD:34 |
 | Test.java:97:16:97:31 | (...)... : Intent | Test.java:98:31:98:32 | in : Intent | provenance |  |
 | Test.java:97:24:97:31 | source(...) : Object | Test.java:97:16:97:31 | (...)... : Intent | provenance |  |
 | Test.java:98:10:98:45 | createChooser(...) : Intent [android.content.Intent.extras, <map.value>] : Intent | Test.java:99:38:99:40 | out : Intent [android.content.Intent.extras, <map.value>] : Intent | provenance |  |
 | Test.java:98:10:98:45 | createChooser(...) : Intent [android.content.Intent.extras, <map.value>] : Intent | Test.java:99:38:99:40 | out : Intent [android.content.Intent.extras, <map.value>] : Intent | provenance |  |
-| Test.java:98:31:98:32 | in : Intent | Test.java:98:10:98:45 | createChooser(...) : Intent [android.content.Intent.extras, <map.value>] : Intent | provenance | MaD:22 |
-| Test.java:98:31:98:32 | in : Intent | Test.java:98:10:98:45 | createChooser(...) : Intent [android.content.Intent.extras, <map.value>] : Intent | provenance | MaD:22 |
-| Test.java:99:21:99:41 | getIntent_extras(...) : Bundle [<map.value>] : Intent | Test.java:99:9:99:42 | getMapValue(...) | provenance | MaD:179 |
+| Test.java:98:31:98:32 | in : Intent | Test.java:98:10:98:45 | createChooser(...) : Intent [android.content.Intent.extras, <map.value>] : Intent | provenance | MaD:17 |
+| Test.java:98:31:98:32 | in : Intent | Test.java:98:10:98:45 | createChooser(...) : Intent [android.content.Intent.extras, <map.value>] : Intent | provenance | MaD:17 |
+| Test.java:99:21:99:41 | getIntent_extras(...) : Bundle [<map.value>] : Intent | Test.java:99:9:99:42 | getMapValue(...) | provenance | MaD:175 |
 | Test.java:99:38:99:40 | out : Intent [android.content.Intent.extras, <map.value>] : Intent | Test.java:23:26:23:33 | i : Intent [android.content.Intent.extras, <map.value>] : Intent | provenance |  |
 | Test.java:99:38:99:40 | out : Intent [android.content.Intent.extras, <map.value>] : Intent | Test.java:23:26:23:33 | i : Intent [android.content.Intent.extras, <map.value>] : Intent | provenance |  |
-| Test.java:99:38:99:40 | out : Intent [android.content.Intent.extras, <map.value>] : Intent | Test.java:99:21:99:41 | getIntent_extras(...) : Bundle [<map.value>] : Intent | provenance | MaD:31 |
-| Test.java:99:38:99:40 | out : Intent [android.content.Intent.extras, <map.value>] : Intent | Test.java:99:21:99:41 | getIntent_extras(...) : Bundle [<map.value>] : Intent | provenance | MaD:31 |
+| Test.java:99:38:99:40 | out : Intent [android.content.Intent.extras, <map.value>] : Intent | Test.java:99:21:99:41 | getIntent_extras(...) : Bundle [<map.value>] : Intent | provenance | MaD:34 |
+| Test.java:99:38:99:40 | out : Intent [android.content.Intent.extras, <map.value>] : Intent | Test.java:99:21:99:41 | getIntent_extras(...) : Bundle [<map.value>] : Intent | provenance | MaD:34 |
 | Test.java:104:16:104:76 | (...)... : Intent [android.content.Intent.extras, <map.value>] : Object | Test.java:105:10:105:11 | in : Intent [android.content.Intent.extras, <map.value>] : Object | provenance |  |
 | Test.java:104:24:104:76 | newWithIntent_extras(...) : Intent [android.content.Intent.extras, <map.value>] : Object | Test.java:104:16:104:76 | (...)... : Intent [android.content.Intent.extras, <map.value>] : Object | provenance |  |
-| Test.java:104:45:104:75 | newBundleWithMapValue(...) : Bundle [<map.value>] : Object | Test.java:104:24:104:76 | newWithIntent_extras(...) : Intent [android.content.Intent.extras, <map.value>] : Object | provenance | MaD:180 |
-| Test.java:104:67:104:74 | source(...) : Object | Test.java:104:45:104:75 | newBundleWithMapValue(...) : Bundle [<map.value>] : Object | provenance | MaD:177 |
-| Test.java:105:10:105:11 | in : Intent [android.content.Intent.extras, <map.value>] : Object | Test.java:105:10:105:32 | getBundleExtra(...) : Bundle | provenance | MaD:23 |
+| Test.java:104:45:104:75 | newBundleWithMapValue(...) : Bundle [<map.value>] : Object | Test.java:104:24:104:76 | newWithIntent_extras(...) : Intent [android.content.Intent.extras, <map.value>] : Object | provenance | MaD:178 |
+| Test.java:104:67:104:74 | source(...) : Object | Test.java:104:45:104:75 | newBundleWithMapValue(...) : Bundle [<map.value>] : Object | provenance | MaD:176 |
+| Test.java:105:10:105:11 | in : Intent [android.content.Intent.extras, <map.value>] : Object | Test.java:105:10:105:32 | getBundleExtra(...) : Bundle | provenance | MaD:26 |
 | Test.java:105:10:105:32 | getBundleExtra(...) : Bundle | Test.java:106:9:106:11 | out | provenance |  |
 | Test.java:111:16:111:76 | (...)... : Intent [android.content.Intent.extras, <map.value>] : Object | Test.java:112:10:112:11 | in : Intent [android.content.Intent.extras, <map.value>] : Object | provenance |  |
 | Test.java:111:24:111:76 | newWithIntent_extras(...) : Intent [android.content.Intent.extras, <map.value>] : Object | Test.java:111:16:111:76 | (...)... : Intent [android.content.Intent.extras, <map.value>] : Object | provenance |  |
-| Test.java:111:45:111:75 | newBundleWithMapValue(...) : Bundle [<map.value>] : Object | Test.java:111:24:111:76 | newWithIntent_extras(...) : Intent [android.content.Intent.extras, <map.value>] : Object | provenance | MaD:180 |
-| Test.java:111:67:111:74 | source(...) : Object | Test.java:111:45:111:75 | newBundleWithMapValue(...) : Bundle [<map.value>] : Object | provenance | MaD:177 |
-| Test.java:112:10:112:11 | in : Intent [android.content.Intent.extras, <map.value>] : Object | Test.java:112:10:112:35 | getByteArrayExtra(...) : byte[] | provenance | MaD:24 |
+| Test.java:111:45:111:75 | newBundleWithMapValue(...) : Bundle [<map.value>] : Object | Test.java:111:24:111:76 | newWithIntent_extras(...) : Intent [android.content.Intent.extras, <map.value>] : Object | provenance | MaD:178 |
+| Test.java:111:67:111:74 | source(...) : Object | Test.java:111:45:111:75 | newBundleWithMapValue(...) : Bundle [<map.value>] : Object | provenance | MaD:176 |
+| Test.java:112:10:112:11 | in : Intent [android.content.Intent.extras, <map.value>] : Object | Test.java:112:10:112:35 | getByteArrayExtra(...) : byte[] | provenance | MaD:27 |
 | Test.java:112:10:112:35 | getByteArrayExtra(...) : byte[] | Test.java:113:9:113:11 | out | provenance |  |
 | Test.java:118:16:118:76 | (...)... : Intent [android.content.Intent.extras, <map.value>] : Object | Test.java:119:10:119:11 | in : Intent [android.content.Intent.extras, <map.value>] : Object | provenance |  |
 | Test.java:118:24:118:76 | newWithIntent_extras(...) : Intent [android.content.Intent.extras, <map.value>] : Object | Test.java:118:16:118:76 | (...)... : Intent [android.content.Intent.extras, <map.value>] : Object | provenance |  |
-| Test.java:118:45:118:75 | newBundleWithMapValue(...) : Bundle [<map.value>] : Object | Test.java:118:24:118:76 | newWithIntent_extras(...) : Intent [android.content.Intent.extras, <map.value>] : Object | provenance | MaD:180 |
-| Test.java:118:67:118:74 | source(...) : Object | Test.java:118:45:118:75 | newBundleWithMapValue(...) : Bundle [<map.value>] : Object | provenance | MaD:177 |
-| Test.java:119:10:119:11 | in : Intent [android.content.Intent.extras, <map.value>] : Object | Test.java:119:10:119:35 | getCharArrayExtra(...) : char[] | provenance | MaD:25 |
+| Test.java:118:45:118:75 | newBundleWithMapValue(...) : Bundle [<map.value>] : Object | Test.java:118:24:118:76 | newWithIntent_extras(...) : Intent [android.content.Intent.extras, <map.value>] : Object | provenance | MaD:178 |
+| Test.java:118:67:118:74 | source(...) : Object | Test.java:118:45:118:75 | newBundleWithMapValue(...) : Bundle [<map.value>] : Object | provenance | MaD:176 |
+| Test.java:119:10:119:11 | in : Intent [android.content.Intent.extras, <map.value>] : Object | Test.java:119:10:119:35 | getCharArrayExtra(...) : char[] | provenance | MaD:28 |
 | Test.java:119:10:119:35 | getCharArrayExtra(...) : char[] | Test.java:120:9:120:11 | out | provenance |  |
 | Test.java:125:16:125:76 | (...)... : Intent [android.content.Intent.extras, <map.value>] : Object | Test.java:126:10:126:11 | in : Intent [android.content.Intent.extras, <map.value>] : Object | provenance |  |
 | Test.java:125:24:125:76 | newWithIntent_extras(...) : Intent [android.content.Intent.extras, <map.value>] : Object | Test.java:125:16:125:76 | (...)... : Intent [android.content.Intent.extras, <map.value>] : Object | provenance |  |
-| Test.java:125:45:125:75 | newBundleWithMapValue(...) : Bundle [<map.value>] : Object | Test.java:125:24:125:76 | newWithIntent_extras(...) : Intent [android.content.Intent.extras, <map.value>] : Object | provenance | MaD:180 |
-| Test.java:125:67:125:74 | source(...) : Object | Test.java:125:45:125:75 | newBundleWithMapValue(...) : Bundle [<map.value>] : Object | provenance | MaD:177 |
-| Test.java:126:10:126:11 | in : Intent [android.content.Intent.extras, <map.value>] : Object | Test.java:126:10:126:43 | getCharSequenceArrayExtra(...) : CharSequence[] | provenance | MaD:26 |
+| Test.java:125:45:125:75 | newBundleWithMapValue(...) : Bundle [<map.value>] : Object | Test.java:125:24:125:76 | newWithIntent_extras(...) : Intent [android.content.Intent.extras, <map.value>] : Object | provenance | MaD:178 |
+| Test.java:125:67:125:74 | source(...) : Object | Test.java:125:45:125:75 | newBundleWithMapValue(...) : Bundle [<map.value>] : Object | provenance | MaD:176 |
+| Test.java:126:10:126:11 | in : Intent [android.content.Intent.extras, <map.value>] : Object | Test.java:126:10:126:43 | getCharSequenceArrayExtra(...) : CharSequence[] | provenance | MaD:29 |
 | Test.java:126:10:126:43 | getCharSequenceArrayExtra(...) : CharSequence[] | Test.java:127:9:127:11 | out | provenance |  |
 | Test.java:132:16:132:76 | (...)... : Intent [android.content.Intent.extras, <map.value>] : Object | Test.java:133:10:133:11 | in : Intent [android.content.Intent.extras, <map.value>] : Object | provenance |  |
 | Test.java:132:24:132:76 | newWithIntent_extras(...) : Intent [android.content.Intent.extras, <map.value>] : Object | Test.java:132:16:132:76 | (...)... : Intent [android.content.Intent.extras, <map.value>] : Object | provenance |  |
-| Test.java:132:45:132:75 | newBundleWithMapValue(...) : Bundle [<map.value>] : Object | Test.java:132:24:132:76 | newWithIntent_extras(...) : Intent [android.content.Intent.extras, <map.value>] : Object | provenance | MaD:180 |
-| Test.java:132:67:132:74 | source(...) : Object | Test.java:132:45:132:75 | newBundleWithMapValue(...) : Bundle [<map.value>] : Object | provenance | MaD:177 |
-| Test.java:133:10:133:11 | in : Intent [android.content.Intent.extras, <map.value>] : Object | Test.java:133:10:133:47 | getCharSequenceArrayListExtra(...) : ArrayList | provenance | MaD:27 |
+| Test.java:132:45:132:75 | newBundleWithMapValue(...) : Bundle [<map.value>] : Object | Test.java:132:24:132:76 | newWithIntent_extras(...) : Intent [android.content.Intent.extras, <map.value>] : Object | provenance | MaD:178 |
+| Test.java:132:67:132:74 | source(...) : Object | Test.java:132:45:132:75 | newBundleWithMapValue(...) : Bundle [<map.value>] : Object | provenance | MaD:176 |
+| Test.java:133:10:133:11 | in : Intent [android.content.Intent.extras, <map.value>] : Object | Test.java:133:10:133:47 | getCharSequenceArrayListExtra(...) : ArrayList | provenance | MaD:30 |
 | Test.java:133:10:133:47 | getCharSequenceArrayListExtra(...) : ArrayList | Test.java:134:9:134:11 | out | provenance |  |
 | Test.java:139:16:139:76 | (...)... : Intent [android.content.Intent.extras, <map.value>] : Object | Test.java:140:10:140:11 | in : Intent [android.content.Intent.extras, <map.value>] : Object | provenance |  |
 | Test.java:139:24:139:76 | newWithIntent_extras(...) : Intent [android.content.Intent.extras, <map.value>] : Object | Test.java:139:16:139:76 | (...)... : Intent [android.content.Intent.extras, <map.value>] : Object | provenance |  |
-| Test.java:139:45:139:75 | newBundleWithMapValue(...) : Bundle [<map.value>] : Object | Test.java:139:24:139:76 | newWithIntent_extras(...) : Intent [android.content.Intent.extras, <map.value>] : Object | provenance | MaD:180 |
-| Test.java:139:67:139:74 | source(...) : Object | Test.java:139:45:139:75 | newBundleWithMapValue(...) : Bundle [<map.value>] : Object | provenance | MaD:177 |
-| Test.java:140:10:140:11 | in : Intent [android.content.Intent.extras, <map.value>] : Object | Test.java:140:10:140:38 | getCharSequenceExtra(...) : CharSequence | provenance | MaD:28 |
+| Test.java:139:45:139:75 | newBundleWithMapValue(...) : Bundle [<map.value>] : Object | Test.java:139:24:139:76 | newWithIntent_extras(...) : Intent [android.content.Intent.extras, <map.value>] : Object | provenance | MaD:178 |
+| Test.java:139:67:139:74 | source(...) : Object | Test.java:139:45:139:75 | newBundleWithMapValue(...) : Bundle [<map.value>] : Object | provenance | MaD:176 |
+| Test.java:140:10:140:11 | in : Intent [android.content.Intent.extras, <map.value>] : Object | Test.java:140:10:140:38 | getCharSequenceExtra(...) : CharSequence | provenance | MaD:31 |
 | Test.java:140:10:140:38 | getCharSequenceExtra(...) : CharSequence | Test.java:141:9:141:11 | out | provenance |  |
 | Test.java:146:16:146:51 | (...)... : Intent [android.content.Intent.data] : Uri | Test.java:147:10:147:11 | in : Intent [android.content.Intent.data] : Uri | provenance |  |
 | Test.java:146:24:146:51 | newWithIntent_data(...) : Intent [android.content.Intent.data] : Uri | Test.java:146:16:146:51 | (...)... : Intent [android.content.Intent.data] : Uri | provenance |  |
 | Test.java:146:43:146:50 | source(...) : Uri | Test.java:27:28:27:35 | data : Uri | provenance |  |
-| Test.java:146:43:146:50 | source(...) : Uri | Test.java:146:24:146:51 | newWithIntent_data(...) : Intent [android.content.Intent.data] : Uri | provenance | MaD:17 |
-| Test.java:147:10:147:11 | in : Intent [android.content.Intent.data] : Uri | Test.java:147:10:147:21 | getData(...) : Uri | provenance | MaD:29 |
+| Test.java:146:43:146:50 | source(...) : Uri | Test.java:146:24:146:51 | newWithIntent_data(...) : Intent [android.content.Intent.data] : Uri | provenance | MaD:15 |
+| Test.java:147:10:147:11 | in : Intent [android.content.Intent.data] : Uri | Test.java:147:10:147:21 | getData(...) : Uri | provenance | MaD:32 |
 | Test.java:147:10:147:21 | getData(...) : Uri | Test.java:148:9:148:11 | out | provenance |  |
 | Test.java:153:16:153:51 | (...)... : Intent [android.content.Intent.data] : Uri | Test.java:154:10:154:11 | in : Intent [android.content.Intent.data] : Uri | provenance |  |
 | Test.java:153:24:153:51 | newWithIntent_data(...) : Intent [android.content.Intent.data] : Uri | Test.java:153:16:153:51 | (...)... : Intent [android.content.Intent.data] : Uri | provenance |  |
 | Test.java:153:43:153:50 | source(...) : Uri | Test.java:27:28:27:35 | data : Uri | provenance |  |
-| Test.java:153:43:153:50 | source(...) : Uri | Test.java:153:24:153:51 | newWithIntent_data(...) : Intent [android.content.Intent.data] : Uri | provenance | MaD:17 |
-| Test.java:154:10:154:11 | in : Intent [android.content.Intent.data] : Uri | Test.java:154:10:154:27 | getDataString(...) : String | provenance | MaD:30 |
+| Test.java:153:43:153:50 | source(...) : Uri | Test.java:153:24:153:51 | newWithIntent_data(...) : Intent [android.content.Intent.data] : Uri | provenance | MaD:15 |
+| Test.java:154:10:154:11 | in : Intent [android.content.Intent.data] : Uri | Test.java:154:10:154:27 | getDataString(...) : String | provenance | MaD:33 |
 | Test.java:154:10:154:27 | getDataString(...) : String | Test.java:155:9:155:11 | out | provenance |  |
 | Test.java:160:16:160:53 | (...)... : Intent [android.content.Intent.extras] : Bundle | Test.java:161:10:161:11 | in : Intent [android.content.Intent.extras] : Bundle | provenance |  |
 | Test.java:160:24:160:53 | newWithIntent_extras(...) : Intent [android.content.Intent.extras] : Bundle | Test.java:160:16:160:53 | (...)... : Intent [android.content.Intent.extras] : Bundle | provenance |  |
-| Test.java:160:45:160:52 | source(...) : Bundle | Test.java:160:24:160:53 | newWithIntent_extras(...) : Intent [android.content.Intent.extras] : Bundle | provenance | MaD:180 |
-| Test.java:161:10:161:11 | in : Intent [android.content.Intent.extras] : Bundle | Test.java:161:10:161:23 | getExtras(...) : Bundle | provenance | MaD:31 |
+| Test.java:160:45:160:52 | source(...) : Bundle | Test.java:160:24:160:53 | newWithIntent_extras(...) : Intent [android.content.Intent.extras] : Bundle | provenance | MaD:178 |
+| Test.java:161:10:161:11 | in : Intent [android.content.Intent.extras] : Bundle | Test.java:161:10:161:23 | getExtras(...) : Bundle | provenance | MaD:34 |
 | Test.java:161:10:161:23 | getExtras(...) : Bundle | Test.java:162:9:162:11 | out | provenance |  |
 | Test.java:167:16:167:31 | (...)... : String | Test.java:168:27:168:28 | in : String | provenance |  |
 | Test.java:167:24:167:31 | source(...) : Object | Test.java:167:16:167:31 | (...)... : String | provenance |  |
 | Test.java:168:10:168:29 | getIntent(...) : Intent | Test.java:169:9:169:11 | out : Intent | provenance |  |
 | Test.java:168:10:168:29 | getIntent(...) : Intent [android.content.Intent.data] : Object | Test.java:169:9:169:11 | out : Intent [android.content.Intent.data] : Object | provenance |  |
-| Test.java:168:27:168:28 | in : String | Test.java:168:10:168:29 | getIntent(...) : Intent | provenance | MaD:33 |
-| Test.java:168:27:168:28 | in : String | Test.java:168:10:168:29 | getIntent(...) : Intent [android.content.Intent.data] : Object | provenance | MaD:32 |
-| Test.java:169:9:169:11 | out : Intent | Test.java:169:9:169:21 | getData(...) | provenance | MaD:29 |
-| Test.java:169:9:169:11 | out : Intent [android.content.Intent.data] : Object | Test.java:169:9:169:21 | getData(...) | provenance | MaD:29 |
+| Test.java:168:27:168:28 | in : String | Test.java:168:10:168:29 | getIntent(...) : Intent | provenance | MaD:35 |
+| Test.java:168:27:168:28 | in : String | Test.java:168:10:168:29 | getIntent(...) : Intent [android.content.Intent.data] : Object | provenance | MaD:18 |
+| Test.java:169:9:169:11 | out : Intent | Test.java:169:9:169:21 | getData(...) | provenance | MaD:32 |
+| Test.java:169:9:169:11 | out : Intent [android.content.Intent.data] : Object | Test.java:169:9:169:21 | getData(...) | provenance | MaD:32 |
 | Test.java:174:16:174:31 | (...)... : String | Test.java:175:30:175:31 | in : String | provenance |  |
 | Test.java:174:24:174:31 | source(...) : Object | Test.java:174:16:174:31 | (...)... : String | provenance |  |
 | Test.java:175:10:175:32 | getIntentOld(...) : Intent | Test.java:176:9:176:11 | out : Intent | provenance |  |
 | Test.java:175:10:175:32 | getIntentOld(...) : Intent [android.content.Intent.data] : Object | Test.java:176:9:176:11 | out : Intent [android.content.Intent.data] : Object | provenance |  |
-| Test.java:175:30:175:31 | in : String | Test.java:175:10:175:32 | getIntentOld(...) : Intent | provenance | MaD:35 |
-| Test.java:175:30:175:31 | in : String | Test.java:175:10:175:32 | getIntentOld(...) : Intent [android.content.Intent.data] : Object | provenance | MaD:34 |
-| Test.java:176:9:176:11 | out : Intent | Test.java:176:9:176:21 | getData(...) | provenance | MaD:29 |
-| Test.java:176:9:176:11 | out : Intent [android.content.Intent.data] : Object | Test.java:176:9:176:21 | getData(...) | provenance | MaD:29 |
+| Test.java:175:30:175:31 | in : String | Test.java:175:10:175:32 | getIntentOld(...) : Intent | provenance | MaD:36 |
+| Test.java:175:30:175:31 | in : String | Test.java:175:10:175:32 | getIntentOld(...) : Intent [android.content.Intent.data] : Object | provenance | MaD:19 |
+| Test.java:176:9:176:11 | out : Intent | Test.java:176:9:176:21 | getData(...) | provenance | MaD:32 |
+| Test.java:176:9:176:11 | out : Intent [android.content.Intent.data] : Object | Test.java:176:9:176:21 | getData(...) | provenance | MaD:32 |
 | Test.java:181:16:181:76 | (...)... : Intent [android.content.Intent.extras, <map.value>] : Object | Test.java:182:10:182:11 | in : Intent [android.content.Intent.extras, <map.value>] : Object | provenance |  |
 | Test.java:181:24:181:76 | newWithIntent_extras(...) : Intent [android.content.Intent.extras, <map.value>] : Object | Test.java:181:16:181:76 | (...)... : Intent [android.content.Intent.extras, <map.value>] : Object | provenance |  |
-| Test.java:181:45:181:75 | newBundleWithMapValue(...) : Bundle [<map.value>] : Object | Test.java:181:24:181:76 | newWithIntent_extras(...) : Intent [android.content.Intent.extras, <map.value>] : Object | provenance | MaD:180 |
-| Test.java:181:67:181:74 | source(...) : Object | Test.java:181:45:181:75 | newBundleWithMapValue(...) : Bundle [<map.value>] : Object | provenance | MaD:177 |
-| Test.java:182:10:182:11 | in : Intent [android.content.Intent.extras, <map.value>] : Object | Test.java:182:10:182:41 | getParcelableArrayExtra(...) : Parcelable[] | provenance | MaD:36 |
+| Test.java:181:45:181:75 | newBundleWithMapValue(...) : Bundle [<map.value>] : Object | Test.java:181:24:181:76 | newWithIntent_extras(...) : Intent [android.content.Intent.extras, <map.value>] : Object | provenance | MaD:178 |
+| Test.java:181:67:181:74 | source(...) : Object | Test.java:181:45:181:75 | newBundleWithMapValue(...) : Bundle [<map.value>] : Object | provenance | MaD:176 |
+| Test.java:182:10:182:11 | in : Intent [android.content.Intent.extras, <map.value>] : Object | Test.java:182:10:182:41 | getParcelableArrayExtra(...) : Parcelable[] | provenance | MaD:37 |
 | Test.java:182:10:182:41 | getParcelableArrayExtra(...) : Parcelable[] | Test.java:183:9:183:11 | out | provenance |  |
 | Test.java:188:16:188:76 | (...)... : Intent [android.content.Intent.extras, <map.value>] : Object | Test.java:189:10:189:11 | in : Intent [android.content.Intent.extras, <map.value>] : Object | provenance |  |
 | Test.java:188:24:188:76 | newWithIntent_extras(...) : Intent [android.content.Intent.extras, <map.value>] : Object | Test.java:188:16:188:76 | (...)... : Intent [android.content.Intent.extras, <map.value>] : Object | provenance |  |
-| Test.java:188:45:188:75 | newBundleWithMapValue(...) : Bundle [<map.value>] : Object | Test.java:188:24:188:76 | newWithIntent_extras(...) : Intent [android.content.Intent.extras, <map.value>] : Object | provenance | MaD:180 |
-| Test.java:188:67:188:74 | source(...) : Object | Test.java:188:45:188:75 | newBundleWithMapValue(...) : Bundle [<map.value>] : Object | provenance | MaD:177 |
-| Test.java:189:10:189:11 | in : Intent [android.content.Intent.extras, <map.value>] : Object | Test.java:189:10:189:45 | getParcelableArrayListExtra(...) : ArrayList | provenance | MaD:37 |
+| Test.java:188:45:188:75 | newBundleWithMapValue(...) : Bundle [<map.value>] : Object | Test.java:188:24:188:76 | newWithIntent_extras(...) : Intent [android.content.Intent.extras, <map.value>] : Object | provenance | MaD:178 |
+| Test.java:188:67:188:74 | source(...) : Object | Test.java:188:45:188:75 | newBundleWithMapValue(...) : Bundle [<map.value>] : Object | provenance | MaD:176 |
+| Test.java:189:10:189:11 | in : Intent [android.content.Intent.extras, <map.value>] : Object | Test.java:189:10:189:45 | getParcelableArrayListExtra(...) : ArrayList | provenance | MaD:38 |
 | Test.java:189:10:189:45 | getParcelableArrayListExtra(...) : ArrayList | Test.java:190:9:190:11 | out | provenance |  |
 | Test.java:195:16:195:76 | (...)... : Intent [android.content.Intent.extras, <map.value>] : Object | Test.java:196:10:196:11 | in : Intent [android.content.Intent.extras, <map.value>] : Object | provenance |  |
 | Test.java:195:24:195:76 | newWithIntent_extras(...) : Intent [android.content.Intent.extras, <map.value>] : Object | Test.java:195:16:195:76 | (...)... : Intent [android.content.Intent.extras, <map.value>] : Object | provenance |  |
-| Test.java:195:45:195:75 | newBundleWithMapValue(...) : Bundle [<map.value>] : Object | Test.java:195:24:195:76 | newWithIntent_extras(...) : Intent [android.content.Intent.extras, <map.value>] : Object | provenance | MaD:180 |
-| Test.java:195:67:195:74 | source(...) : Object | Test.java:195:45:195:75 | newBundleWithMapValue(...) : Bundle [<map.value>] : Object | provenance | MaD:177 |
-| Test.java:196:10:196:11 | in : Intent [android.content.Intent.extras, <map.value>] : Object | Test.java:196:10:196:36 | getParcelableExtra(...) : Parcelable | provenance | MaD:38 |
+| Test.java:195:45:195:75 | newBundleWithMapValue(...) : Bundle [<map.value>] : Object | Test.java:195:24:195:76 | newWithIntent_extras(...) : Intent [android.content.Intent.extras, <map.value>] : Object | provenance | MaD:178 |
+| Test.java:195:67:195:74 | source(...) : Object | Test.java:195:45:195:75 | newBundleWithMapValue(...) : Bundle [<map.value>] : Object | provenance | MaD:176 |
+| Test.java:196:10:196:11 | in : Intent [android.content.Intent.extras, <map.value>] : Object | Test.java:196:10:196:36 | getParcelableExtra(...) : Parcelable | provenance | MaD:39 |
 | Test.java:196:10:196:36 | getParcelableExtra(...) : Parcelable | Test.java:197:9:197:11 | out | provenance |  |
 | Test.java:202:16:202:76 | (...)... : Intent [android.content.Intent.extras, <map.value>] : Object | Test.java:203:10:203:11 | in : Intent [android.content.Intent.extras, <map.value>] : Object | provenance |  |
 | Test.java:202:24:202:76 | newWithIntent_extras(...) : Intent [android.content.Intent.extras, <map.value>] : Object | Test.java:202:16:202:76 | (...)... : Intent [android.content.Intent.extras, <map.value>] : Object | provenance |  |
-| Test.java:202:45:202:75 | newBundleWithMapValue(...) : Bundle [<map.value>] : Object | Test.java:202:24:202:76 | newWithIntent_extras(...) : Intent [android.content.Intent.extras, <map.value>] : Object | provenance | MaD:180 |
-| Test.java:202:67:202:74 | source(...) : Object | Test.java:202:45:202:75 | newBundleWithMapValue(...) : Bundle [<map.value>] : Object | provenance | MaD:177 |
-| Test.java:203:10:203:11 | in : Intent [android.content.Intent.extras, <map.value>] : Object | Test.java:203:10:203:38 | getSerializableExtra(...) : Serializable | provenance | MaD:39 |
+| Test.java:202:45:202:75 | newBundleWithMapValue(...) : Bundle [<map.value>] : Object | Test.java:202:24:202:76 | newWithIntent_extras(...) : Intent [android.content.Intent.extras, <map.value>] : Object | provenance | MaD:178 |
+| Test.java:202:67:202:74 | source(...) : Object | Test.java:202:45:202:75 | newBundleWithMapValue(...) : Bundle [<map.value>] : Object | provenance | MaD:176 |
+| Test.java:203:10:203:11 | in : Intent [android.content.Intent.extras, <map.value>] : Object | Test.java:203:10:203:38 | getSerializableExtra(...) : Serializable | provenance | MaD:40 |
 | Test.java:203:10:203:38 | getSerializableExtra(...) : Serializable | Test.java:204:9:204:11 | out | provenance |  |
 | Test.java:209:16:209:76 | (...)... : Intent [android.content.Intent.extras, <map.value>] : Object | Test.java:210:10:210:11 | in : Intent [android.content.Intent.extras, <map.value>] : Object | provenance |  |
 | Test.java:209:24:209:76 | newWithIntent_extras(...) : Intent [android.content.Intent.extras, <map.value>] : Object | Test.java:209:16:209:76 | (...)... : Intent [android.content.Intent.extras, <map.value>] : Object | provenance |  |
-| Test.java:209:45:209:75 | newBundleWithMapValue(...) : Bundle [<map.value>] : Object | Test.java:209:24:209:76 | newWithIntent_extras(...) : Intent [android.content.Intent.extras, <map.value>] : Object | provenance | MaD:180 |
-| Test.java:209:67:209:74 | source(...) : Object | Test.java:209:45:209:75 | newBundleWithMapValue(...) : Bundle [<map.value>] : Object | provenance | MaD:177 |
-| Test.java:210:10:210:11 | in : Intent [android.content.Intent.extras, <map.value>] : Object | Test.java:210:10:210:37 | getStringArrayExtra(...) : String[] | provenance | MaD:40 |
+| Test.java:209:45:209:75 | newBundleWithMapValue(...) : Bundle [<map.value>] : Object | Test.java:209:24:209:76 | newWithIntent_extras(...) : Intent [android.content.Intent.extras, <map.value>] : Object | provenance | MaD:178 |
+| Test.java:209:67:209:74 | source(...) : Object | Test.java:209:45:209:75 | newBundleWithMapValue(...) : Bundle [<map.value>] : Object | provenance | MaD:176 |
+| Test.java:210:10:210:11 | in : Intent [android.content.Intent.extras, <map.value>] : Object | Test.java:210:10:210:37 | getStringArrayExtra(...) : String[] | provenance | MaD:41 |
 | Test.java:210:10:210:37 | getStringArrayExtra(...) : String[] | Test.java:211:9:211:11 | out | provenance |  |
 | Test.java:216:16:216:76 | (...)... : Intent [android.content.Intent.extras, <map.value>] : Object | Test.java:217:10:217:11 | in : Intent [android.content.Intent.extras, <map.value>] : Object | provenance |  |
 | Test.java:216:24:216:76 | newWithIntent_extras(...) : Intent [android.content.Intent.extras, <map.value>] : Object | Test.java:216:16:216:76 | (...)... : Intent [android.content.Intent.extras, <map.value>] : Object | provenance |  |
-| Test.java:216:45:216:75 | newBundleWithMapValue(...) : Bundle [<map.value>] : Object | Test.java:216:24:216:76 | newWithIntent_extras(...) : Intent [android.content.Intent.extras, <map.value>] : Object | provenance | MaD:180 |
-| Test.java:216:67:216:74 | source(...) : Object | Test.java:216:45:216:75 | newBundleWithMapValue(...) : Bundle [<map.value>] : Object | provenance | MaD:177 |
-| Test.java:217:10:217:11 | in : Intent [android.content.Intent.extras, <map.value>] : Object | Test.java:217:10:217:41 | getStringArrayListExtra(...) : ArrayList | provenance | MaD:41 |
+| Test.java:216:45:216:75 | newBundleWithMapValue(...) : Bundle [<map.value>] : Object | Test.java:216:24:216:76 | newWithIntent_extras(...) : Intent [android.content.Intent.extras, <map.value>] : Object | provenance | MaD:178 |
+| Test.java:216:67:216:74 | source(...) : Object | Test.java:216:45:216:75 | newBundleWithMapValue(...) : Bundle [<map.value>] : Object | provenance | MaD:176 |
+| Test.java:217:10:217:11 | in : Intent [android.content.Intent.extras, <map.value>] : Object | Test.java:217:10:217:41 | getStringArrayListExtra(...) : ArrayList | provenance | MaD:42 |
 | Test.java:217:10:217:41 | getStringArrayListExtra(...) : ArrayList | Test.java:218:9:218:11 | out | provenance |  |
 | Test.java:223:16:223:76 | (...)... : Intent [android.content.Intent.extras, <map.value>] : Object | Test.java:224:10:224:11 | in : Intent [android.content.Intent.extras, <map.value>] : Object | provenance |  |
 | Test.java:223:24:223:76 | newWithIntent_extras(...) : Intent [android.content.Intent.extras, <map.value>] : Object | Test.java:223:16:223:76 | (...)... : Intent [android.content.Intent.extras, <map.value>] : Object | provenance |  |
-| Test.java:223:45:223:75 | newBundleWithMapValue(...) : Bundle [<map.value>] : Object | Test.java:223:24:223:76 | newWithIntent_extras(...) : Intent [android.content.Intent.extras, <map.value>] : Object | provenance | MaD:180 |
-| Test.java:223:67:223:74 | source(...) : Object | Test.java:223:45:223:75 | newBundleWithMapValue(...) : Bundle [<map.value>] : Object | provenance | MaD:177 |
-| Test.java:224:10:224:11 | in : Intent [android.content.Intent.extras, <map.value>] : Object | Test.java:224:10:224:32 | getStringExtra(...) : String | provenance | MaD:42 |
+| Test.java:223:45:223:75 | newBundleWithMapValue(...) : Bundle [<map.value>] : Object | Test.java:223:24:223:76 | newWithIntent_extras(...) : Intent [android.content.Intent.extras, <map.value>] : Object | provenance | MaD:178 |
+| Test.java:223:67:223:74 | source(...) : Object | Test.java:223:45:223:75 | newBundleWithMapValue(...) : Bundle [<map.value>] : Object | provenance | MaD:176 |
+| Test.java:224:10:224:11 | in : Intent [android.content.Intent.extras, <map.value>] : Object | Test.java:224:10:224:32 | getStringExtra(...) : String | provenance | MaD:43 |
 | Test.java:224:10:224:32 | getStringExtra(...) : String | Test.java:225:9:225:11 | out | provenance |  |
 | Test.java:230:16:230:31 | (...)... : String | Test.java:231:26:231:27 | in : String | provenance |  |
 | Test.java:230:24:230:31 | source(...) : Object | Test.java:230:16:230:31 | (...)... : String | provenance |  |
 | Test.java:231:10:231:31 | parseUri(...) : Intent | Test.java:232:9:232:11 | out : Intent | provenance |  |
 | Test.java:231:10:231:31 | parseUri(...) : Intent [android.content.Intent.data] : Object | Test.java:232:9:232:11 | out : Intent [android.content.Intent.data] : Object | provenance |  |
 | Test.java:231:26:231:27 | in : String | Test.java:231:10:231:31 | parseUri(...) : Intent | provenance | MaD:44 |
-| Test.java:231:26:231:27 | in : String | Test.java:231:10:231:31 | parseUri(...) : Intent [android.content.Intent.data] : Object | provenance | MaD:43 |
-| Test.java:232:9:232:11 | out : Intent | Test.java:232:9:232:21 | getData(...) | provenance | MaD:29 |
-| Test.java:232:9:232:11 | out : Intent [android.content.Intent.data] : Object | Test.java:232:9:232:21 | getData(...) | provenance | MaD:29 |
+| Test.java:231:26:231:27 | in : String | Test.java:231:10:231:31 | parseUri(...) : Intent [android.content.Intent.data] : Object | provenance | MaD:20 |
+| Test.java:232:9:232:11 | out : Intent | Test.java:232:9:232:21 | getData(...) | provenance | MaD:32 |
+| Test.java:232:9:232:11 | out : Intent [android.content.Intent.data] : Object | Test.java:232:9:232:21 | getData(...) | provenance | MaD:32 |
 | Test.java:237:16:237:31 | (...)... : Intent | Test.java:238:10:238:11 | in : Intent | provenance |  |
 | Test.java:237:24:237:31 | source(...) : Object | Test.java:237:16:237:31 | (...)... : Intent | provenance |  |
-| Test.java:238:10:238:11 | in : Intent | Test.java:238:10:238:53 | putCharSequenceArrayListExtra(...) : Intent | provenance | MaD:45 |
+| Test.java:238:10:238:11 | in : Intent | Test.java:238:10:238:53 | putCharSequenceArrayListExtra(...) : Intent | provenance | MaD:47 |
 | Test.java:238:10:238:53 | putCharSequenceArrayListExtra(...) : Intent | Test.java:239:9:239:11 | out | provenance |  |
 | Test.java:244:16:244:31 | (...)... : String | Test.java:245:38:245:39 | in : String | provenance |  |
 | Test.java:244:24:244:31 | source(...) : Object | Test.java:244:16:244:31 | (...)... : String | provenance |  |
 | Test.java:245:4:245:6 | out [post update] : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:246:36:246:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | provenance |  |
 | Test.java:245:4:245:6 | out [post update] : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:246:36:246:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | provenance |  |
-| Test.java:245:38:245:39 | in : String | Test.java:245:4:245:6 | out [post update] : Intent [android.content.Intent.extras, <map.key>] : String | provenance | MaD:46 |
-| Test.java:245:38:245:39 | in : String | Test.java:245:4:245:6 | out [post update] : Intent [android.content.Intent.extras, <map.key>] : String | provenance | MaD:46 |
+| Test.java:245:38:245:39 | in : String | Test.java:245:4:245:6 | out [post update] : Intent [android.content.Intent.extras, <map.key>] : String | provenance | MaD:45 |
+| Test.java:245:38:245:39 | in : String | Test.java:245:4:245:6 | out [post update] : Intent [android.content.Intent.extras, <map.key>] : String | provenance | MaD:45 |
 | Test.java:246:19:246:39 | getIntent_extras(...) : Bundle [<map.key>] : String | Test.java:24:19:24:30 | b : Bundle [<map.key>] : String | provenance |  |
 | Test.java:246:19:246:39 | getIntent_extras(...) : Bundle [<map.key>] : String | Test.java:246:9:246:40 | getMapKey(...) | provenance | MaD:98 |
 | Test.java:246:36:246:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:23:26:23:33 | i : Intent [android.content.Intent.extras, <map.key>] : String | provenance |  |
 | Test.java:246:36:246:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:23:26:23:33 | i : Intent [android.content.Intent.extras, <map.key>] : String | provenance |  |
-| Test.java:246:36:246:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:246:19:246:39 | getIntent_extras(...) : Bundle [<map.key>] : String | provenance | MaD:31 |
-| Test.java:246:36:246:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:246:19:246:39 | getIntent_extras(...) : Bundle [<map.key>] : String | provenance | MaD:31 |
+| Test.java:246:36:246:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:246:19:246:39 | getIntent_extras(...) : Bundle [<map.key>] : String | provenance | MaD:34 |
+| Test.java:246:36:246:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:246:19:246:39 | getIntent_extras(...) : Bundle [<map.key>] : String | provenance | MaD:34 |
 | Test.java:251:19:251:37 | (...)... : ArrayList | Test.java:252:44:252:45 | in : ArrayList | provenance |  |
 | Test.java:251:30:251:37 | source(...) : Object | Test.java:251:19:251:37 | (...)... : ArrayList | provenance |  |
 | Test.java:252:4:252:6 | out [post update] : Intent [android.content.Intent.extras, <map.value>] : ArrayList | Test.java:253:38:253:40 | out : Intent [android.content.Intent.extras, <map.value>] : ArrayList | provenance |  |
 | Test.java:252:4:252:6 | out [post update] : Intent [android.content.Intent.extras, <map.value>] : ArrayList | Test.java:253:38:253:40 | out : Intent [android.content.Intent.extras, <map.value>] : ArrayList | provenance |  |
-| Test.java:252:44:252:45 | in : ArrayList | Test.java:252:4:252:6 | out [post update] : Intent [android.content.Intent.extras, <map.value>] : ArrayList | provenance | MaD:47 |
-| Test.java:252:44:252:45 | in : ArrayList | Test.java:252:4:252:6 | out [post update] : Intent [android.content.Intent.extras, <map.value>] : ArrayList | provenance | MaD:47 |
-| Test.java:253:21:253:41 | getIntent_extras(...) : Bundle [<map.value>] : ArrayList | Test.java:253:9:253:42 | getMapValue(...) | provenance | MaD:179 |
+| Test.java:252:44:252:45 | in : ArrayList | Test.java:252:4:252:6 | out [post update] : Intent [android.content.Intent.extras, <map.value>] : ArrayList | provenance | MaD:46 |
+| Test.java:252:44:252:45 | in : ArrayList | Test.java:252:4:252:6 | out [post update] : Intent [android.content.Intent.extras, <map.value>] : ArrayList | provenance | MaD:46 |
+| Test.java:253:21:253:41 | getIntent_extras(...) : Bundle [<map.value>] : ArrayList | Test.java:253:9:253:42 | getMapValue(...) | provenance | MaD:175 |
 | Test.java:253:38:253:40 | out : Intent [android.content.Intent.extras, <map.value>] : ArrayList | Test.java:23:26:23:33 | i : Intent [android.content.Intent.extras, <map.value>] : ArrayList | provenance |  |
 | Test.java:253:38:253:40 | out : Intent [android.content.Intent.extras, <map.value>] : ArrayList | Test.java:23:26:23:33 | i : Intent [android.content.Intent.extras, <map.value>] : ArrayList | provenance |  |
-| Test.java:253:38:253:40 | out : Intent [android.content.Intent.extras, <map.value>] : ArrayList | Test.java:253:21:253:41 | getIntent_extras(...) : Bundle [<map.value>] : ArrayList | provenance | MaD:31 |
-| Test.java:253:38:253:40 | out : Intent [android.content.Intent.extras, <map.value>] : ArrayList | Test.java:253:21:253:41 | getIntent_extras(...) : Bundle [<map.value>] : ArrayList | provenance | MaD:31 |
+| Test.java:253:38:253:40 | out : Intent [android.content.Intent.extras, <map.value>] : ArrayList | Test.java:253:21:253:41 | getIntent_extras(...) : Bundle [<map.value>] : ArrayList | provenance | MaD:34 |
+| Test.java:253:38:253:40 | out : Intent [android.content.Intent.extras, <map.value>] : ArrayList | Test.java:253:21:253:41 | getIntent_extras(...) : Bundle [<map.value>] : ArrayList | provenance | MaD:34 |
 | Test.java:258:16:258:31 | (...)... : Intent | Test.java:259:10:259:11 | in : Intent | provenance |  |
 | Test.java:258:24:258:31 | source(...) : Object | Test.java:258:16:258:31 | (...)... : Intent | provenance |  |
-| Test.java:259:10:259:11 | in : Intent | Test.java:259:10:259:41 | putExtra(...) : Intent | provenance | MaD:48 |
+| Test.java:259:10:259:11 | in : Intent | Test.java:259:10:259:41 | putExtra(...) : Intent | provenance | MaD:50 |
 | Test.java:259:10:259:41 | putExtra(...) : Intent | Test.java:260:9:260:11 | out | provenance |  |
 | Test.java:265:16:265:31 | (...)... : Intent | Test.java:266:10:266:11 | in : Intent | provenance |  |
 | Test.java:265:24:265:31 | source(...) : Object | Test.java:265:16:265:31 | (...)... : Intent | provenance |  |
-| Test.java:266:10:266:11 | in : Intent | Test.java:266:10:266:38 | putExtra(...) : Intent | provenance | MaD:48 |
+| Test.java:266:10:266:11 | in : Intent | Test.java:266:10:266:38 | putExtra(...) : Intent | provenance | MaD:50 |
 | Test.java:266:10:266:38 | putExtra(...) : Intent | Test.java:267:9:267:11 | out | provenance |  |
 | Test.java:272:16:272:31 | (...)... : Intent | Test.java:273:10:273:11 | in : Intent | provenance |  |
 | Test.java:272:24:272:31 | source(...) : Object | Test.java:272:16:272:31 | (...)... : Intent | provenance |  |
-| Test.java:273:10:273:11 | in : Intent | Test.java:273:10:273:40 | putExtra(...) : Intent | provenance | MaD:48 |
+| Test.java:273:10:273:11 | in : Intent | Test.java:273:10:273:40 | putExtra(...) : Intent | provenance | MaD:50 |
 | Test.java:273:10:273:40 | putExtra(...) : Intent | Test.java:274:9:274:11 | out | provenance |  |
 | Test.java:279:16:279:31 | (...)... : Intent | Test.java:280:10:280:11 | in : Intent | provenance |  |
 | Test.java:279:24:279:31 | source(...) : Object | Test.java:279:16:279:31 | (...)... : Intent | provenance |  |
-| Test.java:280:10:280:11 | in : Intent | Test.java:280:10:280:39 | putExtra(...) : Intent | provenance | MaD:48 |
+| Test.java:280:10:280:11 | in : Intent | Test.java:280:10:280:39 | putExtra(...) : Intent | provenance | MaD:50 |
 | Test.java:280:10:280:39 | putExtra(...) : Intent | Test.java:281:9:281:11 | out | provenance |  |
 | Test.java:286:16:286:31 | (...)... : Intent | Test.java:287:10:287:11 | in : Intent | provenance |  |
 | Test.java:286:24:286:31 | source(...) : Object | Test.java:286:16:286:31 | (...)... : Intent | provenance |  |
-| Test.java:287:10:287:11 | in : Intent | Test.java:287:10:287:37 | putExtra(...) : Intent | provenance | MaD:48 |
+| Test.java:287:10:287:11 | in : Intent | Test.java:287:10:287:37 | putExtra(...) : Intent | provenance | MaD:50 |
 | Test.java:287:10:287:37 | putExtra(...) : Intent | Test.java:288:9:288:11 | out | provenance |  |
 | Test.java:293:16:293:31 | (...)... : Intent | Test.java:294:10:294:11 | in : Intent | provenance |  |
 | Test.java:293:24:293:31 | source(...) : Object | Test.java:293:16:293:31 | (...)... : Intent | provenance |  |
-| Test.java:294:10:294:11 | in : Intent | Test.java:294:10:294:49 | putExtra(...) : Intent | provenance | MaD:48 |
+| Test.java:294:10:294:11 | in : Intent | Test.java:294:10:294:49 | putExtra(...) : Intent | provenance | MaD:50 |
 | Test.java:294:10:294:49 | putExtra(...) : Intent | Test.java:295:9:295:11 | out | provenance |  |
 | Test.java:300:16:300:31 | (...)... : Intent | Test.java:301:10:301:11 | in : Intent | provenance |  |
 | Test.java:300:24:300:31 | source(...) : Object | Test.java:300:16:300:31 | (...)... : Intent | provenance |  |
-| Test.java:301:10:301:11 | in : Intent | Test.java:301:10:301:44 | putExtra(...) : Intent | provenance | MaD:48 |
+| Test.java:301:10:301:11 | in : Intent | Test.java:301:10:301:44 | putExtra(...) : Intent | provenance | MaD:50 |
 | Test.java:301:10:301:44 | putExtra(...) : Intent | Test.java:302:9:302:11 | out | provenance |  |
 | Test.java:307:16:307:31 | (...)... : Intent | Test.java:308:10:308:11 | in : Intent | provenance |  |
 | Test.java:307:24:307:31 | source(...) : Object | Test.java:307:16:307:31 | (...)... : Intent | provenance |  |
-| Test.java:308:10:308:11 | in : Intent | Test.java:308:10:308:48 | putExtra(...) : Intent | provenance | MaD:48 |
+| Test.java:308:10:308:11 | in : Intent | Test.java:308:10:308:48 | putExtra(...) : Intent | provenance | MaD:50 |
 | Test.java:308:10:308:48 | putExtra(...) : Intent | Test.java:309:9:309:11 | out | provenance |  |
 | Test.java:314:16:314:31 | (...)... : Intent | Test.java:315:10:315:11 | in : Intent | provenance |  |
 | Test.java:314:24:314:31 | source(...) : Object | Test.java:314:16:314:31 | (...)... : Intent | provenance |  |
-| Test.java:315:10:315:11 | in : Intent | Test.java:315:10:315:47 | putExtra(...) : Intent | provenance | MaD:48 |
+| Test.java:315:10:315:11 | in : Intent | Test.java:315:10:315:47 | putExtra(...) : Intent | provenance | MaD:50 |
 | Test.java:315:10:315:47 | putExtra(...) : Intent | Test.java:316:9:316:11 | out | provenance |  |
 | Test.java:321:16:321:31 | (...)... : Intent | Test.java:322:10:322:11 | in : Intent | provenance |  |
 | Test.java:321:24:321:31 | source(...) : Object | Test.java:321:16:321:31 | (...)... : Intent | provenance |  |
-| Test.java:322:10:322:11 | in : Intent | Test.java:322:10:322:49 | putExtra(...) : Intent | provenance | MaD:48 |
+| Test.java:322:10:322:11 | in : Intent | Test.java:322:10:322:49 | putExtra(...) : Intent | provenance | MaD:50 |
 | Test.java:322:10:322:49 | putExtra(...) : Intent | Test.java:323:9:323:11 | out | provenance |  |
 | Test.java:328:16:328:31 | (...)... : Intent | Test.java:329:10:329:11 | in : Intent | provenance |  |
 | Test.java:328:24:328:31 | source(...) : Object | Test.java:328:16:328:31 | (...)... : Intent | provenance |  |
-| Test.java:329:10:329:11 | in : Intent | Test.java:329:10:329:50 | putExtra(...) : Intent | provenance | MaD:48 |
+| Test.java:329:10:329:11 | in : Intent | Test.java:329:10:329:50 | putExtra(...) : Intent | provenance | MaD:50 |
 | Test.java:329:10:329:50 | putExtra(...) : Intent | Test.java:330:9:330:11 | out | provenance |  |
 | Test.java:335:16:335:31 | (...)... : Intent | Test.java:336:10:336:11 | in : Intent | provenance |  |
 | Test.java:335:24:335:31 | source(...) : Object | Test.java:335:16:335:31 | (...)... : Intent | provenance |  |
-| Test.java:336:10:336:11 | in : Intent | Test.java:336:10:336:48 | putExtra(...) : Intent | provenance | MaD:48 |
+| Test.java:336:10:336:11 | in : Intent | Test.java:336:10:336:48 | putExtra(...) : Intent | provenance | MaD:50 |
 | Test.java:336:10:336:48 | putExtra(...) : Intent | Test.java:337:9:337:11 | out | provenance |  |
 | Test.java:342:16:342:31 | (...)... : Intent | Test.java:343:10:343:11 | in : Intent | provenance |  |
 | Test.java:342:24:342:31 | source(...) : Object | Test.java:342:16:342:31 | (...)... : Intent | provenance |  |
-| Test.java:343:10:343:11 | in : Intent | Test.java:343:10:343:48 | putExtra(...) : Intent | provenance | MaD:48 |
+| Test.java:343:10:343:11 | in : Intent | Test.java:343:10:343:48 | putExtra(...) : Intent | provenance | MaD:50 |
 | Test.java:343:10:343:48 | putExtra(...) : Intent | Test.java:344:9:344:11 | out | provenance |  |
 | Test.java:349:16:349:31 | (...)... : Intent | Test.java:350:10:350:11 | in : Intent | provenance |  |
 | Test.java:349:24:349:31 | source(...) : Object | Test.java:349:16:349:31 | (...)... : Intent | provenance |  |
-| Test.java:350:10:350:11 | in : Intent | Test.java:350:10:350:43 | putExtra(...) : Intent | provenance | MaD:48 |
+| Test.java:350:10:350:11 | in : Intent | Test.java:350:10:350:43 | putExtra(...) : Intent | provenance | MaD:50 |
 | Test.java:350:10:350:43 | putExtra(...) : Intent | Test.java:351:9:351:11 | out | provenance |  |
 | Test.java:356:16:356:31 | (...)... : Intent | Test.java:357:10:357:11 | in : Intent | provenance |  |
 | Test.java:356:24:356:31 | source(...) : Object | Test.java:356:16:356:31 | (...)... : Intent | provenance |  |
-| Test.java:357:10:357:11 | in : Intent | Test.java:357:10:357:51 | putExtra(...) : Intent | provenance | MaD:48 |
+| Test.java:357:10:357:11 | in : Intent | Test.java:357:10:357:51 | putExtra(...) : Intent | provenance | MaD:50 |
 | Test.java:357:10:357:51 | putExtra(...) : Intent | Test.java:358:9:358:11 | out | provenance |  |
 | Test.java:363:16:363:31 | (...)... : Intent | Test.java:364:10:364:11 | in : Intent | provenance |  |
 | Test.java:363:24:363:31 | source(...) : Object | Test.java:363:16:363:31 | (...)... : Intent | provenance |  |
-| Test.java:364:10:364:11 | in : Intent | Test.java:364:10:364:50 | putExtra(...) : Intent | provenance | MaD:48 |
+| Test.java:364:10:364:11 | in : Intent | Test.java:364:10:364:50 | putExtra(...) : Intent | provenance | MaD:50 |
 | Test.java:364:10:364:50 | putExtra(...) : Intent | Test.java:365:9:365:11 | out | provenance |  |
 | Test.java:370:16:370:31 | (...)... : Intent | Test.java:371:10:371:11 | in : Intent | provenance |  |
 | Test.java:370:24:370:31 | source(...) : Object | Test.java:370:16:370:31 | (...)... : Intent | provenance |  |
-| Test.java:371:10:371:11 | in : Intent | Test.java:371:10:371:48 | putExtra(...) : Intent | provenance | MaD:48 |
+| Test.java:371:10:371:11 | in : Intent | Test.java:371:10:371:48 | putExtra(...) : Intent | provenance | MaD:50 |
 | Test.java:371:10:371:48 | putExtra(...) : Intent | Test.java:372:9:372:11 | out | provenance |  |
 | Test.java:377:16:377:31 | (...)... : Intent | Test.java:378:10:378:11 | in : Intent | provenance |  |
 | Test.java:377:24:377:31 | source(...) : Object | Test.java:377:16:377:31 | (...)... : Intent | provenance |  |
-| Test.java:378:10:378:11 | in : Intent | Test.java:378:10:378:54 | putExtra(...) : Intent | provenance | MaD:48 |
+| Test.java:378:10:378:11 | in : Intent | Test.java:378:10:378:54 | putExtra(...) : Intent | provenance | MaD:50 |
 | Test.java:378:10:378:54 | putExtra(...) : Intent | Test.java:379:9:379:11 | out | provenance |  |
 | Test.java:384:16:384:31 | (...)... : Intent | Test.java:385:10:385:11 | in : Intent | provenance |  |
 | Test.java:384:24:384:31 | source(...) : Object | Test.java:384:16:384:31 | (...)... : Intent | provenance |  |
-| Test.java:385:10:385:11 | in : Intent | Test.java:385:10:385:54 | putExtra(...) : Intent | provenance | MaD:48 |
+| Test.java:385:10:385:11 | in : Intent | Test.java:385:10:385:54 | putExtra(...) : Intent | provenance | MaD:50 |
 | Test.java:385:10:385:54 | putExtra(...) : Intent | Test.java:386:9:386:11 | out | provenance |  |
 | Test.java:391:16:391:31 | (...)... : Intent | Test.java:392:10:392:11 | in : Intent | provenance |  |
 | Test.java:391:24:391:31 | source(...) : Object | Test.java:391:16:391:31 | (...)... : Intent | provenance |  |
-| Test.java:392:10:392:11 | in : Intent | Test.java:392:10:392:52 | putExtra(...) : Intent | provenance | MaD:48 |
+| Test.java:392:10:392:11 | in : Intent | Test.java:392:10:392:52 | putExtra(...) : Intent | provenance | MaD:50 |
 | Test.java:392:10:392:52 | putExtra(...) : Intent | Test.java:393:9:393:11 | out | provenance |  |
 | Test.java:398:16:398:31 | (...)... : Intent | Test.java:399:10:399:11 | in : Intent | provenance |  |
 | Test.java:398:24:398:31 | source(...) : Object | Test.java:398:16:398:31 | (...)... : Intent | provenance |  |
-| Test.java:399:10:399:11 | in : Intent | Test.java:399:10:399:56 | putExtra(...) : Intent | provenance | MaD:48 |
+| Test.java:399:10:399:11 | in : Intent | Test.java:399:10:399:56 | putExtra(...) : Intent | provenance | MaD:50 |
 | Test.java:399:10:399:56 | putExtra(...) : Intent | Test.java:400:9:400:11 | out | provenance |  |
 | Test.java:405:16:405:31 | (...)... : Intent | Test.java:406:10:406:11 | in : Intent | provenance |  |
 | Test.java:405:24:405:31 | source(...) : Object | Test.java:405:16:405:31 | (...)... : Intent | provenance |  |
-| Test.java:406:10:406:11 | in : Intent | Test.java:406:10:406:54 | putExtra(...) : Intent | provenance | MaD:48 |
+| Test.java:406:10:406:11 | in : Intent | Test.java:406:10:406:54 | putExtra(...) : Intent | provenance | MaD:50 |
 | Test.java:406:10:406:54 | putExtra(...) : Intent | Test.java:407:9:407:11 | out | provenance |  |
 | Test.java:412:16:412:31 | (...)... : Intent | Test.java:413:10:413:11 | in : Intent | provenance |  |
 | Test.java:412:24:412:31 | source(...) : Object | Test.java:412:16:412:31 | (...)... : Intent | provenance |  |
-| Test.java:413:10:413:11 | in : Intent | Test.java:413:10:413:48 | putExtra(...) : Intent | provenance | MaD:48 |
+| Test.java:413:10:413:11 | in : Intent | Test.java:413:10:413:48 | putExtra(...) : Intent | provenance | MaD:50 |
 | Test.java:413:10:413:48 | putExtra(...) : Intent | Test.java:414:9:414:11 | out | provenance |  |
 | Test.java:419:16:419:31 | (...)... : Intent | Test.java:420:10:420:11 | in : Intent | provenance |  |
 | Test.java:419:24:419:31 | source(...) : Object | Test.java:419:16:419:31 | (...)... : Intent | provenance |  |
-| Test.java:420:10:420:11 | in : Intent | Test.java:420:10:420:40 | putExtra(...) : Intent | provenance | MaD:48 |
+| Test.java:420:10:420:11 | in : Intent | Test.java:420:10:420:40 | putExtra(...) : Intent | provenance | MaD:50 |
 | Test.java:420:10:420:40 | putExtra(...) : Intent | Test.java:421:9:421:11 | out | provenance |  |
 | Test.java:426:16:426:31 | (...)... : String | Test.java:427:17:427:18 | in : String | provenance |  |
 | Test.java:426:24:426:31 | source(...) : Object | Test.java:426:16:426:31 | (...)... : String | provenance |  |
 | Test.java:427:4:427:6 | out [post update] : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:428:36:428:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | provenance |  |
 | Test.java:427:4:427:6 | out [post update] : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:428:36:428:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | provenance |  |
-| Test.java:427:17:427:18 | in : String | Test.java:427:4:427:6 | out [post update] : Intent [android.content.Intent.extras, <map.key>] : String | provenance | MaD:49 |
-| Test.java:427:17:427:18 | in : String | Test.java:427:4:427:6 | out [post update] : Intent [android.content.Intent.extras, <map.key>] : String | provenance | MaD:49 |
+| Test.java:427:17:427:18 | in : String | Test.java:427:4:427:6 | out [post update] : Intent [android.content.Intent.extras, <map.key>] : String | provenance | MaD:48 |
+| Test.java:427:17:427:18 | in : String | Test.java:427:4:427:6 | out [post update] : Intent [android.content.Intent.extras, <map.key>] : String | provenance | MaD:48 |
 | Test.java:428:19:428:39 | getIntent_extras(...) : Bundle [<map.key>] : String | Test.java:24:19:24:30 | b : Bundle [<map.key>] : String | provenance |  |
 | Test.java:428:19:428:39 | getIntent_extras(...) : Bundle [<map.key>] : String | Test.java:428:9:428:40 | getMapKey(...) | provenance | MaD:98 |
 | Test.java:428:36:428:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:23:26:23:33 | i : Intent [android.content.Intent.extras, <map.key>] : String | provenance |  |
 | Test.java:428:36:428:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:23:26:23:33 | i : Intent [android.content.Intent.extras, <map.key>] : String | provenance |  |
-| Test.java:428:36:428:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:428:19:428:39 | getIntent_extras(...) : Bundle [<map.key>] : String | provenance | MaD:31 |
-| Test.java:428:36:428:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:428:19:428:39 | getIntent_extras(...) : Bundle [<map.key>] : String | provenance | MaD:31 |
+| Test.java:428:36:428:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:428:19:428:39 | getIntent_extras(...) : Bundle [<map.key>] : String | provenance | MaD:34 |
+| Test.java:428:36:428:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:428:19:428:39 | getIntent_extras(...) : Bundle [<map.key>] : String | provenance | MaD:34 |
 | Test.java:433:16:433:31 | (...)... : String | Test.java:434:17:434:18 | in : String | provenance |  |
 | Test.java:433:24:433:31 | source(...) : Object | Test.java:433:16:433:31 | (...)... : String | provenance |  |
 | Test.java:434:4:434:6 | out [post update] : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:435:36:435:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | provenance |  |
 | Test.java:434:4:434:6 | out [post update] : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:435:36:435:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | provenance |  |
-| Test.java:434:17:434:18 | in : String | Test.java:434:4:434:6 | out [post update] : Intent [android.content.Intent.extras, <map.key>] : String | provenance | MaD:49 |
-| Test.java:434:17:434:18 | in : String | Test.java:434:4:434:6 | out [post update] : Intent [android.content.Intent.extras, <map.key>] : String | provenance | MaD:49 |
+| Test.java:434:17:434:18 | in : String | Test.java:434:4:434:6 | out [post update] : Intent [android.content.Intent.extras, <map.key>] : String | provenance | MaD:48 |
+| Test.java:434:17:434:18 | in : String | Test.java:434:4:434:6 | out [post update] : Intent [android.content.Intent.extras, <map.key>] : String | provenance | MaD:48 |
 | Test.java:435:19:435:39 | getIntent_extras(...) : Bundle [<map.key>] : String | Test.java:24:19:24:30 | b : Bundle [<map.key>] : String | provenance |  |
 | Test.java:435:19:435:39 | getIntent_extras(...) : Bundle [<map.key>] : String | Test.java:435:9:435:40 | getMapKey(...) | provenance | MaD:98 |
 | Test.java:435:36:435:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:23:26:23:33 | i : Intent [android.content.Intent.extras, <map.key>] : String | provenance |  |
 | Test.java:435:36:435:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:23:26:23:33 | i : Intent [android.content.Intent.extras, <map.key>] : String | provenance |  |
-| Test.java:435:36:435:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:435:19:435:39 | getIntent_extras(...) : Bundle [<map.key>] : String | provenance | MaD:31 |
-| Test.java:435:36:435:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:435:19:435:39 | getIntent_extras(...) : Bundle [<map.key>] : String | provenance | MaD:31 |
+| Test.java:435:36:435:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:435:19:435:39 | getIntent_extras(...) : Bundle [<map.key>] : String | provenance | MaD:34 |
+| Test.java:435:36:435:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:435:19:435:39 | getIntent_extras(...) : Bundle [<map.key>] : String | provenance | MaD:34 |
 | Test.java:440:16:440:31 | (...)... : String | Test.java:441:17:441:18 | in : String | provenance |  |
 | Test.java:440:24:440:31 | source(...) : Object | Test.java:440:16:440:31 | (...)... : String | provenance |  |
 | Test.java:441:4:441:6 | out [post update] : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:442:36:442:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | provenance |  |
 | Test.java:441:4:441:6 | out [post update] : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:442:36:442:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | provenance |  |
-| Test.java:441:17:441:18 | in : String | Test.java:441:4:441:6 | out [post update] : Intent [android.content.Intent.extras, <map.key>] : String | provenance | MaD:49 |
-| Test.java:441:17:441:18 | in : String | Test.java:441:4:441:6 | out [post update] : Intent [android.content.Intent.extras, <map.key>] : String | provenance | MaD:49 |
+| Test.java:441:17:441:18 | in : String | Test.java:441:4:441:6 | out [post update] : Intent [android.content.Intent.extras, <map.key>] : String | provenance | MaD:48 |
+| Test.java:441:17:441:18 | in : String | Test.java:441:4:441:6 | out [post update] : Intent [android.content.Intent.extras, <map.key>] : String | provenance | MaD:48 |
 | Test.java:442:19:442:39 | getIntent_extras(...) : Bundle [<map.key>] : String | Test.java:24:19:24:30 | b : Bundle [<map.key>] : String | provenance |  |
 | Test.java:442:19:442:39 | getIntent_extras(...) : Bundle [<map.key>] : String | Test.java:442:9:442:40 | getMapKey(...) | provenance | MaD:98 |
 | Test.java:442:36:442:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:23:26:23:33 | i : Intent [android.content.Intent.extras, <map.key>] : String | provenance |  |
 | Test.java:442:36:442:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:23:26:23:33 | i : Intent [android.content.Intent.extras, <map.key>] : String | provenance |  |
-| Test.java:442:36:442:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:442:19:442:39 | getIntent_extras(...) : Bundle [<map.key>] : String | provenance | MaD:31 |
-| Test.java:442:36:442:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:442:19:442:39 | getIntent_extras(...) : Bundle [<map.key>] : String | provenance | MaD:31 |
+| Test.java:442:36:442:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:442:19:442:39 | getIntent_extras(...) : Bundle [<map.key>] : String | provenance | MaD:34 |
+| Test.java:442:36:442:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:442:19:442:39 | getIntent_extras(...) : Bundle [<map.key>] : String | provenance | MaD:34 |
 | Test.java:447:16:447:31 | (...)... : String | Test.java:448:17:448:18 | in : String | provenance |  |
 | Test.java:447:24:447:31 | source(...) : Object | Test.java:447:16:447:31 | (...)... : String | provenance |  |
 | Test.java:448:4:448:6 | out [post update] : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:449:36:449:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | provenance |  |
 | Test.java:448:4:448:6 | out [post update] : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:449:36:449:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | provenance |  |
-| Test.java:448:17:448:18 | in : String | Test.java:448:4:448:6 | out [post update] : Intent [android.content.Intent.extras, <map.key>] : String | provenance | MaD:49 |
-| Test.java:448:17:448:18 | in : String | Test.java:448:4:448:6 | out [post update] : Intent [android.content.Intent.extras, <map.key>] : String | provenance | MaD:49 |
+| Test.java:448:17:448:18 | in : String | Test.java:448:4:448:6 | out [post update] : Intent [android.content.Intent.extras, <map.key>] : String | provenance | MaD:48 |
+| Test.java:448:17:448:18 | in : String | Test.java:448:4:448:6 | out [post update] : Intent [android.content.Intent.extras, <map.key>] : String | provenance | MaD:48 |
 | Test.java:449:19:449:39 | getIntent_extras(...) : Bundle [<map.key>] : String | Test.java:24:19:24:30 | b : Bundle [<map.key>] : String | provenance |  |
 | Test.java:449:19:449:39 | getIntent_extras(...) : Bundle [<map.key>] : String | Test.java:449:9:449:40 | getMapKey(...) | provenance | MaD:98 |
 | Test.java:449:36:449:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:23:26:23:33 | i : Intent [android.content.Intent.extras, <map.key>] : String | provenance |  |
 | Test.java:449:36:449:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:23:26:23:33 | i : Intent [android.content.Intent.extras, <map.key>] : String | provenance |  |
-| Test.java:449:36:449:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:449:19:449:39 | getIntent_extras(...) : Bundle [<map.key>] : String | provenance | MaD:31 |
-| Test.java:449:36:449:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:449:19:449:39 | getIntent_extras(...) : Bundle [<map.key>] : String | provenance | MaD:31 |
+| Test.java:449:36:449:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:449:19:449:39 | getIntent_extras(...) : Bundle [<map.key>] : String | provenance | MaD:34 |
+| Test.java:449:36:449:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:449:19:449:39 | getIntent_extras(...) : Bundle [<map.key>] : String | provenance | MaD:34 |
 | Test.java:454:16:454:31 | (...)... : String | Test.java:455:17:455:18 | in : String | provenance |  |
 | Test.java:454:24:454:31 | source(...) : Object | Test.java:454:16:454:31 | (...)... : String | provenance |  |
 | Test.java:455:4:455:6 | out [post update] : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:456:36:456:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | provenance |  |
 | Test.java:455:4:455:6 | out [post update] : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:456:36:456:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | provenance |  |
-| Test.java:455:17:455:18 | in : String | Test.java:455:4:455:6 | out [post update] : Intent [android.content.Intent.extras, <map.key>] : String | provenance | MaD:49 |
-| Test.java:455:17:455:18 | in : String | Test.java:455:4:455:6 | out [post update] : Intent [android.content.Intent.extras, <map.key>] : String | provenance | MaD:49 |
+| Test.java:455:17:455:18 | in : String | Test.java:455:4:455:6 | out [post update] : Intent [android.content.Intent.extras, <map.key>] : String | provenance | MaD:48 |
+| Test.java:455:17:455:18 | in : String | Test.java:455:4:455:6 | out [post update] : Intent [android.content.Intent.extras, <map.key>] : String | provenance | MaD:48 |
 | Test.java:456:19:456:39 | getIntent_extras(...) : Bundle [<map.key>] : String | Test.java:24:19:24:30 | b : Bundle [<map.key>] : String | provenance |  |
 | Test.java:456:19:456:39 | getIntent_extras(...) : Bundle [<map.key>] : String | Test.java:456:9:456:40 | getMapKey(...) | provenance | MaD:98 |
 | Test.java:456:36:456:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:23:26:23:33 | i : Intent [android.content.Intent.extras, <map.key>] : String | provenance |  |
 | Test.java:456:36:456:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:23:26:23:33 | i : Intent [android.content.Intent.extras, <map.key>] : String | provenance |  |
-| Test.java:456:36:456:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:456:19:456:39 | getIntent_extras(...) : Bundle [<map.key>] : String | provenance | MaD:31 |
-| Test.java:456:36:456:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:456:19:456:39 | getIntent_extras(...) : Bundle [<map.key>] : String | provenance | MaD:31 |
+| Test.java:456:36:456:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:456:19:456:39 | getIntent_extras(...) : Bundle [<map.key>] : String | provenance | MaD:34 |
+| Test.java:456:36:456:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:456:19:456:39 | getIntent_extras(...) : Bundle [<map.key>] : String | provenance | MaD:34 |
 | Test.java:461:16:461:31 | (...)... : String | Test.java:462:17:462:18 | in : String | provenance |  |
 | Test.java:461:24:461:31 | source(...) : Object | Test.java:461:16:461:31 | (...)... : String | provenance |  |
 | Test.java:462:4:462:6 | out [post update] : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:463:36:463:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | provenance |  |
 | Test.java:462:4:462:6 | out [post update] : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:463:36:463:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | provenance |  |
-| Test.java:462:17:462:18 | in : String | Test.java:462:4:462:6 | out [post update] : Intent [android.content.Intent.extras, <map.key>] : String | provenance | MaD:49 |
-| Test.java:462:17:462:18 | in : String | Test.java:462:4:462:6 | out [post update] : Intent [android.content.Intent.extras, <map.key>] : String | provenance | MaD:49 |
+| Test.java:462:17:462:18 | in : String | Test.java:462:4:462:6 | out [post update] : Intent [android.content.Intent.extras, <map.key>] : String | provenance | MaD:48 |
+| Test.java:462:17:462:18 | in : String | Test.java:462:4:462:6 | out [post update] : Intent [android.content.Intent.extras, <map.key>] : String | provenance | MaD:48 |
 | Test.java:463:19:463:39 | getIntent_extras(...) : Bundle [<map.key>] : String | Test.java:24:19:24:30 | b : Bundle [<map.key>] : String | provenance |  |
 | Test.java:463:19:463:39 | getIntent_extras(...) : Bundle [<map.key>] : String | Test.java:463:9:463:40 | getMapKey(...) | provenance | MaD:98 |
 | Test.java:463:36:463:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:23:26:23:33 | i : Intent [android.content.Intent.extras, <map.key>] : String | provenance |  |
 | Test.java:463:36:463:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:23:26:23:33 | i : Intent [android.content.Intent.extras, <map.key>] : String | provenance |  |
-| Test.java:463:36:463:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:463:19:463:39 | getIntent_extras(...) : Bundle [<map.key>] : String | provenance | MaD:31 |
-| Test.java:463:36:463:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:463:19:463:39 | getIntent_extras(...) : Bundle [<map.key>] : String | provenance | MaD:31 |
+| Test.java:463:36:463:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:463:19:463:39 | getIntent_extras(...) : Bundle [<map.key>] : String | provenance | MaD:34 |
+| Test.java:463:36:463:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:463:19:463:39 | getIntent_extras(...) : Bundle [<map.key>] : String | provenance | MaD:34 |
 | Test.java:468:16:468:31 | (...)... : String | Test.java:469:17:469:18 | in : String | provenance |  |
 | Test.java:468:24:468:31 | source(...) : Object | Test.java:468:16:468:31 | (...)... : String | provenance |  |
 | Test.java:469:4:469:6 | out [post update] : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:470:36:470:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | provenance |  |
 | Test.java:469:4:469:6 | out [post update] : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:470:36:470:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | provenance |  |
-| Test.java:469:17:469:18 | in : String | Test.java:469:4:469:6 | out [post update] : Intent [android.content.Intent.extras, <map.key>] : String | provenance | MaD:49 |
-| Test.java:469:17:469:18 | in : String | Test.java:469:4:469:6 | out [post update] : Intent [android.content.Intent.extras, <map.key>] : String | provenance | MaD:49 |
+| Test.java:469:17:469:18 | in : String | Test.java:469:4:469:6 | out [post update] : Intent [android.content.Intent.extras, <map.key>] : String | provenance | MaD:48 |
+| Test.java:469:17:469:18 | in : String | Test.java:469:4:469:6 | out [post update] : Intent [android.content.Intent.extras, <map.key>] : String | provenance | MaD:48 |
 | Test.java:470:19:470:39 | getIntent_extras(...) : Bundle [<map.key>] : String | Test.java:24:19:24:30 | b : Bundle [<map.key>] : String | provenance |  |
 | Test.java:470:19:470:39 | getIntent_extras(...) : Bundle [<map.key>] : String | Test.java:470:9:470:40 | getMapKey(...) | provenance | MaD:98 |
 | Test.java:470:36:470:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:23:26:23:33 | i : Intent [android.content.Intent.extras, <map.key>] : String | provenance |  |
 | Test.java:470:36:470:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:23:26:23:33 | i : Intent [android.content.Intent.extras, <map.key>] : String | provenance |  |
-| Test.java:470:36:470:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:470:19:470:39 | getIntent_extras(...) : Bundle [<map.key>] : String | provenance | MaD:31 |
-| Test.java:470:36:470:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:470:19:470:39 | getIntent_extras(...) : Bundle [<map.key>] : String | provenance | MaD:31 |
+| Test.java:470:36:470:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:470:19:470:39 | getIntent_extras(...) : Bundle [<map.key>] : String | provenance | MaD:34 |
+| Test.java:470:36:470:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:470:19:470:39 | getIntent_extras(...) : Bundle [<map.key>] : String | provenance | MaD:34 |
 | Test.java:475:16:475:31 | (...)... : String | Test.java:476:17:476:18 | in : String | provenance |  |
 | Test.java:475:24:475:31 | source(...) : Object | Test.java:475:16:475:31 | (...)... : String | provenance |  |
 | Test.java:476:4:476:6 | out [post update] : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:477:36:477:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | provenance |  |
 | Test.java:476:4:476:6 | out [post update] : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:477:36:477:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | provenance |  |
-| Test.java:476:17:476:18 | in : String | Test.java:476:4:476:6 | out [post update] : Intent [android.content.Intent.extras, <map.key>] : String | provenance | MaD:49 |
-| Test.java:476:17:476:18 | in : String | Test.java:476:4:476:6 | out [post update] : Intent [android.content.Intent.extras, <map.key>] : String | provenance | MaD:49 |
+| Test.java:476:17:476:18 | in : String | Test.java:476:4:476:6 | out [post update] : Intent [android.content.Intent.extras, <map.key>] : String | provenance | MaD:48 |
+| Test.java:476:17:476:18 | in : String | Test.java:476:4:476:6 | out [post update] : Intent [android.content.Intent.extras, <map.key>] : String | provenance | MaD:48 |
 | Test.java:477:19:477:39 | getIntent_extras(...) : Bundle [<map.key>] : String | Test.java:24:19:24:30 | b : Bundle [<map.key>] : String | provenance |  |
 | Test.java:477:19:477:39 | getIntent_extras(...) : Bundle [<map.key>] : String | Test.java:477:9:477:40 | getMapKey(...) | provenance | MaD:98 |
 | Test.java:477:36:477:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:23:26:23:33 | i : Intent [android.content.Intent.extras, <map.key>] : String | provenance |  |
 | Test.java:477:36:477:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:23:26:23:33 | i : Intent [android.content.Intent.extras, <map.key>] : String | provenance |  |
-| Test.java:477:36:477:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:477:19:477:39 | getIntent_extras(...) : Bundle [<map.key>] : String | provenance | MaD:31 |
-| Test.java:477:36:477:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:477:19:477:39 | getIntent_extras(...) : Bundle [<map.key>] : String | provenance | MaD:31 |
+| Test.java:477:36:477:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:477:19:477:39 | getIntent_extras(...) : Bundle [<map.key>] : String | provenance | MaD:34 |
+| Test.java:477:36:477:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:477:19:477:39 | getIntent_extras(...) : Bundle [<map.key>] : String | provenance | MaD:34 |
 | Test.java:482:16:482:31 | (...)... : String | Test.java:483:17:483:18 | in : String | provenance |  |
 | Test.java:482:24:482:31 | source(...) : Object | Test.java:482:16:482:31 | (...)... : String | provenance |  |
 | Test.java:483:4:483:6 | out [post update] : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:484:36:484:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | provenance |  |
 | Test.java:483:4:483:6 | out [post update] : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:484:36:484:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | provenance |  |
-| Test.java:483:17:483:18 | in : String | Test.java:483:4:483:6 | out [post update] : Intent [android.content.Intent.extras, <map.key>] : String | provenance | MaD:49 |
-| Test.java:483:17:483:18 | in : String | Test.java:483:4:483:6 | out [post update] : Intent [android.content.Intent.extras, <map.key>] : String | provenance | MaD:49 |
+| Test.java:483:17:483:18 | in : String | Test.java:483:4:483:6 | out [post update] : Intent [android.content.Intent.extras, <map.key>] : String | provenance | MaD:48 |
+| Test.java:483:17:483:18 | in : String | Test.java:483:4:483:6 | out [post update] : Intent [android.content.Intent.extras, <map.key>] : String | provenance | MaD:48 |
 | Test.java:484:19:484:39 | getIntent_extras(...) : Bundle [<map.key>] : String | Test.java:24:19:24:30 | b : Bundle [<map.key>] : String | provenance |  |
 | Test.java:484:19:484:39 | getIntent_extras(...) : Bundle [<map.key>] : String | Test.java:484:9:484:40 | getMapKey(...) | provenance | MaD:98 |
 | Test.java:484:36:484:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:23:26:23:33 | i : Intent [android.content.Intent.extras, <map.key>] : String | provenance |  |
 | Test.java:484:36:484:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:23:26:23:33 | i : Intent [android.content.Intent.extras, <map.key>] : String | provenance |  |
-| Test.java:484:36:484:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:484:19:484:39 | getIntent_extras(...) : Bundle [<map.key>] : String | provenance | MaD:31 |
-| Test.java:484:36:484:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:484:19:484:39 | getIntent_extras(...) : Bundle [<map.key>] : String | provenance | MaD:31 |
+| Test.java:484:36:484:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:484:19:484:39 | getIntent_extras(...) : Bundle [<map.key>] : String | provenance | MaD:34 |
+| Test.java:484:36:484:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:484:19:484:39 | getIntent_extras(...) : Bundle [<map.key>] : String | provenance | MaD:34 |
 | Test.java:489:16:489:31 | (...)... : String | Test.java:490:17:490:18 | in : String | provenance |  |
 | Test.java:489:24:489:31 | source(...) : Object | Test.java:489:16:489:31 | (...)... : String | provenance |  |
 | Test.java:490:4:490:6 | out [post update] : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:491:36:491:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | provenance |  |
 | Test.java:490:4:490:6 | out [post update] : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:491:36:491:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | provenance |  |
-| Test.java:490:17:490:18 | in : String | Test.java:490:4:490:6 | out [post update] : Intent [android.content.Intent.extras, <map.key>] : String | provenance | MaD:49 |
-| Test.java:490:17:490:18 | in : String | Test.java:490:4:490:6 | out [post update] : Intent [android.content.Intent.extras, <map.key>] : String | provenance | MaD:49 |
+| Test.java:490:17:490:18 | in : String | Test.java:490:4:490:6 | out [post update] : Intent [android.content.Intent.extras, <map.key>] : String | provenance | MaD:48 |
+| Test.java:490:17:490:18 | in : String | Test.java:490:4:490:6 | out [post update] : Intent [android.content.Intent.extras, <map.key>] : String | provenance | MaD:48 |
 | Test.java:491:19:491:39 | getIntent_extras(...) : Bundle [<map.key>] : String | Test.java:24:19:24:30 | b : Bundle [<map.key>] : String | provenance |  |
 | Test.java:491:19:491:39 | getIntent_extras(...) : Bundle [<map.key>] : String | Test.java:491:9:491:40 | getMapKey(...) | provenance | MaD:98 |
 | Test.java:491:36:491:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:23:26:23:33 | i : Intent [android.content.Intent.extras, <map.key>] : String | provenance |  |
 | Test.java:491:36:491:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:23:26:23:33 | i : Intent [android.content.Intent.extras, <map.key>] : String | provenance |  |
-| Test.java:491:36:491:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:491:19:491:39 | getIntent_extras(...) : Bundle [<map.key>] : String | provenance | MaD:31 |
-| Test.java:491:36:491:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:491:19:491:39 | getIntent_extras(...) : Bundle [<map.key>] : String | provenance | MaD:31 |
+| Test.java:491:36:491:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:491:19:491:39 | getIntent_extras(...) : Bundle [<map.key>] : String | provenance | MaD:34 |
+| Test.java:491:36:491:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:491:19:491:39 | getIntent_extras(...) : Bundle [<map.key>] : String | provenance | MaD:34 |
 | Test.java:496:16:496:31 | (...)... : String | Test.java:497:17:497:18 | in : String | provenance |  |
 | Test.java:496:24:496:31 | source(...) : Object | Test.java:496:16:496:31 | (...)... : String | provenance |  |
 | Test.java:497:4:497:6 | out [post update] : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:498:36:498:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | provenance |  |
 | Test.java:497:4:497:6 | out [post update] : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:498:36:498:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | provenance |  |
-| Test.java:497:17:497:18 | in : String | Test.java:497:4:497:6 | out [post update] : Intent [android.content.Intent.extras, <map.key>] : String | provenance | MaD:49 |
-| Test.java:497:17:497:18 | in : String | Test.java:497:4:497:6 | out [post update] : Intent [android.content.Intent.extras, <map.key>] : String | provenance | MaD:49 |
+| Test.java:497:17:497:18 | in : String | Test.java:497:4:497:6 | out [post update] : Intent [android.content.Intent.extras, <map.key>] : String | provenance | MaD:48 |
+| Test.java:497:17:497:18 | in : String | Test.java:497:4:497:6 | out [post update] : Intent [android.content.Intent.extras, <map.key>] : String | provenance | MaD:48 |
 | Test.java:498:19:498:39 | getIntent_extras(...) : Bundle [<map.key>] : String | Test.java:24:19:24:30 | b : Bundle [<map.key>] : String | provenance |  |
 | Test.java:498:19:498:39 | getIntent_extras(...) : Bundle [<map.key>] : String | Test.java:498:9:498:40 | getMapKey(...) | provenance | MaD:98 |
 | Test.java:498:36:498:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:23:26:23:33 | i : Intent [android.content.Intent.extras, <map.key>] : String | provenance |  |
 | Test.java:498:36:498:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:23:26:23:33 | i : Intent [android.content.Intent.extras, <map.key>] : String | provenance |  |
-| Test.java:498:36:498:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:498:19:498:39 | getIntent_extras(...) : Bundle [<map.key>] : String | provenance | MaD:31 |
-| Test.java:498:36:498:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:498:19:498:39 | getIntent_extras(...) : Bundle [<map.key>] : String | provenance | MaD:31 |
+| Test.java:498:36:498:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:498:19:498:39 | getIntent_extras(...) : Bundle [<map.key>] : String | provenance | MaD:34 |
+| Test.java:498:36:498:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:498:19:498:39 | getIntent_extras(...) : Bundle [<map.key>] : String | provenance | MaD:34 |
 | Test.java:503:16:503:31 | (...)... : String | Test.java:504:17:504:18 | in : String | provenance |  |
 | Test.java:503:24:503:31 | source(...) : Object | Test.java:503:16:503:31 | (...)... : String | provenance |  |
 | Test.java:504:4:504:6 | out [post update] : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:505:36:505:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | provenance |  |
 | Test.java:504:4:504:6 | out [post update] : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:505:36:505:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | provenance |  |
-| Test.java:504:17:504:18 | in : String | Test.java:504:4:504:6 | out [post update] : Intent [android.content.Intent.extras, <map.key>] : String | provenance | MaD:49 |
-| Test.java:504:17:504:18 | in : String | Test.java:504:4:504:6 | out [post update] : Intent [android.content.Intent.extras, <map.key>] : String | provenance | MaD:49 |
+| Test.java:504:17:504:18 | in : String | Test.java:504:4:504:6 | out [post update] : Intent [android.content.Intent.extras, <map.key>] : String | provenance | MaD:48 |
+| Test.java:504:17:504:18 | in : String | Test.java:504:4:504:6 | out [post update] : Intent [android.content.Intent.extras, <map.key>] : String | provenance | MaD:48 |
 | Test.java:505:19:505:39 | getIntent_extras(...) : Bundle [<map.key>] : String | Test.java:24:19:24:30 | b : Bundle [<map.key>] : String | provenance |  |
 | Test.java:505:19:505:39 | getIntent_extras(...) : Bundle [<map.key>] : String | Test.java:505:9:505:40 | getMapKey(...) | provenance | MaD:98 |
 | Test.java:505:36:505:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:23:26:23:33 | i : Intent [android.content.Intent.extras, <map.key>] : String | provenance |  |
 | Test.java:505:36:505:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:23:26:23:33 | i : Intent [android.content.Intent.extras, <map.key>] : String | provenance |  |
-| Test.java:505:36:505:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:505:19:505:39 | getIntent_extras(...) : Bundle [<map.key>] : String | provenance | MaD:31 |
-| Test.java:505:36:505:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:505:19:505:39 | getIntent_extras(...) : Bundle [<map.key>] : String | provenance | MaD:31 |
+| Test.java:505:36:505:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:505:19:505:39 | getIntent_extras(...) : Bundle [<map.key>] : String | provenance | MaD:34 |
+| Test.java:505:36:505:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:505:19:505:39 | getIntent_extras(...) : Bundle [<map.key>] : String | provenance | MaD:34 |
 | Test.java:510:16:510:31 | (...)... : String | Test.java:511:17:511:18 | in : String | provenance |  |
 | Test.java:510:24:510:31 | source(...) : Object | Test.java:510:16:510:31 | (...)... : String | provenance |  |
 | Test.java:511:4:511:6 | out [post update] : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:512:36:512:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | provenance |  |
 | Test.java:511:4:511:6 | out [post update] : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:512:36:512:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | provenance |  |
-| Test.java:511:17:511:18 | in : String | Test.java:511:4:511:6 | out [post update] : Intent [android.content.Intent.extras, <map.key>] : String | provenance | MaD:49 |
-| Test.java:511:17:511:18 | in : String | Test.java:511:4:511:6 | out [post update] : Intent [android.content.Intent.extras, <map.key>] : String | provenance | MaD:49 |
+| Test.java:511:17:511:18 | in : String | Test.java:511:4:511:6 | out [post update] : Intent [android.content.Intent.extras, <map.key>] : String | provenance | MaD:48 |
+| Test.java:511:17:511:18 | in : String | Test.java:511:4:511:6 | out [post update] : Intent [android.content.Intent.extras, <map.key>] : String | provenance | MaD:48 |
 | Test.java:512:19:512:39 | getIntent_extras(...) : Bundle [<map.key>] : String | Test.java:24:19:24:30 | b : Bundle [<map.key>] : String | provenance |  |
 | Test.java:512:19:512:39 | getIntent_extras(...) : Bundle [<map.key>] : String | Test.java:512:9:512:40 | getMapKey(...) | provenance | MaD:98 |
 | Test.java:512:36:512:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:23:26:23:33 | i : Intent [android.content.Intent.extras, <map.key>] : String | provenance |  |
 | Test.java:512:36:512:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:23:26:23:33 | i : Intent [android.content.Intent.extras, <map.key>] : String | provenance |  |
-| Test.java:512:36:512:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:512:19:512:39 | getIntent_extras(...) : Bundle [<map.key>] : String | provenance | MaD:31 |
-| Test.java:512:36:512:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:512:19:512:39 | getIntent_extras(...) : Bundle [<map.key>] : String | provenance | MaD:31 |
+| Test.java:512:36:512:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:512:19:512:39 | getIntent_extras(...) : Bundle [<map.key>] : String | provenance | MaD:34 |
+| Test.java:512:36:512:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:512:19:512:39 | getIntent_extras(...) : Bundle [<map.key>] : String | provenance | MaD:34 |
 | Test.java:517:16:517:31 | (...)... : String | Test.java:518:17:518:18 | in : String | provenance |  |
 | Test.java:517:24:517:31 | source(...) : Object | Test.java:517:16:517:31 | (...)... : String | provenance |  |
 | Test.java:518:4:518:6 | out [post update] : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:519:36:519:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | provenance |  |
 | Test.java:518:4:518:6 | out [post update] : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:519:36:519:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | provenance |  |
-| Test.java:518:17:518:18 | in : String | Test.java:518:4:518:6 | out [post update] : Intent [android.content.Intent.extras, <map.key>] : String | provenance | MaD:49 |
-| Test.java:518:17:518:18 | in : String | Test.java:518:4:518:6 | out [post update] : Intent [android.content.Intent.extras, <map.key>] : String | provenance | MaD:49 |
+| Test.java:518:17:518:18 | in : String | Test.java:518:4:518:6 | out [post update] : Intent [android.content.Intent.extras, <map.key>] : String | provenance | MaD:48 |
+| Test.java:518:17:518:18 | in : String | Test.java:518:4:518:6 | out [post update] : Intent [android.content.Intent.extras, <map.key>] : String | provenance | MaD:48 |
 | Test.java:519:19:519:39 | getIntent_extras(...) : Bundle [<map.key>] : String | Test.java:24:19:24:30 | b : Bundle [<map.key>] : String | provenance |  |
 | Test.java:519:19:519:39 | getIntent_extras(...) : Bundle [<map.key>] : String | Test.java:519:9:519:40 | getMapKey(...) | provenance | MaD:98 |
 | Test.java:519:36:519:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:23:26:23:33 | i : Intent [android.content.Intent.extras, <map.key>] : String | provenance |  |
 | Test.java:519:36:519:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:23:26:23:33 | i : Intent [android.content.Intent.extras, <map.key>] : String | provenance |  |
-| Test.java:519:36:519:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:519:19:519:39 | getIntent_extras(...) : Bundle [<map.key>] : String | provenance | MaD:31 |
-| Test.java:519:36:519:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:519:19:519:39 | getIntent_extras(...) : Bundle [<map.key>] : String | provenance | MaD:31 |
+| Test.java:519:36:519:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:519:19:519:39 | getIntent_extras(...) : Bundle [<map.key>] : String | provenance | MaD:34 |
+| Test.java:519:36:519:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:519:19:519:39 | getIntent_extras(...) : Bundle [<map.key>] : String | provenance | MaD:34 |
 | Test.java:524:16:524:31 | (...)... : String | Test.java:525:17:525:18 | in : String | provenance |  |
 | Test.java:524:24:524:31 | source(...) : Object | Test.java:524:16:524:31 | (...)... : String | provenance |  |
 | Test.java:525:4:525:6 | out [post update] : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:526:36:526:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | provenance |  |
 | Test.java:525:4:525:6 | out [post update] : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:526:36:526:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | provenance |  |
-| Test.java:525:17:525:18 | in : String | Test.java:525:4:525:6 | out [post update] : Intent [android.content.Intent.extras, <map.key>] : String | provenance | MaD:49 |
-| Test.java:525:17:525:18 | in : String | Test.java:525:4:525:6 | out [post update] : Intent [android.content.Intent.extras, <map.key>] : String | provenance | MaD:49 |
+| Test.java:525:17:525:18 | in : String | Test.java:525:4:525:6 | out [post update] : Intent [android.content.Intent.extras, <map.key>] : String | provenance | MaD:48 |
+| Test.java:525:17:525:18 | in : String | Test.java:525:4:525:6 | out [post update] : Intent [android.content.Intent.extras, <map.key>] : String | provenance | MaD:48 |
 | Test.java:526:19:526:39 | getIntent_extras(...) : Bundle [<map.key>] : String | Test.java:24:19:24:30 | b : Bundle [<map.key>] : String | provenance |  |
 | Test.java:526:19:526:39 | getIntent_extras(...) : Bundle [<map.key>] : String | Test.java:526:9:526:40 | getMapKey(...) | provenance | MaD:98 |
 | Test.java:526:36:526:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:23:26:23:33 | i : Intent [android.content.Intent.extras, <map.key>] : String | provenance |  |
 | Test.java:526:36:526:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:23:26:23:33 | i : Intent [android.content.Intent.extras, <map.key>] : String | provenance |  |
-| Test.java:526:36:526:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:526:19:526:39 | getIntent_extras(...) : Bundle [<map.key>] : String | provenance | MaD:31 |
-| Test.java:526:36:526:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:526:19:526:39 | getIntent_extras(...) : Bundle [<map.key>] : String | provenance | MaD:31 |
+| Test.java:526:36:526:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:526:19:526:39 | getIntent_extras(...) : Bundle [<map.key>] : String | provenance | MaD:34 |
+| Test.java:526:36:526:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:526:19:526:39 | getIntent_extras(...) : Bundle [<map.key>] : String | provenance | MaD:34 |
 | Test.java:531:16:531:31 | (...)... : String | Test.java:532:17:532:18 | in : String | provenance |  |
 | Test.java:531:24:531:31 | source(...) : Object | Test.java:531:16:531:31 | (...)... : String | provenance |  |
 | Test.java:532:4:532:6 | out [post update] : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:533:36:533:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | provenance |  |
 | Test.java:532:4:532:6 | out [post update] : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:533:36:533:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | provenance |  |
-| Test.java:532:17:532:18 | in : String | Test.java:532:4:532:6 | out [post update] : Intent [android.content.Intent.extras, <map.key>] : String | provenance | MaD:49 |
-| Test.java:532:17:532:18 | in : String | Test.java:532:4:532:6 | out [post update] : Intent [android.content.Intent.extras, <map.key>] : String | provenance | MaD:49 |
+| Test.java:532:17:532:18 | in : String | Test.java:532:4:532:6 | out [post update] : Intent [android.content.Intent.extras, <map.key>] : String | provenance | MaD:48 |
+| Test.java:532:17:532:18 | in : String | Test.java:532:4:532:6 | out [post update] : Intent [android.content.Intent.extras, <map.key>] : String | provenance | MaD:48 |
 | Test.java:533:19:533:39 | getIntent_extras(...) : Bundle [<map.key>] : String | Test.java:24:19:24:30 | b : Bundle [<map.key>] : String | provenance |  |
 | Test.java:533:19:533:39 | getIntent_extras(...) : Bundle [<map.key>] : String | Test.java:533:9:533:40 | getMapKey(...) | provenance | MaD:98 |
 | Test.java:533:36:533:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:23:26:23:33 | i : Intent [android.content.Intent.extras, <map.key>] : String | provenance |  |
 | Test.java:533:36:533:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:23:26:23:33 | i : Intent [android.content.Intent.extras, <map.key>] : String | provenance |  |
-| Test.java:533:36:533:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:533:19:533:39 | getIntent_extras(...) : Bundle [<map.key>] : String | provenance | MaD:31 |
-| Test.java:533:36:533:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:533:19:533:39 | getIntent_extras(...) : Bundle [<map.key>] : String | provenance | MaD:31 |
+| Test.java:533:36:533:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:533:19:533:39 | getIntent_extras(...) : Bundle [<map.key>] : String | provenance | MaD:34 |
+| Test.java:533:36:533:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:533:19:533:39 | getIntent_extras(...) : Bundle [<map.key>] : String | provenance | MaD:34 |
 | Test.java:538:16:538:31 | (...)... : String | Test.java:539:17:539:18 | in : String | provenance |  |
 | Test.java:538:24:538:31 | source(...) : Object | Test.java:538:16:538:31 | (...)... : String | provenance |  |
 | Test.java:539:4:539:6 | out [post update] : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:540:36:540:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | provenance |  |
 | Test.java:539:4:539:6 | out [post update] : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:540:36:540:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | provenance |  |
-| Test.java:539:17:539:18 | in : String | Test.java:539:4:539:6 | out [post update] : Intent [android.content.Intent.extras, <map.key>] : String | provenance | MaD:49 |
-| Test.java:539:17:539:18 | in : String | Test.java:539:4:539:6 | out [post update] : Intent [android.content.Intent.extras, <map.key>] : String | provenance | MaD:49 |
+| Test.java:539:17:539:18 | in : String | Test.java:539:4:539:6 | out [post update] : Intent [android.content.Intent.extras, <map.key>] : String | provenance | MaD:48 |
+| Test.java:539:17:539:18 | in : String | Test.java:539:4:539:6 | out [post update] : Intent [android.content.Intent.extras, <map.key>] : String | provenance | MaD:48 |
 | Test.java:540:19:540:39 | getIntent_extras(...) : Bundle [<map.key>] : String | Test.java:24:19:24:30 | b : Bundle [<map.key>] : String | provenance |  |
 | Test.java:540:19:540:39 | getIntent_extras(...) : Bundle [<map.key>] : String | Test.java:540:9:540:40 | getMapKey(...) | provenance | MaD:98 |
 | Test.java:540:36:540:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:23:26:23:33 | i : Intent [android.content.Intent.extras, <map.key>] : String | provenance |  |
 | Test.java:540:36:540:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:23:26:23:33 | i : Intent [android.content.Intent.extras, <map.key>] : String | provenance |  |
-| Test.java:540:36:540:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:540:19:540:39 | getIntent_extras(...) : Bundle [<map.key>] : String | provenance | MaD:31 |
-| Test.java:540:36:540:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:540:19:540:39 | getIntent_extras(...) : Bundle [<map.key>] : String | provenance | MaD:31 |
+| Test.java:540:36:540:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:540:19:540:39 | getIntent_extras(...) : Bundle [<map.key>] : String | provenance | MaD:34 |
+| Test.java:540:36:540:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:540:19:540:39 | getIntent_extras(...) : Bundle [<map.key>] : String | provenance | MaD:34 |
 | Test.java:545:16:545:31 | (...)... : String | Test.java:546:17:546:18 | in : String | provenance |  |
 | Test.java:545:24:545:31 | source(...) : Object | Test.java:545:16:545:31 | (...)... : String | provenance |  |
 | Test.java:546:4:546:6 | out [post update] : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:547:36:547:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | provenance |  |
 | Test.java:546:4:546:6 | out [post update] : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:547:36:547:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | provenance |  |
-| Test.java:546:17:546:18 | in : String | Test.java:546:4:546:6 | out [post update] : Intent [android.content.Intent.extras, <map.key>] : String | provenance | MaD:49 |
-| Test.java:546:17:546:18 | in : String | Test.java:546:4:546:6 | out [post update] : Intent [android.content.Intent.extras, <map.key>] : String | provenance | MaD:49 |
+| Test.java:546:17:546:18 | in : String | Test.java:546:4:546:6 | out [post update] : Intent [android.content.Intent.extras, <map.key>] : String | provenance | MaD:48 |
+| Test.java:546:17:546:18 | in : String | Test.java:546:4:546:6 | out [post update] : Intent [android.content.Intent.extras, <map.key>] : String | provenance | MaD:48 |
 | Test.java:547:19:547:39 | getIntent_extras(...) : Bundle [<map.key>] : String | Test.java:24:19:24:30 | b : Bundle [<map.key>] : String | provenance |  |
 | Test.java:547:19:547:39 | getIntent_extras(...) : Bundle [<map.key>] : String | Test.java:547:9:547:40 | getMapKey(...) | provenance | MaD:98 |
 | Test.java:547:36:547:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:23:26:23:33 | i : Intent [android.content.Intent.extras, <map.key>] : String | provenance |  |
 | Test.java:547:36:547:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:23:26:23:33 | i : Intent [android.content.Intent.extras, <map.key>] : String | provenance |  |
-| Test.java:547:36:547:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:547:19:547:39 | getIntent_extras(...) : Bundle [<map.key>] : String | provenance | MaD:31 |
-| Test.java:547:36:547:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:547:19:547:39 | getIntent_extras(...) : Bundle [<map.key>] : String | provenance | MaD:31 |
+| Test.java:547:36:547:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:547:19:547:39 | getIntent_extras(...) : Bundle [<map.key>] : String | provenance | MaD:34 |
+| Test.java:547:36:547:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:547:19:547:39 | getIntent_extras(...) : Bundle [<map.key>] : String | provenance | MaD:34 |
 | Test.java:552:16:552:31 | (...)... : String | Test.java:553:17:553:18 | in : String | provenance |  |
 | Test.java:552:24:552:31 | source(...) : Object | Test.java:552:16:552:31 | (...)... : String | provenance |  |
 | Test.java:553:4:553:6 | out [post update] : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:554:36:554:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | provenance |  |
 | Test.java:553:4:553:6 | out [post update] : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:554:36:554:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | provenance |  |
-| Test.java:553:17:553:18 | in : String | Test.java:553:4:553:6 | out [post update] : Intent [android.content.Intent.extras, <map.key>] : String | provenance | MaD:49 |
-| Test.java:553:17:553:18 | in : String | Test.java:553:4:553:6 | out [post update] : Intent [android.content.Intent.extras, <map.key>] : String | provenance | MaD:49 |
+| Test.java:553:17:553:18 | in : String | Test.java:553:4:553:6 | out [post update] : Intent [android.content.Intent.extras, <map.key>] : String | provenance | MaD:48 |
+| Test.java:553:17:553:18 | in : String | Test.java:553:4:553:6 | out [post update] : Intent [android.content.Intent.extras, <map.key>] : String | provenance | MaD:48 |
 | Test.java:554:19:554:39 | getIntent_extras(...) : Bundle [<map.key>] : String | Test.java:24:19:24:30 | b : Bundle [<map.key>] : String | provenance |  |
 | Test.java:554:19:554:39 | getIntent_extras(...) : Bundle [<map.key>] : String | Test.java:554:9:554:40 | getMapKey(...) | provenance | MaD:98 |
 | Test.java:554:36:554:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:23:26:23:33 | i : Intent [android.content.Intent.extras, <map.key>] : String | provenance |  |
 | Test.java:554:36:554:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:23:26:23:33 | i : Intent [android.content.Intent.extras, <map.key>] : String | provenance |  |
-| Test.java:554:36:554:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:554:19:554:39 | getIntent_extras(...) : Bundle [<map.key>] : String | provenance | MaD:31 |
-| Test.java:554:36:554:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:554:19:554:39 | getIntent_extras(...) : Bundle [<map.key>] : String | provenance | MaD:31 |
+| Test.java:554:36:554:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:554:19:554:39 | getIntent_extras(...) : Bundle [<map.key>] : String | provenance | MaD:34 |
+| Test.java:554:36:554:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:554:19:554:39 | getIntent_extras(...) : Bundle [<map.key>] : String | provenance | MaD:34 |
 | Test.java:559:16:559:31 | (...)... : String | Test.java:560:17:560:18 | in : String | provenance |  |
 | Test.java:559:24:559:31 | source(...) : Object | Test.java:559:16:559:31 | (...)... : String | provenance |  |
 | Test.java:560:4:560:6 | out [post update] : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:561:36:561:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | provenance |  |
 | Test.java:560:4:560:6 | out [post update] : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:561:36:561:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | provenance |  |
-| Test.java:560:17:560:18 | in : String | Test.java:560:4:560:6 | out [post update] : Intent [android.content.Intent.extras, <map.key>] : String | provenance | MaD:49 |
-| Test.java:560:17:560:18 | in : String | Test.java:560:4:560:6 | out [post update] : Intent [android.content.Intent.extras, <map.key>] : String | provenance | MaD:49 |
+| Test.java:560:17:560:18 | in : String | Test.java:560:4:560:6 | out [post update] : Intent [android.content.Intent.extras, <map.key>] : String | provenance | MaD:48 |
+| Test.java:560:17:560:18 | in : String | Test.java:560:4:560:6 | out [post update] : Intent [android.content.Intent.extras, <map.key>] : String | provenance | MaD:48 |
 | Test.java:561:19:561:39 | getIntent_extras(...) : Bundle [<map.key>] : String | Test.java:24:19:24:30 | b : Bundle [<map.key>] : String | provenance |  |
 | Test.java:561:19:561:39 | getIntent_extras(...) : Bundle [<map.key>] : String | Test.java:561:9:561:40 | getMapKey(...) | provenance | MaD:98 |
 | Test.java:561:36:561:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:23:26:23:33 | i : Intent [android.content.Intent.extras, <map.key>] : String | provenance |  |
 | Test.java:561:36:561:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:23:26:23:33 | i : Intent [android.content.Intent.extras, <map.key>] : String | provenance |  |
-| Test.java:561:36:561:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:561:19:561:39 | getIntent_extras(...) : Bundle [<map.key>] : String | provenance | MaD:31 |
-| Test.java:561:36:561:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:561:19:561:39 | getIntent_extras(...) : Bundle [<map.key>] : String | provenance | MaD:31 |
+| Test.java:561:36:561:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:561:19:561:39 | getIntent_extras(...) : Bundle [<map.key>] : String | provenance | MaD:34 |
+| Test.java:561:36:561:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:561:19:561:39 | getIntent_extras(...) : Bundle [<map.key>] : String | provenance | MaD:34 |
 | Test.java:566:16:566:31 | (...)... : String | Test.java:567:17:567:18 | in : String | provenance |  |
 | Test.java:566:24:566:31 | source(...) : Object | Test.java:566:16:566:31 | (...)... : String | provenance |  |
 | Test.java:567:4:567:6 | out [post update] : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:568:36:568:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | provenance |  |
 | Test.java:567:4:567:6 | out [post update] : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:568:36:568:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | provenance |  |
-| Test.java:567:17:567:18 | in : String | Test.java:567:4:567:6 | out [post update] : Intent [android.content.Intent.extras, <map.key>] : String | provenance | MaD:49 |
-| Test.java:567:17:567:18 | in : String | Test.java:567:4:567:6 | out [post update] : Intent [android.content.Intent.extras, <map.key>] : String | provenance | MaD:49 |
+| Test.java:567:17:567:18 | in : String | Test.java:567:4:567:6 | out [post update] : Intent [android.content.Intent.extras, <map.key>] : String | provenance | MaD:48 |
+| Test.java:567:17:567:18 | in : String | Test.java:567:4:567:6 | out [post update] : Intent [android.content.Intent.extras, <map.key>] : String | provenance | MaD:48 |
 | Test.java:568:19:568:39 | getIntent_extras(...) : Bundle [<map.key>] : String | Test.java:24:19:24:30 | b : Bundle [<map.key>] : String | provenance |  |
 | Test.java:568:19:568:39 | getIntent_extras(...) : Bundle [<map.key>] : String | Test.java:568:9:568:40 | getMapKey(...) | provenance | MaD:98 |
 | Test.java:568:36:568:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:23:26:23:33 | i : Intent [android.content.Intent.extras, <map.key>] : String | provenance |  |
 | Test.java:568:36:568:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:23:26:23:33 | i : Intent [android.content.Intent.extras, <map.key>] : String | provenance |  |
-| Test.java:568:36:568:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:568:19:568:39 | getIntent_extras(...) : Bundle [<map.key>] : String | provenance | MaD:31 |
-| Test.java:568:36:568:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:568:19:568:39 | getIntent_extras(...) : Bundle [<map.key>] : String | provenance | MaD:31 |
+| Test.java:568:36:568:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:568:19:568:39 | getIntent_extras(...) : Bundle [<map.key>] : String | provenance | MaD:34 |
+| Test.java:568:36:568:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:568:19:568:39 | getIntent_extras(...) : Bundle [<map.key>] : String | provenance | MaD:34 |
 | Test.java:573:16:573:31 | (...)... : String | Test.java:574:17:574:18 | in : String | provenance |  |
 | Test.java:573:24:573:31 | source(...) : Object | Test.java:573:16:573:31 | (...)... : String | provenance |  |
 | Test.java:574:4:574:6 | out [post update] : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:575:36:575:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | provenance |  |
 | Test.java:574:4:574:6 | out [post update] : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:575:36:575:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | provenance |  |
-| Test.java:574:17:574:18 | in : String | Test.java:574:4:574:6 | out [post update] : Intent [android.content.Intent.extras, <map.key>] : String | provenance | MaD:49 |
-| Test.java:574:17:574:18 | in : String | Test.java:574:4:574:6 | out [post update] : Intent [android.content.Intent.extras, <map.key>] : String | provenance | MaD:49 |
+| Test.java:574:17:574:18 | in : String | Test.java:574:4:574:6 | out [post update] : Intent [android.content.Intent.extras, <map.key>] : String | provenance | MaD:48 |
+| Test.java:574:17:574:18 | in : String | Test.java:574:4:574:6 | out [post update] : Intent [android.content.Intent.extras, <map.key>] : String | provenance | MaD:48 |
 | Test.java:575:19:575:39 | getIntent_extras(...) : Bundle [<map.key>] : String | Test.java:24:19:24:30 | b : Bundle [<map.key>] : String | provenance |  |
 | Test.java:575:19:575:39 | getIntent_extras(...) : Bundle [<map.key>] : String | Test.java:575:9:575:40 | getMapKey(...) | provenance | MaD:98 |
 | Test.java:575:36:575:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:23:26:23:33 | i : Intent [android.content.Intent.extras, <map.key>] : String | provenance |  |
 | Test.java:575:36:575:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:23:26:23:33 | i : Intent [android.content.Intent.extras, <map.key>] : String | provenance |  |
-| Test.java:575:36:575:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:575:19:575:39 | getIntent_extras(...) : Bundle [<map.key>] : String | provenance | MaD:31 |
-| Test.java:575:36:575:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:575:19:575:39 | getIntent_extras(...) : Bundle [<map.key>] : String | provenance | MaD:31 |
+| Test.java:575:36:575:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:575:19:575:39 | getIntent_extras(...) : Bundle [<map.key>] : String | provenance | MaD:34 |
+| Test.java:575:36:575:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:575:19:575:39 | getIntent_extras(...) : Bundle [<map.key>] : String | provenance | MaD:34 |
 | Test.java:580:16:580:31 | (...)... : String | Test.java:581:17:581:18 | in : String | provenance |  |
 | Test.java:580:24:580:31 | source(...) : Object | Test.java:580:16:580:31 | (...)... : String | provenance |  |
 | Test.java:581:4:581:6 | out [post update] : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:582:36:582:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | provenance |  |
 | Test.java:581:4:581:6 | out [post update] : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:582:36:582:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | provenance |  |
-| Test.java:581:17:581:18 | in : String | Test.java:581:4:581:6 | out [post update] : Intent [android.content.Intent.extras, <map.key>] : String | provenance | MaD:49 |
-| Test.java:581:17:581:18 | in : String | Test.java:581:4:581:6 | out [post update] : Intent [android.content.Intent.extras, <map.key>] : String | provenance | MaD:49 |
+| Test.java:581:17:581:18 | in : String | Test.java:581:4:581:6 | out [post update] : Intent [android.content.Intent.extras, <map.key>] : String | provenance | MaD:48 |
+| Test.java:581:17:581:18 | in : String | Test.java:581:4:581:6 | out [post update] : Intent [android.content.Intent.extras, <map.key>] : String | provenance | MaD:48 |
 | Test.java:582:19:582:39 | getIntent_extras(...) : Bundle [<map.key>] : String | Test.java:24:19:24:30 | b : Bundle [<map.key>] : String | provenance |  |
 | Test.java:582:19:582:39 | getIntent_extras(...) : Bundle [<map.key>] : String | Test.java:582:9:582:40 | getMapKey(...) | provenance | MaD:98 |
 | Test.java:582:36:582:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:23:26:23:33 | i : Intent [android.content.Intent.extras, <map.key>] : String | provenance |  |
 | Test.java:582:36:582:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:23:26:23:33 | i : Intent [android.content.Intent.extras, <map.key>] : String | provenance |  |
-| Test.java:582:36:582:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:582:19:582:39 | getIntent_extras(...) : Bundle [<map.key>] : String | provenance | MaD:31 |
-| Test.java:582:36:582:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:582:19:582:39 | getIntent_extras(...) : Bundle [<map.key>] : String | provenance | MaD:31 |
+| Test.java:582:36:582:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:582:19:582:39 | getIntent_extras(...) : Bundle [<map.key>] : String | provenance | MaD:34 |
+| Test.java:582:36:582:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:582:19:582:39 | getIntent_extras(...) : Bundle [<map.key>] : String | provenance | MaD:34 |
 | Test.java:587:16:587:31 | (...)... : String | Test.java:588:17:588:18 | in : String | provenance |  |
 | Test.java:587:24:587:31 | source(...) : Object | Test.java:587:16:587:31 | (...)... : String | provenance |  |
 | Test.java:588:4:588:6 | out [post update] : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:589:36:589:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | provenance |  |
 | Test.java:588:4:588:6 | out [post update] : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:589:36:589:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | provenance |  |
-| Test.java:588:17:588:18 | in : String | Test.java:588:4:588:6 | out [post update] : Intent [android.content.Intent.extras, <map.key>] : String | provenance | MaD:49 |
-| Test.java:588:17:588:18 | in : String | Test.java:588:4:588:6 | out [post update] : Intent [android.content.Intent.extras, <map.key>] : String | provenance | MaD:49 |
+| Test.java:588:17:588:18 | in : String | Test.java:588:4:588:6 | out [post update] : Intent [android.content.Intent.extras, <map.key>] : String | provenance | MaD:48 |
+| Test.java:588:17:588:18 | in : String | Test.java:588:4:588:6 | out [post update] : Intent [android.content.Intent.extras, <map.key>] : String | provenance | MaD:48 |
 | Test.java:589:19:589:39 | getIntent_extras(...) : Bundle [<map.key>] : String | Test.java:24:19:24:30 | b : Bundle [<map.key>] : String | provenance |  |
 | Test.java:589:19:589:39 | getIntent_extras(...) : Bundle [<map.key>] : String | Test.java:589:9:589:40 | getMapKey(...) | provenance | MaD:98 |
 | Test.java:589:36:589:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:23:26:23:33 | i : Intent [android.content.Intent.extras, <map.key>] : String | provenance |  |
 | Test.java:589:36:589:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:23:26:23:33 | i : Intent [android.content.Intent.extras, <map.key>] : String | provenance |  |
-| Test.java:589:36:589:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:589:19:589:39 | getIntent_extras(...) : Bundle [<map.key>] : String | provenance | MaD:31 |
-| Test.java:589:36:589:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:589:19:589:39 | getIntent_extras(...) : Bundle [<map.key>] : String | provenance | MaD:31 |
+| Test.java:589:36:589:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:589:19:589:39 | getIntent_extras(...) : Bundle [<map.key>] : String | provenance | MaD:34 |
+| Test.java:589:36:589:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:589:19:589:39 | getIntent_extras(...) : Bundle [<map.key>] : String | provenance | MaD:34 |
 | Test.java:594:17:594:33 | (...)... : short[] | Test.java:595:31:595:32 | in : short[] | provenance |  |
 | Test.java:594:26:594:33 | source(...) : Object | Test.java:594:17:594:33 | (...)... : short[] | provenance |  |
 | Test.java:595:4:595:6 | out [post update] : Intent [android.content.Intent.extras, <map.value>] : short[] | Test.java:596:38:596:40 | out : Intent [android.content.Intent.extras, <map.value>] : short[] | provenance |  |
 | Test.java:595:4:595:6 | out [post update] : Intent [android.content.Intent.extras, <map.value>] : short[] | Test.java:596:38:596:40 | out : Intent [android.content.Intent.extras, <map.value>] : short[] | provenance |  |
-| Test.java:595:31:595:32 | in : short[] | Test.java:595:4:595:6 | out [post update] : Intent [android.content.Intent.extras, <map.value>] : short[] | provenance | MaD:50 |
-| Test.java:595:31:595:32 | in : short[] | Test.java:595:4:595:6 | out [post update] : Intent [android.content.Intent.extras, <map.value>] : short[] | provenance | MaD:50 |
-| Test.java:596:21:596:41 | getIntent_extras(...) : Bundle [<map.value>] : short[] | Test.java:596:9:596:42 | getMapValue(...) | provenance | MaD:179 |
+| Test.java:595:31:595:32 | in : short[] | Test.java:595:4:595:6 | out [post update] : Intent [android.content.Intent.extras, <map.value>] : short[] | provenance | MaD:49 |
+| Test.java:595:31:595:32 | in : short[] | Test.java:595:4:595:6 | out [post update] : Intent [android.content.Intent.extras, <map.value>] : short[] | provenance | MaD:49 |
+| Test.java:596:21:596:41 | getIntent_extras(...) : Bundle [<map.value>] : short[] | Test.java:596:9:596:42 | getMapValue(...) | provenance | MaD:175 |
 | Test.java:596:38:596:40 | out : Intent [android.content.Intent.extras, <map.value>] : short[] | Test.java:23:26:23:33 | i : Intent [android.content.Intent.extras, <map.value>] : short[] | provenance |  |
 | Test.java:596:38:596:40 | out : Intent [android.content.Intent.extras, <map.value>] : short[] | Test.java:23:26:23:33 | i : Intent [android.content.Intent.extras, <map.value>] : short[] | provenance |  |
-| Test.java:596:38:596:40 | out : Intent [android.content.Intent.extras, <map.value>] : short[] | Test.java:596:21:596:41 | getIntent_extras(...) : Bundle [<map.value>] : short[] | provenance | MaD:31 |
-| Test.java:596:38:596:40 | out : Intent [android.content.Intent.extras, <map.value>] : short[] | Test.java:596:21:596:41 | getIntent_extras(...) : Bundle [<map.value>] : short[] | provenance | MaD:31 |
+| Test.java:596:38:596:40 | out : Intent [android.content.Intent.extras, <map.value>] : short[] | Test.java:596:21:596:41 | getIntent_extras(...) : Bundle [<map.value>] : short[] | provenance | MaD:34 |
+| Test.java:596:38:596:40 | out : Intent [android.content.Intent.extras, <map.value>] : short[] | Test.java:596:21:596:41 | getIntent_extras(...) : Bundle [<map.value>] : short[] | provenance | MaD:34 |
 | Test.java:601:15:601:29 | (...)... : Number | Test.java:602:31:602:32 | in : Number | provenance |  |
 | Test.java:601:22:601:29 | source(...) : Object | Test.java:601:15:601:29 | (...)... : Number | provenance |  |
 | Test.java:602:4:602:6 | out [post update] : Intent [android.content.Intent.extras, <map.value>] : Number | Test.java:603:38:603:40 | out : Intent [android.content.Intent.extras, <map.value>] : Number | provenance |  |
 | Test.java:602:4:602:6 | out [post update] : Intent [android.content.Intent.extras, <map.value>] : Number | Test.java:603:38:603:40 | out : Intent [android.content.Intent.extras, <map.value>] : Number | provenance |  |
-| Test.java:602:31:602:32 | in : Number | Test.java:602:4:602:6 | out [post update] : Intent [android.content.Intent.extras, <map.value>] : Number | provenance | MaD:50 |
-| Test.java:602:31:602:32 | in : Number | Test.java:602:4:602:6 | out [post update] : Intent [android.content.Intent.extras, <map.value>] : Number | provenance | MaD:50 |
-| Test.java:603:21:603:41 | getIntent_extras(...) : Bundle [<map.value>] : Number | Test.java:603:9:603:42 | getMapValue(...) | provenance | MaD:179 |
+| Test.java:602:31:602:32 | in : Number | Test.java:602:4:602:6 | out [post update] : Intent [android.content.Intent.extras, <map.value>] : Number | provenance | MaD:49 |
+| Test.java:602:31:602:32 | in : Number | Test.java:602:4:602:6 | out [post update] : Intent [android.content.Intent.extras, <map.value>] : Number | provenance | MaD:49 |
+| Test.java:603:21:603:41 | getIntent_extras(...) : Bundle [<map.value>] : Number | Test.java:603:9:603:42 | getMapValue(...) | provenance | MaD:175 |
 | Test.java:603:38:603:40 | out : Intent [android.content.Intent.extras, <map.value>] : Number | Test.java:23:26:23:33 | i : Intent [android.content.Intent.extras, <map.value>] : Number | provenance |  |
 | Test.java:603:38:603:40 | out : Intent [android.content.Intent.extras, <map.value>] : Number | Test.java:23:26:23:33 | i : Intent [android.content.Intent.extras, <map.value>] : Number | provenance |  |
-| Test.java:603:38:603:40 | out : Intent [android.content.Intent.extras, <map.value>] : Number | Test.java:603:21:603:41 | getIntent_extras(...) : Bundle [<map.value>] : Number | provenance | MaD:31 |
-| Test.java:603:38:603:40 | out : Intent [android.content.Intent.extras, <map.value>] : Number | Test.java:603:21:603:41 | getIntent_extras(...) : Bundle [<map.value>] : Number | provenance | MaD:31 |
+| Test.java:603:38:603:40 | out : Intent [android.content.Intent.extras, <map.value>] : Number | Test.java:603:21:603:41 | getIntent_extras(...) : Bundle [<map.value>] : Number | provenance | MaD:34 |
+| Test.java:603:38:603:40 | out : Intent [android.content.Intent.extras, <map.value>] : Number | Test.java:603:21:603:41 | getIntent_extras(...) : Bundle [<map.value>] : Number | provenance | MaD:34 |
 | Test.java:608:16:608:31 | (...)... : long[] | Test.java:609:31:609:32 | in : long[] | provenance |  |
 | Test.java:608:24:608:31 | source(...) : Object | Test.java:608:16:608:31 | (...)... : long[] | provenance |  |
 | Test.java:609:4:609:6 | out [post update] : Intent [android.content.Intent.extras, <map.value>] : long[] | Test.java:610:38:610:40 | out : Intent [android.content.Intent.extras, <map.value>] : long[] | provenance |  |
 | Test.java:609:4:609:6 | out [post update] : Intent [android.content.Intent.extras, <map.value>] : long[] | Test.java:610:38:610:40 | out : Intent [android.content.Intent.extras, <map.value>] : long[] | provenance |  |
-| Test.java:609:31:609:32 | in : long[] | Test.java:609:4:609:6 | out [post update] : Intent [android.content.Intent.extras, <map.value>] : long[] | provenance | MaD:50 |
-| Test.java:609:31:609:32 | in : long[] | Test.java:609:4:609:6 | out [post update] : Intent [android.content.Intent.extras, <map.value>] : long[] | provenance | MaD:50 |
-| Test.java:610:21:610:41 | getIntent_extras(...) : Bundle [<map.value>] : long[] | Test.java:610:9:610:42 | getMapValue(...) | provenance | MaD:179 |
+| Test.java:609:31:609:32 | in : long[] | Test.java:609:4:609:6 | out [post update] : Intent [android.content.Intent.extras, <map.value>] : long[] | provenance | MaD:49 |
+| Test.java:609:31:609:32 | in : long[] | Test.java:609:4:609:6 | out [post update] : Intent [android.content.Intent.extras, <map.value>] : long[] | provenance | MaD:49 |
+| Test.java:610:21:610:41 | getIntent_extras(...) : Bundle [<map.value>] : long[] | Test.java:610:9:610:42 | getMapValue(...) | provenance | MaD:175 |
 | Test.java:610:38:610:40 | out : Intent [android.content.Intent.extras, <map.value>] : long[] | Test.java:23:26:23:33 | i : Intent [android.content.Intent.extras, <map.value>] : long[] | provenance |  |
 | Test.java:610:38:610:40 | out : Intent [android.content.Intent.extras, <map.value>] : long[] | Test.java:23:26:23:33 | i : Intent [android.content.Intent.extras, <map.value>] : long[] | provenance |  |
-| Test.java:610:38:610:40 | out : Intent [android.content.Intent.extras, <map.value>] : long[] | Test.java:610:21:610:41 | getIntent_extras(...) : Bundle [<map.value>] : long[] | provenance | MaD:31 |
-| Test.java:610:38:610:40 | out : Intent [android.content.Intent.extras, <map.value>] : long[] | Test.java:610:21:610:41 | getIntent_extras(...) : Bundle [<map.value>] : long[] | provenance | MaD:31 |
+| Test.java:610:38:610:40 | out : Intent [android.content.Intent.extras, <map.value>] : long[] | Test.java:610:21:610:41 | getIntent_extras(...) : Bundle [<map.value>] : long[] | provenance | MaD:34 |
+| Test.java:610:38:610:40 | out : Intent [android.content.Intent.extras, <map.value>] : long[] | Test.java:610:21:610:41 | getIntent_extras(...) : Bundle [<map.value>] : long[] | provenance | MaD:34 |
 | Test.java:615:14:615:27 | (...)... : Number | Test.java:616:31:616:32 | in : Number | provenance |  |
 | Test.java:615:20:615:27 | source(...) : Object | Test.java:615:14:615:27 | (...)... : Number | provenance |  |
 | Test.java:616:4:616:6 | out [post update] : Intent [android.content.Intent.extras, <map.value>] : Number | Test.java:617:38:617:40 | out : Intent [android.content.Intent.extras, <map.value>] : Number | provenance |  |
 | Test.java:616:4:616:6 | out [post update] : Intent [android.content.Intent.extras, <map.value>] : Number | Test.java:617:38:617:40 | out : Intent [android.content.Intent.extras, <map.value>] : Number | provenance |  |
-| Test.java:616:31:616:32 | in : Number | Test.java:616:4:616:6 | out [post update] : Intent [android.content.Intent.extras, <map.value>] : Number | provenance | MaD:50 |
-| Test.java:616:31:616:32 | in : Number | Test.java:616:4:616:6 | out [post update] : Intent [android.content.Intent.extras, <map.value>] : Number | provenance | MaD:50 |
-| Test.java:617:21:617:41 | getIntent_extras(...) : Bundle [<map.value>] : Number | Test.java:617:9:617:42 | getMapValue(...) | provenance | MaD:179 |
+| Test.java:616:31:616:32 | in : Number | Test.java:616:4:616:6 | out [post update] : Intent [android.content.Intent.extras, <map.value>] : Number | provenance | MaD:49 |
+| Test.java:616:31:616:32 | in : Number | Test.java:616:4:616:6 | out [post update] : Intent [android.content.Intent.extras, <map.value>] : Number | provenance | MaD:49 |
+| Test.java:617:21:617:41 | getIntent_extras(...) : Bundle [<map.value>] : Number | Test.java:617:9:617:42 | getMapValue(...) | provenance | MaD:175 |
 | Test.java:617:38:617:40 | out : Intent [android.content.Intent.extras, <map.value>] : Number | Test.java:23:26:23:33 | i : Intent [android.content.Intent.extras, <map.value>] : Number | provenance |  |
 | Test.java:617:38:617:40 | out : Intent [android.content.Intent.extras, <map.value>] : Number | Test.java:23:26:23:33 | i : Intent [android.content.Intent.extras, <map.value>] : Number | provenance |  |
-| Test.java:617:38:617:40 | out : Intent [android.content.Intent.extras, <map.value>] : Number | Test.java:617:21:617:41 | getIntent_extras(...) : Bundle [<map.value>] : Number | provenance | MaD:31 |
-| Test.java:617:38:617:40 | out : Intent [android.content.Intent.extras, <map.value>] : Number | Test.java:617:21:617:41 | getIntent_extras(...) : Bundle [<map.value>] : Number | provenance | MaD:31 |
+| Test.java:617:38:617:40 | out : Intent [android.content.Intent.extras, <map.value>] : Number | Test.java:617:21:617:41 | getIntent_extras(...) : Bundle [<map.value>] : Number | provenance | MaD:34 |
+| Test.java:617:38:617:40 | out : Intent [android.content.Intent.extras, <map.value>] : Number | Test.java:617:21:617:41 | getIntent_extras(...) : Bundle [<map.value>] : Number | provenance | MaD:34 |
 | Test.java:622:15:622:29 | (...)... : int[] | Test.java:623:31:623:32 | in : int[] | provenance |  |
 | Test.java:622:22:622:29 | source(...) : Object | Test.java:622:15:622:29 | (...)... : int[] | provenance |  |
 | Test.java:623:4:623:6 | out [post update] : Intent [android.content.Intent.extras, <map.value>] : int[] | Test.java:624:38:624:40 | out : Intent [android.content.Intent.extras, <map.value>] : int[] | provenance |  |
 | Test.java:623:4:623:6 | out [post update] : Intent [android.content.Intent.extras, <map.value>] : int[] | Test.java:624:38:624:40 | out : Intent [android.content.Intent.extras, <map.value>] : int[] | provenance |  |
-| Test.java:623:31:623:32 | in : int[] | Test.java:623:4:623:6 | out [post update] : Intent [android.content.Intent.extras, <map.value>] : int[] | provenance | MaD:50 |
-| Test.java:623:31:623:32 | in : int[] | Test.java:623:4:623:6 | out [post update] : Intent [android.content.Intent.extras, <map.value>] : int[] | provenance | MaD:50 |
-| Test.java:624:21:624:41 | getIntent_extras(...) : Bundle [<map.value>] : int[] | Test.java:624:9:624:42 | getMapValue(...) | provenance | MaD:179 |
+| Test.java:623:31:623:32 | in : int[] | Test.java:623:4:623:6 | out [post update] : Intent [android.content.Intent.extras, <map.value>] : int[] | provenance | MaD:49 |
+| Test.java:623:31:623:32 | in : int[] | Test.java:623:4:623:6 | out [post update] : Intent [android.content.Intent.extras, <map.value>] : int[] | provenance | MaD:49 |
+| Test.java:624:21:624:41 | getIntent_extras(...) : Bundle [<map.value>] : int[] | Test.java:624:9:624:42 | getMapValue(...) | provenance | MaD:175 |
 | Test.java:624:38:624:40 | out : Intent [android.content.Intent.extras, <map.value>] : int[] | Test.java:23:26:23:33 | i : Intent [android.content.Intent.extras, <map.value>] : int[] | provenance |  |
 | Test.java:624:38:624:40 | out : Intent [android.content.Intent.extras, <map.value>] : int[] | Test.java:23:26:23:33 | i : Intent [android.content.Intent.extras, <map.value>] : int[] | provenance |  |
-| Test.java:624:38:624:40 | out : Intent [android.content.Intent.extras, <map.value>] : int[] | Test.java:624:21:624:41 | getIntent_extras(...) : Bundle [<map.value>] : int[] | provenance | MaD:31 |
-| Test.java:624:38:624:40 | out : Intent [android.content.Intent.extras, <map.value>] : int[] | Test.java:624:21:624:41 | getIntent_extras(...) : Bundle [<map.value>] : int[] | provenance | MaD:31 |
+| Test.java:624:38:624:40 | out : Intent [android.content.Intent.extras, <map.value>] : int[] | Test.java:624:21:624:41 | getIntent_extras(...) : Bundle [<map.value>] : int[] | provenance | MaD:34 |
+| Test.java:624:38:624:40 | out : Intent [android.content.Intent.extras, <map.value>] : int[] | Test.java:624:21:624:41 | getIntent_extras(...) : Bundle [<map.value>] : int[] | provenance | MaD:34 |
 | Test.java:629:13:629:25 | (...)... : Number | Test.java:630:31:630:32 | in : Number | provenance |  |
 | Test.java:629:18:629:25 | source(...) : Object | Test.java:629:13:629:25 | (...)... : Number | provenance |  |
 | Test.java:630:4:630:6 | out [post update] : Intent [android.content.Intent.extras, <map.value>] : Number | Test.java:631:38:631:40 | out : Intent [android.content.Intent.extras, <map.value>] : Number | provenance |  |
 | Test.java:630:4:630:6 | out [post update] : Intent [android.content.Intent.extras, <map.value>] : Number | Test.java:631:38:631:40 | out : Intent [android.content.Intent.extras, <map.value>] : Number | provenance |  |
-| Test.java:630:31:630:32 | in : Number | Test.java:630:4:630:6 | out [post update] : Intent [android.content.Intent.extras, <map.value>] : Number | provenance | MaD:50 |
-| Test.java:630:31:630:32 | in : Number | Test.java:630:4:630:6 | out [post update] : Intent [android.content.Intent.extras, <map.value>] : Number | provenance | MaD:50 |
-| Test.java:631:21:631:41 | getIntent_extras(...) : Bundle [<map.value>] : Number | Test.java:631:9:631:42 | getMapValue(...) | provenance | MaD:179 |
+| Test.java:630:31:630:32 | in : Number | Test.java:630:4:630:6 | out [post update] : Intent [android.content.Intent.extras, <map.value>] : Number | provenance | MaD:49 |
+| Test.java:630:31:630:32 | in : Number | Test.java:630:4:630:6 | out [post update] : Intent [android.content.Intent.extras, <map.value>] : Number | provenance | MaD:49 |
+| Test.java:631:21:631:41 | getIntent_extras(...) : Bundle [<map.value>] : Number | Test.java:631:9:631:42 | getMapValue(...) | provenance | MaD:175 |
 | Test.java:631:38:631:40 | out : Intent [android.content.Intent.extras, <map.value>] : Number | Test.java:23:26:23:33 | i : Intent [android.content.Intent.extras, <map.value>] : Number | provenance |  |
 | Test.java:631:38:631:40 | out : Intent [android.content.Intent.extras, <map.value>] : Number | Test.java:23:26:23:33 | i : Intent [android.content.Intent.extras, <map.value>] : Number | provenance |  |
-| Test.java:631:38:631:40 | out : Intent [android.content.Intent.extras, <map.value>] : Number | Test.java:631:21:631:41 | getIntent_extras(...) : Bundle [<map.value>] : Number | provenance | MaD:31 |
-| Test.java:631:38:631:40 | out : Intent [android.content.Intent.extras, <map.value>] : Number | Test.java:631:21:631:41 | getIntent_extras(...) : Bundle [<map.value>] : Number | provenance | MaD:31 |
+| Test.java:631:38:631:40 | out : Intent [android.content.Intent.extras, <map.value>] : Number | Test.java:631:21:631:41 | getIntent_extras(...) : Bundle [<map.value>] : Number | provenance | MaD:34 |
+| Test.java:631:38:631:40 | out : Intent [android.content.Intent.extras, <map.value>] : Number | Test.java:631:21:631:41 | getIntent_extras(...) : Bundle [<map.value>] : Number | provenance | MaD:34 |
 | Test.java:636:17:636:33 | (...)... : float[] | Test.java:637:31:637:32 | in : float[] | provenance |  |
 | Test.java:636:26:636:33 | source(...) : Object | Test.java:636:17:636:33 | (...)... : float[] | provenance |  |
 | Test.java:637:4:637:6 | out [post update] : Intent [android.content.Intent.extras, <map.value>] : float[] | Test.java:638:38:638:40 | out : Intent [android.content.Intent.extras, <map.value>] : float[] | provenance |  |
 | Test.java:637:4:637:6 | out [post update] : Intent [android.content.Intent.extras, <map.value>] : float[] | Test.java:638:38:638:40 | out : Intent [android.content.Intent.extras, <map.value>] : float[] | provenance |  |
-| Test.java:637:31:637:32 | in : float[] | Test.java:637:4:637:6 | out [post update] : Intent [android.content.Intent.extras, <map.value>] : float[] | provenance | MaD:50 |
-| Test.java:637:31:637:32 | in : float[] | Test.java:637:4:637:6 | out [post update] : Intent [android.content.Intent.extras, <map.value>] : float[] | provenance | MaD:50 |
-| Test.java:638:21:638:41 | getIntent_extras(...) : Bundle [<map.value>] : float[] | Test.java:638:9:638:42 | getMapValue(...) | provenance | MaD:179 |
+| Test.java:637:31:637:32 | in : float[] | Test.java:637:4:637:6 | out [post update] : Intent [android.content.Intent.extras, <map.value>] : float[] | provenance | MaD:49 |
+| Test.java:637:31:637:32 | in : float[] | Test.java:637:4:637:6 | out [post update] : Intent [android.content.Intent.extras, <map.value>] : float[] | provenance | MaD:49 |
+| Test.java:638:21:638:41 | getIntent_extras(...) : Bundle [<map.value>] : float[] | Test.java:638:9:638:42 | getMapValue(...) | provenance | MaD:175 |
 | Test.java:638:38:638:40 | out : Intent [android.content.Intent.extras, <map.value>] : float[] | Test.java:23:26:23:33 | i : Intent [android.content.Intent.extras, <map.value>] : float[] | provenance |  |
 | Test.java:638:38:638:40 | out : Intent [android.content.Intent.extras, <map.value>] : float[] | Test.java:23:26:23:33 | i : Intent [android.content.Intent.extras, <map.value>] : float[] | provenance |  |
-| Test.java:638:38:638:40 | out : Intent [android.content.Intent.extras, <map.value>] : float[] | Test.java:638:21:638:41 | getIntent_extras(...) : Bundle [<map.value>] : float[] | provenance | MaD:31 |
-| Test.java:638:38:638:40 | out : Intent [android.content.Intent.extras, <map.value>] : float[] | Test.java:638:21:638:41 | getIntent_extras(...) : Bundle [<map.value>] : float[] | provenance | MaD:31 |
+| Test.java:638:38:638:40 | out : Intent [android.content.Intent.extras, <map.value>] : float[] | Test.java:638:21:638:41 | getIntent_extras(...) : Bundle [<map.value>] : float[] | provenance | MaD:34 |
+| Test.java:638:38:638:40 | out : Intent [android.content.Intent.extras, <map.value>] : float[] | Test.java:638:21:638:41 | getIntent_extras(...) : Bundle [<map.value>] : float[] | provenance | MaD:34 |
 | Test.java:643:15:643:29 | (...)... : Number | Test.java:644:31:644:32 | in : Number | provenance |  |
 | Test.java:643:22:643:29 | source(...) : Object | Test.java:643:15:643:29 | (...)... : Number | provenance |  |
 | Test.java:644:4:644:6 | out [post update] : Intent [android.content.Intent.extras, <map.value>] : Number | Test.java:645:38:645:40 | out : Intent [android.content.Intent.extras, <map.value>] : Number | provenance |  |
 | Test.java:644:4:644:6 | out [post update] : Intent [android.content.Intent.extras, <map.value>] : Number | Test.java:645:38:645:40 | out : Intent [android.content.Intent.extras, <map.value>] : Number | provenance |  |
-| Test.java:644:31:644:32 | in : Number | Test.java:644:4:644:6 | out [post update] : Intent [android.content.Intent.extras, <map.value>] : Number | provenance | MaD:50 |
-| Test.java:644:31:644:32 | in : Number | Test.java:644:4:644:6 | out [post update] : Intent [android.content.Intent.extras, <map.value>] : Number | provenance | MaD:50 |
-| Test.java:645:21:645:41 | getIntent_extras(...) : Bundle [<map.value>] : Number | Test.java:645:9:645:42 | getMapValue(...) | provenance | MaD:179 |
+| Test.java:644:31:644:32 | in : Number | Test.java:644:4:644:6 | out [post update] : Intent [android.content.Intent.extras, <map.value>] : Number | provenance | MaD:49 |
+| Test.java:644:31:644:32 | in : Number | Test.java:644:4:644:6 | out [post update] : Intent [android.content.Intent.extras, <map.value>] : Number | provenance | MaD:49 |
+| Test.java:645:21:645:41 | getIntent_extras(...) : Bundle [<map.value>] : Number | Test.java:645:9:645:42 | getMapValue(...) | provenance | MaD:175 |
 | Test.java:645:38:645:40 | out : Intent [android.content.Intent.extras, <map.value>] : Number | Test.java:23:26:23:33 | i : Intent [android.content.Intent.extras, <map.value>] : Number | provenance |  |
 | Test.java:645:38:645:40 | out : Intent [android.content.Intent.extras, <map.value>] : Number | Test.java:23:26:23:33 | i : Intent [android.content.Intent.extras, <map.value>] : Number | provenance |  |
-| Test.java:645:38:645:40 | out : Intent [android.content.Intent.extras, <map.value>] : Number | Test.java:645:21:645:41 | getIntent_extras(...) : Bundle [<map.value>] : Number | provenance | MaD:31 |
-| Test.java:645:38:645:40 | out : Intent [android.content.Intent.extras, <map.value>] : Number | Test.java:645:21:645:41 | getIntent_extras(...) : Bundle [<map.value>] : Number | provenance | MaD:31 |
+| Test.java:645:38:645:40 | out : Intent [android.content.Intent.extras, <map.value>] : Number | Test.java:645:21:645:41 | getIntent_extras(...) : Bundle [<map.value>] : Number | provenance | MaD:34 |
+| Test.java:645:38:645:40 | out : Intent [android.content.Intent.extras, <map.value>] : Number | Test.java:645:21:645:41 | getIntent_extras(...) : Bundle [<map.value>] : Number | provenance | MaD:34 |
 | Test.java:650:18:650:35 | (...)... : double[] | Test.java:651:31:651:32 | in : double[] | provenance |  |
 | Test.java:650:28:650:35 | source(...) : Object | Test.java:650:18:650:35 | (...)... : double[] | provenance |  |
 | Test.java:651:4:651:6 | out [post update] : Intent [android.content.Intent.extras, <map.value>] : double[] | Test.java:652:38:652:40 | out : Intent [android.content.Intent.extras, <map.value>] : double[] | provenance |  |
 | Test.java:651:4:651:6 | out [post update] : Intent [android.content.Intent.extras, <map.value>] : double[] | Test.java:652:38:652:40 | out : Intent [android.content.Intent.extras, <map.value>] : double[] | provenance |  |
-| Test.java:651:31:651:32 | in : double[] | Test.java:651:4:651:6 | out [post update] : Intent [android.content.Intent.extras, <map.value>] : double[] | provenance | MaD:50 |
-| Test.java:651:31:651:32 | in : double[] | Test.java:651:4:651:6 | out [post update] : Intent [android.content.Intent.extras, <map.value>] : double[] | provenance | MaD:50 |
-| Test.java:652:21:652:41 | getIntent_extras(...) : Bundle [<map.value>] : double[] | Test.java:652:9:652:42 | getMapValue(...) | provenance | MaD:179 |
+| Test.java:651:31:651:32 | in : double[] | Test.java:651:4:651:6 | out [post update] : Intent [android.content.Intent.extras, <map.value>] : double[] | provenance | MaD:49 |
+| Test.java:651:31:651:32 | in : double[] | Test.java:651:4:651:6 | out [post update] : Intent [android.content.Intent.extras, <map.value>] : double[] | provenance | MaD:49 |
+| Test.java:652:21:652:41 | getIntent_extras(...) : Bundle [<map.value>] : double[] | Test.java:652:9:652:42 | getMapValue(...) | provenance | MaD:175 |
 | Test.java:652:38:652:40 | out : Intent [android.content.Intent.extras, <map.value>] : double[] | Test.java:23:26:23:33 | i : Intent [android.content.Intent.extras, <map.value>] : double[] | provenance |  |
 | Test.java:652:38:652:40 | out : Intent [android.content.Intent.extras, <map.value>] : double[] | Test.java:23:26:23:33 | i : Intent [android.content.Intent.extras, <map.value>] : double[] | provenance |  |
-| Test.java:652:38:652:40 | out : Intent [android.content.Intent.extras, <map.value>] : double[] | Test.java:652:21:652:41 | getIntent_extras(...) : Bundle [<map.value>] : double[] | provenance | MaD:31 |
-| Test.java:652:38:652:40 | out : Intent [android.content.Intent.extras, <map.value>] : double[] | Test.java:652:21:652:41 | getIntent_extras(...) : Bundle [<map.value>] : double[] | provenance | MaD:31 |
+| Test.java:652:38:652:40 | out : Intent [android.content.Intent.extras, <map.value>] : double[] | Test.java:652:21:652:41 | getIntent_extras(...) : Bundle [<map.value>] : double[] | provenance | MaD:34 |
+| Test.java:652:38:652:40 | out : Intent [android.content.Intent.extras, <map.value>] : double[] | Test.java:652:21:652:41 | getIntent_extras(...) : Bundle [<map.value>] : double[] | provenance | MaD:34 |
 | Test.java:657:16:657:31 | (...)... : Number | Test.java:658:31:658:32 | in : Number | provenance |  |
 | Test.java:657:24:657:31 | source(...) : Object | Test.java:657:16:657:31 | (...)... : Number | provenance |  |
 | Test.java:658:4:658:6 | out [post update] : Intent [android.content.Intent.extras, <map.value>] : Number | Test.java:659:38:659:40 | out : Intent [android.content.Intent.extras, <map.value>] : Number | provenance |  |
 | Test.java:658:4:658:6 | out [post update] : Intent [android.content.Intent.extras, <map.value>] : Number | Test.java:659:38:659:40 | out : Intent [android.content.Intent.extras, <map.value>] : Number | provenance |  |
-| Test.java:658:31:658:32 | in : Number | Test.java:658:4:658:6 | out [post update] : Intent [android.content.Intent.extras, <map.value>] : Number | provenance | MaD:50 |
-| Test.java:658:31:658:32 | in : Number | Test.java:658:4:658:6 | out [post update] : Intent [android.content.Intent.extras, <map.value>] : Number | provenance | MaD:50 |
-| Test.java:659:21:659:41 | getIntent_extras(...) : Bundle [<map.value>] : Number | Test.java:659:9:659:42 | getMapValue(...) | provenance | MaD:179 |
+| Test.java:658:31:658:32 | in : Number | Test.java:658:4:658:6 | out [post update] : Intent [android.content.Intent.extras, <map.value>] : Number | provenance | MaD:49 |
+| Test.java:658:31:658:32 | in : Number | Test.java:658:4:658:6 | out [post update] : Intent [android.content.Intent.extras, <map.value>] : Number | provenance | MaD:49 |
+| Test.java:659:21:659:41 | getIntent_extras(...) : Bundle [<map.value>] : Number | Test.java:659:9:659:42 | getMapValue(...) | provenance | MaD:175 |
 | Test.java:659:38:659:40 | out : Intent [android.content.Intent.extras, <map.value>] : Number | Test.java:23:26:23:33 | i : Intent [android.content.Intent.extras, <map.value>] : Number | provenance |  |
 | Test.java:659:38:659:40 | out : Intent [android.content.Intent.extras, <map.value>] : Number | Test.java:23:26:23:33 | i : Intent [android.content.Intent.extras, <map.value>] : Number | provenance |  |
-| Test.java:659:38:659:40 | out : Intent [android.content.Intent.extras, <map.value>] : Number | Test.java:659:21:659:41 | getIntent_extras(...) : Bundle [<map.value>] : Number | provenance | MaD:31 |
-| Test.java:659:38:659:40 | out : Intent [android.content.Intent.extras, <map.value>] : Number | Test.java:659:21:659:41 | getIntent_extras(...) : Bundle [<map.value>] : Number | provenance | MaD:31 |
+| Test.java:659:38:659:40 | out : Intent [android.content.Intent.extras, <map.value>] : Number | Test.java:659:21:659:41 | getIntent_extras(...) : Bundle [<map.value>] : Number | provenance | MaD:34 |
+| Test.java:659:38:659:40 | out : Intent [android.content.Intent.extras, <map.value>] : Number | Test.java:659:21:659:41 | getIntent_extras(...) : Bundle [<map.value>] : Number | provenance | MaD:34 |
 | Test.java:664:16:664:31 | (...)... : char[] | Test.java:665:31:665:32 | in : char[] | provenance |  |
 | Test.java:664:24:664:31 | source(...) : Object | Test.java:664:16:664:31 | (...)... : char[] | provenance |  |
 | Test.java:665:4:665:6 | out [post update] : Intent [android.content.Intent.extras, <map.value>] : char[] | Test.java:666:38:666:40 | out : Intent [android.content.Intent.extras, <map.value>] : char[] | provenance |  |
 | Test.java:665:4:665:6 | out [post update] : Intent [android.content.Intent.extras, <map.value>] : char[] | Test.java:666:38:666:40 | out : Intent [android.content.Intent.extras, <map.value>] : char[] | provenance |  |
-| Test.java:665:31:665:32 | in : char[] | Test.java:665:4:665:6 | out [post update] : Intent [android.content.Intent.extras, <map.value>] : char[] | provenance | MaD:50 |
-| Test.java:665:31:665:32 | in : char[] | Test.java:665:4:665:6 | out [post update] : Intent [android.content.Intent.extras, <map.value>] : char[] | provenance | MaD:50 |
-| Test.java:666:21:666:41 | getIntent_extras(...) : Bundle [<map.value>] : char[] | Test.java:666:9:666:42 | getMapValue(...) | provenance | MaD:179 |
+| Test.java:665:31:665:32 | in : char[] | Test.java:665:4:665:6 | out [post update] : Intent [android.content.Intent.extras, <map.value>] : char[] | provenance | MaD:49 |
+| Test.java:665:31:665:32 | in : char[] | Test.java:665:4:665:6 | out [post update] : Intent [android.content.Intent.extras, <map.value>] : char[] | provenance | MaD:49 |
+| Test.java:666:21:666:41 | getIntent_extras(...) : Bundle [<map.value>] : char[] | Test.java:666:9:666:42 | getMapValue(...) | provenance | MaD:175 |
 | Test.java:666:38:666:40 | out : Intent [android.content.Intent.extras, <map.value>] : char[] | Test.java:23:26:23:33 | i : Intent [android.content.Intent.extras, <map.value>] : char[] | provenance |  |
 | Test.java:666:38:666:40 | out : Intent [android.content.Intent.extras, <map.value>] : char[] | Test.java:23:26:23:33 | i : Intent [android.content.Intent.extras, <map.value>] : char[] | provenance |  |
-| Test.java:666:38:666:40 | out : Intent [android.content.Intent.extras, <map.value>] : char[] | Test.java:666:21:666:41 | getIntent_extras(...) : Bundle [<map.value>] : char[] | provenance | MaD:31 |
-| Test.java:666:38:666:40 | out : Intent [android.content.Intent.extras, <map.value>] : char[] | Test.java:666:21:666:41 | getIntent_extras(...) : Bundle [<map.value>] : char[] | provenance | MaD:31 |
+| Test.java:666:38:666:40 | out : Intent [android.content.Intent.extras, <map.value>] : char[] | Test.java:666:21:666:41 | getIntent_extras(...) : Bundle [<map.value>] : char[] | provenance | MaD:34 |
+| Test.java:666:38:666:40 | out : Intent [android.content.Intent.extras, <map.value>] : char[] | Test.java:666:21:666:41 | getIntent_extras(...) : Bundle [<map.value>] : char[] | provenance | MaD:34 |
 | Test.java:671:14:671:27 | (...)... : Number | Test.java:672:31:672:32 | in : Number | provenance |  |
 | Test.java:671:20:671:27 | source(...) : Object | Test.java:671:14:671:27 | (...)... : Number | provenance |  |
 | Test.java:672:4:672:6 | out [post update] : Intent [android.content.Intent.extras, <map.value>] : Number | Test.java:673:38:673:40 | out : Intent [android.content.Intent.extras, <map.value>] : Number | provenance |  |
 | Test.java:672:4:672:6 | out [post update] : Intent [android.content.Intent.extras, <map.value>] : Number | Test.java:673:38:673:40 | out : Intent [android.content.Intent.extras, <map.value>] : Number | provenance |  |
-| Test.java:672:31:672:32 | in : Number | Test.java:672:4:672:6 | out [post update] : Intent [android.content.Intent.extras, <map.value>] : Number | provenance | MaD:50 |
-| Test.java:672:31:672:32 | in : Number | Test.java:672:4:672:6 | out [post update] : Intent [android.content.Intent.extras, <map.value>] : Number | provenance | MaD:50 |
-| Test.java:673:21:673:41 | getIntent_extras(...) : Bundle [<map.value>] : Number | Test.java:673:9:673:42 | getMapValue(...) | provenance | MaD:179 |
+| Test.java:672:31:672:32 | in : Number | Test.java:672:4:672:6 | out [post update] : Intent [android.content.Intent.extras, <map.value>] : Number | provenance | MaD:49 |
+| Test.java:672:31:672:32 | in : Number | Test.java:672:4:672:6 | out [post update] : Intent [android.content.Intent.extras, <map.value>] : Number | provenance | MaD:49 |
+| Test.java:673:21:673:41 | getIntent_extras(...) : Bundle [<map.value>] : Number | Test.java:673:9:673:42 | getMapValue(...) | provenance | MaD:175 |
 | Test.java:673:38:673:40 | out : Intent [android.content.Intent.extras, <map.value>] : Number | Test.java:23:26:23:33 | i : Intent [android.content.Intent.extras, <map.value>] : Number | provenance |  |
 | Test.java:673:38:673:40 | out : Intent [android.content.Intent.extras, <map.value>] : Number | Test.java:23:26:23:33 | i : Intent [android.content.Intent.extras, <map.value>] : Number | provenance |  |
-| Test.java:673:38:673:40 | out : Intent [android.content.Intent.extras, <map.value>] : Number | Test.java:673:21:673:41 | getIntent_extras(...) : Bundle [<map.value>] : Number | provenance | MaD:31 |
-| Test.java:673:38:673:40 | out : Intent [android.content.Intent.extras, <map.value>] : Number | Test.java:673:21:673:41 | getIntent_extras(...) : Bundle [<map.value>] : Number | provenance | MaD:31 |
+| Test.java:673:38:673:40 | out : Intent [android.content.Intent.extras, <map.value>] : Number | Test.java:673:21:673:41 | getIntent_extras(...) : Bundle [<map.value>] : Number | provenance | MaD:34 |
+| Test.java:673:38:673:40 | out : Intent [android.content.Intent.extras, <map.value>] : Number | Test.java:673:21:673:41 | getIntent_extras(...) : Bundle [<map.value>] : Number | provenance | MaD:34 |
 | Test.java:678:16:678:31 | (...)... : byte[] | Test.java:679:31:679:32 | in : byte[] | provenance |  |
 | Test.java:678:24:678:31 | source(...) : Object | Test.java:678:16:678:31 | (...)... : byte[] | provenance |  |
 | Test.java:679:4:679:6 | out [post update] : Intent [android.content.Intent.extras, <map.value>] : byte[] | Test.java:680:38:680:40 | out : Intent [android.content.Intent.extras, <map.value>] : byte[] | provenance |  |
 | Test.java:679:4:679:6 | out [post update] : Intent [android.content.Intent.extras, <map.value>] : byte[] | Test.java:680:38:680:40 | out : Intent [android.content.Intent.extras, <map.value>] : byte[] | provenance |  |
-| Test.java:679:31:679:32 | in : byte[] | Test.java:679:4:679:6 | out [post update] : Intent [android.content.Intent.extras, <map.value>] : byte[] | provenance | MaD:50 |
-| Test.java:679:31:679:32 | in : byte[] | Test.java:679:4:679:6 | out [post update] : Intent [android.content.Intent.extras, <map.value>] : byte[] | provenance | MaD:50 |
-| Test.java:680:21:680:41 | getIntent_extras(...) : Bundle [<map.value>] : byte[] | Test.java:680:9:680:42 | getMapValue(...) | provenance | MaD:179 |
+| Test.java:679:31:679:32 | in : byte[] | Test.java:679:4:679:6 | out [post update] : Intent [android.content.Intent.extras, <map.value>] : byte[] | provenance | MaD:49 |
+| Test.java:679:31:679:32 | in : byte[] | Test.java:679:4:679:6 | out [post update] : Intent [android.content.Intent.extras, <map.value>] : byte[] | provenance | MaD:49 |
+| Test.java:680:21:680:41 | getIntent_extras(...) : Bundle [<map.value>] : byte[] | Test.java:680:9:680:42 | getMapValue(...) | provenance | MaD:175 |
 | Test.java:680:38:680:40 | out : Intent [android.content.Intent.extras, <map.value>] : byte[] | Test.java:23:26:23:33 | i : Intent [android.content.Intent.extras, <map.value>] : byte[] | provenance |  |
 | Test.java:680:38:680:40 | out : Intent [android.content.Intent.extras, <map.value>] : byte[] | Test.java:23:26:23:33 | i : Intent [android.content.Intent.extras, <map.value>] : byte[] | provenance |  |
-| Test.java:680:38:680:40 | out : Intent [android.content.Intent.extras, <map.value>] : byte[] | Test.java:680:21:680:41 | getIntent_extras(...) : Bundle [<map.value>] : byte[] | provenance | MaD:31 |
-| Test.java:680:38:680:40 | out : Intent [android.content.Intent.extras, <map.value>] : byte[] | Test.java:680:21:680:41 | getIntent_extras(...) : Bundle [<map.value>] : byte[] | provenance | MaD:31 |
+| Test.java:680:38:680:40 | out : Intent [android.content.Intent.extras, <map.value>] : byte[] | Test.java:680:21:680:41 | getIntent_extras(...) : Bundle [<map.value>] : byte[] | provenance | MaD:34 |
+| Test.java:680:38:680:40 | out : Intent [android.content.Intent.extras, <map.value>] : byte[] | Test.java:680:21:680:41 | getIntent_extras(...) : Bundle [<map.value>] : byte[] | provenance | MaD:34 |
 | Test.java:685:14:685:27 | (...)... : Number | Test.java:686:31:686:32 | in : Number | provenance |  |
 | Test.java:685:20:685:27 | source(...) : Object | Test.java:685:14:685:27 | (...)... : Number | provenance |  |
 | Test.java:686:4:686:6 | out [post update] : Intent [android.content.Intent.extras, <map.value>] : Number | Test.java:687:38:687:40 | out : Intent [android.content.Intent.extras, <map.value>] : Number | provenance |  |
 | Test.java:686:4:686:6 | out [post update] : Intent [android.content.Intent.extras, <map.value>] : Number | Test.java:687:38:687:40 | out : Intent [android.content.Intent.extras, <map.value>] : Number | provenance |  |
-| Test.java:686:31:686:32 | in : Number | Test.java:686:4:686:6 | out [post update] : Intent [android.content.Intent.extras, <map.value>] : Number | provenance | MaD:50 |
-| Test.java:686:31:686:32 | in : Number | Test.java:686:4:686:6 | out [post update] : Intent [android.content.Intent.extras, <map.value>] : Number | provenance | MaD:50 |
-| Test.java:687:21:687:41 | getIntent_extras(...) : Bundle [<map.value>] : Number | Test.java:687:9:687:42 | getMapValue(...) | provenance | MaD:179 |
+| Test.java:686:31:686:32 | in : Number | Test.java:686:4:686:6 | out [post update] : Intent [android.content.Intent.extras, <map.value>] : Number | provenance | MaD:49 |
+| Test.java:686:31:686:32 | in : Number | Test.java:686:4:686:6 | out [post update] : Intent [android.content.Intent.extras, <map.value>] : Number | provenance | MaD:49 |
+| Test.java:687:21:687:41 | getIntent_extras(...) : Bundle [<map.value>] : Number | Test.java:687:9:687:42 | getMapValue(...) | provenance | MaD:175 |
 | Test.java:687:38:687:40 | out : Intent [android.content.Intent.extras, <map.value>] : Number | Test.java:23:26:23:33 | i : Intent [android.content.Intent.extras, <map.value>] : Number | provenance |  |
 | Test.java:687:38:687:40 | out : Intent [android.content.Intent.extras, <map.value>] : Number | Test.java:23:26:23:33 | i : Intent [android.content.Intent.extras, <map.value>] : Number | provenance |  |
-| Test.java:687:38:687:40 | out : Intent [android.content.Intent.extras, <map.value>] : Number | Test.java:687:21:687:41 | getIntent_extras(...) : Bundle [<map.value>] : Number | provenance | MaD:31 |
-| Test.java:687:38:687:40 | out : Intent [android.content.Intent.extras, <map.value>] : Number | Test.java:687:21:687:41 | getIntent_extras(...) : Bundle [<map.value>] : Number | provenance | MaD:31 |
+| Test.java:687:38:687:40 | out : Intent [android.content.Intent.extras, <map.value>] : Number | Test.java:687:21:687:41 | getIntent_extras(...) : Bundle [<map.value>] : Number | provenance | MaD:34 |
+| Test.java:687:38:687:40 | out : Intent [android.content.Intent.extras, <map.value>] : Number | Test.java:687:21:687:41 | getIntent_extras(...) : Bundle [<map.value>] : Number | provenance | MaD:34 |
 | Test.java:692:19:692:37 | (...)... : boolean[] | Test.java:693:31:693:32 | in : boolean[] | provenance |  |
 | Test.java:692:30:692:37 | source(...) : Object | Test.java:692:19:692:37 | (...)... : boolean[] | provenance |  |
 | Test.java:693:4:693:6 | out [post update] : Intent [android.content.Intent.extras, <map.value>] : boolean[] | Test.java:694:38:694:40 | out : Intent [android.content.Intent.extras, <map.value>] : boolean[] | provenance |  |
 | Test.java:693:4:693:6 | out [post update] : Intent [android.content.Intent.extras, <map.value>] : boolean[] | Test.java:694:38:694:40 | out : Intent [android.content.Intent.extras, <map.value>] : boolean[] | provenance |  |
-| Test.java:693:31:693:32 | in : boolean[] | Test.java:693:4:693:6 | out [post update] : Intent [android.content.Intent.extras, <map.value>] : boolean[] | provenance | MaD:50 |
-| Test.java:693:31:693:32 | in : boolean[] | Test.java:693:4:693:6 | out [post update] : Intent [android.content.Intent.extras, <map.value>] : boolean[] | provenance | MaD:50 |
-| Test.java:694:21:694:41 | getIntent_extras(...) : Bundle [<map.value>] : boolean[] | Test.java:694:9:694:42 | getMapValue(...) | provenance | MaD:179 |
+| Test.java:693:31:693:32 | in : boolean[] | Test.java:693:4:693:6 | out [post update] : Intent [android.content.Intent.extras, <map.value>] : boolean[] | provenance | MaD:49 |
+| Test.java:693:31:693:32 | in : boolean[] | Test.java:693:4:693:6 | out [post update] : Intent [android.content.Intent.extras, <map.value>] : boolean[] | provenance | MaD:49 |
+| Test.java:694:21:694:41 | getIntent_extras(...) : Bundle [<map.value>] : boolean[] | Test.java:694:9:694:42 | getMapValue(...) | provenance | MaD:175 |
 | Test.java:694:38:694:40 | out : Intent [android.content.Intent.extras, <map.value>] : boolean[] | Test.java:23:26:23:33 | i : Intent [android.content.Intent.extras, <map.value>] : boolean[] | provenance |  |
 | Test.java:694:38:694:40 | out : Intent [android.content.Intent.extras, <map.value>] : boolean[] | Test.java:23:26:23:33 | i : Intent [android.content.Intent.extras, <map.value>] : boolean[] | provenance |  |
-| Test.java:694:38:694:40 | out : Intent [android.content.Intent.extras, <map.value>] : boolean[] | Test.java:694:21:694:41 | getIntent_extras(...) : Bundle [<map.value>] : boolean[] | provenance | MaD:31 |
-| Test.java:694:38:694:40 | out : Intent [android.content.Intent.extras, <map.value>] : boolean[] | Test.java:694:21:694:41 | getIntent_extras(...) : Bundle [<map.value>] : boolean[] | provenance | MaD:31 |
+| Test.java:694:38:694:40 | out : Intent [android.content.Intent.extras, <map.value>] : boolean[] | Test.java:694:21:694:41 | getIntent_extras(...) : Bundle [<map.value>] : boolean[] | provenance | MaD:34 |
+| Test.java:694:38:694:40 | out : Intent [android.content.Intent.extras, <map.value>] : boolean[] | Test.java:694:21:694:41 | getIntent_extras(...) : Bundle [<map.value>] : boolean[] | provenance | MaD:34 |
 | Test.java:699:17:699:33 | (...)... : Boolean | Test.java:700:31:700:32 | in : Boolean | provenance |  |
 | Test.java:699:26:699:33 | source(...) : Object | Test.java:699:17:699:33 | (...)... : Boolean | provenance |  |
 | Test.java:700:4:700:6 | out [post update] : Intent [android.content.Intent.extras, <map.value>] : Boolean | Test.java:701:38:701:40 | out : Intent [android.content.Intent.extras, <map.value>] : Boolean | provenance |  |
 | Test.java:700:4:700:6 | out [post update] : Intent [android.content.Intent.extras, <map.value>] : Boolean | Test.java:701:38:701:40 | out : Intent [android.content.Intent.extras, <map.value>] : Boolean | provenance |  |
-| Test.java:700:31:700:32 | in : Boolean | Test.java:700:4:700:6 | out [post update] : Intent [android.content.Intent.extras, <map.value>] : Boolean | provenance | MaD:50 |
-| Test.java:700:31:700:32 | in : Boolean | Test.java:700:4:700:6 | out [post update] : Intent [android.content.Intent.extras, <map.value>] : Boolean | provenance | MaD:50 |
-| Test.java:701:21:701:41 | getIntent_extras(...) : Bundle [<map.value>] : Boolean | Test.java:701:9:701:42 | getMapValue(...) | provenance | MaD:179 |
+| Test.java:700:31:700:32 | in : Boolean | Test.java:700:4:700:6 | out [post update] : Intent [android.content.Intent.extras, <map.value>] : Boolean | provenance | MaD:49 |
+| Test.java:700:31:700:32 | in : Boolean | Test.java:700:4:700:6 | out [post update] : Intent [android.content.Intent.extras, <map.value>] : Boolean | provenance | MaD:49 |
+| Test.java:701:21:701:41 | getIntent_extras(...) : Bundle [<map.value>] : Boolean | Test.java:701:9:701:42 | getMapValue(...) | provenance | MaD:175 |
 | Test.java:701:38:701:40 | out : Intent [android.content.Intent.extras, <map.value>] : Boolean | Test.java:23:26:23:33 | i : Intent [android.content.Intent.extras, <map.value>] : Boolean | provenance |  |
 | Test.java:701:38:701:40 | out : Intent [android.content.Intent.extras, <map.value>] : Boolean | Test.java:23:26:23:33 | i : Intent [android.content.Intent.extras, <map.value>] : Boolean | provenance |  |
-| Test.java:701:38:701:40 | out : Intent [android.content.Intent.extras, <map.value>] : Boolean | Test.java:701:21:701:41 | getIntent_extras(...) : Bundle [<map.value>] : Boolean | provenance | MaD:31 |
-| Test.java:701:38:701:40 | out : Intent [android.content.Intent.extras, <map.value>] : Boolean | Test.java:701:21:701:41 | getIntent_extras(...) : Bundle [<map.value>] : Boolean | provenance | MaD:31 |
+| Test.java:701:38:701:40 | out : Intent [android.content.Intent.extras, <map.value>] : Boolean | Test.java:701:21:701:41 | getIntent_extras(...) : Bundle [<map.value>] : Boolean | provenance | MaD:34 |
+| Test.java:701:38:701:40 | out : Intent [android.content.Intent.extras, <map.value>] : Boolean | Test.java:701:21:701:41 | getIntent_extras(...) : Bundle [<map.value>] : Boolean | provenance | MaD:34 |
 | Test.java:706:18:706:35 | (...)... : String[] | Test.java:707:31:707:32 | in : String[] | provenance |  |
 | Test.java:706:28:706:35 | source(...) : Object | Test.java:706:18:706:35 | (...)... : String[] | provenance |  |
 | Test.java:707:4:707:6 | out [post update] : Intent [android.content.Intent.extras, <map.value>] : String[] | Test.java:708:38:708:40 | out : Intent [android.content.Intent.extras, <map.value>] : String[] | provenance |  |
 | Test.java:707:4:707:6 | out [post update] : Intent [android.content.Intent.extras, <map.value>] : String[] | Test.java:708:38:708:40 | out : Intent [android.content.Intent.extras, <map.value>] : String[] | provenance |  |
-| Test.java:707:31:707:32 | in : String[] | Test.java:707:4:707:6 | out [post update] : Intent [android.content.Intent.extras, <map.value>] : String[] | provenance | MaD:50 |
-| Test.java:707:31:707:32 | in : String[] | Test.java:707:4:707:6 | out [post update] : Intent [android.content.Intent.extras, <map.value>] : String[] | provenance | MaD:50 |
-| Test.java:708:21:708:41 | getIntent_extras(...) : Bundle [<map.value>] : String[] | Test.java:708:9:708:42 | getMapValue(...) | provenance | MaD:179 |
+| Test.java:707:31:707:32 | in : String[] | Test.java:707:4:707:6 | out [post update] : Intent [android.content.Intent.extras, <map.value>] : String[] | provenance | MaD:49 |
+| Test.java:707:31:707:32 | in : String[] | Test.java:707:4:707:6 | out [post update] : Intent [android.content.Intent.extras, <map.value>] : String[] | provenance | MaD:49 |
+| Test.java:708:21:708:41 | getIntent_extras(...) : Bundle [<map.value>] : String[] | Test.java:708:9:708:42 | getMapValue(...) | provenance | MaD:175 |
 | Test.java:708:38:708:40 | out : Intent [android.content.Intent.extras, <map.value>] : String[] | Test.java:23:26:23:33 | i : Intent [android.content.Intent.extras, <map.value>] : String[] | provenance |  |
 | Test.java:708:38:708:40 | out : Intent [android.content.Intent.extras, <map.value>] : String[] | Test.java:23:26:23:33 | i : Intent [android.content.Intent.extras, <map.value>] : String[] | provenance |  |
-| Test.java:708:38:708:40 | out : Intent [android.content.Intent.extras, <map.value>] : String[] | Test.java:708:21:708:41 | getIntent_extras(...) : Bundle [<map.value>] : String[] | provenance | MaD:31 |
-| Test.java:708:38:708:40 | out : Intent [android.content.Intent.extras, <map.value>] : String[] | Test.java:708:21:708:41 | getIntent_extras(...) : Bundle [<map.value>] : String[] | provenance | MaD:31 |
+| Test.java:708:38:708:40 | out : Intent [android.content.Intent.extras, <map.value>] : String[] | Test.java:708:21:708:41 | getIntent_extras(...) : Bundle [<map.value>] : String[] | provenance | MaD:34 |
+| Test.java:708:38:708:40 | out : Intent [android.content.Intent.extras, <map.value>] : String[] | Test.java:708:21:708:41 | getIntent_extras(...) : Bundle [<map.value>] : String[] | provenance | MaD:34 |
 | Test.java:713:16:713:31 | (...)... : String | Test.java:714:31:714:32 | in : String | provenance |  |
 | Test.java:713:24:713:31 | source(...) : Object | Test.java:713:16:713:31 | (...)... : String | provenance |  |
 | Test.java:714:4:714:6 | out [post update] : Intent [android.content.Intent.extras, <map.value>] : String | Test.java:715:38:715:40 | out : Intent [android.content.Intent.extras, <map.value>] : String | provenance |  |
 | Test.java:714:4:714:6 | out [post update] : Intent [android.content.Intent.extras, <map.value>] : String | Test.java:715:38:715:40 | out : Intent [android.content.Intent.extras, <map.value>] : String | provenance |  |
-| Test.java:714:31:714:32 | in : String | Test.java:714:4:714:6 | out [post update] : Intent [android.content.Intent.extras, <map.value>] : String | provenance | MaD:50 |
-| Test.java:714:31:714:32 | in : String | Test.java:714:4:714:6 | out [post update] : Intent [android.content.Intent.extras, <map.value>] : String | provenance | MaD:50 |
-| Test.java:715:21:715:41 | getIntent_extras(...) : Bundle [<map.value>] : String | Test.java:715:9:715:42 | getMapValue(...) | provenance | MaD:179 |
+| Test.java:714:31:714:32 | in : String | Test.java:714:4:714:6 | out [post update] : Intent [android.content.Intent.extras, <map.value>] : String | provenance | MaD:49 |
+| Test.java:714:31:714:32 | in : String | Test.java:714:4:714:6 | out [post update] : Intent [android.content.Intent.extras, <map.value>] : String | provenance | MaD:49 |
+| Test.java:715:21:715:41 | getIntent_extras(...) : Bundle [<map.value>] : String | Test.java:715:9:715:42 | getMapValue(...) | provenance | MaD:175 |
 | Test.java:715:38:715:40 | out : Intent [android.content.Intent.extras, <map.value>] : String | Test.java:23:26:23:33 | i : Intent [android.content.Intent.extras, <map.value>] : String | provenance |  |
 | Test.java:715:38:715:40 | out : Intent [android.content.Intent.extras, <map.value>] : String | Test.java:23:26:23:33 | i : Intent [android.content.Intent.extras, <map.value>] : String | provenance |  |
-| Test.java:715:38:715:40 | out : Intent [android.content.Intent.extras, <map.value>] : String | Test.java:715:21:715:41 | getIntent_extras(...) : Bundle [<map.value>] : String | provenance | MaD:31 |
-| Test.java:715:38:715:40 | out : Intent [android.content.Intent.extras, <map.value>] : String | Test.java:715:21:715:41 | getIntent_extras(...) : Bundle [<map.value>] : String | provenance | MaD:31 |
+| Test.java:715:38:715:40 | out : Intent [android.content.Intent.extras, <map.value>] : String | Test.java:715:21:715:41 | getIntent_extras(...) : Bundle [<map.value>] : String | provenance | MaD:34 |
+| Test.java:715:38:715:40 | out : Intent [android.content.Intent.extras, <map.value>] : String | Test.java:715:21:715:41 | getIntent_extras(...) : Bundle [<map.value>] : String | provenance | MaD:34 |
 | Test.java:720:22:720:43 | (...)... : Serializable | Test.java:721:31:721:32 | in : Serializable | provenance |  |
 | Test.java:720:36:720:43 | source(...) : Object | Test.java:720:22:720:43 | (...)... : Serializable | provenance |  |
 | Test.java:721:4:721:6 | out [post update] : Intent [android.content.Intent.extras, <map.value>] : Serializable | Test.java:722:38:722:40 | out : Intent [android.content.Intent.extras, <map.value>] : Serializable | provenance |  |
 | Test.java:721:4:721:6 | out [post update] : Intent [android.content.Intent.extras, <map.value>] : Serializable | Test.java:722:38:722:40 | out : Intent [android.content.Intent.extras, <map.value>] : Serializable | provenance |  |
-| Test.java:721:31:721:32 | in : Serializable | Test.java:721:4:721:6 | out [post update] : Intent [android.content.Intent.extras, <map.value>] : Serializable | provenance | MaD:50 |
-| Test.java:721:31:721:32 | in : Serializable | Test.java:721:4:721:6 | out [post update] : Intent [android.content.Intent.extras, <map.value>] : Serializable | provenance | MaD:50 |
-| Test.java:722:21:722:41 | getIntent_extras(...) : Bundle [<map.value>] : Serializable | Test.java:722:9:722:42 | getMapValue(...) | provenance | MaD:179 |
+| Test.java:721:31:721:32 | in : Serializable | Test.java:721:4:721:6 | out [post update] : Intent [android.content.Intent.extras, <map.value>] : Serializable | provenance | MaD:49 |
+| Test.java:721:31:721:32 | in : Serializable | Test.java:721:4:721:6 | out [post update] : Intent [android.content.Intent.extras, <map.value>] : Serializable | provenance | MaD:49 |
+| Test.java:722:21:722:41 | getIntent_extras(...) : Bundle [<map.value>] : Serializable | Test.java:722:9:722:42 | getMapValue(...) | provenance | MaD:175 |
 | Test.java:722:38:722:40 | out : Intent [android.content.Intent.extras, <map.value>] : Serializable | Test.java:23:26:23:33 | i : Intent [android.content.Intent.extras, <map.value>] : Serializable | provenance |  |
 | Test.java:722:38:722:40 | out : Intent [android.content.Intent.extras, <map.value>] : Serializable | Test.java:23:26:23:33 | i : Intent [android.content.Intent.extras, <map.value>] : Serializable | provenance |  |
-| Test.java:722:38:722:40 | out : Intent [android.content.Intent.extras, <map.value>] : Serializable | Test.java:722:21:722:41 | getIntent_extras(...) : Bundle [<map.value>] : Serializable | provenance | MaD:31 |
-| Test.java:722:38:722:40 | out : Intent [android.content.Intent.extras, <map.value>] : Serializable | Test.java:722:21:722:41 | getIntent_extras(...) : Bundle [<map.value>] : Serializable | provenance | MaD:31 |
+| Test.java:722:38:722:40 | out : Intent [android.content.Intent.extras, <map.value>] : Serializable | Test.java:722:21:722:41 | getIntent_extras(...) : Bundle [<map.value>] : Serializable | provenance | MaD:34 |
+| Test.java:722:38:722:40 | out : Intent [android.content.Intent.extras, <map.value>] : Serializable | Test.java:722:21:722:41 | getIntent_extras(...) : Bundle [<map.value>] : Serializable | provenance | MaD:34 |
 | Test.java:727:22:727:43 | (...)... : Parcelable[] | Test.java:728:31:728:32 | in : Parcelable[] | provenance |  |
 | Test.java:727:36:727:43 | source(...) : Object | Test.java:727:22:727:43 | (...)... : Parcelable[] | provenance |  |
 | Test.java:728:4:728:6 | out [post update] : Intent [android.content.Intent.extras, <map.value>] : Parcelable[] | Test.java:729:38:729:40 | out : Intent [android.content.Intent.extras, <map.value>] : Parcelable[] | provenance |  |
 | Test.java:728:4:728:6 | out [post update] : Intent [android.content.Intent.extras, <map.value>] : Parcelable[] | Test.java:729:38:729:40 | out : Intent [android.content.Intent.extras, <map.value>] : Parcelable[] | provenance |  |
-| Test.java:728:31:728:32 | in : Parcelable[] | Test.java:728:4:728:6 | out [post update] : Intent [android.content.Intent.extras, <map.value>] : Parcelable[] | provenance | MaD:50 |
-| Test.java:728:31:728:32 | in : Parcelable[] | Test.java:728:4:728:6 | out [post update] : Intent [android.content.Intent.extras, <map.value>] : Parcelable[] | provenance | MaD:50 |
-| Test.java:729:21:729:41 | getIntent_extras(...) : Bundle [<map.value>] : Parcelable[] | Test.java:729:9:729:42 | getMapValue(...) | provenance | MaD:179 |
+| Test.java:728:31:728:32 | in : Parcelable[] | Test.java:728:4:728:6 | out [post update] : Intent [android.content.Intent.extras, <map.value>] : Parcelable[] | provenance | MaD:49 |
+| Test.java:728:31:728:32 | in : Parcelable[] | Test.java:728:4:728:6 | out [post update] : Intent [android.content.Intent.extras, <map.value>] : Parcelable[] | provenance | MaD:49 |
+| Test.java:729:21:729:41 | getIntent_extras(...) : Bundle [<map.value>] : Parcelable[] | Test.java:729:9:729:42 | getMapValue(...) | provenance | MaD:175 |
 | Test.java:729:38:729:40 | out : Intent [android.content.Intent.extras, <map.value>] : Parcelable[] | Test.java:23:26:23:33 | i : Intent [android.content.Intent.extras, <map.value>] : Parcelable[] | provenance |  |
 | Test.java:729:38:729:40 | out : Intent [android.content.Intent.extras, <map.value>] : Parcelable[] | Test.java:23:26:23:33 | i : Intent [android.content.Intent.extras, <map.value>] : Parcelable[] | provenance |  |
-| Test.java:729:38:729:40 | out : Intent [android.content.Intent.extras, <map.value>] : Parcelable[] | Test.java:729:21:729:41 | getIntent_extras(...) : Bundle [<map.value>] : Parcelable[] | provenance | MaD:31 |
-| Test.java:729:38:729:40 | out : Intent [android.content.Intent.extras, <map.value>] : Parcelable[] | Test.java:729:21:729:41 | getIntent_extras(...) : Bundle [<map.value>] : Parcelable[] | provenance | MaD:31 |
+| Test.java:729:38:729:40 | out : Intent [android.content.Intent.extras, <map.value>] : Parcelable[] | Test.java:729:21:729:41 | getIntent_extras(...) : Bundle [<map.value>] : Parcelable[] | provenance | MaD:34 |
+| Test.java:729:38:729:40 | out : Intent [android.content.Intent.extras, <map.value>] : Parcelable[] | Test.java:729:21:729:41 | getIntent_extras(...) : Bundle [<map.value>] : Parcelable[] | provenance | MaD:34 |
 | Test.java:734:20:734:39 | (...)... : Parcelable | Test.java:735:31:735:32 | in : Parcelable | provenance |  |
 | Test.java:734:32:734:39 | source(...) : Object | Test.java:734:20:734:39 | (...)... : Parcelable | provenance |  |
 | Test.java:735:4:735:6 | out [post update] : Intent [android.content.Intent.extras, <map.value>] : Parcelable | Test.java:736:38:736:40 | out : Intent [android.content.Intent.extras, <map.value>] : Parcelable | provenance |  |
 | Test.java:735:4:735:6 | out [post update] : Intent [android.content.Intent.extras, <map.value>] : Parcelable | Test.java:736:38:736:40 | out : Intent [android.content.Intent.extras, <map.value>] : Parcelable | provenance |  |
-| Test.java:735:31:735:32 | in : Parcelable | Test.java:735:4:735:6 | out [post update] : Intent [android.content.Intent.extras, <map.value>] : Parcelable | provenance | MaD:50 |
-| Test.java:735:31:735:32 | in : Parcelable | Test.java:735:4:735:6 | out [post update] : Intent [android.content.Intent.extras, <map.value>] : Parcelable | provenance | MaD:50 |
-| Test.java:736:21:736:41 | getIntent_extras(...) : Bundle [<map.value>] : Parcelable | Test.java:736:9:736:42 | getMapValue(...) | provenance | MaD:179 |
+| Test.java:735:31:735:32 | in : Parcelable | Test.java:735:4:735:6 | out [post update] : Intent [android.content.Intent.extras, <map.value>] : Parcelable | provenance | MaD:49 |
+| Test.java:735:31:735:32 | in : Parcelable | Test.java:735:4:735:6 | out [post update] : Intent [android.content.Intent.extras, <map.value>] : Parcelable | provenance | MaD:49 |
+| Test.java:736:21:736:41 | getIntent_extras(...) : Bundle [<map.value>] : Parcelable | Test.java:736:9:736:42 | getMapValue(...) | provenance | MaD:175 |
 | Test.java:736:38:736:40 | out : Intent [android.content.Intent.extras, <map.value>] : Parcelable | Test.java:23:26:23:33 | i : Intent [android.content.Intent.extras, <map.value>] : Parcelable | provenance |  |
 | Test.java:736:38:736:40 | out : Intent [android.content.Intent.extras, <map.value>] : Parcelable | Test.java:23:26:23:33 | i : Intent [android.content.Intent.extras, <map.value>] : Parcelable | provenance |  |
-| Test.java:736:38:736:40 | out : Intent [android.content.Intent.extras, <map.value>] : Parcelable | Test.java:736:21:736:41 | getIntent_extras(...) : Bundle [<map.value>] : Parcelable | provenance | MaD:31 |
-| Test.java:736:38:736:40 | out : Intent [android.content.Intent.extras, <map.value>] : Parcelable | Test.java:736:21:736:41 | getIntent_extras(...) : Bundle [<map.value>] : Parcelable | provenance | MaD:31 |
+| Test.java:736:38:736:40 | out : Intent [android.content.Intent.extras, <map.value>] : Parcelable | Test.java:736:21:736:41 | getIntent_extras(...) : Bundle [<map.value>] : Parcelable | provenance | MaD:34 |
+| Test.java:736:38:736:40 | out : Intent [android.content.Intent.extras, <map.value>] : Parcelable | Test.java:736:21:736:41 | getIntent_extras(...) : Bundle [<map.value>] : Parcelable | provenance | MaD:34 |
 | Test.java:741:24:741:47 | (...)... : CharSequence[] | Test.java:742:31:742:32 | in : CharSequence[] | provenance |  |
 | Test.java:741:40:741:47 | source(...) : Object | Test.java:741:24:741:47 | (...)... : CharSequence[] | provenance |  |
 | Test.java:742:4:742:6 | out [post update] : Intent [android.content.Intent.extras, <map.value>] : CharSequence[] | Test.java:743:38:743:40 | out : Intent [android.content.Intent.extras, <map.value>] : CharSequence[] | provenance |  |
 | Test.java:742:4:742:6 | out [post update] : Intent [android.content.Intent.extras, <map.value>] : CharSequence[] | Test.java:743:38:743:40 | out : Intent [android.content.Intent.extras, <map.value>] : CharSequence[] | provenance |  |
-| Test.java:742:31:742:32 | in : CharSequence[] | Test.java:742:4:742:6 | out [post update] : Intent [android.content.Intent.extras, <map.value>] : CharSequence[] | provenance | MaD:50 |
-| Test.java:742:31:742:32 | in : CharSequence[] | Test.java:742:4:742:6 | out [post update] : Intent [android.content.Intent.extras, <map.value>] : CharSequence[] | provenance | MaD:50 |
-| Test.java:743:21:743:41 | getIntent_extras(...) : Bundle [<map.value>] : CharSequence[] | Test.java:743:9:743:42 | getMapValue(...) | provenance | MaD:179 |
+| Test.java:742:31:742:32 | in : CharSequence[] | Test.java:742:4:742:6 | out [post update] : Intent [android.content.Intent.extras, <map.value>] : CharSequence[] | provenance | MaD:49 |
+| Test.java:742:31:742:32 | in : CharSequence[] | Test.java:742:4:742:6 | out [post update] : Intent [android.content.Intent.extras, <map.value>] : CharSequence[] | provenance | MaD:49 |
+| Test.java:743:21:743:41 | getIntent_extras(...) : Bundle [<map.value>] : CharSequence[] | Test.java:743:9:743:42 | getMapValue(...) | provenance | MaD:175 |
 | Test.java:743:38:743:40 | out : Intent [android.content.Intent.extras, <map.value>] : CharSequence[] | Test.java:23:26:23:33 | i : Intent [android.content.Intent.extras, <map.value>] : CharSequence[] | provenance |  |
 | Test.java:743:38:743:40 | out : Intent [android.content.Intent.extras, <map.value>] : CharSequence[] | Test.java:23:26:23:33 | i : Intent [android.content.Intent.extras, <map.value>] : CharSequence[] | provenance |  |
-| Test.java:743:38:743:40 | out : Intent [android.content.Intent.extras, <map.value>] : CharSequence[] | Test.java:743:21:743:41 | getIntent_extras(...) : Bundle [<map.value>] : CharSequence[] | provenance | MaD:31 |
-| Test.java:743:38:743:40 | out : Intent [android.content.Intent.extras, <map.value>] : CharSequence[] | Test.java:743:21:743:41 | getIntent_extras(...) : Bundle [<map.value>] : CharSequence[] | provenance | MaD:31 |
+| Test.java:743:38:743:40 | out : Intent [android.content.Intent.extras, <map.value>] : CharSequence[] | Test.java:743:21:743:41 | getIntent_extras(...) : Bundle [<map.value>] : CharSequence[] | provenance | MaD:34 |
+| Test.java:743:38:743:40 | out : Intent [android.content.Intent.extras, <map.value>] : CharSequence[] | Test.java:743:21:743:41 | getIntent_extras(...) : Bundle [<map.value>] : CharSequence[] | provenance | MaD:34 |
 | Test.java:748:22:748:43 | (...)... : CharSequence | Test.java:749:31:749:32 | in : CharSequence | provenance |  |
 | Test.java:748:36:748:43 | source(...) : Object | Test.java:748:22:748:43 | (...)... : CharSequence | provenance |  |
 | Test.java:749:4:749:6 | out [post update] : Intent [android.content.Intent.extras, <map.value>] : CharSequence | Test.java:750:38:750:40 | out : Intent [android.content.Intent.extras, <map.value>] : CharSequence | provenance |  |
 | Test.java:749:4:749:6 | out [post update] : Intent [android.content.Intent.extras, <map.value>] : CharSequence | Test.java:750:38:750:40 | out : Intent [android.content.Intent.extras, <map.value>] : CharSequence | provenance |  |
-| Test.java:749:31:749:32 | in : CharSequence | Test.java:749:4:749:6 | out [post update] : Intent [android.content.Intent.extras, <map.value>] : CharSequence | provenance | MaD:50 |
-| Test.java:749:31:749:32 | in : CharSequence | Test.java:749:4:749:6 | out [post update] : Intent [android.content.Intent.extras, <map.value>] : CharSequence | provenance | MaD:50 |
-| Test.java:750:21:750:41 | getIntent_extras(...) : Bundle [<map.value>] : CharSequence | Test.java:750:9:750:42 | getMapValue(...) | provenance | MaD:179 |
+| Test.java:749:31:749:32 | in : CharSequence | Test.java:749:4:749:6 | out [post update] : Intent [android.content.Intent.extras, <map.value>] : CharSequence | provenance | MaD:49 |
+| Test.java:749:31:749:32 | in : CharSequence | Test.java:749:4:749:6 | out [post update] : Intent [android.content.Intent.extras, <map.value>] : CharSequence | provenance | MaD:49 |
+| Test.java:750:21:750:41 | getIntent_extras(...) : Bundle [<map.value>] : CharSequence | Test.java:750:9:750:42 | getMapValue(...) | provenance | MaD:175 |
 | Test.java:750:38:750:40 | out : Intent [android.content.Intent.extras, <map.value>] : CharSequence | Test.java:23:26:23:33 | i : Intent [android.content.Intent.extras, <map.value>] : CharSequence | provenance |  |
 | Test.java:750:38:750:40 | out : Intent [android.content.Intent.extras, <map.value>] : CharSequence | Test.java:23:26:23:33 | i : Intent [android.content.Intent.extras, <map.value>] : CharSequence | provenance |  |
-| Test.java:750:38:750:40 | out : Intent [android.content.Intent.extras, <map.value>] : CharSequence | Test.java:750:21:750:41 | getIntent_extras(...) : Bundle [<map.value>] : CharSequence | provenance | MaD:31 |
-| Test.java:750:38:750:40 | out : Intent [android.content.Intent.extras, <map.value>] : CharSequence | Test.java:750:21:750:41 | getIntent_extras(...) : Bundle [<map.value>] : CharSequence | provenance | MaD:31 |
+| Test.java:750:38:750:40 | out : Intent [android.content.Intent.extras, <map.value>] : CharSequence | Test.java:750:21:750:41 | getIntent_extras(...) : Bundle [<map.value>] : CharSequence | provenance | MaD:34 |
+| Test.java:750:38:750:40 | out : Intent [android.content.Intent.extras, <map.value>] : CharSequence | Test.java:750:21:750:41 | getIntent_extras(...) : Bundle [<map.value>] : CharSequence | provenance | MaD:34 |
 | Test.java:755:16:755:31 | (...)... : Bundle | Test.java:756:31:756:32 | in : Bundle | provenance |  |
 | Test.java:755:24:755:31 | source(...) : Object | Test.java:755:16:755:31 | (...)... : Bundle | provenance |  |
 | Test.java:756:4:756:6 | out [post update] : Intent [android.content.Intent.extras, <map.value>] : Bundle | Test.java:757:38:757:40 | out : Intent [android.content.Intent.extras, <map.value>] : Bundle | provenance |  |
 | Test.java:756:4:756:6 | out [post update] : Intent [android.content.Intent.extras, <map.value>] : Bundle | Test.java:757:38:757:40 | out : Intent [android.content.Intent.extras, <map.value>] : Bundle | provenance |  |
-| Test.java:756:31:756:32 | in : Bundle | Test.java:756:4:756:6 | out [post update] : Intent [android.content.Intent.extras, <map.value>] : Bundle | provenance | MaD:50 |
-| Test.java:756:31:756:32 | in : Bundle | Test.java:756:4:756:6 | out [post update] : Intent [android.content.Intent.extras, <map.value>] : Bundle | provenance | MaD:50 |
-| Test.java:757:21:757:41 | getIntent_extras(...) : Bundle [<map.value>] : Bundle | Test.java:757:9:757:42 | getMapValue(...) | provenance | MaD:179 |
+| Test.java:756:31:756:32 | in : Bundle | Test.java:756:4:756:6 | out [post update] : Intent [android.content.Intent.extras, <map.value>] : Bundle | provenance | MaD:49 |
+| Test.java:756:31:756:32 | in : Bundle | Test.java:756:4:756:6 | out [post update] : Intent [android.content.Intent.extras, <map.value>] : Bundle | provenance | MaD:49 |
+| Test.java:757:21:757:41 | getIntent_extras(...) : Bundle [<map.value>] : Bundle | Test.java:757:9:757:42 | getMapValue(...) | provenance | MaD:175 |
 | Test.java:757:38:757:40 | out : Intent [android.content.Intent.extras, <map.value>] : Bundle | Test.java:23:26:23:33 | i : Intent [android.content.Intent.extras, <map.value>] : Bundle | provenance |  |
 | Test.java:757:38:757:40 | out : Intent [android.content.Intent.extras, <map.value>] : Bundle | Test.java:23:26:23:33 | i : Intent [android.content.Intent.extras, <map.value>] : Bundle | provenance |  |
-| Test.java:757:38:757:40 | out : Intent [android.content.Intent.extras, <map.value>] : Bundle | Test.java:757:21:757:41 | getIntent_extras(...) : Bundle [<map.value>] : Bundle | provenance | MaD:31 |
-| Test.java:757:38:757:40 | out : Intent [android.content.Intent.extras, <map.value>] : Bundle | Test.java:757:21:757:41 | getIntent_extras(...) : Bundle [<map.value>] : Bundle | provenance | MaD:31 |
+| Test.java:757:38:757:40 | out : Intent [android.content.Intent.extras, <map.value>] : Bundle | Test.java:757:21:757:41 | getIntent_extras(...) : Bundle [<map.value>] : Bundle | provenance | MaD:34 |
+| Test.java:757:38:757:40 | out : Intent [android.content.Intent.extras, <map.value>] : Bundle | Test.java:757:21:757:41 | getIntent_extras(...) : Bundle [<map.value>] : Bundle | provenance | MaD:34 |
 | Test.java:762:16:762:31 | (...)... : Intent | Test.java:763:10:763:11 | in : Intent | provenance |  |
 | Test.java:762:24:762:31 | source(...) : Object | Test.java:762:16:762:31 | (...)... : Intent | provenance |  |
-| Test.java:763:10:763:11 | in : Intent | Test.java:763:10:763:35 | putExtras(...) : Intent | provenance | MaD:51 |
+| Test.java:763:10:763:11 | in : Intent | Test.java:763:10:763:35 | putExtras(...) : Intent | provenance | MaD:53 |
 | Test.java:763:10:763:35 | putExtras(...) : Intent | Test.java:764:9:764:11 | out | provenance |  |
 | Test.java:769:16:769:52 | (...)... : Bundle [<map.key>] : String | Test.java:770:18:770:19 | in : Bundle [<map.key>] : String | provenance |  |
 | Test.java:769:24:769:52 | newBundleWithMapKey(...) : Bundle [<map.key>] : String | Test.java:769:16:769:52 | (...)... : Bundle [<map.key>] : String | provenance |  |
@@ -1182,131 +1182,131 @@ edges
 | Test.java:769:44:769:51 | source(...) : String | Test.java:769:24:769:52 | newBundleWithMapKey(...) : Bundle [<map.key>] : String | provenance | MaD:105 |
 | Test.java:770:4:770:6 | out [post update] : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:771:36:771:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | provenance |  |
 | Test.java:770:4:770:6 | out [post update] : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:771:36:771:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | provenance |  |
-| Test.java:770:18:770:19 | in : Bundle [<map.key>] : String | Test.java:770:4:770:6 | out [post update] : Intent [android.content.Intent.extras, <map.key>] : String | provenance | MaD:52 |
-| Test.java:770:18:770:19 | in : Bundle [<map.key>] : String | Test.java:770:4:770:6 | out [post update] : Intent [android.content.Intent.extras, <map.key>] : String | provenance | MaD:52 |
+| Test.java:770:18:770:19 | in : Bundle [<map.key>] : String | Test.java:770:4:770:6 | out [post update] : Intent [android.content.Intent.extras, <map.key>] : String | provenance | MaD:51 |
+| Test.java:770:18:770:19 | in : Bundle [<map.key>] : String | Test.java:770:4:770:6 | out [post update] : Intent [android.content.Intent.extras, <map.key>] : String | provenance | MaD:51 |
 | Test.java:771:19:771:39 | getIntent_extras(...) : Bundle [<map.key>] : String | Test.java:24:19:24:30 | b : Bundle [<map.key>] : String | provenance |  |
 | Test.java:771:19:771:39 | getIntent_extras(...) : Bundle [<map.key>] : String | Test.java:771:9:771:40 | getMapKey(...) | provenance | MaD:98 |
 | Test.java:771:36:771:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:23:26:23:33 | i : Intent [android.content.Intent.extras, <map.key>] : String | provenance |  |
 | Test.java:771:36:771:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:23:26:23:33 | i : Intent [android.content.Intent.extras, <map.key>] : String | provenance |  |
-| Test.java:771:36:771:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:771:19:771:39 | getIntent_extras(...) : Bundle [<map.key>] : String | provenance | MaD:31 |
-| Test.java:771:36:771:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:771:19:771:39 | getIntent_extras(...) : Bundle [<map.key>] : String | provenance | MaD:31 |
+| Test.java:771:36:771:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:771:19:771:39 | getIntent_extras(...) : Bundle [<map.key>] : String | provenance | MaD:34 |
+| Test.java:771:36:771:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:771:19:771:39 | getIntent_extras(...) : Bundle [<map.key>] : String | provenance | MaD:34 |
 | Test.java:776:16:776:54 | (...)... : Bundle [<map.value>] : Object | Test.java:777:18:777:19 | in : Bundle [<map.value>] : Object | provenance |  |
 | Test.java:776:24:776:54 | newBundleWithMapValue(...) : Bundle [<map.value>] : Object | Test.java:776:16:776:54 | (...)... : Bundle [<map.value>] : Object | provenance |  |
-| Test.java:776:46:776:53 | source(...) : Object | Test.java:776:24:776:54 | newBundleWithMapValue(...) : Bundle [<map.value>] : Object | provenance | MaD:177 |
+| Test.java:776:46:776:53 | source(...) : Object | Test.java:776:24:776:54 | newBundleWithMapValue(...) : Bundle [<map.value>] : Object | provenance | MaD:176 |
 | Test.java:777:4:777:6 | out [post update] : Intent [android.content.Intent.extras, <map.value>] : Object | Test.java:778:38:778:40 | out : Intent [android.content.Intent.extras, <map.value>] : Object | provenance |  |
 | Test.java:777:4:777:6 | out [post update] : Intent [android.content.Intent.extras, <map.value>] : Object | Test.java:778:38:778:40 | out : Intent [android.content.Intent.extras, <map.value>] : Object | provenance |  |
-| Test.java:777:18:777:19 | in : Bundle [<map.value>] : Object | Test.java:777:4:777:6 | out [post update] : Intent [android.content.Intent.extras, <map.value>] : Object | provenance | MaD:53 |
-| Test.java:777:18:777:19 | in : Bundle [<map.value>] : Object | Test.java:777:4:777:6 | out [post update] : Intent [android.content.Intent.extras, <map.value>] : Object | provenance | MaD:53 |
-| Test.java:778:21:778:41 | getIntent_extras(...) : Bundle [<map.value>] : Object | Test.java:778:9:778:42 | getMapValue(...) | provenance | MaD:179 |
+| Test.java:777:18:777:19 | in : Bundle [<map.value>] : Object | Test.java:777:4:777:6 | out [post update] : Intent [android.content.Intent.extras, <map.value>] : Object | provenance | MaD:52 |
+| Test.java:777:18:777:19 | in : Bundle [<map.value>] : Object | Test.java:777:4:777:6 | out [post update] : Intent [android.content.Intent.extras, <map.value>] : Object | provenance | MaD:52 |
+| Test.java:778:21:778:41 | getIntent_extras(...) : Bundle [<map.value>] : Object | Test.java:778:9:778:42 | getMapValue(...) | provenance | MaD:175 |
 | Test.java:778:38:778:40 | out : Intent [android.content.Intent.extras, <map.value>] : Object | Test.java:23:26:23:33 | i : Intent [android.content.Intent.extras, <map.value>] : Object | provenance |  |
 | Test.java:778:38:778:40 | out : Intent [android.content.Intent.extras, <map.value>] : Object | Test.java:23:26:23:33 | i : Intent [android.content.Intent.extras, <map.value>] : Object | provenance |  |
-| Test.java:778:38:778:40 | out : Intent [android.content.Intent.extras, <map.value>] : Object | Test.java:778:21:778:41 | getIntent_extras(...) : Bundle [<map.value>] : Object | provenance | MaD:31 |
-| Test.java:778:38:778:40 | out : Intent [android.content.Intent.extras, <map.value>] : Object | Test.java:778:21:778:41 | getIntent_extras(...) : Bundle [<map.value>] : Object | provenance | MaD:31 |
+| Test.java:778:38:778:40 | out : Intent [android.content.Intent.extras, <map.value>] : Object | Test.java:778:21:778:41 | getIntent_extras(...) : Bundle [<map.value>] : Object | provenance | MaD:34 |
+| Test.java:778:38:778:40 | out : Intent [android.content.Intent.extras, <map.value>] : Object | Test.java:778:21:778:41 | getIntent_extras(...) : Bundle [<map.value>] : Object | provenance | MaD:34 |
 | Test.java:783:16:783:31 | (...)... : Intent | Test.java:784:10:784:11 | in : Intent | provenance |  |
 | Test.java:783:24:783:31 | source(...) : Object | Test.java:783:16:783:31 | (...)... : Intent | provenance |  |
-| Test.java:784:10:784:11 | in : Intent | Test.java:784:10:784:35 | putExtras(...) : Intent | provenance | MaD:54 |
+| Test.java:784:10:784:11 | in : Intent | Test.java:784:10:784:35 | putExtras(...) : Intent | provenance | MaD:56 |
 | Test.java:784:10:784:35 | putExtras(...) : Intent | Test.java:785:9:785:11 | out | provenance |  |
 | Test.java:790:16:790:74 | (...)... : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:791:18:791:19 | in : Intent [android.content.Intent.extras, <map.key>] : String | provenance |  |
 | Test.java:790:24:790:74 | newWithIntent_extras(...) : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:790:16:790:74 | (...)... : Intent [android.content.Intent.extras, <map.key>] : String | provenance |  |
-| Test.java:790:45:790:73 | newBundleWithMapKey(...) : Bundle [<map.key>] : String | Test.java:790:24:790:74 | newWithIntent_extras(...) : Intent [android.content.Intent.extras, <map.key>] : String | provenance | MaD:180 |
+| Test.java:790:45:790:73 | newBundleWithMapKey(...) : Bundle [<map.key>] : String | Test.java:790:24:790:74 | newWithIntent_extras(...) : Intent [android.content.Intent.extras, <map.key>] : String | provenance | MaD:178 |
 | Test.java:790:65:790:72 | source(...) : String | Test.java:28:29:28:36 | k : String | provenance |  |
 | Test.java:790:65:790:72 | source(...) : String | Test.java:790:45:790:73 | newBundleWithMapKey(...) : Bundle [<map.key>] : String | provenance | MaD:105 |
 | Test.java:791:4:791:6 | out [post update] : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:792:36:792:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | provenance |  |
 | Test.java:791:4:791:6 | out [post update] : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:792:36:792:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | provenance |  |
-| Test.java:791:18:791:19 | in : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:791:4:791:6 | out [post update] : Intent [android.content.Intent.extras, <map.key>] : String | provenance | MaD:55 |
-| Test.java:791:18:791:19 | in : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:791:4:791:6 | out [post update] : Intent [android.content.Intent.extras, <map.key>] : String | provenance | MaD:55 |
+| Test.java:791:18:791:19 | in : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:791:4:791:6 | out [post update] : Intent [android.content.Intent.extras, <map.key>] : String | provenance | MaD:54 |
+| Test.java:791:18:791:19 | in : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:791:4:791:6 | out [post update] : Intent [android.content.Intent.extras, <map.key>] : String | provenance | MaD:54 |
 | Test.java:792:19:792:39 | getIntent_extras(...) : Bundle [<map.key>] : String | Test.java:24:19:24:30 | b : Bundle [<map.key>] : String | provenance |  |
 | Test.java:792:19:792:39 | getIntent_extras(...) : Bundle [<map.key>] : String | Test.java:792:9:792:40 | getMapKey(...) | provenance | MaD:98 |
 | Test.java:792:36:792:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:23:26:23:33 | i : Intent [android.content.Intent.extras, <map.key>] : String | provenance |  |
 | Test.java:792:36:792:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:23:26:23:33 | i : Intent [android.content.Intent.extras, <map.key>] : String | provenance |  |
-| Test.java:792:36:792:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:792:19:792:39 | getIntent_extras(...) : Bundle [<map.key>] : String | provenance | MaD:31 |
-| Test.java:792:36:792:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:792:19:792:39 | getIntent_extras(...) : Bundle [<map.key>] : String | provenance | MaD:31 |
+| Test.java:792:36:792:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:792:19:792:39 | getIntent_extras(...) : Bundle [<map.key>] : String | provenance | MaD:34 |
+| Test.java:792:36:792:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:792:19:792:39 | getIntent_extras(...) : Bundle [<map.key>] : String | provenance | MaD:34 |
 | Test.java:797:16:797:76 | (...)... : Intent [android.content.Intent.extras, <map.value>] : Object | Test.java:798:18:798:19 | in : Intent [android.content.Intent.extras, <map.value>] : Object | provenance |  |
 | Test.java:797:24:797:76 | newWithIntent_extras(...) : Intent [android.content.Intent.extras, <map.value>] : Object | Test.java:797:16:797:76 | (...)... : Intent [android.content.Intent.extras, <map.value>] : Object | provenance |  |
-| Test.java:797:45:797:75 | newBundleWithMapValue(...) : Bundle [<map.value>] : Object | Test.java:797:24:797:76 | newWithIntent_extras(...) : Intent [android.content.Intent.extras, <map.value>] : Object | provenance | MaD:180 |
-| Test.java:797:67:797:74 | source(...) : Object | Test.java:797:45:797:75 | newBundleWithMapValue(...) : Bundle [<map.value>] : Object | provenance | MaD:177 |
+| Test.java:797:45:797:75 | newBundleWithMapValue(...) : Bundle [<map.value>] : Object | Test.java:797:24:797:76 | newWithIntent_extras(...) : Intent [android.content.Intent.extras, <map.value>] : Object | provenance | MaD:178 |
+| Test.java:797:67:797:74 | source(...) : Object | Test.java:797:45:797:75 | newBundleWithMapValue(...) : Bundle [<map.value>] : Object | provenance | MaD:176 |
 | Test.java:798:4:798:6 | out [post update] : Intent [android.content.Intent.extras, <map.value>] : Object | Test.java:799:38:799:40 | out : Intent [android.content.Intent.extras, <map.value>] : Object | provenance |  |
 | Test.java:798:4:798:6 | out [post update] : Intent [android.content.Intent.extras, <map.value>] : Object | Test.java:799:38:799:40 | out : Intent [android.content.Intent.extras, <map.value>] : Object | provenance |  |
-| Test.java:798:18:798:19 | in : Intent [android.content.Intent.extras, <map.value>] : Object | Test.java:798:4:798:6 | out [post update] : Intent [android.content.Intent.extras, <map.value>] : Object | provenance | MaD:56 |
-| Test.java:798:18:798:19 | in : Intent [android.content.Intent.extras, <map.value>] : Object | Test.java:798:4:798:6 | out [post update] : Intent [android.content.Intent.extras, <map.value>] : Object | provenance | MaD:56 |
-| Test.java:799:21:799:41 | getIntent_extras(...) : Bundle [<map.value>] : Object | Test.java:799:9:799:42 | getMapValue(...) | provenance | MaD:179 |
+| Test.java:798:18:798:19 | in : Intent [android.content.Intent.extras, <map.value>] : Object | Test.java:798:4:798:6 | out [post update] : Intent [android.content.Intent.extras, <map.value>] : Object | provenance | MaD:55 |
+| Test.java:798:18:798:19 | in : Intent [android.content.Intent.extras, <map.value>] : Object | Test.java:798:4:798:6 | out [post update] : Intent [android.content.Intent.extras, <map.value>] : Object | provenance | MaD:55 |
+| Test.java:799:21:799:41 | getIntent_extras(...) : Bundle [<map.value>] : Object | Test.java:799:9:799:42 | getMapValue(...) | provenance | MaD:175 |
 | Test.java:799:38:799:40 | out : Intent [android.content.Intent.extras, <map.value>] : Object | Test.java:23:26:23:33 | i : Intent [android.content.Intent.extras, <map.value>] : Object | provenance |  |
 | Test.java:799:38:799:40 | out : Intent [android.content.Intent.extras, <map.value>] : Object | Test.java:23:26:23:33 | i : Intent [android.content.Intent.extras, <map.value>] : Object | provenance |  |
-| Test.java:799:38:799:40 | out : Intent [android.content.Intent.extras, <map.value>] : Object | Test.java:799:21:799:41 | getIntent_extras(...) : Bundle [<map.value>] : Object | provenance | MaD:31 |
-| Test.java:799:38:799:40 | out : Intent [android.content.Intent.extras, <map.value>] : Object | Test.java:799:21:799:41 | getIntent_extras(...) : Bundle [<map.value>] : Object | provenance | MaD:31 |
+| Test.java:799:38:799:40 | out : Intent [android.content.Intent.extras, <map.value>] : Object | Test.java:799:21:799:41 | getIntent_extras(...) : Bundle [<map.value>] : Object | provenance | MaD:34 |
+| Test.java:799:38:799:40 | out : Intent [android.content.Intent.extras, <map.value>] : Object | Test.java:799:21:799:41 | getIntent_extras(...) : Bundle [<map.value>] : Object | provenance | MaD:34 |
 | Test.java:804:16:804:31 | (...)... : Intent | Test.java:805:10:805:11 | in : Intent | provenance |  |
 | Test.java:804:24:804:31 | source(...) : Object | Test.java:804:16:804:31 | (...)... : Intent | provenance |  |
-| Test.java:805:10:805:11 | in : Intent | Test.java:805:10:805:48 | putIntegerArrayListExtra(...) : Intent | provenance | MaD:57 |
+| Test.java:805:10:805:11 | in : Intent | Test.java:805:10:805:48 | putIntegerArrayListExtra(...) : Intent | provenance | MaD:58 |
 | Test.java:805:10:805:48 | putIntegerArrayListExtra(...) : Intent | Test.java:806:9:806:11 | out | provenance |  |
 | Test.java:811:16:811:31 | (...)... : String | Test.java:812:33:812:34 | in : String | provenance |  |
 | Test.java:811:24:811:31 | source(...) : Object | Test.java:811:16:811:31 | (...)... : String | provenance |  |
 | Test.java:812:4:812:6 | out [post update] : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:813:36:813:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | provenance |  |
 | Test.java:812:4:812:6 | out [post update] : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:813:36:813:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | provenance |  |
-| Test.java:812:33:812:34 | in : String | Test.java:812:4:812:6 | out [post update] : Intent [android.content.Intent.extras, <map.key>] : String | provenance | MaD:58 |
-| Test.java:812:33:812:34 | in : String | Test.java:812:4:812:6 | out [post update] : Intent [android.content.Intent.extras, <map.key>] : String | provenance | MaD:58 |
+| Test.java:812:33:812:34 | in : String | Test.java:812:4:812:6 | out [post update] : Intent [android.content.Intent.extras, <map.key>] : String | provenance | MaD:57 |
+| Test.java:812:33:812:34 | in : String | Test.java:812:4:812:6 | out [post update] : Intent [android.content.Intent.extras, <map.key>] : String | provenance | MaD:57 |
 | Test.java:813:19:813:39 | getIntent_extras(...) : Bundle [<map.key>] : String | Test.java:24:19:24:30 | b : Bundle [<map.key>] : String | provenance |  |
 | Test.java:813:19:813:39 | getIntent_extras(...) : Bundle [<map.key>] : String | Test.java:813:9:813:40 | getMapKey(...) | provenance | MaD:98 |
 | Test.java:813:36:813:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:23:26:23:33 | i : Intent [android.content.Intent.extras, <map.key>] : String | provenance |  |
 | Test.java:813:36:813:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:23:26:23:33 | i : Intent [android.content.Intent.extras, <map.key>] : String | provenance |  |
-| Test.java:813:36:813:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:813:19:813:39 | getIntent_extras(...) : Bundle [<map.key>] : String | provenance | MaD:31 |
-| Test.java:813:36:813:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:813:19:813:39 | getIntent_extras(...) : Bundle [<map.key>] : String | provenance | MaD:31 |
+| Test.java:813:36:813:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:813:19:813:39 | getIntent_extras(...) : Bundle [<map.key>] : String | provenance | MaD:34 |
+| Test.java:813:36:813:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:813:19:813:39 | getIntent_extras(...) : Bundle [<map.key>] : String | provenance | MaD:34 |
 | Test.java:818:16:818:31 | (...)... : Intent | Test.java:819:10:819:11 | in : Intent | provenance |  |
 | Test.java:818:24:818:31 | source(...) : Object | Test.java:818:16:818:31 | (...)... : Intent | provenance |  |
-| Test.java:819:10:819:11 | in : Intent | Test.java:819:10:819:51 | putParcelableArrayListExtra(...) : Intent | provenance | MaD:59 |
+| Test.java:819:10:819:11 | in : Intent | Test.java:819:10:819:51 | putParcelableArrayListExtra(...) : Intent | provenance | MaD:61 |
 | Test.java:819:10:819:51 | putParcelableArrayListExtra(...) : Intent | Test.java:820:9:820:11 | out | provenance |  |
 | Test.java:825:16:825:31 | (...)... : String | Test.java:826:36:826:37 | in : String | provenance |  |
 | Test.java:825:24:825:31 | source(...) : Object | Test.java:825:16:825:31 | (...)... : String | provenance |  |
 | Test.java:826:4:826:6 | out [post update] : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:827:36:827:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | provenance |  |
 | Test.java:826:4:826:6 | out [post update] : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:827:36:827:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | provenance |  |
-| Test.java:826:36:826:37 | in : String | Test.java:826:4:826:6 | out [post update] : Intent [android.content.Intent.extras, <map.key>] : String | provenance | MaD:60 |
-| Test.java:826:36:826:37 | in : String | Test.java:826:4:826:6 | out [post update] : Intent [android.content.Intent.extras, <map.key>] : String | provenance | MaD:60 |
+| Test.java:826:36:826:37 | in : String | Test.java:826:4:826:6 | out [post update] : Intent [android.content.Intent.extras, <map.key>] : String | provenance | MaD:59 |
+| Test.java:826:36:826:37 | in : String | Test.java:826:4:826:6 | out [post update] : Intent [android.content.Intent.extras, <map.key>] : String | provenance | MaD:59 |
 | Test.java:827:19:827:39 | getIntent_extras(...) : Bundle [<map.key>] : String | Test.java:24:19:24:30 | b : Bundle [<map.key>] : String | provenance |  |
 | Test.java:827:19:827:39 | getIntent_extras(...) : Bundle [<map.key>] : String | Test.java:827:9:827:40 | getMapKey(...) | provenance | MaD:98 |
 | Test.java:827:36:827:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:23:26:23:33 | i : Intent [android.content.Intent.extras, <map.key>] : String | provenance |  |
 | Test.java:827:36:827:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:23:26:23:33 | i : Intent [android.content.Intent.extras, <map.key>] : String | provenance |  |
-| Test.java:827:36:827:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:827:19:827:39 | getIntent_extras(...) : Bundle [<map.key>] : String | provenance | MaD:31 |
-| Test.java:827:36:827:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:827:19:827:39 | getIntent_extras(...) : Bundle [<map.key>] : String | provenance | MaD:31 |
+| Test.java:827:36:827:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:827:19:827:39 | getIntent_extras(...) : Bundle [<map.key>] : String | provenance | MaD:34 |
+| Test.java:827:36:827:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:827:19:827:39 | getIntent_extras(...) : Bundle [<map.key>] : String | provenance | MaD:34 |
 | Test.java:832:19:832:37 | (...)... : ArrayList | Test.java:833:42:833:43 | in : ArrayList | provenance |  |
 | Test.java:832:30:832:37 | source(...) : Object | Test.java:832:19:832:37 | (...)... : ArrayList | provenance |  |
 | Test.java:833:4:833:6 | out [post update] : Intent [android.content.Intent.extras, <map.value>] : ArrayList | Test.java:834:38:834:40 | out : Intent [android.content.Intent.extras, <map.value>] : ArrayList | provenance |  |
 | Test.java:833:4:833:6 | out [post update] : Intent [android.content.Intent.extras, <map.value>] : ArrayList | Test.java:834:38:834:40 | out : Intent [android.content.Intent.extras, <map.value>] : ArrayList | provenance |  |
-| Test.java:833:42:833:43 | in : ArrayList | Test.java:833:4:833:6 | out [post update] : Intent [android.content.Intent.extras, <map.value>] : ArrayList | provenance | MaD:61 |
-| Test.java:833:42:833:43 | in : ArrayList | Test.java:833:4:833:6 | out [post update] : Intent [android.content.Intent.extras, <map.value>] : ArrayList | provenance | MaD:61 |
-| Test.java:834:21:834:41 | getIntent_extras(...) : Bundle [<map.value>] : ArrayList | Test.java:834:9:834:42 | getMapValue(...) | provenance | MaD:179 |
+| Test.java:833:42:833:43 | in : ArrayList | Test.java:833:4:833:6 | out [post update] : Intent [android.content.Intent.extras, <map.value>] : ArrayList | provenance | MaD:60 |
+| Test.java:833:42:833:43 | in : ArrayList | Test.java:833:4:833:6 | out [post update] : Intent [android.content.Intent.extras, <map.value>] : ArrayList | provenance | MaD:60 |
+| Test.java:834:21:834:41 | getIntent_extras(...) : Bundle [<map.value>] : ArrayList | Test.java:834:9:834:42 | getMapValue(...) | provenance | MaD:175 |
 | Test.java:834:38:834:40 | out : Intent [android.content.Intent.extras, <map.value>] : ArrayList | Test.java:23:26:23:33 | i : Intent [android.content.Intent.extras, <map.value>] : ArrayList | provenance |  |
 | Test.java:834:38:834:40 | out : Intent [android.content.Intent.extras, <map.value>] : ArrayList | Test.java:23:26:23:33 | i : Intent [android.content.Intent.extras, <map.value>] : ArrayList | provenance |  |
-| Test.java:834:38:834:40 | out : Intent [android.content.Intent.extras, <map.value>] : ArrayList | Test.java:834:21:834:41 | getIntent_extras(...) : Bundle [<map.value>] : ArrayList | provenance | MaD:31 |
-| Test.java:834:38:834:40 | out : Intent [android.content.Intent.extras, <map.value>] : ArrayList | Test.java:834:21:834:41 | getIntent_extras(...) : Bundle [<map.value>] : ArrayList | provenance | MaD:31 |
+| Test.java:834:38:834:40 | out : Intent [android.content.Intent.extras, <map.value>] : ArrayList | Test.java:834:21:834:41 | getIntent_extras(...) : Bundle [<map.value>] : ArrayList | provenance | MaD:34 |
+| Test.java:834:38:834:40 | out : Intent [android.content.Intent.extras, <map.value>] : ArrayList | Test.java:834:21:834:41 | getIntent_extras(...) : Bundle [<map.value>] : ArrayList | provenance | MaD:34 |
 | Test.java:839:16:839:31 | (...)... : Intent | Test.java:840:10:840:11 | in : Intent | provenance |  |
 | Test.java:839:24:839:31 | source(...) : Object | Test.java:839:16:839:31 | (...)... : Intent | provenance |  |
-| Test.java:840:10:840:11 | in : Intent | Test.java:840:10:840:47 | putStringArrayListExtra(...) : Intent | provenance | MaD:62 |
+| Test.java:840:10:840:11 | in : Intent | Test.java:840:10:840:47 | putStringArrayListExtra(...) : Intent | provenance | MaD:64 |
 | Test.java:840:10:840:47 | putStringArrayListExtra(...) : Intent | Test.java:841:9:841:11 | out | provenance |  |
 | Test.java:846:16:846:31 | (...)... : String | Test.java:847:32:847:33 | in : String | provenance |  |
 | Test.java:846:24:846:31 | source(...) : Object | Test.java:846:16:846:31 | (...)... : String | provenance |  |
 | Test.java:847:4:847:6 | out [post update] : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:848:36:848:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | provenance |  |
 | Test.java:847:4:847:6 | out [post update] : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:848:36:848:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | provenance |  |
-| Test.java:847:32:847:33 | in : String | Test.java:847:4:847:6 | out [post update] : Intent [android.content.Intent.extras, <map.key>] : String | provenance | MaD:63 |
-| Test.java:847:32:847:33 | in : String | Test.java:847:4:847:6 | out [post update] : Intent [android.content.Intent.extras, <map.key>] : String | provenance | MaD:63 |
+| Test.java:847:32:847:33 | in : String | Test.java:847:4:847:6 | out [post update] : Intent [android.content.Intent.extras, <map.key>] : String | provenance | MaD:62 |
+| Test.java:847:32:847:33 | in : String | Test.java:847:4:847:6 | out [post update] : Intent [android.content.Intent.extras, <map.key>] : String | provenance | MaD:62 |
 | Test.java:848:19:848:39 | getIntent_extras(...) : Bundle [<map.key>] : String | Test.java:24:19:24:30 | b : Bundle [<map.key>] : String | provenance |  |
 | Test.java:848:19:848:39 | getIntent_extras(...) : Bundle [<map.key>] : String | Test.java:848:9:848:40 | getMapKey(...) | provenance | MaD:98 |
 | Test.java:848:36:848:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:23:26:23:33 | i : Intent [android.content.Intent.extras, <map.key>] : String | provenance |  |
 | Test.java:848:36:848:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:23:26:23:33 | i : Intent [android.content.Intent.extras, <map.key>] : String | provenance |  |
-| Test.java:848:36:848:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:848:19:848:39 | getIntent_extras(...) : Bundle [<map.key>] : String | provenance | MaD:31 |
-| Test.java:848:36:848:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:848:19:848:39 | getIntent_extras(...) : Bundle [<map.key>] : String | provenance | MaD:31 |
+| Test.java:848:36:848:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:848:19:848:39 | getIntent_extras(...) : Bundle [<map.key>] : String | provenance | MaD:34 |
+| Test.java:848:36:848:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:848:19:848:39 | getIntent_extras(...) : Bundle [<map.key>] : String | provenance | MaD:34 |
 | Test.java:853:19:853:37 | (...)... : ArrayList | Test.java:854:38:854:39 | in : ArrayList | provenance |  |
 | Test.java:853:30:853:37 | source(...) : Object | Test.java:853:19:853:37 | (...)... : ArrayList | provenance |  |
 | Test.java:854:4:854:6 | out [post update] : Intent [android.content.Intent.extras, <map.value>] : ArrayList | Test.java:855:38:855:40 | out : Intent [android.content.Intent.extras, <map.value>] : ArrayList | provenance |  |
 | Test.java:854:4:854:6 | out [post update] : Intent [android.content.Intent.extras, <map.value>] : ArrayList | Test.java:855:38:855:40 | out : Intent [android.content.Intent.extras, <map.value>] : ArrayList | provenance |  |
-| Test.java:854:38:854:39 | in : ArrayList | Test.java:854:4:854:6 | out [post update] : Intent [android.content.Intent.extras, <map.value>] : ArrayList | provenance | MaD:64 |
-| Test.java:854:38:854:39 | in : ArrayList | Test.java:854:4:854:6 | out [post update] : Intent [android.content.Intent.extras, <map.value>] : ArrayList | provenance | MaD:64 |
-| Test.java:855:21:855:41 | getIntent_extras(...) : Bundle [<map.value>] : ArrayList | Test.java:855:9:855:42 | getMapValue(...) | provenance | MaD:179 |
+| Test.java:854:38:854:39 | in : ArrayList | Test.java:854:4:854:6 | out [post update] : Intent [android.content.Intent.extras, <map.value>] : ArrayList | provenance | MaD:63 |
+| Test.java:854:38:854:39 | in : ArrayList | Test.java:854:4:854:6 | out [post update] : Intent [android.content.Intent.extras, <map.value>] : ArrayList | provenance | MaD:63 |
+| Test.java:855:21:855:41 | getIntent_extras(...) : Bundle [<map.value>] : ArrayList | Test.java:855:9:855:42 | getMapValue(...) | provenance | MaD:175 |
 | Test.java:855:38:855:40 | out : Intent [android.content.Intent.extras, <map.value>] : ArrayList | Test.java:23:26:23:33 | i : Intent [android.content.Intent.extras, <map.value>] : ArrayList | provenance |  |
 | Test.java:855:38:855:40 | out : Intent [android.content.Intent.extras, <map.value>] : ArrayList | Test.java:23:26:23:33 | i : Intent [android.content.Intent.extras, <map.value>] : ArrayList | provenance |  |
-| Test.java:855:38:855:40 | out : Intent [android.content.Intent.extras, <map.value>] : ArrayList | Test.java:855:21:855:41 | getIntent_extras(...) : Bundle [<map.value>] : ArrayList | provenance | MaD:31 |
-| Test.java:855:38:855:40 | out : Intent [android.content.Intent.extras, <map.value>] : ArrayList | Test.java:855:21:855:41 | getIntent_extras(...) : Bundle [<map.value>] : ArrayList | provenance | MaD:31 |
+| Test.java:855:38:855:40 | out : Intent [android.content.Intent.extras, <map.value>] : ArrayList | Test.java:855:21:855:41 | getIntent_extras(...) : Bundle [<map.value>] : ArrayList | provenance | MaD:34 |
+| Test.java:855:38:855:40 | out : Intent [android.content.Intent.extras, <map.value>] : ArrayList | Test.java:855:21:855:41 | getIntent_extras(...) : Bundle [<map.value>] : ArrayList | provenance | MaD:34 |
 | Test.java:860:16:860:31 | (...)... : Intent | Test.java:861:10:861:11 | in : Intent | provenance |  |
 | Test.java:860:24:860:31 | source(...) : Object | Test.java:860:16:860:31 | (...)... : Intent | provenance |  |
-| Test.java:861:10:861:11 | in : Intent | Test.java:861:10:861:39 | replaceExtras(...) : Intent | provenance | MaD:65 |
+| Test.java:861:10:861:11 | in : Intent | Test.java:861:10:861:39 | replaceExtras(...) : Intent | provenance | MaD:67 |
 | Test.java:861:10:861:39 | replaceExtras(...) : Intent | Test.java:862:9:862:11 | out | provenance |  |
 | Test.java:867:16:867:52 | (...)... : Bundle [<map.key>] : String | Test.java:868:22:868:23 | in : Bundle [<map.key>] : String | provenance |  |
 | Test.java:867:24:867:52 | newBundleWithMapKey(...) : Bundle [<map.key>] : String | Test.java:867:16:867:52 | (...)... : Bundle [<map.key>] : String | provenance |  |
@@ -1314,113 +1314,113 @@ edges
 | Test.java:867:44:867:51 | source(...) : String | Test.java:867:24:867:52 | newBundleWithMapKey(...) : Bundle [<map.key>] : String | provenance | MaD:105 |
 | Test.java:868:4:868:6 | out [post update] : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:869:36:869:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | provenance |  |
 | Test.java:868:4:868:6 | out [post update] : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:869:36:869:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | provenance |  |
-| Test.java:868:22:868:23 | in : Bundle [<map.key>] : String | Test.java:868:4:868:6 | out [post update] : Intent [android.content.Intent.extras, <map.key>] : String | provenance | MaD:66 |
-| Test.java:868:22:868:23 | in : Bundle [<map.key>] : String | Test.java:868:4:868:6 | out [post update] : Intent [android.content.Intent.extras, <map.key>] : String | provenance | MaD:66 |
+| Test.java:868:22:868:23 | in : Bundle [<map.key>] : String | Test.java:868:4:868:6 | out [post update] : Intent [android.content.Intent.extras, <map.key>] : String | provenance | MaD:65 |
+| Test.java:868:22:868:23 | in : Bundle [<map.key>] : String | Test.java:868:4:868:6 | out [post update] : Intent [android.content.Intent.extras, <map.key>] : String | provenance | MaD:65 |
 | Test.java:869:19:869:39 | getIntent_extras(...) : Bundle [<map.key>] : String | Test.java:24:19:24:30 | b : Bundle [<map.key>] : String | provenance |  |
 | Test.java:869:19:869:39 | getIntent_extras(...) : Bundle [<map.key>] : String | Test.java:869:9:869:40 | getMapKey(...) | provenance | MaD:98 |
 | Test.java:869:36:869:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:23:26:23:33 | i : Intent [android.content.Intent.extras, <map.key>] : String | provenance |  |
 | Test.java:869:36:869:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:23:26:23:33 | i : Intent [android.content.Intent.extras, <map.key>] : String | provenance |  |
-| Test.java:869:36:869:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:869:19:869:39 | getIntent_extras(...) : Bundle [<map.key>] : String | provenance | MaD:31 |
-| Test.java:869:36:869:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:869:19:869:39 | getIntent_extras(...) : Bundle [<map.key>] : String | provenance | MaD:31 |
+| Test.java:869:36:869:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:869:19:869:39 | getIntent_extras(...) : Bundle [<map.key>] : String | provenance | MaD:34 |
+| Test.java:869:36:869:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:869:19:869:39 | getIntent_extras(...) : Bundle [<map.key>] : String | provenance | MaD:34 |
 | Test.java:874:16:874:54 | (...)... : Bundle [<map.value>] : Object | Test.java:875:22:875:23 | in : Bundle [<map.value>] : Object | provenance |  |
 | Test.java:874:24:874:54 | newBundleWithMapValue(...) : Bundle [<map.value>] : Object | Test.java:874:16:874:54 | (...)... : Bundle [<map.value>] : Object | provenance |  |
-| Test.java:874:46:874:53 | source(...) : Object | Test.java:874:24:874:54 | newBundleWithMapValue(...) : Bundle [<map.value>] : Object | provenance | MaD:177 |
+| Test.java:874:46:874:53 | source(...) : Object | Test.java:874:24:874:54 | newBundleWithMapValue(...) : Bundle [<map.value>] : Object | provenance | MaD:176 |
 | Test.java:875:4:875:6 | out [post update] : Intent [android.content.Intent.extras, <map.value>] : Object | Test.java:876:38:876:40 | out : Intent [android.content.Intent.extras, <map.value>] : Object | provenance |  |
 | Test.java:875:4:875:6 | out [post update] : Intent [android.content.Intent.extras, <map.value>] : Object | Test.java:876:38:876:40 | out : Intent [android.content.Intent.extras, <map.value>] : Object | provenance |  |
-| Test.java:875:22:875:23 | in : Bundle [<map.value>] : Object | Test.java:875:4:875:6 | out [post update] : Intent [android.content.Intent.extras, <map.value>] : Object | provenance | MaD:67 |
-| Test.java:875:22:875:23 | in : Bundle [<map.value>] : Object | Test.java:875:4:875:6 | out [post update] : Intent [android.content.Intent.extras, <map.value>] : Object | provenance | MaD:67 |
-| Test.java:876:21:876:41 | getIntent_extras(...) : Bundle [<map.value>] : Object | Test.java:876:9:876:42 | getMapValue(...) | provenance | MaD:179 |
+| Test.java:875:22:875:23 | in : Bundle [<map.value>] : Object | Test.java:875:4:875:6 | out [post update] : Intent [android.content.Intent.extras, <map.value>] : Object | provenance | MaD:66 |
+| Test.java:875:22:875:23 | in : Bundle [<map.value>] : Object | Test.java:875:4:875:6 | out [post update] : Intent [android.content.Intent.extras, <map.value>] : Object | provenance | MaD:66 |
+| Test.java:876:21:876:41 | getIntent_extras(...) : Bundle [<map.value>] : Object | Test.java:876:9:876:42 | getMapValue(...) | provenance | MaD:175 |
 | Test.java:876:38:876:40 | out : Intent [android.content.Intent.extras, <map.value>] : Object | Test.java:23:26:23:33 | i : Intent [android.content.Intent.extras, <map.value>] : Object | provenance |  |
 | Test.java:876:38:876:40 | out : Intent [android.content.Intent.extras, <map.value>] : Object | Test.java:23:26:23:33 | i : Intent [android.content.Intent.extras, <map.value>] : Object | provenance |  |
-| Test.java:876:38:876:40 | out : Intent [android.content.Intent.extras, <map.value>] : Object | Test.java:876:21:876:41 | getIntent_extras(...) : Bundle [<map.value>] : Object | provenance | MaD:31 |
-| Test.java:876:38:876:40 | out : Intent [android.content.Intent.extras, <map.value>] : Object | Test.java:876:21:876:41 | getIntent_extras(...) : Bundle [<map.value>] : Object | provenance | MaD:31 |
+| Test.java:876:38:876:40 | out : Intent [android.content.Intent.extras, <map.value>] : Object | Test.java:876:21:876:41 | getIntent_extras(...) : Bundle [<map.value>] : Object | provenance | MaD:34 |
+| Test.java:876:38:876:40 | out : Intent [android.content.Intent.extras, <map.value>] : Object | Test.java:876:21:876:41 | getIntent_extras(...) : Bundle [<map.value>] : Object | provenance | MaD:34 |
 | Test.java:881:16:881:31 | (...)... : Intent | Test.java:882:10:882:11 | in : Intent | provenance |  |
 | Test.java:881:24:881:31 | source(...) : Object | Test.java:881:16:881:31 | (...)... : Intent | provenance |  |
-| Test.java:882:10:882:11 | in : Intent | Test.java:882:10:882:39 | replaceExtras(...) : Intent | provenance | MaD:68 |
+| Test.java:882:10:882:11 | in : Intent | Test.java:882:10:882:39 | replaceExtras(...) : Intent | provenance | MaD:70 |
 | Test.java:882:10:882:39 | replaceExtras(...) : Intent | Test.java:883:9:883:11 | out | provenance |  |
 | Test.java:888:16:888:74 | (...)... : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:889:22:889:23 | in : Intent [android.content.Intent.extras, <map.key>] : String | provenance |  |
 | Test.java:888:24:888:74 | newWithIntent_extras(...) : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:888:16:888:74 | (...)... : Intent [android.content.Intent.extras, <map.key>] : String | provenance |  |
-| Test.java:888:45:888:73 | newBundleWithMapKey(...) : Bundle [<map.key>] : String | Test.java:888:24:888:74 | newWithIntent_extras(...) : Intent [android.content.Intent.extras, <map.key>] : String | provenance | MaD:180 |
+| Test.java:888:45:888:73 | newBundleWithMapKey(...) : Bundle [<map.key>] : String | Test.java:888:24:888:74 | newWithIntent_extras(...) : Intent [android.content.Intent.extras, <map.key>] : String | provenance | MaD:178 |
 | Test.java:888:65:888:72 | source(...) : String | Test.java:28:29:28:36 | k : String | provenance |  |
 | Test.java:888:65:888:72 | source(...) : String | Test.java:888:45:888:73 | newBundleWithMapKey(...) : Bundle [<map.key>] : String | provenance | MaD:105 |
 | Test.java:889:4:889:6 | out [post update] : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:890:36:890:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | provenance |  |
 | Test.java:889:4:889:6 | out [post update] : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:890:36:890:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | provenance |  |
-| Test.java:889:22:889:23 | in : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:889:4:889:6 | out [post update] : Intent [android.content.Intent.extras, <map.key>] : String | provenance | MaD:69 |
-| Test.java:889:22:889:23 | in : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:889:4:889:6 | out [post update] : Intent [android.content.Intent.extras, <map.key>] : String | provenance | MaD:69 |
+| Test.java:889:22:889:23 | in : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:889:4:889:6 | out [post update] : Intent [android.content.Intent.extras, <map.key>] : String | provenance | MaD:68 |
+| Test.java:889:22:889:23 | in : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:889:4:889:6 | out [post update] : Intent [android.content.Intent.extras, <map.key>] : String | provenance | MaD:68 |
 | Test.java:890:19:890:39 | getIntent_extras(...) : Bundle [<map.key>] : String | Test.java:24:19:24:30 | b : Bundle [<map.key>] : String | provenance |  |
 | Test.java:890:19:890:39 | getIntent_extras(...) : Bundle [<map.key>] : String | Test.java:890:9:890:40 | getMapKey(...) | provenance | MaD:98 |
 | Test.java:890:36:890:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:23:26:23:33 | i : Intent [android.content.Intent.extras, <map.key>] : String | provenance |  |
 | Test.java:890:36:890:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:23:26:23:33 | i : Intent [android.content.Intent.extras, <map.key>] : String | provenance |  |
-| Test.java:890:36:890:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:890:19:890:39 | getIntent_extras(...) : Bundle [<map.key>] : String | provenance | MaD:31 |
-| Test.java:890:36:890:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:890:19:890:39 | getIntent_extras(...) : Bundle [<map.key>] : String | provenance | MaD:31 |
+| Test.java:890:36:890:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:890:19:890:39 | getIntent_extras(...) : Bundle [<map.key>] : String | provenance | MaD:34 |
+| Test.java:890:36:890:38 | out : Intent [android.content.Intent.extras, <map.key>] : String | Test.java:890:19:890:39 | getIntent_extras(...) : Bundle [<map.key>] : String | provenance | MaD:34 |
 | Test.java:895:16:895:76 | (...)... : Intent [android.content.Intent.extras, <map.value>] : Object | Test.java:896:22:896:23 | in : Intent [android.content.Intent.extras, <map.value>] : Object | provenance |  |
 | Test.java:895:24:895:76 | newWithIntent_extras(...) : Intent [android.content.Intent.extras, <map.value>] : Object | Test.java:895:16:895:76 | (...)... : Intent [android.content.Intent.extras, <map.value>] : Object | provenance |  |
-| Test.java:895:45:895:75 | newBundleWithMapValue(...) : Bundle [<map.value>] : Object | Test.java:895:24:895:76 | newWithIntent_extras(...) : Intent [android.content.Intent.extras, <map.value>] : Object | provenance | MaD:180 |
-| Test.java:895:67:895:74 | source(...) : Object | Test.java:895:45:895:75 | newBundleWithMapValue(...) : Bundle [<map.value>] : Object | provenance | MaD:177 |
+| Test.java:895:45:895:75 | newBundleWithMapValue(...) : Bundle [<map.value>] : Object | Test.java:895:24:895:76 | newWithIntent_extras(...) : Intent [android.content.Intent.extras, <map.value>] : Object | provenance | MaD:178 |
+| Test.java:895:67:895:74 | source(...) : Object | Test.java:895:45:895:75 | newBundleWithMapValue(...) : Bundle [<map.value>] : Object | provenance | MaD:176 |
 | Test.java:896:4:896:6 | out [post update] : Intent [android.content.Intent.extras, <map.value>] : Object | Test.java:897:38:897:40 | out : Intent [android.content.Intent.extras, <map.value>] : Object | provenance |  |
 | Test.java:896:4:896:6 | out [post update] : Intent [android.content.Intent.extras, <map.value>] : Object | Test.java:897:38:897:40 | out : Intent [android.content.Intent.extras, <map.value>] : Object | provenance |  |
-| Test.java:896:22:896:23 | in : Intent [android.content.Intent.extras, <map.value>] : Object | Test.java:896:4:896:6 | out [post update] : Intent [android.content.Intent.extras, <map.value>] : Object | provenance | MaD:70 |
-| Test.java:896:22:896:23 | in : Intent [android.content.Intent.extras, <map.value>] : Object | Test.java:896:4:896:6 | out [post update] : Intent [android.content.Intent.extras, <map.value>] : Object | provenance | MaD:70 |
-| Test.java:897:21:897:41 | getIntent_extras(...) : Bundle [<map.value>] : Object | Test.java:897:9:897:42 | getMapValue(...) | provenance | MaD:179 |
+| Test.java:896:22:896:23 | in : Intent [android.content.Intent.extras, <map.value>] : Object | Test.java:896:4:896:6 | out [post update] : Intent [android.content.Intent.extras, <map.value>] : Object | provenance | MaD:69 |
+| Test.java:896:22:896:23 | in : Intent [android.content.Intent.extras, <map.value>] : Object | Test.java:896:4:896:6 | out [post update] : Intent [android.content.Intent.extras, <map.value>] : Object | provenance | MaD:69 |
+| Test.java:897:21:897:41 | getIntent_extras(...) : Bundle [<map.value>] : Object | Test.java:897:9:897:42 | getMapValue(...) | provenance | MaD:175 |
 | Test.java:897:38:897:40 | out : Intent [android.content.Intent.extras, <map.value>] : Object | Test.java:23:26:23:33 | i : Intent [android.content.Intent.extras, <map.value>] : Object | provenance |  |
 | Test.java:897:38:897:40 | out : Intent [android.content.Intent.extras, <map.value>] : Object | Test.java:23:26:23:33 | i : Intent [android.content.Intent.extras, <map.value>] : Object | provenance |  |
-| Test.java:897:38:897:40 | out : Intent [android.content.Intent.extras, <map.value>] : Object | Test.java:897:21:897:41 | getIntent_extras(...) : Bundle [<map.value>] : Object | provenance | MaD:31 |
-| Test.java:897:38:897:40 | out : Intent [android.content.Intent.extras, <map.value>] : Object | Test.java:897:21:897:41 | getIntent_extras(...) : Bundle [<map.value>] : Object | provenance | MaD:31 |
+| Test.java:897:38:897:40 | out : Intent [android.content.Intent.extras, <map.value>] : Object | Test.java:897:21:897:41 | getIntent_extras(...) : Bundle [<map.value>] : Object | provenance | MaD:34 |
+| Test.java:897:38:897:40 | out : Intent [android.content.Intent.extras, <map.value>] : Object | Test.java:897:21:897:41 | getIntent_extras(...) : Bundle [<map.value>] : Object | provenance | MaD:34 |
 | Test.java:902:16:902:31 | (...)... : Intent | Test.java:903:10:903:11 | in : Intent | provenance |  |
 | Test.java:902:24:902:31 | source(...) : Object | Test.java:902:16:902:31 | (...)... : Intent | provenance |  |
 | Test.java:903:10:903:11 | in : Intent | Test.java:903:10:903:27 | setAction(...) : Intent | provenance | MaD:71 |
 | Test.java:903:10:903:27 | setAction(...) : Intent | Test.java:904:9:904:11 | out | provenance |  |
 | Test.java:909:16:909:31 | (...)... : Intent | Test.java:910:10:910:11 | in : Intent | provenance |  |
 | Test.java:909:24:909:31 | source(...) : Object | Test.java:909:16:909:31 | (...)... : Intent | provenance |  |
-| Test.java:910:10:910:11 | in : Intent | Test.java:910:10:910:32 | setClass(...) : Intent | provenance | MaD:72 |
+| Test.java:910:10:910:11 | in : Intent | Test.java:910:10:910:32 | setClass(...) : Intent | provenance | MaD:73 |
 | Test.java:910:10:910:32 | setClass(...) : Intent | Test.java:911:9:911:11 | out | provenance |  |
 | Test.java:916:16:916:31 | (...)... : Intent | Test.java:917:10:917:11 | in : Intent | provenance |  |
 | Test.java:916:24:916:31 | source(...) : Object | Test.java:916:16:916:31 | (...)... : Intent | provenance |  |
-| Test.java:917:10:917:11 | in : Intent | Test.java:917:10:917:52 | setClassName(...) : Intent | provenance | MaD:74 |
+| Test.java:917:10:917:11 | in : Intent | Test.java:917:10:917:52 | setClassName(...) : Intent | provenance | MaD:76 |
 | Test.java:917:10:917:52 | setClassName(...) : Intent | Test.java:918:9:918:11 | out | provenance |  |
 | Test.java:923:16:923:31 | (...)... : Intent | Test.java:924:10:924:11 | in : Intent | provenance |  |
 | Test.java:923:24:923:31 | source(...) : Object | Test.java:923:16:923:31 | (...)... : Intent | provenance |  |
-| Test.java:924:10:924:11 | in : Intent | Test.java:924:10:924:53 | setClassName(...) : Intent | provenance | MaD:74 |
+| Test.java:924:10:924:11 | in : Intent | Test.java:924:10:924:53 | setClassName(...) : Intent | provenance | MaD:76 |
 | Test.java:924:10:924:53 | setClassName(...) : Intent | Test.java:925:9:925:11 | out | provenance |  |
 | Test.java:930:16:930:31 | (...)... : Intent | Test.java:931:10:931:11 | in : Intent | provenance |  |
 | Test.java:930:24:930:31 | source(...) : Object | Test.java:930:16:930:31 | (...)... : Intent | provenance |  |
-| Test.java:931:10:931:11 | in : Intent | Test.java:931:10:931:30 | setComponent(...) : Intent | provenance | MaD:77 |
+| Test.java:931:10:931:11 | in : Intent | Test.java:931:10:931:30 | setComponent(...) : Intent | provenance | MaD:78 |
 | Test.java:931:10:931:30 | setComponent(...) : Intent | Test.java:932:9:932:11 | out | provenance |  |
 | Test.java:937:16:937:31 | (...)... : Intent | Test.java:938:10:938:11 | in : Intent | provenance |  |
 | Test.java:937:24:937:31 | source(...) : Object | Test.java:937:16:937:31 | (...)... : Intent | provenance |  |
-| Test.java:938:10:938:11 | in : Intent | Test.java:938:10:938:25 | setData(...) : Intent | provenance | MaD:79 |
+| Test.java:938:10:938:11 | in : Intent | Test.java:938:10:938:25 | setData(...) : Intent | provenance | MaD:80 |
 | Test.java:938:10:938:25 | setData(...) : Intent | Test.java:939:9:939:11 | out | provenance |  |
 | Test.java:943:13:943:25 | (...)... : Uri | Test.java:945:21:945:22 | in : Uri | provenance |  |
 | Test.java:943:18:943:25 | source(...) : Object | Test.java:943:13:943:25 | (...)... : Uri | provenance |  |
 | Test.java:945:4:945:11 | instance [post update] : Intent [android.content.Intent.data] : Uri | Test.java:946:9:946:16 | instance : Intent [android.content.Intent.data] : Uri | provenance |  |
-| Test.java:945:21:945:22 | in : Uri | Test.java:945:4:945:11 | instance [post update] : Intent [android.content.Intent.data] : Uri | provenance | MaD:80 |
-| Test.java:946:9:946:16 | instance : Intent [android.content.Intent.data] : Uri | Test.java:946:9:946:26 | getData(...) | provenance | MaD:29 |
+| Test.java:945:21:945:22 | in : Uri | Test.java:945:4:945:11 | instance [post update] : Intent [android.content.Intent.data] : Uri | provenance | MaD:79 |
+| Test.java:946:9:946:16 | instance : Intent [android.content.Intent.data] : Uri | Test.java:946:9:946:26 | getData(...) | provenance | MaD:32 |
 | Test.java:950:13:950:25 | (...)... : Uri | Test.java:952:33:952:34 | in : Uri | provenance |  |
 | Test.java:950:18:950:25 | source(...) : Object | Test.java:950:13:950:25 | (...)... : Uri | provenance |  |
 | Test.java:952:4:952:11 | instance [post update] : Intent [android.content.Intent.data] : Uri | Test.java:953:9:953:16 | instance : Intent [android.content.Intent.data] : Uri | provenance |  |
-| Test.java:952:33:952:34 | in : Uri | Test.java:952:4:952:11 | instance [post update] : Intent [android.content.Intent.data] : Uri | provenance | MaD:82 |
-| Test.java:953:9:953:16 | instance : Intent [android.content.Intent.data] : Uri | Test.java:953:9:953:26 | getData(...) | provenance | MaD:29 |
+| Test.java:952:33:952:34 | in : Uri | Test.java:952:4:952:11 | instance [post update] : Intent [android.content.Intent.data] : Uri | provenance | MaD:81 |
+| Test.java:953:9:953:16 | instance : Intent [android.content.Intent.data] : Uri | Test.java:953:9:953:26 | getData(...) | provenance | MaD:32 |
 | Test.java:957:13:957:25 | (...)... : Uri | Test.java:959:28:959:29 | in : Uri | provenance |  |
 | Test.java:957:18:957:25 | source(...) : Object | Test.java:957:13:957:25 | (...)... : Uri | provenance |  |
 | Test.java:959:4:959:11 | instance [post update] : Intent [android.content.Intent.data] : Uri | Test.java:960:9:960:16 | instance : Intent [android.content.Intent.data] : Uri | provenance |  |
-| Test.java:959:28:959:29 | in : Uri | Test.java:959:4:959:11 | instance [post update] : Intent [android.content.Intent.data] : Uri | provenance | MaD:84 |
-| Test.java:960:9:960:16 | instance : Intent [android.content.Intent.data] : Uri | Test.java:960:9:960:26 | getData(...) | provenance | MaD:29 |
+| Test.java:959:28:959:29 | in : Uri | Test.java:959:4:959:11 | instance [post update] : Intent [android.content.Intent.data] : Uri | provenance | MaD:83 |
+| Test.java:960:9:960:16 | instance : Intent [android.content.Intent.data] : Uri | Test.java:960:9:960:26 | getData(...) | provenance | MaD:32 |
 | Test.java:964:13:964:25 | (...)... : Uri | Test.java:966:40:966:41 | in : Uri | provenance |  |
 | Test.java:964:18:964:25 | source(...) : Object | Test.java:964:13:964:25 | (...)... : Uri | provenance |  |
 | Test.java:966:4:966:11 | instance [post update] : Intent [android.content.Intent.data] : Uri | Test.java:967:9:967:16 | instance : Intent [android.content.Intent.data] : Uri | provenance |  |
-| Test.java:966:40:966:41 | in : Uri | Test.java:966:4:966:11 | instance [post update] : Intent [android.content.Intent.data] : Uri | provenance | MaD:86 |
-| Test.java:967:9:967:16 | instance : Intent [android.content.Intent.data] : Uri | Test.java:967:9:967:26 | getData(...) | provenance | MaD:29 |
+| Test.java:966:40:966:41 | in : Uri | Test.java:966:4:966:11 | instance [post update] : Intent [android.content.Intent.data] : Uri | provenance | MaD:85 |
+| Test.java:967:9:967:16 | instance : Intent [android.content.Intent.data] : Uri | Test.java:967:9:967:26 | getData(...) | provenance | MaD:32 |
 | Test.java:972:16:972:31 | (...)... : Intent | Test.java:973:10:973:11 | in : Intent | provenance |  |
 | Test.java:972:24:972:31 | source(...) : Object | Test.java:972:16:972:31 | (...)... : Intent | provenance |  |
-| Test.java:973:10:973:11 | in : Intent | Test.java:973:10:973:37 | setDataAndNormalize(...) : Intent | provenance | MaD:81 |
+| Test.java:973:10:973:11 | in : Intent | Test.java:973:10:973:37 | setDataAndNormalize(...) : Intent | provenance | MaD:82 |
 | Test.java:973:10:973:37 | setDataAndNormalize(...) : Intent | Test.java:974:9:974:11 | out | provenance |  |
 | Test.java:979:16:979:31 | (...)... : Intent | Test.java:980:10:980:11 | in : Intent | provenance |  |
 | Test.java:979:24:979:31 | source(...) : Object | Test.java:979:16:979:31 | (...)... : Intent | provenance |  |
-| Test.java:980:10:980:11 | in : Intent | Test.java:980:10:980:38 | setDataAndType(...) : Intent | provenance | MaD:83 |
+| Test.java:980:10:980:11 | in : Intent | Test.java:980:10:980:38 | setDataAndType(...) : Intent | provenance | MaD:84 |
 | Test.java:980:10:980:38 | setDataAndType(...) : Intent | Test.java:981:9:981:11 | out | provenance |  |
 | Test.java:986:16:986:31 | (...)... : Intent | Test.java:987:10:987:11 | in : Intent | provenance |  |
 | Test.java:986:24:986:31 | source(...) : Object | Test.java:986:16:986:31 | (...)... : Intent | provenance |  |
-| Test.java:987:10:987:11 | in : Intent | Test.java:987:10:987:50 | setDataAndTypeAndNormalize(...) : Intent | provenance | MaD:85 |
+| Test.java:987:10:987:11 | in : Intent | Test.java:987:10:987:50 | setDataAndTypeAndNormalize(...) : Intent | provenance | MaD:86 |
 | Test.java:987:10:987:50 | setDataAndTypeAndNormalize(...) : Intent | Test.java:988:9:988:11 | out | provenance |  |
 | Test.java:993:16:993:31 | (...)... : Intent | Test.java:994:10:994:11 | in : Intent | provenance |  |
 | Test.java:993:24:993:31 | source(...) : Object | Test.java:993:16:993:31 | (...)... : Intent | provenance |  |
@@ -1432,7 +1432,7 @@ edges
 | Test.java:1001:10:1001:31 | setIdentifier(...) : Intent | Test.java:1002:9:1002:11 | out | provenance |  |
 | Test.java:1007:16:1007:31 | (...)... : Intent | Test.java:1008:10:1008:11 | in : Intent | provenance |  |
 | Test.java:1007:24:1007:31 | source(...) : Object | Test.java:1007:16:1007:31 | (...)... : Intent | provenance |  |
-| Test.java:1008:10:1008:11 | in : Intent | Test.java:1008:10:1008:28 | setPackage(...) : Intent | provenance | MaD:89 |
+| Test.java:1008:10:1008:11 | in : Intent | Test.java:1008:10:1008:28 | setPackage(...) : Intent | provenance | MaD:90 |
 | Test.java:1008:10:1008:28 | setPackage(...) : Intent | Test.java:1009:9:1009:11 | out | provenance |  |
 | Test.java:1014:16:1014:31 | (...)... : Intent | Test.java:1015:10:1015:11 | in : Intent | provenance |  |
 | Test.java:1014:24:1014:31 | source(...) : Object | Test.java:1014:16:1014:31 | (...)... : Intent | provenance |  |
@@ -1444,26 +1444,26 @@ edges
 | Test.java:1022:10:1022:37 | setTypeAndNormalize(...) : Intent | Test.java:1023:9:1023:11 | out | provenance |  |
 | Test.java:1028:20:1028:62 | (...)... : Bundle [<map.value>] : Object | Test.java:1029:10:1029:11 | in : Bundle [<map.value>] : Object | provenance |  |
 | Test.java:1028:32:1028:62 | newBundleWithMapValue(...) : Bundle [<map.value>] : Object | Test.java:1028:20:1028:62 | (...)... : Bundle [<map.value>] : Object | provenance |  |
-| Test.java:1028:54:1028:61 | source(...) : Object | Test.java:1028:32:1028:62 | newBundleWithMapValue(...) : Bundle [<map.value>] : Object | provenance | MaD:177 |
+| Test.java:1028:54:1028:61 | source(...) : Object | Test.java:1028:32:1028:62 | newBundleWithMapValue(...) : Bundle [<map.value>] : Object | provenance | MaD:176 |
 | Test.java:1029:10:1029:11 | in : Bundle [<map.value>] : Object | Test.java:1029:10:1029:21 | get(...) : Object | provenance | MaD:93 |
 | Test.java:1029:10:1029:21 | get(...) : Object | Test.java:1030:9:1030:11 | out | provenance |  |
 | Test.java:1035:20:1035:62 | (...)... : Bundle [<map.value>] : Object | Test.java:1036:10:1036:11 | in : Bundle [<map.value>] : Object | provenance |  |
 | Test.java:1035:32:1035:62 | newBundleWithMapValue(...) : Bundle [<map.value>] : Object | Test.java:1035:20:1035:62 | (...)... : Bundle [<map.value>] : Object | provenance |  |
-| Test.java:1035:54:1035:61 | source(...) : Object | Test.java:1035:32:1035:62 | newBundleWithMapValue(...) : Bundle [<map.value>] : Object | provenance | MaD:177 |
+| Test.java:1035:54:1035:61 | source(...) : Object | Test.java:1035:32:1035:62 | newBundleWithMapValue(...) : Bundle [<map.value>] : Object | provenance | MaD:176 |
 | Test.java:1036:10:1036:11 | in : Bundle [<map.value>] : Object | Test.java:1036:10:1036:27 | getString(...) : String | provenance | MaD:94 |
 | Test.java:1036:10:1036:27 | getString(...) : String | Test.java:1037:9:1037:11 | out | provenance |  |
 | Test.java:1042:16:1042:31 | (...)... : String | Test.java:1044:35:1044:36 | in : String | provenance |  |
 | Test.java:1042:24:1042:31 | source(...) : Object | Test.java:1042:16:1042:31 | (...)... : String | provenance |  |
 | Test.java:1044:10:1044:37 | getString(...) : String | Test.java:1045:9:1045:11 | out | provenance |  |
-| Test.java:1044:35:1044:36 | in : String | Test.java:1044:10:1044:37 | getString(...) : String | provenance | MaD:96 |
+| Test.java:1044:35:1044:36 | in : String | Test.java:1044:10:1044:37 | getString(...) : String | provenance | MaD:95 |
 | Test.java:1050:20:1050:62 | (...)... : Bundle [<map.value>] : Object | Test.java:1051:10:1051:11 | in : Bundle [<map.value>] : Object | provenance |  |
 | Test.java:1050:32:1050:62 | newBundleWithMapValue(...) : Bundle [<map.value>] : Object | Test.java:1050:20:1050:62 | (...)... : Bundle [<map.value>] : Object | provenance |  |
-| Test.java:1050:54:1050:61 | source(...) : Object | Test.java:1050:32:1050:62 | newBundleWithMapValue(...) : Bundle [<map.value>] : Object | provenance | MaD:177 |
-| Test.java:1051:10:1051:11 | in : Bundle [<map.value>] : Object | Test.java:1051:10:1051:33 | getString(...) : String | provenance | MaD:95 |
+| Test.java:1050:54:1050:61 | source(...) : Object | Test.java:1050:32:1050:62 | newBundleWithMapValue(...) : Bundle [<map.value>] : Object | provenance | MaD:176 |
+| Test.java:1051:10:1051:11 | in : Bundle [<map.value>] : Object | Test.java:1051:10:1051:33 | getString(...) : String | provenance | MaD:96 |
 | Test.java:1051:10:1051:33 | getString(...) : String | Test.java:1052:9:1052:11 | out | provenance |  |
 | Test.java:1057:20:1057:62 | (...)... : Bundle [<map.value>] : Object | Test.java:1058:10:1058:11 | in : Bundle [<map.value>] : Object | provenance |  |
 | Test.java:1057:32:1057:62 | newBundleWithMapValue(...) : Bundle [<map.value>] : Object | Test.java:1057:20:1057:62 | (...)... : Bundle [<map.value>] : Object | provenance |  |
-| Test.java:1057:54:1057:61 | source(...) : Object | Test.java:1057:32:1057:62 | newBundleWithMapValue(...) : Bundle [<map.value>] : Object | provenance | MaD:177 |
+| Test.java:1057:54:1057:61 | source(...) : Object | Test.java:1057:32:1057:62 | newBundleWithMapValue(...) : Bundle [<map.value>] : Object | provenance | MaD:176 |
 | Test.java:1058:10:1058:11 | in : Bundle [<map.value>] : Object | Test.java:1058:10:1058:32 | getStringArray(...) : String[] | provenance | MaD:97 |
 | Test.java:1058:10:1058:32 | getStringArray(...) : String[] | Test.java:1059:9:1059:11 | out | provenance |  |
 | Test.java:1064:20:1064:60 | (...)... : Bundle [<map.key>] : String | Test.java:1065:10:1065:11 | in : Bundle [<map.key>] : String | provenance |  |
@@ -1473,7 +1473,7 @@ edges
 | Test.java:1065:10:1065:11 | in : Bundle [<map.key>] : String | Test.java:1065:10:1065:20 | keySet(...) : Set [<element>] : String | provenance | MaD:98 |
 | Test.java:1065:10:1065:20 | keySet(...) : Set [<element>] : String | Test.java:1066:20:1066:22 | out : Set [<element>] : String | provenance |  |
 | Test.java:1066:20:1066:22 | out : Set [<element>] : String | Test.java:22:19:22:32 | it : Set [<element>] : String | provenance |  |
-| Test.java:1066:20:1066:22 | out : Set [<element>] : String | Test.java:1066:9:1066:23 | getElement(...) | provenance | MaD:175 |
+| Test.java:1066:20:1066:22 | out : Set [<element>] : String | Test.java:1066:9:1066:23 | getElement(...) | provenance | MaD:179 |
 | Test.java:1071:27:1071:66 | newPersistableBundleWithMapKey(...) : PersistableBundle [<map.key>] : String | Test.java:1072:15:1072:16 | in : PersistableBundle [<map.key>] : String | provenance |  |
 | Test.java:1071:58:1071:65 | source(...) : String | Test.java:29:51:29:58 | k : String | provenance |  |
 | Test.java:1071:58:1071:65 | source(...) : String | Test.java:1071:27:1071:66 | newPersistableBundleWithMapKey(...) : PersistableBundle [<map.key>] : String | provenance | MaD:105 |
@@ -1482,10 +1482,10 @@ edges
 | Test.java:1073:19:1073:21 | out : BaseBundle [<map.key>] : String | Test.java:24:19:24:30 | b : BaseBundle [<map.key>] : String | provenance |  |
 | Test.java:1073:19:1073:21 | out : BaseBundle [<map.key>] : String | Test.java:1073:9:1073:22 | getMapKey(...) | provenance | MaD:98 |
 | Test.java:1078:27:1078:68 | newPersistableBundleWithMapValue(...) : PersistableBundle [<map.value>] : Object | Test.java:1079:15:1079:16 | in : PersistableBundle [<map.value>] : Object | provenance |  |
-| Test.java:1078:60:1078:67 | source(...) : Object | Test.java:1078:27:1078:68 | newPersistableBundleWithMapValue(...) : PersistableBundle [<map.value>] : Object | provenance | MaD:178 |
+| Test.java:1078:60:1078:67 | source(...) : Object | Test.java:1078:27:1078:68 | newPersistableBundleWithMapValue(...) : PersistableBundle [<map.value>] : Object | provenance | MaD:177 |
 | Test.java:1079:4:1079:6 | out [post update] : BaseBundle [<map.value>] : Object | Test.java:1080:21:1080:23 | out : BaseBundle [<map.value>] : Object | provenance |  |
 | Test.java:1079:15:1079:16 | in : PersistableBundle [<map.value>] : Object | Test.java:1079:4:1079:6 | out [post update] : BaseBundle [<map.value>] : Object | provenance | MaD:100 |
-| Test.java:1080:21:1080:23 | out : BaseBundle [<map.value>] : Object | Test.java:1080:9:1080:24 | getMapValue(...) | provenance | MaD:179 |
+| Test.java:1080:21:1080:23 | out : BaseBundle [<map.value>] : Object | Test.java:1080:9:1080:24 | getMapValue(...) | provenance | MaD:175 |
 | Test.java:1085:16:1085:31 | (...)... : String | Test.java:1086:19:1086:20 | in : String | provenance |  |
 | Test.java:1085:24:1085:31 | source(...) : Object | Test.java:1085:16:1085:31 | (...)... : String | provenance |  |
 | Test.java:1086:4:1086:6 | out [post update] : BaseBundle [<map.key>] : String | Test.java:1087:19:1087:21 | out : BaseBundle [<map.key>] : String | provenance |  |
@@ -1544,7 +1544,7 @@ edges
 | Test.java:1148:24:1148:31 | source(...) : Object | Test.java:1148:16:1148:31 | (...)... : String | provenance |  |
 | Test.java:1149:4:1149:6 | out [post update] : BaseBundle [<map.value>] : String | Test.java:1150:21:1150:23 | out : BaseBundle [<map.value>] : String | provenance |  |
 | Test.java:1149:24:1149:25 | in : String | Test.java:1149:4:1149:6 | out [post update] : BaseBundle [<map.value>] : String | provenance | MaD:110 |
-| Test.java:1150:21:1150:23 | out : BaseBundle [<map.value>] : String | Test.java:1150:9:1150:24 | getMapValue(...) | provenance | MaD:179 |
+| Test.java:1150:21:1150:23 | out : BaseBundle [<map.value>] : String | Test.java:1150:9:1150:24 | getMapValue(...) | provenance | MaD:175 |
 | Test.java:1155:16:1155:31 | (...)... : String | Test.java:1156:23:1156:24 | in : String | provenance |  |
 | Test.java:1155:24:1155:31 | source(...) : Object | Test.java:1155:16:1155:31 | (...)... : String | provenance |  |
 | Test.java:1156:4:1156:6 | out [post update] : BaseBundle [<map.key>] : String | Test.java:1157:19:1157:21 | out : BaseBundle [<map.key>] : String | provenance |  |
@@ -1555,7 +1555,7 @@ edges
 | Test.java:1162:28:1162:35 | source(...) : Object | Test.java:1162:18:1162:35 | (...)... : String[] | provenance |  |
 | Test.java:1163:4:1163:6 | out [post update] : BaseBundle [<map.value>] : String[] | Test.java:1164:21:1164:23 | out : BaseBundle [<map.value>] : String[] | provenance |  |
 | Test.java:1163:29:1163:30 | in : String[] | Test.java:1163:4:1163:6 | out [post update] : BaseBundle [<map.value>] : String[] | provenance | MaD:112 |
-| Test.java:1164:21:1164:23 | out : BaseBundle [<map.value>] : String[] | Test.java:1164:9:1164:24 | getMapValue(...) | provenance | MaD:179 |
+| Test.java:1164:21:1164:23 | out : BaseBundle [<map.value>] : String[] | Test.java:1164:9:1164:24 | getMapValue(...) | provenance | MaD:175 |
 | Test.java:1169:16:1169:52 | (...)... : Bundle [<map.key>] : String | Test.java:1170:21:1170:22 | in : Bundle [<map.key>] : String | provenance |  |
 | Test.java:1169:24:1169:52 | newBundleWithMapKey(...) : Bundle [<map.key>] : String | Test.java:1169:16:1169:52 | (...)... : Bundle [<map.key>] : String | provenance |  |
 | Test.java:1169:44:1169:51 | source(...) : String | Test.java:28:29:28:36 | k : String | provenance |  |
@@ -1566,10 +1566,10 @@ edges
 | Test.java:1171:19:1171:21 | out : Bundle [<map.key>] : String | Test.java:1171:9:1171:22 | getMapKey(...) | provenance | MaD:98 |
 | Test.java:1176:16:1176:54 | (...)... : Bundle [<map.value>] : Object | Test.java:1177:21:1177:22 | in : Bundle [<map.value>] : Object | provenance |  |
 | Test.java:1176:24:1176:54 | newBundleWithMapValue(...) : Bundle [<map.value>] : Object | Test.java:1176:16:1176:54 | (...)... : Bundle [<map.value>] : Object | provenance |  |
-| Test.java:1176:46:1176:53 | source(...) : Object | Test.java:1176:24:1176:54 | newBundleWithMapValue(...) : Bundle [<map.value>] : Object | provenance | MaD:177 |
+| Test.java:1176:46:1176:53 | source(...) : Object | Test.java:1176:24:1176:54 | newBundleWithMapValue(...) : Bundle [<map.value>] : Object | provenance | MaD:176 |
 | Test.java:1177:10:1177:23 | new Bundle(...) : Bundle [<map.value>] : Object | Test.java:1178:21:1178:23 | out : Bundle [<map.value>] : Object | provenance |  |
 | Test.java:1177:21:1177:22 | in : Bundle [<map.value>] : Object | Test.java:1177:10:1177:23 | new Bundle(...) : Bundle [<map.value>] : Object | provenance | MaD:114 |
-| Test.java:1178:21:1178:23 | out : Bundle [<map.value>] : Object | Test.java:1178:9:1178:24 | getMapValue(...) | provenance | MaD:179 |
+| Test.java:1178:21:1178:23 | out : Bundle [<map.value>] : Object | Test.java:1178:9:1178:24 | getMapValue(...) | provenance | MaD:175 |
 | Test.java:1183:27:1183:66 | newPersistableBundleWithMapKey(...) : PersistableBundle [<map.key>] : String | Test.java:1184:21:1184:22 | in : PersistableBundle [<map.key>] : String | provenance |  |
 | Test.java:1183:58:1183:65 | source(...) : String | Test.java:29:51:29:58 | k : String | provenance |  |
 | Test.java:1183:58:1183:65 | source(...) : String | Test.java:1183:27:1183:66 | newPersistableBundleWithMapKey(...) : PersistableBundle [<map.key>] : String | provenance | MaD:105 |
@@ -1578,10 +1578,10 @@ edges
 | Test.java:1185:19:1185:21 | out : Bundle [<map.key>] : String | Test.java:24:19:24:30 | b : Bundle [<map.key>] : String | provenance |  |
 | Test.java:1185:19:1185:21 | out : Bundle [<map.key>] : String | Test.java:1185:9:1185:22 | getMapKey(...) | provenance | MaD:98 |
 | Test.java:1190:27:1190:68 | newPersistableBundleWithMapValue(...) : PersistableBundle [<map.value>] : Object | Test.java:1191:21:1191:22 | in : PersistableBundle [<map.value>] : Object | provenance |  |
-| Test.java:1190:60:1190:67 | source(...) : Object | Test.java:1190:27:1190:68 | newPersistableBundleWithMapValue(...) : PersistableBundle [<map.value>] : Object | provenance | MaD:178 |
+| Test.java:1190:60:1190:67 | source(...) : Object | Test.java:1190:27:1190:68 | newPersistableBundleWithMapValue(...) : PersistableBundle [<map.value>] : Object | provenance | MaD:177 |
 | Test.java:1191:10:1191:23 | new Bundle(...) : Bundle [<map.value>] : Object | Test.java:1192:21:1192:23 | out : Bundle [<map.value>] : Object | provenance |  |
 | Test.java:1191:21:1191:22 | in : PersistableBundle [<map.value>] : Object | Test.java:1191:10:1191:23 | new Bundle(...) : Bundle [<map.value>] : Object | provenance | MaD:116 |
-| Test.java:1192:21:1192:23 | out : Bundle [<map.value>] : Object | Test.java:1192:9:1192:24 | getMapValue(...) | provenance | MaD:179 |
+| Test.java:1192:21:1192:23 | out : Bundle [<map.value>] : Object | Test.java:1192:9:1192:24 | getMapValue(...) | provenance | MaD:175 |
 | Test.java:1197:16:1197:52 | (...)... : Bundle [<map.key>] : String | Test.java:1198:10:1198:11 | in : Bundle [<map.key>] : String | provenance |  |
 | Test.java:1197:16:1197:52 | (...)... : Bundle [<map.key>] : String | Test.java:1199:19:1199:29 | (...)... : Bundle [<map.key>] : String | provenance | CloneStep |
 | Test.java:1197:24:1197:52 | newBundleWithMapKey(...) : Bundle [<map.key>] : String | Test.java:1197:16:1197:52 | (...)... : Bundle [<map.key>] : String | provenance |  |
@@ -1594,10 +1594,10 @@ edges
 | Test.java:1204:16:1204:54 | (...)... : Bundle [<map.value>] : Object | Test.java:1205:10:1205:11 | in : Bundle [<map.value>] : Object | provenance |  |
 | Test.java:1204:16:1204:54 | (...)... : Bundle [<map.value>] : Object | Test.java:1206:21:1206:31 | (...)... : Bundle [<map.value>] : Object | provenance | CloneStep |
 | Test.java:1204:24:1204:54 | newBundleWithMapValue(...) : Bundle [<map.value>] : Object | Test.java:1204:16:1204:54 | (...)... : Bundle [<map.value>] : Object | provenance |  |
-| Test.java:1204:46:1204:53 | source(...) : Object | Test.java:1204:24:1204:54 | newBundleWithMapValue(...) : Bundle [<map.value>] : Object | provenance | MaD:177 |
+| Test.java:1204:46:1204:53 | source(...) : Object | Test.java:1204:24:1204:54 | newBundleWithMapValue(...) : Bundle [<map.value>] : Object | provenance | MaD:176 |
 | Test.java:1205:10:1205:11 | in : Bundle [<map.value>] : Object | Test.java:1205:10:1205:19 | clone(...) : Object [<map.value>] : Object | provenance | MaD:118 |
 | Test.java:1205:10:1205:19 | clone(...) : Object [<map.value>] : Object | Test.java:1206:21:1206:31 | (...)... : Bundle [<map.value>] : Object | provenance |  |
-| Test.java:1206:21:1206:31 | (...)... : Bundle [<map.value>] : Object | Test.java:1206:9:1206:32 | getMapValue(...) | provenance | MaD:179 |
+| Test.java:1206:21:1206:31 | (...)... : Bundle [<map.value>] : Object | Test.java:1206:9:1206:32 | getMapValue(...) | provenance | MaD:175 |
 | Test.java:1211:16:1211:52 | (...)... : Bundle [<map.key>] : String | Test.java:1212:10:1212:11 | in : Bundle [<map.key>] : String | provenance |  |
 | Test.java:1211:24:1211:52 | newBundleWithMapKey(...) : Bundle [<map.key>] : String | Test.java:1211:16:1211:52 | (...)... : Bundle [<map.key>] : String | provenance |  |
 | Test.java:1211:44:1211:51 | source(...) : String | Test.java:28:29:28:36 | k : String | provenance |  |
@@ -1608,82 +1608,82 @@ edges
 | Test.java:1213:19:1213:21 | out : Bundle [<map.key>] : String | Test.java:1213:9:1213:22 | getMapKey(...) | provenance | MaD:98 |
 | Test.java:1218:16:1218:54 | (...)... : Bundle [<map.value>] : Object | Test.java:1219:10:1219:11 | in : Bundle [<map.value>] : Object | provenance |  |
 | Test.java:1218:24:1218:54 | newBundleWithMapValue(...) : Bundle [<map.value>] : Object | Test.java:1218:16:1218:54 | (...)... : Bundle [<map.value>] : Object | provenance |  |
-| Test.java:1218:46:1218:53 | source(...) : Object | Test.java:1218:24:1218:54 | newBundleWithMapValue(...) : Bundle [<map.value>] : Object | provenance | MaD:177 |
+| Test.java:1218:46:1218:53 | source(...) : Object | Test.java:1218:24:1218:54 | newBundleWithMapValue(...) : Bundle [<map.value>] : Object | provenance | MaD:176 |
 | Test.java:1219:10:1219:11 | in : Bundle [<map.value>] : Object | Test.java:1219:10:1219:22 | deepCopy(...) : Bundle [<map.value>] : Object | provenance | MaD:120 |
 | Test.java:1219:10:1219:22 | deepCopy(...) : Bundle [<map.value>] : Object | Test.java:1220:21:1220:23 | out : Bundle [<map.value>] : Object | provenance |  |
-| Test.java:1220:21:1220:23 | out : Bundle [<map.value>] : Object | Test.java:1220:9:1220:24 | getMapValue(...) | provenance | MaD:179 |
+| Test.java:1220:21:1220:23 | out : Bundle [<map.value>] : Object | Test.java:1220:9:1220:24 | getMapValue(...) | provenance | MaD:175 |
 | Test.java:1225:16:1225:54 | (...)... : Bundle [<map.value>] : Object | Test.java:1226:10:1226:11 | in : Bundle [<map.value>] : Object | provenance |  |
 | Test.java:1225:24:1225:54 | newBundleWithMapValue(...) : Bundle [<map.value>] : Object | Test.java:1225:16:1225:54 | (...)... : Bundle [<map.value>] : Object | provenance |  |
-| Test.java:1225:46:1225:53 | source(...) : Object | Test.java:1225:24:1225:54 | newBundleWithMapValue(...) : Bundle [<map.value>] : Object | provenance | MaD:177 |
+| Test.java:1225:46:1225:53 | source(...) : Object | Test.java:1225:24:1225:54 | newBundleWithMapValue(...) : Bundle [<map.value>] : Object | provenance | MaD:176 |
 | Test.java:1226:10:1226:11 | in : Bundle [<map.value>] : Object | Test.java:1226:10:1226:27 | getBinder(...) : IBinder | provenance | MaD:121 |
 | Test.java:1226:10:1226:27 | getBinder(...) : IBinder | Test.java:1227:9:1227:11 | out | provenance |  |
 | Test.java:1232:16:1232:54 | (...)... : Bundle [<map.value>] : Object | Test.java:1233:10:1233:11 | in : Bundle [<map.value>] : Object | provenance |  |
 | Test.java:1232:24:1232:54 | newBundleWithMapValue(...) : Bundle [<map.value>] : Object | Test.java:1232:16:1232:54 | (...)... : Bundle [<map.value>] : Object | provenance |  |
-| Test.java:1232:46:1232:53 | source(...) : Object | Test.java:1232:24:1232:54 | newBundleWithMapValue(...) : Bundle [<map.value>] : Object | provenance | MaD:177 |
+| Test.java:1232:46:1232:53 | source(...) : Object | Test.java:1232:24:1232:54 | newBundleWithMapValue(...) : Bundle [<map.value>] : Object | provenance | MaD:176 |
 | Test.java:1233:10:1233:11 | in : Bundle [<map.value>] : Object | Test.java:1233:10:1233:27 | getBundle(...) : Bundle | provenance | MaD:122 |
 | Test.java:1233:10:1233:27 | getBundle(...) : Bundle | Test.java:1234:9:1234:11 | out | provenance |  |
 | Test.java:1239:16:1239:54 | (...)... : Bundle [<map.value>] : Object | Test.java:1240:10:1240:11 | in : Bundle [<map.value>] : Object | provenance |  |
 | Test.java:1239:24:1239:54 | newBundleWithMapValue(...) : Bundle [<map.value>] : Object | Test.java:1239:16:1239:54 | (...)... : Bundle [<map.value>] : Object | provenance |  |
-| Test.java:1239:46:1239:53 | source(...) : Object | Test.java:1239:24:1239:54 | newBundleWithMapValue(...) : Bundle [<map.value>] : Object | provenance | MaD:177 |
+| Test.java:1239:46:1239:53 | source(...) : Object | Test.java:1239:24:1239:54 | newBundleWithMapValue(...) : Bundle [<map.value>] : Object | provenance | MaD:176 |
 | Test.java:1240:10:1240:11 | in : Bundle [<map.value>] : Object | Test.java:1240:10:1240:30 | getByteArray(...) : byte[] | provenance | MaD:123 |
 | Test.java:1240:10:1240:30 | getByteArray(...) : byte[] | Test.java:1241:9:1241:11 | out | provenance |  |
 | Test.java:1246:16:1246:54 | (...)... : Bundle [<map.value>] : Object | Test.java:1247:10:1247:11 | in : Bundle [<map.value>] : Object | provenance |  |
 | Test.java:1246:24:1246:54 | newBundleWithMapValue(...) : Bundle [<map.value>] : Object | Test.java:1246:16:1246:54 | (...)... : Bundle [<map.value>] : Object | provenance |  |
-| Test.java:1246:46:1246:53 | source(...) : Object | Test.java:1246:24:1246:54 | newBundleWithMapValue(...) : Bundle [<map.value>] : Object | provenance | MaD:177 |
+| Test.java:1246:46:1246:53 | source(...) : Object | Test.java:1246:24:1246:54 | newBundleWithMapValue(...) : Bundle [<map.value>] : Object | provenance | MaD:176 |
 | Test.java:1247:10:1247:11 | in : Bundle [<map.value>] : Object | Test.java:1247:10:1247:30 | getCharArray(...) : char[] | provenance | MaD:124 |
 | Test.java:1247:10:1247:30 | getCharArray(...) : char[] | Test.java:1248:9:1248:11 | out | provenance |  |
 | Test.java:1253:16:1253:54 | (...)... : Bundle [<map.value>] : Object | Test.java:1254:10:1254:11 | in : Bundle [<map.value>] : Object | provenance |  |
 | Test.java:1253:24:1253:54 | newBundleWithMapValue(...) : Bundle [<map.value>] : Object | Test.java:1253:16:1253:54 | (...)... : Bundle [<map.value>] : Object | provenance |  |
-| Test.java:1253:46:1253:53 | source(...) : Object | Test.java:1253:24:1253:54 | newBundleWithMapValue(...) : Bundle [<map.value>] : Object | provenance | MaD:177 |
+| Test.java:1253:46:1253:53 | source(...) : Object | Test.java:1253:24:1253:54 | newBundleWithMapValue(...) : Bundle [<map.value>] : Object | provenance | MaD:176 |
 | Test.java:1254:10:1254:11 | in : Bundle [<map.value>] : Object | Test.java:1254:10:1254:33 | getCharSequence(...) : CharSequence | provenance | MaD:125 |
 | Test.java:1254:10:1254:33 | getCharSequence(...) : CharSequence | Test.java:1255:9:1255:11 | out | provenance |  |
 | Test.java:1260:22:1260:43 | (...)... : CharSequence | Test.java:1262:41:1262:42 | in : CharSequence | provenance |  |
 | Test.java:1260:36:1260:43 | source(...) : Object | Test.java:1260:22:1260:43 | (...)... : CharSequence | provenance |  |
 | Test.java:1262:10:1262:43 | getCharSequence(...) : CharSequence | Test.java:1263:9:1263:11 | out | provenance |  |
-| Test.java:1262:41:1262:42 | in : CharSequence | Test.java:1262:10:1262:43 | getCharSequence(...) : CharSequence | provenance | MaD:127 |
+| Test.java:1262:41:1262:42 | in : CharSequence | Test.java:1262:10:1262:43 | getCharSequence(...) : CharSequence | provenance | MaD:126 |
 | Test.java:1268:16:1268:54 | (...)... : Bundle [<map.value>] : Object | Test.java:1269:10:1269:11 | in : Bundle [<map.value>] : Object | provenance |  |
 | Test.java:1268:24:1268:54 | newBundleWithMapValue(...) : Bundle [<map.value>] : Object | Test.java:1268:16:1268:54 | (...)... : Bundle [<map.value>] : Object | provenance |  |
-| Test.java:1268:46:1268:53 | source(...) : Object | Test.java:1268:24:1268:54 | newBundleWithMapValue(...) : Bundle [<map.value>] : Object | provenance | MaD:177 |
-| Test.java:1269:10:1269:11 | in : Bundle [<map.value>] : Object | Test.java:1269:10:1269:39 | getCharSequence(...) : CharSequence | provenance | MaD:126 |
+| Test.java:1268:46:1268:53 | source(...) : Object | Test.java:1268:24:1268:54 | newBundleWithMapValue(...) : Bundle [<map.value>] : Object | provenance | MaD:176 |
+| Test.java:1269:10:1269:11 | in : Bundle [<map.value>] : Object | Test.java:1269:10:1269:39 | getCharSequence(...) : CharSequence | provenance | MaD:127 |
 | Test.java:1269:10:1269:39 | getCharSequence(...) : CharSequence | Test.java:1270:9:1270:11 | out | provenance |  |
 | Test.java:1275:16:1275:54 | (...)... : Bundle [<map.value>] : Object | Test.java:1276:10:1276:11 | in : Bundle [<map.value>] : Object | provenance |  |
 | Test.java:1275:24:1275:54 | newBundleWithMapValue(...) : Bundle [<map.value>] : Object | Test.java:1275:16:1275:54 | (...)... : Bundle [<map.value>] : Object | provenance |  |
-| Test.java:1275:46:1275:53 | source(...) : Object | Test.java:1275:24:1275:54 | newBundleWithMapValue(...) : Bundle [<map.value>] : Object | provenance | MaD:177 |
+| Test.java:1275:46:1275:53 | source(...) : Object | Test.java:1275:24:1275:54 | newBundleWithMapValue(...) : Bundle [<map.value>] : Object | provenance | MaD:176 |
 | Test.java:1276:10:1276:11 | in : Bundle [<map.value>] : Object | Test.java:1276:10:1276:38 | getCharSequenceArray(...) : CharSequence[] | provenance | MaD:128 |
 | Test.java:1276:10:1276:38 | getCharSequenceArray(...) : CharSequence[] | Test.java:1277:9:1277:11 | out | provenance |  |
 | Test.java:1282:16:1282:54 | (...)... : Bundle [<map.value>] : Object | Test.java:1283:10:1283:11 | in : Bundle [<map.value>] : Object | provenance |  |
 | Test.java:1282:24:1282:54 | newBundleWithMapValue(...) : Bundle [<map.value>] : Object | Test.java:1282:16:1282:54 | (...)... : Bundle [<map.value>] : Object | provenance |  |
-| Test.java:1282:46:1282:53 | source(...) : Object | Test.java:1282:24:1282:54 | newBundleWithMapValue(...) : Bundle [<map.value>] : Object | provenance | MaD:177 |
+| Test.java:1282:46:1282:53 | source(...) : Object | Test.java:1282:24:1282:54 | newBundleWithMapValue(...) : Bundle [<map.value>] : Object | provenance | MaD:176 |
 | Test.java:1283:10:1283:11 | in : Bundle [<map.value>] : Object | Test.java:1283:10:1283:42 | getCharSequenceArrayList(...) : ArrayList | provenance | MaD:129 |
 | Test.java:1283:10:1283:42 | getCharSequenceArrayList(...) : ArrayList | Test.java:1284:9:1284:11 | out | provenance |  |
 | Test.java:1289:16:1289:54 | (...)... : Bundle [<map.value>] : Object | Test.java:1290:10:1290:11 | in : Bundle [<map.value>] : Object | provenance |  |
 | Test.java:1289:24:1289:54 | newBundleWithMapValue(...) : Bundle [<map.value>] : Object | Test.java:1289:16:1289:54 | (...)... : Bundle [<map.value>] : Object | provenance |  |
-| Test.java:1289:46:1289:53 | source(...) : Object | Test.java:1289:24:1289:54 | newBundleWithMapValue(...) : Bundle [<map.value>] : Object | provenance | MaD:177 |
+| Test.java:1289:46:1289:53 | source(...) : Object | Test.java:1289:24:1289:54 | newBundleWithMapValue(...) : Bundle [<map.value>] : Object | provenance | MaD:176 |
 | Test.java:1290:10:1290:11 | in : Bundle [<map.value>] : Object | Test.java:1290:10:1290:31 | getParcelable(...) : Parcelable | provenance | MaD:130 |
 | Test.java:1290:10:1290:31 | getParcelable(...) : Parcelable | Test.java:1291:9:1291:11 | out | provenance |  |
 | Test.java:1296:16:1296:54 | (...)... : Bundle [<map.value>] : Object | Test.java:1297:10:1297:11 | in : Bundle [<map.value>] : Object | provenance |  |
 | Test.java:1296:24:1296:54 | newBundleWithMapValue(...) : Bundle [<map.value>] : Object | Test.java:1296:16:1296:54 | (...)... : Bundle [<map.value>] : Object | provenance |  |
-| Test.java:1296:46:1296:53 | source(...) : Object | Test.java:1296:24:1296:54 | newBundleWithMapValue(...) : Bundle [<map.value>] : Object | provenance | MaD:177 |
+| Test.java:1296:46:1296:53 | source(...) : Object | Test.java:1296:24:1296:54 | newBundleWithMapValue(...) : Bundle [<map.value>] : Object | provenance | MaD:176 |
 | Test.java:1297:10:1297:11 | in : Bundle [<map.value>] : Object | Test.java:1297:10:1297:36 | getParcelableArray(...) : Parcelable[] | provenance | MaD:131 |
 | Test.java:1297:10:1297:36 | getParcelableArray(...) : Parcelable[] | Test.java:1298:9:1298:11 | out | provenance |  |
 | Test.java:1303:16:1303:54 | (...)... : Bundle [<map.value>] : Object | Test.java:1304:10:1304:11 | in : Bundle [<map.value>] : Object | provenance |  |
 | Test.java:1303:24:1303:54 | newBundleWithMapValue(...) : Bundle [<map.value>] : Object | Test.java:1303:16:1303:54 | (...)... : Bundle [<map.value>] : Object | provenance |  |
-| Test.java:1303:46:1303:53 | source(...) : Object | Test.java:1303:24:1303:54 | newBundleWithMapValue(...) : Bundle [<map.value>] : Object | provenance | MaD:177 |
+| Test.java:1303:46:1303:53 | source(...) : Object | Test.java:1303:24:1303:54 | newBundleWithMapValue(...) : Bundle [<map.value>] : Object | provenance | MaD:176 |
 | Test.java:1304:10:1304:11 | in : Bundle [<map.value>] : Object | Test.java:1304:10:1304:40 | getParcelableArrayList(...) : ArrayList | provenance | MaD:132 |
 | Test.java:1304:10:1304:40 | getParcelableArrayList(...) : ArrayList | Test.java:1305:9:1305:11 | out | provenance |  |
 | Test.java:1310:16:1310:54 | (...)... : Bundle [<map.value>] : Object | Test.java:1311:10:1311:11 | in : Bundle [<map.value>] : Object | provenance |  |
 | Test.java:1310:24:1310:54 | newBundleWithMapValue(...) : Bundle [<map.value>] : Object | Test.java:1310:16:1310:54 | (...)... : Bundle [<map.value>] : Object | provenance |  |
-| Test.java:1310:46:1310:53 | source(...) : Object | Test.java:1310:24:1310:54 | newBundleWithMapValue(...) : Bundle [<map.value>] : Object | provenance | MaD:177 |
+| Test.java:1310:46:1310:53 | source(...) : Object | Test.java:1310:24:1310:54 | newBundleWithMapValue(...) : Bundle [<map.value>] : Object | provenance | MaD:176 |
 | Test.java:1311:10:1311:11 | in : Bundle [<map.value>] : Object | Test.java:1311:10:1311:33 | getSerializable(...) : Serializable | provenance | MaD:133 |
 | Test.java:1311:10:1311:33 | getSerializable(...) : Serializable | Test.java:1312:9:1312:11 | out | provenance |  |
 | Test.java:1317:16:1317:54 | (...)... : Bundle [<map.value>] : Object | Test.java:1318:10:1318:11 | in : Bundle [<map.value>] : Object | provenance |  |
 | Test.java:1317:24:1317:54 | newBundleWithMapValue(...) : Bundle [<map.value>] : Object | Test.java:1317:16:1317:54 | (...)... : Bundle [<map.value>] : Object | provenance |  |
-| Test.java:1317:46:1317:53 | source(...) : Object | Test.java:1317:24:1317:54 | newBundleWithMapValue(...) : Bundle [<map.value>] : Object | provenance | MaD:177 |
+| Test.java:1317:46:1317:53 | source(...) : Object | Test.java:1317:24:1317:54 | newBundleWithMapValue(...) : Bundle [<map.value>] : Object | provenance | MaD:176 |
 | Test.java:1318:10:1318:11 | in : Bundle [<map.value>] : Object | Test.java:1318:10:1318:42 | getSparseParcelableArray(...) : SparseArray | provenance | MaD:134 |
 | Test.java:1318:10:1318:42 | getSparseParcelableArray(...) : SparseArray | Test.java:1319:9:1319:11 | out | provenance |  |
 | Test.java:1324:16:1324:54 | (...)... : Bundle [<map.value>] : Object | Test.java:1325:10:1325:11 | in : Bundle [<map.value>] : Object | provenance |  |
 | Test.java:1324:24:1324:54 | newBundleWithMapValue(...) : Bundle [<map.value>] : Object | Test.java:1324:16:1324:54 | (...)... : Bundle [<map.value>] : Object | provenance |  |
-| Test.java:1324:46:1324:53 | source(...) : Object | Test.java:1324:24:1324:54 | newBundleWithMapValue(...) : Bundle [<map.value>] : Object | provenance | MaD:177 |
+| Test.java:1324:46:1324:53 | source(...) : Object | Test.java:1324:24:1324:54 | newBundleWithMapValue(...) : Bundle [<map.value>] : Object | provenance | MaD:176 |
 | Test.java:1325:10:1325:11 | in : Bundle [<map.value>] : Object | Test.java:1325:10:1325:36 | getStringArrayList(...) : ArrayList | provenance | MaD:135 |
 | Test.java:1325:10:1325:36 | getStringArrayList(...) : ArrayList | Test.java:1326:9:1326:11 | out | provenance |  |
 | Test.java:1331:16:1331:52 | (...)... : Bundle [<map.key>] : String | Test.java:1332:15:1332:16 | in : Bundle [<map.key>] : String | provenance |  |
@@ -1696,10 +1696,10 @@ edges
 | Test.java:1333:19:1333:21 | out : Bundle [<map.key>] : String | Test.java:1333:9:1333:22 | getMapKey(...) | provenance | MaD:98 |
 | Test.java:1338:16:1338:54 | (...)... : Bundle [<map.value>] : Object | Test.java:1339:15:1339:16 | in : Bundle [<map.value>] : Object | provenance |  |
 | Test.java:1338:24:1338:54 | newBundleWithMapValue(...) : Bundle [<map.value>] : Object | Test.java:1338:16:1338:54 | (...)... : Bundle [<map.value>] : Object | provenance |  |
-| Test.java:1338:46:1338:53 | source(...) : Object | Test.java:1338:24:1338:54 | newBundleWithMapValue(...) : Bundle [<map.value>] : Object | provenance | MaD:177 |
+| Test.java:1338:46:1338:53 | source(...) : Object | Test.java:1338:24:1338:54 | newBundleWithMapValue(...) : Bundle [<map.value>] : Object | provenance | MaD:176 |
 | Test.java:1339:4:1339:6 | out [post update] : Bundle [<map.value>] : Object | Test.java:1340:21:1340:23 | out : Bundle [<map.value>] : Object | provenance |  |
 | Test.java:1339:15:1339:16 | in : Bundle [<map.value>] : Object | Test.java:1339:4:1339:6 | out [post update] : Bundle [<map.value>] : Object | provenance | MaD:137 |
-| Test.java:1340:21:1340:23 | out : Bundle [<map.value>] : Object | Test.java:1340:9:1340:24 | getMapValue(...) | provenance | MaD:179 |
+| Test.java:1340:21:1340:23 | out : Bundle [<map.value>] : Object | Test.java:1340:9:1340:24 | getMapValue(...) | provenance | MaD:175 |
 | Test.java:1345:16:1345:31 | (...)... : String | Test.java:1346:18:1346:19 | in : String | provenance |  |
 | Test.java:1345:24:1345:31 | source(...) : Object | Test.java:1345:16:1345:31 | (...)... : String | provenance |  |
 | Test.java:1346:4:1346:6 | out [post update] : Bundle [<map.key>] : String | Test.java:1347:19:1347:21 | out : Bundle [<map.key>] : String | provenance |  |
@@ -1710,7 +1710,7 @@ edges
 | Test.java:1352:26:1352:33 | source(...) : Object | Test.java:1352:17:1352:33 | (...)... : IBinder | provenance |  |
 | Test.java:1353:4:1353:6 | out [post update] : Bundle [<map.value>] : IBinder | Test.java:1354:21:1354:23 | out : Bundle [<map.value>] : IBinder | provenance |  |
 | Test.java:1353:24:1353:25 | in : IBinder | Test.java:1353:4:1353:6 | out [post update] : Bundle [<map.value>] : IBinder | provenance | MaD:139 |
-| Test.java:1354:21:1354:23 | out : Bundle [<map.value>] : IBinder | Test.java:1354:9:1354:24 | getMapValue(...) | provenance | MaD:179 |
+| Test.java:1354:21:1354:23 | out : Bundle [<map.value>] : IBinder | Test.java:1354:9:1354:24 | getMapValue(...) | provenance | MaD:175 |
 | Test.java:1359:16:1359:31 | (...)... : String | Test.java:1360:18:1360:19 | in : String | provenance |  |
 | Test.java:1359:24:1359:31 | source(...) : Object | Test.java:1359:16:1359:31 | (...)... : String | provenance |  |
 | Test.java:1360:4:1360:6 | out [post update] : Bundle [<map.key>] : String | Test.java:1361:19:1361:21 | out : Bundle [<map.key>] : String | provenance |  |
@@ -1721,7 +1721,7 @@ edges
 | Test.java:1366:24:1366:31 | source(...) : Object | Test.java:1366:16:1366:31 | (...)... : Bundle | provenance |  |
 | Test.java:1367:4:1367:6 | out [post update] : Bundle [<map.value>] : Bundle | Test.java:1368:21:1368:23 | out : Bundle [<map.value>] : Bundle | provenance |  |
 | Test.java:1367:24:1367:25 | in : Bundle | Test.java:1367:4:1367:6 | out [post update] : Bundle [<map.value>] : Bundle | provenance | MaD:141 |
-| Test.java:1368:21:1368:23 | out : Bundle [<map.value>] : Bundle | Test.java:1368:9:1368:24 | getMapValue(...) | provenance | MaD:179 |
+| Test.java:1368:21:1368:23 | out : Bundle [<map.value>] : Bundle | Test.java:1368:9:1368:24 | getMapValue(...) | provenance | MaD:175 |
 | Test.java:1373:16:1373:31 | (...)... : String | Test.java:1374:16:1374:17 | in : String | provenance |  |
 | Test.java:1373:24:1373:31 | source(...) : Object | Test.java:1373:16:1373:31 | (...)... : String | provenance |  |
 | Test.java:1374:4:1374:6 | out [post update] : Bundle [<map.key>] : String | Test.java:1375:19:1375:21 | out : Bundle [<map.key>] : String | provenance |  |
@@ -1738,7 +1738,7 @@ edges
 | Test.java:1387:24:1387:31 | source(...) : Object | Test.java:1387:16:1387:31 | (...)... : byte[] | provenance |  |
 | Test.java:1388:4:1388:6 | out [post update] : Bundle [<map.value>] : byte[] | Test.java:1389:21:1389:23 | out : Bundle [<map.value>] : byte[] | provenance |  |
 | Test.java:1388:27:1388:28 | in : byte[] | Test.java:1388:4:1388:6 | out [post update] : Bundle [<map.value>] : byte[] | provenance | MaD:144 |
-| Test.java:1389:21:1389:23 | out : Bundle [<map.value>] : byte[] | Test.java:1389:9:1389:24 | getMapValue(...) | provenance | MaD:179 |
+| Test.java:1389:21:1389:23 | out : Bundle [<map.value>] : byte[] | Test.java:1389:9:1389:24 | getMapValue(...) | provenance | MaD:175 |
 | Test.java:1394:16:1394:31 | (...)... : String | Test.java:1395:16:1395:17 | in : String | provenance |  |
 | Test.java:1394:24:1394:31 | source(...) : Object | Test.java:1394:16:1394:31 | (...)... : String | provenance |  |
 | Test.java:1395:4:1395:6 | out [post update] : Bundle [<map.key>] : String | Test.java:1396:19:1396:21 | out : Bundle [<map.key>] : String | provenance |  |
@@ -1755,7 +1755,7 @@ edges
 | Test.java:1408:24:1408:31 | source(...) : Object | Test.java:1408:16:1408:31 | (...)... : char[] | provenance |  |
 | Test.java:1409:4:1409:6 | out [post update] : Bundle [<map.value>] : char[] | Test.java:1410:21:1410:23 | out : Bundle [<map.value>] : char[] | provenance |  |
 | Test.java:1409:27:1409:28 | in : char[] | Test.java:1409:4:1409:6 | out [post update] : Bundle [<map.value>] : char[] | provenance | MaD:147 |
-| Test.java:1410:21:1410:23 | out : Bundle [<map.value>] : char[] | Test.java:1410:9:1410:24 | getMapValue(...) | provenance | MaD:179 |
+| Test.java:1410:21:1410:23 | out : Bundle [<map.value>] : char[] | Test.java:1410:9:1410:24 | getMapValue(...) | provenance | MaD:175 |
 | Test.java:1415:16:1415:31 | (...)... : String | Test.java:1416:24:1416:25 | in : String | provenance |  |
 | Test.java:1415:24:1415:31 | source(...) : Object | Test.java:1415:16:1415:31 | (...)... : String | provenance |  |
 | Test.java:1416:4:1416:6 | out [post update] : Bundle [<map.key>] : String | Test.java:1417:19:1417:21 | out : Bundle [<map.key>] : String | provenance |  |
@@ -1766,7 +1766,7 @@ edges
 | Test.java:1422:36:1422:43 | source(...) : Object | Test.java:1422:22:1422:43 | (...)... : CharSequence | provenance |  |
 | Test.java:1423:4:1423:6 | out [post update] : Bundle [<map.value>] : CharSequence | Test.java:1424:21:1424:23 | out : Bundle [<map.value>] : CharSequence | provenance |  |
 | Test.java:1423:30:1423:31 | in : CharSequence | Test.java:1423:4:1423:6 | out [post update] : Bundle [<map.value>] : CharSequence | provenance | MaD:149 |
-| Test.java:1424:21:1424:23 | out : Bundle [<map.value>] : CharSequence | Test.java:1424:9:1424:24 | getMapValue(...) | provenance | MaD:179 |
+| Test.java:1424:21:1424:23 | out : Bundle [<map.value>] : CharSequence | Test.java:1424:9:1424:24 | getMapValue(...) | provenance | MaD:175 |
 | Test.java:1429:16:1429:31 | (...)... : String | Test.java:1430:29:1430:30 | in : String | provenance |  |
 | Test.java:1429:24:1429:31 | source(...) : Object | Test.java:1429:16:1429:31 | (...)... : String | provenance |  |
 | Test.java:1430:4:1430:6 | out [post update] : Bundle [<map.key>] : String | Test.java:1431:19:1431:21 | out : Bundle [<map.key>] : String | provenance |  |
@@ -1777,7 +1777,7 @@ edges
 | Test.java:1436:40:1436:47 | source(...) : Object | Test.java:1436:24:1436:47 | (...)... : CharSequence[] | provenance |  |
 | Test.java:1437:4:1437:6 | out [post update] : Bundle [<map.value>] : CharSequence[] | Test.java:1438:21:1438:23 | out : Bundle [<map.value>] : CharSequence[] | provenance |  |
 | Test.java:1437:35:1437:36 | in : CharSequence[] | Test.java:1437:4:1437:6 | out [post update] : Bundle [<map.value>] : CharSequence[] | provenance | MaD:151 |
-| Test.java:1438:21:1438:23 | out : Bundle [<map.value>] : CharSequence[] | Test.java:1438:9:1438:24 | getMapValue(...) | provenance | MaD:179 |
+| Test.java:1438:21:1438:23 | out : Bundle [<map.value>] : CharSequence[] | Test.java:1438:9:1438:24 | getMapValue(...) | provenance | MaD:175 |
 | Test.java:1443:16:1443:31 | (...)... : String | Test.java:1444:33:1444:34 | in : String | provenance |  |
 | Test.java:1443:24:1443:31 | source(...) : Object | Test.java:1443:16:1443:31 | (...)... : String | provenance |  |
 | Test.java:1444:4:1444:6 | out [post update] : Bundle [<map.key>] : String | Test.java:1445:19:1445:21 | out : Bundle [<map.key>] : String | provenance |  |
@@ -1788,7 +1788,7 @@ edges
 | Test.java:1450:30:1450:37 | source(...) : Object | Test.java:1450:19:1450:37 | (...)... : ArrayList | provenance |  |
 | Test.java:1451:4:1451:6 | out [post update] : Bundle [<map.value>] : ArrayList | Test.java:1452:21:1452:23 | out : Bundle [<map.value>] : ArrayList | provenance |  |
 | Test.java:1451:39:1451:40 | in : ArrayList | Test.java:1451:4:1451:6 | out [post update] : Bundle [<map.value>] : ArrayList | provenance | MaD:153 |
-| Test.java:1452:21:1452:23 | out : Bundle [<map.value>] : ArrayList | Test.java:1452:9:1452:24 | getMapValue(...) | provenance | MaD:179 |
+| Test.java:1452:21:1452:23 | out : Bundle [<map.value>] : ArrayList | Test.java:1452:9:1452:24 | getMapValue(...) | provenance | MaD:175 |
 | Test.java:1457:16:1457:31 | (...)... : String | Test.java:1458:17:1458:18 | in : String | provenance |  |
 | Test.java:1457:24:1457:31 | source(...) : Object | Test.java:1457:16:1457:31 | (...)... : String | provenance |  |
 | Test.java:1458:4:1458:6 | out [post update] : Bundle [<map.key>] : String | Test.java:1459:19:1459:21 | out : Bundle [<map.key>] : String | provenance |  |
@@ -1817,7 +1817,7 @@ edges
 | Test.java:1485:32:1485:39 | source(...) : Object | Test.java:1485:20:1485:39 | (...)... : Parcelable | provenance |  |
 | Test.java:1486:4:1486:6 | out [post update] : Bundle [<map.value>] : Parcelable | Test.java:1487:21:1487:23 | out : Bundle [<map.value>] : Parcelable | provenance |  |
 | Test.java:1486:28:1486:29 | in : Parcelable | Test.java:1486:4:1486:6 | out [post update] : Bundle [<map.value>] : Parcelable | provenance | MaD:158 |
-| Test.java:1487:21:1487:23 | out : Bundle [<map.value>] : Parcelable | Test.java:1487:9:1487:24 | getMapValue(...) | provenance | MaD:179 |
+| Test.java:1487:21:1487:23 | out : Bundle [<map.value>] : Parcelable | Test.java:1487:9:1487:24 | getMapValue(...) | provenance | MaD:175 |
 | Test.java:1492:16:1492:31 | (...)... : String | Test.java:1493:27:1493:28 | in : String | provenance |  |
 | Test.java:1492:24:1492:31 | source(...) : Object | Test.java:1492:16:1492:31 | (...)... : String | provenance |  |
 | Test.java:1493:4:1493:6 | out [post update] : Bundle [<map.key>] : String | Test.java:1494:19:1494:21 | out : Bundle [<map.key>] : String | provenance |  |
@@ -1828,7 +1828,7 @@ edges
 | Test.java:1499:36:1499:43 | source(...) : Object | Test.java:1499:22:1499:43 | (...)... : Parcelable[] | provenance |  |
 | Test.java:1500:4:1500:6 | out [post update] : Bundle [<map.value>] : Parcelable[] | Test.java:1501:21:1501:23 | out : Bundle [<map.value>] : Parcelable[] | provenance |  |
 | Test.java:1500:33:1500:34 | in : Parcelable[] | Test.java:1500:4:1500:6 | out [post update] : Bundle [<map.value>] : Parcelable[] | provenance | MaD:160 |
-| Test.java:1501:21:1501:23 | out : Bundle [<map.value>] : Parcelable[] | Test.java:1501:9:1501:24 | getMapValue(...) | provenance | MaD:179 |
+| Test.java:1501:21:1501:23 | out : Bundle [<map.value>] : Parcelable[] | Test.java:1501:9:1501:24 | getMapValue(...) | provenance | MaD:175 |
 | Test.java:1506:16:1506:31 | (...)... : String | Test.java:1507:31:1507:32 | in : String | provenance |  |
 | Test.java:1506:24:1506:31 | source(...) : Object | Test.java:1506:16:1506:31 | (...)... : String | provenance |  |
 | Test.java:1507:4:1507:6 | out [post update] : Bundle [<map.key>] : String | Test.java:1508:19:1508:21 | out : Bundle [<map.key>] : String | provenance |  |
@@ -1839,7 +1839,7 @@ edges
 | Test.java:1513:30:1513:37 | source(...) : Object | Test.java:1513:19:1513:37 | (...)... : ArrayList | provenance |  |
 | Test.java:1514:4:1514:6 | out [post update] : Bundle [<map.value>] : ArrayList | Test.java:1515:21:1515:23 | out : Bundle [<map.value>] : ArrayList | provenance |  |
 | Test.java:1514:37:1514:38 | in : ArrayList | Test.java:1514:4:1514:6 | out [post update] : Bundle [<map.value>] : ArrayList | provenance | MaD:162 |
-| Test.java:1515:21:1515:23 | out : Bundle [<map.value>] : ArrayList | Test.java:1515:9:1515:24 | getMapValue(...) | provenance | MaD:179 |
+| Test.java:1515:21:1515:23 | out : Bundle [<map.value>] : ArrayList | Test.java:1515:9:1515:24 | getMapValue(...) | provenance | MaD:175 |
 | Test.java:1520:16:1520:31 | (...)... : String | Test.java:1521:24:1521:25 | in : String | provenance |  |
 | Test.java:1520:24:1520:31 | source(...) : Object | Test.java:1520:16:1520:31 | (...)... : String | provenance |  |
 | Test.java:1521:4:1521:6 | out [post update] : Bundle [<map.key>] : String | Test.java:1522:19:1522:21 | out : Bundle [<map.key>] : String | provenance |  |
@@ -1850,7 +1850,7 @@ edges
 | Test.java:1527:36:1527:43 | source(...) : Object | Test.java:1527:22:1527:43 | (...)... : Serializable | provenance |  |
 | Test.java:1528:4:1528:6 | out [post update] : Bundle [<map.value>] : Serializable | Test.java:1529:21:1529:23 | out : Bundle [<map.value>] : Serializable | provenance |  |
 | Test.java:1528:30:1528:31 | in : Serializable | Test.java:1528:4:1528:6 | out [post update] : Bundle [<map.value>] : Serializable | provenance | MaD:164 |
-| Test.java:1529:21:1529:23 | out : Bundle [<map.value>] : Serializable | Test.java:1529:9:1529:24 | getMapValue(...) | provenance | MaD:179 |
+| Test.java:1529:21:1529:23 | out : Bundle [<map.value>] : Serializable | Test.java:1529:9:1529:24 | getMapValue(...) | provenance | MaD:175 |
 | Test.java:1534:16:1534:31 | (...)... : String | Test.java:1535:17:1535:18 | in : String | provenance |  |
 | Test.java:1534:24:1534:31 | source(...) : Object | Test.java:1534:16:1534:31 | (...)... : String | provenance |  |
 | Test.java:1535:4:1535:6 | out [post update] : Bundle [<map.key>] : String | Test.java:1536:19:1536:21 | out : Bundle [<map.key>] : String | provenance |  |
@@ -1885,7 +1885,7 @@ edges
 | Test.java:1569:34:1569:41 | source(...) : Object | Test.java:1569:21:1569:41 | (...)... : SparseArray | provenance |  |
 | Test.java:1570:4:1570:6 | out [post update] : Bundle [<map.value>] : SparseArray | Test.java:1571:21:1571:23 | out : Bundle [<map.value>] : SparseArray | provenance |  |
 | Test.java:1570:39:1570:40 | in : SparseArray | Test.java:1570:4:1570:6 | out [post update] : Bundle [<map.value>] : SparseArray | provenance | MaD:170 |
-| Test.java:1571:21:1571:23 | out : Bundle [<map.value>] : SparseArray | Test.java:1571:9:1571:24 | getMapValue(...) | provenance | MaD:179 |
+| Test.java:1571:21:1571:23 | out : Bundle [<map.value>] : SparseArray | Test.java:1571:9:1571:24 | getMapValue(...) | provenance | MaD:175 |
 | Test.java:1576:16:1576:31 | (...)... : String | Test.java:1577:27:1577:28 | in : String | provenance |  |
 | Test.java:1576:24:1576:31 | source(...) : Object | Test.java:1576:16:1576:31 | (...)... : String | provenance |  |
 | Test.java:1577:4:1577:6 | out [post update] : Bundle [<map.key>] : String | Test.java:1578:19:1578:21 | out : Bundle [<map.key>] : String | provenance |  |
@@ -1896,7 +1896,7 @@ edges
 | Test.java:1583:30:1583:37 | source(...) : Object | Test.java:1583:19:1583:37 | (...)... : ArrayList | provenance |  |
 | Test.java:1584:4:1584:6 | out [post update] : Bundle [<map.value>] : ArrayList | Test.java:1585:21:1585:23 | out : Bundle [<map.value>] : ArrayList | provenance |  |
 | Test.java:1584:33:1584:34 | in : ArrayList | Test.java:1584:4:1584:6 | out [post update] : Bundle [<map.value>] : ArrayList | provenance | MaD:172 |
-| Test.java:1585:21:1585:23 | out : Bundle [<map.value>] : ArrayList | Test.java:1585:9:1585:24 | getMapValue(...) | provenance | MaD:179 |
+| Test.java:1585:21:1585:23 | out : Bundle [<map.value>] : ArrayList | Test.java:1585:9:1585:24 | getMapValue(...) | provenance | MaD:175 |
 | Test.java:1590:16:1590:31 | (...)... : Parcel | Test.java:1591:23:1591:24 | in : Parcel | provenance |  |
 | Test.java:1590:24:1590:31 | source(...) : Object | Test.java:1590:16:1590:31 | (...)... : Parcel | provenance |  |
 | Test.java:1591:4:1591:6 | out [post update] : Bundle [<map.key>] : Object | Test.java:1592:19:1592:21 | out : Bundle [<map.key>] : Object | provenance |  |
@@ -1907,7 +1907,7 @@ edges
 | Test.java:1597:24:1597:31 | source(...) : Object | Test.java:1597:16:1597:31 | (...)... : Parcel | provenance |  |
 | Test.java:1598:4:1598:6 | out [post update] : Bundle [<map.value>] : Object | Test.java:1599:21:1599:23 | out : Bundle [<map.value>] : Object | provenance |  |
 | Test.java:1598:23:1598:24 | in : Parcel | Test.java:1598:4:1598:6 | out [post update] : Bundle [<map.value>] : Object | provenance | MaD:174 |
-| Test.java:1599:21:1599:23 | out : Bundle [<map.value>] : Object | Test.java:1599:9:1599:24 | getMapValue(...) | provenance | MaD:179 |
+| Test.java:1599:21:1599:23 | out : Bundle [<map.value>] : Object | Test.java:1599:9:1599:24 | getMapValue(...) | provenance | MaD:175 |
 | Test.java:1604:15:1604:30 | (...)... : Class | Test.java:1605:44:1605:45 | in : Class | provenance |  |
 | Test.java:1604:23:1604:30 | source(...) : Object | Test.java:1604:15:1604:30 | (...)... : Class | provenance |  |
 | Test.java:1605:10:1605:46 | new ComponentName(...) : ComponentName | Test.java:1606:9:1606:11 | out | provenance |  |
@@ -1967,45 +1967,45 @@ edges
 | Test.java:1702:15:1702:30 | (...)... : Class | Test.java:1703:37:1703:38 | in : Class | provenance |  |
 | Test.java:1702:23:1702:30 | source(...) : Object | Test.java:1702:15:1702:30 | (...)... : Class | provenance |  |
 | Test.java:1703:10:1703:39 | new Intent(...) : Intent | Test.java:1704:9:1704:11 | out | provenance |  |
-| Test.java:1703:37:1703:38 | in : Class | Test.java:1703:10:1703:39 | new Intent(...) : Intent | provenance | MaD:13 |
+| Test.java:1703:37:1703:38 | in : Class | Test.java:1703:10:1703:39 | new Intent(...) : Intent | provenance | MaD:21 |
 | Test.java:1709:16:1709:32 | (...)... : Intent | Test.java:1710:21:1710:22 | in : Intent | provenance |  |
 | Test.java:1709:25:1709:32 | source(...) : Object | Test.java:1709:16:1709:32 | (...)... : Intent | provenance |  |
 | Test.java:1710:10:1710:23 | new Intent(...) : Intent | Test.java:1711:9:1711:11 | out | provenance |  |
-| Test.java:1710:21:1710:22 | in : Intent | Test.java:1710:10:1710:23 | new Intent(...) : Intent | provenance | MaD:14 |
+| Test.java:1710:21:1710:22 | in : Intent | Test.java:1710:10:1710:23 | new Intent(...) : Intent | provenance | MaD:22 |
 | Test.java:1716:15:1716:30 | (...)... : Class | Test.java:1717:39:1717:40 | in : Class | provenance |  |
 | Test.java:1716:23:1716:30 | source(...) : Object | Test.java:1716:15:1716:30 | (...)... : Class | provenance |  |
 | Test.java:1717:10:1717:41 | new Intent(...) : Intent | Test.java:1718:9:1718:11 | out | provenance |  |
-| Test.java:1717:39:1717:40 | in : Class | Test.java:1717:10:1717:41 | new Intent(...) : Intent | provenance | MaD:19 |
+| Test.java:1717:39:1717:40 | in : Class | Test.java:1717:10:1717:41 | new Intent(...) : Intent | provenance | MaD:23 |
 | Test.java:1723:15:1723:30 | (...)... : Class | Test.java:1724:23:1724:24 | in : Class | provenance |  |
 | Test.java:1723:23:1723:30 | source(...) : Object | Test.java:1723:15:1723:30 | (...)... : Class | provenance |  |
 | Test.java:1724:4:1724:6 | out [post update] : Intent | Test.java:1725:9:1725:11 | out | provenance |  |
-| Test.java:1724:23:1724:24 | in : Class | Test.java:1724:4:1724:6 | out [post update] : Intent | provenance | MaD:73 |
+| Test.java:1724:23:1724:24 | in : Class | Test.java:1724:4:1724:6 | out [post update] : Intent | provenance | MaD:72 |
 | Test.java:1730:16:1730:32 | (...)... : String | Test.java:1731:37:1731:38 | in : String | provenance |  |
 | Test.java:1730:25:1730:32 | source(...) : Object | Test.java:1730:16:1730:32 | (...)... : String | provenance |  |
 | Test.java:1731:4:1731:6 | out [post update] : Intent | Test.java:1732:9:1732:11 | out | provenance |  |
-| Test.java:1731:37:1731:38 | in : String | Test.java:1731:4:1731:6 | out [post update] : Intent | provenance | MaD:75 |
+| Test.java:1731:37:1731:38 | in : String | Test.java:1731:4:1731:6 | out [post update] : Intent | provenance | MaD:74 |
 | Test.java:1737:16:1737:32 | (...)... : String | Test.java:1738:21:1738:22 | in : String | provenance |  |
 | Test.java:1737:25:1737:32 | source(...) : Object | Test.java:1737:16:1737:32 | (...)... : String | provenance |  |
 | Test.java:1738:4:1738:6 | out [post update] : Intent | Test.java:1739:9:1739:11 | out | provenance |  |
-| Test.java:1738:21:1738:22 | in : String | Test.java:1738:4:1738:6 | out [post update] : Intent | provenance | MaD:76 |
+| Test.java:1738:21:1738:22 | in : String | Test.java:1738:4:1738:6 | out [post update] : Intent | provenance | MaD:75 |
 | Test.java:1744:16:1744:32 | (...)... : String | Test.java:1745:36:1745:37 | in : String | provenance |  |
 | Test.java:1744:25:1744:32 | source(...) : Object | Test.java:1744:16:1744:32 | (...)... : String | provenance |  |
 | Test.java:1745:4:1745:6 | out [post update] : Intent | Test.java:1746:9:1746:11 | out | provenance |  |
-| Test.java:1745:36:1745:37 | in : String | Test.java:1745:4:1745:6 | out [post update] : Intent | provenance | MaD:76 |
+| Test.java:1745:36:1745:37 | in : String | Test.java:1745:4:1745:6 | out [post update] : Intent | provenance | MaD:75 |
 | Test.java:1751:23:1751:46 | (...)... : ComponentName | Test.java:1752:21:1752:22 | in : ComponentName | provenance |  |
 | Test.java:1751:39:1751:46 | source(...) : Object | Test.java:1751:23:1751:46 | (...)... : ComponentName | provenance |  |
 | Test.java:1752:4:1752:6 | out [post update] : Intent | Test.java:1753:9:1753:11 | out | provenance |  |
-| Test.java:1752:21:1752:22 | in : ComponentName | Test.java:1752:4:1752:6 | out [post update] : Intent | provenance | MaD:78 |
+| Test.java:1752:21:1752:22 | in : ComponentName | Test.java:1752:4:1752:6 | out [post update] : Intent | provenance | MaD:77 |
 | Test.java:1758:16:1758:32 | (...)... : String | Test.java:1759:19:1759:20 | in : String | provenance |  |
 | Test.java:1758:25:1758:32 | source(...) : Object | Test.java:1758:16:1758:32 | (...)... : String | provenance |  |
 | Test.java:1759:4:1759:6 | out [post update] : Intent | Test.java:1760:9:1760:11 | out | provenance |  |
-| Test.java:1759:19:1759:20 | in : String | Test.java:1759:4:1759:6 | out [post update] : Intent | provenance | MaD:90 |
+| Test.java:1759:19:1759:20 | in : String | Test.java:1759:4:1759:6 | out [post update] : Intent | provenance | MaD:89 |
 | TestStartActivityToGetIntent.java:18:13:18:18 | intent [post update] : Intent [android.content.Intent.extras, <map.value>] : String | TestStartActivityToGetIntent.java:19:31:19:36 | intent : Intent [android.content.Intent.extras, <map.value>] : String | provenance |  |
 | TestStartActivityToGetIntent.java:18:13:18:18 | intent [post update] : Intent [android.content.Intent.extras, <map.value>] : String | TestStartActivityToGetIntent.java:19:31:19:36 | intent : Intent [android.content.Intent.extras, <map.value>] : String | provenance |  |
 | TestStartActivityToGetIntent.java:18:13:18:18 | intent [post update] : Intent [android.content.Intent.extras, <map.value>] : String | TestStartActivityToGetIntent.java:19:31:19:36 | intent : Intent [android.content.Intent.extras, <map.value>] : String | provenance |  |
-| TestStartActivityToGetIntent.java:18:37:18:64 | (...)... : String | TestStartActivityToGetIntent.java:18:13:18:18 | intent [post update] : Intent [android.content.Intent.extras, <map.value>] : String | provenance | MaD:50 |
-| TestStartActivityToGetIntent.java:18:37:18:64 | (...)... : String | TestStartActivityToGetIntent.java:18:13:18:18 | intent [post update] : Intent [android.content.Intent.extras, <map.value>] : String | provenance | MaD:50 |
-| TestStartActivityToGetIntent.java:18:37:18:64 | (...)... : String | TestStartActivityToGetIntent.java:18:13:18:18 | intent [post update] : Intent [android.content.Intent.extras, <map.value>] : String | provenance | MaD:50 |
+| TestStartActivityToGetIntent.java:18:37:18:64 | (...)... : String | TestStartActivityToGetIntent.java:18:13:18:18 | intent [post update] : Intent [android.content.Intent.extras, <map.value>] : String | provenance | MaD:49 |
+| TestStartActivityToGetIntent.java:18:37:18:64 | (...)... : String | TestStartActivityToGetIntent.java:18:13:18:18 | intent [post update] : Intent [android.content.Intent.extras, <map.value>] : String | provenance | MaD:49 |
+| TestStartActivityToGetIntent.java:18:37:18:64 | (...)... : String | TestStartActivityToGetIntent.java:18:13:18:18 | intent [post update] : Intent [android.content.Intent.extras, <map.value>] : String | provenance | MaD:49 |
 | TestStartActivityToGetIntent.java:18:46:18:64 | source(...) : Object | TestStartActivityToGetIntent.java:18:37:18:64 | (...)... : String | provenance |  |
 | TestStartActivityToGetIntent.java:19:31:19:36 | intent : Intent [android.content.Intent.extras, <map.value>] : String | TestStartActivityToGetIntent.java:95:18:95:28 | getIntent(...) : Intent [android.content.Intent.extras, <map.value>] : String | provenance |  |
 | TestStartActivityToGetIntent.java:19:31:19:36 | intent : Intent [android.content.Intent.extras, <map.value>] : String | TestStartActivityToGetIntent.java:95:18:95:28 | getIntent(...) : Intent [android.content.Intent.extras, <map.value>] : String | provenance |  |
@@ -2013,9 +2013,9 @@ edges
 | TestStartActivityToGetIntent.java:23:13:23:18 | intent [post update] : Intent [android.content.Intent.extras, <map.value>] : String | TestStartActivityToGetIntent.java:24:46:24:51 | intent : Intent [android.content.Intent.extras, <map.value>] : String | provenance |  |
 | TestStartActivityToGetIntent.java:23:13:23:18 | intent [post update] : Intent [android.content.Intent.extras, <map.value>] : String | TestStartActivityToGetIntent.java:24:46:24:51 | intent : Intent [android.content.Intent.extras, <map.value>] : String | provenance |  |
 | TestStartActivityToGetIntent.java:23:13:23:18 | intent [post update] : Intent [android.content.Intent.extras, <map.value>] : String | TestStartActivityToGetIntent.java:24:46:24:51 | intent : Intent [android.content.Intent.extras, <map.value>] : String | provenance |  |
-| TestStartActivityToGetIntent.java:23:37:23:69 | (...)... : String | TestStartActivityToGetIntent.java:23:13:23:18 | intent [post update] : Intent [android.content.Intent.extras, <map.value>] : String | provenance | MaD:50 |
-| TestStartActivityToGetIntent.java:23:37:23:69 | (...)... : String | TestStartActivityToGetIntent.java:23:13:23:18 | intent [post update] : Intent [android.content.Intent.extras, <map.value>] : String | provenance | MaD:50 |
-| TestStartActivityToGetIntent.java:23:37:23:69 | (...)... : String | TestStartActivityToGetIntent.java:23:13:23:18 | intent [post update] : Intent [android.content.Intent.extras, <map.value>] : String | provenance | MaD:50 |
+| TestStartActivityToGetIntent.java:23:37:23:69 | (...)... : String | TestStartActivityToGetIntent.java:23:13:23:18 | intent [post update] : Intent [android.content.Intent.extras, <map.value>] : String | provenance | MaD:49 |
+| TestStartActivityToGetIntent.java:23:37:23:69 | (...)... : String | TestStartActivityToGetIntent.java:23:13:23:18 | intent [post update] : Intent [android.content.Intent.extras, <map.value>] : String | provenance | MaD:49 |
+| TestStartActivityToGetIntent.java:23:37:23:69 | (...)... : String | TestStartActivityToGetIntent.java:23:13:23:18 | intent [post update] : Intent [android.content.Intent.extras, <map.value>] : String | provenance | MaD:49 |
 | TestStartActivityToGetIntent.java:23:46:23:69 | source(...) : Object | TestStartActivityToGetIntent.java:23:37:23:69 | (...)... : String | provenance |  |
 | TestStartActivityToGetIntent.java:24:32:24:52 | {...} : Intent[] [[], android.content.Intent.extras, <map.value>] : String | TestStartActivityToGetIntent.java:25:33:25:39 | intents : Intent[] [[], android.content.Intent.extras, <map.value>] : String | provenance |  |
 | TestStartActivityToGetIntent.java:24:32:24:52 | {...} : Intent[] [[], android.content.Intent.extras, <map.value>] : String | TestStartActivityToGetIntent.java:25:33:25:39 | intents : Intent[] [[], android.content.Intent.extras, <map.value>] : String | provenance |  |
@@ -2029,9 +2029,9 @@ edges
 | TestStartActivityToGetIntent.java:29:13:29:18 | intent [post update] : Intent [android.content.Intent.extras, <map.value>] : String | TestStartActivityToGetIntent.java:30:46:30:51 | intent : Intent [android.content.Intent.extras, <map.value>] : String | provenance |  |
 | TestStartActivityToGetIntent.java:29:13:29:18 | intent [post update] : Intent [android.content.Intent.extras, <map.value>] : String | TestStartActivityToGetIntent.java:30:46:30:51 | intent : Intent [android.content.Intent.extras, <map.value>] : String | provenance |  |
 | TestStartActivityToGetIntent.java:29:13:29:18 | intent [post update] : Intent [android.content.Intent.extras, <map.value>] : String | TestStartActivityToGetIntent.java:30:46:30:51 | intent : Intent [android.content.Intent.extras, <map.value>] : String | provenance |  |
-| TestStartActivityToGetIntent.java:29:37:29:71 | (...)... : String | TestStartActivityToGetIntent.java:29:13:29:18 | intent [post update] : Intent [android.content.Intent.extras, <map.value>] : String | provenance | MaD:50 |
-| TestStartActivityToGetIntent.java:29:37:29:71 | (...)... : String | TestStartActivityToGetIntent.java:29:13:29:18 | intent [post update] : Intent [android.content.Intent.extras, <map.value>] : String | provenance | MaD:50 |
-| TestStartActivityToGetIntent.java:29:37:29:71 | (...)... : String | TestStartActivityToGetIntent.java:29:13:29:18 | intent [post update] : Intent [android.content.Intent.extras, <map.value>] : String | provenance | MaD:50 |
+| TestStartActivityToGetIntent.java:29:37:29:71 | (...)... : String | TestStartActivityToGetIntent.java:29:13:29:18 | intent [post update] : Intent [android.content.Intent.extras, <map.value>] : String | provenance | MaD:49 |
+| TestStartActivityToGetIntent.java:29:37:29:71 | (...)... : String | TestStartActivityToGetIntent.java:29:13:29:18 | intent [post update] : Intent [android.content.Intent.extras, <map.value>] : String | provenance | MaD:49 |
+| TestStartActivityToGetIntent.java:29:37:29:71 | (...)... : String | TestStartActivityToGetIntent.java:29:13:29:18 | intent [post update] : Intent [android.content.Intent.extras, <map.value>] : String | provenance | MaD:49 |
 | TestStartActivityToGetIntent.java:29:46:29:71 | source(...) : Object | TestStartActivityToGetIntent.java:29:37:29:71 | (...)... : String | provenance |  |
 | TestStartActivityToGetIntent.java:30:32:30:52 | {...} : Intent[] [[], android.content.Intent.extras, <map.value>] : String | TestStartActivityToGetIntent.java:31:33:31:39 | intents : Intent[] [[], android.content.Intent.extras, <map.value>] : String | provenance |  |
 | TestStartActivityToGetIntent.java:30:32:30:52 | {...} : Intent[] [[], android.content.Intent.extras, <map.value>] : String | TestStartActivityToGetIntent.java:31:33:31:39 | intents : Intent[] [[], android.content.Intent.extras, <map.value>] : String | provenance |  |
@@ -2045,9 +2045,9 @@ edges
 | TestStartActivityToGetIntent.java:35:13:35:18 | intent [post update] : Intent [android.content.Intent.extras, <map.value>] : String | TestStartActivityToGetIntent.java:36:31:36:36 | intent : Intent [android.content.Intent.extras, <map.value>] : String | provenance |  |
 | TestStartActivityToGetIntent.java:35:13:35:18 | intent [post update] : Intent [android.content.Intent.extras, <map.value>] : String | TestStartActivityToGetIntent.java:36:31:36:36 | intent : Intent [android.content.Intent.extras, <map.value>] : String | provenance |  |
 | TestStartActivityToGetIntent.java:35:13:35:18 | intent [post update] : Intent [android.content.Intent.extras, <map.value>] : String | TestStartActivityToGetIntent.java:36:31:36:36 | intent : Intent [android.content.Intent.extras, <map.value>] : String | provenance |  |
-| TestStartActivityToGetIntent.java:35:37:35:64 | (...)... : String | TestStartActivityToGetIntent.java:35:13:35:18 | intent [post update] : Intent [android.content.Intent.extras, <map.value>] : String | provenance | MaD:50 |
-| TestStartActivityToGetIntent.java:35:37:35:64 | (...)... : String | TestStartActivityToGetIntent.java:35:13:35:18 | intent [post update] : Intent [android.content.Intent.extras, <map.value>] : String | provenance | MaD:50 |
-| TestStartActivityToGetIntent.java:35:37:35:64 | (...)... : String | TestStartActivityToGetIntent.java:35:13:35:18 | intent [post update] : Intent [android.content.Intent.extras, <map.value>] : String | provenance | MaD:50 |
+| TestStartActivityToGetIntent.java:35:37:35:64 | (...)... : String | TestStartActivityToGetIntent.java:35:13:35:18 | intent [post update] : Intent [android.content.Intent.extras, <map.value>] : String | provenance | MaD:49 |
+| TestStartActivityToGetIntent.java:35:37:35:64 | (...)... : String | TestStartActivityToGetIntent.java:35:13:35:18 | intent [post update] : Intent [android.content.Intent.extras, <map.value>] : String | provenance | MaD:49 |
+| TestStartActivityToGetIntent.java:35:37:35:64 | (...)... : String | TestStartActivityToGetIntent.java:35:13:35:18 | intent [post update] : Intent [android.content.Intent.extras, <map.value>] : String | provenance | MaD:49 |
 | TestStartActivityToGetIntent.java:35:46:35:64 | source(...) : Object | TestStartActivityToGetIntent.java:35:37:35:64 | (...)... : String | provenance |  |
 | TestStartActivityToGetIntent.java:36:31:36:36 | intent : Intent [android.content.Intent.extras, <map.value>] : String | TestStartActivityToGetIntent.java:95:18:95:28 | getIntent(...) : Intent [android.content.Intent.extras, <map.value>] : String | provenance |  |
 | TestStartActivityToGetIntent.java:36:31:36:36 | intent : Intent [android.content.Intent.extras, <map.value>] : String | TestStartActivityToGetIntent.java:95:18:95:28 | getIntent(...) : Intent [android.content.Intent.extras, <map.value>] : String | provenance |  |
@@ -2055,9 +2055,9 @@ edges
 | TestStartActivityToGetIntent.java:40:13:40:18 | intent [post update] : Intent [android.content.Intent.extras, <map.value>] : String | TestStartActivityToGetIntent.java:41:46:41:51 | intent : Intent [android.content.Intent.extras, <map.value>] : String | provenance |  |
 | TestStartActivityToGetIntent.java:40:13:40:18 | intent [post update] : Intent [android.content.Intent.extras, <map.value>] : String | TestStartActivityToGetIntent.java:41:46:41:51 | intent : Intent [android.content.Intent.extras, <map.value>] : String | provenance |  |
 | TestStartActivityToGetIntent.java:40:13:40:18 | intent [post update] : Intent [android.content.Intent.extras, <map.value>] : String | TestStartActivityToGetIntent.java:41:46:41:51 | intent : Intent [android.content.Intent.extras, <map.value>] : String | provenance |  |
-| TestStartActivityToGetIntent.java:40:37:40:69 | (...)... : String | TestStartActivityToGetIntent.java:40:13:40:18 | intent [post update] : Intent [android.content.Intent.extras, <map.value>] : String | provenance | MaD:50 |
-| TestStartActivityToGetIntent.java:40:37:40:69 | (...)... : String | TestStartActivityToGetIntent.java:40:13:40:18 | intent [post update] : Intent [android.content.Intent.extras, <map.value>] : String | provenance | MaD:50 |
-| TestStartActivityToGetIntent.java:40:37:40:69 | (...)... : String | TestStartActivityToGetIntent.java:40:13:40:18 | intent [post update] : Intent [android.content.Intent.extras, <map.value>] : String | provenance | MaD:50 |
+| TestStartActivityToGetIntent.java:40:37:40:69 | (...)... : String | TestStartActivityToGetIntent.java:40:13:40:18 | intent [post update] : Intent [android.content.Intent.extras, <map.value>] : String | provenance | MaD:49 |
+| TestStartActivityToGetIntent.java:40:37:40:69 | (...)... : String | TestStartActivityToGetIntent.java:40:13:40:18 | intent [post update] : Intent [android.content.Intent.extras, <map.value>] : String | provenance | MaD:49 |
+| TestStartActivityToGetIntent.java:40:37:40:69 | (...)... : String | TestStartActivityToGetIntent.java:40:13:40:18 | intent [post update] : Intent [android.content.Intent.extras, <map.value>] : String | provenance | MaD:49 |
 | TestStartActivityToGetIntent.java:40:46:40:69 | source(...) : Object | TestStartActivityToGetIntent.java:40:37:40:69 | (...)... : String | provenance |  |
 | TestStartActivityToGetIntent.java:41:32:41:52 | {...} : Intent[] [[], android.content.Intent.extras, <map.value>] : String | TestStartActivityToGetIntent.java:42:33:42:39 | intents : Intent[] [[], android.content.Intent.extras, <map.value>] : String | provenance |  |
 | TestStartActivityToGetIntent.java:41:32:41:52 | {...} : Intent[] [[], android.content.Intent.extras, <map.value>] : String | TestStartActivityToGetIntent.java:42:33:42:39 | intents : Intent[] [[], android.content.Intent.extras, <map.value>] : String | provenance |  |
@@ -2071,9 +2071,9 @@ edges
 | TestStartActivityToGetIntent.java:52:13:52:18 | intent [post update] : Intent [android.content.Intent.extras, <map.value>] : String | TestStartActivityToGetIntent.java:53:40:53:45 | intent : Intent [android.content.Intent.extras, <map.value>] : String | provenance |  |
 | TestStartActivityToGetIntent.java:52:13:52:18 | intent [post update] : Intent [android.content.Intent.extras, <map.value>] : String | TestStartActivityToGetIntent.java:53:40:53:45 | intent : Intent [android.content.Intent.extras, <map.value>] : String | provenance |  |
 | TestStartActivityToGetIntent.java:52:13:52:18 | intent [post update] : Intent [android.content.Intent.extras, <map.value>] : String | TestStartActivityToGetIntent.java:53:40:53:45 | intent : Intent [android.content.Intent.extras, <map.value>] : String | provenance |  |
-| TestStartActivityToGetIntent.java:52:37:52:71 | (...)... : String | TestStartActivityToGetIntent.java:52:13:52:18 | intent [post update] : Intent [android.content.Intent.extras, <map.value>] : String | provenance | MaD:50 |
-| TestStartActivityToGetIntent.java:52:37:52:71 | (...)... : String | TestStartActivityToGetIntent.java:52:13:52:18 | intent [post update] : Intent [android.content.Intent.extras, <map.value>] : String | provenance | MaD:50 |
-| TestStartActivityToGetIntent.java:52:37:52:71 | (...)... : String | TestStartActivityToGetIntent.java:52:13:52:18 | intent [post update] : Intent [android.content.Intent.extras, <map.value>] : String | provenance | MaD:50 |
+| TestStartActivityToGetIntent.java:52:37:52:71 | (...)... : String | TestStartActivityToGetIntent.java:52:13:52:18 | intent [post update] : Intent [android.content.Intent.extras, <map.value>] : String | provenance | MaD:49 |
+| TestStartActivityToGetIntent.java:52:37:52:71 | (...)... : String | TestStartActivityToGetIntent.java:52:13:52:18 | intent [post update] : Intent [android.content.Intent.extras, <map.value>] : String | provenance | MaD:49 |
+| TestStartActivityToGetIntent.java:52:37:52:71 | (...)... : String | TestStartActivityToGetIntent.java:52:13:52:18 | intent [post update] : Intent [android.content.Intent.extras, <map.value>] : String | provenance | MaD:49 |
 | TestStartActivityToGetIntent.java:52:46:52:71 | source(...) : Object | TestStartActivityToGetIntent.java:52:37:52:71 | (...)... : String | provenance |  |
 | TestStartActivityToGetIntent.java:53:40:53:45 | intent : Intent [android.content.Intent.extras, <map.value>] : String | TestStartActivityToGetIntent.java:95:18:95:28 | getIntent(...) : Intent [android.content.Intent.extras, <map.value>] : String | provenance |  |
 | TestStartActivityToGetIntent.java:53:40:53:45 | intent : Intent [android.content.Intent.extras, <map.value>] : String | TestStartActivityToGetIntent.java:95:18:95:28 | getIntent(...) : Intent [android.content.Intent.extras, <map.value>] : String | provenance |  |
@@ -2081,9 +2081,9 @@ edges
 | TestStartActivityToGetIntent.java:57:13:57:18 | intent [post update] : Intent [android.content.Intent.extras, <map.value>] : String | TestStartActivityToGetIntent.java:58:39:58:44 | intent : Intent [android.content.Intent.extras, <map.value>] : String | provenance |  |
 | TestStartActivityToGetIntent.java:57:13:57:18 | intent [post update] : Intent [android.content.Intent.extras, <map.value>] : String | TestStartActivityToGetIntent.java:58:39:58:44 | intent : Intent [android.content.Intent.extras, <map.value>] : String | provenance |  |
 | TestStartActivityToGetIntent.java:57:13:57:18 | intent [post update] : Intent [android.content.Intent.extras, <map.value>] : String | TestStartActivityToGetIntent.java:58:39:58:44 | intent : Intent [android.content.Intent.extras, <map.value>] : String | provenance |  |
-| TestStartActivityToGetIntent.java:57:37:57:70 | (...)... : String | TestStartActivityToGetIntent.java:57:13:57:18 | intent [post update] : Intent [android.content.Intent.extras, <map.value>] : String | provenance | MaD:50 |
-| TestStartActivityToGetIntent.java:57:37:57:70 | (...)... : String | TestStartActivityToGetIntent.java:57:13:57:18 | intent [post update] : Intent [android.content.Intent.extras, <map.value>] : String | provenance | MaD:50 |
-| TestStartActivityToGetIntent.java:57:37:57:70 | (...)... : String | TestStartActivityToGetIntent.java:57:13:57:18 | intent [post update] : Intent [android.content.Intent.extras, <map.value>] : String | provenance | MaD:50 |
+| TestStartActivityToGetIntent.java:57:37:57:70 | (...)... : String | TestStartActivityToGetIntent.java:57:13:57:18 | intent [post update] : Intent [android.content.Intent.extras, <map.value>] : String | provenance | MaD:49 |
+| TestStartActivityToGetIntent.java:57:37:57:70 | (...)... : String | TestStartActivityToGetIntent.java:57:13:57:18 | intent [post update] : Intent [android.content.Intent.extras, <map.value>] : String | provenance | MaD:49 |
+| TestStartActivityToGetIntent.java:57:37:57:70 | (...)... : String | TestStartActivityToGetIntent.java:57:13:57:18 | intent [post update] : Intent [android.content.Intent.extras, <map.value>] : String | provenance | MaD:49 |
 | TestStartActivityToGetIntent.java:57:46:57:70 | source(...) : Object | TestStartActivityToGetIntent.java:57:37:57:70 | (...)... : String | provenance |  |
 | TestStartActivityToGetIntent.java:58:39:58:44 | intent : Intent [android.content.Intent.extras, <map.value>] : String | TestStartActivityToGetIntent.java:95:18:95:28 | getIntent(...) : Intent [android.content.Intent.extras, <map.value>] : String | provenance |  |
 | TestStartActivityToGetIntent.java:58:39:58:44 | intent : Intent [android.content.Intent.extras, <map.value>] : String | TestStartActivityToGetIntent.java:95:18:95:28 | getIntent(...) : Intent [android.content.Intent.extras, <map.value>] : String | provenance |  |
@@ -2091,9 +2091,9 @@ edges
 | TestStartActivityToGetIntent.java:62:13:62:18 | intent [post update] : Intent [android.content.Intent.extras, <map.value>] : String | TestStartActivityToGetIntent.java:63:43:63:48 | intent : Intent [android.content.Intent.extras, <map.value>] : String | provenance |  |
 | TestStartActivityToGetIntent.java:62:13:62:18 | intent [post update] : Intent [android.content.Intent.extras, <map.value>] : String | TestStartActivityToGetIntent.java:63:43:63:48 | intent : Intent [android.content.Intent.extras, <map.value>] : String | provenance |  |
 | TestStartActivityToGetIntent.java:62:13:62:18 | intent [post update] : Intent [android.content.Intent.extras, <map.value>] : String | TestStartActivityToGetIntent.java:63:43:63:48 | intent : Intent [android.content.Intent.extras, <map.value>] : String | provenance |  |
-| TestStartActivityToGetIntent.java:62:37:62:69 | (...)... : String | TestStartActivityToGetIntent.java:62:13:62:18 | intent [post update] : Intent [android.content.Intent.extras, <map.value>] : String | provenance | MaD:50 |
-| TestStartActivityToGetIntent.java:62:37:62:69 | (...)... : String | TestStartActivityToGetIntent.java:62:13:62:18 | intent [post update] : Intent [android.content.Intent.extras, <map.value>] : String | provenance | MaD:50 |
-| TestStartActivityToGetIntent.java:62:37:62:69 | (...)... : String | TestStartActivityToGetIntent.java:62:13:62:18 | intent [post update] : Intent [android.content.Intent.extras, <map.value>] : String | provenance | MaD:50 |
+| TestStartActivityToGetIntent.java:62:37:62:69 | (...)... : String | TestStartActivityToGetIntent.java:62:13:62:18 | intent [post update] : Intent [android.content.Intent.extras, <map.value>] : String | provenance | MaD:49 |
+| TestStartActivityToGetIntent.java:62:37:62:69 | (...)... : String | TestStartActivityToGetIntent.java:62:13:62:18 | intent [post update] : Intent [android.content.Intent.extras, <map.value>] : String | provenance | MaD:49 |
+| TestStartActivityToGetIntent.java:62:37:62:69 | (...)... : String | TestStartActivityToGetIntent.java:62:13:62:18 | intent [post update] : Intent [android.content.Intent.extras, <map.value>] : String | provenance | MaD:49 |
 | TestStartActivityToGetIntent.java:62:46:62:69 | source(...) : Object | TestStartActivityToGetIntent.java:62:37:62:69 | (...)... : String | provenance |  |
 | TestStartActivityToGetIntent.java:63:43:63:48 | intent : Intent [android.content.Intent.extras, <map.value>] : String | TestStartActivityToGetIntent.java:95:18:95:28 | getIntent(...) : Intent [android.content.Intent.extras, <map.value>] : String | provenance |  |
 | TestStartActivityToGetIntent.java:63:43:63:48 | intent : Intent [android.content.Intent.extras, <map.value>] : String | TestStartActivityToGetIntent.java:95:18:95:28 | getIntent(...) : Intent [android.content.Intent.extras, <map.value>] : String | provenance |  |
@@ -2101,9 +2101,9 @@ edges
 | TestStartActivityToGetIntent.java:67:13:67:18 | intent [post update] : Intent [android.content.Intent.extras, <map.value>] : String | TestStartActivityToGetIntent.java:68:46:68:51 | intent : Intent [android.content.Intent.extras, <map.value>] : String | provenance |  |
 | TestStartActivityToGetIntent.java:67:13:67:18 | intent [post update] : Intent [android.content.Intent.extras, <map.value>] : String | TestStartActivityToGetIntent.java:68:46:68:51 | intent : Intent [android.content.Intent.extras, <map.value>] : String | provenance |  |
 | TestStartActivityToGetIntent.java:67:13:67:18 | intent [post update] : Intent [android.content.Intent.extras, <map.value>] : String | TestStartActivityToGetIntent.java:68:46:68:51 | intent : Intent [android.content.Intent.extras, <map.value>] : String | provenance |  |
-| TestStartActivityToGetIntent.java:67:37:67:71 | (...)... : String | TestStartActivityToGetIntent.java:67:13:67:18 | intent [post update] : Intent [android.content.Intent.extras, <map.value>] : String | provenance | MaD:50 |
-| TestStartActivityToGetIntent.java:67:37:67:71 | (...)... : String | TestStartActivityToGetIntent.java:67:13:67:18 | intent [post update] : Intent [android.content.Intent.extras, <map.value>] : String | provenance | MaD:50 |
-| TestStartActivityToGetIntent.java:67:37:67:71 | (...)... : String | TestStartActivityToGetIntent.java:67:13:67:18 | intent [post update] : Intent [android.content.Intent.extras, <map.value>] : String | provenance | MaD:50 |
+| TestStartActivityToGetIntent.java:67:37:67:71 | (...)... : String | TestStartActivityToGetIntent.java:67:13:67:18 | intent [post update] : Intent [android.content.Intent.extras, <map.value>] : String | provenance | MaD:49 |
+| TestStartActivityToGetIntent.java:67:37:67:71 | (...)... : String | TestStartActivityToGetIntent.java:67:13:67:18 | intent [post update] : Intent [android.content.Intent.extras, <map.value>] : String | provenance | MaD:49 |
+| TestStartActivityToGetIntent.java:67:37:67:71 | (...)... : String | TestStartActivityToGetIntent.java:67:13:67:18 | intent [post update] : Intent [android.content.Intent.extras, <map.value>] : String | provenance | MaD:49 |
 | TestStartActivityToGetIntent.java:67:46:67:71 | source(...) : Object | TestStartActivityToGetIntent.java:67:37:67:71 | (...)... : String | provenance |  |
 | TestStartActivityToGetIntent.java:68:46:68:51 | intent : Intent [android.content.Intent.extras, <map.value>] : String | TestStartActivityToGetIntent.java:95:18:95:28 | getIntent(...) : Intent [android.content.Intent.extras, <map.value>] : String | provenance |  |
 | TestStartActivityToGetIntent.java:68:46:68:51 | intent : Intent [android.content.Intent.extras, <map.value>] : String | TestStartActivityToGetIntent.java:95:18:95:28 | getIntent(...) : Intent [android.content.Intent.extras, <map.value>] : String | provenance |  |
@@ -2111,9 +2111,9 @@ edges
 | TestStartActivityToGetIntent.java:72:13:72:18 | intent [post update] : Intent [android.content.Intent.extras, <map.value>] : String | TestStartActivityToGetIntent.java:73:49:73:54 | intent : Intent [android.content.Intent.extras, <map.value>] : String | provenance |  |
 | TestStartActivityToGetIntent.java:72:13:72:18 | intent [post update] : Intent [android.content.Intent.extras, <map.value>] : String | TestStartActivityToGetIntent.java:73:49:73:54 | intent : Intent [android.content.Intent.extras, <map.value>] : String | provenance |  |
 | TestStartActivityToGetIntent.java:72:13:72:18 | intent [post update] : Intent [android.content.Intent.extras, <map.value>] : String | TestStartActivityToGetIntent.java:73:49:73:54 | intent : Intent [android.content.Intent.extras, <map.value>] : String | provenance |  |
-| TestStartActivityToGetIntent.java:72:37:72:70 | (...)... : String | TestStartActivityToGetIntent.java:72:13:72:18 | intent [post update] : Intent [android.content.Intent.extras, <map.value>] : String | provenance | MaD:50 |
-| TestStartActivityToGetIntent.java:72:37:72:70 | (...)... : String | TestStartActivityToGetIntent.java:72:13:72:18 | intent [post update] : Intent [android.content.Intent.extras, <map.value>] : String | provenance | MaD:50 |
-| TestStartActivityToGetIntent.java:72:37:72:70 | (...)... : String | TestStartActivityToGetIntent.java:72:13:72:18 | intent [post update] : Intent [android.content.Intent.extras, <map.value>] : String | provenance | MaD:50 |
+| TestStartActivityToGetIntent.java:72:37:72:70 | (...)... : String | TestStartActivityToGetIntent.java:72:13:72:18 | intent [post update] : Intent [android.content.Intent.extras, <map.value>] : String | provenance | MaD:49 |
+| TestStartActivityToGetIntent.java:72:37:72:70 | (...)... : String | TestStartActivityToGetIntent.java:72:13:72:18 | intent [post update] : Intent [android.content.Intent.extras, <map.value>] : String | provenance | MaD:49 |
+| TestStartActivityToGetIntent.java:72:37:72:70 | (...)... : String | TestStartActivityToGetIntent.java:72:13:72:18 | intent [post update] : Intent [android.content.Intent.extras, <map.value>] : String | provenance | MaD:49 |
 | TestStartActivityToGetIntent.java:72:46:72:70 | source(...) : Object | TestStartActivityToGetIntent.java:72:37:72:70 | (...)... : String | provenance |  |
 | TestStartActivityToGetIntent.java:73:49:73:54 | intent : Intent [android.content.Intent.extras, <map.value>] : String | TestStartActivityToGetIntent.java:95:18:95:28 | getIntent(...) : Intent [android.content.Intent.extras, <map.value>] : String | provenance |  |
 | TestStartActivityToGetIntent.java:73:49:73:54 | intent : Intent [android.content.Intent.extras, <map.value>] : String | TestStartActivityToGetIntent.java:95:18:95:28 | getIntent(...) : Intent [android.content.Intent.extras, <map.value>] : String | provenance |  |
@@ -2121,25 +2121,25 @@ edges
 | TestStartActivityToGetIntent.java:79:13:79:18 | intent [post update] : Intent [android.content.Intent.extras, <map.value>] : String | TestStartActivityToGetIntent.java:80:31:80:36 | intent : Intent [android.content.Intent.extras, <map.value>] : String | provenance |  |
 | TestStartActivityToGetIntent.java:79:13:79:18 | intent [post update] : Intent [android.content.Intent.extras, <map.value>] : String | TestStartActivityToGetIntent.java:80:31:80:36 | intent : Intent [android.content.Intent.extras, <map.value>] : String | provenance |  |
 | TestStartActivityToGetIntent.java:79:13:79:18 | intent [post update] : Intent [android.content.Intent.extras, <map.value>] : String | TestStartActivityToGetIntent.java:80:31:80:36 | intent : Intent [android.content.Intent.extras, <map.value>] : String | provenance |  |
-| TestStartActivityToGetIntent.java:79:37:79:60 | (...)... : String | TestStartActivityToGetIntent.java:79:13:79:18 | intent [post update] : Intent [android.content.Intent.extras, <map.value>] : String | provenance | MaD:50 |
-| TestStartActivityToGetIntent.java:79:37:79:60 | (...)... : String | TestStartActivityToGetIntent.java:79:13:79:18 | intent [post update] : Intent [android.content.Intent.extras, <map.value>] : String | provenance | MaD:50 |
-| TestStartActivityToGetIntent.java:79:37:79:60 | (...)... : String | TestStartActivityToGetIntent.java:79:13:79:18 | intent [post update] : Intent [android.content.Intent.extras, <map.value>] : String | provenance | MaD:50 |
+| TestStartActivityToGetIntent.java:79:37:79:60 | (...)... : String | TestStartActivityToGetIntent.java:79:13:79:18 | intent [post update] : Intent [android.content.Intent.extras, <map.value>] : String | provenance | MaD:49 |
+| TestStartActivityToGetIntent.java:79:37:79:60 | (...)... : String | TestStartActivityToGetIntent.java:79:13:79:18 | intent [post update] : Intent [android.content.Intent.extras, <map.value>] : String | provenance | MaD:49 |
+| TestStartActivityToGetIntent.java:79:37:79:60 | (...)... : String | TestStartActivityToGetIntent.java:79:13:79:18 | intent [post update] : Intent [android.content.Intent.extras, <map.value>] : String | provenance | MaD:49 |
 | TestStartActivityToGetIntent.java:79:46:79:60 | source(...) : Object | TestStartActivityToGetIntent.java:79:37:79:60 | (...)... : String | provenance |  |
 | TestStartActivityToGetIntent.java:80:31:80:36 | intent : Intent [android.content.Intent.extras, <map.value>] : String | TestStartActivityToGetIntent.java:95:18:95:28 | getIntent(...) : Intent [android.content.Intent.extras, <map.value>] : String | provenance |  |
 | TestStartActivityToGetIntent.java:80:31:80:36 | intent : Intent [android.content.Intent.extras, <map.value>] : String | TestStartActivityToGetIntent.java:95:18:95:28 | getIntent(...) : Intent [android.content.Intent.extras, <map.value>] : String | provenance |  |
 | TestStartActivityToGetIntent.java:80:31:80:36 | intent : Intent [android.content.Intent.extras, <map.value>] : String | TestStartActivityToGetIntent.java:95:18:95:28 | getIntent(...) : Intent [android.content.Intent.extras, <map.value>] : String | provenance |  |
-| TestStartActivityToGetIntent.java:95:18:95:28 | getIntent(...) : Intent [android.content.Intent.extras, <map.value>] : String | TestStartActivityToGetIntent.java:95:18:95:51 | getStringExtra(...) | provenance | MaD:42 |
-| TestStartActivityToGetIntent.java:95:18:95:28 | getIntent(...) : Intent [android.content.Intent.extras, <map.value>] : String | TestStartActivityToGetIntent.java:95:18:95:51 | getStringExtra(...) | provenance | MaD:42 |
-| TestStartActivityToGetIntent.java:95:18:95:28 | getIntent(...) : Intent [android.content.Intent.extras, <map.value>] : String | TestStartActivityToGetIntent.java:95:18:95:51 | getStringExtra(...) | provenance | MaD:42 |
-| TestStartActivityToGetIntent.java:102:18:102:28 | getIntent(...) : Intent [android.content.Intent.extras, <map.value>] : String | TestStartActivityToGetIntent.java:102:18:102:51 | getStringExtra(...) | provenance | MaD:42 |
-| TestStartActivityToGetIntent.java:102:18:102:28 | getIntent(...) : Intent [android.content.Intent.extras, <map.value>] : String | TestStartActivityToGetIntent.java:102:18:102:51 | getStringExtra(...) | provenance | MaD:42 |
-| TestStartActivityToGetIntent.java:102:18:102:28 | getIntent(...) : Intent [android.content.Intent.extras, <map.value>] : String | TestStartActivityToGetIntent.java:102:18:102:51 | getStringExtra(...) | provenance | MaD:42 |
+| TestStartActivityToGetIntent.java:95:18:95:28 | getIntent(...) : Intent [android.content.Intent.extras, <map.value>] : String | TestStartActivityToGetIntent.java:95:18:95:51 | getStringExtra(...) | provenance | MaD:43 |
+| TestStartActivityToGetIntent.java:95:18:95:28 | getIntent(...) : Intent [android.content.Intent.extras, <map.value>] : String | TestStartActivityToGetIntent.java:95:18:95:51 | getStringExtra(...) | provenance | MaD:43 |
+| TestStartActivityToGetIntent.java:95:18:95:28 | getIntent(...) : Intent [android.content.Intent.extras, <map.value>] : String | TestStartActivityToGetIntent.java:95:18:95:51 | getStringExtra(...) | provenance | MaD:43 |
+| TestStartActivityToGetIntent.java:102:18:102:28 | getIntent(...) : Intent [android.content.Intent.extras, <map.value>] : String | TestStartActivityToGetIntent.java:102:18:102:51 | getStringExtra(...) | provenance | MaD:43 |
+| TestStartActivityToGetIntent.java:102:18:102:28 | getIntent(...) : Intent [android.content.Intent.extras, <map.value>] : String | TestStartActivityToGetIntent.java:102:18:102:51 | getStringExtra(...) | provenance | MaD:43 |
+| TestStartActivityToGetIntent.java:102:18:102:28 | getIntent(...) : Intent [android.content.Intent.extras, <map.value>] : String | TestStartActivityToGetIntent.java:102:18:102:51 | getStringExtra(...) | provenance | MaD:43 |
 | TestStartBroadcastReceiverToIntent.java:18:13:18:18 | intent [post update] : Intent [android.content.Intent.extras, <map.value>] : String | TestStartBroadcastReceiverToIntent.java:19:31:19:36 | intent : Intent [android.content.Intent.extras, <map.value>] : String | provenance |  |
 | TestStartBroadcastReceiverToIntent.java:18:13:18:18 | intent [post update] : Intent [android.content.Intent.extras, <map.value>] : String | TestStartBroadcastReceiverToIntent.java:19:31:19:36 | intent : Intent [android.content.Intent.extras, <map.value>] : String | provenance |  |
 | TestStartBroadcastReceiverToIntent.java:18:13:18:18 | intent [post update] : Intent [android.content.Intent.extras, <map.value>] : String | TestStartBroadcastReceiverToIntent.java:19:31:19:36 | intent : Intent [android.content.Intent.extras, <map.value>] : String | provenance |  |
-| TestStartBroadcastReceiverToIntent.java:18:37:18:59 | (...)... : String | TestStartBroadcastReceiverToIntent.java:18:13:18:18 | intent [post update] : Intent [android.content.Intent.extras, <map.value>] : String | provenance | MaD:50 |
-| TestStartBroadcastReceiverToIntent.java:18:37:18:59 | (...)... : String | TestStartBroadcastReceiverToIntent.java:18:13:18:18 | intent [post update] : Intent [android.content.Intent.extras, <map.value>] : String | provenance | MaD:50 |
-| TestStartBroadcastReceiverToIntent.java:18:37:18:59 | (...)... : String | TestStartBroadcastReceiverToIntent.java:18:13:18:18 | intent [post update] : Intent [android.content.Intent.extras, <map.value>] : String | provenance | MaD:50 |
+| TestStartBroadcastReceiverToIntent.java:18:37:18:59 | (...)... : String | TestStartBroadcastReceiverToIntent.java:18:13:18:18 | intent [post update] : Intent [android.content.Intent.extras, <map.value>] : String | provenance | MaD:49 |
+| TestStartBroadcastReceiverToIntent.java:18:37:18:59 | (...)... : String | TestStartBroadcastReceiverToIntent.java:18:13:18:18 | intent [post update] : Intent [android.content.Intent.extras, <map.value>] : String | provenance | MaD:49 |
+| TestStartBroadcastReceiverToIntent.java:18:37:18:59 | (...)... : String | TestStartBroadcastReceiverToIntent.java:18:13:18:18 | intent [post update] : Intent [android.content.Intent.extras, <map.value>] : String | provenance | MaD:49 |
 | TestStartBroadcastReceiverToIntent.java:18:46:18:59 | source(...) : Object | TestStartBroadcastReceiverToIntent.java:18:37:18:59 | (...)... : String | provenance |  |
 | TestStartBroadcastReceiverToIntent.java:19:31:19:36 | intent : Intent [android.content.Intent.extras, <map.value>] : String | TestStartBroadcastReceiverToIntent.java:81:48:81:60 | intent : Intent [android.content.Intent.extras, <map.value>] : String | provenance |  |
 | TestStartBroadcastReceiverToIntent.java:19:31:19:36 | intent : Intent [android.content.Intent.extras, <map.value>] : String | TestStartBroadcastReceiverToIntent.java:81:48:81:60 | intent : Intent [android.content.Intent.extras, <map.value>] : String | provenance |  |
@@ -2147,9 +2147,9 @@ edges
 | TestStartBroadcastReceiverToIntent.java:23:13:23:18 | intent [post update] : Intent [android.content.Intent.extras, <map.value>] : String | TestStartBroadcastReceiverToIntent.java:24:37:24:42 | intent : Intent [android.content.Intent.extras, <map.value>] : String | provenance |  |
 | TestStartBroadcastReceiverToIntent.java:23:13:23:18 | intent [post update] : Intent [android.content.Intent.extras, <map.value>] : String | TestStartBroadcastReceiverToIntent.java:24:37:24:42 | intent : Intent [android.content.Intent.extras, <map.value>] : String | provenance |  |
 | TestStartBroadcastReceiverToIntent.java:23:13:23:18 | intent [post update] : Intent [android.content.Intent.extras, <map.value>] : String | TestStartBroadcastReceiverToIntent.java:24:37:24:42 | intent : Intent [android.content.Intent.extras, <map.value>] : String | provenance |  |
-| TestStartBroadcastReceiverToIntent.java:23:37:23:67 | (...)... : String | TestStartBroadcastReceiverToIntent.java:23:13:23:18 | intent [post update] : Intent [android.content.Intent.extras, <map.value>] : String | provenance | MaD:50 |
-| TestStartBroadcastReceiverToIntent.java:23:37:23:67 | (...)... : String | TestStartBroadcastReceiverToIntent.java:23:13:23:18 | intent [post update] : Intent [android.content.Intent.extras, <map.value>] : String | provenance | MaD:50 |
-| TestStartBroadcastReceiverToIntent.java:23:37:23:67 | (...)... : String | TestStartBroadcastReceiverToIntent.java:23:13:23:18 | intent [post update] : Intent [android.content.Intent.extras, <map.value>] : String | provenance | MaD:50 |
+| TestStartBroadcastReceiverToIntent.java:23:37:23:67 | (...)... : String | TestStartBroadcastReceiverToIntent.java:23:13:23:18 | intent [post update] : Intent [android.content.Intent.extras, <map.value>] : String | provenance | MaD:49 |
+| TestStartBroadcastReceiverToIntent.java:23:37:23:67 | (...)... : String | TestStartBroadcastReceiverToIntent.java:23:13:23:18 | intent [post update] : Intent [android.content.Intent.extras, <map.value>] : String | provenance | MaD:49 |
+| TestStartBroadcastReceiverToIntent.java:23:37:23:67 | (...)... : String | TestStartBroadcastReceiverToIntent.java:23:13:23:18 | intent [post update] : Intent [android.content.Intent.extras, <map.value>] : String | provenance | MaD:49 |
 | TestStartBroadcastReceiverToIntent.java:23:46:23:67 | source(...) : Object | TestStartBroadcastReceiverToIntent.java:23:37:23:67 | (...)... : String | provenance |  |
 | TestStartBroadcastReceiverToIntent.java:24:37:24:42 | intent : Intent [android.content.Intent.extras, <map.value>] : String | TestStartBroadcastReceiverToIntent.java:81:48:81:60 | intent : Intent [android.content.Intent.extras, <map.value>] : String | provenance |  |
 | TestStartBroadcastReceiverToIntent.java:24:37:24:42 | intent : Intent [android.content.Intent.extras, <map.value>] : String | TestStartBroadcastReceiverToIntent.java:81:48:81:60 | intent : Intent [android.content.Intent.extras, <map.value>] : String | provenance |  |
@@ -2157,9 +2157,9 @@ edges
 | TestStartBroadcastReceiverToIntent.java:28:13:28:18 | intent [post update] : Intent [android.content.Intent.extras, <map.value>] : String | TestStartBroadcastReceiverToIntent.java:29:54:29:59 | intent : Intent [android.content.Intent.extras, <map.value>] : String | provenance |  |
 | TestStartBroadcastReceiverToIntent.java:28:13:28:18 | intent [post update] : Intent [android.content.Intent.extras, <map.value>] : String | TestStartBroadcastReceiverToIntent.java:29:54:29:59 | intent : Intent [android.content.Intent.extras, <map.value>] : String | provenance |  |
 | TestStartBroadcastReceiverToIntent.java:28:13:28:18 | intent [post update] : Intent [android.content.Intent.extras, <map.value>] : String | TestStartBroadcastReceiverToIntent.java:29:54:29:59 | intent : Intent [android.content.Intent.extras, <map.value>] : String | provenance |  |
-| TestStartBroadcastReceiverToIntent.java:28:37:28:69 | (...)... : String | TestStartBroadcastReceiverToIntent.java:28:13:28:18 | intent [post update] : Intent [android.content.Intent.extras, <map.value>] : String | provenance | MaD:50 |
-| TestStartBroadcastReceiverToIntent.java:28:37:28:69 | (...)... : String | TestStartBroadcastReceiverToIntent.java:28:13:28:18 | intent [post update] : Intent [android.content.Intent.extras, <map.value>] : String | provenance | MaD:50 |
-| TestStartBroadcastReceiverToIntent.java:28:37:28:69 | (...)... : String | TestStartBroadcastReceiverToIntent.java:28:13:28:18 | intent [post update] : Intent [android.content.Intent.extras, <map.value>] : String | provenance | MaD:50 |
+| TestStartBroadcastReceiverToIntent.java:28:37:28:69 | (...)... : String | TestStartBroadcastReceiverToIntent.java:28:13:28:18 | intent [post update] : Intent [android.content.Intent.extras, <map.value>] : String | provenance | MaD:49 |
+| TestStartBroadcastReceiverToIntent.java:28:37:28:69 | (...)... : String | TestStartBroadcastReceiverToIntent.java:28:13:28:18 | intent [post update] : Intent [android.content.Intent.extras, <map.value>] : String | provenance | MaD:49 |
+| TestStartBroadcastReceiverToIntent.java:28:37:28:69 | (...)... : String | TestStartBroadcastReceiverToIntent.java:28:13:28:18 | intent [post update] : Intent [android.content.Intent.extras, <map.value>] : String | provenance | MaD:49 |
 | TestStartBroadcastReceiverToIntent.java:28:46:28:69 | source(...) : Object | TestStartBroadcastReceiverToIntent.java:28:37:28:69 | (...)... : String | provenance |  |
 | TestStartBroadcastReceiverToIntent.java:29:54:29:59 | intent : Intent [android.content.Intent.extras, <map.value>] : String | TestStartBroadcastReceiverToIntent.java:81:48:81:60 | intent : Intent [android.content.Intent.extras, <map.value>] : String | provenance |  |
 | TestStartBroadcastReceiverToIntent.java:29:54:29:59 | intent : Intent [android.content.Intent.extras, <map.value>] : String | TestStartBroadcastReceiverToIntent.java:81:48:81:60 | intent : Intent [android.content.Intent.extras, <map.value>] : String | provenance |  |
@@ -2167,9 +2167,9 @@ edges
 | TestStartBroadcastReceiverToIntent.java:33:13:33:18 | intent [post update] : Intent [android.content.Intent.extras, <map.value>] : String | TestStartBroadcastReceiverToIntent.java:34:38:34:43 | intent : Intent [android.content.Intent.extras, <map.value>] : String | provenance |  |
 | TestStartBroadcastReceiverToIntent.java:33:13:33:18 | intent [post update] : Intent [android.content.Intent.extras, <map.value>] : String | TestStartBroadcastReceiverToIntent.java:34:38:34:43 | intent : Intent [android.content.Intent.extras, <map.value>] : String | provenance |  |
 | TestStartBroadcastReceiverToIntent.java:33:13:33:18 | intent [post update] : Intent [android.content.Intent.extras, <map.value>] : String | TestStartBroadcastReceiverToIntent.java:34:38:34:43 | intent : Intent [android.content.Intent.extras, <map.value>] : String | provenance |  |
-| TestStartBroadcastReceiverToIntent.java:33:37:33:67 | (...)... : String | TestStartBroadcastReceiverToIntent.java:33:13:33:18 | intent [post update] : Intent [android.content.Intent.extras, <map.value>] : String | provenance | MaD:50 |
-| TestStartBroadcastReceiverToIntent.java:33:37:33:67 | (...)... : String | TestStartBroadcastReceiverToIntent.java:33:13:33:18 | intent [post update] : Intent [android.content.Intent.extras, <map.value>] : String | provenance | MaD:50 |
-| TestStartBroadcastReceiverToIntent.java:33:37:33:67 | (...)... : String | TestStartBroadcastReceiverToIntent.java:33:13:33:18 | intent [post update] : Intent [android.content.Intent.extras, <map.value>] : String | provenance | MaD:50 |
+| TestStartBroadcastReceiverToIntent.java:33:37:33:67 | (...)... : String | TestStartBroadcastReceiverToIntent.java:33:13:33:18 | intent [post update] : Intent [android.content.Intent.extras, <map.value>] : String | provenance | MaD:49 |
+| TestStartBroadcastReceiverToIntent.java:33:37:33:67 | (...)... : String | TestStartBroadcastReceiverToIntent.java:33:13:33:18 | intent [post update] : Intent [android.content.Intent.extras, <map.value>] : String | provenance | MaD:49 |
+| TestStartBroadcastReceiverToIntent.java:33:37:33:67 | (...)... : String | TestStartBroadcastReceiverToIntent.java:33:13:33:18 | intent [post update] : Intent [android.content.Intent.extras, <map.value>] : String | provenance | MaD:49 |
 | TestStartBroadcastReceiverToIntent.java:33:46:33:67 | source(...) : Object | TestStartBroadcastReceiverToIntent.java:33:37:33:67 | (...)... : String | provenance |  |
 | TestStartBroadcastReceiverToIntent.java:34:38:34:43 | intent : Intent [android.content.Intent.extras, <map.value>] : String | TestStartBroadcastReceiverToIntent.java:81:48:81:60 | intent : Intent [android.content.Intent.extras, <map.value>] : String | provenance |  |
 | TestStartBroadcastReceiverToIntent.java:34:38:34:43 | intent : Intent [android.content.Intent.extras, <map.value>] : String | TestStartBroadcastReceiverToIntent.java:81:48:81:60 | intent : Intent [android.content.Intent.extras, <map.value>] : String | provenance |  |
@@ -2177,9 +2177,9 @@ edges
 | TestStartBroadcastReceiverToIntent.java:38:13:38:18 | intent [post update] : Intent [android.content.Intent.extras, <map.value>] : String | TestStartBroadcastReceiverToIntent.java:39:44:39:49 | intent : Intent [android.content.Intent.extras, <map.value>] : String | provenance |  |
 | TestStartBroadcastReceiverToIntent.java:38:13:38:18 | intent [post update] : Intent [android.content.Intent.extras, <map.value>] : String | TestStartBroadcastReceiverToIntent.java:39:44:39:49 | intent : Intent [android.content.Intent.extras, <map.value>] : String | provenance |  |
 | TestStartBroadcastReceiverToIntent.java:38:13:38:18 | intent [post update] : Intent [android.content.Intent.extras, <map.value>] : String | TestStartBroadcastReceiverToIntent.java:39:44:39:49 | intent : Intent [android.content.Intent.extras, <map.value>] : String | provenance |  |
-| TestStartBroadcastReceiverToIntent.java:38:37:38:75 | (...)... : String | TestStartBroadcastReceiverToIntent.java:38:13:38:18 | intent [post update] : Intent [android.content.Intent.extras, <map.value>] : String | provenance | MaD:50 |
-| TestStartBroadcastReceiverToIntent.java:38:37:38:75 | (...)... : String | TestStartBroadcastReceiverToIntent.java:38:13:38:18 | intent [post update] : Intent [android.content.Intent.extras, <map.value>] : String | provenance | MaD:50 |
-| TestStartBroadcastReceiverToIntent.java:38:37:38:75 | (...)... : String | TestStartBroadcastReceiverToIntent.java:38:13:38:18 | intent [post update] : Intent [android.content.Intent.extras, <map.value>] : String | provenance | MaD:50 |
+| TestStartBroadcastReceiverToIntent.java:38:37:38:75 | (...)... : String | TestStartBroadcastReceiverToIntent.java:38:13:38:18 | intent [post update] : Intent [android.content.Intent.extras, <map.value>] : String | provenance | MaD:49 |
+| TestStartBroadcastReceiverToIntent.java:38:37:38:75 | (...)... : String | TestStartBroadcastReceiverToIntent.java:38:13:38:18 | intent [post update] : Intent [android.content.Intent.extras, <map.value>] : String | provenance | MaD:49 |
+| TestStartBroadcastReceiverToIntent.java:38:37:38:75 | (...)... : String | TestStartBroadcastReceiverToIntent.java:38:13:38:18 | intent [post update] : Intent [android.content.Intent.extras, <map.value>] : String | provenance | MaD:49 |
 | TestStartBroadcastReceiverToIntent.java:38:46:38:75 | source(...) : Object | TestStartBroadcastReceiverToIntent.java:38:37:38:75 | (...)... : String | provenance |  |
 | TestStartBroadcastReceiverToIntent.java:39:44:39:49 | intent : Intent [android.content.Intent.extras, <map.value>] : String | TestStartBroadcastReceiverToIntent.java:81:48:81:60 | intent : Intent [android.content.Intent.extras, <map.value>] : String | provenance |  |
 | TestStartBroadcastReceiverToIntent.java:39:44:39:49 | intent : Intent [android.content.Intent.extras, <map.value>] : String | TestStartBroadcastReceiverToIntent.java:81:48:81:60 | intent : Intent [android.content.Intent.extras, <map.value>] : String | provenance |  |
@@ -2187,9 +2187,9 @@ edges
 | TestStartBroadcastReceiverToIntent.java:43:13:43:18 | intent [post update] : Intent [android.content.Intent.extras, <map.value>] : String | TestStartBroadcastReceiverToIntent.java:44:37:44:42 | intent : Intent [android.content.Intent.extras, <map.value>] : String | provenance |  |
 | TestStartBroadcastReceiverToIntent.java:43:13:43:18 | intent [post update] : Intent [android.content.Intent.extras, <map.value>] : String | TestStartBroadcastReceiverToIntent.java:44:37:44:42 | intent : Intent [android.content.Intent.extras, <map.value>] : String | provenance |  |
 | TestStartBroadcastReceiverToIntent.java:43:13:43:18 | intent [post update] : Intent [android.content.Intent.extras, <map.value>] : String | TestStartBroadcastReceiverToIntent.java:44:37:44:42 | intent : Intent [android.content.Intent.extras, <map.value>] : String | provenance |  |
-| TestStartBroadcastReceiverToIntent.java:43:37:43:66 | (...)... : String | TestStartBroadcastReceiverToIntent.java:43:13:43:18 | intent [post update] : Intent [android.content.Intent.extras, <map.value>] : String | provenance | MaD:50 |
-| TestStartBroadcastReceiverToIntent.java:43:37:43:66 | (...)... : String | TestStartBroadcastReceiverToIntent.java:43:13:43:18 | intent [post update] : Intent [android.content.Intent.extras, <map.value>] : String | provenance | MaD:50 |
-| TestStartBroadcastReceiverToIntent.java:43:37:43:66 | (...)... : String | TestStartBroadcastReceiverToIntent.java:43:13:43:18 | intent [post update] : Intent [android.content.Intent.extras, <map.value>] : String | provenance | MaD:50 |
+| TestStartBroadcastReceiverToIntent.java:43:37:43:66 | (...)... : String | TestStartBroadcastReceiverToIntent.java:43:13:43:18 | intent [post update] : Intent [android.content.Intent.extras, <map.value>] : String | provenance | MaD:49 |
+| TestStartBroadcastReceiverToIntent.java:43:37:43:66 | (...)... : String | TestStartBroadcastReceiverToIntent.java:43:13:43:18 | intent [post update] : Intent [android.content.Intent.extras, <map.value>] : String | provenance | MaD:49 |
+| TestStartBroadcastReceiverToIntent.java:43:37:43:66 | (...)... : String | TestStartBroadcastReceiverToIntent.java:43:13:43:18 | intent [post update] : Intent [android.content.Intent.extras, <map.value>] : String | provenance | MaD:49 |
 | TestStartBroadcastReceiverToIntent.java:43:46:43:66 | source(...) : Object | TestStartBroadcastReceiverToIntent.java:43:37:43:66 | (...)... : String | provenance |  |
 | TestStartBroadcastReceiverToIntent.java:44:37:44:42 | intent : Intent [android.content.Intent.extras, <map.value>] : String | TestStartBroadcastReceiverToIntent.java:81:48:81:60 | intent : Intent [android.content.Intent.extras, <map.value>] : String | provenance |  |
 | TestStartBroadcastReceiverToIntent.java:44:37:44:42 | intent : Intent [android.content.Intent.extras, <map.value>] : String | TestStartBroadcastReceiverToIntent.java:81:48:81:60 | intent : Intent [android.content.Intent.extras, <map.value>] : String | provenance |  |
@@ -2197,9 +2197,9 @@ edges
 | TestStartBroadcastReceiverToIntent.java:48:13:48:18 | intent [post update] : Intent [android.content.Intent.extras, <map.value>] : String | TestStartBroadcastReceiverToIntent.java:49:43:49:48 | intent : Intent [android.content.Intent.extras, <map.value>] : String | provenance |  |
 | TestStartBroadcastReceiverToIntent.java:48:13:48:18 | intent [post update] : Intent [android.content.Intent.extras, <map.value>] : String | TestStartBroadcastReceiverToIntent.java:49:43:49:48 | intent : Intent [android.content.Intent.extras, <map.value>] : String | provenance |  |
 | TestStartBroadcastReceiverToIntent.java:48:13:48:18 | intent [post update] : Intent [android.content.Intent.extras, <map.value>] : String | TestStartBroadcastReceiverToIntent.java:49:43:49:48 | intent : Intent [android.content.Intent.extras, <map.value>] : String | provenance |  |
-| TestStartBroadcastReceiverToIntent.java:48:37:48:74 | (...)... : String | TestStartBroadcastReceiverToIntent.java:48:13:48:18 | intent [post update] : Intent [android.content.Intent.extras, <map.value>] : String | provenance | MaD:50 |
-| TestStartBroadcastReceiverToIntent.java:48:37:48:74 | (...)... : String | TestStartBroadcastReceiverToIntent.java:48:13:48:18 | intent [post update] : Intent [android.content.Intent.extras, <map.value>] : String | provenance | MaD:50 |
-| TestStartBroadcastReceiverToIntent.java:48:37:48:74 | (...)... : String | TestStartBroadcastReceiverToIntent.java:48:13:48:18 | intent [post update] : Intent [android.content.Intent.extras, <map.value>] : String | provenance | MaD:50 |
+| TestStartBroadcastReceiverToIntent.java:48:37:48:74 | (...)... : String | TestStartBroadcastReceiverToIntent.java:48:13:48:18 | intent [post update] : Intent [android.content.Intent.extras, <map.value>] : String | provenance | MaD:49 |
+| TestStartBroadcastReceiverToIntent.java:48:37:48:74 | (...)... : String | TestStartBroadcastReceiverToIntent.java:48:13:48:18 | intent [post update] : Intent [android.content.Intent.extras, <map.value>] : String | provenance | MaD:49 |
+| TestStartBroadcastReceiverToIntent.java:48:37:48:74 | (...)... : String | TestStartBroadcastReceiverToIntent.java:48:13:48:18 | intent [post update] : Intent [android.content.Intent.extras, <map.value>] : String | provenance | MaD:49 |
 | TestStartBroadcastReceiverToIntent.java:48:46:48:74 | source(...) : Object | TestStartBroadcastReceiverToIntent.java:48:37:48:74 | (...)... : String | provenance |  |
 | TestStartBroadcastReceiverToIntent.java:49:43:49:48 | intent : Intent [android.content.Intent.extras, <map.value>] : String | TestStartBroadcastReceiverToIntent.java:81:48:81:60 | intent : Intent [android.content.Intent.extras, <map.value>] : String | provenance |  |
 | TestStartBroadcastReceiverToIntent.java:49:43:49:48 | intent : Intent [android.content.Intent.extras, <map.value>] : String | TestStartBroadcastReceiverToIntent.java:81:48:81:60 | intent : Intent [android.content.Intent.extras, <map.value>] : String | provenance |  |
@@ -2207,9 +2207,9 @@ edges
 | TestStartBroadcastReceiverToIntent.java:53:13:53:18 | intent [post update] : Intent [android.content.Intent.extras, <map.value>] : String | TestStartBroadcastReceiverToIntent.java:54:44:54:49 | intent : Intent [android.content.Intent.extras, <map.value>] : String | provenance |  |
 | TestStartBroadcastReceiverToIntent.java:53:13:53:18 | intent [post update] : Intent [android.content.Intent.extras, <map.value>] : String | TestStartBroadcastReceiverToIntent.java:54:44:54:49 | intent : Intent [android.content.Intent.extras, <map.value>] : String | provenance |  |
 | TestStartBroadcastReceiverToIntent.java:53:13:53:18 | intent [post update] : Intent [android.content.Intent.extras, <map.value>] : String | TestStartBroadcastReceiverToIntent.java:54:44:54:49 | intent : Intent [android.content.Intent.extras, <map.value>] : String | provenance |  |
-| TestStartBroadcastReceiverToIntent.java:53:37:53:74 | (...)... : String | TestStartBroadcastReceiverToIntent.java:53:13:53:18 | intent [post update] : Intent [android.content.Intent.extras, <map.value>] : String | provenance | MaD:50 |
-| TestStartBroadcastReceiverToIntent.java:53:37:53:74 | (...)... : String | TestStartBroadcastReceiverToIntent.java:53:13:53:18 | intent [post update] : Intent [android.content.Intent.extras, <map.value>] : String | provenance | MaD:50 |
-| TestStartBroadcastReceiverToIntent.java:53:37:53:74 | (...)... : String | TestStartBroadcastReceiverToIntent.java:53:13:53:18 | intent [post update] : Intent [android.content.Intent.extras, <map.value>] : String | provenance | MaD:50 |
+| TestStartBroadcastReceiverToIntent.java:53:37:53:74 | (...)... : String | TestStartBroadcastReceiverToIntent.java:53:13:53:18 | intent [post update] : Intent [android.content.Intent.extras, <map.value>] : String | provenance | MaD:49 |
+| TestStartBroadcastReceiverToIntent.java:53:37:53:74 | (...)... : String | TestStartBroadcastReceiverToIntent.java:53:13:53:18 | intent [post update] : Intent [android.content.Intent.extras, <map.value>] : String | provenance | MaD:49 |
+| TestStartBroadcastReceiverToIntent.java:53:37:53:74 | (...)... : String | TestStartBroadcastReceiverToIntent.java:53:13:53:18 | intent [post update] : Intent [android.content.Intent.extras, <map.value>] : String | provenance | MaD:49 |
 | TestStartBroadcastReceiverToIntent.java:53:46:53:74 | source(...) : Object | TestStartBroadcastReceiverToIntent.java:53:37:53:74 | (...)... : String | provenance |  |
 | TestStartBroadcastReceiverToIntent.java:54:44:54:49 | intent : Intent [android.content.Intent.extras, <map.value>] : String | TestStartBroadcastReceiverToIntent.java:81:48:81:60 | intent : Intent [android.content.Intent.extras, <map.value>] : String | provenance |  |
 | TestStartBroadcastReceiverToIntent.java:54:44:54:49 | intent : Intent [android.content.Intent.extras, <map.value>] : String | TestStartBroadcastReceiverToIntent.java:81:48:81:60 | intent : Intent [android.content.Intent.extras, <map.value>] : String | provenance |  |
@@ -2217,9 +2217,9 @@ edges
 | TestStartBroadcastReceiverToIntent.java:58:13:58:18 | intent [post update] : Intent [android.content.Intent.extras, <map.value>] : String | TestStartBroadcastReceiverToIntent.java:59:50:59:55 | intent : Intent [android.content.Intent.extras, <map.value>] : String | provenance |  |
 | TestStartBroadcastReceiverToIntent.java:58:13:58:18 | intent [post update] : Intent [android.content.Intent.extras, <map.value>] : String | TestStartBroadcastReceiverToIntent.java:59:50:59:55 | intent : Intent [android.content.Intent.extras, <map.value>] : String | provenance |  |
 | TestStartBroadcastReceiverToIntent.java:58:13:58:18 | intent [post update] : Intent [android.content.Intent.extras, <map.value>] : String | TestStartBroadcastReceiverToIntent.java:59:50:59:55 | intent : Intent [android.content.Intent.extras, <map.value>] : String | provenance |  |
-| TestStartBroadcastReceiverToIntent.java:58:37:58:82 | (...)... : String | TestStartBroadcastReceiverToIntent.java:58:13:58:18 | intent [post update] : Intent [android.content.Intent.extras, <map.value>] : String | provenance | MaD:50 |
-| TestStartBroadcastReceiverToIntent.java:58:37:58:82 | (...)... : String | TestStartBroadcastReceiverToIntent.java:58:13:58:18 | intent [post update] : Intent [android.content.Intent.extras, <map.value>] : String | provenance | MaD:50 |
-| TestStartBroadcastReceiverToIntent.java:58:37:58:82 | (...)... : String | TestStartBroadcastReceiverToIntent.java:58:13:58:18 | intent [post update] : Intent [android.content.Intent.extras, <map.value>] : String | provenance | MaD:50 |
+| TestStartBroadcastReceiverToIntent.java:58:37:58:82 | (...)... : String | TestStartBroadcastReceiverToIntent.java:58:13:58:18 | intent [post update] : Intent [android.content.Intent.extras, <map.value>] : String | provenance | MaD:49 |
+| TestStartBroadcastReceiverToIntent.java:58:37:58:82 | (...)... : String | TestStartBroadcastReceiverToIntent.java:58:13:58:18 | intent [post update] : Intent [android.content.Intent.extras, <map.value>] : String | provenance | MaD:49 |
+| TestStartBroadcastReceiverToIntent.java:58:37:58:82 | (...)... : String | TestStartBroadcastReceiverToIntent.java:58:13:58:18 | intent [post update] : Intent [android.content.Intent.extras, <map.value>] : String | provenance | MaD:49 |
 | TestStartBroadcastReceiverToIntent.java:58:46:58:82 | source(...) : Object | TestStartBroadcastReceiverToIntent.java:58:37:58:82 | (...)... : String | provenance |  |
 | TestStartBroadcastReceiverToIntent.java:59:50:59:55 | intent : Intent [android.content.Intent.extras, <map.value>] : String | TestStartBroadcastReceiverToIntent.java:81:48:81:60 | intent : Intent [android.content.Intent.extras, <map.value>] : String | provenance |  |
 | TestStartBroadcastReceiverToIntent.java:59:50:59:55 | intent : Intent [android.content.Intent.extras, <map.value>] : String | TestStartBroadcastReceiverToIntent.java:81:48:81:60 | intent : Intent [android.content.Intent.extras, <map.value>] : String | provenance |  |
@@ -2227,9 +2227,9 @@ edges
 | TestStartBroadcastReceiverToIntent.java:65:13:65:18 | intent [post update] : Intent [android.content.Intent.extras, <map.value>] : String | TestStartBroadcastReceiverToIntent.java:66:31:66:36 | intent : Intent [android.content.Intent.extras, <map.value>] : String | provenance |  |
 | TestStartBroadcastReceiverToIntent.java:65:13:65:18 | intent [post update] : Intent [android.content.Intent.extras, <map.value>] : String | TestStartBroadcastReceiverToIntent.java:66:31:66:36 | intent : Intent [android.content.Intent.extras, <map.value>] : String | provenance |  |
 | TestStartBroadcastReceiverToIntent.java:65:13:65:18 | intent [post update] : Intent [android.content.Intent.extras, <map.value>] : String | TestStartBroadcastReceiverToIntent.java:66:31:66:36 | intent : Intent [android.content.Intent.extras, <map.value>] : String | provenance |  |
-| TestStartBroadcastReceiverToIntent.java:65:37:65:60 | (...)... : String | TestStartBroadcastReceiverToIntent.java:65:13:65:18 | intent [post update] : Intent [android.content.Intent.extras, <map.value>] : String | provenance | MaD:50 |
-| TestStartBroadcastReceiverToIntent.java:65:37:65:60 | (...)... : String | TestStartBroadcastReceiverToIntent.java:65:13:65:18 | intent [post update] : Intent [android.content.Intent.extras, <map.value>] : String | provenance | MaD:50 |
-| TestStartBroadcastReceiverToIntent.java:65:37:65:60 | (...)... : String | TestStartBroadcastReceiverToIntent.java:65:13:65:18 | intent [post update] : Intent [android.content.Intent.extras, <map.value>] : String | provenance | MaD:50 |
+| TestStartBroadcastReceiverToIntent.java:65:37:65:60 | (...)... : String | TestStartBroadcastReceiverToIntent.java:65:13:65:18 | intent [post update] : Intent [android.content.Intent.extras, <map.value>] : String | provenance | MaD:49 |
+| TestStartBroadcastReceiverToIntent.java:65:37:65:60 | (...)... : String | TestStartBroadcastReceiverToIntent.java:65:13:65:18 | intent [post update] : Intent [android.content.Intent.extras, <map.value>] : String | provenance | MaD:49 |
+| TestStartBroadcastReceiverToIntent.java:65:37:65:60 | (...)... : String | TestStartBroadcastReceiverToIntent.java:65:13:65:18 | intent [post update] : Intent [android.content.Intent.extras, <map.value>] : String | provenance | MaD:49 |
 | TestStartBroadcastReceiverToIntent.java:65:46:65:60 | source(...) : Object | TestStartBroadcastReceiverToIntent.java:65:37:65:60 | (...)... : String | provenance |  |
 | TestStartBroadcastReceiverToIntent.java:66:31:66:36 | intent : Intent [android.content.Intent.extras, <map.value>] : String | TestStartBroadcastReceiverToIntent.java:81:48:81:60 | intent : Intent [android.content.Intent.extras, <map.value>] : String | provenance |  |
 | TestStartBroadcastReceiverToIntent.java:66:31:66:36 | intent : Intent [android.content.Intent.extras, <map.value>] : String | TestStartBroadcastReceiverToIntent.java:81:48:81:60 | intent : Intent [android.content.Intent.extras, <map.value>] : String | provenance |  |
@@ -2237,15 +2237,15 @@ edges
 | TestStartBroadcastReceiverToIntent.java:81:48:81:60 | intent : Intent [android.content.Intent.extras, <map.value>] : String | TestStartBroadcastReceiverToIntent.java:82:18:82:23 | intent : Intent [android.content.Intent.extras, <map.value>] : String | provenance |  |
 | TestStartBroadcastReceiverToIntent.java:81:48:81:60 | intent : Intent [android.content.Intent.extras, <map.value>] : String | TestStartBroadcastReceiverToIntent.java:82:18:82:23 | intent : Intent [android.content.Intent.extras, <map.value>] : String | provenance |  |
 | TestStartBroadcastReceiverToIntent.java:81:48:81:60 | intent : Intent [android.content.Intent.extras, <map.value>] : String | TestStartBroadcastReceiverToIntent.java:82:18:82:23 | intent : Intent [android.content.Intent.extras, <map.value>] : String | provenance |  |
-| TestStartBroadcastReceiverToIntent.java:82:18:82:23 | intent : Intent [android.content.Intent.extras, <map.value>] : String | TestStartBroadcastReceiverToIntent.java:82:18:82:46 | getStringExtra(...) | provenance | MaD:42 |
-| TestStartBroadcastReceiverToIntent.java:82:18:82:23 | intent : Intent [android.content.Intent.extras, <map.value>] : String | TestStartBroadcastReceiverToIntent.java:82:18:82:46 | getStringExtra(...) | provenance | MaD:42 |
-| TestStartBroadcastReceiverToIntent.java:82:18:82:23 | intent : Intent [android.content.Intent.extras, <map.value>] : String | TestStartBroadcastReceiverToIntent.java:82:18:82:46 | getStringExtra(...) | provenance | MaD:42 |
+| TestStartBroadcastReceiverToIntent.java:82:18:82:23 | intent : Intent [android.content.Intent.extras, <map.value>] : String | TestStartBroadcastReceiverToIntent.java:82:18:82:46 | getStringExtra(...) | provenance | MaD:43 |
+| TestStartBroadcastReceiverToIntent.java:82:18:82:23 | intent : Intent [android.content.Intent.extras, <map.value>] : String | TestStartBroadcastReceiverToIntent.java:82:18:82:46 | getStringExtra(...) | provenance | MaD:43 |
+| TestStartBroadcastReceiverToIntent.java:82:18:82:23 | intent : Intent [android.content.Intent.extras, <map.value>] : String | TestStartBroadcastReceiverToIntent.java:82:18:82:46 | getStringExtra(...) | provenance | MaD:43 |
 | TestStartServiceToIntent.java:19:13:19:18 | intent [post update] : Intent [android.content.Intent.extras, <map.value>] : String | TestStartServiceToIntent.java:20:29:20:34 | intent : Intent [android.content.Intent.extras, <map.value>] : String | provenance |  |
 | TestStartServiceToIntent.java:19:13:19:18 | intent [post update] : Intent [android.content.Intent.extras, <map.value>] : String | TestStartServiceToIntent.java:20:29:20:34 | intent : Intent [android.content.Intent.extras, <map.value>] : String | provenance |  |
 | TestStartServiceToIntent.java:19:13:19:18 | intent [post update] : Intent [android.content.Intent.extras, <map.value>] : String | TestStartServiceToIntent.java:20:29:20:34 | intent : Intent [android.content.Intent.extras, <map.value>] : String | provenance |  |
-| TestStartServiceToIntent.java:19:37:19:59 | (...)... : String | TestStartServiceToIntent.java:19:13:19:18 | intent [post update] : Intent [android.content.Intent.extras, <map.value>] : String | provenance | MaD:50 |
-| TestStartServiceToIntent.java:19:37:19:59 | (...)... : String | TestStartServiceToIntent.java:19:13:19:18 | intent [post update] : Intent [android.content.Intent.extras, <map.value>] : String | provenance | MaD:50 |
-| TestStartServiceToIntent.java:19:37:19:59 | (...)... : String | TestStartServiceToIntent.java:19:13:19:18 | intent [post update] : Intent [android.content.Intent.extras, <map.value>] : String | provenance | MaD:50 |
+| TestStartServiceToIntent.java:19:37:19:59 | (...)... : String | TestStartServiceToIntent.java:19:13:19:18 | intent [post update] : Intent [android.content.Intent.extras, <map.value>] : String | provenance | MaD:49 |
+| TestStartServiceToIntent.java:19:37:19:59 | (...)... : String | TestStartServiceToIntent.java:19:13:19:18 | intent [post update] : Intent [android.content.Intent.extras, <map.value>] : String | provenance | MaD:49 |
+| TestStartServiceToIntent.java:19:37:19:59 | (...)... : String | TestStartServiceToIntent.java:19:13:19:18 | intent [post update] : Intent [android.content.Intent.extras, <map.value>] : String | provenance | MaD:49 |
 | TestStartServiceToIntent.java:19:46:19:59 | source(...) : Object | TestStartServiceToIntent.java:19:37:19:59 | (...)... : String | provenance |  |
 | TestStartServiceToIntent.java:20:29:20:34 | intent : Intent [android.content.Intent.extras, <map.value>] : String | TestStartServiceToIntent.java:62:29:62:41 | intent : Intent [android.content.Intent.extras, <map.value>] : String | provenance |  |
 | TestStartServiceToIntent.java:20:29:20:34 | intent : Intent [android.content.Intent.extras, <map.value>] : String | TestStartServiceToIntent.java:62:29:62:41 | intent : Intent [android.content.Intent.extras, <map.value>] : String | provenance |  |
@@ -2268,9 +2268,9 @@ edges
 | TestStartServiceToIntent.java:24:13:24:18 | intent [post update] : Intent [android.content.Intent.extras, <map.value>] : String | TestStartServiceToIntent.java:25:35:25:40 | intent : Intent [android.content.Intent.extras, <map.value>] : String | provenance |  |
 | TestStartServiceToIntent.java:24:13:24:18 | intent [post update] : Intent [android.content.Intent.extras, <map.value>] : String | TestStartServiceToIntent.java:25:35:25:40 | intent : Intent [android.content.Intent.extras, <map.value>] : String | provenance |  |
 | TestStartServiceToIntent.java:24:13:24:18 | intent [post update] : Intent [android.content.Intent.extras, <map.value>] : String | TestStartServiceToIntent.java:25:35:25:40 | intent : Intent [android.content.Intent.extras, <map.value>] : String | provenance |  |
-| TestStartServiceToIntent.java:24:37:24:67 | (...)... : String | TestStartServiceToIntent.java:24:13:24:18 | intent [post update] : Intent [android.content.Intent.extras, <map.value>] : String | provenance | MaD:50 |
-| TestStartServiceToIntent.java:24:37:24:67 | (...)... : String | TestStartServiceToIntent.java:24:13:24:18 | intent [post update] : Intent [android.content.Intent.extras, <map.value>] : String | provenance | MaD:50 |
-| TestStartServiceToIntent.java:24:37:24:67 | (...)... : String | TestStartServiceToIntent.java:24:13:24:18 | intent [post update] : Intent [android.content.Intent.extras, <map.value>] : String | provenance | MaD:50 |
+| TestStartServiceToIntent.java:24:37:24:67 | (...)... : String | TestStartServiceToIntent.java:24:13:24:18 | intent [post update] : Intent [android.content.Intent.extras, <map.value>] : String | provenance | MaD:49 |
+| TestStartServiceToIntent.java:24:37:24:67 | (...)... : String | TestStartServiceToIntent.java:24:13:24:18 | intent [post update] : Intent [android.content.Intent.extras, <map.value>] : String | provenance | MaD:49 |
+| TestStartServiceToIntent.java:24:37:24:67 | (...)... : String | TestStartServiceToIntent.java:24:13:24:18 | intent [post update] : Intent [android.content.Intent.extras, <map.value>] : String | provenance | MaD:49 |
 | TestStartServiceToIntent.java:24:46:24:67 | source(...) : Object | TestStartServiceToIntent.java:24:37:24:67 | (...)... : String | provenance |  |
 | TestStartServiceToIntent.java:25:35:25:40 | intent : Intent [android.content.Intent.extras, <map.value>] : String | TestStartServiceToIntent.java:62:29:62:41 | intent : Intent [android.content.Intent.extras, <map.value>] : String | provenance |  |
 | TestStartServiceToIntent.java:25:35:25:40 | intent : Intent [android.content.Intent.extras, <map.value>] : String | TestStartServiceToIntent.java:62:29:62:41 | intent : Intent [android.content.Intent.extras, <map.value>] : String | provenance |  |
@@ -2293,9 +2293,9 @@ edges
 | TestStartServiceToIntent.java:29:13:29:18 | intent [post update] : Intent [android.content.Intent.extras, <map.value>] : String | TestStartServiceToIntent.java:30:37:30:42 | intent : Intent [android.content.Intent.extras, <map.value>] : String | provenance |  |
 | TestStartServiceToIntent.java:29:13:29:18 | intent [post update] : Intent [android.content.Intent.extras, <map.value>] : String | TestStartServiceToIntent.java:30:37:30:42 | intent : Intent [android.content.Intent.extras, <map.value>] : String | provenance |  |
 | TestStartServiceToIntent.java:29:13:29:18 | intent [post update] : Intent [android.content.Intent.extras, <map.value>] : String | TestStartServiceToIntent.java:30:37:30:42 | intent : Intent [android.content.Intent.extras, <map.value>] : String | provenance |  |
-| TestStartServiceToIntent.java:29:37:29:68 | (...)... : String | TestStartServiceToIntent.java:29:13:29:18 | intent [post update] : Intent [android.content.Intent.extras, <map.value>] : String | provenance | MaD:50 |
-| TestStartServiceToIntent.java:29:37:29:68 | (...)... : String | TestStartServiceToIntent.java:29:13:29:18 | intent [post update] : Intent [android.content.Intent.extras, <map.value>] : String | provenance | MaD:50 |
-| TestStartServiceToIntent.java:29:37:29:68 | (...)... : String | TestStartServiceToIntent.java:29:13:29:18 | intent [post update] : Intent [android.content.Intent.extras, <map.value>] : String | provenance | MaD:50 |
+| TestStartServiceToIntent.java:29:37:29:68 | (...)... : String | TestStartServiceToIntent.java:29:13:29:18 | intent [post update] : Intent [android.content.Intent.extras, <map.value>] : String | provenance | MaD:49 |
+| TestStartServiceToIntent.java:29:37:29:68 | (...)... : String | TestStartServiceToIntent.java:29:13:29:18 | intent [post update] : Intent [android.content.Intent.extras, <map.value>] : String | provenance | MaD:49 |
+| TestStartServiceToIntent.java:29:37:29:68 | (...)... : String | TestStartServiceToIntent.java:29:13:29:18 | intent [post update] : Intent [android.content.Intent.extras, <map.value>] : String | provenance | MaD:49 |
 | TestStartServiceToIntent.java:29:46:29:68 | source(...) : Object | TestStartServiceToIntent.java:29:37:29:68 | (...)... : String | provenance |  |
 | TestStartServiceToIntent.java:30:37:30:42 | intent : Intent [android.content.Intent.extras, <map.value>] : String | TestStartServiceToIntent.java:62:29:62:41 | intent : Intent [android.content.Intent.extras, <map.value>] : String | provenance |  |
 | TestStartServiceToIntent.java:30:37:30:42 | intent : Intent [android.content.Intent.extras, <map.value>] : String | TestStartServiceToIntent.java:62:29:62:41 | intent : Intent [android.content.Intent.extras, <map.value>] : String | provenance |  |
@@ -2318,9 +2318,9 @@ edges
 | TestStartServiceToIntent.java:34:13:34:18 | intent [post update] : Intent [android.content.Intent.extras, <map.value>] : String | TestStartServiceToIntent.java:35:30:35:35 | intent : Intent [android.content.Intent.extras, <map.value>] : String | provenance |  |
 | TestStartServiceToIntent.java:34:13:34:18 | intent [post update] : Intent [android.content.Intent.extras, <map.value>] : String | TestStartServiceToIntent.java:35:30:35:35 | intent : Intent [android.content.Intent.extras, <map.value>] : String | provenance |  |
 | TestStartServiceToIntent.java:34:13:34:18 | intent [post update] : Intent [android.content.Intent.extras, <map.value>] : String | TestStartServiceToIntent.java:35:30:35:35 | intent : Intent [android.content.Intent.extras, <map.value>] : String | provenance |  |
-| TestStartServiceToIntent.java:34:37:34:60 | (...)... : String | TestStartServiceToIntent.java:34:13:34:18 | intent [post update] : Intent [android.content.Intent.extras, <map.value>] : String | provenance | MaD:50 |
-| TestStartServiceToIntent.java:34:37:34:60 | (...)... : String | TestStartServiceToIntent.java:34:13:34:18 | intent [post update] : Intent [android.content.Intent.extras, <map.value>] : String | provenance | MaD:50 |
-| TestStartServiceToIntent.java:34:37:34:60 | (...)... : String | TestStartServiceToIntent.java:34:13:34:18 | intent [post update] : Intent [android.content.Intent.extras, <map.value>] : String | provenance | MaD:50 |
+| TestStartServiceToIntent.java:34:37:34:60 | (...)... : String | TestStartServiceToIntent.java:34:13:34:18 | intent [post update] : Intent [android.content.Intent.extras, <map.value>] : String | provenance | MaD:49 |
+| TestStartServiceToIntent.java:34:37:34:60 | (...)... : String | TestStartServiceToIntent.java:34:13:34:18 | intent [post update] : Intent [android.content.Intent.extras, <map.value>] : String | provenance | MaD:49 |
+| TestStartServiceToIntent.java:34:37:34:60 | (...)... : String | TestStartServiceToIntent.java:34:13:34:18 | intent [post update] : Intent [android.content.Intent.extras, <map.value>] : String | provenance | MaD:49 |
 | TestStartServiceToIntent.java:34:46:34:60 | source(...) : Object | TestStartServiceToIntent.java:34:37:34:60 | (...)... : String | provenance |  |
 | TestStartServiceToIntent.java:35:30:35:35 | intent : Intent [android.content.Intent.extras, <map.value>] : String | TestStartServiceToIntent.java:62:29:62:41 | intent : Intent [android.content.Intent.extras, <map.value>] : String | provenance |  |
 | TestStartServiceToIntent.java:35:30:35:35 | intent : Intent [android.content.Intent.extras, <map.value>] : String | TestStartServiceToIntent.java:62:29:62:41 | intent : Intent [android.content.Intent.extras, <map.value>] : String | provenance |  |
@@ -2343,9 +2343,9 @@ edges
 | TestStartServiceToIntent.java:39:13:39:18 | intent [post update] : Intent [android.content.Intent.extras, <map.value>] : String | TestStartServiceToIntent.java:40:40:40:45 | intent : Intent [android.content.Intent.extras, <map.value>] : String | provenance |  |
 | TestStartServiceToIntent.java:39:13:39:18 | intent [post update] : Intent [android.content.Intent.extras, <map.value>] : String | TestStartServiceToIntent.java:40:40:40:45 | intent : Intent [android.content.Intent.extras, <map.value>] : String | provenance |  |
 | TestStartServiceToIntent.java:39:13:39:18 | intent [post update] : Intent [android.content.Intent.extras, <map.value>] : String | TestStartServiceToIntent.java:40:40:40:45 | intent : Intent [android.content.Intent.extras, <map.value>] : String | provenance |  |
-| TestStartServiceToIntent.java:39:37:39:71 | (...)... : String | TestStartServiceToIntent.java:39:13:39:18 | intent [post update] : Intent [android.content.Intent.extras, <map.value>] : String | provenance | MaD:50 |
-| TestStartServiceToIntent.java:39:37:39:71 | (...)... : String | TestStartServiceToIntent.java:39:13:39:18 | intent [post update] : Intent [android.content.Intent.extras, <map.value>] : String | provenance | MaD:50 |
-| TestStartServiceToIntent.java:39:37:39:71 | (...)... : String | TestStartServiceToIntent.java:39:13:39:18 | intent [post update] : Intent [android.content.Intent.extras, <map.value>] : String | provenance | MaD:50 |
+| TestStartServiceToIntent.java:39:37:39:71 | (...)... : String | TestStartServiceToIntent.java:39:13:39:18 | intent [post update] : Intent [android.content.Intent.extras, <map.value>] : String | provenance | MaD:49 |
+| TestStartServiceToIntent.java:39:37:39:71 | (...)... : String | TestStartServiceToIntent.java:39:13:39:18 | intent [post update] : Intent [android.content.Intent.extras, <map.value>] : String | provenance | MaD:49 |
+| TestStartServiceToIntent.java:39:37:39:71 | (...)... : String | TestStartServiceToIntent.java:39:13:39:18 | intent [post update] : Intent [android.content.Intent.extras, <map.value>] : String | provenance | MaD:49 |
 | TestStartServiceToIntent.java:39:46:39:71 | source(...) : Object | TestStartServiceToIntent.java:39:37:39:71 | (...)... : String | provenance |  |
 | TestStartServiceToIntent.java:40:40:40:45 | intent : Intent [android.content.Intent.extras, <map.value>] : String | TestStartServiceToIntent.java:62:29:62:41 | intent : Intent [android.content.Intent.extras, <map.value>] : String | provenance |  |
 | TestStartServiceToIntent.java:40:40:40:45 | intent : Intent [android.content.Intent.extras, <map.value>] : String | TestStartServiceToIntent.java:62:29:62:41 | intent : Intent [android.content.Intent.extras, <map.value>] : String | provenance |  |
@@ -2368,9 +2368,9 @@ edges
 | TestStartServiceToIntent.java:46:13:46:18 | intent [post update] : Intent [android.content.Intent.extras, <map.value>] : String | TestStartServiceToIntent.java:47:30:47:35 | intent : Intent [android.content.Intent.extras, <map.value>] : String | provenance |  |
 | TestStartServiceToIntent.java:46:13:46:18 | intent [post update] : Intent [android.content.Intent.extras, <map.value>] : String | TestStartServiceToIntent.java:47:30:47:35 | intent : Intent [android.content.Intent.extras, <map.value>] : String | provenance |  |
 | TestStartServiceToIntent.java:46:13:46:18 | intent [post update] : Intent [android.content.Intent.extras, <map.value>] : String | TestStartServiceToIntent.java:47:30:47:35 | intent : Intent [android.content.Intent.extras, <map.value>] : String | provenance |  |
-| TestStartServiceToIntent.java:46:37:46:60 | (...)... : String | TestStartServiceToIntent.java:46:13:46:18 | intent [post update] : Intent [android.content.Intent.extras, <map.value>] : String | provenance | MaD:50 |
-| TestStartServiceToIntent.java:46:37:46:60 | (...)... : String | TestStartServiceToIntent.java:46:13:46:18 | intent [post update] : Intent [android.content.Intent.extras, <map.value>] : String | provenance | MaD:50 |
-| TestStartServiceToIntent.java:46:37:46:60 | (...)... : String | TestStartServiceToIntent.java:46:13:46:18 | intent [post update] : Intent [android.content.Intent.extras, <map.value>] : String | provenance | MaD:50 |
+| TestStartServiceToIntent.java:46:37:46:60 | (...)... : String | TestStartServiceToIntent.java:46:13:46:18 | intent [post update] : Intent [android.content.Intent.extras, <map.value>] : String | provenance | MaD:49 |
+| TestStartServiceToIntent.java:46:37:46:60 | (...)... : String | TestStartServiceToIntent.java:46:13:46:18 | intent [post update] : Intent [android.content.Intent.extras, <map.value>] : String | provenance | MaD:49 |
+| TestStartServiceToIntent.java:46:37:46:60 | (...)... : String | TestStartServiceToIntent.java:46:13:46:18 | intent [post update] : Intent [android.content.Intent.extras, <map.value>] : String | provenance | MaD:49 |
 | TestStartServiceToIntent.java:46:46:46:60 | source(...) : Object | TestStartServiceToIntent.java:46:37:46:60 | (...)... : String | provenance |  |
 | TestStartServiceToIntent.java:47:30:47:35 | intent : Intent [android.content.Intent.extras, <map.value>] : String | TestStartServiceToIntent.java:62:29:62:41 | intent : Intent [android.content.Intent.extras, <map.value>] : String | provenance |  |
 | TestStartServiceToIntent.java:47:30:47:35 | intent : Intent [android.content.Intent.extras, <map.value>] : String | TestStartServiceToIntent.java:62:29:62:41 | intent : Intent [android.content.Intent.extras, <map.value>] : String | provenance |  |
@@ -2393,39 +2393,39 @@ edges
 | TestStartServiceToIntent.java:62:29:62:41 | intent : Intent [android.content.Intent.extras, <map.value>] : String | TestStartServiceToIntent.java:63:18:63:23 | intent : Intent [android.content.Intent.extras, <map.value>] : String | provenance |  |
 | TestStartServiceToIntent.java:62:29:62:41 | intent : Intent [android.content.Intent.extras, <map.value>] : String | TestStartServiceToIntent.java:63:18:63:23 | intent : Intent [android.content.Intent.extras, <map.value>] : String | provenance |  |
 | TestStartServiceToIntent.java:62:29:62:41 | intent : Intent [android.content.Intent.extras, <map.value>] : String | TestStartServiceToIntent.java:63:18:63:23 | intent : Intent [android.content.Intent.extras, <map.value>] : String | provenance |  |
-| TestStartServiceToIntent.java:63:18:63:23 | intent : Intent [android.content.Intent.extras, <map.value>] : String | TestStartServiceToIntent.java:63:18:63:46 | getStringExtra(...) | provenance | MaD:42 |
-| TestStartServiceToIntent.java:63:18:63:23 | intent : Intent [android.content.Intent.extras, <map.value>] : String | TestStartServiceToIntent.java:63:18:63:46 | getStringExtra(...) | provenance | MaD:42 |
-| TestStartServiceToIntent.java:63:18:63:23 | intent : Intent [android.content.Intent.extras, <map.value>] : String | TestStartServiceToIntent.java:63:18:63:46 | getStringExtra(...) | provenance | MaD:42 |
+| TestStartServiceToIntent.java:63:18:63:23 | intent : Intent [android.content.Intent.extras, <map.value>] : String | TestStartServiceToIntent.java:63:18:63:46 | getStringExtra(...) | provenance | MaD:43 |
+| TestStartServiceToIntent.java:63:18:63:23 | intent : Intent [android.content.Intent.extras, <map.value>] : String | TestStartServiceToIntent.java:63:18:63:46 | getStringExtra(...) | provenance | MaD:43 |
+| TestStartServiceToIntent.java:63:18:63:23 | intent : Intent [android.content.Intent.extras, <map.value>] : String | TestStartServiceToIntent.java:63:18:63:46 | getStringExtra(...) | provenance | MaD:43 |
 | TestStartServiceToIntent.java:67:35:67:47 | intent : Intent [android.content.Intent.extras, <map.value>] : String | TestStartServiceToIntent.java:68:18:68:23 | intent : Intent [android.content.Intent.extras, <map.value>] : String | provenance |  |
 | TestStartServiceToIntent.java:67:35:67:47 | intent : Intent [android.content.Intent.extras, <map.value>] : String | TestStartServiceToIntent.java:68:18:68:23 | intent : Intent [android.content.Intent.extras, <map.value>] : String | provenance |  |
 | TestStartServiceToIntent.java:67:35:67:47 | intent : Intent [android.content.Intent.extras, <map.value>] : String | TestStartServiceToIntent.java:68:18:68:23 | intent : Intent [android.content.Intent.extras, <map.value>] : String | provenance |  |
-| TestStartServiceToIntent.java:68:18:68:23 | intent : Intent [android.content.Intent.extras, <map.value>] : String | TestStartServiceToIntent.java:68:18:68:46 | getStringExtra(...) | provenance | MaD:42 |
-| TestStartServiceToIntent.java:68:18:68:23 | intent : Intent [android.content.Intent.extras, <map.value>] : String | TestStartServiceToIntent.java:68:18:68:46 | getStringExtra(...) | provenance | MaD:42 |
-| TestStartServiceToIntent.java:68:18:68:23 | intent : Intent [android.content.Intent.extras, <map.value>] : String | TestStartServiceToIntent.java:68:18:68:46 | getStringExtra(...) | provenance | MaD:42 |
+| TestStartServiceToIntent.java:68:18:68:23 | intent : Intent [android.content.Intent.extras, <map.value>] : String | TestStartServiceToIntent.java:68:18:68:46 | getStringExtra(...) | provenance | MaD:43 |
+| TestStartServiceToIntent.java:68:18:68:23 | intent : Intent [android.content.Intent.extras, <map.value>] : String | TestStartServiceToIntent.java:68:18:68:46 | getStringExtra(...) | provenance | MaD:43 |
+| TestStartServiceToIntent.java:68:18:68:23 | intent : Intent [android.content.Intent.extras, <map.value>] : String | TestStartServiceToIntent.java:68:18:68:46 | getStringExtra(...) | provenance | MaD:43 |
 | TestStartServiceToIntent.java:73:31:73:43 | intent : Intent [android.content.Intent.extras, <map.value>] : String | TestStartServiceToIntent.java:74:18:74:23 | intent : Intent [android.content.Intent.extras, <map.value>] : String | provenance |  |
 | TestStartServiceToIntent.java:73:31:73:43 | intent : Intent [android.content.Intent.extras, <map.value>] : String | TestStartServiceToIntent.java:74:18:74:23 | intent : Intent [android.content.Intent.extras, <map.value>] : String | provenance |  |
 | TestStartServiceToIntent.java:73:31:73:43 | intent : Intent [android.content.Intent.extras, <map.value>] : String | TestStartServiceToIntent.java:74:18:74:23 | intent : Intent [android.content.Intent.extras, <map.value>] : String | provenance |  |
-| TestStartServiceToIntent.java:74:18:74:23 | intent : Intent [android.content.Intent.extras, <map.value>] : String | TestStartServiceToIntent.java:74:18:74:46 | getStringExtra(...) | provenance | MaD:42 |
-| TestStartServiceToIntent.java:74:18:74:23 | intent : Intent [android.content.Intent.extras, <map.value>] : String | TestStartServiceToIntent.java:74:18:74:46 | getStringExtra(...) | provenance | MaD:42 |
-| TestStartServiceToIntent.java:74:18:74:23 | intent : Intent [android.content.Intent.extras, <map.value>] : String | TestStartServiceToIntent.java:74:18:74:46 | getStringExtra(...) | provenance | MaD:42 |
+| TestStartServiceToIntent.java:74:18:74:23 | intent : Intent [android.content.Intent.extras, <map.value>] : String | TestStartServiceToIntent.java:74:18:74:46 | getStringExtra(...) | provenance | MaD:43 |
+| TestStartServiceToIntent.java:74:18:74:23 | intent : Intent [android.content.Intent.extras, <map.value>] : String | TestStartServiceToIntent.java:74:18:74:46 | getStringExtra(...) | provenance | MaD:43 |
+| TestStartServiceToIntent.java:74:18:74:23 | intent : Intent [android.content.Intent.extras, <map.value>] : String | TestStartServiceToIntent.java:74:18:74:46 | getStringExtra(...) | provenance | MaD:43 |
 | TestStartServiceToIntent.java:79:33:79:45 | intent : Intent [android.content.Intent.extras, <map.value>] : String | TestStartServiceToIntent.java:80:18:80:23 | intent : Intent [android.content.Intent.extras, <map.value>] : String | provenance |  |
 | TestStartServiceToIntent.java:79:33:79:45 | intent : Intent [android.content.Intent.extras, <map.value>] : String | TestStartServiceToIntent.java:80:18:80:23 | intent : Intent [android.content.Intent.extras, <map.value>] : String | provenance |  |
 | TestStartServiceToIntent.java:79:33:79:45 | intent : Intent [android.content.Intent.extras, <map.value>] : String | TestStartServiceToIntent.java:80:18:80:23 | intent : Intent [android.content.Intent.extras, <map.value>] : String | provenance |  |
-| TestStartServiceToIntent.java:80:18:80:23 | intent : Intent [android.content.Intent.extras, <map.value>] : String | TestStartServiceToIntent.java:80:18:80:46 | getStringExtra(...) | provenance | MaD:42 |
-| TestStartServiceToIntent.java:80:18:80:23 | intent : Intent [android.content.Intent.extras, <map.value>] : String | TestStartServiceToIntent.java:80:18:80:46 | getStringExtra(...) | provenance | MaD:42 |
-| TestStartServiceToIntent.java:80:18:80:23 | intent : Intent [android.content.Intent.extras, <map.value>] : String | TestStartServiceToIntent.java:80:18:80:46 | getStringExtra(...) | provenance | MaD:42 |
+| TestStartServiceToIntent.java:80:18:80:23 | intent : Intent [android.content.Intent.extras, <map.value>] : String | TestStartServiceToIntent.java:80:18:80:46 | getStringExtra(...) | provenance | MaD:43 |
+| TestStartServiceToIntent.java:80:18:80:23 | intent : Intent [android.content.Intent.extras, <map.value>] : String | TestStartServiceToIntent.java:80:18:80:46 | getStringExtra(...) | provenance | MaD:43 |
+| TestStartServiceToIntent.java:80:18:80:23 | intent : Intent [android.content.Intent.extras, <map.value>] : String | TestStartServiceToIntent.java:80:18:80:46 | getStringExtra(...) | provenance | MaD:43 |
 | TestStartServiceToIntent.java:85:30:85:42 | intent : Intent [android.content.Intent.extras, <map.value>] : String | TestStartServiceToIntent.java:86:18:86:23 | intent : Intent [android.content.Intent.extras, <map.value>] : String | provenance |  |
 | TestStartServiceToIntent.java:85:30:85:42 | intent : Intent [android.content.Intent.extras, <map.value>] : String | TestStartServiceToIntent.java:86:18:86:23 | intent : Intent [android.content.Intent.extras, <map.value>] : String | provenance |  |
 | TestStartServiceToIntent.java:85:30:85:42 | intent : Intent [android.content.Intent.extras, <map.value>] : String | TestStartServiceToIntent.java:86:18:86:23 | intent : Intent [android.content.Intent.extras, <map.value>] : String | provenance |  |
-| TestStartServiceToIntent.java:86:18:86:23 | intent : Intent [android.content.Intent.extras, <map.value>] : String | TestStartServiceToIntent.java:86:18:86:46 | getStringExtra(...) | provenance | MaD:42 |
-| TestStartServiceToIntent.java:86:18:86:23 | intent : Intent [android.content.Intent.extras, <map.value>] : String | TestStartServiceToIntent.java:86:18:86:46 | getStringExtra(...) | provenance | MaD:42 |
-| TestStartServiceToIntent.java:86:18:86:23 | intent : Intent [android.content.Intent.extras, <map.value>] : String | TestStartServiceToIntent.java:86:18:86:46 | getStringExtra(...) | provenance | MaD:42 |
+| TestStartServiceToIntent.java:86:18:86:23 | intent : Intent [android.content.Intent.extras, <map.value>] : String | TestStartServiceToIntent.java:86:18:86:46 | getStringExtra(...) | provenance | MaD:43 |
+| TestStartServiceToIntent.java:86:18:86:23 | intent : Intent [android.content.Intent.extras, <map.value>] : String | TestStartServiceToIntent.java:86:18:86:46 | getStringExtra(...) | provenance | MaD:43 |
+| TestStartServiceToIntent.java:86:18:86:23 | intent : Intent [android.content.Intent.extras, <map.value>] : String | TestStartServiceToIntent.java:86:18:86:46 | getStringExtra(...) | provenance | MaD:43 |
 | TestStartServiceToIntent.java:90:35:90:47 | intent : Intent [android.content.Intent.extras, <map.value>] : String | TestStartServiceToIntent.java:91:18:91:23 | intent : Intent [android.content.Intent.extras, <map.value>] : String | provenance |  |
 | TestStartServiceToIntent.java:90:35:90:47 | intent : Intent [android.content.Intent.extras, <map.value>] : String | TestStartServiceToIntent.java:91:18:91:23 | intent : Intent [android.content.Intent.extras, <map.value>] : String | provenance |  |
 | TestStartServiceToIntent.java:90:35:90:47 | intent : Intent [android.content.Intent.extras, <map.value>] : String | TestStartServiceToIntent.java:91:18:91:23 | intent : Intent [android.content.Intent.extras, <map.value>] : String | provenance |  |
-| TestStartServiceToIntent.java:91:18:91:23 | intent : Intent [android.content.Intent.extras, <map.value>] : String | TestStartServiceToIntent.java:91:18:91:46 | getStringExtra(...) | provenance | MaD:42 |
-| TestStartServiceToIntent.java:91:18:91:23 | intent : Intent [android.content.Intent.extras, <map.value>] : String | TestStartServiceToIntent.java:91:18:91:46 | getStringExtra(...) | provenance | MaD:42 |
-| TestStartServiceToIntent.java:91:18:91:23 | intent : Intent [android.content.Intent.extras, <map.value>] : String | TestStartServiceToIntent.java:91:18:91:46 | getStringExtra(...) | provenance | MaD:42 |
+| TestStartServiceToIntent.java:91:18:91:23 | intent : Intent [android.content.Intent.extras, <map.value>] : String | TestStartServiceToIntent.java:91:18:91:46 | getStringExtra(...) | provenance | MaD:43 |
+| TestStartServiceToIntent.java:91:18:91:23 | intent : Intent [android.content.Intent.extras, <map.value>] : String | TestStartServiceToIntent.java:91:18:91:46 | getStringExtra(...) | provenance | MaD:43 |
+| TestStartServiceToIntent.java:91:18:91:23 | intent : Intent [android.content.Intent.extras, <map.value>] : String | TestStartServiceToIntent.java:91:18:91:46 | getStringExtra(...) | provenance | MaD:43 |
 nodes
 | Test.java:22:19:22:32 | it : Set [<element>] : String | semmle.label | it : Set [<element>] : String |
 | Test.java:22:44:22:45 | it : Set [<element>] : String | semmle.label | it : Set [<element>] : String |
diff --git a/java/ql/test/library-tests/frameworks/android/notification/test.expected b/java/ql/test/library-tests/frameworks/android/notification/test.expected
index d202da47407..65015ad867d 100644
--- a/java/ql/test/library-tests/frameworks/android/notification/test.expected
+++ b/java/ql/test/library-tests/frameworks/android/notification/test.expected
@@ -1,21 +1,21 @@
 models
-| 1 | Summary: android.app; Notification$Action; true; Action; (int,CharSequence,PendingIntent); ; Argument[2]; Argument[this]; taint; manual |
-| 2 | Summary: android.app; Notification$Action; true; getExtras; ; ; Argument[this].SyntheticField[android.content.Intent.extras]; ReturnValue; value; manual |
-| 3 | Summary: android.app; Notification$Action$Builder; true; Builder; (Notification$Action); ; Argument[0]; Argument[this]; taint; manual |
-| 4 | Summary: android.app; Notification$Action$Builder; true; Builder; (Icon,CharSequence,PendingIntent); ; Argument[2]; Argument[this]; taint; manual |
-| 5 | Summary: android.app; Notification$Action$Builder; true; Builder; (int,CharSequence,PendingIntent); ; Argument[2]; Argument[this]; taint; manual |
+| 1 | Summary: android.app; Notification$Action$Builder; true; Builder; (Icon,CharSequence,PendingIntent); ; Argument[2]; Argument[this]; taint; manual |
+| 2 | Summary: android.app; Notification$Action$Builder; true; Builder; (Notification$Action); ; Argument[0]; Argument[this]; taint; manual |
+| 3 | Summary: android.app; Notification$Action$Builder; true; Builder; (int,CharSequence,PendingIntent); ; Argument[2]; Argument[this]; taint; manual |
+| 4 | Summary: android.app; Notification$Action$Builder; true; addExtras; ; ; Argument[0].MapKey; Argument[this].SyntheticField[android.content.Intent.extras].MapKey; value; manual |
+| 5 | Summary: android.app; Notification$Action$Builder; true; addExtras; ; ; Argument[0].MapValue; Argument[this].SyntheticField[android.content.Intent.extras].MapValue; value; manual |
 | 6 | Summary: android.app; Notification$Action$Builder; true; addExtras; ; ; Argument[this]; ReturnValue; value; manual |
-| 7 | Summary: android.app; Notification$Action$Builder; true; addExtras; ; ; Argument[0].MapKey; Argument[this].SyntheticField[android.content.Intent.extras].MapKey; value; manual |
-| 8 | Summary: android.app; Notification$Action$Builder; true; addExtras; ; ; Argument[0].MapValue; Argument[this].SyntheticField[android.content.Intent.extras].MapValue; value; manual |
-| 9 | Summary: android.app; Notification$Action$Builder; true; addRemoteInput; ; ; Argument[this]; ReturnValue; value; manual |
-| 10 | Summary: android.app; Notification$Action$Builder; true; build; ; ; Argument[this]; ReturnValue; taint; manual |
-| 11 | Summary: android.app; Notification$Action$Builder; true; build; ; ; Argument[this].SyntheticField[android.content.Intent.extras]; ReturnValue.SyntheticField[android.content.Intent.extras]; value; manual |
-| 12 | Summary: android.app; Notification$Action$Builder; true; extend; ; ; Argument[this]; ReturnValue; value; manual |
-| 13 | Summary: android.app; Notification$Action$Builder; true; getExtras; ; ; Argument[this].SyntheticField[android.content.Intent.extras]; ReturnValue; value; manual |
-| 14 | Summary: android.app; Notification$Action$Builder; true; setAllowGeneratedReplies; ; ; Argument[this]; ReturnValue; value; manual |
-| 15 | Summary: android.app; Notification$Action$Builder; true; setAuthenticationRequired; ; ; Argument[this]; ReturnValue; value; manual |
-| 16 | Summary: android.app; Notification$Action$Builder; true; setContextual; ; ; Argument[this]; ReturnValue; value; manual |
-| 17 | Summary: android.app; Notification$Action$Builder; true; setSemanticAction; ; ; Argument[this]; ReturnValue; value; manual |
+| 7 | Summary: android.app; Notification$Action$Builder; true; addRemoteInput; ; ; Argument[this]; ReturnValue; value; manual |
+| 8 | Summary: android.app; Notification$Action$Builder; true; build; ; ; Argument[this].SyntheticField[android.content.Intent.extras]; ReturnValue.SyntheticField[android.content.Intent.extras]; value; manual |
+| 9 | Summary: android.app; Notification$Action$Builder; true; build; ; ; Argument[this]; ReturnValue; taint; manual |
+| 10 | Summary: android.app; Notification$Action$Builder; true; extend; ; ; Argument[this]; ReturnValue; value; manual |
+| 11 | Summary: android.app; Notification$Action$Builder; true; getExtras; ; ; Argument[this].SyntheticField[android.content.Intent.extras]; ReturnValue; value; manual |
+| 12 | Summary: android.app; Notification$Action$Builder; true; setAllowGeneratedReplies; ; ; Argument[this]; ReturnValue; value; manual |
+| 13 | Summary: android.app; Notification$Action$Builder; true; setAuthenticationRequired; ; ; Argument[this]; ReturnValue; value; manual |
+| 14 | Summary: android.app; Notification$Action$Builder; true; setContextual; ; ; Argument[this]; ReturnValue; value; manual |
+| 15 | Summary: android.app; Notification$Action$Builder; true; setSemanticAction; ; ; Argument[this]; ReturnValue; value; manual |
+| 16 | Summary: android.app; Notification$Action; true; Action; (int,CharSequence,PendingIntent); ; Argument[2]; Argument[this]; taint; manual |
+| 17 | Summary: android.app; Notification$Action; true; getExtras; ; ; Argument[this].SyntheticField[android.content.Intent.extras]; ReturnValue; value; manual |
 | 18 | Summary: android.app; Notification$BigPictureStyle; true; BigPictureStyle; (Notification$Builder); ; Argument[0]; Argument[this]; taint; manual |
 | 19 | Summary: android.app; Notification$BigPictureStyle; true; bigLargeIcon; ; ; Argument[this]; ReturnValue; value; manual |
 | 20 | Summary: android.app; Notification$BigPictureStyle; true; bigPicture; ; ; Argument[this]; ReturnValue; value; manual |
@@ -27,20 +27,20 @@ models
 | 26 | Summary: android.app; Notification$BigTextStyle; true; bigText; ; ; Argument[this]; ReturnValue; value; manual |
 | 27 | Summary: android.app; Notification$BigTextStyle; true; setBigContentTitle; ; ; Argument[this]; ReturnValue; value; manual |
 | 28 | Summary: android.app; Notification$BigTextStyle; true; setSummaryText; ; ; Argument[this]; ReturnValue; value; manual |
-| 29 | Summary: android.app; Notification$Builder; true; addAction; ; ; Argument[this]; ReturnValue; value; manual |
-| 30 | Summary: android.app; Notification$Builder; true; addAction; (Notification$Action); ; Argument[0]; Argument[this]; taint; manual |
-| 31 | Summary: android.app; Notification$Builder; true; addAction; (int,CharSequence,PendingIntent); ; Argument[2]; Argument[this]; taint; manual |
-| 32 | Summary: android.app; Notification$Builder; true; addExtras; ; ; Argument[this]; ReturnValue; value; manual |
-| 33 | Summary: android.app; Notification$Builder; true; addExtras; ; ; Argument[0].MapKey; Argument[this].SyntheticField[android.content.Intent.extras].MapKey; value; manual |
-| 34 | Summary: android.app; Notification$Builder; true; addExtras; ; ; Argument[0].MapValue; Argument[this].SyntheticField[android.content.Intent.extras].MapValue; value; manual |
+| 29 | Summary: android.app; Notification$Builder; true; addAction; (Notification$Action); ; Argument[0]; Argument[this]; taint; manual |
+| 30 | Summary: android.app; Notification$Builder; true; addAction; (int,CharSequence,PendingIntent); ; Argument[2]; Argument[this]; taint; manual |
+| 31 | Summary: android.app; Notification$Builder; true; addAction; ; ; Argument[this]; ReturnValue; value; manual |
+| 32 | Summary: android.app; Notification$Builder; true; addExtras; ; ; Argument[0].MapKey; Argument[this].SyntheticField[android.content.Intent.extras].MapKey; value; manual |
+| 33 | Summary: android.app; Notification$Builder; true; addExtras; ; ; Argument[0].MapValue; Argument[this].SyntheticField[android.content.Intent.extras].MapValue; value; manual |
+| 34 | Summary: android.app; Notification$Builder; true; addExtras; ; ; Argument[this]; ReturnValue; value; manual |
 | 35 | Summary: android.app; Notification$Builder; true; addPerson; ; ; Argument[this]; ReturnValue; value; manual |
-| 36 | Summary: android.app; Notification$Builder; true; build; ; ; Argument[this]; ReturnValue; taint; manual |
-| 37 | Summary: android.app; Notification$Builder; true; build; ; ; Argument[this].SyntheticField[android.content.Intent.extras]; ReturnValue.Field[android.app.Notification.extras]; value; manual |
+| 36 | Summary: android.app; Notification$Builder; true; build; ; ; Argument[this].SyntheticField[android.content.Intent.extras]; ReturnValue.Field[android.app.Notification.extras]; value; manual |
+| 37 | Summary: android.app; Notification$Builder; true; build; ; ; Argument[this]; ReturnValue; taint; manual |
 | 38 | Summary: android.app; Notification$Builder; true; extend; ; ; Argument[this]; ReturnValue; value; manual |
 | 39 | Summary: android.app; Notification$Builder; true; getExtras; ; ; Argument[this].SyntheticField[android.content.Intent.extras]; ReturnValue; value; manual |
 | 40 | Summary: android.app; Notification$Builder; true; recoverBuilder; ; ; Argument[1]; ReturnValue; taint; manual |
-| 41 | Summary: android.app; Notification$Builder; true; setActions; ; ; Argument[this]; ReturnValue; value; manual |
-| 42 | Summary: android.app; Notification$Builder; true; setActions; ; ; Argument[0].ArrayElement; Argument[this]; taint; manual |
+| 41 | Summary: android.app; Notification$Builder; true; setActions; ; ; Argument[0].ArrayElement; Argument[this]; taint; manual |
+| 42 | Summary: android.app; Notification$Builder; true; setActions; ; ; Argument[this]; ReturnValue; value; manual |
 | 43 | Summary: android.app; Notification$Builder; true; setAutoCancel; ; ; Argument[this]; ReturnValue; value; manual |
 | 44 | Summary: android.app; Notification$Builder; true; setBadgeIconType; ; ; Argument[this]; ReturnValue; value; manual |
 | 45 | Summary: android.app; Notification$Builder; true; setBubbleMetadata; ; ; Argument[this]; ReturnValue; value; manual |
@@ -51,17 +51,17 @@ models
 | 50 | Summary: android.app; Notification$Builder; true; setColorized; ; ; Argument[this]; ReturnValue; value; manual |
 | 51 | Summary: android.app; Notification$Builder; true; setContent; ; ; Argument[this]; ReturnValue; value; manual |
 | 52 | Summary: android.app; Notification$Builder; true; setContentInfo; ; ; Argument[this]; ReturnValue; value; manual |
-| 53 | Summary: android.app; Notification$Builder; true; setContentIntent; ; ; Argument[this]; ReturnValue; value; manual |
-| 54 | Summary: android.app; Notification$Builder; true; setContentIntent; ; ; Argument[0]; Argument[this]; taint; manual |
+| 53 | Summary: android.app; Notification$Builder; true; setContentIntent; ; ; Argument[0]; Argument[this]; taint; manual |
+| 54 | Summary: android.app; Notification$Builder; true; setContentIntent; ; ; Argument[this]; ReturnValue; value; manual |
 | 55 | Summary: android.app; Notification$Builder; true; setContentText; ; ; Argument[this]; ReturnValue; value; manual |
 | 56 | Summary: android.app; Notification$Builder; true; setContentTitle; ; ; Argument[this]; ReturnValue; value; manual |
 | 57 | Summary: android.app; Notification$Builder; true; setCustomBigContentView; ; ; Argument[this]; ReturnValue; value; manual |
 | 58 | Summary: android.app; Notification$Builder; true; setCustomHeadsUpContentView; ; ; Argument[this]; ReturnValue; value; manual |
 | 59 | Summary: android.app; Notification$Builder; true; setDefaults; ; ; Argument[this]; ReturnValue; value; manual |
-| 60 | Summary: android.app; Notification$Builder; true; setDeleteIntent; ; ; Argument[this]; ReturnValue; value; manual |
-| 61 | Summary: android.app; Notification$Builder; true; setDeleteIntent; ; ; Argument[0]; Argument[this]; taint; manual |
-| 62 | Summary: android.app; Notification$Builder; true; setExtras; ; ; Argument[this]; ReturnValue; value; manual |
-| 63 | Summary: android.app; Notification$Builder; true; setExtras; ; ; Argument[0]; Argument[this].SyntheticField[android.content.Intent.extras]; value; manual |
+| 60 | Summary: android.app; Notification$Builder; true; setDeleteIntent; ; ; Argument[0]; Argument[this]; taint; manual |
+| 61 | Summary: android.app; Notification$Builder; true; setDeleteIntent; ; ; Argument[this]; ReturnValue; value; manual |
+| 62 | Summary: android.app; Notification$Builder; true; setExtras; ; ; Argument[0]; Argument[this].SyntheticField[android.content.Intent.extras]; value; manual |
+| 63 | Summary: android.app; Notification$Builder; true; setExtras; ; ; Argument[this]; ReturnValue; value; manual |
 | 64 | Summary: android.app; Notification$Builder; true; setFlag; ; ; Argument[this]; ReturnValue; value; manual |
 | 65 | Summary: android.app; Notification$Builder; true; setForegroundServiceBehavior; ; ; Argument[this]; ReturnValue; value; manual |
 | 66 | Summary: android.app; Notification$Builder; true; setFullScreenIntent; ; ; Argument[this]; ReturnValue; value; manual |
@@ -77,8 +77,8 @@ models
 | 76 | Summary: android.app; Notification$Builder; true; setOnlyAlertOnce; ; ; Argument[this]; ReturnValue; value; manual |
 | 77 | Summary: android.app; Notification$Builder; true; setPriority; ; ; Argument[this]; ReturnValue; value; manual |
 | 78 | Summary: android.app; Notification$Builder; true; setProgress; ; ; Argument[this]; ReturnValue; value; manual |
-| 79 | Summary: android.app; Notification$Builder; true; setPublicVersion; ; ; Argument[this]; ReturnValue; value; manual |
-| 80 | Summary: android.app; Notification$Builder; true; setPublicVersion; ; ; Argument[0]; Argument[this]; taint; manual |
+| 79 | Summary: android.app; Notification$Builder; true; setPublicVersion; ; ; Argument[0]; Argument[this]; taint; manual |
+| 80 | Summary: android.app; Notification$Builder; true; setPublicVersion; ; ; Argument[this]; ReturnValue; value; manual |
 | 81 | Summary: android.app; Notification$Builder; true; setRemoteInputHistory; ; ; Argument[this]; ReturnValue; value; manual |
 | 82 | Summary: android.app; Notification$Builder; true; setSettingsText; ; ; Argument[this]; ReturnValue; value; manual |
 | 83 | Summary: android.app; Notification$Builder; true; setShortcutId; ; ; Argument[this]; ReturnValue; value; manual |
@@ -105,23 +105,23 @@ models
 | 104 | Summary: android.os; BaseBundle; true; get; (String); ; Argument[this].MapValue; ReturnValue; value; manual |
 | 105 | Summary: android.os; BaseBundle; true; putString; ; ; Argument[0]; Argument[this].MapKey; value; manual |
 | 106 | Summary: android.os; BaseBundle; true; putString; ; ; Argument[1]; Argument[this].MapValue; value; manual |
-| 107 | Summary: androidx.core.app; NotificationCompat$Action; true; Action; (IconCompat,CharSequence,PendingIntent); ; Argument[2]; Argument[this]; taint; manual |
-| 108 | Summary: androidx.core.app; NotificationCompat$Action; true; Action; (int,CharSequence,PendingIntent); ; Argument[2]; Argument[this]; taint; manual |
-| 109 | Summary: androidx.core.app; NotificationCompat$Action; true; getExtras; ; ; Argument[this].SyntheticField[android.content.Intent.extras]; ReturnValue; value; manual |
-| 110 | Summary: androidx.core.app; NotificationCompat$Action$Builder; true; Builder; (NotificationCompat$Action); ; Argument[0]; Argument[this]; taint; manual |
-| 111 | Summary: androidx.core.app; NotificationCompat$Action$Builder; true; Builder; (IconCompat,CharSequence,PendingIntent); ; Argument[2]; Argument[this]; taint; manual |
-| 112 | Summary: androidx.core.app; NotificationCompat$Action$Builder; true; Builder; (int,CharSequence,PendingIntent); ; Argument[2]; Argument[this]; taint; manual |
-| 113 | Summary: androidx.core.app; NotificationCompat$Action$Builder; true; addExtras; ; ; Argument[this]; ReturnValue; value; manual |
-| 114 | Summary: androidx.core.app; NotificationCompat$Action$Builder; true; addExtras; ; ; Argument[0].MapKey; Argument[this].SyntheticField[android.content.Intent.extras].MapKey; value; manual |
-| 115 | Summary: androidx.core.app; NotificationCompat$Action$Builder; true; addExtras; ; ; Argument[0].MapValue; Argument[this].SyntheticField[android.content.Intent.extras].MapValue; value; manual |
-| 116 | Summary: androidx.core.app; NotificationCompat$Action$Builder; true; addRemoteInput; ; ; Argument[this]; ReturnValue; value; manual |
-| 117 | Summary: androidx.core.app; NotificationCompat$Action$Builder; true; build; ; ; Argument[this]; ReturnValue; taint; manual |
-| 118 | Summary: androidx.core.app; NotificationCompat$Action$Builder; true; build; ; ; Argument[this].SyntheticField[android.content.Intent.extras]; ReturnValue.SyntheticField[android.content.Intent.extras]; value; manual |
-| 119 | Summary: androidx.core.app; NotificationCompat$Action$Builder; true; extend; ; ; Argument[this]; ReturnValue; value; manual |
-| 120 | Summary: androidx.core.app; NotificationCompat$Action$Builder; true; getExtras; ; ; Argument[this].SyntheticField[android.content.Intent.extras]; ReturnValue; value; manual |
-| 121 | Summary: androidx.core.app; NotificationCompat$Action$Builder; true; setAllowGeneratedReplies; ; ; Argument[this]; ReturnValue; value; manual |
-| 122 | Summary: androidx.core.app; NotificationCompat$Action$Builder; true; setContextual; ; ; Argument[this]; ReturnValue; value; manual |
-| 123 | Summary: androidx.core.app; NotificationCompat$Action$Builder; true; setSemanticAction; ; ; Argument[this]; ReturnValue; value; manual |
+| 107 | Summary: androidx.core.app; NotificationCompat$Action$Builder; true; Builder; (IconCompat,CharSequence,PendingIntent); ; Argument[2]; Argument[this]; taint; manual |
+| 108 | Summary: androidx.core.app; NotificationCompat$Action$Builder; true; Builder; (NotificationCompat$Action); ; Argument[0]; Argument[this]; taint; manual |
+| 109 | Summary: androidx.core.app; NotificationCompat$Action$Builder; true; Builder; (int,CharSequence,PendingIntent); ; Argument[2]; Argument[this]; taint; manual |
+| 110 | Summary: androidx.core.app; NotificationCompat$Action$Builder; true; addExtras; ; ; Argument[0].MapKey; Argument[this].SyntheticField[android.content.Intent.extras].MapKey; value; manual |
+| 111 | Summary: androidx.core.app; NotificationCompat$Action$Builder; true; addExtras; ; ; Argument[0].MapValue; Argument[this].SyntheticField[android.content.Intent.extras].MapValue; value; manual |
+| 112 | Summary: androidx.core.app; NotificationCompat$Action$Builder; true; addExtras; ; ; Argument[this]; ReturnValue; value; manual |
+| 113 | Summary: androidx.core.app; NotificationCompat$Action$Builder; true; addRemoteInput; ; ; Argument[this]; ReturnValue; value; manual |
+| 114 | Summary: androidx.core.app; NotificationCompat$Action$Builder; true; build; ; ; Argument[this].SyntheticField[android.content.Intent.extras]; ReturnValue.SyntheticField[android.content.Intent.extras]; value; manual |
+| 115 | Summary: androidx.core.app; NotificationCompat$Action$Builder; true; build; ; ; Argument[this]; ReturnValue; taint; manual |
+| 116 | Summary: androidx.core.app; NotificationCompat$Action$Builder; true; extend; ; ; Argument[this]; ReturnValue; value; manual |
+| 117 | Summary: androidx.core.app; NotificationCompat$Action$Builder; true; getExtras; ; ; Argument[this].SyntheticField[android.content.Intent.extras]; ReturnValue; value; manual |
+| 118 | Summary: androidx.core.app; NotificationCompat$Action$Builder; true; setAllowGeneratedReplies; ; ; Argument[this]; ReturnValue; value; manual |
+| 119 | Summary: androidx.core.app; NotificationCompat$Action$Builder; true; setContextual; ; ; Argument[this]; ReturnValue; value; manual |
+| 120 | Summary: androidx.core.app; NotificationCompat$Action$Builder; true; setSemanticAction; ; ; Argument[this]; ReturnValue; value; manual |
+| 121 | Summary: androidx.core.app; NotificationCompat$Action; true; Action; (IconCompat,CharSequence,PendingIntent); ; Argument[2]; Argument[this]; taint; manual |
+| 122 | Summary: androidx.core.app; NotificationCompat$Action; true; Action; (int,CharSequence,PendingIntent); ; Argument[2]; Argument[this]; taint; manual |
+| 123 | Summary: androidx.core.app; NotificationCompat$Action; true; getExtras; ; ; Argument[this].SyntheticField[android.content.Intent.extras]; ReturnValue; value; manual |
 | 124 | Summary: androidx.core.app; NotificationCompat$BigPictureStyle; true; bigLargeIcon; ; ; Argument[this]; ReturnValue; value; manual |
 | 125 | Summary: androidx.core.app; NotificationCompat$BigPictureStyle; true; bigPicture; ; ; Argument[this]; ReturnValue; value; manual |
 | 126 | Summary: androidx.core.app; NotificationCompat$BigPictureStyle; true; setBigContentTitle; ; ; Argument[this]; ReturnValue; value; manual |
@@ -129,15 +129,15 @@ models
 | 128 | Summary: androidx.core.app; NotificationCompat$BigTextStyle; true; bigText; ; ; Argument[this]; ReturnValue; value; manual |
 | 129 | Summary: androidx.core.app; NotificationCompat$BigTextStyle; true; setBigContentTitle; ; ; Argument[this]; ReturnValue; value; manual |
 | 130 | Summary: androidx.core.app; NotificationCompat$BigTextStyle; true; setSummaryText; ; ; Argument[this]; ReturnValue; value; manual |
-| 131 | Summary: androidx.core.app; NotificationCompat$Builder; true; addAction; ; ; Argument[this]; ReturnValue; value; manual |
-| 132 | Summary: androidx.core.app; NotificationCompat$Builder; true; addAction; (NotificationCompat$Action); ; Argument[0]; Argument[this]; taint; manual |
-| 133 | Summary: androidx.core.app; NotificationCompat$Builder; true; addAction; (int,CharSequence,PendingIntent); ; Argument[2]; Argument[this]; taint; manual |
-| 134 | Summary: androidx.core.app; NotificationCompat$Builder; true; addExtras; ; ; Argument[this]; ReturnValue; value; manual |
-| 135 | Summary: androidx.core.app; NotificationCompat$Builder; true; addExtras; ; ; Argument[0].MapKey; Argument[this].SyntheticField[android.content.Intent.extras].MapKey; value; manual |
-| 136 | Summary: androidx.core.app; NotificationCompat$Builder; true; addExtras; ; ; Argument[0].MapValue; Argument[this].SyntheticField[android.content.Intent.extras].MapValue; value; manual |
+| 131 | Summary: androidx.core.app; NotificationCompat$Builder; true; addAction; (NotificationCompat$Action); ; Argument[0]; Argument[this]; taint; manual |
+| 132 | Summary: androidx.core.app; NotificationCompat$Builder; true; addAction; (int,CharSequence,PendingIntent); ; Argument[2]; Argument[this]; taint; manual |
+| 133 | Summary: androidx.core.app; NotificationCompat$Builder; true; addAction; ; ; Argument[this]; ReturnValue; value; manual |
+| 134 | Summary: androidx.core.app; NotificationCompat$Builder; true; addExtras; ; ; Argument[0].MapKey; Argument[this].SyntheticField[android.content.Intent.extras].MapKey; value; manual |
+| 135 | Summary: androidx.core.app; NotificationCompat$Builder; true; addExtras; ; ; Argument[0].MapValue; Argument[this].SyntheticField[android.content.Intent.extras].MapValue; value; manual |
+| 136 | Summary: androidx.core.app; NotificationCompat$Builder; true; addExtras; ; ; Argument[this]; ReturnValue; value; manual |
 | 137 | Summary: androidx.core.app; NotificationCompat$Builder; true; addPerson; ; ; Argument[this]; ReturnValue; value; manual |
-| 138 | Summary: androidx.core.app; NotificationCompat$Builder; true; build; ; ; Argument[this]; ReturnValue; taint; manual |
-| 139 | Summary: androidx.core.app; NotificationCompat$Builder; true; build; ; ; Argument[this].SyntheticField[android.content.Intent.extras]; ReturnValue.Field[android.app.Notification.extras]; value; manual |
+| 138 | Summary: androidx.core.app; NotificationCompat$Builder; true; build; ; ; Argument[this].SyntheticField[android.content.Intent.extras]; ReturnValue.Field[android.app.Notification.extras]; value; manual |
+| 139 | Summary: androidx.core.app; NotificationCompat$Builder; true; build; ; ; Argument[this]; ReturnValue; taint; manual |
 | 140 | Summary: androidx.core.app; NotificationCompat$Builder; true; extend; ; ; Argument[this]; ReturnValue; value; manual |
 | 141 | Summary: androidx.core.app; NotificationCompat$Builder; true; getExtras; ; ; Argument[this].SyntheticField[android.content.Intent.extras]; ReturnValue; value; manual |
 | 142 | Summary: androidx.core.app; NotificationCompat$Builder; true; setAutoCancel; ; ; Argument[this]; ReturnValue; value; manual |
@@ -150,17 +150,17 @@ models
 | 149 | Summary: androidx.core.app; NotificationCompat$Builder; true; setColorized; ; ; Argument[this]; ReturnValue; value; manual |
 | 150 | Summary: androidx.core.app; NotificationCompat$Builder; true; setContent; ; ; Argument[this]; ReturnValue; value; manual |
 | 151 | Summary: androidx.core.app; NotificationCompat$Builder; true; setContentInfo; ; ; Argument[this]; ReturnValue; value; manual |
-| 152 | Summary: androidx.core.app; NotificationCompat$Builder; true; setContentIntent; ; ; Argument[this]; ReturnValue; value; manual |
-| 153 | Summary: androidx.core.app; NotificationCompat$Builder; true; setContentIntent; ; ; Argument[0]; Argument[this]; taint; manual |
+| 152 | Summary: androidx.core.app; NotificationCompat$Builder; true; setContentIntent; ; ; Argument[0]; Argument[this]; taint; manual |
+| 153 | Summary: androidx.core.app; NotificationCompat$Builder; true; setContentIntent; ; ; Argument[this]; ReturnValue; value; manual |
 | 154 | Summary: androidx.core.app; NotificationCompat$Builder; true; setContentText; ; ; Argument[this]; ReturnValue; value; manual |
 | 155 | Summary: androidx.core.app; NotificationCompat$Builder; true; setContentTitle; ; ; Argument[this]; ReturnValue; value; manual |
 | 156 | Summary: androidx.core.app; NotificationCompat$Builder; true; setCustomBigContentView; ; ; Argument[this]; ReturnValue; value; manual |
 | 157 | Summary: androidx.core.app; NotificationCompat$Builder; true; setCustomHeadsUpContentView; ; ; Argument[this]; ReturnValue; value; manual |
 | 158 | Summary: androidx.core.app; NotificationCompat$Builder; true; setDefaults; ; ; Argument[this]; ReturnValue; value; manual |
-| 159 | Summary: androidx.core.app; NotificationCompat$Builder; true; setDeleteIntent; ; ; Argument[this]; ReturnValue; value; manual |
-| 160 | Summary: androidx.core.app; NotificationCompat$Builder; true; setDeleteIntent; ; ; Argument[0]; Argument[this]; taint; manual |
-| 161 | Summary: androidx.core.app; NotificationCompat$Builder; true; setExtras; ; ; Argument[this]; ReturnValue; value; manual |
-| 162 | Summary: androidx.core.app; NotificationCompat$Builder; true; setExtras; ; ; Argument[0]; Argument[this].SyntheticField[android.content.Intent.extras]; value; manual |
+| 159 | Summary: androidx.core.app; NotificationCompat$Builder; true; setDeleteIntent; ; ; Argument[0]; Argument[this]; taint; manual |
+| 160 | Summary: androidx.core.app; NotificationCompat$Builder; true; setDeleteIntent; ; ; Argument[this]; ReturnValue; value; manual |
+| 161 | Summary: androidx.core.app; NotificationCompat$Builder; true; setExtras; ; ; Argument[0]; Argument[this].SyntheticField[android.content.Intent.extras]; value; manual |
+| 162 | Summary: androidx.core.app; NotificationCompat$Builder; true; setExtras; ; ; Argument[this]; ReturnValue; value; manual |
 | 163 | Summary: androidx.core.app; NotificationCompat$Builder; true; setFullScreenIntent; ; ; Argument[this]; ReturnValue; value; manual |
 | 164 | Summary: androidx.core.app; NotificationCompat$Builder; true; setGroup; ; ; Argument[this]; ReturnValue; value; manual |
 | 165 | Summary: androidx.core.app; NotificationCompat$Builder; true; setGroupAlertBehavior; ; ; Argument[this]; ReturnValue; value; manual |
@@ -173,8 +173,8 @@ models
 | 172 | Summary: androidx.core.app; NotificationCompat$Builder; true; setOnlyAlertOnce; ; ; Argument[this]; ReturnValue; value; manual |
 | 173 | Summary: androidx.core.app; NotificationCompat$Builder; true; setPriority; ; ; Argument[this]; ReturnValue; value; manual |
 | 174 | Summary: androidx.core.app; NotificationCompat$Builder; true; setProgress; ; ; Argument[this]; ReturnValue; value; manual |
-| 175 | Summary: androidx.core.app; NotificationCompat$Builder; true; setPublicVersion; ; ; Argument[this]; ReturnValue; value; manual |
-| 176 | Summary: androidx.core.app; NotificationCompat$Builder; true; setPublicVersion; ; ; Argument[0]; Argument[this]; taint; manual |
+| 175 | Summary: androidx.core.app; NotificationCompat$Builder; true; setPublicVersion; ; ; Argument[0]; Argument[this]; taint; manual |
+| 176 | Summary: androidx.core.app; NotificationCompat$Builder; true; setPublicVersion; ; ; Argument[this]; ReturnValue; value; manual |
 | 177 | Summary: androidx.core.app; NotificationCompat$Builder; true; setRemoteInputHistory; ; ; Argument[this]; ReturnValue; value; manual |
 | 178 | Summary: androidx.core.app; NotificationCompat$Builder; true; setShortcutId; ; ; Argument[this]; ReturnValue; value; manual |
 | 179 | Summary: androidx.core.app; NotificationCompat$Builder; true; setShowWhen; ; ; Argument[this]; ReturnValue; value; manual |
@@ -205,15 +205,15 @@ edges
 | Test.java:49:29:49:58 | (...)... : Action | Test.java:50:42:50:43 | in : Action | provenance |  |
 | Test.java:49:51:49:58 | source(...) : Object | Test.java:49:29:49:58 | (...)... : Action | provenance |  |
 | Test.java:50:10:50:44 | new Builder(...) : Builder | Test.java:51:9:51:11 | out | provenance |  |
-| Test.java:50:42:50:43 | in : Action | Test.java:50:10:50:44 | new Builder(...) : Builder | provenance | MaD:3 |
+| Test.java:50:42:50:43 | in : Action | Test.java:50:10:50:44 | new Builder(...) : Builder | provenance | MaD:2 |
 | Test.java:56:23:56:46 | (...)... : PendingIntent | Test.java:57:76:57:77 | in : PendingIntent | provenance |  |
 | Test.java:56:39:56:46 | source(...) : Object | Test.java:56:23:56:46 | (...)... : PendingIntent | provenance |  |
 | Test.java:57:10:57:78 | new Builder(...) : Builder | Test.java:58:9:58:11 | out | provenance |  |
-| Test.java:57:76:57:77 | in : PendingIntent | Test.java:57:10:57:78 | new Builder(...) : Builder | provenance | MaD:4 |
+| Test.java:57:76:57:77 | in : PendingIntent | Test.java:57:10:57:78 | new Builder(...) : Builder | provenance | MaD:1 |
 | Test.java:63:23:63:46 | (...)... : PendingIntent | Test.java:64:66:64:67 | in : PendingIntent | provenance |  |
 | Test.java:63:39:63:46 | source(...) : Object | Test.java:63:23:63:46 | (...)... : PendingIntent | provenance |  |
 | Test.java:64:10:64:68 | new Builder(...) : Builder | Test.java:65:9:65:11 | out | provenance |  |
-| Test.java:64:66:64:67 | in : PendingIntent | Test.java:64:10:64:68 | new Builder(...) : Builder | provenance | MaD:5 |
+| Test.java:64:66:64:67 | in : PendingIntent | Test.java:64:10:64:68 | new Builder(...) : Builder | provenance | MaD:3 |
 | Test.java:70:37:70:74 | (...)... : Builder | Test.java:71:10:71:11 | in : Builder | provenance |  |
 | Test.java:70:67:70:74 | source(...) : Object | Test.java:70:37:70:74 | (...)... : Builder | provenance |  |
 | Test.java:71:10:71:11 | in : Builder | Test.java:71:10:71:27 | addExtras(...) : Builder | provenance | MaD:6 |
@@ -224,10 +224,10 @@ edges
 | Test.java:79:46:79:53 | source(...) : Object | Test.java:79:25:79:54 | newWithMapKeyDefault(...) : Bundle [<map.key>] : String | provenance | MaD:105 |
 | Test.java:80:4:80:6 | out [post update] : Builder [android.content.Intent.extras, <map.key>] : String | Test.java:81:26:81:28 | out : Builder [android.content.Intent.extras, <map.key>] : String | provenance |  |
 | Test.java:80:4:80:6 | out [post update] : Builder [android.content.Intent.extras, <map.key>] : String | Test.java:81:26:81:28 | out : Builder [android.content.Intent.extras, <map.key>] : String | provenance |  |
-| Test.java:80:18:80:19 | in : Bundle [<map.key>] : String | Test.java:80:4:80:6 | out [post update] : Builder [android.content.Intent.extras, <map.key>] : String | provenance | MaD:7 |
-| Test.java:80:18:80:19 | in : Bundle [<map.key>] : String | Test.java:80:4:80:6 | out [post update] : Builder [android.content.Intent.extras, <map.key>] : String | provenance | MaD:7 |
-| Test.java:81:26:81:28 | out : Builder [android.content.Intent.extras, <map.key>] : String | Test.java:81:26:81:40 | getExtras(...) : Bundle [<map.key>] : String | provenance | MaD:13 |
-| Test.java:81:26:81:28 | out : Builder [android.content.Intent.extras, <map.key>] : String | Test.java:81:26:81:40 | getExtras(...) : Bundle [<map.key>] : String | provenance | MaD:13 |
+| Test.java:80:18:80:19 | in : Bundle [<map.key>] : String | Test.java:80:4:80:6 | out [post update] : Builder [android.content.Intent.extras, <map.key>] : String | provenance | MaD:4 |
+| Test.java:80:18:80:19 | in : Bundle [<map.key>] : String | Test.java:80:4:80:6 | out [post update] : Builder [android.content.Intent.extras, <map.key>] : String | provenance | MaD:4 |
+| Test.java:81:26:81:28 | out : Builder [android.content.Intent.extras, <map.key>] : String | Test.java:81:26:81:40 | getExtras(...) : Bundle [<map.key>] : String | provenance | MaD:11 |
+| Test.java:81:26:81:28 | out : Builder [android.content.Intent.extras, <map.key>] : String | Test.java:81:26:81:40 | getExtras(...) : Bundle [<map.key>] : String | provenance | MaD:11 |
 | Test.java:81:26:81:40 | getExtras(...) : Bundle [<map.key>] : String | Test.java:81:9:81:41 | getMapKeyDefault(...) | provenance | MaD:194 |
 | Test.java:88:16:88:56 | (...)... : Bundle [<map.value>] : String | Test.java:89:18:89:19 | in : Bundle [<map.value>] : String | provenance |  |
 | Test.java:88:25:88:56 | newWithMapValueDefault(...) : Bundle [<map.value>] : String | Test.java:88:16:88:56 | (...)... : Bundle [<map.value>] : String | provenance |  |
@@ -235,19 +235,19 @@ edges
 | Test.java:88:48:88:55 | source(...) : Object | Test.java:88:25:88:56 | newWithMapValueDefault(...) : Bundle [<map.value>] : String | provenance | MaD:106 |
 | Test.java:89:4:89:6 | out [post update] : Builder [android.content.Intent.extras, <map.value>] : String | Test.java:90:28:90:30 | out : Builder [android.content.Intent.extras, <map.value>] : String | provenance |  |
 | Test.java:89:4:89:6 | out [post update] : Builder [android.content.Intent.extras, <map.value>] : String | Test.java:90:28:90:30 | out : Builder [android.content.Intent.extras, <map.value>] : String | provenance |  |
-| Test.java:89:18:89:19 | in : Bundle [<map.value>] : String | Test.java:89:4:89:6 | out [post update] : Builder [android.content.Intent.extras, <map.value>] : String | provenance | MaD:8 |
-| Test.java:89:18:89:19 | in : Bundle [<map.value>] : String | Test.java:89:4:89:6 | out [post update] : Builder [android.content.Intent.extras, <map.value>] : String | provenance | MaD:8 |
-| Test.java:90:28:90:30 | out : Builder [android.content.Intent.extras, <map.value>] : String | Test.java:90:28:90:42 | getExtras(...) : Bundle [<map.value>] : String | provenance | MaD:13 |
-| Test.java:90:28:90:30 | out : Builder [android.content.Intent.extras, <map.value>] : String | Test.java:90:28:90:42 | getExtras(...) : Bundle [<map.value>] : String | provenance | MaD:13 |
+| Test.java:89:18:89:19 | in : Bundle [<map.value>] : String | Test.java:89:4:89:6 | out [post update] : Builder [android.content.Intent.extras, <map.value>] : String | provenance | MaD:5 |
+| Test.java:89:18:89:19 | in : Bundle [<map.value>] : String | Test.java:89:4:89:6 | out [post update] : Builder [android.content.Intent.extras, <map.value>] : String | provenance | MaD:5 |
+| Test.java:90:28:90:30 | out : Builder [android.content.Intent.extras, <map.value>] : String | Test.java:90:28:90:42 | getExtras(...) : Bundle [<map.value>] : String | provenance | MaD:11 |
+| Test.java:90:28:90:30 | out : Builder [android.content.Intent.extras, <map.value>] : String | Test.java:90:28:90:42 | getExtras(...) : Bundle [<map.value>] : String | provenance | MaD:11 |
 | Test.java:90:28:90:42 | getExtras(...) : Bundle [<map.value>] : String | Test.java:22:28:22:43 | container : Bundle [<map.value>] : String | provenance |  |
 | Test.java:90:28:90:42 | getExtras(...) : Bundle [<map.value>] : String | Test.java:90:9:90:43 | getMapValueDefault(...) | provenance | MaD:104 |
 | Test.java:95:37:95:74 | (...)... : Builder | Test.java:96:10:96:11 | in : Builder | provenance |  |
 | Test.java:95:67:95:74 | source(...) : Object | Test.java:95:37:95:74 | (...)... : Builder | provenance |  |
-| Test.java:96:10:96:11 | in : Builder | Test.java:96:10:96:32 | addRemoteInput(...) : Builder | provenance | MaD:9 |
+| Test.java:96:10:96:11 | in : Builder | Test.java:96:10:96:32 | addRemoteInput(...) : Builder | provenance | MaD:7 |
 | Test.java:96:10:96:32 | addRemoteInput(...) : Builder | Test.java:97:9:97:11 | out | provenance |  |
 | Test.java:102:37:102:74 | (...)... : Builder | Test.java:103:10:103:11 | in : Builder | provenance |  |
 | Test.java:102:67:102:74 | source(...) : Object | Test.java:102:37:102:74 | (...)... : Builder | provenance |  |
-| Test.java:103:10:103:11 | in : Builder | Test.java:103:10:103:19 | build(...) : Action | provenance | MaD:10 |
+| Test.java:103:10:103:11 | in : Builder | Test.java:103:10:103:19 | build(...) : Action | provenance | MaD:9 |
 | Test.java:103:10:103:19 | build(...) : Action | Test.java:104:9:104:11 | out | provenance |  |
 | Test.java:112:16:112:56 | (...)... : Bundle [<map.value>] : String | Test.java:113:22:113:23 | in : Bundle [<map.value>] : String | provenance |  |
 | Test.java:112:25:112:56 | newWithMapValueDefault(...) : Bundle [<map.value>] : String | Test.java:112:16:112:56 | (...)... : Bundle [<map.value>] : String | provenance |  |
@@ -255,64 +255,64 @@ edges
 | Test.java:112:48:112:55 | source(...) : Object | Test.java:112:25:112:56 | newWithMapValueDefault(...) : Bundle [<map.value>] : String | provenance | MaD:106 |
 | Test.java:113:4:113:10 | builder [post update] : Builder [android.content.Intent.extras, <map.value>] : String | Test.java:114:10:114:16 | builder : Builder [android.content.Intent.extras, <map.value>] : String | provenance |  |
 | Test.java:113:4:113:10 | builder [post update] : Builder [android.content.Intent.extras, <map.value>] : String | Test.java:114:10:114:16 | builder : Builder [android.content.Intent.extras, <map.value>] : String | provenance |  |
-| Test.java:113:22:113:23 | in : Bundle [<map.value>] : String | Test.java:113:4:113:10 | builder [post update] : Builder [android.content.Intent.extras, <map.value>] : String | provenance | MaD:8 |
-| Test.java:113:22:113:23 | in : Bundle [<map.value>] : String | Test.java:113:4:113:10 | builder [post update] : Builder [android.content.Intent.extras, <map.value>] : String | provenance | MaD:8 |
-| Test.java:114:10:114:16 | builder : Builder [android.content.Intent.extras, <map.value>] : String | Test.java:114:10:114:24 | build(...) : Action [android.content.Intent.extras, <map.value>] : String | provenance | MaD:11 |
-| Test.java:114:10:114:16 | builder : Builder [android.content.Intent.extras, <map.value>] : String | Test.java:114:10:114:24 | build(...) : Action [android.content.Intent.extras, <map.value>] : String | provenance | MaD:11 |
-| Test.java:114:10:114:16 | builder : Builder [android.content.Intent.extras, <map.value>] : String | Test.java:114:10:114:24 | build(...) : Action [android.content.Intent.extras, <map.value>] : String | provenance | MaD:11 |
+| Test.java:113:22:113:23 | in : Bundle [<map.value>] : String | Test.java:113:4:113:10 | builder [post update] : Builder [android.content.Intent.extras, <map.value>] : String | provenance | MaD:5 |
+| Test.java:113:22:113:23 | in : Bundle [<map.value>] : String | Test.java:113:4:113:10 | builder [post update] : Builder [android.content.Intent.extras, <map.value>] : String | provenance | MaD:5 |
+| Test.java:114:10:114:16 | builder : Builder [android.content.Intent.extras, <map.value>] : String | Test.java:114:10:114:24 | build(...) : Action [android.content.Intent.extras, <map.value>] : String | provenance | MaD:8 |
+| Test.java:114:10:114:16 | builder : Builder [android.content.Intent.extras, <map.value>] : String | Test.java:114:10:114:24 | build(...) : Action [android.content.Intent.extras, <map.value>] : String | provenance | MaD:8 |
+| Test.java:114:10:114:16 | builder : Builder [android.content.Intent.extras, <map.value>] : String | Test.java:114:10:114:24 | build(...) : Action [android.content.Intent.extras, <map.value>] : String | provenance | MaD:8 |
 | Test.java:114:10:114:24 | build(...) : Action [android.content.Intent.extras, <map.value>] : String | Test.java:115:28:115:30 | out : Action [android.content.Intent.extras, <map.value>] : String | provenance |  |
 | Test.java:114:10:114:24 | build(...) : Action [android.content.Intent.extras, <map.value>] : String | Test.java:115:28:115:30 | out : Action [android.content.Intent.extras, <map.value>] : String | provenance |  |
-| Test.java:115:28:115:30 | out : Action [android.content.Intent.extras, <map.value>] : String | Test.java:115:28:115:42 | getExtras(...) : Bundle [<map.value>] : String | provenance | MaD:2 |
-| Test.java:115:28:115:30 | out : Action [android.content.Intent.extras, <map.value>] : String | Test.java:115:28:115:42 | getExtras(...) : Bundle [<map.value>] : String | provenance | MaD:2 |
+| Test.java:115:28:115:30 | out : Action [android.content.Intent.extras, <map.value>] : String | Test.java:115:28:115:42 | getExtras(...) : Bundle [<map.value>] : String | provenance | MaD:17 |
+| Test.java:115:28:115:30 | out : Action [android.content.Intent.extras, <map.value>] : String | Test.java:115:28:115:42 | getExtras(...) : Bundle [<map.value>] : String | provenance | MaD:17 |
 | Test.java:115:28:115:42 | getExtras(...) : Bundle [<map.value>] : String | Test.java:22:28:22:43 | container : Bundle [<map.value>] : String | provenance |  |
 | Test.java:115:28:115:42 | getExtras(...) : Bundle [<map.value>] : String | Test.java:115:9:115:43 | getMapValueDefault(...) | provenance | MaD:104 |
 | Test.java:120:37:120:74 | (...)... : Builder | Test.java:121:10:121:11 | in : Builder | provenance |  |
 | Test.java:120:67:120:74 | source(...) : Object | Test.java:120:37:120:74 | (...)... : Builder | provenance |  |
-| Test.java:121:10:121:11 | in : Builder | Test.java:121:10:121:24 | extend(...) : Builder | provenance | MaD:12 |
+| Test.java:121:10:121:11 | in : Builder | Test.java:121:10:121:24 | extend(...) : Builder | provenance | MaD:10 |
 | Test.java:121:10:121:24 | extend(...) : Builder | Test.java:122:9:122:11 | out | provenance |  |
 | Test.java:128:37:128:74 | (...)... : Builder | Test.java:129:10:129:11 | in : Builder | provenance |  |
 | Test.java:128:67:128:74 | source(...) : Object | Test.java:128:37:128:74 | (...)... : Builder | provenance |  |
-| Test.java:129:10:129:11 | in : Builder | Test.java:129:10:129:23 | getExtras(...) : Bundle | provenance | MaD:13 |
+| Test.java:129:10:129:11 | in : Builder | Test.java:129:10:129:23 | getExtras(...) : Bundle | provenance | MaD:11 |
 | Test.java:129:10:129:23 | getExtras(...) : Bundle | Test.java:130:9:130:11 | out | provenance |  |
 | Test.java:135:37:135:74 | (...)... : Builder | Test.java:136:10:136:11 | in : Builder | provenance |  |
 | Test.java:135:67:135:74 | source(...) : Object | Test.java:135:37:135:74 | (...)... : Builder | provenance |  |
-| Test.java:136:10:136:11 | in : Builder | Test.java:136:10:136:43 | setAllowGeneratedReplies(...) : Builder | provenance | MaD:14 |
+| Test.java:136:10:136:11 | in : Builder | Test.java:136:10:136:43 | setAllowGeneratedReplies(...) : Builder | provenance | MaD:12 |
 | Test.java:136:10:136:43 | setAllowGeneratedReplies(...) : Builder | Test.java:137:9:137:11 | out | provenance |  |
 | Test.java:142:37:142:74 | (...)... : Builder | Test.java:143:10:143:11 | in : Builder | provenance |  |
 | Test.java:142:67:142:74 | source(...) : Object | Test.java:142:37:142:74 | (...)... : Builder | provenance |  |
-| Test.java:143:10:143:11 | in : Builder | Test.java:143:10:143:44 | setAuthenticationRequired(...) : Builder | provenance | MaD:15 |
+| Test.java:143:10:143:11 | in : Builder | Test.java:143:10:143:44 | setAuthenticationRequired(...) : Builder | provenance | MaD:13 |
 | Test.java:143:10:143:44 | setAuthenticationRequired(...) : Builder | Test.java:144:9:144:11 | out | provenance |  |
 | Test.java:149:37:149:74 | (...)... : Builder | Test.java:150:10:150:11 | in : Builder | provenance |  |
 | Test.java:149:67:149:74 | source(...) : Object | Test.java:149:37:149:74 | (...)... : Builder | provenance |  |
-| Test.java:150:10:150:11 | in : Builder | Test.java:150:10:150:32 | setContextual(...) : Builder | provenance | MaD:16 |
+| Test.java:150:10:150:11 | in : Builder | Test.java:150:10:150:32 | setContextual(...) : Builder | provenance | MaD:14 |
 | Test.java:150:10:150:32 | setContextual(...) : Builder | Test.java:151:9:151:11 | out | provenance |  |
 | Test.java:156:37:156:74 | (...)... : Builder | Test.java:157:10:157:11 | in : Builder | provenance |  |
 | Test.java:156:67:156:74 | source(...) : Object | Test.java:156:37:156:74 | (...)... : Builder | provenance |  |
-| Test.java:157:10:157:11 | in : Builder | Test.java:157:10:157:32 | setSemanticAction(...) : Builder | provenance | MaD:17 |
+| Test.java:157:10:157:11 | in : Builder | Test.java:157:10:157:32 | setSemanticAction(...) : Builder | provenance | MaD:15 |
 | Test.java:157:10:157:32 | setSemanticAction(...) : Builder | Test.java:158:9:158:11 | out | provenance |  |
 | Test.java:163:23:163:46 | (...)... : PendingIntent | Test.java:164:43:164:44 | in : PendingIntent | provenance |  |
 | Test.java:163:39:163:46 | source(...) : Object | Test.java:163:23:163:46 | (...)... : PendingIntent | provenance |  |
 | Test.java:164:10:164:45 | new Action(...) : Action | Test.java:165:9:165:11 | out | provenance |  |
-| Test.java:164:43:164:44 | in : PendingIntent | Test.java:164:10:164:45 | new Action(...) : Action | provenance | MaD:1 |
+| Test.java:164:43:164:44 | in : PendingIntent | Test.java:164:10:164:45 | new Action(...) : Action | provenance | MaD:16 |
 | Test.java:170:29:170:58 | (...)... : Action | Test.java:171:18:171:19 | in : Action | provenance |  |
 | Test.java:170:51:170:58 | source(...) : Object | Test.java:170:29:170:58 | (...)... : Action | provenance |  |
 | Test.java:171:4:171:6 | out [post update] : Builder | Test.java:172:9:172:11 | out | provenance |  |
-| Test.java:171:18:171:19 | in : Action | Test.java:171:4:171:6 | out [post update] : Builder | provenance | MaD:30 |
+| Test.java:171:18:171:19 | in : Action | Test.java:171:4:171:6 | out [post update] : Builder | provenance | MaD:29 |
 | Test.java:177:23:177:46 | (...)... : PendingIntent | Test.java:178:27:178:28 | in : PendingIntent | provenance |  |
 | Test.java:177:39:177:46 | source(...) : Object | Test.java:177:23:177:46 | (...)... : PendingIntent | provenance |  |
 | Test.java:178:4:178:6 | out [post update] : Builder | Test.java:179:9:179:11 | out | provenance |  |
-| Test.java:178:27:178:28 | in : PendingIntent | Test.java:178:4:178:6 | out [post update] : Builder | provenance | MaD:31 |
+| Test.java:178:27:178:28 | in : PendingIntent | Test.java:178:4:178:6 | out [post update] : Builder | provenance | MaD:30 |
 | Test.java:184:30:184:60 | (...)... : Builder | Test.java:185:10:185:11 | in : Builder | provenance |  |
 | Test.java:184:53:184:60 | source(...) : Object | Test.java:184:30:184:60 | (...)... : Builder | provenance |  |
-| Test.java:185:10:185:11 | in : Builder | Test.java:185:10:185:27 | addAction(...) : Builder | provenance | MaD:29 |
+| Test.java:185:10:185:11 | in : Builder | Test.java:185:10:185:27 | addAction(...) : Builder | provenance | MaD:31 |
 | Test.java:185:10:185:27 | addAction(...) : Builder | Test.java:186:9:186:11 | out | provenance |  |
 | Test.java:191:30:191:60 | (...)... : Builder | Test.java:192:10:192:11 | in : Builder | provenance |  |
 | Test.java:191:53:191:60 | source(...) : Object | Test.java:191:30:191:60 | (...)... : Builder | provenance |  |
-| Test.java:192:10:192:11 | in : Builder | Test.java:192:10:192:36 | addAction(...) : Builder | provenance | MaD:29 |
+| Test.java:192:10:192:11 | in : Builder | Test.java:192:10:192:36 | addAction(...) : Builder | provenance | MaD:31 |
 | Test.java:192:10:192:36 | addAction(...) : Builder | Test.java:193:9:193:11 | out | provenance |  |
 | Test.java:198:30:198:60 | (...)... : Builder | Test.java:199:10:199:11 | in : Builder | provenance |  |
 | Test.java:198:53:198:60 | source(...) : Object | Test.java:198:30:198:60 | (...)... : Builder | provenance |  |
-| Test.java:199:10:199:11 | in : Builder | Test.java:199:10:199:27 | addExtras(...) : Builder | provenance | MaD:32 |
+| Test.java:199:10:199:11 | in : Builder | Test.java:199:10:199:27 | addExtras(...) : Builder | provenance | MaD:34 |
 | Test.java:199:10:199:27 | addExtras(...) : Builder | Test.java:200:9:200:11 | out | provenance |  |
 | Test.java:206:16:206:54 | (...)... : Bundle [<map.key>] : String | Test.java:207:18:207:19 | in : Bundle [<map.key>] : String | provenance |  |
 | Test.java:206:25:206:54 | newWithMapKeyDefault(...) : Bundle [<map.key>] : String | Test.java:206:16:206:54 | (...)... : Bundle [<map.key>] : String | provenance |  |
@@ -320,8 +320,8 @@ edges
 | Test.java:206:46:206:53 | source(...) : Object | Test.java:206:25:206:54 | newWithMapKeyDefault(...) : Bundle [<map.key>] : String | provenance | MaD:105 |
 | Test.java:207:4:207:6 | out [post update] : Builder [android.content.Intent.extras, <map.key>] : String | Test.java:208:26:208:28 | out : Builder [android.content.Intent.extras, <map.key>] : String | provenance |  |
 | Test.java:207:4:207:6 | out [post update] : Builder [android.content.Intent.extras, <map.key>] : String | Test.java:208:26:208:28 | out : Builder [android.content.Intent.extras, <map.key>] : String | provenance |  |
-| Test.java:207:18:207:19 | in : Bundle [<map.key>] : String | Test.java:207:4:207:6 | out [post update] : Builder [android.content.Intent.extras, <map.key>] : String | provenance | MaD:33 |
-| Test.java:207:18:207:19 | in : Bundle [<map.key>] : String | Test.java:207:4:207:6 | out [post update] : Builder [android.content.Intent.extras, <map.key>] : String | provenance | MaD:33 |
+| Test.java:207:18:207:19 | in : Bundle [<map.key>] : String | Test.java:207:4:207:6 | out [post update] : Builder [android.content.Intent.extras, <map.key>] : String | provenance | MaD:32 |
+| Test.java:207:18:207:19 | in : Bundle [<map.key>] : String | Test.java:207:4:207:6 | out [post update] : Builder [android.content.Intent.extras, <map.key>] : String | provenance | MaD:32 |
 | Test.java:208:26:208:28 | out : Builder [android.content.Intent.extras, <map.key>] : String | Test.java:208:26:208:40 | getExtras(...) : Bundle [<map.key>] : String | provenance | MaD:39 |
 | Test.java:208:26:208:28 | out : Builder [android.content.Intent.extras, <map.key>] : String | Test.java:208:26:208:40 | getExtras(...) : Bundle [<map.key>] : String | provenance | MaD:39 |
 | Test.java:208:26:208:40 | getExtras(...) : Bundle [<map.key>] : String | Test.java:208:9:208:41 | getMapKeyDefault(...) | provenance | MaD:194 |
@@ -331,8 +331,8 @@ edges
 | Test.java:214:48:214:55 | source(...) : Object | Test.java:214:25:214:56 | newWithMapValueDefault(...) : Bundle [<map.value>] : String | provenance | MaD:106 |
 | Test.java:215:4:215:6 | out [post update] : Builder [android.content.Intent.extras, <map.value>] : String | Test.java:216:28:216:30 | out : Builder [android.content.Intent.extras, <map.value>] : String | provenance |  |
 | Test.java:215:4:215:6 | out [post update] : Builder [android.content.Intent.extras, <map.value>] : String | Test.java:216:28:216:30 | out : Builder [android.content.Intent.extras, <map.value>] : String | provenance |  |
-| Test.java:215:18:215:19 | in : Bundle [<map.value>] : String | Test.java:215:4:215:6 | out [post update] : Builder [android.content.Intent.extras, <map.value>] : String | provenance | MaD:34 |
-| Test.java:215:18:215:19 | in : Bundle [<map.value>] : String | Test.java:215:4:215:6 | out [post update] : Builder [android.content.Intent.extras, <map.value>] : String | provenance | MaD:34 |
+| Test.java:215:18:215:19 | in : Bundle [<map.value>] : String | Test.java:215:4:215:6 | out [post update] : Builder [android.content.Intent.extras, <map.value>] : String | provenance | MaD:33 |
+| Test.java:215:18:215:19 | in : Bundle [<map.value>] : String | Test.java:215:4:215:6 | out [post update] : Builder [android.content.Intent.extras, <map.value>] : String | provenance | MaD:33 |
 | Test.java:216:28:216:30 | out : Builder [android.content.Intent.extras, <map.value>] : String | Test.java:216:28:216:42 | getExtras(...) : Bundle [<map.value>] : String | provenance | MaD:39 |
 | Test.java:216:28:216:30 | out : Builder [android.content.Intent.extras, <map.value>] : String | Test.java:216:28:216:42 | getExtras(...) : Bundle [<map.value>] : String | provenance | MaD:39 |
 | Test.java:216:28:216:42 | getExtras(...) : Bundle [<map.value>] : String | Test.java:22:28:22:43 | container : Bundle [<map.value>] : String | provenance |  |
@@ -347,7 +347,7 @@ edges
 | Test.java:229:10:229:36 | addPerson(...) : Builder | Test.java:230:9:230:11 | out | provenance |  |
 | Test.java:235:30:235:60 | (...)... : Builder | Test.java:236:10:236:11 | in : Builder | provenance |  |
 | Test.java:235:53:235:60 | source(...) : Object | Test.java:235:30:235:60 | (...)... : Builder | provenance |  |
-| Test.java:236:10:236:11 | in : Builder | Test.java:236:10:236:19 | build(...) : Notification | provenance | MaD:36 |
+| Test.java:236:10:236:11 | in : Builder | Test.java:236:10:236:19 | build(...) : Notification | provenance | MaD:37 |
 | Test.java:236:10:236:19 | build(...) : Notification | Test.java:237:9:237:11 | out | provenance |  |
 | Test.java:244:16:244:56 | (...)... : Bundle [<map.value>] : String | Test.java:245:22:245:23 | in : Bundle [<map.value>] : String | provenance |  |
 | Test.java:244:25:244:56 | newWithMapValueDefault(...) : Bundle [<map.value>] : String | Test.java:244:16:244:56 | (...)... : Bundle [<map.value>] : String | provenance |  |
@@ -355,11 +355,11 @@ edges
 | Test.java:244:48:244:55 | source(...) : Object | Test.java:244:25:244:56 | newWithMapValueDefault(...) : Bundle [<map.value>] : String | provenance | MaD:106 |
 | Test.java:245:4:245:10 | builder [post update] : Builder [android.content.Intent.extras, <map.value>] : String | Test.java:246:10:246:16 | builder : Builder [android.content.Intent.extras, <map.value>] : String | provenance |  |
 | Test.java:245:4:245:10 | builder [post update] : Builder [android.content.Intent.extras, <map.value>] : String | Test.java:246:10:246:16 | builder : Builder [android.content.Intent.extras, <map.value>] : String | provenance |  |
-| Test.java:245:22:245:23 | in : Bundle [<map.value>] : String | Test.java:245:4:245:10 | builder [post update] : Builder [android.content.Intent.extras, <map.value>] : String | provenance | MaD:34 |
-| Test.java:245:22:245:23 | in : Bundle [<map.value>] : String | Test.java:245:4:245:10 | builder [post update] : Builder [android.content.Intent.extras, <map.value>] : String | provenance | MaD:34 |
-| Test.java:246:10:246:16 | builder : Builder [android.content.Intent.extras, <map.value>] : String | Test.java:246:10:246:24 | build(...) : Notification [extras, <map.value>] : String | provenance | MaD:37 |
-| Test.java:246:10:246:16 | builder : Builder [android.content.Intent.extras, <map.value>] : String | Test.java:246:10:246:24 | build(...) : Notification [extras, <map.value>] : String | provenance | MaD:37 |
-| Test.java:246:10:246:16 | builder : Builder [android.content.Intent.extras, <map.value>] : String | Test.java:246:10:246:24 | build(...) : Notification [extras, <map.value>] : String | provenance | MaD:37 |
+| Test.java:245:22:245:23 | in : Bundle [<map.value>] : String | Test.java:245:4:245:10 | builder [post update] : Builder [android.content.Intent.extras, <map.value>] : String | provenance | MaD:33 |
+| Test.java:245:22:245:23 | in : Bundle [<map.value>] : String | Test.java:245:4:245:10 | builder [post update] : Builder [android.content.Intent.extras, <map.value>] : String | provenance | MaD:33 |
+| Test.java:246:10:246:16 | builder : Builder [android.content.Intent.extras, <map.value>] : String | Test.java:246:10:246:24 | build(...) : Notification [extras, <map.value>] : String | provenance | MaD:36 |
+| Test.java:246:10:246:16 | builder : Builder [android.content.Intent.extras, <map.value>] : String | Test.java:246:10:246:24 | build(...) : Notification [extras, <map.value>] : String | provenance | MaD:36 |
+| Test.java:246:10:246:16 | builder : Builder [android.content.Intent.extras, <map.value>] : String | Test.java:246:10:246:24 | build(...) : Notification [extras, <map.value>] : String | provenance | MaD:36 |
 | Test.java:246:10:246:24 | build(...) : Notification [extras, <map.value>] : String | Test.java:247:28:247:30 | out : Notification [extras, <map.value>] : String | provenance |  |
 | Test.java:246:10:246:24 | build(...) : Notification [extras, <map.value>] : String | Test.java:247:28:247:30 | out : Notification [extras, <map.value>] : String | provenance |  |
 | Test.java:247:28:247:30 | out : Notification [extras, <map.value>] : String | Test.java:247:28:247:37 | out.extras : Bundle [<map.value>] : String | provenance |  |
@@ -380,14 +380,14 @@ edges
 | Test.java:268:52:268:53 | in : Notification | Test.java:268:10:268:54 | recoverBuilder(...) : Builder | provenance | MaD:40 |
 | Test.java:274:30:274:60 | (...)... : Builder | Test.java:275:10:275:11 | in : Builder | provenance |  |
 | Test.java:274:53:274:60 | source(...) : Object | Test.java:274:30:274:60 | (...)... : Builder | provenance |  |
-| Test.java:275:10:275:11 | in : Builder | Test.java:275:10:275:52 | setActions(...) : Builder | provenance | MaD:41 |
+| Test.java:275:10:275:11 | in : Builder | Test.java:275:10:275:52 | setActions(...) : Builder | provenance | MaD:42 |
 | Test.java:275:10:275:52 | setActions(...) : Builder | Test.java:276:9:276:11 | out | provenance |  |
 | Test.java:282:31:283:36 | (...)... : Action[] [[]] : Action | Test.java:284:19:284:20 | in : Action[] [[]] : Action | provenance |  |
 | Test.java:282:55:283:36 | {...} : Action[] [[]] : Action | Test.java:282:31:283:36 | (...)... : Action[] [[]] : Action | provenance |  |
 | Test.java:283:6:283:35 | (...)... : Action | Test.java:282:55:283:36 | {...} : Action[] [[]] : Action | provenance |  |
 | Test.java:283:28:283:35 | source(...) : Object | Test.java:283:6:283:35 | (...)... : Action | provenance |  |
 | Test.java:284:4:284:6 | out [post update] : Builder | Test.java:285:9:285:11 | out | provenance |  |
-| Test.java:284:19:284:20 | in : Action[] [[]] : Action | Test.java:284:4:284:6 | out [post update] : Builder | provenance | MaD:42 |
+| Test.java:284:19:284:20 | in : Action[] [[]] : Action | Test.java:284:4:284:6 | out [post update] : Builder | provenance | MaD:41 |
 | Test.java:290:30:290:60 | (...)... : Builder | Test.java:291:10:291:11 | in : Builder | provenance |  |
 | Test.java:290:53:290:60 | source(...) : Object | Test.java:290:30:290:60 | (...)... : Builder | provenance |  |
 | Test.java:291:10:291:11 | in : Builder | Test.java:291:10:291:32 | setAutoCancel(...) : Builder | provenance | MaD:43 |
@@ -430,12 +430,12 @@ edges
 | Test.java:354:10:354:32 | setContentInfo(...) : Builder | Test.java:355:9:355:11 | out | provenance |  |
 | Test.java:360:30:360:60 | (...)... : Builder | Test.java:361:10:361:11 | in : Builder | provenance |  |
 | Test.java:360:53:360:60 | source(...) : Object | Test.java:360:30:360:60 | (...)... : Builder | provenance |  |
-| Test.java:361:10:361:11 | in : Builder | Test.java:361:10:361:34 | setContentIntent(...) : Builder | provenance | MaD:53 |
+| Test.java:361:10:361:11 | in : Builder | Test.java:361:10:361:34 | setContentIntent(...) : Builder | provenance | MaD:54 |
 | Test.java:361:10:361:34 | setContentIntent(...) : Builder | Test.java:362:9:362:11 | out | provenance |  |
 | Test.java:367:23:367:46 | (...)... : PendingIntent | Test.java:368:25:368:26 | in : PendingIntent | provenance |  |
 | Test.java:367:39:367:46 | source(...) : Object | Test.java:367:23:367:46 | (...)... : PendingIntent | provenance |  |
 | Test.java:368:4:368:6 | out [post update] : Builder | Test.java:369:9:369:11 | out | provenance |  |
-| Test.java:368:25:368:26 | in : PendingIntent | Test.java:368:4:368:6 | out [post update] : Builder | provenance | MaD:54 |
+| Test.java:368:25:368:26 | in : PendingIntent | Test.java:368:4:368:6 | out [post update] : Builder | provenance | MaD:53 |
 | Test.java:374:30:374:60 | (...)... : Builder | Test.java:375:10:375:11 | in : Builder | provenance |  |
 | Test.java:374:53:374:60 | source(...) : Object | Test.java:374:30:374:60 | (...)... : Builder | provenance |  |
 | Test.java:375:10:375:11 | in : Builder | Test.java:375:10:375:32 | setContentText(...) : Builder | provenance | MaD:55 |
@@ -458,20 +458,20 @@ edges
 | Test.java:403:10:403:26 | setDefaults(...) : Builder | Test.java:404:9:404:11 | out | provenance |  |
 | Test.java:409:30:409:60 | (...)... : Builder | Test.java:410:10:410:11 | in : Builder | provenance |  |
 | Test.java:409:53:409:60 | source(...) : Object | Test.java:409:30:409:60 | (...)... : Builder | provenance |  |
-| Test.java:410:10:410:11 | in : Builder | Test.java:410:10:410:33 | setDeleteIntent(...) : Builder | provenance | MaD:60 |
+| Test.java:410:10:410:11 | in : Builder | Test.java:410:10:410:33 | setDeleteIntent(...) : Builder | provenance | MaD:61 |
 | Test.java:410:10:410:33 | setDeleteIntent(...) : Builder | Test.java:411:9:411:11 | out | provenance |  |
 | Test.java:416:23:416:46 | (...)... : PendingIntent | Test.java:417:24:417:25 | in : PendingIntent | provenance |  |
 | Test.java:416:39:416:46 | source(...) : Object | Test.java:416:23:416:46 | (...)... : PendingIntent | provenance |  |
 | Test.java:417:4:417:6 | out [post update] : Builder | Test.java:418:9:418:11 | out | provenance |  |
-| Test.java:417:24:417:25 | in : PendingIntent | Test.java:417:4:417:6 | out [post update] : Builder | provenance | MaD:61 |
+| Test.java:417:24:417:25 | in : PendingIntent | Test.java:417:4:417:6 | out [post update] : Builder | provenance | MaD:60 |
 | Test.java:423:30:423:60 | (...)... : Builder | Test.java:424:10:424:11 | in : Builder | provenance |  |
 | Test.java:423:53:423:60 | source(...) : Object | Test.java:423:30:423:60 | (...)... : Builder | provenance |  |
-| Test.java:424:10:424:11 | in : Builder | Test.java:424:10:424:27 | setExtras(...) : Builder | provenance | MaD:62 |
+| Test.java:424:10:424:11 | in : Builder | Test.java:424:10:424:27 | setExtras(...) : Builder | provenance | MaD:63 |
 | Test.java:424:10:424:27 | setExtras(...) : Builder | Test.java:425:9:425:11 | out | provenance |  |
 | Test.java:431:16:431:32 | (...)... : Bundle | Test.java:432:18:432:19 | in : Bundle | provenance |  |
 | Test.java:431:25:431:32 | source(...) : Object | Test.java:431:16:431:32 | (...)... : Bundle | provenance |  |
 | Test.java:432:4:432:6 | out [post update] : Builder [android.content.Intent.extras] : Bundle | Test.java:433:9:433:11 | out : Builder [android.content.Intent.extras] : Bundle | provenance |  |
-| Test.java:432:18:432:19 | in : Bundle | Test.java:432:4:432:6 | out [post update] : Builder [android.content.Intent.extras] : Bundle | provenance | MaD:63 |
+| Test.java:432:18:432:19 | in : Bundle | Test.java:432:4:432:6 | out [post update] : Builder [android.content.Intent.extras] : Bundle | provenance | MaD:62 |
 | Test.java:433:9:433:11 | out : Builder [android.content.Intent.extras] : Bundle | Test.java:433:9:433:23 | getExtras(...) | provenance | MaD:39 |
 | Test.java:438:30:438:60 | (...)... : Builder | Test.java:439:10:439:11 | in : Builder | provenance |  |
 | Test.java:438:53:438:60 | source(...) : Object | Test.java:438:30:438:60 | (...)... : Builder | provenance |  |
@@ -539,12 +539,12 @@ edges
 | Test.java:544:10:544:36 | setProgress(...) : Builder | Test.java:545:9:545:11 | out | provenance |  |
 | Test.java:550:30:550:60 | (...)... : Builder | Test.java:551:10:551:11 | in : Builder | provenance |  |
 | Test.java:550:53:550:60 | source(...) : Object | Test.java:550:30:550:60 | (...)... : Builder | provenance |  |
-| Test.java:551:10:551:11 | in : Builder | Test.java:551:10:551:34 | setPublicVersion(...) : Builder | provenance | MaD:79 |
+| Test.java:551:10:551:11 | in : Builder | Test.java:551:10:551:34 | setPublicVersion(...) : Builder | provenance | MaD:80 |
 | Test.java:551:10:551:34 | setPublicVersion(...) : Builder | Test.java:552:9:552:11 | out | provenance |  |
 | Test.java:557:22:557:44 | (...)... : Notification | Test.java:558:25:558:26 | in : Notification | provenance |  |
 | Test.java:557:37:557:44 | source(...) : Object | Test.java:557:22:557:44 | (...)... : Notification | provenance |  |
 | Test.java:558:4:558:6 | out [post update] : Builder | Test.java:559:9:559:11 | out | provenance |  |
-| Test.java:558:25:558:26 | in : Notification | Test.java:558:4:558:6 | out [post update] : Builder | provenance | MaD:80 |
+| Test.java:558:25:558:26 | in : Notification | Test.java:558:4:558:6 | out [post update] : Builder | provenance | MaD:79 |
 | Test.java:564:30:564:60 | (...)... : Builder | Test.java:565:10:565:11 | in : Builder | provenance |  |
 | Test.java:564:53:564:60 | source(...) : Object | Test.java:564:30:564:60 | (...)... : Builder | provenance |  |
 | Test.java:565:10:565:11 | in : Builder | Test.java:565:10:565:39 | setRemoteInputHistory(...) : Builder | provenance | MaD:81 |
@@ -704,18 +704,18 @@ edges
 | Test.java:823:35:823:70 | (...)... : Action | Test.java:824:48:824:49 | in : Action | provenance |  |
 | Test.java:823:63:823:70 | source(...) : Object | Test.java:823:35:823:70 | (...)... : Action | provenance |  |
 | Test.java:824:10:824:50 | new Builder(...) : Builder | Test.java:825:9:825:11 | out | provenance |  |
-| Test.java:824:48:824:49 | in : Action | Test.java:824:10:824:50 | new Builder(...) : Builder | provenance | MaD:110 |
+| Test.java:824:48:824:49 | in : Action | Test.java:824:10:824:50 | new Builder(...) : Builder | provenance | MaD:108 |
 | Test.java:830:23:830:46 | (...)... : PendingIntent | Test.java:831:88:831:89 | in : PendingIntent | provenance |  |
 | Test.java:830:39:830:46 | source(...) : Object | Test.java:830:23:830:46 | (...)... : PendingIntent | provenance |  |
 | Test.java:831:10:831:90 | new Builder(...) : Builder | Test.java:832:9:832:11 | out | provenance |  |
-| Test.java:831:88:831:89 | in : PendingIntent | Test.java:831:10:831:90 | new Builder(...) : Builder | provenance | MaD:111 |
+| Test.java:831:88:831:89 | in : PendingIntent | Test.java:831:10:831:90 | new Builder(...) : Builder | provenance | MaD:107 |
 | Test.java:837:23:837:46 | (...)... : PendingIntent | Test.java:838:72:838:73 | in : PendingIntent | provenance |  |
 | Test.java:837:39:837:46 | source(...) : Object | Test.java:837:23:837:46 | (...)... : PendingIntent | provenance |  |
 | Test.java:838:10:838:74 | new Builder(...) : Builder | Test.java:839:9:839:11 | out | provenance |  |
-| Test.java:838:72:838:73 | in : PendingIntent | Test.java:838:10:838:74 | new Builder(...) : Builder | provenance | MaD:112 |
+| Test.java:838:72:838:73 | in : PendingIntent | Test.java:838:10:838:74 | new Builder(...) : Builder | provenance | MaD:109 |
 | Test.java:844:43:844:86 | (...)... : Builder | Test.java:845:10:845:11 | in : Builder | provenance |  |
 | Test.java:844:79:844:86 | source(...) : Object | Test.java:844:43:844:86 | (...)... : Builder | provenance |  |
-| Test.java:845:10:845:11 | in : Builder | Test.java:845:10:845:27 | addExtras(...) : Builder | provenance | MaD:113 |
+| Test.java:845:10:845:11 | in : Builder | Test.java:845:10:845:27 | addExtras(...) : Builder | provenance | MaD:112 |
 | Test.java:845:10:845:27 | addExtras(...) : Builder | Test.java:846:9:846:11 | out | provenance |  |
 | Test.java:851:16:851:54 | (...)... : Bundle [<map.key>] : String | Test.java:852:18:852:19 | in : Bundle [<map.key>] : String | provenance |  |
 | Test.java:851:25:851:54 | newWithMapKeyDefault(...) : Bundle [<map.key>] : String | Test.java:851:16:851:54 | (...)... : Bundle [<map.key>] : String | provenance |  |
@@ -723,10 +723,10 @@ edges
 | Test.java:851:46:851:53 | source(...) : Object | Test.java:851:25:851:54 | newWithMapKeyDefault(...) : Bundle [<map.key>] : String | provenance | MaD:105 |
 | Test.java:852:4:852:6 | out [post update] : Builder [android.content.Intent.extras, <map.key>] : String | Test.java:853:26:853:28 | out : Builder [android.content.Intent.extras, <map.key>] : String | provenance |  |
 | Test.java:852:4:852:6 | out [post update] : Builder [android.content.Intent.extras, <map.key>] : String | Test.java:853:26:853:28 | out : Builder [android.content.Intent.extras, <map.key>] : String | provenance |  |
-| Test.java:852:18:852:19 | in : Bundle [<map.key>] : String | Test.java:852:4:852:6 | out [post update] : Builder [android.content.Intent.extras, <map.key>] : String | provenance | MaD:114 |
-| Test.java:852:18:852:19 | in : Bundle [<map.key>] : String | Test.java:852:4:852:6 | out [post update] : Builder [android.content.Intent.extras, <map.key>] : String | provenance | MaD:114 |
-| Test.java:853:26:853:28 | out : Builder [android.content.Intent.extras, <map.key>] : String | Test.java:853:26:853:40 | getExtras(...) : Bundle [<map.key>] : String | provenance | MaD:120 |
-| Test.java:853:26:853:28 | out : Builder [android.content.Intent.extras, <map.key>] : String | Test.java:853:26:853:40 | getExtras(...) : Bundle [<map.key>] : String | provenance | MaD:120 |
+| Test.java:852:18:852:19 | in : Bundle [<map.key>] : String | Test.java:852:4:852:6 | out [post update] : Builder [android.content.Intent.extras, <map.key>] : String | provenance | MaD:110 |
+| Test.java:852:18:852:19 | in : Bundle [<map.key>] : String | Test.java:852:4:852:6 | out [post update] : Builder [android.content.Intent.extras, <map.key>] : String | provenance | MaD:110 |
+| Test.java:853:26:853:28 | out : Builder [android.content.Intent.extras, <map.key>] : String | Test.java:853:26:853:40 | getExtras(...) : Bundle [<map.key>] : String | provenance | MaD:117 |
+| Test.java:853:26:853:28 | out : Builder [android.content.Intent.extras, <map.key>] : String | Test.java:853:26:853:40 | getExtras(...) : Bundle [<map.key>] : String | provenance | MaD:117 |
 | Test.java:853:26:853:40 | getExtras(...) : Bundle [<map.key>] : String | Test.java:853:9:853:41 | getMapKeyDefault(...) | provenance | MaD:194 |
 | Test.java:858:16:858:56 | (...)... : Bundle [<map.value>] : String | Test.java:859:18:859:19 | in : Bundle [<map.value>] : String | provenance |  |
 | Test.java:858:25:858:56 | newWithMapValueDefault(...) : Bundle [<map.value>] : String | Test.java:858:16:858:56 | (...)... : Bundle [<map.value>] : String | provenance |  |
@@ -734,15 +734,15 @@ edges
 | Test.java:858:48:858:55 | source(...) : Object | Test.java:858:25:858:56 | newWithMapValueDefault(...) : Bundle [<map.value>] : String | provenance | MaD:106 |
 | Test.java:859:4:859:6 | out [post update] : Builder [android.content.Intent.extras, <map.value>] : String | Test.java:860:28:860:30 | out : Builder [android.content.Intent.extras, <map.value>] : String | provenance |  |
 | Test.java:859:4:859:6 | out [post update] : Builder [android.content.Intent.extras, <map.value>] : String | Test.java:860:28:860:30 | out : Builder [android.content.Intent.extras, <map.value>] : String | provenance |  |
-| Test.java:859:18:859:19 | in : Bundle [<map.value>] : String | Test.java:859:4:859:6 | out [post update] : Builder [android.content.Intent.extras, <map.value>] : String | provenance | MaD:115 |
-| Test.java:859:18:859:19 | in : Bundle [<map.value>] : String | Test.java:859:4:859:6 | out [post update] : Builder [android.content.Intent.extras, <map.value>] : String | provenance | MaD:115 |
-| Test.java:860:28:860:30 | out : Builder [android.content.Intent.extras, <map.value>] : String | Test.java:860:28:860:42 | getExtras(...) : Bundle [<map.value>] : String | provenance | MaD:120 |
-| Test.java:860:28:860:30 | out : Builder [android.content.Intent.extras, <map.value>] : String | Test.java:860:28:860:42 | getExtras(...) : Bundle [<map.value>] : String | provenance | MaD:120 |
+| Test.java:859:18:859:19 | in : Bundle [<map.value>] : String | Test.java:859:4:859:6 | out [post update] : Builder [android.content.Intent.extras, <map.value>] : String | provenance | MaD:111 |
+| Test.java:859:18:859:19 | in : Bundle [<map.value>] : String | Test.java:859:4:859:6 | out [post update] : Builder [android.content.Intent.extras, <map.value>] : String | provenance | MaD:111 |
+| Test.java:860:28:860:30 | out : Builder [android.content.Intent.extras, <map.value>] : String | Test.java:860:28:860:42 | getExtras(...) : Bundle [<map.value>] : String | provenance | MaD:117 |
+| Test.java:860:28:860:30 | out : Builder [android.content.Intent.extras, <map.value>] : String | Test.java:860:28:860:42 | getExtras(...) : Bundle [<map.value>] : String | provenance | MaD:117 |
 | Test.java:860:28:860:42 | getExtras(...) : Bundle [<map.value>] : String | Test.java:22:28:22:43 | container : Bundle [<map.value>] : String | provenance |  |
 | Test.java:860:28:860:42 | getExtras(...) : Bundle [<map.value>] : String | Test.java:860:9:860:43 | getMapValueDefault(...) | provenance | MaD:104 |
 | Test.java:865:43:865:86 | (...)... : Builder | Test.java:866:10:866:11 | in : Builder | provenance |  |
 | Test.java:865:79:865:86 | source(...) : Object | Test.java:865:43:865:86 | (...)... : Builder | provenance |  |
-| Test.java:866:10:866:11 | in : Builder | Test.java:866:10:866:32 | addRemoteInput(...) : Builder | provenance | MaD:116 |
+| Test.java:866:10:866:11 | in : Builder | Test.java:866:10:866:32 | addRemoteInput(...) : Builder | provenance | MaD:113 |
 | Test.java:866:10:866:32 | addRemoteInput(...) : Builder | Test.java:867:9:867:11 | out | provenance |  |
 | Test.java:873:16:873:56 | (...)... : Bundle [<map.value>] : String | Test.java:874:22:874:23 | in : Bundle [<map.value>] : String | provenance |  |
 | Test.java:873:25:873:56 | newWithMapValueDefault(...) : Bundle [<map.value>] : String | Test.java:873:16:873:56 | (...)... : Bundle [<map.value>] : String | provenance |  |
@@ -750,52 +750,52 @@ edges
 | Test.java:873:48:873:55 | source(...) : Object | Test.java:873:25:873:56 | newWithMapValueDefault(...) : Bundle [<map.value>] : String | provenance | MaD:106 |
 | Test.java:874:4:874:10 | builder [post update] : Builder [android.content.Intent.extras, <map.value>] : String | Test.java:875:10:875:16 | builder : Builder [android.content.Intent.extras, <map.value>] : String | provenance |  |
 | Test.java:874:4:874:10 | builder [post update] : Builder [android.content.Intent.extras, <map.value>] : String | Test.java:875:10:875:16 | builder : Builder [android.content.Intent.extras, <map.value>] : String | provenance |  |
-| Test.java:874:22:874:23 | in : Bundle [<map.value>] : String | Test.java:874:4:874:10 | builder [post update] : Builder [android.content.Intent.extras, <map.value>] : String | provenance | MaD:115 |
-| Test.java:874:22:874:23 | in : Bundle [<map.value>] : String | Test.java:874:4:874:10 | builder [post update] : Builder [android.content.Intent.extras, <map.value>] : String | provenance | MaD:115 |
-| Test.java:875:10:875:16 | builder : Builder [android.content.Intent.extras, <map.value>] : String | Test.java:875:10:875:24 | build(...) : Action [android.content.Intent.extras, <map.value>] : String | provenance | MaD:118 |
-| Test.java:875:10:875:16 | builder : Builder [android.content.Intent.extras, <map.value>] : String | Test.java:875:10:875:24 | build(...) : Action [android.content.Intent.extras, <map.value>] : String | provenance | MaD:118 |
-| Test.java:875:10:875:16 | builder : Builder [android.content.Intent.extras, <map.value>] : String | Test.java:875:10:875:24 | build(...) : Action [android.content.Intent.extras, <map.value>] : String | provenance | MaD:118 |
+| Test.java:874:22:874:23 | in : Bundle [<map.value>] : String | Test.java:874:4:874:10 | builder [post update] : Builder [android.content.Intent.extras, <map.value>] : String | provenance | MaD:111 |
+| Test.java:874:22:874:23 | in : Bundle [<map.value>] : String | Test.java:874:4:874:10 | builder [post update] : Builder [android.content.Intent.extras, <map.value>] : String | provenance | MaD:111 |
+| Test.java:875:10:875:16 | builder : Builder [android.content.Intent.extras, <map.value>] : String | Test.java:875:10:875:24 | build(...) : Action [android.content.Intent.extras, <map.value>] : String | provenance | MaD:114 |
+| Test.java:875:10:875:16 | builder : Builder [android.content.Intent.extras, <map.value>] : String | Test.java:875:10:875:24 | build(...) : Action [android.content.Intent.extras, <map.value>] : String | provenance | MaD:114 |
+| Test.java:875:10:875:16 | builder : Builder [android.content.Intent.extras, <map.value>] : String | Test.java:875:10:875:24 | build(...) : Action [android.content.Intent.extras, <map.value>] : String | provenance | MaD:114 |
 | Test.java:875:10:875:24 | build(...) : Action [android.content.Intent.extras, <map.value>] : String | Test.java:876:28:876:30 | out : Action [android.content.Intent.extras, <map.value>] : String | provenance |  |
 | Test.java:875:10:875:24 | build(...) : Action [android.content.Intent.extras, <map.value>] : String | Test.java:876:28:876:30 | out : Action [android.content.Intent.extras, <map.value>] : String | provenance |  |
-| Test.java:876:28:876:30 | out : Action [android.content.Intent.extras, <map.value>] : String | Test.java:876:28:876:42 | getExtras(...) : Bundle [<map.value>] : String | provenance | MaD:109 |
-| Test.java:876:28:876:30 | out : Action [android.content.Intent.extras, <map.value>] : String | Test.java:876:28:876:42 | getExtras(...) : Bundle [<map.value>] : String | provenance | MaD:109 |
+| Test.java:876:28:876:30 | out : Action [android.content.Intent.extras, <map.value>] : String | Test.java:876:28:876:42 | getExtras(...) : Bundle [<map.value>] : String | provenance | MaD:123 |
+| Test.java:876:28:876:30 | out : Action [android.content.Intent.extras, <map.value>] : String | Test.java:876:28:876:42 | getExtras(...) : Bundle [<map.value>] : String | provenance | MaD:123 |
 | Test.java:876:28:876:42 | getExtras(...) : Bundle [<map.value>] : String | Test.java:22:28:22:43 | container : Bundle [<map.value>] : String | provenance |  |
 | Test.java:876:28:876:42 | getExtras(...) : Bundle [<map.value>] : String | Test.java:876:9:876:43 | getMapValueDefault(...) | provenance | MaD:104 |
 | Test.java:881:43:881:86 | (...)... : Builder | Test.java:882:10:882:11 | in : Builder | provenance |  |
 | Test.java:881:79:881:86 | source(...) : Object | Test.java:881:43:881:86 | (...)... : Builder | provenance |  |
-| Test.java:882:10:882:11 | in : Builder | Test.java:882:10:882:19 | build(...) : Action | provenance | MaD:117 |
+| Test.java:882:10:882:11 | in : Builder | Test.java:882:10:882:19 | build(...) : Action | provenance | MaD:115 |
 | Test.java:882:10:882:19 | build(...) : Action | Test.java:883:9:883:11 | out | provenance |  |
 | Test.java:888:43:888:86 | (...)... : Builder | Test.java:889:10:889:11 | in : Builder | provenance |  |
 | Test.java:888:79:888:86 | source(...) : Object | Test.java:888:43:888:86 | (...)... : Builder | provenance |  |
-| Test.java:889:10:889:11 | in : Builder | Test.java:889:10:889:24 | extend(...) : Builder | provenance | MaD:119 |
+| Test.java:889:10:889:11 | in : Builder | Test.java:889:10:889:24 | extend(...) : Builder | provenance | MaD:116 |
 | Test.java:889:10:889:24 | extend(...) : Builder | Test.java:890:9:890:11 | out | provenance |  |
 | Test.java:895:43:895:86 | (...)... : Builder | Test.java:896:10:896:11 | in : Builder | provenance |  |
 | Test.java:895:79:895:86 | source(...) : Object | Test.java:895:43:895:86 | (...)... : Builder | provenance |  |
-| Test.java:896:10:896:11 | in : Builder | Test.java:896:10:896:23 | getExtras(...) : Bundle | provenance | MaD:120 |
+| Test.java:896:10:896:11 | in : Builder | Test.java:896:10:896:23 | getExtras(...) : Bundle | provenance | MaD:117 |
 | Test.java:896:10:896:23 | getExtras(...) : Bundle | Test.java:897:9:897:11 | out | provenance |  |
 | Test.java:902:43:902:86 | (...)... : Builder | Test.java:903:10:903:11 | in : Builder | provenance |  |
 | Test.java:902:79:902:86 | source(...) : Object | Test.java:902:43:902:86 | (...)... : Builder | provenance |  |
-| Test.java:903:10:903:11 | in : Builder | Test.java:903:10:903:43 | setAllowGeneratedReplies(...) : Builder | provenance | MaD:121 |
+| Test.java:903:10:903:11 | in : Builder | Test.java:903:10:903:43 | setAllowGeneratedReplies(...) : Builder | provenance | MaD:118 |
 | Test.java:903:10:903:43 | setAllowGeneratedReplies(...) : Builder | Test.java:904:9:904:11 | out | provenance |  |
 | Test.java:909:43:909:86 | (...)... : Builder | Test.java:910:10:910:11 | in : Builder | provenance |  |
 | Test.java:909:79:909:86 | source(...) : Object | Test.java:909:43:909:86 | (...)... : Builder | provenance |  |
-| Test.java:910:10:910:11 | in : Builder | Test.java:910:10:910:32 | setContextual(...) : Builder | provenance | MaD:122 |
+| Test.java:910:10:910:11 | in : Builder | Test.java:910:10:910:32 | setContextual(...) : Builder | provenance | MaD:119 |
 | Test.java:910:10:910:32 | setContextual(...) : Builder | Test.java:911:9:911:11 | out | provenance |  |
 | Test.java:916:43:916:86 | (...)... : Builder | Test.java:917:10:917:11 | in : Builder | provenance |  |
 | Test.java:916:79:916:86 | source(...) : Object | Test.java:916:43:916:86 | (...)... : Builder | provenance |  |
-| Test.java:917:10:917:11 | in : Builder | Test.java:917:10:917:32 | setSemanticAction(...) : Builder | provenance | MaD:123 |
+| Test.java:917:10:917:11 | in : Builder | Test.java:917:10:917:32 | setSemanticAction(...) : Builder | provenance | MaD:120 |
 | Test.java:917:10:917:32 | setSemanticAction(...) : Builder | Test.java:918:9:918:11 | out | provenance |  |
 | Test.java:923:23:923:46 | (...)... : PendingIntent | Test.java:924:80:924:81 | in : PendingIntent | provenance |  |
 | Test.java:923:39:923:46 | source(...) : Object | Test.java:923:23:923:46 | (...)... : PendingIntent | provenance |  |
 | Test.java:924:10:924:82 | new Action(...) : Action | Test.java:925:9:925:11 | out | provenance |  |
-| Test.java:924:80:924:81 | in : PendingIntent | Test.java:924:10:924:82 | new Action(...) : Action | provenance | MaD:107 |
+| Test.java:924:80:924:81 | in : PendingIntent | Test.java:924:10:924:82 | new Action(...) : Action | provenance | MaD:121 |
 | Test.java:930:23:930:46 | (...)... : PendingIntent | Test.java:931:64:931:65 | in : PendingIntent | provenance |  |
 | Test.java:930:39:930:46 | source(...) : Object | Test.java:930:23:930:46 | (...)... : PendingIntent | provenance |  |
 | Test.java:931:10:931:66 | new Action(...) : Action | Test.java:932:9:932:11 | out | provenance |  |
-| Test.java:931:64:931:65 | in : PendingIntent | Test.java:931:10:931:66 | new Action(...) : Action | provenance | MaD:108 |
+| Test.java:931:64:931:65 | in : PendingIntent | Test.java:931:10:931:66 | new Action(...) : Action | provenance | MaD:122 |
 | Test.java:937:35:937:70 | (...)... : Action | Test.java:938:10:938:11 | in : Action | provenance |  |
 | Test.java:937:63:937:70 | source(...) : Object | Test.java:937:35:937:70 | (...)... : Action | provenance |  |
-| Test.java:938:10:938:11 | in : Action | Test.java:938:10:938:23 | getExtras(...) : Bundle | provenance | MaD:109 |
+| Test.java:938:10:938:11 | in : Action | Test.java:938:10:938:23 | getExtras(...) : Bundle | provenance | MaD:123 |
 | Test.java:938:10:938:23 | getExtras(...) : Bundle | Test.java:939:9:939:11 | out | provenance |  |
 | Test.java:944:44:944:88 | (...)... : BigPictureStyle | Test.java:945:10:945:11 | in : BigPictureStyle | provenance |  |
 | Test.java:944:81:944:88 | source(...) : Object | Test.java:944:44:944:88 | (...)... : BigPictureStyle | provenance |  |
@@ -836,22 +836,22 @@ edges
 | Test.java:1007:35:1007:70 | (...)... : Action | Test.java:1008:18:1008:19 | in : Action | provenance |  |
 | Test.java:1007:63:1007:70 | source(...) : Object | Test.java:1007:35:1007:70 | (...)... : Action | provenance |  |
 | Test.java:1008:4:1008:6 | out [post update] : Builder | Test.java:1009:9:1009:11 | out | provenance |  |
-| Test.java:1008:18:1008:19 | in : Action | Test.java:1008:4:1008:6 | out [post update] : Builder | provenance | MaD:132 |
+| Test.java:1008:18:1008:19 | in : Action | Test.java:1008:4:1008:6 | out [post update] : Builder | provenance | MaD:131 |
 | Test.java:1014:23:1014:46 | (...)... : PendingIntent | Test.java:1015:27:1015:28 | in : PendingIntent | provenance |  |
 | Test.java:1014:39:1014:46 | source(...) : Object | Test.java:1014:23:1014:46 | (...)... : PendingIntent | provenance |  |
 | Test.java:1015:4:1015:6 | out [post update] : Builder | Test.java:1016:9:1016:11 | out | provenance |  |
-| Test.java:1015:27:1015:28 | in : PendingIntent | Test.java:1015:4:1015:6 | out [post update] : Builder | provenance | MaD:133 |
+| Test.java:1015:27:1015:28 | in : PendingIntent | Test.java:1015:4:1015:6 | out [post update] : Builder | provenance | MaD:132 |
 | Test.java:1021:36:1021:72 | (...)... : Builder | Test.java:1022:10:1022:11 | in : Builder | provenance |  |
 | Test.java:1021:65:1021:72 | source(...) : Object | Test.java:1021:36:1021:72 | (...)... : Builder | provenance |  |
-| Test.java:1022:10:1022:11 | in : Builder | Test.java:1022:10:1022:36 | addAction(...) : Builder | provenance | MaD:131 |
+| Test.java:1022:10:1022:11 | in : Builder | Test.java:1022:10:1022:36 | addAction(...) : Builder | provenance | MaD:133 |
 | Test.java:1022:10:1022:36 | addAction(...) : Builder | Test.java:1023:9:1023:11 | out | provenance |  |
 | Test.java:1028:36:1028:72 | (...)... : Builder | Test.java:1029:10:1029:11 | in : Builder | provenance |  |
 | Test.java:1028:65:1028:72 | source(...) : Object | Test.java:1028:36:1028:72 | (...)... : Builder | provenance |  |
-| Test.java:1029:10:1029:11 | in : Builder | Test.java:1029:10:1029:27 | addAction(...) : Builder | provenance | MaD:131 |
+| Test.java:1029:10:1029:11 | in : Builder | Test.java:1029:10:1029:27 | addAction(...) : Builder | provenance | MaD:133 |
 | Test.java:1029:10:1029:27 | addAction(...) : Builder | Test.java:1030:9:1030:11 | out | provenance |  |
 | Test.java:1035:36:1035:72 | (...)... : Builder | Test.java:1036:10:1036:11 | in : Builder | provenance |  |
 | Test.java:1035:65:1035:72 | source(...) : Object | Test.java:1035:36:1035:72 | (...)... : Builder | provenance |  |
-| Test.java:1036:10:1036:11 | in : Builder | Test.java:1036:10:1036:27 | addExtras(...) : Builder | provenance | MaD:134 |
+| Test.java:1036:10:1036:11 | in : Builder | Test.java:1036:10:1036:27 | addExtras(...) : Builder | provenance | MaD:136 |
 | Test.java:1036:10:1036:27 | addExtras(...) : Builder | Test.java:1037:9:1037:11 | out | provenance |  |
 | Test.java:1042:16:1042:54 | (...)... : Bundle [<map.key>] : String | Test.java:1043:18:1043:19 | in : Bundle [<map.key>] : String | provenance |  |
 | Test.java:1042:25:1042:54 | newWithMapKeyDefault(...) : Bundle [<map.key>] : String | Test.java:1042:16:1042:54 | (...)... : Bundle [<map.key>] : String | provenance |  |
@@ -859,8 +859,8 @@ edges
 | Test.java:1042:46:1042:53 | source(...) : Object | Test.java:1042:25:1042:54 | newWithMapKeyDefault(...) : Bundle [<map.key>] : String | provenance | MaD:105 |
 | Test.java:1043:4:1043:6 | out [post update] : Builder [android.content.Intent.extras, <map.key>] : String | Test.java:1044:26:1044:28 | out : Builder [android.content.Intent.extras, <map.key>] : String | provenance |  |
 | Test.java:1043:4:1043:6 | out [post update] : Builder [android.content.Intent.extras, <map.key>] : String | Test.java:1044:26:1044:28 | out : Builder [android.content.Intent.extras, <map.key>] : String | provenance |  |
-| Test.java:1043:18:1043:19 | in : Bundle [<map.key>] : String | Test.java:1043:4:1043:6 | out [post update] : Builder [android.content.Intent.extras, <map.key>] : String | provenance | MaD:135 |
-| Test.java:1043:18:1043:19 | in : Bundle [<map.key>] : String | Test.java:1043:4:1043:6 | out [post update] : Builder [android.content.Intent.extras, <map.key>] : String | provenance | MaD:135 |
+| Test.java:1043:18:1043:19 | in : Bundle [<map.key>] : String | Test.java:1043:4:1043:6 | out [post update] : Builder [android.content.Intent.extras, <map.key>] : String | provenance | MaD:134 |
+| Test.java:1043:18:1043:19 | in : Bundle [<map.key>] : String | Test.java:1043:4:1043:6 | out [post update] : Builder [android.content.Intent.extras, <map.key>] : String | provenance | MaD:134 |
 | Test.java:1044:26:1044:28 | out : Builder [android.content.Intent.extras, <map.key>] : String | Test.java:1044:26:1044:40 | getExtras(...) : Bundle [<map.key>] : String | provenance | MaD:141 |
 | Test.java:1044:26:1044:28 | out : Builder [android.content.Intent.extras, <map.key>] : String | Test.java:1044:26:1044:40 | getExtras(...) : Bundle [<map.key>] : String | provenance | MaD:141 |
 | Test.java:1044:26:1044:40 | getExtras(...) : Bundle [<map.key>] : String | Test.java:1044:9:1044:41 | getMapKeyDefault(...) | provenance | MaD:194 |
@@ -870,8 +870,8 @@ edges
 | Test.java:1049:48:1049:55 | source(...) : Object | Test.java:1049:25:1049:56 | newWithMapValueDefault(...) : Bundle [<map.value>] : String | provenance | MaD:106 |
 | Test.java:1050:4:1050:6 | out [post update] : Builder [android.content.Intent.extras, <map.value>] : String | Test.java:1051:28:1051:30 | out : Builder [android.content.Intent.extras, <map.value>] : String | provenance |  |
 | Test.java:1050:4:1050:6 | out [post update] : Builder [android.content.Intent.extras, <map.value>] : String | Test.java:1051:28:1051:30 | out : Builder [android.content.Intent.extras, <map.value>] : String | provenance |  |
-| Test.java:1050:18:1050:19 | in : Bundle [<map.value>] : String | Test.java:1050:4:1050:6 | out [post update] : Builder [android.content.Intent.extras, <map.value>] : String | provenance | MaD:136 |
-| Test.java:1050:18:1050:19 | in : Bundle [<map.value>] : String | Test.java:1050:4:1050:6 | out [post update] : Builder [android.content.Intent.extras, <map.value>] : String | provenance | MaD:136 |
+| Test.java:1050:18:1050:19 | in : Bundle [<map.value>] : String | Test.java:1050:4:1050:6 | out [post update] : Builder [android.content.Intent.extras, <map.value>] : String | provenance | MaD:135 |
+| Test.java:1050:18:1050:19 | in : Bundle [<map.value>] : String | Test.java:1050:4:1050:6 | out [post update] : Builder [android.content.Intent.extras, <map.value>] : String | provenance | MaD:135 |
 | Test.java:1051:28:1051:30 | out : Builder [android.content.Intent.extras, <map.value>] : String | Test.java:1051:28:1051:42 | getExtras(...) : Bundle [<map.value>] : String | provenance | MaD:141 |
 | Test.java:1051:28:1051:30 | out : Builder [android.content.Intent.extras, <map.value>] : String | Test.java:1051:28:1051:42 | getExtras(...) : Bundle [<map.value>] : String | provenance | MaD:141 |
 | Test.java:1051:28:1051:42 | getExtras(...) : Bundle [<map.value>] : String | Test.java:22:28:22:43 | container : Bundle [<map.value>] : String | provenance |  |
@@ -890,11 +890,11 @@ edges
 | Test.java:1071:48:1071:55 | source(...) : Object | Test.java:1071:25:1071:56 | newWithMapValueDefault(...) : Bundle [<map.value>] : String | provenance | MaD:106 |
 | Test.java:1072:4:1072:10 | builder [post update] : Builder [android.content.Intent.extras, <map.value>] : String | Test.java:1073:10:1073:16 | builder : Builder [android.content.Intent.extras, <map.value>] : String | provenance |  |
 | Test.java:1072:4:1072:10 | builder [post update] : Builder [android.content.Intent.extras, <map.value>] : String | Test.java:1073:10:1073:16 | builder : Builder [android.content.Intent.extras, <map.value>] : String | provenance |  |
-| Test.java:1072:22:1072:23 | in : Bundle [<map.value>] : String | Test.java:1072:4:1072:10 | builder [post update] : Builder [android.content.Intent.extras, <map.value>] : String | provenance | MaD:136 |
-| Test.java:1072:22:1072:23 | in : Bundle [<map.value>] : String | Test.java:1072:4:1072:10 | builder [post update] : Builder [android.content.Intent.extras, <map.value>] : String | provenance | MaD:136 |
-| Test.java:1073:10:1073:16 | builder : Builder [android.content.Intent.extras, <map.value>] : String | Test.java:1073:10:1073:24 | build(...) : Notification [extras, <map.value>] : String | provenance | MaD:139 |
-| Test.java:1073:10:1073:16 | builder : Builder [android.content.Intent.extras, <map.value>] : String | Test.java:1073:10:1073:24 | build(...) : Notification [extras, <map.value>] : String | provenance | MaD:139 |
-| Test.java:1073:10:1073:16 | builder : Builder [android.content.Intent.extras, <map.value>] : String | Test.java:1073:10:1073:24 | build(...) : Notification [extras, <map.value>] : String | provenance | MaD:139 |
+| Test.java:1072:22:1072:23 | in : Bundle [<map.value>] : String | Test.java:1072:4:1072:10 | builder [post update] : Builder [android.content.Intent.extras, <map.value>] : String | provenance | MaD:135 |
+| Test.java:1072:22:1072:23 | in : Bundle [<map.value>] : String | Test.java:1072:4:1072:10 | builder [post update] : Builder [android.content.Intent.extras, <map.value>] : String | provenance | MaD:135 |
+| Test.java:1073:10:1073:16 | builder : Builder [android.content.Intent.extras, <map.value>] : String | Test.java:1073:10:1073:24 | build(...) : Notification [extras, <map.value>] : String | provenance | MaD:138 |
+| Test.java:1073:10:1073:16 | builder : Builder [android.content.Intent.extras, <map.value>] : String | Test.java:1073:10:1073:24 | build(...) : Notification [extras, <map.value>] : String | provenance | MaD:138 |
+| Test.java:1073:10:1073:16 | builder : Builder [android.content.Intent.extras, <map.value>] : String | Test.java:1073:10:1073:24 | build(...) : Notification [extras, <map.value>] : String | provenance | MaD:138 |
 | Test.java:1073:10:1073:24 | build(...) : Notification [extras, <map.value>] : String | Test.java:1074:28:1074:30 | out : Notification [extras, <map.value>] : String | provenance |  |
 | Test.java:1073:10:1073:24 | build(...) : Notification [extras, <map.value>] : String | Test.java:1074:28:1074:30 | out : Notification [extras, <map.value>] : String | provenance |  |
 | Test.java:1074:28:1074:30 | out : Notification [extras, <map.value>] : String | Test.java:1074:28:1074:37 | out.extras : Bundle [<map.value>] : String | provenance |  |
@@ -903,7 +903,7 @@ edges
 | Test.java:1074:28:1074:37 | out.extras : Bundle [<map.value>] : String | Test.java:1074:9:1074:38 | getMapValueDefault(...) | provenance | MaD:104 |
 | Test.java:1079:36:1079:72 | (...)... : Builder | Test.java:1080:10:1080:11 | in : Builder | provenance |  |
 | Test.java:1079:65:1079:72 | source(...) : Object | Test.java:1079:36:1079:72 | (...)... : Builder | provenance |  |
-| Test.java:1080:10:1080:11 | in : Builder | Test.java:1080:10:1080:19 | build(...) : Notification | provenance | MaD:138 |
+| Test.java:1080:10:1080:11 | in : Builder | Test.java:1080:10:1080:19 | build(...) : Notification | provenance | MaD:139 |
 | Test.java:1080:10:1080:19 | build(...) : Notification | Test.java:1081:9:1081:11 | out | provenance |  |
 | Test.java:1086:36:1086:72 | (...)... : Builder | Test.java:1087:10:1087:11 | in : Builder | provenance |  |
 | Test.java:1086:65:1086:72 | source(...) : Object | Test.java:1086:36:1086:72 | (...)... : Builder | provenance |  |
@@ -955,12 +955,12 @@ edges
 | Test.java:1164:10:1164:32 | setContentInfo(...) : Builder | Test.java:1165:9:1165:11 | out | provenance |  |
 | Test.java:1170:36:1170:72 | (...)... : Builder | Test.java:1171:10:1171:11 | in : Builder | provenance |  |
 | Test.java:1170:65:1170:72 | source(...) : Object | Test.java:1170:36:1170:72 | (...)... : Builder | provenance |  |
-| Test.java:1171:10:1171:11 | in : Builder | Test.java:1171:10:1171:34 | setContentIntent(...) : Builder | provenance | MaD:152 |
+| Test.java:1171:10:1171:11 | in : Builder | Test.java:1171:10:1171:34 | setContentIntent(...) : Builder | provenance | MaD:153 |
 | Test.java:1171:10:1171:34 | setContentIntent(...) : Builder | Test.java:1172:9:1172:11 | out | provenance |  |
 | Test.java:1177:23:1177:46 | (...)... : PendingIntent | Test.java:1178:25:1178:26 | in : PendingIntent | provenance |  |
 | Test.java:1177:39:1177:46 | source(...) : Object | Test.java:1177:23:1177:46 | (...)... : PendingIntent | provenance |  |
 | Test.java:1178:4:1178:6 | out [post update] : Builder | Test.java:1179:9:1179:11 | out | provenance |  |
-| Test.java:1178:25:1178:26 | in : PendingIntent | Test.java:1178:4:1178:6 | out [post update] : Builder | provenance | MaD:153 |
+| Test.java:1178:25:1178:26 | in : PendingIntent | Test.java:1178:4:1178:6 | out [post update] : Builder | provenance | MaD:152 |
 | Test.java:1184:36:1184:72 | (...)... : Builder | Test.java:1185:10:1185:11 | in : Builder | provenance |  |
 | Test.java:1184:65:1184:72 | source(...) : Object | Test.java:1184:36:1184:72 | (...)... : Builder | provenance |  |
 | Test.java:1185:10:1185:11 | in : Builder | Test.java:1185:10:1185:32 | setContentText(...) : Builder | provenance | MaD:154 |
@@ -983,20 +983,20 @@ edges
 | Test.java:1213:10:1213:26 | setDefaults(...) : Builder | Test.java:1214:9:1214:11 | out | provenance |  |
 | Test.java:1219:36:1219:72 | (...)... : Builder | Test.java:1220:10:1220:11 | in : Builder | provenance |  |
 | Test.java:1219:65:1219:72 | source(...) : Object | Test.java:1219:36:1219:72 | (...)... : Builder | provenance |  |
-| Test.java:1220:10:1220:11 | in : Builder | Test.java:1220:10:1220:33 | setDeleteIntent(...) : Builder | provenance | MaD:159 |
+| Test.java:1220:10:1220:11 | in : Builder | Test.java:1220:10:1220:33 | setDeleteIntent(...) : Builder | provenance | MaD:160 |
 | Test.java:1220:10:1220:33 | setDeleteIntent(...) : Builder | Test.java:1221:9:1221:11 | out | provenance |  |
 | Test.java:1226:23:1226:46 | (...)... : PendingIntent | Test.java:1227:24:1227:25 | in : PendingIntent | provenance |  |
 | Test.java:1226:39:1226:46 | source(...) : Object | Test.java:1226:23:1226:46 | (...)... : PendingIntent | provenance |  |
 | Test.java:1227:4:1227:6 | out [post update] : Builder | Test.java:1228:9:1228:11 | out | provenance |  |
-| Test.java:1227:24:1227:25 | in : PendingIntent | Test.java:1227:4:1227:6 | out [post update] : Builder | provenance | MaD:160 |
+| Test.java:1227:24:1227:25 | in : PendingIntent | Test.java:1227:4:1227:6 | out [post update] : Builder | provenance | MaD:159 |
 | Test.java:1233:36:1233:72 | (...)... : Builder | Test.java:1234:10:1234:11 | in : Builder | provenance |  |
 | Test.java:1233:65:1233:72 | source(...) : Object | Test.java:1233:36:1233:72 | (...)... : Builder | provenance |  |
-| Test.java:1234:10:1234:11 | in : Builder | Test.java:1234:10:1234:27 | setExtras(...) : Builder | provenance | MaD:161 |
+| Test.java:1234:10:1234:11 | in : Builder | Test.java:1234:10:1234:27 | setExtras(...) : Builder | provenance | MaD:162 |
 | Test.java:1234:10:1234:27 | setExtras(...) : Builder | Test.java:1235:9:1235:11 | out | provenance |  |
 | Test.java:1240:16:1240:32 | (...)... : Bundle | Test.java:1241:18:1241:19 | in : Bundle | provenance |  |
 | Test.java:1240:25:1240:32 | source(...) : Object | Test.java:1240:16:1240:32 | (...)... : Bundle | provenance |  |
 | Test.java:1241:4:1241:6 | out [post update] : Builder [android.content.Intent.extras] : Bundle | Test.java:1242:9:1242:11 | out : Builder [android.content.Intent.extras] : Bundle | provenance |  |
-| Test.java:1241:18:1241:19 | in : Bundle | Test.java:1241:4:1241:6 | out [post update] : Builder [android.content.Intent.extras] : Bundle | provenance | MaD:162 |
+| Test.java:1241:18:1241:19 | in : Bundle | Test.java:1241:4:1241:6 | out [post update] : Builder [android.content.Intent.extras] : Bundle | provenance | MaD:161 |
 | Test.java:1242:9:1242:11 | out : Builder [android.content.Intent.extras] : Bundle | Test.java:1242:9:1242:23 | getExtras(...) | provenance | MaD:141 |
 | Test.java:1247:36:1247:72 | (...)... : Builder | Test.java:1248:10:1248:11 | in : Builder | provenance |  |
 | Test.java:1247:65:1247:72 | source(...) : Object | Test.java:1247:36:1247:72 | (...)... : Builder | provenance |  |
@@ -1052,12 +1052,12 @@ edges
 | Test.java:1332:10:1332:36 | setProgress(...) : Builder | Test.java:1333:9:1333:11 | out | provenance |  |
 | Test.java:1338:36:1338:72 | (...)... : Builder | Test.java:1339:10:1339:11 | in : Builder | provenance |  |
 | Test.java:1338:65:1338:72 | source(...) : Object | Test.java:1338:36:1338:72 | (...)... : Builder | provenance |  |
-| Test.java:1339:10:1339:11 | in : Builder | Test.java:1339:10:1339:34 | setPublicVersion(...) : Builder | provenance | MaD:175 |
+| Test.java:1339:10:1339:11 | in : Builder | Test.java:1339:10:1339:34 | setPublicVersion(...) : Builder | provenance | MaD:176 |
 | Test.java:1339:10:1339:34 | setPublicVersion(...) : Builder | Test.java:1340:9:1340:11 | out | provenance |  |
 | Test.java:1345:22:1345:44 | (...)... : Notification | Test.java:1346:25:1346:26 | in : Notification | provenance |  |
 | Test.java:1345:37:1345:44 | source(...) : Object | Test.java:1345:22:1345:44 | (...)... : Notification | provenance |  |
 | Test.java:1346:4:1346:6 | out [post update] : Builder | Test.java:1347:9:1347:11 | out | provenance |  |
-| Test.java:1346:25:1346:26 | in : Notification | Test.java:1346:4:1346:6 | out [post update] : Builder | provenance | MaD:176 |
+| Test.java:1346:25:1346:26 | in : Notification | Test.java:1346:4:1346:6 | out [post update] : Builder | provenance | MaD:175 |
 | Test.java:1352:36:1352:72 | (...)... : Builder | Test.java:1353:10:1353:11 | in : Builder | provenance |  |
 | Test.java:1352:65:1352:72 | source(...) : Object | Test.java:1352:36:1352:72 | (...)... : Builder | provenance |  |
 | Test.java:1353:10:1353:11 | in : Builder | Test.java:1353:10:1353:39 | setRemoteInputHistory(...) : Builder | provenance | MaD:177 |
diff --git a/java/ql/test/library-tests/frameworks/android/slice/test.ql b/java/ql/test/library-tests/frameworks/android/slice/test.ql
index 8540c0604a8..a8b467d1ba0 100644
--- a/java/ql/test/library-tests/frameworks/android/slice/test.ql
+++ b/java/ql/test/library-tests/frameworks/android/slice/test.ql
@@ -5,7 +5,7 @@ import semmle.code.java.dataflow.FlowSources
 
 module SliceValueFlowConfig implements DataFlow::ConfigSig {
   predicate isSource(DataFlow::Node source) {
-    DefaultFlowConfig::isSource(source) or source instanceof ThreatModelFlowSource
+    DefaultFlowConfig::isSource(source) or source instanceof ActiveThreatModelSource
   }
 
   predicate isSink = DefaultFlowConfig::isSink/1;
diff --git a/java/ql/test/library-tests/frameworks/android/sources/OnActivityResultSourceTest.ql b/java/ql/test/library-tests/frameworks/android/sources/OnActivityResultSourceTest.ql
index 9b067cd00dd..96d9523b2a5 100644
--- a/java/ql/test/library-tests/frameworks/android/sources/OnActivityResultSourceTest.ql
+++ b/java/ql/test/library-tests/frameworks/android/sources/OnActivityResultSourceTest.ql
@@ -3,7 +3,7 @@ import semmle.code.java.dataflow.FlowSources
 import TestUtilities.InlineFlowTest
 
 module SourceValueFlowConfig implements DataFlow::ConfigSig {
-  predicate isSource(DataFlow::Node src) { src instanceof ThreatModelFlowSource }
+  predicate isSource(DataFlow::Node src) { src instanceof ActiveThreatModelSource }
 
   predicate isSink(DataFlow::Node sink) { DefaultFlowConfig::isSink(sink) }
 
diff --git a/java/ql/test/library-tests/frameworks/android/uri/test.expected b/java/ql/test/library-tests/frameworks/android/uri/test.expected
index 8113005052d..576aeab9803 100644
--- a/java/ql/test/library-tests/frameworks/android/uri/test.expected
+++ b/java/ql/test/library-tests/frameworks/android/uri/test.expected
@@ -1,324 +1,324 @@
 models
-| 1 | Summary: android.net; Uri; true; buildUpon; ; ; Argument[this]; ReturnValue; taint; manual |
-| 2 | Summary: android.net; Uri; false; decode; ; ; Argument[0]; ReturnValue; taint; manual |
-| 3 | Summary: android.net; Uri; false; encode; ; ; Argument[0]; ReturnValue; taint; manual |
-| 4 | Summary: android.net; Uri; false; fromFile; ; ; Argument[0]; ReturnValue; taint; manual |
-| 5 | Summary: android.net; Uri; false; fromParts; ; ; Argument[0..2]; ReturnValue; taint; manual |
-| 6 | Summary: android.net; Uri; true; getAuthority; ; ; Argument[this]; ReturnValue; taint; manual |
-| 7 | Summary: android.net; Uri; true; getEncodedAuthority; ; ; Argument[this]; ReturnValue; taint; manual |
-| 8 | Summary: android.net; Uri; true; getEncodedFragment; ; ; Argument[this]; ReturnValue; taint; manual |
-| 9 | Summary: android.net; Uri; true; getEncodedPath; ; ; Argument[this]; ReturnValue; taint; manual |
-| 10 | Summary: android.net; Uri; true; getEncodedQuery; ; ; Argument[this]; ReturnValue; taint; manual |
-| 11 | Summary: android.net; Uri; true; getEncodedSchemeSpecificPart; ; ; Argument[this]; ReturnValue; taint; manual |
-| 12 | Summary: android.net; Uri; true; getEncodedUserInfo; ; ; Argument[this]; ReturnValue; taint; manual |
-| 13 | Summary: android.net; Uri; true; getFragment; ; ; Argument[this]; ReturnValue; taint; manual |
-| 14 | Summary: android.net; Uri; true; getHost; ; ; Argument[this]; ReturnValue; taint; manual |
-| 15 | Summary: android.net; Uri; true; getLastPathSegment; ; ; Argument[this]; ReturnValue; taint; manual |
-| 16 | Summary: android.net; Uri; true; getPath; ; ; Argument[this]; ReturnValue; taint; manual |
-| 17 | Summary: android.net; Uri; true; getPathSegments; ; ; Argument[this]; ReturnValue; taint; manual |
-| 18 | Summary: android.net; Uri; true; getQuery; ; ; Argument[this]; ReturnValue; taint; manual |
-| 19 | Summary: android.net; Uri; true; getQueryParameter; ; ; Argument[this]; ReturnValue; taint; manual |
-| 20 | Summary: android.net; Uri; true; getQueryParameterNames; ; ; Argument[this]; ReturnValue; taint; manual |
-| 21 | Summary: android.net; Uri; true; getQueryParameters; ; ; Argument[this]; ReturnValue; taint; manual |
-| 22 | Summary: android.net; Uri; true; getScheme; ; ; Argument[this]; ReturnValue; taint; manual |
-| 23 | Summary: android.net; Uri; true; getSchemeSpecificPart; ; ; Argument[this]; ReturnValue; taint; manual |
-| 24 | Summary: android.net; Uri; true; getUserInfo; ; ; Argument[this]; ReturnValue; taint; manual |
-| 25 | Summary: android.net; Uri; true; normalizeScheme; ; ; Argument[this]; ReturnValue; taint; manual |
-| 26 | Summary: android.net; Uri; false; parse; ; ; Argument[0]; ReturnValue; taint; manual |
-| 27 | Summary: android.net; Uri; true; toString; ; ; Argument[this]; ReturnValue; taint; manual |
-| 28 | Summary: android.net; Uri; false; withAppendedPath; ; ; Argument[0..1]; ReturnValue; taint; manual |
-| 29 | Summary: android.net; Uri; false; writeToParcel; ; ; Argument[1]; Argument[0]; taint; manual |
-| 30 | Summary: android.net; Uri$Builder; false; appendEncodedPath; ; ; Argument[this]; ReturnValue; value; manual |
-| 31 | Summary: android.net; Uri$Builder; false; appendEncodedPath; ; ; Argument[0]; Argument[this]; taint; manual |
-| 32 | Summary: android.net; Uri$Builder; false; appendPath; ; ; Argument[this]; ReturnValue; value; manual |
-| 33 | Summary: android.net; Uri$Builder; false; appendPath; ; ; Argument[0]; Argument[this]; taint; manual |
-| 34 | Summary: android.net; Uri$Builder; false; appendQueryParameter; ; ; Argument[this]; ReturnValue; value; manual |
-| 35 | Summary: android.net; Uri$Builder; false; appendQueryParameter; ; ; Argument[0..1]; Argument[this]; taint; manual |
-| 36 | Summary: android.net; Uri$Builder; false; authority; ; ; Argument[this]; ReturnValue; value; manual |
-| 37 | Summary: android.net; Uri$Builder; false; authority; ; ; Argument[0]; Argument[this]; taint; manual |
-| 38 | Summary: android.net; Uri$Builder; false; build; ; ; Argument[this]; ReturnValue; taint; manual |
-| 39 | Summary: android.net; Uri$Builder; false; clearQuery; ; ; Argument[this]; ReturnValue; value; manual |
-| 40 | Summary: android.net; Uri$Builder; false; encodedAuthority; ; ; Argument[this]; ReturnValue; value; manual |
-| 41 | Summary: android.net; Uri$Builder; false; encodedAuthority; ; ; Argument[0]; Argument[this]; taint; manual |
-| 42 | Summary: android.net; Uri$Builder; false; encodedFragment; ; ; Argument[this]; ReturnValue; value; manual |
-| 43 | Summary: android.net; Uri$Builder; false; encodedFragment; ; ; Argument[0]; Argument[this]; taint; manual |
-| 44 | Summary: android.net; Uri$Builder; false; encodedOpaquePart; ; ; Argument[this]; ReturnValue; value; manual |
-| 45 | Summary: android.net; Uri$Builder; false; encodedOpaquePart; ; ; Argument[0]; Argument[this]; taint; manual |
-| 46 | Summary: android.net; Uri$Builder; false; encodedPath; ; ; Argument[this]; ReturnValue; value; manual |
-| 47 | Summary: android.net; Uri$Builder; false; encodedPath; ; ; Argument[0]; Argument[this]; taint; manual |
-| 48 | Summary: android.net; Uri$Builder; false; encodedQuery; ; ; Argument[this]; ReturnValue; value; manual |
-| 49 | Summary: android.net; Uri$Builder; false; encodedQuery; ; ; Argument[0]; Argument[this]; taint; manual |
-| 50 | Summary: android.net; Uri$Builder; false; fragment; ; ; Argument[this]; ReturnValue; value; manual |
-| 51 | Summary: android.net; Uri$Builder; false; fragment; ; ; Argument[0]; Argument[this]; taint; manual |
-| 52 | Summary: android.net; Uri$Builder; false; opaquePart; ; ; Argument[this]; ReturnValue; value; manual |
-| 53 | Summary: android.net; Uri$Builder; false; opaquePart; ; ; Argument[0]; Argument[this]; taint; manual |
-| 54 | Summary: android.net; Uri$Builder; false; path; ; ; Argument[this]; ReturnValue; value; manual |
-| 55 | Summary: android.net; Uri$Builder; false; path; ; ; Argument[0]; Argument[this]; taint; manual |
-| 56 | Summary: android.net; Uri$Builder; false; query; ; ; Argument[this]; ReturnValue; value; manual |
-| 57 | Summary: android.net; Uri$Builder; false; query; ; ; Argument[0]; Argument[this]; taint; manual |
-| 58 | Summary: android.net; Uri$Builder; false; scheme; ; ; Argument[this]; ReturnValue; value; manual |
-| 59 | Summary: android.net; Uri$Builder; false; scheme; ; ; Argument[0]; Argument[this]; taint; manual |
-| 60 | Summary: android.net; Uri$Builder; false; toString; ; ; Argument[this]; ReturnValue; taint; manual |
+| 1 | Summary: android.net; Uri$Builder; false; appendEncodedPath; ; ; Argument[0]; Argument[this]; taint; manual |
+| 2 | Summary: android.net; Uri$Builder; false; appendEncodedPath; ; ; Argument[this]; ReturnValue; value; manual |
+| 3 | Summary: android.net; Uri$Builder; false; appendPath; ; ; Argument[0]; Argument[this]; taint; manual |
+| 4 | Summary: android.net; Uri$Builder; false; appendPath; ; ; Argument[this]; ReturnValue; value; manual |
+| 5 | Summary: android.net; Uri$Builder; false; appendQueryParameter; ; ; Argument[0..1]; Argument[this]; taint; manual |
+| 6 | Summary: android.net; Uri$Builder; false; appendQueryParameter; ; ; Argument[this]; ReturnValue; value; manual |
+| 7 | Summary: android.net; Uri$Builder; false; authority; ; ; Argument[0]; Argument[this]; taint; manual |
+| 8 | Summary: android.net; Uri$Builder; false; authority; ; ; Argument[this]; ReturnValue; value; manual |
+| 9 | Summary: android.net; Uri$Builder; false; build; ; ; Argument[this]; ReturnValue; taint; manual |
+| 10 | Summary: android.net; Uri$Builder; false; clearQuery; ; ; Argument[this]; ReturnValue; value; manual |
+| 11 | Summary: android.net; Uri$Builder; false; encodedAuthority; ; ; Argument[0]; Argument[this]; taint; manual |
+| 12 | Summary: android.net; Uri$Builder; false; encodedAuthority; ; ; Argument[this]; ReturnValue; value; manual |
+| 13 | Summary: android.net; Uri$Builder; false; encodedFragment; ; ; Argument[0]; Argument[this]; taint; manual |
+| 14 | Summary: android.net; Uri$Builder; false; encodedFragment; ; ; Argument[this]; ReturnValue; value; manual |
+| 15 | Summary: android.net; Uri$Builder; false; encodedOpaquePart; ; ; Argument[0]; Argument[this]; taint; manual |
+| 16 | Summary: android.net; Uri$Builder; false; encodedOpaquePart; ; ; Argument[this]; ReturnValue; value; manual |
+| 17 | Summary: android.net; Uri$Builder; false; encodedPath; ; ; Argument[0]; Argument[this]; taint; manual |
+| 18 | Summary: android.net; Uri$Builder; false; encodedPath; ; ; Argument[this]; ReturnValue; value; manual |
+| 19 | Summary: android.net; Uri$Builder; false; encodedQuery; ; ; Argument[0]; Argument[this]; taint; manual |
+| 20 | Summary: android.net; Uri$Builder; false; encodedQuery; ; ; Argument[this]; ReturnValue; value; manual |
+| 21 | Summary: android.net; Uri$Builder; false; fragment; ; ; Argument[0]; Argument[this]; taint; manual |
+| 22 | Summary: android.net; Uri$Builder; false; fragment; ; ; Argument[this]; ReturnValue; value; manual |
+| 23 | Summary: android.net; Uri$Builder; false; opaquePart; ; ; Argument[0]; Argument[this]; taint; manual |
+| 24 | Summary: android.net; Uri$Builder; false; opaquePart; ; ; Argument[this]; ReturnValue; value; manual |
+| 25 | Summary: android.net; Uri$Builder; false; path; ; ; Argument[0]; Argument[this]; taint; manual |
+| 26 | Summary: android.net; Uri$Builder; false; path; ; ; Argument[this]; ReturnValue; value; manual |
+| 27 | Summary: android.net; Uri$Builder; false; query; ; ; Argument[0]; Argument[this]; taint; manual |
+| 28 | Summary: android.net; Uri$Builder; false; query; ; ; Argument[this]; ReturnValue; value; manual |
+| 29 | Summary: android.net; Uri$Builder; false; scheme; ; ; Argument[0]; Argument[this]; taint; manual |
+| 30 | Summary: android.net; Uri$Builder; false; scheme; ; ; Argument[this]; ReturnValue; value; manual |
+| 31 | Summary: android.net; Uri$Builder; false; toString; ; ; Argument[this]; ReturnValue; taint; manual |
+| 32 | Summary: android.net; Uri; false; decode; ; ; Argument[0]; ReturnValue; taint; manual |
+| 33 | Summary: android.net; Uri; false; encode; ; ; Argument[0]; ReturnValue; taint; manual |
+| 34 | Summary: android.net; Uri; false; fromFile; ; ; Argument[0]; ReturnValue; taint; manual |
+| 35 | Summary: android.net; Uri; false; fromParts; ; ; Argument[0..2]; ReturnValue; taint; manual |
+| 36 | Summary: android.net; Uri; false; parse; ; ; Argument[0]; ReturnValue; taint; manual |
+| 37 | Summary: android.net; Uri; false; withAppendedPath; ; ; Argument[0..1]; ReturnValue; taint; manual |
+| 38 | Summary: android.net; Uri; false; writeToParcel; ; ; Argument[1]; Argument[0]; taint; manual |
+| 39 | Summary: android.net; Uri; true; buildUpon; ; ; Argument[this]; ReturnValue; taint; manual |
+| 40 | Summary: android.net; Uri; true; getAuthority; ; ; Argument[this]; ReturnValue; taint; manual |
+| 41 | Summary: android.net; Uri; true; getEncodedAuthority; ; ; Argument[this]; ReturnValue; taint; manual |
+| 42 | Summary: android.net; Uri; true; getEncodedFragment; ; ; Argument[this]; ReturnValue; taint; manual |
+| 43 | Summary: android.net; Uri; true; getEncodedPath; ; ; Argument[this]; ReturnValue; taint; manual |
+| 44 | Summary: android.net; Uri; true; getEncodedQuery; ; ; Argument[this]; ReturnValue; taint; manual |
+| 45 | Summary: android.net; Uri; true; getEncodedSchemeSpecificPart; ; ; Argument[this]; ReturnValue; taint; manual |
+| 46 | Summary: android.net; Uri; true; getEncodedUserInfo; ; ; Argument[this]; ReturnValue; taint; manual |
+| 47 | Summary: android.net; Uri; true; getFragment; ; ; Argument[this]; ReturnValue; taint; manual |
+| 48 | Summary: android.net; Uri; true; getHost; ; ; Argument[this]; ReturnValue; taint; manual |
+| 49 | Summary: android.net; Uri; true; getLastPathSegment; ; ; Argument[this]; ReturnValue; taint; manual |
+| 50 | Summary: android.net; Uri; true; getPath; ; ; Argument[this]; ReturnValue; taint; manual |
+| 51 | Summary: android.net; Uri; true; getPathSegments; ; ; Argument[this]; ReturnValue; taint; manual |
+| 52 | Summary: android.net; Uri; true; getQuery; ; ; Argument[this]; ReturnValue; taint; manual |
+| 53 | Summary: android.net; Uri; true; getQueryParameter; ; ; Argument[this]; ReturnValue; taint; manual |
+| 54 | Summary: android.net; Uri; true; getQueryParameterNames; ; ; Argument[this]; ReturnValue; taint; manual |
+| 55 | Summary: android.net; Uri; true; getQueryParameters; ; ; Argument[this]; ReturnValue; taint; manual |
+| 56 | Summary: android.net; Uri; true; getScheme; ; ; Argument[this]; ReturnValue; taint; manual |
+| 57 | Summary: android.net; Uri; true; getSchemeSpecificPart; ; ; Argument[this]; ReturnValue; taint; manual |
+| 58 | Summary: android.net; Uri; true; getUserInfo; ; ; Argument[this]; ReturnValue; taint; manual |
+| 59 | Summary: android.net; Uri; true; normalizeScheme; ; ; Argument[this]; ReturnValue; taint; manual |
+| 60 | Summary: android.net; Uri; true; toString; ; ; Argument[this]; ReturnValue; taint; manual |
 edges
 | Test.java:20:21:20:41 | (...)... : Builder | Test.java:21:10:21:11 | in : Builder | provenance |  |
 | Test.java:20:34:20:41 | source(...) : Object | Test.java:20:21:20:41 | (...)... : Builder | provenance |  |
-| Test.java:21:10:21:11 | in : Builder | Test.java:21:10:21:35 | appendEncodedPath(...) : Builder | provenance | MaD:30 |
+| Test.java:21:10:21:11 | in : Builder | Test.java:21:10:21:35 | appendEncodedPath(...) : Builder | provenance | MaD:2 |
 | Test.java:21:10:21:35 | appendEncodedPath(...) : Builder | Test.java:22:9:22:11 | out | provenance |  |
 | Test.java:27:16:27:31 | (...)... : String | Test.java:28:26:28:27 | in : String | provenance |  |
 | Test.java:27:24:27:31 | source(...) : Object | Test.java:27:16:27:31 | (...)... : String | provenance |  |
 | Test.java:28:4:28:6 | out [post update] : Builder | Test.java:29:9:29:11 | out | provenance |  |
-| Test.java:28:26:28:27 | in : String | Test.java:28:4:28:6 | out [post update] : Builder | provenance | MaD:31 |
+| Test.java:28:26:28:27 | in : String | Test.java:28:4:28:6 | out [post update] : Builder | provenance | MaD:1 |
 | Test.java:34:21:34:41 | (...)... : Builder | Test.java:35:10:35:11 | in : Builder | provenance |  |
 | Test.java:34:34:34:41 | source(...) : Object | Test.java:34:21:34:41 | (...)... : Builder | provenance |  |
-| Test.java:35:10:35:11 | in : Builder | Test.java:35:10:35:28 | appendPath(...) : Builder | provenance | MaD:32 |
+| Test.java:35:10:35:11 | in : Builder | Test.java:35:10:35:28 | appendPath(...) : Builder | provenance | MaD:4 |
 | Test.java:35:10:35:28 | appendPath(...) : Builder | Test.java:36:9:36:11 | out | provenance |  |
 | Test.java:41:16:41:31 | (...)... : String | Test.java:42:19:42:20 | in : String | provenance |  |
 | Test.java:41:24:41:31 | source(...) : Object | Test.java:41:16:41:31 | (...)... : String | provenance |  |
 | Test.java:42:4:42:6 | out [post update] : Builder | Test.java:43:9:43:11 | out | provenance |  |
-| Test.java:42:19:42:20 | in : String | Test.java:42:4:42:6 | out [post update] : Builder | provenance | MaD:33 |
+| Test.java:42:19:42:20 | in : String | Test.java:42:4:42:6 | out [post update] : Builder | provenance | MaD:3 |
 | Test.java:48:21:48:41 | (...)... : Builder | Test.java:49:10:49:11 | in : Builder | provenance |  |
 | Test.java:48:34:48:41 | source(...) : Object | Test.java:48:21:48:41 | (...)... : Builder | provenance |  |
-| Test.java:49:10:49:11 | in : Builder | Test.java:49:10:49:44 | appendQueryParameter(...) : Builder | provenance | MaD:34 |
+| Test.java:49:10:49:11 | in : Builder | Test.java:49:10:49:44 | appendQueryParameter(...) : Builder | provenance | MaD:6 |
 | Test.java:49:10:49:44 | appendQueryParameter(...) : Builder | Test.java:50:9:50:11 | out | provenance |  |
 | Test.java:55:16:55:31 | (...)... : String | Test.java:56:35:56:36 | in : String | provenance |  |
 | Test.java:55:24:55:31 | source(...) : Object | Test.java:55:16:55:31 | (...)... : String | provenance |  |
 | Test.java:56:4:56:6 | out [post update] : Builder | Test.java:57:9:57:11 | out | provenance |  |
-| Test.java:56:35:56:36 | in : String | Test.java:56:4:56:6 | out [post update] : Builder | provenance | MaD:35 |
+| Test.java:56:35:56:36 | in : String | Test.java:56:4:56:6 | out [post update] : Builder | provenance | MaD:5 |
 | Test.java:62:16:62:31 | (...)... : String | Test.java:63:29:63:30 | in : String | provenance |  |
 | Test.java:62:24:62:31 | source(...) : Object | Test.java:62:16:62:31 | (...)... : String | provenance |  |
 | Test.java:63:4:63:6 | out [post update] : Builder | Test.java:64:9:64:11 | out | provenance |  |
-| Test.java:63:29:63:30 | in : String | Test.java:63:4:63:6 | out [post update] : Builder | provenance | MaD:35 |
+| Test.java:63:29:63:30 | in : String | Test.java:63:4:63:6 | out [post update] : Builder | provenance | MaD:5 |
 | Test.java:69:21:69:41 | (...)... : Builder | Test.java:70:10:70:11 | in : Builder | provenance |  |
 | Test.java:69:34:69:41 | source(...) : Object | Test.java:69:21:69:41 | (...)... : Builder | provenance |  |
-| Test.java:70:10:70:11 | in : Builder | Test.java:70:10:70:27 | authority(...) : Builder | provenance | MaD:36 |
+| Test.java:70:10:70:11 | in : Builder | Test.java:70:10:70:27 | authority(...) : Builder | provenance | MaD:8 |
 | Test.java:70:10:70:27 | authority(...) : Builder | Test.java:71:9:71:11 | out | provenance |  |
 | Test.java:76:16:76:31 | (...)... : String | Test.java:77:18:77:19 | in : String | provenance |  |
 | Test.java:76:24:76:31 | source(...) : Object | Test.java:76:16:76:31 | (...)... : String | provenance |  |
 | Test.java:77:4:77:6 | out [post update] : Builder | Test.java:78:9:78:11 | out | provenance |  |
-| Test.java:77:18:77:19 | in : String | Test.java:77:4:77:6 | out [post update] : Builder | provenance | MaD:37 |
+| Test.java:77:18:77:19 | in : String | Test.java:77:4:77:6 | out [post update] : Builder | provenance | MaD:7 |
 | Test.java:83:21:83:41 | (...)... : Builder | Test.java:84:10:84:11 | in : Builder | provenance |  |
 | Test.java:83:34:83:41 | source(...) : Object | Test.java:83:21:83:41 | (...)... : Builder | provenance |  |
-| Test.java:84:10:84:11 | in : Builder | Test.java:84:10:84:19 | build(...) : Uri | provenance | MaD:38 |
+| Test.java:84:10:84:11 | in : Builder | Test.java:84:10:84:19 | build(...) : Uri | provenance | MaD:9 |
 | Test.java:84:10:84:19 | build(...) : Uri | Test.java:85:9:85:11 | out | provenance |  |
 | Test.java:90:21:90:41 | (...)... : Builder | Test.java:91:10:91:11 | in : Builder | provenance |  |
 | Test.java:90:34:90:41 | source(...) : Object | Test.java:90:21:90:41 | (...)... : Builder | provenance |  |
-| Test.java:91:10:91:11 | in : Builder | Test.java:91:10:91:24 | clearQuery(...) : Builder | provenance | MaD:39 |
+| Test.java:91:10:91:11 | in : Builder | Test.java:91:10:91:24 | clearQuery(...) : Builder | provenance | MaD:10 |
 | Test.java:91:10:91:24 | clearQuery(...) : Builder | Test.java:92:9:92:11 | out | provenance |  |
 | Test.java:97:21:97:41 | (...)... : Builder | Test.java:98:10:98:11 | in : Builder | provenance |  |
 | Test.java:97:34:97:41 | source(...) : Object | Test.java:97:21:97:41 | (...)... : Builder | provenance |  |
-| Test.java:98:10:98:11 | in : Builder | Test.java:98:10:98:34 | encodedAuthority(...) : Builder | provenance | MaD:40 |
+| Test.java:98:10:98:11 | in : Builder | Test.java:98:10:98:34 | encodedAuthority(...) : Builder | provenance | MaD:12 |
 | Test.java:98:10:98:34 | encodedAuthority(...) : Builder | Test.java:99:9:99:11 | out | provenance |  |
 | Test.java:104:16:104:31 | (...)... : String | Test.java:105:25:105:26 | in : String | provenance |  |
 | Test.java:104:24:104:31 | source(...) : Object | Test.java:104:16:104:31 | (...)... : String | provenance |  |
 | Test.java:105:4:105:6 | out [post update] : Builder | Test.java:106:9:106:11 | out | provenance |  |
-| Test.java:105:25:105:26 | in : String | Test.java:105:4:105:6 | out [post update] : Builder | provenance | MaD:41 |
+| Test.java:105:25:105:26 | in : String | Test.java:105:4:105:6 | out [post update] : Builder | provenance | MaD:11 |
 | Test.java:111:21:111:41 | (...)... : Builder | Test.java:112:10:112:11 | in : Builder | provenance |  |
 | Test.java:111:34:111:41 | source(...) : Object | Test.java:111:21:111:41 | (...)... : Builder | provenance |  |
-| Test.java:112:10:112:11 | in : Builder | Test.java:112:10:112:33 | encodedFragment(...) : Builder | provenance | MaD:42 |
+| Test.java:112:10:112:11 | in : Builder | Test.java:112:10:112:33 | encodedFragment(...) : Builder | provenance | MaD:14 |
 | Test.java:112:10:112:33 | encodedFragment(...) : Builder | Test.java:113:9:113:11 | out | provenance |  |
 | Test.java:118:16:118:31 | (...)... : String | Test.java:119:24:119:25 | in : String | provenance |  |
 | Test.java:118:24:118:31 | source(...) : Object | Test.java:118:16:118:31 | (...)... : String | provenance |  |
 | Test.java:119:4:119:6 | out [post update] : Builder | Test.java:120:9:120:11 | out | provenance |  |
-| Test.java:119:24:119:25 | in : String | Test.java:119:4:119:6 | out [post update] : Builder | provenance | MaD:43 |
+| Test.java:119:24:119:25 | in : String | Test.java:119:4:119:6 | out [post update] : Builder | provenance | MaD:13 |
 | Test.java:125:21:125:41 | (...)... : Builder | Test.java:126:10:126:11 | in : Builder | provenance |  |
 | Test.java:125:34:125:41 | source(...) : Object | Test.java:125:21:125:41 | (...)... : Builder | provenance |  |
-| Test.java:126:10:126:11 | in : Builder | Test.java:126:10:126:35 | encodedOpaquePart(...) : Builder | provenance | MaD:44 |
+| Test.java:126:10:126:11 | in : Builder | Test.java:126:10:126:35 | encodedOpaquePart(...) : Builder | provenance | MaD:16 |
 | Test.java:126:10:126:35 | encodedOpaquePart(...) : Builder | Test.java:127:9:127:11 | out | provenance |  |
 | Test.java:132:16:132:31 | (...)... : String | Test.java:133:26:133:27 | in : String | provenance |  |
 | Test.java:132:24:132:31 | source(...) : Object | Test.java:132:16:132:31 | (...)... : String | provenance |  |
 | Test.java:133:4:133:6 | out [post update] : Builder | Test.java:134:9:134:11 | out | provenance |  |
-| Test.java:133:26:133:27 | in : String | Test.java:133:4:133:6 | out [post update] : Builder | provenance | MaD:45 |
+| Test.java:133:26:133:27 | in : String | Test.java:133:4:133:6 | out [post update] : Builder | provenance | MaD:15 |
 | Test.java:139:21:139:41 | (...)... : Builder | Test.java:140:10:140:11 | in : Builder | provenance |  |
 | Test.java:139:34:139:41 | source(...) : Object | Test.java:139:21:139:41 | (...)... : Builder | provenance |  |
-| Test.java:140:10:140:11 | in : Builder | Test.java:140:10:140:29 | encodedPath(...) : Builder | provenance | MaD:46 |
+| Test.java:140:10:140:11 | in : Builder | Test.java:140:10:140:29 | encodedPath(...) : Builder | provenance | MaD:18 |
 | Test.java:140:10:140:29 | encodedPath(...) : Builder | Test.java:141:9:141:11 | out | provenance |  |
 | Test.java:146:16:146:31 | (...)... : String | Test.java:147:20:147:21 | in : String | provenance |  |
 | Test.java:146:24:146:31 | source(...) : Object | Test.java:146:16:146:31 | (...)... : String | provenance |  |
 | Test.java:147:4:147:6 | out [post update] : Builder | Test.java:148:9:148:11 | out | provenance |  |
-| Test.java:147:20:147:21 | in : String | Test.java:147:4:147:6 | out [post update] : Builder | provenance | MaD:47 |
+| Test.java:147:20:147:21 | in : String | Test.java:147:4:147:6 | out [post update] : Builder | provenance | MaD:17 |
 | Test.java:153:21:153:41 | (...)... : Builder | Test.java:154:10:154:11 | in : Builder | provenance |  |
 | Test.java:153:34:153:41 | source(...) : Object | Test.java:153:21:153:41 | (...)... : Builder | provenance |  |
-| Test.java:154:10:154:11 | in : Builder | Test.java:154:10:154:30 | encodedQuery(...) : Builder | provenance | MaD:48 |
+| Test.java:154:10:154:11 | in : Builder | Test.java:154:10:154:30 | encodedQuery(...) : Builder | provenance | MaD:20 |
 | Test.java:154:10:154:30 | encodedQuery(...) : Builder | Test.java:155:9:155:11 | out | provenance |  |
 | Test.java:160:16:160:31 | (...)... : String | Test.java:161:21:161:22 | in : String | provenance |  |
 | Test.java:160:24:160:31 | source(...) : Object | Test.java:160:16:160:31 | (...)... : String | provenance |  |
 | Test.java:161:4:161:6 | out [post update] : Builder | Test.java:162:9:162:11 | out | provenance |  |
-| Test.java:161:21:161:22 | in : String | Test.java:161:4:161:6 | out [post update] : Builder | provenance | MaD:49 |
+| Test.java:161:21:161:22 | in : String | Test.java:161:4:161:6 | out [post update] : Builder | provenance | MaD:19 |
 | Test.java:167:21:167:41 | (...)... : Builder | Test.java:168:10:168:11 | in : Builder | provenance |  |
 | Test.java:167:34:167:41 | source(...) : Object | Test.java:167:21:167:41 | (...)... : Builder | provenance |  |
-| Test.java:168:10:168:11 | in : Builder | Test.java:168:10:168:26 | fragment(...) : Builder | provenance | MaD:50 |
+| Test.java:168:10:168:11 | in : Builder | Test.java:168:10:168:26 | fragment(...) : Builder | provenance | MaD:22 |
 | Test.java:168:10:168:26 | fragment(...) : Builder | Test.java:169:9:169:11 | out | provenance |  |
 | Test.java:174:16:174:31 | (...)... : String | Test.java:175:17:175:18 | in : String | provenance |  |
 | Test.java:174:24:174:31 | source(...) : Object | Test.java:174:16:174:31 | (...)... : String | provenance |  |
 | Test.java:175:4:175:6 | out [post update] : Builder | Test.java:176:9:176:11 | out | provenance |  |
-| Test.java:175:17:175:18 | in : String | Test.java:175:4:175:6 | out [post update] : Builder | provenance | MaD:51 |
+| Test.java:175:17:175:18 | in : String | Test.java:175:4:175:6 | out [post update] : Builder | provenance | MaD:21 |
 | Test.java:181:21:181:41 | (...)... : Builder | Test.java:182:10:182:11 | in : Builder | provenance |  |
 | Test.java:181:34:181:41 | source(...) : Object | Test.java:181:21:181:41 | (...)... : Builder | provenance |  |
-| Test.java:182:10:182:11 | in : Builder | Test.java:182:10:182:28 | opaquePart(...) : Builder | provenance | MaD:52 |
+| Test.java:182:10:182:11 | in : Builder | Test.java:182:10:182:28 | opaquePart(...) : Builder | provenance | MaD:24 |
 | Test.java:182:10:182:28 | opaquePart(...) : Builder | Test.java:183:9:183:11 | out | provenance |  |
 | Test.java:188:16:188:31 | (...)... : String | Test.java:189:19:189:20 | in : String | provenance |  |
 | Test.java:188:24:188:31 | source(...) : Object | Test.java:188:16:188:31 | (...)... : String | provenance |  |
 | Test.java:189:4:189:6 | out [post update] : Builder | Test.java:190:9:190:11 | out | provenance |  |
-| Test.java:189:19:189:20 | in : String | Test.java:189:4:189:6 | out [post update] : Builder | provenance | MaD:53 |
+| Test.java:189:19:189:20 | in : String | Test.java:189:4:189:6 | out [post update] : Builder | provenance | MaD:23 |
 | Test.java:195:21:195:41 | (...)... : Builder | Test.java:196:10:196:11 | in : Builder | provenance |  |
 | Test.java:195:34:195:41 | source(...) : Object | Test.java:195:21:195:41 | (...)... : Builder | provenance |  |
-| Test.java:196:10:196:11 | in : Builder | Test.java:196:10:196:22 | path(...) : Builder | provenance | MaD:54 |
+| Test.java:196:10:196:11 | in : Builder | Test.java:196:10:196:22 | path(...) : Builder | provenance | MaD:26 |
 | Test.java:196:10:196:22 | path(...) : Builder | Test.java:197:9:197:11 | out | provenance |  |
 | Test.java:202:16:202:31 | (...)... : String | Test.java:203:13:203:14 | in : String | provenance |  |
 | Test.java:202:24:202:31 | source(...) : Object | Test.java:202:16:202:31 | (...)... : String | provenance |  |
 | Test.java:203:4:203:6 | out [post update] : Builder | Test.java:204:9:204:11 | out | provenance |  |
-| Test.java:203:13:203:14 | in : String | Test.java:203:4:203:6 | out [post update] : Builder | provenance | MaD:55 |
+| Test.java:203:13:203:14 | in : String | Test.java:203:4:203:6 | out [post update] : Builder | provenance | MaD:25 |
 | Test.java:209:21:209:41 | (...)... : Builder | Test.java:210:10:210:11 | in : Builder | provenance |  |
 | Test.java:209:34:209:41 | source(...) : Object | Test.java:209:21:209:41 | (...)... : Builder | provenance |  |
-| Test.java:210:10:210:11 | in : Builder | Test.java:210:10:210:23 | query(...) : Builder | provenance | MaD:56 |
+| Test.java:210:10:210:11 | in : Builder | Test.java:210:10:210:23 | query(...) : Builder | provenance | MaD:28 |
 | Test.java:210:10:210:23 | query(...) : Builder | Test.java:211:9:211:11 | out | provenance |  |
 | Test.java:216:16:216:31 | (...)... : String | Test.java:217:14:217:15 | in : String | provenance |  |
 | Test.java:216:24:216:31 | source(...) : Object | Test.java:216:16:216:31 | (...)... : String | provenance |  |
 | Test.java:217:4:217:6 | out [post update] : Builder | Test.java:218:9:218:11 | out | provenance |  |
-| Test.java:217:14:217:15 | in : String | Test.java:217:4:217:6 | out [post update] : Builder | provenance | MaD:57 |
+| Test.java:217:14:217:15 | in : String | Test.java:217:4:217:6 | out [post update] : Builder | provenance | MaD:27 |
 | Test.java:223:21:223:41 | (...)... : Builder | Test.java:224:10:224:11 | in : Builder | provenance |  |
 | Test.java:223:34:223:41 | source(...) : Object | Test.java:223:21:223:41 | (...)... : Builder | provenance |  |
-| Test.java:224:10:224:11 | in : Builder | Test.java:224:10:224:24 | scheme(...) : Builder | provenance | MaD:58 |
+| Test.java:224:10:224:11 | in : Builder | Test.java:224:10:224:24 | scheme(...) : Builder | provenance | MaD:30 |
 | Test.java:224:10:224:24 | scheme(...) : Builder | Test.java:225:9:225:11 | out | provenance |  |
 | Test.java:230:16:230:31 | (...)... : String | Test.java:231:15:231:16 | in : String | provenance |  |
 | Test.java:230:24:230:31 | source(...) : Object | Test.java:230:16:230:31 | (...)... : String | provenance |  |
 | Test.java:231:4:231:6 | out [post update] : Builder | Test.java:232:9:232:11 | out | provenance |  |
-| Test.java:231:15:231:16 | in : String | Test.java:231:4:231:6 | out [post update] : Builder | provenance | MaD:59 |
+| Test.java:231:15:231:16 | in : String | Test.java:231:4:231:6 | out [post update] : Builder | provenance | MaD:29 |
 | Test.java:237:21:237:41 | (...)... : Builder | Test.java:238:10:238:11 | in : Builder | provenance |  |
 | Test.java:237:34:237:41 | source(...) : Object | Test.java:237:21:237:41 | (...)... : Builder | provenance |  |
-| Test.java:238:10:238:11 | in : Builder | Test.java:238:10:238:22 | toString(...) : String | provenance | MaD:60 |
+| Test.java:238:10:238:11 | in : Builder | Test.java:238:10:238:22 | toString(...) : String | provenance | MaD:31 |
 | Test.java:238:10:238:22 | toString(...) : String | Test.java:239:9:239:11 | out | provenance |  |
 | Test.java:244:16:244:31 | (...)... : String | Test.java:245:21:245:22 | in : String | provenance |  |
 | Test.java:244:24:244:31 | source(...) : Object | Test.java:244:16:244:31 | (...)... : String | provenance |  |
 | Test.java:245:10:245:23 | decode(...) : String | Test.java:246:9:246:11 | out | provenance |  |
-| Test.java:245:21:245:22 | in : String | Test.java:245:10:245:23 | decode(...) : String | provenance | MaD:2 |
+| Test.java:245:21:245:22 | in : String | Test.java:245:10:245:23 | decode(...) : String | provenance | MaD:32 |
 | Test.java:251:16:251:31 | (...)... : String | Test.java:252:21:252:22 | in : String | provenance |  |
 | Test.java:251:24:251:31 | source(...) : Object | Test.java:251:16:251:31 | (...)... : String | provenance |  |
 | Test.java:252:10:252:29 | encode(...) : String | Test.java:253:9:253:11 | out | provenance |  |
-| Test.java:252:21:252:22 | in : String | Test.java:252:10:252:29 | encode(...) : String | provenance | MaD:3 |
+| Test.java:252:21:252:22 | in : String | Test.java:252:10:252:29 | encode(...) : String | provenance | MaD:33 |
 | Test.java:258:16:258:31 | (...)... : String | Test.java:259:21:259:22 | in : String | provenance |  |
 | Test.java:258:24:258:31 | source(...) : Object | Test.java:258:16:258:31 | (...)... : String | provenance |  |
 | Test.java:259:10:259:23 | encode(...) : String | Test.java:260:9:260:11 | out | provenance |  |
-| Test.java:259:21:259:22 | in : String | Test.java:259:10:259:23 | encode(...) : String | provenance | MaD:3 |
+| Test.java:259:21:259:22 | in : String | Test.java:259:10:259:23 | encode(...) : String | provenance | MaD:33 |
 | Test.java:265:14:265:27 | (...)... : File | Test.java:266:23:266:24 | in : File | provenance |  |
 | Test.java:265:20:265:27 | source(...) : Object | Test.java:265:14:265:27 | (...)... : File | provenance |  |
 | Test.java:266:10:266:25 | fromFile(...) : Uri | Test.java:267:9:267:11 | out | provenance |  |
-| Test.java:266:23:266:24 | in : File | Test.java:266:10:266:25 | fromFile(...) : Uri | provenance | MaD:4 |
+| Test.java:266:23:266:24 | in : File | Test.java:266:10:266:25 | fromFile(...) : Uri | provenance | MaD:34 |
 | Test.java:272:16:272:31 | (...)... : String | Test.java:273:36:273:37 | in : String | provenance |  |
 | Test.java:272:24:272:31 | source(...) : Object | Test.java:272:16:272:31 | (...)... : String | provenance |  |
 | Test.java:273:10:273:38 | fromParts(...) : Uri | Test.java:274:9:274:11 | out | provenance |  |
-| Test.java:273:36:273:37 | in : String | Test.java:273:10:273:38 | fromParts(...) : Uri | provenance | MaD:5 |
+| Test.java:273:36:273:37 | in : String | Test.java:273:10:273:38 | fromParts(...) : Uri | provenance | MaD:35 |
 | Test.java:279:16:279:31 | (...)... : String | Test.java:280:30:280:31 | in : String | provenance |  |
 | Test.java:279:24:279:31 | source(...) : Object | Test.java:279:16:279:31 | (...)... : String | provenance |  |
 | Test.java:280:10:280:38 | fromParts(...) : Uri | Test.java:281:9:281:11 | out | provenance |  |
-| Test.java:280:30:280:31 | in : String | Test.java:280:10:280:38 | fromParts(...) : Uri | provenance | MaD:5 |
+| Test.java:280:30:280:31 | in : String | Test.java:280:10:280:38 | fromParts(...) : Uri | provenance | MaD:35 |
 | Test.java:286:16:286:31 | (...)... : String | Test.java:287:24:287:25 | in : String | provenance |  |
 | Test.java:286:24:286:31 | source(...) : Object | Test.java:286:16:286:31 | (...)... : String | provenance |  |
 | Test.java:287:10:287:38 | fromParts(...) : Uri | Test.java:288:9:288:11 | out | provenance |  |
-| Test.java:287:24:287:25 | in : String | Test.java:287:10:287:38 | fromParts(...) : Uri | provenance | MaD:5 |
+| Test.java:287:24:287:25 | in : String | Test.java:287:10:287:38 | fromParts(...) : Uri | provenance | MaD:35 |
 | Test.java:293:16:293:31 | (...)... : String | Test.java:294:20:294:21 | in : String | provenance |  |
 | Test.java:293:24:293:31 | source(...) : Object | Test.java:293:16:293:31 | (...)... : String | provenance |  |
 | Test.java:294:10:294:22 | parse(...) : Uri | Test.java:295:9:295:11 | out | provenance |  |
-| Test.java:294:20:294:21 | in : String | Test.java:294:10:294:22 | parse(...) : Uri | provenance | MaD:26 |
+| Test.java:294:20:294:21 | in : String | Test.java:294:10:294:22 | parse(...) : Uri | provenance | MaD:36 |
 | Test.java:300:13:300:25 | (...)... : Uri | Test.java:301:31:301:32 | in : Uri | provenance |  |
 | Test.java:300:18:300:25 | source(...) : Object | Test.java:300:13:300:25 | (...)... : Uri | provenance |  |
 | Test.java:301:10:301:39 | withAppendedPath(...) : Uri | Test.java:302:9:302:11 | out | provenance |  |
-| Test.java:301:31:301:32 | in : Uri | Test.java:301:10:301:39 | withAppendedPath(...) : Uri | provenance | MaD:28 |
+| Test.java:301:31:301:32 | in : Uri | Test.java:301:10:301:39 | withAppendedPath(...) : Uri | provenance | MaD:37 |
 | Test.java:307:16:307:31 | (...)... : String | Test.java:308:37:308:38 | in : String | provenance |  |
 | Test.java:307:24:307:31 | source(...) : Object | Test.java:307:16:307:31 | (...)... : String | provenance |  |
 | Test.java:308:10:308:39 | withAppendedPath(...) : Uri | Test.java:309:9:309:11 | out | provenance |  |
-| Test.java:308:37:308:38 | in : String | Test.java:308:10:308:39 | withAppendedPath(...) : Uri | provenance | MaD:28 |
+| Test.java:308:37:308:38 | in : String | Test.java:308:10:308:39 | withAppendedPath(...) : Uri | provenance | MaD:37 |
 | Test.java:314:13:314:25 | (...)... : Uri | Test.java:315:27:315:28 | in : Uri | provenance |  |
 | Test.java:314:18:314:25 | source(...) : Object | Test.java:314:13:314:25 | (...)... : Uri | provenance |  |
 | Test.java:315:22:315:24 | out [post update] : Parcel | Test.java:316:9:316:11 | out | provenance |  |
-| Test.java:315:27:315:28 | in : Uri | Test.java:315:22:315:24 | out [post update] : Parcel | provenance | MaD:29 |
+| Test.java:315:27:315:28 | in : Uri | Test.java:315:22:315:24 | out [post update] : Parcel | provenance | MaD:38 |
 | Test.java:321:13:321:25 | (...)... : Uri | Test.java:322:10:322:11 | in : Uri | provenance |  |
 | Test.java:321:18:321:25 | source(...) : Object | Test.java:321:13:321:25 | (...)... : Uri | provenance |  |
-| Test.java:322:10:322:11 | in : Uri | Test.java:322:10:322:23 | buildUpon(...) : Builder | provenance | MaD:1 |
+| Test.java:322:10:322:11 | in : Uri | Test.java:322:10:322:23 | buildUpon(...) : Builder | provenance | MaD:39 |
 | Test.java:322:10:322:23 | buildUpon(...) : Builder | Test.java:323:9:323:11 | out | provenance |  |
 | Test.java:328:13:328:25 | (...)... : Uri | Test.java:329:10:329:11 | in : Uri | provenance |  |
 | Test.java:328:18:328:25 | source(...) : Object | Test.java:328:13:328:25 | (...)... : Uri | provenance |  |
-| Test.java:329:10:329:11 | in : Uri | Test.java:329:10:329:26 | getAuthority(...) : String | provenance | MaD:6 |
+| Test.java:329:10:329:11 | in : Uri | Test.java:329:10:329:26 | getAuthority(...) : String | provenance | MaD:40 |
 | Test.java:329:10:329:26 | getAuthority(...) : String | Test.java:330:9:330:11 | out | provenance |  |
 | Test.java:335:13:335:25 | (...)... : Uri | Test.java:336:10:336:11 | in : Uri | provenance |  |
 | Test.java:335:18:335:25 | source(...) : Object | Test.java:335:13:335:25 | (...)... : Uri | provenance |  |
-| Test.java:336:10:336:11 | in : Uri | Test.java:336:10:336:33 | getEncodedAuthority(...) : String | provenance | MaD:7 |
+| Test.java:336:10:336:11 | in : Uri | Test.java:336:10:336:33 | getEncodedAuthority(...) : String | provenance | MaD:41 |
 | Test.java:336:10:336:33 | getEncodedAuthority(...) : String | Test.java:337:9:337:11 | out | provenance |  |
 | Test.java:342:13:342:25 | (...)... : Uri | Test.java:343:10:343:11 | in : Uri | provenance |  |
 | Test.java:342:18:342:25 | source(...) : Object | Test.java:342:13:342:25 | (...)... : Uri | provenance |  |
-| Test.java:343:10:343:11 | in : Uri | Test.java:343:10:343:32 | getEncodedFragment(...) : String | provenance | MaD:8 |
+| Test.java:343:10:343:11 | in : Uri | Test.java:343:10:343:32 | getEncodedFragment(...) : String | provenance | MaD:42 |
 | Test.java:343:10:343:32 | getEncodedFragment(...) : String | Test.java:344:9:344:11 | out | provenance |  |
 | Test.java:349:13:349:25 | (...)... : Uri | Test.java:350:10:350:11 | in : Uri | provenance |  |
 | Test.java:349:18:349:25 | source(...) : Object | Test.java:349:13:349:25 | (...)... : Uri | provenance |  |
-| Test.java:350:10:350:11 | in : Uri | Test.java:350:10:350:28 | getEncodedPath(...) : String | provenance | MaD:9 |
+| Test.java:350:10:350:11 | in : Uri | Test.java:350:10:350:28 | getEncodedPath(...) : String | provenance | MaD:43 |
 | Test.java:350:10:350:28 | getEncodedPath(...) : String | Test.java:351:9:351:11 | out | provenance |  |
 | Test.java:356:13:356:25 | (...)... : Uri | Test.java:357:10:357:11 | in : Uri | provenance |  |
 | Test.java:356:18:356:25 | source(...) : Object | Test.java:356:13:356:25 | (...)... : Uri | provenance |  |
-| Test.java:357:10:357:11 | in : Uri | Test.java:357:10:357:29 | getEncodedQuery(...) : String | provenance | MaD:10 |
+| Test.java:357:10:357:11 | in : Uri | Test.java:357:10:357:29 | getEncodedQuery(...) : String | provenance | MaD:44 |
 | Test.java:357:10:357:29 | getEncodedQuery(...) : String | Test.java:358:9:358:11 | out | provenance |  |
 | Test.java:363:13:363:25 | (...)... : Uri | Test.java:364:10:364:11 | in : Uri | provenance |  |
 | Test.java:363:18:363:25 | source(...) : Object | Test.java:363:13:363:25 | (...)... : Uri | provenance |  |
-| Test.java:364:10:364:11 | in : Uri | Test.java:364:10:364:42 | getEncodedSchemeSpecificPart(...) : String | provenance | MaD:11 |
+| Test.java:364:10:364:11 | in : Uri | Test.java:364:10:364:42 | getEncodedSchemeSpecificPart(...) : String | provenance | MaD:45 |
 | Test.java:364:10:364:42 | getEncodedSchemeSpecificPart(...) : String | Test.java:365:9:365:11 | out | provenance |  |
 | Test.java:370:13:370:25 | (...)... : Uri | Test.java:371:10:371:11 | in : Uri | provenance |  |
 | Test.java:370:18:370:25 | source(...) : Object | Test.java:370:13:370:25 | (...)... : Uri | provenance |  |
-| Test.java:371:10:371:11 | in : Uri | Test.java:371:10:371:32 | getEncodedUserInfo(...) : String | provenance | MaD:12 |
+| Test.java:371:10:371:11 | in : Uri | Test.java:371:10:371:32 | getEncodedUserInfo(...) : String | provenance | MaD:46 |
 | Test.java:371:10:371:32 | getEncodedUserInfo(...) : String | Test.java:372:9:372:11 | out | provenance |  |
 | Test.java:377:13:377:25 | (...)... : Uri | Test.java:378:10:378:11 | in : Uri | provenance |  |
 | Test.java:377:18:377:25 | source(...) : Object | Test.java:377:13:377:25 | (...)... : Uri | provenance |  |
-| Test.java:378:10:378:11 | in : Uri | Test.java:378:10:378:25 | getFragment(...) : String | provenance | MaD:13 |
+| Test.java:378:10:378:11 | in : Uri | Test.java:378:10:378:25 | getFragment(...) : String | provenance | MaD:47 |
 | Test.java:378:10:378:25 | getFragment(...) : String | Test.java:379:9:379:11 | out | provenance |  |
 | Test.java:384:13:384:25 | (...)... : Uri | Test.java:385:10:385:11 | in : Uri | provenance |  |
 | Test.java:384:18:384:25 | source(...) : Object | Test.java:384:13:384:25 | (...)... : Uri | provenance |  |
-| Test.java:385:10:385:11 | in : Uri | Test.java:385:10:385:21 | getHost(...) : String | provenance | MaD:14 |
+| Test.java:385:10:385:11 | in : Uri | Test.java:385:10:385:21 | getHost(...) : String | provenance | MaD:48 |
 | Test.java:385:10:385:21 | getHost(...) : String | Test.java:386:9:386:11 | out | provenance |  |
 | Test.java:391:13:391:25 | (...)... : Uri | Test.java:392:10:392:11 | in : Uri | provenance |  |
 | Test.java:391:18:391:25 | source(...) : Object | Test.java:391:13:391:25 | (...)... : Uri | provenance |  |
-| Test.java:392:10:392:11 | in : Uri | Test.java:392:10:392:32 | getLastPathSegment(...) : String | provenance | MaD:15 |
+| Test.java:392:10:392:11 | in : Uri | Test.java:392:10:392:32 | getLastPathSegment(...) : String | provenance | MaD:49 |
 | Test.java:392:10:392:32 | getLastPathSegment(...) : String | Test.java:393:9:393:11 | out | provenance |  |
 | Test.java:398:13:398:25 | (...)... : Uri | Test.java:399:10:399:11 | in : Uri | provenance |  |
 | Test.java:398:18:398:25 | source(...) : Object | Test.java:398:13:398:25 | (...)... : Uri | provenance |  |
-| Test.java:399:10:399:11 | in : Uri | Test.java:399:10:399:21 | getPath(...) : String | provenance | MaD:16 |
+| Test.java:399:10:399:11 | in : Uri | Test.java:399:10:399:21 | getPath(...) : String | provenance | MaD:50 |
 | Test.java:399:10:399:21 | getPath(...) : String | Test.java:400:9:400:11 | out | provenance |  |
 | Test.java:405:13:405:25 | (...)... : Uri | Test.java:406:10:406:11 | in : Uri | provenance |  |
 | Test.java:405:18:405:25 | source(...) : Object | Test.java:405:13:405:25 | (...)... : Uri | provenance |  |
-| Test.java:406:10:406:11 | in : Uri | Test.java:406:10:406:29 | getPathSegments(...) : List | provenance | MaD:17 |
+| Test.java:406:10:406:11 | in : Uri | Test.java:406:10:406:29 | getPathSegments(...) : List | provenance | MaD:51 |
 | Test.java:406:10:406:29 | getPathSegments(...) : List | Test.java:407:9:407:11 | out | provenance |  |
 | Test.java:412:13:412:25 | (...)... : Uri | Test.java:413:10:413:11 | in : Uri | provenance |  |
 | Test.java:412:18:412:25 | source(...) : Object | Test.java:412:13:412:25 | (...)... : Uri | provenance |  |
-| Test.java:413:10:413:11 | in : Uri | Test.java:413:10:413:22 | getQuery(...) : String | provenance | MaD:18 |
+| Test.java:413:10:413:11 | in : Uri | Test.java:413:10:413:22 | getQuery(...) : String | provenance | MaD:52 |
 | Test.java:413:10:413:22 | getQuery(...) : String | Test.java:414:9:414:11 | out | provenance |  |
 | Test.java:419:13:419:25 | (...)... : Uri | Test.java:420:10:420:11 | in : Uri | provenance |  |
 | Test.java:419:18:419:25 | source(...) : Object | Test.java:419:13:419:25 | (...)... : Uri | provenance |  |
-| Test.java:420:10:420:11 | in : Uri | Test.java:420:10:420:35 | getQueryParameter(...) : String | provenance | MaD:19 |
+| Test.java:420:10:420:11 | in : Uri | Test.java:420:10:420:35 | getQueryParameter(...) : String | provenance | MaD:53 |
 | Test.java:420:10:420:35 | getQueryParameter(...) : String | Test.java:421:9:421:11 | out | provenance |  |
 | Test.java:426:13:426:25 | (...)... : Uri | Test.java:427:10:427:11 | in : Uri | provenance |  |
 | Test.java:426:18:426:25 | source(...) : Object | Test.java:426:13:426:25 | (...)... : Uri | provenance |  |
-| Test.java:427:10:427:11 | in : Uri | Test.java:427:10:427:36 | getQueryParameterNames(...) : Set | provenance | MaD:20 |
+| Test.java:427:10:427:11 | in : Uri | Test.java:427:10:427:36 | getQueryParameterNames(...) : Set | provenance | MaD:54 |
 | Test.java:427:10:427:36 | getQueryParameterNames(...) : Set | Test.java:428:9:428:11 | out | provenance |  |
 | Test.java:433:13:433:25 | (...)... : Uri | Test.java:434:10:434:11 | in : Uri | provenance |  |
 | Test.java:433:18:433:25 | source(...) : Object | Test.java:433:13:433:25 | (...)... : Uri | provenance |  |
-| Test.java:434:10:434:11 | in : Uri | Test.java:434:10:434:36 | getQueryParameters(...) : List | provenance | MaD:21 |
+| Test.java:434:10:434:11 | in : Uri | Test.java:434:10:434:36 | getQueryParameters(...) : List | provenance | MaD:55 |
 | Test.java:434:10:434:36 | getQueryParameters(...) : List | Test.java:435:9:435:11 | out | provenance |  |
 | Test.java:440:13:440:25 | (...)... : Uri | Test.java:441:10:441:11 | in : Uri | provenance |  |
 | Test.java:440:18:440:25 | source(...) : Object | Test.java:440:13:440:25 | (...)... : Uri | provenance |  |
-| Test.java:441:10:441:11 | in : Uri | Test.java:441:10:441:23 | getScheme(...) : String | provenance | MaD:22 |
+| Test.java:441:10:441:11 | in : Uri | Test.java:441:10:441:23 | getScheme(...) : String | provenance | MaD:56 |
 | Test.java:441:10:441:23 | getScheme(...) : String | Test.java:442:9:442:11 | out | provenance |  |
 | Test.java:447:13:447:25 | (...)... : Uri | Test.java:448:10:448:11 | in : Uri | provenance |  |
 | Test.java:447:18:447:25 | source(...) : Object | Test.java:447:13:447:25 | (...)... : Uri | provenance |  |
-| Test.java:448:10:448:11 | in : Uri | Test.java:448:10:448:35 | getSchemeSpecificPart(...) : String | provenance | MaD:23 |
+| Test.java:448:10:448:11 | in : Uri | Test.java:448:10:448:35 | getSchemeSpecificPart(...) : String | provenance | MaD:57 |
 | Test.java:448:10:448:35 | getSchemeSpecificPart(...) : String | Test.java:449:9:449:11 | out | provenance |  |
 | Test.java:454:13:454:25 | (...)... : Uri | Test.java:455:10:455:11 | in : Uri | provenance |  |
 | Test.java:454:18:454:25 | source(...) : Object | Test.java:454:13:454:25 | (...)... : Uri | provenance |  |
-| Test.java:455:10:455:11 | in : Uri | Test.java:455:10:455:25 | getUserInfo(...) : String | provenance | MaD:24 |
+| Test.java:455:10:455:11 | in : Uri | Test.java:455:10:455:25 | getUserInfo(...) : String | provenance | MaD:58 |
 | Test.java:455:10:455:25 | getUserInfo(...) : String | Test.java:456:9:456:11 | out | provenance |  |
 | Test.java:461:13:461:25 | (...)... : Uri | Test.java:462:10:462:11 | in : Uri | provenance |  |
 | Test.java:461:18:461:25 | source(...) : Object | Test.java:461:13:461:25 | (...)... : Uri | provenance |  |
-| Test.java:462:10:462:11 | in : Uri | Test.java:462:10:462:29 | normalizeScheme(...) : Uri | provenance | MaD:25 |
+| Test.java:462:10:462:11 | in : Uri | Test.java:462:10:462:29 | normalizeScheme(...) : Uri | provenance | MaD:59 |
 | Test.java:462:10:462:29 | normalizeScheme(...) : Uri | Test.java:463:9:463:11 | out | provenance |  |
 | Test.java:468:13:468:25 | (...)... : Uri | Test.java:469:10:469:11 | in : Uri | provenance |  |
 | Test.java:468:18:468:25 | source(...) : Object | Test.java:468:13:468:25 | (...)... : Uri | provenance |  |
-| Test.java:469:10:469:11 | in : Uri | Test.java:469:10:469:22 | toString(...) : String | provenance | MaD:27 |
+| Test.java:469:10:469:11 | in : Uri | Test.java:469:10:469:22 | toString(...) : String | provenance | MaD:60 |
 | Test.java:469:10:469:22 | toString(...) : String | Test.java:470:9:470:11 | out | provenance |  |
 nodes
 | Test.java:20:21:20:41 | (...)... : Builder | semmle.label | (...)... : Builder |
diff --git a/java/ql/test/library-tests/frameworks/apache-collections/test.expected b/java/ql/test/library-tests/frameworks/apache-collections/test.expected
index 96a0a4853c3..a75de01c612 100644
--- a/java/ql/test/library-tests/frameworks/apache-collections/test.expected
+++ b/java/ql/test/library-tests/frameworks/apache-collections/test.expected
@@ -1,826 +1,826 @@
 models
-| 1 | Summary: java.lang; Iterable; true; iterator; (); ; Argument[this].Element; ReturnValue.Element; value; manual |
-| 2 | Summary: java.util; Collection; true; add; ; ; Argument[0]; Argument[this].Element; value; manual |
-| 3 | Summary: java.util; Enumeration; true; nextElement; ; ; Argument[this].Element; ReturnValue; value; manual |
-| 4 | Summary: java.util; Iterator; true; next; ; ; Argument[this].Element; ReturnValue; value; manual |
-| 5 | Summary: java.util; List; true; listIterator; ; ; Argument[this].Element; ReturnValue.Element; value; manual |
-| 6 | Summary: java.util; List; false; of; (Object); ; Argument[0]; ReturnValue.Element; value; manual |
-| 7 | Summary: java.util; Map; true; entrySet; ; ; Argument[this].MapKey; ReturnValue.Element.MapKey; value; manual |
-| 8 | Summary: java.util; Map; true; entrySet; ; ; Argument[this].MapValue; ReturnValue.Element.MapValue; value; manual |
-| 9 | Summary: java.util; Map; true; get; ; ; Argument[this].MapValue; ReturnValue; value; manual |
-| 10 | Summary: java.util; Map; true; keySet; (); ; Argument[this].MapKey; ReturnValue.Element; value; manual |
-| 11 | Summary: java.util; Map; false; of; ; ; Argument[0]; ReturnValue.MapKey; value; manual |
-| 12 | Summary: java.util; Map; false; of; ; ; Argument[1]; ReturnValue.MapValue; value; manual |
-| 13 | Summary: java.util; Map; true; put; (Object,Object); ; Argument[this].MapValue; ReturnValue; value; manual |
-| 14 | Summary: java.util; Map; true; put; (Object,Object); ; Argument[0]; Argument[this].MapKey; value; manual |
-| 15 | Summary: java.util; Map; true; put; (Object,Object); ; Argument[1]; Argument[this].MapValue; value; manual |
-| 16 | Summary: java.util; Map; true; putAll; (Map); ; Argument[0].MapKey; Argument[this].MapKey; value; manual |
-| 17 | Summary: java.util; Map; true; putAll; (Map); ; Argument[0].MapValue; Argument[this].MapValue; value; manual |
-| 18 | Summary: java.util; Map; true; remove; (Object); ; Argument[this].MapValue; ReturnValue; value; manual |
-| 19 | Summary: java.util; Map; true; values; (); ; Argument[this].MapValue; ReturnValue.Element; value; manual |
-| 20 | Summary: java.util; Map$Entry; true; getKey; ; ; Argument[this].MapKey; ReturnValue; value; manual |
-| 21 | Summary: java.util; Map$Entry; true; getValue; ; ; Argument[this].MapValue; ReturnValue; value; manual |
-| 22 | Summary: java.util; Map$Entry; true; setValue; ; ; Argument[this].MapValue; ReturnValue; value; manual |
-| 23 | Summary: java.util; Map$Entry; true; setValue; ; ; Argument[0]; Argument[this].MapValue; value; manual |
-| 24 | Summary: org.apache.commons.collections4.bag; AbstractBagDecorator; true; AbstractBagDecorator; ; ; Argument[0].Element; Argument[this].Element; value; manual |
-| 25 | Summary: org.apache.commons.collections4.bag; AbstractMapBag; true; AbstractMapBag; ; ; Argument[0].MapKey; Argument[this].Element; value; manual |
-| 26 | Summary: org.apache.commons.collections4.bag; AbstractMapBag; true; getMap; ; ; Argument[this].Element; ReturnValue.MapKey; value; manual |
-| 27 | Summary: org.apache.commons.collections4.bag; AbstractSortedBagDecorator; true; AbstractSortedBagDecorator; ; ; Argument[0].Element; Argument[this].Element; value; manual |
-| 28 | Summary: org.apache.commons.collections4.bag; CollectionBag; true; CollectionBag; ; ; Argument[0].Element; Argument[this].Element; value; manual |
-| 29 | Summary: org.apache.commons.collections4.bag; CollectionBag; true; collectionBag; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
-| 30 | Summary: org.apache.commons.collections4.bag; CollectionSortedBag; true; CollectionSortedBag; ; ; Argument[0].Element; Argument[this].Element; value; manual |
-| 31 | Summary: org.apache.commons.collections4.bag; CollectionSortedBag; true; collectionSortedBag; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
-| 32 | Summary: org.apache.commons.collections4.bag; HashBag; true; HashBag; ; ; Argument[0].Element; Argument[this].Element; value; manual |
-| 33 | Summary: org.apache.commons.collections4.bag; PredicatedBag; true; predicatedBag; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
-| 34 | Summary: org.apache.commons.collections4.bag; PredicatedSortedBag; true; predicatedSortedBag; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
-| 35 | Summary: org.apache.commons.collections4.bag; SynchronizedBag; true; synchronizedBag; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
-| 36 | Summary: org.apache.commons.collections4.bag; SynchronizedSortedBag; true; synchronizedSortedBag; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
-| 37 | Summary: org.apache.commons.collections4.bag; TransformedBag; true; transformedBag; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
-| 38 | Summary: org.apache.commons.collections4.bag; TransformedSortedBag; true; transformedSortedBag; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
-| 39 | Summary: org.apache.commons.collections4.bag; TreeBag; true; TreeBag; (Collection); ; Argument[0].Element; Argument[this].Element; value; manual |
-| 40 | Summary: org.apache.commons.collections4.bag; UnmodifiableBag; true; unmodifiableBag; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
-| 41 | Summary: org.apache.commons.collections4.bag; UnmodifiableSortedBag; true; unmodifiableSortedBag; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
-| 42 | Summary: org.apache.commons.collections4.bidimap; AbstractBidiMapDecorator; true; AbstractBidiMapDecorator; ; ; Argument[0].MapKey; Argument[this].MapKey; value; manual |
-| 43 | Summary: org.apache.commons.collections4.bidimap; AbstractBidiMapDecorator; true; AbstractBidiMapDecorator; ; ; Argument[0].MapValue; Argument[this].MapValue; value; manual |
-| 44 | Summary: org.apache.commons.collections4.bidimap; AbstractDualBidiMap; true; AbstractDualBidiMap; ; ; Argument[0].MapKey; Argument[this].MapKey; value; manual |
-| 45 | Summary: org.apache.commons.collections4.bidimap; AbstractDualBidiMap; true; AbstractDualBidiMap; ; ; Argument[0].MapValue; Argument[this].MapValue; value; manual |
-| 46 | Summary: org.apache.commons.collections4.bidimap; AbstractDualBidiMap; true; AbstractDualBidiMap; ; ; Argument[1].MapKey; Argument[this].MapValue; value; manual |
-| 47 | Summary: org.apache.commons.collections4.bidimap; AbstractDualBidiMap; true; AbstractDualBidiMap; ; ; Argument[1].MapValue; Argument[this].MapKey; value; manual |
-| 48 | Summary: org.apache.commons.collections4.bidimap; AbstractDualBidiMap; true; AbstractDualBidiMap; ; ; Argument[2].MapKey; Argument[this].MapValue; value; manual |
-| 49 | Summary: org.apache.commons.collections4.bidimap; AbstractDualBidiMap; true; AbstractDualBidiMap; ; ; Argument[2].MapValue; Argument[this].MapKey; value; manual |
-| 50 | Summary: org.apache.commons.collections4.bidimap; AbstractOrderedBidiMapDecorator; true; AbstractOrderedBidiMapDecorator; ; ; Argument[0].MapKey; Argument[this].MapKey; value; manual |
-| 51 | Summary: org.apache.commons.collections4.bidimap; AbstractOrderedBidiMapDecorator; true; AbstractOrderedBidiMapDecorator; ; ; Argument[0].MapValue; Argument[this].MapValue; value; manual |
-| 52 | Summary: org.apache.commons.collections4.bidimap; AbstractSortedBidiMapDecorator; true; AbstractSortedBidiMapDecorator; ; ; Argument[0].MapKey; Argument[this].MapKey; value; manual |
-| 53 | Summary: org.apache.commons.collections4.bidimap; AbstractSortedBidiMapDecorator; true; AbstractSortedBidiMapDecorator; ; ; Argument[0].MapValue; Argument[this].MapValue; value; manual |
-| 54 | Summary: org.apache.commons.collections4.bidimap; DualHashBidiMap; true; DualHashBidiMap; (Map); ; Argument[0].MapKey; Argument[this].MapKey; value; manual |
-| 55 | Summary: org.apache.commons.collections4.bidimap; DualHashBidiMap; true; DualHashBidiMap; (Map); ; Argument[0].MapValue; Argument[this].MapValue; value; manual |
-| 56 | Summary: org.apache.commons.collections4.bidimap; DualLinkedHashBidiMap; true; DualLinkedHashBidiMap; (Map); ; Argument[0].MapKey; Argument[this].MapKey; value; manual |
-| 57 | Summary: org.apache.commons.collections4.bidimap; DualLinkedHashBidiMap; true; DualLinkedHashBidiMap; (Map); ; Argument[0].MapValue; Argument[this].MapValue; value; manual |
-| 58 | Summary: org.apache.commons.collections4.bidimap; DualTreeBidiMap; true; DualTreeBidiMap; (Map); ; Argument[0].MapKey; Argument[this].MapKey; value; manual |
-| 59 | Summary: org.apache.commons.collections4.bidimap; DualTreeBidiMap; true; DualTreeBidiMap; (Map); ; Argument[0].MapValue; Argument[this].MapValue; value; manual |
-| 60 | Summary: org.apache.commons.collections4.bidimap; DualTreeBidiMap; true; inverseOrderedBidiMap; ; ; Argument[this].MapKey; ReturnValue.MapValue; value; manual |
-| 61 | Summary: org.apache.commons.collections4.bidimap; DualTreeBidiMap; true; inverseOrderedBidiMap; ; ; Argument[this].MapValue; ReturnValue.MapKey; value; manual |
-| 62 | Summary: org.apache.commons.collections4.bidimap; DualTreeBidiMap; true; inverseSortedBidiMap; ; ; Argument[this].MapKey; ReturnValue.MapValue; value; manual |
-| 63 | Summary: org.apache.commons.collections4.bidimap; DualTreeBidiMap; true; inverseSortedBidiMap; ; ; Argument[this].MapValue; ReturnValue.MapKey; value; manual |
-| 64 | Summary: org.apache.commons.collections4.bidimap; TreeBidiMap; true; TreeBidiMap; ; ; Argument[0].MapKey; Argument[this].MapKey; value; manual |
-| 65 | Summary: org.apache.commons.collections4.bidimap; TreeBidiMap; true; TreeBidiMap; ; ; Argument[0].MapValue; Argument[this].MapValue; value; manual |
-| 66 | Summary: org.apache.commons.collections4.bidimap; UnmodifiableBidiMap; true; unmodifiableBidiMap; ; ; Argument[0].MapKey; ReturnValue.MapKey; value; manual |
-| 67 | Summary: org.apache.commons.collections4.bidimap; UnmodifiableBidiMap; true; unmodifiableBidiMap; ; ; Argument[0].MapValue; ReturnValue.MapValue; value; manual |
-| 68 | Summary: org.apache.commons.collections4.bidimap; UnmodifiableOrderedBidiMap; true; inverseOrderedBidiMap; ; ; Argument[this].MapKey; ReturnValue.MapValue; value; manual |
-| 69 | Summary: org.apache.commons.collections4.bidimap; UnmodifiableOrderedBidiMap; true; inverseOrderedBidiMap; ; ; Argument[this].MapValue; ReturnValue.MapKey; value; manual |
-| 70 | Summary: org.apache.commons.collections4.bidimap; UnmodifiableOrderedBidiMap; true; unmodifiableOrderedBidiMap; ; ; Argument[0].MapKey; ReturnValue.MapKey; value; manual |
-| 71 | Summary: org.apache.commons.collections4.bidimap; UnmodifiableOrderedBidiMap; true; unmodifiableOrderedBidiMap; ; ; Argument[0].MapValue; ReturnValue.MapValue; value; manual |
-| 72 | Summary: org.apache.commons.collections4.bidimap; UnmodifiableSortedBidiMap; true; unmodifiableSortedBidiMap; ; ; Argument[0].MapKey; ReturnValue.MapKey; value; manual |
-| 73 | Summary: org.apache.commons.collections4.bidimap; UnmodifiableSortedBidiMap; true; unmodifiableSortedBidiMap; ; ; Argument[0].MapValue; ReturnValue.MapValue; value; manual |
-| 74 | Summary: org.apache.commons.collections4.collection; AbstractCollectionDecorator; true; AbstractCollectionDecorator; ; ; Argument[0].Element; Argument[this].Element; value; manual |
-| 75 | Summary: org.apache.commons.collections4.collection; AbstractCollectionDecorator; true; decorated; ; ; Argument[this].Element; ReturnValue.Element; value; manual |
-| 76 | Summary: org.apache.commons.collections4.collection; AbstractCollectionDecorator; true; setCollection; ; ; Argument[0].Element; Argument[this].Element; value; manual |
-| 77 | Summary: org.apache.commons.collections4.collection; CompositeCollection; true; CompositeCollection; (Collection); ; Argument[0].Element; Argument[this].Element; value; manual |
-| 78 | Summary: org.apache.commons.collections4.collection; CompositeCollection; true; CompositeCollection; (Collection,Collection); ; Argument[0].Element; Argument[this].Element; value; manual |
-| 79 | Summary: org.apache.commons.collections4.collection; CompositeCollection; true; CompositeCollection; (Collection,Collection); ; Argument[1].Element; Argument[this].Element; value; manual |
-| 80 | Summary: org.apache.commons.collections4.collection; CompositeCollection; true; CompositeCollection; (Collection[]); ; Argument[0].ArrayElement.Element; Argument[this].Element; value; manual |
-| 81 | Summary: org.apache.commons.collections4.collection; CompositeCollection; true; addComposited; (Collection); ; Argument[0].Element; Argument[this].Element; value; manual |
-| 82 | Summary: org.apache.commons.collections4.collection; CompositeCollection; true; addComposited; (Collection,Collection); ; Argument[0].Element; Argument[this].Element; value; manual |
-| 83 | Summary: org.apache.commons.collections4.collection; CompositeCollection; true; addComposited; (Collection,Collection); ; Argument[1].Element; Argument[this].Element; value; manual |
-| 84 | Summary: org.apache.commons.collections4.collection; CompositeCollection; true; addComposited; (Collection[]); ; Argument[0].ArrayElement.Element; Argument[this].Element; value; manual |
-| 85 | Summary: org.apache.commons.collections4.collection; CompositeCollection; true; getCollections; ; ; Argument[this].Element; ReturnValue.Element.Element; value; manual |
-| 86 | Summary: org.apache.commons.collections4.collection; CompositeCollection; true; toCollection; ; ; Argument[this].Element; ReturnValue.Element; value; manual |
-| 87 | Summary: org.apache.commons.collections4.collection; CompositeCollection$CollectionMutator; true; add; ; ; Argument[2]; Argument[0].Element; value; manual |
-| 88 | Summary: org.apache.commons.collections4.collection; CompositeCollection$CollectionMutator; true; add; ; ; Argument[2]; Argument[1].Element.Element; value; manual |
-| 89 | Summary: org.apache.commons.collections4.collection; CompositeCollection$CollectionMutator; true; addAll; ; ; Argument[2].Element; Argument[0].Element; value; manual |
-| 90 | Summary: org.apache.commons.collections4.collection; CompositeCollection$CollectionMutator; true; addAll; ; ; Argument[2].Element; Argument[1].Element.Element; value; manual |
-| 91 | Summary: org.apache.commons.collections4.collection; IndexedCollection; true; IndexedCollection; ; ; Argument[0].Element; Argument[this].Element; value; manual |
-| 92 | Summary: org.apache.commons.collections4.collection; IndexedCollection; true; get; ; ; Argument[this].Element; ReturnValue; value; manual |
-| 93 | Summary: org.apache.commons.collections4.collection; IndexedCollection; true; nonUniqueIndexedCollection; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
-| 94 | Summary: org.apache.commons.collections4.collection; IndexedCollection; true; uniqueIndexedCollection; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
-| 95 | Summary: org.apache.commons.collections4.collection; IndexedCollection; true; values; ; ; Argument[this].Element; ReturnValue.Element; value; manual |
-| 96 | Summary: org.apache.commons.collections4.collection; PredicatedCollection; true; predicatedCollection; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
-| 97 | Summary: org.apache.commons.collections4.collection; PredicatedCollection$Builder; true; add; ; ; Argument[0]; Argument[this].Element; value; manual |
-| 98 | Summary: org.apache.commons.collections4.collection; PredicatedCollection$Builder; true; addAll; ; ; Argument[0].Element; Argument[this].Element; value; manual |
-| 99 | Summary: org.apache.commons.collections4.collection; PredicatedCollection$Builder; true; createPredicatedBag; ; ; Argument[this].Element; ReturnValue.Element; value; manual |
+| 1 | Summary: generatedtest; Test; false; newRBWithMapKey; ; ; Argument[0]; ReturnValue.MapKey; value; manual |
+| 2 | Summary: generatedtest; Test; false; newRBWithMapValue; ; ; Argument[0]; ReturnValue.MapValue; value; manual |
+| 3 | Summary: java.lang; Iterable; true; iterator; (); ; Argument[this].Element; ReturnValue.Element; value; manual |
+| 4 | Summary: java.util; Collection; true; add; ; ; Argument[0]; Argument[this].Element; value; manual |
+| 5 | Summary: java.util; Enumeration; true; nextElement; ; ; Argument[this].Element; ReturnValue; value; manual |
+| 6 | Summary: java.util; Iterator; true; next; ; ; Argument[this].Element; ReturnValue; value; manual |
+| 7 | Summary: java.util; List; false; of; (Object); ; Argument[0]; ReturnValue.Element; value; manual |
+| 8 | Summary: java.util; List; true; listIterator; ; ; Argument[this].Element; ReturnValue.Element; value; manual |
+| 9 | Summary: java.util; Map$Entry; true; getKey; ; ; Argument[this].MapKey; ReturnValue; value; manual |
+| 10 | Summary: java.util; Map$Entry; true; getValue; ; ; Argument[this].MapValue; ReturnValue; value; manual |
+| 11 | Summary: java.util; Map$Entry; true; setValue; ; ; Argument[0]; Argument[this].MapValue; value; manual |
+| 12 | Summary: java.util; Map$Entry; true; setValue; ; ; Argument[this].MapValue; ReturnValue; value; manual |
+| 13 | Summary: java.util; Map; false; of; ; ; Argument[0]; ReturnValue.MapKey; value; manual |
+| 14 | Summary: java.util; Map; false; of; ; ; Argument[1]; ReturnValue.MapValue; value; manual |
+| 15 | Summary: java.util; Map; true; entrySet; ; ; Argument[this].MapKey; ReturnValue.Element.MapKey; value; manual |
+| 16 | Summary: java.util; Map; true; entrySet; ; ; Argument[this].MapValue; ReturnValue.Element.MapValue; value; manual |
+| 17 | Summary: java.util; Map; true; get; ; ; Argument[this].MapValue; ReturnValue; value; manual |
+| 18 | Summary: java.util; Map; true; keySet; (); ; Argument[this].MapKey; ReturnValue.Element; value; manual |
+| 19 | Summary: java.util; Map; true; put; (Object,Object); ; Argument[0]; Argument[this].MapKey; value; manual |
+| 20 | Summary: java.util; Map; true; put; (Object,Object); ; Argument[1]; Argument[this].MapValue; value; manual |
+| 21 | Summary: java.util; Map; true; put; (Object,Object); ; Argument[this].MapValue; ReturnValue; value; manual |
+| 22 | Summary: java.util; Map; true; putAll; (Map); ; Argument[0].MapKey; Argument[this].MapKey; value; manual |
+| 23 | Summary: java.util; Map; true; putAll; (Map); ; Argument[0].MapValue; Argument[this].MapValue; value; manual |
+| 24 | Summary: java.util; Map; true; remove; (Object); ; Argument[this].MapValue; ReturnValue; value; manual |
+| 25 | Summary: java.util; Map; true; values; (); ; Argument[this].MapValue; ReturnValue.Element; value; manual |
+| 26 | Summary: org.apache.commons.collections4.bag; AbstractBagDecorator; true; AbstractBagDecorator; ; ; Argument[0].Element; Argument[this].Element; value; manual |
+| 27 | Summary: org.apache.commons.collections4.bag; AbstractMapBag; true; AbstractMapBag; ; ; Argument[0].MapKey; Argument[this].Element; value; manual |
+| 28 | Summary: org.apache.commons.collections4.bag; AbstractMapBag; true; getMap; ; ; Argument[this].Element; ReturnValue.MapKey; value; manual |
+| 29 | Summary: org.apache.commons.collections4.bag; AbstractSortedBagDecorator; true; AbstractSortedBagDecorator; ; ; Argument[0].Element; Argument[this].Element; value; manual |
+| 30 | Summary: org.apache.commons.collections4.bag; CollectionBag; true; CollectionBag; ; ; Argument[0].Element; Argument[this].Element; value; manual |
+| 31 | Summary: org.apache.commons.collections4.bag; CollectionBag; true; collectionBag; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
+| 32 | Summary: org.apache.commons.collections4.bag; CollectionSortedBag; true; CollectionSortedBag; ; ; Argument[0].Element; Argument[this].Element; value; manual |
+| 33 | Summary: org.apache.commons.collections4.bag; CollectionSortedBag; true; collectionSortedBag; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
+| 34 | Summary: org.apache.commons.collections4.bag; HashBag; true; HashBag; ; ; Argument[0].Element; Argument[this].Element; value; manual |
+| 35 | Summary: org.apache.commons.collections4.bag; PredicatedBag; true; predicatedBag; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
+| 36 | Summary: org.apache.commons.collections4.bag; PredicatedSortedBag; true; predicatedSortedBag; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
+| 37 | Summary: org.apache.commons.collections4.bag; SynchronizedBag; true; synchronizedBag; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
+| 38 | Summary: org.apache.commons.collections4.bag; SynchronizedSortedBag; true; synchronizedSortedBag; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
+| 39 | Summary: org.apache.commons.collections4.bag; TransformedBag; true; transformedBag; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
+| 40 | Summary: org.apache.commons.collections4.bag; TransformedSortedBag; true; transformedSortedBag; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
+| 41 | Summary: org.apache.commons.collections4.bag; TreeBag; true; TreeBag; (Collection); ; Argument[0].Element; Argument[this].Element; value; manual |
+| 42 | Summary: org.apache.commons.collections4.bag; UnmodifiableBag; true; unmodifiableBag; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
+| 43 | Summary: org.apache.commons.collections4.bag; UnmodifiableSortedBag; true; unmodifiableSortedBag; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
+| 44 | Summary: org.apache.commons.collections4.bidimap; AbstractBidiMapDecorator; true; AbstractBidiMapDecorator; ; ; Argument[0].MapKey; Argument[this].MapKey; value; manual |
+| 45 | Summary: org.apache.commons.collections4.bidimap; AbstractBidiMapDecorator; true; AbstractBidiMapDecorator; ; ; Argument[0].MapValue; Argument[this].MapValue; value; manual |
+| 46 | Summary: org.apache.commons.collections4.bidimap; AbstractDualBidiMap; true; AbstractDualBidiMap; ; ; Argument[0].MapKey; Argument[this].MapKey; value; manual |
+| 47 | Summary: org.apache.commons.collections4.bidimap; AbstractDualBidiMap; true; AbstractDualBidiMap; ; ; Argument[0].MapValue; Argument[this].MapValue; value; manual |
+| 48 | Summary: org.apache.commons.collections4.bidimap; AbstractDualBidiMap; true; AbstractDualBidiMap; ; ; Argument[1].MapKey; Argument[this].MapValue; value; manual |
+| 49 | Summary: org.apache.commons.collections4.bidimap; AbstractDualBidiMap; true; AbstractDualBidiMap; ; ; Argument[1].MapValue; Argument[this].MapKey; value; manual |
+| 50 | Summary: org.apache.commons.collections4.bidimap; AbstractDualBidiMap; true; AbstractDualBidiMap; ; ; Argument[2].MapKey; Argument[this].MapValue; value; manual |
+| 51 | Summary: org.apache.commons.collections4.bidimap; AbstractDualBidiMap; true; AbstractDualBidiMap; ; ; Argument[2].MapValue; Argument[this].MapKey; value; manual |
+| 52 | Summary: org.apache.commons.collections4.bidimap; AbstractOrderedBidiMapDecorator; true; AbstractOrderedBidiMapDecorator; ; ; Argument[0].MapKey; Argument[this].MapKey; value; manual |
+| 53 | Summary: org.apache.commons.collections4.bidimap; AbstractOrderedBidiMapDecorator; true; AbstractOrderedBidiMapDecorator; ; ; Argument[0].MapValue; Argument[this].MapValue; value; manual |
+| 54 | Summary: org.apache.commons.collections4.bidimap; AbstractSortedBidiMapDecorator; true; AbstractSortedBidiMapDecorator; ; ; Argument[0].MapKey; Argument[this].MapKey; value; manual |
+| 55 | Summary: org.apache.commons.collections4.bidimap; AbstractSortedBidiMapDecorator; true; AbstractSortedBidiMapDecorator; ; ; Argument[0].MapValue; Argument[this].MapValue; value; manual |
+| 56 | Summary: org.apache.commons.collections4.bidimap; DualHashBidiMap; true; DualHashBidiMap; (Map); ; Argument[0].MapKey; Argument[this].MapKey; value; manual |
+| 57 | Summary: org.apache.commons.collections4.bidimap; DualHashBidiMap; true; DualHashBidiMap; (Map); ; Argument[0].MapValue; Argument[this].MapValue; value; manual |
+| 58 | Summary: org.apache.commons.collections4.bidimap; DualLinkedHashBidiMap; true; DualLinkedHashBidiMap; (Map); ; Argument[0].MapKey; Argument[this].MapKey; value; manual |
+| 59 | Summary: org.apache.commons.collections4.bidimap; DualLinkedHashBidiMap; true; DualLinkedHashBidiMap; (Map); ; Argument[0].MapValue; Argument[this].MapValue; value; manual |
+| 60 | Summary: org.apache.commons.collections4.bidimap; DualTreeBidiMap; true; DualTreeBidiMap; (Map); ; Argument[0].MapKey; Argument[this].MapKey; value; manual |
+| 61 | Summary: org.apache.commons.collections4.bidimap; DualTreeBidiMap; true; DualTreeBidiMap; (Map); ; Argument[0].MapValue; Argument[this].MapValue; value; manual |
+| 62 | Summary: org.apache.commons.collections4.bidimap; DualTreeBidiMap; true; inverseOrderedBidiMap; ; ; Argument[this].MapKey; ReturnValue.MapValue; value; manual |
+| 63 | Summary: org.apache.commons.collections4.bidimap; DualTreeBidiMap; true; inverseOrderedBidiMap; ; ; Argument[this].MapValue; ReturnValue.MapKey; value; manual |
+| 64 | Summary: org.apache.commons.collections4.bidimap; DualTreeBidiMap; true; inverseSortedBidiMap; ; ; Argument[this].MapKey; ReturnValue.MapValue; value; manual |
+| 65 | Summary: org.apache.commons.collections4.bidimap; DualTreeBidiMap; true; inverseSortedBidiMap; ; ; Argument[this].MapValue; ReturnValue.MapKey; value; manual |
+| 66 | Summary: org.apache.commons.collections4.bidimap; TreeBidiMap; true; TreeBidiMap; ; ; Argument[0].MapKey; Argument[this].MapKey; value; manual |
+| 67 | Summary: org.apache.commons.collections4.bidimap; TreeBidiMap; true; TreeBidiMap; ; ; Argument[0].MapValue; Argument[this].MapValue; value; manual |
+| 68 | Summary: org.apache.commons.collections4.bidimap; UnmodifiableBidiMap; true; unmodifiableBidiMap; ; ; Argument[0].MapKey; ReturnValue.MapKey; value; manual |
+| 69 | Summary: org.apache.commons.collections4.bidimap; UnmodifiableBidiMap; true; unmodifiableBidiMap; ; ; Argument[0].MapValue; ReturnValue.MapValue; value; manual |
+| 70 | Summary: org.apache.commons.collections4.bidimap; UnmodifiableOrderedBidiMap; true; inverseOrderedBidiMap; ; ; Argument[this].MapKey; ReturnValue.MapValue; value; manual |
+| 71 | Summary: org.apache.commons.collections4.bidimap; UnmodifiableOrderedBidiMap; true; inverseOrderedBidiMap; ; ; Argument[this].MapValue; ReturnValue.MapKey; value; manual |
+| 72 | Summary: org.apache.commons.collections4.bidimap; UnmodifiableOrderedBidiMap; true; unmodifiableOrderedBidiMap; ; ; Argument[0].MapKey; ReturnValue.MapKey; value; manual |
+| 73 | Summary: org.apache.commons.collections4.bidimap; UnmodifiableOrderedBidiMap; true; unmodifiableOrderedBidiMap; ; ; Argument[0].MapValue; ReturnValue.MapValue; value; manual |
+| 74 | Summary: org.apache.commons.collections4.bidimap; UnmodifiableSortedBidiMap; true; unmodifiableSortedBidiMap; ; ; Argument[0].MapKey; ReturnValue.MapKey; value; manual |
+| 75 | Summary: org.apache.commons.collections4.bidimap; UnmodifiableSortedBidiMap; true; unmodifiableSortedBidiMap; ; ; Argument[0].MapValue; ReturnValue.MapValue; value; manual |
+| 76 | Summary: org.apache.commons.collections4.collection; AbstractCollectionDecorator; true; AbstractCollectionDecorator; ; ; Argument[0].Element; Argument[this].Element; value; manual |
+| 77 | Summary: org.apache.commons.collections4.collection; AbstractCollectionDecorator; true; decorated; ; ; Argument[this].Element; ReturnValue.Element; value; manual |
+| 78 | Summary: org.apache.commons.collections4.collection; AbstractCollectionDecorator; true; setCollection; ; ; Argument[0].Element; Argument[this].Element; value; manual |
+| 79 | Summary: org.apache.commons.collections4.collection; CompositeCollection$CollectionMutator; true; add; ; ; Argument[2]; Argument[0].Element; value; manual |
+| 80 | Summary: org.apache.commons.collections4.collection; CompositeCollection$CollectionMutator; true; add; ; ; Argument[2]; Argument[1].Element.Element; value; manual |
+| 81 | Summary: org.apache.commons.collections4.collection; CompositeCollection$CollectionMutator; true; addAll; ; ; Argument[2].Element; Argument[0].Element; value; manual |
+| 82 | Summary: org.apache.commons.collections4.collection; CompositeCollection$CollectionMutator; true; addAll; ; ; Argument[2].Element; Argument[1].Element.Element; value; manual |
+| 83 | Summary: org.apache.commons.collections4.collection; CompositeCollection; true; CompositeCollection; (Collection); ; Argument[0].Element; Argument[this].Element; value; manual |
+| 84 | Summary: org.apache.commons.collections4.collection; CompositeCollection; true; CompositeCollection; (Collection,Collection); ; Argument[0].Element; Argument[this].Element; value; manual |
+| 85 | Summary: org.apache.commons.collections4.collection; CompositeCollection; true; CompositeCollection; (Collection,Collection); ; Argument[1].Element; Argument[this].Element; value; manual |
+| 86 | Summary: org.apache.commons.collections4.collection; CompositeCollection; true; CompositeCollection; (Collection[]); ; Argument[0].ArrayElement.Element; Argument[this].Element; value; manual |
+| 87 | Summary: org.apache.commons.collections4.collection; CompositeCollection; true; addComposited; (Collection); ; Argument[0].Element; Argument[this].Element; value; manual |
+| 88 | Summary: org.apache.commons.collections4.collection; CompositeCollection; true; addComposited; (Collection,Collection); ; Argument[0].Element; Argument[this].Element; value; manual |
+| 89 | Summary: org.apache.commons.collections4.collection; CompositeCollection; true; addComposited; (Collection,Collection); ; Argument[1].Element; Argument[this].Element; value; manual |
+| 90 | Summary: org.apache.commons.collections4.collection; CompositeCollection; true; addComposited; (Collection[]); ; Argument[0].ArrayElement.Element; Argument[this].Element; value; manual |
+| 91 | Summary: org.apache.commons.collections4.collection; CompositeCollection; true; getCollections; ; ; Argument[this].Element; ReturnValue.Element.Element; value; manual |
+| 92 | Summary: org.apache.commons.collections4.collection; CompositeCollection; true; toCollection; ; ; Argument[this].Element; ReturnValue.Element; value; manual |
+| 93 | Summary: org.apache.commons.collections4.collection; IndexedCollection; true; IndexedCollection; ; ; Argument[0].Element; Argument[this].Element; value; manual |
+| 94 | Summary: org.apache.commons.collections4.collection; IndexedCollection; true; get; ; ; Argument[this].Element; ReturnValue; value; manual |
+| 95 | Summary: org.apache.commons.collections4.collection; IndexedCollection; true; nonUniqueIndexedCollection; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
+| 96 | Summary: org.apache.commons.collections4.collection; IndexedCollection; true; uniqueIndexedCollection; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
+| 97 | Summary: org.apache.commons.collections4.collection; IndexedCollection; true; values; ; ; Argument[this].Element; ReturnValue.Element; value; manual |
+| 98 | Summary: org.apache.commons.collections4.collection; PredicatedCollection$Builder; true; add; ; ; Argument[0]; Argument[this].Element; value; manual |
+| 99 | Summary: org.apache.commons.collections4.collection; PredicatedCollection$Builder; true; addAll; ; ; Argument[0].Element; Argument[this].Element; value; manual |
 | 100 | Summary: org.apache.commons.collections4.collection; PredicatedCollection$Builder; true; createPredicatedBag; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
-| 101 | Summary: org.apache.commons.collections4.collection; PredicatedCollection$Builder; true; createPredicatedList; ; ; Argument[this].Element; ReturnValue.Element; value; manual |
+| 101 | Summary: org.apache.commons.collections4.collection; PredicatedCollection$Builder; true; createPredicatedBag; ; ; Argument[this].Element; ReturnValue.Element; value; manual |
 | 102 | Summary: org.apache.commons.collections4.collection; PredicatedCollection$Builder; true; createPredicatedList; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
-| 103 | Summary: org.apache.commons.collections4.collection; PredicatedCollection$Builder; true; createPredicatedMultiSet; ; ; Argument[this].Element; ReturnValue.Element; value; manual |
+| 103 | Summary: org.apache.commons.collections4.collection; PredicatedCollection$Builder; true; createPredicatedList; ; ; Argument[this].Element; ReturnValue.Element; value; manual |
 | 104 | Summary: org.apache.commons.collections4.collection; PredicatedCollection$Builder; true; createPredicatedMultiSet; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
-| 105 | Summary: org.apache.commons.collections4.collection; PredicatedCollection$Builder; true; createPredicatedQueue; ; ; Argument[this].Element; ReturnValue.Element; value; manual |
+| 105 | Summary: org.apache.commons.collections4.collection; PredicatedCollection$Builder; true; createPredicatedMultiSet; ; ; Argument[this].Element; ReturnValue.Element; value; manual |
 | 106 | Summary: org.apache.commons.collections4.collection; PredicatedCollection$Builder; true; createPredicatedQueue; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
-| 107 | Summary: org.apache.commons.collections4.collection; PredicatedCollection$Builder; true; createPredicatedSet; ; ; Argument[this].Element; ReturnValue.Element; value; manual |
+| 107 | Summary: org.apache.commons.collections4.collection; PredicatedCollection$Builder; true; createPredicatedQueue; ; ; Argument[this].Element; ReturnValue.Element; value; manual |
 | 108 | Summary: org.apache.commons.collections4.collection; PredicatedCollection$Builder; true; createPredicatedSet; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
-| 109 | Summary: org.apache.commons.collections4.collection; PredicatedCollection$Builder; true; rejectedElements; ; ; Argument[this].Element; ReturnValue.Element; value; manual |
-| 110 | Summary: org.apache.commons.collections4.collection; SynchronizedCollection; true; synchronizedCollection; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
-| 111 | Summary: org.apache.commons.collections4.collection; TransformedCollection; true; transformingCollection; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
-| 112 | Summary: org.apache.commons.collections4.collection; UnmodifiableBoundedCollection; true; unmodifiableBoundedCollection; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
-| 113 | Summary: org.apache.commons.collections4.collection; UnmodifiableCollection; true; unmodifiableCollection; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
-| 114 | Summary: org.apache.commons.collections4.iterators; AbstractIteratorDecorator; true; AbstractIteratorDecorator; ; ; Argument[0].Element; Argument[this].Element; value; manual |
-| 115 | Summary: org.apache.commons.collections4.iterators; AbstractListIteratorDecorator; true; AbstractListIteratorDecorator; ; ; Argument[0].Element; Argument[this].Element; value; manual |
-| 116 | Summary: org.apache.commons.collections4.iterators; AbstractListIteratorDecorator; true; getListIterator; ; ; Argument[this].Element; ReturnValue.Element; value; manual |
-| 117 | Summary: org.apache.commons.collections4.iterators; AbstractMapIteratorDecorator; true; AbstractMapIteratorDecorator; ; ; Argument[0].Element; Argument[this].Element; value; manual |
-| 118 | Summary: org.apache.commons.collections4.iterators; AbstractMapIteratorDecorator; true; AbstractMapIteratorDecorator; ; ; Argument[0].MapValue; Argument[this].MapValue; value; manual |
-| 119 | Summary: org.apache.commons.collections4.iterators; AbstractMapIteratorDecorator; true; getMapIterator; ; ; Argument[this].Element; ReturnValue.Element; value; manual |
-| 120 | Summary: org.apache.commons.collections4.iterators; AbstractMapIteratorDecorator; true; getMapIterator; ; ; Argument[this].MapValue; ReturnValue.MapValue; value; manual |
-| 121 | Summary: org.apache.commons.collections4.iterators; AbstractOrderedMapIteratorDecorator; true; AbstractOrderedMapIteratorDecorator; ; ; Argument[0].Element; Argument[this].Element; value; manual |
-| 122 | Summary: org.apache.commons.collections4.iterators; AbstractOrderedMapIteratorDecorator; true; AbstractOrderedMapIteratorDecorator; ; ; Argument[0].MapValue; Argument[this].MapValue; value; manual |
-| 123 | Summary: org.apache.commons.collections4.iterators; AbstractOrderedMapIteratorDecorator; true; getOrderedMapIterator; ; ; Argument[this].Element; ReturnValue.Element; value; manual |
-| 124 | Summary: org.apache.commons.collections4.iterators; AbstractOrderedMapIteratorDecorator; true; getOrderedMapIterator; ; ; Argument[this].MapValue; ReturnValue.MapValue; value; manual |
-| 125 | Summary: org.apache.commons.collections4.iterators; AbstractUntypedIteratorDecorator; true; AbstractUntypedIteratorDecorator; ; ; Argument[0].Element; Argument[this].Element; value; manual |
-| 126 | Summary: org.apache.commons.collections4.iterators; AbstractUntypedIteratorDecorator; true; getIterator; ; ; Argument[this].Element; ReturnValue.Element; value; manual |
-| 127 | Summary: org.apache.commons.collections4.iterators; ArrayIterator; true; ArrayIterator; ; ; Argument[0].ArrayElement; Argument[this].Element; value; manual |
-| 128 | Summary: org.apache.commons.collections4.iterators; ArrayIterator; true; getArray; ; ; Argument[this].Element; ReturnValue.ArrayElement; value; manual |
-| 129 | Summary: org.apache.commons.collections4.iterators; ArrayListIterator; true; ArrayListIterator; ; ; Argument[0].ArrayElement; Argument[this].Element; value; manual |
-| 130 | Summary: org.apache.commons.collections4.iterators; BoundedIterator; true; BoundedIterator; ; ; Argument[0].Element; Argument[this].Element; value; manual |
-| 131 | Summary: org.apache.commons.collections4.iterators; CollatingIterator; true; CollatingIterator; (Comparator,Collection); ; Argument[1].Element.Element; Argument[this].Element; value; manual |
-| 132 | Summary: org.apache.commons.collections4.iterators; CollatingIterator; true; CollatingIterator; (Comparator,Iterator,Iterator); ; Argument[1].Element; Argument[this].Element; value; manual |
-| 133 | Summary: org.apache.commons.collections4.iterators; CollatingIterator; true; CollatingIterator; (Comparator,Iterator,Iterator); ; Argument[2].Element; Argument[this].Element; value; manual |
-| 134 | Summary: org.apache.commons.collections4.iterators; CollatingIterator; true; CollatingIterator; (Comparator,Iterator[]); ; Argument[1].ArrayElement.Element; Argument[this].Element; value; manual |
-| 135 | Summary: org.apache.commons.collections4.iterators; CollatingIterator; true; addIterator; ; ; Argument[0].Element; Argument[this].Element; value; manual |
-| 136 | Summary: org.apache.commons.collections4.iterators; CollatingIterator; true; getIterators; ; ; Argument[this].Element; ReturnValue.Element.Element; value; manual |
-| 137 | Summary: org.apache.commons.collections4.iterators; CollatingIterator; true; setIterator; ; ; Argument[1].Element; Argument[this].Element; value; manual |
-| 138 | Summary: org.apache.commons.collections4.iterators; EnumerationIterator; true; EnumerationIterator; ; ; Argument[0].Element; Argument[this].Element; value; manual |
-| 139 | Summary: org.apache.commons.collections4.iterators; EnumerationIterator; true; getEnumeration; ; ; Argument[this].Element; ReturnValue.Element; value; manual |
-| 140 | Summary: org.apache.commons.collections4.iterators; EnumerationIterator; true; setEnumeration; ; ; Argument[0].Element; Argument[this].Element; value; manual |
-| 141 | Summary: org.apache.commons.collections4.iterators; FilterIterator; true; FilterIterator; ; ; Argument[0].Element; Argument[this].Element; value; manual |
-| 142 | Summary: org.apache.commons.collections4.iterators; FilterIterator; true; getIterator; ; ; Argument[this].Element; ReturnValue.Element; value; manual |
-| 143 | Summary: org.apache.commons.collections4.iterators; FilterIterator; true; setIterator; ; ; Argument[0].Element; Argument[this].Element; value; manual |
-| 144 | Summary: org.apache.commons.collections4.iterators; FilterListIterator; true; FilterListIterator; (ListIterator); ; Argument[0].Element; Argument[this].Element; value; manual |
-| 145 | Summary: org.apache.commons.collections4.iterators; FilterListIterator; true; FilterListIterator; (ListIterator,Predicate); ; Argument[0].Element; Argument[this].Element; value; manual |
-| 146 | Summary: org.apache.commons.collections4.iterators; FilterListIterator; true; getListIterator; ; ; Argument[this].Element; ReturnValue.Element; value; manual |
-| 147 | Summary: org.apache.commons.collections4.iterators; FilterListIterator; true; setListIterator; ; ; Argument[0].Element; Argument[this].Element; value; manual |
-| 148 | Summary: org.apache.commons.collections4.iterators; IteratorChain; true; IteratorChain; (Collection); ; Argument[0].Element.Element; Argument[this].Element; value; manual |
-| 149 | Summary: org.apache.commons.collections4.iterators; IteratorChain; true; IteratorChain; (Iterator); ; Argument[0].Element; Argument[this].Element; value; manual |
-| 150 | Summary: org.apache.commons.collections4.iterators; IteratorChain; true; IteratorChain; (Iterator,Iterator); ; Argument[0].Element; Argument[this].Element; value; manual |
-| 151 | Summary: org.apache.commons.collections4.iterators; IteratorChain; true; IteratorChain; (Iterator,Iterator); ; Argument[1].Element; Argument[this].Element; value; manual |
-| 152 | Summary: org.apache.commons.collections4.iterators; IteratorChain; true; IteratorChain; (Iterator[]); ; Argument[0].ArrayElement.Element; Argument[this].Element; value; manual |
-| 153 | Summary: org.apache.commons.collections4.iterators; IteratorChain; true; addIterator; ; ; Argument[0].Element; Argument[this].Element; value; manual |
-| 154 | Summary: org.apache.commons.collections4.iterators; IteratorEnumeration; true; IteratorEnumeration; ; ; Argument[0].Element; Argument[this].Element; value; manual |
-| 155 | Summary: org.apache.commons.collections4.iterators; IteratorEnumeration; true; getIterator; ; ; Argument[this].Element; ReturnValue.Element; value; manual |
-| 156 | Summary: org.apache.commons.collections4.iterators; IteratorEnumeration; true; setIterator; ; ; Argument[0].Element; Argument[this].Element; value; manual |
-| 157 | Summary: org.apache.commons.collections4.iterators; IteratorIterable; true; IteratorIterable; ; ; Argument[0].Element; Argument[this].Element; value; manual |
-| 158 | Summary: org.apache.commons.collections4.iterators; ListIteratorWrapper; true; ListIteratorWrapper; ; ; Argument[0].Element; Argument[this].Element; value; manual |
-| 159 | Summary: org.apache.commons.collections4.iterators; LoopingIterator; true; LoopingIterator; ; ; Argument[0].Element; Argument[this].Element; value; manual |
-| 160 | Summary: org.apache.commons.collections4.iterators; LoopingListIterator; true; LoopingListIterator; ; ; Argument[0].Element; Argument[this].Element; value; manual |
-| 161 | Summary: org.apache.commons.collections4.iterators; ObjectArrayIterator; true; ObjectArrayIterator; ; ; Argument[0].ArrayElement; Argument[this].Element; value; manual |
-| 162 | Summary: org.apache.commons.collections4.iterators; ObjectArrayIterator; true; getArray; ; ; Argument[this].Element; ReturnValue.ArrayElement; value; manual |
-| 163 | Summary: org.apache.commons.collections4.iterators; ObjectArrayListIterator; true; ObjectArrayListIterator; ; ; Argument[0].ArrayElement; Argument[this].Element; value; manual |
-| 164 | Summary: org.apache.commons.collections4.iterators; PeekingIterator; true; PeekingIterator; ; ; Argument[0].Element; Argument[this].Element; value; manual |
-| 165 | Summary: org.apache.commons.collections4.iterators; PeekingIterator; true; element; ; ; Argument[this].Element; ReturnValue; value; manual |
-| 166 | Summary: org.apache.commons.collections4.iterators; PeekingIterator; true; peek; ; ; Argument[this].Element; ReturnValue; value; manual |
-| 167 | Summary: org.apache.commons.collections4.iterators; PeekingIterator; true; peekingIterator; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
-| 168 | Summary: org.apache.commons.collections4.iterators; PermutationIterator; true; PermutationIterator; ; ; Argument[0].Element; Argument[this].Element.Element; value; manual |
-| 169 | Summary: org.apache.commons.collections4.iterators; PushbackIterator; true; PushbackIterator; ; ; Argument[0].Element; Argument[this].Element; value; manual |
-| 170 | Summary: org.apache.commons.collections4.iterators; PushbackIterator; true; pushback; ; ; Argument[0]; Argument[this].Element; value; manual |
-| 171 | Summary: org.apache.commons.collections4.iterators; PushbackIterator; true; pushbackIterator; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
-| 172 | Summary: org.apache.commons.collections4.iterators; ReverseListIterator; true; ReverseListIterator; ; ; Argument[0].Element; Argument[this].Element; value; manual |
-| 173 | Summary: org.apache.commons.collections4.iterators; SingletonIterator; true; SingletonIterator; ; ; Argument[0]; Argument[this].Element; value; manual |
-| 174 | Summary: org.apache.commons.collections4.iterators; SingletonListIterator; true; SingletonListIterator; ; ; Argument[0]; Argument[this].Element; value; manual |
-| 175 | Summary: org.apache.commons.collections4.iterators; SkippingIterator; true; SkippingIterator; ; ; Argument[0].Element; Argument[this].Element; value; manual |
-| 176 | Summary: org.apache.commons.collections4.iterators; UniqueFilterIterator; true; UniqueFilterIterator; ; ; Argument[0].Element; Argument[this].Element; value; manual |
-| 177 | Summary: org.apache.commons.collections4.iterators; UnmodifiableIterator; true; unmodifiableIterator; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
-| 178 | Summary: org.apache.commons.collections4.iterators; UnmodifiableListIterator; true; umodifiableListIterator; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
-| 179 | Summary: org.apache.commons.collections4.iterators; UnmodifiableMapIterator; true; unmodifiableMapIterator; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
-| 180 | Summary: org.apache.commons.collections4.iterators; UnmodifiableMapIterator; true; unmodifiableMapIterator; ; ; Argument[0].MapValue; ReturnValue.MapValue; value; manual |
-| 181 | Summary: org.apache.commons.collections4.iterators; UnmodifiableOrderedMapIterator; true; unmodifiableOrderedMapIterator; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
-| 182 | Summary: org.apache.commons.collections4.iterators; UnmodifiableOrderedMapIterator; true; unmodifiableOrderedMapIterator; ; ; Argument[0].MapValue; ReturnValue.MapValue; value; manual |
-| 183 | Summary: org.apache.commons.collections4.iterators; ZippingIterator; true; ZippingIterator; (Iterator,Iterator); ; Argument[0].Element; Argument[this].Element; value; manual |
-| 184 | Summary: org.apache.commons.collections4.iterators; ZippingIterator; true; ZippingIterator; (Iterator,Iterator); ; Argument[1].Element; Argument[this].Element; value; manual |
-| 185 | Summary: org.apache.commons.collections4.iterators; ZippingIterator; true; ZippingIterator; (Iterator,Iterator,Iterator); ; Argument[0].Element; Argument[this].Element; value; manual |
-| 186 | Summary: org.apache.commons.collections4.iterators; ZippingIterator; true; ZippingIterator; (Iterator,Iterator,Iterator); ; Argument[1].Element; Argument[this].Element; value; manual |
-| 187 | Summary: org.apache.commons.collections4.iterators; ZippingIterator; true; ZippingIterator; (Iterator,Iterator,Iterator); ; Argument[2].Element; Argument[this].Element; value; manual |
-| 188 | Summary: org.apache.commons.collections4.iterators; ZippingIterator; true; ZippingIterator; (Iterator[]); ; Argument[0].ArrayElement.Element; Argument[this].Element; value; manual |
-| 189 | Summary: org.apache.commons.collections4.keyvalue; AbstractKeyValue; true; AbstractKeyValue; ; ; Argument[0]; Argument[this].MapKey; value; manual |
-| 190 | Summary: org.apache.commons.collections4.keyvalue; AbstractKeyValue; true; AbstractKeyValue; ; ; Argument[1]; Argument[this].MapValue; value; manual |
-| 191 | Summary: org.apache.commons.collections4.keyvalue; AbstractKeyValue; true; setKey; ; ; Argument[this].MapKey; ReturnValue; value; manual |
-| 192 | Summary: org.apache.commons.collections4.keyvalue; AbstractKeyValue; true; setKey; ; ; Argument[0]; Argument[this].MapKey; value; manual |
-| 193 | Summary: org.apache.commons.collections4.keyvalue; AbstractKeyValue; true; setValue; ; ; Argument[this].MapValue; ReturnValue; value; manual |
-| 194 | Summary: org.apache.commons.collections4.keyvalue; AbstractKeyValue; true; setValue; ; ; Argument[0]; Argument[this].MapValue; value; manual |
-| 195 | Summary: org.apache.commons.collections4.keyvalue; AbstractMapEntry; true; AbstractMapEntry; ; ; Argument[0]; Argument[this].MapKey; value; manual |
-| 196 | Summary: org.apache.commons.collections4.keyvalue; AbstractMapEntry; true; AbstractMapEntry; ; ; Argument[1]; Argument[this].MapValue; value; manual |
-| 197 | Summary: org.apache.commons.collections4.keyvalue; AbstractMapEntryDecorator; true; AbstractMapEntryDecorator; ; ; Argument[0].MapKey; Argument[this].MapKey; value; manual |
-| 198 | Summary: org.apache.commons.collections4.keyvalue; AbstractMapEntryDecorator; true; AbstractMapEntryDecorator; ; ; Argument[0].MapValue; Argument[this].MapValue; value; manual |
-| 199 | Summary: org.apache.commons.collections4.keyvalue; AbstractMapEntryDecorator; true; getMapEntry; ; ; Argument[this].MapKey; ReturnValue.MapKey; value; manual |
-| 200 | Summary: org.apache.commons.collections4.keyvalue; AbstractMapEntryDecorator; true; getMapEntry; ; ; Argument[this].MapValue; ReturnValue.MapValue; value; manual |
-| 201 | Summary: org.apache.commons.collections4.keyvalue; DefaultKeyValue; true; DefaultKeyValue; (Map$Entry); ; Argument[0].MapKey; Argument[this].MapKey; value; manual |
-| 202 | Summary: org.apache.commons.collections4.keyvalue; DefaultKeyValue; true; DefaultKeyValue; (Map$Entry); ; Argument[0].MapValue; Argument[this].MapValue; value; manual |
+| 109 | Summary: org.apache.commons.collections4.collection; PredicatedCollection$Builder; true; createPredicatedSet; ; ; Argument[this].Element; ReturnValue.Element; value; manual |
+| 110 | Summary: org.apache.commons.collections4.collection; PredicatedCollection$Builder; true; rejectedElements; ; ; Argument[this].Element; ReturnValue.Element; value; manual |
+| 111 | Summary: org.apache.commons.collections4.collection; PredicatedCollection; true; predicatedCollection; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
+| 112 | Summary: org.apache.commons.collections4.collection; SynchronizedCollection; true; synchronizedCollection; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
+| 113 | Summary: org.apache.commons.collections4.collection; TransformedCollection; true; transformingCollection; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
+| 114 | Summary: org.apache.commons.collections4.collection; UnmodifiableBoundedCollection; true; unmodifiableBoundedCollection; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
+| 115 | Summary: org.apache.commons.collections4.collection; UnmodifiableCollection; true; unmodifiableCollection; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
+| 116 | Summary: org.apache.commons.collections4.iterators; AbstractIteratorDecorator; true; AbstractIteratorDecorator; ; ; Argument[0].Element; Argument[this].Element; value; manual |
+| 117 | Summary: org.apache.commons.collections4.iterators; AbstractListIteratorDecorator; true; AbstractListIteratorDecorator; ; ; Argument[0].Element; Argument[this].Element; value; manual |
+| 118 | Summary: org.apache.commons.collections4.iterators; AbstractListIteratorDecorator; true; getListIterator; ; ; Argument[this].Element; ReturnValue.Element; value; manual |
+| 119 | Summary: org.apache.commons.collections4.iterators; AbstractMapIteratorDecorator; true; AbstractMapIteratorDecorator; ; ; Argument[0].Element; Argument[this].Element; value; manual |
+| 120 | Summary: org.apache.commons.collections4.iterators; AbstractMapIteratorDecorator; true; AbstractMapIteratorDecorator; ; ; Argument[0].MapValue; Argument[this].MapValue; value; manual |
+| 121 | Summary: org.apache.commons.collections4.iterators; AbstractMapIteratorDecorator; true; getMapIterator; ; ; Argument[this].Element; ReturnValue.Element; value; manual |
+| 122 | Summary: org.apache.commons.collections4.iterators; AbstractMapIteratorDecorator; true; getMapIterator; ; ; Argument[this].MapValue; ReturnValue.MapValue; value; manual |
+| 123 | Summary: org.apache.commons.collections4.iterators; AbstractOrderedMapIteratorDecorator; true; AbstractOrderedMapIteratorDecorator; ; ; Argument[0].Element; Argument[this].Element; value; manual |
+| 124 | Summary: org.apache.commons.collections4.iterators; AbstractOrderedMapIteratorDecorator; true; AbstractOrderedMapIteratorDecorator; ; ; Argument[0].MapValue; Argument[this].MapValue; value; manual |
+| 125 | Summary: org.apache.commons.collections4.iterators; AbstractOrderedMapIteratorDecorator; true; getOrderedMapIterator; ; ; Argument[this].Element; ReturnValue.Element; value; manual |
+| 126 | Summary: org.apache.commons.collections4.iterators; AbstractOrderedMapIteratorDecorator; true; getOrderedMapIterator; ; ; Argument[this].MapValue; ReturnValue.MapValue; value; manual |
+| 127 | Summary: org.apache.commons.collections4.iterators; AbstractUntypedIteratorDecorator; true; AbstractUntypedIteratorDecorator; ; ; Argument[0].Element; Argument[this].Element; value; manual |
+| 128 | Summary: org.apache.commons.collections4.iterators; AbstractUntypedIteratorDecorator; true; getIterator; ; ; Argument[this].Element; ReturnValue.Element; value; manual |
+| 129 | Summary: org.apache.commons.collections4.iterators; ArrayIterator; true; ArrayIterator; ; ; Argument[0].ArrayElement; Argument[this].Element; value; manual |
+| 130 | Summary: org.apache.commons.collections4.iterators; ArrayIterator; true; getArray; ; ; Argument[this].Element; ReturnValue.ArrayElement; value; manual |
+| 131 | Summary: org.apache.commons.collections4.iterators; ArrayListIterator; true; ArrayListIterator; ; ; Argument[0].ArrayElement; Argument[this].Element; value; manual |
+| 132 | Summary: org.apache.commons.collections4.iterators; BoundedIterator; true; BoundedIterator; ; ; Argument[0].Element; Argument[this].Element; value; manual |
+| 133 | Summary: org.apache.commons.collections4.iterators; CollatingIterator; true; CollatingIterator; (Comparator,Collection); ; Argument[1].Element.Element; Argument[this].Element; value; manual |
+| 134 | Summary: org.apache.commons.collections4.iterators; CollatingIterator; true; CollatingIterator; (Comparator,Iterator,Iterator); ; Argument[1].Element; Argument[this].Element; value; manual |
+| 135 | Summary: org.apache.commons.collections4.iterators; CollatingIterator; true; CollatingIterator; (Comparator,Iterator,Iterator); ; Argument[2].Element; Argument[this].Element; value; manual |
+| 136 | Summary: org.apache.commons.collections4.iterators; CollatingIterator; true; CollatingIterator; (Comparator,Iterator[]); ; Argument[1].ArrayElement.Element; Argument[this].Element; value; manual |
+| 137 | Summary: org.apache.commons.collections4.iterators; CollatingIterator; true; addIterator; ; ; Argument[0].Element; Argument[this].Element; value; manual |
+| 138 | Summary: org.apache.commons.collections4.iterators; CollatingIterator; true; getIterators; ; ; Argument[this].Element; ReturnValue.Element.Element; value; manual |
+| 139 | Summary: org.apache.commons.collections4.iterators; CollatingIterator; true; setIterator; ; ; Argument[1].Element; Argument[this].Element; value; manual |
+| 140 | Summary: org.apache.commons.collections4.iterators; EnumerationIterator; true; EnumerationIterator; ; ; Argument[0].Element; Argument[this].Element; value; manual |
+| 141 | Summary: org.apache.commons.collections4.iterators; EnumerationIterator; true; getEnumeration; ; ; Argument[this].Element; ReturnValue.Element; value; manual |
+| 142 | Summary: org.apache.commons.collections4.iterators; EnumerationIterator; true; setEnumeration; ; ; Argument[0].Element; Argument[this].Element; value; manual |
+| 143 | Summary: org.apache.commons.collections4.iterators; FilterIterator; true; FilterIterator; ; ; Argument[0].Element; Argument[this].Element; value; manual |
+| 144 | Summary: org.apache.commons.collections4.iterators; FilterIterator; true; getIterator; ; ; Argument[this].Element; ReturnValue.Element; value; manual |
+| 145 | Summary: org.apache.commons.collections4.iterators; FilterIterator; true; setIterator; ; ; Argument[0].Element; Argument[this].Element; value; manual |
+| 146 | Summary: org.apache.commons.collections4.iterators; FilterListIterator; true; FilterListIterator; (ListIterator); ; Argument[0].Element; Argument[this].Element; value; manual |
+| 147 | Summary: org.apache.commons.collections4.iterators; FilterListIterator; true; FilterListIterator; (ListIterator,Predicate); ; Argument[0].Element; Argument[this].Element; value; manual |
+| 148 | Summary: org.apache.commons.collections4.iterators; FilterListIterator; true; getListIterator; ; ; Argument[this].Element; ReturnValue.Element; value; manual |
+| 149 | Summary: org.apache.commons.collections4.iterators; FilterListIterator; true; setListIterator; ; ; Argument[0].Element; Argument[this].Element; value; manual |
+| 150 | Summary: org.apache.commons.collections4.iterators; IteratorChain; true; IteratorChain; (Collection); ; Argument[0].Element.Element; Argument[this].Element; value; manual |
+| 151 | Summary: org.apache.commons.collections4.iterators; IteratorChain; true; IteratorChain; (Iterator); ; Argument[0].Element; Argument[this].Element; value; manual |
+| 152 | Summary: org.apache.commons.collections4.iterators; IteratorChain; true; IteratorChain; (Iterator,Iterator); ; Argument[0].Element; Argument[this].Element; value; manual |
+| 153 | Summary: org.apache.commons.collections4.iterators; IteratorChain; true; IteratorChain; (Iterator,Iterator); ; Argument[1].Element; Argument[this].Element; value; manual |
+| 154 | Summary: org.apache.commons.collections4.iterators; IteratorChain; true; IteratorChain; (Iterator[]); ; Argument[0].ArrayElement.Element; Argument[this].Element; value; manual |
+| 155 | Summary: org.apache.commons.collections4.iterators; IteratorChain; true; addIterator; ; ; Argument[0].Element; Argument[this].Element; value; manual |
+| 156 | Summary: org.apache.commons.collections4.iterators; IteratorEnumeration; true; IteratorEnumeration; ; ; Argument[0].Element; Argument[this].Element; value; manual |
+| 157 | Summary: org.apache.commons.collections4.iterators; IteratorEnumeration; true; getIterator; ; ; Argument[this].Element; ReturnValue.Element; value; manual |
+| 158 | Summary: org.apache.commons.collections4.iterators; IteratorEnumeration; true; setIterator; ; ; Argument[0].Element; Argument[this].Element; value; manual |
+| 159 | Summary: org.apache.commons.collections4.iterators; IteratorIterable; true; IteratorIterable; ; ; Argument[0].Element; Argument[this].Element; value; manual |
+| 160 | Summary: org.apache.commons.collections4.iterators; ListIteratorWrapper; true; ListIteratorWrapper; ; ; Argument[0].Element; Argument[this].Element; value; manual |
+| 161 | Summary: org.apache.commons.collections4.iterators; LoopingIterator; true; LoopingIterator; ; ; Argument[0].Element; Argument[this].Element; value; manual |
+| 162 | Summary: org.apache.commons.collections4.iterators; LoopingListIterator; true; LoopingListIterator; ; ; Argument[0].Element; Argument[this].Element; value; manual |
+| 163 | Summary: org.apache.commons.collections4.iterators; ObjectArrayIterator; true; ObjectArrayIterator; ; ; Argument[0].ArrayElement; Argument[this].Element; value; manual |
+| 164 | Summary: org.apache.commons.collections4.iterators; ObjectArrayIterator; true; getArray; ; ; Argument[this].Element; ReturnValue.ArrayElement; value; manual |
+| 165 | Summary: org.apache.commons.collections4.iterators; ObjectArrayListIterator; true; ObjectArrayListIterator; ; ; Argument[0].ArrayElement; Argument[this].Element; value; manual |
+| 166 | Summary: org.apache.commons.collections4.iterators; PeekingIterator; true; PeekingIterator; ; ; Argument[0].Element; Argument[this].Element; value; manual |
+| 167 | Summary: org.apache.commons.collections4.iterators; PeekingIterator; true; element; ; ; Argument[this].Element; ReturnValue; value; manual |
+| 168 | Summary: org.apache.commons.collections4.iterators; PeekingIterator; true; peek; ; ; Argument[this].Element; ReturnValue; value; manual |
+| 169 | Summary: org.apache.commons.collections4.iterators; PeekingIterator; true; peekingIterator; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
+| 170 | Summary: org.apache.commons.collections4.iterators; PermutationIterator; true; PermutationIterator; ; ; Argument[0].Element; Argument[this].Element.Element; value; manual |
+| 171 | Summary: org.apache.commons.collections4.iterators; PushbackIterator; true; PushbackIterator; ; ; Argument[0].Element; Argument[this].Element; value; manual |
+| 172 | Summary: org.apache.commons.collections4.iterators; PushbackIterator; true; pushback; ; ; Argument[0]; Argument[this].Element; value; manual |
+| 173 | Summary: org.apache.commons.collections4.iterators; PushbackIterator; true; pushbackIterator; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
+| 174 | Summary: org.apache.commons.collections4.iterators; ReverseListIterator; true; ReverseListIterator; ; ; Argument[0].Element; Argument[this].Element; value; manual |
+| 175 | Summary: org.apache.commons.collections4.iterators; SingletonIterator; true; SingletonIterator; ; ; Argument[0]; Argument[this].Element; value; manual |
+| 176 | Summary: org.apache.commons.collections4.iterators; SingletonListIterator; true; SingletonListIterator; ; ; Argument[0]; Argument[this].Element; value; manual |
+| 177 | Summary: org.apache.commons.collections4.iterators; SkippingIterator; true; SkippingIterator; ; ; Argument[0].Element; Argument[this].Element; value; manual |
+| 178 | Summary: org.apache.commons.collections4.iterators; UniqueFilterIterator; true; UniqueFilterIterator; ; ; Argument[0].Element; Argument[this].Element; value; manual |
+| 179 | Summary: org.apache.commons.collections4.iterators; UnmodifiableIterator; true; unmodifiableIterator; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
+| 180 | Summary: org.apache.commons.collections4.iterators; UnmodifiableListIterator; true; umodifiableListIterator; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
+| 181 | Summary: org.apache.commons.collections4.iterators; UnmodifiableMapIterator; true; unmodifiableMapIterator; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
+| 182 | Summary: org.apache.commons.collections4.iterators; UnmodifiableMapIterator; true; unmodifiableMapIterator; ; ; Argument[0].MapValue; ReturnValue.MapValue; value; manual |
+| 183 | Summary: org.apache.commons.collections4.iterators; UnmodifiableOrderedMapIterator; true; unmodifiableOrderedMapIterator; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
+| 184 | Summary: org.apache.commons.collections4.iterators; UnmodifiableOrderedMapIterator; true; unmodifiableOrderedMapIterator; ; ; Argument[0].MapValue; ReturnValue.MapValue; value; manual |
+| 185 | Summary: org.apache.commons.collections4.iterators; ZippingIterator; true; ZippingIterator; (Iterator,Iterator); ; Argument[0].Element; Argument[this].Element; value; manual |
+| 186 | Summary: org.apache.commons.collections4.iterators; ZippingIterator; true; ZippingIterator; (Iterator,Iterator); ; Argument[1].Element; Argument[this].Element; value; manual |
+| 187 | Summary: org.apache.commons.collections4.iterators; ZippingIterator; true; ZippingIterator; (Iterator,Iterator,Iterator); ; Argument[0].Element; Argument[this].Element; value; manual |
+| 188 | Summary: org.apache.commons.collections4.iterators; ZippingIterator; true; ZippingIterator; (Iterator,Iterator,Iterator); ; Argument[1].Element; Argument[this].Element; value; manual |
+| 189 | Summary: org.apache.commons.collections4.iterators; ZippingIterator; true; ZippingIterator; (Iterator,Iterator,Iterator); ; Argument[2].Element; Argument[this].Element; value; manual |
+| 190 | Summary: org.apache.commons.collections4.iterators; ZippingIterator; true; ZippingIterator; (Iterator[]); ; Argument[0].ArrayElement.Element; Argument[this].Element; value; manual |
+| 191 | Summary: org.apache.commons.collections4.keyvalue; AbstractKeyValue; true; AbstractKeyValue; ; ; Argument[0]; Argument[this].MapKey; value; manual |
+| 192 | Summary: org.apache.commons.collections4.keyvalue; AbstractKeyValue; true; AbstractKeyValue; ; ; Argument[1]; Argument[this].MapValue; value; manual |
+| 193 | Summary: org.apache.commons.collections4.keyvalue; AbstractKeyValue; true; setKey; ; ; Argument[0]; Argument[this].MapKey; value; manual |
+| 194 | Summary: org.apache.commons.collections4.keyvalue; AbstractKeyValue; true; setKey; ; ; Argument[this].MapKey; ReturnValue; value; manual |
+| 195 | Summary: org.apache.commons.collections4.keyvalue; AbstractKeyValue; true; setValue; ; ; Argument[0]; Argument[this].MapValue; value; manual |
+| 196 | Summary: org.apache.commons.collections4.keyvalue; AbstractKeyValue; true; setValue; ; ; Argument[this].MapValue; ReturnValue; value; manual |
+| 197 | Summary: org.apache.commons.collections4.keyvalue; AbstractMapEntry; true; AbstractMapEntry; ; ; Argument[0]; Argument[this].MapKey; value; manual |
+| 198 | Summary: org.apache.commons.collections4.keyvalue; AbstractMapEntry; true; AbstractMapEntry; ; ; Argument[1]; Argument[this].MapValue; value; manual |
+| 199 | Summary: org.apache.commons.collections4.keyvalue; AbstractMapEntryDecorator; true; AbstractMapEntryDecorator; ; ; Argument[0].MapKey; Argument[this].MapKey; value; manual |
+| 200 | Summary: org.apache.commons.collections4.keyvalue; AbstractMapEntryDecorator; true; AbstractMapEntryDecorator; ; ; Argument[0].MapValue; Argument[this].MapValue; value; manual |
+| 201 | Summary: org.apache.commons.collections4.keyvalue; AbstractMapEntryDecorator; true; getMapEntry; ; ; Argument[this].MapKey; ReturnValue.MapKey; value; manual |
+| 202 | Summary: org.apache.commons.collections4.keyvalue; AbstractMapEntryDecorator; true; getMapEntry; ; ; Argument[this].MapValue; ReturnValue.MapValue; value; manual |
 | 203 | Summary: org.apache.commons.collections4.keyvalue; DefaultKeyValue; true; DefaultKeyValue; (KeyValue); ; Argument[0].MapKey; Argument[this].MapKey; value; manual |
 | 204 | Summary: org.apache.commons.collections4.keyvalue; DefaultKeyValue; true; DefaultKeyValue; (KeyValue); ; Argument[0].MapValue; Argument[this].MapValue; value; manual |
-| 205 | Summary: org.apache.commons.collections4.keyvalue; DefaultKeyValue; true; DefaultKeyValue; (Object,Object); ; Argument[0]; Argument[this].MapKey; value; manual |
-| 206 | Summary: org.apache.commons.collections4.keyvalue; DefaultKeyValue; true; DefaultKeyValue; (Object,Object); ; Argument[1]; Argument[this].MapValue; value; manual |
-| 207 | Summary: org.apache.commons.collections4.keyvalue; DefaultKeyValue; true; toMapEntry; ; ; Argument[this].MapKey; ReturnValue.MapKey; value; manual |
-| 208 | Summary: org.apache.commons.collections4.keyvalue; DefaultKeyValue; true; toMapEntry; ; ; Argument[this].MapValue; ReturnValue.MapValue; value; manual |
-| 209 | Summary: org.apache.commons.collections4.keyvalue; DefaultMapEntry; true; DefaultMapEntry; (Map$Entry); ; Argument[0].MapKey; Argument[this].MapKey; value; manual |
-| 210 | Summary: org.apache.commons.collections4.keyvalue; DefaultMapEntry; true; DefaultMapEntry; (Map$Entry); ; Argument[0].MapValue; Argument[this].MapValue; value; manual |
+| 205 | Summary: org.apache.commons.collections4.keyvalue; DefaultKeyValue; true; DefaultKeyValue; (Map$Entry); ; Argument[0].MapKey; Argument[this].MapKey; value; manual |
+| 206 | Summary: org.apache.commons.collections4.keyvalue; DefaultKeyValue; true; DefaultKeyValue; (Map$Entry); ; Argument[0].MapValue; Argument[this].MapValue; value; manual |
+| 207 | Summary: org.apache.commons.collections4.keyvalue; DefaultKeyValue; true; DefaultKeyValue; (Object,Object); ; Argument[0]; Argument[this].MapKey; value; manual |
+| 208 | Summary: org.apache.commons.collections4.keyvalue; DefaultKeyValue; true; DefaultKeyValue; (Object,Object); ; Argument[1]; Argument[this].MapValue; value; manual |
+| 209 | Summary: org.apache.commons.collections4.keyvalue; DefaultKeyValue; true; toMapEntry; ; ; Argument[this].MapKey; ReturnValue.MapKey; value; manual |
+| 210 | Summary: org.apache.commons.collections4.keyvalue; DefaultKeyValue; true; toMapEntry; ; ; Argument[this].MapValue; ReturnValue.MapValue; value; manual |
 | 211 | Summary: org.apache.commons.collections4.keyvalue; DefaultMapEntry; true; DefaultMapEntry; (KeyValue); ; Argument[0].MapKey; Argument[this].MapKey; value; manual |
 | 212 | Summary: org.apache.commons.collections4.keyvalue; DefaultMapEntry; true; DefaultMapEntry; (KeyValue); ; Argument[0].MapValue; Argument[this].MapValue; value; manual |
-| 213 | Summary: org.apache.commons.collections4.keyvalue; DefaultMapEntry; true; DefaultMapEntry; (Object,Object); ; Argument[0]; Argument[this].MapKey; value; manual |
-| 214 | Summary: org.apache.commons.collections4.keyvalue; DefaultMapEntry; true; DefaultMapEntry; (Object,Object); ; Argument[1]; Argument[this].MapValue; value; manual |
-| 215 | Summary: org.apache.commons.collections4.keyvalue; MultiKey; true; MultiKey; (Object,Object); ; Argument[0]; Argument[this].Element; value; manual |
-| 216 | Summary: org.apache.commons.collections4.keyvalue; MultiKey; true; MultiKey; (Object,Object); ; Argument[1]; Argument[this].Element; value; manual |
-| 217 | Summary: org.apache.commons.collections4.keyvalue; MultiKey; true; MultiKey; (Object,Object,Object); ; Argument[0]; Argument[this].Element; value; manual |
-| 218 | Summary: org.apache.commons.collections4.keyvalue; MultiKey; true; MultiKey; (Object,Object,Object); ; Argument[1]; Argument[this].Element; value; manual |
-| 219 | Summary: org.apache.commons.collections4.keyvalue; MultiKey; true; MultiKey; (Object,Object,Object); ; Argument[2]; Argument[this].Element; value; manual |
-| 220 | Summary: org.apache.commons.collections4.keyvalue; MultiKey; true; MultiKey; (Object,Object,Object,Object); ; Argument[0]; Argument[this].Element; value; manual |
-| 221 | Summary: org.apache.commons.collections4.keyvalue; MultiKey; true; MultiKey; (Object,Object,Object,Object); ; Argument[1]; Argument[this].Element; value; manual |
-| 222 | Summary: org.apache.commons.collections4.keyvalue; MultiKey; true; MultiKey; (Object,Object,Object,Object); ; Argument[2]; Argument[this].Element; value; manual |
-| 223 | Summary: org.apache.commons.collections4.keyvalue; MultiKey; true; MultiKey; (Object,Object,Object,Object); ; Argument[3]; Argument[this].Element; value; manual |
-| 224 | Summary: org.apache.commons.collections4.keyvalue; MultiKey; true; MultiKey; (Object,Object,Object,Object,Object); ; Argument[0]; Argument[this].Element; value; manual |
-| 225 | Summary: org.apache.commons.collections4.keyvalue; MultiKey; true; MultiKey; (Object,Object,Object,Object,Object); ; Argument[1]; Argument[this].Element; value; manual |
-| 226 | Summary: org.apache.commons.collections4.keyvalue; MultiKey; true; MultiKey; (Object,Object,Object,Object,Object); ; Argument[2]; Argument[this].Element; value; manual |
-| 227 | Summary: org.apache.commons.collections4.keyvalue; MultiKey; true; MultiKey; (Object,Object,Object,Object,Object); ; Argument[3]; Argument[this].Element; value; manual |
-| 228 | Summary: org.apache.commons.collections4.keyvalue; MultiKey; true; MultiKey; (Object,Object,Object,Object,Object); ; Argument[4]; Argument[this].Element; value; manual |
-| 229 | Summary: org.apache.commons.collections4.keyvalue; MultiKey; true; MultiKey; (Object[]); ; Argument[0].ArrayElement; Argument[this].Element; value; manual |
-| 230 | Summary: org.apache.commons.collections4.keyvalue; MultiKey; true; MultiKey; (Object[],boolean); ; Argument[0].ArrayElement; Argument[this].Element; value; manual |
-| 231 | Summary: org.apache.commons.collections4.keyvalue; MultiKey; true; getKey; ; ; Argument[this].Element; ReturnValue; value; manual |
-| 232 | Summary: org.apache.commons.collections4.keyvalue; MultiKey; true; getKeys; ; ; Argument[this].Element; ReturnValue.ArrayElement; value; manual |
-| 233 | Summary: org.apache.commons.collections4.keyvalue; TiedMapEntry; true; TiedMapEntry; ; ; Argument[0].MapValue; Argument[this].MapValue; value; manual |
-| 234 | Summary: org.apache.commons.collections4.keyvalue; TiedMapEntry; true; TiedMapEntry; ; ; Argument[1]; Argument[this].MapKey; value; manual |
-| 235 | Summary: org.apache.commons.collections4.keyvalue; UnmodifiableMapEntry; true; UnmodifiableMapEntry; (Map$Entry); ; Argument[0].MapKey; Argument[this].MapKey; value; manual |
-| 236 | Summary: org.apache.commons.collections4.keyvalue; UnmodifiableMapEntry; true; UnmodifiableMapEntry; (Map$Entry); ; Argument[0].MapValue; Argument[this].MapValue; value; manual |
+| 213 | Summary: org.apache.commons.collections4.keyvalue; DefaultMapEntry; true; DefaultMapEntry; (Map$Entry); ; Argument[0].MapKey; Argument[this].MapKey; value; manual |
+| 214 | Summary: org.apache.commons.collections4.keyvalue; DefaultMapEntry; true; DefaultMapEntry; (Map$Entry); ; Argument[0].MapValue; Argument[this].MapValue; value; manual |
+| 215 | Summary: org.apache.commons.collections4.keyvalue; DefaultMapEntry; true; DefaultMapEntry; (Object,Object); ; Argument[0]; Argument[this].MapKey; value; manual |
+| 216 | Summary: org.apache.commons.collections4.keyvalue; DefaultMapEntry; true; DefaultMapEntry; (Object,Object); ; Argument[1]; Argument[this].MapValue; value; manual |
+| 217 | Summary: org.apache.commons.collections4.keyvalue; MultiKey; true; MultiKey; (Object,Object); ; Argument[0]; Argument[this].Element; value; manual |
+| 218 | Summary: org.apache.commons.collections4.keyvalue; MultiKey; true; MultiKey; (Object,Object); ; Argument[1]; Argument[this].Element; value; manual |
+| 219 | Summary: org.apache.commons.collections4.keyvalue; MultiKey; true; MultiKey; (Object,Object,Object); ; Argument[0]; Argument[this].Element; value; manual |
+| 220 | Summary: org.apache.commons.collections4.keyvalue; MultiKey; true; MultiKey; (Object,Object,Object); ; Argument[1]; Argument[this].Element; value; manual |
+| 221 | Summary: org.apache.commons.collections4.keyvalue; MultiKey; true; MultiKey; (Object,Object,Object); ; Argument[2]; Argument[this].Element; value; manual |
+| 222 | Summary: org.apache.commons.collections4.keyvalue; MultiKey; true; MultiKey; (Object,Object,Object,Object); ; Argument[0]; Argument[this].Element; value; manual |
+| 223 | Summary: org.apache.commons.collections4.keyvalue; MultiKey; true; MultiKey; (Object,Object,Object,Object); ; Argument[1]; Argument[this].Element; value; manual |
+| 224 | Summary: org.apache.commons.collections4.keyvalue; MultiKey; true; MultiKey; (Object,Object,Object,Object); ; Argument[2]; Argument[this].Element; value; manual |
+| 225 | Summary: org.apache.commons.collections4.keyvalue; MultiKey; true; MultiKey; (Object,Object,Object,Object); ; Argument[3]; Argument[this].Element; value; manual |
+| 226 | Summary: org.apache.commons.collections4.keyvalue; MultiKey; true; MultiKey; (Object,Object,Object,Object,Object); ; Argument[0]; Argument[this].Element; value; manual |
+| 227 | Summary: org.apache.commons.collections4.keyvalue; MultiKey; true; MultiKey; (Object,Object,Object,Object,Object); ; Argument[1]; Argument[this].Element; value; manual |
+| 228 | Summary: org.apache.commons.collections4.keyvalue; MultiKey; true; MultiKey; (Object,Object,Object,Object,Object); ; Argument[2]; Argument[this].Element; value; manual |
+| 229 | Summary: org.apache.commons.collections4.keyvalue; MultiKey; true; MultiKey; (Object,Object,Object,Object,Object); ; Argument[3]; Argument[this].Element; value; manual |
+| 230 | Summary: org.apache.commons.collections4.keyvalue; MultiKey; true; MultiKey; (Object,Object,Object,Object,Object); ; Argument[4]; Argument[this].Element; value; manual |
+| 231 | Summary: org.apache.commons.collections4.keyvalue; MultiKey; true; MultiKey; (Object[]); ; Argument[0].ArrayElement; Argument[this].Element; value; manual |
+| 232 | Summary: org.apache.commons.collections4.keyvalue; MultiKey; true; MultiKey; (Object[],boolean); ; Argument[0].ArrayElement; Argument[this].Element; value; manual |
+| 233 | Summary: org.apache.commons.collections4.keyvalue; MultiKey; true; getKey; ; ; Argument[this].Element; ReturnValue; value; manual |
+| 234 | Summary: org.apache.commons.collections4.keyvalue; MultiKey; true; getKeys; ; ; Argument[this].Element; ReturnValue.ArrayElement; value; manual |
+| 235 | Summary: org.apache.commons.collections4.keyvalue; TiedMapEntry; true; TiedMapEntry; ; ; Argument[0].MapValue; Argument[this].MapValue; value; manual |
+| 236 | Summary: org.apache.commons.collections4.keyvalue; TiedMapEntry; true; TiedMapEntry; ; ; Argument[1]; Argument[this].MapKey; value; manual |
 | 237 | Summary: org.apache.commons.collections4.keyvalue; UnmodifiableMapEntry; true; UnmodifiableMapEntry; (KeyValue); ; Argument[0].MapKey; Argument[this].MapKey; value; manual |
 | 238 | Summary: org.apache.commons.collections4.keyvalue; UnmodifiableMapEntry; true; UnmodifiableMapEntry; (KeyValue); ; Argument[0].MapValue; Argument[this].MapValue; value; manual |
-| 239 | Summary: org.apache.commons.collections4.keyvalue; UnmodifiableMapEntry; true; UnmodifiableMapEntry; (Object,Object); ; Argument[0]; Argument[this].MapKey; value; manual |
-| 240 | Summary: org.apache.commons.collections4.keyvalue; UnmodifiableMapEntry; true; UnmodifiableMapEntry; (Object,Object); ; Argument[1]; Argument[this].MapValue; value; manual |
-| 241 | Summary: org.apache.commons.collections4.list; AbstractLinkedList; true; AbstractLinkedList; ; ; Argument[0].Element; Argument[this].Element; value; manual |
-| 242 | Summary: org.apache.commons.collections4.list; AbstractLinkedList; true; addFirst; ; ; Argument[0]; Argument[this].Element; value; manual |
-| 243 | Summary: org.apache.commons.collections4.list; AbstractLinkedList; true; addLast; ; ; Argument[0]; Argument[this].Element; value; manual |
-| 244 | Summary: org.apache.commons.collections4.list; AbstractLinkedList; true; getFirst; ; ; Argument[this].Element; ReturnValue; value; manual |
-| 245 | Summary: org.apache.commons.collections4.list; AbstractLinkedList; true; getLast; ; ; Argument[this].Element; ReturnValue; value; manual |
-| 246 | Summary: org.apache.commons.collections4.list; AbstractLinkedList; true; removeFirst; ; ; Argument[this].Element; ReturnValue; value; manual |
-| 247 | Summary: org.apache.commons.collections4.list; AbstractLinkedList; true; removeLast; ; ; Argument[this].Element; ReturnValue; value; manual |
-| 248 | Summary: org.apache.commons.collections4.list; AbstractListDecorator; true; AbstractListDecorator; ; ; Argument[0].Element; Argument[this].Element; value; manual |
-| 249 | Summary: org.apache.commons.collections4.list; AbstractSerializableListDecorator; true; AbstractSerializableListDecorator; ; ; Argument[0].Element; Argument[this].Element; value; manual |
-| 250 | Summary: org.apache.commons.collections4.list; CursorableLinkedList; true; CursorableLinkedList; ; ; Argument[0].Element; Argument[this].Element; value; manual |
-| 251 | Summary: org.apache.commons.collections4.list; CursorableLinkedList; true; cursor; ; ; Argument[this].Element; ReturnValue.Element; value; manual |
-| 252 | Summary: org.apache.commons.collections4.list; FixedSizeList; true; fixedSizeList; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
-| 253 | Summary: org.apache.commons.collections4.list; GrowthList; true; growthList; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
-| 254 | Summary: org.apache.commons.collections4.list; LazyList; true; lazyList; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
-| 255 | Summary: org.apache.commons.collections4.list; NodeCachingLinkedList; true; NodeCachingLinkedList; (Collection); ; Argument[0].Element; Argument[this].Element; value; manual |
-| 256 | Summary: org.apache.commons.collections4.list; PredicatedList; true; predicatedList; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
-| 257 | Summary: org.apache.commons.collections4.list; SetUniqueList; true; asSet; ; ; Argument[this].Element; ReturnValue.Element; value; manual |
-| 258 | Summary: org.apache.commons.collections4.list; SetUniqueList; true; setUniqueList; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
-| 259 | Summary: org.apache.commons.collections4.list; TransformedList; true; transformingList; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
-| 260 | Summary: org.apache.commons.collections4.list; TreeList; true; TreeList; ; ; Argument[0].Element; Argument[this].Element; value; manual |
-| 261 | Summary: org.apache.commons.collections4.list; UnmodifiableList; true; UnmodifiableList; ; ; Argument[0].Element; Argument[this].Element; value; manual |
-| 262 | Summary: org.apache.commons.collections4.list; UnmodifiableList; true; unmodifiableList; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
-| 263 | Summary: org.apache.commons.collections4.map; AbstractHashedMap; true; AbstractHashedMap; (Map); ; Argument[0].MapKey; Argument[this].MapKey; value; manual |
-| 264 | Summary: org.apache.commons.collections4.map; AbstractHashedMap; true; AbstractHashedMap; (Map); ; Argument[0].MapValue; Argument[this].MapValue; value; manual |
-| 265 | Summary: org.apache.commons.collections4.map; AbstractLinkedMap; true; AbstractLinkedMap; (Map); ; Argument[0].MapKey; Argument[this].MapKey; value; manual |
-| 266 | Summary: org.apache.commons.collections4.map; AbstractLinkedMap; true; AbstractLinkedMap; (Map); ; Argument[0].MapValue; Argument[this].MapValue; value; manual |
-| 267 | Summary: org.apache.commons.collections4.map; AbstractMapDecorator; true; AbstractMapDecorator; (Map); ; Argument[0].MapKey; Argument[this].MapKey; value; manual |
-| 268 | Summary: org.apache.commons.collections4.map; AbstractMapDecorator; true; AbstractMapDecorator; (Map); ; Argument[0].MapValue; Argument[this].MapValue; value; manual |
-| 269 | Summary: org.apache.commons.collections4.map; AbstractMapDecorator; true; decorated; ; ; Argument[this].MapKey; ReturnValue.MapKey; value; manual |
-| 270 | Summary: org.apache.commons.collections4.map; AbstractMapDecorator; true; decorated; ; ; Argument[this].MapValue; ReturnValue.MapValue; value; manual |
-| 271 | Summary: org.apache.commons.collections4.map; AbstractOrderedMapDecorator; true; AbstractOrderedMapDecorator; (OrderedMap); ; Argument[0].MapKey; Argument[this].MapKey; value; manual |
-| 272 | Summary: org.apache.commons.collections4.map; AbstractOrderedMapDecorator; true; AbstractOrderedMapDecorator; (OrderedMap); ; Argument[0].MapValue; Argument[this].MapValue; value; manual |
-| 273 | Summary: org.apache.commons.collections4.map; AbstractSortedMapDecorator; true; AbstractSortedMapDecorator; (SortedMap); ; Argument[0].MapKey; Argument[this].MapKey; value; manual |
-| 274 | Summary: org.apache.commons.collections4.map; AbstractSortedMapDecorator; true; AbstractSortedMapDecorator; (SortedMap); ; Argument[0].MapValue; Argument[this].MapValue; value; manual |
-| 275 | Summary: org.apache.commons.collections4.map; CaseInsensitiveMap; true; CaseInsensitiveMap; (Map); ; Argument[0].MapKey; Argument[this].MapKey; value; manual |
-| 276 | Summary: org.apache.commons.collections4.map; CaseInsensitiveMap; true; CaseInsensitiveMap; (Map); ; Argument[0].MapValue; Argument[this].MapValue; value; manual |
-| 277 | Summary: org.apache.commons.collections4.map; CompositeMap; true; CompositeMap; (Map,Map); ; Argument[0].MapKey; Argument[this].MapKey; value; manual |
-| 278 | Summary: org.apache.commons.collections4.map; CompositeMap; true; CompositeMap; (Map,Map); ; Argument[0].MapValue; Argument[this].MapValue; value; manual |
-| 279 | Summary: org.apache.commons.collections4.map; CompositeMap; true; CompositeMap; (Map,Map); ; Argument[1].MapKey; Argument[this].MapKey; value; manual |
-| 280 | Summary: org.apache.commons.collections4.map; CompositeMap; true; CompositeMap; (Map,Map); ; Argument[1].MapValue; Argument[this].MapValue; value; manual |
-| 281 | Summary: org.apache.commons.collections4.map; CompositeMap; true; CompositeMap; (Map,Map,CompositeMap$MapMutator); ; Argument[0].MapKey; Argument[this].MapKey; value; manual |
-| 282 | Summary: org.apache.commons.collections4.map; CompositeMap; true; CompositeMap; (Map,Map,CompositeMap$MapMutator); ; Argument[0].MapValue; Argument[this].MapValue; value; manual |
-| 283 | Summary: org.apache.commons.collections4.map; CompositeMap; true; CompositeMap; (Map,Map,CompositeMap$MapMutator); ; Argument[1].MapKey; Argument[this].MapKey; value; manual |
-| 284 | Summary: org.apache.commons.collections4.map; CompositeMap; true; CompositeMap; (Map,Map,CompositeMap$MapMutator); ; Argument[1].MapValue; Argument[this].MapValue; value; manual |
-| 285 | Summary: org.apache.commons.collections4.map; CompositeMap; true; CompositeMap; (Map[]); ; Argument[0].ArrayElement.MapKey; Argument[this].MapKey; value; manual |
-| 286 | Summary: org.apache.commons.collections4.map; CompositeMap; true; CompositeMap; (Map[]); ; Argument[0].ArrayElement.MapValue; Argument[this].MapValue; value; manual |
-| 287 | Summary: org.apache.commons.collections4.map; CompositeMap; true; CompositeMap; (Map[],CompositeMap$MapMutator); ; Argument[0].ArrayElement.MapKey; Argument[this].MapKey; value; manual |
-| 288 | Summary: org.apache.commons.collections4.map; CompositeMap; true; CompositeMap; (Map[],CompositeMap$MapMutator); ; Argument[0].ArrayElement.MapValue; Argument[this].MapValue; value; manual |
-| 289 | Summary: org.apache.commons.collections4.map; CompositeMap; true; addComposited; ; ; Argument[0].MapKey; Argument[this].MapKey; value; manual |
-| 290 | Summary: org.apache.commons.collections4.map; CompositeMap; true; addComposited; ; ; Argument[0].MapValue; Argument[this].MapValue; value; manual |
-| 291 | Summary: org.apache.commons.collections4.map; CompositeMap; true; removeComposited; ; ; Argument[this].MapKey; ReturnValue.MapKey; value; manual |
-| 292 | Summary: org.apache.commons.collections4.map; CompositeMap; true; removeComposited; ; ; Argument[this].MapValue; ReturnValue.MapValue; value; manual |
+| 239 | Summary: org.apache.commons.collections4.keyvalue; UnmodifiableMapEntry; true; UnmodifiableMapEntry; (Map$Entry); ; Argument[0].MapKey; Argument[this].MapKey; value; manual |
+| 240 | Summary: org.apache.commons.collections4.keyvalue; UnmodifiableMapEntry; true; UnmodifiableMapEntry; (Map$Entry); ; Argument[0].MapValue; Argument[this].MapValue; value; manual |
+| 241 | Summary: org.apache.commons.collections4.keyvalue; UnmodifiableMapEntry; true; UnmodifiableMapEntry; (Object,Object); ; Argument[0]; Argument[this].MapKey; value; manual |
+| 242 | Summary: org.apache.commons.collections4.keyvalue; UnmodifiableMapEntry; true; UnmodifiableMapEntry; (Object,Object); ; Argument[1]; Argument[this].MapValue; value; manual |
+| 243 | Summary: org.apache.commons.collections4.list; AbstractLinkedList; true; AbstractLinkedList; ; ; Argument[0].Element; Argument[this].Element; value; manual |
+| 244 | Summary: org.apache.commons.collections4.list; AbstractLinkedList; true; addFirst; ; ; Argument[0]; Argument[this].Element; value; manual |
+| 245 | Summary: org.apache.commons.collections4.list; AbstractLinkedList; true; addLast; ; ; Argument[0]; Argument[this].Element; value; manual |
+| 246 | Summary: org.apache.commons.collections4.list; AbstractLinkedList; true; getFirst; ; ; Argument[this].Element; ReturnValue; value; manual |
+| 247 | Summary: org.apache.commons.collections4.list; AbstractLinkedList; true; getLast; ; ; Argument[this].Element; ReturnValue; value; manual |
+| 248 | Summary: org.apache.commons.collections4.list; AbstractLinkedList; true; removeFirst; ; ; Argument[this].Element; ReturnValue; value; manual |
+| 249 | Summary: org.apache.commons.collections4.list; AbstractLinkedList; true; removeLast; ; ; Argument[this].Element; ReturnValue; value; manual |
+| 250 | Summary: org.apache.commons.collections4.list; AbstractListDecorator; true; AbstractListDecorator; ; ; Argument[0].Element; Argument[this].Element; value; manual |
+| 251 | Summary: org.apache.commons.collections4.list; AbstractSerializableListDecorator; true; AbstractSerializableListDecorator; ; ; Argument[0].Element; Argument[this].Element; value; manual |
+| 252 | Summary: org.apache.commons.collections4.list; CursorableLinkedList; true; CursorableLinkedList; ; ; Argument[0].Element; Argument[this].Element; value; manual |
+| 253 | Summary: org.apache.commons.collections4.list; CursorableLinkedList; true; cursor; ; ; Argument[this].Element; ReturnValue.Element; value; manual |
+| 254 | Summary: org.apache.commons.collections4.list; FixedSizeList; true; fixedSizeList; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
+| 255 | Summary: org.apache.commons.collections4.list; GrowthList; true; growthList; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
+| 256 | Summary: org.apache.commons.collections4.list; LazyList; true; lazyList; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
+| 257 | Summary: org.apache.commons.collections4.list; NodeCachingLinkedList; true; NodeCachingLinkedList; (Collection); ; Argument[0].Element; Argument[this].Element; value; manual |
+| 258 | Summary: org.apache.commons.collections4.list; PredicatedList; true; predicatedList; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
+| 259 | Summary: org.apache.commons.collections4.list; SetUniqueList; true; asSet; ; ; Argument[this].Element; ReturnValue.Element; value; manual |
+| 260 | Summary: org.apache.commons.collections4.list; SetUniqueList; true; setUniqueList; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
+| 261 | Summary: org.apache.commons.collections4.list; TransformedList; true; transformingList; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
+| 262 | Summary: org.apache.commons.collections4.list; TreeList; true; TreeList; ; ; Argument[0].Element; Argument[this].Element; value; manual |
+| 263 | Summary: org.apache.commons.collections4.list; UnmodifiableList; true; UnmodifiableList; ; ; Argument[0].Element; Argument[this].Element; value; manual |
+| 264 | Summary: org.apache.commons.collections4.list; UnmodifiableList; true; unmodifiableList; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
+| 265 | Summary: org.apache.commons.collections4.map; AbstractHashedMap; true; AbstractHashedMap; (Map); ; Argument[0].MapKey; Argument[this].MapKey; value; manual |
+| 266 | Summary: org.apache.commons.collections4.map; AbstractHashedMap; true; AbstractHashedMap; (Map); ; Argument[0].MapValue; Argument[this].MapValue; value; manual |
+| 267 | Summary: org.apache.commons.collections4.map; AbstractLinkedMap; true; AbstractLinkedMap; (Map); ; Argument[0].MapKey; Argument[this].MapKey; value; manual |
+| 268 | Summary: org.apache.commons.collections4.map; AbstractLinkedMap; true; AbstractLinkedMap; (Map); ; Argument[0].MapValue; Argument[this].MapValue; value; manual |
+| 269 | Summary: org.apache.commons.collections4.map; AbstractMapDecorator; true; AbstractMapDecorator; (Map); ; Argument[0].MapKey; Argument[this].MapKey; value; manual |
+| 270 | Summary: org.apache.commons.collections4.map; AbstractMapDecorator; true; AbstractMapDecorator; (Map); ; Argument[0].MapValue; Argument[this].MapValue; value; manual |
+| 271 | Summary: org.apache.commons.collections4.map; AbstractMapDecorator; true; decorated; ; ; Argument[this].MapKey; ReturnValue.MapKey; value; manual |
+| 272 | Summary: org.apache.commons.collections4.map; AbstractMapDecorator; true; decorated; ; ; Argument[this].MapValue; ReturnValue.MapValue; value; manual |
+| 273 | Summary: org.apache.commons.collections4.map; AbstractOrderedMapDecorator; true; AbstractOrderedMapDecorator; (OrderedMap); ; Argument[0].MapKey; Argument[this].MapKey; value; manual |
+| 274 | Summary: org.apache.commons.collections4.map; AbstractOrderedMapDecorator; true; AbstractOrderedMapDecorator; (OrderedMap); ; Argument[0].MapValue; Argument[this].MapValue; value; manual |
+| 275 | Summary: org.apache.commons.collections4.map; AbstractSortedMapDecorator; true; AbstractSortedMapDecorator; (SortedMap); ; Argument[0].MapKey; Argument[this].MapKey; value; manual |
+| 276 | Summary: org.apache.commons.collections4.map; AbstractSortedMapDecorator; true; AbstractSortedMapDecorator; (SortedMap); ; Argument[0].MapValue; Argument[this].MapValue; value; manual |
+| 277 | Summary: org.apache.commons.collections4.map; CaseInsensitiveMap; true; CaseInsensitiveMap; (Map); ; Argument[0].MapKey; Argument[this].MapKey; value; manual |
+| 278 | Summary: org.apache.commons.collections4.map; CaseInsensitiveMap; true; CaseInsensitiveMap; (Map); ; Argument[0].MapValue; Argument[this].MapValue; value; manual |
+| 279 | Summary: org.apache.commons.collections4.map; CompositeMap; true; CompositeMap; (Map,Map); ; Argument[0].MapKey; Argument[this].MapKey; value; manual |
+| 280 | Summary: org.apache.commons.collections4.map; CompositeMap; true; CompositeMap; (Map,Map); ; Argument[0].MapValue; Argument[this].MapValue; value; manual |
+| 281 | Summary: org.apache.commons.collections4.map; CompositeMap; true; CompositeMap; (Map,Map); ; Argument[1].MapKey; Argument[this].MapKey; value; manual |
+| 282 | Summary: org.apache.commons.collections4.map; CompositeMap; true; CompositeMap; (Map,Map); ; Argument[1].MapValue; Argument[this].MapValue; value; manual |
+| 283 | Summary: org.apache.commons.collections4.map; CompositeMap; true; CompositeMap; (Map,Map,CompositeMap$MapMutator); ; Argument[0].MapKey; Argument[this].MapKey; value; manual |
+| 284 | Summary: org.apache.commons.collections4.map; CompositeMap; true; CompositeMap; (Map,Map,CompositeMap$MapMutator); ; Argument[0].MapValue; Argument[this].MapValue; value; manual |
+| 285 | Summary: org.apache.commons.collections4.map; CompositeMap; true; CompositeMap; (Map,Map,CompositeMap$MapMutator); ; Argument[1].MapKey; Argument[this].MapKey; value; manual |
+| 286 | Summary: org.apache.commons.collections4.map; CompositeMap; true; CompositeMap; (Map,Map,CompositeMap$MapMutator); ; Argument[1].MapValue; Argument[this].MapValue; value; manual |
+| 287 | Summary: org.apache.commons.collections4.map; CompositeMap; true; CompositeMap; (Map[]); ; Argument[0].ArrayElement.MapKey; Argument[this].MapKey; value; manual |
+| 288 | Summary: org.apache.commons.collections4.map; CompositeMap; true; CompositeMap; (Map[]); ; Argument[0].ArrayElement.MapValue; Argument[this].MapValue; value; manual |
+| 289 | Summary: org.apache.commons.collections4.map; CompositeMap; true; CompositeMap; (Map[],CompositeMap$MapMutator); ; Argument[0].ArrayElement.MapKey; Argument[this].MapKey; value; manual |
+| 290 | Summary: org.apache.commons.collections4.map; CompositeMap; true; CompositeMap; (Map[],CompositeMap$MapMutator); ; Argument[0].ArrayElement.MapValue; Argument[this].MapValue; value; manual |
+| 291 | Summary: org.apache.commons.collections4.map; CompositeMap; true; addComposited; ; ; Argument[0].MapKey; Argument[this].MapKey; value; manual |
+| 292 | Summary: org.apache.commons.collections4.map; CompositeMap; true; addComposited; ; ; Argument[0].MapValue; Argument[this].MapValue; value; manual |
 | 293 | Summary: org.apache.commons.collections4.map; CompositeMap; true; removeComposited; ; ; Argument[0]; ReturnValue; value; manual |
-| 294 | Summary: org.apache.commons.collections4.map; DefaultedMap; true; DefaultedMap; (Object); ; Argument[0]; Argument[this].MapValue; value; manual |
-| 295 | Summary: org.apache.commons.collections4.map; DefaultedMap; true; defaultedMap; ; ; Argument[0].MapKey; ReturnValue.MapKey; value; manual |
-| 296 | Summary: org.apache.commons.collections4.map; DefaultedMap; true; defaultedMap; ; ; Argument[0].MapValue; ReturnValue.MapValue; value; manual |
+| 294 | Summary: org.apache.commons.collections4.map; CompositeMap; true; removeComposited; ; ; Argument[this].MapKey; ReturnValue.MapKey; value; manual |
+| 295 | Summary: org.apache.commons.collections4.map; CompositeMap; true; removeComposited; ; ; Argument[this].MapValue; ReturnValue.MapValue; value; manual |
+| 296 | Summary: org.apache.commons.collections4.map; DefaultedMap; true; DefaultedMap; (Object); ; Argument[0]; Argument[this].MapValue; value; manual |
 | 297 | Summary: org.apache.commons.collections4.map; DefaultedMap; true; defaultedMap; (Map,Object); ; Argument[1]; ReturnValue.MapValue; value; manual |
-| 298 | Summary: org.apache.commons.collections4.map; EntrySetToMapIteratorAdapter; true; EntrySetToMapIteratorAdapter; ; ; Argument[0].Element.MapKey; Argument[this].Element; value; manual |
-| 299 | Summary: org.apache.commons.collections4.map; EntrySetToMapIteratorAdapter; true; EntrySetToMapIteratorAdapter; ; ; Argument[0].Element.MapValue; Argument[this].MapValue; value; manual |
-| 300 | Summary: org.apache.commons.collections4.map; FixedSizeMap; true; fixedSizeMap; ; ; Argument[0].MapKey; ReturnValue.MapKey; value; manual |
-| 301 | Summary: org.apache.commons.collections4.map; FixedSizeMap; true; fixedSizeMap; ; ; Argument[0].MapValue; ReturnValue.MapValue; value; manual |
-| 302 | Summary: org.apache.commons.collections4.map; FixedSizeSortedMap; true; fixedSizeSortedMap; ; ; Argument[0].MapKey; ReturnValue.MapKey; value; manual |
-| 303 | Summary: org.apache.commons.collections4.map; FixedSizeSortedMap; true; fixedSizeSortedMap; ; ; Argument[0].MapValue; ReturnValue.MapValue; value; manual |
-| 304 | Summary: org.apache.commons.collections4.map; Flat3Map; true; Flat3Map; ; ; Argument[0].MapKey; Argument[this].MapKey; value; manual |
-| 305 | Summary: org.apache.commons.collections4.map; Flat3Map; true; Flat3Map; ; ; Argument[0].MapValue; Argument[this].MapValue; value; manual |
-| 306 | Summary: org.apache.commons.collections4.map; HashedMap; true; HashedMap; (Map); ; Argument[0].MapKey; Argument[this].MapKey; value; manual |
-| 307 | Summary: org.apache.commons.collections4.map; HashedMap; true; HashedMap; (Map); ; Argument[0].MapValue; Argument[this].MapValue; value; manual |
-| 308 | Summary: org.apache.commons.collections4.map; LRUMap; true; LRUMap; (Map); ; Argument[0].MapKey; Argument[this].MapKey; value; manual |
-| 309 | Summary: org.apache.commons.collections4.map; LRUMap; true; LRUMap; (Map); ; Argument[0].MapValue; Argument[this].MapValue; value; manual |
-| 310 | Summary: org.apache.commons.collections4.map; LRUMap; true; LRUMap; (Map,boolean); ; Argument[0].MapKey; Argument[this].MapKey; value; manual |
-| 311 | Summary: org.apache.commons.collections4.map; LRUMap; true; LRUMap; (Map,boolean); ; Argument[0].MapValue; Argument[this].MapValue; value; manual |
-| 312 | Summary: org.apache.commons.collections4.map; LRUMap; true; get; (Object,boolean); ; Argument[0].MapValue; ReturnValue; value; manual |
-| 313 | Summary: org.apache.commons.collections4.map; LazyMap; true; lazyMap; ; ; Argument[0].MapKey; ReturnValue.MapKey; value; manual |
-| 314 | Summary: org.apache.commons.collections4.map; LazyMap; true; lazyMap; ; ; Argument[0].MapValue; ReturnValue.MapValue; value; manual |
-| 315 | Summary: org.apache.commons.collections4.map; LazySortedMap; true; lazySortedMap; ; ; Argument[0].MapKey; ReturnValue.MapKey; value; manual |
-| 316 | Summary: org.apache.commons.collections4.map; LazySortedMap; true; lazySortedMap; ; ; Argument[0].MapValue; ReturnValue.MapValue; value; manual |
-| 317 | Summary: org.apache.commons.collections4.map; LinkedMap; true; LinkedMap; (Map); ; Argument[0].MapKey; Argument[this].MapKey; value; manual |
-| 318 | Summary: org.apache.commons.collections4.map; LinkedMap; true; LinkedMap; (Map); ; Argument[0].MapValue; Argument[this].MapValue; value; manual |
-| 319 | Summary: org.apache.commons.collections4.map; LinkedMap; true; asList; ; ; Argument[this].MapKey; ReturnValue.Element; value; manual |
-| 320 | Summary: org.apache.commons.collections4.map; LinkedMap; true; get; (int); ; Argument[this].MapKey; ReturnValue; value; manual |
-| 321 | Summary: org.apache.commons.collections4.map; LinkedMap; true; getValue; (int); ; Argument[this].MapValue; ReturnValue; value; manual |
-| 322 | Summary: org.apache.commons.collections4.map; LinkedMap; true; remove; (int); ; Argument[this].MapValue; ReturnValue; value; manual |
-| 323 | Summary: org.apache.commons.collections4.map; ListOrderedMap; true; asList; ; ; Argument[this].MapKey; ReturnValue.Element; value; manual |
-| 324 | Summary: org.apache.commons.collections4.map; ListOrderedMap; true; get; (int); ; Argument[this].MapKey; ReturnValue; value; manual |
-| 325 | Summary: org.apache.commons.collections4.map; ListOrderedMap; true; getValue; (int); ; Argument[this].MapValue; ReturnValue; value; manual |
-| 326 | Summary: org.apache.commons.collections4.map; ListOrderedMap; true; keyList; ; ; Argument[this].MapKey; ReturnValue.Element; value; manual |
-| 327 | Summary: org.apache.commons.collections4.map; ListOrderedMap; true; listOrderedMap; ; ; Argument[0].MapKey; ReturnValue.MapKey; value; manual |
-| 328 | Summary: org.apache.commons.collections4.map; ListOrderedMap; true; listOrderedMap; ; ; Argument[0].MapValue; ReturnValue.MapValue; value; manual |
-| 329 | Summary: org.apache.commons.collections4.map; ListOrderedMap; true; put; ; ; Argument[1]; Argument[this].MapKey; value; manual |
-| 330 | Summary: org.apache.commons.collections4.map; ListOrderedMap; true; put; ; ; Argument[2]; Argument[this].MapValue; value; manual |
-| 331 | Summary: org.apache.commons.collections4.map; ListOrderedMap; true; putAll; ; ; Argument[1].MapKey; Argument[this].MapKey; value; manual |
-| 332 | Summary: org.apache.commons.collections4.map; ListOrderedMap; true; putAll; ; ; Argument[1].MapValue; Argument[this].MapValue; value; manual |
-| 333 | Summary: org.apache.commons.collections4.map; ListOrderedMap; true; remove; (int); ; Argument[this].MapValue; ReturnValue; value; manual |
-| 334 | Summary: org.apache.commons.collections4.map; ListOrderedMap; true; setValue; ; ; Argument[1]; Argument[this].MapValue; value; manual |
-| 335 | Summary: org.apache.commons.collections4.map; ListOrderedMap; true; valueList; ; ; Argument[this].MapValue; ReturnValue.Element; value; manual |
-| 336 | Summary: org.apache.commons.collections4.map; MultiKeyMap; true; get; ; ; Argument[this].MapValue; ReturnValue; value; manual |
-| 337 | Summary: org.apache.commons.collections4.map; MultiKeyMap; true; put; ; ; Argument[this].MapValue; ReturnValue; value; manual |
-| 338 | Summary: org.apache.commons.collections4.map; MultiKeyMap; true; put; (Object,Object,Object); ; Argument[0..1]; Argument[this].MapKey.Element; value; manual |
-| 339 | Summary: org.apache.commons.collections4.map; MultiKeyMap; true; put; (Object,Object,Object); ; Argument[2]; Argument[this].MapValue; value; manual |
-| 340 | Summary: org.apache.commons.collections4.map; MultiKeyMap; true; put; (Object,Object,Object,Object); ; Argument[0..2]; Argument[this].MapKey.Element; value; manual |
-| 341 | Summary: org.apache.commons.collections4.map; MultiKeyMap; true; put; (Object,Object,Object,Object); ; Argument[3]; Argument[this].MapValue; value; manual |
-| 342 | Summary: org.apache.commons.collections4.map; MultiKeyMap; true; put; (Object,Object,Object,Object,Object); ; Argument[0..3]; Argument[this].MapKey.Element; value; manual |
-| 343 | Summary: org.apache.commons.collections4.map; MultiKeyMap; true; put; (Object,Object,Object,Object,Object); ; Argument[4]; Argument[this].MapValue; value; manual |
-| 344 | Summary: org.apache.commons.collections4.map; MultiKeyMap; true; put; (Object,Object,Object,Object,Object,Object); ; Argument[0..4]; Argument[this].MapKey.Element; value; manual |
-| 345 | Summary: org.apache.commons.collections4.map; MultiKeyMap; true; put; (Object,Object,Object,Object,Object,Object); ; Argument[5]; Argument[this].MapValue; value; manual |
-| 346 | Summary: org.apache.commons.collections4.map; MultiKeyMap; true; removeMultiKey; ; ; Argument[this].MapValue; ReturnValue; value; manual |
-| 347 | Summary: org.apache.commons.collections4.map; MultiValueMap; true; getCollection; ; ; Argument[this].MapValue.Element; ReturnValue.Element; value; manual |
-| 348 | Summary: org.apache.commons.collections4.map; MultiValueMap; true; iterator; (); ; Argument[this].MapKey; ReturnValue.Element.MapKey; value; manual |
-| 349 | Summary: org.apache.commons.collections4.map; MultiValueMap; true; iterator; (); ; Argument[this].MapValue.Element; ReturnValue.Element.MapValue; value; manual |
-| 350 | Summary: org.apache.commons.collections4.map; MultiValueMap; true; iterator; (Object); ; Argument[this].MapValue.Element; ReturnValue.Element; value; manual |
-| 351 | Summary: org.apache.commons.collections4.map; MultiValueMap; true; multiValueMap; ; ; Argument[0].MapKey; ReturnValue.MapKey; value; manual |
-| 352 | Summary: org.apache.commons.collections4.map; MultiValueMap; true; multiValueMap; ; ; Argument[0].MapValue.Element; ReturnValue.MapValue.Element; value; manual |
-| 353 | Summary: org.apache.commons.collections4.map; MultiValueMap; true; putAll; (Map); ; Argument[0].MapValue; Argument[this].MapValue.Element; value; manual |
-| 354 | Summary: org.apache.commons.collections4.map; MultiValueMap; true; putAll; (Map); ; Argument[0].MapValue.Element; Argument[this].MapValue.Element; value; manual |
-| 355 | Summary: org.apache.commons.collections4.map; MultiValueMap; true; putAll; (Object,Collection); ; Argument[0]; Argument[this].MapKey; value; manual |
-| 356 | Summary: org.apache.commons.collections4.map; MultiValueMap; true; putAll; (Object,Collection); ; Argument[1].Element; Argument[this].MapValue.Element; value; manual |
-| 357 | Summary: org.apache.commons.collections4.map; MultiValueMap; true; values; ; ; Argument[this].MapValue.Element; ReturnValue.Element; value; manual |
-| 358 | Summary: org.apache.commons.collections4.map; PassiveExpiringMap; true; PassiveExpiringMap; (PassiveExpiringMap$ExpirationPolicy,Map); ; Argument[1].MapKey; Argument[this].MapKey; value; manual |
-| 359 | Summary: org.apache.commons.collections4.map; PassiveExpiringMap; true; PassiveExpiringMap; (PassiveExpiringMap$ExpirationPolicy,Map); ; Argument[1].MapValue; Argument[this].MapValue; value; manual |
+| 298 | Summary: org.apache.commons.collections4.map; DefaultedMap; true; defaultedMap; ; ; Argument[0].MapKey; ReturnValue.MapKey; value; manual |
+| 299 | Summary: org.apache.commons.collections4.map; DefaultedMap; true; defaultedMap; ; ; Argument[0].MapValue; ReturnValue.MapValue; value; manual |
+| 300 | Summary: org.apache.commons.collections4.map; EntrySetToMapIteratorAdapter; true; EntrySetToMapIteratorAdapter; ; ; Argument[0].Element.MapKey; Argument[this].Element; value; manual |
+| 301 | Summary: org.apache.commons.collections4.map; EntrySetToMapIteratorAdapter; true; EntrySetToMapIteratorAdapter; ; ; Argument[0].Element.MapValue; Argument[this].MapValue; value; manual |
+| 302 | Summary: org.apache.commons.collections4.map; FixedSizeMap; true; fixedSizeMap; ; ; Argument[0].MapKey; ReturnValue.MapKey; value; manual |
+| 303 | Summary: org.apache.commons.collections4.map; FixedSizeMap; true; fixedSizeMap; ; ; Argument[0].MapValue; ReturnValue.MapValue; value; manual |
+| 304 | Summary: org.apache.commons.collections4.map; FixedSizeSortedMap; true; fixedSizeSortedMap; ; ; Argument[0].MapKey; ReturnValue.MapKey; value; manual |
+| 305 | Summary: org.apache.commons.collections4.map; FixedSizeSortedMap; true; fixedSizeSortedMap; ; ; Argument[0].MapValue; ReturnValue.MapValue; value; manual |
+| 306 | Summary: org.apache.commons.collections4.map; Flat3Map; true; Flat3Map; ; ; Argument[0].MapKey; Argument[this].MapKey; value; manual |
+| 307 | Summary: org.apache.commons.collections4.map; Flat3Map; true; Flat3Map; ; ; Argument[0].MapValue; Argument[this].MapValue; value; manual |
+| 308 | Summary: org.apache.commons.collections4.map; HashedMap; true; HashedMap; (Map); ; Argument[0].MapKey; Argument[this].MapKey; value; manual |
+| 309 | Summary: org.apache.commons.collections4.map; HashedMap; true; HashedMap; (Map); ; Argument[0].MapValue; Argument[this].MapValue; value; manual |
+| 310 | Summary: org.apache.commons.collections4.map; LRUMap; true; LRUMap; (Map); ; Argument[0].MapKey; Argument[this].MapKey; value; manual |
+| 311 | Summary: org.apache.commons.collections4.map; LRUMap; true; LRUMap; (Map); ; Argument[0].MapValue; Argument[this].MapValue; value; manual |
+| 312 | Summary: org.apache.commons.collections4.map; LRUMap; true; LRUMap; (Map,boolean); ; Argument[0].MapKey; Argument[this].MapKey; value; manual |
+| 313 | Summary: org.apache.commons.collections4.map; LRUMap; true; LRUMap; (Map,boolean); ; Argument[0].MapValue; Argument[this].MapValue; value; manual |
+| 314 | Summary: org.apache.commons.collections4.map; LRUMap; true; get; (Object,boolean); ; Argument[0].MapValue; ReturnValue; value; manual |
+| 315 | Summary: org.apache.commons.collections4.map; LazyMap; true; lazyMap; ; ; Argument[0].MapKey; ReturnValue.MapKey; value; manual |
+| 316 | Summary: org.apache.commons.collections4.map; LazyMap; true; lazyMap; ; ; Argument[0].MapValue; ReturnValue.MapValue; value; manual |
+| 317 | Summary: org.apache.commons.collections4.map; LazySortedMap; true; lazySortedMap; ; ; Argument[0].MapKey; ReturnValue.MapKey; value; manual |
+| 318 | Summary: org.apache.commons.collections4.map; LazySortedMap; true; lazySortedMap; ; ; Argument[0].MapValue; ReturnValue.MapValue; value; manual |
+| 319 | Summary: org.apache.commons.collections4.map; LinkedMap; true; LinkedMap; (Map); ; Argument[0].MapKey; Argument[this].MapKey; value; manual |
+| 320 | Summary: org.apache.commons.collections4.map; LinkedMap; true; LinkedMap; (Map); ; Argument[0].MapValue; Argument[this].MapValue; value; manual |
+| 321 | Summary: org.apache.commons.collections4.map; LinkedMap; true; asList; ; ; Argument[this].MapKey; ReturnValue.Element; value; manual |
+| 322 | Summary: org.apache.commons.collections4.map; LinkedMap; true; get; (int); ; Argument[this].MapKey; ReturnValue; value; manual |
+| 323 | Summary: org.apache.commons.collections4.map; LinkedMap; true; getValue; (int); ; Argument[this].MapValue; ReturnValue; value; manual |
+| 324 | Summary: org.apache.commons.collections4.map; LinkedMap; true; remove; (int); ; Argument[this].MapValue; ReturnValue; value; manual |
+| 325 | Summary: org.apache.commons.collections4.map; ListOrderedMap; true; asList; ; ; Argument[this].MapKey; ReturnValue.Element; value; manual |
+| 326 | Summary: org.apache.commons.collections4.map; ListOrderedMap; true; get; (int); ; Argument[this].MapKey; ReturnValue; value; manual |
+| 327 | Summary: org.apache.commons.collections4.map; ListOrderedMap; true; getValue; (int); ; Argument[this].MapValue; ReturnValue; value; manual |
+| 328 | Summary: org.apache.commons.collections4.map; ListOrderedMap; true; keyList; ; ; Argument[this].MapKey; ReturnValue.Element; value; manual |
+| 329 | Summary: org.apache.commons.collections4.map; ListOrderedMap; true; listOrderedMap; ; ; Argument[0].MapKey; ReturnValue.MapKey; value; manual |
+| 330 | Summary: org.apache.commons.collections4.map; ListOrderedMap; true; listOrderedMap; ; ; Argument[0].MapValue; ReturnValue.MapValue; value; manual |
+| 331 | Summary: org.apache.commons.collections4.map; ListOrderedMap; true; put; ; ; Argument[1]; Argument[this].MapKey; value; manual |
+| 332 | Summary: org.apache.commons.collections4.map; ListOrderedMap; true; put; ; ; Argument[2]; Argument[this].MapValue; value; manual |
+| 333 | Summary: org.apache.commons.collections4.map; ListOrderedMap; true; putAll; ; ; Argument[1].MapKey; Argument[this].MapKey; value; manual |
+| 334 | Summary: org.apache.commons.collections4.map; ListOrderedMap; true; putAll; ; ; Argument[1].MapValue; Argument[this].MapValue; value; manual |
+| 335 | Summary: org.apache.commons.collections4.map; ListOrderedMap; true; remove; (int); ; Argument[this].MapValue; ReturnValue; value; manual |
+| 336 | Summary: org.apache.commons.collections4.map; ListOrderedMap; true; setValue; ; ; Argument[1]; Argument[this].MapValue; value; manual |
+| 337 | Summary: org.apache.commons.collections4.map; ListOrderedMap; true; valueList; ; ; Argument[this].MapValue; ReturnValue.Element; value; manual |
+| 338 | Summary: org.apache.commons.collections4.map; MultiKeyMap; true; get; ; ; Argument[this].MapValue; ReturnValue; value; manual |
+| 339 | Summary: org.apache.commons.collections4.map; MultiKeyMap; true; put; (Object,Object,Object); ; Argument[0..1]; Argument[this].MapKey.Element; value; manual |
+| 340 | Summary: org.apache.commons.collections4.map; MultiKeyMap; true; put; (Object,Object,Object); ; Argument[2]; Argument[this].MapValue; value; manual |
+| 341 | Summary: org.apache.commons.collections4.map; MultiKeyMap; true; put; (Object,Object,Object,Object); ; Argument[0..2]; Argument[this].MapKey.Element; value; manual |
+| 342 | Summary: org.apache.commons.collections4.map; MultiKeyMap; true; put; (Object,Object,Object,Object); ; Argument[3]; Argument[this].MapValue; value; manual |
+| 343 | Summary: org.apache.commons.collections4.map; MultiKeyMap; true; put; (Object,Object,Object,Object,Object); ; Argument[0..3]; Argument[this].MapKey.Element; value; manual |
+| 344 | Summary: org.apache.commons.collections4.map; MultiKeyMap; true; put; (Object,Object,Object,Object,Object); ; Argument[4]; Argument[this].MapValue; value; manual |
+| 345 | Summary: org.apache.commons.collections4.map; MultiKeyMap; true; put; (Object,Object,Object,Object,Object,Object); ; Argument[0..4]; Argument[this].MapKey.Element; value; manual |
+| 346 | Summary: org.apache.commons.collections4.map; MultiKeyMap; true; put; (Object,Object,Object,Object,Object,Object); ; Argument[5]; Argument[this].MapValue; value; manual |
+| 347 | Summary: org.apache.commons.collections4.map; MultiKeyMap; true; put; ; ; Argument[this].MapValue; ReturnValue; value; manual |
+| 348 | Summary: org.apache.commons.collections4.map; MultiKeyMap; true; removeMultiKey; ; ; Argument[this].MapValue; ReturnValue; value; manual |
+| 349 | Summary: org.apache.commons.collections4.map; MultiValueMap; true; getCollection; ; ; Argument[this].MapValue.Element; ReturnValue.Element; value; manual |
+| 350 | Summary: org.apache.commons.collections4.map; MultiValueMap; true; iterator; (); ; Argument[this].MapKey; ReturnValue.Element.MapKey; value; manual |
+| 351 | Summary: org.apache.commons.collections4.map; MultiValueMap; true; iterator; (); ; Argument[this].MapValue.Element; ReturnValue.Element.MapValue; value; manual |
+| 352 | Summary: org.apache.commons.collections4.map; MultiValueMap; true; iterator; (Object); ; Argument[this].MapValue.Element; ReturnValue.Element; value; manual |
+| 353 | Summary: org.apache.commons.collections4.map; MultiValueMap; true; multiValueMap; ; ; Argument[0].MapKey; ReturnValue.MapKey; value; manual |
+| 354 | Summary: org.apache.commons.collections4.map; MultiValueMap; true; multiValueMap; ; ; Argument[0].MapValue.Element; ReturnValue.MapValue.Element; value; manual |
+| 355 | Summary: org.apache.commons.collections4.map; MultiValueMap; true; putAll; (Map); ; Argument[0].MapValue.Element; Argument[this].MapValue.Element; value; manual |
+| 356 | Summary: org.apache.commons.collections4.map; MultiValueMap; true; putAll; (Map); ; Argument[0].MapValue; Argument[this].MapValue.Element; value; manual |
+| 357 | Summary: org.apache.commons.collections4.map; MultiValueMap; true; putAll; (Object,Collection); ; Argument[0]; Argument[this].MapKey; value; manual |
+| 358 | Summary: org.apache.commons.collections4.map; MultiValueMap; true; putAll; (Object,Collection); ; Argument[1].Element; Argument[this].MapValue.Element; value; manual |
+| 359 | Summary: org.apache.commons.collections4.map; MultiValueMap; true; values; ; ; Argument[this].MapValue.Element; ReturnValue.Element; value; manual |
 | 360 | Summary: org.apache.commons.collections4.map; PassiveExpiringMap; true; PassiveExpiringMap; (Map); ; Argument[0].MapKey; Argument[this].MapKey; value; manual |
 | 361 | Summary: org.apache.commons.collections4.map; PassiveExpiringMap; true; PassiveExpiringMap; (Map); ; Argument[0].MapValue; Argument[this].MapValue; value; manual |
-| 362 | Summary: org.apache.commons.collections4.map; PassiveExpiringMap; true; PassiveExpiringMap; (long,Map); ; Argument[1].MapKey; Argument[this].MapKey; value; manual |
-| 363 | Summary: org.apache.commons.collections4.map; PassiveExpiringMap; true; PassiveExpiringMap; (long,Map); ; Argument[1].MapValue; Argument[this].MapValue; value; manual |
-| 364 | Summary: org.apache.commons.collections4.map; PassiveExpiringMap; true; PassiveExpiringMap; (long,TimeUnit,Map); ; Argument[2].MapKey; Argument[this].MapKey; value; manual |
-| 365 | Summary: org.apache.commons.collections4.map; PassiveExpiringMap; true; PassiveExpiringMap; (long,TimeUnit,Map); ; Argument[2].MapValue; Argument[this].MapValue; value; manual |
-| 366 | Summary: org.apache.commons.collections4.map; PredicatedMap; true; predicatedMap; ; ; Argument[0].MapKey; ReturnValue.MapKey; value; manual |
-| 367 | Summary: org.apache.commons.collections4.map; PredicatedMap; true; predicatedMap; ; ; Argument[0].MapValue; ReturnValue.MapValue; value; manual |
-| 368 | Summary: org.apache.commons.collections4.map; PredicatedSortedMap; true; predicatedSortedMap; ; ; Argument[0].MapKey; ReturnValue.MapKey; value; manual |
-| 369 | Summary: org.apache.commons.collections4.map; PredicatedSortedMap; true; predicatedSortedMap; ; ; Argument[0].MapValue; ReturnValue.MapValue; value; manual |
-| 370 | Summary: org.apache.commons.collections4.map; SingletonMap; true; SingletonMap; (Map$Entry); ; Argument[0].MapKey; Argument[this].MapKey; value; manual |
-| 371 | Summary: org.apache.commons.collections4.map; SingletonMap; true; SingletonMap; (Map$Entry); ; Argument[0].MapValue; Argument[this].MapValue; value; manual |
+| 362 | Summary: org.apache.commons.collections4.map; PassiveExpiringMap; true; PassiveExpiringMap; (PassiveExpiringMap$ExpirationPolicy,Map); ; Argument[1].MapKey; Argument[this].MapKey; value; manual |
+| 363 | Summary: org.apache.commons.collections4.map; PassiveExpiringMap; true; PassiveExpiringMap; (PassiveExpiringMap$ExpirationPolicy,Map); ; Argument[1].MapValue; Argument[this].MapValue; value; manual |
+| 364 | Summary: org.apache.commons.collections4.map; PassiveExpiringMap; true; PassiveExpiringMap; (long,Map); ; Argument[1].MapKey; Argument[this].MapKey; value; manual |
+| 365 | Summary: org.apache.commons.collections4.map; PassiveExpiringMap; true; PassiveExpiringMap; (long,Map); ; Argument[1].MapValue; Argument[this].MapValue; value; manual |
+| 366 | Summary: org.apache.commons.collections4.map; PassiveExpiringMap; true; PassiveExpiringMap; (long,TimeUnit,Map); ; Argument[2].MapKey; Argument[this].MapKey; value; manual |
+| 367 | Summary: org.apache.commons.collections4.map; PassiveExpiringMap; true; PassiveExpiringMap; (long,TimeUnit,Map); ; Argument[2].MapValue; Argument[this].MapValue; value; manual |
+| 368 | Summary: org.apache.commons.collections4.map; PredicatedMap; true; predicatedMap; ; ; Argument[0].MapKey; ReturnValue.MapKey; value; manual |
+| 369 | Summary: org.apache.commons.collections4.map; PredicatedMap; true; predicatedMap; ; ; Argument[0].MapValue; ReturnValue.MapValue; value; manual |
+| 370 | Summary: org.apache.commons.collections4.map; PredicatedSortedMap; true; predicatedSortedMap; ; ; Argument[0].MapKey; ReturnValue.MapKey; value; manual |
+| 371 | Summary: org.apache.commons.collections4.map; PredicatedSortedMap; true; predicatedSortedMap; ; ; Argument[0].MapValue; ReturnValue.MapValue; value; manual |
 | 372 | Summary: org.apache.commons.collections4.map; SingletonMap; true; SingletonMap; (KeyValue); ; Argument[0].MapKey; Argument[this].MapKey; value; manual |
 | 373 | Summary: org.apache.commons.collections4.map; SingletonMap; true; SingletonMap; (KeyValue); ; Argument[0].MapValue; Argument[this].MapValue; value; manual |
-| 374 | Summary: org.apache.commons.collections4.map; SingletonMap; true; SingletonMap; (Map); ; Argument[0].MapKey; Argument[this].MapKey; value; manual |
-| 375 | Summary: org.apache.commons.collections4.map; SingletonMap; true; SingletonMap; (Map); ; Argument[0].MapValue; Argument[this].MapValue; value; manual |
-| 376 | Summary: org.apache.commons.collections4.map; SingletonMap; true; SingletonMap; (Object,Object); ; Argument[0]; Argument[this].MapKey; value; manual |
-| 377 | Summary: org.apache.commons.collections4.map; SingletonMap; true; SingletonMap; (Object,Object); ; Argument[1]; Argument[this].MapValue; value; manual |
-| 378 | Summary: org.apache.commons.collections4.map; SingletonMap; true; setValue; ; ; Argument[0]; Argument[this].MapValue; value; manual |
-| 379 | Summary: org.apache.commons.collections4.map; TransformedMap; true; transformingMap; ; ; Argument[0].MapKey; ReturnValue.MapKey; value; manual |
-| 380 | Summary: org.apache.commons.collections4.map; TransformedMap; true; transformingMap; ; ; Argument[0].MapValue; ReturnValue.MapValue; value; manual |
-| 381 | Summary: org.apache.commons.collections4.map; TransformedSortedMap; true; transformingSortedMap; ; ; Argument[0].MapKey; ReturnValue.MapKey; value; manual |
-| 382 | Summary: org.apache.commons.collections4.map; TransformedSortedMap; true; transformingSortedMap; ; ; Argument[0].MapValue; ReturnValue.MapValue; value; manual |
-| 383 | Summary: org.apache.commons.collections4.map; UnmodifiableEntrySet; true; unmodifiableEntrySet; ; ; Argument[0].Element.MapKey; ReturnValue.Element.MapKey; value; manual |
-| 384 | Summary: org.apache.commons.collections4.map; UnmodifiableEntrySet; true; unmodifiableEntrySet; ; ; Argument[0].Element.MapValue; ReturnValue.Element.MapValue; value; manual |
-| 385 | Summary: org.apache.commons.collections4.map; UnmodifiableMap; true; unmodifiableMap; ; ; Argument[0].MapKey; ReturnValue.MapKey; value; manual |
-| 386 | Summary: org.apache.commons.collections4.map; UnmodifiableMap; true; unmodifiableMap; ; ; Argument[0].MapValue; ReturnValue.MapValue; value; manual |
-| 387 | Summary: org.apache.commons.collections4.map; UnmodifiableOrderedMap; true; unmodifiableOrderedMap; ; ; Argument[0].MapKey; ReturnValue.MapKey; value; manual |
-| 388 | Summary: org.apache.commons.collections4.map; UnmodifiableOrderedMap; true; unmodifiableOrderedMap; ; ; Argument[0].MapValue; ReturnValue.MapValue; value; manual |
-| 389 | Summary: org.apache.commons.collections4.map; UnmodifiableSortedMap; true; unmodifiableSortedMap; ; ; Argument[0].MapKey; ReturnValue.MapKey; value; manual |
-| 390 | Summary: org.apache.commons.collections4.map; UnmodifiableSortedMap; true; unmodifiableSortedMap; ; ; Argument[0].MapValue; ReturnValue.MapValue; value; manual |
-| 391 | Summary: org.apache.commons.collections4; ArrayStack; true; peek; ; ; Argument[this].Element; ReturnValue; value; manual |
-| 392 | Summary: org.apache.commons.collections4; ArrayStack; true; pop; ; ; Argument[this].Element; ReturnValue; value; manual |
-| 393 | Summary: org.apache.commons.collections4; ArrayStack; true; push; ; ; Argument[0]; Argument[this].Element; value; manual |
-| 394 | Summary: org.apache.commons.collections4; ArrayStack; true; push; ; ; Argument[0]; ReturnValue; value; manual |
-| 395 | Summary: org.apache.commons.collections4; Bag; true; add; ; ; Argument[0]; Argument[this].Element; value; manual |
-| 396 | Summary: org.apache.commons.collections4; Bag; true; uniqueSet; ; ; Argument[this].Element; ReturnValue.Element; value; manual |
-| 397 | Summary: org.apache.commons.collections4; BagUtils; true; collectionBag; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
-| 398 | Summary: org.apache.commons.collections4; BagUtils; true; predicatedBag; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
-| 399 | Summary: org.apache.commons.collections4; BagUtils; true; predicatedSortedBag; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
-| 400 | Summary: org.apache.commons.collections4; BagUtils; true; synchronizedBag; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
-| 401 | Summary: org.apache.commons.collections4; BagUtils; true; synchronizedSortedBag; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
-| 402 | Summary: org.apache.commons.collections4; BagUtils; true; transformingBag; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
-| 403 | Summary: org.apache.commons.collections4; BagUtils; true; transformingSortedBag; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
-| 404 | Summary: org.apache.commons.collections4; BagUtils; true; unmodifiableBag; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
-| 405 | Summary: org.apache.commons.collections4; BagUtils; true; unmodifiableSortedBag; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
-| 406 | Summary: org.apache.commons.collections4; BidiMap; true; getKey; ; ; Argument[this].MapKey; ReturnValue; value; manual |
-| 407 | Summary: org.apache.commons.collections4; BidiMap; true; inverseBidiMap; ; ; Argument[this].MapKey; ReturnValue.MapValue; value; manual |
-| 408 | Summary: org.apache.commons.collections4; BidiMap; true; inverseBidiMap; ; ; Argument[this].MapValue; ReturnValue.MapKey; value; manual |
-| 409 | Summary: org.apache.commons.collections4; BidiMap; true; removeValue; ; ; Argument[this].MapKey; ReturnValue; value; manual |
-| 410 | Summary: org.apache.commons.collections4; CollectionUtils; true; addAll; (Collection,Enumeration); ; Argument[1].Element; Argument[0].Element; value; manual |
-| 411 | Summary: org.apache.commons.collections4; CollectionUtils; true; addAll; (Collection,Iterable); ; Argument[1].Element; Argument[0].Element; value; manual |
-| 412 | Summary: org.apache.commons.collections4; CollectionUtils; true; addAll; (Collection,Iterator); ; Argument[1].Element; Argument[0].Element; value; manual |
-| 413 | Summary: org.apache.commons.collections4; CollectionUtils; true; addAll; (Collection,Object[]); ; Argument[1].ArrayElement; Argument[0].Element; value; manual |
-| 414 | Summary: org.apache.commons.collections4; CollectionUtils; true; addIgnoreNull; ; ; Argument[1]; Argument[0].Element; value; manual |
-| 415 | Summary: org.apache.commons.collections4; CollectionUtils; true; collate; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
-| 416 | Summary: org.apache.commons.collections4; CollectionUtils; true; collate; ; ; Argument[1].Element; ReturnValue.Element; value; manual |
-| 417 | Summary: org.apache.commons.collections4; CollectionUtils; true; disjunction; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
-| 418 | Summary: org.apache.commons.collections4; CollectionUtils; true; disjunction; ; ; Argument[1].Element; ReturnValue.Element; value; manual |
-| 419 | Summary: org.apache.commons.collections4; CollectionUtils; true; emptyIfNull; ; ; Argument[0]; ReturnValue; value; manual |
-| 420 | Summary: org.apache.commons.collections4; CollectionUtils; true; extractSingleton; ; ; Argument[0].Element; ReturnValue; value; manual |
-| 421 | Summary: org.apache.commons.collections4; CollectionUtils; true; find; ; ; Argument[0].Element; ReturnValue; value; manual |
-| 422 | Summary: org.apache.commons.collections4; CollectionUtils; true; get; (Iterable,int); ; Argument[0].Element; ReturnValue; value; manual |
-| 423 | Summary: org.apache.commons.collections4; CollectionUtils; true; get; (Iterator,int); ; Argument[0].Element; ReturnValue; value; manual |
-| 424 | Summary: org.apache.commons.collections4; CollectionUtils; true; get; (Map,int); ; Argument[0].MapKey; ReturnValue.MapKey; value; manual |
-| 425 | Summary: org.apache.commons.collections4; CollectionUtils; true; get; (Map,int); ; Argument[0].MapValue; ReturnValue.MapValue; value; manual |
-| 426 | Summary: org.apache.commons.collections4; CollectionUtils; true; get; (Object,int); ; Argument[0].ArrayElement; ReturnValue; value; manual |
-| 427 | Summary: org.apache.commons.collections4; CollectionUtils; true; get; (Object,int); ; Argument[0].Element; ReturnValue; value; manual |
-| 428 | Summary: org.apache.commons.collections4; CollectionUtils; true; get; (Object,int); ; Argument[0].MapKey; ReturnValue.MapKey; value; manual |
-| 429 | Summary: org.apache.commons.collections4; CollectionUtils; true; get; (Object,int); ; Argument[0].MapValue; ReturnValue.MapValue; value; manual |
-| 430 | Summary: org.apache.commons.collections4; CollectionUtils; true; getCardinalityMap; ; ; Argument[0].Element; ReturnValue.MapKey; value; manual |
-| 431 | Summary: org.apache.commons.collections4; CollectionUtils; true; intersection; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
-| 432 | Summary: org.apache.commons.collections4; CollectionUtils; true; intersection; ; ; Argument[1].Element; ReturnValue.Element; value; manual |
-| 433 | Summary: org.apache.commons.collections4; CollectionUtils; true; permutations; ; ; Argument[0].Element; ReturnValue.Element.Element; value; manual |
-| 434 | Summary: org.apache.commons.collections4; CollectionUtils; true; predicatedCollection; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
-| 435 | Summary: org.apache.commons.collections4; CollectionUtils; true; removeAll; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
-| 436 | Summary: org.apache.commons.collections4; CollectionUtils; true; retainAll; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
-| 437 | Summary: org.apache.commons.collections4; CollectionUtils; true; select; (Iterable,Predicate); ; Argument[0].Element; ReturnValue.Element; value; manual |
-| 438 | Summary: org.apache.commons.collections4; CollectionUtils; true; select; (Iterable,Predicate,Collection); ; Argument[0].Element; Argument[2].Element; value; manual |
-| 439 | Summary: org.apache.commons.collections4; CollectionUtils; true; select; (Iterable,Predicate,Collection); ; Argument[2]; ReturnValue; value; manual |
-| 440 | Summary: org.apache.commons.collections4; CollectionUtils; true; select; (Iterable,Predicate,Collection,Collection); ; Argument[0].Element; Argument[2].Element; value; manual |
-| 441 | Summary: org.apache.commons.collections4; CollectionUtils; true; select; (Iterable,Predicate,Collection,Collection); ; Argument[0].Element; Argument[3].Element; value; manual |
-| 442 | Summary: org.apache.commons.collections4; CollectionUtils; true; select; (Iterable,Predicate,Collection,Collection); ; Argument[2]; ReturnValue; value; manual |
-| 443 | Summary: org.apache.commons.collections4; CollectionUtils; true; selectRejected; (Iterable,Predicate); ; Argument[0].Element; ReturnValue.Element; value; manual |
-| 444 | Summary: org.apache.commons.collections4; CollectionUtils; true; selectRejected; (Iterable,Predicate,Collection); ; Argument[0].Element; Argument[2].Element; value; manual |
-| 445 | Summary: org.apache.commons.collections4; CollectionUtils; true; selectRejected; (Iterable,Predicate,Collection); ; Argument[2]; ReturnValue; value; manual |
-| 446 | Summary: org.apache.commons.collections4; CollectionUtils; true; subtract; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
-| 447 | Summary: org.apache.commons.collections4; CollectionUtils; true; synchronizedCollection; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
-| 448 | Summary: org.apache.commons.collections4; CollectionUtils; true; transformingCollection; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
-| 449 | Summary: org.apache.commons.collections4; CollectionUtils; true; union; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
-| 450 | Summary: org.apache.commons.collections4; CollectionUtils; true; union; ; ; Argument[1].Element; ReturnValue.Element; value; manual |
-| 451 | Summary: org.apache.commons.collections4; CollectionUtils; true; unmodifiableCollection; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
-| 452 | Summary: org.apache.commons.collections4; EnumerationUtils; true; get; ; ; Argument[0].Element; ReturnValue; value; manual |
-| 453 | Summary: org.apache.commons.collections4; EnumerationUtils; true; toList; (Enumeration); ; Argument[0].Element; ReturnValue.Element; value; manual |
-| 454 | Summary: org.apache.commons.collections4; EnumerationUtils; true; toList; (StringTokenizer); ; Argument[0]; ReturnValue.Element; taint; manual |
-| 455 | Summary: org.apache.commons.collections4; FluentIterable; true; append; (Iterable); ; Argument[this].Element; ReturnValue.Element; value; manual |
-| 456 | Summary: org.apache.commons.collections4; FluentIterable; true; append; (Iterable); ; Argument[0].Element; ReturnValue.Element; value; manual |
-| 457 | Summary: org.apache.commons.collections4; FluentIterable; true; append; (Object[]); ; Argument[this].Element; ReturnValue.Element; value; manual |
-| 458 | Summary: org.apache.commons.collections4; FluentIterable; true; append; (Object[]); ; Argument[0].ArrayElement; ReturnValue.Element; value; manual |
-| 459 | Summary: org.apache.commons.collections4; FluentIterable; true; asEnumeration; ; ; Argument[this].Element; ReturnValue.Element; value; manual |
-| 460 | Summary: org.apache.commons.collections4; FluentIterable; true; collate; ; ; Argument[this].Element; ReturnValue.Element; value; manual |
-| 461 | Summary: org.apache.commons.collections4; FluentIterable; true; collate; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
-| 462 | Summary: org.apache.commons.collections4; FluentIterable; true; copyInto; ; ; Argument[this].Element; Argument[0].Element; value; manual |
-| 463 | Summary: org.apache.commons.collections4; FluentIterable; true; eval; ; ; Argument[this].Element; ReturnValue.Element; value; manual |
-| 464 | Summary: org.apache.commons.collections4; FluentIterable; true; filter; ; ; Argument[this].Element; ReturnValue.Element; value; manual |
-| 465 | Summary: org.apache.commons.collections4; FluentIterable; true; get; ; ; Argument[this].Element; ReturnValue; value; manual |
-| 466 | Summary: org.apache.commons.collections4; FluentIterable; true; limit; ; ; Argument[this].Element; ReturnValue.Element; value; manual |
-| 467 | Summary: org.apache.commons.collections4; FluentIterable; true; loop; ; ; Argument[this].Element; ReturnValue.Element; value; manual |
-| 468 | Summary: org.apache.commons.collections4; FluentIterable; true; of; (Iterable); ; Argument[0].Element; ReturnValue.Element; value; manual |
-| 469 | Summary: org.apache.commons.collections4; FluentIterable; true; of; (Object); ; Argument[0]; ReturnValue.Element; value; manual |
-| 470 | Summary: org.apache.commons.collections4; FluentIterable; true; of; (Object[]); ; Argument[0].ArrayElement; ReturnValue.Element; value; manual |
-| 471 | Summary: org.apache.commons.collections4; FluentIterable; true; reverse; ; ; Argument[this].Element; ReturnValue.Element; value; manual |
-| 472 | Summary: org.apache.commons.collections4; FluentIterable; true; skip; ; ; Argument[this].Element; ReturnValue.Element; value; manual |
-| 473 | Summary: org.apache.commons.collections4; FluentIterable; true; toArray; ; ; Argument[this].Element; ReturnValue.ArrayElement; value; manual |
-| 474 | Summary: org.apache.commons.collections4; FluentIterable; true; toList; ; ; Argument[this].Element; ReturnValue.Element; value; manual |
-| 475 | Summary: org.apache.commons.collections4; FluentIterable; true; unique; ; ; Argument[this].Element; ReturnValue.Element; value; manual |
-| 476 | Summary: org.apache.commons.collections4; FluentIterable; true; unmodifiable; ; ; Argument[this].Element; ReturnValue.Element; value; manual |
-| 477 | Summary: org.apache.commons.collections4; FluentIterable; true; zip; (Iterable); ; Argument[this].Element; ReturnValue.Element; value; manual |
-| 478 | Summary: org.apache.commons.collections4; FluentIterable; true; zip; (Iterable); ; Argument[0].Element; ReturnValue.Element; value; manual |
-| 479 | Summary: org.apache.commons.collections4; FluentIterable; true; zip; (Iterable[]); ; Argument[this].Element; ReturnValue.Element; value; manual |
-| 480 | Summary: org.apache.commons.collections4; FluentIterable; true; zip; (Iterable[]); ; Argument[0].ArrayElement.Element; ReturnValue.Element; value; manual |
-| 481 | Summary: org.apache.commons.collections4; Get; true; entrySet; ; ; Argument[this].MapKey; ReturnValue.Element.MapKey; value; manual |
-| 482 | Summary: org.apache.commons.collections4; Get; true; entrySet; ; ; Argument[this].MapValue; ReturnValue.Element.MapValue; value; manual |
-| 483 | Summary: org.apache.commons.collections4; Get; true; get; ; ; Argument[this].MapValue; ReturnValue; value; manual |
-| 484 | Summary: org.apache.commons.collections4; Get; true; keySet; (); ; Argument[this].MapKey; ReturnValue.Element; value; manual |
-| 485 | Summary: org.apache.commons.collections4; Get; true; remove; (Object); ; Argument[this].MapValue; ReturnValue; value; manual |
-| 486 | Summary: org.apache.commons.collections4; Get; true; values; (); ; Argument[this].MapValue; ReturnValue.Element; value; manual |
-| 487 | Summary: org.apache.commons.collections4; IterableGet; true; mapIterator; ; ; Argument[this].MapKey; ReturnValue.Element; value; manual |
-| 488 | Summary: org.apache.commons.collections4; IterableGet; true; mapIterator; ; ; Argument[this].MapValue; ReturnValue.MapValue; value; manual |
-| 489 | Summary: org.apache.commons.collections4; IterableUtils; true; boundedIterable; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
-| 490 | Summary: org.apache.commons.collections4; IterableUtils; true; chainedIterable; (Iterable,Iterable); ; Argument[0].Element; ReturnValue.Element; value; manual |
-| 491 | Summary: org.apache.commons.collections4; IterableUtils; true; chainedIterable; (Iterable,Iterable); ; Argument[1].Element; ReturnValue.Element; value; manual |
-| 492 | Summary: org.apache.commons.collections4; IterableUtils; true; chainedIterable; (Iterable,Iterable,Iterable); ; Argument[0].Element; ReturnValue.Element; value; manual |
-| 493 | Summary: org.apache.commons.collections4; IterableUtils; true; chainedIterable; (Iterable,Iterable,Iterable); ; Argument[1].Element; ReturnValue.Element; value; manual |
-| 494 | Summary: org.apache.commons.collections4; IterableUtils; true; chainedIterable; (Iterable,Iterable,Iterable); ; Argument[2].Element; ReturnValue.Element; value; manual |
-| 495 | Summary: org.apache.commons.collections4; IterableUtils; true; chainedIterable; (Iterable,Iterable,Iterable,Iterable); ; Argument[0].Element; ReturnValue.Element; value; manual |
-| 496 | Summary: org.apache.commons.collections4; IterableUtils; true; chainedIterable; (Iterable,Iterable,Iterable,Iterable); ; Argument[1].Element; ReturnValue.Element; value; manual |
-| 497 | Summary: org.apache.commons.collections4; IterableUtils; true; chainedIterable; (Iterable,Iterable,Iterable,Iterable); ; Argument[2].Element; ReturnValue.Element; value; manual |
-| 498 | Summary: org.apache.commons.collections4; IterableUtils; true; chainedIterable; (Iterable,Iterable,Iterable,Iterable); ; Argument[3].Element; ReturnValue.Element; value; manual |
-| 499 | Summary: org.apache.commons.collections4; IterableUtils; true; collatedIterable; (Comparator,Iterable,Iterable); ; Argument[1].Element; ReturnValue.Element; value; manual |
-| 500 | Summary: org.apache.commons.collections4; IterableUtils; true; collatedIterable; (Comparator,Iterable,Iterable); ; Argument[2].Element; ReturnValue.Element; value; manual |
-| 501 | Summary: org.apache.commons.collections4; IterableUtils; true; collatedIterable; (Iterable,Iterable); ; Argument[0].Element; ReturnValue.Element; value; manual |
-| 502 | Summary: org.apache.commons.collections4; IterableUtils; true; collatedIterable; (Iterable,Iterable); ; Argument[1].Element; ReturnValue.Element; value; manual |
-| 503 | Summary: org.apache.commons.collections4; IterableUtils; true; emptyIfNull; ; ; Argument[0]; ReturnValue; value; manual |
-| 504 | Summary: org.apache.commons.collections4; IterableUtils; true; filteredIterable; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
-| 505 | Summary: org.apache.commons.collections4; IterableUtils; true; find; ; ; Argument[0].Element; ReturnValue; value; manual |
-| 506 | Summary: org.apache.commons.collections4; IterableUtils; true; first; ; ; Argument[0].Element; ReturnValue; value; manual |
-| 507 | Summary: org.apache.commons.collections4; IterableUtils; true; forEachButLast; ; ; Argument[0].Element; ReturnValue; value; manual |
-| 508 | Summary: org.apache.commons.collections4; IterableUtils; true; get; ; ; Argument[0].Element; ReturnValue; value; manual |
-| 509 | Summary: org.apache.commons.collections4; IterableUtils; true; loopingIterable; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
-| 510 | Summary: org.apache.commons.collections4; IterableUtils; true; partition; ; ; Argument[0].Element; ReturnValue.Element.Element; value; manual |
-| 511 | Summary: org.apache.commons.collections4; IterableUtils; true; reversedIterable; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
-| 512 | Summary: org.apache.commons.collections4; IterableUtils; true; skippingIterable; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
-| 513 | Summary: org.apache.commons.collections4; IterableUtils; true; toList; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
-| 514 | Summary: org.apache.commons.collections4; IterableUtils; true; toString; ; ; Argument[2]; ReturnValue; taint; manual |
-| 515 | Summary: org.apache.commons.collections4; IterableUtils; true; toString; ; ; Argument[3]; ReturnValue; taint; manual |
-| 516 | Summary: org.apache.commons.collections4; IterableUtils; true; toString; ; ; Argument[4]; ReturnValue; taint; manual |
-| 517 | Summary: org.apache.commons.collections4; IterableUtils; true; uniqueIterable; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
-| 518 | Summary: org.apache.commons.collections4; IterableUtils; true; unmodifiableIterable; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
-| 519 | Summary: org.apache.commons.collections4; IterableUtils; true; zippingIterable; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
-| 520 | Summary: org.apache.commons.collections4; IterableUtils; true; zippingIterable; (Iterable,Iterable); ; Argument[1].Element; ReturnValue.Element; value; manual |
-| 521 | Summary: org.apache.commons.collections4; IteratorUtils; true; arrayIterator; ; ; Argument[0].ArrayElement; ReturnValue.Element; value; manual |
-| 522 | Summary: org.apache.commons.collections4; IteratorUtils; true; arrayListIterator; ; ; Argument[0].ArrayElement; ReturnValue.Element; value; manual |
-| 523 | Summary: org.apache.commons.collections4; IteratorUtils; true; asEnumeration; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
-| 524 | Summary: org.apache.commons.collections4; IteratorUtils; true; asIterable; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
-| 525 | Summary: org.apache.commons.collections4; IteratorUtils; true; asIterator; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
-| 526 | Summary: org.apache.commons.collections4; IteratorUtils; true; asMultipleUseIterable; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
-| 527 | Summary: org.apache.commons.collections4; IteratorUtils; true; boundedIterator; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
-| 528 | Summary: org.apache.commons.collections4; IteratorUtils; true; chainedIterator; (Collection); ; Argument[0].Element.Element; ReturnValue.Element; value; manual |
-| 529 | Summary: org.apache.commons.collections4; IteratorUtils; true; chainedIterator; (Iterator,Iterator); ; Argument[0].Element; ReturnValue.Element; value; manual |
-| 530 | Summary: org.apache.commons.collections4; IteratorUtils; true; chainedIterator; (Iterator,Iterator); ; Argument[1].Element; ReturnValue.Element; value; manual |
-| 531 | Summary: org.apache.commons.collections4; IteratorUtils; true; collatedIterator; (Comparator,Collection); ; Argument[1].Element.Element; ReturnValue.Element; value; manual |
-| 532 | Summary: org.apache.commons.collections4; IteratorUtils; true; collatedIterator; (Comparator,Iterator,Iterator); ; Argument[1].Element; ReturnValue.Element; value; manual |
-| 533 | Summary: org.apache.commons.collections4; IteratorUtils; true; collatedIterator; (Comparator,Iterator,Iterator); ; Argument[2].Element; ReturnValue.Element; value; manual |
-| 534 | Summary: org.apache.commons.collections4; IteratorUtils; true; collatedIterator; (Comparator,Iterator[]); ; Argument[1].ArrayElement.Element; ReturnValue.Element; value; manual |
-| 535 | Summary: org.apache.commons.collections4; IteratorUtils; true; filteredIterator; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
-| 536 | Summary: org.apache.commons.collections4; IteratorUtils; true; filteredListIterator; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
-| 537 | Summary: org.apache.commons.collections4; IteratorUtils; true; find; ; ; Argument[0].Element; ReturnValue; value; manual |
-| 538 | Summary: org.apache.commons.collections4; IteratorUtils; true; first; ; ; Argument[0].Element; ReturnValue; value; manual |
-| 539 | Summary: org.apache.commons.collections4; IteratorUtils; true; forEachButLast; ; ; Argument[0].Element; ReturnValue; value; manual |
-| 540 | Summary: org.apache.commons.collections4; IteratorUtils; true; get; ; ; Argument[0].Element; ReturnValue; value; manual |
-| 541 | Summary: org.apache.commons.collections4; IteratorUtils; true; getIterator; ; ; Argument[0]; ReturnValue.Element; value; manual |
-| 542 | Summary: org.apache.commons.collections4; IteratorUtils; true; getIterator; ; ; Argument[0].ArrayElement; ReturnValue.Element; value; manual |
-| 543 | Summary: org.apache.commons.collections4; IteratorUtils; true; getIterator; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
-| 544 | Summary: org.apache.commons.collections4; IteratorUtils; true; getIterator; ; ; Argument[0].MapValue; ReturnValue.Element; value; manual |
-| 545 | Summary: org.apache.commons.collections4; IteratorUtils; true; loopingIterator; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
-| 546 | Summary: org.apache.commons.collections4; IteratorUtils; true; loopingListIterator; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
-| 547 | Summary: org.apache.commons.collections4; IteratorUtils; true; peekingIterator; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
-| 548 | Summary: org.apache.commons.collections4; IteratorUtils; true; pushbackIterator; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
-| 549 | Summary: org.apache.commons.collections4; IteratorUtils; true; singletonIterator; ; ; Argument[0]; ReturnValue.Element; value; manual |
-| 550 | Summary: org.apache.commons.collections4; IteratorUtils; true; singletonListIterator; ; ; Argument[0]; ReturnValue.Element; value; manual |
-| 551 | Summary: org.apache.commons.collections4; IteratorUtils; true; skippingIterator; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
-| 552 | Summary: org.apache.commons.collections4; IteratorUtils; true; toArray; ; ; Argument[0].Element; ReturnValue.ArrayElement; value; manual |
-| 553 | Summary: org.apache.commons.collections4; IteratorUtils; true; toList; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
-| 554 | Summary: org.apache.commons.collections4; IteratorUtils; true; toListIterator; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
-| 555 | Summary: org.apache.commons.collections4; IteratorUtils; true; toString; ; ; Argument[2]; ReturnValue; taint; manual |
-| 556 | Summary: org.apache.commons.collections4; IteratorUtils; true; toString; ; ; Argument[3]; ReturnValue; taint; manual |
-| 557 | Summary: org.apache.commons.collections4; IteratorUtils; true; toString; ; ; Argument[4]; ReturnValue; taint; manual |
-| 558 | Summary: org.apache.commons.collections4; IteratorUtils; true; unmodifiableIterator; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
-| 559 | Summary: org.apache.commons.collections4; IteratorUtils; true; unmodifiableListIterator; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
-| 560 | Summary: org.apache.commons.collections4; IteratorUtils; true; unmodifiableMapIterator; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
-| 561 | Summary: org.apache.commons.collections4; IteratorUtils; true; unmodifiableMapIterator; ; ; Argument[0].MapValue; ReturnValue.MapValue; value; manual |
-| 562 | Summary: org.apache.commons.collections4; IteratorUtils; true; zippingIterator; (Iterator,Iterator); ; Argument[0].Element; ReturnValue.Element; value; manual |
-| 563 | Summary: org.apache.commons.collections4; IteratorUtils; true; zippingIterator; (Iterator,Iterator); ; Argument[1].Element; ReturnValue.Element; value; manual |
-| 564 | Summary: org.apache.commons.collections4; IteratorUtils; true; zippingIterator; (Iterator,Iterator,Iterator); ; Argument[0].Element; ReturnValue.Element; value; manual |
-| 565 | Summary: org.apache.commons.collections4; IteratorUtils; true; zippingIterator; (Iterator,Iterator,Iterator); ; Argument[1].Element; ReturnValue.Element; value; manual |
-| 566 | Summary: org.apache.commons.collections4; IteratorUtils; true; zippingIterator; (Iterator,Iterator,Iterator); ; Argument[2].Element; ReturnValue.Element; value; manual |
-| 567 | Summary: org.apache.commons.collections4; IteratorUtils; true; zippingIterator; (Iterator[]); ; Argument[0].ArrayElement.Element; ReturnValue.Element; value; manual |
-| 568 | Summary: org.apache.commons.collections4; KeyValue; true; getKey; ; ; Argument[this].MapKey; ReturnValue; value; manual |
-| 569 | Summary: org.apache.commons.collections4; KeyValue; true; getValue; ; ; Argument[this].MapValue; ReturnValue; value; manual |
-| 570 | Summary: org.apache.commons.collections4; ListUtils; true; defaultIfNull; ; ; Argument[0]; ReturnValue; value; manual |
-| 571 | Summary: org.apache.commons.collections4; ListUtils; true; defaultIfNull; ; ; Argument[1]; ReturnValue; value; manual |
-| 572 | Summary: org.apache.commons.collections4; ListUtils; true; emptyIfNull; ; ; Argument[0]; ReturnValue; value; manual |
-| 573 | Summary: org.apache.commons.collections4; ListUtils; true; fixedSizeList; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
-| 574 | Summary: org.apache.commons.collections4; ListUtils; true; intersection; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
-| 575 | Summary: org.apache.commons.collections4; ListUtils; true; intersection; ; ; Argument[1].Element; ReturnValue.Element; value; manual |
-| 576 | Summary: org.apache.commons.collections4; ListUtils; true; lazyList; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
-| 577 | Summary: org.apache.commons.collections4; ListUtils; true; longestCommonSubsequence; (CharSequence,CharSequence); ; Argument[0]; ReturnValue; taint; manual |
-| 578 | Summary: org.apache.commons.collections4; ListUtils; true; longestCommonSubsequence; (CharSequence,CharSequence); ; Argument[1]; ReturnValue; taint; manual |
-| 579 | Summary: org.apache.commons.collections4; ListUtils; true; longestCommonSubsequence; (List,List); ; Argument[0].Element; ReturnValue.Element; value; manual |
-| 580 | Summary: org.apache.commons.collections4; ListUtils; true; longestCommonSubsequence; (List,List); ; Argument[1].Element; ReturnValue.Element; value; manual |
-| 581 | Summary: org.apache.commons.collections4; ListUtils; true; longestCommonSubsequence; (List,List,Equator); ; Argument[0].Element; ReturnValue.Element; value; manual |
-| 582 | Summary: org.apache.commons.collections4; ListUtils; true; longestCommonSubsequence; (List,List,Equator); ; Argument[1].Element; ReturnValue.Element; value; manual |
-| 583 | Summary: org.apache.commons.collections4; ListUtils; true; partition; ; ; Argument[0].Element; ReturnValue.Element.Element; value; manual |
-| 584 | Summary: org.apache.commons.collections4; ListUtils; true; predicatedList; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
-| 585 | Summary: org.apache.commons.collections4; ListUtils; true; removeAll; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
-| 586 | Summary: org.apache.commons.collections4; ListUtils; true; retainAll; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
-| 587 | Summary: org.apache.commons.collections4; ListUtils; true; select; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
-| 588 | Summary: org.apache.commons.collections4; ListUtils; true; selectRejected; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
-| 589 | Summary: org.apache.commons.collections4; ListUtils; true; subtract; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
-| 590 | Summary: org.apache.commons.collections4; ListUtils; true; sum; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
-| 591 | Summary: org.apache.commons.collections4; ListUtils; true; sum; ; ; Argument[1].Element; ReturnValue.Element; value; manual |
-| 592 | Summary: org.apache.commons.collections4; ListUtils; true; synchronizedList; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
-| 593 | Summary: org.apache.commons.collections4; ListUtils; true; transformedList; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
-| 594 | Summary: org.apache.commons.collections4; ListUtils; true; union; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
-| 595 | Summary: org.apache.commons.collections4; ListUtils; true; union; ; ; Argument[1].Element; ReturnValue.Element; value; manual |
-| 596 | Summary: org.apache.commons.collections4; ListUtils; true; unmodifiableList; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
-| 597 | Summary: org.apache.commons.collections4; MapIterator; true; getKey; ; ; Argument[this].Element; ReturnValue; value; manual |
-| 598 | Summary: org.apache.commons.collections4; MapIterator; true; getValue; ; ; Argument[this].MapValue; ReturnValue; value; manual |
-| 599 | Summary: org.apache.commons.collections4; MapIterator; true; setValue; ; ; Argument[this].MapValue; ReturnValue; value; manual |
-| 600 | Summary: org.apache.commons.collections4; MapIterator; true; setValue; ; ; Argument[0]; Argument[this].MapValue; value; manual |
-| 601 | Summary: org.apache.commons.collections4; MapUtils; true; emptyIfNull; ; ; Argument[0]; ReturnValue; value; manual |
-| 602 | Summary: org.apache.commons.collections4; MapUtils; true; fixedSizeMap; ; ; Argument[0].MapKey; ReturnValue.MapKey; value; manual |
-| 603 | Summary: org.apache.commons.collections4; MapUtils; true; fixedSizeMap; ; ; Argument[0].MapValue; ReturnValue.MapValue; value; manual |
-| 604 | Summary: org.apache.commons.collections4; MapUtils; true; fixedSizeSortedMap; ; ; Argument[0].MapKey; ReturnValue.MapKey; value; manual |
-| 605 | Summary: org.apache.commons.collections4; MapUtils; true; fixedSizeSortedMap; ; ; Argument[0].MapValue; ReturnValue.MapValue; value; manual |
-| 606 | Summary: org.apache.commons.collections4; MapUtils; true; getMap; ; ; Argument[0].MapValue; ReturnValue; value; manual |
-| 607 | Summary: org.apache.commons.collections4; MapUtils; true; getMap; ; ; Argument[2]; ReturnValue; value; manual |
-| 608 | Summary: org.apache.commons.collections4; MapUtils; true; getObject; ; ; Argument[0].MapValue; ReturnValue; value; manual |
-| 609 | Summary: org.apache.commons.collections4; MapUtils; true; getObject; ; ; Argument[2]; ReturnValue; value; manual |
-| 610 | Summary: org.apache.commons.collections4; MapUtils; true; getString; ; ; Argument[0].MapValue; ReturnValue; value; manual |
-| 611 | Summary: org.apache.commons.collections4; MapUtils; true; getString; ; ; Argument[2]; ReturnValue; value; manual |
-| 612 | Summary: org.apache.commons.collections4; MapUtils; true; invertMap; ; ; Argument[0].MapKey; ReturnValue.MapValue; value; manual |
-| 613 | Summary: org.apache.commons.collections4; MapUtils; true; invertMap; ; ; Argument[0].MapValue; ReturnValue.MapKey; value; manual |
-| 614 | Summary: org.apache.commons.collections4; MapUtils; true; iterableMap; ; ; Argument[0].MapKey; ReturnValue.MapKey; value; manual |
-| 615 | Summary: org.apache.commons.collections4; MapUtils; true; iterableMap; ; ; Argument[0].MapValue; ReturnValue.MapValue; value; manual |
-| 616 | Summary: org.apache.commons.collections4; MapUtils; true; iterableSortedMap; ; ; Argument[0].MapKey; ReturnValue.MapKey; value; manual |
-| 617 | Summary: org.apache.commons.collections4; MapUtils; true; iterableSortedMap; ; ; Argument[0].MapValue; ReturnValue.MapValue; value; manual |
-| 618 | Summary: org.apache.commons.collections4; MapUtils; true; lazyMap; ; ; Argument[0].MapKey; ReturnValue.MapKey; value; manual |
-| 619 | Summary: org.apache.commons.collections4; MapUtils; true; lazyMap; ; ; Argument[0].MapValue; ReturnValue.MapValue; value; manual |
-| 620 | Summary: org.apache.commons.collections4; MapUtils; true; lazySortedMap; ; ; Argument[0].MapKey; ReturnValue.MapKey; value; manual |
-| 621 | Summary: org.apache.commons.collections4; MapUtils; true; lazySortedMap; ; ; Argument[0].MapValue; ReturnValue.MapValue; value; manual |
-| 622 | Summary: org.apache.commons.collections4; MapUtils; true; multiValueMap; ; ; Argument[0].MapKey; ReturnValue.MapKey; value; manual |
-| 623 | Summary: org.apache.commons.collections4; MapUtils; true; multiValueMap; ; ; Argument[0].MapValue; ReturnValue.MapValue; value; manual |
-| 624 | Summary: org.apache.commons.collections4; MapUtils; true; orderedMap; ; ; Argument[0].MapKey; ReturnValue.MapKey; value; manual |
-| 625 | Summary: org.apache.commons.collections4; MapUtils; true; orderedMap; ; ; Argument[0].MapValue; ReturnValue.MapValue; value; manual |
-| 626 | Summary: org.apache.commons.collections4; MapUtils; true; populateMap; (Map,Iterable,Transformer); ; Argument[1].Element; Argument[0].MapValue; value; manual |
-| 627 | Summary: org.apache.commons.collections4; MapUtils; true; populateMap; (MultiMap,Iterable,Transformer); ; Argument[1].Element; Argument[0].MapValue.Element; value; manual |
-| 628 | Summary: org.apache.commons.collections4; MapUtils; true; predicatedMap; ; ; Argument[0].MapKey; ReturnValue.MapKey; value; manual |
-| 629 | Summary: org.apache.commons.collections4; MapUtils; true; predicatedMap; ; ; Argument[0].MapValue; ReturnValue.MapValue; value; manual |
-| 630 | Summary: org.apache.commons.collections4; MapUtils; true; predicatedSortedMap; ; ; Argument[0].MapKey; ReturnValue.MapKey; value; manual |
-| 631 | Summary: org.apache.commons.collections4; MapUtils; true; predicatedSortedMap; ; ; Argument[0].MapValue; ReturnValue.MapValue; value; manual |
-| 632 | Summary: org.apache.commons.collections4; MapUtils; true; putAll; ; ; Argument[1].ArrayElement; Argument[0].MapKey; value; manual |
-| 633 | Summary: org.apache.commons.collections4; MapUtils; true; putAll; ; ; Argument[1].ArrayElement; Argument[0].MapValue; value; manual |
-| 634 | Summary: org.apache.commons.collections4; MapUtils; true; putAll; ; ; Argument[1].ArrayElement; ReturnValue.MapKey; value; manual |
-| 635 | Summary: org.apache.commons.collections4; MapUtils; true; putAll; ; ; Argument[1].ArrayElement; ReturnValue.MapValue; value; manual |
-| 636 | Summary: org.apache.commons.collections4; MapUtils; true; putAll; ; ; Argument[1].ArrayElement.ArrayElement; Argument[0].MapKey; value; manual |
-| 637 | Summary: org.apache.commons.collections4; MapUtils; true; putAll; ; ; Argument[1].ArrayElement.ArrayElement; Argument[0].MapValue; value; manual |
-| 638 | Summary: org.apache.commons.collections4; MapUtils; true; putAll; ; ; Argument[1].ArrayElement.ArrayElement; ReturnValue.MapKey; value; manual |
-| 639 | Summary: org.apache.commons.collections4; MapUtils; true; putAll; ; ; Argument[1].ArrayElement.ArrayElement; ReturnValue.MapValue; value; manual |
-| 640 | Summary: org.apache.commons.collections4; MapUtils; true; putAll; ; ; Argument[1].ArrayElement.MapKey; Argument[0].MapKey; value; manual |
-| 641 | Summary: org.apache.commons.collections4; MapUtils; true; putAll; ; ; Argument[1].ArrayElement.MapKey; ReturnValue.MapKey; value; manual |
-| 642 | Summary: org.apache.commons.collections4; MapUtils; true; putAll; ; ; Argument[1].ArrayElement.MapValue; Argument[0].MapValue; value; manual |
-| 643 | Summary: org.apache.commons.collections4; MapUtils; true; putAll; ; ; Argument[1].ArrayElement.MapValue; ReturnValue.MapValue; value; manual |
-| 644 | Summary: org.apache.commons.collections4; MapUtils; true; safeAddToMap; ; ; Argument[1]; Argument[0].MapKey; value; manual |
-| 645 | Summary: org.apache.commons.collections4; MapUtils; true; safeAddToMap; ; ; Argument[2]; Argument[0].MapValue; value; manual |
-| 646 | Summary: org.apache.commons.collections4; MapUtils; true; synchronizedMap; ; ; Argument[0].MapKey; ReturnValue.MapKey; value; manual |
-| 647 | Summary: org.apache.commons.collections4; MapUtils; true; synchronizedMap; ; ; Argument[0].MapValue; ReturnValue.MapValue; value; manual |
-| 648 | Summary: org.apache.commons.collections4; MapUtils; true; synchronizedSortedMap; ; ; Argument[0].MapKey; ReturnValue.MapKey; value; manual |
-| 649 | Summary: org.apache.commons.collections4; MapUtils; true; synchronizedSortedMap; ; ; Argument[0].MapValue; ReturnValue.MapValue; value; manual |
-| 650 | Summary: org.apache.commons.collections4; MapUtils; true; toMap; ; ; Argument[0].MapKey; ReturnValue.MapKey; value; manual |
-| 651 | Summary: org.apache.commons.collections4; MapUtils; true; toMap; ; ; Argument[0].MapValue; ReturnValue.MapValue; value; manual |
-| 652 | Summary: org.apache.commons.collections4; MapUtils; true; transformedMap; ; ; Argument[0].MapKey; ReturnValue.MapKey; value; manual |
-| 653 | Summary: org.apache.commons.collections4; MapUtils; true; transformedMap; ; ; Argument[0].MapValue; ReturnValue.MapValue; value; manual |
-| 654 | Summary: org.apache.commons.collections4; MapUtils; true; transformedSortedMap; ; ; Argument[0].MapKey; ReturnValue.MapKey; value; manual |
-| 655 | Summary: org.apache.commons.collections4; MapUtils; true; transformedSortedMap; ; ; Argument[0].MapValue; ReturnValue.MapValue; value; manual |
-| 656 | Summary: org.apache.commons.collections4; MapUtils; true; unmodifiableMap; ; ; Argument[0].MapKey; ReturnValue.MapKey; value; manual |
-| 657 | Summary: org.apache.commons.collections4; MapUtils; true; unmodifiableMap; ; ; Argument[0].MapValue; ReturnValue.MapValue; value; manual |
-| 658 | Summary: org.apache.commons.collections4; MapUtils; true; unmodifiableSortedMap; ; ; Argument[0].MapKey; ReturnValue.MapKey; value; manual |
-| 659 | Summary: org.apache.commons.collections4; MapUtils; true; unmodifiableSortedMap; ; ; Argument[0].MapValue; ReturnValue.MapValue; value; manual |
-| 660 | Summary: org.apache.commons.collections4; MultiMap; true; get; ; ; Argument[this].MapValue.Element; ReturnValue.Element; value; manual |
-| 661 | Summary: org.apache.commons.collections4; MultiMap; true; put; ; ; Argument[0]; Argument[this].MapKey; value; manual |
-| 662 | Summary: org.apache.commons.collections4; MultiMap; true; put; ; ; Argument[1]; Argument[this].MapValue.Element; value; manual |
-| 663 | Summary: org.apache.commons.collections4; MultiMap; true; values; ; ; Argument[this].MapValue.Element; ReturnValue.Element; value; manual |
-| 664 | Summary: org.apache.commons.collections4; MultiMapUtils; true; emptyIfNull; ; ; Argument[0]; ReturnValue; value; manual |
-| 665 | Summary: org.apache.commons.collections4; MultiMapUtils; true; getCollection; ; ; Argument[0].MapValue; ReturnValue; value; manual |
-| 666 | Summary: org.apache.commons.collections4; MultiMapUtils; true; getValuesAsBag; ; ; Argument[0].MapValue.Element; ReturnValue.Element; value; manual |
-| 667 | Summary: org.apache.commons.collections4; MultiMapUtils; true; getValuesAsList; ; ; Argument[0].MapValue.Element; ReturnValue.Element; value; manual |
-| 668 | Summary: org.apache.commons.collections4; MultiMapUtils; true; getValuesAsSet; ; ; Argument[0].MapValue.Element; ReturnValue.Element; value; manual |
-| 669 | Summary: org.apache.commons.collections4; MultiMapUtils; true; transformedMultiValuedMap; ; ; Argument[0].MapKey; ReturnValue.MapKey; value; manual |
-| 670 | Summary: org.apache.commons.collections4; MultiMapUtils; true; transformedMultiValuedMap; ; ; Argument[0].MapValue.Element; ReturnValue.MapValue.Element; value; manual |
-| 671 | Summary: org.apache.commons.collections4; MultiMapUtils; true; unmodifiableMultiValuedMap; ; ; Argument[0].MapKey; ReturnValue.MapKey; value; manual |
-| 672 | Summary: org.apache.commons.collections4; MultiMapUtils; true; unmodifiableMultiValuedMap; ; ; Argument[0].MapValue.Element; ReturnValue.MapValue.Element; value; manual |
-| 673 | Summary: org.apache.commons.collections4; MultiSet; true; add; ; ; Argument[0]; Argument[this].Element; value; manual |
-| 674 | Summary: org.apache.commons.collections4; MultiSet; true; entrySet; ; ; Argument[this].Element; ReturnValue.Element.Element; value; manual |
-| 675 | Summary: org.apache.commons.collections4; MultiSet; true; uniqueSet; ; ; Argument[this].Element; ReturnValue.Element; value; manual |
-| 676 | Summary: org.apache.commons.collections4; MultiSet$Entry; true; getElement; ; ; Argument[this].Element; ReturnValue; value; manual |
-| 677 | Summary: org.apache.commons.collections4; MultiSetUtils; true; predicatedMultiSet; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
-| 678 | Summary: org.apache.commons.collections4; MultiSetUtils; true; synchronizedMultiSet; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
-| 679 | Summary: org.apache.commons.collections4; MultiSetUtils; true; unmodifiableMultiSet; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
-| 680 | Summary: org.apache.commons.collections4; MultiValuedMap; true; asMap; ; ; Argument[this].MapKey; ReturnValue.MapKey; value; manual |
-| 681 | Summary: org.apache.commons.collections4; MultiValuedMap; true; asMap; ; ; Argument[this].MapValue.Element; ReturnValue.MapValue.Element; value; manual |
-| 682 | Summary: org.apache.commons.collections4; MultiValuedMap; true; entries; ; ; Argument[this].MapKey; ReturnValue.Element.MapKey; value; manual |
-| 683 | Summary: org.apache.commons.collections4; MultiValuedMap; true; entries; ; ; Argument[this].MapValue.Element; ReturnValue.Element.MapValue; value; manual |
-| 684 | Summary: org.apache.commons.collections4; MultiValuedMap; true; get; ; ; Argument[this].MapValue.Element; ReturnValue.Element; value; manual |
-| 685 | Summary: org.apache.commons.collections4; MultiValuedMap; true; keySet; ; ; Argument[this].MapKey; ReturnValue.Element; value; manual |
-| 686 | Summary: org.apache.commons.collections4; MultiValuedMap; true; keys; ; ; Argument[this].MapKey; ReturnValue.Element; value; manual |
-| 687 | Summary: org.apache.commons.collections4; MultiValuedMap; true; mapIterator; ; ; Argument[this].MapKey; ReturnValue.Element; value; manual |
-| 688 | Summary: org.apache.commons.collections4; MultiValuedMap; true; mapIterator; ; ; Argument[this].MapValue.Element; ReturnValue.MapValue; value; manual |
-| 689 | Summary: org.apache.commons.collections4; MultiValuedMap; true; put; ; ; Argument[0]; Argument[this].MapKey; value; manual |
-| 690 | Summary: org.apache.commons.collections4; MultiValuedMap; true; put; ; ; Argument[1]; Argument[this].MapValue.Element; value; manual |
-| 691 | Summary: org.apache.commons.collections4; MultiValuedMap; true; putAll; (Map); ; Argument[0].MapKey; Argument[this].MapKey; value; manual |
-| 692 | Summary: org.apache.commons.collections4; MultiValuedMap; true; putAll; (Map); ; Argument[0].MapValue; Argument[this].MapValue.Element; value; manual |
-| 693 | Summary: org.apache.commons.collections4; MultiValuedMap; true; putAll; (MultiValuedMap); ; Argument[0].MapKey; Argument[this].MapKey; value; manual |
-| 694 | Summary: org.apache.commons.collections4; MultiValuedMap; true; putAll; (MultiValuedMap); ; Argument[0].MapValue.Element; Argument[this].MapValue.Element; value; manual |
-| 695 | Summary: org.apache.commons.collections4; MultiValuedMap; true; putAll; (Object,Iterable); ; Argument[0]; Argument[this].MapKey; value; manual |
-| 696 | Summary: org.apache.commons.collections4; MultiValuedMap; true; putAll; (Object,Iterable); ; Argument[1].Element; Argument[this].MapValue.Element; value; manual |
-| 697 | Summary: org.apache.commons.collections4; MultiValuedMap; true; remove; ; ; Argument[this].MapValue.Element; ReturnValue.Element; value; manual |
-| 698 | Summary: org.apache.commons.collections4; MultiValuedMap; true; values; ; ; Argument[this].MapValue.Element; ReturnValue.Element; value; manual |
-| 699 | Summary: org.apache.commons.collections4; OrderedIterator; true; previous; ; ; Argument[this].Element; ReturnValue; value; manual |
-| 700 | Summary: org.apache.commons.collections4; OrderedMap; true; firstKey; ; ; Argument[this].MapKey; ReturnValue; value; manual |
-| 701 | Summary: org.apache.commons.collections4; OrderedMap; true; lastKey; ; ; Argument[this].MapKey; ReturnValue; value; manual |
-| 702 | Summary: org.apache.commons.collections4; OrderedMap; true; nextKey; ; ; Argument[this].MapKey; ReturnValue; value; manual |
-| 703 | Summary: org.apache.commons.collections4; OrderedMap; true; previousKey; ; ; Argument[this].MapKey; ReturnValue; value; manual |
-| 704 | Summary: org.apache.commons.collections4; Put; true; put; ; ; Argument[this].MapValue; ReturnValue; value; manual |
-| 705 | Summary: org.apache.commons.collections4; Put; true; put; ; ; Argument[0]; Argument[this].MapKey; value; manual |
-| 706 | Summary: org.apache.commons.collections4; Put; true; put; ; ; Argument[1]; Argument[this].MapValue; value; manual |
-| 707 | Summary: org.apache.commons.collections4; Put; true; putAll; (Map); ; Argument[0].MapKey; Argument[this].MapKey; value; manual |
-| 708 | Summary: org.apache.commons.collections4; Put; true; putAll; (Map); ; Argument[0].MapValue; Argument[this].MapValue; value; manual |
-| 709 | Summary: org.apache.commons.collections4; QueueUtils; true; predicatedQueue; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
-| 710 | Summary: org.apache.commons.collections4; QueueUtils; true; synchronizedQueue; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
-| 711 | Summary: org.apache.commons.collections4; QueueUtils; true; transformingQueue; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
-| 712 | Summary: org.apache.commons.collections4; QueueUtils; true; unmodifiableQueue; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
-| 713 | Summary: org.apache.commons.collections4; SetUtils; true; difference; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
-| 714 | Summary: org.apache.commons.collections4; SetUtils; true; disjunction; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
-| 715 | Summary: org.apache.commons.collections4; SetUtils; true; disjunction; ; ; Argument[1].Element; ReturnValue.Element; value; manual |
-| 716 | Summary: org.apache.commons.collections4; SetUtils; true; emptyIfNull; ; ; Argument[0]; ReturnValue; value; manual |
-| 717 | Summary: org.apache.commons.collections4; SetUtils; true; hashSet; ; ; Argument[0].ArrayElement; ReturnValue.Element; value; manual |
-| 718 | Summary: org.apache.commons.collections4; SetUtils; true; intersection; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
-| 719 | Summary: org.apache.commons.collections4; SetUtils; true; intersection; ; ; Argument[1].Element; ReturnValue.Element; value; manual |
-| 720 | Summary: org.apache.commons.collections4; SetUtils; true; orderedSet; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
-| 721 | Summary: org.apache.commons.collections4; SetUtils; true; predicatedNavigableSet; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
-| 722 | Summary: org.apache.commons.collections4; SetUtils; true; predicatedSet; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
-| 723 | Summary: org.apache.commons.collections4; SetUtils; true; predicatedSortedSet; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
-| 724 | Summary: org.apache.commons.collections4; SetUtils; true; synchronizedSet; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
-| 725 | Summary: org.apache.commons.collections4; SetUtils; true; synchronizedSortedSet; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
-| 726 | Summary: org.apache.commons.collections4; SetUtils; true; transformedNavigableSet; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
-| 727 | Summary: org.apache.commons.collections4; SetUtils; true; transformedSet; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
-| 728 | Summary: org.apache.commons.collections4; SetUtils; true; transformedSortedSet; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
-| 729 | Summary: org.apache.commons.collections4; SetUtils; true; union; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
-| 730 | Summary: org.apache.commons.collections4; SetUtils; true; union; ; ; Argument[1].Element; ReturnValue.Element; value; manual |
-| 731 | Summary: org.apache.commons.collections4; SetUtils; true; unmodifiableNavigableSet; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
-| 732 | Summary: org.apache.commons.collections4; SetUtils; true; unmodifiableSet; (Object[]); ; Argument[0].ArrayElement; ReturnValue.Element; value; manual |
-| 733 | Summary: org.apache.commons.collections4; SetUtils; true; unmodifiableSet; (Set); ; Argument[0].Element; ReturnValue.Element; value; manual |
-| 734 | Summary: org.apache.commons.collections4; SetUtils; true; unmodifiableSortedSet; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
-| 735 | Summary: org.apache.commons.collections4; SetUtils$SetView; true; copyInto; ; ; Argument[this].Element; Argument[0].Element; value; manual |
-| 736 | Summary: org.apache.commons.collections4; SetUtils$SetView; true; createIterator; ; ; Argument[this].Element; ReturnValue.Element; value; manual |
-| 737 | Summary: org.apache.commons.collections4; SetUtils$SetView; true; toSet; ; ; Argument[this].Element; ReturnValue.Element; value; manual |
-| 738 | Summary: org.apache.commons.collections4; SortedBag; true; first; ; ; Argument[this].Element; ReturnValue; value; manual |
-| 739 | Summary: org.apache.commons.collections4; SortedBag; true; last; ; ; Argument[this].Element; ReturnValue; value; manual |
-| 740 | Summary: org.apache.commons.collections4; SplitMapUtils; true; readableMap; ; ; Argument[0].MapKey; ReturnValue.MapKey; value; manual |
-| 741 | Summary: org.apache.commons.collections4; SplitMapUtils; true; readableMap; ; ; Argument[0].MapValue; ReturnValue.MapValue; value; manual |
-| 742 | Summary: org.apache.commons.collections4; SplitMapUtils; true; writableMap; ; ; Argument[0].MapKey; ReturnValue.MapKey; value; manual |
-| 743 | Summary: org.apache.commons.collections4; SplitMapUtils; true; writableMap; ; ; Argument[0].MapValue; ReturnValue.MapValue; value; manual |
-| 744 | Summary: org.apache.commons.collections4; Trie; true; prefixMap; ; ; Argument[this].MapKey; ReturnValue.MapKey; value; manual |
-| 745 | Summary: org.apache.commons.collections4; Trie; true; prefixMap; ; ; Argument[this].MapValue; ReturnValue.MapValue; value; manual |
-| 746 | Summary: org.apache.commons.collections4; TrieUtils; true; unmodifiableTrie; ; ; Argument[0].MapKey; ReturnValue.MapKey; value; manual |
-| 747 | Summary: org.apache.commons.collections4; TrieUtils; true; unmodifiableTrie; ; ; Argument[0].MapValue; ReturnValue.MapValue; value; manual |
-| 748 | Summary: org.apache.commons.collections4.multimap; ArrayListValuedHashMap; true; ArrayListValuedHashMap; (Map); ; Argument[0].MapKey; Argument[this].MapKey; value; manual |
-| 749 | Summary: org.apache.commons.collections4.multimap; ArrayListValuedHashMap; true; ArrayListValuedHashMap; (Map); ; Argument[0].MapValue; Argument[this].MapValue.Element; value; manual |
-| 750 | Summary: org.apache.commons.collections4.multimap; ArrayListValuedHashMap; true; ArrayListValuedHashMap; (MultiValuedMap); ; Argument[0].MapKey; Argument[this].MapKey; value; manual |
-| 751 | Summary: org.apache.commons.collections4.multimap; ArrayListValuedHashMap; true; ArrayListValuedHashMap; (MultiValuedMap); ; Argument[0].MapValue.Element; Argument[this].MapValue.Element; value; manual |
-| 752 | Summary: org.apache.commons.collections4.multimap; HashSetValuedHashMap; true; HashSetValuedHashMap; (Map); ; Argument[0].MapKey; Argument[this].MapKey; value; manual |
-| 753 | Summary: org.apache.commons.collections4.multimap; HashSetValuedHashMap; true; HashSetValuedHashMap; (Map); ; Argument[0].MapValue; Argument[this].MapValue.Element; value; manual |
-| 754 | Summary: org.apache.commons.collections4.multimap; HashSetValuedHashMap; true; HashSetValuedHashMap; (MultiValuedMap); ; Argument[0].MapKey; Argument[this].MapKey; value; manual |
-| 755 | Summary: org.apache.commons.collections4.multimap; HashSetValuedHashMap; true; HashSetValuedHashMap; (MultiValuedMap); ; Argument[0].MapValue.Element; Argument[this].MapValue.Element; value; manual |
-| 756 | Summary: org.apache.commons.collections4.multimap; TransformedMultiValuedMap; true; transformingMap; ; ; Argument[0].MapKey; ReturnValue.MapKey; value; manual |
-| 757 | Summary: org.apache.commons.collections4.multimap; TransformedMultiValuedMap; true; transformingMap; ; ; Argument[0].MapValue.Element; ReturnValue.MapValue.Element; value; manual |
-| 758 | Summary: org.apache.commons.collections4.multimap; UnmodifiableMultiValuedMap; true; unmodifiableMultiValuedMap; (MultiValuedMap); ; Argument[0].MapKey; ReturnValue.MapKey; value; manual |
-| 759 | Summary: org.apache.commons.collections4.multimap; UnmodifiableMultiValuedMap; true; unmodifiableMultiValuedMap; (MultiValuedMap); ; Argument[0].MapValue.Element; ReturnValue.MapValue.Element; value; manual |
-| 760 | Summary: org.apache.commons.collections4.multiset; HashMultiSet; true; HashMultiSet; ; ; Argument[0].Element; Argument[this].Element; value; manual |
-| 761 | Summary: org.apache.commons.collections4.multiset; PredicatedMultiSet; true; predicatedMultiSet; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
-| 762 | Summary: org.apache.commons.collections4.multiset; SynchronizedMultiSet; true; synchronizedMultiSet; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
-| 763 | Summary: org.apache.commons.collections4.multiset; UnmodifiableMultiSet; true; unmodifiableMultiSet; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
-| 764 | Summary: org.apache.commons.collections4.properties; AbstractPropertiesFactory; true; load; (ClassLoader,String); ; Argument[1]; ReturnValue; taint; manual |
-| 765 | Summary: org.apache.commons.collections4.properties; AbstractPropertiesFactory; true; load; (File); ; Argument[0]; ReturnValue; taint; manual |
-| 766 | Summary: org.apache.commons.collections4.properties; AbstractPropertiesFactory; true; load; (InputStream); ; Argument[0]; ReturnValue; taint; manual |
-| 767 | Summary: org.apache.commons.collections4.properties; AbstractPropertiesFactory; true; load; (Path); ; Argument[0]; ReturnValue; taint; manual |
-| 768 | Summary: org.apache.commons.collections4.properties; AbstractPropertiesFactory; true; load; (Reader); ; Argument[0]; ReturnValue; taint; manual |
-| 769 | Summary: org.apache.commons.collections4.properties; AbstractPropertiesFactory; true; load; (String); ; Argument[0]; ReturnValue; taint; manual |
-| 770 | Summary: org.apache.commons.collections4.properties; AbstractPropertiesFactory; true; load; (URI); ; Argument[0]; ReturnValue; taint; manual |
-| 771 | Summary: org.apache.commons.collections4.properties; AbstractPropertiesFactory; true; load; (URL); ; Argument[0]; ReturnValue; taint; manual |
-| 772 | Summary: org.apache.commons.collections4.queue; CircularFifoQueue; true; CircularFifoQueue; (Collection); ; Argument[0].Element; Argument[this].Element; value; manual |
-| 773 | Summary: org.apache.commons.collections4.queue; CircularFifoQueue; true; get; ; ; Argument[this].Element; ReturnValue; value; manual |
-| 774 | Summary: org.apache.commons.collections4.queue; PredicatedQueue; true; predicatedQueue; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
-| 775 | Summary: org.apache.commons.collections4.queue; SynchronizedQueue; true; synchronizedQueue; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
-| 776 | Summary: org.apache.commons.collections4.queue; TransformedQueue; true; transformingQueue; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
-| 777 | Summary: org.apache.commons.collections4.queue; UnmodifiableQueue; true; unmodifiableQueue; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
-| 778 | Summary: org.apache.commons.collections4.set; AbstractNavigableSetDecorator; true; AbstractNavigableSetDecorator; ; ; Argument[0].Element; Argument[this].Element; value; manual |
-| 779 | Summary: org.apache.commons.collections4.set; AbstractSetDecorator; true; AbstractSetDecorator; ; ; Argument[0].Element; Argument[this].Element; value; manual |
-| 780 | Summary: org.apache.commons.collections4.set; AbstractSortedSetDecorator; true; AbstractSortedSetDecorator; ; ; Argument[0].Element; Argument[this].Element; value; manual |
-| 781 | Summary: org.apache.commons.collections4.set; CompositeSet; true; CompositeSet; (Set); ; Argument[0].Element; Argument[this].Element; value; manual |
-| 782 | Summary: org.apache.commons.collections4.set; CompositeSet; true; CompositeSet; (Set[]); ; Argument[0].ArrayElement.Element; Argument[this].Element; value; manual |
-| 783 | Summary: org.apache.commons.collections4.set; CompositeSet; true; addComposited; (Set); ; Argument[0].Element; Argument[this].Element; value; manual |
-| 784 | Summary: org.apache.commons.collections4.set; CompositeSet; true; addComposited; (Set,Set); ; Argument[0].Element; Argument[this].Element; value; manual |
-| 785 | Summary: org.apache.commons.collections4.set; CompositeSet; true; addComposited; (Set,Set); ; Argument[1].Element; Argument[this].Element; value; manual |
-| 786 | Summary: org.apache.commons.collections4.set; CompositeSet; true; addComposited; (Set[]); ; Argument[0].ArrayElement.Element; Argument[this].Element; value; manual |
-| 787 | Summary: org.apache.commons.collections4.set; CompositeSet; true; getSets; ; ; Argument[this].Element; ReturnValue.Element.Element; value; manual |
-| 788 | Summary: org.apache.commons.collections4.set; CompositeSet; true; toSet; ; ; Argument[this].Element; ReturnValue.Element; value; manual |
-| 789 | Summary: org.apache.commons.collections4.set; CompositeSet$SetMutator; true; add; ; ; Argument[2]; Argument[0].Element; value; manual |
-| 790 | Summary: org.apache.commons.collections4.set; CompositeSet$SetMutator; true; add; ; ; Argument[2]; Argument[1].Element.Element; value; manual |
-| 791 | Summary: org.apache.commons.collections4.set; CompositeSet$SetMutator; true; addAll; ; ; Argument[2].Element; Argument[0].Element; value; manual |
-| 792 | Summary: org.apache.commons.collections4.set; CompositeSet$SetMutator; true; addAll; ; ; Argument[2].Element; Argument[1].Element.Element; value; manual |
-| 793 | Summary: org.apache.commons.collections4.set; ListOrderedSet; true; add; ; ; Argument[1]; Argument[this].Element; value; manual |
-| 794 | Summary: org.apache.commons.collections4.set; ListOrderedSet; true; addAll; ; ; Argument[1].Element; Argument[this].Element; value; manual |
-| 795 | Summary: org.apache.commons.collections4.set; ListOrderedSet; true; asList; ; ; Argument[this].Element; ReturnValue.Element; value; manual |
-| 796 | Summary: org.apache.commons.collections4.set; ListOrderedSet; true; get; ; ; Argument[this].Element; ReturnValue; value; manual |
-| 797 | Summary: org.apache.commons.collections4.set; ListOrderedSet; true; listOrderedSet; (List); ; Argument[0].Element; ReturnValue.Element; value; manual |
-| 798 | Summary: org.apache.commons.collections4.set; ListOrderedSet; true; listOrderedSet; (Set); ; Argument[0].Element; ReturnValue.Element; value; manual |
-| 799 | Summary: org.apache.commons.collections4.set; MapBackedSet; true; mapBackedSet; ; ; Argument[0].MapKey; ReturnValue.Element; value; manual |
-| 800 | Summary: org.apache.commons.collections4.set; PredicatedNavigableSet; true; predicatedNavigableSet; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
-| 801 | Summary: org.apache.commons.collections4.set; PredicatedSet; true; predicatedSet; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
-| 802 | Summary: org.apache.commons.collections4.set; PredicatedSortedSet; true; predicatedSortedSet; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
-| 803 | Summary: org.apache.commons.collections4.set; TransformedNavigableSet; true; transformingNavigableSet; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
-| 804 | Summary: org.apache.commons.collections4.set; TransformedSet; true; transformingSet; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
-| 805 | Summary: org.apache.commons.collections4.set; TransformedSortedSet; true; transformingSortedSet; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
-| 806 | Summary: org.apache.commons.collections4.set; UnmodifiableNavigableSet; true; unmodifiableNavigableSet; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
-| 807 | Summary: org.apache.commons.collections4.set; UnmodifiableSet; true; unmodifiableSet; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
-| 808 | Summary: org.apache.commons.collections4.set; UnmodifiableSortedSet; true; unmodifiableSortedSet; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
-| 809 | Summary: org.apache.commons.collections4.splitmap; AbstractIterableGetMapDecorator; true; AbstractIterableGetMapDecorator; ; ; Argument[0].MapKey; Argument[this].MapKey; value; manual |
-| 810 | Summary: org.apache.commons.collections4.splitmap; AbstractIterableGetMapDecorator; true; AbstractIterableGetMapDecorator; ; ; Argument[0].MapValue; Argument[this].MapValue; value; manual |
-| 811 | Summary: org.apache.commons.collections4.splitmap; TransformedSplitMap; true; transformingMap; ; ; Argument[0].MapKey; ReturnValue.MapKey; value; manual |
-| 812 | Summary: org.apache.commons.collections4.splitmap; TransformedSplitMap; true; transformingMap; ; ; Argument[0].MapValue; ReturnValue.MapValue; value; manual |
-| 813 | Summary: org.apache.commons.collections4.trie; AbstractPatriciaTrie; true; select; ; ; Argument[this].MapKey; ReturnValue.MapKey; value; manual |
-| 814 | Summary: org.apache.commons.collections4.trie; AbstractPatriciaTrie; true; select; ; ; Argument[this].MapValue; ReturnValue.MapValue; value; manual |
-| 815 | Summary: org.apache.commons.collections4.trie; AbstractPatriciaTrie; true; selectKey; ; ; Argument[this].MapKey; ReturnValue; value; manual |
-| 816 | Summary: org.apache.commons.collections4.trie; AbstractPatriciaTrie; true; selectValue; ; ; Argument[this].MapValue; ReturnValue; value; manual |
-| 817 | Summary: org.apache.commons.collections4.trie; PatriciaTrie; true; PatriciaTrie; ; ; Argument[0].MapKey; Argument[this].MapKey; value; manual |
-| 818 | Summary: org.apache.commons.collections4.trie; PatriciaTrie; true; PatriciaTrie; ; ; Argument[0].MapValue; Argument[this].MapValue; value; manual |
-| 819 | Summary: org.apache.commons.collections4.trie; UnmodifiableTrie; true; unmodifiableTrie; ; ; Argument[0].MapKey; ReturnValue.MapKey; value; manual |
-| 820 | Summary: org.apache.commons.collections4.trie; UnmodifiableTrie; true; unmodifiableTrie; ; ; Argument[0].MapValue; ReturnValue.MapValue; value; manual |
-| 821 | Summary: generatedtest; Test; false; newRBWithMapValue; ; ; Argument[0]; ReturnValue.MapValue; value; manual |
-| 822 | Summary: generatedtest; Test; false; newRBWithMapKey; ; ; Argument[0]; ReturnValue.MapKey; value; manual |
+| 374 | Summary: org.apache.commons.collections4.map; SingletonMap; true; SingletonMap; (Map$Entry); ; Argument[0].MapKey; Argument[this].MapKey; value; manual |
+| 375 | Summary: org.apache.commons.collections4.map; SingletonMap; true; SingletonMap; (Map$Entry); ; Argument[0].MapValue; Argument[this].MapValue; value; manual |
+| 376 | Summary: org.apache.commons.collections4.map; SingletonMap; true; SingletonMap; (Map); ; Argument[0].MapKey; Argument[this].MapKey; value; manual |
+| 377 | Summary: org.apache.commons.collections4.map; SingletonMap; true; SingletonMap; (Map); ; Argument[0].MapValue; Argument[this].MapValue; value; manual |
+| 378 | Summary: org.apache.commons.collections4.map; SingletonMap; true; SingletonMap; (Object,Object); ; Argument[0]; Argument[this].MapKey; value; manual |
+| 379 | Summary: org.apache.commons.collections4.map; SingletonMap; true; SingletonMap; (Object,Object); ; Argument[1]; Argument[this].MapValue; value; manual |
+| 380 | Summary: org.apache.commons.collections4.map; SingletonMap; true; setValue; ; ; Argument[0]; Argument[this].MapValue; value; manual |
+| 381 | Summary: org.apache.commons.collections4.map; TransformedMap; true; transformingMap; ; ; Argument[0].MapKey; ReturnValue.MapKey; value; manual |
+| 382 | Summary: org.apache.commons.collections4.map; TransformedMap; true; transformingMap; ; ; Argument[0].MapValue; ReturnValue.MapValue; value; manual |
+| 383 | Summary: org.apache.commons.collections4.map; TransformedSortedMap; true; transformingSortedMap; ; ; Argument[0].MapKey; ReturnValue.MapKey; value; manual |
+| 384 | Summary: org.apache.commons.collections4.map; TransformedSortedMap; true; transformingSortedMap; ; ; Argument[0].MapValue; ReturnValue.MapValue; value; manual |
+| 385 | Summary: org.apache.commons.collections4.map; UnmodifiableEntrySet; true; unmodifiableEntrySet; ; ; Argument[0].Element.MapKey; ReturnValue.Element.MapKey; value; manual |
+| 386 | Summary: org.apache.commons.collections4.map; UnmodifiableEntrySet; true; unmodifiableEntrySet; ; ; Argument[0].Element.MapValue; ReturnValue.Element.MapValue; value; manual |
+| 387 | Summary: org.apache.commons.collections4.map; UnmodifiableMap; true; unmodifiableMap; ; ; Argument[0].MapKey; ReturnValue.MapKey; value; manual |
+| 388 | Summary: org.apache.commons.collections4.map; UnmodifiableMap; true; unmodifiableMap; ; ; Argument[0].MapValue; ReturnValue.MapValue; value; manual |
+| 389 | Summary: org.apache.commons.collections4.map; UnmodifiableOrderedMap; true; unmodifiableOrderedMap; ; ; Argument[0].MapKey; ReturnValue.MapKey; value; manual |
+| 390 | Summary: org.apache.commons.collections4.map; UnmodifiableOrderedMap; true; unmodifiableOrderedMap; ; ; Argument[0].MapValue; ReturnValue.MapValue; value; manual |
+| 391 | Summary: org.apache.commons.collections4.map; UnmodifiableSortedMap; true; unmodifiableSortedMap; ; ; Argument[0].MapKey; ReturnValue.MapKey; value; manual |
+| 392 | Summary: org.apache.commons.collections4.map; UnmodifiableSortedMap; true; unmodifiableSortedMap; ; ; Argument[0].MapValue; ReturnValue.MapValue; value; manual |
+| 393 | Summary: org.apache.commons.collections4.multimap; ArrayListValuedHashMap; true; ArrayListValuedHashMap; (Map); ; Argument[0].MapKey; Argument[this].MapKey; value; manual |
+| 394 | Summary: org.apache.commons.collections4.multimap; ArrayListValuedHashMap; true; ArrayListValuedHashMap; (Map); ; Argument[0].MapValue; Argument[this].MapValue.Element; value; manual |
+| 395 | Summary: org.apache.commons.collections4.multimap; ArrayListValuedHashMap; true; ArrayListValuedHashMap; (MultiValuedMap); ; Argument[0].MapKey; Argument[this].MapKey; value; manual |
+| 396 | Summary: org.apache.commons.collections4.multimap; ArrayListValuedHashMap; true; ArrayListValuedHashMap; (MultiValuedMap); ; Argument[0].MapValue.Element; Argument[this].MapValue.Element; value; manual |
+| 397 | Summary: org.apache.commons.collections4.multimap; HashSetValuedHashMap; true; HashSetValuedHashMap; (Map); ; Argument[0].MapKey; Argument[this].MapKey; value; manual |
+| 398 | Summary: org.apache.commons.collections4.multimap; HashSetValuedHashMap; true; HashSetValuedHashMap; (Map); ; Argument[0].MapValue; Argument[this].MapValue.Element; value; manual |
+| 399 | Summary: org.apache.commons.collections4.multimap; HashSetValuedHashMap; true; HashSetValuedHashMap; (MultiValuedMap); ; Argument[0].MapKey; Argument[this].MapKey; value; manual |
+| 400 | Summary: org.apache.commons.collections4.multimap; HashSetValuedHashMap; true; HashSetValuedHashMap; (MultiValuedMap); ; Argument[0].MapValue.Element; Argument[this].MapValue.Element; value; manual |
+| 401 | Summary: org.apache.commons.collections4.multimap; TransformedMultiValuedMap; true; transformingMap; ; ; Argument[0].MapKey; ReturnValue.MapKey; value; manual |
+| 402 | Summary: org.apache.commons.collections4.multimap; TransformedMultiValuedMap; true; transformingMap; ; ; Argument[0].MapValue.Element; ReturnValue.MapValue.Element; value; manual |
+| 403 | Summary: org.apache.commons.collections4.multimap; UnmodifiableMultiValuedMap; true; unmodifiableMultiValuedMap; (MultiValuedMap); ; Argument[0].MapKey; ReturnValue.MapKey; value; manual |
+| 404 | Summary: org.apache.commons.collections4.multimap; UnmodifiableMultiValuedMap; true; unmodifiableMultiValuedMap; (MultiValuedMap); ; Argument[0].MapValue.Element; ReturnValue.MapValue.Element; value; manual |
+| 405 | Summary: org.apache.commons.collections4.multiset; HashMultiSet; true; HashMultiSet; ; ; Argument[0].Element; Argument[this].Element; value; manual |
+| 406 | Summary: org.apache.commons.collections4.multiset; PredicatedMultiSet; true; predicatedMultiSet; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
+| 407 | Summary: org.apache.commons.collections4.multiset; SynchronizedMultiSet; true; synchronizedMultiSet; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
+| 408 | Summary: org.apache.commons.collections4.multiset; UnmodifiableMultiSet; true; unmodifiableMultiSet; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
+| 409 | Summary: org.apache.commons.collections4.properties; AbstractPropertiesFactory; true; load; (ClassLoader,String); ; Argument[1]; ReturnValue; taint; manual |
+| 410 | Summary: org.apache.commons.collections4.properties; AbstractPropertiesFactory; true; load; (File); ; Argument[0]; ReturnValue; taint; manual |
+| 411 | Summary: org.apache.commons.collections4.properties; AbstractPropertiesFactory; true; load; (InputStream); ; Argument[0]; ReturnValue; taint; manual |
+| 412 | Summary: org.apache.commons.collections4.properties; AbstractPropertiesFactory; true; load; (Path); ; Argument[0]; ReturnValue; taint; manual |
+| 413 | Summary: org.apache.commons.collections4.properties; AbstractPropertiesFactory; true; load; (Reader); ; Argument[0]; ReturnValue; taint; manual |
+| 414 | Summary: org.apache.commons.collections4.properties; AbstractPropertiesFactory; true; load; (String); ; Argument[0]; ReturnValue; taint; manual |
+| 415 | Summary: org.apache.commons.collections4.properties; AbstractPropertiesFactory; true; load; (URI); ; Argument[0]; ReturnValue; taint; manual |
+| 416 | Summary: org.apache.commons.collections4.properties; AbstractPropertiesFactory; true; load; (URL); ; Argument[0]; ReturnValue; taint; manual |
+| 417 | Summary: org.apache.commons.collections4.queue; CircularFifoQueue; true; CircularFifoQueue; (Collection); ; Argument[0].Element; Argument[this].Element; value; manual |
+| 418 | Summary: org.apache.commons.collections4.queue; CircularFifoQueue; true; get; ; ; Argument[this].Element; ReturnValue; value; manual |
+| 419 | Summary: org.apache.commons.collections4.queue; PredicatedQueue; true; predicatedQueue; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
+| 420 | Summary: org.apache.commons.collections4.queue; SynchronizedQueue; true; synchronizedQueue; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
+| 421 | Summary: org.apache.commons.collections4.queue; TransformedQueue; true; transformingQueue; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
+| 422 | Summary: org.apache.commons.collections4.queue; UnmodifiableQueue; true; unmodifiableQueue; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
+| 423 | Summary: org.apache.commons.collections4.set; AbstractNavigableSetDecorator; true; AbstractNavigableSetDecorator; ; ; Argument[0].Element; Argument[this].Element; value; manual |
+| 424 | Summary: org.apache.commons.collections4.set; AbstractSetDecorator; true; AbstractSetDecorator; ; ; Argument[0].Element; Argument[this].Element; value; manual |
+| 425 | Summary: org.apache.commons.collections4.set; AbstractSortedSetDecorator; true; AbstractSortedSetDecorator; ; ; Argument[0].Element; Argument[this].Element; value; manual |
+| 426 | Summary: org.apache.commons.collections4.set; CompositeSet$SetMutator; true; add; ; ; Argument[2]; Argument[0].Element; value; manual |
+| 427 | Summary: org.apache.commons.collections4.set; CompositeSet$SetMutator; true; add; ; ; Argument[2]; Argument[1].Element.Element; value; manual |
+| 428 | Summary: org.apache.commons.collections4.set; CompositeSet$SetMutator; true; addAll; ; ; Argument[2].Element; Argument[0].Element; value; manual |
+| 429 | Summary: org.apache.commons.collections4.set; CompositeSet$SetMutator; true; addAll; ; ; Argument[2].Element; Argument[1].Element.Element; value; manual |
+| 430 | Summary: org.apache.commons.collections4.set; CompositeSet; true; CompositeSet; (Set); ; Argument[0].Element; Argument[this].Element; value; manual |
+| 431 | Summary: org.apache.commons.collections4.set; CompositeSet; true; CompositeSet; (Set[]); ; Argument[0].ArrayElement.Element; Argument[this].Element; value; manual |
+| 432 | Summary: org.apache.commons.collections4.set; CompositeSet; true; addComposited; (Set); ; Argument[0].Element; Argument[this].Element; value; manual |
+| 433 | Summary: org.apache.commons.collections4.set; CompositeSet; true; addComposited; (Set,Set); ; Argument[0].Element; Argument[this].Element; value; manual |
+| 434 | Summary: org.apache.commons.collections4.set; CompositeSet; true; addComposited; (Set,Set); ; Argument[1].Element; Argument[this].Element; value; manual |
+| 435 | Summary: org.apache.commons.collections4.set; CompositeSet; true; addComposited; (Set[]); ; Argument[0].ArrayElement.Element; Argument[this].Element; value; manual |
+| 436 | Summary: org.apache.commons.collections4.set; CompositeSet; true; getSets; ; ; Argument[this].Element; ReturnValue.Element.Element; value; manual |
+| 437 | Summary: org.apache.commons.collections4.set; CompositeSet; true; toSet; ; ; Argument[this].Element; ReturnValue.Element; value; manual |
+| 438 | Summary: org.apache.commons.collections4.set; ListOrderedSet; true; add; ; ; Argument[1]; Argument[this].Element; value; manual |
+| 439 | Summary: org.apache.commons.collections4.set; ListOrderedSet; true; addAll; ; ; Argument[1].Element; Argument[this].Element; value; manual |
+| 440 | Summary: org.apache.commons.collections4.set; ListOrderedSet; true; asList; ; ; Argument[this].Element; ReturnValue.Element; value; manual |
+| 441 | Summary: org.apache.commons.collections4.set; ListOrderedSet; true; get; ; ; Argument[this].Element; ReturnValue; value; manual |
+| 442 | Summary: org.apache.commons.collections4.set; ListOrderedSet; true; listOrderedSet; (List); ; Argument[0].Element; ReturnValue.Element; value; manual |
+| 443 | Summary: org.apache.commons.collections4.set; ListOrderedSet; true; listOrderedSet; (Set); ; Argument[0].Element; ReturnValue.Element; value; manual |
+| 444 | Summary: org.apache.commons.collections4.set; MapBackedSet; true; mapBackedSet; ; ; Argument[0].MapKey; ReturnValue.Element; value; manual |
+| 445 | Summary: org.apache.commons.collections4.set; PredicatedNavigableSet; true; predicatedNavigableSet; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
+| 446 | Summary: org.apache.commons.collections4.set; PredicatedSet; true; predicatedSet; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
+| 447 | Summary: org.apache.commons.collections4.set; PredicatedSortedSet; true; predicatedSortedSet; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
+| 448 | Summary: org.apache.commons.collections4.set; TransformedNavigableSet; true; transformingNavigableSet; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
+| 449 | Summary: org.apache.commons.collections4.set; TransformedSet; true; transformingSet; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
+| 450 | Summary: org.apache.commons.collections4.set; TransformedSortedSet; true; transformingSortedSet; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
+| 451 | Summary: org.apache.commons.collections4.set; UnmodifiableNavigableSet; true; unmodifiableNavigableSet; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
+| 452 | Summary: org.apache.commons.collections4.set; UnmodifiableSet; true; unmodifiableSet; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
+| 453 | Summary: org.apache.commons.collections4.set; UnmodifiableSortedSet; true; unmodifiableSortedSet; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
+| 454 | Summary: org.apache.commons.collections4.splitmap; AbstractIterableGetMapDecorator; true; AbstractIterableGetMapDecorator; ; ; Argument[0].MapKey; Argument[this].MapKey; value; manual |
+| 455 | Summary: org.apache.commons.collections4.splitmap; AbstractIterableGetMapDecorator; true; AbstractIterableGetMapDecorator; ; ; Argument[0].MapValue; Argument[this].MapValue; value; manual |
+| 456 | Summary: org.apache.commons.collections4.splitmap; TransformedSplitMap; true; transformingMap; ; ; Argument[0].MapKey; ReturnValue.MapKey; value; manual |
+| 457 | Summary: org.apache.commons.collections4.splitmap; TransformedSplitMap; true; transformingMap; ; ; Argument[0].MapValue; ReturnValue.MapValue; value; manual |
+| 458 | Summary: org.apache.commons.collections4.trie; AbstractPatriciaTrie; true; select; ; ; Argument[this].MapKey; ReturnValue.MapKey; value; manual |
+| 459 | Summary: org.apache.commons.collections4.trie; AbstractPatriciaTrie; true; select; ; ; Argument[this].MapValue; ReturnValue.MapValue; value; manual |
+| 460 | Summary: org.apache.commons.collections4.trie; AbstractPatriciaTrie; true; selectKey; ; ; Argument[this].MapKey; ReturnValue; value; manual |
+| 461 | Summary: org.apache.commons.collections4.trie; AbstractPatriciaTrie; true; selectValue; ; ; Argument[this].MapValue; ReturnValue; value; manual |
+| 462 | Summary: org.apache.commons.collections4.trie; PatriciaTrie; true; PatriciaTrie; ; ; Argument[0].MapKey; Argument[this].MapKey; value; manual |
+| 463 | Summary: org.apache.commons.collections4.trie; PatriciaTrie; true; PatriciaTrie; ; ; Argument[0].MapValue; Argument[this].MapValue; value; manual |
+| 464 | Summary: org.apache.commons.collections4.trie; UnmodifiableTrie; true; unmodifiableTrie; ; ; Argument[0].MapKey; ReturnValue.MapKey; value; manual |
+| 465 | Summary: org.apache.commons.collections4.trie; UnmodifiableTrie; true; unmodifiableTrie; ; ; Argument[0].MapValue; ReturnValue.MapValue; value; manual |
+| 466 | Summary: org.apache.commons.collections4; ArrayStack; true; peek; ; ; Argument[this].Element; ReturnValue; value; manual |
+| 467 | Summary: org.apache.commons.collections4; ArrayStack; true; pop; ; ; Argument[this].Element; ReturnValue; value; manual |
+| 468 | Summary: org.apache.commons.collections4; ArrayStack; true; push; ; ; Argument[0]; Argument[this].Element; value; manual |
+| 469 | Summary: org.apache.commons.collections4; ArrayStack; true; push; ; ; Argument[0]; ReturnValue; value; manual |
+| 470 | Summary: org.apache.commons.collections4; Bag; true; add; ; ; Argument[0]; Argument[this].Element; value; manual |
+| 471 | Summary: org.apache.commons.collections4; Bag; true; uniqueSet; ; ; Argument[this].Element; ReturnValue.Element; value; manual |
+| 472 | Summary: org.apache.commons.collections4; BagUtils; true; collectionBag; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
+| 473 | Summary: org.apache.commons.collections4; BagUtils; true; predicatedBag; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
+| 474 | Summary: org.apache.commons.collections4; BagUtils; true; predicatedSortedBag; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
+| 475 | Summary: org.apache.commons.collections4; BagUtils; true; synchronizedBag; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
+| 476 | Summary: org.apache.commons.collections4; BagUtils; true; synchronizedSortedBag; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
+| 477 | Summary: org.apache.commons.collections4; BagUtils; true; transformingBag; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
+| 478 | Summary: org.apache.commons.collections4; BagUtils; true; transformingSortedBag; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
+| 479 | Summary: org.apache.commons.collections4; BagUtils; true; unmodifiableBag; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
+| 480 | Summary: org.apache.commons.collections4; BagUtils; true; unmodifiableSortedBag; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
+| 481 | Summary: org.apache.commons.collections4; BidiMap; true; getKey; ; ; Argument[this].MapKey; ReturnValue; value; manual |
+| 482 | Summary: org.apache.commons.collections4; BidiMap; true; inverseBidiMap; ; ; Argument[this].MapKey; ReturnValue.MapValue; value; manual |
+| 483 | Summary: org.apache.commons.collections4; BidiMap; true; inverseBidiMap; ; ; Argument[this].MapValue; ReturnValue.MapKey; value; manual |
+| 484 | Summary: org.apache.commons.collections4; BidiMap; true; removeValue; ; ; Argument[this].MapKey; ReturnValue; value; manual |
+| 485 | Summary: org.apache.commons.collections4; CollectionUtils; true; addAll; (Collection,Enumeration); ; Argument[1].Element; Argument[0].Element; value; manual |
+| 486 | Summary: org.apache.commons.collections4; CollectionUtils; true; addAll; (Collection,Iterable); ; Argument[1].Element; Argument[0].Element; value; manual |
+| 487 | Summary: org.apache.commons.collections4; CollectionUtils; true; addAll; (Collection,Iterator); ; Argument[1].Element; Argument[0].Element; value; manual |
+| 488 | Summary: org.apache.commons.collections4; CollectionUtils; true; addAll; (Collection,Object[]); ; Argument[1].ArrayElement; Argument[0].Element; value; manual |
+| 489 | Summary: org.apache.commons.collections4; CollectionUtils; true; addIgnoreNull; ; ; Argument[1]; Argument[0].Element; value; manual |
+| 490 | Summary: org.apache.commons.collections4; CollectionUtils; true; collate; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
+| 491 | Summary: org.apache.commons.collections4; CollectionUtils; true; collate; ; ; Argument[1].Element; ReturnValue.Element; value; manual |
+| 492 | Summary: org.apache.commons.collections4; CollectionUtils; true; disjunction; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
+| 493 | Summary: org.apache.commons.collections4; CollectionUtils; true; disjunction; ; ; Argument[1].Element; ReturnValue.Element; value; manual |
+| 494 | Summary: org.apache.commons.collections4; CollectionUtils; true; emptyIfNull; ; ; Argument[0]; ReturnValue; value; manual |
+| 495 | Summary: org.apache.commons.collections4; CollectionUtils; true; extractSingleton; ; ; Argument[0].Element; ReturnValue; value; manual |
+| 496 | Summary: org.apache.commons.collections4; CollectionUtils; true; find; ; ; Argument[0].Element; ReturnValue; value; manual |
+| 497 | Summary: org.apache.commons.collections4; CollectionUtils; true; get; (Iterable,int); ; Argument[0].Element; ReturnValue; value; manual |
+| 498 | Summary: org.apache.commons.collections4; CollectionUtils; true; get; (Iterator,int); ; Argument[0].Element; ReturnValue; value; manual |
+| 499 | Summary: org.apache.commons.collections4; CollectionUtils; true; get; (Map,int); ; Argument[0].MapKey; ReturnValue.MapKey; value; manual |
+| 500 | Summary: org.apache.commons.collections4; CollectionUtils; true; get; (Map,int); ; Argument[0].MapValue; ReturnValue.MapValue; value; manual |
+| 501 | Summary: org.apache.commons.collections4; CollectionUtils; true; get; (Object,int); ; Argument[0].ArrayElement; ReturnValue; value; manual |
+| 502 | Summary: org.apache.commons.collections4; CollectionUtils; true; get; (Object,int); ; Argument[0].Element; ReturnValue; value; manual |
+| 503 | Summary: org.apache.commons.collections4; CollectionUtils; true; get; (Object,int); ; Argument[0].MapKey; ReturnValue.MapKey; value; manual |
+| 504 | Summary: org.apache.commons.collections4; CollectionUtils; true; get; (Object,int); ; Argument[0].MapValue; ReturnValue.MapValue; value; manual |
+| 505 | Summary: org.apache.commons.collections4; CollectionUtils; true; getCardinalityMap; ; ; Argument[0].Element; ReturnValue.MapKey; value; manual |
+| 506 | Summary: org.apache.commons.collections4; CollectionUtils; true; intersection; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
+| 507 | Summary: org.apache.commons.collections4; CollectionUtils; true; intersection; ; ; Argument[1].Element; ReturnValue.Element; value; manual |
+| 508 | Summary: org.apache.commons.collections4; CollectionUtils; true; permutations; ; ; Argument[0].Element; ReturnValue.Element.Element; value; manual |
+| 509 | Summary: org.apache.commons.collections4; CollectionUtils; true; predicatedCollection; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
+| 510 | Summary: org.apache.commons.collections4; CollectionUtils; true; removeAll; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
+| 511 | Summary: org.apache.commons.collections4; CollectionUtils; true; retainAll; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
+| 512 | Summary: org.apache.commons.collections4; CollectionUtils; true; select; (Iterable,Predicate); ; Argument[0].Element; ReturnValue.Element; value; manual |
+| 513 | Summary: org.apache.commons.collections4; CollectionUtils; true; select; (Iterable,Predicate,Collection); ; Argument[0].Element; Argument[2].Element; value; manual |
+| 514 | Summary: org.apache.commons.collections4; CollectionUtils; true; select; (Iterable,Predicate,Collection); ; Argument[2]; ReturnValue; value; manual |
+| 515 | Summary: org.apache.commons.collections4; CollectionUtils; true; select; (Iterable,Predicate,Collection,Collection); ; Argument[0].Element; Argument[2].Element; value; manual |
+| 516 | Summary: org.apache.commons.collections4; CollectionUtils; true; select; (Iterable,Predicate,Collection,Collection); ; Argument[0].Element; Argument[3].Element; value; manual |
+| 517 | Summary: org.apache.commons.collections4; CollectionUtils; true; select; (Iterable,Predicate,Collection,Collection); ; Argument[2]; ReturnValue; value; manual |
+| 518 | Summary: org.apache.commons.collections4; CollectionUtils; true; selectRejected; (Iterable,Predicate); ; Argument[0].Element; ReturnValue.Element; value; manual |
+| 519 | Summary: org.apache.commons.collections4; CollectionUtils; true; selectRejected; (Iterable,Predicate,Collection); ; Argument[0].Element; Argument[2].Element; value; manual |
+| 520 | Summary: org.apache.commons.collections4; CollectionUtils; true; selectRejected; (Iterable,Predicate,Collection); ; Argument[2]; ReturnValue; value; manual |
+| 521 | Summary: org.apache.commons.collections4; CollectionUtils; true; subtract; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
+| 522 | Summary: org.apache.commons.collections4; CollectionUtils; true; synchronizedCollection; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
+| 523 | Summary: org.apache.commons.collections4; CollectionUtils; true; transformingCollection; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
+| 524 | Summary: org.apache.commons.collections4; CollectionUtils; true; union; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
+| 525 | Summary: org.apache.commons.collections4; CollectionUtils; true; union; ; ; Argument[1].Element; ReturnValue.Element; value; manual |
+| 526 | Summary: org.apache.commons.collections4; CollectionUtils; true; unmodifiableCollection; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
+| 527 | Summary: org.apache.commons.collections4; EnumerationUtils; true; get; ; ; Argument[0].Element; ReturnValue; value; manual |
+| 528 | Summary: org.apache.commons.collections4; EnumerationUtils; true; toList; (Enumeration); ; Argument[0].Element; ReturnValue.Element; value; manual |
+| 529 | Summary: org.apache.commons.collections4; EnumerationUtils; true; toList; (StringTokenizer); ; Argument[0]; ReturnValue.Element; taint; manual |
+| 530 | Summary: org.apache.commons.collections4; FluentIterable; true; append; (Iterable); ; Argument[0].Element; ReturnValue.Element; value; manual |
+| 531 | Summary: org.apache.commons.collections4; FluentIterable; true; append; (Iterable); ; Argument[this].Element; ReturnValue.Element; value; manual |
+| 532 | Summary: org.apache.commons.collections4; FluentIterable; true; append; (Object[]); ; Argument[0].ArrayElement; ReturnValue.Element; value; manual |
+| 533 | Summary: org.apache.commons.collections4; FluentIterable; true; append; (Object[]); ; Argument[this].Element; ReturnValue.Element; value; manual |
+| 534 | Summary: org.apache.commons.collections4; FluentIterable; true; asEnumeration; ; ; Argument[this].Element; ReturnValue.Element; value; manual |
+| 535 | Summary: org.apache.commons.collections4; FluentIterable; true; collate; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
+| 536 | Summary: org.apache.commons.collections4; FluentIterable; true; collate; ; ; Argument[this].Element; ReturnValue.Element; value; manual |
+| 537 | Summary: org.apache.commons.collections4; FluentIterable; true; copyInto; ; ; Argument[this].Element; Argument[0].Element; value; manual |
+| 538 | Summary: org.apache.commons.collections4; FluentIterable; true; eval; ; ; Argument[this].Element; ReturnValue.Element; value; manual |
+| 539 | Summary: org.apache.commons.collections4; FluentIterable; true; filter; ; ; Argument[this].Element; ReturnValue.Element; value; manual |
+| 540 | Summary: org.apache.commons.collections4; FluentIterable; true; get; ; ; Argument[this].Element; ReturnValue; value; manual |
+| 541 | Summary: org.apache.commons.collections4; FluentIterable; true; limit; ; ; Argument[this].Element; ReturnValue.Element; value; manual |
+| 542 | Summary: org.apache.commons.collections4; FluentIterable; true; loop; ; ; Argument[this].Element; ReturnValue.Element; value; manual |
+| 543 | Summary: org.apache.commons.collections4; FluentIterable; true; of; (Iterable); ; Argument[0].Element; ReturnValue.Element; value; manual |
+| 544 | Summary: org.apache.commons.collections4; FluentIterable; true; of; (Object); ; Argument[0]; ReturnValue.Element; value; manual |
+| 545 | Summary: org.apache.commons.collections4; FluentIterable; true; of; (Object[]); ; Argument[0].ArrayElement; ReturnValue.Element; value; manual |
+| 546 | Summary: org.apache.commons.collections4; FluentIterable; true; reverse; ; ; Argument[this].Element; ReturnValue.Element; value; manual |
+| 547 | Summary: org.apache.commons.collections4; FluentIterable; true; skip; ; ; Argument[this].Element; ReturnValue.Element; value; manual |
+| 548 | Summary: org.apache.commons.collections4; FluentIterable; true; toArray; ; ; Argument[this].Element; ReturnValue.ArrayElement; value; manual |
+| 549 | Summary: org.apache.commons.collections4; FluentIterable; true; toList; ; ; Argument[this].Element; ReturnValue.Element; value; manual |
+| 550 | Summary: org.apache.commons.collections4; FluentIterable; true; unique; ; ; Argument[this].Element; ReturnValue.Element; value; manual |
+| 551 | Summary: org.apache.commons.collections4; FluentIterable; true; unmodifiable; ; ; Argument[this].Element; ReturnValue.Element; value; manual |
+| 552 | Summary: org.apache.commons.collections4; FluentIterable; true; zip; (Iterable); ; Argument[0].Element; ReturnValue.Element; value; manual |
+| 553 | Summary: org.apache.commons.collections4; FluentIterable; true; zip; (Iterable); ; Argument[this].Element; ReturnValue.Element; value; manual |
+| 554 | Summary: org.apache.commons.collections4; FluentIterable; true; zip; (Iterable[]); ; Argument[0].ArrayElement.Element; ReturnValue.Element; value; manual |
+| 555 | Summary: org.apache.commons.collections4; FluentIterable; true; zip; (Iterable[]); ; Argument[this].Element; ReturnValue.Element; value; manual |
+| 556 | Summary: org.apache.commons.collections4; Get; true; entrySet; ; ; Argument[this].MapKey; ReturnValue.Element.MapKey; value; manual |
+| 557 | Summary: org.apache.commons.collections4; Get; true; entrySet; ; ; Argument[this].MapValue; ReturnValue.Element.MapValue; value; manual |
+| 558 | Summary: org.apache.commons.collections4; Get; true; get; ; ; Argument[this].MapValue; ReturnValue; value; manual |
+| 559 | Summary: org.apache.commons.collections4; Get; true; keySet; (); ; Argument[this].MapKey; ReturnValue.Element; value; manual |
+| 560 | Summary: org.apache.commons.collections4; Get; true; remove; (Object); ; Argument[this].MapValue; ReturnValue; value; manual |
+| 561 | Summary: org.apache.commons.collections4; Get; true; values; (); ; Argument[this].MapValue; ReturnValue.Element; value; manual |
+| 562 | Summary: org.apache.commons.collections4; IterableGet; true; mapIterator; ; ; Argument[this].MapKey; ReturnValue.Element; value; manual |
+| 563 | Summary: org.apache.commons.collections4; IterableGet; true; mapIterator; ; ; Argument[this].MapValue; ReturnValue.MapValue; value; manual |
+| 564 | Summary: org.apache.commons.collections4; IterableUtils; true; boundedIterable; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
+| 565 | Summary: org.apache.commons.collections4; IterableUtils; true; chainedIterable; (Iterable,Iterable); ; Argument[0].Element; ReturnValue.Element; value; manual |
+| 566 | Summary: org.apache.commons.collections4; IterableUtils; true; chainedIterable; (Iterable,Iterable); ; Argument[1].Element; ReturnValue.Element; value; manual |
+| 567 | Summary: org.apache.commons.collections4; IterableUtils; true; chainedIterable; (Iterable,Iterable,Iterable); ; Argument[0].Element; ReturnValue.Element; value; manual |
+| 568 | Summary: org.apache.commons.collections4; IterableUtils; true; chainedIterable; (Iterable,Iterable,Iterable); ; Argument[1].Element; ReturnValue.Element; value; manual |
+| 569 | Summary: org.apache.commons.collections4; IterableUtils; true; chainedIterable; (Iterable,Iterable,Iterable); ; Argument[2].Element; ReturnValue.Element; value; manual |
+| 570 | Summary: org.apache.commons.collections4; IterableUtils; true; chainedIterable; (Iterable,Iterable,Iterable,Iterable); ; Argument[0].Element; ReturnValue.Element; value; manual |
+| 571 | Summary: org.apache.commons.collections4; IterableUtils; true; chainedIterable; (Iterable,Iterable,Iterable,Iterable); ; Argument[1].Element; ReturnValue.Element; value; manual |
+| 572 | Summary: org.apache.commons.collections4; IterableUtils; true; chainedIterable; (Iterable,Iterable,Iterable,Iterable); ; Argument[2].Element; ReturnValue.Element; value; manual |
+| 573 | Summary: org.apache.commons.collections4; IterableUtils; true; chainedIterable; (Iterable,Iterable,Iterable,Iterable); ; Argument[3].Element; ReturnValue.Element; value; manual |
+| 574 | Summary: org.apache.commons.collections4; IterableUtils; true; collatedIterable; (Comparator,Iterable,Iterable); ; Argument[1].Element; ReturnValue.Element; value; manual |
+| 575 | Summary: org.apache.commons.collections4; IterableUtils; true; collatedIterable; (Comparator,Iterable,Iterable); ; Argument[2].Element; ReturnValue.Element; value; manual |
+| 576 | Summary: org.apache.commons.collections4; IterableUtils; true; collatedIterable; (Iterable,Iterable); ; Argument[0].Element; ReturnValue.Element; value; manual |
+| 577 | Summary: org.apache.commons.collections4; IterableUtils; true; collatedIterable; (Iterable,Iterable); ; Argument[1].Element; ReturnValue.Element; value; manual |
+| 578 | Summary: org.apache.commons.collections4; IterableUtils; true; emptyIfNull; ; ; Argument[0]; ReturnValue; value; manual |
+| 579 | Summary: org.apache.commons.collections4; IterableUtils; true; filteredIterable; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
+| 580 | Summary: org.apache.commons.collections4; IterableUtils; true; find; ; ; Argument[0].Element; ReturnValue; value; manual |
+| 581 | Summary: org.apache.commons.collections4; IterableUtils; true; first; ; ; Argument[0].Element; ReturnValue; value; manual |
+| 582 | Summary: org.apache.commons.collections4; IterableUtils; true; forEachButLast; ; ; Argument[0].Element; ReturnValue; value; manual |
+| 583 | Summary: org.apache.commons.collections4; IterableUtils; true; get; ; ; Argument[0].Element; ReturnValue; value; manual |
+| 584 | Summary: org.apache.commons.collections4; IterableUtils; true; loopingIterable; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
+| 585 | Summary: org.apache.commons.collections4; IterableUtils; true; partition; ; ; Argument[0].Element; ReturnValue.Element.Element; value; manual |
+| 586 | Summary: org.apache.commons.collections4; IterableUtils; true; reversedIterable; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
+| 587 | Summary: org.apache.commons.collections4; IterableUtils; true; skippingIterable; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
+| 588 | Summary: org.apache.commons.collections4; IterableUtils; true; toList; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
+| 589 | Summary: org.apache.commons.collections4; IterableUtils; true; toString; ; ; Argument[2]; ReturnValue; taint; manual |
+| 590 | Summary: org.apache.commons.collections4; IterableUtils; true; toString; ; ; Argument[3]; ReturnValue; taint; manual |
+| 591 | Summary: org.apache.commons.collections4; IterableUtils; true; toString; ; ; Argument[4]; ReturnValue; taint; manual |
+| 592 | Summary: org.apache.commons.collections4; IterableUtils; true; uniqueIterable; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
+| 593 | Summary: org.apache.commons.collections4; IterableUtils; true; unmodifiableIterable; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
+| 594 | Summary: org.apache.commons.collections4; IterableUtils; true; zippingIterable; (Iterable,Iterable); ; Argument[1].Element; ReturnValue.Element; value; manual |
+| 595 | Summary: org.apache.commons.collections4; IterableUtils; true; zippingIterable; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
+| 596 | Summary: org.apache.commons.collections4; IteratorUtils; true; arrayIterator; ; ; Argument[0].ArrayElement; ReturnValue.Element; value; manual |
+| 597 | Summary: org.apache.commons.collections4; IteratorUtils; true; arrayListIterator; ; ; Argument[0].ArrayElement; ReturnValue.Element; value; manual |
+| 598 | Summary: org.apache.commons.collections4; IteratorUtils; true; asEnumeration; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
+| 599 | Summary: org.apache.commons.collections4; IteratorUtils; true; asIterable; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
+| 600 | Summary: org.apache.commons.collections4; IteratorUtils; true; asIterator; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
+| 601 | Summary: org.apache.commons.collections4; IteratorUtils; true; asMultipleUseIterable; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
+| 602 | Summary: org.apache.commons.collections4; IteratorUtils; true; boundedIterator; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
+| 603 | Summary: org.apache.commons.collections4; IteratorUtils; true; chainedIterator; (Collection); ; Argument[0].Element.Element; ReturnValue.Element; value; manual |
+| 604 | Summary: org.apache.commons.collections4; IteratorUtils; true; chainedIterator; (Iterator,Iterator); ; Argument[0].Element; ReturnValue.Element; value; manual |
+| 605 | Summary: org.apache.commons.collections4; IteratorUtils; true; chainedIterator; (Iterator,Iterator); ; Argument[1].Element; ReturnValue.Element; value; manual |
+| 606 | Summary: org.apache.commons.collections4; IteratorUtils; true; collatedIterator; (Comparator,Collection); ; Argument[1].Element.Element; ReturnValue.Element; value; manual |
+| 607 | Summary: org.apache.commons.collections4; IteratorUtils; true; collatedIterator; (Comparator,Iterator,Iterator); ; Argument[1].Element; ReturnValue.Element; value; manual |
+| 608 | Summary: org.apache.commons.collections4; IteratorUtils; true; collatedIterator; (Comparator,Iterator,Iterator); ; Argument[2].Element; ReturnValue.Element; value; manual |
+| 609 | Summary: org.apache.commons.collections4; IteratorUtils; true; collatedIterator; (Comparator,Iterator[]); ; Argument[1].ArrayElement.Element; ReturnValue.Element; value; manual |
+| 610 | Summary: org.apache.commons.collections4; IteratorUtils; true; filteredIterator; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
+| 611 | Summary: org.apache.commons.collections4; IteratorUtils; true; filteredListIterator; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
+| 612 | Summary: org.apache.commons.collections4; IteratorUtils; true; find; ; ; Argument[0].Element; ReturnValue; value; manual |
+| 613 | Summary: org.apache.commons.collections4; IteratorUtils; true; first; ; ; Argument[0].Element; ReturnValue; value; manual |
+| 614 | Summary: org.apache.commons.collections4; IteratorUtils; true; forEachButLast; ; ; Argument[0].Element; ReturnValue; value; manual |
+| 615 | Summary: org.apache.commons.collections4; IteratorUtils; true; get; ; ; Argument[0].Element; ReturnValue; value; manual |
+| 616 | Summary: org.apache.commons.collections4; IteratorUtils; true; getIterator; ; ; Argument[0].ArrayElement; ReturnValue.Element; value; manual |
+| 617 | Summary: org.apache.commons.collections4; IteratorUtils; true; getIterator; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
+| 618 | Summary: org.apache.commons.collections4; IteratorUtils; true; getIterator; ; ; Argument[0].MapValue; ReturnValue.Element; value; manual |
+| 619 | Summary: org.apache.commons.collections4; IteratorUtils; true; getIterator; ; ; Argument[0]; ReturnValue.Element; value; manual |
+| 620 | Summary: org.apache.commons.collections4; IteratorUtils; true; loopingIterator; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
+| 621 | Summary: org.apache.commons.collections4; IteratorUtils; true; loopingListIterator; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
+| 622 | Summary: org.apache.commons.collections4; IteratorUtils; true; peekingIterator; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
+| 623 | Summary: org.apache.commons.collections4; IteratorUtils; true; pushbackIterator; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
+| 624 | Summary: org.apache.commons.collections4; IteratorUtils; true; singletonIterator; ; ; Argument[0]; ReturnValue.Element; value; manual |
+| 625 | Summary: org.apache.commons.collections4; IteratorUtils; true; singletonListIterator; ; ; Argument[0]; ReturnValue.Element; value; manual |
+| 626 | Summary: org.apache.commons.collections4; IteratorUtils; true; skippingIterator; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
+| 627 | Summary: org.apache.commons.collections4; IteratorUtils; true; toArray; ; ; Argument[0].Element; ReturnValue.ArrayElement; value; manual |
+| 628 | Summary: org.apache.commons.collections4; IteratorUtils; true; toList; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
+| 629 | Summary: org.apache.commons.collections4; IteratorUtils; true; toListIterator; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
+| 630 | Summary: org.apache.commons.collections4; IteratorUtils; true; toString; ; ; Argument[2]; ReturnValue; taint; manual |
+| 631 | Summary: org.apache.commons.collections4; IteratorUtils; true; toString; ; ; Argument[3]; ReturnValue; taint; manual |
+| 632 | Summary: org.apache.commons.collections4; IteratorUtils; true; toString; ; ; Argument[4]; ReturnValue; taint; manual |
+| 633 | Summary: org.apache.commons.collections4; IteratorUtils; true; unmodifiableIterator; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
+| 634 | Summary: org.apache.commons.collections4; IteratorUtils; true; unmodifiableListIterator; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
+| 635 | Summary: org.apache.commons.collections4; IteratorUtils; true; unmodifiableMapIterator; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
+| 636 | Summary: org.apache.commons.collections4; IteratorUtils; true; unmodifiableMapIterator; ; ; Argument[0].MapValue; ReturnValue.MapValue; value; manual |
+| 637 | Summary: org.apache.commons.collections4; IteratorUtils; true; zippingIterator; (Iterator,Iterator); ; Argument[0].Element; ReturnValue.Element; value; manual |
+| 638 | Summary: org.apache.commons.collections4; IteratorUtils; true; zippingIterator; (Iterator,Iterator); ; Argument[1].Element; ReturnValue.Element; value; manual |
+| 639 | Summary: org.apache.commons.collections4; IteratorUtils; true; zippingIterator; (Iterator,Iterator,Iterator); ; Argument[0].Element; ReturnValue.Element; value; manual |
+| 640 | Summary: org.apache.commons.collections4; IteratorUtils; true; zippingIterator; (Iterator,Iterator,Iterator); ; Argument[1].Element; ReturnValue.Element; value; manual |
+| 641 | Summary: org.apache.commons.collections4; IteratorUtils; true; zippingIterator; (Iterator,Iterator,Iterator); ; Argument[2].Element; ReturnValue.Element; value; manual |
+| 642 | Summary: org.apache.commons.collections4; IteratorUtils; true; zippingIterator; (Iterator[]); ; Argument[0].ArrayElement.Element; ReturnValue.Element; value; manual |
+| 643 | Summary: org.apache.commons.collections4; KeyValue; true; getKey; ; ; Argument[this].MapKey; ReturnValue; value; manual |
+| 644 | Summary: org.apache.commons.collections4; KeyValue; true; getValue; ; ; Argument[this].MapValue; ReturnValue; value; manual |
+| 645 | Summary: org.apache.commons.collections4; ListUtils; true; defaultIfNull; ; ; Argument[0]; ReturnValue; value; manual |
+| 646 | Summary: org.apache.commons.collections4; ListUtils; true; defaultIfNull; ; ; Argument[1]; ReturnValue; value; manual |
+| 647 | Summary: org.apache.commons.collections4; ListUtils; true; emptyIfNull; ; ; Argument[0]; ReturnValue; value; manual |
+| 648 | Summary: org.apache.commons.collections4; ListUtils; true; fixedSizeList; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
+| 649 | Summary: org.apache.commons.collections4; ListUtils; true; intersection; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
+| 650 | Summary: org.apache.commons.collections4; ListUtils; true; intersection; ; ; Argument[1].Element; ReturnValue.Element; value; manual |
+| 651 | Summary: org.apache.commons.collections4; ListUtils; true; lazyList; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
+| 652 | Summary: org.apache.commons.collections4; ListUtils; true; longestCommonSubsequence; (CharSequence,CharSequence); ; Argument[0]; ReturnValue; taint; manual |
+| 653 | Summary: org.apache.commons.collections4; ListUtils; true; longestCommonSubsequence; (CharSequence,CharSequence); ; Argument[1]; ReturnValue; taint; manual |
+| 654 | Summary: org.apache.commons.collections4; ListUtils; true; longestCommonSubsequence; (List,List); ; Argument[0].Element; ReturnValue.Element; value; manual |
+| 655 | Summary: org.apache.commons.collections4; ListUtils; true; longestCommonSubsequence; (List,List); ; Argument[1].Element; ReturnValue.Element; value; manual |
+| 656 | Summary: org.apache.commons.collections4; ListUtils; true; longestCommonSubsequence; (List,List,Equator); ; Argument[0].Element; ReturnValue.Element; value; manual |
+| 657 | Summary: org.apache.commons.collections4; ListUtils; true; longestCommonSubsequence; (List,List,Equator); ; Argument[1].Element; ReturnValue.Element; value; manual |
+| 658 | Summary: org.apache.commons.collections4; ListUtils; true; partition; ; ; Argument[0].Element; ReturnValue.Element.Element; value; manual |
+| 659 | Summary: org.apache.commons.collections4; ListUtils; true; predicatedList; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
+| 660 | Summary: org.apache.commons.collections4; ListUtils; true; removeAll; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
+| 661 | Summary: org.apache.commons.collections4; ListUtils; true; retainAll; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
+| 662 | Summary: org.apache.commons.collections4; ListUtils; true; select; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
+| 663 | Summary: org.apache.commons.collections4; ListUtils; true; selectRejected; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
+| 664 | Summary: org.apache.commons.collections4; ListUtils; true; subtract; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
+| 665 | Summary: org.apache.commons.collections4; ListUtils; true; sum; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
+| 666 | Summary: org.apache.commons.collections4; ListUtils; true; sum; ; ; Argument[1].Element; ReturnValue.Element; value; manual |
+| 667 | Summary: org.apache.commons.collections4; ListUtils; true; synchronizedList; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
+| 668 | Summary: org.apache.commons.collections4; ListUtils; true; transformedList; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
+| 669 | Summary: org.apache.commons.collections4; ListUtils; true; union; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
+| 670 | Summary: org.apache.commons.collections4; ListUtils; true; union; ; ; Argument[1].Element; ReturnValue.Element; value; manual |
+| 671 | Summary: org.apache.commons.collections4; ListUtils; true; unmodifiableList; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
+| 672 | Summary: org.apache.commons.collections4; MapIterator; true; getKey; ; ; Argument[this].Element; ReturnValue; value; manual |
+| 673 | Summary: org.apache.commons.collections4; MapIterator; true; getValue; ; ; Argument[this].MapValue; ReturnValue; value; manual |
+| 674 | Summary: org.apache.commons.collections4; MapIterator; true; setValue; ; ; Argument[0]; Argument[this].MapValue; value; manual |
+| 675 | Summary: org.apache.commons.collections4; MapIterator; true; setValue; ; ; Argument[this].MapValue; ReturnValue; value; manual |
+| 676 | Summary: org.apache.commons.collections4; MapUtils; true; emptyIfNull; ; ; Argument[0]; ReturnValue; value; manual |
+| 677 | Summary: org.apache.commons.collections4; MapUtils; true; fixedSizeMap; ; ; Argument[0].MapKey; ReturnValue.MapKey; value; manual |
+| 678 | Summary: org.apache.commons.collections4; MapUtils; true; fixedSizeMap; ; ; Argument[0].MapValue; ReturnValue.MapValue; value; manual |
+| 679 | Summary: org.apache.commons.collections4; MapUtils; true; fixedSizeSortedMap; ; ; Argument[0].MapKey; ReturnValue.MapKey; value; manual |
+| 680 | Summary: org.apache.commons.collections4; MapUtils; true; fixedSizeSortedMap; ; ; Argument[0].MapValue; ReturnValue.MapValue; value; manual |
+| 681 | Summary: org.apache.commons.collections4; MapUtils; true; getMap; ; ; Argument[0].MapValue; ReturnValue; value; manual |
+| 682 | Summary: org.apache.commons.collections4; MapUtils; true; getMap; ; ; Argument[2]; ReturnValue; value; manual |
+| 683 | Summary: org.apache.commons.collections4; MapUtils; true; getObject; ; ; Argument[0].MapValue; ReturnValue; value; manual |
+| 684 | Summary: org.apache.commons.collections4; MapUtils; true; getObject; ; ; Argument[2]; ReturnValue; value; manual |
+| 685 | Summary: org.apache.commons.collections4; MapUtils; true; getString; ; ; Argument[0].MapValue; ReturnValue; value; manual |
+| 686 | Summary: org.apache.commons.collections4; MapUtils; true; getString; ; ; Argument[2]; ReturnValue; value; manual |
+| 687 | Summary: org.apache.commons.collections4; MapUtils; true; invertMap; ; ; Argument[0].MapKey; ReturnValue.MapValue; value; manual |
+| 688 | Summary: org.apache.commons.collections4; MapUtils; true; invertMap; ; ; Argument[0].MapValue; ReturnValue.MapKey; value; manual |
+| 689 | Summary: org.apache.commons.collections4; MapUtils; true; iterableMap; ; ; Argument[0].MapKey; ReturnValue.MapKey; value; manual |
+| 690 | Summary: org.apache.commons.collections4; MapUtils; true; iterableMap; ; ; Argument[0].MapValue; ReturnValue.MapValue; value; manual |
+| 691 | Summary: org.apache.commons.collections4; MapUtils; true; iterableSortedMap; ; ; Argument[0].MapKey; ReturnValue.MapKey; value; manual |
+| 692 | Summary: org.apache.commons.collections4; MapUtils; true; iterableSortedMap; ; ; Argument[0].MapValue; ReturnValue.MapValue; value; manual |
+| 693 | Summary: org.apache.commons.collections4; MapUtils; true; lazyMap; ; ; Argument[0].MapKey; ReturnValue.MapKey; value; manual |
+| 694 | Summary: org.apache.commons.collections4; MapUtils; true; lazyMap; ; ; Argument[0].MapValue; ReturnValue.MapValue; value; manual |
+| 695 | Summary: org.apache.commons.collections4; MapUtils; true; lazySortedMap; ; ; Argument[0].MapKey; ReturnValue.MapKey; value; manual |
+| 696 | Summary: org.apache.commons.collections4; MapUtils; true; lazySortedMap; ; ; Argument[0].MapValue; ReturnValue.MapValue; value; manual |
+| 697 | Summary: org.apache.commons.collections4; MapUtils; true; multiValueMap; ; ; Argument[0].MapKey; ReturnValue.MapKey; value; manual |
+| 698 | Summary: org.apache.commons.collections4; MapUtils; true; multiValueMap; ; ; Argument[0].MapValue; ReturnValue.MapValue; value; manual |
+| 699 | Summary: org.apache.commons.collections4; MapUtils; true; orderedMap; ; ; Argument[0].MapKey; ReturnValue.MapKey; value; manual |
+| 700 | Summary: org.apache.commons.collections4; MapUtils; true; orderedMap; ; ; Argument[0].MapValue; ReturnValue.MapValue; value; manual |
+| 701 | Summary: org.apache.commons.collections4; MapUtils; true; populateMap; (Map,Iterable,Transformer); ; Argument[1].Element; Argument[0].MapValue; value; manual |
+| 702 | Summary: org.apache.commons.collections4; MapUtils; true; populateMap; (MultiMap,Iterable,Transformer); ; Argument[1].Element; Argument[0].MapValue.Element; value; manual |
+| 703 | Summary: org.apache.commons.collections4; MapUtils; true; predicatedMap; ; ; Argument[0].MapKey; ReturnValue.MapKey; value; manual |
+| 704 | Summary: org.apache.commons.collections4; MapUtils; true; predicatedMap; ; ; Argument[0].MapValue; ReturnValue.MapValue; value; manual |
+| 705 | Summary: org.apache.commons.collections4; MapUtils; true; predicatedSortedMap; ; ; Argument[0].MapKey; ReturnValue.MapKey; value; manual |
+| 706 | Summary: org.apache.commons.collections4; MapUtils; true; predicatedSortedMap; ; ; Argument[0].MapValue; ReturnValue.MapValue; value; manual |
+| 707 | Summary: org.apache.commons.collections4; MapUtils; true; putAll; ; ; Argument[1].ArrayElement.ArrayElement; Argument[0].MapKey; value; manual |
+| 708 | Summary: org.apache.commons.collections4; MapUtils; true; putAll; ; ; Argument[1].ArrayElement.ArrayElement; Argument[0].MapValue; value; manual |
+| 709 | Summary: org.apache.commons.collections4; MapUtils; true; putAll; ; ; Argument[1].ArrayElement.ArrayElement; ReturnValue.MapKey; value; manual |
+| 710 | Summary: org.apache.commons.collections4; MapUtils; true; putAll; ; ; Argument[1].ArrayElement.ArrayElement; ReturnValue.MapValue; value; manual |
+| 711 | Summary: org.apache.commons.collections4; MapUtils; true; putAll; ; ; Argument[1].ArrayElement.MapKey; Argument[0].MapKey; value; manual |
+| 712 | Summary: org.apache.commons.collections4; MapUtils; true; putAll; ; ; Argument[1].ArrayElement.MapKey; ReturnValue.MapKey; value; manual |
+| 713 | Summary: org.apache.commons.collections4; MapUtils; true; putAll; ; ; Argument[1].ArrayElement.MapValue; Argument[0].MapValue; value; manual |
+| 714 | Summary: org.apache.commons.collections4; MapUtils; true; putAll; ; ; Argument[1].ArrayElement.MapValue; ReturnValue.MapValue; value; manual |
+| 715 | Summary: org.apache.commons.collections4; MapUtils; true; putAll; ; ; Argument[1].ArrayElement; Argument[0].MapKey; value; manual |
+| 716 | Summary: org.apache.commons.collections4; MapUtils; true; putAll; ; ; Argument[1].ArrayElement; Argument[0].MapValue; value; manual |
+| 717 | Summary: org.apache.commons.collections4; MapUtils; true; putAll; ; ; Argument[1].ArrayElement; ReturnValue.MapKey; value; manual |
+| 718 | Summary: org.apache.commons.collections4; MapUtils; true; putAll; ; ; Argument[1].ArrayElement; ReturnValue.MapValue; value; manual |
+| 719 | Summary: org.apache.commons.collections4; MapUtils; true; safeAddToMap; ; ; Argument[1]; Argument[0].MapKey; value; manual |
+| 720 | Summary: org.apache.commons.collections4; MapUtils; true; safeAddToMap; ; ; Argument[2]; Argument[0].MapValue; value; manual |
+| 721 | Summary: org.apache.commons.collections4; MapUtils; true; synchronizedMap; ; ; Argument[0].MapKey; ReturnValue.MapKey; value; manual |
+| 722 | Summary: org.apache.commons.collections4; MapUtils; true; synchronizedMap; ; ; Argument[0].MapValue; ReturnValue.MapValue; value; manual |
+| 723 | Summary: org.apache.commons.collections4; MapUtils; true; synchronizedSortedMap; ; ; Argument[0].MapKey; ReturnValue.MapKey; value; manual |
+| 724 | Summary: org.apache.commons.collections4; MapUtils; true; synchronizedSortedMap; ; ; Argument[0].MapValue; ReturnValue.MapValue; value; manual |
+| 725 | Summary: org.apache.commons.collections4; MapUtils; true; toMap; ; ; Argument[0].MapKey; ReturnValue.MapKey; value; manual |
+| 726 | Summary: org.apache.commons.collections4; MapUtils; true; toMap; ; ; Argument[0].MapValue; ReturnValue.MapValue; value; manual |
+| 727 | Summary: org.apache.commons.collections4; MapUtils; true; transformedMap; ; ; Argument[0].MapKey; ReturnValue.MapKey; value; manual |
+| 728 | Summary: org.apache.commons.collections4; MapUtils; true; transformedMap; ; ; Argument[0].MapValue; ReturnValue.MapValue; value; manual |
+| 729 | Summary: org.apache.commons.collections4; MapUtils; true; transformedSortedMap; ; ; Argument[0].MapKey; ReturnValue.MapKey; value; manual |
+| 730 | Summary: org.apache.commons.collections4; MapUtils; true; transformedSortedMap; ; ; Argument[0].MapValue; ReturnValue.MapValue; value; manual |
+| 731 | Summary: org.apache.commons.collections4; MapUtils; true; unmodifiableMap; ; ; Argument[0].MapKey; ReturnValue.MapKey; value; manual |
+| 732 | Summary: org.apache.commons.collections4; MapUtils; true; unmodifiableMap; ; ; Argument[0].MapValue; ReturnValue.MapValue; value; manual |
+| 733 | Summary: org.apache.commons.collections4; MapUtils; true; unmodifiableSortedMap; ; ; Argument[0].MapKey; ReturnValue.MapKey; value; manual |
+| 734 | Summary: org.apache.commons.collections4; MapUtils; true; unmodifiableSortedMap; ; ; Argument[0].MapValue; ReturnValue.MapValue; value; manual |
+| 735 | Summary: org.apache.commons.collections4; MultiMap; true; get; ; ; Argument[this].MapValue.Element; ReturnValue.Element; value; manual |
+| 736 | Summary: org.apache.commons.collections4; MultiMap; true; put; ; ; Argument[0]; Argument[this].MapKey; value; manual |
+| 737 | Summary: org.apache.commons.collections4; MultiMap; true; put; ; ; Argument[1]; Argument[this].MapValue.Element; value; manual |
+| 738 | Summary: org.apache.commons.collections4; MultiMap; true; values; ; ; Argument[this].MapValue.Element; ReturnValue.Element; value; manual |
+| 739 | Summary: org.apache.commons.collections4; MultiMapUtils; true; emptyIfNull; ; ; Argument[0]; ReturnValue; value; manual |
+| 740 | Summary: org.apache.commons.collections4; MultiMapUtils; true; getCollection; ; ; Argument[0].MapValue; ReturnValue; value; manual |
+| 741 | Summary: org.apache.commons.collections4; MultiMapUtils; true; getValuesAsBag; ; ; Argument[0].MapValue.Element; ReturnValue.Element; value; manual |
+| 742 | Summary: org.apache.commons.collections4; MultiMapUtils; true; getValuesAsList; ; ; Argument[0].MapValue.Element; ReturnValue.Element; value; manual |
+| 743 | Summary: org.apache.commons.collections4; MultiMapUtils; true; getValuesAsSet; ; ; Argument[0].MapValue.Element; ReturnValue.Element; value; manual |
+| 744 | Summary: org.apache.commons.collections4; MultiMapUtils; true; transformedMultiValuedMap; ; ; Argument[0].MapKey; ReturnValue.MapKey; value; manual |
+| 745 | Summary: org.apache.commons.collections4; MultiMapUtils; true; transformedMultiValuedMap; ; ; Argument[0].MapValue.Element; ReturnValue.MapValue.Element; value; manual |
+| 746 | Summary: org.apache.commons.collections4; MultiMapUtils; true; unmodifiableMultiValuedMap; ; ; Argument[0].MapKey; ReturnValue.MapKey; value; manual |
+| 747 | Summary: org.apache.commons.collections4; MultiMapUtils; true; unmodifiableMultiValuedMap; ; ; Argument[0].MapValue.Element; ReturnValue.MapValue.Element; value; manual |
+| 748 | Summary: org.apache.commons.collections4; MultiSet$Entry; true; getElement; ; ; Argument[this].Element; ReturnValue; value; manual |
+| 749 | Summary: org.apache.commons.collections4; MultiSet; true; add; ; ; Argument[0]; Argument[this].Element; value; manual |
+| 750 | Summary: org.apache.commons.collections4; MultiSet; true; entrySet; ; ; Argument[this].Element; ReturnValue.Element.Element; value; manual |
+| 751 | Summary: org.apache.commons.collections4; MultiSet; true; uniqueSet; ; ; Argument[this].Element; ReturnValue.Element; value; manual |
+| 752 | Summary: org.apache.commons.collections4; MultiSetUtils; true; predicatedMultiSet; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
+| 753 | Summary: org.apache.commons.collections4; MultiSetUtils; true; synchronizedMultiSet; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
+| 754 | Summary: org.apache.commons.collections4; MultiSetUtils; true; unmodifiableMultiSet; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
+| 755 | Summary: org.apache.commons.collections4; MultiValuedMap; true; asMap; ; ; Argument[this].MapKey; ReturnValue.MapKey; value; manual |
+| 756 | Summary: org.apache.commons.collections4; MultiValuedMap; true; asMap; ; ; Argument[this].MapValue.Element; ReturnValue.MapValue.Element; value; manual |
+| 757 | Summary: org.apache.commons.collections4; MultiValuedMap; true; entries; ; ; Argument[this].MapKey; ReturnValue.Element.MapKey; value; manual |
+| 758 | Summary: org.apache.commons.collections4; MultiValuedMap; true; entries; ; ; Argument[this].MapValue.Element; ReturnValue.Element.MapValue; value; manual |
+| 759 | Summary: org.apache.commons.collections4; MultiValuedMap; true; get; ; ; Argument[this].MapValue.Element; ReturnValue.Element; value; manual |
+| 760 | Summary: org.apache.commons.collections4; MultiValuedMap; true; keySet; ; ; Argument[this].MapKey; ReturnValue.Element; value; manual |
+| 761 | Summary: org.apache.commons.collections4; MultiValuedMap; true; keys; ; ; Argument[this].MapKey; ReturnValue.Element; value; manual |
+| 762 | Summary: org.apache.commons.collections4; MultiValuedMap; true; mapIterator; ; ; Argument[this].MapKey; ReturnValue.Element; value; manual |
+| 763 | Summary: org.apache.commons.collections4; MultiValuedMap; true; mapIterator; ; ; Argument[this].MapValue.Element; ReturnValue.MapValue; value; manual |
+| 764 | Summary: org.apache.commons.collections4; MultiValuedMap; true; put; ; ; Argument[0]; Argument[this].MapKey; value; manual |
+| 765 | Summary: org.apache.commons.collections4; MultiValuedMap; true; put; ; ; Argument[1]; Argument[this].MapValue.Element; value; manual |
+| 766 | Summary: org.apache.commons.collections4; MultiValuedMap; true; putAll; (Map); ; Argument[0].MapKey; Argument[this].MapKey; value; manual |
+| 767 | Summary: org.apache.commons.collections4; MultiValuedMap; true; putAll; (Map); ; Argument[0].MapValue; Argument[this].MapValue.Element; value; manual |
+| 768 | Summary: org.apache.commons.collections4; MultiValuedMap; true; putAll; (MultiValuedMap); ; Argument[0].MapKey; Argument[this].MapKey; value; manual |
+| 769 | Summary: org.apache.commons.collections4; MultiValuedMap; true; putAll; (MultiValuedMap); ; Argument[0].MapValue.Element; Argument[this].MapValue.Element; value; manual |
+| 770 | Summary: org.apache.commons.collections4; MultiValuedMap; true; putAll; (Object,Iterable); ; Argument[0]; Argument[this].MapKey; value; manual |
+| 771 | Summary: org.apache.commons.collections4; MultiValuedMap; true; putAll; (Object,Iterable); ; Argument[1].Element; Argument[this].MapValue.Element; value; manual |
+| 772 | Summary: org.apache.commons.collections4; MultiValuedMap; true; remove; ; ; Argument[this].MapValue.Element; ReturnValue.Element; value; manual |
+| 773 | Summary: org.apache.commons.collections4; MultiValuedMap; true; values; ; ; Argument[this].MapValue.Element; ReturnValue.Element; value; manual |
+| 774 | Summary: org.apache.commons.collections4; OrderedIterator; true; previous; ; ; Argument[this].Element; ReturnValue; value; manual |
+| 775 | Summary: org.apache.commons.collections4; OrderedMap; true; firstKey; ; ; Argument[this].MapKey; ReturnValue; value; manual |
+| 776 | Summary: org.apache.commons.collections4; OrderedMap; true; lastKey; ; ; Argument[this].MapKey; ReturnValue; value; manual |
+| 777 | Summary: org.apache.commons.collections4; OrderedMap; true; nextKey; ; ; Argument[this].MapKey; ReturnValue; value; manual |
+| 778 | Summary: org.apache.commons.collections4; OrderedMap; true; previousKey; ; ; Argument[this].MapKey; ReturnValue; value; manual |
+| 779 | Summary: org.apache.commons.collections4; Put; true; put; ; ; Argument[0]; Argument[this].MapKey; value; manual |
+| 780 | Summary: org.apache.commons.collections4; Put; true; put; ; ; Argument[1]; Argument[this].MapValue; value; manual |
+| 781 | Summary: org.apache.commons.collections4; Put; true; put; ; ; Argument[this].MapValue; ReturnValue; value; manual |
+| 782 | Summary: org.apache.commons.collections4; Put; true; putAll; (Map); ; Argument[0].MapKey; Argument[this].MapKey; value; manual |
+| 783 | Summary: org.apache.commons.collections4; Put; true; putAll; (Map); ; Argument[0].MapValue; Argument[this].MapValue; value; manual |
+| 784 | Summary: org.apache.commons.collections4; QueueUtils; true; predicatedQueue; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
+| 785 | Summary: org.apache.commons.collections4; QueueUtils; true; synchronizedQueue; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
+| 786 | Summary: org.apache.commons.collections4; QueueUtils; true; transformingQueue; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
+| 787 | Summary: org.apache.commons.collections4; QueueUtils; true; unmodifiableQueue; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
+| 788 | Summary: org.apache.commons.collections4; SetUtils$SetView; true; copyInto; ; ; Argument[this].Element; Argument[0].Element; value; manual |
+| 789 | Summary: org.apache.commons.collections4; SetUtils$SetView; true; createIterator; ; ; Argument[this].Element; ReturnValue.Element; value; manual |
+| 790 | Summary: org.apache.commons.collections4; SetUtils$SetView; true; toSet; ; ; Argument[this].Element; ReturnValue.Element; value; manual |
+| 791 | Summary: org.apache.commons.collections4; SetUtils; true; difference; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
+| 792 | Summary: org.apache.commons.collections4; SetUtils; true; disjunction; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
+| 793 | Summary: org.apache.commons.collections4; SetUtils; true; disjunction; ; ; Argument[1].Element; ReturnValue.Element; value; manual |
+| 794 | Summary: org.apache.commons.collections4; SetUtils; true; emptyIfNull; ; ; Argument[0]; ReturnValue; value; manual |
+| 795 | Summary: org.apache.commons.collections4; SetUtils; true; hashSet; ; ; Argument[0].ArrayElement; ReturnValue.Element; value; manual |
+| 796 | Summary: org.apache.commons.collections4; SetUtils; true; intersection; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
+| 797 | Summary: org.apache.commons.collections4; SetUtils; true; intersection; ; ; Argument[1].Element; ReturnValue.Element; value; manual |
+| 798 | Summary: org.apache.commons.collections4; SetUtils; true; orderedSet; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
+| 799 | Summary: org.apache.commons.collections4; SetUtils; true; predicatedNavigableSet; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
+| 800 | Summary: org.apache.commons.collections4; SetUtils; true; predicatedSet; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
+| 801 | Summary: org.apache.commons.collections4; SetUtils; true; predicatedSortedSet; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
+| 802 | Summary: org.apache.commons.collections4; SetUtils; true; synchronizedSet; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
+| 803 | Summary: org.apache.commons.collections4; SetUtils; true; synchronizedSortedSet; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
+| 804 | Summary: org.apache.commons.collections4; SetUtils; true; transformedNavigableSet; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
+| 805 | Summary: org.apache.commons.collections4; SetUtils; true; transformedSet; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
+| 806 | Summary: org.apache.commons.collections4; SetUtils; true; transformedSortedSet; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
+| 807 | Summary: org.apache.commons.collections4; SetUtils; true; union; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
+| 808 | Summary: org.apache.commons.collections4; SetUtils; true; union; ; ; Argument[1].Element; ReturnValue.Element; value; manual |
+| 809 | Summary: org.apache.commons.collections4; SetUtils; true; unmodifiableNavigableSet; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
+| 810 | Summary: org.apache.commons.collections4; SetUtils; true; unmodifiableSet; (Object[]); ; Argument[0].ArrayElement; ReturnValue.Element; value; manual |
+| 811 | Summary: org.apache.commons.collections4; SetUtils; true; unmodifiableSet; (Set); ; Argument[0].Element; ReturnValue.Element; value; manual |
+| 812 | Summary: org.apache.commons.collections4; SetUtils; true; unmodifiableSortedSet; ; ; Argument[0].Element; ReturnValue.Element; value; manual |
+| 813 | Summary: org.apache.commons.collections4; SortedBag; true; first; ; ; Argument[this].Element; ReturnValue; value; manual |
+| 814 | Summary: org.apache.commons.collections4; SortedBag; true; last; ; ; Argument[this].Element; ReturnValue; value; manual |
+| 815 | Summary: org.apache.commons.collections4; SplitMapUtils; true; readableMap; ; ; Argument[0].MapKey; ReturnValue.MapKey; value; manual |
+| 816 | Summary: org.apache.commons.collections4; SplitMapUtils; true; readableMap; ; ; Argument[0].MapValue; ReturnValue.MapValue; value; manual |
+| 817 | Summary: org.apache.commons.collections4; SplitMapUtils; true; writableMap; ; ; Argument[0].MapKey; ReturnValue.MapKey; value; manual |
+| 818 | Summary: org.apache.commons.collections4; SplitMapUtils; true; writableMap; ; ; Argument[0].MapValue; ReturnValue.MapValue; value; manual |
+| 819 | Summary: org.apache.commons.collections4; Trie; true; prefixMap; ; ; Argument[this].MapKey; ReturnValue.MapKey; value; manual |
+| 820 | Summary: org.apache.commons.collections4; Trie; true; prefixMap; ; ; Argument[this].MapValue; ReturnValue.MapValue; value; manual |
+| 821 | Summary: org.apache.commons.collections4; TrieUtils; true; unmodifiableTrie; ; ; Argument[0].MapKey; ReturnValue.MapKey; value; manual |
+| 822 | Summary: org.apache.commons.collections4; TrieUtils; true; unmodifiableTrie; ; ; Argument[0].MapValue; ReturnValue.MapValue; value; manual |
 edges
 | Test.java:228:18:228:29 | map : AbstractMapDecorator [<map.key>] : Object | Test.java:228:41:228:43 | map : AbstractMapDecorator [<map.key>] : Object | provenance |  |
 | Test.java:228:18:228:29 | map : AbstractMapDecorator [<map.key>] : String | Test.java:228:41:228:43 | map : AbstractMapDecorator [<map.key>] : String | provenance |  |
@@ -875,165 +875,165 @@ edges
 | Test.java:228:18:228:29 | map : TransformedSortedMap [<map.key>] : String | Test.java:228:41:228:43 | map : TransformedSortedMap [<map.key>] : String | provenance |  |
 | Test.java:228:18:228:29 | map : TreeBidiMap [<map.key>] : String | Test.java:228:41:228:43 | map : TreeBidiMap [<map.key>] : String | provenance |  |
 | Test.java:228:18:228:29 | map : Trie [<map.key>] : String | Test.java:228:41:228:43 | map : Trie [<map.key>] : String | provenance |  |
-| Test.java:228:41:228:43 | map : AbstractMapDecorator [<map.key>] : Object | Test.java:228:41:228:52 | keySet(...) : Set [<element>] : Object | provenance | MaD:10 |
-| Test.java:228:41:228:43 | map : AbstractMapDecorator [<map.key>] : String | Test.java:228:41:228:52 | keySet(...) : Set [<element>] : String | provenance | MaD:10 |
-| Test.java:228:41:228:43 | map : BidiMap [<map.key>] : Object | Test.java:228:41:228:52 | keySet(...) : Set [<element>] : Object | provenance | MaD:10 |
-| Test.java:228:41:228:43 | map : BidiMap [<map.key>] : String | Test.java:228:41:228:52 | keySet(...) : Set [<element>] : String | provenance | MaD:10 |
-| Test.java:228:41:228:43 | map : CaseInsensitiveMap [<map.key>] : String | Test.java:228:41:228:52 | keySet(...) : Set [<element>] : String | provenance | MaD:10 |
-| Test.java:228:41:228:43 | map : CompositeMap [<map.key>] : String | Test.java:228:41:228:52 | keySet(...) : Set [<element>] : String | provenance | MaD:10 |
-| Test.java:228:41:228:43 | map : DefaultedMap [<map.key>] : String | Test.java:228:41:228:52 | keySet(...) : Set [<element>] : String | provenance | MaD:10 |
-| Test.java:228:41:228:43 | map : DualHashBidiMap [<map.key>] : String | Test.java:228:41:228:52 | keySet(...) : Set [<element>] : String | provenance | MaD:10 |
-| Test.java:228:41:228:43 | map : DualLinkedHashBidiMap [<map.key>] : String | Test.java:228:41:228:52 | keySet(...) : Set [<element>] : String | provenance | MaD:10 |
-| Test.java:228:41:228:43 | map : DualTreeBidiMap [<map.key>] : String | Test.java:228:41:228:52 | keySet(...) : Set [<element>] : String | provenance | MaD:10 |
-| Test.java:228:41:228:43 | map : FixedSizeMap [<map.key>] : String | Test.java:228:41:228:52 | keySet(...) : Set [<element>] : String | provenance | MaD:10 |
-| Test.java:228:41:228:43 | map : FixedSizeSortedMap [<map.key>] : String | Test.java:228:41:228:52 | keySet(...) : Set [<element>] : String | provenance | MaD:10 |
-| Test.java:228:41:228:43 | map : Flat3Map [<map.key>] : String | Test.java:228:41:228:52 | keySet(...) : Set [<element>] : String | provenance | MaD:10 |
-| Test.java:228:41:228:43 | map : HashedMap [<map.key>] : String | Test.java:228:41:228:52 | keySet(...) : Set [<element>] : String | provenance | MaD:10 |
-| Test.java:228:41:228:43 | map : IterableMap [<map.key>] : String | Test.java:228:41:228:52 | keySet(...) : Set [<element>] : String | provenance | MaD:10 |
-| Test.java:228:41:228:43 | map : IterableSortedMap [<map.key>] : String | Test.java:228:41:228:52 | keySet(...) : Set [<element>] : String | provenance | MaD:10 |
-| Test.java:228:41:228:43 | map : LRUMap [<map.key>] : String | Test.java:228:41:228:52 | keySet(...) : Set [<element>] : String | provenance | MaD:10 |
-| Test.java:228:41:228:43 | map : LazyMap [<map.key>] : String | Test.java:228:41:228:52 | keySet(...) : Set [<element>] : String | provenance | MaD:10 |
-| Test.java:228:41:228:43 | map : LazySortedMap [<map.key>] : String | Test.java:228:41:228:52 | keySet(...) : Set [<element>] : String | provenance | MaD:10 |
-| Test.java:228:41:228:43 | map : LinkedMap [<map.key>] : String | Test.java:228:41:228:52 | keySet(...) : Set [<element>] : String | provenance | MaD:10 |
-| Test.java:228:41:228:43 | map : ListOrderedMap [<map.key>] : Object | Test.java:228:41:228:52 | keySet(...) : Set [<element>] : Object | provenance | MaD:10 |
-| Test.java:228:41:228:43 | map : ListOrderedMap [<map.key>] : String | Test.java:228:41:228:52 | keySet(...) : Set [<element>] : String | provenance | MaD:10 |
-| Test.java:228:41:228:43 | map : Map [<map.key>] : Object | Test.java:228:41:228:52 | keySet(...) : Set [<element>] : Object | provenance | MaD:10 |
-| Test.java:228:41:228:43 | map : Map [<map.key>] : String | Test.java:228:41:228:52 | keySet(...) : Set [<element>] : String | provenance | MaD:10 |
-| Test.java:228:41:228:43 | map : MultiKeyMap [<map.key>, <element>] : String | Test.java:228:41:228:52 | keySet(...) : Set [<element>, <element>] : String | provenance | MaD:10 |
-| Test.java:228:41:228:43 | map : MultiMap [<map.key>] : Object | Test.java:228:41:228:52 | keySet(...) : Set [<element>] : Object | provenance | MaD:10 |
-| Test.java:228:41:228:43 | map : MultiValueMap [<map.key>] : Object | Test.java:228:41:228:52 | keySet(...) : Set [<element>] : Object | provenance | MaD:10 |
-| Test.java:228:41:228:43 | map : MultiValueMap [<map.key>] : String | Test.java:228:41:228:52 | keySet(...) : Set [<element>] : String | provenance | MaD:10 |
-| Test.java:228:41:228:43 | map : MyAbstractBidiMapDecorator [<map.key>] : String | Test.java:228:41:228:52 | keySet(...) : Set [<element>] : String | provenance | MaD:10 |
-| Test.java:228:41:228:43 | map : MyAbstractDualBidiMap [<map.key>] : String | Test.java:228:41:228:52 | keySet(...) : Set [<element>] : String | provenance | MaD:10 |
-| Test.java:228:41:228:43 | map : MyAbstractHashedMap [<map.key>] : String | Test.java:228:41:228:52 | keySet(...) : Set [<element>] : String | provenance | MaD:10 |
-| Test.java:228:41:228:43 | map : MyAbstractLinkedMap [<map.key>] : String | Test.java:228:41:228:52 | keySet(...) : Set [<element>] : String | provenance | MaD:10 |
-| Test.java:228:41:228:43 | map : MyAbstractMapDecorator [<map.key>] : String | Test.java:228:41:228:52 | keySet(...) : Set [<element>] : String | provenance | MaD:10 |
-| Test.java:228:41:228:43 | map : MyAbstractOrderedBidiMapDecorator [<map.key>] : String | Test.java:228:41:228:52 | keySet(...) : Set [<element>] : String | provenance | MaD:10 |
-| Test.java:228:41:228:43 | map : MyAbstractOrderedMapDecorator [<map.key>] : String | Test.java:228:41:228:52 | keySet(...) : Set [<element>] : String | provenance | MaD:10 |
-| Test.java:228:41:228:43 | map : MyAbstractSortedBidiMapDecorator [<map.key>] : String | Test.java:228:41:228:52 | keySet(...) : Set [<element>] : String | provenance | MaD:10 |
-| Test.java:228:41:228:43 | map : MyAbstractSortedMapDecorator [<map.key>] : String | Test.java:228:41:228:52 | keySet(...) : Set [<element>] : String | provenance | MaD:10 |
-| Test.java:228:41:228:43 | map : OrderedBidiMap [<map.key>] : String | Test.java:228:41:228:52 | keySet(...) : Set [<element>] : String | provenance | MaD:10 |
-| Test.java:228:41:228:43 | map : OrderedMap [<map.key>] : String | Test.java:228:41:228:52 | keySet(...) : Set [<element>] : String | provenance | MaD:10 |
-| Test.java:228:41:228:43 | map : PassiveExpiringMap [<map.key>] : String | Test.java:228:41:228:52 | keySet(...) : Set [<element>] : String | provenance | MaD:10 |
-| Test.java:228:41:228:43 | map : PatriciaTrie [<map.key>] : String | Test.java:228:41:228:52 | keySet(...) : Set [<element>] : String | provenance | MaD:10 |
-| Test.java:228:41:228:43 | map : PredicatedMap [<map.key>] : String | Test.java:228:41:228:52 | keySet(...) : Set [<element>] : String | provenance | MaD:10 |
-| Test.java:228:41:228:43 | map : PredicatedSortedMap [<map.key>] : String | Test.java:228:41:228:52 | keySet(...) : Set [<element>] : String | provenance | MaD:10 |
-| Test.java:228:41:228:43 | map : Put [<map.key>] : Object | Test.java:228:41:228:52 | keySet(...) : Set [<element>] : Object | provenance | MaD:10 |
-| Test.java:228:41:228:43 | map : Put [<map.key>] : String | Test.java:228:41:228:52 | keySet(...) : Set [<element>] : String | provenance | MaD:10 |
-| Test.java:228:41:228:43 | map : SingletonMap [<map.key>] : Object | Test.java:228:41:228:52 | keySet(...) : Set [<element>] : Object | provenance | MaD:10 |
-| Test.java:228:41:228:43 | map : SingletonMap [<map.key>] : String | Test.java:228:41:228:52 | keySet(...) : Set [<element>] : String | provenance | MaD:10 |
-| Test.java:228:41:228:43 | map : SortedBidiMap [<map.key>] : String | Test.java:228:41:228:52 | keySet(...) : Set [<element>] : String | provenance | MaD:10 |
-| Test.java:228:41:228:43 | map : SortedMap [<map.key>] : String | Test.java:228:41:228:52 | keySet(...) : Set [<element>] : String | provenance | MaD:10 |
-| Test.java:228:41:228:43 | map : TransformedMap [<map.key>] : String | Test.java:228:41:228:52 | keySet(...) : Set [<element>] : String | provenance | MaD:10 |
-| Test.java:228:41:228:43 | map : TransformedSortedMap [<map.key>] : String | Test.java:228:41:228:52 | keySet(...) : Set [<element>] : String | provenance | MaD:10 |
-| Test.java:228:41:228:43 | map : TreeBidiMap [<map.key>] : String | Test.java:228:41:228:52 | keySet(...) : Set [<element>] : String | provenance | MaD:10 |
-| Test.java:228:41:228:43 | map : Trie [<map.key>] : String | Test.java:228:41:228:52 | keySet(...) : Set [<element>] : String | provenance | MaD:10 |
-| Test.java:228:41:228:52 | keySet(...) : Set [<element>, <element>] : String | Test.java:228:41:228:63 | iterator(...) : Iterator [<element>, <element>] : String | provenance | MaD:1 |
-| Test.java:228:41:228:52 | keySet(...) : Set [<element>] : Object | Test.java:228:41:228:63 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:1 |
-| Test.java:228:41:228:52 | keySet(...) : Set [<element>] : Object | Test.java:228:41:228:63 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:1 |
-| Test.java:228:41:228:52 | keySet(...) : Set [<element>] : Object | Test.java:228:41:228:63 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:1 |
-| Test.java:228:41:228:52 | keySet(...) : Set [<element>] : Object | Test.java:228:41:228:63 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:1 |
-| Test.java:228:41:228:52 | keySet(...) : Set [<element>] : Object | Test.java:228:41:228:63 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:1 |
-| Test.java:228:41:228:52 | keySet(...) : Set [<element>] : Object | Test.java:228:41:228:63 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:1 |
-| Test.java:228:41:228:52 | keySet(...) : Set [<element>] : Object | Test.java:228:41:228:63 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:1 |
-| Test.java:228:41:228:52 | keySet(...) : Set [<element>] : Object | Test.java:228:41:228:63 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:1 |
-| Test.java:228:41:228:52 | keySet(...) : Set [<element>] : String | Test.java:228:41:228:63 | iterator(...) : Iterator [<element>] : String | provenance | MaD:1 |
-| Test.java:228:41:228:52 | keySet(...) : Set [<element>] : String | Test.java:228:41:228:63 | iterator(...) : Iterator [<element>] : String | provenance | MaD:1 |
-| Test.java:228:41:228:52 | keySet(...) : Set [<element>] : String | Test.java:228:41:228:63 | iterator(...) : Iterator [<element>] : String | provenance | MaD:1 |
-| Test.java:228:41:228:52 | keySet(...) : Set [<element>] : String | Test.java:228:41:228:63 | iterator(...) : Iterator [<element>] : String | provenance | MaD:1 |
-| Test.java:228:41:228:52 | keySet(...) : Set [<element>] : String | Test.java:228:41:228:63 | iterator(...) : Iterator [<element>] : String | provenance | MaD:1 |
-| Test.java:228:41:228:52 | keySet(...) : Set [<element>] : String | Test.java:228:41:228:63 | iterator(...) : Iterator [<element>] : String | provenance | MaD:1 |
-| Test.java:228:41:228:52 | keySet(...) : Set [<element>] : String | Test.java:228:41:228:63 | iterator(...) : Iterator [<element>] : String | provenance | MaD:1 |
-| Test.java:228:41:228:52 | keySet(...) : Set [<element>] : String | Test.java:228:41:228:63 | iterator(...) : Iterator [<element>] : String | provenance | MaD:1 |
-| Test.java:228:41:228:52 | keySet(...) : Set [<element>] : String | Test.java:228:41:228:63 | iterator(...) : Iterator [<element>] : String | provenance | MaD:1 |
-| Test.java:228:41:228:52 | keySet(...) : Set [<element>] : String | Test.java:228:41:228:63 | iterator(...) : Iterator [<element>] : String | provenance | MaD:1 |
-| Test.java:228:41:228:52 | keySet(...) : Set [<element>] : String | Test.java:228:41:228:63 | iterator(...) : Iterator [<element>] : String | provenance | MaD:1 |
-| Test.java:228:41:228:52 | keySet(...) : Set [<element>] : String | Test.java:228:41:228:63 | iterator(...) : Iterator [<element>] : String | provenance | MaD:1 |
-| Test.java:228:41:228:52 | keySet(...) : Set [<element>] : String | Test.java:228:41:228:63 | iterator(...) : Iterator [<element>] : String | provenance | MaD:1 |
-| Test.java:228:41:228:52 | keySet(...) : Set [<element>] : String | Test.java:228:41:228:63 | iterator(...) : Iterator [<element>] : String | provenance | MaD:1 |
-| Test.java:228:41:228:52 | keySet(...) : Set [<element>] : String | Test.java:228:41:228:63 | iterator(...) : Iterator [<element>] : String | provenance | MaD:1 |
-| Test.java:228:41:228:52 | keySet(...) : Set [<element>] : String | Test.java:228:41:228:63 | iterator(...) : Iterator [<element>] : String | provenance | MaD:1 |
-| Test.java:228:41:228:52 | keySet(...) : Set [<element>] : String | Test.java:228:41:228:63 | iterator(...) : Iterator [<element>] : String | provenance | MaD:1 |
-| Test.java:228:41:228:52 | keySet(...) : Set [<element>] : String | Test.java:228:41:228:63 | iterator(...) : Iterator [<element>] : String | provenance | MaD:1 |
-| Test.java:228:41:228:52 | keySet(...) : Set [<element>] : String | Test.java:228:41:228:63 | iterator(...) : Iterator [<element>] : String | provenance | MaD:1 |
-| Test.java:228:41:228:52 | keySet(...) : Set [<element>] : String | Test.java:228:41:228:63 | iterator(...) : Iterator [<element>] : String | provenance | MaD:1 |
-| Test.java:228:41:228:52 | keySet(...) : Set [<element>] : String | Test.java:228:41:228:63 | iterator(...) : Iterator [<element>] : String | provenance | MaD:1 |
-| Test.java:228:41:228:52 | keySet(...) : Set [<element>] : String | Test.java:228:41:228:63 | iterator(...) : Iterator [<element>] : String | provenance | MaD:1 |
-| Test.java:228:41:228:52 | keySet(...) : Set [<element>] : String | Test.java:228:41:228:63 | iterator(...) : Iterator [<element>] : String | provenance | MaD:1 |
-| Test.java:228:41:228:52 | keySet(...) : Set [<element>] : String | Test.java:228:41:228:63 | iterator(...) : Iterator [<element>] : String | provenance | MaD:1 |
-| Test.java:228:41:228:52 | keySet(...) : Set [<element>] : String | Test.java:228:41:228:63 | iterator(...) : Iterator [<element>] : String | provenance | MaD:1 |
-| Test.java:228:41:228:52 | keySet(...) : Set [<element>] : String | Test.java:228:41:228:63 | iterator(...) : Iterator [<element>] : String | provenance | MaD:1 |
-| Test.java:228:41:228:52 | keySet(...) : Set [<element>] : String | Test.java:228:41:228:63 | iterator(...) : Iterator [<element>] : String | provenance | MaD:1 |
-| Test.java:228:41:228:52 | keySet(...) : Set [<element>] : String | Test.java:228:41:228:63 | iterator(...) : Iterator [<element>] : String | provenance | MaD:1 |
-| Test.java:228:41:228:52 | keySet(...) : Set [<element>] : String | Test.java:228:41:228:63 | iterator(...) : Iterator [<element>] : String | provenance | MaD:1 |
-| Test.java:228:41:228:52 | keySet(...) : Set [<element>] : String | Test.java:228:41:228:63 | iterator(...) : Iterator [<element>] : String | provenance | MaD:1 |
-| Test.java:228:41:228:52 | keySet(...) : Set [<element>] : String | Test.java:228:41:228:63 | iterator(...) : Iterator [<element>] : String | provenance | MaD:1 |
-| Test.java:228:41:228:52 | keySet(...) : Set [<element>] : String | Test.java:228:41:228:63 | iterator(...) : Iterator [<element>] : String | provenance | MaD:1 |
-| Test.java:228:41:228:52 | keySet(...) : Set [<element>] : String | Test.java:228:41:228:63 | iterator(...) : Iterator [<element>] : String | provenance | MaD:1 |
-| Test.java:228:41:228:52 | keySet(...) : Set [<element>] : String | Test.java:228:41:228:63 | iterator(...) : Iterator [<element>] : String | provenance | MaD:1 |
-| Test.java:228:41:228:52 | keySet(...) : Set [<element>] : String | Test.java:228:41:228:63 | iterator(...) : Iterator [<element>] : String | provenance | MaD:1 |
-| Test.java:228:41:228:52 | keySet(...) : Set [<element>] : String | Test.java:228:41:228:63 | iterator(...) : Iterator [<element>] : String | provenance | MaD:1 |
-| Test.java:228:41:228:52 | keySet(...) : Set [<element>] : String | Test.java:228:41:228:63 | iterator(...) : Iterator [<element>] : String | provenance | MaD:1 |
-| Test.java:228:41:228:52 | keySet(...) : Set [<element>] : String | Test.java:228:41:228:63 | iterator(...) : Iterator [<element>] : String | provenance | MaD:1 |
-| Test.java:228:41:228:52 | keySet(...) : Set [<element>] : String | Test.java:228:41:228:63 | iterator(...) : Iterator [<element>] : String | provenance | MaD:1 |
-| Test.java:228:41:228:52 | keySet(...) : Set [<element>] : String | Test.java:228:41:228:63 | iterator(...) : Iterator [<element>] : String | provenance | MaD:1 |
-| Test.java:228:41:228:52 | keySet(...) : Set [<element>] : String | Test.java:228:41:228:63 | iterator(...) : Iterator [<element>] : String | provenance | MaD:1 |
-| Test.java:228:41:228:52 | keySet(...) : Set [<element>] : String | Test.java:228:41:228:63 | iterator(...) : Iterator [<element>] : String | provenance | MaD:1 |
-| Test.java:228:41:228:52 | keySet(...) : Set [<element>] : String | Test.java:228:41:228:63 | iterator(...) : Iterator [<element>] : String | provenance | MaD:1 |
-| Test.java:228:41:228:52 | keySet(...) : Set [<element>] : String | Test.java:228:41:228:63 | iterator(...) : Iterator [<element>] : String | provenance | MaD:1 |
-| Test.java:228:41:228:63 | iterator(...) : Iterator [<element>, <element>] : String | Test.java:228:41:228:70 | next(...) : Object [<element>] : String | provenance | MaD:4 |
-| Test.java:228:41:228:63 | iterator(...) : Iterator [<element>] : Object | Test.java:228:41:228:70 | next(...) : Object | provenance | MaD:4 |
-| Test.java:228:41:228:63 | iterator(...) : Iterator [<element>] : Object | Test.java:228:41:228:70 | next(...) : Object | provenance | MaD:4 |
-| Test.java:228:41:228:63 | iterator(...) : Iterator [<element>] : Object | Test.java:228:41:228:70 | next(...) : Object | provenance | MaD:4 |
-| Test.java:228:41:228:63 | iterator(...) : Iterator [<element>] : Object | Test.java:228:41:228:70 | next(...) : Object | provenance | MaD:4 |
-| Test.java:228:41:228:63 | iterator(...) : Iterator [<element>] : Object | Test.java:228:41:228:70 | next(...) : Object | provenance | MaD:4 |
-| Test.java:228:41:228:63 | iterator(...) : Iterator [<element>] : Object | Test.java:228:41:228:70 | next(...) : Object | provenance | MaD:4 |
-| Test.java:228:41:228:63 | iterator(...) : Iterator [<element>] : Object | Test.java:228:41:228:70 | next(...) : Object | provenance | MaD:4 |
-| Test.java:228:41:228:63 | iterator(...) : Iterator [<element>] : Object | Test.java:228:41:228:70 | next(...) : Object | provenance | MaD:4 |
-| Test.java:228:41:228:63 | iterator(...) : Iterator [<element>] : String | Test.java:228:41:228:70 | next(...) : String | provenance | MaD:4 |
-| Test.java:228:41:228:63 | iterator(...) : Iterator [<element>] : String | Test.java:228:41:228:70 | next(...) : String | provenance | MaD:4 |
-| Test.java:228:41:228:63 | iterator(...) : Iterator [<element>] : String | Test.java:228:41:228:70 | next(...) : String | provenance | MaD:4 |
-| Test.java:228:41:228:63 | iterator(...) : Iterator [<element>] : String | Test.java:228:41:228:70 | next(...) : String | provenance | MaD:4 |
-| Test.java:228:41:228:63 | iterator(...) : Iterator [<element>] : String | Test.java:228:41:228:70 | next(...) : String | provenance | MaD:4 |
-| Test.java:228:41:228:63 | iterator(...) : Iterator [<element>] : String | Test.java:228:41:228:70 | next(...) : String | provenance | MaD:4 |
-| Test.java:228:41:228:63 | iterator(...) : Iterator [<element>] : String | Test.java:228:41:228:70 | next(...) : String | provenance | MaD:4 |
-| Test.java:228:41:228:63 | iterator(...) : Iterator [<element>] : String | Test.java:228:41:228:70 | next(...) : String | provenance | MaD:4 |
-| Test.java:228:41:228:63 | iterator(...) : Iterator [<element>] : String | Test.java:228:41:228:70 | next(...) : String | provenance | MaD:4 |
-| Test.java:228:41:228:63 | iterator(...) : Iterator [<element>] : String | Test.java:228:41:228:70 | next(...) : String | provenance | MaD:4 |
-| Test.java:228:41:228:63 | iterator(...) : Iterator [<element>] : String | Test.java:228:41:228:70 | next(...) : String | provenance | MaD:4 |
-| Test.java:228:41:228:63 | iterator(...) : Iterator [<element>] : String | Test.java:228:41:228:70 | next(...) : String | provenance | MaD:4 |
-| Test.java:228:41:228:63 | iterator(...) : Iterator [<element>] : String | Test.java:228:41:228:70 | next(...) : String | provenance | MaD:4 |
-| Test.java:228:41:228:63 | iterator(...) : Iterator [<element>] : String | Test.java:228:41:228:70 | next(...) : String | provenance | MaD:4 |
-| Test.java:228:41:228:63 | iterator(...) : Iterator [<element>] : String | Test.java:228:41:228:70 | next(...) : String | provenance | MaD:4 |
-| Test.java:228:41:228:63 | iterator(...) : Iterator [<element>] : String | Test.java:228:41:228:70 | next(...) : String | provenance | MaD:4 |
-| Test.java:228:41:228:63 | iterator(...) : Iterator [<element>] : String | Test.java:228:41:228:70 | next(...) : String | provenance | MaD:4 |
-| Test.java:228:41:228:63 | iterator(...) : Iterator [<element>] : String | Test.java:228:41:228:70 | next(...) : String | provenance | MaD:4 |
-| Test.java:228:41:228:63 | iterator(...) : Iterator [<element>] : String | Test.java:228:41:228:70 | next(...) : String | provenance | MaD:4 |
-| Test.java:228:41:228:63 | iterator(...) : Iterator [<element>] : String | Test.java:228:41:228:70 | next(...) : String | provenance | MaD:4 |
-| Test.java:228:41:228:63 | iterator(...) : Iterator [<element>] : String | Test.java:228:41:228:70 | next(...) : String | provenance | MaD:4 |
-| Test.java:228:41:228:63 | iterator(...) : Iterator [<element>] : String | Test.java:228:41:228:70 | next(...) : String | provenance | MaD:4 |
-| Test.java:228:41:228:63 | iterator(...) : Iterator [<element>] : String | Test.java:228:41:228:70 | next(...) : String | provenance | MaD:4 |
-| Test.java:228:41:228:63 | iterator(...) : Iterator [<element>] : String | Test.java:228:41:228:70 | next(...) : String | provenance | MaD:4 |
-| Test.java:228:41:228:63 | iterator(...) : Iterator [<element>] : String | Test.java:228:41:228:70 | next(...) : String | provenance | MaD:4 |
-| Test.java:228:41:228:63 | iterator(...) : Iterator [<element>] : String | Test.java:228:41:228:70 | next(...) : String | provenance | MaD:4 |
-| Test.java:228:41:228:63 | iterator(...) : Iterator [<element>] : String | Test.java:228:41:228:70 | next(...) : String | provenance | MaD:4 |
-| Test.java:228:41:228:63 | iterator(...) : Iterator [<element>] : String | Test.java:228:41:228:70 | next(...) : String | provenance | MaD:4 |
-| Test.java:228:41:228:63 | iterator(...) : Iterator [<element>] : String | Test.java:228:41:228:70 | next(...) : String | provenance | MaD:4 |
-| Test.java:228:41:228:63 | iterator(...) : Iterator [<element>] : String | Test.java:228:41:228:70 | next(...) : String | provenance | MaD:4 |
-| Test.java:228:41:228:63 | iterator(...) : Iterator [<element>] : String | Test.java:228:41:228:70 | next(...) : String | provenance | MaD:4 |
-| Test.java:228:41:228:63 | iterator(...) : Iterator [<element>] : String | Test.java:228:41:228:70 | next(...) : String | provenance | MaD:4 |
-| Test.java:228:41:228:63 | iterator(...) : Iterator [<element>] : String | Test.java:228:41:228:70 | next(...) : String | provenance | MaD:4 |
-| Test.java:228:41:228:63 | iterator(...) : Iterator [<element>] : String | Test.java:228:41:228:70 | next(...) : String | provenance | MaD:4 |
-| Test.java:228:41:228:63 | iterator(...) : Iterator [<element>] : String | Test.java:228:41:228:70 | next(...) : String | provenance | MaD:4 |
-| Test.java:228:41:228:63 | iterator(...) : Iterator [<element>] : String | Test.java:228:41:228:70 | next(...) : String | provenance | MaD:4 |
-| Test.java:228:41:228:63 | iterator(...) : Iterator [<element>] : String | Test.java:228:41:228:70 | next(...) : String | provenance | MaD:4 |
-| Test.java:228:41:228:63 | iterator(...) : Iterator [<element>] : String | Test.java:228:41:228:70 | next(...) : String | provenance | MaD:4 |
-| Test.java:228:41:228:63 | iterator(...) : Iterator [<element>] : String | Test.java:228:41:228:70 | next(...) : String | provenance | MaD:4 |
-| Test.java:228:41:228:63 | iterator(...) : Iterator [<element>] : String | Test.java:228:41:228:70 | next(...) : String | provenance | MaD:4 |
-| Test.java:228:41:228:63 | iterator(...) : Iterator [<element>] : String | Test.java:228:41:228:70 | next(...) : String | provenance | MaD:4 |
-| Test.java:228:41:228:63 | iterator(...) : Iterator [<element>] : String | Test.java:228:41:228:70 | next(...) : String | provenance | MaD:4 |
-| Test.java:228:41:228:63 | iterator(...) : Iterator [<element>] : String | Test.java:228:41:228:70 | next(...) : String | provenance | MaD:4 |
-| Test.java:228:41:228:63 | iterator(...) : Iterator [<element>] : String | Test.java:228:41:228:70 | next(...) : String | provenance | MaD:4 |
+| Test.java:228:41:228:43 | map : AbstractMapDecorator [<map.key>] : Object | Test.java:228:41:228:52 | keySet(...) : Set [<element>] : Object | provenance | MaD:18 |
+| Test.java:228:41:228:43 | map : AbstractMapDecorator [<map.key>] : String | Test.java:228:41:228:52 | keySet(...) : Set [<element>] : String | provenance | MaD:18 |
+| Test.java:228:41:228:43 | map : BidiMap [<map.key>] : Object | Test.java:228:41:228:52 | keySet(...) : Set [<element>] : Object | provenance | MaD:18 |
+| Test.java:228:41:228:43 | map : BidiMap [<map.key>] : String | Test.java:228:41:228:52 | keySet(...) : Set [<element>] : String | provenance | MaD:18 |
+| Test.java:228:41:228:43 | map : CaseInsensitiveMap [<map.key>] : String | Test.java:228:41:228:52 | keySet(...) : Set [<element>] : String | provenance | MaD:18 |
+| Test.java:228:41:228:43 | map : CompositeMap [<map.key>] : String | Test.java:228:41:228:52 | keySet(...) : Set [<element>] : String | provenance | MaD:18 |
+| Test.java:228:41:228:43 | map : DefaultedMap [<map.key>] : String | Test.java:228:41:228:52 | keySet(...) : Set [<element>] : String | provenance | MaD:18 |
+| Test.java:228:41:228:43 | map : DualHashBidiMap [<map.key>] : String | Test.java:228:41:228:52 | keySet(...) : Set [<element>] : String | provenance | MaD:18 |
+| Test.java:228:41:228:43 | map : DualLinkedHashBidiMap [<map.key>] : String | Test.java:228:41:228:52 | keySet(...) : Set [<element>] : String | provenance | MaD:18 |
+| Test.java:228:41:228:43 | map : DualTreeBidiMap [<map.key>] : String | Test.java:228:41:228:52 | keySet(...) : Set [<element>] : String | provenance | MaD:18 |
+| Test.java:228:41:228:43 | map : FixedSizeMap [<map.key>] : String | Test.java:228:41:228:52 | keySet(...) : Set [<element>] : String | provenance | MaD:18 |
+| Test.java:228:41:228:43 | map : FixedSizeSortedMap [<map.key>] : String | Test.java:228:41:228:52 | keySet(...) : Set [<element>] : String | provenance | MaD:18 |
+| Test.java:228:41:228:43 | map : Flat3Map [<map.key>] : String | Test.java:228:41:228:52 | keySet(...) : Set [<element>] : String | provenance | MaD:18 |
+| Test.java:228:41:228:43 | map : HashedMap [<map.key>] : String | Test.java:228:41:228:52 | keySet(...) : Set [<element>] : String | provenance | MaD:18 |
+| Test.java:228:41:228:43 | map : IterableMap [<map.key>] : String | Test.java:228:41:228:52 | keySet(...) : Set [<element>] : String | provenance | MaD:18 |
+| Test.java:228:41:228:43 | map : IterableSortedMap [<map.key>] : String | Test.java:228:41:228:52 | keySet(...) : Set [<element>] : String | provenance | MaD:18 |
+| Test.java:228:41:228:43 | map : LRUMap [<map.key>] : String | Test.java:228:41:228:52 | keySet(...) : Set [<element>] : String | provenance | MaD:18 |
+| Test.java:228:41:228:43 | map : LazyMap [<map.key>] : String | Test.java:228:41:228:52 | keySet(...) : Set [<element>] : String | provenance | MaD:18 |
+| Test.java:228:41:228:43 | map : LazySortedMap [<map.key>] : String | Test.java:228:41:228:52 | keySet(...) : Set [<element>] : String | provenance | MaD:18 |
+| Test.java:228:41:228:43 | map : LinkedMap [<map.key>] : String | Test.java:228:41:228:52 | keySet(...) : Set [<element>] : String | provenance | MaD:18 |
+| Test.java:228:41:228:43 | map : ListOrderedMap [<map.key>] : Object | Test.java:228:41:228:52 | keySet(...) : Set [<element>] : Object | provenance | MaD:18 |
+| Test.java:228:41:228:43 | map : ListOrderedMap [<map.key>] : String | Test.java:228:41:228:52 | keySet(...) : Set [<element>] : String | provenance | MaD:18 |
+| Test.java:228:41:228:43 | map : Map [<map.key>] : Object | Test.java:228:41:228:52 | keySet(...) : Set [<element>] : Object | provenance | MaD:18 |
+| Test.java:228:41:228:43 | map : Map [<map.key>] : String | Test.java:228:41:228:52 | keySet(...) : Set [<element>] : String | provenance | MaD:18 |
+| Test.java:228:41:228:43 | map : MultiKeyMap [<map.key>, <element>] : String | Test.java:228:41:228:52 | keySet(...) : Set [<element>, <element>] : String | provenance | MaD:18 |
+| Test.java:228:41:228:43 | map : MultiMap [<map.key>] : Object | Test.java:228:41:228:52 | keySet(...) : Set [<element>] : Object | provenance | MaD:18 |
+| Test.java:228:41:228:43 | map : MultiValueMap [<map.key>] : Object | Test.java:228:41:228:52 | keySet(...) : Set [<element>] : Object | provenance | MaD:18 |
+| Test.java:228:41:228:43 | map : MultiValueMap [<map.key>] : String | Test.java:228:41:228:52 | keySet(...) : Set [<element>] : String | provenance | MaD:18 |
+| Test.java:228:41:228:43 | map : MyAbstractBidiMapDecorator [<map.key>] : String | Test.java:228:41:228:52 | keySet(...) : Set [<element>] : String | provenance | MaD:18 |
+| Test.java:228:41:228:43 | map : MyAbstractDualBidiMap [<map.key>] : String | Test.java:228:41:228:52 | keySet(...) : Set [<element>] : String | provenance | MaD:18 |
+| Test.java:228:41:228:43 | map : MyAbstractHashedMap [<map.key>] : String | Test.java:228:41:228:52 | keySet(...) : Set [<element>] : String | provenance | MaD:18 |
+| Test.java:228:41:228:43 | map : MyAbstractLinkedMap [<map.key>] : String | Test.java:228:41:228:52 | keySet(...) : Set [<element>] : String | provenance | MaD:18 |
+| Test.java:228:41:228:43 | map : MyAbstractMapDecorator [<map.key>] : String | Test.java:228:41:228:52 | keySet(...) : Set [<element>] : String | provenance | MaD:18 |
+| Test.java:228:41:228:43 | map : MyAbstractOrderedBidiMapDecorator [<map.key>] : String | Test.java:228:41:228:52 | keySet(...) : Set [<element>] : String | provenance | MaD:18 |
+| Test.java:228:41:228:43 | map : MyAbstractOrderedMapDecorator [<map.key>] : String | Test.java:228:41:228:52 | keySet(...) : Set [<element>] : String | provenance | MaD:18 |
+| Test.java:228:41:228:43 | map : MyAbstractSortedBidiMapDecorator [<map.key>] : String | Test.java:228:41:228:52 | keySet(...) : Set [<element>] : String | provenance | MaD:18 |
+| Test.java:228:41:228:43 | map : MyAbstractSortedMapDecorator [<map.key>] : String | Test.java:228:41:228:52 | keySet(...) : Set [<element>] : String | provenance | MaD:18 |
+| Test.java:228:41:228:43 | map : OrderedBidiMap [<map.key>] : String | Test.java:228:41:228:52 | keySet(...) : Set [<element>] : String | provenance | MaD:18 |
+| Test.java:228:41:228:43 | map : OrderedMap [<map.key>] : String | Test.java:228:41:228:52 | keySet(...) : Set [<element>] : String | provenance | MaD:18 |
+| Test.java:228:41:228:43 | map : PassiveExpiringMap [<map.key>] : String | Test.java:228:41:228:52 | keySet(...) : Set [<element>] : String | provenance | MaD:18 |
+| Test.java:228:41:228:43 | map : PatriciaTrie [<map.key>] : String | Test.java:228:41:228:52 | keySet(...) : Set [<element>] : String | provenance | MaD:18 |
+| Test.java:228:41:228:43 | map : PredicatedMap [<map.key>] : String | Test.java:228:41:228:52 | keySet(...) : Set [<element>] : String | provenance | MaD:18 |
+| Test.java:228:41:228:43 | map : PredicatedSortedMap [<map.key>] : String | Test.java:228:41:228:52 | keySet(...) : Set [<element>] : String | provenance | MaD:18 |
+| Test.java:228:41:228:43 | map : Put [<map.key>] : Object | Test.java:228:41:228:52 | keySet(...) : Set [<element>] : Object | provenance | MaD:18 |
+| Test.java:228:41:228:43 | map : Put [<map.key>] : String | Test.java:228:41:228:52 | keySet(...) : Set [<element>] : String | provenance | MaD:18 |
+| Test.java:228:41:228:43 | map : SingletonMap [<map.key>] : Object | Test.java:228:41:228:52 | keySet(...) : Set [<element>] : Object | provenance | MaD:18 |
+| Test.java:228:41:228:43 | map : SingletonMap [<map.key>] : String | Test.java:228:41:228:52 | keySet(...) : Set [<element>] : String | provenance | MaD:18 |
+| Test.java:228:41:228:43 | map : SortedBidiMap [<map.key>] : String | Test.java:228:41:228:52 | keySet(...) : Set [<element>] : String | provenance | MaD:18 |
+| Test.java:228:41:228:43 | map : SortedMap [<map.key>] : String | Test.java:228:41:228:52 | keySet(...) : Set [<element>] : String | provenance | MaD:18 |
+| Test.java:228:41:228:43 | map : TransformedMap [<map.key>] : String | Test.java:228:41:228:52 | keySet(...) : Set [<element>] : String | provenance | MaD:18 |
+| Test.java:228:41:228:43 | map : TransformedSortedMap [<map.key>] : String | Test.java:228:41:228:52 | keySet(...) : Set [<element>] : String | provenance | MaD:18 |
+| Test.java:228:41:228:43 | map : TreeBidiMap [<map.key>] : String | Test.java:228:41:228:52 | keySet(...) : Set [<element>] : String | provenance | MaD:18 |
+| Test.java:228:41:228:43 | map : Trie [<map.key>] : String | Test.java:228:41:228:52 | keySet(...) : Set [<element>] : String | provenance | MaD:18 |
+| Test.java:228:41:228:52 | keySet(...) : Set [<element>, <element>] : String | Test.java:228:41:228:63 | iterator(...) : Iterator [<element>, <element>] : String | provenance | MaD:3 |
+| Test.java:228:41:228:52 | keySet(...) : Set [<element>] : Object | Test.java:228:41:228:63 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:3 |
+| Test.java:228:41:228:52 | keySet(...) : Set [<element>] : Object | Test.java:228:41:228:63 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:3 |
+| Test.java:228:41:228:52 | keySet(...) : Set [<element>] : Object | Test.java:228:41:228:63 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:3 |
+| Test.java:228:41:228:52 | keySet(...) : Set [<element>] : Object | Test.java:228:41:228:63 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:3 |
+| Test.java:228:41:228:52 | keySet(...) : Set [<element>] : Object | Test.java:228:41:228:63 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:3 |
+| Test.java:228:41:228:52 | keySet(...) : Set [<element>] : Object | Test.java:228:41:228:63 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:3 |
+| Test.java:228:41:228:52 | keySet(...) : Set [<element>] : Object | Test.java:228:41:228:63 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:3 |
+| Test.java:228:41:228:52 | keySet(...) : Set [<element>] : Object | Test.java:228:41:228:63 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:3 |
+| Test.java:228:41:228:52 | keySet(...) : Set [<element>] : String | Test.java:228:41:228:63 | iterator(...) : Iterator [<element>] : String | provenance | MaD:3 |
+| Test.java:228:41:228:52 | keySet(...) : Set [<element>] : String | Test.java:228:41:228:63 | iterator(...) : Iterator [<element>] : String | provenance | MaD:3 |
+| Test.java:228:41:228:52 | keySet(...) : Set [<element>] : String | Test.java:228:41:228:63 | iterator(...) : Iterator [<element>] : String | provenance | MaD:3 |
+| Test.java:228:41:228:52 | keySet(...) : Set [<element>] : String | Test.java:228:41:228:63 | iterator(...) : Iterator [<element>] : String | provenance | MaD:3 |
+| Test.java:228:41:228:52 | keySet(...) : Set [<element>] : String | Test.java:228:41:228:63 | iterator(...) : Iterator [<element>] : String | provenance | MaD:3 |
+| Test.java:228:41:228:52 | keySet(...) : Set [<element>] : String | Test.java:228:41:228:63 | iterator(...) : Iterator [<element>] : String | provenance | MaD:3 |
+| Test.java:228:41:228:52 | keySet(...) : Set [<element>] : String | Test.java:228:41:228:63 | iterator(...) : Iterator [<element>] : String | provenance | MaD:3 |
+| Test.java:228:41:228:52 | keySet(...) : Set [<element>] : String | Test.java:228:41:228:63 | iterator(...) : Iterator [<element>] : String | provenance | MaD:3 |
+| Test.java:228:41:228:52 | keySet(...) : Set [<element>] : String | Test.java:228:41:228:63 | iterator(...) : Iterator [<element>] : String | provenance | MaD:3 |
+| Test.java:228:41:228:52 | keySet(...) : Set [<element>] : String | Test.java:228:41:228:63 | iterator(...) : Iterator [<element>] : String | provenance | MaD:3 |
+| Test.java:228:41:228:52 | keySet(...) : Set [<element>] : String | Test.java:228:41:228:63 | iterator(...) : Iterator [<element>] : String | provenance | MaD:3 |
+| Test.java:228:41:228:52 | keySet(...) : Set [<element>] : String | Test.java:228:41:228:63 | iterator(...) : Iterator [<element>] : String | provenance | MaD:3 |
+| Test.java:228:41:228:52 | keySet(...) : Set [<element>] : String | Test.java:228:41:228:63 | iterator(...) : Iterator [<element>] : String | provenance | MaD:3 |
+| Test.java:228:41:228:52 | keySet(...) : Set [<element>] : String | Test.java:228:41:228:63 | iterator(...) : Iterator [<element>] : String | provenance | MaD:3 |
+| Test.java:228:41:228:52 | keySet(...) : Set [<element>] : String | Test.java:228:41:228:63 | iterator(...) : Iterator [<element>] : String | provenance | MaD:3 |
+| Test.java:228:41:228:52 | keySet(...) : Set [<element>] : String | Test.java:228:41:228:63 | iterator(...) : Iterator [<element>] : String | provenance | MaD:3 |
+| Test.java:228:41:228:52 | keySet(...) : Set [<element>] : String | Test.java:228:41:228:63 | iterator(...) : Iterator [<element>] : String | provenance | MaD:3 |
+| Test.java:228:41:228:52 | keySet(...) : Set [<element>] : String | Test.java:228:41:228:63 | iterator(...) : Iterator [<element>] : String | provenance | MaD:3 |
+| Test.java:228:41:228:52 | keySet(...) : Set [<element>] : String | Test.java:228:41:228:63 | iterator(...) : Iterator [<element>] : String | provenance | MaD:3 |
+| Test.java:228:41:228:52 | keySet(...) : Set [<element>] : String | Test.java:228:41:228:63 | iterator(...) : Iterator [<element>] : String | provenance | MaD:3 |
+| Test.java:228:41:228:52 | keySet(...) : Set [<element>] : String | Test.java:228:41:228:63 | iterator(...) : Iterator [<element>] : String | provenance | MaD:3 |
+| Test.java:228:41:228:52 | keySet(...) : Set [<element>] : String | Test.java:228:41:228:63 | iterator(...) : Iterator [<element>] : String | provenance | MaD:3 |
+| Test.java:228:41:228:52 | keySet(...) : Set [<element>] : String | Test.java:228:41:228:63 | iterator(...) : Iterator [<element>] : String | provenance | MaD:3 |
+| Test.java:228:41:228:52 | keySet(...) : Set [<element>] : String | Test.java:228:41:228:63 | iterator(...) : Iterator [<element>] : String | provenance | MaD:3 |
+| Test.java:228:41:228:52 | keySet(...) : Set [<element>] : String | Test.java:228:41:228:63 | iterator(...) : Iterator [<element>] : String | provenance | MaD:3 |
+| Test.java:228:41:228:52 | keySet(...) : Set [<element>] : String | Test.java:228:41:228:63 | iterator(...) : Iterator [<element>] : String | provenance | MaD:3 |
+| Test.java:228:41:228:52 | keySet(...) : Set [<element>] : String | Test.java:228:41:228:63 | iterator(...) : Iterator [<element>] : String | provenance | MaD:3 |
+| Test.java:228:41:228:52 | keySet(...) : Set [<element>] : String | Test.java:228:41:228:63 | iterator(...) : Iterator [<element>] : String | provenance | MaD:3 |
+| Test.java:228:41:228:52 | keySet(...) : Set [<element>] : String | Test.java:228:41:228:63 | iterator(...) : Iterator [<element>] : String | provenance | MaD:3 |
+| Test.java:228:41:228:52 | keySet(...) : Set [<element>] : String | Test.java:228:41:228:63 | iterator(...) : Iterator [<element>] : String | provenance | MaD:3 |
+| Test.java:228:41:228:52 | keySet(...) : Set [<element>] : String | Test.java:228:41:228:63 | iterator(...) : Iterator [<element>] : String | provenance | MaD:3 |
+| Test.java:228:41:228:52 | keySet(...) : Set [<element>] : String | Test.java:228:41:228:63 | iterator(...) : Iterator [<element>] : String | provenance | MaD:3 |
+| Test.java:228:41:228:52 | keySet(...) : Set [<element>] : String | Test.java:228:41:228:63 | iterator(...) : Iterator [<element>] : String | provenance | MaD:3 |
+| Test.java:228:41:228:52 | keySet(...) : Set [<element>] : String | Test.java:228:41:228:63 | iterator(...) : Iterator [<element>] : String | provenance | MaD:3 |
+| Test.java:228:41:228:52 | keySet(...) : Set [<element>] : String | Test.java:228:41:228:63 | iterator(...) : Iterator [<element>] : String | provenance | MaD:3 |
+| Test.java:228:41:228:52 | keySet(...) : Set [<element>] : String | Test.java:228:41:228:63 | iterator(...) : Iterator [<element>] : String | provenance | MaD:3 |
+| Test.java:228:41:228:52 | keySet(...) : Set [<element>] : String | Test.java:228:41:228:63 | iterator(...) : Iterator [<element>] : String | provenance | MaD:3 |
+| Test.java:228:41:228:52 | keySet(...) : Set [<element>] : String | Test.java:228:41:228:63 | iterator(...) : Iterator [<element>] : String | provenance | MaD:3 |
+| Test.java:228:41:228:52 | keySet(...) : Set [<element>] : String | Test.java:228:41:228:63 | iterator(...) : Iterator [<element>] : String | provenance | MaD:3 |
+| Test.java:228:41:228:52 | keySet(...) : Set [<element>] : String | Test.java:228:41:228:63 | iterator(...) : Iterator [<element>] : String | provenance | MaD:3 |
+| Test.java:228:41:228:52 | keySet(...) : Set [<element>] : String | Test.java:228:41:228:63 | iterator(...) : Iterator [<element>] : String | provenance | MaD:3 |
+| Test.java:228:41:228:52 | keySet(...) : Set [<element>] : String | Test.java:228:41:228:63 | iterator(...) : Iterator [<element>] : String | provenance | MaD:3 |
+| Test.java:228:41:228:52 | keySet(...) : Set [<element>] : String | Test.java:228:41:228:63 | iterator(...) : Iterator [<element>] : String | provenance | MaD:3 |
+| Test.java:228:41:228:52 | keySet(...) : Set [<element>] : String | Test.java:228:41:228:63 | iterator(...) : Iterator [<element>] : String | provenance | MaD:3 |
+| Test.java:228:41:228:63 | iterator(...) : Iterator [<element>, <element>] : String | Test.java:228:41:228:70 | next(...) : Object [<element>] : String | provenance | MaD:6 |
+| Test.java:228:41:228:63 | iterator(...) : Iterator [<element>] : Object | Test.java:228:41:228:70 | next(...) : Object | provenance | MaD:6 |
+| Test.java:228:41:228:63 | iterator(...) : Iterator [<element>] : Object | Test.java:228:41:228:70 | next(...) : Object | provenance | MaD:6 |
+| Test.java:228:41:228:63 | iterator(...) : Iterator [<element>] : Object | Test.java:228:41:228:70 | next(...) : Object | provenance | MaD:6 |
+| Test.java:228:41:228:63 | iterator(...) : Iterator [<element>] : Object | Test.java:228:41:228:70 | next(...) : Object | provenance | MaD:6 |
+| Test.java:228:41:228:63 | iterator(...) : Iterator [<element>] : Object | Test.java:228:41:228:70 | next(...) : Object | provenance | MaD:6 |
+| Test.java:228:41:228:63 | iterator(...) : Iterator [<element>] : Object | Test.java:228:41:228:70 | next(...) : Object | provenance | MaD:6 |
+| Test.java:228:41:228:63 | iterator(...) : Iterator [<element>] : Object | Test.java:228:41:228:70 | next(...) : Object | provenance | MaD:6 |
+| Test.java:228:41:228:63 | iterator(...) : Iterator [<element>] : Object | Test.java:228:41:228:70 | next(...) : Object | provenance | MaD:6 |
+| Test.java:228:41:228:63 | iterator(...) : Iterator [<element>] : String | Test.java:228:41:228:70 | next(...) : String | provenance | MaD:6 |
+| Test.java:228:41:228:63 | iterator(...) : Iterator [<element>] : String | Test.java:228:41:228:70 | next(...) : String | provenance | MaD:6 |
+| Test.java:228:41:228:63 | iterator(...) : Iterator [<element>] : String | Test.java:228:41:228:70 | next(...) : String | provenance | MaD:6 |
+| Test.java:228:41:228:63 | iterator(...) : Iterator [<element>] : String | Test.java:228:41:228:70 | next(...) : String | provenance | MaD:6 |
+| Test.java:228:41:228:63 | iterator(...) : Iterator [<element>] : String | Test.java:228:41:228:70 | next(...) : String | provenance | MaD:6 |
+| Test.java:228:41:228:63 | iterator(...) : Iterator [<element>] : String | Test.java:228:41:228:70 | next(...) : String | provenance | MaD:6 |
+| Test.java:228:41:228:63 | iterator(...) : Iterator [<element>] : String | Test.java:228:41:228:70 | next(...) : String | provenance | MaD:6 |
+| Test.java:228:41:228:63 | iterator(...) : Iterator [<element>] : String | Test.java:228:41:228:70 | next(...) : String | provenance | MaD:6 |
+| Test.java:228:41:228:63 | iterator(...) : Iterator [<element>] : String | Test.java:228:41:228:70 | next(...) : String | provenance | MaD:6 |
+| Test.java:228:41:228:63 | iterator(...) : Iterator [<element>] : String | Test.java:228:41:228:70 | next(...) : String | provenance | MaD:6 |
+| Test.java:228:41:228:63 | iterator(...) : Iterator [<element>] : String | Test.java:228:41:228:70 | next(...) : String | provenance | MaD:6 |
+| Test.java:228:41:228:63 | iterator(...) : Iterator [<element>] : String | Test.java:228:41:228:70 | next(...) : String | provenance | MaD:6 |
+| Test.java:228:41:228:63 | iterator(...) : Iterator [<element>] : String | Test.java:228:41:228:70 | next(...) : String | provenance | MaD:6 |
+| Test.java:228:41:228:63 | iterator(...) : Iterator [<element>] : String | Test.java:228:41:228:70 | next(...) : String | provenance | MaD:6 |
+| Test.java:228:41:228:63 | iterator(...) : Iterator [<element>] : String | Test.java:228:41:228:70 | next(...) : String | provenance | MaD:6 |
+| Test.java:228:41:228:63 | iterator(...) : Iterator [<element>] : String | Test.java:228:41:228:70 | next(...) : String | provenance | MaD:6 |
+| Test.java:228:41:228:63 | iterator(...) : Iterator [<element>] : String | Test.java:228:41:228:70 | next(...) : String | provenance | MaD:6 |
+| Test.java:228:41:228:63 | iterator(...) : Iterator [<element>] : String | Test.java:228:41:228:70 | next(...) : String | provenance | MaD:6 |
+| Test.java:228:41:228:63 | iterator(...) : Iterator [<element>] : String | Test.java:228:41:228:70 | next(...) : String | provenance | MaD:6 |
+| Test.java:228:41:228:63 | iterator(...) : Iterator [<element>] : String | Test.java:228:41:228:70 | next(...) : String | provenance | MaD:6 |
+| Test.java:228:41:228:63 | iterator(...) : Iterator [<element>] : String | Test.java:228:41:228:70 | next(...) : String | provenance | MaD:6 |
+| Test.java:228:41:228:63 | iterator(...) : Iterator [<element>] : String | Test.java:228:41:228:70 | next(...) : String | provenance | MaD:6 |
+| Test.java:228:41:228:63 | iterator(...) : Iterator [<element>] : String | Test.java:228:41:228:70 | next(...) : String | provenance | MaD:6 |
+| Test.java:228:41:228:63 | iterator(...) : Iterator [<element>] : String | Test.java:228:41:228:70 | next(...) : String | provenance | MaD:6 |
+| Test.java:228:41:228:63 | iterator(...) : Iterator [<element>] : String | Test.java:228:41:228:70 | next(...) : String | provenance | MaD:6 |
+| Test.java:228:41:228:63 | iterator(...) : Iterator [<element>] : String | Test.java:228:41:228:70 | next(...) : String | provenance | MaD:6 |
+| Test.java:228:41:228:63 | iterator(...) : Iterator [<element>] : String | Test.java:228:41:228:70 | next(...) : String | provenance | MaD:6 |
+| Test.java:228:41:228:63 | iterator(...) : Iterator [<element>] : String | Test.java:228:41:228:70 | next(...) : String | provenance | MaD:6 |
+| Test.java:228:41:228:63 | iterator(...) : Iterator [<element>] : String | Test.java:228:41:228:70 | next(...) : String | provenance | MaD:6 |
+| Test.java:228:41:228:63 | iterator(...) : Iterator [<element>] : String | Test.java:228:41:228:70 | next(...) : String | provenance | MaD:6 |
+| Test.java:228:41:228:63 | iterator(...) : Iterator [<element>] : String | Test.java:228:41:228:70 | next(...) : String | provenance | MaD:6 |
+| Test.java:228:41:228:63 | iterator(...) : Iterator [<element>] : String | Test.java:228:41:228:70 | next(...) : String | provenance | MaD:6 |
+| Test.java:228:41:228:63 | iterator(...) : Iterator [<element>] : String | Test.java:228:41:228:70 | next(...) : String | provenance | MaD:6 |
+| Test.java:228:41:228:63 | iterator(...) : Iterator [<element>] : String | Test.java:228:41:228:70 | next(...) : String | provenance | MaD:6 |
+| Test.java:228:41:228:63 | iterator(...) : Iterator [<element>] : String | Test.java:228:41:228:70 | next(...) : String | provenance | MaD:6 |
+| Test.java:228:41:228:63 | iterator(...) : Iterator [<element>] : String | Test.java:228:41:228:70 | next(...) : String | provenance | MaD:6 |
+| Test.java:228:41:228:63 | iterator(...) : Iterator [<element>] : String | Test.java:228:41:228:70 | next(...) : String | provenance | MaD:6 |
+| Test.java:228:41:228:63 | iterator(...) : Iterator [<element>] : String | Test.java:228:41:228:70 | next(...) : String | provenance | MaD:6 |
+| Test.java:228:41:228:63 | iterator(...) : Iterator [<element>] : String | Test.java:228:41:228:70 | next(...) : String | provenance | MaD:6 |
+| Test.java:228:41:228:63 | iterator(...) : Iterator [<element>] : String | Test.java:228:41:228:70 | next(...) : String | provenance | MaD:6 |
+| Test.java:228:41:228:63 | iterator(...) : Iterator [<element>] : String | Test.java:228:41:228:70 | next(...) : String | provenance | MaD:6 |
+| Test.java:228:41:228:63 | iterator(...) : Iterator [<element>] : String | Test.java:228:41:228:70 | next(...) : String | provenance | MaD:6 |
+| Test.java:228:41:228:63 | iterator(...) : Iterator [<element>] : String | Test.java:228:41:228:70 | next(...) : String | provenance | MaD:6 |
+| Test.java:228:41:228:63 | iterator(...) : Iterator [<element>] : String | Test.java:228:41:228:70 | next(...) : String | provenance | MaD:6 |
 | Test.java:229:24:229:32 | array : Object[] [[]] : String | Test.java:229:44:229:48 | array : Object[] [[]] : String | provenance |  |
 | Test.java:229:24:229:32 | array : String[] [[]] : String | Test.java:229:44:229:48 | array : String[] [[]] : String | provenance |  |
 | Test.java:229:44:229:48 | array : Object[] [[]] : String | Test.java:229:44:229:51 | ...[...] : String | provenance |  |
@@ -1123,176 +1123,176 @@ edges
 | Test.java:230:19:230:32 | it : TreeBag [<element>] : String | Test.java:230:44:230:45 | it : TreeBag [<element>] : String | provenance |  |
 | Test.java:230:19:230:32 | it : TreeList [<element>] : String | Test.java:230:44:230:45 | it : TreeList [<element>] : String | provenance |  |
 | Test.java:230:19:230:32 | it : UnmodifiableList [<element>] : String | Test.java:230:44:230:45 | it : UnmodifiableList [<element>] : String | provenance |  |
-| Test.java:230:44:230:45 | it : AbstractLinkedList [<element>] : Object | Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:1 |
-| Test.java:230:44:230:45 | it : ArrayStack [<element>] : Object | Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:1 |
-| Test.java:230:44:230:45 | it : Bag [<element>] : Object | Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:1 |
-| Test.java:230:44:230:45 | it : Bag [<element>] : String | Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : String | provenance | MaD:1 |
-| Test.java:230:44:230:45 | it : BoundedCollection [<element>] : String | Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : String | provenance | MaD:1 |
-| Test.java:230:44:230:45 | it : CircularFifoQueue [<element>] : String | Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : String | provenance | MaD:1 |
-| Test.java:230:44:230:45 | it : Collection | Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:1 |
-| Test.java:230:44:230:45 | it : Collection [<element>, <element>] : String | Test.java:230:44:230:56 | iterator(...) : Iterator [<element>, <element>] : String | provenance | MaD:1 |
-| Test.java:230:44:230:45 | it : Collection [<element>, <map.key>] : String | Test.java:230:44:230:56 | iterator(...) : Iterator [<element>, <map.key>] : String | provenance | MaD:1 |
-| Test.java:230:44:230:45 | it : Collection [<element>, <map.value>] : String | Test.java:230:44:230:56 | iterator(...) : Iterator [<element>, <map.value>] : String | provenance | MaD:1 |
-| Test.java:230:44:230:45 | it : Collection [<element>] : Object | Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:1 |
-| Test.java:230:44:230:45 | it : Collection [<element>] : String | Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : String | provenance | MaD:1 |
-| Test.java:230:44:230:45 | it : CollectionBag [<element>] : String | Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : String | provenance | MaD:1 |
-| Test.java:230:44:230:45 | it : CollectionSortedBag [<element>] : String | Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : String | provenance | MaD:1 |
-| Test.java:230:44:230:45 | it : CompositeCollection [<element>] : Object | Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:1 |
-| Test.java:230:44:230:45 | it : CompositeCollection [<element>] : String | Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : String | provenance | MaD:1 |
-| Test.java:230:44:230:45 | it : CompositeSet [<element>] : Object | Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:1 |
-| Test.java:230:44:230:45 | it : CompositeSet [<element>] : String | Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : String | provenance | MaD:1 |
-| Test.java:230:44:230:45 | it : CursorableLinkedList [<element>] : String | Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : String | provenance | MaD:1 |
-| Test.java:230:44:230:45 | it : FixedSizeList [<element>] : String | Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : String | provenance | MaD:1 |
-| Test.java:230:44:230:45 | it : FluentIterable [<element>] : Object | Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:1 |
-| Test.java:230:44:230:45 | it : FluentIterable [<element>] : String | Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : String | provenance | MaD:1 |
-| Test.java:230:44:230:45 | it : GrowthList [<element>] : String | Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : String | provenance | MaD:1 |
-| Test.java:230:44:230:45 | it : HashBag [<element>] : String | Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : String | provenance | MaD:1 |
-| Test.java:230:44:230:45 | it : HashMultiSet [<element>] : String | Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : String | provenance | MaD:1 |
-| Test.java:230:44:230:45 | it : HashSet [<element>] : Object | Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:1 |
-| Test.java:230:44:230:45 | it : IndexedCollection [<element>] : String | Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : String | provenance | MaD:1 |
-| Test.java:230:44:230:45 | it : Iterable [<element>] : String | Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : String | provenance | MaD:1 |
-| Test.java:230:44:230:45 | it : IteratorIterable [<element>] : String | Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : String | provenance | MaD:1 |
-| Test.java:230:44:230:45 | it : LazyList [<element>] : String | Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : String | provenance | MaD:1 |
-| Test.java:230:44:230:45 | it : List [<element>, <element>] : Object | Test.java:230:44:230:56 | iterator(...) : Iterator [<element>, <element>] : Object | provenance | MaD:1 |
-| Test.java:230:44:230:45 | it : List [<element>, <element>] : String | Test.java:230:44:230:56 | iterator(...) : Iterator [<element>, <element>] : String | provenance | MaD:1 |
-| Test.java:230:44:230:45 | it : List [<element>] : Object | Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:1 |
-| Test.java:230:44:230:45 | it : List [<element>] : String | Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : String | provenance | MaD:1 |
-| Test.java:230:44:230:45 | it : ListOrderedSet [<element>] : Object | Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:1 |
-| Test.java:230:44:230:45 | it : ListOrderedSet [<element>] : String | Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : String | provenance | MaD:1 |
-| Test.java:230:44:230:45 | it : MapBackedSet [<element>] : String | Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : String | provenance | MaD:1 |
-| Test.java:230:44:230:45 | it : MultiSet [<element>] : Object | Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:1 |
-| Test.java:230:44:230:45 | it : MultiSet [<element>] : String | Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : String | provenance | MaD:1 |
-| Test.java:230:44:230:45 | it : MyAbstractBagDecorator [<element>] : String | Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : String | provenance | MaD:1 |
-| Test.java:230:44:230:45 | it : MyAbstractCollectionDecorator [<element>] : String | Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : String | provenance | MaD:1 |
-| Test.java:230:44:230:45 | it : MyAbstractLinkedList [<element>] : String | Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : String | provenance | MaD:1 |
-| Test.java:230:44:230:45 | it : MyAbstractListDecorator [<element>] : String | Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : String | provenance | MaD:1 |
-| Test.java:230:44:230:45 | it : MyAbstractMapBag [<element>] : String | Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : String | provenance | MaD:1 |
-| Test.java:230:44:230:45 | it : MyAbstractNavigableSetDecorator [<element>] : String | Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : String | provenance | MaD:1 |
-| Test.java:230:44:230:45 | it : MyAbstractSerializableListDecorator [<element>] : String | Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : String | provenance | MaD:1 |
-| Test.java:230:44:230:45 | it : MyAbstractSetDecorator [<element>] : String | Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : String | provenance | MaD:1 |
-| Test.java:230:44:230:45 | it : MyAbstractSortedBagDecorator [<element>] : String | Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : String | provenance | MaD:1 |
-| Test.java:230:44:230:45 | it : MyAbstractSortedSetDecorator [<element>] : String | Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : String | provenance | MaD:1 |
-| Test.java:230:44:230:45 | it : NavigableSet [<element>] : String | Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : String | provenance | MaD:1 |
-| Test.java:230:44:230:45 | it : NodeCachingLinkedList [<element>] : String | Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : String | provenance | MaD:1 |
-| Test.java:230:44:230:45 | it : PredicatedBag [<element>] : String | Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : String | provenance | MaD:1 |
-| Test.java:230:44:230:45 | it : PredicatedCollection [<element>] : String | Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : String | provenance | MaD:1 |
-| Test.java:230:44:230:45 | it : PredicatedList [<element>] : String | Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : String | provenance | MaD:1 |
-| Test.java:230:44:230:45 | it : PredicatedMultiSet [<element>] : String | Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : String | provenance | MaD:1 |
-| Test.java:230:44:230:45 | it : PredicatedNavigableSet [<element>] : String | Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : String | provenance | MaD:1 |
-| Test.java:230:44:230:45 | it : PredicatedQueue [<element>] : String | Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : String | provenance | MaD:1 |
-| Test.java:230:44:230:45 | it : PredicatedSet [<element>] : String | Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : String | provenance | MaD:1 |
-| Test.java:230:44:230:45 | it : PredicatedSortedBag [<element>] : String | Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : String | provenance | MaD:1 |
-| Test.java:230:44:230:45 | it : PredicatedSortedSet [<element>] : String | Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : String | provenance | MaD:1 |
-| Test.java:230:44:230:45 | it : Queue [<element>] : String | Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : String | provenance | MaD:1 |
-| Test.java:230:44:230:45 | it : Set [<element>, <element>] : String | Test.java:230:44:230:56 | iterator(...) : Iterator [<element>, <element>] : String | provenance | MaD:1 |
-| Test.java:230:44:230:45 | it : Set [<element>, <map.key>] : String | Test.java:230:44:230:56 | iterator(...) : Iterator [<element>, <map.key>] : String | provenance | MaD:1 |
-| Test.java:230:44:230:45 | it : Set [<element>, <map.value>] : String | Test.java:230:44:230:56 | iterator(...) : Iterator [<element>, <map.value>] : String | provenance | MaD:1 |
-| Test.java:230:44:230:45 | it : Set [<element>] : Object | Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:1 |
-| Test.java:230:44:230:45 | it : Set [<element>] : String | Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : String | provenance | MaD:1 |
-| Test.java:230:44:230:45 | it : SetUniqueList [<element>] : String | Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : String | provenance | MaD:1 |
-| Test.java:230:44:230:45 | it : SetView [<element>] : String | Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : String | provenance | MaD:1 |
-| Test.java:230:44:230:45 | it : SortedBag [<element>] : String | Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : String | provenance | MaD:1 |
-| Test.java:230:44:230:45 | it : SortedSet [<element>] : String | Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : String | provenance | MaD:1 |
-| Test.java:230:44:230:45 | it : SynchronizedBag [<element>] : String | Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : String | provenance | MaD:1 |
-| Test.java:230:44:230:45 | it : SynchronizedCollection [<element>] : String | Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : String | provenance | MaD:1 |
-| Test.java:230:44:230:45 | it : SynchronizedMultiSet [<element>] : String | Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : String | provenance | MaD:1 |
-| Test.java:230:44:230:45 | it : SynchronizedQueue [<element>] : String | Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : String | provenance | MaD:1 |
-| Test.java:230:44:230:45 | it : SynchronizedSortedBag [<element>] : String | Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : String | provenance | MaD:1 |
-| Test.java:230:44:230:45 | it : TransformedCollection [<element>] : String | Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : String | provenance | MaD:1 |
-| Test.java:230:44:230:45 | it : TransformedList [<element>] : String | Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : String | provenance | MaD:1 |
-| Test.java:230:44:230:45 | it : TransformedNavigableSet [<element>] : String | Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : String | provenance | MaD:1 |
-| Test.java:230:44:230:45 | it : TransformedQueue [<element>] : String | Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : String | provenance | MaD:1 |
-| Test.java:230:44:230:45 | it : TransformedSet [<element>] : String | Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : String | provenance | MaD:1 |
-| Test.java:230:44:230:45 | it : TransformedSortedBag [<element>] : String | Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : String | provenance | MaD:1 |
-| Test.java:230:44:230:45 | it : TransformedSortedSet [<element>] : String | Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : String | provenance | MaD:1 |
-| Test.java:230:44:230:45 | it : TreeBag [<element>] : String | Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : String | provenance | MaD:1 |
-| Test.java:230:44:230:45 | it : TreeList [<element>] : String | Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : String | provenance | MaD:1 |
-| Test.java:230:44:230:45 | it : UnmodifiableList [<element>] : String | Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : String | provenance | MaD:1 |
-| Test.java:230:44:230:56 | iterator(...) : Iterator [<element>, <element>] : Object | Test.java:230:44:230:63 | next(...) : Object [<element>] : Object | provenance | MaD:4 |
-| Test.java:230:44:230:56 | iterator(...) : Iterator [<element>, <element>] : String | Test.java:230:44:230:63 | next(...) : Object [<element>] : String | provenance | MaD:4 |
-| Test.java:230:44:230:56 | iterator(...) : Iterator [<element>, <element>] : String | Test.java:230:44:230:63 | next(...) : Object [<element>] : String | provenance | MaD:4 |
-| Test.java:230:44:230:56 | iterator(...) : Iterator [<element>, <element>] : String | Test.java:230:44:230:63 | next(...) : Object [<element>] : String | provenance | MaD:4 |
-| Test.java:230:44:230:56 | iterator(...) : Iterator [<element>, <map.key>] : String | Test.java:230:44:230:63 | next(...) : Object [<map.key>] : String | provenance | MaD:4 |
-| Test.java:230:44:230:56 | iterator(...) : Iterator [<element>, <map.key>] : String | Test.java:230:44:230:63 | next(...) : Object [<map.key>] : String | provenance | MaD:4 |
-| Test.java:230:44:230:56 | iterator(...) : Iterator [<element>, <map.value>] : String | Test.java:230:44:230:63 | next(...) : Object [<map.value>] : String | provenance | MaD:4 |
-| Test.java:230:44:230:56 | iterator(...) : Iterator [<element>, <map.value>] : String | Test.java:230:44:230:63 | next(...) : Object [<map.value>] : String | provenance | MaD:4 |
-| Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : Object | Test.java:230:44:230:63 | next(...) : Object | provenance | MaD:4 |
-| Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : Object | Test.java:230:44:230:63 | next(...) : Object | provenance | MaD:4 |
-| Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : Object | Test.java:230:44:230:63 | next(...) : Object | provenance | MaD:4 |
-| Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : Object | Test.java:230:44:230:63 | next(...) : Object | provenance | MaD:4 |
-| Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : Object | Test.java:230:44:230:63 | next(...) : Object | provenance | MaD:4 |
-| Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : Object | Test.java:230:44:230:63 | next(...) : Object | provenance | MaD:4 |
-| Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : Object | Test.java:230:44:230:63 | next(...) : Object | provenance | MaD:4 |
-| Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : Object | Test.java:230:44:230:63 | next(...) : Object | provenance | MaD:4 |
-| Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : Object | Test.java:230:44:230:63 | next(...) : Object | provenance | MaD:4 |
-| Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : Object | Test.java:230:44:230:63 | next(...) : Object | provenance | MaD:4 |
-| Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : Object | Test.java:230:44:230:63 | next(...) : Object | provenance | MaD:4 |
-| Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : Object | Test.java:230:44:230:63 | next(...) : Object | provenance | MaD:4 |
-| Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : Object | Test.java:230:44:230:63 | next(...) : Object | provenance | MaD:4 |
-| Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : String | Test.java:230:44:230:63 | next(...) : String | provenance | MaD:4 |
-| Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : String | Test.java:230:44:230:63 | next(...) : String | provenance | MaD:4 |
-| Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : String | Test.java:230:44:230:63 | next(...) : String | provenance | MaD:4 |
-| Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : String | Test.java:230:44:230:63 | next(...) : String | provenance | MaD:4 |
-| Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : String | Test.java:230:44:230:63 | next(...) : String | provenance | MaD:4 |
-| Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : String | Test.java:230:44:230:63 | next(...) : String | provenance | MaD:4 |
-| Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : String | Test.java:230:44:230:63 | next(...) : String | provenance | MaD:4 |
-| Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : String | Test.java:230:44:230:63 | next(...) : String | provenance | MaD:4 |
-| Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : String | Test.java:230:44:230:63 | next(...) : String | provenance | MaD:4 |
-| Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : String | Test.java:230:44:230:63 | next(...) : String | provenance | MaD:4 |
-| Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : String | Test.java:230:44:230:63 | next(...) : String | provenance | MaD:4 |
-| Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : String | Test.java:230:44:230:63 | next(...) : String | provenance | MaD:4 |
-| Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : String | Test.java:230:44:230:63 | next(...) : String | provenance | MaD:4 |
-| Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : String | Test.java:230:44:230:63 | next(...) : String | provenance | MaD:4 |
-| Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : String | Test.java:230:44:230:63 | next(...) : String | provenance | MaD:4 |
-| Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : String | Test.java:230:44:230:63 | next(...) : String | provenance | MaD:4 |
-| Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : String | Test.java:230:44:230:63 | next(...) : String | provenance | MaD:4 |
-| Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : String | Test.java:230:44:230:63 | next(...) : String | provenance | MaD:4 |
-| Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : String | Test.java:230:44:230:63 | next(...) : String | provenance | MaD:4 |
-| Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : String | Test.java:230:44:230:63 | next(...) : String | provenance | MaD:4 |
-| Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : String | Test.java:230:44:230:63 | next(...) : String | provenance | MaD:4 |
-| Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : String | Test.java:230:44:230:63 | next(...) : String | provenance | MaD:4 |
-| Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : String | Test.java:230:44:230:63 | next(...) : String | provenance | MaD:4 |
-| Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : String | Test.java:230:44:230:63 | next(...) : String | provenance | MaD:4 |
-| Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : String | Test.java:230:44:230:63 | next(...) : String | provenance | MaD:4 |
-| Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : String | Test.java:230:44:230:63 | next(...) : String | provenance | MaD:4 |
-| Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : String | Test.java:230:44:230:63 | next(...) : String | provenance | MaD:4 |
-| Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : String | Test.java:230:44:230:63 | next(...) : String | provenance | MaD:4 |
-| Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : String | Test.java:230:44:230:63 | next(...) : String | provenance | MaD:4 |
-| Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : String | Test.java:230:44:230:63 | next(...) : String | provenance | MaD:4 |
-| Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : String | Test.java:230:44:230:63 | next(...) : String | provenance | MaD:4 |
-| Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : String | Test.java:230:44:230:63 | next(...) : String | provenance | MaD:4 |
-| Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : String | Test.java:230:44:230:63 | next(...) : String | provenance | MaD:4 |
-| Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : String | Test.java:230:44:230:63 | next(...) : String | provenance | MaD:4 |
-| Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : String | Test.java:230:44:230:63 | next(...) : String | provenance | MaD:4 |
-| Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : String | Test.java:230:44:230:63 | next(...) : String | provenance | MaD:4 |
-| Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : String | Test.java:230:44:230:63 | next(...) : String | provenance | MaD:4 |
-| Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : String | Test.java:230:44:230:63 | next(...) : String | provenance | MaD:4 |
-| Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : String | Test.java:230:44:230:63 | next(...) : String | provenance | MaD:4 |
-| Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : String | Test.java:230:44:230:63 | next(...) : String | provenance | MaD:4 |
-| Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : String | Test.java:230:44:230:63 | next(...) : String | provenance | MaD:4 |
-| Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : String | Test.java:230:44:230:63 | next(...) : String | provenance | MaD:4 |
-| Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : String | Test.java:230:44:230:63 | next(...) : String | provenance | MaD:4 |
-| Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : String | Test.java:230:44:230:63 | next(...) : String | provenance | MaD:4 |
-| Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : String | Test.java:230:44:230:63 | next(...) : String | provenance | MaD:4 |
-| Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : String | Test.java:230:44:230:63 | next(...) : String | provenance | MaD:4 |
-| Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : String | Test.java:230:44:230:63 | next(...) : String | provenance | MaD:4 |
-| Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : String | Test.java:230:44:230:63 | next(...) : String | provenance | MaD:4 |
-| Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : String | Test.java:230:44:230:63 | next(...) : String | provenance | MaD:4 |
-| Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : String | Test.java:230:44:230:63 | next(...) : String | provenance | MaD:4 |
-| Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : String | Test.java:230:44:230:63 | next(...) : String | provenance | MaD:4 |
-| Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : String | Test.java:230:44:230:63 | next(...) : String | provenance | MaD:4 |
-| Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : String | Test.java:230:44:230:63 | next(...) : String | provenance | MaD:4 |
-| Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : String | Test.java:230:44:230:63 | next(...) : String | provenance | MaD:4 |
-| Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : String | Test.java:230:44:230:63 | next(...) : String | provenance | MaD:4 |
-| Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : String | Test.java:230:44:230:63 | next(...) : String | provenance | MaD:4 |
-| Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : String | Test.java:230:44:230:63 | next(...) : String | provenance | MaD:4 |
-| Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : String | Test.java:230:44:230:63 | next(...) : String | provenance | MaD:4 |
-| Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : String | Test.java:230:44:230:63 | next(...) : String | provenance | MaD:4 |
-| Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : String | Test.java:230:44:230:63 | next(...) : String | provenance | MaD:4 |
-| Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : String | Test.java:230:44:230:63 | next(...) : String | provenance | MaD:4 |
-| Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : String | Test.java:230:44:230:63 | next(...) : String | provenance | MaD:4 |
-| Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : String | Test.java:230:44:230:63 | next(...) : String | provenance | MaD:4 |
-| Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : String | Test.java:230:44:230:63 | next(...) : String | provenance | MaD:4 |
+| Test.java:230:44:230:45 | it : AbstractLinkedList [<element>] : Object | Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:3 |
+| Test.java:230:44:230:45 | it : ArrayStack [<element>] : Object | Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:3 |
+| Test.java:230:44:230:45 | it : Bag [<element>] : Object | Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:3 |
+| Test.java:230:44:230:45 | it : Bag [<element>] : String | Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : String | provenance | MaD:3 |
+| Test.java:230:44:230:45 | it : BoundedCollection [<element>] : String | Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : String | provenance | MaD:3 |
+| Test.java:230:44:230:45 | it : CircularFifoQueue [<element>] : String | Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : String | provenance | MaD:3 |
+| Test.java:230:44:230:45 | it : Collection | Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:3 |
+| Test.java:230:44:230:45 | it : Collection [<element>, <element>] : String | Test.java:230:44:230:56 | iterator(...) : Iterator [<element>, <element>] : String | provenance | MaD:3 |
+| Test.java:230:44:230:45 | it : Collection [<element>, <map.key>] : String | Test.java:230:44:230:56 | iterator(...) : Iterator [<element>, <map.key>] : String | provenance | MaD:3 |
+| Test.java:230:44:230:45 | it : Collection [<element>, <map.value>] : String | Test.java:230:44:230:56 | iterator(...) : Iterator [<element>, <map.value>] : String | provenance | MaD:3 |
+| Test.java:230:44:230:45 | it : Collection [<element>] : Object | Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:3 |
+| Test.java:230:44:230:45 | it : Collection [<element>] : String | Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : String | provenance | MaD:3 |
+| Test.java:230:44:230:45 | it : CollectionBag [<element>] : String | Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : String | provenance | MaD:3 |
+| Test.java:230:44:230:45 | it : CollectionSortedBag [<element>] : String | Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : String | provenance | MaD:3 |
+| Test.java:230:44:230:45 | it : CompositeCollection [<element>] : Object | Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:3 |
+| Test.java:230:44:230:45 | it : CompositeCollection [<element>] : String | Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : String | provenance | MaD:3 |
+| Test.java:230:44:230:45 | it : CompositeSet [<element>] : Object | Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:3 |
+| Test.java:230:44:230:45 | it : CompositeSet [<element>] : String | Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : String | provenance | MaD:3 |
+| Test.java:230:44:230:45 | it : CursorableLinkedList [<element>] : String | Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : String | provenance | MaD:3 |
+| Test.java:230:44:230:45 | it : FixedSizeList [<element>] : String | Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : String | provenance | MaD:3 |
+| Test.java:230:44:230:45 | it : FluentIterable [<element>] : Object | Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:3 |
+| Test.java:230:44:230:45 | it : FluentIterable [<element>] : String | Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : String | provenance | MaD:3 |
+| Test.java:230:44:230:45 | it : GrowthList [<element>] : String | Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : String | provenance | MaD:3 |
+| Test.java:230:44:230:45 | it : HashBag [<element>] : String | Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : String | provenance | MaD:3 |
+| Test.java:230:44:230:45 | it : HashMultiSet [<element>] : String | Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : String | provenance | MaD:3 |
+| Test.java:230:44:230:45 | it : HashSet [<element>] : Object | Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:3 |
+| Test.java:230:44:230:45 | it : IndexedCollection [<element>] : String | Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : String | provenance | MaD:3 |
+| Test.java:230:44:230:45 | it : Iterable [<element>] : String | Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : String | provenance | MaD:3 |
+| Test.java:230:44:230:45 | it : IteratorIterable [<element>] : String | Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : String | provenance | MaD:3 |
+| Test.java:230:44:230:45 | it : LazyList [<element>] : String | Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : String | provenance | MaD:3 |
+| Test.java:230:44:230:45 | it : List [<element>, <element>] : Object | Test.java:230:44:230:56 | iterator(...) : Iterator [<element>, <element>] : Object | provenance | MaD:3 |
+| Test.java:230:44:230:45 | it : List [<element>, <element>] : String | Test.java:230:44:230:56 | iterator(...) : Iterator [<element>, <element>] : String | provenance | MaD:3 |
+| Test.java:230:44:230:45 | it : List [<element>] : Object | Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:3 |
+| Test.java:230:44:230:45 | it : List [<element>] : String | Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : String | provenance | MaD:3 |
+| Test.java:230:44:230:45 | it : ListOrderedSet [<element>] : Object | Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:3 |
+| Test.java:230:44:230:45 | it : ListOrderedSet [<element>] : String | Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : String | provenance | MaD:3 |
+| Test.java:230:44:230:45 | it : MapBackedSet [<element>] : String | Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : String | provenance | MaD:3 |
+| Test.java:230:44:230:45 | it : MultiSet [<element>] : Object | Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:3 |
+| Test.java:230:44:230:45 | it : MultiSet [<element>] : String | Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : String | provenance | MaD:3 |
+| Test.java:230:44:230:45 | it : MyAbstractBagDecorator [<element>] : String | Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : String | provenance | MaD:3 |
+| Test.java:230:44:230:45 | it : MyAbstractCollectionDecorator [<element>] : String | Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : String | provenance | MaD:3 |
+| Test.java:230:44:230:45 | it : MyAbstractLinkedList [<element>] : String | Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : String | provenance | MaD:3 |
+| Test.java:230:44:230:45 | it : MyAbstractListDecorator [<element>] : String | Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : String | provenance | MaD:3 |
+| Test.java:230:44:230:45 | it : MyAbstractMapBag [<element>] : String | Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : String | provenance | MaD:3 |
+| Test.java:230:44:230:45 | it : MyAbstractNavigableSetDecorator [<element>] : String | Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : String | provenance | MaD:3 |
+| Test.java:230:44:230:45 | it : MyAbstractSerializableListDecorator [<element>] : String | Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : String | provenance | MaD:3 |
+| Test.java:230:44:230:45 | it : MyAbstractSetDecorator [<element>] : String | Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : String | provenance | MaD:3 |
+| Test.java:230:44:230:45 | it : MyAbstractSortedBagDecorator [<element>] : String | Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : String | provenance | MaD:3 |
+| Test.java:230:44:230:45 | it : MyAbstractSortedSetDecorator [<element>] : String | Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : String | provenance | MaD:3 |
+| Test.java:230:44:230:45 | it : NavigableSet [<element>] : String | Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : String | provenance | MaD:3 |
+| Test.java:230:44:230:45 | it : NodeCachingLinkedList [<element>] : String | Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : String | provenance | MaD:3 |
+| Test.java:230:44:230:45 | it : PredicatedBag [<element>] : String | Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : String | provenance | MaD:3 |
+| Test.java:230:44:230:45 | it : PredicatedCollection [<element>] : String | Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : String | provenance | MaD:3 |
+| Test.java:230:44:230:45 | it : PredicatedList [<element>] : String | Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : String | provenance | MaD:3 |
+| Test.java:230:44:230:45 | it : PredicatedMultiSet [<element>] : String | Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : String | provenance | MaD:3 |
+| Test.java:230:44:230:45 | it : PredicatedNavigableSet [<element>] : String | Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : String | provenance | MaD:3 |
+| Test.java:230:44:230:45 | it : PredicatedQueue [<element>] : String | Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : String | provenance | MaD:3 |
+| Test.java:230:44:230:45 | it : PredicatedSet [<element>] : String | Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : String | provenance | MaD:3 |
+| Test.java:230:44:230:45 | it : PredicatedSortedBag [<element>] : String | Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : String | provenance | MaD:3 |
+| Test.java:230:44:230:45 | it : PredicatedSortedSet [<element>] : String | Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : String | provenance | MaD:3 |
+| Test.java:230:44:230:45 | it : Queue [<element>] : String | Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : String | provenance | MaD:3 |
+| Test.java:230:44:230:45 | it : Set [<element>, <element>] : String | Test.java:230:44:230:56 | iterator(...) : Iterator [<element>, <element>] : String | provenance | MaD:3 |
+| Test.java:230:44:230:45 | it : Set [<element>, <map.key>] : String | Test.java:230:44:230:56 | iterator(...) : Iterator [<element>, <map.key>] : String | provenance | MaD:3 |
+| Test.java:230:44:230:45 | it : Set [<element>, <map.value>] : String | Test.java:230:44:230:56 | iterator(...) : Iterator [<element>, <map.value>] : String | provenance | MaD:3 |
+| Test.java:230:44:230:45 | it : Set [<element>] : Object | Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:3 |
+| Test.java:230:44:230:45 | it : Set [<element>] : String | Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : String | provenance | MaD:3 |
+| Test.java:230:44:230:45 | it : SetUniqueList [<element>] : String | Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : String | provenance | MaD:3 |
+| Test.java:230:44:230:45 | it : SetView [<element>] : String | Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : String | provenance | MaD:3 |
+| Test.java:230:44:230:45 | it : SortedBag [<element>] : String | Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : String | provenance | MaD:3 |
+| Test.java:230:44:230:45 | it : SortedSet [<element>] : String | Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : String | provenance | MaD:3 |
+| Test.java:230:44:230:45 | it : SynchronizedBag [<element>] : String | Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : String | provenance | MaD:3 |
+| Test.java:230:44:230:45 | it : SynchronizedCollection [<element>] : String | Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : String | provenance | MaD:3 |
+| Test.java:230:44:230:45 | it : SynchronizedMultiSet [<element>] : String | Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : String | provenance | MaD:3 |
+| Test.java:230:44:230:45 | it : SynchronizedQueue [<element>] : String | Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : String | provenance | MaD:3 |
+| Test.java:230:44:230:45 | it : SynchronizedSortedBag [<element>] : String | Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : String | provenance | MaD:3 |
+| Test.java:230:44:230:45 | it : TransformedCollection [<element>] : String | Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : String | provenance | MaD:3 |
+| Test.java:230:44:230:45 | it : TransformedList [<element>] : String | Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : String | provenance | MaD:3 |
+| Test.java:230:44:230:45 | it : TransformedNavigableSet [<element>] : String | Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : String | provenance | MaD:3 |
+| Test.java:230:44:230:45 | it : TransformedQueue [<element>] : String | Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : String | provenance | MaD:3 |
+| Test.java:230:44:230:45 | it : TransformedSet [<element>] : String | Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : String | provenance | MaD:3 |
+| Test.java:230:44:230:45 | it : TransformedSortedBag [<element>] : String | Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : String | provenance | MaD:3 |
+| Test.java:230:44:230:45 | it : TransformedSortedSet [<element>] : String | Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : String | provenance | MaD:3 |
+| Test.java:230:44:230:45 | it : TreeBag [<element>] : String | Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : String | provenance | MaD:3 |
+| Test.java:230:44:230:45 | it : TreeList [<element>] : String | Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : String | provenance | MaD:3 |
+| Test.java:230:44:230:45 | it : UnmodifiableList [<element>] : String | Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : String | provenance | MaD:3 |
+| Test.java:230:44:230:56 | iterator(...) : Iterator [<element>, <element>] : Object | Test.java:230:44:230:63 | next(...) : Object [<element>] : Object | provenance | MaD:6 |
+| Test.java:230:44:230:56 | iterator(...) : Iterator [<element>, <element>] : String | Test.java:230:44:230:63 | next(...) : Object [<element>] : String | provenance | MaD:6 |
+| Test.java:230:44:230:56 | iterator(...) : Iterator [<element>, <element>] : String | Test.java:230:44:230:63 | next(...) : Object [<element>] : String | provenance | MaD:6 |
+| Test.java:230:44:230:56 | iterator(...) : Iterator [<element>, <element>] : String | Test.java:230:44:230:63 | next(...) : Object [<element>] : String | provenance | MaD:6 |
+| Test.java:230:44:230:56 | iterator(...) : Iterator [<element>, <map.key>] : String | Test.java:230:44:230:63 | next(...) : Object [<map.key>] : String | provenance | MaD:6 |
+| Test.java:230:44:230:56 | iterator(...) : Iterator [<element>, <map.key>] : String | Test.java:230:44:230:63 | next(...) : Object [<map.key>] : String | provenance | MaD:6 |
+| Test.java:230:44:230:56 | iterator(...) : Iterator [<element>, <map.value>] : String | Test.java:230:44:230:63 | next(...) : Object [<map.value>] : String | provenance | MaD:6 |
+| Test.java:230:44:230:56 | iterator(...) : Iterator [<element>, <map.value>] : String | Test.java:230:44:230:63 | next(...) : Object [<map.value>] : String | provenance | MaD:6 |
+| Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : Object | Test.java:230:44:230:63 | next(...) : Object | provenance | MaD:6 |
+| Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : Object | Test.java:230:44:230:63 | next(...) : Object | provenance | MaD:6 |
+| Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : Object | Test.java:230:44:230:63 | next(...) : Object | provenance | MaD:6 |
+| Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : Object | Test.java:230:44:230:63 | next(...) : Object | provenance | MaD:6 |
+| Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : Object | Test.java:230:44:230:63 | next(...) : Object | provenance | MaD:6 |
+| Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : Object | Test.java:230:44:230:63 | next(...) : Object | provenance | MaD:6 |
+| Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : Object | Test.java:230:44:230:63 | next(...) : Object | provenance | MaD:6 |
+| Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : Object | Test.java:230:44:230:63 | next(...) : Object | provenance | MaD:6 |
+| Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : Object | Test.java:230:44:230:63 | next(...) : Object | provenance | MaD:6 |
+| Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : Object | Test.java:230:44:230:63 | next(...) : Object | provenance | MaD:6 |
+| Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : Object | Test.java:230:44:230:63 | next(...) : Object | provenance | MaD:6 |
+| Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : Object | Test.java:230:44:230:63 | next(...) : Object | provenance | MaD:6 |
+| Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : Object | Test.java:230:44:230:63 | next(...) : Object | provenance | MaD:6 |
+| Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : String | Test.java:230:44:230:63 | next(...) : String | provenance | MaD:6 |
+| Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : String | Test.java:230:44:230:63 | next(...) : String | provenance | MaD:6 |
+| Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : String | Test.java:230:44:230:63 | next(...) : String | provenance | MaD:6 |
+| Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : String | Test.java:230:44:230:63 | next(...) : String | provenance | MaD:6 |
+| Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : String | Test.java:230:44:230:63 | next(...) : String | provenance | MaD:6 |
+| Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : String | Test.java:230:44:230:63 | next(...) : String | provenance | MaD:6 |
+| Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : String | Test.java:230:44:230:63 | next(...) : String | provenance | MaD:6 |
+| Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : String | Test.java:230:44:230:63 | next(...) : String | provenance | MaD:6 |
+| Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : String | Test.java:230:44:230:63 | next(...) : String | provenance | MaD:6 |
+| Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : String | Test.java:230:44:230:63 | next(...) : String | provenance | MaD:6 |
+| Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : String | Test.java:230:44:230:63 | next(...) : String | provenance | MaD:6 |
+| Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : String | Test.java:230:44:230:63 | next(...) : String | provenance | MaD:6 |
+| Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : String | Test.java:230:44:230:63 | next(...) : String | provenance | MaD:6 |
+| Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : String | Test.java:230:44:230:63 | next(...) : String | provenance | MaD:6 |
+| Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : String | Test.java:230:44:230:63 | next(...) : String | provenance | MaD:6 |
+| Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : String | Test.java:230:44:230:63 | next(...) : String | provenance | MaD:6 |
+| Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : String | Test.java:230:44:230:63 | next(...) : String | provenance | MaD:6 |
+| Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : String | Test.java:230:44:230:63 | next(...) : String | provenance | MaD:6 |
+| Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : String | Test.java:230:44:230:63 | next(...) : String | provenance | MaD:6 |
+| Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : String | Test.java:230:44:230:63 | next(...) : String | provenance | MaD:6 |
+| Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : String | Test.java:230:44:230:63 | next(...) : String | provenance | MaD:6 |
+| Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : String | Test.java:230:44:230:63 | next(...) : String | provenance | MaD:6 |
+| Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : String | Test.java:230:44:230:63 | next(...) : String | provenance | MaD:6 |
+| Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : String | Test.java:230:44:230:63 | next(...) : String | provenance | MaD:6 |
+| Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : String | Test.java:230:44:230:63 | next(...) : String | provenance | MaD:6 |
+| Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : String | Test.java:230:44:230:63 | next(...) : String | provenance | MaD:6 |
+| Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : String | Test.java:230:44:230:63 | next(...) : String | provenance | MaD:6 |
+| Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : String | Test.java:230:44:230:63 | next(...) : String | provenance | MaD:6 |
+| Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : String | Test.java:230:44:230:63 | next(...) : String | provenance | MaD:6 |
+| Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : String | Test.java:230:44:230:63 | next(...) : String | provenance | MaD:6 |
+| Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : String | Test.java:230:44:230:63 | next(...) : String | provenance | MaD:6 |
+| Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : String | Test.java:230:44:230:63 | next(...) : String | provenance | MaD:6 |
+| Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : String | Test.java:230:44:230:63 | next(...) : String | provenance | MaD:6 |
+| Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : String | Test.java:230:44:230:63 | next(...) : String | provenance | MaD:6 |
+| Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : String | Test.java:230:44:230:63 | next(...) : String | provenance | MaD:6 |
+| Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : String | Test.java:230:44:230:63 | next(...) : String | provenance | MaD:6 |
+| Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : String | Test.java:230:44:230:63 | next(...) : String | provenance | MaD:6 |
+| Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : String | Test.java:230:44:230:63 | next(...) : String | provenance | MaD:6 |
+| Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : String | Test.java:230:44:230:63 | next(...) : String | provenance | MaD:6 |
+| Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : String | Test.java:230:44:230:63 | next(...) : String | provenance | MaD:6 |
+| Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : String | Test.java:230:44:230:63 | next(...) : String | provenance | MaD:6 |
+| Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : String | Test.java:230:44:230:63 | next(...) : String | provenance | MaD:6 |
+| Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : String | Test.java:230:44:230:63 | next(...) : String | provenance | MaD:6 |
+| Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : String | Test.java:230:44:230:63 | next(...) : String | provenance | MaD:6 |
+| Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : String | Test.java:230:44:230:63 | next(...) : String | provenance | MaD:6 |
+| Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : String | Test.java:230:44:230:63 | next(...) : String | provenance | MaD:6 |
+| Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : String | Test.java:230:44:230:63 | next(...) : String | provenance | MaD:6 |
+| Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : String | Test.java:230:44:230:63 | next(...) : String | provenance | MaD:6 |
+| Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : String | Test.java:230:44:230:63 | next(...) : String | provenance | MaD:6 |
+| Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : String | Test.java:230:44:230:63 | next(...) : String | provenance | MaD:6 |
+| Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : String | Test.java:230:44:230:63 | next(...) : String | provenance | MaD:6 |
+| Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : String | Test.java:230:44:230:63 | next(...) : String | provenance | MaD:6 |
+| Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : String | Test.java:230:44:230:63 | next(...) : String | provenance | MaD:6 |
+| Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : String | Test.java:230:44:230:63 | next(...) : String | provenance | MaD:6 |
+| Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : String | Test.java:230:44:230:63 | next(...) : String | provenance | MaD:6 |
+| Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : String | Test.java:230:44:230:63 | next(...) : String | provenance | MaD:6 |
+| Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : String | Test.java:230:44:230:63 | next(...) : String | provenance | MaD:6 |
+| Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : String | Test.java:230:44:230:63 | next(...) : String | provenance | MaD:6 |
+| Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : String | Test.java:230:44:230:63 | next(...) : String | provenance | MaD:6 |
+| Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : String | Test.java:230:44:230:63 | next(...) : String | provenance | MaD:6 |
+| Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : String | Test.java:230:44:230:63 | next(...) : String | provenance | MaD:6 |
+| Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : String | Test.java:230:44:230:63 | next(...) : String | provenance | MaD:6 |
+| Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : String | Test.java:230:44:230:63 | next(...) : String | provenance | MaD:6 |
+| Test.java:230:44:230:56 | iterator(...) : Iterator [<element>] : String | Test.java:230:44:230:63 | next(...) : String | provenance | MaD:6 |
 | Test.java:231:19:231:32 | it : ArrayIterator [<element>] : String | Test.java:231:44:231:45 | it : ArrayIterator [<element>] : String | provenance |  |
 | Test.java:231:19:231:32 | it : ArrayListIterator [<element>] : String | Test.java:231:44:231:45 | it : ArrayListIterator [<element>] : String | provenance |  |
 | Test.java:231:19:231:32 | it : BoundedIterator [<element>] : String | Test.java:231:44:231:45 | it : BoundedIterator [<element>] : String | provenance |  |
@@ -1336,49 +1336,49 @@ edges
 | Test.java:231:19:231:32 | it : SkippingIterator [<element>] : String | Test.java:231:44:231:45 | it : SkippingIterator [<element>] : String | provenance |  |
 | Test.java:231:19:231:32 | it : UniqueFilterIterator [<element>] : String | Test.java:231:44:231:45 | it : UniqueFilterIterator [<element>] : String | provenance |  |
 | Test.java:231:19:231:32 | it : ZippingIterator [<element>] : String | Test.java:231:44:231:45 | it : ZippingIterator [<element>] : String | provenance |  |
-| Test.java:231:44:231:45 | it : ArrayIterator [<element>] : String | Test.java:231:44:231:52 | next(...) : String | provenance | MaD:4 |
-| Test.java:231:44:231:45 | it : ArrayListIterator [<element>] : String | Test.java:231:44:231:52 | next(...) : String | provenance | MaD:4 |
-| Test.java:231:44:231:45 | it : BoundedIterator [<element>] : String | Test.java:231:44:231:52 | next(...) : String | provenance | MaD:4 |
-| Test.java:231:44:231:45 | it : CollatingIterator [<element>] : String | Test.java:231:44:231:52 | next(...) : String | provenance | MaD:4 |
-| Test.java:231:44:231:45 | it : Cursor [<element>] : String | Test.java:231:44:231:52 | next(...) : String | provenance | MaD:4 |
-| Test.java:231:44:231:45 | it : EntrySetToMapIteratorAdapter [<element>] : String | Test.java:231:44:231:52 | next(...) : String | provenance | MaD:4 |
-| Test.java:231:44:231:45 | it : EnumerationIterator [<element>] : String | Test.java:231:44:231:52 | next(...) : String | provenance | MaD:4 |
-| Test.java:231:44:231:45 | it : FilterIterator [<element>] : String | Test.java:231:44:231:52 | next(...) : String | provenance | MaD:4 |
-| Test.java:231:44:231:45 | it : FilterListIterator [<element>] : String | Test.java:231:44:231:52 | next(...) : String | provenance | MaD:4 |
-| Test.java:231:44:231:45 | it : Iterator [<element>, <map.key>] : String | Test.java:231:44:231:52 | next(...) : Object [<map.key>] : String | provenance | MaD:4 |
-| Test.java:231:44:231:45 | it : Iterator [<element>, <map.value>] : Object | Test.java:231:44:231:52 | next(...) : Object [<map.value>] : Object | provenance | MaD:4 |
-| Test.java:231:44:231:45 | it : Iterator [<element>, <map.value>] : String | Test.java:231:44:231:52 | next(...) : Object [<map.value>] : String | provenance | MaD:4 |
-| Test.java:231:44:231:45 | it : Iterator [<element>] : Object | Test.java:231:44:231:52 | next(...) : Object | provenance | MaD:4 |
-| Test.java:231:44:231:45 | it : Iterator [<element>] : String | Test.java:231:44:231:52 | next(...) : String | provenance | MaD:4 |
-| Test.java:231:44:231:45 | it : IteratorChain [<element>] : String | Test.java:231:44:231:52 | next(...) : String | provenance | MaD:4 |
-| Test.java:231:44:231:45 | it : ListIterator [<element>] : Object | Test.java:231:44:231:52 | next(...) : Object | provenance | MaD:4 |
-| Test.java:231:44:231:45 | it : ListIterator [<element>] : String | Test.java:231:44:231:52 | next(...) : String | provenance | MaD:4 |
-| Test.java:231:44:231:45 | it : ListIteratorWrapper [<element>] : String | Test.java:231:44:231:52 | next(...) : String | provenance | MaD:4 |
-| Test.java:231:44:231:45 | it : LoopingIterator [<element>] : String | Test.java:231:44:231:52 | next(...) : String | provenance | MaD:4 |
-| Test.java:231:44:231:45 | it : LoopingListIterator [<element>] : String | Test.java:231:44:231:52 | next(...) : String | provenance | MaD:4 |
-| Test.java:231:44:231:45 | it : MapIterator [<element>] : String | Test.java:231:44:231:52 | next(...) : String | provenance | MaD:4 |
-| Test.java:231:44:231:45 | it : MyAbstractIteratorDecorator [<element>] : String | Test.java:231:44:231:52 | next(...) : String | provenance | MaD:4 |
-| Test.java:231:44:231:45 | it : MyAbstractListIteratorDecorator [<element>] : String | Test.java:231:44:231:52 | next(...) : String | provenance | MaD:4 |
-| Test.java:231:44:231:45 | it : MyAbstractMapIteratorDecorator [<element>] : String | Test.java:231:44:231:52 | next(...) : String | provenance | MaD:4 |
-| Test.java:231:44:231:45 | it : MyAbstractOrderedMapIteratorDecorator [<element>] : String | Test.java:231:44:231:52 | next(...) : String | provenance | MaD:4 |
-| Test.java:231:44:231:45 | it : MyAbstractUntypedIteratorDecorator [<element>] : String | Test.java:231:44:231:52 | next(...) : String | provenance | MaD:4 |
-| Test.java:231:44:231:45 | it : ObjectArrayIterator [<element>] : String | Test.java:231:44:231:52 | next(...) : String | provenance | MaD:4 |
-| Test.java:231:44:231:45 | it : ObjectArrayListIterator [<element>] : String | Test.java:231:44:231:52 | next(...) : String | provenance | MaD:4 |
-| Test.java:231:44:231:45 | it : OrderedMapIterator [<element>] : String | Test.java:231:44:231:52 | next(...) : String | provenance | MaD:4 |
-| Test.java:231:44:231:45 | it : PeekingIterator [<element>] : String | Test.java:231:44:231:52 | next(...) : String | provenance | MaD:4 |
-| Test.java:231:44:231:45 | it : PermutationIterator [<element>, <element>] : String | Test.java:231:44:231:52 | next(...) : Object [<element>] : String | provenance | MaD:4 |
-| Test.java:231:44:231:45 | it : PushbackIterator [<element>] : Object | Test.java:231:44:231:52 | next(...) : Object | provenance | MaD:4 |
-| Test.java:231:44:231:45 | it : PushbackIterator [<element>] : String | Test.java:231:44:231:52 | next(...) : String | provenance | MaD:4 |
-| Test.java:231:44:231:45 | it : ResettableIterator [<element>] : Object | Test.java:231:44:231:52 | next(...) : Object | provenance | MaD:4 |
-| Test.java:231:44:231:45 | it : ResettableIterator [<element>] : String | Test.java:231:44:231:52 | next(...) : String | provenance | MaD:4 |
-| Test.java:231:44:231:45 | it : ResettableListIterator [<element>] : Object | Test.java:231:44:231:52 | next(...) : Object | provenance | MaD:4 |
-| Test.java:231:44:231:45 | it : ResettableListIterator [<element>] : String | Test.java:231:44:231:52 | next(...) : String | provenance | MaD:4 |
-| Test.java:231:44:231:45 | it : ReverseListIterator [<element>] : String | Test.java:231:44:231:52 | next(...) : String | provenance | MaD:4 |
-| Test.java:231:44:231:45 | it : SingletonIterator [<element>] : Object | Test.java:231:44:231:52 | next(...) : Object | provenance | MaD:4 |
-| Test.java:231:44:231:45 | it : SingletonListIterator [<element>] : Object | Test.java:231:44:231:52 | next(...) : Object | provenance | MaD:4 |
-| Test.java:231:44:231:45 | it : SkippingIterator [<element>] : String | Test.java:231:44:231:52 | next(...) : String | provenance | MaD:4 |
-| Test.java:231:44:231:45 | it : UniqueFilterIterator [<element>] : String | Test.java:231:44:231:52 | next(...) : String | provenance | MaD:4 |
-| Test.java:231:44:231:45 | it : ZippingIterator [<element>] : String | Test.java:231:44:231:52 | next(...) : String | provenance | MaD:4 |
+| Test.java:231:44:231:45 | it : ArrayIterator [<element>] : String | Test.java:231:44:231:52 | next(...) : String | provenance | MaD:6 |
+| Test.java:231:44:231:45 | it : ArrayListIterator [<element>] : String | Test.java:231:44:231:52 | next(...) : String | provenance | MaD:6 |
+| Test.java:231:44:231:45 | it : BoundedIterator [<element>] : String | Test.java:231:44:231:52 | next(...) : String | provenance | MaD:6 |
+| Test.java:231:44:231:45 | it : CollatingIterator [<element>] : String | Test.java:231:44:231:52 | next(...) : String | provenance | MaD:6 |
+| Test.java:231:44:231:45 | it : Cursor [<element>] : String | Test.java:231:44:231:52 | next(...) : String | provenance | MaD:6 |
+| Test.java:231:44:231:45 | it : EntrySetToMapIteratorAdapter [<element>] : String | Test.java:231:44:231:52 | next(...) : String | provenance | MaD:6 |
+| Test.java:231:44:231:45 | it : EnumerationIterator [<element>] : String | Test.java:231:44:231:52 | next(...) : String | provenance | MaD:6 |
+| Test.java:231:44:231:45 | it : FilterIterator [<element>] : String | Test.java:231:44:231:52 | next(...) : String | provenance | MaD:6 |
+| Test.java:231:44:231:45 | it : FilterListIterator [<element>] : String | Test.java:231:44:231:52 | next(...) : String | provenance | MaD:6 |
+| Test.java:231:44:231:45 | it : Iterator [<element>, <map.key>] : String | Test.java:231:44:231:52 | next(...) : Object [<map.key>] : String | provenance | MaD:6 |
+| Test.java:231:44:231:45 | it : Iterator [<element>, <map.value>] : Object | Test.java:231:44:231:52 | next(...) : Object [<map.value>] : Object | provenance | MaD:6 |
+| Test.java:231:44:231:45 | it : Iterator [<element>, <map.value>] : String | Test.java:231:44:231:52 | next(...) : Object [<map.value>] : String | provenance | MaD:6 |
+| Test.java:231:44:231:45 | it : Iterator [<element>] : Object | Test.java:231:44:231:52 | next(...) : Object | provenance | MaD:6 |
+| Test.java:231:44:231:45 | it : Iterator [<element>] : String | Test.java:231:44:231:52 | next(...) : String | provenance | MaD:6 |
+| Test.java:231:44:231:45 | it : IteratorChain [<element>] : String | Test.java:231:44:231:52 | next(...) : String | provenance | MaD:6 |
+| Test.java:231:44:231:45 | it : ListIterator [<element>] : Object | Test.java:231:44:231:52 | next(...) : Object | provenance | MaD:6 |
+| Test.java:231:44:231:45 | it : ListIterator [<element>] : String | Test.java:231:44:231:52 | next(...) : String | provenance | MaD:6 |
+| Test.java:231:44:231:45 | it : ListIteratorWrapper [<element>] : String | Test.java:231:44:231:52 | next(...) : String | provenance | MaD:6 |
+| Test.java:231:44:231:45 | it : LoopingIterator [<element>] : String | Test.java:231:44:231:52 | next(...) : String | provenance | MaD:6 |
+| Test.java:231:44:231:45 | it : LoopingListIterator [<element>] : String | Test.java:231:44:231:52 | next(...) : String | provenance | MaD:6 |
+| Test.java:231:44:231:45 | it : MapIterator [<element>] : String | Test.java:231:44:231:52 | next(...) : String | provenance | MaD:6 |
+| Test.java:231:44:231:45 | it : MyAbstractIteratorDecorator [<element>] : String | Test.java:231:44:231:52 | next(...) : String | provenance | MaD:6 |
+| Test.java:231:44:231:45 | it : MyAbstractListIteratorDecorator [<element>] : String | Test.java:231:44:231:52 | next(...) : String | provenance | MaD:6 |
+| Test.java:231:44:231:45 | it : MyAbstractMapIteratorDecorator [<element>] : String | Test.java:231:44:231:52 | next(...) : String | provenance | MaD:6 |
+| Test.java:231:44:231:45 | it : MyAbstractOrderedMapIteratorDecorator [<element>] : String | Test.java:231:44:231:52 | next(...) : String | provenance | MaD:6 |
+| Test.java:231:44:231:45 | it : MyAbstractUntypedIteratorDecorator [<element>] : String | Test.java:231:44:231:52 | next(...) : String | provenance | MaD:6 |
+| Test.java:231:44:231:45 | it : ObjectArrayIterator [<element>] : String | Test.java:231:44:231:52 | next(...) : String | provenance | MaD:6 |
+| Test.java:231:44:231:45 | it : ObjectArrayListIterator [<element>] : String | Test.java:231:44:231:52 | next(...) : String | provenance | MaD:6 |
+| Test.java:231:44:231:45 | it : OrderedMapIterator [<element>] : String | Test.java:231:44:231:52 | next(...) : String | provenance | MaD:6 |
+| Test.java:231:44:231:45 | it : PeekingIterator [<element>] : String | Test.java:231:44:231:52 | next(...) : String | provenance | MaD:6 |
+| Test.java:231:44:231:45 | it : PermutationIterator [<element>, <element>] : String | Test.java:231:44:231:52 | next(...) : Object [<element>] : String | provenance | MaD:6 |
+| Test.java:231:44:231:45 | it : PushbackIterator [<element>] : Object | Test.java:231:44:231:52 | next(...) : Object | provenance | MaD:6 |
+| Test.java:231:44:231:45 | it : PushbackIterator [<element>] : String | Test.java:231:44:231:52 | next(...) : String | provenance | MaD:6 |
+| Test.java:231:44:231:45 | it : ResettableIterator [<element>] : Object | Test.java:231:44:231:52 | next(...) : Object | provenance | MaD:6 |
+| Test.java:231:44:231:45 | it : ResettableIterator [<element>] : String | Test.java:231:44:231:52 | next(...) : String | provenance | MaD:6 |
+| Test.java:231:44:231:45 | it : ResettableListIterator [<element>] : Object | Test.java:231:44:231:52 | next(...) : Object | provenance | MaD:6 |
+| Test.java:231:44:231:45 | it : ResettableListIterator [<element>] : String | Test.java:231:44:231:52 | next(...) : String | provenance | MaD:6 |
+| Test.java:231:44:231:45 | it : ReverseListIterator [<element>] : String | Test.java:231:44:231:52 | next(...) : String | provenance | MaD:6 |
+| Test.java:231:44:231:45 | it : SingletonIterator [<element>] : Object | Test.java:231:44:231:52 | next(...) : Object | provenance | MaD:6 |
+| Test.java:231:44:231:45 | it : SingletonListIterator [<element>] : Object | Test.java:231:44:231:52 | next(...) : Object | provenance | MaD:6 |
+| Test.java:231:44:231:45 | it : SkippingIterator [<element>] : String | Test.java:231:44:231:52 | next(...) : String | provenance | MaD:6 |
+| Test.java:231:44:231:45 | it : UniqueFilterIterator [<element>] : String | Test.java:231:44:231:52 | next(...) : String | provenance | MaD:6 |
+| Test.java:231:44:231:45 | it : ZippingIterator [<element>] : String | Test.java:231:44:231:52 | next(...) : String | provenance | MaD:6 |
 | Test.java:232:20:232:31 | map : AbstractMapDecorator [<map.value>] : Object | Test.java:232:43:232:45 | map : AbstractMapDecorator [<map.value>] : Object | provenance |  |
 | Test.java:232:20:232:31 | map : AbstractMapDecorator [<map.value>] : String | Test.java:232:43:232:45 | map : AbstractMapDecorator [<map.value>] : String | provenance |  |
 | Test.java:232:20:232:31 | map : BidiMap [<map.value>] : Object | Test.java:232:43:232:45 | map : BidiMap [<map.value>] : Object | provenance |  |
@@ -1438,75 +1438,75 @@ edges
 | Test.java:232:20:232:31 | map : TransformedSortedMap [<map.value>] : String | Test.java:232:43:232:45 | map : TransformedSortedMap [<map.value>] : String | provenance |  |
 | Test.java:232:20:232:31 | map : TreeBidiMap [<map.value>] : String | Test.java:232:43:232:45 | map : TreeBidiMap [<map.value>] : String | provenance |  |
 | Test.java:232:20:232:31 | map : Trie [<map.value>] : String | Test.java:232:43:232:45 | map : Trie [<map.value>] : String | provenance |  |
-| Test.java:232:43:232:45 | map : AbstractMapDecorator [<map.value>] : Object | Test.java:232:43:232:55 | get(...) : Object | provenance | MaD:9 |
-| Test.java:232:43:232:45 | map : AbstractMapDecorator [<map.value>] : String | Test.java:232:43:232:55 | get(...) : String | provenance | MaD:9 |
-| Test.java:232:43:232:45 | map : BidiMap [<map.value>] : Object | Test.java:232:43:232:55 | get(...) : Object | provenance | MaD:9 |
-| Test.java:232:43:232:45 | map : BidiMap [<map.value>] : String | Test.java:232:43:232:55 | get(...) : String | provenance | MaD:9 |
-| Test.java:232:43:232:45 | map : CaseInsensitiveMap [<map.value>] : String | Test.java:232:43:232:55 | get(...) : String | provenance | MaD:9 |
-| Test.java:232:43:232:45 | map : CompositeMap [<map.value>] : String | Test.java:232:43:232:55 | get(...) : String | provenance | MaD:9 |
-| Test.java:232:43:232:45 | map : DefaultedMap [<map.value>] : Object | Test.java:232:43:232:55 | get(...) : Object | provenance | MaD:9 |
-| Test.java:232:43:232:45 | map : DefaultedMap [<map.value>] : String | Test.java:232:43:232:55 | get(...) : String | provenance | MaD:9 |
-| Test.java:232:43:232:45 | map : DualHashBidiMap [<map.value>] : String | Test.java:232:43:232:55 | get(...) : String | provenance | MaD:9 |
-| Test.java:232:43:232:45 | map : DualLinkedHashBidiMap [<map.value>] : String | Test.java:232:43:232:55 | get(...) : String | provenance | MaD:9 |
-| Test.java:232:43:232:45 | map : DualTreeBidiMap [<map.value>] : String | Test.java:232:43:232:55 | get(...) : String | provenance | MaD:9 |
-| Test.java:232:43:232:45 | map : FixedSizeMap [<map.value>] : String | Test.java:232:43:232:55 | get(...) : String | provenance | MaD:9 |
-| Test.java:232:43:232:45 | map : FixedSizeSortedMap [<map.value>] : String | Test.java:232:43:232:55 | get(...) : String | provenance | MaD:9 |
-| Test.java:232:43:232:45 | map : Flat3Map [<map.value>] : String | Test.java:232:43:232:55 | get(...) : String | provenance | MaD:9 |
-| Test.java:232:43:232:45 | map : HashedMap [<map.value>] : String | Test.java:232:43:232:55 | get(...) : String | provenance | MaD:9 |
-| Test.java:232:43:232:45 | map : IterableMap [<map.value>] : String | Test.java:232:43:232:55 | get(...) : String | provenance | MaD:9 |
-| Test.java:232:43:232:45 | map : IterableSortedMap [<map.value>] : String | Test.java:232:43:232:55 | get(...) : String | provenance | MaD:9 |
-| Test.java:232:43:232:45 | map : LRUMap [<map.value>] : String | Test.java:232:43:232:55 | get(...) : String | provenance | MaD:9 |
-| Test.java:232:43:232:45 | map : LazyMap [<map.value>] : String | Test.java:232:43:232:55 | get(...) : String | provenance | MaD:9 |
-| Test.java:232:43:232:45 | map : LazySortedMap [<map.value>] : String | Test.java:232:43:232:55 | get(...) : String | provenance | MaD:9 |
-| Test.java:232:43:232:45 | map : LinkedMap [<map.value>] : String | Test.java:232:43:232:55 | get(...) : String | provenance | MaD:9 |
-| Test.java:232:43:232:45 | map : ListOrderedMap [<map.value>] : Object | Test.java:232:43:232:55 | get(...) : Object | provenance | MaD:9 |
-| Test.java:232:43:232:45 | map : ListOrderedMap [<map.value>] : String | Test.java:232:43:232:55 | get(...) : String | provenance | MaD:9 |
-| Test.java:232:43:232:45 | map : Map [<map.value>, <element>] : String | Test.java:232:43:232:55 | get(...) : Object [<element>] : String | provenance | MaD:9 |
-| Test.java:232:43:232:45 | map : Map [<map.value>] : Object | Test.java:232:43:232:55 | get(...) : Object | provenance | MaD:9 |
-| Test.java:232:43:232:45 | map : Map [<map.value>] : String | Test.java:232:43:232:55 | get(...) : String | provenance | MaD:9 |
-| Test.java:232:43:232:45 | map : MultiKeyMap [<map.value>] : String | Test.java:232:43:232:55 | get(...) : String | provenance | MaD:9 |
-| Test.java:232:43:232:45 | map : MultiMap [<map.value>, <element>] : Object | Test.java:232:43:232:55 | get(...) : Object [<element>] : Object | provenance | MaD:9 |
-| Test.java:232:43:232:45 | map : MultiMap [<map.value>, <element>] : String | Test.java:232:43:232:55 | get(...) : Object [<element>] : String | provenance | MaD:9 |
-| Test.java:232:43:232:45 | map : MultiMap [<map.value>] : Object | Test.java:232:43:232:55 | get(...) : Object | provenance | MaD:9 |
-| Test.java:232:43:232:45 | map : MultiValueMap [<map.value>, <element>] : Object | Test.java:232:43:232:55 | get(...) : Object [<element>] : Object | provenance | MaD:9 |
-| Test.java:232:43:232:45 | map : MultiValueMap [<map.value>, <element>] : String | Test.java:232:43:232:55 | get(...) : Object [<element>] : String | provenance | MaD:9 |
-| Test.java:232:43:232:45 | map : MultiValueMap [<map.value>] : Object | Test.java:232:43:232:55 | get(...) : Object | provenance | MaD:9 |
-| Test.java:232:43:232:45 | map : MultiValueMap [<map.value>] : String | Test.java:232:43:232:55 | get(...) : String | provenance | MaD:9 |
-| Test.java:232:43:232:45 | map : MyAbstractBidiMapDecorator [<map.value>] : String | Test.java:232:43:232:55 | get(...) : String | provenance | MaD:9 |
-| Test.java:232:43:232:45 | map : MyAbstractDualBidiMap [<map.value>] : String | Test.java:232:43:232:55 | get(...) : String | provenance | MaD:9 |
-| Test.java:232:43:232:45 | map : MyAbstractHashedMap [<map.value>] : String | Test.java:232:43:232:55 | get(...) : String | provenance | MaD:9 |
-| Test.java:232:43:232:45 | map : MyAbstractLinkedMap [<map.value>] : String | Test.java:232:43:232:55 | get(...) : String | provenance | MaD:9 |
-| Test.java:232:43:232:45 | map : MyAbstractMapDecorator [<map.value>] : String | Test.java:232:43:232:55 | get(...) : String | provenance | MaD:9 |
-| Test.java:232:43:232:45 | map : MyAbstractOrderedBidiMapDecorator [<map.value>] : String | Test.java:232:43:232:55 | get(...) : String | provenance | MaD:9 |
-| Test.java:232:43:232:45 | map : MyAbstractOrderedMapDecorator [<map.value>] : String | Test.java:232:43:232:55 | get(...) : String | provenance | MaD:9 |
-| Test.java:232:43:232:45 | map : MyAbstractSortedBidiMapDecorator [<map.value>] : String | Test.java:232:43:232:55 | get(...) : String | provenance | MaD:9 |
-| Test.java:232:43:232:45 | map : MyAbstractSortedMapDecorator [<map.value>] : String | Test.java:232:43:232:55 | get(...) : String | provenance | MaD:9 |
-| Test.java:232:43:232:45 | map : OrderedBidiMap [<map.value>] : String | Test.java:232:43:232:55 | get(...) : String | provenance | MaD:9 |
-| Test.java:232:43:232:45 | map : OrderedMap [<map.value>] : String | Test.java:232:43:232:55 | get(...) : String | provenance | MaD:9 |
-| Test.java:232:43:232:45 | map : PassiveExpiringMap [<map.value>] : String | Test.java:232:43:232:55 | get(...) : String | provenance | MaD:9 |
-| Test.java:232:43:232:45 | map : PatriciaTrie [<map.value>] : String | Test.java:232:43:232:55 | get(...) : String | provenance | MaD:9 |
-| Test.java:232:43:232:45 | map : PredicatedMap [<map.value>] : String | Test.java:232:43:232:55 | get(...) : String | provenance | MaD:9 |
-| Test.java:232:43:232:45 | map : PredicatedSortedMap [<map.value>] : String | Test.java:232:43:232:55 | get(...) : String | provenance | MaD:9 |
-| Test.java:232:43:232:45 | map : Put [<map.value>] : Object | Test.java:232:43:232:55 | get(...) : Object | provenance | MaD:9 |
-| Test.java:232:43:232:45 | map : Put [<map.value>] : String | Test.java:232:43:232:55 | get(...) : String | provenance | MaD:9 |
-| Test.java:232:43:232:45 | map : SingletonMap [<map.value>] : Object | Test.java:232:43:232:55 | get(...) : Object | provenance | MaD:9 |
-| Test.java:232:43:232:45 | map : SingletonMap [<map.value>] : String | Test.java:232:43:232:55 | get(...) : String | provenance | MaD:9 |
-| Test.java:232:43:232:45 | map : SortedBidiMap [<map.value>] : String | Test.java:232:43:232:55 | get(...) : String | provenance | MaD:9 |
-| Test.java:232:43:232:45 | map : SortedMap [<map.value>] : String | Test.java:232:43:232:55 | get(...) : String | provenance | MaD:9 |
-| Test.java:232:43:232:45 | map : TransformedMap [<map.value>] : String | Test.java:232:43:232:55 | get(...) : String | provenance | MaD:9 |
-| Test.java:232:43:232:45 | map : TransformedSortedMap [<map.value>] : String | Test.java:232:43:232:55 | get(...) : String | provenance | MaD:9 |
-| Test.java:232:43:232:45 | map : TreeBidiMap [<map.value>] : String | Test.java:232:43:232:55 | get(...) : String | provenance | MaD:9 |
-| Test.java:232:43:232:45 | map : Trie [<map.value>] : String | Test.java:232:43:232:55 | get(...) : String | provenance | MaD:9 |
+| Test.java:232:43:232:45 | map : AbstractMapDecorator [<map.value>] : Object | Test.java:232:43:232:55 | get(...) : Object | provenance | MaD:17 |
+| Test.java:232:43:232:45 | map : AbstractMapDecorator [<map.value>] : String | Test.java:232:43:232:55 | get(...) : String | provenance | MaD:17 |
+| Test.java:232:43:232:45 | map : BidiMap [<map.value>] : Object | Test.java:232:43:232:55 | get(...) : Object | provenance | MaD:17 |
+| Test.java:232:43:232:45 | map : BidiMap [<map.value>] : String | Test.java:232:43:232:55 | get(...) : String | provenance | MaD:17 |
+| Test.java:232:43:232:45 | map : CaseInsensitiveMap [<map.value>] : String | Test.java:232:43:232:55 | get(...) : String | provenance | MaD:17 |
+| Test.java:232:43:232:45 | map : CompositeMap [<map.value>] : String | Test.java:232:43:232:55 | get(...) : String | provenance | MaD:17 |
+| Test.java:232:43:232:45 | map : DefaultedMap [<map.value>] : Object | Test.java:232:43:232:55 | get(...) : Object | provenance | MaD:17 |
+| Test.java:232:43:232:45 | map : DefaultedMap [<map.value>] : String | Test.java:232:43:232:55 | get(...) : String | provenance | MaD:17 |
+| Test.java:232:43:232:45 | map : DualHashBidiMap [<map.value>] : String | Test.java:232:43:232:55 | get(...) : String | provenance | MaD:17 |
+| Test.java:232:43:232:45 | map : DualLinkedHashBidiMap [<map.value>] : String | Test.java:232:43:232:55 | get(...) : String | provenance | MaD:17 |
+| Test.java:232:43:232:45 | map : DualTreeBidiMap [<map.value>] : String | Test.java:232:43:232:55 | get(...) : String | provenance | MaD:17 |
+| Test.java:232:43:232:45 | map : FixedSizeMap [<map.value>] : String | Test.java:232:43:232:55 | get(...) : String | provenance | MaD:17 |
+| Test.java:232:43:232:45 | map : FixedSizeSortedMap [<map.value>] : String | Test.java:232:43:232:55 | get(...) : String | provenance | MaD:17 |
+| Test.java:232:43:232:45 | map : Flat3Map [<map.value>] : String | Test.java:232:43:232:55 | get(...) : String | provenance | MaD:17 |
+| Test.java:232:43:232:45 | map : HashedMap [<map.value>] : String | Test.java:232:43:232:55 | get(...) : String | provenance | MaD:17 |
+| Test.java:232:43:232:45 | map : IterableMap [<map.value>] : String | Test.java:232:43:232:55 | get(...) : String | provenance | MaD:17 |
+| Test.java:232:43:232:45 | map : IterableSortedMap [<map.value>] : String | Test.java:232:43:232:55 | get(...) : String | provenance | MaD:17 |
+| Test.java:232:43:232:45 | map : LRUMap [<map.value>] : String | Test.java:232:43:232:55 | get(...) : String | provenance | MaD:17 |
+| Test.java:232:43:232:45 | map : LazyMap [<map.value>] : String | Test.java:232:43:232:55 | get(...) : String | provenance | MaD:17 |
+| Test.java:232:43:232:45 | map : LazySortedMap [<map.value>] : String | Test.java:232:43:232:55 | get(...) : String | provenance | MaD:17 |
+| Test.java:232:43:232:45 | map : LinkedMap [<map.value>] : String | Test.java:232:43:232:55 | get(...) : String | provenance | MaD:17 |
+| Test.java:232:43:232:45 | map : ListOrderedMap [<map.value>] : Object | Test.java:232:43:232:55 | get(...) : Object | provenance | MaD:17 |
+| Test.java:232:43:232:45 | map : ListOrderedMap [<map.value>] : String | Test.java:232:43:232:55 | get(...) : String | provenance | MaD:17 |
+| Test.java:232:43:232:45 | map : Map [<map.value>, <element>] : String | Test.java:232:43:232:55 | get(...) : Object [<element>] : String | provenance | MaD:17 |
+| Test.java:232:43:232:45 | map : Map [<map.value>] : Object | Test.java:232:43:232:55 | get(...) : Object | provenance | MaD:17 |
+| Test.java:232:43:232:45 | map : Map [<map.value>] : String | Test.java:232:43:232:55 | get(...) : String | provenance | MaD:17 |
+| Test.java:232:43:232:45 | map : MultiKeyMap [<map.value>] : String | Test.java:232:43:232:55 | get(...) : String | provenance | MaD:17 |
+| Test.java:232:43:232:45 | map : MultiMap [<map.value>, <element>] : Object | Test.java:232:43:232:55 | get(...) : Object [<element>] : Object | provenance | MaD:17 |
+| Test.java:232:43:232:45 | map : MultiMap [<map.value>, <element>] : String | Test.java:232:43:232:55 | get(...) : Object [<element>] : String | provenance | MaD:17 |
+| Test.java:232:43:232:45 | map : MultiMap [<map.value>] : Object | Test.java:232:43:232:55 | get(...) : Object | provenance | MaD:17 |
+| Test.java:232:43:232:45 | map : MultiValueMap [<map.value>, <element>] : Object | Test.java:232:43:232:55 | get(...) : Object [<element>] : Object | provenance | MaD:17 |
+| Test.java:232:43:232:45 | map : MultiValueMap [<map.value>, <element>] : String | Test.java:232:43:232:55 | get(...) : Object [<element>] : String | provenance | MaD:17 |
+| Test.java:232:43:232:45 | map : MultiValueMap [<map.value>] : Object | Test.java:232:43:232:55 | get(...) : Object | provenance | MaD:17 |
+| Test.java:232:43:232:45 | map : MultiValueMap [<map.value>] : String | Test.java:232:43:232:55 | get(...) : String | provenance | MaD:17 |
+| Test.java:232:43:232:45 | map : MyAbstractBidiMapDecorator [<map.value>] : String | Test.java:232:43:232:55 | get(...) : String | provenance | MaD:17 |
+| Test.java:232:43:232:45 | map : MyAbstractDualBidiMap [<map.value>] : String | Test.java:232:43:232:55 | get(...) : String | provenance | MaD:17 |
+| Test.java:232:43:232:45 | map : MyAbstractHashedMap [<map.value>] : String | Test.java:232:43:232:55 | get(...) : String | provenance | MaD:17 |
+| Test.java:232:43:232:45 | map : MyAbstractLinkedMap [<map.value>] : String | Test.java:232:43:232:55 | get(...) : String | provenance | MaD:17 |
+| Test.java:232:43:232:45 | map : MyAbstractMapDecorator [<map.value>] : String | Test.java:232:43:232:55 | get(...) : String | provenance | MaD:17 |
+| Test.java:232:43:232:45 | map : MyAbstractOrderedBidiMapDecorator [<map.value>] : String | Test.java:232:43:232:55 | get(...) : String | provenance | MaD:17 |
+| Test.java:232:43:232:45 | map : MyAbstractOrderedMapDecorator [<map.value>] : String | Test.java:232:43:232:55 | get(...) : String | provenance | MaD:17 |
+| Test.java:232:43:232:45 | map : MyAbstractSortedBidiMapDecorator [<map.value>] : String | Test.java:232:43:232:55 | get(...) : String | provenance | MaD:17 |
+| Test.java:232:43:232:45 | map : MyAbstractSortedMapDecorator [<map.value>] : String | Test.java:232:43:232:55 | get(...) : String | provenance | MaD:17 |
+| Test.java:232:43:232:45 | map : OrderedBidiMap [<map.value>] : String | Test.java:232:43:232:55 | get(...) : String | provenance | MaD:17 |
+| Test.java:232:43:232:45 | map : OrderedMap [<map.value>] : String | Test.java:232:43:232:55 | get(...) : String | provenance | MaD:17 |
+| Test.java:232:43:232:45 | map : PassiveExpiringMap [<map.value>] : String | Test.java:232:43:232:55 | get(...) : String | provenance | MaD:17 |
+| Test.java:232:43:232:45 | map : PatriciaTrie [<map.value>] : String | Test.java:232:43:232:55 | get(...) : String | provenance | MaD:17 |
+| Test.java:232:43:232:45 | map : PredicatedMap [<map.value>] : String | Test.java:232:43:232:55 | get(...) : String | provenance | MaD:17 |
+| Test.java:232:43:232:45 | map : PredicatedSortedMap [<map.value>] : String | Test.java:232:43:232:55 | get(...) : String | provenance | MaD:17 |
+| Test.java:232:43:232:45 | map : Put [<map.value>] : Object | Test.java:232:43:232:55 | get(...) : Object | provenance | MaD:17 |
+| Test.java:232:43:232:45 | map : Put [<map.value>] : String | Test.java:232:43:232:55 | get(...) : String | provenance | MaD:17 |
+| Test.java:232:43:232:45 | map : SingletonMap [<map.value>] : Object | Test.java:232:43:232:55 | get(...) : Object | provenance | MaD:17 |
+| Test.java:232:43:232:45 | map : SingletonMap [<map.value>] : String | Test.java:232:43:232:55 | get(...) : String | provenance | MaD:17 |
+| Test.java:232:43:232:45 | map : SortedBidiMap [<map.value>] : String | Test.java:232:43:232:55 | get(...) : String | provenance | MaD:17 |
+| Test.java:232:43:232:45 | map : SortedMap [<map.value>] : String | Test.java:232:43:232:55 | get(...) : String | provenance | MaD:17 |
+| Test.java:232:43:232:45 | map : TransformedMap [<map.value>] : String | Test.java:232:43:232:55 | get(...) : String | provenance | MaD:17 |
+| Test.java:232:43:232:45 | map : TransformedSortedMap [<map.value>] : String | Test.java:232:43:232:55 | get(...) : String | provenance | MaD:17 |
+| Test.java:232:43:232:45 | map : TreeBidiMap [<map.value>] : String | Test.java:232:43:232:55 | get(...) : String | provenance | MaD:17 |
+| Test.java:232:43:232:45 | map : Trie [<map.value>] : String | Test.java:232:43:232:55 | get(...) : String | provenance | MaD:17 |
 | Test.java:234:19:234:42 | container : Enumeration [<element>] : String | Test.java:234:54:234:62 | container : Enumeration [<element>] : String | provenance |  |
 | Test.java:234:19:234:42 | container : IteratorEnumeration [<element>] : String | Test.java:234:54:234:62 | container : IteratorEnumeration [<element>] : String | provenance |  |
-| Test.java:234:54:234:62 | container : Enumeration [<element>] : String | Test.java:234:54:234:76 | nextElement(...) : String | provenance | MaD:3 |
-| Test.java:234:54:234:62 | container : IteratorEnumeration [<element>] : String | Test.java:234:54:234:76 | nextElement(...) : String | provenance | MaD:3 |
+| Test.java:234:54:234:62 | container : Enumeration [<element>] : String | Test.java:234:54:234:76 | nextElement(...) : String | provenance | MaD:5 |
+| Test.java:234:54:234:62 | container : IteratorEnumeration [<element>] : String | Test.java:234:54:234:76 | nextElement(...) : String | provenance | MaD:5 |
 | Test.java:235:19:235:45 | container : Entry [<element>] : String | Test.java:235:57:235:65 | container : Entry [<element>] : String | provenance |  |
-| Test.java:235:57:235:65 | container : Entry [<element>] : String | Test.java:235:57:235:78 | getElement(...) : String | provenance | MaD:676 |
+| Test.java:235:57:235:65 | container : Entry [<element>] : String | Test.java:235:57:235:78 | getElement(...) : String | provenance | MaD:748 |
 | Test.java:236:19:236:39 | container : MultiKey [<element>] : Object | Test.java:236:51:236:59 | container : MultiKey [<element>] : Object | provenance |  |
 | Test.java:236:19:236:39 | container : MultiKey [<element>] : String | Test.java:236:51:236:59 | container : MultiKey [<element>] : String | provenance |  |
-| Test.java:236:51:236:59 | container : MultiKey [<element>] : Object | Test.java:236:51:236:69 | getKey(...) : Object | provenance | MaD:231 |
-| Test.java:236:51:236:59 | container : MultiKey [<element>] : String | Test.java:236:51:236:69 | getKey(...) : String | provenance | MaD:231 |
+| Test.java:236:51:236:59 | container : MultiKey [<element>] : Object | Test.java:236:51:236:69 | getKey(...) : Object | provenance | MaD:233 |
+| Test.java:236:51:236:59 | container : MultiKey [<element>] : String | Test.java:236:51:236:69 | getKey(...) : String | provenance | MaD:233 |
 | Test.java:237:18:237:48 | container : DefaultKeyValue [<map.key>] : Object | Test.java:237:60:237:68 | container : DefaultKeyValue [<map.key>] : Object | provenance |  |
 | Test.java:237:18:237:48 | container : DefaultKeyValue [<map.key>] : String | Test.java:237:60:237:68 | container : DefaultKeyValue [<map.key>] : String | provenance |  |
 | Test.java:237:18:237:48 | container : DefaultMapEntry [<map.key>] : Object | Test.java:237:60:237:68 | container : DefaultMapEntry [<map.key>] : Object | provenance |  |
@@ -1515,59 +1515,59 @@ edges
 | Test.java:237:18:237:48 | container : MyAbstractMapEntry [<map.key>] : Object | Test.java:237:60:237:68 | container : MyAbstractMapEntry [<map.key>] : Object | provenance |  |
 | Test.java:237:18:237:48 | container : UnmodifiableMapEntry [<map.key>] : Object | Test.java:237:60:237:68 | container : UnmodifiableMapEntry [<map.key>] : Object | provenance |  |
 | Test.java:237:18:237:48 | container : UnmodifiableMapEntry [<map.key>] : String | Test.java:237:60:237:68 | container : UnmodifiableMapEntry [<map.key>] : String | provenance |  |
-| Test.java:237:60:237:68 | container : DefaultKeyValue [<map.key>] : Object | Test.java:237:60:237:77 | getKey(...) : Object | provenance | MaD:568 |
-| Test.java:237:60:237:68 | container : DefaultKeyValue [<map.key>] : String | Test.java:237:60:237:77 | getKey(...) : String | provenance | MaD:568 |
-| Test.java:237:60:237:68 | container : DefaultMapEntry [<map.key>] : Object | Test.java:237:60:237:77 | getKey(...) : Object | provenance | MaD:568 |
-| Test.java:237:60:237:68 | container : DefaultMapEntry [<map.key>] : String | Test.java:237:60:237:77 | getKey(...) : String | provenance | MaD:568 |
-| Test.java:237:60:237:68 | container : MyAbstractKeyValue [<map.key>] : Object | Test.java:237:60:237:77 | getKey(...) : Object | provenance | MaD:568 |
-| Test.java:237:60:237:68 | container : MyAbstractMapEntry [<map.key>] : Object | Test.java:237:60:237:77 | getKey(...) : Object | provenance | MaD:568 |
-| Test.java:237:60:237:68 | container : UnmodifiableMapEntry [<map.key>] : Object | Test.java:237:60:237:77 | getKey(...) : Object | provenance | MaD:568 |
-| Test.java:237:60:237:68 | container : UnmodifiableMapEntry [<map.key>] : String | Test.java:237:60:237:77 | getKey(...) : String | provenance | MaD:568 |
+| Test.java:237:60:237:68 | container : DefaultKeyValue [<map.key>] : Object | Test.java:237:60:237:77 | getKey(...) : Object | provenance | MaD:643 |
+| Test.java:237:60:237:68 | container : DefaultKeyValue [<map.key>] : String | Test.java:237:60:237:77 | getKey(...) : String | provenance | MaD:643 |
+| Test.java:237:60:237:68 | container : DefaultMapEntry [<map.key>] : Object | Test.java:237:60:237:77 | getKey(...) : Object | provenance | MaD:643 |
+| Test.java:237:60:237:68 | container : DefaultMapEntry [<map.key>] : String | Test.java:237:60:237:77 | getKey(...) : String | provenance | MaD:643 |
+| Test.java:237:60:237:68 | container : MyAbstractKeyValue [<map.key>] : Object | Test.java:237:60:237:77 | getKey(...) : Object | provenance | MaD:643 |
+| Test.java:237:60:237:68 | container : MyAbstractMapEntry [<map.key>] : Object | Test.java:237:60:237:77 | getKey(...) : Object | provenance | MaD:643 |
+| Test.java:237:60:237:68 | container : UnmodifiableMapEntry [<map.key>] : Object | Test.java:237:60:237:77 | getKey(...) : Object | provenance | MaD:643 |
+| Test.java:237:60:237:68 | container : UnmodifiableMapEntry [<map.key>] : String | Test.java:237:60:237:77 | getKey(...) : String | provenance | MaD:643 |
 | Test.java:238:27:238:50 | container : Entry [<map.key>] : String | Test.java:238:62:238:70 | container : Entry [<map.key>] : String | provenance |  |
 | Test.java:238:27:238:50 | container : TiedMapEntry [<map.key>] : Object | Test.java:238:62:238:70 | container : TiedMapEntry [<map.key>] : Object | provenance |  |
-| Test.java:238:62:238:70 | container : Entry [<map.key>] : String | Test.java:238:62:238:79 | getKey(...) : String | provenance | MaD:20 |
-| Test.java:238:62:238:70 | container : TiedMapEntry [<map.key>] : Object | Test.java:238:62:238:79 | getKey(...) : Object | provenance | MaD:20 |
+| Test.java:238:62:238:70 | container : Entry [<map.key>] : String | Test.java:238:62:238:79 | getKey(...) : String | provenance | MaD:9 |
+| Test.java:238:62:238:70 | container : TiedMapEntry [<map.key>] : Object | Test.java:238:62:238:79 | getKey(...) : Object | provenance | MaD:9 |
 | Test.java:239:18:239:57 | container : MyAbstractMapEntryDecorator [<map.key>] : String | Test.java:239:69:239:77 | container : MyAbstractMapEntryDecorator [<map.key>] : String | provenance |  |
-| Test.java:239:69:239:77 | container : MyAbstractMapEntryDecorator [<map.key>] : String | Test.java:239:69:239:86 | getKey(...) : String | provenance | MaD:20 |
-| Test.java:239:69:239:77 | container : MyAbstractMapEntryDecorator [<map.key>] : String | Test.java:239:69:239:86 | getKey(...) : String | provenance | MaD:568 |
+| Test.java:239:69:239:77 | container : MyAbstractMapEntryDecorator [<map.key>] : String | Test.java:239:69:239:86 | getKey(...) : String | provenance | MaD:9 |
+| Test.java:239:69:239:77 | container : MyAbstractMapEntryDecorator [<map.key>] : String | Test.java:239:69:239:86 | getKey(...) : String | provenance | MaD:643 |
 | Test.java:240:18:240:46 | container : ArrayListValuedHashMap [<map.key>] : String | Test.java:240:58:240:66 | container : ArrayListValuedHashMap [<map.key>] : String | provenance |  |
 | Test.java:240:18:240:46 | container : HashSetValuedHashMap [<map.key>] : String | Test.java:240:58:240:66 | container : HashSetValuedHashMap [<map.key>] : String | provenance |  |
 | Test.java:240:18:240:46 | container : MultiValuedMap [<map.key>] : Object | Test.java:240:58:240:66 | container : MultiValuedMap [<map.key>] : Object | provenance |  |
 | Test.java:240:18:240:46 | container : MultiValuedMap [<map.key>] : String | Test.java:240:58:240:66 | container : MultiValuedMap [<map.key>] : String | provenance |  |
 | Test.java:240:18:240:46 | container : TransformedMultiValuedMap [<map.key>] : String | Test.java:240:58:240:66 | container : TransformedMultiValuedMap [<map.key>] : String | provenance |  |
 | Test.java:240:18:240:46 | container : UnmodifiableMultiValuedMap [<map.key>] : String | Test.java:240:58:240:66 | container : UnmodifiableMultiValuedMap [<map.key>] : String | provenance |  |
-| Test.java:240:58:240:66 | container : ArrayListValuedHashMap [<map.key>] : String | Test.java:240:58:240:75 | keySet(...) : Set [<element>] : String | provenance | MaD:685 |
-| Test.java:240:58:240:66 | container : HashSetValuedHashMap [<map.key>] : String | Test.java:240:58:240:75 | keySet(...) : Set [<element>] : String | provenance | MaD:685 |
-| Test.java:240:58:240:66 | container : MultiValuedMap [<map.key>] : Object | Test.java:240:58:240:75 | keySet(...) : Set [<element>] : Object | provenance | MaD:685 |
-| Test.java:240:58:240:66 | container : MultiValuedMap [<map.key>] : String | Test.java:240:58:240:75 | keySet(...) : Set [<element>] : String | provenance | MaD:685 |
-| Test.java:240:58:240:66 | container : TransformedMultiValuedMap [<map.key>] : String | Test.java:240:58:240:75 | keySet(...) : Set [<element>] : String | provenance | MaD:685 |
-| Test.java:240:58:240:66 | container : UnmodifiableMultiValuedMap [<map.key>] : String | Test.java:240:58:240:75 | keySet(...) : Set [<element>] : String | provenance | MaD:685 |
-| Test.java:240:58:240:75 | keySet(...) : Set [<element>] : Object | Test.java:240:58:240:86 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:1 |
-| Test.java:240:58:240:75 | keySet(...) : Set [<element>] : String | Test.java:240:58:240:86 | iterator(...) : Iterator [<element>] : String | provenance | MaD:1 |
-| Test.java:240:58:240:75 | keySet(...) : Set [<element>] : String | Test.java:240:58:240:86 | iterator(...) : Iterator [<element>] : String | provenance | MaD:1 |
-| Test.java:240:58:240:75 | keySet(...) : Set [<element>] : String | Test.java:240:58:240:86 | iterator(...) : Iterator [<element>] : String | provenance | MaD:1 |
-| Test.java:240:58:240:75 | keySet(...) : Set [<element>] : String | Test.java:240:58:240:86 | iterator(...) : Iterator [<element>] : String | provenance | MaD:1 |
-| Test.java:240:58:240:75 | keySet(...) : Set [<element>] : String | Test.java:240:58:240:86 | iterator(...) : Iterator [<element>] : String | provenance | MaD:1 |
-| Test.java:240:58:240:86 | iterator(...) : Iterator [<element>] : Object | Test.java:240:58:240:93 | next(...) : Object | provenance | MaD:4 |
-| Test.java:240:58:240:86 | iterator(...) : Iterator [<element>] : String | Test.java:240:58:240:93 | next(...) : String | provenance | MaD:4 |
-| Test.java:240:58:240:86 | iterator(...) : Iterator [<element>] : String | Test.java:240:58:240:93 | next(...) : String | provenance | MaD:4 |
-| Test.java:240:58:240:86 | iterator(...) : Iterator [<element>] : String | Test.java:240:58:240:93 | next(...) : String | provenance | MaD:4 |
-| Test.java:240:58:240:86 | iterator(...) : Iterator [<element>] : String | Test.java:240:58:240:93 | next(...) : String | provenance | MaD:4 |
-| Test.java:240:58:240:86 | iterator(...) : Iterator [<element>] : String | Test.java:240:58:240:93 | next(...) : String | provenance | MaD:4 |
+| Test.java:240:58:240:66 | container : ArrayListValuedHashMap [<map.key>] : String | Test.java:240:58:240:75 | keySet(...) : Set [<element>] : String | provenance | MaD:760 |
+| Test.java:240:58:240:66 | container : HashSetValuedHashMap [<map.key>] : String | Test.java:240:58:240:75 | keySet(...) : Set [<element>] : String | provenance | MaD:760 |
+| Test.java:240:58:240:66 | container : MultiValuedMap [<map.key>] : Object | Test.java:240:58:240:75 | keySet(...) : Set [<element>] : Object | provenance | MaD:760 |
+| Test.java:240:58:240:66 | container : MultiValuedMap [<map.key>] : String | Test.java:240:58:240:75 | keySet(...) : Set [<element>] : String | provenance | MaD:760 |
+| Test.java:240:58:240:66 | container : TransformedMultiValuedMap [<map.key>] : String | Test.java:240:58:240:75 | keySet(...) : Set [<element>] : String | provenance | MaD:760 |
+| Test.java:240:58:240:66 | container : UnmodifiableMultiValuedMap [<map.key>] : String | Test.java:240:58:240:75 | keySet(...) : Set [<element>] : String | provenance | MaD:760 |
+| Test.java:240:58:240:75 | keySet(...) : Set [<element>] : Object | Test.java:240:58:240:86 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:3 |
+| Test.java:240:58:240:75 | keySet(...) : Set [<element>] : String | Test.java:240:58:240:86 | iterator(...) : Iterator [<element>] : String | provenance | MaD:3 |
+| Test.java:240:58:240:75 | keySet(...) : Set [<element>] : String | Test.java:240:58:240:86 | iterator(...) : Iterator [<element>] : String | provenance | MaD:3 |
+| Test.java:240:58:240:75 | keySet(...) : Set [<element>] : String | Test.java:240:58:240:86 | iterator(...) : Iterator [<element>] : String | provenance | MaD:3 |
+| Test.java:240:58:240:75 | keySet(...) : Set [<element>] : String | Test.java:240:58:240:86 | iterator(...) : Iterator [<element>] : String | provenance | MaD:3 |
+| Test.java:240:58:240:75 | keySet(...) : Set [<element>] : String | Test.java:240:58:240:86 | iterator(...) : Iterator [<element>] : String | provenance | MaD:3 |
+| Test.java:240:58:240:86 | iterator(...) : Iterator [<element>] : Object | Test.java:240:58:240:93 | next(...) : Object | provenance | MaD:6 |
+| Test.java:240:58:240:86 | iterator(...) : Iterator [<element>] : String | Test.java:240:58:240:93 | next(...) : String | provenance | MaD:6 |
+| Test.java:240:58:240:86 | iterator(...) : Iterator [<element>] : String | Test.java:240:58:240:93 | next(...) : String | provenance | MaD:6 |
+| Test.java:240:58:240:86 | iterator(...) : Iterator [<element>] : String | Test.java:240:58:240:93 | next(...) : String | provenance | MaD:6 |
+| Test.java:240:58:240:86 | iterator(...) : Iterator [<element>] : String | Test.java:240:58:240:93 | next(...) : String | provenance | MaD:6 |
+| Test.java:240:58:240:86 | iterator(...) : Iterator [<element>] : String | Test.java:240:58:240:93 | next(...) : String | provenance | MaD:6 |
 | Test.java:241:25:241:42 | container : AbstractIterableGetMapDecorator [<map.key>] : String | Test.java:241:54:241:62 | container : AbstractIterableGetMapDecorator [<map.key>] : String | provenance |  |
 | Test.java:241:25:241:42 | container : TransformedSplitMap [<map.key>] : String | Test.java:241:54:241:62 | container : TransformedSplitMap [<map.key>] : String | provenance |  |
-| Test.java:241:54:241:62 | container : AbstractIterableGetMapDecorator [<map.key>] : String | Test.java:241:54:241:71 | keySet(...) : Set [<element>] : String | provenance | MaD:484 |
-| Test.java:241:54:241:62 | container : TransformedSplitMap [<map.key>] : String | Test.java:241:54:241:71 | keySet(...) : Set [<element>] : String | provenance | MaD:484 |
-| Test.java:241:54:241:71 | keySet(...) : Set [<element>] : String | Test.java:241:54:241:82 | iterator(...) : Iterator [<element>] : String | provenance | MaD:1 |
-| Test.java:241:54:241:71 | keySet(...) : Set [<element>] : String | Test.java:241:54:241:82 | iterator(...) : Iterator [<element>] : String | provenance | MaD:1 |
-| Test.java:241:54:241:82 | iterator(...) : Iterator [<element>] : String | Test.java:241:54:241:89 | next(...) : String | provenance | MaD:4 |
-| Test.java:241:54:241:82 | iterator(...) : Iterator [<element>] : String | Test.java:241:54:241:89 | next(...) : String | provenance | MaD:4 |
+| Test.java:241:54:241:62 | container : AbstractIterableGetMapDecorator [<map.key>] : String | Test.java:241:54:241:71 | keySet(...) : Set [<element>] : String | provenance | MaD:559 |
+| Test.java:241:54:241:62 | container : TransformedSplitMap [<map.key>] : String | Test.java:241:54:241:71 | keySet(...) : Set [<element>] : String | provenance | MaD:559 |
+| Test.java:241:54:241:71 | keySet(...) : Set [<element>] : String | Test.java:241:54:241:82 | iterator(...) : Iterator [<element>] : String | provenance | MaD:3 |
+| Test.java:241:54:241:71 | keySet(...) : Set [<element>] : String | Test.java:241:54:241:82 | iterator(...) : Iterator [<element>] : String | provenance | MaD:3 |
+| Test.java:241:54:241:82 | iterator(...) : Iterator [<element>] : String | Test.java:241:54:241:89 | next(...) : String | provenance | MaD:6 |
+| Test.java:241:54:241:82 | iterator(...) : Iterator [<element>] : String | Test.java:241:54:241:89 | next(...) : String | provenance | MaD:6 |
 | Test.java:242:27:242:44 | container : Put [<map.key>] : Object | Test.java:242:66:242:84 | (...)... : Put [<map.key>] : Object | provenance |  |
 | Test.java:242:27:242:44 | container : Put [<map.key>] : String | Test.java:242:66:242:84 | (...)... : Put [<map.key>] : String | provenance |  |
 | Test.java:242:66:242:84 | (...)... : Put [<map.key>] : Object | Test.java:228:18:228:29 | map : Put [<map.key>] : Object | provenance |  |
-| Test.java:242:66:242:84 | (...)... : Put [<map.key>] : Object | Test.java:242:56:242:85 | getMapKey(...) : Object | provenance | MaD:10 |
+| Test.java:242:66:242:84 | (...)... : Put [<map.key>] : Object | Test.java:242:56:242:85 | getMapKey(...) : Object | provenance | MaD:18 |
 | Test.java:242:66:242:84 | (...)... : Put [<map.key>] : String | Test.java:228:18:228:29 | map : Put [<map.key>] : String | provenance |  |
-| Test.java:242:66:242:84 | (...)... : Put [<map.key>] : String | Test.java:242:56:242:85 | getMapKey(...) : String | provenance | MaD:10 |
+| Test.java:242:66:242:84 | (...)... : Put [<map.key>] : String | Test.java:242:56:242:85 | getMapKey(...) : String | provenance | MaD:18 |
 | Test.java:243:20:243:50 | container : AbstractMapEntry [<map.value>] : Object | Test.java:243:62:243:70 | container : AbstractMapEntry [<map.value>] : Object | provenance |  |
 | Test.java:243:20:243:50 | container : DefaultKeyValue [<map.value>] : Object | Test.java:243:62:243:70 | container : DefaultKeyValue [<map.value>] : Object | provenance |  |
 | Test.java:243:20:243:50 | container : DefaultKeyValue [<map.value>] : String | Test.java:243:62:243:70 | container : DefaultKeyValue [<map.value>] : String | provenance |  |
@@ -1577,58 +1577,58 @@ edges
 | Test.java:243:20:243:50 | container : MyAbstractMapEntry [<map.value>] : Object | Test.java:243:62:243:70 | container : MyAbstractMapEntry [<map.value>] : Object | provenance |  |
 | Test.java:243:20:243:50 | container : UnmodifiableMapEntry [<map.value>] : Object | Test.java:243:62:243:70 | container : UnmodifiableMapEntry [<map.value>] : Object | provenance |  |
 | Test.java:243:20:243:50 | container : UnmodifiableMapEntry [<map.value>] : String | Test.java:243:62:243:70 | container : UnmodifiableMapEntry [<map.value>] : String | provenance |  |
-| Test.java:243:62:243:70 | container : AbstractMapEntry [<map.value>] : Object | Test.java:243:62:243:81 | getValue(...) : Object | provenance | MaD:569 |
-| Test.java:243:62:243:70 | container : DefaultKeyValue [<map.value>] : Object | Test.java:243:62:243:81 | getValue(...) : Object | provenance | MaD:569 |
-| Test.java:243:62:243:70 | container : DefaultKeyValue [<map.value>] : String | Test.java:243:62:243:81 | getValue(...) : String | provenance | MaD:569 |
-| Test.java:243:62:243:70 | container : DefaultMapEntry [<map.value>] : Object | Test.java:243:62:243:81 | getValue(...) : Object | provenance | MaD:569 |
-| Test.java:243:62:243:70 | container : DefaultMapEntry [<map.value>] : String | Test.java:243:62:243:81 | getValue(...) : String | provenance | MaD:569 |
-| Test.java:243:62:243:70 | container : MyAbstractKeyValue [<map.value>] : Object | Test.java:243:62:243:81 | getValue(...) : Object | provenance | MaD:569 |
-| Test.java:243:62:243:70 | container : MyAbstractMapEntry [<map.value>] : Object | Test.java:243:62:243:81 | getValue(...) : Object | provenance | MaD:569 |
-| Test.java:243:62:243:70 | container : UnmodifiableMapEntry [<map.value>] : Object | Test.java:243:62:243:81 | getValue(...) : Object | provenance | MaD:569 |
-| Test.java:243:62:243:70 | container : UnmodifiableMapEntry [<map.value>] : String | Test.java:243:62:243:81 | getValue(...) : String | provenance | MaD:569 |
+| Test.java:243:62:243:70 | container : AbstractMapEntry [<map.value>] : Object | Test.java:243:62:243:81 | getValue(...) : Object | provenance | MaD:644 |
+| Test.java:243:62:243:70 | container : DefaultKeyValue [<map.value>] : Object | Test.java:243:62:243:81 | getValue(...) : Object | provenance | MaD:644 |
+| Test.java:243:62:243:70 | container : DefaultKeyValue [<map.value>] : String | Test.java:243:62:243:81 | getValue(...) : String | provenance | MaD:644 |
+| Test.java:243:62:243:70 | container : DefaultMapEntry [<map.value>] : Object | Test.java:243:62:243:81 | getValue(...) : Object | provenance | MaD:644 |
+| Test.java:243:62:243:70 | container : DefaultMapEntry [<map.value>] : String | Test.java:243:62:243:81 | getValue(...) : String | provenance | MaD:644 |
+| Test.java:243:62:243:70 | container : MyAbstractKeyValue [<map.value>] : Object | Test.java:243:62:243:81 | getValue(...) : Object | provenance | MaD:644 |
+| Test.java:243:62:243:70 | container : MyAbstractMapEntry [<map.value>] : Object | Test.java:243:62:243:81 | getValue(...) : Object | provenance | MaD:644 |
+| Test.java:243:62:243:70 | container : UnmodifiableMapEntry [<map.value>] : Object | Test.java:243:62:243:81 | getValue(...) : Object | provenance | MaD:644 |
+| Test.java:243:62:243:70 | container : UnmodifiableMapEntry [<map.value>] : String | Test.java:243:62:243:81 | getValue(...) : String | provenance | MaD:644 |
 | Test.java:244:29:244:52 | container : Entry [<map.value>] : Object | Test.java:244:64:244:72 | container : Entry [<map.value>] : Object | provenance |  |
 | Test.java:244:29:244:52 | container : Entry [<map.value>] : String | Test.java:244:64:244:72 | container : Entry [<map.value>] : String | provenance |  |
 | Test.java:244:29:244:52 | container : TiedMapEntry [<map.value>] : String | Test.java:244:64:244:72 | container : TiedMapEntry [<map.value>] : String | provenance |  |
-| Test.java:244:64:244:72 | container : Entry [<map.value>] : Object | Test.java:244:64:244:83 | getValue(...) : Object | provenance | MaD:21 |
-| Test.java:244:64:244:72 | container : Entry [<map.value>] : String | Test.java:244:64:244:83 | getValue(...) : String | provenance | MaD:21 |
-| Test.java:244:64:244:72 | container : TiedMapEntry [<map.value>] : String | Test.java:244:64:244:83 | getValue(...) : String | provenance | MaD:21 |
+| Test.java:244:64:244:72 | container : Entry [<map.value>] : Object | Test.java:244:64:244:83 | getValue(...) : Object | provenance | MaD:10 |
+| Test.java:244:64:244:72 | container : Entry [<map.value>] : String | Test.java:244:64:244:83 | getValue(...) : String | provenance | MaD:10 |
+| Test.java:244:64:244:72 | container : TiedMapEntry [<map.value>] : String | Test.java:244:64:244:83 | getValue(...) : String | provenance | MaD:10 |
 | Test.java:245:20:245:59 | container : MyAbstractMapEntryDecorator [<map.value>] : String | Test.java:245:71:245:79 | container : MyAbstractMapEntryDecorator [<map.value>] : String | provenance |  |
-| Test.java:245:71:245:79 | container : MyAbstractMapEntryDecorator [<map.value>] : String | Test.java:245:71:245:90 | getValue(...) : String | provenance | MaD:21 |
-| Test.java:245:71:245:79 | container : MyAbstractMapEntryDecorator [<map.value>] : String | Test.java:245:71:245:90 | getValue(...) : String | provenance | MaD:569 |
+| Test.java:245:71:245:79 | container : MyAbstractMapEntryDecorator [<map.value>] : String | Test.java:245:71:245:90 | getValue(...) : String | provenance | MaD:10 |
+| Test.java:245:71:245:79 | container : MyAbstractMapEntryDecorator [<map.value>] : String | Test.java:245:71:245:90 | getValue(...) : String | provenance | MaD:644 |
 | Test.java:246:20:246:47 | mapIterator : EntrySetToMapIteratorAdapter [<map.value>] : String | Test.java:246:59:246:69 | mapIterator : EntrySetToMapIteratorAdapter [<map.value>] : String | provenance |  |
 | Test.java:246:20:246:47 | mapIterator : MapIterator [<map.value>] : Object | Test.java:246:59:246:69 | mapIterator : MapIterator [<map.value>] : Object | provenance |  |
 | Test.java:246:20:246:47 | mapIterator : MapIterator [<map.value>] : String | Test.java:246:59:246:69 | mapIterator : MapIterator [<map.value>] : String | provenance |  |
 | Test.java:246:20:246:47 | mapIterator : MyAbstractMapIteratorDecorator [<map.value>] : String | Test.java:246:59:246:69 | mapIterator : MyAbstractMapIteratorDecorator [<map.value>] : String | provenance |  |
 | Test.java:246:20:246:47 | mapIterator : MyAbstractOrderedMapIteratorDecorator [<map.value>] : String | Test.java:246:59:246:69 | mapIterator : MyAbstractOrderedMapIteratorDecorator [<map.value>] : String | provenance |  |
 | Test.java:246:20:246:47 | mapIterator : OrderedMapIterator [<map.value>] : String | Test.java:246:59:246:69 | mapIterator : OrderedMapIterator [<map.value>] : String | provenance |  |
-| Test.java:246:59:246:69 | mapIterator : EntrySetToMapIteratorAdapter [<map.value>] : String | Test.java:246:59:246:80 | getValue(...) : String | provenance | MaD:598 |
-| Test.java:246:59:246:69 | mapIterator : MapIterator [<map.value>] : Object | Test.java:246:59:246:80 | getValue(...) : Object | provenance | MaD:598 |
-| Test.java:246:59:246:69 | mapIterator : MapIterator [<map.value>] : String | Test.java:246:59:246:80 | getValue(...) : String | provenance | MaD:598 |
-| Test.java:246:59:246:69 | mapIterator : MyAbstractMapIteratorDecorator [<map.value>] : String | Test.java:246:59:246:80 | getValue(...) : String | provenance | MaD:598 |
-| Test.java:246:59:246:69 | mapIterator : MyAbstractOrderedMapIteratorDecorator [<map.value>] : String | Test.java:246:59:246:80 | getValue(...) : String | provenance | MaD:598 |
-| Test.java:246:59:246:69 | mapIterator : OrderedMapIterator [<map.value>] : String | Test.java:246:59:246:80 | getValue(...) : String | provenance | MaD:598 |
+| Test.java:246:59:246:69 | mapIterator : EntrySetToMapIteratorAdapter [<map.value>] : String | Test.java:246:59:246:80 | getValue(...) : String | provenance | MaD:673 |
+| Test.java:246:59:246:69 | mapIterator : MapIterator [<map.value>] : Object | Test.java:246:59:246:80 | getValue(...) : Object | provenance | MaD:673 |
+| Test.java:246:59:246:69 | mapIterator : MapIterator [<map.value>] : String | Test.java:246:59:246:80 | getValue(...) : String | provenance | MaD:673 |
+| Test.java:246:59:246:69 | mapIterator : MyAbstractMapIteratorDecorator [<map.value>] : String | Test.java:246:59:246:80 | getValue(...) : String | provenance | MaD:673 |
+| Test.java:246:59:246:69 | mapIterator : MyAbstractOrderedMapIteratorDecorator [<map.value>] : String | Test.java:246:59:246:80 | getValue(...) : String | provenance | MaD:673 |
+| Test.java:246:59:246:69 | mapIterator : OrderedMapIterator [<map.value>] : String | Test.java:246:59:246:80 | getValue(...) : String | provenance | MaD:673 |
 | Test.java:247:32:247:60 | container : ArrayListValuedHashMap [<map.value>, <element>] : String | Test.java:247:72:247:80 | container : ArrayListValuedHashMap [<map.value>, <element>] : String | provenance |  |
 | Test.java:247:32:247:60 | container : HashSetValuedHashMap [<map.value>, <element>] : String | Test.java:247:72:247:80 | container : HashSetValuedHashMap [<map.value>, <element>] : String | provenance |  |
 | Test.java:247:32:247:60 | container : MultiValuedMap [<map.value>, <element>] : Object | Test.java:247:72:247:80 | container : MultiValuedMap [<map.value>, <element>] : Object | provenance |  |
 | Test.java:247:32:247:60 | container : MultiValuedMap [<map.value>, <element>] : String | Test.java:247:72:247:80 | container : MultiValuedMap [<map.value>, <element>] : String | provenance |  |
 | Test.java:247:32:247:60 | container : TransformedMultiValuedMap [<map.value>, <element>] : String | Test.java:247:72:247:80 | container : TransformedMultiValuedMap [<map.value>, <element>] : String | provenance |  |
 | Test.java:247:32:247:60 | container : UnmodifiableMultiValuedMap [<map.value>, <element>] : String | Test.java:247:72:247:80 | container : UnmodifiableMultiValuedMap [<map.value>, <element>] : String | provenance |  |
-| Test.java:247:72:247:80 | container : ArrayListValuedHashMap [<map.value>, <element>] : String | Test.java:247:72:247:90 | get(...) : Collection [<element>] : String | provenance | MaD:684 |
-| Test.java:247:72:247:80 | container : HashSetValuedHashMap [<map.value>, <element>] : String | Test.java:247:72:247:90 | get(...) : Collection [<element>] : String | provenance | MaD:684 |
-| Test.java:247:72:247:80 | container : MultiValuedMap [<map.value>, <element>] : Object | Test.java:247:72:247:90 | get(...) : Collection [<element>] : Object | provenance | MaD:684 |
-| Test.java:247:72:247:80 | container : MultiValuedMap [<map.value>, <element>] : String | Test.java:247:72:247:90 | get(...) : Collection [<element>] : String | provenance | MaD:684 |
-| Test.java:247:72:247:80 | container : TransformedMultiValuedMap [<map.value>, <element>] : String | Test.java:247:72:247:90 | get(...) : Collection [<element>] : String | provenance | MaD:684 |
-| Test.java:247:72:247:80 | container : UnmodifiableMultiValuedMap [<map.value>, <element>] : String | Test.java:247:72:247:90 | get(...) : Collection [<element>] : String | provenance | MaD:684 |
+| Test.java:247:72:247:80 | container : ArrayListValuedHashMap [<map.value>, <element>] : String | Test.java:247:72:247:90 | get(...) : Collection [<element>] : String | provenance | MaD:759 |
+| Test.java:247:72:247:80 | container : HashSetValuedHashMap [<map.value>, <element>] : String | Test.java:247:72:247:90 | get(...) : Collection [<element>] : String | provenance | MaD:759 |
+| Test.java:247:72:247:80 | container : MultiValuedMap [<map.value>, <element>] : Object | Test.java:247:72:247:90 | get(...) : Collection [<element>] : Object | provenance | MaD:759 |
+| Test.java:247:72:247:80 | container : MultiValuedMap [<map.value>, <element>] : String | Test.java:247:72:247:90 | get(...) : Collection [<element>] : String | provenance | MaD:759 |
+| Test.java:247:72:247:80 | container : TransformedMultiValuedMap [<map.value>, <element>] : String | Test.java:247:72:247:90 | get(...) : Collection [<element>] : String | provenance | MaD:759 |
+| Test.java:247:72:247:80 | container : UnmodifiableMultiValuedMap [<map.value>, <element>] : String | Test.java:247:72:247:90 | get(...) : Collection [<element>] : String | provenance | MaD:759 |
 | Test.java:248:27:248:44 | container : AbstractIterableGetMapDecorator [<map.value>] : String | Test.java:248:56:248:64 | container : AbstractIterableGetMapDecorator [<map.value>] : String | provenance |  |
 | Test.java:248:27:248:44 | container : TransformedSplitMap [<map.value>] : String | Test.java:248:56:248:64 | container : TransformedSplitMap [<map.value>] : String | provenance |  |
-| Test.java:248:56:248:64 | container : AbstractIterableGetMapDecorator [<map.value>] : String | Test.java:248:56:248:74 | get(...) : String | provenance | MaD:483 |
-| Test.java:248:56:248:64 | container : TransformedSplitMap [<map.value>] : String | Test.java:248:56:248:74 | get(...) : String | provenance | MaD:483 |
+| Test.java:248:56:248:64 | container : AbstractIterableGetMapDecorator [<map.value>] : String | Test.java:248:56:248:74 | get(...) : String | provenance | MaD:558 |
+| Test.java:248:56:248:64 | container : TransformedSplitMap [<map.value>] : String | Test.java:248:56:248:74 | get(...) : String | provenance | MaD:558 |
 | Test.java:249:29:249:46 | container : Put [<map.value>] : Object | Test.java:249:70:249:88 | (...)... : Put [<map.value>] : Object | provenance |  |
 | Test.java:249:29:249:46 | container : Put [<map.value>] : String | Test.java:249:70:249:88 | (...)... : Put [<map.value>] : String | provenance |  |
 | Test.java:249:70:249:88 | (...)... : Put [<map.value>] : Object | Test.java:232:20:232:31 | map : Put [<map.value>] : Object | provenance |  |
-| Test.java:249:70:249:88 | (...)... : Put [<map.value>] : Object | Test.java:249:58:249:89 | getMapValue(...) : Object | provenance | MaD:9 |
+| Test.java:249:70:249:88 | (...)... : Put [<map.value>] : Object | Test.java:249:58:249:89 | getMapValue(...) : Object | provenance | MaD:17 |
 | Test.java:249:70:249:88 | (...)... : Put [<map.value>] : String | Test.java:232:20:232:31 | map : Put [<map.value>] : String | provenance |  |
-| Test.java:249:70:249:88 | (...)... : Put [<map.value>] : String | Test.java:249:58:249:89 | getMapValue(...) : String | provenance | MaD:9 |
+| Test.java:249:70:249:88 | (...)... : Put [<map.value>] : String | Test.java:249:58:249:89 | getMapValue(...) : String | provenance | MaD:17 |
 | Test.java:251:31:251:44 | element : MyAbstractKeyValue [<map.key>] : String | Test.java:251:70:251:76 | element : MyAbstractKeyValue [<map.key>] : String | provenance |  |
 | Test.java:251:31:251:44 | element : MyAbstractKeyValue [<map.value>] : String | Test.java:251:70:251:76 | element : MyAbstractKeyValue [<map.value>] : String | provenance |  |
 | Test.java:251:31:251:44 | element : Object[] [[]] : String | Test.java:251:70:251:76 | element : Object[] [[]] : String | provenance |  |
@@ -1643,31 +1643,31 @@ edges
 | Test.java:251:70:251:76 | element : String | Test.java:251:56:251:77 | {...} : Object[] [[]] : String | provenance |  |
 | Test.java:252:45:252:53 | element : String | Test.java:252:103:252:109 | element : String | provenance |  |
 | Test.java:252:96:252:96 | a [post update] : ArrayStack [<element>] : String | Test.java:252:120:252:120 | a : ArrayStack [<element>] : String | provenance |  |
-| Test.java:252:103:252:109 | element : String | Test.java:252:96:252:96 | a [post update] : ArrayStack [<element>] : String | provenance | MaD:393 |
+| Test.java:252:103:252:109 | element : String | Test.java:252:96:252:96 | a [post update] : ArrayStack [<element>] : String | provenance | MaD:468 |
 | Test.java:253:59:253:67 | element : String | Test.java:253:130:253:136 | element : String | provenance |  |
 | Test.java:253:124:253:124 | x [post update] : CircularFifoQueue [<element>] : String | Test.java:253:147:253:147 | x : CircularFifoQueue [<element>] : String | provenance |  |
-| Test.java:253:130:253:136 | element : String | Test.java:253:124:253:124 | x [post update] : CircularFifoQueue [<element>] : String | provenance | MaD:2 |
+| Test.java:253:130:253:136 | element : String | Test.java:253:124:253:124 | x [post update] : CircularFifoQueue [<element>] : String | provenance | MaD:4 |
 | Test.java:254:49:254:57 | element : String | Test.java:254:118:254:124 | element : String | provenance |  |
-| Test.java:254:89:254:125 | newListOrderedSetWithElement(...) : ListOrderedSet [<element>] : String | Test.java:254:69:254:126 | new CompositeSet<T>(...) : CompositeSet [<element>] : String | provenance | MaD:781 |
-| Test.java:254:118:254:124 | element : String | Test.java:254:89:254:125 | newListOrderedSetWithElement(...) : ListOrderedSet [<element>] : String | provenance | MaD:2 |
+| Test.java:254:89:254:125 | newListOrderedSetWithElement(...) : ListOrderedSet [<element>] : String | Test.java:254:69:254:126 | new CompositeSet<T>(...) : CompositeSet [<element>] : String | provenance | MaD:430 |
+| Test.java:254:118:254:124 | element : String | Test.java:254:89:254:125 | newListOrderedSetWithElement(...) : ListOrderedSet [<element>] : String | provenance | MaD:4 |
 | Test.java:254:118:254:124 | element : String | Test.java:260:53:260:61 | element : String | provenance |  |
 | Test.java:255:65:255:73 | element : String | Test.java:255:142:255:148 | element : String | provenance |  |
 | Test.java:255:136:255:136 | x [post update] : CursorableLinkedList [<element>] : String | Test.java:255:159:255:159 | x : CursorableLinkedList [<element>] : String | provenance |  |
-| Test.java:255:142:255:148 | element : String | Test.java:255:136:255:136 | x [post update] : CursorableLinkedList [<element>] : String | provenance | MaD:2 |
+| Test.java:255:142:255:148 | element : String | Test.java:255:136:255:136 | x [post update] : CursorableLinkedList [<element>] : String | provenance | MaD:4 |
 | Test.java:256:47:256:55 | element : String | Test.java:256:115:256:121 | element : String | provenance |  |
-| Test.java:256:94:256:122 | newVectorWithElement(...) : Vector [<element>] : String | Test.java:256:94:256:133 | iterator(...) : Iterator [<element>] : String | provenance | MaD:1 |
-| Test.java:256:94:256:133 | iterator(...) : Iterator [<element>] : String | Test.java:256:67:256:134 | new IteratorEnumeration<T>(...) : IteratorEnumeration [<element>] : String | provenance | MaD:154 |
-| Test.java:256:115:256:121 | element : String | Test.java:256:94:256:122 | newVectorWithElement(...) : Vector [<element>] : String | provenance | MaD:2 |
+| Test.java:256:94:256:122 | newVectorWithElement(...) : Vector [<element>] : String | Test.java:256:94:256:133 | iterator(...) : Iterator [<element>] : String | provenance | MaD:3 |
+| Test.java:256:94:256:133 | iterator(...) : Iterator [<element>] : String | Test.java:256:67:256:134 | new IteratorEnumeration<T>(...) : IteratorEnumeration [<element>] : String | provenance | MaD:156 |
+| Test.java:256:115:256:121 | element : String | Test.java:256:94:256:122 | newVectorWithElement(...) : Vector [<element>] : String | provenance | MaD:4 |
 | Test.java:256:115:256:121 | element : String | Test.java:269:37:269:45 | element : String | provenance |  |
 | Test.java:257:53:257:61 | element : String | Test.java:257:91:257:97 | element : String | provenance |  |
-| Test.java:257:91:257:97 | element : String | Test.java:257:73:257:98 | of(...) : FluentIterable [<element>] : String | provenance | MaD:469 |
+| Test.java:257:91:257:97 | element : String | Test.java:257:73:257:98 | of(...) : FluentIterable [<element>] : String | provenance | MaD:544 |
 | Test.java:258:49:258:57 | element : String | Test.java:258:110:258:116 | element : String | provenance |  |
 | Test.java:258:104:258:104 | x [post update] : HashMultiSet [<element>] : String | Test.java:258:127:258:127 | x : HashMultiSet [<element>] : String | provenance |  |
-| Test.java:258:110:258:116 | element : String | Test.java:258:104:258:104 | x [post update] : HashMultiSet [<element>] : String | provenance | MaD:2 |
-| Test.java:258:110:258:116 | element : String | Test.java:258:104:258:104 | x [post update] : HashMultiSet [<element>] : String | provenance | MaD:673 |
+| Test.java:258:110:258:116 | element : String | Test.java:258:104:258:104 | x [post update] : HashMultiSet [<element>] : String | provenance | MaD:4 |
+| Test.java:258:110:258:116 | element : String | Test.java:258:104:258:104 | x [post update] : HashMultiSet [<element>] : String | provenance | MaD:749 |
 | Test.java:259:49:259:57 | element : String | Test.java:259:90:259:96 | element : String | provenance |  |
-| Test.java:259:69:259:97 | newVectorWithElement(...) : Vector [<element>] : String | Test.java:259:69:259:112 | listIterator(...) : ListIterator [<element>] : String | provenance | MaD:5 |
-| Test.java:259:90:259:96 | element : String | Test.java:259:69:259:97 | newVectorWithElement(...) : Vector [<element>] : String | provenance | MaD:2 |
+| Test.java:259:69:259:97 | newVectorWithElement(...) : Vector [<element>] : String | Test.java:259:69:259:112 | listIterator(...) : ListIterator [<element>] : String | provenance | MaD:8 |
+| Test.java:259:90:259:96 | element : String | Test.java:259:69:259:97 | newVectorWithElement(...) : Vector [<element>] : String | provenance | MaD:4 |
 | Test.java:259:90:259:96 | element : String | Test.java:269:37:269:45 | element : String | provenance |  |
 | Test.java:260:53:260:61 | element : String | Test.java:260:118:260:124 | element : String | provenance |  |
 | Test.java:260:53:260:61 | element : TiedMapEntry [<map.key>] : String | Test.java:260:118:260:124 | element : TiedMapEntry [<map.key>] : String | provenance |  |
@@ -1675,891 +1675,891 @@ edges
 | Test.java:260:112:260:112 | x [post update] : ListOrderedSet [<element>, <map.key>] : String | Test.java:260:135:260:135 | x : ListOrderedSet [<element>, <map.key>] : String | provenance |  |
 | Test.java:260:112:260:112 | x [post update] : ListOrderedSet [<element>, <map.value>] : String | Test.java:260:135:260:135 | x : ListOrderedSet [<element>, <map.value>] : String | provenance |  |
 | Test.java:260:112:260:112 | x [post update] : ListOrderedSet [<element>] : String | Test.java:260:135:260:135 | x : ListOrderedSet [<element>] : String | provenance |  |
-| Test.java:260:118:260:124 | element : String | Test.java:260:112:260:112 | x [post update] : ListOrderedSet [<element>] : String | provenance | MaD:2 |
-| Test.java:260:118:260:124 | element : TiedMapEntry [<map.key>] : String | Test.java:260:112:260:112 | x [post update] : ListOrderedSet [<element>, <map.key>] : String | provenance | MaD:2 |
-| Test.java:260:118:260:124 | element : TiedMapEntry [<map.value>] : String | Test.java:260:112:260:112 | x [post update] : ListOrderedSet [<element>, <map.value>] : String | provenance | MaD:2 |
+| Test.java:260:118:260:124 | element : String | Test.java:260:112:260:112 | x [post update] : ListOrderedSet [<element>] : String | provenance | MaD:4 |
+| Test.java:260:118:260:124 | element : TiedMapEntry [<map.key>] : String | Test.java:260:112:260:112 | x [post update] : ListOrderedSet [<element>, <map.key>] : String | provenance | MaD:4 |
+| Test.java:260:118:260:124 | element : TiedMapEntry [<map.value>] : String | Test.java:260:112:260:112 | x [post update] : ListOrderedSet [<element>, <map.value>] : String | provenance | MaD:4 |
 | Test.java:261:41:261:49 | element : String | Test.java:261:77:261:83 | element : String | provenance |  |
-| Test.java:261:77:261:83 | element : String | Test.java:261:61:261:93 | new MultiKey<T>(...) : MultiKey [<element>] : String | provenance | MaD:215 |
+| Test.java:261:77:261:83 | element : String | Test.java:261:61:261:93 | new MultiKey<T>(...) : MultiKey [<element>] : String | provenance | MaD:217 |
 | Test.java:262:52:262:60 | element : String | Test.java:262:106:262:112 | element : String | provenance |  |
-| Test.java:262:83:262:113 | newMultiSetWithElement(...) : HashMultiSet [<element>] : String | Test.java:262:83:262:124 | entrySet(...) : Set [<element>, <element>] : String | provenance | MaD:674 |
+| Test.java:262:83:262:113 | newMultiSetWithElement(...) : HashMultiSet [<element>] : String | Test.java:262:83:262:124 | entrySet(...) : Set [<element>, <element>] : String | provenance | MaD:750 |
 | Test.java:262:83:262:124 | entrySet(...) : Set [<element>, <element>] : String | Test.java:230:19:230:32 | it : Set [<element>, <element>] : String | provenance |  |
-| Test.java:262:83:262:124 | entrySet(...) : Set [<element>, <element>] : String | Test.java:262:72:262:125 | getElement(...) : Entry [<element>] : String | provenance | MaD:1 |
-| Test.java:262:106:262:112 | element : String | Test.java:262:83:262:113 | newMultiSetWithElement(...) : HashMultiSet [<element>] : String | provenance | MaD:2 |
-| Test.java:262:106:262:112 | element : String | Test.java:262:83:262:113 | newMultiSetWithElement(...) : HashMultiSet [<element>] : String | provenance | MaD:673 |
+| Test.java:262:83:262:124 | entrySet(...) : Set [<element>, <element>] : String | Test.java:262:72:262:125 | getElement(...) : Entry [<element>] : String | provenance | MaD:3 |
+| Test.java:262:106:262:112 | element : String | Test.java:262:83:262:113 | newMultiSetWithElement(...) : HashMultiSet [<element>] : String | provenance | MaD:4 |
+| Test.java:262:106:262:112 | element : String | Test.java:262:83:262:113 | newMultiSetWithElement(...) : HashMultiSet [<element>] : String | provenance | MaD:749 |
 | Test.java:262:106:262:112 | element : String | Test.java:263:41:263:49 | element : String | provenance |  |
 | Test.java:263:41:263:49 | element : String | Test.java:263:102:263:108 | element : String | provenance |  |
 | Test.java:263:96:263:96 | h [post update] : HashMultiSet [<element>] : String | Test.java:263:119:263:119 | h : HashMultiSet [<element>] : String | provenance |  |
-| Test.java:263:102:263:108 | element : String | Test.java:263:96:263:96 | h [post update] : HashMultiSet [<element>] : String | provenance | MaD:2 |
-| Test.java:263:102:263:108 | element : String | Test.java:263:96:263:96 | h [post update] : HashMultiSet [<element>] : String | provenance | MaD:673 |
+| Test.java:263:102:263:108 | element : String | Test.java:263:96:263:96 | h [post update] : HashMultiSet [<element>] : String | provenance | MaD:4 |
+| Test.java:263:102:263:108 | element : String | Test.java:263:96:263:96 | h [post update] : HashMultiSet [<element>] : String | provenance | MaD:749 |
 | Test.java:264:80:264:88 | element : String | Test.java:264:177:264:183 | element : String | provenance |  |
 | Test.java:264:171:264:171 | x [post update] : Builder [<element>] : String | Test.java:264:194:264:194 | x : Builder [<element>] : String | provenance |  |
-| Test.java:264:177:264:183 | element : String | Test.java:264:171:264:171 | x [post update] : Builder [<element>] : String | provenance | MaD:97 |
+| Test.java:264:177:264:183 | element : String | Test.java:264:171:264:171 | x [post update] : Builder [<element>] : String | provenance | MaD:98 |
 | Test.java:265:35:265:43 | element : String | Test.java:265:92:265:98 | element : String | provenance |  |
 | Test.java:265:86:265:86 | q [post update] : LinkedList [<element>] : String | Test.java:265:109:265:109 | q : LinkedList [<element>] : String | provenance |  |
-| Test.java:265:92:265:98 | element : String | Test.java:265:86:265:86 | q [post update] : LinkedList [<element>] : String | provenance | MaD:2 |
+| Test.java:265:92:265:98 | element : String | Test.java:265:86:265:86 | q [post update] : LinkedList [<element>] : String | provenance | MaD:4 |
 | Test.java:266:41:266:49 | element : String | Test.java:266:96:266:102 | element : String | provenance |  |
 | Test.java:266:90:266:90 | s [post update] : MySetView [<element>] : String | Test.java:266:113:266:113 | s : MySetView [<element>] : String | provenance |  |
-| Test.java:266:96:266:102 | element : String | Test.java:266:90:266:90 | s [post update] : MySetView [<element>] : String | provenance | MaD:2 |
+| Test.java:266:96:266:102 | element : String | Test.java:266:90:266:90 | s [post update] : MySetView [<element>] : String | provenance | MaD:4 |
 | Test.java:267:39:267:47 | element : ListIterator [<element>] : String | Test.java:267:90:267:96 | element : ListIterator [<element>] : String | provenance |  |
 | Test.java:267:39:267:47 | element : String | Test.java:267:90:267:96 | element : String | provenance |  |
 | Test.java:267:84:267:84 | b [post update] : TreeBag [<element>, <element>] : String | Test.java:267:107:267:107 | b : TreeBag [<element>, <element>] : String | provenance |  |
 | Test.java:267:84:267:84 | b [post update] : TreeBag [<element>] : String | Test.java:267:107:267:107 | b : TreeBag [<element>] : String | provenance |  |
-| Test.java:267:90:267:96 | element : ListIterator [<element>] : String | Test.java:267:84:267:84 | b [post update] : TreeBag [<element>, <element>] : String | provenance | MaD:2 |
-| Test.java:267:90:267:96 | element : ListIterator [<element>] : String | Test.java:267:84:267:84 | b [post update] : TreeBag [<element>, <element>] : String | provenance | MaD:395 |
-| Test.java:267:90:267:96 | element : String | Test.java:267:84:267:84 | b [post update] : TreeBag [<element>] : String | provenance | MaD:2 |
-| Test.java:267:90:267:96 | element : String | Test.java:267:84:267:84 | b [post update] : TreeBag [<element>] : String | provenance | MaD:395 |
+| Test.java:267:90:267:96 | element : ListIterator [<element>] : String | Test.java:267:84:267:84 | b [post update] : TreeBag [<element>, <element>] : String | provenance | MaD:4 |
+| Test.java:267:90:267:96 | element : ListIterator [<element>] : String | Test.java:267:84:267:84 | b [post update] : TreeBag [<element>, <element>] : String | provenance | MaD:470 |
+| Test.java:267:90:267:96 | element : String | Test.java:267:84:267:84 | b [post update] : TreeBag [<element>] : String | provenance | MaD:4 |
+| Test.java:267:90:267:96 | element : String | Test.java:267:84:267:84 | b [post update] : TreeBag [<element>] : String | provenance | MaD:470 |
 | Test.java:268:39:268:47 | element : String | Test.java:268:90:268:96 | element : String | provenance |  |
 | Test.java:268:84:268:84 | h [post update] : TreeSet [<element>] : String | Test.java:268:107:268:107 | h : TreeSet [<element>] : String | provenance |  |
-| Test.java:268:90:268:96 | element : String | Test.java:268:84:268:84 | h [post update] : TreeSet [<element>] : String | provenance | MaD:2 |
+| Test.java:268:90:268:96 | element : String | Test.java:268:84:268:84 | h [post update] : TreeSet [<element>] : String | provenance | MaD:4 |
 | Test.java:269:37:269:45 | element : String | Test.java:269:86:269:92 | element : String | provenance |  |
 | Test.java:269:80:269:80 | v [post update] : Vector [<element>] : String | Test.java:269:103:269:103 | v : Vector [<element>] : String | provenance |  |
-| Test.java:269:86:269:92 | element : String | Test.java:269:80:269:80 | v [post update] : Vector [<element>] : String | provenance | MaD:2 |
+| Test.java:269:86:269:92 | element : String | Test.java:269:80:269:80 | v [post update] : Vector [<element>] : String | provenance | MaD:4 |
 | Test.java:270:47:270:65 | element : Vector [<element>] : String | Test.java:270:116:270:122 | element : Vector [<element>] : String | provenance |  |
 | Test.java:270:110:270:110 | v [post update] : Vector [<element>, <element>] : String | Test.java:270:133:270:133 | v : Vector [<element>, <element>] : String | provenance |  |
-| Test.java:270:116:270:122 | element : Vector [<element>] : String | Test.java:270:110:270:110 | v [post update] : Vector [<element>, <element>] : String | provenance | MaD:2 |
+| Test.java:270:116:270:122 | element : Vector [<element>] : String | Test.java:270:110:270:110 | v [post update] : Vector [<element>, <element>] : String | provenance | MaD:4 |
 | Test.java:272:58:272:62 | key : String | Test.java:272:142:272:144 | key : String | provenance |  |
 | Test.java:272:136:272:136 | m [post update] : ArrayListValuedHashMap [<map.key>] : String | Test.java:272:160:272:160 | m : ArrayListValuedHashMap [<map.key>] : String | provenance |  |
-| Test.java:272:142:272:144 | key : String | Test.java:272:136:272:136 | m [post update] : ArrayListValuedHashMap [<map.key>] : String | provenance | MaD:689 |
+| Test.java:272:142:272:144 | key : String | Test.java:272:136:272:136 | m [post update] : ArrayListValuedHashMap [<map.key>] : String | provenance | MaD:764 |
 | Test.java:273:49:273:53 | key : String | Test.java:273:95:273:97 | key : String | provenance |  |
-| Test.java:273:95:273:97 | key : String | Test.java:273:65:273:103 | new DefaultKeyValue<K,String>(...) : DefaultKeyValue [<map.key>] : String | provenance | MaD:205 |
+| Test.java:273:95:273:97 | key : String | Test.java:273:65:273:103 | new DefaultKeyValue<K,String>(...) : DefaultKeyValue [<map.key>] : String | provenance | MaD:207 |
 | Test.java:274:61:274:65 | key : String | Test.java:274:114:274:116 | key : String | provenance |  |
-| Test.java:274:107:274:123 | of(...) : Map [<map.key>] : String | Test.java:274:77:274:124 | new DualTreeBidiMap<K,String>(...) : DualTreeBidiMap [<map.key>] : String | provenance | MaD:58 |
-| Test.java:274:114:274:116 | key : String | Test.java:274:107:274:123 | of(...) : Map [<map.key>] : String | provenance | MaD:11 |
+| Test.java:274:107:274:123 | of(...) : Map [<map.key>] : String | Test.java:274:77:274:124 | new DualTreeBidiMap<K,String>(...) : DualTreeBidiMap [<map.key>] : String | provenance | MaD:60 |
+| Test.java:274:114:274:116 | key : String | Test.java:274:107:274:123 | of(...) : Map [<map.key>] : String | provenance | MaD:13 |
 | Test.java:275:49:275:53 | key : String | Test.java:275:107:275:109 | key : String | provenance |  |
 | Test.java:275:101:275:101 | m [post update] : HashedMap [<map.key>] : String | Test.java:275:125:275:125 | m : HashedMap [<map.key>] : String | provenance |  |
-| Test.java:275:107:275:109 | key : String | Test.java:275:101:275:101 | m [post update] : HashedMap [<map.key>] : String | provenance | MaD:14 |
-| Test.java:275:107:275:109 | key : String | Test.java:275:101:275:101 | m [post update] : HashedMap [<map.key>] : String | provenance | MaD:705 |
+| Test.java:275:107:275:109 | key : String | Test.java:275:101:275:101 | m [post update] : HashedMap [<map.key>] : String | provenance | MaD:19 |
+| Test.java:275:107:275:109 | key : String | Test.java:275:101:275:101 | m [post update] : HashedMap [<map.key>] : String | provenance | MaD:779 |
 | Test.java:276:49:276:53 | key : String | Test.java:276:96:276:98 | key : String | provenance |  |
-| Test.java:276:89:276:105 | of(...) : Map [<map.key>] : String | Test.java:276:65:276:106 | new LinkedMap<K,String>(...) : LinkedMap [<map.key>] : String | provenance | MaD:317 |
-| Test.java:276:96:276:98 | key : String | Test.java:276:89:276:105 | of(...) : Map [<map.key>] : String | provenance | MaD:11 |
+| Test.java:276:89:276:105 | of(...) : Map [<map.key>] : String | Test.java:276:65:276:106 | new LinkedMap<K,String>(...) : LinkedMap [<map.key>] : String | provenance | MaD:319 |
+| Test.java:276:96:276:98 | key : String | Test.java:276:89:276:105 | of(...) : Map [<map.key>] : String | provenance | MaD:13 |
 | Test.java:277:59:277:63 | key : Object | Test.java:277:122:277:124 | key : Object | provenance |  |
 | Test.java:277:59:277:63 | key : String | Test.java:277:122:277:124 | key : String | provenance |  |
-| Test.java:277:115:277:131 | of(...) : Map [<map.key>] : Object | Test.java:277:75:277:132 | listOrderedMap(...) : ListOrderedMap [<map.key>] : Object | provenance | MaD:327 |
-| Test.java:277:115:277:131 | of(...) : Map [<map.key>] : String | Test.java:277:75:277:132 | listOrderedMap(...) : ListOrderedMap [<map.key>] : String | provenance | MaD:327 |
-| Test.java:277:122:277:124 | key : Object | Test.java:277:115:277:131 | of(...) : Map [<map.key>] : Object | provenance | MaD:11 |
-| Test.java:277:122:277:124 | key : String | Test.java:277:115:277:131 | of(...) : Map [<map.key>] : String | provenance | MaD:11 |
+| Test.java:277:115:277:131 | of(...) : Map [<map.key>] : Object | Test.java:277:75:277:132 | listOrderedMap(...) : ListOrderedMap [<map.key>] : Object | provenance | MaD:329 |
+| Test.java:277:115:277:131 | of(...) : Map [<map.key>] : String | Test.java:277:75:277:132 | listOrderedMap(...) : ListOrderedMap [<map.key>] : String | provenance | MaD:329 |
+| Test.java:277:122:277:124 | key : Object | Test.java:277:115:277:131 | of(...) : Map [<map.key>] : Object | provenance | MaD:13 |
+| Test.java:277:122:277:124 | key : String | Test.java:277:115:277:131 | of(...) : Map [<map.key>] : String | provenance | MaD:13 |
 | Test.java:279:47:279:51 | key : String | Test.java:279:113:279:115 | key : String | provenance |  |
 | Test.java:279:107:279:107 | m [post update] : MultiValueMap [<map.key>] : String | Test.java:279:131:279:131 | m : MultiValueMap [<map.key>] : String | provenance |  |
-| Test.java:279:113:279:115 | key : String | Test.java:279:107:279:107 | m [post update] : MultiValueMap [<map.key>] : String | provenance | MaD:14 |
-| Test.java:279:113:279:115 | key : String | Test.java:279:107:279:107 | m [post update] : MultiValueMap [<map.key>] : String | provenance | MaD:661 |
-| Test.java:279:113:279:115 | key : String | Test.java:279:107:279:107 | m [post update] : MultiValueMap [<map.key>] : String | provenance | MaD:705 |
+| Test.java:279:113:279:115 | key : String | Test.java:279:107:279:107 | m [post update] : MultiValueMap [<map.key>] : String | provenance | MaD:19 |
+| Test.java:279:113:279:115 | key : String | Test.java:279:107:279:107 | m [post update] : MultiValueMap [<map.key>] : String | provenance | MaD:736 |
+| Test.java:279:113:279:115 | key : String | Test.java:279:107:279:107 | m [post update] : MultiValueMap [<map.key>] : String | provenance | MaD:779 |
 | Test.java:280:53:280:57 | key : String | Test.java:280:102:280:104 | key : String | provenance |  |
-| Test.java:280:102:280:104 | key : String | Test.java:280:69:280:110 | new MyAbstractMapEntry<K,String>(...) : MyAbstractMapEntry [<map.key>] : String | provenance | MaD:195 |
+| Test.java:280:102:280:104 | key : String | Test.java:280:69:280:110 | new MyAbstractMapEntry<K,String>(...) : MyAbstractMapEntry [<map.key>] : String | provenance | MaD:197 |
 | Test.java:280:102:280:104 | key : String | Test.java:7057:22:7057:32 | key : String | provenance |  |
 | Test.java:281:63:281:67 | key : String | Test.java:281:139:281:141 | key : String | provenance |  |
-| Test.java:281:121:281:142 | newMAMEWithMapKey(...) : MyAbstractMapEntry [<map.key>] : String | Test.java:281:79:281:143 | new MyAbstractMapEntryDecorator<K,String>(...) : MyAbstractMapEntryDecorator [<map.key>] : String | provenance | MaD:197 |
+| Test.java:281:121:281:142 | newMAMEWithMapKey(...) : MyAbstractMapEntry [<map.key>] : String | Test.java:281:79:281:143 | new MyAbstractMapEntryDecorator<K,String>(...) : MyAbstractMapEntryDecorator [<map.key>] : String | provenance | MaD:199 |
 | Test.java:281:121:281:142 | newMAMEWithMapKey(...) : MyAbstractMapEntry [<map.key>] : String | Test.java:7067:31:7067:57 | entry : MyAbstractMapEntry [<map.key>] : String | provenance |  |
 | Test.java:281:139:281:141 | key : String | Test.java:280:53:280:57 | key : String | provenance |  |
-| Test.java:281:139:281:141 | key : String | Test.java:281:121:281:142 | newMAMEWithMapKey(...) : MyAbstractMapEntry [<map.key>] : String | provenance | MaD:195 |
+| Test.java:281:139:281:141 | key : String | Test.java:281:121:281:142 | newMAMEWithMapKey(...) : MyAbstractMapEntry [<map.key>] : String | provenance | MaD:197 |
 | Test.java:282:53:282:57 | key : String | Test.java:282:102:282:104 | key : String | provenance |  |
-| Test.java:282:102:282:104 | key : String | Test.java:282:69:282:110 | new MyAbstractKeyValue<K,String>(...) : MyAbstractKeyValue [<map.key>] : String | provenance | MaD:189 |
+| Test.java:282:102:282:104 | key : String | Test.java:282:69:282:110 | new MyAbstractKeyValue<K,String>(...) : MyAbstractKeyValue [<map.key>] : String | provenance | MaD:191 |
 | Test.java:282:102:282:104 | key : String | Test.java:7043:22:7043:26 | key : String | provenance |  |
 | Test.java:283:53:283:57 | key : String | Test.java:283:111:283:113 | key : String | provenance |  |
 | Test.java:283:105:283:105 | m [post update] : LinkedMap [<map.key>] : String | Test.java:283:129:283:129 | m : LinkedMap [<map.key>] : String | provenance |  |
-| Test.java:283:111:283:113 | key : String | Test.java:283:105:283:105 | m [post update] : LinkedMap [<map.key>] : String | provenance | MaD:14 |
-| Test.java:283:111:283:113 | key : String | Test.java:283:105:283:105 | m [post update] : LinkedMap [<map.key>] : String | provenance | MaD:705 |
-| Test.java:283:129:283:129 | m : LinkedMap [<map.key>] : String | Test.java:283:129:283:143 | mapIterator(...) : OrderedMapIterator [<element>] : String | provenance | MaD:487 |
+| Test.java:283:111:283:113 | key : String | Test.java:283:105:283:105 | m [post update] : LinkedMap [<map.key>] : String | provenance | MaD:19 |
+| Test.java:283:111:283:113 | key : String | Test.java:283:105:283:105 | m [post update] : LinkedMap [<map.key>] : String | provenance | MaD:779 |
+| Test.java:283:129:283:129 | m : LinkedMap [<map.key>] : String | Test.java:283:129:283:143 | mapIterator(...) : OrderedMapIterator [<element>] : String | provenance | MaD:562 |
 | Test.java:285:47:285:51 | key : String | Test.java:285:103:285:105 | key : String | provenance |  |
 | Test.java:285:97:285:97 | m [post update] : TreeMap [<map.key>] : String | Test.java:285:121:285:121 | m : TreeMap [<map.key>] : String | provenance |  |
-| Test.java:285:103:285:105 | key : String | Test.java:285:97:285:97 | m [post update] : TreeMap [<map.key>] : String | provenance | MaD:14 |
+| Test.java:285:103:285:105 | key : String | Test.java:285:97:285:97 | m [post update] : TreeMap [<map.key>] : String | provenance | MaD:19 |
 | Test.java:286:46:286:50 | key : String | Test.java:286:113:286:115 | key : String | provenance |  |
-| Test.java:286:113:286:115 | key : String | Test.java:286:62:286:116 | new TiedMapEntry<K,String>(...) : TiedMapEntry [<map.key>] : String | provenance | MaD:234 |
+| Test.java:286:113:286:115 | key : String | Test.java:286:62:286:116 | new TiedMapEntry<K,String>(...) : TiedMapEntry [<map.key>] : String | provenance | MaD:236 |
 | Test.java:287:75:287:79 | key : String | Test.java:287:137:287:139 | key : String | provenance |  |
 | Test.java:287:131:287:131 | m [post update] : TreeBidiMap [<map.key>] : String | Test.java:287:155:287:155 | m : TreeBidiMap [<map.key>] : String | provenance |  |
-| Test.java:287:137:287:139 | key : String | Test.java:287:131:287:131 | m [post update] : TreeBidiMap [<map.key>] : String | provenance | MaD:14 |
-| Test.java:287:137:287:139 | key : String | Test.java:287:131:287:131 | m [post update] : TreeBidiMap [<map.key>] : String | provenance | MaD:705 |
+| Test.java:287:137:287:139 | key : String | Test.java:287:131:287:131 | m [post update] : TreeBidiMap [<map.key>] : String | provenance | MaD:19 |
+| Test.java:287:137:287:139 | key : String | Test.java:287:131:287:131 | m [post update] : TreeBidiMap [<map.key>] : String | provenance | MaD:779 |
 | Test.java:288:49:288:58 | key : String | Test.java:288:116:288:118 | key : String | provenance |  |
 | Test.java:288:110:288:110 | m [post update] : PatriciaTrie [<map.key>] : String | Test.java:288:134:288:134 | m : PatriciaTrie [<map.key>] : String | provenance |  |
-| Test.java:288:116:288:118 | key : String | Test.java:288:110:288:110 | m [post update] : PatriciaTrie [<map.key>] : String | provenance | MaD:14 |
-| Test.java:288:116:288:118 | key : String | Test.java:288:110:288:110 | m [post update] : PatriciaTrie [<map.key>] : String | provenance | MaD:705 |
+| Test.java:288:116:288:118 | key : String | Test.java:288:110:288:110 | m [post update] : PatriciaTrie [<map.key>] : String | provenance | MaD:19 |
+| Test.java:288:116:288:118 | key : String | Test.java:288:110:288:110 | m [post update] : PatriciaTrie [<map.key>] : String | provenance | MaD:779 |
 | Test.java:290:60:290:66 | value : String | Test.java:290:151:290:155 | value : String | provenance |  |
 | Test.java:290:140:290:140 | m [post update] : ArrayListValuedHashMap [<map.value>, <element>] : String | Test.java:290:166:290:166 | m : ArrayListValuedHashMap [<map.value>, <element>] : String | provenance |  |
-| Test.java:290:151:290:155 | value : String | Test.java:290:140:290:140 | m [post update] : ArrayListValuedHashMap [<map.value>, <element>] : String | provenance | MaD:690 |
+| Test.java:290:151:290:155 | value : String | Test.java:290:140:290:140 | m [post update] : ArrayListValuedHashMap [<map.value>, <element>] : String | provenance | MaD:765 |
 | Test.java:291:51:291:57 | value : String | Test.java:291:104:291:108 | value : String | provenance |  |
-| Test.java:291:104:291:108 | value : String | Test.java:291:69:291:109 | new DefaultKeyValue<String,V>(...) : DefaultKeyValue [<map.value>] : String | provenance | MaD:206 |
+| Test.java:291:104:291:108 | value : String | Test.java:291:69:291:109 | new DefaultKeyValue<String,V>(...) : DefaultKeyValue [<map.value>] : String | provenance | MaD:208 |
 | Test.java:292:63:292:69 | value : String | Test.java:292:124:292:128 | value : String | provenance |  |
-| Test.java:292:111:292:129 | of(...) : Map [<map.value>] : String | Test.java:292:81:292:130 | new DualTreeBidiMap<String,V>(...) : DualTreeBidiMap [<map.value>] : String | provenance | MaD:59 |
-| Test.java:292:124:292:128 | value : String | Test.java:292:111:292:129 | of(...) : Map [<map.value>] : String | provenance | MaD:12 |
+| Test.java:292:111:292:129 | of(...) : Map [<map.value>] : String | Test.java:292:81:292:130 | new DualTreeBidiMap<String,V>(...) : DualTreeBidiMap [<map.value>] : String | provenance | MaD:61 |
+| Test.java:292:124:292:128 | value : String | Test.java:292:111:292:129 | of(...) : Map [<map.value>] : String | provenance | MaD:14 |
 | Test.java:293:51:293:57 | value : String | Test.java:293:116:293:120 | value : String | provenance |  |
 | Test.java:293:105:293:105 | m [post update] : HashedMap [<map.value>] : String | Test.java:293:131:293:131 | m : HashedMap [<map.value>] : String | provenance |  |
-| Test.java:293:116:293:120 | value : String | Test.java:293:105:293:105 | m [post update] : HashedMap [<map.value>] : String | provenance | MaD:15 |
-| Test.java:293:116:293:120 | value : String | Test.java:293:105:293:105 | m [post update] : HashedMap [<map.value>] : String | provenance | MaD:706 |
+| Test.java:293:116:293:120 | value : String | Test.java:293:105:293:105 | m [post update] : HashedMap [<map.value>] : String | provenance | MaD:20 |
+| Test.java:293:116:293:120 | value : String | Test.java:293:105:293:105 | m [post update] : HashedMap [<map.value>] : String | provenance | MaD:780 |
 | Test.java:294:58:294:64 | value : String | Test.java:294:145:294:149 | value : String | provenance |  |
 | Test.java:294:134:294:134 | m [post update] : HashSetValuedHashMap [<map.value>, <element>] : String | Test.java:294:160:294:160 | m : HashSetValuedHashMap [<map.value>, <element>] : String | provenance |  |
-| Test.java:294:145:294:149 | value : String | Test.java:294:134:294:134 | m [post update] : HashSetValuedHashMap [<map.value>, <element>] : String | provenance | MaD:690 |
+| Test.java:294:145:294:149 | value : String | Test.java:294:134:294:134 | m [post update] : HashSetValuedHashMap [<map.value>, <element>] : String | provenance | MaD:765 |
 | Test.java:295:51:295:57 | value : String | Test.java:295:106:295:110 | value : String | provenance |  |
-| Test.java:295:93:295:111 | of(...) : Map [<map.value>] : String | Test.java:295:69:295:112 | new LinkedMap<String,V>(...) : LinkedMap [<map.value>] : String | provenance | MaD:318 |
-| Test.java:295:106:295:110 | value : String | Test.java:295:93:295:111 | of(...) : Map [<map.value>] : String | provenance | MaD:12 |
+| Test.java:295:93:295:111 | of(...) : Map [<map.value>] : String | Test.java:295:69:295:112 | new LinkedMap<String,V>(...) : LinkedMap [<map.value>] : String | provenance | MaD:320 |
+| Test.java:295:106:295:110 | value : String | Test.java:295:93:295:111 | of(...) : Map [<map.value>] : String | provenance | MaD:14 |
 | Test.java:296:61:296:67 | value : Object | Test.java:296:132:296:136 | value : Object | provenance |  |
 | Test.java:296:61:296:67 | value : String | Test.java:296:132:296:136 | value : String | provenance |  |
-| Test.java:296:119:296:137 | of(...) : Map [<map.value>] : Object | Test.java:296:79:296:138 | listOrderedMap(...) : ListOrderedMap [<map.value>] : Object | provenance | MaD:328 |
-| Test.java:296:119:296:137 | of(...) : Map [<map.value>] : String | Test.java:296:79:296:138 | listOrderedMap(...) : ListOrderedMap [<map.value>] : String | provenance | MaD:328 |
-| Test.java:296:132:296:136 | value : Object | Test.java:296:119:296:137 | of(...) : Map [<map.value>] : Object | provenance | MaD:12 |
-| Test.java:296:132:296:136 | value : String | Test.java:296:119:296:137 | of(...) : Map [<map.value>] : String | provenance | MaD:12 |
+| Test.java:296:119:296:137 | of(...) : Map [<map.value>] : Object | Test.java:296:79:296:138 | listOrderedMap(...) : ListOrderedMap [<map.value>] : Object | provenance | MaD:330 |
+| Test.java:296:119:296:137 | of(...) : Map [<map.value>] : String | Test.java:296:79:296:138 | listOrderedMap(...) : ListOrderedMap [<map.value>] : String | provenance | MaD:330 |
+| Test.java:296:132:296:136 | value : Object | Test.java:296:119:296:137 | of(...) : Map [<map.value>] : Object | provenance | MaD:14 |
+| Test.java:296:132:296:136 | value : String | Test.java:296:119:296:137 | of(...) : Map [<map.value>] : String | provenance | MaD:14 |
 | Test.java:297:47:297:53 | value : String | Test.java:297:121:297:125 | value : String | provenance |  |
 | Test.java:297:105:297:105 | m [post update] : MultiKeyMap [<map.value>] : String | Test.java:297:136:297:136 | m : MultiKeyMap [<map.value>] : String | provenance |  |
-| Test.java:297:121:297:125 | value : String | Test.java:297:105:297:105 | m [post update] : MultiKeyMap [<map.value>] : String | provenance | MaD:339 |
+| Test.java:297:121:297:125 | value : String | Test.java:297:105:297:105 | m [post update] : MultiKeyMap [<map.value>] : String | provenance | MaD:340 |
 | Test.java:298:49:298:55 | value : String | Test.java:298:122:298:126 | value : String | provenance |  |
 | Test.java:298:111:298:111 | m [post update] : MultiValueMap [<map.value>, <element>] : String | Test.java:298:137:298:137 | m : MultiValueMap [<map.value>, <element>] : String | provenance |  |
 | Test.java:298:111:298:111 | m [post update] : MultiValueMap [<map.value>] : String | Test.java:298:137:298:137 | m : MultiValueMap [<map.value>] : String | provenance |  |
-| Test.java:298:122:298:126 | value : String | Test.java:298:111:298:111 | m [post update] : MultiValueMap [<map.value>, <element>] : String | provenance | MaD:662 |
-| Test.java:298:122:298:126 | value : String | Test.java:298:111:298:111 | m [post update] : MultiValueMap [<map.value>] : String | provenance | MaD:15 |
-| Test.java:298:122:298:126 | value : String | Test.java:298:111:298:111 | m [post update] : MultiValueMap [<map.value>] : String | provenance | MaD:706 |
+| Test.java:298:122:298:126 | value : String | Test.java:298:111:298:111 | m [post update] : MultiValueMap [<map.value>, <element>] : String | provenance | MaD:737 |
+| Test.java:298:122:298:126 | value : String | Test.java:298:111:298:111 | m [post update] : MultiValueMap [<map.value>] : String | provenance | MaD:20 |
+| Test.java:298:122:298:126 | value : String | Test.java:298:111:298:111 | m [post update] : MultiValueMap [<map.value>] : String | provenance | MaD:780 |
 | Test.java:299:55:299:61 | value : String | Test.java:299:111:299:115 | value : String | provenance |  |
-| Test.java:299:111:299:115 | value : String | Test.java:299:73:299:116 | new MyAbstractKeyValue<String,V>(...) : MyAbstractKeyValue [<map.value>] : String | provenance | MaD:190 |
+| Test.java:299:111:299:115 | value : String | Test.java:299:73:299:116 | new MyAbstractKeyValue<String,V>(...) : MyAbstractKeyValue [<map.value>] : String | provenance | MaD:192 |
 | Test.java:299:111:299:115 | value : String | Test.java:7043:29:7043:35 | value : String | provenance |  |
 | Test.java:300:55:300:61 | value : String | Test.java:300:111:300:115 | value : String | provenance |  |
-| Test.java:300:111:300:115 | value : String | Test.java:300:73:300:116 | new MyAbstractMapEntry<String,V>(...) : MyAbstractMapEntry [<map.value>] : String | provenance | MaD:196 |
+| Test.java:300:111:300:115 | value : String | Test.java:300:73:300:116 | new MyAbstractMapEntry<String,V>(...) : MyAbstractMapEntry [<map.value>] : String | provenance | MaD:198 |
 | Test.java:300:111:300:115 | value : String | Test.java:7057:35:7057:47 | value : String | provenance |  |
 | Test.java:301:65:301:71 | value : String | Test.java:301:145:301:149 | value : String | provenance |  |
-| Test.java:301:125:301:150 | newMAMEWithMapValue(...) : MyAbstractMapEntry [<map.value>] : String | Test.java:301:83:301:151 | new MyAbstractMapEntryDecorator<String,V>(...) : MyAbstractMapEntryDecorator [<map.value>] : String | provenance | MaD:198 |
+| Test.java:301:125:301:150 | newMAMEWithMapValue(...) : MyAbstractMapEntry [<map.value>] : String | Test.java:301:83:301:151 | new MyAbstractMapEntryDecorator<String,V>(...) : MyAbstractMapEntryDecorator [<map.value>] : String | provenance | MaD:200 |
 | Test.java:301:125:301:150 | newMAMEWithMapValue(...) : MyAbstractMapEntry [<map.value>] : String | Test.java:7067:31:7067:57 | entry : MyAbstractMapEntry [<map.value>] : String | provenance |  |
 | Test.java:301:145:301:149 | value : String | Test.java:300:55:300:61 | value : String | provenance |  |
-| Test.java:301:145:301:149 | value : String | Test.java:301:125:301:150 | newMAMEWithMapValue(...) : MyAbstractMapEntry [<map.value>] : String | provenance | MaD:196 |
+| Test.java:301:145:301:149 | value : String | Test.java:301:125:301:150 | newMAMEWithMapValue(...) : MyAbstractMapEntry [<map.value>] : String | provenance | MaD:198 |
 | Test.java:302:54:302:60 | value : String | Test.java:302:119:302:123 | value : String | provenance |  |
 | Test.java:302:108:302:108 | m [post update] : LinkedMap [<map.value>] : String | Test.java:302:134:302:134 | m : LinkedMap [<map.value>] : String | provenance |  |
-| Test.java:302:119:302:123 | value : String | Test.java:302:108:302:108 | m [post update] : LinkedMap [<map.value>] : String | provenance | MaD:15 |
-| Test.java:302:119:302:123 | value : String | Test.java:302:108:302:108 | m [post update] : LinkedMap [<map.value>] : String | provenance | MaD:706 |
-| Test.java:302:134:302:134 | m : LinkedMap [<map.value>] : String | Test.java:302:134:302:148 | mapIterator(...) : OrderedMapIterator [<map.value>] : String | provenance | MaD:488 |
+| Test.java:302:119:302:123 | value : String | Test.java:302:108:302:108 | m [post update] : LinkedMap [<map.value>] : String | provenance | MaD:20 |
+| Test.java:302:119:302:123 | value : String | Test.java:302:108:302:108 | m [post update] : LinkedMap [<map.value>] : String | provenance | MaD:780 |
+| Test.java:302:134:302:134 | m : LinkedMap [<map.value>] : String | Test.java:302:134:302:148 | mapIterator(...) : OrderedMapIterator [<map.value>] : String | provenance | MaD:563 |
 | Test.java:304:49:304:55 | value : Map | Test.java:304:112:304:116 | value : Map | provenance |  |
 | Test.java:304:49:304:55 | value : String | Test.java:304:112:304:116 | value : String | provenance |  |
 | Test.java:304:101:304:101 | m [post update] : TreeMap [<map.value>] : Map | Test.java:304:127:304:127 | m : TreeMap [<map.value>] : Map | provenance |  |
 | Test.java:304:101:304:101 | m [post update] : TreeMap [<map.value>] : String | Test.java:304:127:304:127 | m : TreeMap [<map.value>] : String | provenance |  |
-| Test.java:304:112:304:116 | value : Map | Test.java:304:101:304:101 | m [post update] : TreeMap [<map.value>] : Map | provenance | MaD:15 |
-| Test.java:304:112:304:116 | value : String | Test.java:304:101:304:101 | m [post update] : TreeMap [<map.value>] : String | provenance | MaD:15 |
+| Test.java:304:112:304:116 | value : Map | Test.java:304:101:304:101 | m [post update] : TreeMap [<map.value>] : Map | provenance | MaD:20 |
+| Test.java:304:112:304:116 | value : String | Test.java:304:101:304:101 | m [post update] : TreeMap [<map.value>] : String | provenance | MaD:20 |
 | Test.java:305:48:305:54 | value : String | Test.java:305:116:305:120 | value : String | provenance |  |
-| Test.java:305:93:305:121 | newTreeMapWithMapValue(...) : TreeMap [<map.value>] : String | Test.java:305:66:305:127 | new TiedMapEntry<String,V>(...) : TiedMapEntry [<map.value>] : String | provenance | MaD:233 |
+| Test.java:305:93:305:121 | newTreeMapWithMapValue(...) : TreeMap [<map.value>] : String | Test.java:305:66:305:127 | new TiedMapEntry<String,V>(...) : TiedMapEntry [<map.value>] : String | provenance | MaD:235 |
 | Test.java:305:116:305:120 | value : String | Test.java:304:49:304:55 | value : String | provenance |  |
-| Test.java:305:116:305:120 | value : String | Test.java:305:93:305:121 | newTreeMapWithMapValue(...) : TreeMap [<map.value>] : String | provenance | MaD:15 |
+| Test.java:305:116:305:120 | value : String | Test.java:305:93:305:121 | newTreeMapWithMapValue(...) : TreeMap [<map.value>] : String | provenance | MaD:20 |
 | Test.java:306:77:306:83 | value : String | Test.java:306:146:306:150 | value : String | provenance |  |
 | Test.java:306:135:306:135 | m [post update] : TreeBidiMap [<map.value>] : String | Test.java:306:161:306:161 | m : TreeBidiMap [<map.value>] : String | provenance |  |
-| Test.java:306:146:306:150 | value : String | Test.java:306:135:306:135 | m [post update] : TreeBidiMap [<map.value>] : String | provenance | MaD:15 |
-| Test.java:306:146:306:150 | value : String | Test.java:306:135:306:135 | m [post update] : TreeBidiMap [<map.value>] : String | provenance | MaD:706 |
+| Test.java:306:146:306:150 | value : String | Test.java:306:135:306:135 | m [post update] : TreeBidiMap [<map.value>] : String | provenance | MaD:20 |
+| Test.java:306:146:306:150 | value : String | Test.java:306:135:306:135 | m [post update] : TreeBidiMap [<map.value>] : String | provenance | MaD:780 |
 | Test.java:307:50:307:56 | value : String | Test.java:307:114:307:118 | value : String | provenance |  |
 | Test.java:307:103:307:103 | m [post update] : PatriciaTrie [<map.value>] : String | Test.java:307:129:307:129 | m : PatriciaTrie [<map.value>] : String | provenance |  |
-| Test.java:307:114:307:118 | value : String | Test.java:307:103:307:103 | m [post update] : PatriciaTrie [<map.value>] : String | provenance | MaD:15 |
-| Test.java:307:114:307:118 | value : String | Test.java:307:103:307:103 | m [post update] : PatriciaTrie [<map.value>] : String | provenance | MaD:706 |
+| Test.java:307:114:307:118 | value : String | Test.java:307:103:307:103 | m [post update] : PatriciaTrie [<map.value>] : String | provenance | MaD:20 |
+| Test.java:307:114:307:118 | value : String | Test.java:307:103:307:103 | m [post update] : PatriciaTrie [<map.value>] : String | provenance | MaD:780 |
 | Test.java:308:56:308:62 | value : String | Test.java:308:114:308:118 | value : String | provenance |  |
-| Test.java:308:114:308:118 | value : String | Test.java:308:74:308:119 | new UnmodifiableMapEntry<String,V>(...) : UnmodifiableMapEntry [<map.value>] : String | provenance | MaD:240 |
+| Test.java:308:114:308:118 | value : String | Test.java:308:74:308:119 | new UnmodifiableMapEntry<String,V>(...) : UnmodifiableMapEntry [<map.value>] : String | provenance | MaD:242 |
 | Test.java:318:16:318:23 | source(...) : Object | Test.java:319:33:319:34 | in : Object | provenance |  |
 | Test.java:319:10:319:41 | new MyAbstractKeyValue<>(...) : MyAbstractKeyValue [<map.key>] : Object | Test.java:320:19:320:21 | out : MyAbstractKeyValue [<map.key>] : Object | provenance |  |
-| Test.java:319:33:319:34 | in : Object | Test.java:319:10:319:41 | new MyAbstractKeyValue<>(...) : MyAbstractKeyValue [<map.key>] : Object | provenance | MaD:189 |
+| Test.java:319:33:319:34 | in : Object | Test.java:319:10:319:41 | new MyAbstractKeyValue<>(...) : MyAbstractKeyValue [<map.key>] : Object | provenance | MaD:191 |
 | Test.java:319:33:319:34 | in : Object | Test.java:7043:22:7043:26 | key : Object | provenance |  |
 | Test.java:320:19:320:21 | out : MyAbstractKeyValue [<map.key>] : Object | Test.java:237:18:237:48 | container : MyAbstractKeyValue [<map.key>] : Object | provenance |  |
-| Test.java:320:19:320:21 | out : MyAbstractKeyValue [<map.key>] : Object | Test.java:320:9:320:22 | getMapKey(...) | provenance | MaD:568 |
+| Test.java:320:19:320:21 | out : MyAbstractKeyValue [<map.key>] : Object | Test.java:320:9:320:22 | getMapKey(...) | provenance | MaD:643 |
 | Test.java:325:16:325:23 | source(...) : Object | Test.java:326:39:326:40 | in : Object | provenance |  |
 | Test.java:326:10:326:41 | new MyAbstractKeyValue<>(...) : MyAbstractKeyValue [<map.value>] : Object | Test.java:327:21:327:23 | out : MyAbstractKeyValue [<map.value>] : Object | provenance |  |
-| Test.java:326:39:326:40 | in : Object | Test.java:326:10:326:41 | new MyAbstractKeyValue<>(...) : MyAbstractKeyValue [<map.value>] : Object | provenance | MaD:190 |
+| Test.java:326:39:326:40 | in : Object | Test.java:326:10:326:41 | new MyAbstractKeyValue<>(...) : MyAbstractKeyValue [<map.value>] : Object | provenance | MaD:192 |
 | Test.java:326:39:326:40 | in : Object | Test.java:7043:29:7043:35 | value : Object | provenance |  |
 | Test.java:327:21:327:23 | out : MyAbstractKeyValue [<map.value>] : Object | Test.java:243:20:243:50 | container : MyAbstractKeyValue [<map.value>] : Object | provenance |  |
-| Test.java:327:21:327:23 | out : MyAbstractKeyValue [<map.value>] : Object | Test.java:327:9:327:24 | getMapValue(...) | provenance | MaD:569 |
+| Test.java:327:21:327:23 | out : MyAbstractKeyValue [<map.value>] : Object | Test.java:327:9:327:24 | getMapValue(...) | provenance | MaD:644 |
 | Test.java:332:16:332:23 | source(...) : Object | Test.java:333:15:333:16 | in : Object | provenance |  |
 | Test.java:333:4:333:6 | out [post update] : DefaultKeyValue [<map.key>] : Object | Test.java:334:19:334:21 | out : DefaultKeyValue [<map.key>] : Object | provenance |  |
-| Test.java:333:15:333:16 | in : Object | Test.java:333:4:333:6 | out [post update] : DefaultKeyValue [<map.key>] : Object | provenance | MaD:192 |
+| Test.java:333:15:333:16 | in : Object | Test.java:333:4:333:6 | out [post update] : DefaultKeyValue [<map.key>] : Object | provenance | MaD:193 |
 | Test.java:334:19:334:21 | out : DefaultKeyValue [<map.key>] : Object | Test.java:237:18:237:48 | container : DefaultKeyValue [<map.key>] : Object | provenance |  |
-| Test.java:334:19:334:21 | out : DefaultKeyValue [<map.key>] : Object | Test.java:334:9:334:22 | getMapKey(...) | provenance | MaD:568 |
+| Test.java:334:19:334:21 | out : DefaultKeyValue [<map.key>] : Object | Test.java:334:9:334:22 | getMapKey(...) | provenance | MaD:643 |
 | Test.java:339:16:339:23 | source(...) : Object | Test.java:340:17:340:18 | in : Object | provenance |  |
 | Test.java:340:4:340:6 | out [post update] : MyAbstractKeyValue [<map.key>] : Object | Test.java:341:19:341:21 | out : MyAbstractKeyValue [<map.key>] : Object | provenance |  |
-| Test.java:340:17:340:18 | in : Object | Test.java:340:4:340:6 | out [post update] : MyAbstractKeyValue [<map.key>] : Object | provenance | MaD:192 |
+| Test.java:340:17:340:18 | in : Object | Test.java:340:4:340:6 | out [post update] : MyAbstractKeyValue [<map.key>] : Object | provenance | MaD:193 |
 | Test.java:340:17:340:18 | in : Object | Test.java:7047:14:7047:24 | key : Object | provenance |  |
 | Test.java:341:19:341:21 | out : MyAbstractKeyValue [<map.key>] : Object | Test.java:237:18:237:48 | container : MyAbstractKeyValue [<map.key>] : Object | provenance |  |
-| Test.java:341:19:341:21 | out : MyAbstractKeyValue [<map.key>] : Object | Test.java:341:9:341:22 | getMapKey(...) | provenance | MaD:568 |
+| Test.java:341:19:341:21 | out : MyAbstractKeyValue [<map.key>] : Object | Test.java:341:9:341:22 | getMapKey(...) | provenance | MaD:643 |
 | Test.java:346:25:346:58 | newDKVWithMapKey(...) : DefaultKeyValue [<map.key>] : String | Test.java:347:10:347:11 | in : DefaultKeyValue [<map.key>] : String | provenance |  |
 | Test.java:346:42:346:57 | (...)... : String | Test.java:273:49:273:53 | key : String | provenance |  |
-| Test.java:346:42:346:57 | (...)... : String | Test.java:346:25:346:58 | newDKVWithMapKey(...) : DefaultKeyValue [<map.key>] : String | provenance | MaD:205 |
+| Test.java:346:42:346:57 | (...)... : String | Test.java:346:25:346:58 | newDKVWithMapKey(...) : DefaultKeyValue [<map.key>] : String | provenance | MaD:207 |
 | Test.java:346:50:346:57 | source(...) : Object | Test.java:346:42:346:57 | (...)... : String | provenance |  |
-| Test.java:347:10:347:11 | in : DefaultKeyValue [<map.key>] : String | Test.java:347:10:347:24 | setKey(...) : String | provenance | MaD:191 |
+| Test.java:347:10:347:11 | in : DefaultKeyValue [<map.key>] : String | Test.java:347:10:347:24 | setKey(...) : String | provenance | MaD:194 |
 | Test.java:347:10:347:24 | setKey(...) : String | Test.java:348:9:348:11 | out | provenance |  |
 | Test.java:353:28:353:62 | newMAKVWithMapKey(...) : MyAbstractKeyValue [<map.key>] : String | Test.java:354:10:354:11 | in : MyAbstractKeyValue [<map.key>] : String | provenance |  |
 | Test.java:353:46:353:61 | (...)... : String | Test.java:282:53:282:57 | key : String | provenance |  |
-| Test.java:353:46:353:61 | (...)... : String | Test.java:353:28:353:62 | newMAKVWithMapKey(...) : MyAbstractKeyValue [<map.key>] : String | provenance | MaD:189 |
+| Test.java:353:46:353:61 | (...)... : String | Test.java:353:28:353:62 | newMAKVWithMapKey(...) : MyAbstractKeyValue [<map.key>] : String | provenance | MaD:191 |
 | Test.java:353:54:353:61 | source(...) : Object | Test.java:353:46:353:61 | (...)... : String | provenance |  |
-| Test.java:354:10:354:11 | in : MyAbstractKeyValue [<map.key>] : String | Test.java:354:10:354:26 | mySetKey(...) : String | provenance | MaD:191 |
+| Test.java:354:10:354:11 | in : MyAbstractKeyValue [<map.key>] : String | Test.java:354:10:354:26 | mySetKey(...) : String | provenance | MaD:194 |
 | Test.java:354:10:354:11 | in : MyAbstractKeyValue [<map.key>] : String | Test.java:7047:5:7047:12 | parameter this : MyAbstractKeyValue [<map.key>] : String | provenance |  |
 | Test.java:354:10:354:26 | mySetKey(...) : String | Test.java:355:9:355:11 | out | provenance |  |
 | Test.java:360:16:360:23 | source(...) : Object | Test.java:361:17:361:18 | in : Object | provenance |  |
 | Test.java:361:4:361:6 | out [post update] : UnmodifiableMapEntry [<map.value>] : Object | Test.java:362:21:362:23 | out : UnmodifiableMapEntry [<map.value>] : Object | provenance |  |
-| Test.java:361:17:361:18 | in : Object | Test.java:361:4:361:6 | out [post update] : UnmodifiableMapEntry [<map.value>] : Object | provenance | MaD:23 |
-| Test.java:361:17:361:18 | in : Object | Test.java:361:4:361:6 | out [post update] : UnmodifiableMapEntry [<map.value>] : Object | provenance | MaD:194 |
+| Test.java:361:17:361:18 | in : Object | Test.java:361:4:361:6 | out [post update] : UnmodifiableMapEntry [<map.value>] : Object | provenance | MaD:11 |
+| Test.java:361:17:361:18 | in : Object | Test.java:361:4:361:6 | out [post update] : UnmodifiableMapEntry [<map.value>] : Object | provenance | MaD:195 |
 | Test.java:362:21:362:23 | out : UnmodifiableMapEntry [<map.value>] : Object | Test.java:243:20:243:50 | container : UnmodifiableMapEntry [<map.value>] : Object | provenance |  |
-| Test.java:362:21:362:23 | out : UnmodifiableMapEntry [<map.value>] : Object | Test.java:362:9:362:24 | getMapValue(...) | provenance | MaD:569 |
+| Test.java:362:21:362:23 | out : UnmodifiableMapEntry [<map.value>] : Object | Test.java:362:9:362:24 | getMapValue(...) | provenance | MaD:644 |
 | Test.java:367:16:367:23 | source(...) : Object | Test.java:368:17:368:18 | in : Object | provenance |  |
 | Test.java:368:4:368:6 | out [post update] : DefaultKeyValue [<map.value>] : Object | Test.java:369:21:369:23 | out : DefaultKeyValue [<map.value>] : Object | provenance |  |
-| Test.java:368:17:368:18 | in : Object | Test.java:368:4:368:6 | out [post update] : DefaultKeyValue [<map.value>] : Object | provenance | MaD:194 |
+| Test.java:368:17:368:18 | in : Object | Test.java:368:4:368:6 | out [post update] : DefaultKeyValue [<map.value>] : Object | provenance | MaD:195 |
 | Test.java:369:21:369:23 | out : DefaultKeyValue [<map.value>] : Object | Test.java:243:20:243:50 | container : DefaultKeyValue [<map.value>] : Object | provenance |  |
-| Test.java:369:21:369:23 | out : DefaultKeyValue [<map.value>] : Object | Test.java:369:9:369:24 | getMapValue(...) | provenance | MaD:569 |
+| Test.java:369:21:369:23 | out : DefaultKeyValue [<map.value>] : Object | Test.java:369:9:369:24 | getMapValue(...) | provenance | MaD:644 |
 | Test.java:374:16:374:23 | source(...) : Object | Test.java:375:17:375:18 | in : Object | provenance |  |
 | Test.java:375:4:375:6 | out [post update] : AbstractMapEntry [<map.value>] : Object | Test.java:376:21:376:23 | out : AbstractMapEntry [<map.value>] : Object | provenance |  |
-| Test.java:375:17:375:18 | in : Object | Test.java:375:4:375:6 | out [post update] : AbstractMapEntry [<map.value>] : Object | provenance | MaD:23 |
-| Test.java:375:17:375:18 | in : Object | Test.java:375:4:375:6 | out [post update] : AbstractMapEntry [<map.value>] : Object | provenance | MaD:194 |
+| Test.java:375:17:375:18 | in : Object | Test.java:375:4:375:6 | out [post update] : AbstractMapEntry [<map.value>] : Object | provenance | MaD:11 |
+| Test.java:375:17:375:18 | in : Object | Test.java:375:4:375:6 | out [post update] : AbstractMapEntry [<map.value>] : Object | provenance | MaD:195 |
 | Test.java:376:21:376:23 | out : AbstractMapEntry [<map.value>] : Object | Test.java:243:20:243:50 | container : AbstractMapEntry [<map.value>] : Object | provenance |  |
-| Test.java:376:21:376:23 | out : AbstractMapEntry [<map.value>] : Object | Test.java:376:9:376:24 | getMapValue(...) | provenance | MaD:569 |
+| Test.java:376:21:376:23 | out : AbstractMapEntry [<map.value>] : Object | Test.java:376:9:376:24 | getMapValue(...) | provenance | MaD:644 |
 | Test.java:381:16:381:23 | source(...) : Object | Test.java:382:19:382:20 | in : Object | provenance |  |
 | Test.java:382:4:382:6 | out [post update] : MyAbstractKeyValue [<map.value>] : Object | Test.java:383:21:383:23 | out : MyAbstractKeyValue [<map.value>] : Object | provenance |  |
-| Test.java:382:19:382:20 | in : Object | Test.java:382:4:382:6 | out [post update] : MyAbstractKeyValue [<map.value>] : Object | provenance | MaD:194 |
+| Test.java:382:19:382:20 | in : Object | Test.java:382:4:382:6 | out [post update] : MyAbstractKeyValue [<map.value>] : Object | provenance | MaD:195 |
 | Test.java:382:19:382:20 | in : Object | Test.java:7051:16:7051:28 | value : Object | provenance |  |
 | Test.java:383:21:383:23 | out : MyAbstractKeyValue [<map.value>] : Object | Test.java:243:20:243:50 | container : MyAbstractKeyValue [<map.value>] : Object | provenance |  |
-| Test.java:383:21:383:23 | out : MyAbstractKeyValue [<map.value>] : Object | Test.java:383:9:383:24 | getMapValue(...) | provenance | MaD:569 |
+| Test.java:383:21:383:23 | out : MyAbstractKeyValue [<map.value>] : Object | Test.java:383:9:383:24 | getMapValue(...) | provenance | MaD:644 |
 | Test.java:388:30:388:65 | newUMEWithMapValue(...) : UnmodifiableMapEntry [<map.value>] : String | Test.java:389:10:389:11 | in : UnmodifiableMapEntry [<map.value>] : String | provenance |  |
 | Test.java:388:49:388:64 | (...)... : String | Test.java:308:56:308:62 | value : String | provenance |  |
-| Test.java:388:49:388:64 | (...)... : String | Test.java:388:30:388:65 | newUMEWithMapValue(...) : UnmodifiableMapEntry [<map.value>] : String | provenance | MaD:240 |
+| Test.java:388:49:388:64 | (...)... : String | Test.java:388:30:388:65 | newUMEWithMapValue(...) : UnmodifiableMapEntry [<map.value>] : String | provenance | MaD:242 |
 | Test.java:388:57:388:64 | source(...) : Object | Test.java:388:49:388:64 | (...)... : String | provenance |  |
-| Test.java:389:10:389:11 | in : UnmodifiableMapEntry [<map.value>] : String | Test.java:389:10:389:26 | setValue(...) : String | provenance | MaD:22 |
-| Test.java:389:10:389:11 | in : UnmodifiableMapEntry [<map.value>] : String | Test.java:389:10:389:26 | setValue(...) : String | provenance | MaD:193 |
+| Test.java:389:10:389:11 | in : UnmodifiableMapEntry [<map.value>] : String | Test.java:389:10:389:26 | setValue(...) : String | provenance | MaD:12 |
+| Test.java:389:10:389:11 | in : UnmodifiableMapEntry [<map.value>] : String | Test.java:389:10:389:26 | setValue(...) : String | provenance | MaD:196 |
 | Test.java:389:10:389:26 | setValue(...) : String | Test.java:390:9:390:11 | out | provenance |  |
 | Test.java:395:25:395:60 | newDKVWithMapValue(...) : DefaultKeyValue [<map.value>] : String | Test.java:396:10:396:11 | in : DefaultKeyValue [<map.value>] : String | provenance |  |
 | Test.java:395:44:395:59 | (...)... : String | Test.java:291:51:291:57 | value : String | provenance |  |
-| Test.java:395:44:395:59 | (...)... : String | Test.java:395:25:395:60 | newDKVWithMapValue(...) : DefaultKeyValue [<map.value>] : String | provenance | MaD:206 |
+| Test.java:395:44:395:59 | (...)... : String | Test.java:395:25:395:60 | newDKVWithMapValue(...) : DefaultKeyValue [<map.value>] : String | provenance | MaD:208 |
 | Test.java:395:52:395:59 | source(...) : Object | Test.java:395:44:395:59 | (...)... : String | provenance |  |
-| Test.java:396:10:396:11 | in : DefaultKeyValue [<map.value>] : String | Test.java:396:10:396:26 | setValue(...) : String | provenance | MaD:193 |
+| Test.java:396:10:396:11 | in : DefaultKeyValue [<map.value>] : String | Test.java:396:10:396:26 | setValue(...) : String | provenance | MaD:196 |
 | Test.java:396:10:396:26 | setValue(...) : String | Test.java:397:9:397:11 | out | provenance |  |
 | Test.java:402:26:402:62 | newMAMEWithMapValue(...) : MyAbstractMapEntry [<map.value>] : String | Test.java:403:10:403:11 | in : MyAbstractMapEntry [<map.value>] : String | provenance |  |
 | Test.java:402:46:402:61 | (...)... : String | Test.java:300:55:300:61 | value : String | provenance |  |
-| Test.java:402:46:402:61 | (...)... : String | Test.java:402:26:402:62 | newMAMEWithMapValue(...) : MyAbstractMapEntry [<map.value>] : String | provenance | MaD:196 |
+| Test.java:402:46:402:61 | (...)... : String | Test.java:402:26:402:62 | newMAMEWithMapValue(...) : MyAbstractMapEntry [<map.value>] : String | provenance | MaD:198 |
 | Test.java:402:54:402:61 | source(...) : Object | Test.java:402:46:402:61 | (...)... : String | provenance |  |
-| Test.java:403:10:403:11 | in : MyAbstractMapEntry [<map.value>] : String | Test.java:403:10:403:26 | setValue(...) : String | provenance | MaD:22 |
-| Test.java:403:10:403:11 | in : MyAbstractMapEntry [<map.value>] : String | Test.java:403:10:403:26 | setValue(...) : String | provenance | MaD:193 |
+| Test.java:403:10:403:11 | in : MyAbstractMapEntry [<map.value>] : String | Test.java:403:10:403:26 | setValue(...) : String | provenance | MaD:12 |
+| Test.java:403:10:403:11 | in : MyAbstractMapEntry [<map.value>] : String | Test.java:403:10:403:26 | setValue(...) : String | provenance | MaD:196 |
 | Test.java:403:10:403:26 | setValue(...) : String | Test.java:404:9:404:11 | out | provenance |  |
 | Test.java:409:26:409:62 | newMAMEWithMapValue(...) : MyAbstractMapEntry [<map.value>] : String | Test.java:410:10:410:11 | in : MyAbstractMapEntry [<map.value>] : String | provenance |  |
 | Test.java:409:46:409:61 | (...)... : String | Test.java:300:55:300:61 | value : String | provenance |  |
-| Test.java:409:46:409:61 | (...)... : String | Test.java:409:26:409:62 | newMAMEWithMapValue(...) : MyAbstractMapEntry [<map.value>] : String | provenance | MaD:196 |
+| Test.java:409:46:409:61 | (...)... : String | Test.java:409:26:409:62 | newMAMEWithMapValue(...) : MyAbstractMapEntry [<map.value>] : String | provenance | MaD:198 |
 | Test.java:409:54:409:61 | source(...) : Object | Test.java:409:46:409:61 | (...)... : String | provenance |  |
-| Test.java:410:10:410:11 | in : MyAbstractMapEntry [<map.value>] : String | Test.java:410:10:410:26 | setValue(...) : String | provenance | MaD:22 |
-| Test.java:410:10:410:11 | in : MyAbstractMapEntry [<map.value>] : String | Test.java:410:10:410:26 | setValue(...) : String | provenance | MaD:193 |
+| Test.java:410:10:410:11 | in : MyAbstractMapEntry [<map.value>] : String | Test.java:410:10:410:26 | setValue(...) : String | provenance | MaD:12 |
+| Test.java:410:10:410:11 | in : MyAbstractMapEntry [<map.value>] : String | Test.java:410:10:410:26 | setValue(...) : String | provenance | MaD:196 |
 | Test.java:410:10:410:26 | setValue(...) : String | Test.java:411:9:411:11 | out | provenance |  |
 | Test.java:416:28:416:64 | newMAKVWithMapValue(...) : MyAbstractKeyValue [<map.value>] : String | Test.java:417:10:417:11 | in : MyAbstractKeyValue [<map.value>] : String | provenance |  |
 | Test.java:416:48:416:63 | (...)... : String | Test.java:299:55:299:61 | value : String | provenance |  |
-| Test.java:416:48:416:63 | (...)... : String | Test.java:416:28:416:64 | newMAKVWithMapValue(...) : MyAbstractKeyValue [<map.value>] : String | provenance | MaD:190 |
+| Test.java:416:48:416:63 | (...)... : String | Test.java:416:28:416:64 | newMAKVWithMapValue(...) : MyAbstractKeyValue [<map.value>] : String | provenance | MaD:192 |
 | Test.java:416:56:416:63 | source(...) : Object | Test.java:416:48:416:63 | (...)... : String | provenance |  |
-| Test.java:417:10:417:11 | in : MyAbstractKeyValue [<map.value>] : String | Test.java:417:10:417:28 | mySetValue(...) : String | provenance | MaD:193 |
+| Test.java:417:10:417:11 | in : MyAbstractKeyValue [<map.value>] : String | Test.java:417:10:417:28 | mySetValue(...) : String | provenance | MaD:196 |
 | Test.java:417:10:417:11 | in : MyAbstractKeyValue [<map.value>] : String | Test.java:7051:5:7051:14 | parameter this : MyAbstractKeyValue [<map.value>] : String | provenance |  |
 | Test.java:417:10:417:28 | mySetValue(...) : String | Test.java:418:9:418:11 | out | provenance |  |
 | Test.java:423:28:423:64 | newMAKVWithMapValue(...) : MyAbstractKeyValue [<map.value>] : String | Test.java:424:10:424:11 | in : MyAbstractKeyValue [<map.value>] : String | provenance |  |
 | Test.java:423:48:423:63 | (...)... : String | Test.java:299:55:299:61 | value : String | provenance |  |
-| Test.java:423:48:423:63 | (...)... : String | Test.java:423:28:423:64 | newMAKVWithMapValue(...) : MyAbstractKeyValue [<map.value>] : String | provenance | MaD:190 |
+| Test.java:423:48:423:63 | (...)... : String | Test.java:423:28:423:64 | newMAKVWithMapValue(...) : MyAbstractKeyValue [<map.value>] : String | provenance | MaD:192 |
 | Test.java:423:56:423:63 | source(...) : Object | Test.java:423:48:423:63 | (...)... : String | provenance |  |
-| Test.java:424:10:424:11 | in : MyAbstractKeyValue [<map.value>] : String | Test.java:424:10:424:36 | mySetValue(...) : String | provenance | MaD:193 |
+| Test.java:424:10:424:11 | in : MyAbstractKeyValue [<map.value>] : String | Test.java:424:10:424:36 | mySetValue(...) : String | provenance | MaD:196 |
 | Test.java:424:10:424:11 | in : MyAbstractKeyValue [<map.value>] : String | Test.java:7051:5:7051:14 | parameter this : MyAbstractKeyValue [<map.value>] : String | provenance |  |
 | Test.java:424:10:424:36 | mySetValue(...) : String | Test.java:425:9:425:11 | out | provenance |  |
 | Test.java:430:16:430:23 | source(...) : Object | Test.java:431:33:431:34 | in : Object | provenance |  |
 | Test.java:431:10:431:41 | new MyAbstractMapEntry<>(...) : MyAbstractMapEntry [<map.key>] : Object | Test.java:432:19:432:21 | out : MyAbstractMapEntry [<map.key>] : Object | provenance |  |
-| Test.java:431:33:431:34 | in : Object | Test.java:431:10:431:41 | new MyAbstractMapEntry<>(...) : MyAbstractMapEntry [<map.key>] : Object | provenance | MaD:195 |
+| Test.java:431:33:431:34 | in : Object | Test.java:431:10:431:41 | new MyAbstractMapEntry<>(...) : MyAbstractMapEntry [<map.key>] : Object | provenance | MaD:197 |
 | Test.java:431:33:431:34 | in : Object | Test.java:7057:22:7057:32 | key : Object | provenance |  |
 | Test.java:432:19:432:21 | out : MyAbstractMapEntry [<map.key>] : Object | Test.java:237:18:237:48 | container : MyAbstractMapEntry [<map.key>] : Object | provenance |  |
-| Test.java:432:19:432:21 | out : MyAbstractMapEntry [<map.key>] : Object | Test.java:432:9:432:22 | getMapKey(...) | provenance | MaD:568 |
+| Test.java:432:19:432:21 | out : MyAbstractMapEntry [<map.key>] : Object | Test.java:432:9:432:22 | getMapKey(...) | provenance | MaD:643 |
 | Test.java:437:16:437:23 | source(...) : Object | Test.java:438:39:438:40 | in : Object | provenance |  |
 | Test.java:438:10:438:41 | new MyAbstractMapEntry<>(...) : MyAbstractMapEntry [<map.value>] : Object | Test.java:439:21:439:23 | out : MyAbstractMapEntry [<map.value>] : Object | provenance |  |
-| Test.java:438:39:438:40 | in : Object | Test.java:438:10:438:41 | new MyAbstractMapEntry<>(...) : MyAbstractMapEntry [<map.value>] : Object | provenance | MaD:196 |
+| Test.java:438:39:438:40 | in : Object | Test.java:438:10:438:41 | new MyAbstractMapEntry<>(...) : MyAbstractMapEntry [<map.value>] : Object | provenance | MaD:198 |
 | Test.java:438:39:438:40 | in : Object | Test.java:7057:35:7057:47 | value : Object | provenance |  |
 | Test.java:439:21:439:23 | out : MyAbstractMapEntry [<map.value>] : Object | Test.java:243:20:243:50 | container : MyAbstractMapEntry [<map.value>] : Object | provenance |  |
-| Test.java:439:21:439:23 | out : MyAbstractMapEntry [<map.value>] : Object | Test.java:439:9:439:24 | getMapValue(...) | provenance | MaD:569 |
+| Test.java:439:21:439:23 | out : MyAbstractMapEntry [<map.value>] : Object | Test.java:439:9:439:24 | getMapValue(...) | provenance | MaD:644 |
 | Test.java:444:34:444:68 | newMAMEWithMapKey(...) : MyAbstractMapEntry [<map.key>] : String | Test.java:445:42:445:43 | in : MyAbstractMapEntry [<map.key>] : String | provenance |  |
 | Test.java:444:52:444:67 | (...)... : String | Test.java:280:53:280:57 | key : String | provenance |  |
-| Test.java:444:52:444:67 | (...)... : String | Test.java:444:34:444:68 | newMAMEWithMapKey(...) : MyAbstractMapEntry [<map.key>] : String | provenance | MaD:195 |
+| Test.java:444:52:444:67 | (...)... : String | Test.java:444:34:444:68 | newMAMEWithMapKey(...) : MyAbstractMapEntry [<map.key>] : String | provenance | MaD:197 |
 | Test.java:444:60:444:67 | source(...) : Object | Test.java:444:52:444:67 | (...)... : String | provenance |  |
 | Test.java:445:10:445:44 | new MyAbstractMapEntryDecorator<>(...) : MyAbstractMapEntryDecorator [<map.key>] : String | Test.java:446:19:446:21 | out : MyAbstractMapEntryDecorator [<map.key>] : String | provenance |  |
-| Test.java:445:42:445:43 | in : MyAbstractMapEntry [<map.key>] : String | Test.java:445:10:445:44 | new MyAbstractMapEntryDecorator<>(...) : MyAbstractMapEntryDecorator [<map.key>] : String | provenance | MaD:197 |
+| Test.java:445:42:445:43 | in : MyAbstractMapEntry [<map.key>] : String | Test.java:445:10:445:44 | new MyAbstractMapEntryDecorator<>(...) : MyAbstractMapEntryDecorator [<map.key>] : String | provenance | MaD:199 |
 | Test.java:445:42:445:43 | in : MyAbstractMapEntry [<map.key>] : String | Test.java:7067:31:7067:57 | entry : MyAbstractMapEntry [<map.key>] : String | provenance |  |
 | Test.java:446:19:446:21 | out : MyAbstractMapEntryDecorator [<map.key>] : String | Test.java:239:18:239:57 | container : MyAbstractMapEntryDecorator [<map.key>] : String | provenance |  |
-| Test.java:446:19:446:21 | out : MyAbstractMapEntryDecorator [<map.key>] : String | Test.java:446:9:446:22 | getMapKey(...) | provenance | MaD:20 |
-| Test.java:446:19:446:21 | out : MyAbstractMapEntryDecorator [<map.key>] : String | Test.java:446:9:446:22 | getMapKey(...) | provenance | MaD:568 |
+| Test.java:446:19:446:21 | out : MyAbstractMapEntryDecorator [<map.key>] : String | Test.java:446:9:446:22 | getMapKey(...) | provenance | MaD:9 |
+| Test.java:446:19:446:21 | out : MyAbstractMapEntryDecorator [<map.key>] : String | Test.java:446:9:446:22 | getMapKey(...) | provenance | MaD:643 |
 | Test.java:451:34:451:70 | newMAMEWithMapValue(...) : MyAbstractMapEntry [<map.value>] : String | Test.java:452:42:452:43 | in : MyAbstractMapEntry [<map.value>] : String | provenance |  |
 | Test.java:451:54:451:69 | (...)... : String | Test.java:300:55:300:61 | value : String | provenance |  |
-| Test.java:451:54:451:69 | (...)... : String | Test.java:451:34:451:70 | newMAMEWithMapValue(...) : MyAbstractMapEntry [<map.value>] : String | provenance | MaD:196 |
+| Test.java:451:54:451:69 | (...)... : String | Test.java:451:34:451:70 | newMAMEWithMapValue(...) : MyAbstractMapEntry [<map.value>] : String | provenance | MaD:198 |
 | Test.java:451:62:451:69 | source(...) : Object | Test.java:451:54:451:69 | (...)... : String | provenance |  |
 | Test.java:452:10:452:44 | new MyAbstractMapEntryDecorator<>(...) : MyAbstractMapEntryDecorator [<map.value>] : String | Test.java:453:21:453:23 | out : MyAbstractMapEntryDecorator [<map.value>] : String | provenance |  |
-| Test.java:452:42:452:43 | in : MyAbstractMapEntry [<map.value>] : String | Test.java:452:10:452:44 | new MyAbstractMapEntryDecorator<>(...) : MyAbstractMapEntryDecorator [<map.value>] : String | provenance | MaD:198 |
+| Test.java:452:42:452:43 | in : MyAbstractMapEntry [<map.value>] : String | Test.java:452:10:452:44 | new MyAbstractMapEntryDecorator<>(...) : MyAbstractMapEntryDecorator [<map.value>] : String | provenance | MaD:200 |
 | Test.java:452:42:452:43 | in : MyAbstractMapEntry [<map.value>] : String | Test.java:7067:31:7067:57 | entry : MyAbstractMapEntry [<map.value>] : String | provenance |  |
 | Test.java:453:21:453:23 | out : MyAbstractMapEntryDecorator [<map.value>] : String | Test.java:245:20:245:59 | container : MyAbstractMapEntryDecorator [<map.value>] : String | provenance |  |
-| Test.java:453:21:453:23 | out : MyAbstractMapEntryDecorator [<map.value>] : String | Test.java:453:9:453:24 | getMapValue(...) | provenance | MaD:21 |
-| Test.java:453:21:453:23 | out : MyAbstractMapEntryDecorator [<map.value>] : String | Test.java:453:9:453:24 | getMapValue(...) | provenance | MaD:569 |
+| Test.java:453:21:453:23 | out : MyAbstractMapEntryDecorator [<map.value>] : String | Test.java:453:9:453:24 | getMapValue(...) | provenance | MaD:10 |
+| Test.java:453:21:453:23 | out : MyAbstractMapEntryDecorator [<map.value>] : String | Test.java:453:9:453:24 | getMapValue(...) | provenance | MaD:644 |
 | Test.java:458:37:458:72 | newMAMEDWithMapKey(...) : MyAbstractMapEntryDecorator [<map.key>] : String | Test.java:459:10:459:11 | in : MyAbstractMapEntryDecorator [<map.key>] : String | provenance |  |
 | Test.java:458:56:458:71 | (...)... : String | Test.java:281:63:281:67 | key : String | provenance |  |
-| Test.java:458:56:458:71 | (...)... : String | Test.java:458:37:458:72 | newMAMEDWithMapKey(...) : MyAbstractMapEntryDecorator [<map.key>] : String | provenance | MaD:195 |
+| Test.java:458:56:458:71 | (...)... : String | Test.java:458:37:458:72 | newMAMEDWithMapKey(...) : MyAbstractMapEntryDecorator [<map.key>] : String | provenance | MaD:197 |
 | Test.java:458:64:458:71 | source(...) : Object | Test.java:458:56:458:71 | (...)... : String | provenance |  |
-| Test.java:459:10:459:11 | in : MyAbstractMapEntryDecorator [<map.key>] : String | Test.java:459:10:459:27 | myGetMapEntry(...) : Entry [<map.key>] : String | provenance | MaD:199 |
+| Test.java:459:10:459:11 | in : MyAbstractMapEntryDecorator [<map.key>] : String | Test.java:459:10:459:27 | myGetMapEntry(...) : Entry [<map.key>] : String | provenance | MaD:201 |
 | Test.java:459:10:459:11 | in : MyAbstractMapEntryDecorator [<map.key>] : String | Test.java:7071:19:7071:31 | parameter this : MyAbstractMapEntryDecorator [<map.key>] : String | provenance |  |
 | Test.java:459:10:459:27 | myGetMapEntry(...) : Entry [<map.key>] : String | Test.java:460:28:460:30 | out : Entry [<map.key>] : String | provenance |  |
 | Test.java:460:28:460:30 | out : Entry [<map.key>] : String | Test.java:238:27:238:50 | container : Entry [<map.key>] : String | provenance |  |
-| Test.java:460:28:460:30 | out : Entry [<map.key>] : String | Test.java:460:9:460:31 | getMapKeyFromEntry(...) | provenance | MaD:20 |
+| Test.java:460:28:460:30 | out : Entry [<map.key>] : String | Test.java:460:9:460:31 | getMapKeyFromEntry(...) | provenance | MaD:9 |
 | Test.java:465:37:465:74 | newMAMEDWithMapValue(...) : MyAbstractMapEntryDecorator [<map.value>] : String | Test.java:466:10:466:11 | in : MyAbstractMapEntryDecorator [<map.value>] : String | provenance |  |
 | Test.java:465:58:465:73 | (...)... : String | Test.java:301:65:301:71 | value : String | provenance |  |
-| Test.java:465:58:465:73 | (...)... : String | Test.java:465:37:465:74 | newMAMEDWithMapValue(...) : MyAbstractMapEntryDecorator [<map.value>] : String | provenance | MaD:196 |
+| Test.java:465:58:465:73 | (...)... : String | Test.java:465:37:465:74 | newMAMEDWithMapValue(...) : MyAbstractMapEntryDecorator [<map.value>] : String | provenance | MaD:198 |
 | Test.java:465:66:465:73 | source(...) : Object | Test.java:465:58:465:73 | (...)... : String | provenance |  |
-| Test.java:466:10:466:11 | in : MyAbstractMapEntryDecorator [<map.value>] : String | Test.java:466:10:466:27 | myGetMapEntry(...) : Entry [<map.value>] : String | provenance | MaD:200 |
+| Test.java:466:10:466:11 | in : MyAbstractMapEntryDecorator [<map.value>] : String | Test.java:466:10:466:27 | myGetMapEntry(...) : Entry [<map.value>] : String | provenance | MaD:202 |
 | Test.java:466:10:466:11 | in : MyAbstractMapEntryDecorator [<map.value>] : String | Test.java:7071:19:7071:31 | parameter this : MyAbstractMapEntryDecorator [<map.value>] : String | provenance |  |
 | Test.java:466:10:466:27 | myGetMapEntry(...) : Entry [<map.value>] : String | Test.java:467:30:467:32 | out : Entry [<map.value>] : String | provenance |  |
 | Test.java:467:30:467:32 | out : Entry [<map.value>] : String | Test.java:244:29:244:52 | container : Entry [<map.value>] : String | provenance |  |
-| Test.java:467:30:467:32 | out : Entry [<map.value>] : String | Test.java:467:9:467:33 | getMapValueFromEntry(...) | provenance | MaD:21 |
+| Test.java:467:30:467:32 | out : Entry [<map.value>] : String | Test.java:467:9:467:33 | getMapValueFromEntry(...) | provenance | MaD:10 |
 | Test.java:472:34:472:68 | newMAMEWithMapKey(...) : MyAbstractMapEntry [<map.key>] : String | Test.java:473:30:473:31 | in : MyAbstractMapEntry [<map.key>] : String | provenance |  |
 | Test.java:472:52:472:67 | (...)... : String | Test.java:280:53:280:57 | key : String | provenance |  |
-| Test.java:472:52:472:67 | (...)... : String | Test.java:472:34:472:68 | newMAMEWithMapKey(...) : MyAbstractMapEntry [<map.key>] : String | provenance | MaD:195 |
+| Test.java:472:52:472:67 | (...)... : String | Test.java:472:34:472:68 | newMAMEWithMapKey(...) : MyAbstractMapEntry [<map.key>] : String | provenance | MaD:197 |
 | Test.java:472:60:472:67 | source(...) : Object | Test.java:472:52:472:67 | (...)... : String | provenance |  |
 | Test.java:473:10:473:32 | new DefaultKeyValue<>(...) : DefaultKeyValue [<map.key>] : String | Test.java:474:19:474:21 | out : DefaultKeyValue [<map.key>] : String | provenance |  |
-| Test.java:473:30:473:31 | in : MyAbstractMapEntry [<map.key>] : String | Test.java:473:10:473:32 | new DefaultKeyValue<>(...) : DefaultKeyValue [<map.key>] : String | provenance | MaD:201 |
+| Test.java:473:30:473:31 | in : MyAbstractMapEntry [<map.key>] : String | Test.java:473:10:473:32 | new DefaultKeyValue<>(...) : DefaultKeyValue [<map.key>] : String | provenance | MaD:205 |
 | Test.java:474:19:474:21 | out : DefaultKeyValue [<map.key>] : String | Test.java:237:18:237:48 | container : DefaultKeyValue [<map.key>] : String | provenance |  |
-| Test.java:474:19:474:21 | out : DefaultKeyValue [<map.key>] : String | Test.java:474:9:474:22 | getMapKey(...) | provenance | MaD:568 |
+| Test.java:474:19:474:21 | out : DefaultKeyValue [<map.key>] : String | Test.java:474:9:474:22 | getMapKey(...) | provenance | MaD:643 |
 | Test.java:479:34:479:70 | newMAMEWithMapValue(...) : MyAbstractMapEntry [<map.value>] : String | Test.java:480:30:480:31 | in : MyAbstractMapEntry [<map.value>] : String | provenance |  |
 | Test.java:479:54:479:69 | (...)... : String | Test.java:300:55:300:61 | value : String | provenance |  |
-| Test.java:479:54:479:69 | (...)... : String | Test.java:479:34:479:70 | newMAMEWithMapValue(...) : MyAbstractMapEntry [<map.value>] : String | provenance | MaD:196 |
+| Test.java:479:54:479:69 | (...)... : String | Test.java:479:34:479:70 | newMAMEWithMapValue(...) : MyAbstractMapEntry [<map.value>] : String | provenance | MaD:198 |
 | Test.java:479:62:479:69 | source(...) : Object | Test.java:479:54:479:69 | (...)... : String | provenance |  |
 | Test.java:480:10:480:32 | new DefaultKeyValue<>(...) : DefaultKeyValue [<map.value>] : String | Test.java:481:21:481:23 | out : DefaultKeyValue [<map.value>] : String | provenance |  |
-| Test.java:480:30:480:31 | in : MyAbstractMapEntry [<map.value>] : String | Test.java:480:10:480:32 | new DefaultKeyValue<>(...) : DefaultKeyValue [<map.value>] : String | provenance | MaD:202 |
+| Test.java:480:30:480:31 | in : MyAbstractMapEntry [<map.value>] : String | Test.java:480:10:480:32 | new DefaultKeyValue<>(...) : DefaultKeyValue [<map.value>] : String | provenance | MaD:206 |
 | Test.java:481:21:481:23 | out : DefaultKeyValue [<map.value>] : String | Test.java:243:20:243:50 | container : DefaultKeyValue [<map.value>] : String | provenance |  |
-| Test.java:481:21:481:23 | out : DefaultKeyValue [<map.value>] : String | Test.java:481:9:481:24 | getMapValue(...) | provenance | MaD:569 |
+| Test.java:481:21:481:23 | out : DefaultKeyValue [<map.value>] : String | Test.java:481:9:481:24 | getMapValue(...) | provenance | MaD:644 |
 | Test.java:486:18:486:52 | newMAKVWithMapKey(...) : MyAbstractKeyValue [<map.key>] : String | Test.java:487:30:487:31 | in : MyAbstractKeyValue [<map.key>] : String | provenance |  |
 | Test.java:486:36:486:51 | (...)... : String | Test.java:282:53:282:57 | key : String | provenance |  |
-| Test.java:486:36:486:51 | (...)... : String | Test.java:486:18:486:52 | newMAKVWithMapKey(...) : MyAbstractKeyValue [<map.key>] : String | provenance | MaD:189 |
+| Test.java:486:36:486:51 | (...)... : String | Test.java:486:18:486:52 | newMAKVWithMapKey(...) : MyAbstractKeyValue [<map.key>] : String | provenance | MaD:191 |
 | Test.java:486:44:486:51 | source(...) : Object | Test.java:486:36:486:51 | (...)... : String | provenance |  |
 | Test.java:487:10:487:32 | new DefaultKeyValue<>(...) : DefaultKeyValue [<map.key>] : String | Test.java:488:19:488:21 | out : DefaultKeyValue [<map.key>] : String | provenance |  |
 | Test.java:487:30:487:31 | in : MyAbstractKeyValue [<map.key>] : String | Test.java:487:10:487:32 | new DefaultKeyValue<>(...) : DefaultKeyValue [<map.key>] : String | provenance | MaD:203 |
 | Test.java:488:19:488:21 | out : DefaultKeyValue [<map.key>] : String | Test.java:237:18:237:48 | container : DefaultKeyValue [<map.key>] : String | provenance |  |
-| Test.java:488:19:488:21 | out : DefaultKeyValue [<map.key>] : String | Test.java:488:9:488:22 | getMapKey(...) | provenance | MaD:568 |
+| Test.java:488:19:488:21 | out : DefaultKeyValue [<map.key>] : String | Test.java:488:9:488:22 | getMapKey(...) | provenance | MaD:643 |
 | Test.java:493:18:493:54 | newMAKVWithMapValue(...) : MyAbstractKeyValue [<map.value>] : String | Test.java:494:30:494:31 | in : MyAbstractKeyValue [<map.value>] : String | provenance |  |
 | Test.java:493:38:493:53 | (...)... : String | Test.java:299:55:299:61 | value : String | provenance |  |
-| Test.java:493:38:493:53 | (...)... : String | Test.java:493:18:493:54 | newMAKVWithMapValue(...) : MyAbstractKeyValue [<map.value>] : String | provenance | MaD:190 |
+| Test.java:493:38:493:53 | (...)... : String | Test.java:493:18:493:54 | newMAKVWithMapValue(...) : MyAbstractKeyValue [<map.value>] : String | provenance | MaD:192 |
 | Test.java:493:46:493:53 | source(...) : Object | Test.java:493:38:493:53 | (...)... : String | provenance |  |
 | Test.java:494:10:494:32 | new DefaultKeyValue<>(...) : DefaultKeyValue [<map.value>] : String | Test.java:495:21:495:23 | out : DefaultKeyValue [<map.value>] : String | provenance |  |
 | Test.java:494:30:494:31 | in : MyAbstractKeyValue [<map.value>] : String | Test.java:494:10:494:32 | new DefaultKeyValue<>(...) : DefaultKeyValue [<map.value>] : String | provenance | MaD:204 |
 | Test.java:495:21:495:23 | out : DefaultKeyValue [<map.value>] : String | Test.java:243:20:243:50 | container : DefaultKeyValue [<map.value>] : String | provenance |  |
-| Test.java:495:21:495:23 | out : DefaultKeyValue [<map.value>] : String | Test.java:495:9:495:24 | getMapValue(...) | provenance | MaD:569 |
+| Test.java:495:21:495:23 | out : DefaultKeyValue [<map.value>] : String | Test.java:495:9:495:24 | getMapValue(...) | provenance | MaD:644 |
 | Test.java:500:16:500:23 | source(...) : Object | Test.java:501:30:501:31 | in : Object | provenance |  |
 | Test.java:501:10:501:38 | new DefaultKeyValue<>(...) : DefaultKeyValue [<map.key>] : Object | Test.java:502:19:502:21 | out : DefaultKeyValue [<map.key>] : Object | provenance |  |
-| Test.java:501:30:501:31 | in : Object | Test.java:501:10:501:38 | new DefaultKeyValue<>(...) : DefaultKeyValue [<map.key>] : Object | provenance | MaD:205 |
+| Test.java:501:30:501:31 | in : Object | Test.java:501:10:501:38 | new DefaultKeyValue<>(...) : DefaultKeyValue [<map.key>] : Object | provenance | MaD:207 |
 | Test.java:502:19:502:21 | out : DefaultKeyValue [<map.key>] : Object | Test.java:237:18:237:48 | container : DefaultKeyValue [<map.key>] : Object | provenance |  |
-| Test.java:502:19:502:21 | out : DefaultKeyValue [<map.key>] : Object | Test.java:502:9:502:22 | getMapKey(...) | provenance | MaD:568 |
+| Test.java:502:19:502:21 | out : DefaultKeyValue [<map.key>] : Object | Test.java:502:9:502:22 | getMapKey(...) | provenance | MaD:643 |
 | Test.java:507:16:507:23 | source(...) : Object | Test.java:508:36:508:37 | in : Object | provenance |  |
 | Test.java:508:10:508:38 | new DefaultKeyValue<>(...) : DefaultKeyValue [<map.value>] : Object | Test.java:509:21:509:23 | out : DefaultKeyValue [<map.value>] : Object | provenance |  |
-| Test.java:508:36:508:37 | in : Object | Test.java:508:10:508:38 | new DefaultKeyValue<>(...) : DefaultKeyValue [<map.value>] : Object | provenance | MaD:206 |
+| Test.java:508:36:508:37 | in : Object | Test.java:508:10:508:38 | new DefaultKeyValue<>(...) : DefaultKeyValue [<map.value>] : Object | provenance | MaD:208 |
 | Test.java:509:21:509:23 | out : DefaultKeyValue [<map.value>] : Object | Test.java:243:20:243:50 | container : DefaultKeyValue [<map.value>] : Object | provenance |  |
-| Test.java:509:21:509:23 | out : DefaultKeyValue [<map.value>] : Object | Test.java:509:9:509:24 | getMapValue(...) | provenance | MaD:569 |
+| Test.java:509:21:509:23 | out : DefaultKeyValue [<map.value>] : Object | Test.java:509:9:509:24 | getMapValue(...) | provenance | MaD:644 |
 | Test.java:514:25:514:58 | newDKVWithMapKey(...) : DefaultKeyValue [<map.key>] : String | Test.java:515:10:515:11 | in : DefaultKeyValue [<map.key>] : String | provenance |  |
 | Test.java:514:42:514:57 | (...)... : String | Test.java:273:49:273:53 | key : String | provenance |  |
-| Test.java:514:42:514:57 | (...)... : String | Test.java:514:25:514:58 | newDKVWithMapKey(...) : DefaultKeyValue [<map.key>] : String | provenance | MaD:205 |
+| Test.java:514:42:514:57 | (...)... : String | Test.java:514:25:514:58 | newDKVWithMapKey(...) : DefaultKeyValue [<map.key>] : String | provenance | MaD:207 |
 | Test.java:514:50:514:57 | source(...) : Object | Test.java:514:42:514:57 | (...)... : String | provenance |  |
-| Test.java:515:10:515:11 | in : DefaultKeyValue [<map.key>] : String | Test.java:515:10:515:24 | toMapEntry(...) : Entry [<map.key>] : String | provenance | MaD:207 |
+| Test.java:515:10:515:11 | in : DefaultKeyValue [<map.key>] : String | Test.java:515:10:515:24 | toMapEntry(...) : Entry [<map.key>] : String | provenance | MaD:209 |
 | Test.java:515:10:515:24 | toMapEntry(...) : Entry [<map.key>] : String | Test.java:516:28:516:30 | out : Entry [<map.key>] : String | provenance |  |
 | Test.java:516:28:516:30 | out : Entry [<map.key>] : String | Test.java:238:27:238:50 | container : Entry [<map.key>] : String | provenance |  |
-| Test.java:516:28:516:30 | out : Entry [<map.key>] : String | Test.java:516:9:516:31 | getMapKeyFromEntry(...) | provenance | MaD:20 |
+| Test.java:516:28:516:30 | out : Entry [<map.key>] : String | Test.java:516:9:516:31 | getMapKeyFromEntry(...) | provenance | MaD:9 |
 | Test.java:521:25:521:60 | newDKVWithMapValue(...) : DefaultKeyValue [<map.value>] : String | Test.java:522:10:522:11 | in : DefaultKeyValue [<map.value>] : String | provenance |  |
 | Test.java:521:44:521:59 | (...)... : String | Test.java:291:51:291:57 | value : String | provenance |  |
-| Test.java:521:44:521:59 | (...)... : String | Test.java:521:25:521:60 | newDKVWithMapValue(...) : DefaultKeyValue [<map.value>] : String | provenance | MaD:206 |
+| Test.java:521:44:521:59 | (...)... : String | Test.java:521:25:521:60 | newDKVWithMapValue(...) : DefaultKeyValue [<map.value>] : String | provenance | MaD:208 |
 | Test.java:521:52:521:59 | source(...) : Object | Test.java:521:44:521:59 | (...)... : String | provenance |  |
-| Test.java:522:10:522:11 | in : DefaultKeyValue [<map.value>] : String | Test.java:522:10:522:24 | toMapEntry(...) : Entry [<map.value>] : String | provenance | MaD:208 |
+| Test.java:522:10:522:11 | in : DefaultKeyValue [<map.value>] : String | Test.java:522:10:522:24 | toMapEntry(...) : Entry [<map.value>] : String | provenance | MaD:210 |
 | Test.java:522:10:522:24 | toMapEntry(...) : Entry [<map.value>] : String | Test.java:523:30:523:32 | out : Entry [<map.value>] : String | provenance |  |
 | Test.java:523:30:523:32 | out : Entry [<map.value>] : String | Test.java:244:29:244:52 | container : Entry [<map.value>] : String | provenance |  |
-| Test.java:523:30:523:32 | out : Entry [<map.value>] : String | Test.java:523:9:523:33 | getMapValueFromEntry(...) | provenance | MaD:21 |
+| Test.java:523:30:523:32 | out : Entry [<map.value>] : String | Test.java:523:9:523:33 | getMapValueFromEntry(...) | provenance | MaD:10 |
 | Test.java:528:34:528:68 | newMAMEWithMapKey(...) : MyAbstractMapEntry [<map.key>] : String | Test.java:529:30:529:31 | in : MyAbstractMapEntry [<map.key>] : String | provenance |  |
 | Test.java:528:52:528:67 | (...)... : String | Test.java:280:53:280:57 | key : String | provenance |  |
-| Test.java:528:52:528:67 | (...)... : String | Test.java:528:34:528:68 | newMAMEWithMapKey(...) : MyAbstractMapEntry [<map.key>] : String | provenance | MaD:195 |
+| Test.java:528:52:528:67 | (...)... : String | Test.java:528:34:528:68 | newMAMEWithMapKey(...) : MyAbstractMapEntry [<map.key>] : String | provenance | MaD:197 |
 | Test.java:528:60:528:67 | source(...) : Object | Test.java:528:52:528:67 | (...)... : String | provenance |  |
 | Test.java:529:10:529:32 | new DefaultMapEntry<>(...) : DefaultMapEntry [<map.key>] : String | Test.java:530:19:530:21 | out : DefaultMapEntry [<map.key>] : String | provenance |  |
-| Test.java:529:30:529:31 | in : MyAbstractMapEntry [<map.key>] : String | Test.java:529:10:529:32 | new DefaultMapEntry<>(...) : DefaultMapEntry [<map.key>] : String | provenance | MaD:209 |
+| Test.java:529:30:529:31 | in : MyAbstractMapEntry [<map.key>] : String | Test.java:529:10:529:32 | new DefaultMapEntry<>(...) : DefaultMapEntry [<map.key>] : String | provenance | MaD:213 |
 | Test.java:530:19:530:21 | out : DefaultMapEntry [<map.key>] : String | Test.java:237:18:237:48 | container : DefaultMapEntry [<map.key>] : String | provenance |  |
-| Test.java:530:19:530:21 | out : DefaultMapEntry [<map.key>] : String | Test.java:530:9:530:22 | getMapKey(...) | provenance | MaD:568 |
+| Test.java:530:19:530:21 | out : DefaultMapEntry [<map.key>] : String | Test.java:530:9:530:22 | getMapKey(...) | provenance | MaD:643 |
 | Test.java:535:34:535:70 | newMAMEWithMapValue(...) : MyAbstractMapEntry [<map.value>] : String | Test.java:536:30:536:31 | in : MyAbstractMapEntry [<map.value>] : String | provenance |  |
 | Test.java:535:54:535:69 | (...)... : String | Test.java:300:55:300:61 | value : String | provenance |  |
-| Test.java:535:54:535:69 | (...)... : String | Test.java:535:34:535:70 | newMAMEWithMapValue(...) : MyAbstractMapEntry [<map.value>] : String | provenance | MaD:196 |
+| Test.java:535:54:535:69 | (...)... : String | Test.java:535:34:535:70 | newMAMEWithMapValue(...) : MyAbstractMapEntry [<map.value>] : String | provenance | MaD:198 |
 | Test.java:535:62:535:69 | source(...) : Object | Test.java:535:54:535:69 | (...)... : String | provenance |  |
 | Test.java:536:10:536:32 | new DefaultMapEntry<>(...) : DefaultMapEntry [<map.value>] : String | Test.java:537:21:537:23 | out : DefaultMapEntry [<map.value>] : String | provenance |  |
-| Test.java:536:30:536:31 | in : MyAbstractMapEntry [<map.value>] : String | Test.java:536:10:536:32 | new DefaultMapEntry<>(...) : DefaultMapEntry [<map.value>] : String | provenance | MaD:210 |
+| Test.java:536:30:536:31 | in : MyAbstractMapEntry [<map.value>] : String | Test.java:536:10:536:32 | new DefaultMapEntry<>(...) : DefaultMapEntry [<map.value>] : String | provenance | MaD:214 |
 | Test.java:537:21:537:23 | out : DefaultMapEntry [<map.value>] : String | Test.java:243:20:243:50 | container : DefaultMapEntry [<map.value>] : String | provenance |  |
-| Test.java:537:21:537:23 | out : DefaultMapEntry [<map.value>] : String | Test.java:537:9:537:24 | getMapValue(...) | provenance | MaD:569 |
+| Test.java:537:21:537:23 | out : DefaultMapEntry [<map.value>] : String | Test.java:537:9:537:24 | getMapValue(...) | provenance | MaD:644 |
 | Test.java:542:18:542:52 | newMAKVWithMapKey(...) : MyAbstractKeyValue [<map.key>] : String | Test.java:543:30:543:31 | in : MyAbstractKeyValue [<map.key>] : String | provenance |  |
 | Test.java:542:36:542:51 | (...)... : String | Test.java:282:53:282:57 | key : String | provenance |  |
-| Test.java:542:36:542:51 | (...)... : String | Test.java:542:18:542:52 | newMAKVWithMapKey(...) : MyAbstractKeyValue [<map.key>] : String | provenance | MaD:189 |
+| Test.java:542:36:542:51 | (...)... : String | Test.java:542:18:542:52 | newMAKVWithMapKey(...) : MyAbstractKeyValue [<map.key>] : String | provenance | MaD:191 |
 | Test.java:542:44:542:51 | source(...) : Object | Test.java:542:36:542:51 | (...)... : String | provenance |  |
 | Test.java:543:10:543:32 | new DefaultMapEntry<>(...) : DefaultMapEntry [<map.key>] : String | Test.java:544:19:544:21 | out : DefaultMapEntry [<map.key>] : String | provenance |  |
 | Test.java:543:30:543:31 | in : MyAbstractKeyValue [<map.key>] : String | Test.java:543:10:543:32 | new DefaultMapEntry<>(...) : DefaultMapEntry [<map.key>] : String | provenance | MaD:211 |
 | Test.java:544:19:544:21 | out : DefaultMapEntry [<map.key>] : String | Test.java:237:18:237:48 | container : DefaultMapEntry [<map.key>] : String | provenance |  |
-| Test.java:544:19:544:21 | out : DefaultMapEntry [<map.key>] : String | Test.java:544:9:544:22 | getMapKey(...) | provenance | MaD:568 |
+| Test.java:544:19:544:21 | out : DefaultMapEntry [<map.key>] : String | Test.java:544:9:544:22 | getMapKey(...) | provenance | MaD:643 |
 | Test.java:549:18:549:54 | newMAKVWithMapValue(...) : MyAbstractKeyValue [<map.value>] : String | Test.java:550:30:550:31 | in : MyAbstractKeyValue [<map.value>] : String | provenance |  |
 | Test.java:549:38:549:53 | (...)... : String | Test.java:299:55:299:61 | value : String | provenance |  |
-| Test.java:549:38:549:53 | (...)... : String | Test.java:549:18:549:54 | newMAKVWithMapValue(...) : MyAbstractKeyValue [<map.value>] : String | provenance | MaD:190 |
+| Test.java:549:38:549:53 | (...)... : String | Test.java:549:18:549:54 | newMAKVWithMapValue(...) : MyAbstractKeyValue [<map.value>] : String | provenance | MaD:192 |
 | Test.java:549:46:549:53 | source(...) : Object | Test.java:549:38:549:53 | (...)... : String | provenance |  |
 | Test.java:550:10:550:32 | new DefaultMapEntry<>(...) : DefaultMapEntry [<map.value>] : String | Test.java:551:21:551:23 | out : DefaultMapEntry [<map.value>] : String | provenance |  |
 | Test.java:550:30:550:31 | in : MyAbstractKeyValue [<map.value>] : String | Test.java:550:10:550:32 | new DefaultMapEntry<>(...) : DefaultMapEntry [<map.value>] : String | provenance | MaD:212 |
 | Test.java:551:21:551:23 | out : DefaultMapEntry [<map.value>] : String | Test.java:243:20:243:50 | container : DefaultMapEntry [<map.value>] : String | provenance |  |
-| Test.java:551:21:551:23 | out : DefaultMapEntry [<map.value>] : String | Test.java:551:9:551:24 | getMapValue(...) | provenance | MaD:569 |
+| Test.java:551:21:551:23 | out : DefaultMapEntry [<map.value>] : String | Test.java:551:9:551:24 | getMapValue(...) | provenance | MaD:644 |
 | Test.java:556:16:556:23 | source(...) : Object | Test.java:557:30:557:31 | in : Object | provenance |  |
 | Test.java:557:10:557:38 | new DefaultMapEntry<>(...) : DefaultMapEntry [<map.key>] : Object | Test.java:558:19:558:21 | out : DefaultMapEntry [<map.key>] : Object | provenance |  |
-| Test.java:557:30:557:31 | in : Object | Test.java:557:10:557:38 | new DefaultMapEntry<>(...) : DefaultMapEntry [<map.key>] : Object | provenance | MaD:213 |
+| Test.java:557:30:557:31 | in : Object | Test.java:557:10:557:38 | new DefaultMapEntry<>(...) : DefaultMapEntry [<map.key>] : Object | provenance | MaD:215 |
 | Test.java:558:19:558:21 | out : DefaultMapEntry [<map.key>] : Object | Test.java:237:18:237:48 | container : DefaultMapEntry [<map.key>] : Object | provenance |  |
-| Test.java:558:19:558:21 | out : DefaultMapEntry [<map.key>] : Object | Test.java:558:9:558:22 | getMapKey(...) | provenance | MaD:568 |
+| Test.java:558:19:558:21 | out : DefaultMapEntry [<map.key>] : Object | Test.java:558:9:558:22 | getMapKey(...) | provenance | MaD:643 |
 | Test.java:563:16:563:23 | source(...) : Object | Test.java:564:36:564:37 | in : Object | provenance |  |
 | Test.java:564:10:564:38 | new DefaultMapEntry<>(...) : DefaultMapEntry [<map.value>] : Object | Test.java:565:21:565:23 | out : DefaultMapEntry [<map.value>] : Object | provenance |  |
-| Test.java:564:36:564:37 | in : Object | Test.java:564:10:564:38 | new DefaultMapEntry<>(...) : DefaultMapEntry [<map.value>] : Object | provenance | MaD:214 |
+| Test.java:564:36:564:37 | in : Object | Test.java:564:10:564:38 | new DefaultMapEntry<>(...) : DefaultMapEntry [<map.value>] : Object | provenance | MaD:216 |
 | Test.java:565:21:565:23 | out : DefaultMapEntry [<map.value>] : Object | Test.java:243:20:243:50 | container : DefaultMapEntry [<map.value>] : Object | provenance |  |
-| Test.java:565:21:565:23 | out : DefaultMapEntry [<map.value>] : Object | Test.java:565:9:565:24 | getMapValue(...) | provenance | MaD:569 |
+| Test.java:565:21:565:23 | out : DefaultMapEntry [<map.value>] : Object | Test.java:565:9:565:24 | getMapValue(...) | provenance | MaD:644 |
 | Test.java:570:16:570:23 | source(...) : Object | Test.java:571:33:571:34 | in : Object | provenance |  |
 | Test.java:571:10:571:35 | new TiedMapEntry<>(...) : TiedMapEntry [<map.key>] : Object | Test.java:572:28:572:30 | out : TiedMapEntry [<map.key>] : Object | provenance |  |
-| Test.java:571:33:571:34 | in : Object | Test.java:571:10:571:35 | new TiedMapEntry<>(...) : TiedMapEntry [<map.key>] : Object | provenance | MaD:234 |
+| Test.java:571:33:571:34 | in : Object | Test.java:571:10:571:35 | new TiedMapEntry<>(...) : TiedMapEntry [<map.key>] : Object | provenance | MaD:236 |
 | Test.java:572:28:572:30 | out : TiedMapEntry [<map.key>] : Object | Test.java:238:27:238:50 | container : TiedMapEntry [<map.key>] : Object | provenance |  |
-| Test.java:572:28:572:30 | out : TiedMapEntry [<map.key>] : Object | Test.java:572:9:572:31 | getMapKeyFromEntry(...) | provenance | MaD:20 |
+| Test.java:572:28:572:30 | out : TiedMapEntry [<map.key>] : Object | Test.java:572:9:572:31 | getMapKeyFromEntry(...) | provenance | MaD:9 |
 | Test.java:577:13:577:52 | newTreeMapWithMapValue(...) : TreeMap [<map.value>] : String | Test.java:578:27:578:28 | in : TreeMap [<map.value>] : String | provenance |  |
 | Test.java:577:36:577:51 | (...)... : String | Test.java:304:49:304:55 | value : String | provenance |  |
-| Test.java:577:36:577:51 | (...)... : String | Test.java:577:13:577:52 | newTreeMapWithMapValue(...) : TreeMap [<map.value>] : String | provenance | MaD:15 |
+| Test.java:577:36:577:51 | (...)... : String | Test.java:577:13:577:52 | newTreeMapWithMapValue(...) : TreeMap [<map.value>] : String | provenance | MaD:20 |
 | Test.java:577:44:577:51 | source(...) : Object | Test.java:577:36:577:51 | (...)... : String | provenance |  |
 | Test.java:578:10:578:35 | new TiedMapEntry<>(...) : TiedMapEntry [<map.value>] : String | Test.java:579:30:579:32 | out : TiedMapEntry [<map.value>] : String | provenance |  |
-| Test.java:578:27:578:28 | in : TreeMap [<map.value>] : String | Test.java:578:10:578:35 | new TiedMapEntry<>(...) : TiedMapEntry [<map.value>] : String | provenance | MaD:233 |
+| Test.java:578:27:578:28 | in : TreeMap [<map.value>] : String | Test.java:578:10:578:35 | new TiedMapEntry<>(...) : TiedMapEntry [<map.value>] : String | provenance | MaD:235 |
 | Test.java:579:30:579:32 | out : TiedMapEntry [<map.value>] : String | Test.java:244:29:244:52 | container : TiedMapEntry [<map.value>] : String | provenance |  |
-| Test.java:579:30:579:32 | out : TiedMapEntry [<map.value>] : String | Test.java:579:9:579:33 | getMapValueFromEntry(...) | provenance | MaD:21 |
+| Test.java:579:30:579:32 | out : TiedMapEntry [<map.value>] : String | Test.java:579:9:579:33 | getMapValueFromEntry(...) | provenance | MaD:10 |
 | Test.java:584:34:584:68 | newMAMEWithMapKey(...) : MyAbstractMapEntry [<map.key>] : String | Test.java:585:35:585:36 | in : MyAbstractMapEntry [<map.key>] : String | provenance |  |
 | Test.java:584:52:584:67 | (...)... : String | Test.java:280:53:280:57 | key : String | provenance |  |
-| Test.java:584:52:584:67 | (...)... : String | Test.java:584:34:584:68 | newMAMEWithMapKey(...) : MyAbstractMapEntry [<map.key>] : String | provenance | MaD:195 |
+| Test.java:584:52:584:67 | (...)... : String | Test.java:584:34:584:68 | newMAMEWithMapKey(...) : MyAbstractMapEntry [<map.key>] : String | provenance | MaD:197 |
 | Test.java:584:60:584:67 | source(...) : Object | Test.java:584:52:584:67 | (...)... : String | provenance |  |
 | Test.java:585:10:585:37 | new UnmodifiableMapEntry<>(...) : UnmodifiableMapEntry [<map.key>] : String | Test.java:586:19:586:21 | out : UnmodifiableMapEntry [<map.key>] : String | provenance |  |
-| Test.java:585:35:585:36 | in : MyAbstractMapEntry [<map.key>] : String | Test.java:585:10:585:37 | new UnmodifiableMapEntry<>(...) : UnmodifiableMapEntry [<map.key>] : String | provenance | MaD:235 |
+| Test.java:585:35:585:36 | in : MyAbstractMapEntry [<map.key>] : String | Test.java:585:10:585:37 | new UnmodifiableMapEntry<>(...) : UnmodifiableMapEntry [<map.key>] : String | provenance | MaD:239 |
 | Test.java:586:19:586:21 | out : UnmodifiableMapEntry [<map.key>] : String | Test.java:237:18:237:48 | container : UnmodifiableMapEntry [<map.key>] : String | provenance |  |
-| Test.java:586:19:586:21 | out : UnmodifiableMapEntry [<map.key>] : String | Test.java:586:9:586:22 | getMapKey(...) | provenance | MaD:568 |
+| Test.java:586:19:586:21 | out : UnmodifiableMapEntry [<map.key>] : String | Test.java:586:9:586:22 | getMapKey(...) | provenance | MaD:643 |
 | Test.java:591:34:591:70 | newMAMEWithMapValue(...) : MyAbstractMapEntry [<map.value>] : String | Test.java:592:35:592:36 | in : MyAbstractMapEntry [<map.value>] : String | provenance |  |
 | Test.java:591:54:591:69 | (...)... : String | Test.java:300:55:300:61 | value : String | provenance |  |
-| Test.java:591:54:591:69 | (...)... : String | Test.java:591:34:591:70 | newMAMEWithMapValue(...) : MyAbstractMapEntry [<map.value>] : String | provenance | MaD:196 |
+| Test.java:591:54:591:69 | (...)... : String | Test.java:591:34:591:70 | newMAMEWithMapValue(...) : MyAbstractMapEntry [<map.value>] : String | provenance | MaD:198 |
 | Test.java:591:62:591:69 | source(...) : Object | Test.java:591:54:591:69 | (...)... : String | provenance |  |
 | Test.java:592:10:592:37 | new UnmodifiableMapEntry<>(...) : UnmodifiableMapEntry [<map.value>] : String | Test.java:593:21:593:23 | out : UnmodifiableMapEntry [<map.value>] : String | provenance |  |
-| Test.java:592:35:592:36 | in : MyAbstractMapEntry [<map.value>] : String | Test.java:592:10:592:37 | new UnmodifiableMapEntry<>(...) : UnmodifiableMapEntry [<map.value>] : String | provenance | MaD:236 |
+| Test.java:592:35:592:36 | in : MyAbstractMapEntry [<map.value>] : String | Test.java:592:10:592:37 | new UnmodifiableMapEntry<>(...) : UnmodifiableMapEntry [<map.value>] : String | provenance | MaD:240 |
 | Test.java:593:21:593:23 | out : UnmodifiableMapEntry [<map.value>] : String | Test.java:243:20:243:50 | container : UnmodifiableMapEntry [<map.value>] : String | provenance |  |
-| Test.java:593:21:593:23 | out : UnmodifiableMapEntry [<map.value>] : String | Test.java:593:9:593:24 | getMapValue(...) | provenance | MaD:569 |
+| Test.java:593:21:593:23 | out : UnmodifiableMapEntry [<map.value>] : String | Test.java:593:9:593:24 | getMapValue(...) | provenance | MaD:644 |
 | Test.java:598:18:598:52 | newMAKVWithMapKey(...) : MyAbstractKeyValue [<map.key>] : String | Test.java:599:35:599:36 | in : MyAbstractKeyValue [<map.key>] : String | provenance |  |
 | Test.java:598:36:598:51 | (...)... : String | Test.java:282:53:282:57 | key : String | provenance |  |
-| Test.java:598:36:598:51 | (...)... : String | Test.java:598:18:598:52 | newMAKVWithMapKey(...) : MyAbstractKeyValue [<map.key>] : String | provenance | MaD:189 |
+| Test.java:598:36:598:51 | (...)... : String | Test.java:598:18:598:52 | newMAKVWithMapKey(...) : MyAbstractKeyValue [<map.key>] : String | provenance | MaD:191 |
 | Test.java:598:44:598:51 | source(...) : Object | Test.java:598:36:598:51 | (...)... : String | provenance |  |
 | Test.java:599:10:599:37 | new UnmodifiableMapEntry<>(...) : UnmodifiableMapEntry [<map.key>] : String | Test.java:600:19:600:21 | out : UnmodifiableMapEntry [<map.key>] : String | provenance |  |
 | Test.java:599:35:599:36 | in : MyAbstractKeyValue [<map.key>] : String | Test.java:599:10:599:37 | new UnmodifiableMapEntry<>(...) : UnmodifiableMapEntry [<map.key>] : String | provenance | MaD:237 |
 | Test.java:600:19:600:21 | out : UnmodifiableMapEntry [<map.key>] : String | Test.java:237:18:237:48 | container : UnmodifiableMapEntry [<map.key>] : String | provenance |  |
-| Test.java:600:19:600:21 | out : UnmodifiableMapEntry [<map.key>] : String | Test.java:600:9:600:22 | getMapKey(...) | provenance | MaD:568 |
+| Test.java:600:19:600:21 | out : UnmodifiableMapEntry [<map.key>] : String | Test.java:600:9:600:22 | getMapKey(...) | provenance | MaD:643 |
 | Test.java:605:18:605:54 | newMAKVWithMapValue(...) : MyAbstractKeyValue [<map.value>] : String | Test.java:606:35:606:36 | in : MyAbstractKeyValue [<map.value>] : String | provenance |  |
 | Test.java:605:38:605:53 | (...)... : String | Test.java:299:55:299:61 | value : String | provenance |  |
-| Test.java:605:38:605:53 | (...)... : String | Test.java:605:18:605:54 | newMAKVWithMapValue(...) : MyAbstractKeyValue [<map.value>] : String | provenance | MaD:190 |
+| Test.java:605:38:605:53 | (...)... : String | Test.java:605:18:605:54 | newMAKVWithMapValue(...) : MyAbstractKeyValue [<map.value>] : String | provenance | MaD:192 |
 | Test.java:605:46:605:53 | source(...) : Object | Test.java:605:38:605:53 | (...)... : String | provenance |  |
 | Test.java:606:10:606:37 | new UnmodifiableMapEntry<>(...) : UnmodifiableMapEntry [<map.value>] : String | Test.java:607:21:607:23 | out : UnmodifiableMapEntry [<map.value>] : String | provenance |  |
 | Test.java:606:35:606:36 | in : MyAbstractKeyValue [<map.value>] : String | Test.java:606:10:606:37 | new UnmodifiableMapEntry<>(...) : UnmodifiableMapEntry [<map.value>] : String | provenance | MaD:238 |
 | Test.java:607:21:607:23 | out : UnmodifiableMapEntry [<map.value>] : String | Test.java:243:20:243:50 | container : UnmodifiableMapEntry [<map.value>] : String | provenance |  |
-| Test.java:607:21:607:23 | out : UnmodifiableMapEntry [<map.value>] : String | Test.java:607:9:607:24 | getMapValue(...) | provenance | MaD:569 |
+| Test.java:607:21:607:23 | out : UnmodifiableMapEntry [<map.value>] : String | Test.java:607:9:607:24 | getMapValue(...) | provenance | MaD:644 |
 | Test.java:612:16:612:23 | source(...) : Object | Test.java:613:35:613:36 | in : Object | provenance |  |
 | Test.java:613:10:613:43 | new UnmodifiableMapEntry<>(...) : UnmodifiableMapEntry [<map.key>] : Object | Test.java:614:19:614:21 | out : UnmodifiableMapEntry [<map.key>] : Object | provenance |  |
-| Test.java:613:35:613:36 | in : Object | Test.java:613:10:613:43 | new UnmodifiableMapEntry<>(...) : UnmodifiableMapEntry [<map.key>] : Object | provenance | MaD:239 |
+| Test.java:613:35:613:36 | in : Object | Test.java:613:10:613:43 | new UnmodifiableMapEntry<>(...) : UnmodifiableMapEntry [<map.key>] : Object | provenance | MaD:241 |
 | Test.java:614:19:614:21 | out : UnmodifiableMapEntry [<map.key>] : Object | Test.java:237:18:237:48 | container : UnmodifiableMapEntry [<map.key>] : Object | provenance |  |
-| Test.java:614:19:614:21 | out : UnmodifiableMapEntry [<map.key>] : Object | Test.java:614:9:614:22 | getMapKey(...) | provenance | MaD:568 |
+| Test.java:614:19:614:21 | out : UnmodifiableMapEntry [<map.key>] : Object | Test.java:614:9:614:22 | getMapKey(...) | provenance | MaD:643 |
 | Test.java:619:16:619:23 | source(...) : Object | Test.java:620:41:620:42 | in : Object | provenance |  |
 | Test.java:620:10:620:43 | new UnmodifiableMapEntry<>(...) : UnmodifiableMapEntry [<map.value>] : Object | Test.java:621:21:621:23 | out : UnmodifiableMapEntry [<map.value>] : Object | provenance |  |
-| Test.java:620:41:620:42 | in : Object | Test.java:620:10:620:43 | new UnmodifiableMapEntry<>(...) : UnmodifiableMapEntry [<map.value>] : Object | provenance | MaD:240 |
+| Test.java:620:41:620:42 | in : Object | Test.java:620:10:620:43 | new UnmodifiableMapEntry<>(...) : UnmodifiableMapEntry [<map.value>] : Object | provenance | MaD:242 |
 | Test.java:621:21:621:23 | out : UnmodifiableMapEntry [<map.value>] : Object | Test.java:243:20:243:50 | container : UnmodifiableMapEntry [<map.value>] : Object | provenance |  |
-| Test.java:621:21:621:23 | out : UnmodifiableMapEntry [<map.value>] : Object | Test.java:621:9:621:24 | getMapValue(...) | provenance | MaD:569 |
+| Test.java:621:21:621:23 | out : UnmodifiableMapEntry [<map.value>] : Object | Test.java:621:9:621:24 | getMapValue(...) | provenance | MaD:644 |
 | Test.java:626:22:626:55 | newTMEWithMapKey(...) : TiedMapEntry [<map.key>] : String | Test.java:627:10:627:11 | in : TiedMapEntry [<map.key>] : String | provenance |  |
 | Test.java:626:39:626:54 | (...)... : String | Test.java:286:46:286:50 | key : String | provenance |  |
-| Test.java:626:39:626:54 | (...)... : String | Test.java:626:22:626:55 | newTMEWithMapKey(...) : TiedMapEntry [<map.key>] : String | provenance | MaD:234 |
+| Test.java:626:39:626:54 | (...)... : String | Test.java:626:22:626:55 | newTMEWithMapKey(...) : TiedMapEntry [<map.key>] : String | provenance | MaD:236 |
 | Test.java:626:47:626:54 | source(...) : Object | Test.java:626:39:626:54 | (...)... : String | provenance |  |
-| Test.java:627:10:627:11 | in : TiedMapEntry [<map.key>] : String | Test.java:627:10:627:20 | getKey(...) : String | provenance | MaD:20 |
-| Test.java:627:10:627:11 | in : TiedMapEntry [<map.key>] : String | Test.java:627:10:627:20 | getKey(...) : String | provenance | MaD:568 |
+| Test.java:627:10:627:11 | in : TiedMapEntry [<map.key>] : String | Test.java:627:10:627:20 | getKey(...) : String | provenance | MaD:9 |
+| Test.java:627:10:627:11 | in : TiedMapEntry [<map.key>] : String | Test.java:627:10:627:20 | getKey(...) : String | provenance | MaD:643 |
 | Test.java:627:10:627:20 | getKey(...) : String | Test.java:628:9:628:11 | out | provenance |  |
 | Test.java:633:18:633:52 | newMAKVWithMapKey(...) : MyAbstractKeyValue [<map.key>] : String | Test.java:634:10:634:11 | in : MyAbstractKeyValue [<map.key>] : String | provenance |  |
 | Test.java:633:36:633:51 | (...)... : String | Test.java:282:53:282:57 | key : String | provenance |  |
-| Test.java:633:36:633:51 | (...)... : String | Test.java:633:18:633:52 | newMAKVWithMapKey(...) : MyAbstractKeyValue [<map.key>] : String | provenance | MaD:189 |
+| Test.java:633:36:633:51 | (...)... : String | Test.java:633:18:633:52 | newMAKVWithMapKey(...) : MyAbstractKeyValue [<map.key>] : String | provenance | MaD:191 |
 | Test.java:633:44:633:51 | source(...) : Object | Test.java:633:36:633:51 | (...)... : String | provenance |  |
-| Test.java:634:10:634:11 | in : MyAbstractKeyValue [<map.key>] : String | Test.java:634:10:634:20 | getKey(...) : String | provenance | MaD:568 |
+| Test.java:634:10:634:11 | in : MyAbstractKeyValue [<map.key>] : String | Test.java:634:10:634:20 | getKey(...) : String | provenance | MaD:643 |
 | Test.java:634:10:634:20 | getKey(...) : String | Test.java:635:9:635:11 | out | provenance |  |
 | Test.java:640:35:640:70 | newMAMEDWithMapKey(...) : MyAbstractMapEntryDecorator [<map.key>] : String | Test.java:641:10:641:11 | in : MyAbstractMapEntryDecorator [<map.key>] : String | provenance |  |
 | Test.java:640:54:640:69 | (...)... : String | Test.java:281:63:281:67 | key : String | provenance |  |
-| Test.java:640:54:640:69 | (...)... : String | Test.java:640:35:640:70 | newMAMEDWithMapKey(...) : MyAbstractMapEntryDecorator [<map.key>] : String | provenance | MaD:195 |
+| Test.java:640:54:640:69 | (...)... : String | Test.java:640:35:640:70 | newMAMEDWithMapKey(...) : MyAbstractMapEntryDecorator [<map.key>] : String | provenance | MaD:197 |
 | Test.java:640:62:640:69 | source(...) : Object | Test.java:640:54:640:69 | (...)... : String | provenance |  |
-| Test.java:641:10:641:11 | in : MyAbstractMapEntryDecorator [<map.key>] : String | Test.java:641:10:641:20 | getKey(...) : String | provenance | MaD:20 |
-| Test.java:641:10:641:11 | in : MyAbstractMapEntryDecorator [<map.key>] : String | Test.java:641:10:641:20 | getKey(...) : String | provenance | MaD:568 |
+| Test.java:641:10:641:11 | in : MyAbstractMapEntryDecorator [<map.key>] : String | Test.java:641:10:641:20 | getKey(...) : String | provenance | MaD:9 |
+| Test.java:641:10:641:11 | in : MyAbstractMapEntryDecorator [<map.key>] : String | Test.java:641:10:641:20 | getKey(...) : String | provenance | MaD:643 |
 | Test.java:641:10:641:20 | getKey(...) : String | Test.java:642:9:642:11 | out | provenance |  |
 | Test.java:647:26:647:60 | newMAKVWithMapKey(...) : MyAbstractKeyValue [<map.key>] : String | Test.java:648:10:648:11 | in : MyAbstractKeyValue [<map.key>] : String | provenance |  |
 | Test.java:647:44:647:59 | (...)... : String | Test.java:282:53:282:57 | key : String | provenance |  |
-| Test.java:647:44:647:59 | (...)... : String | Test.java:647:26:647:60 | newMAKVWithMapKey(...) : MyAbstractKeyValue [<map.key>] : String | provenance | MaD:189 |
+| Test.java:647:44:647:59 | (...)... : String | Test.java:647:26:647:60 | newMAKVWithMapKey(...) : MyAbstractKeyValue [<map.key>] : String | provenance | MaD:191 |
 | Test.java:647:52:647:59 | source(...) : Object | Test.java:647:44:647:59 | (...)... : String | provenance |  |
-| Test.java:648:10:648:11 | in : MyAbstractKeyValue [<map.key>] : String | Test.java:648:10:648:20 | getKey(...) : String | provenance | MaD:568 |
+| Test.java:648:10:648:11 | in : MyAbstractKeyValue [<map.key>] : String | Test.java:648:10:648:20 | getKey(...) : String | provenance | MaD:643 |
 | Test.java:648:10:648:20 | getKey(...) : String | Test.java:649:9:649:11 | out | provenance |  |
 | Test.java:654:22:654:57 | newTMEWithMapValue(...) : TiedMapEntry [<map.value>] : String | Test.java:655:10:655:11 | in : TiedMapEntry [<map.value>] : String | provenance |  |
 | Test.java:654:41:654:56 | (...)... : String | Test.java:305:48:305:54 | value : String | provenance |  |
-| Test.java:654:41:654:56 | (...)... : String | Test.java:654:22:654:57 | newTMEWithMapValue(...) : TiedMapEntry [<map.value>] : String | provenance | MaD:15 |
+| Test.java:654:41:654:56 | (...)... : String | Test.java:654:22:654:57 | newTMEWithMapValue(...) : TiedMapEntry [<map.value>] : String | provenance | MaD:20 |
 | Test.java:654:49:654:56 | source(...) : Object | Test.java:654:41:654:56 | (...)... : String | provenance |  |
-| Test.java:655:10:655:11 | in : TiedMapEntry [<map.value>] : String | Test.java:655:10:655:22 | getValue(...) : String | provenance | MaD:21 |
-| Test.java:655:10:655:11 | in : TiedMapEntry [<map.value>] : String | Test.java:655:10:655:22 | getValue(...) : String | provenance | MaD:569 |
+| Test.java:655:10:655:11 | in : TiedMapEntry [<map.value>] : String | Test.java:655:10:655:22 | getValue(...) : String | provenance | MaD:10 |
+| Test.java:655:10:655:11 | in : TiedMapEntry [<map.value>] : String | Test.java:655:10:655:22 | getValue(...) : String | provenance | MaD:644 |
 | Test.java:655:10:655:22 | getValue(...) : String | Test.java:656:9:656:11 | out | provenance |  |
 | Test.java:661:18:661:54 | newMAKVWithMapValue(...) : MyAbstractKeyValue [<map.value>] : String | Test.java:662:10:662:11 | in : MyAbstractKeyValue [<map.value>] : String | provenance |  |
 | Test.java:661:38:661:53 | (...)... : String | Test.java:299:55:299:61 | value : String | provenance |  |
-| Test.java:661:38:661:53 | (...)... : String | Test.java:661:18:661:54 | newMAKVWithMapValue(...) : MyAbstractKeyValue [<map.value>] : String | provenance | MaD:190 |
+| Test.java:661:38:661:53 | (...)... : String | Test.java:661:18:661:54 | newMAKVWithMapValue(...) : MyAbstractKeyValue [<map.value>] : String | provenance | MaD:192 |
 | Test.java:661:46:661:53 | source(...) : Object | Test.java:661:38:661:53 | (...)... : String | provenance |  |
-| Test.java:662:10:662:11 | in : MyAbstractKeyValue [<map.value>] : String | Test.java:662:10:662:22 | getValue(...) : String | provenance | MaD:569 |
+| Test.java:662:10:662:11 | in : MyAbstractKeyValue [<map.value>] : String | Test.java:662:10:662:22 | getValue(...) : String | provenance | MaD:644 |
 | Test.java:662:10:662:22 | getValue(...) : String | Test.java:663:9:663:11 | out | provenance |  |
 | Test.java:668:35:668:72 | newMAMEDWithMapValue(...) : MyAbstractMapEntryDecorator [<map.value>] : String | Test.java:669:10:669:11 | in : MyAbstractMapEntryDecorator [<map.value>] : String | provenance |  |
 | Test.java:668:56:668:71 | (...)... : String | Test.java:301:65:301:71 | value : String | provenance |  |
-| Test.java:668:56:668:71 | (...)... : String | Test.java:668:35:668:72 | newMAMEDWithMapValue(...) : MyAbstractMapEntryDecorator [<map.value>] : String | provenance | MaD:196 |
+| Test.java:668:56:668:71 | (...)... : String | Test.java:668:35:668:72 | newMAMEDWithMapValue(...) : MyAbstractMapEntryDecorator [<map.value>] : String | provenance | MaD:198 |
 | Test.java:668:64:668:71 | source(...) : Object | Test.java:668:56:668:71 | (...)... : String | provenance |  |
-| Test.java:669:10:669:11 | in : MyAbstractMapEntryDecorator [<map.value>] : String | Test.java:669:10:669:22 | getValue(...) : String | provenance | MaD:21 |
-| Test.java:669:10:669:11 | in : MyAbstractMapEntryDecorator [<map.value>] : String | Test.java:669:10:669:22 | getValue(...) : String | provenance | MaD:569 |
+| Test.java:669:10:669:11 | in : MyAbstractMapEntryDecorator [<map.value>] : String | Test.java:669:10:669:22 | getValue(...) : String | provenance | MaD:10 |
+| Test.java:669:10:669:11 | in : MyAbstractMapEntryDecorator [<map.value>] : String | Test.java:669:10:669:22 | getValue(...) : String | provenance | MaD:644 |
 | Test.java:669:10:669:22 | getValue(...) : String | Test.java:670:9:670:11 | out | provenance |  |
 | Test.java:675:26:675:62 | newMAKVWithMapValue(...) : MyAbstractKeyValue [<map.value>] : String | Test.java:676:10:676:11 | in : MyAbstractKeyValue [<map.value>] : String | provenance |  |
 | Test.java:675:46:675:61 | (...)... : String | Test.java:299:55:299:61 | value : String | provenance |  |
-| Test.java:675:46:675:61 | (...)... : String | Test.java:675:26:675:62 | newMAKVWithMapValue(...) : MyAbstractKeyValue [<map.value>] : String | provenance | MaD:190 |
+| Test.java:675:46:675:61 | (...)... : String | Test.java:675:26:675:62 | newMAKVWithMapValue(...) : MyAbstractKeyValue [<map.value>] : String | provenance | MaD:192 |
 | Test.java:675:54:675:61 | source(...) : Object | Test.java:675:46:675:61 | (...)... : String | provenance |  |
-| Test.java:676:10:676:11 | in : MyAbstractKeyValue [<map.value>] : String | Test.java:676:10:676:22 | getValue(...) : String | provenance | MaD:569 |
+| Test.java:676:10:676:11 | in : MyAbstractKeyValue [<map.value>] : String | Test.java:676:10:676:22 | getValue(...) : String | provenance | MaD:644 |
 | Test.java:676:10:676:22 | getValue(...) : String | Test.java:677:9:677:11 | out | provenance |  |
 | Test.java:682:13:682:25 | (...)... : Map | Test.java:683:31:683:32 | in : Map | provenance |  |
 | Test.java:682:18:682:25 | source(...) : Object | Test.java:682:13:682:25 | (...)... : Map | provenance |  |
 | Test.java:683:10:683:33 | emptyIfNull(...) : Map | Test.java:684:9:684:11 | out | provenance |  |
-| Test.java:683:31:683:32 | in : Map | Test.java:683:10:683:33 | emptyIfNull(...) : Map | provenance | MaD:601 |
+| Test.java:683:31:683:32 | in : Map | Test.java:683:10:683:33 | emptyIfNull(...) : Map | provenance | MaD:676 |
 | Test.java:689:13:689:50 | newTreeMapWithMapKey(...) : TreeMap [<map.key>] : String | Test.java:690:32:690:33 | in : TreeMap [<map.key>] : String | provenance |  |
 | Test.java:689:34:689:49 | (...)... : String | Test.java:285:47:285:51 | key : String | provenance |  |
-| Test.java:689:34:689:49 | (...)... : String | Test.java:689:13:689:50 | newTreeMapWithMapKey(...) : TreeMap [<map.key>] : String | provenance | MaD:14 |
+| Test.java:689:34:689:49 | (...)... : String | Test.java:689:13:689:50 | newTreeMapWithMapKey(...) : TreeMap [<map.key>] : String | provenance | MaD:19 |
 | Test.java:689:42:689:49 | source(...) : Object | Test.java:689:34:689:49 | (...)... : String | provenance |  |
 | Test.java:690:10:690:34 | fixedSizeMap(...) : IterableMap [<map.key>] : String | Test.java:691:19:691:21 | out : IterableMap [<map.key>] : String | provenance |  |
-| Test.java:690:32:690:33 | in : TreeMap [<map.key>] : String | Test.java:690:10:690:34 | fixedSizeMap(...) : IterableMap [<map.key>] : String | provenance | MaD:602 |
+| Test.java:690:32:690:33 | in : TreeMap [<map.key>] : String | Test.java:690:10:690:34 | fixedSizeMap(...) : IterableMap [<map.key>] : String | provenance | MaD:677 |
 | Test.java:691:19:691:21 | out : IterableMap [<map.key>] : String | Test.java:228:18:228:29 | map : IterableMap [<map.key>] : String | provenance |  |
-| Test.java:691:19:691:21 | out : IterableMap [<map.key>] : String | Test.java:691:9:691:22 | getMapKey(...) | provenance | MaD:10 |
+| Test.java:691:19:691:21 | out : IterableMap [<map.key>] : String | Test.java:691:9:691:22 | getMapKey(...) | provenance | MaD:18 |
 | Test.java:696:13:696:52 | newTreeMapWithMapValue(...) : TreeMap [<map.value>] : String | Test.java:697:32:697:33 | in : TreeMap [<map.value>] : String | provenance |  |
 | Test.java:696:36:696:51 | (...)... : String | Test.java:304:49:304:55 | value : String | provenance |  |
-| Test.java:696:36:696:51 | (...)... : String | Test.java:696:13:696:52 | newTreeMapWithMapValue(...) : TreeMap [<map.value>] : String | provenance | MaD:15 |
+| Test.java:696:36:696:51 | (...)... : String | Test.java:696:13:696:52 | newTreeMapWithMapValue(...) : TreeMap [<map.value>] : String | provenance | MaD:20 |
 | Test.java:696:44:696:51 | source(...) : Object | Test.java:696:36:696:51 | (...)... : String | provenance |  |
 | Test.java:697:10:697:34 | fixedSizeMap(...) : IterableMap [<map.value>] : String | Test.java:698:21:698:23 | out : IterableMap [<map.value>] : String | provenance |  |
-| Test.java:697:32:697:33 | in : TreeMap [<map.value>] : String | Test.java:697:10:697:34 | fixedSizeMap(...) : IterableMap [<map.value>] : String | provenance | MaD:603 |
+| Test.java:697:32:697:33 | in : TreeMap [<map.value>] : String | Test.java:697:10:697:34 | fixedSizeMap(...) : IterableMap [<map.value>] : String | provenance | MaD:678 |
 | Test.java:698:21:698:23 | out : IterableMap [<map.value>] : String | Test.java:232:20:232:31 | map : IterableMap [<map.value>] : String | provenance |  |
-| Test.java:698:21:698:23 | out : IterableMap [<map.value>] : String | Test.java:698:9:698:24 | getMapValue(...) | provenance | MaD:9 |
+| Test.java:698:21:698:23 | out : IterableMap [<map.value>] : String | Test.java:698:9:698:24 | getMapValue(...) | provenance | MaD:17 |
 | Test.java:703:19:703:56 | newTreeMapWithMapKey(...) : TreeMap [<map.key>] : String | Test.java:704:38:704:39 | in : TreeMap [<map.key>] : String | provenance |  |
 | Test.java:703:40:703:55 | (...)... : String | Test.java:285:47:285:51 | key : String | provenance |  |
-| Test.java:703:40:703:55 | (...)... : String | Test.java:703:19:703:56 | newTreeMapWithMapKey(...) : TreeMap [<map.key>] : String | provenance | MaD:14 |
+| Test.java:703:40:703:55 | (...)... : String | Test.java:703:19:703:56 | newTreeMapWithMapKey(...) : TreeMap [<map.key>] : String | provenance | MaD:19 |
 | Test.java:703:48:703:55 | source(...) : Object | Test.java:703:40:703:55 | (...)... : String | provenance |  |
 | Test.java:704:10:704:40 | fixedSizeSortedMap(...) : SortedMap [<map.key>] : String | Test.java:705:19:705:21 | out : SortedMap [<map.key>] : String | provenance |  |
-| Test.java:704:38:704:39 | in : TreeMap [<map.key>] : String | Test.java:704:10:704:40 | fixedSizeSortedMap(...) : SortedMap [<map.key>] : String | provenance | MaD:604 |
+| Test.java:704:38:704:39 | in : TreeMap [<map.key>] : String | Test.java:704:10:704:40 | fixedSizeSortedMap(...) : SortedMap [<map.key>] : String | provenance | MaD:679 |
 | Test.java:705:19:705:21 | out : SortedMap [<map.key>] : String | Test.java:228:18:228:29 | map : SortedMap [<map.key>] : String | provenance |  |
-| Test.java:705:19:705:21 | out : SortedMap [<map.key>] : String | Test.java:705:9:705:22 | getMapKey(...) | provenance | MaD:10 |
+| Test.java:705:19:705:21 | out : SortedMap [<map.key>] : String | Test.java:705:9:705:22 | getMapKey(...) | provenance | MaD:18 |
 | Test.java:710:19:710:58 | newTreeMapWithMapValue(...) : TreeMap [<map.value>] : String | Test.java:711:38:711:39 | in : TreeMap [<map.value>] : String | provenance |  |
 | Test.java:710:42:710:57 | (...)... : String | Test.java:304:49:304:55 | value : String | provenance |  |
-| Test.java:710:42:710:57 | (...)... : String | Test.java:710:19:710:58 | newTreeMapWithMapValue(...) : TreeMap [<map.value>] : String | provenance | MaD:15 |
+| Test.java:710:42:710:57 | (...)... : String | Test.java:710:19:710:58 | newTreeMapWithMapValue(...) : TreeMap [<map.value>] : String | provenance | MaD:20 |
 | Test.java:710:50:710:57 | source(...) : Object | Test.java:710:42:710:57 | (...)... : String | provenance |  |
 | Test.java:711:10:711:40 | fixedSizeSortedMap(...) : SortedMap [<map.value>] : String | Test.java:712:21:712:23 | out : SortedMap [<map.value>] : String | provenance |  |
-| Test.java:711:38:711:39 | in : TreeMap [<map.value>] : String | Test.java:711:10:711:40 | fixedSizeSortedMap(...) : SortedMap [<map.value>] : String | provenance | MaD:605 |
+| Test.java:711:38:711:39 | in : TreeMap [<map.value>] : String | Test.java:711:10:711:40 | fixedSizeSortedMap(...) : SortedMap [<map.value>] : String | provenance | MaD:680 |
 | Test.java:712:21:712:23 | out : SortedMap [<map.value>] : String | Test.java:232:20:232:31 | map : SortedMap [<map.value>] : String | provenance |  |
-| Test.java:712:21:712:23 | out : SortedMap [<map.value>] : String | Test.java:712:9:712:24 | getMapValue(...) | provenance | MaD:9 |
+| Test.java:712:21:712:23 | out : SortedMap [<map.value>] : String | Test.java:712:9:712:24 | getMapValue(...) | provenance | MaD:17 |
 | Test.java:717:13:717:25 | (...)... : Map | Test.java:718:38:718:39 | in : Map | provenance |  |
 | Test.java:717:18:717:25 | source(...) : Object | Test.java:717:13:717:25 | (...)... : Map | provenance |  |
 | Test.java:718:10:718:40 | getMap(...) : Map | Test.java:719:9:719:11 | out | provenance |  |
-| Test.java:718:38:718:39 | in : Map | Test.java:718:10:718:40 | getMap(...) : Map | provenance | MaD:607 |
+| Test.java:718:38:718:39 | in : Map | Test.java:718:10:718:40 | getMap(...) : Map | provenance | MaD:682 |
 | Test.java:724:13:724:49 | newTreeMapWithMapValue(...) : TreeMap [<map.value>] : Map | Test.java:725:26:725:27 | in : TreeMap [<map.value>] : Map | provenance |  |
 | Test.java:724:36:724:48 | (...)... : Map | Test.java:304:49:304:55 | value : Map | provenance |  |
-| Test.java:724:36:724:48 | (...)... : Map | Test.java:724:13:724:49 | newTreeMapWithMapValue(...) : TreeMap [<map.value>] : Map | provenance | MaD:15 |
+| Test.java:724:36:724:48 | (...)... : Map | Test.java:724:13:724:49 | newTreeMapWithMapValue(...) : TreeMap [<map.value>] : Map | provenance | MaD:20 |
 | Test.java:724:41:724:48 | source(...) : Object | Test.java:724:36:724:48 | (...)... : Map | provenance |  |
 | Test.java:725:10:725:40 | getMap(...) : Map | Test.java:726:9:726:11 | out | provenance |  |
-| Test.java:725:26:725:27 | in : TreeMap [<map.value>] : Map | Test.java:725:10:725:40 | getMap(...) : Map | provenance | MaD:606 |
+| Test.java:725:26:725:27 | in : TreeMap [<map.value>] : Map | Test.java:725:10:725:40 | getMap(...) : Map | provenance | MaD:681 |
 | Test.java:731:13:731:49 | newTreeMapWithMapValue(...) : TreeMap [<map.value>] : Map | Test.java:732:26:732:27 | in : TreeMap [<map.value>] : Map | provenance |  |
 | Test.java:731:36:731:48 | (...)... : Map | Test.java:304:49:304:55 | value : Map | provenance |  |
-| Test.java:731:36:731:48 | (...)... : Map | Test.java:731:13:731:49 | newTreeMapWithMapValue(...) : TreeMap [<map.value>] : Map | provenance | MaD:15 |
+| Test.java:731:36:731:48 | (...)... : Map | Test.java:731:13:731:49 | newTreeMapWithMapValue(...) : TreeMap [<map.value>] : Map | provenance | MaD:20 |
 | Test.java:731:41:731:48 | source(...) : Object | Test.java:731:36:731:48 | (...)... : Map | provenance |  |
 | Test.java:732:10:732:34 | getMap(...) : Map | Test.java:733:9:733:11 | out | provenance |  |
-| Test.java:732:26:732:27 | in : TreeMap [<map.value>] : Map | Test.java:732:10:732:34 | getMap(...) : Map | provenance | MaD:606 |
+| Test.java:732:26:732:27 | in : TreeMap [<map.value>] : Map | Test.java:732:10:732:34 | getMap(...) : Map | provenance | MaD:681 |
 | Test.java:738:16:738:23 | source(...) : Object | Test.java:739:41:739:42 | in : Object | provenance |  |
 | Test.java:739:10:739:43 | getObject(...) : Object | Test.java:740:9:740:11 | out | provenance |  |
-| Test.java:739:41:739:42 | in : Object | Test.java:739:10:739:43 | getObject(...) : Object | provenance | MaD:609 |
+| Test.java:739:41:739:42 | in : Object | Test.java:739:10:739:43 | getObject(...) : Object | provenance | MaD:684 |
 | Test.java:745:13:745:52 | newTreeMapWithMapValue(...) : TreeMap [<map.value>] : String | Test.java:746:29:746:30 | in : TreeMap [<map.value>] : String | provenance |  |
 | Test.java:745:36:745:51 | (...)... : String | Test.java:304:49:304:55 | value : String | provenance |  |
-| Test.java:745:36:745:51 | (...)... : String | Test.java:745:13:745:52 | newTreeMapWithMapValue(...) : TreeMap [<map.value>] : String | provenance | MaD:15 |
+| Test.java:745:36:745:51 | (...)... : String | Test.java:745:13:745:52 | newTreeMapWithMapValue(...) : TreeMap [<map.value>] : String | provenance | MaD:20 |
 | Test.java:745:44:745:51 | source(...) : Object | Test.java:745:36:745:51 | (...)... : String | provenance |  |
 | Test.java:746:10:746:43 | getObject(...) : String | Test.java:747:9:747:11 | out | provenance |  |
-| Test.java:746:29:746:30 | in : TreeMap [<map.value>] : String | Test.java:746:10:746:43 | getObject(...) : String | provenance | MaD:608 |
+| Test.java:746:29:746:30 | in : TreeMap [<map.value>] : String | Test.java:746:10:746:43 | getObject(...) : String | provenance | MaD:683 |
 | Test.java:752:13:752:52 | newTreeMapWithMapValue(...) : TreeMap [<map.value>] : String | Test.java:753:29:753:30 | in : TreeMap [<map.value>] : String | provenance |  |
 | Test.java:752:36:752:51 | (...)... : String | Test.java:304:49:304:55 | value : String | provenance |  |
-| Test.java:752:36:752:51 | (...)... : String | Test.java:752:13:752:52 | newTreeMapWithMapValue(...) : TreeMap [<map.value>] : String | provenance | MaD:15 |
+| Test.java:752:36:752:51 | (...)... : String | Test.java:752:13:752:52 | newTreeMapWithMapValue(...) : TreeMap [<map.value>] : String | provenance | MaD:20 |
 | Test.java:752:44:752:51 | source(...) : Object | Test.java:752:36:752:51 | (...)... : String | provenance |  |
 | Test.java:753:10:753:37 | getObject(...) : String | Test.java:754:9:754:11 | out | provenance |  |
-| Test.java:753:29:753:30 | in : TreeMap [<map.value>] : String | Test.java:753:10:753:37 | getObject(...) : String | provenance | MaD:608 |
+| Test.java:753:29:753:30 | in : TreeMap [<map.value>] : String | Test.java:753:10:753:37 | getObject(...) : String | provenance | MaD:683 |
 | Test.java:759:16:759:31 | (...)... : String | Test.java:760:41:760:42 | in : String | provenance |  |
 | Test.java:759:24:759:31 | source(...) : Object | Test.java:759:16:759:31 | (...)... : String | provenance |  |
 | Test.java:760:10:760:43 | getString(...) : String | Test.java:761:9:761:11 | out | provenance |  |
-| Test.java:760:41:760:42 | in : String | Test.java:760:10:760:43 | getString(...) : String | provenance | MaD:611 |
+| Test.java:760:41:760:42 | in : String | Test.java:760:10:760:43 | getString(...) : String | provenance | MaD:686 |
 | Test.java:766:13:766:52 | newTreeMapWithMapValue(...) : TreeMap [<map.value>] : String | Test.java:767:29:767:30 | in : TreeMap [<map.value>] : String | provenance |  |
 | Test.java:766:36:766:51 | (...)... : String | Test.java:304:49:304:55 | value : String | provenance |  |
-| Test.java:766:36:766:51 | (...)... : String | Test.java:766:13:766:52 | newTreeMapWithMapValue(...) : TreeMap [<map.value>] : String | provenance | MaD:15 |
+| Test.java:766:36:766:51 | (...)... : String | Test.java:766:13:766:52 | newTreeMapWithMapValue(...) : TreeMap [<map.value>] : String | provenance | MaD:20 |
 | Test.java:766:44:766:51 | source(...) : Object | Test.java:766:36:766:51 | (...)... : String | provenance |  |
 | Test.java:767:10:767:43 | getString(...) : String | Test.java:768:9:768:11 | out | provenance |  |
-| Test.java:767:29:767:30 | in : TreeMap [<map.value>] : String | Test.java:767:10:767:43 | getString(...) : String | provenance | MaD:610 |
+| Test.java:767:29:767:30 | in : TreeMap [<map.value>] : String | Test.java:767:10:767:43 | getString(...) : String | provenance | MaD:685 |
 | Test.java:773:13:773:52 | newTreeMapWithMapValue(...) : TreeMap [<map.value>] : String | Test.java:774:29:774:30 | in : TreeMap [<map.value>] : String | provenance |  |
 | Test.java:773:36:773:51 | (...)... : String | Test.java:304:49:304:55 | value : String | provenance |  |
-| Test.java:773:36:773:51 | (...)... : String | Test.java:773:13:773:52 | newTreeMapWithMapValue(...) : TreeMap [<map.value>] : String | provenance | MaD:15 |
+| Test.java:773:36:773:51 | (...)... : String | Test.java:773:13:773:52 | newTreeMapWithMapValue(...) : TreeMap [<map.value>] : String | provenance | MaD:20 |
 | Test.java:773:44:773:51 | source(...) : Object | Test.java:773:36:773:51 | (...)... : String | provenance |  |
 | Test.java:774:10:774:37 | getString(...) : String | Test.java:775:9:775:11 | out | provenance |  |
-| Test.java:774:29:774:30 | in : TreeMap [<map.value>] : String | Test.java:774:10:774:37 | getString(...) : String | provenance | MaD:610 |
+| Test.java:774:29:774:30 | in : TreeMap [<map.value>] : String | Test.java:774:10:774:37 | getString(...) : String | provenance | MaD:685 |
 | Test.java:780:13:780:50 | newTreeMapWithMapKey(...) : TreeMap [<map.key>] : String | Test.java:781:29:781:30 | in : TreeMap [<map.key>] : String | provenance |  |
 | Test.java:780:34:780:49 | (...)... : String | Test.java:285:47:285:51 | key : String | provenance |  |
-| Test.java:780:34:780:49 | (...)... : String | Test.java:780:13:780:50 | newTreeMapWithMapKey(...) : TreeMap [<map.key>] : String | provenance | MaD:14 |
+| Test.java:780:34:780:49 | (...)... : String | Test.java:780:13:780:50 | newTreeMapWithMapKey(...) : TreeMap [<map.key>] : String | provenance | MaD:19 |
 | Test.java:780:42:780:49 | source(...) : Object | Test.java:780:34:780:49 | (...)... : String | provenance |  |
 | Test.java:781:10:781:31 | invertMap(...) : Map [<map.value>] : String | Test.java:782:21:782:23 | out : Map [<map.value>] : String | provenance |  |
-| Test.java:781:29:781:30 | in : TreeMap [<map.key>] : String | Test.java:781:10:781:31 | invertMap(...) : Map [<map.value>] : String | provenance | MaD:612 |
+| Test.java:781:29:781:30 | in : TreeMap [<map.key>] : String | Test.java:781:10:781:31 | invertMap(...) : Map [<map.value>] : String | provenance | MaD:687 |
 | Test.java:782:21:782:23 | out : Map [<map.value>] : String | Test.java:232:20:232:31 | map : Map [<map.value>] : String | provenance |  |
-| Test.java:782:21:782:23 | out : Map [<map.value>] : String | Test.java:782:9:782:24 | getMapValue(...) | provenance | MaD:9 |
+| Test.java:782:21:782:23 | out : Map [<map.value>] : String | Test.java:782:9:782:24 | getMapValue(...) | provenance | MaD:17 |
 | Test.java:787:13:787:52 | newTreeMapWithMapValue(...) : TreeMap [<map.value>] : String | Test.java:788:29:788:30 | in : TreeMap [<map.value>] : String | provenance |  |
 | Test.java:787:36:787:51 | (...)... : String | Test.java:304:49:304:55 | value : String | provenance |  |
-| Test.java:787:36:787:51 | (...)... : String | Test.java:787:13:787:52 | newTreeMapWithMapValue(...) : TreeMap [<map.value>] : String | provenance | MaD:15 |
+| Test.java:787:36:787:51 | (...)... : String | Test.java:787:13:787:52 | newTreeMapWithMapValue(...) : TreeMap [<map.value>] : String | provenance | MaD:20 |
 | Test.java:787:44:787:51 | source(...) : Object | Test.java:787:36:787:51 | (...)... : String | provenance |  |
 | Test.java:788:10:788:31 | invertMap(...) : Map [<map.key>] : String | Test.java:789:19:789:21 | out : Map [<map.key>] : String | provenance |  |
-| Test.java:788:29:788:30 | in : TreeMap [<map.value>] : String | Test.java:788:10:788:31 | invertMap(...) : Map [<map.key>] : String | provenance | MaD:613 |
+| Test.java:788:29:788:30 | in : TreeMap [<map.value>] : String | Test.java:788:10:788:31 | invertMap(...) : Map [<map.key>] : String | provenance | MaD:688 |
 | Test.java:789:19:789:21 | out : Map [<map.key>] : String | Test.java:228:18:228:29 | map : Map [<map.key>] : String | provenance |  |
-| Test.java:789:19:789:21 | out : Map [<map.key>] : String | Test.java:789:9:789:22 | getMapKey(...) | provenance | MaD:10 |
+| Test.java:789:19:789:21 | out : Map [<map.key>] : String | Test.java:789:9:789:22 | getMapKey(...) | provenance | MaD:18 |
 | Test.java:794:13:794:50 | newTreeMapWithMapKey(...) : TreeMap [<map.key>] : String | Test.java:795:31:795:32 | in : TreeMap [<map.key>] : String | provenance |  |
 | Test.java:794:34:794:49 | (...)... : String | Test.java:285:47:285:51 | key : String | provenance |  |
-| Test.java:794:34:794:49 | (...)... : String | Test.java:794:13:794:50 | newTreeMapWithMapKey(...) : TreeMap [<map.key>] : String | provenance | MaD:14 |
+| Test.java:794:34:794:49 | (...)... : String | Test.java:794:13:794:50 | newTreeMapWithMapKey(...) : TreeMap [<map.key>] : String | provenance | MaD:19 |
 | Test.java:794:42:794:49 | source(...) : Object | Test.java:794:34:794:49 | (...)... : String | provenance |  |
 | Test.java:795:10:795:33 | iterableMap(...) : IterableMap [<map.key>] : String | Test.java:796:19:796:21 | out : IterableMap [<map.key>] : String | provenance |  |
-| Test.java:795:31:795:32 | in : TreeMap [<map.key>] : String | Test.java:795:10:795:33 | iterableMap(...) : IterableMap [<map.key>] : String | provenance | MaD:614 |
+| Test.java:795:31:795:32 | in : TreeMap [<map.key>] : String | Test.java:795:10:795:33 | iterableMap(...) : IterableMap [<map.key>] : String | provenance | MaD:689 |
 | Test.java:796:19:796:21 | out : IterableMap [<map.key>] : String | Test.java:228:18:228:29 | map : IterableMap [<map.key>] : String | provenance |  |
-| Test.java:796:19:796:21 | out : IterableMap [<map.key>] : String | Test.java:796:9:796:22 | getMapKey(...) | provenance | MaD:10 |
+| Test.java:796:19:796:21 | out : IterableMap [<map.key>] : String | Test.java:796:9:796:22 | getMapKey(...) | provenance | MaD:18 |
 | Test.java:801:13:801:52 | newTreeMapWithMapValue(...) : TreeMap [<map.value>] : String | Test.java:802:31:802:32 | in : TreeMap [<map.value>] : String | provenance |  |
 | Test.java:801:36:801:51 | (...)... : String | Test.java:304:49:304:55 | value : String | provenance |  |
-| Test.java:801:36:801:51 | (...)... : String | Test.java:801:13:801:52 | newTreeMapWithMapValue(...) : TreeMap [<map.value>] : String | provenance | MaD:15 |
+| Test.java:801:36:801:51 | (...)... : String | Test.java:801:13:801:52 | newTreeMapWithMapValue(...) : TreeMap [<map.value>] : String | provenance | MaD:20 |
 | Test.java:801:44:801:51 | source(...) : Object | Test.java:801:36:801:51 | (...)... : String | provenance |  |
 | Test.java:802:10:802:33 | iterableMap(...) : IterableMap [<map.value>] : String | Test.java:803:21:803:23 | out : IterableMap [<map.value>] : String | provenance |  |
-| Test.java:802:31:802:32 | in : TreeMap [<map.value>] : String | Test.java:802:10:802:33 | iterableMap(...) : IterableMap [<map.value>] : String | provenance | MaD:615 |
+| Test.java:802:31:802:32 | in : TreeMap [<map.value>] : String | Test.java:802:10:802:33 | iterableMap(...) : IterableMap [<map.value>] : String | provenance | MaD:690 |
 | Test.java:803:21:803:23 | out : IterableMap [<map.value>] : String | Test.java:232:20:232:31 | map : IterableMap [<map.value>] : String | provenance |  |
-| Test.java:803:21:803:23 | out : IterableMap [<map.value>] : String | Test.java:803:9:803:24 | getMapValue(...) | provenance | MaD:9 |
+| Test.java:803:21:803:23 | out : IterableMap [<map.value>] : String | Test.java:803:9:803:24 | getMapValue(...) | provenance | MaD:17 |
 | Test.java:808:19:808:56 | newTreeMapWithMapKey(...) : TreeMap [<map.key>] : String | Test.java:809:37:809:38 | in : TreeMap [<map.key>] : String | provenance |  |
 | Test.java:808:40:808:55 | (...)... : String | Test.java:285:47:285:51 | key : String | provenance |  |
-| Test.java:808:40:808:55 | (...)... : String | Test.java:808:19:808:56 | newTreeMapWithMapKey(...) : TreeMap [<map.key>] : String | provenance | MaD:14 |
+| Test.java:808:40:808:55 | (...)... : String | Test.java:808:19:808:56 | newTreeMapWithMapKey(...) : TreeMap [<map.key>] : String | provenance | MaD:19 |
 | Test.java:808:48:808:55 | source(...) : Object | Test.java:808:40:808:55 | (...)... : String | provenance |  |
 | Test.java:809:10:809:39 | iterableSortedMap(...) : IterableSortedMap [<map.key>] : String | Test.java:810:19:810:21 | out : IterableSortedMap [<map.key>] : String | provenance |  |
-| Test.java:809:37:809:38 | in : TreeMap [<map.key>] : String | Test.java:809:10:809:39 | iterableSortedMap(...) : IterableSortedMap [<map.key>] : String | provenance | MaD:616 |
+| Test.java:809:37:809:38 | in : TreeMap [<map.key>] : String | Test.java:809:10:809:39 | iterableSortedMap(...) : IterableSortedMap [<map.key>] : String | provenance | MaD:691 |
 | Test.java:810:19:810:21 | out : IterableSortedMap [<map.key>] : String | Test.java:228:18:228:29 | map : IterableSortedMap [<map.key>] : String | provenance |  |
-| Test.java:810:19:810:21 | out : IterableSortedMap [<map.key>] : String | Test.java:810:9:810:22 | getMapKey(...) | provenance | MaD:10 |
+| Test.java:810:19:810:21 | out : IterableSortedMap [<map.key>] : String | Test.java:810:9:810:22 | getMapKey(...) | provenance | MaD:18 |
 | Test.java:815:19:815:58 | newTreeMapWithMapValue(...) : TreeMap [<map.value>] : String | Test.java:816:37:816:38 | in : TreeMap [<map.value>] : String | provenance |  |
 | Test.java:815:42:815:57 | (...)... : String | Test.java:304:49:304:55 | value : String | provenance |  |
-| Test.java:815:42:815:57 | (...)... : String | Test.java:815:19:815:58 | newTreeMapWithMapValue(...) : TreeMap [<map.value>] : String | provenance | MaD:15 |
+| Test.java:815:42:815:57 | (...)... : String | Test.java:815:19:815:58 | newTreeMapWithMapValue(...) : TreeMap [<map.value>] : String | provenance | MaD:20 |
 | Test.java:815:50:815:57 | source(...) : Object | Test.java:815:42:815:57 | (...)... : String | provenance |  |
 | Test.java:816:10:816:39 | iterableSortedMap(...) : IterableSortedMap [<map.value>] : String | Test.java:817:21:817:23 | out : IterableSortedMap [<map.value>] : String | provenance |  |
-| Test.java:816:37:816:38 | in : TreeMap [<map.value>] : String | Test.java:816:10:816:39 | iterableSortedMap(...) : IterableSortedMap [<map.value>] : String | provenance | MaD:617 |
+| Test.java:816:37:816:38 | in : TreeMap [<map.value>] : String | Test.java:816:10:816:39 | iterableSortedMap(...) : IterableSortedMap [<map.value>] : String | provenance | MaD:692 |
 | Test.java:817:21:817:23 | out : IterableSortedMap [<map.value>] : String | Test.java:232:20:232:31 | map : IterableSortedMap [<map.value>] : String | provenance |  |
-| Test.java:817:21:817:23 | out : IterableSortedMap [<map.value>] : String | Test.java:817:9:817:24 | getMapValue(...) | provenance | MaD:9 |
+| Test.java:817:21:817:23 | out : IterableSortedMap [<map.value>] : String | Test.java:817:9:817:24 | getMapValue(...) | provenance | MaD:17 |
 | Test.java:822:13:822:50 | newTreeMapWithMapKey(...) : TreeMap [<map.key>] : String | Test.java:823:27:823:28 | in : TreeMap [<map.key>] : String | provenance |  |
 | Test.java:822:34:822:49 | (...)... : String | Test.java:285:47:285:51 | key : String | provenance |  |
-| Test.java:822:34:822:49 | (...)... : String | Test.java:822:13:822:50 | newTreeMapWithMapKey(...) : TreeMap [<map.key>] : String | provenance | MaD:14 |
+| Test.java:822:34:822:49 | (...)... : String | Test.java:822:13:822:50 | newTreeMapWithMapKey(...) : TreeMap [<map.key>] : String | provenance | MaD:19 |
 | Test.java:822:42:822:49 | source(...) : Object | Test.java:822:34:822:49 | (...)... : String | provenance |  |
 | Test.java:823:10:823:48 | lazyMap(...) : IterableMap [<map.key>] : String | Test.java:824:19:824:21 | out : IterableMap [<map.key>] : String | provenance |  |
-| Test.java:823:27:823:28 | in : TreeMap [<map.key>] : String | Test.java:823:10:823:48 | lazyMap(...) : IterableMap [<map.key>] : String | provenance | MaD:618 |
+| Test.java:823:27:823:28 | in : TreeMap [<map.key>] : String | Test.java:823:10:823:48 | lazyMap(...) : IterableMap [<map.key>] : String | provenance | MaD:693 |
 | Test.java:824:19:824:21 | out : IterableMap [<map.key>] : String | Test.java:228:18:228:29 | map : IterableMap [<map.key>] : String | provenance |  |
-| Test.java:824:19:824:21 | out : IterableMap [<map.key>] : String | Test.java:824:9:824:22 | getMapKey(...) | provenance | MaD:10 |
+| Test.java:824:19:824:21 | out : IterableMap [<map.key>] : String | Test.java:824:9:824:22 | getMapKey(...) | provenance | MaD:18 |
 | Test.java:829:13:829:50 | newTreeMapWithMapKey(...) : TreeMap [<map.key>] : String | Test.java:830:27:830:28 | in : TreeMap [<map.key>] : String | provenance |  |
 | Test.java:829:34:829:49 | (...)... : String | Test.java:285:47:285:51 | key : String | provenance |  |
-| Test.java:829:34:829:49 | (...)... : String | Test.java:829:13:829:50 | newTreeMapWithMapKey(...) : TreeMap [<map.key>] : String | provenance | MaD:14 |
+| Test.java:829:34:829:49 | (...)... : String | Test.java:829:13:829:50 | newTreeMapWithMapKey(...) : TreeMap [<map.key>] : String | provenance | MaD:19 |
 | Test.java:829:42:829:49 | source(...) : Object | Test.java:829:34:829:49 | (...)... : String | provenance |  |
 | Test.java:830:10:830:44 | lazyMap(...) : IterableMap [<map.key>] : String | Test.java:831:19:831:21 | out : IterableMap [<map.key>] : String | provenance |  |
-| Test.java:830:27:830:28 | in : TreeMap [<map.key>] : String | Test.java:830:10:830:44 | lazyMap(...) : IterableMap [<map.key>] : String | provenance | MaD:618 |
+| Test.java:830:27:830:28 | in : TreeMap [<map.key>] : String | Test.java:830:10:830:44 | lazyMap(...) : IterableMap [<map.key>] : String | provenance | MaD:693 |
 | Test.java:831:19:831:21 | out : IterableMap [<map.key>] : String | Test.java:228:18:228:29 | map : IterableMap [<map.key>] : String | provenance |  |
-| Test.java:831:19:831:21 | out : IterableMap [<map.key>] : String | Test.java:831:9:831:22 | getMapKey(...) | provenance | MaD:10 |
+| Test.java:831:19:831:21 | out : IterableMap [<map.key>] : String | Test.java:831:9:831:22 | getMapKey(...) | provenance | MaD:18 |
 | Test.java:836:13:836:52 | newTreeMapWithMapValue(...) : TreeMap [<map.value>] : String | Test.java:837:27:837:28 | in : TreeMap [<map.value>] : String | provenance |  |
 | Test.java:836:36:836:51 | (...)... : String | Test.java:304:49:304:55 | value : String | provenance |  |
-| Test.java:836:36:836:51 | (...)... : String | Test.java:836:13:836:52 | newTreeMapWithMapValue(...) : TreeMap [<map.value>] : String | provenance | MaD:15 |
+| Test.java:836:36:836:51 | (...)... : String | Test.java:836:13:836:52 | newTreeMapWithMapValue(...) : TreeMap [<map.value>] : String | provenance | MaD:20 |
 | Test.java:836:44:836:51 | source(...) : Object | Test.java:836:36:836:51 | (...)... : String | provenance |  |
 | Test.java:837:10:837:48 | lazyMap(...) : IterableMap [<map.value>] : String | Test.java:838:21:838:23 | out : IterableMap [<map.value>] : String | provenance |  |
-| Test.java:837:27:837:28 | in : TreeMap [<map.value>] : String | Test.java:837:10:837:48 | lazyMap(...) : IterableMap [<map.value>] : String | provenance | MaD:619 |
+| Test.java:837:27:837:28 | in : TreeMap [<map.value>] : String | Test.java:837:10:837:48 | lazyMap(...) : IterableMap [<map.value>] : String | provenance | MaD:694 |
 | Test.java:838:21:838:23 | out : IterableMap [<map.value>] : String | Test.java:232:20:232:31 | map : IterableMap [<map.value>] : String | provenance |  |
-| Test.java:838:21:838:23 | out : IterableMap [<map.value>] : String | Test.java:838:9:838:24 | getMapValue(...) | provenance | MaD:9 |
+| Test.java:838:21:838:23 | out : IterableMap [<map.value>] : String | Test.java:838:9:838:24 | getMapValue(...) | provenance | MaD:17 |
 | Test.java:843:13:843:52 | newTreeMapWithMapValue(...) : TreeMap [<map.value>] : String | Test.java:844:27:844:28 | in : TreeMap [<map.value>] : String | provenance |  |
 | Test.java:843:36:843:51 | (...)... : String | Test.java:304:49:304:55 | value : String | provenance |  |
-| Test.java:843:36:843:51 | (...)... : String | Test.java:843:13:843:52 | newTreeMapWithMapValue(...) : TreeMap [<map.value>] : String | provenance | MaD:15 |
+| Test.java:843:36:843:51 | (...)... : String | Test.java:843:13:843:52 | newTreeMapWithMapValue(...) : TreeMap [<map.value>] : String | provenance | MaD:20 |
 | Test.java:843:44:843:51 | source(...) : Object | Test.java:843:36:843:51 | (...)... : String | provenance |  |
 | Test.java:844:10:844:44 | lazyMap(...) : IterableMap [<map.value>] : String | Test.java:845:21:845:23 | out : IterableMap [<map.value>] : String | provenance |  |
-| Test.java:844:27:844:28 | in : TreeMap [<map.value>] : String | Test.java:844:10:844:44 | lazyMap(...) : IterableMap [<map.value>] : String | provenance | MaD:619 |
+| Test.java:844:27:844:28 | in : TreeMap [<map.value>] : String | Test.java:844:10:844:44 | lazyMap(...) : IterableMap [<map.value>] : String | provenance | MaD:694 |
 | Test.java:845:21:845:23 | out : IterableMap [<map.value>] : String | Test.java:232:20:232:31 | map : IterableMap [<map.value>] : String | provenance |  |
-| Test.java:845:21:845:23 | out : IterableMap [<map.value>] : String | Test.java:845:9:845:24 | getMapValue(...) | provenance | MaD:9 |
+| Test.java:845:21:845:23 | out : IterableMap [<map.value>] : String | Test.java:845:9:845:24 | getMapValue(...) | provenance | MaD:17 |
 | Test.java:850:19:850:56 | newTreeMapWithMapKey(...) : TreeMap [<map.key>] : String | Test.java:851:33:851:34 | in : TreeMap [<map.key>] : String | provenance |  |
 | Test.java:850:40:850:55 | (...)... : String | Test.java:285:47:285:51 | key : String | provenance |  |
-| Test.java:850:40:850:55 | (...)... : String | Test.java:850:19:850:56 | newTreeMapWithMapKey(...) : TreeMap [<map.key>] : String | provenance | MaD:14 |
+| Test.java:850:40:850:55 | (...)... : String | Test.java:850:19:850:56 | newTreeMapWithMapKey(...) : TreeMap [<map.key>] : String | provenance | MaD:19 |
 | Test.java:850:48:850:55 | source(...) : Object | Test.java:850:40:850:55 | (...)... : String | provenance |  |
 | Test.java:851:10:851:54 | lazySortedMap(...) : SortedMap [<map.key>] : String | Test.java:852:19:852:21 | out : SortedMap [<map.key>] : String | provenance |  |
-| Test.java:851:33:851:34 | in : TreeMap [<map.key>] : String | Test.java:851:10:851:54 | lazySortedMap(...) : SortedMap [<map.key>] : String | provenance | MaD:620 |
+| Test.java:851:33:851:34 | in : TreeMap [<map.key>] : String | Test.java:851:10:851:54 | lazySortedMap(...) : SortedMap [<map.key>] : String | provenance | MaD:695 |
 | Test.java:852:19:852:21 | out : SortedMap [<map.key>] : String | Test.java:228:18:228:29 | map : SortedMap [<map.key>] : String | provenance |  |
-| Test.java:852:19:852:21 | out : SortedMap [<map.key>] : String | Test.java:852:9:852:22 | getMapKey(...) | provenance | MaD:10 |
+| Test.java:852:19:852:21 | out : SortedMap [<map.key>] : String | Test.java:852:9:852:22 | getMapKey(...) | provenance | MaD:18 |
 | Test.java:857:19:857:56 | newTreeMapWithMapKey(...) : TreeMap [<map.key>] : String | Test.java:858:33:858:34 | in : TreeMap [<map.key>] : String | provenance |  |
 | Test.java:857:40:857:55 | (...)... : String | Test.java:285:47:285:51 | key : String | provenance |  |
-| Test.java:857:40:857:55 | (...)... : String | Test.java:857:19:857:56 | newTreeMapWithMapKey(...) : TreeMap [<map.key>] : String | provenance | MaD:14 |
+| Test.java:857:40:857:55 | (...)... : String | Test.java:857:19:857:56 | newTreeMapWithMapKey(...) : TreeMap [<map.key>] : String | provenance | MaD:19 |
 | Test.java:857:48:857:55 | source(...) : Object | Test.java:857:40:857:55 | (...)... : String | provenance |  |
 | Test.java:858:10:858:50 | lazySortedMap(...) : SortedMap [<map.key>] : String | Test.java:859:19:859:21 | out : SortedMap [<map.key>] : String | provenance |  |
-| Test.java:858:33:858:34 | in : TreeMap [<map.key>] : String | Test.java:858:10:858:50 | lazySortedMap(...) : SortedMap [<map.key>] : String | provenance | MaD:620 |
+| Test.java:858:33:858:34 | in : TreeMap [<map.key>] : String | Test.java:858:10:858:50 | lazySortedMap(...) : SortedMap [<map.key>] : String | provenance | MaD:695 |
 | Test.java:859:19:859:21 | out : SortedMap [<map.key>] : String | Test.java:228:18:228:29 | map : SortedMap [<map.key>] : String | provenance |  |
-| Test.java:859:19:859:21 | out : SortedMap [<map.key>] : String | Test.java:859:9:859:22 | getMapKey(...) | provenance | MaD:10 |
+| Test.java:859:19:859:21 | out : SortedMap [<map.key>] : String | Test.java:859:9:859:22 | getMapKey(...) | provenance | MaD:18 |
 | Test.java:864:19:864:58 | newTreeMapWithMapValue(...) : TreeMap [<map.value>] : String | Test.java:865:33:865:34 | in : TreeMap [<map.value>] : String | provenance |  |
 | Test.java:864:42:864:57 | (...)... : String | Test.java:304:49:304:55 | value : String | provenance |  |
-| Test.java:864:42:864:57 | (...)... : String | Test.java:864:19:864:58 | newTreeMapWithMapValue(...) : TreeMap [<map.value>] : String | provenance | MaD:15 |
+| Test.java:864:42:864:57 | (...)... : String | Test.java:864:19:864:58 | newTreeMapWithMapValue(...) : TreeMap [<map.value>] : String | provenance | MaD:20 |
 | Test.java:864:50:864:57 | source(...) : Object | Test.java:864:42:864:57 | (...)... : String | provenance |  |
 | Test.java:865:10:865:54 | lazySortedMap(...) : SortedMap [<map.value>] : String | Test.java:866:21:866:23 | out : SortedMap [<map.value>] : String | provenance |  |
-| Test.java:865:33:865:34 | in : TreeMap [<map.value>] : String | Test.java:865:10:865:54 | lazySortedMap(...) : SortedMap [<map.value>] : String | provenance | MaD:621 |
+| Test.java:865:33:865:34 | in : TreeMap [<map.value>] : String | Test.java:865:10:865:54 | lazySortedMap(...) : SortedMap [<map.value>] : String | provenance | MaD:696 |
 | Test.java:866:21:866:23 | out : SortedMap [<map.value>] : String | Test.java:232:20:232:31 | map : SortedMap [<map.value>] : String | provenance |  |
-| Test.java:866:21:866:23 | out : SortedMap [<map.value>] : String | Test.java:866:9:866:24 | getMapValue(...) | provenance | MaD:9 |
+| Test.java:866:21:866:23 | out : SortedMap [<map.value>] : String | Test.java:866:9:866:24 | getMapValue(...) | provenance | MaD:17 |
 | Test.java:871:19:871:58 | newTreeMapWithMapValue(...) : TreeMap [<map.value>] : String | Test.java:872:33:872:34 | in : TreeMap [<map.value>] : String | provenance |  |
 | Test.java:871:42:871:57 | (...)... : String | Test.java:304:49:304:55 | value : String | provenance |  |
-| Test.java:871:42:871:57 | (...)... : String | Test.java:871:19:871:58 | newTreeMapWithMapValue(...) : TreeMap [<map.value>] : String | provenance | MaD:15 |
+| Test.java:871:42:871:57 | (...)... : String | Test.java:871:19:871:58 | newTreeMapWithMapValue(...) : TreeMap [<map.value>] : String | provenance | MaD:20 |
 | Test.java:871:50:871:57 | source(...) : Object | Test.java:871:42:871:57 | (...)... : String | provenance |  |
 | Test.java:872:10:872:50 | lazySortedMap(...) : SortedMap [<map.value>] : String | Test.java:873:21:873:23 | out : SortedMap [<map.value>] : String | provenance |  |
-| Test.java:872:33:872:34 | in : TreeMap [<map.value>] : String | Test.java:872:10:872:50 | lazySortedMap(...) : SortedMap [<map.value>] : String | provenance | MaD:621 |
+| Test.java:872:33:872:34 | in : TreeMap [<map.value>] : String | Test.java:872:10:872:50 | lazySortedMap(...) : SortedMap [<map.value>] : String | provenance | MaD:696 |
 | Test.java:873:21:873:23 | out : SortedMap [<map.value>] : String | Test.java:232:20:232:31 | map : SortedMap [<map.value>] : String | provenance |  |
-| Test.java:873:21:873:23 | out : SortedMap [<map.value>] : String | Test.java:873:9:873:24 | getMapValue(...) | provenance | MaD:9 |
+| Test.java:873:21:873:23 | out : SortedMap [<map.value>] : String | Test.java:873:9:873:24 | getMapValue(...) | provenance | MaD:17 |
 | Test.java:878:13:878:50 | newTreeMapWithMapKey(...) : TreeMap [<map.key>] : String | Test.java:879:33:879:34 | in : TreeMap [<map.key>] : String | provenance |  |
 | Test.java:878:34:878:49 | (...)... : String | Test.java:285:47:285:51 | key : String | provenance |  |
-| Test.java:878:34:878:49 | (...)... : String | Test.java:878:13:878:50 | newTreeMapWithMapKey(...) : TreeMap [<map.key>] : String | provenance | MaD:14 |
+| Test.java:878:34:878:49 | (...)... : String | Test.java:878:13:878:50 | newTreeMapWithMapKey(...) : TreeMap [<map.key>] : String | provenance | MaD:19 |
 | Test.java:878:42:878:49 | source(...) : Object | Test.java:878:34:878:49 | (...)... : String | provenance |  |
 | Test.java:879:10:879:50 | multiValueMap(...) : MultiValueMap [<map.key>] : String | Test.java:880:19:880:21 | out : MultiValueMap [<map.key>] : String | provenance |  |
-| Test.java:879:33:879:34 | in : TreeMap [<map.key>] : String | Test.java:879:10:879:50 | multiValueMap(...) : MultiValueMap [<map.key>] : String | provenance | MaD:622 |
+| Test.java:879:33:879:34 | in : TreeMap [<map.key>] : String | Test.java:879:10:879:50 | multiValueMap(...) : MultiValueMap [<map.key>] : String | provenance | MaD:697 |
 | Test.java:880:19:880:21 | out : MultiValueMap [<map.key>] : String | Test.java:228:18:228:29 | map : MultiValueMap [<map.key>] : String | provenance |  |
-| Test.java:880:19:880:21 | out : MultiValueMap [<map.key>] : String | Test.java:880:9:880:22 | getMapKey(...) | provenance | MaD:10 |
+| Test.java:880:19:880:21 | out : MultiValueMap [<map.key>] : String | Test.java:880:9:880:22 | getMapKey(...) | provenance | MaD:18 |
 | Test.java:885:13:885:50 | newTreeMapWithMapKey(...) : TreeMap [<map.key>] : String | Test.java:886:33:886:34 | in : TreeMap [<map.key>] : String | provenance |  |
 | Test.java:885:34:885:49 | (...)... : String | Test.java:285:47:285:51 | key : String | provenance |  |
-| Test.java:885:34:885:49 | (...)... : String | Test.java:885:13:885:50 | newTreeMapWithMapKey(...) : TreeMap [<map.key>] : String | provenance | MaD:14 |
+| Test.java:885:34:885:49 | (...)... : String | Test.java:885:13:885:50 | newTreeMapWithMapKey(...) : TreeMap [<map.key>] : String | provenance | MaD:19 |
 | Test.java:885:42:885:49 | source(...) : Object | Test.java:885:34:885:49 | (...)... : String | provenance |  |
 | Test.java:886:10:886:48 | multiValueMap(...) : MultiValueMap [<map.key>] : String | Test.java:887:19:887:21 | out : MultiValueMap [<map.key>] : String | provenance |  |
-| Test.java:886:33:886:34 | in : TreeMap [<map.key>] : String | Test.java:886:10:886:48 | multiValueMap(...) : MultiValueMap [<map.key>] : String | provenance | MaD:622 |
+| Test.java:886:33:886:34 | in : TreeMap [<map.key>] : String | Test.java:886:10:886:48 | multiValueMap(...) : MultiValueMap [<map.key>] : String | provenance | MaD:697 |
 | Test.java:887:19:887:21 | out : MultiValueMap [<map.key>] : String | Test.java:228:18:228:29 | map : MultiValueMap [<map.key>] : String | provenance |  |
-| Test.java:887:19:887:21 | out : MultiValueMap [<map.key>] : String | Test.java:887:9:887:22 | getMapKey(...) | provenance | MaD:10 |
+| Test.java:887:19:887:21 | out : MultiValueMap [<map.key>] : String | Test.java:887:9:887:22 | getMapKey(...) | provenance | MaD:18 |
 | Test.java:892:13:892:50 | newTreeMapWithMapKey(...) : TreeMap [<map.key>] : String | Test.java:893:33:893:34 | in : TreeMap [<map.key>] : String | provenance |  |
 | Test.java:892:34:892:49 | (...)... : String | Test.java:285:47:285:51 | key : String | provenance |  |
-| Test.java:892:34:892:49 | (...)... : String | Test.java:892:13:892:50 | newTreeMapWithMapKey(...) : TreeMap [<map.key>] : String | provenance | MaD:14 |
+| Test.java:892:34:892:49 | (...)... : String | Test.java:892:13:892:50 | newTreeMapWithMapKey(...) : TreeMap [<map.key>] : String | provenance | MaD:19 |
 | Test.java:892:42:892:49 | source(...) : Object | Test.java:892:34:892:49 | (...)... : String | provenance |  |
 | Test.java:893:10:893:35 | multiValueMap(...) : MultiValueMap [<map.key>] : String | Test.java:894:19:894:21 | out : MultiValueMap [<map.key>] : String | provenance |  |
-| Test.java:893:33:893:34 | in : TreeMap [<map.key>] : String | Test.java:893:10:893:35 | multiValueMap(...) : MultiValueMap [<map.key>] : String | provenance | MaD:622 |
+| Test.java:893:33:893:34 | in : TreeMap [<map.key>] : String | Test.java:893:10:893:35 | multiValueMap(...) : MultiValueMap [<map.key>] : String | provenance | MaD:697 |
 | Test.java:894:19:894:21 | out : MultiValueMap [<map.key>] : String | Test.java:228:18:228:29 | map : MultiValueMap [<map.key>] : String | provenance |  |
-| Test.java:894:19:894:21 | out : MultiValueMap [<map.key>] : String | Test.java:894:9:894:22 | getMapKey(...) | provenance | MaD:10 |
+| Test.java:894:19:894:21 | out : MultiValueMap [<map.key>] : String | Test.java:894:9:894:22 | getMapKey(...) | provenance | MaD:18 |
 | Test.java:899:13:899:52 | newTreeMapWithMapValue(...) : TreeMap [<map.value>] : String | Test.java:900:33:900:34 | in : TreeMap [<map.value>] : String | provenance |  |
 | Test.java:899:36:899:51 | (...)... : String | Test.java:304:49:304:55 | value : String | provenance |  |
-| Test.java:899:36:899:51 | (...)... : String | Test.java:899:13:899:52 | newTreeMapWithMapValue(...) : TreeMap [<map.value>] : String | provenance | MaD:15 |
+| Test.java:899:36:899:51 | (...)... : String | Test.java:899:13:899:52 | newTreeMapWithMapValue(...) : TreeMap [<map.value>] : String | provenance | MaD:20 |
 | Test.java:899:44:899:51 | source(...) : Object | Test.java:899:36:899:51 | (...)... : String | provenance |  |
 | Test.java:900:10:900:50 | multiValueMap(...) : MultiValueMap [<map.value>] : String | Test.java:901:21:901:23 | out : MultiValueMap [<map.value>] : String | provenance |  |
-| Test.java:900:33:900:34 | in : TreeMap [<map.value>] : String | Test.java:900:10:900:50 | multiValueMap(...) : MultiValueMap [<map.value>] : String | provenance | MaD:623 |
+| Test.java:900:33:900:34 | in : TreeMap [<map.value>] : String | Test.java:900:10:900:50 | multiValueMap(...) : MultiValueMap [<map.value>] : String | provenance | MaD:698 |
 | Test.java:901:21:901:23 | out : MultiValueMap [<map.value>] : String | Test.java:232:20:232:31 | map : MultiValueMap [<map.value>] : String | provenance |  |
-| Test.java:901:21:901:23 | out : MultiValueMap [<map.value>] : String | Test.java:901:9:901:24 | getMapValue(...) | provenance | MaD:9 |
+| Test.java:901:21:901:23 | out : MultiValueMap [<map.value>] : String | Test.java:901:9:901:24 | getMapValue(...) | provenance | MaD:17 |
 | Test.java:906:13:906:52 | newTreeMapWithMapValue(...) : TreeMap [<map.value>] : String | Test.java:907:33:907:34 | in : TreeMap [<map.value>] : String | provenance |  |
 | Test.java:906:36:906:51 | (...)... : String | Test.java:304:49:304:55 | value : String | provenance |  |
-| Test.java:906:36:906:51 | (...)... : String | Test.java:906:13:906:52 | newTreeMapWithMapValue(...) : TreeMap [<map.value>] : String | provenance | MaD:15 |
+| Test.java:906:36:906:51 | (...)... : String | Test.java:906:13:906:52 | newTreeMapWithMapValue(...) : TreeMap [<map.value>] : String | provenance | MaD:20 |
 | Test.java:906:44:906:51 | source(...) : Object | Test.java:906:36:906:51 | (...)... : String | provenance |  |
 | Test.java:907:10:907:48 | multiValueMap(...) : MultiValueMap [<map.value>] : String | Test.java:908:21:908:23 | out : MultiValueMap [<map.value>] : String | provenance |  |
-| Test.java:907:33:907:34 | in : TreeMap [<map.value>] : String | Test.java:907:10:907:48 | multiValueMap(...) : MultiValueMap [<map.value>] : String | provenance | MaD:623 |
+| Test.java:907:33:907:34 | in : TreeMap [<map.value>] : String | Test.java:907:10:907:48 | multiValueMap(...) : MultiValueMap [<map.value>] : String | provenance | MaD:698 |
 | Test.java:908:21:908:23 | out : MultiValueMap [<map.value>] : String | Test.java:232:20:232:31 | map : MultiValueMap [<map.value>] : String | provenance |  |
-| Test.java:908:21:908:23 | out : MultiValueMap [<map.value>] : String | Test.java:908:9:908:24 | getMapValue(...) | provenance | MaD:9 |
+| Test.java:908:21:908:23 | out : MultiValueMap [<map.value>] : String | Test.java:908:9:908:24 | getMapValue(...) | provenance | MaD:17 |
 | Test.java:913:13:913:52 | newTreeMapWithMapValue(...) : TreeMap [<map.value>] : String | Test.java:914:33:914:34 | in : TreeMap [<map.value>] : String | provenance |  |
 | Test.java:913:36:913:51 | (...)... : String | Test.java:304:49:304:55 | value : String | provenance |  |
-| Test.java:913:36:913:51 | (...)... : String | Test.java:913:13:913:52 | newTreeMapWithMapValue(...) : TreeMap [<map.value>] : String | provenance | MaD:15 |
+| Test.java:913:36:913:51 | (...)... : String | Test.java:913:13:913:52 | newTreeMapWithMapValue(...) : TreeMap [<map.value>] : String | provenance | MaD:20 |
 | Test.java:913:44:913:51 | source(...) : Object | Test.java:913:36:913:51 | (...)... : String | provenance |  |
 | Test.java:914:10:914:35 | multiValueMap(...) : MultiValueMap [<map.value>] : String | Test.java:915:21:915:23 | out : MultiValueMap [<map.value>] : String | provenance |  |
-| Test.java:914:33:914:34 | in : TreeMap [<map.value>] : String | Test.java:914:10:914:35 | multiValueMap(...) : MultiValueMap [<map.value>] : String | provenance | MaD:623 |
+| Test.java:914:33:914:34 | in : TreeMap [<map.value>] : String | Test.java:914:10:914:35 | multiValueMap(...) : MultiValueMap [<map.value>] : String | provenance | MaD:698 |
 | Test.java:915:21:915:23 | out : MultiValueMap [<map.value>] : String | Test.java:232:20:232:31 | map : MultiValueMap [<map.value>] : String | provenance |  |
-| Test.java:915:21:915:23 | out : MultiValueMap [<map.value>] : String | Test.java:915:9:915:24 | getMapValue(...) | provenance | MaD:9 |
+| Test.java:915:21:915:23 | out : MultiValueMap [<map.value>] : String | Test.java:915:9:915:24 | getMapValue(...) | provenance | MaD:17 |
 | Test.java:920:13:920:50 | newTreeMapWithMapKey(...) : TreeMap [<map.key>] : String | Test.java:921:30:921:31 | in : TreeMap [<map.key>] : String | provenance |  |
 | Test.java:920:34:920:49 | (...)... : String | Test.java:285:47:285:51 | key : String | provenance |  |
-| Test.java:920:34:920:49 | (...)... : String | Test.java:920:13:920:50 | newTreeMapWithMapKey(...) : TreeMap [<map.key>] : String | provenance | MaD:14 |
+| Test.java:920:34:920:49 | (...)... : String | Test.java:920:13:920:50 | newTreeMapWithMapKey(...) : TreeMap [<map.key>] : String | provenance | MaD:19 |
 | Test.java:920:42:920:49 | source(...) : Object | Test.java:920:34:920:49 | (...)... : String | provenance |  |
 | Test.java:921:10:921:32 | orderedMap(...) : OrderedMap [<map.key>] : String | Test.java:922:19:922:21 | out : OrderedMap [<map.key>] : String | provenance |  |
-| Test.java:921:30:921:31 | in : TreeMap [<map.key>] : String | Test.java:921:10:921:32 | orderedMap(...) : OrderedMap [<map.key>] : String | provenance | MaD:624 |
+| Test.java:921:30:921:31 | in : TreeMap [<map.key>] : String | Test.java:921:10:921:32 | orderedMap(...) : OrderedMap [<map.key>] : String | provenance | MaD:699 |
 | Test.java:922:19:922:21 | out : OrderedMap [<map.key>] : String | Test.java:228:18:228:29 | map : OrderedMap [<map.key>] : String | provenance |  |
-| Test.java:922:19:922:21 | out : OrderedMap [<map.key>] : String | Test.java:922:9:922:22 | getMapKey(...) | provenance | MaD:10 |
+| Test.java:922:19:922:21 | out : OrderedMap [<map.key>] : String | Test.java:922:9:922:22 | getMapKey(...) | provenance | MaD:18 |
 | Test.java:927:13:927:52 | newTreeMapWithMapValue(...) : TreeMap [<map.value>] : String | Test.java:928:30:928:31 | in : TreeMap [<map.value>] : String | provenance |  |
 | Test.java:927:36:927:51 | (...)... : String | Test.java:304:49:304:55 | value : String | provenance |  |
-| Test.java:927:36:927:51 | (...)... : String | Test.java:927:13:927:52 | newTreeMapWithMapValue(...) : TreeMap [<map.value>] : String | provenance | MaD:15 |
+| Test.java:927:36:927:51 | (...)... : String | Test.java:927:13:927:52 | newTreeMapWithMapValue(...) : TreeMap [<map.value>] : String | provenance | MaD:20 |
 | Test.java:927:44:927:51 | source(...) : Object | Test.java:927:36:927:51 | (...)... : String | provenance |  |
 | Test.java:928:10:928:32 | orderedMap(...) : OrderedMap [<map.value>] : String | Test.java:929:21:929:23 | out : OrderedMap [<map.value>] : String | provenance |  |
-| Test.java:928:30:928:31 | in : TreeMap [<map.value>] : String | Test.java:928:10:928:32 | orderedMap(...) : OrderedMap [<map.value>] : String | provenance | MaD:625 |
+| Test.java:928:30:928:31 | in : TreeMap [<map.value>] : String | Test.java:928:10:928:32 | orderedMap(...) : OrderedMap [<map.value>] : String | provenance | MaD:700 |
 | Test.java:929:21:929:23 | out : OrderedMap [<map.value>] : String | Test.java:232:20:232:31 | map : OrderedMap [<map.value>] : String | provenance |  |
-| Test.java:929:21:929:23 | out : OrderedMap [<map.value>] : String | Test.java:929:9:929:24 | getMapValue(...) | provenance | MaD:9 |
+| Test.java:929:21:929:23 | out : OrderedMap [<map.value>] : String | Test.java:929:9:929:24 | getMapValue(...) | provenance | MaD:17 |
 | Test.java:934:18:934:55 | newVectorWithElement(...) : Vector [<element>] : String | Test.java:935:30:935:31 | in : Vector [<element>] : String | provenance |  |
 | Test.java:934:39:934:54 | (...)... : String | Test.java:269:37:269:45 | element : String | provenance |  |
-| Test.java:934:39:934:54 | (...)... : String | Test.java:934:18:934:55 | newVectorWithElement(...) : Vector [<element>] : String | provenance | MaD:2 |
+| Test.java:934:39:934:54 | (...)... : String | Test.java:934:18:934:55 | newVectorWithElement(...) : Vector [<element>] : String | provenance | MaD:4 |
 | Test.java:934:47:934:54 | source(...) : Object | Test.java:934:39:934:54 | (...)... : String | provenance |  |
 | Test.java:935:25:935:27 | out [post update] : Map [<map.value>] : String | Test.java:936:21:936:23 | out : Map [<map.value>] : String | provenance |  |
-| Test.java:935:30:935:31 | in : Vector [<element>] : String | Test.java:935:25:935:27 | out [post update] : Map [<map.value>] : String | provenance | MaD:626 |
+| Test.java:935:30:935:31 | in : Vector [<element>] : String | Test.java:935:25:935:27 | out [post update] : Map [<map.value>] : String | provenance | MaD:701 |
 | Test.java:936:21:936:23 | out : Map [<map.value>] : String | Test.java:232:20:232:31 | map : Map [<map.value>] : String | provenance |  |
-| Test.java:936:21:936:23 | out : Map [<map.value>] : String | Test.java:936:9:936:24 | getMapValue(...) | provenance | MaD:9 |
+| Test.java:936:21:936:23 | out : Map [<map.value>] : String | Test.java:936:9:936:24 | getMapValue(...) | provenance | MaD:17 |
 | Test.java:943:26:943:63 | newVectorWithElement(...) : Vector [<element>] : String | Test.java:944:30:944:31 | in : Vector [<element>] : String | provenance |  |
 | Test.java:943:47:943:62 | (...)... : String | Test.java:269:37:269:45 | element : String | provenance |  |
-| Test.java:943:47:943:62 | (...)... : String | Test.java:943:26:943:63 | newVectorWithElement(...) : Vector [<element>] : String | provenance | MaD:2 |
+| Test.java:943:47:943:62 | (...)... : String | Test.java:943:26:943:63 | newVectorWithElement(...) : Vector [<element>] : String | provenance | MaD:4 |
 | Test.java:943:55:943:62 | source(...) : Object | Test.java:943:47:943:62 | (...)... : String | provenance |  |
 | Test.java:944:25:944:27 | out [post update] : MultiMap [<map.value>, <element>] : String | Test.java:945:44:945:46 | out : MultiMap [<map.value>, <element>] : String | provenance |  |
-| Test.java:944:30:944:31 | in : Vector [<element>] : String | Test.java:944:25:944:27 | out [post update] : MultiMap [<map.value>, <element>] : String | provenance | MaD:627 |
+| Test.java:944:30:944:31 | in : Vector [<element>] : String | Test.java:944:25:944:27 | out [post update] : MultiMap [<map.value>, <element>] : String | provenance | MaD:702 |
 | Test.java:945:20:945:47 | (...)... : Collection [<element>] : String | Test.java:230:19:230:32 | it : Collection [<element>] : String | provenance |  |
-| Test.java:945:20:945:47 | (...)... : Collection [<element>] : String | Test.java:945:9:945:48 | getElement(...) | provenance | MaD:1 |
+| Test.java:945:20:945:47 | (...)... : Collection [<element>] : String | Test.java:945:9:945:48 | getElement(...) | provenance | MaD:3 |
 | Test.java:945:32:945:47 | getMapValue(...) : Object [<element>] : String | Test.java:945:20:945:47 | (...)... : Collection [<element>] : String | provenance |  |
 | Test.java:945:44:945:46 | out : MultiMap [<map.value>, <element>] : String | Test.java:232:20:232:31 | map : MultiMap [<map.value>, <element>] : String | provenance |  |
-| Test.java:945:44:945:46 | out : MultiMap [<map.value>, <element>] : String | Test.java:945:32:945:47 | getMapValue(...) : Object [<element>] : String | provenance | MaD:9 |
+| Test.java:945:44:945:46 | out : MultiMap [<map.value>, <element>] : String | Test.java:945:32:945:47 | getMapValue(...) : Object [<element>] : String | provenance | MaD:17 |
 | Test.java:950:13:950:50 | newTreeMapWithMapKey(...) : TreeMap [<map.key>] : String | Test.java:951:33:951:34 | in : TreeMap [<map.key>] : String | provenance |  |
 | Test.java:950:34:950:49 | (...)... : String | Test.java:285:47:285:51 | key : String | provenance |  |
-| Test.java:950:34:950:49 | (...)... : String | Test.java:950:13:950:50 | newTreeMapWithMapKey(...) : TreeMap [<map.key>] : String | provenance | MaD:14 |
+| Test.java:950:34:950:49 | (...)... : String | Test.java:950:13:950:50 | newTreeMapWithMapKey(...) : TreeMap [<map.key>] : String | provenance | MaD:19 |
 | Test.java:950:42:950:49 | source(...) : Object | Test.java:950:34:950:49 | (...)... : String | provenance |  |
 | Test.java:951:10:951:47 | predicatedMap(...) : IterableMap [<map.key>] : String | Test.java:952:19:952:21 | out : IterableMap [<map.key>] : String | provenance |  |
-| Test.java:951:33:951:34 | in : TreeMap [<map.key>] : String | Test.java:951:10:951:47 | predicatedMap(...) : IterableMap [<map.key>] : String | provenance | MaD:628 |
+| Test.java:951:33:951:34 | in : TreeMap [<map.key>] : String | Test.java:951:10:951:47 | predicatedMap(...) : IterableMap [<map.key>] : String | provenance | MaD:703 |
 | Test.java:952:19:952:21 | out : IterableMap [<map.key>] : String | Test.java:228:18:228:29 | map : IterableMap [<map.key>] : String | provenance |  |
-| Test.java:952:19:952:21 | out : IterableMap [<map.key>] : String | Test.java:952:9:952:22 | getMapKey(...) | provenance | MaD:10 |
+| Test.java:952:19:952:21 | out : IterableMap [<map.key>] : String | Test.java:952:9:952:22 | getMapKey(...) | provenance | MaD:18 |
 | Test.java:957:13:957:52 | newTreeMapWithMapValue(...) : TreeMap [<map.value>] : String | Test.java:958:33:958:34 | in : TreeMap [<map.value>] : String | provenance |  |
 | Test.java:957:36:957:51 | (...)... : String | Test.java:304:49:304:55 | value : String | provenance |  |
-| Test.java:957:36:957:51 | (...)... : String | Test.java:957:13:957:52 | newTreeMapWithMapValue(...) : TreeMap [<map.value>] : String | provenance | MaD:15 |
+| Test.java:957:36:957:51 | (...)... : String | Test.java:957:13:957:52 | newTreeMapWithMapValue(...) : TreeMap [<map.value>] : String | provenance | MaD:20 |
 | Test.java:957:44:957:51 | source(...) : Object | Test.java:957:36:957:51 | (...)... : String | provenance |  |
 | Test.java:958:10:958:47 | predicatedMap(...) : IterableMap [<map.value>] : String | Test.java:959:21:959:23 | out : IterableMap [<map.value>] : String | provenance |  |
-| Test.java:958:33:958:34 | in : TreeMap [<map.value>] : String | Test.java:958:10:958:47 | predicatedMap(...) : IterableMap [<map.value>] : String | provenance | MaD:629 |
+| Test.java:958:33:958:34 | in : TreeMap [<map.value>] : String | Test.java:958:10:958:47 | predicatedMap(...) : IterableMap [<map.value>] : String | provenance | MaD:704 |
 | Test.java:959:21:959:23 | out : IterableMap [<map.value>] : String | Test.java:232:20:232:31 | map : IterableMap [<map.value>] : String | provenance |  |
-| Test.java:959:21:959:23 | out : IterableMap [<map.value>] : String | Test.java:959:9:959:24 | getMapValue(...) | provenance | MaD:9 |
+| Test.java:959:21:959:23 | out : IterableMap [<map.value>] : String | Test.java:959:9:959:24 | getMapValue(...) | provenance | MaD:17 |
 | Test.java:964:19:964:56 | newTreeMapWithMapKey(...) : TreeMap [<map.key>] : String | Test.java:965:39:965:40 | in : TreeMap [<map.key>] : String | provenance |  |
 | Test.java:964:40:964:55 | (...)... : String | Test.java:285:47:285:51 | key : String | provenance |  |
-| Test.java:964:40:964:55 | (...)... : String | Test.java:964:19:964:56 | newTreeMapWithMapKey(...) : TreeMap [<map.key>] : String | provenance | MaD:14 |
+| Test.java:964:40:964:55 | (...)... : String | Test.java:964:19:964:56 | newTreeMapWithMapKey(...) : TreeMap [<map.key>] : String | provenance | MaD:19 |
 | Test.java:964:48:964:55 | source(...) : Object | Test.java:964:40:964:55 | (...)... : String | provenance |  |
 | Test.java:965:10:965:53 | predicatedSortedMap(...) : SortedMap [<map.key>] : String | Test.java:966:19:966:21 | out : SortedMap [<map.key>] : String | provenance |  |
-| Test.java:965:39:965:40 | in : TreeMap [<map.key>] : String | Test.java:965:10:965:53 | predicatedSortedMap(...) : SortedMap [<map.key>] : String | provenance | MaD:630 |
+| Test.java:965:39:965:40 | in : TreeMap [<map.key>] : String | Test.java:965:10:965:53 | predicatedSortedMap(...) : SortedMap [<map.key>] : String | provenance | MaD:705 |
 | Test.java:966:19:966:21 | out : SortedMap [<map.key>] : String | Test.java:228:18:228:29 | map : SortedMap [<map.key>] : String | provenance |  |
-| Test.java:966:19:966:21 | out : SortedMap [<map.key>] : String | Test.java:966:9:966:22 | getMapKey(...) | provenance | MaD:10 |
+| Test.java:966:19:966:21 | out : SortedMap [<map.key>] : String | Test.java:966:9:966:22 | getMapKey(...) | provenance | MaD:18 |
 | Test.java:971:19:971:58 | newTreeMapWithMapValue(...) : TreeMap [<map.value>] : String | Test.java:972:39:972:40 | in : TreeMap [<map.value>] : String | provenance |  |
 | Test.java:971:42:971:57 | (...)... : String | Test.java:304:49:304:55 | value : String | provenance |  |
-| Test.java:971:42:971:57 | (...)... : String | Test.java:971:19:971:58 | newTreeMapWithMapValue(...) : TreeMap [<map.value>] : String | provenance | MaD:15 |
+| Test.java:971:42:971:57 | (...)... : String | Test.java:971:19:971:58 | newTreeMapWithMapValue(...) : TreeMap [<map.value>] : String | provenance | MaD:20 |
 | Test.java:971:50:971:57 | source(...) : Object | Test.java:971:42:971:57 | (...)... : String | provenance |  |
 | Test.java:972:10:972:53 | predicatedSortedMap(...) : SortedMap [<map.value>] : String | Test.java:973:21:973:23 | out : SortedMap [<map.value>] : String | provenance |  |
-| Test.java:972:39:972:40 | in : TreeMap [<map.value>] : String | Test.java:972:10:972:53 | predicatedSortedMap(...) : SortedMap [<map.value>] : String | provenance | MaD:631 |
+| Test.java:972:39:972:40 | in : TreeMap [<map.value>] : String | Test.java:972:10:972:53 | predicatedSortedMap(...) : SortedMap [<map.value>] : String | provenance | MaD:706 |
 | Test.java:973:21:973:23 | out : SortedMap [<map.value>] : String | Test.java:232:20:232:31 | map : SortedMap [<map.value>] : String | provenance |  |
-| Test.java:973:21:973:23 | out : SortedMap [<map.value>] : String | Test.java:973:9:973:24 | getMapValue(...) | provenance | MaD:9 |
+| Test.java:973:21:973:23 | out : SortedMap [<map.value>] : String | Test.java:973:9:973:24 | getMapValue(...) | provenance | MaD:17 |
 | Test.java:978:18:978:54 | newWithArrayElement(...) : Object[] [[]] : String | Test.java:979:25:979:26 | in : Object[] [[]] : String | provenance |  |
 | Test.java:978:38:978:53 | (...)... : String | Test.java:251:31:251:44 | element : String | provenance |  |
 | Test.java:978:38:978:53 | (...)... : String | Test.java:978:18:978:54 | newWithArrayElement(...) : Object[] [[]] : String | provenance |  |
 | Test.java:978:46:978:53 | source(...) : Object | Test.java:978:38:978:53 | (...)... : String | provenance |  |
 | Test.java:979:20:979:22 | out [post update] : Map [<map.key>] : Object | Test.java:980:19:980:21 | out : Map [<map.key>] : Object | provenance |  |
 | Test.java:979:20:979:22 | out [post update] : Map [<map.key>] : String | Test.java:980:19:980:21 | out : Map [<map.key>] : String | provenance |  |
-| Test.java:979:25:979:26 | in : Object[] [[]] : String | Test.java:979:20:979:22 | out [post update] : Map [<map.key>] : Object | provenance | MaD:636 |
-| Test.java:979:25:979:26 | in : Object[] [[]] : String | Test.java:979:20:979:22 | out [post update] : Map [<map.key>] : Object | provenance | MaD:640 |
-| Test.java:979:25:979:26 | in : Object[] [[]] : String | Test.java:979:20:979:22 | out [post update] : Map [<map.key>] : String | provenance | MaD:632 |
+| Test.java:979:25:979:26 | in : Object[] [[]] : String | Test.java:979:20:979:22 | out [post update] : Map [<map.key>] : Object | provenance | MaD:707 |
+| Test.java:979:25:979:26 | in : Object[] [[]] : String | Test.java:979:20:979:22 | out [post update] : Map [<map.key>] : Object | provenance | MaD:711 |
+| Test.java:979:25:979:26 | in : Object[] [[]] : String | Test.java:979:20:979:22 | out [post update] : Map [<map.key>] : String | provenance | MaD:715 |
 | Test.java:980:19:980:21 | out : Map [<map.key>] : Object | Test.java:228:18:228:29 | map : Map [<map.key>] : Object | provenance |  |
-| Test.java:980:19:980:21 | out : Map [<map.key>] : Object | Test.java:980:9:980:22 | getMapKey(...) | provenance | MaD:10 |
+| Test.java:980:19:980:21 | out : Map [<map.key>] : Object | Test.java:980:9:980:22 | getMapKey(...) | provenance | MaD:18 |
 | Test.java:980:19:980:21 | out : Map [<map.key>] : String | Test.java:228:18:228:29 | map : Map [<map.key>] : String | provenance |  |
-| Test.java:980:19:980:21 | out : Map [<map.key>] : String | Test.java:980:9:980:22 | getMapKey(...) | provenance | MaD:10 |
+| Test.java:980:19:980:21 | out : Map [<map.key>] : String | Test.java:980:9:980:22 | getMapKey(...) | provenance | MaD:18 |
 | Test.java:985:18:985:54 | newWithArrayElement(...) : Object[] [[]] : String | Test.java:986:32:986:33 | in : Object[] [[]] : String | provenance |  |
 | Test.java:985:38:985:53 | (...)... : String | Test.java:251:31:251:44 | element : String | provenance |  |
 | Test.java:985:38:985:53 | (...)... : String | Test.java:985:18:985:54 | newWithArrayElement(...) : Object[] [[]] : String | provenance |  |
 | Test.java:985:46:985:53 | source(...) : Object | Test.java:985:38:985:53 | (...)... : String | provenance |  |
 | Test.java:986:10:986:34 | putAll(...) : Map [<map.key>] : Object | Test.java:987:19:987:21 | out : Map [<map.key>] : Object | provenance |  |
 | Test.java:986:10:986:34 | putAll(...) : Map [<map.key>] : String | Test.java:987:19:987:21 | out : Map [<map.key>] : String | provenance |  |
-| Test.java:986:32:986:33 | in : Object[] [[]] : String | Test.java:986:10:986:34 | putAll(...) : Map [<map.key>] : Object | provenance | MaD:638 |
-| Test.java:986:32:986:33 | in : Object[] [[]] : String | Test.java:986:10:986:34 | putAll(...) : Map [<map.key>] : Object | provenance | MaD:641 |
-| Test.java:986:32:986:33 | in : Object[] [[]] : String | Test.java:986:10:986:34 | putAll(...) : Map [<map.key>] : String | provenance | MaD:634 |
+| Test.java:986:32:986:33 | in : Object[] [[]] : String | Test.java:986:10:986:34 | putAll(...) : Map [<map.key>] : Object | provenance | MaD:709 |
+| Test.java:986:32:986:33 | in : Object[] [[]] : String | Test.java:986:10:986:34 | putAll(...) : Map [<map.key>] : Object | provenance | MaD:712 |
+| Test.java:986:32:986:33 | in : Object[] [[]] : String | Test.java:986:10:986:34 | putAll(...) : Map [<map.key>] : String | provenance | MaD:717 |
 | Test.java:987:19:987:21 | out : Map [<map.key>] : Object | Test.java:228:18:228:29 | map : Map [<map.key>] : Object | provenance |  |
-| Test.java:987:19:987:21 | out : Map [<map.key>] : Object | Test.java:987:9:987:22 | getMapKey(...) | provenance | MaD:10 |
+| Test.java:987:19:987:21 | out : Map [<map.key>] : Object | Test.java:987:9:987:22 | getMapKey(...) | provenance | MaD:18 |
 | Test.java:987:19:987:21 | out : Map [<map.key>] : String | Test.java:228:18:228:29 | map : Map [<map.key>] : String | provenance |  |
-| Test.java:987:19:987:21 | out : Map [<map.key>] : String | Test.java:987:9:987:22 | getMapKey(...) | provenance | MaD:10 |
+| Test.java:987:19:987:21 | out : Map [<map.key>] : String | Test.java:987:9:987:22 | getMapKey(...) | provenance | MaD:18 |
 | Test.java:992:18:992:54 | newWithArrayElement(...) : Object[] [[]] : String | Test.java:993:25:993:26 | in : Object[] [[]] : String | provenance |  |
 | Test.java:992:38:992:53 | (...)... : String | Test.java:251:31:251:44 | element : String | provenance |  |
 | Test.java:992:38:992:53 | (...)... : String | Test.java:992:18:992:54 | newWithArrayElement(...) : Object[] [[]] : String | provenance |  |
 | Test.java:992:46:992:53 | source(...) : Object | Test.java:992:38:992:53 | (...)... : String | provenance |  |
 | Test.java:993:20:993:22 | out [post update] : Map [<map.value>] : Object | Test.java:994:21:994:23 | out : Map [<map.value>] : Object | provenance |  |
 | Test.java:993:20:993:22 | out [post update] : Map [<map.value>] : String | Test.java:994:21:994:23 | out : Map [<map.value>] : String | provenance |  |
-| Test.java:993:25:993:26 | in : Object[] [[]] : String | Test.java:993:20:993:22 | out [post update] : Map [<map.value>] : Object | provenance | MaD:637 |
-| Test.java:993:25:993:26 | in : Object[] [[]] : String | Test.java:993:20:993:22 | out [post update] : Map [<map.value>] : Object | provenance | MaD:642 |
-| Test.java:993:25:993:26 | in : Object[] [[]] : String | Test.java:993:20:993:22 | out [post update] : Map [<map.value>] : String | provenance | MaD:633 |
+| Test.java:993:25:993:26 | in : Object[] [[]] : String | Test.java:993:20:993:22 | out [post update] : Map [<map.value>] : Object | provenance | MaD:708 |
+| Test.java:993:25:993:26 | in : Object[] [[]] : String | Test.java:993:20:993:22 | out [post update] : Map [<map.value>] : Object | provenance | MaD:713 |
+| Test.java:993:25:993:26 | in : Object[] [[]] : String | Test.java:993:20:993:22 | out [post update] : Map [<map.value>] : String | provenance | MaD:716 |
 | Test.java:994:21:994:23 | out : Map [<map.value>] : Object | Test.java:232:20:232:31 | map : Map [<map.value>] : Object | provenance |  |
-| Test.java:994:21:994:23 | out : Map [<map.value>] : Object | Test.java:994:9:994:24 | getMapValue(...) | provenance | MaD:9 |
+| Test.java:994:21:994:23 | out : Map [<map.value>] : Object | Test.java:994:9:994:24 | getMapValue(...) | provenance | MaD:17 |
 | Test.java:994:21:994:23 | out : Map [<map.value>] : String | Test.java:232:20:232:31 | map : Map [<map.value>] : String | provenance |  |
-| Test.java:994:21:994:23 | out : Map [<map.value>] : String | Test.java:994:9:994:24 | getMapValue(...) | provenance | MaD:9 |
+| Test.java:994:21:994:23 | out : Map [<map.value>] : String | Test.java:994:9:994:24 | getMapValue(...) | provenance | MaD:17 |
 | Test.java:999:18:999:54 | newWithArrayElement(...) : Object[] [[]] : String | Test.java:1000:32:1000:33 | in : Object[] [[]] : String | provenance |  |
 | Test.java:999:38:999:53 | (...)... : String | Test.java:251:31:251:44 | element : String | provenance |  |
 | Test.java:999:38:999:53 | (...)... : String | Test.java:999:18:999:54 | newWithArrayElement(...) : Object[] [[]] : String | provenance |  |
 | Test.java:999:46:999:53 | source(...) : Object | Test.java:999:38:999:53 | (...)... : String | provenance |  |
 | Test.java:1000:10:1000:34 | putAll(...) : Map [<map.value>] : Object | Test.java:1001:21:1001:23 | out : Map [<map.value>] : Object | provenance |  |
 | Test.java:1000:10:1000:34 | putAll(...) : Map [<map.value>] : String | Test.java:1001:21:1001:23 | out : Map [<map.value>] : String | provenance |  |
-| Test.java:1000:32:1000:33 | in : Object[] [[]] : String | Test.java:1000:10:1000:34 | putAll(...) : Map [<map.value>] : Object | provenance | MaD:639 |
-| Test.java:1000:32:1000:33 | in : Object[] [[]] : String | Test.java:1000:10:1000:34 | putAll(...) : Map [<map.value>] : Object | provenance | MaD:643 |
-| Test.java:1000:32:1000:33 | in : Object[] [[]] : String | Test.java:1000:10:1000:34 | putAll(...) : Map [<map.value>] : String | provenance | MaD:635 |
+| Test.java:1000:32:1000:33 | in : Object[] [[]] : String | Test.java:1000:10:1000:34 | putAll(...) : Map [<map.value>] : Object | provenance | MaD:710 |
+| Test.java:1000:32:1000:33 | in : Object[] [[]] : String | Test.java:1000:10:1000:34 | putAll(...) : Map [<map.value>] : Object | provenance | MaD:714 |
+| Test.java:1000:32:1000:33 | in : Object[] [[]] : String | Test.java:1000:10:1000:34 | putAll(...) : Map [<map.value>] : String | provenance | MaD:718 |
 | Test.java:1001:21:1001:23 | out : Map [<map.value>] : Object | Test.java:232:20:232:31 | map : Map [<map.value>] : Object | provenance |  |
-| Test.java:1001:21:1001:23 | out : Map [<map.value>] : Object | Test.java:1001:9:1001:24 | getMapValue(...) | provenance | MaD:9 |
+| Test.java:1001:21:1001:23 | out : Map [<map.value>] : Object | Test.java:1001:9:1001:24 | getMapValue(...) | provenance | MaD:17 |
 | Test.java:1001:21:1001:23 | out : Map [<map.value>] : String | Test.java:232:20:232:31 | map : Map [<map.value>] : String | provenance |  |
-| Test.java:1001:21:1001:23 | out : Map [<map.value>] : String | Test.java:1001:9:1001:24 | getMapValue(...) | provenance | MaD:9 |
+| Test.java:1001:21:1001:23 | out : Map [<map.value>] : String | Test.java:1001:9:1001:24 | getMapValue(...) | provenance | MaD:17 |
 | Test.java:1006:18:1006:75 | newWithArrayElement(...) : Object[] [[], []] : String | Test.java:1007:25:1007:26 | in : Object[] [[], []] : String | provenance |  |
 | Test.java:1006:38:1006:74 | newWithArrayElement(...) : Object[] [[]] : String | Test.java:251:31:251:44 | element : Object[] [[]] : String | provenance |  |
 | Test.java:1006:38:1006:74 | newWithArrayElement(...) : Object[] [[]] : String | Test.java:1006:18:1006:75 | newWithArrayElement(...) : Object[] [[], []] : String | provenance |  |
@@ -2567,9 +2567,9 @@ edges
 | Test.java:1006:58:1006:73 | (...)... : String | Test.java:1006:38:1006:74 | newWithArrayElement(...) : Object[] [[]] : String | provenance |  |
 | Test.java:1006:66:1006:73 | source(...) : Object | Test.java:1006:58:1006:73 | (...)... : String | provenance |  |
 | Test.java:1007:20:1007:22 | out [post update] : Map [<map.key>] : String | Test.java:1008:19:1008:21 | out : Map [<map.key>] : String | provenance |  |
-| Test.java:1007:25:1007:26 | in : Object[] [[], []] : String | Test.java:1007:20:1007:22 | out [post update] : Map [<map.key>] : String | provenance | MaD:636 |
+| Test.java:1007:25:1007:26 | in : Object[] [[], []] : String | Test.java:1007:20:1007:22 | out [post update] : Map [<map.key>] : String | provenance | MaD:707 |
 | Test.java:1008:19:1008:21 | out : Map [<map.key>] : String | Test.java:228:18:228:29 | map : Map [<map.key>] : String | provenance |  |
-| Test.java:1008:19:1008:21 | out : Map [<map.key>] : String | Test.java:1008:9:1008:22 | getMapKey(...) | provenance | MaD:10 |
+| Test.java:1008:19:1008:21 | out : Map [<map.key>] : String | Test.java:1008:9:1008:22 | getMapKey(...) | provenance | MaD:18 |
 | Test.java:1013:18:1013:75 | newWithArrayElement(...) : Object[] [[], []] : String | Test.java:1014:32:1014:33 | in : Object[] [[], []] : String | provenance |  |
 | Test.java:1013:38:1013:74 | newWithArrayElement(...) : Object[] [[]] : String | Test.java:251:31:251:44 | element : Object[] [[]] : String | provenance |  |
 | Test.java:1013:38:1013:74 | newWithArrayElement(...) : Object[] [[]] : String | Test.java:1013:18:1013:75 | newWithArrayElement(...) : Object[] [[], []] : String | provenance |  |
@@ -2577,9 +2577,9 @@ edges
 | Test.java:1013:58:1013:73 | (...)... : String | Test.java:1013:38:1013:74 | newWithArrayElement(...) : Object[] [[]] : String | provenance |  |
 | Test.java:1013:66:1013:73 | source(...) : Object | Test.java:1013:58:1013:73 | (...)... : String | provenance |  |
 | Test.java:1014:10:1014:34 | putAll(...) : Map [<map.key>] : String | Test.java:1015:19:1015:21 | out : Map [<map.key>] : String | provenance |  |
-| Test.java:1014:32:1014:33 | in : Object[] [[], []] : String | Test.java:1014:10:1014:34 | putAll(...) : Map [<map.key>] : String | provenance | MaD:638 |
+| Test.java:1014:32:1014:33 | in : Object[] [[], []] : String | Test.java:1014:10:1014:34 | putAll(...) : Map [<map.key>] : String | provenance | MaD:709 |
 | Test.java:1015:19:1015:21 | out : Map [<map.key>] : String | Test.java:228:18:228:29 | map : Map [<map.key>] : String | provenance |  |
-| Test.java:1015:19:1015:21 | out : Map [<map.key>] : String | Test.java:1015:9:1015:22 | getMapKey(...) | provenance | MaD:10 |
+| Test.java:1015:19:1015:21 | out : Map [<map.key>] : String | Test.java:1015:9:1015:22 | getMapKey(...) | provenance | MaD:18 |
 | Test.java:1020:18:1020:75 | newWithArrayElement(...) : Object[] [[], []] : String | Test.java:1021:25:1021:26 | in : Object[] [[], []] : String | provenance |  |
 | Test.java:1020:38:1020:74 | newWithArrayElement(...) : Object[] [[]] : String | Test.java:251:31:251:44 | element : Object[] [[]] : String | provenance |  |
 | Test.java:1020:38:1020:74 | newWithArrayElement(...) : Object[] [[]] : String | Test.java:1020:18:1020:75 | newWithArrayElement(...) : Object[] [[], []] : String | provenance |  |
@@ -2587,9 +2587,9 @@ edges
 | Test.java:1020:58:1020:73 | (...)... : String | Test.java:1020:38:1020:74 | newWithArrayElement(...) : Object[] [[]] : String | provenance |  |
 | Test.java:1020:66:1020:73 | source(...) : Object | Test.java:1020:58:1020:73 | (...)... : String | provenance |  |
 | Test.java:1021:20:1021:22 | out [post update] : Map [<map.value>] : String | Test.java:1022:21:1022:23 | out : Map [<map.value>] : String | provenance |  |
-| Test.java:1021:25:1021:26 | in : Object[] [[], []] : String | Test.java:1021:20:1021:22 | out [post update] : Map [<map.value>] : String | provenance | MaD:637 |
+| Test.java:1021:25:1021:26 | in : Object[] [[], []] : String | Test.java:1021:20:1021:22 | out [post update] : Map [<map.value>] : String | provenance | MaD:708 |
 | Test.java:1022:21:1022:23 | out : Map [<map.value>] : String | Test.java:232:20:232:31 | map : Map [<map.value>] : String | provenance |  |
-| Test.java:1022:21:1022:23 | out : Map [<map.value>] : String | Test.java:1022:9:1022:24 | getMapValue(...) | provenance | MaD:9 |
+| Test.java:1022:21:1022:23 | out : Map [<map.value>] : String | Test.java:1022:9:1022:24 | getMapValue(...) | provenance | MaD:17 |
 | Test.java:1027:18:1027:75 | newWithArrayElement(...) : Object[] [[], []] : String | Test.java:1028:32:1028:33 | in : Object[] [[], []] : String | provenance |  |
 | Test.java:1027:38:1027:74 | newWithArrayElement(...) : Object[] [[]] : String | Test.java:251:31:251:44 | element : Object[] [[]] : String | provenance |  |
 | Test.java:1027:38:1027:74 | newWithArrayElement(...) : Object[] [[]] : String | Test.java:1027:18:1027:75 | newWithArrayElement(...) : Object[] [[], []] : String | provenance |  |
@@ -2597,4144 +2597,4144 @@ edges
 | Test.java:1027:58:1027:73 | (...)... : String | Test.java:1027:38:1027:74 | newWithArrayElement(...) : Object[] [[]] : String | provenance |  |
 | Test.java:1027:66:1027:73 | source(...) : Object | Test.java:1027:58:1027:73 | (...)... : String | provenance |  |
 | Test.java:1028:10:1028:34 | putAll(...) : Map [<map.value>] : String | Test.java:1029:21:1029:23 | out : Map [<map.value>] : String | provenance |  |
-| Test.java:1028:32:1028:33 | in : Object[] [[], []] : String | Test.java:1028:10:1028:34 | putAll(...) : Map [<map.value>] : String | provenance | MaD:639 |
+| Test.java:1028:32:1028:33 | in : Object[] [[], []] : String | Test.java:1028:10:1028:34 | putAll(...) : Map [<map.value>] : String | provenance | MaD:710 |
 | Test.java:1029:21:1029:23 | out : Map [<map.value>] : String | Test.java:232:20:232:31 | map : Map [<map.value>] : String | provenance |  |
-| Test.java:1029:21:1029:23 | out : Map [<map.value>] : String | Test.java:1029:9:1029:24 | getMapValue(...) | provenance | MaD:9 |
+| Test.java:1029:21:1029:23 | out : Map [<map.value>] : String | Test.java:1029:9:1029:24 | getMapValue(...) | provenance | MaD:17 |
 | Test.java:1034:18:1034:73 | newWithArrayElement(...) : Object[] [[], <map.key>] : String | Test.java:1035:25:1035:26 | in : Object[] [[], <map.key>] : String | provenance |  |
 | Test.java:1034:38:1034:72 | newMAKVWithMapKey(...) : MyAbstractKeyValue [<map.key>] : String | Test.java:251:31:251:44 | element : MyAbstractKeyValue [<map.key>] : String | provenance |  |
 | Test.java:1034:38:1034:72 | newMAKVWithMapKey(...) : MyAbstractKeyValue [<map.key>] : String | Test.java:1034:18:1034:73 | newWithArrayElement(...) : Object[] [[], <map.key>] : String | provenance |  |
 | Test.java:1034:56:1034:71 | (...)... : String | Test.java:282:53:282:57 | key : String | provenance |  |
-| Test.java:1034:56:1034:71 | (...)... : String | Test.java:1034:38:1034:72 | newMAKVWithMapKey(...) : MyAbstractKeyValue [<map.key>] : String | provenance | MaD:189 |
+| Test.java:1034:56:1034:71 | (...)... : String | Test.java:1034:38:1034:72 | newMAKVWithMapKey(...) : MyAbstractKeyValue [<map.key>] : String | provenance | MaD:191 |
 | Test.java:1034:64:1034:71 | source(...) : Object | Test.java:1034:56:1034:71 | (...)... : String | provenance |  |
 | Test.java:1035:20:1035:22 | out [post update] : Map [<map.key>] : String | Test.java:1036:19:1036:21 | out : Map [<map.key>] : String | provenance |  |
-| Test.java:1035:25:1035:26 | in : Object[] [[], <map.key>] : String | Test.java:1035:20:1035:22 | out [post update] : Map [<map.key>] : String | provenance | MaD:640 |
+| Test.java:1035:25:1035:26 | in : Object[] [[], <map.key>] : String | Test.java:1035:20:1035:22 | out [post update] : Map [<map.key>] : String | provenance | MaD:711 |
 | Test.java:1036:19:1036:21 | out : Map [<map.key>] : String | Test.java:228:18:228:29 | map : Map [<map.key>] : String | provenance |  |
-| Test.java:1036:19:1036:21 | out : Map [<map.key>] : String | Test.java:1036:9:1036:22 | getMapKey(...) | provenance | MaD:10 |
+| Test.java:1036:19:1036:21 | out : Map [<map.key>] : String | Test.java:1036:9:1036:22 | getMapKey(...) | provenance | MaD:18 |
 | Test.java:1041:18:1041:73 | newWithArrayElement(...) : Object[] [[], <map.key>] : String | Test.java:1042:32:1042:33 | in : Object[] [[], <map.key>] : String | provenance |  |
 | Test.java:1041:38:1041:72 | newMAKVWithMapKey(...) : MyAbstractKeyValue [<map.key>] : String | Test.java:251:31:251:44 | element : MyAbstractKeyValue [<map.key>] : String | provenance |  |
 | Test.java:1041:38:1041:72 | newMAKVWithMapKey(...) : MyAbstractKeyValue [<map.key>] : String | Test.java:1041:18:1041:73 | newWithArrayElement(...) : Object[] [[], <map.key>] : String | provenance |  |
 | Test.java:1041:56:1041:71 | (...)... : String | Test.java:282:53:282:57 | key : String | provenance |  |
-| Test.java:1041:56:1041:71 | (...)... : String | Test.java:1041:38:1041:72 | newMAKVWithMapKey(...) : MyAbstractKeyValue [<map.key>] : String | provenance | MaD:189 |
+| Test.java:1041:56:1041:71 | (...)... : String | Test.java:1041:38:1041:72 | newMAKVWithMapKey(...) : MyAbstractKeyValue [<map.key>] : String | provenance | MaD:191 |
 | Test.java:1041:64:1041:71 | source(...) : Object | Test.java:1041:56:1041:71 | (...)... : String | provenance |  |
 | Test.java:1042:10:1042:34 | putAll(...) : Map [<map.key>] : String | Test.java:1043:19:1043:21 | out : Map [<map.key>] : String | provenance |  |
-| Test.java:1042:32:1042:33 | in : Object[] [[], <map.key>] : String | Test.java:1042:10:1042:34 | putAll(...) : Map [<map.key>] : String | provenance | MaD:641 |
+| Test.java:1042:32:1042:33 | in : Object[] [[], <map.key>] : String | Test.java:1042:10:1042:34 | putAll(...) : Map [<map.key>] : String | provenance | MaD:712 |
 | Test.java:1043:19:1043:21 | out : Map [<map.key>] : String | Test.java:228:18:228:29 | map : Map [<map.key>] : String | provenance |  |
-| Test.java:1043:19:1043:21 | out : Map [<map.key>] : String | Test.java:1043:9:1043:22 | getMapKey(...) | provenance | MaD:10 |
+| Test.java:1043:19:1043:21 | out : Map [<map.key>] : String | Test.java:1043:9:1043:22 | getMapKey(...) | provenance | MaD:18 |
 | Test.java:1048:18:1048:75 | newWithArrayElement(...) : Object[] [[], <map.value>] : String | Test.java:1049:25:1049:26 | in : Object[] [[], <map.value>] : String | provenance |  |
 | Test.java:1048:38:1048:74 | newMAKVWithMapValue(...) : MyAbstractKeyValue [<map.value>] : String | Test.java:251:31:251:44 | element : MyAbstractKeyValue [<map.value>] : String | provenance |  |
 | Test.java:1048:38:1048:74 | newMAKVWithMapValue(...) : MyAbstractKeyValue [<map.value>] : String | Test.java:1048:18:1048:75 | newWithArrayElement(...) : Object[] [[], <map.value>] : String | provenance |  |
 | Test.java:1048:58:1048:73 | (...)... : String | Test.java:299:55:299:61 | value : String | provenance |  |
-| Test.java:1048:58:1048:73 | (...)... : String | Test.java:1048:38:1048:74 | newMAKVWithMapValue(...) : MyAbstractKeyValue [<map.value>] : String | provenance | MaD:190 |
+| Test.java:1048:58:1048:73 | (...)... : String | Test.java:1048:38:1048:74 | newMAKVWithMapValue(...) : MyAbstractKeyValue [<map.value>] : String | provenance | MaD:192 |
 | Test.java:1048:66:1048:73 | source(...) : Object | Test.java:1048:58:1048:73 | (...)... : String | provenance |  |
 | Test.java:1049:20:1049:22 | out [post update] : Map [<map.value>] : String | Test.java:1050:21:1050:23 | out : Map [<map.value>] : String | provenance |  |
-| Test.java:1049:25:1049:26 | in : Object[] [[], <map.value>] : String | Test.java:1049:20:1049:22 | out [post update] : Map [<map.value>] : String | provenance | MaD:642 |
+| Test.java:1049:25:1049:26 | in : Object[] [[], <map.value>] : String | Test.java:1049:20:1049:22 | out [post update] : Map [<map.value>] : String | provenance | MaD:713 |
 | Test.java:1050:21:1050:23 | out : Map [<map.value>] : String | Test.java:232:20:232:31 | map : Map [<map.value>] : String | provenance |  |
-| Test.java:1050:21:1050:23 | out : Map [<map.value>] : String | Test.java:1050:9:1050:24 | getMapValue(...) | provenance | MaD:9 |
+| Test.java:1050:21:1050:23 | out : Map [<map.value>] : String | Test.java:1050:9:1050:24 | getMapValue(...) | provenance | MaD:17 |
 | Test.java:1055:18:1055:75 | newWithArrayElement(...) : Object[] [[], <map.value>] : String | Test.java:1056:32:1056:33 | in : Object[] [[], <map.value>] : String | provenance |  |
 | Test.java:1055:38:1055:74 | newMAKVWithMapValue(...) : MyAbstractKeyValue [<map.value>] : String | Test.java:251:31:251:44 | element : MyAbstractKeyValue [<map.value>] : String | provenance |  |
 | Test.java:1055:38:1055:74 | newMAKVWithMapValue(...) : MyAbstractKeyValue [<map.value>] : String | Test.java:1055:18:1055:75 | newWithArrayElement(...) : Object[] [[], <map.value>] : String | provenance |  |
 | Test.java:1055:58:1055:73 | (...)... : String | Test.java:299:55:299:61 | value : String | provenance |  |
-| Test.java:1055:58:1055:73 | (...)... : String | Test.java:1055:38:1055:74 | newMAKVWithMapValue(...) : MyAbstractKeyValue [<map.value>] : String | provenance | MaD:190 |
+| Test.java:1055:58:1055:73 | (...)... : String | Test.java:1055:38:1055:74 | newMAKVWithMapValue(...) : MyAbstractKeyValue [<map.value>] : String | provenance | MaD:192 |
 | Test.java:1055:66:1055:73 | source(...) : Object | Test.java:1055:58:1055:73 | (...)... : String | provenance |  |
 | Test.java:1056:10:1056:34 | putAll(...) : Map [<map.value>] : String | Test.java:1057:21:1057:23 | out : Map [<map.value>] : String | provenance |  |
-| Test.java:1056:32:1056:33 | in : Object[] [[], <map.value>] : String | Test.java:1056:10:1056:34 | putAll(...) : Map [<map.value>] : String | provenance | MaD:643 |
+| Test.java:1056:32:1056:33 | in : Object[] [[], <map.value>] : String | Test.java:1056:10:1056:34 | putAll(...) : Map [<map.value>] : String | provenance | MaD:714 |
 | Test.java:1057:21:1057:23 | out : Map [<map.value>] : String | Test.java:232:20:232:31 | map : Map [<map.value>] : String | provenance |  |
-| Test.java:1057:21:1057:23 | out : Map [<map.value>] : String | Test.java:1057:9:1057:24 | getMapValue(...) | provenance | MaD:9 |
+| Test.java:1057:21:1057:23 | out : Map [<map.value>] : String | Test.java:1057:9:1057:24 | getMapValue(...) | provenance | MaD:17 |
 | Test.java:1062:16:1062:23 | source(...) : Object | Test.java:1063:31:1063:32 | in : Object | provenance |  |
 | Test.java:1063:26:1063:28 | out [post update] : Map [<map.key>] : Object | Test.java:1064:19:1064:21 | out : Map [<map.key>] : Object | provenance |  |
-| Test.java:1063:31:1063:32 | in : Object | Test.java:1063:26:1063:28 | out [post update] : Map [<map.key>] : Object | provenance | MaD:644 |
+| Test.java:1063:31:1063:32 | in : Object | Test.java:1063:26:1063:28 | out [post update] : Map [<map.key>] : Object | provenance | MaD:719 |
 | Test.java:1064:19:1064:21 | out : Map [<map.key>] : Object | Test.java:228:18:228:29 | map : Map [<map.key>] : Object | provenance |  |
-| Test.java:1064:19:1064:21 | out : Map [<map.key>] : Object | Test.java:1064:9:1064:22 | getMapKey(...) | provenance | MaD:10 |
+| Test.java:1064:19:1064:21 | out : Map [<map.key>] : Object | Test.java:1064:9:1064:22 | getMapKey(...) | provenance | MaD:18 |
 | Test.java:1069:16:1069:23 | source(...) : Object | Test.java:1070:37:1070:38 | in : Object | provenance |  |
 | Test.java:1070:26:1070:28 | out [post update] : Map [<map.value>] : Object | Test.java:1071:21:1071:23 | out : Map [<map.value>] : Object | provenance |  |
-| Test.java:1070:37:1070:38 | in : Object | Test.java:1070:26:1070:28 | out [post update] : Map [<map.value>] : Object | provenance | MaD:645 |
+| Test.java:1070:37:1070:38 | in : Object | Test.java:1070:26:1070:28 | out [post update] : Map [<map.value>] : Object | provenance | MaD:720 |
 | Test.java:1071:21:1071:23 | out : Map [<map.value>] : Object | Test.java:232:20:232:31 | map : Map [<map.value>] : Object | provenance |  |
-| Test.java:1071:21:1071:23 | out : Map [<map.value>] : Object | Test.java:1071:9:1071:24 | getMapValue(...) | provenance | MaD:9 |
+| Test.java:1071:21:1071:23 | out : Map [<map.value>] : Object | Test.java:1071:9:1071:24 | getMapValue(...) | provenance | MaD:17 |
 | Test.java:1076:13:1076:50 | newTreeMapWithMapKey(...) : TreeMap [<map.key>] : String | Test.java:1077:35:1077:36 | in : TreeMap [<map.key>] : String | provenance |  |
 | Test.java:1076:34:1076:49 | (...)... : String | Test.java:285:47:285:51 | key : String | provenance |  |
-| Test.java:1076:34:1076:49 | (...)... : String | Test.java:1076:13:1076:50 | newTreeMapWithMapKey(...) : TreeMap [<map.key>] : String | provenance | MaD:14 |
+| Test.java:1076:34:1076:49 | (...)... : String | Test.java:1076:13:1076:50 | newTreeMapWithMapKey(...) : TreeMap [<map.key>] : String | provenance | MaD:19 |
 | Test.java:1076:42:1076:49 | source(...) : Object | Test.java:1076:34:1076:49 | (...)... : String | provenance |  |
 | Test.java:1077:10:1077:37 | synchronizedMap(...) : Map [<map.key>] : String | Test.java:1078:19:1078:21 | out : Map [<map.key>] : String | provenance |  |
-| Test.java:1077:35:1077:36 | in : TreeMap [<map.key>] : String | Test.java:1077:10:1077:37 | synchronizedMap(...) : Map [<map.key>] : String | provenance | MaD:646 |
+| Test.java:1077:35:1077:36 | in : TreeMap [<map.key>] : String | Test.java:1077:10:1077:37 | synchronizedMap(...) : Map [<map.key>] : String | provenance | MaD:721 |
 | Test.java:1078:19:1078:21 | out : Map [<map.key>] : String | Test.java:228:18:228:29 | map : Map [<map.key>] : String | provenance |  |
-| Test.java:1078:19:1078:21 | out : Map [<map.key>] : String | Test.java:1078:9:1078:22 | getMapKey(...) | provenance | MaD:10 |
+| Test.java:1078:19:1078:21 | out : Map [<map.key>] : String | Test.java:1078:9:1078:22 | getMapKey(...) | provenance | MaD:18 |
 | Test.java:1083:13:1083:52 | newTreeMapWithMapValue(...) : TreeMap [<map.value>] : String | Test.java:1084:35:1084:36 | in : TreeMap [<map.value>] : String | provenance |  |
 | Test.java:1083:36:1083:51 | (...)... : String | Test.java:304:49:304:55 | value : String | provenance |  |
-| Test.java:1083:36:1083:51 | (...)... : String | Test.java:1083:13:1083:52 | newTreeMapWithMapValue(...) : TreeMap [<map.value>] : String | provenance | MaD:15 |
+| Test.java:1083:36:1083:51 | (...)... : String | Test.java:1083:13:1083:52 | newTreeMapWithMapValue(...) : TreeMap [<map.value>] : String | provenance | MaD:20 |
 | Test.java:1083:44:1083:51 | source(...) : Object | Test.java:1083:36:1083:51 | (...)... : String | provenance |  |
 | Test.java:1084:10:1084:37 | synchronizedMap(...) : Map [<map.value>] : String | Test.java:1085:21:1085:23 | out : Map [<map.value>] : String | provenance |  |
-| Test.java:1084:35:1084:36 | in : TreeMap [<map.value>] : String | Test.java:1084:10:1084:37 | synchronizedMap(...) : Map [<map.value>] : String | provenance | MaD:647 |
+| Test.java:1084:35:1084:36 | in : TreeMap [<map.value>] : String | Test.java:1084:10:1084:37 | synchronizedMap(...) : Map [<map.value>] : String | provenance | MaD:722 |
 | Test.java:1085:21:1085:23 | out : Map [<map.value>] : String | Test.java:232:20:232:31 | map : Map [<map.value>] : String | provenance |  |
-| Test.java:1085:21:1085:23 | out : Map [<map.value>] : String | Test.java:1085:9:1085:24 | getMapValue(...) | provenance | MaD:9 |
+| Test.java:1085:21:1085:23 | out : Map [<map.value>] : String | Test.java:1085:9:1085:24 | getMapValue(...) | provenance | MaD:17 |
 | Test.java:1090:19:1090:56 | newTreeMapWithMapKey(...) : TreeMap [<map.key>] : String | Test.java:1091:41:1091:42 | in : TreeMap [<map.key>] : String | provenance |  |
 | Test.java:1090:40:1090:55 | (...)... : String | Test.java:285:47:285:51 | key : String | provenance |  |
-| Test.java:1090:40:1090:55 | (...)... : String | Test.java:1090:19:1090:56 | newTreeMapWithMapKey(...) : TreeMap [<map.key>] : String | provenance | MaD:14 |
+| Test.java:1090:40:1090:55 | (...)... : String | Test.java:1090:19:1090:56 | newTreeMapWithMapKey(...) : TreeMap [<map.key>] : String | provenance | MaD:19 |
 | Test.java:1090:48:1090:55 | source(...) : Object | Test.java:1090:40:1090:55 | (...)... : String | provenance |  |
 | Test.java:1091:10:1091:43 | synchronizedSortedMap(...) : SortedMap [<map.key>] : String | Test.java:1092:19:1092:21 | out : SortedMap [<map.key>] : String | provenance |  |
-| Test.java:1091:41:1091:42 | in : TreeMap [<map.key>] : String | Test.java:1091:10:1091:43 | synchronizedSortedMap(...) : SortedMap [<map.key>] : String | provenance | MaD:648 |
+| Test.java:1091:41:1091:42 | in : TreeMap [<map.key>] : String | Test.java:1091:10:1091:43 | synchronizedSortedMap(...) : SortedMap [<map.key>] : String | provenance | MaD:723 |
 | Test.java:1092:19:1092:21 | out : SortedMap [<map.key>] : String | Test.java:228:18:228:29 | map : SortedMap [<map.key>] : String | provenance |  |
-| Test.java:1092:19:1092:21 | out : SortedMap [<map.key>] : String | Test.java:1092:9:1092:22 | getMapKey(...) | provenance | MaD:10 |
+| Test.java:1092:19:1092:21 | out : SortedMap [<map.key>] : String | Test.java:1092:9:1092:22 | getMapKey(...) | provenance | MaD:18 |
 | Test.java:1097:19:1097:58 | newTreeMapWithMapValue(...) : TreeMap [<map.value>] : String | Test.java:1098:41:1098:42 | in : TreeMap [<map.value>] : String | provenance |  |
 | Test.java:1097:42:1097:57 | (...)... : String | Test.java:304:49:304:55 | value : String | provenance |  |
-| Test.java:1097:42:1097:57 | (...)... : String | Test.java:1097:19:1097:58 | newTreeMapWithMapValue(...) : TreeMap [<map.value>] : String | provenance | MaD:15 |
+| Test.java:1097:42:1097:57 | (...)... : String | Test.java:1097:19:1097:58 | newTreeMapWithMapValue(...) : TreeMap [<map.value>] : String | provenance | MaD:20 |
 | Test.java:1097:50:1097:57 | source(...) : Object | Test.java:1097:42:1097:57 | (...)... : String | provenance |  |
 | Test.java:1098:10:1098:43 | synchronizedSortedMap(...) : SortedMap [<map.value>] : String | Test.java:1099:21:1099:23 | out : SortedMap [<map.value>] : String | provenance |  |
-| Test.java:1098:41:1098:42 | in : TreeMap [<map.value>] : String | Test.java:1098:10:1098:43 | synchronizedSortedMap(...) : SortedMap [<map.value>] : String | provenance | MaD:649 |
+| Test.java:1098:41:1098:42 | in : TreeMap [<map.value>] : String | Test.java:1098:10:1098:43 | synchronizedSortedMap(...) : SortedMap [<map.value>] : String | provenance | MaD:724 |
 | Test.java:1099:21:1099:23 | out : SortedMap [<map.value>] : String | Test.java:232:20:232:31 | map : SortedMap [<map.value>] : String | provenance |  |
-| Test.java:1099:21:1099:23 | out : SortedMap [<map.value>] : String | Test.java:1099:9:1099:24 | getMapValue(...) | provenance | MaD:9 |
+| Test.java:1099:21:1099:23 | out : SortedMap [<map.value>] : String | Test.java:1099:9:1099:24 | getMapValue(...) | provenance | MaD:17 |
 | Test.java:1104:24:1104:56 | newRBWithMapKey(...) : ResourceBundle [<map.key>] : String | Test.java:1105:25:1105:26 | in : ResourceBundle [<map.key>] : String | provenance |  |
-| Test.java:1104:40:1104:55 | (...)... : String | Test.java:1104:24:1104:56 | newRBWithMapKey(...) : ResourceBundle [<map.key>] : String | provenance | MaD:822 |
+| Test.java:1104:40:1104:55 | (...)... : String | Test.java:1104:24:1104:56 | newRBWithMapKey(...) : ResourceBundle [<map.key>] : String | provenance | MaD:1 |
 | Test.java:1104:48:1104:55 | source(...) : Object | Test.java:1104:40:1104:55 | (...)... : String | provenance |  |
 | Test.java:1105:10:1105:27 | toMap(...) : Map [<map.key>] : String | Test.java:1106:19:1106:21 | out : Map [<map.key>] : String | provenance |  |
-| Test.java:1105:25:1105:26 | in : ResourceBundle [<map.key>] : String | Test.java:1105:10:1105:27 | toMap(...) : Map [<map.key>] : String | provenance | MaD:650 |
+| Test.java:1105:25:1105:26 | in : ResourceBundle [<map.key>] : String | Test.java:1105:10:1105:27 | toMap(...) : Map [<map.key>] : String | provenance | MaD:725 |
 | Test.java:1106:19:1106:21 | out : Map [<map.key>] : String | Test.java:228:18:228:29 | map : Map [<map.key>] : String | provenance |  |
-| Test.java:1106:19:1106:21 | out : Map [<map.key>] : String | Test.java:1106:9:1106:22 | getMapKey(...) | provenance | MaD:10 |
+| Test.java:1106:19:1106:21 | out : Map [<map.key>] : String | Test.java:1106:9:1106:22 | getMapKey(...) | provenance | MaD:18 |
 | Test.java:1111:24:1111:58 | newRBWithMapValue(...) : ResourceBundle [<map.value>] : String | Test.java:1112:25:1112:26 | in : ResourceBundle [<map.value>] : String | provenance |  |
-| Test.java:1111:42:1111:57 | (...)... : String | Test.java:1111:24:1111:58 | newRBWithMapValue(...) : ResourceBundle [<map.value>] : String | provenance | MaD:821 |
+| Test.java:1111:42:1111:57 | (...)... : String | Test.java:1111:24:1111:58 | newRBWithMapValue(...) : ResourceBundle [<map.value>] : String | provenance | MaD:2 |
 | Test.java:1111:50:1111:57 | source(...) : Object | Test.java:1111:42:1111:57 | (...)... : String | provenance |  |
 | Test.java:1112:10:1112:27 | toMap(...) : Map [<map.value>] : String | Test.java:1113:21:1113:23 | out : Map [<map.value>] : String | provenance |  |
-| Test.java:1112:25:1112:26 | in : ResourceBundle [<map.value>] : String | Test.java:1112:10:1112:27 | toMap(...) : Map [<map.value>] : String | provenance | MaD:651 |
+| Test.java:1112:25:1112:26 | in : ResourceBundle [<map.value>] : String | Test.java:1112:10:1112:27 | toMap(...) : Map [<map.value>] : String | provenance | MaD:726 |
 | Test.java:1113:21:1113:23 | out : Map [<map.value>] : String | Test.java:232:20:232:31 | map : Map [<map.value>] : String | provenance |  |
-| Test.java:1113:21:1113:23 | out : Map [<map.value>] : String | Test.java:1113:9:1113:24 | getMapValue(...) | provenance | MaD:9 |
+| Test.java:1113:21:1113:23 | out : Map [<map.value>] : String | Test.java:1113:9:1113:24 | getMapValue(...) | provenance | MaD:17 |
 | Test.java:1118:13:1118:50 | newTreeMapWithMapKey(...) : TreeMap [<map.key>] : String | Test.java:1119:34:1119:35 | in : TreeMap [<map.key>] : String | provenance |  |
 | Test.java:1118:34:1118:49 | (...)... : String | Test.java:285:47:285:51 | key : String | provenance |  |
-| Test.java:1118:34:1118:49 | (...)... : String | Test.java:1118:13:1118:50 | newTreeMapWithMapKey(...) : TreeMap [<map.key>] : String | provenance | MaD:14 |
+| Test.java:1118:34:1118:49 | (...)... : String | Test.java:1118:13:1118:50 | newTreeMapWithMapKey(...) : TreeMap [<map.key>] : String | provenance | MaD:19 |
 | Test.java:1118:42:1118:49 | source(...) : Object | Test.java:1118:34:1118:49 | (...)... : String | provenance |  |
 | Test.java:1119:10:1119:48 | transformedMap(...) : IterableMap [<map.key>] : String | Test.java:1120:19:1120:21 | out : IterableMap [<map.key>] : String | provenance |  |
-| Test.java:1119:34:1119:35 | in : TreeMap [<map.key>] : String | Test.java:1119:10:1119:48 | transformedMap(...) : IterableMap [<map.key>] : String | provenance | MaD:652 |
+| Test.java:1119:34:1119:35 | in : TreeMap [<map.key>] : String | Test.java:1119:10:1119:48 | transformedMap(...) : IterableMap [<map.key>] : String | provenance | MaD:727 |
 | Test.java:1120:19:1120:21 | out : IterableMap [<map.key>] : String | Test.java:228:18:228:29 | map : IterableMap [<map.key>] : String | provenance |  |
-| Test.java:1120:19:1120:21 | out : IterableMap [<map.key>] : String | Test.java:1120:9:1120:22 | getMapKey(...) | provenance | MaD:10 |
+| Test.java:1120:19:1120:21 | out : IterableMap [<map.key>] : String | Test.java:1120:9:1120:22 | getMapKey(...) | provenance | MaD:18 |
 | Test.java:1125:13:1125:52 | newTreeMapWithMapValue(...) : TreeMap [<map.value>] : String | Test.java:1126:34:1126:35 | in : TreeMap [<map.value>] : String | provenance |  |
 | Test.java:1125:36:1125:51 | (...)... : String | Test.java:304:49:304:55 | value : String | provenance |  |
-| Test.java:1125:36:1125:51 | (...)... : String | Test.java:1125:13:1125:52 | newTreeMapWithMapValue(...) : TreeMap [<map.value>] : String | provenance | MaD:15 |
+| Test.java:1125:36:1125:51 | (...)... : String | Test.java:1125:13:1125:52 | newTreeMapWithMapValue(...) : TreeMap [<map.value>] : String | provenance | MaD:20 |
 | Test.java:1125:44:1125:51 | source(...) : Object | Test.java:1125:36:1125:51 | (...)... : String | provenance |  |
 | Test.java:1126:10:1126:48 | transformedMap(...) : IterableMap [<map.value>] : String | Test.java:1127:21:1127:23 | out : IterableMap [<map.value>] : String | provenance |  |
-| Test.java:1126:34:1126:35 | in : TreeMap [<map.value>] : String | Test.java:1126:10:1126:48 | transformedMap(...) : IterableMap [<map.value>] : String | provenance | MaD:653 |
+| Test.java:1126:34:1126:35 | in : TreeMap [<map.value>] : String | Test.java:1126:10:1126:48 | transformedMap(...) : IterableMap [<map.value>] : String | provenance | MaD:728 |
 | Test.java:1127:21:1127:23 | out : IterableMap [<map.value>] : String | Test.java:232:20:232:31 | map : IterableMap [<map.value>] : String | provenance |  |
-| Test.java:1127:21:1127:23 | out : IterableMap [<map.value>] : String | Test.java:1127:9:1127:24 | getMapValue(...) | provenance | MaD:9 |
+| Test.java:1127:21:1127:23 | out : IterableMap [<map.value>] : String | Test.java:1127:9:1127:24 | getMapValue(...) | provenance | MaD:17 |
 | Test.java:1132:19:1132:56 | newTreeMapWithMapKey(...) : TreeMap [<map.key>] : String | Test.java:1133:40:1133:41 | in : TreeMap [<map.key>] : String | provenance |  |
 | Test.java:1132:40:1132:55 | (...)... : String | Test.java:285:47:285:51 | key : String | provenance |  |
-| Test.java:1132:40:1132:55 | (...)... : String | Test.java:1132:19:1132:56 | newTreeMapWithMapKey(...) : TreeMap [<map.key>] : String | provenance | MaD:14 |
+| Test.java:1132:40:1132:55 | (...)... : String | Test.java:1132:19:1132:56 | newTreeMapWithMapKey(...) : TreeMap [<map.key>] : String | provenance | MaD:19 |
 | Test.java:1132:48:1132:55 | source(...) : Object | Test.java:1132:40:1132:55 | (...)... : String | provenance |  |
 | Test.java:1133:10:1133:54 | transformedSortedMap(...) : SortedMap [<map.key>] : String | Test.java:1134:19:1134:21 | out : SortedMap [<map.key>] : String | provenance |  |
-| Test.java:1133:40:1133:41 | in : TreeMap [<map.key>] : String | Test.java:1133:10:1133:54 | transformedSortedMap(...) : SortedMap [<map.key>] : String | provenance | MaD:654 |
+| Test.java:1133:40:1133:41 | in : TreeMap [<map.key>] : String | Test.java:1133:10:1133:54 | transformedSortedMap(...) : SortedMap [<map.key>] : String | provenance | MaD:729 |
 | Test.java:1134:19:1134:21 | out : SortedMap [<map.key>] : String | Test.java:228:18:228:29 | map : SortedMap [<map.key>] : String | provenance |  |
-| Test.java:1134:19:1134:21 | out : SortedMap [<map.key>] : String | Test.java:1134:9:1134:22 | getMapKey(...) | provenance | MaD:10 |
+| Test.java:1134:19:1134:21 | out : SortedMap [<map.key>] : String | Test.java:1134:9:1134:22 | getMapKey(...) | provenance | MaD:18 |
 | Test.java:1139:19:1139:58 | newTreeMapWithMapValue(...) : TreeMap [<map.value>] : String | Test.java:1140:40:1140:41 | in : TreeMap [<map.value>] : String | provenance |  |
 | Test.java:1139:42:1139:57 | (...)... : String | Test.java:304:49:304:55 | value : String | provenance |  |
-| Test.java:1139:42:1139:57 | (...)... : String | Test.java:1139:19:1139:58 | newTreeMapWithMapValue(...) : TreeMap [<map.value>] : String | provenance | MaD:15 |
+| Test.java:1139:42:1139:57 | (...)... : String | Test.java:1139:19:1139:58 | newTreeMapWithMapValue(...) : TreeMap [<map.value>] : String | provenance | MaD:20 |
 | Test.java:1139:50:1139:57 | source(...) : Object | Test.java:1139:42:1139:57 | (...)... : String | provenance |  |
 | Test.java:1140:10:1140:54 | transformedSortedMap(...) : SortedMap [<map.value>] : String | Test.java:1141:21:1141:23 | out : SortedMap [<map.value>] : String | provenance |  |
-| Test.java:1140:40:1140:41 | in : TreeMap [<map.value>] : String | Test.java:1140:10:1140:54 | transformedSortedMap(...) : SortedMap [<map.value>] : String | provenance | MaD:655 |
+| Test.java:1140:40:1140:41 | in : TreeMap [<map.value>] : String | Test.java:1140:10:1140:54 | transformedSortedMap(...) : SortedMap [<map.value>] : String | provenance | MaD:730 |
 | Test.java:1141:21:1141:23 | out : SortedMap [<map.value>] : String | Test.java:232:20:232:31 | map : SortedMap [<map.value>] : String | provenance |  |
-| Test.java:1141:21:1141:23 | out : SortedMap [<map.value>] : String | Test.java:1141:9:1141:24 | getMapValue(...) | provenance | MaD:9 |
+| Test.java:1141:21:1141:23 | out : SortedMap [<map.value>] : String | Test.java:1141:9:1141:24 | getMapValue(...) | provenance | MaD:17 |
 | Test.java:1146:13:1146:50 | newTreeMapWithMapKey(...) : TreeMap [<map.key>] : String | Test.java:1147:35:1147:36 | in : TreeMap [<map.key>] : String | provenance |  |
 | Test.java:1146:34:1146:49 | (...)... : String | Test.java:285:47:285:51 | key : String | provenance |  |
-| Test.java:1146:34:1146:49 | (...)... : String | Test.java:1146:13:1146:50 | newTreeMapWithMapKey(...) : TreeMap [<map.key>] : String | provenance | MaD:14 |
+| Test.java:1146:34:1146:49 | (...)... : String | Test.java:1146:13:1146:50 | newTreeMapWithMapKey(...) : TreeMap [<map.key>] : String | provenance | MaD:19 |
 | Test.java:1146:42:1146:49 | source(...) : Object | Test.java:1146:34:1146:49 | (...)... : String | provenance |  |
 | Test.java:1147:10:1147:37 | unmodifiableMap(...) : Map [<map.key>] : String | Test.java:1148:19:1148:21 | out : Map [<map.key>] : String | provenance |  |
-| Test.java:1147:35:1147:36 | in : TreeMap [<map.key>] : String | Test.java:1147:10:1147:37 | unmodifiableMap(...) : Map [<map.key>] : String | provenance | MaD:656 |
+| Test.java:1147:35:1147:36 | in : TreeMap [<map.key>] : String | Test.java:1147:10:1147:37 | unmodifiableMap(...) : Map [<map.key>] : String | provenance | MaD:731 |
 | Test.java:1148:19:1148:21 | out : Map [<map.key>] : String | Test.java:228:18:228:29 | map : Map [<map.key>] : String | provenance |  |
-| Test.java:1148:19:1148:21 | out : Map [<map.key>] : String | Test.java:1148:9:1148:22 | getMapKey(...) | provenance | MaD:10 |
+| Test.java:1148:19:1148:21 | out : Map [<map.key>] : String | Test.java:1148:9:1148:22 | getMapKey(...) | provenance | MaD:18 |
 | Test.java:1153:13:1153:52 | newTreeMapWithMapValue(...) : TreeMap [<map.value>] : String | Test.java:1154:35:1154:36 | in : TreeMap [<map.value>] : String | provenance |  |
 | Test.java:1153:36:1153:51 | (...)... : String | Test.java:304:49:304:55 | value : String | provenance |  |
-| Test.java:1153:36:1153:51 | (...)... : String | Test.java:1153:13:1153:52 | newTreeMapWithMapValue(...) : TreeMap [<map.value>] : String | provenance | MaD:15 |
+| Test.java:1153:36:1153:51 | (...)... : String | Test.java:1153:13:1153:52 | newTreeMapWithMapValue(...) : TreeMap [<map.value>] : String | provenance | MaD:20 |
 | Test.java:1153:44:1153:51 | source(...) : Object | Test.java:1153:36:1153:51 | (...)... : String | provenance |  |
 | Test.java:1154:10:1154:37 | unmodifiableMap(...) : Map [<map.value>] : String | Test.java:1155:21:1155:23 | out : Map [<map.value>] : String | provenance |  |
-| Test.java:1154:35:1154:36 | in : TreeMap [<map.value>] : String | Test.java:1154:10:1154:37 | unmodifiableMap(...) : Map [<map.value>] : String | provenance | MaD:657 |
+| Test.java:1154:35:1154:36 | in : TreeMap [<map.value>] : String | Test.java:1154:10:1154:37 | unmodifiableMap(...) : Map [<map.value>] : String | provenance | MaD:732 |
 | Test.java:1155:21:1155:23 | out : Map [<map.value>] : String | Test.java:232:20:232:31 | map : Map [<map.value>] : String | provenance |  |
-| Test.java:1155:21:1155:23 | out : Map [<map.value>] : String | Test.java:1155:9:1155:24 | getMapValue(...) | provenance | MaD:9 |
+| Test.java:1155:21:1155:23 | out : Map [<map.value>] : String | Test.java:1155:9:1155:24 | getMapValue(...) | provenance | MaD:17 |
 | Test.java:1160:19:1160:56 | newTreeMapWithMapKey(...) : TreeMap [<map.key>] : String | Test.java:1161:41:1161:42 | in : TreeMap [<map.key>] : String | provenance |  |
 | Test.java:1160:40:1160:55 | (...)... : String | Test.java:285:47:285:51 | key : String | provenance |  |
-| Test.java:1160:40:1160:55 | (...)... : String | Test.java:1160:19:1160:56 | newTreeMapWithMapKey(...) : TreeMap [<map.key>] : String | provenance | MaD:14 |
+| Test.java:1160:40:1160:55 | (...)... : String | Test.java:1160:19:1160:56 | newTreeMapWithMapKey(...) : TreeMap [<map.key>] : String | provenance | MaD:19 |
 | Test.java:1160:48:1160:55 | source(...) : Object | Test.java:1160:40:1160:55 | (...)... : String | provenance |  |
 | Test.java:1161:10:1161:43 | unmodifiableSortedMap(...) : SortedMap [<map.key>] : String | Test.java:1162:19:1162:21 | out : SortedMap [<map.key>] : String | provenance |  |
-| Test.java:1161:41:1161:42 | in : TreeMap [<map.key>] : String | Test.java:1161:10:1161:43 | unmodifiableSortedMap(...) : SortedMap [<map.key>] : String | provenance | MaD:658 |
+| Test.java:1161:41:1161:42 | in : TreeMap [<map.key>] : String | Test.java:1161:10:1161:43 | unmodifiableSortedMap(...) : SortedMap [<map.key>] : String | provenance | MaD:733 |
 | Test.java:1162:19:1162:21 | out : SortedMap [<map.key>] : String | Test.java:228:18:228:29 | map : SortedMap [<map.key>] : String | provenance |  |
-| Test.java:1162:19:1162:21 | out : SortedMap [<map.key>] : String | Test.java:1162:9:1162:22 | getMapKey(...) | provenance | MaD:10 |
+| Test.java:1162:19:1162:21 | out : SortedMap [<map.key>] : String | Test.java:1162:9:1162:22 | getMapKey(...) | provenance | MaD:18 |
 | Test.java:1167:19:1167:58 | newTreeMapWithMapValue(...) : TreeMap [<map.value>] : String | Test.java:1168:41:1168:42 | in : TreeMap [<map.value>] : String | provenance |  |
 | Test.java:1167:42:1167:57 | (...)... : String | Test.java:304:49:304:55 | value : String | provenance |  |
-| Test.java:1167:42:1167:57 | (...)... : String | Test.java:1167:19:1167:58 | newTreeMapWithMapValue(...) : TreeMap [<map.value>] : String | provenance | MaD:15 |
+| Test.java:1167:42:1167:57 | (...)... : String | Test.java:1167:19:1167:58 | newTreeMapWithMapValue(...) : TreeMap [<map.value>] : String | provenance | MaD:20 |
 | Test.java:1167:50:1167:57 | source(...) : Object | Test.java:1167:42:1167:57 | (...)... : String | provenance |  |
 | Test.java:1168:10:1168:43 | unmodifiableSortedMap(...) : SortedMap [<map.value>] : String | Test.java:1169:21:1169:23 | out : SortedMap [<map.value>] : String | provenance |  |
-| Test.java:1168:41:1168:42 | in : TreeMap [<map.value>] : String | Test.java:1168:10:1168:43 | unmodifiableSortedMap(...) : SortedMap [<map.value>] : String | provenance | MaD:659 |
+| Test.java:1168:41:1168:42 | in : TreeMap [<map.value>] : String | Test.java:1168:10:1168:43 | unmodifiableSortedMap(...) : SortedMap [<map.value>] : String | provenance | MaD:734 |
 | Test.java:1169:21:1169:23 | out : SortedMap [<map.value>] : String | Test.java:232:20:232:31 | map : SortedMap [<map.value>] : String | provenance |  |
-| Test.java:1169:21:1169:23 | out : SortedMap [<map.value>] : String | Test.java:1169:9:1169:24 | getMapValue(...) | provenance | MaD:9 |
+| Test.java:1169:21:1169:23 | out : SortedMap [<map.value>] : String | Test.java:1169:9:1169:24 | getMapValue(...) | provenance | MaD:17 |
 | Test.java:1174:20:1174:61 | newArrayStackWithElement(...) : ArrayStack [<element>] : String | Test.java:1175:10:1175:11 | in : ArrayStack [<element>] : String | provenance |  |
 | Test.java:1174:45:1174:60 | (...)... : String | Test.java:252:45:252:53 | element : String | provenance |  |
-| Test.java:1174:45:1174:60 | (...)... : String | Test.java:1174:20:1174:61 | newArrayStackWithElement(...) : ArrayStack [<element>] : String | provenance | MaD:393 |
+| Test.java:1174:45:1174:60 | (...)... : String | Test.java:1174:20:1174:61 | newArrayStackWithElement(...) : ArrayStack [<element>] : String | provenance | MaD:468 |
 | Test.java:1174:53:1174:60 | source(...) : Object | Test.java:1174:45:1174:60 | (...)... : String | provenance |  |
-| Test.java:1175:10:1175:11 | in : ArrayStack [<element>] : String | Test.java:1175:10:1175:19 | peek(...) : String | provenance | MaD:391 |
+| Test.java:1175:10:1175:11 | in : ArrayStack [<element>] : String | Test.java:1175:10:1175:19 | peek(...) : String | provenance | MaD:466 |
 | Test.java:1175:10:1175:19 | peek(...) : String | Test.java:1176:9:1176:11 | out | provenance |  |
 | Test.java:1181:20:1181:61 | newArrayStackWithElement(...) : ArrayStack [<element>] : String | Test.java:1182:10:1182:11 | in : ArrayStack [<element>] : String | provenance |  |
 | Test.java:1181:45:1181:60 | (...)... : String | Test.java:252:45:252:53 | element : String | provenance |  |
-| Test.java:1181:45:1181:60 | (...)... : String | Test.java:1181:20:1181:61 | newArrayStackWithElement(...) : ArrayStack [<element>] : String | provenance | MaD:393 |
+| Test.java:1181:45:1181:60 | (...)... : String | Test.java:1181:20:1181:61 | newArrayStackWithElement(...) : ArrayStack [<element>] : String | provenance | MaD:468 |
 | Test.java:1181:53:1181:60 | source(...) : Object | Test.java:1181:45:1181:60 | (...)... : String | provenance |  |
-| Test.java:1182:10:1182:11 | in : ArrayStack [<element>] : String | Test.java:1182:10:1182:18 | peek(...) : String | provenance | MaD:391 |
+| Test.java:1182:10:1182:11 | in : ArrayStack [<element>] : String | Test.java:1182:10:1182:18 | peek(...) : String | provenance | MaD:466 |
 | Test.java:1182:10:1182:18 | peek(...) : String | Test.java:1183:9:1183:11 | out | provenance |  |
 | Test.java:1188:20:1188:61 | newArrayStackWithElement(...) : ArrayStack [<element>] : String | Test.java:1189:10:1189:11 | in : ArrayStack [<element>] : String | provenance |  |
 | Test.java:1188:45:1188:60 | (...)... : String | Test.java:252:45:252:53 | element : String | provenance |  |
-| Test.java:1188:45:1188:60 | (...)... : String | Test.java:1188:20:1188:61 | newArrayStackWithElement(...) : ArrayStack [<element>] : String | provenance | MaD:393 |
+| Test.java:1188:45:1188:60 | (...)... : String | Test.java:1188:20:1188:61 | newArrayStackWithElement(...) : ArrayStack [<element>] : String | provenance | MaD:468 |
 | Test.java:1188:53:1188:60 | source(...) : Object | Test.java:1188:45:1188:60 | (...)... : String | provenance |  |
-| Test.java:1189:10:1189:11 | in : ArrayStack [<element>] : String | Test.java:1189:10:1189:17 | pop(...) : String | provenance | MaD:392 |
+| Test.java:1189:10:1189:11 | in : ArrayStack [<element>] : String | Test.java:1189:10:1189:17 | pop(...) : String | provenance | MaD:467 |
 | Test.java:1189:10:1189:17 | pop(...) : String | Test.java:1190:9:1190:11 | out | provenance |  |
 | Test.java:1195:16:1195:23 | source(...) : Object | Test.java:1196:13:1196:14 | in : Object | provenance |  |
 | Test.java:1196:4:1196:6 | out [post update] : ArrayStack [<element>] : Object | Test.java:1197:20:1197:22 | out : ArrayStack [<element>] : Object | provenance |  |
-| Test.java:1196:13:1196:14 | in : Object | Test.java:1196:4:1196:6 | out [post update] : ArrayStack [<element>] : Object | provenance | MaD:393 |
+| Test.java:1196:13:1196:14 | in : Object | Test.java:1196:4:1196:6 | out [post update] : ArrayStack [<element>] : Object | provenance | MaD:468 |
 | Test.java:1197:20:1197:22 | out : ArrayStack [<element>] : Object | Test.java:230:19:230:32 | it : ArrayStack [<element>] : Object | provenance |  |
-| Test.java:1197:20:1197:22 | out : ArrayStack [<element>] : Object | Test.java:1197:9:1197:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:1197:20:1197:22 | out : ArrayStack [<element>] : Object | Test.java:1197:9:1197:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:1202:16:1202:23 | source(...) : Object | Test.java:1204:24:1204:25 | in : Object | provenance |  |
 | Test.java:1204:10:1204:26 | push(...) : Object | Test.java:1205:9:1205:11 | out | provenance |  |
-| Test.java:1204:24:1204:25 | in : Object | Test.java:1204:10:1204:26 | push(...) : Object | provenance | MaD:394 |
+| Test.java:1204:24:1204:25 | in : Object | Test.java:1204:10:1204:26 | push(...) : Object | provenance | MaD:469 |
 | Test.java:1210:16:1210:23 | source(...) : Object | Test.java:1211:12:1211:13 | in : Object | provenance |  |
 | Test.java:1211:4:1211:6 | out [post update] : Bag [<element>] : Object | Test.java:1212:20:1212:22 | out : Bag [<element>] : Object | provenance |  |
-| Test.java:1211:12:1211:13 | in : Object | Test.java:1211:4:1211:6 | out [post update] : Bag [<element>] : Object | provenance | MaD:395 |
+| Test.java:1211:12:1211:13 | in : Object | Test.java:1211:4:1211:6 | out [post update] : Bag [<element>] : Object | provenance | MaD:470 |
 | Test.java:1212:20:1212:22 | out : Bag [<element>] : Object | Test.java:230:19:230:32 | it : Bag [<element>] : Object | provenance |  |
-| Test.java:1212:20:1212:22 | out : Bag [<element>] : Object | Test.java:1212:9:1212:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:1212:20:1212:22 | out : Bag [<element>] : Object | Test.java:1212:9:1212:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:1217:16:1217:23 | source(...) : Object | Test.java:1218:12:1218:13 | in : Object | provenance |  |
 | Test.java:1218:4:1218:6 | out [post update] : Bag [<element>] : Object | Test.java:1219:20:1219:22 | out : Bag [<element>] : Object | provenance |  |
-| Test.java:1218:12:1218:13 | in : Object | Test.java:1218:4:1218:6 | out [post update] : Bag [<element>] : Object | provenance | MaD:2 |
-| Test.java:1218:12:1218:13 | in : Object | Test.java:1218:4:1218:6 | out [post update] : Bag [<element>] : Object | provenance | MaD:395 |
+| Test.java:1218:12:1218:13 | in : Object | Test.java:1218:4:1218:6 | out [post update] : Bag [<element>] : Object | provenance | MaD:4 |
+| Test.java:1218:12:1218:13 | in : Object | Test.java:1218:4:1218:6 | out [post update] : Bag [<element>] : Object | provenance | MaD:470 |
 | Test.java:1219:20:1219:22 | out : Bag [<element>] : Object | Test.java:230:19:230:32 | it : Bag [<element>] : Object | provenance |  |
-| Test.java:1219:20:1219:22 | out : Bag [<element>] : Object | Test.java:1219:9:1219:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:1219:20:1219:22 | out : Bag [<element>] : Object | Test.java:1219:9:1219:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:1224:13:1224:51 | newTreeBagWithElement(...) : TreeBag [<element>] : String | Test.java:1225:10:1225:11 | in : TreeBag [<element>] : String | provenance |  |
 | Test.java:1224:35:1224:50 | (...)... : String | Test.java:267:39:267:47 | element : String | provenance |  |
-| Test.java:1224:35:1224:50 | (...)... : String | Test.java:1224:13:1224:51 | newTreeBagWithElement(...) : TreeBag [<element>] : String | provenance | MaD:2 |
-| Test.java:1224:35:1224:50 | (...)... : String | Test.java:1224:13:1224:51 | newTreeBagWithElement(...) : TreeBag [<element>] : String | provenance | MaD:395 |
+| Test.java:1224:35:1224:50 | (...)... : String | Test.java:1224:13:1224:51 | newTreeBagWithElement(...) : TreeBag [<element>] : String | provenance | MaD:4 |
+| Test.java:1224:35:1224:50 | (...)... : String | Test.java:1224:13:1224:51 | newTreeBagWithElement(...) : TreeBag [<element>] : String | provenance | MaD:470 |
 | Test.java:1224:43:1224:50 | source(...) : Object | Test.java:1224:35:1224:50 | (...)... : String | provenance |  |
-| Test.java:1225:10:1225:11 | in : TreeBag [<element>] : String | Test.java:1225:10:1225:23 | uniqueSet(...) : Set [<element>] : String | provenance | MaD:396 |
+| Test.java:1225:10:1225:11 | in : TreeBag [<element>] : String | Test.java:1225:10:1225:23 | uniqueSet(...) : Set [<element>] : String | provenance | MaD:471 |
 | Test.java:1225:10:1225:23 | uniqueSet(...) : Set [<element>] : String | Test.java:1226:20:1226:22 | out : Set [<element>] : String | provenance |  |
 | Test.java:1226:20:1226:22 | out : Set [<element>] : String | Test.java:230:19:230:32 | it : Set [<element>] : String | provenance |  |
-| Test.java:1226:20:1226:22 | out : Set [<element>] : String | Test.java:1226:9:1226:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:1226:20:1226:22 | out : Set [<element>] : String | Test.java:1226:9:1226:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:1231:13:1231:51 | newTreeBagWithElement(...) : TreeBag [<element>] : String | Test.java:1232:33:1232:34 | in : TreeBag [<element>] : String | provenance |  |
 | Test.java:1231:35:1231:50 | (...)... : String | Test.java:267:39:267:47 | element : String | provenance |  |
-| Test.java:1231:35:1231:50 | (...)... : String | Test.java:1231:13:1231:51 | newTreeBagWithElement(...) : TreeBag [<element>] : String | provenance | MaD:2 |
-| Test.java:1231:35:1231:50 | (...)... : String | Test.java:1231:13:1231:51 | newTreeBagWithElement(...) : TreeBag [<element>] : String | provenance | MaD:395 |
+| Test.java:1231:35:1231:50 | (...)... : String | Test.java:1231:13:1231:51 | newTreeBagWithElement(...) : TreeBag [<element>] : String | provenance | MaD:4 |
+| Test.java:1231:35:1231:50 | (...)... : String | Test.java:1231:13:1231:51 | newTreeBagWithElement(...) : TreeBag [<element>] : String | provenance | MaD:470 |
 | Test.java:1231:43:1231:50 | source(...) : Object | Test.java:1231:35:1231:50 | (...)... : String | provenance |  |
 | Test.java:1232:10:1232:35 | collectionBag(...) : Bag [<element>] : String | Test.java:1233:20:1233:22 | out : Bag [<element>] : String | provenance |  |
-| Test.java:1232:33:1232:34 | in : TreeBag [<element>] : String | Test.java:1232:10:1232:35 | collectionBag(...) : Bag [<element>] : String | provenance | MaD:397 |
+| Test.java:1232:33:1232:34 | in : TreeBag [<element>] : String | Test.java:1232:10:1232:35 | collectionBag(...) : Bag [<element>] : String | provenance | MaD:472 |
 | Test.java:1233:20:1233:22 | out : Bag [<element>] : String | Test.java:230:19:230:32 | it : Bag [<element>] : String | provenance |  |
-| Test.java:1233:20:1233:22 | out : Bag [<element>] : String | Test.java:1233:9:1233:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:1233:20:1233:22 | out : Bag [<element>] : String | Test.java:1233:9:1233:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:1238:13:1238:51 | newTreeBagWithElement(...) : TreeBag [<element>] : String | Test.java:1239:33:1239:34 | in : TreeBag [<element>] : String | provenance |  |
 | Test.java:1238:35:1238:50 | (...)... : String | Test.java:267:39:267:47 | element : String | provenance |  |
-| Test.java:1238:35:1238:50 | (...)... : String | Test.java:1238:13:1238:51 | newTreeBagWithElement(...) : TreeBag [<element>] : String | provenance | MaD:2 |
-| Test.java:1238:35:1238:50 | (...)... : String | Test.java:1238:13:1238:51 | newTreeBagWithElement(...) : TreeBag [<element>] : String | provenance | MaD:395 |
+| Test.java:1238:35:1238:50 | (...)... : String | Test.java:1238:13:1238:51 | newTreeBagWithElement(...) : TreeBag [<element>] : String | provenance | MaD:4 |
+| Test.java:1238:35:1238:50 | (...)... : String | Test.java:1238:13:1238:51 | newTreeBagWithElement(...) : TreeBag [<element>] : String | provenance | MaD:470 |
 | Test.java:1238:43:1238:50 | source(...) : Object | Test.java:1238:35:1238:50 | (...)... : String | provenance |  |
 | Test.java:1239:10:1239:41 | predicatedBag(...) : Bag [<element>] : String | Test.java:1240:20:1240:22 | out : Bag [<element>] : String | provenance |  |
-| Test.java:1239:33:1239:34 | in : TreeBag [<element>] : String | Test.java:1239:10:1239:41 | predicatedBag(...) : Bag [<element>] : String | provenance | MaD:398 |
+| Test.java:1239:33:1239:34 | in : TreeBag [<element>] : String | Test.java:1239:10:1239:41 | predicatedBag(...) : Bag [<element>] : String | provenance | MaD:473 |
 | Test.java:1240:20:1240:22 | out : Bag [<element>] : String | Test.java:230:19:230:32 | it : Bag [<element>] : String | provenance |  |
-| Test.java:1240:20:1240:22 | out : Bag [<element>] : String | Test.java:1240:9:1240:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:1240:20:1240:22 | out : Bag [<element>] : String | Test.java:1240:9:1240:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:1245:19:1245:57 | newTreeBagWithElement(...) : TreeBag [<element>] : String | Test.java:1246:39:1246:40 | in : TreeBag [<element>] : String | provenance |  |
 | Test.java:1245:41:1245:56 | (...)... : String | Test.java:267:39:267:47 | element : String | provenance |  |
-| Test.java:1245:41:1245:56 | (...)... : String | Test.java:1245:19:1245:57 | newTreeBagWithElement(...) : TreeBag [<element>] : String | provenance | MaD:2 |
-| Test.java:1245:41:1245:56 | (...)... : String | Test.java:1245:19:1245:57 | newTreeBagWithElement(...) : TreeBag [<element>] : String | provenance | MaD:395 |
+| Test.java:1245:41:1245:56 | (...)... : String | Test.java:1245:19:1245:57 | newTreeBagWithElement(...) : TreeBag [<element>] : String | provenance | MaD:4 |
+| Test.java:1245:41:1245:56 | (...)... : String | Test.java:1245:19:1245:57 | newTreeBagWithElement(...) : TreeBag [<element>] : String | provenance | MaD:470 |
 | Test.java:1245:49:1245:56 | source(...) : Object | Test.java:1245:41:1245:56 | (...)... : String | provenance |  |
 | Test.java:1246:10:1246:47 | predicatedSortedBag(...) : SortedBag [<element>] : String | Test.java:1247:20:1247:22 | out : SortedBag [<element>] : String | provenance |  |
-| Test.java:1246:39:1246:40 | in : TreeBag [<element>] : String | Test.java:1246:10:1246:47 | predicatedSortedBag(...) : SortedBag [<element>] : String | provenance | MaD:399 |
+| Test.java:1246:39:1246:40 | in : TreeBag [<element>] : String | Test.java:1246:10:1246:47 | predicatedSortedBag(...) : SortedBag [<element>] : String | provenance | MaD:474 |
 | Test.java:1247:20:1247:22 | out : SortedBag [<element>] : String | Test.java:230:19:230:32 | it : SortedBag [<element>] : String | provenance |  |
-| Test.java:1247:20:1247:22 | out : SortedBag [<element>] : String | Test.java:1247:9:1247:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:1247:20:1247:22 | out : SortedBag [<element>] : String | Test.java:1247:9:1247:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:1252:13:1252:51 | newTreeBagWithElement(...) : TreeBag [<element>] : String | Test.java:1253:35:1253:36 | in : TreeBag [<element>] : String | provenance |  |
 | Test.java:1252:35:1252:50 | (...)... : String | Test.java:267:39:267:47 | element : String | provenance |  |
-| Test.java:1252:35:1252:50 | (...)... : String | Test.java:1252:13:1252:51 | newTreeBagWithElement(...) : TreeBag [<element>] : String | provenance | MaD:2 |
-| Test.java:1252:35:1252:50 | (...)... : String | Test.java:1252:13:1252:51 | newTreeBagWithElement(...) : TreeBag [<element>] : String | provenance | MaD:395 |
+| Test.java:1252:35:1252:50 | (...)... : String | Test.java:1252:13:1252:51 | newTreeBagWithElement(...) : TreeBag [<element>] : String | provenance | MaD:4 |
+| Test.java:1252:35:1252:50 | (...)... : String | Test.java:1252:13:1252:51 | newTreeBagWithElement(...) : TreeBag [<element>] : String | provenance | MaD:470 |
 | Test.java:1252:43:1252:50 | source(...) : Object | Test.java:1252:35:1252:50 | (...)... : String | provenance |  |
 | Test.java:1253:10:1253:37 | synchronizedBag(...) : Bag [<element>] : String | Test.java:1254:20:1254:22 | out : Bag [<element>] : String | provenance |  |
-| Test.java:1253:35:1253:36 | in : TreeBag [<element>] : String | Test.java:1253:10:1253:37 | synchronizedBag(...) : Bag [<element>] : String | provenance | MaD:400 |
+| Test.java:1253:35:1253:36 | in : TreeBag [<element>] : String | Test.java:1253:10:1253:37 | synchronizedBag(...) : Bag [<element>] : String | provenance | MaD:475 |
 | Test.java:1254:20:1254:22 | out : Bag [<element>] : String | Test.java:230:19:230:32 | it : Bag [<element>] : String | provenance |  |
-| Test.java:1254:20:1254:22 | out : Bag [<element>] : String | Test.java:1254:9:1254:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:1254:20:1254:22 | out : Bag [<element>] : String | Test.java:1254:9:1254:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:1259:19:1259:57 | newTreeBagWithElement(...) : TreeBag [<element>] : String | Test.java:1260:41:1260:42 | in : TreeBag [<element>] : String | provenance |  |
 | Test.java:1259:41:1259:56 | (...)... : String | Test.java:267:39:267:47 | element : String | provenance |  |
-| Test.java:1259:41:1259:56 | (...)... : String | Test.java:1259:19:1259:57 | newTreeBagWithElement(...) : TreeBag [<element>] : String | provenance | MaD:2 |
-| Test.java:1259:41:1259:56 | (...)... : String | Test.java:1259:19:1259:57 | newTreeBagWithElement(...) : TreeBag [<element>] : String | provenance | MaD:395 |
+| Test.java:1259:41:1259:56 | (...)... : String | Test.java:1259:19:1259:57 | newTreeBagWithElement(...) : TreeBag [<element>] : String | provenance | MaD:4 |
+| Test.java:1259:41:1259:56 | (...)... : String | Test.java:1259:19:1259:57 | newTreeBagWithElement(...) : TreeBag [<element>] : String | provenance | MaD:470 |
 | Test.java:1259:49:1259:56 | source(...) : Object | Test.java:1259:41:1259:56 | (...)... : String | provenance |  |
 | Test.java:1260:10:1260:43 | synchronizedSortedBag(...) : SortedBag [<element>] : String | Test.java:1261:20:1261:22 | out : SortedBag [<element>] : String | provenance |  |
-| Test.java:1260:41:1260:42 | in : TreeBag [<element>] : String | Test.java:1260:10:1260:43 | synchronizedSortedBag(...) : SortedBag [<element>] : String | provenance | MaD:401 |
+| Test.java:1260:41:1260:42 | in : TreeBag [<element>] : String | Test.java:1260:10:1260:43 | synchronizedSortedBag(...) : SortedBag [<element>] : String | provenance | MaD:476 |
 | Test.java:1261:20:1261:22 | out : SortedBag [<element>] : String | Test.java:230:19:230:32 | it : SortedBag [<element>] : String | provenance |  |
-| Test.java:1261:20:1261:22 | out : SortedBag [<element>] : String | Test.java:1261:9:1261:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:1261:20:1261:22 | out : SortedBag [<element>] : String | Test.java:1261:9:1261:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:1266:13:1266:51 | newTreeBagWithElement(...) : TreeBag [<element>] : String | Test.java:1267:35:1267:36 | in : TreeBag [<element>] : String | provenance |  |
 | Test.java:1266:35:1266:50 | (...)... : String | Test.java:267:39:267:47 | element : String | provenance |  |
-| Test.java:1266:35:1266:50 | (...)... : String | Test.java:1266:13:1266:51 | newTreeBagWithElement(...) : TreeBag [<element>] : String | provenance | MaD:2 |
-| Test.java:1266:35:1266:50 | (...)... : String | Test.java:1266:13:1266:51 | newTreeBagWithElement(...) : TreeBag [<element>] : String | provenance | MaD:395 |
+| Test.java:1266:35:1266:50 | (...)... : String | Test.java:1266:13:1266:51 | newTreeBagWithElement(...) : TreeBag [<element>] : String | provenance | MaD:4 |
+| Test.java:1266:35:1266:50 | (...)... : String | Test.java:1266:13:1266:51 | newTreeBagWithElement(...) : TreeBag [<element>] : String | provenance | MaD:470 |
 | Test.java:1266:43:1266:50 | source(...) : Object | Test.java:1266:35:1266:50 | (...)... : String | provenance |  |
 | Test.java:1267:10:1267:43 | transformingBag(...) : Bag [<element>] : String | Test.java:1268:20:1268:22 | out : Bag [<element>] : String | provenance |  |
-| Test.java:1267:35:1267:36 | in : TreeBag [<element>] : String | Test.java:1267:10:1267:43 | transformingBag(...) : Bag [<element>] : String | provenance | MaD:402 |
+| Test.java:1267:35:1267:36 | in : TreeBag [<element>] : String | Test.java:1267:10:1267:43 | transformingBag(...) : Bag [<element>] : String | provenance | MaD:477 |
 | Test.java:1268:20:1268:22 | out : Bag [<element>] : String | Test.java:230:19:230:32 | it : Bag [<element>] : String | provenance |  |
-| Test.java:1268:20:1268:22 | out : Bag [<element>] : String | Test.java:1268:9:1268:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:1268:20:1268:22 | out : Bag [<element>] : String | Test.java:1268:9:1268:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:1273:19:1273:57 | newTreeBagWithElement(...) : TreeBag [<element>] : String | Test.java:1274:41:1274:42 | in : TreeBag [<element>] : String | provenance |  |
 | Test.java:1273:41:1273:56 | (...)... : String | Test.java:267:39:267:47 | element : String | provenance |  |
-| Test.java:1273:41:1273:56 | (...)... : String | Test.java:1273:19:1273:57 | newTreeBagWithElement(...) : TreeBag [<element>] : String | provenance | MaD:2 |
-| Test.java:1273:41:1273:56 | (...)... : String | Test.java:1273:19:1273:57 | newTreeBagWithElement(...) : TreeBag [<element>] : String | provenance | MaD:395 |
+| Test.java:1273:41:1273:56 | (...)... : String | Test.java:1273:19:1273:57 | newTreeBagWithElement(...) : TreeBag [<element>] : String | provenance | MaD:4 |
+| Test.java:1273:41:1273:56 | (...)... : String | Test.java:1273:19:1273:57 | newTreeBagWithElement(...) : TreeBag [<element>] : String | provenance | MaD:470 |
 | Test.java:1273:49:1273:56 | source(...) : Object | Test.java:1273:41:1273:56 | (...)... : String | provenance |  |
 | Test.java:1274:10:1274:49 | transformingSortedBag(...) : SortedBag [<element>] : String | Test.java:1275:20:1275:22 | out : SortedBag [<element>] : String | provenance |  |
-| Test.java:1274:41:1274:42 | in : TreeBag [<element>] : String | Test.java:1274:10:1274:49 | transformingSortedBag(...) : SortedBag [<element>] : String | provenance | MaD:403 |
+| Test.java:1274:41:1274:42 | in : TreeBag [<element>] : String | Test.java:1274:10:1274:49 | transformingSortedBag(...) : SortedBag [<element>] : String | provenance | MaD:478 |
 | Test.java:1275:20:1275:22 | out : SortedBag [<element>] : String | Test.java:230:19:230:32 | it : SortedBag [<element>] : String | provenance |  |
-| Test.java:1275:20:1275:22 | out : SortedBag [<element>] : String | Test.java:1275:9:1275:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:1275:20:1275:22 | out : SortedBag [<element>] : String | Test.java:1275:9:1275:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:1280:13:1280:51 | newTreeBagWithElement(...) : TreeBag [<element>] : String | Test.java:1281:35:1281:36 | in : TreeBag [<element>] : String | provenance |  |
 | Test.java:1280:35:1280:50 | (...)... : String | Test.java:267:39:267:47 | element : String | provenance |  |
-| Test.java:1280:35:1280:50 | (...)... : String | Test.java:1280:13:1280:51 | newTreeBagWithElement(...) : TreeBag [<element>] : String | provenance | MaD:2 |
-| Test.java:1280:35:1280:50 | (...)... : String | Test.java:1280:13:1280:51 | newTreeBagWithElement(...) : TreeBag [<element>] : String | provenance | MaD:395 |
+| Test.java:1280:35:1280:50 | (...)... : String | Test.java:1280:13:1280:51 | newTreeBagWithElement(...) : TreeBag [<element>] : String | provenance | MaD:4 |
+| Test.java:1280:35:1280:50 | (...)... : String | Test.java:1280:13:1280:51 | newTreeBagWithElement(...) : TreeBag [<element>] : String | provenance | MaD:470 |
 | Test.java:1280:43:1280:50 | source(...) : Object | Test.java:1280:35:1280:50 | (...)... : String | provenance |  |
 | Test.java:1281:10:1281:37 | unmodifiableBag(...) : Bag [<element>] : String | Test.java:1282:20:1282:22 | out : Bag [<element>] : String | provenance |  |
-| Test.java:1281:35:1281:36 | in : TreeBag [<element>] : String | Test.java:1281:10:1281:37 | unmodifiableBag(...) : Bag [<element>] : String | provenance | MaD:404 |
+| Test.java:1281:35:1281:36 | in : TreeBag [<element>] : String | Test.java:1281:10:1281:37 | unmodifiableBag(...) : Bag [<element>] : String | provenance | MaD:479 |
 | Test.java:1282:20:1282:22 | out : Bag [<element>] : String | Test.java:230:19:230:32 | it : Bag [<element>] : String | provenance |  |
-| Test.java:1282:20:1282:22 | out : Bag [<element>] : String | Test.java:1282:9:1282:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:1282:20:1282:22 | out : Bag [<element>] : String | Test.java:1282:9:1282:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:1287:19:1287:57 | newTreeBagWithElement(...) : TreeBag [<element>] : String | Test.java:1288:41:1288:42 | in : TreeBag [<element>] : String | provenance |  |
 | Test.java:1287:41:1287:56 | (...)... : String | Test.java:267:39:267:47 | element : String | provenance |  |
-| Test.java:1287:41:1287:56 | (...)... : String | Test.java:1287:19:1287:57 | newTreeBagWithElement(...) : TreeBag [<element>] : String | provenance | MaD:2 |
-| Test.java:1287:41:1287:56 | (...)... : String | Test.java:1287:19:1287:57 | newTreeBagWithElement(...) : TreeBag [<element>] : String | provenance | MaD:395 |
+| Test.java:1287:41:1287:56 | (...)... : String | Test.java:1287:19:1287:57 | newTreeBagWithElement(...) : TreeBag [<element>] : String | provenance | MaD:4 |
+| Test.java:1287:41:1287:56 | (...)... : String | Test.java:1287:19:1287:57 | newTreeBagWithElement(...) : TreeBag [<element>] : String | provenance | MaD:470 |
 | Test.java:1287:49:1287:56 | source(...) : Object | Test.java:1287:41:1287:56 | (...)... : String | provenance |  |
 | Test.java:1288:10:1288:43 | unmodifiableSortedBag(...) : SortedBag [<element>] : String | Test.java:1289:20:1289:22 | out : SortedBag [<element>] : String | provenance |  |
-| Test.java:1288:41:1288:42 | in : TreeBag [<element>] : String | Test.java:1288:10:1288:43 | unmodifiableSortedBag(...) : SortedBag [<element>] : String | provenance | MaD:405 |
+| Test.java:1288:41:1288:42 | in : TreeBag [<element>] : String | Test.java:1288:10:1288:43 | unmodifiableSortedBag(...) : SortedBag [<element>] : String | provenance | MaD:480 |
 | Test.java:1289:20:1289:22 | out : SortedBag [<element>] : String | Test.java:230:19:230:32 | it : SortedBag [<element>] : String | provenance |  |
-| Test.java:1289:20:1289:22 | out : SortedBag [<element>] : String | Test.java:1289:9:1289:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:1289:20:1289:22 | out : SortedBag [<element>] : String | Test.java:1289:9:1289:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:1294:17:1294:58 | newTreeBidiMapWithMapKey(...) : TreeBidiMap [<map.key>] : String | Test.java:1295:10:1295:11 | in : TreeBidiMap [<map.key>] : String | provenance |  |
 | Test.java:1294:42:1294:57 | (...)... : String | Test.java:287:75:287:79 | key : String | provenance |  |
-| Test.java:1294:42:1294:57 | (...)... : String | Test.java:1294:17:1294:58 | newTreeBidiMapWithMapKey(...) : TreeBidiMap [<map.key>] : String | provenance | MaD:14 |
-| Test.java:1294:42:1294:57 | (...)... : String | Test.java:1294:17:1294:58 | newTreeBidiMapWithMapKey(...) : TreeBidiMap [<map.key>] : String | provenance | MaD:705 |
+| Test.java:1294:42:1294:57 | (...)... : String | Test.java:1294:17:1294:58 | newTreeBidiMapWithMapKey(...) : TreeBidiMap [<map.key>] : String | provenance | MaD:19 |
+| Test.java:1294:42:1294:57 | (...)... : String | Test.java:1294:17:1294:58 | newTreeBidiMapWithMapKey(...) : TreeBidiMap [<map.key>] : String | provenance | MaD:779 |
 | Test.java:1294:50:1294:57 | source(...) : Object | Test.java:1294:42:1294:57 | (...)... : String | provenance |  |
-| Test.java:1295:10:1295:11 | in : TreeBidiMap [<map.key>] : String | Test.java:1295:10:1295:24 | getKey(...) : String | provenance | MaD:406 |
+| Test.java:1295:10:1295:11 | in : TreeBidiMap [<map.key>] : String | Test.java:1295:10:1295:24 | getKey(...) : String | provenance | MaD:481 |
 | Test.java:1295:10:1295:24 | getKey(...) : String | Test.java:1296:9:1296:11 | out | provenance |  |
 | Test.java:1301:17:1301:58 | newTreeBidiMapWithMapKey(...) : TreeBidiMap [<map.key>] : String | Test.java:1302:10:1302:11 | in : TreeBidiMap [<map.key>] : String | provenance |  |
 | Test.java:1301:42:1301:57 | (...)... : String | Test.java:287:75:287:79 | key : String | provenance |  |
-| Test.java:1301:42:1301:57 | (...)... : String | Test.java:1301:17:1301:58 | newTreeBidiMapWithMapKey(...) : TreeBidiMap [<map.key>] : String | provenance | MaD:14 |
-| Test.java:1301:42:1301:57 | (...)... : String | Test.java:1301:17:1301:58 | newTreeBidiMapWithMapKey(...) : TreeBidiMap [<map.key>] : String | provenance | MaD:705 |
+| Test.java:1301:42:1301:57 | (...)... : String | Test.java:1301:17:1301:58 | newTreeBidiMapWithMapKey(...) : TreeBidiMap [<map.key>] : String | provenance | MaD:19 |
+| Test.java:1301:42:1301:57 | (...)... : String | Test.java:1301:17:1301:58 | newTreeBidiMapWithMapKey(...) : TreeBidiMap [<map.key>] : String | provenance | MaD:779 |
 | Test.java:1301:50:1301:57 | source(...) : Object | Test.java:1301:42:1301:57 | (...)... : String | provenance |  |
-| Test.java:1302:10:1302:11 | in : TreeBidiMap [<map.key>] : String | Test.java:1302:10:1302:28 | inverseBidiMap(...) : BidiMap [<map.value>] : String | provenance | MaD:407 |
+| Test.java:1302:10:1302:11 | in : TreeBidiMap [<map.key>] : String | Test.java:1302:10:1302:28 | inverseBidiMap(...) : BidiMap [<map.value>] : String | provenance | MaD:482 |
 | Test.java:1302:10:1302:28 | inverseBidiMap(...) : BidiMap [<map.value>] : String | Test.java:1303:21:1303:23 | out : BidiMap [<map.value>] : String | provenance |  |
 | Test.java:1303:21:1303:23 | out : BidiMap [<map.value>] : String | Test.java:232:20:232:31 | map : BidiMap [<map.value>] : String | provenance |  |
-| Test.java:1303:21:1303:23 | out : BidiMap [<map.value>] : String | Test.java:1303:9:1303:24 | getMapValue(...) | provenance | MaD:9 |
+| Test.java:1303:21:1303:23 | out : BidiMap [<map.value>] : String | Test.java:1303:9:1303:24 | getMapValue(...) | provenance | MaD:17 |
 | Test.java:1308:17:1308:60 | newTreeBidiMapWithMapValue(...) : TreeBidiMap [<map.value>] : String | Test.java:1309:10:1309:11 | in : TreeBidiMap [<map.value>] : String | provenance |  |
 | Test.java:1308:44:1308:59 | (...)... : String | Test.java:306:77:306:83 | value : String | provenance |  |
-| Test.java:1308:44:1308:59 | (...)... : String | Test.java:1308:17:1308:60 | newTreeBidiMapWithMapValue(...) : TreeBidiMap [<map.value>] : String | provenance | MaD:15 |
-| Test.java:1308:44:1308:59 | (...)... : String | Test.java:1308:17:1308:60 | newTreeBidiMapWithMapValue(...) : TreeBidiMap [<map.value>] : String | provenance | MaD:706 |
+| Test.java:1308:44:1308:59 | (...)... : String | Test.java:1308:17:1308:60 | newTreeBidiMapWithMapValue(...) : TreeBidiMap [<map.value>] : String | provenance | MaD:20 |
+| Test.java:1308:44:1308:59 | (...)... : String | Test.java:1308:17:1308:60 | newTreeBidiMapWithMapValue(...) : TreeBidiMap [<map.value>] : String | provenance | MaD:780 |
 | Test.java:1308:52:1308:59 | source(...) : Object | Test.java:1308:44:1308:59 | (...)... : String | provenance |  |
-| Test.java:1309:10:1309:11 | in : TreeBidiMap [<map.value>] : String | Test.java:1309:10:1309:28 | inverseBidiMap(...) : BidiMap [<map.key>] : String | provenance | MaD:408 |
+| Test.java:1309:10:1309:11 | in : TreeBidiMap [<map.value>] : String | Test.java:1309:10:1309:28 | inverseBidiMap(...) : BidiMap [<map.key>] : String | provenance | MaD:483 |
 | Test.java:1309:10:1309:28 | inverseBidiMap(...) : BidiMap [<map.key>] : String | Test.java:1310:19:1310:21 | out : BidiMap [<map.key>] : String | provenance |  |
 | Test.java:1310:19:1310:21 | out : BidiMap [<map.key>] : String | Test.java:228:18:228:29 | map : BidiMap [<map.key>] : String | provenance |  |
-| Test.java:1310:19:1310:21 | out : BidiMap [<map.key>] : String | Test.java:1310:9:1310:22 | getMapKey(...) | provenance | MaD:10 |
+| Test.java:1310:19:1310:21 | out : BidiMap [<map.key>] : String | Test.java:1310:9:1310:22 | getMapKey(...) | provenance | MaD:18 |
 | Test.java:1315:17:1315:58 | newTreeBidiMapWithMapKey(...) : TreeBidiMap [<map.key>] : String | Test.java:1316:10:1316:11 | in : TreeBidiMap [<map.key>] : String | provenance |  |
 | Test.java:1315:42:1315:57 | (...)... : String | Test.java:287:75:287:79 | key : String | provenance |  |
-| Test.java:1315:42:1315:57 | (...)... : String | Test.java:1315:17:1315:58 | newTreeBidiMapWithMapKey(...) : TreeBidiMap [<map.key>] : String | provenance | MaD:14 |
-| Test.java:1315:42:1315:57 | (...)... : String | Test.java:1315:17:1315:58 | newTreeBidiMapWithMapKey(...) : TreeBidiMap [<map.key>] : String | provenance | MaD:705 |
+| Test.java:1315:42:1315:57 | (...)... : String | Test.java:1315:17:1315:58 | newTreeBidiMapWithMapKey(...) : TreeBidiMap [<map.key>] : String | provenance | MaD:19 |
+| Test.java:1315:42:1315:57 | (...)... : String | Test.java:1315:17:1315:58 | newTreeBidiMapWithMapKey(...) : TreeBidiMap [<map.key>] : String | provenance | MaD:779 |
 | Test.java:1315:50:1315:57 | source(...) : Object | Test.java:1315:42:1315:57 | (...)... : String | provenance |  |
-| Test.java:1316:10:1316:11 | in : TreeBidiMap [<map.key>] : String | Test.java:1316:10:1316:29 | removeValue(...) : String | provenance | MaD:409 |
+| Test.java:1316:10:1316:11 | in : TreeBidiMap [<map.key>] : String | Test.java:1316:10:1316:29 | removeValue(...) : String | provenance | MaD:484 |
 | Test.java:1316:10:1316:29 | removeValue(...) : String | Test.java:1317:9:1317:11 | out | provenance |  |
 | Test.java:1322:21:1322:63 | newEnumerationWithElement(...) : IteratorEnumeration [<element>] : String | Test.java:1323:32:1323:33 | in : IteratorEnumeration [<element>] : String | provenance |  |
 | Test.java:1322:47:1322:62 | (...)... : String | Test.java:256:47:256:55 | element : String | provenance |  |
-| Test.java:1322:47:1322:62 | (...)... : String | Test.java:1322:21:1322:63 | newEnumerationWithElement(...) : IteratorEnumeration [<element>] : String | provenance | MaD:2 |
+| Test.java:1322:47:1322:62 | (...)... : String | Test.java:1322:21:1322:63 | newEnumerationWithElement(...) : IteratorEnumeration [<element>] : String | provenance | MaD:4 |
 | Test.java:1322:55:1322:62 | source(...) : Object | Test.java:1322:47:1322:62 | (...)... : String | provenance |  |
 | Test.java:1323:27:1323:29 | out [post update] : Collection [<element>] : String | Test.java:1324:20:1324:22 | out : Collection [<element>] : String | provenance |  |
-| Test.java:1323:32:1323:33 | in : IteratorEnumeration [<element>] : String | Test.java:1323:27:1323:29 | out [post update] : Collection [<element>] : String | provenance | MaD:410 |
+| Test.java:1323:32:1323:33 | in : IteratorEnumeration [<element>] : String | Test.java:1323:27:1323:29 | out [post update] : Collection [<element>] : String | provenance | MaD:485 |
 | Test.java:1324:20:1324:22 | out : Collection [<element>] : String | Test.java:230:19:230:32 | it : Collection [<element>] : String | provenance |  |
-| Test.java:1324:20:1324:22 | out : Collection [<element>] : String | Test.java:1324:9:1324:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:1324:20:1324:22 | out : Collection [<element>] : String | Test.java:1324:9:1324:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:1329:18:1329:55 | newVectorWithElement(...) : Vector [<element>] : String | Test.java:1330:32:1330:33 | in : Vector [<element>] : String | provenance |  |
 | Test.java:1329:39:1329:54 | (...)... : String | Test.java:269:37:269:45 | element : String | provenance |  |
-| Test.java:1329:39:1329:54 | (...)... : String | Test.java:1329:18:1329:55 | newVectorWithElement(...) : Vector [<element>] : String | provenance | MaD:2 |
+| Test.java:1329:39:1329:54 | (...)... : String | Test.java:1329:18:1329:55 | newVectorWithElement(...) : Vector [<element>] : String | provenance | MaD:4 |
 | Test.java:1329:47:1329:54 | source(...) : Object | Test.java:1329:39:1329:54 | (...)... : String | provenance |  |
 | Test.java:1330:27:1330:29 | out [post update] : Collection [<element>] : String | Test.java:1331:20:1331:22 | out : Collection [<element>] : String | provenance |  |
-| Test.java:1330:32:1330:33 | in : Vector [<element>] : String | Test.java:1330:27:1330:29 | out [post update] : Collection [<element>] : String | provenance | MaD:411 |
+| Test.java:1330:32:1330:33 | in : Vector [<element>] : String | Test.java:1330:27:1330:29 | out [post update] : Collection [<element>] : String | provenance | MaD:486 |
 | Test.java:1331:20:1331:22 | out : Collection [<element>] : String | Test.java:230:19:230:32 | it : Collection [<element>] : String | provenance |  |
-| Test.java:1331:20:1331:22 | out : Collection [<element>] : String | Test.java:1331:9:1331:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:1331:20:1331:22 | out : Collection [<element>] : String | Test.java:1331:9:1331:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:1336:18:1336:61 | newListIteratorWithElement(...) : ListIterator [<element>] : String | Test.java:1337:32:1337:33 | in : ListIterator [<element>] : String | provenance |  |
 | Test.java:1336:45:1336:60 | (...)... : String | Test.java:259:49:259:57 | element : String | provenance |  |
-| Test.java:1336:45:1336:60 | (...)... : String | Test.java:1336:18:1336:61 | newListIteratorWithElement(...) : ListIterator [<element>] : String | provenance | MaD:2 |
+| Test.java:1336:45:1336:60 | (...)... : String | Test.java:1336:18:1336:61 | newListIteratorWithElement(...) : ListIterator [<element>] : String | provenance | MaD:4 |
 | Test.java:1336:53:1336:60 | source(...) : Object | Test.java:1336:45:1336:60 | (...)... : String | provenance |  |
 | Test.java:1337:27:1337:29 | out [post update] : Collection [<element>] : String | Test.java:1338:20:1338:22 | out : Collection [<element>] : String | provenance |  |
-| Test.java:1337:32:1337:33 | in : ListIterator [<element>] : String | Test.java:1337:27:1337:29 | out [post update] : Collection [<element>] : String | provenance | MaD:412 |
+| Test.java:1337:32:1337:33 | in : ListIterator [<element>] : String | Test.java:1337:27:1337:29 | out [post update] : Collection [<element>] : String | provenance | MaD:487 |
 | Test.java:1338:20:1338:22 | out : Collection [<element>] : String | Test.java:230:19:230:32 | it : Collection [<element>] : String | provenance |  |
-| Test.java:1338:20:1338:22 | out : Collection [<element>] : String | Test.java:1338:9:1338:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:1338:20:1338:22 | out : Collection [<element>] : String | Test.java:1338:9:1338:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:1343:18:1343:54 | newWithArrayElement(...) : Object[] [[]] : String | Test.java:1344:32:1344:33 | in : Object[] [[]] : String | provenance |  |
 | Test.java:1343:38:1343:53 | (...)... : String | Test.java:251:31:251:44 | element : String | provenance |  |
 | Test.java:1343:38:1343:53 | (...)... : String | Test.java:1343:18:1343:54 | newWithArrayElement(...) : Object[] [[]] : String | provenance |  |
 | Test.java:1343:46:1343:53 | source(...) : Object | Test.java:1343:38:1343:53 | (...)... : String | provenance |  |
 | Test.java:1344:27:1344:29 | out [post update] : Collection [<element>] : String | Test.java:1345:20:1345:22 | out : Collection [<element>] : String | provenance |  |
-| Test.java:1344:32:1344:33 | in : Object[] [[]] : String | Test.java:1344:27:1344:29 | out [post update] : Collection [<element>] : String | provenance | MaD:413 |
+| Test.java:1344:32:1344:33 | in : Object[] [[]] : String | Test.java:1344:27:1344:29 | out [post update] : Collection [<element>] : String | provenance | MaD:488 |
 | Test.java:1345:20:1345:22 | out : Collection [<element>] : String | Test.java:230:19:230:32 | it : Collection [<element>] : String | provenance |  |
-| Test.java:1345:20:1345:22 | out : Collection [<element>] : String | Test.java:1345:9:1345:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:1345:20:1345:22 | out : Collection [<element>] : String | Test.java:1345:9:1345:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:1350:16:1350:23 | source(...) : Object | Test.java:1351:39:1351:40 | in : Object | provenance |  |
 | Test.java:1351:34:1351:36 | out [post update] : Collection [<element>] : Object | Test.java:1352:20:1352:22 | out : Collection [<element>] : Object | provenance |  |
-| Test.java:1351:39:1351:40 | in : Object | Test.java:1351:34:1351:36 | out [post update] : Collection [<element>] : Object | provenance | MaD:414 |
+| Test.java:1351:39:1351:40 | in : Object | Test.java:1351:34:1351:36 | out [post update] : Collection [<element>] : Object | provenance | MaD:489 |
 | Test.java:1352:20:1352:22 | out : Collection [<element>] : Object | Test.java:230:19:230:32 | it : Collection [<element>] : Object | provenance |  |
-| Test.java:1352:20:1352:22 | out : Collection [<element>] : Object | Test.java:1352:9:1352:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:1352:20:1352:22 | out : Collection [<element>] : Object | Test.java:1352:9:1352:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:1357:18:1357:55 | newVectorWithElement(...) : Vector [<element>] : String | Test.java:1358:34:1358:35 | in : Vector [<element>] : String | provenance |  |
 | Test.java:1357:39:1357:54 | (...)... : String | Test.java:269:37:269:45 | element : String | provenance |  |
-| Test.java:1357:39:1357:54 | (...)... : String | Test.java:1357:18:1357:55 | newVectorWithElement(...) : Vector [<element>] : String | provenance | MaD:2 |
+| Test.java:1357:39:1357:54 | (...)... : String | Test.java:1357:18:1357:55 | newVectorWithElement(...) : Vector [<element>] : String | provenance | MaD:4 |
 | Test.java:1357:47:1357:54 | source(...) : Object | Test.java:1357:39:1357:54 | (...)... : String | provenance |  |
 | Test.java:1358:10:1358:55 | collate(...) : List [<element>] : String | Test.java:1359:20:1359:22 | out : List [<element>] : String | provenance |  |
-| Test.java:1358:34:1358:35 | in : Vector [<element>] : String | Test.java:1358:10:1358:55 | collate(...) : List [<element>] : String | provenance | MaD:415 |
+| Test.java:1358:34:1358:35 | in : Vector [<element>] : String | Test.java:1358:10:1358:55 | collate(...) : List [<element>] : String | provenance | MaD:490 |
 | Test.java:1359:20:1359:22 | out : List [<element>] : String | Test.java:230:19:230:32 | it : List [<element>] : String | provenance |  |
-| Test.java:1359:20:1359:22 | out : List [<element>] : String | Test.java:1359:9:1359:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:1359:20:1359:22 | out : List [<element>] : String | Test.java:1359:9:1359:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:1364:18:1364:55 | newVectorWithElement(...) : Vector [<element>] : String | Test.java:1365:34:1365:35 | in : Vector [<element>] : String | provenance |  |
 | Test.java:1364:39:1364:54 | (...)... : String | Test.java:269:37:269:45 | element : String | provenance |  |
-| Test.java:1364:39:1364:54 | (...)... : String | Test.java:1364:18:1364:55 | newVectorWithElement(...) : Vector [<element>] : String | provenance | MaD:2 |
+| Test.java:1364:39:1364:54 | (...)... : String | Test.java:1364:18:1364:55 | newVectorWithElement(...) : Vector [<element>] : String | provenance | MaD:4 |
 | Test.java:1364:47:1364:54 | source(...) : Object | Test.java:1364:39:1364:54 | (...)... : String | provenance |  |
 | Test.java:1365:10:1365:42 | collate(...) : List [<element>] : String | Test.java:1366:20:1366:22 | out : List [<element>] : String | provenance |  |
-| Test.java:1365:34:1365:35 | in : Vector [<element>] : String | Test.java:1365:10:1365:42 | collate(...) : List [<element>] : String | provenance | MaD:415 |
+| Test.java:1365:34:1365:35 | in : Vector [<element>] : String | Test.java:1365:10:1365:42 | collate(...) : List [<element>] : String | provenance | MaD:490 |
 | Test.java:1366:20:1366:22 | out : List [<element>] : String | Test.java:230:19:230:32 | it : List [<element>] : String | provenance |  |
-| Test.java:1366:20:1366:22 | out : List [<element>] : String | Test.java:1366:9:1366:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:1366:20:1366:22 | out : List [<element>] : String | Test.java:1366:9:1366:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:1371:18:1371:55 | newVectorWithElement(...) : Vector [<element>] : String | Test.java:1372:34:1372:35 | in : Vector [<element>] : String | provenance |  |
 | Test.java:1371:39:1371:54 | (...)... : String | Test.java:269:37:269:45 | element : String | provenance |  |
-| Test.java:1371:39:1371:54 | (...)... : String | Test.java:1371:18:1371:55 | newVectorWithElement(...) : Vector [<element>] : String | provenance | MaD:2 |
+| Test.java:1371:39:1371:54 | (...)... : String | Test.java:1371:18:1371:55 | newVectorWithElement(...) : Vector [<element>] : String | provenance | MaD:4 |
 | Test.java:1371:47:1371:54 | source(...) : Object | Test.java:1371:39:1371:54 | (...)... : String | provenance |  |
 | Test.java:1372:10:1372:59 | collate(...) : List [<element>] : String | Test.java:1373:20:1373:22 | out : List [<element>] : String | provenance |  |
-| Test.java:1372:34:1372:35 | in : Vector [<element>] : String | Test.java:1372:10:1372:59 | collate(...) : List [<element>] : String | provenance | MaD:415 |
+| Test.java:1372:34:1372:35 | in : Vector [<element>] : String | Test.java:1372:10:1372:59 | collate(...) : List [<element>] : String | provenance | MaD:490 |
 | Test.java:1373:20:1373:22 | out : List [<element>] : String | Test.java:230:19:230:32 | it : List [<element>] : String | provenance |  |
-| Test.java:1373:20:1373:22 | out : List [<element>] : String | Test.java:1373:9:1373:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:1373:20:1373:22 | out : List [<element>] : String | Test.java:1373:9:1373:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:1378:18:1378:55 | newVectorWithElement(...) : Vector [<element>] : String | Test.java:1379:34:1379:35 | in : Vector [<element>] : String | provenance |  |
 | Test.java:1378:39:1378:54 | (...)... : String | Test.java:269:37:269:45 | element : String | provenance |  |
-| Test.java:1378:39:1378:54 | (...)... : String | Test.java:1378:18:1378:55 | newVectorWithElement(...) : Vector [<element>] : String | provenance | MaD:2 |
+| Test.java:1378:39:1378:54 | (...)... : String | Test.java:1378:18:1378:55 | newVectorWithElement(...) : Vector [<element>] : String | provenance | MaD:4 |
 | Test.java:1378:47:1378:54 | source(...) : Object | Test.java:1378:39:1378:54 | (...)... : String | provenance |  |
 | Test.java:1379:10:1379:70 | collate(...) : List [<element>] : String | Test.java:1380:20:1380:22 | out : List [<element>] : String | provenance |  |
-| Test.java:1379:34:1379:35 | in : Vector [<element>] : String | Test.java:1379:10:1379:70 | collate(...) : List [<element>] : String | provenance | MaD:415 |
+| Test.java:1379:34:1379:35 | in : Vector [<element>] : String | Test.java:1379:10:1379:70 | collate(...) : List [<element>] : String | provenance | MaD:490 |
 | Test.java:1380:20:1380:22 | out : List [<element>] : String | Test.java:230:19:230:32 | it : List [<element>] : String | provenance |  |
-| Test.java:1380:20:1380:22 | out : List [<element>] : String | Test.java:1380:9:1380:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:1380:20:1380:22 | out : List [<element>] : String | Test.java:1380:9:1380:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:1385:18:1385:55 | newVectorWithElement(...) : Vector [<element>] : String | Test.java:1386:40:1386:41 | in : Vector [<element>] : String | provenance |  |
 | Test.java:1385:39:1385:54 | (...)... : String | Test.java:269:37:269:45 | element : String | provenance |  |
-| Test.java:1385:39:1385:54 | (...)... : String | Test.java:1385:18:1385:55 | newVectorWithElement(...) : Vector [<element>] : String | provenance | MaD:2 |
+| Test.java:1385:39:1385:54 | (...)... : String | Test.java:1385:18:1385:55 | newVectorWithElement(...) : Vector [<element>] : String | provenance | MaD:4 |
 | Test.java:1385:47:1385:54 | source(...) : Object | Test.java:1385:39:1385:54 | (...)... : String | provenance |  |
 | Test.java:1386:10:1386:55 | collate(...) : List [<element>] : String | Test.java:1387:20:1387:22 | out : List [<element>] : String | provenance |  |
-| Test.java:1386:40:1386:41 | in : Vector [<element>] : String | Test.java:1386:10:1386:55 | collate(...) : List [<element>] : String | provenance | MaD:416 |
+| Test.java:1386:40:1386:41 | in : Vector [<element>] : String | Test.java:1386:10:1386:55 | collate(...) : List [<element>] : String | provenance | MaD:491 |
 | Test.java:1387:20:1387:22 | out : List [<element>] : String | Test.java:230:19:230:32 | it : List [<element>] : String | provenance |  |
-| Test.java:1387:20:1387:22 | out : List [<element>] : String | Test.java:1387:9:1387:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:1387:20:1387:22 | out : List [<element>] : String | Test.java:1387:9:1387:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:1392:18:1392:55 | newVectorWithElement(...) : Vector [<element>] : String | Test.java:1393:40:1393:41 | in : Vector [<element>] : String | provenance |  |
 | Test.java:1392:39:1392:54 | (...)... : String | Test.java:269:37:269:45 | element : String | provenance |  |
-| Test.java:1392:39:1392:54 | (...)... : String | Test.java:1392:18:1392:55 | newVectorWithElement(...) : Vector [<element>] : String | provenance | MaD:2 |
+| Test.java:1392:39:1392:54 | (...)... : String | Test.java:1392:18:1392:55 | newVectorWithElement(...) : Vector [<element>] : String | provenance | MaD:4 |
 | Test.java:1392:47:1392:54 | source(...) : Object | Test.java:1392:39:1392:54 | (...)... : String | provenance |  |
 | Test.java:1393:10:1393:42 | collate(...) : List [<element>] : String | Test.java:1394:20:1394:22 | out : List [<element>] : String | provenance |  |
-| Test.java:1393:40:1393:41 | in : Vector [<element>] : String | Test.java:1393:10:1393:42 | collate(...) : List [<element>] : String | provenance | MaD:416 |
+| Test.java:1393:40:1393:41 | in : Vector [<element>] : String | Test.java:1393:10:1393:42 | collate(...) : List [<element>] : String | provenance | MaD:491 |
 | Test.java:1394:20:1394:22 | out : List [<element>] : String | Test.java:230:19:230:32 | it : List [<element>] : String | provenance |  |
-| Test.java:1394:20:1394:22 | out : List [<element>] : String | Test.java:1394:9:1394:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:1394:20:1394:22 | out : List [<element>] : String | Test.java:1394:9:1394:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:1399:18:1399:55 | newVectorWithElement(...) : Vector [<element>] : String | Test.java:1400:50:1400:51 | in : Vector [<element>] : String | provenance |  |
 | Test.java:1399:39:1399:54 | (...)... : String | Test.java:269:37:269:45 | element : String | provenance |  |
-| Test.java:1399:39:1399:54 | (...)... : String | Test.java:1399:18:1399:55 | newVectorWithElement(...) : Vector [<element>] : String | provenance | MaD:2 |
+| Test.java:1399:39:1399:54 | (...)... : String | Test.java:1399:18:1399:55 | newVectorWithElement(...) : Vector [<element>] : String | provenance | MaD:4 |
 | Test.java:1399:47:1399:54 | source(...) : Object | Test.java:1399:39:1399:54 | (...)... : String | provenance |  |
 | Test.java:1400:10:1400:59 | collate(...) : List [<element>] : String | Test.java:1401:20:1401:22 | out : List [<element>] : String | provenance |  |
-| Test.java:1400:50:1400:51 | in : Vector [<element>] : String | Test.java:1400:10:1400:59 | collate(...) : List [<element>] : String | provenance | MaD:416 |
+| Test.java:1400:50:1400:51 | in : Vector [<element>] : String | Test.java:1400:10:1400:59 | collate(...) : List [<element>] : String | provenance | MaD:491 |
 | Test.java:1401:20:1401:22 | out : List [<element>] : String | Test.java:230:19:230:32 | it : List [<element>] : String | provenance |  |
-| Test.java:1401:20:1401:22 | out : List [<element>] : String | Test.java:1401:9:1401:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:1401:20:1401:22 | out : List [<element>] : String | Test.java:1401:9:1401:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:1406:18:1406:55 | newVectorWithElement(...) : Vector [<element>] : String | Test.java:1407:50:1407:51 | in : Vector [<element>] : String | provenance |  |
 | Test.java:1406:39:1406:54 | (...)... : String | Test.java:269:37:269:45 | element : String | provenance |  |
-| Test.java:1406:39:1406:54 | (...)... : String | Test.java:1406:18:1406:55 | newVectorWithElement(...) : Vector [<element>] : String | provenance | MaD:2 |
+| Test.java:1406:39:1406:54 | (...)... : String | Test.java:1406:18:1406:55 | newVectorWithElement(...) : Vector [<element>] : String | provenance | MaD:4 |
 | Test.java:1406:47:1406:54 | source(...) : Object | Test.java:1406:39:1406:54 | (...)... : String | provenance |  |
 | Test.java:1407:10:1407:70 | collate(...) : List [<element>] : String | Test.java:1408:20:1408:22 | out : List [<element>] : String | provenance |  |
-| Test.java:1407:50:1407:51 | in : Vector [<element>] : String | Test.java:1407:10:1407:70 | collate(...) : List [<element>] : String | provenance | MaD:416 |
+| Test.java:1407:50:1407:51 | in : Vector [<element>] : String | Test.java:1407:10:1407:70 | collate(...) : List [<element>] : String | provenance | MaD:491 |
 | Test.java:1408:20:1408:22 | out : List [<element>] : String | Test.java:230:19:230:32 | it : List [<element>] : String | provenance |  |
-| Test.java:1408:20:1408:22 | out : List [<element>] : String | Test.java:1408:9:1408:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:1408:20:1408:22 | out : List [<element>] : String | Test.java:1408:9:1408:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:1413:18:1413:55 | newVectorWithElement(...) : Vector [<element>] : String | Test.java:1414:38:1414:39 | in : Vector [<element>] : String | provenance |  |
 | Test.java:1413:39:1413:54 | (...)... : String | Test.java:269:37:269:45 | element : String | provenance |  |
-| Test.java:1413:39:1413:54 | (...)... : String | Test.java:1413:18:1413:55 | newVectorWithElement(...) : Vector [<element>] : String | provenance | MaD:2 |
+| Test.java:1413:39:1413:54 | (...)... : String | Test.java:1413:18:1413:55 | newVectorWithElement(...) : Vector [<element>] : String | provenance | MaD:4 |
 | Test.java:1413:47:1413:54 | source(...) : Object | Test.java:1413:39:1413:54 | (...)... : String | provenance |  |
 | Test.java:1414:10:1414:46 | disjunction(...) : Collection [<element>] : String | Test.java:1415:20:1415:22 | out : Collection [<element>] : String | provenance |  |
-| Test.java:1414:38:1414:39 | in : Vector [<element>] : String | Test.java:1414:10:1414:46 | disjunction(...) : Collection [<element>] : String | provenance | MaD:417 |
+| Test.java:1414:38:1414:39 | in : Vector [<element>] : String | Test.java:1414:10:1414:46 | disjunction(...) : Collection [<element>] : String | provenance | MaD:492 |
 | Test.java:1415:20:1415:22 | out : Collection [<element>] : String | Test.java:230:19:230:32 | it : Collection [<element>] : String | provenance |  |
-| Test.java:1415:20:1415:22 | out : Collection [<element>] : String | Test.java:1415:9:1415:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:1415:20:1415:22 | out : Collection [<element>] : String | Test.java:1415:9:1415:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:1420:18:1420:55 | newVectorWithElement(...) : Vector [<element>] : String | Test.java:1421:44:1421:45 | in : Vector [<element>] : String | provenance |  |
 | Test.java:1420:39:1420:54 | (...)... : String | Test.java:269:37:269:45 | element : String | provenance |  |
-| Test.java:1420:39:1420:54 | (...)... : String | Test.java:1420:18:1420:55 | newVectorWithElement(...) : Vector [<element>] : String | provenance | MaD:2 |
+| Test.java:1420:39:1420:54 | (...)... : String | Test.java:1420:18:1420:55 | newVectorWithElement(...) : Vector [<element>] : String | provenance | MaD:4 |
 | Test.java:1420:47:1420:54 | source(...) : Object | Test.java:1420:39:1420:54 | (...)... : String | provenance |  |
 | Test.java:1421:10:1421:46 | disjunction(...) : Collection [<element>] : String | Test.java:1422:20:1422:22 | out : Collection [<element>] : String | provenance |  |
-| Test.java:1421:44:1421:45 | in : Vector [<element>] : String | Test.java:1421:10:1421:46 | disjunction(...) : Collection [<element>] : String | provenance | MaD:418 |
+| Test.java:1421:44:1421:45 | in : Vector [<element>] : String | Test.java:1421:10:1421:46 | disjunction(...) : Collection [<element>] : String | provenance | MaD:493 |
 | Test.java:1422:20:1422:22 | out : Collection [<element>] : String | Test.java:230:19:230:32 | it : Collection [<element>] : String | provenance |  |
-| Test.java:1422:20:1422:22 | out : Collection [<element>] : String | Test.java:1422:9:1422:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:1422:20:1422:22 | out : Collection [<element>] : String | Test.java:1422:9:1422:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:1427:20:1427:39 | (...)... : Collection | Test.java:1428:38:1428:39 | in : Collection | provenance |  |
 | Test.java:1427:32:1427:39 | source(...) : Object | Test.java:1427:20:1427:39 | (...)... : Collection | provenance |  |
 | Test.java:1428:10:1428:40 | emptyIfNull(...) : Collection | Test.java:1429:9:1429:11 | out | provenance |  |
-| Test.java:1428:38:1428:39 | in : Collection | Test.java:1428:10:1428:40 | emptyIfNull(...) : Collection | provenance | MaD:419 |
+| Test.java:1428:38:1428:39 | in : Collection | Test.java:1428:10:1428:40 | emptyIfNull(...) : Collection | provenance | MaD:494 |
 | Test.java:1434:20:1434:57 | newVectorWithElement(...) : Vector [<element>] : String | Test.java:1435:43:1435:44 | in : Vector [<element>] : String | provenance |  |
 | Test.java:1434:41:1434:56 | (...)... : String | Test.java:269:37:269:45 | element : String | provenance |  |
-| Test.java:1434:41:1434:56 | (...)... : String | Test.java:1434:20:1434:57 | newVectorWithElement(...) : Vector [<element>] : String | provenance | MaD:2 |
+| Test.java:1434:41:1434:56 | (...)... : String | Test.java:1434:20:1434:57 | newVectorWithElement(...) : Vector [<element>] : String | provenance | MaD:4 |
 | Test.java:1434:49:1434:56 | source(...) : Object | Test.java:1434:41:1434:56 | (...)... : String | provenance |  |
 | Test.java:1435:10:1435:45 | extractSingleton(...) : String | Test.java:1436:9:1436:11 | out | provenance |  |
-| Test.java:1435:43:1435:44 | in : Vector [<element>] : String | Test.java:1435:10:1435:45 | extractSingleton(...) : String | provenance | MaD:420 |
+| Test.java:1435:43:1435:44 | in : Vector [<element>] : String | Test.java:1435:10:1435:45 | extractSingleton(...) : String | provenance | MaD:495 |
 | Test.java:1441:18:1441:55 | newVectorWithElement(...) : Vector [<element>] : String | Test.java:1442:31:1442:32 | in : Vector [<element>] : String | provenance |  |
 | Test.java:1441:39:1441:54 | (...)... : String | Test.java:269:37:269:45 | element : String | provenance |  |
-| Test.java:1441:39:1441:54 | (...)... : String | Test.java:1441:18:1441:55 | newVectorWithElement(...) : Vector [<element>] : String | provenance | MaD:2 |
+| Test.java:1441:39:1441:54 | (...)... : String | Test.java:1441:18:1441:55 | newVectorWithElement(...) : Vector [<element>] : String | provenance | MaD:4 |
 | Test.java:1441:47:1441:54 | source(...) : Object | Test.java:1441:39:1441:54 | (...)... : String | provenance |  |
 | Test.java:1442:10:1442:39 | find(...) : String | Test.java:1443:9:1443:11 | out | provenance |  |
-| Test.java:1442:31:1442:32 | in : Vector [<element>] : String | Test.java:1442:10:1442:39 | find(...) : String | provenance | MaD:421 |
+| Test.java:1442:31:1442:32 | in : Vector [<element>] : String | Test.java:1442:10:1442:39 | find(...) : String | provenance | MaD:496 |
 | Test.java:1448:18:1448:61 | newListIteratorWithElement(...) : ListIterator [<element>] : String | Test.java:1449:30:1449:31 | in : ListIterator [<element>] : String | provenance |  |
 | Test.java:1448:45:1448:60 | (...)... : String | Test.java:259:49:259:57 | element : String | provenance |  |
-| Test.java:1448:45:1448:60 | (...)... : String | Test.java:1448:18:1448:61 | newListIteratorWithElement(...) : ListIterator [<element>] : String | provenance | MaD:2 |
+| Test.java:1448:45:1448:60 | (...)... : String | Test.java:1448:18:1448:61 | newListIteratorWithElement(...) : ListIterator [<element>] : String | provenance | MaD:4 |
 | Test.java:1448:53:1448:60 | source(...) : Object | Test.java:1448:45:1448:60 | (...)... : String | provenance |  |
 | Test.java:1449:10:1449:35 | get(...) : String | Test.java:1450:9:1450:11 | out | provenance |  |
-| Test.java:1449:30:1449:31 | in : ListIterator [<element>] : String | Test.java:1449:10:1449:35 | get(...) : String | provenance | MaD:423 |
+| Test.java:1449:30:1449:31 | in : ListIterator [<element>] : String | Test.java:1449:10:1449:35 | get(...) : String | provenance | MaD:498 |
 | Test.java:1455:18:1455:55 | newVectorWithElement(...) : Vector [<element>] : String | Test.java:1456:30:1456:31 | in : Vector [<element>] : String | provenance |  |
 | Test.java:1455:39:1455:54 | (...)... : String | Test.java:269:37:269:45 | element : String | provenance |  |
-| Test.java:1455:39:1455:54 | (...)... : String | Test.java:1455:18:1455:55 | newVectorWithElement(...) : Vector [<element>] : String | provenance | MaD:2 |
+| Test.java:1455:39:1455:54 | (...)... : String | Test.java:1455:18:1455:55 | newVectorWithElement(...) : Vector [<element>] : String | provenance | MaD:4 |
 | Test.java:1455:47:1455:54 | source(...) : Object | Test.java:1455:39:1455:54 | (...)... : String | provenance |  |
 | Test.java:1456:10:1456:35 | get(...) : String | Test.java:1457:9:1457:11 | out | provenance |  |
-| Test.java:1456:30:1456:31 | in : Vector [<element>] : String | Test.java:1456:10:1456:35 | get(...) : String | provenance | MaD:422 |
+| Test.java:1456:30:1456:31 | in : Vector [<element>] : String | Test.java:1456:10:1456:35 | get(...) : String | provenance | MaD:497 |
 | Test.java:1462:13:1462:50 | newTreeMapWithMapKey(...) : TreeMap [<map.key>] : String | Test.java:1463:30:1463:31 | in : TreeMap [<map.key>] : String | provenance |  |
 | Test.java:1462:34:1462:49 | (...)... : String | Test.java:285:47:285:51 | key : String | provenance |  |
-| Test.java:1462:34:1462:49 | (...)... : String | Test.java:1462:13:1462:50 | newTreeMapWithMapKey(...) : TreeMap [<map.key>] : String | provenance | MaD:14 |
+| Test.java:1462:34:1462:49 | (...)... : String | Test.java:1462:13:1462:50 | newTreeMapWithMapKey(...) : TreeMap [<map.key>] : String | provenance | MaD:19 |
 | Test.java:1462:42:1462:49 | source(...) : Object | Test.java:1462:34:1462:49 | (...)... : String | provenance |  |
 | Test.java:1463:10:1463:35 | get(...) : Entry [<map.key>] : String | Test.java:1464:28:1464:30 | out : Entry [<map.key>] : String | provenance |  |
-| Test.java:1463:30:1463:31 | in : TreeMap [<map.key>] : String | Test.java:1463:10:1463:35 | get(...) : Entry [<map.key>] : String | provenance | MaD:424 |
+| Test.java:1463:30:1463:31 | in : TreeMap [<map.key>] : String | Test.java:1463:10:1463:35 | get(...) : Entry [<map.key>] : String | provenance | MaD:499 |
 | Test.java:1464:28:1464:30 | out : Entry [<map.key>] : String | Test.java:238:27:238:50 | container : Entry [<map.key>] : String | provenance |  |
-| Test.java:1464:28:1464:30 | out : Entry [<map.key>] : String | Test.java:1464:9:1464:31 | getMapKeyFromEntry(...) | provenance | MaD:20 |
+| Test.java:1464:28:1464:30 | out : Entry [<map.key>] : String | Test.java:1464:9:1464:31 | getMapKeyFromEntry(...) | provenance | MaD:9 |
 | Test.java:1469:13:1469:52 | newTreeMapWithMapValue(...) : TreeMap [<map.value>] : String | Test.java:1470:30:1470:31 | in : TreeMap [<map.value>] : String | provenance |  |
 | Test.java:1469:36:1469:51 | (...)... : String | Test.java:304:49:304:55 | value : String | provenance |  |
-| Test.java:1469:36:1469:51 | (...)... : String | Test.java:1469:13:1469:52 | newTreeMapWithMapValue(...) : TreeMap [<map.value>] : String | provenance | MaD:15 |
+| Test.java:1469:36:1469:51 | (...)... : String | Test.java:1469:13:1469:52 | newTreeMapWithMapValue(...) : TreeMap [<map.value>] : String | provenance | MaD:20 |
 | Test.java:1469:44:1469:51 | source(...) : Object | Test.java:1469:36:1469:51 | (...)... : String | provenance |  |
 | Test.java:1470:10:1470:35 | get(...) : Entry [<map.value>] : String | Test.java:1471:30:1471:32 | out : Entry [<map.value>] : String | provenance |  |
-| Test.java:1470:30:1470:31 | in : TreeMap [<map.value>] : String | Test.java:1470:10:1470:35 | get(...) : Entry [<map.value>] : String | provenance | MaD:425 |
+| Test.java:1470:30:1470:31 | in : TreeMap [<map.value>] : String | Test.java:1470:10:1470:35 | get(...) : Entry [<map.value>] : String | provenance | MaD:500 |
 | Test.java:1471:30:1471:32 | out : Entry [<map.value>] : String | Test.java:244:29:244:52 | container : Entry [<map.value>] : String | provenance |  |
-| Test.java:1471:30:1471:32 | out : Entry [<map.value>] : String | Test.java:1471:9:1471:33 | getMapValueFromEntry(...) | provenance | MaD:21 |
+| Test.java:1471:30:1471:32 | out : Entry [<map.value>] : String | Test.java:1471:9:1471:33 | getMapValueFromEntry(...) | provenance | MaD:10 |
 | Test.java:1476:16:1476:52 | newWithArrayElement(...) : Object[] [[]] : String | Test.java:1477:30:1477:31 | in : Object[] [[]] : String | provenance |  |
 | Test.java:1476:36:1476:51 | (...)... : String | Test.java:251:31:251:44 | element : String | provenance |  |
 | Test.java:1476:36:1476:51 | (...)... : String | Test.java:1476:16:1476:52 | newWithArrayElement(...) : Object[] [[]] : String | provenance |  |
 | Test.java:1476:44:1476:51 | source(...) : Object | Test.java:1476:36:1476:51 | (...)... : String | provenance |  |
 | Test.java:1477:10:1477:35 | get(...) : String | Test.java:1478:9:1478:11 | out | provenance |  |
-| Test.java:1477:30:1477:31 | in : Object[] [[]] : String | Test.java:1477:10:1477:35 | get(...) : String | provenance | MaD:426 |
+| Test.java:1477:30:1477:31 | in : Object[] [[]] : String | Test.java:1477:10:1477:35 | get(...) : String | provenance | MaD:501 |
 | Test.java:1483:16:1483:53 | newVectorWithElement(...) : Vector [<element>] : String | Test.java:1484:30:1484:31 | in : Vector [<element>] : String | provenance |  |
 | Test.java:1483:37:1483:52 | (...)... : String | Test.java:269:37:269:45 | element : String | provenance |  |
-| Test.java:1483:37:1483:52 | (...)... : String | Test.java:1483:16:1483:53 | newVectorWithElement(...) : Vector [<element>] : String | provenance | MaD:2 |
+| Test.java:1483:37:1483:52 | (...)... : String | Test.java:1483:16:1483:53 | newVectorWithElement(...) : Vector [<element>] : String | provenance | MaD:4 |
 | Test.java:1483:45:1483:52 | source(...) : Object | Test.java:1483:37:1483:52 | (...)... : String | provenance |  |
 | Test.java:1484:10:1484:35 | get(...) : String | Test.java:1485:9:1485:11 | out | provenance |  |
-| Test.java:1484:30:1484:31 | in : Vector [<element>] : String | Test.java:1484:10:1484:35 | get(...) : String | provenance | MaD:427 |
+| Test.java:1484:30:1484:31 | in : Vector [<element>] : String | Test.java:1484:10:1484:35 | get(...) : String | provenance | MaD:502 |
 | Test.java:1490:16:1490:53 | newTreeMapWithMapKey(...) : TreeMap [<map.key>] : String | Test.java:1491:41:1491:42 | in : TreeMap [<map.key>] : String | provenance |  |
 | Test.java:1490:37:1490:52 | (...)... : String | Test.java:285:47:285:51 | key : String | provenance |  |
-| Test.java:1490:37:1490:52 | (...)... : String | Test.java:1490:16:1490:53 | newTreeMapWithMapKey(...) : TreeMap [<map.key>] : String | provenance | MaD:14 |
+| Test.java:1490:37:1490:52 | (...)... : String | Test.java:1490:16:1490:53 | newTreeMapWithMapKey(...) : TreeMap [<map.key>] : String | provenance | MaD:19 |
 | Test.java:1490:45:1490:52 | source(...) : Object | Test.java:1490:37:1490:52 | (...)... : String | provenance |  |
 | Test.java:1491:10:1491:46 | (...)... : Entry [<map.key>] : String | Test.java:1492:28:1492:30 | out : Entry [<map.key>] : String | provenance |  |
 | Test.java:1491:21:1491:46 | get(...) : Object [<map.key>] : String | Test.java:1491:10:1491:46 | (...)... : Entry [<map.key>] : String | provenance |  |
-| Test.java:1491:41:1491:42 | in : TreeMap [<map.key>] : String | Test.java:1491:21:1491:46 | get(...) : Object [<map.key>] : String | provenance | MaD:428 |
+| Test.java:1491:41:1491:42 | in : TreeMap [<map.key>] : String | Test.java:1491:21:1491:46 | get(...) : Object [<map.key>] : String | provenance | MaD:503 |
 | Test.java:1492:28:1492:30 | out : Entry [<map.key>] : String | Test.java:238:27:238:50 | container : Entry [<map.key>] : String | provenance |  |
-| Test.java:1492:28:1492:30 | out : Entry [<map.key>] : String | Test.java:1492:9:1492:31 | getMapKeyFromEntry(...) | provenance | MaD:20 |
+| Test.java:1492:28:1492:30 | out : Entry [<map.key>] : String | Test.java:1492:9:1492:31 | getMapKeyFromEntry(...) | provenance | MaD:9 |
 | Test.java:1497:16:1497:55 | newTreeMapWithMapValue(...) : TreeMap [<map.value>] : String | Test.java:1498:41:1498:42 | in : TreeMap [<map.value>] : String | provenance |  |
 | Test.java:1497:39:1497:54 | (...)... : String | Test.java:304:49:304:55 | value : String | provenance |  |
-| Test.java:1497:39:1497:54 | (...)... : String | Test.java:1497:16:1497:55 | newTreeMapWithMapValue(...) : TreeMap [<map.value>] : String | provenance | MaD:15 |
+| Test.java:1497:39:1497:54 | (...)... : String | Test.java:1497:16:1497:55 | newTreeMapWithMapValue(...) : TreeMap [<map.value>] : String | provenance | MaD:20 |
 | Test.java:1497:47:1497:54 | source(...) : Object | Test.java:1497:39:1497:54 | (...)... : String | provenance |  |
 | Test.java:1498:10:1498:46 | (...)... : Entry [<map.value>] : String | Test.java:1499:30:1499:32 | out : Entry [<map.value>] : String | provenance |  |
 | Test.java:1498:21:1498:46 | get(...) : Object [<map.value>] : String | Test.java:1498:10:1498:46 | (...)... : Entry [<map.value>] : String | provenance |  |
-| Test.java:1498:41:1498:42 | in : TreeMap [<map.value>] : String | Test.java:1498:21:1498:46 | get(...) : Object [<map.value>] : String | provenance | MaD:429 |
+| Test.java:1498:41:1498:42 | in : TreeMap [<map.value>] : String | Test.java:1498:21:1498:46 | get(...) : Object [<map.value>] : String | provenance | MaD:504 |
 | Test.java:1499:30:1499:32 | out : Entry [<map.value>] : String | Test.java:244:29:244:52 | container : Entry [<map.value>] : String | provenance |  |
-| Test.java:1499:30:1499:32 | out : Entry [<map.value>] : String | Test.java:1499:9:1499:33 | getMapValueFromEntry(...) | provenance | MaD:21 |
+| Test.java:1499:30:1499:32 | out : Entry [<map.value>] : String | Test.java:1499:9:1499:33 | getMapValueFromEntry(...) | provenance | MaD:10 |
 | Test.java:1504:18:1504:55 | newVectorWithElement(...) : Vector [<element>] : String | Test.java:1505:44:1505:45 | in : Vector [<element>] : String | provenance |  |
 | Test.java:1504:39:1504:54 | (...)... : String | Test.java:269:37:269:45 | element : String | provenance |  |
-| Test.java:1504:39:1504:54 | (...)... : String | Test.java:1504:18:1504:55 | newVectorWithElement(...) : Vector [<element>] : String | provenance | MaD:2 |
+| Test.java:1504:39:1504:54 | (...)... : String | Test.java:1504:18:1504:55 | newVectorWithElement(...) : Vector [<element>] : String | provenance | MaD:4 |
 | Test.java:1504:47:1504:54 | source(...) : Object | Test.java:1504:39:1504:54 | (...)... : String | provenance |  |
 | Test.java:1505:10:1505:46 | getCardinalityMap(...) : Map [<map.key>] : String | Test.java:1506:19:1506:21 | out : Map [<map.key>] : String | provenance |  |
-| Test.java:1505:44:1505:45 | in : Vector [<element>] : String | Test.java:1505:10:1505:46 | getCardinalityMap(...) : Map [<map.key>] : String | provenance | MaD:430 |
+| Test.java:1505:44:1505:45 | in : Vector [<element>] : String | Test.java:1505:10:1505:46 | getCardinalityMap(...) : Map [<map.key>] : String | provenance | MaD:505 |
 | Test.java:1506:19:1506:21 | out : Map [<map.key>] : String | Test.java:228:18:228:29 | map : Map [<map.key>] : String | provenance |  |
-| Test.java:1506:19:1506:21 | out : Map [<map.key>] : String | Test.java:1506:9:1506:22 | getMapKey(...) | provenance | MaD:10 |
+| Test.java:1506:19:1506:21 | out : Map [<map.key>] : String | Test.java:1506:9:1506:22 | getMapKey(...) | provenance | MaD:18 |
 | Test.java:1511:18:1511:55 | newVectorWithElement(...) : Vector [<element>] : String | Test.java:1512:39:1512:40 | in : Vector [<element>] : String | provenance |  |
 | Test.java:1511:39:1511:54 | (...)... : String | Test.java:269:37:269:45 | element : String | provenance |  |
-| Test.java:1511:39:1511:54 | (...)... : String | Test.java:1511:18:1511:55 | newVectorWithElement(...) : Vector [<element>] : String | provenance | MaD:2 |
+| Test.java:1511:39:1511:54 | (...)... : String | Test.java:1511:18:1511:55 | newVectorWithElement(...) : Vector [<element>] : String | provenance | MaD:4 |
 | Test.java:1511:47:1511:54 | source(...) : Object | Test.java:1511:39:1511:54 | (...)... : String | provenance |  |
 | Test.java:1512:10:1512:47 | intersection(...) : Collection [<element>] : String | Test.java:1513:20:1513:22 | out : Collection [<element>] : String | provenance |  |
-| Test.java:1512:39:1512:40 | in : Vector [<element>] : String | Test.java:1512:10:1512:47 | intersection(...) : Collection [<element>] : String | provenance | MaD:431 |
+| Test.java:1512:39:1512:40 | in : Vector [<element>] : String | Test.java:1512:10:1512:47 | intersection(...) : Collection [<element>] : String | provenance | MaD:506 |
 | Test.java:1513:20:1513:22 | out : Collection [<element>] : String | Test.java:230:19:230:32 | it : Collection [<element>] : String | provenance |  |
-| Test.java:1513:20:1513:22 | out : Collection [<element>] : String | Test.java:1513:9:1513:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:1513:20:1513:22 | out : Collection [<element>] : String | Test.java:1513:9:1513:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:1518:18:1518:55 | newVectorWithElement(...) : Vector [<element>] : String | Test.java:1519:45:1519:46 | in : Vector [<element>] : String | provenance |  |
 | Test.java:1518:39:1518:54 | (...)... : String | Test.java:269:37:269:45 | element : String | provenance |  |
-| Test.java:1518:39:1518:54 | (...)... : String | Test.java:1518:18:1518:55 | newVectorWithElement(...) : Vector [<element>] : String | provenance | MaD:2 |
+| Test.java:1518:39:1518:54 | (...)... : String | Test.java:1518:18:1518:55 | newVectorWithElement(...) : Vector [<element>] : String | provenance | MaD:4 |
 | Test.java:1518:47:1518:54 | source(...) : Object | Test.java:1518:39:1518:54 | (...)... : String | provenance |  |
 | Test.java:1519:10:1519:47 | intersection(...) : Collection [<element>] : String | Test.java:1520:20:1520:22 | out : Collection [<element>] : String | provenance |  |
-| Test.java:1519:45:1519:46 | in : Vector [<element>] : String | Test.java:1519:10:1519:47 | intersection(...) : Collection [<element>] : String | provenance | MaD:432 |
+| Test.java:1519:45:1519:46 | in : Vector [<element>] : String | Test.java:1519:10:1519:47 | intersection(...) : Collection [<element>] : String | provenance | MaD:507 |
 | Test.java:1520:20:1520:22 | out : Collection [<element>] : String | Test.java:230:19:230:32 | it : Collection [<element>] : String | provenance |  |
-| Test.java:1520:20:1520:22 | out : Collection [<element>] : String | Test.java:1520:9:1520:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:1520:20:1520:22 | out : Collection [<element>] : String | Test.java:1520:9:1520:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:1525:20:1525:57 | newVectorWithElement(...) : Vector [<element>] : String | Test.java:1526:39:1526:40 | in : Vector [<element>] : String | provenance |  |
 | Test.java:1525:41:1525:56 | (...)... : String | Test.java:269:37:269:45 | element : String | provenance |  |
-| Test.java:1525:41:1525:56 | (...)... : String | Test.java:1525:20:1525:57 | newVectorWithElement(...) : Vector [<element>] : String | provenance | MaD:2 |
+| Test.java:1525:41:1525:56 | (...)... : String | Test.java:1525:20:1525:57 | newVectorWithElement(...) : Vector [<element>] : String | provenance | MaD:4 |
 | Test.java:1525:49:1525:56 | source(...) : Object | Test.java:1525:41:1525:56 | (...)... : String | provenance |  |
 | Test.java:1526:10:1526:41 | permutations(...) : Collection [<element>, <element>] : String | Test.java:1527:41:1527:43 | out : Collection [<element>, <element>] : String | provenance |  |
-| Test.java:1526:39:1526:40 | in : Vector [<element>] : String | Test.java:1526:10:1526:41 | permutations(...) : Collection [<element>, <element>] : String | provenance | MaD:433 |
+| Test.java:1526:39:1526:40 | in : Vector [<element>] : String | Test.java:1526:10:1526:41 | permutations(...) : Collection [<element>, <element>] : String | provenance | MaD:508 |
 | Test.java:1527:20:1527:44 | (...)... : Iterable [<element>] : String | Test.java:230:19:230:32 | it : Iterable [<element>] : String | provenance |  |
-| Test.java:1527:20:1527:44 | (...)... : Iterable [<element>] : String | Test.java:1527:9:1527:45 | getElement(...) | provenance | MaD:1 |
+| Test.java:1527:20:1527:44 | (...)... : Iterable [<element>] : String | Test.java:1527:9:1527:45 | getElement(...) | provenance | MaD:3 |
 | Test.java:1527:30:1527:44 | getElement(...) : Object [<element>] : String | Test.java:1527:20:1527:44 | (...)... : Iterable [<element>] : String | provenance |  |
 | Test.java:1527:41:1527:43 | out : Collection [<element>, <element>] : String | Test.java:230:19:230:32 | it : Collection [<element>, <element>] : String | provenance |  |
-| Test.java:1527:41:1527:43 | out : Collection [<element>, <element>] : String | Test.java:1527:30:1527:44 | getElement(...) : Object [<element>] : String | provenance | MaD:1 |
+| Test.java:1527:41:1527:43 | out : Collection [<element>, <element>] : String | Test.java:1527:30:1527:44 | getElement(...) : Object [<element>] : String | provenance | MaD:3 |
 | Test.java:1532:20:1532:57 | newVectorWithElement(...) : Vector [<element>] : String | Test.java:1533:47:1533:48 | in : Vector [<element>] : String | provenance |  |
 | Test.java:1532:41:1532:56 | (...)... : String | Test.java:269:37:269:45 | element : String | provenance |  |
-| Test.java:1532:41:1532:56 | (...)... : String | Test.java:1532:20:1532:57 | newVectorWithElement(...) : Vector [<element>] : String | provenance | MaD:2 |
+| Test.java:1532:41:1532:56 | (...)... : String | Test.java:1532:20:1532:57 | newVectorWithElement(...) : Vector [<element>] : String | provenance | MaD:4 |
 | Test.java:1532:49:1532:56 | source(...) : Object | Test.java:1532:41:1532:56 | (...)... : String | provenance |  |
 | Test.java:1533:10:1533:55 | predicatedCollection(...) : Collection [<element>] : String | Test.java:1534:20:1534:22 | out : Collection [<element>] : String | provenance |  |
-| Test.java:1533:47:1533:48 | in : Vector [<element>] : String | Test.java:1533:10:1533:55 | predicatedCollection(...) : Collection [<element>] : String | provenance | MaD:434 |
+| Test.java:1533:47:1533:48 | in : Vector [<element>] : String | Test.java:1533:10:1533:55 | predicatedCollection(...) : Collection [<element>] : String | provenance | MaD:509 |
 | Test.java:1534:20:1534:22 | out : Collection [<element>] : String | Test.java:230:19:230:32 | it : Collection [<element>] : String | provenance |  |
-| Test.java:1534:20:1534:22 | out : Collection [<element>] : String | Test.java:1534:9:1534:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:1534:20:1534:22 | out : Collection [<element>] : String | Test.java:1534:9:1534:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:1539:18:1539:55 | newVectorWithElement(...) : Vector [<element>] : String | Test.java:1540:36:1540:37 | in : Vector [<element>] : String | provenance |  |
 | Test.java:1539:39:1539:54 | (...)... : String | Test.java:269:37:269:45 | element : String | provenance |  |
-| Test.java:1539:39:1539:54 | (...)... : String | Test.java:1539:18:1539:55 | newVectorWithElement(...) : Vector [<element>] : String | provenance | MaD:2 |
+| Test.java:1539:39:1539:54 | (...)... : String | Test.java:1539:18:1539:55 | newVectorWithElement(...) : Vector [<element>] : String | provenance | MaD:4 |
 | Test.java:1539:47:1539:54 | source(...) : Object | Test.java:1539:39:1539:54 | (...)... : String | provenance |  |
 | Test.java:1540:10:1540:50 | removeAll(...) : Collection [<element>] : String | Test.java:1541:20:1541:22 | out : Collection [<element>] : String | provenance |  |
-| Test.java:1540:36:1540:37 | in : Vector [<element>] : String | Test.java:1540:10:1540:50 | removeAll(...) : Collection [<element>] : String | provenance | MaD:435 |
+| Test.java:1540:36:1540:37 | in : Vector [<element>] : String | Test.java:1540:10:1540:50 | removeAll(...) : Collection [<element>] : String | provenance | MaD:510 |
 | Test.java:1541:20:1541:22 | out : Collection [<element>] : String | Test.java:230:19:230:32 | it : Collection [<element>] : String | provenance |  |
-| Test.java:1541:20:1541:22 | out : Collection [<element>] : String | Test.java:1541:9:1541:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:1541:20:1541:22 | out : Collection [<element>] : String | Test.java:1541:9:1541:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:1546:20:1546:57 | newVectorWithElement(...) : Vector [<element>] : String | Test.java:1547:36:1547:37 | in : Vector [<element>] : String | provenance |  |
 | Test.java:1546:41:1546:56 | (...)... : String | Test.java:269:37:269:45 | element : String | provenance |  |
-| Test.java:1546:41:1546:56 | (...)... : String | Test.java:1546:20:1546:57 | newVectorWithElement(...) : Vector [<element>] : String | provenance | MaD:2 |
+| Test.java:1546:41:1546:56 | (...)... : String | Test.java:1546:20:1546:57 | newVectorWithElement(...) : Vector [<element>] : String | provenance | MaD:4 |
 | Test.java:1546:49:1546:56 | source(...) : Object | Test.java:1546:41:1546:56 | (...)... : String | provenance |  |
 | Test.java:1547:10:1547:44 | removeAll(...) : Collection [<element>] : String | Test.java:1548:20:1548:22 | out : Collection [<element>] : String | provenance |  |
-| Test.java:1547:36:1547:37 | in : Vector [<element>] : String | Test.java:1547:10:1547:44 | removeAll(...) : Collection [<element>] : String | provenance | MaD:435 |
+| Test.java:1547:36:1547:37 | in : Vector [<element>] : String | Test.java:1547:10:1547:44 | removeAll(...) : Collection [<element>] : String | provenance | MaD:510 |
 | Test.java:1548:20:1548:22 | out : Collection [<element>] : String | Test.java:230:19:230:32 | it : Collection [<element>] : String | provenance |  |
-| Test.java:1548:20:1548:22 | out : Collection [<element>] : String | Test.java:1548:9:1548:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:1548:20:1548:22 | out : Collection [<element>] : String | Test.java:1548:9:1548:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:1553:18:1553:55 | newVectorWithElement(...) : Vector [<element>] : String | Test.java:1554:36:1554:37 | in : Vector [<element>] : String | provenance |  |
 | Test.java:1553:39:1553:54 | (...)... : String | Test.java:269:37:269:45 | element : String | provenance |  |
-| Test.java:1553:39:1553:54 | (...)... : String | Test.java:1553:18:1553:55 | newVectorWithElement(...) : Vector [<element>] : String | provenance | MaD:2 |
+| Test.java:1553:39:1553:54 | (...)... : String | Test.java:1553:18:1553:55 | newVectorWithElement(...) : Vector [<element>] : String | provenance | MaD:4 |
 | Test.java:1553:47:1553:54 | source(...) : Object | Test.java:1553:39:1553:54 | (...)... : String | provenance |  |
 | Test.java:1554:10:1554:50 | retainAll(...) : Collection [<element>] : String | Test.java:1555:20:1555:22 | out : Collection [<element>] : String | provenance |  |
-| Test.java:1554:36:1554:37 | in : Vector [<element>] : String | Test.java:1554:10:1554:50 | retainAll(...) : Collection [<element>] : String | provenance | MaD:436 |
+| Test.java:1554:36:1554:37 | in : Vector [<element>] : String | Test.java:1554:10:1554:50 | retainAll(...) : Collection [<element>] : String | provenance | MaD:511 |
 | Test.java:1555:20:1555:22 | out : Collection [<element>] : String | Test.java:230:19:230:32 | it : Collection [<element>] : String | provenance |  |
-| Test.java:1555:20:1555:22 | out : Collection [<element>] : String | Test.java:1555:9:1555:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:1555:20:1555:22 | out : Collection [<element>] : String | Test.java:1555:9:1555:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:1560:20:1560:57 | newVectorWithElement(...) : Vector [<element>] : String | Test.java:1561:36:1561:37 | in : Vector [<element>] : String | provenance |  |
 | Test.java:1560:41:1560:56 | (...)... : String | Test.java:269:37:269:45 | element : String | provenance |  |
-| Test.java:1560:41:1560:56 | (...)... : String | Test.java:1560:20:1560:57 | newVectorWithElement(...) : Vector [<element>] : String | provenance | MaD:2 |
+| Test.java:1560:41:1560:56 | (...)... : String | Test.java:1560:20:1560:57 | newVectorWithElement(...) : Vector [<element>] : String | provenance | MaD:4 |
 | Test.java:1560:49:1560:56 | source(...) : Object | Test.java:1560:41:1560:56 | (...)... : String | provenance |  |
 | Test.java:1561:10:1561:44 | retainAll(...) : Collection [<element>] : String | Test.java:1562:20:1562:22 | out : Collection [<element>] : String | provenance |  |
-| Test.java:1561:36:1561:37 | in : Vector [<element>] : String | Test.java:1561:10:1561:44 | retainAll(...) : Collection [<element>] : String | provenance | MaD:436 |
+| Test.java:1561:36:1561:37 | in : Vector [<element>] : String | Test.java:1561:10:1561:44 | retainAll(...) : Collection [<element>] : String | provenance | MaD:511 |
 | Test.java:1562:20:1562:22 | out : Collection [<element>] : String | Test.java:230:19:230:32 | it : Collection [<element>] : String | provenance |  |
-| Test.java:1562:20:1562:22 | out : Collection [<element>] : String | Test.java:1562:9:1562:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:1562:20:1562:22 | out : Collection [<element>] : String | Test.java:1562:9:1562:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:1567:18:1567:55 | newVectorWithElement(...) : Vector [<element>] : String | Test.java:1568:33:1568:34 | in : Vector [<element>] : String | provenance |  |
 | Test.java:1567:39:1567:54 | (...)... : String | Test.java:269:37:269:45 | element : String | provenance |  |
-| Test.java:1567:39:1567:54 | (...)... : String | Test.java:1567:18:1567:55 | newVectorWithElement(...) : Vector [<element>] : String | provenance | MaD:2 |
+| Test.java:1567:39:1567:54 | (...)... : String | Test.java:1567:18:1567:55 | newVectorWithElement(...) : Vector [<element>] : String | provenance | MaD:4 |
 | Test.java:1567:47:1567:54 | source(...) : Object | Test.java:1567:39:1567:54 | (...)... : String | provenance |  |
 | Test.java:1568:10:1568:41 | select(...) : Collection [<element>] : String | Test.java:1569:20:1569:22 | out : Collection [<element>] : String | provenance |  |
-| Test.java:1568:33:1568:34 | in : Vector [<element>] : String | Test.java:1568:10:1568:41 | select(...) : Collection [<element>] : String | provenance | MaD:437 |
+| Test.java:1568:33:1568:34 | in : Vector [<element>] : String | Test.java:1568:10:1568:41 | select(...) : Collection [<element>] : String | provenance | MaD:512 |
 | Test.java:1569:20:1569:22 | out : Collection [<element>] : String | Test.java:230:19:230:32 | it : Collection [<element>] : String | provenance |  |
-| Test.java:1569:20:1569:22 | out : Collection [<element>] : String | Test.java:1569:9:1569:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:1569:20:1569:22 | out : Collection [<element>] : String | Test.java:1569:9:1569:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:1574:20:1574:39 | (...)... : Collection | Test.java:1575:45:1575:46 | in : Collection | provenance |  |
 | Test.java:1574:32:1574:39 | source(...) : Object | Test.java:1574:20:1574:39 | (...)... : Collection | provenance |  |
 | Test.java:1575:10:1575:47 | select(...) : Collection | Test.java:1576:9:1576:11 | out | provenance |  |
-| Test.java:1575:45:1575:46 | in : Collection | Test.java:1575:10:1575:47 | select(...) : Collection | provenance | MaD:439 |
+| Test.java:1575:45:1575:46 | in : Collection | Test.java:1575:10:1575:47 | select(...) : Collection | provenance | MaD:514 |
 | Test.java:1581:18:1581:55 | newVectorWithElement(...) : Vector [<element>] : String | Test.java:1582:27:1582:28 | in : Vector [<element>] : String | provenance |  |
 | Test.java:1581:39:1581:54 | (...)... : String | Test.java:269:37:269:45 | element : String | provenance |  |
-| Test.java:1581:39:1581:54 | (...)... : String | Test.java:1581:18:1581:55 | newVectorWithElement(...) : Vector [<element>] : String | provenance | MaD:2 |
+| Test.java:1581:39:1581:54 | (...)... : String | Test.java:1581:18:1581:55 | newVectorWithElement(...) : Vector [<element>] : String | provenance | MaD:4 |
 | Test.java:1581:47:1581:54 | source(...) : Object | Test.java:1581:39:1581:54 | (...)... : String | provenance |  |
-| Test.java:1582:27:1582:28 | in : Vector [<element>] : String | Test.java:1582:37:1582:39 | out [post update] : Collection [<element>] : String | provenance | MaD:438 |
+| Test.java:1582:27:1582:28 | in : Vector [<element>] : String | Test.java:1582:37:1582:39 | out [post update] : Collection [<element>] : String | provenance | MaD:513 |
 | Test.java:1582:37:1582:39 | out [post update] : Collection [<element>] : String | Test.java:1583:20:1583:22 | out : Collection [<element>] : String | provenance |  |
 | Test.java:1583:20:1583:22 | out : Collection [<element>] : String | Test.java:230:19:230:32 | it : Collection [<element>] : String | provenance |  |
-| Test.java:1583:20:1583:22 | out : Collection [<element>] : String | Test.java:1583:9:1583:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:1583:20:1583:22 | out : Collection [<element>] : String | Test.java:1583:9:1583:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:1588:18:1588:55 | newVectorWithElement(...) : Vector [<element>] : String | Test.java:1589:33:1589:34 | in : Vector [<element>] : String | provenance |  |
 | Test.java:1588:39:1588:54 | (...)... : String | Test.java:269:37:269:45 | element : String | provenance |  |
-| Test.java:1588:39:1588:54 | (...)... : String | Test.java:1588:18:1588:55 | newVectorWithElement(...) : Vector [<element>] : String | provenance | MaD:2 |
+| Test.java:1588:39:1588:54 | (...)... : String | Test.java:1588:18:1588:55 | newVectorWithElement(...) : Vector [<element>] : String | provenance | MaD:4 |
 | Test.java:1588:47:1588:54 | source(...) : Object | Test.java:1588:39:1588:54 | (...)... : String | provenance |  |
 | Test.java:1589:10:1589:46 | select(...) : Collection [<element>] : String | Test.java:1590:20:1590:22 | out : Collection [<element>] : String | provenance |  |
-| Test.java:1589:33:1589:34 | in : Vector [<element>] : String | Test.java:1589:10:1589:46 | select(...) : Collection [<element>] : String | provenance | MaD:438+MaD:439 |
+| Test.java:1589:33:1589:34 | in : Vector [<element>] : String | Test.java:1589:10:1589:46 | select(...) : Collection [<element>] : String | provenance | MaD:513+MaD:514 |
 | Test.java:1590:20:1590:22 | out : Collection [<element>] : String | Test.java:230:19:230:32 | it : Collection [<element>] : String | provenance |  |
-| Test.java:1590:20:1590:22 | out : Collection [<element>] : String | Test.java:1590:9:1590:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:1590:20:1590:22 | out : Collection [<element>] : String | Test.java:1590:9:1590:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:1595:20:1595:39 | (...)... : Collection | Test.java:1596:45:1596:46 | in : Collection | provenance |  |
 | Test.java:1595:32:1595:39 | source(...) : Object | Test.java:1595:20:1595:39 | (...)... : Collection | provenance |  |
 | Test.java:1596:10:1596:53 | select(...) : Collection | Test.java:1597:9:1597:11 | out | provenance |  |
-| Test.java:1596:45:1596:46 | in : Collection | Test.java:1596:10:1596:53 | select(...) : Collection | provenance | MaD:442 |
+| Test.java:1596:45:1596:46 | in : Collection | Test.java:1596:10:1596:53 | select(...) : Collection | provenance | MaD:517 |
 | Test.java:1602:18:1602:55 | newVectorWithElement(...) : Vector [<element>] : String | Test.java:1603:27:1603:28 | in : Vector [<element>] : String | provenance |  |
 | Test.java:1602:39:1602:54 | (...)... : String | Test.java:269:37:269:45 | element : String | provenance |  |
-| Test.java:1602:39:1602:54 | (...)... : String | Test.java:1602:18:1602:55 | newVectorWithElement(...) : Vector [<element>] : String | provenance | MaD:2 |
+| Test.java:1602:39:1602:54 | (...)... : String | Test.java:1602:18:1602:55 | newVectorWithElement(...) : Vector [<element>] : String | provenance | MaD:4 |
 | Test.java:1602:47:1602:54 | source(...) : Object | Test.java:1602:39:1602:54 | (...)... : String | provenance |  |
-| Test.java:1603:27:1603:28 | in : Vector [<element>] : String | Test.java:1603:37:1603:39 | out [post update] : Collection [<element>] : String | provenance | MaD:440 |
+| Test.java:1603:27:1603:28 | in : Vector [<element>] : String | Test.java:1603:37:1603:39 | out [post update] : Collection [<element>] : String | provenance | MaD:515 |
 | Test.java:1603:37:1603:39 | out [post update] : Collection [<element>] : String | Test.java:1604:20:1604:22 | out : Collection [<element>] : String | provenance |  |
 | Test.java:1604:20:1604:22 | out : Collection [<element>] : String | Test.java:230:19:230:32 | it : Collection [<element>] : String | provenance |  |
-| Test.java:1604:20:1604:22 | out : Collection [<element>] : String | Test.java:1604:9:1604:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:1604:20:1604:22 | out : Collection [<element>] : String | Test.java:1604:9:1604:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:1609:18:1609:55 | newVectorWithElement(...) : Vector [<element>] : String | Test.java:1610:33:1610:34 | in : Vector [<element>] : String | provenance |  |
 | Test.java:1609:39:1609:54 | (...)... : String | Test.java:269:37:269:45 | element : String | provenance |  |
-| Test.java:1609:39:1609:54 | (...)... : String | Test.java:1609:18:1609:55 | newVectorWithElement(...) : Vector [<element>] : String | provenance | MaD:2 |
+| Test.java:1609:39:1609:54 | (...)... : String | Test.java:1609:18:1609:55 | newVectorWithElement(...) : Vector [<element>] : String | provenance | MaD:4 |
 | Test.java:1609:47:1609:54 | source(...) : Object | Test.java:1609:39:1609:54 | (...)... : String | provenance |  |
 | Test.java:1610:10:1610:52 | select(...) : Collection [<element>] : String | Test.java:1611:20:1611:22 | out : Collection [<element>] : String | provenance |  |
-| Test.java:1610:33:1610:34 | in : Vector [<element>] : String | Test.java:1610:10:1610:52 | select(...) : Collection [<element>] : String | provenance | MaD:440+MaD:442 |
+| Test.java:1610:33:1610:34 | in : Vector [<element>] : String | Test.java:1610:10:1610:52 | select(...) : Collection [<element>] : String | provenance | MaD:515+MaD:517 |
 | Test.java:1611:20:1611:22 | out : Collection [<element>] : String | Test.java:230:19:230:32 | it : Collection [<element>] : String | provenance |  |
-| Test.java:1611:20:1611:22 | out : Collection [<element>] : String | Test.java:1611:9:1611:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:1611:20:1611:22 | out : Collection [<element>] : String | Test.java:1611:9:1611:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:1616:18:1616:55 | newVectorWithElement(...) : Vector [<element>] : String | Test.java:1617:27:1617:28 | in : Vector [<element>] : String | provenance |  |
 | Test.java:1616:39:1616:54 | (...)... : String | Test.java:269:37:269:45 | element : String | provenance |  |
-| Test.java:1616:39:1616:54 | (...)... : String | Test.java:1616:18:1616:55 | newVectorWithElement(...) : Vector [<element>] : String | provenance | MaD:2 |
+| Test.java:1616:39:1616:54 | (...)... : String | Test.java:1616:18:1616:55 | newVectorWithElement(...) : Vector [<element>] : String | provenance | MaD:4 |
 | Test.java:1616:47:1616:54 | source(...) : Object | Test.java:1616:39:1616:54 | (...)... : String | provenance |  |
-| Test.java:1617:27:1617:28 | in : Vector [<element>] : String | Test.java:1617:43:1617:45 | out [post update] : Collection [<element>] : String | provenance | MaD:441 |
+| Test.java:1617:27:1617:28 | in : Vector [<element>] : String | Test.java:1617:43:1617:45 | out [post update] : Collection [<element>] : String | provenance | MaD:516 |
 | Test.java:1617:43:1617:45 | out [post update] : Collection [<element>] : String | Test.java:1618:20:1618:22 | out : Collection [<element>] : String | provenance |  |
 | Test.java:1618:20:1618:22 | out : Collection [<element>] : String | Test.java:230:19:230:32 | it : Collection [<element>] : String | provenance |  |
-| Test.java:1618:20:1618:22 | out : Collection [<element>] : String | Test.java:1618:9:1618:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:1618:20:1618:22 | out : Collection [<element>] : String | Test.java:1618:9:1618:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:1623:18:1623:55 | newVectorWithElement(...) : Vector [<element>] : String | Test.java:1624:41:1624:42 | in : Vector [<element>] : String | provenance |  |
 | Test.java:1623:39:1623:54 | (...)... : String | Test.java:269:37:269:45 | element : String | provenance |  |
-| Test.java:1623:39:1623:54 | (...)... : String | Test.java:1623:18:1623:55 | newVectorWithElement(...) : Vector [<element>] : String | provenance | MaD:2 |
+| Test.java:1623:39:1623:54 | (...)... : String | Test.java:1623:18:1623:55 | newVectorWithElement(...) : Vector [<element>] : String | provenance | MaD:4 |
 | Test.java:1623:47:1623:54 | source(...) : Object | Test.java:1623:39:1623:54 | (...)... : String | provenance |  |
 | Test.java:1624:10:1624:49 | selectRejected(...) : Collection [<element>] : String | Test.java:1625:20:1625:22 | out : Collection [<element>] : String | provenance |  |
-| Test.java:1624:41:1624:42 | in : Vector [<element>] : String | Test.java:1624:10:1624:49 | selectRejected(...) : Collection [<element>] : String | provenance | MaD:443 |
+| Test.java:1624:41:1624:42 | in : Vector [<element>] : String | Test.java:1624:10:1624:49 | selectRejected(...) : Collection [<element>] : String | provenance | MaD:518 |
 | Test.java:1625:20:1625:22 | out : Collection [<element>] : String | Test.java:230:19:230:32 | it : Collection [<element>] : String | provenance |  |
-| Test.java:1625:20:1625:22 | out : Collection [<element>] : String | Test.java:1625:9:1625:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:1625:20:1625:22 | out : Collection [<element>] : String | Test.java:1625:9:1625:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:1630:20:1630:39 | (...)... : Collection | Test.java:1631:53:1631:54 | in : Collection | provenance |  |
 | Test.java:1630:32:1630:39 | source(...) : Object | Test.java:1630:20:1630:39 | (...)... : Collection | provenance |  |
 | Test.java:1631:10:1631:55 | selectRejected(...) : Collection | Test.java:1632:9:1632:11 | out | provenance |  |
-| Test.java:1631:53:1631:54 | in : Collection | Test.java:1631:10:1631:55 | selectRejected(...) : Collection | provenance | MaD:445 |
+| Test.java:1631:53:1631:54 | in : Collection | Test.java:1631:10:1631:55 | selectRejected(...) : Collection | provenance | MaD:520 |
 | Test.java:1637:18:1637:55 | newVectorWithElement(...) : Vector [<element>] : String | Test.java:1638:35:1638:36 | in : Vector [<element>] : String | provenance |  |
 | Test.java:1637:39:1637:54 | (...)... : String | Test.java:269:37:269:45 | element : String | provenance |  |
-| Test.java:1637:39:1637:54 | (...)... : String | Test.java:1637:18:1637:55 | newVectorWithElement(...) : Vector [<element>] : String | provenance | MaD:2 |
+| Test.java:1637:39:1637:54 | (...)... : String | Test.java:1637:18:1637:55 | newVectorWithElement(...) : Vector [<element>] : String | provenance | MaD:4 |
 | Test.java:1637:47:1637:54 | source(...) : Object | Test.java:1637:39:1637:54 | (...)... : String | provenance |  |
-| Test.java:1638:35:1638:36 | in : Vector [<element>] : String | Test.java:1638:45:1638:47 | out [post update] : Collection [<element>] : String | provenance | MaD:444 |
+| Test.java:1638:35:1638:36 | in : Vector [<element>] : String | Test.java:1638:45:1638:47 | out [post update] : Collection [<element>] : String | provenance | MaD:519 |
 | Test.java:1638:45:1638:47 | out [post update] : Collection [<element>] : String | Test.java:1639:20:1639:22 | out : Collection [<element>] : String | provenance |  |
 | Test.java:1639:20:1639:22 | out : Collection [<element>] : String | Test.java:230:19:230:32 | it : Collection [<element>] : String | provenance |  |
-| Test.java:1639:20:1639:22 | out : Collection [<element>] : String | Test.java:1639:9:1639:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:1639:20:1639:22 | out : Collection [<element>] : String | Test.java:1639:9:1639:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:1644:18:1644:55 | newVectorWithElement(...) : Vector [<element>] : String | Test.java:1645:35:1645:36 | in : Vector [<element>] : String | provenance |  |
 | Test.java:1644:39:1644:54 | (...)... : String | Test.java:269:37:269:45 | element : String | provenance |  |
-| Test.java:1644:39:1644:54 | (...)... : String | Test.java:1644:18:1644:55 | newVectorWithElement(...) : Vector [<element>] : String | provenance | MaD:2 |
+| Test.java:1644:39:1644:54 | (...)... : String | Test.java:1644:18:1644:55 | newVectorWithElement(...) : Vector [<element>] : String | provenance | MaD:4 |
 | Test.java:1644:47:1644:54 | source(...) : Object | Test.java:1644:39:1644:54 | (...)... : String | provenance |  |
 | Test.java:1645:10:1645:49 | subtract(...) : Collection [<element>] : String | Test.java:1646:20:1646:22 | out : Collection [<element>] : String | provenance |  |
-| Test.java:1645:35:1645:36 | in : Vector [<element>] : String | Test.java:1645:10:1645:49 | subtract(...) : Collection [<element>] : String | provenance | MaD:446 |
+| Test.java:1645:35:1645:36 | in : Vector [<element>] : String | Test.java:1645:10:1645:49 | subtract(...) : Collection [<element>] : String | provenance | MaD:521 |
 | Test.java:1646:20:1646:22 | out : Collection [<element>] : String | Test.java:230:19:230:32 | it : Collection [<element>] : String | provenance |  |
-| Test.java:1646:20:1646:22 | out : Collection [<element>] : String | Test.java:1646:9:1646:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:1646:20:1646:22 | out : Collection [<element>] : String | Test.java:1646:9:1646:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:1651:18:1651:55 | newVectorWithElement(...) : Vector [<element>] : String | Test.java:1652:35:1652:36 | in : Vector [<element>] : String | provenance |  |
 | Test.java:1651:39:1651:54 | (...)... : String | Test.java:269:37:269:45 | element : String | provenance |  |
-| Test.java:1651:39:1651:54 | (...)... : String | Test.java:1651:18:1651:55 | newVectorWithElement(...) : Vector [<element>] : String | provenance | MaD:2 |
+| Test.java:1651:39:1651:54 | (...)... : String | Test.java:1651:18:1651:55 | newVectorWithElement(...) : Vector [<element>] : String | provenance | MaD:4 |
 | Test.java:1651:47:1651:54 | source(...) : Object | Test.java:1651:39:1651:54 | (...)... : String | provenance |  |
 | Test.java:1652:10:1652:43 | subtract(...) : Collection [<element>] : String | Test.java:1653:20:1653:22 | out : Collection [<element>] : String | provenance |  |
-| Test.java:1652:35:1652:36 | in : Vector [<element>] : String | Test.java:1652:10:1652:43 | subtract(...) : Collection [<element>] : String | provenance | MaD:446 |
+| Test.java:1652:35:1652:36 | in : Vector [<element>] : String | Test.java:1652:10:1652:43 | subtract(...) : Collection [<element>] : String | provenance | MaD:521 |
 | Test.java:1653:20:1653:22 | out : Collection [<element>] : String | Test.java:230:19:230:32 | it : Collection [<element>] : String | provenance |  |
-| Test.java:1653:20:1653:22 | out : Collection [<element>] : String | Test.java:1653:9:1653:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:1653:20:1653:22 | out : Collection [<element>] : String | Test.java:1653:9:1653:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:1658:20:1658:57 | newVectorWithElement(...) : Vector [<element>] : String | Test.java:1659:49:1659:50 | in : Vector [<element>] : String | provenance |  |
 | Test.java:1658:41:1658:56 | (...)... : String | Test.java:269:37:269:45 | element : String | provenance |  |
-| Test.java:1658:41:1658:56 | (...)... : String | Test.java:1658:20:1658:57 | newVectorWithElement(...) : Vector [<element>] : String | provenance | MaD:2 |
+| Test.java:1658:41:1658:56 | (...)... : String | Test.java:1658:20:1658:57 | newVectorWithElement(...) : Vector [<element>] : String | provenance | MaD:4 |
 | Test.java:1658:49:1658:56 | source(...) : Object | Test.java:1658:41:1658:56 | (...)... : String | provenance |  |
 | Test.java:1659:10:1659:51 | synchronizedCollection(...) : Collection [<element>] : String | Test.java:1660:20:1660:22 | out : Collection [<element>] : String | provenance |  |
-| Test.java:1659:49:1659:50 | in : Vector [<element>] : String | Test.java:1659:10:1659:51 | synchronizedCollection(...) : Collection [<element>] : String | provenance | MaD:447 |
+| Test.java:1659:49:1659:50 | in : Vector [<element>] : String | Test.java:1659:10:1659:51 | synchronizedCollection(...) : Collection [<element>] : String | provenance | MaD:522 |
 | Test.java:1660:20:1660:22 | out : Collection [<element>] : String | Test.java:230:19:230:32 | it : Collection [<element>] : String | provenance |  |
-| Test.java:1660:20:1660:22 | out : Collection [<element>] : String | Test.java:1660:9:1660:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:1660:20:1660:22 | out : Collection [<element>] : String | Test.java:1660:9:1660:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:1665:20:1665:57 | newVectorWithElement(...) : Vector [<element>] : String | Test.java:1666:49:1666:50 | in : Vector [<element>] : String | provenance |  |
 | Test.java:1665:41:1665:56 | (...)... : String | Test.java:269:37:269:45 | element : String | provenance |  |
-| Test.java:1665:41:1665:56 | (...)... : String | Test.java:1665:20:1665:57 | newVectorWithElement(...) : Vector [<element>] : String | provenance | MaD:2 |
+| Test.java:1665:41:1665:56 | (...)... : String | Test.java:1665:20:1665:57 | newVectorWithElement(...) : Vector [<element>] : String | provenance | MaD:4 |
 | Test.java:1665:49:1665:56 | source(...) : Object | Test.java:1665:41:1665:56 | (...)... : String | provenance |  |
 | Test.java:1666:10:1666:57 | transformingCollection(...) : Collection [<element>] : String | Test.java:1667:20:1667:22 | out : Collection [<element>] : String | provenance |  |
-| Test.java:1666:49:1666:50 | in : Vector [<element>] : String | Test.java:1666:10:1666:57 | transformingCollection(...) : Collection [<element>] : String | provenance | MaD:448 |
+| Test.java:1666:49:1666:50 | in : Vector [<element>] : String | Test.java:1666:10:1666:57 | transformingCollection(...) : Collection [<element>] : String | provenance | MaD:523 |
 | Test.java:1667:20:1667:22 | out : Collection [<element>] : String | Test.java:230:19:230:32 | it : Collection [<element>] : String | provenance |  |
-| Test.java:1667:20:1667:22 | out : Collection [<element>] : String | Test.java:1667:9:1667:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:1667:20:1667:22 | out : Collection [<element>] : String | Test.java:1667:9:1667:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:1672:18:1672:55 | newVectorWithElement(...) : Vector [<element>] : String | Test.java:1673:32:1673:33 | in : Vector [<element>] : String | provenance |  |
 | Test.java:1672:39:1672:54 | (...)... : String | Test.java:269:37:269:45 | element : String | provenance |  |
-| Test.java:1672:39:1672:54 | (...)... : String | Test.java:1672:18:1672:55 | newVectorWithElement(...) : Vector [<element>] : String | provenance | MaD:2 |
+| Test.java:1672:39:1672:54 | (...)... : String | Test.java:1672:18:1672:55 | newVectorWithElement(...) : Vector [<element>] : String | provenance | MaD:4 |
 | Test.java:1672:47:1672:54 | source(...) : Object | Test.java:1672:39:1672:54 | (...)... : String | provenance |  |
 | Test.java:1673:10:1673:40 | union(...) : Collection [<element>] : String | Test.java:1674:20:1674:22 | out : Collection [<element>] : String | provenance |  |
-| Test.java:1673:32:1673:33 | in : Vector [<element>] : String | Test.java:1673:10:1673:40 | union(...) : Collection [<element>] : String | provenance | MaD:449 |
+| Test.java:1673:32:1673:33 | in : Vector [<element>] : String | Test.java:1673:10:1673:40 | union(...) : Collection [<element>] : String | provenance | MaD:524 |
 | Test.java:1674:20:1674:22 | out : Collection [<element>] : String | Test.java:230:19:230:32 | it : Collection [<element>] : String | provenance |  |
-| Test.java:1674:20:1674:22 | out : Collection [<element>] : String | Test.java:1674:9:1674:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:1674:20:1674:22 | out : Collection [<element>] : String | Test.java:1674:9:1674:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:1679:18:1679:55 | newVectorWithElement(...) : Vector [<element>] : String | Test.java:1680:38:1680:39 | in : Vector [<element>] : String | provenance |  |
 | Test.java:1679:39:1679:54 | (...)... : String | Test.java:269:37:269:45 | element : String | provenance |  |
-| Test.java:1679:39:1679:54 | (...)... : String | Test.java:1679:18:1679:55 | newVectorWithElement(...) : Vector [<element>] : String | provenance | MaD:2 |
+| Test.java:1679:39:1679:54 | (...)... : String | Test.java:1679:18:1679:55 | newVectorWithElement(...) : Vector [<element>] : String | provenance | MaD:4 |
 | Test.java:1679:47:1679:54 | source(...) : Object | Test.java:1679:39:1679:54 | (...)... : String | provenance |  |
 | Test.java:1680:10:1680:40 | union(...) : Collection [<element>] : String | Test.java:1681:20:1681:22 | out : Collection [<element>] : String | provenance |  |
-| Test.java:1680:38:1680:39 | in : Vector [<element>] : String | Test.java:1680:10:1680:40 | union(...) : Collection [<element>] : String | provenance | MaD:450 |
+| Test.java:1680:38:1680:39 | in : Vector [<element>] : String | Test.java:1680:10:1680:40 | union(...) : Collection [<element>] : String | provenance | MaD:525 |
 | Test.java:1681:20:1681:22 | out : Collection [<element>] : String | Test.java:230:19:230:32 | it : Collection [<element>] : String | provenance |  |
-| Test.java:1681:20:1681:22 | out : Collection [<element>] : String | Test.java:1681:9:1681:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:1681:20:1681:22 | out : Collection [<element>] : String | Test.java:1681:9:1681:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:1686:20:1686:57 | newVectorWithElement(...) : Vector [<element>] : String | Test.java:1687:49:1687:50 | in : Vector [<element>] : String | provenance |  |
 | Test.java:1686:41:1686:56 | (...)... : String | Test.java:269:37:269:45 | element : String | provenance |  |
-| Test.java:1686:41:1686:56 | (...)... : String | Test.java:1686:20:1686:57 | newVectorWithElement(...) : Vector [<element>] : String | provenance | MaD:2 |
+| Test.java:1686:41:1686:56 | (...)... : String | Test.java:1686:20:1686:57 | newVectorWithElement(...) : Vector [<element>] : String | provenance | MaD:4 |
 | Test.java:1686:49:1686:56 | source(...) : Object | Test.java:1686:41:1686:56 | (...)... : String | provenance |  |
 | Test.java:1687:10:1687:51 | unmodifiableCollection(...) : Collection [<element>] : String | Test.java:1688:20:1688:22 | out : Collection [<element>] : String | provenance |  |
-| Test.java:1687:49:1687:50 | in : Vector [<element>] : String | Test.java:1687:10:1687:51 | unmodifiableCollection(...) : Collection [<element>] : String | provenance | MaD:451 |
+| Test.java:1687:49:1687:50 | in : Vector [<element>] : String | Test.java:1687:10:1687:51 | unmodifiableCollection(...) : Collection [<element>] : String | provenance | MaD:526 |
 | Test.java:1688:20:1688:22 | out : Collection [<element>] : String | Test.java:230:19:230:32 | it : Collection [<element>] : String | provenance |  |
-| Test.java:1688:20:1688:22 | out : Collection [<element>] : String | Test.java:1688:9:1688:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:1688:20:1688:22 | out : Collection [<element>] : String | Test.java:1688:9:1688:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:1693:21:1693:63 | newEnumerationWithElement(...) : IteratorEnumeration [<element>] : String | Test.java:1694:31:1694:32 | in : IteratorEnumeration [<element>] : String | provenance |  |
 | Test.java:1693:47:1693:62 | (...)... : String | Test.java:256:47:256:55 | element : String | provenance |  |
-| Test.java:1693:47:1693:62 | (...)... : String | Test.java:1693:21:1693:63 | newEnumerationWithElement(...) : IteratorEnumeration [<element>] : String | provenance | MaD:2 |
+| Test.java:1693:47:1693:62 | (...)... : String | Test.java:1693:21:1693:63 | newEnumerationWithElement(...) : IteratorEnumeration [<element>] : String | provenance | MaD:4 |
 | Test.java:1693:55:1693:62 | source(...) : Object | Test.java:1693:47:1693:62 | (...)... : String | provenance |  |
 | Test.java:1694:10:1694:36 | get(...) : String | Test.java:1695:9:1695:11 | out | provenance |  |
-| Test.java:1694:31:1694:32 | in : IteratorEnumeration [<element>] : String | Test.java:1694:10:1694:36 | get(...) : String | provenance | MaD:452 |
+| Test.java:1694:31:1694:32 | in : IteratorEnumeration [<element>] : String | Test.java:1694:10:1694:36 | get(...) : String | provenance | MaD:527 |
 | Test.java:1700:21:1700:63 | newEnumerationWithElement(...) : IteratorEnumeration [<element>] : String | Test.java:1701:34:1701:35 | in : IteratorEnumeration [<element>] : String | provenance |  |
 | Test.java:1700:47:1700:62 | (...)... : String | Test.java:256:47:256:55 | element : String | provenance |  |
-| Test.java:1700:47:1700:62 | (...)... : String | Test.java:1700:21:1700:63 | newEnumerationWithElement(...) : IteratorEnumeration [<element>] : String | provenance | MaD:2 |
+| Test.java:1700:47:1700:62 | (...)... : String | Test.java:1700:21:1700:63 | newEnumerationWithElement(...) : IteratorEnumeration [<element>] : String | provenance | MaD:4 |
 | Test.java:1700:55:1700:62 | source(...) : Object | Test.java:1700:47:1700:62 | (...)... : String | provenance |  |
 | Test.java:1701:10:1701:36 | toList(...) : List [<element>] : String | Test.java:1702:20:1702:22 | out : List [<element>] : String | provenance |  |
-| Test.java:1701:34:1701:35 | in : IteratorEnumeration [<element>] : String | Test.java:1701:10:1701:36 | toList(...) : List [<element>] : String | provenance | MaD:453 |
+| Test.java:1701:34:1701:35 | in : IteratorEnumeration [<element>] : String | Test.java:1701:10:1701:36 | toList(...) : List [<element>] : String | provenance | MaD:528 |
 | Test.java:1702:20:1702:22 | out : List [<element>] : String | Test.java:230:19:230:32 | it : List [<element>] : String | provenance |  |
-| Test.java:1702:20:1702:22 | out : List [<element>] : String | Test.java:1702:9:1702:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:1702:20:1702:22 | out : List [<element>] : String | Test.java:1702:9:1702:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:1707:25:1707:49 | (...)... : StringTokenizer | Test.java:1708:34:1708:35 | in : StringTokenizer | provenance |  |
 | Test.java:1707:42:1707:49 | source(...) : Object | Test.java:1707:25:1707:49 | (...)... : StringTokenizer | provenance |  |
 | Test.java:1708:10:1708:36 | toList(...) : List [<element>] : Object | Test.java:1709:20:1709:22 | out : List [<element>] : Object | provenance |  |
-| Test.java:1708:34:1708:35 | in : StringTokenizer | Test.java:1708:10:1708:36 | toList(...) : List [<element>] : Object | provenance | MaD:454 |
+| Test.java:1708:34:1708:35 | in : StringTokenizer | Test.java:1708:10:1708:36 | toList(...) : List [<element>] : Object | provenance | MaD:529 |
 | Test.java:1709:20:1709:22 | out : List [<element>] : Object | Test.java:230:19:230:32 | it : List [<element>] : Object | provenance |  |
-| Test.java:1709:20:1709:22 | out : List [<element>] : Object | Test.java:1709:9:1709:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:1709:20:1709:22 | out : List [<element>] : Object | Test.java:1709:9:1709:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:1714:24:1714:69 | newFluentIterableWithElement(...) : FluentIterable [<element>] : String | Test.java:1715:10:1715:11 | in : FluentIterable [<element>] : String | provenance |  |
 | Test.java:1714:53:1714:68 | (...)... : String | Test.java:257:53:257:61 | element : String | provenance |  |
-| Test.java:1714:53:1714:68 | (...)... : String | Test.java:1714:24:1714:69 | newFluentIterableWithElement(...) : FluentIterable [<element>] : String | provenance | MaD:469 |
+| Test.java:1714:53:1714:68 | (...)... : String | Test.java:1714:24:1714:69 | newFluentIterableWithElement(...) : FluentIterable [<element>] : String | provenance | MaD:544 |
 | Test.java:1714:61:1714:68 | source(...) : Object | Test.java:1714:53:1714:68 | (...)... : String | provenance |  |
-| Test.java:1715:10:1715:11 | in : FluentIterable [<element>] : String | Test.java:1715:10:1715:34 | append(...) : FluentIterable [<element>] : String | provenance | MaD:455 |
+| Test.java:1715:10:1715:11 | in : FluentIterable [<element>] : String | Test.java:1715:10:1715:34 | append(...) : FluentIterable [<element>] : String | provenance | MaD:531 |
 | Test.java:1715:10:1715:34 | append(...) : FluentIterable [<element>] : String | Test.java:1716:20:1716:22 | out : FluentIterable [<element>] : String | provenance |  |
 | Test.java:1716:20:1716:22 | out : FluentIterable [<element>] : String | Test.java:230:19:230:32 | it : FluentIterable [<element>] : String | provenance |  |
-| Test.java:1716:20:1716:22 | out : FluentIterable [<element>] : String | Test.java:1716:9:1716:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:1716:20:1716:22 | out : FluentIterable [<element>] : String | Test.java:1716:9:1716:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:1721:18:1721:63 | newFluentIterableWithElement(...) : FluentIterable [<element>] : String | Test.java:1723:26:1723:27 | in : FluentIterable [<element>] : String | provenance |  |
 | Test.java:1721:47:1721:62 | (...)... : String | Test.java:257:53:257:61 | element : String | provenance |  |
-| Test.java:1721:47:1721:62 | (...)... : String | Test.java:1721:18:1721:63 | newFluentIterableWithElement(...) : FluentIterable [<element>] : String | provenance | MaD:469 |
+| Test.java:1721:47:1721:62 | (...)... : String | Test.java:1721:18:1721:63 | newFluentIterableWithElement(...) : FluentIterable [<element>] : String | provenance | MaD:544 |
 | Test.java:1721:55:1721:62 | source(...) : Object | Test.java:1721:47:1721:62 | (...)... : String | provenance |  |
 | Test.java:1723:10:1723:28 | append(...) : FluentIterable [<element>] : String | Test.java:1724:20:1724:22 | out : FluentIterable [<element>] : String | provenance |  |
-| Test.java:1723:26:1723:27 | in : FluentIterable [<element>] : String | Test.java:1723:10:1723:28 | append(...) : FluentIterable [<element>] : String | provenance | MaD:456 |
+| Test.java:1723:26:1723:27 | in : FluentIterable [<element>] : String | Test.java:1723:10:1723:28 | append(...) : FluentIterable [<element>] : String | provenance | MaD:530 |
 | Test.java:1724:20:1724:22 | out : FluentIterable [<element>] : String | Test.java:230:19:230:32 | it : FluentIterable [<element>] : String | provenance |  |
-| Test.java:1724:20:1724:22 | out : FluentIterable [<element>] : String | Test.java:1724:9:1724:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:1724:20:1724:22 | out : FluentIterable [<element>] : String | Test.java:1724:9:1724:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:1729:16:1729:23 | source(...) : Object | Test.java:1731:26:1731:27 | in : Object | provenance |  |
 | Test.java:1731:10:1731:28 | append(...) : FluentIterable [<element>] : Object | Test.java:1732:20:1732:22 | out : FluentIterable [<element>] : Object | provenance |  |
-| Test.java:1731:10:1731:28 | new ..[] { .. } : Object[] [[]] : Object | Test.java:1731:10:1731:28 | append(...) : FluentIterable [<element>] : Object | provenance | MaD:458 |
+| Test.java:1731:10:1731:28 | new ..[] { .. } : Object[] [[]] : Object | Test.java:1731:10:1731:28 | append(...) : FluentIterable [<element>] : Object | provenance | MaD:532 |
 | Test.java:1731:26:1731:27 | in : Object | Test.java:1731:10:1731:28 | new ..[] { .. } : Object[] [[]] : Object | provenance |  |
 | Test.java:1732:20:1732:22 | out : FluentIterable [<element>] : Object | Test.java:230:19:230:32 | it : FluentIterable [<element>] : Object | provenance |  |
-| Test.java:1732:20:1732:22 | out : FluentIterable [<element>] : Object | Test.java:1732:9:1732:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:1732:20:1732:22 | out : FluentIterable [<element>] : Object | Test.java:1732:9:1732:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:1737:24:1737:69 | newFluentIterableWithElement(...) : FluentIterable [<element>] : String | Test.java:1738:10:1738:11 | in : FluentIterable [<element>] : String | provenance |  |
 | Test.java:1737:53:1737:68 | (...)... : String | Test.java:257:53:257:61 | element : String | provenance |  |
-| Test.java:1737:53:1737:68 | (...)... : String | Test.java:1737:24:1737:69 | newFluentIterableWithElement(...) : FluentIterable [<element>] : String | provenance | MaD:469 |
+| Test.java:1737:53:1737:68 | (...)... : String | Test.java:1737:24:1737:69 | newFluentIterableWithElement(...) : FluentIterable [<element>] : String | provenance | MaD:544 |
 | Test.java:1737:61:1737:68 | source(...) : Object | Test.java:1737:53:1737:68 | (...)... : String | provenance |  |
-| Test.java:1738:10:1738:11 | in : FluentIterable [<element>] : String | Test.java:1738:10:1738:20 | append(...) : FluentIterable [<element>] : String | provenance | MaD:457 |
+| Test.java:1738:10:1738:11 | in : FluentIterable [<element>] : String | Test.java:1738:10:1738:20 | append(...) : FluentIterable [<element>] : String | provenance | MaD:533 |
 | Test.java:1738:10:1738:20 | append(...) : FluentIterable [<element>] : String | Test.java:1739:20:1739:22 | out : FluentIterable [<element>] : String | provenance |  |
 | Test.java:1739:20:1739:22 | out : FluentIterable [<element>] : String | Test.java:230:19:230:32 | it : FluentIterable [<element>] : String | provenance |  |
-| Test.java:1739:20:1739:22 | out : FluentIterable [<element>] : String | Test.java:1739:9:1739:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:1739:20:1739:22 | out : FluentIterable [<element>] : String | Test.java:1739:9:1739:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:1744:24:1744:69 | newFluentIterableWithElement(...) : FluentIterable [<element>] : String | Test.java:1745:10:1745:11 | in : FluentIterable [<element>] : String | provenance |  |
 | Test.java:1744:53:1744:68 | (...)... : String | Test.java:257:53:257:61 | element : String | provenance |  |
-| Test.java:1744:53:1744:68 | (...)... : String | Test.java:1744:24:1744:69 | newFluentIterableWithElement(...) : FluentIterable [<element>] : String | provenance | MaD:469 |
+| Test.java:1744:53:1744:68 | (...)... : String | Test.java:1744:24:1744:69 | newFluentIterableWithElement(...) : FluentIterable [<element>] : String | provenance | MaD:544 |
 | Test.java:1744:61:1744:68 | source(...) : Object | Test.java:1744:53:1744:68 | (...)... : String | provenance |  |
-| Test.java:1745:10:1745:11 | in : FluentIterable [<element>] : String | Test.java:1745:10:1745:27 | asEnumeration(...) : Enumeration [<element>] : String | provenance | MaD:459 |
+| Test.java:1745:10:1745:11 | in : FluentIterable [<element>] : String | Test.java:1745:10:1745:27 | asEnumeration(...) : Enumeration [<element>] : String | provenance | MaD:534 |
 | Test.java:1745:10:1745:27 | asEnumeration(...) : Enumeration [<element>] : String | Test.java:1746:20:1746:22 | out : Enumeration [<element>] : String | provenance |  |
 | Test.java:1746:20:1746:22 | out : Enumeration [<element>] : String | Test.java:234:19:234:42 | container : Enumeration [<element>] : String | provenance |  |
-| Test.java:1746:20:1746:22 | out : Enumeration [<element>] : String | Test.java:1746:9:1746:23 | getElement(...) | provenance | MaD:3 |
+| Test.java:1746:20:1746:22 | out : Enumeration [<element>] : String | Test.java:1746:9:1746:23 | getElement(...) | provenance | MaD:5 |
 | Test.java:1751:24:1751:69 | newFluentIterableWithElement(...) : FluentIterable [<element>] : String | Test.java:1752:10:1752:11 | in : FluentIterable [<element>] : String | provenance |  |
 | Test.java:1751:53:1751:68 | (...)... : String | Test.java:257:53:257:61 | element : String | provenance |  |
-| Test.java:1751:53:1751:68 | (...)... : String | Test.java:1751:24:1751:69 | newFluentIterableWithElement(...) : FluentIterable [<element>] : String | provenance | MaD:469 |
+| Test.java:1751:53:1751:68 | (...)... : String | Test.java:1751:24:1751:69 | newFluentIterableWithElement(...) : FluentIterable [<element>] : String | provenance | MaD:544 |
 | Test.java:1751:61:1751:68 | source(...) : Object | Test.java:1751:53:1751:68 | (...)... : String | provenance |  |
-| Test.java:1752:10:1752:11 | in : FluentIterable [<element>] : String | Test.java:1752:10:1752:31 | collate(...) : FluentIterable [<element>] : String | provenance | MaD:460 |
+| Test.java:1752:10:1752:11 | in : FluentIterable [<element>] : String | Test.java:1752:10:1752:31 | collate(...) : FluentIterable [<element>] : String | provenance | MaD:536 |
 | Test.java:1752:10:1752:31 | collate(...) : FluentIterable [<element>] : String | Test.java:1753:20:1753:22 | out : FluentIterable [<element>] : String | provenance |  |
 | Test.java:1753:20:1753:22 | out : FluentIterable [<element>] : String | Test.java:230:19:230:32 | it : FluentIterable [<element>] : String | provenance |  |
-| Test.java:1753:20:1753:22 | out : FluentIterable [<element>] : String | Test.java:1753:9:1753:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:1753:20:1753:22 | out : FluentIterable [<element>] : String | Test.java:1753:9:1753:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:1758:24:1758:69 | newFluentIterableWithElement(...) : FluentIterable [<element>] : String | Test.java:1759:10:1759:11 | in : FluentIterable [<element>] : String | provenance |  |
 | Test.java:1758:53:1758:68 | (...)... : String | Test.java:257:53:257:61 | element : String | provenance |  |
-| Test.java:1758:53:1758:68 | (...)... : String | Test.java:1758:24:1758:69 | newFluentIterableWithElement(...) : FluentIterable [<element>] : String | provenance | MaD:469 |
+| Test.java:1758:53:1758:68 | (...)... : String | Test.java:1758:24:1758:69 | newFluentIterableWithElement(...) : FluentIterable [<element>] : String | provenance | MaD:544 |
 | Test.java:1758:61:1758:68 | source(...) : Object | Test.java:1758:53:1758:68 | (...)... : String | provenance |  |
-| Test.java:1759:10:1759:11 | in : FluentIterable [<element>] : String | Test.java:1759:10:1759:25 | collate(...) : FluentIterable [<element>] : String | provenance | MaD:460 |
+| Test.java:1759:10:1759:11 | in : FluentIterable [<element>] : String | Test.java:1759:10:1759:25 | collate(...) : FluentIterable [<element>] : String | provenance | MaD:536 |
 | Test.java:1759:10:1759:25 | collate(...) : FluentIterable [<element>] : String | Test.java:1760:20:1760:22 | out : FluentIterable [<element>] : String | provenance |  |
 | Test.java:1760:20:1760:22 | out : FluentIterable [<element>] : String | Test.java:230:19:230:32 | it : FluentIterable [<element>] : String | provenance |  |
-| Test.java:1760:20:1760:22 | out : FluentIterable [<element>] : String | Test.java:1760:9:1760:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:1760:20:1760:22 | out : FluentIterable [<element>] : String | Test.java:1760:9:1760:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:1765:18:1765:63 | newFluentIterableWithElement(...) : FluentIterable [<element>] : String | Test.java:1767:27:1767:28 | in : FluentIterable [<element>] : String | provenance |  |
 | Test.java:1765:47:1765:62 | (...)... : String | Test.java:257:53:257:61 | element : String | provenance |  |
-| Test.java:1765:47:1765:62 | (...)... : String | Test.java:1765:18:1765:63 | newFluentIterableWithElement(...) : FluentIterable [<element>] : String | provenance | MaD:469 |
+| Test.java:1765:47:1765:62 | (...)... : String | Test.java:1765:18:1765:63 | newFluentIterableWithElement(...) : FluentIterable [<element>] : String | provenance | MaD:544 |
 | Test.java:1765:55:1765:62 | source(...) : Object | Test.java:1765:47:1765:62 | (...)... : String | provenance |  |
 | Test.java:1767:10:1767:35 | collate(...) : FluentIterable [<element>] : String | Test.java:1768:20:1768:22 | out : FluentIterable [<element>] : String | provenance |  |
-| Test.java:1767:27:1767:28 | in : FluentIterable [<element>] : String | Test.java:1767:10:1767:35 | collate(...) : FluentIterable [<element>] : String | provenance | MaD:461 |
+| Test.java:1767:27:1767:28 | in : FluentIterable [<element>] : String | Test.java:1767:10:1767:35 | collate(...) : FluentIterable [<element>] : String | provenance | MaD:535 |
 | Test.java:1768:20:1768:22 | out : FluentIterable [<element>] : String | Test.java:230:19:230:32 | it : FluentIterable [<element>] : String | provenance |  |
-| Test.java:1768:20:1768:22 | out : FluentIterable [<element>] : String | Test.java:1768:9:1768:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:1768:20:1768:22 | out : FluentIterable [<element>] : String | Test.java:1768:9:1768:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:1773:18:1773:63 | newFluentIterableWithElement(...) : FluentIterable [<element>] : String | Test.java:1775:27:1775:28 | in : FluentIterable [<element>] : String | provenance |  |
 | Test.java:1773:47:1773:62 | (...)... : String | Test.java:257:53:257:61 | element : String | provenance |  |
-| Test.java:1773:47:1773:62 | (...)... : String | Test.java:1773:18:1773:63 | newFluentIterableWithElement(...) : FluentIterable [<element>] : String | provenance | MaD:469 |
+| Test.java:1773:47:1773:62 | (...)... : String | Test.java:1773:18:1773:63 | newFluentIterableWithElement(...) : FluentIterable [<element>] : String | provenance | MaD:544 |
 | Test.java:1773:55:1773:62 | source(...) : Object | Test.java:1773:47:1773:62 | (...)... : String | provenance |  |
 | Test.java:1775:10:1775:29 | collate(...) : FluentIterable [<element>] : String | Test.java:1776:20:1776:22 | out : FluentIterable [<element>] : String | provenance |  |
-| Test.java:1775:27:1775:28 | in : FluentIterable [<element>] : String | Test.java:1775:10:1775:29 | collate(...) : FluentIterable [<element>] : String | provenance | MaD:461 |
+| Test.java:1775:27:1775:28 | in : FluentIterable [<element>] : String | Test.java:1775:10:1775:29 | collate(...) : FluentIterable [<element>] : String | provenance | MaD:535 |
 | Test.java:1776:20:1776:22 | out : FluentIterable [<element>] : String | Test.java:230:19:230:32 | it : FluentIterable [<element>] : String | provenance |  |
-| Test.java:1776:20:1776:22 | out : FluentIterable [<element>] : String | Test.java:1776:9:1776:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:1776:20:1776:22 | out : FluentIterable [<element>] : String | Test.java:1776:9:1776:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:1781:24:1781:69 | newFluentIterableWithElement(...) : FluentIterable [<element>] : String | Test.java:1782:4:1782:5 | in : FluentIterable [<element>] : String | provenance |  |
 | Test.java:1781:53:1781:68 | (...)... : String | Test.java:257:53:257:61 | element : String | provenance |  |
-| Test.java:1781:53:1781:68 | (...)... : String | Test.java:1781:24:1781:69 | newFluentIterableWithElement(...) : FluentIterable [<element>] : String | provenance | MaD:469 |
+| Test.java:1781:53:1781:68 | (...)... : String | Test.java:1781:24:1781:69 | newFluentIterableWithElement(...) : FluentIterable [<element>] : String | provenance | MaD:544 |
 | Test.java:1781:61:1781:68 | source(...) : Object | Test.java:1781:53:1781:68 | (...)... : String | provenance |  |
-| Test.java:1782:4:1782:5 | in : FluentIterable [<element>] : String | Test.java:1782:16:1782:18 | out [post update] : Collection [<element>] : String | provenance | MaD:462 |
+| Test.java:1782:4:1782:5 | in : FluentIterable [<element>] : String | Test.java:1782:16:1782:18 | out [post update] : Collection [<element>] : String | provenance | MaD:537 |
 | Test.java:1782:16:1782:18 | out [post update] : Collection [<element>] : String | Test.java:1783:20:1783:22 | out : Collection [<element>] : String | provenance |  |
 | Test.java:1783:20:1783:22 | out : Collection [<element>] : String | Test.java:230:19:230:32 | it : Collection [<element>] : String | provenance |  |
-| Test.java:1783:20:1783:22 | out : Collection [<element>] : String | Test.java:1783:9:1783:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:1783:20:1783:22 | out : Collection [<element>] : String | Test.java:1783:9:1783:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:1788:24:1788:69 | newFluentIterableWithElement(...) : FluentIterable [<element>] : String | Test.java:1789:10:1789:11 | in : FluentIterable [<element>] : String | provenance |  |
 | Test.java:1788:53:1788:68 | (...)... : String | Test.java:257:53:257:61 | element : String | provenance |  |
-| Test.java:1788:53:1788:68 | (...)... : String | Test.java:1788:24:1788:69 | newFluentIterableWithElement(...) : FluentIterable [<element>] : String | provenance | MaD:469 |
+| Test.java:1788:53:1788:68 | (...)... : String | Test.java:1788:24:1788:69 | newFluentIterableWithElement(...) : FluentIterable [<element>] : String | provenance | MaD:544 |
 | Test.java:1788:61:1788:68 | source(...) : Object | Test.java:1788:53:1788:68 | (...)... : String | provenance |  |
-| Test.java:1789:10:1789:11 | in : FluentIterable [<element>] : String | Test.java:1789:10:1789:18 | eval(...) : FluentIterable [<element>] : String | provenance | MaD:463 |
+| Test.java:1789:10:1789:11 | in : FluentIterable [<element>] : String | Test.java:1789:10:1789:18 | eval(...) : FluentIterable [<element>] : String | provenance | MaD:538 |
 | Test.java:1789:10:1789:18 | eval(...) : FluentIterable [<element>] : String | Test.java:1790:20:1790:22 | out : FluentIterable [<element>] : String | provenance |  |
 | Test.java:1790:20:1790:22 | out : FluentIterable [<element>] : String | Test.java:230:19:230:32 | it : FluentIterable [<element>] : String | provenance |  |
-| Test.java:1790:20:1790:22 | out : FluentIterable [<element>] : String | Test.java:1790:9:1790:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:1790:20:1790:22 | out : FluentIterable [<element>] : String | Test.java:1790:9:1790:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:1795:24:1795:69 | newFluentIterableWithElement(...) : FluentIterable [<element>] : String | Test.java:1796:10:1796:11 | in : FluentIterable [<element>] : String | provenance |  |
 | Test.java:1795:53:1795:68 | (...)... : String | Test.java:257:53:257:61 | element : String | provenance |  |
-| Test.java:1795:53:1795:68 | (...)... : String | Test.java:1795:24:1795:69 | newFluentIterableWithElement(...) : FluentIterable [<element>] : String | provenance | MaD:469 |
+| Test.java:1795:53:1795:68 | (...)... : String | Test.java:1795:24:1795:69 | newFluentIterableWithElement(...) : FluentIterable [<element>] : String | provenance | MaD:544 |
 | Test.java:1795:61:1795:68 | source(...) : Object | Test.java:1795:53:1795:68 | (...)... : String | provenance |  |
-| Test.java:1796:10:1796:11 | in : FluentIterable [<element>] : String | Test.java:1796:10:1796:24 | filter(...) : FluentIterable [<element>] : String | provenance | MaD:464 |
+| Test.java:1796:10:1796:11 | in : FluentIterable [<element>] : String | Test.java:1796:10:1796:24 | filter(...) : FluentIterable [<element>] : String | provenance | MaD:539 |
 | Test.java:1796:10:1796:24 | filter(...) : FluentIterable [<element>] : String | Test.java:1797:20:1797:22 | out : FluentIterable [<element>] : String | provenance |  |
 | Test.java:1797:20:1797:22 | out : FluentIterable [<element>] : String | Test.java:230:19:230:32 | it : FluentIterable [<element>] : String | provenance |  |
-| Test.java:1797:20:1797:22 | out : FluentIterable [<element>] : String | Test.java:1797:9:1797:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:1797:20:1797:22 | out : FluentIterable [<element>] : String | Test.java:1797:9:1797:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:1802:24:1802:69 | newFluentIterableWithElement(...) : FluentIterable [<element>] : String | Test.java:1803:10:1803:11 | in : FluentIterable [<element>] : String | provenance |  |
 | Test.java:1802:53:1802:68 | (...)... : String | Test.java:257:53:257:61 | element : String | provenance |  |
-| Test.java:1802:53:1802:68 | (...)... : String | Test.java:1802:24:1802:69 | newFluentIterableWithElement(...) : FluentIterable [<element>] : String | provenance | MaD:469 |
+| Test.java:1802:53:1802:68 | (...)... : String | Test.java:1802:24:1802:69 | newFluentIterableWithElement(...) : FluentIterable [<element>] : String | provenance | MaD:544 |
 | Test.java:1802:61:1802:68 | source(...) : Object | Test.java:1802:53:1802:68 | (...)... : String | provenance |  |
-| Test.java:1803:10:1803:11 | in : FluentIterable [<element>] : String | Test.java:1803:10:1803:18 | get(...) : String | provenance | MaD:465 |
+| Test.java:1803:10:1803:11 | in : FluentIterable [<element>] : String | Test.java:1803:10:1803:18 | get(...) : String | provenance | MaD:540 |
 | Test.java:1803:10:1803:18 | get(...) : String | Test.java:1804:9:1804:11 | out | provenance |  |
 | Test.java:1809:24:1809:69 | newFluentIterableWithElement(...) : FluentIterable [<element>] : String | Test.java:1810:10:1810:11 | in : FluentIterable [<element>] : String | provenance |  |
 | Test.java:1809:53:1809:68 | (...)... : String | Test.java:257:53:257:61 | element : String | provenance |  |
-| Test.java:1809:53:1809:68 | (...)... : String | Test.java:1809:24:1809:69 | newFluentIterableWithElement(...) : FluentIterable [<element>] : String | provenance | MaD:469 |
+| Test.java:1809:53:1809:68 | (...)... : String | Test.java:1809:24:1809:69 | newFluentIterableWithElement(...) : FluentIterable [<element>] : String | provenance | MaD:544 |
 | Test.java:1809:61:1809:68 | source(...) : Object | Test.java:1809:53:1809:68 | (...)... : String | provenance |  |
-| Test.java:1810:10:1810:11 | in : FluentIterable [<element>] : String | Test.java:1810:10:1810:21 | limit(...) : FluentIterable [<element>] : String | provenance | MaD:466 |
+| Test.java:1810:10:1810:11 | in : FluentIterable [<element>] : String | Test.java:1810:10:1810:21 | limit(...) : FluentIterable [<element>] : String | provenance | MaD:541 |
 | Test.java:1810:10:1810:21 | limit(...) : FluentIterable [<element>] : String | Test.java:1811:20:1811:22 | out : FluentIterable [<element>] : String | provenance |  |
 | Test.java:1811:20:1811:22 | out : FluentIterable [<element>] : String | Test.java:230:19:230:32 | it : FluentIterable [<element>] : String | provenance |  |
-| Test.java:1811:20:1811:22 | out : FluentIterable [<element>] : String | Test.java:1811:9:1811:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:1811:20:1811:22 | out : FluentIterable [<element>] : String | Test.java:1811:9:1811:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:1816:24:1816:69 | newFluentIterableWithElement(...) : FluentIterable [<element>] : String | Test.java:1817:10:1817:11 | in : FluentIterable [<element>] : String | provenance |  |
 | Test.java:1816:53:1816:68 | (...)... : String | Test.java:257:53:257:61 | element : String | provenance |  |
-| Test.java:1816:53:1816:68 | (...)... : String | Test.java:1816:24:1816:69 | newFluentIterableWithElement(...) : FluentIterable [<element>] : String | provenance | MaD:469 |
+| Test.java:1816:53:1816:68 | (...)... : String | Test.java:1816:24:1816:69 | newFluentIterableWithElement(...) : FluentIterable [<element>] : String | provenance | MaD:544 |
 | Test.java:1816:61:1816:68 | source(...) : Object | Test.java:1816:53:1816:68 | (...)... : String | provenance |  |
-| Test.java:1817:10:1817:11 | in : FluentIterable [<element>] : String | Test.java:1817:10:1817:18 | loop(...) : FluentIterable [<element>] : String | provenance | MaD:467 |
+| Test.java:1817:10:1817:11 | in : FluentIterable [<element>] : String | Test.java:1817:10:1817:18 | loop(...) : FluentIterable [<element>] : String | provenance | MaD:542 |
 | Test.java:1817:10:1817:18 | loop(...) : FluentIterable [<element>] : String | Test.java:1818:20:1818:22 | out : FluentIterable [<element>] : String | provenance |  |
 | Test.java:1818:20:1818:22 | out : FluentIterable [<element>] : String | Test.java:230:19:230:32 | it : FluentIterable [<element>] : String | provenance |  |
-| Test.java:1818:20:1818:22 | out : FluentIterable [<element>] : String | Test.java:1818:9:1818:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:1818:20:1818:22 | out : FluentIterable [<element>] : String | Test.java:1818:9:1818:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:1823:18:1823:63 | newFluentIterableWithElement(...) : FluentIterable [<element>] : String | Test.java:1824:28:1824:29 | in : FluentIterable [<element>] : String | provenance |  |
 | Test.java:1823:47:1823:62 | (...)... : String | Test.java:257:53:257:61 | element : String | provenance |  |
-| Test.java:1823:47:1823:62 | (...)... : String | Test.java:1823:18:1823:63 | newFluentIterableWithElement(...) : FluentIterable [<element>] : String | provenance | MaD:469 |
+| Test.java:1823:47:1823:62 | (...)... : String | Test.java:1823:18:1823:63 | newFluentIterableWithElement(...) : FluentIterable [<element>] : String | provenance | MaD:544 |
 | Test.java:1823:55:1823:62 | source(...) : Object | Test.java:1823:47:1823:62 | (...)... : String | provenance |  |
 | Test.java:1824:10:1824:30 | of(...) : FluentIterable [<element>] : String | Test.java:1825:20:1825:22 | out : FluentIterable [<element>] : String | provenance |  |
-| Test.java:1824:28:1824:29 | in : FluentIterable [<element>] : String | Test.java:1824:10:1824:30 | of(...) : FluentIterable [<element>] : String | provenance | MaD:468 |
+| Test.java:1824:28:1824:29 | in : FluentIterable [<element>] : String | Test.java:1824:10:1824:30 | of(...) : FluentIterable [<element>] : String | provenance | MaD:543 |
 | Test.java:1825:20:1825:22 | out : FluentIterable [<element>] : String | Test.java:230:19:230:32 | it : FluentIterable [<element>] : String | provenance |  |
-| Test.java:1825:20:1825:22 | out : FluentIterable [<element>] : String | Test.java:1825:9:1825:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:1825:20:1825:22 | out : FluentIterable [<element>] : String | Test.java:1825:9:1825:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:1830:16:1830:23 | source(...) : Object | Test.java:1831:28:1831:29 | in : Object | provenance |  |
 | Test.java:1831:10:1831:30 | of(...) : FluentIterable [<element>] : Object | Test.java:1832:20:1832:22 | out : FluentIterable [<element>] : Object | provenance |  |
-| Test.java:1831:28:1831:29 | in : Object | Test.java:1831:10:1831:30 | of(...) : FluentIterable [<element>] : Object | provenance | MaD:469 |
+| Test.java:1831:28:1831:29 | in : Object | Test.java:1831:10:1831:30 | of(...) : FluentIterable [<element>] : Object | provenance | MaD:544 |
 | Test.java:1832:20:1832:22 | out : FluentIterable [<element>] : Object | Test.java:230:19:230:32 | it : FluentIterable [<element>] : Object | provenance |  |
-| Test.java:1832:20:1832:22 | out : FluentIterable [<element>] : Object | Test.java:1832:9:1832:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:1832:20:1832:22 | out : FluentIterable [<element>] : Object | Test.java:1832:9:1832:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:1837:18:1837:54 | newWithArrayElement(...) : Object[] [[]] : String | Test.java:1838:28:1838:29 | in : Object[] [[]] : String | provenance |  |
 | Test.java:1837:38:1837:53 | (...)... : String | Test.java:251:31:251:44 | element : String | provenance |  |
 | Test.java:1837:38:1837:53 | (...)... : String | Test.java:1837:18:1837:54 | newWithArrayElement(...) : Object[] [[]] : String | provenance |  |
 | Test.java:1837:46:1837:53 | source(...) : Object | Test.java:1837:38:1837:53 | (...)... : String | provenance |  |
 | Test.java:1838:10:1838:30 | of(...) : FluentIterable [<element>] : String | Test.java:1839:20:1839:22 | out : FluentIterable [<element>] : String | provenance |  |
-| Test.java:1838:28:1838:29 | in : Object[] [[]] : String | Test.java:1838:10:1838:30 | of(...) : FluentIterable [<element>] : String | provenance | MaD:470 |
+| Test.java:1838:28:1838:29 | in : Object[] [[]] : String | Test.java:1838:10:1838:30 | of(...) : FluentIterable [<element>] : String | provenance | MaD:545 |
 | Test.java:1839:20:1839:22 | out : FluentIterable [<element>] : String | Test.java:230:19:230:32 | it : FluentIterable [<element>] : String | provenance |  |
-| Test.java:1839:20:1839:22 | out : FluentIterable [<element>] : String | Test.java:1839:9:1839:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:1839:20:1839:22 | out : FluentIterable [<element>] : String | Test.java:1839:9:1839:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:1844:24:1844:69 | newFluentIterableWithElement(...) : FluentIterable [<element>] : String | Test.java:1845:10:1845:11 | in : FluentIterable [<element>] : String | provenance |  |
 | Test.java:1844:53:1844:68 | (...)... : String | Test.java:257:53:257:61 | element : String | provenance |  |
-| Test.java:1844:53:1844:68 | (...)... : String | Test.java:1844:24:1844:69 | newFluentIterableWithElement(...) : FluentIterable [<element>] : String | provenance | MaD:469 |
+| Test.java:1844:53:1844:68 | (...)... : String | Test.java:1844:24:1844:69 | newFluentIterableWithElement(...) : FluentIterable [<element>] : String | provenance | MaD:544 |
 | Test.java:1844:61:1844:68 | source(...) : Object | Test.java:1844:53:1844:68 | (...)... : String | provenance |  |
-| Test.java:1845:10:1845:11 | in : FluentIterable [<element>] : String | Test.java:1845:10:1845:21 | reverse(...) : FluentIterable [<element>] : String | provenance | MaD:471 |
+| Test.java:1845:10:1845:11 | in : FluentIterable [<element>] : String | Test.java:1845:10:1845:21 | reverse(...) : FluentIterable [<element>] : String | provenance | MaD:546 |
 | Test.java:1845:10:1845:21 | reverse(...) : FluentIterable [<element>] : String | Test.java:1846:20:1846:22 | out : FluentIterable [<element>] : String | provenance |  |
 | Test.java:1846:20:1846:22 | out : FluentIterable [<element>] : String | Test.java:230:19:230:32 | it : FluentIterable [<element>] : String | provenance |  |
-| Test.java:1846:20:1846:22 | out : FluentIterable [<element>] : String | Test.java:1846:9:1846:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:1846:20:1846:22 | out : FluentIterable [<element>] : String | Test.java:1846:9:1846:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:1851:24:1851:69 | newFluentIterableWithElement(...) : FluentIterable [<element>] : String | Test.java:1852:10:1852:11 | in : FluentIterable [<element>] : String | provenance |  |
 | Test.java:1851:53:1851:68 | (...)... : String | Test.java:257:53:257:61 | element : String | provenance |  |
-| Test.java:1851:53:1851:68 | (...)... : String | Test.java:1851:24:1851:69 | newFluentIterableWithElement(...) : FluentIterable [<element>] : String | provenance | MaD:469 |
+| Test.java:1851:53:1851:68 | (...)... : String | Test.java:1851:24:1851:69 | newFluentIterableWithElement(...) : FluentIterable [<element>] : String | provenance | MaD:544 |
 | Test.java:1851:61:1851:68 | source(...) : Object | Test.java:1851:53:1851:68 | (...)... : String | provenance |  |
-| Test.java:1852:10:1852:11 | in : FluentIterable [<element>] : String | Test.java:1852:10:1852:20 | skip(...) : FluentIterable [<element>] : String | provenance | MaD:472 |
+| Test.java:1852:10:1852:11 | in : FluentIterable [<element>] : String | Test.java:1852:10:1852:20 | skip(...) : FluentIterable [<element>] : String | provenance | MaD:547 |
 | Test.java:1852:10:1852:20 | skip(...) : FluentIterable [<element>] : String | Test.java:1853:20:1853:22 | out : FluentIterable [<element>] : String | provenance |  |
 | Test.java:1853:20:1853:22 | out : FluentIterable [<element>] : String | Test.java:230:19:230:32 | it : FluentIterable [<element>] : String | provenance |  |
-| Test.java:1853:20:1853:22 | out : FluentIterable [<element>] : String | Test.java:1853:9:1853:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:1853:20:1853:22 | out : FluentIterable [<element>] : String | Test.java:1853:9:1853:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:1858:24:1858:69 | newFluentIterableWithElement(...) : FluentIterable [<element>] : String | Test.java:1859:10:1859:11 | in : FluentIterable [<element>] : String | provenance |  |
 | Test.java:1858:53:1858:68 | (...)... : String | Test.java:257:53:257:61 | element : String | provenance |  |
-| Test.java:1858:53:1858:68 | (...)... : String | Test.java:1858:24:1858:69 | newFluentIterableWithElement(...) : FluentIterable [<element>] : String | provenance | MaD:469 |
+| Test.java:1858:53:1858:68 | (...)... : String | Test.java:1858:24:1858:69 | newFluentIterableWithElement(...) : FluentIterable [<element>] : String | provenance | MaD:544 |
 | Test.java:1858:61:1858:68 | source(...) : Object | Test.java:1858:53:1858:68 | (...)... : String | provenance |  |
-| Test.java:1859:10:1859:11 | in : FluentIterable [<element>] : String | Test.java:1859:10:1859:25 | toArray(...) : Object[] [[]] : String | provenance | MaD:473 |
+| Test.java:1859:10:1859:11 | in : FluentIterable [<element>] : String | Test.java:1859:10:1859:25 | toArray(...) : Object[] [[]] : String | provenance | MaD:548 |
 | Test.java:1859:10:1859:25 | toArray(...) : Object[] [[]] : String | Test.java:1860:25:1860:27 | out : Object[] [[]] : String | provenance |  |
 | Test.java:1860:25:1860:27 | out : Object[] [[]] : String | Test.java:229:24:229:32 | array : Object[] [[]] : String | provenance |  |
 | Test.java:1860:25:1860:27 | out : Object[] [[]] : String | Test.java:1860:9:1860:28 | getArrayElement(...) | provenance |  |
 | Test.java:1865:24:1865:69 | newFluentIterableWithElement(...) : FluentIterable [<element>] : String | Test.java:1866:10:1866:11 | in : FluentIterable [<element>] : String | provenance |  |
 | Test.java:1865:53:1865:68 | (...)... : String | Test.java:257:53:257:61 | element : String | provenance |  |
-| Test.java:1865:53:1865:68 | (...)... : String | Test.java:1865:24:1865:69 | newFluentIterableWithElement(...) : FluentIterable [<element>] : String | provenance | MaD:469 |
+| Test.java:1865:53:1865:68 | (...)... : String | Test.java:1865:24:1865:69 | newFluentIterableWithElement(...) : FluentIterable [<element>] : String | provenance | MaD:544 |
 | Test.java:1865:61:1865:68 | source(...) : Object | Test.java:1865:53:1865:68 | (...)... : String | provenance |  |
-| Test.java:1866:10:1866:11 | in : FluentIterable [<element>] : String | Test.java:1866:10:1866:20 | toList(...) : List [<element>] : String | provenance | MaD:474 |
+| Test.java:1866:10:1866:11 | in : FluentIterable [<element>] : String | Test.java:1866:10:1866:20 | toList(...) : List [<element>] : String | provenance | MaD:549 |
 | Test.java:1866:10:1866:20 | toList(...) : List [<element>] : String | Test.java:1867:20:1867:22 | out : List [<element>] : String | provenance |  |
 | Test.java:1867:20:1867:22 | out : List [<element>] : String | Test.java:230:19:230:32 | it : List [<element>] : String | provenance |  |
-| Test.java:1867:20:1867:22 | out : List [<element>] : String | Test.java:1867:9:1867:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:1867:20:1867:22 | out : List [<element>] : String | Test.java:1867:9:1867:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:1872:24:1872:69 | newFluentIterableWithElement(...) : FluentIterable [<element>] : String | Test.java:1873:10:1873:11 | in : FluentIterable [<element>] : String | provenance |  |
 | Test.java:1872:53:1872:68 | (...)... : String | Test.java:257:53:257:61 | element : String | provenance |  |
-| Test.java:1872:53:1872:68 | (...)... : String | Test.java:1872:24:1872:69 | newFluentIterableWithElement(...) : FluentIterable [<element>] : String | provenance | MaD:469 |
+| Test.java:1872:53:1872:68 | (...)... : String | Test.java:1872:24:1872:69 | newFluentIterableWithElement(...) : FluentIterable [<element>] : String | provenance | MaD:544 |
 | Test.java:1872:61:1872:68 | source(...) : Object | Test.java:1872:53:1872:68 | (...)... : String | provenance |  |
-| Test.java:1873:10:1873:11 | in : FluentIterable [<element>] : String | Test.java:1873:10:1873:20 | unique(...) : FluentIterable [<element>] : String | provenance | MaD:475 |
+| Test.java:1873:10:1873:11 | in : FluentIterable [<element>] : String | Test.java:1873:10:1873:20 | unique(...) : FluentIterable [<element>] : String | provenance | MaD:550 |
 | Test.java:1873:10:1873:20 | unique(...) : FluentIterable [<element>] : String | Test.java:1874:20:1874:22 | out : FluentIterable [<element>] : String | provenance |  |
 | Test.java:1874:20:1874:22 | out : FluentIterable [<element>] : String | Test.java:230:19:230:32 | it : FluentIterable [<element>] : String | provenance |  |
-| Test.java:1874:20:1874:22 | out : FluentIterable [<element>] : String | Test.java:1874:9:1874:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:1874:20:1874:22 | out : FluentIterable [<element>] : String | Test.java:1874:9:1874:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:1879:24:1879:69 | newFluentIterableWithElement(...) : FluentIterable [<element>] : String | Test.java:1880:10:1880:11 | in : FluentIterable [<element>] : String | provenance |  |
 | Test.java:1879:53:1879:68 | (...)... : String | Test.java:257:53:257:61 | element : String | provenance |  |
-| Test.java:1879:53:1879:68 | (...)... : String | Test.java:1879:24:1879:69 | newFluentIterableWithElement(...) : FluentIterable [<element>] : String | provenance | MaD:469 |
+| Test.java:1879:53:1879:68 | (...)... : String | Test.java:1879:24:1879:69 | newFluentIterableWithElement(...) : FluentIterable [<element>] : String | provenance | MaD:544 |
 | Test.java:1879:61:1879:68 | source(...) : Object | Test.java:1879:53:1879:68 | (...)... : String | provenance |  |
-| Test.java:1880:10:1880:11 | in : FluentIterable [<element>] : String | Test.java:1880:10:1880:26 | unmodifiable(...) : FluentIterable [<element>] : String | provenance | MaD:476 |
+| Test.java:1880:10:1880:11 | in : FluentIterable [<element>] : String | Test.java:1880:10:1880:26 | unmodifiable(...) : FluentIterable [<element>] : String | provenance | MaD:551 |
 | Test.java:1880:10:1880:26 | unmodifiable(...) : FluentIterable [<element>] : String | Test.java:1881:20:1881:22 | out : FluentIterable [<element>] : String | provenance |  |
 | Test.java:1881:20:1881:22 | out : FluentIterable [<element>] : String | Test.java:230:19:230:32 | it : FluentIterable [<element>] : String | provenance |  |
-| Test.java:1881:20:1881:22 | out : FluentIterable [<element>] : String | Test.java:1881:9:1881:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:1881:20:1881:22 | out : FluentIterable [<element>] : String | Test.java:1881:9:1881:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:1886:24:1886:69 | newFluentIterableWithElement(...) : FluentIterable [<element>] : String | Test.java:1887:10:1887:11 | in : FluentIterable [<element>] : String | provenance |  |
 | Test.java:1886:53:1886:68 | (...)... : String | Test.java:257:53:257:61 | element : String | provenance |  |
-| Test.java:1886:53:1886:68 | (...)... : String | Test.java:1886:24:1886:69 | newFluentIterableWithElement(...) : FluentIterable [<element>] : String | provenance | MaD:469 |
+| Test.java:1886:53:1886:68 | (...)... : String | Test.java:1886:24:1886:69 | newFluentIterableWithElement(...) : FluentIterable [<element>] : String | provenance | MaD:544 |
 | Test.java:1886:61:1886:68 | source(...) : Object | Test.java:1886:53:1886:68 | (...)... : String | provenance |  |
-| Test.java:1887:10:1887:11 | in : FluentIterable [<element>] : String | Test.java:1887:10:1887:31 | zip(...) : FluentIterable [<element>] : String | provenance | MaD:477 |
+| Test.java:1887:10:1887:11 | in : FluentIterable [<element>] : String | Test.java:1887:10:1887:31 | zip(...) : FluentIterable [<element>] : String | provenance | MaD:553 |
 | Test.java:1887:10:1887:31 | zip(...) : FluentIterable [<element>] : String | Test.java:1888:20:1888:22 | out : FluentIterable [<element>] : String | provenance |  |
 | Test.java:1888:20:1888:22 | out : FluentIterable [<element>] : String | Test.java:230:19:230:32 | it : FluentIterable [<element>] : String | provenance |  |
-| Test.java:1888:20:1888:22 | out : FluentIterable [<element>] : String | Test.java:1888:9:1888:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:1888:20:1888:22 | out : FluentIterable [<element>] : String | Test.java:1888:9:1888:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:1893:18:1893:63 | newFluentIterableWithElement(...) : FluentIterable [<element>] : String | Test.java:1895:23:1895:24 | in : FluentIterable [<element>] : String | provenance |  |
 | Test.java:1893:47:1893:62 | (...)... : String | Test.java:257:53:257:61 | element : String | provenance |  |
-| Test.java:1893:47:1893:62 | (...)... : String | Test.java:1893:18:1893:63 | newFluentIterableWithElement(...) : FluentIterable [<element>] : String | provenance | MaD:469 |
+| Test.java:1893:47:1893:62 | (...)... : String | Test.java:1893:18:1893:63 | newFluentIterableWithElement(...) : FluentIterable [<element>] : String | provenance | MaD:544 |
 | Test.java:1893:55:1893:62 | source(...) : Object | Test.java:1893:47:1893:62 | (...)... : String | provenance |  |
 | Test.java:1895:10:1895:25 | zip(...) : FluentIterable [<element>] : String | Test.java:1896:20:1896:22 | out : FluentIterable [<element>] : String | provenance |  |
-| Test.java:1895:23:1895:24 | in : FluentIterable [<element>] : String | Test.java:1895:10:1895:25 | zip(...) : FluentIterable [<element>] : String | provenance | MaD:478 |
+| Test.java:1895:23:1895:24 | in : FluentIterable [<element>] : String | Test.java:1895:10:1895:25 | zip(...) : FluentIterable [<element>] : String | provenance | MaD:552 |
 | Test.java:1896:20:1896:22 | out : FluentIterable [<element>] : String | Test.java:230:19:230:32 | it : FluentIterable [<element>] : String | provenance |  |
-| Test.java:1896:20:1896:22 | out : FluentIterable [<element>] : String | Test.java:1896:9:1896:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:1896:20:1896:22 | out : FluentIterable [<element>] : String | Test.java:1896:9:1896:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:1901:24:1901:69 | newFluentIterableWithElement(...) : FluentIterable [<element>] : String | Test.java:1902:10:1902:11 | in : FluentIterable [<element>] : String | provenance |  |
 | Test.java:1901:53:1901:68 | (...)... : String | Test.java:257:53:257:61 | element : String | provenance |  |
-| Test.java:1901:53:1901:68 | (...)... : String | Test.java:1901:24:1901:69 | newFluentIterableWithElement(...) : FluentIterable [<element>] : String | provenance | MaD:469 |
+| Test.java:1901:53:1901:68 | (...)... : String | Test.java:1901:24:1901:69 | newFluentIterableWithElement(...) : FluentIterable [<element>] : String | provenance | MaD:544 |
 | Test.java:1901:61:1901:68 | source(...) : Object | Test.java:1901:53:1901:68 | (...)... : String | provenance |  |
-| Test.java:1902:10:1902:11 | in : FluentIterable [<element>] : String | Test.java:1902:10:1902:47 | zip(...) : FluentIterable [<element>] : String | provenance | MaD:479 |
+| Test.java:1902:10:1902:11 | in : FluentIterable [<element>] : String | Test.java:1902:10:1902:47 | zip(...) : FluentIterable [<element>] : String | provenance | MaD:555 |
 | Test.java:1902:10:1902:47 | zip(...) : FluentIterable [<element>] : String | Test.java:1903:20:1903:22 | out : FluentIterable [<element>] : String | provenance |  |
 | Test.java:1903:20:1903:22 | out : FluentIterable [<element>] : String | Test.java:230:19:230:32 | it : FluentIterable [<element>] : String | provenance |  |
-| Test.java:1903:20:1903:22 | out : FluentIterable [<element>] : String | Test.java:1903:9:1903:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:1903:20:1903:22 | out : FluentIterable [<element>] : String | Test.java:1903:9:1903:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:1908:18:1908:55 | newVectorWithElement(...) : Vector [<element>] : String | Test.java:1910:23:1910:24 | in : Vector [<element>] : String | provenance |  |
 | Test.java:1908:39:1908:54 | (...)... : String | Test.java:269:37:269:45 | element : String | provenance |  |
-| Test.java:1908:39:1908:54 | (...)... : String | Test.java:1908:18:1908:55 | newVectorWithElement(...) : Vector [<element>] : String | provenance | MaD:2 |
+| Test.java:1908:39:1908:54 | (...)... : String | Test.java:1908:18:1908:55 | newVectorWithElement(...) : Vector [<element>] : String | provenance | MaD:4 |
 | Test.java:1908:47:1908:54 | source(...) : Object | Test.java:1908:39:1908:54 | (...)... : String | provenance |  |
-| Test.java:1910:10:1910:41 | new ..[] { .. } : Iterable[] [[], <element>] : String | Test.java:1910:10:1910:41 | zip(...) : FluentIterable [<element>] : String | provenance | MaD:480 |
+| Test.java:1910:10:1910:41 | new ..[] { .. } : Iterable[] [[], <element>] : String | Test.java:1910:10:1910:41 | zip(...) : FluentIterable [<element>] : String | provenance | MaD:554 |
 | Test.java:1910:10:1910:41 | zip(...) : FluentIterable [<element>] : String | Test.java:1911:20:1911:22 | out : FluentIterable [<element>] : String | provenance |  |
 | Test.java:1910:23:1910:24 | in : Vector [<element>] : String | Test.java:1910:10:1910:41 | new ..[] { .. } : Iterable[] [[], <element>] : String | provenance |  |
 | Test.java:1911:20:1911:22 | out : FluentIterable [<element>] : String | Test.java:230:19:230:32 | it : FluentIterable [<element>] : String | provenance |  |
-| Test.java:1911:20:1911:22 | out : FluentIterable [<element>] : String | Test.java:1911:9:1911:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:1911:20:1911:22 | out : FluentIterable [<element>] : String | Test.java:1911:9:1911:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:1916:23:1916:56 | newMVMWithMapKey(...) : MultiValueMap [<map.key>] : String | Test.java:1917:10:1917:11 | in : MultiValueMap [<map.key>] : String | provenance |  |
 | Test.java:1916:40:1916:55 | (...)... : String | Test.java:279:47:279:51 | key : String | provenance |  |
-| Test.java:1916:40:1916:55 | (...)... : String | Test.java:1916:23:1916:56 | newMVMWithMapKey(...) : MultiValueMap [<map.key>] : String | provenance | MaD:14 |
-| Test.java:1916:40:1916:55 | (...)... : String | Test.java:1916:23:1916:56 | newMVMWithMapKey(...) : MultiValueMap [<map.key>] : String | provenance | MaD:661 |
-| Test.java:1916:40:1916:55 | (...)... : String | Test.java:1916:23:1916:56 | newMVMWithMapKey(...) : MultiValueMap [<map.key>] : String | provenance | MaD:705 |
+| Test.java:1916:40:1916:55 | (...)... : String | Test.java:1916:23:1916:56 | newMVMWithMapKey(...) : MultiValueMap [<map.key>] : String | provenance | MaD:19 |
+| Test.java:1916:40:1916:55 | (...)... : String | Test.java:1916:23:1916:56 | newMVMWithMapKey(...) : MultiValueMap [<map.key>] : String | provenance | MaD:736 |
+| Test.java:1916:40:1916:55 | (...)... : String | Test.java:1916:23:1916:56 | newMVMWithMapKey(...) : MultiValueMap [<map.key>] : String | provenance | MaD:779 |
 | Test.java:1916:48:1916:55 | source(...) : Object | Test.java:1916:40:1916:55 | (...)... : String | provenance |  |
-| Test.java:1917:10:1917:11 | in : MultiValueMap [<map.key>] : String | Test.java:1917:10:1917:22 | entrySet(...) : Set [<element>, <map.key>] : String | provenance | MaD:7 |
-| Test.java:1917:10:1917:11 | in : MultiValueMap [<map.key>] : String | Test.java:1917:10:1917:22 | entrySet(...) : Set [<element>, <map.key>] : String | provenance | MaD:481 |
+| Test.java:1917:10:1917:11 | in : MultiValueMap [<map.key>] : String | Test.java:1917:10:1917:22 | entrySet(...) : Set [<element>, <map.key>] : String | provenance | MaD:15 |
+| Test.java:1917:10:1917:11 | in : MultiValueMap [<map.key>] : String | Test.java:1917:10:1917:22 | entrySet(...) : Set [<element>, <map.key>] : String | provenance | MaD:556 |
 | Test.java:1917:10:1917:22 | entrySet(...) : Set [<element>, <map.key>] : String | Test.java:1918:39:1918:41 | out : Set [<element>, <map.key>] : String | provenance |  |
 | Test.java:1918:28:1918:42 | getElement(...) : Entry [<map.key>] : String | Test.java:238:27:238:50 | container : Entry [<map.key>] : String | provenance |  |
-| Test.java:1918:28:1918:42 | getElement(...) : Entry [<map.key>] : String | Test.java:1918:9:1918:43 | getMapKeyFromEntry(...) | provenance | MaD:20 |
+| Test.java:1918:28:1918:42 | getElement(...) : Entry [<map.key>] : String | Test.java:1918:9:1918:43 | getMapKeyFromEntry(...) | provenance | MaD:9 |
 | Test.java:1918:39:1918:41 | out : Set [<element>, <map.key>] : String | Test.java:230:19:230:32 | it : Set [<element>, <map.key>] : String | provenance |  |
-| Test.java:1918:39:1918:41 | out : Set [<element>, <map.key>] : String | Test.java:1918:28:1918:42 | getElement(...) : Entry [<map.key>] : String | provenance | MaD:1 |
+| Test.java:1918:39:1918:41 | out : Set [<element>, <map.key>] : String | Test.java:1918:28:1918:42 | getElement(...) : Entry [<map.key>] : String | provenance | MaD:3 |
 | Test.java:1923:13:1923:55 | newPatriciaTrieWithMapKey(...) : PatriciaTrie [<map.key>] : String | Test.java:1924:10:1924:11 | in : PatriciaTrie [<map.key>] : String | provenance |  |
 | Test.java:1923:39:1923:54 | (...)... : String | Test.java:288:49:288:58 | key : String | provenance |  |
-| Test.java:1923:39:1923:54 | (...)... : String | Test.java:1923:13:1923:55 | newPatriciaTrieWithMapKey(...) : PatriciaTrie [<map.key>] : String | provenance | MaD:14 |
-| Test.java:1923:39:1923:54 | (...)... : String | Test.java:1923:13:1923:55 | newPatriciaTrieWithMapKey(...) : PatriciaTrie [<map.key>] : String | provenance | MaD:705 |
+| Test.java:1923:39:1923:54 | (...)... : String | Test.java:1923:13:1923:55 | newPatriciaTrieWithMapKey(...) : PatriciaTrie [<map.key>] : String | provenance | MaD:19 |
+| Test.java:1923:39:1923:54 | (...)... : String | Test.java:1923:13:1923:55 | newPatriciaTrieWithMapKey(...) : PatriciaTrie [<map.key>] : String | provenance | MaD:779 |
 | Test.java:1923:47:1923:54 | source(...) : Object | Test.java:1923:39:1923:54 | (...)... : String | provenance |  |
-| Test.java:1924:10:1924:11 | in : PatriciaTrie [<map.key>] : String | Test.java:1924:10:1924:22 | entrySet(...) : Set [<element>, <map.key>] : String | provenance | MaD:481 |
+| Test.java:1924:10:1924:11 | in : PatriciaTrie [<map.key>] : String | Test.java:1924:10:1924:22 | entrySet(...) : Set [<element>, <map.key>] : String | provenance | MaD:556 |
 | Test.java:1924:10:1924:22 | entrySet(...) : Set [<element>, <map.key>] : String | Test.java:1925:39:1925:41 | out : Set [<element>, <map.key>] : String | provenance |  |
 | Test.java:1925:28:1925:42 | getElement(...) : Entry [<map.key>] : String | Test.java:238:27:238:50 | container : Entry [<map.key>] : String | provenance |  |
-| Test.java:1925:28:1925:42 | getElement(...) : Entry [<map.key>] : String | Test.java:1925:9:1925:43 | getMapKeyFromEntry(...) | provenance | MaD:20 |
+| Test.java:1925:28:1925:42 | getElement(...) : Entry [<map.key>] : String | Test.java:1925:9:1925:43 | getMapKeyFromEntry(...) | provenance | MaD:9 |
 | Test.java:1925:39:1925:41 | out : Set [<element>, <map.key>] : String | Test.java:230:19:230:32 | it : Set [<element>, <map.key>] : String | provenance |  |
-| Test.java:1925:39:1925:41 | out : Set [<element>, <map.key>] : String | Test.java:1925:28:1925:42 | getElement(...) : Entry [<map.key>] : String | provenance | MaD:1 |
+| Test.java:1925:39:1925:41 | out : Set [<element>, <map.key>] : String | Test.java:1925:28:1925:42 | getElement(...) : Entry [<map.key>] : String | provenance | MaD:3 |
 | Test.java:1930:30:1930:63 | newMVMWithMapKey(...) : MultiValueMap [<map.key>] : String | Test.java:1931:10:1931:11 | in : MultiValueMap [<map.key>] : String | provenance |  |
 | Test.java:1930:47:1930:62 | (...)... : String | Test.java:279:47:279:51 | key : String | provenance |  |
-| Test.java:1930:47:1930:62 | (...)... : String | Test.java:1930:30:1930:63 | newMVMWithMapKey(...) : MultiValueMap [<map.key>] : String | provenance | MaD:14 |
-| Test.java:1930:47:1930:62 | (...)... : String | Test.java:1930:30:1930:63 | newMVMWithMapKey(...) : MultiValueMap [<map.key>] : String | provenance | MaD:661 |
-| Test.java:1930:47:1930:62 | (...)... : String | Test.java:1930:30:1930:63 | newMVMWithMapKey(...) : MultiValueMap [<map.key>] : String | provenance | MaD:705 |
+| Test.java:1930:47:1930:62 | (...)... : String | Test.java:1930:30:1930:63 | newMVMWithMapKey(...) : MultiValueMap [<map.key>] : String | provenance | MaD:19 |
+| Test.java:1930:47:1930:62 | (...)... : String | Test.java:1930:30:1930:63 | newMVMWithMapKey(...) : MultiValueMap [<map.key>] : String | provenance | MaD:736 |
+| Test.java:1930:47:1930:62 | (...)... : String | Test.java:1930:30:1930:63 | newMVMWithMapKey(...) : MultiValueMap [<map.key>] : String | provenance | MaD:779 |
 | Test.java:1930:55:1930:62 | source(...) : Object | Test.java:1930:47:1930:62 | (...)... : String | provenance |  |
-| Test.java:1931:10:1931:11 | in : MultiValueMap [<map.key>] : String | Test.java:1931:10:1931:22 | entrySet(...) : Set [<element>, <map.key>] : String | provenance | MaD:7 |
-| Test.java:1931:10:1931:11 | in : MultiValueMap [<map.key>] : String | Test.java:1931:10:1931:22 | entrySet(...) : Set [<element>, <map.key>] : String | provenance | MaD:481 |
+| Test.java:1931:10:1931:11 | in : MultiValueMap [<map.key>] : String | Test.java:1931:10:1931:22 | entrySet(...) : Set [<element>, <map.key>] : String | provenance | MaD:15 |
+| Test.java:1931:10:1931:11 | in : MultiValueMap [<map.key>] : String | Test.java:1931:10:1931:22 | entrySet(...) : Set [<element>, <map.key>] : String | provenance | MaD:556 |
 | Test.java:1931:10:1931:22 | entrySet(...) : Set [<element>, <map.key>] : String | Test.java:1932:39:1932:41 | out : Set [<element>, <map.key>] : String | provenance |  |
 | Test.java:1932:28:1932:42 | getElement(...) : Entry [<map.key>] : String | Test.java:238:27:238:50 | container : Entry [<map.key>] : String | provenance |  |
-| Test.java:1932:28:1932:42 | getElement(...) : Entry [<map.key>] : String | Test.java:1932:9:1932:43 | getMapKeyFromEntry(...) | provenance | MaD:20 |
+| Test.java:1932:28:1932:42 | getElement(...) : Entry [<map.key>] : String | Test.java:1932:9:1932:43 | getMapKeyFromEntry(...) | provenance | MaD:9 |
 | Test.java:1932:39:1932:41 | out : Set [<element>, <map.key>] : String | Test.java:230:19:230:32 | it : Set [<element>, <map.key>] : String | provenance |  |
-| Test.java:1932:39:1932:41 | out : Set [<element>, <map.key>] : String | Test.java:1932:28:1932:42 | getElement(...) : Entry [<map.key>] : String | provenance | MaD:1 |
+| Test.java:1932:39:1932:41 | out : Set [<element>, <map.key>] : String | Test.java:1932:28:1932:42 | getElement(...) : Entry [<map.key>] : String | provenance | MaD:3 |
 | Test.java:1937:23:1937:58 | newMVMWithMapValue(...) : MultiValueMap [<map.value>] : String | Test.java:1938:10:1938:11 | in : MultiValueMap [<map.value>] : String | provenance |  |
 | Test.java:1937:42:1937:57 | (...)... : String | Test.java:298:49:298:55 | value : String | provenance |  |
-| Test.java:1937:42:1937:57 | (...)... : String | Test.java:1937:23:1937:58 | newMVMWithMapValue(...) : MultiValueMap [<map.value>] : String | provenance | MaD:15 |
-| Test.java:1937:42:1937:57 | (...)... : String | Test.java:1937:23:1937:58 | newMVMWithMapValue(...) : MultiValueMap [<map.value>] : String | provenance | MaD:706 |
+| Test.java:1937:42:1937:57 | (...)... : String | Test.java:1937:23:1937:58 | newMVMWithMapValue(...) : MultiValueMap [<map.value>] : String | provenance | MaD:20 |
+| Test.java:1937:42:1937:57 | (...)... : String | Test.java:1937:23:1937:58 | newMVMWithMapValue(...) : MultiValueMap [<map.value>] : String | provenance | MaD:780 |
 | Test.java:1937:50:1937:57 | source(...) : Object | Test.java:1937:42:1937:57 | (...)... : String | provenance |  |
-| Test.java:1938:10:1938:11 | in : MultiValueMap [<map.value>] : String | Test.java:1938:10:1938:22 | entrySet(...) : Set [<element>, <map.value>] : String | provenance | MaD:8 |
-| Test.java:1938:10:1938:11 | in : MultiValueMap [<map.value>] : String | Test.java:1938:10:1938:22 | entrySet(...) : Set [<element>, <map.value>] : String | provenance | MaD:482 |
+| Test.java:1938:10:1938:11 | in : MultiValueMap [<map.value>] : String | Test.java:1938:10:1938:22 | entrySet(...) : Set [<element>, <map.value>] : String | provenance | MaD:16 |
+| Test.java:1938:10:1938:11 | in : MultiValueMap [<map.value>] : String | Test.java:1938:10:1938:22 | entrySet(...) : Set [<element>, <map.value>] : String | provenance | MaD:557 |
 | Test.java:1938:10:1938:22 | entrySet(...) : Set [<element>, <map.value>] : String | Test.java:1939:41:1939:43 | out : Set [<element>, <map.value>] : String | provenance |  |
 | Test.java:1939:30:1939:44 | getElement(...) : Entry [<map.value>] : String | Test.java:244:29:244:52 | container : Entry [<map.value>] : String | provenance |  |
-| Test.java:1939:30:1939:44 | getElement(...) : Entry [<map.value>] : String | Test.java:1939:9:1939:45 | getMapValueFromEntry(...) | provenance | MaD:21 |
+| Test.java:1939:30:1939:44 | getElement(...) : Entry [<map.value>] : String | Test.java:1939:9:1939:45 | getMapValueFromEntry(...) | provenance | MaD:10 |
 | Test.java:1939:41:1939:43 | out : Set [<element>, <map.value>] : String | Test.java:230:19:230:32 | it : Set [<element>, <map.value>] : String | provenance |  |
-| Test.java:1939:41:1939:43 | out : Set [<element>, <map.value>] : String | Test.java:1939:30:1939:44 | getElement(...) : Entry [<map.value>] : String | provenance | MaD:1 |
+| Test.java:1939:41:1939:43 | out : Set [<element>, <map.value>] : String | Test.java:1939:30:1939:44 | getElement(...) : Entry [<map.value>] : String | provenance | MaD:3 |
 | Test.java:1944:13:1944:57 | newPatriciaTrieWithMapValue(...) : PatriciaTrie [<map.value>] : String | Test.java:1945:10:1945:11 | in : PatriciaTrie [<map.value>] : String | provenance |  |
 | Test.java:1944:41:1944:56 | (...)... : String | Test.java:307:50:307:56 | value : String | provenance |  |
-| Test.java:1944:41:1944:56 | (...)... : String | Test.java:1944:13:1944:57 | newPatriciaTrieWithMapValue(...) : PatriciaTrie [<map.value>] : String | provenance | MaD:15 |
-| Test.java:1944:41:1944:56 | (...)... : String | Test.java:1944:13:1944:57 | newPatriciaTrieWithMapValue(...) : PatriciaTrie [<map.value>] : String | provenance | MaD:706 |
+| Test.java:1944:41:1944:56 | (...)... : String | Test.java:1944:13:1944:57 | newPatriciaTrieWithMapValue(...) : PatriciaTrie [<map.value>] : String | provenance | MaD:20 |
+| Test.java:1944:41:1944:56 | (...)... : String | Test.java:1944:13:1944:57 | newPatriciaTrieWithMapValue(...) : PatriciaTrie [<map.value>] : String | provenance | MaD:780 |
 | Test.java:1944:49:1944:56 | source(...) : Object | Test.java:1944:41:1944:56 | (...)... : String | provenance |  |
-| Test.java:1945:10:1945:11 | in : PatriciaTrie [<map.value>] : String | Test.java:1945:10:1945:22 | entrySet(...) : Set [<element>, <map.value>] : String | provenance | MaD:482 |
+| Test.java:1945:10:1945:11 | in : PatriciaTrie [<map.value>] : String | Test.java:1945:10:1945:22 | entrySet(...) : Set [<element>, <map.value>] : String | provenance | MaD:557 |
 | Test.java:1945:10:1945:22 | entrySet(...) : Set [<element>, <map.value>] : String | Test.java:1946:41:1946:43 | out : Set [<element>, <map.value>] : String | provenance |  |
 | Test.java:1946:30:1946:44 | getElement(...) : Entry [<map.value>] : String | Test.java:244:29:244:52 | container : Entry [<map.value>] : String | provenance |  |
-| Test.java:1946:30:1946:44 | getElement(...) : Entry [<map.value>] : String | Test.java:1946:9:1946:45 | getMapValueFromEntry(...) | provenance | MaD:21 |
+| Test.java:1946:30:1946:44 | getElement(...) : Entry [<map.value>] : String | Test.java:1946:9:1946:45 | getMapValueFromEntry(...) | provenance | MaD:10 |
 | Test.java:1946:41:1946:43 | out : Set [<element>, <map.value>] : String | Test.java:230:19:230:32 | it : Set [<element>, <map.value>] : String | provenance |  |
-| Test.java:1946:41:1946:43 | out : Set [<element>, <map.value>] : String | Test.java:1946:30:1946:44 | getElement(...) : Entry [<map.value>] : String | provenance | MaD:1 |
+| Test.java:1946:41:1946:43 | out : Set [<element>, <map.value>] : String | Test.java:1946:30:1946:44 | getElement(...) : Entry [<map.value>] : String | provenance | MaD:3 |
 | Test.java:1951:30:1951:65 | newMVMWithMapValue(...) : MultiValueMap [<map.value>] : String | Test.java:1952:10:1952:11 | in : MultiValueMap [<map.value>] : String | provenance |  |
 | Test.java:1951:49:1951:64 | (...)... : String | Test.java:298:49:298:55 | value : String | provenance |  |
-| Test.java:1951:49:1951:64 | (...)... : String | Test.java:1951:30:1951:65 | newMVMWithMapValue(...) : MultiValueMap [<map.value>] : String | provenance | MaD:15 |
-| Test.java:1951:49:1951:64 | (...)... : String | Test.java:1951:30:1951:65 | newMVMWithMapValue(...) : MultiValueMap [<map.value>] : String | provenance | MaD:706 |
+| Test.java:1951:49:1951:64 | (...)... : String | Test.java:1951:30:1951:65 | newMVMWithMapValue(...) : MultiValueMap [<map.value>] : String | provenance | MaD:20 |
+| Test.java:1951:49:1951:64 | (...)... : String | Test.java:1951:30:1951:65 | newMVMWithMapValue(...) : MultiValueMap [<map.value>] : String | provenance | MaD:780 |
 | Test.java:1951:57:1951:64 | source(...) : Object | Test.java:1951:49:1951:64 | (...)... : String | provenance |  |
-| Test.java:1952:10:1952:11 | in : MultiValueMap [<map.value>] : String | Test.java:1952:10:1952:22 | entrySet(...) : Set [<element>, <map.value>] : String | provenance | MaD:8 |
-| Test.java:1952:10:1952:11 | in : MultiValueMap [<map.value>] : String | Test.java:1952:10:1952:22 | entrySet(...) : Set [<element>, <map.value>] : String | provenance | MaD:482 |
+| Test.java:1952:10:1952:11 | in : MultiValueMap [<map.value>] : String | Test.java:1952:10:1952:22 | entrySet(...) : Set [<element>, <map.value>] : String | provenance | MaD:16 |
+| Test.java:1952:10:1952:11 | in : MultiValueMap [<map.value>] : String | Test.java:1952:10:1952:22 | entrySet(...) : Set [<element>, <map.value>] : String | provenance | MaD:557 |
 | Test.java:1952:10:1952:22 | entrySet(...) : Set [<element>, <map.value>] : String | Test.java:1953:41:1953:43 | out : Set [<element>, <map.value>] : String | provenance |  |
 | Test.java:1953:30:1953:44 | getElement(...) : Entry [<map.value>] : String | Test.java:244:29:244:52 | container : Entry [<map.value>] : String | provenance |  |
-| Test.java:1953:30:1953:44 | getElement(...) : Entry [<map.value>] : String | Test.java:1953:9:1953:45 | getMapValueFromEntry(...) | provenance | MaD:21 |
+| Test.java:1953:30:1953:44 | getElement(...) : Entry [<map.value>] : String | Test.java:1953:9:1953:45 | getMapValueFromEntry(...) | provenance | MaD:10 |
 | Test.java:1953:41:1953:43 | out : Set [<element>, <map.value>] : String | Test.java:230:19:230:32 | it : Set [<element>, <map.value>] : String | provenance |  |
-| Test.java:1953:41:1953:43 | out : Set [<element>, <map.value>] : String | Test.java:1953:30:1953:44 | getElement(...) : Entry [<map.value>] : String | provenance | MaD:1 |
+| Test.java:1953:41:1953:43 | out : Set [<element>, <map.value>] : String | Test.java:1953:30:1953:44 | getElement(...) : Entry [<map.value>] : String | provenance | MaD:3 |
 | Test.java:1958:18:1958:53 | newMVMWithMapValue(...) : MultiValueMap [<map.value>] : String | Test.java:1959:10:1959:11 | in : MultiValueMap [<map.value>] : String | provenance |  |
 | Test.java:1958:37:1958:52 | (...)... : String | Test.java:298:49:298:55 | value : String | provenance |  |
-| Test.java:1958:37:1958:52 | (...)... : String | Test.java:1958:18:1958:53 | newMVMWithMapValue(...) : MultiValueMap [<map.value>] : String | provenance | MaD:15 |
-| Test.java:1958:37:1958:52 | (...)... : String | Test.java:1958:18:1958:53 | newMVMWithMapValue(...) : MultiValueMap [<map.value>] : String | provenance | MaD:706 |
+| Test.java:1958:37:1958:52 | (...)... : String | Test.java:1958:18:1958:53 | newMVMWithMapValue(...) : MultiValueMap [<map.value>] : String | provenance | MaD:20 |
+| Test.java:1958:37:1958:52 | (...)... : String | Test.java:1958:18:1958:53 | newMVMWithMapValue(...) : MultiValueMap [<map.value>] : String | provenance | MaD:780 |
 | Test.java:1958:45:1958:52 | source(...) : Object | Test.java:1958:37:1958:52 | (...)... : String | provenance |  |
-| Test.java:1959:10:1959:11 | in : MultiValueMap [<map.value>] : String | Test.java:1959:10:1959:21 | get(...) : String | provenance | MaD:9 |
-| Test.java:1959:10:1959:11 | in : MultiValueMap [<map.value>] : String | Test.java:1959:10:1959:21 | get(...) : String | provenance | MaD:483 |
+| Test.java:1959:10:1959:11 | in : MultiValueMap [<map.value>] : String | Test.java:1959:10:1959:21 | get(...) : String | provenance | MaD:17 |
+| Test.java:1959:10:1959:11 | in : MultiValueMap [<map.value>] : String | Test.java:1959:10:1959:21 | get(...) : String | provenance | MaD:558 |
 | Test.java:1959:10:1959:21 | get(...) : String | Test.java:1960:9:1960:11 | out | provenance |  |
 | Test.java:1965:13:1965:57 | newPatriciaTrieWithMapValue(...) : PatriciaTrie [<map.value>] : String | Test.java:1966:10:1966:11 | in : PatriciaTrie [<map.value>] : String | provenance |  |
 | Test.java:1965:41:1965:56 | (...)... : String | Test.java:307:50:307:56 | value : String | provenance |  |
-| Test.java:1965:41:1965:56 | (...)... : String | Test.java:1965:13:1965:57 | newPatriciaTrieWithMapValue(...) : PatriciaTrie [<map.value>] : String | provenance | MaD:15 |
-| Test.java:1965:41:1965:56 | (...)... : String | Test.java:1965:13:1965:57 | newPatriciaTrieWithMapValue(...) : PatriciaTrie [<map.value>] : String | provenance | MaD:706 |
+| Test.java:1965:41:1965:56 | (...)... : String | Test.java:1965:13:1965:57 | newPatriciaTrieWithMapValue(...) : PatriciaTrie [<map.value>] : String | provenance | MaD:20 |
+| Test.java:1965:41:1965:56 | (...)... : String | Test.java:1965:13:1965:57 | newPatriciaTrieWithMapValue(...) : PatriciaTrie [<map.value>] : String | provenance | MaD:780 |
 | Test.java:1965:49:1965:56 | source(...) : Object | Test.java:1965:41:1965:56 | (...)... : String | provenance |  |
-| Test.java:1966:10:1966:11 | in : PatriciaTrie [<map.value>] : String | Test.java:1966:10:1966:21 | get(...) : String | provenance | MaD:483 |
+| Test.java:1966:10:1966:11 | in : PatriciaTrie [<map.value>] : String | Test.java:1966:10:1966:21 | get(...) : String | provenance | MaD:558 |
 | Test.java:1966:10:1966:21 | get(...) : String | Test.java:1967:9:1967:11 | out | provenance |  |
 | Test.java:1972:30:1972:65 | newMVMWithMapValue(...) : MultiValueMap [<map.value>] : String | Test.java:1973:10:1973:11 | in : MultiValueMap [<map.value>] : String | provenance |  |
 | Test.java:1972:49:1972:64 | (...)... : String | Test.java:298:49:298:55 | value : String | provenance |  |
-| Test.java:1972:49:1972:64 | (...)... : String | Test.java:1972:30:1972:65 | newMVMWithMapValue(...) : MultiValueMap [<map.value>] : String | provenance | MaD:15 |
-| Test.java:1972:49:1972:64 | (...)... : String | Test.java:1972:30:1972:65 | newMVMWithMapValue(...) : MultiValueMap [<map.value>] : String | provenance | MaD:706 |
+| Test.java:1972:49:1972:64 | (...)... : String | Test.java:1972:30:1972:65 | newMVMWithMapValue(...) : MultiValueMap [<map.value>] : String | provenance | MaD:20 |
+| Test.java:1972:49:1972:64 | (...)... : String | Test.java:1972:30:1972:65 | newMVMWithMapValue(...) : MultiValueMap [<map.value>] : String | provenance | MaD:780 |
 | Test.java:1972:57:1972:64 | source(...) : Object | Test.java:1972:49:1972:64 | (...)... : String | provenance |  |
-| Test.java:1973:10:1973:11 | in : MultiValueMap [<map.value>] : String | Test.java:1973:10:1973:21 | get(...) : String | provenance | MaD:9 |
-| Test.java:1973:10:1973:11 | in : MultiValueMap [<map.value>] : String | Test.java:1973:10:1973:21 | get(...) : String | provenance | MaD:483 |
+| Test.java:1973:10:1973:11 | in : MultiValueMap [<map.value>] : String | Test.java:1973:10:1973:21 | get(...) : String | provenance | MaD:17 |
+| Test.java:1973:10:1973:11 | in : MultiValueMap [<map.value>] : String | Test.java:1973:10:1973:21 | get(...) : String | provenance | MaD:558 |
 | Test.java:1973:10:1973:21 | get(...) : String | Test.java:1974:9:1974:11 | out | provenance |  |
 | Test.java:1979:13:1979:55 | newPatriciaTrieWithMapKey(...) : PatriciaTrie [<map.key>] : String | Test.java:1980:10:1980:11 | in : PatriciaTrie [<map.key>] : String | provenance |  |
 | Test.java:1979:39:1979:54 | (...)... : String | Test.java:288:49:288:58 | key : String | provenance |  |
-| Test.java:1979:39:1979:54 | (...)... : String | Test.java:1979:13:1979:55 | newPatriciaTrieWithMapKey(...) : PatriciaTrie [<map.key>] : String | provenance | MaD:14 |
-| Test.java:1979:39:1979:54 | (...)... : String | Test.java:1979:13:1979:55 | newPatriciaTrieWithMapKey(...) : PatriciaTrie [<map.key>] : String | provenance | MaD:705 |
+| Test.java:1979:39:1979:54 | (...)... : String | Test.java:1979:13:1979:55 | newPatriciaTrieWithMapKey(...) : PatriciaTrie [<map.key>] : String | provenance | MaD:19 |
+| Test.java:1979:39:1979:54 | (...)... : String | Test.java:1979:13:1979:55 | newPatriciaTrieWithMapKey(...) : PatriciaTrie [<map.key>] : String | provenance | MaD:779 |
 | Test.java:1979:47:1979:54 | source(...) : Object | Test.java:1979:39:1979:54 | (...)... : String | provenance |  |
-| Test.java:1980:10:1980:11 | in : PatriciaTrie [<map.key>] : String | Test.java:1980:10:1980:20 | keySet(...) : Set [<element>] : String | provenance | MaD:484 |
+| Test.java:1980:10:1980:11 | in : PatriciaTrie [<map.key>] : String | Test.java:1980:10:1980:20 | keySet(...) : Set [<element>] : String | provenance | MaD:559 |
 | Test.java:1980:10:1980:20 | keySet(...) : Set [<element>] : String | Test.java:1981:20:1981:22 | out : Set [<element>] : String | provenance |  |
 | Test.java:1981:20:1981:22 | out : Set [<element>] : String | Test.java:230:19:230:32 | it : Set [<element>] : String | provenance |  |
-| Test.java:1981:20:1981:22 | out : Set [<element>] : String | Test.java:1981:9:1981:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:1981:20:1981:22 | out : Set [<element>] : String | Test.java:1981:9:1981:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:1986:30:1986:63 | newMVMWithMapKey(...) : MultiValueMap [<map.key>] : String | Test.java:1987:10:1987:11 | in : MultiValueMap [<map.key>] : String | provenance |  |
 | Test.java:1986:47:1986:62 | (...)... : String | Test.java:279:47:279:51 | key : String | provenance |  |
-| Test.java:1986:47:1986:62 | (...)... : String | Test.java:1986:30:1986:63 | newMVMWithMapKey(...) : MultiValueMap [<map.key>] : String | provenance | MaD:14 |
-| Test.java:1986:47:1986:62 | (...)... : String | Test.java:1986:30:1986:63 | newMVMWithMapKey(...) : MultiValueMap [<map.key>] : String | provenance | MaD:661 |
-| Test.java:1986:47:1986:62 | (...)... : String | Test.java:1986:30:1986:63 | newMVMWithMapKey(...) : MultiValueMap [<map.key>] : String | provenance | MaD:705 |
+| Test.java:1986:47:1986:62 | (...)... : String | Test.java:1986:30:1986:63 | newMVMWithMapKey(...) : MultiValueMap [<map.key>] : String | provenance | MaD:19 |
+| Test.java:1986:47:1986:62 | (...)... : String | Test.java:1986:30:1986:63 | newMVMWithMapKey(...) : MultiValueMap [<map.key>] : String | provenance | MaD:736 |
+| Test.java:1986:47:1986:62 | (...)... : String | Test.java:1986:30:1986:63 | newMVMWithMapKey(...) : MultiValueMap [<map.key>] : String | provenance | MaD:779 |
 | Test.java:1986:55:1986:62 | source(...) : Object | Test.java:1986:47:1986:62 | (...)... : String | provenance |  |
-| Test.java:1987:10:1987:11 | in : MultiValueMap [<map.key>] : String | Test.java:1987:10:1987:20 | keySet(...) : Set [<element>] : String | provenance | MaD:10 |
-| Test.java:1987:10:1987:11 | in : MultiValueMap [<map.key>] : String | Test.java:1987:10:1987:20 | keySet(...) : Set [<element>] : String | provenance | MaD:484 |
+| Test.java:1987:10:1987:11 | in : MultiValueMap [<map.key>] : String | Test.java:1987:10:1987:20 | keySet(...) : Set [<element>] : String | provenance | MaD:18 |
+| Test.java:1987:10:1987:11 | in : MultiValueMap [<map.key>] : String | Test.java:1987:10:1987:20 | keySet(...) : Set [<element>] : String | provenance | MaD:559 |
 | Test.java:1987:10:1987:20 | keySet(...) : Set [<element>] : String | Test.java:1988:20:1988:22 | out : Set [<element>] : String | provenance |  |
 | Test.java:1988:20:1988:22 | out : Set [<element>] : String | Test.java:230:19:230:32 | it : Set [<element>] : String | provenance |  |
-| Test.java:1988:20:1988:22 | out : Set [<element>] : String | Test.java:1988:9:1988:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:1988:20:1988:22 | out : Set [<element>] : String | Test.java:1988:9:1988:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:1993:18:1993:53 | newMVMWithMapValue(...) : MultiValueMap [<map.value>] : String | Test.java:1994:10:1994:11 | in : MultiValueMap [<map.value>] : String | provenance |  |
 | Test.java:1993:37:1993:52 | (...)... : String | Test.java:298:49:298:55 | value : String | provenance |  |
-| Test.java:1993:37:1993:52 | (...)... : String | Test.java:1993:18:1993:53 | newMVMWithMapValue(...) : MultiValueMap [<map.value>] : String | provenance | MaD:15 |
-| Test.java:1993:37:1993:52 | (...)... : String | Test.java:1993:18:1993:53 | newMVMWithMapValue(...) : MultiValueMap [<map.value>] : String | provenance | MaD:706 |
+| Test.java:1993:37:1993:52 | (...)... : String | Test.java:1993:18:1993:53 | newMVMWithMapValue(...) : MultiValueMap [<map.value>] : String | provenance | MaD:20 |
+| Test.java:1993:37:1993:52 | (...)... : String | Test.java:1993:18:1993:53 | newMVMWithMapValue(...) : MultiValueMap [<map.value>] : String | provenance | MaD:780 |
 | Test.java:1993:45:1993:52 | source(...) : Object | Test.java:1993:37:1993:52 | (...)... : String | provenance |  |
-| Test.java:1994:10:1994:11 | in : MultiValueMap [<map.value>] : String | Test.java:1994:10:1994:24 | remove(...) : String | provenance | MaD:18 |
-| Test.java:1994:10:1994:11 | in : MultiValueMap [<map.value>] : String | Test.java:1994:10:1994:24 | remove(...) : String | provenance | MaD:485 |
+| Test.java:1994:10:1994:11 | in : MultiValueMap [<map.value>] : String | Test.java:1994:10:1994:24 | remove(...) : String | provenance | MaD:24 |
+| Test.java:1994:10:1994:11 | in : MultiValueMap [<map.value>] : String | Test.java:1994:10:1994:24 | remove(...) : String | provenance | MaD:560 |
 | Test.java:1994:10:1994:24 | remove(...) : String | Test.java:1995:9:1995:11 | out | provenance |  |
 | Test.java:2000:13:2000:57 | newPatriciaTrieWithMapValue(...) : PatriciaTrie [<map.value>] : String | Test.java:2001:10:2001:11 | in : PatriciaTrie [<map.value>] : String | provenance |  |
 | Test.java:2000:41:2000:56 | (...)... : String | Test.java:307:50:307:56 | value : String | provenance |  |
-| Test.java:2000:41:2000:56 | (...)... : String | Test.java:2000:13:2000:57 | newPatriciaTrieWithMapValue(...) : PatriciaTrie [<map.value>] : String | provenance | MaD:15 |
-| Test.java:2000:41:2000:56 | (...)... : String | Test.java:2000:13:2000:57 | newPatriciaTrieWithMapValue(...) : PatriciaTrie [<map.value>] : String | provenance | MaD:706 |
+| Test.java:2000:41:2000:56 | (...)... : String | Test.java:2000:13:2000:57 | newPatriciaTrieWithMapValue(...) : PatriciaTrie [<map.value>] : String | provenance | MaD:20 |
+| Test.java:2000:41:2000:56 | (...)... : String | Test.java:2000:13:2000:57 | newPatriciaTrieWithMapValue(...) : PatriciaTrie [<map.value>] : String | provenance | MaD:780 |
 | Test.java:2000:49:2000:56 | source(...) : Object | Test.java:2000:41:2000:56 | (...)... : String | provenance |  |
-| Test.java:2001:10:2001:11 | in : PatriciaTrie [<map.value>] : String | Test.java:2001:10:2001:24 | remove(...) : String | provenance | MaD:485 |
+| Test.java:2001:10:2001:11 | in : PatriciaTrie [<map.value>] : String | Test.java:2001:10:2001:24 | remove(...) : String | provenance | MaD:560 |
 | Test.java:2001:10:2001:24 | remove(...) : String | Test.java:2002:9:2002:11 | out | provenance |  |
 | Test.java:2007:30:2007:65 | newMVMWithMapValue(...) : MultiValueMap [<map.value>] : String | Test.java:2008:10:2008:11 | in : MultiValueMap [<map.value>] : String | provenance |  |
 | Test.java:2007:49:2007:64 | (...)... : String | Test.java:298:49:298:55 | value : String | provenance |  |
-| Test.java:2007:49:2007:64 | (...)... : String | Test.java:2007:30:2007:65 | newMVMWithMapValue(...) : MultiValueMap [<map.value>] : String | provenance | MaD:15 |
-| Test.java:2007:49:2007:64 | (...)... : String | Test.java:2007:30:2007:65 | newMVMWithMapValue(...) : MultiValueMap [<map.value>] : String | provenance | MaD:706 |
+| Test.java:2007:49:2007:64 | (...)... : String | Test.java:2007:30:2007:65 | newMVMWithMapValue(...) : MultiValueMap [<map.value>] : String | provenance | MaD:20 |
+| Test.java:2007:49:2007:64 | (...)... : String | Test.java:2007:30:2007:65 | newMVMWithMapValue(...) : MultiValueMap [<map.value>] : String | provenance | MaD:780 |
 | Test.java:2007:57:2007:64 | source(...) : Object | Test.java:2007:49:2007:64 | (...)... : String | provenance |  |
-| Test.java:2008:10:2008:11 | in : MultiValueMap [<map.value>] : String | Test.java:2008:10:2008:24 | remove(...) : String | provenance | MaD:18 |
-| Test.java:2008:10:2008:11 | in : MultiValueMap [<map.value>] : String | Test.java:2008:10:2008:24 | remove(...) : String | provenance | MaD:485 |
+| Test.java:2008:10:2008:11 | in : MultiValueMap [<map.value>] : String | Test.java:2008:10:2008:24 | remove(...) : String | provenance | MaD:24 |
+| Test.java:2008:10:2008:11 | in : MultiValueMap [<map.value>] : String | Test.java:2008:10:2008:24 | remove(...) : String | provenance | MaD:560 |
 | Test.java:2008:10:2008:24 | remove(...) : String | Test.java:2009:9:2009:11 | out | provenance |  |
 | Test.java:2014:17:2014:60 | newTreeBidiMapWithMapValue(...) : TreeBidiMap [<map.value>] : String | Test.java:2015:10:2015:11 | in : TreeBidiMap [<map.value>] : String | provenance |  |
 | Test.java:2014:44:2014:59 | (...)... : String | Test.java:306:77:306:83 | value : String | provenance |  |
-| Test.java:2014:44:2014:59 | (...)... : String | Test.java:2014:17:2014:60 | newTreeBidiMapWithMapValue(...) : TreeBidiMap [<map.value>] : String | provenance | MaD:15 |
-| Test.java:2014:44:2014:59 | (...)... : String | Test.java:2014:17:2014:60 | newTreeBidiMapWithMapValue(...) : TreeBidiMap [<map.value>] : String | provenance | MaD:706 |
+| Test.java:2014:44:2014:59 | (...)... : String | Test.java:2014:17:2014:60 | newTreeBidiMapWithMapValue(...) : TreeBidiMap [<map.value>] : String | provenance | MaD:20 |
+| Test.java:2014:44:2014:59 | (...)... : String | Test.java:2014:17:2014:60 | newTreeBidiMapWithMapValue(...) : TreeBidiMap [<map.value>] : String | provenance | MaD:780 |
 | Test.java:2014:52:2014:59 | source(...) : Object | Test.java:2014:44:2014:59 | (...)... : String | provenance |  |
-| Test.java:2015:10:2015:11 | in : TreeBidiMap [<map.value>] : String | Test.java:2015:10:2015:20 | values(...) : Set [<element>] : String | provenance | MaD:19 |
-| Test.java:2015:10:2015:11 | in : TreeBidiMap [<map.value>] : String | Test.java:2015:10:2015:20 | values(...) : Set [<element>] : String | provenance | MaD:486 |
+| Test.java:2015:10:2015:11 | in : TreeBidiMap [<map.value>] : String | Test.java:2015:10:2015:20 | values(...) : Set [<element>] : String | provenance | MaD:25 |
+| Test.java:2015:10:2015:11 | in : TreeBidiMap [<map.value>] : String | Test.java:2015:10:2015:20 | values(...) : Set [<element>] : String | provenance | MaD:561 |
 | Test.java:2015:10:2015:20 | values(...) : Set [<element>] : String | Test.java:2016:20:2016:22 | out : Set [<element>] : String | provenance |  |
 | Test.java:2016:20:2016:22 | out : Set [<element>] : String | Test.java:230:19:230:32 | it : Set [<element>] : String | provenance |  |
-| Test.java:2016:20:2016:22 | out : Set [<element>] : String | Test.java:2016:9:2016:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:2016:20:2016:22 | out : Set [<element>] : String | Test.java:2016:9:2016:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:2021:23:2021:58 | newMVMWithMapValue(...) : MultiValueMap [<map.value>, <element>] : String | Test.java:2022:10:2022:11 | in : MultiValueMap [<map.value>, <element>] : String | provenance |  |
 | Test.java:2021:23:2021:58 | newMVMWithMapValue(...) : MultiValueMap [<map.value>] : String | Test.java:2022:10:2022:11 | in : MultiValueMap [<map.value>] : String | provenance |  |
 | Test.java:2021:42:2021:57 | (...)... : String | Test.java:298:49:298:55 | value : String | provenance |  |
-| Test.java:2021:42:2021:57 | (...)... : String | Test.java:2021:23:2021:58 | newMVMWithMapValue(...) : MultiValueMap [<map.value>, <element>] : String | provenance | MaD:662 |
-| Test.java:2021:42:2021:57 | (...)... : String | Test.java:2021:23:2021:58 | newMVMWithMapValue(...) : MultiValueMap [<map.value>] : String | provenance | MaD:15 |
-| Test.java:2021:42:2021:57 | (...)... : String | Test.java:2021:23:2021:58 | newMVMWithMapValue(...) : MultiValueMap [<map.value>] : String | provenance | MaD:706 |
+| Test.java:2021:42:2021:57 | (...)... : String | Test.java:2021:23:2021:58 | newMVMWithMapValue(...) : MultiValueMap [<map.value>, <element>] : String | provenance | MaD:737 |
+| Test.java:2021:42:2021:57 | (...)... : String | Test.java:2021:23:2021:58 | newMVMWithMapValue(...) : MultiValueMap [<map.value>] : String | provenance | MaD:20 |
+| Test.java:2021:42:2021:57 | (...)... : String | Test.java:2021:23:2021:58 | newMVMWithMapValue(...) : MultiValueMap [<map.value>] : String | provenance | MaD:780 |
 | Test.java:2021:50:2021:57 | source(...) : Object | Test.java:2021:42:2021:57 | (...)... : String | provenance |  |
-| Test.java:2022:10:2022:11 | in : MultiValueMap [<map.value>, <element>] : String | Test.java:2022:10:2022:20 | values(...) : Collection [<element>] : String | provenance | MaD:357 |
-| Test.java:2022:10:2022:11 | in : MultiValueMap [<map.value>, <element>] : String | Test.java:2022:10:2022:20 | values(...) : Collection [<element>] : String | provenance | MaD:663 |
-| Test.java:2022:10:2022:11 | in : MultiValueMap [<map.value>] : String | Test.java:2022:10:2022:20 | values(...) : Collection [<element>] : Object | provenance | MaD:357 |
-| Test.java:2022:10:2022:11 | in : MultiValueMap [<map.value>] : String | Test.java:2022:10:2022:20 | values(...) : Collection [<element>] : Object | provenance | MaD:663 |
-| Test.java:2022:10:2022:11 | in : MultiValueMap [<map.value>] : String | Test.java:2022:10:2022:20 | values(...) : Collection [<element>] : String | provenance | MaD:19 |
-| Test.java:2022:10:2022:11 | in : MultiValueMap [<map.value>] : String | Test.java:2022:10:2022:20 | values(...) : Collection [<element>] : String | provenance | MaD:486 |
+| Test.java:2022:10:2022:11 | in : MultiValueMap [<map.value>, <element>] : String | Test.java:2022:10:2022:20 | values(...) : Collection [<element>] : String | provenance | MaD:359 |
+| Test.java:2022:10:2022:11 | in : MultiValueMap [<map.value>, <element>] : String | Test.java:2022:10:2022:20 | values(...) : Collection [<element>] : String | provenance | MaD:738 |
+| Test.java:2022:10:2022:11 | in : MultiValueMap [<map.value>] : String | Test.java:2022:10:2022:20 | values(...) : Collection [<element>] : Object | provenance | MaD:359 |
+| Test.java:2022:10:2022:11 | in : MultiValueMap [<map.value>] : String | Test.java:2022:10:2022:20 | values(...) : Collection [<element>] : Object | provenance | MaD:738 |
+| Test.java:2022:10:2022:11 | in : MultiValueMap [<map.value>] : String | Test.java:2022:10:2022:20 | values(...) : Collection [<element>] : String | provenance | MaD:25 |
+| Test.java:2022:10:2022:11 | in : MultiValueMap [<map.value>] : String | Test.java:2022:10:2022:20 | values(...) : Collection [<element>] : String | provenance | MaD:561 |
 | Test.java:2022:10:2022:20 | values(...) : Collection [<element>] : Object | Test.java:2023:20:2023:22 | out : Collection [<element>] : Object | provenance |  |
 | Test.java:2022:10:2022:20 | values(...) : Collection [<element>] : String | Test.java:2023:20:2023:22 | out : Collection [<element>] : String | provenance |  |
 | Test.java:2023:20:2023:22 | out : Collection [<element>] : Object | Test.java:230:19:230:32 | it : Collection [<element>] : Object | provenance |  |
-| Test.java:2023:20:2023:22 | out : Collection [<element>] : Object | Test.java:2023:9:2023:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:2023:20:2023:22 | out : Collection [<element>] : Object | Test.java:2023:9:2023:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:2023:20:2023:22 | out : Collection [<element>] : String | Test.java:230:19:230:32 | it : Collection [<element>] : String | provenance |  |
-| Test.java:2023:20:2023:22 | out : Collection [<element>] : String | Test.java:2023:9:2023:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:2023:20:2023:22 | out : Collection [<element>] : String | Test.java:2023:9:2023:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:2028:18:2028:53 | newMVMWithMapValue(...) : MultiValueMap [<map.value>, <element>] : String | Test.java:2029:10:2029:11 | in : MultiValueMap [<map.value>, <element>] : String | provenance |  |
 | Test.java:2028:18:2028:53 | newMVMWithMapValue(...) : MultiValueMap [<map.value>] : String | Test.java:2029:10:2029:11 | in : MultiValueMap [<map.value>] : String | provenance |  |
 | Test.java:2028:37:2028:52 | (...)... : String | Test.java:298:49:298:55 | value : String | provenance |  |
-| Test.java:2028:37:2028:52 | (...)... : String | Test.java:2028:18:2028:53 | newMVMWithMapValue(...) : MultiValueMap [<map.value>, <element>] : String | provenance | MaD:662 |
-| Test.java:2028:37:2028:52 | (...)... : String | Test.java:2028:18:2028:53 | newMVMWithMapValue(...) : MultiValueMap [<map.value>] : String | provenance | MaD:15 |
-| Test.java:2028:37:2028:52 | (...)... : String | Test.java:2028:18:2028:53 | newMVMWithMapValue(...) : MultiValueMap [<map.value>] : String | provenance | MaD:706 |
+| Test.java:2028:37:2028:52 | (...)... : String | Test.java:2028:18:2028:53 | newMVMWithMapValue(...) : MultiValueMap [<map.value>, <element>] : String | provenance | MaD:737 |
+| Test.java:2028:37:2028:52 | (...)... : String | Test.java:2028:18:2028:53 | newMVMWithMapValue(...) : MultiValueMap [<map.value>] : String | provenance | MaD:20 |
+| Test.java:2028:37:2028:52 | (...)... : String | Test.java:2028:18:2028:53 | newMVMWithMapValue(...) : MultiValueMap [<map.value>] : String | provenance | MaD:780 |
 | Test.java:2028:45:2028:52 | source(...) : Object | Test.java:2028:37:2028:52 | (...)... : String | provenance |  |
-| Test.java:2029:10:2029:11 | in : MultiValueMap [<map.value>, <element>] : String | Test.java:2029:10:2029:20 | values(...) : Collection [<element>] : String | provenance | MaD:663 |
-| Test.java:2029:10:2029:11 | in : MultiValueMap [<map.value>] : String | Test.java:2029:10:2029:20 | values(...) : Collection [<element>] : Object | provenance | MaD:663 |
-| Test.java:2029:10:2029:11 | in : MultiValueMap [<map.value>] : String | Test.java:2029:10:2029:20 | values(...) : Collection [<element>] : String | provenance | MaD:19 |
-| Test.java:2029:10:2029:11 | in : MultiValueMap [<map.value>] : String | Test.java:2029:10:2029:20 | values(...) : Collection [<element>] : String | provenance | MaD:486 |
+| Test.java:2029:10:2029:11 | in : MultiValueMap [<map.value>, <element>] : String | Test.java:2029:10:2029:20 | values(...) : Collection [<element>] : String | provenance | MaD:738 |
+| Test.java:2029:10:2029:11 | in : MultiValueMap [<map.value>] : String | Test.java:2029:10:2029:20 | values(...) : Collection [<element>] : Object | provenance | MaD:738 |
+| Test.java:2029:10:2029:11 | in : MultiValueMap [<map.value>] : String | Test.java:2029:10:2029:20 | values(...) : Collection [<element>] : String | provenance | MaD:25 |
+| Test.java:2029:10:2029:11 | in : MultiValueMap [<map.value>] : String | Test.java:2029:10:2029:20 | values(...) : Collection [<element>] : String | provenance | MaD:561 |
 | Test.java:2029:10:2029:20 | values(...) : Collection [<element>] : Object | Test.java:2030:20:2030:22 | out : Collection [<element>] : Object | provenance |  |
 | Test.java:2029:10:2029:20 | values(...) : Collection [<element>] : String | Test.java:2030:20:2030:22 | out : Collection [<element>] : String | provenance |  |
 | Test.java:2030:20:2030:22 | out : Collection [<element>] : Object | Test.java:230:19:230:32 | it : Collection [<element>] : Object | provenance |  |
-| Test.java:2030:20:2030:22 | out : Collection [<element>] : Object | Test.java:2030:9:2030:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:2030:20:2030:22 | out : Collection [<element>] : Object | Test.java:2030:9:2030:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:2030:20:2030:22 | out : Collection [<element>] : String | Test.java:230:19:230:32 | it : Collection [<element>] : String | provenance |  |
-| Test.java:2030:20:2030:22 | out : Collection [<element>] : String | Test.java:2030:9:2030:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:2030:20:2030:22 | out : Collection [<element>] : String | Test.java:2030:9:2030:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:2035:13:2035:57 | newPatriciaTrieWithMapValue(...) : PatriciaTrie [<map.value>] : String | Test.java:2036:10:2036:11 | in : PatriciaTrie [<map.value>] : String | provenance |  |
 | Test.java:2035:41:2035:56 | (...)... : String | Test.java:307:50:307:56 | value : String | provenance |  |
-| Test.java:2035:41:2035:56 | (...)... : String | Test.java:2035:13:2035:57 | newPatriciaTrieWithMapValue(...) : PatriciaTrie [<map.value>] : String | provenance | MaD:15 |
-| Test.java:2035:41:2035:56 | (...)... : String | Test.java:2035:13:2035:57 | newPatriciaTrieWithMapValue(...) : PatriciaTrie [<map.value>] : String | provenance | MaD:706 |
+| Test.java:2035:41:2035:56 | (...)... : String | Test.java:2035:13:2035:57 | newPatriciaTrieWithMapValue(...) : PatriciaTrie [<map.value>] : String | provenance | MaD:20 |
+| Test.java:2035:41:2035:56 | (...)... : String | Test.java:2035:13:2035:57 | newPatriciaTrieWithMapValue(...) : PatriciaTrie [<map.value>] : String | provenance | MaD:780 |
 | Test.java:2035:49:2035:56 | source(...) : Object | Test.java:2035:41:2035:56 | (...)... : String | provenance |  |
-| Test.java:2036:10:2036:11 | in : PatriciaTrie [<map.value>] : String | Test.java:2036:10:2036:20 | values(...) : Collection [<element>] : String | provenance | MaD:486 |
+| Test.java:2036:10:2036:11 | in : PatriciaTrie [<map.value>] : String | Test.java:2036:10:2036:20 | values(...) : Collection [<element>] : String | provenance | MaD:561 |
 | Test.java:2036:10:2036:20 | values(...) : Collection [<element>] : String | Test.java:2037:20:2037:22 | out : Collection [<element>] : String | provenance |  |
 | Test.java:2037:20:2037:22 | out : Collection [<element>] : String | Test.java:230:19:230:32 | it : Collection [<element>] : String | provenance |  |
-| Test.java:2037:20:2037:22 | out : Collection [<element>] : String | Test.java:2037:9:2037:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:2037:20:2037:22 | out : Collection [<element>] : String | Test.java:2037:9:2037:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:2042:30:2042:65 | newMVMWithMapValue(...) : MultiValueMap [<map.value>] : String | Test.java:2043:10:2043:11 | in : MultiValueMap [<map.value>] : String | provenance |  |
 | Test.java:2042:49:2042:64 | (...)... : String | Test.java:298:49:298:55 | value : String | provenance |  |
-| Test.java:2042:49:2042:64 | (...)... : String | Test.java:2042:30:2042:65 | newMVMWithMapValue(...) : MultiValueMap [<map.value>] : String | provenance | MaD:15 |
-| Test.java:2042:49:2042:64 | (...)... : String | Test.java:2042:30:2042:65 | newMVMWithMapValue(...) : MultiValueMap [<map.value>] : String | provenance | MaD:706 |
+| Test.java:2042:49:2042:64 | (...)... : String | Test.java:2042:30:2042:65 | newMVMWithMapValue(...) : MultiValueMap [<map.value>] : String | provenance | MaD:20 |
+| Test.java:2042:49:2042:64 | (...)... : String | Test.java:2042:30:2042:65 | newMVMWithMapValue(...) : MultiValueMap [<map.value>] : String | provenance | MaD:780 |
 | Test.java:2042:57:2042:64 | source(...) : Object | Test.java:2042:49:2042:64 | (...)... : String | provenance |  |
-| Test.java:2043:10:2043:11 | in : MultiValueMap [<map.value>] : String | Test.java:2043:10:2043:20 | values(...) : Collection [<element>] : String | provenance | MaD:19 |
-| Test.java:2043:10:2043:11 | in : MultiValueMap [<map.value>] : String | Test.java:2043:10:2043:20 | values(...) : Collection [<element>] : String | provenance | MaD:486 |
+| Test.java:2043:10:2043:11 | in : MultiValueMap [<map.value>] : String | Test.java:2043:10:2043:20 | values(...) : Collection [<element>] : String | provenance | MaD:25 |
+| Test.java:2043:10:2043:11 | in : MultiValueMap [<map.value>] : String | Test.java:2043:10:2043:20 | values(...) : Collection [<element>] : String | provenance | MaD:561 |
 | Test.java:2043:10:2043:20 | values(...) : Collection [<element>] : String | Test.java:2044:20:2044:22 | out : Collection [<element>] : String | provenance |  |
 | Test.java:2044:20:2044:22 | out : Collection [<element>] : String | Test.java:230:19:230:32 | it : Collection [<element>] : String | provenance |  |
-| Test.java:2044:20:2044:22 | out : Collection [<element>] : String | Test.java:2044:9:2044:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:2044:20:2044:22 | out : Collection [<element>] : String | Test.java:2044:9:2044:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:2049:20:2049:61 | newTreeBidiMapWithMapKey(...) : TreeBidiMap [<map.key>] : String | Test.java:2050:10:2050:11 | in : TreeBidiMap [<map.key>] : String | provenance |  |
 | Test.java:2049:45:2049:60 | (...)... : String | Test.java:287:75:287:79 | key : String | provenance |  |
-| Test.java:2049:45:2049:60 | (...)... : String | Test.java:2049:20:2049:61 | newTreeBidiMapWithMapKey(...) : TreeBidiMap [<map.key>] : String | provenance | MaD:14 |
-| Test.java:2049:45:2049:60 | (...)... : String | Test.java:2049:20:2049:61 | newTreeBidiMapWithMapKey(...) : TreeBidiMap [<map.key>] : String | provenance | MaD:705 |
+| Test.java:2049:45:2049:60 | (...)... : String | Test.java:2049:20:2049:61 | newTreeBidiMapWithMapKey(...) : TreeBidiMap [<map.key>] : String | provenance | MaD:19 |
+| Test.java:2049:45:2049:60 | (...)... : String | Test.java:2049:20:2049:61 | newTreeBidiMapWithMapKey(...) : TreeBidiMap [<map.key>] : String | provenance | MaD:779 |
 | Test.java:2049:53:2049:60 | source(...) : Object | Test.java:2049:45:2049:60 | (...)... : String | provenance |  |
-| Test.java:2050:10:2050:11 | in : TreeBidiMap [<map.key>] : String | Test.java:2050:10:2050:25 | mapIterator(...) : OrderedMapIterator [<element>] : String | provenance | MaD:487 |
+| Test.java:2050:10:2050:11 | in : TreeBidiMap [<map.key>] : String | Test.java:2050:10:2050:25 | mapIterator(...) : OrderedMapIterator [<element>] : String | provenance | MaD:562 |
 | Test.java:2050:10:2050:25 | mapIterator(...) : OrderedMapIterator [<element>] : String | Test.java:2051:20:2051:22 | out : OrderedMapIterator [<element>] : String | provenance |  |
 | Test.java:2051:20:2051:22 | out : OrderedMapIterator [<element>] : String | Test.java:231:19:231:32 | it : OrderedMapIterator [<element>] : String | provenance |  |
-| Test.java:2051:20:2051:22 | out : OrderedMapIterator [<element>] : String | Test.java:2051:9:2051:23 | getElement(...) | provenance | MaD:4 |
+| Test.java:2051:20:2051:22 | out : OrderedMapIterator [<element>] : String | Test.java:2051:9:2051:23 | getElement(...) | provenance | MaD:6 |
 | Test.java:2056:21:2056:60 | newHashedMapWithMapKey(...) : HashedMap [<map.key>] : String | Test.java:2057:10:2057:11 | in : HashedMap [<map.key>] : String | provenance |  |
 | Test.java:2056:44:2056:59 | (...)... : String | Test.java:275:49:275:53 | key : String | provenance |  |
-| Test.java:2056:44:2056:59 | (...)... : String | Test.java:2056:21:2056:60 | newHashedMapWithMapKey(...) : HashedMap [<map.key>] : String | provenance | MaD:14 |
-| Test.java:2056:44:2056:59 | (...)... : String | Test.java:2056:21:2056:60 | newHashedMapWithMapKey(...) : HashedMap [<map.key>] : String | provenance | MaD:705 |
+| Test.java:2056:44:2056:59 | (...)... : String | Test.java:2056:21:2056:60 | newHashedMapWithMapKey(...) : HashedMap [<map.key>] : String | provenance | MaD:19 |
+| Test.java:2056:44:2056:59 | (...)... : String | Test.java:2056:21:2056:60 | newHashedMapWithMapKey(...) : HashedMap [<map.key>] : String | provenance | MaD:779 |
 | Test.java:2056:52:2056:59 | source(...) : Object | Test.java:2056:44:2056:59 | (...)... : String | provenance |  |
-| Test.java:2057:10:2057:11 | in : HashedMap [<map.key>] : String | Test.java:2057:10:2057:25 | mapIterator(...) : MapIterator [<element>] : String | provenance | MaD:487 |
+| Test.java:2057:10:2057:11 | in : HashedMap [<map.key>] : String | Test.java:2057:10:2057:25 | mapIterator(...) : MapIterator [<element>] : String | provenance | MaD:562 |
 | Test.java:2057:10:2057:25 | mapIterator(...) : MapIterator [<element>] : String | Test.java:2058:20:2058:22 | out : MapIterator [<element>] : String | provenance |  |
 | Test.java:2058:20:2058:22 | out : MapIterator [<element>] : String | Test.java:231:19:231:32 | it : MapIterator [<element>] : String | provenance |  |
-| Test.java:2058:20:2058:22 | out : MapIterator [<element>] : String | Test.java:2058:9:2058:23 | getElement(...) | provenance | MaD:4 |
+| Test.java:2058:20:2058:22 | out : MapIterator [<element>] : String | Test.java:2058:9:2058:23 | getElement(...) | provenance | MaD:6 |
 | Test.java:2063:29:2063:62 | newMVMWithMapKey(...) : MultiValueMap [<map.key>] : String | Test.java:2064:10:2064:11 | in : MultiValueMap [<map.key>] : String | provenance |  |
 | Test.java:2063:46:2063:61 | (...)... : String | Test.java:279:47:279:51 | key : String | provenance |  |
-| Test.java:2063:46:2063:61 | (...)... : String | Test.java:2063:29:2063:62 | newMVMWithMapKey(...) : MultiValueMap [<map.key>] : String | provenance | MaD:14 |
-| Test.java:2063:46:2063:61 | (...)... : String | Test.java:2063:29:2063:62 | newMVMWithMapKey(...) : MultiValueMap [<map.key>] : String | provenance | MaD:661 |
-| Test.java:2063:46:2063:61 | (...)... : String | Test.java:2063:29:2063:62 | newMVMWithMapKey(...) : MultiValueMap [<map.key>] : String | provenance | MaD:705 |
+| Test.java:2063:46:2063:61 | (...)... : String | Test.java:2063:29:2063:62 | newMVMWithMapKey(...) : MultiValueMap [<map.key>] : String | provenance | MaD:19 |
+| Test.java:2063:46:2063:61 | (...)... : String | Test.java:2063:29:2063:62 | newMVMWithMapKey(...) : MultiValueMap [<map.key>] : String | provenance | MaD:736 |
+| Test.java:2063:46:2063:61 | (...)... : String | Test.java:2063:29:2063:62 | newMVMWithMapKey(...) : MultiValueMap [<map.key>] : String | provenance | MaD:779 |
 | Test.java:2063:54:2063:61 | source(...) : Object | Test.java:2063:46:2063:61 | (...)... : String | provenance |  |
-| Test.java:2064:10:2064:11 | in : MultiValueMap [<map.key>] : String | Test.java:2064:10:2064:25 | mapIterator(...) : MapIterator [<element>] : String | provenance | MaD:487 |
+| Test.java:2064:10:2064:11 | in : MultiValueMap [<map.key>] : String | Test.java:2064:10:2064:25 | mapIterator(...) : MapIterator [<element>] : String | provenance | MaD:562 |
 | Test.java:2064:10:2064:25 | mapIterator(...) : MapIterator [<element>] : String | Test.java:2065:20:2065:22 | out : MapIterator [<element>] : String | provenance |  |
 | Test.java:2065:20:2065:22 | out : MapIterator [<element>] : String | Test.java:231:19:231:32 | it : MapIterator [<element>] : String | provenance |  |
-| Test.java:2065:20:2065:22 | out : MapIterator [<element>] : String | Test.java:2065:9:2065:23 | getElement(...) | provenance | MaD:4 |
+| Test.java:2065:20:2065:22 | out : MapIterator [<element>] : String | Test.java:2065:9:2065:23 | getElement(...) | provenance | MaD:6 |
 | Test.java:2070:20:2070:63 | newTreeBidiMapWithMapValue(...) : TreeBidiMap [<map.value>] : String | Test.java:2071:10:2071:11 | in : TreeBidiMap [<map.value>] : String | provenance |  |
 | Test.java:2070:47:2070:62 | (...)... : String | Test.java:306:77:306:83 | value : String | provenance |  |
-| Test.java:2070:47:2070:62 | (...)... : String | Test.java:2070:20:2070:63 | newTreeBidiMapWithMapValue(...) : TreeBidiMap [<map.value>] : String | provenance | MaD:15 |
-| Test.java:2070:47:2070:62 | (...)... : String | Test.java:2070:20:2070:63 | newTreeBidiMapWithMapValue(...) : TreeBidiMap [<map.value>] : String | provenance | MaD:706 |
+| Test.java:2070:47:2070:62 | (...)... : String | Test.java:2070:20:2070:63 | newTreeBidiMapWithMapValue(...) : TreeBidiMap [<map.value>] : String | provenance | MaD:20 |
+| Test.java:2070:47:2070:62 | (...)... : String | Test.java:2070:20:2070:63 | newTreeBidiMapWithMapValue(...) : TreeBidiMap [<map.value>] : String | provenance | MaD:780 |
 | Test.java:2070:55:2070:62 | source(...) : Object | Test.java:2070:47:2070:62 | (...)... : String | provenance |  |
-| Test.java:2071:10:2071:11 | in : TreeBidiMap [<map.value>] : String | Test.java:2071:10:2071:25 | mapIterator(...) : OrderedMapIterator [<map.value>] : String | provenance | MaD:488 |
+| Test.java:2071:10:2071:11 | in : TreeBidiMap [<map.value>] : String | Test.java:2071:10:2071:25 | mapIterator(...) : OrderedMapIterator [<map.value>] : String | provenance | MaD:563 |
 | Test.java:2071:10:2071:25 | mapIterator(...) : OrderedMapIterator [<map.value>] : String | Test.java:2072:21:2072:23 | out : OrderedMapIterator [<map.value>] : String | provenance |  |
 | Test.java:2072:21:2072:23 | out : OrderedMapIterator [<map.value>] : String | Test.java:246:20:246:47 | mapIterator : OrderedMapIterator [<map.value>] : String | provenance |  |
-| Test.java:2072:21:2072:23 | out : OrderedMapIterator [<map.value>] : String | Test.java:2072:9:2072:24 | getMapValue(...) | provenance | MaD:598 |
+| Test.java:2072:21:2072:23 | out : OrderedMapIterator [<map.value>] : String | Test.java:2072:9:2072:24 | getMapValue(...) | provenance | MaD:673 |
 | Test.java:2077:21:2077:62 | newHashedMapWithMapValue(...) : HashedMap [<map.value>] : String | Test.java:2078:10:2078:11 | in : HashedMap [<map.value>] : String | provenance |  |
 | Test.java:2077:46:2077:61 | (...)... : String | Test.java:293:51:293:57 | value : String | provenance |  |
-| Test.java:2077:46:2077:61 | (...)... : String | Test.java:2077:21:2077:62 | newHashedMapWithMapValue(...) : HashedMap [<map.value>] : String | provenance | MaD:15 |
-| Test.java:2077:46:2077:61 | (...)... : String | Test.java:2077:21:2077:62 | newHashedMapWithMapValue(...) : HashedMap [<map.value>] : String | provenance | MaD:706 |
+| Test.java:2077:46:2077:61 | (...)... : String | Test.java:2077:21:2077:62 | newHashedMapWithMapValue(...) : HashedMap [<map.value>] : String | provenance | MaD:20 |
+| Test.java:2077:46:2077:61 | (...)... : String | Test.java:2077:21:2077:62 | newHashedMapWithMapValue(...) : HashedMap [<map.value>] : String | provenance | MaD:780 |
 | Test.java:2077:54:2077:61 | source(...) : Object | Test.java:2077:46:2077:61 | (...)... : String | provenance |  |
-| Test.java:2078:10:2078:11 | in : HashedMap [<map.value>] : String | Test.java:2078:10:2078:25 | mapIterator(...) : MapIterator [<map.value>] : String | provenance | MaD:488 |
+| Test.java:2078:10:2078:11 | in : HashedMap [<map.value>] : String | Test.java:2078:10:2078:25 | mapIterator(...) : MapIterator [<map.value>] : String | provenance | MaD:563 |
 | Test.java:2078:10:2078:25 | mapIterator(...) : MapIterator [<map.value>] : String | Test.java:2079:21:2079:23 | out : MapIterator [<map.value>] : String | provenance |  |
 | Test.java:2079:21:2079:23 | out : MapIterator [<map.value>] : String | Test.java:246:20:246:47 | mapIterator : MapIterator [<map.value>] : String | provenance |  |
-| Test.java:2079:21:2079:23 | out : MapIterator [<map.value>] : String | Test.java:2079:9:2079:24 | getMapValue(...) | provenance | MaD:598 |
+| Test.java:2079:21:2079:23 | out : MapIterator [<map.value>] : String | Test.java:2079:9:2079:24 | getMapValue(...) | provenance | MaD:673 |
 | Test.java:2084:29:2084:64 | newMVMWithMapValue(...) : MultiValueMap [<map.value>] : String | Test.java:2085:10:2085:11 | in : MultiValueMap [<map.value>] : String | provenance |  |
 | Test.java:2084:48:2084:63 | (...)... : String | Test.java:298:49:298:55 | value : String | provenance |  |
-| Test.java:2084:48:2084:63 | (...)... : String | Test.java:2084:29:2084:64 | newMVMWithMapValue(...) : MultiValueMap [<map.value>] : String | provenance | MaD:15 |
-| Test.java:2084:48:2084:63 | (...)... : String | Test.java:2084:29:2084:64 | newMVMWithMapValue(...) : MultiValueMap [<map.value>] : String | provenance | MaD:706 |
+| Test.java:2084:48:2084:63 | (...)... : String | Test.java:2084:29:2084:64 | newMVMWithMapValue(...) : MultiValueMap [<map.value>] : String | provenance | MaD:20 |
+| Test.java:2084:48:2084:63 | (...)... : String | Test.java:2084:29:2084:64 | newMVMWithMapValue(...) : MultiValueMap [<map.value>] : String | provenance | MaD:780 |
 | Test.java:2084:56:2084:63 | source(...) : Object | Test.java:2084:48:2084:63 | (...)... : String | provenance |  |
-| Test.java:2085:10:2085:11 | in : MultiValueMap [<map.value>] : String | Test.java:2085:10:2085:25 | mapIterator(...) : MapIterator [<map.value>] : String | provenance | MaD:488 |
+| Test.java:2085:10:2085:11 | in : MultiValueMap [<map.value>] : String | Test.java:2085:10:2085:25 | mapIterator(...) : MapIterator [<map.value>] : String | provenance | MaD:563 |
 | Test.java:2085:10:2085:25 | mapIterator(...) : MapIterator [<map.value>] : String | Test.java:2086:21:2086:23 | out : MapIterator [<map.value>] : String | provenance |  |
 | Test.java:2086:21:2086:23 | out : MapIterator [<map.value>] : String | Test.java:246:20:246:47 | mapIterator : MapIterator [<map.value>] : String | provenance |  |
-| Test.java:2086:21:2086:23 | out : MapIterator [<map.value>] : String | Test.java:2086:9:2086:24 | getMapValue(...) | provenance | MaD:598 |
+| Test.java:2086:21:2086:23 | out : MapIterator [<map.value>] : String | Test.java:2086:9:2086:24 | getMapValue(...) | provenance | MaD:673 |
 | Test.java:2091:18:2091:55 | newVectorWithElement(...) : Vector [<element>] : String | Test.java:2092:40:2092:41 | in : Vector [<element>] : String | provenance |  |
 | Test.java:2091:39:2091:54 | (...)... : String | Test.java:269:37:269:45 | element : String | provenance |  |
-| Test.java:2091:39:2091:54 | (...)... : String | Test.java:2091:18:2091:55 | newVectorWithElement(...) : Vector [<element>] : String | provenance | MaD:2 |
+| Test.java:2091:39:2091:54 | (...)... : String | Test.java:2091:18:2091:55 | newVectorWithElement(...) : Vector [<element>] : String | provenance | MaD:4 |
 | Test.java:2091:47:2091:54 | source(...) : Object | Test.java:2091:39:2091:54 | (...)... : String | provenance |  |
 | Test.java:2092:10:2092:46 | boundedIterable(...) : Iterable [<element>] : String | Test.java:2093:20:2093:22 | out : Iterable [<element>] : String | provenance |  |
-| Test.java:2092:40:2092:41 | in : Vector [<element>] : String | Test.java:2092:10:2092:46 | boundedIterable(...) : Iterable [<element>] : String | provenance | MaD:489 |
+| Test.java:2092:40:2092:41 | in : Vector [<element>] : String | Test.java:2092:10:2092:46 | boundedIterable(...) : Iterable [<element>] : String | provenance | MaD:564 |
 | Test.java:2093:20:2093:22 | out : Iterable [<element>] : String | Test.java:230:19:230:32 | it : Iterable [<element>] : String | provenance |  |
-| Test.java:2093:20:2093:22 | out : Iterable [<element>] : String | Test.java:2093:9:2093:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:2093:20:2093:22 | out : Iterable [<element>] : String | Test.java:2093:9:2093:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:2098:18:2098:55 | newVectorWithElement(...) : Vector [<element>] : String | Test.java:2099:40:2099:41 | in : Vector [<element>] : String | provenance |  |
 | Test.java:2098:39:2098:54 | (...)... : String | Test.java:269:37:269:45 | element : String | provenance |  |
-| Test.java:2098:39:2098:54 | (...)... : String | Test.java:2098:18:2098:55 | newVectorWithElement(...) : Vector [<element>] : String | provenance | MaD:2 |
+| Test.java:2098:39:2098:54 | (...)... : String | Test.java:2098:18:2098:55 | newVectorWithElement(...) : Vector [<element>] : String | provenance | MaD:4 |
 | Test.java:2098:47:2098:54 | source(...) : Object | Test.java:2098:39:2098:54 | (...)... : String | provenance |  |
 | Test.java:2099:10:2099:58 | chainedIterable(...) : Iterable [<element>] : String | Test.java:2100:20:2100:22 | out : Iterable [<element>] : String | provenance |  |
-| Test.java:2099:40:2099:41 | in : Vector [<element>] : String | Test.java:2099:10:2099:58 | chainedIterable(...) : Iterable [<element>] : String | provenance | MaD:490 |
+| Test.java:2099:40:2099:41 | in : Vector [<element>] : String | Test.java:2099:10:2099:58 | chainedIterable(...) : Iterable [<element>] : String | provenance | MaD:565 |
 | Test.java:2100:20:2100:22 | out : Iterable [<element>] : String | Test.java:230:19:230:32 | it : Iterable [<element>] : String | provenance |  |
-| Test.java:2100:20:2100:22 | out : Iterable [<element>] : String | Test.java:2100:9:2100:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:2100:20:2100:22 | out : Iterable [<element>] : String | Test.java:2100:9:2100:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:2105:18:2105:55 | newVectorWithElement(...) : Vector [<element>] : String | Test.java:2106:40:2106:41 | in : Vector [<element>] : String | provenance |  |
 | Test.java:2105:39:2105:54 | (...)... : String | Test.java:269:37:269:45 | element : String | provenance |  |
-| Test.java:2105:39:2105:54 | (...)... : String | Test.java:2105:18:2105:55 | newVectorWithElement(...) : Vector [<element>] : String | provenance | MaD:2 |
+| Test.java:2105:39:2105:54 | (...)... : String | Test.java:2105:18:2105:55 | newVectorWithElement(...) : Vector [<element>] : String | provenance | MaD:4 |
 | Test.java:2105:47:2105:54 | source(...) : Object | Test.java:2105:39:2105:54 | (...)... : String | provenance |  |
 | Test.java:2106:10:2106:48 | chainedIterable(...) : Iterable [<element>] : String | Test.java:2107:20:2107:22 | out : Iterable [<element>] : String | provenance |  |
-| Test.java:2106:40:2106:41 | in : Vector [<element>] : String | Test.java:2106:10:2106:48 | chainedIterable(...) : Iterable [<element>] : String | provenance | MaD:490 |
+| Test.java:2106:40:2106:41 | in : Vector [<element>] : String | Test.java:2106:10:2106:48 | chainedIterable(...) : Iterable [<element>] : String | provenance | MaD:565 |
 | Test.java:2107:20:2107:22 | out : Iterable [<element>] : String | Test.java:230:19:230:32 | it : Iterable [<element>] : String | provenance |  |
-| Test.java:2107:20:2107:22 | out : Iterable [<element>] : String | Test.java:2107:9:2107:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:2107:20:2107:22 | out : Iterable [<element>] : String | Test.java:2107:9:2107:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:2112:18:2112:55 | newVectorWithElement(...) : Vector [<element>] : String | Test.java:2113:46:2113:47 | in : Vector [<element>] : String | provenance |  |
 | Test.java:2112:39:2112:54 | (...)... : String | Test.java:269:37:269:45 | element : String | provenance |  |
-| Test.java:2112:39:2112:54 | (...)... : String | Test.java:2112:18:2112:55 | newVectorWithElement(...) : Vector [<element>] : String | provenance | MaD:2 |
+| Test.java:2112:39:2112:54 | (...)... : String | Test.java:2112:18:2112:55 | newVectorWithElement(...) : Vector [<element>] : String | provenance | MaD:4 |
 | Test.java:2112:47:2112:54 | source(...) : Object | Test.java:2112:39:2112:54 | (...)... : String | provenance |  |
 | Test.java:2113:10:2113:48 | chainedIterable(...) : Iterable [<element>] : String | Test.java:2114:20:2114:22 | out : Iterable [<element>] : String | provenance |  |
-| Test.java:2113:46:2113:47 | in : Vector [<element>] : String | Test.java:2113:10:2113:48 | chainedIterable(...) : Iterable [<element>] : String | provenance | MaD:491 |
+| Test.java:2113:46:2113:47 | in : Vector [<element>] : String | Test.java:2113:10:2113:48 | chainedIterable(...) : Iterable [<element>] : String | provenance | MaD:566 |
 | Test.java:2114:20:2114:22 | out : Iterable [<element>] : String | Test.java:230:19:230:32 | it : Iterable [<element>] : String | provenance |  |
-| Test.java:2114:20:2114:22 | out : Iterable [<element>] : String | Test.java:2114:9:2114:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:2114:20:2114:22 | out : Iterable [<element>] : String | Test.java:2114:9:2114:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:2119:18:2119:55 | newVectorWithElement(...) : Vector [<element>] : String | Test.java:2120:40:2120:41 | in : Vector [<element>] : String | provenance |  |
 | Test.java:2119:39:2119:54 | (...)... : String | Test.java:269:37:269:45 | element : String | provenance |  |
-| Test.java:2119:39:2119:54 | (...)... : String | Test.java:2119:18:2119:55 | newVectorWithElement(...) : Vector [<element>] : String | provenance | MaD:2 |
+| Test.java:2119:39:2119:54 | (...)... : String | Test.java:2119:18:2119:55 | newVectorWithElement(...) : Vector [<element>] : String | provenance | MaD:4 |
 | Test.java:2119:47:2119:54 | source(...) : Object | Test.java:2119:39:2119:54 | (...)... : String | provenance |  |
 | Test.java:2120:10:2120:54 | chainedIterable(...) : Iterable [<element>] : String | Test.java:2121:20:2121:22 | out : Iterable [<element>] : String | provenance |  |
-| Test.java:2120:40:2120:41 | in : Vector [<element>] : String | Test.java:2120:10:2120:54 | chainedIterable(...) : Iterable [<element>] : String | provenance | MaD:492 |
+| Test.java:2120:40:2120:41 | in : Vector [<element>] : String | Test.java:2120:10:2120:54 | chainedIterable(...) : Iterable [<element>] : String | provenance | MaD:567 |
 | Test.java:2121:20:2121:22 | out : Iterable [<element>] : String | Test.java:230:19:230:32 | it : Iterable [<element>] : String | provenance |  |
-| Test.java:2121:20:2121:22 | out : Iterable [<element>] : String | Test.java:2121:9:2121:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:2121:20:2121:22 | out : Iterable [<element>] : String | Test.java:2121:9:2121:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:2126:18:2126:55 | newVectorWithElement(...) : Vector [<element>] : String | Test.java:2127:46:2127:47 | in : Vector [<element>] : String | provenance |  |
 | Test.java:2126:39:2126:54 | (...)... : String | Test.java:269:37:269:45 | element : String | provenance |  |
-| Test.java:2126:39:2126:54 | (...)... : String | Test.java:2126:18:2126:55 | newVectorWithElement(...) : Vector [<element>] : String | provenance | MaD:2 |
+| Test.java:2126:39:2126:54 | (...)... : String | Test.java:2126:18:2126:55 | newVectorWithElement(...) : Vector [<element>] : String | provenance | MaD:4 |
 | Test.java:2126:47:2126:54 | source(...) : Object | Test.java:2126:39:2126:54 | (...)... : String | provenance |  |
 | Test.java:2127:10:2127:54 | chainedIterable(...) : Iterable [<element>] : String | Test.java:2128:20:2128:22 | out : Iterable [<element>] : String | provenance |  |
-| Test.java:2127:46:2127:47 | in : Vector [<element>] : String | Test.java:2127:10:2127:54 | chainedIterable(...) : Iterable [<element>] : String | provenance | MaD:493 |
+| Test.java:2127:46:2127:47 | in : Vector [<element>] : String | Test.java:2127:10:2127:54 | chainedIterable(...) : Iterable [<element>] : String | provenance | MaD:568 |
 | Test.java:2128:20:2128:22 | out : Iterable [<element>] : String | Test.java:230:19:230:32 | it : Iterable [<element>] : String | provenance |  |
-| Test.java:2128:20:2128:22 | out : Iterable [<element>] : String | Test.java:2128:9:2128:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:2128:20:2128:22 | out : Iterable [<element>] : String | Test.java:2128:9:2128:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:2133:18:2133:55 | newVectorWithElement(...) : Vector [<element>] : String | Test.java:2134:52:2134:53 | in : Vector [<element>] : String | provenance |  |
 | Test.java:2133:39:2133:54 | (...)... : String | Test.java:269:37:269:45 | element : String | provenance |  |
-| Test.java:2133:39:2133:54 | (...)... : String | Test.java:2133:18:2133:55 | newVectorWithElement(...) : Vector [<element>] : String | provenance | MaD:2 |
+| Test.java:2133:39:2133:54 | (...)... : String | Test.java:2133:18:2133:55 | newVectorWithElement(...) : Vector [<element>] : String | provenance | MaD:4 |
 | Test.java:2133:47:2133:54 | source(...) : Object | Test.java:2133:39:2133:54 | (...)... : String | provenance |  |
 | Test.java:2134:10:2134:54 | chainedIterable(...) : Iterable [<element>] : String | Test.java:2135:20:2135:22 | out : Iterable [<element>] : String | provenance |  |
-| Test.java:2134:52:2134:53 | in : Vector [<element>] : String | Test.java:2134:10:2134:54 | chainedIterable(...) : Iterable [<element>] : String | provenance | MaD:494 |
+| Test.java:2134:52:2134:53 | in : Vector [<element>] : String | Test.java:2134:10:2134:54 | chainedIterable(...) : Iterable [<element>] : String | provenance | MaD:569 |
 | Test.java:2135:20:2135:22 | out : Iterable [<element>] : String | Test.java:230:19:230:32 | it : Iterable [<element>] : String | provenance |  |
-| Test.java:2135:20:2135:22 | out : Iterable [<element>] : String | Test.java:2135:9:2135:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:2135:20:2135:22 | out : Iterable [<element>] : String | Test.java:2135:9:2135:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:2140:18:2140:55 | newVectorWithElement(...) : Vector [<element>] : String | Test.java:2141:40:2141:41 | in : Vector [<element>] : String | provenance |  |
 | Test.java:2140:39:2140:54 | (...)... : String | Test.java:269:37:269:45 | element : String | provenance |  |
-| Test.java:2140:39:2140:54 | (...)... : String | Test.java:2140:18:2140:55 | newVectorWithElement(...) : Vector [<element>] : String | provenance | MaD:2 |
+| Test.java:2140:39:2140:54 | (...)... : String | Test.java:2140:18:2140:55 | newVectorWithElement(...) : Vector [<element>] : String | provenance | MaD:4 |
 | Test.java:2140:47:2140:54 | source(...) : Object | Test.java:2140:39:2140:54 | (...)... : String | provenance |  |
 | Test.java:2141:10:2141:60 | chainedIterable(...) : Iterable [<element>] : String | Test.java:2142:20:2142:22 | out : Iterable [<element>] : String | provenance |  |
-| Test.java:2141:40:2141:41 | in : Vector [<element>] : String | Test.java:2141:10:2141:60 | chainedIterable(...) : Iterable [<element>] : String | provenance | MaD:495 |
+| Test.java:2141:40:2141:41 | in : Vector [<element>] : String | Test.java:2141:10:2141:60 | chainedIterable(...) : Iterable [<element>] : String | provenance | MaD:570 |
 | Test.java:2142:20:2142:22 | out : Iterable [<element>] : String | Test.java:230:19:230:32 | it : Iterable [<element>] : String | provenance |  |
-| Test.java:2142:20:2142:22 | out : Iterable [<element>] : String | Test.java:2142:9:2142:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:2142:20:2142:22 | out : Iterable [<element>] : String | Test.java:2142:9:2142:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:2147:18:2147:55 | newVectorWithElement(...) : Vector [<element>] : String | Test.java:2148:46:2148:47 | in : Vector [<element>] : String | provenance |  |
 | Test.java:2147:39:2147:54 | (...)... : String | Test.java:269:37:269:45 | element : String | provenance |  |
-| Test.java:2147:39:2147:54 | (...)... : String | Test.java:2147:18:2147:55 | newVectorWithElement(...) : Vector [<element>] : String | provenance | MaD:2 |
+| Test.java:2147:39:2147:54 | (...)... : String | Test.java:2147:18:2147:55 | newVectorWithElement(...) : Vector [<element>] : String | provenance | MaD:4 |
 | Test.java:2147:47:2147:54 | source(...) : Object | Test.java:2147:39:2147:54 | (...)... : String | provenance |  |
 | Test.java:2148:10:2148:60 | chainedIterable(...) : Iterable [<element>] : String | Test.java:2149:20:2149:22 | out : Iterable [<element>] : String | provenance |  |
-| Test.java:2148:46:2148:47 | in : Vector [<element>] : String | Test.java:2148:10:2148:60 | chainedIterable(...) : Iterable [<element>] : String | provenance | MaD:496 |
+| Test.java:2148:46:2148:47 | in : Vector [<element>] : String | Test.java:2148:10:2148:60 | chainedIterable(...) : Iterable [<element>] : String | provenance | MaD:571 |
 | Test.java:2149:20:2149:22 | out : Iterable [<element>] : String | Test.java:230:19:230:32 | it : Iterable [<element>] : String | provenance |  |
-| Test.java:2149:20:2149:22 | out : Iterable [<element>] : String | Test.java:2149:9:2149:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:2149:20:2149:22 | out : Iterable [<element>] : String | Test.java:2149:9:2149:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:2154:18:2154:55 | newVectorWithElement(...) : Vector [<element>] : String | Test.java:2155:52:2155:53 | in : Vector [<element>] : String | provenance |  |
 | Test.java:2154:39:2154:54 | (...)... : String | Test.java:269:37:269:45 | element : String | provenance |  |
-| Test.java:2154:39:2154:54 | (...)... : String | Test.java:2154:18:2154:55 | newVectorWithElement(...) : Vector [<element>] : String | provenance | MaD:2 |
+| Test.java:2154:39:2154:54 | (...)... : String | Test.java:2154:18:2154:55 | newVectorWithElement(...) : Vector [<element>] : String | provenance | MaD:4 |
 | Test.java:2154:47:2154:54 | source(...) : Object | Test.java:2154:39:2154:54 | (...)... : String | provenance |  |
 | Test.java:2155:10:2155:60 | chainedIterable(...) : Iterable [<element>] : String | Test.java:2156:20:2156:22 | out : Iterable [<element>] : String | provenance |  |
-| Test.java:2155:52:2155:53 | in : Vector [<element>] : String | Test.java:2155:10:2155:60 | chainedIterable(...) : Iterable [<element>] : String | provenance | MaD:497 |
+| Test.java:2155:52:2155:53 | in : Vector [<element>] : String | Test.java:2155:10:2155:60 | chainedIterable(...) : Iterable [<element>] : String | provenance | MaD:572 |
 | Test.java:2156:20:2156:22 | out : Iterable [<element>] : String | Test.java:230:19:230:32 | it : Iterable [<element>] : String | provenance |  |
-| Test.java:2156:20:2156:22 | out : Iterable [<element>] : String | Test.java:2156:9:2156:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:2156:20:2156:22 | out : Iterable [<element>] : String | Test.java:2156:9:2156:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:2161:18:2161:55 | newVectorWithElement(...) : Vector [<element>] : String | Test.java:2162:58:2162:59 | in : Vector [<element>] : String | provenance |  |
 | Test.java:2161:39:2161:54 | (...)... : String | Test.java:269:37:269:45 | element : String | provenance |  |
-| Test.java:2161:39:2161:54 | (...)... : String | Test.java:2161:18:2161:55 | newVectorWithElement(...) : Vector [<element>] : String | provenance | MaD:2 |
+| Test.java:2161:39:2161:54 | (...)... : String | Test.java:2161:18:2161:55 | newVectorWithElement(...) : Vector [<element>] : String | provenance | MaD:4 |
 | Test.java:2161:47:2161:54 | source(...) : Object | Test.java:2161:39:2161:54 | (...)... : String | provenance |  |
 | Test.java:2162:10:2162:60 | chainedIterable(...) : Iterable [<element>] : String | Test.java:2163:20:2163:22 | out : Iterable [<element>] : String | provenance |  |
-| Test.java:2162:58:2162:59 | in : Vector [<element>] : String | Test.java:2162:10:2162:60 | chainedIterable(...) : Iterable [<element>] : String | provenance | MaD:498 |
+| Test.java:2162:58:2162:59 | in : Vector [<element>] : String | Test.java:2162:10:2162:60 | chainedIterable(...) : Iterable [<element>] : String | provenance | MaD:573 |
 | Test.java:2163:20:2163:22 | out : Iterable [<element>] : String | Test.java:230:19:230:32 | it : Iterable [<element>] : String | provenance |  |
-| Test.java:2163:20:2163:22 | out : Iterable [<element>] : String | Test.java:2163:9:2163:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:2163:20:2163:22 | out : Iterable [<element>] : String | Test.java:2163:9:2163:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:2168:18:2168:55 | newVectorWithElement(...) : Vector [<element>] : String | Test.java:2169:47:2169:48 | in : Vector [<element>] : String | provenance |  |
 | Test.java:2168:39:2168:54 | (...)... : String | Test.java:269:37:269:45 | element : String | provenance |  |
-| Test.java:2168:39:2168:54 | (...)... : String | Test.java:2168:18:2168:55 | newVectorWithElement(...) : Vector [<element>] : String | provenance | MaD:2 |
+| Test.java:2168:39:2168:54 | (...)... : String | Test.java:2168:18:2168:55 | newVectorWithElement(...) : Vector [<element>] : String | provenance | MaD:4 |
 | Test.java:2168:47:2168:54 | source(...) : Object | Test.java:2168:39:2168:54 | (...)... : String | provenance |  |
 | Test.java:2169:10:2169:55 | collatedIterable(...) : Iterable [<element>] : String | Test.java:2170:20:2170:22 | out : Iterable [<element>] : String | provenance |  |
-| Test.java:2169:47:2169:48 | in : Vector [<element>] : String | Test.java:2169:10:2169:55 | collatedIterable(...) : Iterable [<element>] : String | provenance | MaD:499 |
+| Test.java:2169:47:2169:48 | in : Vector [<element>] : String | Test.java:2169:10:2169:55 | collatedIterable(...) : Iterable [<element>] : String | provenance | MaD:574 |
 | Test.java:2170:20:2170:22 | out : Iterable [<element>] : String | Test.java:230:19:230:32 | it : Iterable [<element>] : String | provenance |  |
-| Test.java:2170:20:2170:22 | out : Iterable [<element>] : String | Test.java:2170:9:2170:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:2170:20:2170:22 | out : Iterable [<element>] : String | Test.java:2170:9:2170:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:2175:18:2175:55 | newVectorWithElement(...) : Vector [<element>] : String | Test.java:2176:53:2176:54 | in : Vector [<element>] : String | provenance |  |
 | Test.java:2175:39:2175:54 | (...)... : String | Test.java:269:37:269:45 | element : String | provenance |  |
-| Test.java:2175:39:2175:54 | (...)... : String | Test.java:2175:18:2175:55 | newVectorWithElement(...) : Vector [<element>] : String | provenance | MaD:2 |
+| Test.java:2175:39:2175:54 | (...)... : String | Test.java:2175:18:2175:55 | newVectorWithElement(...) : Vector [<element>] : String | provenance | MaD:4 |
 | Test.java:2175:47:2175:54 | source(...) : Object | Test.java:2175:39:2175:54 | (...)... : String | provenance |  |
 | Test.java:2176:10:2176:55 | collatedIterable(...) : Iterable [<element>] : String | Test.java:2177:20:2177:22 | out : Iterable [<element>] : String | provenance |  |
-| Test.java:2176:53:2176:54 | in : Vector [<element>] : String | Test.java:2176:10:2176:55 | collatedIterable(...) : Iterable [<element>] : String | provenance | MaD:500 |
+| Test.java:2176:53:2176:54 | in : Vector [<element>] : String | Test.java:2176:10:2176:55 | collatedIterable(...) : Iterable [<element>] : String | provenance | MaD:575 |
 | Test.java:2177:20:2177:22 | out : Iterable [<element>] : String | Test.java:230:19:230:32 | it : Iterable [<element>] : String | provenance |  |
-| Test.java:2177:20:2177:22 | out : Iterable [<element>] : String | Test.java:2177:9:2177:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:2177:20:2177:22 | out : Iterable [<element>] : String | Test.java:2177:9:2177:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:2182:18:2182:55 | newVectorWithElement(...) : Vector [<element>] : String | Test.java:2183:41:2183:42 | in : Vector [<element>] : String | provenance |  |
 | Test.java:2182:39:2182:54 | (...)... : String | Test.java:269:37:269:45 | element : String | provenance |  |
-| Test.java:2182:39:2182:54 | (...)... : String | Test.java:2182:18:2182:55 | newVectorWithElement(...) : Vector [<element>] : String | provenance | MaD:2 |
+| Test.java:2182:39:2182:54 | (...)... : String | Test.java:2182:18:2182:55 | newVectorWithElement(...) : Vector [<element>] : String | provenance | MaD:4 |
 | Test.java:2182:47:2182:54 | source(...) : Object | Test.java:2182:39:2182:54 | (...)... : String | provenance |  |
 | Test.java:2183:10:2183:49 | collatedIterable(...) : Iterable [<element>] : String | Test.java:2184:20:2184:22 | out : Iterable [<element>] : String | provenance |  |
-| Test.java:2183:41:2183:42 | in : Vector [<element>] : String | Test.java:2183:10:2183:49 | collatedIterable(...) : Iterable [<element>] : String | provenance | MaD:501 |
+| Test.java:2183:41:2183:42 | in : Vector [<element>] : String | Test.java:2183:10:2183:49 | collatedIterable(...) : Iterable [<element>] : String | provenance | MaD:576 |
 | Test.java:2184:20:2184:22 | out : Iterable [<element>] : String | Test.java:230:19:230:32 | it : Iterable [<element>] : String | provenance |  |
-| Test.java:2184:20:2184:22 | out : Iterable [<element>] : String | Test.java:2184:9:2184:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:2184:20:2184:22 | out : Iterable [<element>] : String | Test.java:2184:9:2184:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:2189:18:2189:55 | newVectorWithElement(...) : Vector [<element>] : String | Test.java:2190:47:2190:48 | in : Vector [<element>] : String | provenance |  |
 | Test.java:2189:39:2189:54 | (...)... : String | Test.java:269:37:269:45 | element : String | provenance |  |
-| Test.java:2189:39:2189:54 | (...)... : String | Test.java:2189:18:2189:55 | newVectorWithElement(...) : Vector [<element>] : String | provenance | MaD:2 |
+| Test.java:2189:39:2189:54 | (...)... : String | Test.java:2189:18:2189:55 | newVectorWithElement(...) : Vector [<element>] : String | provenance | MaD:4 |
 | Test.java:2189:47:2189:54 | source(...) : Object | Test.java:2189:39:2189:54 | (...)... : String | provenance |  |
 | Test.java:2190:10:2190:49 | collatedIterable(...) : Iterable [<element>] : String | Test.java:2191:20:2191:22 | out : Iterable [<element>] : String | provenance |  |
-| Test.java:2190:47:2190:48 | in : Vector [<element>] : String | Test.java:2190:10:2190:49 | collatedIterable(...) : Iterable [<element>] : String | provenance | MaD:502 |
+| Test.java:2190:47:2190:48 | in : Vector [<element>] : String | Test.java:2190:10:2190:49 | collatedIterable(...) : Iterable [<element>] : String | provenance | MaD:577 |
 | Test.java:2191:20:2191:22 | out : Iterable [<element>] : String | Test.java:230:19:230:32 | it : Iterable [<element>] : String | provenance |  |
-| Test.java:2191:20:2191:22 | out : Iterable [<element>] : String | Test.java:2191:9:2191:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:2191:20:2191:22 | out : Iterable [<element>] : String | Test.java:2191:9:2191:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:2196:18:2196:35 | (...)... : Iterable | Test.java:2197:36:2197:37 | in : Iterable | provenance |  |
 | Test.java:2196:28:2196:35 | source(...) : Object | Test.java:2196:18:2196:35 | (...)... : Iterable | provenance |  |
 | Test.java:2197:10:2197:38 | emptyIfNull(...) : Iterable | Test.java:2198:9:2198:11 | out | provenance |  |
-| Test.java:2197:36:2197:37 | in : Iterable | Test.java:2197:10:2197:38 | emptyIfNull(...) : Iterable | provenance | MaD:503 |
+| Test.java:2197:36:2197:37 | in : Iterable | Test.java:2197:10:2197:38 | emptyIfNull(...) : Iterable | provenance | MaD:578 |
 | Test.java:2203:18:2203:55 | newVectorWithElement(...) : Vector [<element>] : String | Test.java:2204:41:2204:42 | in : Vector [<element>] : String | provenance |  |
 | Test.java:2203:39:2203:54 | (...)... : String | Test.java:269:37:269:45 | element : String | provenance |  |
-| Test.java:2203:39:2203:54 | (...)... : String | Test.java:2203:18:2203:55 | newVectorWithElement(...) : Vector [<element>] : String | provenance | MaD:2 |
+| Test.java:2203:39:2203:54 | (...)... : String | Test.java:2203:18:2203:55 | newVectorWithElement(...) : Vector [<element>] : String | provenance | MaD:4 |
 | Test.java:2203:47:2203:54 | source(...) : Object | Test.java:2203:39:2203:54 | (...)... : String | provenance |  |
 | Test.java:2204:10:2204:49 | filteredIterable(...) : Iterable [<element>] : String | Test.java:2205:20:2205:22 | out : Iterable [<element>] : String | provenance |  |
-| Test.java:2204:41:2204:42 | in : Vector [<element>] : String | Test.java:2204:10:2204:49 | filteredIterable(...) : Iterable [<element>] : String | provenance | MaD:504 |
+| Test.java:2204:41:2204:42 | in : Vector [<element>] : String | Test.java:2204:10:2204:49 | filteredIterable(...) : Iterable [<element>] : String | provenance | MaD:579 |
 | Test.java:2205:20:2205:22 | out : Iterable [<element>] : String | Test.java:230:19:230:32 | it : Iterable [<element>] : String | provenance |  |
-| Test.java:2205:20:2205:22 | out : Iterable [<element>] : String | Test.java:2205:9:2205:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:2205:20:2205:22 | out : Iterable [<element>] : String | Test.java:2205:9:2205:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:2210:18:2210:55 | newVectorWithElement(...) : Vector [<element>] : String | Test.java:2211:29:2211:30 | in : Vector [<element>] : String | provenance |  |
 | Test.java:2210:39:2210:54 | (...)... : String | Test.java:269:37:269:45 | element : String | provenance |  |
-| Test.java:2210:39:2210:54 | (...)... : String | Test.java:2210:18:2210:55 | newVectorWithElement(...) : Vector [<element>] : String | provenance | MaD:2 |
+| Test.java:2210:39:2210:54 | (...)... : String | Test.java:2210:18:2210:55 | newVectorWithElement(...) : Vector [<element>] : String | provenance | MaD:4 |
 | Test.java:2210:47:2210:54 | source(...) : Object | Test.java:2210:39:2210:54 | (...)... : String | provenance |  |
 | Test.java:2211:10:2211:37 | find(...) : String | Test.java:2212:9:2212:11 | out | provenance |  |
-| Test.java:2211:29:2211:30 | in : Vector [<element>] : String | Test.java:2211:10:2211:37 | find(...) : String | provenance | MaD:505 |
+| Test.java:2211:29:2211:30 | in : Vector [<element>] : String | Test.java:2211:10:2211:37 | find(...) : String | provenance | MaD:580 |
 | Test.java:2217:18:2217:55 | newVectorWithElement(...) : Vector [<element>] : String | Test.java:2218:30:2218:31 | in : Vector [<element>] : String | provenance |  |
 | Test.java:2217:39:2217:54 | (...)... : String | Test.java:269:37:269:45 | element : String | provenance |  |
-| Test.java:2217:39:2217:54 | (...)... : String | Test.java:2217:18:2217:55 | newVectorWithElement(...) : Vector [<element>] : String | provenance | MaD:2 |
+| Test.java:2217:39:2217:54 | (...)... : String | Test.java:2217:18:2217:55 | newVectorWithElement(...) : Vector [<element>] : String | provenance | MaD:4 |
 | Test.java:2217:47:2217:54 | source(...) : Object | Test.java:2217:39:2217:54 | (...)... : String | provenance |  |
 | Test.java:2218:10:2218:32 | first(...) : String | Test.java:2219:9:2219:11 | out | provenance |  |
-| Test.java:2218:30:2218:31 | in : Vector [<element>] : String | Test.java:2218:10:2218:32 | first(...) : String | provenance | MaD:506 |
+| Test.java:2218:30:2218:31 | in : Vector [<element>] : String | Test.java:2218:10:2218:32 | first(...) : String | provenance | MaD:581 |
 | Test.java:2224:18:2224:55 | newVectorWithElement(...) : Vector [<element>] : String | Test.java:2225:39:2225:40 | in : Vector [<element>] : String | provenance |  |
 | Test.java:2224:39:2224:54 | (...)... : String | Test.java:269:37:269:45 | element : String | provenance |  |
-| Test.java:2224:39:2224:54 | (...)... : String | Test.java:2224:18:2224:55 | newVectorWithElement(...) : Vector [<element>] : String | provenance | MaD:2 |
+| Test.java:2224:39:2224:54 | (...)... : String | Test.java:2224:18:2224:55 | newVectorWithElement(...) : Vector [<element>] : String | provenance | MaD:4 |
 | Test.java:2224:47:2224:54 | source(...) : Object | Test.java:2224:39:2224:54 | (...)... : String | provenance |  |
 | Test.java:2225:10:2225:47 | forEachButLast(...) : String | Test.java:2226:9:2226:11 | out | provenance |  |
-| Test.java:2225:39:2225:40 | in : Vector [<element>] : String | Test.java:2225:10:2225:47 | forEachButLast(...) : String | provenance | MaD:507 |
+| Test.java:2225:39:2225:40 | in : Vector [<element>] : String | Test.java:2225:10:2225:47 | forEachButLast(...) : String | provenance | MaD:582 |
 | Test.java:2231:18:2231:55 | newVectorWithElement(...) : Vector [<element>] : String | Test.java:2232:28:2232:29 | in : Vector [<element>] : String | provenance |  |
 | Test.java:2231:39:2231:54 | (...)... : String | Test.java:269:37:269:45 | element : String | provenance |  |
-| Test.java:2231:39:2231:54 | (...)... : String | Test.java:2231:18:2231:55 | newVectorWithElement(...) : Vector [<element>] : String | provenance | MaD:2 |
+| Test.java:2231:39:2231:54 | (...)... : String | Test.java:2231:18:2231:55 | newVectorWithElement(...) : Vector [<element>] : String | provenance | MaD:4 |
 | Test.java:2231:47:2231:54 | source(...) : Object | Test.java:2231:39:2231:54 | (...)... : String | provenance |  |
 | Test.java:2232:10:2232:33 | get(...) : String | Test.java:2233:9:2233:11 | out | provenance |  |
-| Test.java:2232:28:2232:29 | in : Vector [<element>] : String | Test.java:2232:10:2232:33 | get(...) : String | provenance | MaD:508 |
+| Test.java:2232:28:2232:29 | in : Vector [<element>] : String | Test.java:2232:10:2232:33 | get(...) : String | provenance | MaD:583 |
 | Test.java:2238:18:2238:55 | newVectorWithElement(...) : Vector [<element>] : String | Test.java:2239:40:2239:41 | in : Vector [<element>] : String | provenance |  |
 | Test.java:2238:39:2238:54 | (...)... : String | Test.java:269:37:269:45 | element : String | provenance |  |
-| Test.java:2238:39:2238:54 | (...)... : String | Test.java:2238:18:2238:55 | newVectorWithElement(...) : Vector [<element>] : String | provenance | MaD:2 |
+| Test.java:2238:39:2238:54 | (...)... : String | Test.java:2238:18:2238:55 | newVectorWithElement(...) : Vector [<element>] : String | provenance | MaD:4 |
 | Test.java:2238:47:2238:54 | source(...) : Object | Test.java:2238:39:2238:54 | (...)... : String | provenance |  |
 | Test.java:2239:10:2239:42 | loopingIterable(...) : Iterable [<element>] : String | Test.java:2240:20:2240:22 | out : Iterable [<element>] : String | provenance |  |
-| Test.java:2239:40:2239:41 | in : Vector [<element>] : String | Test.java:2239:10:2239:42 | loopingIterable(...) : Iterable [<element>] : String | provenance | MaD:509 |
+| Test.java:2239:40:2239:41 | in : Vector [<element>] : String | Test.java:2239:10:2239:42 | loopingIterable(...) : Iterable [<element>] : String | provenance | MaD:584 |
 | Test.java:2240:20:2240:22 | out : Iterable [<element>] : String | Test.java:230:19:230:32 | it : Iterable [<element>] : String | provenance |  |
-| Test.java:2240:20:2240:22 | out : Iterable [<element>] : String | Test.java:2240:9:2240:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:2240:20:2240:22 | out : Iterable [<element>] : String | Test.java:2240:9:2240:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:2245:18:2245:55 | newVectorWithElement(...) : Vector [<element>] : String | Test.java:2246:34:2246:35 | in : Vector [<element>] : String | provenance |  |
 | Test.java:2245:39:2245:54 | (...)... : String | Test.java:269:37:269:45 | element : String | provenance |  |
-| Test.java:2245:39:2245:54 | (...)... : String | Test.java:2245:18:2245:55 | newVectorWithElement(...) : Vector [<element>] : String | provenance | MaD:2 |
+| Test.java:2245:39:2245:54 | (...)... : String | Test.java:2245:18:2245:55 | newVectorWithElement(...) : Vector [<element>] : String | provenance | MaD:4 |
 | Test.java:2245:47:2245:54 | source(...) : Object | Test.java:2245:39:2245:54 | (...)... : String | provenance |  |
 | Test.java:2246:10:2246:85 | partition(...) : List [<element>, <element>] : String | Test.java:2247:41:2247:43 | out : List [<element>, <element>] : String | provenance |  |
-| Test.java:2246:34:2246:35 | in : Vector [<element>] : String | Test.java:2246:10:2246:85 | partition(...) : List [<element>, <element>] : String | provenance | MaD:510 |
+| Test.java:2246:34:2246:35 | in : Vector [<element>] : String | Test.java:2246:10:2246:85 | partition(...) : List [<element>, <element>] : String | provenance | MaD:585 |
 | Test.java:2247:20:2247:44 | (...)... : Iterable [<element>] : String | Test.java:230:19:230:32 | it : Iterable [<element>] : String | provenance |  |
-| Test.java:2247:20:2247:44 | (...)... : Iterable [<element>] : String | Test.java:2247:9:2247:45 | getElement(...) | provenance | MaD:1 |
+| Test.java:2247:20:2247:44 | (...)... : Iterable [<element>] : String | Test.java:2247:9:2247:45 | getElement(...) | provenance | MaD:3 |
 | Test.java:2247:30:2247:44 | getElement(...) : Object [<element>] : String | Test.java:2247:20:2247:44 | (...)... : Iterable [<element>] : String | provenance |  |
 | Test.java:2247:41:2247:43 | out : List [<element>, <element>] : String | Test.java:230:19:230:32 | it : List [<element>, <element>] : String | provenance |  |
-| Test.java:2247:41:2247:43 | out : List [<element>, <element>] : String | Test.java:2247:30:2247:44 | getElement(...) : Object [<element>] : String | provenance | MaD:1 |
+| Test.java:2247:41:2247:43 | out : List [<element>, <element>] : String | Test.java:2247:30:2247:44 | getElement(...) : Object [<element>] : String | provenance | MaD:3 |
 | Test.java:2252:18:2252:55 | newVectorWithElement(...) : Vector [<element>] : String | Test.java:2253:34:2253:35 | in : Vector [<element>] : String | provenance |  |
 | Test.java:2252:39:2252:54 | (...)... : String | Test.java:269:37:269:45 | element : String | provenance |  |
-| Test.java:2252:39:2252:54 | (...)... : String | Test.java:2252:18:2252:55 | newVectorWithElement(...) : Vector [<element>] : String | provenance | MaD:2 |
+| Test.java:2252:39:2252:54 | (...)... : String | Test.java:2252:18:2252:55 | newVectorWithElement(...) : Vector [<element>] : String | provenance | MaD:4 |
 | Test.java:2252:47:2252:54 | source(...) : Object | Test.java:2252:39:2252:54 | (...)... : String | provenance |  |
 | Test.java:2253:10:2253:70 | partition(...) : List [<element>, <element>] : String | Test.java:2254:41:2254:43 | out : List [<element>, <element>] : String | provenance |  |
-| Test.java:2253:34:2253:35 | in : Vector [<element>] : String | Test.java:2253:10:2253:70 | partition(...) : List [<element>, <element>] : String | provenance | MaD:510 |
+| Test.java:2253:34:2253:35 | in : Vector [<element>] : String | Test.java:2253:10:2253:70 | partition(...) : List [<element>, <element>] : String | provenance | MaD:585 |
 | Test.java:2254:20:2254:44 | (...)... : Iterable [<element>] : String | Test.java:230:19:230:32 | it : Iterable [<element>] : String | provenance |  |
-| Test.java:2254:20:2254:44 | (...)... : Iterable [<element>] : String | Test.java:2254:9:2254:45 | getElement(...) | provenance | MaD:1 |
+| Test.java:2254:20:2254:44 | (...)... : Iterable [<element>] : String | Test.java:2254:9:2254:45 | getElement(...) | provenance | MaD:3 |
 | Test.java:2254:30:2254:44 | getElement(...) : Object [<element>] : String | Test.java:2254:20:2254:44 | (...)... : Iterable [<element>] : String | provenance |  |
 | Test.java:2254:41:2254:43 | out : List [<element>, <element>] : String | Test.java:230:19:230:32 | it : List [<element>, <element>] : String | provenance |  |
-| Test.java:2254:41:2254:43 | out : List [<element>, <element>] : String | Test.java:2254:30:2254:44 | getElement(...) : Object [<element>] : String | provenance | MaD:1 |
+| Test.java:2254:41:2254:43 | out : List [<element>, <element>] : String | Test.java:2254:30:2254:44 | getElement(...) : Object [<element>] : String | provenance | MaD:3 |
 | Test.java:2259:18:2259:55 | newVectorWithElement(...) : Vector [<element>] : String | Test.java:2260:34:2260:35 | in : Vector [<element>] : String | provenance |  |
 | Test.java:2259:39:2259:54 | (...)... : String | Test.java:269:37:269:45 | element : String | provenance |  |
-| Test.java:2259:39:2259:54 | (...)... : String | Test.java:2259:18:2259:55 | newVectorWithElement(...) : Vector [<element>] : String | provenance | MaD:2 |
+| Test.java:2259:39:2259:54 | (...)... : String | Test.java:2259:18:2259:55 | newVectorWithElement(...) : Vector [<element>] : String | provenance | MaD:4 |
 | Test.java:2259:47:2259:54 | source(...) : Object | Test.java:2259:39:2259:54 | (...)... : String | provenance |  |
 | Test.java:2260:10:2260:70 | partition(...) : List [<element>, <element>] : String | Test.java:2261:41:2261:43 | out : List [<element>, <element>] : String | provenance |  |
-| Test.java:2260:34:2260:35 | in : Vector [<element>] : String | Test.java:2260:10:2260:70 | partition(...) : List [<element>, <element>] : String | provenance | MaD:510 |
+| Test.java:2260:34:2260:35 | in : Vector [<element>] : String | Test.java:2260:10:2260:70 | partition(...) : List [<element>, <element>] : String | provenance | MaD:585 |
 | Test.java:2261:20:2261:44 | (...)... : Iterable [<element>] : String | Test.java:230:19:230:32 | it : Iterable [<element>] : String | provenance |  |
-| Test.java:2261:20:2261:44 | (...)... : Iterable [<element>] : String | Test.java:2261:9:2261:45 | getElement(...) | provenance | MaD:1 |
+| Test.java:2261:20:2261:44 | (...)... : Iterable [<element>] : String | Test.java:2261:9:2261:45 | getElement(...) | provenance | MaD:3 |
 | Test.java:2261:30:2261:44 | getElement(...) : Object [<element>] : String | Test.java:2261:20:2261:44 | (...)... : Iterable [<element>] : String | provenance |  |
 | Test.java:2261:41:2261:43 | out : List [<element>, <element>] : String | Test.java:230:19:230:32 | it : List [<element>, <element>] : String | provenance |  |
-| Test.java:2261:41:2261:43 | out : List [<element>, <element>] : String | Test.java:2261:30:2261:44 | getElement(...) : Object [<element>] : String | provenance | MaD:1 |
+| Test.java:2261:41:2261:43 | out : List [<element>, <element>] : String | Test.java:2261:30:2261:44 | getElement(...) : Object [<element>] : String | provenance | MaD:3 |
 | Test.java:2266:18:2266:55 | newVectorWithElement(...) : Vector [<element>] : String | Test.java:2267:41:2267:42 | in : Vector [<element>] : String | provenance |  |
 | Test.java:2266:39:2266:54 | (...)... : String | Test.java:269:37:269:45 | element : String | provenance |  |
-| Test.java:2266:39:2266:54 | (...)... : String | Test.java:2266:18:2266:55 | newVectorWithElement(...) : Vector [<element>] : String | provenance | MaD:2 |
+| Test.java:2266:39:2266:54 | (...)... : String | Test.java:2266:18:2266:55 | newVectorWithElement(...) : Vector [<element>] : String | provenance | MaD:4 |
 | Test.java:2266:47:2266:54 | source(...) : Object | Test.java:2266:39:2266:54 | (...)... : String | provenance |  |
 | Test.java:2267:10:2267:43 | reversedIterable(...) : Iterable [<element>] : String | Test.java:2268:20:2268:22 | out : Iterable [<element>] : String | provenance |  |
-| Test.java:2267:41:2267:42 | in : Vector [<element>] : String | Test.java:2267:10:2267:43 | reversedIterable(...) : Iterable [<element>] : String | provenance | MaD:511 |
+| Test.java:2267:41:2267:42 | in : Vector [<element>] : String | Test.java:2267:10:2267:43 | reversedIterable(...) : Iterable [<element>] : String | provenance | MaD:586 |
 | Test.java:2268:20:2268:22 | out : Iterable [<element>] : String | Test.java:230:19:230:32 | it : Iterable [<element>] : String | provenance |  |
-| Test.java:2268:20:2268:22 | out : Iterable [<element>] : String | Test.java:2268:9:2268:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:2268:20:2268:22 | out : Iterable [<element>] : String | Test.java:2268:9:2268:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:2273:18:2273:55 | newVectorWithElement(...) : Vector [<element>] : String | Test.java:2274:41:2274:42 | in : Vector [<element>] : String | provenance |  |
 | Test.java:2273:39:2273:54 | (...)... : String | Test.java:269:37:269:45 | element : String | provenance |  |
-| Test.java:2273:39:2273:54 | (...)... : String | Test.java:2273:18:2273:55 | newVectorWithElement(...) : Vector [<element>] : String | provenance | MaD:2 |
+| Test.java:2273:39:2273:54 | (...)... : String | Test.java:2273:18:2273:55 | newVectorWithElement(...) : Vector [<element>] : String | provenance | MaD:4 |
 | Test.java:2273:47:2273:54 | source(...) : Object | Test.java:2273:39:2273:54 | (...)... : String | provenance |  |
 | Test.java:2274:10:2274:47 | skippingIterable(...) : Iterable [<element>] : String | Test.java:2275:20:2275:22 | out : Iterable [<element>] : String | provenance |  |
-| Test.java:2274:41:2274:42 | in : Vector [<element>] : String | Test.java:2274:10:2274:47 | skippingIterable(...) : Iterable [<element>] : String | provenance | MaD:512 |
+| Test.java:2274:41:2274:42 | in : Vector [<element>] : String | Test.java:2274:10:2274:47 | skippingIterable(...) : Iterable [<element>] : String | provenance | MaD:587 |
 | Test.java:2275:20:2275:22 | out : Iterable [<element>] : String | Test.java:230:19:230:32 | it : Iterable [<element>] : String | provenance |  |
-| Test.java:2275:20:2275:22 | out : Iterable [<element>] : String | Test.java:2275:9:2275:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:2275:20:2275:22 | out : Iterable [<element>] : String | Test.java:2275:9:2275:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:2280:18:2280:55 | newVectorWithElement(...) : Vector [<element>] : String | Test.java:2281:31:2281:32 | in : Vector [<element>] : String | provenance |  |
 | Test.java:2280:39:2280:54 | (...)... : String | Test.java:269:37:269:45 | element : String | provenance |  |
-| Test.java:2280:39:2280:54 | (...)... : String | Test.java:2280:18:2280:55 | newVectorWithElement(...) : Vector [<element>] : String | provenance | MaD:2 |
+| Test.java:2280:39:2280:54 | (...)... : String | Test.java:2280:18:2280:55 | newVectorWithElement(...) : Vector [<element>] : String | provenance | MaD:4 |
 | Test.java:2280:47:2280:54 | source(...) : Object | Test.java:2280:39:2280:54 | (...)... : String | provenance |  |
 | Test.java:2281:10:2281:33 | toList(...) : List [<element>] : String | Test.java:2282:20:2282:22 | out : List [<element>] : String | provenance |  |
-| Test.java:2281:31:2281:32 | in : Vector [<element>] : String | Test.java:2281:10:2281:33 | toList(...) : List [<element>] : String | provenance | MaD:513 |
+| Test.java:2281:31:2281:32 | in : Vector [<element>] : String | Test.java:2281:10:2281:33 | toList(...) : List [<element>] : String | provenance | MaD:588 |
 | Test.java:2282:20:2282:22 | out : List [<element>] : String | Test.java:230:19:230:32 | it : List [<element>] : String | provenance |  |
-| Test.java:2282:20:2282:22 | out : List [<element>] : String | Test.java:2282:9:2282:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:2282:20:2282:22 | out : List [<element>] : String | Test.java:2282:9:2282:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:2287:16:2287:31 | (...)... : String | Test.java:2288:45:2288:46 | in : String | provenance |  |
 | Test.java:2287:24:2287:31 | source(...) : Object | Test.java:2287:16:2287:31 | (...)... : String | provenance |  |
 | Test.java:2288:10:2288:59 | toString(...) : String | Test.java:2289:9:2289:11 | out | provenance |  |
-| Test.java:2288:45:2288:46 | in : String | Test.java:2288:10:2288:59 | toString(...) : String | provenance | MaD:514 |
+| Test.java:2288:45:2288:46 | in : String | Test.java:2288:10:2288:59 | toString(...) : String | provenance | MaD:589 |
 | Test.java:2294:16:2294:31 | (...)... : String | Test.java:2295:51:2295:52 | in : String | provenance |  |
 | Test.java:2294:24:2294:31 | source(...) : Object | Test.java:2294:16:2294:31 | (...)... : String | provenance |  |
 | Test.java:2295:10:2295:59 | toString(...) : String | Test.java:2296:9:2296:11 | out | provenance |  |
-| Test.java:2295:51:2295:52 | in : String | Test.java:2295:10:2295:59 | toString(...) : String | provenance | MaD:515 |
+| Test.java:2295:51:2295:52 | in : String | Test.java:2295:10:2295:59 | toString(...) : String | provenance | MaD:590 |
 | Test.java:2301:16:2301:31 | (...)... : String | Test.java:2302:57:2302:58 | in : String | provenance |  |
 | Test.java:2301:24:2301:31 | source(...) : Object | Test.java:2301:16:2301:31 | (...)... : String | provenance |  |
 | Test.java:2302:10:2302:59 | toString(...) : String | Test.java:2303:9:2303:11 | out | provenance |  |
-| Test.java:2302:57:2302:58 | in : String | Test.java:2302:10:2302:59 | toString(...) : String | provenance | MaD:516 |
+| Test.java:2302:57:2302:58 | in : String | Test.java:2302:10:2302:59 | toString(...) : String | provenance | MaD:591 |
 | Test.java:2308:18:2308:55 | newVectorWithElement(...) : Vector [<element>] : String | Test.java:2309:39:2309:40 | in : Vector [<element>] : String | provenance |  |
 | Test.java:2308:39:2308:54 | (...)... : String | Test.java:269:37:269:45 | element : String | provenance |  |
-| Test.java:2308:39:2308:54 | (...)... : String | Test.java:2308:18:2308:55 | newVectorWithElement(...) : Vector [<element>] : String | provenance | MaD:2 |
+| Test.java:2308:39:2308:54 | (...)... : String | Test.java:2308:18:2308:55 | newVectorWithElement(...) : Vector [<element>] : String | provenance | MaD:4 |
 | Test.java:2308:47:2308:54 | source(...) : Object | Test.java:2308:39:2308:54 | (...)... : String | provenance |  |
 | Test.java:2309:10:2309:41 | uniqueIterable(...) : Iterable [<element>] : String | Test.java:2310:20:2310:22 | out : Iterable [<element>] : String | provenance |  |
-| Test.java:2309:39:2309:40 | in : Vector [<element>] : String | Test.java:2309:10:2309:41 | uniqueIterable(...) : Iterable [<element>] : String | provenance | MaD:517 |
+| Test.java:2309:39:2309:40 | in : Vector [<element>] : String | Test.java:2309:10:2309:41 | uniqueIterable(...) : Iterable [<element>] : String | provenance | MaD:592 |
 | Test.java:2310:20:2310:22 | out : Iterable [<element>] : String | Test.java:230:19:230:32 | it : Iterable [<element>] : String | provenance |  |
-| Test.java:2310:20:2310:22 | out : Iterable [<element>] : String | Test.java:2310:9:2310:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:2310:20:2310:22 | out : Iterable [<element>] : String | Test.java:2310:9:2310:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:2315:18:2315:55 | newVectorWithElement(...) : Vector [<element>] : String | Test.java:2316:45:2316:46 | in : Vector [<element>] : String | provenance |  |
 | Test.java:2315:39:2315:54 | (...)... : String | Test.java:269:37:269:45 | element : String | provenance |  |
-| Test.java:2315:39:2315:54 | (...)... : String | Test.java:2315:18:2315:55 | newVectorWithElement(...) : Vector [<element>] : String | provenance | MaD:2 |
+| Test.java:2315:39:2315:54 | (...)... : String | Test.java:2315:18:2315:55 | newVectorWithElement(...) : Vector [<element>] : String | provenance | MaD:4 |
 | Test.java:2315:47:2315:54 | source(...) : Object | Test.java:2315:39:2315:54 | (...)... : String | provenance |  |
 | Test.java:2316:10:2316:47 | unmodifiableIterable(...) : Iterable [<element>] : String | Test.java:2317:20:2317:22 | out : Iterable [<element>] : String | provenance |  |
-| Test.java:2316:45:2316:46 | in : Vector [<element>] : String | Test.java:2316:10:2316:47 | unmodifiableIterable(...) : Iterable [<element>] : String | provenance | MaD:518 |
+| Test.java:2316:45:2316:46 | in : Vector [<element>] : String | Test.java:2316:10:2316:47 | unmodifiableIterable(...) : Iterable [<element>] : String | provenance | MaD:593 |
 | Test.java:2317:20:2317:22 | out : Iterable [<element>] : String | Test.java:230:19:230:32 | it : Iterable [<element>] : String | provenance |  |
-| Test.java:2317:20:2317:22 | out : Iterable [<element>] : String | Test.java:2317:9:2317:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:2317:20:2317:22 | out : Iterable [<element>] : String | Test.java:2317:9:2317:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:2322:18:2322:55 | newVectorWithElement(...) : Vector [<element>] : String | Test.java:2323:56:2323:57 | in : Vector [<element>] : String | provenance |  |
 | Test.java:2322:39:2322:54 | (...)... : String | Test.java:269:37:269:45 | element : String | provenance |  |
-| Test.java:2322:39:2322:54 | (...)... : String | Test.java:2322:18:2322:55 | newVectorWithElement(...) : Vector [<element>] : String | provenance | MaD:2 |
+| Test.java:2322:39:2322:54 | (...)... : String | Test.java:2322:18:2322:55 | newVectorWithElement(...) : Vector [<element>] : String | provenance | MaD:4 |
 | Test.java:2322:47:2322:54 | source(...) : Object | Test.java:2322:39:2322:54 | (...)... : String | provenance |  |
 | Test.java:2323:10:2323:58 | zippingIterable(...) : Iterable [<element>] : String | Test.java:2324:20:2324:22 | out : Iterable [<element>] : String | provenance |  |
-| Test.java:2323:56:2323:57 | in : Vector [<element>] : String | Test.java:2323:10:2323:58 | zippingIterable(...) : Iterable [<element>] : String | provenance | MaD:520 |
+| Test.java:2323:56:2323:57 | in : Vector [<element>] : String | Test.java:2323:10:2323:58 | zippingIterable(...) : Iterable [<element>] : String | provenance | MaD:594 |
 | Test.java:2324:20:2324:22 | out : Iterable [<element>] : String | Test.java:230:19:230:32 | it : Iterable [<element>] : String | provenance |  |
-| Test.java:2324:20:2324:22 | out : Iterable [<element>] : String | Test.java:2324:9:2324:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:2324:20:2324:22 | out : Iterable [<element>] : String | Test.java:2324:9:2324:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:2329:18:2329:55 | newVectorWithElement(...) : Vector [<element>] : String | Test.java:2330:56:2330:57 | in : Vector [<element>] : String | provenance |  |
 | Test.java:2329:39:2329:54 | (...)... : String | Test.java:269:37:269:45 | element : String | provenance |  |
-| Test.java:2329:39:2329:54 | (...)... : String | Test.java:2329:18:2329:55 | newVectorWithElement(...) : Vector [<element>] : String | provenance | MaD:2 |
+| Test.java:2329:39:2329:54 | (...)... : String | Test.java:2329:18:2329:55 | newVectorWithElement(...) : Vector [<element>] : String | provenance | MaD:4 |
 | Test.java:2329:47:2329:54 | source(...) : Object | Test.java:2329:39:2329:54 | (...)... : String | provenance |  |
 | Test.java:2330:10:2330:58 | zippingIterable(...) : Iterable [<element>] : String | Test.java:2331:20:2331:22 | out : Iterable [<element>] : String | provenance |  |
-| Test.java:2330:56:2330:57 | in : Vector [<element>] : String | Test.java:2330:10:2330:58 | zippingIterable(...) : Iterable [<element>] : String | provenance | MaD:520 |
+| Test.java:2330:56:2330:57 | in : Vector [<element>] : String | Test.java:2330:10:2330:58 | zippingIterable(...) : Iterable [<element>] : String | provenance | MaD:594 |
 | Test.java:2331:20:2331:22 | out : Iterable [<element>] : String | Test.java:230:19:230:32 | it : Iterable [<element>] : String | provenance |  |
-| Test.java:2331:20:2331:22 | out : Iterable [<element>] : String | Test.java:2331:9:2331:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:2331:20:2331:22 | out : Iterable [<element>] : String | Test.java:2331:9:2331:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:2336:18:2336:55 | newVectorWithElement(...) : Vector [<element>] : String | Test.java:2337:40:2337:41 | in : Vector [<element>] : String | provenance |  |
 | Test.java:2336:39:2336:54 | (...)... : String | Test.java:269:37:269:45 | element : String | provenance |  |
-| Test.java:2336:39:2336:54 | (...)... : String | Test.java:2336:18:2336:55 | newVectorWithElement(...) : Vector [<element>] : String | provenance | MaD:2 |
+| Test.java:2336:39:2336:54 | (...)... : String | Test.java:2336:18:2336:55 | newVectorWithElement(...) : Vector [<element>] : String | provenance | MaD:4 |
 | Test.java:2336:47:2336:54 | source(...) : Object | Test.java:2336:39:2336:54 | (...)... : String | provenance |  |
 | Test.java:2337:10:2337:74 | zippingIterable(...) : Iterable [<element>] : String | Test.java:2338:20:2338:22 | out : Iterable [<element>] : String | provenance |  |
-| Test.java:2337:40:2337:41 | in : Vector [<element>] : String | Test.java:2337:10:2337:74 | zippingIterable(...) : Iterable [<element>] : String | provenance | MaD:519 |
+| Test.java:2337:40:2337:41 | in : Vector [<element>] : String | Test.java:2337:10:2337:74 | zippingIterable(...) : Iterable [<element>] : String | provenance | MaD:595 |
 | Test.java:2338:20:2338:22 | out : Iterable [<element>] : String | Test.java:230:19:230:32 | it : Iterable [<element>] : String | provenance |  |
-| Test.java:2338:20:2338:22 | out : Iterable [<element>] : String | Test.java:2338:9:2338:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:2338:20:2338:22 | out : Iterable [<element>] : String | Test.java:2338:9:2338:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:2343:18:2343:55 | newVectorWithElement(...) : Vector [<element>] : String | Test.java:2344:40:2344:41 | in : Vector [<element>] : String | provenance |  |
 | Test.java:2343:39:2343:54 | (...)... : String | Test.java:269:37:269:45 | element : String | provenance |  |
-| Test.java:2343:39:2343:54 | (...)... : String | Test.java:2343:18:2343:55 | newVectorWithElement(...) : Vector [<element>] : String | provenance | MaD:2 |
+| Test.java:2343:39:2343:54 | (...)... : String | Test.java:2343:18:2343:55 | newVectorWithElement(...) : Vector [<element>] : String | provenance | MaD:4 |
 | Test.java:2343:47:2343:54 | source(...) : Object | Test.java:2343:39:2343:54 | (...)... : String | provenance |  |
 | Test.java:2344:10:2344:58 | zippingIterable(...) : Iterable [<element>] : String | Test.java:2345:20:2345:22 | out : Iterable [<element>] : String | provenance |  |
-| Test.java:2344:40:2344:41 | in : Vector [<element>] : String | Test.java:2344:10:2344:58 | zippingIterable(...) : Iterable [<element>] : String | provenance | MaD:519 |
+| Test.java:2344:40:2344:41 | in : Vector [<element>] : String | Test.java:2344:10:2344:58 | zippingIterable(...) : Iterable [<element>] : String | provenance | MaD:595 |
 | Test.java:2345:20:2345:22 | out : Iterable [<element>] : String | Test.java:230:19:230:32 | it : Iterable [<element>] : String | provenance |  |
-| Test.java:2345:20:2345:22 | out : Iterable [<element>] : String | Test.java:2345:9:2345:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:2345:20:2345:22 | out : Iterable [<element>] : String | Test.java:2345:9:2345:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:2350:18:2350:54 | newWithArrayElement(...) : Object[] [[]] : String | Test.java:2351:38:2351:39 | in : Object[] [[]] : String | provenance |  |
 | Test.java:2350:38:2350:53 | (...)... : String | Test.java:251:31:251:44 | element : String | provenance |  |
 | Test.java:2350:38:2350:53 | (...)... : String | Test.java:2350:18:2350:54 | newWithArrayElement(...) : Object[] [[]] : String | provenance |  |
 | Test.java:2350:46:2350:53 | source(...) : Object | Test.java:2350:38:2350:53 | (...)... : String | provenance |  |
 | Test.java:2351:10:2351:46 | arrayIterator(...) : ResettableIterator [<element>] : String | Test.java:2352:20:2352:22 | out : ResettableIterator [<element>] : String | provenance |  |
-| Test.java:2351:38:2351:39 | in : Object[] [[]] : String | Test.java:2351:10:2351:46 | arrayIterator(...) : ResettableIterator [<element>] : String | provenance | MaD:521 |
+| Test.java:2351:38:2351:39 | in : Object[] [[]] : String | Test.java:2351:10:2351:46 | arrayIterator(...) : ResettableIterator [<element>] : String | provenance | MaD:596 |
 | Test.java:2352:20:2352:22 | out : ResettableIterator [<element>] : String | Test.java:231:19:231:32 | it : ResettableIterator [<element>] : String | provenance |  |
-| Test.java:2352:20:2352:22 | out : ResettableIterator [<element>] : String | Test.java:2352:9:2352:23 | getElement(...) | provenance | MaD:4 |
+| Test.java:2352:20:2352:22 | out : ResettableIterator [<element>] : String | Test.java:2352:9:2352:23 | getElement(...) | provenance | MaD:6 |
 | Test.java:2357:18:2357:54 | newWithArrayElement(...) : Object[] [[]] : String | Test.java:2358:38:2358:39 | in : Object[] [[]] : String | provenance |  |
 | Test.java:2357:38:2357:53 | (...)... : String | Test.java:251:31:251:44 | element : String | provenance |  |
 | Test.java:2357:38:2357:53 | (...)... : String | Test.java:2357:18:2357:54 | newWithArrayElement(...) : Object[] [[]] : String | provenance |  |
 | Test.java:2357:46:2357:53 | source(...) : Object | Test.java:2357:38:2357:53 | (...)... : String | provenance |  |
 | Test.java:2358:10:2358:43 | arrayIterator(...) : ResettableIterator [<element>] : String | Test.java:2359:20:2359:22 | out : ResettableIterator [<element>] : String | provenance |  |
-| Test.java:2358:38:2358:39 | in : Object[] [[]] : String | Test.java:2358:10:2358:43 | arrayIterator(...) : ResettableIterator [<element>] : String | provenance | MaD:521 |
+| Test.java:2358:38:2358:39 | in : Object[] [[]] : String | Test.java:2358:10:2358:43 | arrayIterator(...) : ResettableIterator [<element>] : String | provenance | MaD:596 |
 | Test.java:2359:20:2359:22 | out : ResettableIterator [<element>] : String | Test.java:231:19:231:32 | it : ResettableIterator [<element>] : String | provenance |  |
-| Test.java:2359:20:2359:22 | out : ResettableIterator [<element>] : String | Test.java:2359:9:2359:23 | getElement(...) | provenance | MaD:4 |
+| Test.java:2359:20:2359:22 | out : ResettableIterator [<element>] : String | Test.java:2359:9:2359:23 | getElement(...) | provenance | MaD:6 |
 | Test.java:2364:16:2364:23 | source(...) : Object | Test.java:2365:38:2365:39 | in : Object | provenance |  |
 | Test.java:2365:10:2365:54 | arrayIterator(...) : ResettableIterator [<element>] : Object | Test.java:2366:20:2366:22 | out : ResettableIterator [<element>] : Object | provenance |  |
-| Test.java:2365:10:2365:54 | new ..[] { .. } : Object[] [[]] : Object | Test.java:2365:10:2365:54 | arrayIterator(...) : ResettableIterator [<element>] : Object | provenance | MaD:521 |
+| Test.java:2365:10:2365:54 | new ..[] { .. } : Object[] [[]] : Object | Test.java:2365:10:2365:54 | arrayIterator(...) : ResettableIterator [<element>] : Object | provenance | MaD:596 |
 | Test.java:2365:38:2365:39 | in : Object | Test.java:2365:10:2365:54 | new ..[] { .. } : Object[] [[]] : Object | provenance |  |
 | Test.java:2366:20:2366:22 | out : ResettableIterator [<element>] : Object | Test.java:231:19:231:32 | it : ResettableIterator [<element>] : Object | provenance |  |
-| Test.java:2366:20:2366:22 | out : ResettableIterator [<element>] : Object | Test.java:2366:9:2366:23 | getElement(...) | provenance | MaD:4 |
+| Test.java:2366:20:2366:22 | out : ResettableIterator [<element>] : Object | Test.java:2366:9:2366:23 | getElement(...) | provenance | MaD:6 |
 | Test.java:2371:16:2371:52 | newWithArrayElement(...) : Object[] [[]] : String | Test.java:2372:38:2372:39 | in : Object[] [[]] : String | provenance |  |
 | Test.java:2371:36:2371:51 | (...)... : String | Test.java:251:31:251:44 | element : String | provenance |  |
 | Test.java:2371:36:2371:51 | (...)... : String | Test.java:2371:16:2371:52 | newWithArrayElement(...) : Object[] [[]] : String | provenance |  |
 | Test.java:2371:44:2371:51 | source(...) : Object | Test.java:2371:36:2371:51 | (...)... : String | provenance |  |
 | Test.java:2372:10:2372:46 | arrayIterator(...) : ResettableIterator [<element>] : String | Test.java:2373:20:2373:22 | out : ResettableIterator [<element>] : String | provenance |  |
-| Test.java:2372:38:2372:39 | in : Object[] [[]] : String | Test.java:2372:10:2372:46 | arrayIterator(...) : ResettableIterator [<element>] : String | provenance | MaD:521 |
+| Test.java:2372:38:2372:39 | in : Object[] [[]] : String | Test.java:2372:10:2372:46 | arrayIterator(...) : ResettableIterator [<element>] : String | provenance | MaD:596 |
 | Test.java:2373:20:2373:22 | out : ResettableIterator [<element>] : String | Test.java:231:19:231:32 | it : ResettableIterator [<element>] : String | provenance |  |
-| Test.java:2373:20:2373:22 | out : ResettableIterator [<element>] : String | Test.java:2373:9:2373:23 | getElement(...) | provenance | MaD:4 |
+| Test.java:2373:20:2373:22 | out : ResettableIterator [<element>] : String | Test.java:2373:9:2373:23 | getElement(...) | provenance | MaD:6 |
 | Test.java:2378:16:2378:52 | newWithArrayElement(...) : Object[] [[]] : String | Test.java:2379:38:2379:39 | in : Object[] [[]] : String | provenance |  |
 | Test.java:2378:36:2378:51 | (...)... : String | Test.java:251:31:251:44 | element : String | provenance |  |
 | Test.java:2378:36:2378:51 | (...)... : String | Test.java:2378:16:2378:52 | newWithArrayElement(...) : Object[] [[]] : String | provenance |  |
 | Test.java:2378:44:2378:51 | source(...) : Object | Test.java:2378:36:2378:51 | (...)... : String | provenance |  |
 | Test.java:2379:10:2379:43 | arrayIterator(...) : ResettableIterator [<element>] : String | Test.java:2380:20:2380:22 | out : ResettableIterator [<element>] : String | provenance |  |
-| Test.java:2379:38:2379:39 | in : Object[] [[]] : String | Test.java:2379:10:2379:43 | arrayIterator(...) : ResettableIterator [<element>] : String | provenance | MaD:521 |
+| Test.java:2379:38:2379:39 | in : Object[] [[]] : String | Test.java:2379:10:2379:43 | arrayIterator(...) : ResettableIterator [<element>] : String | provenance | MaD:596 |
 | Test.java:2380:20:2380:22 | out : ResettableIterator [<element>] : String | Test.java:231:19:231:32 | it : ResettableIterator [<element>] : String | provenance |  |
-| Test.java:2380:20:2380:22 | out : ResettableIterator [<element>] : String | Test.java:2380:9:2380:23 | getElement(...) | provenance | MaD:4 |
+| Test.java:2380:20:2380:22 | out : ResettableIterator [<element>] : String | Test.java:2380:9:2380:23 | getElement(...) | provenance | MaD:6 |
 | Test.java:2385:16:2385:52 | newWithArrayElement(...) : Object[] [[]] : String | Test.java:2386:38:2386:39 | in : Object[] [[]] : String | provenance |  |
 | Test.java:2385:36:2385:51 | (...)... : String | Test.java:251:31:251:44 | element : String | provenance |  |
 | Test.java:2385:36:2385:51 | (...)... : String | Test.java:2385:16:2385:52 | newWithArrayElement(...) : Object[] [[]] : String | provenance |  |
 | Test.java:2385:44:2385:51 | source(...) : Object | Test.java:2385:36:2385:51 | (...)... : String | provenance |  |
 | Test.java:2386:10:2386:40 | arrayIterator(...) : ResettableIterator [<element>] : String | Test.java:2387:20:2387:22 | out : ResettableIterator [<element>] : String | provenance |  |
-| Test.java:2386:38:2386:39 | in : Object[] [[]] : String | Test.java:2386:10:2386:40 | arrayIterator(...) : ResettableIterator [<element>] : String | provenance | MaD:521 |
+| Test.java:2386:38:2386:39 | in : Object[] [[]] : String | Test.java:2386:10:2386:40 | arrayIterator(...) : ResettableIterator [<element>] : String | provenance | MaD:596 |
 | Test.java:2387:20:2387:22 | out : ResettableIterator [<element>] : String | Test.java:231:19:231:32 | it : ResettableIterator [<element>] : String | provenance |  |
-| Test.java:2387:20:2387:22 | out : ResettableIterator [<element>] : String | Test.java:2387:9:2387:23 | getElement(...) | provenance | MaD:4 |
+| Test.java:2387:20:2387:22 | out : ResettableIterator [<element>] : String | Test.java:2387:9:2387:23 | getElement(...) | provenance | MaD:6 |
 | Test.java:2392:18:2392:54 | newWithArrayElement(...) : Object[] [[]] : String | Test.java:2393:42:2393:43 | in : Object[] [[]] : String | provenance |  |
 | Test.java:2392:38:2392:53 | (...)... : String | Test.java:251:31:251:44 | element : String | provenance |  |
 | Test.java:2392:38:2392:53 | (...)... : String | Test.java:2392:18:2392:54 | newWithArrayElement(...) : Object[] [[]] : String | provenance |  |
 | Test.java:2392:46:2392:53 | source(...) : Object | Test.java:2392:38:2392:53 | (...)... : String | provenance |  |
 | Test.java:2393:10:2393:50 | arrayListIterator(...) : ResettableListIterator [<element>] : String | Test.java:2394:20:2394:22 | out : ResettableListIterator [<element>] : String | provenance |  |
-| Test.java:2393:42:2393:43 | in : Object[] [[]] : String | Test.java:2393:10:2393:50 | arrayListIterator(...) : ResettableListIterator [<element>] : String | provenance | MaD:522 |
+| Test.java:2393:42:2393:43 | in : Object[] [[]] : String | Test.java:2393:10:2393:50 | arrayListIterator(...) : ResettableListIterator [<element>] : String | provenance | MaD:597 |
 | Test.java:2394:20:2394:22 | out : ResettableListIterator [<element>] : String | Test.java:231:19:231:32 | it : ResettableListIterator [<element>] : String | provenance |  |
-| Test.java:2394:20:2394:22 | out : ResettableListIterator [<element>] : String | Test.java:2394:9:2394:23 | getElement(...) | provenance | MaD:4 |
+| Test.java:2394:20:2394:22 | out : ResettableListIterator [<element>] : String | Test.java:2394:9:2394:23 | getElement(...) | provenance | MaD:6 |
 | Test.java:2399:18:2399:54 | newWithArrayElement(...) : Object[] [[]] : String | Test.java:2400:42:2400:43 | in : Object[] [[]] : String | provenance |  |
 | Test.java:2399:38:2399:53 | (...)... : String | Test.java:251:31:251:44 | element : String | provenance |  |
 | Test.java:2399:38:2399:53 | (...)... : String | Test.java:2399:18:2399:54 | newWithArrayElement(...) : Object[] [[]] : String | provenance |  |
 | Test.java:2399:46:2399:53 | source(...) : Object | Test.java:2399:38:2399:53 | (...)... : String | provenance |  |
 | Test.java:2400:10:2400:47 | arrayListIterator(...) : ResettableListIterator [<element>] : String | Test.java:2401:20:2401:22 | out : ResettableListIterator [<element>] : String | provenance |  |
-| Test.java:2400:42:2400:43 | in : Object[] [[]] : String | Test.java:2400:10:2400:47 | arrayListIterator(...) : ResettableListIterator [<element>] : String | provenance | MaD:522 |
+| Test.java:2400:42:2400:43 | in : Object[] [[]] : String | Test.java:2400:10:2400:47 | arrayListIterator(...) : ResettableListIterator [<element>] : String | provenance | MaD:597 |
 | Test.java:2401:20:2401:22 | out : ResettableListIterator [<element>] : String | Test.java:231:19:231:32 | it : ResettableListIterator [<element>] : String | provenance |  |
-| Test.java:2401:20:2401:22 | out : ResettableListIterator [<element>] : String | Test.java:2401:9:2401:23 | getElement(...) | provenance | MaD:4 |
+| Test.java:2401:20:2401:22 | out : ResettableListIterator [<element>] : String | Test.java:2401:9:2401:23 | getElement(...) | provenance | MaD:6 |
 | Test.java:2406:16:2406:23 | source(...) : Object | Test.java:2407:42:2407:43 | in : Object | provenance |  |
 | Test.java:2407:10:2407:58 | arrayListIterator(...) : ResettableListIterator [<element>] : Object | Test.java:2408:20:2408:22 | out : ResettableListIterator [<element>] : Object | provenance |  |
-| Test.java:2407:10:2407:58 | new ..[] { .. } : Object[] [[]] : Object | Test.java:2407:10:2407:58 | arrayListIterator(...) : ResettableListIterator [<element>] : Object | provenance | MaD:522 |
+| Test.java:2407:10:2407:58 | new ..[] { .. } : Object[] [[]] : Object | Test.java:2407:10:2407:58 | arrayListIterator(...) : ResettableListIterator [<element>] : Object | provenance | MaD:597 |
 | Test.java:2407:42:2407:43 | in : Object | Test.java:2407:10:2407:58 | new ..[] { .. } : Object[] [[]] : Object | provenance |  |
 | Test.java:2408:20:2408:22 | out : ResettableListIterator [<element>] : Object | Test.java:231:19:231:32 | it : ResettableListIterator [<element>] : Object | provenance |  |
-| Test.java:2408:20:2408:22 | out : ResettableListIterator [<element>] : Object | Test.java:2408:9:2408:23 | getElement(...) | provenance | MaD:4 |
+| Test.java:2408:20:2408:22 | out : ResettableListIterator [<element>] : Object | Test.java:2408:9:2408:23 | getElement(...) | provenance | MaD:6 |
 | Test.java:2413:16:2413:52 | newWithArrayElement(...) : Object[] [[]] : String | Test.java:2414:42:2414:43 | in : Object[] [[]] : String | provenance |  |
 | Test.java:2413:36:2413:51 | (...)... : String | Test.java:251:31:251:44 | element : String | provenance |  |
 | Test.java:2413:36:2413:51 | (...)... : String | Test.java:2413:16:2413:52 | newWithArrayElement(...) : Object[] [[]] : String | provenance |  |
 | Test.java:2413:44:2413:51 | source(...) : Object | Test.java:2413:36:2413:51 | (...)... : String | provenance |  |
 | Test.java:2414:10:2414:50 | arrayListIterator(...) : ResettableListIterator [<element>] : String | Test.java:2415:20:2415:22 | out : ResettableListIterator [<element>] : String | provenance |  |
-| Test.java:2414:42:2414:43 | in : Object[] [[]] : String | Test.java:2414:10:2414:50 | arrayListIterator(...) : ResettableListIterator [<element>] : String | provenance | MaD:522 |
+| Test.java:2414:42:2414:43 | in : Object[] [[]] : String | Test.java:2414:10:2414:50 | arrayListIterator(...) : ResettableListIterator [<element>] : String | provenance | MaD:597 |
 | Test.java:2415:20:2415:22 | out : ResettableListIterator [<element>] : String | Test.java:231:19:231:32 | it : ResettableListIterator [<element>] : String | provenance |  |
-| Test.java:2415:20:2415:22 | out : ResettableListIterator [<element>] : String | Test.java:2415:9:2415:23 | getElement(...) | provenance | MaD:4 |
+| Test.java:2415:20:2415:22 | out : ResettableListIterator [<element>] : String | Test.java:2415:9:2415:23 | getElement(...) | provenance | MaD:6 |
 | Test.java:2420:16:2420:52 | newWithArrayElement(...) : Object[] [[]] : String | Test.java:2421:42:2421:43 | in : Object[] [[]] : String | provenance |  |
 | Test.java:2420:36:2420:51 | (...)... : String | Test.java:251:31:251:44 | element : String | provenance |  |
 | Test.java:2420:36:2420:51 | (...)... : String | Test.java:2420:16:2420:52 | newWithArrayElement(...) : Object[] [[]] : String | provenance |  |
 | Test.java:2420:44:2420:51 | source(...) : Object | Test.java:2420:36:2420:51 | (...)... : String | provenance |  |
 | Test.java:2421:10:2421:47 | arrayListIterator(...) : ResettableListIterator [<element>] : String | Test.java:2422:20:2422:22 | out : ResettableListIterator [<element>] : String | provenance |  |
-| Test.java:2421:42:2421:43 | in : Object[] [[]] : String | Test.java:2421:10:2421:47 | arrayListIterator(...) : ResettableListIterator [<element>] : String | provenance | MaD:522 |
+| Test.java:2421:42:2421:43 | in : Object[] [[]] : String | Test.java:2421:10:2421:47 | arrayListIterator(...) : ResettableListIterator [<element>] : String | provenance | MaD:597 |
 | Test.java:2422:20:2422:22 | out : ResettableListIterator [<element>] : String | Test.java:231:19:231:32 | it : ResettableListIterator [<element>] : String | provenance |  |
-| Test.java:2422:20:2422:22 | out : ResettableListIterator [<element>] : String | Test.java:2422:9:2422:23 | getElement(...) | provenance | MaD:4 |
+| Test.java:2422:20:2422:22 | out : ResettableListIterator [<element>] : String | Test.java:2422:9:2422:23 | getElement(...) | provenance | MaD:6 |
 | Test.java:2427:16:2427:52 | newWithArrayElement(...) : Object[] [[]] : String | Test.java:2428:42:2428:43 | in : Object[] [[]] : String | provenance |  |
 | Test.java:2427:36:2427:51 | (...)... : String | Test.java:251:31:251:44 | element : String | provenance |  |
 | Test.java:2427:36:2427:51 | (...)... : String | Test.java:2427:16:2427:52 | newWithArrayElement(...) : Object[] [[]] : String | provenance |  |
 | Test.java:2427:44:2427:51 | source(...) : Object | Test.java:2427:36:2427:51 | (...)... : String | provenance |  |
 | Test.java:2428:10:2428:44 | arrayListIterator(...) : ResettableListIterator [<element>] : String | Test.java:2429:20:2429:22 | out : ResettableListIterator [<element>] : String | provenance |  |
-| Test.java:2428:42:2428:43 | in : Object[] [[]] : String | Test.java:2428:10:2428:44 | arrayListIterator(...) : ResettableListIterator [<element>] : String | provenance | MaD:522 |
+| Test.java:2428:42:2428:43 | in : Object[] [[]] : String | Test.java:2428:10:2428:44 | arrayListIterator(...) : ResettableListIterator [<element>] : String | provenance | MaD:597 |
 | Test.java:2429:20:2429:22 | out : ResettableListIterator [<element>] : String | Test.java:231:19:231:32 | it : ResettableListIterator [<element>] : String | provenance |  |
-| Test.java:2429:20:2429:22 | out : ResettableListIterator [<element>] : String | Test.java:2429:9:2429:23 | getElement(...) | provenance | MaD:4 |
+| Test.java:2429:20:2429:22 | out : ResettableListIterator [<element>] : String | Test.java:2429:9:2429:23 | getElement(...) | provenance | MaD:6 |
 | Test.java:2434:18:2434:61 | newListIteratorWithElement(...) : ListIterator [<element>] : String | Test.java:2435:38:2435:39 | in : ListIterator [<element>] : String | provenance |  |
 | Test.java:2434:45:2434:60 | (...)... : String | Test.java:259:49:259:57 | element : String | provenance |  |
-| Test.java:2434:45:2434:60 | (...)... : String | Test.java:2434:18:2434:61 | newListIteratorWithElement(...) : ListIterator [<element>] : String | provenance | MaD:2 |
+| Test.java:2434:45:2434:60 | (...)... : String | Test.java:2434:18:2434:61 | newListIteratorWithElement(...) : ListIterator [<element>] : String | provenance | MaD:4 |
 | Test.java:2434:53:2434:60 | source(...) : Object | Test.java:2434:45:2434:60 | (...)... : String | provenance |  |
 | Test.java:2435:10:2435:40 | asEnumeration(...) : Enumeration [<element>] : String | Test.java:2436:20:2436:22 | out : Enumeration [<element>] : String | provenance |  |
-| Test.java:2435:38:2435:39 | in : ListIterator [<element>] : String | Test.java:2435:10:2435:40 | asEnumeration(...) : Enumeration [<element>] : String | provenance | MaD:523 |
+| Test.java:2435:38:2435:39 | in : ListIterator [<element>] : String | Test.java:2435:10:2435:40 | asEnumeration(...) : Enumeration [<element>] : String | provenance | MaD:598 |
 | Test.java:2436:20:2436:22 | out : Enumeration [<element>] : String | Test.java:234:19:234:42 | container : Enumeration [<element>] : String | provenance |  |
-| Test.java:2436:20:2436:22 | out : Enumeration [<element>] : String | Test.java:2436:9:2436:23 | getElement(...) | provenance | MaD:3 |
+| Test.java:2436:20:2436:22 | out : Enumeration [<element>] : String | Test.java:2436:9:2436:23 | getElement(...) | provenance | MaD:5 |
 | Test.java:2441:18:2441:61 | newListIteratorWithElement(...) : ListIterator [<element>] : String | Test.java:2442:35:2442:36 | in : ListIterator [<element>] : String | provenance |  |
 | Test.java:2441:45:2441:60 | (...)... : String | Test.java:259:49:259:57 | element : String | provenance |  |
-| Test.java:2441:45:2441:60 | (...)... : String | Test.java:2441:18:2441:61 | newListIteratorWithElement(...) : ListIterator [<element>] : String | provenance | MaD:2 |
+| Test.java:2441:45:2441:60 | (...)... : String | Test.java:2441:18:2441:61 | newListIteratorWithElement(...) : ListIterator [<element>] : String | provenance | MaD:4 |
 | Test.java:2441:53:2441:60 | source(...) : Object | Test.java:2441:45:2441:60 | (...)... : String | provenance |  |
 | Test.java:2442:10:2442:37 | asIterable(...) : Iterable [<element>] : String | Test.java:2443:20:2443:22 | out : Iterable [<element>] : String | provenance |  |
-| Test.java:2442:35:2442:36 | in : ListIterator [<element>] : String | Test.java:2442:10:2442:37 | asIterable(...) : Iterable [<element>] : String | provenance | MaD:524 |
+| Test.java:2442:35:2442:36 | in : ListIterator [<element>] : String | Test.java:2442:10:2442:37 | asIterable(...) : Iterable [<element>] : String | provenance | MaD:599 |
 | Test.java:2443:20:2443:22 | out : Iterable [<element>] : String | Test.java:230:19:230:32 | it : Iterable [<element>] : String | provenance |  |
-| Test.java:2443:20:2443:22 | out : Iterable [<element>] : String | Test.java:2443:9:2443:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:2443:20:2443:22 | out : Iterable [<element>] : String | Test.java:2443:9:2443:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:2448:21:2448:63 | newEnumerationWithElement(...) : IteratorEnumeration [<element>] : String | Test.java:2449:35:2449:36 | in : IteratorEnumeration [<element>] : String | provenance |  |
 | Test.java:2448:47:2448:62 | (...)... : String | Test.java:256:47:256:55 | element : String | provenance |  |
-| Test.java:2448:47:2448:62 | (...)... : String | Test.java:2448:21:2448:63 | newEnumerationWithElement(...) : IteratorEnumeration [<element>] : String | provenance | MaD:2 |
+| Test.java:2448:47:2448:62 | (...)... : String | Test.java:2448:21:2448:63 | newEnumerationWithElement(...) : IteratorEnumeration [<element>] : String | provenance | MaD:4 |
 | Test.java:2448:55:2448:62 | source(...) : Object | Test.java:2448:47:2448:62 | (...)... : String | provenance |  |
 | Test.java:2449:10:2449:43 | asIterator(...) : Iterator [<element>] : String | Test.java:2450:20:2450:22 | out : Iterator [<element>] : String | provenance |  |
-| Test.java:2449:35:2449:36 | in : IteratorEnumeration [<element>] : String | Test.java:2449:10:2449:43 | asIterator(...) : Iterator [<element>] : String | provenance | MaD:525 |
+| Test.java:2449:35:2449:36 | in : IteratorEnumeration [<element>] : String | Test.java:2449:10:2449:43 | asIterator(...) : Iterator [<element>] : String | provenance | MaD:600 |
 | Test.java:2450:20:2450:22 | out : Iterator [<element>] : String | Test.java:231:19:231:32 | it : Iterator [<element>] : String | provenance |  |
-| Test.java:2450:20:2450:22 | out : Iterator [<element>] : String | Test.java:2450:9:2450:23 | getElement(...) | provenance | MaD:4 |
+| Test.java:2450:20:2450:22 | out : Iterator [<element>] : String | Test.java:2450:9:2450:23 | getElement(...) | provenance | MaD:6 |
 | Test.java:2455:21:2455:63 | newEnumerationWithElement(...) : IteratorEnumeration [<element>] : String | Test.java:2456:35:2456:36 | in : IteratorEnumeration [<element>] : String | provenance |  |
 | Test.java:2455:47:2455:62 | (...)... : String | Test.java:256:47:256:55 | element : String | provenance |  |
-| Test.java:2455:47:2455:62 | (...)... : String | Test.java:2455:21:2455:63 | newEnumerationWithElement(...) : IteratorEnumeration [<element>] : String | provenance | MaD:2 |
+| Test.java:2455:47:2455:62 | (...)... : String | Test.java:2455:21:2455:63 | newEnumerationWithElement(...) : IteratorEnumeration [<element>] : String | provenance | MaD:4 |
 | Test.java:2455:55:2455:62 | source(...) : Object | Test.java:2455:47:2455:62 | (...)... : String | provenance |  |
 | Test.java:2456:10:2456:37 | asIterator(...) : Iterator [<element>] : String | Test.java:2457:20:2457:22 | out : Iterator [<element>] : String | provenance |  |
-| Test.java:2456:35:2456:36 | in : IteratorEnumeration [<element>] : String | Test.java:2456:10:2456:37 | asIterator(...) : Iterator [<element>] : String | provenance | MaD:525 |
+| Test.java:2456:35:2456:36 | in : IteratorEnumeration [<element>] : String | Test.java:2456:10:2456:37 | asIterator(...) : Iterator [<element>] : String | provenance | MaD:600 |
 | Test.java:2457:20:2457:22 | out : Iterator [<element>] : String | Test.java:231:19:231:32 | it : Iterator [<element>] : String | provenance |  |
-| Test.java:2457:20:2457:22 | out : Iterator [<element>] : String | Test.java:2457:9:2457:23 | getElement(...) | provenance | MaD:4 |
+| Test.java:2457:20:2457:22 | out : Iterator [<element>] : String | Test.java:2457:9:2457:23 | getElement(...) | provenance | MaD:6 |
 | Test.java:2462:18:2462:61 | newListIteratorWithElement(...) : ListIterator [<element>] : String | Test.java:2463:46:2463:47 | in : ListIterator [<element>] : String | provenance |  |
 | Test.java:2462:45:2462:60 | (...)... : String | Test.java:259:49:259:57 | element : String | provenance |  |
-| Test.java:2462:45:2462:60 | (...)... : String | Test.java:2462:18:2462:61 | newListIteratorWithElement(...) : ListIterator [<element>] : String | provenance | MaD:2 |
+| Test.java:2462:45:2462:60 | (...)... : String | Test.java:2462:18:2462:61 | newListIteratorWithElement(...) : ListIterator [<element>] : String | provenance | MaD:4 |
 | Test.java:2462:53:2462:60 | source(...) : Object | Test.java:2462:45:2462:60 | (...)... : String | provenance |  |
 | Test.java:2463:10:2463:48 | asMultipleUseIterable(...) : Iterable [<element>] : String | Test.java:2464:20:2464:22 | out : Iterable [<element>] : String | provenance |  |
-| Test.java:2463:46:2463:47 | in : ListIterator [<element>] : String | Test.java:2463:10:2463:48 | asMultipleUseIterable(...) : Iterable [<element>] : String | provenance | MaD:526 |
+| Test.java:2463:46:2463:47 | in : ListIterator [<element>] : String | Test.java:2463:10:2463:48 | asMultipleUseIterable(...) : Iterable [<element>] : String | provenance | MaD:601 |
 | Test.java:2464:20:2464:22 | out : Iterable [<element>] : String | Test.java:230:19:230:32 | it : Iterable [<element>] : String | provenance |  |
-| Test.java:2464:20:2464:22 | out : Iterable [<element>] : String | Test.java:2464:9:2464:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:2464:20:2464:22 | out : Iterable [<element>] : String | Test.java:2464:9:2464:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:2469:18:2469:61 | newListIteratorWithElement(...) : ListIterator [<element>] : String | Test.java:2470:40:2470:41 | in : ListIterator [<element>] : String | provenance |  |
 | Test.java:2469:45:2469:60 | (...)... : String | Test.java:259:49:259:57 | element : String | provenance |  |
-| Test.java:2469:45:2469:60 | (...)... : String | Test.java:2469:18:2469:61 | newListIteratorWithElement(...) : ListIterator [<element>] : String | provenance | MaD:2 |
+| Test.java:2469:45:2469:60 | (...)... : String | Test.java:2469:18:2469:61 | newListIteratorWithElement(...) : ListIterator [<element>] : String | provenance | MaD:4 |
 | Test.java:2469:53:2469:60 | source(...) : Object | Test.java:2469:45:2469:60 | (...)... : String | provenance |  |
 | Test.java:2470:10:2470:50 | boundedIterator(...) : BoundedIterator [<element>] : String | Test.java:2471:20:2471:22 | out : BoundedIterator [<element>] : String | provenance |  |
-| Test.java:2470:40:2470:41 | in : ListIterator [<element>] : String | Test.java:2470:10:2470:50 | boundedIterator(...) : BoundedIterator [<element>] : String | provenance | MaD:527 |
+| Test.java:2470:40:2470:41 | in : ListIterator [<element>] : String | Test.java:2470:10:2470:50 | boundedIterator(...) : BoundedIterator [<element>] : String | provenance | MaD:602 |
 | Test.java:2471:20:2471:22 | out : BoundedIterator [<element>] : String | Test.java:231:19:231:32 | it : BoundedIterator [<element>] : String | provenance |  |
-| Test.java:2471:20:2471:22 | out : BoundedIterator [<element>] : String | Test.java:2471:9:2471:23 | getElement(...) | provenance | MaD:4 |
+| Test.java:2471:20:2471:22 | out : BoundedIterator [<element>] : String | Test.java:2471:9:2471:23 | getElement(...) | provenance | MaD:6 |
 | Test.java:2476:18:2476:61 | newListIteratorWithElement(...) : ListIterator [<element>] : String | Test.java:2477:40:2477:41 | in : ListIterator [<element>] : String | provenance |  |
 | Test.java:2476:45:2476:60 | (...)... : String | Test.java:259:49:259:57 | element : String | provenance |  |
-| Test.java:2476:45:2476:60 | (...)... : String | Test.java:2476:18:2476:61 | newListIteratorWithElement(...) : ListIterator [<element>] : String | provenance | MaD:2 |
+| Test.java:2476:45:2476:60 | (...)... : String | Test.java:2476:18:2476:61 | newListIteratorWithElement(...) : ListIterator [<element>] : String | provenance | MaD:4 |
 | Test.java:2476:53:2476:60 | source(...) : Object | Test.java:2476:45:2476:60 | (...)... : String | provenance |  |
 | Test.java:2477:10:2477:46 | boundedIterator(...) : BoundedIterator [<element>] : String | Test.java:2478:20:2478:22 | out : BoundedIterator [<element>] : String | provenance |  |
-| Test.java:2477:40:2477:41 | in : ListIterator [<element>] : String | Test.java:2477:10:2477:46 | boundedIterator(...) : BoundedIterator [<element>] : String | provenance | MaD:527 |
+| Test.java:2477:40:2477:41 | in : ListIterator [<element>] : String | Test.java:2477:10:2477:46 | boundedIterator(...) : BoundedIterator [<element>] : String | provenance | MaD:602 |
 | Test.java:2478:20:2478:22 | out : BoundedIterator [<element>] : String | Test.java:231:19:231:32 | it : BoundedIterator [<element>] : String | provenance |  |
-| Test.java:2478:20:2478:22 | out : BoundedIterator [<element>] : String | Test.java:2478:9:2478:23 | getElement(...) | provenance | MaD:4 |
+| Test.java:2478:20:2478:22 | out : BoundedIterator [<element>] : String | Test.java:2478:9:2478:23 | getElement(...) | provenance | MaD:6 |
 | Test.java:2483:20:2483:79 | newVectorWithElement(...) : Vector [<element>, <element>] : String | Test.java:2484:40:2484:41 | in : Vector [<element>, <element>] : String | provenance |  |
 | Test.java:2483:41:2483:78 | newVectorWithElement(...) : Vector [<element>] : String | Test.java:270:47:270:65 | element : Vector [<element>] : String | provenance |  |
-| Test.java:2483:41:2483:78 | newVectorWithElement(...) : Vector [<element>] : String | Test.java:2483:20:2483:79 | newVectorWithElement(...) : Vector [<element>, <element>] : String | provenance | MaD:2 |
+| Test.java:2483:41:2483:78 | newVectorWithElement(...) : Vector [<element>] : String | Test.java:2483:20:2483:79 | newVectorWithElement(...) : Vector [<element>, <element>] : String | provenance | MaD:4 |
 | Test.java:2483:62:2483:77 | (...)... : String | Test.java:269:37:269:45 | element : String | provenance |  |
-| Test.java:2483:62:2483:77 | (...)... : String | Test.java:2483:41:2483:78 | newVectorWithElement(...) : Vector [<element>] : String | provenance | MaD:2 |
+| Test.java:2483:62:2483:77 | (...)... : String | Test.java:2483:41:2483:78 | newVectorWithElement(...) : Vector [<element>] : String | provenance | MaD:4 |
 | Test.java:2483:70:2483:77 | source(...) : Object | Test.java:2483:62:2483:77 | (...)... : String | provenance |  |
 | Test.java:2484:10:2484:42 | chainedIterator(...) : Iterator [<element>] : String | Test.java:2485:20:2485:22 | out : Iterator [<element>] : String | provenance |  |
-| Test.java:2484:40:2484:41 | in : Vector [<element>, <element>] : String | Test.java:2484:10:2484:42 | chainedIterator(...) : Iterator [<element>] : String | provenance | MaD:528 |
+| Test.java:2484:40:2484:41 | in : Vector [<element>, <element>] : String | Test.java:2484:10:2484:42 | chainedIterator(...) : Iterator [<element>] : String | provenance | MaD:603 |
 | Test.java:2485:20:2485:22 | out : Iterator [<element>] : String | Test.java:231:19:231:32 | it : Iterator [<element>] : String | provenance |  |
-| Test.java:2485:20:2485:22 | out : Iterator [<element>] : String | Test.java:2485:9:2485:23 | getElement(...) | provenance | MaD:4 |
+| Test.java:2485:20:2485:22 | out : Iterator [<element>] : String | Test.java:2485:9:2485:23 | getElement(...) | provenance | MaD:6 |
 | Test.java:2490:18:2490:61 | newListIteratorWithElement(...) : ListIterator [<element>] : String | Test.java:2491:40:2491:41 | in : ListIterator [<element>] : String | provenance |  |
 | Test.java:2490:45:2490:60 | (...)... : String | Test.java:259:49:259:57 | element : String | provenance |  |
-| Test.java:2490:45:2490:60 | (...)... : String | Test.java:2490:18:2490:61 | newListIteratorWithElement(...) : ListIterator [<element>] : String | provenance | MaD:2 |
+| Test.java:2490:45:2490:60 | (...)... : String | Test.java:2490:18:2490:61 | newListIteratorWithElement(...) : ListIterator [<element>] : String | provenance | MaD:4 |
 | Test.java:2490:53:2490:60 | source(...) : Object | Test.java:2490:45:2490:60 | (...)... : String | provenance |  |
 | Test.java:2491:10:2491:58 | chainedIterator(...) : Iterator [<element>] : String | Test.java:2492:20:2492:22 | out : Iterator [<element>] : String | provenance |  |
-| Test.java:2491:40:2491:41 | in : ListIterator [<element>] : String | Test.java:2491:10:2491:58 | chainedIterator(...) : Iterator [<element>] : String | provenance | MaD:529 |
+| Test.java:2491:40:2491:41 | in : ListIterator [<element>] : String | Test.java:2491:10:2491:58 | chainedIterator(...) : Iterator [<element>] : String | provenance | MaD:604 |
 | Test.java:2492:20:2492:22 | out : Iterator [<element>] : String | Test.java:231:19:231:32 | it : Iterator [<element>] : String | provenance |  |
-| Test.java:2492:20:2492:22 | out : Iterator [<element>] : String | Test.java:2492:9:2492:23 | getElement(...) | provenance | MaD:4 |
+| Test.java:2492:20:2492:22 | out : Iterator [<element>] : String | Test.java:2492:9:2492:23 | getElement(...) | provenance | MaD:6 |
 | Test.java:2497:18:2497:61 | newListIteratorWithElement(...) : ListIterator [<element>] : String | Test.java:2498:40:2498:41 | in : ListIterator [<element>] : String | provenance |  |
 | Test.java:2497:45:2497:60 | (...)... : String | Test.java:259:49:259:57 | element : String | provenance |  |
-| Test.java:2497:45:2497:60 | (...)... : String | Test.java:2497:18:2497:61 | newListIteratorWithElement(...) : ListIterator [<element>] : String | provenance | MaD:2 |
+| Test.java:2497:45:2497:60 | (...)... : String | Test.java:2497:18:2497:61 | newListIteratorWithElement(...) : ListIterator [<element>] : String | provenance | MaD:4 |
 | Test.java:2497:53:2497:60 | source(...) : Object | Test.java:2497:45:2497:60 | (...)... : String | provenance |  |
 | Test.java:2498:10:2498:48 | chainedIterator(...) : Iterator [<element>] : String | Test.java:2499:20:2499:22 | out : Iterator [<element>] : String | provenance |  |
-| Test.java:2498:40:2498:41 | in : ListIterator [<element>] : String | Test.java:2498:10:2498:48 | chainedIterator(...) : Iterator [<element>] : String | provenance | MaD:529 |
+| Test.java:2498:40:2498:41 | in : ListIterator [<element>] : String | Test.java:2498:10:2498:48 | chainedIterator(...) : Iterator [<element>] : String | provenance | MaD:604 |
 | Test.java:2499:20:2499:22 | out : Iterator [<element>] : String | Test.java:231:19:231:32 | it : Iterator [<element>] : String | provenance |  |
-| Test.java:2499:20:2499:22 | out : Iterator [<element>] : String | Test.java:2499:9:2499:23 | getElement(...) | provenance | MaD:4 |
+| Test.java:2499:20:2499:22 | out : Iterator [<element>] : String | Test.java:2499:9:2499:23 | getElement(...) | provenance | MaD:6 |
 | Test.java:2504:18:2504:61 | newListIteratorWithElement(...) : ListIterator [<element>] : String | Test.java:2505:46:2505:47 | in : ListIterator [<element>] : String | provenance |  |
 | Test.java:2504:45:2504:60 | (...)... : String | Test.java:259:49:259:57 | element : String | provenance |  |
-| Test.java:2504:45:2504:60 | (...)... : String | Test.java:2504:18:2504:61 | newListIteratorWithElement(...) : ListIterator [<element>] : String | provenance | MaD:2 |
+| Test.java:2504:45:2504:60 | (...)... : String | Test.java:2504:18:2504:61 | newListIteratorWithElement(...) : ListIterator [<element>] : String | provenance | MaD:4 |
 | Test.java:2504:53:2504:60 | source(...) : Object | Test.java:2504:45:2504:60 | (...)... : String | provenance |  |
 | Test.java:2505:10:2505:48 | chainedIterator(...) : Iterator [<element>] : String | Test.java:2506:20:2506:22 | out : Iterator [<element>] : String | provenance |  |
-| Test.java:2505:46:2505:47 | in : ListIterator [<element>] : String | Test.java:2505:10:2505:48 | chainedIterator(...) : Iterator [<element>] : String | provenance | MaD:530 |
+| Test.java:2505:46:2505:47 | in : ListIterator [<element>] : String | Test.java:2505:10:2505:48 | chainedIterator(...) : Iterator [<element>] : String | provenance | MaD:605 |
 | Test.java:2506:20:2506:22 | out : Iterator [<element>] : String | Test.java:231:19:231:32 | it : Iterator [<element>] : String | provenance |  |
-| Test.java:2506:20:2506:22 | out : Iterator [<element>] : String | Test.java:2506:9:2506:23 | getElement(...) | provenance | MaD:4 |
+| Test.java:2506:20:2506:22 | out : Iterator [<element>] : String | Test.java:2506:9:2506:23 | getElement(...) | provenance | MaD:6 |
 | Test.java:2511:20:2511:79 | newVectorWithElement(...) : Vector [<element>, <element>] : String | Test.java:2512:59:2512:60 | in : Vector [<element>, <element>] : String | provenance |  |
 | Test.java:2511:41:2511:78 | newVectorWithElement(...) : Vector [<element>] : String | Test.java:270:47:270:65 | element : Vector [<element>] : String | provenance |  |
-| Test.java:2511:41:2511:78 | newVectorWithElement(...) : Vector [<element>] : String | Test.java:2511:20:2511:79 | newVectorWithElement(...) : Vector [<element>, <element>] : String | provenance | MaD:2 |
+| Test.java:2511:41:2511:78 | newVectorWithElement(...) : Vector [<element>] : String | Test.java:2511:20:2511:79 | newVectorWithElement(...) : Vector [<element>, <element>] : String | provenance | MaD:4 |
 | Test.java:2511:62:2511:77 | (...)... : String | Test.java:269:37:269:45 | element : String | provenance |  |
-| Test.java:2511:62:2511:77 | (...)... : String | Test.java:2511:41:2511:78 | newVectorWithElement(...) : Vector [<element>] : String | provenance | MaD:2 |
+| Test.java:2511:62:2511:77 | (...)... : String | Test.java:2511:41:2511:78 | newVectorWithElement(...) : Vector [<element>] : String | provenance | MaD:4 |
 | Test.java:2511:70:2511:77 | source(...) : Object | Test.java:2511:62:2511:77 | (...)... : String | provenance |  |
 | Test.java:2512:10:2512:61 | collatedIterator(...) : Iterator [<element>] : String | Test.java:2513:20:2513:22 | out : Iterator [<element>] : String | provenance |  |
-| Test.java:2512:59:2512:60 | in : Vector [<element>, <element>] : String | Test.java:2512:10:2512:61 | collatedIterator(...) : Iterator [<element>] : String | provenance | MaD:531 |
+| Test.java:2512:59:2512:60 | in : Vector [<element>, <element>] : String | Test.java:2512:10:2512:61 | collatedIterator(...) : Iterator [<element>] : String | provenance | MaD:606 |
 | Test.java:2513:20:2513:22 | out : Iterator [<element>] : String | Test.java:231:19:231:32 | it : Iterator [<element>] : String | provenance |  |
-| Test.java:2513:20:2513:22 | out : Iterator [<element>] : String | Test.java:2513:9:2513:23 | getElement(...) | provenance | MaD:4 |
+| Test.java:2513:20:2513:22 | out : Iterator [<element>] : String | Test.java:2513:9:2513:23 | getElement(...) | provenance | MaD:6 |
 | Test.java:2518:18:2518:61 | newListIteratorWithElement(...) : ListIterator [<element>] : String | Test.java:2519:59:2519:60 | in : ListIterator [<element>] : String | provenance |  |
 | Test.java:2518:45:2518:60 | (...)... : String | Test.java:259:49:259:57 | element : String | provenance |  |
-| Test.java:2518:45:2518:60 | (...)... : String | Test.java:2518:18:2518:61 | newListIteratorWithElement(...) : ListIterator [<element>] : String | provenance | MaD:2 |
+| Test.java:2518:45:2518:60 | (...)... : String | Test.java:2518:18:2518:61 | newListIteratorWithElement(...) : ListIterator [<element>] : String | provenance | MaD:4 |
 | Test.java:2518:53:2518:60 | source(...) : Object | Test.java:2518:45:2518:60 | (...)... : String | provenance |  |
 | Test.java:2519:10:2519:61 | collatedIterator(...) : Iterator [<element>] : String | Test.java:2520:20:2520:22 | out : Iterator [<element>] : String | provenance |  |
-| Test.java:2519:10:2519:61 | new ..[] { .. } : Iterator[] [[], <element>] : String | Test.java:2519:10:2519:61 | collatedIterator(...) : Iterator [<element>] : String | provenance | MaD:534 |
+| Test.java:2519:10:2519:61 | new ..[] { .. } : Iterator[] [[], <element>] : String | Test.java:2519:10:2519:61 | collatedIterator(...) : Iterator [<element>] : String | provenance | MaD:609 |
 | Test.java:2519:59:2519:60 | in : ListIterator [<element>] : String | Test.java:2519:10:2519:61 | new ..[] { .. } : Iterator[] [[], <element>] : String | provenance |  |
 | Test.java:2520:20:2520:22 | out : Iterator [<element>] : String | Test.java:231:19:231:32 | it : Iterator [<element>] : String | provenance |  |
-| Test.java:2520:20:2520:22 | out : Iterator [<element>] : String | Test.java:2520:9:2520:23 | getElement(...) | provenance | MaD:4 |
+| Test.java:2520:20:2520:22 | out : Iterator [<element>] : String | Test.java:2520:9:2520:23 | getElement(...) | provenance | MaD:6 |
 | Test.java:2525:18:2525:61 | newListIteratorWithElement(...) : ListIterator [<element>] : String | Test.java:2526:47:2526:48 | in : ListIterator [<element>] : String | provenance |  |
 | Test.java:2525:45:2525:60 | (...)... : String | Test.java:259:49:259:57 | element : String | provenance |  |
-| Test.java:2525:45:2525:60 | (...)... : String | Test.java:2525:18:2525:61 | newListIteratorWithElement(...) : ListIterator [<element>] : String | provenance | MaD:2 |
+| Test.java:2525:45:2525:60 | (...)... : String | Test.java:2525:18:2525:61 | newListIteratorWithElement(...) : ListIterator [<element>] : String | provenance | MaD:4 |
 | Test.java:2525:53:2525:60 | source(...) : Object | Test.java:2525:45:2525:60 | (...)... : String | provenance |  |
 | Test.java:2526:10:2526:55 | collatedIterator(...) : Iterator [<element>] : String | Test.java:2527:20:2527:22 | out : Iterator [<element>] : String | provenance |  |
-| Test.java:2526:47:2526:48 | in : ListIterator [<element>] : String | Test.java:2526:10:2526:55 | collatedIterator(...) : Iterator [<element>] : String | provenance | MaD:532 |
+| Test.java:2526:47:2526:48 | in : ListIterator [<element>] : String | Test.java:2526:10:2526:55 | collatedIterator(...) : Iterator [<element>] : String | provenance | MaD:607 |
 | Test.java:2527:20:2527:22 | out : Iterator [<element>] : String | Test.java:231:19:231:32 | it : Iterator [<element>] : String | provenance |  |
-| Test.java:2527:20:2527:22 | out : Iterator [<element>] : String | Test.java:2527:9:2527:23 | getElement(...) | provenance | MaD:4 |
+| Test.java:2527:20:2527:22 | out : Iterator [<element>] : String | Test.java:2527:9:2527:23 | getElement(...) | provenance | MaD:6 |
 | Test.java:2532:18:2532:61 | newListIteratorWithElement(...) : ListIterator [<element>] : String | Test.java:2533:53:2533:54 | in : ListIterator [<element>] : String | provenance |  |
 | Test.java:2532:45:2532:60 | (...)... : String | Test.java:259:49:259:57 | element : String | provenance |  |
-| Test.java:2532:45:2532:60 | (...)... : String | Test.java:2532:18:2532:61 | newListIteratorWithElement(...) : ListIterator [<element>] : String | provenance | MaD:2 |
+| Test.java:2532:45:2532:60 | (...)... : String | Test.java:2532:18:2532:61 | newListIteratorWithElement(...) : ListIterator [<element>] : String | provenance | MaD:4 |
 | Test.java:2532:53:2532:60 | source(...) : Object | Test.java:2532:45:2532:60 | (...)... : String | provenance |  |
 | Test.java:2533:10:2533:55 | collatedIterator(...) : Iterator [<element>] : String | Test.java:2534:20:2534:22 | out : Iterator [<element>] : String | provenance |  |
-| Test.java:2533:53:2533:54 | in : ListIterator [<element>] : String | Test.java:2533:10:2533:55 | collatedIterator(...) : Iterator [<element>] : String | provenance | MaD:533 |
+| Test.java:2533:53:2533:54 | in : ListIterator [<element>] : String | Test.java:2533:10:2533:55 | collatedIterator(...) : Iterator [<element>] : String | provenance | MaD:608 |
 | Test.java:2534:20:2534:22 | out : Iterator [<element>] : String | Test.java:231:19:231:32 | it : Iterator [<element>] : String | provenance |  |
-| Test.java:2534:20:2534:22 | out : Iterator [<element>] : String | Test.java:2534:9:2534:23 | getElement(...) | provenance | MaD:4 |
+| Test.java:2534:20:2534:22 | out : Iterator [<element>] : String | Test.java:2534:9:2534:23 | getElement(...) | provenance | MaD:6 |
 | Test.java:2539:18:2539:61 | newListIteratorWithElement(...) : ListIterator [<element>] : String | Test.java:2540:41:2540:42 | in : ListIterator [<element>] : String | provenance |  |
 | Test.java:2539:45:2539:60 | (...)... : String | Test.java:259:49:259:57 | element : String | provenance |  |
-| Test.java:2539:45:2539:60 | (...)... : String | Test.java:2539:18:2539:61 | newListIteratorWithElement(...) : ListIterator [<element>] : String | provenance | MaD:2 |
+| Test.java:2539:45:2539:60 | (...)... : String | Test.java:2539:18:2539:61 | newListIteratorWithElement(...) : ListIterator [<element>] : String | provenance | MaD:4 |
 | Test.java:2539:53:2539:60 | source(...) : Object | Test.java:2539:45:2539:60 | (...)... : String | provenance |  |
 | Test.java:2540:10:2540:49 | filteredIterator(...) : Iterator [<element>] : String | Test.java:2541:20:2541:22 | out : Iterator [<element>] : String | provenance |  |
-| Test.java:2540:41:2540:42 | in : ListIterator [<element>] : String | Test.java:2540:10:2540:49 | filteredIterator(...) : Iterator [<element>] : String | provenance | MaD:535 |
+| Test.java:2540:41:2540:42 | in : ListIterator [<element>] : String | Test.java:2540:10:2540:49 | filteredIterator(...) : Iterator [<element>] : String | provenance | MaD:610 |
 | Test.java:2541:20:2541:22 | out : Iterator [<element>] : String | Test.java:231:19:231:32 | it : Iterator [<element>] : String | provenance |  |
-| Test.java:2541:20:2541:22 | out : Iterator [<element>] : String | Test.java:2541:9:2541:23 | getElement(...) | provenance | MaD:4 |
+| Test.java:2541:20:2541:22 | out : Iterator [<element>] : String | Test.java:2541:9:2541:23 | getElement(...) | provenance | MaD:6 |
 | Test.java:2546:22:2546:65 | newListIteratorWithElement(...) : ListIterator [<element>] : String | Test.java:2547:45:2547:46 | in : ListIterator [<element>] : String | provenance |  |
 | Test.java:2546:49:2546:64 | (...)... : String | Test.java:259:49:259:57 | element : String | provenance |  |
-| Test.java:2546:49:2546:64 | (...)... : String | Test.java:2546:22:2546:65 | newListIteratorWithElement(...) : ListIterator [<element>] : String | provenance | MaD:2 |
+| Test.java:2546:49:2546:64 | (...)... : String | Test.java:2546:22:2546:65 | newListIteratorWithElement(...) : ListIterator [<element>] : String | provenance | MaD:4 |
 | Test.java:2546:57:2546:64 | source(...) : Object | Test.java:2546:49:2546:64 | (...)... : String | provenance |  |
 | Test.java:2547:10:2547:53 | filteredListIterator(...) : ListIterator [<element>] : String | Test.java:2548:20:2548:22 | out : ListIterator [<element>] : String | provenance |  |
-| Test.java:2547:45:2547:46 | in : ListIterator [<element>] : String | Test.java:2547:10:2547:53 | filteredListIterator(...) : ListIterator [<element>] : String | provenance | MaD:536 |
+| Test.java:2547:45:2547:46 | in : ListIterator [<element>] : String | Test.java:2547:10:2547:53 | filteredListIterator(...) : ListIterator [<element>] : String | provenance | MaD:611 |
 | Test.java:2548:20:2548:22 | out : ListIterator [<element>] : String | Test.java:231:19:231:32 | it : ListIterator [<element>] : String | provenance |  |
-| Test.java:2548:20:2548:22 | out : ListIterator [<element>] : String | Test.java:2548:9:2548:23 | getElement(...) | provenance | MaD:4 |
+| Test.java:2548:20:2548:22 | out : ListIterator [<element>] : String | Test.java:2548:9:2548:23 | getElement(...) | provenance | MaD:6 |
 | Test.java:2553:18:2553:61 | newListIteratorWithElement(...) : ListIterator [<element>] : String | Test.java:2554:29:2554:30 | in : ListIterator [<element>] : String | provenance |  |
 | Test.java:2553:45:2553:60 | (...)... : String | Test.java:259:49:259:57 | element : String | provenance |  |
-| Test.java:2553:45:2553:60 | (...)... : String | Test.java:2553:18:2553:61 | newListIteratorWithElement(...) : ListIterator [<element>] : String | provenance | MaD:2 |
+| Test.java:2553:45:2553:60 | (...)... : String | Test.java:2553:18:2553:61 | newListIteratorWithElement(...) : ListIterator [<element>] : String | provenance | MaD:4 |
 | Test.java:2553:53:2553:60 | source(...) : Object | Test.java:2553:45:2553:60 | (...)... : String | provenance |  |
 | Test.java:2554:10:2554:37 | find(...) : String | Test.java:2555:9:2555:11 | out | provenance |  |
-| Test.java:2554:29:2554:30 | in : ListIterator [<element>] : String | Test.java:2554:10:2554:37 | find(...) : String | provenance | MaD:537 |
+| Test.java:2554:29:2554:30 | in : ListIterator [<element>] : String | Test.java:2554:10:2554:37 | find(...) : String | provenance | MaD:612 |
 | Test.java:2560:18:2560:61 | newListIteratorWithElement(...) : ListIterator [<element>] : String | Test.java:2561:30:2561:31 | in : ListIterator [<element>] : String | provenance |  |
 | Test.java:2560:45:2560:60 | (...)... : String | Test.java:259:49:259:57 | element : String | provenance |  |
-| Test.java:2560:45:2560:60 | (...)... : String | Test.java:2560:18:2560:61 | newListIteratorWithElement(...) : ListIterator [<element>] : String | provenance | MaD:2 |
+| Test.java:2560:45:2560:60 | (...)... : String | Test.java:2560:18:2560:61 | newListIteratorWithElement(...) : ListIterator [<element>] : String | provenance | MaD:4 |
 | Test.java:2560:53:2560:60 | source(...) : Object | Test.java:2560:45:2560:60 | (...)... : String | provenance |  |
 | Test.java:2561:10:2561:32 | first(...) : String | Test.java:2562:9:2562:11 | out | provenance |  |
-| Test.java:2561:30:2561:31 | in : ListIterator [<element>] : String | Test.java:2561:10:2561:32 | first(...) : String | provenance | MaD:538 |
+| Test.java:2561:30:2561:31 | in : ListIterator [<element>] : String | Test.java:2561:10:2561:32 | first(...) : String | provenance | MaD:613 |
 | Test.java:2567:18:2567:61 | newListIteratorWithElement(...) : ListIterator [<element>] : String | Test.java:2568:39:2568:40 | in : ListIterator [<element>] : String | provenance |  |
 | Test.java:2567:45:2567:60 | (...)... : String | Test.java:259:49:259:57 | element : String | provenance |  |
-| Test.java:2567:45:2567:60 | (...)... : String | Test.java:2567:18:2567:61 | newListIteratorWithElement(...) : ListIterator [<element>] : String | provenance | MaD:2 |
+| Test.java:2567:45:2567:60 | (...)... : String | Test.java:2567:18:2567:61 | newListIteratorWithElement(...) : ListIterator [<element>] : String | provenance | MaD:4 |
 | Test.java:2567:53:2567:60 | source(...) : Object | Test.java:2567:45:2567:60 | (...)... : String | provenance |  |
 | Test.java:2568:10:2568:47 | forEachButLast(...) : String | Test.java:2569:9:2569:11 | out | provenance |  |
-| Test.java:2568:39:2568:40 | in : ListIterator [<element>] : String | Test.java:2568:10:2568:47 | forEachButLast(...) : String | provenance | MaD:539 |
+| Test.java:2568:39:2568:40 | in : ListIterator [<element>] : String | Test.java:2568:10:2568:47 | forEachButLast(...) : String | provenance | MaD:614 |
 | Test.java:2574:18:2574:61 | newListIteratorWithElement(...) : ListIterator [<element>] : String | Test.java:2575:28:2575:29 | in : ListIterator [<element>] : String | provenance |  |
 | Test.java:2574:45:2574:60 | (...)... : String | Test.java:259:49:259:57 | element : String | provenance |  |
-| Test.java:2574:45:2574:60 | (...)... : String | Test.java:2574:18:2574:61 | newListIteratorWithElement(...) : ListIterator [<element>] : String | provenance | MaD:2 |
+| Test.java:2574:45:2574:60 | (...)... : String | Test.java:2574:18:2574:61 | newListIteratorWithElement(...) : ListIterator [<element>] : String | provenance | MaD:4 |
 | Test.java:2574:53:2574:60 | source(...) : Object | Test.java:2574:45:2574:60 | (...)... : String | provenance |  |
 | Test.java:2575:10:2575:33 | get(...) : String | Test.java:2576:9:2576:11 | out | provenance |  |
-| Test.java:2575:28:2575:29 | in : ListIterator [<element>] : String | Test.java:2575:10:2575:33 | get(...) : String | provenance | MaD:540 |
+| Test.java:2575:28:2575:29 | in : ListIterator [<element>] : String | Test.java:2575:10:2575:33 | get(...) : String | provenance | MaD:615 |
 | Test.java:2581:16:2581:23 | source(...) : Object | Test.java:2582:36:2582:37 | in : Object | provenance |  |
 | Test.java:2582:10:2582:38 | getIterator(...) : Iterator [<element>] : Object | Test.java:2583:20:2583:22 | out : Iterator [<element>] : Object | provenance |  |
-| Test.java:2582:36:2582:37 | in : Object | Test.java:2582:10:2582:38 | getIterator(...) : Iterator [<element>] : Object | provenance | MaD:541 |
-| Test.java:2582:36:2582:37 | in : Object | Test.java:2582:10:2582:38 | getIterator(...) : Iterator [<element>] : Object | provenance | MaD:542 |
-| Test.java:2582:36:2582:37 | in : Object | Test.java:2582:10:2582:38 | getIterator(...) : Iterator [<element>] : Object | provenance | MaD:543 |
-| Test.java:2582:36:2582:37 | in : Object | Test.java:2582:10:2582:38 | getIterator(...) : Iterator [<element>] : Object | provenance | MaD:544 |
+| Test.java:2582:36:2582:37 | in : Object | Test.java:2582:10:2582:38 | getIterator(...) : Iterator [<element>] : Object | provenance | MaD:616 |
+| Test.java:2582:36:2582:37 | in : Object | Test.java:2582:10:2582:38 | getIterator(...) : Iterator [<element>] : Object | provenance | MaD:617 |
+| Test.java:2582:36:2582:37 | in : Object | Test.java:2582:10:2582:38 | getIterator(...) : Iterator [<element>] : Object | provenance | MaD:618 |
+| Test.java:2582:36:2582:37 | in : Object | Test.java:2582:10:2582:38 | getIterator(...) : Iterator [<element>] : Object | provenance | MaD:619 |
 | Test.java:2583:20:2583:22 | out : Iterator [<element>] : Object | Test.java:231:19:231:32 | it : Iterator [<element>] : Object | provenance |  |
-| Test.java:2583:20:2583:22 | out : Iterator [<element>] : Object | Test.java:2583:9:2583:23 | getElement(...) | provenance | MaD:4 |
+| Test.java:2583:20:2583:22 | out : Iterator [<element>] : Object | Test.java:2583:9:2583:23 | getElement(...) | provenance | MaD:6 |
 | Test.java:2588:16:2588:52 | newWithArrayElement(...) : Object[] [[]] : String | Test.java:2589:36:2589:37 | in : Object[] [[]] : String | provenance |  |
 | Test.java:2588:36:2588:51 | (...)... : String | Test.java:251:31:251:44 | element : String | provenance |  |
 | Test.java:2588:36:2588:51 | (...)... : String | Test.java:2588:16:2588:52 | newWithArrayElement(...) : Object[] [[]] : String | provenance |  |
 | Test.java:2588:44:2588:51 | source(...) : Object | Test.java:2588:36:2588:51 | (...)... : String | provenance |  |
 | Test.java:2589:10:2589:38 | getIterator(...) : Iterator [<element>] : String | Test.java:2590:20:2590:22 | out : Iterator [<element>] : String | provenance |  |
-| Test.java:2589:36:2589:37 | in : Object[] [[]] : String | Test.java:2589:10:2589:38 | getIterator(...) : Iterator [<element>] : String | provenance | MaD:542 |
+| Test.java:2589:36:2589:37 | in : Object[] [[]] : String | Test.java:2589:10:2589:38 | getIterator(...) : Iterator [<element>] : String | provenance | MaD:616 |
 | Test.java:2590:20:2590:22 | out : Iterator [<element>] : String | Test.java:231:19:231:32 | it : Iterator [<element>] : String | provenance |  |
-| Test.java:2590:20:2590:22 | out : Iterator [<element>] : String | Test.java:2590:9:2590:23 | getElement(...) | provenance | MaD:4 |
+| Test.java:2590:20:2590:22 | out : Iterator [<element>] : String | Test.java:2590:9:2590:23 | getElement(...) | provenance | MaD:6 |
 | Test.java:2595:16:2595:53 | newVectorWithElement(...) : Vector [<element>] : String | Test.java:2596:36:2596:37 | in : Vector [<element>] : String | provenance |  |
 | Test.java:2595:37:2595:52 | (...)... : String | Test.java:269:37:269:45 | element : String | provenance |  |
-| Test.java:2595:37:2595:52 | (...)... : String | Test.java:2595:16:2595:53 | newVectorWithElement(...) : Vector [<element>] : String | provenance | MaD:2 |
+| Test.java:2595:37:2595:52 | (...)... : String | Test.java:2595:16:2595:53 | newVectorWithElement(...) : Vector [<element>] : String | provenance | MaD:4 |
 | Test.java:2595:45:2595:52 | source(...) : Object | Test.java:2595:37:2595:52 | (...)... : String | provenance |  |
 | Test.java:2596:10:2596:38 | getIterator(...) : Iterator [<element>] : String | Test.java:2597:20:2597:22 | out : Iterator [<element>] : String | provenance |  |
-| Test.java:2596:36:2596:37 | in : Vector [<element>] : String | Test.java:2596:10:2596:38 | getIterator(...) : Iterator [<element>] : String | provenance | MaD:543 |
+| Test.java:2596:36:2596:37 | in : Vector [<element>] : String | Test.java:2596:10:2596:38 | getIterator(...) : Iterator [<element>] : String | provenance | MaD:617 |
 | Test.java:2597:20:2597:22 | out : Iterator [<element>] : String | Test.java:231:19:231:32 | it : Iterator [<element>] : String | provenance |  |
-| Test.java:2597:20:2597:22 | out : Iterator [<element>] : String | Test.java:2597:9:2597:23 | getElement(...) | provenance | MaD:4 |
+| Test.java:2597:20:2597:22 | out : Iterator [<element>] : String | Test.java:2597:9:2597:23 | getElement(...) | provenance | MaD:6 |
 | Test.java:2602:13:2602:52 | newTreeMapWithMapValue(...) : TreeMap [<map.value>] : String | Test.java:2603:36:2603:37 | in : TreeMap [<map.value>] : String | provenance |  |
 | Test.java:2602:36:2602:51 | (...)... : String | Test.java:304:49:304:55 | value : String | provenance |  |
-| Test.java:2602:36:2602:51 | (...)... : String | Test.java:2602:13:2602:52 | newTreeMapWithMapValue(...) : TreeMap [<map.value>] : String | provenance | MaD:15 |
+| Test.java:2602:36:2602:51 | (...)... : String | Test.java:2602:13:2602:52 | newTreeMapWithMapValue(...) : TreeMap [<map.value>] : String | provenance | MaD:20 |
 | Test.java:2602:44:2602:51 | source(...) : Object | Test.java:2602:36:2602:51 | (...)... : String | provenance |  |
 | Test.java:2603:10:2603:38 | getIterator(...) : Iterator [<element>] : String | Test.java:2604:20:2604:22 | out : Iterator [<element>] : String | provenance |  |
-| Test.java:2603:36:2603:37 | in : TreeMap [<map.value>] : String | Test.java:2603:10:2603:38 | getIterator(...) : Iterator [<element>] : String | provenance | MaD:544 |
+| Test.java:2603:36:2603:37 | in : TreeMap [<map.value>] : String | Test.java:2603:10:2603:38 | getIterator(...) : Iterator [<element>] : String | provenance | MaD:618 |
 | Test.java:2604:20:2604:22 | out : Iterator [<element>] : String | Test.java:231:19:231:32 | it : Iterator [<element>] : String | provenance |  |
-| Test.java:2604:20:2604:22 | out : Iterator [<element>] : String | Test.java:2604:9:2604:23 | getElement(...) | provenance | MaD:4 |
+| Test.java:2604:20:2604:22 | out : Iterator [<element>] : String | Test.java:2604:9:2604:23 | getElement(...) | provenance | MaD:6 |
 | Test.java:2609:20:2609:57 | newVectorWithElement(...) : Vector [<element>] : String | Test.java:2610:40:2610:41 | in : Vector [<element>] : String | provenance |  |
 | Test.java:2609:41:2609:56 | (...)... : String | Test.java:269:37:269:45 | element : String | provenance |  |
-| Test.java:2609:41:2609:56 | (...)... : String | Test.java:2609:20:2609:57 | newVectorWithElement(...) : Vector [<element>] : String | provenance | MaD:2 |
+| Test.java:2609:41:2609:56 | (...)... : String | Test.java:2609:20:2609:57 | newVectorWithElement(...) : Vector [<element>] : String | provenance | MaD:4 |
 | Test.java:2609:49:2609:56 | source(...) : Object | Test.java:2609:41:2609:56 | (...)... : String | provenance |  |
 | Test.java:2610:10:2610:42 | loopingIterator(...) : ResettableIterator [<element>] : String | Test.java:2611:20:2611:22 | out : ResettableIterator [<element>] : String | provenance |  |
-| Test.java:2610:40:2610:41 | in : Vector [<element>] : String | Test.java:2610:10:2610:42 | loopingIterator(...) : ResettableIterator [<element>] : String | provenance | MaD:545 |
+| Test.java:2610:40:2610:41 | in : Vector [<element>] : String | Test.java:2610:10:2610:42 | loopingIterator(...) : ResettableIterator [<element>] : String | provenance | MaD:620 |
 | Test.java:2611:20:2611:22 | out : ResettableIterator [<element>] : String | Test.java:231:19:231:32 | it : ResettableIterator [<element>] : String | provenance |  |
-| Test.java:2611:20:2611:22 | out : ResettableIterator [<element>] : String | Test.java:2611:9:2611:23 | getElement(...) | provenance | MaD:4 |
+| Test.java:2611:20:2611:22 | out : ResettableIterator [<element>] : String | Test.java:2611:9:2611:23 | getElement(...) | provenance | MaD:6 |
 | Test.java:2616:14:2616:51 | newVectorWithElement(...) : Vector [<element>] : String | Test.java:2617:44:2617:45 | in : Vector [<element>] : String | provenance |  |
 | Test.java:2616:35:2616:50 | (...)... : String | Test.java:269:37:269:45 | element : String | provenance |  |
-| Test.java:2616:35:2616:50 | (...)... : String | Test.java:2616:14:2616:51 | newVectorWithElement(...) : Vector [<element>] : String | provenance | MaD:2 |
+| Test.java:2616:35:2616:50 | (...)... : String | Test.java:2616:14:2616:51 | newVectorWithElement(...) : Vector [<element>] : String | provenance | MaD:4 |
 | Test.java:2616:43:2616:50 | source(...) : Object | Test.java:2616:35:2616:50 | (...)... : String | provenance |  |
 | Test.java:2617:10:2617:46 | loopingListIterator(...) : ResettableListIterator [<element>] : String | Test.java:2618:20:2618:22 | out : ResettableListIterator [<element>] : String | provenance |  |
-| Test.java:2617:44:2617:45 | in : Vector [<element>] : String | Test.java:2617:10:2617:46 | loopingListIterator(...) : ResettableListIterator [<element>] : String | provenance | MaD:546 |
+| Test.java:2617:44:2617:45 | in : Vector [<element>] : String | Test.java:2617:10:2617:46 | loopingListIterator(...) : ResettableListIterator [<element>] : String | provenance | MaD:621 |
 | Test.java:2618:20:2618:22 | out : ResettableListIterator [<element>] : String | Test.java:231:19:231:32 | it : ResettableListIterator [<element>] : String | provenance |  |
-| Test.java:2618:20:2618:22 | out : ResettableListIterator [<element>] : String | Test.java:2618:9:2618:23 | getElement(...) | provenance | MaD:4 |
+| Test.java:2618:20:2618:22 | out : ResettableListIterator [<element>] : String | Test.java:2618:9:2618:23 | getElement(...) | provenance | MaD:6 |
 | Test.java:2623:18:2623:61 | newListIteratorWithElement(...) : ListIterator [<element>] : String | Test.java:2624:40:2624:41 | in : ListIterator [<element>] : String | provenance |  |
 | Test.java:2623:45:2623:60 | (...)... : String | Test.java:259:49:259:57 | element : String | provenance |  |
-| Test.java:2623:45:2623:60 | (...)... : String | Test.java:2623:18:2623:61 | newListIteratorWithElement(...) : ListIterator [<element>] : String | provenance | MaD:2 |
+| Test.java:2623:45:2623:60 | (...)... : String | Test.java:2623:18:2623:61 | newListIteratorWithElement(...) : ListIterator [<element>] : String | provenance | MaD:4 |
 | Test.java:2623:53:2623:60 | source(...) : Object | Test.java:2623:45:2623:60 | (...)... : String | provenance |  |
 | Test.java:2624:10:2624:42 | peekingIterator(...) : Iterator [<element>] : String | Test.java:2625:20:2625:22 | out : Iterator [<element>] : String | provenance |  |
-| Test.java:2624:40:2624:41 | in : ListIterator [<element>] : String | Test.java:2624:10:2624:42 | peekingIterator(...) : Iterator [<element>] : String | provenance | MaD:547 |
+| Test.java:2624:40:2624:41 | in : ListIterator [<element>] : String | Test.java:2624:10:2624:42 | peekingIterator(...) : Iterator [<element>] : String | provenance | MaD:622 |
 | Test.java:2625:20:2625:22 | out : Iterator [<element>] : String | Test.java:231:19:231:32 | it : Iterator [<element>] : String | provenance |  |
-| Test.java:2625:20:2625:22 | out : Iterator [<element>] : String | Test.java:2625:9:2625:23 | getElement(...) | provenance | MaD:4 |
+| Test.java:2625:20:2625:22 | out : Iterator [<element>] : String | Test.java:2625:9:2625:23 | getElement(...) | provenance | MaD:6 |
 | Test.java:2630:18:2630:61 | newListIteratorWithElement(...) : ListIterator [<element>] : String | Test.java:2631:41:2631:42 | in : ListIterator [<element>] : String | provenance |  |
 | Test.java:2630:45:2630:60 | (...)... : String | Test.java:259:49:259:57 | element : String | provenance |  |
-| Test.java:2630:45:2630:60 | (...)... : String | Test.java:2630:18:2630:61 | newListIteratorWithElement(...) : ListIterator [<element>] : String | provenance | MaD:2 |
+| Test.java:2630:45:2630:60 | (...)... : String | Test.java:2630:18:2630:61 | newListIteratorWithElement(...) : ListIterator [<element>] : String | provenance | MaD:4 |
 | Test.java:2630:53:2630:60 | source(...) : Object | Test.java:2630:45:2630:60 | (...)... : String | provenance |  |
 | Test.java:2631:10:2631:43 | pushbackIterator(...) : Iterator [<element>] : String | Test.java:2632:20:2632:22 | out : Iterator [<element>] : String | provenance |  |
-| Test.java:2631:41:2631:42 | in : ListIterator [<element>] : String | Test.java:2631:10:2631:43 | pushbackIterator(...) : Iterator [<element>] : String | provenance | MaD:548 |
+| Test.java:2631:41:2631:42 | in : ListIterator [<element>] : String | Test.java:2631:10:2631:43 | pushbackIterator(...) : Iterator [<element>] : String | provenance | MaD:623 |
 | Test.java:2632:20:2632:22 | out : Iterator [<element>] : String | Test.java:231:19:231:32 | it : Iterator [<element>] : String | provenance |  |
-| Test.java:2632:20:2632:22 | out : Iterator [<element>] : String | Test.java:2632:9:2632:23 | getElement(...) | provenance | MaD:4 |
+| Test.java:2632:20:2632:22 | out : Iterator [<element>] : String | Test.java:2632:9:2632:23 | getElement(...) | provenance | MaD:6 |
 | Test.java:2637:16:2637:23 | source(...) : Object | Test.java:2638:42:2638:43 | in : Object | provenance |  |
 | Test.java:2638:10:2638:44 | singletonIterator(...) : ResettableIterator [<element>] : Object | Test.java:2639:20:2639:22 | out : ResettableIterator [<element>] : Object | provenance |  |
-| Test.java:2638:42:2638:43 | in : Object | Test.java:2638:10:2638:44 | singletonIterator(...) : ResettableIterator [<element>] : Object | provenance | MaD:549 |
+| Test.java:2638:42:2638:43 | in : Object | Test.java:2638:10:2638:44 | singletonIterator(...) : ResettableIterator [<element>] : Object | provenance | MaD:624 |
 | Test.java:2639:20:2639:22 | out : ResettableIterator [<element>] : Object | Test.java:231:19:231:32 | it : ResettableIterator [<element>] : Object | provenance |  |
-| Test.java:2639:20:2639:22 | out : ResettableIterator [<element>] : Object | Test.java:2639:9:2639:23 | getElement(...) | provenance | MaD:4 |
+| Test.java:2639:20:2639:22 | out : ResettableIterator [<element>] : Object | Test.java:2639:9:2639:23 | getElement(...) | provenance | MaD:6 |
 | Test.java:2644:16:2644:23 | source(...) : Object | Test.java:2645:46:2645:47 | in : Object | provenance |  |
 | Test.java:2645:10:2645:48 | singletonListIterator(...) : ListIterator [<element>] : Object | Test.java:2646:20:2646:22 | out : ListIterator [<element>] : Object | provenance |  |
-| Test.java:2645:46:2645:47 | in : Object | Test.java:2645:10:2645:48 | singletonListIterator(...) : ListIterator [<element>] : Object | provenance | MaD:550 |
+| Test.java:2645:46:2645:47 | in : Object | Test.java:2645:10:2645:48 | singletonListIterator(...) : ListIterator [<element>] : Object | provenance | MaD:625 |
 | Test.java:2646:20:2646:22 | out : ListIterator [<element>] : Object | Test.java:231:19:231:32 | it : ListIterator [<element>] : Object | provenance |  |
-| Test.java:2646:20:2646:22 | out : ListIterator [<element>] : Object | Test.java:2646:9:2646:23 | getElement(...) | provenance | MaD:4 |
+| Test.java:2646:20:2646:22 | out : ListIterator [<element>] : Object | Test.java:2646:9:2646:23 | getElement(...) | provenance | MaD:6 |
 | Test.java:2651:18:2651:61 | newListIteratorWithElement(...) : ListIterator [<element>] : String | Test.java:2652:41:2652:42 | in : ListIterator [<element>] : String | provenance |  |
 | Test.java:2651:45:2651:60 | (...)... : String | Test.java:259:49:259:57 | element : String | provenance |  |
-| Test.java:2651:45:2651:60 | (...)... : String | Test.java:2651:18:2651:61 | newListIteratorWithElement(...) : ListIterator [<element>] : String | provenance | MaD:2 |
+| Test.java:2651:45:2651:60 | (...)... : String | Test.java:2651:18:2651:61 | newListIteratorWithElement(...) : ListIterator [<element>] : String | provenance | MaD:4 |
 | Test.java:2651:53:2651:60 | source(...) : Object | Test.java:2651:45:2651:60 | (...)... : String | provenance |  |
 | Test.java:2652:10:2652:47 | skippingIterator(...) : SkippingIterator [<element>] : String | Test.java:2653:20:2653:22 | out : SkippingIterator [<element>] : String | provenance |  |
-| Test.java:2652:41:2652:42 | in : ListIterator [<element>] : String | Test.java:2652:10:2652:47 | skippingIterator(...) : SkippingIterator [<element>] : String | provenance | MaD:551 |
+| Test.java:2652:41:2652:42 | in : ListIterator [<element>] : String | Test.java:2652:10:2652:47 | skippingIterator(...) : SkippingIterator [<element>] : String | provenance | MaD:626 |
 | Test.java:2653:20:2653:22 | out : SkippingIterator [<element>] : String | Test.java:231:19:231:32 | it : SkippingIterator [<element>] : String | provenance |  |
-| Test.java:2653:20:2653:22 | out : SkippingIterator [<element>] : String | Test.java:2653:9:2653:23 | getElement(...) | provenance | MaD:4 |
+| Test.java:2653:20:2653:22 | out : SkippingIterator [<element>] : String | Test.java:2653:9:2653:23 | getElement(...) | provenance | MaD:6 |
 | Test.java:2658:18:2658:61 | newListIteratorWithElement(...) : ListIterator [<element>] : String | Test.java:2659:32:2659:33 | in : ListIterator [<element>] : String | provenance |  |
 | Test.java:2658:45:2658:60 | (...)... : String | Test.java:259:49:259:57 | element : String | provenance |  |
-| Test.java:2658:45:2658:60 | (...)... : String | Test.java:2658:18:2658:61 | newListIteratorWithElement(...) : ListIterator [<element>] : String | provenance | MaD:2 |
+| Test.java:2658:45:2658:60 | (...)... : String | Test.java:2658:18:2658:61 | newListIteratorWithElement(...) : ListIterator [<element>] : String | provenance | MaD:4 |
 | Test.java:2658:53:2658:60 | source(...) : Object | Test.java:2658:45:2658:60 | (...)... : String | provenance |  |
 | Test.java:2659:10:2659:40 | toArray(...) : Object[] [[]] : String | Test.java:2660:25:2660:27 | out : Object[] [[]] : String | provenance |  |
-| Test.java:2659:32:2659:33 | in : ListIterator [<element>] : String | Test.java:2659:10:2659:40 | toArray(...) : Object[] [[]] : String | provenance | MaD:552 |
+| Test.java:2659:32:2659:33 | in : ListIterator [<element>] : String | Test.java:2659:10:2659:40 | toArray(...) : Object[] [[]] : String | provenance | MaD:627 |
 | Test.java:2660:25:2660:27 | out : Object[] [[]] : String | Test.java:229:24:229:32 | array : Object[] [[]] : String | provenance |  |
 | Test.java:2660:25:2660:27 | out : Object[] [[]] : String | Test.java:2660:9:2660:28 | getArrayElement(...) | provenance |  |
 | Test.java:2665:18:2665:61 | newListIteratorWithElement(...) : ListIterator [<element>] : String | Test.java:2666:32:2666:33 | in : ListIterator [<element>] : String | provenance |  |
 | Test.java:2665:45:2665:60 | (...)... : String | Test.java:259:49:259:57 | element : String | provenance |  |
-| Test.java:2665:45:2665:60 | (...)... : String | Test.java:2665:18:2665:61 | newListIteratorWithElement(...) : ListIterator [<element>] : String | provenance | MaD:2 |
+| Test.java:2665:45:2665:60 | (...)... : String | Test.java:2665:18:2665:61 | newListIteratorWithElement(...) : ListIterator [<element>] : String | provenance | MaD:4 |
 | Test.java:2665:53:2665:60 | source(...) : Object | Test.java:2665:45:2665:60 | (...)... : String | provenance |  |
 | Test.java:2666:10:2666:34 | toArray(...) : Object[] [[]] : String | Test.java:2667:25:2667:27 | out : Object[] [[]] : String | provenance |  |
-| Test.java:2666:32:2666:33 | in : ListIterator [<element>] : String | Test.java:2666:10:2666:34 | toArray(...) : Object[] [[]] : String | provenance | MaD:552 |
+| Test.java:2666:32:2666:33 | in : ListIterator [<element>] : String | Test.java:2666:10:2666:34 | toArray(...) : Object[] [[]] : String | provenance | MaD:627 |
 | Test.java:2667:25:2667:27 | out : Object[] [[]] : String | Test.java:229:24:229:32 | array : Object[] [[]] : String | provenance |  |
 | Test.java:2667:25:2667:27 | out : Object[] [[]] : String | Test.java:2667:9:2667:28 | getArrayElement(...) | provenance |  |
 | Test.java:2672:18:2672:61 | newListIteratorWithElement(...) : ListIterator [<element>] : String | Test.java:2673:31:2673:32 | in : ListIterator [<element>] : String | provenance |  |
 | Test.java:2672:45:2672:60 | (...)... : String | Test.java:259:49:259:57 | element : String | provenance |  |
-| Test.java:2672:45:2672:60 | (...)... : String | Test.java:2672:18:2672:61 | newListIteratorWithElement(...) : ListIterator [<element>] : String | provenance | MaD:2 |
+| Test.java:2672:45:2672:60 | (...)... : String | Test.java:2672:18:2672:61 | newListIteratorWithElement(...) : ListIterator [<element>] : String | provenance | MaD:4 |
 | Test.java:2672:53:2672:60 | source(...) : Object | Test.java:2672:45:2672:60 | (...)... : String | provenance |  |
 | Test.java:2673:10:2673:36 | toList(...) : List [<element>] : String | Test.java:2674:20:2674:22 | out : List [<element>] : String | provenance |  |
-| Test.java:2673:31:2673:32 | in : ListIterator [<element>] : String | Test.java:2673:10:2673:36 | toList(...) : List [<element>] : String | provenance | MaD:553 |
+| Test.java:2673:31:2673:32 | in : ListIterator [<element>] : String | Test.java:2673:10:2673:36 | toList(...) : List [<element>] : String | provenance | MaD:628 |
 | Test.java:2674:20:2674:22 | out : List [<element>] : String | Test.java:230:19:230:32 | it : List [<element>] : String | provenance |  |
-| Test.java:2674:20:2674:22 | out : List [<element>] : String | Test.java:2674:9:2674:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:2674:20:2674:22 | out : List [<element>] : String | Test.java:2674:9:2674:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:2679:18:2679:61 | newListIteratorWithElement(...) : ListIterator [<element>] : String | Test.java:2680:31:2680:32 | in : ListIterator [<element>] : String | provenance |  |
 | Test.java:2679:45:2679:60 | (...)... : String | Test.java:259:49:259:57 | element : String | provenance |  |
-| Test.java:2679:45:2679:60 | (...)... : String | Test.java:2679:18:2679:61 | newListIteratorWithElement(...) : ListIterator [<element>] : String | provenance | MaD:2 |
+| Test.java:2679:45:2679:60 | (...)... : String | Test.java:2679:18:2679:61 | newListIteratorWithElement(...) : ListIterator [<element>] : String | provenance | MaD:4 |
 | Test.java:2679:53:2679:60 | source(...) : Object | Test.java:2679:45:2679:60 | (...)... : String | provenance |  |
 | Test.java:2680:10:2680:33 | toList(...) : List [<element>] : String | Test.java:2681:20:2681:22 | out : List [<element>] : String | provenance |  |
-| Test.java:2680:31:2680:32 | in : ListIterator [<element>] : String | Test.java:2680:10:2680:33 | toList(...) : List [<element>] : String | provenance | MaD:553 |
+| Test.java:2680:31:2680:32 | in : ListIterator [<element>] : String | Test.java:2680:10:2680:33 | toList(...) : List [<element>] : String | provenance | MaD:628 |
 | Test.java:2681:20:2681:22 | out : List [<element>] : String | Test.java:230:19:230:32 | it : List [<element>] : String | provenance |  |
-| Test.java:2681:20:2681:22 | out : List [<element>] : String | Test.java:2681:9:2681:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:2681:20:2681:22 | out : List [<element>] : String | Test.java:2681:9:2681:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:2686:18:2686:61 | newListIteratorWithElement(...) : ListIterator [<element>] : String | Test.java:2687:39:2687:40 | in : ListIterator [<element>] : String | provenance |  |
 | Test.java:2686:45:2686:60 | (...)... : String | Test.java:259:49:259:57 | element : String | provenance |  |
-| Test.java:2686:45:2686:60 | (...)... : String | Test.java:2686:18:2686:61 | newListIteratorWithElement(...) : ListIterator [<element>] : String | provenance | MaD:2 |
+| Test.java:2686:45:2686:60 | (...)... : String | Test.java:2686:18:2686:61 | newListIteratorWithElement(...) : ListIterator [<element>] : String | provenance | MaD:4 |
 | Test.java:2686:53:2686:60 | source(...) : Object | Test.java:2686:45:2686:60 | (...)... : String | provenance |  |
 | Test.java:2687:10:2687:41 | toListIterator(...) : ListIterator [<element>] : String | Test.java:2688:20:2688:22 | out : ListIterator [<element>] : String | provenance |  |
-| Test.java:2687:39:2687:40 | in : ListIterator [<element>] : String | Test.java:2687:10:2687:41 | toListIterator(...) : ListIterator [<element>] : String | provenance | MaD:554 |
+| Test.java:2687:39:2687:40 | in : ListIterator [<element>] : String | Test.java:2687:10:2687:41 | toListIterator(...) : ListIterator [<element>] : String | provenance | MaD:629 |
 | Test.java:2688:20:2688:22 | out : ListIterator [<element>] : String | Test.java:231:19:231:32 | it : ListIterator [<element>] : String | provenance |  |
-| Test.java:2688:20:2688:22 | out : ListIterator [<element>] : String | Test.java:2688:9:2688:23 | getElement(...) | provenance | MaD:4 |
+| Test.java:2688:20:2688:22 | out : ListIterator [<element>] : String | Test.java:2688:9:2688:23 | getElement(...) | provenance | MaD:6 |
 | Test.java:2693:16:2693:31 | (...)... : String | Test.java:2694:45:2694:46 | in : String | provenance |  |
 | Test.java:2693:24:2693:31 | source(...) : Object | Test.java:2693:16:2693:31 | (...)... : String | provenance |  |
 | Test.java:2694:10:2694:59 | toString(...) : String | Test.java:2695:9:2695:11 | out | provenance |  |
-| Test.java:2694:45:2694:46 | in : String | Test.java:2694:10:2694:59 | toString(...) : String | provenance | MaD:555 |
+| Test.java:2694:45:2694:46 | in : String | Test.java:2694:10:2694:59 | toString(...) : String | provenance | MaD:630 |
 | Test.java:2700:16:2700:31 | (...)... : String | Test.java:2701:51:2701:52 | in : String | provenance |  |
 | Test.java:2700:24:2700:31 | source(...) : Object | Test.java:2700:16:2700:31 | (...)... : String | provenance |  |
 | Test.java:2701:10:2701:59 | toString(...) : String | Test.java:2702:9:2702:11 | out | provenance |  |
-| Test.java:2701:51:2701:52 | in : String | Test.java:2701:10:2701:59 | toString(...) : String | provenance | MaD:556 |
+| Test.java:2701:51:2701:52 | in : String | Test.java:2701:10:2701:59 | toString(...) : String | provenance | MaD:631 |
 | Test.java:2707:16:2707:31 | (...)... : String | Test.java:2708:57:2708:58 | in : String | provenance |  |
 | Test.java:2707:24:2707:31 | source(...) : Object | Test.java:2707:16:2707:31 | (...)... : String | provenance |  |
 | Test.java:2708:10:2708:59 | toString(...) : String | Test.java:2709:9:2709:11 | out | provenance |  |
-| Test.java:2708:57:2708:58 | in : String | Test.java:2708:10:2708:59 | toString(...) : String | provenance | MaD:557 |
+| Test.java:2708:57:2708:58 | in : String | Test.java:2708:10:2708:59 | toString(...) : String | provenance | MaD:632 |
 | Test.java:2714:18:2714:61 | newListIteratorWithElement(...) : ListIterator [<element>] : String | Test.java:2715:45:2715:46 | in : ListIterator [<element>] : String | provenance |  |
 | Test.java:2714:45:2714:60 | (...)... : String | Test.java:259:49:259:57 | element : String | provenance |  |
-| Test.java:2714:45:2714:60 | (...)... : String | Test.java:2714:18:2714:61 | newListIteratorWithElement(...) : ListIterator [<element>] : String | provenance | MaD:2 |
+| Test.java:2714:45:2714:60 | (...)... : String | Test.java:2714:18:2714:61 | newListIteratorWithElement(...) : ListIterator [<element>] : String | provenance | MaD:4 |
 | Test.java:2714:53:2714:60 | source(...) : Object | Test.java:2714:45:2714:60 | (...)... : String | provenance |  |
 | Test.java:2715:10:2715:47 | unmodifiableIterator(...) : Iterator [<element>] : String | Test.java:2716:20:2716:22 | out : Iterator [<element>] : String | provenance |  |
-| Test.java:2715:45:2715:46 | in : ListIterator [<element>] : String | Test.java:2715:10:2715:47 | unmodifiableIterator(...) : Iterator [<element>] : String | provenance | MaD:558 |
+| Test.java:2715:45:2715:46 | in : ListIterator [<element>] : String | Test.java:2715:10:2715:47 | unmodifiableIterator(...) : Iterator [<element>] : String | provenance | MaD:633 |
 | Test.java:2716:20:2716:22 | out : Iterator [<element>] : String | Test.java:231:19:231:32 | it : Iterator [<element>] : String | provenance |  |
-| Test.java:2716:20:2716:22 | out : Iterator [<element>] : String | Test.java:2716:9:2716:23 | getElement(...) | provenance | MaD:4 |
+| Test.java:2716:20:2716:22 | out : Iterator [<element>] : String | Test.java:2716:9:2716:23 | getElement(...) | provenance | MaD:6 |
 | Test.java:2721:22:2721:65 | newListIteratorWithElement(...) : ListIterator [<element>] : String | Test.java:2722:49:2722:50 | in : ListIterator [<element>] : String | provenance |  |
 | Test.java:2721:49:2721:64 | (...)... : String | Test.java:259:49:259:57 | element : String | provenance |  |
-| Test.java:2721:49:2721:64 | (...)... : String | Test.java:2721:22:2721:65 | newListIteratorWithElement(...) : ListIterator [<element>] : String | provenance | MaD:2 |
+| Test.java:2721:49:2721:64 | (...)... : String | Test.java:2721:22:2721:65 | newListIteratorWithElement(...) : ListIterator [<element>] : String | provenance | MaD:4 |
 | Test.java:2721:57:2721:64 | source(...) : Object | Test.java:2721:49:2721:64 | (...)... : String | provenance |  |
 | Test.java:2722:10:2722:51 | unmodifiableListIterator(...) : ListIterator [<element>] : String | Test.java:2723:20:2723:22 | out : ListIterator [<element>] : String | provenance |  |
-| Test.java:2722:49:2722:50 | in : ListIterator [<element>] : String | Test.java:2722:10:2722:51 | unmodifiableListIterator(...) : ListIterator [<element>] : String | provenance | MaD:559 |
+| Test.java:2722:49:2722:50 | in : ListIterator [<element>] : String | Test.java:2722:10:2722:51 | unmodifiableListIterator(...) : ListIterator [<element>] : String | provenance | MaD:634 |
 | Test.java:2723:20:2723:22 | out : ListIterator [<element>] : String | Test.java:231:19:231:32 | it : ListIterator [<element>] : String | provenance |  |
-| Test.java:2723:20:2723:22 | out : ListIterator [<element>] : String | Test.java:2723:9:2723:23 | getElement(...) | provenance | MaD:4 |
+| Test.java:2723:20:2723:22 | out : ListIterator [<element>] : String | Test.java:2723:9:2723:23 | getElement(...) | provenance | MaD:6 |
 | Test.java:2728:21:2728:55 | newOMIWithElement(...) : OrderedMapIterator [<element>] : String | Test.java:2729:48:2729:49 | in : OrderedMapIterator [<element>] : String | provenance |  |
 | Test.java:2728:39:2728:54 | (...)... : String | Test.java:283:53:283:57 | key : String | provenance |  |
-| Test.java:2728:39:2728:54 | (...)... : String | Test.java:2728:21:2728:55 | newOMIWithElement(...) : OrderedMapIterator [<element>] : String | provenance | MaD:14 |
-| Test.java:2728:39:2728:54 | (...)... : String | Test.java:2728:21:2728:55 | newOMIWithElement(...) : OrderedMapIterator [<element>] : String | provenance | MaD:705 |
+| Test.java:2728:39:2728:54 | (...)... : String | Test.java:2728:21:2728:55 | newOMIWithElement(...) : OrderedMapIterator [<element>] : String | provenance | MaD:19 |
+| Test.java:2728:39:2728:54 | (...)... : String | Test.java:2728:21:2728:55 | newOMIWithElement(...) : OrderedMapIterator [<element>] : String | provenance | MaD:779 |
 | Test.java:2728:47:2728:54 | source(...) : Object | Test.java:2728:39:2728:54 | (...)... : String | provenance |  |
 | Test.java:2729:10:2729:50 | unmodifiableMapIterator(...) : MapIterator [<element>] : String | Test.java:2730:20:2730:22 | out : MapIterator [<element>] : String | provenance |  |
-| Test.java:2729:48:2729:49 | in : OrderedMapIterator [<element>] : String | Test.java:2729:10:2729:50 | unmodifiableMapIterator(...) : MapIterator [<element>] : String | provenance | MaD:560 |
+| Test.java:2729:48:2729:49 | in : OrderedMapIterator [<element>] : String | Test.java:2729:10:2729:50 | unmodifiableMapIterator(...) : MapIterator [<element>] : String | provenance | MaD:635 |
 | Test.java:2730:20:2730:22 | out : MapIterator [<element>] : String | Test.java:231:19:231:32 | it : MapIterator [<element>] : String | provenance |  |
-| Test.java:2730:20:2730:22 | out : MapIterator [<element>] : String | Test.java:2730:9:2730:23 | getElement(...) | provenance | MaD:4 |
+| Test.java:2730:20:2730:22 | out : MapIterator [<element>] : String | Test.java:2730:9:2730:23 | getElement(...) | provenance | MaD:6 |
 | Test.java:2735:21:2735:56 | newOMIWithMapValue(...) : OrderedMapIterator [<map.value>] : String | Test.java:2736:48:2736:49 | in : OrderedMapIterator [<map.value>] : String | provenance |  |
 | Test.java:2735:40:2735:55 | (...)... : String | Test.java:302:54:302:60 | value : String | provenance |  |
-| Test.java:2735:40:2735:55 | (...)... : String | Test.java:2735:21:2735:56 | newOMIWithMapValue(...) : OrderedMapIterator [<map.value>] : String | provenance | MaD:15 |
-| Test.java:2735:40:2735:55 | (...)... : String | Test.java:2735:21:2735:56 | newOMIWithMapValue(...) : OrderedMapIterator [<map.value>] : String | provenance | MaD:706 |
+| Test.java:2735:40:2735:55 | (...)... : String | Test.java:2735:21:2735:56 | newOMIWithMapValue(...) : OrderedMapIterator [<map.value>] : String | provenance | MaD:20 |
+| Test.java:2735:40:2735:55 | (...)... : String | Test.java:2735:21:2735:56 | newOMIWithMapValue(...) : OrderedMapIterator [<map.value>] : String | provenance | MaD:780 |
 | Test.java:2735:48:2735:55 | source(...) : Object | Test.java:2735:40:2735:55 | (...)... : String | provenance |  |
 | Test.java:2736:10:2736:50 | unmodifiableMapIterator(...) : MapIterator [<map.value>] : String | Test.java:2737:21:2737:23 | out : MapIterator [<map.value>] : String | provenance |  |
-| Test.java:2736:48:2736:49 | in : OrderedMapIterator [<map.value>] : String | Test.java:2736:10:2736:50 | unmodifiableMapIterator(...) : MapIterator [<map.value>] : String | provenance | MaD:561 |
+| Test.java:2736:48:2736:49 | in : OrderedMapIterator [<map.value>] : String | Test.java:2736:10:2736:50 | unmodifiableMapIterator(...) : MapIterator [<map.value>] : String | provenance | MaD:636 |
 | Test.java:2737:21:2737:23 | out : MapIterator [<map.value>] : String | Test.java:246:20:246:47 | mapIterator : MapIterator [<map.value>] : String | provenance |  |
-| Test.java:2737:21:2737:23 | out : MapIterator [<map.value>] : String | Test.java:2737:9:2737:24 | getMapValue(...) | provenance | MaD:598 |
+| Test.java:2737:21:2737:23 | out : MapIterator [<map.value>] : String | Test.java:2737:9:2737:24 | getMapValue(...) | provenance | MaD:673 |
 | Test.java:2742:18:2742:61 | newListIteratorWithElement(...) : ListIterator [<element>] : String | Test.java:2743:40:2743:41 | in : ListIterator [<element>] : String | provenance |  |
 | Test.java:2742:45:2742:60 | (...)... : String | Test.java:259:49:259:57 | element : String | provenance |  |
-| Test.java:2742:45:2742:60 | (...)... : String | Test.java:2742:18:2742:61 | newListIteratorWithElement(...) : ListIterator [<element>] : String | provenance | MaD:2 |
+| Test.java:2742:45:2742:60 | (...)... : String | Test.java:2742:18:2742:61 | newListIteratorWithElement(...) : ListIterator [<element>] : String | provenance | MaD:4 |
 | Test.java:2742:53:2742:60 | source(...) : Object | Test.java:2742:45:2742:60 | (...)... : String | provenance |  |
-| Test.java:2743:10:2743:42 | new ..[] { .. } : Iterator[] [[], <element>] : String | Test.java:2743:10:2743:42 | zippingIterator(...) : ZippingIterator [<element>] : String | provenance | MaD:567 |
+| Test.java:2743:10:2743:42 | new ..[] { .. } : Iterator[] [[], <element>] : String | Test.java:2743:10:2743:42 | zippingIterator(...) : ZippingIterator [<element>] : String | provenance | MaD:642 |
 | Test.java:2743:10:2743:42 | zippingIterator(...) : ZippingIterator [<element>] : String | Test.java:2744:20:2744:22 | out : ZippingIterator [<element>] : String | provenance |  |
 | Test.java:2743:40:2743:41 | in : ListIterator [<element>] : String | Test.java:2743:10:2743:42 | new ..[] { .. } : Iterator[] [[], <element>] : String | provenance |  |
 | Test.java:2744:20:2744:22 | out : ZippingIterator [<element>] : String | Test.java:231:19:231:32 | it : ZippingIterator [<element>] : String | provenance |  |
-| Test.java:2744:20:2744:22 | out : ZippingIterator [<element>] : String | Test.java:2744:9:2744:23 | getElement(...) | provenance | MaD:4 |
+| Test.java:2744:20:2744:22 | out : ZippingIterator [<element>] : String | Test.java:2744:9:2744:23 | getElement(...) | provenance | MaD:6 |
 | Test.java:2749:18:2749:61 | newListIteratorWithElement(...) : ListIterator [<element>] : String | Test.java:2750:40:2750:41 | in : ListIterator [<element>] : String | provenance |  |
 | Test.java:2749:45:2749:60 | (...)... : String | Test.java:259:49:259:57 | element : String | provenance |  |
-| Test.java:2749:45:2749:60 | (...)... : String | Test.java:2749:18:2749:61 | newListIteratorWithElement(...) : ListIterator [<element>] : String | provenance | MaD:2 |
+| Test.java:2749:45:2749:60 | (...)... : String | Test.java:2749:18:2749:61 | newListIteratorWithElement(...) : ListIterator [<element>] : String | provenance | MaD:4 |
 | Test.java:2749:53:2749:60 | source(...) : Object | Test.java:2749:45:2749:60 | (...)... : String | provenance |  |
 | Test.java:2750:10:2750:48 | zippingIterator(...) : ZippingIterator [<element>] : String | Test.java:2751:20:2751:22 | out : ZippingIterator [<element>] : String | provenance |  |
-| Test.java:2750:40:2750:41 | in : ListIterator [<element>] : String | Test.java:2750:10:2750:48 | zippingIterator(...) : ZippingIterator [<element>] : String | provenance | MaD:562 |
+| Test.java:2750:40:2750:41 | in : ListIterator [<element>] : String | Test.java:2750:10:2750:48 | zippingIterator(...) : ZippingIterator [<element>] : String | provenance | MaD:637 |
 | Test.java:2751:20:2751:22 | out : ZippingIterator [<element>] : String | Test.java:231:19:231:32 | it : ZippingIterator [<element>] : String | provenance |  |
-| Test.java:2751:20:2751:22 | out : ZippingIterator [<element>] : String | Test.java:2751:9:2751:23 | getElement(...) | provenance | MaD:4 |
+| Test.java:2751:20:2751:22 | out : ZippingIterator [<element>] : String | Test.java:2751:9:2751:23 | getElement(...) | provenance | MaD:6 |
 | Test.java:2756:18:2756:61 | newListIteratorWithElement(...) : ListIterator [<element>] : String | Test.java:2757:46:2757:47 | in : ListIterator [<element>] : String | provenance |  |
 | Test.java:2756:45:2756:60 | (...)... : String | Test.java:259:49:259:57 | element : String | provenance |  |
-| Test.java:2756:45:2756:60 | (...)... : String | Test.java:2756:18:2756:61 | newListIteratorWithElement(...) : ListIterator [<element>] : String | provenance | MaD:2 |
+| Test.java:2756:45:2756:60 | (...)... : String | Test.java:2756:18:2756:61 | newListIteratorWithElement(...) : ListIterator [<element>] : String | provenance | MaD:4 |
 | Test.java:2756:53:2756:60 | source(...) : Object | Test.java:2756:45:2756:60 | (...)... : String | provenance |  |
 | Test.java:2757:10:2757:48 | zippingIterator(...) : ZippingIterator [<element>] : String | Test.java:2758:20:2758:22 | out : ZippingIterator [<element>] : String | provenance |  |
-| Test.java:2757:46:2757:47 | in : ListIterator [<element>] : String | Test.java:2757:10:2757:48 | zippingIterator(...) : ZippingIterator [<element>] : String | provenance | MaD:563 |
+| Test.java:2757:46:2757:47 | in : ListIterator [<element>] : String | Test.java:2757:10:2757:48 | zippingIterator(...) : ZippingIterator [<element>] : String | provenance | MaD:638 |
 | Test.java:2758:20:2758:22 | out : ZippingIterator [<element>] : String | Test.java:231:19:231:32 | it : ZippingIterator [<element>] : String | provenance |  |
-| Test.java:2758:20:2758:22 | out : ZippingIterator [<element>] : String | Test.java:2758:9:2758:23 | getElement(...) | provenance | MaD:4 |
+| Test.java:2758:20:2758:22 | out : ZippingIterator [<element>] : String | Test.java:2758:9:2758:23 | getElement(...) | provenance | MaD:6 |
 | Test.java:2763:18:2763:61 | newListIteratorWithElement(...) : ListIterator [<element>] : String | Test.java:2764:40:2764:41 | in : ListIterator [<element>] : String | provenance |  |
 | Test.java:2763:45:2763:60 | (...)... : String | Test.java:259:49:259:57 | element : String | provenance |  |
-| Test.java:2763:45:2763:60 | (...)... : String | Test.java:2763:18:2763:61 | newListIteratorWithElement(...) : ListIterator [<element>] : String | provenance | MaD:2 |
+| Test.java:2763:45:2763:60 | (...)... : String | Test.java:2763:18:2763:61 | newListIteratorWithElement(...) : ListIterator [<element>] : String | provenance | MaD:4 |
 | Test.java:2763:53:2763:60 | source(...) : Object | Test.java:2763:45:2763:60 | (...)... : String | provenance |  |
 | Test.java:2764:10:2764:54 | zippingIterator(...) : ZippingIterator [<element>] : String | Test.java:2765:20:2765:22 | out : ZippingIterator [<element>] : String | provenance |  |
-| Test.java:2764:40:2764:41 | in : ListIterator [<element>] : String | Test.java:2764:10:2764:54 | zippingIterator(...) : ZippingIterator [<element>] : String | provenance | MaD:564 |
+| Test.java:2764:40:2764:41 | in : ListIterator [<element>] : String | Test.java:2764:10:2764:54 | zippingIterator(...) : ZippingIterator [<element>] : String | provenance | MaD:639 |
 | Test.java:2765:20:2765:22 | out : ZippingIterator [<element>] : String | Test.java:231:19:231:32 | it : ZippingIterator [<element>] : String | provenance |  |
-| Test.java:2765:20:2765:22 | out : ZippingIterator [<element>] : String | Test.java:2765:9:2765:23 | getElement(...) | provenance | MaD:4 |
+| Test.java:2765:20:2765:22 | out : ZippingIterator [<element>] : String | Test.java:2765:9:2765:23 | getElement(...) | provenance | MaD:6 |
 | Test.java:2770:18:2770:61 | newListIteratorWithElement(...) : ListIterator [<element>] : String | Test.java:2771:46:2771:47 | in : ListIterator [<element>] : String | provenance |  |
 | Test.java:2770:45:2770:60 | (...)... : String | Test.java:259:49:259:57 | element : String | provenance |  |
-| Test.java:2770:45:2770:60 | (...)... : String | Test.java:2770:18:2770:61 | newListIteratorWithElement(...) : ListIterator [<element>] : String | provenance | MaD:2 |
+| Test.java:2770:45:2770:60 | (...)... : String | Test.java:2770:18:2770:61 | newListIteratorWithElement(...) : ListIterator [<element>] : String | provenance | MaD:4 |
 | Test.java:2770:53:2770:60 | source(...) : Object | Test.java:2770:45:2770:60 | (...)... : String | provenance |  |
 | Test.java:2771:10:2771:54 | zippingIterator(...) : ZippingIterator [<element>] : String | Test.java:2772:20:2772:22 | out : ZippingIterator [<element>] : String | provenance |  |
-| Test.java:2771:46:2771:47 | in : ListIterator [<element>] : String | Test.java:2771:10:2771:54 | zippingIterator(...) : ZippingIterator [<element>] : String | provenance | MaD:565 |
+| Test.java:2771:46:2771:47 | in : ListIterator [<element>] : String | Test.java:2771:10:2771:54 | zippingIterator(...) : ZippingIterator [<element>] : String | provenance | MaD:640 |
 | Test.java:2772:20:2772:22 | out : ZippingIterator [<element>] : String | Test.java:231:19:231:32 | it : ZippingIterator [<element>] : String | provenance |  |
-| Test.java:2772:20:2772:22 | out : ZippingIterator [<element>] : String | Test.java:2772:9:2772:23 | getElement(...) | provenance | MaD:4 |
+| Test.java:2772:20:2772:22 | out : ZippingIterator [<element>] : String | Test.java:2772:9:2772:23 | getElement(...) | provenance | MaD:6 |
 | Test.java:2777:18:2777:61 | newListIteratorWithElement(...) : ListIterator [<element>] : String | Test.java:2778:52:2778:53 | in : ListIterator [<element>] : String | provenance |  |
 | Test.java:2777:45:2777:60 | (...)... : String | Test.java:259:49:259:57 | element : String | provenance |  |
-| Test.java:2777:45:2777:60 | (...)... : String | Test.java:2777:18:2777:61 | newListIteratorWithElement(...) : ListIterator [<element>] : String | provenance | MaD:2 |
+| Test.java:2777:45:2777:60 | (...)... : String | Test.java:2777:18:2777:61 | newListIteratorWithElement(...) : ListIterator [<element>] : String | provenance | MaD:4 |
 | Test.java:2777:53:2777:60 | source(...) : Object | Test.java:2777:45:2777:60 | (...)... : String | provenance |  |
 | Test.java:2778:10:2778:54 | zippingIterator(...) : ZippingIterator [<element>] : String | Test.java:2779:20:2779:22 | out : ZippingIterator [<element>] : String | provenance |  |
-| Test.java:2778:52:2778:53 | in : ListIterator [<element>] : String | Test.java:2778:10:2778:54 | zippingIterator(...) : ZippingIterator [<element>] : String | provenance | MaD:566 |
+| Test.java:2778:52:2778:53 | in : ListIterator [<element>] : String | Test.java:2778:10:2778:54 | zippingIterator(...) : ZippingIterator [<element>] : String | provenance | MaD:641 |
 | Test.java:2779:20:2779:22 | out : ZippingIterator [<element>] : String | Test.java:231:19:231:32 | it : ZippingIterator [<element>] : String | provenance |  |
-| Test.java:2779:20:2779:22 | out : ZippingIterator [<element>] : String | Test.java:2779:9:2779:23 | getElement(...) | provenance | MaD:4 |
+| Test.java:2779:20:2779:22 | out : ZippingIterator [<element>] : String | Test.java:2779:9:2779:23 | getElement(...) | provenance | MaD:6 |
 | Test.java:2784:14:2784:27 | (...)... : List | Test.java:2785:34:2785:35 | in : List | provenance |  |
 | Test.java:2784:20:2784:27 | source(...) : Object | Test.java:2784:14:2784:27 | (...)... : List | provenance |  |
 | Test.java:2785:10:2785:42 | defaultIfNull(...) : List | Test.java:2786:9:2786:11 | out | provenance |  |
-| Test.java:2785:34:2785:35 | in : List | Test.java:2785:10:2785:42 | defaultIfNull(...) : List | provenance | MaD:570 |
+| Test.java:2785:34:2785:35 | in : List | Test.java:2785:10:2785:42 | defaultIfNull(...) : List | provenance | MaD:645 |
 | Test.java:2791:14:2791:27 | (...)... : List | Test.java:2792:40:2792:41 | in : List | provenance |  |
 | Test.java:2791:20:2791:27 | source(...) : Object | Test.java:2791:14:2791:27 | (...)... : List | provenance |  |
 | Test.java:2792:10:2792:42 | defaultIfNull(...) : List | Test.java:2793:9:2793:11 | out | provenance |  |
-| Test.java:2792:40:2792:41 | in : List | Test.java:2792:10:2792:42 | defaultIfNull(...) : List | provenance | MaD:571 |
+| Test.java:2792:40:2792:41 | in : List | Test.java:2792:10:2792:42 | defaultIfNull(...) : List | provenance | MaD:646 |
 | Test.java:2798:14:2798:27 | (...)... : List | Test.java:2799:32:2799:33 | in : List | provenance |  |
 | Test.java:2798:20:2798:27 | source(...) : Object | Test.java:2798:14:2798:27 | (...)... : List | provenance |  |
 | Test.java:2799:10:2799:34 | emptyIfNull(...) : List | Test.java:2800:9:2800:11 | out | provenance |  |
-| Test.java:2799:32:2799:33 | in : List | Test.java:2799:10:2799:34 | emptyIfNull(...) : List | provenance | MaD:572 |
+| Test.java:2799:32:2799:33 | in : List | Test.java:2799:10:2799:34 | emptyIfNull(...) : List | provenance | MaD:647 |
 | Test.java:2805:14:2805:51 | newVectorWithElement(...) : Vector [<element>] : String | Test.java:2806:34:2806:35 | in : Vector [<element>] : String | provenance |  |
 | Test.java:2805:35:2805:50 | (...)... : String | Test.java:269:37:269:45 | element : String | provenance |  |
-| Test.java:2805:35:2805:50 | (...)... : String | Test.java:2805:14:2805:51 | newVectorWithElement(...) : Vector [<element>] : String | provenance | MaD:2 |
+| Test.java:2805:35:2805:50 | (...)... : String | Test.java:2805:14:2805:51 | newVectorWithElement(...) : Vector [<element>] : String | provenance | MaD:4 |
 | Test.java:2805:43:2805:50 | source(...) : Object | Test.java:2805:35:2805:50 | (...)... : String | provenance |  |
 | Test.java:2806:10:2806:36 | fixedSizeList(...) : List [<element>] : String | Test.java:2807:20:2807:22 | out : List [<element>] : String | provenance |  |
-| Test.java:2806:34:2806:35 | in : Vector [<element>] : String | Test.java:2806:10:2806:36 | fixedSizeList(...) : List [<element>] : String | provenance | MaD:573 |
+| Test.java:2806:34:2806:35 | in : Vector [<element>] : String | Test.java:2806:10:2806:36 | fixedSizeList(...) : List [<element>] : String | provenance | MaD:648 |
 | Test.java:2807:20:2807:22 | out : List [<element>] : String | Test.java:230:19:230:32 | it : List [<element>] : String | provenance |  |
-| Test.java:2807:20:2807:22 | out : List [<element>] : String | Test.java:2807:9:2807:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:2807:20:2807:22 | out : List [<element>] : String | Test.java:2807:9:2807:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:2812:14:2812:51 | newVectorWithElement(...) : Vector [<element>] : String | Test.java:2813:33:2813:34 | in : Vector [<element>] : String | provenance |  |
 | Test.java:2812:35:2812:50 | (...)... : String | Test.java:269:37:269:45 | element : String | provenance |  |
-| Test.java:2812:35:2812:50 | (...)... : String | Test.java:2812:14:2812:51 | newVectorWithElement(...) : Vector [<element>] : String | provenance | MaD:2 |
+| Test.java:2812:35:2812:50 | (...)... : String | Test.java:2812:14:2812:51 | newVectorWithElement(...) : Vector [<element>] : String | provenance | MaD:4 |
 | Test.java:2812:43:2812:50 | source(...) : Object | Test.java:2812:35:2812:50 | (...)... : String | provenance |  |
 | Test.java:2813:10:2813:41 | intersection(...) : List [<element>] : String | Test.java:2814:20:2814:22 | out : List [<element>] : String | provenance |  |
-| Test.java:2813:33:2813:34 | in : Vector [<element>] : String | Test.java:2813:10:2813:41 | intersection(...) : List [<element>] : String | provenance | MaD:574 |
+| Test.java:2813:33:2813:34 | in : Vector [<element>] : String | Test.java:2813:10:2813:41 | intersection(...) : List [<element>] : String | provenance | MaD:649 |
 | Test.java:2814:20:2814:22 | out : List [<element>] : String | Test.java:230:19:230:32 | it : List [<element>] : String | provenance |  |
-| Test.java:2814:20:2814:22 | out : List [<element>] : String | Test.java:2814:9:2814:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:2814:20:2814:22 | out : List [<element>] : String | Test.java:2814:9:2814:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:2819:14:2819:51 | newVectorWithElement(...) : Vector [<element>] : String | Test.java:2820:39:2820:40 | in : Vector [<element>] : String | provenance |  |
 | Test.java:2819:35:2819:50 | (...)... : String | Test.java:269:37:269:45 | element : String | provenance |  |
-| Test.java:2819:35:2819:50 | (...)... : String | Test.java:2819:14:2819:51 | newVectorWithElement(...) : Vector [<element>] : String | provenance | MaD:2 |
+| Test.java:2819:35:2819:50 | (...)... : String | Test.java:2819:14:2819:51 | newVectorWithElement(...) : Vector [<element>] : String | provenance | MaD:4 |
 | Test.java:2819:43:2819:50 | source(...) : Object | Test.java:2819:35:2819:50 | (...)... : String | provenance |  |
 | Test.java:2820:10:2820:41 | intersection(...) : List [<element>] : String | Test.java:2821:20:2821:22 | out : List [<element>] : String | provenance |  |
-| Test.java:2820:39:2820:40 | in : Vector [<element>] : String | Test.java:2820:10:2820:41 | intersection(...) : List [<element>] : String | provenance | MaD:575 |
+| Test.java:2820:39:2820:40 | in : Vector [<element>] : String | Test.java:2820:10:2820:41 | intersection(...) : List [<element>] : String | provenance | MaD:650 |
 | Test.java:2821:20:2821:22 | out : List [<element>] : String | Test.java:230:19:230:32 | it : List [<element>] : String | provenance |  |
-| Test.java:2821:20:2821:22 | out : List [<element>] : String | Test.java:2821:9:2821:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:2821:20:2821:22 | out : List [<element>] : String | Test.java:2821:9:2821:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:2826:14:2826:51 | newVectorWithElement(...) : Vector [<element>] : String | Test.java:2827:29:2827:30 | in : Vector [<element>] : String | provenance |  |
 | Test.java:2826:35:2826:50 | (...)... : String | Test.java:269:37:269:45 | element : String | provenance |  |
-| Test.java:2826:35:2826:50 | (...)... : String | Test.java:2826:14:2826:51 | newVectorWithElement(...) : Vector [<element>] : String | provenance | MaD:2 |
+| Test.java:2826:35:2826:50 | (...)... : String | Test.java:2826:14:2826:51 | newVectorWithElement(...) : Vector [<element>] : String | provenance | MaD:4 |
 | Test.java:2826:43:2826:50 | source(...) : Object | Test.java:2826:35:2826:50 | (...)... : String | provenance |  |
 | Test.java:2827:10:2827:50 | lazyList(...) : List [<element>] : String | Test.java:2828:20:2828:22 | out : List [<element>] : String | provenance |  |
-| Test.java:2827:29:2827:30 | in : Vector [<element>] : String | Test.java:2827:10:2827:50 | lazyList(...) : List [<element>] : String | provenance | MaD:576 |
+| Test.java:2827:29:2827:30 | in : Vector [<element>] : String | Test.java:2827:10:2827:50 | lazyList(...) : List [<element>] : String | provenance | MaD:651 |
 | Test.java:2828:20:2828:22 | out : List [<element>] : String | Test.java:230:19:230:32 | it : List [<element>] : String | provenance |  |
-| Test.java:2828:20:2828:22 | out : List [<element>] : String | Test.java:2828:9:2828:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:2828:20:2828:22 | out : List [<element>] : String | Test.java:2828:9:2828:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:2833:14:2833:51 | newVectorWithElement(...) : Vector [<element>] : String | Test.java:2834:29:2834:30 | in : Vector [<element>] : String | provenance |  |
 | Test.java:2833:35:2833:50 | (...)... : String | Test.java:269:37:269:45 | element : String | provenance |  |
-| Test.java:2833:35:2833:50 | (...)... : String | Test.java:2833:14:2833:51 | newVectorWithElement(...) : Vector [<element>] : String | provenance | MaD:2 |
+| Test.java:2833:35:2833:50 | (...)... : String | Test.java:2833:14:2833:51 | newVectorWithElement(...) : Vector [<element>] : String | provenance | MaD:4 |
 | Test.java:2833:43:2833:50 | source(...) : Object | Test.java:2833:35:2833:50 | (...)... : String | provenance |  |
 | Test.java:2834:10:2834:46 | lazyList(...) : List [<element>] : String | Test.java:2835:20:2835:22 | out : List [<element>] : String | provenance |  |
-| Test.java:2834:29:2834:30 | in : Vector [<element>] : String | Test.java:2834:10:2834:46 | lazyList(...) : List [<element>] : String | provenance | MaD:576 |
+| Test.java:2834:29:2834:30 | in : Vector [<element>] : String | Test.java:2834:10:2834:46 | lazyList(...) : List [<element>] : String | provenance | MaD:651 |
 | Test.java:2835:20:2835:22 | out : List [<element>] : String | Test.java:230:19:230:32 | it : List [<element>] : String | provenance |  |
-| Test.java:2835:20:2835:22 | out : List [<element>] : String | Test.java:2835:9:2835:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:2835:20:2835:22 | out : List [<element>] : String | Test.java:2835:9:2835:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:2840:22:2840:43 | (...)... : CharSequence | Test.java:2841:45:2841:46 | in : CharSequence | provenance |  |
 | Test.java:2840:36:2840:43 | source(...) : Object | Test.java:2840:22:2840:43 | (...)... : CharSequence | provenance |  |
 | Test.java:2841:10:2841:67 | longestCommonSubsequence(...) : String | Test.java:2842:9:2842:11 | out | provenance |  |
-| Test.java:2841:45:2841:46 | in : CharSequence | Test.java:2841:10:2841:67 | longestCommonSubsequence(...) : String | provenance | MaD:577 |
+| Test.java:2841:45:2841:46 | in : CharSequence | Test.java:2841:10:2841:67 | longestCommonSubsequence(...) : String | provenance | MaD:652 |
 | Test.java:2847:22:2847:43 | (...)... : CharSequence | Test.java:2848:65:2848:66 | in : CharSequence | provenance |  |
 | Test.java:2847:36:2847:43 | source(...) : Object | Test.java:2847:22:2847:43 | (...)... : CharSequence | provenance |  |
 | Test.java:2848:10:2848:67 | longestCommonSubsequence(...) : String | Test.java:2849:9:2849:11 | out | provenance |  |
-| Test.java:2848:65:2848:66 | in : CharSequence | Test.java:2848:10:2848:67 | longestCommonSubsequence(...) : String | provenance | MaD:578 |
+| Test.java:2848:65:2848:66 | in : CharSequence | Test.java:2848:10:2848:67 | longestCommonSubsequence(...) : String | provenance | MaD:653 |
 | Test.java:2854:14:2854:51 | newVectorWithElement(...) : Vector [<element>] : String | Test.java:2855:45:2855:46 | in : Vector [<element>] : String | provenance |  |
 | Test.java:2854:35:2854:50 | (...)... : String | Test.java:269:37:269:45 | element : String | provenance |  |
-| Test.java:2854:35:2854:50 | (...)... : String | Test.java:2854:14:2854:51 | newVectorWithElement(...) : Vector [<element>] : String | provenance | MaD:2 |
+| Test.java:2854:35:2854:50 | (...)... : String | Test.java:2854:14:2854:51 | newVectorWithElement(...) : Vector [<element>] : String | provenance | MaD:4 |
 | Test.java:2854:43:2854:50 | source(...) : Object | Test.java:2854:35:2854:50 | (...)... : String | provenance |  |
 | Test.java:2855:10:2855:59 | longestCommonSubsequence(...) : List [<element>] : String | Test.java:2856:20:2856:22 | out : List [<element>] : String | provenance |  |
-| Test.java:2855:45:2855:46 | in : Vector [<element>] : String | Test.java:2855:10:2855:59 | longestCommonSubsequence(...) : List [<element>] : String | provenance | MaD:579 |
+| Test.java:2855:45:2855:46 | in : Vector [<element>] : String | Test.java:2855:10:2855:59 | longestCommonSubsequence(...) : List [<element>] : String | provenance | MaD:654 |
 | Test.java:2856:20:2856:22 | out : List [<element>] : String | Test.java:230:19:230:32 | it : List [<element>] : String | provenance |  |
-| Test.java:2856:20:2856:22 | out : List [<element>] : String | Test.java:2856:9:2856:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:2856:20:2856:22 | out : List [<element>] : String | Test.java:2856:9:2856:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:2861:14:2861:51 | newVectorWithElement(...) : Vector [<element>] : String | Test.java:2862:57:2862:58 | in : Vector [<element>] : String | provenance |  |
 | Test.java:2861:35:2861:50 | (...)... : String | Test.java:269:37:269:45 | element : String | provenance |  |
-| Test.java:2861:35:2861:50 | (...)... : String | Test.java:2861:14:2861:51 | newVectorWithElement(...) : Vector [<element>] : String | provenance | MaD:2 |
+| Test.java:2861:35:2861:50 | (...)... : String | Test.java:2861:14:2861:51 | newVectorWithElement(...) : Vector [<element>] : String | provenance | MaD:4 |
 | Test.java:2861:43:2861:50 | source(...) : Object | Test.java:2861:35:2861:50 | (...)... : String | provenance |  |
 | Test.java:2862:10:2862:59 | longestCommonSubsequence(...) : List [<element>] : String | Test.java:2863:20:2863:22 | out : List [<element>] : String | provenance |  |
-| Test.java:2862:57:2862:58 | in : Vector [<element>] : String | Test.java:2862:10:2862:59 | longestCommonSubsequence(...) : List [<element>] : String | provenance | MaD:580 |
+| Test.java:2862:57:2862:58 | in : Vector [<element>] : String | Test.java:2862:10:2862:59 | longestCommonSubsequence(...) : List [<element>] : String | provenance | MaD:655 |
 | Test.java:2863:20:2863:22 | out : List [<element>] : String | Test.java:230:19:230:32 | it : List [<element>] : String | provenance |  |
-| Test.java:2863:20:2863:22 | out : List [<element>] : String | Test.java:2863:9:2863:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:2863:20:2863:22 | out : List [<element>] : String | Test.java:2863:9:2863:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:2868:14:2868:51 | newVectorWithElement(...) : Vector [<element>] : String | Test.java:2869:45:2869:46 | in : Vector [<element>] : String | provenance |  |
 | Test.java:2868:35:2868:50 | (...)... : String | Test.java:269:37:269:45 | element : String | provenance |  |
-| Test.java:2868:35:2868:50 | (...)... : String | Test.java:2868:14:2868:51 | newVectorWithElement(...) : Vector [<element>] : String | provenance | MaD:2 |
+| Test.java:2868:35:2868:50 | (...)... : String | Test.java:2868:14:2868:51 | newVectorWithElement(...) : Vector [<element>] : String | provenance | MaD:4 |
 | Test.java:2868:43:2868:50 | source(...) : Object | Test.java:2868:35:2868:50 | (...)... : String | provenance |  |
 | Test.java:2869:10:2869:59 | longestCommonSubsequence(...) : List [<element>] : String | Test.java:2870:20:2870:22 | out : List [<element>] : String | provenance |  |
-| Test.java:2869:45:2869:46 | in : Vector [<element>] : String | Test.java:2869:10:2869:59 | longestCommonSubsequence(...) : List [<element>] : String | provenance | MaD:581 |
+| Test.java:2869:45:2869:46 | in : Vector [<element>] : String | Test.java:2869:10:2869:59 | longestCommonSubsequence(...) : List [<element>] : String | provenance | MaD:656 |
 | Test.java:2870:20:2870:22 | out : List [<element>] : String | Test.java:230:19:230:32 | it : List [<element>] : String | provenance |  |
-| Test.java:2870:20:2870:22 | out : List [<element>] : String | Test.java:2870:9:2870:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:2870:20:2870:22 | out : List [<element>] : String | Test.java:2870:9:2870:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:2875:14:2875:51 | newVectorWithElement(...) : Vector [<element>] : String | Test.java:2876:51:2876:52 | in : Vector [<element>] : String | provenance |  |
 | Test.java:2875:35:2875:50 | (...)... : String | Test.java:269:37:269:45 | element : String | provenance |  |
-| Test.java:2875:35:2875:50 | (...)... : String | Test.java:2875:14:2875:51 | newVectorWithElement(...) : Vector [<element>] : String | provenance | MaD:2 |
+| Test.java:2875:35:2875:50 | (...)... : String | Test.java:2875:14:2875:51 | newVectorWithElement(...) : Vector [<element>] : String | provenance | MaD:4 |
 | Test.java:2875:43:2875:50 | source(...) : Object | Test.java:2875:35:2875:50 | (...)... : String | provenance |  |
 | Test.java:2876:10:2876:59 | longestCommonSubsequence(...) : List [<element>] : String | Test.java:2877:20:2877:22 | out : List [<element>] : String | provenance |  |
-| Test.java:2876:51:2876:52 | in : Vector [<element>] : String | Test.java:2876:10:2876:59 | longestCommonSubsequence(...) : List [<element>] : String | provenance | MaD:582 |
+| Test.java:2876:51:2876:52 | in : Vector [<element>] : String | Test.java:2876:10:2876:59 | longestCommonSubsequence(...) : List [<element>] : String | provenance | MaD:657 |
 | Test.java:2877:20:2877:22 | out : List [<element>] : String | Test.java:230:19:230:32 | it : List [<element>] : String | provenance |  |
-| Test.java:2877:20:2877:22 | out : List [<element>] : String | Test.java:2877:9:2877:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:2877:20:2877:22 | out : List [<element>] : String | Test.java:2877:9:2877:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:2882:14:2882:51 | newVectorWithElement(...) : Vector [<element>] : String | Test.java:2883:30:2883:31 | in : Vector [<element>] : String | provenance |  |
 | Test.java:2882:35:2882:50 | (...)... : String | Test.java:269:37:269:45 | element : String | provenance |  |
-| Test.java:2882:35:2882:50 | (...)... : String | Test.java:2882:14:2882:51 | newVectorWithElement(...) : Vector [<element>] : String | provenance | MaD:2 |
+| Test.java:2882:35:2882:50 | (...)... : String | Test.java:2882:14:2882:51 | newVectorWithElement(...) : Vector [<element>] : String | provenance | MaD:4 |
 | Test.java:2882:43:2882:50 | source(...) : Object | Test.java:2882:35:2882:50 | (...)... : String | provenance |  |
 | Test.java:2883:10:2883:35 | partition(...) : List [<element>, <element>] : String | Test.java:2884:41:2884:43 | out : List [<element>, <element>] : String | provenance |  |
-| Test.java:2883:30:2883:31 | in : Vector [<element>] : String | Test.java:2883:10:2883:35 | partition(...) : List [<element>, <element>] : String | provenance | MaD:583 |
+| Test.java:2883:30:2883:31 | in : Vector [<element>] : String | Test.java:2883:10:2883:35 | partition(...) : List [<element>, <element>] : String | provenance | MaD:658 |
 | Test.java:2884:20:2884:44 | (...)... : Iterable [<element>] : String | Test.java:230:19:230:32 | it : Iterable [<element>] : String | provenance |  |
-| Test.java:2884:20:2884:44 | (...)... : Iterable [<element>] : String | Test.java:2884:9:2884:45 | getElement(...) | provenance | MaD:1 |
+| Test.java:2884:20:2884:44 | (...)... : Iterable [<element>] : String | Test.java:2884:9:2884:45 | getElement(...) | provenance | MaD:3 |
 | Test.java:2884:30:2884:44 | getElement(...) : Object [<element>] : String | Test.java:2884:20:2884:44 | (...)... : Iterable [<element>] : String | provenance |  |
 | Test.java:2884:41:2884:43 | out : List [<element>, <element>] : String | Test.java:230:19:230:32 | it : List [<element>, <element>] : String | provenance |  |
-| Test.java:2884:41:2884:43 | out : List [<element>, <element>] : String | Test.java:2884:30:2884:44 | getElement(...) : Object [<element>] : String | provenance | MaD:1 |
+| Test.java:2884:41:2884:43 | out : List [<element>, <element>] : String | Test.java:2884:30:2884:44 | getElement(...) : Object [<element>] : String | provenance | MaD:3 |
 | Test.java:2889:14:2889:51 | newVectorWithElement(...) : Vector [<element>] : String | Test.java:2890:35:2890:36 | in : Vector [<element>] : String | provenance |  |
 | Test.java:2889:35:2889:50 | (...)... : String | Test.java:269:37:269:45 | element : String | provenance |  |
-| Test.java:2889:35:2889:50 | (...)... : String | Test.java:2889:14:2889:51 | newVectorWithElement(...) : Vector [<element>] : String | provenance | MaD:2 |
+| Test.java:2889:35:2889:50 | (...)... : String | Test.java:2889:14:2889:51 | newVectorWithElement(...) : Vector [<element>] : String | provenance | MaD:4 |
 | Test.java:2889:43:2889:50 | source(...) : Object | Test.java:2889:35:2889:50 | (...)... : String | provenance |  |
 | Test.java:2890:10:2890:43 | predicatedList(...) : List [<element>] : String | Test.java:2891:20:2891:22 | out : List [<element>] : String | provenance |  |
-| Test.java:2890:35:2890:36 | in : Vector [<element>] : String | Test.java:2890:10:2890:43 | predicatedList(...) : List [<element>] : String | provenance | MaD:584 |
+| Test.java:2890:35:2890:36 | in : Vector [<element>] : String | Test.java:2890:10:2890:43 | predicatedList(...) : List [<element>] : String | provenance | MaD:659 |
 | Test.java:2891:20:2891:22 | out : List [<element>] : String | Test.java:230:19:230:32 | it : List [<element>] : String | provenance |  |
-| Test.java:2891:20:2891:22 | out : List [<element>] : String | Test.java:2891:9:2891:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:2891:20:2891:22 | out : List [<element>] : String | Test.java:2891:9:2891:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:2896:20:2896:57 | newVectorWithElement(...) : Vector [<element>] : String | Test.java:2897:30:2897:31 | in : Vector [<element>] : String | provenance |  |
 | Test.java:2896:41:2896:56 | (...)... : String | Test.java:269:37:269:45 | element : String | provenance |  |
-| Test.java:2896:41:2896:56 | (...)... : String | Test.java:2896:20:2896:57 | newVectorWithElement(...) : Vector [<element>] : String | provenance | MaD:2 |
+| Test.java:2896:41:2896:56 | (...)... : String | Test.java:2896:20:2896:57 | newVectorWithElement(...) : Vector [<element>] : String | provenance | MaD:4 |
 | Test.java:2896:49:2896:56 | source(...) : Object | Test.java:2896:41:2896:56 | (...)... : String | provenance |  |
 | Test.java:2897:10:2897:38 | removeAll(...) : List [<element>] : String | Test.java:2898:20:2898:22 | out : List [<element>] : String | provenance |  |
-| Test.java:2897:30:2897:31 | in : Vector [<element>] : String | Test.java:2897:10:2897:38 | removeAll(...) : List [<element>] : String | provenance | MaD:585 |
+| Test.java:2897:30:2897:31 | in : Vector [<element>] : String | Test.java:2897:10:2897:38 | removeAll(...) : List [<element>] : String | provenance | MaD:660 |
 | Test.java:2898:20:2898:22 | out : List [<element>] : String | Test.java:230:19:230:32 | it : List [<element>] : String | provenance |  |
-| Test.java:2898:20:2898:22 | out : List [<element>] : String | Test.java:2898:9:2898:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:2898:20:2898:22 | out : List [<element>] : String | Test.java:2898:9:2898:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:2903:20:2903:57 | newVectorWithElement(...) : Vector [<element>] : String | Test.java:2904:30:2904:31 | in : Vector [<element>] : String | provenance |  |
 | Test.java:2903:41:2903:56 | (...)... : String | Test.java:269:37:269:45 | element : String | provenance |  |
-| Test.java:2903:41:2903:56 | (...)... : String | Test.java:2903:20:2903:57 | newVectorWithElement(...) : Vector [<element>] : String | provenance | MaD:2 |
+| Test.java:2903:41:2903:56 | (...)... : String | Test.java:2903:20:2903:57 | newVectorWithElement(...) : Vector [<element>] : String | provenance | MaD:4 |
 | Test.java:2903:49:2903:56 | source(...) : Object | Test.java:2903:41:2903:56 | (...)... : String | provenance |  |
 | Test.java:2904:10:2904:38 | retainAll(...) : List [<element>] : String | Test.java:2905:20:2905:22 | out : List [<element>] : String | provenance |  |
-| Test.java:2904:30:2904:31 | in : Vector [<element>] : String | Test.java:2904:10:2904:38 | retainAll(...) : List [<element>] : String | provenance | MaD:586 |
+| Test.java:2904:30:2904:31 | in : Vector [<element>] : String | Test.java:2904:10:2904:38 | retainAll(...) : List [<element>] : String | provenance | MaD:661 |
 | Test.java:2905:20:2905:22 | out : List [<element>] : String | Test.java:230:19:230:32 | it : List [<element>] : String | provenance |  |
-| Test.java:2905:20:2905:22 | out : List [<element>] : String | Test.java:2905:9:2905:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:2905:20:2905:22 | out : List [<element>] : String | Test.java:2905:9:2905:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:2910:20:2910:57 | newVectorWithElement(...) : Vector [<element>] : String | Test.java:2911:27:2911:28 | in : Vector [<element>] : String | provenance |  |
 | Test.java:2910:41:2910:56 | (...)... : String | Test.java:269:37:269:45 | element : String | provenance |  |
-| Test.java:2910:41:2910:56 | (...)... : String | Test.java:2910:20:2910:57 | newVectorWithElement(...) : Vector [<element>] : String | provenance | MaD:2 |
+| Test.java:2910:41:2910:56 | (...)... : String | Test.java:2910:20:2910:57 | newVectorWithElement(...) : Vector [<element>] : String | provenance | MaD:4 |
 | Test.java:2910:49:2910:56 | source(...) : Object | Test.java:2910:41:2910:56 | (...)... : String | provenance |  |
 | Test.java:2911:10:2911:35 | select(...) : List [<element>] : String | Test.java:2912:20:2912:22 | out : List [<element>] : String | provenance |  |
-| Test.java:2911:27:2911:28 | in : Vector [<element>] : String | Test.java:2911:10:2911:35 | select(...) : List [<element>] : String | provenance | MaD:587 |
+| Test.java:2911:27:2911:28 | in : Vector [<element>] : String | Test.java:2911:10:2911:35 | select(...) : List [<element>] : String | provenance | MaD:662 |
 | Test.java:2912:20:2912:22 | out : List [<element>] : String | Test.java:230:19:230:32 | it : List [<element>] : String | provenance |  |
-| Test.java:2912:20:2912:22 | out : List [<element>] : String | Test.java:2912:9:2912:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:2912:20:2912:22 | out : List [<element>] : String | Test.java:2912:9:2912:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:2917:20:2917:57 | newVectorWithElement(...) : Vector [<element>] : String | Test.java:2918:35:2918:36 | in : Vector [<element>] : String | provenance |  |
 | Test.java:2917:41:2917:56 | (...)... : String | Test.java:269:37:269:45 | element : String | provenance |  |
-| Test.java:2917:41:2917:56 | (...)... : String | Test.java:2917:20:2917:57 | newVectorWithElement(...) : Vector [<element>] : String | provenance | MaD:2 |
+| Test.java:2917:41:2917:56 | (...)... : String | Test.java:2917:20:2917:57 | newVectorWithElement(...) : Vector [<element>] : String | provenance | MaD:4 |
 | Test.java:2917:49:2917:56 | source(...) : Object | Test.java:2917:41:2917:56 | (...)... : String | provenance |  |
 | Test.java:2918:10:2918:43 | selectRejected(...) : List [<element>] : String | Test.java:2919:20:2919:22 | out : List [<element>] : String | provenance |  |
-| Test.java:2918:35:2918:36 | in : Vector [<element>] : String | Test.java:2918:10:2918:43 | selectRejected(...) : List [<element>] : String | provenance | MaD:588 |
+| Test.java:2918:35:2918:36 | in : Vector [<element>] : String | Test.java:2918:10:2918:43 | selectRejected(...) : List [<element>] : String | provenance | MaD:663 |
 | Test.java:2919:20:2919:22 | out : List [<element>] : String | Test.java:230:19:230:32 | it : List [<element>] : String | provenance |  |
-| Test.java:2919:20:2919:22 | out : List [<element>] : String | Test.java:2919:9:2919:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:2919:20:2919:22 | out : List [<element>] : String | Test.java:2919:9:2919:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:2924:14:2924:51 | newVectorWithElement(...) : Vector [<element>] : String | Test.java:2925:29:2925:30 | in : Vector [<element>] : String | provenance |  |
 | Test.java:2924:35:2924:50 | (...)... : String | Test.java:269:37:269:45 | element : String | provenance |  |
-| Test.java:2924:35:2924:50 | (...)... : String | Test.java:2924:14:2924:51 | newVectorWithElement(...) : Vector [<element>] : String | provenance | MaD:2 |
+| Test.java:2924:35:2924:50 | (...)... : String | Test.java:2924:14:2924:51 | newVectorWithElement(...) : Vector [<element>] : String | provenance | MaD:4 |
 | Test.java:2924:43:2924:50 | source(...) : Object | Test.java:2924:35:2924:50 | (...)... : String | provenance |  |
 | Test.java:2925:10:2925:37 | subtract(...) : List [<element>] : String | Test.java:2926:20:2926:22 | out : List [<element>] : String | provenance |  |
-| Test.java:2925:29:2925:30 | in : Vector [<element>] : String | Test.java:2925:10:2925:37 | subtract(...) : List [<element>] : String | provenance | MaD:589 |
+| Test.java:2925:29:2925:30 | in : Vector [<element>] : String | Test.java:2925:10:2925:37 | subtract(...) : List [<element>] : String | provenance | MaD:664 |
 | Test.java:2926:20:2926:22 | out : List [<element>] : String | Test.java:230:19:230:32 | it : List [<element>] : String | provenance |  |
-| Test.java:2926:20:2926:22 | out : List [<element>] : String | Test.java:2926:9:2926:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:2926:20:2926:22 | out : List [<element>] : String | Test.java:2926:9:2926:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:2931:14:2931:51 | newVectorWithElement(...) : Vector [<element>] : String | Test.java:2932:24:2932:25 | in : Vector [<element>] : String | provenance |  |
 | Test.java:2931:35:2931:50 | (...)... : String | Test.java:269:37:269:45 | element : String | provenance |  |
-| Test.java:2931:35:2931:50 | (...)... : String | Test.java:2931:14:2931:51 | newVectorWithElement(...) : Vector [<element>] : String | provenance | MaD:2 |
+| Test.java:2931:35:2931:50 | (...)... : String | Test.java:2931:14:2931:51 | newVectorWithElement(...) : Vector [<element>] : String | provenance | MaD:4 |
 | Test.java:2931:43:2931:50 | source(...) : Object | Test.java:2931:35:2931:50 | (...)... : String | provenance |  |
 | Test.java:2932:10:2932:32 | sum(...) : List [<element>] : String | Test.java:2933:20:2933:22 | out : List [<element>] : String | provenance |  |
-| Test.java:2932:24:2932:25 | in : Vector [<element>] : String | Test.java:2932:10:2932:32 | sum(...) : List [<element>] : String | provenance | MaD:590 |
+| Test.java:2932:24:2932:25 | in : Vector [<element>] : String | Test.java:2932:10:2932:32 | sum(...) : List [<element>] : String | provenance | MaD:665 |
 | Test.java:2933:20:2933:22 | out : List [<element>] : String | Test.java:230:19:230:32 | it : List [<element>] : String | provenance |  |
-| Test.java:2933:20:2933:22 | out : List [<element>] : String | Test.java:2933:9:2933:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:2933:20:2933:22 | out : List [<element>] : String | Test.java:2933:9:2933:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:2938:14:2938:51 | newVectorWithElement(...) : Vector [<element>] : String | Test.java:2939:30:2939:31 | in : Vector [<element>] : String | provenance |  |
 | Test.java:2938:35:2938:50 | (...)... : String | Test.java:269:37:269:45 | element : String | provenance |  |
-| Test.java:2938:35:2938:50 | (...)... : String | Test.java:2938:14:2938:51 | newVectorWithElement(...) : Vector [<element>] : String | provenance | MaD:2 |
+| Test.java:2938:35:2938:50 | (...)... : String | Test.java:2938:14:2938:51 | newVectorWithElement(...) : Vector [<element>] : String | provenance | MaD:4 |
 | Test.java:2938:43:2938:50 | source(...) : Object | Test.java:2938:35:2938:50 | (...)... : String | provenance |  |
 | Test.java:2939:10:2939:32 | sum(...) : List [<element>] : String | Test.java:2940:20:2940:22 | out : List [<element>] : String | provenance |  |
-| Test.java:2939:30:2939:31 | in : Vector [<element>] : String | Test.java:2939:10:2939:32 | sum(...) : List [<element>] : String | provenance | MaD:591 |
+| Test.java:2939:30:2939:31 | in : Vector [<element>] : String | Test.java:2939:10:2939:32 | sum(...) : List [<element>] : String | provenance | MaD:666 |
 | Test.java:2940:20:2940:22 | out : List [<element>] : String | Test.java:230:19:230:32 | it : List [<element>] : String | provenance |  |
-| Test.java:2940:20:2940:22 | out : List [<element>] : String | Test.java:2940:9:2940:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:2940:20:2940:22 | out : List [<element>] : String | Test.java:2940:9:2940:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:2945:14:2945:51 | newVectorWithElement(...) : Vector [<element>] : String | Test.java:2946:37:2946:38 | in : Vector [<element>] : String | provenance |  |
 | Test.java:2945:35:2945:50 | (...)... : String | Test.java:269:37:269:45 | element : String | provenance |  |
-| Test.java:2945:35:2945:50 | (...)... : String | Test.java:2945:14:2945:51 | newVectorWithElement(...) : Vector [<element>] : String | provenance | MaD:2 |
+| Test.java:2945:35:2945:50 | (...)... : String | Test.java:2945:14:2945:51 | newVectorWithElement(...) : Vector [<element>] : String | provenance | MaD:4 |
 | Test.java:2945:43:2945:50 | source(...) : Object | Test.java:2945:35:2945:50 | (...)... : String | provenance |  |
 | Test.java:2946:10:2946:39 | synchronizedList(...) : List [<element>] : String | Test.java:2947:20:2947:22 | out : List [<element>] : String | provenance |  |
-| Test.java:2946:37:2946:38 | in : Vector [<element>] : String | Test.java:2946:10:2946:39 | synchronizedList(...) : List [<element>] : String | provenance | MaD:592 |
+| Test.java:2946:37:2946:38 | in : Vector [<element>] : String | Test.java:2946:10:2946:39 | synchronizedList(...) : List [<element>] : String | provenance | MaD:667 |
 | Test.java:2947:20:2947:22 | out : List [<element>] : String | Test.java:230:19:230:32 | it : List [<element>] : String | provenance |  |
-| Test.java:2947:20:2947:22 | out : List [<element>] : String | Test.java:2947:9:2947:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:2947:20:2947:22 | out : List [<element>] : String | Test.java:2947:9:2947:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:2952:14:2952:51 | newVectorWithElement(...) : Vector [<element>] : String | Test.java:2953:36:2953:37 | in : Vector [<element>] : String | provenance |  |
 | Test.java:2952:35:2952:50 | (...)... : String | Test.java:269:37:269:45 | element : String | provenance |  |
-| Test.java:2952:35:2952:50 | (...)... : String | Test.java:2952:14:2952:51 | newVectorWithElement(...) : Vector [<element>] : String | provenance | MaD:2 |
+| Test.java:2952:35:2952:50 | (...)... : String | Test.java:2952:14:2952:51 | newVectorWithElement(...) : Vector [<element>] : String | provenance | MaD:4 |
 | Test.java:2952:43:2952:50 | source(...) : Object | Test.java:2952:35:2952:50 | (...)... : String | provenance |  |
 | Test.java:2953:10:2953:44 | transformedList(...) : List [<element>] : String | Test.java:2954:20:2954:22 | out : List [<element>] : String | provenance |  |
-| Test.java:2953:36:2953:37 | in : Vector [<element>] : String | Test.java:2953:10:2953:44 | transformedList(...) : List [<element>] : String | provenance | MaD:593 |
+| Test.java:2953:36:2953:37 | in : Vector [<element>] : String | Test.java:2953:10:2953:44 | transformedList(...) : List [<element>] : String | provenance | MaD:668 |
 | Test.java:2954:20:2954:22 | out : List [<element>] : String | Test.java:230:19:230:32 | it : List [<element>] : String | provenance |  |
-| Test.java:2954:20:2954:22 | out : List [<element>] : String | Test.java:2954:9:2954:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:2954:20:2954:22 | out : List [<element>] : String | Test.java:2954:9:2954:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:2959:14:2959:51 | newVectorWithElement(...) : Vector [<element>] : String | Test.java:2960:26:2960:27 | in : Vector [<element>] : String | provenance |  |
 | Test.java:2959:35:2959:50 | (...)... : String | Test.java:269:37:269:45 | element : String | provenance |  |
-| Test.java:2959:35:2959:50 | (...)... : String | Test.java:2959:14:2959:51 | newVectorWithElement(...) : Vector [<element>] : String | provenance | MaD:2 |
+| Test.java:2959:35:2959:50 | (...)... : String | Test.java:2959:14:2959:51 | newVectorWithElement(...) : Vector [<element>] : String | provenance | MaD:4 |
 | Test.java:2959:43:2959:50 | source(...) : Object | Test.java:2959:35:2959:50 | (...)... : String | provenance |  |
 | Test.java:2960:10:2960:34 | union(...) : List [<element>] : String | Test.java:2961:20:2961:22 | out : List [<element>] : String | provenance |  |
-| Test.java:2960:26:2960:27 | in : Vector [<element>] : String | Test.java:2960:10:2960:34 | union(...) : List [<element>] : String | provenance | MaD:594 |
+| Test.java:2960:26:2960:27 | in : Vector [<element>] : String | Test.java:2960:10:2960:34 | union(...) : List [<element>] : String | provenance | MaD:669 |
 | Test.java:2961:20:2961:22 | out : List [<element>] : String | Test.java:230:19:230:32 | it : List [<element>] : String | provenance |  |
-| Test.java:2961:20:2961:22 | out : List [<element>] : String | Test.java:2961:9:2961:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:2961:20:2961:22 | out : List [<element>] : String | Test.java:2961:9:2961:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:2966:14:2966:51 | newVectorWithElement(...) : Vector [<element>] : String | Test.java:2967:32:2967:33 | in : Vector [<element>] : String | provenance |  |
 | Test.java:2966:35:2966:50 | (...)... : String | Test.java:269:37:269:45 | element : String | provenance |  |
-| Test.java:2966:35:2966:50 | (...)... : String | Test.java:2966:14:2966:51 | newVectorWithElement(...) : Vector [<element>] : String | provenance | MaD:2 |
+| Test.java:2966:35:2966:50 | (...)... : String | Test.java:2966:14:2966:51 | newVectorWithElement(...) : Vector [<element>] : String | provenance | MaD:4 |
 | Test.java:2966:43:2966:50 | source(...) : Object | Test.java:2966:35:2966:50 | (...)... : String | provenance |  |
 | Test.java:2967:10:2967:34 | union(...) : List [<element>] : String | Test.java:2968:20:2968:22 | out : List [<element>] : String | provenance |  |
-| Test.java:2967:32:2967:33 | in : Vector [<element>] : String | Test.java:2967:10:2967:34 | union(...) : List [<element>] : String | provenance | MaD:595 |
+| Test.java:2967:32:2967:33 | in : Vector [<element>] : String | Test.java:2967:10:2967:34 | union(...) : List [<element>] : String | provenance | MaD:670 |
 | Test.java:2968:20:2968:22 | out : List [<element>] : String | Test.java:230:19:230:32 | it : List [<element>] : String | provenance |  |
-| Test.java:2968:20:2968:22 | out : List [<element>] : String | Test.java:2968:9:2968:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:2968:20:2968:22 | out : List [<element>] : String | Test.java:2968:9:2968:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:2973:14:2973:51 | newVectorWithElement(...) : Vector [<element>] : String | Test.java:2974:37:2974:38 | in : Vector [<element>] : String | provenance |  |
 | Test.java:2973:35:2973:50 | (...)... : String | Test.java:269:37:269:45 | element : String | provenance |  |
-| Test.java:2973:35:2973:50 | (...)... : String | Test.java:2973:14:2973:51 | newVectorWithElement(...) : Vector [<element>] : String | provenance | MaD:2 |
+| Test.java:2973:35:2973:50 | (...)... : String | Test.java:2973:14:2973:51 | newVectorWithElement(...) : Vector [<element>] : String | provenance | MaD:4 |
 | Test.java:2973:43:2973:50 | source(...) : Object | Test.java:2973:35:2973:50 | (...)... : String | provenance |  |
 | Test.java:2974:10:2974:39 | unmodifiableList(...) : List [<element>] : String | Test.java:2975:20:2975:22 | out : List [<element>] : String | provenance |  |
-| Test.java:2974:37:2974:38 | in : Vector [<element>] : String | Test.java:2974:10:2974:39 | unmodifiableList(...) : List [<element>] : String | provenance | MaD:596 |
+| Test.java:2974:37:2974:38 | in : Vector [<element>] : String | Test.java:2974:10:2974:39 | unmodifiableList(...) : List [<element>] : String | provenance | MaD:671 |
 | Test.java:2975:20:2975:22 | out : List [<element>] : String | Test.java:230:19:230:32 | it : List [<element>] : String | provenance |  |
-| Test.java:2975:20:2975:22 | out : List [<element>] : String | Test.java:2975:9:2975:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:2975:20:2975:22 | out : List [<element>] : String | Test.java:2975:9:2975:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:2980:21:2980:55 | newOMIWithElement(...) : OrderedMapIterator [<element>] : String | Test.java:2981:10:2981:11 | in : OrderedMapIterator [<element>] : String | provenance |  |
 | Test.java:2980:39:2980:54 | (...)... : String | Test.java:283:53:283:57 | key : String | provenance |  |
-| Test.java:2980:39:2980:54 | (...)... : String | Test.java:2980:21:2980:55 | newOMIWithElement(...) : OrderedMapIterator [<element>] : String | provenance | MaD:14 |
-| Test.java:2980:39:2980:54 | (...)... : String | Test.java:2980:21:2980:55 | newOMIWithElement(...) : OrderedMapIterator [<element>] : String | provenance | MaD:705 |
+| Test.java:2980:39:2980:54 | (...)... : String | Test.java:2980:21:2980:55 | newOMIWithElement(...) : OrderedMapIterator [<element>] : String | provenance | MaD:19 |
+| Test.java:2980:39:2980:54 | (...)... : String | Test.java:2980:21:2980:55 | newOMIWithElement(...) : OrderedMapIterator [<element>] : String | provenance | MaD:779 |
 | Test.java:2980:47:2980:54 | source(...) : Object | Test.java:2980:39:2980:54 | (...)... : String | provenance |  |
-| Test.java:2981:10:2981:11 | in : OrderedMapIterator [<element>] : String | Test.java:2981:10:2981:20 | getKey(...) : String | provenance | MaD:597 |
+| Test.java:2981:10:2981:11 | in : OrderedMapIterator [<element>] : String | Test.java:2981:10:2981:20 | getKey(...) : String | provenance | MaD:672 |
 | Test.java:2981:10:2981:20 | getKey(...) : String | Test.java:2982:9:2982:11 | out | provenance |  |
 | Test.java:2987:21:2987:56 | newOMIWithMapValue(...) : OrderedMapIterator [<map.value>] : String | Test.java:2988:10:2988:11 | in : OrderedMapIterator [<map.value>] : String | provenance |  |
 | Test.java:2987:40:2987:55 | (...)... : String | Test.java:302:54:302:60 | value : String | provenance |  |
-| Test.java:2987:40:2987:55 | (...)... : String | Test.java:2987:21:2987:56 | newOMIWithMapValue(...) : OrderedMapIterator [<map.value>] : String | provenance | MaD:15 |
-| Test.java:2987:40:2987:55 | (...)... : String | Test.java:2987:21:2987:56 | newOMIWithMapValue(...) : OrderedMapIterator [<map.value>] : String | provenance | MaD:706 |
+| Test.java:2987:40:2987:55 | (...)... : String | Test.java:2987:21:2987:56 | newOMIWithMapValue(...) : OrderedMapIterator [<map.value>] : String | provenance | MaD:20 |
+| Test.java:2987:40:2987:55 | (...)... : String | Test.java:2987:21:2987:56 | newOMIWithMapValue(...) : OrderedMapIterator [<map.value>] : String | provenance | MaD:780 |
 | Test.java:2987:48:2987:55 | source(...) : Object | Test.java:2987:40:2987:55 | (...)... : String | provenance |  |
-| Test.java:2988:10:2988:11 | in : OrderedMapIterator [<map.value>] : String | Test.java:2988:10:2988:22 | getValue(...) : String | provenance | MaD:598 |
+| Test.java:2988:10:2988:11 | in : OrderedMapIterator [<map.value>] : String | Test.java:2988:10:2988:22 | getValue(...) : String | provenance | MaD:673 |
 | Test.java:2988:10:2988:22 | getValue(...) : String | Test.java:2989:9:2989:11 | out | provenance |  |
 | Test.java:2994:16:2994:23 | source(...) : Object | Test.java:2995:17:2995:18 | in : Object | provenance |  |
 | Test.java:2995:4:2995:6 | out [post update] : MapIterator [<map.value>] : Object | Test.java:2996:21:2996:23 | out : MapIterator [<map.value>] : Object | provenance |  |
-| Test.java:2995:17:2995:18 | in : Object | Test.java:2995:4:2995:6 | out [post update] : MapIterator [<map.value>] : Object | provenance | MaD:600 |
+| Test.java:2995:17:2995:18 | in : Object | Test.java:2995:4:2995:6 | out [post update] : MapIterator [<map.value>] : Object | provenance | MaD:674 |
 | Test.java:2996:21:2996:23 | out : MapIterator [<map.value>] : Object | Test.java:246:20:246:47 | mapIterator : MapIterator [<map.value>] : Object | provenance |  |
-| Test.java:2996:21:2996:23 | out : MapIterator [<map.value>] : Object | Test.java:2996:9:2996:24 | getMapValue(...) | provenance | MaD:598 |
+| Test.java:2996:21:2996:23 | out : MapIterator [<map.value>] : Object | Test.java:2996:9:2996:24 | getMapValue(...) | provenance | MaD:673 |
 | Test.java:3001:21:3001:56 | newOMIWithMapValue(...) : OrderedMapIterator [<map.value>] : String | Test.java:3002:10:3002:11 | in : OrderedMapIterator [<map.value>] : String | provenance |  |
 | Test.java:3001:40:3001:55 | (...)... : String | Test.java:302:54:302:60 | value : String | provenance |  |
-| Test.java:3001:40:3001:55 | (...)... : String | Test.java:3001:21:3001:56 | newOMIWithMapValue(...) : OrderedMapIterator [<map.value>] : String | provenance | MaD:15 |
-| Test.java:3001:40:3001:55 | (...)... : String | Test.java:3001:21:3001:56 | newOMIWithMapValue(...) : OrderedMapIterator [<map.value>] : String | provenance | MaD:706 |
+| Test.java:3001:40:3001:55 | (...)... : String | Test.java:3001:21:3001:56 | newOMIWithMapValue(...) : OrderedMapIterator [<map.value>] : String | provenance | MaD:20 |
+| Test.java:3001:40:3001:55 | (...)... : String | Test.java:3001:21:3001:56 | newOMIWithMapValue(...) : OrderedMapIterator [<map.value>] : String | provenance | MaD:780 |
 | Test.java:3001:48:3001:55 | source(...) : Object | Test.java:3001:40:3001:55 | (...)... : String | provenance |  |
-| Test.java:3002:10:3002:11 | in : OrderedMapIterator [<map.value>] : String | Test.java:3002:10:3002:26 | setValue(...) : String | provenance | MaD:599 |
+| Test.java:3002:10:3002:11 | in : OrderedMapIterator [<map.value>] : String | Test.java:3002:10:3002:26 | setValue(...) : String | provenance | MaD:675 |
 | Test.java:3002:10:3002:26 | setValue(...) : String | Test.java:3003:9:3003:11 | out | provenance |  |
 | Test.java:3008:18:3008:53 | newMVMWithMapValue(...) : MultiValueMap [<map.value>, <element>] : String | Test.java:3009:22:3009:23 | in : MultiValueMap [<map.value>, <element>] : String | provenance |  |
 | Test.java:3008:18:3008:53 | newMVMWithMapValue(...) : MultiValueMap [<map.value>] : String | Test.java:3009:22:3009:23 | in : MultiValueMap [<map.value>] : String | provenance |  |
 | Test.java:3008:37:3008:52 | (...)... : String | Test.java:298:49:298:55 | value : String | provenance |  |
-| Test.java:3008:37:3008:52 | (...)... : String | Test.java:3008:18:3008:53 | newMVMWithMapValue(...) : MultiValueMap [<map.value>, <element>] : String | provenance | MaD:662 |
-| Test.java:3008:37:3008:52 | (...)... : String | Test.java:3008:18:3008:53 | newMVMWithMapValue(...) : MultiValueMap [<map.value>] : String | provenance | MaD:15 |
-| Test.java:3008:37:3008:52 | (...)... : String | Test.java:3008:18:3008:53 | newMVMWithMapValue(...) : MultiValueMap [<map.value>] : String | provenance | MaD:706 |
+| Test.java:3008:37:3008:52 | (...)... : String | Test.java:3008:18:3008:53 | newMVMWithMapValue(...) : MultiValueMap [<map.value>, <element>] : String | provenance | MaD:737 |
+| Test.java:3008:37:3008:52 | (...)... : String | Test.java:3008:18:3008:53 | newMVMWithMapValue(...) : MultiValueMap [<map.value>] : String | provenance | MaD:20 |
+| Test.java:3008:37:3008:52 | (...)... : String | Test.java:3008:18:3008:53 | newMVMWithMapValue(...) : MultiValueMap [<map.value>] : String | provenance | MaD:780 |
 | Test.java:3008:45:3008:52 | source(...) : Object | Test.java:3008:37:3008:52 | (...)... : String | provenance |  |
 | Test.java:3009:10:3009:33 | (...)... : Collection [<element>] : Object | Test.java:3010:20:3010:22 | out : Collection [<element>] : Object | provenance |  |
 | Test.java:3009:10:3009:33 | (...)... : Collection [<element>] : String | Test.java:3010:20:3010:22 | out : Collection [<element>] : String | provenance |  |
-| Test.java:3009:22:3009:23 | in : MultiValueMap [<map.value>, <element>] : String | Test.java:3009:22:3009:33 | get(...) : Object [<element>] : String | provenance | MaD:9 |
-| Test.java:3009:22:3009:23 | in : MultiValueMap [<map.value>, <element>] : String | Test.java:3009:22:3009:33 | get(...) : Object [<element>] : String | provenance | MaD:483 |
-| Test.java:3009:22:3009:23 | in : MultiValueMap [<map.value>, <element>] : String | Test.java:3009:22:3009:33 | get(...) : Object [<element>] : String | provenance | MaD:660 |
-| Test.java:3009:22:3009:23 | in : MultiValueMap [<map.value>] : String | Test.java:3009:22:3009:33 | get(...) : Object [<element>] : Object | provenance | MaD:660 |
+| Test.java:3009:22:3009:23 | in : MultiValueMap [<map.value>, <element>] : String | Test.java:3009:22:3009:33 | get(...) : Object [<element>] : String | provenance | MaD:17 |
+| Test.java:3009:22:3009:23 | in : MultiValueMap [<map.value>, <element>] : String | Test.java:3009:22:3009:33 | get(...) : Object [<element>] : String | provenance | MaD:558 |
+| Test.java:3009:22:3009:23 | in : MultiValueMap [<map.value>, <element>] : String | Test.java:3009:22:3009:33 | get(...) : Object [<element>] : String | provenance | MaD:735 |
+| Test.java:3009:22:3009:23 | in : MultiValueMap [<map.value>] : String | Test.java:3009:22:3009:33 | get(...) : Object [<element>] : Object | provenance | MaD:735 |
 | Test.java:3009:22:3009:33 | get(...) : Object [<element>] : Object | Test.java:3009:10:3009:33 | (...)... : Collection [<element>] : Object | provenance |  |
 | Test.java:3009:22:3009:33 | get(...) : Object [<element>] : String | Test.java:3009:10:3009:33 | (...)... : Collection [<element>] : String | provenance |  |
 | Test.java:3010:20:3010:22 | out : Collection [<element>] : Object | Test.java:230:19:230:32 | it : Collection [<element>] : Object | provenance |  |
-| Test.java:3010:20:3010:22 | out : Collection [<element>] : Object | Test.java:3010:9:3010:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:3010:20:3010:22 | out : Collection [<element>] : Object | Test.java:3010:9:3010:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:3010:20:3010:22 | out : Collection [<element>] : String | Test.java:230:19:230:32 | it : Collection [<element>] : String | provenance |  |
-| Test.java:3010:20:3010:22 | out : Collection [<element>] : String | Test.java:3010:9:3010:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:3010:20:3010:22 | out : Collection [<element>] : String | Test.java:3010:9:3010:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:3015:16:3015:23 | source(...) : Object | Test.java:3016:12:3016:13 | in : Object | provenance |  |
 | Test.java:3016:4:3016:6 | out [post update] : MultiValueMap [<map.key>] : Object | Test.java:3017:19:3017:21 | out : MultiValueMap [<map.key>] : Object | provenance |  |
-| Test.java:3016:12:3016:13 | in : Object | Test.java:3016:4:3016:6 | out [post update] : MultiValueMap [<map.key>] : Object | provenance | MaD:14 |
-| Test.java:3016:12:3016:13 | in : Object | Test.java:3016:4:3016:6 | out [post update] : MultiValueMap [<map.key>] : Object | provenance | MaD:661 |
-| Test.java:3016:12:3016:13 | in : Object | Test.java:3016:4:3016:6 | out [post update] : MultiValueMap [<map.key>] : Object | provenance | MaD:705 |
+| Test.java:3016:12:3016:13 | in : Object | Test.java:3016:4:3016:6 | out [post update] : MultiValueMap [<map.key>] : Object | provenance | MaD:19 |
+| Test.java:3016:12:3016:13 | in : Object | Test.java:3016:4:3016:6 | out [post update] : MultiValueMap [<map.key>] : Object | provenance | MaD:736 |
+| Test.java:3016:12:3016:13 | in : Object | Test.java:3016:4:3016:6 | out [post update] : MultiValueMap [<map.key>] : Object | provenance | MaD:779 |
 | Test.java:3017:19:3017:21 | out : MultiValueMap [<map.key>] : Object | Test.java:228:18:228:29 | map : MultiValueMap [<map.key>] : Object | provenance |  |
-| Test.java:3017:19:3017:21 | out : MultiValueMap [<map.key>] : Object | Test.java:3017:9:3017:22 | getMapKey(...) | provenance | MaD:10 |
+| Test.java:3017:19:3017:21 | out : MultiValueMap [<map.key>] : Object | Test.java:3017:9:3017:22 | getMapKey(...) | provenance | MaD:18 |
 | Test.java:3022:16:3022:23 | source(...) : Object | Test.java:3023:12:3023:13 | in : Object | provenance |  |
 | Test.java:3023:4:3023:6 | out [post update] : MultiMap [<map.key>] : Object | Test.java:3024:19:3024:21 | out : MultiMap [<map.key>] : Object | provenance |  |
-| Test.java:3023:12:3023:13 | in : Object | Test.java:3023:4:3023:6 | out [post update] : MultiMap [<map.key>] : Object | provenance | MaD:14 |
-| Test.java:3023:12:3023:13 | in : Object | Test.java:3023:4:3023:6 | out [post update] : MultiMap [<map.key>] : Object | provenance | MaD:661 |
-| Test.java:3023:12:3023:13 | in : Object | Test.java:3023:4:3023:6 | out [post update] : MultiMap [<map.key>] : Object | provenance | MaD:705 |
+| Test.java:3023:12:3023:13 | in : Object | Test.java:3023:4:3023:6 | out [post update] : MultiMap [<map.key>] : Object | provenance | MaD:19 |
+| Test.java:3023:12:3023:13 | in : Object | Test.java:3023:4:3023:6 | out [post update] : MultiMap [<map.key>] : Object | provenance | MaD:736 |
+| Test.java:3023:12:3023:13 | in : Object | Test.java:3023:4:3023:6 | out [post update] : MultiMap [<map.key>] : Object | provenance | MaD:779 |
 | Test.java:3024:19:3024:21 | out : MultiMap [<map.key>] : Object | Test.java:228:18:228:29 | map : MultiMap [<map.key>] : Object | provenance |  |
-| Test.java:3024:19:3024:21 | out : MultiMap [<map.key>] : Object | Test.java:3024:9:3024:22 | getMapKey(...) | provenance | MaD:10 |
+| Test.java:3024:19:3024:21 | out : MultiMap [<map.key>] : Object | Test.java:3024:9:3024:22 | getMapKey(...) | provenance | MaD:18 |
 | Test.java:3029:16:3029:23 | source(...) : Object | Test.java:3030:18:3030:19 | in : Object | provenance |  |
 | Test.java:3030:4:3030:6 | out [post update] : MultiValueMap [<map.value>, <element>] : Object | Test.java:3031:44:3031:46 | out : MultiValueMap [<map.value>, <element>] : Object | provenance |  |
 | Test.java:3030:4:3030:6 | out [post update] : MultiValueMap [<map.value>] : Object | Test.java:3031:44:3031:46 | out : MultiValueMap [<map.value>] : Object | provenance |  |
-| Test.java:3030:18:3030:19 | in : Object | Test.java:3030:4:3030:6 | out [post update] : MultiValueMap [<map.value>, <element>] : Object | provenance | MaD:662 |
-| Test.java:3030:18:3030:19 | in : Object | Test.java:3030:4:3030:6 | out [post update] : MultiValueMap [<map.value>] : Object | provenance | MaD:15 |
-| Test.java:3030:18:3030:19 | in : Object | Test.java:3030:4:3030:6 | out [post update] : MultiValueMap [<map.value>] : Object | provenance | MaD:706 |
+| Test.java:3030:18:3030:19 | in : Object | Test.java:3030:4:3030:6 | out [post update] : MultiValueMap [<map.value>, <element>] : Object | provenance | MaD:737 |
+| Test.java:3030:18:3030:19 | in : Object | Test.java:3030:4:3030:6 | out [post update] : MultiValueMap [<map.value>] : Object | provenance | MaD:20 |
+| Test.java:3030:18:3030:19 | in : Object | Test.java:3030:4:3030:6 | out [post update] : MultiValueMap [<map.value>] : Object | provenance | MaD:780 |
 | Test.java:3031:20:3031:47 | (...)... : Collection | Test.java:230:19:230:32 | it : Collection | provenance |  |
-| Test.java:3031:20:3031:47 | (...)... : Collection | Test.java:3031:9:3031:48 | getElement(...) | provenance | MaD:1 |
+| Test.java:3031:20:3031:47 | (...)... : Collection | Test.java:3031:9:3031:48 | getElement(...) | provenance | MaD:3 |
 | Test.java:3031:20:3031:47 | (...)... : Collection [<element>] : Object | Test.java:230:19:230:32 | it : Collection [<element>] : Object | provenance |  |
-| Test.java:3031:20:3031:47 | (...)... : Collection [<element>] : Object | Test.java:3031:9:3031:48 | getElement(...) | provenance | MaD:1 |
+| Test.java:3031:20:3031:47 | (...)... : Collection [<element>] : Object | Test.java:3031:9:3031:48 | getElement(...) | provenance | MaD:3 |
 | Test.java:3031:32:3031:47 | getMapValue(...) : Object | Test.java:3031:20:3031:47 | (...)... : Collection | provenance |  |
 | Test.java:3031:32:3031:47 | getMapValue(...) : Object [<element>] : Object | Test.java:3031:20:3031:47 | (...)... : Collection [<element>] : Object | provenance |  |
 | Test.java:3031:44:3031:46 | out : MultiValueMap [<map.value>, <element>] : Object | Test.java:232:20:232:31 | map : MultiValueMap [<map.value>, <element>] : Object | provenance |  |
-| Test.java:3031:44:3031:46 | out : MultiValueMap [<map.value>, <element>] : Object | Test.java:3031:32:3031:47 | getMapValue(...) : Object [<element>] : Object | provenance | MaD:9 |
+| Test.java:3031:44:3031:46 | out : MultiValueMap [<map.value>, <element>] : Object | Test.java:3031:32:3031:47 | getMapValue(...) : Object [<element>] : Object | provenance | MaD:17 |
 | Test.java:3031:44:3031:46 | out : MultiValueMap [<map.value>] : Object | Test.java:232:20:232:31 | map : MultiValueMap [<map.value>] : Object | provenance |  |
-| Test.java:3031:44:3031:46 | out : MultiValueMap [<map.value>] : Object | Test.java:3031:32:3031:47 | getMapValue(...) : Object | provenance | MaD:9 |
+| Test.java:3031:44:3031:46 | out : MultiValueMap [<map.value>] : Object | Test.java:3031:32:3031:47 | getMapValue(...) : Object | provenance | MaD:17 |
 | Test.java:3036:16:3036:23 | source(...) : Object | Test.java:3037:18:3037:19 | in : Object | provenance |  |
 | Test.java:3037:4:3037:6 | out [post update] : MultiMap [<map.value>, <element>] : Object | Test.java:3038:44:3038:46 | out : MultiMap [<map.value>, <element>] : Object | provenance |  |
 | Test.java:3037:4:3037:6 | out [post update] : MultiMap [<map.value>] : Object | Test.java:3038:44:3038:46 | out : MultiMap [<map.value>] : Object | provenance |  |
-| Test.java:3037:18:3037:19 | in : Object | Test.java:3037:4:3037:6 | out [post update] : MultiMap [<map.value>, <element>] : Object | provenance | MaD:662 |
-| Test.java:3037:18:3037:19 | in : Object | Test.java:3037:4:3037:6 | out [post update] : MultiMap [<map.value>] : Object | provenance | MaD:15 |
-| Test.java:3037:18:3037:19 | in : Object | Test.java:3037:4:3037:6 | out [post update] : MultiMap [<map.value>] : Object | provenance | MaD:706 |
+| Test.java:3037:18:3037:19 | in : Object | Test.java:3037:4:3037:6 | out [post update] : MultiMap [<map.value>, <element>] : Object | provenance | MaD:737 |
+| Test.java:3037:18:3037:19 | in : Object | Test.java:3037:4:3037:6 | out [post update] : MultiMap [<map.value>] : Object | provenance | MaD:20 |
+| Test.java:3037:18:3037:19 | in : Object | Test.java:3037:4:3037:6 | out [post update] : MultiMap [<map.value>] : Object | provenance | MaD:780 |
 | Test.java:3038:20:3038:47 | (...)... : Collection | Test.java:230:19:230:32 | it : Collection | provenance |  |
-| Test.java:3038:20:3038:47 | (...)... : Collection | Test.java:3038:9:3038:48 | getElement(...) | provenance | MaD:1 |
+| Test.java:3038:20:3038:47 | (...)... : Collection | Test.java:3038:9:3038:48 | getElement(...) | provenance | MaD:3 |
 | Test.java:3038:20:3038:47 | (...)... : Collection [<element>] : Object | Test.java:230:19:230:32 | it : Collection [<element>] : Object | provenance |  |
-| Test.java:3038:20:3038:47 | (...)... : Collection [<element>] : Object | Test.java:3038:9:3038:48 | getElement(...) | provenance | MaD:1 |
+| Test.java:3038:20:3038:47 | (...)... : Collection [<element>] : Object | Test.java:3038:9:3038:48 | getElement(...) | provenance | MaD:3 |
 | Test.java:3038:32:3038:47 | getMapValue(...) : Object | Test.java:3038:20:3038:47 | (...)... : Collection | provenance |  |
 | Test.java:3038:32:3038:47 | getMapValue(...) : Object [<element>] : Object | Test.java:3038:20:3038:47 | (...)... : Collection [<element>] : Object | provenance |  |
 | Test.java:3038:44:3038:46 | out : MultiMap [<map.value>, <element>] : Object | Test.java:232:20:232:31 | map : MultiMap [<map.value>, <element>] : Object | provenance |  |
-| Test.java:3038:44:3038:46 | out : MultiMap [<map.value>, <element>] : Object | Test.java:3038:32:3038:47 | getMapValue(...) : Object [<element>] : Object | provenance | MaD:9 |
+| Test.java:3038:44:3038:46 | out : MultiMap [<map.value>, <element>] : Object | Test.java:3038:32:3038:47 | getMapValue(...) : Object [<element>] : Object | provenance | MaD:17 |
 | Test.java:3038:44:3038:46 | out : MultiMap [<map.value>] : Object | Test.java:232:20:232:31 | map : MultiMap [<map.value>] : Object | provenance |  |
-| Test.java:3038:44:3038:46 | out : MultiMap [<map.value>] : Object | Test.java:3038:32:3038:47 | getMapValue(...) : Object | provenance | MaD:9 |
+| Test.java:3038:44:3038:46 | out : MultiMap [<map.value>] : Object | Test.java:3038:32:3038:47 | getMapValue(...) : Object | provenance | MaD:17 |
 | Test.java:3043:23:3043:58 | newMVMWithMapValue(...) : MultiValueMap [<map.value>, <element>] : String | Test.java:3044:10:3044:11 | in : MultiValueMap [<map.value>, <element>] : String | provenance |  |
 | Test.java:3043:23:3043:58 | newMVMWithMapValue(...) : MultiValueMap [<map.value>] : String | Test.java:3044:10:3044:11 | in : MultiValueMap [<map.value>] : String | provenance |  |
 | Test.java:3043:42:3043:57 | (...)... : String | Test.java:298:49:298:55 | value : String | provenance |  |
-| Test.java:3043:42:3043:57 | (...)... : String | Test.java:3043:23:3043:58 | newMVMWithMapValue(...) : MultiValueMap [<map.value>, <element>] : String | provenance | MaD:662 |
-| Test.java:3043:42:3043:57 | (...)... : String | Test.java:3043:23:3043:58 | newMVMWithMapValue(...) : MultiValueMap [<map.value>] : String | provenance | MaD:15 |
-| Test.java:3043:42:3043:57 | (...)... : String | Test.java:3043:23:3043:58 | newMVMWithMapValue(...) : MultiValueMap [<map.value>] : String | provenance | MaD:706 |
+| Test.java:3043:42:3043:57 | (...)... : String | Test.java:3043:23:3043:58 | newMVMWithMapValue(...) : MultiValueMap [<map.value>, <element>] : String | provenance | MaD:737 |
+| Test.java:3043:42:3043:57 | (...)... : String | Test.java:3043:23:3043:58 | newMVMWithMapValue(...) : MultiValueMap [<map.value>] : String | provenance | MaD:20 |
+| Test.java:3043:42:3043:57 | (...)... : String | Test.java:3043:23:3043:58 | newMVMWithMapValue(...) : MultiValueMap [<map.value>] : String | provenance | MaD:780 |
 | Test.java:3043:50:3043:57 | source(...) : Object | Test.java:3043:42:3043:57 | (...)... : String | provenance |  |
-| Test.java:3044:10:3044:11 | in : MultiValueMap [<map.value>, <element>] : String | Test.java:3044:10:3044:20 | values(...) : Collection [<element>] : String | provenance | MaD:357 |
-| Test.java:3044:10:3044:11 | in : MultiValueMap [<map.value>, <element>] : String | Test.java:3044:10:3044:20 | values(...) : Collection [<element>] : String | provenance | MaD:663 |
-| Test.java:3044:10:3044:11 | in : MultiValueMap [<map.value>] : String | Test.java:3044:10:3044:20 | values(...) : Collection [<element>] : Object | provenance | MaD:357 |
-| Test.java:3044:10:3044:11 | in : MultiValueMap [<map.value>] : String | Test.java:3044:10:3044:20 | values(...) : Collection [<element>] : Object | provenance | MaD:663 |
-| Test.java:3044:10:3044:11 | in : MultiValueMap [<map.value>] : String | Test.java:3044:10:3044:20 | values(...) : Collection [<element>] : String | provenance | MaD:19 |
-| Test.java:3044:10:3044:11 | in : MultiValueMap [<map.value>] : String | Test.java:3044:10:3044:20 | values(...) : Collection [<element>] : String | provenance | MaD:486 |
+| Test.java:3044:10:3044:11 | in : MultiValueMap [<map.value>, <element>] : String | Test.java:3044:10:3044:20 | values(...) : Collection [<element>] : String | provenance | MaD:359 |
+| Test.java:3044:10:3044:11 | in : MultiValueMap [<map.value>, <element>] : String | Test.java:3044:10:3044:20 | values(...) : Collection [<element>] : String | provenance | MaD:738 |
+| Test.java:3044:10:3044:11 | in : MultiValueMap [<map.value>] : String | Test.java:3044:10:3044:20 | values(...) : Collection [<element>] : Object | provenance | MaD:359 |
+| Test.java:3044:10:3044:11 | in : MultiValueMap [<map.value>] : String | Test.java:3044:10:3044:20 | values(...) : Collection [<element>] : Object | provenance | MaD:738 |
+| Test.java:3044:10:3044:11 | in : MultiValueMap [<map.value>] : String | Test.java:3044:10:3044:20 | values(...) : Collection [<element>] : String | provenance | MaD:25 |
+| Test.java:3044:10:3044:11 | in : MultiValueMap [<map.value>] : String | Test.java:3044:10:3044:20 | values(...) : Collection [<element>] : String | provenance | MaD:561 |
 | Test.java:3044:10:3044:20 | values(...) : Collection [<element>] : Object | Test.java:3045:20:3045:22 | out : Collection [<element>] : Object | provenance |  |
 | Test.java:3044:10:3044:20 | values(...) : Collection [<element>] : String | Test.java:3045:20:3045:22 | out : Collection [<element>] : String | provenance |  |
 | Test.java:3045:20:3045:22 | out : Collection [<element>] : Object | Test.java:230:19:230:32 | it : Collection [<element>] : Object | provenance |  |
-| Test.java:3045:20:3045:22 | out : Collection [<element>] : Object | Test.java:3045:9:3045:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:3045:20:3045:22 | out : Collection [<element>] : Object | Test.java:3045:9:3045:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:3045:20:3045:22 | out : Collection [<element>] : String | Test.java:230:19:230:32 | it : Collection [<element>] : String | provenance |  |
-| Test.java:3045:20:3045:22 | out : Collection [<element>] : String | Test.java:3045:9:3045:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:3045:20:3045:22 | out : Collection [<element>] : String | Test.java:3045:9:3045:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:3050:18:3050:53 | newMVMWithMapValue(...) : MultiValueMap [<map.value>, <element>] : String | Test.java:3051:10:3051:11 | in : MultiValueMap [<map.value>, <element>] : String | provenance |  |
 | Test.java:3050:18:3050:53 | newMVMWithMapValue(...) : MultiValueMap [<map.value>] : String | Test.java:3051:10:3051:11 | in : MultiValueMap [<map.value>] : String | provenance |  |
 | Test.java:3050:37:3050:52 | (...)... : String | Test.java:298:49:298:55 | value : String | provenance |  |
-| Test.java:3050:37:3050:52 | (...)... : String | Test.java:3050:18:3050:53 | newMVMWithMapValue(...) : MultiValueMap [<map.value>, <element>] : String | provenance | MaD:662 |
-| Test.java:3050:37:3050:52 | (...)... : String | Test.java:3050:18:3050:53 | newMVMWithMapValue(...) : MultiValueMap [<map.value>] : String | provenance | MaD:15 |
-| Test.java:3050:37:3050:52 | (...)... : String | Test.java:3050:18:3050:53 | newMVMWithMapValue(...) : MultiValueMap [<map.value>] : String | provenance | MaD:706 |
+| Test.java:3050:37:3050:52 | (...)... : String | Test.java:3050:18:3050:53 | newMVMWithMapValue(...) : MultiValueMap [<map.value>, <element>] : String | provenance | MaD:737 |
+| Test.java:3050:37:3050:52 | (...)... : String | Test.java:3050:18:3050:53 | newMVMWithMapValue(...) : MultiValueMap [<map.value>] : String | provenance | MaD:20 |
+| Test.java:3050:37:3050:52 | (...)... : String | Test.java:3050:18:3050:53 | newMVMWithMapValue(...) : MultiValueMap [<map.value>] : String | provenance | MaD:780 |
 | Test.java:3050:45:3050:52 | source(...) : Object | Test.java:3050:37:3050:52 | (...)... : String | provenance |  |
-| Test.java:3051:10:3051:11 | in : MultiValueMap [<map.value>, <element>] : String | Test.java:3051:10:3051:20 | values(...) : Collection [<element>] : String | provenance | MaD:663 |
-| Test.java:3051:10:3051:11 | in : MultiValueMap [<map.value>] : String | Test.java:3051:10:3051:20 | values(...) : Collection [<element>] : Object | provenance | MaD:663 |
-| Test.java:3051:10:3051:11 | in : MultiValueMap [<map.value>] : String | Test.java:3051:10:3051:20 | values(...) : Collection [<element>] : String | provenance | MaD:19 |
-| Test.java:3051:10:3051:11 | in : MultiValueMap [<map.value>] : String | Test.java:3051:10:3051:20 | values(...) : Collection [<element>] : String | provenance | MaD:486 |
+| Test.java:3051:10:3051:11 | in : MultiValueMap [<map.value>, <element>] : String | Test.java:3051:10:3051:20 | values(...) : Collection [<element>] : String | provenance | MaD:738 |
+| Test.java:3051:10:3051:11 | in : MultiValueMap [<map.value>] : String | Test.java:3051:10:3051:20 | values(...) : Collection [<element>] : Object | provenance | MaD:738 |
+| Test.java:3051:10:3051:11 | in : MultiValueMap [<map.value>] : String | Test.java:3051:10:3051:20 | values(...) : Collection [<element>] : String | provenance | MaD:25 |
+| Test.java:3051:10:3051:11 | in : MultiValueMap [<map.value>] : String | Test.java:3051:10:3051:20 | values(...) : Collection [<element>] : String | provenance | MaD:561 |
 | Test.java:3051:10:3051:20 | values(...) : Collection [<element>] : Object | Test.java:3052:20:3052:22 | out : Collection [<element>] : Object | provenance |  |
 | Test.java:3051:10:3051:20 | values(...) : Collection [<element>] : String | Test.java:3052:20:3052:22 | out : Collection [<element>] : String | provenance |  |
 | Test.java:3052:20:3052:22 | out : Collection [<element>] : Object | Test.java:230:19:230:32 | it : Collection [<element>] : Object | provenance |  |
-| Test.java:3052:20:3052:22 | out : Collection [<element>] : Object | Test.java:3052:9:3052:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:3052:20:3052:22 | out : Collection [<element>] : Object | Test.java:3052:9:3052:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:3052:20:3052:22 | out : Collection [<element>] : String | Test.java:230:19:230:32 | it : Collection [<element>] : String | provenance |  |
-| Test.java:3052:20:3052:22 | out : Collection [<element>] : String | Test.java:3052:9:3052:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:3052:20:3052:22 | out : Collection [<element>] : String | Test.java:3052:9:3052:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:3057:24:3057:47 | (...)... : MultiValuedMap | Test.java:3058:36:3058:37 | in : MultiValuedMap | provenance |  |
 | Test.java:3057:40:3057:47 | source(...) : Object | Test.java:3057:24:3057:47 | (...)... : MultiValuedMap | provenance |  |
 | Test.java:3058:10:3058:38 | emptyIfNull(...) : MultiValuedMap | Test.java:3059:9:3059:11 | out | provenance |  |
-| Test.java:3058:36:3058:37 | in : MultiValuedMap | Test.java:3058:10:3058:38 | emptyIfNull(...) : MultiValuedMap | provenance | MaD:664 |
+| Test.java:3058:36:3058:37 | in : MultiValuedMap | Test.java:3058:10:3058:38 | emptyIfNull(...) : MultiValuedMap | provenance | MaD:739 |
 | Test.java:3064:24:3064:59 | newALVHMWithMapKey(...) : ArrayListValuedHashMap [<map.key>] : String | Test.java:3065:10:3065:11 | in : ArrayListValuedHashMap [<map.key>] : String | provenance |  |
 | Test.java:3064:43:3064:58 | (...)... : String | Test.java:272:58:272:62 | key : String | provenance |  |
-| Test.java:3064:43:3064:58 | (...)... : String | Test.java:3064:24:3064:59 | newALVHMWithMapKey(...) : ArrayListValuedHashMap [<map.key>] : String | provenance | MaD:689 |
+| Test.java:3064:43:3064:58 | (...)... : String | Test.java:3064:24:3064:59 | newALVHMWithMapKey(...) : ArrayListValuedHashMap [<map.key>] : String | provenance | MaD:764 |
 | Test.java:3064:51:3064:58 | source(...) : Object | Test.java:3064:43:3064:58 | (...)... : String | provenance |  |
-| Test.java:3065:10:3065:11 | in : ArrayListValuedHashMap [<map.key>] : String | Test.java:3065:10:3065:21 | entries(...) : Collection [<element>, <map.key>] : String | provenance | MaD:682 |
+| Test.java:3065:10:3065:11 | in : ArrayListValuedHashMap [<map.key>] : String | Test.java:3065:10:3065:21 | entries(...) : Collection [<element>, <map.key>] : String | provenance | MaD:757 |
 | Test.java:3065:10:3065:21 | entries(...) : Collection [<element>, <map.key>] : String | Test.java:3066:39:3066:41 | out : Collection [<element>, <map.key>] : String | provenance |  |
 | Test.java:3066:28:3066:42 | getElement(...) : Entry [<map.key>] : String | Test.java:238:27:238:50 | container : Entry [<map.key>] : String | provenance |  |
-| Test.java:3066:28:3066:42 | getElement(...) : Entry [<map.key>] : String | Test.java:3066:9:3066:43 | getMapKeyFromEntry(...) | provenance | MaD:20 |
+| Test.java:3066:28:3066:42 | getElement(...) : Entry [<map.key>] : String | Test.java:3066:9:3066:43 | getMapKeyFromEntry(...) | provenance | MaD:9 |
 | Test.java:3066:39:3066:41 | out : Collection [<element>, <map.key>] : String | Test.java:230:19:230:32 | it : Collection [<element>, <map.key>] : String | provenance |  |
-| Test.java:3066:39:3066:41 | out : Collection [<element>, <map.key>] : String | Test.java:3066:28:3066:42 | getElement(...) : Entry [<map.key>] : String | provenance | MaD:1 |
+| Test.java:3066:39:3066:41 | out : Collection [<element>, <map.key>] : String | Test.java:3066:28:3066:42 | getElement(...) : Entry [<map.key>] : String | provenance | MaD:3 |
 | Test.java:3071:24:3071:61 | newALVHMWithMapValue(...) : ArrayListValuedHashMap [<map.value>, <element>] : String | Test.java:3072:10:3072:11 | in : ArrayListValuedHashMap [<map.value>, <element>] : String | provenance |  |
 | Test.java:3071:45:3071:60 | (...)... : String | Test.java:290:60:290:66 | value : String | provenance |  |
-| Test.java:3071:45:3071:60 | (...)... : String | Test.java:3071:24:3071:61 | newALVHMWithMapValue(...) : ArrayListValuedHashMap [<map.value>, <element>] : String | provenance | MaD:690 |
+| Test.java:3071:45:3071:60 | (...)... : String | Test.java:3071:24:3071:61 | newALVHMWithMapValue(...) : ArrayListValuedHashMap [<map.value>, <element>] : String | provenance | MaD:765 |
 | Test.java:3071:53:3071:60 | source(...) : Object | Test.java:3071:45:3071:60 | (...)... : String | provenance |  |
-| Test.java:3072:10:3072:11 | in : ArrayListValuedHashMap [<map.value>, <element>] : String | Test.java:3072:10:3072:21 | entries(...) : Collection [<element>, <map.value>] : String | provenance | MaD:683 |
+| Test.java:3072:10:3072:11 | in : ArrayListValuedHashMap [<map.value>, <element>] : String | Test.java:3072:10:3072:21 | entries(...) : Collection [<element>, <map.value>] : String | provenance | MaD:758 |
 | Test.java:3072:10:3072:21 | entries(...) : Collection [<element>, <map.value>] : String | Test.java:3073:41:3073:43 | out : Collection [<element>, <map.value>] : String | provenance |  |
 | Test.java:3073:30:3073:44 | getElement(...) : Entry [<map.value>] : String | Test.java:244:29:244:52 | container : Entry [<map.value>] : String | provenance |  |
-| Test.java:3073:30:3073:44 | getElement(...) : Entry [<map.value>] : String | Test.java:3073:9:3073:45 | getMapValueFromEntry(...) | provenance | MaD:21 |
+| Test.java:3073:30:3073:44 | getElement(...) : Entry [<map.value>] : String | Test.java:3073:9:3073:45 | getMapValueFromEntry(...) | provenance | MaD:10 |
 | Test.java:3073:41:3073:43 | out : Collection [<element>, <map.value>] : String | Test.java:230:19:230:32 | it : Collection [<element>, <map.value>] : String | provenance |  |
-| Test.java:3073:41:3073:43 | out : Collection [<element>, <map.value>] : String | Test.java:3073:30:3073:44 | getElement(...) : Entry [<map.value>] : String | provenance | MaD:1 |
+| Test.java:3073:41:3073:43 | out : Collection [<element>, <map.value>] : String | Test.java:3073:30:3073:44 | getElement(...) : Entry [<map.value>] : String | provenance | MaD:3 |
 | Test.java:3078:24:3078:61 | newALVHMWithMapValue(...) : ArrayListValuedHashMap [<map.value>, <element>] : String | Test.java:3079:38:3079:39 | in : ArrayListValuedHashMap [<map.value>, <element>] : String | provenance |  |
 | Test.java:3078:45:3078:60 | (...)... : String | Test.java:290:60:290:66 | value : String | provenance |  |
-| Test.java:3078:45:3078:60 | (...)... : String | Test.java:3078:24:3078:61 | newALVHMWithMapValue(...) : ArrayListValuedHashMap [<map.value>, <element>] : String | provenance | MaD:690 |
+| Test.java:3078:45:3078:60 | (...)... : String | Test.java:3078:24:3078:61 | newALVHMWithMapValue(...) : ArrayListValuedHashMap [<map.value>, <element>] : String | provenance | MaD:765 |
 | Test.java:3078:53:3078:60 | source(...) : Object | Test.java:3078:45:3078:60 | (...)... : String | provenance |  |
 | Test.java:3079:10:3079:46 | getCollection(...) : Collection [<element>] : String | Test.java:3080:20:3080:22 | out : Collection [<element>] : String | provenance |  |
-| Test.java:3079:38:3079:39 | in : ArrayListValuedHashMap [<map.value>, <element>] : String | Test.java:3079:10:3079:46 | getCollection(...) : Collection [<element>] : String | provenance | MaD:665 |
+| Test.java:3079:38:3079:39 | in : ArrayListValuedHashMap [<map.value>, <element>] : String | Test.java:3079:10:3079:46 | getCollection(...) : Collection [<element>] : String | provenance | MaD:740 |
 | Test.java:3080:20:3080:22 | out : Collection [<element>] : String | Test.java:230:19:230:32 | it : Collection [<element>] : String | provenance |  |
-| Test.java:3080:20:3080:22 | out : Collection [<element>] : String | Test.java:3080:9:3080:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:3080:20:3080:22 | out : Collection [<element>] : String | Test.java:3080:9:3080:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:3085:24:3085:61 | newALVHMWithMapValue(...) : ArrayListValuedHashMap [<map.value>, <element>] : String | Test.java:3086:39:3086:40 | in : ArrayListValuedHashMap [<map.value>, <element>] : String | provenance |  |
 | Test.java:3085:45:3085:60 | (...)... : String | Test.java:290:60:290:66 | value : String | provenance |  |
-| Test.java:3085:45:3085:60 | (...)... : String | Test.java:3085:24:3085:61 | newALVHMWithMapValue(...) : ArrayListValuedHashMap [<map.value>, <element>] : String | provenance | MaD:690 |
+| Test.java:3085:45:3085:60 | (...)... : String | Test.java:3085:24:3085:61 | newALVHMWithMapValue(...) : ArrayListValuedHashMap [<map.value>, <element>] : String | provenance | MaD:765 |
 | Test.java:3085:53:3085:60 | source(...) : Object | Test.java:3085:45:3085:60 | (...)... : String | provenance |  |
 | Test.java:3086:10:3086:47 | getValuesAsBag(...) : Bag [<element>] : String | Test.java:3087:20:3087:22 | out : Bag [<element>] : String | provenance |  |
-| Test.java:3086:39:3086:40 | in : ArrayListValuedHashMap [<map.value>, <element>] : String | Test.java:3086:10:3086:47 | getValuesAsBag(...) : Bag [<element>] : String | provenance | MaD:666 |
+| Test.java:3086:39:3086:40 | in : ArrayListValuedHashMap [<map.value>, <element>] : String | Test.java:3086:10:3086:47 | getValuesAsBag(...) : Bag [<element>] : String | provenance | MaD:741 |
 | Test.java:3087:20:3087:22 | out : Bag [<element>] : String | Test.java:230:19:230:32 | it : Bag [<element>] : String | provenance |  |
-| Test.java:3087:20:3087:22 | out : Bag [<element>] : String | Test.java:3087:9:3087:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:3087:20:3087:22 | out : Bag [<element>] : String | Test.java:3087:9:3087:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:3092:24:3092:61 | newALVHMWithMapValue(...) : ArrayListValuedHashMap [<map.value>, <element>] : String | Test.java:3093:40:3093:41 | in : ArrayListValuedHashMap [<map.value>, <element>] : String | provenance |  |
 | Test.java:3092:45:3092:60 | (...)... : String | Test.java:290:60:290:66 | value : String | provenance |  |
-| Test.java:3092:45:3092:60 | (...)... : String | Test.java:3092:24:3092:61 | newALVHMWithMapValue(...) : ArrayListValuedHashMap [<map.value>, <element>] : String | provenance | MaD:690 |
+| Test.java:3092:45:3092:60 | (...)... : String | Test.java:3092:24:3092:61 | newALVHMWithMapValue(...) : ArrayListValuedHashMap [<map.value>, <element>] : String | provenance | MaD:765 |
 | Test.java:3092:53:3092:60 | source(...) : Object | Test.java:3092:45:3092:60 | (...)... : String | provenance |  |
 | Test.java:3093:10:3093:48 | getValuesAsList(...) : List [<element>] : String | Test.java:3094:20:3094:22 | out : List [<element>] : String | provenance |  |
-| Test.java:3093:40:3093:41 | in : ArrayListValuedHashMap [<map.value>, <element>] : String | Test.java:3093:10:3093:48 | getValuesAsList(...) : List [<element>] : String | provenance | MaD:667 |
+| Test.java:3093:40:3093:41 | in : ArrayListValuedHashMap [<map.value>, <element>] : String | Test.java:3093:10:3093:48 | getValuesAsList(...) : List [<element>] : String | provenance | MaD:742 |
 | Test.java:3094:20:3094:22 | out : List [<element>] : String | Test.java:230:19:230:32 | it : List [<element>] : String | provenance |  |
-| Test.java:3094:20:3094:22 | out : List [<element>] : String | Test.java:3094:9:3094:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:3094:20:3094:22 | out : List [<element>] : String | Test.java:3094:9:3094:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:3099:24:3099:61 | newALVHMWithMapValue(...) : ArrayListValuedHashMap [<map.value>, <element>] : String | Test.java:3100:39:3100:40 | in : ArrayListValuedHashMap [<map.value>, <element>] : String | provenance |  |
 | Test.java:3099:45:3099:60 | (...)... : String | Test.java:290:60:290:66 | value : String | provenance |  |
-| Test.java:3099:45:3099:60 | (...)... : String | Test.java:3099:24:3099:61 | newALVHMWithMapValue(...) : ArrayListValuedHashMap [<map.value>, <element>] : String | provenance | MaD:690 |
+| Test.java:3099:45:3099:60 | (...)... : String | Test.java:3099:24:3099:61 | newALVHMWithMapValue(...) : ArrayListValuedHashMap [<map.value>, <element>] : String | provenance | MaD:765 |
 | Test.java:3099:53:3099:60 | source(...) : Object | Test.java:3099:45:3099:60 | (...)... : String | provenance |  |
 | Test.java:3100:10:3100:47 | getValuesAsSet(...) : Set [<element>] : String | Test.java:3101:20:3101:22 | out : Set [<element>] : String | provenance |  |
-| Test.java:3100:39:3100:40 | in : ArrayListValuedHashMap [<map.value>, <element>] : String | Test.java:3100:10:3100:47 | getValuesAsSet(...) : Set [<element>] : String | provenance | MaD:668 |
+| Test.java:3100:39:3100:40 | in : ArrayListValuedHashMap [<map.value>, <element>] : String | Test.java:3100:10:3100:47 | getValuesAsSet(...) : Set [<element>] : String | provenance | MaD:743 |
 | Test.java:3101:20:3101:22 | out : Set [<element>] : String | Test.java:230:19:230:32 | it : Set [<element>] : String | provenance |  |
-| Test.java:3101:20:3101:22 | out : Set [<element>] : String | Test.java:3101:9:3101:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:3101:20:3101:22 | out : Set [<element>] : String | Test.java:3101:9:3101:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:3106:24:3106:59 | newALVHMWithMapKey(...) : ArrayListValuedHashMap [<map.key>] : String | Test.java:3107:50:3107:51 | in : ArrayListValuedHashMap [<map.key>] : String | provenance |  |
 | Test.java:3106:43:3106:58 | (...)... : String | Test.java:272:58:272:62 | key : String | provenance |  |
-| Test.java:3106:43:3106:58 | (...)... : String | Test.java:3106:24:3106:59 | newALVHMWithMapKey(...) : ArrayListValuedHashMap [<map.key>] : String | provenance | MaD:689 |
+| Test.java:3106:43:3106:58 | (...)... : String | Test.java:3106:24:3106:59 | newALVHMWithMapKey(...) : ArrayListValuedHashMap [<map.key>] : String | provenance | MaD:764 |
 | Test.java:3106:51:3106:58 | source(...) : Object | Test.java:3106:43:3106:58 | (...)... : String | provenance |  |
 | Test.java:3107:10:3107:64 | transformedMultiValuedMap(...) : MultiValuedMap [<map.key>] : String | Test.java:3108:19:3108:21 | out : MultiValuedMap [<map.key>] : String | provenance |  |
-| Test.java:3107:50:3107:51 | in : ArrayListValuedHashMap [<map.key>] : String | Test.java:3107:10:3107:64 | transformedMultiValuedMap(...) : MultiValuedMap [<map.key>] : String | provenance | MaD:669 |
+| Test.java:3107:50:3107:51 | in : ArrayListValuedHashMap [<map.key>] : String | Test.java:3107:10:3107:64 | transformedMultiValuedMap(...) : MultiValuedMap [<map.key>] : String | provenance | MaD:744 |
 | Test.java:3108:19:3108:21 | out : MultiValuedMap [<map.key>] : String | Test.java:240:18:240:46 | container : MultiValuedMap [<map.key>] : String | provenance |  |
-| Test.java:3108:19:3108:21 | out : MultiValuedMap [<map.key>] : String | Test.java:3108:9:3108:22 | getMapKey(...) | provenance | MaD:685 |
+| Test.java:3108:19:3108:21 | out : MultiValuedMap [<map.key>] : String | Test.java:3108:9:3108:22 | getMapKey(...) | provenance | MaD:760 |
 | Test.java:3113:24:3113:61 | newALVHMWithMapValue(...) : ArrayListValuedHashMap [<map.value>, <element>] : String | Test.java:3114:50:3114:51 | in : ArrayListValuedHashMap [<map.value>, <element>] : String | provenance |  |
 | Test.java:3113:45:3113:60 | (...)... : String | Test.java:290:60:290:66 | value : String | provenance |  |
-| Test.java:3113:45:3113:60 | (...)... : String | Test.java:3113:24:3113:61 | newALVHMWithMapValue(...) : ArrayListValuedHashMap [<map.value>, <element>] : String | provenance | MaD:690 |
+| Test.java:3113:45:3113:60 | (...)... : String | Test.java:3113:24:3113:61 | newALVHMWithMapValue(...) : ArrayListValuedHashMap [<map.value>, <element>] : String | provenance | MaD:765 |
 | Test.java:3113:53:3113:60 | source(...) : Object | Test.java:3113:45:3113:60 | (...)... : String | provenance |  |
 | Test.java:3114:10:3114:64 | transformedMultiValuedMap(...) : MultiValuedMap [<map.value>, <element>] : String | Test.java:3115:32:3115:34 | out : MultiValuedMap [<map.value>, <element>] : String | provenance |  |
-| Test.java:3114:50:3114:51 | in : ArrayListValuedHashMap [<map.value>, <element>] : String | Test.java:3114:10:3114:64 | transformedMultiValuedMap(...) : MultiValuedMap [<map.value>, <element>] : String | provenance | MaD:670 |
+| Test.java:3114:50:3114:51 | in : ArrayListValuedHashMap [<map.value>, <element>] : String | Test.java:3114:10:3114:64 | transformedMultiValuedMap(...) : MultiValuedMap [<map.value>, <element>] : String | provenance | MaD:745 |
 | Test.java:3115:20:3115:35 | getMapValue(...) : Collection [<element>] : String | Test.java:230:19:230:32 | it : Collection [<element>] : String | provenance |  |
-| Test.java:3115:20:3115:35 | getMapValue(...) : Collection [<element>] : String | Test.java:3115:9:3115:36 | getElement(...) | provenance | MaD:1 |
+| Test.java:3115:20:3115:35 | getMapValue(...) : Collection [<element>] : String | Test.java:3115:9:3115:36 | getElement(...) | provenance | MaD:3 |
 | Test.java:3115:32:3115:34 | out : MultiValuedMap [<map.value>, <element>] : String | Test.java:247:32:247:60 | container : MultiValuedMap [<map.value>, <element>] : String | provenance |  |
-| Test.java:3115:32:3115:34 | out : MultiValuedMap [<map.value>, <element>] : String | Test.java:3115:20:3115:35 | getMapValue(...) : Collection [<element>] : String | provenance | MaD:684 |
+| Test.java:3115:32:3115:34 | out : MultiValuedMap [<map.value>, <element>] : String | Test.java:3115:20:3115:35 | getMapValue(...) : Collection [<element>] : String | provenance | MaD:759 |
 | Test.java:3120:24:3120:59 | newALVHMWithMapKey(...) : ArrayListValuedHashMap [<map.key>] : String | Test.java:3121:51:3121:52 | in : ArrayListValuedHashMap [<map.key>] : String | provenance |  |
 | Test.java:3120:43:3120:58 | (...)... : String | Test.java:272:58:272:62 | key : String | provenance |  |
-| Test.java:3120:43:3120:58 | (...)... : String | Test.java:3120:24:3120:59 | newALVHMWithMapKey(...) : ArrayListValuedHashMap [<map.key>] : String | provenance | MaD:689 |
+| Test.java:3120:43:3120:58 | (...)... : String | Test.java:3120:24:3120:59 | newALVHMWithMapKey(...) : ArrayListValuedHashMap [<map.key>] : String | provenance | MaD:764 |
 | Test.java:3120:51:3120:58 | source(...) : Object | Test.java:3120:43:3120:58 | (...)... : String | provenance |  |
 | Test.java:3121:10:3121:53 | unmodifiableMultiValuedMap(...) : MultiValuedMap [<map.key>] : String | Test.java:3122:19:3122:21 | out : MultiValuedMap [<map.key>] : String | provenance |  |
-| Test.java:3121:51:3121:52 | in : ArrayListValuedHashMap [<map.key>] : String | Test.java:3121:10:3121:53 | unmodifiableMultiValuedMap(...) : MultiValuedMap [<map.key>] : String | provenance | MaD:671 |
+| Test.java:3121:51:3121:52 | in : ArrayListValuedHashMap [<map.key>] : String | Test.java:3121:10:3121:53 | unmodifiableMultiValuedMap(...) : MultiValuedMap [<map.key>] : String | provenance | MaD:746 |
 | Test.java:3122:19:3122:21 | out : MultiValuedMap [<map.key>] : String | Test.java:240:18:240:46 | container : MultiValuedMap [<map.key>] : String | provenance |  |
-| Test.java:3122:19:3122:21 | out : MultiValuedMap [<map.key>] : String | Test.java:3122:9:3122:22 | getMapKey(...) | provenance | MaD:685 |
+| Test.java:3122:19:3122:21 | out : MultiValuedMap [<map.key>] : String | Test.java:3122:9:3122:22 | getMapKey(...) | provenance | MaD:760 |
 | Test.java:3127:24:3127:61 | newALVHMWithMapValue(...) : ArrayListValuedHashMap [<map.value>, <element>] : String | Test.java:3128:51:3128:52 | in : ArrayListValuedHashMap [<map.value>, <element>] : String | provenance |  |
 | Test.java:3127:45:3127:60 | (...)... : String | Test.java:290:60:290:66 | value : String | provenance |  |
-| Test.java:3127:45:3127:60 | (...)... : String | Test.java:3127:24:3127:61 | newALVHMWithMapValue(...) : ArrayListValuedHashMap [<map.value>, <element>] : String | provenance | MaD:690 |
+| Test.java:3127:45:3127:60 | (...)... : String | Test.java:3127:24:3127:61 | newALVHMWithMapValue(...) : ArrayListValuedHashMap [<map.value>, <element>] : String | provenance | MaD:765 |
 | Test.java:3127:53:3127:60 | source(...) : Object | Test.java:3127:45:3127:60 | (...)... : String | provenance |  |
 | Test.java:3128:10:3128:53 | unmodifiableMultiValuedMap(...) : MultiValuedMap [<map.value>, <element>] : String | Test.java:3129:32:3129:34 | out : MultiValuedMap [<map.value>, <element>] : String | provenance |  |
-| Test.java:3128:51:3128:52 | in : ArrayListValuedHashMap [<map.value>, <element>] : String | Test.java:3128:10:3128:53 | unmodifiableMultiValuedMap(...) : MultiValuedMap [<map.value>, <element>] : String | provenance | MaD:672 |
+| Test.java:3128:51:3128:52 | in : ArrayListValuedHashMap [<map.value>, <element>] : String | Test.java:3128:10:3128:53 | unmodifiableMultiValuedMap(...) : MultiValuedMap [<map.value>, <element>] : String | provenance | MaD:747 |
 | Test.java:3129:20:3129:35 | getMapValue(...) : Collection [<element>] : String | Test.java:230:19:230:32 | it : Collection [<element>] : String | provenance |  |
-| Test.java:3129:20:3129:35 | getMapValue(...) : Collection [<element>] : String | Test.java:3129:9:3129:36 | getElement(...) | provenance | MaD:1 |
+| Test.java:3129:20:3129:35 | getMapValue(...) : Collection [<element>] : String | Test.java:3129:9:3129:36 | getElement(...) | provenance | MaD:3 |
 | Test.java:3129:32:3129:34 | out : MultiValuedMap [<map.value>, <element>] : String | Test.java:247:32:247:60 | container : MultiValuedMap [<map.value>, <element>] : String | provenance |  |
-| Test.java:3129:32:3129:34 | out : MultiValuedMap [<map.value>, <element>] : String | Test.java:3129:20:3129:35 | getMapValue(...) : Collection [<element>] : String | provenance | MaD:684 |
+| Test.java:3129:32:3129:34 | out : MultiValuedMap [<map.value>, <element>] : String | Test.java:3129:20:3129:35 | getMapValue(...) : Collection [<element>] : String | provenance | MaD:759 |
 | Test.java:3134:24:3134:68 | newMultiSetEntryWithElement(...) : Entry [<element>] : String | Test.java:3135:10:3135:11 | in : Entry [<element>] : String | provenance |  |
 | Test.java:3134:52:3134:67 | (...)... : String | Test.java:262:52:262:60 | element : String | provenance |  |
-| Test.java:3134:52:3134:67 | (...)... : String | Test.java:3134:24:3134:68 | newMultiSetEntryWithElement(...) : Entry [<element>] : String | provenance | MaD:2 |
-| Test.java:3134:52:3134:67 | (...)... : String | Test.java:3134:24:3134:68 | newMultiSetEntryWithElement(...) : Entry [<element>] : String | provenance | MaD:673 |
+| Test.java:3134:52:3134:67 | (...)... : String | Test.java:3134:24:3134:68 | newMultiSetEntryWithElement(...) : Entry [<element>] : String | provenance | MaD:4 |
+| Test.java:3134:52:3134:67 | (...)... : String | Test.java:3134:24:3134:68 | newMultiSetEntryWithElement(...) : Entry [<element>] : String | provenance | MaD:749 |
 | Test.java:3134:60:3134:67 | source(...) : Object | Test.java:3134:52:3134:67 | (...)... : String | provenance |  |
-| Test.java:3135:10:3135:11 | in : Entry [<element>] : String | Test.java:3135:10:3135:24 | getElement(...) : String | provenance | MaD:676 |
+| Test.java:3135:10:3135:11 | in : Entry [<element>] : String | Test.java:3135:10:3135:24 | getElement(...) : String | provenance | MaD:748 |
 | Test.java:3135:10:3135:24 | getElement(...) : String | Test.java:3136:9:3136:11 | out | provenance |  |
 | Test.java:3141:16:3141:23 | source(...) : Object | Test.java:3142:12:3142:13 | in : Object | provenance |  |
 | Test.java:3142:4:3142:6 | out [post update] : MultiSet [<element>] : Object | Test.java:3143:20:3143:22 | out : MultiSet [<element>] : Object | provenance |  |
-| Test.java:3142:12:3142:13 | in : Object | Test.java:3142:4:3142:6 | out [post update] : MultiSet [<element>] : Object | provenance | MaD:673 |
+| Test.java:3142:12:3142:13 | in : Object | Test.java:3142:4:3142:6 | out [post update] : MultiSet [<element>] : Object | provenance | MaD:749 |
 | Test.java:3143:20:3143:22 | out : MultiSet [<element>] : Object | Test.java:230:19:230:32 | it : MultiSet [<element>] : Object | provenance |  |
-| Test.java:3143:20:3143:22 | out : MultiSet [<element>] : Object | Test.java:3143:9:3143:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:3143:20:3143:22 | out : MultiSet [<element>] : Object | Test.java:3143:9:3143:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:3148:16:3148:23 | source(...) : Object | Test.java:3149:12:3149:13 | in : Object | provenance |  |
 | Test.java:3149:4:3149:6 | out [post update] : MultiSet [<element>] : Object | Test.java:3150:20:3150:22 | out : MultiSet [<element>] : Object | provenance |  |
-| Test.java:3149:12:3149:13 | in : Object | Test.java:3149:4:3149:6 | out [post update] : MultiSet [<element>] : Object | provenance | MaD:2 |
-| Test.java:3149:12:3149:13 | in : Object | Test.java:3149:4:3149:6 | out [post update] : MultiSet [<element>] : Object | provenance | MaD:673 |
+| Test.java:3149:12:3149:13 | in : Object | Test.java:3149:4:3149:6 | out [post update] : MultiSet [<element>] : Object | provenance | MaD:4 |
+| Test.java:3149:12:3149:13 | in : Object | Test.java:3149:4:3149:6 | out [post update] : MultiSet [<element>] : Object | provenance | MaD:749 |
 | Test.java:3150:20:3150:22 | out : MultiSet [<element>] : Object | Test.java:230:19:230:32 | it : MultiSet [<element>] : Object | provenance |  |
-| Test.java:3150:20:3150:22 | out : MultiSet [<element>] : Object | Test.java:3150:9:3150:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:3150:20:3150:22 | out : MultiSet [<element>] : Object | Test.java:3150:9:3150:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:3155:18:3155:57 | newMultiSetWithElement(...) : HashMultiSet [<element>] : String | Test.java:3156:10:3156:11 | in : HashMultiSet [<element>] : String | provenance |  |
 | Test.java:3155:41:3155:56 | (...)... : String | Test.java:263:41:263:49 | element : String | provenance |  |
-| Test.java:3155:41:3155:56 | (...)... : String | Test.java:3155:18:3155:57 | newMultiSetWithElement(...) : HashMultiSet [<element>] : String | provenance | MaD:2 |
-| Test.java:3155:41:3155:56 | (...)... : String | Test.java:3155:18:3155:57 | newMultiSetWithElement(...) : HashMultiSet [<element>] : String | provenance | MaD:673 |
+| Test.java:3155:41:3155:56 | (...)... : String | Test.java:3155:18:3155:57 | newMultiSetWithElement(...) : HashMultiSet [<element>] : String | provenance | MaD:4 |
+| Test.java:3155:41:3155:56 | (...)... : String | Test.java:3155:18:3155:57 | newMultiSetWithElement(...) : HashMultiSet [<element>] : String | provenance | MaD:749 |
 | Test.java:3155:49:3155:56 | source(...) : Object | Test.java:3155:41:3155:56 | (...)... : String | provenance |  |
-| Test.java:3156:10:3156:11 | in : HashMultiSet [<element>] : String | Test.java:3156:10:3156:22 | entrySet(...) : Set [<element>, <element>] : String | provenance | MaD:674 |
+| Test.java:3156:10:3156:11 | in : HashMultiSet [<element>] : String | Test.java:3156:10:3156:22 | entrySet(...) : Set [<element>, <element>] : String | provenance | MaD:750 |
 | Test.java:3156:10:3156:22 | entrySet(...) : Set [<element>, <element>] : String | Test.java:3157:31:3157:33 | out : Set [<element>, <element>] : String | provenance |  |
 | Test.java:3157:20:3157:34 | getElement(...) : Entry [<element>] : String | Test.java:235:19:235:45 | container : Entry [<element>] : String | provenance |  |
-| Test.java:3157:20:3157:34 | getElement(...) : Entry [<element>] : String | Test.java:3157:9:3157:35 | getElement(...) | provenance | MaD:676 |
+| Test.java:3157:20:3157:34 | getElement(...) : Entry [<element>] : String | Test.java:3157:9:3157:35 | getElement(...) | provenance | MaD:748 |
 | Test.java:3157:31:3157:33 | out : Set [<element>, <element>] : String | Test.java:230:19:230:32 | it : Set [<element>, <element>] : String | provenance |  |
-| Test.java:3157:31:3157:33 | out : Set [<element>, <element>] : String | Test.java:3157:20:3157:34 | getElement(...) : Entry [<element>] : String | provenance | MaD:1 |
+| Test.java:3157:31:3157:33 | out : Set [<element>, <element>] : String | Test.java:3157:20:3157:34 | getElement(...) : Entry [<element>] : String | provenance | MaD:3 |
 | Test.java:3162:18:3162:57 | newMultiSetWithElement(...) : HashMultiSet [<element>] : String | Test.java:3163:10:3163:11 | in : HashMultiSet [<element>] : String | provenance |  |
 | Test.java:3162:41:3162:56 | (...)... : String | Test.java:263:41:263:49 | element : String | provenance |  |
-| Test.java:3162:41:3162:56 | (...)... : String | Test.java:3162:18:3162:57 | newMultiSetWithElement(...) : HashMultiSet [<element>] : String | provenance | MaD:2 |
-| Test.java:3162:41:3162:56 | (...)... : String | Test.java:3162:18:3162:57 | newMultiSetWithElement(...) : HashMultiSet [<element>] : String | provenance | MaD:673 |
+| Test.java:3162:41:3162:56 | (...)... : String | Test.java:3162:18:3162:57 | newMultiSetWithElement(...) : HashMultiSet [<element>] : String | provenance | MaD:4 |
+| Test.java:3162:41:3162:56 | (...)... : String | Test.java:3162:18:3162:57 | newMultiSetWithElement(...) : HashMultiSet [<element>] : String | provenance | MaD:749 |
 | Test.java:3162:49:3162:56 | source(...) : Object | Test.java:3162:41:3162:56 | (...)... : String | provenance |  |
-| Test.java:3163:10:3163:11 | in : HashMultiSet [<element>] : String | Test.java:3163:10:3163:23 | uniqueSet(...) : Set [<element>] : String | provenance | MaD:675 |
+| Test.java:3163:10:3163:11 | in : HashMultiSet [<element>] : String | Test.java:3163:10:3163:23 | uniqueSet(...) : Set [<element>] : String | provenance | MaD:751 |
 | Test.java:3163:10:3163:23 | uniqueSet(...) : Set [<element>] : String | Test.java:3164:20:3164:22 | out : Set [<element>] : String | provenance |  |
 | Test.java:3164:20:3164:22 | out : Set [<element>] : String | Test.java:230:19:230:32 | it : Set [<element>] : String | provenance |  |
-| Test.java:3164:20:3164:22 | out : Set [<element>] : String | Test.java:3164:9:3164:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:3164:20:3164:22 | out : Set [<element>] : String | Test.java:3164:9:3164:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:3169:18:3169:57 | newMultiSetWithElement(...) : HashMultiSet [<element>] : String | Test.java:3170:43:3170:44 | in : HashMultiSet [<element>] : String | provenance |  |
 | Test.java:3169:41:3169:56 | (...)... : String | Test.java:263:41:263:49 | element : String | provenance |  |
-| Test.java:3169:41:3169:56 | (...)... : String | Test.java:3169:18:3169:57 | newMultiSetWithElement(...) : HashMultiSet [<element>] : String | provenance | MaD:2 |
-| Test.java:3169:41:3169:56 | (...)... : String | Test.java:3169:18:3169:57 | newMultiSetWithElement(...) : HashMultiSet [<element>] : String | provenance | MaD:673 |
+| Test.java:3169:41:3169:56 | (...)... : String | Test.java:3169:18:3169:57 | newMultiSetWithElement(...) : HashMultiSet [<element>] : String | provenance | MaD:4 |
+| Test.java:3169:41:3169:56 | (...)... : String | Test.java:3169:18:3169:57 | newMultiSetWithElement(...) : HashMultiSet [<element>] : String | provenance | MaD:749 |
 | Test.java:3169:49:3169:56 | source(...) : Object | Test.java:3169:41:3169:56 | (...)... : String | provenance |  |
 | Test.java:3170:10:3170:51 | predicatedMultiSet(...) : MultiSet [<element>] : String | Test.java:3171:20:3171:22 | out : MultiSet [<element>] : String | provenance |  |
-| Test.java:3170:43:3170:44 | in : HashMultiSet [<element>] : String | Test.java:3170:10:3170:51 | predicatedMultiSet(...) : MultiSet [<element>] : String | provenance | MaD:677 |
+| Test.java:3170:43:3170:44 | in : HashMultiSet [<element>] : String | Test.java:3170:10:3170:51 | predicatedMultiSet(...) : MultiSet [<element>] : String | provenance | MaD:752 |
 | Test.java:3171:20:3171:22 | out : MultiSet [<element>] : String | Test.java:230:19:230:32 | it : MultiSet [<element>] : String | provenance |  |
-| Test.java:3171:20:3171:22 | out : MultiSet [<element>] : String | Test.java:3171:9:3171:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:3171:20:3171:22 | out : MultiSet [<element>] : String | Test.java:3171:9:3171:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:3176:18:3176:57 | newMultiSetWithElement(...) : HashMultiSet [<element>] : String | Test.java:3177:45:3177:46 | in : HashMultiSet [<element>] : String | provenance |  |
 | Test.java:3176:41:3176:56 | (...)... : String | Test.java:263:41:263:49 | element : String | provenance |  |
-| Test.java:3176:41:3176:56 | (...)... : String | Test.java:3176:18:3176:57 | newMultiSetWithElement(...) : HashMultiSet [<element>] : String | provenance | MaD:2 |
-| Test.java:3176:41:3176:56 | (...)... : String | Test.java:3176:18:3176:57 | newMultiSetWithElement(...) : HashMultiSet [<element>] : String | provenance | MaD:673 |
+| Test.java:3176:41:3176:56 | (...)... : String | Test.java:3176:18:3176:57 | newMultiSetWithElement(...) : HashMultiSet [<element>] : String | provenance | MaD:4 |
+| Test.java:3176:41:3176:56 | (...)... : String | Test.java:3176:18:3176:57 | newMultiSetWithElement(...) : HashMultiSet [<element>] : String | provenance | MaD:749 |
 | Test.java:3176:49:3176:56 | source(...) : Object | Test.java:3176:41:3176:56 | (...)... : String | provenance |  |
 | Test.java:3177:10:3177:47 | synchronizedMultiSet(...) : MultiSet [<element>] : String | Test.java:3178:20:3178:22 | out : MultiSet [<element>] : String | provenance |  |
-| Test.java:3177:45:3177:46 | in : HashMultiSet [<element>] : String | Test.java:3177:10:3177:47 | synchronizedMultiSet(...) : MultiSet [<element>] : String | provenance | MaD:678 |
+| Test.java:3177:45:3177:46 | in : HashMultiSet [<element>] : String | Test.java:3177:10:3177:47 | synchronizedMultiSet(...) : MultiSet [<element>] : String | provenance | MaD:753 |
 | Test.java:3178:20:3178:22 | out : MultiSet [<element>] : String | Test.java:230:19:230:32 | it : MultiSet [<element>] : String | provenance |  |
-| Test.java:3178:20:3178:22 | out : MultiSet [<element>] : String | Test.java:3178:9:3178:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:3178:20:3178:22 | out : MultiSet [<element>] : String | Test.java:3178:9:3178:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:3183:18:3183:57 | newMultiSetWithElement(...) : HashMultiSet [<element>] : String | Test.java:3184:45:3184:46 | in : HashMultiSet [<element>] : String | provenance |  |
 | Test.java:3183:41:3183:56 | (...)... : String | Test.java:263:41:263:49 | element : String | provenance |  |
-| Test.java:3183:41:3183:56 | (...)... : String | Test.java:3183:18:3183:57 | newMultiSetWithElement(...) : HashMultiSet [<element>] : String | provenance | MaD:2 |
-| Test.java:3183:41:3183:56 | (...)... : String | Test.java:3183:18:3183:57 | newMultiSetWithElement(...) : HashMultiSet [<element>] : String | provenance | MaD:673 |
+| Test.java:3183:41:3183:56 | (...)... : String | Test.java:3183:18:3183:57 | newMultiSetWithElement(...) : HashMultiSet [<element>] : String | provenance | MaD:4 |
+| Test.java:3183:41:3183:56 | (...)... : String | Test.java:3183:18:3183:57 | newMultiSetWithElement(...) : HashMultiSet [<element>] : String | provenance | MaD:749 |
 | Test.java:3183:49:3183:56 | source(...) : Object | Test.java:3183:41:3183:56 | (...)... : String | provenance |  |
 | Test.java:3184:10:3184:47 | unmodifiableMultiSet(...) : MultiSet [<element>] : String | Test.java:3185:20:3185:22 | out : MultiSet [<element>] : String | provenance |  |
-| Test.java:3184:45:3184:46 | in : HashMultiSet [<element>] : String | Test.java:3184:10:3184:47 | unmodifiableMultiSet(...) : MultiSet [<element>] : String | provenance | MaD:679 |
+| Test.java:3184:45:3184:46 | in : HashMultiSet [<element>] : String | Test.java:3184:10:3184:47 | unmodifiableMultiSet(...) : MultiSet [<element>] : String | provenance | MaD:754 |
 | Test.java:3185:20:3185:22 | out : MultiSet [<element>] : String | Test.java:230:19:230:32 | it : MultiSet [<element>] : String | provenance |  |
-| Test.java:3185:20:3185:22 | out : MultiSet [<element>] : String | Test.java:3185:9:3185:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:3185:20:3185:22 | out : MultiSet [<element>] : String | Test.java:3185:9:3185:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:3190:24:3190:61 | newALVHMWithMapValue(...) : ArrayListValuedHashMap [<map.value>, <element>] : String | Test.java:3191:10:3191:11 | in : ArrayListValuedHashMap [<map.value>, <element>] : String | provenance |  |
 | Test.java:3190:45:3190:60 | (...)... : String | Test.java:290:60:290:66 | value : String | provenance |  |
-| Test.java:3190:45:3190:60 | (...)... : String | Test.java:3190:24:3190:61 | newALVHMWithMapValue(...) : ArrayListValuedHashMap [<map.value>, <element>] : String | provenance | MaD:690 |
+| Test.java:3190:45:3190:60 | (...)... : String | Test.java:3190:24:3190:61 | newALVHMWithMapValue(...) : ArrayListValuedHashMap [<map.value>, <element>] : String | provenance | MaD:765 |
 | Test.java:3190:53:3190:60 | source(...) : Object | Test.java:3190:45:3190:60 | (...)... : String | provenance |  |
-| Test.java:3191:10:3191:11 | in : ArrayListValuedHashMap [<map.value>, <element>] : String | Test.java:3191:10:3191:19 | asMap(...) : Map [<map.value>, <element>] : String | provenance | MaD:681 |
+| Test.java:3191:10:3191:11 | in : ArrayListValuedHashMap [<map.value>, <element>] : String | Test.java:3191:10:3191:19 | asMap(...) : Map [<map.value>, <element>] : String | provenance | MaD:756 |
 | Test.java:3191:10:3191:19 | asMap(...) : Map [<map.value>, <element>] : String | Test.java:3192:44:3192:46 | out : Map [<map.value>, <element>] : String | provenance |  |
 | Test.java:3192:20:3192:47 | (...)... : Collection [<element>] : String | Test.java:230:19:230:32 | it : Collection [<element>] : String | provenance |  |
-| Test.java:3192:20:3192:47 | (...)... : Collection [<element>] : String | Test.java:3192:9:3192:48 | getElement(...) | provenance | MaD:1 |
+| Test.java:3192:20:3192:47 | (...)... : Collection [<element>] : String | Test.java:3192:9:3192:48 | getElement(...) | provenance | MaD:3 |
 | Test.java:3192:32:3192:47 | getMapValue(...) : Object [<element>] : String | Test.java:3192:20:3192:47 | (...)... : Collection [<element>] : String | provenance |  |
 | Test.java:3192:44:3192:46 | out : Map [<map.value>, <element>] : String | Test.java:232:20:232:31 | map : Map [<map.value>, <element>] : String | provenance |  |
-| Test.java:3192:44:3192:46 | out : Map [<map.value>, <element>] : String | Test.java:3192:32:3192:47 | getMapValue(...) : Object [<element>] : String | provenance | MaD:9 |
+| Test.java:3192:44:3192:46 | out : Map [<map.value>, <element>] : String | Test.java:3192:32:3192:47 | getMapValue(...) : Object [<element>] : String | provenance | MaD:17 |
 | Test.java:3197:24:3197:59 | newALVHMWithMapKey(...) : ArrayListValuedHashMap [<map.key>] : String | Test.java:3198:10:3198:11 | in : ArrayListValuedHashMap [<map.key>] : String | provenance |  |
 | Test.java:3197:43:3197:58 | (...)... : String | Test.java:272:58:272:62 | key : String | provenance |  |
-| Test.java:3197:43:3197:58 | (...)... : String | Test.java:3197:24:3197:59 | newALVHMWithMapKey(...) : ArrayListValuedHashMap [<map.key>] : String | provenance | MaD:689 |
+| Test.java:3197:43:3197:58 | (...)... : String | Test.java:3197:24:3197:59 | newALVHMWithMapKey(...) : ArrayListValuedHashMap [<map.key>] : String | provenance | MaD:764 |
 | Test.java:3197:51:3197:58 | source(...) : Object | Test.java:3197:43:3197:58 | (...)... : String | provenance |  |
-| Test.java:3198:10:3198:11 | in : ArrayListValuedHashMap [<map.key>] : String | Test.java:3198:10:3198:19 | asMap(...) : Map [<map.key>] : String | provenance | MaD:680 |
+| Test.java:3198:10:3198:11 | in : ArrayListValuedHashMap [<map.key>] : String | Test.java:3198:10:3198:19 | asMap(...) : Map [<map.key>] : String | provenance | MaD:755 |
 | Test.java:3198:10:3198:19 | asMap(...) : Map [<map.key>] : String | Test.java:3199:19:3199:21 | out : Map [<map.key>] : String | provenance |  |
 | Test.java:3199:19:3199:21 | out : Map [<map.key>] : String | Test.java:228:18:228:29 | map : Map [<map.key>] : String | provenance |  |
-| Test.java:3199:19:3199:21 | out : Map [<map.key>] : String | Test.java:3199:9:3199:22 | getMapKey(...) | provenance | MaD:10 |
+| Test.java:3199:19:3199:21 | out : Map [<map.key>] : String | Test.java:3199:9:3199:22 | getMapKey(...) | provenance | MaD:18 |
 | Test.java:3204:22:3204:59 | newHSVHMWithMapValue(...) : HashSetValuedHashMap [<map.value>, <element>] : String | Test.java:3205:10:3205:11 | in : HashSetValuedHashMap [<map.value>, <element>] : String | provenance |  |
 | Test.java:3204:43:3204:58 | (...)... : String | Test.java:294:58:294:64 | value : String | provenance |  |
-| Test.java:3204:43:3204:58 | (...)... : String | Test.java:3204:22:3204:59 | newHSVHMWithMapValue(...) : HashSetValuedHashMap [<map.value>, <element>] : String | provenance | MaD:690 |
+| Test.java:3204:43:3204:58 | (...)... : String | Test.java:3204:22:3204:59 | newHSVHMWithMapValue(...) : HashSetValuedHashMap [<map.value>, <element>] : String | provenance | MaD:765 |
 | Test.java:3204:51:3204:58 | source(...) : Object | Test.java:3204:43:3204:58 | (...)... : String | provenance |  |
-| Test.java:3205:10:3205:11 | in : HashSetValuedHashMap [<map.value>, <element>] : String | Test.java:3205:10:3205:21 | get(...) : Set [<element>] : String | provenance | MaD:684 |
+| Test.java:3205:10:3205:11 | in : HashSetValuedHashMap [<map.value>, <element>] : String | Test.java:3205:10:3205:21 | get(...) : Set [<element>] : String | provenance | MaD:759 |
 | Test.java:3205:10:3205:21 | get(...) : Set [<element>] : String | Test.java:3206:20:3206:22 | out : Set [<element>] : String | provenance |  |
 | Test.java:3206:20:3206:22 | out : Set [<element>] : String | Test.java:230:19:230:32 | it : Set [<element>] : String | provenance |  |
-| Test.java:3206:20:3206:22 | out : Set [<element>] : String | Test.java:3206:9:3206:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:3206:20:3206:22 | out : Set [<element>] : String | Test.java:3206:9:3206:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:3211:23:3211:60 | newALVHMWithMapValue(...) : ArrayListValuedHashMap [<map.value>, <element>] : String | Test.java:3212:10:3212:11 | in : ArrayListValuedHashMap [<map.value>, <element>] : String | provenance |  |
 | Test.java:3211:44:3211:59 | (...)... : String | Test.java:290:60:290:66 | value : String | provenance |  |
-| Test.java:3211:44:3211:59 | (...)... : String | Test.java:3211:23:3211:60 | newALVHMWithMapValue(...) : ArrayListValuedHashMap [<map.value>, <element>] : String | provenance | MaD:690 |
+| Test.java:3211:44:3211:59 | (...)... : String | Test.java:3211:23:3211:60 | newALVHMWithMapValue(...) : ArrayListValuedHashMap [<map.value>, <element>] : String | provenance | MaD:765 |
 | Test.java:3211:52:3211:59 | source(...) : Object | Test.java:3211:44:3211:59 | (...)... : String | provenance |  |
-| Test.java:3212:10:3212:11 | in : ArrayListValuedHashMap [<map.value>, <element>] : String | Test.java:3212:10:3212:21 | get(...) : List [<element>] : String | provenance | MaD:684 |
+| Test.java:3212:10:3212:11 | in : ArrayListValuedHashMap [<map.value>, <element>] : String | Test.java:3212:10:3212:21 | get(...) : List [<element>] : String | provenance | MaD:759 |
 | Test.java:3212:10:3212:21 | get(...) : List [<element>] : String | Test.java:3213:20:3213:22 | out : List [<element>] : String | provenance |  |
 | Test.java:3213:20:3213:22 | out : List [<element>] : String | Test.java:230:19:230:32 | it : List [<element>] : String | provenance |  |
-| Test.java:3213:20:3213:22 | out : List [<element>] : String | Test.java:3213:9:3213:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:3213:20:3213:22 | out : List [<element>] : String | Test.java:3213:9:3213:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:3218:24:3218:61 | newALVHMWithMapValue(...) : ArrayListValuedHashMap [<map.value>, <element>] : String | Test.java:3219:10:3219:11 | in : ArrayListValuedHashMap [<map.value>, <element>] : String | provenance |  |
 | Test.java:3218:45:3218:60 | (...)... : String | Test.java:290:60:290:66 | value : String | provenance |  |
-| Test.java:3218:45:3218:60 | (...)... : String | Test.java:3218:24:3218:61 | newALVHMWithMapValue(...) : ArrayListValuedHashMap [<map.value>, <element>] : String | provenance | MaD:690 |
+| Test.java:3218:45:3218:60 | (...)... : String | Test.java:3218:24:3218:61 | newALVHMWithMapValue(...) : ArrayListValuedHashMap [<map.value>, <element>] : String | provenance | MaD:765 |
 | Test.java:3218:53:3218:60 | source(...) : Object | Test.java:3218:45:3218:60 | (...)... : String | provenance |  |
-| Test.java:3219:10:3219:11 | in : ArrayListValuedHashMap [<map.value>, <element>] : String | Test.java:3219:10:3219:21 | get(...) : Collection [<element>] : String | provenance | MaD:684 |
+| Test.java:3219:10:3219:11 | in : ArrayListValuedHashMap [<map.value>, <element>] : String | Test.java:3219:10:3219:21 | get(...) : Collection [<element>] : String | provenance | MaD:759 |
 | Test.java:3219:10:3219:21 | get(...) : Collection [<element>] : String | Test.java:3220:20:3220:22 | out : Collection [<element>] : String | provenance |  |
 | Test.java:3220:20:3220:22 | out : Collection [<element>] : String | Test.java:230:19:230:32 | it : Collection [<element>] : String | provenance |  |
-| Test.java:3220:20:3220:22 | out : Collection [<element>] : String | Test.java:3220:9:3220:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:3220:20:3220:22 | out : Collection [<element>] : String | Test.java:3220:9:3220:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:3225:24:3225:59 | newALVHMWithMapKey(...) : ArrayListValuedHashMap [<map.key>] : String | Test.java:3226:10:3226:11 | in : ArrayListValuedHashMap [<map.key>] : String | provenance |  |
 | Test.java:3225:43:3225:58 | (...)... : String | Test.java:272:58:272:62 | key : String | provenance |  |
-| Test.java:3225:43:3225:58 | (...)... : String | Test.java:3225:24:3225:59 | newALVHMWithMapKey(...) : ArrayListValuedHashMap [<map.key>] : String | provenance | MaD:689 |
+| Test.java:3225:43:3225:58 | (...)... : String | Test.java:3225:24:3225:59 | newALVHMWithMapKey(...) : ArrayListValuedHashMap [<map.key>] : String | provenance | MaD:764 |
 | Test.java:3225:51:3225:58 | source(...) : Object | Test.java:3225:43:3225:58 | (...)... : String | provenance |  |
-| Test.java:3226:10:3226:11 | in : ArrayListValuedHashMap [<map.key>] : String | Test.java:3226:10:3226:20 | keySet(...) : Set [<element>] : String | provenance | MaD:685 |
+| Test.java:3226:10:3226:11 | in : ArrayListValuedHashMap [<map.key>] : String | Test.java:3226:10:3226:20 | keySet(...) : Set [<element>] : String | provenance | MaD:760 |
 | Test.java:3226:10:3226:20 | keySet(...) : Set [<element>] : String | Test.java:3227:20:3227:22 | out : Set [<element>] : String | provenance |  |
 | Test.java:3227:20:3227:22 | out : Set [<element>] : String | Test.java:230:19:230:32 | it : Set [<element>] : String | provenance |  |
-| Test.java:3227:20:3227:22 | out : Set [<element>] : String | Test.java:3227:9:3227:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:3227:20:3227:22 | out : Set [<element>] : String | Test.java:3227:9:3227:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:3232:24:3232:59 | newALVHMWithMapKey(...) : ArrayListValuedHashMap [<map.key>] : String | Test.java:3233:10:3233:11 | in : ArrayListValuedHashMap [<map.key>] : String | provenance |  |
 | Test.java:3232:43:3232:58 | (...)... : String | Test.java:272:58:272:62 | key : String | provenance |  |
-| Test.java:3232:43:3232:58 | (...)... : String | Test.java:3232:24:3232:59 | newALVHMWithMapKey(...) : ArrayListValuedHashMap [<map.key>] : String | provenance | MaD:689 |
+| Test.java:3232:43:3232:58 | (...)... : String | Test.java:3232:24:3232:59 | newALVHMWithMapKey(...) : ArrayListValuedHashMap [<map.key>] : String | provenance | MaD:764 |
 | Test.java:3232:51:3232:58 | source(...) : Object | Test.java:3232:43:3232:58 | (...)... : String | provenance |  |
-| Test.java:3233:10:3233:11 | in : ArrayListValuedHashMap [<map.key>] : String | Test.java:3233:10:3233:18 | keys(...) : MultiSet [<element>] : String | provenance | MaD:686 |
+| Test.java:3233:10:3233:11 | in : ArrayListValuedHashMap [<map.key>] : String | Test.java:3233:10:3233:18 | keys(...) : MultiSet [<element>] : String | provenance | MaD:761 |
 | Test.java:3233:10:3233:18 | keys(...) : MultiSet [<element>] : String | Test.java:3234:20:3234:22 | out : MultiSet [<element>] : String | provenance |  |
 | Test.java:3234:20:3234:22 | out : MultiSet [<element>] : String | Test.java:230:19:230:32 | it : MultiSet [<element>] : String | provenance |  |
-| Test.java:3234:20:3234:22 | out : MultiSet [<element>] : String | Test.java:3234:9:3234:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:3234:20:3234:22 | out : MultiSet [<element>] : String | Test.java:3234:9:3234:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:3239:24:3239:61 | newALVHMWithMapValue(...) : ArrayListValuedHashMap [<map.value>, <element>] : String | Test.java:3240:10:3240:11 | in : ArrayListValuedHashMap [<map.value>, <element>] : String | provenance |  |
 | Test.java:3239:45:3239:60 | (...)... : String | Test.java:290:60:290:66 | value : String | provenance |  |
-| Test.java:3239:45:3239:60 | (...)... : String | Test.java:3239:24:3239:61 | newALVHMWithMapValue(...) : ArrayListValuedHashMap [<map.value>, <element>] : String | provenance | MaD:690 |
+| Test.java:3239:45:3239:60 | (...)... : String | Test.java:3239:24:3239:61 | newALVHMWithMapValue(...) : ArrayListValuedHashMap [<map.value>, <element>] : String | provenance | MaD:765 |
 | Test.java:3239:53:3239:60 | source(...) : Object | Test.java:3239:45:3239:60 | (...)... : String | provenance |  |
-| Test.java:3240:10:3240:11 | in : ArrayListValuedHashMap [<map.value>, <element>] : String | Test.java:3240:10:3240:25 | mapIterator(...) : MapIterator [<map.value>] : String | provenance | MaD:688 |
+| Test.java:3240:10:3240:11 | in : ArrayListValuedHashMap [<map.value>, <element>] : String | Test.java:3240:10:3240:25 | mapIterator(...) : MapIterator [<map.value>] : String | provenance | MaD:763 |
 | Test.java:3240:10:3240:25 | mapIterator(...) : MapIterator [<map.value>] : String | Test.java:3241:21:3241:23 | out : MapIterator [<map.value>] : String | provenance |  |
 | Test.java:3241:21:3241:23 | out : MapIterator [<map.value>] : String | Test.java:246:20:246:47 | mapIterator : MapIterator [<map.value>] : String | provenance |  |
-| Test.java:3241:21:3241:23 | out : MapIterator [<map.value>] : String | Test.java:3241:9:3241:24 | getMapValue(...) | provenance | MaD:598 |
+| Test.java:3241:21:3241:23 | out : MapIterator [<map.value>] : String | Test.java:3241:9:3241:24 | getMapValue(...) | provenance | MaD:673 |
 | Test.java:3246:24:3246:59 | newALVHMWithMapKey(...) : ArrayListValuedHashMap [<map.key>] : String | Test.java:3247:10:3247:11 | in : ArrayListValuedHashMap [<map.key>] : String | provenance |  |
 | Test.java:3246:43:3246:58 | (...)... : String | Test.java:272:58:272:62 | key : String | provenance |  |
-| Test.java:3246:43:3246:58 | (...)... : String | Test.java:3246:24:3246:59 | newALVHMWithMapKey(...) : ArrayListValuedHashMap [<map.key>] : String | provenance | MaD:689 |
+| Test.java:3246:43:3246:58 | (...)... : String | Test.java:3246:24:3246:59 | newALVHMWithMapKey(...) : ArrayListValuedHashMap [<map.key>] : String | provenance | MaD:764 |
 | Test.java:3246:51:3246:58 | source(...) : Object | Test.java:3246:43:3246:58 | (...)... : String | provenance |  |
-| Test.java:3247:10:3247:11 | in : ArrayListValuedHashMap [<map.key>] : String | Test.java:3247:10:3247:25 | mapIterator(...) : MapIterator [<element>] : String | provenance | MaD:687 |
+| Test.java:3247:10:3247:11 | in : ArrayListValuedHashMap [<map.key>] : String | Test.java:3247:10:3247:25 | mapIterator(...) : MapIterator [<element>] : String | provenance | MaD:762 |
 | Test.java:3247:10:3247:25 | mapIterator(...) : MapIterator [<element>] : String | Test.java:3248:20:3248:22 | out : MapIterator [<element>] : String | provenance |  |
 | Test.java:3248:20:3248:22 | out : MapIterator [<element>] : String | Test.java:231:19:231:32 | it : MapIterator [<element>] : String | provenance |  |
-| Test.java:3248:20:3248:22 | out : MapIterator [<element>] : String | Test.java:3248:9:3248:23 | getElement(...) | provenance | MaD:4 |
+| Test.java:3248:20:3248:22 | out : MapIterator [<element>] : String | Test.java:3248:9:3248:23 | getElement(...) | provenance | MaD:6 |
 | Test.java:3253:16:3253:23 | source(...) : Object | Test.java:3254:12:3254:13 | in : Object | provenance |  |
 | Test.java:3254:4:3254:6 | out [post update] : MultiValuedMap [<map.key>] : Object | Test.java:3255:19:3255:21 | out : MultiValuedMap [<map.key>] : Object | provenance |  |
-| Test.java:3254:12:3254:13 | in : Object | Test.java:3254:4:3254:6 | out [post update] : MultiValuedMap [<map.key>] : Object | provenance | MaD:689 |
+| Test.java:3254:12:3254:13 | in : Object | Test.java:3254:4:3254:6 | out [post update] : MultiValuedMap [<map.key>] : Object | provenance | MaD:764 |
 | Test.java:3255:19:3255:21 | out : MultiValuedMap [<map.key>] : Object | Test.java:240:18:240:46 | container : MultiValuedMap [<map.key>] : Object | provenance |  |
-| Test.java:3255:19:3255:21 | out : MultiValuedMap [<map.key>] : Object | Test.java:3255:9:3255:22 | getMapKey(...) | provenance | MaD:685 |
+| Test.java:3255:19:3255:21 | out : MultiValuedMap [<map.key>] : Object | Test.java:3255:9:3255:22 | getMapKey(...) | provenance | MaD:760 |
 | Test.java:3260:16:3260:23 | source(...) : Object | Test.java:3261:18:3261:19 | in : Object | provenance |  |
 | Test.java:3261:4:3261:6 | out [post update] : MultiValuedMap [<map.value>, <element>] : Object | Test.java:3262:32:3262:34 | out : MultiValuedMap [<map.value>, <element>] : Object | provenance |  |
-| Test.java:3261:18:3261:19 | in : Object | Test.java:3261:4:3261:6 | out [post update] : MultiValuedMap [<map.value>, <element>] : Object | provenance | MaD:690 |
+| Test.java:3261:18:3261:19 | in : Object | Test.java:3261:4:3261:6 | out [post update] : MultiValuedMap [<map.value>, <element>] : Object | provenance | MaD:765 |
 | Test.java:3262:20:3262:35 | getMapValue(...) : Collection [<element>] : Object | Test.java:230:19:230:32 | it : Collection [<element>] : Object | provenance |  |
-| Test.java:3262:20:3262:35 | getMapValue(...) : Collection [<element>] : Object | Test.java:3262:9:3262:36 | getElement(...) | provenance | MaD:1 |
+| Test.java:3262:20:3262:35 | getMapValue(...) : Collection [<element>] : Object | Test.java:3262:9:3262:36 | getElement(...) | provenance | MaD:3 |
 | Test.java:3262:32:3262:34 | out : MultiValuedMap [<map.value>, <element>] : Object | Test.java:247:32:247:60 | container : MultiValuedMap [<map.value>, <element>] : Object | provenance |  |
-| Test.java:3262:32:3262:34 | out : MultiValuedMap [<map.value>, <element>] : Object | Test.java:3262:20:3262:35 | getMapValue(...) : Collection [<element>] : Object | provenance | MaD:684 |
+| Test.java:3262:32:3262:34 | out : MultiValuedMap [<map.value>, <element>] : Object | Test.java:3262:20:3262:35 | getMapValue(...) : Collection [<element>] : Object | provenance | MaD:759 |
 | Test.java:3267:13:3267:50 | newTreeMapWithMapKey(...) : TreeMap [<map.key>] : String | Test.java:3268:15:3268:16 | in : TreeMap [<map.key>] : String | provenance |  |
 | Test.java:3267:34:3267:49 | (...)... : String | Test.java:285:47:285:51 | key : String | provenance |  |
-| Test.java:3267:34:3267:49 | (...)... : String | Test.java:3267:13:3267:50 | newTreeMapWithMapKey(...) : TreeMap [<map.key>] : String | provenance | MaD:14 |
+| Test.java:3267:34:3267:49 | (...)... : String | Test.java:3267:13:3267:50 | newTreeMapWithMapKey(...) : TreeMap [<map.key>] : String | provenance | MaD:19 |
 | Test.java:3267:42:3267:49 | source(...) : Object | Test.java:3267:34:3267:49 | (...)... : String | provenance |  |
 | Test.java:3268:4:3268:6 | out [post update] : MultiValuedMap [<map.key>] : String | Test.java:3269:19:3269:21 | out : MultiValuedMap [<map.key>] : String | provenance |  |
-| Test.java:3268:15:3268:16 | in : TreeMap [<map.key>] : String | Test.java:3268:4:3268:6 | out [post update] : MultiValuedMap [<map.key>] : String | provenance | MaD:691 |
+| Test.java:3268:15:3268:16 | in : TreeMap [<map.key>] : String | Test.java:3268:4:3268:6 | out [post update] : MultiValuedMap [<map.key>] : String | provenance | MaD:766 |
 | Test.java:3269:19:3269:21 | out : MultiValuedMap [<map.key>] : String | Test.java:240:18:240:46 | container : MultiValuedMap [<map.key>] : String | provenance |  |
-| Test.java:3269:19:3269:21 | out : MultiValuedMap [<map.key>] : String | Test.java:3269:9:3269:22 | getMapKey(...) | provenance | MaD:685 |
+| Test.java:3269:19:3269:21 | out : MultiValuedMap [<map.key>] : String | Test.java:3269:9:3269:22 | getMapKey(...) | provenance | MaD:760 |
 | Test.java:3274:13:3274:52 | newTreeMapWithMapValue(...) : TreeMap [<map.value>] : String | Test.java:3275:15:3275:16 | in : TreeMap [<map.value>] : String | provenance |  |
 | Test.java:3274:36:3274:51 | (...)... : String | Test.java:304:49:304:55 | value : String | provenance |  |
-| Test.java:3274:36:3274:51 | (...)... : String | Test.java:3274:13:3274:52 | newTreeMapWithMapValue(...) : TreeMap [<map.value>] : String | provenance | MaD:15 |
+| Test.java:3274:36:3274:51 | (...)... : String | Test.java:3274:13:3274:52 | newTreeMapWithMapValue(...) : TreeMap [<map.value>] : String | provenance | MaD:20 |
 | Test.java:3274:44:3274:51 | source(...) : Object | Test.java:3274:36:3274:51 | (...)... : String | provenance |  |
 | Test.java:3275:4:3275:6 | out [post update] : MultiValuedMap [<map.value>, <element>] : String | Test.java:3276:32:3276:34 | out : MultiValuedMap [<map.value>, <element>] : String | provenance |  |
-| Test.java:3275:15:3275:16 | in : TreeMap [<map.value>] : String | Test.java:3275:4:3275:6 | out [post update] : MultiValuedMap [<map.value>, <element>] : String | provenance | MaD:692 |
+| Test.java:3275:15:3275:16 | in : TreeMap [<map.value>] : String | Test.java:3275:4:3275:6 | out [post update] : MultiValuedMap [<map.value>, <element>] : String | provenance | MaD:767 |
 | Test.java:3276:20:3276:35 | getMapValue(...) : Collection [<element>] : String | Test.java:230:19:230:32 | it : Collection [<element>] : String | provenance |  |
-| Test.java:3276:20:3276:35 | getMapValue(...) : Collection [<element>] : String | Test.java:3276:9:3276:36 | getElement(...) | provenance | MaD:1 |
+| Test.java:3276:20:3276:35 | getMapValue(...) : Collection [<element>] : String | Test.java:3276:9:3276:36 | getElement(...) | provenance | MaD:3 |
 | Test.java:3276:32:3276:34 | out : MultiValuedMap [<map.value>, <element>] : String | Test.java:247:32:247:60 | container : MultiValuedMap [<map.value>, <element>] : String | provenance |  |
-| Test.java:3276:32:3276:34 | out : MultiValuedMap [<map.value>, <element>] : String | Test.java:3276:20:3276:35 | getMapValue(...) : Collection [<element>] : String | provenance | MaD:684 |
+| Test.java:3276:32:3276:34 | out : MultiValuedMap [<map.value>, <element>] : String | Test.java:3276:20:3276:35 | getMapValue(...) : Collection [<element>] : String | provenance | MaD:759 |
 | Test.java:3281:24:3281:61 | newALVHMWithMapValue(...) : ArrayListValuedHashMap [<map.value>, <element>] : String | Test.java:3282:15:3282:16 | in : ArrayListValuedHashMap [<map.value>, <element>] : String | provenance |  |
 | Test.java:3281:45:3281:60 | (...)... : String | Test.java:290:60:290:66 | value : String | provenance |  |
-| Test.java:3281:45:3281:60 | (...)... : String | Test.java:3281:24:3281:61 | newALVHMWithMapValue(...) : ArrayListValuedHashMap [<map.value>, <element>] : String | provenance | MaD:690 |
+| Test.java:3281:45:3281:60 | (...)... : String | Test.java:3281:24:3281:61 | newALVHMWithMapValue(...) : ArrayListValuedHashMap [<map.value>, <element>] : String | provenance | MaD:765 |
 | Test.java:3281:53:3281:60 | source(...) : Object | Test.java:3281:45:3281:60 | (...)... : String | provenance |  |
 | Test.java:3282:4:3282:6 | out [post update] : MultiValuedMap [<map.value>, <element>] : String | Test.java:3283:32:3283:34 | out : MultiValuedMap [<map.value>, <element>] : String | provenance |  |
-| Test.java:3282:15:3282:16 | in : ArrayListValuedHashMap [<map.value>, <element>] : String | Test.java:3282:4:3282:6 | out [post update] : MultiValuedMap [<map.value>, <element>] : String | provenance | MaD:694 |
+| Test.java:3282:15:3282:16 | in : ArrayListValuedHashMap [<map.value>, <element>] : String | Test.java:3282:4:3282:6 | out [post update] : MultiValuedMap [<map.value>, <element>] : String | provenance | MaD:769 |
 | Test.java:3283:20:3283:35 | getMapValue(...) : Collection [<element>] : String | Test.java:230:19:230:32 | it : Collection [<element>] : String | provenance |  |
-| Test.java:3283:20:3283:35 | getMapValue(...) : Collection [<element>] : String | Test.java:3283:9:3283:36 | getElement(...) | provenance | MaD:1 |
+| Test.java:3283:20:3283:35 | getMapValue(...) : Collection [<element>] : String | Test.java:3283:9:3283:36 | getElement(...) | provenance | MaD:3 |
 | Test.java:3283:32:3283:34 | out : MultiValuedMap [<map.value>, <element>] : String | Test.java:247:32:247:60 | container : MultiValuedMap [<map.value>, <element>] : String | provenance |  |
-| Test.java:3283:32:3283:34 | out : MultiValuedMap [<map.value>, <element>] : String | Test.java:3283:20:3283:35 | getMapValue(...) : Collection [<element>] : String | provenance | MaD:684 |
+| Test.java:3283:32:3283:34 | out : MultiValuedMap [<map.value>, <element>] : String | Test.java:3283:20:3283:35 | getMapValue(...) : Collection [<element>] : String | provenance | MaD:759 |
 | Test.java:3288:24:3288:59 | newALVHMWithMapKey(...) : ArrayListValuedHashMap [<map.key>] : String | Test.java:3289:15:3289:16 | in : ArrayListValuedHashMap [<map.key>] : String | provenance |  |
 | Test.java:3288:43:3288:58 | (...)... : String | Test.java:272:58:272:62 | key : String | provenance |  |
-| Test.java:3288:43:3288:58 | (...)... : String | Test.java:3288:24:3288:59 | newALVHMWithMapKey(...) : ArrayListValuedHashMap [<map.key>] : String | provenance | MaD:689 |
+| Test.java:3288:43:3288:58 | (...)... : String | Test.java:3288:24:3288:59 | newALVHMWithMapKey(...) : ArrayListValuedHashMap [<map.key>] : String | provenance | MaD:764 |
 | Test.java:3288:51:3288:58 | source(...) : Object | Test.java:3288:43:3288:58 | (...)... : String | provenance |  |
 | Test.java:3289:4:3289:6 | out [post update] : MultiValuedMap [<map.key>] : String | Test.java:3290:19:3290:21 | out : MultiValuedMap [<map.key>] : String | provenance |  |
-| Test.java:3289:15:3289:16 | in : ArrayListValuedHashMap [<map.key>] : String | Test.java:3289:4:3289:6 | out [post update] : MultiValuedMap [<map.key>] : String | provenance | MaD:693 |
+| Test.java:3289:15:3289:16 | in : ArrayListValuedHashMap [<map.key>] : String | Test.java:3289:4:3289:6 | out [post update] : MultiValuedMap [<map.key>] : String | provenance | MaD:768 |
 | Test.java:3290:19:3290:21 | out : MultiValuedMap [<map.key>] : String | Test.java:240:18:240:46 | container : MultiValuedMap [<map.key>] : String | provenance |  |
-| Test.java:3290:19:3290:21 | out : MultiValuedMap [<map.key>] : String | Test.java:3290:9:3290:22 | getMapKey(...) | provenance | MaD:685 |
+| Test.java:3290:19:3290:21 | out : MultiValuedMap [<map.key>] : String | Test.java:3290:9:3290:22 | getMapKey(...) | provenance | MaD:760 |
 | Test.java:3295:16:3295:23 | source(...) : Object | Test.java:3296:15:3296:16 | in : Object | provenance |  |
 | Test.java:3296:4:3296:6 | out [post update] : MultiValuedMap [<map.key>] : Object | Test.java:3297:19:3297:21 | out : MultiValuedMap [<map.key>] : Object | provenance |  |
-| Test.java:3296:15:3296:16 | in : Object | Test.java:3296:4:3296:6 | out [post update] : MultiValuedMap [<map.key>] : Object | provenance | MaD:695 |
+| Test.java:3296:15:3296:16 | in : Object | Test.java:3296:4:3296:6 | out [post update] : MultiValuedMap [<map.key>] : Object | provenance | MaD:770 |
 | Test.java:3297:19:3297:21 | out : MultiValuedMap [<map.key>] : Object | Test.java:240:18:240:46 | container : MultiValuedMap [<map.key>] : Object | provenance |  |
-| Test.java:3297:19:3297:21 | out : MultiValuedMap [<map.key>] : Object | Test.java:3297:9:3297:22 | getMapKey(...) | provenance | MaD:685 |
+| Test.java:3297:19:3297:21 | out : MultiValuedMap [<map.key>] : Object | Test.java:3297:9:3297:22 | getMapKey(...) | provenance | MaD:760 |
 | Test.java:3302:18:3302:63 | newFluentIterableWithElement(...) : FluentIterable [<element>] : String | Test.java:3303:21:3303:22 | in : FluentIterable [<element>] : String | provenance |  |
 | Test.java:3302:47:3302:62 | (...)... : String | Test.java:257:53:257:61 | element : String | provenance |  |
-| Test.java:3302:47:3302:62 | (...)... : String | Test.java:3302:18:3302:63 | newFluentIterableWithElement(...) : FluentIterable [<element>] : String | provenance | MaD:469 |
+| Test.java:3302:47:3302:62 | (...)... : String | Test.java:3302:18:3302:63 | newFluentIterableWithElement(...) : FluentIterable [<element>] : String | provenance | MaD:544 |
 | Test.java:3302:55:3302:62 | source(...) : Object | Test.java:3302:47:3302:62 | (...)... : String | provenance |  |
 | Test.java:3303:4:3303:6 | out [post update] : MultiValuedMap [<map.value>, <element>] : String | Test.java:3304:32:3304:34 | out : MultiValuedMap [<map.value>, <element>] : String | provenance |  |
-| Test.java:3303:21:3303:22 | in : FluentIterable [<element>] : String | Test.java:3303:4:3303:6 | out [post update] : MultiValuedMap [<map.value>, <element>] : String | provenance | MaD:696 |
+| Test.java:3303:21:3303:22 | in : FluentIterable [<element>] : String | Test.java:3303:4:3303:6 | out [post update] : MultiValuedMap [<map.value>, <element>] : String | provenance | MaD:771 |
 | Test.java:3304:20:3304:35 | getMapValue(...) : Collection [<element>] : String | Test.java:230:19:230:32 | it : Collection [<element>] : String | provenance |  |
-| Test.java:3304:20:3304:35 | getMapValue(...) : Collection [<element>] : String | Test.java:3304:9:3304:36 | getElement(...) | provenance | MaD:1 |
+| Test.java:3304:20:3304:35 | getMapValue(...) : Collection [<element>] : String | Test.java:3304:9:3304:36 | getElement(...) | provenance | MaD:3 |
 | Test.java:3304:32:3304:34 | out : MultiValuedMap [<map.value>, <element>] : String | Test.java:247:32:247:60 | container : MultiValuedMap [<map.value>, <element>] : String | provenance |  |
-| Test.java:3304:32:3304:34 | out : MultiValuedMap [<map.value>, <element>] : String | Test.java:3304:20:3304:35 | getMapValue(...) : Collection [<element>] : String | provenance | MaD:684 |
+| Test.java:3304:32:3304:34 | out : MultiValuedMap [<map.value>, <element>] : String | Test.java:3304:20:3304:35 | getMapValue(...) : Collection [<element>] : String | provenance | MaD:759 |
 | Test.java:3309:22:3309:59 | newHSVHMWithMapValue(...) : HashSetValuedHashMap [<map.value>, <element>] : String | Test.java:3310:10:3310:11 | in : HashSetValuedHashMap [<map.value>, <element>] : String | provenance |  |
 | Test.java:3309:43:3309:58 | (...)... : String | Test.java:294:58:294:64 | value : String | provenance |  |
-| Test.java:3309:43:3309:58 | (...)... : String | Test.java:3309:22:3309:59 | newHSVHMWithMapValue(...) : HashSetValuedHashMap [<map.value>, <element>] : String | provenance | MaD:690 |
+| Test.java:3309:43:3309:58 | (...)... : String | Test.java:3309:22:3309:59 | newHSVHMWithMapValue(...) : HashSetValuedHashMap [<map.value>, <element>] : String | provenance | MaD:765 |
 | Test.java:3309:51:3309:58 | source(...) : Object | Test.java:3309:43:3309:58 | (...)... : String | provenance |  |
-| Test.java:3310:10:3310:11 | in : HashSetValuedHashMap [<map.value>, <element>] : String | Test.java:3310:10:3310:24 | remove(...) : Set [<element>] : String | provenance | MaD:697 |
+| Test.java:3310:10:3310:11 | in : HashSetValuedHashMap [<map.value>, <element>] : String | Test.java:3310:10:3310:24 | remove(...) : Set [<element>] : String | provenance | MaD:772 |
 | Test.java:3310:10:3310:24 | remove(...) : Set [<element>] : String | Test.java:3311:20:3311:22 | out : Set [<element>] : String | provenance |  |
 | Test.java:3311:20:3311:22 | out : Set [<element>] : String | Test.java:230:19:230:32 | it : Set [<element>] : String | provenance |  |
-| Test.java:3311:20:3311:22 | out : Set [<element>] : String | Test.java:3311:9:3311:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:3311:20:3311:22 | out : Set [<element>] : String | Test.java:3311:9:3311:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:3316:23:3316:60 | newALVHMWithMapValue(...) : ArrayListValuedHashMap [<map.value>, <element>] : String | Test.java:3317:10:3317:11 | in : ArrayListValuedHashMap [<map.value>, <element>] : String | provenance |  |
 | Test.java:3316:44:3316:59 | (...)... : String | Test.java:290:60:290:66 | value : String | provenance |  |
-| Test.java:3316:44:3316:59 | (...)... : String | Test.java:3316:23:3316:60 | newALVHMWithMapValue(...) : ArrayListValuedHashMap [<map.value>, <element>] : String | provenance | MaD:690 |
+| Test.java:3316:44:3316:59 | (...)... : String | Test.java:3316:23:3316:60 | newALVHMWithMapValue(...) : ArrayListValuedHashMap [<map.value>, <element>] : String | provenance | MaD:765 |
 | Test.java:3316:52:3316:59 | source(...) : Object | Test.java:3316:44:3316:59 | (...)... : String | provenance |  |
-| Test.java:3317:10:3317:11 | in : ArrayListValuedHashMap [<map.value>, <element>] : String | Test.java:3317:10:3317:24 | remove(...) : List [<element>] : String | provenance | MaD:697 |
+| Test.java:3317:10:3317:11 | in : ArrayListValuedHashMap [<map.value>, <element>] : String | Test.java:3317:10:3317:24 | remove(...) : List [<element>] : String | provenance | MaD:772 |
 | Test.java:3317:10:3317:24 | remove(...) : List [<element>] : String | Test.java:3318:20:3318:22 | out : List [<element>] : String | provenance |  |
 | Test.java:3318:20:3318:22 | out : List [<element>] : String | Test.java:230:19:230:32 | it : List [<element>] : String | provenance |  |
-| Test.java:3318:20:3318:22 | out : List [<element>] : String | Test.java:3318:9:3318:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:3318:20:3318:22 | out : List [<element>] : String | Test.java:3318:9:3318:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:3323:24:3323:61 | newALVHMWithMapValue(...) : ArrayListValuedHashMap [<map.value>, <element>] : String | Test.java:3324:10:3324:11 | in : ArrayListValuedHashMap [<map.value>, <element>] : String | provenance |  |
 | Test.java:3323:45:3323:60 | (...)... : String | Test.java:290:60:290:66 | value : String | provenance |  |
-| Test.java:3323:45:3323:60 | (...)... : String | Test.java:3323:24:3323:61 | newALVHMWithMapValue(...) : ArrayListValuedHashMap [<map.value>, <element>] : String | provenance | MaD:690 |
+| Test.java:3323:45:3323:60 | (...)... : String | Test.java:3323:24:3323:61 | newALVHMWithMapValue(...) : ArrayListValuedHashMap [<map.value>, <element>] : String | provenance | MaD:765 |
 | Test.java:3323:53:3323:60 | source(...) : Object | Test.java:3323:45:3323:60 | (...)... : String | provenance |  |
-| Test.java:3324:10:3324:11 | in : ArrayListValuedHashMap [<map.value>, <element>] : String | Test.java:3324:10:3324:24 | remove(...) : Collection [<element>] : String | provenance | MaD:697 |
+| Test.java:3324:10:3324:11 | in : ArrayListValuedHashMap [<map.value>, <element>] : String | Test.java:3324:10:3324:24 | remove(...) : Collection [<element>] : String | provenance | MaD:772 |
 | Test.java:3324:10:3324:24 | remove(...) : Collection [<element>] : String | Test.java:3325:20:3325:22 | out : Collection [<element>] : String | provenance |  |
 | Test.java:3325:20:3325:22 | out : Collection [<element>] : String | Test.java:230:19:230:32 | it : Collection [<element>] : String | provenance |  |
-| Test.java:3325:20:3325:22 | out : Collection [<element>] : String | Test.java:3325:9:3325:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:3325:20:3325:22 | out : Collection [<element>] : String | Test.java:3325:9:3325:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:3330:24:3330:61 | newALVHMWithMapValue(...) : ArrayListValuedHashMap [<map.value>, <element>] : String | Test.java:3331:10:3331:11 | in : ArrayListValuedHashMap [<map.value>, <element>] : String | provenance |  |
 | Test.java:3330:45:3330:60 | (...)... : String | Test.java:290:60:290:66 | value : String | provenance |  |
-| Test.java:3330:45:3330:60 | (...)... : String | Test.java:3330:24:3330:61 | newALVHMWithMapValue(...) : ArrayListValuedHashMap [<map.value>, <element>] : String | provenance | MaD:690 |
+| Test.java:3330:45:3330:60 | (...)... : String | Test.java:3330:24:3330:61 | newALVHMWithMapValue(...) : ArrayListValuedHashMap [<map.value>, <element>] : String | provenance | MaD:765 |
 | Test.java:3330:53:3330:60 | source(...) : Object | Test.java:3330:45:3330:60 | (...)... : String | provenance |  |
-| Test.java:3331:10:3331:11 | in : ArrayListValuedHashMap [<map.value>, <element>] : String | Test.java:3331:10:3331:20 | values(...) : Collection [<element>] : String | provenance | MaD:698 |
+| Test.java:3331:10:3331:11 | in : ArrayListValuedHashMap [<map.value>, <element>] : String | Test.java:3331:10:3331:20 | values(...) : Collection [<element>] : String | provenance | MaD:773 |
 | Test.java:3331:10:3331:20 | values(...) : Collection [<element>] : String | Test.java:3332:20:3332:22 | out : Collection [<element>] : String | provenance |  |
 | Test.java:3332:20:3332:22 | out : Collection [<element>] : String | Test.java:230:19:230:32 | it : Collection [<element>] : String | provenance |  |
-| Test.java:3332:20:3332:22 | out : Collection [<element>] : String | Test.java:3332:9:3332:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:3332:20:3332:22 | out : Collection [<element>] : String | Test.java:3332:9:3332:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:3337:28:3337:62 | newOMIWithElement(...) : OrderedMapIterator [<element>] : String | Test.java:3338:10:3338:11 | in : OrderedMapIterator [<element>] : String | provenance |  |
 | Test.java:3337:46:3337:61 | (...)... : String | Test.java:283:53:283:57 | key : String | provenance |  |
-| Test.java:3337:46:3337:61 | (...)... : String | Test.java:3337:28:3337:62 | newOMIWithElement(...) : OrderedMapIterator [<element>] : String | provenance | MaD:14 |
-| Test.java:3337:46:3337:61 | (...)... : String | Test.java:3337:28:3337:62 | newOMIWithElement(...) : OrderedMapIterator [<element>] : String | provenance | MaD:705 |
+| Test.java:3337:46:3337:61 | (...)... : String | Test.java:3337:28:3337:62 | newOMIWithElement(...) : OrderedMapIterator [<element>] : String | provenance | MaD:19 |
+| Test.java:3337:46:3337:61 | (...)... : String | Test.java:3337:28:3337:62 | newOMIWithElement(...) : OrderedMapIterator [<element>] : String | provenance | MaD:779 |
 | Test.java:3337:54:3337:61 | source(...) : Object | Test.java:3337:46:3337:61 | (...)... : String | provenance |  |
-| Test.java:3338:10:3338:11 | in : OrderedMapIterator [<element>] : String | Test.java:3338:10:3338:22 | previous(...) : String | provenance | MaD:699 |
+| Test.java:3338:10:3338:11 | in : OrderedMapIterator [<element>] : String | Test.java:3338:10:3338:22 | previous(...) : String | provenance | MaD:774 |
 | Test.java:3338:10:3338:22 | previous(...) : String | Test.java:3339:9:3339:11 | out | provenance |  |
 | Test.java:3344:25:3344:59 | newOMIWithElement(...) : OrderedMapIterator [<element>] : String | Test.java:3345:10:3345:11 | in : OrderedMapIterator [<element>] : String | provenance |  |
 | Test.java:3344:43:3344:58 | (...)... : String | Test.java:283:53:283:57 | key : String | provenance |  |
-| Test.java:3344:43:3344:58 | (...)... : String | Test.java:3344:25:3344:59 | newOMIWithElement(...) : OrderedMapIterator [<element>] : String | provenance | MaD:14 |
-| Test.java:3344:43:3344:58 | (...)... : String | Test.java:3344:25:3344:59 | newOMIWithElement(...) : OrderedMapIterator [<element>] : String | provenance | MaD:705 |
+| Test.java:3344:43:3344:58 | (...)... : String | Test.java:3344:25:3344:59 | newOMIWithElement(...) : OrderedMapIterator [<element>] : String | provenance | MaD:19 |
+| Test.java:3344:43:3344:58 | (...)... : String | Test.java:3344:25:3344:59 | newOMIWithElement(...) : OrderedMapIterator [<element>] : String | provenance | MaD:779 |
 | Test.java:3344:51:3344:58 | source(...) : Object | Test.java:3344:43:3344:58 | (...)... : String | provenance |  |
-| Test.java:3345:10:3345:11 | in : OrderedMapIterator [<element>] : String | Test.java:3345:10:3345:22 | previous(...) : String | provenance | MaD:699 |
+| Test.java:3345:10:3345:11 | in : OrderedMapIterator [<element>] : String | Test.java:3345:10:3345:22 | previous(...) : String | provenance | MaD:774 |
 | Test.java:3345:10:3345:22 | previous(...) : String | Test.java:3346:9:3346:11 | out | provenance |  |
 | Test.java:3351:20:3351:61 | newTreeBidiMapWithMapKey(...) : TreeBidiMap [<map.key>] : String | Test.java:3352:10:3352:11 | in : TreeBidiMap [<map.key>] : String | provenance |  |
 | Test.java:3351:45:3351:60 | (...)... : String | Test.java:287:75:287:79 | key : String | provenance |  |
-| Test.java:3351:45:3351:60 | (...)... : String | Test.java:3351:20:3351:61 | newTreeBidiMapWithMapKey(...) : TreeBidiMap [<map.key>] : String | provenance | MaD:14 |
-| Test.java:3351:45:3351:60 | (...)... : String | Test.java:3351:20:3351:61 | newTreeBidiMapWithMapKey(...) : TreeBidiMap [<map.key>] : String | provenance | MaD:705 |
+| Test.java:3351:45:3351:60 | (...)... : String | Test.java:3351:20:3351:61 | newTreeBidiMapWithMapKey(...) : TreeBidiMap [<map.key>] : String | provenance | MaD:19 |
+| Test.java:3351:45:3351:60 | (...)... : String | Test.java:3351:20:3351:61 | newTreeBidiMapWithMapKey(...) : TreeBidiMap [<map.key>] : String | provenance | MaD:779 |
 | Test.java:3351:53:3351:60 | source(...) : Object | Test.java:3351:45:3351:60 | (...)... : String | provenance |  |
-| Test.java:3352:10:3352:11 | in : TreeBidiMap [<map.key>] : String | Test.java:3352:10:3352:22 | firstKey(...) : String | provenance | MaD:700 |
+| Test.java:3352:10:3352:11 | in : TreeBidiMap [<map.key>] : String | Test.java:3352:10:3352:22 | firstKey(...) : String | provenance | MaD:775 |
 | Test.java:3352:10:3352:22 | firstKey(...) : String | Test.java:3353:9:3353:11 | out | provenance |  |
 | Test.java:3358:20:3358:61 | newTreeBidiMapWithMapKey(...) : TreeBidiMap [<map.key>] : String | Test.java:3359:10:3359:11 | in : TreeBidiMap [<map.key>] : String | provenance |  |
 | Test.java:3358:45:3358:60 | (...)... : String | Test.java:287:75:287:79 | key : String | provenance |  |
-| Test.java:3358:45:3358:60 | (...)... : String | Test.java:3358:20:3358:61 | newTreeBidiMapWithMapKey(...) : TreeBidiMap [<map.key>] : String | provenance | MaD:14 |
-| Test.java:3358:45:3358:60 | (...)... : String | Test.java:3358:20:3358:61 | newTreeBidiMapWithMapKey(...) : TreeBidiMap [<map.key>] : String | provenance | MaD:705 |
+| Test.java:3358:45:3358:60 | (...)... : String | Test.java:3358:20:3358:61 | newTreeBidiMapWithMapKey(...) : TreeBidiMap [<map.key>] : String | provenance | MaD:19 |
+| Test.java:3358:45:3358:60 | (...)... : String | Test.java:3358:20:3358:61 | newTreeBidiMapWithMapKey(...) : TreeBidiMap [<map.key>] : String | provenance | MaD:779 |
 | Test.java:3358:53:3358:60 | source(...) : Object | Test.java:3358:45:3358:60 | (...)... : String | provenance |  |
-| Test.java:3359:10:3359:11 | in : TreeBidiMap [<map.key>] : String | Test.java:3359:10:3359:21 | lastKey(...) : String | provenance | MaD:701 |
+| Test.java:3359:10:3359:11 | in : TreeBidiMap [<map.key>] : String | Test.java:3359:10:3359:21 | lastKey(...) : String | provenance | MaD:776 |
 | Test.java:3359:10:3359:21 | lastKey(...) : String | Test.java:3360:9:3360:11 | out | provenance |  |
 | Test.java:3365:20:3365:61 | newTreeBidiMapWithMapKey(...) : TreeBidiMap [<map.key>] : String | Test.java:3366:10:3366:11 | in : TreeBidiMap [<map.key>] : String | provenance |  |
 | Test.java:3365:45:3365:60 | (...)... : String | Test.java:287:75:287:79 | key : String | provenance |  |
-| Test.java:3365:45:3365:60 | (...)... : String | Test.java:3365:20:3365:61 | newTreeBidiMapWithMapKey(...) : TreeBidiMap [<map.key>] : String | provenance | MaD:14 |
-| Test.java:3365:45:3365:60 | (...)... : String | Test.java:3365:20:3365:61 | newTreeBidiMapWithMapKey(...) : TreeBidiMap [<map.key>] : String | provenance | MaD:705 |
+| Test.java:3365:45:3365:60 | (...)... : String | Test.java:3365:20:3365:61 | newTreeBidiMapWithMapKey(...) : TreeBidiMap [<map.key>] : String | provenance | MaD:19 |
+| Test.java:3365:45:3365:60 | (...)... : String | Test.java:3365:20:3365:61 | newTreeBidiMapWithMapKey(...) : TreeBidiMap [<map.key>] : String | provenance | MaD:779 |
 | Test.java:3365:53:3365:60 | source(...) : Object | Test.java:3365:45:3365:60 | (...)... : String | provenance |  |
-| Test.java:3366:10:3366:11 | in : TreeBidiMap [<map.key>] : String | Test.java:3366:10:3366:25 | nextKey(...) : String | provenance | MaD:702 |
+| Test.java:3366:10:3366:11 | in : TreeBidiMap [<map.key>] : String | Test.java:3366:10:3366:25 | nextKey(...) : String | provenance | MaD:777 |
 | Test.java:3366:10:3366:25 | nextKey(...) : String | Test.java:3367:9:3367:11 | out | provenance |  |
 | Test.java:3372:20:3372:61 | newTreeBidiMapWithMapKey(...) : TreeBidiMap [<map.key>] : String | Test.java:3373:10:3373:11 | in : TreeBidiMap [<map.key>] : String | provenance |  |
 | Test.java:3372:45:3372:60 | (...)... : String | Test.java:287:75:287:79 | key : String | provenance |  |
-| Test.java:3372:45:3372:60 | (...)... : String | Test.java:3372:20:3372:61 | newTreeBidiMapWithMapKey(...) : TreeBidiMap [<map.key>] : String | provenance | MaD:14 |
-| Test.java:3372:45:3372:60 | (...)... : String | Test.java:3372:20:3372:61 | newTreeBidiMapWithMapKey(...) : TreeBidiMap [<map.key>] : String | provenance | MaD:705 |
+| Test.java:3372:45:3372:60 | (...)... : String | Test.java:3372:20:3372:61 | newTreeBidiMapWithMapKey(...) : TreeBidiMap [<map.key>] : String | provenance | MaD:19 |
+| Test.java:3372:45:3372:60 | (...)... : String | Test.java:3372:20:3372:61 | newTreeBidiMapWithMapKey(...) : TreeBidiMap [<map.key>] : String | provenance | MaD:779 |
 | Test.java:3372:53:3372:60 | source(...) : Object | Test.java:3372:45:3372:60 | (...)... : String | provenance |  |
-| Test.java:3373:10:3373:11 | in : TreeBidiMap [<map.key>] : String | Test.java:3373:10:3373:29 | previousKey(...) : String | provenance | MaD:703 |
+| Test.java:3373:10:3373:11 | in : TreeBidiMap [<map.key>] : String | Test.java:3373:10:3373:29 | previousKey(...) : String | provenance | MaD:778 |
 | Test.java:3373:10:3373:29 | previousKey(...) : String | Test.java:3374:9:3374:11 | out | provenance |  |
 | Test.java:3379:16:3379:23 | source(...) : Object | Test.java:3380:12:3380:13 | in : Object | provenance |  |
 | Test.java:3380:4:3380:6 | out [post update] : Put [<map.key>] : Object | Test.java:3381:26:3381:28 | out : Put [<map.key>] : Object | provenance |  |
-| Test.java:3380:12:3380:13 | in : Object | Test.java:3380:4:3380:6 | out [post update] : Put [<map.key>] : Object | provenance | MaD:705 |
+| Test.java:3380:12:3380:13 | in : Object | Test.java:3380:4:3380:6 | out [post update] : Put [<map.key>] : Object | provenance | MaD:779 |
 | Test.java:3381:26:3381:28 | out : Put [<map.key>] : Object | Test.java:242:27:242:44 | container : Put [<map.key>] : Object | provenance |  |
-| Test.java:3381:26:3381:28 | out : Put [<map.key>] : Object | Test.java:3381:9:3381:29 | getMapKeyFromPut(...) | provenance | MaD:10 |
+| Test.java:3381:26:3381:28 | out : Put [<map.key>] : Object | Test.java:3381:9:3381:29 | getMapKeyFromPut(...) | provenance | MaD:18 |
 | Test.java:3386:16:3386:23 | source(...) : Object | Test.java:3387:12:3387:13 | in : Object | provenance |  |
 | Test.java:3387:4:3387:6 | out [post update] : MultiValueMap [<map.key>] : Object | Test.java:3388:19:3388:21 | out : MultiValueMap [<map.key>] : Object | provenance |  |
-| Test.java:3387:12:3387:13 | in : Object | Test.java:3387:4:3387:6 | out [post update] : MultiValueMap [<map.key>] : Object | provenance | MaD:14 |
-| Test.java:3387:12:3387:13 | in : Object | Test.java:3387:4:3387:6 | out [post update] : MultiValueMap [<map.key>] : Object | provenance | MaD:661 |
-| Test.java:3387:12:3387:13 | in : Object | Test.java:3387:4:3387:6 | out [post update] : MultiValueMap [<map.key>] : Object | provenance | MaD:705 |
+| Test.java:3387:12:3387:13 | in : Object | Test.java:3387:4:3387:6 | out [post update] : MultiValueMap [<map.key>] : Object | provenance | MaD:19 |
+| Test.java:3387:12:3387:13 | in : Object | Test.java:3387:4:3387:6 | out [post update] : MultiValueMap [<map.key>] : Object | provenance | MaD:736 |
+| Test.java:3387:12:3387:13 | in : Object | Test.java:3387:4:3387:6 | out [post update] : MultiValueMap [<map.key>] : Object | provenance | MaD:779 |
 | Test.java:3388:19:3388:21 | out : MultiValueMap [<map.key>] : Object | Test.java:228:18:228:29 | map : MultiValueMap [<map.key>] : Object | provenance |  |
-| Test.java:3388:19:3388:21 | out : MultiValueMap [<map.key>] : Object | Test.java:3388:9:3388:22 | getMapKey(...) | provenance | MaD:10 |
+| Test.java:3388:19:3388:21 | out : MultiValueMap [<map.key>] : Object | Test.java:3388:9:3388:22 | getMapKey(...) | provenance | MaD:18 |
 | Test.java:3393:16:3393:23 | source(...) : Object | Test.java:3394:12:3394:13 | in : Object | provenance |  |
 | Test.java:3394:4:3394:6 | out [post update] : MultiMap [<map.key>] : Object | Test.java:3395:19:3395:21 | out : MultiMap [<map.key>] : Object | provenance |  |
-| Test.java:3394:12:3394:13 | in : Object | Test.java:3394:4:3394:6 | out [post update] : MultiMap [<map.key>] : Object | provenance | MaD:14 |
-| Test.java:3394:12:3394:13 | in : Object | Test.java:3394:4:3394:6 | out [post update] : MultiMap [<map.key>] : Object | provenance | MaD:661 |
-| Test.java:3394:12:3394:13 | in : Object | Test.java:3394:4:3394:6 | out [post update] : MultiMap [<map.key>] : Object | provenance | MaD:705 |
+| Test.java:3394:12:3394:13 | in : Object | Test.java:3394:4:3394:6 | out [post update] : MultiMap [<map.key>] : Object | provenance | MaD:19 |
+| Test.java:3394:12:3394:13 | in : Object | Test.java:3394:4:3394:6 | out [post update] : MultiMap [<map.key>] : Object | provenance | MaD:736 |
+| Test.java:3394:12:3394:13 | in : Object | Test.java:3394:4:3394:6 | out [post update] : MultiMap [<map.key>] : Object | provenance | MaD:779 |
 | Test.java:3395:19:3395:21 | out : MultiMap [<map.key>] : Object | Test.java:228:18:228:29 | map : MultiMap [<map.key>] : Object | provenance |  |
-| Test.java:3395:19:3395:21 | out : MultiMap [<map.key>] : Object | Test.java:3395:9:3395:22 | getMapKey(...) | provenance | MaD:10 |
+| Test.java:3395:19:3395:21 | out : MultiMap [<map.key>] : Object | Test.java:3395:9:3395:22 | getMapKey(...) | provenance | MaD:18 |
 | Test.java:3400:16:3400:23 | source(...) : Object | Test.java:3401:12:3401:13 | in : Object | provenance |  |
 | Test.java:3401:4:3401:6 | out [post update] : BidiMap [<map.key>] : Object | Test.java:3402:19:3402:21 | out : BidiMap [<map.key>] : Object | provenance |  |
-| Test.java:3401:12:3401:13 | in : Object | Test.java:3401:4:3401:6 | out [post update] : BidiMap [<map.key>] : Object | provenance | MaD:14 |
-| Test.java:3401:12:3401:13 | in : Object | Test.java:3401:4:3401:6 | out [post update] : BidiMap [<map.key>] : Object | provenance | MaD:705 |
+| Test.java:3401:12:3401:13 | in : Object | Test.java:3401:4:3401:6 | out [post update] : BidiMap [<map.key>] : Object | provenance | MaD:19 |
+| Test.java:3401:12:3401:13 | in : Object | Test.java:3401:4:3401:6 | out [post update] : BidiMap [<map.key>] : Object | provenance | MaD:779 |
 | Test.java:3402:19:3402:21 | out : BidiMap [<map.key>] : Object | Test.java:228:18:228:29 | map : BidiMap [<map.key>] : Object | provenance |  |
-| Test.java:3402:19:3402:21 | out : BidiMap [<map.key>] : Object | Test.java:3402:9:3402:22 | getMapKey(...) | provenance | MaD:10 |
+| Test.java:3402:19:3402:21 | out : BidiMap [<map.key>] : Object | Test.java:3402:9:3402:22 | getMapKey(...) | provenance | MaD:18 |
 | Test.java:3407:16:3407:23 | source(...) : Object | Test.java:3408:12:3408:13 | in : Object | provenance |  |
 | Test.java:3408:4:3408:6 | out [post update] : AbstractMapDecorator [<map.key>] : Object | Test.java:3409:19:3409:21 | out : AbstractMapDecorator [<map.key>] : Object | provenance |  |
-| Test.java:3408:12:3408:13 | in : Object | Test.java:3408:4:3408:6 | out [post update] : AbstractMapDecorator [<map.key>] : Object | provenance | MaD:14 |
-| Test.java:3408:12:3408:13 | in : Object | Test.java:3408:4:3408:6 | out [post update] : AbstractMapDecorator [<map.key>] : Object | provenance | MaD:705 |
+| Test.java:3408:12:3408:13 | in : Object | Test.java:3408:4:3408:6 | out [post update] : AbstractMapDecorator [<map.key>] : Object | provenance | MaD:19 |
+| Test.java:3408:12:3408:13 | in : Object | Test.java:3408:4:3408:6 | out [post update] : AbstractMapDecorator [<map.key>] : Object | provenance | MaD:779 |
 | Test.java:3409:19:3409:21 | out : AbstractMapDecorator [<map.key>] : Object | Test.java:228:18:228:29 | map : AbstractMapDecorator [<map.key>] : Object | provenance |  |
-| Test.java:3409:19:3409:21 | out : AbstractMapDecorator [<map.key>] : Object | Test.java:3409:9:3409:22 | getMapKey(...) | provenance | MaD:10 |
+| Test.java:3409:19:3409:21 | out : AbstractMapDecorator [<map.key>] : Object | Test.java:3409:9:3409:22 | getMapKey(...) | provenance | MaD:18 |
 | Test.java:3414:16:3414:23 | source(...) : Object | Test.java:3415:18:3415:19 | in : Object | provenance |  |
 | Test.java:3415:4:3415:6 | out [post update] : Put [<map.value>] : Object | Test.java:3416:28:3416:30 | out : Put [<map.value>] : Object | provenance |  |
-| Test.java:3415:18:3415:19 | in : Object | Test.java:3415:4:3415:6 | out [post update] : Put [<map.value>] : Object | provenance | MaD:706 |
+| Test.java:3415:18:3415:19 | in : Object | Test.java:3415:4:3415:6 | out [post update] : Put [<map.value>] : Object | provenance | MaD:780 |
 | Test.java:3416:28:3416:30 | out : Put [<map.value>] : Object | Test.java:249:29:249:46 | container : Put [<map.value>] : Object | provenance |  |
-| Test.java:3416:28:3416:30 | out : Put [<map.value>] : Object | Test.java:3416:9:3416:31 | getMapValueFromPut(...) | provenance | MaD:9 |
+| Test.java:3416:28:3416:30 | out : Put [<map.value>] : Object | Test.java:3416:9:3416:31 | getMapValueFromPut(...) | provenance | MaD:17 |
 | Test.java:3421:16:3421:23 | source(...) : Object | Test.java:3422:18:3422:19 | in : Object | provenance |  |
 | Test.java:3422:4:3422:6 | out [post update] : MultiValueMap [<map.value>] : Object | Test.java:3423:21:3423:23 | out : MultiValueMap [<map.value>] : Object | provenance |  |
-| Test.java:3422:18:3422:19 | in : Object | Test.java:3422:4:3422:6 | out [post update] : MultiValueMap [<map.value>] : Object | provenance | MaD:15 |
-| Test.java:3422:18:3422:19 | in : Object | Test.java:3422:4:3422:6 | out [post update] : MultiValueMap [<map.value>] : Object | provenance | MaD:706 |
+| Test.java:3422:18:3422:19 | in : Object | Test.java:3422:4:3422:6 | out [post update] : MultiValueMap [<map.value>] : Object | provenance | MaD:20 |
+| Test.java:3422:18:3422:19 | in : Object | Test.java:3422:4:3422:6 | out [post update] : MultiValueMap [<map.value>] : Object | provenance | MaD:780 |
 | Test.java:3423:21:3423:23 | out : MultiValueMap [<map.value>] : Object | Test.java:232:20:232:31 | map : MultiValueMap [<map.value>] : Object | provenance |  |
-| Test.java:3423:21:3423:23 | out : MultiValueMap [<map.value>] : Object | Test.java:3423:9:3423:24 | getMapValue(...) | provenance | MaD:9 |
+| Test.java:3423:21:3423:23 | out : MultiValueMap [<map.value>] : Object | Test.java:3423:9:3423:24 | getMapValue(...) | provenance | MaD:17 |
 | Test.java:3428:16:3428:23 | source(...) : Object | Test.java:3429:18:3429:19 | in : Object | provenance |  |
 | Test.java:3429:4:3429:6 | out [post update] : MultiMap [<map.value>] : Object | Test.java:3430:21:3430:23 | out : MultiMap [<map.value>] : Object | provenance |  |
-| Test.java:3429:18:3429:19 | in : Object | Test.java:3429:4:3429:6 | out [post update] : MultiMap [<map.value>] : Object | provenance | MaD:15 |
-| Test.java:3429:18:3429:19 | in : Object | Test.java:3429:4:3429:6 | out [post update] : MultiMap [<map.value>] : Object | provenance | MaD:706 |
+| Test.java:3429:18:3429:19 | in : Object | Test.java:3429:4:3429:6 | out [post update] : MultiMap [<map.value>] : Object | provenance | MaD:20 |
+| Test.java:3429:18:3429:19 | in : Object | Test.java:3429:4:3429:6 | out [post update] : MultiMap [<map.value>] : Object | provenance | MaD:780 |
 | Test.java:3430:21:3430:23 | out : MultiMap [<map.value>] : Object | Test.java:232:20:232:31 | map : MultiMap [<map.value>] : Object | provenance |  |
-| Test.java:3430:21:3430:23 | out : MultiMap [<map.value>] : Object | Test.java:3430:9:3430:24 | getMapValue(...) | provenance | MaD:9 |
+| Test.java:3430:21:3430:23 | out : MultiMap [<map.value>] : Object | Test.java:3430:9:3430:24 | getMapValue(...) | provenance | MaD:17 |
 | Test.java:3435:16:3435:23 | source(...) : Object | Test.java:3436:18:3436:19 | in : Object | provenance |  |
 | Test.java:3436:4:3436:6 | out [post update] : BidiMap [<map.value>] : Object | Test.java:3437:21:3437:23 | out : BidiMap [<map.value>] : Object | provenance |  |
-| Test.java:3436:18:3436:19 | in : Object | Test.java:3436:4:3436:6 | out [post update] : BidiMap [<map.value>] : Object | provenance | MaD:15 |
-| Test.java:3436:18:3436:19 | in : Object | Test.java:3436:4:3436:6 | out [post update] : BidiMap [<map.value>] : Object | provenance | MaD:706 |
+| Test.java:3436:18:3436:19 | in : Object | Test.java:3436:4:3436:6 | out [post update] : BidiMap [<map.value>] : Object | provenance | MaD:20 |
+| Test.java:3436:18:3436:19 | in : Object | Test.java:3436:4:3436:6 | out [post update] : BidiMap [<map.value>] : Object | provenance | MaD:780 |
 | Test.java:3437:21:3437:23 | out : BidiMap [<map.value>] : Object | Test.java:232:20:232:31 | map : BidiMap [<map.value>] : Object | provenance |  |
-| Test.java:3437:21:3437:23 | out : BidiMap [<map.value>] : Object | Test.java:3437:9:3437:24 | getMapValue(...) | provenance | MaD:9 |
+| Test.java:3437:21:3437:23 | out : BidiMap [<map.value>] : Object | Test.java:3437:9:3437:24 | getMapValue(...) | provenance | MaD:17 |
 | Test.java:3442:16:3442:23 | source(...) : Object | Test.java:3443:18:3443:19 | in : Object | provenance |  |
 | Test.java:3443:4:3443:6 | out [post update] : AbstractMapDecorator [<map.value>] : Object | Test.java:3444:21:3444:23 | out : AbstractMapDecorator [<map.value>] : Object | provenance |  |
-| Test.java:3443:18:3443:19 | in : Object | Test.java:3443:4:3443:6 | out [post update] : AbstractMapDecorator [<map.value>] : Object | provenance | MaD:15 |
-| Test.java:3443:18:3443:19 | in : Object | Test.java:3443:4:3443:6 | out [post update] : AbstractMapDecorator [<map.value>] : Object | provenance | MaD:706 |
+| Test.java:3443:18:3443:19 | in : Object | Test.java:3443:4:3443:6 | out [post update] : AbstractMapDecorator [<map.value>] : Object | provenance | MaD:20 |
+| Test.java:3443:18:3443:19 | in : Object | Test.java:3443:4:3443:6 | out [post update] : AbstractMapDecorator [<map.value>] : Object | provenance | MaD:780 |
 | Test.java:3444:21:3444:23 | out : AbstractMapDecorator [<map.value>] : Object | Test.java:232:20:232:31 | map : AbstractMapDecorator [<map.value>] : Object | provenance |  |
-| Test.java:3444:21:3444:23 | out : AbstractMapDecorator [<map.value>] : Object | Test.java:3444:9:3444:24 | getMapValue(...) | provenance | MaD:9 |
+| Test.java:3444:21:3444:23 | out : AbstractMapDecorator [<map.value>] : Object | Test.java:3444:9:3444:24 | getMapValue(...) | provenance | MaD:17 |
 | Test.java:3449:13:3449:54 | newHashedMapWithMapValue(...) : HashedMap [<map.value>] : String | Test.java:3450:10:3450:11 | in : HashedMap [<map.value>] : String | provenance |  |
 | Test.java:3449:38:3449:53 | (...)... : String | Test.java:293:51:293:57 | value : String | provenance |  |
-| Test.java:3449:38:3449:53 | (...)... : String | Test.java:3449:13:3449:54 | newHashedMapWithMapValue(...) : HashedMap [<map.value>] : String | provenance | MaD:15 |
-| Test.java:3449:38:3449:53 | (...)... : String | Test.java:3449:13:3449:54 | newHashedMapWithMapValue(...) : HashedMap [<map.value>] : String | provenance | MaD:706 |
+| Test.java:3449:38:3449:53 | (...)... : String | Test.java:3449:13:3449:54 | newHashedMapWithMapValue(...) : HashedMap [<map.value>] : String | provenance | MaD:20 |
+| Test.java:3449:38:3449:53 | (...)... : String | Test.java:3449:13:3449:54 | newHashedMapWithMapValue(...) : HashedMap [<map.value>] : String | provenance | MaD:780 |
 | Test.java:3449:46:3449:53 | source(...) : Object | Test.java:3449:38:3449:53 | (...)... : String | provenance |  |
-| Test.java:3450:10:3450:11 | in : HashedMap [<map.value>] : String | Test.java:3450:10:3450:27 | put(...) : String | provenance | MaD:704 |
+| Test.java:3450:10:3450:11 | in : HashedMap [<map.value>] : String | Test.java:3450:10:3450:27 | put(...) : String | provenance | MaD:781 |
 | Test.java:3450:10:3450:27 | put(...) : String | Test.java:3451:9:3451:11 | out | provenance |  |
 | Test.java:3456:23:3456:58 | newMVMWithMapValue(...) : MultiValueMap [<map.value>] : String | Test.java:3457:10:3457:11 | in : MultiValueMap [<map.value>] : String | provenance |  |
 | Test.java:3456:42:3456:57 | (...)... : String | Test.java:298:49:298:55 | value : String | provenance |  |
-| Test.java:3456:42:3456:57 | (...)... : String | Test.java:3456:23:3456:58 | newMVMWithMapValue(...) : MultiValueMap [<map.value>] : String | provenance | MaD:15 |
-| Test.java:3456:42:3456:57 | (...)... : String | Test.java:3456:23:3456:58 | newMVMWithMapValue(...) : MultiValueMap [<map.value>] : String | provenance | MaD:706 |
+| Test.java:3456:42:3456:57 | (...)... : String | Test.java:3456:23:3456:58 | newMVMWithMapValue(...) : MultiValueMap [<map.value>] : String | provenance | MaD:20 |
+| Test.java:3456:42:3456:57 | (...)... : String | Test.java:3456:23:3456:58 | newMVMWithMapValue(...) : MultiValueMap [<map.value>] : String | provenance | MaD:780 |
 | Test.java:3456:50:3456:57 | source(...) : Object | Test.java:3456:42:3456:57 | (...)... : String | provenance |  |
-| Test.java:3457:10:3457:11 | in : MultiValueMap [<map.value>] : String | Test.java:3457:10:3457:27 | put(...) : String | provenance | MaD:13 |
-| Test.java:3457:10:3457:11 | in : MultiValueMap [<map.value>] : String | Test.java:3457:10:3457:27 | put(...) : String | provenance | MaD:704 |
+| Test.java:3457:10:3457:11 | in : MultiValueMap [<map.value>] : String | Test.java:3457:10:3457:27 | put(...) : String | provenance | MaD:21 |
+| Test.java:3457:10:3457:11 | in : MultiValueMap [<map.value>] : String | Test.java:3457:10:3457:27 | put(...) : String | provenance | MaD:781 |
 | Test.java:3457:10:3457:27 | put(...) : String | Test.java:3458:9:3458:11 | out | provenance |  |
 | Test.java:3463:18:3463:53 | newMVMWithMapValue(...) : MultiValueMap [<map.value>] : String | Test.java:3464:10:3464:11 | in : MultiValueMap [<map.value>] : String | provenance |  |
 | Test.java:3463:37:3463:52 | (...)... : String | Test.java:298:49:298:55 | value : String | provenance |  |
-| Test.java:3463:37:3463:52 | (...)... : String | Test.java:3463:18:3463:53 | newMVMWithMapValue(...) : MultiValueMap [<map.value>] : String | provenance | MaD:15 |
-| Test.java:3463:37:3463:52 | (...)... : String | Test.java:3463:18:3463:53 | newMVMWithMapValue(...) : MultiValueMap [<map.value>] : String | provenance | MaD:706 |
+| Test.java:3463:37:3463:52 | (...)... : String | Test.java:3463:18:3463:53 | newMVMWithMapValue(...) : MultiValueMap [<map.value>] : String | provenance | MaD:20 |
+| Test.java:3463:37:3463:52 | (...)... : String | Test.java:3463:18:3463:53 | newMVMWithMapValue(...) : MultiValueMap [<map.value>] : String | provenance | MaD:780 |
 | Test.java:3463:45:3463:52 | source(...) : Object | Test.java:3463:37:3463:52 | (...)... : String | provenance |  |
-| Test.java:3464:10:3464:11 | in : MultiValueMap [<map.value>] : String | Test.java:3464:10:3464:27 | put(...) : String | provenance | MaD:13 |
-| Test.java:3464:10:3464:11 | in : MultiValueMap [<map.value>] : String | Test.java:3464:10:3464:27 | put(...) : String | provenance | MaD:704 |
+| Test.java:3464:10:3464:11 | in : MultiValueMap [<map.value>] : String | Test.java:3464:10:3464:27 | put(...) : String | provenance | MaD:21 |
+| Test.java:3464:10:3464:11 | in : MultiValueMap [<map.value>] : String | Test.java:3464:10:3464:27 | put(...) : String | provenance | MaD:781 |
 | Test.java:3464:10:3464:27 | put(...) : String | Test.java:3465:9:3465:11 | out | provenance |  |
 | Test.java:3470:17:3470:60 | newTreeBidiMapWithMapValue(...) : TreeBidiMap [<map.value>] : String | Test.java:3471:10:3471:11 | in : TreeBidiMap [<map.value>] : String | provenance |  |
 | Test.java:3470:44:3470:59 | (...)... : String | Test.java:306:77:306:83 | value : String | provenance |  |
-| Test.java:3470:44:3470:59 | (...)... : String | Test.java:3470:17:3470:60 | newTreeBidiMapWithMapValue(...) : TreeBidiMap [<map.value>] : String | provenance | MaD:15 |
-| Test.java:3470:44:3470:59 | (...)... : String | Test.java:3470:17:3470:60 | newTreeBidiMapWithMapValue(...) : TreeBidiMap [<map.value>] : String | provenance | MaD:706 |
+| Test.java:3470:44:3470:59 | (...)... : String | Test.java:3470:17:3470:60 | newTreeBidiMapWithMapValue(...) : TreeBidiMap [<map.value>] : String | provenance | MaD:20 |
+| Test.java:3470:44:3470:59 | (...)... : String | Test.java:3470:17:3470:60 | newTreeBidiMapWithMapValue(...) : TreeBidiMap [<map.value>] : String | provenance | MaD:780 |
 | Test.java:3470:52:3470:59 | source(...) : Object | Test.java:3470:44:3470:59 | (...)... : String | provenance |  |
-| Test.java:3471:10:3471:11 | in : TreeBidiMap [<map.value>] : String | Test.java:3471:10:3471:27 | put(...) : String | provenance | MaD:13 |
-| Test.java:3471:10:3471:11 | in : TreeBidiMap [<map.value>] : String | Test.java:3471:10:3471:27 | put(...) : String | provenance | MaD:704 |
+| Test.java:3471:10:3471:11 | in : TreeBidiMap [<map.value>] : String | Test.java:3471:10:3471:27 | put(...) : String | provenance | MaD:21 |
+| Test.java:3471:10:3471:11 | in : TreeBidiMap [<map.value>] : String | Test.java:3471:10:3471:27 | put(...) : String | provenance | MaD:781 |
 | Test.java:3471:10:3471:27 | put(...) : String | Test.java:3472:9:3472:11 | out | provenance |  |
 | Test.java:3477:30:3477:65 | newMVMWithMapValue(...) : MultiValueMap [<map.value>] : String | Test.java:3478:10:3478:11 | in : MultiValueMap [<map.value>] : String | provenance |  |
 | Test.java:3477:49:3477:64 | (...)... : String | Test.java:298:49:298:55 | value : String | provenance |  |
-| Test.java:3477:49:3477:64 | (...)... : String | Test.java:3477:30:3477:65 | newMVMWithMapValue(...) : MultiValueMap [<map.value>] : String | provenance | MaD:15 |
-| Test.java:3477:49:3477:64 | (...)... : String | Test.java:3477:30:3477:65 | newMVMWithMapValue(...) : MultiValueMap [<map.value>] : String | provenance | MaD:706 |
+| Test.java:3477:49:3477:64 | (...)... : String | Test.java:3477:30:3477:65 | newMVMWithMapValue(...) : MultiValueMap [<map.value>] : String | provenance | MaD:20 |
+| Test.java:3477:49:3477:64 | (...)... : String | Test.java:3477:30:3477:65 | newMVMWithMapValue(...) : MultiValueMap [<map.value>] : String | provenance | MaD:780 |
 | Test.java:3477:57:3477:64 | source(...) : Object | Test.java:3477:49:3477:64 | (...)... : String | provenance |  |
-| Test.java:3478:10:3478:11 | in : MultiValueMap [<map.value>] : String | Test.java:3478:10:3478:27 | put(...) : String | provenance | MaD:13 |
-| Test.java:3478:10:3478:11 | in : MultiValueMap [<map.value>] : String | Test.java:3478:10:3478:27 | put(...) : String | provenance | MaD:704 |
+| Test.java:3478:10:3478:11 | in : MultiValueMap [<map.value>] : String | Test.java:3478:10:3478:27 | put(...) : String | provenance | MaD:21 |
+| Test.java:3478:10:3478:11 | in : MultiValueMap [<map.value>] : String | Test.java:3478:10:3478:27 | put(...) : String | provenance | MaD:781 |
 | Test.java:3478:10:3478:27 | put(...) : String | Test.java:3479:9:3479:11 | out | provenance |  |
 | Test.java:3484:13:3484:50 | newTreeMapWithMapKey(...) : TreeMap [<map.key>] : String | Test.java:3485:15:3485:16 | in : TreeMap [<map.key>] : String | provenance |  |
 | Test.java:3484:34:3484:49 | (...)... : String | Test.java:285:47:285:51 | key : String | provenance |  |
-| Test.java:3484:34:3484:49 | (...)... : String | Test.java:3484:13:3484:50 | newTreeMapWithMapKey(...) : TreeMap [<map.key>] : String | provenance | MaD:14 |
+| Test.java:3484:34:3484:49 | (...)... : String | Test.java:3484:13:3484:50 | newTreeMapWithMapKey(...) : TreeMap [<map.key>] : String | provenance | MaD:19 |
 | Test.java:3484:42:3484:49 | source(...) : Object | Test.java:3484:34:3484:49 | (...)... : String | provenance |  |
 | Test.java:3485:4:3485:6 | out [post update] : Put [<map.key>] : String | Test.java:3486:26:3486:28 | out : Put [<map.key>] : String | provenance |  |
-| Test.java:3485:15:3485:16 | in : TreeMap [<map.key>] : String | Test.java:3485:4:3485:6 | out [post update] : Put [<map.key>] : String | provenance | MaD:707 |
+| Test.java:3485:15:3485:16 | in : TreeMap [<map.key>] : String | Test.java:3485:4:3485:6 | out [post update] : Put [<map.key>] : String | provenance | MaD:782 |
 | Test.java:3486:26:3486:28 | out : Put [<map.key>] : String | Test.java:242:27:242:44 | container : Put [<map.key>] : String | provenance |  |
-| Test.java:3486:26:3486:28 | out : Put [<map.key>] : String | Test.java:3486:9:3486:29 | getMapKeyFromPut(...) | provenance | MaD:10 |
+| Test.java:3486:26:3486:28 | out : Put [<map.key>] : String | Test.java:3486:9:3486:29 | getMapKeyFromPut(...) | provenance | MaD:18 |
 | Test.java:3491:13:3491:50 | newTreeMapWithMapKey(...) : TreeMap [<map.key>] : String | Test.java:3492:15:3492:16 | in : TreeMap [<map.key>] : String | provenance |  |
 | Test.java:3491:34:3491:49 | (...)... : String | Test.java:285:47:285:51 | key : String | provenance |  |
-| Test.java:3491:34:3491:49 | (...)... : String | Test.java:3491:13:3491:50 | newTreeMapWithMapKey(...) : TreeMap [<map.key>] : String | provenance | MaD:14 |
+| Test.java:3491:34:3491:49 | (...)... : String | Test.java:3491:13:3491:50 | newTreeMapWithMapKey(...) : TreeMap [<map.key>] : String | provenance | MaD:19 |
 | Test.java:3491:42:3491:49 | source(...) : Object | Test.java:3491:34:3491:49 | (...)... : String | provenance |  |
 | Test.java:3492:4:3492:6 | out [post update] : MultiValueMap [<map.key>] : String | Test.java:3493:19:3493:21 | out : MultiValueMap [<map.key>] : String | provenance |  |
-| Test.java:3492:15:3492:16 | in : TreeMap [<map.key>] : String | Test.java:3492:4:3492:6 | out [post update] : MultiValueMap [<map.key>] : String | provenance | MaD:16 |
-| Test.java:3492:15:3492:16 | in : TreeMap [<map.key>] : String | Test.java:3492:4:3492:6 | out [post update] : MultiValueMap [<map.key>] : String | provenance | MaD:707 |
+| Test.java:3492:15:3492:16 | in : TreeMap [<map.key>] : String | Test.java:3492:4:3492:6 | out [post update] : MultiValueMap [<map.key>] : String | provenance | MaD:22 |
+| Test.java:3492:15:3492:16 | in : TreeMap [<map.key>] : String | Test.java:3492:4:3492:6 | out [post update] : MultiValueMap [<map.key>] : String | provenance | MaD:782 |
 | Test.java:3493:19:3493:21 | out : MultiValueMap [<map.key>] : String | Test.java:228:18:228:29 | map : MultiValueMap [<map.key>] : String | provenance |  |
-| Test.java:3493:19:3493:21 | out : MultiValueMap [<map.key>] : String | Test.java:3493:9:3493:22 | getMapKey(...) | provenance | MaD:10 |
+| Test.java:3493:19:3493:21 | out : MultiValueMap [<map.key>] : String | Test.java:3493:9:3493:22 | getMapKey(...) | provenance | MaD:18 |
 | Test.java:3498:13:3498:50 | newTreeMapWithMapKey(...) : TreeMap [<map.key>] : String | Test.java:3499:15:3499:16 | in : TreeMap [<map.key>] : String | provenance |  |
 | Test.java:3498:34:3498:49 | (...)... : String | Test.java:285:47:285:51 | key : String | provenance |  |
-| Test.java:3498:34:3498:49 | (...)... : String | Test.java:3498:13:3498:50 | newTreeMapWithMapKey(...) : TreeMap [<map.key>] : String | provenance | MaD:14 |
+| Test.java:3498:34:3498:49 | (...)... : String | Test.java:3498:13:3498:50 | newTreeMapWithMapKey(...) : TreeMap [<map.key>] : String | provenance | MaD:19 |
 | Test.java:3498:42:3498:49 | source(...) : Object | Test.java:3498:34:3498:49 | (...)... : String | provenance |  |
 | Test.java:3499:4:3499:6 | out [post update] : AbstractMapDecorator [<map.key>] : String | Test.java:3500:19:3500:21 | out : AbstractMapDecorator [<map.key>] : String | provenance |  |
-| Test.java:3499:15:3499:16 | in : TreeMap [<map.key>] : String | Test.java:3499:4:3499:6 | out [post update] : AbstractMapDecorator [<map.key>] : String | provenance | MaD:16 |
-| Test.java:3499:15:3499:16 | in : TreeMap [<map.key>] : String | Test.java:3499:4:3499:6 | out [post update] : AbstractMapDecorator [<map.key>] : String | provenance | MaD:707 |
+| Test.java:3499:15:3499:16 | in : TreeMap [<map.key>] : String | Test.java:3499:4:3499:6 | out [post update] : AbstractMapDecorator [<map.key>] : String | provenance | MaD:22 |
+| Test.java:3499:15:3499:16 | in : TreeMap [<map.key>] : String | Test.java:3499:4:3499:6 | out [post update] : AbstractMapDecorator [<map.key>] : String | provenance | MaD:782 |
 | Test.java:3500:19:3500:21 | out : AbstractMapDecorator [<map.key>] : String | Test.java:228:18:228:29 | map : AbstractMapDecorator [<map.key>] : String | provenance |  |
-| Test.java:3500:19:3500:21 | out : AbstractMapDecorator [<map.key>] : String | Test.java:3500:9:3500:22 | getMapKey(...) | provenance | MaD:10 |
+| Test.java:3500:19:3500:21 | out : AbstractMapDecorator [<map.key>] : String | Test.java:3500:9:3500:22 | getMapKey(...) | provenance | MaD:18 |
 | Test.java:3505:13:3505:52 | newTreeMapWithMapValue(...) : TreeMap [<map.value>] : String | Test.java:3506:15:3506:16 | in : TreeMap [<map.value>] : String | provenance |  |
 | Test.java:3505:36:3505:51 | (...)... : String | Test.java:304:49:304:55 | value : String | provenance |  |
-| Test.java:3505:36:3505:51 | (...)... : String | Test.java:3505:13:3505:52 | newTreeMapWithMapValue(...) : TreeMap [<map.value>] : String | provenance | MaD:15 |
+| Test.java:3505:36:3505:51 | (...)... : String | Test.java:3505:13:3505:52 | newTreeMapWithMapValue(...) : TreeMap [<map.value>] : String | provenance | MaD:20 |
 | Test.java:3505:44:3505:51 | source(...) : Object | Test.java:3505:36:3505:51 | (...)... : String | provenance |  |
 | Test.java:3506:4:3506:6 | out [post update] : Put [<map.value>] : String | Test.java:3507:28:3507:30 | out : Put [<map.value>] : String | provenance |  |
-| Test.java:3506:15:3506:16 | in : TreeMap [<map.value>] : String | Test.java:3506:4:3506:6 | out [post update] : Put [<map.value>] : String | provenance | MaD:708 |
+| Test.java:3506:15:3506:16 | in : TreeMap [<map.value>] : String | Test.java:3506:4:3506:6 | out [post update] : Put [<map.value>] : String | provenance | MaD:783 |
 | Test.java:3507:28:3507:30 | out : Put [<map.value>] : String | Test.java:249:29:249:46 | container : Put [<map.value>] : String | provenance |  |
-| Test.java:3507:28:3507:30 | out : Put [<map.value>] : String | Test.java:3507:9:3507:31 | getMapValueFromPut(...) | provenance | MaD:9 |
+| Test.java:3507:28:3507:30 | out : Put [<map.value>] : String | Test.java:3507:9:3507:31 | getMapValueFromPut(...) | provenance | MaD:17 |
 | Test.java:3512:13:3512:52 | newTreeMapWithMapValue(...) : TreeMap [<map.value>] : String | Test.java:3513:15:3513:16 | in : TreeMap [<map.value>] : String | provenance |  |
 | Test.java:3512:36:3512:51 | (...)... : String | Test.java:304:49:304:55 | value : String | provenance |  |
-| Test.java:3512:36:3512:51 | (...)... : String | Test.java:3512:13:3512:52 | newTreeMapWithMapValue(...) : TreeMap [<map.value>] : String | provenance | MaD:15 |
+| Test.java:3512:36:3512:51 | (...)... : String | Test.java:3512:13:3512:52 | newTreeMapWithMapValue(...) : TreeMap [<map.value>] : String | provenance | MaD:20 |
 | Test.java:3512:44:3512:51 | source(...) : Object | Test.java:3512:36:3512:51 | (...)... : String | provenance |  |
 | Test.java:3513:4:3513:6 | out [post update] : MultiValueMap [<map.value>] : String | Test.java:3514:21:3514:23 | out : MultiValueMap [<map.value>] : String | provenance |  |
-| Test.java:3513:15:3513:16 | in : TreeMap [<map.value>] : String | Test.java:3513:4:3513:6 | out [post update] : MultiValueMap [<map.value>] : String | provenance | MaD:17 |
-| Test.java:3513:15:3513:16 | in : TreeMap [<map.value>] : String | Test.java:3513:4:3513:6 | out [post update] : MultiValueMap [<map.value>] : String | provenance | MaD:708 |
+| Test.java:3513:15:3513:16 | in : TreeMap [<map.value>] : String | Test.java:3513:4:3513:6 | out [post update] : MultiValueMap [<map.value>] : String | provenance | MaD:23 |
+| Test.java:3513:15:3513:16 | in : TreeMap [<map.value>] : String | Test.java:3513:4:3513:6 | out [post update] : MultiValueMap [<map.value>] : String | provenance | MaD:783 |
 | Test.java:3514:21:3514:23 | out : MultiValueMap [<map.value>] : String | Test.java:232:20:232:31 | map : MultiValueMap [<map.value>] : String | provenance |  |
-| Test.java:3514:21:3514:23 | out : MultiValueMap [<map.value>] : String | Test.java:3514:9:3514:24 | getMapValue(...) | provenance | MaD:9 |
+| Test.java:3514:21:3514:23 | out : MultiValueMap [<map.value>] : String | Test.java:3514:9:3514:24 | getMapValue(...) | provenance | MaD:17 |
 | Test.java:3519:13:3519:52 | newTreeMapWithMapValue(...) : TreeMap [<map.value>] : String | Test.java:3520:15:3520:16 | in : TreeMap [<map.value>] : String | provenance |  |
 | Test.java:3519:36:3519:51 | (...)... : String | Test.java:304:49:304:55 | value : String | provenance |  |
-| Test.java:3519:36:3519:51 | (...)... : String | Test.java:3519:13:3519:52 | newTreeMapWithMapValue(...) : TreeMap [<map.value>] : String | provenance | MaD:15 |
+| Test.java:3519:36:3519:51 | (...)... : String | Test.java:3519:13:3519:52 | newTreeMapWithMapValue(...) : TreeMap [<map.value>] : String | provenance | MaD:20 |
 | Test.java:3519:44:3519:51 | source(...) : Object | Test.java:3519:36:3519:51 | (...)... : String | provenance |  |
 | Test.java:3520:4:3520:6 | out [post update] : AbstractMapDecorator [<map.value>] : String | Test.java:3521:21:3521:23 | out : AbstractMapDecorator [<map.value>] : String | provenance |  |
-| Test.java:3520:15:3520:16 | in : TreeMap [<map.value>] : String | Test.java:3520:4:3520:6 | out [post update] : AbstractMapDecorator [<map.value>] : String | provenance | MaD:17 |
-| Test.java:3520:15:3520:16 | in : TreeMap [<map.value>] : String | Test.java:3520:4:3520:6 | out [post update] : AbstractMapDecorator [<map.value>] : String | provenance | MaD:708 |
+| Test.java:3520:15:3520:16 | in : TreeMap [<map.value>] : String | Test.java:3520:4:3520:6 | out [post update] : AbstractMapDecorator [<map.value>] : String | provenance | MaD:23 |
+| Test.java:3520:15:3520:16 | in : TreeMap [<map.value>] : String | Test.java:3520:4:3520:6 | out [post update] : AbstractMapDecorator [<map.value>] : String | provenance | MaD:783 |
 | Test.java:3521:21:3521:23 | out : AbstractMapDecorator [<map.value>] : String | Test.java:232:20:232:31 | map : AbstractMapDecorator [<map.value>] : String | provenance |  |
-| Test.java:3521:21:3521:23 | out : AbstractMapDecorator [<map.value>] : String | Test.java:3521:9:3521:24 | getMapValue(...) | provenance | MaD:9 |
+| Test.java:3521:21:3521:23 | out : AbstractMapDecorator [<map.value>] : String | Test.java:3521:9:3521:24 | getMapValue(...) | provenance | MaD:17 |
 | Test.java:3526:15:3526:51 | newQueueWithElement(...) : LinkedList [<element>] : String | Test.java:3527:37:3527:38 | in : LinkedList [<element>] : String | provenance |  |
 | Test.java:3526:35:3526:50 | (...)... : String | Test.java:265:35:265:43 | element : String | provenance |  |
-| Test.java:3526:35:3526:50 | (...)... : String | Test.java:3526:15:3526:51 | newQueueWithElement(...) : LinkedList [<element>] : String | provenance | MaD:2 |
+| Test.java:3526:35:3526:50 | (...)... : String | Test.java:3526:15:3526:51 | newQueueWithElement(...) : LinkedList [<element>] : String | provenance | MaD:4 |
 | Test.java:3526:43:3526:50 | source(...) : Object | Test.java:3526:35:3526:50 | (...)... : String | provenance |  |
 | Test.java:3527:10:3527:45 | predicatedQueue(...) : Queue [<element>] : String | Test.java:3528:20:3528:22 | out : Queue [<element>] : String | provenance |  |
-| Test.java:3527:37:3527:38 | in : LinkedList [<element>] : String | Test.java:3527:10:3527:45 | predicatedQueue(...) : Queue [<element>] : String | provenance | MaD:709 |
+| Test.java:3527:37:3527:38 | in : LinkedList [<element>] : String | Test.java:3527:10:3527:45 | predicatedQueue(...) : Queue [<element>] : String | provenance | MaD:784 |
 | Test.java:3528:20:3528:22 | out : Queue [<element>] : String | Test.java:230:19:230:32 | it : Queue [<element>] : String | provenance |  |
-| Test.java:3528:20:3528:22 | out : Queue [<element>] : String | Test.java:3528:9:3528:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:3528:20:3528:22 | out : Queue [<element>] : String | Test.java:3528:9:3528:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:3533:15:3533:51 | newQueueWithElement(...) : LinkedList [<element>] : String | Test.java:3534:39:3534:40 | in : LinkedList [<element>] : String | provenance |  |
 | Test.java:3533:35:3533:50 | (...)... : String | Test.java:265:35:265:43 | element : String | provenance |  |
-| Test.java:3533:35:3533:50 | (...)... : String | Test.java:3533:15:3533:51 | newQueueWithElement(...) : LinkedList [<element>] : String | provenance | MaD:2 |
+| Test.java:3533:35:3533:50 | (...)... : String | Test.java:3533:15:3533:51 | newQueueWithElement(...) : LinkedList [<element>] : String | provenance | MaD:4 |
 | Test.java:3533:43:3533:50 | source(...) : Object | Test.java:3533:35:3533:50 | (...)... : String | provenance |  |
 | Test.java:3534:10:3534:41 | synchronizedQueue(...) : Queue [<element>] : String | Test.java:3535:20:3535:22 | out : Queue [<element>] : String | provenance |  |
-| Test.java:3534:39:3534:40 | in : LinkedList [<element>] : String | Test.java:3534:10:3534:41 | synchronizedQueue(...) : Queue [<element>] : String | provenance | MaD:710 |
+| Test.java:3534:39:3534:40 | in : LinkedList [<element>] : String | Test.java:3534:10:3534:41 | synchronizedQueue(...) : Queue [<element>] : String | provenance | MaD:785 |
 | Test.java:3535:20:3535:22 | out : Queue [<element>] : String | Test.java:230:19:230:32 | it : Queue [<element>] : String | provenance |  |
-| Test.java:3535:20:3535:22 | out : Queue [<element>] : String | Test.java:3535:9:3535:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:3535:20:3535:22 | out : Queue [<element>] : String | Test.java:3535:9:3535:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:3540:15:3540:51 | newQueueWithElement(...) : LinkedList [<element>] : String | Test.java:3541:39:3541:40 | in : LinkedList [<element>] : String | provenance |  |
 | Test.java:3540:35:3540:50 | (...)... : String | Test.java:265:35:265:43 | element : String | provenance |  |
-| Test.java:3540:35:3540:50 | (...)... : String | Test.java:3540:15:3540:51 | newQueueWithElement(...) : LinkedList [<element>] : String | provenance | MaD:2 |
+| Test.java:3540:35:3540:50 | (...)... : String | Test.java:3540:15:3540:51 | newQueueWithElement(...) : LinkedList [<element>] : String | provenance | MaD:4 |
 | Test.java:3540:43:3540:50 | source(...) : Object | Test.java:3540:35:3540:50 | (...)... : String | provenance |  |
 | Test.java:3541:10:3541:47 | transformingQueue(...) : Queue [<element>] : String | Test.java:3542:20:3542:22 | out : Queue [<element>] : String | provenance |  |
-| Test.java:3541:39:3541:40 | in : LinkedList [<element>] : String | Test.java:3541:10:3541:47 | transformingQueue(...) : Queue [<element>] : String | provenance | MaD:711 |
+| Test.java:3541:39:3541:40 | in : LinkedList [<element>] : String | Test.java:3541:10:3541:47 | transformingQueue(...) : Queue [<element>] : String | provenance | MaD:786 |
 | Test.java:3542:20:3542:22 | out : Queue [<element>] : String | Test.java:230:19:230:32 | it : Queue [<element>] : String | provenance |  |
-| Test.java:3542:20:3542:22 | out : Queue [<element>] : String | Test.java:3542:9:3542:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:3542:20:3542:22 | out : Queue [<element>] : String | Test.java:3542:9:3542:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:3547:15:3547:51 | newQueueWithElement(...) : LinkedList [<element>] : String | Test.java:3548:39:3548:40 | in : LinkedList [<element>] : String | provenance |  |
 | Test.java:3547:35:3547:50 | (...)... : String | Test.java:265:35:265:43 | element : String | provenance |  |
-| Test.java:3547:35:3547:50 | (...)... : String | Test.java:3547:15:3547:51 | newQueueWithElement(...) : LinkedList [<element>] : String | provenance | MaD:2 |
+| Test.java:3547:35:3547:50 | (...)... : String | Test.java:3547:15:3547:51 | newQueueWithElement(...) : LinkedList [<element>] : String | provenance | MaD:4 |
 | Test.java:3547:43:3547:50 | source(...) : Object | Test.java:3547:35:3547:50 | (...)... : String | provenance |  |
 | Test.java:3548:10:3548:41 | unmodifiableQueue(...) : Queue [<element>] : String | Test.java:3549:20:3549:22 | out : Queue [<element>] : String | provenance |  |
-| Test.java:3548:39:3548:40 | in : LinkedList [<element>] : String | Test.java:3548:10:3548:41 | unmodifiableQueue(...) : Queue [<element>] : String | provenance | MaD:712 |
+| Test.java:3548:39:3548:40 | in : LinkedList [<element>] : String | Test.java:3548:10:3548:41 | unmodifiableQueue(...) : Queue [<element>] : String | provenance | MaD:787 |
 | Test.java:3549:20:3549:22 | out : Queue [<element>] : String | Test.java:230:19:230:32 | it : Queue [<element>] : String | provenance |  |
-| Test.java:3549:20:3549:22 | out : Queue [<element>] : String | Test.java:3549:9:3549:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:3549:20:3549:22 | out : Queue [<element>] : String | Test.java:3549:9:3549:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:3554:26:3554:64 | newSetViewWithElement(...) : MySetView [<element>] : String | Test.java:3555:4:3555:5 | in : MySetView [<element>] : String | provenance |  |
 | Test.java:3554:48:3554:63 | (...)... : String | Test.java:266:41:266:49 | element : String | provenance |  |
-| Test.java:3554:48:3554:63 | (...)... : String | Test.java:3554:26:3554:64 | newSetViewWithElement(...) : MySetView [<element>] : String | provenance | MaD:2 |
+| Test.java:3554:48:3554:63 | (...)... : String | Test.java:3554:26:3554:64 | newSetViewWithElement(...) : MySetView [<element>] : String | provenance | MaD:4 |
 | Test.java:3554:56:3554:63 | source(...) : Object | Test.java:3554:48:3554:63 | (...)... : String | provenance |  |
-| Test.java:3555:4:3555:5 | in : MySetView [<element>] : String | Test.java:3555:16:3555:18 | out [post update] : Set [<element>] : String | provenance | MaD:735 |
+| Test.java:3555:4:3555:5 | in : MySetView [<element>] : String | Test.java:3555:16:3555:18 | out [post update] : Set [<element>] : String | provenance | MaD:788 |
 | Test.java:3555:16:3555:18 | out [post update] : Set [<element>] : String | Test.java:3556:20:3556:22 | out : Set [<element>] : String | provenance |  |
 | Test.java:3556:20:3556:22 | out : Set [<element>] : String | Test.java:230:19:230:32 | it : Set [<element>] : String | provenance |  |
-| Test.java:3556:20:3556:22 | out : Set [<element>] : String | Test.java:3556:9:3556:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:3556:20:3556:22 | out : Set [<element>] : String | Test.java:3556:9:3556:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:3561:19:3561:57 | newSetViewWithElement(...) : MySetView [<element>] : String | Test.java:3562:10:3562:11 | in : MySetView [<element>] : String | provenance |  |
 | Test.java:3561:41:3561:56 | (...)... : String | Test.java:266:41:266:49 | element : String | provenance |  |
-| Test.java:3561:41:3561:56 | (...)... : String | Test.java:3561:19:3561:57 | newSetViewWithElement(...) : MySetView [<element>] : String | provenance | MaD:2 |
+| Test.java:3561:41:3561:56 | (...)... : String | Test.java:3561:19:3561:57 | newSetViewWithElement(...) : MySetView [<element>] : String | provenance | MaD:4 |
 | Test.java:3561:49:3561:56 | source(...) : Object | Test.java:3561:41:3561:56 | (...)... : String | provenance |  |
-| Test.java:3562:10:3562:11 | in : MySetView [<element>] : String | Test.java:3562:10:3562:30 | myCreateIterator(...) : Iterator [<element>] : String | provenance | MaD:736 |
+| Test.java:3562:10:3562:11 | in : MySetView [<element>] : String | Test.java:3562:10:3562:30 | myCreateIterator(...) : Iterator [<element>] : String | provenance | MaD:789 |
 | Test.java:3562:10:3562:11 | in : MySetView [<element>] : String | Test.java:7082:15:7082:30 | parameter this : MySetView [<element>] : String | provenance |  |
 | Test.java:3562:10:3562:30 | myCreateIterator(...) : Iterator [<element>] : String | Test.java:3563:20:3563:22 | out : Iterator [<element>] : String | provenance |  |
 | Test.java:3563:20:3563:22 | out : Iterator [<element>] : String | Test.java:231:19:231:32 | it : Iterator [<element>] : String | provenance |  |
-| Test.java:3563:20:3563:22 | out : Iterator [<element>] : String | Test.java:3563:9:3563:23 | getElement(...) | provenance | MaD:4 |
+| Test.java:3563:20:3563:22 | out : Iterator [<element>] : String | Test.java:3563:9:3563:23 | getElement(...) | provenance | MaD:6 |
 | Test.java:3568:19:3568:57 | newSetViewWithElement(...) : MySetView [<element>] : String | Test.java:3569:10:3569:11 | in : MySetView [<element>] : String | provenance |  |
 | Test.java:3568:41:3568:56 | (...)... : String | Test.java:266:41:266:49 | element : String | provenance |  |
-| Test.java:3568:41:3568:56 | (...)... : String | Test.java:3568:19:3568:57 | newSetViewWithElement(...) : MySetView [<element>] : String | provenance | MaD:2 |
+| Test.java:3568:41:3568:56 | (...)... : String | Test.java:3568:19:3568:57 | newSetViewWithElement(...) : MySetView [<element>] : String | provenance | MaD:4 |
 | Test.java:3568:49:3568:56 | source(...) : Object | Test.java:3568:41:3568:56 | (...)... : String | provenance |  |
-| Test.java:3569:10:3569:11 | in : MySetView [<element>] : String | Test.java:3569:10:3569:19 | toSet(...) : Set [<element>] : String | provenance | MaD:737 |
+| Test.java:3569:10:3569:11 | in : MySetView [<element>] : String | Test.java:3569:10:3569:19 | toSet(...) : Set [<element>] : String | provenance | MaD:790 |
 | Test.java:3569:10:3569:19 | toSet(...) : Set [<element>] : String | Test.java:3570:20:3570:22 | out : Set [<element>] : String | provenance |  |
 | Test.java:3570:20:3570:22 | out : Set [<element>] : String | Test.java:230:19:230:32 | it : Set [<element>] : String | provenance |  |
-| Test.java:3570:20:3570:22 | out : Set [<element>] : String | Test.java:3570:9:3570:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:3570:20:3570:22 | out : Set [<element>] : String | Test.java:3570:9:3570:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:3575:13:3575:51 | newTreeSetWithElement(...) : TreeSet [<element>] : String | Test.java:3576:30:3576:31 | in : TreeSet [<element>] : String | provenance |  |
 | Test.java:3575:35:3575:50 | (...)... : String | Test.java:268:39:268:47 | element : String | provenance |  |
-| Test.java:3575:35:3575:50 | (...)... : String | Test.java:3575:13:3575:51 | newTreeSetWithElement(...) : TreeSet [<element>] : String | provenance | MaD:2 |
+| Test.java:3575:35:3575:50 | (...)... : String | Test.java:3575:13:3575:51 | newTreeSetWithElement(...) : TreeSet [<element>] : String | provenance | MaD:4 |
 | Test.java:3575:43:3575:50 | source(...) : Object | Test.java:3575:35:3575:50 | (...)... : String | provenance |  |
 | Test.java:3576:10:3576:38 | difference(...) : SetView [<element>] : String | Test.java:3577:20:3577:22 | out : SetView [<element>] : String | provenance |  |
-| Test.java:3576:30:3576:31 | in : TreeSet [<element>] : String | Test.java:3576:10:3576:38 | difference(...) : SetView [<element>] : String | provenance | MaD:713 |
+| Test.java:3576:30:3576:31 | in : TreeSet [<element>] : String | Test.java:3576:10:3576:38 | difference(...) : SetView [<element>] : String | provenance | MaD:791 |
 | Test.java:3577:20:3577:22 | out : SetView [<element>] : String | Test.java:230:19:230:32 | it : SetView [<element>] : String | provenance |  |
-| Test.java:3577:20:3577:22 | out : SetView [<element>] : String | Test.java:3577:9:3577:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:3577:20:3577:22 | out : SetView [<element>] : String | Test.java:3577:9:3577:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:3582:13:3582:51 | newTreeSetWithElement(...) : TreeSet [<element>] : String | Test.java:3583:31:3583:32 | in : TreeSet [<element>] : String | provenance |  |
 | Test.java:3582:35:3582:50 | (...)... : String | Test.java:268:39:268:47 | element : String | provenance |  |
-| Test.java:3582:35:3582:50 | (...)... : String | Test.java:3582:13:3582:51 | newTreeSetWithElement(...) : TreeSet [<element>] : String | provenance | MaD:2 |
+| Test.java:3582:35:3582:50 | (...)... : String | Test.java:3582:13:3582:51 | newTreeSetWithElement(...) : TreeSet [<element>] : String | provenance | MaD:4 |
 | Test.java:3582:43:3582:50 | source(...) : Object | Test.java:3582:35:3582:50 | (...)... : String | provenance |  |
 | Test.java:3583:10:3583:39 | disjunction(...) : SetView [<element>] : String | Test.java:3584:20:3584:22 | out : SetView [<element>] : String | provenance |  |
-| Test.java:3583:31:3583:32 | in : TreeSet [<element>] : String | Test.java:3583:10:3583:39 | disjunction(...) : SetView [<element>] : String | provenance | MaD:714 |
+| Test.java:3583:31:3583:32 | in : TreeSet [<element>] : String | Test.java:3583:10:3583:39 | disjunction(...) : SetView [<element>] : String | provenance | MaD:792 |
 | Test.java:3584:20:3584:22 | out : SetView [<element>] : String | Test.java:230:19:230:32 | it : SetView [<element>] : String | provenance |  |
-| Test.java:3584:20:3584:22 | out : SetView [<element>] : String | Test.java:3584:9:3584:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:3584:20:3584:22 | out : SetView [<element>] : String | Test.java:3584:9:3584:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:3589:13:3589:51 | newTreeSetWithElement(...) : TreeSet [<element>] : String | Test.java:3590:37:3590:38 | in : TreeSet [<element>] : String | provenance |  |
 | Test.java:3589:35:3589:50 | (...)... : String | Test.java:268:39:268:47 | element : String | provenance |  |
-| Test.java:3589:35:3589:50 | (...)... : String | Test.java:3589:13:3589:51 | newTreeSetWithElement(...) : TreeSet [<element>] : String | provenance | MaD:2 |
+| Test.java:3589:35:3589:50 | (...)... : String | Test.java:3589:13:3589:51 | newTreeSetWithElement(...) : TreeSet [<element>] : String | provenance | MaD:4 |
 | Test.java:3589:43:3589:50 | source(...) : Object | Test.java:3589:35:3589:50 | (...)... : String | provenance |  |
 | Test.java:3590:10:3590:39 | disjunction(...) : SetView [<element>] : String | Test.java:3591:20:3591:22 | out : SetView [<element>] : String | provenance |  |
-| Test.java:3590:37:3590:38 | in : TreeSet [<element>] : String | Test.java:3590:10:3590:39 | disjunction(...) : SetView [<element>] : String | provenance | MaD:715 |
+| Test.java:3590:37:3590:38 | in : TreeSet [<element>] : String | Test.java:3590:10:3590:39 | disjunction(...) : SetView [<element>] : String | provenance | MaD:793 |
 | Test.java:3591:20:3591:22 | out : SetView [<element>] : String | Test.java:230:19:230:32 | it : SetView [<element>] : String | provenance |  |
-| Test.java:3591:20:3591:22 | out : SetView [<element>] : String | Test.java:3591:9:3591:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:3591:20:3591:22 | out : SetView [<element>] : String | Test.java:3591:9:3591:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:3596:13:3596:25 | (...)... : Set | Test.java:3597:31:3597:32 | in : Set | provenance |  |
 | Test.java:3596:18:3596:25 | source(...) : Object | Test.java:3596:13:3596:25 | (...)... : Set | provenance |  |
 | Test.java:3597:10:3597:33 | emptyIfNull(...) : Set | Test.java:3598:9:3598:11 | out | provenance |  |
-| Test.java:3597:31:3597:32 | in : Set | Test.java:3597:10:3597:33 | emptyIfNull(...) : Set | provenance | MaD:716 |
+| Test.java:3597:31:3597:32 | in : Set | Test.java:3597:10:3597:33 | emptyIfNull(...) : Set | provenance | MaD:794 |
 | Test.java:3603:16:3603:23 | source(...) : Object | Test.java:3604:27:3604:28 | in : Object | provenance |  |
 | Test.java:3604:10:3604:35 | hashSet(...) : HashSet [<element>] : Object | Test.java:3605:20:3605:22 | out : HashSet [<element>] : Object | provenance |  |
-| Test.java:3604:10:3604:35 | new ..[] { .. } : Object[] [[]] : Object | Test.java:3604:10:3604:35 | hashSet(...) : HashSet [<element>] : Object | provenance | MaD:717 |
+| Test.java:3604:10:3604:35 | new ..[] { .. } : Object[] [[]] : Object | Test.java:3604:10:3604:35 | hashSet(...) : HashSet [<element>] : Object | provenance | MaD:795 |
 | Test.java:3604:27:3604:28 | in : Object | Test.java:3604:10:3604:35 | new ..[] { .. } : Object[] [[]] : Object | provenance |  |
 | Test.java:3605:20:3605:22 | out : HashSet [<element>] : Object | Test.java:230:19:230:32 | it : HashSet [<element>] : Object | provenance |  |
-| Test.java:3605:20:3605:22 | out : HashSet [<element>] : Object | Test.java:3605:9:3605:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:3605:20:3605:22 | out : HashSet [<element>] : Object | Test.java:3605:9:3605:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:3610:13:3610:51 | newTreeSetWithElement(...) : TreeSet [<element>] : String | Test.java:3611:32:3611:33 | in : TreeSet [<element>] : String | provenance |  |
 | Test.java:3610:35:3610:50 | (...)... : String | Test.java:268:39:268:47 | element : String | provenance |  |
-| Test.java:3610:35:3610:50 | (...)... : String | Test.java:3610:13:3610:51 | newTreeSetWithElement(...) : TreeSet [<element>] : String | provenance | MaD:2 |
+| Test.java:3610:35:3610:50 | (...)... : String | Test.java:3610:13:3610:51 | newTreeSetWithElement(...) : TreeSet [<element>] : String | provenance | MaD:4 |
 | Test.java:3610:43:3610:50 | source(...) : Object | Test.java:3610:35:3610:50 | (...)... : String | provenance |  |
 | Test.java:3611:10:3611:40 | intersection(...) : SetView [<element>] : String | Test.java:3612:20:3612:22 | out : SetView [<element>] : String | provenance |  |
-| Test.java:3611:32:3611:33 | in : TreeSet [<element>] : String | Test.java:3611:10:3611:40 | intersection(...) : SetView [<element>] : String | provenance | MaD:718 |
+| Test.java:3611:32:3611:33 | in : TreeSet [<element>] : String | Test.java:3611:10:3611:40 | intersection(...) : SetView [<element>] : String | provenance | MaD:796 |
 | Test.java:3612:20:3612:22 | out : SetView [<element>] : String | Test.java:230:19:230:32 | it : SetView [<element>] : String | provenance |  |
-| Test.java:3612:20:3612:22 | out : SetView [<element>] : String | Test.java:3612:9:3612:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:3612:20:3612:22 | out : SetView [<element>] : String | Test.java:3612:9:3612:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:3617:13:3617:51 | newTreeSetWithElement(...) : TreeSet [<element>] : String | Test.java:3618:38:3618:39 | in : TreeSet [<element>] : String | provenance |  |
 | Test.java:3617:35:3617:50 | (...)... : String | Test.java:268:39:268:47 | element : String | provenance |  |
-| Test.java:3617:35:3617:50 | (...)... : String | Test.java:3617:13:3617:51 | newTreeSetWithElement(...) : TreeSet [<element>] : String | provenance | MaD:2 |
+| Test.java:3617:35:3617:50 | (...)... : String | Test.java:3617:13:3617:51 | newTreeSetWithElement(...) : TreeSet [<element>] : String | provenance | MaD:4 |
 | Test.java:3617:43:3617:50 | source(...) : Object | Test.java:3617:35:3617:50 | (...)... : String | provenance |  |
 | Test.java:3618:10:3618:40 | intersection(...) : SetView [<element>] : String | Test.java:3619:20:3619:22 | out : SetView [<element>] : String | provenance |  |
-| Test.java:3618:38:3618:39 | in : TreeSet [<element>] : String | Test.java:3618:10:3618:40 | intersection(...) : SetView [<element>] : String | provenance | MaD:719 |
+| Test.java:3618:38:3618:39 | in : TreeSet [<element>] : String | Test.java:3618:10:3618:40 | intersection(...) : SetView [<element>] : String | provenance | MaD:797 |
 | Test.java:3619:20:3619:22 | out : SetView [<element>] : String | Test.java:230:19:230:32 | it : SetView [<element>] : String | provenance |  |
-| Test.java:3619:20:3619:22 | out : SetView [<element>] : String | Test.java:3619:9:3619:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:3619:20:3619:22 | out : SetView [<element>] : String | Test.java:3619:9:3619:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:3624:13:3624:51 | newTreeSetWithElement(...) : TreeSet [<element>] : String | Test.java:3625:30:3625:31 | in : TreeSet [<element>] : String | provenance |  |
 | Test.java:3624:35:3624:50 | (...)... : String | Test.java:268:39:268:47 | element : String | provenance |  |
-| Test.java:3624:35:3624:50 | (...)... : String | Test.java:3624:13:3624:51 | newTreeSetWithElement(...) : TreeSet [<element>] : String | provenance | MaD:2 |
+| Test.java:3624:35:3624:50 | (...)... : String | Test.java:3624:13:3624:51 | newTreeSetWithElement(...) : TreeSet [<element>] : String | provenance | MaD:4 |
 | Test.java:3624:43:3624:50 | source(...) : Object | Test.java:3624:35:3624:50 | (...)... : String | provenance |  |
 | Test.java:3625:10:3625:32 | orderedSet(...) : Set [<element>] : String | Test.java:3626:20:3626:22 | out : Set [<element>] : String | provenance |  |
-| Test.java:3625:30:3625:31 | in : TreeSet [<element>] : String | Test.java:3625:10:3625:32 | orderedSet(...) : Set [<element>] : String | provenance | MaD:720 |
+| Test.java:3625:30:3625:31 | in : TreeSet [<element>] : String | Test.java:3625:10:3625:32 | orderedSet(...) : Set [<element>] : String | provenance | MaD:798 |
 | Test.java:3626:20:3626:22 | out : Set [<element>] : String | Test.java:230:19:230:32 | it : Set [<element>] : String | provenance |  |
-| Test.java:3626:20:3626:22 | out : Set [<element>] : String | Test.java:3626:9:3626:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:3626:20:3626:22 | out : Set [<element>] : String | Test.java:3626:9:3626:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:3631:22:3631:60 | newTreeSetWithElement(...) : TreeSet [<element>] : String | Test.java:3632:42:3632:43 | in : TreeSet [<element>] : String | provenance |  |
 | Test.java:3631:44:3631:59 | (...)... : String | Test.java:268:39:268:47 | element : String | provenance |  |
-| Test.java:3631:44:3631:59 | (...)... : String | Test.java:3631:22:3631:60 | newTreeSetWithElement(...) : TreeSet [<element>] : String | provenance | MaD:2 |
+| Test.java:3631:44:3631:59 | (...)... : String | Test.java:3631:22:3631:60 | newTreeSetWithElement(...) : TreeSet [<element>] : String | provenance | MaD:4 |
 | Test.java:3631:52:3631:59 | source(...) : Object | Test.java:3631:44:3631:59 | (...)... : String | provenance |  |
 | Test.java:3632:10:3632:50 | predicatedNavigableSet(...) : SortedSet [<element>] : String | Test.java:3633:20:3633:22 | out : SortedSet [<element>] : String | provenance |  |
-| Test.java:3632:42:3632:43 | in : TreeSet [<element>] : String | Test.java:3632:10:3632:50 | predicatedNavigableSet(...) : SortedSet [<element>] : String | provenance | MaD:721 |
+| Test.java:3632:42:3632:43 | in : TreeSet [<element>] : String | Test.java:3632:10:3632:50 | predicatedNavigableSet(...) : SortedSet [<element>] : String | provenance | MaD:799 |
 | Test.java:3633:20:3633:22 | out : SortedSet [<element>] : String | Test.java:230:19:230:32 | it : SortedSet [<element>] : String | provenance |  |
-| Test.java:3633:20:3633:22 | out : SortedSet [<element>] : String | Test.java:3633:9:3633:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:3633:20:3633:22 | out : SortedSet [<element>] : String | Test.java:3633:9:3633:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:3638:13:3638:51 | newTreeSetWithElement(...) : TreeSet [<element>] : String | Test.java:3639:33:3639:34 | in : TreeSet [<element>] : String | provenance |  |
 | Test.java:3638:35:3638:50 | (...)... : String | Test.java:268:39:268:47 | element : String | provenance |  |
-| Test.java:3638:35:3638:50 | (...)... : String | Test.java:3638:13:3638:51 | newTreeSetWithElement(...) : TreeSet [<element>] : String | provenance | MaD:2 |
+| Test.java:3638:35:3638:50 | (...)... : String | Test.java:3638:13:3638:51 | newTreeSetWithElement(...) : TreeSet [<element>] : String | provenance | MaD:4 |
 | Test.java:3638:43:3638:50 | source(...) : Object | Test.java:3638:35:3638:50 | (...)... : String | provenance |  |
 | Test.java:3639:10:3639:41 | predicatedSet(...) : Set [<element>] : String | Test.java:3640:20:3640:22 | out : Set [<element>] : String | provenance |  |
-| Test.java:3639:33:3639:34 | in : TreeSet [<element>] : String | Test.java:3639:10:3639:41 | predicatedSet(...) : Set [<element>] : String | provenance | MaD:722 |
+| Test.java:3639:33:3639:34 | in : TreeSet [<element>] : String | Test.java:3639:10:3639:41 | predicatedSet(...) : Set [<element>] : String | provenance | MaD:800 |
 | Test.java:3640:20:3640:22 | out : Set [<element>] : String | Test.java:230:19:230:32 | it : Set [<element>] : String | provenance |  |
-| Test.java:3640:20:3640:22 | out : Set [<element>] : String | Test.java:3640:9:3640:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:3640:20:3640:22 | out : Set [<element>] : String | Test.java:3640:9:3640:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:3645:19:3645:57 | newTreeSetWithElement(...) : TreeSet [<element>] : String | Test.java:3646:39:3646:40 | in : TreeSet [<element>] : String | provenance |  |
 | Test.java:3645:41:3645:56 | (...)... : String | Test.java:268:39:268:47 | element : String | provenance |  |
-| Test.java:3645:41:3645:56 | (...)... : String | Test.java:3645:19:3645:57 | newTreeSetWithElement(...) : TreeSet [<element>] : String | provenance | MaD:2 |
+| Test.java:3645:41:3645:56 | (...)... : String | Test.java:3645:19:3645:57 | newTreeSetWithElement(...) : TreeSet [<element>] : String | provenance | MaD:4 |
 | Test.java:3645:49:3645:56 | source(...) : Object | Test.java:3645:41:3645:56 | (...)... : String | provenance |  |
 | Test.java:3646:10:3646:47 | predicatedSortedSet(...) : SortedSet [<element>] : String | Test.java:3647:20:3647:22 | out : SortedSet [<element>] : String | provenance |  |
-| Test.java:3646:39:3646:40 | in : TreeSet [<element>] : String | Test.java:3646:10:3646:47 | predicatedSortedSet(...) : SortedSet [<element>] : String | provenance | MaD:723 |
+| Test.java:3646:39:3646:40 | in : TreeSet [<element>] : String | Test.java:3646:10:3646:47 | predicatedSortedSet(...) : SortedSet [<element>] : String | provenance | MaD:801 |
 | Test.java:3647:20:3647:22 | out : SortedSet [<element>] : String | Test.java:230:19:230:32 | it : SortedSet [<element>] : String | provenance |  |
-| Test.java:3647:20:3647:22 | out : SortedSet [<element>] : String | Test.java:3647:9:3647:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:3647:20:3647:22 | out : SortedSet [<element>] : String | Test.java:3647:9:3647:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:3652:13:3652:51 | newTreeSetWithElement(...) : TreeSet [<element>] : String | Test.java:3653:35:3653:36 | in : TreeSet [<element>] : String | provenance |  |
 | Test.java:3652:35:3652:50 | (...)... : String | Test.java:268:39:268:47 | element : String | provenance |  |
-| Test.java:3652:35:3652:50 | (...)... : String | Test.java:3652:13:3652:51 | newTreeSetWithElement(...) : TreeSet [<element>] : String | provenance | MaD:2 |
+| Test.java:3652:35:3652:50 | (...)... : String | Test.java:3652:13:3652:51 | newTreeSetWithElement(...) : TreeSet [<element>] : String | provenance | MaD:4 |
 | Test.java:3652:43:3652:50 | source(...) : Object | Test.java:3652:35:3652:50 | (...)... : String | provenance |  |
 | Test.java:3653:10:3653:37 | synchronizedSet(...) : Set [<element>] : String | Test.java:3654:20:3654:22 | out : Set [<element>] : String | provenance |  |
-| Test.java:3653:35:3653:36 | in : TreeSet [<element>] : String | Test.java:3653:10:3653:37 | synchronizedSet(...) : Set [<element>] : String | provenance | MaD:724 |
+| Test.java:3653:35:3653:36 | in : TreeSet [<element>] : String | Test.java:3653:10:3653:37 | synchronizedSet(...) : Set [<element>] : String | provenance | MaD:802 |
 | Test.java:3654:20:3654:22 | out : Set [<element>] : String | Test.java:230:19:230:32 | it : Set [<element>] : String | provenance |  |
-| Test.java:3654:20:3654:22 | out : Set [<element>] : String | Test.java:3654:9:3654:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:3654:20:3654:22 | out : Set [<element>] : String | Test.java:3654:9:3654:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:3659:19:3659:57 | newTreeSetWithElement(...) : TreeSet [<element>] : String | Test.java:3660:41:3660:42 | in : TreeSet [<element>] : String | provenance |  |
 | Test.java:3659:41:3659:56 | (...)... : String | Test.java:268:39:268:47 | element : String | provenance |  |
-| Test.java:3659:41:3659:56 | (...)... : String | Test.java:3659:19:3659:57 | newTreeSetWithElement(...) : TreeSet [<element>] : String | provenance | MaD:2 |
+| Test.java:3659:41:3659:56 | (...)... : String | Test.java:3659:19:3659:57 | newTreeSetWithElement(...) : TreeSet [<element>] : String | provenance | MaD:4 |
 | Test.java:3659:49:3659:56 | source(...) : Object | Test.java:3659:41:3659:56 | (...)... : String | provenance |  |
 | Test.java:3660:10:3660:43 | synchronizedSortedSet(...) : SortedSet [<element>] : String | Test.java:3661:20:3661:22 | out : SortedSet [<element>] : String | provenance |  |
-| Test.java:3660:41:3660:42 | in : TreeSet [<element>] : String | Test.java:3660:10:3660:43 | synchronizedSortedSet(...) : SortedSet [<element>] : String | provenance | MaD:725 |
+| Test.java:3660:41:3660:42 | in : TreeSet [<element>] : String | Test.java:3660:10:3660:43 | synchronizedSortedSet(...) : SortedSet [<element>] : String | provenance | MaD:803 |
 | Test.java:3661:20:3661:22 | out : SortedSet [<element>] : String | Test.java:230:19:230:32 | it : SortedSet [<element>] : String | provenance |  |
-| Test.java:3661:20:3661:22 | out : SortedSet [<element>] : String | Test.java:3661:9:3661:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:3661:20:3661:22 | out : SortedSet [<element>] : String | Test.java:3661:9:3661:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:3666:22:3666:60 | newTreeSetWithElement(...) : TreeSet [<element>] : String | Test.java:3667:43:3667:44 | in : TreeSet [<element>] : String | provenance |  |
 | Test.java:3666:44:3666:59 | (...)... : String | Test.java:268:39:268:47 | element : String | provenance |  |
-| Test.java:3666:44:3666:59 | (...)... : String | Test.java:3666:22:3666:60 | newTreeSetWithElement(...) : TreeSet [<element>] : String | provenance | MaD:2 |
+| Test.java:3666:44:3666:59 | (...)... : String | Test.java:3666:22:3666:60 | newTreeSetWithElement(...) : TreeSet [<element>] : String | provenance | MaD:4 |
 | Test.java:3666:52:3666:59 | source(...) : Object | Test.java:3666:44:3666:59 | (...)... : String | provenance |  |
 | Test.java:3667:10:3667:51 | transformedNavigableSet(...) : SortedSet [<element>] : String | Test.java:3668:20:3668:22 | out : SortedSet [<element>] : String | provenance |  |
-| Test.java:3667:43:3667:44 | in : TreeSet [<element>] : String | Test.java:3667:10:3667:51 | transformedNavigableSet(...) : SortedSet [<element>] : String | provenance | MaD:726 |
+| Test.java:3667:43:3667:44 | in : TreeSet [<element>] : String | Test.java:3667:10:3667:51 | transformedNavigableSet(...) : SortedSet [<element>] : String | provenance | MaD:804 |
 | Test.java:3668:20:3668:22 | out : SortedSet [<element>] : String | Test.java:230:19:230:32 | it : SortedSet [<element>] : String | provenance |  |
-| Test.java:3668:20:3668:22 | out : SortedSet [<element>] : String | Test.java:3668:9:3668:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:3668:20:3668:22 | out : SortedSet [<element>] : String | Test.java:3668:9:3668:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:3673:13:3673:51 | newTreeSetWithElement(...) : TreeSet [<element>] : String | Test.java:3674:34:3674:35 | in : TreeSet [<element>] : String | provenance |  |
 | Test.java:3673:35:3673:50 | (...)... : String | Test.java:268:39:268:47 | element : String | provenance |  |
-| Test.java:3673:35:3673:50 | (...)... : String | Test.java:3673:13:3673:51 | newTreeSetWithElement(...) : TreeSet [<element>] : String | provenance | MaD:2 |
+| Test.java:3673:35:3673:50 | (...)... : String | Test.java:3673:13:3673:51 | newTreeSetWithElement(...) : TreeSet [<element>] : String | provenance | MaD:4 |
 | Test.java:3673:43:3673:50 | source(...) : Object | Test.java:3673:35:3673:50 | (...)... : String | provenance |  |
 | Test.java:3674:10:3674:42 | transformedSet(...) : Set [<element>] : String | Test.java:3675:20:3675:22 | out : Set [<element>] : String | provenance |  |
-| Test.java:3674:34:3674:35 | in : TreeSet [<element>] : String | Test.java:3674:10:3674:42 | transformedSet(...) : Set [<element>] : String | provenance | MaD:727 |
+| Test.java:3674:34:3674:35 | in : TreeSet [<element>] : String | Test.java:3674:10:3674:42 | transformedSet(...) : Set [<element>] : String | provenance | MaD:805 |
 | Test.java:3675:20:3675:22 | out : Set [<element>] : String | Test.java:230:19:230:32 | it : Set [<element>] : String | provenance |  |
-| Test.java:3675:20:3675:22 | out : Set [<element>] : String | Test.java:3675:9:3675:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:3675:20:3675:22 | out : Set [<element>] : String | Test.java:3675:9:3675:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:3680:19:3680:57 | newTreeSetWithElement(...) : TreeSet [<element>] : String | Test.java:3681:40:3681:41 | in : TreeSet [<element>] : String | provenance |  |
 | Test.java:3680:41:3680:56 | (...)... : String | Test.java:268:39:268:47 | element : String | provenance |  |
-| Test.java:3680:41:3680:56 | (...)... : String | Test.java:3680:19:3680:57 | newTreeSetWithElement(...) : TreeSet [<element>] : String | provenance | MaD:2 |
+| Test.java:3680:41:3680:56 | (...)... : String | Test.java:3680:19:3680:57 | newTreeSetWithElement(...) : TreeSet [<element>] : String | provenance | MaD:4 |
 | Test.java:3680:49:3680:56 | source(...) : Object | Test.java:3680:41:3680:56 | (...)... : String | provenance |  |
 | Test.java:3681:10:3681:48 | transformedSortedSet(...) : SortedSet [<element>] : String | Test.java:3682:20:3682:22 | out : SortedSet [<element>] : String | provenance |  |
-| Test.java:3681:40:3681:41 | in : TreeSet [<element>] : String | Test.java:3681:10:3681:48 | transformedSortedSet(...) : SortedSet [<element>] : String | provenance | MaD:728 |
+| Test.java:3681:40:3681:41 | in : TreeSet [<element>] : String | Test.java:3681:10:3681:48 | transformedSortedSet(...) : SortedSet [<element>] : String | provenance | MaD:806 |
 | Test.java:3682:20:3682:22 | out : SortedSet [<element>] : String | Test.java:230:19:230:32 | it : SortedSet [<element>] : String | provenance |  |
-| Test.java:3682:20:3682:22 | out : SortedSet [<element>] : String | Test.java:3682:9:3682:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:3682:20:3682:22 | out : SortedSet [<element>] : String | Test.java:3682:9:3682:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:3687:13:3687:51 | newTreeSetWithElement(...) : TreeSet [<element>] : String | Test.java:3688:25:3688:26 | in : TreeSet [<element>] : String | provenance |  |
 | Test.java:3687:35:3687:50 | (...)... : String | Test.java:268:39:268:47 | element : String | provenance |  |
-| Test.java:3687:35:3687:50 | (...)... : String | Test.java:3687:13:3687:51 | newTreeSetWithElement(...) : TreeSet [<element>] : String | provenance | MaD:2 |
+| Test.java:3687:35:3687:50 | (...)... : String | Test.java:3687:13:3687:51 | newTreeSetWithElement(...) : TreeSet [<element>] : String | provenance | MaD:4 |
 | Test.java:3687:43:3687:50 | source(...) : Object | Test.java:3687:35:3687:50 | (...)... : String | provenance |  |
 | Test.java:3688:10:3688:33 | union(...) : SetView [<element>] : String | Test.java:3689:20:3689:22 | out : SetView [<element>] : String | provenance |  |
-| Test.java:3688:25:3688:26 | in : TreeSet [<element>] : String | Test.java:3688:10:3688:33 | union(...) : SetView [<element>] : String | provenance | MaD:729 |
+| Test.java:3688:25:3688:26 | in : TreeSet [<element>] : String | Test.java:3688:10:3688:33 | union(...) : SetView [<element>] : String | provenance | MaD:807 |
 | Test.java:3689:20:3689:22 | out : SetView [<element>] : String | Test.java:230:19:230:32 | it : SetView [<element>] : String | provenance |  |
-| Test.java:3689:20:3689:22 | out : SetView [<element>] : String | Test.java:3689:9:3689:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:3689:20:3689:22 | out : SetView [<element>] : String | Test.java:3689:9:3689:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:3694:13:3694:51 | newTreeSetWithElement(...) : TreeSet [<element>] : String | Test.java:3695:31:3695:32 | in : TreeSet [<element>] : String | provenance |  |
 | Test.java:3694:35:3694:50 | (...)... : String | Test.java:268:39:268:47 | element : String | provenance |  |
-| Test.java:3694:35:3694:50 | (...)... : String | Test.java:3694:13:3694:51 | newTreeSetWithElement(...) : TreeSet [<element>] : String | provenance | MaD:2 |
+| Test.java:3694:35:3694:50 | (...)... : String | Test.java:3694:13:3694:51 | newTreeSetWithElement(...) : TreeSet [<element>] : String | provenance | MaD:4 |
 | Test.java:3694:43:3694:50 | source(...) : Object | Test.java:3694:35:3694:50 | (...)... : String | provenance |  |
 | Test.java:3695:10:3695:33 | union(...) : SetView [<element>] : String | Test.java:3696:20:3696:22 | out : SetView [<element>] : String | provenance |  |
-| Test.java:3695:31:3695:32 | in : TreeSet [<element>] : String | Test.java:3695:10:3695:33 | union(...) : SetView [<element>] : String | provenance | MaD:730 |
+| Test.java:3695:31:3695:32 | in : TreeSet [<element>] : String | Test.java:3695:10:3695:33 | union(...) : SetView [<element>] : String | provenance | MaD:808 |
 | Test.java:3696:20:3696:22 | out : SetView [<element>] : String | Test.java:230:19:230:32 | it : SetView [<element>] : String | provenance |  |
-| Test.java:3696:20:3696:22 | out : SetView [<element>] : String | Test.java:3696:9:3696:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:3696:20:3696:22 | out : SetView [<element>] : String | Test.java:3696:9:3696:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:3701:22:3701:60 | newTreeSetWithElement(...) : TreeSet [<element>] : String | Test.java:3702:44:3702:45 | in : TreeSet [<element>] : String | provenance |  |
 | Test.java:3701:44:3701:59 | (...)... : String | Test.java:268:39:268:47 | element : String | provenance |  |
-| Test.java:3701:44:3701:59 | (...)... : String | Test.java:3701:22:3701:60 | newTreeSetWithElement(...) : TreeSet [<element>] : String | provenance | MaD:2 |
+| Test.java:3701:44:3701:59 | (...)... : String | Test.java:3701:22:3701:60 | newTreeSetWithElement(...) : TreeSet [<element>] : String | provenance | MaD:4 |
 | Test.java:3701:52:3701:59 | source(...) : Object | Test.java:3701:44:3701:59 | (...)... : String | provenance |  |
 | Test.java:3702:10:3702:46 | unmodifiableNavigableSet(...) : SortedSet [<element>] : String | Test.java:3703:20:3703:22 | out : SortedSet [<element>] : String | provenance |  |
-| Test.java:3702:44:3702:45 | in : TreeSet [<element>] : String | Test.java:3702:10:3702:46 | unmodifiableNavigableSet(...) : SortedSet [<element>] : String | provenance | MaD:731 |
+| Test.java:3702:44:3702:45 | in : TreeSet [<element>] : String | Test.java:3702:10:3702:46 | unmodifiableNavigableSet(...) : SortedSet [<element>] : String | provenance | MaD:809 |
 | Test.java:3703:20:3703:22 | out : SortedSet [<element>] : String | Test.java:230:19:230:32 | it : SortedSet [<element>] : String | provenance |  |
-| Test.java:3703:20:3703:22 | out : SortedSet [<element>] : String | Test.java:3703:9:3703:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:3703:20:3703:22 | out : SortedSet [<element>] : String | Test.java:3703:9:3703:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:3708:16:3708:23 | source(...) : Object | Test.java:3709:35:3709:36 | in : Object | provenance |  |
-| Test.java:3709:10:3709:43 | new ..[] { .. } : Object[] [[]] : Object | Test.java:3709:10:3709:43 | unmodifiableSet(...) : Set [<element>] : Object | provenance | MaD:732 |
+| Test.java:3709:10:3709:43 | new ..[] { .. } : Object[] [[]] : Object | Test.java:3709:10:3709:43 | unmodifiableSet(...) : Set [<element>] : Object | provenance | MaD:810 |
 | Test.java:3709:10:3709:43 | unmodifiableSet(...) : Set [<element>] : Object | Test.java:3710:20:3710:22 | out : Set [<element>] : Object | provenance |  |
 | Test.java:3709:35:3709:36 | in : Object | Test.java:3709:10:3709:43 | new ..[] { .. } : Object[] [[]] : Object | provenance |  |
 | Test.java:3710:20:3710:22 | out : Set [<element>] : Object | Test.java:230:19:230:32 | it : Set [<element>] : Object | provenance |  |
-| Test.java:3710:20:3710:22 | out : Set [<element>] : Object | Test.java:3710:9:3710:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:3710:20:3710:22 | out : Set [<element>] : Object | Test.java:3710:9:3710:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:3715:13:3715:51 | newTreeSetWithElement(...) : TreeSet [<element>] : String | Test.java:3716:35:3716:36 | in : TreeSet [<element>] : String | provenance |  |
 | Test.java:3715:35:3715:50 | (...)... : String | Test.java:268:39:268:47 | element : String | provenance |  |
-| Test.java:3715:35:3715:50 | (...)... : String | Test.java:3715:13:3715:51 | newTreeSetWithElement(...) : TreeSet [<element>] : String | provenance | MaD:2 |
+| Test.java:3715:35:3715:50 | (...)... : String | Test.java:3715:13:3715:51 | newTreeSetWithElement(...) : TreeSet [<element>] : String | provenance | MaD:4 |
 | Test.java:3715:43:3715:50 | source(...) : Object | Test.java:3715:35:3715:50 | (...)... : String | provenance |  |
 | Test.java:3716:10:3716:37 | unmodifiableSet(...) : Set [<element>] : String | Test.java:3717:20:3717:22 | out : Set [<element>] : String | provenance |  |
-| Test.java:3716:35:3716:36 | in : TreeSet [<element>] : String | Test.java:3716:10:3716:37 | unmodifiableSet(...) : Set [<element>] : String | provenance | MaD:733 |
+| Test.java:3716:35:3716:36 | in : TreeSet [<element>] : String | Test.java:3716:10:3716:37 | unmodifiableSet(...) : Set [<element>] : String | provenance | MaD:811 |
 | Test.java:3717:20:3717:22 | out : Set [<element>] : String | Test.java:230:19:230:32 | it : Set [<element>] : String | provenance |  |
-| Test.java:3717:20:3717:22 | out : Set [<element>] : String | Test.java:3717:9:3717:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:3717:20:3717:22 | out : Set [<element>] : String | Test.java:3717:9:3717:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:3722:19:3722:57 | newTreeSetWithElement(...) : TreeSet [<element>] : String | Test.java:3723:41:3723:42 | in : TreeSet [<element>] : String | provenance |  |
 | Test.java:3722:41:3722:56 | (...)... : String | Test.java:268:39:268:47 | element : String | provenance |  |
-| Test.java:3722:41:3722:56 | (...)... : String | Test.java:3722:19:3722:57 | newTreeSetWithElement(...) : TreeSet [<element>] : String | provenance | MaD:2 |
+| Test.java:3722:41:3722:56 | (...)... : String | Test.java:3722:19:3722:57 | newTreeSetWithElement(...) : TreeSet [<element>] : String | provenance | MaD:4 |
 | Test.java:3722:49:3722:56 | source(...) : Object | Test.java:3722:41:3722:56 | (...)... : String | provenance |  |
 | Test.java:3723:10:3723:43 | unmodifiableSortedSet(...) : SortedSet [<element>] : String | Test.java:3724:20:3724:22 | out : SortedSet [<element>] : String | provenance |  |
-| Test.java:3723:41:3723:42 | in : TreeSet [<element>] : String | Test.java:3723:10:3723:43 | unmodifiableSortedSet(...) : SortedSet [<element>] : String | provenance | MaD:734 |
+| Test.java:3723:41:3723:42 | in : TreeSet [<element>] : String | Test.java:3723:10:3723:43 | unmodifiableSortedSet(...) : SortedSet [<element>] : String | provenance | MaD:812 |
 | Test.java:3724:20:3724:22 | out : SortedSet [<element>] : String | Test.java:230:19:230:32 | it : SortedSet [<element>] : String | provenance |  |
-| Test.java:3724:20:3724:22 | out : SortedSet [<element>] : String | Test.java:3724:9:3724:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:3724:20:3724:22 | out : SortedSet [<element>] : String | Test.java:3724:9:3724:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:3729:19:3729:57 | newTreeBagWithElement(...) : TreeBag [<element>] : String | Test.java:3730:10:3730:11 | in : TreeBag [<element>] : String | provenance |  |
 | Test.java:3729:41:3729:56 | (...)... : String | Test.java:267:39:267:47 | element : String | provenance |  |
-| Test.java:3729:41:3729:56 | (...)... : String | Test.java:3729:19:3729:57 | newTreeBagWithElement(...) : TreeBag [<element>] : String | provenance | MaD:2 |
-| Test.java:3729:41:3729:56 | (...)... : String | Test.java:3729:19:3729:57 | newTreeBagWithElement(...) : TreeBag [<element>] : String | provenance | MaD:395 |
+| Test.java:3729:41:3729:56 | (...)... : String | Test.java:3729:19:3729:57 | newTreeBagWithElement(...) : TreeBag [<element>] : String | provenance | MaD:4 |
+| Test.java:3729:41:3729:56 | (...)... : String | Test.java:3729:19:3729:57 | newTreeBagWithElement(...) : TreeBag [<element>] : String | provenance | MaD:470 |
 | Test.java:3729:49:3729:56 | source(...) : Object | Test.java:3729:41:3729:56 | (...)... : String | provenance |  |
-| Test.java:3730:10:3730:11 | in : TreeBag [<element>] : String | Test.java:3730:10:3730:19 | first(...) : String | provenance | MaD:738 |
+| Test.java:3730:10:3730:11 | in : TreeBag [<element>] : String | Test.java:3730:10:3730:19 | first(...) : String | provenance | MaD:813 |
 | Test.java:3730:10:3730:19 | first(...) : String | Test.java:3731:9:3731:11 | out | provenance |  |
 | Test.java:3736:19:3736:57 | newTreeBagWithElement(...) : TreeBag [<element>] : String | Test.java:3737:10:3737:11 | in : TreeBag [<element>] : String | provenance |  |
 | Test.java:3736:41:3736:56 | (...)... : String | Test.java:267:39:267:47 | element : String | provenance |  |
-| Test.java:3736:41:3736:56 | (...)... : String | Test.java:3736:19:3736:57 | newTreeBagWithElement(...) : TreeBag [<element>] : String | provenance | MaD:2 |
-| Test.java:3736:41:3736:56 | (...)... : String | Test.java:3736:19:3736:57 | newTreeBagWithElement(...) : TreeBag [<element>] : String | provenance | MaD:395 |
+| Test.java:3736:41:3736:56 | (...)... : String | Test.java:3736:19:3736:57 | newTreeBagWithElement(...) : TreeBag [<element>] : String | provenance | MaD:4 |
+| Test.java:3736:41:3736:56 | (...)... : String | Test.java:3736:19:3736:57 | newTreeBagWithElement(...) : TreeBag [<element>] : String | provenance | MaD:470 |
 | Test.java:3736:49:3736:56 | source(...) : Object | Test.java:3736:41:3736:56 | (...)... : String | provenance |  |
-| Test.java:3737:10:3737:11 | in : TreeBag [<element>] : String | Test.java:3737:10:3737:18 | last(...) : String | provenance | MaD:739 |
+| Test.java:3737:10:3737:11 | in : TreeBag [<element>] : String | Test.java:3737:10:3737:18 | last(...) : String | provenance | MaD:814 |
 | Test.java:3737:10:3737:18 | last(...) : String | Test.java:3738:9:3738:11 | out | provenance |  |
 | Test.java:3743:13:3743:52 | newHashedMapWithMapKey(...) : HashedMap [<map.key>] : String | Test.java:3744:36:3744:37 | in : HashedMap [<map.key>] : String | provenance |  |
 | Test.java:3743:36:3743:51 | (...)... : String | Test.java:275:49:275:53 | key : String | provenance |  |
-| Test.java:3743:36:3743:51 | (...)... : String | Test.java:3743:13:3743:52 | newHashedMapWithMapKey(...) : HashedMap [<map.key>] : String | provenance | MaD:14 |
-| Test.java:3743:36:3743:51 | (...)... : String | Test.java:3743:13:3743:52 | newHashedMapWithMapKey(...) : HashedMap [<map.key>] : String | provenance | MaD:705 |
+| Test.java:3743:36:3743:51 | (...)... : String | Test.java:3743:13:3743:52 | newHashedMapWithMapKey(...) : HashedMap [<map.key>] : String | provenance | MaD:19 |
+| Test.java:3743:36:3743:51 | (...)... : String | Test.java:3743:13:3743:52 | newHashedMapWithMapKey(...) : HashedMap [<map.key>] : String | provenance | MaD:779 |
 | Test.java:3743:44:3743:51 | source(...) : Object | Test.java:3743:36:3743:51 | (...)... : String | provenance |  |
 | Test.java:3744:10:3744:38 | readableMap(...) : IterableMap [<map.key>] : String | Test.java:3745:19:3745:21 | out : IterableMap [<map.key>] : String | provenance |  |
-| Test.java:3744:36:3744:37 | in : HashedMap [<map.key>] : String | Test.java:3744:10:3744:38 | readableMap(...) : IterableMap [<map.key>] : String | provenance | MaD:740 |
+| Test.java:3744:36:3744:37 | in : HashedMap [<map.key>] : String | Test.java:3744:10:3744:38 | readableMap(...) : IterableMap [<map.key>] : String | provenance | MaD:815 |
 | Test.java:3745:19:3745:21 | out : IterableMap [<map.key>] : String | Test.java:228:18:228:29 | map : IterableMap [<map.key>] : String | provenance |  |
-| Test.java:3745:19:3745:21 | out : IterableMap [<map.key>] : String | Test.java:3745:9:3745:22 | getMapKey(...) | provenance | MaD:10 |
+| Test.java:3745:19:3745:21 | out : IterableMap [<map.key>] : String | Test.java:3745:9:3745:22 | getMapKey(...) | provenance | MaD:18 |
 | Test.java:3750:13:3750:54 | newHashedMapWithMapValue(...) : HashedMap [<map.value>] : String | Test.java:3751:36:3751:37 | in : HashedMap [<map.value>] : String | provenance |  |
 | Test.java:3750:38:3750:53 | (...)... : String | Test.java:293:51:293:57 | value : String | provenance |  |
-| Test.java:3750:38:3750:53 | (...)... : String | Test.java:3750:13:3750:54 | newHashedMapWithMapValue(...) : HashedMap [<map.value>] : String | provenance | MaD:15 |
-| Test.java:3750:38:3750:53 | (...)... : String | Test.java:3750:13:3750:54 | newHashedMapWithMapValue(...) : HashedMap [<map.value>] : String | provenance | MaD:706 |
+| Test.java:3750:38:3750:53 | (...)... : String | Test.java:3750:13:3750:54 | newHashedMapWithMapValue(...) : HashedMap [<map.value>] : String | provenance | MaD:20 |
+| Test.java:3750:38:3750:53 | (...)... : String | Test.java:3750:13:3750:54 | newHashedMapWithMapValue(...) : HashedMap [<map.value>] : String | provenance | MaD:780 |
 | Test.java:3750:46:3750:53 | source(...) : Object | Test.java:3750:38:3750:53 | (...)... : String | provenance |  |
 | Test.java:3751:10:3751:38 | readableMap(...) : IterableMap [<map.value>] : String | Test.java:3752:21:3752:23 | out : IterableMap [<map.value>] : String | provenance |  |
-| Test.java:3751:36:3751:37 | in : HashedMap [<map.value>] : String | Test.java:3751:10:3751:38 | readableMap(...) : IterableMap [<map.value>] : String | provenance | MaD:741 |
+| Test.java:3751:36:3751:37 | in : HashedMap [<map.value>] : String | Test.java:3751:10:3751:38 | readableMap(...) : IterableMap [<map.value>] : String | provenance | MaD:816 |
 | Test.java:3752:21:3752:23 | out : IterableMap [<map.value>] : String | Test.java:232:20:232:31 | map : IterableMap [<map.value>] : String | provenance |  |
-| Test.java:3752:21:3752:23 | out : IterableMap [<map.value>] : String | Test.java:3752:9:3752:24 | getMapValue(...) | provenance | MaD:9 |
+| Test.java:3752:21:3752:23 | out : IterableMap [<map.value>] : String | Test.java:3752:9:3752:24 | getMapValue(...) | provenance | MaD:17 |
 | Test.java:3757:13:3757:52 | newHashedMapWithMapKey(...) : HashedMap [<map.key>] : String | Test.java:3758:36:3758:37 | in : HashedMap [<map.key>] : String | provenance |  |
 | Test.java:3757:36:3757:51 | (...)... : String | Test.java:275:49:275:53 | key : String | provenance |  |
-| Test.java:3757:36:3757:51 | (...)... : String | Test.java:3757:13:3757:52 | newHashedMapWithMapKey(...) : HashedMap [<map.key>] : String | provenance | MaD:14 |
-| Test.java:3757:36:3757:51 | (...)... : String | Test.java:3757:13:3757:52 | newHashedMapWithMapKey(...) : HashedMap [<map.key>] : String | provenance | MaD:705 |
+| Test.java:3757:36:3757:51 | (...)... : String | Test.java:3757:13:3757:52 | newHashedMapWithMapKey(...) : HashedMap [<map.key>] : String | provenance | MaD:19 |
+| Test.java:3757:36:3757:51 | (...)... : String | Test.java:3757:13:3757:52 | newHashedMapWithMapKey(...) : HashedMap [<map.key>] : String | provenance | MaD:779 |
 | Test.java:3757:44:3757:51 | source(...) : Object | Test.java:3757:36:3757:51 | (...)... : String | provenance |  |
 | Test.java:3758:10:3758:38 | writableMap(...) : Map [<map.key>] : String | Test.java:3759:19:3759:21 | out : Map [<map.key>] : String | provenance |  |
-| Test.java:3758:36:3758:37 | in : HashedMap [<map.key>] : String | Test.java:3758:10:3758:38 | writableMap(...) : Map [<map.key>] : String | provenance | MaD:742 |
+| Test.java:3758:36:3758:37 | in : HashedMap [<map.key>] : String | Test.java:3758:10:3758:38 | writableMap(...) : Map [<map.key>] : String | provenance | MaD:817 |
 | Test.java:3759:19:3759:21 | out : Map [<map.key>] : String | Test.java:228:18:228:29 | map : Map [<map.key>] : String | provenance |  |
-| Test.java:3759:19:3759:21 | out : Map [<map.key>] : String | Test.java:3759:9:3759:22 | getMapKey(...) | provenance | MaD:10 |
+| Test.java:3759:19:3759:21 | out : Map [<map.key>] : String | Test.java:3759:9:3759:22 | getMapKey(...) | provenance | MaD:18 |
 | Test.java:3764:13:3764:54 | newHashedMapWithMapValue(...) : HashedMap [<map.value>] : String | Test.java:3765:36:3765:37 | in : HashedMap [<map.value>] : String | provenance |  |
 | Test.java:3764:38:3764:53 | (...)... : String | Test.java:293:51:293:57 | value : String | provenance |  |
-| Test.java:3764:38:3764:53 | (...)... : String | Test.java:3764:13:3764:54 | newHashedMapWithMapValue(...) : HashedMap [<map.value>] : String | provenance | MaD:15 |
-| Test.java:3764:38:3764:53 | (...)... : String | Test.java:3764:13:3764:54 | newHashedMapWithMapValue(...) : HashedMap [<map.value>] : String | provenance | MaD:706 |
+| Test.java:3764:38:3764:53 | (...)... : String | Test.java:3764:13:3764:54 | newHashedMapWithMapValue(...) : HashedMap [<map.value>] : String | provenance | MaD:20 |
+| Test.java:3764:38:3764:53 | (...)... : String | Test.java:3764:13:3764:54 | newHashedMapWithMapValue(...) : HashedMap [<map.value>] : String | provenance | MaD:780 |
 | Test.java:3764:46:3764:53 | source(...) : Object | Test.java:3764:38:3764:53 | (...)... : String | provenance |  |
 | Test.java:3765:10:3765:38 | writableMap(...) : Map [<map.value>] : String | Test.java:3766:21:3766:23 | out : Map [<map.value>] : String | provenance |  |
-| Test.java:3765:36:3765:37 | in : HashedMap [<map.value>] : String | Test.java:3765:10:3765:38 | writableMap(...) : Map [<map.value>] : String | provenance | MaD:743 |
+| Test.java:3765:36:3765:37 | in : HashedMap [<map.value>] : String | Test.java:3765:10:3765:38 | writableMap(...) : Map [<map.value>] : String | provenance | MaD:818 |
 | Test.java:3766:21:3766:23 | out : Map [<map.value>] : String | Test.java:232:20:232:31 | map : Map [<map.value>] : String | provenance |  |
-| Test.java:3766:21:3766:23 | out : Map [<map.value>] : String | Test.java:3766:9:3766:24 | getMapValue(...) | provenance | MaD:9 |
+| Test.java:3766:21:3766:23 | out : Map [<map.value>] : String | Test.java:3766:9:3766:24 | getMapValue(...) | provenance | MaD:17 |
 | Test.java:3771:14:3771:56 | newPatriciaTrieWithMapKey(...) : PatriciaTrie [<map.key>] : String | Test.java:3772:10:3772:11 | in : PatriciaTrie [<map.key>] : String | provenance |  |
 | Test.java:3771:40:3771:55 | (...)... : String | Test.java:288:49:288:58 | key : String | provenance |  |
-| Test.java:3771:40:3771:55 | (...)... : String | Test.java:3771:14:3771:56 | newPatriciaTrieWithMapKey(...) : PatriciaTrie [<map.key>] : String | provenance | MaD:14 |
-| Test.java:3771:40:3771:55 | (...)... : String | Test.java:3771:14:3771:56 | newPatriciaTrieWithMapKey(...) : PatriciaTrie [<map.key>] : String | provenance | MaD:705 |
+| Test.java:3771:40:3771:55 | (...)... : String | Test.java:3771:14:3771:56 | newPatriciaTrieWithMapKey(...) : PatriciaTrie [<map.key>] : String | provenance | MaD:19 |
+| Test.java:3771:40:3771:55 | (...)... : String | Test.java:3771:14:3771:56 | newPatriciaTrieWithMapKey(...) : PatriciaTrie [<map.key>] : String | provenance | MaD:779 |
 | Test.java:3771:48:3771:55 | source(...) : Object | Test.java:3771:40:3771:55 | (...)... : String | provenance |  |
-| Test.java:3772:10:3772:11 | in : PatriciaTrie [<map.key>] : String | Test.java:3772:10:3772:27 | prefixMap(...) : SortedMap [<map.key>] : String | provenance | MaD:744 |
+| Test.java:3772:10:3772:11 | in : PatriciaTrie [<map.key>] : String | Test.java:3772:10:3772:27 | prefixMap(...) : SortedMap [<map.key>] : String | provenance | MaD:819 |
 | Test.java:3772:10:3772:27 | prefixMap(...) : SortedMap [<map.key>] : String | Test.java:3773:19:3773:21 | out : SortedMap [<map.key>] : String | provenance |  |
 | Test.java:3773:19:3773:21 | out : SortedMap [<map.key>] : String | Test.java:228:18:228:29 | map : SortedMap [<map.key>] : String | provenance |  |
-| Test.java:3773:19:3773:21 | out : SortedMap [<map.key>] : String | Test.java:3773:9:3773:22 | getMapKey(...) | provenance | MaD:10 |
+| Test.java:3773:19:3773:21 | out : SortedMap [<map.key>] : String | Test.java:3773:9:3773:22 | getMapKey(...) | provenance | MaD:18 |
 | Test.java:3778:14:3778:58 | newPatriciaTrieWithMapValue(...) : PatriciaTrie [<map.value>] : String | Test.java:3779:10:3779:11 | in : PatriciaTrie [<map.value>] : String | provenance |  |
 | Test.java:3778:42:3778:57 | (...)... : String | Test.java:307:50:307:56 | value : String | provenance |  |
-| Test.java:3778:42:3778:57 | (...)... : String | Test.java:3778:14:3778:58 | newPatriciaTrieWithMapValue(...) : PatriciaTrie [<map.value>] : String | provenance | MaD:15 |
-| Test.java:3778:42:3778:57 | (...)... : String | Test.java:3778:14:3778:58 | newPatriciaTrieWithMapValue(...) : PatriciaTrie [<map.value>] : String | provenance | MaD:706 |
+| Test.java:3778:42:3778:57 | (...)... : String | Test.java:3778:14:3778:58 | newPatriciaTrieWithMapValue(...) : PatriciaTrie [<map.value>] : String | provenance | MaD:20 |
+| Test.java:3778:42:3778:57 | (...)... : String | Test.java:3778:14:3778:58 | newPatriciaTrieWithMapValue(...) : PatriciaTrie [<map.value>] : String | provenance | MaD:780 |
 | Test.java:3778:50:3778:57 | source(...) : Object | Test.java:3778:42:3778:57 | (...)... : String | provenance |  |
-| Test.java:3779:10:3779:11 | in : PatriciaTrie [<map.value>] : String | Test.java:3779:10:3779:27 | prefixMap(...) : SortedMap [<map.value>] : String | provenance | MaD:745 |
+| Test.java:3779:10:3779:11 | in : PatriciaTrie [<map.value>] : String | Test.java:3779:10:3779:27 | prefixMap(...) : SortedMap [<map.value>] : String | provenance | MaD:820 |
 | Test.java:3779:10:3779:27 | prefixMap(...) : SortedMap [<map.value>] : String | Test.java:3780:21:3780:23 | out : SortedMap [<map.value>] : String | provenance |  |
 | Test.java:3780:21:3780:23 | out : SortedMap [<map.value>] : String | Test.java:232:20:232:31 | map : SortedMap [<map.value>] : String | provenance |  |
-| Test.java:3780:21:3780:23 | out : SortedMap [<map.value>] : String | Test.java:3780:9:3780:24 | getMapValue(...) | provenance | MaD:9 |
+| Test.java:3780:21:3780:23 | out : SortedMap [<map.value>] : String | Test.java:3780:9:3780:24 | getMapValue(...) | provenance | MaD:17 |
 | Test.java:3785:14:3785:56 | newPatriciaTrieWithMapKey(...) : PatriciaTrie [<map.key>] : String | Test.java:3786:37:3786:38 | in : PatriciaTrie [<map.key>] : String | provenance |  |
 | Test.java:3785:40:3785:55 | (...)... : String | Test.java:288:49:288:58 | key : String | provenance |  |
-| Test.java:3785:40:3785:55 | (...)... : String | Test.java:3785:14:3785:56 | newPatriciaTrieWithMapKey(...) : PatriciaTrie [<map.key>] : String | provenance | MaD:14 |
-| Test.java:3785:40:3785:55 | (...)... : String | Test.java:3785:14:3785:56 | newPatriciaTrieWithMapKey(...) : PatriciaTrie [<map.key>] : String | provenance | MaD:705 |
+| Test.java:3785:40:3785:55 | (...)... : String | Test.java:3785:14:3785:56 | newPatriciaTrieWithMapKey(...) : PatriciaTrie [<map.key>] : String | provenance | MaD:19 |
+| Test.java:3785:40:3785:55 | (...)... : String | Test.java:3785:14:3785:56 | newPatriciaTrieWithMapKey(...) : PatriciaTrie [<map.key>] : String | provenance | MaD:779 |
 | Test.java:3785:48:3785:55 | source(...) : Object | Test.java:3785:40:3785:55 | (...)... : String | provenance |  |
 | Test.java:3786:10:3786:39 | unmodifiableTrie(...) : Trie [<map.key>] : String | Test.java:3787:19:3787:21 | out : Trie [<map.key>] : String | provenance |  |
-| Test.java:3786:37:3786:38 | in : PatriciaTrie [<map.key>] : String | Test.java:3786:10:3786:39 | unmodifiableTrie(...) : Trie [<map.key>] : String | provenance | MaD:746 |
+| Test.java:3786:37:3786:38 | in : PatriciaTrie [<map.key>] : String | Test.java:3786:10:3786:39 | unmodifiableTrie(...) : Trie [<map.key>] : String | provenance | MaD:821 |
 | Test.java:3787:19:3787:21 | out : Trie [<map.key>] : String | Test.java:228:18:228:29 | map : Trie [<map.key>] : String | provenance |  |
-| Test.java:3787:19:3787:21 | out : Trie [<map.key>] : String | Test.java:3787:9:3787:22 | getMapKey(...) | provenance | MaD:10 |
+| Test.java:3787:19:3787:21 | out : Trie [<map.key>] : String | Test.java:3787:9:3787:22 | getMapKey(...) | provenance | MaD:18 |
 | Test.java:3792:14:3792:58 | newPatriciaTrieWithMapValue(...) : PatriciaTrie [<map.value>] : String | Test.java:3793:37:3793:38 | in : PatriciaTrie [<map.value>] : String | provenance |  |
 | Test.java:3792:42:3792:57 | (...)... : String | Test.java:307:50:307:56 | value : String | provenance |  |
-| Test.java:3792:42:3792:57 | (...)... : String | Test.java:3792:14:3792:58 | newPatriciaTrieWithMapValue(...) : PatriciaTrie [<map.value>] : String | provenance | MaD:15 |
-| Test.java:3792:42:3792:57 | (...)... : String | Test.java:3792:14:3792:58 | newPatriciaTrieWithMapValue(...) : PatriciaTrie [<map.value>] : String | provenance | MaD:706 |
+| Test.java:3792:42:3792:57 | (...)... : String | Test.java:3792:14:3792:58 | newPatriciaTrieWithMapValue(...) : PatriciaTrie [<map.value>] : String | provenance | MaD:20 |
+| Test.java:3792:42:3792:57 | (...)... : String | Test.java:3792:14:3792:58 | newPatriciaTrieWithMapValue(...) : PatriciaTrie [<map.value>] : String | provenance | MaD:780 |
 | Test.java:3792:50:3792:57 | source(...) : Object | Test.java:3792:42:3792:57 | (...)... : String | provenance |  |
 | Test.java:3793:10:3793:39 | unmodifiableTrie(...) : Trie [<map.value>] : String | Test.java:3794:21:3794:23 | out : Trie [<map.value>] : String | provenance |  |
-| Test.java:3793:37:3793:38 | in : PatriciaTrie [<map.value>] : String | Test.java:3793:10:3793:39 | unmodifiableTrie(...) : Trie [<map.value>] : String | provenance | MaD:747 |
+| Test.java:3793:37:3793:38 | in : PatriciaTrie [<map.value>] : String | Test.java:3793:10:3793:39 | unmodifiableTrie(...) : Trie [<map.value>] : String | provenance | MaD:822 |
 | Test.java:3794:21:3794:23 | out : Trie [<map.value>] : String | Test.java:232:20:232:31 | map : Trie [<map.value>] : String | provenance |  |
-| Test.java:3794:21:3794:23 | out : Trie [<map.value>] : String | Test.java:3794:9:3794:24 | getMapValue(...) | provenance | MaD:9 |
+| Test.java:3794:21:3794:23 | out : Trie [<map.value>] : String | Test.java:3794:9:3794:24 | getMapValue(...) | provenance | MaD:17 |
 | Test.java:3799:13:3799:51 | newTreeBagWithElement(...) : TreeBag [<element>] : String | Test.java:3800:37:3800:38 | in : TreeBag [<element>] : String | provenance |  |
 | Test.java:3799:35:3799:50 | (...)... : String | Test.java:267:39:267:47 | element : String | provenance |  |
-| Test.java:3799:35:3799:50 | (...)... : String | Test.java:3799:13:3799:51 | newTreeBagWithElement(...) : TreeBag [<element>] : String | provenance | MaD:2 |
-| Test.java:3799:35:3799:50 | (...)... : String | Test.java:3799:13:3799:51 | newTreeBagWithElement(...) : TreeBag [<element>] : String | provenance | MaD:395 |
+| Test.java:3799:35:3799:50 | (...)... : String | Test.java:3799:13:3799:51 | newTreeBagWithElement(...) : TreeBag [<element>] : String | provenance | MaD:4 |
+| Test.java:3799:35:3799:50 | (...)... : String | Test.java:3799:13:3799:51 | newTreeBagWithElement(...) : TreeBag [<element>] : String | provenance | MaD:470 |
 | Test.java:3799:43:3799:50 | source(...) : Object | Test.java:3799:35:3799:50 | (...)... : String | provenance |  |
 | Test.java:3800:10:3800:39 | new MyAbstractBagDecorator<>(...) : MyAbstractBagDecorator [<element>] : String | Test.java:3801:20:3801:22 | out : MyAbstractBagDecorator [<element>] : String | provenance |  |
-| Test.java:3800:37:3800:38 | in : TreeBag [<element>] : String | Test.java:3800:10:3800:39 | new MyAbstractBagDecorator<>(...) : MyAbstractBagDecorator [<element>] : String | provenance | MaD:24 |
+| Test.java:3800:37:3800:38 | in : TreeBag [<element>] : String | Test.java:3800:10:3800:39 | new MyAbstractBagDecorator<>(...) : MyAbstractBagDecorator [<element>] : String | provenance | MaD:26 |
 | Test.java:3800:37:3800:38 | in : TreeBag [<element>] : String | Test.java:7104:33:7104:48 | bag : TreeBag [<element>] : String | provenance |  |
 | Test.java:3801:20:3801:22 | out : MyAbstractBagDecorator [<element>] : String | Test.java:230:19:230:32 | it : MyAbstractBagDecorator [<element>] : String | provenance |  |
-| Test.java:3801:20:3801:22 | out : MyAbstractBagDecorator [<element>] : String | Test.java:3801:9:3801:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:3801:20:3801:22 | out : MyAbstractBagDecorator [<element>] : String | Test.java:3801:9:3801:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:3806:13:3806:42 | of(...) : Map [<map.key>] : String | Test.java:3807:31:3807:32 | in : Map [<map.key>] : String | provenance |  |
-| Test.java:3806:20:3806:35 | (...)... : String | Test.java:3806:13:3806:42 | of(...) : Map [<map.key>] : String | provenance | MaD:11 |
+| Test.java:3806:20:3806:35 | (...)... : String | Test.java:3806:13:3806:42 | of(...) : Map [<map.key>] : String | provenance | MaD:13 |
 | Test.java:3806:28:3806:35 | source(...) : Object | Test.java:3806:20:3806:35 | (...)... : String | provenance |  |
 | Test.java:3807:10:3807:33 | new MyAbstractMapBag<>(...) : MyAbstractMapBag [<element>] : String | Test.java:3808:20:3808:22 | out : MyAbstractMapBag [<element>] : String | provenance |  |
-| Test.java:3807:31:3807:32 | in : Map [<map.key>] : String | Test.java:3807:10:3807:33 | new MyAbstractMapBag<>(...) : MyAbstractMapBag [<element>] : String | provenance | MaD:25 |
+| Test.java:3807:31:3807:32 | in : Map [<map.key>] : String | Test.java:3807:10:3807:33 | new MyAbstractMapBag<>(...) : MyAbstractMapBag [<element>] : String | provenance | MaD:27 |
 | Test.java:3807:31:3807:32 | in : Map [<map.key>] : String | Test.java:7110:27:7110:58 | map : Map [<map.key>] : String | provenance |  |
 | Test.java:3808:20:3808:22 | out : MyAbstractMapBag [<element>] : String | Test.java:230:19:230:32 | it : MyAbstractMapBag [<element>] : String | provenance |  |
-| Test.java:3808:20:3808:22 | out : MyAbstractMapBag [<element>] : String | Test.java:3808:9:3808:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:3808:20:3808:22 | out : MyAbstractMapBag [<element>] : String | Test.java:3808:9:3808:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:3813:26:3813:77 | new MyAbstractMapBag<>(...) : MyAbstractMapBag [<element>] : String | Test.java:3814:10:3814:11 | in : MyAbstractMapBag [<element>] : String | provenance |  |
-| Test.java:3813:47:3813:76 | of(...) : Map [<map.key>] : String | Test.java:3813:26:3813:77 | new MyAbstractMapBag<>(...) : MyAbstractMapBag [<element>] : String | provenance | MaD:25 |
+| Test.java:3813:47:3813:76 | of(...) : Map [<map.key>] : String | Test.java:3813:26:3813:77 | new MyAbstractMapBag<>(...) : MyAbstractMapBag [<element>] : String | provenance | MaD:27 |
 | Test.java:3813:47:3813:76 | of(...) : Map [<map.key>] : String | Test.java:7110:27:7110:58 | map : Map [<map.key>] : String | provenance |  |
-| Test.java:3813:54:3813:69 | (...)... : String | Test.java:3813:47:3813:76 | of(...) : Map [<map.key>] : String | provenance | MaD:11 |
+| Test.java:3813:54:3813:69 | (...)... : String | Test.java:3813:47:3813:76 | of(...) : Map [<map.key>] : String | provenance | MaD:13 |
 | Test.java:3813:62:3813:69 | source(...) : Object | Test.java:3813:54:3813:69 | (...)... : String | provenance |  |
-| Test.java:3814:10:3814:11 | in : MyAbstractMapBag [<element>] : String | Test.java:3814:10:3814:22 | myGetMap(...) : Map [<map.key>] : String | provenance | MaD:26 |
+| Test.java:3814:10:3814:11 | in : MyAbstractMapBag [<element>] : String | Test.java:3814:10:3814:22 | myGetMap(...) : Map [<map.key>] : String | provenance | MaD:28 |
 | Test.java:3814:10:3814:11 | in : MyAbstractMapBag [<element>] : String | Test.java:7113:33:7113:40 | parameter this : MyAbstractMapBag [<element>] : String | provenance |  |
 | Test.java:3814:10:3814:22 | myGetMap(...) : Map [<map.key>] : String | Test.java:3815:19:3815:21 | out : Map [<map.key>] : String | provenance |  |
 | Test.java:3815:19:3815:21 | out : Map [<map.key>] : String | Test.java:228:18:228:29 | map : Map [<map.key>] : String | provenance |  |
-| Test.java:3815:19:3815:21 | out : Map [<map.key>] : String | Test.java:3815:9:3815:22 | getMapKey(...) | provenance | MaD:10 |
+| Test.java:3815:19:3815:21 | out : Map [<map.key>] : String | Test.java:3815:9:3815:22 | getMapKey(...) | provenance | MaD:18 |
 | Test.java:3820:19:3820:57 | newTreeBagWithElement(...) : TreeBag [<element>] : String | Test.java:3821:43:3821:44 | in : TreeBag [<element>] : String | provenance |  |
 | Test.java:3820:41:3820:56 | (...)... : String | Test.java:267:39:267:47 | element : String | provenance |  |
-| Test.java:3820:41:3820:56 | (...)... : String | Test.java:3820:19:3820:57 | newTreeBagWithElement(...) : TreeBag [<element>] : String | provenance | MaD:2 |
-| Test.java:3820:41:3820:56 | (...)... : String | Test.java:3820:19:3820:57 | newTreeBagWithElement(...) : TreeBag [<element>] : String | provenance | MaD:395 |
+| Test.java:3820:41:3820:56 | (...)... : String | Test.java:3820:19:3820:57 | newTreeBagWithElement(...) : TreeBag [<element>] : String | provenance | MaD:4 |
+| Test.java:3820:41:3820:56 | (...)... : String | Test.java:3820:19:3820:57 | newTreeBagWithElement(...) : TreeBag [<element>] : String | provenance | MaD:470 |
 | Test.java:3820:49:3820:56 | source(...) : Object | Test.java:3820:41:3820:56 | (...)... : String | provenance |  |
 | Test.java:3821:10:3821:45 | new MyAbstractSortedBagDecorator<>(...) : MyAbstractSortedBagDecorator [<element>] : String | Test.java:3822:20:3822:22 | out : MyAbstractSortedBagDecorator [<element>] : String | provenance |  |
-| Test.java:3821:43:3821:44 | in : TreeBag [<element>] : String | Test.java:3821:10:3821:45 | new MyAbstractSortedBagDecorator<>(...) : MyAbstractSortedBagDecorator [<element>] : String | provenance | MaD:27 |
+| Test.java:3821:43:3821:44 | in : TreeBag [<element>] : String | Test.java:3821:10:3821:45 | new MyAbstractSortedBagDecorator<>(...) : MyAbstractSortedBagDecorator [<element>] : String | provenance | MaD:29 |
 | Test.java:3821:43:3821:44 | in : TreeBag [<element>] : String | Test.java:7119:39:7119:60 | bag : TreeBag [<element>] : String | provenance |  |
 | Test.java:3822:20:3822:22 | out : MyAbstractSortedBagDecorator [<element>] : String | Test.java:230:19:230:32 | it : MyAbstractSortedBagDecorator [<element>] : String | provenance |  |
-| Test.java:3822:20:3822:22 | out : MyAbstractSortedBagDecorator [<element>] : String | Test.java:3822:9:3822:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:3822:20:3822:22 | out : MyAbstractSortedBagDecorator [<element>] : String | Test.java:3822:9:3822:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:3827:13:3827:51 | newTreeBagWithElement(...) : TreeBag [<element>] : String | Test.java:3828:28:3828:29 | in : TreeBag [<element>] : String | provenance |  |
 | Test.java:3827:35:3827:50 | (...)... : String | Test.java:267:39:267:47 | element : String | provenance |  |
-| Test.java:3827:35:3827:50 | (...)... : String | Test.java:3827:13:3827:51 | newTreeBagWithElement(...) : TreeBag [<element>] : String | provenance | MaD:2 |
-| Test.java:3827:35:3827:50 | (...)... : String | Test.java:3827:13:3827:51 | newTreeBagWithElement(...) : TreeBag [<element>] : String | provenance | MaD:395 |
+| Test.java:3827:35:3827:50 | (...)... : String | Test.java:3827:13:3827:51 | newTreeBagWithElement(...) : TreeBag [<element>] : String | provenance | MaD:4 |
+| Test.java:3827:35:3827:50 | (...)... : String | Test.java:3827:13:3827:51 | newTreeBagWithElement(...) : TreeBag [<element>] : String | provenance | MaD:470 |
 | Test.java:3827:43:3827:50 | source(...) : Object | Test.java:3827:35:3827:50 | (...)... : String | provenance |  |
 | Test.java:3828:10:3828:30 | new CollectionBag<>(...) : CollectionBag [<element>] : String | Test.java:3829:20:3829:22 | out : CollectionBag [<element>] : String | provenance |  |
-| Test.java:3828:28:3828:29 | in : TreeBag [<element>] : String | Test.java:3828:10:3828:30 | new CollectionBag<>(...) : CollectionBag [<element>] : String | provenance | MaD:28 |
+| Test.java:3828:28:3828:29 | in : TreeBag [<element>] : String | Test.java:3828:10:3828:30 | new CollectionBag<>(...) : CollectionBag [<element>] : String | provenance | MaD:30 |
 | Test.java:3829:20:3829:22 | out : CollectionBag [<element>] : String | Test.java:230:19:230:32 | it : CollectionBag [<element>] : String | provenance |  |
-| Test.java:3829:20:3829:22 | out : CollectionBag [<element>] : String | Test.java:3829:9:3829:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:3829:20:3829:22 | out : CollectionBag [<element>] : String | Test.java:3829:9:3829:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:3834:13:3834:51 | newTreeBagWithElement(...) : TreeBag [<element>] : String | Test.java:3835:38:3835:39 | in : TreeBag [<element>] : String | provenance |  |
 | Test.java:3834:35:3834:50 | (...)... : String | Test.java:267:39:267:47 | element : String | provenance |  |
-| Test.java:3834:35:3834:50 | (...)... : String | Test.java:3834:13:3834:51 | newTreeBagWithElement(...) : TreeBag [<element>] : String | provenance | MaD:2 |
-| Test.java:3834:35:3834:50 | (...)... : String | Test.java:3834:13:3834:51 | newTreeBagWithElement(...) : TreeBag [<element>] : String | provenance | MaD:395 |
+| Test.java:3834:35:3834:50 | (...)... : String | Test.java:3834:13:3834:51 | newTreeBagWithElement(...) : TreeBag [<element>] : String | provenance | MaD:4 |
+| Test.java:3834:35:3834:50 | (...)... : String | Test.java:3834:13:3834:51 | newTreeBagWithElement(...) : TreeBag [<element>] : String | provenance | MaD:470 |
 | Test.java:3834:43:3834:50 | source(...) : Object | Test.java:3834:35:3834:50 | (...)... : String | provenance |  |
 | Test.java:3835:10:3835:40 | collectionBag(...) : Bag [<element>] : String | Test.java:3836:20:3836:22 | out : Bag [<element>] : String | provenance |  |
-| Test.java:3835:38:3835:39 | in : TreeBag [<element>] : String | Test.java:3835:10:3835:40 | collectionBag(...) : Bag [<element>] : String | provenance | MaD:29 |
+| Test.java:3835:38:3835:39 | in : TreeBag [<element>] : String | Test.java:3835:10:3835:40 | collectionBag(...) : Bag [<element>] : String | provenance | MaD:31 |
 | Test.java:3836:20:3836:22 | out : Bag [<element>] : String | Test.java:230:19:230:32 | it : Bag [<element>] : String | provenance |  |
-| Test.java:3836:20:3836:22 | out : Bag [<element>] : String | Test.java:3836:9:3836:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:3836:20:3836:22 | out : Bag [<element>] : String | Test.java:3836:9:3836:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:3841:19:3841:57 | newTreeBagWithElement(...) : TreeBag [<element>] : String | Test.java:3842:34:3842:35 | in : TreeBag [<element>] : String | provenance |  |
 | Test.java:3841:41:3841:56 | (...)... : String | Test.java:267:39:267:47 | element : String | provenance |  |
-| Test.java:3841:41:3841:56 | (...)... : String | Test.java:3841:19:3841:57 | newTreeBagWithElement(...) : TreeBag [<element>] : String | provenance | MaD:2 |
-| Test.java:3841:41:3841:56 | (...)... : String | Test.java:3841:19:3841:57 | newTreeBagWithElement(...) : TreeBag [<element>] : String | provenance | MaD:395 |
+| Test.java:3841:41:3841:56 | (...)... : String | Test.java:3841:19:3841:57 | newTreeBagWithElement(...) : TreeBag [<element>] : String | provenance | MaD:4 |
+| Test.java:3841:41:3841:56 | (...)... : String | Test.java:3841:19:3841:57 | newTreeBagWithElement(...) : TreeBag [<element>] : String | provenance | MaD:470 |
 | Test.java:3841:49:3841:56 | source(...) : Object | Test.java:3841:41:3841:56 | (...)... : String | provenance |  |
 | Test.java:3842:10:3842:36 | new CollectionSortedBag<>(...) : CollectionSortedBag [<element>] : String | Test.java:3843:20:3843:22 | out : CollectionSortedBag [<element>] : String | provenance |  |
-| Test.java:3842:34:3842:35 | in : TreeBag [<element>] : String | Test.java:3842:10:3842:36 | new CollectionSortedBag<>(...) : CollectionSortedBag [<element>] : String | provenance | MaD:30 |
+| Test.java:3842:34:3842:35 | in : TreeBag [<element>] : String | Test.java:3842:10:3842:36 | new CollectionSortedBag<>(...) : CollectionSortedBag [<element>] : String | provenance | MaD:32 |
 | Test.java:3843:20:3843:22 | out : CollectionSortedBag [<element>] : String | Test.java:230:19:230:32 | it : CollectionSortedBag [<element>] : String | provenance |  |
-| Test.java:3843:20:3843:22 | out : CollectionSortedBag [<element>] : String | Test.java:3843:9:3843:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:3843:20:3843:22 | out : CollectionSortedBag [<element>] : String | Test.java:3843:9:3843:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:3848:19:3848:57 | newTreeBagWithElement(...) : TreeBag [<element>] : String | Test.java:3849:50:3849:51 | in : TreeBag [<element>] : String | provenance |  |
 | Test.java:3848:41:3848:56 | (...)... : String | Test.java:267:39:267:47 | element : String | provenance |  |
-| Test.java:3848:41:3848:56 | (...)... : String | Test.java:3848:19:3848:57 | newTreeBagWithElement(...) : TreeBag [<element>] : String | provenance | MaD:2 |
-| Test.java:3848:41:3848:56 | (...)... : String | Test.java:3848:19:3848:57 | newTreeBagWithElement(...) : TreeBag [<element>] : String | provenance | MaD:395 |
+| Test.java:3848:41:3848:56 | (...)... : String | Test.java:3848:19:3848:57 | newTreeBagWithElement(...) : TreeBag [<element>] : String | provenance | MaD:4 |
+| Test.java:3848:41:3848:56 | (...)... : String | Test.java:3848:19:3848:57 | newTreeBagWithElement(...) : TreeBag [<element>] : String | provenance | MaD:470 |
 | Test.java:3848:49:3848:56 | source(...) : Object | Test.java:3848:41:3848:56 | (...)... : String | provenance |  |
 | Test.java:3849:10:3849:52 | collectionSortedBag(...) : SortedBag [<element>] : String | Test.java:3850:20:3850:22 | out : SortedBag [<element>] : String | provenance |  |
-| Test.java:3849:50:3849:51 | in : TreeBag [<element>] : String | Test.java:3849:10:3849:52 | collectionSortedBag(...) : SortedBag [<element>] : String | provenance | MaD:31 |
+| Test.java:3849:50:3849:51 | in : TreeBag [<element>] : String | Test.java:3849:10:3849:52 | collectionSortedBag(...) : SortedBag [<element>] : String | provenance | MaD:33 |
 | Test.java:3850:20:3850:22 | out : SortedBag [<element>] : String | Test.java:230:19:230:32 | it : SortedBag [<element>] : String | provenance |  |
-| Test.java:3850:20:3850:22 | out : SortedBag [<element>] : String | Test.java:3850:9:3850:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:3850:20:3850:22 | out : SortedBag [<element>] : String | Test.java:3850:9:3850:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:3855:20:3855:58 | newTreeBagWithElement(...) : TreeBag [<element>] : String | Test.java:3856:22:3856:23 | in : TreeBag [<element>] : String | provenance |  |
 | Test.java:3855:42:3855:57 | (...)... : String | Test.java:267:39:267:47 | element : String | provenance |  |
-| Test.java:3855:42:3855:57 | (...)... : String | Test.java:3855:20:3855:58 | newTreeBagWithElement(...) : TreeBag [<element>] : String | provenance | MaD:2 |
-| Test.java:3855:42:3855:57 | (...)... : String | Test.java:3855:20:3855:58 | newTreeBagWithElement(...) : TreeBag [<element>] : String | provenance | MaD:395 |
+| Test.java:3855:42:3855:57 | (...)... : String | Test.java:3855:20:3855:58 | newTreeBagWithElement(...) : TreeBag [<element>] : String | provenance | MaD:4 |
+| Test.java:3855:42:3855:57 | (...)... : String | Test.java:3855:20:3855:58 | newTreeBagWithElement(...) : TreeBag [<element>] : String | provenance | MaD:470 |
 | Test.java:3855:50:3855:57 | source(...) : Object | Test.java:3855:42:3855:57 | (...)... : String | provenance |  |
 | Test.java:3856:10:3856:24 | new HashBag<>(...) : HashBag [<element>] : String | Test.java:3857:20:3857:22 | out : HashBag [<element>] : String | provenance |  |
-| Test.java:3856:22:3856:23 | in : TreeBag [<element>] : String | Test.java:3856:10:3856:24 | new HashBag<>(...) : HashBag [<element>] : String | provenance | MaD:32 |
+| Test.java:3856:22:3856:23 | in : TreeBag [<element>] : String | Test.java:3856:10:3856:24 | new HashBag<>(...) : HashBag [<element>] : String | provenance | MaD:34 |
 | Test.java:3857:20:3857:22 | out : HashBag [<element>] : String | Test.java:230:19:230:32 | it : HashBag [<element>] : String | provenance |  |
-| Test.java:3857:20:3857:22 | out : HashBag [<element>] : String | Test.java:3857:9:3857:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:3857:20:3857:22 | out : HashBag [<element>] : String | Test.java:3857:9:3857:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:3862:13:3862:51 | newTreeBagWithElement(...) : TreeBag [<element>] : String | Test.java:3863:38:3863:39 | in : TreeBag [<element>] : String | provenance |  |
 | Test.java:3862:35:3862:50 | (...)... : String | Test.java:267:39:267:47 | element : String | provenance |  |
-| Test.java:3862:35:3862:50 | (...)... : String | Test.java:3862:13:3862:51 | newTreeBagWithElement(...) : TreeBag [<element>] : String | provenance | MaD:2 |
-| Test.java:3862:35:3862:50 | (...)... : String | Test.java:3862:13:3862:51 | newTreeBagWithElement(...) : TreeBag [<element>] : String | provenance | MaD:395 |
+| Test.java:3862:35:3862:50 | (...)... : String | Test.java:3862:13:3862:51 | newTreeBagWithElement(...) : TreeBag [<element>] : String | provenance | MaD:4 |
+| Test.java:3862:35:3862:50 | (...)... : String | Test.java:3862:13:3862:51 | newTreeBagWithElement(...) : TreeBag [<element>] : String | provenance | MaD:470 |
 | Test.java:3862:43:3862:50 | source(...) : Object | Test.java:3862:35:3862:50 | (...)... : String | provenance |  |
 | Test.java:3863:10:3863:46 | predicatedBag(...) : PredicatedBag [<element>] : String | Test.java:3864:20:3864:22 | out : PredicatedBag [<element>] : String | provenance |  |
-| Test.java:3863:38:3863:39 | in : TreeBag [<element>] : String | Test.java:3863:10:3863:46 | predicatedBag(...) : PredicatedBag [<element>] : String | provenance | MaD:33 |
+| Test.java:3863:38:3863:39 | in : TreeBag [<element>] : String | Test.java:3863:10:3863:46 | predicatedBag(...) : PredicatedBag [<element>] : String | provenance | MaD:35 |
 | Test.java:3864:20:3864:22 | out : PredicatedBag [<element>] : String | Test.java:230:19:230:32 | it : PredicatedBag [<element>] : String | provenance |  |
-| Test.java:3864:20:3864:22 | out : PredicatedBag [<element>] : String | Test.java:3864:9:3864:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:3864:20:3864:22 | out : PredicatedBag [<element>] : String | Test.java:3864:9:3864:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:3869:19:3869:57 | newTreeBagWithElement(...) : TreeBag [<element>] : String | Test.java:3870:50:3870:51 | in : TreeBag [<element>] : String | provenance |  |
 | Test.java:3869:41:3869:56 | (...)... : String | Test.java:267:39:267:47 | element : String | provenance |  |
-| Test.java:3869:41:3869:56 | (...)... : String | Test.java:3869:19:3869:57 | newTreeBagWithElement(...) : TreeBag [<element>] : String | provenance | MaD:2 |
-| Test.java:3869:41:3869:56 | (...)... : String | Test.java:3869:19:3869:57 | newTreeBagWithElement(...) : TreeBag [<element>] : String | provenance | MaD:395 |
+| Test.java:3869:41:3869:56 | (...)... : String | Test.java:3869:19:3869:57 | newTreeBagWithElement(...) : TreeBag [<element>] : String | provenance | MaD:4 |
+| Test.java:3869:41:3869:56 | (...)... : String | Test.java:3869:19:3869:57 | newTreeBagWithElement(...) : TreeBag [<element>] : String | provenance | MaD:470 |
 | Test.java:3869:49:3869:56 | source(...) : Object | Test.java:3869:41:3869:56 | (...)... : String | provenance |  |
 | Test.java:3870:10:3870:58 | predicatedSortedBag(...) : PredicatedSortedBag [<element>] : String | Test.java:3871:20:3871:22 | out : PredicatedSortedBag [<element>] : String | provenance |  |
-| Test.java:3870:50:3870:51 | in : TreeBag [<element>] : String | Test.java:3870:10:3870:58 | predicatedSortedBag(...) : PredicatedSortedBag [<element>] : String | provenance | MaD:34 |
+| Test.java:3870:50:3870:51 | in : TreeBag [<element>] : String | Test.java:3870:10:3870:58 | predicatedSortedBag(...) : PredicatedSortedBag [<element>] : String | provenance | MaD:36 |
 | Test.java:3871:20:3871:22 | out : PredicatedSortedBag [<element>] : String | Test.java:230:19:230:32 | it : PredicatedSortedBag [<element>] : String | provenance |  |
-| Test.java:3871:20:3871:22 | out : PredicatedSortedBag [<element>] : String | Test.java:3871:9:3871:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:3871:20:3871:22 | out : PredicatedSortedBag [<element>] : String | Test.java:3871:9:3871:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:3876:13:3876:51 | newTreeBagWithElement(...) : TreeBag [<element>] : String | Test.java:3877:42:3877:43 | in : TreeBag [<element>] : String | provenance |  |
 | Test.java:3876:35:3876:50 | (...)... : String | Test.java:267:39:267:47 | element : String | provenance |  |
-| Test.java:3876:35:3876:50 | (...)... : String | Test.java:3876:13:3876:51 | newTreeBagWithElement(...) : TreeBag [<element>] : String | provenance | MaD:2 |
-| Test.java:3876:35:3876:50 | (...)... : String | Test.java:3876:13:3876:51 | newTreeBagWithElement(...) : TreeBag [<element>] : String | provenance | MaD:395 |
+| Test.java:3876:35:3876:50 | (...)... : String | Test.java:3876:13:3876:51 | newTreeBagWithElement(...) : TreeBag [<element>] : String | provenance | MaD:4 |
+| Test.java:3876:35:3876:50 | (...)... : String | Test.java:3876:13:3876:51 | newTreeBagWithElement(...) : TreeBag [<element>] : String | provenance | MaD:470 |
 | Test.java:3876:43:3876:50 | source(...) : Object | Test.java:3876:35:3876:50 | (...)... : String | provenance |  |
 | Test.java:3877:10:3877:44 | synchronizedBag(...) : SynchronizedBag [<element>] : String | Test.java:3878:20:3878:22 | out : SynchronizedBag [<element>] : String | provenance |  |
-| Test.java:3877:42:3877:43 | in : TreeBag [<element>] : String | Test.java:3877:10:3877:44 | synchronizedBag(...) : SynchronizedBag [<element>] : String | provenance | MaD:35 |
+| Test.java:3877:42:3877:43 | in : TreeBag [<element>] : String | Test.java:3877:10:3877:44 | synchronizedBag(...) : SynchronizedBag [<element>] : String | provenance | MaD:37 |
 | Test.java:3878:20:3878:22 | out : SynchronizedBag [<element>] : String | Test.java:230:19:230:32 | it : SynchronizedBag [<element>] : String | provenance |  |
-| Test.java:3878:20:3878:22 | out : SynchronizedBag [<element>] : String | Test.java:3878:9:3878:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:3878:20:3878:22 | out : SynchronizedBag [<element>] : String | Test.java:3878:9:3878:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:3883:19:3883:57 | newTreeBagWithElement(...) : TreeBag [<element>] : String | Test.java:3884:54:3884:55 | in : TreeBag [<element>] : String | provenance |  |
 | Test.java:3883:41:3883:56 | (...)... : String | Test.java:267:39:267:47 | element : String | provenance |  |
-| Test.java:3883:41:3883:56 | (...)... : String | Test.java:3883:19:3883:57 | newTreeBagWithElement(...) : TreeBag [<element>] : String | provenance | MaD:2 |
-| Test.java:3883:41:3883:56 | (...)... : String | Test.java:3883:19:3883:57 | newTreeBagWithElement(...) : TreeBag [<element>] : String | provenance | MaD:395 |
+| Test.java:3883:41:3883:56 | (...)... : String | Test.java:3883:19:3883:57 | newTreeBagWithElement(...) : TreeBag [<element>] : String | provenance | MaD:4 |
+| Test.java:3883:41:3883:56 | (...)... : String | Test.java:3883:19:3883:57 | newTreeBagWithElement(...) : TreeBag [<element>] : String | provenance | MaD:470 |
 | Test.java:3883:49:3883:56 | source(...) : Object | Test.java:3883:41:3883:56 | (...)... : String | provenance |  |
 | Test.java:3884:10:3884:56 | synchronizedSortedBag(...) : SynchronizedSortedBag [<element>] : String | Test.java:3885:20:3885:22 | out : SynchronizedSortedBag [<element>] : String | provenance |  |
-| Test.java:3884:54:3884:55 | in : TreeBag [<element>] : String | Test.java:3884:10:3884:56 | synchronizedSortedBag(...) : SynchronizedSortedBag [<element>] : String | provenance | MaD:36 |
+| Test.java:3884:54:3884:55 | in : TreeBag [<element>] : String | Test.java:3884:10:3884:56 | synchronizedSortedBag(...) : SynchronizedSortedBag [<element>] : String | provenance | MaD:38 |
 | Test.java:3885:20:3885:22 | out : SynchronizedSortedBag [<element>] : String | Test.java:230:19:230:32 | it : SynchronizedSortedBag [<element>] : String | provenance |  |
-| Test.java:3885:20:3885:22 | out : SynchronizedSortedBag [<element>] : String | Test.java:3885:9:3885:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:3885:20:3885:22 | out : SynchronizedSortedBag [<element>] : String | Test.java:3885:9:3885:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:3890:13:3890:51 | newTreeBagWithElement(...) : TreeBag [<element>] : String | Test.java:3891:40:3891:41 | in : TreeBag [<element>] : String | provenance |  |
 | Test.java:3890:35:3890:50 | (...)... : String | Test.java:267:39:267:47 | element : String | provenance |  |
-| Test.java:3890:35:3890:50 | (...)... : String | Test.java:3890:13:3890:51 | newTreeBagWithElement(...) : TreeBag [<element>] : String | provenance | MaD:2 |
-| Test.java:3890:35:3890:50 | (...)... : String | Test.java:3890:13:3890:51 | newTreeBagWithElement(...) : TreeBag [<element>] : String | provenance | MaD:395 |
+| Test.java:3890:35:3890:50 | (...)... : String | Test.java:3890:13:3890:51 | newTreeBagWithElement(...) : TreeBag [<element>] : String | provenance | MaD:4 |
+| Test.java:3890:35:3890:50 | (...)... : String | Test.java:3890:13:3890:51 | newTreeBagWithElement(...) : TreeBag [<element>] : String | provenance | MaD:470 |
 | Test.java:3890:43:3890:50 | source(...) : Object | Test.java:3890:35:3890:50 | (...)... : String | provenance |  |
 | Test.java:3891:10:3891:48 | transformedBag(...) : Bag [<element>] : String | Test.java:3892:20:3892:22 | out : Bag [<element>] : String | provenance |  |
-| Test.java:3891:40:3891:41 | in : TreeBag [<element>] : String | Test.java:3891:10:3891:48 | transformedBag(...) : Bag [<element>] : String | provenance | MaD:37 |
+| Test.java:3891:40:3891:41 | in : TreeBag [<element>] : String | Test.java:3891:10:3891:48 | transformedBag(...) : Bag [<element>] : String | provenance | MaD:39 |
 | Test.java:3892:20:3892:22 | out : Bag [<element>] : String | Test.java:230:19:230:32 | it : Bag [<element>] : String | provenance |  |
-| Test.java:3892:20:3892:22 | out : Bag [<element>] : String | Test.java:3892:9:3892:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:3892:20:3892:22 | out : Bag [<element>] : String | Test.java:3892:9:3892:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:3897:19:3897:57 | newTreeBagWithElement(...) : TreeBag [<element>] : String | Test.java:3898:52:3898:53 | in : TreeBag [<element>] : String | provenance |  |
 | Test.java:3897:41:3897:56 | (...)... : String | Test.java:267:39:267:47 | element : String | provenance |  |
-| Test.java:3897:41:3897:56 | (...)... : String | Test.java:3897:19:3897:57 | newTreeBagWithElement(...) : TreeBag [<element>] : String | provenance | MaD:2 |
-| Test.java:3897:41:3897:56 | (...)... : String | Test.java:3897:19:3897:57 | newTreeBagWithElement(...) : TreeBag [<element>] : String | provenance | MaD:395 |
+| Test.java:3897:41:3897:56 | (...)... : String | Test.java:3897:19:3897:57 | newTreeBagWithElement(...) : TreeBag [<element>] : String | provenance | MaD:4 |
+| Test.java:3897:41:3897:56 | (...)... : String | Test.java:3897:19:3897:57 | newTreeBagWithElement(...) : TreeBag [<element>] : String | provenance | MaD:470 |
 | Test.java:3897:49:3897:56 | source(...) : Object | Test.java:3897:41:3897:56 | (...)... : String | provenance |  |
 | Test.java:3898:10:3898:60 | transformedSortedBag(...) : TransformedSortedBag [<element>] : String | Test.java:3899:20:3899:22 | out : TransformedSortedBag [<element>] : String | provenance |  |
-| Test.java:3898:52:3898:53 | in : TreeBag [<element>] : String | Test.java:3898:10:3898:60 | transformedSortedBag(...) : TransformedSortedBag [<element>] : String | provenance | MaD:38 |
+| Test.java:3898:52:3898:53 | in : TreeBag [<element>] : String | Test.java:3898:10:3898:60 | transformedSortedBag(...) : TransformedSortedBag [<element>] : String | provenance | MaD:40 |
 | Test.java:3899:20:3899:22 | out : TransformedSortedBag [<element>] : String | Test.java:230:19:230:32 | it : TransformedSortedBag [<element>] : String | provenance |  |
-| Test.java:3899:20:3899:22 | out : TransformedSortedBag [<element>] : String | Test.java:3899:9:3899:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:3899:20:3899:22 | out : TransformedSortedBag [<element>] : String | Test.java:3899:9:3899:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:3904:20:3904:58 | newTreeBagWithElement(...) : TreeBag [<element>] : String | Test.java:3905:22:3905:23 | in : TreeBag [<element>] : String | provenance |  |
 | Test.java:3904:42:3904:57 | (...)... : String | Test.java:267:39:267:47 | element : String | provenance |  |
-| Test.java:3904:42:3904:57 | (...)... : String | Test.java:3904:20:3904:58 | newTreeBagWithElement(...) : TreeBag [<element>] : String | provenance | MaD:2 |
-| Test.java:3904:42:3904:57 | (...)... : String | Test.java:3904:20:3904:58 | newTreeBagWithElement(...) : TreeBag [<element>] : String | provenance | MaD:395 |
+| Test.java:3904:42:3904:57 | (...)... : String | Test.java:3904:20:3904:58 | newTreeBagWithElement(...) : TreeBag [<element>] : String | provenance | MaD:4 |
+| Test.java:3904:42:3904:57 | (...)... : String | Test.java:3904:20:3904:58 | newTreeBagWithElement(...) : TreeBag [<element>] : String | provenance | MaD:470 |
 | Test.java:3904:50:3904:57 | source(...) : Object | Test.java:3904:42:3904:57 | (...)... : String | provenance |  |
 | Test.java:3905:10:3905:24 | new TreeBag<>(...) : TreeBag [<element>] : String | Test.java:3906:20:3906:22 | out : TreeBag [<element>] : String | provenance |  |
-| Test.java:3905:22:3905:23 | in : TreeBag [<element>] : String | Test.java:3905:10:3905:24 | new TreeBag<>(...) : TreeBag [<element>] : String | provenance | MaD:39 |
+| Test.java:3905:22:3905:23 | in : TreeBag [<element>] : String | Test.java:3905:10:3905:24 | new TreeBag<>(...) : TreeBag [<element>] : String | provenance | MaD:41 |
 | Test.java:3906:20:3906:22 | out : TreeBag [<element>] : String | Test.java:230:19:230:32 | it : TreeBag [<element>] : String | provenance |  |
-| Test.java:3906:20:3906:22 | out : TreeBag [<element>] : String | Test.java:3906:9:3906:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:3906:20:3906:22 | out : TreeBag [<element>] : String | Test.java:3906:9:3906:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:3911:13:3911:51 | newTreeBagWithElement(...) : TreeBag [<element>] : String | Test.java:3912:42:3912:43 | in : TreeBag [<element>] : String | provenance |  |
 | Test.java:3911:35:3911:50 | (...)... : String | Test.java:267:39:267:47 | element : String | provenance |  |
-| Test.java:3911:35:3911:50 | (...)... : String | Test.java:3911:13:3911:51 | newTreeBagWithElement(...) : TreeBag [<element>] : String | provenance | MaD:2 |
-| Test.java:3911:35:3911:50 | (...)... : String | Test.java:3911:13:3911:51 | newTreeBagWithElement(...) : TreeBag [<element>] : String | provenance | MaD:395 |
+| Test.java:3911:35:3911:50 | (...)... : String | Test.java:3911:13:3911:51 | newTreeBagWithElement(...) : TreeBag [<element>] : String | provenance | MaD:4 |
+| Test.java:3911:35:3911:50 | (...)... : String | Test.java:3911:13:3911:51 | newTreeBagWithElement(...) : TreeBag [<element>] : String | provenance | MaD:470 |
 | Test.java:3911:43:3911:50 | source(...) : Object | Test.java:3911:35:3911:50 | (...)... : String | provenance |  |
 | Test.java:3912:10:3912:44 | unmodifiableBag(...) : Bag [<element>] : String | Test.java:3913:20:3913:22 | out : Bag [<element>] : String | provenance |  |
-| Test.java:3912:42:3912:43 | in : TreeBag [<element>] : String | Test.java:3912:10:3912:44 | unmodifiableBag(...) : Bag [<element>] : String | provenance | MaD:40 |
+| Test.java:3912:42:3912:43 | in : TreeBag [<element>] : String | Test.java:3912:10:3912:44 | unmodifiableBag(...) : Bag [<element>] : String | provenance | MaD:42 |
 | Test.java:3913:20:3913:22 | out : Bag [<element>] : String | Test.java:230:19:230:32 | it : Bag [<element>] : String | provenance |  |
-| Test.java:3913:20:3913:22 | out : Bag [<element>] : String | Test.java:3913:9:3913:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:3913:20:3913:22 | out : Bag [<element>] : String | Test.java:3913:9:3913:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:3918:19:3918:57 | newTreeBagWithElement(...) : TreeBag [<element>] : String | Test.java:3919:54:3919:55 | in : TreeBag [<element>] : String | provenance |  |
 | Test.java:3918:41:3918:56 | (...)... : String | Test.java:267:39:267:47 | element : String | provenance |  |
-| Test.java:3918:41:3918:56 | (...)... : String | Test.java:3918:19:3918:57 | newTreeBagWithElement(...) : TreeBag [<element>] : String | provenance | MaD:2 |
-| Test.java:3918:41:3918:56 | (...)... : String | Test.java:3918:19:3918:57 | newTreeBagWithElement(...) : TreeBag [<element>] : String | provenance | MaD:395 |
+| Test.java:3918:41:3918:56 | (...)... : String | Test.java:3918:19:3918:57 | newTreeBagWithElement(...) : TreeBag [<element>] : String | provenance | MaD:4 |
+| Test.java:3918:41:3918:56 | (...)... : String | Test.java:3918:19:3918:57 | newTreeBagWithElement(...) : TreeBag [<element>] : String | provenance | MaD:470 |
 | Test.java:3918:49:3918:56 | source(...) : Object | Test.java:3918:41:3918:56 | (...)... : String | provenance |  |
 | Test.java:3919:10:3919:56 | unmodifiableSortedBag(...) : SortedBag [<element>] : String | Test.java:3920:20:3920:22 | out : SortedBag [<element>] : String | provenance |  |
-| Test.java:3919:54:3919:55 | in : TreeBag [<element>] : String | Test.java:3919:10:3919:56 | unmodifiableSortedBag(...) : SortedBag [<element>] : String | provenance | MaD:41 |
+| Test.java:3919:54:3919:55 | in : TreeBag [<element>] : String | Test.java:3919:10:3919:56 | unmodifiableSortedBag(...) : SortedBag [<element>] : String | provenance | MaD:43 |
 | Test.java:3920:20:3920:22 | out : SortedBag [<element>] : String | Test.java:230:19:230:32 | it : SortedBag [<element>] : String | provenance |  |
-| Test.java:3920:20:3920:22 | out : SortedBag [<element>] : String | Test.java:3920:9:3920:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:3920:20:3920:22 | out : SortedBag [<element>] : String | Test.java:3920:9:3920:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:3925:17:3925:62 | newDualTreeBidiMapWithMapKey(...) : DualTreeBidiMap [<map.key>] : String | Test.java:3926:41:3926:42 | in : DualTreeBidiMap [<map.key>] : String | provenance |  |
 | Test.java:3925:46:3925:61 | (...)... : String | Test.java:274:61:274:65 | key : String | provenance |  |
-| Test.java:3925:46:3925:61 | (...)... : String | Test.java:3925:17:3925:62 | newDualTreeBidiMapWithMapKey(...) : DualTreeBidiMap [<map.key>] : String | provenance | MaD:11 |
+| Test.java:3925:46:3925:61 | (...)... : String | Test.java:3925:17:3925:62 | newDualTreeBidiMapWithMapKey(...) : DualTreeBidiMap [<map.key>] : String | provenance | MaD:13 |
 | Test.java:3925:54:3925:61 | source(...) : Object | Test.java:3925:46:3925:61 | (...)... : String | provenance |  |
 | Test.java:3926:10:3926:43 | new MyAbstractBidiMapDecorator<>(...) : MyAbstractBidiMapDecorator [<map.key>] : String | Test.java:3927:19:3927:21 | out : MyAbstractBidiMapDecorator [<map.key>] : String | provenance |  |
-| Test.java:3926:41:3926:42 | in : DualTreeBidiMap [<map.key>] : String | Test.java:3926:10:3926:43 | new MyAbstractBidiMapDecorator<>(...) : MyAbstractBidiMapDecorator [<map.key>] : String | provenance | MaD:42 |
+| Test.java:3926:41:3926:42 | in : DualTreeBidiMap [<map.key>] : String | Test.java:3926:10:3926:43 | new MyAbstractBidiMapDecorator<>(...) : MyAbstractBidiMapDecorator [<map.key>] : String | provenance | MaD:44 |
 | Test.java:3926:41:3926:42 | in : DualTreeBidiMap [<map.key>] : String | Test.java:7125:37:7125:59 | map : DualTreeBidiMap [<map.key>] : String | provenance |  |
 | Test.java:3927:19:3927:21 | out : MyAbstractBidiMapDecorator [<map.key>] : String | Test.java:228:18:228:29 | map : MyAbstractBidiMapDecorator [<map.key>] : String | provenance |  |
-| Test.java:3927:19:3927:21 | out : MyAbstractBidiMapDecorator [<map.key>] : String | Test.java:3927:9:3927:22 | getMapKey(...) | provenance | MaD:10 |
+| Test.java:3927:19:3927:21 | out : MyAbstractBidiMapDecorator [<map.key>] : String | Test.java:3927:9:3927:22 | getMapKey(...) | provenance | MaD:18 |
 | Test.java:3932:17:3932:64 | newDualTreeBidiMapWithMapValue(...) : DualTreeBidiMap [<map.value>] : String | Test.java:3933:41:3933:42 | in : DualTreeBidiMap [<map.value>] : String | provenance |  |
 | Test.java:3932:48:3932:63 | (...)... : String | Test.java:292:63:292:69 | value : String | provenance |  |
-| Test.java:3932:48:3932:63 | (...)... : String | Test.java:3932:17:3932:64 | newDualTreeBidiMapWithMapValue(...) : DualTreeBidiMap [<map.value>] : String | provenance | MaD:12 |
+| Test.java:3932:48:3932:63 | (...)... : String | Test.java:3932:17:3932:64 | newDualTreeBidiMapWithMapValue(...) : DualTreeBidiMap [<map.value>] : String | provenance | MaD:14 |
 | Test.java:3932:56:3932:63 | source(...) : Object | Test.java:3932:48:3932:63 | (...)... : String | provenance |  |
 | Test.java:3933:10:3933:43 | new MyAbstractBidiMapDecorator<>(...) : MyAbstractBidiMapDecorator [<map.value>] : String | Test.java:3934:21:3934:23 | out : MyAbstractBidiMapDecorator [<map.value>] : String | provenance |  |
-| Test.java:3933:41:3933:42 | in : DualTreeBidiMap [<map.value>] : String | Test.java:3933:10:3933:43 | new MyAbstractBidiMapDecorator<>(...) : MyAbstractBidiMapDecorator [<map.value>] : String | provenance | MaD:43 |
+| Test.java:3933:41:3933:42 | in : DualTreeBidiMap [<map.value>] : String | Test.java:3933:10:3933:43 | new MyAbstractBidiMapDecorator<>(...) : MyAbstractBidiMapDecorator [<map.value>] : String | provenance | MaD:45 |
 | Test.java:3933:41:3933:42 | in : DualTreeBidiMap [<map.value>] : String | Test.java:7125:37:7125:59 | map : DualTreeBidiMap [<map.value>] : String | provenance |  |
 | Test.java:3934:21:3934:23 | out : MyAbstractBidiMapDecorator [<map.value>] : String | Test.java:232:20:232:31 | map : MyAbstractBidiMapDecorator [<map.value>] : String | provenance |  |
-| Test.java:3934:21:3934:23 | out : MyAbstractBidiMapDecorator [<map.value>] : String | Test.java:3934:9:3934:24 | getMapValue(...) | provenance | MaD:9 |
+| Test.java:3934:21:3934:23 | out : MyAbstractBidiMapDecorator [<map.value>] : String | Test.java:3934:9:3934:24 | getMapValue(...) | provenance | MaD:17 |
 | Test.java:3939:17:3939:62 | newDualTreeBidiMapWithMapKey(...) : DualTreeBidiMap [<map.key>] : String | Test.java:3940:36:3940:37 | in : DualTreeBidiMap [<map.key>] : String | provenance |  |
 | Test.java:3939:46:3939:61 | (...)... : String | Test.java:274:61:274:65 | key : String | provenance |  |
-| Test.java:3939:46:3939:61 | (...)... : String | Test.java:3939:17:3939:62 | newDualTreeBidiMapWithMapKey(...) : DualTreeBidiMap [<map.key>] : String | provenance | MaD:11 |
+| Test.java:3939:46:3939:61 | (...)... : String | Test.java:3939:17:3939:62 | newDualTreeBidiMapWithMapKey(...) : DualTreeBidiMap [<map.key>] : String | provenance | MaD:13 |
 | Test.java:3939:54:3939:61 | source(...) : Object | Test.java:3939:46:3939:61 | (...)... : String | provenance |  |
 | Test.java:3940:10:3940:50 | new MyAbstractDualBidiMap<>(...) : MyAbstractDualBidiMap [<map.key>] : String | Test.java:3941:19:3941:21 | out : MyAbstractDualBidiMap [<map.key>] : String | provenance |  |
-| Test.java:3940:36:3940:37 | in : DualTreeBidiMap [<map.key>] : String | Test.java:3940:10:3940:50 | new MyAbstractDualBidiMap<>(...) : MyAbstractDualBidiMap [<map.key>] : String | provenance | MaD:44 |
+| Test.java:3940:36:3940:37 | in : DualTreeBidiMap [<map.key>] : String | Test.java:3940:10:3940:50 | new MyAbstractDualBidiMap<>(...) : MyAbstractDualBidiMap [<map.key>] : String | provenance | MaD:46 |
 | Test.java:3940:36:3940:37 | in : DualTreeBidiMap [<map.key>] : String | Test.java:7134:32:7134:56 | normalMap : DualTreeBidiMap [<map.key>] : String | provenance |  |
 | Test.java:3941:19:3941:21 | out : MyAbstractDualBidiMap [<map.key>] : String | Test.java:228:18:228:29 | map : MyAbstractDualBidiMap [<map.key>] : String | provenance |  |
-| Test.java:3941:19:3941:21 | out : MyAbstractDualBidiMap [<map.key>] : String | Test.java:3941:9:3941:22 | getMapKey(...) | provenance | MaD:10 |
+| Test.java:3941:19:3941:21 | out : MyAbstractDualBidiMap [<map.key>] : String | Test.java:3941:9:3941:22 | getMapKey(...) | provenance | MaD:18 |
 | Test.java:3946:17:3946:62 | newDualTreeBidiMapWithMapKey(...) : DualTreeBidiMap [<map.key>] : String | Test.java:3947:42:3947:43 | in : DualTreeBidiMap [<map.key>] : String | provenance |  |
 | Test.java:3946:46:3946:61 | (...)... : String | Test.java:274:61:274:65 | key : String | provenance |  |
-| Test.java:3946:46:3946:61 | (...)... : String | Test.java:3946:17:3946:62 | newDualTreeBidiMapWithMapKey(...) : DualTreeBidiMap [<map.key>] : String | provenance | MaD:11 |
+| Test.java:3946:46:3946:61 | (...)... : String | Test.java:3946:17:3946:62 | newDualTreeBidiMapWithMapKey(...) : DualTreeBidiMap [<map.key>] : String | provenance | MaD:13 |
 | Test.java:3946:54:3946:61 | source(...) : Object | Test.java:3946:46:3946:61 | (...)... : String | provenance |  |
 | Test.java:3947:10:3947:50 | new MyAbstractDualBidiMap<>(...) : MyAbstractDualBidiMap [<map.value>] : String | Test.java:3948:21:3948:23 | out : MyAbstractDualBidiMap [<map.value>] : String | provenance |  |
-| Test.java:3947:42:3947:43 | in : DualTreeBidiMap [<map.key>] : String | Test.java:3947:10:3947:50 | new MyAbstractDualBidiMap<>(...) : MyAbstractDualBidiMap [<map.value>] : String | provenance | MaD:46 |
+| Test.java:3947:42:3947:43 | in : DualTreeBidiMap [<map.key>] : String | Test.java:3947:10:3947:50 | new MyAbstractDualBidiMap<>(...) : MyAbstractDualBidiMap [<map.value>] : String | provenance | MaD:48 |
 | Test.java:3947:42:3947:43 | in : DualTreeBidiMap [<map.key>] : String | Test.java:7134:59:7134:84 | reverseMap : DualTreeBidiMap [<map.key>] : String | provenance |  |
 | Test.java:3948:21:3948:23 | out : MyAbstractDualBidiMap [<map.value>] : String | Test.java:232:20:232:31 | map : MyAbstractDualBidiMap [<map.value>] : String | provenance |  |
-| Test.java:3948:21:3948:23 | out : MyAbstractDualBidiMap [<map.value>] : String | Test.java:3948:9:3948:24 | getMapValue(...) | provenance | MaD:9 |
+| Test.java:3948:21:3948:23 | out : MyAbstractDualBidiMap [<map.value>] : String | Test.java:3948:9:3948:24 | getMapValue(...) | provenance | MaD:17 |
 | Test.java:3953:17:3953:62 | newDualTreeBidiMapWithMapKey(...) : DualTreeBidiMap [<map.key>] : String | Test.java:3954:48:3954:49 | in : DualTreeBidiMap [<map.key>] : String | provenance |  |
 | Test.java:3953:46:3953:61 | (...)... : String | Test.java:274:61:274:65 | key : String | provenance |  |
-| Test.java:3953:46:3953:61 | (...)... : String | Test.java:3953:17:3953:62 | newDualTreeBidiMapWithMapKey(...) : DualTreeBidiMap [<map.key>] : String | provenance | MaD:11 |
+| Test.java:3953:46:3953:61 | (...)... : String | Test.java:3953:17:3953:62 | newDualTreeBidiMapWithMapKey(...) : DualTreeBidiMap [<map.key>] : String | provenance | MaD:13 |
 | Test.java:3953:54:3953:61 | source(...) : Object | Test.java:3953:46:3953:61 | (...)... : String | provenance |  |
 | Test.java:3954:10:3954:50 | new MyAbstractDualBidiMap<>(...) : MyAbstractDualBidiMap [<map.value>] : String | Test.java:3955:21:3955:23 | out : MyAbstractDualBidiMap [<map.value>] : String | provenance |  |
-| Test.java:3954:48:3954:49 | in : DualTreeBidiMap [<map.key>] : String | Test.java:3954:10:3954:50 | new MyAbstractDualBidiMap<>(...) : MyAbstractDualBidiMap [<map.value>] : String | provenance | MaD:48 |
+| Test.java:3954:48:3954:49 | in : DualTreeBidiMap [<map.key>] : String | Test.java:3954:10:3954:50 | new MyAbstractDualBidiMap<>(...) : MyAbstractDualBidiMap [<map.value>] : String | provenance | MaD:50 |
 | Test.java:3954:48:3954:49 | in : DualTreeBidiMap [<map.key>] : String | Test.java:7134:87:7134:120 | inverseBidiMap : DualTreeBidiMap [<map.key>] : String | provenance |  |
 | Test.java:3955:21:3955:23 | out : MyAbstractDualBidiMap [<map.value>] : String | Test.java:232:20:232:31 | map : MyAbstractDualBidiMap [<map.value>] : String | provenance |  |
-| Test.java:3955:21:3955:23 | out : MyAbstractDualBidiMap [<map.value>] : String | Test.java:3955:9:3955:24 | getMapValue(...) | provenance | MaD:9 |
+| Test.java:3955:21:3955:23 | out : MyAbstractDualBidiMap [<map.value>] : String | Test.java:3955:9:3955:24 | getMapValue(...) | provenance | MaD:17 |
 | Test.java:3960:17:3960:64 | newDualTreeBidiMapWithMapValue(...) : DualTreeBidiMap [<map.value>] : String | Test.java:3961:36:3961:37 | in : DualTreeBidiMap [<map.value>] : String | provenance |  |
 | Test.java:3960:48:3960:63 | (...)... : String | Test.java:292:63:292:69 | value : String | provenance |  |
-| Test.java:3960:48:3960:63 | (...)... : String | Test.java:3960:17:3960:64 | newDualTreeBidiMapWithMapValue(...) : DualTreeBidiMap [<map.value>] : String | provenance | MaD:12 |
+| Test.java:3960:48:3960:63 | (...)... : String | Test.java:3960:17:3960:64 | newDualTreeBidiMapWithMapValue(...) : DualTreeBidiMap [<map.value>] : String | provenance | MaD:14 |
 | Test.java:3960:56:3960:63 | source(...) : Object | Test.java:3960:48:3960:63 | (...)... : String | provenance |  |
 | Test.java:3961:10:3961:50 | new MyAbstractDualBidiMap<>(...) : MyAbstractDualBidiMap [<map.value>] : String | Test.java:3962:21:3962:23 | out : MyAbstractDualBidiMap [<map.value>] : String | provenance |  |
-| Test.java:3961:36:3961:37 | in : DualTreeBidiMap [<map.value>] : String | Test.java:3961:10:3961:50 | new MyAbstractDualBidiMap<>(...) : MyAbstractDualBidiMap [<map.value>] : String | provenance | MaD:45 |
+| Test.java:3961:36:3961:37 | in : DualTreeBidiMap [<map.value>] : String | Test.java:3961:10:3961:50 | new MyAbstractDualBidiMap<>(...) : MyAbstractDualBidiMap [<map.value>] : String | provenance | MaD:47 |
 | Test.java:3961:36:3961:37 | in : DualTreeBidiMap [<map.value>] : String | Test.java:7134:32:7134:56 | normalMap : DualTreeBidiMap [<map.value>] : String | provenance |  |
 | Test.java:3962:21:3962:23 | out : MyAbstractDualBidiMap [<map.value>] : String | Test.java:232:20:232:31 | map : MyAbstractDualBidiMap [<map.value>] : String | provenance |  |
-| Test.java:3962:21:3962:23 | out : MyAbstractDualBidiMap [<map.value>] : String | Test.java:3962:9:3962:24 | getMapValue(...) | provenance | MaD:9 |
+| Test.java:3962:21:3962:23 | out : MyAbstractDualBidiMap [<map.value>] : String | Test.java:3962:9:3962:24 | getMapValue(...) | provenance | MaD:17 |
 | Test.java:3967:17:3967:64 | newDualTreeBidiMapWithMapValue(...) : DualTreeBidiMap [<map.value>] : String | Test.java:3968:42:3968:43 | in : DualTreeBidiMap [<map.value>] : String | provenance |  |
 | Test.java:3967:48:3967:63 | (...)... : String | Test.java:292:63:292:69 | value : String | provenance |  |
-| Test.java:3967:48:3967:63 | (...)... : String | Test.java:3967:17:3967:64 | newDualTreeBidiMapWithMapValue(...) : DualTreeBidiMap [<map.value>] : String | provenance | MaD:12 |
+| Test.java:3967:48:3967:63 | (...)... : String | Test.java:3967:17:3967:64 | newDualTreeBidiMapWithMapValue(...) : DualTreeBidiMap [<map.value>] : String | provenance | MaD:14 |
 | Test.java:3967:56:3967:63 | source(...) : Object | Test.java:3967:48:3967:63 | (...)... : String | provenance |  |
 | Test.java:3968:10:3968:50 | new MyAbstractDualBidiMap<>(...) : MyAbstractDualBidiMap [<map.key>] : String | Test.java:3969:19:3969:21 | out : MyAbstractDualBidiMap [<map.key>] : String | provenance |  |
-| Test.java:3968:42:3968:43 | in : DualTreeBidiMap [<map.value>] : String | Test.java:3968:10:3968:50 | new MyAbstractDualBidiMap<>(...) : MyAbstractDualBidiMap [<map.key>] : String | provenance | MaD:47 |
+| Test.java:3968:42:3968:43 | in : DualTreeBidiMap [<map.value>] : String | Test.java:3968:10:3968:50 | new MyAbstractDualBidiMap<>(...) : MyAbstractDualBidiMap [<map.key>] : String | provenance | MaD:49 |
 | Test.java:3968:42:3968:43 | in : DualTreeBidiMap [<map.value>] : String | Test.java:7134:59:7134:84 | reverseMap : DualTreeBidiMap [<map.value>] : String | provenance |  |
 | Test.java:3969:19:3969:21 | out : MyAbstractDualBidiMap [<map.key>] : String | Test.java:228:18:228:29 | map : MyAbstractDualBidiMap [<map.key>] : String | provenance |  |
-| Test.java:3969:19:3969:21 | out : MyAbstractDualBidiMap [<map.key>] : String | Test.java:3969:9:3969:22 | getMapKey(...) | provenance | MaD:10 |
+| Test.java:3969:19:3969:21 | out : MyAbstractDualBidiMap [<map.key>] : String | Test.java:3969:9:3969:22 | getMapKey(...) | provenance | MaD:18 |
 | Test.java:3974:17:3974:64 | newDualTreeBidiMapWithMapValue(...) : DualTreeBidiMap [<map.value>] : String | Test.java:3975:48:3975:49 | in : DualTreeBidiMap [<map.value>] : String | provenance |  |
 | Test.java:3974:48:3974:63 | (...)... : String | Test.java:292:63:292:69 | value : String | provenance |  |
-| Test.java:3974:48:3974:63 | (...)... : String | Test.java:3974:17:3974:64 | newDualTreeBidiMapWithMapValue(...) : DualTreeBidiMap [<map.value>] : String | provenance | MaD:12 |
+| Test.java:3974:48:3974:63 | (...)... : String | Test.java:3974:17:3974:64 | newDualTreeBidiMapWithMapValue(...) : DualTreeBidiMap [<map.value>] : String | provenance | MaD:14 |
 | Test.java:3974:56:3974:63 | source(...) : Object | Test.java:3974:48:3974:63 | (...)... : String | provenance |  |
 | Test.java:3975:10:3975:50 | new MyAbstractDualBidiMap<>(...) : MyAbstractDualBidiMap [<map.key>] : String | Test.java:3976:19:3976:21 | out : MyAbstractDualBidiMap [<map.key>] : String | provenance |  |
-| Test.java:3975:48:3975:49 | in : DualTreeBidiMap [<map.value>] : String | Test.java:3975:10:3975:50 | new MyAbstractDualBidiMap<>(...) : MyAbstractDualBidiMap [<map.key>] : String | provenance | MaD:49 |
+| Test.java:3975:48:3975:49 | in : DualTreeBidiMap [<map.value>] : String | Test.java:3975:10:3975:50 | new MyAbstractDualBidiMap<>(...) : MyAbstractDualBidiMap [<map.key>] : String | provenance | MaD:51 |
 | Test.java:3975:48:3975:49 | in : DualTreeBidiMap [<map.value>] : String | Test.java:7134:87:7134:120 | inverseBidiMap : DualTreeBidiMap [<map.value>] : String | provenance |  |
 | Test.java:3976:19:3976:21 | out : MyAbstractDualBidiMap [<map.key>] : String | Test.java:228:18:228:29 | map : MyAbstractDualBidiMap [<map.key>] : String | provenance |  |
-| Test.java:3976:19:3976:21 | out : MyAbstractDualBidiMap [<map.key>] : String | Test.java:3976:9:3976:22 | getMapKey(...) | provenance | MaD:10 |
+| Test.java:3976:19:3976:21 | out : MyAbstractDualBidiMap [<map.key>] : String | Test.java:3976:9:3976:22 | getMapKey(...) | provenance | MaD:18 |
 | Test.java:3981:24:3981:69 | newDualTreeBidiMapWithMapKey(...) : DualTreeBidiMap [<map.key>] : String | Test.java:3982:48:3982:49 | in : DualTreeBidiMap [<map.key>] : String | provenance |  |
 | Test.java:3981:53:3981:68 | (...)... : String | Test.java:274:61:274:65 | key : String | provenance |  |
-| Test.java:3981:53:3981:68 | (...)... : String | Test.java:3981:24:3981:69 | newDualTreeBidiMapWithMapKey(...) : DualTreeBidiMap [<map.key>] : String | provenance | MaD:11 |
+| Test.java:3981:53:3981:68 | (...)... : String | Test.java:3981:24:3981:69 | newDualTreeBidiMapWithMapKey(...) : DualTreeBidiMap [<map.key>] : String | provenance | MaD:13 |
 | Test.java:3981:61:3981:68 | source(...) : Object | Test.java:3981:53:3981:68 | (...)... : String | provenance |  |
 | Test.java:3982:10:3982:50 | new MyAbstractOrderedBidiMapDecorator<>(...) : MyAbstractOrderedBidiMapDecorator [<map.key>] : String | Test.java:3983:19:3983:21 | out : MyAbstractOrderedBidiMapDecorator [<map.key>] : String | provenance |  |
-| Test.java:3982:48:3982:49 | in : DualTreeBidiMap [<map.key>] : String | Test.java:3982:10:3982:50 | new MyAbstractOrderedBidiMapDecorator<>(...) : MyAbstractOrderedBidiMapDecorator [<map.key>] : String | provenance | MaD:50 |
+| Test.java:3982:48:3982:49 | in : DualTreeBidiMap [<map.key>] : String | Test.java:3982:10:3982:50 | new MyAbstractOrderedBidiMapDecorator<>(...) : MyAbstractOrderedBidiMapDecorator [<map.key>] : String | provenance | MaD:52 |
 | Test.java:3982:48:3982:49 | in : DualTreeBidiMap [<map.key>] : String | Test.java:7143:44:7143:73 | map : DualTreeBidiMap [<map.key>] : String | provenance |  |
 | Test.java:3983:19:3983:21 | out : MyAbstractOrderedBidiMapDecorator [<map.key>] : String | Test.java:228:18:228:29 | map : MyAbstractOrderedBidiMapDecorator [<map.key>] : String | provenance |  |
-| Test.java:3983:19:3983:21 | out : MyAbstractOrderedBidiMapDecorator [<map.key>] : String | Test.java:3983:9:3983:22 | getMapKey(...) | provenance | MaD:10 |
+| Test.java:3983:19:3983:21 | out : MyAbstractOrderedBidiMapDecorator [<map.key>] : String | Test.java:3983:9:3983:22 | getMapKey(...) | provenance | MaD:18 |
 | Test.java:3988:24:3988:71 | newDualTreeBidiMapWithMapValue(...) : DualTreeBidiMap [<map.value>] : String | Test.java:3989:48:3989:49 | in : DualTreeBidiMap [<map.value>] : String | provenance |  |
 | Test.java:3988:55:3988:70 | (...)... : String | Test.java:292:63:292:69 | value : String | provenance |  |
-| Test.java:3988:55:3988:70 | (...)... : String | Test.java:3988:24:3988:71 | newDualTreeBidiMapWithMapValue(...) : DualTreeBidiMap [<map.value>] : String | provenance | MaD:12 |
+| Test.java:3988:55:3988:70 | (...)... : String | Test.java:3988:24:3988:71 | newDualTreeBidiMapWithMapValue(...) : DualTreeBidiMap [<map.value>] : String | provenance | MaD:14 |
 | Test.java:3988:63:3988:70 | source(...) : Object | Test.java:3988:55:3988:70 | (...)... : String | provenance |  |
 | Test.java:3989:10:3989:50 | new MyAbstractOrderedBidiMapDecorator<>(...) : MyAbstractOrderedBidiMapDecorator [<map.value>] : String | Test.java:3990:21:3990:23 | out : MyAbstractOrderedBidiMapDecorator [<map.value>] : String | provenance |  |
-| Test.java:3989:48:3989:49 | in : DualTreeBidiMap [<map.value>] : String | Test.java:3989:10:3989:50 | new MyAbstractOrderedBidiMapDecorator<>(...) : MyAbstractOrderedBidiMapDecorator [<map.value>] : String | provenance | MaD:51 |
+| Test.java:3989:48:3989:49 | in : DualTreeBidiMap [<map.value>] : String | Test.java:3989:10:3989:50 | new MyAbstractOrderedBidiMapDecorator<>(...) : MyAbstractOrderedBidiMapDecorator [<map.value>] : String | provenance | MaD:53 |
 | Test.java:3989:48:3989:49 | in : DualTreeBidiMap [<map.value>] : String | Test.java:7143:44:7143:73 | map : DualTreeBidiMap [<map.value>] : String | provenance |  |
 | Test.java:3990:21:3990:23 | out : MyAbstractOrderedBidiMapDecorator [<map.value>] : String | Test.java:232:20:232:31 | map : MyAbstractOrderedBidiMapDecorator [<map.value>] : String | provenance |  |
-| Test.java:3990:21:3990:23 | out : MyAbstractOrderedBidiMapDecorator [<map.value>] : String | Test.java:3990:9:3990:24 | getMapValue(...) | provenance | MaD:9 |
+| Test.java:3990:21:3990:23 | out : MyAbstractOrderedBidiMapDecorator [<map.value>] : String | Test.java:3990:9:3990:24 | getMapValue(...) | provenance | MaD:17 |
 | Test.java:3995:23:3995:68 | newDualTreeBidiMapWithMapKey(...) : DualTreeBidiMap [<map.key>] : String | Test.java:3996:47:3996:48 | in : DualTreeBidiMap [<map.key>] : String | provenance |  |
 | Test.java:3995:52:3995:67 | (...)... : String | Test.java:274:61:274:65 | key : String | provenance |  |
-| Test.java:3995:52:3995:67 | (...)... : String | Test.java:3995:23:3995:68 | newDualTreeBidiMapWithMapKey(...) : DualTreeBidiMap [<map.key>] : String | provenance | MaD:11 |
+| Test.java:3995:52:3995:67 | (...)... : String | Test.java:3995:23:3995:68 | newDualTreeBidiMapWithMapKey(...) : DualTreeBidiMap [<map.key>] : String | provenance | MaD:13 |
 | Test.java:3995:60:3995:67 | source(...) : Object | Test.java:3995:52:3995:67 | (...)... : String | provenance |  |
 | Test.java:3996:10:3996:49 | new MyAbstractSortedBidiMapDecorator<>(...) : MyAbstractSortedBidiMapDecorator [<map.key>] : String | Test.java:3997:19:3997:21 | out : MyAbstractSortedBidiMapDecorator [<map.key>] : String | provenance |  |
-| Test.java:3996:47:3996:48 | in : DualTreeBidiMap [<map.key>] : String | Test.java:3996:10:3996:49 | new MyAbstractSortedBidiMapDecorator<>(...) : MyAbstractSortedBidiMapDecorator [<map.key>] : String | provenance | MaD:52 |
+| Test.java:3996:47:3996:48 | in : DualTreeBidiMap [<map.key>] : String | Test.java:3996:10:3996:49 | new MyAbstractSortedBidiMapDecorator<>(...) : MyAbstractSortedBidiMapDecorator [<map.key>] : String | provenance | MaD:54 |
 | Test.java:3996:47:3996:48 | in : DualTreeBidiMap [<map.key>] : String | Test.java:7086:43:7086:71 | map : DualTreeBidiMap [<map.key>] : String | provenance |  |
 | Test.java:3997:19:3997:21 | out : MyAbstractSortedBidiMapDecorator [<map.key>] : String | Test.java:228:18:228:29 | map : MyAbstractSortedBidiMapDecorator [<map.key>] : String | provenance |  |
-| Test.java:3997:19:3997:21 | out : MyAbstractSortedBidiMapDecorator [<map.key>] : String | Test.java:3997:9:3997:22 | getMapKey(...) | provenance | MaD:10 |
+| Test.java:3997:19:3997:21 | out : MyAbstractSortedBidiMapDecorator [<map.key>] : String | Test.java:3997:9:3997:22 | getMapKey(...) | provenance | MaD:18 |
 | Test.java:4002:23:4002:70 | newDualTreeBidiMapWithMapValue(...) : DualTreeBidiMap [<map.value>] : String | Test.java:4003:47:4003:48 | in : DualTreeBidiMap [<map.value>] : String | provenance |  |
 | Test.java:4002:54:4002:69 | (...)... : String | Test.java:292:63:292:69 | value : String | provenance |  |
-| Test.java:4002:54:4002:69 | (...)... : String | Test.java:4002:23:4002:70 | newDualTreeBidiMapWithMapValue(...) : DualTreeBidiMap [<map.value>] : String | provenance | MaD:12 |
+| Test.java:4002:54:4002:69 | (...)... : String | Test.java:4002:23:4002:70 | newDualTreeBidiMapWithMapValue(...) : DualTreeBidiMap [<map.value>] : String | provenance | MaD:14 |
 | Test.java:4002:62:4002:69 | source(...) : Object | Test.java:4002:54:4002:69 | (...)... : String | provenance |  |
 | Test.java:4003:10:4003:49 | new MyAbstractSortedBidiMapDecorator<>(...) : MyAbstractSortedBidiMapDecorator [<map.value>] : String | Test.java:4004:21:4004:23 | out : MyAbstractSortedBidiMapDecorator [<map.value>] : String | provenance |  |
-| Test.java:4003:47:4003:48 | in : DualTreeBidiMap [<map.value>] : String | Test.java:4003:10:4003:49 | new MyAbstractSortedBidiMapDecorator<>(...) : MyAbstractSortedBidiMapDecorator [<map.value>] : String | provenance | MaD:53 |
+| Test.java:4003:47:4003:48 | in : DualTreeBidiMap [<map.value>] : String | Test.java:4003:10:4003:49 | new MyAbstractSortedBidiMapDecorator<>(...) : MyAbstractSortedBidiMapDecorator [<map.value>] : String | provenance | MaD:55 |
 | Test.java:4003:47:4003:48 | in : DualTreeBidiMap [<map.value>] : String | Test.java:7086:43:7086:71 | map : DualTreeBidiMap [<map.value>] : String | provenance |  |
 | Test.java:4004:21:4004:23 | out : MyAbstractSortedBidiMapDecorator [<map.value>] : String | Test.java:232:20:232:31 | map : MyAbstractSortedBidiMapDecorator [<map.value>] : String | provenance |  |
-| Test.java:4004:21:4004:23 | out : MyAbstractSortedBidiMapDecorator [<map.value>] : String | Test.java:4004:9:4004:24 | getMapValue(...) | provenance | MaD:9 |
+| Test.java:4004:21:4004:23 | out : MyAbstractSortedBidiMapDecorator [<map.value>] : String | Test.java:4004:9:4004:24 | getMapValue(...) | provenance | MaD:17 |
 | Test.java:4009:13:4009:42 | of(...) : Map [<map.key>] : String | Test.java:4010:30:4010:31 | in : Map [<map.key>] : String | provenance |  |
-| Test.java:4009:20:4009:35 | (...)... : String | Test.java:4009:13:4009:42 | of(...) : Map [<map.key>] : String | provenance | MaD:11 |
+| Test.java:4009:20:4009:35 | (...)... : String | Test.java:4009:13:4009:42 | of(...) : Map [<map.key>] : String | provenance | MaD:13 |
 | Test.java:4009:28:4009:35 | source(...) : Object | Test.java:4009:20:4009:35 | (...)... : String | provenance |  |
 | Test.java:4010:10:4010:32 | new DualHashBidiMap<>(...) : DualHashBidiMap [<map.key>] : String | Test.java:4011:19:4011:21 | out : DualHashBidiMap [<map.key>] : String | provenance |  |
-| Test.java:4010:30:4010:31 | in : Map [<map.key>] : String | Test.java:4010:10:4010:32 | new DualHashBidiMap<>(...) : DualHashBidiMap [<map.key>] : String | provenance | MaD:54 |
+| Test.java:4010:30:4010:31 | in : Map [<map.key>] : String | Test.java:4010:10:4010:32 | new DualHashBidiMap<>(...) : DualHashBidiMap [<map.key>] : String | provenance | MaD:56 |
 | Test.java:4011:19:4011:21 | out : DualHashBidiMap [<map.key>] : String | Test.java:228:18:228:29 | map : DualHashBidiMap [<map.key>] : String | provenance |  |
-| Test.java:4011:19:4011:21 | out : DualHashBidiMap [<map.key>] : String | Test.java:4011:9:4011:22 | getMapKey(...) | provenance | MaD:10 |
+| Test.java:4011:19:4011:21 | out : DualHashBidiMap [<map.key>] : String | Test.java:4011:9:4011:22 | getMapKey(...) | provenance | MaD:18 |
 | Test.java:4016:13:4016:42 | of(...) : Map [<map.value>] : String | Test.java:4017:30:4017:31 | in : Map [<map.value>] : String | provenance |  |
-| Test.java:4016:26:4016:41 | (...)... : String | Test.java:4016:13:4016:42 | of(...) : Map [<map.value>] : String | provenance | MaD:12 |
+| Test.java:4016:26:4016:41 | (...)... : String | Test.java:4016:13:4016:42 | of(...) : Map [<map.value>] : String | provenance | MaD:14 |
 | Test.java:4016:34:4016:41 | source(...) : Object | Test.java:4016:26:4016:41 | (...)... : String | provenance |  |
 | Test.java:4017:10:4017:32 | new DualHashBidiMap<>(...) : DualHashBidiMap [<map.value>] : String | Test.java:4018:21:4018:23 | out : DualHashBidiMap [<map.value>] : String | provenance |  |
-| Test.java:4017:30:4017:31 | in : Map [<map.value>] : String | Test.java:4017:10:4017:32 | new DualHashBidiMap<>(...) : DualHashBidiMap [<map.value>] : String | provenance | MaD:55 |
+| Test.java:4017:30:4017:31 | in : Map [<map.value>] : String | Test.java:4017:10:4017:32 | new DualHashBidiMap<>(...) : DualHashBidiMap [<map.value>] : String | provenance | MaD:57 |
 | Test.java:4018:21:4018:23 | out : DualHashBidiMap [<map.value>] : String | Test.java:232:20:232:31 | map : DualHashBidiMap [<map.value>] : String | provenance |  |
-| Test.java:4018:21:4018:23 | out : DualHashBidiMap [<map.value>] : String | Test.java:4018:9:4018:24 | getMapValue(...) | provenance | MaD:9 |
+| Test.java:4018:21:4018:23 | out : DualHashBidiMap [<map.value>] : String | Test.java:4018:9:4018:24 | getMapValue(...) | provenance | MaD:17 |
 | Test.java:4023:13:4023:42 | of(...) : Map [<map.key>] : String | Test.java:4024:36:4024:37 | in : Map [<map.key>] : String | provenance |  |
-| Test.java:4023:20:4023:35 | (...)... : String | Test.java:4023:13:4023:42 | of(...) : Map [<map.key>] : String | provenance | MaD:11 |
+| Test.java:4023:20:4023:35 | (...)... : String | Test.java:4023:13:4023:42 | of(...) : Map [<map.key>] : String | provenance | MaD:13 |
 | Test.java:4023:28:4023:35 | source(...) : Object | Test.java:4023:20:4023:35 | (...)... : String | provenance |  |
 | Test.java:4024:10:4024:38 | new DualLinkedHashBidiMap<>(...) : DualLinkedHashBidiMap [<map.key>] : String | Test.java:4025:19:4025:21 | out : DualLinkedHashBidiMap [<map.key>] : String | provenance |  |
-| Test.java:4024:36:4024:37 | in : Map [<map.key>] : String | Test.java:4024:10:4024:38 | new DualLinkedHashBidiMap<>(...) : DualLinkedHashBidiMap [<map.key>] : String | provenance | MaD:56 |
+| Test.java:4024:36:4024:37 | in : Map [<map.key>] : String | Test.java:4024:10:4024:38 | new DualLinkedHashBidiMap<>(...) : DualLinkedHashBidiMap [<map.key>] : String | provenance | MaD:58 |
 | Test.java:4025:19:4025:21 | out : DualLinkedHashBidiMap [<map.key>] : String | Test.java:228:18:228:29 | map : DualLinkedHashBidiMap [<map.key>] : String | provenance |  |
-| Test.java:4025:19:4025:21 | out : DualLinkedHashBidiMap [<map.key>] : String | Test.java:4025:9:4025:22 | getMapKey(...) | provenance | MaD:10 |
+| Test.java:4025:19:4025:21 | out : DualLinkedHashBidiMap [<map.key>] : String | Test.java:4025:9:4025:22 | getMapKey(...) | provenance | MaD:18 |
 | Test.java:4030:13:4030:42 | of(...) : Map [<map.value>] : String | Test.java:4031:36:4031:37 | in : Map [<map.value>] : String | provenance |  |
-| Test.java:4030:26:4030:41 | (...)... : String | Test.java:4030:13:4030:42 | of(...) : Map [<map.value>] : String | provenance | MaD:12 |
+| Test.java:4030:26:4030:41 | (...)... : String | Test.java:4030:13:4030:42 | of(...) : Map [<map.value>] : String | provenance | MaD:14 |
 | Test.java:4030:34:4030:41 | source(...) : Object | Test.java:4030:26:4030:41 | (...)... : String | provenance |  |
 | Test.java:4031:10:4031:38 | new DualLinkedHashBidiMap<>(...) : DualLinkedHashBidiMap [<map.value>] : String | Test.java:4032:21:4032:23 | out : DualLinkedHashBidiMap [<map.value>] : String | provenance |  |
-| Test.java:4031:36:4031:37 | in : Map [<map.value>] : String | Test.java:4031:10:4031:38 | new DualLinkedHashBidiMap<>(...) : DualLinkedHashBidiMap [<map.value>] : String | provenance | MaD:57 |
+| Test.java:4031:36:4031:37 | in : Map [<map.value>] : String | Test.java:4031:10:4031:38 | new DualLinkedHashBidiMap<>(...) : DualLinkedHashBidiMap [<map.value>] : String | provenance | MaD:59 |
 | Test.java:4032:21:4032:23 | out : DualLinkedHashBidiMap [<map.value>] : String | Test.java:232:20:232:31 | map : DualLinkedHashBidiMap [<map.value>] : String | provenance |  |
-| Test.java:4032:21:4032:23 | out : DualLinkedHashBidiMap [<map.value>] : String | Test.java:4032:9:4032:24 | getMapValue(...) | provenance | MaD:9 |
+| Test.java:4032:21:4032:23 | out : DualLinkedHashBidiMap [<map.value>] : String | Test.java:4032:9:4032:24 | getMapValue(...) | provenance | MaD:17 |
 | Test.java:4037:13:4037:42 | of(...) : Map [<map.key>] : String | Test.java:4038:30:4038:31 | in : Map [<map.key>] : String | provenance |  |
-| Test.java:4037:20:4037:35 | (...)... : String | Test.java:4037:13:4037:42 | of(...) : Map [<map.key>] : String | provenance | MaD:11 |
+| Test.java:4037:20:4037:35 | (...)... : String | Test.java:4037:13:4037:42 | of(...) : Map [<map.key>] : String | provenance | MaD:13 |
 | Test.java:4037:28:4037:35 | source(...) : Object | Test.java:4037:20:4037:35 | (...)... : String | provenance |  |
 | Test.java:4038:10:4038:32 | new DualTreeBidiMap<>(...) : DualTreeBidiMap [<map.key>] : String | Test.java:4039:19:4039:21 | out : DualTreeBidiMap [<map.key>] : String | provenance |  |
-| Test.java:4038:30:4038:31 | in : Map [<map.key>] : String | Test.java:4038:10:4038:32 | new DualTreeBidiMap<>(...) : DualTreeBidiMap [<map.key>] : String | provenance | MaD:58 |
+| Test.java:4038:30:4038:31 | in : Map [<map.key>] : String | Test.java:4038:10:4038:32 | new DualTreeBidiMap<>(...) : DualTreeBidiMap [<map.key>] : String | provenance | MaD:60 |
 | Test.java:4039:19:4039:21 | out : DualTreeBidiMap [<map.key>] : String | Test.java:228:18:228:29 | map : DualTreeBidiMap [<map.key>] : String | provenance |  |
-| Test.java:4039:19:4039:21 | out : DualTreeBidiMap [<map.key>] : String | Test.java:4039:9:4039:22 | getMapKey(...) | provenance | MaD:10 |
+| Test.java:4039:19:4039:21 | out : DualTreeBidiMap [<map.key>] : String | Test.java:4039:9:4039:22 | getMapKey(...) | provenance | MaD:18 |
 | Test.java:4044:13:4044:42 | of(...) : Map [<map.value>] : String | Test.java:4045:30:4045:31 | in : Map [<map.value>] : String | provenance |  |
-| Test.java:4044:26:4044:41 | (...)... : String | Test.java:4044:13:4044:42 | of(...) : Map [<map.value>] : String | provenance | MaD:12 |
+| Test.java:4044:26:4044:41 | (...)... : String | Test.java:4044:13:4044:42 | of(...) : Map [<map.value>] : String | provenance | MaD:14 |
 | Test.java:4044:34:4044:41 | source(...) : Object | Test.java:4044:26:4044:41 | (...)... : String | provenance |  |
 | Test.java:4045:10:4045:32 | new DualTreeBidiMap<>(...) : DualTreeBidiMap [<map.value>] : String | Test.java:4046:21:4046:23 | out : DualTreeBidiMap [<map.value>] : String | provenance |  |
-| Test.java:4045:30:4045:31 | in : Map [<map.value>] : String | Test.java:4045:10:4045:32 | new DualTreeBidiMap<>(...) : DualTreeBidiMap [<map.value>] : String | provenance | MaD:59 |
+| Test.java:4045:30:4045:31 | in : Map [<map.value>] : String | Test.java:4045:10:4045:32 | new DualTreeBidiMap<>(...) : DualTreeBidiMap [<map.value>] : String | provenance | MaD:61 |
 | Test.java:4046:21:4046:23 | out : DualTreeBidiMap [<map.value>] : String | Test.java:232:20:232:31 | map : DualTreeBidiMap [<map.value>] : String | provenance |  |
-| Test.java:4046:21:4046:23 | out : DualTreeBidiMap [<map.value>] : String | Test.java:4046:9:4046:24 | getMapValue(...) | provenance | MaD:9 |
+| Test.java:4046:21:4046:23 | out : DualTreeBidiMap [<map.value>] : String | Test.java:4046:9:4046:24 | getMapValue(...) | provenance | MaD:17 |
 | Test.java:4051:25:4051:70 | newDualTreeBidiMapWithMapKey(...) : DualTreeBidiMap [<map.key>] : String | Test.java:4052:10:4052:11 | in : DualTreeBidiMap [<map.key>] : String | provenance |  |
 | Test.java:4051:54:4051:69 | (...)... : String | Test.java:274:61:274:65 | key : String | provenance |  |
-| Test.java:4051:54:4051:69 | (...)... : String | Test.java:4051:25:4051:70 | newDualTreeBidiMapWithMapKey(...) : DualTreeBidiMap [<map.key>] : String | provenance | MaD:11 |
+| Test.java:4051:54:4051:69 | (...)... : String | Test.java:4051:25:4051:70 | newDualTreeBidiMapWithMapKey(...) : DualTreeBidiMap [<map.key>] : String | provenance | MaD:13 |
 | Test.java:4051:62:4051:69 | source(...) : Object | Test.java:4051:54:4051:69 | (...)... : String | provenance |  |
-| Test.java:4052:10:4052:11 | in : DualTreeBidiMap [<map.key>] : String | Test.java:4052:10:4052:35 | inverseOrderedBidiMap(...) : OrderedBidiMap [<map.value>] : String | provenance | MaD:60 |
+| Test.java:4052:10:4052:11 | in : DualTreeBidiMap [<map.key>] : String | Test.java:4052:10:4052:35 | inverseOrderedBidiMap(...) : OrderedBidiMap [<map.value>] : String | provenance | MaD:62 |
 | Test.java:4052:10:4052:35 | inverseOrderedBidiMap(...) : OrderedBidiMap [<map.value>] : String | Test.java:4053:21:4053:23 | out : OrderedBidiMap [<map.value>] : String | provenance |  |
 | Test.java:4053:21:4053:23 | out : OrderedBidiMap [<map.value>] : String | Test.java:232:20:232:31 | map : OrderedBidiMap [<map.value>] : String | provenance |  |
-| Test.java:4053:21:4053:23 | out : OrderedBidiMap [<map.value>] : String | Test.java:4053:9:4053:24 | getMapValue(...) | provenance | MaD:9 |
+| Test.java:4053:21:4053:23 | out : OrderedBidiMap [<map.value>] : String | Test.java:4053:9:4053:24 | getMapValue(...) | provenance | MaD:17 |
 | Test.java:4058:25:4058:72 | newDualTreeBidiMapWithMapValue(...) : DualTreeBidiMap [<map.value>] : String | Test.java:4059:10:4059:11 | in : DualTreeBidiMap [<map.value>] : String | provenance |  |
 | Test.java:4058:56:4058:71 | (...)... : String | Test.java:292:63:292:69 | value : String | provenance |  |
-| Test.java:4058:56:4058:71 | (...)... : String | Test.java:4058:25:4058:72 | newDualTreeBidiMapWithMapValue(...) : DualTreeBidiMap [<map.value>] : String | provenance | MaD:12 |
+| Test.java:4058:56:4058:71 | (...)... : String | Test.java:4058:25:4058:72 | newDualTreeBidiMapWithMapValue(...) : DualTreeBidiMap [<map.value>] : String | provenance | MaD:14 |
 | Test.java:4058:64:4058:71 | source(...) : Object | Test.java:4058:56:4058:71 | (...)... : String | provenance |  |
-| Test.java:4059:10:4059:11 | in : DualTreeBidiMap [<map.value>] : String | Test.java:4059:10:4059:35 | inverseOrderedBidiMap(...) : OrderedBidiMap [<map.key>] : String | provenance | MaD:61 |
+| Test.java:4059:10:4059:11 | in : DualTreeBidiMap [<map.value>] : String | Test.java:4059:10:4059:35 | inverseOrderedBidiMap(...) : OrderedBidiMap [<map.key>] : String | provenance | MaD:63 |
 | Test.java:4059:10:4059:35 | inverseOrderedBidiMap(...) : OrderedBidiMap [<map.key>] : String | Test.java:4060:19:4060:21 | out : OrderedBidiMap [<map.key>] : String | provenance |  |
 | Test.java:4060:19:4060:21 | out : OrderedBidiMap [<map.key>] : String | Test.java:228:18:228:29 | map : OrderedBidiMap [<map.key>] : String | provenance |  |
-| Test.java:4060:19:4060:21 | out : OrderedBidiMap [<map.key>] : String | Test.java:4060:9:4060:22 | getMapKey(...) | provenance | MaD:10 |
+| Test.java:4060:19:4060:21 | out : OrderedBidiMap [<map.key>] : String | Test.java:4060:9:4060:22 | getMapKey(...) | provenance | MaD:18 |
 | Test.java:4065:25:4065:70 | newDualTreeBidiMapWithMapKey(...) : DualTreeBidiMap [<map.key>] : String | Test.java:4066:10:4066:11 | in : DualTreeBidiMap [<map.key>] : String | provenance |  |
 | Test.java:4065:54:4065:69 | (...)... : String | Test.java:274:61:274:65 | key : String | provenance |  |
-| Test.java:4065:54:4065:69 | (...)... : String | Test.java:4065:25:4065:70 | newDualTreeBidiMapWithMapKey(...) : DualTreeBidiMap [<map.key>] : String | provenance | MaD:11 |
+| Test.java:4065:54:4065:69 | (...)... : String | Test.java:4065:25:4065:70 | newDualTreeBidiMapWithMapKey(...) : DualTreeBidiMap [<map.key>] : String | provenance | MaD:13 |
 | Test.java:4065:62:4065:69 | source(...) : Object | Test.java:4065:54:4065:69 | (...)... : String | provenance |  |
-| Test.java:4066:10:4066:11 | in : DualTreeBidiMap [<map.key>] : String | Test.java:4066:10:4066:34 | inverseSortedBidiMap(...) : SortedBidiMap [<map.value>] : String | provenance | MaD:62 |
+| Test.java:4066:10:4066:11 | in : DualTreeBidiMap [<map.key>] : String | Test.java:4066:10:4066:34 | inverseSortedBidiMap(...) : SortedBidiMap [<map.value>] : String | provenance | MaD:64 |
 | Test.java:4066:10:4066:34 | inverseSortedBidiMap(...) : SortedBidiMap [<map.value>] : String | Test.java:4067:21:4067:23 | out : SortedBidiMap [<map.value>] : String | provenance |  |
 | Test.java:4067:21:4067:23 | out : SortedBidiMap [<map.value>] : String | Test.java:232:20:232:31 | map : SortedBidiMap [<map.value>] : String | provenance |  |
-| Test.java:4067:21:4067:23 | out : SortedBidiMap [<map.value>] : String | Test.java:4067:9:4067:24 | getMapValue(...) | provenance | MaD:9 |
+| Test.java:4067:21:4067:23 | out : SortedBidiMap [<map.value>] : String | Test.java:4067:9:4067:24 | getMapValue(...) | provenance | MaD:17 |
 | Test.java:4072:25:4072:72 | newDualTreeBidiMapWithMapValue(...) : DualTreeBidiMap [<map.value>] : String | Test.java:4073:10:4073:11 | in : DualTreeBidiMap [<map.value>] : String | provenance |  |
 | Test.java:4072:56:4072:71 | (...)... : String | Test.java:292:63:292:69 | value : String | provenance |  |
-| Test.java:4072:56:4072:71 | (...)... : String | Test.java:4072:25:4072:72 | newDualTreeBidiMapWithMapValue(...) : DualTreeBidiMap [<map.value>] : String | provenance | MaD:12 |
+| Test.java:4072:56:4072:71 | (...)... : String | Test.java:4072:25:4072:72 | newDualTreeBidiMapWithMapValue(...) : DualTreeBidiMap [<map.value>] : String | provenance | MaD:14 |
 | Test.java:4072:64:4072:71 | source(...) : Object | Test.java:4072:56:4072:71 | (...)... : String | provenance |  |
-| Test.java:4073:10:4073:11 | in : DualTreeBidiMap [<map.value>] : String | Test.java:4073:10:4073:34 | inverseSortedBidiMap(...) : SortedBidiMap [<map.key>] : String | provenance | MaD:63 |
+| Test.java:4073:10:4073:11 | in : DualTreeBidiMap [<map.value>] : String | Test.java:4073:10:4073:34 | inverseSortedBidiMap(...) : SortedBidiMap [<map.key>] : String | provenance | MaD:65 |
 | Test.java:4073:10:4073:34 | inverseSortedBidiMap(...) : SortedBidiMap [<map.key>] : String | Test.java:4074:19:4074:21 | out : SortedBidiMap [<map.key>] : String | provenance |  |
 | Test.java:4074:19:4074:21 | out : SortedBidiMap [<map.key>] : String | Test.java:228:18:228:29 | map : SortedBidiMap [<map.key>] : String | provenance |  |
-| Test.java:4074:19:4074:21 | out : SortedBidiMap [<map.key>] : String | Test.java:4074:9:4074:22 | getMapKey(...) | provenance | MaD:10 |
+| Test.java:4074:19:4074:21 | out : SortedBidiMap [<map.key>] : String | Test.java:4074:9:4074:22 | getMapKey(...) | provenance | MaD:18 |
 | Test.java:4079:13:4079:42 | of(...) : Map [<map.key>] : String | Test.java:4080:26:4080:27 | in : Map [<map.key>] : String | provenance |  |
-| Test.java:4079:20:4079:35 | (...)... : String | Test.java:4079:13:4079:42 | of(...) : Map [<map.key>] : String | provenance | MaD:11 |
+| Test.java:4079:20:4079:35 | (...)... : String | Test.java:4079:13:4079:42 | of(...) : Map [<map.key>] : String | provenance | MaD:13 |
 | Test.java:4079:28:4079:35 | source(...) : Object | Test.java:4079:20:4079:35 | (...)... : String | provenance |  |
 | Test.java:4080:10:4080:28 | new TreeBidiMap<>(...) : TreeBidiMap [<map.key>] : String | Test.java:4081:19:4081:21 | out : TreeBidiMap [<map.key>] : String | provenance |  |
-| Test.java:4080:26:4080:27 | in : Map [<map.key>] : String | Test.java:4080:10:4080:28 | new TreeBidiMap<>(...) : TreeBidiMap [<map.key>] : String | provenance | MaD:64 |
+| Test.java:4080:26:4080:27 | in : Map [<map.key>] : String | Test.java:4080:10:4080:28 | new TreeBidiMap<>(...) : TreeBidiMap [<map.key>] : String | provenance | MaD:66 |
 | Test.java:4081:19:4081:21 | out : TreeBidiMap [<map.key>] : String | Test.java:228:18:228:29 | map : TreeBidiMap [<map.key>] : String | provenance |  |
-| Test.java:4081:19:4081:21 | out : TreeBidiMap [<map.key>] : String | Test.java:4081:9:4081:22 | getMapKey(...) | provenance | MaD:10 |
+| Test.java:4081:19:4081:21 | out : TreeBidiMap [<map.key>] : String | Test.java:4081:9:4081:22 | getMapKey(...) | provenance | MaD:18 |
 | Test.java:4086:13:4086:42 | of(...) : Map [<map.value>] : String | Test.java:4087:26:4087:27 | in : Map [<map.value>] : String | provenance |  |
-| Test.java:4086:26:4086:41 | (...)... : String | Test.java:4086:13:4086:42 | of(...) : Map [<map.value>] : String | provenance | MaD:12 |
+| Test.java:4086:26:4086:41 | (...)... : String | Test.java:4086:13:4086:42 | of(...) : Map [<map.value>] : String | provenance | MaD:14 |
 | Test.java:4086:34:4086:41 | source(...) : Object | Test.java:4086:26:4086:41 | (...)... : String | provenance |  |
 | Test.java:4087:10:4087:28 | new TreeBidiMap<>(...) : TreeBidiMap [<map.value>] : String | Test.java:4088:21:4088:23 | out : TreeBidiMap [<map.value>] : String | provenance |  |
-| Test.java:4087:26:4087:27 | in : Map [<map.value>] : String | Test.java:4087:10:4087:28 | new TreeBidiMap<>(...) : TreeBidiMap [<map.value>] : String | provenance | MaD:65 |
+| Test.java:4087:26:4087:27 | in : Map [<map.value>] : String | Test.java:4087:10:4087:28 | new TreeBidiMap<>(...) : TreeBidiMap [<map.value>] : String | provenance | MaD:67 |
 | Test.java:4088:21:4088:23 | out : TreeBidiMap [<map.value>] : String | Test.java:232:20:232:31 | map : TreeBidiMap [<map.value>] : String | provenance |  |
-| Test.java:4088:21:4088:23 | out : TreeBidiMap [<map.value>] : String | Test.java:4088:9:4088:24 | getMapValue(...) | provenance | MaD:9 |
+| Test.java:4088:21:4088:23 | out : TreeBidiMap [<map.value>] : String | Test.java:4088:9:4088:24 | getMapValue(...) | provenance | MaD:17 |
 | Test.java:4093:17:4093:62 | newDualTreeBidiMapWithMapKey(...) : DualTreeBidiMap [<map.key>] : String | Test.java:4094:50:4094:51 | in : DualTreeBidiMap [<map.key>] : String | provenance |  |
 | Test.java:4093:46:4093:61 | (...)... : String | Test.java:274:61:274:65 | key : String | provenance |  |
-| Test.java:4093:46:4093:61 | (...)... : String | Test.java:4093:17:4093:62 | newDualTreeBidiMapWithMapKey(...) : DualTreeBidiMap [<map.key>] : String | provenance | MaD:11 |
+| Test.java:4093:46:4093:61 | (...)... : String | Test.java:4093:17:4093:62 | newDualTreeBidiMapWithMapKey(...) : DualTreeBidiMap [<map.key>] : String | provenance | MaD:13 |
 | Test.java:4093:54:4093:61 | source(...) : Object | Test.java:4093:46:4093:61 | (...)... : String | provenance |  |
 | Test.java:4094:10:4094:52 | unmodifiableBidiMap(...) : BidiMap [<map.key>] : String | Test.java:4095:19:4095:21 | out : BidiMap [<map.key>] : String | provenance |  |
-| Test.java:4094:50:4094:51 | in : DualTreeBidiMap [<map.key>] : String | Test.java:4094:10:4094:52 | unmodifiableBidiMap(...) : BidiMap [<map.key>] : String | provenance | MaD:66 |
+| Test.java:4094:50:4094:51 | in : DualTreeBidiMap [<map.key>] : String | Test.java:4094:10:4094:52 | unmodifiableBidiMap(...) : BidiMap [<map.key>] : String | provenance | MaD:68 |
 | Test.java:4095:19:4095:21 | out : BidiMap [<map.key>] : String | Test.java:228:18:228:29 | map : BidiMap [<map.key>] : String | provenance |  |
-| Test.java:4095:19:4095:21 | out : BidiMap [<map.key>] : String | Test.java:4095:9:4095:22 | getMapKey(...) | provenance | MaD:10 |
+| Test.java:4095:19:4095:21 | out : BidiMap [<map.key>] : String | Test.java:4095:9:4095:22 | getMapKey(...) | provenance | MaD:18 |
 | Test.java:4100:17:4100:64 | newDualTreeBidiMapWithMapValue(...) : DualTreeBidiMap [<map.value>] : String | Test.java:4101:50:4101:51 | in : DualTreeBidiMap [<map.value>] : String | provenance |  |
 | Test.java:4100:48:4100:63 | (...)... : String | Test.java:292:63:292:69 | value : String | provenance |  |
-| Test.java:4100:48:4100:63 | (...)... : String | Test.java:4100:17:4100:64 | newDualTreeBidiMapWithMapValue(...) : DualTreeBidiMap [<map.value>] : String | provenance | MaD:12 |
+| Test.java:4100:48:4100:63 | (...)... : String | Test.java:4100:17:4100:64 | newDualTreeBidiMapWithMapValue(...) : DualTreeBidiMap [<map.value>] : String | provenance | MaD:14 |
 | Test.java:4100:56:4100:63 | source(...) : Object | Test.java:4100:48:4100:63 | (...)... : String | provenance |  |
 | Test.java:4101:10:4101:52 | unmodifiableBidiMap(...) : BidiMap [<map.value>] : String | Test.java:4102:21:4102:23 | out : BidiMap [<map.value>] : String | provenance |  |
-| Test.java:4101:50:4101:51 | in : DualTreeBidiMap [<map.value>] : String | Test.java:4101:10:4101:52 | unmodifiableBidiMap(...) : BidiMap [<map.value>] : String | provenance | MaD:67 |
+| Test.java:4101:50:4101:51 | in : DualTreeBidiMap [<map.value>] : String | Test.java:4101:10:4101:52 | unmodifiableBidiMap(...) : BidiMap [<map.value>] : String | provenance | MaD:69 |
 | Test.java:4102:21:4102:23 | out : BidiMap [<map.value>] : String | Test.java:232:20:232:31 | map : BidiMap [<map.value>] : String | provenance |  |
-| Test.java:4102:21:4102:23 | out : BidiMap [<map.value>] : String | Test.java:4102:9:4102:24 | getMapValue(...) | provenance | MaD:9 |
+| Test.java:4102:21:4102:23 | out : BidiMap [<map.value>] : String | Test.java:4102:9:4102:24 | getMapValue(...) | provenance | MaD:17 |
 | Test.java:4107:36:4107:164 | (...)... : UnmodifiableOrderedBidiMap [<map.key>] : String | Test.java:4108:10:4108:11 | in : UnmodifiableOrderedBidiMap [<map.key>] : String | provenance |  |
 | Test.java:4107:64:4107:164 | unmodifiableOrderedBidiMap(...) : OrderedBidiMap [<map.key>] : String | Test.java:4107:36:4107:164 | (...)... : UnmodifiableOrderedBidiMap [<map.key>] : String | provenance |  |
-| Test.java:4107:118:4107:163 | newDualTreeBidiMapWithMapKey(...) : DualTreeBidiMap [<map.key>] : String | Test.java:4107:64:4107:164 | unmodifiableOrderedBidiMap(...) : OrderedBidiMap [<map.key>] : String | provenance | MaD:70 |
+| Test.java:4107:118:4107:163 | newDualTreeBidiMapWithMapKey(...) : DualTreeBidiMap [<map.key>] : String | Test.java:4107:64:4107:164 | unmodifiableOrderedBidiMap(...) : OrderedBidiMap [<map.key>] : String | provenance | MaD:72 |
 | Test.java:4107:147:4107:162 | (...)... : String | Test.java:274:61:274:65 | key : String | provenance |  |
-| Test.java:4107:147:4107:162 | (...)... : String | Test.java:4107:118:4107:163 | newDualTreeBidiMapWithMapKey(...) : DualTreeBidiMap [<map.key>] : String | provenance | MaD:11 |
+| Test.java:4107:147:4107:162 | (...)... : String | Test.java:4107:118:4107:163 | newDualTreeBidiMapWithMapKey(...) : DualTreeBidiMap [<map.key>] : String | provenance | MaD:13 |
 | Test.java:4107:155:4107:162 | source(...) : Object | Test.java:4107:147:4107:162 | (...)... : String | provenance |  |
-| Test.java:4108:10:4108:11 | in : UnmodifiableOrderedBidiMap [<map.key>] : String | Test.java:4108:10:4108:35 | inverseOrderedBidiMap(...) : OrderedBidiMap [<map.value>] : String | provenance | MaD:68 |
+| Test.java:4108:10:4108:11 | in : UnmodifiableOrderedBidiMap [<map.key>] : String | Test.java:4108:10:4108:35 | inverseOrderedBidiMap(...) : OrderedBidiMap [<map.value>] : String | provenance | MaD:70 |
 | Test.java:4108:10:4108:35 | inverseOrderedBidiMap(...) : OrderedBidiMap [<map.value>] : String | Test.java:4109:21:4109:23 | out : OrderedBidiMap [<map.value>] : String | provenance |  |
 | Test.java:4109:21:4109:23 | out : OrderedBidiMap [<map.value>] : String | Test.java:232:20:232:31 | map : OrderedBidiMap [<map.value>] : String | provenance |  |
-| Test.java:4109:21:4109:23 | out : OrderedBidiMap [<map.value>] : String | Test.java:4109:9:4109:24 | getMapValue(...) | provenance | MaD:9 |
+| Test.java:4109:21:4109:23 | out : OrderedBidiMap [<map.value>] : String | Test.java:4109:9:4109:24 | getMapValue(...) | provenance | MaD:17 |
 | Test.java:4114:36:4114:166 | (...)... : UnmodifiableOrderedBidiMap [<map.value>] : String | Test.java:4115:10:4115:11 | in : UnmodifiableOrderedBidiMap [<map.value>] : String | provenance |  |
 | Test.java:4114:64:4114:166 | unmodifiableOrderedBidiMap(...) : OrderedBidiMap [<map.value>] : String | Test.java:4114:36:4114:166 | (...)... : UnmodifiableOrderedBidiMap [<map.value>] : String | provenance |  |
-| Test.java:4114:118:4114:165 | newDualTreeBidiMapWithMapValue(...) : DualTreeBidiMap [<map.value>] : String | Test.java:4114:64:4114:166 | unmodifiableOrderedBidiMap(...) : OrderedBidiMap [<map.value>] : String | provenance | MaD:71 |
+| Test.java:4114:118:4114:165 | newDualTreeBidiMapWithMapValue(...) : DualTreeBidiMap [<map.value>] : String | Test.java:4114:64:4114:166 | unmodifiableOrderedBidiMap(...) : OrderedBidiMap [<map.value>] : String | provenance | MaD:73 |
 | Test.java:4114:149:4114:164 | (...)... : String | Test.java:292:63:292:69 | value : String | provenance |  |
-| Test.java:4114:149:4114:164 | (...)... : String | Test.java:4114:118:4114:165 | newDualTreeBidiMapWithMapValue(...) : DualTreeBidiMap [<map.value>] : String | provenance | MaD:12 |
+| Test.java:4114:149:4114:164 | (...)... : String | Test.java:4114:118:4114:165 | newDualTreeBidiMapWithMapValue(...) : DualTreeBidiMap [<map.value>] : String | provenance | MaD:14 |
 | Test.java:4114:157:4114:164 | source(...) : Object | Test.java:4114:149:4114:164 | (...)... : String | provenance |  |
-| Test.java:4115:10:4115:11 | in : UnmodifiableOrderedBidiMap [<map.value>] : String | Test.java:4115:10:4115:35 | inverseOrderedBidiMap(...) : OrderedBidiMap [<map.key>] : String | provenance | MaD:69 |
+| Test.java:4115:10:4115:11 | in : UnmodifiableOrderedBidiMap [<map.value>] : String | Test.java:4115:10:4115:35 | inverseOrderedBidiMap(...) : OrderedBidiMap [<map.key>] : String | provenance | MaD:71 |
 | Test.java:4115:10:4115:35 | inverseOrderedBidiMap(...) : OrderedBidiMap [<map.key>] : String | Test.java:4116:19:4116:21 | out : OrderedBidiMap [<map.key>] : String | provenance |  |
 | Test.java:4116:19:4116:21 | out : OrderedBidiMap [<map.key>] : String | Test.java:228:18:228:29 | map : OrderedBidiMap [<map.key>] : String | provenance |  |
-| Test.java:4116:19:4116:21 | out : OrderedBidiMap [<map.key>] : String | Test.java:4116:9:4116:22 | getMapKey(...) | provenance | MaD:10 |
+| Test.java:4116:19:4116:21 | out : OrderedBidiMap [<map.key>] : String | Test.java:4116:9:4116:22 | getMapKey(...) | provenance | MaD:18 |
 | Test.java:4121:24:4121:69 | newDualTreeBidiMapWithMapKey(...) : DualTreeBidiMap [<map.key>] : String | Test.java:4122:64:4122:65 | in : DualTreeBidiMap [<map.key>] : String | provenance |  |
 | Test.java:4121:53:4121:68 | (...)... : String | Test.java:274:61:274:65 | key : String | provenance |  |
-| Test.java:4121:53:4121:68 | (...)... : String | Test.java:4121:24:4121:69 | newDualTreeBidiMapWithMapKey(...) : DualTreeBidiMap [<map.key>] : String | provenance | MaD:11 |
+| Test.java:4121:53:4121:68 | (...)... : String | Test.java:4121:24:4121:69 | newDualTreeBidiMapWithMapKey(...) : DualTreeBidiMap [<map.key>] : String | provenance | MaD:13 |
 | Test.java:4121:61:4121:68 | source(...) : Object | Test.java:4121:53:4121:68 | (...)... : String | provenance |  |
 | Test.java:4122:10:4122:66 | unmodifiableOrderedBidiMap(...) : OrderedBidiMap [<map.key>] : String | Test.java:4123:19:4123:21 | out : OrderedBidiMap [<map.key>] : String | provenance |  |
-| Test.java:4122:64:4122:65 | in : DualTreeBidiMap [<map.key>] : String | Test.java:4122:10:4122:66 | unmodifiableOrderedBidiMap(...) : OrderedBidiMap [<map.key>] : String | provenance | MaD:70 |
+| Test.java:4122:64:4122:65 | in : DualTreeBidiMap [<map.key>] : String | Test.java:4122:10:4122:66 | unmodifiableOrderedBidiMap(...) : OrderedBidiMap [<map.key>] : String | provenance | MaD:72 |
 | Test.java:4123:19:4123:21 | out : OrderedBidiMap [<map.key>] : String | Test.java:228:18:228:29 | map : OrderedBidiMap [<map.key>] : String | provenance |  |
-| Test.java:4123:19:4123:21 | out : OrderedBidiMap [<map.key>] : String | Test.java:4123:9:4123:22 | getMapKey(...) | provenance | MaD:10 |
+| Test.java:4123:19:4123:21 | out : OrderedBidiMap [<map.key>] : String | Test.java:4123:9:4123:22 | getMapKey(...) | provenance | MaD:18 |
 | Test.java:4128:24:4128:71 | newDualTreeBidiMapWithMapValue(...) : DualTreeBidiMap [<map.value>] : String | Test.java:4129:64:4129:65 | in : DualTreeBidiMap [<map.value>] : String | provenance |  |
 | Test.java:4128:55:4128:70 | (...)... : String | Test.java:292:63:292:69 | value : String | provenance |  |
-| Test.java:4128:55:4128:70 | (...)... : String | Test.java:4128:24:4128:71 | newDualTreeBidiMapWithMapValue(...) : DualTreeBidiMap [<map.value>] : String | provenance | MaD:12 |
+| Test.java:4128:55:4128:70 | (...)... : String | Test.java:4128:24:4128:71 | newDualTreeBidiMapWithMapValue(...) : DualTreeBidiMap [<map.value>] : String | provenance | MaD:14 |
 | Test.java:4128:63:4128:70 | source(...) : Object | Test.java:4128:55:4128:70 | (...)... : String | provenance |  |
 | Test.java:4129:10:4129:66 | unmodifiableOrderedBidiMap(...) : OrderedBidiMap [<map.value>] : String | Test.java:4130:21:4130:23 | out : OrderedBidiMap [<map.value>] : String | provenance |  |
-| Test.java:4129:64:4129:65 | in : DualTreeBidiMap [<map.value>] : String | Test.java:4129:10:4129:66 | unmodifiableOrderedBidiMap(...) : OrderedBidiMap [<map.value>] : String | provenance | MaD:71 |
+| Test.java:4129:64:4129:65 | in : DualTreeBidiMap [<map.value>] : String | Test.java:4129:10:4129:66 | unmodifiableOrderedBidiMap(...) : OrderedBidiMap [<map.value>] : String | provenance | MaD:73 |
 | Test.java:4130:21:4130:23 | out : OrderedBidiMap [<map.value>] : String | Test.java:232:20:232:31 | map : OrderedBidiMap [<map.value>] : String | provenance |  |
-| Test.java:4130:21:4130:23 | out : OrderedBidiMap [<map.value>] : String | Test.java:4130:9:4130:24 | getMapValue(...) | provenance | MaD:9 |
+| Test.java:4130:21:4130:23 | out : OrderedBidiMap [<map.value>] : String | Test.java:4130:9:4130:24 | getMapValue(...) | provenance | MaD:17 |
 | Test.java:4135:23:4135:68 | newDualTreeBidiMapWithMapKey(...) : DualTreeBidiMap [<map.key>] : String | Test.java:4136:62:4136:63 | in : DualTreeBidiMap [<map.key>] : String | provenance |  |
 | Test.java:4135:52:4135:67 | (...)... : String | Test.java:274:61:274:65 | key : String | provenance |  |
-| Test.java:4135:52:4135:67 | (...)... : String | Test.java:4135:23:4135:68 | newDualTreeBidiMapWithMapKey(...) : DualTreeBidiMap [<map.key>] : String | provenance | MaD:11 |
+| Test.java:4135:52:4135:67 | (...)... : String | Test.java:4135:23:4135:68 | newDualTreeBidiMapWithMapKey(...) : DualTreeBidiMap [<map.key>] : String | provenance | MaD:13 |
 | Test.java:4135:60:4135:67 | source(...) : Object | Test.java:4135:52:4135:67 | (...)... : String | provenance |  |
 | Test.java:4136:10:4136:64 | unmodifiableSortedBidiMap(...) : SortedBidiMap [<map.key>] : String | Test.java:4137:19:4137:21 | out : SortedBidiMap [<map.key>] : String | provenance |  |
-| Test.java:4136:62:4136:63 | in : DualTreeBidiMap [<map.key>] : String | Test.java:4136:10:4136:64 | unmodifiableSortedBidiMap(...) : SortedBidiMap [<map.key>] : String | provenance | MaD:72 |
+| Test.java:4136:62:4136:63 | in : DualTreeBidiMap [<map.key>] : String | Test.java:4136:10:4136:64 | unmodifiableSortedBidiMap(...) : SortedBidiMap [<map.key>] : String | provenance | MaD:74 |
 | Test.java:4137:19:4137:21 | out : SortedBidiMap [<map.key>] : String | Test.java:228:18:228:29 | map : SortedBidiMap [<map.key>] : String | provenance |  |
-| Test.java:4137:19:4137:21 | out : SortedBidiMap [<map.key>] : String | Test.java:4137:9:4137:22 | getMapKey(...) | provenance | MaD:10 |
+| Test.java:4137:19:4137:21 | out : SortedBidiMap [<map.key>] : String | Test.java:4137:9:4137:22 | getMapKey(...) | provenance | MaD:18 |
 | Test.java:4142:23:4142:70 | newDualTreeBidiMapWithMapValue(...) : DualTreeBidiMap [<map.value>] : String | Test.java:4143:62:4143:63 | in : DualTreeBidiMap [<map.value>] : String | provenance |  |
 | Test.java:4142:54:4142:69 | (...)... : String | Test.java:292:63:292:69 | value : String | provenance |  |
-| Test.java:4142:54:4142:69 | (...)... : String | Test.java:4142:23:4142:70 | newDualTreeBidiMapWithMapValue(...) : DualTreeBidiMap [<map.value>] : String | provenance | MaD:12 |
+| Test.java:4142:54:4142:69 | (...)... : String | Test.java:4142:23:4142:70 | newDualTreeBidiMapWithMapValue(...) : DualTreeBidiMap [<map.value>] : String | provenance | MaD:14 |
 | Test.java:4142:62:4142:69 | source(...) : Object | Test.java:4142:54:4142:69 | (...)... : String | provenance |  |
 | Test.java:4143:10:4143:64 | unmodifiableSortedBidiMap(...) : SortedBidiMap [<map.value>] : String | Test.java:4144:21:4144:23 | out : SortedBidiMap [<map.value>] : String | provenance |  |
-| Test.java:4143:62:4143:63 | in : DualTreeBidiMap [<map.value>] : String | Test.java:4143:10:4143:64 | unmodifiableSortedBidiMap(...) : SortedBidiMap [<map.value>] : String | provenance | MaD:73 |
+| Test.java:4143:62:4143:63 | in : DualTreeBidiMap [<map.value>] : String | Test.java:4143:10:4143:64 | unmodifiableSortedBidiMap(...) : SortedBidiMap [<map.value>] : String | provenance | MaD:75 |
 | Test.java:4144:21:4144:23 | out : SortedBidiMap [<map.value>] : String | Test.java:232:20:232:31 | map : SortedBidiMap [<map.value>] : String | provenance |  |
-| Test.java:4144:21:4144:23 | out : SortedBidiMap [<map.value>] : String | Test.java:4144:9:4144:24 | getMapValue(...) | provenance | MaD:9 |
+| Test.java:4144:21:4144:23 | out : SortedBidiMap [<map.value>] : String | Test.java:4144:9:4144:24 | getMapValue(...) | provenance | MaD:17 |
 | Test.java:4149:20:4149:58 | newTreeBagWithElement(...) : TreeBag [<element>] : String | Test.java:4150:44:4150:45 | in : TreeBag [<element>] : String | provenance |  |
 | Test.java:4149:42:4149:57 | (...)... : String | Test.java:267:39:267:47 | element : String | provenance |  |
-| Test.java:4149:42:4149:57 | (...)... : String | Test.java:4149:20:4149:58 | newTreeBagWithElement(...) : TreeBag [<element>] : String | provenance | MaD:2 |
-| Test.java:4149:42:4149:57 | (...)... : String | Test.java:4149:20:4149:58 | newTreeBagWithElement(...) : TreeBag [<element>] : String | provenance | MaD:395 |
+| Test.java:4149:42:4149:57 | (...)... : String | Test.java:4149:20:4149:58 | newTreeBagWithElement(...) : TreeBag [<element>] : String | provenance | MaD:4 |
+| Test.java:4149:42:4149:57 | (...)... : String | Test.java:4149:20:4149:58 | newTreeBagWithElement(...) : TreeBag [<element>] : String | provenance | MaD:470 |
 | Test.java:4149:50:4149:57 | source(...) : Object | Test.java:4149:42:4149:57 | (...)... : String | provenance |  |
 | Test.java:4150:10:4150:46 | new MyAbstractCollectionDecorator<>(...) : MyAbstractCollectionDecorator [<element>] : String | Test.java:4151:20:4151:22 | out : MyAbstractCollectionDecorator [<element>] : String | provenance |  |
-| Test.java:4150:44:4150:45 | in : TreeBag [<element>] : String | Test.java:4150:10:4150:46 | new MyAbstractCollectionDecorator<>(...) : MyAbstractCollectionDecorator [<element>] : String | provenance | MaD:74 |
+| Test.java:4150:44:4150:45 | in : TreeBag [<element>] : String | Test.java:4150:10:4150:46 | new MyAbstractCollectionDecorator<>(...) : MyAbstractCollectionDecorator [<element>] : String | provenance | MaD:76 |
 | Test.java:4150:44:4150:45 | in : TreeBag [<element>] : String | Test.java:7149:40:7149:63 | coll : TreeBag [<element>] : String | provenance |  |
 | Test.java:4151:20:4151:22 | out : MyAbstractCollectionDecorator [<element>] : String | Test.java:230:19:230:32 | it : MyAbstractCollectionDecorator [<element>] : String | provenance |  |
-| Test.java:4151:20:4151:22 | out : MyAbstractCollectionDecorator [<element>] : String | Test.java:4151:9:4151:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:4151:20:4151:22 | out : MyAbstractCollectionDecorator [<element>] : String | Test.java:4151:9:4151:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:4156:39:4156:112 | new MyAbstractCollectionDecorator<>(...) : MyAbstractCollectionDecorator [<element>] : String | Test.java:4157:10:4157:11 | in : MyAbstractCollectionDecorator [<element>] : String | provenance |  |
-| Test.java:4156:73:4156:111 | newTreeBagWithElement(...) : TreeBag [<element>] : String | Test.java:4156:39:4156:112 | new MyAbstractCollectionDecorator<>(...) : MyAbstractCollectionDecorator [<element>] : String | provenance | MaD:74 |
+| Test.java:4156:73:4156:111 | newTreeBagWithElement(...) : TreeBag [<element>] : String | Test.java:4156:39:4156:112 | new MyAbstractCollectionDecorator<>(...) : MyAbstractCollectionDecorator [<element>] : String | provenance | MaD:76 |
 | Test.java:4156:73:4156:111 | newTreeBagWithElement(...) : TreeBag [<element>] : String | Test.java:7149:40:7149:63 | coll : TreeBag [<element>] : String | provenance |  |
 | Test.java:4156:95:4156:110 | (...)... : String | Test.java:267:39:267:47 | element : String | provenance |  |
-| Test.java:4156:95:4156:110 | (...)... : String | Test.java:4156:73:4156:111 | newTreeBagWithElement(...) : TreeBag [<element>] : String | provenance | MaD:2 |
-| Test.java:4156:95:4156:110 | (...)... : String | Test.java:4156:73:4156:111 | newTreeBagWithElement(...) : TreeBag [<element>] : String | provenance | MaD:395 |
+| Test.java:4156:95:4156:110 | (...)... : String | Test.java:4156:73:4156:111 | newTreeBagWithElement(...) : TreeBag [<element>] : String | provenance | MaD:4 |
+| Test.java:4156:95:4156:110 | (...)... : String | Test.java:4156:73:4156:111 | newTreeBagWithElement(...) : TreeBag [<element>] : String | provenance | MaD:470 |
 | Test.java:4156:103:4156:110 | source(...) : Object | Test.java:4156:95:4156:110 | (...)... : String | provenance |  |
-| Test.java:4157:10:4157:11 | in : MyAbstractCollectionDecorator [<element>] : String | Test.java:4157:10:4157:25 | myDecorated(...) : Collection [<element>] : String | provenance | MaD:75 |
+| Test.java:4157:10:4157:11 | in : MyAbstractCollectionDecorator [<element>] : String | Test.java:4157:10:4157:25 | myDecorated(...) : Collection [<element>] : String | provenance | MaD:77 |
 | Test.java:4157:10:4157:11 | in : MyAbstractCollectionDecorator [<element>] : String | Test.java:7152:24:7152:34 | parameter this : MyAbstractCollectionDecorator [<element>] : String | provenance |  |
 | Test.java:4157:10:4157:25 | myDecorated(...) : Collection [<element>] : String | Test.java:4158:20:4158:22 | out : Collection [<element>] : String | provenance |  |
 | Test.java:4158:20:4158:22 | out : Collection [<element>] : String | Test.java:230:19:230:32 | it : Collection [<element>] : String | provenance |  |
-| Test.java:4158:20:4158:22 | out : Collection [<element>] : String | Test.java:4158:9:4158:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:4158:20:4158:22 | out : Collection [<element>] : String | Test.java:4158:9:4158:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:4163:20:4163:58 | newTreeBagWithElement(...) : TreeBag [<element>] : String | Test.java:4164:24:4164:25 | in : TreeBag [<element>] : String | provenance |  |
 | Test.java:4163:42:4163:57 | (...)... : String | Test.java:267:39:267:47 | element : String | provenance |  |
-| Test.java:4163:42:4163:57 | (...)... : String | Test.java:4163:20:4163:58 | newTreeBagWithElement(...) : TreeBag [<element>] : String | provenance | MaD:2 |
-| Test.java:4163:42:4163:57 | (...)... : String | Test.java:4163:20:4163:58 | newTreeBagWithElement(...) : TreeBag [<element>] : String | provenance | MaD:395 |
+| Test.java:4163:42:4163:57 | (...)... : String | Test.java:4163:20:4163:58 | newTreeBagWithElement(...) : TreeBag [<element>] : String | provenance | MaD:4 |
+| Test.java:4163:42:4163:57 | (...)... : String | Test.java:4163:20:4163:58 | newTreeBagWithElement(...) : TreeBag [<element>] : String | provenance | MaD:470 |
 | Test.java:4163:50:4163:57 | source(...) : Object | Test.java:4163:42:4163:57 | (...)... : String | provenance |  |
 | Test.java:4164:4:4164:6 | out [post update] : MyAbstractCollectionDecorator [<element>] : String | Test.java:4165:20:4165:22 | out : MyAbstractCollectionDecorator [<element>] : String | provenance |  |
-| Test.java:4164:24:4164:25 | in : TreeBag [<element>] : String | Test.java:4164:4:4164:6 | out [post update] : MyAbstractCollectionDecorator [<element>] : String | provenance | MaD:76 |
+| Test.java:4164:24:4164:25 | in : TreeBag [<element>] : String | Test.java:4164:4:4164:6 | out [post update] : MyAbstractCollectionDecorator [<element>] : String | provenance | MaD:78 |
 | Test.java:4164:24:4164:25 | in : TreeBag [<element>] : String | Test.java:7155:31:7155:54 | coll : TreeBag [<element>] : String | provenance |  |
 | Test.java:4165:20:4165:22 | out : MyAbstractCollectionDecorator [<element>] : String | Test.java:230:19:230:32 | it : MyAbstractCollectionDecorator [<element>] : String | provenance |  |
-| Test.java:4165:20:4165:22 | out : MyAbstractCollectionDecorator [<element>] : String | Test.java:4165:9:4165:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:4165:20:4165:22 | out : MyAbstractCollectionDecorator [<element>] : String | Test.java:4165:9:4165:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:4170:16:4170:23 | source(...) : Object | Test.java:4172:28:4172:29 | in : Object | provenance |  |
 | Test.java:4172:17:4172:19 | out [post update] : CompositeCollection [<element>] : Object | Test.java:4173:20:4173:22 | out : CompositeCollection [<element>] : Object | provenance |  |
-| Test.java:4172:28:4172:29 | in : Object | Test.java:4172:17:4172:19 | out [post update] : CompositeCollection [<element>] : Object | provenance | MaD:87 |
+| Test.java:4172:28:4172:29 | in : Object | Test.java:4172:17:4172:19 | out [post update] : CompositeCollection [<element>] : Object | provenance | MaD:79 |
 | Test.java:4173:20:4173:22 | out : CompositeCollection [<element>] : Object | Test.java:230:19:230:32 | it : CompositeCollection [<element>] : Object | provenance |  |
-| Test.java:4173:20:4173:22 | out : CompositeCollection [<element>] : Object | Test.java:4173:9:4173:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:4173:20:4173:22 | out : CompositeCollection [<element>] : Object | Test.java:4173:9:4173:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:4178:16:4178:23 | source(...) : Object | Test.java:4180:28:4180:29 | in : Object | provenance |  |
 | Test.java:4180:23:4180:25 | out [post update] : List [<element>, <element>] : Object | Test.java:4181:31:4181:33 | out : List [<element>, <element>] : Object | provenance |  |
-| Test.java:4180:28:4180:29 | in : Object | Test.java:4180:23:4180:25 | out [post update] : List [<element>, <element>] : Object | provenance | MaD:88 |
+| Test.java:4180:28:4180:29 | in : Object | Test.java:4180:23:4180:25 | out [post update] : List [<element>, <element>] : Object | provenance | MaD:80 |
 | Test.java:4181:20:4181:34 | getElement(...) : Collection [<element>] : Object | Test.java:230:19:230:32 | it : Collection [<element>] : Object | provenance |  |
-| Test.java:4181:20:4181:34 | getElement(...) : Collection [<element>] : Object | Test.java:4181:9:4181:35 | getElement(...) | provenance | MaD:1 |
+| Test.java:4181:20:4181:34 | getElement(...) : Collection [<element>] : Object | Test.java:4181:9:4181:35 | getElement(...) | provenance | MaD:3 |
 | Test.java:4181:31:4181:33 | out : List [<element>, <element>] : Object | Test.java:230:19:230:32 | it : List [<element>, <element>] : Object | provenance |  |
-| Test.java:4181:31:4181:33 | out : List [<element>, <element>] : Object | Test.java:4181:20:4181:34 | getElement(...) : Collection [<element>] : Object | provenance | MaD:1 |
+| Test.java:4181:31:4181:33 | out : List [<element>, <element>] : Object | Test.java:4181:20:4181:34 | getElement(...) : Collection [<element>] : Object | provenance | MaD:3 |
 | Test.java:4186:20:4186:58 | newTreeBagWithElement(...) : TreeBag [<element>] : String | Test.java:4188:31:4188:32 | in : TreeBag [<element>] : String | provenance |  |
 | Test.java:4186:42:4186:57 | (...)... : String | Test.java:267:39:267:47 | element : String | provenance |  |
-| Test.java:4186:42:4186:57 | (...)... : String | Test.java:4186:20:4186:58 | newTreeBagWithElement(...) : TreeBag [<element>] : String | provenance | MaD:2 |
-| Test.java:4186:42:4186:57 | (...)... : String | Test.java:4186:20:4186:58 | newTreeBagWithElement(...) : TreeBag [<element>] : String | provenance | MaD:395 |
+| Test.java:4186:42:4186:57 | (...)... : String | Test.java:4186:20:4186:58 | newTreeBagWithElement(...) : TreeBag [<element>] : String | provenance | MaD:4 |
+| Test.java:4186:42:4186:57 | (...)... : String | Test.java:4186:20:4186:58 | newTreeBagWithElement(...) : TreeBag [<element>] : String | provenance | MaD:470 |
 | Test.java:4186:50:4186:57 | source(...) : Object | Test.java:4186:42:4186:57 | (...)... : String | provenance |  |
 | Test.java:4188:20:4188:22 | out [post update] : CompositeCollection [<element>] : String | Test.java:4189:20:4189:22 | out : CompositeCollection [<element>] : String | provenance |  |
-| Test.java:4188:31:4188:32 | in : TreeBag [<element>] : String | Test.java:4188:20:4188:22 | out [post update] : CompositeCollection [<element>] : String | provenance | MaD:89 |
+| Test.java:4188:31:4188:32 | in : TreeBag [<element>] : String | Test.java:4188:20:4188:22 | out [post update] : CompositeCollection [<element>] : String | provenance | MaD:81 |
 | Test.java:4189:20:4189:22 | out : CompositeCollection [<element>] : String | Test.java:230:19:230:32 | it : CompositeCollection [<element>] : String | provenance |  |
-| Test.java:4189:20:4189:22 | out : CompositeCollection [<element>] : String | Test.java:4189:9:4189:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:4189:20:4189:22 | out : CompositeCollection [<element>] : String | Test.java:4189:9:4189:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:4194:20:4194:58 | newTreeBagWithElement(...) : TreeBag [<element>] : String | Test.java:4196:31:4196:32 | in : TreeBag [<element>] : String | provenance |  |
 | Test.java:4194:42:4194:57 | (...)... : String | Test.java:267:39:267:47 | element : String | provenance |  |
-| Test.java:4194:42:4194:57 | (...)... : String | Test.java:4194:20:4194:58 | newTreeBagWithElement(...) : TreeBag [<element>] : String | provenance | MaD:2 |
-| Test.java:4194:42:4194:57 | (...)... : String | Test.java:4194:20:4194:58 | newTreeBagWithElement(...) : TreeBag [<element>] : String | provenance | MaD:395 |
+| Test.java:4194:42:4194:57 | (...)... : String | Test.java:4194:20:4194:58 | newTreeBagWithElement(...) : TreeBag [<element>] : String | provenance | MaD:4 |
+| Test.java:4194:42:4194:57 | (...)... : String | Test.java:4194:20:4194:58 | newTreeBagWithElement(...) : TreeBag [<element>] : String | provenance | MaD:470 |
 | Test.java:4194:50:4194:57 | source(...) : Object | Test.java:4194:42:4194:57 | (...)... : String | provenance |  |
 | Test.java:4196:26:4196:28 | out [post update] : List [<element>, <element>] : String | Test.java:4197:31:4197:33 | out : List [<element>, <element>] : String | provenance |  |
-| Test.java:4196:31:4196:32 | in : TreeBag [<element>] : String | Test.java:4196:26:4196:28 | out [post update] : List [<element>, <element>] : String | provenance | MaD:90 |
+| Test.java:4196:31:4196:32 | in : TreeBag [<element>] : String | Test.java:4196:26:4196:28 | out [post update] : List [<element>, <element>] : String | provenance | MaD:82 |
 | Test.java:4197:20:4197:34 | getElement(...) : Collection [<element>] : String | Test.java:230:19:230:32 | it : Collection [<element>] : String | provenance |  |
-| Test.java:4197:20:4197:34 | getElement(...) : Collection [<element>] : String | Test.java:4197:9:4197:35 | getElement(...) | provenance | MaD:1 |
+| Test.java:4197:20:4197:34 | getElement(...) : Collection [<element>] : String | Test.java:4197:9:4197:35 | getElement(...) | provenance | MaD:3 |
 | Test.java:4197:31:4197:33 | out : List [<element>, <element>] : String | Test.java:230:19:230:32 | it : List [<element>, <element>] : String | provenance |  |
-| Test.java:4197:31:4197:33 | out : List [<element>, <element>] : String | Test.java:4197:20:4197:34 | getElement(...) : Collection [<element>] : String | provenance | MaD:1 |
+| Test.java:4197:31:4197:33 | out : List [<element>, <element>] : String | Test.java:4197:20:4197:34 | getElement(...) : Collection [<element>] : String | provenance | MaD:3 |
 | Test.java:4202:20:4202:58 | newTreeBagWithElement(...) : TreeBag [<element>] : String | Test.java:4203:34:4203:35 | in : TreeBag [<element>] : String | provenance |  |
 | Test.java:4202:42:4202:57 | (...)... : String | Test.java:267:39:267:47 | element : String | provenance |  |
-| Test.java:4202:42:4202:57 | (...)... : String | Test.java:4202:20:4202:58 | newTreeBagWithElement(...) : TreeBag [<element>] : String | provenance | MaD:2 |
-| Test.java:4202:42:4202:57 | (...)... : String | Test.java:4202:20:4202:58 | newTreeBagWithElement(...) : TreeBag [<element>] : String | provenance | MaD:395 |
+| Test.java:4202:42:4202:57 | (...)... : String | Test.java:4202:20:4202:58 | newTreeBagWithElement(...) : TreeBag [<element>] : String | provenance | MaD:4 |
+| Test.java:4202:42:4202:57 | (...)... : String | Test.java:4202:20:4202:58 | newTreeBagWithElement(...) : TreeBag [<element>] : String | provenance | MaD:470 |
 | Test.java:4202:50:4202:57 | source(...) : Object | Test.java:4202:42:4202:57 | (...)... : String | provenance |  |
 | Test.java:4203:10:4203:36 | new CompositeCollection<>(...) : CompositeCollection [<element>] : String | Test.java:4204:20:4204:22 | out : CompositeCollection [<element>] : String | provenance |  |
-| Test.java:4203:34:4203:35 | in : TreeBag [<element>] : String | Test.java:4203:10:4203:36 | new CompositeCollection<>(...) : CompositeCollection [<element>] : String | provenance | MaD:77 |
+| Test.java:4203:34:4203:35 | in : TreeBag [<element>] : String | Test.java:4203:10:4203:36 | new CompositeCollection<>(...) : CompositeCollection [<element>] : String | provenance | MaD:83 |
 | Test.java:4204:20:4204:22 | out : CompositeCollection [<element>] : String | Test.java:230:19:230:32 | it : CompositeCollection [<element>] : String | provenance |  |
-| Test.java:4204:20:4204:22 | out : CompositeCollection [<element>] : String | Test.java:4204:9:4204:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:4204:20:4204:22 | out : CompositeCollection [<element>] : String | Test.java:4204:9:4204:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:4209:20:4209:58 | newTreeBagWithElement(...) : TreeBag [<element>] : String | Test.java:4210:34:4210:35 | in : TreeBag [<element>] : String | provenance |  |
 | Test.java:4209:42:4209:57 | (...)... : String | Test.java:267:39:267:47 | element : String | provenance |  |
-| Test.java:4209:42:4209:57 | (...)... : String | Test.java:4209:20:4209:58 | newTreeBagWithElement(...) : TreeBag [<element>] : String | provenance | MaD:2 |
-| Test.java:4209:42:4209:57 | (...)... : String | Test.java:4209:20:4209:58 | newTreeBagWithElement(...) : TreeBag [<element>] : String | provenance | MaD:395 |
+| Test.java:4209:42:4209:57 | (...)... : String | Test.java:4209:20:4209:58 | newTreeBagWithElement(...) : TreeBag [<element>] : String | provenance | MaD:4 |
+| Test.java:4209:42:4209:57 | (...)... : String | Test.java:4209:20:4209:58 | newTreeBagWithElement(...) : TreeBag [<element>] : String | provenance | MaD:470 |
 | Test.java:4209:50:4209:57 | source(...) : Object | Test.java:4209:42:4209:57 | (...)... : String | provenance |  |
 | Test.java:4210:10:4210:42 | new CompositeCollection<>(...) : CompositeCollection [<element>] : String | Test.java:4211:20:4211:22 | out : CompositeCollection [<element>] : String | provenance |  |
-| Test.java:4210:34:4210:35 | in : TreeBag [<element>] : String | Test.java:4210:10:4210:42 | new CompositeCollection<>(...) : CompositeCollection [<element>] : String | provenance | MaD:78 |
+| Test.java:4210:34:4210:35 | in : TreeBag [<element>] : String | Test.java:4210:10:4210:42 | new CompositeCollection<>(...) : CompositeCollection [<element>] : String | provenance | MaD:84 |
 | Test.java:4211:20:4211:22 | out : CompositeCollection [<element>] : String | Test.java:230:19:230:32 | it : CompositeCollection [<element>] : String | provenance |  |
-| Test.java:4211:20:4211:22 | out : CompositeCollection [<element>] : String | Test.java:4211:9:4211:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:4211:20:4211:22 | out : CompositeCollection [<element>] : String | Test.java:4211:9:4211:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:4216:20:4216:58 | newTreeBagWithElement(...) : TreeBag [<element>] : String | Test.java:4217:40:4217:41 | in : TreeBag [<element>] : String | provenance |  |
 | Test.java:4216:42:4216:57 | (...)... : String | Test.java:267:39:267:47 | element : String | provenance |  |
-| Test.java:4216:42:4216:57 | (...)... : String | Test.java:4216:20:4216:58 | newTreeBagWithElement(...) : TreeBag [<element>] : String | provenance | MaD:2 |
-| Test.java:4216:42:4216:57 | (...)... : String | Test.java:4216:20:4216:58 | newTreeBagWithElement(...) : TreeBag [<element>] : String | provenance | MaD:395 |
+| Test.java:4216:42:4216:57 | (...)... : String | Test.java:4216:20:4216:58 | newTreeBagWithElement(...) : TreeBag [<element>] : String | provenance | MaD:4 |
+| Test.java:4216:42:4216:57 | (...)... : String | Test.java:4216:20:4216:58 | newTreeBagWithElement(...) : TreeBag [<element>] : String | provenance | MaD:470 |
 | Test.java:4216:50:4216:57 | source(...) : Object | Test.java:4216:42:4216:57 | (...)... : String | provenance |  |
 | Test.java:4217:10:4217:42 | new CompositeCollection<>(...) : CompositeCollection [<element>] : String | Test.java:4218:20:4218:22 | out : CompositeCollection [<element>] : String | provenance |  |
-| Test.java:4217:40:4217:41 | in : TreeBag [<element>] : String | Test.java:4217:10:4217:42 | new CompositeCollection<>(...) : CompositeCollection [<element>] : String | provenance | MaD:79 |
+| Test.java:4217:40:4217:41 | in : TreeBag [<element>] : String | Test.java:4217:10:4217:42 | new CompositeCollection<>(...) : CompositeCollection [<element>] : String | provenance | MaD:85 |
 | Test.java:4218:20:4218:22 | out : CompositeCollection [<element>] : String | Test.java:230:19:230:32 | it : CompositeCollection [<element>] : String | provenance |  |
-| Test.java:4218:20:4218:22 | out : CompositeCollection [<element>] : String | Test.java:4218:9:4218:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:4218:20:4218:22 | out : CompositeCollection [<element>] : String | Test.java:4218:9:4218:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:4223:22:4223:78 | {...} : Collection[] [[], <element>] : String | Test.java:4224:34:4224:35 | in : Collection[] [[], <element>] : String | provenance |  |
 | Test.java:4223:39:4223:77 | newTreeBagWithElement(...) : TreeBag [<element>] : String | Test.java:4223:22:4223:78 | {...} : Collection[] [[], <element>] : String | provenance |  |
 | Test.java:4223:61:4223:76 | (...)... : String | Test.java:267:39:267:47 | element : String | provenance |  |
-| Test.java:4223:61:4223:76 | (...)... : String | Test.java:4223:39:4223:77 | newTreeBagWithElement(...) : TreeBag [<element>] : String | provenance | MaD:2 |
-| Test.java:4223:61:4223:76 | (...)... : String | Test.java:4223:39:4223:77 | newTreeBagWithElement(...) : TreeBag [<element>] : String | provenance | MaD:395 |
+| Test.java:4223:61:4223:76 | (...)... : String | Test.java:4223:39:4223:77 | newTreeBagWithElement(...) : TreeBag [<element>] : String | provenance | MaD:4 |
+| Test.java:4223:61:4223:76 | (...)... : String | Test.java:4223:39:4223:77 | newTreeBagWithElement(...) : TreeBag [<element>] : String | provenance | MaD:470 |
 | Test.java:4223:69:4223:76 | source(...) : Object | Test.java:4223:61:4223:76 | (...)... : String | provenance |  |
 | Test.java:4224:10:4224:36 | new CompositeCollection<>(...) : CompositeCollection [<element>] : String | Test.java:4225:20:4225:22 | out : CompositeCollection [<element>] : String | provenance |  |
-| Test.java:4224:34:4224:35 | in : Collection[] [[], <element>] : String | Test.java:4224:10:4224:36 | new CompositeCollection<>(...) : CompositeCollection [<element>] : String | provenance | MaD:80 |
+| Test.java:4224:34:4224:35 | in : Collection[] [[], <element>] : String | Test.java:4224:10:4224:36 | new CompositeCollection<>(...) : CompositeCollection [<element>] : String | provenance | MaD:86 |
 | Test.java:4225:20:4225:22 | out : CompositeCollection [<element>] : String | Test.java:230:19:230:32 | it : CompositeCollection [<element>] : String | provenance |  |
-| Test.java:4225:20:4225:22 | out : CompositeCollection [<element>] : String | Test.java:4225:9:4225:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:4225:20:4225:22 | out : CompositeCollection [<element>] : String | Test.java:4225:9:4225:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:4230:20:4230:58 | newTreeBagWithElement(...) : TreeBag [<element>] : String | Test.java:4231:22:4231:23 | in : TreeBag [<element>] : String | provenance |  |
 | Test.java:4230:42:4230:57 | (...)... : String | Test.java:267:39:267:47 | element : String | provenance |  |
-| Test.java:4230:42:4230:57 | (...)... : String | Test.java:4230:20:4230:58 | newTreeBagWithElement(...) : TreeBag [<element>] : String | provenance | MaD:2 |
-| Test.java:4230:42:4230:57 | (...)... : String | Test.java:4230:20:4230:58 | newTreeBagWithElement(...) : TreeBag [<element>] : String | provenance | MaD:395 |
+| Test.java:4230:42:4230:57 | (...)... : String | Test.java:4230:20:4230:58 | newTreeBagWithElement(...) : TreeBag [<element>] : String | provenance | MaD:4 |
+| Test.java:4230:42:4230:57 | (...)... : String | Test.java:4230:20:4230:58 | newTreeBagWithElement(...) : TreeBag [<element>] : String | provenance | MaD:470 |
 | Test.java:4230:50:4230:57 | source(...) : Object | Test.java:4230:42:4230:57 | (...)... : String | provenance |  |
 | Test.java:4231:4:4231:6 | out [post update] : CompositeCollection [<element>] : String | Test.java:4232:20:4232:22 | out : CompositeCollection [<element>] : String | provenance |  |
-| Test.java:4231:22:4231:23 | in : TreeBag [<element>] : String | Test.java:4231:4:4231:6 | out [post update] : CompositeCollection [<element>] : String | provenance | MaD:81 |
+| Test.java:4231:22:4231:23 | in : TreeBag [<element>] : String | Test.java:4231:4:4231:6 | out [post update] : CompositeCollection [<element>] : String | provenance | MaD:87 |
 | Test.java:4232:20:4232:22 | out : CompositeCollection [<element>] : String | Test.java:230:19:230:32 | it : CompositeCollection [<element>] : String | provenance |  |
-| Test.java:4232:20:4232:22 | out : CompositeCollection [<element>] : String | Test.java:4232:9:4232:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:4232:20:4232:22 | out : CompositeCollection [<element>] : String | Test.java:4232:9:4232:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:4237:20:4237:58 | newTreeBagWithElement(...) : TreeBag [<element>] : String | Test.java:4238:22:4238:23 | in : TreeBag [<element>] : String | provenance |  |
 | Test.java:4237:42:4237:57 | (...)... : String | Test.java:267:39:267:47 | element : String | provenance |  |
-| Test.java:4237:42:4237:57 | (...)... : String | Test.java:4237:20:4237:58 | newTreeBagWithElement(...) : TreeBag [<element>] : String | provenance | MaD:2 |
-| Test.java:4237:42:4237:57 | (...)... : String | Test.java:4237:20:4237:58 | newTreeBagWithElement(...) : TreeBag [<element>] : String | provenance | MaD:395 |
+| Test.java:4237:42:4237:57 | (...)... : String | Test.java:4237:20:4237:58 | newTreeBagWithElement(...) : TreeBag [<element>] : String | provenance | MaD:4 |
+| Test.java:4237:42:4237:57 | (...)... : String | Test.java:4237:20:4237:58 | newTreeBagWithElement(...) : TreeBag [<element>] : String | provenance | MaD:470 |
 | Test.java:4237:50:4237:57 | source(...) : Object | Test.java:4237:42:4237:57 | (...)... : String | provenance |  |
 | Test.java:4238:4:4238:6 | out [post update] : CompositeCollection [<element>] : String | Test.java:4239:20:4239:22 | out : CompositeCollection [<element>] : String | provenance |  |
-| Test.java:4238:22:4238:23 | in : TreeBag [<element>] : String | Test.java:4238:4:4238:6 | out [post update] : CompositeCollection [<element>] : String | provenance | MaD:82 |
+| Test.java:4238:22:4238:23 | in : TreeBag [<element>] : String | Test.java:4238:4:4238:6 | out [post update] : CompositeCollection [<element>] : String | provenance | MaD:88 |
 | Test.java:4239:20:4239:22 | out : CompositeCollection [<element>] : String | Test.java:230:19:230:32 | it : CompositeCollection [<element>] : String | provenance |  |
-| Test.java:4239:20:4239:22 | out : CompositeCollection [<element>] : String | Test.java:4239:9:4239:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:4239:20:4239:22 | out : CompositeCollection [<element>] : String | Test.java:4239:9:4239:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:4244:20:4244:58 | newTreeBagWithElement(...) : TreeBag [<element>] : String | Test.java:4245:28:4245:29 | in : TreeBag [<element>] : String | provenance |  |
 | Test.java:4244:42:4244:57 | (...)... : String | Test.java:267:39:267:47 | element : String | provenance |  |
-| Test.java:4244:42:4244:57 | (...)... : String | Test.java:4244:20:4244:58 | newTreeBagWithElement(...) : TreeBag [<element>] : String | provenance | MaD:2 |
-| Test.java:4244:42:4244:57 | (...)... : String | Test.java:4244:20:4244:58 | newTreeBagWithElement(...) : TreeBag [<element>] : String | provenance | MaD:395 |
+| Test.java:4244:42:4244:57 | (...)... : String | Test.java:4244:20:4244:58 | newTreeBagWithElement(...) : TreeBag [<element>] : String | provenance | MaD:4 |
+| Test.java:4244:42:4244:57 | (...)... : String | Test.java:4244:20:4244:58 | newTreeBagWithElement(...) : TreeBag [<element>] : String | provenance | MaD:470 |
 | Test.java:4244:50:4244:57 | source(...) : Object | Test.java:4244:42:4244:57 | (...)... : String | provenance |  |
 | Test.java:4245:4:4245:6 | out [post update] : CompositeCollection [<element>] : String | Test.java:4246:20:4246:22 | out : CompositeCollection [<element>] : String | provenance |  |
-| Test.java:4245:28:4245:29 | in : TreeBag [<element>] : String | Test.java:4245:4:4245:6 | out [post update] : CompositeCollection [<element>] : String | provenance | MaD:83 |
+| Test.java:4245:28:4245:29 | in : TreeBag [<element>] : String | Test.java:4245:4:4245:6 | out [post update] : CompositeCollection [<element>] : String | provenance | MaD:89 |
 | Test.java:4246:20:4246:22 | out : CompositeCollection [<element>] : String | Test.java:230:19:230:32 | it : CompositeCollection [<element>] : String | provenance |  |
-| Test.java:4246:20:4246:22 | out : CompositeCollection [<element>] : String | Test.java:4246:9:4246:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:4246:20:4246:22 | out : CompositeCollection [<element>] : String | Test.java:4246:9:4246:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:4251:22:4251:78 | {...} : Collection[] [[], <element>] : String | Test.java:4252:22:4252:23 | in : Collection[] [[], <element>] : String | provenance |  |
 | Test.java:4251:39:4251:77 | newTreeBagWithElement(...) : TreeBag [<element>] : String | Test.java:4251:22:4251:78 | {...} : Collection[] [[], <element>] : String | provenance |  |
 | Test.java:4251:61:4251:76 | (...)... : String | Test.java:267:39:267:47 | element : String | provenance |  |
-| Test.java:4251:61:4251:76 | (...)... : String | Test.java:4251:39:4251:77 | newTreeBagWithElement(...) : TreeBag [<element>] : String | provenance | MaD:2 |
-| Test.java:4251:61:4251:76 | (...)... : String | Test.java:4251:39:4251:77 | newTreeBagWithElement(...) : TreeBag [<element>] : String | provenance | MaD:395 |
+| Test.java:4251:61:4251:76 | (...)... : String | Test.java:4251:39:4251:77 | newTreeBagWithElement(...) : TreeBag [<element>] : String | provenance | MaD:4 |
+| Test.java:4251:61:4251:76 | (...)... : String | Test.java:4251:39:4251:77 | newTreeBagWithElement(...) : TreeBag [<element>] : String | provenance | MaD:470 |
 | Test.java:4251:69:4251:76 | source(...) : Object | Test.java:4251:61:4251:76 | (...)... : String | provenance |  |
 | Test.java:4252:4:4252:6 | out [post update] : CompositeCollection [<element>] : String | Test.java:4253:20:4253:22 | out : CompositeCollection [<element>] : String | provenance |  |
-| Test.java:4252:22:4252:23 | in : Collection[] [[], <element>] : String | Test.java:4252:4:4252:6 | out [post update] : CompositeCollection [<element>] : String | provenance | MaD:84 |
+| Test.java:4252:22:4252:23 | in : Collection[] [[], <element>] : String | Test.java:4252:4:4252:6 | out [post update] : CompositeCollection [<element>] : String | provenance | MaD:90 |
 | Test.java:4253:20:4253:22 | out : CompositeCollection [<element>] : String | Test.java:230:19:230:32 | it : CompositeCollection [<element>] : String | provenance |  |
-| Test.java:4253:20:4253:22 | out : CompositeCollection [<element>] : String | Test.java:4253:9:4253:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:4253:20:4253:22 | out : CompositeCollection [<element>] : String | Test.java:4253:9:4253:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:4258:29:4258:92 | new CompositeCollection<>(...) : CompositeCollection [<element>] : String | Test.java:4259:10:4259:11 | in : CompositeCollection [<element>] : String | provenance |  |
-| Test.java:4258:53:4258:91 | newTreeBagWithElement(...) : TreeBag [<element>] : String | Test.java:4258:29:4258:92 | new CompositeCollection<>(...) : CompositeCollection [<element>] : String | provenance | MaD:77 |
+| Test.java:4258:53:4258:91 | newTreeBagWithElement(...) : TreeBag [<element>] : String | Test.java:4258:29:4258:92 | new CompositeCollection<>(...) : CompositeCollection [<element>] : String | provenance | MaD:83 |
 | Test.java:4258:75:4258:90 | (...)... : String | Test.java:267:39:267:47 | element : String | provenance |  |
-| Test.java:4258:75:4258:90 | (...)... : String | Test.java:4258:53:4258:91 | newTreeBagWithElement(...) : TreeBag [<element>] : String | provenance | MaD:2 |
-| Test.java:4258:75:4258:90 | (...)... : String | Test.java:4258:53:4258:91 | newTreeBagWithElement(...) : TreeBag [<element>] : String | provenance | MaD:395 |
+| Test.java:4258:75:4258:90 | (...)... : String | Test.java:4258:53:4258:91 | newTreeBagWithElement(...) : TreeBag [<element>] : String | provenance | MaD:4 |
+| Test.java:4258:75:4258:90 | (...)... : String | Test.java:4258:53:4258:91 | newTreeBagWithElement(...) : TreeBag [<element>] : String | provenance | MaD:470 |
 | Test.java:4258:83:4258:90 | source(...) : Object | Test.java:4258:75:4258:90 | (...)... : String | provenance |  |
-| Test.java:4259:10:4259:11 | in : CompositeCollection [<element>] : String | Test.java:4259:10:4259:28 | getCollections(...) : List [<element>, <element>] : String | provenance | MaD:85 |
+| Test.java:4259:10:4259:11 | in : CompositeCollection [<element>] : String | Test.java:4259:10:4259:28 | getCollections(...) : List [<element>, <element>] : String | provenance | MaD:91 |
 | Test.java:4259:10:4259:28 | getCollections(...) : List [<element>, <element>] : String | Test.java:4260:31:4260:33 | out : List [<element>, <element>] : String | provenance |  |
 | Test.java:4260:20:4260:34 | getElement(...) : Collection [<element>] : String | Test.java:230:19:230:32 | it : Collection [<element>] : String | provenance |  |
-| Test.java:4260:20:4260:34 | getElement(...) : Collection [<element>] : String | Test.java:4260:9:4260:35 | getElement(...) | provenance | MaD:1 |
+| Test.java:4260:20:4260:34 | getElement(...) : Collection [<element>] : String | Test.java:4260:9:4260:35 | getElement(...) | provenance | MaD:3 |
 | Test.java:4260:31:4260:33 | out : List [<element>, <element>] : String | Test.java:230:19:230:32 | it : List [<element>, <element>] : String | provenance |  |
-| Test.java:4260:31:4260:33 | out : List [<element>, <element>] : String | Test.java:4260:20:4260:34 | getElement(...) : Collection [<element>] : String | provenance | MaD:1 |
+| Test.java:4260:31:4260:33 | out : List [<element>, <element>] : String | Test.java:4260:20:4260:34 | getElement(...) : Collection [<element>] : String | provenance | MaD:3 |
 | Test.java:4265:29:4265:92 | new CompositeCollection<>(...) : CompositeCollection [<element>] : String | Test.java:4266:10:4266:11 | in : CompositeCollection [<element>] : String | provenance |  |
-| Test.java:4265:53:4265:91 | newTreeBagWithElement(...) : TreeBag [<element>] : String | Test.java:4265:29:4265:92 | new CompositeCollection<>(...) : CompositeCollection [<element>] : String | provenance | MaD:77 |
+| Test.java:4265:53:4265:91 | newTreeBagWithElement(...) : TreeBag [<element>] : String | Test.java:4265:29:4265:92 | new CompositeCollection<>(...) : CompositeCollection [<element>] : String | provenance | MaD:83 |
 | Test.java:4265:75:4265:90 | (...)... : String | Test.java:267:39:267:47 | element : String | provenance |  |
-| Test.java:4265:75:4265:90 | (...)... : String | Test.java:4265:53:4265:91 | newTreeBagWithElement(...) : TreeBag [<element>] : String | provenance | MaD:2 |
-| Test.java:4265:75:4265:90 | (...)... : String | Test.java:4265:53:4265:91 | newTreeBagWithElement(...) : TreeBag [<element>] : String | provenance | MaD:395 |
+| Test.java:4265:75:4265:90 | (...)... : String | Test.java:4265:53:4265:91 | newTreeBagWithElement(...) : TreeBag [<element>] : String | provenance | MaD:4 |
+| Test.java:4265:75:4265:90 | (...)... : String | Test.java:4265:53:4265:91 | newTreeBagWithElement(...) : TreeBag [<element>] : String | provenance | MaD:470 |
 | Test.java:4265:83:4265:90 | source(...) : Object | Test.java:4265:75:4265:90 | (...)... : String | provenance |  |
-| Test.java:4266:10:4266:11 | in : CompositeCollection [<element>] : String | Test.java:4266:10:4266:26 | toCollection(...) : Collection [<element>] : String | provenance | MaD:86 |
+| Test.java:4266:10:4266:11 | in : CompositeCollection [<element>] : String | Test.java:4266:10:4266:26 | toCollection(...) : Collection [<element>] : String | provenance | MaD:92 |
 | Test.java:4266:10:4266:26 | toCollection(...) : Collection [<element>] : String | Test.java:4267:20:4267:22 | out : Collection [<element>] : String | provenance |  |
 | Test.java:4267:20:4267:22 | out : Collection [<element>] : String | Test.java:230:19:230:32 | it : Collection [<element>] : String | provenance |  |
-| Test.java:4267:20:4267:22 | out : Collection [<element>] : String | Test.java:4267:9:4267:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:4267:20:4267:22 | out : Collection [<element>] : String | Test.java:4267:9:4267:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:4272:20:4272:58 | newTreeBagWithElement(...) : TreeBag [<element>] : String | Test.java:4273:32:4273:33 | in : TreeBag [<element>] : String | provenance |  |
 | Test.java:4272:42:4272:57 | (...)... : String | Test.java:267:39:267:47 | element : String | provenance |  |
-| Test.java:4272:42:4272:57 | (...)... : String | Test.java:4272:20:4272:58 | newTreeBagWithElement(...) : TreeBag [<element>] : String | provenance | MaD:2 |
-| Test.java:4272:42:4272:57 | (...)... : String | Test.java:4272:20:4272:58 | newTreeBagWithElement(...) : TreeBag [<element>] : String | provenance | MaD:395 |
+| Test.java:4272:42:4272:57 | (...)... : String | Test.java:4272:20:4272:58 | newTreeBagWithElement(...) : TreeBag [<element>] : String | provenance | MaD:4 |
+| Test.java:4272:42:4272:57 | (...)... : String | Test.java:4272:20:4272:58 | newTreeBagWithElement(...) : TreeBag [<element>] : String | provenance | MaD:470 |
 | Test.java:4272:50:4272:57 | source(...) : Object | Test.java:4272:42:4272:57 | (...)... : String | provenance |  |
 | Test.java:4273:10:4273:53 | new IndexedCollection<>(...) : IndexedCollection [<element>] : String | Test.java:4274:20:4274:22 | out : IndexedCollection [<element>] : String | provenance |  |
-| Test.java:4273:32:4273:33 | in : TreeBag [<element>] : String | Test.java:4273:10:4273:53 | new IndexedCollection<>(...) : IndexedCollection [<element>] : String | provenance | MaD:91 |
+| Test.java:4273:32:4273:33 | in : TreeBag [<element>] : String | Test.java:4273:10:4273:53 | new IndexedCollection<>(...) : IndexedCollection [<element>] : String | provenance | MaD:93 |
 | Test.java:4274:20:4274:22 | out : IndexedCollection [<element>] : String | Test.java:230:19:230:32 | it : IndexedCollection [<element>] : String | provenance |  |
-| Test.java:4274:20:4274:22 | out : IndexedCollection [<element>] : String | Test.java:4274:9:4274:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:4274:20:4274:22 | out : IndexedCollection [<element>] : String | Test.java:4274:9:4274:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:4279:27:4279:107 | new IndexedCollection<>(...) : IndexedCollection [<element>] : String | Test.java:4280:10:4280:11 | in : IndexedCollection [<element>] : String | provenance |  |
-| Test.java:4279:49:4279:87 | newTreeBagWithElement(...) : TreeBag [<element>] : String | Test.java:4279:27:4279:107 | new IndexedCollection<>(...) : IndexedCollection [<element>] : String | provenance | MaD:91 |
+| Test.java:4279:49:4279:87 | newTreeBagWithElement(...) : TreeBag [<element>] : String | Test.java:4279:27:4279:107 | new IndexedCollection<>(...) : IndexedCollection [<element>] : String | provenance | MaD:93 |
 | Test.java:4279:71:4279:86 | (...)... : String | Test.java:267:39:267:47 | element : String | provenance |  |
-| Test.java:4279:71:4279:86 | (...)... : String | Test.java:4279:49:4279:87 | newTreeBagWithElement(...) : TreeBag [<element>] : String | provenance | MaD:2 |
-| Test.java:4279:71:4279:86 | (...)... : String | Test.java:4279:49:4279:87 | newTreeBagWithElement(...) : TreeBag [<element>] : String | provenance | MaD:395 |
+| Test.java:4279:71:4279:86 | (...)... : String | Test.java:4279:49:4279:87 | newTreeBagWithElement(...) : TreeBag [<element>] : String | provenance | MaD:4 |
+| Test.java:4279:71:4279:86 | (...)... : String | Test.java:4279:49:4279:87 | newTreeBagWithElement(...) : TreeBag [<element>] : String | provenance | MaD:470 |
 | Test.java:4279:79:4279:86 | source(...) : Object | Test.java:4279:71:4279:86 | (...)... : String | provenance |  |
-| Test.java:4280:10:4280:11 | in : IndexedCollection [<element>] : String | Test.java:4280:10:4280:21 | get(...) : String | provenance | MaD:92 |
+| Test.java:4280:10:4280:11 | in : IndexedCollection [<element>] : String | Test.java:4280:10:4280:21 | get(...) : String | provenance | MaD:94 |
 | Test.java:4280:10:4280:21 | get(...) : String | Test.java:4281:9:4281:11 | out | provenance |  |
 | Test.java:4286:20:4286:58 | newTreeBagWithElement(...) : TreeBag [<element>] : String | Test.java:4287:55:4287:56 | in : TreeBag [<element>] : String | provenance |  |
 | Test.java:4286:42:4286:57 | (...)... : String | Test.java:267:39:267:47 | element : String | provenance |  |
-| Test.java:4286:42:4286:57 | (...)... : String | Test.java:4286:20:4286:58 | newTreeBagWithElement(...) : TreeBag [<element>] : String | provenance | MaD:2 |
-| Test.java:4286:42:4286:57 | (...)... : String | Test.java:4286:20:4286:58 | newTreeBagWithElement(...) : TreeBag [<element>] : String | provenance | MaD:395 |
+| Test.java:4286:42:4286:57 | (...)... : String | Test.java:4286:20:4286:58 | newTreeBagWithElement(...) : TreeBag [<element>] : String | provenance | MaD:4 |
+| Test.java:4286:42:4286:57 | (...)... : String | Test.java:4286:20:4286:58 | newTreeBagWithElement(...) : TreeBag [<element>] : String | provenance | MaD:470 |
 | Test.java:4286:50:4286:57 | source(...) : Object | Test.java:4286:42:4286:57 | (...)... : String | provenance |  |
 | Test.java:4287:10:4287:63 | nonUniqueIndexedCollection(...) : IndexedCollection [<element>] : String | Test.java:4288:20:4288:22 | out : IndexedCollection [<element>] : String | provenance |  |
-| Test.java:4287:55:4287:56 | in : TreeBag [<element>] : String | Test.java:4287:10:4287:63 | nonUniqueIndexedCollection(...) : IndexedCollection [<element>] : String | provenance | MaD:93 |
+| Test.java:4287:55:4287:56 | in : TreeBag [<element>] : String | Test.java:4287:10:4287:63 | nonUniqueIndexedCollection(...) : IndexedCollection [<element>] : String | provenance | MaD:95 |
 | Test.java:4288:20:4288:22 | out : IndexedCollection [<element>] : String | Test.java:230:19:230:32 | it : IndexedCollection [<element>] : String | provenance |  |
-| Test.java:4288:20:4288:22 | out : IndexedCollection [<element>] : String | Test.java:4288:9:4288:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:4288:20:4288:22 | out : IndexedCollection [<element>] : String | Test.java:4288:9:4288:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:4293:20:4293:58 | newTreeBagWithElement(...) : TreeBag [<element>] : String | Test.java:4294:52:4294:53 | in : TreeBag [<element>] : String | provenance |  |
 | Test.java:4293:42:4293:57 | (...)... : String | Test.java:267:39:267:47 | element : String | provenance |  |
-| Test.java:4293:42:4293:57 | (...)... : String | Test.java:4293:20:4293:58 | newTreeBagWithElement(...) : TreeBag [<element>] : String | provenance | MaD:2 |
-| Test.java:4293:42:4293:57 | (...)... : String | Test.java:4293:20:4293:58 | newTreeBagWithElement(...) : TreeBag [<element>] : String | provenance | MaD:395 |
+| Test.java:4293:42:4293:57 | (...)... : String | Test.java:4293:20:4293:58 | newTreeBagWithElement(...) : TreeBag [<element>] : String | provenance | MaD:4 |
+| Test.java:4293:42:4293:57 | (...)... : String | Test.java:4293:20:4293:58 | newTreeBagWithElement(...) : TreeBag [<element>] : String | provenance | MaD:470 |
 | Test.java:4293:50:4293:57 | source(...) : Object | Test.java:4293:42:4293:57 | (...)... : String | provenance |  |
 | Test.java:4294:10:4294:60 | uniqueIndexedCollection(...) : IndexedCollection [<element>] : String | Test.java:4295:20:4295:22 | out : IndexedCollection [<element>] : String | provenance |  |
-| Test.java:4294:52:4294:53 | in : TreeBag [<element>] : String | Test.java:4294:10:4294:60 | uniqueIndexedCollection(...) : IndexedCollection [<element>] : String | provenance | MaD:94 |
+| Test.java:4294:52:4294:53 | in : TreeBag [<element>] : String | Test.java:4294:10:4294:60 | uniqueIndexedCollection(...) : IndexedCollection [<element>] : String | provenance | MaD:96 |
 | Test.java:4295:20:4295:22 | out : IndexedCollection [<element>] : String | Test.java:230:19:230:32 | it : IndexedCollection [<element>] : String | provenance |  |
-| Test.java:4295:20:4295:22 | out : IndexedCollection [<element>] : String | Test.java:4295:9:4295:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:4295:20:4295:22 | out : IndexedCollection [<element>] : String | Test.java:4295:9:4295:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:4300:27:4300:107 | new IndexedCollection<>(...) : IndexedCollection [<element>] : String | Test.java:4301:10:4301:11 | in : IndexedCollection [<element>] : String | provenance |  |
-| Test.java:4300:49:4300:87 | newTreeBagWithElement(...) : TreeBag [<element>] : String | Test.java:4300:27:4300:107 | new IndexedCollection<>(...) : IndexedCollection [<element>] : String | provenance | MaD:91 |
+| Test.java:4300:49:4300:87 | newTreeBagWithElement(...) : TreeBag [<element>] : String | Test.java:4300:27:4300:107 | new IndexedCollection<>(...) : IndexedCollection [<element>] : String | provenance | MaD:93 |
 | Test.java:4300:71:4300:86 | (...)... : String | Test.java:267:39:267:47 | element : String | provenance |  |
-| Test.java:4300:71:4300:86 | (...)... : String | Test.java:4300:49:4300:87 | newTreeBagWithElement(...) : TreeBag [<element>] : String | provenance | MaD:2 |
-| Test.java:4300:71:4300:86 | (...)... : String | Test.java:4300:49:4300:87 | newTreeBagWithElement(...) : TreeBag [<element>] : String | provenance | MaD:395 |
+| Test.java:4300:71:4300:86 | (...)... : String | Test.java:4300:49:4300:87 | newTreeBagWithElement(...) : TreeBag [<element>] : String | provenance | MaD:4 |
+| Test.java:4300:71:4300:86 | (...)... : String | Test.java:4300:49:4300:87 | newTreeBagWithElement(...) : TreeBag [<element>] : String | provenance | MaD:470 |
 | Test.java:4300:79:4300:86 | source(...) : Object | Test.java:4300:71:4300:86 | (...)... : String | provenance |  |
-| Test.java:4301:10:4301:11 | in : IndexedCollection [<element>] : String | Test.java:4301:10:4301:24 | values(...) : Collection [<element>] : String | provenance | MaD:95 |
+| Test.java:4301:10:4301:11 | in : IndexedCollection [<element>] : String | Test.java:4301:10:4301:24 | values(...) : Collection [<element>] : String | provenance | MaD:97 |
 | Test.java:4301:10:4301:24 | values(...) : Collection [<element>] : String | Test.java:4302:20:4302:22 | out : Collection [<element>] : String | provenance |  |
 | Test.java:4302:20:4302:22 | out : Collection [<element>] : String | Test.java:230:19:230:32 | it : Collection [<element>] : String | provenance |  |
-| Test.java:4302:20:4302:22 | out : Collection [<element>] : String | Test.java:4302:9:4302:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:4302:20:4302:22 | out : Collection [<element>] : String | Test.java:4302:9:4302:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:4307:16:4307:31 | (...)... : String | Test.java:4308:12:4308:13 | in : String | provenance |  |
 | Test.java:4307:24:4307:31 | source(...) : Object | Test.java:4307:16:4307:31 | (...)... : String | provenance |  |
 | Test.java:4308:4:4308:6 | out [post update] : Builder [<element>] : String | Test.java:4309:20:4309:22 | out : Builder [<element>] : String | provenance |  |
-| Test.java:4308:12:4308:13 | in : String | Test.java:4308:4:4308:6 | out [post update] : Builder [<element>] : String | provenance | MaD:97 |
-| Test.java:4309:20:4309:22 | out : Builder [<element>] : String | Test.java:4309:20:4309:45 | createPredicatedList(...) : List [<element>] : String | provenance | MaD:101 |
+| Test.java:4308:12:4308:13 | in : String | Test.java:4308:4:4308:6 | out [post update] : Builder [<element>] : String | provenance | MaD:98 |
+| Test.java:4309:20:4309:22 | out : Builder [<element>] : String | Test.java:4309:20:4309:45 | createPredicatedList(...) : List [<element>] : String | provenance | MaD:103 |
 | Test.java:4309:20:4309:45 | createPredicatedList(...) : List [<element>] : String | Test.java:230:19:230:32 | it : List [<element>] : String | provenance |  |
-| Test.java:4309:20:4309:45 | createPredicatedList(...) : List [<element>] : String | Test.java:4309:9:4309:46 | getElement(...) | provenance | MaD:1 |
+| Test.java:4309:20:4309:45 | createPredicatedList(...) : List [<element>] : String | Test.java:4309:9:4309:46 | getElement(...) | provenance | MaD:3 |
 | Test.java:4314:20:4314:44 | of(...) : List [<element>] : String | Test.java:4315:15:4315:16 | in : List [<element>] : String | provenance |  |
-| Test.java:4314:28:4314:43 | (...)... : String | Test.java:4314:20:4314:44 | of(...) : List [<element>] : String | provenance | MaD:6 |
+| Test.java:4314:28:4314:43 | (...)... : String | Test.java:4314:20:4314:44 | of(...) : List [<element>] : String | provenance | MaD:7 |
 | Test.java:4314:36:4314:43 | source(...) : Object | Test.java:4314:28:4314:43 | (...)... : String | provenance |  |
 | Test.java:4315:4:4315:6 | out [post update] : Builder [<element>] : String | Test.java:4316:20:4316:22 | out : Builder [<element>] : String | provenance |  |
-| Test.java:4315:15:4315:16 | in : List [<element>] : String | Test.java:4315:4:4315:6 | out [post update] : Builder [<element>] : String | provenance | MaD:98 |
-| Test.java:4316:20:4316:22 | out : Builder [<element>] : String | Test.java:4316:20:4316:45 | createPredicatedList(...) : List [<element>] : String | provenance | MaD:101 |
+| Test.java:4315:15:4315:16 | in : List [<element>] : String | Test.java:4315:4:4315:6 | out [post update] : Builder [<element>] : String | provenance | MaD:99 |
+| Test.java:4316:20:4316:22 | out : Builder [<element>] : String | Test.java:4316:20:4316:45 | createPredicatedList(...) : List [<element>] : String | provenance | MaD:103 |
 | Test.java:4316:20:4316:45 | createPredicatedList(...) : List [<element>] : String | Test.java:230:19:230:32 | it : List [<element>] : String | provenance |  |
-| Test.java:4316:20:4316:45 | createPredicatedList(...) : List [<element>] : String | Test.java:4316:9:4316:46 | getElement(...) | provenance | MaD:1 |
+| Test.java:4316:20:4316:45 | createPredicatedList(...) : List [<element>] : String | Test.java:4316:9:4316:46 | getElement(...) | provenance | MaD:3 |
 | Test.java:4321:38:4321:96 | newPredicatedCollectionBuilderWithElement(...) : Builder [<element>] : String | Test.java:4322:10:4322:11 | in : Builder [<element>] : String | provenance |  |
 | Test.java:4321:80:4321:95 | (...)... : String | Test.java:264:80:264:88 | element : String | provenance |  |
-| Test.java:4321:80:4321:95 | (...)... : String | Test.java:4321:38:4321:96 | newPredicatedCollectionBuilderWithElement(...) : Builder [<element>] : String | provenance | MaD:97 |
+| Test.java:4321:80:4321:95 | (...)... : String | Test.java:4321:38:4321:96 | newPredicatedCollectionBuilderWithElement(...) : Builder [<element>] : String | provenance | MaD:98 |
 | Test.java:4321:88:4321:95 | source(...) : Object | Test.java:4321:80:4321:95 | (...)... : String | provenance |  |
-| Test.java:4322:10:4322:11 | in : Builder [<element>] : String | Test.java:4322:10:4322:37 | createPredicatedBag(...) : Bag [<element>] : String | provenance | MaD:99 |
+| Test.java:4322:10:4322:11 | in : Builder [<element>] : String | Test.java:4322:10:4322:37 | createPredicatedBag(...) : Bag [<element>] : String | provenance | MaD:101 |
 | Test.java:4322:10:4322:37 | createPredicatedBag(...) : Bag [<element>] : String | Test.java:4323:20:4323:22 | out : Bag [<element>] : String | provenance |  |
 | Test.java:4323:20:4323:22 | out : Bag [<element>] : String | Test.java:230:19:230:32 | it : Bag [<element>] : String | provenance |  |
-| Test.java:4323:20:4323:22 | out : Bag [<element>] : String | Test.java:4323:9:4323:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:4323:20:4323:22 | out : Bag [<element>] : String | Test.java:4323:9:4323:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:4328:38:4328:96 | newPredicatedCollectionBuilderWithElement(...) : Builder [<element>] : String | Test.java:4329:10:4329:11 | in : Builder [<element>] : String | provenance |  |
 | Test.java:4328:80:4328:95 | (...)... : String | Test.java:264:80:264:88 | element : String | provenance |  |
-| Test.java:4328:80:4328:95 | (...)... : String | Test.java:4328:38:4328:96 | newPredicatedCollectionBuilderWithElement(...) : Builder [<element>] : String | provenance | MaD:97 |
+| Test.java:4328:80:4328:95 | (...)... : String | Test.java:4328:38:4328:96 | newPredicatedCollectionBuilderWithElement(...) : Builder [<element>] : String | provenance | MaD:98 |
 | Test.java:4328:88:4328:95 | source(...) : Object | Test.java:4328:80:4328:95 | (...)... : String | provenance |  |
-| Test.java:4329:10:4329:11 | in : Builder [<element>] : String | Test.java:4329:10:4329:33 | createPredicatedBag(...) : Bag [<element>] : String | provenance | MaD:99 |
+| Test.java:4329:10:4329:11 | in : Builder [<element>] : String | Test.java:4329:10:4329:33 | createPredicatedBag(...) : Bag [<element>] : String | provenance | MaD:101 |
 | Test.java:4329:10:4329:33 | createPredicatedBag(...) : Bag [<element>] : String | Test.java:4330:20:4330:22 | out : Bag [<element>] : String | provenance |  |
 | Test.java:4330:20:4330:22 | out : Bag [<element>] : String | Test.java:230:19:230:32 | it : Bag [<element>] : String | provenance |  |
-| Test.java:4330:20:4330:22 | out : Bag [<element>] : String | Test.java:4330:9:4330:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:4330:20:4330:22 | out : Bag [<element>] : String | Test.java:4330:9:4330:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:4335:13:4335:51 | newTreeBagWithElement(...) : TreeBag [<element>] : String | Test.java:4337:39:4337:40 | in : TreeBag [<element>] : String | provenance |  |
 | Test.java:4335:35:4335:50 | (...)... : String | Test.java:267:39:267:47 | element : String | provenance |  |
-| Test.java:4335:35:4335:50 | (...)... : String | Test.java:4335:13:4335:51 | newTreeBagWithElement(...) : TreeBag [<element>] : String | provenance | MaD:2 |
-| Test.java:4335:35:4335:50 | (...)... : String | Test.java:4335:13:4335:51 | newTreeBagWithElement(...) : TreeBag [<element>] : String | provenance | MaD:395 |
+| Test.java:4335:35:4335:50 | (...)... : String | Test.java:4335:13:4335:51 | newTreeBagWithElement(...) : TreeBag [<element>] : String | provenance | MaD:4 |
+| Test.java:4335:35:4335:50 | (...)... : String | Test.java:4335:13:4335:51 | newTreeBagWithElement(...) : TreeBag [<element>] : String | provenance | MaD:470 |
 | Test.java:4335:43:4335:50 | source(...) : Object | Test.java:4335:35:4335:50 | (...)... : String | provenance |  |
 | Test.java:4337:10:4337:41 | createPredicatedBag(...) : Bag [<element>] : String | Test.java:4338:20:4338:22 | out : Bag [<element>] : String | provenance |  |
 | Test.java:4337:39:4337:40 | in : TreeBag [<element>] : String | Test.java:4337:10:4337:41 | createPredicatedBag(...) : Bag [<element>] : String | provenance | MaD:100 |
 | Test.java:4338:20:4338:22 | out : Bag [<element>] : String | Test.java:230:19:230:32 | it : Bag [<element>] : String | provenance |  |
-| Test.java:4338:20:4338:22 | out : Bag [<element>] : String | Test.java:4338:9:4338:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:4338:20:4338:22 | out : Bag [<element>] : String | Test.java:4338:9:4338:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:4343:38:4343:96 | newPredicatedCollectionBuilderWithElement(...) : Builder [<element>] : String | Test.java:4344:10:4344:11 | in : Builder [<element>] : String | provenance |  |
 | Test.java:4343:80:4343:95 | (...)... : String | Test.java:264:80:264:88 | element : String | provenance |  |
-| Test.java:4343:80:4343:95 | (...)... : String | Test.java:4343:38:4343:96 | newPredicatedCollectionBuilderWithElement(...) : Builder [<element>] : String | provenance | MaD:97 |
+| Test.java:4343:80:4343:95 | (...)... : String | Test.java:4343:38:4343:96 | newPredicatedCollectionBuilderWithElement(...) : Builder [<element>] : String | provenance | MaD:98 |
 | Test.java:4343:88:4343:95 | source(...) : Object | Test.java:4343:80:4343:95 | (...)... : String | provenance |  |
-| Test.java:4344:10:4344:11 | in : Builder [<element>] : String | Test.java:4344:10:4344:38 | createPredicatedList(...) : List [<element>] : String | provenance | MaD:101 |
+| Test.java:4344:10:4344:11 | in : Builder [<element>] : String | Test.java:4344:10:4344:38 | createPredicatedList(...) : List [<element>] : String | provenance | MaD:103 |
 | Test.java:4344:10:4344:38 | createPredicatedList(...) : List [<element>] : String | Test.java:4345:20:4345:22 | out : List [<element>] : String | provenance |  |
 | Test.java:4345:20:4345:22 | out : List [<element>] : String | Test.java:230:19:230:32 | it : List [<element>] : String | provenance |  |
-| Test.java:4345:20:4345:22 | out : List [<element>] : String | Test.java:4345:9:4345:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:4345:20:4345:22 | out : List [<element>] : String | Test.java:4345:9:4345:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:4350:38:4350:96 | newPredicatedCollectionBuilderWithElement(...) : Builder [<element>] : String | Test.java:4351:10:4351:11 | in : Builder [<element>] : String | provenance |  |
 | Test.java:4350:80:4350:95 | (...)... : String | Test.java:264:80:264:88 | element : String | provenance |  |
-| Test.java:4350:80:4350:95 | (...)... : String | Test.java:4350:38:4350:96 | newPredicatedCollectionBuilderWithElement(...) : Builder [<element>] : String | provenance | MaD:97 |
+| Test.java:4350:80:4350:95 | (...)... : String | Test.java:4350:38:4350:96 | newPredicatedCollectionBuilderWithElement(...) : Builder [<element>] : String | provenance | MaD:98 |
 | Test.java:4350:88:4350:95 | source(...) : Object | Test.java:4350:80:4350:95 | (...)... : String | provenance |  |
-| Test.java:4351:10:4351:11 | in : Builder [<element>] : String | Test.java:4351:10:4351:34 | createPredicatedList(...) : List [<element>] : String | provenance | MaD:101 |
+| Test.java:4351:10:4351:11 | in : Builder [<element>] : String | Test.java:4351:10:4351:34 | createPredicatedList(...) : List [<element>] : String | provenance | MaD:103 |
 | Test.java:4351:10:4351:34 | createPredicatedList(...) : List [<element>] : String | Test.java:4352:20:4352:22 | out : List [<element>] : String | provenance |  |
 | Test.java:4352:20:4352:22 | out : List [<element>] : String | Test.java:230:19:230:32 | it : List [<element>] : String | provenance |  |
-| Test.java:4352:20:4352:22 | out : List [<element>] : String | Test.java:4352:9:4352:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:4352:20:4352:22 | out : List [<element>] : String | Test.java:4352:9:4352:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:4357:14:4357:38 | of(...) : List [<element>] : String | Test.java:4359:40:4359:41 | in : List [<element>] : String | provenance |  |
-| Test.java:4357:22:4357:37 | (...)... : String | Test.java:4357:14:4357:38 | of(...) : List [<element>] : String | provenance | MaD:6 |
+| Test.java:4357:22:4357:37 | (...)... : String | Test.java:4357:14:4357:38 | of(...) : List [<element>] : String | provenance | MaD:7 |
 | Test.java:4357:30:4357:37 | source(...) : Object | Test.java:4357:22:4357:37 | (...)... : String | provenance |  |
 | Test.java:4359:10:4359:42 | createPredicatedList(...) : List [<element>] : String | Test.java:4360:20:4360:22 | out : List [<element>] : String | provenance |  |
 | Test.java:4359:40:4359:41 | in : List [<element>] : String | Test.java:4359:10:4359:42 | createPredicatedList(...) : List [<element>] : String | provenance | MaD:102 |
 | Test.java:4360:20:4360:22 | out : List [<element>] : String | Test.java:230:19:230:32 | it : List [<element>] : String | provenance |  |
-| Test.java:4360:20:4360:22 | out : List [<element>] : String | Test.java:4360:9:4360:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:4360:20:4360:22 | out : List [<element>] : String | Test.java:4360:9:4360:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:4365:38:4365:96 | newPredicatedCollectionBuilderWithElement(...) : Builder [<element>] : String | Test.java:4366:10:4366:11 | in : Builder [<element>] : String | provenance |  |
 | Test.java:4365:80:4365:95 | (...)... : String | Test.java:264:80:264:88 | element : String | provenance |  |
-| Test.java:4365:80:4365:95 | (...)... : String | Test.java:4365:38:4365:96 | newPredicatedCollectionBuilderWithElement(...) : Builder [<element>] : String | provenance | MaD:97 |
+| Test.java:4365:80:4365:95 | (...)... : String | Test.java:4365:38:4365:96 | newPredicatedCollectionBuilderWithElement(...) : Builder [<element>] : String | provenance | MaD:98 |
 | Test.java:4365:88:4365:95 | source(...) : Object | Test.java:4365:80:4365:95 | (...)... : String | provenance |  |
-| Test.java:4366:10:4366:11 | in : Builder [<element>] : String | Test.java:4366:10:4366:42 | createPredicatedMultiSet(...) : MultiSet [<element>] : String | provenance | MaD:103 |
+| Test.java:4366:10:4366:11 | in : Builder [<element>] : String | Test.java:4366:10:4366:42 | createPredicatedMultiSet(...) : MultiSet [<element>] : String | provenance | MaD:105 |
 | Test.java:4366:10:4366:42 | createPredicatedMultiSet(...) : MultiSet [<element>] : String | Test.java:4367:20:4367:22 | out : MultiSet [<element>] : String | provenance |  |
 | Test.java:4367:20:4367:22 | out : MultiSet [<element>] : String | Test.java:230:19:230:32 | it : MultiSet [<element>] : String | provenance |  |
-| Test.java:4367:20:4367:22 | out : MultiSet [<element>] : String | Test.java:4367:9:4367:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:4367:20:4367:22 | out : MultiSet [<element>] : String | Test.java:4367:9:4367:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:4372:38:4372:96 | newPredicatedCollectionBuilderWithElement(...) : Builder [<element>] : String | Test.java:4373:10:4373:11 | in : Builder [<element>] : String | provenance |  |
 | Test.java:4372:80:4372:95 | (...)... : String | Test.java:264:80:264:88 | element : String | provenance |  |
-| Test.java:4372:80:4372:95 | (...)... : String | Test.java:4372:38:4372:96 | newPredicatedCollectionBuilderWithElement(...) : Builder [<element>] : String | provenance | MaD:97 |
+| Test.java:4372:80:4372:95 | (...)... : String | Test.java:4372:38:4372:96 | newPredicatedCollectionBuilderWithElement(...) : Builder [<element>] : String | provenance | MaD:98 |
 | Test.java:4372:88:4372:95 | source(...) : Object | Test.java:4372:80:4372:95 | (...)... : String | provenance |  |
-| Test.java:4373:10:4373:11 | in : Builder [<element>] : String | Test.java:4373:10:4373:38 | createPredicatedMultiSet(...) : MultiSet [<element>] : String | provenance | MaD:103 |
+| Test.java:4373:10:4373:11 | in : Builder [<element>] : String | Test.java:4373:10:4373:38 | createPredicatedMultiSet(...) : MultiSet [<element>] : String | provenance | MaD:105 |
 | Test.java:4373:10:4373:38 | createPredicatedMultiSet(...) : MultiSet [<element>] : String | Test.java:4374:20:4374:22 | out : MultiSet [<element>] : String | provenance |  |
 | Test.java:4374:20:4374:22 | out : MultiSet [<element>] : String | Test.java:230:19:230:32 | it : MultiSet [<element>] : String | provenance |  |
-| Test.java:4374:20:4374:22 | out : MultiSet [<element>] : String | Test.java:4374:9:4374:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:4374:20:4374:22 | out : MultiSet [<element>] : String | Test.java:4374:9:4374:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:4379:18:4379:61 | newHashMultiSetWithElement(...) : HashMultiSet [<element>] : String | Test.java:4381:44:4381:45 | in : HashMultiSet [<element>] : String | provenance |  |
 | Test.java:4379:45:4379:60 | (...)... : String | Test.java:258:49:258:57 | element : String | provenance |  |
-| Test.java:4379:45:4379:60 | (...)... : String | Test.java:4379:18:4379:61 | newHashMultiSetWithElement(...) : HashMultiSet [<element>] : String | provenance | MaD:2 |
-| Test.java:4379:45:4379:60 | (...)... : String | Test.java:4379:18:4379:61 | newHashMultiSetWithElement(...) : HashMultiSet [<element>] : String | provenance | MaD:673 |
+| Test.java:4379:45:4379:60 | (...)... : String | Test.java:4379:18:4379:61 | newHashMultiSetWithElement(...) : HashMultiSet [<element>] : String | provenance | MaD:4 |
+| Test.java:4379:45:4379:60 | (...)... : String | Test.java:4379:18:4379:61 | newHashMultiSetWithElement(...) : HashMultiSet [<element>] : String | provenance | MaD:749 |
 | Test.java:4379:53:4379:60 | source(...) : Object | Test.java:4379:45:4379:60 | (...)... : String | provenance |  |
 | Test.java:4381:10:4381:46 | createPredicatedMultiSet(...) : MultiSet [<element>] : String | Test.java:4382:20:4382:22 | out : MultiSet [<element>] : String | provenance |  |
 | Test.java:4381:44:4381:45 | in : HashMultiSet [<element>] : String | Test.java:4381:10:4381:46 | createPredicatedMultiSet(...) : MultiSet [<element>] : String | provenance | MaD:104 |
 | Test.java:4382:20:4382:22 | out : MultiSet [<element>] : String | Test.java:230:19:230:32 | it : MultiSet [<element>] : String | provenance |  |
-| Test.java:4382:20:4382:22 | out : MultiSet [<element>] : String | Test.java:4382:9:4382:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:4382:20:4382:22 | out : MultiSet [<element>] : String | Test.java:4382:9:4382:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:4387:38:4387:96 | newPredicatedCollectionBuilderWithElement(...) : Builder [<element>] : String | Test.java:4388:10:4388:11 | in : Builder [<element>] : String | provenance |  |
 | Test.java:4387:80:4387:95 | (...)... : String | Test.java:264:80:264:88 | element : String | provenance |  |
-| Test.java:4387:80:4387:95 | (...)... : String | Test.java:4387:38:4387:96 | newPredicatedCollectionBuilderWithElement(...) : Builder [<element>] : String | provenance | MaD:97 |
+| Test.java:4387:80:4387:95 | (...)... : String | Test.java:4387:38:4387:96 | newPredicatedCollectionBuilderWithElement(...) : Builder [<element>] : String | provenance | MaD:98 |
 | Test.java:4387:88:4387:95 | source(...) : Object | Test.java:4387:80:4387:95 | (...)... : String | provenance |  |
-| Test.java:4388:10:4388:11 | in : Builder [<element>] : String | Test.java:4388:10:4388:39 | createPredicatedQueue(...) : Queue [<element>] : String | provenance | MaD:105 |
+| Test.java:4388:10:4388:11 | in : Builder [<element>] : String | Test.java:4388:10:4388:39 | createPredicatedQueue(...) : Queue [<element>] : String | provenance | MaD:107 |
 | Test.java:4388:10:4388:39 | createPredicatedQueue(...) : Queue [<element>] : String | Test.java:4389:20:4389:22 | out : Queue [<element>] : String | provenance |  |
 | Test.java:4389:20:4389:22 | out : Queue [<element>] : String | Test.java:230:19:230:32 | it : Queue [<element>] : String | provenance |  |
-| Test.java:4389:20:4389:22 | out : Queue [<element>] : String | Test.java:4389:9:4389:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:4389:20:4389:22 | out : Queue [<element>] : String | Test.java:4389:9:4389:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:4394:38:4394:96 | newPredicatedCollectionBuilderWithElement(...) : Builder [<element>] : String | Test.java:4395:10:4395:11 | in : Builder [<element>] : String | provenance |  |
 | Test.java:4394:80:4394:95 | (...)... : String | Test.java:264:80:264:88 | element : String | provenance |  |
-| Test.java:4394:80:4394:95 | (...)... : String | Test.java:4394:38:4394:96 | newPredicatedCollectionBuilderWithElement(...) : Builder [<element>] : String | provenance | MaD:97 |
+| Test.java:4394:80:4394:95 | (...)... : String | Test.java:4394:38:4394:96 | newPredicatedCollectionBuilderWithElement(...) : Builder [<element>] : String | provenance | MaD:98 |
 | Test.java:4394:88:4394:95 | source(...) : Object | Test.java:4394:80:4394:95 | (...)... : String | provenance |  |
-| Test.java:4395:10:4395:11 | in : Builder [<element>] : String | Test.java:4395:10:4395:35 | createPredicatedQueue(...) : Queue [<element>] : String | provenance | MaD:105 |
+| Test.java:4395:10:4395:11 | in : Builder [<element>] : String | Test.java:4395:10:4395:35 | createPredicatedQueue(...) : Queue [<element>] : String | provenance | MaD:107 |
 | Test.java:4395:10:4395:35 | createPredicatedQueue(...) : Queue [<element>] : String | Test.java:4396:20:4396:22 | out : Queue [<element>] : String | provenance |  |
 | Test.java:4396:20:4396:22 | out : Queue [<element>] : String | Test.java:230:19:230:32 | it : Queue [<element>] : String | provenance |  |
-| Test.java:4396:20:4396:22 | out : Queue [<element>] : String | Test.java:4396:9:4396:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:4396:20:4396:22 | out : Queue [<element>] : String | Test.java:4396:9:4396:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:4401:15:4401:63 | newCircularFifoQueueWithElement(...) : CircularFifoQueue [<element>] : String | Test.java:4403:41:4403:42 | in : CircularFifoQueue [<element>] : String | provenance |  |
 | Test.java:4401:47:4401:62 | (...)... : String | Test.java:253:59:253:67 | element : String | provenance |  |
-| Test.java:4401:47:4401:62 | (...)... : String | Test.java:4401:15:4401:63 | newCircularFifoQueueWithElement(...) : CircularFifoQueue [<element>] : String | provenance | MaD:2 |
+| Test.java:4401:47:4401:62 | (...)... : String | Test.java:4401:15:4401:63 | newCircularFifoQueueWithElement(...) : CircularFifoQueue [<element>] : String | provenance | MaD:4 |
 | Test.java:4401:55:4401:62 | source(...) : Object | Test.java:4401:47:4401:62 | (...)... : String | provenance |  |
 | Test.java:4403:10:4403:43 | createPredicatedQueue(...) : Queue [<element>] : String | Test.java:4404:20:4404:22 | out : Queue [<element>] : String | provenance |  |
 | Test.java:4403:41:4403:42 | in : CircularFifoQueue [<element>] : String | Test.java:4403:10:4403:43 | createPredicatedQueue(...) : Queue [<element>] : String | provenance | MaD:106 |
 | Test.java:4404:20:4404:22 | out : Queue [<element>] : String | Test.java:230:19:230:32 | it : Queue [<element>] : String | provenance |  |
-| Test.java:4404:20:4404:22 | out : Queue [<element>] : String | Test.java:4404:9:4404:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:4404:20:4404:22 | out : Queue [<element>] : String | Test.java:4404:9:4404:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:4409:38:4409:96 | newPredicatedCollectionBuilderWithElement(...) : Builder [<element>] : String | Test.java:4410:10:4410:11 | in : Builder [<element>] : String | provenance |  |
 | Test.java:4409:80:4409:95 | (...)... : String | Test.java:264:80:264:88 | element : String | provenance |  |
-| Test.java:4409:80:4409:95 | (...)... : String | Test.java:4409:38:4409:96 | newPredicatedCollectionBuilderWithElement(...) : Builder [<element>] : String | provenance | MaD:97 |
+| Test.java:4409:80:4409:95 | (...)... : String | Test.java:4409:38:4409:96 | newPredicatedCollectionBuilderWithElement(...) : Builder [<element>] : String | provenance | MaD:98 |
 | Test.java:4409:88:4409:95 | source(...) : Object | Test.java:4409:80:4409:95 | (...)... : String | provenance |  |
-| Test.java:4410:10:4410:11 | in : Builder [<element>] : String | Test.java:4410:10:4410:37 | createPredicatedSet(...) : Set [<element>] : String | provenance | MaD:107 |
+| Test.java:4410:10:4410:11 | in : Builder [<element>] : String | Test.java:4410:10:4410:37 | createPredicatedSet(...) : Set [<element>] : String | provenance | MaD:109 |
 | Test.java:4410:10:4410:37 | createPredicatedSet(...) : Set [<element>] : String | Test.java:4411:20:4411:22 | out : Set [<element>] : String | provenance |  |
 | Test.java:4411:20:4411:22 | out : Set [<element>] : String | Test.java:230:19:230:32 | it : Set [<element>] : String | provenance |  |
-| Test.java:4411:20:4411:22 | out : Set [<element>] : String | Test.java:4411:9:4411:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:4411:20:4411:22 | out : Set [<element>] : String | Test.java:4411:9:4411:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:4416:38:4416:96 | newPredicatedCollectionBuilderWithElement(...) : Builder [<element>] : String | Test.java:4417:10:4417:11 | in : Builder [<element>] : String | provenance |  |
 | Test.java:4416:80:4416:95 | (...)... : String | Test.java:264:80:264:88 | element : String | provenance |  |
-| Test.java:4416:80:4416:95 | (...)... : String | Test.java:4416:38:4416:96 | newPredicatedCollectionBuilderWithElement(...) : Builder [<element>] : String | provenance | MaD:97 |
+| Test.java:4416:80:4416:95 | (...)... : String | Test.java:4416:38:4416:96 | newPredicatedCollectionBuilderWithElement(...) : Builder [<element>] : String | provenance | MaD:98 |
 | Test.java:4416:88:4416:95 | source(...) : Object | Test.java:4416:80:4416:95 | (...)... : String | provenance |  |
-| Test.java:4417:10:4417:11 | in : Builder [<element>] : String | Test.java:4417:10:4417:33 | createPredicatedSet(...) : Set [<element>] : String | provenance | MaD:107 |
+| Test.java:4417:10:4417:11 | in : Builder [<element>] : String | Test.java:4417:10:4417:33 | createPredicatedSet(...) : Set [<element>] : String | provenance | MaD:109 |
 | Test.java:4417:10:4417:33 | createPredicatedSet(...) : Set [<element>] : String | Test.java:4418:20:4418:22 | out : Set [<element>] : String | provenance |  |
 | Test.java:4418:20:4418:22 | out : Set [<element>] : String | Test.java:230:19:230:32 | it : Set [<element>] : String | provenance |  |
-| Test.java:4418:20:4418:22 | out : Set [<element>] : String | Test.java:4418:9:4418:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:4418:20:4418:22 | out : Set [<element>] : String | Test.java:4418:9:4418:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:4423:13:4423:58 | newListOrderedSetWithElement(...) : ListOrderedSet [<element>] : String | Test.java:4425:39:4425:40 | in : ListOrderedSet [<element>] : String | provenance |  |
 | Test.java:4423:42:4423:57 | (...)... : String | Test.java:260:53:260:61 | element : String | provenance |  |
-| Test.java:4423:42:4423:57 | (...)... : String | Test.java:4423:13:4423:58 | newListOrderedSetWithElement(...) : ListOrderedSet [<element>] : String | provenance | MaD:2 |
+| Test.java:4423:42:4423:57 | (...)... : String | Test.java:4423:13:4423:58 | newListOrderedSetWithElement(...) : ListOrderedSet [<element>] : String | provenance | MaD:4 |
 | Test.java:4423:50:4423:57 | source(...) : Object | Test.java:4423:42:4423:57 | (...)... : String | provenance |  |
 | Test.java:4425:10:4425:41 | createPredicatedSet(...) : Set [<element>] : String | Test.java:4426:20:4426:22 | out : Set [<element>] : String | provenance |  |
 | Test.java:4425:39:4425:40 | in : ListOrderedSet [<element>] : String | Test.java:4425:10:4425:41 | createPredicatedSet(...) : Set [<element>] : String | provenance | MaD:108 |
 | Test.java:4426:20:4426:22 | out : Set [<element>] : String | Test.java:230:19:230:32 | it : Set [<element>] : String | provenance |  |
-| Test.java:4426:20:4426:22 | out : Set [<element>] : String | Test.java:4426:9:4426:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:4426:20:4426:22 | out : Set [<element>] : String | Test.java:4426:9:4426:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:4431:38:4431:96 | newPredicatedCollectionBuilderWithElement(...) : Builder [<element>] : String | Test.java:4432:10:4432:11 | in : Builder [<element>] : String | provenance |  |
 | Test.java:4431:80:4431:95 | (...)... : String | Test.java:264:80:264:88 | element : String | provenance |  |
-| Test.java:4431:80:4431:95 | (...)... : String | Test.java:4431:38:4431:96 | newPredicatedCollectionBuilderWithElement(...) : Builder [<element>] : String | provenance | MaD:97 |
+| Test.java:4431:80:4431:95 | (...)... : String | Test.java:4431:38:4431:96 | newPredicatedCollectionBuilderWithElement(...) : Builder [<element>] : String | provenance | MaD:98 |
 | Test.java:4431:88:4431:95 | source(...) : Object | Test.java:4431:80:4431:95 | (...)... : String | provenance |  |
-| Test.java:4432:10:4432:11 | in : Builder [<element>] : String | Test.java:4432:10:4432:30 | rejectedElements(...) : Collection [<element>] : String | provenance | MaD:109 |
+| Test.java:4432:10:4432:11 | in : Builder [<element>] : String | Test.java:4432:10:4432:30 | rejectedElements(...) : Collection [<element>] : String | provenance | MaD:110 |
 | Test.java:4432:10:4432:30 | rejectedElements(...) : Collection [<element>] : String | Test.java:4433:20:4433:22 | out : Collection [<element>] : String | provenance |  |
 | Test.java:4433:20:4433:22 | out : Collection [<element>] : String | Test.java:230:19:230:32 | it : Collection [<element>] : String | provenance |  |
-| Test.java:4433:20:4433:22 | out : Collection [<element>] : String | Test.java:4433:9:4433:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:4433:20:4433:22 | out : Collection [<element>] : String | Test.java:4433:9:4433:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:4438:20:4438:58 | newTreeBagWithElement(...) : TreeBag [<element>] : String | Test.java:4439:52:4439:53 | in : TreeBag [<element>] : String | provenance |  |
 | Test.java:4438:42:4438:57 | (...)... : String | Test.java:267:39:267:47 | element : String | provenance |  |
-| Test.java:4438:42:4438:57 | (...)... : String | Test.java:4438:20:4438:58 | newTreeBagWithElement(...) : TreeBag [<element>] : String | provenance | MaD:2 |
-| Test.java:4438:42:4438:57 | (...)... : String | Test.java:4438:20:4438:58 | newTreeBagWithElement(...) : TreeBag [<element>] : String | provenance | MaD:395 |
+| Test.java:4438:42:4438:57 | (...)... : String | Test.java:4438:20:4438:58 | newTreeBagWithElement(...) : TreeBag [<element>] : String | provenance | MaD:4 |
+| Test.java:4438:42:4438:57 | (...)... : String | Test.java:4438:20:4438:58 | newTreeBagWithElement(...) : TreeBag [<element>] : String | provenance | MaD:470 |
 | Test.java:4438:50:4438:57 | source(...) : Object | Test.java:4438:42:4438:57 | (...)... : String | provenance |  |
 | Test.java:4439:10:4439:60 | predicatedCollection(...) : PredicatedCollection [<element>] : String | Test.java:4440:20:4440:22 | out : PredicatedCollection [<element>] : String | provenance |  |
-| Test.java:4439:52:4439:53 | in : TreeBag [<element>] : String | Test.java:4439:10:4439:60 | predicatedCollection(...) : PredicatedCollection [<element>] : String | provenance | MaD:96 |
+| Test.java:4439:52:4439:53 | in : TreeBag [<element>] : String | Test.java:4439:10:4439:60 | predicatedCollection(...) : PredicatedCollection [<element>] : String | provenance | MaD:111 |
 | Test.java:4440:20:4440:22 | out : PredicatedCollection [<element>] : String | Test.java:230:19:230:32 | it : PredicatedCollection [<element>] : String | provenance |  |
-| Test.java:4440:20:4440:22 | out : PredicatedCollection [<element>] : String | Test.java:4440:9:4440:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:4440:20:4440:22 | out : PredicatedCollection [<element>] : String | Test.java:4440:9:4440:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:4445:20:4445:58 | newTreeBagWithElement(...) : TreeBag [<element>] : String | Test.java:4446:56:4446:57 | in : TreeBag [<element>] : String | provenance |  |
 | Test.java:4445:42:4445:57 | (...)... : String | Test.java:267:39:267:47 | element : String | provenance |  |
-| Test.java:4445:42:4445:57 | (...)... : String | Test.java:4445:20:4445:58 | newTreeBagWithElement(...) : TreeBag [<element>] : String | provenance | MaD:2 |
-| Test.java:4445:42:4445:57 | (...)... : String | Test.java:4445:20:4445:58 | newTreeBagWithElement(...) : TreeBag [<element>] : String | provenance | MaD:395 |
+| Test.java:4445:42:4445:57 | (...)... : String | Test.java:4445:20:4445:58 | newTreeBagWithElement(...) : TreeBag [<element>] : String | provenance | MaD:4 |
+| Test.java:4445:42:4445:57 | (...)... : String | Test.java:4445:20:4445:58 | newTreeBagWithElement(...) : TreeBag [<element>] : String | provenance | MaD:470 |
 | Test.java:4445:50:4445:57 | source(...) : Object | Test.java:4445:42:4445:57 | (...)... : String | provenance |  |
 | Test.java:4446:10:4446:58 | synchronizedCollection(...) : SynchronizedCollection [<element>] : String | Test.java:4447:20:4447:22 | out : SynchronizedCollection [<element>] : String | provenance |  |
-| Test.java:4446:56:4446:57 | in : TreeBag [<element>] : String | Test.java:4446:10:4446:58 | synchronizedCollection(...) : SynchronizedCollection [<element>] : String | provenance | MaD:110 |
+| Test.java:4446:56:4446:57 | in : TreeBag [<element>] : String | Test.java:4446:10:4446:58 | synchronizedCollection(...) : SynchronizedCollection [<element>] : String | provenance | MaD:112 |
 | Test.java:4447:20:4447:22 | out : SynchronizedCollection [<element>] : String | Test.java:230:19:230:32 | it : SynchronizedCollection [<element>] : String | provenance |  |
-| Test.java:4447:20:4447:22 | out : SynchronizedCollection [<element>] : String | Test.java:4447:9:4447:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:4447:20:4447:22 | out : SynchronizedCollection [<element>] : String | Test.java:4447:9:4447:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:4452:20:4452:58 | newTreeBagWithElement(...) : TreeBag [<element>] : String | Test.java:4453:55:4453:56 | in : TreeBag [<element>] : String | provenance |  |
 | Test.java:4452:42:4452:57 | (...)... : String | Test.java:267:39:267:47 | element : String | provenance |  |
-| Test.java:4452:42:4452:57 | (...)... : String | Test.java:4452:20:4452:58 | newTreeBagWithElement(...) : TreeBag [<element>] : String | provenance | MaD:2 |
-| Test.java:4452:42:4452:57 | (...)... : String | Test.java:4452:20:4452:58 | newTreeBagWithElement(...) : TreeBag [<element>] : String | provenance | MaD:395 |
+| Test.java:4452:42:4452:57 | (...)... : String | Test.java:4452:20:4452:58 | newTreeBagWithElement(...) : TreeBag [<element>] : String | provenance | MaD:4 |
+| Test.java:4452:42:4452:57 | (...)... : String | Test.java:4452:20:4452:58 | newTreeBagWithElement(...) : TreeBag [<element>] : String | provenance | MaD:470 |
 | Test.java:4452:50:4452:57 | source(...) : Object | Test.java:4452:42:4452:57 | (...)... : String | provenance |  |
 | Test.java:4453:10:4453:63 | transformingCollection(...) : TransformedCollection [<element>] : String | Test.java:4454:20:4454:22 | out : TransformedCollection [<element>] : String | provenance |  |
-| Test.java:4453:55:4453:56 | in : TreeBag [<element>] : String | Test.java:4453:10:4453:63 | transformingCollection(...) : TransformedCollection [<element>] : String | provenance | MaD:111 |
+| Test.java:4453:55:4453:56 | in : TreeBag [<element>] : String | Test.java:4453:10:4453:63 | transformingCollection(...) : TransformedCollection [<element>] : String | provenance | MaD:113 |
 | Test.java:4454:20:4454:22 | out : TransformedCollection [<element>] : String | Test.java:230:19:230:32 | it : TransformedCollection [<element>] : String | provenance |  |
-| Test.java:4454:20:4454:22 | out : TransformedCollection [<element>] : String | Test.java:4454:9:4454:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:4454:20:4454:22 | out : TransformedCollection [<element>] : String | Test.java:4454:9:4454:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:4459:20:4459:58 | newTreeBagWithElement(...) : TreeBag [<element>] : String | Test.java:4460:70:4460:71 | in : TreeBag [<element>] : String | provenance |  |
 | Test.java:4459:42:4459:57 | (...)... : String | Test.java:267:39:267:47 | element : String | provenance |  |
-| Test.java:4459:42:4459:57 | (...)... : String | Test.java:4459:20:4459:58 | newTreeBagWithElement(...) : TreeBag [<element>] : String | provenance | MaD:2 |
-| Test.java:4459:42:4459:57 | (...)... : String | Test.java:4459:20:4459:58 | newTreeBagWithElement(...) : TreeBag [<element>] : String | provenance | MaD:395 |
+| Test.java:4459:42:4459:57 | (...)... : String | Test.java:4459:20:4459:58 | newTreeBagWithElement(...) : TreeBag [<element>] : String | provenance | MaD:4 |
+| Test.java:4459:42:4459:57 | (...)... : String | Test.java:4459:20:4459:58 | newTreeBagWithElement(...) : TreeBag [<element>] : String | provenance | MaD:470 |
 | Test.java:4459:50:4459:57 | source(...) : Object | Test.java:4459:42:4459:57 | (...)... : String | provenance |  |
 | Test.java:4460:10:4460:72 | unmodifiableBoundedCollection(...) : BoundedCollection [<element>] : String | Test.java:4461:20:4461:22 | out : BoundedCollection [<element>] : String | provenance |  |
-| Test.java:4460:70:4460:71 | in : TreeBag [<element>] : String | Test.java:4460:10:4460:72 | unmodifiableBoundedCollection(...) : BoundedCollection [<element>] : String | provenance | MaD:112 |
+| Test.java:4460:70:4460:71 | in : TreeBag [<element>] : String | Test.java:4460:10:4460:72 | unmodifiableBoundedCollection(...) : BoundedCollection [<element>] : String | provenance | MaD:114 |
 | Test.java:4461:20:4461:22 | out : BoundedCollection [<element>] : String | Test.java:230:19:230:32 | it : BoundedCollection [<element>] : String | provenance |  |
-| Test.java:4461:20:4461:22 | out : BoundedCollection [<element>] : String | Test.java:4461:9:4461:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:4461:20:4461:22 | out : BoundedCollection [<element>] : String | Test.java:4461:9:4461:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:4466:27:4466:75 | newCircularFifoQueueWithElement(...) : CircularFifoQueue [<element>] : String | Test.java:4467:70:4467:71 | in : CircularFifoQueue [<element>] : String | provenance |  |
 | Test.java:4466:59:4466:74 | (...)... : String | Test.java:253:59:253:67 | element : String | provenance |  |
-| Test.java:4466:59:4466:74 | (...)... : String | Test.java:4466:27:4466:75 | newCircularFifoQueueWithElement(...) : CircularFifoQueue [<element>] : String | provenance | MaD:2 |
+| Test.java:4466:59:4466:74 | (...)... : String | Test.java:4466:27:4466:75 | newCircularFifoQueueWithElement(...) : CircularFifoQueue [<element>] : String | provenance | MaD:4 |
 | Test.java:4466:67:4466:74 | source(...) : Object | Test.java:4466:59:4466:74 | (...)... : String | provenance |  |
 | Test.java:4467:10:4467:72 | unmodifiableBoundedCollection(...) : BoundedCollection [<element>] : String | Test.java:4468:20:4468:22 | out : BoundedCollection [<element>] : String | provenance |  |
-| Test.java:4467:70:4467:71 | in : CircularFifoQueue [<element>] : String | Test.java:4467:10:4467:72 | unmodifiableBoundedCollection(...) : BoundedCollection [<element>] : String | provenance | MaD:112 |
+| Test.java:4467:70:4467:71 | in : CircularFifoQueue [<element>] : String | Test.java:4467:10:4467:72 | unmodifiableBoundedCollection(...) : BoundedCollection [<element>] : String | provenance | MaD:114 |
 | Test.java:4468:20:4468:22 | out : BoundedCollection [<element>] : String | Test.java:230:19:230:32 | it : BoundedCollection [<element>] : String | provenance |  |
-| Test.java:4468:20:4468:22 | out : BoundedCollection [<element>] : String | Test.java:4468:9:4468:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:4468:20:4468:22 | out : BoundedCollection [<element>] : String | Test.java:4468:9:4468:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:4473:20:4473:58 | newTreeBagWithElement(...) : TreeBag [<element>] : String | Test.java:4474:56:4474:57 | in : TreeBag [<element>] : String | provenance |  |
 | Test.java:4473:42:4473:57 | (...)... : String | Test.java:267:39:267:47 | element : String | provenance |  |
-| Test.java:4473:42:4473:57 | (...)... : String | Test.java:4473:20:4473:58 | newTreeBagWithElement(...) : TreeBag [<element>] : String | provenance | MaD:2 |
-| Test.java:4473:42:4473:57 | (...)... : String | Test.java:4473:20:4473:58 | newTreeBagWithElement(...) : TreeBag [<element>] : String | provenance | MaD:395 |
+| Test.java:4473:42:4473:57 | (...)... : String | Test.java:4473:20:4473:58 | newTreeBagWithElement(...) : TreeBag [<element>] : String | provenance | MaD:4 |
+| Test.java:4473:42:4473:57 | (...)... : String | Test.java:4473:20:4473:58 | newTreeBagWithElement(...) : TreeBag [<element>] : String | provenance | MaD:470 |
 | Test.java:4473:50:4473:57 | source(...) : Object | Test.java:4473:42:4473:57 | (...)... : String | provenance |  |
 | Test.java:4474:10:4474:58 | unmodifiableCollection(...) : Collection [<element>] : String | Test.java:4475:20:4475:22 | out : Collection [<element>] : String | provenance |  |
-| Test.java:4474:56:4474:57 | in : TreeBag [<element>] : String | Test.java:4474:10:4474:58 | unmodifiableCollection(...) : Collection [<element>] : String | provenance | MaD:113 |
+| Test.java:4474:56:4474:57 | in : TreeBag [<element>] : String | Test.java:4474:10:4474:58 | unmodifiableCollection(...) : Collection [<element>] : String | provenance | MaD:115 |
 | Test.java:4475:20:4475:22 | out : Collection [<element>] : String | Test.java:230:19:230:32 | it : Collection [<element>] : String | provenance |  |
-| Test.java:4475:20:4475:22 | out : Collection [<element>] : String | Test.java:4475:9:4475:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:4475:20:4475:22 | out : Collection [<element>] : String | Test.java:4475:9:4475:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:4480:18:4480:61 | newListIteratorWithElement(...) : ListIterator [<element>] : String | Test.java:4481:42:4481:43 | in : ListIterator [<element>] : String | provenance |  |
 | Test.java:4480:45:4480:60 | (...)... : String | Test.java:259:49:259:57 | element : String | provenance |  |
-| Test.java:4480:45:4480:60 | (...)... : String | Test.java:4480:18:4480:61 | newListIteratorWithElement(...) : ListIterator [<element>] : String | provenance | MaD:2 |
+| Test.java:4480:45:4480:60 | (...)... : String | Test.java:4480:18:4480:61 | newListIteratorWithElement(...) : ListIterator [<element>] : String | provenance | MaD:4 |
 | Test.java:4480:53:4480:60 | source(...) : Object | Test.java:4480:45:4480:60 | (...)... : String | provenance |  |
 | Test.java:4481:10:4481:44 | new MyAbstractIteratorDecorator<>(...) : MyAbstractIteratorDecorator [<element>] : String | Test.java:4482:20:4482:22 | out : MyAbstractIteratorDecorator [<element>] : String | provenance |  |
-| Test.java:4481:42:4481:43 | in : ListIterator [<element>] : String | Test.java:4481:10:4481:44 | new MyAbstractIteratorDecorator<>(...) : MyAbstractIteratorDecorator [<element>] : String | provenance | MaD:114 |
+| Test.java:4481:42:4481:43 | in : ListIterator [<element>] : String | Test.java:4481:10:4481:44 | new MyAbstractIteratorDecorator<>(...) : MyAbstractIteratorDecorator [<element>] : String | provenance | MaD:116 |
 | Test.java:4481:42:4481:43 | in : ListIterator [<element>] : String | Test.java:7161:38:7161:63 | iterator : ListIterator [<element>] : String | provenance |  |
 | Test.java:4482:20:4482:22 | out : MyAbstractIteratorDecorator [<element>] : String | Test.java:231:19:231:32 | it : MyAbstractIteratorDecorator [<element>] : String | provenance |  |
-| Test.java:4482:20:4482:22 | out : MyAbstractIteratorDecorator [<element>] : String | Test.java:4482:9:4482:23 | getElement(...) | provenance | MaD:4 |
+| Test.java:4482:20:4482:22 | out : MyAbstractIteratorDecorator [<element>] : String | Test.java:4482:9:4482:23 | getElement(...) | provenance | MaD:6 |
 | Test.java:4487:22:4487:65 | newListIteratorWithElement(...) : ListIterator [<element>] : String | Test.java:4488:46:4488:47 | in : ListIterator [<element>] : String | provenance |  |
 | Test.java:4487:49:4487:64 | (...)... : String | Test.java:259:49:259:57 | element : String | provenance |  |
-| Test.java:4487:49:4487:64 | (...)... : String | Test.java:4487:22:4487:65 | newListIteratorWithElement(...) : ListIterator [<element>] : String | provenance | MaD:2 |
+| Test.java:4487:49:4487:64 | (...)... : String | Test.java:4487:22:4487:65 | newListIteratorWithElement(...) : ListIterator [<element>] : String | provenance | MaD:4 |
 | Test.java:4487:57:4487:64 | source(...) : Object | Test.java:4487:49:4487:64 | (...)... : String | provenance |  |
 | Test.java:4488:10:4488:48 | new MyAbstractListIteratorDecorator<>(...) : MyAbstractListIteratorDecorator [<element>] : String | Test.java:4489:20:4489:22 | out : MyAbstractListIteratorDecorator [<element>] : String | provenance |  |
-| Test.java:4488:46:4488:47 | in : ListIterator [<element>] : String | Test.java:4488:10:4488:48 | new MyAbstractListIteratorDecorator<>(...) : MyAbstractListIteratorDecorator [<element>] : String | provenance | MaD:115 |
+| Test.java:4488:46:4488:47 | in : ListIterator [<element>] : String | Test.java:4488:10:4488:48 | new MyAbstractListIteratorDecorator<>(...) : MyAbstractListIteratorDecorator [<element>] : String | provenance | MaD:117 |
 | Test.java:4488:46:4488:47 | in : ListIterator [<element>] : String | Test.java:7167:42:7167:71 | iterator : ListIterator [<element>] : String | provenance |  |
 | Test.java:4489:20:4489:22 | out : MyAbstractListIteratorDecorator [<element>] : String | Test.java:231:19:231:32 | it : MyAbstractListIteratorDecorator [<element>] : String | provenance |  |
-| Test.java:4489:20:4489:22 | out : MyAbstractListIteratorDecorator [<element>] : String | Test.java:4489:9:4489:23 | getElement(...) | provenance | MaD:4 |
+| Test.java:4489:20:4489:22 | out : MyAbstractListIteratorDecorator [<element>] : String | Test.java:4489:9:4489:23 | getElement(...) | provenance | MaD:6 |
 | Test.java:4494:41:4494:121 | new MyAbstractListIteratorDecorator<>(...) : MyAbstractListIteratorDecorator [<element>] : String | Test.java:4495:10:4495:11 | in : MyAbstractListIteratorDecorator [<element>] : String | provenance |  |
-| Test.java:4494:77:4494:120 | newListIteratorWithElement(...) : ListIterator [<element>] : String | Test.java:4494:41:4494:121 | new MyAbstractListIteratorDecorator<>(...) : MyAbstractListIteratorDecorator [<element>] : String | provenance | MaD:115 |
+| Test.java:4494:77:4494:120 | newListIteratorWithElement(...) : ListIterator [<element>] : String | Test.java:4494:41:4494:121 | new MyAbstractListIteratorDecorator<>(...) : MyAbstractListIteratorDecorator [<element>] : String | provenance | MaD:117 |
 | Test.java:4494:77:4494:120 | newListIteratorWithElement(...) : ListIterator [<element>] : String | Test.java:7167:42:7167:71 | iterator : ListIterator [<element>] : String | provenance |  |
 | Test.java:4494:104:4494:119 | (...)... : String | Test.java:259:49:259:57 | element : String | provenance |  |
-| Test.java:4494:104:4494:119 | (...)... : String | Test.java:4494:77:4494:120 | newListIteratorWithElement(...) : ListIterator [<element>] : String | provenance | MaD:2 |
+| Test.java:4494:104:4494:119 | (...)... : String | Test.java:4494:77:4494:120 | newListIteratorWithElement(...) : ListIterator [<element>] : String | provenance | MaD:4 |
 | Test.java:4494:112:4494:119 | source(...) : Object | Test.java:4494:104:4494:119 | (...)... : String | provenance |  |
-| Test.java:4495:10:4495:11 | in : MyAbstractListIteratorDecorator [<element>] : String | Test.java:4495:10:4495:31 | myGetListIterator(...) : ListIterator [<element>] : String | provenance | MaD:116 |
+| Test.java:4495:10:4495:11 | in : MyAbstractListIteratorDecorator [<element>] : String | Test.java:4495:10:4495:31 | myGetListIterator(...) : ListIterator [<element>] : String | provenance | MaD:118 |
 | Test.java:4495:10:4495:11 | in : MyAbstractListIteratorDecorator [<element>] : String | Test.java:7170:26:7170:42 | parameter this : MyAbstractListIteratorDecorator [<element>] : String | provenance |  |
 | Test.java:4495:10:4495:31 | myGetListIterator(...) : ListIterator [<element>] : String | Test.java:4496:20:4496:22 | out : ListIterator [<element>] : String | provenance |  |
 | Test.java:4496:20:4496:22 | out : ListIterator [<element>] : String | Test.java:231:19:231:32 | it : ListIterator [<element>] : String | provenance |  |
-| Test.java:4496:20:4496:22 | out : ListIterator [<element>] : String | Test.java:4496:9:4496:23 | getElement(...) | provenance | MaD:4 |
-| Test.java:4501:21:4501:60 | newLinkedMapWithMapKey(...) : LinkedMap [<map.key>] : String | Test.java:4501:21:4501:74 | mapIterator(...) : OrderedMapIterator [<element>] : String | provenance | MaD:487 |
+| Test.java:4496:20:4496:22 | out : ListIterator [<element>] : String | Test.java:4496:9:4496:23 | getElement(...) | provenance | MaD:6 |
+| Test.java:4501:21:4501:60 | newLinkedMapWithMapKey(...) : LinkedMap [<map.key>] : String | Test.java:4501:21:4501:74 | mapIterator(...) : OrderedMapIterator [<element>] : String | provenance | MaD:562 |
 | Test.java:4501:21:4501:74 | mapIterator(...) : OrderedMapIterator [<element>] : String | Test.java:4502:45:4502:46 | in : OrderedMapIterator [<element>] : String | provenance |  |
 | Test.java:4501:44:4501:59 | (...)... : String | Test.java:276:49:276:53 | key : String | provenance |  |
-| Test.java:4501:44:4501:59 | (...)... : String | Test.java:4501:21:4501:60 | newLinkedMapWithMapKey(...) : LinkedMap [<map.key>] : String | provenance | MaD:11 |
+| Test.java:4501:44:4501:59 | (...)... : String | Test.java:4501:21:4501:60 | newLinkedMapWithMapKey(...) : LinkedMap [<map.key>] : String | provenance | MaD:13 |
 | Test.java:4501:52:4501:59 | source(...) : Object | Test.java:4501:44:4501:59 | (...)... : String | provenance |  |
 | Test.java:4502:10:4502:47 | new MyAbstractMapIteratorDecorator<>(...) : MyAbstractMapIteratorDecorator [<element>] : String | Test.java:4503:20:4503:22 | out : MyAbstractMapIteratorDecorator [<element>] : String | provenance |  |
-| Test.java:4502:45:4502:46 | in : OrderedMapIterator [<element>] : String | Test.java:4502:10:4502:47 | new MyAbstractMapIteratorDecorator<>(...) : MyAbstractMapIteratorDecorator [<element>] : String | provenance | MaD:117 |
+| Test.java:4502:45:4502:46 | in : OrderedMapIterator [<element>] : String | Test.java:4502:10:4502:47 | new MyAbstractMapIteratorDecorator<>(...) : MyAbstractMapIteratorDecorator [<element>] : String | provenance | MaD:119 |
 | Test.java:4502:45:4502:46 | in : OrderedMapIterator [<element>] : String | Test.java:7176:41:7176:72 | iterator : OrderedMapIterator [<element>] : String | provenance |  |
 | Test.java:4503:20:4503:22 | out : MyAbstractMapIteratorDecorator [<element>] : String | Test.java:231:19:231:32 | it : MyAbstractMapIteratorDecorator [<element>] : String | provenance |  |
-| Test.java:4503:20:4503:22 | out : MyAbstractMapIteratorDecorator [<element>] : String | Test.java:4503:9:4503:23 | getElement(...) | provenance | MaD:4 |
-| Test.java:4508:21:4508:62 | newLinkedMapWithMapValue(...) : LinkedMap [<map.value>] : String | Test.java:4508:21:4508:76 | mapIterator(...) : OrderedMapIterator [<map.value>] : String | provenance | MaD:488 |
+| Test.java:4503:20:4503:22 | out : MyAbstractMapIteratorDecorator [<element>] : String | Test.java:4503:9:4503:23 | getElement(...) | provenance | MaD:6 |
+| Test.java:4508:21:4508:62 | newLinkedMapWithMapValue(...) : LinkedMap [<map.value>] : String | Test.java:4508:21:4508:76 | mapIterator(...) : OrderedMapIterator [<map.value>] : String | provenance | MaD:563 |
 | Test.java:4508:21:4508:76 | mapIterator(...) : OrderedMapIterator [<map.value>] : String | Test.java:4509:45:4509:46 | in : OrderedMapIterator [<map.value>] : String | provenance |  |
 | Test.java:4508:46:4508:61 | (...)... : String | Test.java:295:51:295:57 | value : String | provenance |  |
-| Test.java:4508:46:4508:61 | (...)... : String | Test.java:4508:21:4508:62 | newLinkedMapWithMapValue(...) : LinkedMap [<map.value>] : String | provenance | MaD:12 |
+| Test.java:4508:46:4508:61 | (...)... : String | Test.java:4508:21:4508:62 | newLinkedMapWithMapValue(...) : LinkedMap [<map.value>] : String | provenance | MaD:14 |
 | Test.java:4508:54:4508:61 | source(...) : Object | Test.java:4508:46:4508:61 | (...)... : String | provenance |  |
 | Test.java:4509:10:4509:47 | new MyAbstractMapIteratorDecorator<>(...) : MyAbstractMapIteratorDecorator [<map.value>] : String | Test.java:4510:21:4510:23 | out : MyAbstractMapIteratorDecorator [<map.value>] : String | provenance |  |
-| Test.java:4509:45:4509:46 | in : OrderedMapIterator [<map.value>] : String | Test.java:4509:10:4509:47 | new MyAbstractMapIteratorDecorator<>(...) : MyAbstractMapIteratorDecorator [<map.value>] : String | provenance | MaD:118 |
+| Test.java:4509:45:4509:46 | in : OrderedMapIterator [<map.value>] : String | Test.java:4509:10:4509:47 | new MyAbstractMapIteratorDecorator<>(...) : MyAbstractMapIteratorDecorator [<map.value>] : String | provenance | MaD:120 |
 | Test.java:4509:45:4509:46 | in : OrderedMapIterator [<map.value>] : String | Test.java:7176:41:7176:72 | iterator : OrderedMapIterator [<map.value>] : String | provenance |  |
 | Test.java:4510:21:4510:23 | out : MyAbstractMapIteratorDecorator [<map.value>] : String | Test.java:246:20:246:47 | mapIterator : MyAbstractMapIteratorDecorator [<map.value>] : String | provenance |  |
-| Test.java:4510:21:4510:23 | out : MyAbstractMapIteratorDecorator [<map.value>] : String | Test.java:4510:9:4510:24 | getMapValue(...) | provenance | MaD:598 |
+| Test.java:4510:21:4510:23 | out : MyAbstractMapIteratorDecorator [<map.value>] : String | Test.java:4510:9:4510:24 | getMapValue(...) | provenance | MaD:673 |
 | Test.java:4515:40:4515:129 | new MyAbstractMapIteratorDecorator<>(...) : MyAbstractMapIteratorDecorator [<element>] : String | Test.java:4516:10:4516:11 | in : MyAbstractMapIteratorDecorator [<element>] : String | provenance |  |
-| Test.java:4515:75:4515:114 | newLinkedMapWithMapKey(...) : LinkedMap [<map.key>] : String | Test.java:4515:75:4515:128 | mapIterator(...) : OrderedMapIterator [<element>] : String | provenance | MaD:487 |
-| Test.java:4515:75:4515:128 | mapIterator(...) : OrderedMapIterator [<element>] : String | Test.java:4515:40:4515:129 | new MyAbstractMapIteratorDecorator<>(...) : MyAbstractMapIteratorDecorator [<element>] : String | provenance | MaD:117 |
+| Test.java:4515:75:4515:114 | newLinkedMapWithMapKey(...) : LinkedMap [<map.key>] : String | Test.java:4515:75:4515:128 | mapIterator(...) : OrderedMapIterator [<element>] : String | provenance | MaD:562 |
+| Test.java:4515:75:4515:128 | mapIterator(...) : OrderedMapIterator [<element>] : String | Test.java:4515:40:4515:129 | new MyAbstractMapIteratorDecorator<>(...) : MyAbstractMapIteratorDecorator [<element>] : String | provenance | MaD:119 |
 | Test.java:4515:75:4515:128 | mapIterator(...) : OrderedMapIterator [<element>] : String | Test.java:7176:41:7176:72 | iterator : OrderedMapIterator [<element>] : String | provenance |  |
 | Test.java:4515:98:4515:113 | (...)... : String | Test.java:276:49:276:53 | key : String | provenance |  |
-| Test.java:4515:98:4515:113 | (...)... : String | Test.java:4515:75:4515:114 | newLinkedMapWithMapKey(...) : LinkedMap [<map.key>] : String | provenance | MaD:11 |
+| Test.java:4515:98:4515:113 | (...)... : String | Test.java:4515:75:4515:114 | newLinkedMapWithMapKey(...) : LinkedMap [<map.key>] : String | provenance | MaD:13 |
 | Test.java:4515:106:4515:113 | source(...) : Object | Test.java:4515:98:4515:113 | (...)... : String | provenance |  |
-| Test.java:4516:10:4516:11 | in : MyAbstractMapIteratorDecorator [<element>] : String | Test.java:4516:10:4516:30 | myGetMapIterator(...) : MapIterator [<element>] : String | provenance | MaD:119 |
+| Test.java:4516:10:4516:11 | in : MyAbstractMapIteratorDecorator [<element>] : String | Test.java:4516:10:4516:30 | myGetMapIterator(...) : MapIterator [<element>] : String | provenance | MaD:121 |
 | Test.java:4516:10:4516:11 | in : MyAbstractMapIteratorDecorator [<element>] : String | Test.java:7179:28:7179:43 | parameter this : MyAbstractMapIteratorDecorator [<element>] : String | provenance |  |
 | Test.java:4516:10:4516:30 | myGetMapIterator(...) : MapIterator [<element>] : String | Test.java:4517:20:4517:22 | out : MapIterator [<element>] : String | provenance |  |
 | Test.java:4517:20:4517:22 | out : MapIterator [<element>] : String | Test.java:231:19:231:32 | it : MapIterator [<element>] : String | provenance |  |
-| Test.java:4517:20:4517:22 | out : MapIterator [<element>] : String | Test.java:4517:9:4517:23 | getElement(...) | provenance | MaD:4 |
+| Test.java:4517:20:4517:22 | out : MapIterator [<element>] : String | Test.java:4517:9:4517:23 | getElement(...) | provenance | MaD:6 |
 | Test.java:4522:40:4522:131 | new MyAbstractMapIteratorDecorator<>(...) : MyAbstractMapIteratorDecorator [<map.value>] : String | Test.java:4523:10:4523:11 | in : MyAbstractMapIteratorDecorator [<map.value>] : String | provenance |  |
-| Test.java:4522:75:4522:116 | newLinkedMapWithMapValue(...) : LinkedMap [<map.value>] : String | Test.java:4522:75:4522:130 | mapIterator(...) : OrderedMapIterator [<map.value>] : String | provenance | MaD:488 |
-| Test.java:4522:75:4522:130 | mapIterator(...) : OrderedMapIterator [<map.value>] : String | Test.java:4522:40:4522:131 | new MyAbstractMapIteratorDecorator<>(...) : MyAbstractMapIteratorDecorator [<map.value>] : String | provenance | MaD:118 |
+| Test.java:4522:75:4522:116 | newLinkedMapWithMapValue(...) : LinkedMap [<map.value>] : String | Test.java:4522:75:4522:130 | mapIterator(...) : OrderedMapIterator [<map.value>] : String | provenance | MaD:563 |
+| Test.java:4522:75:4522:130 | mapIterator(...) : OrderedMapIterator [<map.value>] : String | Test.java:4522:40:4522:131 | new MyAbstractMapIteratorDecorator<>(...) : MyAbstractMapIteratorDecorator [<map.value>] : String | provenance | MaD:120 |
 | Test.java:4522:75:4522:130 | mapIterator(...) : OrderedMapIterator [<map.value>] : String | Test.java:7176:41:7176:72 | iterator : OrderedMapIterator [<map.value>] : String | provenance |  |
 | Test.java:4522:100:4522:115 | (...)... : String | Test.java:295:51:295:57 | value : String | provenance |  |
-| Test.java:4522:100:4522:115 | (...)... : String | Test.java:4522:75:4522:116 | newLinkedMapWithMapValue(...) : LinkedMap [<map.value>] : String | provenance | MaD:12 |
+| Test.java:4522:100:4522:115 | (...)... : String | Test.java:4522:75:4522:116 | newLinkedMapWithMapValue(...) : LinkedMap [<map.value>] : String | provenance | MaD:14 |
 | Test.java:4522:108:4522:115 | source(...) : Object | Test.java:4522:100:4522:115 | (...)... : String | provenance |  |
-| Test.java:4523:10:4523:11 | in : MyAbstractMapIteratorDecorator [<map.value>] : String | Test.java:4523:10:4523:30 | myGetMapIterator(...) : MapIterator [<map.value>] : String | provenance | MaD:120 |
+| Test.java:4523:10:4523:11 | in : MyAbstractMapIteratorDecorator [<map.value>] : String | Test.java:4523:10:4523:30 | myGetMapIterator(...) : MapIterator [<map.value>] : String | provenance | MaD:122 |
 | Test.java:4523:10:4523:11 | in : MyAbstractMapIteratorDecorator [<map.value>] : String | Test.java:7179:28:7179:43 | parameter this : MyAbstractMapIteratorDecorator [<map.value>] : String | provenance |  |
 | Test.java:4523:10:4523:30 | myGetMapIterator(...) : MapIterator [<map.value>] : String | Test.java:4524:21:4524:23 | out : MapIterator [<map.value>] : String | provenance |  |
 | Test.java:4524:21:4524:23 | out : MapIterator [<map.value>] : String | Test.java:246:20:246:47 | mapIterator : MapIterator [<map.value>] : String | provenance |  |
-| Test.java:4524:21:4524:23 | out : MapIterator [<map.value>] : String | Test.java:4524:9:4524:24 | getMapValue(...) | provenance | MaD:598 |
-| Test.java:4529:28:4529:72 | newListOrderedMapWithMapKey(...) : ListOrderedMap [<map.key>] : String | Test.java:4529:28:4529:86 | mapIterator(...) : OrderedMapIterator [<element>] : String | provenance | MaD:487 |
+| Test.java:4524:21:4524:23 | out : MapIterator [<map.value>] : String | Test.java:4524:9:4524:24 | getMapValue(...) | provenance | MaD:673 |
+| Test.java:4529:28:4529:72 | newListOrderedMapWithMapKey(...) : ListOrderedMap [<map.key>] : String | Test.java:4529:28:4529:86 | mapIterator(...) : OrderedMapIterator [<element>] : String | provenance | MaD:562 |
 | Test.java:4529:28:4529:86 | mapIterator(...) : OrderedMapIterator [<element>] : String | Test.java:4530:52:4530:53 | in : OrderedMapIterator [<element>] : String | provenance |  |
 | Test.java:4529:56:4529:71 | (...)... : String | Test.java:277:59:277:63 | key : String | provenance |  |
-| Test.java:4529:56:4529:71 | (...)... : String | Test.java:4529:28:4529:72 | newListOrderedMapWithMapKey(...) : ListOrderedMap [<map.key>] : String | provenance | MaD:11 |
+| Test.java:4529:56:4529:71 | (...)... : String | Test.java:4529:28:4529:72 | newListOrderedMapWithMapKey(...) : ListOrderedMap [<map.key>] : String | provenance | MaD:13 |
 | Test.java:4529:64:4529:71 | source(...) : Object | Test.java:4529:56:4529:71 | (...)... : String | provenance |  |
 | Test.java:4530:10:4530:54 | new MyAbstractOrderedMapIteratorDecorator<>(...) : MyAbstractOrderedMapIteratorDecorator [<element>] : String | Test.java:4531:20:4531:22 | out : MyAbstractOrderedMapIteratorDecorator [<element>] : String | provenance |  |
-| Test.java:4530:52:4530:53 | in : OrderedMapIterator [<element>] : String | Test.java:4530:10:4530:54 | new MyAbstractOrderedMapIteratorDecorator<>(...) : MyAbstractOrderedMapIteratorDecorator [<element>] : String | provenance | MaD:121 |
+| Test.java:4530:52:4530:53 | in : OrderedMapIterator [<element>] : String | Test.java:4530:10:4530:54 | new MyAbstractOrderedMapIteratorDecorator<>(...) : MyAbstractOrderedMapIteratorDecorator [<element>] : String | provenance | MaD:123 |
 | Test.java:4530:52:4530:53 | in : OrderedMapIterator [<element>] : String | Test.java:7185:48:7185:86 | iterator : OrderedMapIterator [<element>] : String | provenance |  |
 | Test.java:4531:20:4531:22 | out : MyAbstractOrderedMapIteratorDecorator [<element>] : String | Test.java:231:19:231:32 | it : MyAbstractOrderedMapIteratorDecorator [<element>] : String | provenance |  |
-| Test.java:4531:20:4531:22 | out : MyAbstractOrderedMapIteratorDecorator [<element>] : String | Test.java:4531:9:4531:23 | getElement(...) | provenance | MaD:4 |
-| Test.java:4536:28:4536:74 | newListOrderedMapWithMapValue(...) : ListOrderedMap [<map.value>] : String | Test.java:4536:28:4536:88 | mapIterator(...) : OrderedMapIterator [<map.value>] : String | provenance | MaD:488 |
+| Test.java:4531:20:4531:22 | out : MyAbstractOrderedMapIteratorDecorator [<element>] : String | Test.java:4531:9:4531:23 | getElement(...) | provenance | MaD:6 |
+| Test.java:4536:28:4536:74 | newListOrderedMapWithMapValue(...) : ListOrderedMap [<map.value>] : String | Test.java:4536:28:4536:88 | mapIterator(...) : OrderedMapIterator [<map.value>] : String | provenance | MaD:563 |
 | Test.java:4536:28:4536:88 | mapIterator(...) : OrderedMapIterator [<map.value>] : String | Test.java:4537:52:4537:53 | in : OrderedMapIterator [<map.value>] : String | provenance |  |
 | Test.java:4536:58:4536:73 | (...)... : String | Test.java:296:61:296:67 | value : String | provenance |  |
-| Test.java:4536:58:4536:73 | (...)... : String | Test.java:4536:28:4536:74 | newListOrderedMapWithMapValue(...) : ListOrderedMap [<map.value>] : String | provenance | MaD:12 |
+| Test.java:4536:58:4536:73 | (...)... : String | Test.java:4536:28:4536:74 | newListOrderedMapWithMapValue(...) : ListOrderedMap [<map.value>] : String | provenance | MaD:14 |
 | Test.java:4536:66:4536:73 | source(...) : Object | Test.java:4536:58:4536:73 | (...)... : String | provenance |  |
 | Test.java:4537:10:4537:54 | new MyAbstractOrderedMapIteratorDecorator<>(...) : MyAbstractOrderedMapIteratorDecorator [<map.value>] : String | Test.java:4538:21:4538:23 | out : MyAbstractOrderedMapIteratorDecorator [<map.value>] : String | provenance |  |
-| Test.java:4537:52:4537:53 | in : OrderedMapIterator [<map.value>] : String | Test.java:4537:10:4537:54 | new MyAbstractOrderedMapIteratorDecorator<>(...) : MyAbstractOrderedMapIteratorDecorator [<map.value>] : String | provenance | MaD:122 |
+| Test.java:4537:52:4537:53 | in : OrderedMapIterator [<map.value>] : String | Test.java:4537:10:4537:54 | new MyAbstractOrderedMapIteratorDecorator<>(...) : MyAbstractOrderedMapIteratorDecorator [<map.value>] : String | provenance | MaD:124 |
 | Test.java:4537:52:4537:53 | in : OrderedMapIterator [<map.value>] : String | Test.java:7185:48:7185:86 | iterator : OrderedMapIterator [<map.value>] : String | provenance |  |
 | Test.java:4538:21:4538:23 | out : MyAbstractOrderedMapIteratorDecorator [<map.value>] : String | Test.java:246:20:246:47 | mapIterator : MyAbstractOrderedMapIteratorDecorator [<map.value>] : String | provenance |  |
-| Test.java:4538:21:4538:23 | out : MyAbstractOrderedMapIteratorDecorator [<map.value>] : String | Test.java:4538:9:4538:24 | getMapValue(...) | provenance | MaD:598 |
+| Test.java:4538:21:4538:23 | out : MyAbstractOrderedMapIteratorDecorator [<map.value>] : String | Test.java:4538:9:4538:24 | getMapValue(...) | provenance | MaD:673 |
 | Test.java:4543:47:4543:148 | new MyAbstractOrderedMapIteratorDecorator<>(...) : MyAbstractOrderedMapIteratorDecorator [<element>] : String | Test.java:4544:10:4544:11 | in : MyAbstractOrderedMapIteratorDecorator [<element>] : String | provenance |  |
-| Test.java:4543:89:4543:133 | newListOrderedMapWithMapKey(...) : ListOrderedMap [<map.key>] : String | Test.java:4543:89:4543:147 | mapIterator(...) : OrderedMapIterator [<element>] : String | provenance | MaD:487 |
-| Test.java:4543:89:4543:147 | mapIterator(...) : OrderedMapIterator [<element>] : String | Test.java:4543:47:4543:148 | new MyAbstractOrderedMapIteratorDecorator<>(...) : MyAbstractOrderedMapIteratorDecorator [<element>] : String | provenance | MaD:121 |
+| Test.java:4543:89:4543:133 | newListOrderedMapWithMapKey(...) : ListOrderedMap [<map.key>] : String | Test.java:4543:89:4543:147 | mapIterator(...) : OrderedMapIterator [<element>] : String | provenance | MaD:562 |
+| Test.java:4543:89:4543:147 | mapIterator(...) : OrderedMapIterator [<element>] : String | Test.java:4543:47:4543:148 | new MyAbstractOrderedMapIteratorDecorator<>(...) : MyAbstractOrderedMapIteratorDecorator [<element>] : String | provenance | MaD:123 |
 | Test.java:4543:89:4543:147 | mapIterator(...) : OrderedMapIterator [<element>] : String | Test.java:7185:48:7185:86 | iterator : OrderedMapIterator [<element>] : String | provenance |  |
 | Test.java:4543:117:4543:132 | (...)... : String | Test.java:277:59:277:63 | key : String | provenance |  |
-| Test.java:4543:117:4543:132 | (...)... : String | Test.java:4543:89:4543:133 | newListOrderedMapWithMapKey(...) : ListOrderedMap [<map.key>] : String | provenance | MaD:11 |
+| Test.java:4543:117:4543:132 | (...)... : String | Test.java:4543:89:4543:133 | newListOrderedMapWithMapKey(...) : ListOrderedMap [<map.key>] : String | provenance | MaD:13 |
 | Test.java:4543:125:4543:132 | source(...) : Object | Test.java:4543:117:4543:132 | (...)... : String | provenance |  |
-| Test.java:4544:10:4544:11 | in : MyAbstractOrderedMapIteratorDecorator [<element>] : String | Test.java:4544:10:4544:37 | myGetOrderedMapIterator(...) : OrderedMapIterator [<element>] : String | provenance | MaD:123 |
+| Test.java:4544:10:4544:11 | in : MyAbstractOrderedMapIteratorDecorator [<element>] : String | Test.java:4544:10:4544:37 | myGetOrderedMapIterator(...) : OrderedMapIterator [<element>] : String | provenance | MaD:125 |
 | Test.java:4544:10:4544:11 | in : MyAbstractOrderedMapIteratorDecorator [<element>] : String | Test.java:7188:35:7188:57 | parameter this : MyAbstractOrderedMapIteratorDecorator [<element>] : String | provenance |  |
 | Test.java:4544:10:4544:37 | myGetOrderedMapIterator(...) : OrderedMapIterator [<element>] : String | Test.java:4545:20:4545:22 | out : OrderedMapIterator [<element>] : String | provenance |  |
 | Test.java:4545:20:4545:22 | out : OrderedMapIterator [<element>] : String | Test.java:231:19:231:32 | it : OrderedMapIterator [<element>] : String | provenance |  |
-| Test.java:4545:20:4545:22 | out : OrderedMapIterator [<element>] : String | Test.java:4545:9:4545:23 | getElement(...) | provenance | MaD:4 |
+| Test.java:4545:20:4545:22 | out : OrderedMapIterator [<element>] : String | Test.java:4545:9:4545:23 | getElement(...) | provenance | MaD:6 |
 | Test.java:4550:47:4550:150 | new MyAbstractOrderedMapIteratorDecorator<>(...) : MyAbstractOrderedMapIteratorDecorator [<map.value>] : String | Test.java:4551:10:4551:11 | in : MyAbstractOrderedMapIteratorDecorator [<map.value>] : String | provenance |  |
-| Test.java:4550:89:4550:135 | newListOrderedMapWithMapValue(...) : ListOrderedMap [<map.value>] : String | Test.java:4550:89:4550:149 | mapIterator(...) : OrderedMapIterator [<map.value>] : String | provenance | MaD:488 |
-| Test.java:4550:89:4550:149 | mapIterator(...) : OrderedMapIterator [<map.value>] : String | Test.java:4550:47:4550:150 | new MyAbstractOrderedMapIteratorDecorator<>(...) : MyAbstractOrderedMapIteratorDecorator [<map.value>] : String | provenance | MaD:122 |
+| Test.java:4550:89:4550:135 | newListOrderedMapWithMapValue(...) : ListOrderedMap [<map.value>] : String | Test.java:4550:89:4550:149 | mapIterator(...) : OrderedMapIterator [<map.value>] : String | provenance | MaD:563 |
+| Test.java:4550:89:4550:149 | mapIterator(...) : OrderedMapIterator [<map.value>] : String | Test.java:4550:47:4550:150 | new MyAbstractOrderedMapIteratorDecorator<>(...) : MyAbstractOrderedMapIteratorDecorator [<map.value>] : String | provenance | MaD:124 |
 | Test.java:4550:89:4550:149 | mapIterator(...) : OrderedMapIterator [<map.value>] : String | Test.java:7185:48:7185:86 | iterator : OrderedMapIterator [<map.value>] : String | provenance |  |
 | Test.java:4550:119:4550:134 | (...)... : String | Test.java:296:61:296:67 | value : String | provenance |  |
-| Test.java:4550:119:4550:134 | (...)... : String | Test.java:4550:89:4550:135 | newListOrderedMapWithMapValue(...) : ListOrderedMap [<map.value>] : String | provenance | MaD:12 |
+| Test.java:4550:119:4550:134 | (...)... : String | Test.java:4550:89:4550:135 | newListOrderedMapWithMapValue(...) : ListOrderedMap [<map.value>] : String | provenance | MaD:14 |
 | Test.java:4550:127:4550:134 | source(...) : Object | Test.java:4550:119:4550:134 | (...)... : String | provenance |  |
-| Test.java:4551:10:4551:11 | in : MyAbstractOrderedMapIteratorDecorator [<map.value>] : String | Test.java:4551:10:4551:37 | myGetOrderedMapIterator(...) : OrderedMapIterator [<map.value>] : String | provenance | MaD:124 |
+| Test.java:4551:10:4551:11 | in : MyAbstractOrderedMapIteratorDecorator [<map.value>] : String | Test.java:4551:10:4551:37 | myGetOrderedMapIterator(...) : OrderedMapIterator [<map.value>] : String | provenance | MaD:126 |
 | Test.java:4551:10:4551:11 | in : MyAbstractOrderedMapIteratorDecorator [<map.value>] : String | Test.java:7188:35:7188:57 | parameter this : MyAbstractOrderedMapIteratorDecorator [<map.value>] : String | provenance |  |
 | Test.java:4551:10:4551:37 | myGetOrderedMapIterator(...) : OrderedMapIterator [<map.value>] : String | Test.java:4552:21:4552:23 | out : OrderedMapIterator [<map.value>] : String | provenance |  |
 | Test.java:4552:21:4552:23 | out : OrderedMapIterator [<map.value>] : String | Test.java:246:20:246:47 | mapIterator : OrderedMapIterator [<map.value>] : String | provenance |  |
-| Test.java:4552:21:4552:23 | out : OrderedMapIterator [<map.value>] : String | Test.java:4552:9:4552:24 | getMapValue(...) | provenance | MaD:598 |
+| Test.java:4552:21:4552:23 | out : OrderedMapIterator [<map.value>] : String | Test.java:4552:9:4552:24 | getMapValue(...) | provenance | MaD:673 |
 | Test.java:4557:18:4557:61 | newListIteratorWithElement(...) : ListIterator [<element>] : String | Test.java:4558:49:4558:50 | in : ListIterator [<element>] : String | provenance |  |
 | Test.java:4557:45:4557:60 | (...)... : String | Test.java:259:49:259:57 | element : String | provenance |  |
-| Test.java:4557:45:4557:60 | (...)... : String | Test.java:4557:18:4557:61 | newListIteratorWithElement(...) : ListIterator [<element>] : String | provenance | MaD:2 |
+| Test.java:4557:45:4557:60 | (...)... : String | Test.java:4557:18:4557:61 | newListIteratorWithElement(...) : ListIterator [<element>] : String | provenance | MaD:4 |
 | Test.java:4557:53:4557:60 | source(...) : Object | Test.java:4557:45:4557:60 | (...)... : String | provenance |  |
 | Test.java:4558:10:4558:51 | new MyAbstractUntypedIteratorDecorator<>(...) : MyAbstractUntypedIteratorDecorator [<element>] : String | Test.java:4559:20:4559:22 | out : MyAbstractUntypedIteratorDecorator [<element>] : String | provenance |  |
-| Test.java:4558:49:4558:50 | in : ListIterator [<element>] : String | Test.java:4558:10:4558:51 | new MyAbstractUntypedIteratorDecorator<>(...) : MyAbstractUntypedIteratorDecorator [<element>] : String | provenance | MaD:125 |
+| Test.java:4558:49:4558:50 | in : ListIterator [<element>] : String | Test.java:4558:10:4558:51 | new MyAbstractUntypedIteratorDecorator<>(...) : MyAbstractUntypedIteratorDecorator [<element>] : String | provenance | MaD:127 |
 | Test.java:4558:49:4558:50 | in : ListIterator [<element>] : String | Test.java:7194:45:7194:70 | iterator : ListIterator [<element>] : String | provenance |  |
 | Test.java:4559:20:4559:22 | out : MyAbstractUntypedIteratorDecorator [<element>] : String | Test.java:231:19:231:32 | it : MyAbstractUntypedIteratorDecorator [<element>] : String | provenance |  |
-| Test.java:4559:20:4559:22 | out : MyAbstractUntypedIteratorDecorator [<element>] : String | Test.java:4559:9:4559:23 | getElement(...) | provenance | MaD:4 |
+| Test.java:4559:20:4559:22 | out : MyAbstractUntypedIteratorDecorator [<element>] : String | Test.java:4559:9:4559:23 | getElement(...) | provenance | MaD:6 |
 | Test.java:4564:44:4564:127 | new MyAbstractUntypedIteratorDecorator<>(...) : MyAbstractUntypedIteratorDecorator [<element>] : String | Test.java:4565:10:4565:11 | in : MyAbstractUntypedIteratorDecorator [<element>] : String | provenance |  |
-| Test.java:4564:83:4564:126 | newListIteratorWithElement(...) : ListIterator [<element>] : String | Test.java:4564:44:4564:127 | new MyAbstractUntypedIteratorDecorator<>(...) : MyAbstractUntypedIteratorDecorator [<element>] : String | provenance | MaD:125 |
+| Test.java:4564:83:4564:126 | newListIteratorWithElement(...) : ListIterator [<element>] : String | Test.java:4564:44:4564:127 | new MyAbstractUntypedIteratorDecorator<>(...) : MyAbstractUntypedIteratorDecorator [<element>] : String | provenance | MaD:127 |
 | Test.java:4564:83:4564:126 | newListIteratorWithElement(...) : ListIterator [<element>] : String | Test.java:7194:45:7194:70 | iterator : ListIterator [<element>] : String | provenance |  |
 | Test.java:4564:110:4564:125 | (...)... : String | Test.java:259:49:259:57 | element : String | provenance |  |
-| Test.java:4564:110:4564:125 | (...)... : String | Test.java:4564:83:4564:126 | newListIteratorWithElement(...) : ListIterator [<element>] : String | provenance | MaD:2 |
+| Test.java:4564:110:4564:125 | (...)... : String | Test.java:4564:83:4564:126 | newListIteratorWithElement(...) : ListIterator [<element>] : String | provenance | MaD:4 |
 | Test.java:4564:118:4564:125 | source(...) : Object | Test.java:4564:110:4564:125 | (...)... : String | provenance |  |
-| Test.java:4565:10:4565:11 | in : MyAbstractUntypedIteratorDecorator [<element>] : String | Test.java:4565:10:4565:27 | myGetIterator(...) : Iterator [<element>] : String | provenance | MaD:126 |
+| Test.java:4565:10:4565:11 | in : MyAbstractUntypedIteratorDecorator [<element>] : String | Test.java:4565:10:4565:27 | myGetIterator(...) : Iterator [<element>] : String | provenance | MaD:128 |
 | Test.java:4565:10:4565:11 | in : MyAbstractUntypedIteratorDecorator [<element>] : String | Test.java:7197:22:7197:34 | parameter this : MyAbstractUntypedIteratorDecorator [<element>] : String | provenance |  |
 | Test.java:4565:10:4565:27 | myGetIterator(...) : Iterator [<element>] : String | Test.java:4566:20:4566:22 | out : Iterator [<element>] : String | provenance |  |
 | Test.java:4566:20:4566:22 | out : Iterator [<element>] : String | Test.java:231:19:231:32 | it : Iterator [<element>] : String | provenance |  |
-| Test.java:4566:20:4566:22 | out : Iterator [<element>] : String | Test.java:4566:9:4566:23 | getElement(...) | provenance | MaD:4 |
+| Test.java:4566:20:4566:22 | out : Iterator [<element>] : String | Test.java:4566:9:4566:23 | getElement(...) | provenance | MaD:6 |
 | Test.java:4571:16:4571:60 | (...)... : Object[] [[]] : String | Test.java:4572:28:4572:29 | in : Object[] [[]] : String | provenance |  |
 | Test.java:4571:24:4571:60 | newWithArrayElement(...) : Object[] [[]] : String | Test.java:4571:16:4571:60 | (...)... : Object[] [[]] : String | provenance |  |
 | Test.java:4571:44:4571:59 | (...)... : String | Test.java:251:31:251:44 | element : String | provenance |  |
 | Test.java:4571:44:4571:59 | (...)... : String | Test.java:4571:24:4571:60 | newWithArrayElement(...) : Object[] [[]] : String | provenance |  |
 | Test.java:4571:52:4571:59 | source(...) : Object | Test.java:4571:44:4571:59 | (...)... : String | provenance |  |
 | Test.java:4572:10:4572:36 | new ArrayIterator<>(...) : ArrayIterator [<element>] : String | Test.java:4573:20:4573:22 | out : ArrayIterator [<element>] : String | provenance |  |
-| Test.java:4572:28:4572:29 | in : Object[] [[]] : String | Test.java:4572:10:4572:36 | new ArrayIterator<>(...) : ArrayIterator [<element>] : String | provenance | MaD:127 |
+| Test.java:4572:28:4572:29 | in : Object[] [[]] : String | Test.java:4572:10:4572:36 | new ArrayIterator<>(...) : ArrayIterator [<element>] : String | provenance | MaD:129 |
 | Test.java:4573:20:4573:22 | out : ArrayIterator [<element>] : String | Test.java:231:19:231:32 | it : ArrayIterator [<element>] : String | provenance |  |
-| Test.java:4573:20:4573:22 | out : ArrayIterator [<element>] : String | Test.java:4573:9:4573:23 | getElement(...) | provenance | MaD:4 |
+| Test.java:4573:20:4573:22 | out : ArrayIterator [<element>] : String | Test.java:4573:9:4573:23 | getElement(...) | provenance | MaD:6 |
 | Test.java:4578:16:4578:60 | (...)... : Object[] [[]] : String | Test.java:4579:28:4579:29 | in : Object[] [[]] : String | provenance |  |
 | Test.java:4578:24:4578:60 | newWithArrayElement(...) : Object[] [[]] : String | Test.java:4578:16:4578:60 | (...)... : Object[] [[]] : String | provenance |  |
 | Test.java:4578:44:4578:59 | (...)... : String | Test.java:251:31:251:44 | element : String | provenance |  |
 | Test.java:4578:44:4578:59 | (...)... : String | Test.java:4578:24:4578:60 | newWithArrayElement(...) : Object[] [[]] : String | provenance |  |
 | Test.java:4578:52:4578:59 | source(...) : Object | Test.java:4578:44:4578:59 | (...)... : String | provenance |  |
 | Test.java:4579:10:4579:33 | new ArrayIterator<>(...) : ArrayIterator [<element>] : String | Test.java:4580:20:4580:22 | out : ArrayIterator [<element>] : String | provenance |  |
-| Test.java:4579:28:4579:29 | in : Object[] [[]] : String | Test.java:4579:10:4579:33 | new ArrayIterator<>(...) : ArrayIterator [<element>] : String | provenance | MaD:127 |
+| Test.java:4579:28:4579:29 | in : Object[] [[]] : String | Test.java:4579:10:4579:33 | new ArrayIterator<>(...) : ArrayIterator [<element>] : String | provenance | MaD:129 |
 | Test.java:4580:20:4580:22 | out : ArrayIterator [<element>] : String | Test.java:231:19:231:32 | it : ArrayIterator [<element>] : String | provenance |  |
-| Test.java:4580:20:4580:22 | out : ArrayIterator [<element>] : String | Test.java:4580:9:4580:23 | getElement(...) | provenance | MaD:4 |
+| Test.java:4580:20:4580:22 | out : ArrayIterator [<element>] : String | Test.java:4580:9:4580:23 | getElement(...) | provenance | MaD:6 |
 | Test.java:4585:16:4585:60 | (...)... : Object[] [[]] : String | Test.java:4586:28:4586:29 | in : Object[] [[]] : String | provenance |  |
 | Test.java:4585:24:4585:60 | newWithArrayElement(...) : Object[] [[]] : String | Test.java:4585:16:4585:60 | (...)... : Object[] [[]] : String | provenance |  |
 | Test.java:4585:44:4585:59 | (...)... : String | Test.java:251:31:251:44 | element : String | provenance |  |
 | Test.java:4585:44:4585:59 | (...)... : String | Test.java:4585:24:4585:60 | newWithArrayElement(...) : Object[] [[]] : String | provenance |  |
 | Test.java:4585:52:4585:59 | source(...) : Object | Test.java:4585:44:4585:59 | (...)... : String | provenance |  |
 | Test.java:4586:10:4586:30 | new ArrayIterator<>(...) : ArrayIterator [<element>] : String | Test.java:4587:20:4587:22 | out : ArrayIterator [<element>] : String | provenance |  |
-| Test.java:4586:28:4586:29 | in : Object[] [[]] : String | Test.java:4586:10:4586:30 | new ArrayIterator<>(...) : ArrayIterator [<element>] : String | provenance | MaD:127 |
+| Test.java:4586:28:4586:29 | in : Object[] [[]] : String | Test.java:4586:10:4586:30 | new ArrayIterator<>(...) : ArrayIterator [<element>] : String | provenance | MaD:129 |
 | Test.java:4587:20:4587:22 | out : ArrayIterator [<element>] : String | Test.java:231:19:231:32 | it : ArrayIterator [<element>] : String | provenance |  |
-| Test.java:4587:20:4587:22 | out : ArrayIterator [<element>] : String | Test.java:4587:9:4587:23 | getElement(...) | provenance | MaD:4 |
+| Test.java:4587:20:4587:22 | out : ArrayIterator [<element>] : String | Test.java:4587:9:4587:23 | getElement(...) | provenance | MaD:6 |
 | Test.java:4592:23:4592:86 | new ArrayIterator<>(...) : ArrayIterator [<element>] : String | Test.java:4593:20:4593:21 | in : ArrayIterator [<element>] : String | provenance |  |
-| Test.java:4592:41:4592:85 | (...)... : Object[] [[]] : String | Test.java:4592:23:4592:86 | new ArrayIterator<>(...) : ArrayIterator [<element>] : String | provenance | MaD:127 |
+| Test.java:4592:41:4592:85 | (...)... : Object[] [[]] : String | Test.java:4592:23:4592:86 | new ArrayIterator<>(...) : ArrayIterator [<element>] : String | provenance | MaD:129 |
 | Test.java:4592:49:4592:85 | newWithArrayElement(...) : Object[] [[]] : String | Test.java:4592:41:4592:85 | (...)... : Object[] [[]] : String | provenance |  |
 | Test.java:4592:69:4592:84 | (...)... : String | Test.java:251:31:251:44 | element : String | provenance |  |
 | Test.java:4592:69:4592:84 | (...)... : String | Test.java:4592:49:4592:85 | newWithArrayElement(...) : Object[] [[]] : String | provenance |  |
 | Test.java:4592:77:4592:84 | source(...) : Object | Test.java:4592:69:4592:84 | (...)... : String | provenance |  |
 | Test.java:4593:10:4593:32 | (...)... : String[] [[]] : String | Test.java:4594:25:4594:27 | out : String[] [[]] : String | provenance |  |
-| Test.java:4593:20:4593:21 | in : ArrayIterator [<element>] : String | Test.java:4593:20:4593:32 | getArray(...) : Object [[]] : String | provenance | MaD:128 |
+| Test.java:4593:20:4593:21 | in : ArrayIterator [<element>] : String | Test.java:4593:20:4593:32 | getArray(...) : Object [[]] : String | provenance | MaD:130 |
 | Test.java:4593:20:4593:32 | getArray(...) : Object [[]] : String | Test.java:4593:10:4593:32 | (...)... : String[] [[]] : String | provenance |  |
 | Test.java:4594:25:4594:27 | out : String[] [[]] : String | Test.java:229:24:229:32 | array : String[] [[]] : String | provenance |  |
 | Test.java:4594:25:4594:27 | out : String[] [[]] : String | Test.java:4594:9:4594:28 | getArrayElement(...) | provenance |  |
@@ -6744,340 +6744,340 @@ edges
 | Test.java:4599:44:4599:59 | (...)... : String | Test.java:4599:24:4599:60 | newWithArrayElement(...) : Object[] [[]] : String | provenance |  |
 | Test.java:4599:52:4599:59 | source(...) : Object | Test.java:4599:44:4599:59 | (...)... : String | provenance |  |
 | Test.java:4600:10:4600:40 | new ArrayListIterator<>(...) : ArrayListIterator [<element>] : String | Test.java:4601:20:4601:22 | out : ArrayListIterator [<element>] : String | provenance |  |
-| Test.java:4600:32:4600:33 | in : Object[] [[]] : String | Test.java:4600:10:4600:40 | new ArrayListIterator<>(...) : ArrayListIterator [<element>] : String | provenance | MaD:129 |
+| Test.java:4600:32:4600:33 | in : Object[] [[]] : String | Test.java:4600:10:4600:40 | new ArrayListIterator<>(...) : ArrayListIterator [<element>] : String | provenance | MaD:131 |
 | Test.java:4601:20:4601:22 | out : ArrayListIterator [<element>] : String | Test.java:231:19:231:32 | it : ArrayListIterator [<element>] : String | provenance |  |
-| Test.java:4601:20:4601:22 | out : ArrayListIterator [<element>] : String | Test.java:4601:9:4601:23 | getElement(...) | provenance | MaD:4 |
+| Test.java:4601:20:4601:22 | out : ArrayListIterator [<element>] : String | Test.java:4601:9:4601:23 | getElement(...) | provenance | MaD:6 |
 | Test.java:4606:16:4606:60 | (...)... : Object[] [[]] : String | Test.java:4607:32:4607:33 | in : Object[] [[]] : String | provenance |  |
 | Test.java:4606:24:4606:60 | newWithArrayElement(...) : Object[] [[]] : String | Test.java:4606:16:4606:60 | (...)... : Object[] [[]] : String | provenance |  |
 | Test.java:4606:44:4606:59 | (...)... : String | Test.java:251:31:251:44 | element : String | provenance |  |
 | Test.java:4606:44:4606:59 | (...)... : String | Test.java:4606:24:4606:60 | newWithArrayElement(...) : Object[] [[]] : String | provenance |  |
 | Test.java:4606:52:4606:59 | source(...) : Object | Test.java:4606:44:4606:59 | (...)... : String | provenance |  |
 | Test.java:4607:10:4607:37 | new ArrayListIterator<>(...) : ArrayListIterator [<element>] : String | Test.java:4608:20:4608:22 | out : ArrayListIterator [<element>] : String | provenance |  |
-| Test.java:4607:32:4607:33 | in : Object[] [[]] : String | Test.java:4607:10:4607:37 | new ArrayListIterator<>(...) : ArrayListIterator [<element>] : String | provenance | MaD:129 |
+| Test.java:4607:32:4607:33 | in : Object[] [[]] : String | Test.java:4607:10:4607:37 | new ArrayListIterator<>(...) : ArrayListIterator [<element>] : String | provenance | MaD:131 |
 | Test.java:4608:20:4608:22 | out : ArrayListIterator [<element>] : String | Test.java:231:19:231:32 | it : ArrayListIterator [<element>] : String | provenance |  |
-| Test.java:4608:20:4608:22 | out : ArrayListIterator [<element>] : String | Test.java:4608:9:4608:23 | getElement(...) | provenance | MaD:4 |
+| Test.java:4608:20:4608:22 | out : ArrayListIterator [<element>] : String | Test.java:4608:9:4608:23 | getElement(...) | provenance | MaD:6 |
 | Test.java:4613:16:4613:60 | (...)... : Object[] [[]] : String | Test.java:4614:32:4614:33 | in : Object[] [[]] : String | provenance |  |
 | Test.java:4613:24:4613:60 | newWithArrayElement(...) : Object[] [[]] : String | Test.java:4613:16:4613:60 | (...)... : Object[] [[]] : String | provenance |  |
 | Test.java:4613:44:4613:59 | (...)... : String | Test.java:251:31:251:44 | element : String | provenance |  |
 | Test.java:4613:44:4613:59 | (...)... : String | Test.java:4613:24:4613:60 | newWithArrayElement(...) : Object[] [[]] : String | provenance |  |
 | Test.java:4613:52:4613:59 | source(...) : Object | Test.java:4613:44:4613:59 | (...)... : String | provenance |  |
 | Test.java:4614:10:4614:34 | new ArrayListIterator<>(...) : ArrayListIterator [<element>] : String | Test.java:4615:20:4615:22 | out : ArrayListIterator [<element>] : String | provenance |  |
-| Test.java:4614:32:4614:33 | in : Object[] [[]] : String | Test.java:4614:10:4614:34 | new ArrayListIterator<>(...) : ArrayListIterator [<element>] : String | provenance | MaD:129 |
+| Test.java:4614:32:4614:33 | in : Object[] [[]] : String | Test.java:4614:10:4614:34 | new ArrayListIterator<>(...) : ArrayListIterator [<element>] : String | provenance | MaD:131 |
 | Test.java:4615:20:4615:22 | out : ArrayListIterator [<element>] : String | Test.java:231:19:231:32 | it : ArrayListIterator [<element>] : String | provenance |  |
-| Test.java:4615:20:4615:22 | out : ArrayListIterator [<element>] : String | Test.java:4615:9:4615:23 | getElement(...) | provenance | MaD:4 |
+| Test.java:4615:20:4615:22 | out : ArrayListIterator [<element>] : String | Test.java:4615:9:4615:23 | getElement(...) | provenance | MaD:6 |
 | Test.java:4620:18:4620:61 | newListIteratorWithElement(...) : ListIterator [<element>] : String | Test.java:4621:30:4621:31 | in : ListIterator [<element>] : String | provenance |  |
 | Test.java:4620:45:4620:60 | (...)... : String | Test.java:259:49:259:57 | element : String | provenance |  |
-| Test.java:4620:45:4620:60 | (...)... : String | Test.java:4620:18:4620:61 | newListIteratorWithElement(...) : ListIterator [<element>] : String | provenance | MaD:2 |
+| Test.java:4620:45:4620:60 | (...)... : String | Test.java:4620:18:4620:61 | newListIteratorWithElement(...) : ListIterator [<element>] : String | provenance | MaD:4 |
 | Test.java:4620:53:4620:60 | source(...) : Object | Test.java:4620:45:4620:60 | (...)... : String | provenance |  |
 | Test.java:4621:10:4621:40 | new BoundedIterator<>(...) : BoundedIterator [<element>] : String | Test.java:4622:20:4622:22 | out : BoundedIterator [<element>] : String | provenance |  |
-| Test.java:4621:30:4621:31 | in : ListIterator [<element>] : String | Test.java:4621:10:4621:40 | new BoundedIterator<>(...) : BoundedIterator [<element>] : String | provenance | MaD:130 |
+| Test.java:4621:30:4621:31 | in : ListIterator [<element>] : String | Test.java:4621:10:4621:40 | new BoundedIterator<>(...) : BoundedIterator [<element>] : String | provenance | MaD:132 |
 | Test.java:4622:20:4622:22 | out : BoundedIterator [<element>] : String | Test.java:231:19:231:32 | it : BoundedIterator [<element>] : String | provenance |  |
-| Test.java:4622:20:4622:22 | out : BoundedIterator [<element>] : String | Test.java:4622:9:4622:23 | getElement(...) | provenance | MaD:4 |
+| Test.java:4622:20:4622:22 | out : BoundedIterator [<element>] : String | Test.java:4622:9:4622:23 | getElement(...) | provenance | MaD:6 |
 | Test.java:4627:20:4627:72 | of(...) : List [<element>, <element>] : String | Test.java:4628:50:4628:51 | in : List [<element>, <element>] : String | provenance |  |
-| Test.java:4627:28:4627:71 | newListIteratorWithElement(...) : ListIterator [<element>] : String | Test.java:4627:20:4627:72 | of(...) : List [<element>, <element>] : String | provenance | MaD:6 |
+| Test.java:4627:28:4627:71 | newListIteratorWithElement(...) : ListIterator [<element>] : String | Test.java:4627:20:4627:72 | of(...) : List [<element>, <element>] : String | provenance | MaD:7 |
 | Test.java:4627:55:4627:70 | (...)... : String | Test.java:259:49:259:57 | element : String | provenance |  |
-| Test.java:4627:55:4627:70 | (...)... : String | Test.java:4627:28:4627:71 | newListIteratorWithElement(...) : ListIterator [<element>] : String | provenance | MaD:2 |
+| Test.java:4627:55:4627:70 | (...)... : String | Test.java:4627:28:4627:71 | newListIteratorWithElement(...) : ListIterator [<element>] : String | provenance | MaD:4 |
 | Test.java:4627:63:4627:70 | source(...) : Object | Test.java:4627:55:4627:70 | (...)... : String | provenance |  |
 | Test.java:4628:10:4628:52 | new CollatingIterator<>(...) : CollatingIterator [<element>] : String | Test.java:4629:20:4629:22 | out : CollatingIterator [<element>] : String | provenance |  |
-| Test.java:4628:50:4628:51 | in : List [<element>, <element>] : String | Test.java:4628:10:4628:52 | new CollatingIterator<>(...) : CollatingIterator [<element>] : String | provenance | MaD:131 |
+| Test.java:4628:50:4628:51 | in : List [<element>, <element>] : String | Test.java:4628:10:4628:52 | new CollatingIterator<>(...) : CollatingIterator [<element>] : String | provenance | MaD:133 |
 | Test.java:4629:20:4629:22 | out : CollatingIterator [<element>] : String | Test.java:231:19:231:32 | it : CollatingIterator [<element>] : String | provenance |  |
-| Test.java:4629:20:4629:22 | out : CollatingIterator [<element>] : String | Test.java:4629:9:4629:23 | getElement(...) | provenance | MaD:4 |
+| Test.java:4629:20:4629:22 | out : CollatingIterator [<element>] : String | Test.java:4629:9:4629:23 | getElement(...) | provenance | MaD:6 |
 | Test.java:4634:18:4634:61 | newListIteratorWithElement(...) : ListIterator [<element>] : String | Test.java:4635:38:4635:39 | in : ListIterator [<element>] : String | provenance |  |
 | Test.java:4634:45:4634:60 | (...)... : String | Test.java:259:49:259:57 | element : String | provenance |  |
-| Test.java:4634:45:4634:60 | (...)... : String | Test.java:4634:18:4634:61 | newListIteratorWithElement(...) : ListIterator [<element>] : String | provenance | MaD:2 |
+| Test.java:4634:45:4634:60 | (...)... : String | Test.java:4634:18:4634:61 | newListIteratorWithElement(...) : ListIterator [<element>] : String | provenance | MaD:4 |
 | Test.java:4634:53:4634:60 | source(...) : Object | Test.java:4634:45:4634:60 | (...)... : String | provenance |  |
 | Test.java:4635:10:4635:46 | new CollatingIterator<>(...) : CollatingIterator [<element>] : String | Test.java:4636:20:4636:22 | out : CollatingIterator [<element>] : String | provenance |  |
-| Test.java:4635:38:4635:39 | in : ListIterator [<element>] : String | Test.java:4635:10:4635:46 | new CollatingIterator<>(...) : CollatingIterator [<element>] : String | provenance | MaD:132 |
+| Test.java:4635:38:4635:39 | in : ListIterator [<element>] : String | Test.java:4635:10:4635:46 | new CollatingIterator<>(...) : CollatingIterator [<element>] : String | provenance | MaD:134 |
 | Test.java:4636:20:4636:22 | out : CollatingIterator [<element>] : String | Test.java:231:19:231:32 | it : CollatingIterator [<element>] : String | provenance |  |
-| Test.java:4636:20:4636:22 | out : CollatingIterator [<element>] : String | Test.java:4636:9:4636:23 | getElement(...) | provenance | MaD:4 |
+| Test.java:4636:20:4636:22 | out : CollatingIterator [<element>] : String | Test.java:4636:9:4636:23 | getElement(...) | provenance | MaD:6 |
 | Test.java:4641:18:4641:61 | newListIteratorWithElement(...) : ListIterator [<element>] : String | Test.java:4642:44:4642:45 | in : ListIterator [<element>] : String | provenance |  |
 | Test.java:4641:45:4641:60 | (...)... : String | Test.java:259:49:259:57 | element : String | provenance |  |
-| Test.java:4641:45:4641:60 | (...)... : String | Test.java:4641:18:4641:61 | newListIteratorWithElement(...) : ListIterator [<element>] : String | provenance | MaD:2 |
+| Test.java:4641:45:4641:60 | (...)... : String | Test.java:4641:18:4641:61 | newListIteratorWithElement(...) : ListIterator [<element>] : String | provenance | MaD:4 |
 | Test.java:4641:53:4641:60 | source(...) : Object | Test.java:4641:45:4641:60 | (...)... : String | provenance |  |
 | Test.java:4642:10:4642:46 | new CollatingIterator<>(...) : CollatingIterator [<element>] : String | Test.java:4643:20:4643:22 | out : CollatingIterator [<element>] : String | provenance |  |
-| Test.java:4642:44:4642:45 | in : ListIterator [<element>] : String | Test.java:4642:10:4642:46 | new CollatingIterator<>(...) : CollatingIterator [<element>] : String | provenance | MaD:133 |
+| Test.java:4642:44:4642:45 | in : ListIterator [<element>] : String | Test.java:4642:10:4642:46 | new CollatingIterator<>(...) : CollatingIterator [<element>] : String | provenance | MaD:135 |
 | Test.java:4643:20:4643:22 | out : CollatingIterator [<element>] : String | Test.java:231:19:231:32 | it : CollatingIterator [<element>] : String | provenance |  |
-| Test.java:4643:20:4643:22 | out : CollatingIterator [<element>] : String | Test.java:4643:9:4643:23 | getElement(...) | provenance | MaD:4 |
+| Test.java:4643:20:4643:22 | out : CollatingIterator [<element>] : String | Test.java:4643:9:4643:23 | getElement(...) | provenance | MaD:6 |
 | Test.java:4648:20:4648:79 | {...} : Iterator[] [[], <element>] : String | Test.java:4649:50:4649:51 | in : Iterator[] [[], <element>] : String | provenance |  |
 | Test.java:4648:35:4648:78 | newListIteratorWithElement(...) : ListIterator [<element>] : String | Test.java:4648:20:4648:79 | {...} : Iterator[] [[], <element>] : String | provenance |  |
 | Test.java:4648:62:4648:77 | (...)... : String | Test.java:259:49:259:57 | element : String | provenance |  |
-| Test.java:4648:62:4648:77 | (...)... : String | Test.java:4648:35:4648:78 | newListIteratorWithElement(...) : ListIterator [<element>] : String | provenance | MaD:2 |
+| Test.java:4648:62:4648:77 | (...)... : String | Test.java:4648:35:4648:78 | newListIteratorWithElement(...) : ListIterator [<element>] : String | provenance | MaD:4 |
 | Test.java:4648:70:4648:77 | source(...) : Object | Test.java:4648:62:4648:77 | (...)... : String | provenance |  |
 | Test.java:4649:10:4649:52 | new CollatingIterator<>(...) : CollatingIterator [<element>] : String | Test.java:4650:20:4650:22 | out : CollatingIterator [<element>] : String | provenance |  |
-| Test.java:4649:50:4649:51 | in : Iterator[] [[], <element>] : String | Test.java:4649:10:4649:52 | new CollatingIterator<>(...) : CollatingIterator [<element>] : String | provenance | MaD:134 |
+| Test.java:4649:50:4649:51 | in : Iterator[] [[], <element>] : String | Test.java:4649:10:4649:52 | new CollatingIterator<>(...) : CollatingIterator [<element>] : String | provenance | MaD:136 |
 | Test.java:4650:20:4650:22 | out : CollatingIterator [<element>] : String | Test.java:231:19:231:32 | it : CollatingIterator [<element>] : String | provenance |  |
-| Test.java:4650:20:4650:22 | out : CollatingIterator [<element>] : String | Test.java:4650:9:4650:23 | getElement(...) | provenance | MaD:4 |
+| Test.java:4650:20:4650:22 | out : CollatingIterator [<element>] : String | Test.java:4650:9:4650:23 | getElement(...) | provenance | MaD:6 |
 | Test.java:4655:18:4655:61 | newListIteratorWithElement(...) : ListIterator [<element>] : String | Test.java:4656:20:4656:21 | in : ListIterator [<element>] : String | provenance |  |
 | Test.java:4655:45:4655:60 | (...)... : String | Test.java:259:49:259:57 | element : String | provenance |  |
-| Test.java:4655:45:4655:60 | (...)... : String | Test.java:4655:18:4655:61 | newListIteratorWithElement(...) : ListIterator [<element>] : String | provenance | MaD:2 |
+| Test.java:4655:45:4655:60 | (...)... : String | Test.java:4655:18:4655:61 | newListIteratorWithElement(...) : ListIterator [<element>] : String | provenance | MaD:4 |
 | Test.java:4655:53:4655:60 | source(...) : Object | Test.java:4655:45:4655:60 | (...)... : String | provenance |  |
 | Test.java:4656:4:4656:6 | out [post update] : CollatingIterator [<element>] : String | Test.java:4657:20:4657:22 | out : CollatingIterator [<element>] : String | provenance |  |
-| Test.java:4656:20:4656:21 | in : ListIterator [<element>] : String | Test.java:4656:4:4656:6 | out [post update] : CollatingIterator [<element>] : String | provenance | MaD:135 |
+| Test.java:4656:20:4656:21 | in : ListIterator [<element>] : String | Test.java:4656:4:4656:6 | out [post update] : CollatingIterator [<element>] : String | provenance | MaD:137 |
 | Test.java:4657:20:4657:22 | out : CollatingIterator [<element>] : String | Test.java:231:19:231:32 | it : CollatingIterator [<element>] : String | provenance |  |
-| Test.java:4657:20:4657:22 | out : CollatingIterator [<element>] : String | Test.java:4657:9:4657:23 | getElement(...) | provenance | MaD:4 |
+| Test.java:4657:20:4657:22 | out : CollatingIterator [<element>] : String | Test.java:4657:9:4657:23 | getElement(...) | provenance | MaD:6 |
 | Test.java:4662:27:4662:120 | new CollatingIterator<>(...) : CollatingIterator [<element>] : String | Test.java:4663:10:4663:11 | in : CollatingIterator [<element>] : String | provenance |  |
-| Test.java:4662:67:4662:119 | of(...) : List [<element>, <element>] : String | Test.java:4662:27:4662:120 | new CollatingIterator<>(...) : CollatingIterator [<element>] : String | provenance | MaD:131 |
-| Test.java:4662:75:4662:118 | newListIteratorWithElement(...) : ListIterator [<element>] : String | Test.java:4662:67:4662:119 | of(...) : List [<element>, <element>] : String | provenance | MaD:6 |
+| Test.java:4662:67:4662:119 | of(...) : List [<element>, <element>] : String | Test.java:4662:27:4662:120 | new CollatingIterator<>(...) : CollatingIterator [<element>] : String | provenance | MaD:133 |
+| Test.java:4662:75:4662:118 | newListIteratorWithElement(...) : ListIterator [<element>] : String | Test.java:4662:67:4662:119 | of(...) : List [<element>, <element>] : String | provenance | MaD:7 |
 | Test.java:4662:102:4662:117 | (...)... : String | Test.java:259:49:259:57 | element : String | provenance |  |
-| Test.java:4662:102:4662:117 | (...)... : String | Test.java:4662:75:4662:118 | newListIteratorWithElement(...) : ListIterator [<element>] : String | provenance | MaD:2 |
+| Test.java:4662:102:4662:117 | (...)... : String | Test.java:4662:75:4662:118 | newListIteratorWithElement(...) : ListIterator [<element>] : String | provenance | MaD:4 |
 | Test.java:4662:110:4662:117 | source(...) : Object | Test.java:4662:102:4662:117 | (...)... : String | provenance |  |
-| Test.java:4663:10:4663:11 | in : CollatingIterator [<element>] : String | Test.java:4663:10:4663:26 | getIterators(...) : List [<element>, <element>] : String | provenance | MaD:136 |
+| Test.java:4663:10:4663:11 | in : CollatingIterator [<element>] : String | Test.java:4663:10:4663:26 | getIterators(...) : List [<element>, <element>] : String | provenance | MaD:138 |
 | Test.java:4663:10:4663:26 | getIterators(...) : List [<element>, <element>] : String | Test.java:4664:31:4664:33 | out : List [<element>, <element>] : String | provenance |  |
 | Test.java:4664:20:4664:34 | getElement(...) : Iterator [<element>] : String | Test.java:231:19:231:32 | it : Iterator [<element>] : String | provenance |  |
-| Test.java:4664:20:4664:34 | getElement(...) : Iterator [<element>] : String | Test.java:4664:9:4664:35 | getElement(...) | provenance | MaD:4 |
+| Test.java:4664:20:4664:34 | getElement(...) : Iterator [<element>] : String | Test.java:4664:9:4664:35 | getElement(...) | provenance | MaD:6 |
 | Test.java:4664:31:4664:33 | out : List [<element>, <element>] : String | Test.java:230:19:230:32 | it : List [<element>, <element>] : String | provenance |  |
-| Test.java:4664:31:4664:33 | out : List [<element>, <element>] : String | Test.java:4664:20:4664:34 | getElement(...) : Iterator [<element>] : String | provenance | MaD:1 |
+| Test.java:4664:31:4664:33 | out : List [<element>, <element>] : String | Test.java:4664:20:4664:34 | getElement(...) : Iterator [<element>] : String | provenance | MaD:3 |
 | Test.java:4669:18:4669:61 | newListIteratorWithElement(...) : ListIterator [<element>] : String | Test.java:4670:23:4670:24 | in : ListIterator [<element>] : String | provenance |  |
 | Test.java:4669:45:4669:60 | (...)... : String | Test.java:259:49:259:57 | element : String | provenance |  |
-| Test.java:4669:45:4669:60 | (...)... : String | Test.java:4669:18:4669:61 | newListIteratorWithElement(...) : ListIterator [<element>] : String | provenance | MaD:2 |
+| Test.java:4669:45:4669:60 | (...)... : String | Test.java:4669:18:4669:61 | newListIteratorWithElement(...) : ListIterator [<element>] : String | provenance | MaD:4 |
 | Test.java:4669:53:4669:60 | source(...) : Object | Test.java:4669:45:4669:60 | (...)... : String | provenance |  |
 | Test.java:4670:4:4670:6 | out [post update] : CollatingIterator [<element>] : String | Test.java:4671:20:4671:22 | out : CollatingIterator [<element>] : String | provenance |  |
-| Test.java:4670:23:4670:24 | in : ListIterator [<element>] : String | Test.java:4670:4:4670:6 | out [post update] : CollatingIterator [<element>] : String | provenance | MaD:137 |
+| Test.java:4670:23:4670:24 | in : ListIterator [<element>] : String | Test.java:4670:4:4670:6 | out [post update] : CollatingIterator [<element>] : String | provenance | MaD:139 |
 | Test.java:4671:20:4671:22 | out : CollatingIterator [<element>] : String | Test.java:231:19:231:32 | it : CollatingIterator [<element>] : String | provenance |  |
-| Test.java:4671:20:4671:22 | out : CollatingIterator [<element>] : String | Test.java:4671:9:4671:23 | getElement(...) | provenance | MaD:4 |
+| Test.java:4671:20:4671:22 | out : CollatingIterator [<element>] : String | Test.java:4671:9:4671:23 | getElement(...) | provenance | MaD:6 |
 | Test.java:4676:21:4676:63 | newEnumerationWithElement(...) : IteratorEnumeration [<element>] : String | Test.java:4677:34:4677:35 | in : IteratorEnumeration [<element>] : String | provenance |  |
 | Test.java:4676:47:4676:62 | (...)... : String | Test.java:256:47:256:55 | element : String | provenance |  |
-| Test.java:4676:47:4676:62 | (...)... : String | Test.java:4676:21:4676:63 | newEnumerationWithElement(...) : IteratorEnumeration [<element>] : String | provenance | MaD:2 |
+| Test.java:4676:47:4676:62 | (...)... : String | Test.java:4676:21:4676:63 | newEnumerationWithElement(...) : IteratorEnumeration [<element>] : String | provenance | MaD:4 |
 | Test.java:4676:55:4676:62 | source(...) : Object | Test.java:4676:47:4676:62 | (...)... : String | provenance |  |
 | Test.java:4677:10:4677:42 | new EnumerationIterator<>(...) : EnumerationIterator [<element>] : String | Test.java:4678:20:4678:22 | out : EnumerationIterator [<element>] : String | provenance |  |
-| Test.java:4677:34:4677:35 | in : IteratorEnumeration [<element>] : String | Test.java:4677:10:4677:42 | new EnumerationIterator<>(...) : EnumerationIterator [<element>] : String | provenance | MaD:138 |
+| Test.java:4677:34:4677:35 | in : IteratorEnumeration [<element>] : String | Test.java:4677:10:4677:42 | new EnumerationIterator<>(...) : EnumerationIterator [<element>] : String | provenance | MaD:140 |
 | Test.java:4678:20:4678:22 | out : EnumerationIterator [<element>] : String | Test.java:231:19:231:32 | it : EnumerationIterator [<element>] : String | provenance |  |
-| Test.java:4678:20:4678:22 | out : EnumerationIterator [<element>] : String | Test.java:4678:9:4678:23 | getElement(...) | provenance | MaD:4 |
+| Test.java:4678:20:4678:22 | out : EnumerationIterator [<element>] : String | Test.java:4678:9:4678:23 | getElement(...) | provenance | MaD:6 |
 | Test.java:4683:21:4683:63 | newEnumerationWithElement(...) : IteratorEnumeration [<element>] : String | Test.java:4684:34:4684:35 | in : IteratorEnumeration [<element>] : String | provenance |  |
 | Test.java:4683:47:4683:62 | (...)... : String | Test.java:256:47:256:55 | element : String | provenance |  |
-| Test.java:4683:47:4683:62 | (...)... : String | Test.java:4683:21:4683:63 | newEnumerationWithElement(...) : IteratorEnumeration [<element>] : String | provenance | MaD:2 |
+| Test.java:4683:47:4683:62 | (...)... : String | Test.java:4683:21:4683:63 | newEnumerationWithElement(...) : IteratorEnumeration [<element>] : String | provenance | MaD:4 |
 | Test.java:4683:55:4683:62 | source(...) : Object | Test.java:4683:47:4683:62 | (...)... : String | provenance |  |
 | Test.java:4684:10:4684:36 | new EnumerationIterator<>(...) : EnumerationIterator [<element>] : String | Test.java:4685:20:4685:22 | out : EnumerationIterator [<element>] : String | provenance |  |
-| Test.java:4684:34:4684:35 | in : IteratorEnumeration [<element>] : String | Test.java:4684:10:4684:36 | new EnumerationIterator<>(...) : EnumerationIterator [<element>] : String | provenance | MaD:138 |
+| Test.java:4684:34:4684:35 | in : IteratorEnumeration [<element>] : String | Test.java:4684:10:4684:36 | new EnumerationIterator<>(...) : EnumerationIterator [<element>] : String | provenance | MaD:140 |
 | Test.java:4685:20:4685:22 | out : EnumerationIterator [<element>] : String | Test.java:231:19:231:32 | it : EnumerationIterator [<element>] : String | provenance |  |
-| Test.java:4685:20:4685:22 | out : EnumerationIterator [<element>] : String | Test.java:4685:9:4685:23 | getElement(...) | provenance | MaD:4 |
+| Test.java:4685:20:4685:22 | out : EnumerationIterator [<element>] : String | Test.java:4685:9:4685:23 | getElement(...) | provenance | MaD:6 |
 | Test.java:4690:29:4690:96 | new EnumerationIterator<>(...) : EnumerationIterator [<element>] : String | Test.java:4691:10:4691:11 | in : EnumerationIterator [<element>] : String | provenance |  |
-| Test.java:4690:53:4690:95 | newEnumerationWithElement(...) : IteratorEnumeration [<element>] : String | Test.java:4690:29:4690:96 | new EnumerationIterator<>(...) : EnumerationIterator [<element>] : String | provenance | MaD:138 |
+| Test.java:4690:53:4690:95 | newEnumerationWithElement(...) : IteratorEnumeration [<element>] : String | Test.java:4690:29:4690:96 | new EnumerationIterator<>(...) : EnumerationIterator [<element>] : String | provenance | MaD:140 |
 | Test.java:4690:79:4690:94 | (...)... : String | Test.java:256:47:256:55 | element : String | provenance |  |
-| Test.java:4690:79:4690:94 | (...)... : String | Test.java:4690:53:4690:95 | newEnumerationWithElement(...) : IteratorEnumeration [<element>] : String | provenance | MaD:2 |
+| Test.java:4690:79:4690:94 | (...)... : String | Test.java:4690:53:4690:95 | newEnumerationWithElement(...) : IteratorEnumeration [<element>] : String | provenance | MaD:4 |
 | Test.java:4690:87:4690:94 | source(...) : Object | Test.java:4690:79:4690:94 | (...)... : String | provenance |  |
-| Test.java:4691:10:4691:11 | in : EnumerationIterator [<element>] : String | Test.java:4691:10:4691:28 | getEnumeration(...) : Enumeration [<element>] : String | provenance | MaD:139 |
+| Test.java:4691:10:4691:11 | in : EnumerationIterator [<element>] : String | Test.java:4691:10:4691:28 | getEnumeration(...) : Enumeration [<element>] : String | provenance | MaD:141 |
 | Test.java:4691:10:4691:28 | getEnumeration(...) : Enumeration [<element>] : String | Test.java:4692:20:4692:22 | out : Enumeration [<element>] : String | provenance |  |
 | Test.java:4692:20:4692:22 | out : Enumeration [<element>] : String | Test.java:234:19:234:42 | container : Enumeration [<element>] : String | provenance |  |
-| Test.java:4692:20:4692:22 | out : Enumeration [<element>] : String | Test.java:4692:9:4692:23 | getElement(...) | provenance | MaD:3 |
+| Test.java:4692:20:4692:22 | out : Enumeration [<element>] : String | Test.java:4692:9:4692:23 | getElement(...) | provenance | MaD:5 |
 | Test.java:4697:21:4697:63 | newEnumerationWithElement(...) : IteratorEnumeration [<element>] : String | Test.java:4698:23:4698:24 | in : IteratorEnumeration [<element>] : String | provenance |  |
 | Test.java:4697:47:4697:62 | (...)... : String | Test.java:256:47:256:55 | element : String | provenance |  |
-| Test.java:4697:47:4697:62 | (...)... : String | Test.java:4697:21:4697:63 | newEnumerationWithElement(...) : IteratorEnumeration [<element>] : String | provenance | MaD:2 |
+| Test.java:4697:47:4697:62 | (...)... : String | Test.java:4697:21:4697:63 | newEnumerationWithElement(...) : IteratorEnumeration [<element>] : String | provenance | MaD:4 |
 | Test.java:4697:55:4697:62 | source(...) : Object | Test.java:4697:47:4697:62 | (...)... : String | provenance |  |
 | Test.java:4698:4:4698:6 | out [post update] : EnumerationIterator [<element>] : String | Test.java:4699:20:4699:22 | out : EnumerationIterator [<element>] : String | provenance |  |
-| Test.java:4698:23:4698:24 | in : IteratorEnumeration [<element>] : String | Test.java:4698:4:4698:6 | out [post update] : EnumerationIterator [<element>] : String | provenance | MaD:140 |
+| Test.java:4698:23:4698:24 | in : IteratorEnumeration [<element>] : String | Test.java:4698:4:4698:6 | out [post update] : EnumerationIterator [<element>] : String | provenance | MaD:142 |
 | Test.java:4699:20:4699:22 | out : EnumerationIterator [<element>] : String | Test.java:231:19:231:32 | it : EnumerationIterator [<element>] : String | provenance |  |
-| Test.java:4699:20:4699:22 | out : EnumerationIterator [<element>] : String | Test.java:4699:9:4699:23 | getElement(...) | provenance | MaD:4 |
+| Test.java:4699:20:4699:22 | out : EnumerationIterator [<element>] : String | Test.java:4699:9:4699:23 | getElement(...) | provenance | MaD:6 |
 | Test.java:4704:18:4704:61 | newListIteratorWithElement(...) : ListIterator [<element>] : String | Test.java:4705:29:4705:30 | in : ListIterator [<element>] : String | provenance |  |
 | Test.java:4704:45:4704:60 | (...)... : String | Test.java:259:49:259:57 | element : String | provenance |  |
-| Test.java:4704:45:4704:60 | (...)... : String | Test.java:4704:18:4704:61 | newListIteratorWithElement(...) : ListIterator [<element>] : String | provenance | MaD:2 |
+| Test.java:4704:45:4704:60 | (...)... : String | Test.java:4704:18:4704:61 | newListIteratorWithElement(...) : ListIterator [<element>] : String | provenance | MaD:4 |
 | Test.java:4704:53:4704:60 | source(...) : Object | Test.java:4704:45:4704:60 | (...)... : String | provenance |  |
 | Test.java:4705:10:4705:37 | new FilterIterator<>(...) : FilterIterator [<element>] : String | Test.java:4706:20:4706:22 | out : FilterIterator [<element>] : String | provenance |  |
-| Test.java:4705:29:4705:30 | in : ListIterator [<element>] : String | Test.java:4705:10:4705:37 | new FilterIterator<>(...) : FilterIterator [<element>] : String | provenance | MaD:141 |
+| Test.java:4705:29:4705:30 | in : ListIterator [<element>] : String | Test.java:4705:10:4705:37 | new FilterIterator<>(...) : FilterIterator [<element>] : String | provenance | MaD:143 |
 | Test.java:4706:20:4706:22 | out : FilterIterator [<element>] : String | Test.java:231:19:231:32 | it : FilterIterator [<element>] : String | provenance |  |
-| Test.java:4706:20:4706:22 | out : FilterIterator [<element>] : String | Test.java:4706:9:4706:23 | getElement(...) | provenance | MaD:4 |
+| Test.java:4706:20:4706:22 | out : FilterIterator [<element>] : String | Test.java:4706:9:4706:23 | getElement(...) | provenance | MaD:6 |
 | Test.java:4711:18:4711:61 | newListIteratorWithElement(...) : ListIterator [<element>] : String | Test.java:4712:29:4712:30 | in : ListIterator [<element>] : String | provenance |  |
 | Test.java:4711:45:4711:60 | (...)... : String | Test.java:259:49:259:57 | element : String | provenance |  |
-| Test.java:4711:45:4711:60 | (...)... : String | Test.java:4711:18:4711:61 | newListIteratorWithElement(...) : ListIterator [<element>] : String | provenance | MaD:2 |
+| Test.java:4711:45:4711:60 | (...)... : String | Test.java:4711:18:4711:61 | newListIteratorWithElement(...) : ListIterator [<element>] : String | provenance | MaD:4 |
 | Test.java:4711:53:4711:60 | source(...) : Object | Test.java:4711:45:4711:60 | (...)... : String | provenance |  |
 | Test.java:4712:10:4712:31 | new FilterIterator<>(...) : FilterIterator [<element>] : String | Test.java:4713:20:4713:22 | out : FilterIterator [<element>] : String | provenance |  |
-| Test.java:4712:29:4712:30 | in : ListIterator [<element>] : String | Test.java:4712:10:4712:31 | new FilterIterator<>(...) : FilterIterator [<element>] : String | provenance | MaD:141 |
+| Test.java:4712:29:4712:30 | in : ListIterator [<element>] : String | Test.java:4712:10:4712:31 | new FilterIterator<>(...) : FilterIterator [<element>] : String | provenance | MaD:143 |
 | Test.java:4713:20:4713:22 | out : FilterIterator [<element>] : String | Test.java:231:19:231:32 | it : FilterIterator [<element>] : String | provenance |  |
-| Test.java:4713:20:4713:22 | out : FilterIterator [<element>] : String | Test.java:4713:9:4713:23 | getElement(...) | provenance | MaD:4 |
+| Test.java:4713:20:4713:22 | out : FilterIterator [<element>] : String | Test.java:4713:9:4713:23 | getElement(...) | provenance | MaD:6 |
 | Test.java:4718:24:4718:87 | new FilterIterator<>(...) : FilterIterator [<element>] : String | Test.java:4719:10:4719:11 | in : FilterIterator [<element>] : String | provenance |  |
-| Test.java:4718:43:4718:86 | newListIteratorWithElement(...) : ListIterator [<element>] : String | Test.java:4718:24:4718:87 | new FilterIterator<>(...) : FilterIterator [<element>] : String | provenance | MaD:141 |
+| Test.java:4718:43:4718:86 | newListIteratorWithElement(...) : ListIterator [<element>] : String | Test.java:4718:24:4718:87 | new FilterIterator<>(...) : FilterIterator [<element>] : String | provenance | MaD:143 |
 | Test.java:4718:70:4718:85 | (...)... : String | Test.java:259:49:259:57 | element : String | provenance |  |
-| Test.java:4718:70:4718:85 | (...)... : String | Test.java:4718:43:4718:86 | newListIteratorWithElement(...) : ListIterator [<element>] : String | provenance | MaD:2 |
+| Test.java:4718:70:4718:85 | (...)... : String | Test.java:4718:43:4718:86 | newListIteratorWithElement(...) : ListIterator [<element>] : String | provenance | MaD:4 |
 | Test.java:4718:78:4718:85 | source(...) : Object | Test.java:4718:70:4718:85 | (...)... : String | provenance |  |
-| Test.java:4719:10:4719:11 | in : FilterIterator [<element>] : String | Test.java:4719:10:4719:25 | getIterator(...) : Iterator [<element>] : String | provenance | MaD:142 |
+| Test.java:4719:10:4719:11 | in : FilterIterator [<element>] : String | Test.java:4719:10:4719:25 | getIterator(...) : Iterator [<element>] : String | provenance | MaD:144 |
 | Test.java:4719:10:4719:25 | getIterator(...) : Iterator [<element>] : String | Test.java:4720:20:4720:22 | out : Iterator [<element>] : String | provenance |  |
 | Test.java:4720:20:4720:22 | out : Iterator [<element>] : String | Test.java:231:19:231:32 | it : Iterator [<element>] : String | provenance |  |
-| Test.java:4720:20:4720:22 | out : Iterator [<element>] : String | Test.java:4720:9:4720:23 | getElement(...) | provenance | MaD:4 |
+| Test.java:4720:20:4720:22 | out : Iterator [<element>] : String | Test.java:4720:9:4720:23 | getElement(...) | provenance | MaD:6 |
 | Test.java:4725:18:4725:61 | newListIteratorWithElement(...) : ListIterator [<element>] : String | Test.java:4726:20:4726:21 | in : ListIterator [<element>] : String | provenance |  |
 | Test.java:4725:45:4725:60 | (...)... : String | Test.java:259:49:259:57 | element : String | provenance |  |
-| Test.java:4725:45:4725:60 | (...)... : String | Test.java:4725:18:4725:61 | newListIteratorWithElement(...) : ListIterator [<element>] : String | provenance | MaD:2 |
+| Test.java:4725:45:4725:60 | (...)... : String | Test.java:4725:18:4725:61 | newListIteratorWithElement(...) : ListIterator [<element>] : String | provenance | MaD:4 |
 | Test.java:4725:53:4725:60 | source(...) : Object | Test.java:4725:45:4725:60 | (...)... : String | provenance |  |
 | Test.java:4726:4:4726:6 | out [post update] : FilterIterator [<element>] : String | Test.java:4727:20:4727:22 | out : FilterIterator [<element>] : String | provenance |  |
-| Test.java:4726:20:4726:21 | in : ListIterator [<element>] : String | Test.java:4726:4:4726:6 | out [post update] : FilterIterator [<element>] : String | provenance | MaD:143 |
+| Test.java:4726:20:4726:21 | in : ListIterator [<element>] : String | Test.java:4726:4:4726:6 | out [post update] : FilterIterator [<element>] : String | provenance | MaD:145 |
 | Test.java:4727:20:4727:22 | out : FilterIterator [<element>] : String | Test.java:231:19:231:32 | it : FilterIterator [<element>] : String | provenance |  |
-| Test.java:4727:20:4727:22 | out : FilterIterator [<element>] : String | Test.java:4727:9:4727:23 | getElement(...) | provenance | MaD:4 |
+| Test.java:4727:20:4727:22 | out : FilterIterator [<element>] : String | Test.java:4727:9:4727:23 | getElement(...) | provenance | MaD:6 |
 | Test.java:4732:22:4732:65 | newListIteratorWithElement(...) : ListIterator [<element>] : String | Test.java:4733:33:4733:34 | in : ListIterator [<element>] : String | provenance |  |
 | Test.java:4732:49:4732:64 | (...)... : String | Test.java:259:49:259:57 | element : String | provenance |  |
-| Test.java:4732:49:4732:64 | (...)... : String | Test.java:4732:22:4732:65 | newListIteratorWithElement(...) : ListIterator [<element>] : String | provenance | MaD:2 |
+| Test.java:4732:49:4732:64 | (...)... : String | Test.java:4732:22:4732:65 | newListIteratorWithElement(...) : ListIterator [<element>] : String | provenance | MaD:4 |
 | Test.java:4732:57:4732:64 | source(...) : Object | Test.java:4732:49:4732:64 | (...)... : String | provenance |  |
 | Test.java:4733:10:4733:35 | new FilterListIterator<>(...) : FilterListIterator [<element>] : String | Test.java:4734:20:4734:22 | out : FilterListIterator [<element>] : String | provenance |  |
-| Test.java:4733:33:4733:34 | in : ListIterator [<element>] : String | Test.java:4733:10:4733:35 | new FilterListIterator<>(...) : FilterListIterator [<element>] : String | provenance | MaD:144 |
+| Test.java:4733:33:4733:34 | in : ListIterator [<element>] : String | Test.java:4733:10:4733:35 | new FilterListIterator<>(...) : FilterListIterator [<element>] : String | provenance | MaD:146 |
 | Test.java:4734:20:4734:22 | out : FilterListIterator [<element>] : String | Test.java:231:19:231:32 | it : FilterListIterator [<element>] : String | provenance |  |
-| Test.java:4734:20:4734:22 | out : FilterListIterator [<element>] : String | Test.java:4734:9:4734:23 | getElement(...) | provenance | MaD:4 |
+| Test.java:4734:20:4734:22 | out : FilterListIterator [<element>] : String | Test.java:4734:9:4734:23 | getElement(...) | provenance | MaD:6 |
 | Test.java:4739:22:4739:65 | newListIteratorWithElement(...) : ListIterator [<element>] : String | Test.java:4740:33:4740:34 | in : ListIterator [<element>] : String | provenance |  |
 | Test.java:4739:49:4739:64 | (...)... : String | Test.java:259:49:259:57 | element : String | provenance |  |
-| Test.java:4739:49:4739:64 | (...)... : String | Test.java:4739:22:4739:65 | newListIteratorWithElement(...) : ListIterator [<element>] : String | provenance | MaD:2 |
+| Test.java:4739:49:4739:64 | (...)... : String | Test.java:4739:22:4739:65 | newListIteratorWithElement(...) : ListIterator [<element>] : String | provenance | MaD:4 |
 | Test.java:4739:57:4739:64 | source(...) : Object | Test.java:4739:49:4739:64 | (...)... : String | provenance |  |
 | Test.java:4740:10:4740:41 | new FilterListIterator<>(...) : FilterListIterator [<element>] : String | Test.java:4741:20:4741:22 | out : FilterListIterator [<element>] : String | provenance |  |
-| Test.java:4740:33:4740:34 | in : ListIterator [<element>] : String | Test.java:4740:10:4740:41 | new FilterListIterator<>(...) : FilterListIterator [<element>] : String | provenance | MaD:145 |
+| Test.java:4740:33:4740:34 | in : ListIterator [<element>] : String | Test.java:4740:10:4740:41 | new FilterListIterator<>(...) : FilterListIterator [<element>] : String | provenance | MaD:147 |
 | Test.java:4741:20:4741:22 | out : FilterListIterator [<element>] : String | Test.java:231:19:231:32 | it : FilterListIterator [<element>] : String | provenance |  |
-| Test.java:4741:20:4741:22 | out : FilterListIterator [<element>] : String | Test.java:4741:9:4741:23 | getElement(...) | provenance | MaD:4 |
+| Test.java:4741:20:4741:22 | out : FilterListIterator [<element>] : String | Test.java:4741:9:4741:23 | getElement(...) | provenance | MaD:6 |
 | Test.java:4746:28:4746:95 | new FilterListIterator<>(...) : FilterListIterator [<element>] : String | Test.java:4747:10:4747:11 | in : FilterListIterator [<element>] : String | provenance |  |
-| Test.java:4746:51:4746:94 | newListIteratorWithElement(...) : ListIterator [<element>] : String | Test.java:4746:28:4746:95 | new FilterListIterator<>(...) : FilterListIterator [<element>] : String | provenance | MaD:144 |
+| Test.java:4746:51:4746:94 | newListIteratorWithElement(...) : ListIterator [<element>] : String | Test.java:4746:28:4746:95 | new FilterListIterator<>(...) : FilterListIterator [<element>] : String | provenance | MaD:146 |
 | Test.java:4746:78:4746:93 | (...)... : String | Test.java:259:49:259:57 | element : String | provenance |  |
-| Test.java:4746:78:4746:93 | (...)... : String | Test.java:4746:51:4746:94 | newListIteratorWithElement(...) : ListIterator [<element>] : String | provenance | MaD:2 |
+| Test.java:4746:78:4746:93 | (...)... : String | Test.java:4746:51:4746:94 | newListIteratorWithElement(...) : ListIterator [<element>] : String | provenance | MaD:4 |
 | Test.java:4746:86:4746:93 | source(...) : Object | Test.java:4746:78:4746:93 | (...)... : String | provenance |  |
-| Test.java:4747:10:4747:11 | in : FilterListIterator [<element>] : String | Test.java:4747:10:4747:29 | getListIterator(...) : ListIterator [<element>] : String | provenance | MaD:146 |
+| Test.java:4747:10:4747:11 | in : FilterListIterator [<element>] : String | Test.java:4747:10:4747:29 | getListIterator(...) : ListIterator [<element>] : String | provenance | MaD:148 |
 | Test.java:4747:10:4747:29 | getListIterator(...) : ListIterator [<element>] : String | Test.java:4748:20:4748:22 | out : ListIterator [<element>] : String | provenance |  |
 | Test.java:4748:20:4748:22 | out : ListIterator [<element>] : String | Test.java:231:19:231:32 | it : ListIterator [<element>] : String | provenance |  |
-| Test.java:4748:20:4748:22 | out : ListIterator [<element>] : String | Test.java:4748:9:4748:23 | getElement(...) | provenance | MaD:4 |
+| Test.java:4748:20:4748:22 | out : ListIterator [<element>] : String | Test.java:4748:9:4748:23 | getElement(...) | provenance | MaD:6 |
 | Test.java:4753:22:4753:65 | newListIteratorWithElement(...) : ListIterator [<element>] : String | Test.java:4754:24:4754:25 | in : ListIterator [<element>] : String | provenance |  |
 | Test.java:4753:49:4753:64 | (...)... : String | Test.java:259:49:259:57 | element : String | provenance |  |
-| Test.java:4753:49:4753:64 | (...)... : String | Test.java:4753:22:4753:65 | newListIteratorWithElement(...) : ListIterator [<element>] : String | provenance | MaD:2 |
+| Test.java:4753:49:4753:64 | (...)... : String | Test.java:4753:22:4753:65 | newListIteratorWithElement(...) : ListIterator [<element>] : String | provenance | MaD:4 |
 | Test.java:4753:57:4753:64 | source(...) : Object | Test.java:4753:49:4753:64 | (...)... : String | provenance |  |
 | Test.java:4754:4:4754:6 | out [post update] : FilterListIterator [<element>] : String | Test.java:4755:20:4755:22 | out : FilterListIterator [<element>] : String | provenance |  |
-| Test.java:4754:24:4754:25 | in : ListIterator [<element>] : String | Test.java:4754:4:4754:6 | out [post update] : FilterListIterator [<element>] : String | provenance | MaD:147 |
+| Test.java:4754:24:4754:25 | in : ListIterator [<element>] : String | Test.java:4754:4:4754:6 | out [post update] : FilterListIterator [<element>] : String | provenance | MaD:149 |
 | Test.java:4755:20:4755:22 | out : FilterListIterator [<element>] : String | Test.java:231:19:231:32 | it : FilterListIterator [<element>] : String | provenance |  |
-| Test.java:4755:20:4755:22 | out : FilterListIterator [<element>] : String | Test.java:4755:9:4755:23 | getElement(...) | provenance | MaD:4 |
+| Test.java:4755:20:4755:22 | out : FilterListIterator [<element>] : String | Test.java:4755:9:4755:23 | getElement(...) | provenance | MaD:6 |
 | Test.java:4760:20:4760:86 | newTreeBagWithElement(...) : TreeBag [<element>, <element>] : String | Test.java:4761:28:4761:29 | in : TreeBag [<element>, <element>] : String | provenance |  |
 | Test.java:4760:42:4760:85 | newListIteratorWithElement(...) : ListIterator [<element>] : String | Test.java:267:39:267:47 | element : ListIterator [<element>] : String | provenance |  |
-| Test.java:4760:42:4760:85 | newListIteratorWithElement(...) : ListIterator [<element>] : String | Test.java:4760:20:4760:86 | newTreeBagWithElement(...) : TreeBag [<element>, <element>] : String | provenance | MaD:2 |
-| Test.java:4760:42:4760:85 | newListIteratorWithElement(...) : ListIterator [<element>] : String | Test.java:4760:20:4760:86 | newTreeBagWithElement(...) : TreeBag [<element>, <element>] : String | provenance | MaD:395 |
+| Test.java:4760:42:4760:85 | newListIteratorWithElement(...) : ListIterator [<element>] : String | Test.java:4760:20:4760:86 | newTreeBagWithElement(...) : TreeBag [<element>, <element>] : String | provenance | MaD:4 |
+| Test.java:4760:42:4760:85 | newListIteratorWithElement(...) : ListIterator [<element>] : String | Test.java:4760:20:4760:86 | newTreeBagWithElement(...) : TreeBag [<element>, <element>] : String | provenance | MaD:470 |
 | Test.java:4760:69:4760:84 | (...)... : String | Test.java:259:49:259:57 | element : String | provenance |  |
-| Test.java:4760:69:4760:84 | (...)... : String | Test.java:4760:42:4760:85 | newListIteratorWithElement(...) : ListIterator [<element>] : String | provenance | MaD:2 |
+| Test.java:4760:69:4760:84 | (...)... : String | Test.java:4760:42:4760:85 | newListIteratorWithElement(...) : ListIterator [<element>] : String | provenance | MaD:4 |
 | Test.java:4760:77:4760:84 | source(...) : Object | Test.java:4760:69:4760:84 | (...)... : String | provenance |  |
 | Test.java:4761:10:4761:30 | new IteratorChain<>(...) : IteratorChain [<element>] : String | Test.java:4762:20:4762:22 | out : IteratorChain [<element>] : String | provenance |  |
-| Test.java:4761:28:4761:29 | in : TreeBag [<element>, <element>] : String | Test.java:4761:10:4761:30 | new IteratorChain<>(...) : IteratorChain [<element>] : String | provenance | MaD:148 |
+| Test.java:4761:28:4761:29 | in : TreeBag [<element>, <element>] : String | Test.java:4761:10:4761:30 | new IteratorChain<>(...) : IteratorChain [<element>] : String | provenance | MaD:150 |
 | Test.java:4762:20:4762:22 | out : IteratorChain [<element>] : String | Test.java:231:19:231:32 | it : IteratorChain [<element>] : String | provenance |  |
-| Test.java:4762:20:4762:22 | out : IteratorChain [<element>] : String | Test.java:4762:9:4762:23 | getElement(...) | provenance | MaD:4 |
+| Test.java:4762:20:4762:22 | out : IteratorChain [<element>] : String | Test.java:4762:9:4762:23 | getElement(...) | provenance | MaD:6 |
 | Test.java:4767:18:4767:61 | newListIteratorWithElement(...) : ListIterator [<element>] : String | Test.java:4768:28:4768:29 | in : ListIterator [<element>] : String | provenance |  |
 | Test.java:4767:45:4767:60 | (...)... : String | Test.java:259:49:259:57 | element : String | provenance |  |
-| Test.java:4767:45:4767:60 | (...)... : String | Test.java:4767:18:4767:61 | newListIteratorWithElement(...) : ListIterator [<element>] : String | provenance | MaD:2 |
+| Test.java:4767:45:4767:60 | (...)... : String | Test.java:4767:18:4767:61 | newListIteratorWithElement(...) : ListIterator [<element>] : String | provenance | MaD:4 |
 | Test.java:4767:53:4767:60 | source(...) : Object | Test.java:4767:45:4767:60 | (...)... : String | provenance |  |
 | Test.java:4768:10:4768:30 | new IteratorChain<>(...) : IteratorChain [<element>] : String | Test.java:4769:20:4769:22 | out : IteratorChain [<element>] : String | provenance |  |
-| Test.java:4768:28:4768:29 | in : ListIterator [<element>] : String | Test.java:4768:10:4768:30 | new IteratorChain<>(...) : IteratorChain [<element>] : String | provenance | MaD:149 |
+| Test.java:4768:28:4768:29 | in : ListIterator [<element>] : String | Test.java:4768:10:4768:30 | new IteratorChain<>(...) : IteratorChain [<element>] : String | provenance | MaD:151 |
 | Test.java:4769:20:4769:22 | out : IteratorChain [<element>] : String | Test.java:231:19:231:32 | it : IteratorChain [<element>] : String | provenance |  |
-| Test.java:4769:20:4769:22 | out : IteratorChain [<element>] : String | Test.java:4769:9:4769:23 | getElement(...) | provenance | MaD:4 |
+| Test.java:4769:20:4769:22 | out : IteratorChain [<element>] : String | Test.java:4769:9:4769:23 | getElement(...) | provenance | MaD:6 |
 | Test.java:4774:18:4774:61 | newListIteratorWithElement(...) : ListIterator [<element>] : String | Test.java:4775:28:4775:29 | in : ListIterator [<element>] : String | provenance |  |
 | Test.java:4774:45:4774:60 | (...)... : String | Test.java:259:49:259:57 | element : String | provenance |  |
-| Test.java:4774:45:4774:60 | (...)... : String | Test.java:4774:18:4774:61 | newListIteratorWithElement(...) : ListIterator [<element>] : String | provenance | MaD:2 |
+| Test.java:4774:45:4774:60 | (...)... : String | Test.java:4774:18:4774:61 | newListIteratorWithElement(...) : ListIterator [<element>] : String | provenance | MaD:4 |
 | Test.java:4774:53:4774:60 | source(...) : Object | Test.java:4774:45:4774:60 | (...)... : String | provenance |  |
 | Test.java:4775:10:4775:36 | new IteratorChain<>(...) : IteratorChain [<element>] : String | Test.java:4776:20:4776:22 | out : IteratorChain [<element>] : String | provenance |  |
-| Test.java:4775:28:4775:29 | in : ListIterator [<element>] : String | Test.java:4775:10:4775:36 | new IteratorChain<>(...) : IteratorChain [<element>] : String | provenance | MaD:150 |
+| Test.java:4775:28:4775:29 | in : ListIterator [<element>] : String | Test.java:4775:10:4775:36 | new IteratorChain<>(...) : IteratorChain [<element>] : String | provenance | MaD:152 |
 | Test.java:4776:20:4776:22 | out : IteratorChain [<element>] : String | Test.java:231:19:231:32 | it : IteratorChain [<element>] : String | provenance |  |
-| Test.java:4776:20:4776:22 | out : IteratorChain [<element>] : String | Test.java:4776:9:4776:23 | getElement(...) | provenance | MaD:4 |
+| Test.java:4776:20:4776:22 | out : IteratorChain [<element>] : String | Test.java:4776:9:4776:23 | getElement(...) | provenance | MaD:6 |
 | Test.java:4781:18:4781:61 | newListIteratorWithElement(...) : ListIterator [<element>] : String | Test.java:4782:34:4782:35 | in : ListIterator [<element>] : String | provenance |  |
 | Test.java:4781:45:4781:60 | (...)... : String | Test.java:259:49:259:57 | element : String | provenance |  |
-| Test.java:4781:45:4781:60 | (...)... : String | Test.java:4781:18:4781:61 | newListIteratorWithElement(...) : ListIterator [<element>] : String | provenance | MaD:2 |
+| Test.java:4781:45:4781:60 | (...)... : String | Test.java:4781:18:4781:61 | newListIteratorWithElement(...) : ListIterator [<element>] : String | provenance | MaD:4 |
 | Test.java:4781:53:4781:60 | source(...) : Object | Test.java:4781:45:4781:60 | (...)... : String | provenance |  |
 | Test.java:4782:10:4782:36 | new IteratorChain<>(...) : IteratorChain [<element>] : String | Test.java:4783:20:4783:22 | out : IteratorChain [<element>] : String | provenance |  |
-| Test.java:4782:34:4782:35 | in : ListIterator [<element>] : String | Test.java:4782:10:4782:36 | new IteratorChain<>(...) : IteratorChain [<element>] : String | provenance | MaD:151 |
+| Test.java:4782:34:4782:35 | in : ListIterator [<element>] : String | Test.java:4782:10:4782:36 | new IteratorChain<>(...) : IteratorChain [<element>] : String | provenance | MaD:153 |
 | Test.java:4783:20:4783:22 | out : IteratorChain [<element>] : String | Test.java:231:19:231:32 | it : IteratorChain [<element>] : String | provenance |  |
-| Test.java:4783:20:4783:22 | out : IteratorChain [<element>] : String | Test.java:4783:9:4783:23 | getElement(...) | provenance | MaD:4 |
+| Test.java:4783:20:4783:22 | out : IteratorChain [<element>] : String | Test.java:4783:9:4783:23 | getElement(...) | provenance | MaD:6 |
 | Test.java:4788:20:4788:79 | {...} : Iterator[] [[], <element>] : String | Test.java:4789:28:4789:29 | in : Iterator[] [[], <element>] : String | provenance |  |
 | Test.java:4788:35:4788:78 | newListIteratorWithElement(...) : ListIterator [<element>] : String | Test.java:4788:20:4788:79 | {...} : Iterator[] [[], <element>] : String | provenance |  |
 | Test.java:4788:62:4788:77 | (...)... : String | Test.java:259:49:259:57 | element : String | provenance |  |
-| Test.java:4788:62:4788:77 | (...)... : String | Test.java:4788:35:4788:78 | newListIteratorWithElement(...) : ListIterator [<element>] : String | provenance | MaD:2 |
+| Test.java:4788:62:4788:77 | (...)... : String | Test.java:4788:35:4788:78 | newListIteratorWithElement(...) : ListIterator [<element>] : String | provenance | MaD:4 |
 | Test.java:4788:70:4788:77 | source(...) : Object | Test.java:4788:62:4788:77 | (...)... : String | provenance |  |
 | Test.java:4789:10:4789:30 | new IteratorChain<>(...) : IteratorChain [<element>] : String | Test.java:4790:20:4790:22 | out : IteratorChain [<element>] : String | provenance |  |
-| Test.java:4789:28:4789:29 | in : Iterator[] [[], <element>] : String | Test.java:4789:10:4789:30 | new IteratorChain<>(...) : IteratorChain [<element>] : String | provenance | MaD:152 |
+| Test.java:4789:28:4789:29 | in : Iterator[] [[], <element>] : String | Test.java:4789:10:4789:30 | new IteratorChain<>(...) : IteratorChain [<element>] : String | provenance | MaD:154 |
 | Test.java:4790:20:4790:22 | out : IteratorChain [<element>] : String | Test.java:231:19:231:32 | it : IteratorChain [<element>] : String | provenance |  |
-| Test.java:4790:20:4790:22 | out : IteratorChain [<element>] : String | Test.java:4790:9:4790:23 | getElement(...) | provenance | MaD:4 |
+| Test.java:4790:20:4790:22 | out : IteratorChain [<element>] : String | Test.java:4790:9:4790:23 | getElement(...) | provenance | MaD:6 |
 | Test.java:4795:18:4795:61 | newListIteratorWithElement(...) : ListIterator [<element>] : String | Test.java:4796:20:4796:21 | in : ListIterator [<element>] : String | provenance |  |
 | Test.java:4795:45:4795:60 | (...)... : String | Test.java:259:49:259:57 | element : String | provenance |  |
-| Test.java:4795:45:4795:60 | (...)... : String | Test.java:4795:18:4795:61 | newListIteratorWithElement(...) : ListIterator [<element>] : String | provenance | MaD:2 |
+| Test.java:4795:45:4795:60 | (...)... : String | Test.java:4795:18:4795:61 | newListIteratorWithElement(...) : ListIterator [<element>] : String | provenance | MaD:4 |
 | Test.java:4795:53:4795:60 | source(...) : Object | Test.java:4795:45:4795:60 | (...)... : String | provenance |  |
 | Test.java:4796:4:4796:6 | out [post update] : IteratorChain [<element>] : String | Test.java:4797:20:4797:22 | out : IteratorChain [<element>] : String | provenance |  |
-| Test.java:4796:20:4796:21 | in : ListIterator [<element>] : String | Test.java:4796:4:4796:6 | out [post update] : IteratorChain [<element>] : String | provenance | MaD:153 |
+| Test.java:4796:20:4796:21 | in : ListIterator [<element>] : String | Test.java:4796:4:4796:6 | out [post update] : IteratorChain [<element>] : String | provenance | MaD:155 |
 | Test.java:4797:20:4797:22 | out : IteratorChain [<element>] : String | Test.java:231:19:231:32 | it : IteratorChain [<element>] : String | provenance |  |
-| Test.java:4797:20:4797:22 | out : IteratorChain [<element>] : String | Test.java:4797:9:4797:23 | getElement(...) | provenance | MaD:4 |
+| Test.java:4797:20:4797:22 | out : IteratorChain [<element>] : String | Test.java:4797:9:4797:23 | getElement(...) | provenance | MaD:6 |
 | Test.java:4802:18:4802:61 | newListIteratorWithElement(...) : ListIterator [<element>] : String | Test.java:4803:34:4803:35 | in : ListIterator [<element>] : String | provenance |  |
 | Test.java:4802:45:4802:60 | (...)... : String | Test.java:259:49:259:57 | element : String | provenance |  |
-| Test.java:4802:45:4802:60 | (...)... : String | Test.java:4802:18:4802:61 | newListIteratorWithElement(...) : ListIterator [<element>] : String | provenance | MaD:2 |
+| Test.java:4802:45:4802:60 | (...)... : String | Test.java:4802:18:4802:61 | newListIteratorWithElement(...) : ListIterator [<element>] : String | provenance | MaD:4 |
 | Test.java:4802:53:4802:60 | source(...) : Object | Test.java:4802:45:4802:60 | (...)... : String | provenance |  |
 | Test.java:4803:10:4803:36 | new IteratorEnumeration<>(...) : IteratorEnumeration [<element>] : String | Test.java:4804:20:4804:22 | out : IteratorEnumeration [<element>] : String | provenance |  |
-| Test.java:4803:34:4803:35 | in : ListIterator [<element>] : String | Test.java:4803:10:4803:36 | new IteratorEnumeration<>(...) : IteratorEnumeration [<element>] : String | provenance | MaD:154 |
+| Test.java:4803:34:4803:35 | in : ListIterator [<element>] : String | Test.java:4803:10:4803:36 | new IteratorEnumeration<>(...) : IteratorEnumeration [<element>] : String | provenance | MaD:156 |
 | Test.java:4804:20:4804:22 | out : IteratorEnumeration [<element>] : String | Test.java:234:19:234:42 | container : IteratorEnumeration [<element>] : String | provenance |  |
-| Test.java:4804:20:4804:22 | out : IteratorEnumeration [<element>] : String | Test.java:4804:9:4804:23 | getElement(...) | provenance | MaD:3 |
+| Test.java:4804:20:4804:22 | out : IteratorEnumeration [<element>] : String | Test.java:4804:9:4804:23 | getElement(...) | provenance | MaD:5 |
 | Test.java:4809:29:4809:97 | new IteratorEnumeration<>(...) : IteratorEnumeration [<element>] : String | Test.java:4810:10:4810:11 | in : IteratorEnumeration [<element>] : String | provenance |  |
-| Test.java:4809:53:4809:96 | newListIteratorWithElement(...) : ListIterator [<element>] : String | Test.java:4809:29:4809:97 | new IteratorEnumeration<>(...) : IteratorEnumeration [<element>] : String | provenance | MaD:154 |
+| Test.java:4809:53:4809:96 | newListIteratorWithElement(...) : ListIterator [<element>] : String | Test.java:4809:29:4809:97 | new IteratorEnumeration<>(...) : IteratorEnumeration [<element>] : String | provenance | MaD:156 |
 | Test.java:4809:80:4809:95 | (...)... : String | Test.java:259:49:259:57 | element : String | provenance |  |
-| Test.java:4809:80:4809:95 | (...)... : String | Test.java:4809:53:4809:96 | newListIteratorWithElement(...) : ListIterator [<element>] : String | provenance | MaD:2 |
+| Test.java:4809:80:4809:95 | (...)... : String | Test.java:4809:53:4809:96 | newListIteratorWithElement(...) : ListIterator [<element>] : String | provenance | MaD:4 |
 | Test.java:4809:88:4809:95 | source(...) : Object | Test.java:4809:80:4809:95 | (...)... : String | provenance |  |
-| Test.java:4810:10:4810:11 | in : IteratorEnumeration [<element>] : String | Test.java:4810:10:4810:25 | getIterator(...) : Iterator [<element>] : String | provenance | MaD:155 |
+| Test.java:4810:10:4810:11 | in : IteratorEnumeration [<element>] : String | Test.java:4810:10:4810:25 | getIterator(...) : Iterator [<element>] : String | provenance | MaD:157 |
 | Test.java:4810:10:4810:25 | getIterator(...) : Iterator [<element>] : String | Test.java:4811:20:4811:22 | out : Iterator [<element>] : String | provenance |  |
 | Test.java:4811:20:4811:22 | out : Iterator [<element>] : String | Test.java:231:19:231:32 | it : Iterator [<element>] : String | provenance |  |
-| Test.java:4811:20:4811:22 | out : Iterator [<element>] : String | Test.java:4811:9:4811:23 | getElement(...) | provenance | MaD:4 |
+| Test.java:4811:20:4811:22 | out : Iterator [<element>] : String | Test.java:4811:9:4811:23 | getElement(...) | provenance | MaD:6 |
 | Test.java:4816:18:4816:61 | newListIteratorWithElement(...) : ListIterator [<element>] : String | Test.java:4817:20:4817:21 | in : ListIterator [<element>] : String | provenance |  |
 | Test.java:4816:45:4816:60 | (...)... : String | Test.java:259:49:259:57 | element : String | provenance |  |
-| Test.java:4816:45:4816:60 | (...)... : String | Test.java:4816:18:4816:61 | newListIteratorWithElement(...) : ListIterator [<element>] : String | provenance | MaD:2 |
+| Test.java:4816:45:4816:60 | (...)... : String | Test.java:4816:18:4816:61 | newListIteratorWithElement(...) : ListIterator [<element>] : String | provenance | MaD:4 |
 | Test.java:4816:53:4816:60 | source(...) : Object | Test.java:4816:45:4816:60 | (...)... : String | provenance |  |
 | Test.java:4817:4:4817:6 | out [post update] : IteratorEnumeration [<element>] : String | Test.java:4818:20:4818:22 | out : IteratorEnumeration [<element>] : String | provenance |  |
-| Test.java:4817:20:4817:21 | in : ListIterator [<element>] : String | Test.java:4817:4:4817:6 | out [post update] : IteratorEnumeration [<element>] : String | provenance | MaD:156 |
+| Test.java:4817:20:4817:21 | in : ListIterator [<element>] : String | Test.java:4817:4:4817:6 | out [post update] : IteratorEnumeration [<element>] : String | provenance | MaD:158 |
 | Test.java:4818:20:4818:22 | out : IteratorEnumeration [<element>] : String | Test.java:234:19:234:42 | container : IteratorEnumeration [<element>] : String | provenance |  |
-| Test.java:4818:20:4818:22 | out : IteratorEnumeration [<element>] : String | Test.java:4818:9:4818:23 | getElement(...) | provenance | MaD:3 |
+| Test.java:4818:20:4818:22 | out : IteratorEnumeration [<element>] : String | Test.java:4818:9:4818:23 | getElement(...) | provenance | MaD:5 |
 | Test.java:4823:18:4823:61 | newListIteratorWithElement(...) : ListIterator [<element>] : String | Test.java:4824:31:4824:32 | in : ListIterator [<element>] : String | provenance |  |
 | Test.java:4823:45:4823:60 | (...)... : String | Test.java:259:49:259:57 | element : String | provenance |  |
-| Test.java:4823:45:4823:60 | (...)... : String | Test.java:4823:18:4823:61 | newListIteratorWithElement(...) : ListIterator [<element>] : String | provenance | MaD:2 |
+| Test.java:4823:45:4823:60 | (...)... : String | Test.java:4823:18:4823:61 | newListIteratorWithElement(...) : ListIterator [<element>] : String | provenance | MaD:4 |
 | Test.java:4823:53:4823:60 | source(...) : Object | Test.java:4823:45:4823:60 | (...)... : String | provenance |  |
 | Test.java:4824:10:4824:40 | new IteratorIterable<>(...) : IteratorIterable [<element>] : String | Test.java:4825:20:4825:22 | out : IteratorIterable [<element>] : String | provenance |  |
-| Test.java:4824:31:4824:32 | in : ListIterator [<element>] : String | Test.java:4824:10:4824:40 | new IteratorIterable<>(...) : IteratorIterable [<element>] : String | provenance | MaD:157 |
+| Test.java:4824:31:4824:32 | in : ListIterator [<element>] : String | Test.java:4824:10:4824:40 | new IteratorIterable<>(...) : IteratorIterable [<element>] : String | provenance | MaD:159 |
 | Test.java:4825:20:4825:22 | out : IteratorIterable [<element>] : String | Test.java:230:19:230:32 | it : IteratorIterable [<element>] : String | provenance |  |
-| Test.java:4825:20:4825:22 | out : IteratorIterable [<element>] : String | Test.java:4825:9:4825:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:4825:20:4825:22 | out : IteratorIterable [<element>] : String | Test.java:4825:9:4825:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:4830:18:4830:61 | newListIteratorWithElement(...) : ListIterator [<element>] : String | Test.java:4831:31:4831:32 | in : ListIterator [<element>] : String | provenance |  |
 | Test.java:4830:45:4830:60 | (...)... : String | Test.java:259:49:259:57 | element : String | provenance |  |
-| Test.java:4830:45:4830:60 | (...)... : String | Test.java:4830:18:4830:61 | newListIteratorWithElement(...) : ListIterator [<element>] : String | provenance | MaD:2 |
+| Test.java:4830:45:4830:60 | (...)... : String | Test.java:4830:18:4830:61 | newListIteratorWithElement(...) : ListIterator [<element>] : String | provenance | MaD:4 |
 | Test.java:4830:53:4830:60 | source(...) : Object | Test.java:4830:45:4830:60 | (...)... : String | provenance |  |
 | Test.java:4831:10:4831:33 | new IteratorIterable<>(...) : IteratorIterable [<element>] : String | Test.java:4832:20:4832:22 | out : IteratorIterable [<element>] : String | provenance |  |
-| Test.java:4831:31:4831:32 | in : ListIterator [<element>] : String | Test.java:4831:10:4831:33 | new IteratorIterable<>(...) : IteratorIterable [<element>] : String | provenance | MaD:157 |
+| Test.java:4831:31:4831:32 | in : ListIterator [<element>] : String | Test.java:4831:10:4831:33 | new IteratorIterable<>(...) : IteratorIterable [<element>] : String | provenance | MaD:159 |
 | Test.java:4832:20:4832:22 | out : IteratorIterable [<element>] : String | Test.java:230:19:230:32 | it : IteratorIterable [<element>] : String | provenance |  |
-| Test.java:4832:20:4832:22 | out : IteratorIterable [<element>] : String | Test.java:4832:9:4832:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:4832:20:4832:22 | out : IteratorIterable [<element>] : String | Test.java:4832:9:4832:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:4837:18:4837:61 | newListIteratorWithElement(...) : ListIterator [<element>] : String | Test.java:4838:34:4838:35 | in : ListIterator [<element>] : String | provenance |  |
 | Test.java:4837:45:4837:60 | (...)... : String | Test.java:259:49:259:57 | element : String | provenance |  |
-| Test.java:4837:45:4837:60 | (...)... : String | Test.java:4837:18:4837:61 | newListIteratorWithElement(...) : ListIterator [<element>] : String | provenance | MaD:2 |
+| Test.java:4837:45:4837:60 | (...)... : String | Test.java:4837:18:4837:61 | newListIteratorWithElement(...) : ListIterator [<element>] : String | provenance | MaD:4 |
 | Test.java:4837:53:4837:60 | source(...) : Object | Test.java:4837:45:4837:60 | (...)... : String | provenance |  |
 | Test.java:4838:10:4838:36 | new ListIteratorWrapper<>(...) : ListIteratorWrapper [<element>] : String | Test.java:4839:20:4839:22 | out : ListIteratorWrapper [<element>] : String | provenance |  |
-| Test.java:4838:34:4838:35 | in : ListIterator [<element>] : String | Test.java:4838:10:4838:36 | new ListIteratorWrapper<>(...) : ListIteratorWrapper [<element>] : String | provenance | MaD:158 |
+| Test.java:4838:34:4838:35 | in : ListIterator [<element>] : String | Test.java:4838:10:4838:36 | new ListIteratorWrapper<>(...) : ListIteratorWrapper [<element>] : String | provenance | MaD:160 |
 | Test.java:4839:20:4839:22 | out : ListIteratorWrapper [<element>] : String | Test.java:231:19:231:32 | it : ListIteratorWrapper [<element>] : String | provenance |  |
-| Test.java:4839:20:4839:22 | out : ListIteratorWrapper [<element>] : String | Test.java:4839:9:4839:23 | getElement(...) | provenance | MaD:4 |
+| Test.java:4839:20:4839:22 | out : ListIteratorWrapper [<element>] : String | Test.java:4839:9:4839:23 | getElement(...) | provenance | MaD:6 |
 | Test.java:4844:20:4844:58 | newTreeBagWithElement(...) : TreeBag [<element>] : String | Test.java:4845:30:4845:31 | in : TreeBag [<element>] : String | provenance |  |
 | Test.java:4844:42:4844:57 | (...)... : String | Test.java:267:39:267:47 | element : String | provenance |  |
-| Test.java:4844:42:4844:57 | (...)... : String | Test.java:4844:20:4844:58 | newTreeBagWithElement(...) : TreeBag [<element>] : String | provenance | MaD:2 |
-| Test.java:4844:42:4844:57 | (...)... : String | Test.java:4844:20:4844:58 | newTreeBagWithElement(...) : TreeBag [<element>] : String | provenance | MaD:395 |
+| Test.java:4844:42:4844:57 | (...)... : String | Test.java:4844:20:4844:58 | newTreeBagWithElement(...) : TreeBag [<element>] : String | provenance | MaD:4 |
+| Test.java:4844:42:4844:57 | (...)... : String | Test.java:4844:20:4844:58 | newTreeBagWithElement(...) : TreeBag [<element>] : String | provenance | MaD:470 |
 | Test.java:4844:50:4844:57 | source(...) : Object | Test.java:4844:42:4844:57 | (...)... : String | provenance |  |
 | Test.java:4845:10:4845:32 | new LoopingIterator<>(...) : LoopingIterator [<element>] : String | Test.java:4846:20:4846:22 | out : LoopingIterator [<element>] : String | provenance |  |
-| Test.java:4845:30:4845:31 | in : TreeBag [<element>] : String | Test.java:4845:10:4845:32 | new LoopingIterator<>(...) : LoopingIterator [<element>] : String | provenance | MaD:159 |
+| Test.java:4845:30:4845:31 | in : TreeBag [<element>] : String | Test.java:4845:10:4845:32 | new LoopingIterator<>(...) : LoopingIterator [<element>] : String | provenance | MaD:161 |
 | Test.java:4846:20:4846:22 | out : LoopingIterator [<element>] : String | Test.java:231:19:231:32 | it : LoopingIterator [<element>] : String | provenance |  |
-| Test.java:4846:20:4846:22 | out : LoopingIterator [<element>] : String | Test.java:4846:9:4846:23 | getElement(...) | provenance | MaD:4 |
+| Test.java:4846:20:4846:22 | out : LoopingIterator [<element>] : String | Test.java:4846:9:4846:23 | getElement(...) | provenance | MaD:6 |
 | Test.java:4851:14:4851:38 | of(...) : List [<element>] : String | Test.java:4852:34:4852:35 | in : List [<element>] : String | provenance |  |
-| Test.java:4851:22:4851:37 | (...)... : String | Test.java:4851:14:4851:38 | of(...) : List [<element>] : String | provenance | MaD:6 |
+| Test.java:4851:22:4851:37 | (...)... : String | Test.java:4851:14:4851:38 | of(...) : List [<element>] : String | provenance | MaD:7 |
 | Test.java:4851:30:4851:37 | source(...) : Object | Test.java:4851:22:4851:37 | (...)... : String | provenance |  |
 | Test.java:4852:10:4852:36 | new LoopingListIterator<>(...) : LoopingListIterator [<element>] : String | Test.java:4853:20:4853:22 | out : LoopingListIterator [<element>] : String | provenance |  |
-| Test.java:4852:34:4852:35 | in : List [<element>] : String | Test.java:4852:10:4852:36 | new LoopingListIterator<>(...) : LoopingListIterator [<element>] : String | provenance | MaD:160 |
+| Test.java:4852:34:4852:35 | in : List [<element>] : String | Test.java:4852:10:4852:36 | new LoopingListIterator<>(...) : LoopingListIterator [<element>] : String | provenance | MaD:162 |
 | Test.java:4853:20:4853:22 | out : LoopingListIterator [<element>] : String | Test.java:231:19:231:32 | it : LoopingListIterator [<element>] : String | provenance |  |
-| Test.java:4853:20:4853:22 | out : LoopingListIterator [<element>] : String | Test.java:4853:9:4853:23 | getElement(...) | provenance | MaD:4 |
+| Test.java:4853:20:4853:22 | out : LoopingListIterator [<element>] : String | Test.java:4853:9:4853:23 | getElement(...) | provenance | MaD:6 |
 | Test.java:4858:18:4858:47 | {...} : Object[] [[]] : String | Test.java:4859:34:4859:35 | in : Object[] [[]] : String | provenance |  |
 | Test.java:4858:31:4858:46 | (...)... : String | Test.java:4858:18:4858:47 | {...} : Object[] [[]] : String | provenance |  |
 | Test.java:4858:39:4858:46 | source(...) : Object | Test.java:4858:31:4858:46 | (...)... : String | provenance |  |
 | Test.java:4859:10:4859:42 | new ObjectArrayIterator<>(...) : ObjectArrayIterator [<element>] : String | Test.java:4860:20:4860:22 | out : ObjectArrayIterator [<element>] : String | provenance |  |
-| Test.java:4859:34:4859:35 | in : Object[] [[]] : String | Test.java:4859:10:4859:42 | new ObjectArrayIterator<>(...) : ObjectArrayIterator [<element>] : String | provenance | MaD:161 |
+| Test.java:4859:34:4859:35 | in : Object[] [[]] : String | Test.java:4859:10:4859:42 | new ObjectArrayIterator<>(...) : ObjectArrayIterator [<element>] : String | provenance | MaD:163 |
 | Test.java:4860:20:4860:22 | out : ObjectArrayIterator [<element>] : String | Test.java:231:19:231:32 | it : ObjectArrayIterator [<element>] : String | provenance |  |
-| Test.java:4860:20:4860:22 | out : ObjectArrayIterator [<element>] : String | Test.java:4860:9:4860:23 | getElement(...) | provenance | MaD:4 |
+| Test.java:4860:20:4860:22 | out : ObjectArrayIterator [<element>] : String | Test.java:4860:9:4860:23 | getElement(...) | provenance | MaD:6 |
 | Test.java:4865:18:4865:47 | {...} : Object[] [[]] : String | Test.java:4866:34:4866:35 | in : Object[] [[]] : String | provenance |  |
 | Test.java:4865:31:4865:46 | (...)... : String | Test.java:4865:18:4865:47 | {...} : Object[] [[]] : String | provenance |  |
 | Test.java:4865:39:4865:46 | source(...) : Object | Test.java:4865:31:4865:46 | (...)... : String | provenance |  |
 | Test.java:4866:10:4866:39 | new ObjectArrayIterator<>(...) : ObjectArrayIterator [<element>] : String | Test.java:4867:20:4867:22 | out : ObjectArrayIterator [<element>] : String | provenance |  |
-| Test.java:4866:34:4866:35 | in : Object[] [[]] : String | Test.java:4866:10:4866:39 | new ObjectArrayIterator<>(...) : ObjectArrayIterator [<element>] : String | provenance | MaD:161 |
+| Test.java:4866:34:4866:35 | in : Object[] [[]] : String | Test.java:4866:10:4866:39 | new ObjectArrayIterator<>(...) : ObjectArrayIterator [<element>] : String | provenance | MaD:163 |
 | Test.java:4867:20:4867:22 | out : ObjectArrayIterator [<element>] : String | Test.java:231:19:231:32 | it : ObjectArrayIterator [<element>] : String | provenance |  |
-| Test.java:4867:20:4867:22 | out : ObjectArrayIterator [<element>] : String | Test.java:4867:9:4867:23 | getElement(...) | provenance | MaD:4 |
+| Test.java:4867:20:4867:22 | out : ObjectArrayIterator [<element>] : String | Test.java:4867:9:4867:23 | getElement(...) | provenance | MaD:6 |
 | Test.java:4872:18:4872:47 | {...} : Object[] [[]] : String | Test.java:4873:34:4873:35 | in : Object[] [[]] : String | provenance |  |
 | Test.java:4872:31:4872:46 | (...)... : String | Test.java:4872:18:4872:47 | {...} : Object[] [[]] : String | provenance |  |
 | Test.java:4872:39:4872:46 | source(...) : Object | Test.java:4872:31:4872:46 | (...)... : String | provenance |  |
 | Test.java:4873:10:4873:36 | new ObjectArrayIterator<>(...) : ObjectArrayIterator [<element>] : String | Test.java:4874:20:4874:22 | out : ObjectArrayIterator [<element>] : String | provenance |  |
-| Test.java:4873:34:4873:35 | in : Object[] [[]] : String | Test.java:4873:10:4873:36 | new ObjectArrayIterator<>(...) : ObjectArrayIterator [<element>] : String | provenance | MaD:161 |
+| Test.java:4873:34:4873:35 | in : Object[] [[]] : String | Test.java:4873:10:4873:36 | new ObjectArrayIterator<>(...) : ObjectArrayIterator [<element>] : String | provenance | MaD:163 |
 | Test.java:4874:20:4874:22 | out : ObjectArrayIterator [<element>] : String | Test.java:231:19:231:32 | it : ObjectArrayIterator [<element>] : String | provenance |  |
-| Test.java:4874:20:4874:22 | out : ObjectArrayIterator [<element>] : String | Test.java:4874:9:4874:23 | getElement(...) | provenance | MaD:4 |
+| Test.java:4874:20:4874:22 | out : ObjectArrayIterator [<element>] : String | Test.java:4874:9:4874:23 | getElement(...) | provenance | MaD:6 |
 | Test.java:4879:29:4879:83 | new ObjectArrayIterator<>(...) : ObjectArrayIterator [<element>] : String | Test.java:4880:10:4880:11 | in : ObjectArrayIterator [<element>] : String | provenance |  |
-| Test.java:4879:53:4879:82 | new Object[] : Object[] [[]] : String | Test.java:4879:29:4879:83 | new ObjectArrayIterator<>(...) : ObjectArrayIterator [<element>] : String | provenance | MaD:161 |
+| Test.java:4879:53:4879:82 | new Object[] : Object[] [[]] : String | Test.java:4879:29:4879:83 | new ObjectArrayIterator<>(...) : ObjectArrayIterator [<element>] : String | provenance | MaD:163 |
 | Test.java:4879:53:4879:82 | {...} : Object[] [[]] : String | Test.java:4879:53:4879:82 | new Object[] : Object[] [[]] : String | provenance |  |
 | Test.java:4879:66:4879:81 | (...)... : String | Test.java:4879:53:4879:82 | {...} : Object[] [[]] : String | provenance |  |
 | Test.java:4879:74:4879:81 | source(...) : Object | Test.java:4879:66:4879:81 | (...)... : String | provenance |  |
-| Test.java:4880:10:4880:11 | in : ObjectArrayIterator [<element>] : String | Test.java:4880:10:4880:22 | getArray(...) : Object[] [[]] : String | provenance | MaD:162 |
+| Test.java:4880:10:4880:11 | in : ObjectArrayIterator [<element>] : String | Test.java:4880:10:4880:22 | getArray(...) : Object[] [[]] : String | provenance | MaD:164 |
 | Test.java:4880:10:4880:22 | getArray(...) : Object[] [[]] : String | Test.java:4881:25:4881:27 | out : Object[] [[]] : String | provenance |  |
 | Test.java:4881:25:4881:27 | out : Object[] [[]] : String | Test.java:229:24:229:32 | array : Object[] [[]] : String | provenance |  |
 | Test.java:4881:25:4881:27 | out : Object[] [[]] : String | Test.java:4881:9:4881:28 | getArrayElement(...) | provenance |  |
@@ -7085,2304 +7085,2304 @@ edges
 | Test.java:4886:31:4886:46 | (...)... : String | Test.java:4886:18:4886:47 | {...} : Object[] [[]] : String | provenance |  |
 | Test.java:4886:39:4886:46 | source(...) : Object | Test.java:4886:31:4886:46 | (...)... : String | provenance |  |
 | Test.java:4887:10:4887:46 | new ObjectArrayListIterator<>(...) : ObjectArrayListIterator [<element>] : String | Test.java:4888:20:4888:22 | out : ObjectArrayListIterator [<element>] : String | provenance |  |
-| Test.java:4887:38:4887:39 | in : Object[] [[]] : String | Test.java:4887:10:4887:46 | new ObjectArrayListIterator<>(...) : ObjectArrayListIterator [<element>] : String | provenance | MaD:163 |
+| Test.java:4887:38:4887:39 | in : Object[] [[]] : String | Test.java:4887:10:4887:46 | new ObjectArrayListIterator<>(...) : ObjectArrayListIterator [<element>] : String | provenance | MaD:165 |
 | Test.java:4888:20:4888:22 | out : ObjectArrayListIterator [<element>] : String | Test.java:231:19:231:32 | it : ObjectArrayListIterator [<element>] : String | provenance |  |
-| Test.java:4888:20:4888:22 | out : ObjectArrayListIterator [<element>] : String | Test.java:4888:9:4888:23 | getElement(...) | provenance | MaD:4 |
+| Test.java:4888:20:4888:22 | out : ObjectArrayListIterator [<element>] : String | Test.java:4888:9:4888:23 | getElement(...) | provenance | MaD:6 |
 | Test.java:4893:18:4893:47 | {...} : Object[] [[]] : String | Test.java:4894:38:4894:39 | in : Object[] [[]] : String | provenance |  |
 | Test.java:4893:31:4893:46 | (...)... : String | Test.java:4893:18:4893:47 | {...} : Object[] [[]] : String | provenance |  |
 | Test.java:4893:39:4893:46 | source(...) : Object | Test.java:4893:31:4893:46 | (...)... : String | provenance |  |
 | Test.java:4894:10:4894:43 | new ObjectArrayListIterator<>(...) : ObjectArrayListIterator [<element>] : String | Test.java:4895:20:4895:22 | out : ObjectArrayListIterator [<element>] : String | provenance |  |
-| Test.java:4894:38:4894:39 | in : Object[] [[]] : String | Test.java:4894:10:4894:43 | new ObjectArrayListIterator<>(...) : ObjectArrayListIterator [<element>] : String | provenance | MaD:163 |
+| Test.java:4894:38:4894:39 | in : Object[] [[]] : String | Test.java:4894:10:4894:43 | new ObjectArrayListIterator<>(...) : ObjectArrayListIterator [<element>] : String | provenance | MaD:165 |
 | Test.java:4895:20:4895:22 | out : ObjectArrayListIterator [<element>] : String | Test.java:231:19:231:32 | it : ObjectArrayListIterator [<element>] : String | provenance |  |
-| Test.java:4895:20:4895:22 | out : ObjectArrayListIterator [<element>] : String | Test.java:4895:9:4895:23 | getElement(...) | provenance | MaD:4 |
+| Test.java:4895:20:4895:22 | out : ObjectArrayListIterator [<element>] : String | Test.java:4895:9:4895:23 | getElement(...) | provenance | MaD:6 |
 | Test.java:4900:18:4900:47 | {...} : Object[] [[]] : String | Test.java:4901:38:4901:39 | in : Object[] [[]] : String | provenance |  |
 | Test.java:4900:31:4900:46 | (...)... : String | Test.java:4900:18:4900:47 | {...} : Object[] [[]] : String | provenance |  |
 | Test.java:4900:39:4900:46 | source(...) : Object | Test.java:4900:31:4900:46 | (...)... : String | provenance |  |
 | Test.java:4901:10:4901:40 | new ObjectArrayListIterator<>(...) : ObjectArrayListIterator [<element>] : String | Test.java:4902:20:4902:22 | out : ObjectArrayListIterator [<element>] : String | provenance |  |
-| Test.java:4901:38:4901:39 | in : Object[] [[]] : String | Test.java:4901:10:4901:40 | new ObjectArrayListIterator<>(...) : ObjectArrayListIterator [<element>] : String | provenance | MaD:163 |
+| Test.java:4901:38:4901:39 | in : Object[] [[]] : String | Test.java:4901:10:4901:40 | new ObjectArrayListIterator<>(...) : ObjectArrayListIterator [<element>] : String | provenance | MaD:165 |
 | Test.java:4902:20:4902:22 | out : ObjectArrayListIterator [<element>] : String | Test.java:231:19:231:32 | it : ObjectArrayListIterator [<element>] : String | provenance |  |
-| Test.java:4902:20:4902:22 | out : ObjectArrayListIterator [<element>] : String | Test.java:4902:9:4902:23 | getElement(...) | provenance | MaD:4 |
+| Test.java:4902:20:4902:22 | out : ObjectArrayListIterator [<element>] : String | Test.java:4902:9:4902:23 | getElement(...) | provenance | MaD:6 |
 | Test.java:4907:18:4907:61 | newListIteratorWithElement(...) : ListIterator [<element>] : String | Test.java:4908:30:4908:31 | in : ListIterator [<element>] : String | provenance |  |
 | Test.java:4907:45:4907:60 | (...)... : String | Test.java:259:49:259:57 | element : String | provenance |  |
-| Test.java:4907:45:4907:60 | (...)... : String | Test.java:4907:18:4907:61 | newListIteratorWithElement(...) : ListIterator [<element>] : String | provenance | MaD:2 |
+| Test.java:4907:45:4907:60 | (...)... : String | Test.java:4907:18:4907:61 | newListIteratorWithElement(...) : ListIterator [<element>] : String | provenance | MaD:4 |
 | Test.java:4907:53:4907:60 | source(...) : Object | Test.java:4907:45:4907:60 | (...)... : String | provenance |  |
 | Test.java:4908:10:4908:32 | new PeekingIterator<>(...) : PeekingIterator [<element>] : String | Test.java:4909:20:4909:22 | out : PeekingIterator [<element>] : String | provenance |  |
-| Test.java:4908:30:4908:31 | in : ListIterator [<element>] : String | Test.java:4908:10:4908:32 | new PeekingIterator<>(...) : PeekingIterator [<element>] : String | provenance | MaD:164 |
+| Test.java:4908:30:4908:31 | in : ListIterator [<element>] : String | Test.java:4908:10:4908:32 | new PeekingIterator<>(...) : PeekingIterator [<element>] : String | provenance | MaD:166 |
 | Test.java:4909:20:4909:22 | out : PeekingIterator [<element>] : String | Test.java:231:19:231:32 | it : PeekingIterator [<element>] : String | provenance |  |
-| Test.java:4909:20:4909:22 | out : PeekingIterator [<element>] : String | Test.java:4909:9:4909:23 | getElement(...) | provenance | MaD:4 |
+| Test.java:4909:20:4909:22 | out : PeekingIterator [<element>] : String | Test.java:4909:9:4909:23 | getElement(...) | provenance | MaD:6 |
 | Test.java:4914:25:4914:89 | new PeekingIterator<>(...) : PeekingIterator [<element>] : String | Test.java:4915:10:4915:11 | in : PeekingIterator [<element>] : String | provenance |  |
-| Test.java:4914:45:4914:88 | newListIteratorWithElement(...) : ListIterator [<element>] : String | Test.java:4914:25:4914:89 | new PeekingIterator<>(...) : PeekingIterator [<element>] : String | provenance | MaD:164 |
+| Test.java:4914:45:4914:88 | newListIteratorWithElement(...) : ListIterator [<element>] : String | Test.java:4914:25:4914:89 | new PeekingIterator<>(...) : PeekingIterator [<element>] : String | provenance | MaD:166 |
 | Test.java:4914:72:4914:87 | (...)... : String | Test.java:259:49:259:57 | element : String | provenance |  |
-| Test.java:4914:72:4914:87 | (...)... : String | Test.java:4914:45:4914:88 | newListIteratorWithElement(...) : ListIterator [<element>] : String | provenance | MaD:2 |
+| Test.java:4914:72:4914:87 | (...)... : String | Test.java:4914:45:4914:88 | newListIteratorWithElement(...) : ListIterator [<element>] : String | provenance | MaD:4 |
 | Test.java:4914:80:4914:87 | source(...) : Object | Test.java:4914:72:4914:87 | (...)... : String | provenance |  |
-| Test.java:4915:10:4915:11 | in : PeekingIterator [<element>] : String | Test.java:4915:10:4915:21 | element(...) : String | provenance | MaD:165 |
+| Test.java:4915:10:4915:11 | in : PeekingIterator [<element>] : String | Test.java:4915:10:4915:21 | element(...) : String | provenance | MaD:167 |
 | Test.java:4915:10:4915:21 | element(...) : String | Test.java:4916:9:4916:11 | out | provenance |  |
 | Test.java:4921:25:4921:89 | new PeekingIterator<>(...) : PeekingIterator [<element>] : String | Test.java:4922:10:4922:11 | in : PeekingIterator [<element>] : String | provenance |  |
-| Test.java:4921:45:4921:88 | newListIteratorWithElement(...) : ListIterator [<element>] : String | Test.java:4921:25:4921:89 | new PeekingIterator<>(...) : PeekingIterator [<element>] : String | provenance | MaD:164 |
+| Test.java:4921:45:4921:88 | newListIteratorWithElement(...) : ListIterator [<element>] : String | Test.java:4921:25:4921:89 | new PeekingIterator<>(...) : PeekingIterator [<element>] : String | provenance | MaD:166 |
 | Test.java:4921:72:4921:87 | (...)... : String | Test.java:259:49:259:57 | element : String | provenance |  |
-| Test.java:4921:72:4921:87 | (...)... : String | Test.java:4921:45:4921:88 | newListIteratorWithElement(...) : ListIterator [<element>] : String | provenance | MaD:2 |
+| Test.java:4921:72:4921:87 | (...)... : String | Test.java:4921:45:4921:88 | newListIteratorWithElement(...) : ListIterator [<element>] : String | provenance | MaD:4 |
 | Test.java:4921:80:4921:87 | source(...) : Object | Test.java:4921:72:4921:87 | (...)... : String | provenance |  |
-| Test.java:4922:10:4922:11 | in : PeekingIterator [<element>] : String | Test.java:4922:10:4922:18 | peek(...) : String | provenance | MaD:166 |
+| Test.java:4922:10:4922:11 | in : PeekingIterator [<element>] : String | Test.java:4922:10:4922:18 | peek(...) : String | provenance | MaD:168 |
 | Test.java:4922:10:4922:18 | peek(...) : String | Test.java:4923:9:4923:11 | out | provenance |  |
 | Test.java:4928:18:4928:61 | newListIteratorWithElement(...) : ListIterator [<element>] : String | Test.java:4929:42:4929:43 | in : ListIterator [<element>] : String | provenance |  |
 | Test.java:4928:45:4928:60 | (...)... : String | Test.java:259:49:259:57 | element : String | provenance |  |
-| Test.java:4928:45:4928:60 | (...)... : String | Test.java:4928:18:4928:61 | newListIteratorWithElement(...) : ListIterator [<element>] : String | provenance | MaD:2 |
+| Test.java:4928:45:4928:60 | (...)... : String | Test.java:4928:18:4928:61 | newListIteratorWithElement(...) : ListIterator [<element>] : String | provenance | MaD:4 |
 | Test.java:4928:53:4928:60 | source(...) : Object | Test.java:4928:45:4928:60 | (...)... : String | provenance |  |
 | Test.java:4929:10:4929:44 | peekingIterator(...) : PeekingIterator [<element>] : String | Test.java:4930:20:4930:22 | out : PeekingIterator [<element>] : String | provenance |  |
-| Test.java:4929:42:4929:43 | in : ListIterator [<element>] : String | Test.java:4929:10:4929:44 | peekingIterator(...) : PeekingIterator [<element>] : String | provenance | MaD:167 |
+| Test.java:4929:42:4929:43 | in : ListIterator [<element>] : String | Test.java:4929:10:4929:44 | peekingIterator(...) : PeekingIterator [<element>] : String | provenance | MaD:169 |
 | Test.java:4930:20:4930:22 | out : PeekingIterator [<element>] : String | Test.java:231:19:231:32 | it : PeekingIterator [<element>] : String | provenance |  |
-| Test.java:4930:20:4930:22 | out : PeekingIterator [<element>] : String | Test.java:4930:9:4930:23 | getElement(...) | provenance | MaD:4 |
+| Test.java:4930:20:4930:22 | out : PeekingIterator [<element>] : String | Test.java:4930:9:4930:23 | getElement(...) | provenance | MaD:6 |
 | Test.java:4935:28:4935:60 | of(...) : List [<element>] : String | Test.java:4936:34:4936:35 | in : List [<element>] : String | provenance |  |
-| Test.java:4935:44:4935:59 | (...)... : String | Test.java:4935:28:4935:60 | of(...) : List [<element>] : String | provenance | MaD:6 |
+| Test.java:4935:44:4935:59 | (...)... : String | Test.java:4935:28:4935:60 | of(...) : List [<element>] : String | provenance | MaD:7 |
 | Test.java:4935:52:4935:59 | source(...) : Object | Test.java:4935:44:4935:59 | (...)... : String | provenance |  |
 | Test.java:4936:10:4936:36 | new PermutationIterator<>(...) : PermutationIterator [<element>, <element>] : String | Test.java:4937:31:4937:33 | out : PermutationIterator [<element>, <element>] : String | provenance |  |
-| Test.java:4936:34:4936:35 | in : List [<element>] : String | Test.java:4936:10:4936:36 | new PermutationIterator<>(...) : PermutationIterator [<element>, <element>] : String | provenance | MaD:168 |
+| Test.java:4936:34:4936:35 | in : List [<element>] : String | Test.java:4936:10:4936:36 | new PermutationIterator<>(...) : PermutationIterator [<element>, <element>] : String | provenance | MaD:170 |
 | Test.java:4937:20:4937:34 | getElement(...) : List [<element>] : String | Test.java:230:19:230:32 | it : List [<element>] : String | provenance |  |
-| Test.java:4937:20:4937:34 | getElement(...) : List [<element>] : String | Test.java:4937:9:4937:35 | getElement(...) | provenance | MaD:1 |
+| Test.java:4937:20:4937:34 | getElement(...) : List [<element>] : String | Test.java:4937:9:4937:35 | getElement(...) | provenance | MaD:3 |
 | Test.java:4937:31:4937:33 | out : PermutationIterator [<element>, <element>] : String | Test.java:231:19:231:32 | it : PermutationIterator [<element>, <element>] : String | provenance |  |
-| Test.java:4937:31:4937:33 | out : PermutationIterator [<element>, <element>] : String | Test.java:4937:20:4937:34 | getElement(...) : List [<element>] : String | provenance | MaD:4 |
+| Test.java:4937:31:4937:33 | out : PermutationIterator [<element>, <element>] : String | Test.java:4937:20:4937:34 | getElement(...) : List [<element>] : String | provenance | MaD:6 |
 | Test.java:4942:18:4942:61 | newListIteratorWithElement(...) : ListIterator [<element>] : String | Test.java:4943:31:4943:32 | in : ListIterator [<element>] : String | provenance |  |
 | Test.java:4942:45:4942:60 | (...)... : String | Test.java:259:49:259:57 | element : String | provenance |  |
-| Test.java:4942:45:4942:60 | (...)... : String | Test.java:4942:18:4942:61 | newListIteratorWithElement(...) : ListIterator [<element>] : String | provenance | MaD:2 |
+| Test.java:4942:45:4942:60 | (...)... : String | Test.java:4942:18:4942:61 | newListIteratorWithElement(...) : ListIterator [<element>] : String | provenance | MaD:4 |
 | Test.java:4942:53:4942:60 | source(...) : Object | Test.java:4942:45:4942:60 | (...)... : String | provenance |  |
 | Test.java:4943:10:4943:33 | new PushbackIterator<>(...) : PushbackIterator [<element>] : String | Test.java:4944:20:4944:22 | out : PushbackIterator [<element>] : String | provenance |  |
-| Test.java:4943:31:4943:32 | in : ListIterator [<element>] : String | Test.java:4943:10:4943:33 | new PushbackIterator<>(...) : PushbackIterator [<element>] : String | provenance | MaD:169 |
+| Test.java:4943:31:4943:32 | in : ListIterator [<element>] : String | Test.java:4943:10:4943:33 | new PushbackIterator<>(...) : PushbackIterator [<element>] : String | provenance | MaD:171 |
 | Test.java:4944:20:4944:22 | out : PushbackIterator [<element>] : String | Test.java:231:19:231:32 | it : PushbackIterator [<element>] : String | provenance |  |
-| Test.java:4944:20:4944:22 | out : PushbackIterator [<element>] : String | Test.java:4944:9:4944:23 | getElement(...) | provenance | MaD:4 |
+| Test.java:4944:20:4944:22 | out : PushbackIterator [<element>] : String | Test.java:4944:9:4944:23 | getElement(...) | provenance | MaD:6 |
 | Test.java:4949:16:4949:23 | source(...) : Object | Test.java:4950:17:4950:18 | in : Object | provenance |  |
 | Test.java:4950:4:4950:6 | out [post update] : PushbackIterator [<element>] : Object | Test.java:4951:20:4951:22 | out : PushbackIterator [<element>] : Object | provenance |  |
-| Test.java:4950:17:4950:18 | in : Object | Test.java:4950:4:4950:6 | out [post update] : PushbackIterator [<element>] : Object | provenance | MaD:170 |
+| Test.java:4950:17:4950:18 | in : Object | Test.java:4950:4:4950:6 | out [post update] : PushbackIterator [<element>] : Object | provenance | MaD:172 |
 | Test.java:4951:20:4951:22 | out : PushbackIterator [<element>] : Object | Test.java:231:19:231:32 | it : PushbackIterator [<element>] : Object | provenance |  |
-| Test.java:4951:20:4951:22 | out : PushbackIterator [<element>] : Object | Test.java:4951:9:4951:23 | getElement(...) | provenance | MaD:4 |
+| Test.java:4951:20:4951:22 | out : PushbackIterator [<element>] : Object | Test.java:4951:9:4951:23 | getElement(...) | provenance | MaD:6 |
 | Test.java:4956:18:4956:61 | newListIteratorWithElement(...) : ListIterator [<element>] : String | Test.java:4957:44:4957:45 | in : ListIterator [<element>] : String | provenance |  |
 | Test.java:4956:45:4956:60 | (...)... : String | Test.java:259:49:259:57 | element : String | provenance |  |
-| Test.java:4956:45:4956:60 | (...)... : String | Test.java:4956:18:4956:61 | newListIteratorWithElement(...) : ListIterator [<element>] : String | provenance | MaD:2 |
+| Test.java:4956:45:4956:60 | (...)... : String | Test.java:4956:18:4956:61 | newListIteratorWithElement(...) : ListIterator [<element>] : String | provenance | MaD:4 |
 | Test.java:4956:53:4956:60 | source(...) : Object | Test.java:4956:45:4956:60 | (...)... : String | provenance |  |
 | Test.java:4957:10:4957:46 | pushbackIterator(...) : PushbackIterator [<element>] : String | Test.java:4958:20:4958:22 | out : PushbackIterator [<element>] : String | provenance |  |
-| Test.java:4957:44:4957:45 | in : ListIterator [<element>] : String | Test.java:4957:10:4957:46 | pushbackIterator(...) : PushbackIterator [<element>] : String | provenance | MaD:171 |
+| Test.java:4957:44:4957:45 | in : ListIterator [<element>] : String | Test.java:4957:10:4957:46 | pushbackIterator(...) : PushbackIterator [<element>] : String | provenance | MaD:173 |
 | Test.java:4958:20:4958:22 | out : PushbackIterator [<element>] : String | Test.java:231:19:231:32 | it : PushbackIterator [<element>] : String | provenance |  |
-| Test.java:4958:20:4958:22 | out : PushbackIterator [<element>] : String | Test.java:4958:9:4958:23 | getElement(...) | provenance | MaD:4 |
+| Test.java:4958:20:4958:22 | out : PushbackIterator [<element>] : String | Test.java:4958:9:4958:23 | getElement(...) | provenance | MaD:6 |
 | Test.java:4963:14:4963:38 | of(...) : List [<element>] : String | Test.java:4964:34:4964:35 | in : List [<element>] : String | provenance |  |
-| Test.java:4963:22:4963:37 | (...)... : String | Test.java:4963:14:4963:38 | of(...) : List [<element>] : String | provenance | MaD:6 |
+| Test.java:4963:22:4963:37 | (...)... : String | Test.java:4963:14:4963:38 | of(...) : List [<element>] : String | provenance | MaD:7 |
 | Test.java:4963:30:4963:37 | source(...) : Object | Test.java:4963:22:4963:37 | (...)... : String | provenance |  |
 | Test.java:4964:10:4964:36 | new ReverseListIterator<>(...) : ReverseListIterator [<element>] : String | Test.java:4965:20:4965:22 | out : ReverseListIterator [<element>] : String | provenance |  |
-| Test.java:4964:34:4964:35 | in : List [<element>] : String | Test.java:4964:10:4964:36 | new ReverseListIterator<>(...) : ReverseListIterator [<element>] : String | provenance | MaD:172 |
+| Test.java:4964:34:4964:35 | in : List [<element>] : String | Test.java:4964:10:4964:36 | new ReverseListIterator<>(...) : ReverseListIterator [<element>] : String | provenance | MaD:174 |
 | Test.java:4965:20:4965:22 | out : ReverseListIterator [<element>] : String | Test.java:231:19:231:32 | it : ReverseListIterator [<element>] : String | provenance |  |
-| Test.java:4965:20:4965:22 | out : ReverseListIterator [<element>] : String | Test.java:4965:9:4965:23 | getElement(...) | provenance | MaD:4 |
+| Test.java:4965:20:4965:22 | out : ReverseListIterator [<element>] : String | Test.java:4965:9:4965:23 | getElement(...) | provenance | MaD:6 |
 | Test.java:4970:16:4970:23 | source(...) : Object | Test.java:4971:32:4971:33 | in : Object | provenance |  |
 | Test.java:4971:10:4971:41 | new SingletonIterator<>(...) : SingletonIterator [<element>] : Object | Test.java:4972:20:4972:22 | out : SingletonIterator [<element>] : Object | provenance |  |
-| Test.java:4971:32:4971:33 | in : Object | Test.java:4971:10:4971:41 | new SingletonIterator<>(...) : SingletonIterator [<element>] : Object | provenance | MaD:173 |
+| Test.java:4971:32:4971:33 | in : Object | Test.java:4971:10:4971:41 | new SingletonIterator<>(...) : SingletonIterator [<element>] : Object | provenance | MaD:175 |
 | Test.java:4972:20:4972:22 | out : SingletonIterator [<element>] : Object | Test.java:231:19:231:32 | it : SingletonIterator [<element>] : Object | provenance |  |
-| Test.java:4972:20:4972:22 | out : SingletonIterator [<element>] : Object | Test.java:4972:9:4972:23 | getElement(...) | provenance | MaD:4 |
+| Test.java:4972:20:4972:22 | out : SingletonIterator [<element>] : Object | Test.java:4972:9:4972:23 | getElement(...) | provenance | MaD:6 |
 | Test.java:4977:16:4977:23 | source(...) : Object | Test.java:4978:32:4978:33 | in : Object | provenance |  |
 | Test.java:4978:10:4978:34 | new SingletonIterator<>(...) : SingletonIterator [<element>] : Object | Test.java:4979:20:4979:22 | out : SingletonIterator [<element>] : Object | provenance |  |
-| Test.java:4978:32:4978:33 | in : Object | Test.java:4978:10:4978:34 | new SingletonIterator<>(...) : SingletonIterator [<element>] : Object | provenance | MaD:173 |
+| Test.java:4978:32:4978:33 | in : Object | Test.java:4978:10:4978:34 | new SingletonIterator<>(...) : SingletonIterator [<element>] : Object | provenance | MaD:175 |
 | Test.java:4979:20:4979:22 | out : SingletonIterator [<element>] : Object | Test.java:231:19:231:32 | it : SingletonIterator [<element>] : Object | provenance |  |
-| Test.java:4979:20:4979:22 | out : SingletonIterator [<element>] : Object | Test.java:4979:9:4979:23 | getElement(...) | provenance | MaD:4 |
+| Test.java:4979:20:4979:22 | out : SingletonIterator [<element>] : Object | Test.java:4979:9:4979:23 | getElement(...) | provenance | MaD:6 |
 | Test.java:4984:16:4984:23 | source(...) : Object | Test.java:4985:36:4985:37 | in : Object | provenance |  |
 | Test.java:4985:10:4985:38 | new SingletonListIterator<>(...) : SingletonListIterator [<element>] : Object | Test.java:4986:20:4986:22 | out : SingletonListIterator [<element>] : Object | provenance |  |
-| Test.java:4985:36:4985:37 | in : Object | Test.java:4985:10:4985:38 | new SingletonListIterator<>(...) : SingletonListIterator [<element>] : Object | provenance | MaD:174 |
+| Test.java:4985:36:4985:37 | in : Object | Test.java:4985:10:4985:38 | new SingletonListIterator<>(...) : SingletonListIterator [<element>] : Object | provenance | MaD:176 |
 | Test.java:4986:20:4986:22 | out : SingletonListIterator [<element>] : Object | Test.java:231:19:231:32 | it : SingletonListIterator [<element>] : Object | provenance |  |
-| Test.java:4986:20:4986:22 | out : SingletonListIterator [<element>] : Object | Test.java:4986:9:4986:23 | getElement(...) | provenance | MaD:4 |
+| Test.java:4986:20:4986:22 | out : SingletonListIterator [<element>] : Object | Test.java:4986:9:4986:23 | getElement(...) | provenance | MaD:6 |
 | Test.java:4991:18:4991:61 | newListIteratorWithElement(...) : ListIterator [<element>] : String | Test.java:4992:31:4992:32 | in : ListIterator [<element>] : String | provenance |  |
 | Test.java:4991:45:4991:60 | (...)... : String | Test.java:259:49:259:57 | element : String | provenance |  |
-| Test.java:4991:45:4991:60 | (...)... : String | Test.java:4991:18:4991:61 | newListIteratorWithElement(...) : ListIterator [<element>] : String | provenance | MaD:2 |
+| Test.java:4991:45:4991:60 | (...)... : String | Test.java:4991:18:4991:61 | newListIteratorWithElement(...) : ListIterator [<element>] : String | provenance | MaD:4 |
 | Test.java:4991:53:4991:60 | source(...) : Object | Test.java:4991:45:4991:60 | (...)... : String | provenance |  |
 | Test.java:4992:10:4992:37 | new SkippingIterator<>(...) : SkippingIterator [<element>] : String | Test.java:4993:20:4993:22 | out : SkippingIterator [<element>] : String | provenance |  |
-| Test.java:4992:31:4992:32 | in : ListIterator [<element>] : String | Test.java:4992:10:4992:37 | new SkippingIterator<>(...) : SkippingIterator [<element>] : String | provenance | MaD:175 |
+| Test.java:4992:31:4992:32 | in : ListIterator [<element>] : String | Test.java:4992:10:4992:37 | new SkippingIterator<>(...) : SkippingIterator [<element>] : String | provenance | MaD:177 |
 | Test.java:4993:20:4993:22 | out : SkippingIterator [<element>] : String | Test.java:231:19:231:32 | it : SkippingIterator [<element>] : String | provenance |  |
-| Test.java:4993:20:4993:22 | out : SkippingIterator [<element>] : String | Test.java:4993:9:4993:23 | getElement(...) | provenance | MaD:4 |
+| Test.java:4993:20:4993:22 | out : SkippingIterator [<element>] : String | Test.java:4993:9:4993:23 | getElement(...) | provenance | MaD:6 |
 | Test.java:4998:18:4998:61 | newListIteratorWithElement(...) : ListIterator [<element>] : String | Test.java:4999:35:4999:36 | in : ListIterator [<element>] : String | provenance |  |
 | Test.java:4998:45:4998:60 | (...)... : String | Test.java:259:49:259:57 | element : String | provenance |  |
-| Test.java:4998:45:4998:60 | (...)... : String | Test.java:4998:18:4998:61 | newListIteratorWithElement(...) : ListIterator [<element>] : String | provenance | MaD:2 |
+| Test.java:4998:45:4998:60 | (...)... : String | Test.java:4998:18:4998:61 | newListIteratorWithElement(...) : ListIterator [<element>] : String | provenance | MaD:4 |
 | Test.java:4998:53:4998:60 | source(...) : Object | Test.java:4998:45:4998:60 | (...)... : String | provenance |  |
 | Test.java:4999:10:4999:37 | new UniqueFilterIterator<>(...) : UniqueFilterIterator [<element>] : String | Test.java:5000:20:5000:22 | out : UniqueFilterIterator [<element>] : String | provenance |  |
-| Test.java:4999:35:4999:36 | in : ListIterator [<element>] : String | Test.java:4999:10:4999:37 | new UniqueFilterIterator<>(...) : UniqueFilterIterator [<element>] : String | provenance | MaD:176 |
+| Test.java:4999:35:4999:36 | in : ListIterator [<element>] : String | Test.java:4999:10:4999:37 | new UniqueFilterIterator<>(...) : UniqueFilterIterator [<element>] : String | provenance | MaD:178 |
 | Test.java:5000:20:5000:22 | out : UniqueFilterIterator [<element>] : String | Test.java:231:19:231:32 | it : UniqueFilterIterator [<element>] : String | provenance |  |
-| Test.java:5000:20:5000:22 | out : UniqueFilterIterator [<element>] : String | Test.java:5000:9:5000:23 | getElement(...) | provenance | MaD:4 |
+| Test.java:5000:20:5000:22 | out : UniqueFilterIterator [<element>] : String | Test.java:5000:9:5000:23 | getElement(...) | provenance | MaD:6 |
 | Test.java:5005:18:5005:61 | newListIteratorWithElement(...) : ListIterator [<element>] : String | Test.java:5006:52:5006:53 | in : ListIterator [<element>] : String | provenance |  |
 | Test.java:5005:45:5005:60 | (...)... : String | Test.java:259:49:259:57 | element : String | provenance |  |
-| Test.java:5005:45:5005:60 | (...)... : String | Test.java:5005:18:5005:61 | newListIteratorWithElement(...) : ListIterator [<element>] : String | provenance | MaD:2 |
+| Test.java:5005:45:5005:60 | (...)... : String | Test.java:5005:18:5005:61 | newListIteratorWithElement(...) : ListIterator [<element>] : String | provenance | MaD:4 |
 | Test.java:5005:53:5005:60 | source(...) : Object | Test.java:5005:45:5005:60 | (...)... : String | provenance |  |
 | Test.java:5006:10:5006:54 | unmodifiableIterator(...) : Iterator [<element>] : String | Test.java:5007:20:5007:22 | out : Iterator [<element>] : String | provenance |  |
-| Test.java:5006:52:5006:53 | in : ListIterator [<element>] : String | Test.java:5006:10:5006:54 | unmodifiableIterator(...) : Iterator [<element>] : String | provenance | MaD:177 |
+| Test.java:5006:52:5006:53 | in : ListIterator [<element>] : String | Test.java:5006:10:5006:54 | unmodifiableIterator(...) : Iterator [<element>] : String | provenance | MaD:179 |
 | Test.java:5007:20:5007:22 | out : Iterator [<element>] : String | Test.java:231:19:231:32 | it : Iterator [<element>] : String | provenance |  |
-| Test.java:5007:20:5007:22 | out : Iterator [<element>] : String | Test.java:5007:9:5007:23 | getElement(...) | provenance | MaD:4 |
+| Test.java:5007:20:5007:22 | out : Iterator [<element>] : String | Test.java:5007:9:5007:23 | getElement(...) | provenance | MaD:6 |
 | Test.java:5012:22:5012:65 | newListIteratorWithElement(...) : ListIterator [<element>] : String | Test.java:5013:59:5013:60 | in : ListIterator [<element>] : String | provenance |  |
 | Test.java:5012:49:5012:64 | (...)... : String | Test.java:259:49:259:57 | element : String | provenance |  |
-| Test.java:5012:49:5012:64 | (...)... : String | Test.java:5012:22:5012:65 | newListIteratorWithElement(...) : ListIterator [<element>] : String | provenance | MaD:2 |
+| Test.java:5012:49:5012:64 | (...)... : String | Test.java:5012:22:5012:65 | newListIteratorWithElement(...) : ListIterator [<element>] : String | provenance | MaD:4 |
 | Test.java:5012:57:5012:64 | source(...) : Object | Test.java:5012:49:5012:64 | (...)... : String | provenance |  |
 | Test.java:5013:10:5013:61 | umodifiableListIterator(...) : ListIterator [<element>] : String | Test.java:5014:20:5014:22 | out : ListIterator [<element>] : String | provenance |  |
-| Test.java:5013:59:5013:60 | in : ListIterator [<element>] : String | Test.java:5013:10:5013:61 | umodifiableListIterator(...) : ListIterator [<element>] : String | provenance | MaD:178 |
+| Test.java:5013:59:5013:60 | in : ListIterator [<element>] : String | Test.java:5013:10:5013:61 | umodifiableListIterator(...) : ListIterator [<element>] : String | provenance | MaD:180 |
 | Test.java:5014:20:5014:22 | out : ListIterator [<element>] : String | Test.java:231:19:231:32 | it : ListIterator [<element>] : String | provenance |  |
-| Test.java:5014:20:5014:22 | out : ListIterator [<element>] : String | Test.java:5014:9:5014:23 | getElement(...) | provenance | MaD:4 |
-| Test.java:5019:21:5019:60 | newLinkedMapWithMapKey(...) : LinkedMap [<map.key>] : String | Test.java:5019:21:5019:74 | mapIterator(...) : OrderedMapIterator [<element>] : String | provenance | MaD:487 |
+| Test.java:5014:20:5014:22 | out : ListIterator [<element>] : String | Test.java:5014:9:5014:23 | getElement(...) | provenance | MaD:6 |
+| Test.java:5019:21:5019:60 | newLinkedMapWithMapKey(...) : LinkedMap [<map.key>] : String | Test.java:5019:21:5019:74 | mapIterator(...) : OrderedMapIterator [<element>] : String | provenance | MaD:562 |
 | Test.java:5019:21:5019:74 | mapIterator(...) : OrderedMapIterator [<element>] : String | Test.java:5020:58:5020:59 | in : OrderedMapIterator [<element>] : String | provenance |  |
 | Test.java:5019:44:5019:59 | (...)... : String | Test.java:276:49:276:53 | key : String | provenance |  |
-| Test.java:5019:44:5019:59 | (...)... : String | Test.java:5019:21:5019:60 | newLinkedMapWithMapKey(...) : LinkedMap [<map.key>] : String | provenance | MaD:11 |
+| Test.java:5019:44:5019:59 | (...)... : String | Test.java:5019:21:5019:60 | newLinkedMapWithMapKey(...) : LinkedMap [<map.key>] : String | provenance | MaD:13 |
 | Test.java:5019:52:5019:59 | source(...) : Object | Test.java:5019:44:5019:59 | (...)... : String | provenance |  |
 | Test.java:5020:10:5020:60 | unmodifiableMapIterator(...) : MapIterator [<element>] : String | Test.java:5021:20:5021:22 | out : MapIterator [<element>] : String | provenance |  |
-| Test.java:5020:58:5020:59 | in : OrderedMapIterator [<element>] : String | Test.java:5020:10:5020:60 | unmodifiableMapIterator(...) : MapIterator [<element>] : String | provenance | MaD:179 |
+| Test.java:5020:58:5020:59 | in : OrderedMapIterator [<element>] : String | Test.java:5020:10:5020:60 | unmodifiableMapIterator(...) : MapIterator [<element>] : String | provenance | MaD:181 |
 | Test.java:5021:20:5021:22 | out : MapIterator [<element>] : String | Test.java:231:19:231:32 | it : MapIterator [<element>] : String | provenance |  |
-| Test.java:5021:20:5021:22 | out : MapIterator [<element>] : String | Test.java:5021:9:5021:23 | getElement(...) | provenance | MaD:4 |
-| Test.java:5026:21:5026:62 | newLinkedMapWithMapValue(...) : LinkedMap [<map.value>] : String | Test.java:5026:21:5026:76 | mapIterator(...) : OrderedMapIterator [<map.value>] : String | provenance | MaD:488 |
+| Test.java:5021:20:5021:22 | out : MapIterator [<element>] : String | Test.java:5021:9:5021:23 | getElement(...) | provenance | MaD:6 |
+| Test.java:5026:21:5026:62 | newLinkedMapWithMapValue(...) : LinkedMap [<map.value>] : String | Test.java:5026:21:5026:76 | mapIterator(...) : OrderedMapIterator [<map.value>] : String | provenance | MaD:563 |
 | Test.java:5026:21:5026:76 | mapIterator(...) : OrderedMapIterator [<map.value>] : String | Test.java:5027:58:5027:59 | in : OrderedMapIterator [<map.value>] : String | provenance |  |
 | Test.java:5026:46:5026:61 | (...)... : String | Test.java:295:51:295:57 | value : String | provenance |  |
-| Test.java:5026:46:5026:61 | (...)... : String | Test.java:5026:21:5026:62 | newLinkedMapWithMapValue(...) : LinkedMap [<map.value>] : String | provenance | MaD:12 |
+| Test.java:5026:46:5026:61 | (...)... : String | Test.java:5026:21:5026:62 | newLinkedMapWithMapValue(...) : LinkedMap [<map.value>] : String | provenance | MaD:14 |
 | Test.java:5026:54:5026:61 | source(...) : Object | Test.java:5026:46:5026:61 | (...)... : String | provenance |  |
 | Test.java:5027:10:5027:60 | unmodifiableMapIterator(...) : MapIterator [<map.value>] : String | Test.java:5028:21:5028:23 | out : MapIterator [<map.value>] : String | provenance |  |
-| Test.java:5027:58:5027:59 | in : OrderedMapIterator [<map.value>] : String | Test.java:5027:10:5027:60 | unmodifiableMapIterator(...) : MapIterator [<map.value>] : String | provenance | MaD:180 |
+| Test.java:5027:58:5027:59 | in : OrderedMapIterator [<map.value>] : String | Test.java:5027:10:5027:60 | unmodifiableMapIterator(...) : MapIterator [<map.value>] : String | provenance | MaD:182 |
 | Test.java:5028:21:5028:23 | out : MapIterator [<map.value>] : String | Test.java:246:20:246:47 | mapIterator : MapIterator [<map.value>] : String | provenance |  |
-| Test.java:5028:21:5028:23 | out : MapIterator [<map.value>] : String | Test.java:5028:9:5028:24 | getMapValue(...) | provenance | MaD:598 |
-| Test.java:5033:28:5033:72 | newListOrderedMapWithMapKey(...) : ListOrderedMap [<map.key>] : String | Test.java:5033:28:5033:86 | mapIterator(...) : OrderedMapIterator [<element>] : String | provenance | MaD:487 |
+| Test.java:5028:21:5028:23 | out : MapIterator [<map.value>] : String | Test.java:5028:9:5028:24 | getMapValue(...) | provenance | MaD:673 |
+| Test.java:5033:28:5033:72 | newListOrderedMapWithMapKey(...) : ListOrderedMap [<map.key>] : String | Test.java:5033:28:5033:86 | mapIterator(...) : OrderedMapIterator [<element>] : String | provenance | MaD:562 |
 | Test.java:5033:28:5033:86 | mapIterator(...) : OrderedMapIterator [<element>] : String | Test.java:5034:72:5034:73 | in : OrderedMapIterator [<element>] : String | provenance |  |
 | Test.java:5033:56:5033:71 | (...)... : String | Test.java:277:59:277:63 | key : String | provenance |  |
-| Test.java:5033:56:5033:71 | (...)... : String | Test.java:5033:28:5033:72 | newListOrderedMapWithMapKey(...) : ListOrderedMap [<map.key>] : String | provenance | MaD:11 |
+| Test.java:5033:56:5033:71 | (...)... : String | Test.java:5033:28:5033:72 | newListOrderedMapWithMapKey(...) : ListOrderedMap [<map.key>] : String | provenance | MaD:13 |
 | Test.java:5033:64:5033:71 | source(...) : Object | Test.java:5033:56:5033:71 | (...)... : String | provenance |  |
 | Test.java:5034:10:5034:74 | unmodifiableOrderedMapIterator(...) : OrderedMapIterator [<element>] : String | Test.java:5035:20:5035:22 | out : OrderedMapIterator [<element>] : String | provenance |  |
-| Test.java:5034:72:5034:73 | in : OrderedMapIterator [<element>] : String | Test.java:5034:10:5034:74 | unmodifiableOrderedMapIterator(...) : OrderedMapIterator [<element>] : String | provenance | MaD:181 |
+| Test.java:5034:72:5034:73 | in : OrderedMapIterator [<element>] : String | Test.java:5034:10:5034:74 | unmodifiableOrderedMapIterator(...) : OrderedMapIterator [<element>] : String | provenance | MaD:183 |
 | Test.java:5035:20:5035:22 | out : OrderedMapIterator [<element>] : String | Test.java:231:19:231:32 | it : OrderedMapIterator [<element>] : String | provenance |  |
-| Test.java:5035:20:5035:22 | out : OrderedMapIterator [<element>] : String | Test.java:5035:9:5035:23 | getElement(...) | provenance | MaD:4 |
-| Test.java:5040:28:5040:74 | newListOrderedMapWithMapValue(...) : ListOrderedMap [<map.value>] : String | Test.java:5040:28:5040:88 | mapIterator(...) : OrderedMapIterator [<map.value>] : String | provenance | MaD:488 |
+| Test.java:5035:20:5035:22 | out : OrderedMapIterator [<element>] : String | Test.java:5035:9:5035:23 | getElement(...) | provenance | MaD:6 |
+| Test.java:5040:28:5040:74 | newListOrderedMapWithMapValue(...) : ListOrderedMap [<map.value>] : String | Test.java:5040:28:5040:88 | mapIterator(...) : OrderedMapIterator [<map.value>] : String | provenance | MaD:563 |
 | Test.java:5040:28:5040:88 | mapIterator(...) : OrderedMapIterator [<map.value>] : String | Test.java:5041:72:5041:73 | in : OrderedMapIterator [<map.value>] : String | provenance |  |
 | Test.java:5040:58:5040:73 | (...)... : String | Test.java:296:61:296:67 | value : String | provenance |  |
-| Test.java:5040:58:5040:73 | (...)... : String | Test.java:5040:28:5040:74 | newListOrderedMapWithMapValue(...) : ListOrderedMap [<map.value>] : String | provenance | MaD:12 |
+| Test.java:5040:58:5040:73 | (...)... : String | Test.java:5040:28:5040:74 | newListOrderedMapWithMapValue(...) : ListOrderedMap [<map.value>] : String | provenance | MaD:14 |
 | Test.java:5040:66:5040:73 | source(...) : Object | Test.java:5040:58:5040:73 | (...)... : String | provenance |  |
 | Test.java:5041:10:5041:74 | unmodifiableOrderedMapIterator(...) : OrderedMapIterator [<map.value>] : String | Test.java:5042:21:5042:23 | out : OrderedMapIterator [<map.value>] : String | provenance |  |
-| Test.java:5041:72:5041:73 | in : OrderedMapIterator [<map.value>] : String | Test.java:5041:10:5041:74 | unmodifiableOrderedMapIterator(...) : OrderedMapIterator [<map.value>] : String | provenance | MaD:182 |
+| Test.java:5041:72:5041:73 | in : OrderedMapIterator [<map.value>] : String | Test.java:5041:10:5041:74 | unmodifiableOrderedMapIterator(...) : OrderedMapIterator [<map.value>] : String | provenance | MaD:184 |
 | Test.java:5042:21:5042:23 | out : OrderedMapIterator [<map.value>] : String | Test.java:246:20:246:47 | mapIterator : OrderedMapIterator [<map.value>] : String | provenance |  |
-| Test.java:5042:21:5042:23 | out : OrderedMapIterator [<map.value>] : String | Test.java:5042:9:5042:24 | getMapValue(...) | provenance | MaD:598 |
+| Test.java:5042:21:5042:23 | out : OrderedMapIterator [<map.value>] : String | Test.java:5042:9:5042:24 | getMapValue(...) | provenance | MaD:673 |
 | Test.java:5047:18:5047:61 | newListIteratorWithElement(...) : ListIterator [<element>] : String | Test.java:5048:30:5048:31 | in : ListIterator [<element>] : String | provenance |  |
 | Test.java:5047:45:5047:60 | (...)... : String | Test.java:259:49:259:57 | element : String | provenance |  |
-| Test.java:5047:45:5047:60 | (...)... : String | Test.java:5047:18:5047:61 | newListIteratorWithElement(...) : ListIterator [<element>] : String | provenance | MaD:2 |
+| Test.java:5047:45:5047:60 | (...)... : String | Test.java:5047:18:5047:61 | newListIteratorWithElement(...) : ListIterator [<element>] : String | provenance | MaD:4 |
 | Test.java:5047:53:5047:60 | source(...) : Object | Test.java:5047:45:5047:60 | (...)... : String | provenance |  |
 | Test.java:5048:10:5048:38 | new ZippingIterator<>(...) : ZippingIterator [<element>] : String | Test.java:5049:20:5049:22 | out : ZippingIterator [<element>] : String | provenance |  |
-| Test.java:5048:30:5048:31 | in : ListIterator [<element>] : String | Test.java:5048:10:5048:38 | new ZippingIterator<>(...) : ZippingIterator [<element>] : String | provenance | MaD:183 |
+| Test.java:5048:30:5048:31 | in : ListIterator [<element>] : String | Test.java:5048:10:5048:38 | new ZippingIterator<>(...) : ZippingIterator [<element>] : String | provenance | MaD:185 |
 | Test.java:5049:20:5049:22 | out : ZippingIterator [<element>] : String | Test.java:231:19:231:32 | it : ZippingIterator [<element>] : String | provenance |  |
-| Test.java:5049:20:5049:22 | out : ZippingIterator [<element>] : String | Test.java:5049:9:5049:23 | getElement(...) | provenance | MaD:4 |
+| Test.java:5049:20:5049:22 | out : ZippingIterator [<element>] : String | Test.java:5049:9:5049:23 | getElement(...) | provenance | MaD:6 |
 | Test.java:5054:18:5054:61 | newListIteratorWithElement(...) : ListIterator [<element>] : String | Test.java:5055:36:5055:37 | in : ListIterator [<element>] : String | provenance |  |
 | Test.java:5054:45:5054:60 | (...)... : String | Test.java:259:49:259:57 | element : String | provenance |  |
-| Test.java:5054:45:5054:60 | (...)... : String | Test.java:5054:18:5054:61 | newListIteratorWithElement(...) : ListIterator [<element>] : String | provenance | MaD:2 |
+| Test.java:5054:45:5054:60 | (...)... : String | Test.java:5054:18:5054:61 | newListIteratorWithElement(...) : ListIterator [<element>] : String | provenance | MaD:4 |
 | Test.java:5054:53:5054:60 | source(...) : Object | Test.java:5054:45:5054:60 | (...)... : String | provenance |  |
 | Test.java:5055:10:5055:38 | new ZippingIterator<>(...) : ZippingIterator [<element>] : String | Test.java:5056:20:5056:22 | out : ZippingIterator [<element>] : String | provenance |  |
-| Test.java:5055:36:5055:37 | in : ListIterator [<element>] : String | Test.java:5055:10:5055:38 | new ZippingIterator<>(...) : ZippingIterator [<element>] : String | provenance | MaD:184 |
+| Test.java:5055:36:5055:37 | in : ListIterator [<element>] : String | Test.java:5055:10:5055:38 | new ZippingIterator<>(...) : ZippingIterator [<element>] : String | provenance | MaD:186 |
 | Test.java:5056:20:5056:22 | out : ZippingIterator [<element>] : String | Test.java:231:19:231:32 | it : ZippingIterator [<element>] : String | provenance |  |
-| Test.java:5056:20:5056:22 | out : ZippingIterator [<element>] : String | Test.java:5056:9:5056:23 | getElement(...) | provenance | MaD:4 |
+| Test.java:5056:20:5056:22 | out : ZippingIterator [<element>] : String | Test.java:5056:9:5056:23 | getElement(...) | provenance | MaD:6 |
 | Test.java:5061:18:5061:61 | newListIteratorWithElement(...) : ListIterator [<element>] : String | Test.java:5062:30:5062:31 | in : ListIterator [<element>] : String | provenance |  |
 | Test.java:5061:45:5061:60 | (...)... : String | Test.java:259:49:259:57 | element : String | provenance |  |
-| Test.java:5061:45:5061:60 | (...)... : String | Test.java:5061:18:5061:61 | newListIteratorWithElement(...) : ListIterator [<element>] : String | provenance | MaD:2 |
+| Test.java:5061:45:5061:60 | (...)... : String | Test.java:5061:18:5061:61 | newListIteratorWithElement(...) : ListIterator [<element>] : String | provenance | MaD:4 |
 | Test.java:5061:53:5061:60 | source(...) : Object | Test.java:5061:45:5061:60 | (...)... : String | provenance |  |
 | Test.java:5062:10:5062:44 | new ZippingIterator<>(...) : ZippingIterator [<element>] : String | Test.java:5063:20:5063:22 | out : ZippingIterator [<element>] : String | provenance |  |
-| Test.java:5062:30:5062:31 | in : ListIterator [<element>] : String | Test.java:5062:10:5062:44 | new ZippingIterator<>(...) : ZippingIterator [<element>] : String | provenance | MaD:185 |
+| Test.java:5062:30:5062:31 | in : ListIterator [<element>] : String | Test.java:5062:10:5062:44 | new ZippingIterator<>(...) : ZippingIterator [<element>] : String | provenance | MaD:187 |
 | Test.java:5063:20:5063:22 | out : ZippingIterator [<element>] : String | Test.java:231:19:231:32 | it : ZippingIterator [<element>] : String | provenance |  |
-| Test.java:5063:20:5063:22 | out : ZippingIterator [<element>] : String | Test.java:5063:9:5063:23 | getElement(...) | provenance | MaD:4 |
+| Test.java:5063:20:5063:22 | out : ZippingIterator [<element>] : String | Test.java:5063:9:5063:23 | getElement(...) | provenance | MaD:6 |
 | Test.java:5068:18:5068:61 | newListIteratorWithElement(...) : ListIterator [<element>] : String | Test.java:5069:36:5069:37 | in : ListIterator [<element>] : String | provenance |  |
 | Test.java:5068:45:5068:60 | (...)... : String | Test.java:259:49:259:57 | element : String | provenance |  |
-| Test.java:5068:45:5068:60 | (...)... : String | Test.java:5068:18:5068:61 | newListIteratorWithElement(...) : ListIterator [<element>] : String | provenance | MaD:2 |
+| Test.java:5068:45:5068:60 | (...)... : String | Test.java:5068:18:5068:61 | newListIteratorWithElement(...) : ListIterator [<element>] : String | provenance | MaD:4 |
 | Test.java:5068:53:5068:60 | source(...) : Object | Test.java:5068:45:5068:60 | (...)... : String | provenance |  |
 | Test.java:5069:10:5069:44 | new ZippingIterator<>(...) : ZippingIterator [<element>] : String | Test.java:5070:20:5070:22 | out : ZippingIterator [<element>] : String | provenance |  |
-| Test.java:5069:36:5069:37 | in : ListIterator [<element>] : String | Test.java:5069:10:5069:44 | new ZippingIterator<>(...) : ZippingIterator [<element>] : String | provenance | MaD:186 |
+| Test.java:5069:36:5069:37 | in : ListIterator [<element>] : String | Test.java:5069:10:5069:44 | new ZippingIterator<>(...) : ZippingIterator [<element>] : String | provenance | MaD:188 |
 | Test.java:5070:20:5070:22 | out : ZippingIterator [<element>] : String | Test.java:231:19:231:32 | it : ZippingIterator [<element>] : String | provenance |  |
-| Test.java:5070:20:5070:22 | out : ZippingIterator [<element>] : String | Test.java:5070:9:5070:23 | getElement(...) | provenance | MaD:4 |
+| Test.java:5070:20:5070:22 | out : ZippingIterator [<element>] : String | Test.java:5070:9:5070:23 | getElement(...) | provenance | MaD:6 |
 | Test.java:5075:18:5075:61 | newListIteratorWithElement(...) : ListIterator [<element>] : String | Test.java:5076:42:5076:43 | in : ListIterator [<element>] : String | provenance |  |
 | Test.java:5075:45:5075:60 | (...)... : String | Test.java:259:49:259:57 | element : String | provenance |  |
-| Test.java:5075:45:5075:60 | (...)... : String | Test.java:5075:18:5075:61 | newListIteratorWithElement(...) : ListIterator [<element>] : String | provenance | MaD:2 |
+| Test.java:5075:45:5075:60 | (...)... : String | Test.java:5075:18:5075:61 | newListIteratorWithElement(...) : ListIterator [<element>] : String | provenance | MaD:4 |
 | Test.java:5075:53:5075:60 | source(...) : Object | Test.java:5075:45:5075:60 | (...)... : String | provenance |  |
 | Test.java:5076:10:5076:44 | new ZippingIterator<>(...) : ZippingIterator [<element>] : String | Test.java:5077:20:5077:22 | out : ZippingIterator [<element>] : String | provenance |  |
-| Test.java:5076:42:5076:43 | in : ListIterator [<element>] : String | Test.java:5076:10:5076:44 | new ZippingIterator<>(...) : ZippingIterator [<element>] : String | provenance | MaD:187 |
+| Test.java:5076:42:5076:43 | in : ListIterator [<element>] : String | Test.java:5076:10:5076:44 | new ZippingIterator<>(...) : ZippingIterator [<element>] : String | provenance | MaD:189 |
 | Test.java:5077:20:5077:22 | out : ZippingIterator [<element>] : String | Test.java:231:19:231:32 | it : ZippingIterator [<element>] : String | provenance |  |
-| Test.java:5077:20:5077:22 | out : ZippingIterator [<element>] : String | Test.java:5077:9:5077:23 | getElement(...) | provenance | MaD:4 |
+| Test.java:5077:20:5077:22 | out : ZippingIterator [<element>] : String | Test.java:5077:9:5077:23 | getElement(...) | provenance | MaD:6 |
 | Test.java:5082:20:5082:79 | {...} : Iterator[] [[], <element>] : String | Test.java:5083:30:5083:31 | in : Iterator[] [[], <element>] : String | provenance |  |
 | Test.java:5082:35:5082:78 | newListIteratorWithElement(...) : ListIterator [<element>] : String | Test.java:5082:20:5082:79 | {...} : Iterator[] [[], <element>] : String | provenance |  |
 | Test.java:5082:62:5082:77 | (...)... : String | Test.java:259:49:259:57 | element : String | provenance |  |
-| Test.java:5082:62:5082:77 | (...)... : String | Test.java:5082:35:5082:78 | newListIteratorWithElement(...) : ListIterator [<element>] : String | provenance | MaD:2 |
+| Test.java:5082:62:5082:77 | (...)... : String | Test.java:5082:35:5082:78 | newListIteratorWithElement(...) : ListIterator [<element>] : String | provenance | MaD:4 |
 | Test.java:5082:70:5082:77 | source(...) : Object | Test.java:5082:62:5082:77 | (...)... : String | provenance |  |
 | Test.java:5083:10:5083:32 | new ZippingIterator<>(...) : ZippingIterator [<element>] : String | Test.java:5084:20:5084:22 | out : ZippingIterator [<element>] : String | provenance |  |
-| Test.java:5083:30:5083:31 | in : Iterator[] [[], <element>] : String | Test.java:5083:10:5083:32 | new ZippingIterator<>(...) : ZippingIterator [<element>] : String | provenance | MaD:188 |
+| Test.java:5083:30:5083:31 | in : Iterator[] [[], <element>] : String | Test.java:5083:10:5083:32 | new ZippingIterator<>(...) : ZippingIterator [<element>] : String | provenance | MaD:190 |
 | Test.java:5084:20:5084:22 | out : ZippingIterator [<element>] : String | Test.java:231:19:231:32 | it : ZippingIterator [<element>] : String | provenance |  |
-| Test.java:5084:20:5084:22 | out : ZippingIterator [<element>] : String | Test.java:5084:9:5084:23 | getElement(...) | provenance | MaD:4 |
+| Test.java:5084:20:5084:22 | out : ZippingIterator [<element>] : String | Test.java:5084:9:5084:23 | getElement(...) | provenance | MaD:6 |
 | Test.java:5089:16:5089:23 | source(...) : Object | Test.java:5090:23:5090:24 | in : Object | provenance |  |
 | Test.java:5090:10:5090:39 | new MultiKey<>(...) : MultiKey [<element>] : Object | Test.java:5091:20:5091:22 | out : MultiKey [<element>] : Object | provenance |  |
-| Test.java:5090:23:5090:24 | in : Object | Test.java:5090:10:5090:39 | new MultiKey<>(...) : MultiKey [<element>] : Object | provenance | MaD:215 |
+| Test.java:5090:23:5090:24 | in : Object | Test.java:5090:10:5090:39 | new MultiKey<>(...) : MultiKey [<element>] : Object | provenance | MaD:217 |
 | Test.java:5091:20:5091:22 | out : MultiKey [<element>] : Object | Test.java:236:19:236:39 | container : MultiKey [<element>] : Object | provenance |  |
-| Test.java:5091:20:5091:22 | out : MultiKey [<element>] : Object | Test.java:5091:9:5091:23 | getElement(...) | provenance | MaD:231 |
+| Test.java:5091:20:5091:22 | out : MultiKey [<element>] : Object | Test.java:5091:9:5091:23 | getElement(...) | provenance | MaD:233 |
 | Test.java:5096:16:5096:23 | source(...) : Object | Test.java:5097:37:5097:38 | in : Object | provenance |  |
 | Test.java:5097:10:5097:39 | new MultiKey<>(...) : MultiKey [<element>] : Object | Test.java:5098:20:5098:22 | out : MultiKey [<element>] : Object | provenance |  |
-| Test.java:5097:37:5097:38 | in : Object | Test.java:5097:10:5097:39 | new MultiKey<>(...) : MultiKey [<element>] : Object | provenance | MaD:216 |
+| Test.java:5097:37:5097:38 | in : Object | Test.java:5097:10:5097:39 | new MultiKey<>(...) : MultiKey [<element>] : Object | provenance | MaD:218 |
 | Test.java:5098:20:5098:22 | out : MultiKey [<element>] : Object | Test.java:236:19:236:39 | container : MultiKey [<element>] : Object | provenance |  |
-| Test.java:5098:20:5098:22 | out : MultiKey [<element>] : Object | Test.java:5098:9:5098:23 | getElement(...) | provenance | MaD:231 |
+| Test.java:5098:20:5098:22 | out : MultiKey [<element>] : Object | Test.java:5098:9:5098:23 | getElement(...) | provenance | MaD:233 |
 | Test.java:5103:16:5103:23 | source(...) : Object | Test.java:5104:23:5104:24 | in : Object | provenance |  |
 | Test.java:5104:10:5104:37 | new MultiKey<>(...) : MultiKey [<element>] : Object | Test.java:5105:20:5105:22 | out : MultiKey [<element>] : Object | provenance |  |
-| Test.java:5104:23:5104:24 | in : Object | Test.java:5104:10:5104:37 | new MultiKey<>(...) : MultiKey [<element>] : Object | provenance | MaD:217 |
+| Test.java:5104:23:5104:24 | in : Object | Test.java:5104:10:5104:37 | new MultiKey<>(...) : MultiKey [<element>] : Object | provenance | MaD:219 |
 | Test.java:5105:20:5105:22 | out : MultiKey [<element>] : Object | Test.java:236:19:236:39 | container : MultiKey [<element>] : Object | provenance |  |
-| Test.java:5105:20:5105:22 | out : MultiKey [<element>] : Object | Test.java:5105:9:5105:23 | getElement(...) | provenance | MaD:231 |
+| Test.java:5105:20:5105:22 | out : MultiKey [<element>] : Object | Test.java:5105:9:5105:23 | getElement(...) | provenance | MaD:233 |
 | Test.java:5110:16:5110:23 | source(...) : Object | Test.java:5111:29:5111:30 | in : Object | provenance |  |
 | Test.java:5111:10:5111:37 | new MultiKey<>(...) : MultiKey [<element>] : Object | Test.java:5112:20:5112:22 | out : MultiKey [<element>] : Object | provenance |  |
-| Test.java:5111:29:5111:30 | in : Object | Test.java:5111:10:5111:37 | new MultiKey<>(...) : MultiKey [<element>] : Object | provenance | MaD:218 |
+| Test.java:5111:29:5111:30 | in : Object | Test.java:5111:10:5111:37 | new MultiKey<>(...) : MultiKey [<element>] : Object | provenance | MaD:220 |
 | Test.java:5112:20:5112:22 | out : MultiKey [<element>] : Object | Test.java:236:19:236:39 | container : MultiKey [<element>] : Object | provenance |  |
-| Test.java:5112:20:5112:22 | out : MultiKey [<element>] : Object | Test.java:5112:9:5112:23 | getElement(...) | provenance | MaD:231 |
+| Test.java:5112:20:5112:22 | out : MultiKey [<element>] : Object | Test.java:5112:9:5112:23 | getElement(...) | provenance | MaD:233 |
 | Test.java:5117:16:5117:23 | source(...) : Object | Test.java:5118:35:5118:36 | in : Object | provenance |  |
 | Test.java:5118:10:5118:37 | new MultiKey<>(...) : MultiKey [<element>] : Object | Test.java:5119:20:5119:22 | out : MultiKey [<element>] : Object | provenance |  |
-| Test.java:5118:35:5118:36 | in : Object | Test.java:5118:10:5118:37 | new MultiKey<>(...) : MultiKey [<element>] : Object | provenance | MaD:219 |
+| Test.java:5118:35:5118:36 | in : Object | Test.java:5118:10:5118:37 | new MultiKey<>(...) : MultiKey [<element>] : Object | provenance | MaD:221 |
 | Test.java:5119:20:5119:22 | out : MultiKey [<element>] : Object | Test.java:236:19:236:39 | container : MultiKey [<element>] : Object | provenance |  |
-| Test.java:5119:20:5119:22 | out : MultiKey [<element>] : Object | Test.java:5119:9:5119:23 | getElement(...) | provenance | MaD:231 |
+| Test.java:5119:20:5119:22 | out : MultiKey [<element>] : Object | Test.java:5119:9:5119:23 | getElement(...) | provenance | MaD:233 |
 | Test.java:5124:16:5124:23 | source(...) : Object | Test.java:5125:23:5125:24 | in : Object | provenance |  |
 | Test.java:5125:10:5125:43 | new MultiKey<>(...) : MultiKey [<element>] : Object | Test.java:5126:20:5126:22 | out : MultiKey [<element>] : Object | provenance |  |
-| Test.java:5125:23:5125:24 | in : Object | Test.java:5125:10:5125:43 | new MultiKey<>(...) : MultiKey [<element>] : Object | provenance | MaD:220 |
+| Test.java:5125:23:5125:24 | in : Object | Test.java:5125:10:5125:43 | new MultiKey<>(...) : MultiKey [<element>] : Object | provenance | MaD:222 |
 | Test.java:5126:20:5126:22 | out : MultiKey [<element>] : Object | Test.java:236:19:236:39 | container : MultiKey [<element>] : Object | provenance |  |
-| Test.java:5126:20:5126:22 | out : MultiKey [<element>] : Object | Test.java:5126:9:5126:23 | getElement(...) | provenance | MaD:231 |
+| Test.java:5126:20:5126:22 | out : MultiKey [<element>] : Object | Test.java:5126:9:5126:23 | getElement(...) | provenance | MaD:233 |
 | Test.java:5131:16:5131:23 | source(...) : Object | Test.java:5132:29:5132:30 | in : Object | provenance |  |
 | Test.java:5132:10:5132:43 | new MultiKey<>(...) : MultiKey [<element>] : Object | Test.java:5133:20:5133:22 | out : MultiKey [<element>] : Object | provenance |  |
-| Test.java:5132:29:5132:30 | in : Object | Test.java:5132:10:5132:43 | new MultiKey<>(...) : MultiKey [<element>] : Object | provenance | MaD:221 |
+| Test.java:5132:29:5132:30 | in : Object | Test.java:5132:10:5132:43 | new MultiKey<>(...) : MultiKey [<element>] : Object | provenance | MaD:223 |
 | Test.java:5133:20:5133:22 | out : MultiKey [<element>] : Object | Test.java:236:19:236:39 | container : MultiKey [<element>] : Object | provenance |  |
-| Test.java:5133:20:5133:22 | out : MultiKey [<element>] : Object | Test.java:5133:9:5133:23 | getElement(...) | provenance | MaD:231 |
+| Test.java:5133:20:5133:22 | out : MultiKey [<element>] : Object | Test.java:5133:9:5133:23 | getElement(...) | provenance | MaD:233 |
 | Test.java:5138:16:5138:23 | source(...) : Object | Test.java:5139:35:5139:36 | in : Object | provenance |  |
 | Test.java:5139:10:5139:43 | new MultiKey<>(...) : MultiKey [<element>] : Object | Test.java:5140:20:5140:22 | out : MultiKey [<element>] : Object | provenance |  |
-| Test.java:5139:35:5139:36 | in : Object | Test.java:5139:10:5139:43 | new MultiKey<>(...) : MultiKey [<element>] : Object | provenance | MaD:222 |
+| Test.java:5139:35:5139:36 | in : Object | Test.java:5139:10:5139:43 | new MultiKey<>(...) : MultiKey [<element>] : Object | provenance | MaD:224 |
 | Test.java:5140:20:5140:22 | out : MultiKey [<element>] : Object | Test.java:236:19:236:39 | container : MultiKey [<element>] : Object | provenance |  |
-| Test.java:5140:20:5140:22 | out : MultiKey [<element>] : Object | Test.java:5140:9:5140:23 | getElement(...) | provenance | MaD:231 |
+| Test.java:5140:20:5140:22 | out : MultiKey [<element>] : Object | Test.java:5140:9:5140:23 | getElement(...) | provenance | MaD:233 |
 | Test.java:5145:16:5145:23 | source(...) : Object | Test.java:5146:41:5146:42 | in : Object | provenance |  |
 | Test.java:5146:10:5146:43 | new MultiKey<>(...) : MultiKey [<element>] : Object | Test.java:5147:20:5147:22 | out : MultiKey [<element>] : Object | provenance |  |
-| Test.java:5146:41:5146:42 | in : Object | Test.java:5146:10:5146:43 | new MultiKey<>(...) : MultiKey [<element>] : Object | provenance | MaD:223 |
+| Test.java:5146:41:5146:42 | in : Object | Test.java:5146:10:5146:43 | new MultiKey<>(...) : MultiKey [<element>] : Object | provenance | MaD:225 |
 | Test.java:5147:20:5147:22 | out : MultiKey [<element>] : Object | Test.java:236:19:236:39 | container : MultiKey [<element>] : Object | provenance |  |
-| Test.java:5147:20:5147:22 | out : MultiKey [<element>] : Object | Test.java:5147:9:5147:23 | getElement(...) | provenance | MaD:231 |
+| Test.java:5147:20:5147:22 | out : MultiKey [<element>] : Object | Test.java:5147:9:5147:23 | getElement(...) | provenance | MaD:233 |
 | Test.java:5152:16:5152:23 | source(...) : Object | Test.java:5153:23:5153:24 | in : Object | provenance |  |
 | Test.java:5153:10:5153:49 | new MultiKey<>(...) : MultiKey [<element>] : Object | Test.java:5154:20:5154:22 | out : MultiKey [<element>] : Object | provenance |  |
-| Test.java:5153:23:5153:24 | in : Object | Test.java:5153:10:5153:49 | new MultiKey<>(...) : MultiKey [<element>] : Object | provenance | MaD:224 |
+| Test.java:5153:23:5153:24 | in : Object | Test.java:5153:10:5153:49 | new MultiKey<>(...) : MultiKey [<element>] : Object | provenance | MaD:226 |
 | Test.java:5154:20:5154:22 | out : MultiKey [<element>] : Object | Test.java:236:19:236:39 | container : MultiKey [<element>] : Object | provenance |  |
-| Test.java:5154:20:5154:22 | out : MultiKey [<element>] : Object | Test.java:5154:9:5154:23 | getElement(...) | provenance | MaD:231 |
+| Test.java:5154:20:5154:22 | out : MultiKey [<element>] : Object | Test.java:5154:9:5154:23 | getElement(...) | provenance | MaD:233 |
 | Test.java:5159:16:5159:23 | source(...) : Object | Test.java:5160:29:5160:30 | in : Object | provenance |  |
 | Test.java:5160:10:5160:49 | new MultiKey<>(...) : MultiKey [<element>] : Object | Test.java:5161:20:5161:22 | out : MultiKey [<element>] : Object | provenance |  |
-| Test.java:5160:29:5160:30 | in : Object | Test.java:5160:10:5160:49 | new MultiKey<>(...) : MultiKey [<element>] : Object | provenance | MaD:225 |
+| Test.java:5160:29:5160:30 | in : Object | Test.java:5160:10:5160:49 | new MultiKey<>(...) : MultiKey [<element>] : Object | provenance | MaD:227 |
 | Test.java:5161:20:5161:22 | out : MultiKey [<element>] : Object | Test.java:236:19:236:39 | container : MultiKey [<element>] : Object | provenance |  |
-| Test.java:5161:20:5161:22 | out : MultiKey [<element>] : Object | Test.java:5161:9:5161:23 | getElement(...) | provenance | MaD:231 |
+| Test.java:5161:20:5161:22 | out : MultiKey [<element>] : Object | Test.java:5161:9:5161:23 | getElement(...) | provenance | MaD:233 |
 | Test.java:5166:16:5166:23 | source(...) : Object | Test.java:5167:35:5167:36 | in : Object | provenance |  |
 | Test.java:5167:10:5167:49 | new MultiKey<>(...) : MultiKey [<element>] : Object | Test.java:5168:20:5168:22 | out : MultiKey [<element>] : Object | provenance |  |
-| Test.java:5167:35:5167:36 | in : Object | Test.java:5167:10:5167:49 | new MultiKey<>(...) : MultiKey [<element>] : Object | provenance | MaD:226 |
+| Test.java:5167:35:5167:36 | in : Object | Test.java:5167:10:5167:49 | new MultiKey<>(...) : MultiKey [<element>] : Object | provenance | MaD:228 |
 | Test.java:5168:20:5168:22 | out : MultiKey [<element>] : Object | Test.java:236:19:236:39 | container : MultiKey [<element>] : Object | provenance |  |
-| Test.java:5168:20:5168:22 | out : MultiKey [<element>] : Object | Test.java:5168:9:5168:23 | getElement(...) | provenance | MaD:231 |
+| Test.java:5168:20:5168:22 | out : MultiKey [<element>] : Object | Test.java:5168:9:5168:23 | getElement(...) | provenance | MaD:233 |
 | Test.java:5173:16:5173:23 | source(...) : Object | Test.java:5174:41:5174:42 | in : Object | provenance |  |
 | Test.java:5174:10:5174:49 | new MultiKey<>(...) : MultiKey [<element>] : Object | Test.java:5175:20:5175:22 | out : MultiKey [<element>] : Object | provenance |  |
-| Test.java:5174:41:5174:42 | in : Object | Test.java:5174:10:5174:49 | new MultiKey<>(...) : MultiKey [<element>] : Object | provenance | MaD:227 |
+| Test.java:5174:41:5174:42 | in : Object | Test.java:5174:10:5174:49 | new MultiKey<>(...) : MultiKey [<element>] : Object | provenance | MaD:229 |
 | Test.java:5175:20:5175:22 | out : MultiKey [<element>] : Object | Test.java:236:19:236:39 | container : MultiKey [<element>] : Object | provenance |  |
-| Test.java:5175:20:5175:22 | out : MultiKey [<element>] : Object | Test.java:5175:9:5175:23 | getElement(...) | provenance | MaD:231 |
+| Test.java:5175:20:5175:22 | out : MultiKey [<element>] : Object | Test.java:5175:9:5175:23 | getElement(...) | provenance | MaD:233 |
 | Test.java:5180:16:5180:23 | source(...) : Object | Test.java:5181:47:5181:48 | in : Object | provenance |  |
 | Test.java:5181:10:5181:49 | new MultiKey<>(...) : MultiKey [<element>] : Object | Test.java:5182:20:5182:22 | out : MultiKey [<element>] : Object | provenance |  |
-| Test.java:5181:47:5181:48 | in : Object | Test.java:5181:10:5181:49 | new MultiKey<>(...) : MultiKey [<element>] : Object | provenance | MaD:228 |
+| Test.java:5181:47:5181:48 | in : Object | Test.java:5181:10:5181:49 | new MultiKey<>(...) : MultiKey [<element>] : Object | provenance | MaD:230 |
 | Test.java:5182:20:5182:22 | out : MultiKey [<element>] : Object | Test.java:236:19:236:39 | container : MultiKey [<element>] : Object | provenance |  |
-| Test.java:5182:20:5182:22 | out : MultiKey [<element>] : Object | Test.java:5182:9:5182:23 | getElement(...) | provenance | MaD:231 |
+| Test.java:5182:20:5182:22 | out : MultiKey [<element>] : Object | Test.java:5182:9:5182:23 | getElement(...) | provenance | MaD:233 |
 | Test.java:5187:18:5187:47 | {...} : Object[] [[]] : String | Test.java:5188:23:5188:24 | in : Object[] [[]] : String | provenance |  |
 | Test.java:5187:31:5187:46 | (...)... : String | Test.java:5187:18:5187:47 | {...} : Object[] [[]] : String | provenance |  |
 | Test.java:5187:39:5187:46 | source(...) : Object | Test.java:5187:31:5187:46 | (...)... : String | provenance |  |
 | Test.java:5188:10:5188:25 | new MultiKey<>(...) : MultiKey [<element>] : String | Test.java:5189:20:5189:22 | out : MultiKey [<element>] : String | provenance |  |
-| Test.java:5188:23:5188:24 | in : Object[] [[]] : String | Test.java:5188:10:5188:25 | new MultiKey<>(...) : MultiKey [<element>] : String | provenance | MaD:229 |
+| Test.java:5188:23:5188:24 | in : Object[] [[]] : String | Test.java:5188:10:5188:25 | new MultiKey<>(...) : MultiKey [<element>] : String | provenance | MaD:231 |
 | Test.java:5189:20:5189:22 | out : MultiKey [<element>] : String | Test.java:236:19:236:39 | container : MultiKey [<element>] : String | provenance |  |
-| Test.java:5189:20:5189:22 | out : MultiKey [<element>] : String | Test.java:5189:9:5189:23 | getElement(...) | provenance | MaD:231 |
+| Test.java:5189:20:5189:22 | out : MultiKey [<element>] : String | Test.java:5189:9:5189:23 | getElement(...) | provenance | MaD:233 |
 | Test.java:5194:18:5194:47 | {...} : Object[] [[]] : String | Test.java:5195:23:5195:24 | in : Object[] [[]] : String | provenance |  |
 | Test.java:5194:31:5194:46 | (...)... : String | Test.java:5194:18:5194:47 | {...} : Object[] [[]] : String | provenance |  |
 | Test.java:5194:39:5194:46 | source(...) : Object | Test.java:5194:31:5194:46 | (...)... : String | provenance |  |
 | Test.java:5195:10:5195:32 | new MultiKey<>(...) : MultiKey [<element>] : String | Test.java:5196:20:5196:22 | out : MultiKey [<element>] : String | provenance |  |
-| Test.java:5195:23:5195:24 | in : Object[] [[]] : String | Test.java:5195:10:5195:32 | new MultiKey<>(...) : MultiKey [<element>] : String | provenance | MaD:230 |
+| Test.java:5195:23:5195:24 | in : Object[] [[]] : String | Test.java:5195:10:5195:32 | new MultiKey<>(...) : MultiKey [<element>] : String | provenance | MaD:232 |
 | Test.java:5196:20:5196:22 | out : MultiKey [<element>] : String | Test.java:236:19:236:39 | container : MultiKey [<element>] : String | provenance |  |
-| Test.java:5196:20:5196:22 | out : MultiKey [<element>] : String | Test.java:5196:9:5196:23 | getElement(...) | provenance | MaD:231 |
+| Test.java:5196:20:5196:22 | out : MultiKey [<element>] : String | Test.java:5196:9:5196:23 | getElement(...) | provenance | MaD:233 |
 | Test.java:5201:18:5201:57 | newMultiKeyWithElement(...) : MultiKey [<element>] : String | Test.java:5202:10:5202:11 | in : MultiKey [<element>] : String | provenance |  |
 | Test.java:5201:41:5201:56 | (...)... : String | Test.java:261:41:261:49 | element : String | provenance |  |
-| Test.java:5201:41:5201:56 | (...)... : String | Test.java:5201:18:5201:57 | newMultiKeyWithElement(...) : MultiKey [<element>] : String | provenance | MaD:215 |
+| Test.java:5201:41:5201:56 | (...)... : String | Test.java:5201:18:5201:57 | newMultiKeyWithElement(...) : MultiKey [<element>] : String | provenance | MaD:217 |
 | Test.java:5201:49:5201:56 | source(...) : Object | Test.java:5201:41:5201:56 | (...)... : String | provenance |  |
-| Test.java:5202:10:5202:11 | in : MultiKey [<element>] : String | Test.java:5202:10:5202:21 | getKey(...) : String | provenance | MaD:231 |
+| Test.java:5202:10:5202:11 | in : MultiKey [<element>] : String | Test.java:5202:10:5202:21 | getKey(...) : String | provenance | MaD:233 |
 | Test.java:5202:10:5202:21 | getKey(...) : String | Test.java:5203:9:5203:11 | out | provenance |  |
 | Test.java:5208:18:5208:57 | newMultiKeyWithElement(...) : MultiKey [<element>] : String | Test.java:5209:10:5209:11 | in : MultiKey [<element>] : String | provenance |  |
 | Test.java:5208:41:5208:56 | (...)... : String | Test.java:261:41:261:49 | element : String | provenance |  |
-| Test.java:5208:41:5208:56 | (...)... : String | Test.java:5208:18:5208:57 | newMultiKeyWithElement(...) : MultiKey [<element>] : String | provenance | MaD:215 |
+| Test.java:5208:41:5208:56 | (...)... : String | Test.java:5208:18:5208:57 | newMultiKeyWithElement(...) : MultiKey [<element>] : String | provenance | MaD:217 |
 | Test.java:5208:49:5208:56 | source(...) : Object | Test.java:5208:41:5208:56 | (...)... : String | provenance |  |
-| Test.java:5209:10:5209:11 | in : MultiKey [<element>] : String | Test.java:5209:10:5209:21 | getKeys(...) : Object[] [[]] : String | provenance | MaD:232 |
+| Test.java:5209:10:5209:11 | in : MultiKey [<element>] : String | Test.java:5209:10:5209:21 | getKeys(...) : Object[] [[]] : String | provenance | MaD:234 |
 | Test.java:5209:10:5209:21 | getKeys(...) : Object[] [[]] : String | Test.java:5210:25:5210:27 | out : Object[] [[]] : String | provenance |  |
 | Test.java:5210:25:5210:27 | out : Object[] [[]] : String | Test.java:229:24:229:32 | array : Object[] [[]] : String | provenance |  |
 | Test.java:5210:25:5210:27 | out : Object[] [[]] : String | Test.java:5210:9:5210:28 | getArrayElement(...) | provenance |  |
 | Test.java:5215:20:5215:58 | newTreeBagWithElement(...) : TreeBag [<element>] : String | Test.java:5216:35:5216:36 | in : TreeBag [<element>] : String | provenance |  |
 | Test.java:5215:42:5215:57 | (...)... : String | Test.java:267:39:267:47 | element : String | provenance |  |
-| Test.java:5215:42:5215:57 | (...)... : String | Test.java:5215:20:5215:58 | newTreeBagWithElement(...) : TreeBag [<element>] : String | provenance | MaD:2 |
-| Test.java:5215:42:5215:57 | (...)... : String | Test.java:5215:20:5215:58 | newTreeBagWithElement(...) : TreeBag [<element>] : String | provenance | MaD:395 |
+| Test.java:5215:42:5215:57 | (...)... : String | Test.java:5215:20:5215:58 | newTreeBagWithElement(...) : TreeBag [<element>] : String | provenance | MaD:4 |
+| Test.java:5215:42:5215:57 | (...)... : String | Test.java:5215:20:5215:58 | newTreeBagWithElement(...) : TreeBag [<element>] : String | provenance | MaD:470 |
 | Test.java:5215:50:5215:57 | source(...) : Object | Test.java:5215:42:5215:57 | (...)... : String | provenance |  |
 | Test.java:5216:10:5216:37 | new MyAbstractLinkedList<>(...) : MyAbstractLinkedList [<element>] : String | Test.java:5217:20:5217:22 | out : MyAbstractLinkedList [<element>] : String | provenance |  |
-| Test.java:5216:35:5216:36 | in : TreeBag [<element>] : String | Test.java:5216:10:5216:37 | new MyAbstractLinkedList<>(...) : MyAbstractLinkedList [<element>] : String | provenance | MaD:241 |
+| Test.java:5216:35:5216:36 | in : TreeBag [<element>] : String | Test.java:5216:10:5216:37 | new MyAbstractLinkedList<>(...) : MyAbstractLinkedList [<element>] : String | provenance | MaD:243 |
 | Test.java:5216:35:5216:36 | in : TreeBag [<element>] : String | Test.java:7204:31:7204:64 | coll : TreeBag [<element>] : String | provenance |  |
 | Test.java:5217:20:5217:22 | out : MyAbstractLinkedList [<element>] : String | Test.java:230:19:230:32 | it : MyAbstractLinkedList [<element>] : String | provenance |  |
-| Test.java:5217:20:5217:22 | out : MyAbstractLinkedList [<element>] : String | Test.java:5217:9:5217:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:5217:20:5217:22 | out : MyAbstractLinkedList [<element>] : String | Test.java:5217:9:5217:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:5222:16:5222:23 | source(...) : Object | Test.java:5223:17:5223:18 | in : Object | provenance |  |
 | Test.java:5223:4:5223:6 | out [post update] : AbstractLinkedList [<element>] : Object | Test.java:5224:20:5224:22 | out : AbstractLinkedList [<element>] : Object | provenance |  |
-| Test.java:5223:17:5223:18 | in : Object | Test.java:5223:4:5223:6 | out [post update] : AbstractLinkedList [<element>] : Object | provenance | MaD:242 |
+| Test.java:5223:17:5223:18 | in : Object | Test.java:5223:4:5223:6 | out [post update] : AbstractLinkedList [<element>] : Object | provenance | MaD:244 |
 | Test.java:5224:20:5224:22 | out : AbstractLinkedList [<element>] : Object | Test.java:230:19:230:32 | it : AbstractLinkedList [<element>] : Object | provenance |  |
-| Test.java:5224:20:5224:22 | out : AbstractLinkedList [<element>] : Object | Test.java:5224:9:5224:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:5224:20:5224:22 | out : AbstractLinkedList [<element>] : Object | Test.java:5224:9:5224:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:5229:16:5229:23 | source(...) : Object | Test.java:5230:16:5230:17 | in : Object | provenance |  |
 | Test.java:5230:4:5230:6 | out [post update] : AbstractLinkedList [<element>] : Object | Test.java:5231:20:5231:22 | out : AbstractLinkedList [<element>] : Object | provenance |  |
-| Test.java:5230:16:5230:17 | in : Object | Test.java:5230:4:5230:6 | out [post update] : AbstractLinkedList [<element>] : Object | provenance | MaD:243 |
+| Test.java:5230:16:5230:17 | in : Object | Test.java:5230:4:5230:6 | out [post update] : AbstractLinkedList [<element>] : Object | provenance | MaD:245 |
 | Test.java:5231:20:5231:22 | out : AbstractLinkedList [<element>] : Object | Test.java:230:19:230:32 | it : AbstractLinkedList [<element>] : Object | provenance |  |
-| Test.java:5231:20:5231:22 | out : AbstractLinkedList [<element>] : Object | Test.java:5231:9:5231:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:5231:20:5231:22 | out : AbstractLinkedList [<element>] : Object | Test.java:5231:9:5231:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:5236:28:5236:79 | newCursorableLinkedListWithElement(...) : CursorableLinkedList [<element>] : String | Test.java:5237:10:5237:11 | in : CursorableLinkedList [<element>] : String | provenance |  |
 | Test.java:5236:63:5236:78 | (...)... : String | Test.java:255:65:255:73 | element : String | provenance |  |
-| Test.java:5236:63:5236:78 | (...)... : String | Test.java:5236:28:5236:79 | newCursorableLinkedListWithElement(...) : CursorableLinkedList [<element>] : String | provenance | MaD:2 |
+| Test.java:5236:63:5236:78 | (...)... : String | Test.java:5236:28:5236:79 | newCursorableLinkedListWithElement(...) : CursorableLinkedList [<element>] : String | provenance | MaD:4 |
 | Test.java:5236:71:5236:78 | source(...) : Object | Test.java:5236:63:5236:78 | (...)... : String | provenance |  |
-| Test.java:5237:10:5237:11 | in : CursorableLinkedList [<element>] : String | Test.java:5237:10:5237:22 | getFirst(...) : String | provenance | MaD:244 |
+| Test.java:5237:10:5237:11 | in : CursorableLinkedList [<element>] : String | Test.java:5237:10:5237:22 | getFirst(...) : String | provenance | MaD:246 |
 | Test.java:5237:10:5237:22 | getFirst(...) : String | Test.java:5238:9:5238:11 | out | provenance |  |
 | Test.java:5243:28:5243:79 | newCursorableLinkedListWithElement(...) : CursorableLinkedList [<element>] : String | Test.java:5244:10:5244:11 | in : CursorableLinkedList [<element>] : String | provenance |  |
 | Test.java:5243:63:5243:78 | (...)... : String | Test.java:255:65:255:73 | element : String | provenance |  |
-| Test.java:5243:63:5243:78 | (...)... : String | Test.java:5243:28:5243:79 | newCursorableLinkedListWithElement(...) : CursorableLinkedList [<element>] : String | provenance | MaD:2 |
+| Test.java:5243:63:5243:78 | (...)... : String | Test.java:5243:28:5243:79 | newCursorableLinkedListWithElement(...) : CursorableLinkedList [<element>] : String | provenance | MaD:4 |
 | Test.java:5243:71:5243:78 | source(...) : Object | Test.java:5243:63:5243:78 | (...)... : String | provenance |  |
-| Test.java:5244:10:5244:11 | in : CursorableLinkedList [<element>] : String | Test.java:5244:10:5244:21 | getLast(...) : String | provenance | MaD:245 |
+| Test.java:5244:10:5244:11 | in : CursorableLinkedList [<element>] : String | Test.java:5244:10:5244:21 | getLast(...) : String | provenance | MaD:247 |
 | Test.java:5244:10:5244:21 | getLast(...) : String | Test.java:5245:9:5245:11 | out | provenance |  |
 | Test.java:5250:28:5250:79 | newCursorableLinkedListWithElement(...) : CursorableLinkedList [<element>] : String | Test.java:5251:10:5251:11 | in : CursorableLinkedList [<element>] : String | provenance |  |
 | Test.java:5250:63:5250:78 | (...)... : String | Test.java:255:65:255:73 | element : String | provenance |  |
-| Test.java:5250:63:5250:78 | (...)... : String | Test.java:5250:28:5250:79 | newCursorableLinkedListWithElement(...) : CursorableLinkedList [<element>] : String | provenance | MaD:2 |
+| Test.java:5250:63:5250:78 | (...)... : String | Test.java:5250:28:5250:79 | newCursorableLinkedListWithElement(...) : CursorableLinkedList [<element>] : String | provenance | MaD:4 |
 | Test.java:5250:71:5250:78 | source(...) : Object | Test.java:5250:63:5250:78 | (...)... : String | provenance |  |
-| Test.java:5251:10:5251:11 | in : CursorableLinkedList [<element>] : String | Test.java:5251:10:5251:25 | removeFirst(...) : String | provenance | MaD:246 |
+| Test.java:5251:10:5251:11 | in : CursorableLinkedList [<element>] : String | Test.java:5251:10:5251:25 | removeFirst(...) : String | provenance | MaD:248 |
 | Test.java:5251:10:5251:25 | removeFirst(...) : String | Test.java:5252:9:5252:11 | out | provenance |  |
 | Test.java:5257:28:5257:79 | newCursorableLinkedListWithElement(...) : CursorableLinkedList [<element>] : String | Test.java:5258:10:5258:11 | in : CursorableLinkedList [<element>] : String | provenance |  |
 | Test.java:5257:63:5257:78 | (...)... : String | Test.java:255:65:255:73 | element : String | provenance |  |
-| Test.java:5257:63:5257:78 | (...)... : String | Test.java:5257:28:5257:79 | newCursorableLinkedListWithElement(...) : CursorableLinkedList [<element>] : String | provenance | MaD:2 |
+| Test.java:5257:63:5257:78 | (...)... : String | Test.java:5257:28:5257:79 | newCursorableLinkedListWithElement(...) : CursorableLinkedList [<element>] : String | provenance | MaD:4 |
 | Test.java:5257:71:5257:78 | source(...) : Object | Test.java:5257:63:5257:78 | (...)... : String | provenance |  |
-| Test.java:5258:10:5258:11 | in : CursorableLinkedList [<element>] : String | Test.java:5258:10:5258:24 | removeLast(...) : String | provenance | MaD:247 |
+| Test.java:5258:10:5258:11 | in : CursorableLinkedList [<element>] : String | Test.java:5258:10:5258:24 | removeLast(...) : String | provenance | MaD:249 |
 | Test.java:5258:10:5258:24 | removeLast(...) : String | Test.java:5259:9:5259:11 | out | provenance |  |
 | Test.java:5264:14:5264:38 | of(...) : List [<element>] : String | Test.java:5265:38:5265:39 | in : List [<element>] : String | provenance |  |
-| Test.java:5264:22:5264:37 | (...)... : String | Test.java:5264:14:5264:38 | of(...) : List [<element>] : String | provenance | MaD:6 |
+| Test.java:5264:22:5264:37 | (...)... : String | Test.java:5264:14:5264:38 | of(...) : List [<element>] : String | provenance | MaD:7 |
 | Test.java:5264:30:5264:37 | source(...) : Object | Test.java:5264:22:5264:37 | (...)... : String | provenance |  |
 | Test.java:5265:10:5265:40 | new MyAbstractListDecorator<>(...) : MyAbstractListDecorator [<element>] : String | Test.java:5266:20:5266:22 | out : MyAbstractListDecorator [<element>] : String | provenance |  |
-| Test.java:5265:38:5265:39 | in : List [<element>] : String | Test.java:5265:10:5265:40 | new MyAbstractListDecorator<>(...) : MyAbstractListDecorator [<element>] : String | provenance | MaD:248 |
+| Test.java:5265:38:5265:39 | in : List [<element>] : String | Test.java:5265:10:5265:40 | new MyAbstractListDecorator<>(...) : MyAbstractListDecorator [<element>] : String | provenance | MaD:250 |
 | Test.java:5265:38:5265:39 | in : List [<element>] : String | Test.java:7210:34:7210:51 | list : List [<element>] : String | provenance |  |
 | Test.java:5266:20:5266:22 | out : MyAbstractListDecorator [<element>] : String | Test.java:230:19:230:32 | it : MyAbstractListDecorator [<element>] : String | provenance |  |
-| Test.java:5266:20:5266:22 | out : MyAbstractListDecorator [<element>] : String | Test.java:5266:9:5266:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:5266:20:5266:22 | out : MyAbstractListDecorator [<element>] : String | Test.java:5266:9:5266:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:5271:14:5271:38 | of(...) : List [<element>] : String | Test.java:5272:50:5272:51 | in : List [<element>] : String | provenance |  |
-| Test.java:5271:22:5271:37 | (...)... : String | Test.java:5271:14:5271:38 | of(...) : List [<element>] : String | provenance | MaD:6 |
+| Test.java:5271:22:5271:37 | (...)... : String | Test.java:5271:14:5271:38 | of(...) : List [<element>] : String | provenance | MaD:7 |
 | Test.java:5271:30:5271:37 | source(...) : Object | Test.java:5271:22:5271:37 | (...)... : String | provenance |  |
 | Test.java:5272:10:5272:52 | new MyAbstractSerializableListDecorator<>(...) : MyAbstractSerializableListDecorator [<element>] : String | Test.java:5273:20:5273:22 | out : MyAbstractSerializableListDecorator [<element>] : String | provenance |  |
-| Test.java:5272:50:5272:51 | in : List [<element>] : String | Test.java:5272:10:5272:52 | new MyAbstractSerializableListDecorator<>(...) : MyAbstractSerializableListDecorator [<element>] : String | provenance | MaD:249 |
+| Test.java:5272:50:5272:51 | in : List [<element>] : String | Test.java:5272:10:5272:52 | new MyAbstractSerializableListDecorator<>(...) : MyAbstractSerializableListDecorator [<element>] : String | provenance | MaD:251 |
 | Test.java:5272:50:5272:51 | in : List [<element>] : String | Test.java:7216:46:7216:63 | list : List [<element>] : String | provenance |  |
 | Test.java:5273:20:5273:22 | out : MyAbstractSerializableListDecorator [<element>] : String | Test.java:230:19:230:32 | it : MyAbstractSerializableListDecorator [<element>] : String | provenance |  |
-| Test.java:5273:20:5273:22 | out : MyAbstractSerializableListDecorator [<element>] : String | Test.java:5273:9:5273:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:5273:20:5273:22 | out : MyAbstractSerializableListDecorator [<element>] : String | Test.java:5273:9:5273:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:5278:20:5278:44 | of(...) : List [<element>] : String | Test.java:5279:35:5279:36 | in : List [<element>] : String | provenance |  |
-| Test.java:5278:28:5278:43 | (...)... : String | Test.java:5278:20:5278:44 | of(...) : List [<element>] : String | provenance | MaD:6 |
+| Test.java:5278:28:5278:43 | (...)... : String | Test.java:5278:20:5278:44 | of(...) : List [<element>] : String | provenance | MaD:7 |
 | Test.java:5278:36:5278:43 | source(...) : Object | Test.java:5278:28:5278:43 | (...)... : String | provenance |  |
 | Test.java:5279:10:5279:37 | new CursorableLinkedList<>(...) : CursorableLinkedList [<element>] : String | Test.java:5280:20:5280:22 | out : CursorableLinkedList [<element>] : String | provenance |  |
-| Test.java:5279:35:5279:36 | in : List [<element>] : String | Test.java:5279:10:5279:37 | new CursorableLinkedList<>(...) : CursorableLinkedList [<element>] : String | provenance | MaD:250 |
+| Test.java:5279:35:5279:36 | in : List [<element>] : String | Test.java:5279:10:5279:37 | new CursorableLinkedList<>(...) : CursorableLinkedList [<element>] : String | provenance | MaD:252 |
 | Test.java:5280:20:5280:22 | out : CursorableLinkedList [<element>] : String | Test.java:230:19:230:32 | it : CursorableLinkedList [<element>] : String | provenance |  |
-| Test.java:5280:20:5280:22 | out : CursorableLinkedList [<element>] : String | Test.java:5280:9:5280:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:5280:20:5280:22 | out : CursorableLinkedList [<element>] : String | Test.java:5280:9:5280:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:5285:30:5285:81 | newCursorableLinkedListWithElement(...) : CursorableLinkedList [<element>] : String | Test.java:5286:10:5286:11 | in : CursorableLinkedList [<element>] : String | provenance |  |
 | Test.java:5285:65:5285:80 | (...)... : String | Test.java:255:65:255:73 | element : String | provenance |  |
-| Test.java:5285:65:5285:80 | (...)... : String | Test.java:5285:30:5285:81 | newCursorableLinkedListWithElement(...) : CursorableLinkedList [<element>] : String | provenance | MaD:2 |
+| Test.java:5285:65:5285:80 | (...)... : String | Test.java:5285:30:5285:81 | newCursorableLinkedListWithElement(...) : CursorableLinkedList [<element>] : String | provenance | MaD:4 |
 | Test.java:5285:73:5285:80 | source(...) : Object | Test.java:5285:65:5285:80 | (...)... : String | provenance |  |
-| Test.java:5286:10:5286:11 | in : CursorableLinkedList [<element>] : String | Test.java:5286:10:5286:21 | cursor(...) : Cursor [<element>] : String | provenance | MaD:251 |
+| Test.java:5286:10:5286:11 | in : CursorableLinkedList [<element>] : String | Test.java:5286:10:5286:21 | cursor(...) : Cursor [<element>] : String | provenance | MaD:253 |
 | Test.java:5286:10:5286:21 | cursor(...) : Cursor [<element>] : String | Test.java:5287:20:5287:22 | out : Cursor [<element>] : String | provenance |  |
 | Test.java:5287:20:5287:22 | out : Cursor [<element>] : String | Test.java:231:19:231:32 | it : Cursor [<element>] : String | provenance |  |
-| Test.java:5287:20:5287:22 | out : Cursor [<element>] : String | Test.java:5287:9:5287:23 | getElement(...) | provenance | MaD:4 |
+| Test.java:5287:20:5287:22 | out : Cursor [<element>] : String | Test.java:5287:9:5287:23 | getElement(...) | provenance | MaD:6 |
 | Test.java:5292:30:5292:81 | newCursorableLinkedListWithElement(...) : CursorableLinkedList [<element>] : String | Test.java:5293:10:5293:11 | in : CursorableLinkedList [<element>] : String | provenance |  |
 | Test.java:5292:65:5292:80 | (...)... : String | Test.java:255:65:255:73 | element : String | provenance |  |
-| Test.java:5292:65:5292:80 | (...)... : String | Test.java:5292:30:5292:81 | newCursorableLinkedListWithElement(...) : CursorableLinkedList [<element>] : String | provenance | MaD:2 |
+| Test.java:5292:65:5292:80 | (...)... : String | Test.java:5292:30:5292:81 | newCursorableLinkedListWithElement(...) : CursorableLinkedList [<element>] : String | provenance | MaD:4 |
 | Test.java:5292:73:5292:80 | source(...) : Object | Test.java:5292:65:5292:80 | (...)... : String | provenance |  |
-| Test.java:5293:10:5293:11 | in : CursorableLinkedList [<element>] : String | Test.java:5293:10:5293:20 | cursor(...) : Cursor [<element>] : String | provenance | MaD:251 |
+| Test.java:5293:10:5293:11 | in : CursorableLinkedList [<element>] : String | Test.java:5293:10:5293:20 | cursor(...) : Cursor [<element>] : String | provenance | MaD:253 |
 | Test.java:5293:10:5293:20 | cursor(...) : Cursor [<element>] : String | Test.java:5294:20:5294:22 | out : Cursor [<element>] : String | provenance |  |
 | Test.java:5294:20:5294:22 | out : Cursor [<element>] : String | Test.java:231:19:231:32 | it : Cursor [<element>] : String | provenance |  |
-| Test.java:5294:20:5294:22 | out : Cursor [<element>] : String | Test.java:5294:9:5294:23 | getElement(...) | provenance | MaD:4 |
+| Test.java:5294:20:5294:22 | out : Cursor [<element>] : String | Test.java:5294:9:5294:23 | getElement(...) | provenance | MaD:6 |
 | Test.java:5299:14:5299:38 | of(...) : List [<element>] : String | Test.java:5300:38:5300:39 | in : List [<element>] : String | provenance |  |
-| Test.java:5299:22:5299:37 | (...)... : String | Test.java:5299:14:5299:38 | of(...) : List [<element>] : String | provenance | MaD:6 |
+| Test.java:5299:22:5299:37 | (...)... : String | Test.java:5299:14:5299:38 | of(...) : List [<element>] : String | provenance | MaD:7 |
 | Test.java:5299:30:5299:37 | source(...) : Object | Test.java:5299:22:5299:37 | (...)... : String | provenance |  |
 | Test.java:5300:10:5300:40 | fixedSizeList(...) : FixedSizeList [<element>] : String | Test.java:5301:20:5301:22 | out : FixedSizeList [<element>] : String | provenance |  |
-| Test.java:5300:38:5300:39 | in : List [<element>] : String | Test.java:5300:10:5300:40 | fixedSizeList(...) : FixedSizeList [<element>] : String | provenance | MaD:252 |
+| Test.java:5300:38:5300:39 | in : List [<element>] : String | Test.java:5300:10:5300:40 | fixedSizeList(...) : FixedSizeList [<element>] : String | provenance | MaD:254 |
 | Test.java:5301:20:5301:22 | out : FixedSizeList [<element>] : String | Test.java:230:19:230:32 | it : FixedSizeList [<element>] : String | provenance |  |
-| Test.java:5301:20:5301:22 | out : FixedSizeList [<element>] : String | Test.java:5301:9:5301:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:5301:20:5301:22 | out : FixedSizeList [<element>] : String | Test.java:5301:9:5301:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:5306:14:5306:38 | of(...) : List [<element>] : String | Test.java:5307:32:5307:33 | in : List [<element>] : String | provenance |  |
-| Test.java:5306:22:5306:37 | (...)... : String | Test.java:5306:14:5306:38 | of(...) : List [<element>] : String | provenance | MaD:6 |
+| Test.java:5306:22:5306:37 | (...)... : String | Test.java:5306:14:5306:38 | of(...) : List [<element>] : String | provenance | MaD:7 |
 | Test.java:5306:30:5306:37 | source(...) : Object | Test.java:5306:22:5306:37 | (...)... : String | provenance |  |
 | Test.java:5307:10:5307:34 | growthList(...) : GrowthList [<element>] : String | Test.java:5308:20:5308:22 | out : GrowthList [<element>] : String | provenance |  |
-| Test.java:5307:32:5307:33 | in : List [<element>] : String | Test.java:5307:10:5307:34 | growthList(...) : GrowthList [<element>] : String | provenance | MaD:253 |
+| Test.java:5307:32:5307:33 | in : List [<element>] : String | Test.java:5307:10:5307:34 | growthList(...) : GrowthList [<element>] : String | provenance | MaD:255 |
 | Test.java:5308:20:5308:22 | out : GrowthList [<element>] : String | Test.java:230:19:230:32 | it : GrowthList [<element>] : String | provenance |  |
-| Test.java:5308:20:5308:22 | out : GrowthList [<element>] : String | Test.java:5308:9:5308:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:5308:20:5308:22 | out : GrowthList [<element>] : String | Test.java:5308:9:5308:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:5313:14:5313:38 | of(...) : List [<element>] : String | Test.java:5314:28:5314:29 | in : List [<element>] : String | provenance |  |
-| Test.java:5313:22:5313:37 | (...)... : String | Test.java:5313:14:5313:38 | of(...) : List [<element>] : String | provenance | MaD:6 |
+| Test.java:5313:22:5313:37 | (...)... : String | Test.java:5313:14:5313:38 | of(...) : List [<element>] : String | provenance | MaD:7 |
 | Test.java:5313:30:5313:37 | source(...) : Object | Test.java:5313:22:5313:37 | (...)... : String | provenance |  |
 | Test.java:5314:10:5314:49 | lazyList(...) : LazyList [<element>] : String | Test.java:5315:20:5315:22 | out : LazyList [<element>] : String | provenance |  |
-| Test.java:5314:28:5314:29 | in : List [<element>] : String | Test.java:5314:10:5314:49 | lazyList(...) : LazyList [<element>] : String | provenance | MaD:254 |
+| Test.java:5314:28:5314:29 | in : List [<element>] : String | Test.java:5314:10:5314:49 | lazyList(...) : LazyList [<element>] : String | provenance | MaD:256 |
 | Test.java:5315:20:5315:22 | out : LazyList [<element>] : String | Test.java:230:19:230:32 | it : LazyList [<element>] : String | provenance |  |
-| Test.java:5315:20:5315:22 | out : LazyList [<element>] : String | Test.java:5315:9:5315:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:5315:20:5315:22 | out : LazyList [<element>] : String | Test.java:5315:9:5315:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:5320:14:5320:38 | of(...) : List [<element>] : String | Test.java:5321:28:5321:29 | in : List [<element>] : String | provenance |  |
-| Test.java:5320:22:5320:37 | (...)... : String | Test.java:5320:14:5320:38 | of(...) : List [<element>] : String | provenance | MaD:6 |
+| Test.java:5320:22:5320:37 | (...)... : String | Test.java:5320:14:5320:38 | of(...) : List [<element>] : String | provenance | MaD:7 |
 | Test.java:5320:30:5320:37 | source(...) : Object | Test.java:5320:22:5320:37 | (...)... : String | provenance |  |
 | Test.java:5321:10:5321:45 | lazyList(...) : LazyList [<element>] : String | Test.java:5322:20:5322:22 | out : LazyList [<element>] : String | provenance |  |
-| Test.java:5321:28:5321:29 | in : List [<element>] : String | Test.java:5321:10:5321:45 | lazyList(...) : LazyList [<element>] : String | provenance | MaD:254 |
+| Test.java:5321:28:5321:29 | in : List [<element>] : String | Test.java:5321:10:5321:45 | lazyList(...) : LazyList [<element>] : String | provenance | MaD:256 |
 | Test.java:5322:20:5322:22 | out : LazyList [<element>] : String | Test.java:230:19:230:32 | it : LazyList [<element>] : String | provenance |  |
-| Test.java:5322:20:5322:22 | out : LazyList [<element>] : String | Test.java:5322:9:5322:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:5322:20:5322:22 | out : LazyList [<element>] : String | Test.java:5322:9:5322:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:5327:20:5327:44 | of(...) : List [<element>] : String | Test.java:5328:36:5328:37 | in : List [<element>] : String | provenance |  |
-| Test.java:5327:28:5327:43 | (...)... : String | Test.java:5327:20:5327:44 | of(...) : List [<element>] : String | provenance | MaD:6 |
+| Test.java:5327:28:5327:43 | (...)... : String | Test.java:5327:20:5327:44 | of(...) : List [<element>] : String | provenance | MaD:7 |
 | Test.java:5327:36:5327:43 | source(...) : Object | Test.java:5327:28:5327:43 | (...)... : String | provenance |  |
 | Test.java:5328:10:5328:38 | new NodeCachingLinkedList<>(...) : NodeCachingLinkedList [<element>] : String | Test.java:5329:20:5329:22 | out : NodeCachingLinkedList [<element>] : String | provenance |  |
-| Test.java:5328:36:5328:37 | in : List [<element>] : String | Test.java:5328:10:5328:38 | new NodeCachingLinkedList<>(...) : NodeCachingLinkedList [<element>] : String | provenance | MaD:255 |
+| Test.java:5328:36:5328:37 | in : List [<element>] : String | Test.java:5328:10:5328:38 | new NodeCachingLinkedList<>(...) : NodeCachingLinkedList [<element>] : String | provenance | MaD:257 |
 | Test.java:5329:20:5329:22 | out : NodeCachingLinkedList [<element>] : String | Test.java:230:19:230:32 | it : NodeCachingLinkedList [<element>] : String | provenance |  |
-| Test.java:5329:20:5329:22 | out : NodeCachingLinkedList [<element>] : String | Test.java:5329:9:5329:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:5329:20:5329:22 | out : NodeCachingLinkedList [<element>] : String | Test.java:5329:9:5329:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:5334:14:5334:38 | of(...) : List [<element>] : String | Test.java:5335:40:5335:41 | in : List [<element>] : String | provenance |  |
-| Test.java:5334:22:5334:37 | (...)... : String | Test.java:5334:14:5334:38 | of(...) : List [<element>] : String | provenance | MaD:6 |
+| Test.java:5334:22:5334:37 | (...)... : String | Test.java:5334:14:5334:38 | of(...) : List [<element>] : String | provenance | MaD:7 |
 | Test.java:5334:30:5334:37 | source(...) : Object | Test.java:5334:22:5334:37 | (...)... : String | provenance |  |
 | Test.java:5335:10:5335:48 | predicatedList(...) : PredicatedList [<element>] : String | Test.java:5336:20:5336:22 | out : PredicatedList [<element>] : String | provenance |  |
-| Test.java:5335:40:5335:41 | in : List [<element>] : String | Test.java:5335:10:5335:48 | predicatedList(...) : PredicatedList [<element>] : String | provenance | MaD:256 |
+| Test.java:5335:40:5335:41 | in : List [<element>] : String | Test.java:5335:10:5335:48 | predicatedList(...) : PredicatedList [<element>] : String | provenance | MaD:258 |
 | Test.java:5336:20:5336:22 | out : PredicatedList [<element>] : String | Test.java:230:19:230:32 | it : PredicatedList [<element>] : String | provenance |  |
-| Test.java:5336:20:5336:22 | out : PredicatedList [<element>] : String | Test.java:5336:9:5336:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:5336:20:5336:22 | out : PredicatedList [<element>] : String | Test.java:5336:9:5336:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:5341:23:5341:76 | setUniqueList(...) : SetUniqueList [<element>] : String | Test.java:5342:10:5342:11 | in : SetUniqueList [<element>] : String | provenance |  |
-| Test.java:5341:51:5341:75 | of(...) : List [<element>] : String | Test.java:5341:23:5341:76 | setUniqueList(...) : SetUniqueList [<element>] : String | provenance | MaD:258 |
-| Test.java:5341:59:5341:74 | (...)... : String | Test.java:5341:51:5341:75 | of(...) : List [<element>] : String | provenance | MaD:6 |
+| Test.java:5341:51:5341:75 | of(...) : List [<element>] : String | Test.java:5341:23:5341:76 | setUniqueList(...) : SetUniqueList [<element>] : String | provenance | MaD:260 |
+| Test.java:5341:59:5341:74 | (...)... : String | Test.java:5341:51:5341:75 | of(...) : List [<element>] : String | provenance | MaD:7 |
 | Test.java:5341:67:5341:74 | source(...) : Object | Test.java:5341:59:5341:74 | (...)... : String | provenance |  |
-| Test.java:5342:10:5342:11 | in : SetUniqueList [<element>] : String | Test.java:5342:10:5342:19 | asSet(...) : Set [<element>] : String | provenance | MaD:257 |
+| Test.java:5342:10:5342:11 | in : SetUniqueList [<element>] : String | Test.java:5342:10:5342:19 | asSet(...) : Set [<element>] : String | provenance | MaD:259 |
 | Test.java:5342:10:5342:19 | asSet(...) : Set [<element>] : String | Test.java:5343:20:5343:22 | out : Set [<element>] : String | provenance |  |
 | Test.java:5343:20:5343:22 | out : Set [<element>] : String | Test.java:230:19:230:32 | it : Set [<element>] : String | provenance |  |
-| Test.java:5343:20:5343:22 | out : Set [<element>] : String | Test.java:5343:9:5343:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:5343:20:5343:22 | out : Set [<element>] : String | Test.java:5343:9:5343:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:5348:14:5348:38 | of(...) : List [<element>] : String | Test.java:5349:38:5349:39 | in : List [<element>] : String | provenance |  |
-| Test.java:5348:22:5348:37 | (...)... : String | Test.java:5348:14:5348:38 | of(...) : List [<element>] : String | provenance | MaD:6 |
+| Test.java:5348:22:5348:37 | (...)... : String | Test.java:5348:14:5348:38 | of(...) : List [<element>] : String | provenance | MaD:7 |
 | Test.java:5348:30:5348:37 | source(...) : Object | Test.java:5348:22:5348:37 | (...)... : String | provenance |  |
 | Test.java:5349:10:5349:40 | setUniqueList(...) : SetUniqueList [<element>] : String | Test.java:5350:20:5350:22 | out : SetUniqueList [<element>] : String | provenance |  |
-| Test.java:5349:38:5349:39 | in : List [<element>] : String | Test.java:5349:10:5349:40 | setUniqueList(...) : SetUniqueList [<element>] : String | provenance | MaD:258 |
+| Test.java:5349:38:5349:39 | in : List [<element>] : String | Test.java:5349:10:5349:40 | setUniqueList(...) : SetUniqueList [<element>] : String | provenance | MaD:260 |
 | Test.java:5350:20:5350:22 | out : SetUniqueList [<element>] : String | Test.java:230:19:230:32 | it : SetUniqueList [<element>] : String | provenance |  |
-| Test.java:5350:20:5350:22 | out : SetUniqueList [<element>] : String | Test.java:5350:9:5350:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:5350:20:5350:22 | out : SetUniqueList [<element>] : String | Test.java:5350:9:5350:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:5355:14:5355:38 | of(...) : List [<element>] : String | Test.java:5356:43:5356:44 | in : List [<element>] : String | provenance |  |
-| Test.java:5355:22:5355:37 | (...)... : String | Test.java:5355:14:5355:38 | of(...) : List [<element>] : String | provenance | MaD:6 |
+| Test.java:5355:22:5355:37 | (...)... : String | Test.java:5355:14:5355:38 | of(...) : List [<element>] : String | provenance | MaD:7 |
 | Test.java:5355:30:5355:37 | source(...) : Object | Test.java:5355:22:5355:37 | (...)... : String | provenance |  |
 | Test.java:5356:10:5356:51 | transformingList(...) : TransformedList [<element>] : String | Test.java:5357:20:5357:22 | out : TransformedList [<element>] : String | provenance |  |
-| Test.java:5356:43:5356:44 | in : List [<element>] : String | Test.java:5356:10:5356:51 | transformingList(...) : TransformedList [<element>] : String | provenance | MaD:259 |
+| Test.java:5356:43:5356:44 | in : List [<element>] : String | Test.java:5356:10:5356:51 | transformingList(...) : TransformedList [<element>] : String | provenance | MaD:261 |
 | Test.java:5357:20:5357:22 | out : TransformedList [<element>] : String | Test.java:230:19:230:32 | it : TransformedList [<element>] : String | provenance |  |
-| Test.java:5357:20:5357:22 | out : TransformedList [<element>] : String | Test.java:5357:9:5357:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:5357:20:5357:22 | out : TransformedList [<element>] : String | Test.java:5357:9:5357:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:5362:20:5362:44 | of(...) : List [<element>] : String | Test.java:5363:23:5363:24 | in : List [<element>] : String | provenance |  |
-| Test.java:5362:28:5362:43 | (...)... : String | Test.java:5362:20:5362:44 | of(...) : List [<element>] : String | provenance | MaD:6 |
+| Test.java:5362:28:5362:43 | (...)... : String | Test.java:5362:20:5362:44 | of(...) : List [<element>] : String | provenance | MaD:7 |
 | Test.java:5362:36:5362:43 | source(...) : Object | Test.java:5362:28:5362:43 | (...)... : String | provenance |  |
 | Test.java:5363:10:5363:25 | new TreeList<>(...) : TreeList [<element>] : String | Test.java:5364:20:5364:22 | out : TreeList [<element>] : String | provenance |  |
-| Test.java:5363:23:5363:24 | in : List [<element>] : String | Test.java:5363:10:5363:25 | new TreeList<>(...) : TreeList [<element>] : String | provenance | MaD:260 |
+| Test.java:5363:23:5363:24 | in : List [<element>] : String | Test.java:5363:10:5363:25 | new TreeList<>(...) : TreeList [<element>] : String | provenance | MaD:262 |
 | Test.java:5364:20:5364:22 | out : TreeList [<element>] : String | Test.java:230:19:230:32 | it : TreeList [<element>] : String | provenance |  |
-| Test.java:5364:20:5364:22 | out : TreeList [<element>] : String | Test.java:5364:9:5364:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:5364:20:5364:22 | out : TreeList [<element>] : String | Test.java:5364:9:5364:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:5369:14:5369:38 | of(...) : List [<element>] : String | Test.java:5370:31:5370:32 | in : List [<element>] : String | provenance |  |
-| Test.java:5369:22:5369:37 | (...)... : String | Test.java:5369:14:5369:38 | of(...) : List [<element>] : String | provenance | MaD:6 |
+| Test.java:5369:22:5369:37 | (...)... : String | Test.java:5369:14:5369:38 | of(...) : List [<element>] : String | provenance | MaD:7 |
 | Test.java:5369:30:5369:37 | source(...) : Object | Test.java:5369:22:5369:37 | (...)... : String | provenance |  |
 | Test.java:5370:10:5370:33 | new UnmodifiableList<>(...) : UnmodifiableList [<element>] : String | Test.java:5371:20:5371:22 | out : UnmodifiableList [<element>] : String | provenance |  |
-| Test.java:5370:31:5370:32 | in : List [<element>] : String | Test.java:5370:10:5370:33 | new UnmodifiableList<>(...) : UnmodifiableList [<element>] : String | provenance | MaD:261 |
+| Test.java:5370:31:5370:32 | in : List [<element>] : String | Test.java:5370:10:5370:33 | new UnmodifiableList<>(...) : UnmodifiableList [<element>] : String | provenance | MaD:263 |
 | Test.java:5371:20:5371:22 | out : UnmodifiableList [<element>] : String | Test.java:230:19:230:32 | it : UnmodifiableList [<element>] : String | provenance |  |
-| Test.java:5371:20:5371:22 | out : UnmodifiableList [<element>] : String | Test.java:5371:9:5371:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:5371:20:5371:22 | out : UnmodifiableList [<element>] : String | Test.java:5371:9:5371:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:5376:14:5376:38 | of(...) : List [<element>] : String | Test.java:5377:44:5377:45 | in : List [<element>] : String | provenance |  |
-| Test.java:5376:22:5376:37 | (...)... : String | Test.java:5376:14:5376:38 | of(...) : List [<element>] : String | provenance | MaD:6 |
+| Test.java:5376:22:5376:37 | (...)... : String | Test.java:5376:14:5376:38 | of(...) : List [<element>] : String | provenance | MaD:7 |
 | Test.java:5376:30:5376:37 | source(...) : Object | Test.java:5376:22:5376:37 | (...)... : String | provenance |  |
 | Test.java:5377:10:5377:46 | unmodifiableList(...) : List [<element>] : String | Test.java:5378:20:5378:22 | out : List [<element>] : String | provenance |  |
-| Test.java:5377:44:5377:45 | in : List [<element>] : String | Test.java:5377:10:5377:46 | unmodifiableList(...) : List [<element>] : String | provenance | MaD:262 |
+| Test.java:5377:44:5377:45 | in : List [<element>] : String | Test.java:5377:10:5377:46 | unmodifiableList(...) : List [<element>] : String | provenance | MaD:264 |
 | Test.java:5378:20:5378:22 | out : List [<element>] : String | Test.java:230:19:230:32 | it : List [<element>] : String | provenance |  |
-| Test.java:5378:20:5378:22 | out : List [<element>] : String | Test.java:5378:9:5378:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:5378:20:5378:22 | out : List [<element>] : String | Test.java:5378:9:5378:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:5383:13:5383:42 | of(...) : Map [<map.key>] : String | Test.java:5384:34:5384:35 | in : Map [<map.key>] : String | provenance |  |
-| Test.java:5383:20:5383:35 | (...)... : String | Test.java:5383:13:5383:42 | of(...) : Map [<map.key>] : String | provenance | MaD:11 |
+| Test.java:5383:20:5383:35 | (...)... : String | Test.java:5383:13:5383:42 | of(...) : Map [<map.key>] : String | provenance | MaD:13 |
 | Test.java:5383:28:5383:35 | source(...) : Object | Test.java:5383:20:5383:35 | (...)... : String | provenance |  |
 | Test.java:5384:10:5384:36 | new MyAbstractHashedMap<>(...) : MyAbstractHashedMap [<map.key>] : String | Test.java:5385:19:5385:21 | out : MyAbstractHashedMap [<map.key>] : String | provenance |  |
-| Test.java:5384:34:5384:35 | in : Map [<map.key>] : String | Test.java:5384:10:5384:36 | new MyAbstractHashedMap<>(...) : MyAbstractHashedMap [<map.key>] : String | provenance | MaD:263 |
+| Test.java:5384:34:5384:35 | in : Map [<map.key>] : String | Test.java:5384:10:5384:36 | new MyAbstractHashedMap<>(...) : MyAbstractHashedMap [<map.key>] : String | provenance | MaD:265 |
 | Test.java:5384:34:5384:35 | in : Map [<map.key>] : String | Test.java:7222:30:7222:68 | map : Map [<map.key>] : String | provenance |  |
 | Test.java:5385:19:5385:21 | out : MyAbstractHashedMap [<map.key>] : String | Test.java:228:18:228:29 | map : MyAbstractHashedMap [<map.key>] : String | provenance |  |
-| Test.java:5385:19:5385:21 | out : MyAbstractHashedMap [<map.key>] : String | Test.java:5385:9:5385:22 | getMapKey(...) | provenance | MaD:10 |
+| Test.java:5385:19:5385:21 | out : MyAbstractHashedMap [<map.key>] : String | Test.java:5385:9:5385:22 | getMapKey(...) | provenance | MaD:18 |
 | Test.java:5390:13:5390:42 | of(...) : Map [<map.value>] : String | Test.java:5391:34:5391:35 | in : Map [<map.value>] : String | provenance |  |
-| Test.java:5390:26:5390:41 | (...)... : String | Test.java:5390:13:5390:42 | of(...) : Map [<map.value>] : String | provenance | MaD:12 |
+| Test.java:5390:26:5390:41 | (...)... : String | Test.java:5390:13:5390:42 | of(...) : Map [<map.value>] : String | provenance | MaD:14 |
 | Test.java:5390:34:5390:41 | source(...) : Object | Test.java:5390:26:5390:41 | (...)... : String | provenance |  |
 | Test.java:5391:10:5391:36 | new MyAbstractHashedMap<>(...) : MyAbstractHashedMap [<map.value>] : String | Test.java:5392:21:5392:23 | out : MyAbstractHashedMap [<map.value>] : String | provenance |  |
-| Test.java:5391:34:5391:35 | in : Map [<map.value>] : String | Test.java:5391:10:5391:36 | new MyAbstractHashedMap<>(...) : MyAbstractHashedMap [<map.value>] : String | provenance | MaD:264 |
+| Test.java:5391:34:5391:35 | in : Map [<map.value>] : String | Test.java:5391:10:5391:36 | new MyAbstractHashedMap<>(...) : MyAbstractHashedMap [<map.value>] : String | provenance | MaD:266 |
 | Test.java:5391:34:5391:35 | in : Map [<map.value>] : String | Test.java:7222:30:7222:68 | map : Map [<map.value>] : String | provenance |  |
 | Test.java:5392:21:5392:23 | out : MyAbstractHashedMap [<map.value>] : String | Test.java:232:20:232:31 | map : MyAbstractHashedMap [<map.value>] : String | provenance |  |
-| Test.java:5392:21:5392:23 | out : MyAbstractHashedMap [<map.value>] : String | Test.java:5392:9:5392:24 | getMapValue(...) | provenance | MaD:9 |
+| Test.java:5392:21:5392:23 | out : MyAbstractHashedMap [<map.value>] : String | Test.java:5392:9:5392:24 | getMapValue(...) | provenance | MaD:17 |
 | Test.java:5397:13:5397:42 | of(...) : Map [<map.key>] : String | Test.java:5398:34:5398:35 | in : Map [<map.key>] : String | provenance |  |
-| Test.java:5397:20:5397:35 | (...)... : String | Test.java:5397:13:5397:42 | of(...) : Map [<map.key>] : String | provenance | MaD:11 |
+| Test.java:5397:20:5397:35 | (...)... : String | Test.java:5397:13:5397:42 | of(...) : Map [<map.key>] : String | provenance | MaD:13 |
 | Test.java:5397:28:5397:35 | source(...) : Object | Test.java:5397:20:5397:35 | (...)... : String | provenance |  |
 | Test.java:5398:10:5398:36 | new MyAbstractLinkedMap<>(...) : MyAbstractLinkedMap [<map.key>] : String | Test.java:5399:19:5399:21 | out : MyAbstractLinkedMap [<map.key>] : String | provenance |  |
-| Test.java:5398:34:5398:35 | in : Map [<map.key>] : String | Test.java:5398:10:5398:36 | new MyAbstractLinkedMap<>(...) : MyAbstractLinkedMap [<map.key>] : String | provenance | MaD:265 |
+| Test.java:5398:34:5398:35 | in : Map [<map.key>] : String | Test.java:5398:10:5398:36 | new MyAbstractLinkedMap<>(...) : MyAbstractLinkedMap [<map.key>] : String | provenance | MaD:267 |
 | Test.java:5398:34:5398:35 | in : Map [<map.key>] : String | Test.java:7228:30:7228:68 | map : Map [<map.key>] : String | provenance |  |
 | Test.java:5399:19:5399:21 | out : MyAbstractLinkedMap [<map.key>] : String | Test.java:228:18:228:29 | map : MyAbstractLinkedMap [<map.key>] : String | provenance |  |
-| Test.java:5399:19:5399:21 | out : MyAbstractLinkedMap [<map.key>] : String | Test.java:5399:9:5399:22 | getMapKey(...) | provenance | MaD:10 |
+| Test.java:5399:19:5399:21 | out : MyAbstractLinkedMap [<map.key>] : String | Test.java:5399:9:5399:22 | getMapKey(...) | provenance | MaD:18 |
 | Test.java:5404:13:5404:42 | of(...) : Map [<map.value>] : String | Test.java:5405:34:5405:35 | in : Map [<map.value>] : String | provenance |  |
-| Test.java:5404:26:5404:41 | (...)... : String | Test.java:5404:13:5404:42 | of(...) : Map [<map.value>] : String | provenance | MaD:12 |
+| Test.java:5404:26:5404:41 | (...)... : String | Test.java:5404:13:5404:42 | of(...) : Map [<map.value>] : String | provenance | MaD:14 |
 | Test.java:5404:34:5404:41 | source(...) : Object | Test.java:5404:26:5404:41 | (...)... : String | provenance |  |
 | Test.java:5405:10:5405:36 | new MyAbstractLinkedMap<>(...) : MyAbstractLinkedMap [<map.value>] : String | Test.java:5406:21:5406:23 | out : MyAbstractLinkedMap [<map.value>] : String | provenance |  |
-| Test.java:5405:34:5405:35 | in : Map [<map.value>] : String | Test.java:5405:10:5405:36 | new MyAbstractLinkedMap<>(...) : MyAbstractLinkedMap [<map.value>] : String | provenance | MaD:266 |
+| Test.java:5405:34:5405:35 | in : Map [<map.value>] : String | Test.java:5405:10:5405:36 | new MyAbstractLinkedMap<>(...) : MyAbstractLinkedMap [<map.value>] : String | provenance | MaD:268 |
 | Test.java:5405:34:5405:35 | in : Map [<map.value>] : String | Test.java:7228:30:7228:68 | map : Map [<map.value>] : String | provenance |  |
 | Test.java:5406:21:5406:23 | out : MyAbstractLinkedMap [<map.value>] : String | Test.java:232:20:232:31 | map : MyAbstractLinkedMap [<map.value>] : String | provenance |  |
-| Test.java:5406:21:5406:23 | out : MyAbstractLinkedMap [<map.value>] : String | Test.java:5406:9:5406:24 | getMapValue(...) | provenance | MaD:9 |
+| Test.java:5406:21:5406:23 | out : MyAbstractLinkedMap [<map.value>] : String | Test.java:5406:9:5406:24 | getMapValue(...) | provenance | MaD:17 |
 | Test.java:5411:13:5411:42 | of(...) : Map [<map.key>] : String | Test.java:5412:37:5412:38 | in : Map [<map.key>] : String | provenance |  |
-| Test.java:5411:20:5411:35 | (...)... : String | Test.java:5411:13:5411:42 | of(...) : Map [<map.key>] : String | provenance | MaD:11 |
+| Test.java:5411:20:5411:35 | (...)... : String | Test.java:5411:13:5411:42 | of(...) : Map [<map.key>] : String | provenance | MaD:13 |
 | Test.java:5411:28:5411:35 | source(...) : Object | Test.java:5411:20:5411:35 | (...)... : String | provenance |  |
 | Test.java:5412:10:5412:39 | new MyAbstractMapDecorator<>(...) : MyAbstractMapDecorator [<map.key>] : String | Test.java:5413:19:5413:21 | out : MyAbstractMapDecorator [<map.key>] : String | provenance |  |
-| Test.java:5412:37:5412:38 | in : Map [<map.key>] : String | Test.java:5412:10:5412:39 | new MyAbstractMapDecorator<>(...) : MyAbstractMapDecorator [<map.key>] : String | provenance | MaD:267 |
+| Test.java:5412:37:5412:38 | in : Map [<map.key>] : String | Test.java:5412:10:5412:39 | new MyAbstractMapDecorator<>(...) : MyAbstractMapDecorator [<map.key>] : String | provenance | MaD:269 |
 | Test.java:5412:37:5412:38 | in : Map [<map.key>] : String | Test.java:7234:33:7234:51 | map : Map [<map.key>] : String | provenance |  |
 | Test.java:5413:19:5413:21 | out : MyAbstractMapDecorator [<map.key>] : String | Test.java:228:18:228:29 | map : MyAbstractMapDecorator [<map.key>] : String | provenance |  |
-| Test.java:5413:19:5413:21 | out : MyAbstractMapDecorator [<map.key>] : String | Test.java:5413:9:5413:22 | getMapKey(...) | provenance | MaD:10 |
+| Test.java:5413:19:5413:21 | out : MyAbstractMapDecorator [<map.key>] : String | Test.java:5413:9:5413:22 | getMapKey(...) | provenance | MaD:18 |
 | Test.java:5418:13:5418:42 | of(...) : Map [<map.value>] : String | Test.java:5419:37:5419:38 | in : Map [<map.value>] : String | provenance |  |
-| Test.java:5418:26:5418:41 | (...)... : String | Test.java:5418:13:5418:42 | of(...) : Map [<map.value>] : String | provenance | MaD:12 |
+| Test.java:5418:26:5418:41 | (...)... : String | Test.java:5418:13:5418:42 | of(...) : Map [<map.value>] : String | provenance | MaD:14 |
 | Test.java:5418:34:5418:41 | source(...) : Object | Test.java:5418:26:5418:41 | (...)... : String | provenance |  |
 | Test.java:5419:10:5419:39 | new MyAbstractMapDecorator<>(...) : MyAbstractMapDecorator [<map.value>] : String | Test.java:5420:21:5420:23 | out : MyAbstractMapDecorator [<map.value>] : String | provenance |  |
-| Test.java:5419:37:5419:38 | in : Map [<map.value>] : String | Test.java:5419:10:5419:39 | new MyAbstractMapDecorator<>(...) : MyAbstractMapDecorator [<map.value>] : String | provenance | MaD:268 |
+| Test.java:5419:37:5419:38 | in : Map [<map.value>] : String | Test.java:5419:10:5419:39 | new MyAbstractMapDecorator<>(...) : MyAbstractMapDecorator [<map.value>] : String | provenance | MaD:270 |
 | Test.java:5419:37:5419:38 | in : Map [<map.value>] : String | Test.java:7234:33:7234:51 | map : Map [<map.value>] : String | provenance |  |
 | Test.java:5420:21:5420:23 | out : MyAbstractMapDecorator [<map.value>] : String | Test.java:232:20:232:31 | map : MyAbstractMapDecorator [<map.value>] : String | provenance |  |
-| Test.java:5420:21:5420:23 | out : MyAbstractMapDecorator [<map.value>] : String | Test.java:5420:9:5420:24 | getMapValue(...) | provenance | MaD:9 |
+| Test.java:5420:21:5420:23 | out : MyAbstractMapDecorator [<map.value>] : String | Test.java:5420:9:5420:24 | getMapValue(...) | provenance | MaD:17 |
 | Test.java:5425:32:5425:89 | new MyAbstractMapDecorator<>(...) : MyAbstractMapDecorator [<map.key>] : String | Test.java:5426:10:5426:11 | in : MyAbstractMapDecorator [<map.key>] : String | provenance |  |
-| Test.java:5425:59:5425:88 | of(...) : Map [<map.key>] : String | Test.java:5425:32:5425:89 | new MyAbstractMapDecorator<>(...) : MyAbstractMapDecorator [<map.key>] : String | provenance | MaD:267 |
+| Test.java:5425:59:5425:88 | of(...) : Map [<map.key>] : String | Test.java:5425:32:5425:89 | new MyAbstractMapDecorator<>(...) : MyAbstractMapDecorator [<map.key>] : String | provenance | MaD:269 |
 | Test.java:5425:59:5425:88 | of(...) : Map [<map.key>] : String | Test.java:7234:33:7234:51 | map : Map [<map.key>] : String | provenance |  |
-| Test.java:5425:66:5425:81 | (...)... : String | Test.java:5425:59:5425:88 | of(...) : Map [<map.key>] : String | provenance | MaD:11 |
+| Test.java:5425:66:5425:81 | (...)... : String | Test.java:5425:59:5425:88 | of(...) : Map [<map.key>] : String | provenance | MaD:13 |
 | Test.java:5425:74:5425:81 | source(...) : Object | Test.java:5425:66:5425:81 | (...)... : String | provenance |  |
-| Test.java:5426:10:5426:11 | in : MyAbstractMapDecorator [<map.key>] : String | Test.java:5426:10:5426:25 | myDecorated(...) : Map [<map.key>] : String | provenance | MaD:269 |
+| Test.java:5426:10:5426:11 | in : MyAbstractMapDecorator [<map.key>] : String | Test.java:5426:10:5426:25 | myDecorated(...) : Map [<map.key>] : String | provenance | MaD:271 |
 | Test.java:5426:10:5426:11 | in : MyAbstractMapDecorator [<map.key>] : String | Test.java:7237:20:7237:30 | parameter this : MyAbstractMapDecorator [<map.key>] : String | provenance |  |
 | Test.java:5426:10:5426:25 | myDecorated(...) : Map [<map.key>] : String | Test.java:5427:19:5427:21 | out : Map [<map.key>] : String | provenance |  |
 | Test.java:5427:19:5427:21 | out : Map [<map.key>] : String | Test.java:228:18:228:29 | map : Map [<map.key>] : String | provenance |  |
-| Test.java:5427:19:5427:21 | out : Map [<map.key>] : String | Test.java:5427:9:5427:22 | getMapKey(...) | provenance | MaD:10 |
+| Test.java:5427:19:5427:21 | out : Map [<map.key>] : String | Test.java:5427:9:5427:22 | getMapKey(...) | provenance | MaD:18 |
 | Test.java:5432:32:5432:89 | new MyAbstractMapDecorator<>(...) : MyAbstractMapDecorator [<map.value>] : String | Test.java:5433:10:5433:11 | in : MyAbstractMapDecorator [<map.value>] : String | provenance |  |
-| Test.java:5432:59:5432:88 | of(...) : Map [<map.value>] : String | Test.java:5432:32:5432:89 | new MyAbstractMapDecorator<>(...) : MyAbstractMapDecorator [<map.value>] : String | provenance | MaD:268 |
+| Test.java:5432:59:5432:88 | of(...) : Map [<map.value>] : String | Test.java:5432:32:5432:89 | new MyAbstractMapDecorator<>(...) : MyAbstractMapDecorator [<map.value>] : String | provenance | MaD:270 |
 | Test.java:5432:59:5432:88 | of(...) : Map [<map.value>] : String | Test.java:7234:33:7234:51 | map : Map [<map.value>] : String | provenance |  |
-| Test.java:5432:72:5432:87 | (...)... : String | Test.java:5432:59:5432:88 | of(...) : Map [<map.value>] : String | provenance | MaD:12 |
+| Test.java:5432:72:5432:87 | (...)... : String | Test.java:5432:59:5432:88 | of(...) : Map [<map.value>] : String | provenance | MaD:14 |
 | Test.java:5432:80:5432:87 | source(...) : Object | Test.java:5432:72:5432:87 | (...)... : String | provenance |  |
-| Test.java:5433:10:5433:11 | in : MyAbstractMapDecorator [<map.value>] : String | Test.java:5433:10:5433:25 | myDecorated(...) : Map [<map.value>] : String | provenance | MaD:270 |
+| Test.java:5433:10:5433:11 | in : MyAbstractMapDecorator [<map.value>] : String | Test.java:5433:10:5433:25 | myDecorated(...) : Map [<map.value>] : String | provenance | MaD:272 |
 | Test.java:5433:10:5433:11 | in : MyAbstractMapDecorator [<map.value>] : String | Test.java:7237:20:7237:30 | parameter this : MyAbstractMapDecorator [<map.value>] : String | provenance |  |
 | Test.java:5433:10:5433:25 | myDecorated(...) : Map [<map.value>] : String | Test.java:5434:21:5434:23 | out : Map [<map.value>] : String | provenance |  |
 | Test.java:5434:21:5434:23 | out : Map [<map.value>] : String | Test.java:232:20:232:31 | map : Map [<map.value>] : String | provenance |  |
-| Test.java:5434:21:5434:23 | out : Map [<map.value>] : String | Test.java:5434:9:5434:24 | getMapValue(...) | provenance | MaD:9 |
+| Test.java:5434:21:5434:23 | out : Map [<map.value>] : String | Test.java:5434:9:5434:24 | getMapValue(...) | provenance | MaD:17 |
 | Test.java:5439:20:5439:64 | newListOrderedMapWithMapKey(...) : ListOrderedMap [<map.key>] : String | Test.java:5440:44:5440:45 | in : ListOrderedMap [<map.key>] : String | provenance |  |
 | Test.java:5439:48:5439:63 | (...)... : String | Test.java:277:59:277:63 | key : String | provenance |  |
-| Test.java:5439:48:5439:63 | (...)... : String | Test.java:5439:20:5439:64 | newListOrderedMapWithMapKey(...) : ListOrderedMap [<map.key>] : String | provenance | MaD:11 |
+| Test.java:5439:48:5439:63 | (...)... : String | Test.java:5439:20:5439:64 | newListOrderedMapWithMapKey(...) : ListOrderedMap [<map.key>] : String | provenance | MaD:13 |
 | Test.java:5439:56:5439:63 | source(...) : Object | Test.java:5439:48:5439:63 | (...)... : String | provenance |  |
 | Test.java:5440:10:5440:46 | new MyAbstractOrderedMapDecorator<>(...) : MyAbstractOrderedMapDecorator [<map.key>] : String | Test.java:5441:19:5441:21 | out : MyAbstractOrderedMapDecorator [<map.key>] : String | provenance |  |
-| Test.java:5440:44:5440:45 | in : ListOrderedMap [<map.key>] : String | Test.java:5440:10:5440:46 | new MyAbstractOrderedMapDecorator<>(...) : MyAbstractOrderedMapDecorator [<map.key>] : String | provenance | MaD:271 |
+| Test.java:5440:44:5440:45 | in : ListOrderedMap [<map.key>] : String | Test.java:5440:10:5440:46 | new MyAbstractOrderedMapDecorator<>(...) : MyAbstractOrderedMapDecorator [<map.key>] : String | provenance | MaD:273 |
 | Test.java:5440:44:5440:45 | in : ListOrderedMap [<map.key>] : String | Test.java:7092:40:7092:65 | map : ListOrderedMap [<map.key>] : String | provenance |  |
 | Test.java:5441:19:5441:21 | out : MyAbstractOrderedMapDecorator [<map.key>] : String | Test.java:228:18:228:29 | map : MyAbstractOrderedMapDecorator [<map.key>] : String | provenance |  |
-| Test.java:5441:19:5441:21 | out : MyAbstractOrderedMapDecorator [<map.key>] : String | Test.java:5441:9:5441:22 | getMapKey(...) | provenance | MaD:10 |
+| Test.java:5441:19:5441:21 | out : MyAbstractOrderedMapDecorator [<map.key>] : String | Test.java:5441:9:5441:22 | getMapKey(...) | provenance | MaD:18 |
 | Test.java:5446:20:5446:66 | newListOrderedMapWithMapValue(...) : ListOrderedMap [<map.value>] : String | Test.java:5447:44:5447:45 | in : ListOrderedMap [<map.value>] : String | provenance |  |
 | Test.java:5446:50:5446:65 | (...)... : String | Test.java:296:61:296:67 | value : String | provenance |  |
-| Test.java:5446:50:5446:65 | (...)... : String | Test.java:5446:20:5446:66 | newListOrderedMapWithMapValue(...) : ListOrderedMap [<map.value>] : String | provenance | MaD:12 |
+| Test.java:5446:50:5446:65 | (...)... : String | Test.java:5446:20:5446:66 | newListOrderedMapWithMapValue(...) : ListOrderedMap [<map.value>] : String | provenance | MaD:14 |
 | Test.java:5446:58:5446:65 | source(...) : Object | Test.java:5446:50:5446:65 | (...)... : String | provenance |  |
 | Test.java:5447:10:5447:46 | new MyAbstractOrderedMapDecorator<>(...) : MyAbstractOrderedMapDecorator [<map.value>] : String | Test.java:5448:21:5448:23 | out : MyAbstractOrderedMapDecorator [<map.value>] : String | provenance |  |
-| Test.java:5447:44:5447:45 | in : ListOrderedMap [<map.value>] : String | Test.java:5447:10:5447:46 | new MyAbstractOrderedMapDecorator<>(...) : MyAbstractOrderedMapDecorator [<map.value>] : String | provenance | MaD:272 |
+| Test.java:5447:44:5447:45 | in : ListOrderedMap [<map.value>] : String | Test.java:5447:10:5447:46 | new MyAbstractOrderedMapDecorator<>(...) : MyAbstractOrderedMapDecorator [<map.value>] : String | provenance | MaD:274 |
 | Test.java:5447:44:5447:45 | in : ListOrderedMap [<map.value>] : String | Test.java:7092:40:7092:65 | map : ListOrderedMap [<map.value>] : String | provenance |  |
 | Test.java:5448:21:5448:23 | out : MyAbstractOrderedMapDecorator [<map.value>] : String | Test.java:232:20:232:31 | map : MyAbstractOrderedMapDecorator [<map.value>] : String | provenance |  |
-| Test.java:5448:21:5448:23 | out : MyAbstractOrderedMapDecorator [<map.value>] : String | Test.java:5448:9:5448:24 | getMapValue(...) | provenance | MaD:9 |
+| Test.java:5448:21:5448:23 | out : MyAbstractOrderedMapDecorator [<map.value>] : String | Test.java:5448:9:5448:24 | getMapValue(...) | provenance | MaD:17 |
 | Test.java:5453:19:5453:56 | newTreeMapWithMapKey(...) : TreeMap [<map.key>] : String | Test.java:5454:43:5454:44 | in : TreeMap [<map.key>] : String | provenance |  |
 | Test.java:5453:40:5453:55 | (...)... : String | Test.java:285:47:285:51 | key : String | provenance |  |
-| Test.java:5453:40:5453:55 | (...)... : String | Test.java:5453:19:5453:56 | newTreeMapWithMapKey(...) : TreeMap [<map.key>] : String | provenance | MaD:14 |
+| Test.java:5453:40:5453:55 | (...)... : String | Test.java:5453:19:5453:56 | newTreeMapWithMapKey(...) : TreeMap [<map.key>] : String | provenance | MaD:19 |
 | Test.java:5453:48:5453:55 | source(...) : Object | Test.java:5453:40:5453:55 | (...)... : String | provenance |  |
 | Test.java:5454:10:5454:45 | new MyAbstractSortedMapDecorator<>(...) : MyAbstractSortedMapDecorator [<map.key>] : String | Test.java:5455:19:5455:21 | out : MyAbstractSortedMapDecorator [<map.key>] : String | provenance |  |
-| Test.java:5454:43:5454:44 | in : TreeMap [<map.key>] : String | Test.java:5454:10:5454:45 | new MyAbstractSortedMapDecorator<>(...) : MyAbstractSortedMapDecorator [<map.key>] : String | provenance | MaD:273 |
+| Test.java:5454:43:5454:44 | in : TreeMap [<map.key>] : String | Test.java:5454:10:5454:45 | new MyAbstractSortedMapDecorator<>(...) : MyAbstractSortedMapDecorator [<map.key>] : String | provenance | MaD:275 |
 | Test.java:5454:43:5454:44 | in : TreeMap [<map.key>] : String | Test.java:7098:39:7098:63 | map : TreeMap [<map.key>] : String | provenance |  |
 | Test.java:5455:19:5455:21 | out : MyAbstractSortedMapDecorator [<map.key>] : String | Test.java:228:18:228:29 | map : MyAbstractSortedMapDecorator [<map.key>] : String | provenance |  |
-| Test.java:5455:19:5455:21 | out : MyAbstractSortedMapDecorator [<map.key>] : String | Test.java:5455:9:5455:22 | getMapKey(...) | provenance | MaD:10 |
+| Test.java:5455:19:5455:21 | out : MyAbstractSortedMapDecorator [<map.key>] : String | Test.java:5455:9:5455:22 | getMapKey(...) | provenance | MaD:18 |
 | Test.java:5460:19:5460:58 | newTreeMapWithMapValue(...) : TreeMap [<map.value>] : String | Test.java:5461:43:5461:44 | in : TreeMap [<map.value>] : String | provenance |  |
 | Test.java:5460:42:5460:57 | (...)... : String | Test.java:304:49:304:55 | value : String | provenance |  |
-| Test.java:5460:42:5460:57 | (...)... : String | Test.java:5460:19:5460:58 | newTreeMapWithMapValue(...) : TreeMap [<map.value>] : String | provenance | MaD:15 |
+| Test.java:5460:42:5460:57 | (...)... : String | Test.java:5460:19:5460:58 | newTreeMapWithMapValue(...) : TreeMap [<map.value>] : String | provenance | MaD:20 |
 | Test.java:5460:50:5460:57 | source(...) : Object | Test.java:5460:42:5460:57 | (...)... : String | provenance |  |
 | Test.java:5461:10:5461:45 | new MyAbstractSortedMapDecorator<>(...) : MyAbstractSortedMapDecorator [<map.value>] : String | Test.java:5462:21:5462:23 | out : MyAbstractSortedMapDecorator [<map.value>] : String | provenance |  |
-| Test.java:5461:43:5461:44 | in : TreeMap [<map.value>] : String | Test.java:5461:10:5461:45 | new MyAbstractSortedMapDecorator<>(...) : MyAbstractSortedMapDecorator [<map.value>] : String | provenance | MaD:274 |
+| Test.java:5461:43:5461:44 | in : TreeMap [<map.value>] : String | Test.java:5461:10:5461:45 | new MyAbstractSortedMapDecorator<>(...) : MyAbstractSortedMapDecorator [<map.value>] : String | provenance | MaD:276 |
 | Test.java:5461:43:5461:44 | in : TreeMap [<map.value>] : String | Test.java:7098:39:7098:63 | map : TreeMap [<map.value>] : String | provenance |  |
 | Test.java:5462:21:5462:23 | out : MyAbstractSortedMapDecorator [<map.value>] : String | Test.java:232:20:232:31 | map : MyAbstractSortedMapDecorator [<map.value>] : String | provenance |  |
-| Test.java:5462:21:5462:23 | out : MyAbstractSortedMapDecorator [<map.value>] : String | Test.java:5462:9:5462:24 | getMapValue(...) | provenance | MaD:9 |
+| Test.java:5462:21:5462:23 | out : MyAbstractSortedMapDecorator [<map.value>] : String | Test.java:5462:9:5462:24 | getMapValue(...) | provenance | MaD:17 |
 | Test.java:5467:13:5467:42 | of(...) : Map [<map.key>] : String | Test.java:5468:33:5468:34 | in : Map [<map.key>] : String | provenance |  |
-| Test.java:5467:20:5467:35 | (...)... : String | Test.java:5467:13:5467:42 | of(...) : Map [<map.key>] : String | provenance | MaD:11 |
+| Test.java:5467:20:5467:35 | (...)... : String | Test.java:5467:13:5467:42 | of(...) : Map [<map.key>] : String | provenance | MaD:13 |
 | Test.java:5467:28:5467:35 | source(...) : Object | Test.java:5467:20:5467:35 | (...)... : String | provenance |  |
 | Test.java:5468:10:5468:35 | new CaseInsensitiveMap<>(...) : CaseInsensitiveMap [<map.key>] : String | Test.java:5469:19:5469:21 | out : CaseInsensitiveMap [<map.key>] : String | provenance |  |
-| Test.java:5468:33:5468:34 | in : Map [<map.key>] : String | Test.java:5468:10:5468:35 | new CaseInsensitiveMap<>(...) : CaseInsensitiveMap [<map.key>] : String | provenance | MaD:275 |
+| Test.java:5468:33:5468:34 | in : Map [<map.key>] : String | Test.java:5468:10:5468:35 | new CaseInsensitiveMap<>(...) : CaseInsensitiveMap [<map.key>] : String | provenance | MaD:277 |
 | Test.java:5469:19:5469:21 | out : CaseInsensitiveMap [<map.key>] : String | Test.java:228:18:228:29 | map : CaseInsensitiveMap [<map.key>] : String | provenance |  |
-| Test.java:5469:19:5469:21 | out : CaseInsensitiveMap [<map.key>] : String | Test.java:5469:9:5469:22 | getMapKey(...) | provenance | MaD:10 |
+| Test.java:5469:19:5469:21 | out : CaseInsensitiveMap [<map.key>] : String | Test.java:5469:9:5469:22 | getMapKey(...) | provenance | MaD:18 |
 | Test.java:5474:13:5474:42 | of(...) : Map [<map.value>] : String | Test.java:5475:33:5475:34 | in : Map [<map.value>] : String | provenance |  |
-| Test.java:5474:26:5474:41 | (...)... : String | Test.java:5474:13:5474:42 | of(...) : Map [<map.value>] : String | provenance | MaD:12 |
+| Test.java:5474:26:5474:41 | (...)... : String | Test.java:5474:13:5474:42 | of(...) : Map [<map.value>] : String | provenance | MaD:14 |
 | Test.java:5474:34:5474:41 | source(...) : Object | Test.java:5474:26:5474:41 | (...)... : String | provenance |  |
 | Test.java:5475:10:5475:35 | new CaseInsensitiveMap<>(...) : CaseInsensitiveMap [<map.value>] : String | Test.java:5476:21:5476:23 | out : CaseInsensitiveMap [<map.value>] : String | provenance |  |
-| Test.java:5475:33:5475:34 | in : Map [<map.value>] : String | Test.java:5475:10:5475:35 | new CaseInsensitiveMap<>(...) : CaseInsensitiveMap [<map.value>] : String | provenance | MaD:276 |
+| Test.java:5475:33:5475:34 | in : Map [<map.value>] : String | Test.java:5475:10:5475:35 | new CaseInsensitiveMap<>(...) : CaseInsensitiveMap [<map.value>] : String | provenance | MaD:278 |
 | Test.java:5476:21:5476:23 | out : CaseInsensitiveMap [<map.value>] : String | Test.java:232:20:232:31 | map : CaseInsensitiveMap [<map.value>] : String | provenance |  |
-| Test.java:5476:21:5476:23 | out : CaseInsensitiveMap [<map.value>] : String | Test.java:5476:9:5476:24 | getMapValue(...) | provenance | MaD:9 |
+| Test.java:5476:21:5476:23 | out : CaseInsensitiveMap [<map.value>] : String | Test.java:5476:9:5476:24 | getMapValue(...) | provenance | MaD:17 |
 | Test.java:5481:13:5481:42 | of(...) : Map [<map.key>] : String | Test.java:5482:27:5482:28 | in : Map [<map.key>] : String | provenance |  |
-| Test.java:5481:20:5481:35 | (...)... : String | Test.java:5481:13:5481:42 | of(...) : Map [<map.key>] : String | provenance | MaD:11 |
+| Test.java:5481:20:5481:35 | (...)... : String | Test.java:5481:13:5481:42 | of(...) : Map [<map.key>] : String | provenance | MaD:13 |
 | Test.java:5481:28:5481:35 | source(...) : Object | Test.java:5481:20:5481:35 | (...)... : String | provenance |  |
 | Test.java:5482:10:5482:40 | new CompositeMap<>(...) : CompositeMap [<map.key>] : String | Test.java:5483:19:5483:21 | out : CompositeMap [<map.key>] : String | provenance |  |
-| Test.java:5482:27:5482:28 | in : Map [<map.key>] : String | Test.java:5482:10:5482:40 | new CompositeMap<>(...) : CompositeMap [<map.key>] : String | provenance | MaD:277 |
+| Test.java:5482:27:5482:28 | in : Map [<map.key>] : String | Test.java:5482:10:5482:40 | new CompositeMap<>(...) : CompositeMap [<map.key>] : String | provenance | MaD:279 |
 | Test.java:5483:19:5483:21 | out : CompositeMap [<map.key>] : String | Test.java:228:18:228:29 | map : CompositeMap [<map.key>] : String | provenance |  |
-| Test.java:5483:19:5483:21 | out : CompositeMap [<map.key>] : String | Test.java:5483:9:5483:22 | getMapKey(...) | provenance | MaD:10 |
+| Test.java:5483:19:5483:21 | out : CompositeMap [<map.key>] : String | Test.java:5483:9:5483:22 | getMapKey(...) | provenance | MaD:18 |
 | Test.java:5488:13:5488:42 | of(...) : Map [<map.key>] : String | Test.java:5489:38:5489:39 | in : Map [<map.key>] : String | provenance |  |
-| Test.java:5488:20:5488:35 | (...)... : String | Test.java:5488:13:5488:42 | of(...) : Map [<map.key>] : String | provenance | MaD:11 |
+| Test.java:5488:20:5488:35 | (...)... : String | Test.java:5488:13:5488:42 | of(...) : Map [<map.key>] : String | provenance | MaD:13 |
 | Test.java:5488:28:5488:35 | source(...) : Object | Test.java:5488:20:5488:35 | (...)... : String | provenance |  |
 | Test.java:5489:10:5489:40 | new CompositeMap<>(...) : CompositeMap [<map.key>] : String | Test.java:5490:19:5490:21 | out : CompositeMap [<map.key>] : String | provenance |  |
-| Test.java:5489:38:5489:39 | in : Map [<map.key>] : String | Test.java:5489:10:5489:40 | new CompositeMap<>(...) : CompositeMap [<map.key>] : String | provenance | MaD:279 |
+| Test.java:5489:38:5489:39 | in : Map [<map.key>] : String | Test.java:5489:10:5489:40 | new CompositeMap<>(...) : CompositeMap [<map.key>] : String | provenance | MaD:281 |
 | Test.java:5490:19:5490:21 | out : CompositeMap [<map.key>] : String | Test.java:228:18:228:29 | map : CompositeMap [<map.key>] : String | provenance |  |
-| Test.java:5490:19:5490:21 | out : CompositeMap [<map.key>] : String | Test.java:5490:9:5490:22 | getMapKey(...) | provenance | MaD:10 |
+| Test.java:5490:19:5490:21 | out : CompositeMap [<map.key>] : String | Test.java:5490:9:5490:22 | getMapKey(...) | provenance | MaD:18 |
 | Test.java:5495:13:5495:42 | of(...) : Map [<map.value>] : String | Test.java:5496:27:5496:28 | in : Map [<map.value>] : String | provenance |  |
-| Test.java:5495:26:5495:41 | (...)... : String | Test.java:5495:13:5495:42 | of(...) : Map [<map.value>] : String | provenance | MaD:12 |
+| Test.java:5495:26:5495:41 | (...)... : String | Test.java:5495:13:5495:42 | of(...) : Map [<map.value>] : String | provenance | MaD:14 |
 | Test.java:5495:34:5495:41 | source(...) : Object | Test.java:5495:26:5495:41 | (...)... : String | provenance |  |
 | Test.java:5496:10:5496:40 | new CompositeMap<>(...) : CompositeMap [<map.value>] : String | Test.java:5497:21:5497:23 | out : CompositeMap [<map.value>] : String | provenance |  |
-| Test.java:5496:27:5496:28 | in : Map [<map.value>] : String | Test.java:5496:10:5496:40 | new CompositeMap<>(...) : CompositeMap [<map.value>] : String | provenance | MaD:278 |
+| Test.java:5496:27:5496:28 | in : Map [<map.value>] : String | Test.java:5496:10:5496:40 | new CompositeMap<>(...) : CompositeMap [<map.value>] : String | provenance | MaD:280 |
 | Test.java:5497:21:5497:23 | out : CompositeMap [<map.value>] : String | Test.java:232:20:232:31 | map : CompositeMap [<map.value>] : String | provenance |  |
-| Test.java:5497:21:5497:23 | out : CompositeMap [<map.value>] : String | Test.java:5497:9:5497:24 | getMapValue(...) | provenance | MaD:9 |
+| Test.java:5497:21:5497:23 | out : CompositeMap [<map.value>] : String | Test.java:5497:9:5497:24 | getMapValue(...) | provenance | MaD:17 |
 | Test.java:5502:13:5502:42 | of(...) : Map [<map.value>] : String | Test.java:5503:38:5503:39 | in : Map [<map.value>] : String | provenance |  |
-| Test.java:5502:26:5502:41 | (...)... : String | Test.java:5502:13:5502:42 | of(...) : Map [<map.value>] : String | provenance | MaD:12 |
+| Test.java:5502:26:5502:41 | (...)... : String | Test.java:5502:13:5502:42 | of(...) : Map [<map.value>] : String | provenance | MaD:14 |
 | Test.java:5502:34:5502:41 | source(...) : Object | Test.java:5502:26:5502:41 | (...)... : String | provenance |  |
 | Test.java:5503:10:5503:40 | new CompositeMap<>(...) : CompositeMap [<map.value>] : String | Test.java:5504:21:5504:23 | out : CompositeMap [<map.value>] : String | provenance |  |
-| Test.java:5503:38:5503:39 | in : Map [<map.value>] : String | Test.java:5503:10:5503:40 | new CompositeMap<>(...) : CompositeMap [<map.value>] : String | provenance | MaD:280 |
+| Test.java:5503:38:5503:39 | in : Map [<map.value>] : String | Test.java:5503:10:5503:40 | new CompositeMap<>(...) : CompositeMap [<map.value>] : String | provenance | MaD:282 |
 | Test.java:5504:21:5504:23 | out : CompositeMap [<map.value>] : String | Test.java:232:20:232:31 | map : CompositeMap [<map.value>] : String | provenance |  |
-| Test.java:5504:21:5504:23 | out : CompositeMap [<map.value>] : String | Test.java:5504:9:5504:24 | getMapValue(...) | provenance | MaD:9 |
+| Test.java:5504:21:5504:23 | out : CompositeMap [<map.value>] : String | Test.java:5504:9:5504:24 | getMapValue(...) | provenance | MaD:17 |
 | Test.java:5509:13:5509:42 | of(...) : Map [<map.key>] : String | Test.java:5510:27:5510:28 | in : Map [<map.key>] : String | provenance |  |
-| Test.java:5509:20:5509:35 | (...)... : String | Test.java:5509:13:5509:42 | of(...) : Map [<map.key>] : String | provenance | MaD:11 |
+| Test.java:5509:20:5509:35 | (...)... : String | Test.java:5509:13:5509:42 | of(...) : Map [<map.key>] : String | provenance | MaD:13 |
 | Test.java:5509:28:5509:35 | source(...) : Object | Test.java:5509:20:5509:35 | (...)... : String | provenance |  |
 | Test.java:5510:10:5510:41 | new CompositeMap<>(...) : CompositeMap [<map.key>] : String | Test.java:5511:19:5511:21 | out : CompositeMap [<map.key>] : String | provenance |  |
-| Test.java:5510:27:5510:28 | in : Map [<map.key>] : String | Test.java:5510:10:5510:41 | new CompositeMap<>(...) : CompositeMap [<map.key>] : String | provenance | MaD:281 |
+| Test.java:5510:27:5510:28 | in : Map [<map.key>] : String | Test.java:5510:10:5510:41 | new CompositeMap<>(...) : CompositeMap [<map.key>] : String | provenance | MaD:283 |
 | Test.java:5511:19:5511:21 | out : CompositeMap [<map.key>] : String | Test.java:228:18:228:29 | map : CompositeMap [<map.key>] : String | provenance |  |
-| Test.java:5511:19:5511:21 | out : CompositeMap [<map.key>] : String | Test.java:5511:9:5511:22 | getMapKey(...) | provenance | MaD:10 |
+| Test.java:5511:19:5511:21 | out : CompositeMap [<map.key>] : String | Test.java:5511:9:5511:22 | getMapKey(...) | provenance | MaD:18 |
 | Test.java:5516:13:5516:42 | of(...) : Map [<map.key>] : String | Test.java:5517:33:5517:34 | in : Map [<map.key>] : String | provenance |  |
-| Test.java:5516:20:5516:35 | (...)... : String | Test.java:5516:13:5516:42 | of(...) : Map [<map.key>] : String | provenance | MaD:11 |
+| Test.java:5516:20:5516:35 | (...)... : String | Test.java:5516:13:5516:42 | of(...) : Map [<map.key>] : String | provenance | MaD:13 |
 | Test.java:5516:28:5516:35 | source(...) : Object | Test.java:5516:20:5516:35 | (...)... : String | provenance |  |
 | Test.java:5517:10:5517:41 | new CompositeMap<>(...) : CompositeMap [<map.key>] : String | Test.java:5518:19:5518:21 | out : CompositeMap [<map.key>] : String | provenance |  |
-| Test.java:5517:33:5517:34 | in : Map [<map.key>] : String | Test.java:5517:10:5517:41 | new CompositeMap<>(...) : CompositeMap [<map.key>] : String | provenance | MaD:283 |
+| Test.java:5517:33:5517:34 | in : Map [<map.key>] : String | Test.java:5517:10:5517:41 | new CompositeMap<>(...) : CompositeMap [<map.key>] : String | provenance | MaD:285 |
 | Test.java:5518:19:5518:21 | out : CompositeMap [<map.key>] : String | Test.java:228:18:228:29 | map : CompositeMap [<map.key>] : String | provenance |  |
-| Test.java:5518:19:5518:21 | out : CompositeMap [<map.key>] : String | Test.java:5518:9:5518:22 | getMapKey(...) | provenance | MaD:10 |
+| Test.java:5518:19:5518:21 | out : CompositeMap [<map.key>] : String | Test.java:5518:9:5518:22 | getMapKey(...) | provenance | MaD:18 |
 | Test.java:5523:13:5523:42 | of(...) : Map [<map.value>] : String | Test.java:5524:27:5524:28 | in : Map [<map.value>] : String | provenance |  |
-| Test.java:5523:26:5523:41 | (...)... : String | Test.java:5523:13:5523:42 | of(...) : Map [<map.value>] : String | provenance | MaD:12 |
+| Test.java:5523:26:5523:41 | (...)... : String | Test.java:5523:13:5523:42 | of(...) : Map [<map.value>] : String | provenance | MaD:14 |
 | Test.java:5523:34:5523:41 | source(...) : Object | Test.java:5523:26:5523:41 | (...)... : String | provenance |  |
 | Test.java:5524:10:5524:41 | new CompositeMap<>(...) : CompositeMap [<map.value>] : String | Test.java:5525:21:5525:23 | out : CompositeMap [<map.value>] : String | provenance |  |
-| Test.java:5524:27:5524:28 | in : Map [<map.value>] : String | Test.java:5524:10:5524:41 | new CompositeMap<>(...) : CompositeMap [<map.value>] : String | provenance | MaD:282 |
+| Test.java:5524:27:5524:28 | in : Map [<map.value>] : String | Test.java:5524:10:5524:41 | new CompositeMap<>(...) : CompositeMap [<map.value>] : String | provenance | MaD:284 |
 | Test.java:5525:21:5525:23 | out : CompositeMap [<map.value>] : String | Test.java:232:20:232:31 | map : CompositeMap [<map.value>] : String | provenance |  |
-| Test.java:5525:21:5525:23 | out : CompositeMap [<map.value>] : String | Test.java:5525:9:5525:24 | getMapValue(...) | provenance | MaD:9 |
+| Test.java:5525:21:5525:23 | out : CompositeMap [<map.value>] : String | Test.java:5525:9:5525:24 | getMapValue(...) | provenance | MaD:17 |
 | Test.java:5530:13:5530:42 | of(...) : Map [<map.value>] : String | Test.java:5531:33:5531:34 | in : Map [<map.value>] : String | provenance |  |
-| Test.java:5530:26:5530:41 | (...)... : String | Test.java:5530:13:5530:42 | of(...) : Map [<map.value>] : String | provenance | MaD:12 |
+| Test.java:5530:26:5530:41 | (...)... : String | Test.java:5530:13:5530:42 | of(...) : Map [<map.value>] : String | provenance | MaD:14 |
 | Test.java:5530:34:5530:41 | source(...) : Object | Test.java:5530:26:5530:41 | (...)... : String | provenance |  |
 | Test.java:5531:10:5531:41 | new CompositeMap<>(...) : CompositeMap [<map.value>] : String | Test.java:5532:21:5532:23 | out : CompositeMap [<map.value>] : String | provenance |  |
-| Test.java:5531:33:5531:34 | in : Map [<map.value>] : String | Test.java:5531:10:5531:41 | new CompositeMap<>(...) : CompositeMap [<map.value>] : String | provenance | MaD:284 |
+| Test.java:5531:33:5531:34 | in : Map [<map.value>] : String | Test.java:5531:10:5531:41 | new CompositeMap<>(...) : CompositeMap [<map.value>] : String | provenance | MaD:286 |
 | Test.java:5532:21:5532:23 | out : CompositeMap [<map.value>] : String | Test.java:232:20:232:31 | map : CompositeMap [<map.value>] : String | provenance |  |
-| Test.java:5532:21:5532:23 | out : CompositeMap [<map.value>] : String | Test.java:5532:9:5532:24 | getMapValue(...) | provenance | MaD:9 |
+| Test.java:5532:21:5532:23 | out : CompositeMap [<map.value>] : String | Test.java:5532:9:5532:24 | getMapValue(...) | provenance | MaD:17 |
 | Test.java:5537:15:5537:55 | {...} : Map[] [[], <map.key>] : String | Test.java:5538:27:5538:28 | in : Map[] [[], <map.key>] : String | provenance |  |
 | Test.java:5537:25:5537:54 | of(...) : Map [<map.key>] : String | Test.java:5537:15:5537:55 | {...} : Map[] [[], <map.key>] : String | provenance |  |
-| Test.java:5537:32:5537:47 | (...)... : String | Test.java:5537:25:5537:54 | of(...) : Map [<map.key>] : String | provenance | MaD:11 |
+| Test.java:5537:32:5537:47 | (...)... : String | Test.java:5537:25:5537:54 | of(...) : Map [<map.key>] : String | provenance | MaD:13 |
 | Test.java:5537:40:5537:47 | source(...) : Object | Test.java:5537:32:5537:47 | (...)... : String | provenance |  |
 | Test.java:5538:10:5538:29 | new CompositeMap<>(...) : CompositeMap [<map.key>] : String | Test.java:5539:19:5539:21 | out : CompositeMap [<map.key>] : String | provenance |  |
-| Test.java:5538:27:5538:28 | in : Map[] [[], <map.key>] : String | Test.java:5538:10:5538:29 | new CompositeMap<>(...) : CompositeMap [<map.key>] : String | provenance | MaD:285 |
+| Test.java:5538:27:5538:28 | in : Map[] [[], <map.key>] : String | Test.java:5538:10:5538:29 | new CompositeMap<>(...) : CompositeMap [<map.key>] : String | provenance | MaD:287 |
 | Test.java:5539:19:5539:21 | out : CompositeMap [<map.key>] : String | Test.java:228:18:228:29 | map : CompositeMap [<map.key>] : String | provenance |  |
-| Test.java:5539:19:5539:21 | out : CompositeMap [<map.key>] : String | Test.java:5539:9:5539:22 | getMapKey(...) | provenance | MaD:10 |
+| Test.java:5539:19:5539:21 | out : CompositeMap [<map.key>] : String | Test.java:5539:9:5539:22 | getMapKey(...) | provenance | MaD:18 |
 | Test.java:5544:15:5544:55 | {...} : Map[] [[], <map.value>] : String | Test.java:5545:27:5545:28 | in : Map[] [[], <map.value>] : String | provenance |  |
 | Test.java:5544:25:5544:54 | of(...) : Map [<map.value>] : String | Test.java:5544:15:5544:55 | {...} : Map[] [[], <map.value>] : String | provenance |  |
-| Test.java:5544:38:5544:53 | (...)... : String | Test.java:5544:25:5544:54 | of(...) : Map [<map.value>] : String | provenance | MaD:12 |
+| Test.java:5544:38:5544:53 | (...)... : String | Test.java:5544:25:5544:54 | of(...) : Map [<map.value>] : String | provenance | MaD:14 |
 | Test.java:5544:46:5544:53 | source(...) : Object | Test.java:5544:38:5544:53 | (...)... : String | provenance |  |
 | Test.java:5545:10:5545:29 | new CompositeMap<>(...) : CompositeMap [<map.value>] : String | Test.java:5546:21:5546:23 | out : CompositeMap [<map.value>] : String | provenance |  |
-| Test.java:5545:27:5545:28 | in : Map[] [[], <map.value>] : String | Test.java:5545:10:5545:29 | new CompositeMap<>(...) : CompositeMap [<map.value>] : String | provenance | MaD:286 |
+| Test.java:5545:27:5545:28 | in : Map[] [[], <map.value>] : String | Test.java:5545:10:5545:29 | new CompositeMap<>(...) : CompositeMap [<map.value>] : String | provenance | MaD:288 |
 | Test.java:5546:21:5546:23 | out : CompositeMap [<map.value>] : String | Test.java:232:20:232:31 | map : CompositeMap [<map.value>] : String | provenance |  |
-| Test.java:5546:21:5546:23 | out : CompositeMap [<map.value>] : String | Test.java:5546:9:5546:24 | getMapValue(...) | provenance | MaD:9 |
+| Test.java:5546:21:5546:23 | out : CompositeMap [<map.value>] : String | Test.java:5546:9:5546:24 | getMapValue(...) | provenance | MaD:17 |
 | Test.java:5551:15:5551:55 | {...} : Map[] [[], <map.key>] : String | Test.java:5552:27:5552:28 | in : Map[] [[], <map.key>] : String | provenance |  |
 | Test.java:5551:25:5551:54 | of(...) : Map [<map.key>] : String | Test.java:5551:15:5551:55 | {...} : Map[] [[], <map.key>] : String | provenance |  |
-| Test.java:5551:32:5551:47 | (...)... : String | Test.java:5551:25:5551:54 | of(...) : Map [<map.key>] : String | provenance | MaD:11 |
+| Test.java:5551:32:5551:47 | (...)... : String | Test.java:5551:25:5551:54 | of(...) : Map [<map.key>] : String | provenance | MaD:13 |
 | Test.java:5551:40:5551:47 | source(...) : Object | Test.java:5551:32:5551:47 | (...)... : String | provenance |  |
 | Test.java:5552:10:5552:60 | new CompositeMap<>(...) : CompositeMap [<map.key>] : String | Test.java:5553:19:5553:21 | out : CompositeMap [<map.key>] : String | provenance |  |
-| Test.java:5552:27:5552:28 | in : Map[] [[], <map.key>] : String | Test.java:5552:10:5552:60 | new CompositeMap<>(...) : CompositeMap [<map.key>] : String | provenance | MaD:287 |
+| Test.java:5552:27:5552:28 | in : Map[] [[], <map.key>] : String | Test.java:5552:10:5552:60 | new CompositeMap<>(...) : CompositeMap [<map.key>] : String | provenance | MaD:289 |
 | Test.java:5553:19:5553:21 | out : CompositeMap [<map.key>] : String | Test.java:228:18:228:29 | map : CompositeMap [<map.key>] : String | provenance |  |
-| Test.java:5553:19:5553:21 | out : CompositeMap [<map.key>] : String | Test.java:5553:9:5553:22 | getMapKey(...) | provenance | MaD:10 |
+| Test.java:5553:19:5553:21 | out : CompositeMap [<map.key>] : String | Test.java:5553:9:5553:22 | getMapKey(...) | provenance | MaD:18 |
 | Test.java:5558:15:5558:55 | {...} : Map[] [[], <map.value>] : String | Test.java:5559:27:5559:28 | in : Map[] [[], <map.value>] : String | provenance |  |
 | Test.java:5558:25:5558:54 | of(...) : Map [<map.value>] : String | Test.java:5558:15:5558:55 | {...} : Map[] [[], <map.value>] : String | provenance |  |
-| Test.java:5558:38:5558:53 | (...)... : String | Test.java:5558:25:5558:54 | of(...) : Map [<map.value>] : String | provenance | MaD:12 |
+| Test.java:5558:38:5558:53 | (...)... : String | Test.java:5558:25:5558:54 | of(...) : Map [<map.value>] : String | provenance | MaD:14 |
 | Test.java:5558:46:5558:53 | source(...) : Object | Test.java:5558:38:5558:53 | (...)... : String | provenance |  |
 | Test.java:5559:10:5559:60 | new CompositeMap<>(...) : CompositeMap [<map.value>] : String | Test.java:5560:21:5560:23 | out : CompositeMap [<map.value>] : String | provenance |  |
-| Test.java:5559:27:5559:28 | in : Map[] [[], <map.value>] : String | Test.java:5559:10:5559:60 | new CompositeMap<>(...) : CompositeMap [<map.value>] : String | provenance | MaD:288 |
+| Test.java:5559:27:5559:28 | in : Map[] [[], <map.value>] : String | Test.java:5559:10:5559:60 | new CompositeMap<>(...) : CompositeMap [<map.value>] : String | provenance | MaD:290 |
 | Test.java:5560:21:5560:23 | out : CompositeMap [<map.value>] : String | Test.java:232:20:232:31 | map : CompositeMap [<map.value>] : String | provenance |  |
-| Test.java:5560:21:5560:23 | out : CompositeMap [<map.value>] : String | Test.java:5560:9:5560:24 | getMapValue(...) | provenance | MaD:9 |
+| Test.java:5560:21:5560:23 | out : CompositeMap [<map.value>] : String | Test.java:5560:9:5560:24 | getMapValue(...) | provenance | MaD:17 |
 | Test.java:5565:13:5565:42 | of(...) : Map [<map.key>] : String | Test.java:5566:22:5566:23 | in : Map [<map.key>] : String | provenance |  |
-| Test.java:5565:20:5565:35 | (...)... : String | Test.java:5565:13:5565:42 | of(...) : Map [<map.key>] : String | provenance | MaD:11 |
+| Test.java:5565:20:5565:35 | (...)... : String | Test.java:5565:13:5565:42 | of(...) : Map [<map.key>] : String | provenance | MaD:13 |
 | Test.java:5565:28:5565:35 | source(...) : Object | Test.java:5565:20:5565:35 | (...)... : String | provenance |  |
 | Test.java:5566:4:5566:6 | out [post update] : CompositeMap [<map.key>] : String | Test.java:5567:19:5567:21 | out : CompositeMap [<map.key>] : String | provenance |  |
-| Test.java:5566:22:5566:23 | in : Map [<map.key>] : String | Test.java:5566:4:5566:6 | out [post update] : CompositeMap [<map.key>] : String | provenance | MaD:289 |
+| Test.java:5566:22:5566:23 | in : Map [<map.key>] : String | Test.java:5566:4:5566:6 | out [post update] : CompositeMap [<map.key>] : String | provenance | MaD:291 |
 | Test.java:5567:19:5567:21 | out : CompositeMap [<map.key>] : String | Test.java:228:18:228:29 | map : CompositeMap [<map.key>] : String | provenance |  |
-| Test.java:5567:19:5567:21 | out : CompositeMap [<map.key>] : String | Test.java:5567:9:5567:22 | getMapKey(...) | provenance | MaD:10 |
+| Test.java:5567:19:5567:21 | out : CompositeMap [<map.key>] : String | Test.java:5567:9:5567:22 | getMapKey(...) | provenance | MaD:18 |
 | Test.java:5572:13:5572:42 | of(...) : Map [<map.value>] : String | Test.java:5573:22:5573:23 | in : Map [<map.value>] : String | provenance |  |
-| Test.java:5572:26:5572:41 | (...)... : String | Test.java:5572:13:5572:42 | of(...) : Map [<map.value>] : String | provenance | MaD:12 |
+| Test.java:5572:26:5572:41 | (...)... : String | Test.java:5572:13:5572:42 | of(...) : Map [<map.value>] : String | provenance | MaD:14 |
 | Test.java:5572:34:5572:41 | source(...) : Object | Test.java:5572:26:5572:41 | (...)... : String | provenance |  |
 | Test.java:5573:4:5573:6 | out [post update] : CompositeMap [<map.value>] : String | Test.java:5574:21:5574:23 | out : CompositeMap [<map.value>] : String | provenance |  |
-| Test.java:5573:22:5573:23 | in : Map [<map.value>] : String | Test.java:5573:4:5573:6 | out [post update] : CompositeMap [<map.value>] : String | provenance | MaD:290 |
+| Test.java:5573:22:5573:23 | in : Map [<map.value>] : String | Test.java:5573:4:5573:6 | out [post update] : CompositeMap [<map.value>] : String | provenance | MaD:292 |
 | Test.java:5574:21:5574:23 | out : CompositeMap [<map.value>] : String | Test.java:232:20:232:31 | map : CompositeMap [<map.value>] : String | provenance |  |
-| Test.java:5574:21:5574:23 | out : CompositeMap [<map.value>] : String | Test.java:5574:9:5574:24 | getMapValue(...) | provenance | MaD:9 |
+| Test.java:5574:21:5574:23 | out : CompositeMap [<map.value>] : String | Test.java:5574:9:5574:24 | getMapValue(...) | provenance | MaD:17 |
 | Test.java:5579:13:5579:25 | (...)... : Map | Test.java:5581:36:5581:37 | in : Map | provenance |  |
 | Test.java:5579:18:5579:25 | source(...) : Object | Test.java:5579:13:5579:25 | (...)... : Map | provenance |  |
 | Test.java:5581:10:5581:38 | removeComposited(...) : Map | Test.java:5582:9:5582:11 | out | provenance |  |
 | Test.java:5581:36:5581:37 | in : Map | Test.java:5581:10:5581:38 | removeComposited(...) : Map | provenance | MaD:293 |
 | Test.java:5587:22:5587:75 | new CompositeMap<>(...) : CompositeMap [<map.key>] : String | Test.java:5588:10:5588:11 | in : CompositeMap [<map.key>] : String | provenance |  |
-| Test.java:5587:39:5587:68 | of(...) : Map [<map.key>] : String | Test.java:5587:22:5587:75 | new CompositeMap<>(...) : CompositeMap [<map.key>] : String | provenance | MaD:277 |
-| Test.java:5587:46:5587:61 | (...)... : String | Test.java:5587:39:5587:68 | of(...) : Map [<map.key>] : String | provenance | MaD:11 |
+| Test.java:5587:39:5587:68 | of(...) : Map [<map.key>] : String | Test.java:5587:22:5587:75 | new CompositeMap<>(...) : CompositeMap [<map.key>] : String | provenance | MaD:279 |
+| Test.java:5587:46:5587:61 | (...)... : String | Test.java:5587:39:5587:68 | of(...) : Map [<map.key>] : String | provenance | MaD:13 |
 | Test.java:5587:54:5587:61 | source(...) : Object | Test.java:5587:46:5587:61 | (...)... : String | provenance |  |
-| Test.java:5588:10:5588:11 | in : CompositeMap [<map.key>] : String | Test.java:5588:10:5588:34 | removeComposited(...) : Map [<map.key>] : String | provenance | MaD:291 |
+| Test.java:5588:10:5588:11 | in : CompositeMap [<map.key>] : String | Test.java:5588:10:5588:34 | removeComposited(...) : Map [<map.key>] : String | provenance | MaD:294 |
 | Test.java:5588:10:5588:34 | removeComposited(...) : Map [<map.key>] : String | Test.java:5589:19:5589:21 | out : Map [<map.key>] : String | provenance |  |
 | Test.java:5589:19:5589:21 | out : Map [<map.key>] : String | Test.java:228:18:228:29 | map : Map [<map.key>] : String | provenance |  |
-| Test.java:5589:19:5589:21 | out : Map [<map.key>] : String | Test.java:5589:9:5589:22 | getMapKey(...) | provenance | MaD:10 |
+| Test.java:5589:19:5589:21 | out : Map [<map.key>] : String | Test.java:5589:9:5589:22 | getMapKey(...) | provenance | MaD:18 |
 | Test.java:5594:22:5594:75 | new CompositeMap<>(...) : CompositeMap [<map.value>] : String | Test.java:5595:10:5595:11 | in : CompositeMap [<map.value>] : String | provenance |  |
-| Test.java:5594:39:5594:68 | of(...) : Map [<map.value>] : String | Test.java:5594:22:5594:75 | new CompositeMap<>(...) : CompositeMap [<map.value>] : String | provenance | MaD:278 |
-| Test.java:5594:52:5594:67 | (...)... : String | Test.java:5594:39:5594:68 | of(...) : Map [<map.value>] : String | provenance | MaD:12 |
+| Test.java:5594:39:5594:68 | of(...) : Map [<map.value>] : String | Test.java:5594:22:5594:75 | new CompositeMap<>(...) : CompositeMap [<map.value>] : String | provenance | MaD:280 |
+| Test.java:5594:52:5594:67 | (...)... : String | Test.java:5594:39:5594:68 | of(...) : Map [<map.value>] : String | provenance | MaD:14 |
 | Test.java:5594:60:5594:67 | source(...) : Object | Test.java:5594:52:5594:67 | (...)... : String | provenance |  |
-| Test.java:5595:10:5595:11 | in : CompositeMap [<map.value>] : String | Test.java:5595:10:5595:34 | removeComposited(...) : Map [<map.value>] : String | provenance | MaD:292 |
+| Test.java:5595:10:5595:11 | in : CompositeMap [<map.value>] : String | Test.java:5595:10:5595:34 | removeComposited(...) : Map [<map.value>] : String | provenance | MaD:295 |
 | Test.java:5595:10:5595:34 | removeComposited(...) : Map [<map.value>] : String | Test.java:5596:21:5596:23 | out : Map [<map.value>] : String | provenance |  |
 | Test.java:5596:21:5596:23 | out : Map [<map.value>] : String | Test.java:232:20:232:31 | map : Map [<map.value>] : String | provenance |  |
-| Test.java:5596:21:5596:23 | out : Map [<map.value>] : String | Test.java:5596:9:5596:24 | getMapValue(...) | provenance | MaD:9 |
+| Test.java:5596:21:5596:23 | out : Map [<map.value>] : String | Test.java:5596:9:5596:24 | getMapValue(...) | provenance | MaD:17 |
 | Test.java:5601:16:5601:23 | source(...) : Object | Test.java:5602:27:5602:28 | in : Object | provenance |  |
 | Test.java:5602:10:5602:29 | new DefaultedMap<>(...) : DefaultedMap [<map.value>] : Object | Test.java:5603:21:5603:23 | out : DefaultedMap [<map.value>] : Object | provenance |  |
-| Test.java:5602:27:5602:28 | in : Object | Test.java:5602:10:5602:29 | new DefaultedMap<>(...) : DefaultedMap [<map.value>] : Object | provenance | MaD:294 |
+| Test.java:5602:27:5602:28 | in : Object | Test.java:5602:10:5602:29 | new DefaultedMap<>(...) : DefaultedMap [<map.value>] : Object | provenance | MaD:296 |
 | Test.java:5603:21:5603:23 | out : DefaultedMap [<map.value>] : Object | Test.java:232:20:232:31 | map : DefaultedMap [<map.value>] : Object | provenance |  |
-| Test.java:5603:21:5603:23 | out : DefaultedMap [<map.value>] : Object | Test.java:5603:9:5603:24 | getMapValue(...) | provenance | MaD:9 |
+| Test.java:5603:21:5603:23 | out : DefaultedMap [<map.value>] : Object | Test.java:5603:9:5603:24 | getMapValue(...) | provenance | MaD:17 |
 | Test.java:5608:16:5608:23 | source(...) : Object | Test.java:5609:47:5609:48 | in : Object | provenance |  |
 | Test.java:5609:10:5609:49 | defaultedMap(...) : DefaultedMap [<map.value>] : Object | Test.java:5610:21:5610:23 | out : DefaultedMap [<map.value>] : Object | provenance |  |
 | Test.java:5609:47:5609:48 | in : Object | Test.java:5609:10:5609:49 | defaultedMap(...) : DefaultedMap [<map.value>] : Object | provenance | MaD:297 |
 | Test.java:5610:21:5610:23 | out : DefaultedMap [<map.value>] : Object | Test.java:232:20:232:31 | map : DefaultedMap [<map.value>] : Object | provenance |  |
-| Test.java:5610:21:5610:23 | out : DefaultedMap [<map.value>] : Object | Test.java:5610:9:5610:24 | getMapValue(...) | provenance | MaD:9 |
+| Test.java:5610:21:5610:23 | out : DefaultedMap [<map.value>] : Object | Test.java:5610:9:5610:24 | getMapValue(...) | provenance | MaD:17 |
 | Test.java:5615:28:5615:57 | of(...) : Map [<map.key>] : String | Test.java:5616:36:5616:37 | in : Map [<map.key>] : String | provenance |  |
-| Test.java:5615:35:5615:50 | (...)... : String | Test.java:5615:28:5615:57 | of(...) : Map [<map.key>] : String | provenance | MaD:11 |
+| Test.java:5615:35:5615:50 | (...)... : String | Test.java:5615:28:5615:57 | of(...) : Map [<map.key>] : String | provenance | MaD:13 |
 | Test.java:5615:43:5615:50 | source(...) : Object | Test.java:5615:35:5615:50 | (...)... : String | provenance |  |
 | Test.java:5616:10:5616:57 | defaultedMap(...) : Map [<map.key>] : String | Test.java:5617:19:5617:21 | out : Map [<map.key>] : String | provenance |  |
-| Test.java:5616:36:5616:37 | in : Map [<map.key>] : String | Test.java:5616:10:5616:57 | defaultedMap(...) : Map [<map.key>] : String | provenance | MaD:295 |
+| Test.java:5616:36:5616:37 | in : Map [<map.key>] : String | Test.java:5616:10:5616:57 | defaultedMap(...) : Map [<map.key>] : String | provenance | MaD:298 |
 | Test.java:5617:19:5617:21 | out : Map [<map.key>] : String | Test.java:228:18:228:29 | map : Map [<map.key>] : String | provenance |  |
-| Test.java:5617:19:5617:21 | out : Map [<map.key>] : String | Test.java:5617:9:5617:22 | getMapKey(...) | provenance | MaD:10 |
+| Test.java:5617:19:5617:21 | out : Map [<map.key>] : String | Test.java:5617:9:5617:22 | getMapKey(...) | provenance | MaD:18 |
 | Test.java:5622:13:5622:42 | of(...) : Map [<map.key>] : String | Test.java:5623:36:5623:37 | in : Map [<map.key>] : String | provenance |  |
-| Test.java:5622:20:5622:35 | (...)... : String | Test.java:5622:13:5622:42 | of(...) : Map [<map.key>] : String | provenance | MaD:11 |
+| Test.java:5622:20:5622:35 | (...)... : String | Test.java:5622:13:5622:42 | of(...) : Map [<map.key>] : String | provenance | MaD:13 |
 | Test.java:5622:28:5622:35 | source(...) : Object | Test.java:5622:20:5622:35 | (...)... : String | provenance |  |
 | Test.java:5623:10:5623:52 | defaultedMap(...) : DefaultedMap [<map.key>] : String | Test.java:5624:19:5624:21 | out : DefaultedMap [<map.key>] : String | provenance |  |
-| Test.java:5623:36:5623:37 | in : Map [<map.key>] : String | Test.java:5623:10:5623:52 | defaultedMap(...) : DefaultedMap [<map.key>] : String | provenance | MaD:295 |
+| Test.java:5623:36:5623:37 | in : Map [<map.key>] : String | Test.java:5623:10:5623:52 | defaultedMap(...) : DefaultedMap [<map.key>] : String | provenance | MaD:298 |
 | Test.java:5624:19:5624:21 | out : DefaultedMap [<map.key>] : String | Test.java:228:18:228:29 | map : DefaultedMap [<map.key>] : String | provenance |  |
-| Test.java:5624:19:5624:21 | out : DefaultedMap [<map.key>] : String | Test.java:5624:9:5624:22 | getMapKey(...) | provenance | MaD:10 |
+| Test.java:5624:19:5624:21 | out : DefaultedMap [<map.key>] : String | Test.java:5624:9:5624:22 | getMapKey(...) | provenance | MaD:18 |
 | Test.java:5629:28:5629:57 | of(...) : Map [<map.key>] : String | Test.java:5630:36:5630:37 | in : Map [<map.key>] : String | provenance |  |
-| Test.java:5629:35:5629:50 | (...)... : String | Test.java:5629:28:5629:57 | of(...) : Map [<map.key>] : String | provenance | MaD:11 |
+| Test.java:5629:35:5629:50 | (...)... : String | Test.java:5629:28:5629:57 | of(...) : Map [<map.key>] : String | provenance | MaD:13 |
 | Test.java:5629:43:5629:50 | source(...) : Object | Test.java:5629:35:5629:50 | (...)... : String | provenance |  |
 | Test.java:5630:10:5630:53 | defaultedMap(...) : DefaultedMap [<map.key>] : String | Test.java:5631:19:5631:21 | out : DefaultedMap [<map.key>] : String | provenance |  |
-| Test.java:5630:36:5630:37 | in : Map [<map.key>] : String | Test.java:5630:10:5630:53 | defaultedMap(...) : DefaultedMap [<map.key>] : String | provenance | MaD:295 |
+| Test.java:5630:36:5630:37 | in : Map [<map.key>] : String | Test.java:5630:10:5630:53 | defaultedMap(...) : DefaultedMap [<map.key>] : String | provenance | MaD:298 |
 | Test.java:5631:19:5631:21 | out : DefaultedMap [<map.key>] : String | Test.java:228:18:228:29 | map : DefaultedMap [<map.key>] : String | provenance |  |
-| Test.java:5631:19:5631:21 | out : DefaultedMap [<map.key>] : String | Test.java:5631:9:5631:22 | getMapKey(...) | provenance | MaD:10 |
+| Test.java:5631:19:5631:21 | out : DefaultedMap [<map.key>] : String | Test.java:5631:9:5631:22 | getMapKey(...) | provenance | MaD:18 |
 | Test.java:5636:28:5636:57 | of(...) : Map [<map.value>] : String | Test.java:5637:36:5637:37 | in : Map [<map.value>] : String | provenance |  |
-| Test.java:5636:41:5636:56 | (...)... : String | Test.java:5636:28:5636:57 | of(...) : Map [<map.value>] : String | provenance | MaD:12 |
+| Test.java:5636:41:5636:56 | (...)... : String | Test.java:5636:28:5636:57 | of(...) : Map [<map.value>] : String | provenance | MaD:14 |
 | Test.java:5636:49:5636:56 | source(...) : Object | Test.java:5636:41:5636:56 | (...)... : String | provenance |  |
 | Test.java:5637:10:5637:57 | defaultedMap(...) : Map [<map.value>] : String | Test.java:5638:21:5638:23 | out : Map [<map.value>] : String | provenance |  |
-| Test.java:5637:36:5637:37 | in : Map [<map.value>] : String | Test.java:5637:10:5637:57 | defaultedMap(...) : Map [<map.value>] : String | provenance | MaD:296 |
+| Test.java:5637:36:5637:37 | in : Map [<map.value>] : String | Test.java:5637:10:5637:57 | defaultedMap(...) : Map [<map.value>] : String | provenance | MaD:299 |
 | Test.java:5638:21:5638:23 | out : Map [<map.value>] : String | Test.java:232:20:232:31 | map : Map [<map.value>] : String | provenance |  |
-| Test.java:5638:21:5638:23 | out : Map [<map.value>] : String | Test.java:5638:9:5638:24 | getMapValue(...) | provenance | MaD:9 |
+| Test.java:5638:21:5638:23 | out : Map [<map.value>] : String | Test.java:5638:9:5638:24 | getMapValue(...) | provenance | MaD:17 |
 | Test.java:5643:13:5643:42 | of(...) : Map [<map.value>] : String | Test.java:5644:36:5644:37 | in : Map [<map.value>] : String | provenance |  |
-| Test.java:5643:26:5643:41 | (...)... : String | Test.java:5643:13:5643:42 | of(...) : Map [<map.value>] : String | provenance | MaD:12 |
+| Test.java:5643:26:5643:41 | (...)... : String | Test.java:5643:13:5643:42 | of(...) : Map [<map.value>] : String | provenance | MaD:14 |
 | Test.java:5643:34:5643:41 | source(...) : Object | Test.java:5643:26:5643:41 | (...)... : String | provenance |  |
 | Test.java:5644:10:5644:52 | defaultedMap(...) : DefaultedMap [<map.value>] : String | Test.java:5645:21:5645:23 | out : DefaultedMap [<map.value>] : String | provenance |  |
-| Test.java:5644:36:5644:37 | in : Map [<map.value>] : String | Test.java:5644:10:5644:52 | defaultedMap(...) : DefaultedMap [<map.value>] : String | provenance | MaD:296 |
+| Test.java:5644:36:5644:37 | in : Map [<map.value>] : String | Test.java:5644:10:5644:52 | defaultedMap(...) : DefaultedMap [<map.value>] : String | provenance | MaD:299 |
 | Test.java:5645:21:5645:23 | out : DefaultedMap [<map.value>] : String | Test.java:232:20:232:31 | map : DefaultedMap [<map.value>] : String | provenance |  |
-| Test.java:5645:21:5645:23 | out : DefaultedMap [<map.value>] : String | Test.java:5645:9:5645:24 | getMapValue(...) | provenance | MaD:9 |
+| Test.java:5645:21:5645:23 | out : DefaultedMap [<map.value>] : String | Test.java:5645:9:5645:24 | getMapValue(...) | provenance | MaD:17 |
 | Test.java:5650:28:5650:57 | of(...) : Map [<map.value>] : String | Test.java:5651:36:5651:37 | in : Map [<map.value>] : String | provenance |  |
-| Test.java:5650:41:5650:56 | (...)... : String | Test.java:5650:28:5650:57 | of(...) : Map [<map.value>] : String | provenance | MaD:12 |
+| Test.java:5650:41:5650:56 | (...)... : String | Test.java:5650:28:5650:57 | of(...) : Map [<map.value>] : String | provenance | MaD:14 |
 | Test.java:5650:49:5650:56 | source(...) : Object | Test.java:5650:41:5650:56 | (...)... : String | provenance |  |
 | Test.java:5651:10:5651:53 | defaultedMap(...) : DefaultedMap [<map.value>] : String | Test.java:5652:21:5652:23 | out : DefaultedMap [<map.value>] : String | provenance |  |
-| Test.java:5651:36:5651:37 | in : Map [<map.value>] : String | Test.java:5651:10:5651:53 | defaultedMap(...) : DefaultedMap [<map.value>] : String | provenance | MaD:296 |
+| Test.java:5651:36:5651:37 | in : Map [<map.value>] : String | Test.java:5651:10:5651:53 | defaultedMap(...) : DefaultedMap [<map.value>] : String | provenance | MaD:299 |
 | Test.java:5652:21:5652:23 | out : DefaultedMap [<map.value>] : String | Test.java:232:20:232:31 | map : DefaultedMap [<map.value>] : String | provenance |  |
-| Test.java:5652:21:5652:23 | out : DefaultedMap [<map.value>] : String | Test.java:5652:9:5652:24 | getMapValue(...) | provenance | MaD:9 |
+| Test.java:5652:21:5652:23 | out : DefaultedMap [<map.value>] : String | Test.java:5652:9:5652:24 | getMapValue(...) | provenance | MaD:17 |
 | Test.java:5657:13:5657:76 | newListOrderedSetWithElement(...) : ListOrderedSet [<element>, <map.key>] : String | Test.java:5658:43:5658:44 | in : ListOrderedSet [<element>, <map.key>] : String | provenance |  |
 | Test.java:5657:42:5657:75 | newTMEWithMapKey(...) : TiedMapEntry [<map.key>] : String | Test.java:260:53:260:61 | element : TiedMapEntry [<map.key>] : String | provenance |  |
-| Test.java:5657:42:5657:75 | newTMEWithMapKey(...) : TiedMapEntry [<map.key>] : String | Test.java:5657:13:5657:76 | newListOrderedSetWithElement(...) : ListOrderedSet [<element>, <map.key>] : String | provenance | MaD:2 |
+| Test.java:5657:42:5657:75 | newTMEWithMapKey(...) : TiedMapEntry [<map.key>] : String | Test.java:5657:13:5657:76 | newListOrderedSetWithElement(...) : ListOrderedSet [<element>, <map.key>] : String | provenance | MaD:4 |
 | Test.java:5657:59:5657:74 | (...)... : String | Test.java:286:46:286:50 | key : String | provenance |  |
-| Test.java:5657:59:5657:74 | (...)... : String | Test.java:5657:42:5657:75 | newTMEWithMapKey(...) : TiedMapEntry [<map.key>] : String | provenance | MaD:234 |
+| Test.java:5657:59:5657:74 | (...)... : String | Test.java:5657:42:5657:75 | newTMEWithMapKey(...) : TiedMapEntry [<map.key>] : String | provenance | MaD:236 |
 | Test.java:5657:67:5657:74 | source(...) : Object | Test.java:5657:59:5657:74 | (...)... : String | provenance |  |
 | Test.java:5658:10:5658:45 | new EntrySetToMapIteratorAdapter<>(...) : EntrySetToMapIteratorAdapter [<element>] : String | Test.java:5659:20:5659:22 | out : EntrySetToMapIteratorAdapter [<element>] : String | provenance |  |
-| Test.java:5658:43:5658:44 | in : ListOrderedSet [<element>, <map.key>] : String | Test.java:5658:10:5658:45 | new EntrySetToMapIteratorAdapter<>(...) : EntrySetToMapIteratorAdapter [<element>] : String | provenance | MaD:298 |
+| Test.java:5658:43:5658:44 | in : ListOrderedSet [<element>, <map.key>] : String | Test.java:5658:10:5658:45 | new EntrySetToMapIteratorAdapter<>(...) : EntrySetToMapIteratorAdapter [<element>] : String | provenance | MaD:300 |
 | Test.java:5659:20:5659:22 | out : EntrySetToMapIteratorAdapter [<element>] : String | Test.java:231:19:231:32 | it : EntrySetToMapIteratorAdapter [<element>] : String | provenance |  |
-| Test.java:5659:20:5659:22 | out : EntrySetToMapIteratorAdapter [<element>] : String | Test.java:5659:9:5659:23 | getElement(...) | provenance | MaD:4 |
+| Test.java:5659:20:5659:22 | out : EntrySetToMapIteratorAdapter [<element>] : String | Test.java:5659:9:5659:23 | getElement(...) | provenance | MaD:6 |
 | Test.java:5664:13:5664:78 | newListOrderedSetWithElement(...) : ListOrderedSet [<element>, <map.value>] : String | Test.java:5665:43:5665:44 | in : ListOrderedSet [<element>, <map.value>] : String | provenance |  |
 | Test.java:5664:42:5664:77 | newTMEWithMapValue(...) : TiedMapEntry [<map.value>] : String | Test.java:260:53:260:61 | element : TiedMapEntry [<map.value>] : String | provenance |  |
-| Test.java:5664:42:5664:77 | newTMEWithMapValue(...) : TiedMapEntry [<map.value>] : String | Test.java:5664:13:5664:78 | newListOrderedSetWithElement(...) : ListOrderedSet [<element>, <map.value>] : String | provenance | MaD:2 |
+| Test.java:5664:42:5664:77 | newTMEWithMapValue(...) : TiedMapEntry [<map.value>] : String | Test.java:5664:13:5664:78 | newListOrderedSetWithElement(...) : ListOrderedSet [<element>, <map.value>] : String | provenance | MaD:4 |
 | Test.java:5664:61:5664:76 | (...)... : String | Test.java:305:48:305:54 | value : String | provenance |  |
-| Test.java:5664:61:5664:76 | (...)... : String | Test.java:5664:42:5664:77 | newTMEWithMapValue(...) : TiedMapEntry [<map.value>] : String | provenance | MaD:15 |
+| Test.java:5664:61:5664:76 | (...)... : String | Test.java:5664:42:5664:77 | newTMEWithMapValue(...) : TiedMapEntry [<map.value>] : String | provenance | MaD:20 |
 | Test.java:5664:69:5664:76 | source(...) : Object | Test.java:5664:61:5664:76 | (...)... : String | provenance |  |
 | Test.java:5665:10:5665:45 | new EntrySetToMapIteratorAdapter<>(...) : EntrySetToMapIteratorAdapter [<map.value>] : String | Test.java:5666:21:5666:23 | out : EntrySetToMapIteratorAdapter [<map.value>] : String | provenance |  |
-| Test.java:5665:43:5665:44 | in : ListOrderedSet [<element>, <map.value>] : String | Test.java:5665:10:5665:45 | new EntrySetToMapIteratorAdapter<>(...) : EntrySetToMapIteratorAdapter [<map.value>] : String | provenance | MaD:299 |
+| Test.java:5665:43:5665:44 | in : ListOrderedSet [<element>, <map.value>] : String | Test.java:5665:10:5665:45 | new EntrySetToMapIteratorAdapter<>(...) : EntrySetToMapIteratorAdapter [<map.value>] : String | provenance | MaD:301 |
 | Test.java:5666:21:5666:23 | out : EntrySetToMapIteratorAdapter [<map.value>] : String | Test.java:246:20:246:47 | mapIterator : EntrySetToMapIteratorAdapter [<map.value>] : String | provenance |  |
-| Test.java:5666:21:5666:23 | out : EntrySetToMapIteratorAdapter [<map.value>] : String | Test.java:5666:9:5666:24 | getMapValue(...) | provenance | MaD:598 |
+| Test.java:5666:21:5666:23 | out : EntrySetToMapIteratorAdapter [<map.value>] : String | Test.java:5666:9:5666:24 | getMapValue(...) | provenance | MaD:673 |
 | Test.java:5671:13:5671:42 | of(...) : Map [<map.key>] : String | Test.java:5672:36:5672:37 | in : Map [<map.key>] : String | provenance |  |
-| Test.java:5671:20:5671:35 | (...)... : String | Test.java:5671:13:5671:42 | of(...) : Map [<map.key>] : String | provenance | MaD:11 |
+| Test.java:5671:20:5671:35 | (...)... : String | Test.java:5671:13:5671:42 | of(...) : Map [<map.key>] : String | provenance | MaD:13 |
 | Test.java:5671:28:5671:35 | source(...) : Object | Test.java:5671:20:5671:35 | (...)... : String | provenance |  |
 | Test.java:5672:10:5672:38 | fixedSizeMap(...) : FixedSizeMap [<map.key>] : String | Test.java:5673:19:5673:21 | out : FixedSizeMap [<map.key>] : String | provenance |  |
-| Test.java:5672:36:5672:37 | in : Map [<map.key>] : String | Test.java:5672:10:5672:38 | fixedSizeMap(...) : FixedSizeMap [<map.key>] : String | provenance | MaD:300 |
+| Test.java:5672:36:5672:37 | in : Map [<map.key>] : String | Test.java:5672:10:5672:38 | fixedSizeMap(...) : FixedSizeMap [<map.key>] : String | provenance | MaD:302 |
 | Test.java:5673:19:5673:21 | out : FixedSizeMap [<map.key>] : String | Test.java:228:18:228:29 | map : FixedSizeMap [<map.key>] : String | provenance |  |
-| Test.java:5673:19:5673:21 | out : FixedSizeMap [<map.key>] : String | Test.java:5673:9:5673:22 | getMapKey(...) | provenance | MaD:10 |
+| Test.java:5673:19:5673:21 | out : FixedSizeMap [<map.key>] : String | Test.java:5673:9:5673:22 | getMapKey(...) | provenance | MaD:18 |
 | Test.java:5678:13:5678:42 | of(...) : Map [<map.value>] : String | Test.java:5679:36:5679:37 | in : Map [<map.value>] : String | provenance |  |
-| Test.java:5678:26:5678:41 | (...)... : String | Test.java:5678:13:5678:42 | of(...) : Map [<map.value>] : String | provenance | MaD:12 |
+| Test.java:5678:26:5678:41 | (...)... : String | Test.java:5678:13:5678:42 | of(...) : Map [<map.value>] : String | provenance | MaD:14 |
 | Test.java:5678:34:5678:41 | source(...) : Object | Test.java:5678:26:5678:41 | (...)... : String | provenance |  |
 | Test.java:5679:10:5679:38 | fixedSizeMap(...) : FixedSizeMap [<map.value>] : String | Test.java:5680:21:5680:23 | out : FixedSizeMap [<map.value>] : String | provenance |  |
-| Test.java:5679:36:5679:37 | in : Map [<map.value>] : String | Test.java:5679:10:5679:38 | fixedSizeMap(...) : FixedSizeMap [<map.value>] : String | provenance | MaD:301 |
+| Test.java:5679:36:5679:37 | in : Map [<map.value>] : String | Test.java:5679:10:5679:38 | fixedSizeMap(...) : FixedSizeMap [<map.value>] : String | provenance | MaD:303 |
 | Test.java:5680:21:5680:23 | out : FixedSizeMap [<map.value>] : String | Test.java:232:20:232:31 | map : FixedSizeMap [<map.value>] : String | provenance |  |
-| Test.java:5680:21:5680:23 | out : FixedSizeMap [<map.value>] : String | Test.java:5680:9:5680:24 | getMapValue(...) | provenance | MaD:9 |
+| Test.java:5680:21:5680:23 | out : FixedSizeMap [<map.value>] : String | Test.java:5680:9:5680:24 | getMapValue(...) | provenance | MaD:17 |
 | Test.java:5685:19:5685:56 | newTreeMapWithMapKey(...) : TreeMap [<map.key>] : String | Test.java:5686:48:5686:49 | in : TreeMap [<map.key>] : String | provenance |  |
 | Test.java:5685:40:5685:55 | (...)... : String | Test.java:285:47:285:51 | key : String | provenance |  |
-| Test.java:5685:40:5685:55 | (...)... : String | Test.java:5685:19:5685:56 | newTreeMapWithMapKey(...) : TreeMap [<map.key>] : String | provenance | MaD:14 |
+| Test.java:5685:40:5685:55 | (...)... : String | Test.java:5685:19:5685:56 | newTreeMapWithMapKey(...) : TreeMap [<map.key>] : String | provenance | MaD:19 |
 | Test.java:5685:48:5685:55 | source(...) : Object | Test.java:5685:40:5685:55 | (...)... : String | provenance |  |
 | Test.java:5686:10:5686:50 | fixedSizeSortedMap(...) : FixedSizeSortedMap [<map.key>] : String | Test.java:5687:19:5687:21 | out : FixedSizeSortedMap [<map.key>] : String | provenance |  |
-| Test.java:5686:48:5686:49 | in : TreeMap [<map.key>] : String | Test.java:5686:10:5686:50 | fixedSizeSortedMap(...) : FixedSizeSortedMap [<map.key>] : String | provenance | MaD:302 |
+| Test.java:5686:48:5686:49 | in : TreeMap [<map.key>] : String | Test.java:5686:10:5686:50 | fixedSizeSortedMap(...) : FixedSizeSortedMap [<map.key>] : String | provenance | MaD:304 |
 | Test.java:5687:19:5687:21 | out : FixedSizeSortedMap [<map.key>] : String | Test.java:228:18:228:29 | map : FixedSizeSortedMap [<map.key>] : String | provenance |  |
-| Test.java:5687:19:5687:21 | out : FixedSizeSortedMap [<map.key>] : String | Test.java:5687:9:5687:22 | getMapKey(...) | provenance | MaD:10 |
+| Test.java:5687:19:5687:21 | out : FixedSizeSortedMap [<map.key>] : String | Test.java:5687:9:5687:22 | getMapKey(...) | provenance | MaD:18 |
 | Test.java:5692:19:5692:58 | newTreeMapWithMapValue(...) : TreeMap [<map.value>] : String | Test.java:5693:48:5693:49 | in : TreeMap [<map.value>] : String | provenance |  |
 | Test.java:5692:42:5692:57 | (...)... : String | Test.java:304:49:304:55 | value : String | provenance |  |
-| Test.java:5692:42:5692:57 | (...)... : String | Test.java:5692:19:5692:58 | newTreeMapWithMapValue(...) : TreeMap [<map.value>] : String | provenance | MaD:15 |
+| Test.java:5692:42:5692:57 | (...)... : String | Test.java:5692:19:5692:58 | newTreeMapWithMapValue(...) : TreeMap [<map.value>] : String | provenance | MaD:20 |
 | Test.java:5692:50:5692:57 | source(...) : Object | Test.java:5692:42:5692:57 | (...)... : String | provenance |  |
 | Test.java:5693:10:5693:50 | fixedSizeSortedMap(...) : FixedSizeSortedMap [<map.value>] : String | Test.java:5694:21:5694:23 | out : FixedSizeSortedMap [<map.value>] : String | provenance |  |
-| Test.java:5693:48:5693:49 | in : TreeMap [<map.value>] : String | Test.java:5693:10:5693:50 | fixedSizeSortedMap(...) : FixedSizeSortedMap [<map.value>] : String | provenance | MaD:303 |
+| Test.java:5693:48:5693:49 | in : TreeMap [<map.value>] : String | Test.java:5693:10:5693:50 | fixedSizeSortedMap(...) : FixedSizeSortedMap [<map.value>] : String | provenance | MaD:305 |
 | Test.java:5694:21:5694:23 | out : FixedSizeSortedMap [<map.value>] : String | Test.java:232:20:232:31 | map : FixedSizeSortedMap [<map.value>] : String | provenance |  |
-| Test.java:5694:21:5694:23 | out : FixedSizeSortedMap [<map.value>] : String | Test.java:5694:9:5694:24 | getMapValue(...) | provenance | MaD:9 |
+| Test.java:5694:21:5694:23 | out : FixedSizeSortedMap [<map.value>] : String | Test.java:5694:9:5694:24 | getMapValue(...) | provenance | MaD:17 |
 | Test.java:5699:13:5699:42 | of(...) : Map [<map.key>] : String | Test.java:5700:23:5700:24 | in : Map [<map.key>] : String | provenance |  |
-| Test.java:5699:20:5699:35 | (...)... : String | Test.java:5699:13:5699:42 | of(...) : Map [<map.key>] : String | provenance | MaD:11 |
+| Test.java:5699:20:5699:35 | (...)... : String | Test.java:5699:13:5699:42 | of(...) : Map [<map.key>] : String | provenance | MaD:13 |
 | Test.java:5699:28:5699:35 | source(...) : Object | Test.java:5699:20:5699:35 | (...)... : String | provenance |  |
 | Test.java:5700:10:5700:25 | new Flat3Map<>(...) : Flat3Map [<map.key>] : String | Test.java:5701:19:5701:21 | out : Flat3Map [<map.key>] : String | provenance |  |
-| Test.java:5700:23:5700:24 | in : Map [<map.key>] : String | Test.java:5700:10:5700:25 | new Flat3Map<>(...) : Flat3Map [<map.key>] : String | provenance | MaD:304 |
+| Test.java:5700:23:5700:24 | in : Map [<map.key>] : String | Test.java:5700:10:5700:25 | new Flat3Map<>(...) : Flat3Map [<map.key>] : String | provenance | MaD:306 |
 | Test.java:5701:19:5701:21 | out : Flat3Map [<map.key>] : String | Test.java:228:18:228:29 | map : Flat3Map [<map.key>] : String | provenance |  |
-| Test.java:5701:19:5701:21 | out : Flat3Map [<map.key>] : String | Test.java:5701:9:5701:22 | getMapKey(...) | provenance | MaD:10 |
+| Test.java:5701:19:5701:21 | out : Flat3Map [<map.key>] : String | Test.java:5701:9:5701:22 | getMapKey(...) | provenance | MaD:18 |
 | Test.java:5706:13:5706:42 | of(...) : Map [<map.value>] : String | Test.java:5707:23:5707:24 | in : Map [<map.value>] : String | provenance |  |
-| Test.java:5706:26:5706:41 | (...)... : String | Test.java:5706:13:5706:42 | of(...) : Map [<map.value>] : String | provenance | MaD:12 |
+| Test.java:5706:26:5706:41 | (...)... : String | Test.java:5706:13:5706:42 | of(...) : Map [<map.value>] : String | provenance | MaD:14 |
 | Test.java:5706:34:5706:41 | source(...) : Object | Test.java:5706:26:5706:41 | (...)... : String | provenance |  |
 | Test.java:5707:10:5707:25 | new Flat3Map<>(...) : Flat3Map [<map.value>] : String | Test.java:5708:21:5708:23 | out : Flat3Map [<map.value>] : String | provenance |  |
-| Test.java:5707:23:5707:24 | in : Map [<map.value>] : String | Test.java:5707:10:5707:25 | new Flat3Map<>(...) : Flat3Map [<map.value>] : String | provenance | MaD:305 |
+| Test.java:5707:23:5707:24 | in : Map [<map.value>] : String | Test.java:5707:10:5707:25 | new Flat3Map<>(...) : Flat3Map [<map.value>] : String | provenance | MaD:307 |
 | Test.java:5708:21:5708:23 | out : Flat3Map [<map.value>] : String | Test.java:232:20:232:31 | map : Flat3Map [<map.value>] : String | provenance |  |
-| Test.java:5708:21:5708:23 | out : Flat3Map [<map.value>] : String | Test.java:5708:9:5708:24 | getMapValue(...) | provenance | MaD:9 |
+| Test.java:5708:21:5708:23 | out : Flat3Map [<map.value>] : String | Test.java:5708:9:5708:24 | getMapValue(...) | provenance | MaD:17 |
 | Test.java:5713:13:5713:42 | of(...) : Map [<map.key>] : String | Test.java:5714:24:5714:25 | in : Map [<map.key>] : String | provenance |  |
-| Test.java:5713:20:5713:35 | (...)... : String | Test.java:5713:13:5713:42 | of(...) : Map [<map.key>] : String | provenance | MaD:11 |
+| Test.java:5713:20:5713:35 | (...)... : String | Test.java:5713:13:5713:42 | of(...) : Map [<map.key>] : String | provenance | MaD:13 |
 | Test.java:5713:28:5713:35 | source(...) : Object | Test.java:5713:20:5713:35 | (...)... : String | provenance |  |
 | Test.java:5714:10:5714:26 | new HashedMap<>(...) : HashedMap [<map.key>] : String | Test.java:5715:19:5715:21 | out : HashedMap [<map.key>] : String | provenance |  |
-| Test.java:5714:24:5714:25 | in : Map [<map.key>] : String | Test.java:5714:10:5714:26 | new HashedMap<>(...) : HashedMap [<map.key>] : String | provenance | MaD:306 |
+| Test.java:5714:24:5714:25 | in : Map [<map.key>] : String | Test.java:5714:10:5714:26 | new HashedMap<>(...) : HashedMap [<map.key>] : String | provenance | MaD:308 |
 | Test.java:5715:19:5715:21 | out : HashedMap [<map.key>] : String | Test.java:228:18:228:29 | map : HashedMap [<map.key>] : String | provenance |  |
-| Test.java:5715:19:5715:21 | out : HashedMap [<map.key>] : String | Test.java:5715:9:5715:22 | getMapKey(...) | provenance | MaD:10 |
+| Test.java:5715:19:5715:21 | out : HashedMap [<map.key>] : String | Test.java:5715:9:5715:22 | getMapKey(...) | provenance | MaD:18 |
 | Test.java:5720:13:5720:42 | of(...) : Map [<map.value>] : String | Test.java:5721:24:5721:25 | in : Map [<map.value>] : String | provenance |  |
-| Test.java:5720:26:5720:41 | (...)... : String | Test.java:5720:13:5720:42 | of(...) : Map [<map.value>] : String | provenance | MaD:12 |
+| Test.java:5720:26:5720:41 | (...)... : String | Test.java:5720:13:5720:42 | of(...) : Map [<map.value>] : String | provenance | MaD:14 |
 | Test.java:5720:34:5720:41 | source(...) : Object | Test.java:5720:26:5720:41 | (...)... : String | provenance |  |
 | Test.java:5721:10:5721:26 | new HashedMap<>(...) : HashedMap [<map.value>] : String | Test.java:5722:21:5722:23 | out : HashedMap [<map.value>] : String | provenance |  |
-| Test.java:5721:24:5721:25 | in : Map [<map.value>] : String | Test.java:5721:10:5721:26 | new HashedMap<>(...) : HashedMap [<map.value>] : String | provenance | MaD:307 |
+| Test.java:5721:24:5721:25 | in : Map [<map.value>] : String | Test.java:5721:10:5721:26 | new HashedMap<>(...) : HashedMap [<map.value>] : String | provenance | MaD:309 |
 | Test.java:5722:21:5722:23 | out : HashedMap [<map.value>] : String | Test.java:232:20:232:31 | map : HashedMap [<map.value>] : String | provenance |  |
-| Test.java:5722:21:5722:23 | out : HashedMap [<map.value>] : String | Test.java:5722:9:5722:24 | getMapValue(...) | provenance | MaD:9 |
+| Test.java:5722:21:5722:23 | out : HashedMap [<map.value>] : String | Test.java:5722:9:5722:24 | getMapValue(...) | provenance | MaD:17 |
 | Test.java:5727:13:5727:42 | of(...) : Map [<map.key>] : String | Test.java:5728:21:5728:22 | in : Map [<map.key>] : String | provenance |  |
-| Test.java:5727:20:5727:35 | (...)... : String | Test.java:5727:13:5727:42 | of(...) : Map [<map.key>] : String | provenance | MaD:11 |
+| Test.java:5727:20:5727:35 | (...)... : String | Test.java:5727:13:5727:42 | of(...) : Map [<map.key>] : String | provenance | MaD:13 |
 | Test.java:5727:28:5727:35 | source(...) : Object | Test.java:5727:20:5727:35 | (...)... : String | provenance |  |
 | Test.java:5728:10:5728:23 | new LRUMap<>(...) : LRUMap [<map.key>] : String | Test.java:5729:19:5729:21 | out : LRUMap [<map.key>] : String | provenance |  |
-| Test.java:5728:21:5728:22 | in : Map [<map.key>] : String | Test.java:5728:10:5728:23 | new LRUMap<>(...) : LRUMap [<map.key>] : String | provenance | MaD:308 |
+| Test.java:5728:21:5728:22 | in : Map [<map.key>] : String | Test.java:5728:10:5728:23 | new LRUMap<>(...) : LRUMap [<map.key>] : String | provenance | MaD:310 |
 | Test.java:5729:19:5729:21 | out : LRUMap [<map.key>] : String | Test.java:228:18:228:29 | map : LRUMap [<map.key>] : String | provenance |  |
-| Test.java:5729:19:5729:21 | out : LRUMap [<map.key>] : String | Test.java:5729:9:5729:22 | getMapKey(...) | provenance | MaD:10 |
+| Test.java:5729:19:5729:21 | out : LRUMap [<map.key>] : String | Test.java:5729:9:5729:22 | getMapKey(...) | provenance | MaD:18 |
 | Test.java:5734:13:5734:42 | of(...) : Map [<map.value>] : String | Test.java:5735:21:5735:22 | in : Map [<map.value>] : String | provenance |  |
-| Test.java:5734:26:5734:41 | (...)... : String | Test.java:5734:13:5734:42 | of(...) : Map [<map.value>] : String | provenance | MaD:12 |
+| Test.java:5734:26:5734:41 | (...)... : String | Test.java:5734:13:5734:42 | of(...) : Map [<map.value>] : String | provenance | MaD:14 |
 | Test.java:5734:34:5734:41 | source(...) : Object | Test.java:5734:26:5734:41 | (...)... : String | provenance |  |
 | Test.java:5735:10:5735:23 | new LRUMap<>(...) : LRUMap [<map.value>] : String | Test.java:5736:21:5736:23 | out : LRUMap [<map.value>] : String | provenance |  |
-| Test.java:5735:21:5735:22 | in : Map [<map.value>] : String | Test.java:5735:10:5735:23 | new LRUMap<>(...) : LRUMap [<map.value>] : String | provenance | MaD:309 |
+| Test.java:5735:21:5735:22 | in : Map [<map.value>] : String | Test.java:5735:10:5735:23 | new LRUMap<>(...) : LRUMap [<map.value>] : String | provenance | MaD:311 |
 | Test.java:5736:21:5736:23 | out : LRUMap [<map.value>] : String | Test.java:232:20:232:31 | map : LRUMap [<map.value>] : String | provenance |  |
-| Test.java:5736:21:5736:23 | out : LRUMap [<map.value>] : String | Test.java:5736:9:5736:24 | getMapValue(...) | provenance | MaD:9 |
+| Test.java:5736:21:5736:23 | out : LRUMap [<map.value>] : String | Test.java:5736:9:5736:24 | getMapValue(...) | provenance | MaD:17 |
 | Test.java:5741:13:5741:42 | of(...) : Map [<map.key>] : String | Test.java:5742:21:5742:22 | in : Map [<map.key>] : String | provenance |  |
-| Test.java:5741:20:5741:35 | (...)... : String | Test.java:5741:13:5741:42 | of(...) : Map [<map.key>] : String | provenance | MaD:11 |
+| Test.java:5741:20:5741:35 | (...)... : String | Test.java:5741:13:5741:42 | of(...) : Map [<map.key>] : String | provenance | MaD:13 |
 | Test.java:5741:28:5741:35 | source(...) : Object | Test.java:5741:20:5741:35 | (...)... : String | provenance |  |
 | Test.java:5742:10:5742:30 | new LRUMap<>(...) : LRUMap [<map.key>] : String | Test.java:5743:19:5743:21 | out : LRUMap [<map.key>] : String | provenance |  |
-| Test.java:5742:21:5742:22 | in : Map [<map.key>] : String | Test.java:5742:10:5742:30 | new LRUMap<>(...) : LRUMap [<map.key>] : String | provenance | MaD:310 |
+| Test.java:5742:21:5742:22 | in : Map [<map.key>] : String | Test.java:5742:10:5742:30 | new LRUMap<>(...) : LRUMap [<map.key>] : String | provenance | MaD:312 |
 | Test.java:5743:19:5743:21 | out : LRUMap [<map.key>] : String | Test.java:228:18:228:29 | map : LRUMap [<map.key>] : String | provenance |  |
-| Test.java:5743:19:5743:21 | out : LRUMap [<map.key>] : String | Test.java:5743:9:5743:22 | getMapKey(...) | provenance | MaD:10 |
+| Test.java:5743:19:5743:21 | out : LRUMap [<map.key>] : String | Test.java:5743:9:5743:22 | getMapKey(...) | provenance | MaD:18 |
 | Test.java:5748:13:5748:42 | of(...) : Map [<map.value>] : String | Test.java:5749:21:5749:22 | in : Map [<map.value>] : String | provenance |  |
-| Test.java:5748:26:5748:41 | (...)... : String | Test.java:5748:13:5748:42 | of(...) : Map [<map.value>] : String | provenance | MaD:12 |
+| Test.java:5748:26:5748:41 | (...)... : String | Test.java:5748:13:5748:42 | of(...) : Map [<map.value>] : String | provenance | MaD:14 |
 | Test.java:5748:34:5748:41 | source(...) : Object | Test.java:5748:26:5748:41 | (...)... : String | provenance |  |
 | Test.java:5749:10:5749:30 | new LRUMap<>(...) : LRUMap [<map.value>] : String | Test.java:5750:21:5750:23 | out : LRUMap [<map.value>] : String | provenance |  |
-| Test.java:5749:21:5749:22 | in : Map [<map.value>] : String | Test.java:5749:10:5749:30 | new LRUMap<>(...) : LRUMap [<map.value>] : String | provenance | MaD:311 |
+| Test.java:5749:21:5749:22 | in : Map [<map.value>] : String | Test.java:5749:10:5749:30 | new LRUMap<>(...) : LRUMap [<map.value>] : String | provenance | MaD:313 |
 | Test.java:5750:21:5750:23 | out : LRUMap [<map.value>] : String | Test.java:232:20:232:31 | map : LRUMap [<map.value>] : String | provenance |  |
-| Test.java:5750:21:5750:23 | out : LRUMap [<map.value>] : String | Test.java:5750:9:5750:24 | getMapValue(...) | provenance | MaD:9 |
+| Test.java:5750:21:5750:23 | out : LRUMap [<map.value>] : String | Test.java:5750:9:5750:24 | getMapValue(...) | provenance | MaD:17 |
 | Test.java:5755:16:5755:53 | (...)... : Map [<map.value>] : String | Test.java:5757:23:5757:24 | in : Map [<map.value>] : String | provenance |  |
 | Test.java:5755:24:5755:53 | of(...) : Map [<map.value>] : String | Test.java:5755:16:5755:53 | (...)... : Map [<map.value>] : String | provenance |  |
-| Test.java:5755:37:5755:52 | (...)... : String | Test.java:5755:24:5755:53 | of(...) : Map [<map.value>] : String | provenance | MaD:12 |
+| Test.java:5755:37:5755:52 | (...)... : String | Test.java:5755:24:5755:53 | of(...) : Map [<map.value>] : String | provenance | MaD:14 |
 | Test.java:5755:45:5755:52 | source(...) : Object | Test.java:5755:37:5755:52 | (...)... : String | provenance |  |
 | Test.java:5757:10:5757:32 | get(...) : String | Test.java:5758:9:5758:11 | out | provenance |  |
-| Test.java:5757:23:5757:24 | in : Map [<map.value>] : String | Test.java:5757:10:5757:32 | get(...) : String | provenance | MaD:312 |
+| Test.java:5757:23:5757:24 | in : Map [<map.value>] : String | Test.java:5757:10:5757:32 | get(...) : String | provenance | MaD:314 |
 | Test.java:5763:13:5763:42 | of(...) : Map [<map.key>] : String | Test.java:5764:26:5764:27 | in : Map [<map.key>] : String | provenance |  |
-| Test.java:5763:20:5763:35 | (...)... : String | Test.java:5763:13:5763:42 | of(...) : Map [<map.key>] : String | provenance | MaD:11 |
+| Test.java:5763:20:5763:35 | (...)... : String | Test.java:5763:13:5763:42 | of(...) : Map [<map.key>] : String | provenance | MaD:13 |
 | Test.java:5763:28:5763:35 | source(...) : Object | Test.java:5763:20:5763:35 | (...)... : String | provenance |  |
 | Test.java:5764:10:5764:47 | lazyMap(...) : LazyMap [<map.key>] : String | Test.java:5765:19:5765:21 | out : LazyMap [<map.key>] : String | provenance |  |
-| Test.java:5764:26:5764:27 | in : Map [<map.key>] : String | Test.java:5764:10:5764:47 | lazyMap(...) : LazyMap [<map.key>] : String | provenance | MaD:313 |
+| Test.java:5764:26:5764:27 | in : Map [<map.key>] : String | Test.java:5764:10:5764:47 | lazyMap(...) : LazyMap [<map.key>] : String | provenance | MaD:315 |
 | Test.java:5765:19:5765:21 | out : LazyMap [<map.key>] : String | Test.java:228:18:228:29 | map : LazyMap [<map.key>] : String | provenance |  |
-| Test.java:5765:19:5765:21 | out : LazyMap [<map.key>] : String | Test.java:5765:9:5765:22 | getMapKey(...) | provenance | MaD:10 |
+| Test.java:5765:19:5765:21 | out : LazyMap [<map.key>] : String | Test.java:5765:9:5765:22 | getMapKey(...) | provenance | MaD:18 |
 | Test.java:5770:13:5770:42 | of(...) : Map [<map.key>] : String | Test.java:5771:26:5771:27 | in : Map [<map.key>] : String | provenance |  |
-| Test.java:5770:20:5770:35 | (...)... : String | Test.java:5770:13:5770:42 | of(...) : Map [<map.key>] : String | provenance | MaD:11 |
+| Test.java:5770:20:5770:35 | (...)... : String | Test.java:5770:13:5770:42 | of(...) : Map [<map.key>] : String | provenance | MaD:13 |
 | Test.java:5770:28:5770:35 | source(...) : Object | Test.java:5770:20:5770:35 | (...)... : String | provenance |  |
 | Test.java:5771:10:5771:43 | lazyMap(...) : LazyMap [<map.key>] : String | Test.java:5772:19:5772:21 | out : LazyMap [<map.key>] : String | provenance |  |
-| Test.java:5771:26:5771:27 | in : Map [<map.key>] : String | Test.java:5771:10:5771:43 | lazyMap(...) : LazyMap [<map.key>] : String | provenance | MaD:313 |
+| Test.java:5771:26:5771:27 | in : Map [<map.key>] : String | Test.java:5771:10:5771:43 | lazyMap(...) : LazyMap [<map.key>] : String | provenance | MaD:315 |
 | Test.java:5772:19:5772:21 | out : LazyMap [<map.key>] : String | Test.java:228:18:228:29 | map : LazyMap [<map.key>] : String | provenance |  |
-| Test.java:5772:19:5772:21 | out : LazyMap [<map.key>] : String | Test.java:5772:9:5772:22 | getMapKey(...) | provenance | MaD:10 |
+| Test.java:5772:19:5772:21 | out : LazyMap [<map.key>] : String | Test.java:5772:9:5772:22 | getMapKey(...) | provenance | MaD:18 |
 | Test.java:5777:13:5777:42 | of(...) : Map [<map.value>] : String | Test.java:5778:26:5778:27 | in : Map [<map.value>] : String | provenance |  |
-| Test.java:5777:26:5777:41 | (...)... : String | Test.java:5777:13:5777:42 | of(...) : Map [<map.value>] : String | provenance | MaD:12 |
+| Test.java:5777:26:5777:41 | (...)... : String | Test.java:5777:13:5777:42 | of(...) : Map [<map.value>] : String | provenance | MaD:14 |
 | Test.java:5777:34:5777:41 | source(...) : Object | Test.java:5777:26:5777:41 | (...)... : String | provenance |  |
 | Test.java:5778:10:5778:47 | lazyMap(...) : LazyMap [<map.value>] : String | Test.java:5779:21:5779:23 | out : LazyMap [<map.value>] : String | provenance |  |
-| Test.java:5778:26:5778:27 | in : Map [<map.value>] : String | Test.java:5778:10:5778:47 | lazyMap(...) : LazyMap [<map.value>] : String | provenance | MaD:314 |
+| Test.java:5778:26:5778:27 | in : Map [<map.value>] : String | Test.java:5778:10:5778:47 | lazyMap(...) : LazyMap [<map.value>] : String | provenance | MaD:316 |
 | Test.java:5779:21:5779:23 | out : LazyMap [<map.value>] : String | Test.java:232:20:232:31 | map : LazyMap [<map.value>] : String | provenance |  |
-| Test.java:5779:21:5779:23 | out : LazyMap [<map.value>] : String | Test.java:5779:9:5779:24 | getMapValue(...) | provenance | MaD:9 |
+| Test.java:5779:21:5779:23 | out : LazyMap [<map.value>] : String | Test.java:5779:9:5779:24 | getMapValue(...) | provenance | MaD:17 |
 | Test.java:5784:13:5784:42 | of(...) : Map [<map.value>] : String | Test.java:5785:26:5785:27 | in : Map [<map.value>] : String | provenance |  |
-| Test.java:5784:26:5784:41 | (...)... : String | Test.java:5784:13:5784:42 | of(...) : Map [<map.value>] : String | provenance | MaD:12 |
+| Test.java:5784:26:5784:41 | (...)... : String | Test.java:5784:13:5784:42 | of(...) : Map [<map.value>] : String | provenance | MaD:14 |
 | Test.java:5784:34:5784:41 | source(...) : Object | Test.java:5784:26:5784:41 | (...)... : String | provenance |  |
 | Test.java:5785:10:5785:43 | lazyMap(...) : LazyMap [<map.value>] : String | Test.java:5786:21:5786:23 | out : LazyMap [<map.value>] : String | provenance |  |
-| Test.java:5785:26:5785:27 | in : Map [<map.value>] : String | Test.java:5785:10:5785:43 | lazyMap(...) : LazyMap [<map.value>] : String | provenance | MaD:314 |
+| Test.java:5785:26:5785:27 | in : Map [<map.value>] : String | Test.java:5785:10:5785:43 | lazyMap(...) : LazyMap [<map.value>] : String | provenance | MaD:316 |
 | Test.java:5786:21:5786:23 | out : LazyMap [<map.value>] : String | Test.java:232:20:232:31 | map : LazyMap [<map.value>] : String | provenance |  |
-| Test.java:5786:21:5786:23 | out : LazyMap [<map.value>] : String | Test.java:5786:9:5786:24 | getMapValue(...) | provenance | MaD:9 |
+| Test.java:5786:21:5786:23 | out : LazyMap [<map.value>] : String | Test.java:5786:9:5786:24 | getMapValue(...) | provenance | MaD:17 |
 | Test.java:5791:19:5791:56 | newTreeMapWithMapKey(...) : TreeMap [<map.key>] : String | Test.java:5792:38:5792:39 | in : TreeMap [<map.key>] : String | provenance |  |
 | Test.java:5791:40:5791:55 | (...)... : String | Test.java:285:47:285:51 | key : String | provenance |  |
-| Test.java:5791:40:5791:55 | (...)... : String | Test.java:5791:19:5791:56 | newTreeMapWithMapKey(...) : TreeMap [<map.key>] : String | provenance | MaD:14 |
+| Test.java:5791:40:5791:55 | (...)... : String | Test.java:5791:19:5791:56 | newTreeMapWithMapKey(...) : TreeMap [<map.key>] : String | provenance | MaD:19 |
 | Test.java:5791:48:5791:55 | source(...) : Object | Test.java:5791:40:5791:55 | (...)... : String | provenance |  |
 | Test.java:5792:10:5792:59 | lazySortedMap(...) : LazySortedMap [<map.key>] : String | Test.java:5793:19:5793:21 | out : LazySortedMap [<map.key>] : String | provenance |  |
-| Test.java:5792:38:5792:39 | in : TreeMap [<map.key>] : String | Test.java:5792:10:5792:59 | lazySortedMap(...) : LazySortedMap [<map.key>] : String | provenance | MaD:315 |
+| Test.java:5792:38:5792:39 | in : TreeMap [<map.key>] : String | Test.java:5792:10:5792:59 | lazySortedMap(...) : LazySortedMap [<map.key>] : String | provenance | MaD:317 |
 | Test.java:5793:19:5793:21 | out : LazySortedMap [<map.key>] : String | Test.java:228:18:228:29 | map : LazySortedMap [<map.key>] : String | provenance |  |
-| Test.java:5793:19:5793:21 | out : LazySortedMap [<map.key>] : String | Test.java:5793:9:5793:22 | getMapKey(...) | provenance | MaD:10 |
+| Test.java:5793:19:5793:21 | out : LazySortedMap [<map.key>] : String | Test.java:5793:9:5793:22 | getMapKey(...) | provenance | MaD:18 |
 | Test.java:5798:19:5798:56 | newTreeMapWithMapKey(...) : TreeMap [<map.key>] : String | Test.java:5799:38:5799:39 | in : TreeMap [<map.key>] : String | provenance |  |
 | Test.java:5798:40:5798:55 | (...)... : String | Test.java:285:47:285:51 | key : String | provenance |  |
-| Test.java:5798:40:5798:55 | (...)... : String | Test.java:5798:19:5798:56 | newTreeMapWithMapKey(...) : TreeMap [<map.key>] : String | provenance | MaD:14 |
+| Test.java:5798:40:5798:55 | (...)... : String | Test.java:5798:19:5798:56 | newTreeMapWithMapKey(...) : TreeMap [<map.key>] : String | provenance | MaD:19 |
 | Test.java:5798:48:5798:55 | source(...) : Object | Test.java:5798:40:5798:55 | (...)... : String | provenance |  |
 | Test.java:5799:10:5799:55 | lazySortedMap(...) : LazySortedMap [<map.key>] : String | Test.java:5800:19:5800:21 | out : LazySortedMap [<map.key>] : String | provenance |  |
-| Test.java:5799:38:5799:39 | in : TreeMap [<map.key>] : String | Test.java:5799:10:5799:55 | lazySortedMap(...) : LazySortedMap [<map.key>] : String | provenance | MaD:315 |
+| Test.java:5799:38:5799:39 | in : TreeMap [<map.key>] : String | Test.java:5799:10:5799:55 | lazySortedMap(...) : LazySortedMap [<map.key>] : String | provenance | MaD:317 |
 | Test.java:5800:19:5800:21 | out : LazySortedMap [<map.key>] : String | Test.java:228:18:228:29 | map : LazySortedMap [<map.key>] : String | provenance |  |
-| Test.java:5800:19:5800:21 | out : LazySortedMap [<map.key>] : String | Test.java:5800:9:5800:22 | getMapKey(...) | provenance | MaD:10 |
+| Test.java:5800:19:5800:21 | out : LazySortedMap [<map.key>] : String | Test.java:5800:9:5800:22 | getMapKey(...) | provenance | MaD:18 |
 | Test.java:5805:19:5805:58 | newTreeMapWithMapValue(...) : TreeMap [<map.value>] : String | Test.java:5806:38:5806:39 | in : TreeMap [<map.value>] : String | provenance |  |
 | Test.java:5805:42:5805:57 | (...)... : String | Test.java:304:49:304:55 | value : String | provenance |  |
-| Test.java:5805:42:5805:57 | (...)... : String | Test.java:5805:19:5805:58 | newTreeMapWithMapValue(...) : TreeMap [<map.value>] : String | provenance | MaD:15 |
+| Test.java:5805:42:5805:57 | (...)... : String | Test.java:5805:19:5805:58 | newTreeMapWithMapValue(...) : TreeMap [<map.value>] : String | provenance | MaD:20 |
 | Test.java:5805:50:5805:57 | source(...) : Object | Test.java:5805:42:5805:57 | (...)... : String | provenance |  |
 | Test.java:5806:10:5806:59 | lazySortedMap(...) : LazySortedMap [<map.value>] : String | Test.java:5807:21:5807:23 | out : LazySortedMap [<map.value>] : String | provenance |  |
-| Test.java:5806:38:5806:39 | in : TreeMap [<map.value>] : String | Test.java:5806:10:5806:59 | lazySortedMap(...) : LazySortedMap [<map.value>] : String | provenance | MaD:316 |
+| Test.java:5806:38:5806:39 | in : TreeMap [<map.value>] : String | Test.java:5806:10:5806:59 | lazySortedMap(...) : LazySortedMap [<map.value>] : String | provenance | MaD:318 |
 | Test.java:5807:21:5807:23 | out : LazySortedMap [<map.value>] : String | Test.java:232:20:232:31 | map : LazySortedMap [<map.value>] : String | provenance |  |
-| Test.java:5807:21:5807:23 | out : LazySortedMap [<map.value>] : String | Test.java:5807:9:5807:24 | getMapValue(...) | provenance | MaD:9 |
+| Test.java:5807:21:5807:23 | out : LazySortedMap [<map.value>] : String | Test.java:5807:9:5807:24 | getMapValue(...) | provenance | MaD:17 |
 | Test.java:5812:19:5812:58 | newTreeMapWithMapValue(...) : TreeMap [<map.value>] : String | Test.java:5813:38:5813:39 | in : TreeMap [<map.value>] : String | provenance |  |
 | Test.java:5812:42:5812:57 | (...)... : String | Test.java:304:49:304:55 | value : String | provenance |  |
-| Test.java:5812:42:5812:57 | (...)... : String | Test.java:5812:19:5812:58 | newTreeMapWithMapValue(...) : TreeMap [<map.value>] : String | provenance | MaD:15 |
+| Test.java:5812:42:5812:57 | (...)... : String | Test.java:5812:19:5812:58 | newTreeMapWithMapValue(...) : TreeMap [<map.value>] : String | provenance | MaD:20 |
 | Test.java:5812:50:5812:57 | source(...) : Object | Test.java:5812:42:5812:57 | (...)... : String | provenance |  |
 | Test.java:5813:10:5813:55 | lazySortedMap(...) : LazySortedMap [<map.value>] : String | Test.java:5814:21:5814:23 | out : LazySortedMap [<map.value>] : String | provenance |  |
-| Test.java:5813:38:5813:39 | in : TreeMap [<map.value>] : String | Test.java:5813:10:5813:55 | lazySortedMap(...) : LazySortedMap [<map.value>] : String | provenance | MaD:316 |
+| Test.java:5813:38:5813:39 | in : TreeMap [<map.value>] : String | Test.java:5813:10:5813:55 | lazySortedMap(...) : LazySortedMap [<map.value>] : String | provenance | MaD:318 |
 | Test.java:5814:21:5814:23 | out : LazySortedMap [<map.value>] : String | Test.java:232:20:232:31 | map : LazySortedMap [<map.value>] : String | provenance |  |
-| Test.java:5814:21:5814:23 | out : LazySortedMap [<map.value>] : String | Test.java:5814:9:5814:24 | getMapValue(...) | provenance | MaD:9 |
+| Test.java:5814:21:5814:23 | out : LazySortedMap [<map.value>] : String | Test.java:5814:9:5814:24 | getMapValue(...) | provenance | MaD:17 |
 | Test.java:5819:13:5819:42 | of(...) : Map [<map.key>] : String | Test.java:5820:24:5820:25 | in : Map [<map.key>] : String | provenance |  |
-| Test.java:5819:20:5819:35 | (...)... : String | Test.java:5819:13:5819:42 | of(...) : Map [<map.key>] : String | provenance | MaD:11 |
+| Test.java:5819:20:5819:35 | (...)... : String | Test.java:5819:13:5819:42 | of(...) : Map [<map.key>] : String | provenance | MaD:13 |
 | Test.java:5819:28:5819:35 | source(...) : Object | Test.java:5819:20:5819:35 | (...)... : String | provenance |  |
 | Test.java:5820:10:5820:26 | new LinkedMap<>(...) : LinkedMap [<map.key>] : String | Test.java:5821:19:5821:21 | out : LinkedMap [<map.key>] : String | provenance |  |
-| Test.java:5820:24:5820:25 | in : Map [<map.key>] : String | Test.java:5820:10:5820:26 | new LinkedMap<>(...) : LinkedMap [<map.key>] : String | provenance | MaD:317 |
+| Test.java:5820:24:5820:25 | in : Map [<map.key>] : String | Test.java:5820:10:5820:26 | new LinkedMap<>(...) : LinkedMap [<map.key>] : String | provenance | MaD:319 |
 | Test.java:5821:19:5821:21 | out : LinkedMap [<map.key>] : String | Test.java:228:18:228:29 | map : LinkedMap [<map.key>] : String | provenance |  |
-| Test.java:5821:19:5821:21 | out : LinkedMap [<map.key>] : String | Test.java:5821:9:5821:22 | getMapKey(...) | provenance | MaD:10 |
+| Test.java:5821:19:5821:21 | out : LinkedMap [<map.key>] : String | Test.java:5821:9:5821:22 | getMapKey(...) | provenance | MaD:18 |
 | Test.java:5826:13:5826:42 | of(...) : Map [<map.value>] : String | Test.java:5827:24:5827:25 | in : Map [<map.value>] : String | provenance |  |
-| Test.java:5826:26:5826:41 | (...)... : String | Test.java:5826:13:5826:42 | of(...) : Map [<map.value>] : String | provenance | MaD:12 |
+| Test.java:5826:26:5826:41 | (...)... : String | Test.java:5826:13:5826:42 | of(...) : Map [<map.value>] : String | provenance | MaD:14 |
 | Test.java:5826:34:5826:41 | source(...) : Object | Test.java:5826:26:5826:41 | (...)... : String | provenance |  |
 | Test.java:5827:10:5827:26 | new LinkedMap<>(...) : LinkedMap [<map.value>] : String | Test.java:5828:21:5828:23 | out : LinkedMap [<map.value>] : String | provenance |  |
-| Test.java:5827:24:5827:25 | in : Map [<map.value>] : String | Test.java:5827:10:5827:26 | new LinkedMap<>(...) : LinkedMap [<map.value>] : String | provenance | MaD:318 |
+| Test.java:5827:24:5827:25 | in : Map [<map.value>] : String | Test.java:5827:10:5827:26 | new LinkedMap<>(...) : LinkedMap [<map.value>] : String | provenance | MaD:320 |
 | Test.java:5828:21:5828:23 | out : LinkedMap [<map.value>] : String | Test.java:232:20:232:31 | map : LinkedMap [<map.value>] : String | provenance |  |
-| Test.java:5828:21:5828:23 | out : LinkedMap [<map.value>] : String | Test.java:5828:9:5828:24 | getMapValue(...) | provenance | MaD:9 |
+| Test.java:5828:21:5828:23 | out : LinkedMap [<map.value>] : String | Test.java:5828:9:5828:24 | getMapValue(...) | provenance | MaD:17 |
 | Test.java:5833:19:5833:58 | newLinkedMapWithMapKey(...) : LinkedMap [<map.key>] : String | Test.java:5834:10:5834:11 | in : LinkedMap [<map.key>] : String | provenance |  |
 | Test.java:5833:42:5833:57 | (...)... : String | Test.java:276:49:276:53 | key : String | provenance |  |
-| Test.java:5833:42:5833:57 | (...)... : String | Test.java:5833:19:5833:58 | newLinkedMapWithMapKey(...) : LinkedMap [<map.key>] : String | provenance | MaD:11 |
+| Test.java:5833:42:5833:57 | (...)... : String | Test.java:5833:19:5833:58 | newLinkedMapWithMapKey(...) : LinkedMap [<map.key>] : String | provenance | MaD:13 |
 | Test.java:5833:50:5833:57 | source(...) : Object | Test.java:5833:42:5833:57 | (...)... : String | provenance |  |
-| Test.java:5834:10:5834:11 | in : LinkedMap [<map.key>] : String | Test.java:5834:10:5834:20 | asList(...) : List [<element>] : String | provenance | MaD:319 |
+| Test.java:5834:10:5834:11 | in : LinkedMap [<map.key>] : String | Test.java:5834:10:5834:20 | asList(...) : List [<element>] : String | provenance | MaD:321 |
 | Test.java:5834:10:5834:20 | asList(...) : List [<element>] : String | Test.java:5835:20:5835:22 | out : List [<element>] : String | provenance |  |
 | Test.java:5835:20:5835:22 | out : List [<element>] : String | Test.java:230:19:230:32 | it : List [<element>] : String | provenance |  |
-| Test.java:5835:20:5835:22 | out : List [<element>] : String | Test.java:5835:9:5835:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:5835:20:5835:22 | out : List [<element>] : String | Test.java:5835:9:5835:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:5840:19:5840:58 | newLinkedMapWithMapKey(...) : LinkedMap [<map.key>] : String | Test.java:5841:10:5841:11 | in : LinkedMap [<map.key>] : String | provenance |  |
 | Test.java:5840:42:5840:57 | (...)... : String | Test.java:276:49:276:53 | key : String | provenance |  |
-| Test.java:5840:42:5840:57 | (...)... : String | Test.java:5840:19:5840:58 | newLinkedMapWithMapKey(...) : LinkedMap [<map.key>] : String | provenance | MaD:11 |
+| Test.java:5840:42:5840:57 | (...)... : String | Test.java:5840:19:5840:58 | newLinkedMapWithMapKey(...) : LinkedMap [<map.key>] : String | provenance | MaD:13 |
 | Test.java:5840:50:5840:57 | source(...) : Object | Test.java:5840:42:5840:57 | (...)... : String | provenance |  |
-| Test.java:5841:10:5841:11 | in : LinkedMap [<map.key>] : String | Test.java:5841:10:5841:18 | get(...) : String | provenance | MaD:320 |
+| Test.java:5841:10:5841:11 | in : LinkedMap [<map.key>] : String | Test.java:5841:10:5841:18 | get(...) : String | provenance | MaD:322 |
 | Test.java:5841:10:5841:18 | get(...) : String | Test.java:5842:9:5842:11 | out | provenance |  |
 | Test.java:5847:19:5847:60 | newLinkedMapWithMapValue(...) : LinkedMap [<map.value>] : String | Test.java:5848:10:5848:11 | in : LinkedMap [<map.value>] : String | provenance |  |
 | Test.java:5847:44:5847:59 | (...)... : String | Test.java:295:51:295:57 | value : String | provenance |  |
-| Test.java:5847:44:5847:59 | (...)... : String | Test.java:5847:19:5847:60 | newLinkedMapWithMapValue(...) : LinkedMap [<map.value>] : String | provenance | MaD:12 |
+| Test.java:5847:44:5847:59 | (...)... : String | Test.java:5847:19:5847:60 | newLinkedMapWithMapValue(...) : LinkedMap [<map.value>] : String | provenance | MaD:14 |
 | Test.java:5847:52:5847:59 | source(...) : Object | Test.java:5847:44:5847:59 | (...)... : String | provenance |  |
-| Test.java:5848:10:5848:11 | in : LinkedMap [<map.value>] : String | Test.java:5848:10:5848:23 | getValue(...) : String | provenance | MaD:321 |
+| Test.java:5848:10:5848:11 | in : LinkedMap [<map.value>] : String | Test.java:5848:10:5848:23 | getValue(...) : String | provenance | MaD:323 |
 | Test.java:5848:10:5848:23 | getValue(...) : String | Test.java:5849:9:5849:11 | out | provenance |  |
 | Test.java:5854:19:5854:60 | newLinkedMapWithMapValue(...) : LinkedMap [<map.value>] : String | Test.java:5855:10:5855:11 | in : LinkedMap [<map.value>] : String | provenance |  |
 | Test.java:5854:44:5854:59 | (...)... : String | Test.java:295:51:295:57 | value : String | provenance |  |
-| Test.java:5854:44:5854:59 | (...)... : String | Test.java:5854:19:5854:60 | newLinkedMapWithMapValue(...) : LinkedMap [<map.value>] : String | provenance | MaD:12 |
+| Test.java:5854:44:5854:59 | (...)... : String | Test.java:5854:19:5854:60 | newLinkedMapWithMapValue(...) : LinkedMap [<map.value>] : String | provenance | MaD:14 |
 | Test.java:5854:52:5854:59 | source(...) : Object | Test.java:5854:44:5854:59 | (...)... : String | provenance |  |
-| Test.java:5855:10:5855:11 | in : LinkedMap [<map.value>] : String | Test.java:5855:10:5855:21 | remove(...) : String | provenance | MaD:322 |
+| Test.java:5855:10:5855:11 | in : LinkedMap [<map.value>] : String | Test.java:5855:10:5855:21 | remove(...) : String | provenance | MaD:324 |
 | Test.java:5855:10:5855:21 | remove(...) : String | Test.java:5856:9:5856:11 | out | provenance |  |
 | Test.java:5861:24:5861:68 | newListOrderedMapWithMapKey(...) : ListOrderedMap [<map.key>] : String | Test.java:5862:10:5862:11 | in : ListOrderedMap [<map.key>] : String | provenance |  |
 | Test.java:5861:52:5861:67 | (...)... : String | Test.java:277:59:277:63 | key : String | provenance |  |
-| Test.java:5861:52:5861:67 | (...)... : String | Test.java:5861:24:5861:68 | newListOrderedMapWithMapKey(...) : ListOrderedMap [<map.key>] : String | provenance | MaD:11 |
+| Test.java:5861:52:5861:67 | (...)... : String | Test.java:5861:24:5861:68 | newListOrderedMapWithMapKey(...) : ListOrderedMap [<map.key>] : String | provenance | MaD:13 |
 | Test.java:5861:60:5861:67 | source(...) : Object | Test.java:5861:52:5861:67 | (...)... : String | provenance |  |
-| Test.java:5862:10:5862:11 | in : ListOrderedMap [<map.key>] : String | Test.java:5862:10:5862:20 | asList(...) : List [<element>] : String | provenance | MaD:323 |
+| Test.java:5862:10:5862:11 | in : ListOrderedMap [<map.key>] : String | Test.java:5862:10:5862:20 | asList(...) : List [<element>] : String | provenance | MaD:325 |
 | Test.java:5862:10:5862:20 | asList(...) : List [<element>] : String | Test.java:5863:20:5863:22 | out : List [<element>] : String | provenance |  |
 | Test.java:5863:20:5863:22 | out : List [<element>] : String | Test.java:230:19:230:32 | it : List [<element>] : String | provenance |  |
-| Test.java:5863:20:5863:22 | out : List [<element>] : String | Test.java:5863:9:5863:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:5863:20:5863:22 | out : List [<element>] : String | Test.java:5863:9:5863:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:5868:24:5868:60 | newListOrderedMapWithMapKey(...) : ListOrderedMap [<map.key>] : Object | Test.java:5869:10:5869:11 | in : ListOrderedMap [<map.key>] : Object | provenance |  |
 | Test.java:5868:52:5868:59 | source(...) : Object | Test.java:277:59:277:63 | key : Object | provenance |  |
-| Test.java:5868:52:5868:59 | source(...) : Object | Test.java:5868:24:5868:60 | newListOrderedMapWithMapKey(...) : ListOrderedMap [<map.key>] : Object | provenance | MaD:11 |
-| Test.java:5869:10:5869:11 | in : ListOrderedMap [<map.key>] : Object | Test.java:5869:10:5869:18 | get(...) : Object | provenance | MaD:324 |
+| Test.java:5868:52:5868:59 | source(...) : Object | Test.java:5868:24:5868:60 | newListOrderedMapWithMapKey(...) : ListOrderedMap [<map.key>] : Object | provenance | MaD:13 |
+| Test.java:5869:10:5869:11 | in : ListOrderedMap [<map.key>] : Object | Test.java:5869:10:5869:18 | get(...) : Object | provenance | MaD:326 |
 | Test.java:5869:10:5869:18 | get(...) : Object | Test.java:5870:9:5870:11 | out | provenance |  |
 | Test.java:5875:24:5875:62 | newListOrderedMapWithMapValue(...) : ListOrderedMap [<map.value>] : Object | Test.java:5876:10:5876:11 | in : ListOrderedMap [<map.value>] : Object | provenance |  |
 | Test.java:5875:54:5875:61 | source(...) : Object | Test.java:296:61:296:67 | value : Object | provenance |  |
-| Test.java:5875:54:5875:61 | source(...) : Object | Test.java:5875:24:5875:62 | newListOrderedMapWithMapValue(...) : ListOrderedMap [<map.value>] : Object | provenance | MaD:12 |
-| Test.java:5876:10:5876:11 | in : ListOrderedMap [<map.value>] : Object | Test.java:5876:10:5876:23 | getValue(...) : Object | provenance | MaD:325 |
+| Test.java:5875:54:5875:61 | source(...) : Object | Test.java:5875:24:5875:62 | newListOrderedMapWithMapValue(...) : ListOrderedMap [<map.value>] : Object | provenance | MaD:14 |
+| Test.java:5876:10:5876:11 | in : ListOrderedMap [<map.value>] : Object | Test.java:5876:10:5876:23 | getValue(...) : Object | provenance | MaD:327 |
 | Test.java:5876:10:5876:23 | getValue(...) : Object | Test.java:5877:9:5877:11 | out | provenance |  |
 | Test.java:5882:24:5882:68 | newListOrderedMapWithMapKey(...) : ListOrderedMap [<map.key>] : String | Test.java:5883:10:5883:11 | in : ListOrderedMap [<map.key>] : String | provenance |  |
 | Test.java:5882:52:5882:67 | (...)... : String | Test.java:277:59:277:63 | key : String | provenance |  |
-| Test.java:5882:52:5882:67 | (...)... : String | Test.java:5882:24:5882:68 | newListOrderedMapWithMapKey(...) : ListOrderedMap [<map.key>] : String | provenance | MaD:11 |
+| Test.java:5882:52:5882:67 | (...)... : String | Test.java:5882:24:5882:68 | newListOrderedMapWithMapKey(...) : ListOrderedMap [<map.key>] : String | provenance | MaD:13 |
 | Test.java:5882:60:5882:67 | source(...) : Object | Test.java:5882:52:5882:67 | (...)... : String | provenance |  |
-| Test.java:5883:10:5883:11 | in : ListOrderedMap [<map.key>] : String | Test.java:5883:10:5883:21 | keyList(...) : List [<element>] : String | provenance | MaD:326 |
+| Test.java:5883:10:5883:11 | in : ListOrderedMap [<map.key>] : String | Test.java:5883:10:5883:21 | keyList(...) : List [<element>] : String | provenance | MaD:328 |
 | Test.java:5883:10:5883:21 | keyList(...) : List [<element>] : String | Test.java:5884:20:5884:22 | out : List [<element>] : String | provenance |  |
 | Test.java:5884:20:5884:22 | out : List [<element>] : String | Test.java:230:19:230:32 | it : List [<element>] : String | provenance |  |
-| Test.java:5884:20:5884:22 | out : List [<element>] : String | Test.java:5884:9:5884:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:5884:20:5884:22 | out : List [<element>] : String | Test.java:5884:9:5884:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:5889:13:5889:42 | of(...) : Map [<map.key>] : String | Test.java:5890:40:5890:41 | in : Map [<map.key>] : String | provenance |  |
-| Test.java:5889:20:5889:35 | (...)... : String | Test.java:5889:13:5889:42 | of(...) : Map [<map.key>] : String | provenance | MaD:11 |
+| Test.java:5889:20:5889:35 | (...)... : String | Test.java:5889:13:5889:42 | of(...) : Map [<map.key>] : String | provenance | MaD:13 |
 | Test.java:5889:28:5889:35 | source(...) : Object | Test.java:5889:20:5889:35 | (...)... : String | provenance |  |
 | Test.java:5890:10:5890:42 | listOrderedMap(...) : ListOrderedMap [<map.key>] : String | Test.java:5891:19:5891:21 | out : ListOrderedMap [<map.key>] : String | provenance |  |
-| Test.java:5890:40:5890:41 | in : Map [<map.key>] : String | Test.java:5890:10:5890:42 | listOrderedMap(...) : ListOrderedMap [<map.key>] : String | provenance | MaD:327 |
+| Test.java:5890:40:5890:41 | in : Map [<map.key>] : String | Test.java:5890:10:5890:42 | listOrderedMap(...) : ListOrderedMap [<map.key>] : String | provenance | MaD:329 |
 | Test.java:5891:19:5891:21 | out : ListOrderedMap [<map.key>] : String | Test.java:228:18:228:29 | map : ListOrderedMap [<map.key>] : String | provenance |  |
-| Test.java:5891:19:5891:21 | out : ListOrderedMap [<map.key>] : String | Test.java:5891:9:5891:22 | getMapKey(...) | provenance | MaD:10 |
+| Test.java:5891:19:5891:21 | out : ListOrderedMap [<map.key>] : String | Test.java:5891:9:5891:22 | getMapKey(...) | provenance | MaD:18 |
 | Test.java:5896:13:5896:42 | of(...) : Map [<map.value>] : String | Test.java:5897:40:5897:41 | in : Map [<map.value>] : String | provenance |  |
-| Test.java:5896:26:5896:41 | (...)... : String | Test.java:5896:13:5896:42 | of(...) : Map [<map.value>] : String | provenance | MaD:12 |
+| Test.java:5896:26:5896:41 | (...)... : String | Test.java:5896:13:5896:42 | of(...) : Map [<map.value>] : String | provenance | MaD:14 |
 | Test.java:5896:34:5896:41 | source(...) : Object | Test.java:5896:26:5896:41 | (...)... : String | provenance |  |
 | Test.java:5897:10:5897:42 | listOrderedMap(...) : ListOrderedMap [<map.value>] : String | Test.java:5898:21:5898:23 | out : ListOrderedMap [<map.value>] : String | provenance |  |
-| Test.java:5897:40:5897:41 | in : Map [<map.value>] : String | Test.java:5897:10:5897:42 | listOrderedMap(...) : ListOrderedMap [<map.value>] : String | provenance | MaD:328 |
+| Test.java:5897:40:5897:41 | in : Map [<map.value>] : String | Test.java:5897:10:5897:42 | listOrderedMap(...) : ListOrderedMap [<map.value>] : String | provenance | MaD:330 |
 | Test.java:5898:21:5898:23 | out : ListOrderedMap [<map.value>] : String | Test.java:232:20:232:31 | map : ListOrderedMap [<map.value>] : String | provenance |  |
-| Test.java:5898:21:5898:23 | out : ListOrderedMap [<map.value>] : String | Test.java:5898:9:5898:24 | getMapValue(...) | provenance | MaD:9 |
+| Test.java:5898:21:5898:23 | out : ListOrderedMap [<map.value>] : String | Test.java:5898:9:5898:24 | getMapValue(...) | provenance | MaD:17 |
 | Test.java:5903:16:5903:23 | source(...) : Object | Test.java:5904:18:5904:19 | in : Object | provenance |  |
 | Test.java:5904:4:5904:6 | out [post update] : ListOrderedMap [<map.key>] : Object | Test.java:5905:19:5905:21 | out : ListOrderedMap [<map.key>] : Object | provenance |  |
-| Test.java:5904:18:5904:19 | in : Object | Test.java:5904:4:5904:6 | out [post update] : ListOrderedMap [<map.key>] : Object | provenance | MaD:329 |
+| Test.java:5904:18:5904:19 | in : Object | Test.java:5904:4:5904:6 | out [post update] : ListOrderedMap [<map.key>] : Object | provenance | MaD:331 |
 | Test.java:5905:19:5905:21 | out : ListOrderedMap [<map.key>] : Object | Test.java:228:18:228:29 | map : ListOrderedMap [<map.key>] : Object | provenance |  |
-| Test.java:5905:19:5905:21 | out : ListOrderedMap [<map.key>] : Object | Test.java:5905:9:5905:22 | getMapKey(...) | provenance | MaD:10 |
+| Test.java:5905:19:5905:21 | out : ListOrderedMap [<map.key>] : Object | Test.java:5905:9:5905:22 | getMapKey(...) | provenance | MaD:18 |
 | Test.java:5910:16:5910:23 | source(...) : Object | Test.java:5911:15:5911:16 | in : Object | provenance |  |
 | Test.java:5911:4:5911:6 | out [post update] : ListOrderedMap [<map.key>] : Object | Test.java:5912:19:5912:21 | out : ListOrderedMap [<map.key>] : Object | provenance |  |
-| Test.java:5911:15:5911:16 | in : Object | Test.java:5911:4:5911:6 | out [post update] : ListOrderedMap [<map.key>] : Object | provenance | MaD:329 |
+| Test.java:5911:15:5911:16 | in : Object | Test.java:5911:4:5911:6 | out [post update] : ListOrderedMap [<map.key>] : Object | provenance | MaD:331 |
 | Test.java:5912:19:5912:21 | out : ListOrderedMap [<map.key>] : Object | Test.java:228:18:228:29 | map : ListOrderedMap [<map.key>] : Object | provenance |  |
-| Test.java:5912:19:5912:21 | out : ListOrderedMap [<map.key>] : Object | Test.java:5912:9:5912:22 | getMapKey(...) | provenance | MaD:10 |
+| Test.java:5912:19:5912:21 | out : ListOrderedMap [<map.key>] : Object | Test.java:5912:9:5912:22 | getMapKey(...) | provenance | MaD:18 |
 | Test.java:5917:16:5917:23 | source(...) : Object | Test.java:5918:21:5918:22 | in : Object | provenance |  |
 | Test.java:5918:4:5918:6 | out [post update] : ListOrderedMap [<map.value>] : Object | Test.java:5919:21:5919:23 | out : ListOrderedMap [<map.value>] : Object | provenance |  |
-| Test.java:5918:21:5918:22 | in : Object | Test.java:5918:4:5918:6 | out [post update] : ListOrderedMap [<map.value>] : Object | provenance | MaD:330 |
+| Test.java:5918:21:5918:22 | in : Object | Test.java:5918:4:5918:6 | out [post update] : ListOrderedMap [<map.value>] : Object | provenance | MaD:332 |
 | Test.java:5919:21:5919:23 | out : ListOrderedMap [<map.value>] : Object | Test.java:232:20:232:31 | map : ListOrderedMap [<map.value>] : Object | provenance |  |
-| Test.java:5919:21:5919:23 | out : ListOrderedMap [<map.value>] : Object | Test.java:5919:9:5919:24 | getMapValue(...) | provenance | MaD:9 |
+| Test.java:5919:21:5919:23 | out : ListOrderedMap [<map.value>] : Object | Test.java:5919:9:5919:24 | getMapValue(...) | provenance | MaD:17 |
 | Test.java:5924:13:5924:42 | of(...) : Map [<map.key>] : String | Test.java:5925:18:5925:19 | in : Map [<map.key>] : String | provenance |  |
-| Test.java:5924:20:5924:35 | (...)... : String | Test.java:5924:13:5924:42 | of(...) : Map [<map.key>] : String | provenance | MaD:11 |
+| Test.java:5924:20:5924:35 | (...)... : String | Test.java:5924:13:5924:42 | of(...) : Map [<map.key>] : String | provenance | MaD:13 |
 | Test.java:5924:28:5924:35 | source(...) : Object | Test.java:5924:20:5924:35 | (...)... : String | provenance |  |
 | Test.java:5925:4:5925:6 | out [post update] : ListOrderedMap [<map.key>] : String | Test.java:5926:19:5926:21 | out : ListOrderedMap [<map.key>] : String | provenance |  |
-| Test.java:5925:18:5925:19 | in : Map [<map.key>] : String | Test.java:5925:4:5925:6 | out [post update] : ListOrderedMap [<map.key>] : String | provenance | MaD:331 |
+| Test.java:5925:18:5925:19 | in : Map [<map.key>] : String | Test.java:5925:4:5925:6 | out [post update] : ListOrderedMap [<map.key>] : String | provenance | MaD:333 |
 | Test.java:5926:19:5926:21 | out : ListOrderedMap [<map.key>] : String | Test.java:228:18:228:29 | map : ListOrderedMap [<map.key>] : String | provenance |  |
-| Test.java:5926:19:5926:21 | out : ListOrderedMap [<map.key>] : String | Test.java:5926:9:5926:22 | getMapKey(...) | provenance | MaD:10 |
+| Test.java:5926:19:5926:21 | out : ListOrderedMap [<map.key>] : String | Test.java:5926:9:5926:22 | getMapKey(...) | provenance | MaD:18 |
 | Test.java:5931:13:5931:42 | of(...) : Map [<map.value>] : String | Test.java:5932:18:5932:19 | in : Map [<map.value>] : String | provenance |  |
-| Test.java:5931:26:5931:41 | (...)... : String | Test.java:5931:13:5931:42 | of(...) : Map [<map.value>] : String | provenance | MaD:12 |
+| Test.java:5931:26:5931:41 | (...)... : String | Test.java:5931:13:5931:42 | of(...) : Map [<map.value>] : String | provenance | MaD:14 |
 | Test.java:5931:34:5931:41 | source(...) : Object | Test.java:5931:26:5931:41 | (...)... : String | provenance |  |
 | Test.java:5932:4:5932:6 | out [post update] : ListOrderedMap [<map.value>] : String | Test.java:5933:21:5933:23 | out : ListOrderedMap [<map.value>] : String | provenance |  |
-| Test.java:5932:18:5932:19 | in : Map [<map.value>] : String | Test.java:5932:4:5932:6 | out [post update] : ListOrderedMap [<map.value>] : String | provenance | MaD:332 |
+| Test.java:5932:18:5932:19 | in : Map [<map.value>] : String | Test.java:5932:4:5932:6 | out [post update] : ListOrderedMap [<map.value>] : String | provenance | MaD:334 |
 | Test.java:5933:21:5933:23 | out : ListOrderedMap [<map.value>] : String | Test.java:232:20:232:31 | map : ListOrderedMap [<map.value>] : String | provenance |  |
-| Test.java:5933:21:5933:23 | out : ListOrderedMap [<map.value>] : String | Test.java:5933:9:5933:24 | getMapValue(...) | provenance | MaD:9 |
+| Test.java:5933:21:5933:23 | out : ListOrderedMap [<map.value>] : String | Test.java:5933:9:5933:24 | getMapValue(...) | provenance | MaD:17 |
 | Test.java:5938:24:5938:70 | newListOrderedMapWithMapValue(...) : ListOrderedMap [<map.value>] : String | Test.java:5939:10:5939:11 | in : ListOrderedMap [<map.value>] : String | provenance |  |
 | Test.java:5938:54:5938:69 | (...)... : String | Test.java:296:61:296:67 | value : String | provenance |  |
-| Test.java:5938:54:5938:69 | (...)... : String | Test.java:5938:24:5938:70 | newListOrderedMapWithMapValue(...) : ListOrderedMap [<map.value>] : String | provenance | MaD:12 |
+| Test.java:5938:54:5938:69 | (...)... : String | Test.java:5938:24:5938:70 | newListOrderedMapWithMapValue(...) : ListOrderedMap [<map.value>] : String | provenance | MaD:14 |
 | Test.java:5938:62:5938:69 | source(...) : Object | Test.java:5938:54:5938:69 | (...)... : String | provenance |  |
-| Test.java:5939:10:5939:11 | in : ListOrderedMap [<map.value>] : String | Test.java:5939:10:5939:21 | remove(...) : String | provenance | MaD:333 |
+| Test.java:5939:10:5939:11 | in : ListOrderedMap [<map.value>] : String | Test.java:5939:10:5939:21 | remove(...) : String | provenance | MaD:335 |
 | Test.java:5939:10:5939:21 | remove(...) : String | Test.java:5940:9:5940:11 | out | provenance |  |
 | Test.java:5945:16:5945:23 | source(...) : Object | Test.java:5946:20:5946:21 | in : Object | provenance |  |
 | Test.java:5946:4:5946:6 | out [post update] : ListOrderedMap [<map.value>] : Object | Test.java:5947:21:5947:23 | out : ListOrderedMap [<map.value>] : Object | provenance |  |
-| Test.java:5946:20:5946:21 | in : Object | Test.java:5946:4:5946:6 | out [post update] : ListOrderedMap [<map.value>] : Object | provenance | MaD:334 |
+| Test.java:5946:20:5946:21 | in : Object | Test.java:5946:4:5946:6 | out [post update] : ListOrderedMap [<map.value>] : Object | provenance | MaD:336 |
 | Test.java:5947:21:5947:23 | out : ListOrderedMap [<map.value>] : Object | Test.java:232:20:232:31 | map : ListOrderedMap [<map.value>] : Object | provenance |  |
-| Test.java:5947:21:5947:23 | out : ListOrderedMap [<map.value>] : Object | Test.java:5947:9:5947:24 | getMapValue(...) | provenance | MaD:9 |
+| Test.java:5947:21:5947:23 | out : ListOrderedMap [<map.value>] : Object | Test.java:5947:9:5947:24 | getMapValue(...) | provenance | MaD:17 |
 | Test.java:5952:24:5952:70 | newListOrderedMapWithMapValue(...) : ListOrderedMap [<map.value>] : String | Test.java:5953:10:5953:11 | in : ListOrderedMap [<map.value>] : String | provenance |  |
 | Test.java:5952:54:5952:69 | (...)... : String | Test.java:296:61:296:67 | value : String | provenance |  |
-| Test.java:5952:54:5952:69 | (...)... : String | Test.java:5952:24:5952:70 | newListOrderedMapWithMapValue(...) : ListOrderedMap [<map.value>] : String | provenance | MaD:12 |
+| Test.java:5952:54:5952:69 | (...)... : String | Test.java:5952:24:5952:70 | newListOrderedMapWithMapValue(...) : ListOrderedMap [<map.value>] : String | provenance | MaD:14 |
 | Test.java:5952:62:5952:69 | source(...) : Object | Test.java:5952:54:5952:69 | (...)... : String | provenance |  |
-| Test.java:5953:10:5953:11 | in : ListOrderedMap [<map.value>] : String | Test.java:5953:10:5953:23 | valueList(...) : List [<element>] : String | provenance | MaD:335 |
+| Test.java:5953:10:5953:11 | in : ListOrderedMap [<map.value>] : String | Test.java:5953:10:5953:23 | valueList(...) : List [<element>] : String | provenance | MaD:337 |
 | Test.java:5953:10:5953:23 | valueList(...) : List [<element>] : String | Test.java:5954:20:5954:22 | out : List [<element>] : String | provenance |  |
 | Test.java:5954:20:5954:22 | out : List [<element>] : String | Test.java:230:19:230:32 | it : List [<element>] : String | provenance |  |
-| Test.java:5954:20:5954:22 | out : List [<element>] : String | Test.java:5954:9:5954:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:5954:20:5954:22 | out : List [<element>] : String | Test.java:5954:9:5954:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:5959:21:5959:56 | newMKMWithMapValue(...) : MultiKeyMap [<map.value>] : String | Test.java:5960:10:5960:11 | in : MultiKeyMap [<map.value>] : String | provenance |  |
 | Test.java:5959:40:5959:55 | (...)... : String | Test.java:297:47:297:53 | value : String | provenance |  |
-| Test.java:5959:40:5959:55 | (...)... : String | Test.java:5959:21:5959:56 | newMKMWithMapValue(...) : MultiKeyMap [<map.value>] : String | provenance | MaD:339 |
+| Test.java:5959:40:5959:55 | (...)... : String | Test.java:5959:21:5959:56 | newMKMWithMapValue(...) : MultiKeyMap [<map.value>] : String | provenance | MaD:340 |
 | Test.java:5959:48:5959:55 | source(...) : Object | Test.java:5959:40:5959:55 | (...)... : String | provenance |  |
-| Test.java:5960:10:5960:11 | in : MultiKeyMap [<map.value>] : String | Test.java:5960:10:5960:45 | get(...) : String | provenance | MaD:336 |
+| Test.java:5960:10:5960:11 | in : MultiKeyMap [<map.value>] : String | Test.java:5960:10:5960:45 | get(...) : String | provenance | MaD:338 |
 | Test.java:5960:10:5960:45 | get(...) : String | Test.java:5961:9:5961:11 | out | provenance |  |
 | Test.java:5966:21:5966:56 | newMKMWithMapValue(...) : MultiKeyMap [<map.value>] : String | Test.java:5967:10:5967:11 | in : MultiKeyMap [<map.value>] : String | provenance |  |
 | Test.java:5966:40:5966:55 | (...)... : String | Test.java:297:47:297:53 | value : String | provenance |  |
-| Test.java:5966:40:5966:55 | (...)... : String | Test.java:5966:21:5966:56 | newMKMWithMapValue(...) : MultiKeyMap [<map.value>] : String | provenance | MaD:339 |
+| Test.java:5966:40:5966:55 | (...)... : String | Test.java:5966:21:5966:56 | newMKMWithMapValue(...) : MultiKeyMap [<map.value>] : String | provenance | MaD:340 |
 | Test.java:5966:48:5966:55 | source(...) : Object | Test.java:5966:40:5966:55 | (...)... : String | provenance |  |
-| Test.java:5967:10:5967:11 | in : MultiKeyMap [<map.value>] : String | Test.java:5967:10:5967:39 | get(...) : String | provenance | MaD:336 |
+| Test.java:5967:10:5967:11 | in : MultiKeyMap [<map.value>] : String | Test.java:5967:10:5967:39 | get(...) : String | provenance | MaD:338 |
 | Test.java:5967:10:5967:39 | get(...) : String | Test.java:5968:9:5968:11 | out | provenance |  |
 | Test.java:5973:21:5973:56 | newMKMWithMapValue(...) : MultiKeyMap [<map.value>] : String | Test.java:5974:10:5974:11 | in : MultiKeyMap [<map.value>] : String | provenance |  |
 | Test.java:5973:40:5973:55 | (...)... : String | Test.java:297:47:297:53 | value : String | provenance |  |
-| Test.java:5973:40:5973:55 | (...)... : String | Test.java:5973:21:5973:56 | newMKMWithMapValue(...) : MultiKeyMap [<map.value>] : String | provenance | MaD:339 |
+| Test.java:5973:40:5973:55 | (...)... : String | Test.java:5973:21:5973:56 | newMKMWithMapValue(...) : MultiKeyMap [<map.value>] : String | provenance | MaD:340 |
 | Test.java:5973:48:5973:55 | source(...) : Object | Test.java:5973:40:5973:55 | (...)... : String | provenance |  |
-| Test.java:5974:10:5974:11 | in : MultiKeyMap [<map.value>] : String | Test.java:5974:10:5974:33 | get(...) : String | provenance | MaD:336 |
+| Test.java:5974:10:5974:11 | in : MultiKeyMap [<map.value>] : String | Test.java:5974:10:5974:33 | get(...) : String | provenance | MaD:338 |
 | Test.java:5974:10:5974:33 | get(...) : String | Test.java:5975:9:5975:11 | out | provenance |  |
 | Test.java:5980:21:5980:56 | newMKMWithMapValue(...) : MultiKeyMap [<map.value>] : String | Test.java:5981:10:5981:11 | in : MultiKeyMap [<map.value>] : String | provenance |  |
 | Test.java:5980:40:5980:55 | (...)... : String | Test.java:297:47:297:53 | value : String | provenance |  |
-| Test.java:5980:40:5980:55 | (...)... : String | Test.java:5980:21:5980:56 | newMKMWithMapValue(...) : MultiKeyMap [<map.value>] : String | provenance | MaD:339 |
+| Test.java:5980:40:5980:55 | (...)... : String | Test.java:5980:21:5980:56 | newMKMWithMapValue(...) : MultiKeyMap [<map.value>] : String | provenance | MaD:340 |
 | Test.java:5980:48:5980:55 | source(...) : Object | Test.java:5980:40:5980:55 | (...)... : String | provenance |  |
-| Test.java:5981:10:5981:11 | in : MultiKeyMap [<map.value>] : String | Test.java:5981:10:5981:27 | get(...) : String | provenance | MaD:336 |
+| Test.java:5981:10:5981:11 | in : MultiKeyMap [<map.value>] : String | Test.java:5981:10:5981:27 | get(...) : String | provenance | MaD:338 |
 | Test.java:5981:10:5981:27 | get(...) : String | Test.java:5982:9:5982:11 | out | provenance |  |
 | Test.java:5987:16:5987:31 | (...)... : String | Test.java:5988:18:5988:19 | in : String | provenance |  |
 | Test.java:5987:24:5987:31 | source(...) : Object | Test.java:5987:16:5987:31 | (...)... : String | provenance |  |
 | Test.java:5988:4:5988:6 | out [post update] : MultiKeyMap [<map.key>, <element>] : String | Test.java:5989:30:5989:32 | out : MultiKeyMap [<map.key>, <element>] : String | provenance |  |
-| Test.java:5988:18:5988:19 | in : String | Test.java:5988:4:5988:6 | out [post update] : MultiKeyMap [<map.key>, <element>] : String | provenance | MaD:338 |
+| Test.java:5988:18:5988:19 | in : String | Test.java:5988:4:5988:6 | out [post update] : MultiKeyMap [<map.key>, <element>] : String | provenance | MaD:339 |
 | Test.java:5989:20:5989:33 | getMapKey(...) : MultiKey [<element>] : String | Test.java:236:19:236:39 | container : MultiKey [<element>] : String | provenance |  |
-| Test.java:5989:20:5989:33 | getMapKey(...) : MultiKey [<element>] : String | Test.java:5989:9:5989:34 | getElement(...) | provenance | MaD:231 |
+| Test.java:5989:20:5989:33 | getMapKey(...) : MultiKey [<element>] : String | Test.java:5989:9:5989:34 | getElement(...) | provenance | MaD:233 |
 | Test.java:5989:30:5989:32 | out : MultiKeyMap [<map.key>, <element>] : String | Test.java:228:18:228:29 | map : MultiKeyMap [<map.key>, <element>] : String | provenance |  |
-| Test.java:5989:30:5989:32 | out : MultiKeyMap [<map.key>, <element>] : String | Test.java:5989:20:5989:33 | getMapKey(...) : MultiKey [<element>] : String | provenance | MaD:10 |
+| Test.java:5989:30:5989:32 | out : MultiKeyMap [<map.key>, <element>] : String | Test.java:5989:20:5989:33 | getMapKey(...) : MultiKey [<element>] : String | provenance | MaD:18 |
 | Test.java:5994:16:5994:31 | (...)... : String | Test.java:5995:12:5995:13 | in : String | provenance |  |
 | Test.java:5994:24:5994:31 | source(...) : Object | Test.java:5994:16:5994:31 | (...)... : String | provenance |  |
 | Test.java:5995:4:5995:6 | out [post update] : MultiKeyMap [<map.key>, <element>] : String | Test.java:5996:30:5996:32 | out : MultiKeyMap [<map.key>, <element>] : String | provenance |  |
-| Test.java:5995:12:5995:13 | in : String | Test.java:5995:4:5995:6 | out [post update] : MultiKeyMap [<map.key>, <element>] : String | provenance | MaD:338 |
+| Test.java:5995:12:5995:13 | in : String | Test.java:5995:4:5995:6 | out [post update] : MultiKeyMap [<map.key>, <element>] : String | provenance | MaD:339 |
 | Test.java:5996:20:5996:33 | getMapKey(...) : MultiKey [<element>] : String | Test.java:236:19:236:39 | container : MultiKey [<element>] : String | provenance |  |
-| Test.java:5996:20:5996:33 | getMapKey(...) : MultiKey [<element>] : String | Test.java:5996:9:5996:34 | getElement(...) | provenance | MaD:231 |
+| Test.java:5996:20:5996:33 | getMapKey(...) : MultiKey [<element>] : String | Test.java:5996:9:5996:34 | getElement(...) | provenance | MaD:233 |
 | Test.java:5996:30:5996:32 | out : MultiKeyMap [<map.key>, <element>] : String | Test.java:228:18:228:29 | map : MultiKeyMap [<map.key>, <element>] : String | provenance |  |
-| Test.java:5996:30:5996:32 | out : MultiKeyMap [<map.key>, <element>] : String | Test.java:5996:20:5996:33 | getMapKey(...) : MultiKey [<element>] : String | provenance | MaD:10 |
+| Test.java:5996:30:5996:32 | out : MultiKeyMap [<map.key>, <element>] : String | Test.java:5996:20:5996:33 | getMapKey(...) : MultiKey [<element>] : String | provenance | MaD:18 |
 | Test.java:6001:16:6001:31 | (...)... : String | Test.java:6002:24:6002:25 | in : String | provenance |  |
 | Test.java:6001:24:6001:31 | source(...) : Object | Test.java:6001:16:6001:31 | (...)... : String | provenance |  |
 | Test.java:6002:4:6002:6 | out [post update] : MultiKeyMap [<map.value>] : String | Test.java:6003:21:6003:23 | out : MultiKeyMap [<map.value>] : String | provenance |  |
-| Test.java:6002:24:6002:25 | in : String | Test.java:6002:4:6002:6 | out [post update] : MultiKeyMap [<map.value>] : String | provenance | MaD:339 |
+| Test.java:6002:24:6002:25 | in : String | Test.java:6002:4:6002:6 | out [post update] : MultiKeyMap [<map.value>] : String | provenance | MaD:340 |
 | Test.java:6003:21:6003:23 | out : MultiKeyMap [<map.value>] : String | Test.java:232:20:232:31 | map : MultiKeyMap [<map.value>] : String | provenance |  |
-| Test.java:6003:21:6003:23 | out : MultiKeyMap [<map.value>] : String | Test.java:6003:9:6003:24 | getMapValue(...) | provenance | MaD:9 |
+| Test.java:6003:21:6003:23 | out : MultiKeyMap [<map.value>] : String | Test.java:6003:9:6003:24 | getMapValue(...) | provenance | MaD:17 |
 | Test.java:6008:16:6008:31 | (...)... : String | Test.java:6009:24:6009:25 | in : String | provenance |  |
 | Test.java:6008:24:6008:31 | source(...) : Object | Test.java:6008:16:6008:31 | (...)... : String | provenance |  |
 | Test.java:6009:4:6009:6 | out [post update] : MultiKeyMap [<map.key>, <element>] : String | Test.java:6010:30:6010:32 | out : MultiKeyMap [<map.key>, <element>] : String | provenance |  |
-| Test.java:6009:24:6009:25 | in : String | Test.java:6009:4:6009:6 | out [post update] : MultiKeyMap [<map.key>, <element>] : String | provenance | MaD:340 |
+| Test.java:6009:24:6009:25 | in : String | Test.java:6009:4:6009:6 | out [post update] : MultiKeyMap [<map.key>, <element>] : String | provenance | MaD:341 |
 | Test.java:6010:20:6010:33 | getMapKey(...) : MultiKey [<element>] : String | Test.java:236:19:236:39 | container : MultiKey [<element>] : String | provenance |  |
-| Test.java:6010:20:6010:33 | getMapKey(...) : MultiKey [<element>] : String | Test.java:6010:9:6010:34 | getElement(...) | provenance | MaD:231 |
+| Test.java:6010:20:6010:33 | getMapKey(...) : MultiKey [<element>] : String | Test.java:6010:9:6010:34 | getElement(...) | provenance | MaD:233 |
 | Test.java:6010:30:6010:32 | out : MultiKeyMap [<map.key>, <element>] : String | Test.java:228:18:228:29 | map : MultiKeyMap [<map.key>, <element>] : String | provenance |  |
-| Test.java:6010:30:6010:32 | out : MultiKeyMap [<map.key>, <element>] : String | Test.java:6010:20:6010:33 | getMapKey(...) : MultiKey [<element>] : String | provenance | MaD:10 |
+| Test.java:6010:30:6010:32 | out : MultiKeyMap [<map.key>, <element>] : String | Test.java:6010:20:6010:33 | getMapKey(...) : MultiKey [<element>] : String | provenance | MaD:18 |
 | Test.java:6015:16:6015:31 | (...)... : String | Test.java:6016:18:6016:19 | in : String | provenance |  |
 | Test.java:6015:24:6015:31 | source(...) : Object | Test.java:6015:16:6015:31 | (...)... : String | provenance |  |
 | Test.java:6016:4:6016:6 | out [post update] : MultiKeyMap [<map.key>, <element>] : String | Test.java:6017:30:6017:32 | out : MultiKeyMap [<map.key>, <element>] : String | provenance |  |
-| Test.java:6016:18:6016:19 | in : String | Test.java:6016:4:6016:6 | out [post update] : MultiKeyMap [<map.key>, <element>] : String | provenance | MaD:340 |
+| Test.java:6016:18:6016:19 | in : String | Test.java:6016:4:6016:6 | out [post update] : MultiKeyMap [<map.key>, <element>] : String | provenance | MaD:341 |
 | Test.java:6017:20:6017:33 | getMapKey(...) : MultiKey [<element>] : String | Test.java:236:19:236:39 | container : MultiKey [<element>] : String | provenance |  |
-| Test.java:6017:20:6017:33 | getMapKey(...) : MultiKey [<element>] : String | Test.java:6017:9:6017:34 | getElement(...) | provenance | MaD:231 |
+| Test.java:6017:20:6017:33 | getMapKey(...) : MultiKey [<element>] : String | Test.java:6017:9:6017:34 | getElement(...) | provenance | MaD:233 |
 | Test.java:6017:30:6017:32 | out : MultiKeyMap [<map.key>, <element>] : String | Test.java:228:18:228:29 | map : MultiKeyMap [<map.key>, <element>] : String | provenance |  |
-| Test.java:6017:30:6017:32 | out : MultiKeyMap [<map.key>, <element>] : String | Test.java:6017:20:6017:33 | getMapKey(...) : MultiKey [<element>] : String | provenance | MaD:10 |
+| Test.java:6017:30:6017:32 | out : MultiKeyMap [<map.key>, <element>] : String | Test.java:6017:20:6017:33 | getMapKey(...) : MultiKey [<element>] : String | provenance | MaD:18 |
 | Test.java:6022:16:6022:31 | (...)... : String | Test.java:6023:12:6023:13 | in : String | provenance |  |
 | Test.java:6022:24:6022:31 | source(...) : Object | Test.java:6022:16:6022:31 | (...)... : String | provenance |  |
 | Test.java:6023:4:6023:6 | out [post update] : MultiKeyMap [<map.key>, <element>] : String | Test.java:6024:30:6024:32 | out : MultiKeyMap [<map.key>, <element>] : String | provenance |  |
-| Test.java:6023:12:6023:13 | in : String | Test.java:6023:4:6023:6 | out [post update] : MultiKeyMap [<map.key>, <element>] : String | provenance | MaD:340 |
+| Test.java:6023:12:6023:13 | in : String | Test.java:6023:4:6023:6 | out [post update] : MultiKeyMap [<map.key>, <element>] : String | provenance | MaD:341 |
 | Test.java:6024:20:6024:33 | getMapKey(...) : MultiKey [<element>] : String | Test.java:236:19:236:39 | container : MultiKey [<element>] : String | provenance |  |
-| Test.java:6024:20:6024:33 | getMapKey(...) : MultiKey [<element>] : String | Test.java:6024:9:6024:34 | getElement(...) | provenance | MaD:231 |
+| Test.java:6024:20:6024:33 | getMapKey(...) : MultiKey [<element>] : String | Test.java:6024:9:6024:34 | getElement(...) | provenance | MaD:233 |
 | Test.java:6024:30:6024:32 | out : MultiKeyMap [<map.key>, <element>] : String | Test.java:228:18:228:29 | map : MultiKeyMap [<map.key>, <element>] : String | provenance |  |
-| Test.java:6024:30:6024:32 | out : MultiKeyMap [<map.key>, <element>] : String | Test.java:6024:20:6024:33 | getMapKey(...) : MultiKey [<element>] : String | provenance | MaD:10 |
+| Test.java:6024:30:6024:32 | out : MultiKeyMap [<map.key>, <element>] : String | Test.java:6024:20:6024:33 | getMapKey(...) : MultiKey [<element>] : String | provenance | MaD:18 |
 | Test.java:6029:16:6029:31 | (...)... : String | Test.java:6030:30:6030:31 | in : String | provenance |  |
 | Test.java:6029:24:6029:31 | source(...) : Object | Test.java:6029:16:6029:31 | (...)... : String | provenance |  |
 | Test.java:6030:4:6030:6 | out [post update] : MultiKeyMap [<map.value>] : String | Test.java:6031:21:6031:23 | out : MultiKeyMap [<map.value>] : String | provenance |  |
-| Test.java:6030:30:6030:31 | in : String | Test.java:6030:4:6030:6 | out [post update] : MultiKeyMap [<map.value>] : String | provenance | MaD:341 |
+| Test.java:6030:30:6030:31 | in : String | Test.java:6030:4:6030:6 | out [post update] : MultiKeyMap [<map.value>] : String | provenance | MaD:342 |
 | Test.java:6031:21:6031:23 | out : MultiKeyMap [<map.value>] : String | Test.java:232:20:232:31 | map : MultiKeyMap [<map.value>] : String | provenance |  |
-| Test.java:6031:21:6031:23 | out : MultiKeyMap [<map.value>] : String | Test.java:6031:9:6031:24 | getMapValue(...) | provenance | MaD:9 |
+| Test.java:6031:21:6031:23 | out : MultiKeyMap [<map.value>] : String | Test.java:6031:9:6031:24 | getMapValue(...) | provenance | MaD:17 |
 | Test.java:6036:16:6036:31 | (...)... : String | Test.java:6037:30:6037:31 | in : String | provenance |  |
 | Test.java:6036:24:6036:31 | source(...) : Object | Test.java:6036:16:6036:31 | (...)... : String | provenance |  |
 | Test.java:6037:4:6037:6 | out [post update] : MultiKeyMap [<map.key>, <element>] : String | Test.java:6038:30:6038:32 | out : MultiKeyMap [<map.key>, <element>] : String | provenance |  |
-| Test.java:6037:30:6037:31 | in : String | Test.java:6037:4:6037:6 | out [post update] : MultiKeyMap [<map.key>, <element>] : String | provenance | MaD:342 |
+| Test.java:6037:30:6037:31 | in : String | Test.java:6037:4:6037:6 | out [post update] : MultiKeyMap [<map.key>, <element>] : String | provenance | MaD:343 |
 | Test.java:6038:20:6038:33 | getMapKey(...) : MultiKey [<element>] : String | Test.java:236:19:236:39 | container : MultiKey [<element>] : String | provenance |  |
-| Test.java:6038:20:6038:33 | getMapKey(...) : MultiKey [<element>] : String | Test.java:6038:9:6038:34 | getElement(...) | provenance | MaD:231 |
+| Test.java:6038:20:6038:33 | getMapKey(...) : MultiKey [<element>] : String | Test.java:6038:9:6038:34 | getElement(...) | provenance | MaD:233 |
 | Test.java:6038:30:6038:32 | out : MultiKeyMap [<map.key>, <element>] : String | Test.java:228:18:228:29 | map : MultiKeyMap [<map.key>, <element>] : String | provenance |  |
-| Test.java:6038:30:6038:32 | out : MultiKeyMap [<map.key>, <element>] : String | Test.java:6038:20:6038:33 | getMapKey(...) : MultiKey [<element>] : String | provenance | MaD:10 |
+| Test.java:6038:30:6038:32 | out : MultiKeyMap [<map.key>, <element>] : String | Test.java:6038:20:6038:33 | getMapKey(...) : MultiKey [<element>] : String | provenance | MaD:18 |
 | Test.java:6043:16:6043:31 | (...)... : String | Test.java:6044:24:6044:25 | in : String | provenance |  |
 | Test.java:6043:24:6043:31 | source(...) : Object | Test.java:6043:16:6043:31 | (...)... : String | provenance |  |
 | Test.java:6044:4:6044:6 | out [post update] : MultiKeyMap [<map.key>, <element>] : String | Test.java:6045:30:6045:32 | out : MultiKeyMap [<map.key>, <element>] : String | provenance |  |
-| Test.java:6044:24:6044:25 | in : String | Test.java:6044:4:6044:6 | out [post update] : MultiKeyMap [<map.key>, <element>] : String | provenance | MaD:342 |
+| Test.java:6044:24:6044:25 | in : String | Test.java:6044:4:6044:6 | out [post update] : MultiKeyMap [<map.key>, <element>] : String | provenance | MaD:343 |
 | Test.java:6045:20:6045:33 | getMapKey(...) : MultiKey [<element>] : String | Test.java:236:19:236:39 | container : MultiKey [<element>] : String | provenance |  |
-| Test.java:6045:20:6045:33 | getMapKey(...) : MultiKey [<element>] : String | Test.java:6045:9:6045:34 | getElement(...) | provenance | MaD:231 |
+| Test.java:6045:20:6045:33 | getMapKey(...) : MultiKey [<element>] : String | Test.java:6045:9:6045:34 | getElement(...) | provenance | MaD:233 |
 | Test.java:6045:30:6045:32 | out : MultiKeyMap [<map.key>, <element>] : String | Test.java:228:18:228:29 | map : MultiKeyMap [<map.key>, <element>] : String | provenance |  |
-| Test.java:6045:30:6045:32 | out : MultiKeyMap [<map.key>, <element>] : String | Test.java:6045:20:6045:33 | getMapKey(...) : MultiKey [<element>] : String | provenance | MaD:10 |
+| Test.java:6045:30:6045:32 | out : MultiKeyMap [<map.key>, <element>] : String | Test.java:6045:20:6045:33 | getMapKey(...) : MultiKey [<element>] : String | provenance | MaD:18 |
 | Test.java:6050:16:6050:31 | (...)... : String | Test.java:6051:18:6051:19 | in : String | provenance |  |
 | Test.java:6050:24:6050:31 | source(...) : Object | Test.java:6050:16:6050:31 | (...)... : String | provenance |  |
 | Test.java:6051:4:6051:6 | out [post update] : MultiKeyMap [<map.key>, <element>] : String | Test.java:6052:30:6052:32 | out : MultiKeyMap [<map.key>, <element>] : String | provenance |  |
-| Test.java:6051:18:6051:19 | in : String | Test.java:6051:4:6051:6 | out [post update] : MultiKeyMap [<map.key>, <element>] : String | provenance | MaD:342 |
+| Test.java:6051:18:6051:19 | in : String | Test.java:6051:4:6051:6 | out [post update] : MultiKeyMap [<map.key>, <element>] : String | provenance | MaD:343 |
 | Test.java:6052:20:6052:33 | getMapKey(...) : MultiKey [<element>] : String | Test.java:236:19:236:39 | container : MultiKey [<element>] : String | provenance |  |
-| Test.java:6052:20:6052:33 | getMapKey(...) : MultiKey [<element>] : String | Test.java:6052:9:6052:34 | getElement(...) | provenance | MaD:231 |
+| Test.java:6052:20:6052:33 | getMapKey(...) : MultiKey [<element>] : String | Test.java:6052:9:6052:34 | getElement(...) | provenance | MaD:233 |
 | Test.java:6052:30:6052:32 | out : MultiKeyMap [<map.key>, <element>] : String | Test.java:228:18:228:29 | map : MultiKeyMap [<map.key>, <element>] : String | provenance |  |
-| Test.java:6052:30:6052:32 | out : MultiKeyMap [<map.key>, <element>] : String | Test.java:6052:20:6052:33 | getMapKey(...) : MultiKey [<element>] : String | provenance | MaD:10 |
+| Test.java:6052:30:6052:32 | out : MultiKeyMap [<map.key>, <element>] : String | Test.java:6052:20:6052:33 | getMapKey(...) : MultiKey [<element>] : String | provenance | MaD:18 |
 | Test.java:6057:16:6057:31 | (...)... : String | Test.java:6058:12:6058:13 | in : String | provenance |  |
 | Test.java:6057:24:6057:31 | source(...) : Object | Test.java:6057:16:6057:31 | (...)... : String | provenance |  |
 | Test.java:6058:4:6058:6 | out [post update] : MultiKeyMap [<map.key>, <element>] : String | Test.java:6059:30:6059:32 | out : MultiKeyMap [<map.key>, <element>] : String | provenance |  |
-| Test.java:6058:12:6058:13 | in : String | Test.java:6058:4:6058:6 | out [post update] : MultiKeyMap [<map.key>, <element>] : String | provenance | MaD:342 |
+| Test.java:6058:12:6058:13 | in : String | Test.java:6058:4:6058:6 | out [post update] : MultiKeyMap [<map.key>, <element>] : String | provenance | MaD:343 |
 | Test.java:6059:20:6059:33 | getMapKey(...) : MultiKey [<element>] : String | Test.java:236:19:236:39 | container : MultiKey [<element>] : String | provenance |  |
-| Test.java:6059:20:6059:33 | getMapKey(...) : MultiKey [<element>] : String | Test.java:6059:9:6059:34 | getElement(...) | provenance | MaD:231 |
+| Test.java:6059:20:6059:33 | getMapKey(...) : MultiKey [<element>] : String | Test.java:6059:9:6059:34 | getElement(...) | provenance | MaD:233 |
 | Test.java:6059:30:6059:32 | out : MultiKeyMap [<map.key>, <element>] : String | Test.java:228:18:228:29 | map : MultiKeyMap [<map.key>, <element>] : String | provenance |  |
-| Test.java:6059:30:6059:32 | out : MultiKeyMap [<map.key>, <element>] : String | Test.java:6059:20:6059:33 | getMapKey(...) : MultiKey [<element>] : String | provenance | MaD:10 |
+| Test.java:6059:30:6059:32 | out : MultiKeyMap [<map.key>, <element>] : String | Test.java:6059:20:6059:33 | getMapKey(...) : MultiKey [<element>] : String | provenance | MaD:18 |
 | Test.java:6064:16:6064:31 | (...)... : String | Test.java:6065:36:6065:37 | in : String | provenance |  |
 | Test.java:6064:24:6064:31 | source(...) : Object | Test.java:6064:16:6064:31 | (...)... : String | provenance |  |
 | Test.java:6065:4:6065:6 | out [post update] : MultiKeyMap [<map.value>] : String | Test.java:6066:21:6066:23 | out : MultiKeyMap [<map.value>] : String | provenance |  |
-| Test.java:6065:36:6065:37 | in : String | Test.java:6065:4:6065:6 | out [post update] : MultiKeyMap [<map.value>] : String | provenance | MaD:343 |
+| Test.java:6065:36:6065:37 | in : String | Test.java:6065:4:6065:6 | out [post update] : MultiKeyMap [<map.value>] : String | provenance | MaD:344 |
 | Test.java:6066:21:6066:23 | out : MultiKeyMap [<map.value>] : String | Test.java:232:20:232:31 | map : MultiKeyMap [<map.value>] : String | provenance |  |
-| Test.java:6066:21:6066:23 | out : MultiKeyMap [<map.value>] : String | Test.java:6066:9:6066:24 | getMapValue(...) | provenance | MaD:9 |
+| Test.java:6066:21:6066:23 | out : MultiKeyMap [<map.value>] : String | Test.java:6066:9:6066:24 | getMapValue(...) | provenance | MaD:17 |
 | Test.java:6071:16:6071:31 | (...)... : String | Test.java:6072:36:6072:37 | in : String | provenance |  |
 | Test.java:6071:24:6071:31 | source(...) : Object | Test.java:6071:16:6071:31 | (...)... : String | provenance |  |
 | Test.java:6072:4:6072:6 | out [post update] : MultiKeyMap [<map.key>, <element>] : String | Test.java:6073:30:6073:32 | out : MultiKeyMap [<map.key>, <element>] : String | provenance |  |
-| Test.java:6072:36:6072:37 | in : String | Test.java:6072:4:6072:6 | out [post update] : MultiKeyMap [<map.key>, <element>] : String | provenance | MaD:344 |
+| Test.java:6072:36:6072:37 | in : String | Test.java:6072:4:6072:6 | out [post update] : MultiKeyMap [<map.key>, <element>] : String | provenance | MaD:345 |
 | Test.java:6073:20:6073:33 | getMapKey(...) : MultiKey [<element>] : String | Test.java:236:19:236:39 | container : MultiKey [<element>] : String | provenance |  |
-| Test.java:6073:20:6073:33 | getMapKey(...) : MultiKey [<element>] : String | Test.java:6073:9:6073:34 | getElement(...) | provenance | MaD:231 |
+| Test.java:6073:20:6073:33 | getMapKey(...) : MultiKey [<element>] : String | Test.java:6073:9:6073:34 | getElement(...) | provenance | MaD:233 |
 | Test.java:6073:30:6073:32 | out : MultiKeyMap [<map.key>, <element>] : String | Test.java:228:18:228:29 | map : MultiKeyMap [<map.key>, <element>] : String | provenance |  |
-| Test.java:6073:30:6073:32 | out : MultiKeyMap [<map.key>, <element>] : String | Test.java:6073:20:6073:33 | getMapKey(...) : MultiKey [<element>] : String | provenance | MaD:10 |
+| Test.java:6073:30:6073:32 | out : MultiKeyMap [<map.key>, <element>] : String | Test.java:6073:20:6073:33 | getMapKey(...) : MultiKey [<element>] : String | provenance | MaD:18 |
 | Test.java:6078:16:6078:31 | (...)... : String | Test.java:6079:30:6079:31 | in : String | provenance |  |
 | Test.java:6078:24:6078:31 | source(...) : Object | Test.java:6078:16:6078:31 | (...)... : String | provenance |  |
 | Test.java:6079:4:6079:6 | out [post update] : MultiKeyMap [<map.key>, <element>] : String | Test.java:6080:30:6080:32 | out : MultiKeyMap [<map.key>, <element>] : String | provenance |  |
-| Test.java:6079:30:6079:31 | in : String | Test.java:6079:4:6079:6 | out [post update] : MultiKeyMap [<map.key>, <element>] : String | provenance | MaD:344 |
+| Test.java:6079:30:6079:31 | in : String | Test.java:6079:4:6079:6 | out [post update] : MultiKeyMap [<map.key>, <element>] : String | provenance | MaD:345 |
 | Test.java:6080:20:6080:33 | getMapKey(...) : MultiKey [<element>] : String | Test.java:236:19:236:39 | container : MultiKey [<element>] : String | provenance |  |
-| Test.java:6080:20:6080:33 | getMapKey(...) : MultiKey [<element>] : String | Test.java:6080:9:6080:34 | getElement(...) | provenance | MaD:231 |
+| Test.java:6080:20:6080:33 | getMapKey(...) : MultiKey [<element>] : String | Test.java:6080:9:6080:34 | getElement(...) | provenance | MaD:233 |
 | Test.java:6080:30:6080:32 | out : MultiKeyMap [<map.key>, <element>] : String | Test.java:228:18:228:29 | map : MultiKeyMap [<map.key>, <element>] : String | provenance |  |
-| Test.java:6080:30:6080:32 | out : MultiKeyMap [<map.key>, <element>] : String | Test.java:6080:20:6080:33 | getMapKey(...) : MultiKey [<element>] : String | provenance | MaD:10 |
+| Test.java:6080:30:6080:32 | out : MultiKeyMap [<map.key>, <element>] : String | Test.java:6080:20:6080:33 | getMapKey(...) : MultiKey [<element>] : String | provenance | MaD:18 |
 | Test.java:6085:16:6085:31 | (...)... : String | Test.java:6086:24:6086:25 | in : String | provenance |  |
 | Test.java:6085:24:6085:31 | source(...) : Object | Test.java:6085:16:6085:31 | (...)... : String | provenance |  |
 | Test.java:6086:4:6086:6 | out [post update] : MultiKeyMap [<map.key>, <element>] : String | Test.java:6087:30:6087:32 | out : MultiKeyMap [<map.key>, <element>] : String | provenance |  |
-| Test.java:6086:24:6086:25 | in : String | Test.java:6086:4:6086:6 | out [post update] : MultiKeyMap [<map.key>, <element>] : String | provenance | MaD:344 |
+| Test.java:6086:24:6086:25 | in : String | Test.java:6086:4:6086:6 | out [post update] : MultiKeyMap [<map.key>, <element>] : String | provenance | MaD:345 |
 | Test.java:6087:20:6087:33 | getMapKey(...) : MultiKey [<element>] : String | Test.java:236:19:236:39 | container : MultiKey [<element>] : String | provenance |  |
-| Test.java:6087:20:6087:33 | getMapKey(...) : MultiKey [<element>] : String | Test.java:6087:9:6087:34 | getElement(...) | provenance | MaD:231 |
+| Test.java:6087:20:6087:33 | getMapKey(...) : MultiKey [<element>] : String | Test.java:6087:9:6087:34 | getElement(...) | provenance | MaD:233 |
 | Test.java:6087:30:6087:32 | out : MultiKeyMap [<map.key>, <element>] : String | Test.java:228:18:228:29 | map : MultiKeyMap [<map.key>, <element>] : String | provenance |  |
-| Test.java:6087:30:6087:32 | out : MultiKeyMap [<map.key>, <element>] : String | Test.java:6087:20:6087:33 | getMapKey(...) : MultiKey [<element>] : String | provenance | MaD:10 |
+| Test.java:6087:30:6087:32 | out : MultiKeyMap [<map.key>, <element>] : String | Test.java:6087:20:6087:33 | getMapKey(...) : MultiKey [<element>] : String | provenance | MaD:18 |
 | Test.java:6092:16:6092:31 | (...)... : String | Test.java:6093:18:6093:19 | in : String | provenance |  |
 | Test.java:6092:24:6092:31 | source(...) : Object | Test.java:6092:16:6092:31 | (...)... : String | provenance |  |
 | Test.java:6093:4:6093:6 | out [post update] : MultiKeyMap [<map.key>, <element>] : String | Test.java:6094:30:6094:32 | out : MultiKeyMap [<map.key>, <element>] : String | provenance |  |
-| Test.java:6093:18:6093:19 | in : String | Test.java:6093:4:6093:6 | out [post update] : MultiKeyMap [<map.key>, <element>] : String | provenance | MaD:344 |
+| Test.java:6093:18:6093:19 | in : String | Test.java:6093:4:6093:6 | out [post update] : MultiKeyMap [<map.key>, <element>] : String | provenance | MaD:345 |
 | Test.java:6094:20:6094:33 | getMapKey(...) : MultiKey [<element>] : String | Test.java:236:19:236:39 | container : MultiKey [<element>] : String | provenance |  |
-| Test.java:6094:20:6094:33 | getMapKey(...) : MultiKey [<element>] : String | Test.java:6094:9:6094:34 | getElement(...) | provenance | MaD:231 |
+| Test.java:6094:20:6094:33 | getMapKey(...) : MultiKey [<element>] : String | Test.java:6094:9:6094:34 | getElement(...) | provenance | MaD:233 |
 | Test.java:6094:30:6094:32 | out : MultiKeyMap [<map.key>, <element>] : String | Test.java:228:18:228:29 | map : MultiKeyMap [<map.key>, <element>] : String | provenance |  |
-| Test.java:6094:30:6094:32 | out : MultiKeyMap [<map.key>, <element>] : String | Test.java:6094:20:6094:33 | getMapKey(...) : MultiKey [<element>] : String | provenance | MaD:10 |
+| Test.java:6094:30:6094:32 | out : MultiKeyMap [<map.key>, <element>] : String | Test.java:6094:20:6094:33 | getMapKey(...) : MultiKey [<element>] : String | provenance | MaD:18 |
 | Test.java:6099:16:6099:31 | (...)... : String | Test.java:6100:12:6100:13 | in : String | provenance |  |
 | Test.java:6099:24:6099:31 | source(...) : Object | Test.java:6099:16:6099:31 | (...)... : String | provenance |  |
 | Test.java:6100:4:6100:6 | out [post update] : MultiKeyMap [<map.key>, <element>] : String | Test.java:6101:30:6101:32 | out : MultiKeyMap [<map.key>, <element>] : String | provenance |  |
-| Test.java:6100:12:6100:13 | in : String | Test.java:6100:4:6100:6 | out [post update] : MultiKeyMap [<map.key>, <element>] : String | provenance | MaD:344 |
+| Test.java:6100:12:6100:13 | in : String | Test.java:6100:4:6100:6 | out [post update] : MultiKeyMap [<map.key>, <element>] : String | provenance | MaD:345 |
 | Test.java:6101:20:6101:33 | getMapKey(...) : MultiKey [<element>] : String | Test.java:236:19:236:39 | container : MultiKey [<element>] : String | provenance |  |
-| Test.java:6101:20:6101:33 | getMapKey(...) : MultiKey [<element>] : String | Test.java:6101:9:6101:34 | getElement(...) | provenance | MaD:231 |
+| Test.java:6101:20:6101:33 | getMapKey(...) : MultiKey [<element>] : String | Test.java:6101:9:6101:34 | getElement(...) | provenance | MaD:233 |
 | Test.java:6101:30:6101:32 | out : MultiKeyMap [<map.key>, <element>] : String | Test.java:228:18:228:29 | map : MultiKeyMap [<map.key>, <element>] : String | provenance |  |
-| Test.java:6101:30:6101:32 | out : MultiKeyMap [<map.key>, <element>] : String | Test.java:6101:20:6101:33 | getMapKey(...) : MultiKey [<element>] : String | provenance | MaD:10 |
+| Test.java:6101:30:6101:32 | out : MultiKeyMap [<map.key>, <element>] : String | Test.java:6101:20:6101:33 | getMapKey(...) : MultiKey [<element>] : String | provenance | MaD:18 |
 | Test.java:6106:16:6106:31 | (...)... : String | Test.java:6107:42:6107:43 | in : String | provenance |  |
 | Test.java:6106:24:6106:31 | source(...) : Object | Test.java:6106:16:6106:31 | (...)... : String | provenance |  |
 | Test.java:6107:4:6107:6 | out [post update] : MultiKeyMap [<map.value>] : String | Test.java:6108:21:6108:23 | out : MultiKeyMap [<map.value>] : String | provenance |  |
-| Test.java:6107:42:6107:43 | in : String | Test.java:6107:4:6107:6 | out [post update] : MultiKeyMap [<map.value>] : String | provenance | MaD:345 |
+| Test.java:6107:42:6107:43 | in : String | Test.java:6107:4:6107:6 | out [post update] : MultiKeyMap [<map.value>] : String | provenance | MaD:346 |
 | Test.java:6108:21:6108:23 | out : MultiKeyMap [<map.value>] : String | Test.java:232:20:232:31 | map : MultiKeyMap [<map.value>] : String | provenance |  |
-| Test.java:6108:21:6108:23 | out : MultiKeyMap [<map.value>] : String | Test.java:6108:9:6108:24 | getMapValue(...) | provenance | MaD:9 |
+| Test.java:6108:21:6108:23 | out : MultiKeyMap [<map.value>] : String | Test.java:6108:9:6108:24 | getMapValue(...) | provenance | MaD:17 |
 | Test.java:6113:21:6113:56 | newMKMWithMapValue(...) : MultiKeyMap [<map.value>] : String | Test.java:6114:10:6114:11 | in : MultiKeyMap [<map.value>] : String | provenance |  |
 | Test.java:6113:40:6113:55 | (...)... : String | Test.java:297:47:297:53 | value : String | provenance |  |
-| Test.java:6113:40:6113:55 | (...)... : String | Test.java:6113:21:6113:56 | newMKMWithMapValue(...) : MultiKeyMap [<map.value>] : String | provenance | MaD:339 |
+| Test.java:6113:40:6113:55 | (...)... : String | Test.java:6113:21:6113:56 | newMKMWithMapValue(...) : MultiKeyMap [<map.value>] : String | provenance | MaD:340 |
 | Test.java:6113:48:6113:55 | source(...) : Object | Test.java:6113:40:6113:55 | (...)... : String | provenance |  |
-| Test.java:6114:10:6114:11 | in : MultiKeyMap [<map.value>] : String | Test.java:6114:10:6114:51 | put(...) : String | provenance | MaD:337 |
+| Test.java:6114:10:6114:11 | in : MultiKeyMap [<map.value>] : String | Test.java:6114:10:6114:51 | put(...) : String | provenance | MaD:347 |
 | Test.java:6114:10:6114:51 | put(...) : String | Test.java:6115:9:6115:11 | out | provenance |  |
 | Test.java:6120:21:6120:56 | newMKMWithMapValue(...) : MultiKeyMap [<map.value>] : String | Test.java:6121:10:6121:11 | in : MultiKeyMap [<map.value>] : String | provenance |  |
 | Test.java:6120:40:6120:55 | (...)... : String | Test.java:297:47:297:53 | value : String | provenance |  |
-| Test.java:6120:40:6120:55 | (...)... : String | Test.java:6120:21:6120:56 | newMKMWithMapValue(...) : MultiKeyMap [<map.value>] : String | provenance | MaD:339 |
+| Test.java:6120:40:6120:55 | (...)... : String | Test.java:6120:21:6120:56 | newMKMWithMapValue(...) : MultiKeyMap [<map.value>] : String | provenance | MaD:340 |
 | Test.java:6120:48:6120:55 | source(...) : Object | Test.java:6120:40:6120:55 | (...)... : String | provenance |  |
-| Test.java:6121:10:6121:11 | in : MultiKeyMap [<map.value>] : String | Test.java:6121:10:6121:45 | put(...) : String | provenance | MaD:337 |
+| Test.java:6121:10:6121:11 | in : MultiKeyMap [<map.value>] : String | Test.java:6121:10:6121:45 | put(...) : String | provenance | MaD:347 |
 | Test.java:6121:10:6121:45 | put(...) : String | Test.java:6122:9:6122:11 | out | provenance |  |
 | Test.java:6127:21:6127:56 | newMKMWithMapValue(...) : MultiKeyMap [<map.value>] : String | Test.java:6128:10:6128:11 | in : MultiKeyMap [<map.value>] : String | provenance |  |
 | Test.java:6127:40:6127:55 | (...)... : String | Test.java:297:47:297:53 | value : String | provenance |  |
-| Test.java:6127:40:6127:55 | (...)... : String | Test.java:6127:21:6127:56 | newMKMWithMapValue(...) : MultiKeyMap [<map.value>] : String | provenance | MaD:339 |
+| Test.java:6127:40:6127:55 | (...)... : String | Test.java:6127:21:6127:56 | newMKMWithMapValue(...) : MultiKeyMap [<map.value>] : String | provenance | MaD:340 |
 | Test.java:6127:48:6127:55 | source(...) : Object | Test.java:6127:40:6127:55 | (...)... : String | provenance |  |
-| Test.java:6128:10:6128:11 | in : MultiKeyMap [<map.value>] : String | Test.java:6128:10:6128:39 | put(...) : String | provenance | MaD:337 |
+| Test.java:6128:10:6128:11 | in : MultiKeyMap [<map.value>] : String | Test.java:6128:10:6128:39 | put(...) : String | provenance | MaD:347 |
 | Test.java:6128:10:6128:39 | put(...) : String | Test.java:6129:9:6129:11 | out | provenance |  |
 | Test.java:6134:21:6134:56 | newMKMWithMapValue(...) : MultiKeyMap [<map.value>] : String | Test.java:6135:10:6135:11 | in : MultiKeyMap [<map.value>] : String | provenance |  |
 | Test.java:6134:40:6134:55 | (...)... : String | Test.java:297:47:297:53 | value : String | provenance |  |
-| Test.java:6134:40:6134:55 | (...)... : String | Test.java:6134:21:6134:56 | newMKMWithMapValue(...) : MultiKeyMap [<map.value>] : String | provenance | MaD:339 |
+| Test.java:6134:40:6134:55 | (...)... : String | Test.java:6134:21:6134:56 | newMKMWithMapValue(...) : MultiKeyMap [<map.value>] : String | provenance | MaD:340 |
 | Test.java:6134:48:6134:55 | source(...) : Object | Test.java:6134:40:6134:55 | (...)... : String | provenance |  |
-| Test.java:6135:10:6135:11 | in : MultiKeyMap [<map.value>] : String | Test.java:6135:10:6135:33 | put(...) : String | provenance | MaD:337 |
+| Test.java:6135:10:6135:11 | in : MultiKeyMap [<map.value>] : String | Test.java:6135:10:6135:33 | put(...) : String | provenance | MaD:347 |
 | Test.java:6135:10:6135:33 | put(...) : String | Test.java:6136:9:6136:11 | out | provenance |  |
 | Test.java:6141:21:6141:56 | newMKMWithMapValue(...) : MultiKeyMap [<map.value>] : String | Test.java:6142:10:6142:11 | in : MultiKeyMap [<map.value>] : String | provenance |  |
 | Test.java:6141:40:6141:55 | (...)... : String | Test.java:297:47:297:53 | value : String | provenance |  |
-| Test.java:6141:40:6141:55 | (...)... : String | Test.java:6141:21:6141:56 | newMKMWithMapValue(...) : MultiKeyMap [<map.value>] : String | provenance | MaD:339 |
+| Test.java:6141:40:6141:55 | (...)... : String | Test.java:6141:21:6141:56 | newMKMWithMapValue(...) : MultiKeyMap [<map.value>] : String | provenance | MaD:340 |
 | Test.java:6141:48:6141:55 | source(...) : Object | Test.java:6141:40:6141:55 | (...)... : String | provenance |  |
-| Test.java:6142:10:6142:11 | in : MultiKeyMap [<map.value>] : String | Test.java:6142:10:6142:27 | put(...) : String | provenance | MaD:13 |
-| Test.java:6142:10:6142:11 | in : MultiKeyMap [<map.value>] : String | Test.java:6142:10:6142:27 | put(...) : String | provenance | MaD:337 |
-| Test.java:6142:10:6142:11 | in : MultiKeyMap [<map.value>] : String | Test.java:6142:10:6142:27 | put(...) : String | provenance | MaD:704 |
+| Test.java:6142:10:6142:11 | in : MultiKeyMap [<map.value>] : String | Test.java:6142:10:6142:27 | put(...) : String | provenance | MaD:21 |
+| Test.java:6142:10:6142:11 | in : MultiKeyMap [<map.value>] : String | Test.java:6142:10:6142:27 | put(...) : String | provenance | MaD:347 |
+| Test.java:6142:10:6142:11 | in : MultiKeyMap [<map.value>] : String | Test.java:6142:10:6142:27 | put(...) : String | provenance | MaD:781 |
 | Test.java:6142:10:6142:27 | put(...) : String | Test.java:6143:9:6143:11 | out | provenance |  |
 | Test.java:6148:21:6148:56 | newMKMWithMapValue(...) : MultiKeyMap [<map.value>] : String | Test.java:6149:10:6149:11 | in : MultiKeyMap [<map.value>] : String | provenance |  |
 | Test.java:6148:40:6148:55 | (...)... : String | Test.java:297:47:297:53 | value : String | provenance |  |
-| Test.java:6148:40:6148:55 | (...)... : String | Test.java:6148:21:6148:56 | newMKMWithMapValue(...) : MultiKeyMap [<map.value>] : String | provenance | MaD:339 |
+| Test.java:6148:40:6148:55 | (...)... : String | Test.java:6148:21:6148:56 | newMKMWithMapValue(...) : MultiKeyMap [<map.value>] : String | provenance | MaD:340 |
 | Test.java:6148:48:6148:55 | source(...) : Object | Test.java:6148:40:6148:55 | (...)... : String | provenance |  |
-| Test.java:6149:10:6149:11 | in : MultiKeyMap [<map.value>] : String | Test.java:6149:10:6149:56 | removeMultiKey(...) : String | provenance | MaD:346 |
+| Test.java:6149:10:6149:11 | in : MultiKeyMap [<map.value>] : String | Test.java:6149:10:6149:56 | removeMultiKey(...) : String | provenance | MaD:348 |
 | Test.java:6149:10:6149:56 | removeMultiKey(...) : String | Test.java:6150:9:6150:11 | out | provenance |  |
 | Test.java:6155:21:6155:56 | newMKMWithMapValue(...) : MultiKeyMap [<map.value>] : String | Test.java:6156:10:6156:11 | in : MultiKeyMap [<map.value>] : String | provenance |  |
 | Test.java:6155:40:6155:55 | (...)... : String | Test.java:297:47:297:53 | value : String | provenance |  |
-| Test.java:6155:40:6155:55 | (...)... : String | Test.java:6155:21:6155:56 | newMKMWithMapValue(...) : MultiKeyMap [<map.value>] : String | provenance | MaD:339 |
+| Test.java:6155:40:6155:55 | (...)... : String | Test.java:6155:21:6155:56 | newMKMWithMapValue(...) : MultiKeyMap [<map.value>] : String | provenance | MaD:340 |
 | Test.java:6155:48:6155:55 | source(...) : Object | Test.java:6155:40:6155:55 | (...)... : String | provenance |  |
-| Test.java:6156:10:6156:11 | in : MultiKeyMap [<map.value>] : String | Test.java:6156:10:6156:50 | removeMultiKey(...) : String | provenance | MaD:346 |
+| Test.java:6156:10:6156:11 | in : MultiKeyMap [<map.value>] : String | Test.java:6156:10:6156:50 | removeMultiKey(...) : String | provenance | MaD:348 |
 | Test.java:6156:10:6156:50 | removeMultiKey(...) : String | Test.java:6157:9:6157:11 | out | provenance |  |
 | Test.java:6162:21:6162:56 | newMKMWithMapValue(...) : MultiKeyMap [<map.value>] : String | Test.java:6163:10:6163:11 | in : MultiKeyMap [<map.value>] : String | provenance |  |
 | Test.java:6162:40:6162:55 | (...)... : String | Test.java:297:47:297:53 | value : String | provenance |  |
-| Test.java:6162:40:6162:55 | (...)... : String | Test.java:6162:21:6162:56 | newMKMWithMapValue(...) : MultiKeyMap [<map.value>] : String | provenance | MaD:339 |
+| Test.java:6162:40:6162:55 | (...)... : String | Test.java:6162:21:6162:56 | newMKMWithMapValue(...) : MultiKeyMap [<map.value>] : String | provenance | MaD:340 |
 | Test.java:6162:48:6162:55 | source(...) : Object | Test.java:6162:40:6162:55 | (...)... : String | provenance |  |
-| Test.java:6163:10:6163:11 | in : MultiKeyMap [<map.value>] : String | Test.java:6163:10:6163:44 | removeMultiKey(...) : String | provenance | MaD:346 |
+| Test.java:6163:10:6163:11 | in : MultiKeyMap [<map.value>] : String | Test.java:6163:10:6163:44 | removeMultiKey(...) : String | provenance | MaD:348 |
 | Test.java:6163:10:6163:44 | removeMultiKey(...) : String | Test.java:6164:9:6164:11 | out | provenance |  |
 | Test.java:6169:21:6169:56 | newMKMWithMapValue(...) : MultiKeyMap [<map.value>] : String | Test.java:6170:10:6170:11 | in : MultiKeyMap [<map.value>] : String | provenance |  |
 | Test.java:6169:40:6169:55 | (...)... : String | Test.java:297:47:297:53 | value : String | provenance |  |
-| Test.java:6169:40:6169:55 | (...)... : String | Test.java:6169:21:6169:56 | newMKMWithMapValue(...) : MultiKeyMap [<map.value>] : String | provenance | MaD:339 |
+| Test.java:6169:40:6169:55 | (...)... : String | Test.java:6169:21:6169:56 | newMKMWithMapValue(...) : MultiKeyMap [<map.value>] : String | provenance | MaD:340 |
 | Test.java:6169:48:6169:55 | source(...) : Object | Test.java:6169:40:6169:55 | (...)... : String | provenance |  |
-| Test.java:6170:10:6170:11 | in : MultiKeyMap [<map.value>] : String | Test.java:6170:10:6170:38 | removeMultiKey(...) : String | provenance | MaD:346 |
+| Test.java:6170:10:6170:11 | in : MultiKeyMap [<map.value>] : String | Test.java:6170:10:6170:38 | removeMultiKey(...) : String | provenance | MaD:348 |
 | Test.java:6170:10:6170:38 | removeMultiKey(...) : String | Test.java:6171:9:6171:11 | out | provenance |  |
 | Test.java:6176:23:6176:58 | newMVMWithMapValue(...) : MultiValueMap [<map.value>, <element>] : String | Test.java:6177:10:6177:11 | in : MultiValueMap [<map.value>, <element>] : String | provenance |  |
 | Test.java:6176:23:6176:58 | newMVMWithMapValue(...) : MultiValueMap [<map.value>] : String | Test.java:6177:10:6177:11 | in : MultiValueMap [<map.value>] : String | provenance |  |
 | Test.java:6176:42:6176:57 | (...)... : String | Test.java:298:49:298:55 | value : String | provenance |  |
-| Test.java:6176:42:6176:57 | (...)... : String | Test.java:6176:23:6176:58 | newMVMWithMapValue(...) : MultiValueMap [<map.value>, <element>] : String | provenance | MaD:662 |
-| Test.java:6176:42:6176:57 | (...)... : String | Test.java:6176:23:6176:58 | newMVMWithMapValue(...) : MultiValueMap [<map.value>] : String | provenance | MaD:15 |
-| Test.java:6176:42:6176:57 | (...)... : String | Test.java:6176:23:6176:58 | newMVMWithMapValue(...) : MultiValueMap [<map.value>] : String | provenance | MaD:706 |
+| Test.java:6176:42:6176:57 | (...)... : String | Test.java:6176:23:6176:58 | newMVMWithMapValue(...) : MultiValueMap [<map.value>, <element>] : String | provenance | MaD:737 |
+| Test.java:6176:42:6176:57 | (...)... : String | Test.java:6176:23:6176:58 | newMVMWithMapValue(...) : MultiValueMap [<map.value>] : String | provenance | MaD:20 |
+| Test.java:6176:42:6176:57 | (...)... : String | Test.java:6176:23:6176:58 | newMVMWithMapValue(...) : MultiValueMap [<map.value>] : String | provenance | MaD:780 |
 | Test.java:6176:50:6176:57 | source(...) : Object | Test.java:6176:42:6176:57 | (...)... : String | provenance |  |
-| Test.java:6177:10:6177:11 | in : MultiValueMap [<map.value>, <element>] : String | Test.java:6177:10:6177:31 | getCollection(...) : Collection [<element>] : String | provenance | MaD:347 |
-| Test.java:6177:10:6177:11 | in : MultiValueMap [<map.value>] : String | Test.java:6177:10:6177:31 | getCollection(...) : Collection [<element>] : Object | provenance | MaD:347 |
+| Test.java:6177:10:6177:11 | in : MultiValueMap [<map.value>, <element>] : String | Test.java:6177:10:6177:31 | getCollection(...) : Collection [<element>] : String | provenance | MaD:349 |
+| Test.java:6177:10:6177:11 | in : MultiValueMap [<map.value>] : String | Test.java:6177:10:6177:31 | getCollection(...) : Collection [<element>] : Object | provenance | MaD:349 |
 | Test.java:6177:10:6177:31 | getCollection(...) : Collection [<element>] : Object | Test.java:6178:20:6178:22 | out : Collection [<element>] : Object | provenance |  |
 | Test.java:6177:10:6177:31 | getCollection(...) : Collection [<element>] : String | Test.java:6178:20:6178:22 | out : Collection [<element>] : String | provenance |  |
 | Test.java:6178:20:6178:22 | out : Collection [<element>] : Object | Test.java:230:19:230:32 | it : Collection [<element>] : Object | provenance |  |
-| Test.java:6178:20:6178:22 | out : Collection [<element>] : Object | Test.java:6178:9:6178:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:6178:20:6178:22 | out : Collection [<element>] : Object | Test.java:6178:9:6178:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:6178:20:6178:22 | out : Collection [<element>] : String | Test.java:230:19:230:32 | it : Collection [<element>] : String | provenance |  |
-| Test.java:6178:20:6178:22 | out : Collection [<element>] : String | Test.java:6178:9:6178:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:6178:20:6178:22 | out : Collection [<element>] : String | Test.java:6178:9:6178:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:6183:38:6183:73 | newMVMWithMapValue(...) : MultiValueMap [<map.value>, <element>] : String | Test.java:6184:10:6184:11 | in : MultiValueMap [<map.value>, <element>] : String | provenance |  |
 | Test.java:6183:38:6183:73 | newMVMWithMapValue(...) : MultiValueMap [<map.value>] : String | Test.java:6184:10:6184:11 | in : MultiValueMap [<map.value>] : String | provenance |  |
 | Test.java:6183:57:6183:72 | (...)... : String | Test.java:298:49:298:55 | value : String | provenance |  |
-| Test.java:6183:57:6183:72 | (...)... : String | Test.java:6183:38:6183:73 | newMVMWithMapValue(...) : MultiValueMap [<map.value>, <element>] : String | provenance | MaD:662 |
-| Test.java:6183:57:6183:72 | (...)... : String | Test.java:6183:38:6183:73 | newMVMWithMapValue(...) : MultiValueMap [<map.value>] : String | provenance | MaD:15 |
-| Test.java:6183:57:6183:72 | (...)... : String | Test.java:6183:38:6183:73 | newMVMWithMapValue(...) : MultiValueMap [<map.value>] : String | provenance | MaD:706 |
+| Test.java:6183:57:6183:72 | (...)... : String | Test.java:6183:38:6183:73 | newMVMWithMapValue(...) : MultiValueMap [<map.value>, <element>] : String | provenance | MaD:737 |
+| Test.java:6183:57:6183:72 | (...)... : String | Test.java:6183:38:6183:73 | newMVMWithMapValue(...) : MultiValueMap [<map.value>] : String | provenance | MaD:20 |
+| Test.java:6183:57:6183:72 | (...)... : String | Test.java:6183:38:6183:73 | newMVMWithMapValue(...) : MultiValueMap [<map.value>] : String | provenance | MaD:780 |
 | Test.java:6183:65:6183:72 | source(...) : Object | Test.java:6183:57:6183:72 | (...)... : String | provenance |  |
-| Test.java:6184:10:6184:11 | in : MultiValueMap [<map.value>, <element>] : String | Test.java:6184:10:6184:22 | iterator(...) : Iterator [<element>, <map.value>] : String | provenance | MaD:349 |
-| Test.java:6184:10:6184:11 | in : MultiValueMap [<map.value>] : String | Test.java:6184:10:6184:22 | iterator(...) : Iterator [<element>, <map.value>] : Object | provenance | MaD:349 |
+| Test.java:6184:10:6184:11 | in : MultiValueMap [<map.value>, <element>] : String | Test.java:6184:10:6184:22 | iterator(...) : Iterator [<element>, <map.value>] : String | provenance | MaD:351 |
+| Test.java:6184:10:6184:11 | in : MultiValueMap [<map.value>] : String | Test.java:6184:10:6184:22 | iterator(...) : Iterator [<element>, <map.value>] : Object | provenance | MaD:351 |
 | Test.java:6184:10:6184:22 | iterator(...) : Iterator [<element>, <map.value>] : Object | Test.java:6185:41:6185:43 | out : Iterator [<element>, <map.value>] : Object | provenance |  |
 | Test.java:6184:10:6184:22 | iterator(...) : Iterator [<element>, <map.value>] : String | Test.java:6185:41:6185:43 | out : Iterator [<element>, <map.value>] : String | provenance |  |
 | Test.java:6185:30:6185:44 | getElement(...) : Entry [<map.value>] : Object | Test.java:244:29:244:52 | container : Entry [<map.value>] : Object | provenance |  |
-| Test.java:6185:30:6185:44 | getElement(...) : Entry [<map.value>] : Object | Test.java:6185:9:6185:45 | getMapValueFromEntry(...) | provenance | MaD:21 |
+| Test.java:6185:30:6185:44 | getElement(...) : Entry [<map.value>] : Object | Test.java:6185:9:6185:45 | getMapValueFromEntry(...) | provenance | MaD:10 |
 | Test.java:6185:30:6185:44 | getElement(...) : Entry [<map.value>] : String | Test.java:244:29:244:52 | container : Entry [<map.value>] : String | provenance |  |
-| Test.java:6185:30:6185:44 | getElement(...) : Entry [<map.value>] : String | Test.java:6185:9:6185:45 | getMapValueFromEntry(...) | provenance | MaD:21 |
+| Test.java:6185:30:6185:44 | getElement(...) : Entry [<map.value>] : String | Test.java:6185:9:6185:45 | getMapValueFromEntry(...) | provenance | MaD:10 |
 | Test.java:6185:41:6185:43 | out : Iterator [<element>, <map.value>] : Object | Test.java:231:19:231:32 | it : Iterator [<element>, <map.value>] : Object | provenance |  |
-| Test.java:6185:41:6185:43 | out : Iterator [<element>, <map.value>] : Object | Test.java:6185:30:6185:44 | getElement(...) : Entry [<map.value>] : Object | provenance | MaD:4 |
+| Test.java:6185:41:6185:43 | out : Iterator [<element>, <map.value>] : Object | Test.java:6185:30:6185:44 | getElement(...) : Entry [<map.value>] : Object | provenance | MaD:6 |
 | Test.java:6185:41:6185:43 | out : Iterator [<element>, <map.value>] : String | Test.java:231:19:231:32 | it : Iterator [<element>, <map.value>] : String | provenance |  |
-| Test.java:6185:41:6185:43 | out : Iterator [<element>, <map.value>] : String | Test.java:6185:30:6185:44 | getElement(...) : Entry [<map.value>] : String | provenance | MaD:4 |
+| Test.java:6185:41:6185:43 | out : Iterator [<element>, <map.value>] : String | Test.java:6185:30:6185:44 | getElement(...) : Entry [<map.value>] : String | provenance | MaD:6 |
 | Test.java:6190:38:6190:71 | newMVMWithMapKey(...) : MultiValueMap [<map.key>] : String | Test.java:6191:10:6191:11 | in : MultiValueMap [<map.key>] : String | provenance |  |
 | Test.java:6190:55:6190:70 | (...)... : String | Test.java:279:47:279:51 | key : String | provenance |  |
-| Test.java:6190:55:6190:70 | (...)... : String | Test.java:6190:38:6190:71 | newMVMWithMapKey(...) : MultiValueMap [<map.key>] : String | provenance | MaD:14 |
-| Test.java:6190:55:6190:70 | (...)... : String | Test.java:6190:38:6190:71 | newMVMWithMapKey(...) : MultiValueMap [<map.key>] : String | provenance | MaD:661 |
-| Test.java:6190:55:6190:70 | (...)... : String | Test.java:6190:38:6190:71 | newMVMWithMapKey(...) : MultiValueMap [<map.key>] : String | provenance | MaD:705 |
+| Test.java:6190:55:6190:70 | (...)... : String | Test.java:6190:38:6190:71 | newMVMWithMapKey(...) : MultiValueMap [<map.key>] : String | provenance | MaD:19 |
+| Test.java:6190:55:6190:70 | (...)... : String | Test.java:6190:38:6190:71 | newMVMWithMapKey(...) : MultiValueMap [<map.key>] : String | provenance | MaD:736 |
+| Test.java:6190:55:6190:70 | (...)... : String | Test.java:6190:38:6190:71 | newMVMWithMapKey(...) : MultiValueMap [<map.key>] : String | provenance | MaD:779 |
 | Test.java:6190:63:6190:70 | source(...) : Object | Test.java:6190:55:6190:70 | (...)... : String | provenance |  |
-| Test.java:6191:10:6191:11 | in : MultiValueMap [<map.key>] : String | Test.java:6191:10:6191:22 | iterator(...) : Iterator [<element>, <map.key>] : String | provenance | MaD:348 |
+| Test.java:6191:10:6191:11 | in : MultiValueMap [<map.key>] : String | Test.java:6191:10:6191:22 | iterator(...) : Iterator [<element>, <map.key>] : String | provenance | MaD:350 |
 | Test.java:6191:10:6191:22 | iterator(...) : Iterator [<element>, <map.key>] : String | Test.java:6192:39:6192:41 | out : Iterator [<element>, <map.key>] : String | provenance |  |
 | Test.java:6192:28:6192:42 | getElement(...) : Entry [<map.key>] : String | Test.java:238:27:238:50 | container : Entry [<map.key>] : String | provenance |  |
-| Test.java:6192:28:6192:42 | getElement(...) : Entry [<map.key>] : String | Test.java:6192:9:6192:43 | getMapKeyFromEntry(...) | provenance | MaD:20 |
+| Test.java:6192:28:6192:42 | getElement(...) : Entry [<map.key>] : String | Test.java:6192:9:6192:43 | getMapKeyFromEntry(...) | provenance | MaD:9 |
 | Test.java:6192:39:6192:41 | out : Iterator [<element>, <map.key>] : String | Test.java:231:19:231:32 | it : Iterator [<element>, <map.key>] : String | provenance |  |
-| Test.java:6192:39:6192:41 | out : Iterator [<element>, <map.key>] : String | Test.java:6192:28:6192:42 | getElement(...) : Entry [<map.key>] : String | provenance | MaD:4 |
+| Test.java:6192:39:6192:41 | out : Iterator [<element>, <map.key>] : String | Test.java:6192:28:6192:42 | getElement(...) : Entry [<map.key>] : String | provenance | MaD:6 |
 | Test.java:6197:38:6197:73 | newMVMWithMapValue(...) : MultiValueMap [<map.value>, <element>] : String | Test.java:6198:10:6198:11 | in : MultiValueMap [<map.value>, <element>] : String | provenance |  |
 | Test.java:6197:38:6197:73 | newMVMWithMapValue(...) : MultiValueMap [<map.value>] : String | Test.java:6198:10:6198:11 | in : MultiValueMap [<map.value>] : String | provenance |  |
 | Test.java:6197:57:6197:72 | (...)... : String | Test.java:298:49:298:55 | value : String | provenance |  |
-| Test.java:6197:57:6197:72 | (...)... : String | Test.java:6197:38:6197:73 | newMVMWithMapValue(...) : MultiValueMap [<map.value>, <element>] : String | provenance | MaD:662 |
-| Test.java:6197:57:6197:72 | (...)... : String | Test.java:6197:38:6197:73 | newMVMWithMapValue(...) : MultiValueMap [<map.value>] : String | provenance | MaD:15 |
-| Test.java:6197:57:6197:72 | (...)... : String | Test.java:6197:38:6197:73 | newMVMWithMapValue(...) : MultiValueMap [<map.value>] : String | provenance | MaD:706 |
+| Test.java:6197:57:6197:72 | (...)... : String | Test.java:6197:38:6197:73 | newMVMWithMapValue(...) : MultiValueMap [<map.value>, <element>] : String | provenance | MaD:737 |
+| Test.java:6197:57:6197:72 | (...)... : String | Test.java:6197:38:6197:73 | newMVMWithMapValue(...) : MultiValueMap [<map.value>] : String | provenance | MaD:20 |
+| Test.java:6197:57:6197:72 | (...)... : String | Test.java:6197:38:6197:73 | newMVMWithMapValue(...) : MultiValueMap [<map.value>] : String | provenance | MaD:780 |
 | Test.java:6197:65:6197:72 | source(...) : Object | Test.java:6197:57:6197:72 | (...)... : String | provenance |  |
-| Test.java:6198:10:6198:11 | in : MultiValueMap [<map.value>, <element>] : String | Test.java:6198:10:6198:26 | iterator(...) : Iterator [<element>] : String | provenance | MaD:350 |
-| Test.java:6198:10:6198:11 | in : MultiValueMap [<map.value>] : String | Test.java:6198:10:6198:26 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:350 |
+| Test.java:6198:10:6198:11 | in : MultiValueMap [<map.value>, <element>] : String | Test.java:6198:10:6198:26 | iterator(...) : Iterator [<element>] : String | provenance | MaD:352 |
+| Test.java:6198:10:6198:11 | in : MultiValueMap [<map.value>] : String | Test.java:6198:10:6198:26 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:352 |
 | Test.java:6198:10:6198:26 | iterator(...) : Iterator [<element>] : Object | Test.java:6199:20:6199:22 | out : Iterator [<element>] : Object | provenance |  |
 | Test.java:6198:10:6198:26 | iterator(...) : Iterator [<element>] : String | Test.java:6199:20:6199:22 | out : Iterator [<element>] : String | provenance |  |
 | Test.java:6199:20:6199:22 | out : Iterator [<element>] : Object | Test.java:231:19:231:32 | it : Iterator [<element>] : Object | provenance |  |
-| Test.java:6199:20:6199:22 | out : Iterator [<element>] : Object | Test.java:6199:9:6199:23 | getElement(...) | provenance | MaD:4 |
+| Test.java:6199:20:6199:22 | out : Iterator [<element>] : Object | Test.java:6199:9:6199:23 | getElement(...) | provenance | MaD:6 |
 | Test.java:6199:20:6199:22 | out : Iterator [<element>] : String | Test.java:231:19:231:32 | it : Iterator [<element>] : String | provenance |  |
-| Test.java:6199:20:6199:22 | out : Iterator [<element>] : String | Test.java:6199:9:6199:23 | getElement(...) | provenance | MaD:4 |
+| Test.java:6199:20:6199:22 | out : Iterator [<element>] : String | Test.java:6199:9:6199:23 | getElement(...) | provenance | MaD:6 |
 | Test.java:6204:13:6204:64 | of(...) : Map [<map.value>, <element>] : String | Test.java:6205:38:6205:39 | in : Map [<map.value>, <element>] : String | provenance |  |
-| Test.java:6204:26:6204:63 | newVectorWithElement(...) : Vector [<element>] : String | Test.java:6204:13:6204:64 | of(...) : Map [<map.value>, <element>] : String | provenance | MaD:12 |
+| Test.java:6204:26:6204:63 | newVectorWithElement(...) : Vector [<element>] : String | Test.java:6204:13:6204:64 | of(...) : Map [<map.value>, <element>] : String | provenance | MaD:14 |
 | Test.java:6204:47:6204:62 | (...)... : String | Test.java:269:37:269:45 | element : String | provenance |  |
-| Test.java:6204:47:6204:62 | (...)... : String | Test.java:6204:26:6204:63 | newVectorWithElement(...) : Vector [<element>] : String | provenance | MaD:2 |
+| Test.java:6204:47:6204:62 | (...)... : String | Test.java:6204:26:6204:63 | newVectorWithElement(...) : Vector [<element>] : String | provenance | MaD:4 |
 | Test.java:6204:55:6204:62 | source(...) : Object | Test.java:6204:47:6204:62 | (...)... : String | provenance |  |
 | Test.java:6205:10:6205:55 | multiValueMap(...) : MultiValueMap [<map.value>, <element>] : String | Test.java:6206:44:6206:46 | out : MultiValueMap [<map.value>, <element>] : String | provenance |  |
-| Test.java:6205:38:6205:39 | in : Map [<map.value>, <element>] : String | Test.java:6205:10:6205:55 | multiValueMap(...) : MultiValueMap [<map.value>, <element>] : String | provenance | MaD:352 |
+| Test.java:6205:38:6205:39 | in : Map [<map.value>, <element>] : String | Test.java:6205:10:6205:55 | multiValueMap(...) : MultiValueMap [<map.value>, <element>] : String | provenance | MaD:354 |
 | Test.java:6206:20:6206:47 | (...)... : Collection [<element>] : String | Test.java:230:19:230:32 | it : Collection [<element>] : String | provenance |  |
-| Test.java:6206:20:6206:47 | (...)... : Collection [<element>] : String | Test.java:6206:9:6206:48 | getElement(...) | provenance | MaD:1 |
+| Test.java:6206:20:6206:47 | (...)... : Collection [<element>] : String | Test.java:6206:9:6206:48 | getElement(...) | provenance | MaD:3 |
 | Test.java:6206:32:6206:47 | getMapValue(...) : Object [<element>] : String | Test.java:6206:20:6206:47 | (...)... : Collection [<element>] : String | provenance |  |
 | Test.java:6206:44:6206:46 | out : MultiValueMap [<map.value>, <element>] : String | Test.java:232:20:232:31 | map : MultiValueMap [<map.value>, <element>] : String | provenance |  |
-| Test.java:6206:44:6206:46 | out : MultiValueMap [<map.value>, <element>] : String | Test.java:6206:32:6206:47 | getMapValue(...) : Object [<element>] : String | provenance | MaD:9 |
+| Test.java:6206:44:6206:46 | out : MultiValueMap [<map.value>, <element>] : String | Test.java:6206:32:6206:47 | getMapValue(...) : Object [<element>] : String | provenance | MaD:17 |
 | Test.java:6211:13:6211:64 | of(...) : Map [<map.value>, <element>] : String | Test.java:6212:38:6212:39 | in : Map [<map.value>, <element>] : String | provenance |  |
-| Test.java:6211:26:6211:63 | newVectorWithElement(...) : Vector [<element>] : String | Test.java:6211:13:6211:64 | of(...) : Map [<map.value>, <element>] : String | provenance | MaD:12 |
+| Test.java:6211:26:6211:63 | newVectorWithElement(...) : Vector [<element>] : String | Test.java:6211:13:6211:64 | of(...) : Map [<map.value>, <element>] : String | provenance | MaD:14 |
 | Test.java:6211:47:6211:62 | (...)... : String | Test.java:269:37:269:45 | element : String | provenance |  |
-| Test.java:6211:47:6211:62 | (...)... : String | Test.java:6211:26:6211:63 | newVectorWithElement(...) : Vector [<element>] : String | provenance | MaD:2 |
+| Test.java:6211:47:6211:62 | (...)... : String | Test.java:6211:26:6211:63 | newVectorWithElement(...) : Vector [<element>] : String | provenance | MaD:4 |
 | Test.java:6211:55:6211:62 | source(...) : Object | Test.java:6211:47:6211:62 | (...)... : String | provenance |  |
 | Test.java:6212:10:6212:53 | multiValueMap(...) : MultiValueMap [<map.value>, <element>] : String | Test.java:6213:44:6213:46 | out : MultiValueMap [<map.value>, <element>] : String | provenance |  |
-| Test.java:6212:38:6212:39 | in : Map [<map.value>, <element>] : String | Test.java:6212:10:6212:53 | multiValueMap(...) : MultiValueMap [<map.value>, <element>] : String | provenance | MaD:352 |
+| Test.java:6212:38:6212:39 | in : Map [<map.value>, <element>] : String | Test.java:6212:10:6212:53 | multiValueMap(...) : MultiValueMap [<map.value>, <element>] : String | provenance | MaD:354 |
 | Test.java:6213:20:6213:47 | (...)... : Collection [<element>] : String | Test.java:230:19:230:32 | it : Collection [<element>] : String | provenance |  |
-| Test.java:6213:20:6213:47 | (...)... : Collection [<element>] : String | Test.java:6213:9:6213:48 | getElement(...) | provenance | MaD:1 |
+| Test.java:6213:20:6213:47 | (...)... : Collection [<element>] : String | Test.java:6213:9:6213:48 | getElement(...) | provenance | MaD:3 |
 | Test.java:6213:32:6213:47 | getMapValue(...) : Object [<element>] : String | Test.java:6213:20:6213:47 | (...)... : Collection [<element>] : String | provenance |  |
 | Test.java:6213:44:6213:46 | out : MultiValueMap [<map.value>, <element>] : String | Test.java:232:20:232:31 | map : MultiValueMap [<map.value>, <element>] : String | provenance |  |
-| Test.java:6213:44:6213:46 | out : MultiValueMap [<map.value>, <element>] : String | Test.java:6213:32:6213:47 | getMapValue(...) : Object [<element>] : String | provenance | MaD:9 |
+| Test.java:6213:44:6213:46 | out : MultiValueMap [<map.value>, <element>] : String | Test.java:6213:32:6213:47 | getMapValue(...) : Object [<element>] : String | provenance | MaD:17 |
 | Test.java:6218:13:6218:64 | of(...) : Map [<map.value>, <element>] : String | Test.java:6219:38:6219:39 | in : Map [<map.value>, <element>] : String | provenance |  |
-| Test.java:6218:26:6218:63 | newVectorWithElement(...) : Vector [<element>] : String | Test.java:6218:13:6218:64 | of(...) : Map [<map.value>, <element>] : String | provenance | MaD:12 |
+| Test.java:6218:26:6218:63 | newVectorWithElement(...) : Vector [<element>] : String | Test.java:6218:13:6218:64 | of(...) : Map [<map.value>, <element>] : String | provenance | MaD:14 |
 | Test.java:6218:47:6218:62 | (...)... : String | Test.java:269:37:269:45 | element : String | provenance |  |
-| Test.java:6218:47:6218:62 | (...)... : String | Test.java:6218:26:6218:63 | newVectorWithElement(...) : Vector [<element>] : String | provenance | MaD:2 |
+| Test.java:6218:47:6218:62 | (...)... : String | Test.java:6218:26:6218:63 | newVectorWithElement(...) : Vector [<element>] : String | provenance | MaD:4 |
 | Test.java:6218:55:6218:62 | source(...) : Object | Test.java:6218:47:6218:62 | (...)... : String | provenance |  |
 | Test.java:6219:10:6219:40 | multiValueMap(...) : MultiValueMap [<map.value>, <element>] : String | Test.java:6220:44:6220:46 | out : MultiValueMap [<map.value>, <element>] : String | provenance |  |
-| Test.java:6219:38:6219:39 | in : Map [<map.value>, <element>] : String | Test.java:6219:10:6219:40 | multiValueMap(...) : MultiValueMap [<map.value>, <element>] : String | provenance | MaD:352 |
+| Test.java:6219:38:6219:39 | in : Map [<map.value>, <element>] : String | Test.java:6219:10:6219:40 | multiValueMap(...) : MultiValueMap [<map.value>, <element>] : String | provenance | MaD:354 |
 | Test.java:6220:20:6220:47 | (...)... : Collection [<element>] : String | Test.java:230:19:230:32 | it : Collection [<element>] : String | provenance |  |
-| Test.java:6220:20:6220:47 | (...)... : Collection [<element>] : String | Test.java:6220:9:6220:48 | getElement(...) | provenance | MaD:1 |
+| Test.java:6220:20:6220:47 | (...)... : Collection [<element>] : String | Test.java:6220:9:6220:48 | getElement(...) | provenance | MaD:3 |
 | Test.java:6220:32:6220:47 | getMapValue(...) : Object [<element>] : String | Test.java:6220:20:6220:47 | (...)... : Collection [<element>] : String | provenance |  |
 | Test.java:6220:44:6220:46 | out : MultiValueMap [<map.value>, <element>] : String | Test.java:232:20:232:31 | map : MultiValueMap [<map.value>, <element>] : String | provenance |  |
-| Test.java:6220:44:6220:46 | out : MultiValueMap [<map.value>, <element>] : String | Test.java:6220:32:6220:47 | getMapValue(...) : Object [<element>] : String | provenance | MaD:9 |
+| Test.java:6220:44:6220:46 | out : MultiValueMap [<map.value>, <element>] : String | Test.java:6220:32:6220:47 | getMapValue(...) : Object [<element>] : String | provenance | MaD:17 |
 | Test.java:6225:13:6225:42 | of(...) : Map [<map.key>] : String | Test.java:6226:38:6226:39 | in : Map [<map.key>] : String | provenance |  |
-| Test.java:6225:20:6225:35 | (...)... : String | Test.java:6225:13:6225:42 | of(...) : Map [<map.key>] : String | provenance | MaD:11 |
+| Test.java:6225:20:6225:35 | (...)... : String | Test.java:6225:13:6225:42 | of(...) : Map [<map.key>] : String | provenance | MaD:13 |
 | Test.java:6225:28:6225:35 | source(...) : Object | Test.java:6225:20:6225:35 | (...)... : String | provenance |  |
 | Test.java:6226:10:6226:55 | multiValueMap(...) : MultiValueMap [<map.key>] : String | Test.java:6227:19:6227:21 | out : MultiValueMap [<map.key>] : String | provenance |  |
-| Test.java:6226:38:6226:39 | in : Map [<map.key>] : String | Test.java:6226:10:6226:55 | multiValueMap(...) : MultiValueMap [<map.key>] : String | provenance | MaD:351 |
+| Test.java:6226:38:6226:39 | in : Map [<map.key>] : String | Test.java:6226:10:6226:55 | multiValueMap(...) : MultiValueMap [<map.key>] : String | provenance | MaD:353 |
 | Test.java:6227:19:6227:21 | out : MultiValueMap [<map.key>] : String | Test.java:228:18:228:29 | map : MultiValueMap [<map.key>] : String | provenance |  |
-| Test.java:6227:19:6227:21 | out : MultiValueMap [<map.key>] : String | Test.java:6227:9:6227:22 | getMapKey(...) | provenance | MaD:10 |
+| Test.java:6227:19:6227:21 | out : MultiValueMap [<map.key>] : String | Test.java:6227:9:6227:22 | getMapKey(...) | provenance | MaD:18 |
 | Test.java:6232:13:6232:42 | of(...) : Map [<map.key>] : String | Test.java:6233:38:6233:39 | in : Map [<map.key>] : String | provenance |  |
-| Test.java:6232:20:6232:35 | (...)... : String | Test.java:6232:13:6232:42 | of(...) : Map [<map.key>] : String | provenance | MaD:11 |
+| Test.java:6232:20:6232:35 | (...)... : String | Test.java:6232:13:6232:42 | of(...) : Map [<map.key>] : String | provenance | MaD:13 |
 | Test.java:6232:28:6232:35 | source(...) : Object | Test.java:6232:20:6232:35 | (...)... : String | provenance |  |
 | Test.java:6233:10:6233:53 | multiValueMap(...) : MultiValueMap [<map.key>] : String | Test.java:6234:19:6234:21 | out : MultiValueMap [<map.key>] : String | provenance |  |
-| Test.java:6233:38:6233:39 | in : Map [<map.key>] : String | Test.java:6233:10:6233:53 | multiValueMap(...) : MultiValueMap [<map.key>] : String | provenance | MaD:351 |
+| Test.java:6233:38:6233:39 | in : Map [<map.key>] : String | Test.java:6233:10:6233:53 | multiValueMap(...) : MultiValueMap [<map.key>] : String | provenance | MaD:353 |
 | Test.java:6234:19:6234:21 | out : MultiValueMap [<map.key>] : String | Test.java:228:18:228:29 | map : MultiValueMap [<map.key>] : String | provenance |  |
-| Test.java:6234:19:6234:21 | out : MultiValueMap [<map.key>] : String | Test.java:6234:9:6234:22 | getMapKey(...) | provenance | MaD:10 |
+| Test.java:6234:19:6234:21 | out : MultiValueMap [<map.key>] : String | Test.java:6234:9:6234:22 | getMapKey(...) | provenance | MaD:18 |
 | Test.java:6239:13:6239:42 | of(...) : Map [<map.key>] : String | Test.java:6240:38:6240:39 | in : Map [<map.key>] : String | provenance |  |
-| Test.java:6239:20:6239:35 | (...)... : String | Test.java:6239:13:6239:42 | of(...) : Map [<map.key>] : String | provenance | MaD:11 |
+| Test.java:6239:20:6239:35 | (...)... : String | Test.java:6239:13:6239:42 | of(...) : Map [<map.key>] : String | provenance | MaD:13 |
 | Test.java:6239:28:6239:35 | source(...) : Object | Test.java:6239:20:6239:35 | (...)... : String | provenance |  |
 | Test.java:6240:10:6240:40 | multiValueMap(...) : MultiValueMap [<map.key>] : String | Test.java:6241:19:6241:21 | out : MultiValueMap [<map.key>] : String | provenance |  |
-| Test.java:6240:38:6240:39 | in : Map [<map.key>] : String | Test.java:6240:10:6240:40 | multiValueMap(...) : MultiValueMap [<map.key>] : String | provenance | MaD:351 |
+| Test.java:6240:38:6240:39 | in : Map [<map.key>] : String | Test.java:6240:10:6240:40 | multiValueMap(...) : MultiValueMap [<map.key>] : String | provenance | MaD:353 |
 | Test.java:6241:19:6241:21 | out : MultiValueMap [<map.key>] : String | Test.java:228:18:228:29 | map : MultiValueMap [<map.key>] : String | provenance |  |
-| Test.java:6241:19:6241:21 | out : MultiValueMap [<map.key>] : String | Test.java:6241:9:6241:22 | getMapKey(...) | provenance | MaD:10 |
+| Test.java:6241:19:6241:21 | out : MultiValueMap [<map.key>] : String | Test.java:6241:9:6241:22 | getMapKey(...) | provenance | MaD:18 |
 | Test.java:6246:13:6246:48 | newMVMWithMapValue(...) : MultiValueMap [<map.value>, <element>] : String | Test.java:6247:15:6247:16 | in : MultiValueMap [<map.value>, <element>] : String | provenance |  |
 | Test.java:6246:13:6246:48 | newMVMWithMapValue(...) : MultiValueMap [<map.value>] : String | Test.java:6247:15:6247:16 | in : MultiValueMap [<map.value>] : String | provenance |  |
 | Test.java:6246:32:6246:47 | (...)... : String | Test.java:298:49:298:55 | value : String | provenance |  |
-| Test.java:6246:32:6246:47 | (...)... : String | Test.java:6246:13:6246:48 | newMVMWithMapValue(...) : MultiValueMap [<map.value>, <element>] : String | provenance | MaD:662 |
-| Test.java:6246:32:6246:47 | (...)... : String | Test.java:6246:13:6246:48 | newMVMWithMapValue(...) : MultiValueMap [<map.value>] : String | provenance | MaD:15 |
-| Test.java:6246:32:6246:47 | (...)... : String | Test.java:6246:13:6246:48 | newMVMWithMapValue(...) : MultiValueMap [<map.value>] : String | provenance | MaD:706 |
+| Test.java:6246:32:6246:47 | (...)... : String | Test.java:6246:13:6246:48 | newMVMWithMapValue(...) : MultiValueMap [<map.value>, <element>] : String | provenance | MaD:737 |
+| Test.java:6246:32:6246:47 | (...)... : String | Test.java:6246:13:6246:48 | newMVMWithMapValue(...) : MultiValueMap [<map.value>] : String | provenance | MaD:20 |
+| Test.java:6246:32:6246:47 | (...)... : String | Test.java:6246:13:6246:48 | newMVMWithMapValue(...) : MultiValueMap [<map.value>] : String | provenance | MaD:780 |
 | Test.java:6246:40:6246:47 | source(...) : Object | Test.java:6246:32:6246:47 | (...)... : String | provenance |  |
 | Test.java:6247:4:6247:6 | out [post update] : MultiValueMap [<map.value>, <element>] : Object | Test.java:6248:44:6248:46 | out : MultiValueMap [<map.value>, <element>] : Object | provenance |  |
 | Test.java:6247:4:6247:6 | out [post update] : MultiValueMap [<map.value>, <element>] : String | Test.java:6248:44:6248:46 | out : MultiValueMap [<map.value>, <element>] : String | provenance |  |
-| Test.java:6247:15:6247:16 | in : MultiValueMap [<map.value>, <element>] : String | Test.java:6247:4:6247:6 | out [post update] : MultiValueMap [<map.value>, <element>] : String | provenance | MaD:17 |
-| Test.java:6247:15:6247:16 | in : MultiValueMap [<map.value>, <element>] : String | Test.java:6247:4:6247:6 | out [post update] : MultiValueMap [<map.value>, <element>] : String | provenance | MaD:354 |
-| Test.java:6247:15:6247:16 | in : MultiValueMap [<map.value>, <element>] : String | Test.java:6247:4:6247:6 | out [post update] : MultiValueMap [<map.value>, <element>] : String | provenance | MaD:708 |
-| Test.java:6247:15:6247:16 | in : MultiValueMap [<map.value>] : String | Test.java:6247:4:6247:6 | out [post update] : MultiValueMap [<map.value>, <element>] : Object | provenance | MaD:354 |
-| Test.java:6247:15:6247:16 | in : MultiValueMap [<map.value>] : String | Test.java:6247:4:6247:6 | out [post update] : MultiValueMap [<map.value>, <element>] : String | provenance | MaD:353 |
+| Test.java:6247:15:6247:16 | in : MultiValueMap [<map.value>, <element>] : String | Test.java:6247:4:6247:6 | out [post update] : MultiValueMap [<map.value>, <element>] : String | provenance | MaD:23 |
+| Test.java:6247:15:6247:16 | in : MultiValueMap [<map.value>, <element>] : String | Test.java:6247:4:6247:6 | out [post update] : MultiValueMap [<map.value>, <element>] : String | provenance | MaD:355 |
+| Test.java:6247:15:6247:16 | in : MultiValueMap [<map.value>, <element>] : String | Test.java:6247:4:6247:6 | out [post update] : MultiValueMap [<map.value>, <element>] : String | provenance | MaD:783 |
+| Test.java:6247:15:6247:16 | in : MultiValueMap [<map.value>] : String | Test.java:6247:4:6247:6 | out [post update] : MultiValueMap [<map.value>, <element>] : Object | provenance | MaD:355 |
+| Test.java:6247:15:6247:16 | in : MultiValueMap [<map.value>] : String | Test.java:6247:4:6247:6 | out [post update] : MultiValueMap [<map.value>, <element>] : String | provenance | MaD:356 |
 | Test.java:6248:20:6248:47 | (...)... : Collection [<element>] : Object | Test.java:230:19:230:32 | it : Collection [<element>] : Object | provenance |  |
-| Test.java:6248:20:6248:47 | (...)... : Collection [<element>] : Object | Test.java:6248:9:6248:48 | getElement(...) | provenance | MaD:1 |
+| Test.java:6248:20:6248:47 | (...)... : Collection [<element>] : Object | Test.java:6248:9:6248:48 | getElement(...) | provenance | MaD:3 |
 | Test.java:6248:20:6248:47 | (...)... : Collection [<element>] : String | Test.java:230:19:230:32 | it : Collection [<element>] : String | provenance |  |
-| Test.java:6248:20:6248:47 | (...)... : Collection [<element>] : String | Test.java:6248:9:6248:48 | getElement(...) | provenance | MaD:1 |
+| Test.java:6248:20:6248:47 | (...)... : Collection [<element>] : String | Test.java:6248:9:6248:48 | getElement(...) | provenance | MaD:3 |
 | Test.java:6248:32:6248:47 | getMapValue(...) : Object [<element>] : Object | Test.java:6248:20:6248:47 | (...)... : Collection [<element>] : Object | provenance |  |
 | Test.java:6248:32:6248:47 | getMapValue(...) : Object [<element>] : String | Test.java:6248:20:6248:47 | (...)... : Collection [<element>] : String | provenance |  |
 | Test.java:6248:44:6248:46 | out : MultiValueMap [<map.value>, <element>] : Object | Test.java:232:20:232:31 | map : MultiValueMap [<map.value>, <element>] : Object | provenance |  |
-| Test.java:6248:44:6248:46 | out : MultiValueMap [<map.value>, <element>] : Object | Test.java:6248:32:6248:47 | getMapValue(...) : Object [<element>] : Object | provenance | MaD:9 |
+| Test.java:6248:44:6248:46 | out : MultiValueMap [<map.value>, <element>] : Object | Test.java:6248:32:6248:47 | getMapValue(...) : Object [<element>] : Object | provenance | MaD:17 |
 | Test.java:6248:44:6248:46 | out : MultiValueMap [<map.value>, <element>] : String | Test.java:232:20:232:31 | map : MultiValueMap [<map.value>, <element>] : String | provenance |  |
-| Test.java:6248:44:6248:46 | out : MultiValueMap [<map.value>, <element>] : String | Test.java:6248:32:6248:47 | getMapValue(...) : Object [<element>] : String | provenance | MaD:9 |
+| Test.java:6248:44:6248:46 | out : MultiValueMap [<map.value>, <element>] : String | Test.java:6248:32:6248:47 | getMapValue(...) : Object [<element>] : String | provenance | MaD:17 |
 | Test.java:6253:13:6253:34 | of(...) : Map [<map.value>] : Object | Test.java:6254:15:6254:16 | in : Map [<map.value>] : Object | provenance |  |
-| Test.java:6253:26:6253:33 | source(...) : Object | Test.java:6253:13:6253:34 | of(...) : Map [<map.value>] : Object | provenance | MaD:12 |
+| Test.java:6253:26:6253:33 | source(...) : Object | Test.java:6253:13:6253:34 | of(...) : Map [<map.value>] : Object | provenance | MaD:14 |
 | Test.java:6254:4:6254:6 | out [post update] : MultiValueMap [<map.value>, <element>] : Object | Test.java:6255:44:6255:46 | out : MultiValueMap [<map.value>, <element>] : Object | provenance |  |
 | Test.java:6254:4:6254:6 | out [post update] : MultiValueMap [<map.value>] : Object | Test.java:6255:44:6255:46 | out : MultiValueMap [<map.value>] : Object | provenance |  |
-| Test.java:6254:15:6254:16 | in : Map [<map.value>] : Object | Test.java:6254:4:6254:6 | out [post update] : MultiValueMap [<map.value>, <element>] : Object | provenance | MaD:353 |
-| Test.java:6254:15:6254:16 | in : Map [<map.value>] : Object | Test.java:6254:4:6254:6 | out [post update] : MultiValueMap [<map.value>, <element>] : Object | provenance | MaD:354 |
-| Test.java:6254:15:6254:16 | in : Map [<map.value>] : Object | Test.java:6254:4:6254:6 | out [post update] : MultiValueMap [<map.value>] : Object | provenance | MaD:17 |
-| Test.java:6254:15:6254:16 | in : Map [<map.value>] : Object | Test.java:6254:4:6254:6 | out [post update] : MultiValueMap [<map.value>] : Object | provenance | MaD:708 |
+| Test.java:6254:15:6254:16 | in : Map [<map.value>] : Object | Test.java:6254:4:6254:6 | out [post update] : MultiValueMap [<map.value>, <element>] : Object | provenance | MaD:355 |
+| Test.java:6254:15:6254:16 | in : Map [<map.value>] : Object | Test.java:6254:4:6254:6 | out [post update] : MultiValueMap [<map.value>, <element>] : Object | provenance | MaD:356 |
+| Test.java:6254:15:6254:16 | in : Map [<map.value>] : Object | Test.java:6254:4:6254:6 | out [post update] : MultiValueMap [<map.value>] : Object | provenance | MaD:23 |
+| Test.java:6254:15:6254:16 | in : Map [<map.value>] : Object | Test.java:6254:4:6254:6 | out [post update] : MultiValueMap [<map.value>] : Object | provenance | MaD:783 |
 | Test.java:6255:20:6255:47 | (...)... : Collection | Test.java:230:19:230:32 | it : Collection | provenance |  |
-| Test.java:6255:20:6255:47 | (...)... : Collection | Test.java:6255:9:6255:48 | getElement(...) | provenance | MaD:1 |
+| Test.java:6255:20:6255:47 | (...)... : Collection | Test.java:6255:9:6255:48 | getElement(...) | provenance | MaD:3 |
 | Test.java:6255:20:6255:47 | (...)... : Collection [<element>] : Object | Test.java:230:19:230:32 | it : Collection [<element>] : Object | provenance |  |
-| Test.java:6255:20:6255:47 | (...)... : Collection [<element>] : Object | Test.java:6255:9:6255:48 | getElement(...) | provenance | MaD:1 |
+| Test.java:6255:20:6255:47 | (...)... : Collection [<element>] : Object | Test.java:6255:9:6255:48 | getElement(...) | provenance | MaD:3 |
 | Test.java:6255:32:6255:47 | getMapValue(...) : Object | Test.java:6255:20:6255:47 | (...)... : Collection | provenance |  |
 | Test.java:6255:32:6255:47 | getMapValue(...) : Object [<element>] : Object | Test.java:6255:20:6255:47 | (...)... : Collection [<element>] : Object | provenance |  |
 | Test.java:6255:44:6255:46 | out : MultiValueMap [<map.value>, <element>] : Object | Test.java:232:20:232:31 | map : MultiValueMap [<map.value>, <element>] : Object | provenance |  |
-| Test.java:6255:44:6255:46 | out : MultiValueMap [<map.value>, <element>] : Object | Test.java:6255:32:6255:47 | getMapValue(...) : Object [<element>] : Object | provenance | MaD:9 |
+| Test.java:6255:44:6255:46 | out : MultiValueMap [<map.value>, <element>] : Object | Test.java:6255:32:6255:47 | getMapValue(...) : Object [<element>] : Object | provenance | MaD:17 |
 | Test.java:6255:44:6255:46 | out : MultiValueMap [<map.value>] : Object | Test.java:232:20:232:31 | map : MultiValueMap [<map.value>] : Object | provenance |  |
-| Test.java:6255:44:6255:46 | out : MultiValueMap [<map.value>] : Object | Test.java:6255:32:6255:47 | getMapValue(...) : Object | provenance | MaD:9 |
+| Test.java:6255:44:6255:46 | out : MultiValueMap [<map.value>] : Object | Test.java:6255:32:6255:47 | getMapValue(...) : Object | provenance | MaD:17 |
 | Test.java:6260:16:6260:23 | source(...) : Object | Test.java:6261:15:6261:16 | in : Object | provenance |  |
 | Test.java:6261:4:6261:6 | out [post update] : MultiValueMap [<map.key>] : Object | Test.java:6262:19:6262:21 | out : MultiValueMap [<map.key>] : Object | provenance |  |
-| Test.java:6261:15:6261:16 | in : Object | Test.java:6261:4:6261:6 | out [post update] : MultiValueMap [<map.key>] : Object | provenance | MaD:355 |
+| Test.java:6261:15:6261:16 | in : Object | Test.java:6261:4:6261:6 | out [post update] : MultiValueMap [<map.key>] : Object | provenance | MaD:357 |
 | Test.java:6262:19:6262:21 | out : MultiValueMap [<map.key>] : Object | Test.java:228:18:228:29 | map : MultiValueMap [<map.key>] : Object | provenance |  |
-| Test.java:6262:19:6262:21 | out : MultiValueMap [<map.key>] : Object | Test.java:6262:9:6262:22 | getMapKey(...) | provenance | MaD:10 |
+| Test.java:6262:19:6262:21 | out : MultiValueMap [<map.key>] : Object | Test.java:6262:9:6262:22 | getMapKey(...) | provenance | MaD:18 |
 | Test.java:6267:20:6267:58 | newTreeBagWithElement(...) : TreeBag [<element>] : String | Test.java:6268:21:6268:22 | in : TreeBag [<element>] : String | provenance |  |
 | Test.java:6267:42:6267:57 | (...)... : String | Test.java:267:39:267:47 | element : String | provenance |  |
-| Test.java:6267:42:6267:57 | (...)... : String | Test.java:6267:20:6267:58 | newTreeBagWithElement(...) : TreeBag [<element>] : String | provenance | MaD:2 |
-| Test.java:6267:42:6267:57 | (...)... : String | Test.java:6267:20:6267:58 | newTreeBagWithElement(...) : TreeBag [<element>] : String | provenance | MaD:395 |
+| Test.java:6267:42:6267:57 | (...)... : String | Test.java:6267:20:6267:58 | newTreeBagWithElement(...) : TreeBag [<element>] : String | provenance | MaD:4 |
+| Test.java:6267:42:6267:57 | (...)... : String | Test.java:6267:20:6267:58 | newTreeBagWithElement(...) : TreeBag [<element>] : String | provenance | MaD:470 |
 | Test.java:6267:50:6267:57 | source(...) : Object | Test.java:6267:42:6267:57 | (...)... : String | provenance |  |
 | Test.java:6268:4:6268:6 | out [post update] : MultiValueMap [<map.value>, <element>] : String | Test.java:6269:44:6269:46 | out : MultiValueMap [<map.value>, <element>] : String | provenance |  |
-| Test.java:6268:21:6268:22 | in : TreeBag [<element>] : String | Test.java:6268:4:6268:6 | out [post update] : MultiValueMap [<map.value>, <element>] : String | provenance | MaD:356 |
+| Test.java:6268:21:6268:22 | in : TreeBag [<element>] : String | Test.java:6268:4:6268:6 | out [post update] : MultiValueMap [<map.value>, <element>] : String | provenance | MaD:358 |
 | Test.java:6269:20:6269:47 | (...)... : Collection [<element>] : String | Test.java:230:19:230:32 | it : Collection [<element>] : String | provenance |  |
-| Test.java:6269:20:6269:47 | (...)... : Collection [<element>] : String | Test.java:6269:9:6269:48 | getElement(...) | provenance | MaD:1 |
+| Test.java:6269:20:6269:47 | (...)... : Collection [<element>] : String | Test.java:6269:9:6269:48 | getElement(...) | provenance | MaD:3 |
 | Test.java:6269:32:6269:47 | getMapValue(...) : Object [<element>] : String | Test.java:6269:20:6269:47 | (...)... : Collection [<element>] : String | provenance |  |
 | Test.java:6269:44:6269:46 | out : MultiValueMap [<map.value>, <element>] : String | Test.java:232:20:232:31 | map : MultiValueMap [<map.value>, <element>] : String | provenance |  |
-| Test.java:6269:44:6269:46 | out : MultiValueMap [<map.value>, <element>] : String | Test.java:6269:32:6269:47 | getMapValue(...) : Object [<element>] : String | provenance | MaD:9 |
+| Test.java:6269:44:6269:46 | out : MultiValueMap [<map.value>, <element>] : String | Test.java:6269:32:6269:47 | getMapValue(...) : Object [<element>] : String | provenance | MaD:17 |
 | Test.java:6274:23:6274:58 | newMVMWithMapValue(...) : MultiValueMap [<map.value>, <element>] : String | Test.java:6275:10:6275:11 | in : MultiValueMap [<map.value>, <element>] : String | provenance |  |
 | Test.java:6274:23:6274:58 | newMVMWithMapValue(...) : MultiValueMap [<map.value>] : String | Test.java:6275:10:6275:11 | in : MultiValueMap [<map.value>] : String | provenance |  |
 | Test.java:6274:42:6274:57 | (...)... : String | Test.java:298:49:298:55 | value : String | provenance |  |
-| Test.java:6274:42:6274:57 | (...)... : String | Test.java:6274:23:6274:58 | newMVMWithMapValue(...) : MultiValueMap [<map.value>, <element>] : String | provenance | MaD:662 |
-| Test.java:6274:42:6274:57 | (...)... : String | Test.java:6274:23:6274:58 | newMVMWithMapValue(...) : MultiValueMap [<map.value>] : String | provenance | MaD:15 |
-| Test.java:6274:42:6274:57 | (...)... : String | Test.java:6274:23:6274:58 | newMVMWithMapValue(...) : MultiValueMap [<map.value>] : String | provenance | MaD:706 |
+| Test.java:6274:42:6274:57 | (...)... : String | Test.java:6274:23:6274:58 | newMVMWithMapValue(...) : MultiValueMap [<map.value>, <element>] : String | provenance | MaD:737 |
+| Test.java:6274:42:6274:57 | (...)... : String | Test.java:6274:23:6274:58 | newMVMWithMapValue(...) : MultiValueMap [<map.value>] : String | provenance | MaD:20 |
+| Test.java:6274:42:6274:57 | (...)... : String | Test.java:6274:23:6274:58 | newMVMWithMapValue(...) : MultiValueMap [<map.value>] : String | provenance | MaD:780 |
 | Test.java:6274:50:6274:57 | source(...) : Object | Test.java:6274:42:6274:57 | (...)... : String | provenance |  |
-| Test.java:6275:10:6275:11 | in : MultiValueMap [<map.value>, <element>] : String | Test.java:6275:10:6275:20 | values(...) : Collection [<element>] : String | provenance | MaD:357 |
-| Test.java:6275:10:6275:11 | in : MultiValueMap [<map.value>, <element>] : String | Test.java:6275:10:6275:20 | values(...) : Collection [<element>] : String | provenance | MaD:663 |
-| Test.java:6275:10:6275:11 | in : MultiValueMap [<map.value>] : String | Test.java:6275:10:6275:20 | values(...) : Collection [<element>] : Object | provenance | MaD:357 |
-| Test.java:6275:10:6275:11 | in : MultiValueMap [<map.value>] : String | Test.java:6275:10:6275:20 | values(...) : Collection [<element>] : Object | provenance | MaD:663 |
-| Test.java:6275:10:6275:11 | in : MultiValueMap [<map.value>] : String | Test.java:6275:10:6275:20 | values(...) : Collection [<element>] : String | provenance | MaD:19 |
-| Test.java:6275:10:6275:11 | in : MultiValueMap [<map.value>] : String | Test.java:6275:10:6275:20 | values(...) : Collection [<element>] : String | provenance | MaD:486 |
+| Test.java:6275:10:6275:11 | in : MultiValueMap [<map.value>, <element>] : String | Test.java:6275:10:6275:20 | values(...) : Collection [<element>] : String | provenance | MaD:359 |
+| Test.java:6275:10:6275:11 | in : MultiValueMap [<map.value>, <element>] : String | Test.java:6275:10:6275:20 | values(...) : Collection [<element>] : String | provenance | MaD:738 |
+| Test.java:6275:10:6275:11 | in : MultiValueMap [<map.value>] : String | Test.java:6275:10:6275:20 | values(...) : Collection [<element>] : Object | provenance | MaD:359 |
+| Test.java:6275:10:6275:11 | in : MultiValueMap [<map.value>] : String | Test.java:6275:10:6275:20 | values(...) : Collection [<element>] : Object | provenance | MaD:738 |
+| Test.java:6275:10:6275:11 | in : MultiValueMap [<map.value>] : String | Test.java:6275:10:6275:20 | values(...) : Collection [<element>] : String | provenance | MaD:25 |
+| Test.java:6275:10:6275:11 | in : MultiValueMap [<map.value>] : String | Test.java:6275:10:6275:20 | values(...) : Collection [<element>] : String | provenance | MaD:561 |
 | Test.java:6275:10:6275:20 | values(...) : Collection [<element>] : Object | Test.java:6276:20:6276:22 | out : Collection [<element>] : Object | provenance |  |
 | Test.java:6275:10:6275:20 | values(...) : Collection [<element>] : String | Test.java:6276:20:6276:22 | out : Collection [<element>] : String | provenance |  |
 | Test.java:6276:20:6276:22 | out : Collection [<element>] : Object | Test.java:230:19:230:32 | it : Collection [<element>] : Object | provenance |  |
-| Test.java:6276:20:6276:22 | out : Collection [<element>] : Object | Test.java:6276:9:6276:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:6276:20:6276:22 | out : Collection [<element>] : Object | Test.java:6276:9:6276:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:6276:20:6276:22 | out : Collection [<element>] : String | Test.java:230:19:230:32 | it : Collection [<element>] : String | provenance |  |
-| Test.java:6276:20:6276:22 | out : Collection [<element>] : String | Test.java:6276:9:6276:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:6276:20:6276:22 | out : Collection [<element>] : String | Test.java:6276:9:6276:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:6281:13:6281:42 | of(...) : Map [<map.key>] : String | Test.java:6282:76:6282:77 | in : Map [<map.key>] : String | provenance |  |
-| Test.java:6281:20:6281:35 | (...)... : String | Test.java:6281:13:6281:42 | of(...) : Map [<map.key>] : String | provenance | MaD:11 |
+| Test.java:6281:20:6281:35 | (...)... : String | Test.java:6281:13:6281:42 | of(...) : Map [<map.key>] : String | provenance | MaD:13 |
 | Test.java:6281:28:6281:35 | source(...) : Object | Test.java:6281:20:6281:35 | (...)... : String | provenance |  |
 | Test.java:6282:10:6282:78 | new PassiveExpiringMap<>(...) : PassiveExpiringMap [<map.key>] : String | Test.java:6283:19:6283:21 | out : PassiveExpiringMap [<map.key>] : String | provenance |  |
-| Test.java:6282:76:6282:77 | in : Map [<map.key>] : String | Test.java:6282:10:6282:78 | new PassiveExpiringMap<>(...) : PassiveExpiringMap [<map.key>] : String | provenance | MaD:358 |
+| Test.java:6282:76:6282:77 | in : Map [<map.key>] : String | Test.java:6282:10:6282:78 | new PassiveExpiringMap<>(...) : PassiveExpiringMap [<map.key>] : String | provenance | MaD:362 |
 | Test.java:6283:19:6283:21 | out : PassiveExpiringMap [<map.key>] : String | Test.java:228:18:228:29 | map : PassiveExpiringMap [<map.key>] : String | provenance |  |
-| Test.java:6283:19:6283:21 | out : PassiveExpiringMap [<map.key>] : String | Test.java:6283:9:6283:22 | getMapKey(...) | provenance | MaD:10 |
+| Test.java:6283:19:6283:21 | out : PassiveExpiringMap [<map.key>] : String | Test.java:6283:9:6283:22 | getMapKey(...) | provenance | MaD:18 |
 | Test.java:6288:13:6288:42 | of(...) : Map [<map.value>] : String | Test.java:6289:76:6289:77 | in : Map [<map.value>] : String | provenance |  |
-| Test.java:6288:26:6288:41 | (...)... : String | Test.java:6288:13:6288:42 | of(...) : Map [<map.value>] : String | provenance | MaD:12 |
+| Test.java:6288:26:6288:41 | (...)... : String | Test.java:6288:13:6288:42 | of(...) : Map [<map.value>] : String | provenance | MaD:14 |
 | Test.java:6288:34:6288:41 | source(...) : Object | Test.java:6288:26:6288:41 | (...)... : String | provenance |  |
 | Test.java:6289:10:6289:78 | new PassiveExpiringMap<>(...) : PassiveExpiringMap [<map.value>] : String | Test.java:6290:21:6290:23 | out : PassiveExpiringMap [<map.value>] : String | provenance |  |
-| Test.java:6289:76:6289:77 | in : Map [<map.value>] : String | Test.java:6289:10:6289:78 | new PassiveExpiringMap<>(...) : PassiveExpiringMap [<map.value>] : String | provenance | MaD:359 |
+| Test.java:6289:76:6289:77 | in : Map [<map.value>] : String | Test.java:6289:10:6289:78 | new PassiveExpiringMap<>(...) : PassiveExpiringMap [<map.value>] : String | provenance | MaD:363 |
 | Test.java:6290:21:6290:23 | out : PassiveExpiringMap [<map.value>] : String | Test.java:232:20:232:31 | map : PassiveExpiringMap [<map.value>] : String | provenance |  |
-| Test.java:6290:21:6290:23 | out : PassiveExpiringMap [<map.value>] : String | Test.java:6290:9:6290:24 | getMapValue(...) | provenance | MaD:9 |
+| Test.java:6290:21:6290:23 | out : PassiveExpiringMap [<map.value>] : String | Test.java:6290:9:6290:24 | getMapValue(...) | provenance | MaD:17 |
 | Test.java:6295:13:6295:42 | of(...) : Map [<map.key>] : String | Test.java:6296:33:6296:34 | in : Map [<map.key>] : String | provenance |  |
-| Test.java:6295:20:6295:35 | (...)... : String | Test.java:6295:13:6295:42 | of(...) : Map [<map.key>] : String | provenance | MaD:11 |
+| Test.java:6295:20:6295:35 | (...)... : String | Test.java:6295:13:6295:42 | of(...) : Map [<map.key>] : String | provenance | MaD:13 |
 | Test.java:6295:28:6295:35 | source(...) : Object | Test.java:6295:20:6295:35 | (...)... : String | provenance |  |
 | Test.java:6296:10:6296:35 | new PassiveExpiringMap<>(...) : PassiveExpiringMap [<map.key>] : String | Test.java:6297:19:6297:21 | out : PassiveExpiringMap [<map.key>] : String | provenance |  |
 | Test.java:6296:33:6296:34 | in : Map [<map.key>] : String | Test.java:6296:10:6296:35 | new PassiveExpiringMap<>(...) : PassiveExpiringMap [<map.key>] : String | provenance | MaD:360 |
 | Test.java:6297:19:6297:21 | out : PassiveExpiringMap [<map.key>] : String | Test.java:228:18:228:29 | map : PassiveExpiringMap [<map.key>] : String | provenance |  |
-| Test.java:6297:19:6297:21 | out : PassiveExpiringMap [<map.key>] : String | Test.java:6297:9:6297:22 | getMapKey(...) | provenance | MaD:10 |
+| Test.java:6297:19:6297:21 | out : PassiveExpiringMap [<map.key>] : String | Test.java:6297:9:6297:22 | getMapKey(...) | provenance | MaD:18 |
 | Test.java:6302:13:6302:42 | of(...) : Map [<map.value>] : String | Test.java:6303:33:6303:34 | in : Map [<map.value>] : String | provenance |  |
-| Test.java:6302:26:6302:41 | (...)... : String | Test.java:6302:13:6302:42 | of(...) : Map [<map.value>] : String | provenance | MaD:12 |
+| Test.java:6302:26:6302:41 | (...)... : String | Test.java:6302:13:6302:42 | of(...) : Map [<map.value>] : String | provenance | MaD:14 |
 | Test.java:6302:34:6302:41 | source(...) : Object | Test.java:6302:26:6302:41 | (...)... : String | provenance |  |
 | Test.java:6303:10:6303:35 | new PassiveExpiringMap<>(...) : PassiveExpiringMap [<map.value>] : String | Test.java:6304:21:6304:23 | out : PassiveExpiringMap [<map.value>] : String | provenance |  |
 | Test.java:6303:33:6303:34 | in : Map [<map.value>] : String | Test.java:6303:10:6303:35 | new PassiveExpiringMap<>(...) : PassiveExpiringMap [<map.value>] : String | provenance | MaD:361 |
 | Test.java:6304:21:6304:23 | out : PassiveExpiringMap [<map.value>] : String | Test.java:232:20:232:31 | map : PassiveExpiringMap [<map.value>] : String | provenance |  |
-| Test.java:6304:21:6304:23 | out : PassiveExpiringMap [<map.value>] : String | Test.java:6304:9:6304:24 | getMapValue(...) | provenance | MaD:9 |
+| Test.java:6304:21:6304:23 | out : PassiveExpiringMap [<map.value>] : String | Test.java:6304:9:6304:24 | getMapValue(...) | provenance | MaD:17 |
 | Test.java:6309:13:6309:42 | of(...) : Map [<map.key>] : String | Test.java:6310:37:6310:38 | in : Map [<map.key>] : String | provenance |  |
-| Test.java:6309:20:6309:35 | (...)... : String | Test.java:6309:13:6309:42 | of(...) : Map [<map.key>] : String | provenance | MaD:11 |
+| Test.java:6309:20:6309:35 | (...)... : String | Test.java:6309:13:6309:42 | of(...) : Map [<map.key>] : String | provenance | MaD:13 |
 | Test.java:6309:28:6309:35 | source(...) : Object | Test.java:6309:20:6309:35 | (...)... : String | provenance |  |
 | Test.java:6310:10:6310:39 | new PassiveExpiringMap<>(...) : PassiveExpiringMap [<map.key>] : String | Test.java:6311:19:6311:21 | out : PassiveExpiringMap [<map.key>] : String | provenance |  |
-| Test.java:6310:37:6310:38 | in : Map [<map.key>] : String | Test.java:6310:10:6310:39 | new PassiveExpiringMap<>(...) : PassiveExpiringMap [<map.key>] : String | provenance | MaD:362 |
+| Test.java:6310:37:6310:38 | in : Map [<map.key>] : String | Test.java:6310:10:6310:39 | new PassiveExpiringMap<>(...) : PassiveExpiringMap [<map.key>] : String | provenance | MaD:364 |
 | Test.java:6311:19:6311:21 | out : PassiveExpiringMap [<map.key>] : String | Test.java:228:18:228:29 | map : PassiveExpiringMap [<map.key>] : String | provenance |  |
-| Test.java:6311:19:6311:21 | out : PassiveExpiringMap [<map.key>] : String | Test.java:6311:9:6311:22 | getMapKey(...) | provenance | MaD:10 |
+| Test.java:6311:19:6311:21 | out : PassiveExpiringMap [<map.key>] : String | Test.java:6311:9:6311:22 | getMapKey(...) | provenance | MaD:18 |
 | Test.java:6316:13:6316:42 | of(...) : Map [<map.value>] : String | Test.java:6317:37:6317:38 | in : Map [<map.value>] : String | provenance |  |
-| Test.java:6316:26:6316:41 | (...)... : String | Test.java:6316:13:6316:42 | of(...) : Map [<map.value>] : String | provenance | MaD:12 |
+| Test.java:6316:26:6316:41 | (...)... : String | Test.java:6316:13:6316:42 | of(...) : Map [<map.value>] : String | provenance | MaD:14 |
 | Test.java:6316:34:6316:41 | source(...) : Object | Test.java:6316:26:6316:41 | (...)... : String | provenance |  |
 | Test.java:6317:10:6317:39 | new PassiveExpiringMap<>(...) : PassiveExpiringMap [<map.value>] : String | Test.java:6318:21:6318:23 | out : PassiveExpiringMap [<map.value>] : String | provenance |  |
-| Test.java:6317:37:6317:38 | in : Map [<map.value>] : String | Test.java:6317:10:6317:39 | new PassiveExpiringMap<>(...) : PassiveExpiringMap [<map.value>] : String | provenance | MaD:363 |
+| Test.java:6317:37:6317:38 | in : Map [<map.value>] : String | Test.java:6317:10:6317:39 | new PassiveExpiringMap<>(...) : PassiveExpiringMap [<map.value>] : String | provenance | MaD:365 |
 | Test.java:6318:21:6318:23 | out : PassiveExpiringMap [<map.value>] : String | Test.java:232:20:232:31 | map : PassiveExpiringMap [<map.value>] : String | provenance |  |
-| Test.java:6318:21:6318:23 | out : PassiveExpiringMap [<map.value>] : String | Test.java:6318:9:6318:24 | getMapValue(...) | provenance | MaD:9 |
+| Test.java:6318:21:6318:23 | out : PassiveExpiringMap [<map.value>] : String | Test.java:6318:9:6318:24 | getMapValue(...) | provenance | MaD:17 |
 | Test.java:6323:13:6323:42 | of(...) : Map [<map.key>] : String | Test.java:6324:43:6324:44 | in : Map [<map.key>] : String | provenance |  |
-| Test.java:6323:20:6323:35 | (...)... : String | Test.java:6323:13:6323:42 | of(...) : Map [<map.key>] : String | provenance | MaD:11 |
+| Test.java:6323:20:6323:35 | (...)... : String | Test.java:6323:13:6323:42 | of(...) : Map [<map.key>] : String | provenance | MaD:13 |
 | Test.java:6323:28:6323:35 | source(...) : Object | Test.java:6323:20:6323:35 | (...)... : String | provenance |  |
 | Test.java:6324:10:6324:45 | new PassiveExpiringMap<>(...) : PassiveExpiringMap [<map.key>] : String | Test.java:6325:19:6325:21 | out : PassiveExpiringMap [<map.key>] : String | provenance |  |
-| Test.java:6324:43:6324:44 | in : Map [<map.key>] : String | Test.java:6324:10:6324:45 | new PassiveExpiringMap<>(...) : PassiveExpiringMap [<map.key>] : String | provenance | MaD:364 |
+| Test.java:6324:43:6324:44 | in : Map [<map.key>] : String | Test.java:6324:10:6324:45 | new PassiveExpiringMap<>(...) : PassiveExpiringMap [<map.key>] : String | provenance | MaD:366 |
 | Test.java:6325:19:6325:21 | out : PassiveExpiringMap [<map.key>] : String | Test.java:228:18:228:29 | map : PassiveExpiringMap [<map.key>] : String | provenance |  |
-| Test.java:6325:19:6325:21 | out : PassiveExpiringMap [<map.key>] : String | Test.java:6325:9:6325:22 | getMapKey(...) | provenance | MaD:10 |
+| Test.java:6325:19:6325:21 | out : PassiveExpiringMap [<map.key>] : String | Test.java:6325:9:6325:22 | getMapKey(...) | provenance | MaD:18 |
 | Test.java:6330:13:6330:42 | of(...) : Map [<map.value>] : String | Test.java:6331:43:6331:44 | in : Map [<map.value>] : String | provenance |  |
-| Test.java:6330:26:6330:41 | (...)... : String | Test.java:6330:13:6330:42 | of(...) : Map [<map.value>] : String | provenance | MaD:12 |
+| Test.java:6330:26:6330:41 | (...)... : String | Test.java:6330:13:6330:42 | of(...) : Map [<map.value>] : String | provenance | MaD:14 |
 | Test.java:6330:34:6330:41 | source(...) : Object | Test.java:6330:26:6330:41 | (...)... : String | provenance |  |
 | Test.java:6331:10:6331:45 | new PassiveExpiringMap<>(...) : PassiveExpiringMap [<map.value>] : String | Test.java:6332:21:6332:23 | out : PassiveExpiringMap [<map.value>] : String | provenance |  |
-| Test.java:6331:43:6331:44 | in : Map [<map.value>] : String | Test.java:6331:10:6331:45 | new PassiveExpiringMap<>(...) : PassiveExpiringMap [<map.value>] : String | provenance | MaD:365 |
+| Test.java:6331:43:6331:44 | in : Map [<map.value>] : String | Test.java:6331:10:6331:45 | new PassiveExpiringMap<>(...) : PassiveExpiringMap [<map.value>] : String | provenance | MaD:367 |
 | Test.java:6332:21:6332:23 | out : PassiveExpiringMap [<map.value>] : String | Test.java:232:20:232:31 | map : PassiveExpiringMap [<map.value>] : String | provenance |  |
-| Test.java:6332:21:6332:23 | out : PassiveExpiringMap [<map.value>] : String | Test.java:6332:9:6332:24 | getMapValue(...) | provenance | MaD:9 |
+| Test.java:6332:21:6332:23 | out : PassiveExpiringMap [<map.value>] : String | Test.java:6332:9:6332:24 | getMapValue(...) | provenance | MaD:17 |
 | Test.java:6337:13:6337:42 | of(...) : Map [<map.key>] : String | Test.java:6338:38:6338:39 | in : Map [<map.key>] : String | provenance |  |
-| Test.java:6337:20:6337:35 | (...)... : String | Test.java:6337:13:6337:42 | of(...) : Map [<map.key>] : String | provenance | MaD:11 |
+| Test.java:6337:20:6337:35 | (...)... : String | Test.java:6337:13:6337:42 | of(...) : Map [<map.key>] : String | provenance | MaD:13 |
 | Test.java:6337:28:6337:35 | source(...) : Object | Test.java:6337:20:6337:35 | (...)... : String | provenance |  |
 | Test.java:6338:10:6338:52 | predicatedMap(...) : PredicatedMap [<map.key>] : String | Test.java:6339:19:6339:21 | out : PredicatedMap [<map.key>] : String | provenance |  |
-| Test.java:6338:38:6338:39 | in : Map [<map.key>] : String | Test.java:6338:10:6338:52 | predicatedMap(...) : PredicatedMap [<map.key>] : String | provenance | MaD:366 |
+| Test.java:6338:38:6338:39 | in : Map [<map.key>] : String | Test.java:6338:10:6338:52 | predicatedMap(...) : PredicatedMap [<map.key>] : String | provenance | MaD:368 |
 | Test.java:6339:19:6339:21 | out : PredicatedMap [<map.key>] : String | Test.java:228:18:228:29 | map : PredicatedMap [<map.key>] : String | provenance |  |
-| Test.java:6339:19:6339:21 | out : PredicatedMap [<map.key>] : String | Test.java:6339:9:6339:22 | getMapKey(...) | provenance | MaD:10 |
+| Test.java:6339:19:6339:21 | out : PredicatedMap [<map.key>] : String | Test.java:6339:9:6339:22 | getMapKey(...) | provenance | MaD:18 |
 | Test.java:6344:13:6344:42 | of(...) : Map [<map.value>] : String | Test.java:6345:38:6345:39 | in : Map [<map.value>] : String | provenance |  |
-| Test.java:6344:26:6344:41 | (...)... : String | Test.java:6344:13:6344:42 | of(...) : Map [<map.value>] : String | provenance | MaD:12 |
+| Test.java:6344:26:6344:41 | (...)... : String | Test.java:6344:13:6344:42 | of(...) : Map [<map.value>] : String | provenance | MaD:14 |
 | Test.java:6344:34:6344:41 | source(...) : Object | Test.java:6344:26:6344:41 | (...)... : String | provenance |  |
 | Test.java:6345:10:6345:52 | predicatedMap(...) : PredicatedMap [<map.value>] : String | Test.java:6346:21:6346:23 | out : PredicatedMap [<map.value>] : String | provenance |  |
-| Test.java:6345:38:6345:39 | in : Map [<map.value>] : String | Test.java:6345:10:6345:52 | predicatedMap(...) : PredicatedMap [<map.value>] : String | provenance | MaD:367 |
+| Test.java:6345:38:6345:39 | in : Map [<map.value>] : String | Test.java:6345:10:6345:52 | predicatedMap(...) : PredicatedMap [<map.value>] : String | provenance | MaD:369 |
 | Test.java:6346:21:6346:23 | out : PredicatedMap [<map.value>] : String | Test.java:232:20:232:31 | map : PredicatedMap [<map.value>] : String | provenance |  |
-| Test.java:6346:21:6346:23 | out : PredicatedMap [<map.value>] : String | Test.java:6346:9:6346:24 | getMapValue(...) | provenance | MaD:9 |
+| Test.java:6346:21:6346:23 | out : PredicatedMap [<map.value>] : String | Test.java:6346:9:6346:24 | getMapValue(...) | provenance | MaD:17 |
 | Test.java:6351:19:6351:56 | newTreeMapWithMapKey(...) : TreeMap [<map.key>] : String | Test.java:6352:50:6352:51 | in : TreeMap [<map.key>] : String | provenance |  |
 | Test.java:6351:40:6351:55 | (...)... : String | Test.java:285:47:285:51 | key : String | provenance |  |
-| Test.java:6351:40:6351:55 | (...)... : String | Test.java:6351:19:6351:56 | newTreeMapWithMapKey(...) : TreeMap [<map.key>] : String | provenance | MaD:14 |
+| Test.java:6351:40:6351:55 | (...)... : String | Test.java:6351:19:6351:56 | newTreeMapWithMapKey(...) : TreeMap [<map.key>] : String | provenance | MaD:19 |
 | Test.java:6351:48:6351:55 | source(...) : Object | Test.java:6351:40:6351:55 | (...)... : String | provenance |  |
 | Test.java:6352:10:6352:64 | predicatedSortedMap(...) : PredicatedSortedMap [<map.key>] : String | Test.java:6353:19:6353:21 | out : PredicatedSortedMap [<map.key>] : String | provenance |  |
-| Test.java:6352:50:6352:51 | in : TreeMap [<map.key>] : String | Test.java:6352:10:6352:64 | predicatedSortedMap(...) : PredicatedSortedMap [<map.key>] : String | provenance | MaD:368 |
+| Test.java:6352:50:6352:51 | in : TreeMap [<map.key>] : String | Test.java:6352:10:6352:64 | predicatedSortedMap(...) : PredicatedSortedMap [<map.key>] : String | provenance | MaD:370 |
 | Test.java:6353:19:6353:21 | out : PredicatedSortedMap [<map.key>] : String | Test.java:228:18:228:29 | map : PredicatedSortedMap [<map.key>] : String | provenance |  |
-| Test.java:6353:19:6353:21 | out : PredicatedSortedMap [<map.key>] : String | Test.java:6353:9:6353:22 | getMapKey(...) | provenance | MaD:10 |
+| Test.java:6353:19:6353:21 | out : PredicatedSortedMap [<map.key>] : String | Test.java:6353:9:6353:22 | getMapKey(...) | provenance | MaD:18 |
 | Test.java:6358:19:6358:58 | newTreeMapWithMapValue(...) : TreeMap [<map.value>] : String | Test.java:6359:50:6359:51 | in : TreeMap [<map.value>] : String | provenance |  |
 | Test.java:6358:42:6358:57 | (...)... : String | Test.java:304:49:304:55 | value : String | provenance |  |
-| Test.java:6358:42:6358:57 | (...)... : String | Test.java:6358:19:6358:58 | newTreeMapWithMapValue(...) : TreeMap [<map.value>] : String | provenance | MaD:15 |
+| Test.java:6358:42:6358:57 | (...)... : String | Test.java:6358:19:6358:58 | newTreeMapWithMapValue(...) : TreeMap [<map.value>] : String | provenance | MaD:20 |
 | Test.java:6358:50:6358:57 | source(...) : Object | Test.java:6358:42:6358:57 | (...)... : String | provenance |  |
 | Test.java:6359:10:6359:64 | predicatedSortedMap(...) : PredicatedSortedMap [<map.value>] : String | Test.java:6360:21:6360:23 | out : PredicatedSortedMap [<map.value>] : String | provenance |  |
-| Test.java:6359:50:6359:51 | in : TreeMap [<map.value>] : String | Test.java:6359:10:6359:64 | predicatedSortedMap(...) : PredicatedSortedMap [<map.value>] : String | provenance | MaD:369 |
+| Test.java:6359:50:6359:51 | in : TreeMap [<map.value>] : String | Test.java:6359:10:6359:64 | predicatedSortedMap(...) : PredicatedSortedMap [<map.value>] : String | provenance | MaD:371 |
 | Test.java:6360:21:6360:23 | out : PredicatedSortedMap [<map.value>] : String | Test.java:232:20:232:31 | map : PredicatedSortedMap [<map.value>] : String | provenance |  |
-| Test.java:6360:21:6360:23 | out : PredicatedSortedMap [<map.value>] : String | Test.java:6360:9:6360:24 | getMapValue(...) | provenance | MaD:9 |
+| Test.java:6360:21:6360:23 | out : PredicatedSortedMap [<map.value>] : String | Test.java:6360:9:6360:24 | getMapValue(...) | provenance | MaD:17 |
 | Test.java:6365:19:6365:52 | newTMEWithMapKey(...) : TiedMapEntry [<map.key>] : String | Test.java:6366:27:6366:28 | in : TiedMapEntry [<map.key>] : String | provenance |  |
 | Test.java:6365:36:6365:51 | (...)... : String | Test.java:286:46:286:50 | key : String | provenance |  |
-| Test.java:6365:36:6365:51 | (...)... : String | Test.java:6365:19:6365:52 | newTMEWithMapKey(...) : TiedMapEntry [<map.key>] : String | provenance | MaD:234 |
+| Test.java:6365:36:6365:51 | (...)... : String | Test.java:6365:19:6365:52 | newTMEWithMapKey(...) : TiedMapEntry [<map.key>] : String | provenance | MaD:236 |
 | Test.java:6365:44:6365:51 | source(...) : Object | Test.java:6365:36:6365:51 | (...)... : String | provenance |  |
 | Test.java:6366:10:6366:29 | new SingletonMap<>(...) : SingletonMap [<map.key>] : String | Test.java:6367:19:6367:21 | out : SingletonMap [<map.key>] : String | provenance |  |
-| Test.java:6366:27:6366:28 | in : TiedMapEntry [<map.key>] : String | Test.java:6366:10:6366:29 | new SingletonMap<>(...) : SingletonMap [<map.key>] : String | provenance | MaD:370 |
+| Test.java:6366:27:6366:28 | in : TiedMapEntry [<map.key>] : String | Test.java:6366:10:6366:29 | new SingletonMap<>(...) : SingletonMap [<map.key>] : String | provenance | MaD:374 |
 | Test.java:6367:19:6367:21 | out : SingletonMap [<map.key>] : String | Test.java:228:18:228:29 | map : SingletonMap [<map.key>] : String | provenance |  |
-| Test.java:6367:19:6367:21 | out : SingletonMap [<map.key>] : String | Test.java:6367:9:6367:22 | getMapKey(...) | provenance | MaD:10 |
+| Test.java:6367:19:6367:21 | out : SingletonMap [<map.key>] : String | Test.java:6367:9:6367:22 | getMapKey(...) | provenance | MaD:18 |
 | Test.java:6372:19:6372:54 | newTMEWithMapValue(...) : TiedMapEntry [<map.value>] : String | Test.java:6373:27:6373:28 | in : TiedMapEntry [<map.value>] : String | provenance |  |
 | Test.java:6372:38:6372:53 | (...)... : String | Test.java:305:48:305:54 | value : String | provenance |  |
-| Test.java:6372:38:6372:53 | (...)... : String | Test.java:6372:19:6372:54 | newTMEWithMapValue(...) : TiedMapEntry [<map.value>] : String | provenance | MaD:15 |
+| Test.java:6372:38:6372:53 | (...)... : String | Test.java:6372:19:6372:54 | newTMEWithMapValue(...) : TiedMapEntry [<map.value>] : String | provenance | MaD:20 |
 | Test.java:6372:46:6372:53 | source(...) : Object | Test.java:6372:38:6372:53 | (...)... : String | provenance |  |
 | Test.java:6373:10:6373:29 | new SingletonMap<>(...) : SingletonMap [<map.value>] : String | Test.java:6374:21:6374:23 | out : SingletonMap [<map.value>] : String | provenance |  |
-| Test.java:6373:27:6373:28 | in : TiedMapEntry [<map.value>] : String | Test.java:6373:10:6373:29 | new SingletonMap<>(...) : SingletonMap [<map.value>] : String | provenance | MaD:371 |
+| Test.java:6373:27:6373:28 | in : TiedMapEntry [<map.value>] : String | Test.java:6373:10:6373:29 | new SingletonMap<>(...) : SingletonMap [<map.value>] : String | provenance | MaD:375 |
 | Test.java:6374:21:6374:23 | out : SingletonMap [<map.value>] : String | Test.java:232:20:232:31 | map : SingletonMap [<map.value>] : String | provenance |  |
-| Test.java:6374:21:6374:23 | out : SingletonMap [<map.value>] : String | Test.java:6374:9:6374:24 | getMapValue(...) | provenance | MaD:9 |
+| Test.java:6374:21:6374:23 | out : SingletonMap [<map.value>] : String | Test.java:6374:9:6374:24 | getMapValue(...) | provenance | MaD:17 |
 | Test.java:6379:18:6379:51 | newDKVWithMapKey(...) : DefaultKeyValue [<map.key>] : String | Test.java:6380:27:6380:28 | in : DefaultKeyValue [<map.key>] : String | provenance |  |
 | Test.java:6379:35:6379:50 | (...)... : String | Test.java:273:49:273:53 | key : String | provenance |  |
-| Test.java:6379:35:6379:50 | (...)... : String | Test.java:6379:18:6379:51 | newDKVWithMapKey(...) : DefaultKeyValue [<map.key>] : String | provenance | MaD:205 |
+| Test.java:6379:35:6379:50 | (...)... : String | Test.java:6379:18:6379:51 | newDKVWithMapKey(...) : DefaultKeyValue [<map.key>] : String | provenance | MaD:207 |
 | Test.java:6379:43:6379:50 | source(...) : Object | Test.java:6379:35:6379:50 | (...)... : String | provenance |  |
 | Test.java:6380:10:6380:29 | new SingletonMap<>(...) : SingletonMap [<map.key>] : String | Test.java:6381:19:6381:21 | out : SingletonMap [<map.key>] : String | provenance |  |
 | Test.java:6380:27:6380:28 | in : DefaultKeyValue [<map.key>] : String | Test.java:6380:10:6380:29 | new SingletonMap<>(...) : SingletonMap [<map.key>] : String | provenance | MaD:372 |
 | Test.java:6381:19:6381:21 | out : SingletonMap [<map.key>] : String | Test.java:228:18:228:29 | map : SingletonMap [<map.key>] : String | provenance |  |
-| Test.java:6381:19:6381:21 | out : SingletonMap [<map.key>] : String | Test.java:6381:9:6381:22 | getMapKey(...) | provenance | MaD:10 |
+| Test.java:6381:19:6381:21 | out : SingletonMap [<map.key>] : String | Test.java:6381:9:6381:22 | getMapKey(...) | provenance | MaD:18 |
 | Test.java:6386:18:6386:53 | newDKVWithMapValue(...) : DefaultKeyValue [<map.value>] : String | Test.java:6387:27:6387:28 | in : DefaultKeyValue [<map.value>] : String | provenance |  |
 | Test.java:6386:37:6386:52 | (...)... : String | Test.java:291:51:291:57 | value : String | provenance |  |
-| Test.java:6386:37:6386:52 | (...)... : String | Test.java:6386:18:6386:53 | newDKVWithMapValue(...) : DefaultKeyValue [<map.value>] : String | provenance | MaD:206 |
+| Test.java:6386:37:6386:52 | (...)... : String | Test.java:6386:18:6386:53 | newDKVWithMapValue(...) : DefaultKeyValue [<map.value>] : String | provenance | MaD:208 |
 | Test.java:6386:45:6386:52 | source(...) : Object | Test.java:6386:37:6386:52 | (...)... : String | provenance |  |
 | Test.java:6387:10:6387:29 | new SingletonMap<>(...) : SingletonMap [<map.value>] : String | Test.java:6388:21:6388:23 | out : SingletonMap [<map.value>] : String | provenance |  |
 | Test.java:6387:27:6387:28 | in : DefaultKeyValue [<map.value>] : String | Test.java:6387:10:6387:29 | new SingletonMap<>(...) : SingletonMap [<map.value>] : String | provenance | MaD:373 |
 | Test.java:6388:21:6388:23 | out : SingletonMap [<map.value>] : String | Test.java:232:20:232:31 | map : SingletonMap [<map.value>] : String | provenance |  |
-| Test.java:6388:21:6388:23 | out : SingletonMap [<map.value>] : String | Test.java:6388:9:6388:24 | getMapValue(...) | provenance | MaD:9 |
+| Test.java:6388:21:6388:23 | out : SingletonMap [<map.value>] : String | Test.java:6388:9:6388:24 | getMapValue(...) | provenance | MaD:17 |
 | Test.java:6393:13:6393:42 | of(...) : Map [<map.key>] : String | Test.java:6394:27:6394:28 | in : Map [<map.key>] : String | provenance |  |
-| Test.java:6393:20:6393:35 | (...)... : String | Test.java:6393:13:6393:42 | of(...) : Map [<map.key>] : String | provenance | MaD:11 |
+| Test.java:6393:20:6393:35 | (...)... : String | Test.java:6393:13:6393:42 | of(...) : Map [<map.key>] : String | provenance | MaD:13 |
 | Test.java:6393:28:6393:35 | source(...) : Object | Test.java:6393:20:6393:35 | (...)... : String | provenance |  |
 | Test.java:6394:10:6394:29 | new SingletonMap<>(...) : SingletonMap [<map.key>] : String | Test.java:6395:19:6395:21 | out : SingletonMap [<map.key>] : String | provenance |  |
-| Test.java:6394:27:6394:28 | in : Map [<map.key>] : String | Test.java:6394:10:6394:29 | new SingletonMap<>(...) : SingletonMap [<map.key>] : String | provenance | MaD:374 |
+| Test.java:6394:27:6394:28 | in : Map [<map.key>] : String | Test.java:6394:10:6394:29 | new SingletonMap<>(...) : SingletonMap [<map.key>] : String | provenance | MaD:376 |
 | Test.java:6395:19:6395:21 | out : SingletonMap [<map.key>] : String | Test.java:228:18:228:29 | map : SingletonMap [<map.key>] : String | provenance |  |
-| Test.java:6395:19:6395:21 | out : SingletonMap [<map.key>] : String | Test.java:6395:9:6395:22 | getMapKey(...) | provenance | MaD:10 |
+| Test.java:6395:19:6395:21 | out : SingletonMap [<map.key>] : String | Test.java:6395:9:6395:22 | getMapKey(...) | provenance | MaD:18 |
 | Test.java:6400:13:6400:42 | of(...) : Map [<map.value>] : String | Test.java:6401:27:6401:28 | in : Map [<map.value>] : String | provenance |  |
-| Test.java:6400:26:6400:41 | (...)... : String | Test.java:6400:13:6400:42 | of(...) : Map [<map.value>] : String | provenance | MaD:12 |
+| Test.java:6400:26:6400:41 | (...)... : String | Test.java:6400:13:6400:42 | of(...) : Map [<map.value>] : String | provenance | MaD:14 |
 | Test.java:6400:34:6400:41 | source(...) : Object | Test.java:6400:26:6400:41 | (...)... : String | provenance |  |
 | Test.java:6401:10:6401:29 | new SingletonMap<>(...) : SingletonMap [<map.value>] : String | Test.java:6402:21:6402:23 | out : SingletonMap [<map.value>] : String | provenance |  |
-| Test.java:6401:27:6401:28 | in : Map [<map.value>] : String | Test.java:6401:10:6401:29 | new SingletonMap<>(...) : SingletonMap [<map.value>] : String | provenance | MaD:375 |
+| Test.java:6401:27:6401:28 | in : Map [<map.value>] : String | Test.java:6401:10:6401:29 | new SingletonMap<>(...) : SingletonMap [<map.value>] : String | provenance | MaD:377 |
 | Test.java:6402:21:6402:23 | out : SingletonMap [<map.value>] : String | Test.java:232:20:232:31 | map : SingletonMap [<map.value>] : String | provenance |  |
-| Test.java:6402:21:6402:23 | out : SingletonMap [<map.value>] : String | Test.java:6402:9:6402:24 | getMapValue(...) | provenance | MaD:9 |
+| Test.java:6402:21:6402:23 | out : SingletonMap [<map.value>] : String | Test.java:6402:9:6402:24 | getMapValue(...) | provenance | MaD:17 |
 | Test.java:6407:16:6407:23 | source(...) : Object | Test.java:6408:27:6408:28 | in : Object | provenance |  |
 | Test.java:6408:10:6408:35 | new SingletonMap<>(...) : SingletonMap [<map.key>] : Object | Test.java:6409:19:6409:21 | out : SingletonMap [<map.key>] : Object | provenance |  |
-| Test.java:6408:27:6408:28 | in : Object | Test.java:6408:10:6408:35 | new SingletonMap<>(...) : SingletonMap [<map.key>] : Object | provenance | MaD:376 |
+| Test.java:6408:27:6408:28 | in : Object | Test.java:6408:10:6408:35 | new SingletonMap<>(...) : SingletonMap [<map.key>] : Object | provenance | MaD:378 |
 | Test.java:6409:19:6409:21 | out : SingletonMap [<map.key>] : Object | Test.java:228:18:228:29 | map : SingletonMap [<map.key>] : Object | provenance |  |
-| Test.java:6409:19:6409:21 | out : SingletonMap [<map.key>] : Object | Test.java:6409:9:6409:22 | getMapKey(...) | provenance | MaD:10 |
+| Test.java:6409:19:6409:21 | out : SingletonMap [<map.key>] : Object | Test.java:6409:9:6409:22 | getMapKey(...) | provenance | MaD:18 |
 | Test.java:6414:16:6414:23 | source(...) : Object | Test.java:6415:33:6415:34 | in : Object | provenance |  |
 | Test.java:6415:10:6415:35 | new SingletonMap<>(...) : SingletonMap [<map.value>] : Object | Test.java:6416:21:6416:23 | out : SingletonMap [<map.value>] : Object | provenance |  |
-| Test.java:6415:33:6415:34 | in : Object | Test.java:6415:10:6415:35 | new SingletonMap<>(...) : SingletonMap [<map.value>] : Object | provenance | MaD:377 |
+| Test.java:6415:33:6415:34 | in : Object | Test.java:6415:10:6415:35 | new SingletonMap<>(...) : SingletonMap [<map.value>] : Object | provenance | MaD:379 |
 | Test.java:6416:21:6416:23 | out : SingletonMap [<map.value>] : Object | Test.java:232:20:232:31 | map : SingletonMap [<map.value>] : Object | provenance |  |
-| Test.java:6416:21:6416:23 | out : SingletonMap [<map.value>] : Object | Test.java:6416:9:6416:24 | getMapValue(...) | provenance | MaD:9 |
+| Test.java:6416:21:6416:23 | out : SingletonMap [<map.value>] : Object | Test.java:6416:9:6416:24 | getMapValue(...) | provenance | MaD:17 |
 | Test.java:6421:16:6421:23 | source(...) : Object | Test.java:6422:17:6422:18 | in : Object | provenance |  |
 | Test.java:6422:4:6422:6 | out [post update] : SingletonMap [<map.value>] : Object | Test.java:6423:21:6423:23 | out : SingletonMap [<map.value>] : Object | provenance |  |
-| Test.java:6422:17:6422:18 | in : Object | Test.java:6422:4:6422:6 | out [post update] : SingletonMap [<map.value>] : Object | provenance | MaD:378 |
+| Test.java:6422:17:6422:18 | in : Object | Test.java:6422:4:6422:6 | out [post update] : SingletonMap [<map.value>] : Object | provenance | MaD:380 |
 | Test.java:6423:21:6423:23 | out : SingletonMap [<map.value>] : Object | Test.java:232:20:232:31 | map : SingletonMap [<map.value>] : Object | provenance |  |
-| Test.java:6423:21:6423:23 | out : SingletonMap [<map.value>] : Object | Test.java:6423:9:6423:24 | getMapValue(...) | provenance | MaD:9 |
+| Test.java:6423:21:6423:23 | out : SingletonMap [<map.value>] : Object | Test.java:6423:9:6423:24 | getMapValue(...) | provenance | MaD:17 |
 | Test.java:6428:13:6428:42 | of(...) : Map [<map.key>] : String | Test.java:6429:41:6429:42 | in : Map [<map.key>] : String | provenance |  |
-| Test.java:6428:20:6428:35 | (...)... : String | Test.java:6428:13:6428:42 | of(...) : Map [<map.key>] : String | provenance | MaD:11 |
+| Test.java:6428:20:6428:35 | (...)... : String | Test.java:6428:13:6428:42 | of(...) : Map [<map.key>] : String | provenance | MaD:13 |
 | Test.java:6428:28:6428:35 | source(...) : Object | Test.java:6428:20:6428:35 | (...)... : String | provenance |  |
 | Test.java:6429:10:6429:55 | transformingMap(...) : TransformedMap [<map.key>] : String | Test.java:6430:19:6430:21 | out : TransformedMap [<map.key>] : String | provenance |  |
-| Test.java:6429:41:6429:42 | in : Map [<map.key>] : String | Test.java:6429:10:6429:55 | transformingMap(...) : TransformedMap [<map.key>] : String | provenance | MaD:379 |
+| Test.java:6429:41:6429:42 | in : Map [<map.key>] : String | Test.java:6429:10:6429:55 | transformingMap(...) : TransformedMap [<map.key>] : String | provenance | MaD:381 |
 | Test.java:6430:19:6430:21 | out : TransformedMap [<map.key>] : String | Test.java:228:18:228:29 | map : TransformedMap [<map.key>] : String | provenance |  |
-| Test.java:6430:19:6430:21 | out : TransformedMap [<map.key>] : String | Test.java:6430:9:6430:22 | getMapKey(...) | provenance | MaD:10 |
+| Test.java:6430:19:6430:21 | out : TransformedMap [<map.key>] : String | Test.java:6430:9:6430:22 | getMapKey(...) | provenance | MaD:18 |
 | Test.java:6435:13:6435:42 | of(...) : Map [<map.value>] : String | Test.java:6436:41:6436:42 | in : Map [<map.value>] : String | provenance |  |
-| Test.java:6435:26:6435:41 | (...)... : String | Test.java:6435:13:6435:42 | of(...) : Map [<map.value>] : String | provenance | MaD:12 |
+| Test.java:6435:26:6435:41 | (...)... : String | Test.java:6435:13:6435:42 | of(...) : Map [<map.value>] : String | provenance | MaD:14 |
 | Test.java:6435:34:6435:41 | source(...) : Object | Test.java:6435:26:6435:41 | (...)... : String | provenance |  |
 | Test.java:6436:10:6436:55 | transformingMap(...) : TransformedMap [<map.value>] : String | Test.java:6437:21:6437:23 | out : TransformedMap [<map.value>] : String | provenance |  |
-| Test.java:6436:41:6436:42 | in : Map [<map.value>] : String | Test.java:6436:10:6436:55 | transformingMap(...) : TransformedMap [<map.value>] : String | provenance | MaD:380 |
+| Test.java:6436:41:6436:42 | in : Map [<map.value>] : String | Test.java:6436:10:6436:55 | transformingMap(...) : TransformedMap [<map.value>] : String | provenance | MaD:382 |
 | Test.java:6437:21:6437:23 | out : TransformedMap [<map.value>] : String | Test.java:232:20:232:31 | map : TransformedMap [<map.value>] : String | provenance |  |
-| Test.java:6437:21:6437:23 | out : TransformedMap [<map.value>] : String | Test.java:6437:9:6437:24 | getMapValue(...) | provenance | MaD:9 |
+| Test.java:6437:21:6437:23 | out : TransformedMap [<map.value>] : String | Test.java:6437:9:6437:24 | getMapValue(...) | provenance | MaD:17 |
 | Test.java:6442:19:6442:56 | newTreeMapWithMapKey(...) : TreeMap [<map.key>] : String | Test.java:6443:53:6443:54 | in : TreeMap [<map.key>] : String | provenance |  |
 | Test.java:6442:40:6442:55 | (...)... : String | Test.java:285:47:285:51 | key : String | provenance |  |
-| Test.java:6442:40:6442:55 | (...)... : String | Test.java:6442:19:6442:56 | newTreeMapWithMapKey(...) : TreeMap [<map.key>] : String | provenance | MaD:14 |
+| Test.java:6442:40:6442:55 | (...)... : String | Test.java:6442:19:6442:56 | newTreeMapWithMapKey(...) : TreeMap [<map.key>] : String | provenance | MaD:19 |
 | Test.java:6442:48:6442:55 | source(...) : Object | Test.java:6442:40:6442:55 | (...)... : String | provenance |  |
 | Test.java:6443:10:6443:67 | transformingSortedMap(...) : TransformedSortedMap [<map.key>] : String | Test.java:6444:19:6444:21 | out : TransformedSortedMap [<map.key>] : String | provenance |  |
-| Test.java:6443:53:6443:54 | in : TreeMap [<map.key>] : String | Test.java:6443:10:6443:67 | transformingSortedMap(...) : TransformedSortedMap [<map.key>] : String | provenance | MaD:381 |
+| Test.java:6443:53:6443:54 | in : TreeMap [<map.key>] : String | Test.java:6443:10:6443:67 | transformingSortedMap(...) : TransformedSortedMap [<map.key>] : String | provenance | MaD:383 |
 | Test.java:6444:19:6444:21 | out : TransformedSortedMap [<map.key>] : String | Test.java:228:18:228:29 | map : TransformedSortedMap [<map.key>] : String | provenance |  |
-| Test.java:6444:19:6444:21 | out : TransformedSortedMap [<map.key>] : String | Test.java:6444:9:6444:22 | getMapKey(...) | provenance | MaD:10 |
+| Test.java:6444:19:6444:21 | out : TransformedSortedMap [<map.key>] : String | Test.java:6444:9:6444:22 | getMapKey(...) | provenance | MaD:18 |
 | Test.java:6449:19:6449:58 | newTreeMapWithMapValue(...) : TreeMap [<map.value>] : String | Test.java:6450:53:6450:54 | in : TreeMap [<map.value>] : String | provenance |  |
 | Test.java:6449:42:6449:57 | (...)... : String | Test.java:304:49:304:55 | value : String | provenance |  |
-| Test.java:6449:42:6449:57 | (...)... : String | Test.java:6449:19:6449:58 | newTreeMapWithMapValue(...) : TreeMap [<map.value>] : String | provenance | MaD:15 |
+| Test.java:6449:42:6449:57 | (...)... : String | Test.java:6449:19:6449:58 | newTreeMapWithMapValue(...) : TreeMap [<map.value>] : String | provenance | MaD:20 |
 | Test.java:6449:50:6449:57 | source(...) : Object | Test.java:6449:42:6449:57 | (...)... : String | provenance |  |
 | Test.java:6450:10:6450:67 | transformingSortedMap(...) : TransformedSortedMap [<map.value>] : String | Test.java:6451:21:6451:23 | out : TransformedSortedMap [<map.value>] : String | provenance |  |
-| Test.java:6450:53:6450:54 | in : TreeMap [<map.value>] : String | Test.java:6450:10:6450:67 | transformingSortedMap(...) : TransformedSortedMap [<map.value>] : String | provenance | MaD:382 |
+| Test.java:6450:53:6450:54 | in : TreeMap [<map.value>] : String | Test.java:6450:10:6450:67 | transformingSortedMap(...) : TransformedSortedMap [<map.value>] : String | provenance | MaD:384 |
 | Test.java:6451:21:6451:23 | out : TransformedSortedMap [<map.value>] : String | Test.java:232:20:232:31 | map : TransformedSortedMap [<map.value>] : String | provenance |  |
-| Test.java:6451:21:6451:23 | out : TransformedSortedMap [<map.value>] : String | Test.java:6451:9:6451:24 | getMapValue(...) | provenance | MaD:9 |
+| Test.java:6451:21:6451:23 | out : TransformedSortedMap [<map.value>] : String | Test.java:6451:9:6451:24 | getMapValue(...) | provenance | MaD:17 |
 | Test.java:6456:39:6456:102 | newListOrderedSetWithElement(...) : ListOrderedSet [<element>, <map.key>] : String | Test.java:6457:52:6457:53 | in : ListOrderedSet [<element>, <map.key>] : String | provenance |  |
 | Test.java:6456:68:6456:101 | newTMEWithMapKey(...) : TiedMapEntry [<map.key>] : String | Test.java:260:53:260:61 | element : TiedMapEntry [<map.key>] : String | provenance |  |
-| Test.java:6456:68:6456:101 | newTMEWithMapKey(...) : TiedMapEntry [<map.key>] : String | Test.java:6456:39:6456:102 | newListOrderedSetWithElement(...) : ListOrderedSet [<element>, <map.key>] : String | provenance | MaD:2 |
+| Test.java:6456:68:6456:101 | newTMEWithMapKey(...) : TiedMapEntry [<map.key>] : String | Test.java:6456:39:6456:102 | newListOrderedSetWithElement(...) : ListOrderedSet [<element>, <map.key>] : String | provenance | MaD:4 |
 | Test.java:6456:85:6456:100 | (...)... : String | Test.java:286:46:286:50 | key : String | provenance |  |
-| Test.java:6456:85:6456:100 | (...)... : String | Test.java:6456:68:6456:101 | newTMEWithMapKey(...) : TiedMapEntry [<map.key>] : String | provenance | MaD:234 |
+| Test.java:6456:85:6456:100 | (...)... : String | Test.java:6456:68:6456:101 | newTMEWithMapKey(...) : TiedMapEntry [<map.key>] : String | provenance | MaD:236 |
 | Test.java:6456:93:6456:100 | source(...) : Object | Test.java:6456:85:6456:100 | (...)... : String | provenance |  |
 | Test.java:6457:10:6457:54 | unmodifiableEntrySet(...) : Set [<element>, <map.key>] : String | Test.java:6458:39:6458:41 | out : Set [<element>, <map.key>] : String | provenance |  |
-| Test.java:6457:52:6457:53 | in : ListOrderedSet [<element>, <map.key>] : String | Test.java:6457:10:6457:54 | unmodifiableEntrySet(...) : Set [<element>, <map.key>] : String | provenance | MaD:383 |
+| Test.java:6457:52:6457:53 | in : ListOrderedSet [<element>, <map.key>] : String | Test.java:6457:10:6457:54 | unmodifiableEntrySet(...) : Set [<element>, <map.key>] : String | provenance | MaD:385 |
 | Test.java:6458:28:6458:42 | getElement(...) : Entry [<map.key>] : String | Test.java:238:27:238:50 | container : Entry [<map.key>] : String | provenance |  |
-| Test.java:6458:28:6458:42 | getElement(...) : Entry [<map.key>] : String | Test.java:6458:9:6458:43 | getMapKeyFromEntry(...) | provenance | MaD:20 |
+| Test.java:6458:28:6458:42 | getElement(...) : Entry [<map.key>] : String | Test.java:6458:9:6458:43 | getMapKeyFromEntry(...) | provenance | MaD:9 |
 | Test.java:6458:39:6458:41 | out : Set [<element>, <map.key>] : String | Test.java:230:19:230:32 | it : Set [<element>, <map.key>] : String | provenance |  |
-| Test.java:6458:39:6458:41 | out : Set [<element>, <map.key>] : String | Test.java:6458:28:6458:42 | getElement(...) : Entry [<map.key>] : String | provenance | MaD:1 |
+| Test.java:6458:39:6458:41 | out : Set [<element>, <map.key>] : String | Test.java:6458:28:6458:42 | getElement(...) : Entry [<map.key>] : String | provenance | MaD:3 |
 | Test.java:6463:39:6463:104 | newListOrderedSetWithElement(...) : ListOrderedSet [<element>, <map.value>] : String | Test.java:6464:52:6464:53 | in : ListOrderedSet [<element>, <map.value>] : String | provenance |  |
 | Test.java:6463:68:6463:103 | newTMEWithMapValue(...) : TiedMapEntry [<map.value>] : String | Test.java:260:53:260:61 | element : TiedMapEntry [<map.value>] : String | provenance |  |
-| Test.java:6463:68:6463:103 | newTMEWithMapValue(...) : TiedMapEntry [<map.value>] : String | Test.java:6463:39:6463:104 | newListOrderedSetWithElement(...) : ListOrderedSet [<element>, <map.value>] : String | provenance | MaD:2 |
+| Test.java:6463:68:6463:103 | newTMEWithMapValue(...) : TiedMapEntry [<map.value>] : String | Test.java:6463:39:6463:104 | newListOrderedSetWithElement(...) : ListOrderedSet [<element>, <map.value>] : String | provenance | MaD:4 |
 | Test.java:6463:87:6463:102 | (...)... : String | Test.java:305:48:305:54 | value : String | provenance |  |
-| Test.java:6463:87:6463:102 | (...)... : String | Test.java:6463:68:6463:103 | newTMEWithMapValue(...) : TiedMapEntry [<map.value>] : String | provenance | MaD:15 |
+| Test.java:6463:87:6463:102 | (...)... : String | Test.java:6463:68:6463:103 | newTMEWithMapValue(...) : TiedMapEntry [<map.value>] : String | provenance | MaD:20 |
 | Test.java:6463:95:6463:102 | source(...) : Object | Test.java:6463:87:6463:102 | (...)... : String | provenance |  |
 | Test.java:6464:10:6464:54 | unmodifiableEntrySet(...) : Set [<element>, <map.value>] : String | Test.java:6465:41:6465:43 | out : Set [<element>, <map.value>] : String | provenance |  |
-| Test.java:6464:52:6464:53 | in : ListOrderedSet [<element>, <map.value>] : String | Test.java:6464:10:6464:54 | unmodifiableEntrySet(...) : Set [<element>, <map.value>] : String | provenance | MaD:384 |
+| Test.java:6464:52:6464:53 | in : ListOrderedSet [<element>, <map.value>] : String | Test.java:6464:10:6464:54 | unmodifiableEntrySet(...) : Set [<element>, <map.value>] : String | provenance | MaD:386 |
 | Test.java:6465:30:6465:44 | getElement(...) : Entry [<map.value>] : String | Test.java:244:29:244:52 | container : Entry [<map.value>] : String | provenance |  |
-| Test.java:6465:30:6465:44 | getElement(...) : Entry [<map.value>] : String | Test.java:6465:9:6465:45 | getMapValueFromEntry(...) | provenance | MaD:21 |
+| Test.java:6465:30:6465:44 | getElement(...) : Entry [<map.value>] : String | Test.java:6465:9:6465:45 | getMapValueFromEntry(...) | provenance | MaD:10 |
 | Test.java:6465:41:6465:43 | out : Set [<element>, <map.value>] : String | Test.java:230:19:230:32 | it : Set [<element>, <map.value>] : String | provenance |  |
-| Test.java:6465:41:6465:43 | out : Set [<element>, <map.value>] : String | Test.java:6465:30:6465:44 | getElement(...) : Entry [<map.value>] : String | provenance | MaD:1 |
+| Test.java:6465:41:6465:43 | out : Set [<element>, <map.value>] : String | Test.java:6465:30:6465:44 | getElement(...) : Entry [<map.value>] : String | provenance | MaD:3 |
 | Test.java:6470:13:6470:42 | of(...) : Map [<map.key>] : String | Test.java:6471:42:6471:43 | in : Map [<map.key>] : String | provenance |  |
-| Test.java:6470:20:6470:35 | (...)... : String | Test.java:6470:13:6470:42 | of(...) : Map [<map.key>] : String | provenance | MaD:11 |
+| Test.java:6470:20:6470:35 | (...)... : String | Test.java:6470:13:6470:42 | of(...) : Map [<map.key>] : String | provenance | MaD:13 |
 | Test.java:6470:28:6470:35 | source(...) : Object | Test.java:6470:20:6470:35 | (...)... : String | provenance |  |
 | Test.java:6471:10:6471:44 | unmodifiableMap(...) : Map [<map.key>] : String | Test.java:6472:19:6472:21 | out : Map [<map.key>] : String | provenance |  |
-| Test.java:6471:42:6471:43 | in : Map [<map.key>] : String | Test.java:6471:10:6471:44 | unmodifiableMap(...) : Map [<map.key>] : String | provenance | MaD:385 |
+| Test.java:6471:42:6471:43 | in : Map [<map.key>] : String | Test.java:6471:10:6471:44 | unmodifiableMap(...) : Map [<map.key>] : String | provenance | MaD:387 |
 | Test.java:6472:19:6472:21 | out : Map [<map.key>] : String | Test.java:228:18:228:29 | map : Map [<map.key>] : String | provenance |  |
-| Test.java:6472:19:6472:21 | out : Map [<map.key>] : String | Test.java:6472:9:6472:22 | getMapKey(...) | provenance | MaD:10 |
+| Test.java:6472:19:6472:21 | out : Map [<map.key>] : String | Test.java:6472:9:6472:22 | getMapKey(...) | provenance | MaD:18 |
 | Test.java:6477:13:6477:42 | of(...) : Map [<map.value>] : String | Test.java:6478:42:6478:43 | in : Map [<map.value>] : String | provenance |  |
-| Test.java:6477:26:6477:41 | (...)... : String | Test.java:6477:13:6477:42 | of(...) : Map [<map.value>] : String | provenance | MaD:12 |
+| Test.java:6477:26:6477:41 | (...)... : String | Test.java:6477:13:6477:42 | of(...) : Map [<map.value>] : String | provenance | MaD:14 |
 | Test.java:6477:34:6477:41 | source(...) : Object | Test.java:6477:26:6477:41 | (...)... : String | provenance |  |
 | Test.java:6478:10:6478:44 | unmodifiableMap(...) : Map [<map.value>] : String | Test.java:6479:21:6479:23 | out : Map [<map.value>] : String | provenance |  |
-| Test.java:6478:42:6478:43 | in : Map [<map.value>] : String | Test.java:6478:10:6478:44 | unmodifiableMap(...) : Map [<map.value>] : String | provenance | MaD:386 |
+| Test.java:6478:42:6478:43 | in : Map [<map.value>] : String | Test.java:6478:10:6478:44 | unmodifiableMap(...) : Map [<map.value>] : String | provenance | MaD:388 |
 | Test.java:6479:21:6479:23 | out : Map [<map.value>] : String | Test.java:232:20:232:31 | map : Map [<map.value>] : String | provenance |  |
-| Test.java:6479:21:6479:23 | out : Map [<map.value>] : String | Test.java:6479:9:6479:24 | getMapValue(...) | provenance | MaD:9 |
+| Test.java:6479:21:6479:23 | out : Map [<map.value>] : String | Test.java:6479:9:6479:24 | getMapValue(...) | provenance | MaD:17 |
 | Test.java:6484:20:6484:64 | newListOrderedMapWithMapKey(...) : ListOrderedMap [<map.key>] : String | Test.java:6485:56:6485:57 | in : ListOrderedMap [<map.key>] : String | provenance |  |
 | Test.java:6484:48:6484:63 | (...)... : String | Test.java:277:59:277:63 | key : String | provenance |  |
-| Test.java:6484:48:6484:63 | (...)... : String | Test.java:6484:20:6484:64 | newListOrderedMapWithMapKey(...) : ListOrderedMap [<map.key>] : String | provenance | MaD:11 |
+| Test.java:6484:48:6484:63 | (...)... : String | Test.java:6484:20:6484:64 | newListOrderedMapWithMapKey(...) : ListOrderedMap [<map.key>] : String | provenance | MaD:13 |
 | Test.java:6484:56:6484:63 | source(...) : Object | Test.java:6484:48:6484:63 | (...)... : String | provenance |  |
 | Test.java:6485:10:6485:58 | unmodifiableOrderedMap(...) : OrderedMap [<map.key>] : String | Test.java:6486:19:6486:21 | out : OrderedMap [<map.key>] : String | provenance |  |
-| Test.java:6485:56:6485:57 | in : ListOrderedMap [<map.key>] : String | Test.java:6485:10:6485:58 | unmodifiableOrderedMap(...) : OrderedMap [<map.key>] : String | provenance | MaD:387 |
+| Test.java:6485:56:6485:57 | in : ListOrderedMap [<map.key>] : String | Test.java:6485:10:6485:58 | unmodifiableOrderedMap(...) : OrderedMap [<map.key>] : String | provenance | MaD:389 |
 | Test.java:6486:19:6486:21 | out : OrderedMap [<map.key>] : String | Test.java:228:18:228:29 | map : OrderedMap [<map.key>] : String | provenance |  |
-| Test.java:6486:19:6486:21 | out : OrderedMap [<map.key>] : String | Test.java:6486:9:6486:22 | getMapKey(...) | provenance | MaD:10 |
+| Test.java:6486:19:6486:21 | out : OrderedMap [<map.key>] : String | Test.java:6486:9:6486:22 | getMapKey(...) | provenance | MaD:18 |
 | Test.java:6491:20:6491:66 | newListOrderedMapWithMapValue(...) : ListOrderedMap [<map.value>] : String | Test.java:6492:56:6492:57 | in : ListOrderedMap [<map.value>] : String | provenance |  |
 | Test.java:6491:50:6491:65 | (...)... : String | Test.java:296:61:296:67 | value : String | provenance |  |
-| Test.java:6491:50:6491:65 | (...)... : String | Test.java:6491:20:6491:66 | newListOrderedMapWithMapValue(...) : ListOrderedMap [<map.value>] : String | provenance | MaD:12 |
+| Test.java:6491:50:6491:65 | (...)... : String | Test.java:6491:20:6491:66 | newListOrderedMapWithMapValue(...) : ListOrderedMap [<map.value>] : String | provenance | MaD:14 |
 | Test.java:6491:58:6491:65 | source(...) : Object | Test.java:6491:50:6491:65 | (...)... : String | provenance |  |
 | Test.java:6492:10:6492:58 | unmodifiableOrderedMap(...) : OrderedMap [<map.value>] : String | Test.java:6493:21:6493:23 | out : OrderedMap [<map.value>] : String | provenance |  |
-| Test.java:6492:56:6492:57 | in : ListOrderedMap [<map.value>] : String | Test.java:6492:10:6492:58 | unmodifiableOrderedMap(...) : OrderedMap [<map.value>] : String | provenance | MaD:388 |
+| Test.java:6492:56:6492:57 | in : ListOrderedMap [<map.value>] : String | Test.java:6492:10:6492:58 | unmodifiableOrderedMap(...) : OrderedMap [<map.value>] : String | provenance | MaD:390 |
 | Test.java:6493:21:6493:23 | out : OrderedMap [<map.value>] : String | Test.java:232:20:232:31 | map : OrderedMap [<map.value>] : String | provenance |  |
-| Test.java:6493:21:6493:23 | out : OrderedMap [<map.value>] : String | Test.java:6493:9:6493:24 | getMapValue(...) | provenance | MaD:9 |
+| Test.java:6493:21:6493:23 | out : OrderedMap [<map.value>] : String | Test.java:6493:9:6493:24 | getMapValue(...) | provenance | MaD:17 |
 | Test.java:6498:19:6498:56 | newTreeMapWithMapKey(...) : TreeMap [<map.key>] : String | Test.java:6499:54:6499:55 | in : TreeMap [<map.key>] : String | provenance |  |
 | Test.java:6498:40:6498:55 | (...)... : String | Test.java:285:47:285:51 | key : String | provenance |  |
-| Test.java:6498:40:6498:55 | (...)... : String | Test.java:6498:19:6498:56 | newTreeMapWithMapKey(...) : TreeMap [<map.key>] : String | provenance | MaD:14 |
+| Test.java:6498:40:6498:55 | (...)... : String | Test.java:6498:19:6498:56 | newTreeMapWithMapKey(...) : TreeMap [<map.key>] : String | provenance | MaD:19 |
 | Test.java:6498:48:6498:55 | source(...) : Object | Test.java:6498:40:6498:55 | (...)... : String | provenance |  |
 | Test.java:6499:10:6499:56 | unmodifiableSortedMap(...) : SortedMap [<map.key>] : String | Test.java:6500:19:6500:21 | out : SortedMap [<map.key>] : String | provenance |  |
-| Test.java:6499:54:6499:55 | in : TreeMap [<map.key>] : String | Test.java:6499:10:6499:56 | unmodifiableSortedMap(...) : SortedMap [<map.key>] : String | provenance | MaD:389 |
+| Test.java:6499:54:6499:55 | in : TreeMap [<map.key>] : String | Test.java:6499:10:6499:56 | unmodifiableSortedMap(...) : SortedMap [<map.key>] : String | provenance | MaD:391 |
 | Test.java:6500:19:6500:21 | out : SortedMap [<map.key>] : String | Test.java:228:18:228:29 | map : SortedMap [<map.key>] : String | provenance |  |
-| Test.java:6500:19:6500:21 | out : SortedMap [<map.key>] : String | Test.java:6500:9:6500:22 | getMapKey(...) | provenance | MaD:10 |
+| Test.java:6500:19:6500:21 | out : SortedMap [<map.key>] : String | Test.java:6500:9:6500:22 | getMapKey(...) | provenance | MaD:18 |
 | Test.java:6505:19:6505:58 | newTreeMapWithMapValue(...) : TreeMap [<map.value>] : String | Test.java:6506:54:6506:55 | in : TreeMap [<map.value>] : String | provenance |  |
 | Test.java:6505:42:6505:57 | (...)... : String | Test.java:304:49:304:55 | value : String | provenance |  |
-| Test.java:6505:42:6505:57 | (...)... : String | Test.java:6505:19:6505:58 | newTreeMapWithMapValue(...) : TreeMap [<map.value>] : String | provenance | MaD:15 |
+| Test.java:6505:42:6505:57 | (...)... : String | Test.java:6505:19:6505:58 | newTreeMapWithMapValue(...) : TreeMap [<map.value>] : String | provenance | MaD:20 |
 | Test.java:6505:50:6505:57 | source(...) : Object | Test.java:6505:42:6505:57 | (...)... : String | provenance |  |
 | Test.java:6506:10:6506:56 | unmodifiableSortedMap(...) : SortedMap [<map.value>] : String | Test.java:6507:21:6507:23 | out : SortedMap [<map.value>] : String | provenance |  |
-| Test.java:6506:54:6506:55 | in : TreeMap [<map.value>] : String | Test.java:6506:10:6506:56 | unmodifiableSortedMap(...) : SortedMap [<map.value>] : String | provenance | MaD:390 |
+| Test.java:6506:54:6506:55 | in : TreeMap [<map.value>] : String | Test.java:6506:10:6506:56 | unmodifiableSortedMap(...) : SortedMap [<map.value>] : String | provenance | MaD:392 |
 | Test.java:6507:21:6507:23 | out : SortedMap [<map.value>] : String | Test.java:232:20:232:31 | map : SortedMap [<map.value>] : String | provenance |  |
-| Test.java:6507:21:6507:23 | out : SortedMap [<map.value>] : String | Test.java:6507:9:6507:24 | getMapValue(...) | provenance | MaD:9 |
+| Test.java:6507:21:6507:23 | out : SortedMap [<map.value>] : String | Test.java:6507:9:6507:24 | getMapValue(...) | provenance | MaD:17 |
 | Test.java:6512:13:6512:42 | of(...) : Map [<map.key>] : String | Test.java:6513:37:6513:38 | in : Map [<map.key>] : String | provenance |  |
-| Test.java:6512:20:6512:35 | (...)... : String | Test.java:6512:13:6512:42 | of(...) : Map [<map.key>] : String | provenance | MaD:11 |
+| Test.java:6512:20:6512:35 | (...)... : String | Test.java:6512:13:6512:42 | of(...) : Map [<map.key>] : String | provenance | MaD:13 |
 | Test.java:6512:28:6512:35 | source(...) : Object | Test.java:6512:20:6512:35 | (...)... : String | provenance |  |
 | Test.java:6513:10:6513:39 | new ArrayListValuedHashMap<>(...) : ArrayListValuedHashMap [<map.key>] : String | Test.java:6514:19:6514:21 | out : ArrayListValuedHashMap [<map.key>] : String | provenance |  |
-| Test.java:6513:37:6513:38 | in : Map [<map.key>] : String | Test.java:6513:10:6513:39 | new ArrayListValuedHashMap<>(...) : ArrayListValuedHashMap [<map.key>] : String | provenance | MaD:748 |
+| Test.java:6513:37:6513:38 | in : Map [<map.key>] : String | Test.java:6513:10:6513:39 | new ArrayListValuedHashMap<>(...) : ArrayListValuedHashMap [<map.key>] : String | provenance | MaD:393 |
 | Test.java:6514:19:6514:21 | out : ArrayListValuedHashMap [<map.key>] : String | Test.java:240:18:240:46 | container : ArrayListValuedHashMap [<map.key>] : String | provenance |  |
-| Test.java:6514:19:6514:21 | out : ArrayListValuedHashMap [<map.key>] : String | Test.java:6514:9:6514:22 | getMapKey(...) | provenance | MaD:685 |
+| Test.java:6514:19:6514:21 | out : ArrayListValuedHashMap [<map.key>] : String | Test.java:6514:9:6514:22 | getMapKey(...) | provenance | MaD:760 |
 | Test.java:6519:13:6519:42 | of(...) : Map [<map.value>] : String | Test.java:6520:37:6520:38 | in : Map [<map.value>] : String | provenance |  |
-| Test.java:6519:26:6519:41 | (...)... : String | Test.java:6519:13:6519:42 | of(...) : Map [<map.value>] : String | provenance | MaD:12 |
+| Test.java:6519:26:6519:41 | (...)... : String | Test.java:6519:13:6519:42 | of(...) : Map [<map.value>] : String | provenance | MaD:14 |
 | Test.java:6519:34:6519:41 | source(...) : Object | Test.java:6519:26:6519:41 | (...)... : String | provenance |  |
 | Test.java:6520:10:6520:39 | new ArrayListValuedHashMap<>(...) : ArrayListValuedHashMap [<map.value>, <element>] : String | Test.java:6521:32:6521:34 | out : ArrayListValuedHashMap [<map.value>, <element>] : String | provenance |  |
-| Test.java:6520:37:6520:38 | in : Map [<map.value>] : String | Test.java:6520:10:6520:39 | new ArrayListValuedHashMap<>(...) : ArrayListValuedHashMap [<map.value>, <element>] : String | provenance | MaD:749 |
+| Test.java:6520:37:6520:38 | in : Map [<map.value>] : String | Test.java:6520:10:6520:39 | new ArrayListValuedHashMap<>(...) : ArrayListValuedHashMap [<map.value>, <element>] : String | provenance | MaD:394 |
 | Test.java:6521:20:6521:35 | getMapValue(...) : Collection [<element>] : String | Test.java:230:19:230:32 | it : Collection [<element>] : String | provenance |  |
-| Test.java:6521:20:6521:35 | getMapValue(...) : Collection [<element>] : String | Test.java:6521:9:6521:36 | getElement(...) | provenance | MaD:1 |
+| Test.java:6521:20:6521:35 | getMapValue(...) : Collection [<element>] : String | Test.java:6521:9:6521:36 | getElement(...) | provenance | MaD:3 |
 | Test.java:6521:32:6521:34 | out : ArrayListValuedHashMap [<map.value>, <element>] : String | Test.java:247:32:247:60 | container : ArrayListValuedHashMap [<map.value>, <element>] : String | provenance |  |
-| Test.java:6521:32:6521:34 | out : ArrayListValuedHashMap [<map.value>, <element>] : String | Test.java:6521:20:6521:35 | getMapValue(...) : Collection [<element>] : String | provenance | MaD:684 |
+| Test.java:6521:32:6521:34 | out : ArrayListValuedHashMap [<map.value>, <element>] : String | Test.java:6521:20:6521:35 | getMapValue(...) : Collection [<element>] : String | provenance | MaD:759 |
 | Test.java:6526:24:6526:61 | newALVHMWithMapValue(...) : ArrayListValuedHashMap [<map.value>, <element>] : String | Test.java:6527:37:6527:38 | in : ArrayListValuedHashMap [<map.value>, <element>] : String | provenance |  |
 | Test.java:6526:45:6526:60 | (...)... : String | Test.java:290:60:290:66 | value : String | provenance |  |
-| Test.java:6526:45:6526:60 | (...)... : String | Test.java:6526:24:6526:61 | newALVHMWithMapValue(...) : ArrayListValuedHashMap [<map.value>, <element>] : String | provenance | MaD:690 |
+| Test.java:6526:45:6526:60 | (...)... : String | Test.java:6526:24:6526:61 | newALVHMWithMapValue(...) : ArrayListValuedHashMap [<map.value>, <element>] : String | provenance | MaD:765 |
 | Test.java:6526:53:6526:60 | source(...) : Object | Test.java:6526:45:6526:60 | (...)... : String | provenance |  |
 | Test.java:6527:10:6527:39 | new ArrayListValuedHashMap<>(...) : ArrayListValuedHashMap [<map.value>, <element>] : String | Test.java:6528:32:6528:34 | out : ArrayListValuedHashMap [<map.value>, <element>] : String | provenance |  |
-| Test.java:6527:37:6527:38 | in : ArrayListValuedHashMap [<map.value>, <element>] : String | Test.java:6527:10:6527:39 | new ArrayListValuedHashMap<>(...) : ArrayListValuedHashMap [<map.value>, <element>] : String | provenance | MaD:751 |
+| Test.java:6527:37:6527:38 | in : ArrayListValuedHashMap [<map.value>, <element>] : String | Test.java:6527:10:6527:39 | new ArrayListValuedHashMap<>(...) : ArrayListValuedHashMap [<map.value>, <element>] : String | provenance | MaD:396 |
 | Test.java:6528:20:6528:35 | getMapValue(...) : Collection [<element>] : String | Test.java:230:19:230:32 | it : Collection [<element>] : String | provenance |  |
-| Test.java:6528:20:6528:35 | getMapValue(...) : Collection [<element>] : String | Test.java:6528:9:6528:36 | getElement(...) | provenance | MaD:1 |
+| Test.java:6528:20:6528:35 | getMapValue(...) : Collection [<element>] : String | Test.java:6528:9:6528:36 | getElement(...) | provenance | MaD:3 |
 | Test.java:6528:32:6528:34 | out : ArrayListValuedHashMap [<map.value>, <element>] : String | Test.java:247:32:247:60 | container : ArrayListValuedHashMap [<map.value>, <element>] : String | provenance |  |
-| Test.java:6528:32:6528:34 | out : ArrayListValuedHashMap [<map.value>, <element>] : String | Test.java:6528:20:6528:35 | getMapValue(...) : Collection [<element>] : String | provenance | MaD:684 |
+| Test.java:6528:32:6528:34 | out : ArrayListValuedHashMap [<map.value>, <element>] : String | Test.java:6528:20:6528:35 | getMapValue(...) : Collection [<element>] : String | provenance | MaD:759 |
 | Test.java:6533:24:6533:59 | newALVHMWithMapKey(...) : ArrayListValuedHashMap [<map.key>] : String | Test.java:6534:37:6534:38 | in : ArrayListValuedHashMap [<map.key>] : String | provenance |  |
 | Test.java:6533:43:6533:58 | (...)... : String | Test.java:272:58:272:62 | key : String | provenance |  |
-| Test.java:6533:43:6533:58 | (...)... : String | Test.java:6533:24:6533:59 | newALVHMWithMapKey(...) : ArrayListValuedHashMap [<map.key>] : String | provenance | MaD:689 |
+| Test.java:6533:43:6533:58 | (...)... : String | Test.java:6533:24:6533:59 | newALVHMWithMapKey(...) : ArrayListValuedHashMap [<map.key>] : String | provenance | MaD:764 |
 | Test.java:6533:51:6533:58 | source(...) : Object | Test.java:6533:43:6533:58 | (...)... : String | provenance |  |
 | Test.java:6534:10:6534:39 | new ArrayListValuedHashMap<>(...) : ArrayListValuedHashMap [<map.key>] : String | Test.java:6535:19:6535:21 | out : ArrayListValuedHashMap [<map.key>] : String | provenance |  |
-| Test.java:6534:37:6534:38 | in : ArrayListValuedHashMap [<map.key>] : String | Test.java:6534:10:6534:39 | new ArrayListValuedHashMap<>(...) : ArrayListValuedHashMap [<map.key>] : String | provenance | MaD:750 |
+| Test.java:6534:37:6534:38 | in : ArrayListValuedHashMap [<map.key>] : String | Test.java:6534:10:6534:39 | new ArrayListValuedHashMap<>(...) : ArrayListValuedHashMap [<map.key>] : String | provenance | MaD:395 |
 | Test.java:6535:19:6535:21 | out : ArrayListValuedHashMap [<map.key>] : String | Test.java:240:18:240:46 | container : ArrayListValuedHashMap [<map.key>] : String | provenance |  |
-| Test.java:6535:19:6535:21 | out : ArrayListValuedHashMap [<map.key>] : String | Test.java:6535:9:6535:22 | getMapKey(...) | provenance | MaD:685 |
+| Test.java:6535:19:6535:21 | out : ArrayListValuedHashMap [<map.key>] : String | Test.java:6535:9:6535:22 | getMapKey(...) | provenance | MaD:760 |
 | Test.java:6540:13:6540:42 | of(...) : Map [<map.key>] : String | Test.java:6541:35:6541:36 | in : Map [<map.key>] : String | provenance |  |
-| Test.java:6540:20:6540:35 | (...)... : String | Test.java:6540:13:6540:42 | of(...) : Map [<map.key>] : String | provenance | MaD:11 |
+| Test.java:6540:20:6540:35 | (...)... : String | Test.java:6540:13:6540:42 | of(...) : Map [<map.key>] : String | provenance | MaD:13 |
 | Test.java:6540:28:6540:35 | source(...) : Object | Test.java:6540:20:6540:35 | (...)... : String | provenance |  |
 | Test.java:6541:10:6541:37 | new HashSetValuedHashMap<>(...) : HashSetValuedHashMap [<map.key>] : String | Test.java:6542:19:6542:21 | out : HashSetValuedHashMap [<map.key>] : String | provenance |  |
-| Test.java:6541:35:6541:36 | in : Map [<map.key>] : String | Test.java:6541:10:6541:37 | new HashSetValuedHashMap<>(...) : HashSetValuedHashMap [<map.key>] : String | provenance | MaD:752 |
+| Test.java:6541:35:6541:36 | in : Map [<map.key>] : String | Test.java:6541:10:6541:37 | new HashSetValuedHashMap<>(...) : HashSetValuedHashMap [<map.key>] : String | provenance | MaD:397 |
 | Test.java:6542:19:6542:21 | out : HashSetValuedHashMap [<map.key>] : String | Test.java:240:18:240:46 | container : HashSetValuedHashMap [<map.key>] : String | provenance |  |
-| Test.java:6542:19:6542:21 | out : HashSetValuedHashMap [<map.key>] : String | Test.java:6542:9:6542:22 | getMapKey(...) | provenance | MaD:685 |
+| Test.java:6542:19:6542:21 | out : HashSetValuedHashMap [<map.key>] : String | Test.java:6542:9:6542:22 | getMapKey(...) | provenance | MaD:760 |
 | Test.java:6547:13:6547:42 | of(...) : Map [<map.value>] : String | Test.java:6548:35:6548:36 | in : Map [<map.value>] : String | provenance |  |
-| Test.java:6547:26:6547:41 | (...)... : String | Test.java:6547:13:6547:42 | of(...) : Map [<map.value>] : String | provenance | MaD:12 |
+| Test.java:6547:26:6547:41 | (...)... : String | Test.java:6547:13:6547:42 | of(...) : Map [<map.value>] : String | provenance | MaD:14 |
 | Test.java:6547:34:6547:41 | source(...) : Object | Test.java:6547:26:6547:41 | (...)... : String | provenance |  |
 | Test.java:6548:10:6548:37 | new HashSetValuedHashMap<>(...) : HashSetValuedHashMap [<map.value>, <element>] : String | Test.java:6549:32:6549:34 | out : HashSetValuedHashMap [<map.value>, <element>] : String | provenance |  |
-| Test.java:6548:35:6548:36 | in : Map [<map.value>] : String | Test.java:6548:10:6548:37 | new HashSetValuedHashMap<>(...) : HashSetValuedHashMap [<map.value>, <element>] : String | provenance | MaD:753 |
+| Test.java:6548:35:6548:36 | in : Map [<map.value>] : String | Test.java:6548:10:6548:37 | new HashSetValuedHashMap<>(...) : HashSetValuedHashMap [<map.value>, <element>] : String | provenance | MaD:398 |
 | Test.java:6549:20:6549:35 | getMapValue(...) : Collection [<element>] : String | Test.java:230:19:230:32 | it : Collection [<element>] : String | provenance |  |
-| Test.java:6549:20:6549:35 | getMapValue(...) : Collection [<element>] : String | Test.java:6549:9:6549:36 | getElement(...) | provenance | MaD:1 |
+| Test.java:6549:20:6549:35 | getMapValue(...) : Collection [<element>] : String | Test.java:6549:9:6549:36 | getElement(...) | provenance | MaD:3 |
 | Test.java:6549:32:6549:34 | out : HashSetValuedHashMap [<map.value>, <element>] : String | Test.java:247:32:247:60 | container : HashSetValuedHashMap [<map.value>, <element>] : String | provenance |  |
-| Test.java:6549:32:6549:34 | out : HashSetValuedHashMap [<map.value>, <element>] : String | Test.java:6549:20:6549:35 | getMapValue(...) : Collection [<element>] : String | provenance | MaD:684 |
+| Test.java:6549:32:6549:34 | out : HashSetValuedHashMap [<map.value>, <element>] : String | Test.java:6549:20:6549:35 | getMapValue(...) : Collection [<element>] : String | provenance | MaD:759 |
 | Test.java:6554:24:6554:61 | newALVHMWithMapValue(...) : ArrayListValuedHashMap [<map.value>, <element>] : String | Test.java:6555:35:6555:36 | in : ArrayListValuedHashMap [<map.value>, <element>] : String | provenance |  |
 | Test.java:6554:45:6554:60 | (...)... : String | Test.java:290:60:290:66 | value : String | provenance |  |
-| Test.java:6554:45:6554:60 | (...)... : String | Test.java:6554:24:6554:61 | newALVHMWithMapValue(...) : ArrayListValuedHashMap [<map.value>, <element>] : String | provenance | MaD:690 |
+| Test.java:6554:45:6554:60 | (...)... : String | Test.java:6554:24:6554:61 | newALVHMWithMapValue(...) : ArrayListValuedHashMap [<map.value>, <element>] : String | provenance | MaD:765 |
 | Test.java:6554:53:6554:60 | source(...) : Object | Test.java:6554:45:6554:60 | (...)... : String | provenance |  |
 | Test.java:6555:10:6555:37 | new HashSetValuedHashMap<>(...) : HashSetValuedHashMap [<map.value>, <element>] : String | Test.java:6556:32:6556:34 | out : HashSetValuedHashMap [<map.value>, <element>] : String | provenance |  |
-| Test.java:6555:35:6555:36 | in : ArrayListValuedHashMap [<map.value>, <element>] : String | Test.java:6555:10:6555:37 | new HashSetValuedHashMap<>(...) : HashSetValuedHashMap [<map.value>, <element>] : String | provenance | MaD:755 |
+| Test.java:6555:35:6555:36 | in : ArrayListValuedHashMap [<map.value>, <element>] : String | Test.java:6555:10:6555:37 | new HashSetValuedHashMap<>(...) : HashSetValuedHashMap [<map.value>, <element>] : String | provenance | MaD:400 |
 | Test.java:6556:20:6556:35 | getMapValue(...) : Collection [<element>] : String | Test.java:230:19:230:32 | it : Collection [<element>] : String | provenance |  |
-| Test.java:6556:20:6556:35 | getMapValue(...) : Collection [<element>] : String | Test.java:6556:9:6556:36 | getElement(...) | provenance | MaD:1 |
+| Test.java:6556:20:6556:35 | getMapValue(...) : Collection [<element>] : String | Test.java:6556:9:6556:36 | getElement(...) | provenance | MaD:3 |
 | Test.java:6556:32:6556:34 | out : HashSetValuedHashMap [<map.value>, <element>] : String | Test.java:247:32:247:60 | container : HashSetValuedHashMap [<map.value>, <element>] : String | provenance |  |
-| Test.java:6556:32:6556:34 | out : HashSetValuedHashMap [<map.value>, <element>] : String | Test.java:6556:20:6556:35 | getMapValue(...) : Collection [<element>] : String | provenance | MaD:684 |
+| Test.java:6556:32:6556:34 | out : HashSetValuedHashMap [<map.value>, <element>] : String | Test.java:6556:20:6556:35 | getMapValue(...) : Collection [<element>] : String | provenance | MaD:759 |
 | Test.java:6561:24:6561:59 | newALVHMWithMapKey(...) : ArrayListValuedHashMap [<map.key>] : String | Test.java:6562:35:6562:36 | in : ArrayListValuedHashMap [<map.key>] : String | provenance |  |
 | Test.java:6561:43:6561:58 | (...)... : String | Test.java:272:58:272:62 | key : String | provenance |  |
-| Test.java:6561:43:6561:58 | (...)... : String | Test.java:6561:24:6561:59 | newALVHMWithMapKey(...) : ArrayListValuedHashMap [<map.key>] : String | provenance | MaD:689 |
+| Test.java:6561:43:6561:58 | (...)... : String | Test.java:6561:24:6561:59 | newALVHMWithMapKey(...) : ArrayListValuedHashMap [<map.key>] : String | provenance | MaD:764 |
 | Test.java:6561:51:6561:58 | source(...) : Object | Test.java:6561:43:6561:58 | (...)... : String | provenance |  |
 | Test.java:6562:10:6562:37 | new HashSetValuedHashMap<>(...) : HashSetValuedHashMap [<map.key>] : String | Test.java:6563:19:6563:21 | out : HashSetValuedHashMap [<map.key>] : String | provenance |  |
-| Test.java:6562:35:6562:36 | in : ArrayListValuedHashMap [<map.key>] : String | Test.java:6562:10:6562:37 | new HashSetValuedHashMap<>(...) : HashSetValuedHashMap [<map.key>] : String | provenance | MaD:754 |
+| Test.java:6562:35:6562:36 | in : ArrayListValuedHashMap [<map.key>] : String | Test.java:6562:10:6562:37 | new HashSetValuedHashMap<>(...) : HashSetValuedHashMap [<map.key>] : String | provenance | MaD:399 |
 | Test.java:6563:19:6563:21 | out : HashSetValuedHashMap [<map.key>] : String | Test.java:240:18:240:46 | container : HashSetValuedHashMap [<map.key>] : String | provenance |  |
-| Test.java:6563:19:6563:21 | out : HashSetValuedHashMap [<map.key>] : String | Test.java:6563:9:6563:22 | getMapKey(...) | provenance | MaD:685 |
+| Test.java:6563:19:6563:21 | out : HashSetValuedHashMap [<map.key>] : String | Test.java:6563:9:6563:22 | getMapKey(...) | provenance | MaD:760 |
 | Test.java:6568:24:6568:61 | newALVHMWithMapValue(...) : ArrayListValuedHashMap [<map.value>, <element>] : String | Test.java:6569:52:6569:53 | in : ArrayListValuedHashMap [<map.value>, <element>] : String | provenance |  |
 | Test.java:6568:45:6568:60 | (...)... : String | Test.java:290:60:290:66 | value : String | provenance |  |
-| Test.java:6568:45:6568:60 | (...)... : String | Test.java:6568:24:6568:61 | newALVHMWithMapValue(...) : ArrayListValuedHashMap [<map.value>, <element>] : String | provenance | MaD:690 |
+| Test.java:6568:45:6568:60 | (...)... : String | Test.java:6568:24:6568:61 | newALVHMWithMapValue(...) : ArrayListValuedHashMap [<map.value>, <element>] : String | provenance | MaD:765 |
 | Test.java:6568:53:6568:60 | source(...) : Object | Test.java:6568:45:6568:60 | (...)... : String | provenance |  |
 | Test.java:6569:10:6569:66 | transformingMap(...) : TransformedMultiValuedMap [<map.value>, <element>] : String | Test.java:6570:32:6570:34 | out : TransformedMultiValuedMap [<map.value>, <element>] : String | provenance |  |
-| Test.java:6569:52:6569:53 | in : ArrayListValuedHashMap [<map.value>, <element>] : String | Test.java:6569:10:6569:66 | transformingMap(...) : TransformedMultiValuedMap [<map.value>, <element>] : String | provenance | MaD:757 |
+| Test.java:6569:52:6569:53 | in : ArrayListValuedHashMap [<map.value>, <element>] : String | Test.java:6569:10:6569:66 | transformingMap(...) : TransformedMultiValuedMap [<map.value>, <element>] : String | provenance | MaD:402 |
 | Test.java:6570:20:6570:35 | getMapValue(...) : Collection [<element>] : String | Test.java:230:19:230:32 | it : Collection [<element>] : String | provenance |  |
-| Test.java:6570:20:6570:35 | getMapValue(...) : Collection [<element>] : String | Test.java:6570:9:6570:36 | getElement(...) | provenance | MaD:1 |
+| Test.java:6570:20:6570:35 | getMapValue(...) : Collection [<element>] : String | Test.java:6570:9:6570:36 | getElement(...) | provenance | MaD:3 |
 | Test.java:6570:32:6570:34 | out : TransformedMultiValuedMap [<map.value>, <element>] : String | Test.java:247:32:247:60 | container : TransformedMultiValuedMap [<map.value>, <element>] : String | provenance |  |
-| Test.java:6570:32:6570:34 | out : TransformedMultiValuedMap [<map.value>, <element>] : String | Test.java:6570:20:6570:35 | getMapValue(...) : Collection [<element>] : String | provenance | MaD:684 |
+| Test.java:6570:32:6570:34 | out : TransformedMultiValuedMap [<map.value>, <element>] : String | Test.java:6570:20:6570:35 | getMapValue(...) : Collection [<element>] : String | provenance | MaD:759 |
 | Test.java:6575:24:6575:59 | newALVHMWithMapKey(...) : ArrayListValuedHashMap [<map.key>] : String | Test.java:6576:52:6576:53 | in : ArrayListValuedHashMap [<map.key>] : String | provenance |  |
 | Test.java:6575:43:6575:58 | (...)... : String | Test.java:272:58:272:62 | key : String | provenance |  |
-| Test.java:6575:43:6575:58 | (...)... : String | Test.java:6575:24:6575:59 | newALVHMWithMapKey(...) : ArrayListValuedHashMap [<map.key>] : String | provenance | MaD:689 |
+| Test.java:6575:43:6575:58 | (...)... : String | Test.java:6575:24:6575:59 | newALVHMWithMapKey(...) : ArrayListValuedHashMap [<map.key>] : String | provenance | MaD:764 |
 | Test.java:6575:51:6575:58 | source(...) : Object | Test.java:6575:43:6575:58 | (...)... : String | provenance |  |
 | Test.java:6576:10:6576:66 | transformingMap(...) : TransformedMultiValuedMap [<map.key>] : String | Test.java:6577:19:6577:21 | out : TransformedMultiValuedMap [<map.key>] : String | provenance |  |
-| Test.java:6576:52:6576:53 | in : ArrayListValuedHashMap [<map.key>] : String | Test.java:6576:10:6576:66 | transformingMap(...) : TransformedMultiValuedMap [<map.key>] : String | provenance | MaD:756 |
+| Test.java:6576:52:6576:53 | in : ArrayListValuedHashMap [<map.key>] : String | Test.java:6576:10:6576:66 | transformingMap(...) : TransformedMultiValuedMap [<map.key>] : String | provenance | MaD:401 |
 | Test.java:6577:19:6577:21 | out : TransformedMultiValuedMap [<map.key>] : String | Test.java:240:18:240:46 | container : TransformedMultiValuedMap [<map.key>] : String | provenance |  |
-| Test.java:6577:19:6577:21 | out : TransformedMultiValuedMap [<map.key>] : String | Test.java:6577:9:6577:22 | getMapKey(...) | provenance | MaD:685 |
+| Test.java:6577:19:6577:21 | out : TransformedMultiValuedMap [<map.key>] : String | Test.java:6577:9:6577:22 | getMapKey(...) | provenance | MaD:760 |
 | Test.java:6582:24:6582:61 | newALVHMWithMapValue(...) : ArrayListValuedHashMap [<map.value>, <element>] : String | Test.java:6583:64:6583:65 | in : ArrayListValuedHashMap [<map.value>, <element>] : String | provenance |  |
 | Test.java:6582:45:6582:60 | (...)... : String | Test.java:290:60:290:66 | value : String | provenance |  |
-| Test.java:6582:45:6582:60 | (...)... : String | Test.java:6582:24:6582:61 | newALVHMWithMapValue(...) : ArrayListValuedHashMap [<map.value>, <element>] : String | provenance | MaD:690 |
+| Test.java:6582:45:6582:60 | (...)... : String | Test.java:6582:24:6582:61 | newALVHMWithMapValue(...) : ArrayListValuedHashMap [<map.value>, <element>] : String | provenance | MaD:765 |
 | Test.java:6582:53:6582:60 | source(...) : Object | Test.java:6582:45:6582:60 | (...)... : String | provenance |  |
 | Test.java:6583:10:6583:66 | unmodifiableMultiValuedMap(...) : UnmodifiableMultiValuedMap [<map.value>, <element>] : String | Test.java:6584:32:6584:34 | out : UnmodifiableMultiValuedMap [<map.value>, <element>] : String | provenance |  |
-| Test.java:6583:64:6583:65 | in : ArrayListValuedHashMap [<map.value>, <element>] : String | Test.java:6583:10:6583:66 | unmodifiableMultiValuedMap(...) : UnmodifiableMultiValuedMap [<map.value>, <element>] : String | provenance | MaD:759 |
+| Test.java:6583:64:6583:65 | in : ArrayListValuedHashMap [<map.value>, <element>] : String | Test.java:6583:10:6583:66 | unmodifiableMultiValuedMap(...) : UnmodifiableMultiValuedMap [<map.value>, <element>] : String | provenance | MaD:404 |
 | Test.java:6584:20:6584:35 | getMapValue(...) : Collection [<element>] : String | Test.java:230:19:230:32 | it : Collection [<element>] : String | provenance |  |
-| Test.java:6584:20:6584:35 | getMapValue(...) : Collection [<element>] : String | Test.java:6584:9:6584:36 | getElement(...) | provenance | MaD:1 |
+| Test.java:6584:20:6584:35 | getMapValue(...) : Collection [<element>] : String | Test.java:6584:9:6584:36 | getElement(...) | provenance | MaD:3 |
 | Test.java:6584:32:6584:34 | out : UnmodifiableMultiValuedMap [<map.value>, <element>] : String | Test.java:247:32:247:60 | container : UnmodifiableMultiValuedMap [<map.value>, <element>] : String | provenance |  |
-| Test.java:6584:32:6584:34 | out : UnmodifiableMultiValuedMap [<map.value>, <element>] : String | Test.java:6584:20:6584:35 | getMapValue(...) : Collection [<element>] : String | provenance | MaD:684 |
+| Test.java:6584:32:6584:34 | out : UnmodifiableMultiValuedMap [<map.value>, <element>] : String | Test.java:6584:20:6584:35 | getMapValue(...) : Collection [<element>] : String | provenance | MaD:759 |
 | Test.java:6589:24:6589:59 | newALVHMWithMapKey(...) : ArrayListValuedHashMap [<map.key>] : String | Test.java:6590:64:6590:65 | in : ArrayListValuedHashMap [<map.key>] : String | provenance |  |
 | Test.java:6589:43:6589:58 | (...)... : String | Test.java:272:58:272:62 | key : String | provenance |  |
-| Test.java:6589:43:6589:58 | (...)... : String | Test.java:6589:24:6589:59 | newALVHMWithMapKey(...) : ArrayListValuedHashMap [<map.key>] : String | provenance | MaD:689 |
+| Test.java:6589:43:6589:58 | (...)... : String | Test.java:6589:24:6589:59 | newALVHMWithMapKey(...) : ArrayListValuedHashMap [<map.key>] : String | provenance | MaD:764 |
 | Test.java:6589:51:6589:58 | source(...) : Object | Test.java:6589:43:6589:58 | (...)... : String | provenance |  |
 | Test.java:6590:10:6590:66 | unmodifiableMultiValuedMap(...) : UnmodifiableMultiValuedMap [<map.key>] : String | Test.java:6591:19:6591:21 | out : UnmodifiableMultiValuedMap [<map.key>] : String | provenance |  |
-| Test.java:6590:64:6590:65 | in : ArrayListValuedHashMap [<map.key>] : String | Test.java:6590:10:6590:66 | unmodifiableMultiValuedMap(...) : UnmodifiableMultiValuedMap [<map.key>] : String | provenance | MaD:758 |
+| Test.java:6590:64:6590:65 | in : ArrayListValuedHashMap [<map.key>] : String | Test.java:6590:10:6590:66 | unmodifiableMultiValuedMap(...) : UnmodifiableMultiValuedMap [<map.key>] : String | provenance | MaD:403 |
 | Test.java:6591:19:6591:21 | out : UnmodifiableMultiValuedMap [<map.key>] : String | Test.java:240:18:240:46 | container : UnmodifiableMultiValuedMap [<map.key>] : String | provenance |  |
-| Test.java:6591:19:6591:21 | out : UnmodifiableMultiValuedMap [<map.key>] : String | Test.java:6591:9:6591:22 | getMapKey(...) | provenance | MaD:685 |
+| Test.java:6591:19:6591:21 | out : UnmodifiableMultiValuedMap [<map.key>] : String | Test.java:6591:9:6591:22 | getMapKey(...) | provenance | MaD:760 |
 | Test.java:6596:20:6596:58 | newTreeBagWithElement(...) : TreeBag [<element>] : String | Test.java:6597:27:6597:28 | in : TreeBag [<element>] : String | provenance |  |
 | Test.java:6596:42:6596:57 | (...)... : String | Test.java:267:39:267:47 | element : String | provenance |  |
-| Test.java:6596:42:6596:57 | (...)... : String | Test.java:6596:20:6596:58 | newTreeBagWithElement(...) : TreeBag [<element>] : String | provenance | MaD:2 |
-| Test.java:6596:42:6596:57 | (...)... : String | Test.java:6596:20:6596:58 | newTreeBagWithElement(...) : TreeBag [<element>] : String | provenance | MaD:395 |
+| Test.java:6596:42:6596:57 | (...)... : String | Test.java:6596:20:6596:58 | newTreeBagWithElement(...) : TreeBag [<element>] : String | provenance | MaD:4 |
+| Test.java:6596:42:6596:57 | (...)... : String | Test.java:6596:20:6596:58 | newTreeBagWithElement(...) : TreeBag [<element>] : String | provenance | MaD:470 |
 | Test.java:6596:50:6596:57 | source(...) : Object | Test.java:6596:42:6596:57 | (...)... : String | provenance |  |
 | Test.java:6597:10:6597:29 | new HashMultiSet<>(...) : HashMultiSet [<element>] : String | Test.java:6598:20:6598:22 | out : HashMultiSet [<element>] : String | provenance |  |
-| Test.java:6597:27:6597:28 | in : TreeBag [<element>] : String | Test.java:6597:10:6597:29 | new HashMultiSet<>(...) : HashMultiSet [<element>] : String | provenance | MaD:760 |
+| Test.java:6597:27:6597:28 | in : TreeBag [<element>] : String | Test.java:6597:10:6597:29 | new HashMultiSet<>(...) : HashMultiSet [<element>] : String | provenance | MaD:405 |
 | Test.java:6598:20:6598:22 | out : HashMultiSet [<element>] : String | Test.java:230:19:230:32 | it : HashMultiSet [<element>] : String | provenance |  |
-| Test.java:6598:20:6598:22 | out : HashMultiSet [<element>] : String | Test.java:6598:9:6598:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:6598:20:6598:22 | out : HashMultiSet [<element>] : String | Test.java:6598:9:6598:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:6603:18:6603:61 | newHashMultiSetWithElement(...) : HashMultiSet [<element>] : String | Test.java:6604:48:6604:49 | in : HashMultiSet [<element>] : String | provenance |  |
 | Test.java:6603:45:6603:60 | (...)... : String | Test.java:258:49:258:57 | element : String | provenance |  |
-| Test.java:6603:45:6603:60 | (...)... : String | Test.java:6603:18:6603:61 | newHashMultiSetWithElement(...) : HashMultiSet [<element>] : String | provenance | MaD:2 |
-| Test.java:6603:45:6603:60 | (...)... : String | Test.java:6603:18:6603:61 | newHashMultiSetWithElement(...) : HashMultiSet [<element>] : String | provenance | MaD:673 |
+| Test.java:6603:45:6603:60 | (...)... : String | Test.java:6603:18:6603:61 | newHashMultiSetWithElement(...) : HashMultiSet [<element>] : String | provenance | MaD:4 |
+| Test.java:6603:45:6603:60 | (...)... : String | Test.java:6603:18:6603:61 | newHashMultiSetWithElement(...) : HashMultiSet [<element>] : String | provenance | MaD:749 |
 | Test.java:6603:53:6603:60 | source(...) : Object | Test.java:6603:45:6603:60 | (...)... : String | provenance |  |
 | Test.java:6604:10:6604:56 | predicatedMultiSet(...) : PredicatedMultiSet [<element>] : String | Test.java:6605:20:6605:22 | out : PredicatedMultiSet [<element>] : String | provenance |  |
-| Test.java:6604:48:6604:49 | in : HashMultiSet [<element>] : String | Test.java:6604:10:6604:56 | predicatedMultiSet(...) : PredicatedMultiSet [<element>] : String | provenance | MaD:761 |
+| Test.java:6604:48:6604:49 | in : HashMultiSet [<element>] : String | Test.java:6604:10:6604:56 | predicatedMultiSet(...) : PredicatedMultiSet [<element>] : String | provenance | MaD:406 |
 | Test.java:6605:20:6605:22 | out : PredicatedMultiSet [<element>] : String | Test.java:230:19:230:32 | it : PredicatedMultiSet [<element>] : String | provenance |  |
-| Test.java:6605:20:6605:22 | out : PredicatedMultiSet [<element>] : String | Test.java:6605:9:6605:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:6605:20:6605:22 | out : PredicatedMultiSet [<element>] : String | Test.java:6605:9:6605:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:6610:18:6610:61 | newHashMultiSetWithElement(...) : HashMultiSet [<element>] : String | Test.java:6611:52:6611:53 | in : HashMultiSet [<element>] : String | provenance |  |
 | Test.java:6610:45:6610:60 | (...)... : String | Test.java:258:49:258:57 | element : String | provenance |  |
-| Test.java:6610:45:6610:60 | (...)... : String | Test.java:6610:18:6610:61 | newHashMultiSetWithElement(...) : HashMultiSet [<element>] : String | provenance | MaD:2 |
-| Test.java:6610:45:6610:60 | (...)... : String | Test.java:6610:18:6610:61 | newHashMultiSetWithElement(...) : HashMultiSet [<element>] : String | provenance | MaD:673 |
+| Test.java:6610:45:6610:60 | (...)... : String | Test.java:6610:18:6610:61 | newHashMultiSetWithElement(...) : HashMultiSet [<element>] : String | provenance | MaD:4 |
+| Test.java:6610:45:6610:60 | (...)... : String | Test.java:6610:18:6610:61 | newHashMultiSetWithElement(...) : HashMultiSet [<element>] : String | provenance | MaD:749 |
 | Test.java:6610:53:6610:60 | source(...) : Object | Test.java:6610:45:6610:60 | (...)... : String | provenance |  |
 | Test.java:6611:10:6611:54 | synchronizedMultiSet(...) : SynchronizedMultiSet [<element>] : String | Test.java:6612:20:6612:22 | out : SynchronizedMultiSet [<element>] : String | provenance |  |
-| Test.java:6611:52:6611:53 | in : HashMultiSet [<element>] : String | Test.java:6611:10:6611:54 | synchronizedMultiSet(...) : SynchronizedMultiSet [<element>] : String | provenance | MaD:762 |
+| Test.java:6611:52:6611:53 | in : HashMultiSet [<element>] : String | Test.java:6611:10:6611:54 | synchronizedMultiSet(...) : SynchronizedMultiSet [<element>] : String | provenance | MaD:407 |
 | Test.java:6612:20:6612:22 | out : SynchronizedMultiSet [<element>] : String | Test.java:230:19:230:32 | it : SynchronizedMultiSet [<element>] : String | provenance |  |
-| Test.java:6612:20:6612:22 | out : SynchronizedMultiSet [<element>] : String | Test.java:6612:9:6612:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:6612:20:6612:22 | out : SynchronizedMultiSet [<element>] : String | Test.java:6612:9:6612:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:6617:18:6617:61 | newHashMultiSetWithElement(...) : HashMultiSet [<element>] : String | Test.java:6618:52:6618:53 | in : HashMultiSet [<element>] : String | provenance |  |
 | Test.java:6617:45:6617:60 | (...)... : String | Test.java:258:49:258:57 | element : String | provenance |  |
-| Test.java:6617:45:6617:60 | (...)... : String | Test.java:6617:18:6617:61 | newHashMultiSetWithElement(...) : HashMultiSet [<element>] : String | provenance | MaD:2 |
-| Test.java:6617:45:6617:60 | (...)... : String | Test.java:6617:18:6617:61 | newHashMultiSetWithElement(...) : HashMultiSet [<element>] : String | provenance | MaD:673 |
+| Test.java:6617:45:6617:60 | (...)... : String | Test.java:6617:18:6617:61 | newHashMultiSetWithElement(...) : HashMultiSet [<element>] : String | provenance | MaD:4 |
+| Test.java:6617:45:6617:60 | (...)... : String | Test.java:6617:18:6617:61 | newHashMultiSetWithElement(...) : HashMultiSet [<element>] : String | provenance | MaD:749 |
 | Test.java:6617:53:6617:60 | source(...) : Object | Test.java:6617:45:6617:60 | (...)... : String | provenance |  |
 | Test.java:6618:10:6618:54 | unmodifiableMultiSet(...) : MultiSet [<element>] : String | Test.java:6619:20:6619:22 | out : MultiSet [<element>] : String | provenance |  |
-| Test.java:6618:52:6618:53 | in : HashMultiSet [<element>] : String | Test.java:6618:10:6618:54 | unmodifiableMultiSet(...) : MultiSet [<element>] : String | provenance | MaD:763 |
+| Test.java:6618:52:6618:53 | in : HashMultiSet [<element>] : String | Test.java:6618:10:6618:54 | unmodifiableMultiSet(...) : MultiSet [<element>] : String | provenance | MaD:408 |
 | Test.java:6619:20:6619:22 | out : MultiSet [<element>] : String | Test.java:230:19:230:32 | it : MultiSet [<element>] : String | provenance |  |
-| Test.java:6619:20:6619:22 | out : MultiSet [<element>] : String | Test.java:6619:9:6619:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:6619:20:6619:22 | out : MultiSet [<element>] : String | Test.java:6619:9:6619:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:6624:16:6624:31 | (...)... : String | Test.java:6626:30:6626:31 | in : String | provenance |  |
 | Test.java:6624:24:6624:31 | source(...) : Object | Test.java:6624:16:6624:31 | (...)... : String | provenance |  |
 | Test.java:6626:10:6626:32 | load(...) : Properties | Test.java:6627:9:6627:11 | out | provenance |  |
-| Test.java:6626:30:6626:31 | in : String | Test.java:6626:10:6626:32 | load(...) : Properties | provenance | MaD:764 |
+| Test.java:6626:30:6626:31 | in : String | Test.java:6626:10:6626:32 | load(...) : Properties | provenance | MaD:409 |
 | Test.java:6632:14:6632:27 | (...)... : File | Test.java:6634:24:6634:25 | in : File | provenance |  |
 | Test.java:6632:20:6632:27 | source(...) : Object | Test.java:6632:14:6632:27 | (...)... : File | provenance |  |
 | Test.java:6634:10:6634:26 | load(...) : Properties | Test.java:6635:9:6635:11 | out | provenance |  |
-| Test.java:6634:24:6634:25 | in : File | Test.java:6634:10:6634:26 | load(...) : Properties | provenance | MaD:765 |
+| Test.java:6634:24:6634:25 | in : File | Test.java:6634:10:6634:26 | load(...) : Properties | provenance | MaD:410 |
 | Test.java:6640:21:6640:41 | (...)... : InputStream | Test.java:6642:24:6642:25 | in : InputStream | provenance |  |
 | Test.java:6640:34:6640:41 | source(...) : Object | Test.java:6640:21:6640:41 | (...)... : InputStream | provenance |  |
 | Test.java:6642:10:6642:26 | load(...) : Properties | Test.java:6643:9:6643:11 | out | provenance |  |
-| Test.java:6642:24:6642:25 | in : InputStream | Test.java:6642:10:6642:26 | load(...) : Properties | provenance | MaD:766 |
+| Test.java:6642:24:6642:25 | in : InputStream | Test.java:6642:10:6642:26 | load(...) : Properties | provenance | MaD:411 |
 | Test.java:6648:14:6648:27 | (...)... : Path | Test.java:6650:24:6650:25 | in : Path | provenance |  |
 | Test.java:6648:20:6648:27 | source(...) : Object | Test.java:6648:14:6648:27 | (...)... : Path | provenance |  |
 | Test.java:6650:10:6650:26 | load(...) : Properties | Test.java:6651:9:6651:11 | out | provenance |  |
-| Test.java:6650:24:6650:25 | in : Path | Test.java:6650:10:6650:26 | load(...) : Properties | provenance | MaD:767 |
+| Test.java:6650:24:6650:25 | in : Path | Test.java:6650:10:6650:26 | load(...) : Properties | provenance | MaD:412 |
 | Test.java:6656:16:6656:31 | (...)... : Reader | Test.java:6658:24:6658:25 | in : Reader | provenance |  |
 | Test.java:6656:24:6656:31 | source(...) : Object | Test.java:6656:16:6656:31 | (...)... : Reader | provenance |  |
 | Test.java:6658:10:6658:26 | load(...) : Properties | Test.java:6659:9:6659:11 | out | provenance |  |
-| Test.java:6658:24:6658:25 | in : Reader | Test.java:6658:10:6658:26 | load(...) : Properties | provenance | MaD:768 |
+| Test.java:6658:24:6658:25 | in : Reader | Test.java:6658:10:6658:26 | load(...) : Properties | provenance | MaD:413 |
 | Test.java:6664:16:6664:31 | (...)... : String | Test.java:6666:24:6666:25 | in : String | provenance |  |
 | Test.java:6664:24:6664:31 | source(...) : Object | Test.java:6664:16:6664:31 | (...)... : String | provenance |  |
 | Test.java:6666:10:6666:26 | load(...) : Properties | Test.java:6667:9:6667:11 | out | provenance |  |
-| Test.java:6666:24:6666:25 | in : String | Test.java:6666:10:6666:26 | load(...) : Properties | provenance | MaD:769 |
+| Test.java:6666:24:6666:25 | in : String | Test.java:6666:10:6666:26 | load(...) : Properties | provenance | MaD:414 |
 | Test.java:6672:13:6672:25 | (...)... : URI | Test.java:6674:24:6674:25 | in : URI | provenance |  |
 | Test.java:6672:18:6672:25 | source(...) : Object | Test.java:6672:13:6672:25 | (...)... : URI | provenance |  |
 | Test.java:6674:10:6674:26 | load(...) : Properties | Test.java:6675:9:6675:11 | out | provenance |  |
-| Test.java:6674:24:6674:25 | in : URI | Test.java:6674:10:6674:26 | load(...) : Properties | provenance | MaD:770 |
+| Test.java:6674:24:6674:25 | in : URI | Test.java:6674:10:6674:26 | load(...) : Properties | provenance | MaD:415 |
 | Test.java:6680:13:6680:25 | (...)... : URL | Test.java:6682:24:6682:25 | in : URL | provenance |  |
 | Test.java:6680:18:6680:25 | source(...) : Object | Test.java:6680:13:6680:25 | (...)... : URL | provenance |  |
 | Test.java:6682:10:6682:26 | load(...) : Properties | Test.java:6683:9:6683:11 | out | provenance |  |
-| Test.java:6682:24:6682:25 | in : URL | Test.java:6682:10:6682:26 | load(...) : Properties | provenance | MaD:771 |
+| Test.java:6682:24:6682:25 | in : URL | Test.java:6682:10:6682:26 | load(...) : Properties | provenance | MaD:416 |
 | Test.java:6688:20:6688:58 | newTreeBagWithElement(...) : TreeBag [<element>] : String | Test.java:6689:32:6689:33 | in : TreeBag [<element>] : String | provenance |  |
 | Test.java:6688:42:6688:57 | (...)... : String | Test.java:267:39:267:47 | element : String | provenance |  |
-| Test.java:6688:42:6688:57 | (...)... : String | Test.java:6688:20:6688:58 | newTreeBagWithElement(...) : TreeBag [<element>] : String | provenance | MaD:2 |
-| Test.java:6688:42:6688:57 | (...)... : String | Test.java:6688:20:6688:58 | newTreeBagWithElement(...) : TreeBag [<element>] : String | provenance | MaD:395 |
+| Test.java:6688:42:6688:57 | (...)... : String | Test.java:6688:20:6688:58 | newTreeBagWithElement(...) : TreeBag [<element>] : String | provenance | MaD:4 |
+| Test.java:6688:42:6688:57 | (...)... : String | Test.java:6688:20:6688:58 | newTreeBagWithElement(...) : TreeBag [<element>] : String | provenance | MaD:470 |
 | Test.java:6688:50:6688:57 | source(...) : Object | Test.java:6688:42:6688:57 | (...)... : String | provenance |  |
 | Test.java:6689:10:6689:34 | new CircularFifoQueue<>(...) : CircularFifoQueue [<element>] : String | Test.java:6690:20:6690:22 | out : CircularFifoQueue [<element>] : String | provenance |  |
-| Test.java:6689:32:6689:33 | in : TreeBag [<element>] : String | Test.java:6689:10:6689:34 | new CircularFifoQueue<>(...) : CircularFifoQueue [<element>] : String | provenance | MaD:772 |
+| Test.java:6689:32:6689:33 | in : TreeBag [<element>] : String | Test.java:6689:10:6689:34 | new CircularFifoQueue<>(...) : CircularFifoQueue [<element>] : String | provenance | MaD:417 |
 | Test.java:6690:20:6690:22 | out : CircularFifoQueue [<element>] : String | Test.java:230:19:230:32 | it : CircularFifoQueue [<element>] : String | provenance |  |
-| Test.java:6690:20:6690:22 | out : CircularFifoQueue [<element>] : String | Test.java:6690:9:6690:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:6690:20:6690:22 | out : CircularFifoQueue [<element>] : String | Test.java:6690:9:6690:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:6695:27:6695:75 | newCircularFifoQueueWithElement(...) : CircularFifoQueue [<element>] : String | Test.java:6696:10:6696:11 | in : CircularFifoQueue [<element>] : String | provenance |  |
 | Test.java:6695:59:6695:74 | (...)... : String | Test.java:253:59:253:67 | element : String | provenance |  |
-| Test.java:6695:59:6695:74 | (...)... : String | Test.java:6695:27:6695:75 | newCircularFifoQueueWithElement(...) : CircularFifoQueue [<element>] : String | provenance | MaD:2 |
+| Test.java:6695:59:6695:74 | (...)... : String | Test.java:6695:27:6695:75 | newCircularFifoQueueWithElement(...) : CircularFifoQueue [<element>] : String | provenance | MaD:4 |
 | Test.java:6695:67:6695:74 | source(...) : Object | Test.java:6695:59:6695:74 | (...)... : String | provenance |  |
-| Test.java:6696:10:6696:11 | in : CircularFifoQueue [<element>] : String | Test.java:6696:10:6696:18 | get(...) : String | provenance | MaD:773 |
+| Test.java:6696:10:6696:11 | in : CircularFifoQueue [<element>] : String | Test.java:6696:10:6696:18 | get(...) : String | provenance | MaD:418 |
 | Test.java:6696:10:6696:18 | get(...) : String | Test.java:6697:9:6697:11 | out | provenance |  |
 | Test.java:6702:15:6702:63 | newCircularFifoQueueWithElement(...) : CircularFifoQueue [<element>] : String | Test.java:6703:42:6703:43 | in : CircularFifoQueue [<element>] : String | provenance |  |
 | Test.java:6702:47:6702:62 | (...)... : String | Test.java:253:59:253:67 | element : String | provenance |  |
-| Test.java:6702:47:6702:62 | (...)... : String | Test.java:6702:15:6702:63 | newCircularFifoQueueWithElement(...) : CircularFifoQueue [<element>] : String | provenance | MaD:2 |
+| Test.java:6702:47:6702:62 | (...)... : String | Test.java:6702:15:6702:63 | newCircularFifoQueueWithElement(...) : CircularFifoQueue [<element>] : String | provenance | MaD:4 |
 | Test.java:6702:55:6702:62 | source(...) : Object | Test.java:6702:47:6702:62 | (...)... : String | provenance |  |
 | Test.java:6703:10:6703:50 | predicatedQueue(...) : PredicatedQueue [<element>] : String | Test.java:6704:20:6704:22 | out : PredicatedQueue [<element>] : String | provenance |  |
-| Test.java:6703:42:6703:43 | in : CircularFifoQueue [<element>] : String | Test.java:6703:10:6703:50 | predicatedQueue(...) : PredicatedQueue [<element>] : String | provenance | MaD:774 |
+| Test.java:6703:42:6703:43 | in : CircularFifoQueue [<element>] : String | Test.java:6703:10:6703:50 | predicatedQueue(...) : PredicatedQueue [<element>] : String | provenance | MaD:419 |
 | Test.java:6704:20:6704:22 | out : PredicatedQueue [<element>] : String | Test.java:230:19:230:32 | it : PredicatedQueue [<element>] : String | provenance |  |
-| Test.java:6704:20:6704:22 | out : PredicatedQueue [<element>] : String | Test.java:6704:9:6704:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:6704:20:6704:22 | out : PredicatedQueue [<element>] : String | Test.java:6704:9:6704:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:6709:15:6709:63 | newCircularFifoQueueWithElement(...) : CircularFifoQueue [<element>] : String | Test.java:6710:46:6710:47 | in : CircularFifoQueue [<element>] : String | provenance |  |
 | Test.java:6709:47:6709:62 | (...)... : String | Test.java:253:59:253:67 | element : String | provenance |  |
-| Test.java:6709:47:6709:62 | (...)... : String | Test.java:6709:15:6709:63 | newCircularFifoQueueWithElement(...) : CircularFifoQueue [<element>] : String | provenance | MaD:2 |
+| Test.java:6709:47:6709:62 | (...)... : String | Test.java:6709:15:6709:63 | newCircularFifoQueueWithElement(...) : CircularFifoQueue [<element>] : String | provenance | MaD:4 |
 | Test.java:6709:55:6709:62 | source(...) : Object | Test.java:6709:47:6709:62 | (...)... : String | provenance |  |
 | Test.java:6710:10:6710:48 | synchronizedQueue(...) : SynchronizedQueue [<element>] : String | Test.java:6711:20:6711:22 | out : SynchronizedQueue [<element>] : String | provenance |  |
-| Test.java:6710:46:6710:47 | in : CircularFifoQueue [<element>] : String | Test.java:6710:10:6710:48 | synchronizedQueue(...) : SynchronizedQueue [<element>] : String | provenance | MaD:775 |
+| Test.java:6710:46:6710:47 | in : CircularFifoQueue [<element>] : String | Test.java:6710:10:6710:48 | synchronizedQueue(...) : SynchronizedQueue [<element>] : String | provenance | MaD:420 |
 | Test.java:6711:20:6711:22 | out : SynchronizedQueue [<element>] : String | Test.java:230:19:230:32 | it : SynchronizedQueue [<element>] : String | provenance |  |
-| Test.java:6711:20:6711:22 | out : SynchronizedQueue [<element>] : String | Test.java:6711:9:6711:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:6711:20:6711:22 | out : SynchronizedQueue [<element>] : String | Test.java:6711:9:6711:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:6716:15:6716:63 | newCircularFifoQueueWithElement(...) : CircularFifoQueue [<element>] : String | Test.java:6717:45:6717:46 | in : CircularFifoQueue [<element>] : String | provenance |  |
 | Test.java:6716:47:6716:62 | (...)... : String | Test.java:253:59:253:67 | element : String | provenance |  |
-| Test.java:6716:47:6716:62 | (...)... : String | Test.java:6716:15:6716:63 | newCircularFifoQueueWithElement(...) : CircularFifoQueue [<element>] : String | provenance | MaD:2 |
+| Test.java:6716:47:6716:62 | (...)... : String | Test.java:6716:15:6716:63 | newCircularFifoQueueWithElement(...) : CircularFifoQueue [<element>] : String | provenance | MaD:4 |
 | Test.java:6716:55:6716:62 | source(...) : Object | Test.java:6716:47:6716:62 | (...)... : String | provenance |  |
 | Test.java:6717:10:6717:53 | transformingQueue(...) : TransformedQueue [<element>] : String | Test.java:6718:20:6718:22 | out : TransformedQueue [<element>] : String | provenance |  |
-| Test.java:6717:45:6717:46 | in : CircularFifoQueue [<element>] : String | Test.java:6717:10:6717:53 | transformingQueue(...) : TransformedQueue [<element>] : String | provenance | MaD:776 |
+| Test.java:6717:45:6717:46 | in : CircularFifoQueue [<element>] : String | Test.java:6717:10:6717:53 | transformingQueue(...) : TransformedQueue [<element>] : String | provenance | MaD:421 |
 | Test.java:6718:20:6718:22 | out : TransformedQueue [<element>] : String | Test.java:230:19:230:32 | it : TransformedQueue [<element>] : String | provenance |  |
-| Test.java:6718:20:6718:22 | out : TransformedQueue [<element>] : String | Test.java:6718:9:6718:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:6718:20:6718:22 | out : TransformedQueue [<element>] : String | Test.java:6718:9:6718:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:6723:15:6723:63 | newCircularFifoQueueWithElement(...) : CircularFifoQueue [<element>] : String | Test.java:6724:46:6724:47 | in : CircularFifoQueue [<element>] : String | provenance |  |
 | Test.java:6723:47:6723:62 | (...)... : String | Test.java:253:59:253:67 | element : String | provenance |  |
-| Test.java:6723:47:6723:62 | (...)... : String | Test.java:6723:15:6723:63 | newCircularFifoQueueWithElement(...) : CircularFifoQueue [<element>] : String | provenance | MaD:2 |
+| Test.java:6723:47:6723:62 | (...)... : String | Test.java:6723:15:6723:63 | newCircularFifoQueueWithElement(...) : CircularFifoQueue [<element>] : String | provenance | MaD:4 |
 | Test.java:6723:55:6723:62 | source(...) : Object | Test.java:6723:47:6723:62 | (...)... : String | provenance |  |
 | Test.java:6724:10:6724:48 | unmodifiableQueue(...) : Queue [<element>] : String | Test.java:6725:20:6725:22 | out : Queue [<element>] : String | provenance |  |
-| Test.java:6724:46:6724:47 | in : CircularFifoQueue [<element>] : String | Test.java:6724:10:6724:48 | unmodifiableQueue(...) : Queue [<element>] : String | provenance | MaD:777 |
+| Test.java:6724:46:6724:47 | in : CircularFifoQueue [<element>] : String | Test.java:6724:10:6724:48 | unmodifiableQueue(...) : Queue [<element>] : String | provenance | MaD:422 |
 | Test.java:6725:20:6725:22 | out : Queue [<element>] : String | Test.java:230:19:230:32 | it : Queue [<element>] : String | provenance |  |
-| Test.java:6725:20:6725:22 | out : Queue [<element>] : String | Test.java:6725:9:6725:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:6725:20:6725:22 | out : Queue [<element>] : String | Test.java:6725:9:6725:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:6730:22:6730:60 | newTreeSetWithElement(...) : TreeSet [<element>] : String | Test.java:6731:46:6731:47 | in : TreeSet [<element>] : String | provenance |  |
 | Test.java:6730:44:6730:59 | (...)... : String | Test.java:268:39:268:47 | element : String | provenance |  |
-| Test.java:6730:44:6730:59 | (...)... : String | Test.java:6730:22:6730:60 | newTreeSetWithElement(...) : TreeSet [<element>] : String | provenance | MaD:2 |
+| Test.java:6730:44:6730:59 | (...)... : String | Test.java:6730:22:6730:60 | newTreeSetWithElement(...) : TreeSet [<element>] : String | provenance | MaD:4 |
 | Test.java:6730:52:6730:59 | source(...) : Object | Test.java:6730:44:6730:59 | (...)... : String | provenance |  |
 | Test.java:6731:10:6731:48 | new MyAbstractNavigableSetDecorator<>(...) : MyAbstractNavigableSetDecorator [<element>] : String | Test.java:6732:20:6732:22 | out : MyAbstractNavigableSetDecorator [<element>] : String | provenance |  |
-| Test.java:6731:46:6731:47 | in : TreeSet [<element>] : String | Test.java:6731:10:6731:48 | new MyAbstractNavigableSetDecorator<>(...) : MyAbstractNavigableSetDecorator [<element>] : String | provenance | MaD:778 |
+| Test.java:6731:46:6731:47 | in : TreeSet [<element>] : String | Test.java:6731:10:6731:48 | new MyAbstractNavigableSetDecorator<>(...) : MyAbstractNavigableSetDecorator [<element>] : String | provenance | MaD:423 |
 | Test.java:6731:46:6731:47 | in : TreeSet [<element>] : String | Test.java:7243:42:7243:66 | set : TreeSet [<element>] : String | provenance |  |
 | Test.java:6732:20:6732:22 | out : MyAbstractNavigableSetDecorator [<element>] : String | Test.java:230:19:230:32 | it : MyAbstractNavigableSetDecorator [<element>] : String | provenance |  |
-| Test.java:6732:20:6732:22 | out : MyAbstractNavigableSetDecorator [<element>] : String | Test.java:6732:9:6732:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:6732:20:6732:22 | out : MyAbstractNavigableSetDecorator [<element>] : String | Test.java:6732:9:6732:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:6737:13:6737:58 | newListOrderedSetWithElement(...) : ListOrderedSet [<element>] : String | Test.java:6738:37:6738:38 | in : ListOrderedSet [<element>] : String | provenance |  |
 | Test.java:6737:42:6737:57 | (...)... : String | Test.java:260:53:260:61 | element : String | provenance |  |
-| Test.java:6737:42:6737:57 | (...)... : String | Test.java:6737:13:6737:58 | newListOrderedSetWithElement(...) : ListOrderedSet [<element>] : String | provenance | MaD:2 |
+| Test.java:6737:42:6737:57 | (...)... : String | Test.java:6737:13:6737:58 | newListOrderedSetWithElement(...) : ListOrderedSet [<element>] : String | provenance | MaD:4 |
 | Test.java:6737:50:6737:57 | source(...) : Object | Test.java:6737:42:6737:57 | (...)... : String | provenance |  |
 | Test.java:6738:10:6738:39 | new MyAbstractSetDecorator<>(...) : MyAbstractSetDecorator [<element>] : String | Test.java:6739:20:6739:22 | out : MyAbstractSetDecorator [<element>] : String | provenance |  |
-| Test.java:6738:37:6738:38 | in : ListOrderedSet [<element>] : String | Test.java:6738:10:6738:39 | new MyAbstractSetDecorator<>(...) : MyAbstractSetDecorator [<element>] : String | provenance | MaD:779 |
+| Test.java:6738:37:6738:38 | in : ListOrderedSet [<element>] : String | Test.java:6738:10:6738:39 | new MyAbstractSetDecorator<>(...) : MyAbstractSetDecorator [<element>] : String | provenance | MaD:424 |
 | Test.java:6738:37:6738:38 | in : ListOrderedSet [<element>] : String | Test.java:7249:33:7249:48 | set : ListOrderedSet [<element>] : String | provenance |  |
 | Test.java:6739:20:6739:22 | out : MyAbstractSetDecorator [<element>] : String | Test.java:230:19:230:32 | it : MyAbstractSetDecorator [<element>] : String | provenance |  |
-| Test.java:6739:20:6739:22 | out : MyAbstractSetDecorator [<element>] : String | Test.java:6739:9:6739:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:6739:20:6739:22 | out : MyAbstractSetDecorator [<element>] : String | Test.java:6739:9:6739:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:6744:13:6744:58 | newListOrderedSetWithElement(...) : ListOrderedSet [<element>] : String | Test.java:6745:43:6745:44 | in : ListOrderedSet [<element>] : String | provenance |  |
 | Test.java:6744:42:6744:57 | (...)... : String | Test.java:260:53:260:61 | element : String | provenance |  |
-| Test.java:6744:42:6744:57 | (...)... : String | Test.java:6744:13:6744:58 | newListOrderedSetWithElement(...) : ListOrderedSet [<element>] : String | provenance | MaD:2 |
+| Test.java:6744:42:6744:57 | (...)... : String | Test.java:6744:13:6744:58 | newListOrderedSetWithElement(...) : ListOrderedSet [<element>] : String | provenance | MaD:4 |
 | Test.java:6744:50:6744:57 | source(...) : Object | Test.java:6744:42:6744:57 | (...)... : String | provenance |  |
 | Test.java:6745:10:6745:45 | new MyAbstractSortedSetDecorator<>(...) : MyAbstractSortedSetDecorator [<element>] : String | Test.java:6746:20:6746:22 | out : MyAbstractSortedSetDecorator [<element>] : String | provenance |  |
-| Test.java:6745:43:6745:44 | in : ListOrderedSet [<element>] : String | Test.java:6745:10:6745:45 | new MyAbstractSortedSetDecorator<>(...) : MyAbstractSortedSetDecorator [<element>] : String | provenance | MaD:780 |
+| Test.java:6745:43:6745:44 | in : ListOrderedSet [<element>] : String | Test.java:6745:10:6745:45 | new MyAbstractSortedSetDecorator<>(...) : MyAbstractSortedSetDecorator [<element>] : String | provenance | MaD:425 |
 | Test.java:6745:43:6745:44 | in : ListOrderedSet [<element>] : String | Test.java:7255:39:7255:54 | set : ListOrderedSet [<element>] : String | provenance |  |
 | Test.java:6746:20:6746:22 | out : MyAbstractSortedSetDecorator [<element>] : String | Test.java:230:19:230:32 | it : MyAbstractSortedSetDecorator [<element>] : String | provenance |  |
-| Test.java:6746:20:6746:22 | out : MyAbstractSortedSetDecorator [<element>] : String | Test.java:6746:9:6746:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:6746:20:6746:22 | out : MyAbstractSortedSetDecorator [<element>] : String | Test.java:6746:9:6746:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:6751:16:6751:23 | source(...) : Object | Test.java:6753:28:6753:29 | in : Object | provenance |  |
 | Test.java:6753:17:6753:19 | out [post update] : CompositeSet [<element>] : Object | Test.java:6754:20:6754:22 | out : CompositeSet [<element>] : Object | provenance |  |
-| Test.java:6753:28:6753:29 | in : Object | Test.java:6753:17:6753:19 | out [post update] : CompositeSet [<element>] : Object | provenance | MaD:789 |
+| Test.java:6753:28:6753:29 | in : Object | Test.java:6753:17:6753:19 | out [post update] : CompositeSet [<element>] : Object | provenance | MaD:426 |
 | Test.java:6754:20:6754:22 | out : CompositeSet [<element>] : Object | Test.java:230:19:230:32 | it : CompositeSet [<element>] : Object | provenance |  |
-| Test.java:6754:20:6754:22 | out : CompositeSet [<element>] : Object | Test.java:6754:9:6754:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:6754:20:6754:22 | out : CompositeSet [<element>] : Object | Test.java:6754:9:6754:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:6759:16:6759:23 | source(...) : Object | Test.java:6761:28:6761:29 | in : Object | provenance |  |
 | Test.java:6761:23:6761:25 | out [post update] : List [<element>, <element>] : Object | Test.java:6762:31:6762:33 | out : List [<element>, <element>] : Object | provenance |  |
-| Test.java:6761:28:6761:29 | in : Object | Test.java:6761:23:6761:25 | out [post update] : List [<element>, <element>] : Object | provenance | MaD:790 |
+| Test.java:6761:28:6761:29 | in : Object | Test.java:6761:23:6761:25 | out [post update] : List [<element>, <element>] : Object | provenance | MaD:427 |
 | Test.java:6762:20:6762:34 | getElement(...) : Set [<element>] : Object | Test.java:230:19:230:32 | it : Set [<element>] : Object | provenance |  |
-| Test.java:6762:20:6762:34 | getElement(...) : Set [<element>] : Object | Test.java:6762:9:6762:35 | getElement(...) | provenance | MaD:1 |
+| Test.java:6762:20:6762:34 | getElement(...) : Set [<element>] : Object | Test.java:6762:9:6762:35 | getElement(...) | provenance | MaD:3 |
 | Test.java:6762:31:6762:33 | out : List [<element>, <element>] : Object | Test.java:230:19:230:32 | it : List [<element>, <element>] : Object | provenance |  |
-| Test.java:6762:31:6762:33 | out : List [<element>, <element>] : Object | Test.java:6762:20:6762:34 | getElement(...) : Set [<element>] : Object | provenance | MaD:1 |
+| Test.java:6762:31:6762:33 | out : List [<element>, <element>] : Object | Test.java:6762:20:6762:34 | getElement(...) : Set [<element>] : Object | provenance | MaD:3 |
 | Test.java:6767:20:6767:58 | newTreeBagWithElement(...) : TreeBag [<element>] : String | Test.java:6769:31:6769:32 | in : TreeBag [<element>] : String | provenance |  |
 | Test.java:6767:42:6767:57 | (...)... : String | Test.java:267:39:267:47 | element : String | provenance |  |
-| Test.java:6767:42:6767:57 | (...)... : String | Test.java:6767:20:6767:58 | newTreeBagWithElement(...) : TreeBag [<element>] : String | provenance | MaD:2 |
-| Test.java:6767:42:6767:57 | (...)... : String | Test.java:6767:20:6767:58 | newTreeBagWithElement(...) : TreeBag [<element>] : String | provenance | MaD:395 |
+| Test.java:6767:42:6767:57 | (...)... : String | Test.java:6767:20:6767:58 | newTreeBagWithElement(...) : TreeBag [<element>] : String | provenance | MaD:4 |
+| Test.java:6767:42:6767:57 | (...)... : String | Test.java:6767:20:6767:58 | newTreeBagWithElement(...) : TreeBag [<element>] : String | provenance | MaD:470 |
 | Test.java:6767:50:6767:57 | source(...) : Object | Test.java:6767:42:6767:57 | (...)... : String | provenance |  |
 | Test.java:6769:20:6769:22 | out [post update] : CompositeSet [<element>] : String | Test.java:6770:20:6770:22 | out : CompositeSet [<element>] : String | provenance |  |
-| Test.java:6769:31:6769:32 | in : TreeBag [<element>] : String | Test.java:6769:20:6769:22 | out [post update] : CompositeSet [<element>] : String | provenance | MaD:791 |
+| Test.java:6769:31:6769:32 | in : TreeBag [<element>] : String | Test.java:6769:20:6769:22 | out [post update] : CompositeSet [<element>] : String | provenance | MaD:428 |
 | Test.java:6770:20:6770:22 | out : CompositeSet [<element>] : String | Test.java:230:19:230:32 | it : CompositeSet [<element>] : String | provenance |  |
-| Test.java:6770:20:6770:22 | out : CompositeSet [<element>] : String | Test.java:6770:9:6770:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:6770:20:6770:22 | out : CompositeSet [<element>] : String | Test.java:6770:9:6770:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:6775:20:6775:58 | newTreeBagWithElement(...) : TreeBag [<element>] : String | Test.java:6777:31:6777:32 | in : TreeBag [<element>] : String | provenance |  |
 | Test.java:6775:42:6775:57 | (...)... : String | Test.java:267:39:267:47 | element : String | provenance |  |
-| Test.java:6775:42:6775:57 | (...)... : String | Test.java:6775:20:6775:58 | newTreeBagWithElement(...) : TreeBag [<element>] : String | provenance | MaD:2 |
-| Test.java:6775:42:6775:57 | (...)... : String | Test.java:6775:20:6775:58 | newTreeBagWithElement(...) : TreeBag [<element>] : String | provenance | MaD:395 |
+| Test.java:6775:42:6775:57 | (...)... : String | Test.java:6775:20:6775:58 | newTreeBagWithElement(...) : TreeBag [<element>] : String | provenance | MaD:4 |
+| Test.java:6775:42:6775:57 | (...)... : String | Test.java:6775:20:6775:58 | newTreeBagWithElement(...) : TreeBag [<element>] : String | provenance | MaD:470 |
 | Test.java:6775:50:6775:57 | source(...) : Object | Test.java:6775:42:6775:57 | (...)... : String | provenance |  |
 | Test.java:6777:26:6777:28 | out [post update] : List [<element>, <element>] : String | Test.java:6778:31:6778:33 | out : List [<element>, <element>] : String | provenance |  |
-| Test.java:6777:31:6777:32 | in : TreeBag [<element>] : String | Test.java:6777:26:6777:28 | out [post update] : List [<element>, <element>] : String | provenance | MaD:792 |
+| Test.java:6777:31:6777:32 | in : TreeBag [<element>] : String | Test.java:6777:26:6777:28 | out [post update] : List [<element>, <element>] : String | provenance | MaD:429 |
 | Test.java:6778:20:6778:34 | getElement(...) : Set [<element>] : String | Test.java:230:19:230:32 | it : Set [<element>] : String | provenance |  |
-| Test.java:6778:20:6778:34 | getElement(...) : Set [<element>] : String | Test.java:6778:9:6778:35 | getElement(...) | provenance | MaD:1 |
+| Test.java:6778:20:6778:34 | getElement(...) : Set [<element>] : String | Test.java:6778:9:6778:35 | getElement(...) | provenance | MaD:3 |
 | Test.java:6778:31:6778:33 | out : List [<element>, <element>] : String | Test.java:230:19:230:32 | it : List [<element>, <element>] : String | provenance |  |
-| Test.java:6778:31:6778:33 | out : List [<element>, <element>] : String | Test.java:6778:20:6778:34 | getElement(...) : Set [<element>] : String | provenance | MaD:1 |
+| Test.java:6778:31:6778:33 | out : List [<element>, <element>] : String | Test.java:6778:20:6778:34 | getElement(...) : Set [<element>] : String | provenance | MaD:3 |
 | Test.java:6783:13:6783:58 | newListOrderedSetWithElement(...) : ListOrderedSet [<element>] : String | Test.java:6784:27:6784:28 | in : ListOrderedSet [<element>] : String | provenance |  |
 | Test.java:6783:42:6783:57 | (...)... : String | Test.java:260:53:260:61 | element : String | provenance |  |
-| Test.java:6783:42:6783:57 | (...)... : String | Test.java:6783:13:6783:58 | newListOrderedSetWithElement(...) : ListOrderedSet [<element>] : String | provenance | MaD:2 |
+| Test.java:6783:42:6783:57 | (...)... : String | Test.java:6783:13:6783:58 | newListOrderedSetWithElement(...) : ListOrderedSet [<element>] : String | provenance | MaD:4 |
 | Test.java:6783:50:6783:57 | source(...) : Object | Test.java:6783:42:6783:57 | (...)... : String | provenance |  |
 | Test.java:6784:10:6784:29 | new CompositeSet<>(...) : CompositeSet [<element>] : String | Test.java:6785:20:6785:22 | out : CompositeSet [<element>] : String | provenance |  |
-| Test.java:6784:27:6784:28 | in : ListOrderedSet [<element>] : String | Test.java:6784:10:6784:29 | new CompositeSet<>(...) : CompositeSet [<element>] : String | provenance | MaD:781 |
+| Test.java:6784:27:6784:28 | in : ListOrderedSet [<element>] : String | Test.java:6784:10:6784:29 | new CompositeSet<>(...) : CompositeSet [<element>] : String | provenance | MaD:430 |
 | Test.java:6785:20:6785:22 | out : CompositeSet [<element>] : String | Test.java:230:19:230:32 | it : CompositeSet [<element>] : String | provenance |  |
-| Test.java:6785:20:6785:22 | out : CompositeSet [<element>] : String | Test.java:6785:9:6785:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:6785:20:6785:22 | out : CompositeSet [<element>] : String | Test.java:6785:9:6785:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:6790:15:6790:71 | {...} : Set[] [[], <element>] : String | Test.java:6791:27:6791:28 | in : Set[] [[], <element>] : String | provenance |  |
 | Test.java:6790:25:6790:70 | newListOrderedSetWithElement(...) : ListOrderedSet [<element>] : String | Test.java:6790:15:6790:71 | {...} : Set[] [[], <element>] : String | provenance |  |
 | Test.java:6790:54:6790:69 | (...)... : String | Test.java:260:53:260:61 | element : String | provenance |  |
-| Test.java:6790:54:6790:69 | (...)... : String | Test.java:6790:25:6790:70 | newListOrderedSetWithElement(...) : ListOrderedSet [<element>] : String | provenance | MaD:2 |
+| Test.java:6790:54:6790:69 | (...)... : String | Test.java:6790:25:6790:70 | newListOrderedSetWithElement(...) : ListOrderedSet [<element>] : String | provenance | MaD:4 |
 | Test.java:6790:62:6790:69 | source(...) : Object | Test.java:6790:54:6790:69 | (...)... : String | provenance |  |
 | Test.java:6791:10:6791:29 | new CompositeSet<>(...) : CompositeSet [<element>] : String | Test.java:6792:20:6792:22 | out : CompositeSet [<element>] : String | provenance |  |
-| Test.java:6791:27:6791:28 | in : Set[] [[], <element>] : String | Test.java:6791:10:6791:29 | new CompositeSet<>(...) : CompositeSet [<element>] : String | provenance | MaD:782 |
+| Test.java:6791:27:6791:28 | in : Set[] [[], <element>] : String | Test.java:6791:10:6791:29 | new CompositeSet<>(...) : CompositeSet [<element>] : String | provenance | MaD:431 |
 | Test.java:6792:20:6792:22 | out : CompositeSet [<element>] : String | Test.java:230:19:230:32 | it : CompositeSet [<element>] : String | provenance |  |
-| Test.java:6792:20:6792:22 | out : CompositeSet [<element>] : String | Test.java:6792:9:6792:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:6792:20:6792:22 | out : CompositeSet [<element>] : String | Test.java:6792:9:6792:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:6797:13:6797:58 | newListOrderedSetWithElement(...) : ListOrderedSet [<element>] : String | Test.java:6798:22:6798:23 | in : ListOrderedSet [<element>] : String | provenance |  |
 | Test.java:6797:42:6797:57 | (...)... : String | Test.java:260:53:260:61 | element : String | provenance |  |
-| Test.java:6797:42:6797:57 | (...)... : String | Test.java:6797:13:6797:58 | newListOrderedSetWithElement(...) : ListOrderedSet [<element>] : String | provenance | MaD:2 |
+| Test.java:6797:42:6797:57 | (...)... : String | Test.java:6797:13:6797:58 | newListOrderedSetWithElement(...) : ListOrderedSet [<element>] : String | provenance | MaD:4 |
 | Test.java:6797:50:6797:57 | source(...) : Object | Test.java:6797:42:6797:57 | (...)... : String | provenance |  |
 | Test.java:6798:4:6798:6 | out [post update] : CompositeSet [<element>] : String | Test.java:6799:20:6799:22 | out : CompositeSet [<element>] : String | provenance |  |
-| Test.java:6798:22:6798:23 | in : ListOrderedSet [<element>] : String | Test.java:6798:4:6798:6 | out [post update] : CompositeSet [<element>] : String | provenance | MaD:783 |
+| Test.java:6798:22:6798:23 | in : ListOrderedSet [<element>] : String | Test.java:6798:4:6798:6 | out [post update] : CompositeSet [<element>] : String | provenance | MaD:432 |
 | Test.java:6799:20:6799:22 | out : CompositeSet [<element>] : String | Test.java:230:19:230:32 | it : CompositeSet [<element>] : String | provenance |  |
-| Test.java:6799:20:6799:22 | out : CompositeSet [<element>] : String | Test.java:6799:9:6799:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:6799:20:6799:22 | out : CompositeSet [<element>] : String | Test.java:6799:9:6799:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:6804:13:6804:58 | newListOrderedSetWithElement(...) : ListOrderedSet [<element>] : String | Test.java:6805:22:6805:23 | in : ListOrderedSet [<element>] : String | provenance |  |
 | Test.java:6804:42:6804:57 | (...)... : String | Test.java:260:53:260:61 | element : String | provenance |  |
-| Test.java:6804:42:6804:57 | (...)... : String | Test.java:6804:13:6804:58 | newListOrderedSetWithElement(...) : ListOrderedSet [<element>] : String | provenance | MaD:2 |
+| Test.java:6804:42:6804:57 | (...)... : String | Test.java:6804:13:6804:58 | newListOrderedSetWithElement(...) : ListOrderedSet [<element>] : String | provenance | MaD:4 |
 | Test.java:6804:50:6804:57 | source(...) : Object | Test.java:6804:42:6804:57 | (...)... : String | provenance |  |
 | Test.java:6805:4:6805:6 | out [post update] : CompositeSet [<element>] : String | Test.java:6806:20:6806:22 | out : CompositeSet [<element>] : String | provenance |  |
-| Test.java:6805:22:6805:23 | in : ListOrderedSet [<element>] : String | Test.java:6805:4:6805:6 | out [post update] : CompositeSet [<element>] : String | provenance | MaD:784 |
+| Test.java:6805:22:6805:23 | in : ListOrderedSet [<element>] : String | Test.java:6805:4:6805:6 | out [post update] : CompositeSet [<element>] : String | provenance | MaD:433 |
 | Test.java:6806:20:6806:22 | out : CompositeSet [<element>] : String | Test.java:230:19:230:32 | it : CompositeSet [<element>] : String | provenance |  |
-| Test.java:6806:20:6806:22 | out : CompositeSet [<element>] : String | Test.java:6806:9:6806:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:6806:20:6806:22 | out : CompositeSet [<element>] : String | Test.java:6806:9:6806:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:6811:13:6811:58 | newListOrderedSetWithElement(...) : ListOrderedSet [<element>] : String | Test.java:6812:28:6812:29 | in : ListOrderedSet [<element>] : String | provenance |  |
 | Test.java:6811:42:6811:57 | (...)... : String | Test.java:260:53:260:61 | element : String | provenance |  |
-| Test.java:6811:42:6811:57 | (...)... : String | Test.java:6811:13:6811:58 | newListOrderedSetWithElement(...) : ListOrderedSet [<element>] : String | provenance | MaD:2 |
+| Test.java:6811:42:6811:57 | (...)... : String | Test.java:6811:13:6811:58 | newListOrderedSetWithElement(...) : ListOrderedSet [<element>] : String | provenance | MaD:4 |
 | Test.java:6811:50:6811:57 | source(...) : Object | Test.java:6811:42:6811:57 | (...)... : String | provenance |  |
 | Test.java:6812:4:6812:6 | out [post update] : CompositeSet [<element>] : String | Test.java:6813:20:6813:22 | out : CompositeSet [<element>] : String | provenance |  |
-| Test.java:6812:28:6812:29 | in : ListOrderedSet [<element>] : String | Test.java:6812:4:6812:6 | out [post update] : CompositeSet [<element>] : String | provenance | MaD:785 |
+| Test.java:6812:28:6812:29 | in : ListOrderedSet [<element>] : String | Test.java:6812:4:6812:6 | out [post update] : CompositeSet [<element>] : String | provenance | MaD:434 |
 | Test.java:6813:20:6813:22 | out : CompositeSet [<element>] : String | Test.java:230:19:230:32 | it : CompositeSet [<element>] : String | provenance |  |
-| Test.java:6813:20:6813:22 | out : CompositeSet [<element>] : String | Test.java:6813:9:6813:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:6813:20:6813:22 | out : CompositeSet [<element>] : String | Test.java:6813:9:6813:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:6818:15:6818:71 | {...} : Set[] [[], <element>] : String | Test.java:6819:22:6819:23 | in : Set[] [[], <element>] : String | provenance |  |
 | Test.java:6818:25:6818:70 | newListOrderedSetWithElement(...) : ListOrderedSet [<element>] : String | Test.java:6818:15:6818:71 | {...} : Set[] [[], <element>] : String | provenance |  |
 | Test.java:6818:54:6818:69 | (...)... : String | Test.java:260:53:260:61 | element : String | provenance |  |
-| Test.java:6818:54:6818:69 | (...)... : String | Test.java:6818:25:6818:70 | newListOrderedSetWithElement(...) : ListOrderedSet [<element>] : String | provenance | MaD:2 |
+| Test.java:6818:54:6818:69 | (...)... : String | Test.java:6818:25:6818:70 | newListOrderedSetWithElement(...) : ListOrderedSet [<element>] : String | provenance | MaD:4 |
 | Test.java:6818:62:6818:69 | source(...) : Object | Test.java:6818:54:6818:69 | (...)... : String | provenance |  |
 | Test.java:6819:4:6819:6 | out [post update] : CompositeSet [<element>] : String | Test.java:6820:20:6820:22 | out : CompositeSet [<element>] : String | provenance |  |
-| Test.java:6819:22:6819:23 | in : Set[] [[], <element>] : String | Test.java:6819:4:6819:6 | out [post update] : CompositeSet [<element>] : String | provenance | MaD:786 |
+| Test.java:6819:22:6819:23 | in : Set[] [[], <element>] : String | Test.java:6819:4:6819:6 | out [post update] : CompositeSet [<element>] : String | provenance | MaD:435 |
 | Test.java:6820:20:6820:22 | out : CompositeSet [<element>] : String | Test.java:230:19:230:32 | it : CompositeSet [<element>] : String | provenance |  |
-| Test.java:6820:20:6820:22 | out : CompositeSet [<element>] : String | Test.java:6820:9:6820:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:6820:20:6820:22 | out : CompositeSet [<element>] : String | Test.java:6820:9:6820:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:6825:30:6825:73 | newCompositeSetWithElement(...) : CompositeSet [<element>] : String | Test.java:6826:10:6826:11 | in : CompositeSet [<element>] : String | provenance |  |
 | Test.java:6825:57:6825:72 | (...)... : String | Test.java:254:49:254:57 | element : String | provenance |  |
-| Test.java:6825:57:6825:72 | (...)... : String | Test.java:6825:30:6825:73 | newCompositeSetWithElement(...) : CompositeSet [<element>] : String | provenance | MaD:2 |
+| Test.java:6825:57:6825:72 | (...)... : String | Test.java:6825:30:6825:73 | newCompositeSetWithElement(...) : CompositeSet [<element>] : String | provenance | MaD:4 |
 | Test.java:6825:65:6825:72 | source(...) : Object | Test.java:6825:57:6825:72 | (...)... : String | provenance |  |
-| Test.java:6826:10:6826:11 | in : CompositeSet [<element>] : String | Test.java:6826:10:6826:21 | getSets(...) : List [<element>, <element>] : String | provenance | MaD:787 |
+| Test.java:6826:10:6826:11 | in : CompositeSet [<element>] : String | Test.java:6826:10:6826:21 | getSets(...) : List [<element>, <element>] : String | provenance | MaD:436 |
 | Test.java:6826:10:6826:21 | getSets(...) : List [<element>, <element>] : String | Test.java:6827:31:6827:33 | out : List [<element>, <element>] : String | provenance |  |
 | Test.java:6827:20:6827:34 | getElement(...) : Set [<element>] : String | Test.java:230:19:230:32 | it : Set [<element>] : String | provenance |  |
-| Test.java:6827:20:6827:34 | getElement(...) : Set [<element>] : String | Test.java:6827:9:6827:35 | getElement(...) | provenance | MaD:1 |
+| Test.java:6827:20:6827:34 | getElement(...) : Set [<element>] : String | Test.java:6827:9:6827:35 | getElement(...) | provenance | MaD:3 |
 | Test.java:6827:31:6827:33 | out : List [<element>, <element>] : String | Test.java:230:19:230:32 | it : List [<element>, <element>] : String | provenance |  |
-| Test.java:6827:31:6827:33 | out : List [<element>, <element>] : String | Test.java:6827:20:6827:34 | getElement(...) : Set [<element>] : String | provenance | MaD:1 |
+| Test.java:6827:31:6827:33 | out : List [<element>, <element>] : String | Test.java:6827:20:6827:34 | getElement(...) : Set [<element>] : String | provenance | MaD:3 |
 | Test.java:6832:22:6832:65 | newCompositeSetWithElement(...) : CompositeSet [<element>] : String | Test.java:6833:10:6833:11 | in : CompositeSet [<element>] : String | provenance |  |
 | Test.java:6832:49:6832:64 | (...)... : String | Test.java:254:49:254:57 | element : String | provenance |  |
-| Test.java:6832:49:6832:64 | (...)... : String | Test.java:6832:22:6832:65 | newCompositeSetWithElement(...) : CompositeSet [<element>] : String | provenance | MaD:2 |
+| Test.java:6832:49:6832:64 | (...)... : String | Test.java:6832:22:6832:65 | newCompositeSetWithElement(...) : CompositeSet [<element>] : String | provenance | MaD:4 |
 | Test.java:6832:57:6832:64 | source(...) : Object | Test.java:6832:49:6832:64 | (...)... : String | provenance |  |
-| Test.java:6833:10:6833:11 | in : CompositeSet [<element>] : String | Test.java:6833:10:6833:19 | toSet(...) : Set [<element>] : String | provenance | MaD:788 |
+| Test.java:6833:10:6833:11 | in : CompositeSet [<element>] : String | Test.java:6833:10:6833:19 | toSet(...) : Set [<element>] : String | provenance | MaD:437 |
 | Test.java:6833:10:6833:19 | toSet(...) : Set [<element>] : String | Test.java:6834:20:6834:22 | out : Set [<element>] : String | provenance |  |
 | Test.java:6834:20:6834:22 | out : Set [<element>] : String | Test.java:230:19:230:32 | it : Set [<element>] : String | provenance |  |
-| Test.java:6834:20:6834:22 | out : Set [<element>] : String | Test.java:6834:9:6834:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:6834:20:6834:22 | out : Set [<element>] : String | Test.java:6834:9:6834:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:6839:16:6839:23 | source(...) : Object | Test.java:6840:15:6840:16 | in : Object | provenance |  |
 | Test.java:6840:4:6840:6 | out [post update] : ListOrderedSet [<element>] : Object | Test.java:6841:20:6841:22 | out : ListOrderedSet [<element>] : Object | provenance |  |
-| Test.java:6840:15:6840:16 | in : Object | Test.java:6840:4:6840:6 | out [post update] : ListOrderedSet [<element>] : Object | provenance | MaD:793 |
+| Test.java:6840:15:6840:16 | in : Object | Test.java:6840:4:6840:6 | out [post update] : ListOrderedSet [<element>] : Object | provenance | MaD:438 |
 | Test.java:6841:20:6841:22 | out : ListOrderedSet [<element>] : Object | Test.java:230:19:230:32 | it : ListOrderedSet [<element>] : Object | provenance |  |
-| Test.java:6841:20:6841:22 | out : ListOrderedSet [<element>] : Object | Test.java:6841:9:6841:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:6841:20:6841:22 | out : ListOrderedSet [<element>] : Object | Test.java:6841:9:6841:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:6846:20:6846:44 | of(...) : List [<element>] : String | Test.java:6847:18:6847:19 | in : List [<element>] : String | provenance |  |
-| Test.java:6846:28:6846:43 | (...)... : String | Test.java:6846:20:6846:44 | of(...) : List [<element>] : String | provenance | MaD:6 |
+| Test.java:6846:28:6846:43 | (...)... : String | Test.java:6846:20:6846:44 | of(...) : List [<element>] : String | provenance | MaD:7 |
 | Test.java:6846:36:6846:43 | source(...) : Object | Test.java:6846:28:6846:43 | (...)... : String | provenance |  |
 | Test.java:6847:4:6847:6 | out [post update] : ListOrderedSet [<element>] : String | Test.java:6848:20:6848:22 | out : ListOrderedSet [<element>] : String | provenance |  |
-| Test.java:6847:18:6847:19 | in : List [<element>] : String | Test.java:6847:4:6847:6 | out [post update] : ListOrderedSet [<element>] : String | provenance | MaD:794 |
+| Test.java:6847:18:6847:19 | in : List [<element>] : String | Test.java:6847:4:6847:6 | out [post update] : ListOrderedSet [<element>] : String | provenance | MaD:439 |
 | Test.java:6848:20:6848:22 | out : ListOrderedSet [<element>] : String | Test.java:230:19:230:32 | it : ListOrderedSet [<element>] : String | provenance |  |
-| Test.java:6848:20:6848:22 | out : ListOrderedSet [<element>] : String | Test.java:6848:9:6848:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:6848:20:6848:22 | out : ListOrderedSet [<element>] : String | Test.java:6848:9:6848:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:6853:24:6853:69 | newListOrderedSetWithElement(...) : ListOrderedSet [<element>] : String | Test.java:6854:10:6854:11 | in : ListOrderedSet [<element>] : String | provenance |  |
 | Test.java:6853:53:6853:68 | (...)... : String | Test.java:260:53:260:61 | element : String | provenance |  |
-| Test.java:6853:53:6853:68 | (...)... : String | Test.java:6853:24:6853:69 | newListOrderedSetWithElement(...) : ListOrderedSet [<element>] : String | provenance | MaD:2 |
+| Test.java:6853:53:6853:68 | (...)... : String | Test.java:6853:24:6853:69 | newListOrderedSetWithElement(...) : ListOrderedSet [<element>] : String | provenance | MaD:4 |
 | Test.java:6853:61:6853:68 | source(...) : Object | Test.java:6853:53:6853:68 | (...)... : String | provenance |  |
-| Test.java:6854:10:6854:11 | in : ListOrderedSet [<element>] : String | Test.java:6854:10:6854:20 | asList(...) : List [<element>] : String | provenance | MaD:795 |
+| Test.java:6854:10:6854:11 | in : ListOrderedSet [<element>] : String | Test.java:6854:10:6854:20 | asList(...) : List [<element>] : String | provenance | MaD:440 |
 | Test.java:6854:10:6854:20 | asList(...) : List [<element>] : String | Test.java:6855:20:6855:22 | out : List [<element>] : String | provenance |  |
 | Test.java:6855:20:6855:22 | out : List [<element>] : String | Test.java:230:19:230:32 | it : List [<element>] : String | provenance |  |
-| Test.java:6855:20:6855:22 | out : List [<element>] : String | Test.java:6855:9:6855:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:6855:20:6855:22 | out : List [<element>] : String | Test.java:6855:9:6855:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:6860:24:6860:69 | newListOrderedSetWithElement(...) : ListOrderedSet [<element>] : String | Test.java:6861:10:6861:11 | in : ListOrderedSet [<element>] : String | provenance |  |
 | Test.java:6860:53:6860:68 | (...)... : String | Test.java:260:53:260:61 | element : String | provenance |  |
-| Test.java:6860:53:6860:68 | (...)... : String | Test.java:6860:24:6860:69 | newListOrderedSetWithElement(...) : ListOrderedSet [<element>] : String | provenance | MaD:2 |
+| Test.java:6860:53:6860:68 | (...)... : String | Test.java:6860:24:6860:69 | newListOrderedSetWithElement(...) : ListOrderedSet [<element>] : String | provenance | MaD:4 |
 | Test.java:6860:61:6860:68 | source(...) : Object | Test.java:6860:53:6860:68 | (...)... : String | provenance |  |
-| Test.java:6861:10:6861:11 | in : ListOrderedSet [<element>] : String | Test.java:6861:10:6861:18 | get(...) : String | provenance | MaD:796 |
+| Test.java:6861:10:6861:11 | in : ListOrderedSet [<element>] : String | Test.java:6861:10:6861:18 | get(...) : String | provenance | MaD:441 |
 | Test.java:6861:10:6861:18 | get(...) : String | Test.java:6862:9:6862:11 | out | provenance |  |
 | Test.java:6867:14:6867:38 | of(...) : List [<element>] : String | Test.java:6868:40:6868:41 | in : List [<element>] : String | provenance |  |
-| Test.java:6867:22:6867:37 | (...)... : String | Test.java:6867:14:6867:38 | of(...) : List [<element>] : String | provenance | MaD:6 |
+| Test.java:6867:22:6867:37 | (...)... : String | Test.java:6867:14:6867:38 | of(...) : List [<element>] : String | provenance | MaD:7 |
 | Test.java:6867:30:6867:37 | source(...) : Object | Test.java:6867:22:6867:37 | (...)... : String | provenance |  |
 | Test.java:6868:10:6868:42 | listOrderedSet(...) : ListOrderedSet [<element>] : String | Test.java:6869:20:6869:22 | out : ListOrderedSet [<element>] : String | provenance |  |
-| Test.java:6868:40:6868:41 | in : List [<element>] : String | Test.java:6868:10:6868:42 | listOrderedSet(...) : ListOrderedSet [<element>] : String | provenance | MaD:797 |
+| Test.java:6868:40:6868:41 | in : List [<element>] : String | Test.java:6868:10:6868:42 | listOrderedSet(...) : ListOrderedSet [<element>] : String | provenance | MaD:442 |
 | Test.java:6869:20:6869:22 | out : ListOrderedSet [<element>] : String | Test.java:230:19:230:32 | it : ListOrderedSet [<element>] : String | provenance |  |
-| Test.java:6869:20:6869:22 | out : ListOrderedSet [<element>] : String | Test.java:6869:9:6869:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:6869:20:6869:22 | out : ListOrderedSet [<element>] : String | Test.java:6869:9:6869:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:6874:13:6874:58 | newListOrderedSetWithElement(...) : ListOrderedSet [<element>] : String | Test.java:6875:40:6875:41 | in : ListOrderedSet [<element>] : String | provenance |  |
 | Test.java:6874:42:6874:57 | (...)... : String | Test.java:260:53:260:61 | element : String | provenance |  |
-| Test.java:6874:42:6874:57 | (...)... : String | Test.java:6874:13:6874:58 | newListOrderedSetWithElement(...) : ListOrderedSet [<element>] : String | provenance | MaD:2 |
+| Test.java:6874:42:6874:57 | (...)... : String | Test.java:6874:13:6874:58 | newListOrderedSetWithElement(...) : ListOrderedSet [<element>] : String | provenance | MaD:4 |
 | Test.java:6874:50:6874:57 | source(...) : Object | Test.java:6874:42:6874:57 | (...)... : String | provenance |  |
 | Test.java:6875:10:6875:42 | listOrderedSet(...) : ListOrderedSet [<element>] : String | Test.java:6876:20:6876:22 | out : ListOrderedSet [<element>] : String | provenance |  |
-| Test.java:6875:40:6875:41 | in : ListOrderedSet [<element>] : String | Test.java:6875:10:6875:42 | listOrderedSet(...) : ListOrderedSet [<element>] : String | provenance | MaD:798 |
+| Test.java:6875:40:6875:41 | in : ListOrderedSet [<element>] : String | Test.java:6875:10:6875:42 | listOrderedSet(...) : ListOrderedSet [<element>] : String | provenance | MaD:443 |
 | Test.java:6876:20:6876:22 | out : ListOrderedSet [<element>] : String | Test.java:230:19:230:32 | it : ListOrderedSet [<element>] : String | provenance |  |
-| Test.java:6876:20:6876:22 | out : ListOrderedSet [<element>] : String | Test.java:6876:9:6876:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:6876:20:6876:22 | out : ListOrderedSet [<element>] : String | Test.java:6876:9:6876:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:6881:13:6881:42 | of(...) : Map [<map.key>] : String | Test.java:6882:36:6882:37 | in : Map [<map.key>] : String | provenance |  |
-| Test.java:6881:20:6881:35 | (...)... : String | Test.java:6881:13:6881:42 | of(...) : Map [<map.key>] : String | provenance | MaD:11 |
+| Test.java:6881:20:6881:35 | (...)... : String | Test.java:6881:13:6881:42 | of(...) : Map [<map.key>] : String | provenance | MaD:13 |
 | Test.java:6881:28:6881:35 | source(...) : Object | Test.java:6881:20:6881:35 | (...)... : String | provenance |  |
 | Test.java:6882:10:6882:44 | mapBackedSet(...) : MapBackedSet [<element>] : String | Test.java:6883:20:6883:22 | out : MapBackedSet [<element>] : String | provenance |  |
-| Test.java:6882:36:6882:37 | in : Map [<map.key>] : String | Test.java:6882:10:6882:44 | mapBackedSet(...) : MapBackedSet [<element>] : String | provenance | MaD:799 |
+| Test.java:6882:36:6882:37 | in : Map [<map.key>] : String | Test.java:6882:10:6882:44 | mapBackedSet(...) : MapBackedSet [<element>] : String | provenance | MaD:444 |
 | Test.java:6883:20:6883:22 | out : MapBackedSet [<element>] : String | Test.java:230:19:230:32 | it : MapBackedSet [<element>] : String | provenance |  |
-| Test.java:6883:20:6883:22 | out : MapBackedSet [<element>] : String | Test.java:6883:9:6883:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:6883:20:6883:22 | out : MapBackedSet [<element>] : String | Test.java:6883:9:6883:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:6888:13:6888:42 | of(...) : Map [<map.key>] : String | Test.java:6889:36:6889:37 | in : Map [<map.key>] : String | provenance |  |
-| Test.java:6888:20:6888:35 | (...)... : String | Test.java:6888:13:6888:42 | of(...) : Map [<map.key>] : String | provenance | MaD:11 |
+| Test.java:6888:20:6888:35 | (...)... : String | Test.java:6888:13:6888:42 | of(...) : Map [<map.key>] : String | provenance | MaD:13 |
 | Test.java:6888:28:6888:35 | source(...) : Object | Test.java:6888:20:6888:35 | (...)... : String | provenance |  |
 | Test.java:6889:10:6889:38 | mapBackedSet(...) : MapBackedSet [<element>] : String | Test.java:6890:20:6890:22 | out : MapBackedSet [<element>] : String | provenance |  |
-| Test.java:6889:36:6889:37 | in : Map [<map.key>] : String | Test.java:6889:10:6889:38 | mapBackedSet(...) : MapBackedSet [<element>] : String | provenance | MaD:799 |
+| Test.java:6889:36:6889:37 | in : Map [<map.key>] : String | Test.java:6889:10:6889:38 | mapBackedSet(...) : MapBackedSet [<element>] : String | provenance | MaD:444 |
 | Test.java:6890:20:6890:22 | out : MapBackedSet [<element>] : String | Test.java:230:19:230:32 | it : MapBackedSet [<element>] : String | provenance |  |
-| Test.java:6890:20:6890:22 | out : MapBackedSet [<element>] : String | Test.java:6890:9:6890:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:6890:20:6890:22 | out : MapBackedSet [<element>] : String | Test.java:6890:9:6890:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:6895:22:6895:60 | newTreeSetWithElement(...) : TreeSet [<element>] : String | Test.java:6896:56:6896:57 | in : TreeSet [<element>] : String | provenance |  |
 | Test.java:6895:44:6895:59 | (...)... : String | Test.java:268:39:268:47 | element : String | provenance |  |
-| Test.java:6895:44:6895:59 | (...)... : String | Test.java:6895:22:6895:60 | newTreeSetWithElement(...) : TreeSet [<element>] : String | provenance | MaD:2 |
+| Test.java:6895:44:6895:59 | (...)... : String | Test.java:6895:22:6895:60 | newTreeSetWithElement(...) : TreeSet [<element>] : String | provenance | MaD:4 |
 | Test.java:6895:52:6895:59 | source(...) : Object | Test.java:6895:44:6895:59 | (...)... : String | provenance |  |
 | Test.java:6896:10:6896:64 | predicatedNavigableSet(...) : PredicatedNavigableSet [<element>] : String | Test.java:6897:20:6897:22 | out : PredicatedNavigableSet [<element>] : String | provenance |  |
-| Test.java:6896:56:6896:57 | in : TreeSet [<element>] : String | Test.java:6896:10:6896:64 | predicatedNavigableSet(...) : PredicatedNavigableSet [<element>] : String | provenance | MaD:800 |
+| Test.java:6896:56:6896:57 | in : TreeSet [<element>] : String | Test.java:6896:10:6896:64 | predicatedNavigableSet(...) : PredicatedNavigableSet [<element>] : String | provenance | MaD:445 |
 | Test.java:6897:20:6897:22 | out : PredicatedNavigableSet [<element>] : String | Test.java:230:19:230:32 | it : PredicatedNavigableSet [<element>] : String | provenance |  |
-| Test.java:6897:20:6897:22 | out : PredicatedNavigableSet [<element>] : String | Test.java:6897:9:6897:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:6897:20:6897:22 | out : PredicatedNavigableSet [<element>] : String | Test.java:6897:9:6897:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:6902:13:6902:58 | newListOrderedSetWithElement(...) : ListOrderedSet [<element>] : String | Test.java:6903:38:6903:39 | in : ListOrderedSet [<element>] : String | provenance |  |
 | Test.java:6902:42:6902:57 | (...)... : String | Test.java:260:53:260:61 | element : String | provenance |  |
-| Test.java:6902:42:6902:57 | (...)... : String | Test.java:6902:13:6902:58 | newListOrderedSetWithElement(...) : ListOrderedSet [<element>] : String | provenance | MaD:2 |
+| Test.java:6902:42:6902:57 | (...)... : String | Test.java:6902:13:6902:58 | newListOrderedSetWithElement(...) : ListOrderedSet [<element>] : String | provenance | MaD:4 |
 | Test.java:6902:50:6902:57 | source(...) : Object | Test.java:6902:42:6902:57 | (...)... : String | provenance |  |
 | Test.java:6903:10:6903:46 | predicatedSet(...) : PredicatedSet [<element>] : String | Test.java:6904:20:6904:22 | out : PredicatedSet [<element>] : String | provenance |  |
-| Test.java:6903:38:6903:39 | in : ListOrderedSet [<element>] : String | Test.java:6903:10:6903:46 | predicatedSet(...) : PredicatedSet [<element>] : String | provenance | MaD:801 |
+| Test.java:6903:38:6903:39 | in : ListOrderedSet [<element>] : String | Test.java:6903:10:6903:46 | predicatedSet(...) : PredicatedSet [<element>] : String | provenance | MaD:446 |
 | Test.java:6904:20:6904:22 | out : PredicatedSet [<element>] : String | Test.java:230:19:230:32 | it : PredicatedSet [<element>] : String | provenance |  |
-| Test.java:6904:20:6904:22 | out : PredicatedSet [<element>] : String | Test.java:6904:9:6904:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:6904:20:6904:22 | out : PredicatedSet [<element>] : String | Test.java:6904:9:6904:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:6909:19:6909:57 | newTreeSetWithElement(...) : TreeSet [<element>] : String | Test.java:6910:50:6910:51 | in : TreeSet [<element>] : String | provenance |  |
 | Test.java:6909:41:6909:56 | (...)... : String | Test.java:268:39:268:47 | element : String | provenance |  |
-| Test.java:6909:41:6909:56 | (...)... : String | Test.java:6909:19:6909:57 | newTreeSetWithElement(...) : TreeSet [<element>] : String | provenance | MaD:2 |
+| Test.java:6909:41:6909:56 | (...)... : String | Test.java:6909:19:6909:57 | newTreeSetWithElement(...) : TreeSet [<element>] : String | provenance | MaD:4 |
 | Test.java:6909:49:6909:56 | source(...) : Object | Test.java:6909:41:6909:56 | (...)... : String | provenance |  |
 | Test.java:6910:10:6910:58 | predicatedSortedSet(...) : PredicatedSortedSet [<element>] : String | Test.java:6911:20:6911:22 | out : PredicatedSortedSet [<element>] : String | provenance |  |
-| Test.java:6910:50:6910:51 | in : TreeSet [<element>] : String | Test.java:6910:10:6910:58 | predicatedSortedSet(...) : PredicatedSortedSet [<element>] : String | provenance | MaD:802 |
+| Test.java:6910:50:6910:51 | in : TreeSet [<element>] : String | Test.java:6910:10:6910:58 | predicatedSortedSet(...) : PredicatedSortedSet [<element>] : String | provenance | MaD:447 |
 | Test.java:6911:20:6911:22 | out : PredicatedSortedSet [<element>] : String | Test.java:230:19:230:32 | it : PredicatedSortedSet [<element>] : String | provenance |  |
-| Test.java:6911:20:6911:22 | out : PredicatedSortedSet [<element>] : String | Test.java:6911:9:6911:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:6911:20:6911:22 | out : PredicatedSortedSet [<element>] : String | Test.java:6911:9:6911:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:6916:22:6916:60 | newTreeSetWithElement(...) : TreeSet [<element>] : String | Test.java:6917:59:6917:60 | in : TreeSet [<element>] : String | provenance |  |
 | Test.java:6916:44:6916:59 | (...)... : String | Test.java:268:39:268:47 | element : String | provenance |  |
-| Test.java:6916:44:6916:59 | (...)... : String | Test.java:6916:22:6916:60 | newTreeSetWithElement(...) : TreeSet [<element>] : String | provenance | MaD:2 |
+| Test.java:6916:44:6916:59 | (...)... : String | Test.java:6916:22:6916:60 | newTreeSetWithElement(...) : TreeSet [<element>] : String | provenance | MaD:4 |
 | Test.java:6916:52:6916:59 | source(...) : Object | Test.java:6916:44:6916:59 | (...)... : String | provenance |  |
 | Test.java:6917:10:6917:67 | transformingNavigableSet(...) : TransformedNavigableSet [<element>] : String | Test.java:6918:20:6918:22 | out : TransformedNavigableSet [<element>] : String | provenance |  |
-| Test.java:6917:59:6917:60 | in : TreeSet [<element>] : String | Test.java:6917:10:6917:67 | transformingNavigableSet(...) : TransformedNavigableSet [<element>] : String | provenance | MaD:803 |
+| Test.java:6917:59:6917:60 | in : TreeSet [<element>] : String | Test.java:6917:10:6917:67 | transformingNavigableSet(...) : TransformedNavigableSet [<element>] : String | provenance | MaD:448 |
 | Test.java:6918:20:6918:22 | out : TransformedNavigableSet [<element>] : String | Test.java:230:19:230:32 | it : TransformedNavigableSet [<element>] : String | provenance |  |
-| Test.java:6918:20:6918:22 | out : TransformedNavigableSet [<element>] : String | Test.java:6918:9:6918:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:6918:20:6918:22 | out : TransformedNavigableSet [<element>] : String | Test.java:6918:9:6918:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:6923:13:6923:58 | newListOrderedSetWithElement(...) : ListOrderedSet [<element>] : String | Test.java:6924:41:6924:42 | in : ListOrderedSet [<element>] : String | provenance |  |
 | Test.java:6923:42:6923:57 | (...)... : String | Test.java:260:53:260:61 | element : String | provenance |  |
-| Test.java:6923:42:6923:57 | (...)... : String | Test.java:6923:13:6923:58 | newListOrderedSetWithElement(...) : ListOrderedSet [<element>] : String | provenance | MaD:2 |
+| Test.java:6923:42:6923:57 | (...)... : String | Test.java:6923:13:6923:58 | newListOrderedSetWithElement(...) : ListOrderedSet [<element>] : String | provenance | MaD:4 |
 | Test.java:6923:50:6923:57 | source(...) : Object | Test.java:6923:42:6923:57 | (...)... : String | provenance |  |
 | Test.java:6924:10:6924:49 | transformingSet(...) : TransformedSet [<element>] : String | Test.java:6925:20:6925:22 | out : TransformedSet [<element>] : String | provenance |  |
-| Test.java:6924:41:6924:42 | in : ListOrderedSet [<element>] : String | Test.java:6924:10:6924:49 | transformingSet(...) : TransformedSet [<element>] : String | provenance | MaD:804 |
+| Test.java:6924:41:6924:42 | in : ListOrderedSet [<element>] : String | Test.java:6924:10:6924:49 | transformingSet(...) : TransformedSet [<element>] : String | provenance | MaD:449 |
 | Test.java:6925:20:6925:22 | out : TransformedSet [<element>] : String | Test.java:230:19:230:32 | it : TransformedSet [<element>] : String | provenance |  |
-| Test.java:6925:20:6925:22 | out : TransformedSet [<element>] : String | Test.java:6925:9:6925:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:6925:20:6925:22 | out : TransformedSet [<element>] : String | Test.java:6925:9:6925:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:6930:19:6930:57 | newTreeSetWithElement(...) : TreeSet [<element>] : String | Test.java:6931:53:6931:54 | in : TreeSet [<element>] : String | provenance |  |
 | Test.java:6930:41:6930:56 | (...)... : String | Test.java:268:39:268:47 | element : String | provenance |  |
-| Test.java:6930:41:6930:56 | (...)... : String | Test.java:6930:19:6930:57 | newTreeSetWithElement(...) : TreeSet [<element>] : String | provenance | MaD:2 |
+| Test.java:6930:41:6930:56 | (...)... : String | Test.java:6930:19:6930:57 | newTreeSetWithElement(...) : TreeSet [<element>] : String | provenance | MaD:4 |
 | Test.java:6930:49:6930:56 | source(...) : Object | Test.java:6930:41:6930:56 | (...)... : String | provenance |  |
 | Test.java:6931:10:6931:61 | transformingSortedSet(...) : TransformedSortedSet [<element>] : String | Test.java:6932:20:6932:22 | out : TransformedSortedSet [<element>] : String | provenance |  |
-| Test.java:6931:53:6931:54 | in : TreeSet [<element>] : String | Test.java:6931:10:6931:61 | transformingSortedSet(...) : TransformedSortedSet [<element>] : String | provenance | MaD:805 |
+| Test.java:6931:53:6931:54 | in : TreeSet [<element>] : String | Test.java:6931:10:6931:61 | transformingSortedSet(...) : TransformedSortedSet [<element>] : String | provenance | MaD:450 |
 | Test.java:6932:20:6932:22 | out : TransformedSortedSet [<element>] : String | Test.java:230:19:230:32 | it : TransformedSortedSet [<element>] : String | provenance |  |
-| Test.java:6932:20:6932:22 | out : TransformedSortedSet [<element>] : String | Test.java:6932:9:6932:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:6932:20:6932:22 | out : TransformedSortedSet [<element>] : String | Test.java:6932:9:6932:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:6937:22:6937:60 | newTreeSetWithElement(...) : TreeSet [<element>] : String | Test.java:6938:60:6938:61 | in : TreeSet [<element>] : String | provenance |  |
 | Test.java:6937:44:6937:59 | (...)... : String | Test.java:268:39:268:47 | element : String | provenance |  |
-| Test.java:6937:44:6937:59 | (...)... : String | Test.java:6937:22:6937:60 | newTreeSetWithElement(...) : TreeSet [<element>] : String | provenance | MaD:2 |
+| Test.java:6937:44:6937:59 | (...)... : String | Test.java:6937:22:6937:60 | newTreeSetWithElement(...) : TreeSet [<element>] : String | provenance | MaD:4 |
 | Test.java:6937:52:6937:59 | source(...) : Object | Test.java:6937:44:6937:59 | (...)... : String | provenance |  |
 | Test.java:6938:10:6938:62 | unmodifiableNavigableSet(...) : NavigableSet [<element>] : String | Test.java:6939:20:6939:22 | out : NavigableSet [<element>] : String | provenance |  |
-| Test.java:6938:60:6938:61 | in : TreeSet [<element>] : String | Test.java:6938:10:6938:62 | unmodifiableNavigableSet(...) : NavigableSet [<element>] : String | provenance | MaD:806 |
+| Test.java:6938:60:6938:61 | in : TreeSet [<element>] : String | Test.java:6938:10:6938:62 | unmodifiableNavigableSet(...) : NavigableSet [<element>] : String | provenance | MaD:451 |
 | Test.java:6939:20:6939:22 | out : NavigableSet [<element>] : String | Test.java:230:19:230:32 | it : NavigableSet [<element>] : String | provenance |  |
-| Test.java:6939:20:6939:22 | out : NavigableSet [<element>] : String | Test.java:6939:9:6939:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:6939:20:6939:22 | out : NavigableSet [<element>] : String | Test.java:6939:9:6939:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:6944:13:6944:58 | newListOrderedSetWithElement(...) : ListOrderedSet [<element>] : String | Test.java:6945:42:6945:43 | in : ListOrderedSet [<element>] : String | provenance |  |
 | Test.java:6944:42:6944:57 | (...)... : String | Test.java:260:53:260:61 | element : String | provenance |  |
-| Test.java:6944:42:6944:57 | (...)... : String | Test.java:6944:13:6944:58 | newListOrderedSetWithElement(...) : ListOrderedSet [<element>] : String | provenance | MaD:2 |
+| Test.java:6944:42:6944:57 | (...)... : String | Test.java:6944:13:6944:58 | newListOrderedSetWithElement(...) : ListOrderedSet [<element>] : String | provenance | MaD:4 |
 | Test.java:6944:50:6944:57 | source(...) : Object | Test.java:6944:42:6944:57 | (...)... : String | provenance |  |
 | Test.java:6945:10:6945:44 | unmodifiableSet(...) : Set [<element>] : String | Test.java:6946:20:6946:22 | out : Set [<element>] : String | provenance |  |
-| Test.java:6945:42:6945:43 | in : ListOrderedSet [<element>] : String | Test.java:6945:10:6945:44 | unmodifiableSet(...) : Set [<element>] : String | provenance | MaD:807 |
+| Test.java:6945:42:6945:43 | in : ListOrderedSet [<element>] : String | Test.java:6945:10:6945:44 | unmodifiableSet(...) : Set [<element>] : String | provenance | MaD:452 |
 | Test.java:6946:20:6946:22 | out : Set [<element>] : String | Test.java:230:19:230:32 | it : Set [<element>] : String | provenance |  |
-| Test.java:6946:20:6946:22 | out : Set [<element>] : String | Test.java:6946:9:6946:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:6946:20:6946:22 | out : Set [<element>] : String | Test.java:6946:9:6946:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:6951:19:6951:57 | newTreeSetWithElement(...) : TreeSet [<element>] : String | Test.java:6952:54:6952:55 | in : TreeSet [<element>] : String | provenance |  |
 | Test.java:6951:41:6951:56 | (...)... : String | Test.java:268:39:268:47 | element : String | provenance |  |
-| Test.java:6951:41:6951:56 | (...)... : String | Test.java:6951:19:6951:57 | newTreeSetWithElement(...) : TreeSet [<element>] : String | provenance | MaD:2 |
+| Test.java:6951:41:6951:56 | (...)... : String | Test.java:6951:19:6951:57 | newTreeSetWithElement(...) : TreeSet [<element>] : String | provenance | MaD:4 |
 | Test.java:6951:49:6951:56 | source(...) : Object | Test.java:6951:41:6951:56 | (...)... : String | provenance |  |
 | Test.java:6952:10:6952:56 | unmodifiableSortedSet(...) : SortedSet [<element>] : String | Test.java:6953:20:6953:22 | out : SortedSet [<element>] : String | provenance |  |
-| Test.java:6952:54:6952:55 | in : TreeSet [<element>] : String | Test.java:6952:10:6952:56 | unmodifiableSortedSet(...) : SortedSet [<element>] : String | provenance | MaD:808 |
+| Test.java:6952:54:6952:55 | in : TreeSet [<element>] : String | Test.java:6952:10:6952:56 | unmodifiableSortedSet(...) : SortedSet [<element>] : String | provenance | MaD:453 |
 | Test.java:6953:20:6953:22 | out : SortedSet [<element>] : String | Test.java:230:19:230:32 | it : SortedSet [<element>] : String | provenance |  |
-| Test.java:6953:20:6953:22 | out : SortedSet [<element>] : String | Test.java:6953:9:6953:23 | getElement(...) | provenance | MaD:1 |
+| Test.java:6953:20:6953:22 | out : SortedSet [<element>] : String | Test.java:6953:9:6953:23 | getElement(...) | provenance | MaD:3 |
 | Test.java:6958:13:6958:42 | of(...) : Map [<map.key>] : String | Test.java:6959:46:6959:47 | in : Map [<map.key>] : String | provenance |  |
-| Test.java:6958:20:6958:35 | (...)... : String | Test.java:6958:13:6958:42 | of(...) : Map [<map.key>] : String | provenance | MaD:11 |
+| Test.java:6958:20:6958:35 | (...)... : String | Test.java:6958:13:6958:42 | of(...) : Map [<map.key>] : String | provenance | MaD:13 |
 | Test.java:6958:28:6958:35 | source(...) : Object | Test.java:6958:20:6958:35 | (...)... : String | provenance |  |
 | Test.java:6959:10:6959:48 | new AbstractIterableGetMapDecorator<>(...) : AbstractIterableGetMapDecorator [<map.key>] : String | Test.java:6960:26:6960:28 | out : AbstractIterableGetMapDecorator [<map.key>] : String | provenance |  |
-| Test.java:6959:46:6959:47 | in : Map [<map.key>] : String | Test.java:6959:10:6959:48 | new AbstractIterableGetMapDecorator<>(...) : AbstractIterableGetMapDecorator [<map.key>] : String | provenance | MaD:809 |
+| Test.java:6959:46:6959:47 | in : Map [<map.key>] : String | Test.java:6959:10:6959:48 | new AbstractIterableGetMapDecorator<>(...) : AbstractIterableGetMapDecorator [<map.key>] : String | provenance | MaD:454 |
 | Test.java:6960:26:6960:28 | out : AbstractIterableGetMapDecorator [<map.key>] : String | Test.java:241:25:241:42 | container : AbstractIterableGetMapDecorator [<map.key>] : String | provenance |  |
-| Test.java:6960:26:6960:28 | out : AbstractIterableGetMapDecorator [<map.key>] : String | Test.java:6960:9:6960:29 | getMapKeyFromGet(...) | provenance | MaD:484 |
+| Test.java:6960:26:6960:28 | out : AbstractIterableGetMapDecorator [<map.key>] : String | Test.java:6960:9:6960:29 | getMapKeyFromGet(...) | provenance | MaD:559 |
 | Test.java:6965:13:6965:42 | of(...) : Map [<map.value>] : String | Test.java:6966:46:6966:47 | in : Map [<map.value>] : String | provenance |  |
-| Test.java:6965:26:6965:41 | (...)... : String | Test.java:6965:13:6965:42 | of(...) : Map [<map.value>] : String | provenance | MaD:12 |
+| Test.java:6965:26:6965:41 | (...)... : String | Test.java:6965:13:6965:42 | of(...) : Map [<map.value>] : String | provenance | MaD:14 |
 | Test.java:6965:34:6965:41 | source(...) : Object | Test.java:6965:26:6965:41 | (...)... : String | provenance |  |
 | Test.java:6966:10:6966:48 | new AbstractIterableGetMapDecorator<>(...) : AbstractIterableGetMapDecorator [<map.value>] : String | Test.java:6967:28:6967:30 | out : AbstractIterableGetMapDecorator [<map.value>] : String | provenance |  |
-| Test.java:6966:46:6966:47 | in : Map [<map.value>] : String | Test.java:6966:10:6966:48 | new AbstractIterableGetMapDecorator<>(...) : AbstractIterableGetMapDecorator [<map.value>] : String | provenance | MaD:810 |
+| Test.java:6966:46:6966:47 | in : Map [<map.value>] : String | Test.java:6966:10:6966:48 | new AbstractIterableGetMapDecorator<>(...) : AbstractIterableGetMapDecorator [<map.value>] : String | provenance | MaD:455 |
 | Test.java:6967:28:6967:30 | out : AbstractIterableGetMapDecorator [<map.value>] : String | Test.java:248:27:248:44 | container : AbstractIterableGetMapDecorator [<map.value>] : String | provenance |  |
-| Test.java:6967:28:6967:30 | out : AbstractIterableGetMapDecorator [<map.value>] : String | Test.java:6967:9:6967:31 | getMapValueFromGet(...) | provenance | MaD:483 |
+| Test.java:6967:28:6967:30 | out : AbstractIterableGetMapDecorator [<map.value>] : String | Test.java:6967:9:6967:31 | getMapValueFromGet(...) | provenance | MaD:558 |
 | Test.java:6972:13:6972:42 | of(...) : Map [<map.key>] : String | Test.java:6973:46:6973:47 | in : Map [<map.key>] : String | provenance |  |
-| Test.java:6972:20:6972:35 | (...)... : String | Test.java:6972:13:6972:42 | of(...) : Map [<map.key>] : String | provenance | MaD:11 |
+| Test.java:6972:20:6972:35 | (...)... : String | Test.java:6972:13:6972:42 | of(...) : Map [<map.key>] : String | provenance | MaD:13 |
 | Test.java:6972:28:6972:35 | source(...) : Object | Test.java:6972:20:6972:35 | (...)... : String | provenance |  |
 | Test.java:6973:10:6973:60 | transformingMap(...) : TransformedSplitMap [<map.key>] : String | Test.java:6974:26:6974:28 | out : TransformedSplitMap [<map.key>] : String | provenance |  |
-| Test.java:6973:46:6973:47 | in : Map [<map.key>] : String | Test.java:6973:10:6973:60 | transformingMap(...) : TransformedSplitMap [<map.key>] : String | provenance | MaD:811 |
+| Test.java:6973:46:6973:47 | in : Map [<map.key>] : String | Test.java:6973:10:6973:60 | transformingMap(...) : TransformedSplitMap [<map.key>] : String | provenance | MaD:456 |
 | Test.java:6974:26:6974:28 | out : TransformedSplitMap [<map.key>] : String | Test.java:241:25:241:42 | container : TransformedSplitMap [<map.key>] : String | provenance |  |
-| Test.java:6974:26:6974:28 | out : TransformedSplitMap [<map.key>] : String | Test.java:6974:9:6974:29 | getMapKeyFromGet(...) | provenance | MaD:484 |
+| Test.java:6974:26:6974:28 | out : TransformedSplitMap [<map.key>] : String | Test.java:6974:9:6974:29 | getMapKeyFromGet(...) | provenance | MaD:559 |
 | Test.java:6979:13:6979:42 | of(...) : Map [<map.value>] : String | Test.java:6980:46:6980:47 | in : Map [<map.value>] : String | provenance |  |
-| Test.java:6979:26:6979:41 | (...)... : String | Test.java:6979:13:6979:42 | of(...) : Map [<map.value>] : String | provenance | MaD:12 |
+| Test.java:6979:26:6979:41 | (...)... : String | Test.java:6979:13:6979:42 | of(...) : Map [<map.value>] : String | provenance | MaD:14 |
 | Test.java:6979:34:6979:41 | source(...) : Object | Test.java:6979:26:6979:41 | (...)... : String | provenance |  |
 | Test.java:6980:10:6980:60 | transformingMap(...) : TransformedSplitMap [<map.value>] : String | Test.java:6981:28:6981:30 | out : TransformedSplitMap [<map.value>] : String | provenance |  |
-| Test.java:6980:46:6980:47 | in : Map [<map.value>] : String | Test.java:6980:10:6980:60 | transformingMap(...) : TransformedSplitMap [<map.value>] : String | provenance | MaD:812 |
+| Test.java:6980:46:6980:47 | in : Map [<map.value>] : String | Test.java:6980:10:6980:60 | transformingMap(...) : TransformedSplitMap [<map.value>] : String | provenance | MaD:457 |
 | Test.java:6981:28:6981:30 | out : TransformedSplitMap [<map.value>] : String | Test.java:248:27:248:44 | container : TransformedSplitMap [<map.value>] : String | provenance |  |
-| Test.java:6981:28:6981:30 | out : TransformedSplitMap [<map.value>] : String | Test.java:6981:9:6981:31 | getMapValueFromGet(...) | provenance | MaD:483 |
+| Test.java:6981:28:6981:30 | out : TransformedSplitMap [<map.value>] : String | Test.java:6981:9:6981:31 | getMapValueFromGet(...) | provenance | MaD:558 |
 | Test.java:6986:13:6986:42 | of(...) : Map [<map.key>] : String | Test.java:6987:27:6987:28 | in : Map [<map.key>] : String | provenance |  |
-| Test.java:6986:20:6986:35 | (...)... : String | Test.java:6986:13:6986:42 | of(...) : Map [<map.key>] : String | provenance | MaD:11 |
+| Test.java:6986:20:6986:35 | (...)... : String | Test.java:6986:13:6986:42 | of(...) : Map [<map.key>] : String | provenance | MaD:13 |
 | Test.java:6986:28:6986:35 | source(...) : Object | Test.java:6986:20:6986:35 | (...)... : String | provenance |  |
 | Test.java:6987:10:6987:29 | new PatriciaTrie<>(...) : PatriciaTrie [<map.key>] : String | Test.java:6988:19:6988:21 | out : PatriciaTrie [<map.key>] : String | provenance |  |
-| Test.java:6987:27:6987:28 | in : Map [<map.key>] : String | Test.java:6987:10:6987:29 | new PatriciaTrie<>(...) : PatriciaTrie [<map.key>] : String | provenance | MaD:817 |
+| Test.java:6987:27:6987:28 | in : Map [<map.key>] : String | Test.java:6987:10:6987:29 | new PatriciaTrie<>(...) : PatriciaTrie [<map.key>] : String | provenance | MaD:462 |
 | Test.java:6988:19:6988:21 | out : PatriciaTrie [<map.key>] : String | Test.java:228:18:228:29 | map : PatriciaTrie [<map.key>] : String | provenance |  |
-| Test.java:6988:19:6988:21 | out : PatriciaTrie [<map.key>] : String | Test.java:6988:9:6988:22 | getMapKey(...) | provenance | MaD:10 |
+| Test.java:6988:19:6988:21 | out : PatriciaTrie [<map.key>] : String | Test.java:6988:9:6988:22 | getMapKey(...) | provenance | MaD:18 |
 | Test.java:6993:13:6993:42 | of(...) : Map [<map.value>] : String | Test.java:6994:27:6994:28 | in : Map [<map.value>] : String | provenance |  |
-| Test.java:6993:26:6993:41 | (...)... : String | Test.java:6993:13:6993:42 | of(...) : Map [<map.value>] : String | provenance | MaD:12 |
+| Test.java:6993:26:6993:41 | (...)... : String | Test.java:6993:13:6993:42 | of(...) : Map [<map.value>] : String | provenance | MaD:14 |
 | Test.java:6993:34:6993:41 | source(...) : Object | Test.java:6993:26:6993:41 | (...)... : String | provenance |  |
 | Test.java:6994:10:6994:29 | new PatriciaTrie<>(...) : PatriciaTrie [<map.value>] : String | Test.java:6995:21:6995:23 | out : PatriciaTrie [<map.value>] : String | provenance |  |
-| Test.java:6994:27:6994:28 | in : Map [<map.value>] : String | Test.java:6994:10:6994:29 | new PatriciaTrie<>(...) : PatriciaTrie [<map.value>] : String | provenance | MaD:818 |
+| Test.java:6994:27:6994:28 | in : Map [<map.value>] : String | Test.java:6994:10:6994:29 | new PatriciaTrie<>(...) : PatriciaTrie [<map.value>] : String | provenance | MaD:463 |
 | Test.java:6995:21:6995:23 | out : PatriciaTrie [<map.value>] : String | Test.java:232:20:232:31 | map : PatriciaTrie [<map.value>] : String | provenance |  |
-| Test.java:6995:21:6995:23 | out : PatriciaTrie [<map.value>] : String | Test.java:6995:9:6995:24 | getMapValue(...) | provenance | MaD:9 |
+| Test.java:6995:21:6995:23 | out : PatriciaTrie [<map.value>] : String | Test.java:6995:9:6995:24 | getMapValue(...) | provenance | MaD:17 |
 | Test.java:6999:30:6999:72 | newPatriciaTrieWithMapKey(...) : PatriciaTrie [<map.key>] : String | Test.java:7001:10:7001:11 | in : PatriciaTrie [<map.key>] : String | provenance |  |
 | Test.java:6999:56:6999:71 | (...)... : String | Test.java:288:49:288:58 | key : String | provenance |  |
-| Test.java:6999:56:6999:71 | (...)... : String | Test.java:6999:30:6999:72 | newPatriciaTrieWithMapKey(...) : PatriciaTrie [<map.key>] : String | provenance | MaD:14 |
-| Test.java:6999:56:6999:71 | (...)... : String | Test.java:6999:30:6999:72 | newPatriciaTrieWithMapKey(...) : PatriciaTrie [<map.key>] : String | provenance | MaD:705 |
+| Test.java:6999:56:6999:71 | (...)... : String | Test.java:6999:30:6999:72 | newPatriciaTrieWithMapKey(...) : PatriciaTrie [<map.key>] : String | provenance | MaD:19 |
+| Test.java:6999:56:6999:71 | (...)... : String | Test.java:6999:30:6999:72 | newPatriciaTrieWithMapKey(...) : PatriciaTrie [<map.key>] : String | provenance | MaD:779 |
 | Test.java:6999:64:6999:71 | source(...) : Object | Test.java:6999:56:6999:71 | (...)... : String | provenance |  |
-| Test.java:7001:10:7001:11 | in : PatriciaTrie [<map.key>] : String | Test.java:7001:10:7001:24 | select(...) : Entry [<map.key>] : String | provenance | MaD:813 |
+| Test.java:7001:10:7001:11 | in : PatriciaTrie [<map.key>] : String | Test.java:7001:10:7001:24 | select(...) : Entry [<map.key>] : String | provenance | MaD:458 |
 | Test.java:7001:10:7001:24 | select(...) : Entry [<map.key>] : String | Test.java:7002:28:7002:30 | out : Entry [<map.key>] : String | provenance |  |
 | Test.java:7002:28:7002:30 | out : Entry [<map.key>] : String | Test.java:238:27:238:50 | container : Entry [<map.key>] : String | provenance |  |
-| Test.java:7002:28:7002:30 | out : Entry [<map.key>] : String | Test.java:7002:9:7002:31 | getMapKeyFromEntry(...) | provenance | MaD:20 |
+| Test.java:7002:28:7002:30 | out : Entry [<map.key>] : String | Test.java:7002:9:7002:31 | getMapKeyFromEntry(...) | provenance | MaD:9 |
 | Test.java:7006:30:7006:74 | newPatriciaTrieWithMapValue(...) : PatriciaTrie [<map.value>] : String | Test.java:7008:10:7008:11 | in : PatriciaTrie [<map.value>] : String | provenance |  |
 | Test.java:7006:58:7006:73 | (...)... : String | Test.java:307:50:307:56 | value : String | provenance |  |
-| Test.java:7006:58:7006:73 | (...)... : String | Test.java:7006:30:7006:74 | newPatriciaTrieWithMapValue(...) : PatriciaTrie [<map.value>] : String | provenance | MaD:15 |
-| Test.java:7006:58:7006:73 | (...)... : String | Test.java:7006:30:7006:74 | newPatriciaTrieWithMapValue(...) : PatriciaTrie [<map.value>] : String | provenance | MaD:706 |
+| Test.java:7006:58:7006:73 | (...)... : String | Test.java:7006:30:7006:74 | newPatriciaTrieWithMapValue(...) : PatriciaTrie [<map.value>] : String | provenance | MaD:20 |
+| Test.java:7006:58:7006:73 | (...)... : String | Test.java:7006:30:7006:74 | newPatriciaTrieWithMapValue(...) : PatriciaTrie [<map.value>] : String | provenance | MaD:780 |
 | Test.java:7006:66:7006:73 | source(...) : Object | Test.java:7006:58:7006:73 | (...)... : String | provenance |  |
-| Test.java:7008:10:7008:11 | in : PatriciaTrie [<map.value>] : String | Test.java:7008:10:7008:24 | select(...) : Entry [<map.value>] : String | provenance | MaD:814 |
+| Test.java:7008:10:7008:11 | in : PatriciaTrie [<map.value>] : String | Test.java:7008:10:7008:24 | select(...) : Entry [<map.value>] : String | provenance | MaD:459 |
 | Test.java:7008:10:7008:24 | select(...) : Entry [<map.value>] : String | Test.java:7009:30:7009:32 | out : Entry [<map.value>] : String | provenance |  |
 | Test.java:7009:30:7009:32 | out : Entry [<map.value>] : String | Test.java:244:29:244:52 | container : Entry [<map.value>] : String | provenance |  |
-| Test.java:7009:30:7009:32 | out : Entry [<map.value>] : String | Test.java:7009:9:7009:33 | getMapValueFromEntry(...) | provenance | MaD:21 |
+| Test.java:7009:30:7009:32 | out : Entry [<map.value>] : String | Test.java:7009:9:7009:33 | getMapValueFromEntry(...) | provenance | MaD:10 |
 | Test.java:7013:30:7013:72 | newPatriciaTrieWithMapKey(...) : PatriciaTrie [<map.key>] : String | Test.java:7015:10:7015:11 | in : PatriciaTrie [<map.key>] : String | provenance |  |
 | Test.java:7013:56:7013:71 | (...)... : String | Test.java:288:49:288:58 | key : String | provenance |  |
-| Test.java:7013:56:7013:71 | (...)... : String | Test.java:7013:30:7013:72 | newPatriciaTrieWithMapKey(...) : PatriciaTrie [<map.key>] : String | provenance | MaD:14 |
-| Test.java:7013:56:7013:71 | (...)... : String | Test.java:7013:30:7013:72 | newPatriciaTrieWithMapKey(...) : PatriciaTrie [<map.key>] : String | provenance | MaD:705 |
+| Test.java:7013:56:7013:71 | (...)... : String | Test.java:7013:30:7013:72 | newPatriciaTrieWithMapKey(...) : PatriciaTrie [<map.key>] : String | provenance | MaD:19 |
+| Test.java:7013:56:7013:71 | (...)... : String | Test.java:7013:30:7013:72 | newPatriciaTrieWithMapKey(...) : PatriciaTrie [<map.key>] : String | provenance | MaD:779 |
 | Test.java:7013:64:7013:71 | source(...) : Object | Test.java:7013:56:7013:71 | (...)... : String | provenance |  |
-| Test.java:7015:10:7015:11 | in : PatriciaTrie [<map.key>] : String | Test.java:7015:10:7015:27 | selectKey(...) : String | provenance | MaD:815 |
+| Test.java:7015:10:7015:11 | in : PatriciaTrie [<map.key>] : String | Test.java:7015:10:7015:27 | selectKey(...) : String | provenance | MaD:460 |
 | Test.java:7015:10:7015:27 | selectKey(...) : String | Test.java:7016:9:7016:11 | out | provenance |  |
 | Test.java:7020:30:7020:74 | newPatriciaTrieWithMapValue(...) : PatriciaTrie [<map.value>] : String | Test.java:7022:10:7022:11 | in : PatriciaTrie [<map.value>] : String | provenance |  |
 | Test.java:7020:58:7020:73 | (...)... : String | Test.java:307:50:307:56 | value : String | provenance |  |
-| Test.java:7020:58:7020:73 | (...)... : String | Test.java:7020:30:7020:74 | newPatriciaTrieWithMapValue(...) : PatriciaTrie [<map.value>] : String | provenance | MaD:15 |
-| Test.java:7020:58:7020:73 | (...)... : String | Test.java:7020:30:7020:74 | newPatriciaTrieWithMapValue(...) : PatriciaTrie [<map.value>] : String | provenance | MaD:706 |
+| Test.java:7020:58:7020:73 | (...)... : String | Test.java:7020:30:7020:74 | newPatriciaTrieWithMapValue(...) : PatriciaTrie [<map.value>] : String | provenance | MaD:20 |
+| Test.java:7020:58:7020:73 | (...)... : String | Test.java:7020:30:7020:74 | newPatriciaTrieWithMapValue(...) : PatriciaTrie [<map.value>] : String | provenance | MaD:780 |
 | Test.java:7020:66:7020:73 | source(...) : Object | Test.java:7020:58:7020:73 | (...)... : String | provenance |  |
-| Test.java:7022:10:7022:11 | in : PatriciaTrie [<map.value>] : String | Test.java:7022:10:7022:29 | selectValue(...) : String | provenance | MaD:816 |
+| Test.java:7022:10:7022:11 | in : PatriciaTrie [<map.value>] : String | Test.java:7022:10:7022:29 | selectValue(...) : String | provenance | MaD:461 |
 | Test.java:7022:10:7022:29 | selectValue(...) : String | Test.java:7023:9:7023:11 | out | provenance |  |
 | Test.java:7028:14:7028:56 | newPatriciaTrieWithMapKey(...) : PatriciaTrie [<map.key>] : String | Test.java:7029:44:7029:45 | in : PatriciaTrie [<map.key>] : String | provenance |  |
 | Test.java:7028:40:7028:55 | (...)... : String | Test.java:288:49:288:58 | key : String | provenance |  |
-| Test.java:7028:40:7028:55 | (...)... : String | Test.java:7028:14:7028:56 | newPatriciaTrieWithMapKey(...) : PatriciaTrie [<map.key>] : String | provenance | MaD:14 |
-| Test.java:7028:40:7028:55 | (...)... : String | Test.java:7028:14:7028:56 | newPatriciaTrieWithMapKey(...) : PatriciaTrie [<map.key>] : String | provenance | MaD:705 |
+| Test.java:7028:40:7028:55 | (...)... : String | Test.java:7028:14:7028:56 | newPatriciaTrieWithMapKey(...) : PatriciaTrie [<map.key>] : String | provenance | MaD:19 |
+| Test.java:7028:40:7028:55 | (...)... : String | Test.java:7028:14:7028:56 | newPatriciaTrieWithMapKey(...) : PatriciaTrie [<map.key>] : String | provenance | MaD:779 |
 | Test.java:7028:48:7028:55 | source(...) : Object | Test.java:7028:40:7028:55 | (...)... : String | provenance |  |
 | Test.java:7029:10:7029:46 | unmodifiableTrie(...) : Trie [<map.key>] : String | Test.java:7030:19:7030:21 | out : Trie [<map.key>] : String | provenance |  |
-| Test.java:7029:44:7029:45 | in : PatriciaTrie [<map.key>] : String | Test.java:7029:10:7029:46 | unmodifiableTrie(...) : Trie [<map.key>] : String | provenance | MaD:819 |
+| Test.java:7029:44:7029:45 | in : PatriciaTrie [<map.key>] : String | Test.java:7029:10:7029:46 | unmodifiableTrie(...) : Trie [<map.key>] : String | provenance | MaD:464 |
 | Test.java:7030:19:7030:21 | out : Trie [<map.key>] : String | Test.java:228:18:228:29 | map : Trie [<map.key>] : String | provenance |  |
-| Test.java:7030:19:7030:21 | out : Trie [<map.key>] : String | Test.java:7030:9:7030:22 | getMapKey(...) | provenance | MaD:10 |
+| Test.java:7030:19:7030:21 | out : Trie [<map.key>] : String | Test.java:7030:9:7030:22 | getMapKey(...) | provenance | MaD:18 |
 | Test.java:7035:14:7035:58 | newPatriciaTrieWithMapValue(...) : PatriciaTrie [<map.value>] : String | Test.java:7036:44:7036:45 | in : PatriciaTrie [<map.value>] : String | provenance |  |
 | Test.java:7035:42:7035:57 | (...)... : String | Test.java:307:50:307:56 | value : String | provenance |  |
-| Test.java:7035:42:7035:57 | (...)... : String | Test.java:7035:14:7035:58 | newPatriciaTrieWithMapValue(...) : PatriciaTrie [<map.value>] : String | provenance | MaD:15 |
-| Test.java:7035:42:7035:57 | (...)... : String | Test.java:7035:14:7035:58 | newPatriciaTrieWithMapValue(...) : PatriciaTrie [<map.value>] : String | provenance | MaD:706 |
+| Test.java:7035:42:7035:57 | (...)... : String | Test.java:7035:14:7035:58 | newPatriciaTrieWithMapValue(...) : PatriciaTrie [<map.value>] : String | provenance | MaD:20 |
+| Test.java:7035:42:7035:57 | (...)... : String | Test.java:7035:14:7035:58 | newPatriciaTrieWithMapValue(...) : PatriciaTrie [<map.value>] : String | provenance | MaD:780 |
 | Test.java:7035:50:7035:57 | source(...) : Object | Test.java:7035:42:7035:57 | (...)... : String | provenance |  |
 | Test.java:7036:10:7036:46 | unmodifiableTrie(...) : Trie [<map.value>] : String | Test.java:7037:21:7037:23 | out : Trie [<map.value>] : String | provenance |  |
-| Test.java:7036:44:7036:45 | in : PatriciaTrie [<map.value>] : String | Test.java:7036:10:7036:46 | unmodifiableTrie(...) : Trie [<map.value>] : String | provenance | MaD:820 |
+| Test.java:7036:44:7036:45 | in : PatriciaTrie [<map.value>] : String | Test.java:7036:10:7036:46 | unmodifiableTrie(...) : Trie [<map.value>] : String | provenance | MaD:465 |
 | Test.java:7037:21:7037:23 | out : Trie [<map.value>] : String | Test.java:232:20:232:31 | map : Trie [<map.value>] : String | provenance |  |
-| Test.java:7037:21:7037:23 | out : Trie [<map.value>] : String | Test.java:7037:9:7037:24 | getMapValue(...) | provenance | MaD:9 |
+| Test.java:7037:21:7037:23 | out : Trie [<map.value>] : String | Test.java:7037:9:7037:24 | getMapValue(...) | provenance | MaD:17 |
 | Test.java:7043:22:7043:26 | key : Object | Test.java:7044:10:7044:12 | key : Object | provenance |  |
 | Test.java:7043:22:7043:26 | key : String | Test.java:7044:10:7044:12 | key : String | provenance |  |
 | Test.java:7043:29:7043:35 | value : Object | Test.java:7044:15:7044:19 | value : Object | provenance |  |
@@ -9391,20 +9391,20 @@ edges
 | Test.java:7044:4:7044:21 | this <constr(this)> [post update] : MyAbstractKeyValue [<map.key>] : String | Test.java:7043:3:7043:20 | parameter this [Return] : MyAbstractKeyValue [<map.key>] : String | provenance |  |
 | Test.java:7044:4:7044:21 | this <constr(this)> [post update] : MyAbstractKeyValue [<map.value>] : Object | Test.java:7043:3:7043:20 | parameter this [Return] : MyAbstractKeyValue [<map.value>] : Object | provenance |  |
 | Test.java:7044:4:7044:21 | this <constr(this)> [post update] : MyAbstractKeyValue [<map.value>] : String | Test.java:7043:3:7043:20 | parameter this [Return] : MyAbstractKeyValue [<map.value>] : String | provenance |  |
-| Test.java:7044:10:7044:12 | key : Object | Test.java:7044:4:7044:21 | this <constr(this)> [post update] : MyAbstractKeyValue [<map.key>] : Object | provenance | MaD:189 |
-| Test.java:7044:10:7044:12 | key : String | Test.java:7044:4:7044:21 | this <constr(this)> [post update] : MyAbstractKeyValue [<map.key>] : String | provenance | MaD:189 |
-| Test.java:7044:15:7044:19 | value : Object | Test.java:7044:4:7044:21 | this <constr(this)> [post update] : MyAbstractKeyValue [<map.value>] : Object | provenance | MaD:190 |
-| Test.java:7044:15:7044:19 | value : String | Test.java:7044:4:7044:21 | this <constr(this)> [post update] : MyAbstractKeyValue [<map.value>] : String | provenance | MaD:190 |
+| Test.java:7044:10:7044:12 | key : Object | Test.java:7044:4:7044:21 | this <constr(this)> [post update] : MyAbstractKeyValue [<map.key>] : Object | provenance | MaD:191 |
+| Test.java:7044:10:7044:12 | key : String | Test.java:7044:4:7044:21 | this <constr(this)> [post update] : MyAbstractKeyValue [<map.key>] : String | provenance | MaD:191 |
+| Test.java:7044:15:7044:19 | value : Object | Test.java:7044:4:7044:21 | this <constr(this)> [post update] : MyAbstractKeyValue [<map.value>] : Object | provenance | MaD:192 |
+| Test.java:7044:15:7044:19 | value : String | Test.java:7044:4:7044:21 | this <constr(this)> [post update] : MyAbstractKeyValue [<map.value>] : String | provenance | MaD:192 |
 | Test.java:7047:5:7047:12 | parameter this : MyAbstractKeyValue [<map.key>] : String | Test.java:7048:11:7048:15 | super : MyAbstractKeyValue [<map.key>] : String | provenance |  |
 | Test.java:7047:14:7047:24 | key : Object | Test.java:7048:24:7048:26 | key : Object | provenance |  |
-| Test.java:7048:11:7048:15 | super : MyAbstractKeyValue [<map.key>] : String | Test.java:7048:11:7048:27 | setKey(...) : String | provenance | MaD:191 |
+| Test.java:7048:11:7048:15 | super : MyAbstractKeyValue [<map.key>] : String | Test.java:7048:11:7048:27 | setKey(...) : String | provenance | MaD:194 |
 | Test.java:7048:11:7048:15 | super [post update] : MyAbstractKeyValue [<map.key>] : Object | Test.java:7047:5:7047:12 | parameter this [Return] : MyAbstractKeyValue [<map.key>] : Object | provenance |  |
-| Test.java:7048:24:7048:26 | key : Object | Test.java:7048:11:7048:15 | super [post update] : MyAbstractKeyValue [<map.key>] : Object | provenance | MaD:192 |
+| Test.java:7048:24:7048:26 | key : Object | Test.java:7048:11:7048:15 | super [post update] : MyAbstractKeyValue [<map.key>] : Object | provenance | MaD:193 |
 | Test.java:7051:5:7051:14 | parameter this : MyAbstractKeyValue [<map.value>] : String | Test.java:7052:11:7052:15 | super : MyAbstractKeyValue [<map.value>] : String | provenance |  |
 | Test.java:7051:16:7051:28 | value : Object | Test.java:7052:26:7052:30 | value : Object | provenance |  |
-| Test.java:7052:11:7052:15 | super : MyAbstractKeyValue [<map.value>] : String | Test.java:7052:11:7052:31 | setValue(...) : String | provenance | MaD:193 |
+| Test.java:7052:11:7052:15 | super : MyAbstractKeyValue [<map.value>] : String | Test.java:7052:11:7052:31 | setValue(...) : String | provenance | MaD:196 |
 | Test.java:7052:11:7052:15 | super [post update] : MyAbstractKeyValue [<map.value>] : Object | Test.java:7051:5:7051:14 | parameter this [Return] : MyAbstractKeyValue [<map.value>] : Object | provenance |  |
-| Test.java:7052:26:7052:30 | value : Object | Test.java:7052:11:7052:15 | super [post update] : MyAbstractKeyValue [<map.value>] : Object | provenance | MaD:194 |
+| Test.java:7052:26:7052:30 | value : Object | Test.java:7052:11:7052:15 | super [post update] : MyAbstractKeyValue [<map.value>] : Object | provenance | MaD:195 |
 | Test.java:7057:22:7057:32 | key : Object | Test.java:7058:10:7058:12 | key : Object | provenance |  |
 | Test.java:7057:22:7057:32 | key : String | Test.java:7058:10:7058:12 | key : String | provenance |  |
 | Test.java:7057:35:7057:47 | value : Object | Test.java:7058:15:7058:19 | value : Object | provenance |  |
@@ -9413,57 +9413,57 @@ edges
 | Test.java:7058:4:7058:21 | this <constr(this)> [post update] : MyAbstractMapEntry [<map.key>] : String | Test.java:7057:3:7057:20 | parameter this [Return] : MyAbstractMapEntry [<map.key>] : String | provenance |  |
 | Test.java:7058:4:7058:21 | this <constr(this)> [post update] : MyAbstractMapEntry [<map.value>] : Object | Test.java:7057:3:7057:20 | parameter this [Return] : MyAbstractMapEntry [<map.value>] : Object | provenance |  |
 | Test.java:7058:4:7058:21 | this <constr(this)> [post update] : MyAbstractMapEntry [<map.value>] : String | Test.java:7057:3:7057:20 | parameter this [Return] : MyAbstractMapEntry [<map.value>] : String | provenance |  |
-| Test.java:7058:10:7058:12 | key : Object | Test.java:7058:4:7058:21 | this <constr(this)> [post update] : MyAbstractMapEntry [<map.key>] : Object | provenance | MaD:195 |
-| Test.java:7058:10:7058:12 | key : String | Test.java:7058:4:7058:21 | this <constr(this)> [post update] : MyAbstractMapEntry [<map.key>] : String | provenance | MaD:195 |
-| Test.java:7058:15:7058:19 | value : Object | Test.java:7058:4:7058:21 | this <constr(this)> [post update] : MyAbstractMapEntry [<map.value>] : Object | provenance | MaD:196 |
-| Test.java:7058:15:7058:19 | value : String | Test.java:7058:4:7058:21 | this <constr(this)> [post update] : MyAbstractMapEntry [<map.value>] : String | provenance | MaD:196 |
+| Test.java:7058:10:7058:12 | key : Object | Test.java:7058:4:7058:21 | this <constr(this)> [post update] : MyAbstractMapEntry [<map.key>] : Object | provenance | MaD:197 |
+| Test.java:7058:10:7058:12 | key : String | Test.java:7058:4:7058:21 | this <constr(this)> [post update] : MyAbstractMapEntry [<map.key>] : String | provenance | MaD:197 |
+| Test.java:7058:15:7058:19 | value : Object | Test.java:7058:4:7058:21 | this <constr(this)> [post update] : MyAbstractMapEntry [<map.value>] : Object | provenance | MaD:198 |
+| Test.java:7058:15:7058:19 | value : String | Test.java:7058:4:7058:21 | this <constr(this)> [post update] : MyAbstractMapEntry [<map.value>] : String | provenance | MaD:198 |
 | Test.java:7067:31:7067:57 | entry : MyAbstractMapEntry [<map.key>] : String | Test.java:7068:10:7068:14 | entry : MyAbstractMapEntry [<map.key>] : String | provenance |  |
 | Test.java:7067:31:7067:57 | entry : MyAbstractMapEntry [<map.value>] : String | Test.java:7068:10:7068:14 | entry : MyAbstractMapEntry [<map.value>] : String | provenance |  |
 | Test.java:7068:4:7068:16 | this <constr(this)> [post update] : MyAbstractMapEntryDecorator [<map.key>] : String | Test.java:7067:3:7067:29 | parameter this [Return] : MyAbstractMapEntryDecorator [<map.key>] : String | provenance |  |
 | Test.java:7068:4:7068:16 | this <constr(this)> [post update] : MyAbstractMapEntryDecorator [<map.value>] : String | Test.java:7067:3:7067:29 | parameter this [Return] : MyAbstractMapEntryDecorator [<map.value>] : String | provenance |  |
-| Test.java:7068:10:7068:14 | entry : MyAbstractMapEntry [<map.key>] : String | Test.java:7068:4:7068:16 | this <constr(this)> [post update] : MyAbstractMapEntryDecorator [<map.key>] : String | provenance | MaD:197 |
-| Test.java:7068:10:7068:14 | entry : MyAbstractMapEntry [<map.value>] : String | Test.java:7068:4:7068:16 | this <constr(this)> [post update] : MyAbstractMapEntryDecorator [<map.value>] : String | provenance | MaD:198 |
+| Test.java:7068:10:7068:14 | entry : MyAbstractMapEntry [<map.key>] : String | Test.java:7068:4:7068:16 | this <constr(this)> [post update] : MyAbstractMapEntryDecorator [<map.key>] : String | provenance | MaD:199 |
+| Test.java:7068:10:7068:14 | entry : MyAbstractMapEntry [<map.value>] : String | Test.java:7068:4:7068:16 | this <constr(this)> [post update] : MyAbstractMapEntryDecorator [<map.value>] : String | provenance | MaD:200 |
 | Test.java:7071:19:7071:31 | parameter this : MyAbstractMapEntryDecorator [<map.key>] : String | Test.java:7072:11:7072:15 | super : MyAbstractMapEntryDecorator [<map.key>] : String | provenance |  |
 | Test.java:7071:19:7071:31 | parameter this : MyAbstractMapEntryDecorator [<map.value>] : String | Test.java:7072:11:7072:15 | super : MyAbstractMapEntryDecorator [<map.value>] : String | provenance |  |
-| Test.java:7072:11:7072:15 | super : MyAbstractMapEntryDecorator [<map.key>] : String | Test.java:7072:11:7072:29 | getMapEntry(...) : Entry [<map.key>] : String | provenance | MaD:199 |
-| Test.java:7072:11:7072:15 | super : MyAbstractMapEntryDecorator [<map.value>] : String | Test.java:7072:11:7072:29 | getMapEntry(...) : Entry [<map.value>] : String | provenance | MaD:200 |
+| Test.java:7072:11:7072:15 | super : MyAbstractMapEntryDecorator [<map.key>] : String | Test.java:7072:11:7072:29 | getMapEntry(...) : Entry [<map.key>] : String | provenance | MaD:201 |
+| Test.java:7072:11:7072:15 | super : MyAbstractMapEntryDecorator [<map.value>] : String | Test.java:7072:11:7072:29 | getMapEntry(...) : Entry [<map.value>] : String | provenance | MaD:202 |
 | Test.java:7082:15:7082:30 | parameter this : MySetView [<element>] : String | Test.java:7082:43:7082:58 | this <.method> : MySetView [<element>] : String | provenance |  |
-| Test.java:7082:43:7082:58 | this <.method> : MySetView [<element>] : String | Test.java:7082:43:7082:58 | createIterator(...) : Iterator [<element>] : String | provenance | MaD:736 |
+| Test.java:7082:43:7082:58 | this <.method> : MySetView [<element>] : String | Test.java:7082:43:7082:58 | createIterator(...) : Iterator [<element>] : String | provenance | MaD:789 |
 | Test.java:7086:43:7086:71 | map : DualTreeBidiMap [<map.key>] : String | Test.java:7087:10:7087:12 | map : DualTreeBidiMap [<map.key>] : String | provenance |  |
 | Test.java:7086:43:7086:71 | map : DualTreeBidiMap [<map.value>] : String | Test.java:7087:10:7087:12 | map : DualTreeBidiMap [<map.value>] : String | provenance |  |
 | Test.java:7087:4:7087:14 | this <constr(this)> [post update] : MyAbstractSortedBidiMapDecorator [<map.key>] : String | Test.java:7086:10:7086:41 | parameter this [Return] : MyAbstractSortedBidiMapDecorator [<map.key>] : String | provenance |  |
 | Test.java:7087:4:7087:14 | this <constr(this)> [post update] : MyAbstractSortedBidiMapDecorator [<map.value>] : String | Test.java:7086:10:7086:41 | parameter this [Return] : MyAbstractSortedBidiMapDecorator [<map.value>] : String | provenance |  |
-| Test.java:7087:10:7087:12 | map : DualTreeBidiMap [<map.key>] : String | Test.java:7087:4:7087:14 | this <constr(this)> [post update] : MyAbstractSortedBidiMapDecorator [<map.key>] : String | provenance | MaD:52 |
-| Test.java:7087:10:7087:12 | map : DualTreeBidiMap [<map.value>] : String | Test.java:7087:4:7087:14 | this <constr(this)> [post update] : MyAbstractSortedBidiMapDecorator [<map.value>] : String | provenance | MaD:53 |
+| Test.java:7087:10:7087:12 | map : DualTreeBidiMap [<map.key>] : String | Test.java:7087:4:7087:14 | this <constr(this)> [post update] : MyAbstractSortedBidiMapDecorator [<map.key>] : String | provenance | MaD:54 |
+| Test.java:7087:10:7087:12 | map : DualTreeBidiMap [<map.value>] : String | Test.java:7087:4:7087:14 | this <constr(this)> [post update] : MyAbstractSortedBidiMapDecorator [<map.value>] : String | provenance | MaD:55 |
 | Test.java:7092:40:7092:65 | map : ListOrderedMap [<map.key>] : String | Test.java:7093:10:7093:12 | map : ListOrderedMap [<map.key>] : String | provenance |  |
 | Test.java:7092:40:7092:65 | map : ListOrderedMap [<map.value>] : String | Test.java:7093:10:7093:12 | map : ListOrderedMap [<map.value>] : String | provenance |  |
 | Test.java:7093:4:7093:14 | this <constr(this)> [post update] : MyAbstractOrderedMapDecorator [<map.key>] : String | Test.java:7092:10:7092:38 | parameter this [Return] : MyAbstractOrderedMapDecorator [<map.key>] : String | provenance |  |
 | Test.java:7093:4:7093:14 | this <constr(this)> [post update] : MyAbstractOrderedMapDecorator [<map.value>] : String | Test.java:7092:10:7092:38 | parameter this [Return] : MyAbstractOrderedMapDecorator [<map.value>] : String | provenance |  |
-| Test.java:7093:10:7093:12 | map : ListOrderedMap [<map.key>] : String | Test.java:7093:4:7093:14 | this <constr(this)> [post update] : MyAbstractOrderedMapDecorator [<map.key>] : String | provenance | MaD:271 |
-| Test.java:7093:10:7093:12 | map : ListOrderedMap [<map.value>] : String | Test.java:7093:4:7093:14 | this <constr(this)> [post update] : MyAbstractOrderedMapDecorator [<map.value>] : String | provenance | MaD:272 |
+| Test.java:7093:10:7093:12 | map : ListOrderedMap [<map.key>] : String | Test.java:7093:4:7093:14 | this <constr(this)> [post update] : MyAbstractOrderedMapDecorator [<map.key>] : String | provenance | MaD:273 |
+| Test.java:7093:10:7093:12 | map : ListOrderedMap [<map.value>] : String | Test.java:7093:4:7093:14 | this <constr(this)> [post update] : MyAbstractOrderedMapDecorator [<map.value>] : String | provenance | MaD:274 |
 | Test.java:7098:39:7098:63 | map : TreeMap [<map.key>] : String | Test.java:7099:10:7099:12 | map : TreeMap [<map.key>] : String | provenance |  |
 | Test.java:7098:39:7098:63 | map : TreeMap [<map.value>] : String | Test.java:7099:10:7099:12 | map : TreeMap [<map.value>] : String | provenance |  |
 | Test.java:7099:4:7099:14 | this <constr(this)> [post update] : MyAbstractSortedMapDecorator [<map.key>] : String | Test.java:7098:10:7098:37 | parameter this [Return] : MyAbstractSortedMapDecorator [<map.key>] : String | provenance |  |
 | Test.java:7099:4:7099:14 | this <constr(this)> [post update] : MyAbstractSortedMapDecorator [<map.value>] : String | Test.java:7098:10:7098:37 | parameter this [Return] : MyAbstractSortedMapDecorator [<map.value>] : String | provenance |  |
-| Test.java:7099:10:7099:12 | map : TreeMap [<map.key>] : String | Test.java:7099:4:7099:14 | this <constr(this)> [post update] : MyAbstractSortedMapDecorator [<map.key>] : String | provenance | MaD:273 |
-| Test.java:7099:10:7099:12 | map : TreeMap [<map.value>] : String | Test.java:7099:4:7099:14 | this <constr(this)> [post update] : MyAbstractSortedMapDecorator [<map.value>] : String | provenance | MaD:274 |
+| Test.java:7099:10:7099:12 | map : TreeMap [<map.key>] : String | Test.java:7099:4:7099:14 | this <constr(this)> [post update] : MyAbstractSortedMapDecorator [<map.key>] : String | provenance | MaD:275 |
+| Test.java:7099:10:7099:12 | map : TreeMap [<map.value>] : String | Test.java:7099:4:7099:14 | this <constr(this)> [post update] : MyAbstractSortedMapDecorator [<map.value>] : String | provenance | MaD:276 |
 | Test.java:7104:33:7104:48 | bag : TreeBag [<element>] : String | Test.java:7105:10:7105:12 | bag : TreeBag [<element>] : String | provenance |  |
 | Test.java:7105:4:7105:14 | this <constr(this)> [post update] : MyAbstractBagDecorator [<element>] : String | Test.java:7104:10:7104:31 | parameter this [Return] : MyAbstractBagDecorator [<element>] : String | provenance |  |
-| Test.java:7105:10:7105:12 | bag : TreeBag [<element>] : String | Test.java:7105:4:7105:14 | this <constr(this)> [post update] : MyAbstractBagDecorator [<element>] : String | provenance | MaD:24 |
+| Test.java:7105:10:7105:12 | bag : TreeBag [<element>] : String | Test.java:7105:4:7105:14 | this <constr(this)> [post update] : MyAbstractBagDecorator [<element>] : String | provenance | MaD:26 |
 | Test.java:7110:27:7110:58 | map : Map [<map.key>] : String | Test.java:7111:10:7111:12 | map : Map [<map.key>] : String | provenance |  |
 | Test.java:7111:4:7111:14 | this <constr(this)> [post update] : MyAbstractMapBag [<element>] : String | Test.java:7110:10:7110:25 | parameter this [Return] : MyAbstractMapBag [<element>] : String | provenance |  |
-| Test.java:7111:10:7111:12 | map : Map [<map.key>] : String | Test.java:7111:4:7111:14 | this <constr(this)> [post update] : MyAbstractMapBag [<element>] : String | provenance | MaD:25 |
+| Test.java:7111:10:7111:12 | map : Map [<map.key>] : String | Test.java:7111:4:7111:14 | this <constr(this)> [post update] : MyAbstractMapBag [<element>] : String | provenance | MaD:27 |
 | Test.java:7113:33:7113:40 | parameter this : MyAbstractMapBag [<element>] : String | Test.java:7114:11:7114:15 | super : MyAbstractMapBag [<element>] : String | provenance |  |
-| Test.java:7114:11:7114:15 | super : MyAbstractMapBag [<element>] : String | Test.java:7114:11:7114:24 | getMap(...) : Map [<map.key>] : String | provenance | MaD:26 |
+| Test.java:7114:11:7114:15 | super : MyAbstractMapBag [<element>] : String | Test.java:7114:11:7114:24 | getMap(...) : Map [<map.key>] : String | provenance | MaD:28 |
 | Test.java:7119:39:7119:60 | bag : TreeBag [<element>] : String | Test.java:7120:10:7120:12 | bag : TreeBag [<element>] : String | provenance |  |
 | Test.java:7120:4:7120:14 | this <constr(this)> [post update] : MyAbstractSortedBagDecorator [<element>] : String | Test.java:7119:10:7119:37 | parameter this [Return] : MyAbstractSortedBagDecorator [<element>] : String | provenance |  |
-| Test.java:7120:10:7120:12 | bag : TreeBag [<element>] : String | Test.java:7120:4:7120:14 | this <constr(this)> [post update] : MyAbstractSortedBagDecorator [<element>] : String | provenance | MaD:27 |
+| Test.java:7120:10:7120:12 | bag : TreeBag [<element>] : String | Test.java:7120:4:7120:14 | this <constr(this)> [post update] : MyAbstractSortedBagDecorator [<element>] : String | provenance | MaD:29 |
 | Test.java:7125:37:7125:59 | map : DualTreeBidiMap [<map.key>] : String | Test.java:7126:10:7126:12 | map : DualTreeBidiMap [<map.key>] : String | provenance |  |
 | Test.java:7125:37:7125:59 | map : DualTreeBidiMap [<map.value>] : String | Test.java:7126:10:7126:12 | map : DualTreeBidiMap [<map.value>] : String | provenance |  |
 | Test.java:7126:4:7126:14 | this <constr(this)> [post update] : MyAbstractBidiMapDecorator [<map.key>] : String | Test.java:7125:10:7125:35 | parameter this [Return] : MyAbstractBidiMapDecorator [<map.key>] : String | provenance |  |
 | Test.java:7126:4:7126:14 | this <constr(this)> [post update] : MyAbstractBidiMapDecorator [<map.value>] : String | Test.java:7125:10:7125:35 | parameter this [Return] : MyAbstractBidiMapDecorator [<map.value>] : String | provenance |  |
-| Test.java:7126:10:7126:12 | map : DualTreeBidiMap [<map.key>] : String | Test.java:7126:4:7126:14 | this <constr(this)> [post update] : MyAbstractBidiMapDecorator [<map.key>] : String | provenance | MaD:42 |
-| Test.java:7126:10:7126:12 | map : DualTreeBidiMap [<map.value>] : String | Test.java:7126:4:7126:14 | this <constr(this)> [post update] : MyAbstractBidiMapDecorator [<map.value>] : String | provenance | MaD:43 |
+| Test.java:7126:10:7126:12 | map : DualTreeBidiMap [<map.key>] : String | Test.java:7126:4:7126:14 | this <constr(this)> [post update] : MyAbstractBidiMapDecorator [<map.key>] : String | provenance | MaD:44 |
+| Test.java:7126:10:7126:12 | map : DualTreeBidiMap [<map.value>] : String | Test.java:7126:4:7126:14 | this <constr(this)> [post update] : MyAbstractBidiMapDecorator [<map.value>] : String | provenance | MaD:45 |
 | Test.java:7134:32:7134:56 | normalMap : DualTreeBidiMap [<map.key>] : String | Test.java:7135:10:7135:18 | normalMap : DualTreeBidiMap [<map.key>] : String | provenance |  |
 | Test.java:7134:32:7134:56 | normalMap : DualTreeBidiMap [<map.value>] : String | Test.java:7135:10:7135:18 | normalMap : DualTreeBidiMap [<map.value>] : String | provenance |  |
 | Test.java:7134:59:7134:84 | reverseMap : DualTreeBidiMap [<map.key>] : String | Test.java:7135:21:7135:30 | reverseMap : DualTreeBidiMap [<map.key>] : String | provenance |  |
@@ -9476,99 +9476,99 @@ edges
 | Test.java:7135:4:7135:48 | this <constr(this)> [post update] : MyAbstractDualBidiMap [<map.value>] : String | Test.java:7134:10:7134:30 | parameter this [Return] : MyAbstractDualBidiMap [<map.value>] : String | provenance |  |
 | Test.java:7135:4:7135:48 | this <constr(this)> [post update] : MyAbstractDualBidiMap [<map.value>] : String | Test.java:7134:10:7134:30 | parameter this [Return] : MyAbstractDualBidiMap [<map.value>] : String | provenance |  |
 | Test.java:7135:4:7135:48 | this <constr(this)> [post update] : MyAbstractDualBidiMap [<map.value>] : String | Test.java:7134:10:7134:30 | parameter this [Return] : MyAbstractDualBidiMap [<map.value>] : String | provenance |  |
-| Test.java:7135:10:7135:18 | normalMap : DualTreeBidiMap [<map.key>] : String | Test.java:7135:4:7135:48 | this <constr(this)> [post update] : MyAbstractDualBidiMap [<map.key>] : String | provenance | MaD:44 |
-| Test.java:7135:10:7135:18 | normalMap : DualTreeBidiMap [<map.value>] : String | Test.java:7135:4:7135:48 | this <constr(this)> [post update] : MyAbstractDualBidiMap [<map.value>] : String | provenance | MaD:45 |
-| Test.java:7135:21:7135:30 | reverseMap : DualTreeBidiMap [<map.key>] : String | Test.java:7135:4:7135:48 | this <constr(this)> [post update] : MyAbstractDualBidiMap [<map.value>] : String | provenance | MaD:46 |
-| Test.java:7135:21:7135:30 | reverseMap : DualTreeBidiMap [<map.value>] : String | Test.java:7135:4:7135:48 | this <constr(this)> [post update] : MyAbstractDualBidiMap [<map.key>] : String | provenance | MaD:47 |
-| Test.java:7135:33:7135:46 | inverseBidiMap : DualTreeBidiMap [<map.key>] : String | Test.java:7135:4:7135:48 | this <constr(this)> [post update] : MyAbstractDualBidiMap [<map.value>] : String | provenance | MaD:48 |
-| Test.java:7135:33:7135:46 | inverseBidiMap : DualTreeBidiMap [<map.value>] : String | Test.java:7135:4:7135:48 | this <constr(this)> [post update] : MyAbstractDualBidiMap [<map.key>] : String | provenance | MaD:49 |
+| Test.java:7135:10:7135:18 | normalMap : DualTreeBidiMap [<map.key>] : String | Test.java:7135:4:7135:48 | this <constr(this)> [post update] : MyAbstractDualBidiMap [<map.key>] : String | provenance | MaD:46 |
+| Test.java:7135:10:7135:18 | normalMap : DualTreeBidiMap [<map.value>] : String | Test.java:7135:4:7135:48 | this <constr(this)> [post update] : MyAbstractDualBidiMap [<map.value>] : String | provenance | MaD:47 |
+| Test.java:7135:21:7135:30 | reverseMap : DualTreeBidiMap [<map.key>] : String | Test.java:7135:4:7135:48 | this <constr(this)> [post update] : MyAbstractDualBidiMap [<map.value>] : String | provenance | MaD:48 |
+| Test.java:7135:21:7135:30 | reverseMap : DualTreeBidiMap [<map.value>] : String | Test.java:7135:4:7135:48 | this <constr(this)> [post update] : MyAbstractDualBidiMap [<map.key>] : String | provenance | MaD:49 |
+| Test.java:7135:33:7135:46 | inverseBidiMap : DualTreeBidiMap [<map.key>] : String | Test.java:7135:4:7135:48 | this <constr(this)> [post update] : MyAbstractDualBidiMap [<map.value>] : String | provenance | MaD:50 |
+| Test.java:7135:33:7135:46 | inverseBidiMap : DualTreeBidiMap [<map.value>] : String | Test.java:7135:4:7135:48 | this <constr(this)> [post update] : MyAbstractDualBidiMap [<map.key>] : String | provenance | MaD:51 |
 | Test.java:7143:44:7143:73 | map : DualTreeBidiMap [<map.key>] : String | Test.java:7144:10:7144:12 | map : DualTreeBidiMap [<map.key>] : String | provenance |  |
 | Test.java:7143:44:7143:73 | map : DualTreeBidiMap [<map.value>] : String | Test.java:7144:10:7144:12 | map : DualTreeBidiMap [<map.value>] : String | provenance |  |
 | Test.java:7144:4:7144:14 | this <constr(this)> [post update] : MyAbstractOrderedBidiMapDecorator [<map.key>] : String | Test.java:7143:10:7143:42 | parameter this [Return] : MyAbstractOrderedBidiMapDecorator [<map.key>] : String | provenance |  |
 | Test.java:7144:4:7144:14 | this <constr(this)> [post update] : MyAbstractOrderedBidiMapDecorator [<map.value>] : String | Test.java:7143:10:7143:42 | parameter this [Return] : MyAbstractOrderedBidiMapDecorator [<map.value>] : String | provenance |  |
-| Test.java:7144:10:7144:12 | map : DualTreeBidiMap [<map.key>] : String | Test.java:7144:4:7144:14 | this <constr(this)> [post update] : MyAbstractOrderedBidiMapDecorator [<map.key>] : String | provenance | MaD:50 |
-| Test.java:7144:10:7144:12 | map : DualTreeBidiMap [<map.value>] : String | Test.java:7144:4:7144:14 | this <constr(this)> [post update] : MyAbstractOrderedBidiMapDecorator [<map.value>] : String | provenance | MaD:51 |
+| Test.java:7144:10:7144:12 | map : DualTreeBidiMap [<map.key>] : String | Test.java:7144:4:7144:14 | this <constr(this)> [post update] : MyAbstractOrderedBidiMapDecorator [<map.key>] : String | provenance | MaD:52 |
+| Test.java:7144:10:7144:12 | map : DualTreeBidiMap [<map.value>] : String | Test.java:7144:4:7144:14 | this <constr(this)> [post update] : MyAbstractOrderedBidiMapDecorator [<map.value>] : String | provenance | MaD:53 |
 | Test.java:7149:40:7149:63 | coll : TreeBag [<element>] : String | Test.java:7150:10:7150:13 | coll : TreeBag [<element>] : String | provenance |  |
 | Test.java:7150:4:7150:15 | this <constr(this)> [post update] : MyAbstractCollectionDecorator [<element>] : String | Test.java:7149:10:7149:38 | parameter this [Return] : MyAbstractCollectionDecorator [<element>] : String | provenance |  |
-| Test.java:7150:10:7150:13 | coll : TreeBag [<element>] : String | Test.java:7150:4:7150:15 | this <constr(this)> [post update] : MyAbstractCollectionDecorator [<element>] : String | provenance | MaD:74 |
+| Test.java:7150:10:7150:13 | coll : TreeBag [<element>] : String | Test.java:7150:4:7150:15 | this <constr(this)> [post update] : MyAbstractCollectionDecorator [<element>] : String | provenance | MaD:76 |
 | Test.java:7152:24:7152:34 | parameter this : MyAbstractCollectionDecorator [<element>] : String | Test.java:7153:11:7153:15 | super : MyAbstractCollectionDecorator [<element>] : String | provenance |  |
-| Test.java:7153:11:7153:15 | super : MyAbstractCollectionDecorator [<element>] : String | Test.java:7153:11:7153:27 | decorated(...) : Collection [<element>] : String | provenance | MaD:75 |
+| Test.java:7153:11:7153:15 | super : MyAbstractCollectionDecorator [<element>] : String | Test.java:7153:11:7153:27 | decorated(...) : Collection [<element>] : String | provenance | MaD:77 |
 | Test.java:7155:31:7155:54 | coll : TreeBag [<element>] : String | Test.java:7156:24:7156:27 | coll : TreeBag [<element>] : String | provenance |  |
 | Test.java:7156:4:7156:8 | super [post update] : MyAbstractCollectionDecorator [<element>] : String | Test.java:7155:15:7155:29 | parameter this [Return] : MyAbstractCollectionDecorator [<element>] : String | provenance |  |
-| Test.java:7156:24:7156:27 | coll : TreeBag [<element>] : String | Test.java:7156:4:7156:8 | super [post update] : MyAbstractCollectionDecorator [<element>] : String | provenance | MaD:76 |
+| Test.java:7156:24:7156:27 | coll : TreeBag [<element>] : String | Test.java:7156:4:7156:8 | super [post update] : MyAbstractCollectionDecorator [<element>] : String | provenance | MaD:78 |
 | Test.java:7161:38:7161:63 | iterator : ListIterator [<element>] : String | Test.java:7162:10:7162:17 | iterator : ListIterator [<element>] : String | provenance |  |
 | Test.java:7162:4:7162:19 | this <constr(this)> [post update] : MyAbstractIteratorDecorator [<element>] : String | Test.java:7161:10:7161:36 | parameter this [Return] : MyAbstractIteratorDecorator [<element>] : String | provenance |  |
-| Test.java:7162:10:7162:17 | iterator : ListIterator [<element>] : String | Test.java:7162:4:7162:19 | this <constr(this)> [post update] : MyAbstractIteratorDecorator [<element>] : String | provenance | MaD:114 |
+| Test.java:7162:10:7162:17 | iterator : ListIterator [<element>] : String | Test.java:7162:4:7162:19 | this <constr(this)> [post update] : MyAbstractIteratorDecorator [<element>] : String | provenance | MaD:116 |
 | Test.java:7167:42:7167:71 | iterator : ListIterator [<element>] : String | Test.java:7168:10:7168:17 | iterator : ListIterator [<element>] : String | provenance |  |
 | Test.java:7168:4:7168:19 | this <constr(this)> [post update] : MyAbstractListIteratorDecorator [<element>] : String | Test.java:7167:10:7167:40 | parameter this [Return] : MyAbstractListIteratorDecorator [<element>] : String | provenance |  |
-| Test.java:7168:10:7168:17 | iterator : ListIterator [<element>] : String | Test.java:7168:4:7168:19 | this <constr(this)> [post update] : MyAbstractListIteratorDecorator [<element>] : String | provenance | MaD:115 |
+| Test.java:7168:10:7168:17 | iterator : ListIterator [<element>] : String | Test.java:7168:4:7168:19 | this <constr(this)> [post update] : MyAbstractListIteratorDecorator [<element>] : String | provenance | MaD:117 |
 | Test.java:7170:26:7170:42 | parameter this : MyAbstractListIteratorDecorator [<element>] : String | Test.java:7171:11:7171:15 | super : MyAbstractListIteratorDecorator [<element>] : String | provenance |  |
-| Test.java:7171:11:7171:15 | super : MyAbstractListIteratorDecorator [<element>] : String | Test.java:7171:11:7171:33 | getListIterator(...) : ListIterator [<element>] : String | provenance | MaD:116 |
+| Test.java:7171:11:7171:15 | super : MyAbstractListIteratorDecorator [<element>] : String | Test.java:7171:11:7171:33 | getListIterator(...) : ListIterator [<element>] : String | provenance | MaD:118 |
 | Test.java:7176:41:7176:72 | iterator : OrderedMapIterator [<element>] : String | Test.java:7177:10:7177:17 | iterator : OrderedMapIterator [<element>] : String | provenance |  |
 | Test.java:7176:41:7176:72 | iterator : OrderedMapIterator [<map.value>] : String | Test.java:7177:10:7177:17 | iterator : OrderedMapIterator [<map.value>] : String | provenance |  |
 | Test.java:7177:4:7177:19 | this <constr(this)> [post update] : MyAbstractMapIteratorDecorator [<element>] : String | Test.java:7176:10:7176:39 | parameter this [Return] : MyAbstractMapIteratorDecorator [<element>] : String | provenance |  |
 | Test.java:7177:4:7177:19 | this <constr(this)> [post update] : MyAbstractMapIteratorDecorator [<map.value>] : String | Test.java:7176:10:7176:39 | parameter this [Return] : MyAbstractMapIteratorDecorator [<map.value>] : String | provenance |  |
-| Test.java:7177:10:7177:17 | iterator : OrderedMapIterator [<element>] : String | Test.java:7177:4:7177:19 | this <constr(this)> [post update] : MyAbstractMapIteratorDecorator [<element>] : String | provenance | MaD:117 |
-| Test.java:7177:10:7177:17 | iterator : OrderedMapIterator [<map.value>] : String | Test.java:7177:4:7177:19 | this <constr(this)> [post update] : MyAbstractMapIteratorDecorator [<map.value>] : String | provenance | MaD:118 |
+| Test.java:7177:10:7177:17 | iterator : OrderedMapIterator [<element>] : String | Test.java:7177:4:7177:19 | this <constr(this)> [post update] : MyAbstractMapIteratorDecorator [<element>] : String | provenance | MaD:119 |
+| Test.java:7177:10:7177:17 | iterator : OrderedMapIterator [<map.value>] : String | Test.java:7177:4:7177:19 | this <constr(this)> [post update] : MyAbstractMapIteratorDecorator [<map.value>] : String | provenance | MaD:120 |
 | Test.java:7179:28:7179:43 | parameter this : MyAbstractMapIteratorDecorator [<element>] : String | Test.java:7180:11:7180:15 | super : MyAbstractMapIteratorDecorator [<element>] : String | provenance |  |
 | Test.java:7179:28:7179:43 | parameter this : MyAbstractMapIteratorDecorator [<map.value>] : String | Test.java:7180:11:7180:15 | super : MyAbstractMapIteratorDecorator [<map.value>] : String | provenance |  |
-| Test.java:7180:11:7180:15 | super : MyAbstractMapIteratorDecorator [<element>] : String | Test.java:7180:11:7180:32 | getMapIterator(...) : MapIterator [<element>] : String | provenance | MaD:119 |
-| Test.java:7180:11:7180:15 | super : MyAbstractMapIteratorDecorator [<map.value>] : String | Test.java:7180:11:7180:32 | getMapIterator(...) : MapIterator [<map.value>] : String | provenance | MaD:120 |
+| Test.java:7180:11:7180:15 | super : MyAbstractMapIteratorDecorator [<element>] : String | Test.java:7180:11:7180:32 | getMapIterator(...) : MapIterator [<element>] : String | provenance | MaD:121 |
+| Test.java:7180:11:7180:15 | super : MyAbstractMapIteratorDecorator [<map.value>] : String | Test.java:7180:11:7180:32 | getMapIterator(...) : MapIterator [<map.value>] : String | provenance | MaD:122 |
 | Test.java:7185:48:7185:86 | iterator : OrderedMapIterator [<element>] : String | Test.java:7186:10:7186:17 | iterator : OrderedMapIterator [<element>] : String | provenance |  |
 | Test.java:7185:48:7185:86 | iterator : OrderedMapIterator [<map.value>] : String | Test.java:7186:10:7186:17 | iterator : OrderedMapIterator [<map.value>] : String | provenance |  |
 | Test.java:7186:4:7186:19 | this <constr(this)> [post update] : MyAbstractOrderedMapIteratorDecorator [<element>] : String | Test.java:7185:10:7185:46 | parameter this [Return] : MyAbstractOrderedMapIteratorDecorator [<element>] : String | provenance |  |
 | Test.java:7186:4:7186:19 | this <constr(this)> [post update] : MyAbstractOrderedMapIteratorDecorator [<map.value>] : String | Test.java:7185:10:7185:46 | parameter this [Return] : MyAbstractOrderedMapIteratorDecorator [<map.value>] : String | provenance |  |
-| Test.java:7186:10:7186:17 | iterator : OrderedMapIterator [<element>] : String | Test.java:7186:4:7186:19 | this <constr(this)> [post update] : MyAbstractOrderedMapIteratorDecorator [<element>] : String | provenance | MaD:121 |
-| Test.java:7186:10:7186:17 | iterator : OrderedMapIterator [<map.value>] : String | Test.java:7186:4:7186:19 | this <constr(this)> [post update] : MyAbstractOrderedMapIteratorDecorator [<map.value>] : String | provenance | MaD:122 |
+| Test.java:7186:10:7186:17 | iterator : OrderedMapIterator [<element>] : String | Test.java:7186:4:7186:19 | this <constr(this)> [post update] : MyAbstractOrderedMapIteratorDecorator [<element>] : String | provenance | MaD:123 |
+| Test.java:7186:10:7186:17 | iterator : OrderedMapIterator [<map.value>] : String | Test.java:7186:4:7186:19 | this <constr(this)> [post update] : MyAbstractOrderedMapIteratorDecorator [<map.value>] : String | provenance | MaD:124 |
 | Test.java:7188:35:7188:57 | parameter this : MyAbstractOrderedMapIteratorDecorator [<element>] : String | Test.java:7189:11:7189:15 | super : MyAbstractOrderedMapIteratorDecorator [<element>] : String | provenance |  |
 | Test.java:7188:35:7188:57 | parameter this : MyAbstractOrderedMapIteratorDecorator [<map.value>] : String | Test.java:7189:11:7189:15 | super : MyAbstractOrderedMapIteratorDecorator [<map.value>] : String | provenance |  |
-| Test.java:7189:11:7189:15 | super : MyAbstractOrderedMapIteratorDecorator [<element>] : String | Test.java:7189:11:7189:39 | getOrderedMapIterator(...) : OrderedMapIterator [<element>] : String | provenance | MaD:123 |
-| Test.java:7189:11:7189:15 | super : MyAbstractOrderedMapIteratorDecorator [<map.value>] : String | Test.java:7189:11:7189:39 | getOrderedMapIterator(...) : OrderedMapIterator [<map.value>] : String | provenance | MaD:124 |
+| Test.java:7189:11:7189:15 | super : MyAbstractOrderedMapIteratorDecorator [<element>] : String | Test.java:7189:11:7189:39 | getOrderedMapIterator(...) : OrderedMapIterator [<element>] : String | provenance | MaD:125 |
+| Test.java:7189:11:7189:15 | super : MyAbstractOrderedMapIteratorDecorator [<map.value>] : String | Test.java:7189:11:7189:39 | getOrderedMapIterator(...) : OrderedMapIterator [<map.value>] : String | provenance | MaD:126 |
 | Test.java:7194:45:7194:70 | iterator : ListIterator [<element>] : String | Test.java:7195:10:7195:17 | iterator : ListIterator [<element>] : String | provenance |  |
 | Test.java:7195:4:7195:19 | this <constr(this)> [post update] : MyAbstractUntypedIteratorDecorator [<element>] : String | Test.java:7194:10:7194:43 | parameter this [Return] : MyAbstractUntypedIteratorDecorator [<element>] : String | provenance |  |
-| Test.java:7195:10:7195:17 | iterator : ListIterator [<element>] : String | Test.java:7195:4:7195:19 | this <constr(this)> [post update] : MyAbstractUntypedIteratorDecorator [<element>] : String | provenance | MaD:125 |
+| Test.java:7195:10:7195:17 | iterator : ListIterator [<element>] : String | Test.java:7195:4:7195:19 | this <constr(this)> [post update] : MyAbstractUntypedIteratorDecorator [<element>] : String | provenance | MaD:127 |
 | Test.java:7197:22:7197:34 | parameter this : MyAbstractUntypedIteratorDecorator [<element>] : String | Test.java:7198:11:7198:15 | super : MyAbstractUntypedIteratorDecorator [<element>] : String | provenance |  |
-| Test.java:7198:11:7198:15 | super : MyAbstractUntypedIteratorDecorator [<element>] : String | Test.java:7198:11:7198:29 | getIterator(...) : Iterator [<element>] : String | provenance | MaD:126 |
+| Test.java:7198:11:7198:15 | super : MyAbstractUntypedIteratorDecorator [<element>] : String | Test.java:7198:11:7198:29 | getIterator(...) : Iterator [<element>] : String | provenance | MaD:128 |
 | Test.java:7204:31:7204:64 | coll : TreeBag [<element>] : String | Test.java:7205:10:7205:13 | coll : TreeBag [<element>] : String | provenance |  |
 | Test.java:7205:4:7205:15 | this <constr(this)> [post update] : MyAbstractLinkedList [<element>] : String | Test.java:7204:10:7204:29 | parameter this [Return] : MyAbstractLinkedList [<element>] : String | provenance |  |
-| Test.java:7205:10:7205:13 | coll : TreeBag [<element>] : String | Test.java:7205:4:7205:15 | this <constr(this)> [post update] : MyAbstractLinkedList [<element>] : String | provenance | MaD:241 |
+| Test.java:7205:10:7205:13 | coll : TreeBag [<element>] : String | Test.java:7205:4:7205:15 | this <constr(this)> [post update] : MyAbstractLinkedList [<element>] : String | provenance | MaD:243 |
 | Test.java:7210:34:7210:51 | list : List [<element>] : String | Test.java:7211:10:7211:13 | list : List [<element>] : String | provenance |  |
 | Test.java:7211:4:7211:15 | this <constr(this)> [post update] : MyAbstractListDecorator [<element>] : String | Test.java:7210:10:7210:32 | parameter this [Return] : MyAbstractListDecorator [<element>] : String | provenance |  |
-| Test.java:7211:10:7211:13 | list : List [<element>] : String | Test.java:7211:4:7211:15 | this <constr(this)> [post update] : MyAbstractListDecorator [<element>] : String | provenance | MaD:248 |
+| Test.java:7211:10:7211:13 | list : List [<element>] : String | Test.java:7211:4:7211:15 | this <constr(this)> [post update] : MyAbstractListDecorator [<element>] : String | provenance | MaD:250 |
 | Test.java:7216:46:7216:63 | list : List [<element>] : String | Test.java:7217:10:7217:13 | list : List [<element>] : String | provenance |  |
 | Test.java:7217:4:7217:15 | this <constr(this)> [post update] : MyAbstractSerializableListDecorator [<element>] : String | Test.java:7216:10:7216:44 | parameter this [Return] : MyAbstractSerializableListDecorator [<element>] : String | provenance |  |
-| Test.java:7217:10:7217:13 | list : List [<element>] : String | Test.java:7217:4:7217:15 | this <constr(this)> [post update] : MyAbstractSerializableListDecorator [<element>] : String | provenance | MaD:249 |
+| Test.java:7217:10:7217:13 | list : List [<element>] : String | Test.java:7217:4:7217:15 | this <constr(this)> [post update] : MyAbstractSerializableListDecorator [<element>] : String | provenance | MaD:251 |
 | Test.java:7222:30:7222:68 | map : Map [<map.key>] : String | Test.java:7223:10:7223:12 | map : Map [<map.key>] : String | provenance |  |
 | Test.java:7222:30:7222:68 | map : Map [<map.value>] : String | Test.java:7223:10:7223:12 | map : Map [<map.value>] : String | provenance |  |
 | Test.java:7223:4:7223:14 | this <constr(this)> [post update] : MyAbstractHashedMap [<map.key>] : String | Test.java:7222:10:7222:28 | parameter this [Return] : MyAbstractHashedMap [<map.key>] : String | provenance |  |
 | Test.java:7223:4:7223:14 | this <constr(this)> [post update] : MyAbstractHashedMap [<map.value>] : String | Test.java:7222:10:7222:28 | parameter this [Return] : MyAbstractHashedMap [<map.value>] : String | provenance |  |
-| Test.java:7223:10:7223:12 | map : Map [<map.key>] : String | Test.java:7223:4:7223:14 | this <constr(this)> [post update] : MyAbstractHashedMap [<map.key>] : String | provenance | MaD:263 |
-| Test.java:7223:10:7223:12 | map : Map [<map.value>] : String | Test.java:7223:4:7223:14 | this <constr(this)> [post update] : MyAbstractHashedMap [<map.value>] : String | provenance | MaD:264 |
+| Test.java:7223:10:7223:12 | map : Map [<map.key>] : String | Test.java:7223:4:7223:14 | this <constr(this)> [post update] : MyAbstractHashedMap [<map.key>] : String | provenance | MaD:265 |
+| Test.java:7223:10:7223:12 | map : Map [<map.value>] : String | Test.java:7223:4:7223:14 | this <constr(this)> [post update] : MyAbstractHashedMap [<map.value>] : String | provenance | MaD:266 |
 | Test.java:7228:30:7228:68 | map : Map [<map.key>] : String | Test.java:7229:10:7229:12 | map : Map [<map.key>] : String | provenance |  |
 | Test.java:7228:30:7228:68 | map : Map [<map.value>] : String | Test.java:7229:10:7229:12 | map : Map [<map.value>] : String | provenance |  |
 | Test.java:7229:4:7229:14 | this <constr(this)> [post update] : MyAbstractLinkedMap [<map.key>] : String | Test.java:7228:10:7228:28 | parameter this [Return] : MyAbstractLinkedMap [<map.key>] : String | provenance |  |
 | Test.java:7229:4:7229:14 | this <constr(this)> [post update] : MyAbstractLinkedMap [<map.value>] : String | Test.java:7228:10:7228:28 | parameter this [Return] : MyAbstractLinkedMap [<map.value>] : String | provenance |  |
-| Test.java:7229:10:7229:12 | map : Map [<map.key>] : String | Test.java:7229:4:7229:14 | this <constr(this)> [post update] : MyAbstractLinkedMap [<map.key>] : String | provenance | MaD:265 |
-| Test.java:7229:10:7229:12 | map : Map [<map.value>] : String | Test.java:7229:4:7229:14 | this <constr(this)> [post update] : MyAbstractLinkedMap [<map.value>] : String | provenance | MaD:266 |
+| Test.java:7229:10:7229:12 | map : Map [<map.key>] : String | Test.java:7229:4:7229:14 | this <constr(this)> [post update] : MyAbstractLinkedMap [<map.key>] : String | provenance | MaD:267 |
+| Test.java:7229:10:7229:12 | map : Map [<map.value>] : String | Test.java:7229:4:7229:14 | this <constr(this)> [post update] : MyAbstractLinkedMap [<map.value>] : String | provenance | MaD:268 |
 | Test.java:7234:33:7234:51 | map : Map [<map.key>] : String | Test.java:7235:10:7235:12 | map : Map [<map.key>] : String | provenance |  |
 | Test.java:7234:33:7234:51 | map : Map [<map.value>] : String | Test.java:7235:10:7235:12 | map : Map [<map.value>] : String | provenance |  |
 | Test.java:7235:4:7235:14 | this <constr(this)> [post update] : MyAbstractMapDecorator [<map.key>] : String | Test.java:7234:10:7234:31 | parameter this [Return] : MyAbstractMapDecorator [<map.key>] : String | provenance |  |
 | Test.java:7235:4:7235:14 | this <constr(this)> [post update] : MyAbstractMapDecorator [<map.value>] : String | Test.java:7234:10:7234:31 | parameter this [Return] : MyAbstractMapDecorator [<map.value>] : String | provenance |  |
-| Test.java:7235:10:7235:12 | map : Map [<map.key>] : String | Test.java:7235:4:7235:14 | this <constr(this)> [post update] : MyAbstractMapDecorator [<map.key>] : String | provenance | MaD:267 |
-| Test.java:7235:10:7235:12 | map : Map [<map.value>] : String | Test.java:7235:4:7235:14 | this <constr(this)> [post update] : MyAbstractMapDecorator [<map.value>] : String | provenance | MaD:268 |
+| Test.java:7235:10:7235:12 | map : Map [<map.key>] : String | Test.java:7235:4:7235:14 | this <constr(this)> [post update] : MyAbstractMapDecorator [<map.key>] : String | provenance | MaD:269 |
+| Test.java:7235:10:7235:12 | map : Map [<map.value>] : String | Test.java:7235:4:7235:14 | this <constr(this)> [post update] : MyAbstractMapDecorator [<map.value>] : String | provenance | MaD:270 |
 | Test.java:7237:20:7237:30 | parameter this : MyAbstractMapDecorator [<map.key>] : String | Test.java:7238:11:7238:15 | super : MyAbstractMapDecorator [<map.key>] : String | provenance |  |
 | Test.java:7237:20:7237:30 | parameter this : MyAbstractMapDecorator [<map.value>] : String | Test.java:7238:11:7238:15 | super : MyAbstractMapDecorator [<map.value>] : String | provenance |  |
-| Test.java:7238:11:7238:15 | super : MyAbstractMapDecorator [<map.key>] : String | Test.java:7238:11:7238:27 | decorated(...) : Map [<map.key>] : String | provenance | MaD:269 |
-| Test.java:7238:11:7238:15 | super : MyAbstractMapDecorator [<map.value>] : String | Test.java:7238:11:7238:27 | decorated(...) : Map [<map.value>] : String | provenance | MaD:270 |
+| Test.java:7238:11:7238:15 | super : MyAbstractMapDecorator [<map.key>] : String | Test.java:7238:11:7238:27 | decorated(...) : Map [<map.key>] : String | provenance | MaD:271 |
+| Test.java:7238:11:7238:15 | super : MyAbstractMapDecorator [<map.value>] : String | Test.java:7238:11:7238:27 | decorated(...) : Map [<map.value>] : String | provenance | MaD:272 |
 | Test.java:7243:42:7243:66 | set : TreeSet [<element>] : String | Test.java:7244:10:7244:12 | set : TreeSet [<element>] : String | provenance |  |
 | Test.java:7244:4:7244:14 | this <constr(this)> [post update] : MyAbstractNavigableSetDecorator [<element>] : String | Test.java:7243:10:7243:40 | parameter this [Return] : MyAbstractNavigableSetDecorator [<element>] : String | provenance |  |
-| Test.java:7244:10:7244:12 | set : TreeSet [<element>] : String | Test.java:7244:4:7244:14 | this <constr(this)> [post update] : MyAbstractNavigableSetDecorator [<element>] : String | provenance | MaD:778 |
+| Test.java:7244:10:7244:12 | set : TreeSet [<element>] : String | Test.java:7244:4:7244:14 | this <constr(this)> [post update] : MyAbstractNavigableSetDecorator [<element>] : String | provenance | MaD:423 |
 | Test.java:7249:33:7249:48 | set : ListOrderedSet [<element>] : String | Test.java:7250:10:7250:12 | set : ListOrderedSet [<element>] : String | provenance |  |
 | Test.java:7250:4:7250:14 | this <constr(this)> [post update] : MyAbstractSetDecorator [<element>] : String | Test.java:7249:10:7249:31 | parameter this [Return] : MyAbstractSetDecorator [<element>] : String | provenance |  |
-| Test.java:7250:10:7250:12 | set : ListOrderedSet [<element>] : String | Test.java:7250:4:7250:14 | this <constr(this)> [post update] : MyAbstractSetDecorator [<element>] : String | provenance | MaD:779 |
+| Test.java:7250:10:7250:12 | set : ListOrderedSet [<element>] : String | Test.java:7250:4:7250:14 | this <constr(this)> [post update] : MyAbstractSetDecorator [<element>] : String | provenance | MaD:424 |
 | Test.java:7255:39:7255:54 | set : ListOrderedSet [<element>] : String | Test.java:7256:10:7256:12 | set : ListOrderedSet [<element>] : String | provenance |  |
 | Test.java:7256:4:7256:14 | this <constr(this)> [post update] : MyAbstractSortedSetDecorator [<element>] : String | Test.java:7255:10:7255:37 | parameter this [Return] : MyAbstractSortedSetDecorator [<element>] : String | provenance |  |
-| Test.java:7256:10:7256:12 | set : ListOrderedSet [<element>] : String | Test.java:7256:4:7256:14 | this <constr(this)> [post update] : MyAbstractSortedSetDecorator [<element>] : String | provenance | MaD:780 |
+| Test.java:7256:10:7256:12 | set : ListOrderedSet [<element>] : String | Test.java:7256:4:7256:14 | this <constr(this)> [post update] : MyAbstractSortedSetDecorator [<element>] : String | provenance | MaD:425 |
 nodes
 | Test.java:228:18:228:29 | map : AbstractMapDecorator [<map.key>] : Object | semmle.label | map : AbstractMapDecorator [<map.key>] : Object |
 | Test.java:228:18:228:29 | map : AbstractMapDecorator [<map.key>] : String | semmle.label | map : AbstractMapDecorator [<map.key>] : String |
diff --git a/java/ql/test/library-tests/frameworks/apache-commons-lang3/flow.expected b/java/ql/test/library-tests/frameworks/apache-commons-lang3/flow.expected
index 9031c242a1c..4ecf1896c57 100644
--- a/java/ql/test/library-tests/frameworks/apache-commons-lang3/flow.expected
+++ b/java/ql/test/library-tests/frameworks/apache-commons-lang3/flow.expected
@@ -13,461 +13,461 @@ models
 | 12 | Summary: java.util; Dictionary; true; put; (Object,Object); ; Argument[1]; Argument[this].MapValue; value; manual |
 | 13 | Summary: java.util; Iterator; true; next; ; ; Argument[this].Element; ReturnValue; value; manual |
 | 14 | Summary: java.util; ListIterator; true; previous; ; ; Argument[this].Element; ReturnValue; value; manual |
-| 15 | Summary: java.util; Map; true; get; ; ; Argument[this].MapValue; ReturnValue; value; manual |
-| 16 | Summary: java.util; Map; true; put; (Object,Object); ; Argument[1]; Argument[this].MapValue; value; manual |
-| 17 | Summary: java.util; Map$Entry; true; getValue; ; ; Argument[this].MapValue; ReturnValue; value; manual |
-| 18 | Summary: java.util; Map$Entry; true; setValue; ; ; Argument[0]; Argument[this].MapValue; value; manual |
-| 19 | Summary: org.apache.commons.lang3.builder; ToStringBuilder; false; append; ; ; Argument[this]; ReturnValue; value; manual |
-| 20 | Summary: org.apache.commons.lang3.builder; ToStringBuilder; false; append; (java.lang.Object); ; Argument[0]; Argument[this]; taint; manual |
-| 21 | Summary: org.apache.commons.lang3.builder; ToStringBuilder; false; append; (java.lang.Object[]); ; Argument[0].ArrayElement; Argument[this]; taint; manual |
-| 22 | Summary: org.apache.commons.lang3.builder; ToStringBuilder; false; append; (java.lang.String,boolean); ; Argument[0]; Argument[this]; taint; manual |
-| 23 | Summary: org.apache.commons.lang3.builder; ToStringBuilder; false; append; (java.lang.String,java.lang.Object); ; Argument[0..1]; Argument[this]; taint; manual |
-| 24 | Summary: org.apache.commons.lang3.builder; ToStringBuilder; false; append; (java.lang.String,java.lang.Object[]); ; Argument[1].ArrayElement; Argument[this]; taint; manual |
-| 25 | Summary: org.apache.commons.lang3.builder; ToStringBuilder; false; append; (java.lang.String,java.lang.Object[],boolean); ; Argument[1].ArrayElement; Argument[this]; taint; manual |
+| 15 | Summary: java.util; Map$Entry; true; getValue; ; ; Argument[this].MapValue; ReturnValue; value; manual |
+| 16 | Summary: java.util; Map$Entry; true; setValue; ; ; Argument[0]; Argument[this].MapValue; value; manual |
+| 17 | Summary: java.util; Map; true; get; ; ; Argument[this].MapValue; ReturnValue; value; manual |
+| 18 | Summary: java.util; Map; true; put; (Object,Object); ; Argument[1]; Argument[this].MapValue; value; manual |
+| 19 | Summary: org.apache.commons.lang3.builder; ToStringBuilder; false; append; (java.lang.Object); ; Argument[0]; Argument[this]; taint; manual |
+| 20 | Summary: org.apache.commons.lang3.builder; ToStringBuilder; false; append; (java.lang.Object[]); ; Argument[0].ArrayElement; Argument[this]; taint; manual |
+| 21 | Summary: org.apache.commons.lang3.builder; ToStringBuilder; false; append; (java.lang.String,boolean); ; Argument[0]; Argument[this]; taint; manual |
+| 22 | Summary: org.apache.commons.lang3.builder; ToStringBuilder; false; append; (java.lang.String,java.lang.Object); ; Argument[0..1]; Argument[this]; taint; manual |
+| 23 | Summary: org.apache.commons.lang3.builder; ToStringBuilder; false; append; (java.lang.String,java.lang.Object[]); ; Argument[1].ArrayElement; Argument[this]; taint; manual |
+| 24 | Summary: org.apache.commons.lang3.builder; ToStringBuilder; false; append; (java.lang.String,java.lang.Object[],boolean); ; Argument[1].ArrayElement; Argument[this]; taint; manual |
+| 25 | Summary: org.apache.commons.lang3.builder; ToStringBuilder; false; append; ; ; Argument[this]; ReturnValue; value; manual |
 | 26 | Summary: org.apache.commons.lang3.builder; ToStringBuilder; false; appendSuper; ; ; Argument[0]; Argument[this]; taint; manual |
 | 27 | Summary: org.apache.commons.lang3.builder; ToStringBuilder; false; appendToString; ; ; Argument[0]; Argument[this]; taint; manual |
 | 28 | Summary: org.apache.commons.lang3.builder; ToStringBuilder; false; build; ; ; Argument[this]; ReturnValue; taint; manual |
 | 29 | Summary: org.apache.commons.lang3.builder; ToStringBuilder; false; getStringBuffer; ; ; Argument[this]; ReturnValue; taint; manual |
 | 30 | Summary: org.apache.commons.lang3.builder; ToStringBuilder; false; toString; ; ; Argument[this]; ReturnValue; taint; manual |
-| 31 | Summary: org.apache.commons.lang3; ArrayUtils; false; add; ; ; Argument[0].ArrayElement; ReturnValue.ArrayElement; value; manual |
-| 32 | Summary: org.apache.commons.lang3; ArrayUtils; false; add; ; ; Argument[2]; ReturnValue.ArrayElement; value; manual |
-| 33 | Summary: org.apache.commons.lang3; ArrayUtils; false; add; (java.lang.Object[],java.lang.Object); ; Argument[1]; ReturnValue.ArrayElement; value; manual |
-| 34 | Summary: org.apache.commons.lang3; ArrayUtils; false; addAll; ; ; Argument[0..1].ArrayElement; ReturnValue.ArrayElement; value; manual |
-| 35 | Summary: org.apache.commons.lang3; ArrayUtils; false; addFirst; ; ; Argument[0].ArrayElement; ReturnValue.ArrayElement; value; manual |
-| 36 | Summary: org.apache.commons.lang3; ArrayUtils; false; addFirst; ; ; Argument[1]; ReturnValue.ArrayElement; value; manual |
-| 37 | Summary: org.apache.commons.lang3; ArrayUtils; false; clone; ; ; Argument[0].ArrayElement; ReturnValue.ArrayElement; value; manual |
-| 38 | Summary: org.apache.commons.lang3; ArrayUtils; false; get; ; ; Argument[0].ArrayElement; ReturnValue; value; manual |
-| 39 | Summary: org.apache.commons.lang3; ArrayUtils; false; get; (java.lang.Object[],int,java.lang.Object); ; Argument[2]; ReturnValue; value; manual |
-| 40 | Summary: org.apache.commons.lang3; ArrayUtils; false; insert; ; ; Argument[1..2].ArrayElement; ReturnValue.ArrayElement; value; manual |
-| 41 | Summary: org.apache.commons.lang3; ArrayUtils; false; nullToEmpty; (java.lang.Object[],java.lang.Class); ; Argument[0]; ReturnValue; value; manual |
-| 42 | Summary: org.apache.commons.lang3; ArrayUtils; false; nullToEmpty; (java.lang.String[]); ; Argument[0]; ReturnValue; value; manual |
-| 43 | Summary: org.apache.commons.lang3; ArrayUtils; false; remove; ; ; Argument[0].ArrayElement; ReturnValue.ArrayElement; value; manual |
-| 44 | Summary: org.apache.commons.lang3; ArrayUtils; false; removeAll; ; ; Argument[0].ArrayElement; ReturnValue.ArrayElement; value; manual |
-| 45 | Summary: org.apache.commons.lang3; ArrayUtils; false; removeAllOccurences; ; ; Argument[0].ArrayElement; ReturnValue.ArrayElement; value; manual |
-| 46 | Summary: org.apache.commons.lang3; ArrayUtils; false; removeAllOccurrences; ; ; Argument[0].ArrayElement; ReturnValue.ArrayElement; value; manual |
-| 47 | Summary: org.apache.commons.lang3; ArrayUtils; false; removeElement; ; ; Argument[0].ArrayElement; ReturnValue.ArrayElement; value; manual |
-| 48 | Summary: org.apache.commons.lang3; ArrayUtils; false; removeElements; ; ; Argument[0].ArrayElement; ReturnValue.ArrayElement; value; manual |
-| 49 | Summary: org.apache.commons.lang3; ArrayUtils; false; subarray; ; ; Argument[0].ArrayElement; ReturnValue.ArrayElement; value; manual |
-| 50 | Summary: org.apache.commons.lang3; ArrayUtils; false; toArray; ; ; Argument[0].ArrayElement; ReturnValue.ArrayElement; value; manual |
-| 51 | Summary: org.apache.commons.lang3; ArrayUtils; false; toMap; ; ; Argument[0].ArrayElement.ArrayElement; ReturnValue.MapValue; value; manual |
-| 52 | Summary: org.apache.commons.lang3; ArrayUtils; false; toMap; ; ; Argument[0].ArrayElement.MapValue; ReturnValue.MapValue; value; manual |
-| 53 | Summary: org.apache.commons.lang3; ArrayUtils; false; toObject; ; ; Argument[0].ArrayElement; ReturnValue.ArrayElement; value; manual |
-| 54 | Summary: org.apache.commons.lang3; ArrayUtils; false; toPrimitive; ; ; Argument[0].ArrayElement; ReturnValue.ArrayElement; value; manual |
-| 55 | Summary: org.apache.commons.lang3; ArrayUtils; false; toPrimitive; ; ; Argument[1]; ReturnValue.ArrayElement; value; manual |
-| 56 | Summary: org.apache.commons.lang3; ObjectUtils; false; CONST; ; ; Argument[0]; ReturnValue; value; manual |
-| 57 | Summary: org.apache.commons.lang3; ObjectUtils; false; CONST_BYTE; ; ; Argument[0]; ReturnValue; value; manual |
-| 58 | Summary: org.apache.commons.lang3; ObjectUtils; false; CONST_SHORT; ; ; Argument[0]; ReturnValue; value; manual |
-| 59 | Summary: org.apache.commons.lang3; ObjectUtils; false; clone; ; ; Argument[0]; ReturnValue; value; manual |
-| 60 | Summary: org.apache.commons.lang3; ObjectUtils; false; cloneIfPossible; ; ; Argument[0]; ReturnValue; value; manual |
-| 61 | Summary: org.apache.commons.lang3; ObjectUtils; false; defaultIfNull; ; ; Argument[0..1]; ReturnValue; value; manual |
-| 62 | Summary: org.apache.commons.lang3; ObjectUtils; false; firstNonNull; ; ; Argument[0].ArrayElement; ReturnValue; value; manual |
-| 63 | Summary: org.apache.commons.lang3; ObjectUtils; false; getIfNull; ; ; Argument[0]; ReturnValue; value; manual |
-| 64 | Summary: org.apache.commons.lang3; ObjectUtils; false; max; ; ; Argument[0].ArrayElement; ReturnValue; value; manual |
-| 65 | Summary: org.apache.commons.lang3; ObjectUtils; false; median; ; ; Argument[0].ArrayElement; ReturnValue; value; manual |
-| 66 | Summary: org.apache.commons.lang3; ObjectUtils; false; min; ; ; Argument[0].ArrayElement; ReturnValue; value; manual |
-| 67 | Summary: org.apache.commons.lang3; ObjectUtils; false; mode; ; ; Argument[0].ArrayElement; ReturnValue; value; manual |
-| 68 | Summary: org.apache.commons.lang3; ObjectUtils; false; requireNonEmpty; ; ; Argument[0]; ReturnValue; value; manual |
-| 69 | Summary: org.apache.commons.lang3; ObjectUtils; false; toString; (Object,String); ; Argument[1]; ReturnValue; value; manual |
-| 70 | Summary: org.apache.commons.lang3; RegExUtils; false; removeAll; ; ; Argument[0]; ReturnValue; taint; manual |
-| 71 | Summary: org.apache.commons.lang3; RegExUtils; false; removeFirst; ; ; Argument[0]; ReturnValue; taint; manual |
-| 72 | Summary: org.apache.commons.lang3; RegExUtils; false; removePattern; ; ; Argument[0]; ReturnValue; taint; manual |
-| 73 | Summary: org.apache.commons.lang3; RegExUtils; false; replaceAll; ; ; Argument[0]; ReturnValue; taint; manual |
-| 74 | Summary: org.apache.commons.lang3; RegExUtils; false; replaceAll; ; ; Argument[2]; ReturnValue; taint; manual |
-| 75 | Summary: org.apache.commons.lang3; RegExUtils; false; replaceFirst; ; ; Argument[0]; ReturnValue; taint; manual |
-| 76 | Summary: org.apache.commons.lang3; RegExUtils; false; replaceFirst; ; ; Argument[2]; ReturnValue; taint; manual |
-| 77 | Summary: org.apache.commons.lang3; RegExUtils; false; replacePattern; ; ; Argument[0]; ReturnValue; taint; manual |
-| 78 | Summary: org.apache.commons.lang3; RegExUtils; false; replacePattern; ; ; Argument[2]; ReturnValue; taint; manual |
-| 79 | Summary: org.apache.commons.lang3; StringEscapeUtils; false; escapeJson; ; ; Argument[0]; ReturnValue; taint; manual |
-| 80 | Summary: org.apache.commons.lang3; StringUtils; false; abbreviate; ; ; Argument[0]; ReturnValue; taint; manual |
-| 81 | Summary: org.apache.commons.lang3; StringUtils; false; abbreviate; (java.lang.String,java.lang.String,int); ; Argument[1]; ReturnValue; taint; manual |
-| 82 | Summary: org.apache.commons.lang3; StringUtils; false; abbreviate; (java.lang.String,java.lang.String,int,int); ; Argument[1]; ReturnValue; taint; manual |
-| 83 | Summary: org.apache.commons.lang3; StringUtils; false; abbreviateMiddle; ; ; Argument[0]; ReturnValue; taint; manual |
-| 84 | Summary: org.apache.commons.lang3; StringUtils; false; abbreviateMiddle; ; ; Argument[1]; ReturnValue; taint; manual |
-| 85 | Summary: org.apache.commons.lang3; StringUtils; false; appendIfMissing; ; ; Argument[0]; ReturnValue; taint; manual |
-| 86 | Summary: org.apache.commons.lang3; StringUtils; false; appendIfMissing; ; ; Argument[1]; ReturnValue; taint; manual |
-| 87 | Summary: org.apache.commons.lang3; StringUtils; false; appendIfMissingIgnoreCase; ; ; Argument[0]; ReturnValue; taint; manual |
-| 88 | Summary: org.apache.commons.lang3; StringUtils; false; appendIfMissingIgnoreCase; ; ; Argument[1]; ReturnValue; taint; manual |
-| 89 | Summary: org.apache.commons.lang3; StringUtils; false; capitalize; ; ; Argument[0]; ReturnValue; taint; manual |
-| 90 | Summary: org.apache.commons.lang3; StringUtils; false; center; ; ; Argument[0]; ReturnValue; taint; manual |
-| 91 | Summary: org.apache.commons.lang3; StringUtils; false; center; (java.lang.String,int,java.lang.String); ; Argument[2]; ReturnValue; taint; manual |
-| 92 | Summary: org.apache.commons.lang3; StringUtils; false; chomp; (java.lang.String); ; Argument[0]; ReturnValue; taint; manual |
-| 93 | Summary: org.apache.commons.lang3; StringUtils; false; chomp; (java.lang.String,java.lang.String); ; Argument[0]; ReturnValue; taint; manual |
-| 94 | Summary: org.apache.commons.lang3; StringUtils; false; chop; ; ; Argument[0]; ReturnValue; taint; manual |
-| 95 | Summary: org.apache.commons.lang3; StringUtils; false; defaultIfBlank; ; ; Argument[0..1]; ReturnValue; taint; manual |
-| 96 | Summary: org.apache.commons.lang3; StringUtils; false; defaultIfEmpty; ; ; Argument[0..1]; ReturnValue; taint; manual |
-| 97 | Summary: org.apache.commons.lang3; StringUtils; false; defaultString; ; ; Argument[0..1]; ReturnValue; taint; manual |
-| 98 | Summary: org.apache.commons.lang3; StringUtils; false; deleteWhitespace; ; ; Argument[0]; ReturnValue; taint; manual |
-| 99 | Summary: org.apache.commons.lang3; StringUtils; false; difference; ; ; Argument[0..1]; ReturnValue; taint; manual |
-| 100 | Summary: org.apache.commons.lang3; StringUtils; false; firstNonBlank; ; ; Argument[0].ArrayElement; ReturnValue; value; manual |
-| 101 | Summary: org.apache.commons.lang3; StringUtils; false; firstNonEmpty; ; ; Argument[0].ArrayElement; ReturnValue; value; manual |
-| 102 | Summary: org.apache.commons.lang3; StringUtils; false; getBytes; ; ; Argument[0]; ReturnValue; taint; manual |
-| 103 | Summary: org.apache.commons.lang3; StringUtils; false; getCommonPrefix; ; ; Argument[0].ArrayElement; ReturnValue; taint; manual |
-| 104 | Summary: org.apache.commons.lang3; StringUtils; false; getDigits; ; ; Argument[0]; ReturnValue; taint; manual |
-| 105 | Summary: org.apache.commons.lang3; StringUtils; false; getIfBlank; ; ; Argument[0..1]; ReturnValue; taint; manual |
-| 106 | Summary: org.apache.commons.lang3; StringUtils; false; getIfEmpty; ; ; Argument[0..1]; ReturnValue; taint; manual |
-| 107 | Summary: org.apache.commons.lang3; StringUtils; false; join; (char[],char); ; Argument[0]; ReturnValue; taint; manual |
-| 108 | Summary: org.apache.commons.lang3; StringUtils; false; join; (char[],char,int,int); ; Argument[0]; ReturnValue; taint; manual |
-| 109 | Summary: org.apache.commons.lang3; StringUtils; false; join; (java.lang.Iterable,char); ; Argument[0].Element; ReturnValue; taint; manual |
-| 110 | Summary: org.apache.commons.lang3; StringUtils; false; join; (java.lang.Iterable,java.lang.String); ; Argument[0].Element; ReturnValue; taint; manual |
-| 111 | Summary: org.apache.commons.lang3; StringUtils; false; join; (java.lang.Iterable,java.lang.String); ; Argument[1]; ReturnValue; taint; manual |
-| 112 | Summary: org.apache.commons.lang3; StringUtils; false; join; (Object[]); ; Argument[0].ArrayElement; ReturnValue; taint; manual |
-| 113 | Summary: org.apache.commons.lang3; StringUtils; false; join; (Object[],char); ; Argument[0].ArrayElement; ReturnValue; taint; manual |
-| 114 | Summary: org.apache.commons.lang3; StringUtils; false; join; (Object[],char,int,int); ; Argument[0].ArrayElement; ReturnValue; taint; manual |
-| 115 | Summary: org.apache.commons.lang3; StringUtils; false; join; (Object[],String); ; Argument[0].ArrayElement; ReturnValue; taint; manual |
-| 116 | Summary: org.apache.commons.lang3; StringUtils; false; join; (Object[],String); ; Argument[1]; ReturnValue; taint; manual |
-| 117 | Summary: org.apache.commons.lang3; StringUtils; false; join; (Object[],String,int,int); ; Argument[0].ArrayElement; ReturnValue; taint; manual |
-| 118 | Summary: org.apache.commons.lang3; StringUtils; false; join; (Object[],String,int,int); ; Argument[1]; ReturnValue; taint; manual |
-| 119 | Summary: org.apache.commons.lang3; StringUtils; false; join; (java.util.Iterator,char); ; Argument[0].Element; ReturnValue; taint; manual |
-| 120 | Summary: org.apache.commons.lang3; StringUtils; false; join; (java.util.Iterator,java.lang.String); ; Argument[0].Element; ReturnValue; taint; manual |
-| 121 | Summary: org.apache.commons.lang3; StringUtils; false; join; (java.util.Iterator,java.lang.String); ; Argument[1]; ReturnValue; taint; manual |
-| 122 | Summary: org.apache.commons.lang3; StringUtils; false; join; (java.util.List,char,int,int); ; Argument[0].Element; ReturnValue; taint; manual |
-| 123 | Summary: org.apache.commons.lang3; StringUtils; false; join; (java.util.List,java.lang.String,int,int); ; Argument[0].Element; ReturnValue; taint; manual |
-| 124 | Summary: org.apache.commons.lang3; StringUtils; false; join; (java.util.List,java.lang.String,int,int); ; Argument[1]; ReturnValue; taint; manual |
-| 125 | Summary: org.apache.commons.lang3; StringUtils; false; joinWith; ; ; Argument[0]; ReturnValue; taint; manual |
-| 126 | Summary: org.apache.commons.lang3; StringUtils; false; joinWith; ; ; Argument[1].ArrayElement; ReturnValue; taint; manual |
-| 127 | Summary: org.apache.commons.lang3; StringUtils; false; left; ; ; Argument[0]; ReturnValue; taint; manual |
-| 128 | Summary: org.apache.commons.lang3; StringUtils; false; leftPad; ; ; Argument[0]; ReturnValue; taint; manual |
-| 129 | Summary: org.apache.commons.lang3; StringUtils; false; leftPad; (java.lang.String,int,java.lang.String); ; Argument[2]; ReturnValue; taint; manual |
-| 130 | Summary: org.apache.commons.lang3; StringUtils; false; lowerCase; (java.lang.String); ; Argument[0]; ReturnValue; taint; manual |
-| 131 | Summary: org.apache.commons.lang3; StringUtils; false; lowerCase; (java.lang.String,java.util.Locale); ; Argument[0]; ReturnValue; taint; manual |
-| 132 | Summary: org.apache.commons.lang3; StringUtils; false; mid; ; ; Argument[0]; ReturnValue; taint; manual |
-| 133 | Summary: org.apache.commons.lang3; StringUtils; false; normalizeSpace; ; ; Argument[0]; ReturnValue; taint; manual |
-| 134 | Summary: org.apache.commons.lang3; StringUtils; false; overlay; ; ; Argument[0]; ReturnValue; taint; manual |
-| 135 | Summary: org.apache.commons.lang3; StringUtils; false; overlay; ; ; Argument[1]; ReturnValue; taint; manual |
-| 136 | Summary: org.apache.commons.lang3; StringUtils; false; prependIfMissing; ; ; Argument[0]; ReturnValue; taint; manual |
-| 137 | Summary: org.apache.commons.lang3; StringUtils; false; prependIfMissing; ; ; Argument[1]; ReturnValue; taint; manual |
-| 138 | Summary: org.apache.commons.lang3; StringUtils; false; prependIfMissingIgnoreCase; ; ; Argument[0]; ReturnValue; taint; manual |
-| 139 | Summary: org.apache.commons.lang3; StringUtils; false; prependIfMissingIgnoreCase; ; ; Argument[1]; ReturnValue; taint; manual |
-| 140 | Summary: org.apache.commons.lang3; StringUtils; false; remove; ; ; Argument[0]; ReturnValue; taint; manual |
-| 141 | Summary: org.apache.commons.lang3; StringUtils; false; removeAll; ; ; Argument[0]; ReturnValue; taint; manual |
-| 142 | Summary: org.apache.commons.lang3; StringUtils; false; removeEnd; ; ; Argument[0]; ReturnValue; taint; manual |
-| 143 | Summary: org.apache.commons.lang3; StringUtils; false; removeEndIgnoreCase; ; ; Argument[0]; ReturnValue; taint; manual |
-| 144 | Summary: org.apache.commons.lang3; StringUtils; false; removeFirst; ; ; Argument[0]; ReturnValue; taint; manual |
-| 145 | Summary: org.apache.commons.lang3; StringUtils; false; removeIgnoreCase; ; ; Argument[0]; ReturnValue; taint; manual |
-| 146 | Summary: org.apache.commons.lang3; StringUtils; false; removePattern; ; ; Argument[0]; ReturnValue; taint; manual |
-| 147 | Summary: org.apache.commons.lang3; StringUtils; false; removeStart; ; ; Argument[0]; ReturnValue; taint; manual |
-| 148 | Summary: org.apache.commons.lang3; StringUtils; false; removeStartIgnoreCase; ; ; Argument[0]; ReturnValue; taint; manual |
-| 149 | Summary: org.apache.commons.lang3; StringUtils; false; repeat; ; ; Argument[0]; ReturnValue; taint; manual |
-| 150 | Summary: org.apache.commons.lang3; StringUtils; false; repeat; (java.lang.String,java.lang.String,int); ; Argument[1]; ReturnValue; taint; manual |
-| 151 | Summary: org.apache.commons.lang3; StringUtils; false; replace; ; ; Argument[0]; ReturnValue; taint; manual |
-| 152 | Summary: org.apache.commons.lang3; StringUtils; false; replace; ; ; Argument[2]; ReturnValue; taint; manual |
-| 153 | Summary: org.apache.commons.lang3; StringUtils; false; replaceAll; ; ; Argument[0]; ReturnValue; taint; manual |
-| 154 | Summary: org.apache.commons.lang3; StringUtils; false; replaceAll; ; ; Argument[2]; ReturnValue; taint; manual |
-| 155 | Summary: org.apache.commons.lang3; StringUtils; false; replaceChars; ; ; Argument[0]; ReturnValue; taint; manual |
-| 156 | Summary: org.apache.commons.lang3; StringUtils; false; replaceChars; (java.lang.String,java.lang.String,java.lang.String); ; Argument[2]; ReturnValue; taint; manual |
-| 157 | Summary: org.apache.commons.lang3; StringUtils; false; replaceEach; ; ; Argument[0]; ReturnValue; taint; manual |
-| 158 | Summary: org.apache.commons.lang3; StringUtils; false; replaceEach; ; ; Argument[2].ArrayElement; ReturnValue; taint; manual |
-| 159 | Summary: org.apache.commons.lang3; StringUtils; false; replaceEachRepeatedly; ; ; Argument[0]; ReturnValue; taint; manual |
-| 160 | Summary: org.apache.commons.lang3; StringUtils; false; replaceEachRepeatedly; ; ; Argument[2].ArrayElement; ReturnValue; taint; manual |
-| 161 | Summary: org.apache.commons.lang3; StringUtils; false; replaceFirst; ; ; Argument[0]; ReturnValue; taint; manual |
-| 162 | Summary: org.apache.commons.lang3; StringUtils; false; replaceFirst; ; ; Argument[2]; ReturnValue; taint; manual |
-| 163 | Summary: org.apache.commons.lang3; StringUtils; false; replaceIgnoreCase; ; ; Argument[0]; ReturnValue; taint; manual |
-| 164 | Summary: org.apache.commons.lang3; StringUtils; false; replaceIgnoreCase; ; ; Argument[2]; ReturnValue; taint; manual |
-| 165 | Summary: org.apache.commons.lang3; StringUtils; false; replaceOnce; ; ; Argument[0]; ReturnValue; taint; manual |
-| 166 | Summary: org.apache.commons.lang3; StringUtils; false; replaceOnce; ; ; Argument[2]; ReturnValue; taint; manual |
-| 167 | Summary: org.apache.commons.lang3; StringUtils; false; replaceOnceIgnoreCase; ; ; Argument[0]; ReturnValue; taint; manual |
-| 168 | Summary: org.apache.commons.lang3; StringUtils; false; replaceOnceIgnoreCase; ; ; Argument[2]; ReturnValue; taint; manual |
-| 169 | Summary: org.apache.commons.lang3; StringUtils; false; replacePattern; ; ; Argument[0]; ReturnValue; taint; manual |
-| 170 | Summary: org.apache.commons.lang3; StringUtils; false; replacePattern; ; ; Argument[2]; ReturnValue; taint; manual |
-| 171 | Summary: org.apache.commons.lang3; StringUtils; false; reverse; ; ; Argument[0]; ReturnValue; taint; manual |
-| 172 | Summary: org.apache.commons.lang3; StringUtils; false; reverseDelimited; ; ; Argument[0]; ReturnValue; taint; manual |
-| 173 | Summary: org.apache.commons.lang3; StringUtils; false; right; ; ; Argument[0]; ReturnValue; taint; manual |
-| 174 | Summary: org.apache.commons.lang3; StringUtils; false; rightPad; ; ; Argument[0]; ReturnValue; taint; manual |
-| 175 | Summary: org.apache.commons.lang3; StringUtils; false; rightPad; (java.lang.String,int,java.lang.String); ; Argument[2]; ReturnValue; taint; manual |
-| 176 | Summary: org.apache.commons.lang3; StringUtils; false; rotate; ; ; Argument[0]; ReturnValue; taint; manual |
-| 177 | Summary: org.apache.commons.lang3; StringUtils; false; split; (java.lang.String); ; Argument[0]; ReturnValue; taint; manual |
-| 178 | Summary: org.apache.commons.lang3; StringUtils; false; split; (java.lang.String,char); ; Argument[0]; ReturnValue; taint; manual |
-| 179 | Summary: org.apache.commons.lang3; StringUtils; false; split; (java.lang.String,java.lang.String); ; Argument[0]; ReturnValue; taint; manual |
-| 180 | Summary: org.apache.commons.lang3; StringUtils; false; split; (java.lang.String,java.lang.String,int); ; Argument[0]; ReturnValue; taint; manual |
-| 181 | Summary: org.apache.commons.lang3; StringUtils; false; splitByCharacterType; ; ; Argument[0]; ReturnValue; taint; manual |
-| 182 | Summary: org.apache.commons.lang3; StringUtils; false; splitByCharacterTypeCamelCase; ; ; Argument[0]; ReturnValue; taint; manual |
-| 183 | Summary: org.apache.commons.lang3; StringUtils; false; splitByWholeSeparator; ; ; Argument[0]; ReturnValue; taint; manual |
-| 184 | Summary: org.apache.commons.lang3; StringUtils; false; splitByWholeSeparatorPreserveAllTokens; ; ; Argument[0]; ReturnValue; taint; manual |
-| 185 | Summary: org.apache.commons.lang3; StringUtils; false; splitPreserveAllTokens; (java.lang.String); ; Argument[0]; ReturnValue; taint; manual |
-| 186 | Summary: org.apache.commons.lang3; StringUtils; false; splitPreserveAllTokens; (java.lang.String,char); ; Argument[0]; ReturnValue; taint; manual |
-| 187 | Summary: org.apache.commons.lang3; StringUtils; false; splitPreserveAllTokens; (java.lang.String,java.lang.String); ; Argument[0]; ReturnValue; taint; manual |
-| 188 | Summary: org.apache.commons.lang3; StringUtils; false; splitPreserveAllTokens; (java.lang.String,java.lang.String,int); ; Argument[0]; ReturnValue; taint; manual |
-| 189 | Summary: org.apache.commons.lang3; StringUtils; false; strip; (java.lang.String); ; Argument[0]; ReturnValue; taint; manual |
-| 190 | Summary: org.apache.commons.lang3; StringUtils; false; strip; (java.lang.String,java.lang.String); ; Argument[0]; ReturnValue; taint; manual |
-| 191 | Summary: org.apache.commons.lang3; StringUtils; false; stripAccents; ; ; Argument[0]; ReturnValue; taint; manual |
-| 192 | Summary: org.apache.commons.lang3; StringUtils; false; stripAll; ; ; Argument[0].ArrayElement; ReturnValue.ArrayElement; taint; manual |
-| 193 | Summary: org.apache.commons.lang3; StringUtils; false; stripEnd; ; ; Argument[0]; ReturnValue; taint; manual |
-| 194 | Summary: org.apache.commons.lang3; StringUtils; false; stripStart; ; ; Argument[0]; ReturnValue; taint; manual |
-| 195 | Summary: org.apache.commons.lang3; StringUtils; false; stripToEmpty; ; ; Argument[0]; ReturnValue; taint; manual |
-| 196 | Summary: org.apache.commons.lang3; StringUtils; false; stripToNull; ; ; Argument[0]; ReturnValue; taint; manual |
-| 197 | Summary: org.apache.commons.lang3; StringUtils; false; substring; ; ; Argument[0]; ReturnValue; taint; manual |
-| 198 | Summary: org.apache.commons.lang3; StringUtils; false; substringAfter; ; ; Argument[0]; ReturnValue; taint; manual |
-| 199 | Summary: org.apache.commons.lang3; StringUtils; false; substringAfterLast; ; ; Argument[0]; ReturnValue; taint; manual |
-| 200 | Summary: org.apache.commons.lang3; StringUtils; false; substringBefore; ; ; Argument[0]; ReturnValue; taint; manual |
-| 201 | Summary: org.apache.commons.lang3; StringUtils; false; substringBeforeLast; ; ; Argument[0]; ReturnValue; taint; manual |
-| 202 | Summary: org.apache.commons.lang3; StringUtils; false; substringBetween; ; ; Argument[0]; ReturnValue; taint; manual |
-| 203 | Summary: org.apache.commons.lang3; StringUtils; false; substringsBetween; ; ; Argument[0]; ReturnValue; taint; manual |
-| 204 | Summary: org.apache.commons.lang3; StringUtils; false; swapCase; ; ; Argument[0]; ReturnValue; taint; manual |
-| 205 | Summary: org.apache.commons.lang3; StringUtils; false; toCodePoints; ; ; Argument[0]; ReturnValue; taint; manual |
-| 206 | Summary: org.apache.commons.lang3; StringUtils; false; toEncodedString; ; ; Argument[0]; ReturnValue; taint; manual |
-| 207 | Summary: org.apache.commons.lang3; StringUtils; false; toRootLowerCase; ; ; Argument[0]; ReturnValue; taint; manual |
-| 208 | Summary: org.apache.commons.lang3; StringUtils; false; toRootUpperCase; ; ; Argument[0]; ReturnValue; taint; manual |
-| 209 | Summary: org.apache.commons.lang3; StringUtils; false; toString; ; ; Argument[0]; ReturnValue; taint; manual |
-| 210 | Summary: org.apache.commons.lang3; StringUtils; false; trim; ; ; Argument[0]; ReturnValue; taint; manual |
-| 211 | Summary: org.apache.commons.lang3; StringUtils; false; trimToEmpty; ; ; Argument[0]; ReturnValue; taint; manual |
-| 212 | Summary: org.apache.commons.lang3; StringUtils; false; trimToNull; ; ; Argument[0]; ReturnValue; taint; manual |
-| 213 | Summary: org.apache.commons.lang3; StringUtils; false; truncate; ; ; Argument[0]; ReturnValue; taint; manual |
-| 214 | Summary: org.apache.commons.lang3; StringUtils; false; uncapitalize; ; ; Argument[0]; ReturnValue; taint; manual |
-| 215 | Summary: org.apache.commons.lang3; StringUtils; false; unwrap; ; ; Argument[0]; ReturnValue; taint; manual |
-| 216 | Summary: org.apache.commons.lang3; StringUtils; false; upperCase; (java.lang.String); ; Argument[0]; ReturnValue; taint; manual |
-| 217 | Summary: org.apache.commons.lang3; StringUtils; false; upperCase; (java.lang.String,java.util.Locale); ; Argument[0]; ReturnValue; taint; manual |
-| 218 | Summary: org.apache.commons.lang3; StringUtils; false; valueOf; ; ; Argument[0]; ReturnValue; taint; manual |
-| 219 | Summary: org.apache.commons.lang3; StringUtils; false; wrap; (java.lang.String,char); ; Argument[0]; ReturnValue; taint; manual |
-| 220 | Summary: org.apache.commons.lang3; StringUtils; false; wrap; (java.lang.String,java.lang.String); ; Argument[0..1]; ReturnValue; taint; manual |
-| 221 | Summary: org.apache.commons.lang3; StringUtils; false; wrapIfMissing; (java.lang.String,char); ; Argument[0]; ReturnValue; taint; manual |
-| 222 | Summary: org.apache.commons.lang3; StringUtils; false; wrapIfMissing; (java.lang.String,java.lang.String); ; Argument[0..1]; ReturnValue; taint; manual |
-| 223 | Summary: org.apache.commons.lang3.mutable; Mutable; true; getValue; ; ; Argument[this].SyntheticField[org.apache.commons.lang3.mutable.MutableObject.value]; ReturnValue; value; manual |
-| 224 | Summary: org.apache.commons.lang3.mutable; Mutable; true; setValue; ; ; Argument[0]; Argument[this].SyntheticField[org.apache.commons.lang3.mutable.MutableObject.value]; value; manual |
-| 225 | Summary: org.apache.commons.lang3.mutable; MutableObject; false; MutableObject; ; ; Argument[0]; Argument[this].SyntheticField[org.apache.commons.lang3.mutable.MutableObject.value]; value; manual |
-| 226 | Summary: org.apache.commons.lang3.text; StrBuilder; false; StrBuilder; (java.lang.String); ; Argument[0]; Argument[this]; taint; manual |
-| 227 | Summary: org.apache.commons.lang3.text; StrBuilder; false; append; ; ; Argument[this]; ReturnValue; value; manual |
-| 228 | Summary: org.apache.commons.lang3.text; StrBuilder; false; append; (char[]); ; Argument[0]; Argument[this]; taint; manual |
-| 229 | Summary: org.apache.commons.lang3.text; StrBuilder; false; append; (char[],int,int); ; Argument[0]; Argument[this]; taint; manual |
-| 230 | Summary: org.apache.commons.lang3.text; StrBuilder; false; append; (java.lang.CharSequence); ; Argument[0]; Argument[this]; taint; manual |
-| 231 | Summary: org.apache.commons.lang3.text; StrBuilder; false; append; (java.lang.CharSequence,int,int); ; Argument[0]; Argument[this]; taint; manual |
-| 232 | Summary: org.apache.commons.lang3.text; StrBuilder; false; append; (java.lang.Object); ; Argument[0]; Argument[this]; taint; manual |
-| 233 | Summary: org.apache.commons.lang3.text; StrBuilder; false; append; (java.lang.String); ; Argument[0]; Argument[this]; taint; manual |
-| 234 | Summary: org.apache.commons.lang3.text; StrBuilder; false; append; (java.lang.String,int,int); ; Argument[0]; Argument[this]; taint; manual |
-| 235 | Summary: org.apache.commons.lang3.text; StrBuilder; false; append; (java.lang.String,java.lang.Object[]); ; Argument[0]; Argument[this]; taint; manual |
-| 236 | Summary: org.apache.commons.lang3.text; StrBuilder; false; append; (java.lang.String,java.lang.Object[]); ; Argument[1].ArrayElement; Argument[this]; taint; manual |
-| 237 | Summary: org.apache.commons.lang3.text; StrBuilder; false; append; (java.lang.StringBuffer); ; Argument[0]; Argument[this]; taint; manual |
-| 238 | Summary: org.apache.commons.lang3.text; StrBuilder; false; append; (java.lang.StringBuffer,int,int); ; Argument[0]; Argument[this]; taint; manual |
-| 239 | Summary: org.apache.commons.lang3.text; StrBuilder; false; append; (java.lang.StringBuilder); ; Argument[0]; Argument[this]; taint; manual |
-| 240 | Summary: org.apache.commons.lang3.text; StrBuilder; false; append; (java.lang.StringBuilder,int,int); ; Argument[0]; Argument[this]; taint; manual |
-| 241 | Summary: org.apache.commons.lang3.text; StrBuilder; false; append; (java.nio.CharBuffer); ; Argument[0]; Argument[this]; taint; manual |
-| 242 | Summary: org.apache.commons.lang3.text; StrBuilder; false; append; (java.nio.CharBuffer,int,int); ; Argument[0]; Argument[this]; taint; manual |
-| 243 | Summary: org.apache.commons.lang3.text; StrBuilder; false; append; (org.apache.commons.lang3.text.StrBuilder); ; Argument[0]; Argument[this]; taint; manual |
-| 244 | Summary: org.apache.commons.lang3.text; StrBuilder; false; appendAll; ; ; Argument[this]; ReturnValue; value; manual |
-| 245 | Summary: org.apache.commons.lang3.text; StrBuilder; false; appendAll; (Iterable); ; Argument[0].Element; Argument[this]; taint; manual |
-| 246 | Summary: org.apache.commons.lang3.text; StrBuilder; false; appendAll; (Iterator); ; Argument[0].Element; Argument[this]; taint; manual |
-| 247 | Summary: org.apache.commons.lang3.text; StrBuilder; false; appendAll; (Object[]); ; Argument[0].ArrayElement; Argument[this]; taint; manual |
-| 248 | Summary: org.apache.commons.lang3.text; StrBuilder; false; appendFixedWidthPadLeft; ; ; Argument[this]; ReturnValue; value; manual |
-| 249 | Summary: org.apache.commons.lang3.text; StrBuilder; false; appendFixedWidthPadLeft; ; ; Argument[0]; Argument[this]; taint; manual |
-| 250 | Summary: org.apache.commons.lang3.text; StrBuilder; false; appendFixedWidthPadRight; ; ; Argument[this]; ReturnValue; value; manual |
-| 251 | Summary: org.apache.commons.lang3.text; StrBuilder; false; appendFixedWidthPadRight; ; ; Argument[0]; Argument[this]; taint; manual |
-| 252 | Summary: org.apache.commons.lang3.text; StrBuilder; false; appendNewLine; ; ; Argument[this]; ReturnValue; value; manual |
-| 253 | Summary: org.apache.commons.lang3.text; StrBuilder; false; appendNull; ; ; Argument[this]; ReturnValue; value; manual |
-| 254 | Summary: org.apache.commons.lang3.text; StrBuilder; false; appendPadding; ; ; Argument[this]; ReturnValue; value; manual |
-| 255 | Summary: org.apache.commons.lang3.text; StrBuilder; false; appendSeparator; ; ; Argument[this]; ReturnValue; value; manual |
-| 256 | Summary: org.apache.commons.lang3.text; StrBuilder; false; appendSeparator; (java.lang.String); ; Argument[0]; Argument[this]; taint; manual |
-| 257 | Summary: org.apache.commons.lang3.text; StrBuilder; false; appendSeparator; (java.lang.String,int); ; Argument[0]; Argument[this]; taint; manual |
-| 258 | Summary: org.apache.commons.lang3.text; StrBuilder; false; appendSeparator; (java.lang.String,java.lang.String); ; Argument[0..1]; Argument[this]; taint; manual |
-| 259 | Summary: org.apache.commons.lang3.text; StrBuilder; false; appendTo; ; ; Argument[this]; Argument[0]; taint; manual |
-| 260 | Summary: org.apache.commons.lang3.text; StrBuilder; false; appendWithSeparators; ; ; Argument[this]; ReturnValue; value; manual |
-| 261 | Summary: org.apache.commons.lang3.text; StrBuilder; false; appendWithSeparators; ; ; Argument[1]; Argument[this]; taint; manual |
-| 262 | Summary: org.apache.commons.lang3.text; StrBuilder; false; appendWithSeparators; (Iterable,String); ; Argument[0].Element; Argument[this]; taint; manual |
-| 263 | Summary: org.apache.commons.lang3.text; StrBuilder; false; appendWithSeparators; (Iterator,String); ; Argument[0].Element; Argument[this]; taint; manual |
-| 264 | Summary: org.apache.commons.lang3.text; StrBuilder; false; appendWithSeparators; (Object[],String); ; Argument[0].ArrayElement; Argument[this]; taint; manual |
-| 265 | Summary: org.apache.commons.lang3.text; StrBuilder; false; appendln; ; ; Argument[this]; ReturnValue; value; manual |
-| 266 | Summary: org.apache.commons.lang3.text; StrBuilder; false; appendln; (char[]); ; Argument[0]; Argument[this]; taint; manual |
-| 267 | Summary: org.apache.commons.lang3.text; StrBuilder; false; appendln; (char[],int,int); ; Argument[0]; Argument[this]; taint; manual |
-| 268 | Summary: org.apache.commons.lang3.text; StrBuilder; false; appendln; (java.lang.Object); ; Argument[0]; Argument[this]; taint; manual |
-| 269 | Summary: org.apache.commons.lang3.text; StrBuilder; false; appendln; (java.lang.String); ; Argument[0]; Argument[this]; taint; manual |
-| 270 | Summary: org.apache.commons.lang3.text; StrBuilder; false; appendln; (java.lang.String,int,int); ; Argument[0]; Argument[this]; taint; manual |
-| 271 | Summary: org.apache.commons.lang3.text; StrBuilder; false; appendln; (java.lang.String,java.lang.Object[]); ; Argument[0]; Argument[this]; taint; manual |
-| 272 | Summary: org.apache.commons.lang3.text; StrBuilder; false; appendln; (java.lang.String,java.lang.Object[]); ; Argument[1].ArrayElement; Argument[this]; taint; manual |
-| 273 | Summary: org.apache.commons.lang3.text; StrBuilder; false; appendln; (java.lang.StringBuffer); ; Argument[0]; Argument[this]; taint; manual |
-| 274 | Summary: org.apache.commons.lang3.text; StrBuilder; false; appendln; (java.lang.StringBuffer,int,int); ; Argument[0]; Argument[this]; taint; manual |
-| 275 | Summary: org.apache.commons.lang3.text; StrBuilder; false; appendln; (java.lang.StringBuilder); ; Argument[0]; Argument[this]; taint; manual |
-| 276 | Summary: org.apache.commons.lang3.text; StrBuilder; false; appendln; (java.lang.StringBuilder,int,int); ; Argument[0]; Argument[this]; taint; manual |
-| 277 | Summary: org.apache.commons.lang3.text; StrBuilder; false; appendln; (org.apache.commons.lang3.text.StrBuilder); ; Argument[0]; Argument[this]; taint; manual |
-| 278 | Summary: org.apache.commons.lang3.text; StrBuilder; false; asReader; ; ; Argument[this]; ReturnValue; taint; manual |
-| 279 | Summary: org.apache.commons.lang3.text; StrBuilder; false; asTokenizer; ; ; Argument[this]; ReturnValue; taint; manual |
-| 280 | Summary: org.apache.commons.lang3.text; StrBuilder; false; build; ; ; Argument[this]; ReturnValue; taint; manual |
-| 281 | Summary: org.apache.commons.lang3.text; StrBuilder; false; delete; ; ; Argument[this]; ReturnValue; value; manual |
-| 282 | Summary: org.apache.commons.lang3.text; StrBuilder; false; deleteAll; ; ; Argument[this]; ReturnValue; value; manual |
-| 283 | Summary: org.apache.commons.lang3.text; StrBuilder; false; deleteCharAt; ; ; Argument[this]; ReturnValue; value; manual |
-| 284 | Summary: org.apache.commons.lang3.text; StrBuilder; false; deleteFirst; ; ; Argument[this]; ReturnValue; value; manual |
-| 285 | Summary: org.apache.commons.lang3.text; StrBuilder; false; ensureCapacity; ; ; Argument[this]; ReturnValue; value; manual |
-| 286 | Summary: org.apache.commons.lang3.text; StrBuilder; false; getChars; (char[]); ; Argument[this]; Argument[0]; taint; manual |
-| 287 | Summary: org.apache.commons.lang3.text; StrBuilder; false; getChars; (char[]); ; Argument[this]; ReturnValue; taint; manual |
-| 288 | Summary: org.apache.commons.lang3.text; StrBuilder; false; getChars; (int,int,char[],int); ; Argument[this]; Argument[2]; taint; manual |
-| 289 | Summary: org.apache.commons.lang3.text; StrBuilder; false; insert; ; ; Argument[this]; ReturnValue; value; manual |
-| 290 | Summary: org.apache.commons.lang3.text; StrBuilder; false; insert; ; ; Argument[1]; Argument[this]; taint; manual |
-| 291 | Summary: org.apache.commons.lang3.text; StrBuilder; false; leftString; ; ; Argument[this]; ReturnValue; taint; manual |
-| 292 | Summary: org.apache.commons.lang3.text; StrBuilder; false; midString; ; ; Argument[this]; ReturnValue; taint; manual |
-| 293 | Summary: org.apache.commons.lang3.text; StrBuilder; false; minimizeCapacity; ; ; Argument[this]; ReturnValue; value; manual |
-| 294 | Summary: org.apache.commons.lang3.text; StrBuilder; false; readFrom; ; ; Argument[0]; Argument[this]; taint; manual |
-| 295 | Summary: org.apache.commons.lang3.text; StrBuilder; false; replace; ; ; Argument[this]; ReturnValue; value; manual |
-| 296 | Summary: org.apache.commons.lang3.text; StrBuilder; false; replace; (int,int,java.lang.String); ; Argument[2]; Argument[this]; taint; manual |
-| 297 | Summary: org.apache.commons.lang3.text; StrBuilder; false; replace; (org.apache.commons.lang3.text.StrMatcher,java.lang.String,int,int,int); ; Argument[1]; Argument[this]; taint; manual |
-| 298 | Summary: org.apache.commons.lang3.text; StrBuilder; false; replaceAll; ; ; Argument[this]; ReturnValue; value; manual |
-| 299 | Summary: org.apache.commons.lang3.text; StrBuilder; false; replaceAll; ; ; Argument[1]; Argument[this]; taint; manual |
-| 300 | Summary: org.apache.commons.lang3.text; StrBuilder; false; replaceFirst; ; ; Argument[this]; ReturnValue; value; manual |
-| 301 | Summary: org.apache.commons.lang3.text; StrBuilder; false; replaceFirst; ; ; Argument[1]; Argument[this]; taint; manual |
-| 302 | Summary: org.apache.commons.lang3.text; StrBuilder; false; reverse; ; ; Argument[this]; ReturnValue; value; manual |
-| 303 | Summary: org.apache.commons.lang3.text; StrBuilder; false; rightString; ; ; Argument[this]; ReturnValue; taint; manual |
-| 304 | Summary: org.apache.commons.lang3.text; StrBuilder; false; setCharAt; ; ; Argument[this]; ReturnValue; value; manual |
-| 305 | Summary: org.apache.commons.lang3.text; StrBuilder; false; setLength; ; ; Argument[this]; ReturnValue; value; manual |
-| 306 | Summary: org.apache.commons.lang3.text; StrBuilder; false; setNewLineText; ; ; Argument[this]; ReturnValue; value; manual |
-| 307 | Summary: org.apache.commons.lang3.text; StrBuilder; false; setNullText; ; ; Argument[this]; ReturnValue; value; manual |
-| 308 | Summary: org.apache.commons.lang3.text; StrBuilder; false; subSequence; ; ; Argument[this]; ReturnValue; taint; manual |
-| 309 | Summary: org.apache.commons.lang3.text; StrBuilder; false; substring; ; ; Argument[this]; ReturnValue; taint; manual |
-| 310 | Summary: org.apache.commons.lang3.text; StrBuilder; false; toCharArray; ; ; Argument[this]; ReturnValue; taint; manual |
-| 311 | Summary: org.apache.commons.lang3.text; StrBuilder; false; toString; ; ; Argument[this]; ReturnValue; taint; manual |
-| 312 | Summary: org.apache.commons.lang3.text; StrBuilder; false; toStringBuffer; ; ; Argument[this]; ReturnValue; taint; manual |
-| 313 | Summary: org.apache.commons.lang3.text; StrBuilder; false; toStringBuilder; ; ; Argument[this]; ReturnValue; taint; manual |
-| 314 | Summary: org.apache.commons.lang3.text; StrBuilder; false; trim; ; ; Argument[this]; ReturnValue; value; manual |
-| 315 | Summary: org.apache.commons.lang3.text; StrLookup; false; lookup; ; ; Argument[this]; ReturnValue; taint; manual |
-| 316 | Summary: org.apache.commons.lang3.text; StrLookup; false; mapLookup; ; ; Argument[0].MapValue; ReturnValue; taint; manual |
-| 317 | Summary: org.apache.commons.lang3.text; StrSubstitutor; false; StrSubstitutor; ; ; Argument[0]; Argument[this]; taint; manual |
-| 318 | Summary: org.apache.commons.lang3.text; StrSubstitutor; false; StrSubstitutor; ; ; Argument[0].MapValue; Argument[this]; taint; manual |
-| 319 | Summary: org.apache.commons.lang3.text; StrSubstitutor; false; replace; ; ; Argument[this]; ReturnValue; taint; manual |
-| 320 | Summary: org.apache.commons.lang3.text; StrSubstitutor; false; replace; (char[]); ; Argument[0]; ReturnValue; taint; manual |
-| 321 | Summary: org.apache.commons.lang3.text; StrSubstitutor; false; replace; (char[],int,int); ; Argument[0]; ReturnValue; taint; manual |
-| 322 | Summary: org.apache.commons.lang3.text; StrSubstitutor; false; replace; (java.lang.CharSequence); ; Argument[0]; ReturnValue; taint; manual |
-| 323 | Summary: org.apache.commons.lang3.text; StrSubstitutor; false; replace; (java.lang.CharSequence,int,int); ; Argument[0]; ReturnValue; taint; manual |
-| 324 | Summary: org.apache.commons.lang3.text; StrSubstitutor; false; replace; (java.lang.Object); ; Argument[0]; ReturnValue; taint; manual |
-| 325 | Summary: org.apache.commons.lang3.text; StrSubstitutor; false; replace; (java.lang.Object,java.util.Map); ; Argument[0]; ReturnValue; taint; manual |
-| 326 | Summary: org.apache.commons.lang3.text; StrSubstitutor; false; replace; (java.lang.Object,java.util.Map); ; Argument[1].MapValue; ReturnValue; taint; manual |
-| 327 | Summary: org.apache.commons.lang3.text; StrSubstitutor; false; replace; (java.lang.Object,java.util.Map,java.lang.String,java.lang.String); ; Argument[0]; ReturnValue; taint; manual |
-| 328 | Summary: org.apache.commons.lang3.text; StrSubstitutor; false; replace; (java.lang.Object,java.util.Map,java.lang.String,java.lang.String); ; Argument[1].MapValue; ReturnValue; taint; manual |
-| 329 | Summary: org.apache.commons.lang3.text; StrSubstitutor; false; replace; (java.lang.Object,java.util.Properties); ; Argument[0]; ReturnValue; taint; manual |
-| 330 | Summary: org.apache.commons.lang3.text; StrSubstitutor; false; replace; (java.lang.Object,java.util.Properties); ; Argument[1].MapValue; ReturnValue; taint; manual |
-| 331 | Summary: org.apache.commons.lang3.text; StrSubstitutor; false; replace; (java.lang.String); ; Argument[0]; ReturnValue; taint; manual |
-| 332 | Summary: org.apache.commons.lang3.text; StrSubstitutor; false; replace; (java.lang.String,int,int); ; Argument[0]; ReturnValue; taint; manual |
-| 333 | Summary: org.apache.commons.lang3.text; StrSubstitutor; false; replace; (java.lang.StringBuffer); ; Argument[0]; ReturnValue; taint; manual |
-| 334 | Summary: org.apache.commons.lang3.text; StrSubstitutor; false; replace; (java.lang.StringBuffer,int,int); ; Argument[0]; ReturnValue; taint; manual |
-| 335 | Summary: org.apache.commons.lang3.text; StrSubstitutor; false; replace; (org.apache.commons.lang3.text.StrBuilder); ; Argument[0]; ReturnValue; taint; manual |
-| 336 | Summary: org.apache.commons.lang3.text; StrSubstitutor; false; replace; (org.apache.commons.lang3.text.StrBuilder,int,int); ; Argument[0]; ReturnValue; taint; manual |
-| 337 | Summary: org.apache.commons.lang3.text; StrSubstitutor; false; replaceIn; (java.lang.StringBuffer); ; Argument[this]; Argument[0]; taint; manual |
-| 338 | Summary: org.apache.commons.lang3.text; StrSubstitutor; false; replaceIn; (java.lang.StringBuffer,int,int); ; Argument[this]; Argument[0]; taint; manual |
-| 339 | Summary: org.apache.commons.lang3.text; StrSubstitutor; false; replaceIn; (java.lang.StringBuilder); ; Argument[this]; Argument[0]; taint; manual |
-| 340 | Summary: org.apache.commons.lang3.text; StrSubstitutor; false; replaceIn; (java.lang.StringBuilder,int,int); ; Argument[this]; Argument[0]; taint; manual |
-| 341 | Summary: org.apache.commons.lang3.text; StrSubstitutor; false; replaceIn; (org.apache.commons.lang3.text.StrBuilder); ; Argument[this]; Argument[0]; taint; manual |
-| 342 | Summary: org.apache.commons.lang3.text; StrSubstitutor; false; replaceIn; (org.apache.commons.lang3.text.StrBuilder,int,int); ; Argument[this]; Argument[0]; taint; manual |
-| 343 | Summary: org.apache.commons.lang3.text; StrSubstitutor; false; setVariableResolver; ; ; Argument[0]; Argument[this]; taint; manual |
-| 344 | Summary: org.apache.commons.lang3.text; StrTokenizer; false; StrTokenizer; ; ; Argument[0]; Argument[this]; taint; manual |
-| 345 | Summary: org.apache.commons.lang3.text; StrTokenizer; false; clone; ; ; Argument[this]; ReturnValue; taint; manual |
-| 346 | Summary: org.apache.commons.lang3.text; StrTokenizer; false; getCSVInstance; ; ; Argument[0]; ReturnValue; taint; manual |
-| 347 | Summary: org.apache.commons.lang3.text; StrTokenizer; false; getContent; ; ; Argument[this]; ReturnValue; taint; manual |
-| 348 | Summary: org.apache.commons.lang3.text; StrTokenizer; false; getTSVInstance; ; ; Argument[0]; ReturnValue; taint; manual |
-| 349 | Summary: org.apache.commons.lang3.text; StrTokenizer; false; getTokenArray; ; ; Argument[this]; ReturnValue; taint; manual |
-| 350 | Summary: org.apache.commons.lang3.text; StrTokenizer; false; getTokenList; ; ; Argument[this]; ReturnValue; taint; manual |
-| 351 | Summary: org.apache.commons.lang3.text; StrTokenizer; false; next; ; ; Argument[this]; ReturnValue; taint; manual |
-| 352 | Summary: org.apache.commons.lang3.text; StrTokenizer; false; nextToken; ; ; Argument[this]; ReturnValue; taint; manual |
-| 353 | Summary: org.apache.commons.lang3.text; StrTokenizer; false; previous; ; ; Argument[this]; ReturnValue; taint; manual |
-| 354 | Summary: org.apache.commons.lang3.text; StrTokenizer; false; previousToken; ; ; Argument[this]; ReturnValue; taint; manual |
-| 355 | Summary: org.apache.commons.lang3.text; StrTokenizer; false; reset; ; ; Argument[0]; ReturnValue; taint; manual |
-| 356 | Summary: org.apache.commons.lang3.text; StrTokenizer; false; toString; ; ; Argument[this]; ReturnValue; taint; manual |
-| 357 | Summary: org.apache.commons.lang3.text; WordUtils; false; capitalize; (java.lang.String); ; Argument[0]; ReturnValue; taint; manual |
-| 358 | Summary: org.apache.commons.lang3.text; WordUtils; false; capitalize; (java.lang.String,char[]); ; Argument[0]; ReturnValue; taint; manual |
-| 359 | Summary: org.apache.commons.lang3.text; WordUtils; false; capitalizeFully; (java.lang.String); ; Argument[0]; ReturnValue; taint; manual |
-| 360 | Summary: org.apache.commons.lang3.text; WordUtils; false; capitalizeFully; (java.lang.String,char[]); ; Argument[0]; ReturnValue; taint; manual |
-| 361 | Summary: org.apache.commons.lang3.text; WordUtils; false; initials; (java.lang.String); ; Argument[0]; ReturnValue; taint; manual |
-| 362 | Summary: org.apache.commons.lang3.text; WordUtils; false; initials; (java.lang.String,char[]); ; Argument[0]; ReturnValue; taint; manual |
-| 363 | Summary: org.apache.commons.lang3.text; WordUtils; false; swapCase; ; ; Argument[0]; ReturnValue; taint; manual |
-| 364 | Summary: org.apache.commons.lang3.text; WordUtils; false; uncapitalize; (java.lang.String); ; Argument[0]; ReturnValue; taint; manual |
-| 365 | Summary: org.apache.commons.lang3.text; WordUtils; false; uncapitalize; (java.lang.String,char[]); ; Argument[0]; ReturnValue; taint; manual |
-| 366 | Summary: org.apache.commons.lang3.text; WordUtils; false; wrap; ; ; Argument[0]; ReturnValue; taint; manual |
-| 367 | Summary: org.apache.commons.lang3.text; WordUtils; false; wrap; (java.lang.String,int,java.lang.String,boolean); ; Argument[2]; ReturnValue; taint; manual |
-| 368 | Summary: org.apache.commons.lang3.text; WordUtils; false; wrap; (java.lang.String,int,java.lang.String,boolean,java.lang.String); ; Argument[2]; ReturnValue; taint; manual |
-| 369 | Summary: org.apache.commons.lang3.tuple; ImmutablePair; false; ImmutablePair; (java.lang.Object,java.lang.Object); ; Argument[0]; Argument[this].Field[org.apache.commons.lang3.tuple.ImmutablePair.left]; value; manual |
-| 370 | Summary: org.apache.commons.lang3.tuple; ImmutablePair; false; ImmutablePair; (java.lang.Object,java.lang.Object); ; Argument[1]; Argument[this].Field[org.apache.commons.lang3.tuple.ImmutablePair.right]; value; manual |
-| 371 | Summary: org.apache.commons.lang3.tuple; ImmutablePair; false; left; ; ; Argument[0]; ReturnValue.Field[org.apache.commons.lang3.tuple.ImmutablePair.left]; value; manual |
-| 372 | Summary: org.apache.commons.lang3.tuple; ImmutablePair; false; of; (java.lang.Object,java.lang.Object); ; Argument[0]; ReturnValue.Field[org.apache.commons.lang3.tuple.ImmutablePair.left]; value; manual |
-| 373 | Summary: org.apache.commons.lang3.tuple; ImmutablePair; false; of; (java.lang.Object,java.lang.Object); ; Argument[1]; ReturnValue.Field[org.apache.commons.lang3.tuple.ImmutablePair.right]; value; manual |
-| 374 | Summary: org.apache.commons.lang3.tuple; ImmutablePair; false; right; ; ; Argument[0]; ReturnValue.Field[org.apache.commons.lang3.tuple.ImmutablePair.right]; value; manual |
-| 375 | Summary: org.apache.commons.lang3.tuple; ImmutableTriple; false; ImmutableTriple; (java.lang.Object,java.lang.Object,java.lang.Object); ; Argument[0]; Argument[this].Field[org.apache.commons.lang3.tuple.ImmutableTriple.left]; value; manual |
-| 376 | Summary: org.apache.commons.lang3.tuple; ImmutableTriple; false; ImmutableTriple; (java.lang.Object,java.lang.Object,java.lang.Object); ; Argument[1]; Argument[this].Field[org.apache.commons.lang3.tuple.ImmutableTriple.middle]; value; manual |
-| 377 | Summary: org.apache.commons.lang3.tuple; ImmutableTriple; false; ImmutableTriple; (java.lang.Object,java.lang.Object,java.lang.Object); ; Argument[2]; Argument[this].Field[org.apache.commons.lang3.tuple.ImmutableTriple.right]; value; manual |
-| 378 | Summary: org.apache.commons.lang3.tuple; ImmutableTriple; false; of; (java.lang.Object,java.lang.Object,java.lang.Object); ; Argument[0]; ReturnValue.Field[org.apache.commons.lang3.tuple.ImmutableTriple.left]; value; manual |
-| 379 | Summary: org.apache.commons.lang3.tuple; ImmutableTriple; false; of; (java.lang.Object,java.lang.Object,java.lang.Object); ; Argument[1]; ReturnValue.Field[org.apache.commons.lang3.tuple.ImmutableTriple.middle]; value; manual |
-| 380 | Summary: org.apache.commons.lang3.tuple; ImmutableTriple; false; of; (java.lang.Object,java.lang.Object,java.lang.Object); ; Argument[2]; ReturnValue.Field[org.apache.commons.lang3.tuple.ImmutableTriple.right]; value; manual |
-| 381 | Summary: org.apache.commons.lang3.tuple; MutablePair; false; MutablePair; (java.lang.Object,java.lang.Object); ; Argument[0]; Argument[this].Field[org.apache.commons.lang3.tuple.MutablePair.left]; value; manual |
-| 382 | Summary: org.apache.commons.lang3.tuple; MutablePair; false; MutablePair; (java.lang.Object,java.lang.Object); ; Argument[1]; Argument[this].Field[org.apache.commons.lang3.tuple.MutablePair.right]; value; manual |
-| 383 | Summary: org.apache.commons.lang3.tuple; MutablePair; false; of; (java.lang.Object,java.lang.Object); ; Argument[0]; ReturnValue.Field[org.apache.commons.lang3.tuple.MutablePair.left]; value; manual |
-| 384 | Summary: org.apache.commons.lang3.tuple; MutablePair; false; of; (java.lang.Object,java.lang.Object); ; Argument[1]; ReturnValue.Field[org.apache.commons.lang3.tuple.MutablePair.right]; value; manual |
-| 385 | Summary: org.apache.commons.lang3.tuple; MutablePair; false; setLeft; ; ; Argument[0]; Argument[this].Field[org.apache.commons.lang3.tuple.MutablePair.left]; value; manual |
-| 386 | Summary: org.apache.commons.lang3.tuple; MutablePair; false; setRight; ; ; Argument[0]; Argument[this].Field[org.apache.commons.lang3.tuple.MutablePair.right]; value; manual |
-| 387 | Summary: org.apache.commons.lang3.tuple; MutablePair; false; setValue; ; ; Argument[0]; Argument[this].Field[org.apache.commons.lang3.tuple.MutablePair.right]; value; manual |
-| 388 | Summary: org.apache.commons.lang3.tuple; MutableTriple; false; MutableTriple; (java.lang.Object,java.lang.Object,java.lang.Object); ; Argument[0]; Argument[this].Field[org.apache.commons.lang3.tuple.MutableTriple.left]; value; manual |
-| 389 | Summary: org.apache.commons.lang3.tuple; MutableTriple; false; MutableTriple; (java.lang.Object,java.lang.Object,java.lang.Object); ; Argument[1]; Argument[this].Field[org.apache.commons.lang3.tuple.MutableTriple.middle]; value; manual |
-| 390 | Summary: org.apache.commons.lang3.tuple; MutableTriple; false; MutableTriple; (java.lang.Object,java.lang.Object,java.lang.Object); ; Argument[2]; Argument[this].Field[org.apache.commons.lang3.tuple.MutableTriple.right]; value; manual |
-| 391 | Summary: org.apache.commons.lang3.tuple; MutableTriple; false; of; (java.lang.Object,java.lang.Object,java.lang.Object); ; Argument[0]; ReturnValue.Field[org.apache.commons.lang3.tuple.MutableTriple.left]; value; manual |
-| 392 | Summary: org.apache.commons.lang3.tuple; MutableTriple; false; of; (java.lang.Object,java.lang.Object,java.lang.Object); ; Argument[1]; ReturnValue.Field[org.apache.commons.lang3.tuple.MutableTriple.middle]; value; manual |
-| 393 | Summary: org.apache.commons.lang3.tuple; MutableTriple; false; of; (java.lang.Object,java.lang.Object,java.lang.Object); ; Argument[2]; ReturnValue.Field[org.apache.commons.lang3.tuple.MutableTriple.right]; value; manual |
-| 394 | Summary: org.apache.commons.lang3.tuple; MutableTriple; false; setLeft; ; ; Argument[0]; Argument[this].Field[org.apache.commons.lang3.tuple.MutableTriple.left]; value; manual |
-| 395 | Summary: org.apache.commons.lang3.tuple; MutableTriple; false; setMiddle; ; ; Argument[0]; Argument[this].Field[org.apache.commons.lang3.tuple.MutableTriple.middle]; value; manual |
-| 396 | Summary: org.apache.commons.lang3.tuple; MutableTriple; false; setRight; ; ; Argument[0]; Argument[this].Field[org.apache.commons.lang3.tuple.MutableTriple.right]; value; manual |
-| 397 | Summary: org.apache.commons.lang3.tuple; Pair; true; getKey; ; ; Argument[this].Field[org.apache.commons.lang3.tuple.ImmutablePair.left]; ReturnValue; value; manual |
-| 398 | Summary: org.apache.commons.lang3.tuple; Pair; true; getKey; ; ; Argument[this].Field[org.apache.commons.lang3.tuple.MutablePair.left]; ReturnValue; value; manual |
-| 399 | Summary: org.apache.commons.lang3.tuple; Pair; true; getLeft; ; ; Argument[this].Field[org.apache.commons.lang3.tuple.ImmutablePair.left]; ReturnValue; value; manual |
-| 400 | Summary: org.apache.commons.lang3.tuple; Pair; true; getLeft; ; ; Argument[this].Field[org.apache.commons.lang3.tuple.MutablePair.left]; ReturnValue; value; manual |
-| 401 | Summary: org.apache.commons.lang3.tuple; Pair; true; getRight; ; ; Argument[this].Field[org.apache.commons.lang3.tuple.ImmutablePair.right]; ReturnValue; value; manual |
-| 402 | Summary: org.apache.commons.lang3.tuple; Pair; true; getRight; ; ; Argument[this].Field[org.apache.commons.lang3.tuple.MutablePair.right]; ReturnValue; value; manual |
-| 403 | Summary: org.apache.commons.lang3.tuple; Pair; true; getValue; ; ; Argument[this].Field[org.apache.commons.lang3.tuple.ImmutablePair.right]; ReturnValue; value; manual |
-| 404 | Summary: org.apache.commons.lang3.tuple; Pair; true; getValue; ; ; Argument[this].Field[org.apache.commons.lang3.tuple.MutablePair.right]; ReturnValue; value; manual |
-| 405 | Summary: org.apache.commons.lang3.tuple; Pair; false; of; (java.lang.Object,java.lang.Object); ; Argument[0]; ReturnValue.Field[org.apache.commons.lang3.tuple.ImmutablePair.left]; value; manual |
-| 406 | Summary: org.apache.commons.lang3.tuple; Pair; false; of; (java.lang.Object,java.lang.Object); ; Argument[1]; ReturnValue.Field[org.apache.commons.lang3.tuple.ImmutablePair.right]; value; manual |
-| 407 | Summary: org.apache.commons.lang3.tuple; Triple; true; getLeft; ; ; Argument[this].Field[org.apache.commons.lang3.tuple.ImmutableTriple.left]; ReturnValue; value; manual |
-| 408 | Summary: org.apache.commons.lang3.tuple; Triple; true; getLeft; ; ; Argument[this].Field[org.apache.commons.lang3.tuple.MutableTriple.left]; ReturnValue; value; manual |
-| 409 | Summary: org.apache.commons.lang3.tuple; Triple; true; getMiddle; ; ; Argument[this].Field[org.apache.commons.lang3.tuple.ImmutableTriple.middle]; ReturnValue; value; manual |
-| 410 | Summary: org.apache.commons.lang3.tuple; Triple; true; getMiddle; ; ; Argument[this].Field[org.apache.commons.lang3.tuple.MutableTriple.middle]; ReturnValue; value; manual |
-| 411 | Summary: org.apache.commons.lang3.tuple; Triple; true; getRight; ; ; Argument[this].Field[org.apache.commons.lang3.tuple.ImmutableTriple.right]; ReturnValue; value; manual |
-| 412 | Summary: org.apache.commons.lang3.tuple; Triple; true; getRight; ; ; Argument[this].Field[org.apache.commons.lang3.tuple.MutableTriple.right]; ReturnValue; value; manual |
-| 413 | Summary: org.apache.commons.lang3.tuple; Triple; false; of; (java.lang.Object,java.lang.Object,java.lang.Object); ; Argument[0]; ReturnValue.Field[org.apache.commons.lang3.tuple.ImmutableTriple.left]; value; manual |
-| 414 | Summary: org.apache.commons.lang3.tuple; Triple; false; of; (java.lang.Object,java.lang.Object,java.lang.Object); ; Argument[1]; ReturnValue.Field[org.apache.commons.lang3.tuple.ImmutableTriple.middle]; value; manual |
-| 415 | Summary: org.apache.commons.lang3.tuple; Triple; false; of; (java.lang.Object,java.lang.Object,java.lang.Object); ; Argument[2]; ReturnValue.Field[org.apache.commons.lang3.tuple.ImmutableTriple.right]; value; manual |
+| 31 | Summary: org.apache.commons.lang3.mutable; Mutable; true; getValue; ; ; Argument[this].SyntheticField[org.apache.commons.lang3.mutable.MutableObject.value]; ReturnValue; value; manual |
+| 32 | Summary: org.apache.commons.lang3.mutable; Mutable; true; setValue; ; ; Argument[0]; Argument[this].SyntheticField[org.apache.commons.lang3.mutable.MutableObject.value]; value; manual |
+| 33 | Summary: org.apache.commons.lang3.mutable; MutableObject; false; MutableObject; ; ; Argument[0]; Argument[this].SyntheticField[org.apache.commons.lang3.mutable.MutableObject.value]; value; manual |
+| 34 | Summary: org.apache.commons.lang3.text; StrBuilder; false; StrBuilder; (java.lang.String); ; Argument[0]; Argument[this]; taint; manual |
+| 35 | Summary: org.apache.commons.lang3.text; StrBuilder; false; append; (char[]); ; Argument[0]; Argument[this]; taint; manual |
+| 36 | Summary: org.apache.commons.lang3.text; StrBuilder; false; append; (char[],int,int); ; Argument[0]; Argument[this]; taint; manual |
+| 37 | Summary: org.apache.commons.lang3.text; StrBuilder; false; append; (java.lang.CharSequence); ; Argument[0]; Argument[this]; taint; manual |
+| 38 | Summary: org.apache.commons.lang3.text; StrBuilder; false; append; (java.lang.CharSequence,int,int); ; Argument[0]; Argument[this]; taint; manual |
+| 39 | Summary: org.apache.commons.lang3.text; StrBuilder; false; append; (java.lang.Object); ; Argument[0]; Argument[this]; taint; manual |
+| 40 | Summary: org.apache.commons.lang3.text; StrBuilder; false; append; (java.lang.String); ; Argument[0]; Argument[this]; taint; manual |
+| 41 | Summary: org.apache.commons.lang3.text; StrBuilder; false; append; (java.lang.String,int,int); ; Argument[0]; Argument[this]; taint; manual |
+| 42 | Summary: org.apache.commons.lang3.text; StrBuilder; false; append; (java.lang.String,java.lang.Object[]); ; Argument[0]; Argument[this]; taint; manual |
+| 43 | Summary: org.apache.commons.lang3.text; StrBuilder; false; append; (java.lang.String,java.lang.Object[]); ; Argument[1].ArrayElement; Argument[this]; taint; manual |
+| 44 | Summary: org.apache.commons.lang3.text; StrBuilder; false; append; (java.lang.StringBuffer); ; Argument[0]; Argument[this]; taint; manual |
+| 45 | Summary: org.apache.commons.lang3.text; StrBuilder; false; append; (java.lang.StringBuffer,int,int); ; Argument[0]; Argument[this]; taint; manual |
+| 46 | Summary: org.apache.commons.lang3.text; StrBuilder; false; append; (java.lang.StringBuilder); ; Argument[0]; Argument[this]; taint; manual |
+| 47 | Summary: org.apache.commons.lang3.text; StrBuilder; false; append; (java.lang.StringBuilder,int,int); ; Argument[0]; Argument[this]; taint; manual |
+| 48 | Summary: org.apache.commons.lang3.text; StrBuilder; false; append; (java.nio.CharBuffer); ; Argument[0]; Argument[this]; taint; manual |
+| 49 | Summary: org.apache.commons.lang3.text; StrBuilder; false; append; (java.nio.CharBuffer,int,int); ; Argument[0]; Argument[this]; taint; manual |
+| 50 | Summary: org.apache.commons.lang3.text; StrBuilder; false; append; (org.apache.commons.lang3.text.StrBuilder); ; Argument[0]; Argument[this]; taint; manual |
+| 51 | Summary: org.apache.commons.lang3.text; StrBuilder; false; append; ; ; Argument[this]; ReturnValue; value; manual |
+| 52 | Summary: org.apache.commons.lang3.text; StrBuilder; false; appendAll; (Iterable); ; Argument[0].Element; Argument[this]; taint; manual |
+| 53 | Summary: org.apache.commons.lang3.text; StrBuilder; false; appendAll; (Iterator); ; Argument[0].Element; Argument[this]; taint; manual |
+| 54 | Summary: org.apache.commons.lang3.text; StrBuilder; false; appendAll; (Object[]); ; Argument[0].ArrayElement; Argument[this]; taint; manual |
+| 55 | Summary: org.apache.commons.lang3.text; StrBuilder; false; appendAll; ; ; Argument[this]; ReturnValue; value; manual |
+| 56 | Summary: org.apache.commons.lang3.text; StrBuilder; false; appendFixedWidthPadLeft; ; ; Argument[0]; Argument[this]; taint; manual |
+| 57 | Summary: org.apache.commons.lang3.text; StrBuilder; false; appendFixedWidthPadLeft; ; ; Argument[this]; ReturnValue; value; manual |
+| 58 | Summary: org.apache.commons.lang3.text; StrBuilder; false; appendFixedWidthPadRight; ; ; Argument[0]; Argument[this]; taint; manual |
+| 59 | Summary: org.apache.commons.lang3.text; StrBuilder; false; appendFixedWidthPadRight; ; ; Argument[this]; ReturnValue; value; manual |
+| 60 | Summary: org.apache.commons.lang3.text; StrBuilder; false; appendNewLine; ; ; Argument[this]; ReturnValue; value; manual |
+| 61 | Summary: org.apache.commons.lang3.text; StrBuilder; false; appendNull; ; ; Argument[this]; ReturnValue; value; manual |
+| 62 | Summary: org.apache.commons.lang3.text; StrBuilder; false; appendPadding; ; ; Argument[this]; ReturnValue; value; manual |
+| 63 | Summary: org.apache.commons.lang3.text; StrBuilder; false; appendSeparator; (java.lang.String); ; Argument[0]; Argument[this]; taint; manual |
+| 64 | Summary: org.apache.commons.lang3.text; StrBuilder; false; appendSeparator; (java.lang.String,int); ; Argument[0]; Argument[this]; taint; manual |
+| 65 | Summary: org.apache.commons.lang3.text; StrBuilder; false; appendSeparator; (java.lang.String,java.lang.String); ; Argument[0..1]; Argument[this]; taint; manual |
+| 66 | Summary: org.apache.commons.lang3.text; StrBuilder; false; appendSeparator; ; ; Argument[this]; ReturnValue; value; manual |
+| 67 | Summary: org.apache.commons.lang3.text; StrBuilder; false; appendTo; ; ; Argument[this]; Argument[0]; taint; manual |
+| 68 | Summary: org.apache.commons.lang3.text; StrBuilder; false; appendWithSeparators; (Iterable,String); ; Argument[0].Element; Argument[this]; taint; manual |
+| 69 | Summary: org.apache.commons.lang3.text; StrBuilder; false; appendWithSeparators; (Iterator,String); ; Argument[0].Element; Argument[this]; taint; manual |
+| 70 | Summary: org.apache.commons.lang3.text; StrBuilder; false; appendWithSeparators; (Object[],String); ; Argument[0].ArrayElement; Argument[this]; taint; manual |
+| 71 | Summary: org.apache.commons.lang3.text; StrBuilder; false; appendWithSeparators; ; ; Argument[1]; Argument[this]; taint; manual |
+| 72 | Summary: org.apache.commons.lang3.text; StrBuilder; false; appendWithSeparators; ; ; Argument[this]; ReturnValue; value; manual |
+| 73 | Summary: org.apache.commons.lang3.text; StrBuilder; false; appendln; (char[]); ; Argument[0]; Argument[this]; taint; manual |
+| 74 | Summary: org.apache.commons.lang3.text; StrBuilder; false; appendln; (char[],int,int); ; Argument[0]; Argument[this]; taint; manual |
+| 75 | Summary: org.apache.commons.lang3.text; StrBuilder; false; appendln; (java.lang.Object); ; Argument[0]; Argument[this]; taint; manual |
+| 76 | Summary: org.apache.commons.lang3.text; StrBuilder; false; appendln; (java.lang.String); ; Argument[0]; Argument[this]; taint; manual |
+| 77 | Summary: org.apache.commons.lang3.text; StrBuilder; false; appendln; (java.lang.String,int,int); ; Argument[0]; Argument[this]; taint; manual |
+| 78 | Summary: org.apache.commons.lang3.text; StrBuilder; false; appendln; (java.lang.String,java.lang.Object[]); ; Argument[0]; Argument[this]; taint; manual |
+| 79 | Summary: org.apache.commons.lang3.text; StrBuilder; false; appendln; (java.lang.String,java.lang.Object[]); ; Argument[1].ArrayElement; Argument[this]; taint; manual |
+| 80 | Summary: org.apache.commons.lang3.text; StrBuilder; false; appendln; (java.lang.StringBuffer); ; Argument[0]; Argument[this]; taint; manual |
+| 81 | Summary: org.apache.commons.lang3.text; StrBuilder; false; appendln; (java.lang.StringBuffer,int,int); ; Argument[0]; Argument[this]; taint; manual |
+| 82 | Summary: org.apache.commons.lang3.text; StrBuilder; false; appendln; (java.lang.StringBuilder); ; Argument[0]; Argument[this]; taint; manual |
+| 83 | Summary: org.apache.commons.lang3.text; StrBuilder; false; appendln; (java.lang.StringBuilder,int,int); ; Argument[0]; Argument[this]; taint; manual |
+| 84 | Summary: org.apache.commons.lang3.text; StrBuilder; false; appendln; (org.apache.commons.lang3.text.StrBuilder); ; Argument[0]; Argument[this]; taint; manual |
+| 85 | Summary: org.apache.commons.lang3.text; StrBuilder; false; appendln; ; ; Argument[this]; ReturnValue; value; manual |
+| 86 | Summary: org.apache.commons.lang3.text; StrBuilder; false; asReader; ; ; Argument[this]; ReturnValue; taint; manual |
+| 87 | Summary: org.apache.commons.lang3.text; StrBuilder; false; asTokenizer; ; ; Argument[this]; ReturnValue; taint; manual |
+| 88 | Summary: org.apache.commons.lang3.text; StrBuilder; false; build; ; ; Argument[this]; ReturnValue; taint; manual |
+| 89 | Summary: org.apache.commons.lang3.text; StrBuilder; false; delete; ; ; Argument[this]; ReturnValue; value; manual |
+| 90 | Summary: org.apache.commons.lang3.text; StrBuilder; false; deleteAll; ; ; Argument[this]; ReturnValue; value; manual |
+| 91 | Summary: org.apache.commons.lang3.text; StrBuilder; false; deleteCharAt; ; ; Argument[this]; ReturnValue; value; manual |
+| 92 | Summary: org.apache.commons.lang3.text; StrBuilder; false; deleteFirst; ; ; Argument[this]; ReturnValue; value; manual |
+| 93 | Summary: org.apache.commons.lang3.text; StrBuilder; false; ensureCapacity; ; ; Argument[this]; ReturnValue; value; manual |
+| 94 | Summary: org.apache.commons.lang3.text; StrBuilder; false; getChars; (char[]); ; Argument[this]; Argument[0]; taint; manual |
+| 95 | Summary: org.apache.commons.lang3.text; StrBuilder; false; getChars; (char[]); ; Argument[this]; ReturnValue; taint; manual |
+| 96 | Summary: org.apache.commons.lang3.text; StrBuilder; false; getChars; (int,int,char[],int); ; Argument[this]; Argument[2]; taint; manual |
+| 97 | Summary: org.apache.commons.lang3.text; StrBuilder; false; insert; ; ; Argument[1]; Argument[this]; taint; manual |
+| 98 | Summary: org.apache.commons.lang3.text; StrBuilder; false; insert; ; ; Argument[this]; ReturnValue; value; manual |
+| 99 | Summary: org.apache.commons.lang3.text; StrBuilder; false; leftString; ; ; Argument[this]; ReturnValue; taint; manual |
+| 100 | Summary: org.apache.commons.lang3.text; StrBuilder; false; midString; ; ; Argument[this]; ReturnValue; taint; manual |
+| 101 | Summary: org.apache.commons.lang3.text; StrBuilder; false; minimizeCapacity; ; ; Argument[this]; ReturnValue; value; manual |
+| 102 | Summary: org.apache.commons.lang3.text; StrBuilder; false; readFrom; ; ; Argument[0]; Argument[this]; taint; manual |
+| 103 | Summary: org.apache.commons.lang3.text; StrBuilder; false; replace; (int,int,java.lang.String); ; Argument[2]; Argument[this]; taint; manual |
+| 104 | Summary: org.apache.commons.lang3.text; StrBuilder; false; replace; (org.apache.commons.lang3.text.StrMatcher,java.lang.String,int,int,int); ; Argument[1]; Argument[this]; taint; manual |
+| 105 | Summary: org.apache.commons.lang3.text; StrBuilder; false; replace; ; ; Argument[this]; ReturnValue; value; manual |
+| 106 | Summary: org.apache.commons.lang3.text; StrBuilder; false; replaceAll; ; ; Argument[1]; Argument[this]; taint; manual |
+| 107 | Summary: org.apache.commons.lang3.text; StrBuilder; false; replaceAll; ; ; Argument[this]; ReturnValue; value; manual |
+| 108 | Summary: org.apache.commons.lang3.text; StrBuilder; false; replaceFirst; ; ; Argument[1]; Argument[this]; taint; manual |
+| 109 | Summary: org.apache.commons.lang3.text; StrBuilder; false; replaceFirst; ; ; Argument[this]; ReturnValue; value; manual |
+| 110 | Summary: org.apache.commons.lang3.text; StrBuilder; false; reverse; ; ; Argument[this]; ReturnValue; value; manual |
+| 111 | Summary: org.apache.commons.lang3.text; StrBuilder; false; rightString; ; ; Argument[this]; ReturnValue; taint; manual |
+| 112 | Summary: org.apache.commons.lang3.text; StrBuilder; false; setCharAt; ; ; Argument[this]; ReturnValue; value; manual |
+| 113 | Summary: org.apache.commons.lang3.text; StrBuilder; false; setLength; ; ; Argument[this]; ReturnValue; value; manual |
+| 114 | Summary: org.apache.commons.lang3.text; StrBuilder; false; setNewLineText; ; ; Argument[this]; ReturnValue; value; manual |
+| 115 | Summary: org.apache.commons.lang3.text; StrBuilder; false; setNullText; ; ; Argument[this]; ReturnValue; value; manual |
+| 116 | Summary: org.apache.commons.lang3.text; StrBuilder; false; subSequence; ; ; Argument[this]; ReturnValue; taint; manual |
+| 117 | Summary: org.apache.commons.lang3.text; StrBuilder; false; substring; ; ; Argument[this]; ReturnValue; taint; manual |
+| 118 | Summary: org.apache.commons.lang3.text; StrBuilder; false; toCharArray; ; ; Argument[this]; ReturnValue; taint; manual |
+| 119 | Summary: org.apache.commons.lang3.text; StrBuilder; false; toString; ; ; Argument[this]; ReturnValue; taint; manual |
+| 120 | Summary: org.apache.commons.lang3.text; StrBuilder; false; toStringBuffer; ; ; Argument[this]; ReturnValue; taint; manual |
+| 121 | Summary: org.apache.commons.lang3.text; StrBuilder; false; toStringBuilder; ; ; Argument[this]; ReturnValue; taint; manual |
+| 122 | Summary: org.apache.commons.lang3.text; StrBuilder; false; trim; ; ; Argument[this]; ReturnValue; value; manual |
+| 123 | Summary: org.apache.commons.lang3.text; StrLookup; false; lookup; ; ; Argument[this]; ReturnValue; taint; manual |
+| 124 | Summary: org.apache.commons.lang3.text; StrLookup; false; mapLookup; ; ; Argument[0].MapValue; ReturnValue; taint; manual |
+| 125 | Summary: org.apache.commons.lang3.text; StrSubstitutor; false; StrSubstitutor; ; ; Argument[0].MapValue; Argument[this]; taint; manual |
+| 126 | Summary: org.apache.commons.lang3.text; StrSubstitutor; false; StrSubstitutor; ; ; Argument[0]; Argument[this]; taint; manual |
+| 127 | Summary: org.apache.commons.lang3.text; StrSubstitutor; false; replace; (char[]); ; Argument[0]; ReturnValue; taint; manual |
+| 128 | Summary: org.apache.commons.lang3.text; StrSubstitutor; false; replace; (char[],int,int); ; Argument[0]; ReturnValue; taint; manual |
+| 129 | Summary: org.apache.commons.lang3.text; StrSubstitutor; false; replace; (java.lang.CharSequence); ; Argument[0]; ReturnValue; taint; manual |
+| 130 | Summary: org.apache.commons.lang3.text; StrSubstitutor; false; replace; (java.lang.CharSequence,int,int); ; Argument[0]; ReturnValue; taint; manual |
+| 131 | Summary: org.apache.commons.lang3.text; StrSubstitutor; false; replace; (java.lang.Object); ; Argument[0]; ReturnValue; taint; manual |
+| 132 | Summary: org.apache.commons.lang3.text; StrSubstitutor; false; replace; (java.lang.Object,java.util.Map); ; Argument[0]; ReturnValue; taint; manual |
+| 133 | Summary: org.apache.commons.lang3.text; StrSubstitutor; false; replace; (java.lang.Object,java.util.Map); ; Argument[1].MapValue; ReturnValue; taint; manual |
+| 134 | Summary: org.apache.commons.lang3.text; StrSubstitutor; false; replace; (java.lang.Object,java.util.Map,java.lang.String,java.lang.String); ; Argument[0]; ReturnValue; taint; manual |
+| 135 | Summary: org.apache.commons.lang3.text; StrSubstitutor; false; replace; (java.lang.Object,java.util.Map,java.lang.String,java.lang.String); ; Argument[1].MapValue; ReturnValue; taint; manual |
+| 136 | Summary: org.apache.commons.lang3.text; StrSubstitutor; false; replace; (java.lang.Object,java.util.Properties); ; Argument[0]; ReturnValue; taint; manual |
+| 137 | Summary: org.apache.commons.lang3.text; StrSubstitutor; false; replace; (java.lang.Object,java.util.Properties); ; Argument[1].MapValue; ReturnValue; taint; manual |
+| 138 | Summary: org.apache.commons.lang3.text; StrSubstitutor; false; replace; (java.lang.String); ; Argument[0]; ReturnValue; taint; manual |
+| 139 | Summary: org.apache.commons.lang3.text; StrSubstitutor; false; replace; (java.lang.String,int,int); ; Argument[0]; ReturnValue; taint; manual |
+| 140 | Summary: org.apache.commons.lang3.text; StrSubstitutor; false; replace; (java.lang.StringBuffer); ; Argument[0]; ReturnValue; taint; manual |
+| 141 | Summary: org.apache.commons.lang3.text; StrSubstitutor; false; replace; (java.lang.StringBuffer,int,int); ; Argument[0]; ReturnValue; taint; manual |
+| 142 | Summary: org.apache.commons.lang3.text; StrSubstitutor; false; replace; (org.apache.commons.lang3.text.StrBuilder); ; Argument[0]; ReturnValue; taint; manual |
+| 143 | Summary: org.apache.commons.lang3.text; StrSubstitutor; false; replace; (org.apache.commons.lang3.text.StrBuilder,int,int); ; Argument[0]; ReturnValue; taint; manual |
+| 144 | Summary: org.apache.commons.lang3.text; StrSubstitutor; false; replace; ; ; Argument[this]; ReturnValue; taint; manual |
+| 145 | Summary: org.apache.commons.lang3.text; StrSubstitutor; false; replaceIn; (java.lang.StringBuffer); ; Argument[this]; Argument[0]; taint; manual |
+| 146 | Summary: org.apache.commons.lang3.text; StrSubstitutor; false; replaceIn; (java.lang.StringBuffer,int,int); ; Argument[this]; Argument[0]; taint; manual |
+| 147 | Summary: org.apache.commons.lang3.text; StrSubstitutor; false; replaceIn; (java.lang.StringBuilder); ; Argument[this]; Argument[0]; taint; manual |
+| 148 | Summary: org.apache.commons.lang3.text; StrSubstitutor; false; replaceIn; (java.lang.StringBuilder,int,int); ; Argument[this]; Argument[0]; taint; manual |
+| 149 | Summary: org.apache.commons.lang3.text; StrSubstitutor; false; replaceIn; (org.apache.commons.lang3.text.StrBuilder); ; Argument[this]; Argument[0]; taint; manual |
+| 150 | Summary: org.apache.commons.lang3.text; StrSubstitutor; false; replaceIn; (org.apache.commons.lang3.text.StrBuilder,int,int); ; Argument[this]; Argument[0]; taint; manual |
+| 151 | Summary: org.apache.commons.lang3.text; StrSubstitutor; false; setVariableResolver; ; ; Argument[0]; Argument[this]; taint; manual |
+| 152 | Summary: org.apache.commons.lang3.text; StrTokenizer; false; StrTokenizer; ; ; Argument[0]; Argument[this]; taint; manual |
+| 153 | Summary: org.apache.commons.lang3.text; StrTokenizer; false; clone; ; ; Argument[this]; ReturnValue; taint; manual |
+| 154 | Summary: org.apache.commons.lang3.text; StrTokenizer; false; getCSVInstance; ; ; Argument[0]; ReturnValue; taint; manual |
+| 155 | Summary: org.apache.commons.lang3.text; StrTokenizer; false; getContent; ; ; Argument[this]; ReturnValue; taint; manual |
+| 156 | Summary: org.apache.commons.lang3.text; StrTokenizer; false; getTSVInstance; ; ; Argument[0]; ReturnValue; taint; manual |
+| 157 | Summary: org.apache.commons.lang3.text; StrTokenizer; false; getTokenArray; ; ; Argument[this]; ReturnValue; taint; manual |
+| 158 | Summary: org.apache.commons.lang3.text; StrTokenizer; false; getTokenList; ; ; Argument[this]; ReturnValue; taint; manual |
+| 159 | Summary: org.apache.commons.lang3.text; StrTokenizer; false; next; ; ; Argument[this]; ReturnValue; taint; manual |
+| 160 | Summary: org.apache.commons.lang3.text; StrTokenizer; false; nextToken; ; ; Argument[this]; ReturnValue; taint; manual |
+| 161 | Summary: org.apache.commons.lang3.text; StrTokenizer; false; previous; ; ; Argument[this]; ReturnValue; taint; manual |
+| 162 | Summary: org.apache.commons.lang3.text; StrTokenizer; false; previousToken; ; ; Argument[this]; ReturnValue; taint; manual |
+| 163 | Summary: org.apache.commons.lang3.text; StrTokenizer; false; reset; ; ; Argument[0]; ReturnValue; taint; manual |
+| 164 | Summary: org.apache.commons.lang3.text; StrTokenizer; false; toString; ; ; Argument[this]; ReturnValue; taint; manual |
+| 165 | Summary: org.apache.commons.lang3.text; WordUtils; false; capitalize; (java.lang.String); ; Argument[0]; ReturnValue; taint; manual |
+| 166 | Summary: org.apache.commons.lang3.text; WordUtils; false; capitalize; (java.lang.String,char[]); ; Argument[0]; ReturnValue; taint; manual |
+| 167 | Summary: org.apache.commons.lang3.text; WordUtils; false; capitalizeFully; (java.lang.String); ; Argument[0]; ReturnValue; taint; manual |
+| 168 | Summary: org.apache.commons.lang3.text; WordUtils; false; capitalizeFully; (java.lang.String,char[]); ; Argument[0]; ReturnValue; taint; manual |
+| 169 | Summary: org.apache.commons.lang3.text; WordUtils; false; initials; (java.lang.String); ; Argument[0]; ReturnValue; taint; manual |
+| 170 | Summary: org.apache.commons.lang3.text; WordUtils; false; initials; (java.lang.String,char[]); ; Argument[0]; ReturnValue; taint; manual |
+| 171 | Summary: org.apache.commons.lang3.text; WordUtils; false; swapCase; ; ; Argument[0]; ReturnValue; taint; manual |
+| 172 | Summary: org.apache.commons.lang3.text; WordUtils; false; uncapitalize; (java.lang.String); ; Argument[0]; ReturnValue; taint; manual |
+| 173 | Summary: org.apache.commons.lang3.text; WordUtils; false; uncapitalize; (java.lang.String,char[]); ; Argument[0]; ReturnValue; taint; manual |
+| 174 | Summary: org.apache.commons.lang3.text; WordUtils; false; wrap; (java.lang.String,int,java.lang.String,boolean); ; Argument[2]; ReturnValue; taint; manual |
+| 175 | Summary: org.apache.commons.lang3.text; WordUtils; false; wrap; (java.lang.String,int,java.lang.String,boolean,java.lang.String); ; Argument[2]; ReturnValue; taint; manual |
+| 176 | Summary: org.apache.commons.lang3.text; WordUtils; false; wrap; ; ; Argument[0]; ReturnValue; taint; manual |
+| 177 | Summary: org.apache.commons.lang3.tuple; ImmutablePair; false; ImmutablePair; (java.lang.Object,java.lang.Object); ; Argument[0]; Argument[this].Field[org.apache.commons.lang3.tuple.ImmutablePair.left]; value; manual |
+| 178 | Summary: org.apache.commons.lang3.tuple; ImmutablePair; false; ImmutablePair; (java.lang.Object,java.lang.Object); ; Argument[1]; Argument[this].Field[org.apache.commons.lang3.tuple.ImmutablePair.right]; value; manual |
+| 179 | Summary: org.apache.commons.lang3.tuple; ImmutablePair; false; left; ; ; Argument[0]; ReturnValue.Field[org.apache.commons.lang3.tuple.ImmutablePair.left]; value; manual |
+| 180 | Summary: org.apache.commons.lang3.tuple; ImmutablePair; false; of; (java.lang.Object,java.lang.Object); ; Argument[0]; ReturnValue.Field[org.apache.commons.lang3.tuple.ImmutablePair.left]; value; manual |
+| 181 | Summary: org.apache.commons.lang3.tuple; ImmutablePair; false; of; (java.lang.Object,java.lang.Object); ; Argument[1]; ReturnValue.Field[org.apache.commons.lang3.tuple.ImmutablePair.right]; value; manual |
+| 182 | Summary: org.apache.commons.lang3.tuple; ImmutablePair; false; right; ; ; Argument[0]; ReturnValue.Field[org.apache.commons.lang3.tuple.ImmutablePair.right]; value; manual |
+| 183 | Summary: org.apache.commons.lang3.tuple; ImmutableTriple; false; ImmutableTriple; (java.lang.Object,java.lang.Object,java.lang.Object); ; Argument[0]; Argument[this].Field[org.apache.commons.lang3.tuple.ImmutableTriple.left]; value; manual |
+| 184 | Summary: org.apache.commons.lang3.tuple; ImmutableTriple; false; ImmutableTriple; (java.lang.Object,java.lang.Object,java.lang.Object); ; Argument[1]; Argument[this].Field[org.apache.commons.lang3.tuple.ImmutableTriple.middle]; value; manual |
+| 185 | Summary: org.apache.commons.lang3.tuple; ImmutableTriple; false; ImmutableTriple; (java.lang.Object,java.lang.Object,java.lang.Object); ; Argument[2]; Argument[this].Field[org.apache.commons.lang3.tuple.ImmutableTriple.right]; value; manual |
+| 186 | Summary: org.apache.commons.lang3.tuple; ImmutableTriple; false; of; (java.lang.Object,java.lang.Object,java.lang.Object); ; Argument[0]; ReturnValue.Field[org.apache.commons.lang3.tuple.ImmutableTriple.left]; value; manual |
+| 187 | Summary: org.apache.commons.lang3.tuple; ImmutableTriple; false; of; (java.lang.Object,java.lang.Object,java.lang.Object); ; Argument[1]; ReturnValue.Field[org.apache.commons.lang3.tuple.ImmutableTriple.middle]; value; manual |
+| 188 | Summary: org.apache.commons.lang3.tuple; ImmutableTriple; false; of; (java.lang.Object,java.lang.Object,java.lang.Object); ; Argument[2]; ReturnValue.Field[org.apache.commons.lang3.tuple.ImmutableTriple.right]; value; manual |
+| 189 | Summary: org.apache.commons.lang3.tuple; MutablePair; false; MutablePair; (java.lang.Object,java.lang.Object); ; Argument[0]; Argument[this].Field[org.apache.commons.lang3.tuple.MutablePair.left]; value; manual |
+| 190 | Summary: org.apache.commons.lang3.tuple; MutablePair; false; MutablePair; (java.lang.Object,java.lang.Object); ; Argument[1]; Argument[this].Field[org.apache.commons.lang3.tuple.MutablePair.right]; value; manual |
+| 191 | Summary: org.apache.commons.lang3.tuple; MutablePair; false; of; (java.lang.Object,java.lang.Object); ; Argument[0]; ReturnValue.Field[org.apache.commons.lang3.tuple.MutablePair.left]; value; manual |
+| 192 | Summary: org.apache.commons.lang3.tuple; MutablePair; false; of; (java.lang.Object,java.lang.Object); ; Argument[1]; ReturnValue.Field[org.apache.commons.lang3.tuple.MutablePair.right]; value; manual |
+| 193 | Summary: org.apache.commons.lang3.tuple; MutablePair; false; setLeft; ; ; Argument[0]; Argument[this].Field[org.apache.commons.lang3.tuple.MutablePair.left]; value; manual |
+| 194 | Summary: org.apache.commons.lang3.tuple; MutablePair; false; setRight; ; ; Argument[0]; Argument[this].Field[org.apache.commons.lang3.tuple.MutablePair.right]; value; manual |
+| 195 | Summary: org.apache.commons.lang3.tuple; MutablePair; false; setValue; ; ; Argument[0]; Argument[this].Field[org.apache.commons.lang3.tuple.MutablePair.right]; value; manual |
+| 196 | Summary: org.apache.commons.lang3.tuple; MutableTriple; false; MutableTriple; (java.lang.Object,java.lang.Object,java.lang.Object); ; Argument[0]; Argument[this].Field[org.apache.commons.lang3.tuple.MutableTriple.left]; value; manual |
+| 197 | Summary: org.apache.commons.lang3.tuple; MutableTriple; false; MutableTriple; (java.lang.Object,java.lang.Object,java.lang.Object); ; Argument[1]; Argument[this].Field[org.apache.commons.lang3.tuple.MutableTriple.middle]; value; manual |
+| 198 | Summary: org.apache.commons.lang3.tuple; MutableTriple; false; MutableTriple; (java.lang.Object,java.lang.Object,java.lang.Object); ; Argument[2]; Argument[this].Field[org.apache.commons.lang3.tuple.MutableTriple.right]; value; manual |
+| 199 | Summary: org.apache.commons.lang3.tuple; MutableTriple; false; of; (java.lang.Object,java.lang.Object,java.lang.Object); ; Argument[0]; ReturnValue.Field[org.apache.commons.lang3.tuple.MutableTriple.left]; value; manual |
+| 200 | Summary: org.apache.commons.lang3.tuple; MutableTriple; false; of; (java.lang.Object,java.lang.Object,java.lang.Object); ; Argument[1]; ReturnValue.Field[org.apache.commons.lang3.tuple.MutableTriple.middle]; value; manual |
+| 201 | Summary: org.apache.commons.lang3.tuple; MutableTriple; false; of; (java.lang.Object,java.lang.Object,java.lang.Object); ; Argument[2]; ReturnValue.Field[org.apache.commons.lang3.tuple.MutableTriple.right]; value; manual |
+| 202 | Summary: org.apache.commons.lang3.tuple; MutableTriple; false; setLeft; ; ; Argument[0]; Argument[this].Field[org.apache.commons.lang3.tuple.MutableTriple.left]; value; manual |
+| 203 | Summary: org.apache.commons.lang3.tuple; MutableTriple; false; setMiddle; ; ; Argument[0]; Argument[this].Field[org.apache.commons.lang3.tuple.MutableTriple.middle]; value; manual |
+| 204 | Summary: org.apache.commons.lang3.tuple; MutableTriple; false; setRight; ; ; Argument[0]; Argument[this].Field[org.apache.commons.lang3.tuple.MutableTriple.right]; value; manual |
+| 205 | Summary: org.apache.commons.lang3.tuple; Pair; false; of; (java.lang.Object,java.lang.Object); ; Argument[0]; ReturnValue.Field[org.apache.commons.lang3.tuple.ImmutablePair.left]; value; manual |
+| 206 | Summary: org.apache.commons.lang3.tuple; Pair; false; of; (java.lang.Object,java.lang.Object); ; Argument[1]; ReturnValue.Field[org.apache.commons.lang3.tuple.ImmutablePair.right]; value; manual |
+| 207 | Summary: org.apache.commons.lang3.tuple; Pair; true; getKey; ; ; Argument[this].Field[org.apache.commons.lang3.tuple.ImmutablePair.left]; ReturnValue; value; manual |
+| 208 | Summary: org.apache.commons.lang3.tuple; Pair; true; getKey; ; ; Argument[this].Field[org.apache.commons.lang3.tuple.MutablePair.left]; ReturnValue; value; manual |
+| 209 | Summary: org.apache.commons.lang3.tuple; Pair; true; getLeft; ; ; Argument[this].Field[org.apache.commons.lang3.tuple.ImmutablePair.left]; ReturnValue; value; manual |
+| 210 | Summary: org.apache.commons.lang3.tuple; Pair; true; getLeft; ; ; Argument[this].Field[org.apache.commons.lang3.tuple.MutablePair.left]; ReturnValue; value; manual |
+| 211 | Summary: org.apache.commons.lang3.tuple; Pair; true; getRight; ; ; Argument[this].Field[org.apache.commons.lang3.tuple.ImmutablePair.right]; ReturnValue; value; manual |
+| 212 | Summary: org.apache.commons.lang3.tuple; Pair; true; getRight; ; ; Argument[this].Field[org.apache.commons.lang3.tuple.MutablePair.right]; ReturnValue; value; manual |
+| 213 | Summary: org.apache.commons.lang3.tuple; Pair; true; getValue; ; ; Argument[this].Field[org.apache.commons.lang3.tuple.ImmutablePair.right]; ReturnValue; value; manual |
+| 214 | Summary: org.apache.commons.lang3.tuple; Pair; true; getValue; ; ; Argument[this].Field[org.apache.commons.lang3.tuple.MutablePair.right]; ReturnValue; value; manual |
+| 215 | Summary: org.apache.commons.lang3.tuple; Triple; false; of; (java.lang.Object,java.lang.Object,java.lang.Object); ; Argument[0]; ReturnValue.Field[org.apache.commons.lang3.tuple.ImmutableTriple.left]; value; manual |
+| 216 | Summary: org.apache.commons.lang3.tuple; Triple; false; of; (java.lang.Object,java.lang.Object,java.lang.Object); ; Argument[1]; ReturnValue.Field[org.apache.commons.lang3.tuple.ImmutableTriple.middle]; value; manual |
+| 217 | Summary: org.apache.commons.lang3.tuple; Triple; false; of; (java.lang.Object,java.lang.Object,java.lang.Object); ; Argument[2]; ReturnValue.Field[org.apache.commons.lang3.tuple.ImmutableTriple.right]; value; manual |
+| 218 | Summary: org.apache.commons.lang3.tuple; Triple; true; getLeft; ; ; Argument[this].Field[org.apache.commons.lang3.tuple.ImmutableTriple.left]; ReturnValue; value; manual |
+| 219 | Summary: org.apache.commons.lang3.tuple; Triple; true; getLeft; ; ; Argument[this].Field[org.apache.commons.lang3.tuple.MutableTriple.left]; ReturnValue; value; manual |
+| 220 | Summary: org.apache.commons.lang3.tuple; Triple; true; getMiddle; ; ; Argument[this].Field[org.apache.commons.lang3.tuple.ImmutableTriple.middle]; ReturnValue; value; manual |
+| 221 | Summary: org.apache.commons.lang3.tuple; Triple; true; getMiddle; ; ; Argument[this].Field[org.apache.commons.lang3.tuple.MutableTriple.middle]; ReturnValue; value; manual |
+| 222 | Summary: org.apache.commons.lang3.tuple; Triple; true; getRight; ; ; Argument[this].Field[org.apache.commons.lang3.tuple.ImmutableTriple.right]; ReturnValue; value; manual |
+| 223 | Summary: org.apache.commons.lang3.tuple; Triple; true; getRight; ; ; Argument[this].Field[org.apache.commons.lang3.tuple.MutableTriple.right]; ReturnValue; value; manual |
+| 224 | Summary: org.apache.commons.lang3; ArrayUtils; false; add; (java.lang.Object[],java.lang.Object); ; Argument[1]; ReturnValue.ArrayElement; value; manual |
+| 225 | Summary: org.apache.commons.lang3; ArrayUtils; false; add; ; ; Argument[0].ArrayElement; ReturnValue.ArrayElement; value; manual |
+| 226 | Summary: org.apache.commons.lang3; ArrayUtils; false; add; ; ; Argument[2]; ReturnValue.ArrayElement; value; manual |
+| 227 | Summary: org.apache.commons.lang3; ArrayUtils; false; addAll; ; ; Argument[0..1].ArrayElement; ReturnValue.ArrayElement; value; manual |
+| 228 | Summary: org.apache.commons.lang3; ArrayUtils; false; addFirst; ; ; Argument[0].ArrayElement; ReturnValue.ArrayElement; value; manual |
+| 229 | Summary: org.apache.commons.lang3; ArrayUtils; false; addFirst; ; ; Argument[1]; ReturnValue.ArrayElement; value; manual |
+| 230 | Summary: org.apache.commons.lang3; ArrayUtils; false; clone; ; ; Argument[0].ArrayElement; ReturnValue.ArrayElement; value; manual |
+| 231 | Summary: org.apache.commons.lang3; ArrayUtils; false; get; (java.lang.Object[],int,java.lang.Object); ; Argument[2]; ReturnValue; value; manual |
+| 232 | Summary: org.apache.commons.lang3; ArrayUtils; false; get; ; ; Argument[0].ArrayElement; ReturnValue; value; manual |
+| 233 | Summary: org.apache.commons.lang3; ArrayUtils; false; insert; ; ; Argument[1..2].ArrayElement; ReturnValue.ArrayElement; value; manual |
+| 234 | Summary: org.apache.commons.lang3; ArrayUtils; false; nullToEmpty; (java.lang.Object[],java.lang.Class); ; Argument[0]; ReturnValue; value; manual |
+| 235 | Summary: org.apache.commons.lang3; ArrayUtils; false; nullToEmpty; (java.lang.String[]); ; Argument[0]; ReturnValue; value; manual |
+| 236 | Summary: org.apache.commons.lang3; ArrayUtils; false; remove; ; ; Argument[0].ArrayElement; ReturnValue.ArrayElement; value; manual |
+| 237 | Summary: org.apache.commons.lang3; ArrayUtils; false; removeAll; ; ; Argument[0].ArrayElement; ReturnValue.ArrayElement; value; manual |
+| 238 | Summary: org.apache.commons.lang3; ArrayUtils; false; removeAllOccurences; ; ; Argument[0].ArrayElement; ReturnValue.ArrayElement; value; manual |
+| 239 | Summary: org.apache.commons.lang3; ArrayUtils; false; removeAllOccurrences; ; ; Argument[0].ArrayElement; ReturnValue.ArrayElement; value; manual |
+| 240 | Summary: org.apache.commons.lang3; ArrayUtils; false; removeElement; ; ; Argument[0].ArrayElement; ReturnValue.ArrayElement; value; manual |
+| 241 | Summary: org.apache.commons.lang3; ArrayUtils; false; removeElements; ; ; Argument[0].ArrayElement; ReturnValue.ArrayElement; value; manual |
+| 242 | Summary: org.apache.commons.lang3; ArrayUtils; false; subarray; ; ; Argument[0].ArrayElement; ReturnValue.ArrayElement; value; manual |
+| 243 | Summary: org.apache.commons.lang3; ArrayUtils; false; toArray; ; ; Argument[0].ArrayElement; ReturnValue.ArrayElement; value; manual |
+| 244 | Summary: org.apache.commons.lang3; ArrayUtils; false; toMap; ; ; Argument[0].ArrayElement.ArrayElement; ReturnValue.MapValue; value; manual |
+| 245 | Summary: org.apache.commons.lang3; ArrayUtils; false; toMap; ; ; Argument[0].ArrayElement.MapValue; ReturnValue.MapValue; value; manual |
+| 246 | Summary: org.apache.commons.lang3; ArrayUtils; false; toObject; ; ; Argument[0].ArrayElement; ReturnValue.ArrayElement; value; manual |
+| 247 | Summary: org.apache.commons.lang3; ArrayUtils; false; toPrimitive; ; ; Argument[0].ArrayElement; ReturnValue.ArrayElement; value; manual |
+| 248 | Summary: org.apache.commons.lang3; ArrayUtils; false; toPrimitive; ; ; Argument[1]; ReturnValue.ArrayElement; value; manual |
+| 249 | Summary: org.apache.commons.lang3; ObjectUtils; false; CONST; ; ; Argument[0]; ReturnValue; value; manual |
+| 250 | Summary: org.apache.commons.lang3; ObjectUtils; false; CONST_BYTE; ; ; Argument[0]; ReturnValue; value; manual |
+| 251 | Summary: org.apache.commons.lang3; ObjectUtils; false; CONST_SHORT; ; ; Argument[0]; ReturnValue; value; manual |
+| 252 | Summary: org.apache.commons.lang3; ObjectUtils; false; clone; ; ; Argument[0]; ReturnValue; value; manual |
+| 253 | Summary: org.apache.commons.lang3; ObjectUtils; false; cloneIfPossible; ; ; Argument[0]; ReturnValue; value; manual |
+| 254 | Summary: org.apache.commons.lang3; ObjectUtils; false; defaultIfNull; ; ; Argument[0..1]; ReturnValue; value; manual |
+| 255 | Summary: org.apache.commons.lang3; ObjectUtils; false; firstNonNull; ; ; Argument[0].ArrayElement; ReturnValue; value; manual |
+| 256 | Summary: org.apache.commons.lang3; ObjectUtils; false; getIfNull; ; ; Argument[0]; ReturnValue; value; manual |
+| 257 | Summary: org.apache.commons.lang3; ObjectUtils; false; max; ; ; Argument[0].ArrayElement; ReturnValue; value; manual |
+| 258 | Summary: org.apache.commons.lang3; ObjectUtils; false; median; ; ; Argument[0].ArrayElement; ReturnValue; value; manual |
+| 259 | Summary: org.apache.commons.lang3; ObjectUtils; false; min; ; ; Argument[0].ArrayElement; ReturnValue; value; manual |
+| 260 | Summary: org.apache.commons.lang3; ObjectUtils; false; mode; ; ; Argument[0].ArrayElement; ReturnValue; value; manual |
+| 261 | Summary: org.apache.commons.lang3; ObjectUtils; false; requireNonEmpty; ; ; Argument[0]; ReturnValue; value; manual |
+| 262 | Summary: org.apache.commons.lang3; ObjectUtils; false; toString; (Object,String); ; Argument[1]; ReturnValue; value; manual |
+| 263 | Summary: org.apache.commons.lang3; RegExUtils; false; removeAll; ; ; Argument[0]; ReturnValue; taint; manual |
+| 264 | Summary: org.apache.commons.lang3; RegExUtils; false; removeFirst; ; ; Argument[0]; ReturnValue; taint; manual |
+| 265 | Summary: org.apache.commons.lang3; RegExUtils; false; removePattern; ; ; Argument[0]; ReturnValue; taint; manual |
+| 266 | Summary: org.apache.commons.lang3; RegExUtils; false; replaceAll; ; ; Argument[0]; ReturnValue; taint; manual |
+| 267 | Summary: org.apache.commons.lang3; RegExUtils; false; replaceAll; ; ; Argument[2]; ReturnValue; taint; manual |
+| 268 | Summary: org.apache.commons.lang3; RegExUtils; false; replaceFirst; ; ; Argument[0]; ReturnValue; taint; manual |
+| 269 | Summary: org.apache.commons.lang3; RegExUtils; false; replaceFirst; ; ; Argument[2]; ReturnValue; taint; manual |
+| 270 | Summary: org.apache.commons.lang3; RegExUtils; false; replacePattern; ; ; Argument[0]; ReturnValue; taint; manual |
+| 271 | Summary: org.apache.commons.lang3; RegExUtils; false; replacePattern; ; ; Argument[2]; ReturnValue; taint; manual |
+| 272 | Summary: org.apache.commons.lang3; StringEscapeUtils; false; escapeJson; ; ; Argument[0]; ReturnValue; taint; manual |
+| 273 | Summary: org.apache.commons.lang3; StringUtils; false; abbreviate; (java.lang.String,java.lang.String,int); ; Argument[1]; ReturnValue; taint; manual |
+| 274 | Summary: org.apache.commons.lang3; StringUtils; false; abbreviate; (java.lang.String,java.lang.String,int,int); ; Argument[1]; ReturnValue; taint; manual |
+| 275 | Summary: org.apache.commons.lang3; StringUtils; false; abbreviate; ; ; Argument[0]; ReturnValue; taint; manual |
+| 276 | Summary: org.apache.commons.lang3; StringUtils; false; abbreviateMiddle; ; ; Argument[0]; ReturnValue; taint; manual |
+| 277 | Summary: org.apache.commons.lang3; StringUtils; false; abbreviateMiddle; ; ; Argument[1]; ReturnValue; taint; manual |
+| 278 | Summary: org.apache.commons.lang3; StringUtils; false; appendIfMissing; ; ; Argument[0]; ReturnValue; taint; manual |
+| 279 | Summary: org.apache.commons.lang3; StringUtils; false; appendIfMissing; ; ; Argument[1]; ReturnValue; taint; manual |
+| 280 | Summary: org.apache.commons.lang3; StringUtils; false; appendIfMissingIgnoreCase; ; ; Argument[0]; ReturnValue; taint; manual |
+| 281 | Summary: org.apache.commons.lang3; StringUtils; false; appendIfMissingIgnoreCase; ; ; Argument[1]; ReturnValue; taint; manual |
+| 282 | Summary: org.apache.commons.lang3; StringUtils; false; capitalize; ; ; Argument[0]; ReturnValue; taint; manual |
+| 283 | Summary: org.apache.commons.lang3; StringUtils; false; center; (java.lang.String,int,java.lang.String); ; Argument[2]; ReturnValue; taint; manual |
+| 284 | Summary: org.apache.commons.lang3; StringUtils; false; center; ; ; Argument[0]; ReturnValue; taint; manual |
+| 285 | Summary: org.apache.commons.lang3; StringUtils; false; chomp; (java.lang.String); ; Argument[0]; ReturnValue; taint; manual |
+| 286 | Summary: org.apache.commons.lang3; StringUtils; false; chomp; (java.lang.String,java.lang.String); ; Argument[0]; ReturnValue; taint; manual |
+| 287 | Summary: org.apache.commons.lang3; StringUtils; false; chop; ; ; Argument[0]; ReturnValue; taint; manual |
+| 288 | Summary: org.apache.commons.lang3; StringUtils; false; defaultIfBlank; ; ; Argument[0..1]; ReturnValue; taint; manual |
+| 289 | Summary: org.apache.commons.lang3; StringUtils; false; defaultIfEmpty; ; ; Argument[0..1]; ReturnValue; taint; manual |
+| 290 | Summary: org.apache.commons.lang3; StringUtils; false; defaultString; ; ; Argument[0..1]; ReturnValue; taint; manual |
+| 291 | Summary: org.apache.commons.lang3; StringUtils; false; deleteWhitespace; ; ; Argument[0]; ReturnValue; taint; manual |
+| 292 | Summary: org.apache.commons.lang3; StringUtils; false; difference; ; ; Argument[0..1]; ReturnValue; taint; manual |
+| 293 | Summary: org.apache.commons.lang3; StringUtils; false; firstNonBlank; ; ; Argument[0].ArrayElement; ReturnValue; value; manual |
+| 294 | Summary: org.apache.commons.lang3; StringUtils; false; firstNonEmpty; ; ; Argument[0].ArrayElement; ReturnValue; value; manual |
+| 295 | Summary: org.apache.commons.lang3; StringUtils; false; getBytes; ; ; Argument[0]; ReturnValue; taint; manual |
+| 296 | Summary: org.apache.commons.lang3; StringUtils; false; getCommonPrefix; ; ; Argument[0].ArrayElement; ReturnValue; taint; manual |
+| 297 | Summary: org.apache.commons.lang3; StringUtils; false; getDigits; ; ; Argument[0]; ReturnValue; taint; manual |
+| 298 | Summary: org.apache.commons.lang3; StringUtils; false; getIfBlank; ; ; Argument[0..1]; ReturnValue; taint; manual |
+| 299 | Summary: org.apache.commons.lang3; StringUtils; false; getIfEmpty; ; ; Argument[0..1]; ReturnValue; taint; manual |
+| 300 | Summary: org.apache.commons.lang3; StringUtils; false; join; (Object[]); ; Argument[0].ArrayElement; ReturnValue; taint; manual |
+| 301 | Summary: org.apache.commons.lang3; StringUtils; false; join; (Object[],String); ; Argument[0].ArrayElement; ReturnValue; taint; manual |
+| 302 | Summary: org.apache.commons.lang3; StringUtils; false; join; (Object[],String); ; Argument[1]; ReturnValue; taint; manual |
+| 303 | Summary: org.apache.commons.lang3; StringUtils; false; join; (Object[],String,int,int); ; Argument[0].ArrayElement; ReturnValue; taint; manual |
+| 304 | Summary: org.apache.commons.lang3; StringUtils; false; join; (Object[],String,int,int); ; Argument[1]; ReturnValue; taint; manual |
+| 305 | Summary: org.apache.commons.lang3; StringUtils; false; join; (Object[],char); ; Argument[0].ArrayElement; ReturnValue; taint; manual |
+| 306 | Summary: org.apache.commons.lang3; StringUtils; false; join; (Object[],char,int,int); ; Argument[0].ArrayElement; ReturnValue; taint; manual |
+| 307 | Summary: org.apache.commons.lang3; StringUtils; false; join; (char[],char); ; Argument[0]; ReturnValue; taint; manual |
+| 308 | Summary: org.apache.commons.lang3; StringUtils; false; join; (char[],char,int,int); ; Argument[0]; ReturnValue; taint; manual |
+| 309 | Summary: org.apache.commons.lang3; StringUtils; false; join; (java.lang.Iterable,char); ; Argument[0].Element; ReturnValue; taint; manual |
+| 310 | Summary: org.apache.commons.lang3; StringUtils; false; join; (java.lang.Iterable,java.lang.String); ; Argument[0].Element; ReturnValue; taint; manual |
+| 311 | Summary: org.apache.commons.lang3; StringUtils; false; join; (java.lang.Iterable,java.lang.String); ; Argument[1]; ReturnValue; taint; manual |
+| 312 | Summary: org.apache.commons.lang3; StringUtils; false; join; (java.util.Iterator,char); ; Argument[0].Element; ReturnValue; taint; manual |
+| 313 | Summary: org.apache.commons.lang3; StringUtils; false; join; (java.util.Iterator,java.lang.String); ; Argument[0].Element; ReturnValue; taint; manual |
+| 314 | Summary: org.apache.commons.lang3; StringUtils; false; join; (java.util.Iterator,java.lang.String); ; Argument[1]; ReturnValue; taint; manual |
+| 315 | Summary: org.apache.commons.lang3; StringUtils; false; join; (java.util.List,char,int,int); ; Argument[0].Element; ReturnValue; taint; manual |
+| 316 | Summary: org.apache.commons.lang3; StringUtils; false; join; (java.util.List,java.lang.String,int,int); ; Argument[0].Element; ReturnValue; taint; manual |
+| 317 | Summary: org.apache.commons.lang3; StringUtils; false; join; (java.util.List,java.lang.String,int,int); ; Argument[1]; ReturnValue; taint; manual |
+| 318 | Summary: org.apache.commons.lang3; StringUtils; false; joinWith; ; ; Argument[0]; ReturnValue; taint; manual |
+| 319 | Summary: org.apache.commons.lang3; StringUtils; false; joinWith; ; ; Argument[1].ArrayElement; ReturnValue; taint; manual |
+| 320 | Summary: org.apache.commons.lang3; StringUtils; false; left; ; ; Argument[0]; ReturnValue; taint; manual |
+| 321 | Summary: org.apache.commons.lang3; StringUtils; false; leftPad; (java.lang.String,int,java.lang.String); ; Argument[2]; ReturnValue; taint; manual |
+| 322 | Summary: org.apache.commons.lang3; StringUtils; false; leftPad; ; ; Argument[0]; ReturnValue; taint; manual |
+| 323 | Summary: org.apache.commons.lang3; StringUtils; false; lowerCase; (java.lang.String); ; Argument[0]; ReturnValue; taint; manual |
+| 324 | Summary: org.apache.commons.lang3; StringUtils; false; lowerCase; (java.lang.String,java.util.Locale); ; Argument[0]; ReturnValue; taint; manual |
+| 325 | Summary: org.apache.commons.lang3; StringUtils; false; mid; ; ; Argument[0]; ReturnValue; taint; manual |
+| 326 | Summary: org.apache.commons.lang3; StringUtils; false; normalizeSpace; ; ; Argument[0]; ReturnValue; taint; manual |
+| 327 | Summary: org.apache.commons.lang3; StringUtils; false; overlay; ; ; Argument[0]; ReturnValue; taint; manual |
+| 328 | Summary: org.apache.commons.lang3; StringUtils; false; overlay; ; ; Argument[1]; ReturnValue; taint; manual |
+| 329 | Summary: org.apache.commons.lang3; StringUtils; false; prependIfMissing; ; ; Argument[0]; ReturnValue; taint; manual |
+| 330 | Summary: org.apache.commons.lang3; StringUtils; false; prependIfMissing; ; ; Argument[1]; ReturnValue; taint; manual |
+| 331 | Summary: org.apache.commons.lang3; StringUtils; false; prependIfMissingIgnoreCase; ; ; Argument[0]; ReturnValue; taint; manual |
+| 332 | Summary: org.apache.commons.lang3; StringUtils; false; prependIfMissingIgnoreCase; ; ; Argument[1]; ReturnValue; taint; manual |
+| 333 | Summary: org.apache.commons.lang3; StringUtils; false; remove; ; ; Argument[0]; ReturnValue; taint; manual |
+| 334 | Summary: org.apache.commons.lang3; StringUtils; false; removeAll; ; ; Argument[0]; ReturnValue; taint; manual |
+| 335 | Summary: org.apache.commons.lang3; StringUtils; false; removeEnd; ; ; Argument[0]; ReturnValue; taint; manual |
+| 336 | Summary: org.apache.commons.lang3; StringUtils; false; removeEndIgnoreCase; ; ; Argument[0]; ReturnValue; taint; manual |
+| 337 | Summary: org.apache.commons.lang3; StringUtils; false; removeFirst; ; ; Argument[0]; ReturnValue; taint; manual |
+| 338 | Summary: org.apache.commons.lang3; StringUtils; false; removeIgnoreCase; ; ; Argument[0]; ReturnValue; taint; manual |
+| 339 | Summary: org.apache.commons.lang3; StringUtils; false; removePattern; ; ; Argument[0]; ReturnValue; taint; manual |
+| 340 | Summary: org.apache.commons.lang3; StringUtils; false; removeStart; ; ; Argument[0]; ReturnValue; taint; manual |
+| 341 | Summary: org.apache.commons.lang3; StringUtils; false; removeStartIgnoreCase; ; ; Argument[0]; ReturnValue; taint; manual |
+| 342 | Summary: org.apache.commons.lang3; StringUtils; false; repeat; (java.lang.String,java.lang.String,int); ; Argument[1]; ReturnValue; taint; manual |
+| 343 | Summary: org.apache.commons.lang3; StringUtils; false; repeat; ; ; Argument[0]; ReturnValue; taint; manual |
+| 344 | Summary: org.apache.commons.lang3; StringUtils; false; replace; ; ; Argument[0]; ReturnValue; taint; manual |
+| 345 | Summary: org.apache.commons.lang3; StringUtils; false; replace; ; ; Argument[2]; ReturnValue; taint; manual |
+| 346 | Summary: org.apache.commons.lang3; StringUtils; false; replaceAll; ; ; Argument[0]; ReturnValue; taint; manual |
+| 347 | Summary: org.apache.commons.lang3; StringUtils; false; replaceAll; ; ; Argument[2]; ReturnValue; taint; manual |
+| 348 | Summary: org.apache.commons.lang3; StringUtils; false; replaceChars; (java.lang.String,java.lang.String,java.lang.String); ; Argument[2]; ReturnValue; taint; manual |
+| 349 | Summary: org.apache.commons.lang3; StringUtils; false; replaceChars; ; ; Argument[0]; ReturnValue; taint; manual |
+| 350 | Summary: org.apache.commons.lang3; StringUtils; false; replaceEach; ; ; Argument[0]; ReturnValue; taint; manual |
+| 351 | Summary: org.apache.commons.lang3; StringUtils; false; replaceEach; ; ; Argument[2].ArrayElement; ReturnValue; taint; manual |
+| 352 | Summary: org.apache.commons.lang3; StringUtils; false; replaceEachRepeatedly; ; ; Argument[0]; ReturnValue; taint; manual |
+| 353 | Summary: org.apache.commons.lang3; StringUtils; false; replaceEachRepeatedly; ; ; Argument[2].ArrayElement; ReturnValue; taint; manual |
+| 354 | Summary: org.apache.commons.lang3; StringUtils; false; replaceFirst; ; ; Argument[0]; ReturnValue; taint; manual |
+| 355 | Summary: org.apache.commons.lang3; StringUtils; false; replaceFirst; ; ; Argument[2]; ReturnValue; taint; manual |
+| 356 | Summary: org.apache.commons.lang3; StringUtils; false; replaceIgnoreCase; ; ; Argument[0]; ReturnValue; taint; manual |
+| 357 | Summary: org.apache.commons.lang3; StringUtils; false; replaceIgnoreCase; ; ; Argument[2]; ReturnValue; taint; manual |
+| 358 | Summary: org.apache.commons.lang3; StringUtils; false; replaceOnce; ; ; Argument[0]; ReturnValue; taint; manual |
+| 359 | Summary: org.apache.commons.lang3; StringUtils; false; replaceOnce; ; ; Argument[2]; ReturnValue; taint; manual |
+| 360 | Summary: org.apache.commons.lang3; StringUtils; false; replaceOnceIgnoreCase; ; ; Argument[0]; ReturnValue; taint; manual |
+| 361 | Summary: org.apache.commons.lang3; StringUtils; false; replaceOnceIgnoreCase; ; ; Argument[2]; ReturnValue; taint; manual |
+| 362 | Summary: org.apache.commons.lang3; StringUtils; false; replacePattern; ; ; Argument[0]; ReturnValue; taint; manual |
+| 363 | Summary: org.apache.commons.lang3; StringUtils; false; replacePattern; ; ; Argument[2]; ReturnValue; taint; manual |
+| 364 | Summary: org.apache.commons.lang3; StringUtils; false; reverse; ; ; Argument[0]; ReturnValue; taint; manual |
+| 365 | Summary: org.apache.commons.lang3; StringUtils; false; reverseDelimited; ; ; Argument[0]; ReturnValue; taint; manual |
+| 366 | Summary: org.apache.commons.lang3; StringUtils; false; right; ; ; Argument[0]; ReturnValue; taint; manual |
+| 367 | Summary: org.apache.commons.lang3; StringUtils; false; rightPad; (java.lang.String,int,java.lang.String); ; Argument[2]; ReturnValue; taint; manual |
+| 368 | Summary: org.apache.commons.lang3; StringUtils; false; rightPad; ; ; Argument[0]; ReturnValue; taint; manual |
+| 369 | Summary: org.apache.commons.lang3; StringUtils; false; rotate; ; ; Argument[0]; ReturnValue; taint; manual |
+| 370 | Summary: org.apache.commons.lang3; StringUtils; false; split; (java.lang.String); ; Argument[0]; ReturnValue; taint; manual |
+| 371 | Summary: org.apache.commons.lang3; StringUtils; false; split; (java.lang.String,char); ; Argument[0]; ReturnValue; taint; manual |
+| 372 | Summary: org.apache.commons.lang3; StringUtils; false; split; (java.lang.String,java.lang.String); ; Argument[0]; ReturnValue; taint; manual |
+| 373 | Summary: org.apache.commons.lang3; StringUtils; false; split; (java.lang.String,java.lang.String,int); ; Argument[0]; ReturnValue; taint; manual |
+| 374 | Summary: org.apache.commons.lang3; StringUtils; false; splitByCharacterType; ; ; Argument[0]; ReturnValue; taint; manual |
+| 375 | Summary: org.apache.commons.lang3; StringUtils; false; splitByCharacterTypeCamelCase; ; ; Argument[0]; ReturnValue; taint; manual |
+| 376 | Summary: org.apache.commons.lang3; StringUtils; false; splitByWholeSeparator; ; ; Argument[0]; ReturnValue; taint; manual |
+| 377 | Summary: org.apache.commons.lang3; StringUtils; false; splitByWholeSeparatorPreserveAllTokens; ; ; Argument[0]; ReturnValue; taint; manual |
+| 378 | Summary: org.apache.commons.lang3; StringUtils; false; splitPreserveAllTokens; (java.lang.String); ; Argument[0]; ReturnValue; taint; manual |
+| 379 | Summary: org.apache.commons.lang3; StringUtils; false; splitPreserveAllTokens; (java.lang.String,char); ; Argument[0]; ReturnValue; taint; manual |
+| 380 | Summary: org.apache.commons.lang3; StringUtils; false; splitPreserveAllTokens; (java.lang.String,java.lang.String); ; Argument[0]; ReturnValue; taint; manual |
+| 381 | Summary: org.apache.commons.lang3; StringUtils; false; splitPreserveAllTokens; (java.lang.String,java.lang.String,int); ; Argument[0]; ReturnValue; taint; manual |
+| 382 | Summary: org.apache.commons.lang3; StringUtils; false; strip; (java.lang.String); ; Argument[0]; ReturnValue; taint; manual |
+| 383 | Summary: org.apache.commons.lang3; StringUtils; false; strip; (java.lang.String,java.lang.String); ; Argument[0]; ReturnValue; taint; manual |
+| 384 | Summary: org.apache.commons.lang3; StringUtils; false; stripAccents; ; ; Argument[0]; ReturnValue; taint; manual |
+| 385 | Summary: org.apache.commons.lang3; StringUtils; false; stripAll; ; ; Argument[0].ArrayElement; ReturnValue.ArrayElement; taint; manual |
+| 386 | Summary: org.apache.commons.lang3; StringUtils; false; stripEnd; ; ; Argument[0]; ReturnValue; taint; manual |
+| 387 | Summary: org.apache.commons.lang3; StringUtils; false; stripStart; ; ; Argument[0]; ReturnValue; taint; manual |
+| 388 | Summary: org.apache.commons.lang3; StringUtils; false; stripToEmpty; ; ; Argument[0]; ReturnValue; taint; manual |
+| 389 | Summary: org.apache.commons.lang3; StringUtils; false; stripToNull; ; ; Argument[0]; ReturnValue; taint; manual |
+| 390 | Summary: org.apache.commons.lang3; StringUtils; false; substring; ; ; Argument[0]; ReturnValue; taint; manual |
+| 391 | Summary: org.apache.commons.lang3; StringUtils; false; substringAfter; ; ; Argument[0]; ReturnValue; taint; manual |
+| 392 | Summary: org.apache.commons.lang3; StringUtils; false; substringAfterLast; ; ; Argument[0]; ReturnValue; taint; manual |
+| 393 | Summary: org.apache.commons.lang3; StringUtils; false; substringBefore; ; ; Argument[0]; ReturnValue; taint; manual |
+| 394 | Summary: org.apache.commons.lang3; StringUtils; false; substringBeforeLast; ; ; Argument[0]; ReturnValue; taint; manual |
+| 395 | Summary: org.apache.commons.lang3; StringUtils; false; substringBetween; ; ; Argument[0]; ReturnValue; taint; manual |
+| 396 | Summary: org.apache.commons.lang3; StringUtils; false; substringsBetween; ; ; Argument[0]; ReturnValue; taint; manual |
+| 397 | Summary: org.apache.commons.lang3; StringUtils; false; swapCase; ; ; Argument[0]; ReturnValue; taint; manual |
+| 398 | Summary: org.apache.commons.lang3; StringUtils; false; toCodePoints; ; ; Argument[0]; ReturnValue; taint; manual |
+| 399 | Summary: org.apache.commons.lang3; StringUtils; false; toEncodedString; ; ; Argument[0]; ReturnValue; taint; manual |
+| 400 | Summary: org.apache.commons.lang3; StringUtils; false; toRootLowerCase; ; ; Argument[0]; ReturnValue; taint; manual |
+| 401 | Summary: org.apache.commons.lang3; StringUtils; false; toRootUpperCase; ; ; Argument[0]; ReturnValue; taint; manual |
+| 402 | Summary: org.apache.commons.lang3; StringUtils; false; toString; ; ; Argument[0]; ReturnValue; taint; manual |
+| 403 | Summary: org.apache.commons.lang3; StringUtils; false; trim; ; ; Argument[0]; ReturnValue; taint; manual |
+| 404 | Summary: org.apache.commons.lang3; StringUtils; false; trimToEmpty; ; ; Argument[0]; ReturnValue; taint; manual |
+| 405 | Summary: org.apache.commons.lang3; StringUtils; false; trimToNull; ; ; Argument[0]; ReturnValue; taint; manual |
+| 406 | Summary: org.apache.commons.lang3; StringUtils; false; truncate; ; ; Argument[0]; ReturnValue; taint; manual |
+| 407 | Summary: org.apache.commons.lang3; StringUtils; false; uncapitalize; ; ; Argument[0]; ReturnValue; taint; manual |
+| 408 | Summary: org.apache.commons.lang3; StringUtils; false; unwrap; ; ; Argument[0]; ReturnValue; taint; manual |
+| 409 | Summary: org.apache.commons.lang3; StringUtils; false; upperCase; (java.lang.String); ; Argument[0]; ReturnValue; taint; manual |
+| 410 | Summary: org.apache.commons.lang3; StringUtils; false; upperCase; (java.lang.String,java.util.Locale); ; Argument[0]; ReturnValue; taint; manual |
+| 411 | Summary: org.apache.commons.lang3; StringUtils; false; valueOf; ; ; Argument[0]; ReturnValue; taint; manual |
+| 412 | Summary: org.apache.commons.lang3; StringUtils; false; wrap; (java.lang.String,char); ; Argument[0]; ReturnValue; taint; manual |
+| 413 | Summary: org.apache.commons.lang3; StringUtils; false; wrap; (java.lang.String,java.lang.String); ; Argument[0..1]; ReturnValue; taint; manual |
+| 414 | Summary: org.apache.commons.lang3; StringUtils; false; wrapIfMissing; (java.lang.String,char); ; Argument[0]; ReturnValue; taint; manual |
+| 415 | Summary: org.apache.commons.lang3; StringUtils; false; wrapIfMissing; (java.lang.String,java.lang.String); ; Argument[0..1]; ReturnValue; taint; manual |
 | 416 | Summary: org.apache.commons.text.lookup; StringLookup; true; lookup; ; ; Argument[this]; ReturnValue; taint; manual |
 | 417 | Summary: org.apache.commons.text.lookup; StringLookupFactory; false; mapStringLookup; ; ; Argument[0].MapValue; ReturnValue; taint; manual |
 | 418 | Summary: org.apache.commons.text; StrBuilder; false; StrBuilder; (java.lang.String); ; Argument[0]; Argument[this]; taint; manual |
-| 419 | Summary: org.apache.commons.text; StrBuilder; false; append; ; ; Argument[this]; ReturnValue; value; manual |
-| 420 | Summary: org.apache.commons.text; StrBuilder; false; append; (char[]); ; Argument[0]; Argument[this]; taint; manual |
-| 421 | Summary: org.apache.commons.text; StrBuilder; false; append; (char[],int,int); ; Argument[0]; Argument[this]; taint; manual |
-| 422 | Summary: org.apache.commons.text; StrBuilder; false; append; (java.lang.CharSequence); ; Argument[0]; Argument[this]; taint; manual |
-| 423 | Summary: org.apache.commons.text; StrBuilder; false; append; (java.lang.CharSequence,int,int); ; Argument[0]; Argument[this]; taint; manual |
-| 424 | Summary: org.apache.commons.text; StrBuilder; false; append; (java.lang.Object); ; Argument[0]; Argument[this]; taint; manual |
-| 425 | Summary: org.apache.commons.text; StrBuilder; false; append; (java.lang.String); ; Argument[0]; Argument[this]; taint; manual |
-| 426 | Summary: org.apache.commons.text; StrBuilder; false; append; (java.lang.String,int,int); ; Argument[0]; Argument[this]; taint; manual |
-| 427 | Summary: org.apache.commons.text; StrBuilder; false; append; (java.lang.String,java.lang.Object[]); ; Argument[0]; Argument[this]; taint; manual |
-| 428 | Summary: org.apache.commons.text; StrBuilder; false; append; (java.lang.String,java.lang.Object[]); ; Argument[1].ArrayElement; Argument[this]; taint; manual |
-| 429 | Summary: org.apache.commons.text; StrBuilder; false; append; (java.lang.StringBuffer); ; Argument[0]; Argument[this]; taint; manual |
-| 430 | Summary: org.apache.commons.text; StrBuilder; false; append; (java.lang.StringBuffer,int,int); ; Argument[0]; Argument[this]; taint; manual |
-| 431 | Summary: org.apache.commons.text; StrBuilder; false; append; (java.lang.StringBuilder); ; Argument[0]; Argument[this]; taint; manual |
-| 432 | Summary: org.apache.commons.text; StrBuilder; false; append; (java.lang.StringBuilder,int,int); ; Argument[0]; Argument[this]; taint; manual |
-| 433 | Summary: org.apache.commons.text; StrBuilder; false; append; (java.nio.CharBuffer); ; Argument[0]; Argument[this]; taint; manual |
-| 434 | Summary: org.apache.commons.text; StrBuilder; false; append; (java.nio.CharBuffer,int,int); ; Argument[0]; Argument[this]; taint; manual |
-| 435 | Summary: org.apache.commons.text; StrBuilder; false; append; (org.apache.commons.text.StrBuilder); ; Argument[0]; Argument[this]; taint; manual |
-| 436 | Summary: org.apache.commons.text; StrBuilder; false; appendAll; ; ; Argument[this]; ReturnValue; value; manual |
-| 437 | Summary: org.apache.commons.text; StrBuilder; false; appendAll; (Iterable); ; Argument[0].Element; Argument[this]; taint; manual |
-| 438 | Summary: org.apache.commons.text; StrBuilder; false; appendAll; (Iterator); ; Argument[0].Element; Argument[this]; taint; manual |
-| 439 | Summary: org.apache.commons.text; StrBuilder; false; appendAll; (Object[]); ; Argument[0].ArrayElement; Argument[this]; taint; manual |
-| 440 | Summary: org.apache.commons.text; StrBuilder; false; appendFixedWidthPadLeft; ; ; Argument[this]; ReturnValue; value; manual |
-| 441 | Summary: org.apache.commons.text; StrBuilder; false; appendFixedWidthPadLeft; ; ; Argument[0]; Argument[this]; taint; manual |
-| 442 | Summary: org.apache.commons.text; StrBuilder; false; appendFixedWidthPadRight; ; ; Argument[this]; ReturnValue; value; manual |
-| 443 | Summary: org.apache.commons.text; StrBuilder; false; appendFixedWidthPadRight; ; ; Argument[0]; Argument[this]; taint; manual |
+| 419 | Summary: org.apache.commons.text; StrBuilder; false; append; (char[]); ; Argument[0]; Argument[this]; taint; manual |
+| 420 | Summary: org.apache.commons.text; StrBuilder; false; append; (char[],int,int); ; Argument[0]; Argument[this]; taint; manual |
+| 421 | Summary: org.apache.commons.text; StrBuilder; false; append; (java.lang.CharSequence); ; Argument[0]; Argument[this]; taint; manual |
+| 422 | Summary: org.apache.commons.text; StrBuilder; false; append; (java.lang.CharSequence,int,int); ; Argument[0]; Argument[this]; taint; manual |
+| 423 | Summary: org.apache.commons.text; StrBuilder; false; append; (java.lang.Object); ; Argument[0]; Argument[this]; taint; manual |
+| 424 | Summary: org.apache.commons.text; StrBuilder; false; append; (java.lang.String); ; Argument[0]; Argument[this]; taint; manual |
+| 425 | Summary: org.apache.commons.text; StrBuilder; false; append; (java.lang.String,int,int); ; Argument[0]; Argument[this]; taint; manual |
+| 426 | Summary: org.apache.commons.text; StrBuilder; false; append; (java.lang.String,java.lang.Object[]); ; Argument[0]; Argument[this]; taint; manual |
+| 427 | Summary: org.apache.commons.text; StrBuilder; false; append; (java.lang.String,java.lang.Object[]); ; Argument[1].ArrayElement; Argument[this]; taint; manual |
+| 428 | Summary: org.apache.commons.text; StrBuilder; false; append; (java.lang.StringBuffer); ; Argument[0]; Argument[this]; taint; manual |
+| 429 | Summary: org.apache.commons.text; StrBuilder; false; append; (java.lang.StringBuffer,int,int); ; Argument[0]; Argument[this]; taint; manual |
+| 430 | Summary: org.apache.commons.text; StrBuilder; false; append; (java.lang.StringBuilder); ; Argument[0]; Argument[this]; taint; manual |
+| 431 | Summary: org.apache.commons.text; StrBuilder; false; append; (java.lang.StringBuilder,int,int); ; Argument[0]; Argument[this]; taint; manual |
+| 432 | Summary: org.apache.commons.text; StrBuilder; false; append; (java.nio.CharBuffer); ; Argument[0]; Argument[this]; taint; manual |
+| 433 | Summary: org.apache.commons.text; StrBuilder; false; append; (java.nio.CharBuffer,int,int); ; Argument[0]; Argument[this]; taint; manual |
+| 434 | Summary: org.apache.commons.text; StrBuilder; false; append; (org.apache.commons.text.StrBuilder); ; Argument[0]; Argument[this]; taint; manual |
+| 435 | Summary: org.apache.commons.text; StrBuilder; false; append; ; ; Argument[this]; ReturnValue; value; manual |
+| 436 | Summary: org.apache.commons.text; StrBuilder; false; appendAll; (Iterable); ; Argument[0].Element; Argument[this]; taint; manual |
+| 437 | Summary: org.apache.commons.text; StrBuilder; false; appendAll; (Iterator); ; Argument[0].Element; Argument[this]; taint; manual |
+| 438 | Summary: org.apache.commons.text; StrBuilder; false; appendAll; (Object[]); ; Argument[0].ArrayElement; Argument[this]; taint; manual |
+| 439 | Summary: org.apache.commons.text; StrBuilder; false; appendAll; ; ; Argument[this]; ReturnValue; value; manual |
+| 440 | Summary: org.apache.commons.text; StrBuilder; false; appendFixedWidthPadLeft; ; ; Argument[0]; Argument[this]; taint; manual |
+| 441 | Summary: org.apache.commons.text; StrBuilder; false; appendFixedWidthPadLeft; ; ; Argument[this]; ReturnValue; value; manual |
+| 442 | Summary: org.apache.commons.text; StrBuilder; false; appendFixedWidthPadRight; ; ; Argument[0]; Argument[this]; taint; manual |
+| 443 | Summary: org.apache.commons.text; StrBuilder; false; appendFixedWidthPadRight; ; ; Argument[this]; ReturnValue; value; manual |
 | 444 | Summary: org.apache.commons.text; StrBuilder; false; appendNewLine; ; ; Argument[this]; ReturnValue; value; manual |
 | 445 | Summary: org.apache.commons.text; StrBuilder; false; appendNull; ; ; Argument[this]; ReturnValue; value; manual |
 | 446 | Summary: org.apache.commons.text; StrBuilder; false; appendPadding; ; ; Argument[this]; ReturnValue; value; manual |
-| 447 | Summary: org.apache.commons.text; StrBuilder; false; appendSeparator; ; ; Argument[this]; ReturnValue; value; manual |
-| 448 | Summary: org.apache.commons.text; StrBuilder; false; appendSeparator; (java.lang.String); ; Argument[0]; Argument[this]; taint; manual |
-| 449 | Summary: org.apache.commons.text; StrBuilder; false; appendSeparator; (java.lang.String,int); ; Argument[0]; Argument[this]; taint; manual |
-| 450 | Summary: org.apache.commons.text; StrBuilder; false; appendSeparator; (java.lang.String,java.lang.String); ; Argument[0..1]; Argument[this]; taint; manual |
+| 447 | Summary: org.apache.commons.text; StrBuilder; false; appendSeparator; (java.lang.String); ; Argument[0]; Argument[this]; taint; manual |
+| 448 | Summary: org.apache.commons.text; StrBuilder; false; appendSeparator; (java.lang.String,int); ; Argument[0]; Argument[this]; taint; manual |
+| 449 | Summary: org.apache.commons.text; StrBuilder; false; appendSeparator; (java.lang.String,java.lang.String); ; Argument[0..1]; Argument[this]; taint; manual |
+| 450 | Summary: org.apache.commons.text; StrBuilder; false; appendSeparator; ; ; Argument[this]; ReturnValue; value; manual |
 | 451 | Summary: org.apache.commons.text; StrBuilder; false; appendTo; ; ; Argument[this]; Argument[0]; taint; manual |
-| 452 | Summary: org.apache.commons.text; StrBuilder; false; appendWithSeparators; ; ; Argument[this]; ReturnValue; value; manual |
-| 453 | Summary: org.apache.commons.text; StrBuilder; false; appendWithSeparators; ; ; Argument[1]; Argument[this]; taint; manual |
-| 454 | Summary: org.apache.commons.text; StrBuilder; false; appendWithSeparators; (Iterable,String); ; Argument[0].Element; Argument[this]; taint; manual |
-| 455 | Summary: org.apache.commons.text; StrBuilder; false; appendWithSeparators; (Iterator,String); ; Argument[0].Element; Argument[this]; taint; manual |
-| 456 | Summary: org.apache.commons.text; StrBuilder; false; appendWithSeparators; (Object[],String); ; Argument[0].ArrayElement; Argument[this]; taint; manual |
-| 457 | Summary: org.apache.commons.text; StrBuilder; false; appendln; ; ; Argument[this]; ReturnValue; value; manual |
-| 458 | Summary: org.apache.commons.text; StrBuilder; false; appendln; (char[]); ; Argument[0]; Argument[this]; taint; manual |
-| 459 | Summary: org.apache.commons.text; StrBuilder; false; appendln; (char[],int,int); ; Argument[0]; Argument[this]; taint; manual |
-| 460 | Summary: org.apache.commons.text; StrBuilder; false; appendln; (java.lang.Object); ; Argument[0]; Argument[this]; taint; manual |
-| 461 | Summary: org.apache.commons.text; StrBuilder; false; appendln; (java.lang.String); ; Argument[0]; Argument[this]; taint; manual |
-| 462 | Summary: org.apache.commons.text; StrBuilder; false; appendln; (java.lang.String,int,int); ; Argument[0]; Argument[this]; taint; manual |
-| 463 | Summary: org.apache.commons.text; StrBuilder; false; appendln; (java.lang.String,java.lang.Object[]); ; Argument[0]; Argument[this]; taint; manual |
-| 464 | Summary: org.apache.commons.text; StrBuilder; false; appendln; (java.lang.String,java.lang.Object[]); ; Argument[1].ArrayElement; Argument[this]; taint; manual |
-| 465 | Summary: org.apache.commons.text; StrBuilder; false; appendln; (java.lang.StringBuffer); ; Argument[0]; Argument[this]; taint; manual |
-| 466 | Summary: org.apache.commons.text; StrBuilder; false; appendln; (java.lang.StringBuffer,int,int); ; Argument[0]; Argument[this]; taint; manual |
-| 467 | Summary: org.apache.commons.text; StrBuilder; false; appendln; (java.lang.StringBuilder); ; Argument[0]; Argument[this]; taint; manual |
-| 468 | Summary: org.apache.commons.text; StrBuilder; false; appendln; (java.lang.StringBuilder,int,int); ; Argument[0]; Argument[this]; taint; manual |
-| 469 | Summary: org.apache.commons.text; StrBuilder; false; appendln; (org.apache.commons.text.StrBuilder); ; Argument[0]; Argument[this]; taint; manual |
+| 452 | Summary: org.apache.commons.text; StrBuilder; false; appendWithSeparators; (Iterable,String); ; Argument[0].Element; Argument[this]; taint; manual |
+| 453 | Summary: org.apache.commons.text; StrBuilder; false; appendWithSeparators; (Iterator,String); ; Argument[0].Element; Argument[this]; taint; manual |
+| 454 | Summary: org.apache.commons.text; StrBuilder; false; appendWithSeparators; (Object[],String); ; Argument[0].ArrayElement; Argument[this]; taint; manual |
+| 455 | Summary: org.apache.commons.text; StrBuilder; false; appendWithSeparators; ; ; Argument[1]; Argument[this]; taint; manual |
+| 456 | Summary: org.apache.commons.text; StrBuilder; false; appendWithSeparators; ; ; Argument[this]; ReturnValue; value; manual |
+| 457 | Summary: org.apache.commons.text; StrBuilder; false; appendln; (char[]); ; Argument[0]; Argument[this]; taint; manual |
+| 458 | Summary: org.apache.commons.text; StrBuilder; false; appendln; (char[],int,int); ; Argument[0]; Argument[this]; taint; manual |
+| 459 | Summary: org.apache.commons.text; StrBuilder; false; appendln; (java.lang.Object); ; Argument[0]; Argument[this]; taint; manual |
+| 460 | Summary: org.apache.commons.text; StrBuilder; false; appendln; (java.lang.String); ; Argument[0]; Argument[this]; taint; manual |
+| 461 | Summary: org.apache.commons.text; StrBuilder; false; appendln; (java.lang.String,int,int); ; Argument[0]; Argument[this]; taint; manual |
+| 462 | Summary: org.apache.commons.text; StrBuilder; false; appendln; (java.lang.String,java.lang.Object[]); ; Argument[0]; Argument[this]; taint; manual |
+| 463 | Summary: org.apache.commons.text; StrBuilder; false; appendln; (java.lang.String,java.lang.Object[]); ; Argument[1].ArrayElement; Argument[this]; taint; manual |
+| 464 | Summary: org.apache.commons.text; StrBuilder; false; appendln; (java.lang.StringBuffer); ; Argument[0]; Argument[this]; taint; manual |
+| 465 | Summary: org.apache.commons.text; StrBuilder; false; appendln; (java.lang.StringBuffer,int,int); ; Argument[0]; Argument[this]; taint; manual |
+| 466 | Summary: org.apache.commons.text; StrBuilder; false; appendln; (java.lang.StringBuilder); ; Argument[0]; Argument[this]; taint; manual |
+| 467 | Summary: org.apache.commons.text; StrBuilder; false; appendln; (java.lang.StringBuilder,int,int); ; Argument[0]; Argument[this]; taint; manual |
+| 468 | Summary: org.apache.commons.text; StrBuilder; false; appendln; (org.apache.commons.text.StrBuilder); ; Argument[0]; Argument[this]; taint; manual |
+| 469 | Summary: org.apache.commons.text; StrBuilder; false; appendln; ; ; Argument[this]; ReturnValue; value; manual |
 | 470 | Summary: org.apache.commons.text; StrBuilder; false; asReader; ; ; Argument[this]; ReturnValue; taint; manual |
 | 471 | Summary: org.apache.commons.text; StrBuilder; false; asTokenizer; ; ; Argument[this]; ReturnValue; taint; manual |
 | 472 | Summary: org.apache.commons.text; StrBuilder; false; build; ; ; Argument[this]; ReturnValue; taint; manual |
@@ -479,19 +479,19 @@ models
 | 478 | Summary: org.apache.commons.text; StrBuilder; false; getChars; (char[]); ; Argument[this]; Argument[0]; taint; manual |
 | 479 | Summary: org.apache.commons.text; StrBuilder; false; getChars; (char[]); ; Argument[this]; ReturnValue; taint; manual |
 | 480 | Summary: org.apache.commons.text; StrBuilder; false; getChars; (int,int,char[],int); ; Argument[this]; Argument[2]; taint; manual |
-| 481 | Summary: org.apache.commons.text; StrBuilder; false; insert; ; ; Argument[this]; ReturnValue; value; manual |
-| 482 | Summary: org.apache.commons.text; StrBuilder; false; insert; ; ; Argument[1]; Argument[this]; taint; manual |
+| 481 | Summary: org.apache.commons.text; StrBuilder; false; insert; ; ; Argument[1]; Argument[this]; taint; manual |
+| 482 | Summary: org.apache.commons.text; StrBuilder; false; insert; ; ; Argument[this]; ReturnValue; value; manual |
 | 483 | Summary: org.apache.commons.text; StrBuilder; false; leftString; ; ; Argument[this]; ReturnValue; taint; manual |
 | 484 | Summary: org.apache.commons.text; StrBuilder; false; midString; ; ; Argument[this]; ReturnValue; taint; manual |
 | 485 | Summary: org.apache.commons.text; StrBuilder; false; minimizeCapacity; ; ; Argument[this]; ReturnValue; value; manual |
 | 486 | Summary: org.apache.commons.text; StrBuilder; false; readFrom; ; ; Argument[0]; Argument[this]; taint; manual |
-| 487 | Summary: org.apache.commons.text; StrBuilder; false; replace; ; ; Argument[this]; ReturnValue; value; manual |
-| 488 | Summary: org.apache.commons.text; StrBuilder; false; replace; (int,int,java.lang.String); ; Argument[2]; Argument[this]; taint; manual |
-| 489 | Summary: org.apache.commons.text; StrBuilder; false; replace; (org.apache.commons.text.StrMatcher,java.lang.String,int,int,int); ; Argument[1]; Argument[this]; taint; manual |
-| 490 | Summary: org.apache.commons.text; StrBuilder; false; replaceAll; ; ; Argument[this]; ReturnValue; value; manual |
-| 491 | Summary: org.apache.commons.text; StrBuilder; false; replaceAll; ; ; Argument[1]; Argument[this]; taint; manual |
-| 492 | Summary: org.apache.commons.text; StrBuilder; false; replaceFirst; ; ; Argument[this]; ReturnValue; value; manual |
-| 493 | Summary: org.apache.commons.text; StrBuilder; false; replaceFirst; ; ; Argument[1]; Argument[this]; taint; manual |
+| 487 | Summary: org.apache.commons.text; StrBuilder; false; replace; (int,int,java.lang.String); ; Argument[2]; Argument[this]; taint; manual |
+| 488 | Summary: org.apache.commons.text; StrBuilder; false; replace; (org.apache.commons.text.StrMatcher,java.lang.String,int,int,int); ; Argument[1]; Argument[this]; taint; manual |
+| 489 | Summary: org.apache.commons.text; StrBuilder; false; replace; ; ; Argument[this]; ReturnValue; value; manual |
+| 490 | Summary: org.apache.commons.text; StrBuilder; false; replaceAll; ; ; Argument[1]; Argument[this]; taint; manual |
+| 491 | Summary: org.apache.commons.text; StrBuilder; false; replaceAll; ; ; Argument[this]; ReturnValue; value; manual |
+| 492 | Summary: org.apache.commons.text; StrBuilder; false; replaceFirst; ; ; Argument[1]; Argument[this]; taint; manual |
+| 493 | Summary: org.apache.commons.text; StrBuilder; false; replaceFirst; ; ; Argument[this]; ReturnValue; value; manual |
 | 494 | Summary: org.apache.commons.text; StrBuilder; false; reverse; ; ; Argument[this]; ReturnValue; value; manual |
 | 495 | Summary: org.apache.commons.text; StrBuilder; false; rightString; ; ; Argument[this]; ReturnValue; taint; manual |
 | 496 | Summary: org.apache.commons.text; StrBuilder; false; setCharAt; ; ; Argument[this]; ReturnValue; value; manual |
@@ -518,26 +518,26 @@ models
 | 517 | Summary: org.apache.commons.text; StrTokenizer; false; previousToken; ; ; Argument[this]; ReturnValue; taint; manual |
 | 518 | Summary: org.apache.commons.text; StrTokenizer; false; reset; ; ; Argument[0]; ReturnValue; taint; manual |
 | 519 | Summary: org.apache.commons.text; StrTokenizer; false; toString; ; ; Argument[this]; ReturnValue; taint; manual |
-| 520 | Summary: org.apache.commons.text; StringSubstitutor; false; StringSubstitutor; ; ; Argument[0]; Argument[this]; taint; manual |
-| 521 | Summary: org.apache.commons.text; StringSubstitutor; false; StringSubstitutor; ; ; Argument[0].MapValue; Argument[this]; taint; manual |
-| 522 | Summary: org.apache.commons.text; StringSubstitutor; false; replace; ; ; Argument[this]; ReturnValue; taint; manual |
-| 523 | Summary: org.apache.commons.text; StringSubstitutor; false; replace; (char[]); ; Argument[0]; ReturnValue; taint; manual |
-| 524 | Summary: org.apache.commons.text; StringSubstitutor; false; replace; (char[],int,int); ; Argument[0]; ReturnValue; taint; manual |
-| 525 | Summary: org.apache.commons.text; StringSubstitutor; false; replace; (java.lang.CharSequence); ; Argument[0]; ReturnValue; taint; manual |
-| 526 | Summary: org.apache.commons.text; StringSubstitutor; false; replace; (java.lang.CharSequence,int,int); ; Argument[0]; ReturnValue; taint; manual |
-| 527 | Summary: org.apache.commons.text; StringSubstitutor; false; replace; (java.lang.Object); ; Argument[0]; ReturnValue; taint; manual |
-| 528 | Summary: org.apache.commons.text; StringSubstitutor; false; replace; (java.lang.Object,java.util.Map); ; Argument[0]; ReturnValue; taint; manual |
-| 529 | Summary: org.apache.commons.text; StringSubstitutor; false; replace; (java.lang.Object,java.util.Map); ; Argument[1].MapValue; ReturnValue; taint; manual |
-| 530 | Summary: org.apache.commons.text; StringSubstitutor; false; replace; (java.lang.Object,java.util.Map,java.lang.String,java.lang.String); ; Argument[0]; ReturnValue; taint; manual |
-| 531 | Summary: org.apache.commons.text; StringSubstitutor; false; replace; (java.lang.Object,java.util.Map,java.lang.String,java.lang.String); ; Argument[1].MapValue; ReturnValue; taint; manual |
-| 532 | Summary: org.apache.commons.text; StringSubstitutor; false; replace; (java.lang.Object,java.util.Properties); ; Argument[0]; ReturnValue; taint; manual |
-| 533 | Summary: org.apache.commons.text; StringSubstitutor; false; replace; (java.lang.Object,java.util.Properties); ; Argument[1].MapValue; ReturnValue; taint; manual |
-| 534 | Summary: org.apache.commons.text; StringSubstitutor; false; replace; (java.lang.String); ; Argument[0]; ReturnValue; taint; manual |
-| 535 | Summary: org.apache.commons.text; StringSubstitutor; false; replace; (java.lang.String,int,int); ; Argument[0]; ReturnValue; taint; manual |
-| 536 | Summary: org.apache.commons.text; StringSubstitutor; false; replace; (java.lang.StringBuffer); ; Argument[0]; ReturnValue; taint; manual |
-| 537 | Summary: org.apache.commons.text; StringSubstitutor; false; replace; (java.lang.StringBuffer,int,int); ; Argument[0]; ReturnValue; taint; manual |
-| 538 | Summary: org.apache.commons.text; StringSubstitutor; false; replace; (org.apache.commons.text.TextStringBuilder); ; Argument[0]; ReturnValue; taint; manual |
-| 539 | Summary: org.apache.commons.text; StringSubstitutor; false; replace; (org.apache.commons.text.TextStringBuilder,int,int); ; Argument[0]; ReturnValue; taint; manual |
+| 520 | Summary: org.apache.commons.text; StringSubstitutor; false; StringSubstitutor; ; ; Argument[0].MapValue; Argument[this]; taint; manual |
+| 521 | Summary: org.apache.commons.text; StringSubstitutor; false; StringSubstitutor; ; ; Argument[0]; Argument[this]; taint; manual |
+| 522 | Summary: org.apache.commons.text; StringSubstitutor; false; replace; (char[]); ; Argument[0]; ReturnValue; taint; manual |
+| 523 | Summary: org.apache.commons.text; StringSubstitutor; false; replace; (char[],int,int); ; Argument[0]; ReturnValue; taint; manual |
+| 524 | Summary: org.apache.commons.text; StringSubstitutor; false; replace; (java.lang.CharSequence); ; Argument[0]; ReturnValue; taint; manual |
+| 525 | Summary: org.apache.commons.text; StringSubstitutor; false; replace; (java.lang.CharSequence,int,int); ; Argument[0]; ReturnValue; taint; manual |
+| 526 | Summary: org.apache.commons.text; StringSubstitutor; false; replace; (java.lang.Object); ; Argument[0]; ReturnValue; taint; manual |
+| 527 | Summary: org.apache.commons.text; StringSubstitutor; false; replace; (java.lang.Object,java.util.Map); ; Argument[0]; ReturnValue; taint; manual |
+| 528 | Summary: org.apache.commons.text; StringSubstitutor; false; replace; (java.lang.Object,java.util.Map); ; Argument[1].MapValue; ReturnValue; taint; manual |
+| 529 | Summary: org.apache.commons.text; StringSubstitutor; false; replace; (java.lang.Object,java.util.Map,java.lang.String,java.lang.String); ; Argument[0]; ReturnValue; taint; manual |
+| 530 | Summary: org.apache.commons.text; StringSubstitutor; false; replace; (java.lang.Object,java.util.Map,java.lang.String,java.lang.String); ; Argument[1].MapValue; ReturnValue; taint; manual |
+| 531 | Summary: org.apache.commons.text; StringSubstitutor; false; replace; (java.lang.Object,java.util.Properties); ; Argument[0]; ReturnValue; taint; manual |
+| 532 | Summary: org.apache.commons.text; StringSubstitutor; false; replace; (java.lang.Object,java.util.Properties); ; Argument[1].MapValue; ReturnValue; taint; manual |
+| 533 | Summary: org.apache.commons.text; StringSubstitutor; false; replace; (java.lang.String); ; Argument[0]; ReturnValue; taint; manual |
+| 534 | Summary: org.apache.commons.text; StringSubstitutor; false; replace; (java.lang.String,int,int); ; Argument[0]; ReturnValue; taint; manual |
+| 535 | Summary: org.apache.commons.text; StringSubstitutor; false; replace; (java.lang.StringBuffer); ; Argument[0]; ReturnValue; taint; manual |
+| 536 | Summary: org.apache.commons.text; StringSubstitutor; false; replace; (java.lang.StringBuffer,int,int); ; Argument[0]; ReturnValue; taint; manual |
+| 537 | Summary: org.apache.commons.text; StringSubstitutor; false; replace; (org.apache.commons.text.TextStringBuilder); ; Argument[0]; ReturnValue; taint; manual |
+| 538 | Summary: org.apache.commons.text; StringSubstitutor; false; replace; (org.apache.commons.text.TextStringBuilder,int,int); ; Argument[0]; ReturnValue; taint; manual |
+| 539 | Summary: org.apache.commons.text; StringSubstitutor; false; replace; ; ; Argument[this]; ReturnValue; taint; manual |
 | 540 | Summary: org.apache.commons.text; StringSubstitutor; false; replaceIn; (java.lang.StringBuffer); ; Argument[this]; Argument[0]; taint; manual |
 | 541 | Summary: org.apache.commons.text; StringSubstitutor; false; replaceIn; (java.lang.StringBuffer,int,int); ; Argument[this]; Argument[0]; taint; manual |
 | 542 | Summary: org.apache.commons.text; StringSubstitutor; false; replaceIn; (java.lang.StringBuilder); ; Argument[this]; Argument[0]; taint; manual |
@@ -560,57 +560,57 @@ models
 | 559 | Summary: org.apache.commons.text; StringTokenizer; false; toString; ; ; Argument[this]; ReturnValue; taint; manual |
 | 560 | Summary: org.apache.commons.text; TextStringBuilder; false; TextStringBuilder; (java.lang.CharSequence); ; Argument[0]; Argument[this]; taint; manual |
 | 561 | Summary: org.apache.commons.text; TextStringBuilder; false; TextStringBuilder; (java.lang.String); ; Argument[0]; Argument[this]; taint; manual |
-| 562 | Summary: org.apache.commons.text; TextStringBuilder; false; append; ; ; Argument[this]; ReturnValue; value; manual |
-| 563 | Summary: org.apache.commons.text; TextStringBuilder; false; append; (char[]); ; Argument[0]; Argument[this]; taint; manual |
-| 564 | Summary: org.apache.commons.text; TextStringBuilder; false; append; (char[],int,int); ; Argument[0]; Argument[this]; taint; manual |
-| 565 | Summary: org.apache.commons.text; TextStringBuilder; false; append; (java.lang.CharSequence); ; Argument[0]; Argument[this]; taint; manual |
-| 566 | Summary: org.apache.commons.text; TextStringBuilder; false; append; (java.lang.CharSequence,int,int); ; Argument[0]; Argument[this]; taint; manual |
-| 567 | Summary: org.apache.commons.text; TextStringBuilder; false; append; (java.lang.Object); ; Argument[0]; Argument[this]; taint; manual |
-| 568 | Summary: org.apache.commons.text; TextStringBuilder; false; append; (java.lang.String); ; Argument[0]; Argument[this]; taint; manual |
-| 569 | Summary: org.apache.commons.text; TextStringBuilder; false; append; (java.lang.String,int,int); ; Argument[0]; Argument[this]; taint; manual |
-| 570 | Summary: org.apache.commons.text; TextStringBuilder; false; append; (java.lang.String,java.lang.Object[]); ; Argument[0]; Argument[this]; taint; manual |
-| 571 | Summary: org.apache.commons.text; TextStringBuilder; false; append; (java.lang.String,java.lang.Object[]); ; Argument[1].ArrayElement; Argument[this]; taint; manual |
-| 572 | Summary: org.apache.commons.text; TextStringBuilder; false; append; (java.lang.StringBuffer); ; Argument[0]; Argument[this]; taint; manual |
-| 573 | Summary: org.apache.commons.text; TextStringBuilder; false; append; (java.lang.StringBuffer,int,int); ; Argument[0]; Argument[this]; taint; manual |
-| 574 | Summary: org.apache.commons.text; TextStringBuilder; false; append; (java.lang.StringBuilder); ; Argument[0]; Argument[this]; taint; manual |
-| 575 | Summary: org.apache.commons.text; TextStringBuilder; false; append; (java.lang.StringBuilder,int,int); ; Argument[0]; Argument[this]; taint; manual |
-| 576 | Summary: org.apache.commons.text; TextStringBuilder; false; append; (java.nio.CharBuffer); ; Argument[0]; Argument[this]; taint; manual |
-| 577 | Summary: org.apache.commons.text; TextStringBuilder; false; append; (java.nio.CharBuffer,int,int); ; Argument[0]; Argument[this]; taint; manual |
-| 578 | Summary: org.apache.commons.text; TextStringBuilder; false; append; (org.apache.commons.text.TextStringBuilder); ; Argument[0]; Argument[this]; taint; manual |
-| 579 | Summary: org.apache.commons.text; TextStringBuilder; false; appendAll; ; ; Argument[this]; ReturnValue; value; manual |
-| 580 | Summary: org.apache.commons.text; TextStringBuilder; false; appendAll; (Iterable); ; Argument[0].Element; Argument[this]; taint; manual |
-| 581 | Summary: org.apache.commons.text; TextStringBuilder; false; appendAll; (Iterator); ; Argument[0].Element; Argument[this]; taint; manual |
-| 582 | Summary: org.apache.commons.text; TextStringBuilder; false; appendAll; (Object[]); ; Argument[0].ArrayElement; Argument[this]; taint; manual |
-| 583 | Summary: org.apache.commons.text; TextStringBuilder; false; appendFixedWidthPadLeft; ; ; Argument[this]; ReturnValue; value; manual |
-| 584 | Summary: org.apache.commons.text; TextStringBuilder; false; appendFixedWidthPadLeft; ; ; Argument[0]; Argument[this]; taint; manual |
-| 585 | Summary: org.apache.commons.text; TextStringBuilder; false; appendFixedWidthPadRight; ; ; Argument[this]; ReturnValue; value; manual |
-| 586 | Summary: org.apache.commons.text; TextStringBuilder; false; appendFixedWidthPadRight; ; ; Argument[0]; Argument[this]; taint; manual |
+| 562 | Summary: org.apache.commons.text; TextStringBuilder; false; append; (char[]); ; Argument[0]; Argument[this]; taint; manual |
+| 563 | Summary: org.apache.commons.text; TextStringBuilder; false; append; (char[],int,int); ; Argument[0]; Argument[this]; taint; manual |
+| 564 | Summary: org.apache.commons.text; TextStringBuilder; false; append; (java.lang.CharSequence); ; Argument[0]; Argument[this]; taint; manual |
+| 565 | Summary: org.apache.commons.text; TextStringBuilder; false; append; (java.lang.CharSequence,int,int); ; Argument[0]; Argument[this]; taint; manual |
+| 566 | Summary: org.apache.commons.text; TextStringBuilder; false; append; (java.lang.Object); ; Argument[0]; Argument[this]; taint; manual |
+| 567 | Summary: org.apache.commons.text; TextStringBuilder; false; append; (java.lang.String); ; Argument[0]; Argument[this]; taint; manual |
+| 568 | Summary: org.apache.commons.text; TextStringBuilder; false; append; (java.lang.String,int,int); ; Argument[0]; Argument[this]; taint; manual |
+| 569 | Summary: org.apache.commons.text; TextStringBuilder; false; append; (java.lang.String,java.lang.Object[]); ; Argument[0]; Argument[this]; taint; manual |
+| 570 | Summary: org.apache.commons.text; TextStringBuilder; false; append; (java.lang.String,java.lang.Object[]); ; Argument[1].ArrayElement; Argument[this]; taint; manual |
+| 571 | Summary: org.apache.commons.text; TextStringBuilder; false; append; (java.lang.StringBuffer); ; Argument[0]; Argument[this]; taint; manual |
+| 572 | Summary: org.apache.commons.text; TextStringBuilder; false; append; (java.lang.StringBuffer,int,int); ; Argument[0]; Argument[this]; taint; manual |
+| 573 | Summary: org.apache.commons.text; TextStringBuilder; false; append; (java.lang.StringBuilder); ; Argument[0]; Argument[this]; taint; manual |
+| 574 | Summary: org.apache.commons.text; TextStringBuilder; false; append; (java.lang.StringBuilder,int,int); ; Argument[0]; Argument[this]; taint; manual |
+| 575 | Summary: org.apache.commons.text; TextStringBuilder; false; append; (java.nio.CharBuffer); ; Argument[0]; Argument[this]; taint; manual |
+| 576 | Summary: org.apache.commons.text; TextStringBuilder; false; append; (java.nio.CharBuffer,int,int); ; Argument[0]; Argument[this]; taint; manual |
+| 577 | Summary: org.apache.commons.text; TextStringBuilder; false; append; (org.apache.commons.text.TextStringBuilder); ; Argument[0]; Argument[this]; taint; manual |
+| 578 | Summary: org.apache.commons.text; TextStringBuilder; false; append; ; ; Argument[this]; ReturnValue; value; manual |
+| 579 | Summary: org.apache.commons.text; TextStringBuilder; false; appendAll; (Iterable); ; Argument[0].Element; Argument[this]; taint; manual |
+| 580 | Summary: org.apache.commons.text; TextStringBuilder; false; appendAll; (Iterator); ; Argument[0].Element; Argument[this]; taint; manual |
+| 581 | Summary: org.apache.commons.text; TextStringBuilder; false; appendAll; (Object[]); ; Argument[0].ArrayElement; Argument[this]; taint; manual |
+| 582 | Summary: org.apache.commons.text; TextStringBuilder; false; appendAll; ; ; Argument[this]; ReturnValue; value; manual |
+| 583 | Summary: org.apache.commons.text; TextStringBuilder; false; appendFixedWidthPadLeft; ; ; Argument[0]; Argument[this]; taint; manual |
+| 584 | Summary: org.apache.commons.text; TextStringBuilder; false; appendFixedWidthPadLeft; ; ; Argument[this]; ReturnValue; value; manual |
+| 585 | Summary: org.apache.commons.text; TextStringBuilder; false; appendFixedWidthPadRight; ; ; Argument[0]; Argument[this]; taint; manual |
+| 586 | Summary: org.apache.commons.text; TextStringBuilder; false; appendFixedWidthPadRight; ; ; Argument[this]; ReturnValue; value; manual |
 | 587 | Summary: org.apache.commons.text; TextStringBuilder; false; appendNewLine; ; ; Argument[this]; ReturnValue; value; manual |
 | 588 | Summary: org.apache.commons.text; TextStringBuilder; false; appendNull; ; ; Argument[this]; ReturnValue; value; manual |
 | 589 | Summary: org.apache.commons.text; TextStringBuilder; false; appendPadding; ; ; Argument[this]; ReturnValue; value; manual |
-| 590 | Summary: org.apache.commons.text; TextStringBuilder; false; appendSeparator; ; ; Argument[this]; ReturnValue; value; manual |
-| 591 | Summary: org.apache.commons.text; TextStringBuilder; false; appendSeparator; (java.lang.String); ; Argument[0]; Argument[this]; taint; manual |
-| 592 | Summary: org.apache.commons.text; TextStringBuilder; false; appendSeparator; (java.lang.String,int); ; Argument[0]; Argument[this]; taint; manual |
-| 593 | Summary: org.apache.commons.text; TextStringBuilder; false; appendSeparator; (java.lang.String,java.lang.String); ; Argument[0..1]; Argument[this]; taint; manual |
+| 590 | Summary: org.apache.commons.text; TextStringBuilder; false; appendSeparator; (java.lang.String); ; Argument[0]; Argument[this]; taint; manual |
+| 591 | Summary: org.apache.commons.text; TextStringBuilder; false; appendSeparator; (java.lang.String,int); ; Argument[0]; Argument[this]; taint; manual |
+| 592 | Summary: org.apache.commons.text; TextStringBuilder; false; appendSeparator; (java.lang.String,java.lang.String); ; Argument[0..1]; Argument[this]; taint; manual |
+| 593 | Summary: org.apache.commons.text; TextStringBuilder; false; appendSeparator; ; ; Argument[this]; ReturnValue; value; manual |
 | 594 | Summary: org.apache.commons.text; TextStringBuilder; false; appendTo; ; ; Argument[this]; Argument[0]; taint; manual |
-| 595 | Summary: org.apache.commons.text; TextStringBuilder; false; appendWithSeparators; ; ; Argument[this]; ReturnValue; value; manual |
-| 596 | Summary: org.apache.commons.text; TextStringBuilder; false; appendWithSeparators; ; ; Argument[1]; Argument[this]; taint; manual |
-| 597 | Summary: org.apache.commons.text; TextStringBuilder; false; appendWithSeparators; (Iterable,String); ; Argument[0].Element; Argument[this]; taint; manual |
-| 598 | Summary: org.apache.commons.text; TextStringBuilder; false; appendWithSeparators; (Iterator,String); ; Argument[0].Element; Argument[this]; taint; manual |
-| 599 | Summary: org.apache.commons.text; TextStringBuilder; false; appendWithSeparators; (Object[],String); ; Argument[0].ArrayElement; Argument[this]; taint; manual |
-| 600 | Summary: org.apache.commons.text; TextStringBuilder; false; appendln; ; ; Argument[this]; ReturnValue; value; manual |
-| 601 | Summary: org.apache.commons.text; TextStringBuilder; false; appendln; (char[]); ; Argument[0]; Argument[this]; taint; manual |
-| 602 | Summary: org.apache.commons.text; TextStringBuilder; false; appendln; (char[],int,int); ; Argument[0]; Argument[this]; taint; manual |
-| 603 | Summary: org.apache.commons.text; TextStringBuilder; false; appendln; (java.lang.Object); ; Argument[0]; Argument[this]; taint; manual |
-| 604 | Summary: org.apache.commons.text; TextStringBuilder; false; appendln; (java.lang.String); ; Argument[0]; Argument[this]; taint; manual |
-| 605 | Summary: org.apache.commons.text; TextStringBuilder; false; appendln; (java.lang.String,int,int); ; Argument[0]; Argument[this]; taint; manual |
-| 606 | Summary: org.apache.commons.text; TextStringBuilder; false; appendln; (java.lang.String,java.lang.Object[]); ; Argument[0]; Argument[this]; taint; manual |
-| 607 | Summary: org.apache.commons.text; TextStringBuilder; false; appendln; (java.lang.String,java.lang.Object[]); ; Argument[1].ArrayElement; Argument[this]; taint; manual |
-| 608 | Summary: org.apache.commons.text; TextStringBuilder; false; appendln; (java.lang.StringBuffer); ; Argument[0]; Argument[this]; taint; manual |
-| 609 | Summary: org.apache.commons.text; TextStringBuilder; false; appendln; (java.lang.StringBuffer,int,int); ; Argument[0]; Argument[this]; taint; manual |
-| 610 | Summary: org.apache.commons.text; TextStringBuilder; false; appendln; (java.lang.StringBuilder); ; Argument[0]; Argument[this]; taint; manual |
-| 611 | Summary: org.apache.commons.text; TextStringBuilder; false; appendln; (java.lang.StringBuilder,int,int); ; Argument[0]; Argument[this]; taint; manual |
-| 612 | Summary: org.apache.commons.text; TextStringBuilder; false; appendln; (org.apache.commons.text.TextStringBuilder); ; Argument[0]; Argument[this]; taint; manual |
+| 595 | Summary: org.apache.commons.text; TextStringBuilder; false; appendWithSeparators; (Iterable,String); ; Argument[0].Element; Argument[this]; taint; manual |
+| 596 | Summary: org.apache.commons.text; TextStringBuilder; false; appendWithSeparators; (Iterator,String); ; Argument[0].Element; Argument[this]; taint; manual |
+| 597 | Summary: org.apache.commons.text; TextStringBuilder; false; appendWithSeparators; (Object[],String); ; Argument[0].ArrayElement; Argument[this]; taint; manual |
+| 598 | Summary: org.apache.commons.text; TextStringBuilder; false; appendWithSeparators; ; ; Argument[1]; Argument[this]; taint; manual |
+| 599 | Summary: org.apache.commons.text; TextStringBuilder; false; appendWithSeparators; ; ; Argument[this]; ReturnValue; value; manual |
+| 600 | Summary: org.apache.commons.text; TextStringBuilder; false; appendln; (char[]); ; Argument[0]; Argument[this]; taint; manual |
+| 601 | Summary: org.apache.commons.text; TextStringBuilder; false; appendln; (char[],int,int); ; Argument[0]; Argument[this]; taint; manual |
+| 602 | Summary: org.apache.commons.text; TextStringBuilder; false; appendln; (java.lang.Object); ; Argument[0]; Argument[this]; taint; manual |
+| 603 | Summary: org.apache.commons.text; TextStringBuilder; false; appendln; (java.lang.String); ; Argument[0]; Argument[this]; taint; manual |
+| 604 | Summary: org.apache.commons.text; TextStringBuilder; false; appendln; (java.lang.String,int,int); ; Argument[0]; Argument[this]; taint; manual |
+| 605 | Summary: org.apache.commons.text; TextStringBuilder; false; appendln; (java.lang.String,java.lang.Object[]); ; Argument[0]; Argument[this]; taint; manual |
+| 606 | Summary: org.apache.commons.text; TextStringBuilder; false; appendln; (java.lang.String,java.lang.Object[]); ; Argument[1].ArrayElement; Argument[this]; taint; manual |
+| 607 | Summary: org.apache.commons.text; TextStringBuilder; false; appendln; (java.lang.StringBuffer); ; Argument[0]; Argument[this]; taint; manual |
+| 608 | Summary: org.apache.commons.text; TextStringBuilder; false; appendln; (java.lang.StringBuffer,int,int); ; Argument[0]; Argument[this]; taint; manual |
+| 609 | Summary: org.apache.commons.text; TextStringBuilder; false; appendln; (java.lang.StringBuilder); ; Argument[0]; Argument[this]; taint; manual |
+| 610 | Summary: org.apache.commons.text; TextStringBuilder; false; appendln; (java.lang.StringBuilder,int,int); ; Argument[0]; Argument[this]; taint; manual |
+| 611 | Summary: org.apache.commons.text; TextStringBuilder; false; appendln; (org.apache.commons.text.TextStringBuilder); ; Argument[0]; Argument[this]; taint; manual |
+| 612 | Summary: org.apache.commons.text; TextStringBuilder; false; appendln; ; ; Argument[this]; ReturnValue; value; manual |
 | 613 | Summary: org.apache.commons.text; TextStringBuilder; false; asReader; ; ; Argument[this]; ReturnValue; taint; manual |
 | 614 | Summary: org.apache.commons.text; TextStringBuilder; false; asTokenizer; ; ; Argument[this]; ReturnValue; taint; manual |
 | 615 | Summary: org.apache.commons.text; TextStringBuilder; false; build; ; ; Argument[this]; ReturnValue; taint; manual |
@@ -622,19 +622,19 @@ models
 | 621 | Summary: org.apache.commons.text; TextStringBuilder; false; getChars; (char[]); ; Argument[this]; Argument[0]; taint; manual |
 | 622 | Summary: org.apache.commons.text; TextStringBuilder; false; getChars; (char[]); ; Argument[this]; ReturnValue; taint; manual |
 | 623 | Summary: org.apache.commons.text; TextStringBuilder; false; getChars; (int,int,char[],int); ; Argument[this]; Argument[2]; taint; manual |
-| 624 | Summary: org.apache.commons.text; TextStringBuilder; false; insert; ; ; Argument[this]; ReturnValue; value; manual |
-| 625 | Summary: org.apache.commons.text; TextStringBuilder; false; insert; ; ; Argument[1]; Argument[this]; taint; manual |
+| 624 | Summary: org.apache.commons.text; TextStringBuilder; false; insert; ; ; Argument[1]; Argument[this]; taint; manual |
+| 625 | Summary: org.apache.commons.text; TextStringBuilder; false; insert; ; ; Argument[this]; ReturnValue; value; manual |
 | 626 | Summary: org.apache.commons.text; TextStringBuilder; false; leftString; ; ; Argument[this]; ReturnValue; taint; manual |
 | 627 | Summary: org.apache.commons.text; TextStringBuilder; false; midString; ; ; Argument[this]; ReturnValue; taint; manual |
 | 628 | Summary: org.apache.commons.text; TextStringBuilder; false; minimizeCapacity; ; ; Argument[this]; ReturnValue; value; manual |
 | 629 | Summary: org.apache.commons.text; TextStringBuilder; false; readFrom; ; ; Argument[0]; Argument[this]; taint; manual |
-| 630 | Summary: org.apache.commons.text; TextStringBuilder; false; replace; ; ; Argument[this]; ReturnValue; value; manual |
-| 631 | Summary: org.apache.commons.text; TextStringBuilder; false; replace; (int,int,java.lang.String); ; Argument[2]; Argument[this]; taint; manual |
-| 632 | Summary: org.apache.commons.text; TextStringBuilder; false; replace; (org.apache.commons.text.matcher.StringMatcher,java.lang.String,int,int,int); ; Argument[1]; Argument[this]; taint; manual |
-| 633 | Summary: org.apache.commons.text; TextStringBuilder; false; replaceAll; ; ; Argument[this]; ReturnValue; value; manual |
-| 634 | Summary: org.apache.commons.text; TextStringBuilder; false; replaceAll; ; ; Argument[1]; Argument[this]; taint; manual |
-| 635 | Summary: org.apache.commons.text; TextStringBuilder; false; replaceFirst; ; ; Argument[this]; ReturnValue; value; manual |
-| 636 | Summary: org.apache.commons.text; TextStringBuilder; false; replaceFirst; ; ; Argument[1]; Argument[this]; taint; manual |
+| 630 | Summary: org.apache.commons.text; TextStringBuilder; false; replace; (int,int,java.lang.String); ; Argument[2]; Argument[this]; taint; manual |
+| 631 | Summary: org.apache.commons.text; TextStringBuilder; false; replace; (org.apache.commons.text.matcher.StringMatcher,java.lang.String,int,int,int); ; Argument[1]; Argument[this]; taint; manual |
+| 632 | Summary: org.apache.commons.text; TextStringBuilder; false; replace; ; ; Argument[this]; ReturnValue; value; manual |
+| 633 | Summary: org.apache.commons.text; TextStringBuilder; false; replaceAll; ; ; Argument[1]; Argument[this]; taint; manual |
+| 634 | Summary: org.apache.commons.text; TextStringBuilder; false; replaceAll; ; ; Argument[this]; ReturnValue; value; manual |
+| 635 | Summary: org.apache.commons.text; TextStringBuilder; false; replaceFirst; ; ; Argument[1]; Argument[this]; taint; manual |
+| 636 | Summary: org.apache.commons.text; TextStringBuilder; false; replaceFirst; ; ; Argument[this]; ReturnValue; value; manual |
 | 637 | Summary: org.apache.commons.text; TextStringBuilder; false; reverse; ; ; Argument[this]; ReturnValue; value; manual |
 | 638 | Summary: org.apache.commons.text; TextStringBuilder; false; rightString; ; ; Argument[this]; ReturnValue; taint; manual |
 | 639 | Summary: org.apache.commons.text; TextStringBuilder; false; setCharAt; ; ; Argument[this]; ReturnValue; value; manual |
@@ -659,9 +659,9 @@ models
 | 658 | Summary: org.apache.commons.text; WordUtils; false; swapCase; ; ; Argument[0]; ReturnValue; taint; manual |
 | 659 | Summary: org.apache.commons.text; WordUtils; false; uncapitalize; (java.lang.String); ; Argument[0]; ReturnValue; taint; manual |
 | 660 | Summary: org.apache.commons.text; WordUtils; false; uncapitalize; (java.lang.String,char[]); ; Argument[0]; ReturnValue; taint; manual |
-| 661 | Summary: org.apache.commons.text; WordUtils; false; wrap; ; ; Argument[0]; ReturnValue; taint; manual |
-| 662 | Summary: org.apache.commons.text; WordUtils; false; wrap; (java.lang.String,int,java.lang.String,boolean); ; Argument[2]; ReturnValue; taint; manual |
-| 663 | Summary: org.apache.commons.text; WordUtils; false; wrap; (java.lang.String,int,java.lang.String,boolean,java.lang.String); ; Argument[2]; ReturnValue; taint; manual |
+| 661 | Summary: org.apache.commons.text; WordUtils; false; wrap; (java.lang.String,int,java.lang.String,boolean); ; Argument[2]; ReturnValue; taint; manual |
+| 662 | Summary: org.apache.commons.text; WordUtils; false; wrap; (java.lang.String,int,java.lang.String,boolean,java.lang.String); ; Argument[2]; ReturnValue; taint; manual |
+| 663 | Summary: org.apache.commons.text; WordUtils; false; wrap; ; ; Argument[0]; ReturnValue; taint; manual |
 edges
 | ArrayUtilsTest.java:20:33:20:56 | {...} : String[] [[]] : String | ArrayUtilsTest.java:24:27:24:40 | alreadyTainted : String[] [[]] : String | provenance |  |
 | ArrayUtilsTest.java:20:33:20:56 | {...} : String[] [[]] : String | ArrayUtilsTest.java:27:27:27:40 | alreadyTainted : String[] [[]] : String | provenance |  |
@@ -682,612 +682,586 @@ edges
 | ArrayUtilsTest.java:20:33:20:56 | {...} : String[] [[]] : String | ArrayUtilsTest.java:59:32:59:45 | alreadyTainted : String[] [[]] : String | provenance |  |
 | ArrayUtilsTest.java:20:33:20:56 | {...} : String[] [[]] : String | ArrayUtilsTest.java:63:29:63:42 | alreadyTainted : String[] [[]] : String | provenance |  |
 | ArrayUtilsTest.java:20:48:20:54 | taint(...) : String | ArrayUtilsTest.java:20:33:20:56 | {...} : String[] [[]] : String | provenance |  |
-| ArrayUtilsTest.java:23:12:23:44 | add(...) : String[] [[]] : String | ArrayUtilsTest.java:23:12:23:44 | add(...) | provenance |  |
-| ArrayUtilsTest.java:23:37:23:43 | taint(...) : String | ArrayUtilsTest.java:23:12:23:44 | add(...) : String[] [[]] : String | provenance | MaD:32 |
-| ArrayUtilsTest.java:24:12:24:53 | add(...) : String[] [[]] : String | ArrayUtilsTest.java:24:12:24:53 | add(...) | provenance |  |
-| ArrayUtilsTest.java:24:27:24:40 | alreadyTainted : String[] [[]] : String | ArrayUtilsTest.java:24:12:24:53 | add(...) : String[] [[]] : String | provenance | MaD:31 |
-| ArrayUtilsTest.java:26:12:26:41 | add(...) : String[] [[]] : String | ArrayUtilsTest.java:26:12:26:41 | add(...) | provenance |  |
-| ArrayUtilsTest.java:26:34:26:40 | taint(...) : String | ArrayUtilsTest.java:26:12:26:41 | add(...) : String[] [[]] : String | provenance | MaD:33 |
-| ArrayUtilsTest.java:27:12:27:50 | add(...) : String[] [[]] : String | ArrayUtilsTest.java:27:12:27:50 | add(...) | provenance |  |
-| ArrayUtilsTest.java:27:27:27:40 | alreadyTainted : String[] [[]] : String | ArrayUtilsTest.java:27:12:27:50 | add(...) : String[] [[]] : String | provenance | MaD:31 |
-| ArrayUtilsTest.java:28:12:28:53 | addAll(...) : String[] [[]] : String | ArrayUtilsTest.java:28:12:28:53 | addAll(...) | provenance |  |
-| ArrayUtilsTest.java:28:12:28:53 | new ..[] { .. } : Object[] [[]] : String | ArrayUtilsTest.java:28:12:28:53 | addAll(...) : String[] [[]] : String | provenance | MaD:34 |
+| ArrayUtilsTest.java:23:37:23:43 | taint(...) : String | ArrayUtilsTest.java:23:12:23:44 | add(...) | provenance | MaD:226 |
+| ArrayUtilsTest.java:24:27:24:40 | alreadyTainted : String[] [[]] : String | ArrayUtilsTest.java:24:12:24:53 | add(...) | provenance | MaD:225 |
+| ArrayUtilsTest.java:26:34:26:40 | taint(...) : String | ArrayUtilsTest.java:26:12:26:41 | add(...) | provenance | MaD:224 |
+| ArrayUtilsTest.java:27:27:27:40 | alreadyTainted : String[] [[]] : String | ArrayUtilsTest.java:27:12:27:50 | add(...) | provenance | MaD:225 |
+| ArrayUtilsTest.java:28:12:28:53 | new ..[] { .. } : Object[] [[]] : String | ArrayUtilsTest.java:28:12:28:53 | addAll(...) | provenance | MaD:227 |
 | ArrayUtilsTest.java:28:46:28:52 | taint(...) : String | ArrayUtilsTest.java:28:12:28:53 | new ..[] { .. } : Object[] [[]] : String | provenance |  |
-| ArrayUtilsTest.java:29:12:29:53 | addAll(...) : String[] [[]] : String | ArrayUtilsTest.java:29:12:29:53 | addAll(...) | provenance |  |
-| ArrayUtilsTest.java:29:12:29:53 | new ..[] { .. } : Object[] [[]] : String | ArrayUtilsTest.java:29:12:29:53 | addAll(...) : String[] [[]] : String | provenance | MaD:34 |
+| ArrayUtilsTest.java:29:12:29:53 | new ..[] { .. } : Object[] [[]] : String | ArrayUtilsTest.java:29:12:29:53 | addAll(...) | provenance | MaD:227 |
 | ArrayUtilsTest.java:29:37:29:43 | taint(...) : String | ArrayUtilsTest.java:29:12:29:53 | new ..[] { .. } : Object[] [[]] : String | provenance |  |
-| ArrayUtilsTest.java:30:12:30:67 | addAll(...) : String[] [[]] : String | ArrayUtilsTest.java:30:12:30:67 | addAll(...) | provenance |  |
-| ArrayUtilsTest.java:30:30:30:43 | alreadyTainted : String[] [[]] : String | ArrayUtilsTest.java:30:12:30:67 | addAll(...) : String[] [[]] : String | provenance | MaD:34 |
-| ArrayUtilsTest.java:31:12:31:46 | addFirst(...) : String[] [[]] : String | ArrayUtilsTest.java:31:12:31:46 | addFirst(...) | provenance |  |
-| ArrayUtilsTest.java:31:39:31:45 | taint(...) : String | ArrayUtilsTest.java:31:12:31:46 | addFirst(...) : String[] [[]] : String | provenance | MaD:36 |
-| ArrayUtilsTest.java:32:12:32:55 | addFirst(...) : String[] [[]] : String | ArrayUtilsTest.java:32:12:32:55 | addFirst(...) | provenance |  |
-| ArrayUtilsTest.java:32:32:32:45 | alreadyTainted : String[] [[]] : String | ArrayUtilsTest.java:32:12:32:55 | addFirst(...) : String[] [[]] : String | provenance | MaD:35 |
-| ArrayUtilsTest.java:33:12:33:43 | clone(...) : String[] [[]] : String | ArrayUtilsTest.java:33:12:33:43 | clone(...) | provenance |  |
-| ArrayUtilsTest.java:33:29:33:42 | alreadyTainted : String[] [[]] : String | ArrayUtilsTest.java:33:12:33:43 | clone(...) : String[] [[]] : String | provenance | MaD:37 |
-| ArrayUtilsTest.java:34:27:34:40 | alreadyTainted : String[] [[]] : String | ArrayUtilsTest.java:34:12:34:44 | get(...) | provenance | MaD:38 |
-| ArrayUtilsTest.java:36:27:36:40 | alreadyTainted : String[] [[]] : String | ArrayUtilsTest.java:36:12:36:61 | get(...) | provenance | MaD:38 |
-| ArrayUtilsTest.java:38:37:38:43 | taint(...) : String | ArrayUtilsTest.java:38:12:38:44 | get(...) | provenance | MaD:39 |
-| ArrayUtilsTest.java:40:12:40:67 | insert(...) : String[] [[]] : String | ArrayUtilsTest.java:40:12:40:67 | insert(...) | provenance |  |
-| ArrayUtilsTest.java:40:33:40:46 | alreadyTainted : String[] [[]] : String | ArrayUtilsTest.java:40:12:40:67 | insert(...) : String[] [[]] : String | provenance | MaD:40 |
-| ArrayUtilsTest.java:41:12:41:57 | insert(...) : String[] [[]] : String | ArrayUtilsTest.java:41:12:41:57 | insert(...) | provenance |  |
-| ArrayUtilsTest.java:41:12:41:57 | new ..[] { .. } : Object[] [[]] : String | ArrayUtilsTest.java:41:12:41:57 | insert(...) : String[] [[]] : String | provenance | MaD:40 |
+| ArrayUtilsTest.java:30:30:30:43 | alreadyTainted : String[] [[]] : String | ArrayUtilsTest.java:30:12:30:67 | addAll(...) | provenance | MaD:227 |
+| ArrayUtilsTest.java:31:39:31:45 | taint(...) : String | ArrayUtilsTest.java:31:12:31:46 | addFirst(...) | provenance | MaD:229 |
+| ArrayUtilsTest.java:32:32:32:45 | alreadyTainted : String[] [[]] : String | ArrayUtilsTest.java:32:12:32:55 | addFirst(...) | provenance | MaD:228 |
+| ArrayUtilsTest.java:33:29:33:42 | alreadyTainted : String[] [[]] : String | ArrayUtilsTest.java:33:12:33:43 | clone(...) | provenance | MaD:230 |
+| ArrayUtilsTest.java:34:27:34:40 | alreadyTainted : String[] [[]] : String | ArrayUtilsTest.java:34:12:34:44 | get(...) | provenance | MaD:232 |
+| ArrayUtilsTest.java:36:27:36:40 | alreadyTainted : String[] [[]] : String | ArrayUtilsTest.java:36:12:36:61 | get(...) | provenance | MaD:232 |
+| ArrayUtilsTest.java:38:37:38:43 | taint(...) : String | ArrayUtilsTest.java:38:12:38:44 | get(...) | provenance | MaD:231 |
+| ArrayUtilsTest.java:40:33:40:46 | alreadyTainted : String[] [[]] : String | ArrayUtilsTest.java:40:12:40:67 | insert(...) | provenance | MaD:233 |
+| ArrayUtilsTest.java:41:12:41:57 | new ..[] { .. } : Object[] [[]] : String | ArrayUtilsTest.java:41:12:41:57 | insert(...) | provenance | MaD:233 |
 | ArrayUtilsTest.java:41:40:41:46 | taint(...) : String | ArrayUtilsTest.java:41:12:41:57 | new ..[] { .. } : Object[] [[]] : String | provenance |  |
-| ArrayUtilsTest.java:42:12:42:57 | insert(...) : String[] [[]] : String | ArrayUtilsTest.java:42:12:42:57 | insert(...) | provenance |  |
-| ArrayUtilsTest.java:42:12:42:57 | new ..[] { .. } : Object[] [[]] : String | ArrayUtilsTest.java:42:12:42:57 | insert(...) : String[] [[]] : String | provenance | MaD:40 |
+| ArrayUtilsTest.java:42:12:42:57 | new ..[] { .. } : Object[] [[]] : String | ArrayUtilsTest.java:42:12:42:57 | insert(...) | provenance | MaD:233 |
 | ArrayUtilsTest.java:42:50:42:56 | taint(...) : String | ArrayUtilsTest.java:42:12:42:57 | new ..[] { .. } : Object[] [[]] : String | provenance |  |
-| ArrayUtilsTest.java:43:12:43:49 | nullToEmpty(...) : String[] [[]] : String | ArrayUtilsTest.java:43:12:43:49 | nullToEmpty(...) | provenance |  |
-| ArrayUtilsTest.java:43:35:43:48 | alreadyTainted : String[] [[]] : String | ArrayUtilsTest.java:43:12:43:49 | nullToEmpty(...) : String[] [[]] : String | provenance | MaD:42 |
-| ArrayUtilsTest.java:44:12:44:65 | nullToEmpty(...) : String[] [[]] : String | ArrayUtilsTest.java:44:12:44:65 | nullToEmpty(...) | provenance |  |
-| ArrayUtilsTest.java:44:35:44:48 | alreadyTainted : String[] [[]] : String | ArrayUtilsTest.java:44:12:44:65 | nullToEmpty(...) : String[] [[]] : String | provenance | MaD:41 |
-| ArrayUtilsTest.java:45:12:45:47 | remove(...) : String[] [[]] : String | ArrayUtilsTest.java:45:12:45:47 | remove(...) | provenance |  |
-| ArrayUtilsTest.java:45:30:45:43 | alreadyTainted : String[] [[]] : String | ArrayUtilsTest.java:45:12:45:47 | remove(...) : String[] [[]] : String | provenance | MaD:43 |
-| ArrayUtilsTest.java:47:12:47:53 | removeAll(...) : String[] [[]] : String | ArrayUtilsTest.java:47:12:47:53 | removeAll(...) | provenance |  |
-| ArrayUtilsTest.java:47:33:47:46 | alreadyTainted : String[] [[]] : String | ArrayUtilsTest.java:47:12:47:53 | removeAll(...) : String[] [[]] : String | provenance | MaD:44 |
-| ArrayUtilsTest.java:51:12:51:76 | removeAllOccurences(...) : String[] [[]] : String | ArrayUtilsTest.java:51:12:51:76 | removeAllOccurences(...) | provenance |  |
-| ArrayUtilsTest.java:51:43:51:56 | alreadyTainted : String[] [[]] : String | ArrayUtilsTest.java:51:12:51:76 | removeAllOccurences(...) : String[] [[]] : String | provenance | MaD:45 |
-| ArrayUtilsTest.java:53:12:53:77 | removeAllOccurrences(...) : String[] [[]] : String | ArrayUtilsTest.java:53:12:53:77 | removeAllOccurrences(...) | provenance |  |
-| ArrayUtilsTest.java:53:44:53:57 | alreadyTainted : String[] [[]] : String | ArrayUtilsTest.java:53:12:53:77 | removeAllOccurrences(...) : String[] [[]] : String | provenance | MaD:46 |
-| ArrayUtilsTest.java:55:12:55:70 | removeElement(...) : String[] [[]] : String | ArrayUtilsTest.java:55:12:55:70 | removeElement(...) | provenance |  |
-| ArrayUtilsTest.java:55:37:55:50 | alreadyTainted : String[] [[]] : String | ArrayUtilsTest.java:55:12:55:70 | removeElement(...) : String[] [[]] : String | provenance | MaD:47 |
-| ArrayUtilsTest.java:56:12:56:58 | removeElements(...) : Object[] [[]] : String | ArrayUtilsTest.java:56:12:56:58 | removeElements(...) | provenance |  |
-| ArrayUtilsTest.java:56:38:56:51 | alreadyTainted : String[] [[]] : String | ArrayUtilsTest.java:56:12:56:58 | removeElements(...) : Object[] [[]] : String | provenance | MaD:48 |
-| ArrayUtilsTest.java:59:12:59:52 | subarray(...) : String[] [[]] : String | ArrayUtilsTest.java:59:12:59:52 | subarray(...) | provenance |  |
-| ArrayUtilsTest.java:59:32:59:45 | alreadyTainted : String[] [[]] : String | ArrayUtilsTest.java:59:12:59:52 | subarray(...) : String[] [[]] : String | provenance | MaD:49 |
-| ArrayUtilsTest.java:61:12:61:47 | new ..[] { .. } : Object[] [[]] : String | ArrayUtilsTest.java:61:12:61:47 | toArray(...) : String[] [[]] : String | provenance | MaD:50 |
-| ArrayUtilsTest.java:61:12:61:47 | toArray(...) : String[] [[]] : String | ArrayUtilsTest.java:61:12:61:47 | toArray(...) | provenance |  |
+| ArrayUtilsTest.java:43:35:43:48 | alreadyTainted : String[] [[]] : String | ArrayUtilsTest.java:43:12:43:49 | nullToEmpty(...) | provenance | MaD:235 |
+| ArrayUtilsTest.java:44:35:44:48 | alreadyTainted : String[] [[]] : String | ArrayUtilsTest.java:44:12:44:65 | nullToEmpty(...) | provenance | MaD:234 |
+| ArrayUtilsTest.java:45:30:45:43 | alreadyTainted : String[] [[]] : String | ArrayUtilsTest.java:45:12:45:47 | remove(...) | provenance | MaD:236 |
+| ArrayUtilsTest.java:47:33:47:46 | alreadyTainted : String[] [[]] : String | ArrayUtilsTest.java:47:12:47:53 | removeAll(...) | provenance | MaD:237 |
+| ArrayUtilsTest.java:51:43:51:56 | alreadyTainted : String[] [[]] : String | ArrayUtilsTest.java:51:12:51:76 | removeAllOccurences(...) | provenance | MaD:238 |
+| ArrayUtilsTest.java:53:44:53:57 | alreadyTainted : String[] [[]] : String | ArrayUtilsTest.java:53:12:53:77 | removeAllOccurrences(...) | provenance | MaD:239 |
+| ArrayUtilsTest.java:55:37:55:50 | alreadyTainted : String[] [[]] : String | ArrayUtilsTest.java:55:12:55:70 | removeElement(...) | provenance | MaD:240 |
+| ArrayUtilsTest.java:56:38:56:51 | alreadyTainted : String[] [[]] : String | ArrayUtilsTest.java:56:12:56:58 | removeElements(...) | provenance | MaD:241 |
+| ArrayUtilsTest.java:59:32:59:45 | alreadyTainted : String[] [[]] : String | ArrayUtilsTest.java:59:12:59:52 | subarray(...) | provenance | MaD:242 |
+| ArrayUtilsTest.java:61:12:61:47 | new ..[] { .. } : Object[] [[]] : String | ArrayUtilsTest.java:61:12:61:47 | toArray(...) | provenance | MaD:243 |
 | ArrayUtilsTest.java:61:40:61:46 | taint(...) : String | ArrayUtilsTest.java:61:12:61:47 | new ..[] { .. } : Object[] [[]] : String | provenance |  |
-| ArrayUtilsTest.java:62:12:62:47 | new ..[] { .. } : Object[] [[]] : String | ArrayUtilsTest.java:62:12:62:47 | toArray(...) : String[] [[]] : String | provenance | MaD:50 |
-| ArrayUtilsTest.java:62:12:62:47 | toArray(...) : String[] [[]] : String | ArrayUtilsTest.java:62:12:62:47 | toArray(...) | provenance |  |
+| ArrayUtilsTest.java:62:12:62:47 | new ..[] { .. } : Object[] [[]] : String | ArrayUtilsTest.java:62:12:62:47 | toArray(...) | provenance | MaD:243 |
 | ArrayUtilsTest.java:62:31:62:37 | taint(...) : String | ArrayUtilsTest.java:62:12:62:47 | new ..[] { .. } : Object[] [[]] : String | provenance |  |
-| ArrayUtilsTest.java:63:12:63:43 | toMap(...) : Map [<map.value>] : Object | ArrayUtilsTest.java:63:12:63:54 | get(...) | provenance | MaD:15 |
-| ArrayUtilsTest.java:63:29:63:42 | alreadyTainted : String[] [[]] : String | ArrayUtilsTest.java:63:12:63:43 | toMap(...) : Map [<map.value>] : Object | provenance | MaD:51 |
-| ArrayUtilsTest.java:63:29:63:42 | alreadyTainted : String[] [[]] : String | ArrayUtilsTest.java:63:12:63:43 | toMap(...) : Map [<map.value>] : Object | provenance | MaD:52 |
+| ArrayUtilsTest.java:63:12:63:43 | toMap(...) : Map [<map.value>] : Object | ArrayUtilsTest.java:63:12:63:54 | get(...) | provenance | MaD:17 |
+| ArrayUtilsTest.java:63:29:63:42 | alreadyTainted : String[] [[]] : String | ArrayUtilsTest.java:63:12:63:43 | toMap(...) : Map [<map.value>] : Object | provenance | MaD:244 |
+| ArrayUtilsTest.java:63:29:63:42 | alreadyTainted : String[] [[]] : String | ArrayUtilsTest.java:63:12:63:43 | toMap(...) : Map [<map.value>] : Object | provenance | MaD:245 |
 | ArrayUtilsTest.java:68:27:68:57 | {...} : int[] [[]] : Number | ArrayUtilsTest.java:69:56:69:66 | taintedInts : int[] [[]] : Number | provenance |  |
 | ArrayUtilsTest.java:68:39:68:55 | taint(...) : Number | ArrayUtilsTest.java:68:27:68:57 | {...} : int[] [[]] : Number | provenance |  |
 | ArrayUtilsTest.java:69:36:69:67 | toObject(...) : Integer[] [[]] : Number | ArrayUtilsTest.java:70:12:70:27 | taintedBoxedInts | provenance |  |
 | ArrayUtilsTest.java:69:36:69:67 | toObject(...) : Integer[] [[]] : Number | ArrayUtilsTest.java:71:35:71:50 | taintedBoxedInts : Integer[] [[]] : Number | provenance |  |
-| ArrayUtilsTest.java:69:56:69:66 | taintedInts : int[] [[]] : Number | ArrayUtilsTest.java:69:36:69:67 | toObject(...) : Integer[] [[]] : Number | provenance | MaD:53 |
-| ArrayUtilsTest.java:71:12:71:51 | toPrimitive(...) : int[] [[]] : Number | ArrayUtilsTest.java:71:12:71:51 | toPrimitive(...) | provenance |  |
-| ArrayUtilsTest.java:71:35:71:50 | taintedBoxedInts : Integer[] [[]] : Number | ArrayUtilsTest.java:71:12:71:51 | toPrimitive(...) : int[] [[]] : Number | provenance | MaD:54 |
-| ArrayUtilsTest.java:72:12:72:70 | toPrimitive(...) : int[] [[]] : Number | ArrayUtilsTest.java:72:12:72:70 | toPrimitive(...) | provenance |  |
-| ArrayUtilsTest.java:72:53:72:69 | taint(...) : Number | ArrayUtilsTest.java:72:12:72:70 | toPrimitive(...) : int[] [[]] : Number | provenance | MaD:55 |
+| ArrayUtilsTest.java:69:56:69:66 | taintedInts : int[] [[]] : Number | ArrayUtilsTest.java:69:36:69:67 | toObject(...) : Integer[] [[]] : Number | provenance | MaD:246 |
+| ArrayUtilsTest.java:71:35:71:50 | taintedBoxedInts : Integer[] [[]] : Number | ArrayUtilsTest.java:71:12:71:51 | toPrimitive(...) | provenance | MaD:247 |
+| ArrayUtilsTest.java:72:53:72:69 | taint(...) : Number | ArrayUtilsTest.java:72:12:72:70 | toPrimitive(...) | provenance | MaD:248 |
 | MutableTest.java:11:39:11:66 | new MutableObject<String>(...) : MutableObject [org.apache.commons.lang3.mutable.MutableObject.value] : String | MutableTest.java:20:12:20:18 | tainted : MutableObject [org.apache.commons.lang3.mutable.MutableObject.value] : String | provenance |  |
 | MutableTest.java:11:39:11:66 | new MutableObject<String>(...) : MutableObject [org.apache.commons.lang3.mutable.MutableObject.value] : String | MutableTest.java:21:12:21:23 | taintedAlias : MutableObject [org.apache.commons.lang3.mutable.MutableObject.value] : String | provenance |  |
-| MutableTest.java:11:59:11:65 | taint(...) : String | MutableTest.java:11:39:11:66 | new MutableObject<String>(...) : MutableObject [org.apache.commons.lang3.mutable.MutableObject.value] : String | provenance | MaD:225 |
+| MutableTest.java:11:59:11:65 | taint(...) : String | MutableTest.java:11:39:11:66 | new MutableObject<String>(...) : MutableObject [org.apache.commons.lang3.mutable.MutableObject.value] : String | provenance | MaD:33 |
 | MutableTest.java:13:44:13:71 | new MutableObject<String>(...) : MutableObject [org.apache.commons.lang3.mutable.MutableObject.value] : String | MutableTest.java:26:12:26:23 | taintCleared : MutableObject [org.apache.commons.lang3.mutable.MutableObject.value] : String | provenance |  |
 | MutableTest.java:13:44:13:71 | new MutableObject<String>(...) : MutableObject [org.apache.commons.lang3.mutable.MutableObject.value] : String | MutableTest.java:27:12:27:28 | taintClearedAlias : MutableObject [org.apache.commons.lang3.mutable.MutableObject.value] : String | provenance |  |
-| MutableTest.java:13:64:13:70 | taint(...) : String | MutableTest.java:13:44:13:71 | new MutableObject<String>(...) : MutableObject [org.apache.commons.lang3.mutable.MutableObject.value] : String | provenance | MaD:225 |
+| MutableTest.java:13:64:13:70 | taint(...) : String | MutableTest.java:13:44:13:71 | new MutableObject<String>(...) : MutableObject [org.apache.commons.lang3.mutable.MutableObject.value] : String | provenance | MaD:33 |
 | MutableTest.java:14:7:14:14 | taintSet [post update] : MutableObject [org.apache.commons.lang3.mutable.MutableObject.value] : String | MutableTest.java:22:12:22:19 | taintSet : MutableObject [org.apache.commons.lang3.mutable.MutableObject.value] : String | provenance |  |
 | MutableTest.java:14:7:14:14 | taintSet [post update] : MutableObject [org.apache.commons.lang3.mutable.MutableObject.value] : String | MutableTest.java:23:12:23:24 | taintSetAlias : MutableObject [org.apache.commons.lang3.mutable.MutableObject.value] : String | provenance |  |
-| MutableTest.java:14:25:14:31 | taint(...) : String | MutableTest.java:14:7:14:14 | taintSet [post update] : MutableObject [org.apache.commons.lang3.mutable.MutableObject.value] : String | provenance | MaD:224 |
-| MutableTest.java:20:12:20:18 | tainted : MutableObject [org.apache.commons.lang3.mutable.MutableObject.value] : String | MutableTest.java:20:12:20:29 | getValue(...) | provenance | MaD:223 |
-| MutableTest.java:21:12:21:23 | taintedAlias : MutableObject [org.apache.commons.lang3.mutable.MutableObject.value] : String | MutableTest.java:21:12:21:34 | getValue(...) | provenance | MaD:223 |
-| MutableTest.java:22:12:22:19 | taintSet : MutableObject [org.apache.commons.lang3.mutable.MutableObject.value] : String | MutableTest.java:22:12:22:30 | getValue(...) | provenance | MaD:223 |
-| MutableTest.java:23:12:23:24 | taintSetAlias : MutableObject [org.apache.commons.lang3.mutable.MutableObject.value] : String | MutableTest.java:23:12:23:35 | getValue(...) | provenance | MaD:223 |
-| MutableTest.java:26:12:26:23 | taintCleared : MutableObject [org.apache.commons.lang3.mutable.MutableObject.value] : String | MutableTest.java:26:12:26:34 | getValue(...) | provenance | MaD:223 |
-| MutableTest.java:27:12:27:28 | taintClearedAlias : MutableObject [org.apache.commons.lang3.mutable.MutableObject.value] : String | MutableTest.java:27:12:27:39 | getValue(...) | provenance | MaD:223 |
-| ObjectUtilsTest.java:13:28:13:34 | taint(...) : String | ObjectUtilsTest.java:13:10:13:35 | clone(...) | provenance | MaD:59 |
-| ObjectUtilsTest.java:14:38:14:44 | taint(...) : String | ObjectUtilsTest.java:14:10:14:45 | cloneIfPossible(...) | provenance | MaD:60 |
-| ObjectUtilsTest.java:15:28:15:34 | taint(...) : String | ObjectUtilsTest.java:15:10:15:35 | CONST(...) | provenance | MaD:56 |
-| ObjectUtilsTest.java:16:34:16:50 | taint(...) : Number | ObjectUtilsTest.java:16:10:16:51 | CONST_SHORT(...) | provenance | MaD:58 |
-| ObjectUtilsTest.java:17:33:17:49 | taint(...) : Number | ObjectUtilsTest.java:17:10:17:50 | CONST_BYTE(...) | provenance | MaD:57 |
-| ObjectUtilsTest.java:18:36:18:42 | taint(...) : String | ObjectUtilsTest.java:18:10:18:49 | defaultIfNull(...) | provenance | MaD:61 |
-| ObjectUtilsTest.java:19:42:19:48 | taint(...) : String | ObjectUtilsTest.java:19:10:19:49 | defaultIfNull(...) | provenance | MaD:61 |
-| ObjectUtilsTest.java:20:10:20:54 | new ..[] { .. } : Object[] [[]] : String | ObjectUtilsTest.java:20:10:20:54 | firstNonNull(...) | provenance | MaD:62 |
+| MutableTest.java:14:25:14:31 | taint(...) : String | MutableTest.java:14:7:14:14 | taintSet [post update] : MutableObject [org.apache.commons.lang3.mutable.MutableObject.value] : String | provenance | MaD:32 |
+| MutableTest.java:20:12:20:18 | tainted : MutableObject [org.apache.commons.lang3.mutable.MutableObject.value] : String | MutableTest.java:20:12:20:29 | getValue(...) | provenance | MaD:31 |
+| MutableTest.java:21:12:21:23 | taintedAlias : MutableObject [org.apache.commons.lang3.mutable.MutableObject.value] : String | MutableTest.java:21:12:21:34 | getValue(...) | provenance | MaD:31 |
+| MutableTest.java:22:12:22:19 | taintSet : MutableObject [org.apache.commons.lang3.mutable.MutableObject.value] : String | MutableTest.java:22:12:22:30 | getValue(...) | provenance | MaD:31 |
+| MutableTest.java:23:12:23:24 | taintSetAlias : MutableObject [org.apache.commons.lang3.mutable.MutableObject.value] : String | MutableTest.java:23:12:23:35 | getValue(...) | provenance | MaD:31 |
+| MutableTest.java:26:12:26:23 | taintCleared : MutableObject [org.apache.commons.lang3.mutable.MutableObject.value] : String | MutableTest.java:26:12:26:34 | getValue(...) | provenance | MaD:31 |
+| MutableTest.java:27:12:27:28 | taintClearedAlias : MutableObject [org.apache.commons.lang3.mutable.MutableObject.value] : String | MutableTest.java:27:12:27:39 | getValue(...) | provenance | MaD:31 |
+| ObjectUtilsTest.java:13:28:13:34 | taint(...) : String | ObjectUtilsTest.java:13:10:13:35 | clone(...) | provenance | MaD:252 |
+| ObjectUtilsTest.java:14:38:14:44 | taint(...) : String | ObjectUtilsTest.java:14:10:14:45 | cloneIfPossible(...) | provenance | MaD:253 |
+| ObjectUtilsTest.java:15:28:15:34 | taint(...) : String | ObjectUtilsTest.java:15:10:15:35 | CONST(...) | provenance | MaD:249 |
+| ObjectUtilsTest.java:16:34:16:50 | taint(...) : Number | ObjectUtilsTest.java:16:10:16:51 | CONST_SHORT(...) | provenance | MaD:251 |
+| ObjectUtilsTest.java:17:33:17:49 | taint(...) : Number | ObjectUtilsTest.java:17:10:17:50 | CONST_BYTE(...) | provenance | MaD:250 |
+| ObjectUtilsTest.java:18:36:18:42 | taint(...) : String | ObjectUtilsTest.java:18:10:18:49 | defaultIfNull(...) | provenance | MaD:254 |
+| ObjectUtilsTest.java:19:42:19:48 | taint(...) : String | ObjectUtilsTest.java:19:10:19:49 | defaultIfNull(...) | provenance | MaD:254 |
+| ObjectUtilsTest.java:20:10:20:54 | new ..[] { .. } : Object[] [[]] : String | ObjectUtilsTest.java:20:10:20:54 | firstNonNull(...) | provenance | MaD:255 |
 | ObjectUtilsTest.java:20:35:20:41 | taint(...) : String | ObjectUtilsTest.java:20:10:20:54 | new ..[] { .. } : Object[] [[]] : String | provenance |  |
-| ObjectUtilsTest.java:21:10:21:54 | new ..[] { .. } : Object[] [[]] : String | ObjectUtilsTest.java:21:10:21:54 | firstNonNull(...) | provenance | MaD:62 |
+| ObjectUtilsTest.java:21:10:21:54 | new ..[] { .. } : Object[] [[]] : String | ObjectUtilsTest.java:21:10:21:54 | firstNonNull(...) | provenance | MaD:255 |
 | ObjectUtilsTest.java:21:41:21:47 | taint(...) : String | ObjectUtilsTest.java:21:10:21:54 | new ..[] { .. } : Object[] [[]] : String | provenance |  |
-| ObjectUtilsTest.java:22:10:22:54 | new ..[] { .. } : Object[] [[]] : String | ObjectUtilsTest.java:22:10:22:54 | firstNonNull(...) | provenance | MaD:62 |
+| ObjectUtilsTest.java:22:10:22:54 | new ..[] { .. } : Object[] [[]] : String | ObjectUtilsTest.java:22:10:22:54 | firstNonNull(...) | provenance | MaD:255 |
 | ObjectUtilsTest.java:22:47:22:53 | taint(...) : String | ObjectUtilsTest.java:22:10:22:54 | new ..[] { .. } : Object[] [[]] : String | provenance |  |
-| ObjectUtilsTest.java:23:32:23:38 | taint(...) : String | ObjectUtilsTest.java:23:10:23:45 | getIfNull(...) | provenance | MaD:63 |
-| ObjectUtilsTest.java:24:10:24:45 | new ..[] { .. } : Comparable[] [[]] : String | ObjectUtilsTest.java:24:10:24:45 | max(...) | provenance | MaD:64 |
+| ObjectUtilsTest.java:23:32:23:38 | taint(...) : String | ObjectUtilsTest.java:23:10:23:45 | getIfNull(...) | provenance | MaD:256 |
+| ObjectUtilsTest.java:24:10:24:45 | new ..[] { .. } : Comparable[] [[]] : String | ObjectUtilsTest.java:24:10:24:45 | max(...) | provenance | MaD:257 |
 | ObjectUtilsTest.java:24:26:24:32 | taint(...) : String | ObjectUtilsTest.java:24:10:24:45 | new ..[] { .. } : Comparable[] [[]] : String | provenance |  |
-| ObjectUtilsTest.java:25:10:25:45 | new ..[] { .. } : Comparable[] [[]] : String | ObjectUtilsTest.java:25:10:25:45 | max(...) | provenance | MaD:64 |
+| ObjectUtilsTest.java:25:10:25:45 | new ..[] { .. } : Comparable[] [[]] : String | ObjectUtilsTest.java:25:10:25:45 | max(...) | provenance | MaD:257 |
 | ObjectUtilsTest.java:25:32:25:38 | taint(...) : String | ObjectUtilsTest.java:25:10:25:45 | new ..[] { .. } : Comparable[] [[]] : String | provenance |  |
-| ObjectUtilsTest.java:26:10:26:45 | new ..[] { .. } : Comparable[] [[]] : String | ObjectUtilsTest.java:26:10:26:45 | max(...) | provenance | MaD:64 |
+| ObjectUtilsTest.java:26:10:26:45 | new ..[] { .. } : Comparable[] [[]] : String | ObjectUtilsTest.java:26:10:26:45 | max(...) | provenance | MaD:257 |
 | ObjectUtilsTest.java:26:38:26:44 | taint(...) : String | ObjectUtilsTest.java:26:10:26:45 | new ..[] { .. } : Comparable[] [[]] : String | provenance |  |
-| ObjectUtilsTest.java:27:10:27:48 | new ..[] { .. } : Comparable[] [[]] : String | ObjectUtilsTest.java:27:10:27:48 | median(...) | provenance | MaD:65 |
+| ObjectUtilsTest.java:27:10:27:48 | new ..[] { .. } : Comparable[] [[]] : String | ObjectUtilsTest.java:27:10:27:48 | median(...) | provenance | MaD:258 |
 | ObjectUtilsTest.java:27:29:27:35 | taint(...) : String | ObjectUtilsTest.java:27:10:27:48 | new ..[] { .. } : Comparable[] [[]] : String | provenance |  |
-| ObjectUtilsTest.java:28:10:28:56 | new ..[] { .. } : Comparable[] [[]] : String | ObjectUtilsTest.java:28:10:28:56 | median(...) | provenance | MaD:65 |
+| ObjectUtilsTest.java:28:10:28:56 | new ..[] { .. } : Comparable[] [[]] : String | ObjectUtilsTest.java:28:10:28:56 | median(...) | provenance | MaD:258 |
 | ObjectUtilsTest.java:28:43:28:49 | taint(...) : String | ObjectUtilsTest.java:28:10:28:56 | new ..[] { .. } : Comparable[] [[]] : String | provenance |  |
-| ObjectUtilsTest.java:29:10:29:56 | new ..[] { .. } : Comparable[] [[]] : String | ObjectUtilsTest.java:29:10:29:56 | median(...) | provenance | MaD:65 |
+| ObjectUtilsTest.java:29:10:29:56 | new ..[] { .. } : Comparable[] [[]] : String | ObjectUtilsTest.java:29:10:29:56 | median(...) | provenance | MaD:258 |
 | ObjectUtilsTest.java:29:49:29:55 | taint(...) : String | ObjectUtilsTest.java:29:10:29:56 | new ..[] { .. } : Comparable[] [[]] : String | provenance |  |
-| ObjectUtilsTest.java:30:10:30:45 | new ..[] { .. } : Comparable[] [[]] : String | ObjectUtilsTest.java:30:10:30:45 | min(...) | provenance | MaD:66 |
+| ObjectUtilsTest.java:30:10:30:45 | new ..[] { .. } : Comparable[] [[]] : String | ObjectUtilsTest.java:30:10:30:45 | min(...) | provenance | MaD:259 |
 | ObjectUtilsTest.java:30:26:30:32 | taint(...) : String | ObjectUtilsTest.java:30:10:30:45 | new ..[] { .. } : Comparable[] [[]] : String | provenance |  |
-| ObjectUtilsTest.java:31:10:31:45 | new ..[] { .. } : Comparable[] [[]] : String | ObjectUtilsTest.java:31:10:31:45 | min(...) | provenance | MaD:66 |
+| ObjectUtilsTest.java:31:10:31:45 | new ..[] { .. } : Comparable[] [[]] : String | ObjectUtilsTest.java:31:10:31:45 | min(...) | provenance | MaD:259 |
 | ObjectUtilsTest.java:31:32:31:38 | taint(...) : String | ObjectUtilsTest.java:31:10:31:45 | new ..[] { .. } : Comparable[] [[]] : String | provenance |  |
-| ObjectUtilsTest.java:32:10:32:45 | new ..[] { .. } : Comparable[] [[]] : String | ObjectUtilsTest.java:32:10:32:45 | min(...) | provenance | MaD:66 |
+| ObjectUtilsTest.java:32:10:32:45 | new ..[] { .. } : Comparable[] [[]] : String | ObjectUtilsTest.java:32:10:32:45 | min(...) | provenance | MaD:259 |
 | ObjectUtilsTest.java:32:38:32:44 | taint(...) : String | ObjectUtilsTest.java:32:10:32:45 | new ..[] { .. } : Comparable[] [[]] : String | provenance |  |
-| ObjectUtilsTest.java:33:10:33:46 | new ..[] { .. } : Object[] [[]] : String | ObjectUtilsTest.java:33:10:33:46 | mode(...) | provenance | MaD:67 |
+| ObjectUtilsTest.java:33:10:33:46 | new ..[] { .. } : Object[] [[]] : String | ObjectUtilsTest.java:33:10:33:46 | mode(...) | provenance | MaD:260 |
 | ObjectUtilsTest.java:33:27:33:33 | taint(...) : String | ObjectUtilsTest.java:33:10:33:46 | new ..[] { .. } : Object[] [[]] : String | provenance |  |
-| ObjectUtilsTest.java:34:10:34:46 | new ..[] { .. } : Object[] [[]] : String | ObjectUtilsTest.java:34:10:34:46 | mode(...) | provenance | MaD:67 |
+| ObjectUtilsTest.java:34:10:34:46 | new ..[] { .. } : Object[] [[]] : String | ObjectUtilsTest.java:34:10:34:46 | mode(...) | provenance | MaD:260 |
 | ObjectUtilsTest.java:34:33:34:39 | taint(...) : String | ObjectUtilsTest.java:34:10:34:46 | new ..[] { .. } : Object[] [[]] : String | provenance |  |
-| ObjectUtilsTest.java:35:10:35:46 | new ..[] { .. } : Object[] [[]] : String | ObjectUtilsTest.java:35:10:35:46 | mode(...) | provenance | MaD:67 |
+| ObjectUtilsTest.java:35:10:35:46 | new ..[] { .. } : Object[] [[]] : String | ObjectUtilsTest.java:35:10:35:46 | mode(...) | provenance | MaD:260 |
 | ObjectUtilsTest.java:35:39:35:45 | taint(...) : String | ObjectUtilsTest.java:35:10:35:46 | new ..[] { .. } : Object[] [[]] : String | provenance |  |
-| ObjectUtilsTest.java:36:38:36:44 | taint(...) : String | ObjectUtilsTest.java:36:10:36:56 | requireNonEmpty(...) | provenance | MaD:68 |
-| ObjectUtilsTest.java:39:37:39:43 | taint(...) : String | ObjectUtilsTest.java:39:10:39:44 | toString(...) | provenance | MaD:69 |
+| ObjectUtilsTest.java:36:38:36:44 | taint(...) : String | ObjectUtilsTest.java:36:10:36:56 | requireNonEmpty(...) | provenance | MaD:261 |
+| ObjectUtilsTest.java:39:37:39:43 | taint(...) : String | ObjectUtilsTest.java:39:10:39:44 | toString(...) | provenance | MaD:262 |
 | PairTest.java:16:51:16:90 | of(...) : ImmutablePair [left] : String | PairTest.java:28:12:28:22 | taintedLeft : ImmutablePair [left] : String | provenance |  |
 | PairTest.java:16:51:16:90 | of(...) : ImmutablePair [left] : String | PairTest.java:30:12:30:22 | taintedLeft : ImmutablePair [left] : String | provenance |  |
 | PairTest.java:16:51:16:90 | of(...) : ImmutablePair [left] : String | PairTest.java:32:12:32:22 | taintedLeft : ImmutablePair [left] : String | provenance |  |
-| PairTest.java:16:68:16:74 | taint(...) : String | PairTest.java:16:51:16:90 | of(...) : ImmutablePair [left] : String | provenance | MaD:372 |
+| PairTest.java:16:68:16:74 | taint(...) : String | PairTest.java:16:51:16:90 | of(...) : ImmutablePair [left] : String | provenance | MaD:180 |
 | PairTest.java:17:52:17:90 | of(...) : ImmutablePair [right] : String | PairTest.java:35:12:35:23 | taintedRight : ImmutablePair [right] : String | provenance |  |
 | PairTest.java:17:52:17:90 | of(...) : ImmutablePair [right] : String | PairTest.java:37:12:37:23 | taintedRight : ImmutablePair [right] : String | provenance |  |
 | PairTest.java:17:52:17:90 | of(...) : ImmutablePair [right] : String | PairTest.java:39:12:39:23 | taintedRight : ImmutablePair [right] : String | provenance |  |
-| PairTest.java:17:83:17:89 | taint(...) : String | PairTest.java:17:52:17:90 | of(...) : ImmutablePair [right] : String | provenance | MaD:373 |
+| PairTest.java:17:83:17:89 | taint(...) : String | PairTest.java:17:52:17:90 | of(...) : ImmutablePair [right] : String | provenance | MaD:181 |
 | PairTest.java:18:44:18:70 | left(...) : Pair [left] : String | PairTest.java:19:52:19:79 | (...)... : ImmutablePair [left] : String | provenance |  |
 | PairTest.java:18:44:18:70 | left(...) : Pair [left] : String | PairTest.java:74:12:74:24 | taintedLeft2_ : Pair [left] : String | provenance |  |
 | PairTest.java:18:44:18:70 | left(...) : Pair [left] : String | PairTest.java:76:12:76:24 | taintedLeft2_ : Pair [left] : String | provenance |  |
-| PairTest.java:18:63:18:69 | taint(...) : String | PairTest.java:18:44:18:70 | left(...) : Pair [left] : String | provenance | MaD:371 |
+| PairTest.java:18:63:18:69 | taint(...) : String | PairTest.java:18:44:18:70 | left(...) : Pair [left] : String | provenance | MaD:179 |
 | PairTest.java:19:52:19:79 | (...)... : ImmutablePair [left] : String | PairTest.java:40:12:40:23 | taintedLeft2 : ImmutablePair [left] : String | provenance |  |
 | PairTest.java:19:52:19:79 | (...)... : ImmutablePair [left] : String | PairTest.java:42:12:42:23 | taintedLeft2 : ImmutablePair [left] : String | provenance |  |
 | PairTest.java:19:52:19:79 | (...)... : ImmutablePair [left] : String | PairTest.java:44:12:44:23 | taintedLeft2 : ImmutablePair [left] : String | provenance |  |
 | PairTest.java:20:45:20:72 | right(...) : Pair [right] : String | PairTest.java:21:53:21:81 | (...)... : ImmutablePair [right] : String | provenance |  |
 | PairTest.java:20:45:20:72 | right(...) : Pair [right] : String | PairTest.java:79:12:79:25 | taintedRight2_ : Pair [right] : String | provenance |  |
 | PairTest.java:20:45:20:72 | right(...) : Pair [right] : String | PairTest.java:81:12:81:25 | taintedRight2_ : Pair [right] : String | provenance |  |
-| PairTest.java:20:65:20:71 | taint(...) : String | PairTest.java:20:45:20:72 | right(...) : Pair [right] : String | provenance | MaD:374 |
+| PairTest.java:20:65:20:71 | taint(...) : String | PairTest.java:20:45:20:72 | right(...) : Pair [right] : String | provenance | MaD:182 |
 | PairTest.java:21:53:21:81 | (...)... : ImmutablePair [right] : String | PairTest.java:47:12:47:24 | taintedRight2 : ImmutablePair [right] : String | provenance |  |
 | PairTest.java:21:53:21:81 | (...)... : ImmutablePair [right] : String | PairTest.java:49:12:49:24 | taintedRight2 : ImmutablePair [right] : String | provenance |  |
 | PairTest.java:21:53:21:81 | (...)... : ImmutablePair [right] : String | PairTest.java:51:12:51:24 | taintedRight2 : ImmutablePair [right] : String | provenance |  |
 | PairTest.java:22:43:22:73 | of(...) : Pair [left] : String | PairTest.java:52:12:52:23 | taintedLeft3 : Pair [left] : String | provenance |  |
 | PairTest.java:22:43:22:73 | of(...) : Pair [left] : String | PairTest.java:54:12:54:23 | taintedLeft3 : Pair [left] : String | provenance |  |
-| PairTest.java:22:51:22:57 | taint(...) : String | PairTest.java:22:43:22:73 | of(...) : Pair [left] : String | provenance | MaD:405 |
+| PairTest.java:22:51:22:57 | taint(...) : String | PairTest.java:22:43:22:73 | of(...) : Pair [left] : String | provenance | MaD:205 |
 | PairTest.java:23:44:23:73 | of(...) : Pair [right] : String | PairTest.java:57:12:57:24 | taintedRight3 : Pair [right] : String | provenance |  |
 | PairTest.java:23:44:23:73 | of(...) : Pair [right] : String | PairTest.java:59:12:59:24 | taintedRight3 : Pair [right] : String | provenance |  |
-| PairTest.java:23:66:23:72 | taint(...) : String | PairTest.java:23:44:23:73 | of(...) : Pair [right] : String | provenance | MaD:406 |
+| PairTest.java:23:66:23:72 | taint(...) : String | PairTest.java:23:44:23:73 | of(...) : Pair [right] : String | provenance | MaD:206 |
 | PairTest.java:24:52:24:92 | new ImmutablePair<>(...) : ImmutablePair [left] : String | PairTest.java:60:12:60:23 | taintedLeft4 : ImmutablePair [left] : String | provenance |  |
 | PairTest.java:24:52:24:92 | new ImmutablePair<>(...) : ImmutablePair [left] : String | PairTest.java:62:12:62:23 | taintedLeft4 : ImmutablePair [left] : String | provenance |  |
 | PairTest.java:24:52:24:92 | new ImmutablePair<>(...) : ImmutablePair [left] : String | PairTest.java:64:12:64:23 | taintedLeft4 : ImmutablePair [left] : String | provenance |  |
-| PairTest.java:24:70:24:76 | taint(...) : String | PairTest.java:24:52:24:92 | new ImmutablePair<>(...) : ImmutablePair [left] : String | provenance | MaD:369 |
+| PairTest.java:24:70:24:76 | taint(...) : String | PairTest.java:24:52:24:92 | new ImmutablePair<>(...) : ImmutablePair [left] : String | provenance | MaD:177 |
 | PairTest.java:25:53:25:92 | new ImmutablePair<>(...) : ImmutablePair [right] : String | PairTest.java:67:12:67:24 | taintedRight4 : ImmutablePair [right] : String | provenance |  |
 | PairTest.java:25:53:25:92 | new ImmutablePair<>(...) : ImmutablePair [right] : String | PairTest.java:69:12:69:24 | taintedRight4 : ImmutablePair [right] : String | provenance |  |
 | PairTest.java:25:53:25:92 | new ImmutablePair<>(...) : ImmutablePair [right] : String | PairTest.java:71:12:71:24 | taintedRight4 : ImmutablePair [right] : String | provenance |  |
-| PairTest.java:25:85:25:91 | taint(...) : String | PairTest.java:25:53:25:92 | new ImmutablePair<>(...) : ImmutablePair [right] : String | provenance | MaD:370 |
-| PairTest.java:28:12:28:22 | taintedLeft : ImmutablePair [left] : String | PairTest.java:28:12:28:32 | getLeft(...) | provenance | MaD:399 |
-| PairTest.java:30:12:30:22 | taintedLeft : ImmutablePair [left] : String | PairTest.java:30:12:30:31 | getKey(...) | provenance | MaD:397 |
+| PairTest.java:25:85:25:91 | taint(...) : String | PairTest.java:25:53:25:92 | new ImmutablePair<>(...) : ImmutablePair [right] : String | provenance | MaD:178 |
+| PairTest.java:28:12:28:22 | taintedLeft : ImmutablePair [left] : String | PairTest.java:28:12:28:32 | getLeft(...) | provenance | MaD:209 |
+| PairTest.java:30:12:30:22 | taintedLeft : ImmutablePair [left] : String | PairTest.java:30:12:30:31 | getKey(...) | provenance | MaD:207 |
 | PairTest.java:32:12:32:22 | taintedLeft : ImmutablePair [left] : String | PairTest.java:32:12:32:27 | taintedLeft.left | provenance |  |
-| PairTest.java:35:12:35:23 | taintedRight : ImmutablePair [right] : String | PairTest.java:35:12:35:34 | getRight(...) | provenance | MaD:401 |
-| PairTest.java:37:12:37:23 | taintedRight : ImmutablePair [right] : String | PairTest.java:37:12:37:34 | getValue(...) | provenance | MaD:403 |
+| PairTest.java:35:12:35:23 | taintedRight : ImmutablePair [right] : String | PairTest.java:35:12:35:34 | getRight(...) | provenance | MaD:211 |
+| PairTest.java:37:12:37:23 | taintedRight : ImmutablePair [right] : String | PairTest.java:37:12:37:34 | getValue(...) | provenance | MaD:213 |
 | PairTest.java:39:12:39:23 | taintedRight : ImmutablePair [right] : String | PairTest.java:39:12:39:29 | taintedRight.right | provenance |  |
-| PairTest.java:40:12:40:23 | taintedLeft2 : ImmutablePair [left] : String | PairTest.java:40:12:40:33 | getLeft(...) | provenance | MaD:399 |
-| PairTest.java:42:12:42:23 | taintedLeft2 : ImmutablePair [left] : String | PairTest.java:42:12:42:32 | getKey(...) | provenance | MaD:397 |
+| PairTest.java:40:12:40:23 | taintedLeft2 : ImmutablePair [left] : String | PairTest.java:40:12:40:33 | getLeft(...) | provenance | MaD:209 |
+| PairTest.java:42:12:42:23 | taintedLeft2 : ImmutablePair [left] : String | PairTest.java:42:12:42:32 | getKey(...) | provenance | MaD:207 |
 | PairTest.java:44:12:44:23 | taintedLeft2 : ImmutablePair [left] : String | PairTest.java:44:12:44:28 | taintedLeft2.left | provenance |  |
-| PairTest.java:47:12:47:24 | taintedRight2 : ImmutablePair [right] : String | PairTest.java:47:12:47:35 | getRight(...) | provenance | MaD:401 |
-| PairTest.java:49:12:49:24 | taintedRight2 : ImmutablePair [right] : String | PairTest.java:49:12:49:35 | getValue(...) | provenance | MaD:403 |
+| PairTest.java:47:12:47:24 | taintedRight2 : ImmutablePair [right] : String | PairTest.java:47:12:47:35 | getRight(...) | provenance | MaD:211 |
+| PairTest.java:49:12:49:24 | taintedRight2 : ImmutablePair [right] : String | PairTest.java:49:12:49:35 | getValue(...) | provenance | MaD:213 |
 | PairTest.java:51:12:51:24 | taintedRight2 : ImmutablePair [right] : String | PairTest.java:51:12:51:30 | taintedRight2.right | provenance |  |
-| PairTest.java:52:12:52:23 | taintedLeft3 : Pair [left] : String | PairTest.java:52:12:52:33 | getLeft(...) | provenance | MaD:399 |
-| PairTest.java:54:12:54:23 | taintedLeft3 : Pair [left] : String | PairTest.java:54:12:54:32 | getKey(...) | provenance | MaD:397 |
-| PairTest.java:57:12:57:24 | taintedRight3 : Pair [right] : String | PairTest.java:57:12:57:35 | getRight(...) | provenance | MaD:401 |
-| PairTest.java:59:12:59:24 | taintedRight3 : Pair [right] : String | PairTest.java:59:12:59:35 | getValue(...) | provenance | MaD:403 |
-| PairTest.java:60:12:60:23 | taintedLeft4 : ImmutablePair [left] : String | PairTest.java:60:12:60:33 | getLeft(...) | provenance | MaD:399 |
-| PairTest.java:62:12:62:23 | taintedLeft4 : ImmutablePair [left] : String | PairTest.java:62:12:62:32 | getKey(...) | provenance | MaD:397 |
+| PairTest.java:52:12:52:23 | taintedLeft3 : Pair [left] : String | PairTest.java:52:12:52:33 | getLeft(...) | provenance | MaD:209 |
+| PairTest.java:54:12:54:23 | taintedLeft3 : Pair [left] : String | PairTest.java:54:12:54:32 | getKey(...) | provenance | MaD:207 |
+| PairTest.java:57:12:57:24 | taintedRight3 : Pair [right] : String | PairTest.java:57:12:57:35 | getRight(...) | provenance | MaD:211 |
+| PairTest.java:59:12:59:24 | taintedRight3 : Pair [right] : String | PairTest.java:59:12:59:35 | getValue(...) | provenance | MaD:213 |
+| PairTest.java:60:12:60:23 | taintedLeft4 : ImmutablePair [left] : String | PairTest.java:60:12:60:33 | getLeft(...) | provenance | MaD:209 |
+| PairTest.java:62:12:62:23 | taintedLeft4 : ImmutablePair [left] : String | PairTest.java:62:12:62:32 | getKey(...) | provenance | MaD:207 |
 | PairTest.java:64:12:64:23 | taintedLeft4 : ImmutablePair [left] : String | PairTest.java:64:12:64:28 | taintedLeft4.left | provenance |  |
-| PairTest.java:67:12:67:24 | taintedRight4 : ImmutablePair [right] : String | PairTest.java:67:12:67:35 | getRight(...) | provenance | MaD:401 |
-| PairTest.java:69:12:69:24 | taintedRight4 : ImmutablePair [right] : String | PairTest.java:69:12:69:35 | getValue(...) | provenance | MaD:403 |
+| PairTest.java:67:12:67:24 | taintedRight4 : ImmutablePair [right] : String | PairTest.java:67:12:67:35 | getRight(...) | provenance | MaD:211 |
+| PairTest.java:69:12:69:24 | taintedRight4 : ImmutablePair [right] : String | PairTest.java:69:12:69:35 | getValue(...) | provenance | MaD:213 |
 | PairTest.java:71:12:71:24 | taintedRight4 : ImmutablePair [right] : String | PairTest.java:71:12:71:30 | taintedRight4.right | provenance |  |
-| PairTest.java:74:12:74:24 | taintedLeft2_ : Pair [left] : String | PairTest.java:74:12:74:34 | getLeft(...) | provenance | MaD:399 |
-| PairTest.java:76:12:76:24 | taintedLeft2_ : Pair [left] : String | PairTest.java:76:12:76:33 | getKey(...) | provenance | MaD:397 |
-| PairTest.java:79:12:79:25 | taintedRight2_ : Pair [right] : String | PairTest.java:79:12:79:36 | getRight(...) | provenance | MaD:401 |
-| PairTest.java:81:12:81:25 | taintedRight2_ : Pair [right] : String | PairTest.java:81:12:81:36 | getValue(...) | provenance | MaD:403 |
+| PairTest.java:74:12:74:24 | taintedLeft2_ : Pair [left] : String | PairTest.java:74:12:74:34 | getLeft(...) | provenance | MaD:209 |
+| PairTest.java:76:12:76:24 | taintedLeft2_ : Pair [left] : String | PairTest.java:76:12:76:33 | getKey(...) | provenance | MaD:207 |
+| PairTest.java:79:12:79:25 | taintedRight2_ : Pair [right] : String | PairTest.java:79:12:79:36 | getRight(...) | provenance | MaD:211 |
+| PairTest.java:81:12:81:25 | taintedRight2_ : Pair [right] : String | PairTest.java:81:12:81:36 | getValue(...) | provenance | MaD:213 |
 | PairTest.java:84:56:84:93 | of(...) : MutablePair [left] : String | PairTest.java:95:12:95:29 | taintedLeftMutable : MutablePair [left] : String | provenance |  |
 | PairTest.java:84:56:84:93 | of(...) : MutablePair [left] : String | PairTest.java:97:12:97:29 | taintedLeftMutable : MutablePair [left] : String | provenance |  |
 | PairTest.java:84:56:84:93 | of(...) : MutablePair [left] : String | PairTest.java:99:12:99:29 | taintedLeftMutable : MutablePair [left] : String | provenance |  |
 | PairTest.java:84:56:84:93 | of(...) : MutablePair [left] : String | PairTest.java:141:12:141:34 | taintedLeftMutableAlias : MutablePair [left] : String | provenance |  |
 | PairTest.java:84:56:84:93 | of(...) : MutablePair [left] : String | PairTest.java:143:12:143:34 | taintedLeftMutableAlias : MutablePair [left] : String | provenance |  |
-| PairTest.java:84:71:84:77 | taint(...) : String | PairTest.java:84:56:84:93 | of(...) : MutablePair [left] : String | provenance | MaD:383 |
+| PairTest.java:84:71:84:77 | taint(...) : String | PairTest.java:84:56:84:93 | of(...) : MutablePair [left] : String | provenance | MaD:191 |
 | PairTest.java:85:57:85:93 | of(...) : MutablePair [right] : String | PairTest.java:102:12:102:30 | taintedRightMutable : MutablePair [right] : String | provenance |  |
 | PairTest.java:85:57:85:93 | of(...) : MutablePair [right] : String | PairTest.java:104:12:104:30 | taintedRightMutable : MutablePair [right] : String | provenance |  |
 | PairTest.java:85:57:85:93 | of(...) : MutablePair [right] : String | PairTest.java:106:12:106:30 | taintedRightMutable : MutablePair [right] : String | provenance |  |
 | PairTest.java:85:57:85:93 | of(...) : MutablePair [right] : String | PairTest.java:146:12:146:35 | taintedRightMutableAlias : MutablePair [right] : String | provenance |  |
 | PairTest.java:85:57:85:93 | of(...) : MutablePair [right] : String | PairTest.java:148:12:148:35 | taintedRightMutableAlias : MutablePair [right] : String | provenance |  |
-| PairTest.java:85:86:85:92 | taint(...) : String | PairTest.java:85:57:85:93 | of(...) : MutablePair [right] : String | provenance | MaD:384 |
+| PairTest.java:85:86:85:92 | taint(...) : String | PairTest.java:85:57:85:93 | of(...) : MutablePair [right] : String | provenance | MaD:192 |
 | PairTest.java:87:7:87:18 | setTaintLeft [post update] : MutablePair [left] : String | PairTest.java:107:12:107:23 | setTaintLeft : MutablePair [left] : String | provenance |  |
 | PairTest.java:87:7:87:18 | setTaintLeft [post update] : MutablePair [left] : String | PairTest.java:109:12:109:23 | setTaintLeft : MutablePair [left] : String | provenance |  |
 | PairTest.java:87:7:87:18 | setTaintLeft [post update] : MutablePair [left] : String | PairTest.java:111:12:111:23 | setTaintLeft : MutablePair [left] : String | provenance |  |
-| PairTest.java:87:28:87:34 | taint(...) : String | PairTest.java:87:7:87:18 | setTaintLeft [post update] : MutablePair [left] : String | provenance | MaD:385 |
+| PairTest.java:87:28:87:34 | taint(...) : String | PairTest.java:87:7:87:18 | setTaintLeft [post update] : MutablePair [left] : String | provenance | MaD:193 |
 | PairTest.java:89:7:89:19 | setTaintRight [post update] : MutablePair [right] : String | PairTest.java:114:12:114:24 | setTaintRight : MutablePair [right] : String | provenance |  |
 | PairTest.java:89:7:89:19 | setTaintRight [post update] : MutablePair [right] : String | PairTest.java:116:12:116:24 | setTaintRight : MutablePair [right] : String | provenance |  |
 | PairTest.java:89:7:89:19 | setTaintRight [post update] : MutablePair [right] : String | PairTest.java:118:12:118:24 | setTaintRight : MutablePair [right] : String | provenance |  |
-| PairTest.java:89:30:89:36 | taint(...) : String | PairTest.java:89:7:89:19 | setTaintRight [post update] : MutablePair [right] : String | provenance | MaD:386 |
+| PairTest.java:89:30:89:36 | taint(...) : String | PairTest.java:89:7:89:19 | setTaintRight [post update] : MutablePair [right] : String | provenance | MaD:194 |
 | PairTest.java:91:7:91:19 | setTaintValue [post update] : MutablePair [<map.value>] : String | PairTest.java:122:12:122:24 | setTaintValue : MutablePair [<map.value>] : String | provenance |  |
 | PairTest.java:91:7:91:19 | setTaintValue [post update] : MutablePair [right] : String | PairTest.java:120:12:120:24 | setTaintValue : MutablePair [right] : String | provenance |  |
 | PairTest.java:91:7:91:19 | setTaintValue [post update] : MutablePair [right] : String | PairTest.java:122:12:122:24 | setTaintValue : MutablePair [right] : String | provenance |  |
 | PairTest.java:91:7:91:19 | setTaintValue [post update] : MutablePair [right] : String | PairTest.java:124:12:124:24 | setTaintValue : MutablePair [right] : String | provenance |  |
-| PairTest.java:91:30:91:36 | taint(...) : String | PairTest.java:91:7:91:19 | setTaintValue [post update] : MutablePair [<map.value>] : String | provenance | MaD:18 |
-| PairTest.java:91:30:91:36 | taint(...) : String | PairTest.java:91:7:91:19 | setTaintValue [post update] : MutablePair [right] : String | provenance | MaD:387 |
+| PairTest.java:91:30:91:36 | taint(...) : String | PairTest.java:91:7:91:19 | setTaintValue [post update] : MutablePair [<map.value>] : String | provenance | MaD:16 |
+| PairTest.java:91:30:91:36 | taint(...) : String | PairTest.java:91:7:91:19 | setTaintValue [post update] : MutablePair [right] : String | provenance | MaD:195 |
 | PairTest.java:92:67:92:105 | new MutablePair<>(...) : MutablePair [left] : String | PairTest.java:125:12:125:40 | taintedLeftMutableConstructed : MutablePair [left] : String | provenance |  |
 | PairTest.java:92:67:92:105 | new MutablePair<>(...) : MutablePair [left] : String | PairTest.java:127:12:127:40 | taintedLeftMutableConstructed : MutablePair [left] : String | provenance |  |
 | PairTest.java:92:67:92:105 | new MutablePair<>(...) : MutablePair [left] : String | PairTest.java:129:12:129:40 | taintedLeftMutableConstructed : MutablePair [left] : String | provenance |  |
-| PairTest.java:92:83:92:89 | taint(...) : String | PairTest.java:92:67:92:105 | new MutablePair<>(...) : MutablePair [left] : String | provenance | MaD:381 |
+| PairTest.java:92:83:92:89 | taint(...) : String | PairTest.java:92:67:92:105 | new MutablePair<>(...) : MutablePair [left] : String | provenance | MaD:189 |
 | PairTest.java:93:68:93:105 | new MutablePair<>(...) : MutablePair [right] : String | PairTest.java:132:12:132:41 | taintedRightMutableConstructed : MutablePair [right] : String | provenance |  |
 | PairTest.java:93:68:93:105 | new MutablePair<>(...) : MutablePair [right] : String | PairTest.java:134:12:134:41 | taintedRightMutableConstructed : MutablePair [right] : String | provenance |  |
 | PairTest.java:93:68:93:105 | new MutablePair<>(...) : MutablePair [right] : String | PairTest.java:136:12:136:41 | taintedRightMutableConstructed : MutablePair [right] : String | provenance |  |
-| PairTest.java:93:98:93:104 | taint(...) : String | PairTest.java:93:68:93:105 | new MutablePair<>(...) : MutablePair [right] : String | provenance | MaD:382 |
-| PairTest.java:95:12:95:29 | taintedLeftMutable : MutablePair [left] : String | PairTest.java:95:12:95:39 | getLeft(...) | provenance | MaD:400 |
-| PairTest.java:97:12:97:29 | taintedLeftMutable : MutablePair [left] : String | PairTest.java:97:12:97:38 | getKey(...) | provenance | MaD:398 |
+| PairTest.java:93:98:93:104 | taint(...) : String | PairTest.java:93:68:93:105 | new MutablePair<>(...) : MutablePair [right] : String | provenance | MaD:190 |
+| PairTest.java:95:12:95:29 | taintedLeftMutable : MutablePair [left] : String | PairTest.java:95:12:95:39 | getLeft(...) | provenance | MaD:210 |
+| PairTest.java:97:12:97:29 | taintedLeftMutable : MutablePair [left] : String | PairTest.java:97:12:97:38 | getKey(...) | provenance | MaD:208 |
 | PairTest.java:99:12:99:29 | taintedLeftMutable : MutablePair [left] : String | PairTest.java:99:12:99:34 | taintedLeftMutable.left | provenance |  |
-| PairTest.java:102:12:102:30 | taintedRightMutable : MutablePair [right] : String | PairTest.java:102:12:102:41 | getRight(...) | provenance | MaD:402 |
-| PairTest.java:104:12:104:30 | taintedRightMutable : MutablePair [right] : String | PairTest.java:104:12:104:41 | getValue(...) | provenance | MaD:404 |
+| PairTest.java:102:12:102:30 | taintedRightMutable : MutablePair [right] : String | PairTest.java:102:12:102:41 | getRight(...) | provenance | MaD:212 |
+| PairTest.java:104:12:104:30 | taintedRightMutable : MutablePair [right] : String | PairTest.java:104:12:104:41 | getValue(...) | provenance | MaD:214 |
 | PairTest.java:106:12:106:30 | taintedRightMutable : MutablePair [right] : String | PairTest.java:106:12:106:36 | taintedRightMutable.right | provenance |  |
-| PairTest.java:107:12:107:23 | setTaintLeft : MutablePair [left] : String | PairTest.java:107:12:107:33 | getLeft(...) | provenance | MaD:400 |
-| PairTest.java:109:12:109:23 | setTaintLeft : MutablePair [left] : String | PairTest.java:109:12:109:32 | getKey(...) | provenance | MaD:398 |
+| PairTest.java:107:12:107:23 | setTaintLeft : MutablePair [left] : String | PairTest.java:107:12:107:33 | getLeft(...) | provenance | MaD:210 |
+| PairTest.java:109:12:109:23 | setTaintLeft : MutablePair [left] : String | PairTest.java:109:12:109:32 | getKey(...) | provenance | MaD:208 |
 | PairTest.java:111:12:111:23 | setTaintLeft : MutablePair [left] : String | PairTest.java:111:12:111:28 | setTaintLeft.left | provenance |  |
-| PairTest.java:114:12:114:24 | setTaintRight : MutablePair [right] : String | PairTest.java:114:12:114:35 | getRight(...) | provenance | MaD:402 |
-| PairTest.java:116:12:116:24 | setTaintRight : MutablePair [right] : String | PairTest.java:116:12:116:35 | getValue(...) | provenance | MaD:404 |
+| PairTest.java:114:12:114:24 | setTaintRight : MutablePair [right] : String | PairTest.java:114:12:114:35 | getRight(...) | provenance | MaD:212 |
+| PairTest.java:116:12:116:24 | setTaintRight : MutablePair [right] : String | PairTest.java:116:12:116:35 | getValue(...) | provenance | MaD:214 |
 | PairTest.java:118:12:118:24 | setTaintRight : MutablePair [right] : String | PairTest.java:118:12:118:30 | setTaintRight.right | provenance |  |
-| PairTest.java:120:12:120:24 | setTaintValue : MutablePair [right] : String | PairTest.java:120:12:120:35 | getRight(...) | provenance | MaD:402 |
-| PairTest.java:122:12:122:24 | setTaintValue : MutablePair [<map.value>] : String | PairTest.java:122:12:122:35 | getValue(...) | provenance | MaD:17 |
-| PairTest.java:122:12:122:24 | setTaintValue : MutablePair [right] : String | PairTest.java:122:12:122:35 | getValue(...) | provenance | MaD:404 |
+| PairTest.java:120:12:120:24 | setTaintValue : MutablePair [right] : String | PairTest.java:120:12:120:35 | getRight(...) | provenance | MaD:212 |
+| PairTest.java:122:12:122:24 | setTaintValue : MutablePair [<map.value>] : String | PairTest.java:122:12:122:35 | getValue(...) | provenance | MaD:15 |
+| PairTest.java:122:12:122:24 | setTaintValue : MutablePair [right] : String | PairTest.java:122:12:122:35 | getValue(...) | provenance | MaD:214 |
 | PairTest.java:124:12:124:24 | setTaintValue : MutablePair [right] : String | PairTest.java:124:12:124:30 | setTaintValue.right | provenance |  |
-| PairTest.java:125:12:125:40 | taintedLeftMutableConstructed : MutablePair [left] : String | PairTest.java:125:12:125:50 | getLeft(...) | provenance | MaD:400 |
-| PairTest.java:127:12:127:40 | taintedLeftMutableConstructed : MutablePair [left] : String | PairTest.java:127:12:127:49 | getKey(...) | provenance | MaD:398 |
+| PairTest.java:125:12:125:40 | taintedLeftMutableConstructed : MutablePair [left] : String | PairTest.java:125:12:125:50 | getLeft(...) | provenance | MaD:210 |
+| PairTest.java:127:12:127:40 | taintedLeftMutableConstructed : MutablePair [left] : String | PairTest.java:127:12:127:49 | getKey(...) | provenance | MaD:208 |
 | PairTest.java:129:12:129:40 | taintedLeftMutableConstructed : MutablePair [left] : String | PairTest.java:129:12:129:45 | taintedLeftMutableConstructed.left | provenance |  |
-| PairTest.java:132:12:132:41 | taintedRightMutableConstructed : MutablePair [right] : String | PairTest.java:132:12:132:52 | getRight(...) | provenance | MaD:402 |
-| PairTest.java:134:12:134:41 | taintedRightMutableConstructed : MutablePair [right] : String | PairTest.java:134:12:134:52 | getValue(...) | provenance | MaD:404 |
+| PairTest.java:132:12:132:41 | taintedRightMutableConstructed : MutablePair [right] : String | PairTest.java:132:12:132:52 | getRight(...) | provenance | MaD:212 |
+| PairTest.java:134:12:134:41 | taintedRightMutableConstructed : MutablePair [right] : String | PairTest.java:134:12:134:52 | getValue(...) | provenance | MaD:214 |
 | PairTest.java:136:12:136:41 | taintedRightMutableConstructed : MutablePair [right] : String | PairTest.java:136:12:136:47 | taintedRightMutableConstructed.right | provenance |  |
-| PairTest.java:141:12:141:34 | taintedLeftMutableAlias : MutablePair [left] : String | PairTest.java:141:12:141:44 | getLeft(...) | provenance | MaD:400 |
-| PairTest.java:143:12:143:34 | taintedLeftMutableAlias : MutablePair [left] : String | PairTest.java:143:12:143:43 | getKey(...) | provenance | MaD:398 |
-| PairTest.java:146:12:146:35 | taintedRightMutableAlias : MutablePair [right] : String | PairTest.java:146:12:146:46 | getRight(...) | provenance | MaD:402 |
-| PairTest.java:148:12:148:35 | taintedRightMutableAlias : MutablePair [right] : String | PairTest.java:148:12:148:46 | getValue(...) | provenance | MaD:404 |
-| RegExUtilsTest.java:13:31:13:37 | taint(...) : String | RegExUtilsTest.java:13:10:13:52 | removeAll(...) | provenance | MaD:70 |
-| RegExUtilsTest.java:14:31:14:37 | taint(...) : String | RegExUtilsTest.java:14:10:14:47 | removeAll(...) | provenance | MaD:70 |
-| RegExUtilsTest.java:15:33:15:39 | taint(...) : String | RegExUtilsTest.java:15:10:15:54 | removeFirst(...) | provenance | MaD:71 |
-| RegExUtilsTest.java:16:33:16:39 | taint(...) : String | RegExUtilsTest.java:16:10:16:49 | removeFirst(...) | provenance | MaD:71 |
-| RegExUtilsTest.java:17:35:17:41 | taint(...) : String | RegExUtilsTest.java:17:10:17:51 | removePattern(...) | provenance | MaD:72 |
-| RegExUtilsTest.java:18:32:18:38 | taint(...) : String | RegExUtilsTest.java:18:10:18:68 | replaceAll(...) | provenance | MaD:73 |
-| RegExUtilsTest.java:19:32:19:38 | taint(...) : String | RegExUtilsTest.java:19:10:19:63 | replaceAll(...) | provenance | MaD:73 |
-| RegExUtilsTest.java:20:34:20:40 | taint(...) : String | RegExUtilsTest.java:20:10:20:70 | replaceFirst(...) | provenance | MaD:75 |
-| RegExUtilsTest.java:21:34:21:40 | taint(...) : String | RegExUtilsTest.java:21:10:21:65 | replaceFirst(...) | provenance | MaD:75 |
-| RegExUtilsTest.java:22:36:22:42 | taint(...) : String | RegExUtilsTest.java:22:10:22:67 | replacePattern(...) | provenance | MaD:77 |
-| RegExUtilsTest.java:23:58:23:64 | taint(...) : String | RegExUtilsTest.java:23:10:23:65 | replaceAll(...) | provenance | MaD:74 |
-| RegExUtilsTest.java:24:53:24:59 | taint(...) : String | RegExUtilsTest.java:24:10:24:60 | replaceAll(...) | provenance | MaD:74 |
-| RegExUtilsTest.java:25:60:25:66 | taint(...) : String | RegExUtilsTest.java:25:10:25:67 | replaceFirst(...) | provenance | MaD:76 |
-| RegExUtilsTest.java:26:55:26:61 | taint(...) : String | RegExUtilsTest.java:26:10:26:62 | replaceFirst(...) | provenance | MaD:76 |
-| RegExUtilsTest.java:27:57:27:63 | taint(...) : String | RegExUtilsTest.java:27:10:27:64 | replacePattern(...) | provenance | MaD:78 |
+| PairTest.java:141:12:141:34 | taintedLeftMutableAlias : MutablePair [left] : String | PairTest.java:141:12:141:44 | getLeft(...) | provenance | MaD:210 |
+| PairTest.java:143:12:143:34 | taintedLeftMutableAlias : MutablePair [left] : String | PairTest.java:143:12:143:43 | getKey(...) | provenance | MaD:208 |
+| PairTest.java:146:12:146:35 | taintedRightMutableAlias : MutablePair [right] : String | PairTest.java:146:12:146:46 | getRight(...) | provenance | MaD:212 |
+| PairTest.java:148:12:148:35 | taintedRightMutableAlias : MutablePair [right] : String | PairTest.java:148:12:148:46 | getValue(...) | provenance | MaD:214 |
+| RegExUtilsTest.java:13:31:13:37 | taint(...) : String | RegExUtilsTest.java:13:10:13:52 | removeAll(...) | provenance | MaD:263 |
+| RegExUtilsTest.java:14:31:14:37 | taint(...) : String | RegExUtilsTest.java:14:10:14:47 | removeAll(...) | provenance | MaD:263 |
+| RegExUtilsTest.java:15:33:15:39 | taint(...) : String | RegExUtilsTest.java:15:10:15:54 | removeFirst(...) | provenance | MaD:264 |
+| RegExUtilsTest.java:16:33:16:39 | taint(...) : String | RegExUtilsTest.java:16:10:16:49 | removeFirst(...) | provenance | MaD:264 |
+| RegExUtilsTest.java:17:35:17:41 | taint(...) : String | RegExUtilsTest.java:17:10:17:51 | removePattern(...) | provenance | MaD:265 |
+| RegExUtilsTest.java:18:32:18:38 | taint(...) : String | RegExUtilsTest.java:18:10:18:68 | replaceAll(...) | provenance | MaD:266 |
+| RegExUtilsTest.java:19:32:19:38 | taint(...) : String | RegExUtilsTest.java:19:10:19:63 | replaceAll(...) | provenance | MaD:266 |
+| RegExUtilsTest.java:20:34:20:40 | taint(...) : String | RegExUtilsTest.java:20:10:20:70 | replaceFirst(...) | provenance | MaD:268 |
+| RegExUtilsTest.java:21:34:21:40 | taint(...) : String | RegExUtilsTest.java:21:10:21:65 | replaceFirst(...) | provenance | MaD:268 |
+| RegExUtilsTest.java:22:36:22:42 | taint(...) : String | RegExUtilsTest.java:22:10:22:67 | replacePattern(...) | provenance | MaD:270 |
+| RegExUtilsTest.java:23:58:23:64 | taint(...) : String | RegExUtilsTest.java:23:10:23:65 | replaceAll(...) | provenance | MaD:267 |
+| RegExUtilsTest.java:24:53:24:59 | taint(...) : String | RegExUtilsTest.java:24:10:24:60 | replaceAll(...) | provenance | MaD:267 |
+| RegExUtilsTest.java:25:60:25:66 | taint(...) : String | RegExUtilsTest.java:25:10:25:67 | replaceFirst(...) | provenance | MaD:269 |
+| RegExUtilsTest.java:26:55:26:61 | taint(...) : String | RegExUtilsTest.java:26:10:26:62 | replaceFirst(...) | provenance | MaD:269 |
+| RegExUtilsTest.java:27:57:27:63 | taint(...) : String | RegExUtilsTest.java:27:10:27:64 | replacePattern(...) | provenance | MaD:271 |
 | StrBuilderTest.java:17:28:17:50 | new StrBuilder(...) : StrBuilder | StrBuilderTest.java:17:58:17:62 | cons1 : StrBuilder | provenance |  |
-| StrBuilderTest.java:17:43:17:49 | taint(...) : String | StrBuilderTest.java:17:28:17:50 | new StrBuilder(...) : StrBuilder | provenance | MaD:226 |
+| StrBuilderTest.java:17:43:17:49 | taint(...) : String | StrBuilderTest.java:17:28:17:50 | new StrBuilder(...) : StrBuilder | provenance | MaD:34 |
 | StrBuilderTest.java:17:58:17:62 | cons1 : StrBuilder | StrBuilderTest.java:17:58:17:73 | toString(...) | provenance | MaD:5 |
-| StrBuilderTest.java:17:58:17:62 | cons1 : StrBuilder | StrBuilderTest.java:17:58:17:73 | toString(...) | provenance | MaD:311 |
+| StrBuilderTest.java:17:58:17:62 | cons1 : StrBuilder | StrBuilderTest.java:17:58:17:73 | toString(...) | provenance | MaD:119 |
 | StrBuilderTest.java:19:44:19:46 | sb1 [post update] : StrBuilder | StrBuilderTest.java:19:84:19:86 | sb1 : StrBuilder | provenance |  |
 | StrBuilderTest.java:19:55:19:61 | taint(...) : String | StrBuilderTest.java:19:55:19:75 | toCharArray(...) : char[] | provenance | MaD:7 |
-| StrBuilderTest.java:19:55:19:75 | toCharArray(...) : char[] | StrBuilderTest.java:19:44:19:46 | sb1 [post update] : StrBuilder | provenance | MaD:228 |
+| StrBuilderTest.java:19:55:19:75 | toCharArray(...) : char[] | StrBuilderTest.java:19:44:19:46 | sb1 [post update] : StrBuilder | provenance | MaD:35 |
 | StrBuilderTest.java:19:84:19:86 | sb1 : StrBuilder | StrBuilderTest.java:19:84:19:97 | toString(...) | provenance | MaD:5 |
-| StrBuilderTest.java:19:84:19:86 | sb1 : StrBuilder | StrBuilderTest.java:19:84:19:97 | toString(...) | provenance | MaD:311 |
+| StrBuilderTest.java:19:84:19:86 | sb1 : StrBuilder | StrBuilderTest.java:19:84:19:97 | toString(...) | provenance | MaD:119 |
 | StrBuilderTest.java:20:44:20:46 | sb2 [post update] : StrBuilder | StrBuilderTest.java:20:90:20:92 | sb2 : StrBuilder | provenance |  |
 | StrBuilderTest.java:20:55:20:61 | taint(...) : String | StrBuilderTest.java:20:55:20:75 | toCharArray(...) : char[] | provenance | MaD:7 |
-| StrBuilderTest.java:20:55:20:75 | toCharArray(...) : char[] | StrBuilderTest.java:20:44:20:46 | sb2 [post update] : StrBuilder | provenance | MaD:229 |
+| StrBuilderTest.java:20:55:20:75 | toCharArray(...) : char[] | StrBuilderTest.java:20:44:20:46 | sb2 [post update] : StrBuilder | provenance | MaD:36 |
 | StrBuilderTest.java:20:90:20:92 | sb2 : StrBuilder | StrBuilderTest.java:20:90:20:103 | toString(...) | provenance | MaD:5 |
-| StrBuilderTest.java:20:90:20:92 | sb2 : StrBuilder | StrBuilderTest.java:20:90:20:103 | toString(...) | provenance | MaD:311 |
+| StrBuilderTest.java:20:90:20:92 | sb2 : StrBuilder | StrBuilderTest.java:20:90:20:103 | toString(...) | provenance | MaD:119 |
 | StrBuilderTest.java:21:44:21:46 | sb3 [post update] : StrBuilder | StrBuilderTest.java:21:101:21:103 | sb3 : StrBuilder | provenance |  |
-| StrBuilderTest.java:21:55:21:92 | wrap(...) : CharBuffer | StrBuilderTest.java:21:44:21:46 | sb3 [post update] : StrBuilder | provenance | MaD:241 |
+| StrBuilderTest.java:21:55:21:92 | wrap(...) : CharBuffer | StrBuilderTest.java:21:44:21:46 | sb3 [post update] : StrBuilder | provenance | MaD:48 |
 | StrBuilderTest.java:21:71:21:77 | taint(...) : String | StrBuilderTest.java:21:71:21:91 | toCharArray(...) : char[] | provenance | MaD:7 |
 | StrBuilderTest.java:21:71:21:91 | toCharArray(...) : char[] | StrBuilderTest.java:21:55:21:92 | wrap(...) : CharBuffer | provenance | MaD:10 |
 | StrBuilderTest.java:21:101:21:103 | sb3 : StrBuilder | StrBuilderTest.java:21:101:21:114 | toString(...) | provenance | MaD:5 |
-| StrBuilderTest.java:21:101:21:103 | sb3 : StrBuilder | StrBuilderTest.java:21:101:21:114 | toString(...) | provenance | MaD:311 |
+| StrBuilderTest.java:21:101:21:103 | sb3 : StrBuilder | StrBuilderTest.java:21:101:21:114 | toString(...) | provenance | MaD:119 |
 | StrBuilderTest.java:22:44:22:46 | sb4 [post update] : StrBuilder | StrBuilderTest.java:22:107:22:109 | sb4 : StrBuilder | provenance |  |
-| StrBuilderTest.java:22:55:22:92 | wrap(...) : CharBuffer | StrBuilderTest.java:22:44:22:46 | sb4 [post update] : StrBuilder | provenance | MaD:242 |
+| StrBuilderTest.java:22:55:22:92 | wrap(...) : CharBuffer | StrBuilderTest.java:22:44:22:46 | sb4 [post update] : StrBuilder | provenance | MaD:49 |
 | StrBuilderTest.java:22:71:22:77 | taint(...) : String | StrBuilderTest.java:22:71:22:91 | toCharArray(...) : char[] | provenance | MaD:7 |
 | StrBuilderTest.java:22:71:22:91 | toCharArray(...) : char[] | StrBuilderTest.java:22:55:22:92 | wrap(...) : CharBuffer | provenance | MaD:10 |
 | StrBuilderTest.java:22:107:22:109 | sb4 : StrBuilder | StrBuilderTest.java:22:107:22:120 | toString(...) | provenance | MaD:5 |
-| StrBuilderTest.java:22:107:22:109 | sb4 : StrBuilder | StrBuilderTest.java:22:107:22:120 | toString(...) | provenance | MaD:311 |
+| StrBuilderTest.java:22:107:22:109 | sb4 : StrBuilder | StrBuilderTest.java:22:107:22:120 | toString(...) | provenance | MaD:119 |
 | StrBuilderTest.java:23:44:23:46 | sb5 [post update] : StrBuilder | StrBuilderTest.java:23:84:23:86 | sb5 : StrBuilder | provenance |  |
 | StrBuilderTest.java:23:55:23:75 | (...)... : String | StrBuilderTest.java:23:44:23:46 | sb5 [post update] : StrBuilder | provenance | MaD:3 |
-| StrBuilderTest.java:23:55:23:75 | (...)... : String | StrBuilderTest.java:23:44:23:46 | sb5 [post update] : StrBuilder | provenance | MaD:230 |
+| StrBuilderTest.java:23:55:23:75 | (...)... : String | StrBuilderTest.java:23:44:23:46 | sb5 [post update] : StrBuilder | provenance | MaD:37 |
 | StrBuilderTest.java:23:69:23:75 | taint(...) : String | StrBuilderTest.java:23:55:23:75 | (...)... : String | provenance |  |
 | StrBuilderTest.java:23:84:23:86 | sb5 : StrBuilder | StrBuilderTest.java:23:84:23:97 | toString(...) | provenance | MaD:5 |
-| StrBuilderTest.java:23:84:23:86 | sb5 : StrBuilder | StrBuilderTest.java:23:84:23:97 | toString(...) | provenance | MaD:311 |
+| StrBuilderTest.java:23:84:23:86 | sb5 : StrBuilder | StrBuilderTest.java:23:84:23:97 | toString(...) | provenance | MaD:119 |
 | StrBuilderTest.java:24:44:24:46 | sb6 [post update] : StrBuilder | StrBuilderTest.java:24:90:24:92 | sb6 : StrBuilder | provenance |  |
 | StrBuilderTest.java:24:55:24:75 | (...)... : String | StrBuilderTest.java:24:44:24:46 | sb6 [post update] : StrBuilder | provenance | MaD:3 |
-| StrBuilderTest.java:24:55:24:75 | (...)... : String | StrBuilderTest.java:24:44:24:46 | sb6 [post update] : StrBuilder | provenance | MaD:231 |
+| StrBuilderTest.java:24:55:24:75 | (...)... : String | StrBuilderTest.java:24:44:24:46 | sb6 [post update] : StrBuilder | provenance | MaD:38 |
 | StrBuilderTest.java:24:69:24:75 | taint(...) : String | StrBuilderTest.java:24:55:24:75 | (...)... : String | provenance |  |
 | StrBuilderTest.java:24:90:24:92 | sb6 : StrBuilder | StrBuilderTest.java:24:90:24:103 | toString(...) | provenance | MaD:5 |
-| StrBuilderTest.java:24:90:24:92 | sb6 : StrBuilder | StrBuilderTest.java:24:90:24:103 | toString(...) | provenance | MaD:311 |
+| StrBuilderTest.java:24:90:24:92 | sb6 : StrBuilder | StrBuilderTest.java:24:90:24:103 | toString(...) | provenance | MaD:119 |
 | StrBuilderTest.java:25:44:25:46 | sb7 [post update] : StrBuilder | StrBuilderTest.java:25:78:25:80 | sb7 : StrBuilder | provenance |  |
-| StrBuilderTest.java:25:55:25:69 | (...)... : String | StrBuilderTest.java:25:44:25:46 | sb7 [post update] : StrBuilder | provenance | MaD:232 |
+| StrBuilderTest.java:25:55:25:69 | (...)... : String | StrBuilderTest.java:25:44:25:46 | sb7 [post update] : StrBuilder | provenance | MaD:39 |
 | StrBuilderTest.java:25:63:25:69 | taint(...) : String | StrBuilderTest.java:25:55:25:69 | (...)... : String | provenance |  |
 | StrBuilderTest.java:25:78:25:80 | sb7 : StrBuilder | StrBuilderTest.java:25:78:25:91 | toString(...) | provenance | MaD:5 |
-| StrBuilderTest.java:25:78:25:80 | sb7 : StrBuilder | StrBuilderTest.java:25:78:25:91 | toString(...) | provenance | MaD:311 |
+| StrBuilderTest.java:25:78:25:80 | sb7 : StrBuilder | StrBuilderTest.java:25:78:25:91 | toString(...) | provenance | MaD:119 |
 | StrBuilderTest.java:27:50:27:54 | auxsb [post update] : StrBuilder | StrBuilderTest.java:28:59:28:63 | auxsb : StrBuilder | provenance |  |
-| StrBuilderTest.java:27:63:27:69 | taint(...) : String | StrBuilderTest.java:27:50:27:54 | auxsb [post update] : StrBuilder | provenance | MaD:233 |
+| StrBuilderTest.java:27:63:27:69 | taint(...) : String | StrBuilderTest.java:27:50:27:54 | auxsb [post update] : StrBuilder | provenance | MaD:40 |
 | StrBuilderTest.java:28:48:28:50 | sb8 [post update] : StrBuilder | StrBuilderTest.java:28:72:28:74 | sb8 : StrBuilder | provenance |  |
-| StrBuilderTest.java:28:59:28:63 | auxsb : StrBuilder | StrBuilderTest.java:28:48:28:50 | sb8 [post update] : StrBuilder | provenance | MaD:243 |
+| StrBuilderTest.java:28:59:28:63 | auxsb : StrBuilder | StrBuilderTest.java:28:48:28:50 | sb8 [post update] : StrBuilder | provenance | MaD:50 |
 | StrBuilderTest.java:28:72:28:74 | sb8 : StrBuilder | StrBuilderTest.java:28:72:28:85 | toString(...) | provenance | MaD:5 |
-| StrBuilderTest.java:28:72:28:74 | sb8 : StrBuilder | StrBuilderTest.java:28:72:28:85 | toString(...) | provenance | MaD:311 |
+| StrBuilderTest.java:28:72:28:74 | sb8 : StrBuilder | StrBuilderTest.java:28:72:28:85 | toString(...) | provenance | MaD:119 |
 | StrBuilderTest.java:30:44:30:46 | sb9 [post update] : StrBuilder | StrBuilderTest.java:30:88:30:90 | sb9 : StrBuilder | provenance |  |
-| StrBuilderTest.java:30:55:30:79 | new StringBuffer(...) : StringBuffer | StrBuilderTest.java:30:44:30:46 | sb9 [post update] : StrBuilder | provenance | MaD:237 |
+| StrBuilderTest.java:30:55:30:79 | new StringBuffer(...) : StringBuffer | StrBuilderTest.java:30:44:30:46 | sb9 [post update] : StrBuilder | provenance | MaD:44 |
 | StrBuilderTest.java:30:72:30:78 | taint(...) : String | StrBuilderTest.java:30:55:30:79 | new StringBuffer(...) : StringBuffer | provenance | MaD:8 |
 | StrBuilderTest.java:30:88:30:90 | sb9 : StrBuilder | StrBuilderTest.java:30:88:30:101 | toString(...) | provenance | MaD:5 |
-| StrBuilderTest.java:30:88:30:90 | sb9 : StrBuilder | StrBuilderTest.java:30:88:30:101 | toString(...) | provenance | MaD:311 |
+| StrBuilderTest.java:30:88:30:90 | sb9 : StrBuilder | StrBuilderTest.java:30:88:30:101 | toString(...) | provenance | MaD:119 |
 | StrBuilderTest.java:31:45:31:48 | sb10 [post update] : StrBuilder | StrBuilderTest.java:31:96:31:99 | sb10 : StrBuilder | provenance |  |
-| StrBuilderTest.java:31:57:31:81 | new StringBuffer(...) : StringBuffer | StrBuilderTest.java:31:45:31:48 | sb10 [post update] : StrBuilder | provenance | MaD:238 |
+| StrBuilderTest.java:31:57:31:81 | new StringBuffer(...) : StringBuffer | StrBuilderTest.java:31:45:31:48 | sb10 [post update] : StrBuilder | provenance | MaD:45 |
 | StrBuilderTest.java:31:74:31:80 | taint(...) : String | StrBuilderTest.java:31:57:31:81 | new StringBuffer(...) : StringBuffer | provenance | MaD:8 |
 | StrBuilderTest.java:31:96:31:99 | sb10 : StrBuilder | StrBuilderTest.java:31:96:31:110 | toString(...) | provenance | MaD:5 |
-| StrBuilderTest.java:31:96:31:99 | sb10 : StrBuilder | StrBuilderTest.java:31:96:31:110 | toString(...) | provenance | MaD:311 |
+| StrBuilderTest.java:31:96:31:99 | sb10 : StrBuilder | StrBuilderTest.java:31:96:31:110 | toString(...) | provenance | MaD:119 |
 | StrBuilderTest.java:32:45:32:48 | sb11 [post update] : StrBuilder | StrBuilderTest.java:32:91:32:94 | sb11 : StrBuilder | provenance |  |
-| StrBuilderTest.java:32:57:32:82 | new StringBuilder(...) : StringBuilder | StrBuilderTest.java:32:45:32:48 | sb11 [post update] : StrBuilder | provenance | MaD:239 |
+| StrBuilderTest.java:32:57:32:82 | new StringBuilder(...) : StringBuilder | StrBuilderTest.java:32:45:32:48 | sb11 [post update] : StrBuilder | provenance | MaD:46 |
 | StrBuilderTest.java:32:75:32:81 | taint(...) : String | StrBuilderTest.java:32:57:32:82 | new StringBuilder(...) : StringBuilder | provenance | MaD:9 |
 | StrBuilderTest.java:32:91:32:94 | sb11 : StrBuilder | StrBuilderTest.java:32:91:32:105 | toString(...) | provenance | MaD:5 |
-| StrBuilderTest.java:32:91:32:94 | sb11 : StrBuilder | StrBuilderTest.java:32:91:32:105 | toString(...) | provenance | MaD:311 |
+| StrBuilderTest.java:32:91:32:94 | sb11 : StrBuilder | StrBuilderTest.java:32:91:32:105 | toString(...) | provenance | MaD:119 |
 | StrBuilderTest.java:33:45:33:48 | sb12 [post update] : StrBuilder | StrBuilderTest.java:33:97:33:100 | sb12 : StrBuilder | provenance |  |
-| StrBuilderTest.java:33:57:33:82 | new StringBuilder(...) : StringBuilder | StrBuilderTest.java:33:45:33:48 | sb12 [post update] : StrBuilder | provenance | MaD:240 |
+| StrBuilderTest.java:33:57:33:82 | new StringBuilder(...) : StringBuilder | StrBuilderTest.java:33:45:33:48 | sb12 [post update] : StrBuilder | provenance | MaD:47 |
 | StrBuilderTest.java:33:75:33:81 | taint(...) : String | StrBuilderTest.java:33:57:33:82 | new StringBuilder(...) : StringBuilder | provenance | MaD:9 |
 | StrBuilderTest.java:33:97:33:100 | sb12 : StrBuilder | StrBuilderTest.java:33:97:33:111 | toString(...) | provenance | MaD:5 |
-| StrBuilderTest.java:33:97:33:100 | sb12 : StrBuilder | StrBuilderTest.java:33:97:33:111 | toString(...) | provenance | MaD:311 |
+| StrBuilderTest.java:33:97:33:100 | sb12 : StrBuilder | StrBuilderTest.java:33:97:33:111 | toString(...) | provenance | MaD:119 |
 | StrBuilderTest.java:34:45:34:48 | sb13 [post update] : StrBuilder | StrBuilderTest.java:34:72:34:75 | sb13 : StrBuilder | provenance |  |
-| StrBuilderTest.java:34:57:34:63 | taint(...) : String | StrBuilderTest.java:34:45:34:48 | sb13 [post update] : StrBuilder | provenance | MaD:233 |
+| StrBuilderTest.java:34:57:34:63 | taint(...) : String | StrBuilderTest.java:34:45:34:48 | sb13 [post update] : StrBuilder | provenance | MaD:40 |
 | StrBuilderTest.java:34:72:34:75 | sb13 : StrBuilder | StrBuilderTest.java:34:72:34:86 | toString(...) | provenance | MaD:5 |
-| StrBuilderTest.java:34:72:34:75 | sb13 : StrBuilder | StrBuilderTest.java:34:72:34:86 | toString(...) | provenance | MaD:311 |
+| StrBuilderTest.java:34:72:34:75 | sb13 : StrBuilder | StrBuilderTest.java:34:72:34:86 | toString(...) | provenance | MaD:119 |
 | StrBuilderTest.java:35:45:35:48 | sb14 [post update] : StrBuilder | StrBuilderTest.java:35:78:35:81 | sb14 : StrBuilder | provenance |  |
-| StrBuilderTest.java:35:57:35:63 | taint(...) : String | StrBuilderTest.java:35:45:35:48 | sb14 [post update] : StrBuilder | provenance | MaD:234 |
+| StrBuilderTest.java:35:57:35:63 | taint(...) : String | StrBuilderTest.java:35:45:35:48 | sb14 [post update] : StrBuilder | provenance | MaD:41 |
 | StrBuilderTest.java:35:78:35:81 | sb14 : StrBuilder | StrBuilderTest.java:35:78:35:92 | toString(...) | provenance | MaD:5 |
-| StrBuilderTest.java:35:78:35:81 | sb14 : StrBuilder | StrBuilderTest.java:35:78:35:92 | toString(...) | provenance | MaD:311 |
+| StrBuilderTest.java:35:78:35:81 | sb14 : StrBuilder | StrBuilderTest.java:35:78:35:92 | toString(...) | provenance | MaD:119 |
 | StrBuilderTest.java:36:45:36:48 | sb15 [post update] : StrBuilder | StrBuilderTest.java:36:90:36:93 | sb15 : StrBuilder | provenance |  |
-| StrBuilderTest.java:36:57:36:63 | taint(...) : String | StrBuilderTest.java:36:45:36:48 | sb15 [post update] : StrBuilder | provenance | MaD:235 |
+| StrBuilderTest.java:36:57:36:63 | taint(...) : String | StrBuilderTest.java:36:45:36:48 | sb15 [post update] : StrBuilder | provenance | MaD:42 |
 | StrBuilderTest.java:36:90:36:93 | sb15 : StrBuilder | StrBuilderTest.java:36:90:36:104 | toString(...) | provenance | MaD:5 |
-| StrBuilderTest.java:36:90:36:93 | sb15 : StrBuilder | StrBuilderTest.java:36:90:36:104 | toString(...) | provenance | MaD:311 |
+| StrBuilderTest.java:36:90:36:93 | sb15 : StrBuilder | StrBuilderTest.java:36:90:36:104 | toString(...) | provenance | MaD:119 |
 | StrBuilderTest.java:37:45:37:48 | sb16 [post update] : StrBuilder | StrBuilderTest.java:37:97:37:100 | sb16 : StrBuilder | provenance |  |
-| StrBuilderTest.java:37:45:37:89 | new ..[] { .. } : Object[] [[]] : String | StrBuilderTest.java:37:45:37:48 | sb16 [post update] : StrBuilder | provenance | MaD:236 |
+| StrBuilderTest.java:37:45:37:89 | new ..[] { .. } : Object[] [[]] : String | StrBuilderTest.java:37:45:37:48 | sb16 [post update] : StrBuilder | provenance | MaD:43 |
 | StrBuilderTest.java:37:74:37:80 | taint(...) : String | StrBuilderTest.java:37:45:37:89 | new ..[] { .. } : Object[] [[]] : String | provenance |  |
 | StrBuilderTest.java:37:97:37:100 | sb16 : StrBuilder | StrBuilderTest.java:37:97:37:111 | toString(...) | provenance | MaD:5 |
-| StrBuilderTest.java:37:97:37:100 | sb16 : StrBuilder | StrBuilderTest.java:37:97:37:111 | toString(...) | provenance | MaD:311 |
+| StrBuilderTest.java:37:97:37:100 | sb16 : StrBuilder | StrBuilderTest.java:37:97:37:111 | toString(...) | provenance | MaD:119 |
 | StrBuilderTest.java:40:13:40:23 | taintedList [post update] : ArrayList [<element>] : String | StrBuilderTest.java:41:64:41:74 | taintedList : ArrayList [<element>] : String | provenance |  |
 | StrBuilderTest.java:40:13:40:23 | taintedList [post update] : ArrayList [<element>] : String | StrBuilderTest.java:42:64:42:74 | taintedList : ArrayList [<element>] : String | provenance |  |
 | StrBuilderTest.java:40:29:40:35 | taint(...) : String | StrBuilderTest.java:40:13:40:23 | taintedList [post update] : ArrayList [<element>] : String | provenance | MaD:11 |
 | StrBuilderTest.java:41:49:41:52 | sb17 [post update] : StrBuilder | StrBuilderTest.java:41:83:41:86 | sb17 : StrBuilder | provenance |  |
-| StrBuilderTest.java:41:64:41:74 | taintedList : ArrayList [<element>] : String | StrBuilderTest.java:41:49:41:52 | sb17 [post update] : StrBuilder | provenance | MaD:245 |
+| StrBuilderTest.java:41:64:41:74 | taintedList : ArrayList [<element>] : String | StrBuilderTest.java:41:49:41:52 | sb17 [post update] : StrBuilder | provenance | MaD:52 |
 | StrBuilderTest.java:41:83:41:86 | sb17 : StrBuilder | StrBuilderTest.java:41:83:41:97 | toString(...) | provenance | MaD:5 |
-| StrBuilderTest.java:41:83:41:86 | sb17 : StrBuilder | StrBuilderTest.java:41:83:41:97 | toString(...) | provenance | MaD:311 |
+| StrBuilderTest.java:41:83:41:86 | sb17 : StrBuilder | StrBuilderTest.java:41:83:41:97 | toString(...) | provenance | MaD:119 |
 | StrBuilderTest.java:42:49:42:52 | sb18 [post update] : StrBuilder | StrBuilderTest.java:42:94:42:97 | sb18 : StrBuilder | provenance |  |
 | StrBuilderTest.java:42:64:42:74 | taintedList : ArrayList [<element>] : String | StrBuilderTest.java:42:64:42:85 | iterator(...) : Iterator [<element>] : String | provenance | MaD:6 |
-| StrBuilderTest.java:42:64:42:85 | iterator(...) : Iterator [<element>] : String | StrBuilderTest.java:42:49:42:52 | sb18 [post update] : StrBuilder | provenance | MaD:246 |
+| StrBuilderTest.java:42:64:42:85 | iterator(...) : Iterator [<element>] : String | StrBuilderTest.java:42:49:42:52 | sb18 [post update] : StrBuilder | provenance | MaD:53 |
 | StrBuilderTest.java:42:94:42:97 | sb18 : StrBuilder | StrBuilderTest.java:42:94:42:108 | toString(...) | provenance | MaD:5 |
-| StrBuilderTest.java:42:94:42:97 | sb18 : StrBuilder | StrBuilderTest.java:42:94:42:108 | toString(...) | provenance | MaD:311 |
+| StrBuilderTest.java:42:94:42:97 | sb18 : StrBuilder | StrBuilderTest.java:42:94:42:108 | toString(...) | provenance | MaD:119 |
 | StrBuilderTest.java:44:45:44:48 | sb19 [post update] : StrBuilder | StrBuilderTest.java:44:84:44:87 | sb19 : StrBuilder | provenance |  |
-| StrBuilderTest.java:44:45:44:76 | new ..[] { .. } : Object[] [[]] : String | StrBuilderTest.java:44:45:44:48 | sb19 [post update] : StrBuilder | provenance | MaD:247 |
+| StrBuilderTest.java:44:45:44:76 | new ..[] { .. } : Object[] [[]] : String | StrBuilderTest.java:44:45:44:48 | sb19 [post update] : StrBuilder | provenance | MaD:54 |
 | StrBuilderTest.java:44:69:44:75 | taint(...) : String | StrBuilderTest.java:44:45:44:76 | new ..[] { .. } : Object[] [[]] : String | provenance |  |
 | StrBuilderTest.java:44:84:44:87 | sb19 : StrBuilder | StrBuilderTest.java:44:84:44:98 | toString(...) | provenance | MaD:5 |
-| StrBuilderTest.java:44:84:44:87 | sb19 : StrBuilder | StrBuilderTest.java:44:84:44:98 | toString(...) | provenance | MaD:311 |
+| StrBuilderTest.java:44:84:44:87 | sb19 : StrBuilder | StrBuilderTest.java:44:84:44:98 | toString(...) | provenance | MaD:119 |
 | StrBuilderTest.java:45:45:45:48 | sb20 [post update] : StrBuilder | StrBuilderTest.java:45:84:45:87 | sb20 : StrBuilder | provenance |  |
-| StrBuilderTest.java:45:45:45:76 | new ..[] { .. } : Object[] [[]] : String | StrBuilderTest.java:45:45:45:48 | sb20 [post update] : StrBuilder | provenance | MaD:247 |
+| StrBuilderTest.java:45:45:45:76 | new ..[] { .. } : Object[] [[]] : String | StrBuilderTest.java:45:45:45:48 | sb20 [post update] : StrBuilder | provenance | MaD:54 |
 | StrBuilderTest.java:45:60:45:66 | taint(...) : String | StrBuilderTest.java:45:45:45:76 | new ..[] { .. } : Object[] [[]] : String | provenance |  |
 | StrBuilderTest.java:45:84:45:87 | sb20 : StrBuilder | StrBuilderTest.java:45:84:45:98 | toString(...) | provenance | MaD:5 |
-| StrBuilderTest.java:45:84:45:87 | sb20 : StrBuilder | StrBuilderTest.java:45:84:45:98 | toString(...) | provenance | MaD:311 |
+| StrBuilderTest.java:45:84:45:87 | sb20 : StrBuilder | StrBuilderTest.java:45:84:45:98 | toString(...) | provenance | MaD:119 |
 | StrBuilderTest.java:46:45:46:48 | sb21 [post update] : StrBuilder | StrBuilderTest.java:46:97:46:100 | sb21 : StrBuilder | provenance |  |
-| StrBuilderTest.java:46:74:46:80 | taint(...) : String | StrBuilderTest.java:46:45:46:48 | sb21 [post update] : StrBuilder | provenance | MaD:249 |
+| StrBuilderTest.java:46:74:46:80 | taint(...) : String | StrBuilderTest.java:46:45:46:48 | sb21 [post update] : StrBuilder | provenance | MaD:56 |
 | StrBuilderTest.java:46:97:46:100 | sb21 : StrBuilder | StrBuilderTest.java:46:97:46:111 | toString(...) | provenance | MaD:5 |
-| StrBuilderTest.java:46:97:46:100 | sb21 : StrBuilder | StrBuilderTest.java:46:97:46:111 | toString(...) | provenance | MaD:311 |
+| StrBuilderTest.java:46:97:46:100 | sb21 : StrBuilder | StrBuilderTest.java:46:97:46:111 | toString(...) | provenance | MaD:119 |
 | StrBuilderTest.java:47:45:47:48 | sb22 [post update] : StrBuilder | StrBuilderTest.java:47:98:47:101 | sb22 : StrBuilder | provenance |  |
-| StrBuilderTest.java:47:75:47:81 | taint(...) : String | StrBuilderTest.java:47:45:47:48 | sb22 [post update] : StrBuilder | provenance | MaD:251 |
+| StrBuilderTest.java:47:75:47:81 | taint(...) : String | StrBuilderTest.java:47:45:47:48 | sb22 [post update] : StrBuilder | provenance | MaD:58 |
 | StrBuilderTest.java:47:98:47:101 | sb22 : StrBuilder | StrBuilderTest.java:47:98:47:112 | toString(...) | provenance | MaD:5 |
-| StrBuilderTest.java:47:98:47:101 | sb22 : StrBuilder | StrBuilderTest.java:47:98:47:112 | toString(...) | provenance | MaD:311 |
+| StrBuilderTest.java:47:98:47:101 | sb22 : StrBuilder | StrBuilderTest.java:47:98:47:112 | toString(...) | provenance | MaD:119 |
 | StrBuilderTest.java:48:45:48:48 | sb23 [post update] : StrBuilder | StrBuilderTest.java:48:88:48:91 | sb23 : StrBuilder | provenance |  |
 | StrBuilderTest.java:48:59:48:65 | taint(...) : String | StrBuilderTest.java:48:59:48:79 | toCharArray(...) : char[] | provenance | MaD:7 |
-| StrBuilderTest.java:48:59:48:79 | toCharArray(...) : char[] | StrBuilderTest.java:48:45:48:48 | sb23 [post update] : StrBuilder | provenance | MaD:266 |
+| StrBuilderTest.java:48:59:48:79 | toCharArray(...) : char[] | StrBuilderTest.java:48:45:48:48 | sb23 [post update] : StrBuilder | provenance | MaD:73 |
 | StrBuilderTest.java:48:88:48:91 | sb23 : StrBuilder | StrBuilderTest.java:48:88:48:102 | toString(...) | provenance | MaD:5 |
-| StrBuilderTest.java:48:88:48:91 | sb23 : StrBuilder | StrBuilderTest.java:48:88:48:102 | toString(...) | provenance | MaD:311 |
+| StrBuilderTest.java:48:88:48:91 | sb23 : StrBuilder | StrBuilderTest.java:48:88:48:102 | toString(...) | provenance | MaD:119 |
 | StrBuilderTest.java:49:45:49:48 | sb24 [post update] : StrBuilder | StrBuilderTest.java:49:94:49:97 | sb24 : StrBuilder | provenance |  |
 | StrBuilderTest.java:49:59:49:65 | taint(...) : String | StrBuilderTest.java:49:59:49:79 | toCharArray(...) : char[] | provenance | MaD:7 |
-| StrBuilderTest.java:49:59:49:79 | toCharArray(...) : char[] | StrBuilderTest.java:49:45:49:48 | sb24 [post update] : StrBuilder | provenance | MaD:267 |
+| StrBuilderTest.java:49:59:49:79 | toCharArray(...) : char[] | StrBuilderTest.java:49:45:49:48 | sb24 [post update] : StrBuilder | provenance | MaD:74 |
 | StrBuilderTest.java:49:94:49:97 | sb24 : StrBuilder | StrBuilderTest.java:49:94:49:108 | toString(...) | provenance | MaD:5 |
-| StrBuilderTest.java:49:94:49:97 | sb24 : StrBuilder | StrBuilderTest.java:49:94:49:108 | toString(...) | provenance | MaD:311 |
+| StrBuilderTest.java:49:94:49:97 | sb24 : StrBuilder | StrBuilderTest.java:49:94:49:108 | toString(...) | provenance | MaD:119 |
 | StrBuilderTest.java:50:45:50:48 | sb25 [post update] : StrBuilder | StrBuilderTest.java:50:82:50:85 | sb25 : StrBuilder | provenance |  |
-| StrBuilderTest.java:50:59:50:73 | (...)... : String | StrBuilderTest.java:50:45:50:48 | sb25 [post update] : StrBuilder | provenance | MaD:268 |
+| StrBuilderTest.java:50:59:50:73 | (...)... : String | StrBuilderTest.java:50:45:50:48 | sb25 [post update] : StrBuilder | provenance | MaD:75 |
 | StrBuilderTest.java:50:67:50:73 | taint(...) : String | StrBuilderTest.java:50:59:50:73 | (...)... : String | provenance |  |
 | StrBuilderTest.java:50:82:50:85 | sb25 : StrBuilder | StrBuilderTest.java:50:82:50:96 | toString(...) | provenance | MaD:5 |
-| StrBuilderTest.java:50:82:50:85 | sb25 : StrBuilder | StrBuilderTest.java:50:82:50:96 | toString(...) | provenance | MaD:311 |
+| StrBuilderTest.java:50:82:50:85 | sb25 : StrBuilder | StrBuilderTest.java:50:82:50:96 | toString(...) | provenance | MaD:119 |
 | StrBuilderTest.java:52:50:52:54 | auxsb [post update] : StrBuilder | StrBuilderTest.java:53:63:53:67 | auxsb : StrBuilder | provenance |  |
-| StrBuilderTest.java:52:65:52:71 | taint(...) : String | StrBuilderTest.java:52:50:52:54 | auxsb [post update] : StrBuilder | provenance | MaD:269 |
+| StrBuilderTest.java:52:65:52:71 | taint(...) : String | StrBuilderTest.java:52:50:52:54 | auxsb [post update] : StrBuilder | provenance | MaD:76 |
 | StrBuilderTest.java:53:49:53:52 | sb26 [post update] : StrBuilder | StrBuilderTest.java:53:76:53:79 | sb26 : StrBuilder | provenance |  |
-| StrBuilderTest.java:53:63:53:67 | auxsb : StrBuilder | StrBuilderTest.java:53:49:53:52 | sb26 [post update] : StrBuilder | provenance | MaD:277 |
+| StrBuilderTest.java:53:63:53:67 | auxsb : StrBuilder | StrBuilderTest.java:53:49:53:52 | sb26 [post update] : StrBuilder | provenance | MaD:84 |
 | StrBuilderTest.java:53:76:53:79 | sb26 : StrBuilder | StrBuilderTest.java:53:76:53:90 | toString(...) | provenance | MaD:5 |
-| StrBuilderTest.java:53:76:53:79 | sb26 : StrBuilder | StrBuilderTest.java:53:76:53:90 | toString(...) | provenance | MaD:311 |
+| StrBuilderTest.java:53:76:53:79 | sb26 : StrBuilder | StrBuilderTest.java:53:76:53:90 | toString(...) | provenance | MaD:119 |
 | StrBuilderTest.java:55:45:55:48 | sb27 [post update] : StrBuilder | StrBuilderTest.java:55:92:55:95 | sb27 : StrBuilder | provenance |  |
-| StrBuilderTest.java:55:59:55:83 | new StringBuffer(...) : StringBuffer | StrBuilderTest.java:55:45:55:48 | sb27 [post update] : StrBuilder | provenance | MaD:273 |
+| StrBuilderTest.java:55:59:55:83 | new StringBuffer(...) : StringBuffer | StrBuilderTest.java:55:45:55:48 | sb27 [post update] : StrBuilder | provenance | MaD:80 |
 | StrBuilderTest.java:55:76:55:82 | taint(...) : String | StrBuilderTest.java:55:59:55:83 | new StringBuffer(...) : StringBuffer | provenance | MaD:8 |
 | StrBuilderTest.java:55:92:55:95 | sb27 : StrBuilder | StrBuilderTest.java:55:92:55:106 | toString(...) | provenance | MaD:5 |
-| StrBuilderTest.java:55:92:55:95 | sb27 : StrBuilder | StrBuilderTest.java:55:92:55:106 | toString(...) | provenance | MaD:311 |
+| StrBuilderTest.java:55:92:55:95 | sb27 : StrBuilder | StrBuilderTest.java:55:92:55:106 | toString(...) | provenance | MaD:119 |
 | StrBuilderTest.java:56:45:56:48 | sb28 [post update] : StrBuilder | StrBuilderTest.java:56:98:56:101 | sb28 : StrBuilder | provenance |  |
-| StrBuilderTest.java:56:59:56:83 | new StringBuffer(...) : StringBuffer | StrBuilderTest.java:56:45:56:48 | sb28 [post update] : StrBuilder | provenance | MaD:274 |
+| StrBuilderTest.java:56:59:56:83 | new StringBuffer(...) : StringBuffer | StrBuilderTest.java:56:45:56:48 | sb28 [post update] : StrBuilder | provenance | MaD:81 |
 | StrBuilderTest.java:56:76:56:82 | taint(...) : String | StrBuilderTest.java:56:59:56:83 | new StringBuffer(...) : StringBuffer | provenance | MaD:8 |
 | StrBuilderTest.java:56:98:56:101 | sb28 : StrBuilder | StrBuilderTest.java:56:98:56:112 | toString(...) | provenance | MaD:5 |
-| StrBuilderTest.java:56:98:56:101 | sb28 : StrBuilder | StrBuilderTest.java:56:98:56:112 | toString(...) | provenance | MaD:311 |
+| StrBuilderTest.java:56:98:56:101 | sb28 : StrBuilder | StrBuilderTest.java:56:98:56:112 | toString(...) | provenance | MaD:119 |
 | StrBuilderTest.java:57:45:57:48 | sb29 [post update] : StrBuilder | StrBuilderTest.java:57:93:57:96 | sb29 : StrBuilder | provenance |  |
-| StrBuilderTest.java:57:59:57:84 | new StringBuilder(...) : StringBuilder | StrBuilderTest.java:57:45:57:48 | sb29 [post update] : StrBuilder | provenance | MaD:275 |
+| StrBuilderTest.java:57:59:57:84 | new StringBuilder(...) : StringBuilder | StrBuilderTest.java:57:45:57:48 | sb29 [post update] : StrBuilder | provenance | MaD:82 |
 | StrBuilderTest.java:57:77:57:83 | taint(...) : String | StrBuilderTest.java:57:59:57:84 | new StringBuilder(...) : StringBuilder | provenance | MaD:9 |
 | StrBuilderTest.java:57:93:57:96 | sb29 : StrBuilder | StrBuilderTest.java:57:93:57:107 | toString(...) | provenance | MaD:5 |
-| StrBuilderTest.java:57:93:57:96 | sb29 : StrBuilder | StrBuilderTest.java:57:93:57:107 | toString(...) | provenance | MaD:311 |
+| StrBuilderTest.java:57:93:57:96 | sb29 : StrBuilder | StrBuilderTest.java:57:93:57:107 | toString(...) | provenance | MaD:119 |
 | StrBuilderTest.java:58:45:58:48 | sb30 [post update] : StrBuilder | StrBuilderTest.java:58:99:58:102 | sb30 : StrBuilder | provenance |  |
-| StrBuilderTest.java:58:59:58:84 | new StringBuilder(...) : StringBuilder | StrBuilderTest.java:58:45:58:48 | sb30 [post update] : StrBuilder | provenance | MaD:276 |
+| StrBuilderTest.java:58:59:58:84 | new StringBuilder(...) : StringBuilder | StrBuilderTest.java:58:45:58:48 | sb30 [post update] : StrBuilder | provenance | MaD:83 |
 | StrBuilderTest.java:58:77:58:83 | taint(...) : String | StrBuilderTest.java:58:59:58:84 | new StringBuilder(...) : StringBuilder | provenance | MaD:9 |
 | StrBuilderTest.java:58:99:58:102 | sb30 : StrBuilder | StrBuilderTest.java:58:99:58:113 | toString(...) | provenance | MaD:5 |
-| StrBuilderTest.java:58:99:58:102 | sb30 : StrBuilder | StrBuilderTest.java:58:99:58:113 | toString(...) | provenance | MaD:311 |
+| StrBuilderTest.java:58:99:58:102 | sb30 : StrBuilder | StrBuilderTest.java:58:99:58:113 | toString(...) | provenance | MaD:119 |
 | StrBuilderTest.java:59:45:59:48 | sb31 [post update] : StrBuilder | StrBuilderTest.java:59:74:59:77 | sb31 : StrBuilder | provenance |  |
-| StrBuilderTest.java:59:59:59:65 | taint(...) : String | StrBuilderTest.java:59:45:59:48 | sb31 [post update] : StrBuilder | provenance | MaD:269 |
+| StrBuilderTest.java:59:59:59:65 | taint(...) : String | StrBuilderTest.java:59:45:59:48 | sb31 [post update] : StrBuilder | provenance | MaD:76 |
 | StrBuilderTest.java:59:74:59:77 | sb31 : StrBuilder | StrBuilderTest.java:59:74:59:88 | toString(...) | provenance | MaD:5 |
-| StrBuilderTest.java:59:74:59:77 | sb31 : StrBuilder | StrBuilderTest.java:59:74:59:88 | toString(...) | provenance | MaD:311 |
+| StrBuilderTest.java:59:74:59:77 | sb31 : StrBuilder | StrBuilderTest.java:59:74:59:88 | toString(...) | provenance | MaD:119 |
 | StrBuilderTest.java:60:45:60:48 | sb32 [post update] : StrBuilder | StrBuilderTest.java:60:80:60:83 | sb32 : StrBuilder | provenance |  |
-| StrBuilderTest.java:60:59:60:65 | taint(...) : String | StrBuilderTest.java:60:45:60:48 | sb32 [post update] : StrBuilder | provenance | MaD:270 |
+| StrBuilderTest.java:60:59:60:65 | taint(...) : String | StrBuilderTest.java:60:45:60:48 | sb32 [post update] : StrBuilder | provenance | MaD:77 |
 | StrBuilderTest.java:60:80:60:83 | sb32 : StrBuilder | StrBuilderTest.java:60:80:60:94 | toString(...) | provenance | MaD:5 |
-| StrBuilderTest.java:60:80:60:83 | sb32 : StrBuilder | StrBuilderTest.java:60:80:60:94 | toString(...) | provenance | MaD:311 |
+| StrBuilderTest.java:60:80:60:83 | sb32 : StrBuilder | StrBuilderTest.java:60:80:60:94 | toString(...) | provenance | MaD:119 |
 | StrBuilderTest.java:61:45:61:48 | sb33 [post update] : StrBuilder | StrBuilderTest.java:61:92:61:95 | sb33 : StrBuilder | provenance |  |
-| StrBuilderTest.java:61:59:61:65 | taint(...) : String | StrBuilderTest.java:61:45:61:48 | sb33 [post update] : StrBuilder | provenance | MaD:271 |
+| StrBuilderTest.java:61:59:61:65 | taint(...) : String | StrBuilderTest.java:61:45:61:48 | sb33 [post update] : StrBuilder | provenance | MaD:78 |
 | StrBuilderTest.java:61:92:61:95 | sb33 : StrBuilder | StrBuilderTest.java:61:92:61:106 | toString(...) | provenance | MaD:5 |
-| StrBuilderTest.java:61:92:61:95 | sb33 : StrBuilder | StrBuilderTest.java:61:92:61:106 | toString(...) | provenance | MaD:311 |
+| StrBuilderTest.java:61:92:61:95 | sb33 : StrBuilder | StrBuilderTest.java:61:92:61:106 | toString(...) | provenance | MaD:119 |
 | StrBuilderTest.java:62:45:62:48 | sb34 [post update] : StrBuilder | StrBuilderTest.java:62:99:62:102 | sb34 : StrBuilder | provenance |  |
-| StrBuilderTest.java:62:45:62:91 | new ..[] { .. } : Object[] [[]] : String | StrBuilderTest.java:62:45:62:48 | sb34 [post update] : StrBuilder | provenance | MaD:272 |
+| StrBuilderTest.java:62:45:62:91 | new ..[] { .. } : Object[] [[]] : String | StrBuilderTest.java:62:45:62:48 | sb34 [post update] : StrBuilder | provenance | MaD:79 |
 | StrBuilderTest.java:62:76:62:82 | taint(...) : String | StrBuilderTest.java:62:45:62:91 | new ..[] { .. } : Object[] [[]] : String | provenance |  |
 | StrBuilderTest.java:62:99:62:102 | sb34 : StrBuilder | StrBuilderTest.java:62:99:62:113 | toString(...) | provenance | MaD:5 |
-| StrBuilderTest.java:62:99:62:102 | sb34 : StrBuilder | StrBuilderTest.java:62:99:62:113 | toString(...) | provenance | MaD:311 |
+| StrBuilderTest.java:62:99:62:102 | sb34 : StrBuilder | StrBuilderTest.java:62:99:62:113 | toString(...) | provenance | MaD:119 |
 | StrBuilderTest.java:63:45:63:48 | sb35 [post update] : StrBuilder | StrBuilderTest.java:63:81:63:84 | sb35 : StrBuilder | provenance |  |
-| StrBuilderTest.java:63:66:63:72 | taint(...) : String | StrBuilderTest.java:63:45:63:48 | sb35 [post update] : StrBuilder | provenance | MaD:256 |
+| StrBuilderTest.java:63:66:63:72 | taint(...) : String | StrBuilderTest.java:63:45:63:48 | sb35 [post update] : StrBuilder | provenance | MaD:63 |
 | StrBuilderTest.java:63:81:63:84 | sb35 : StrBuilder | StrBuilderTest.java:63:81:63:95 | toString(...) | provenance | MaD:5 |
-| StrBuilderTest.java:63:81:63:84 | sb35 : StrBuilder | StrBuilderTest.java:63:81:63:95 | toString(...) | provenance | MaD:311 |
+| StrBuilderTest.java:63:81:63:84 | sb35 : StrBuilder | StrBuilderTest.java:63:81:63:95 | toString(...) | provenance | MaD:119 |
 | StrBuilderTest.java:64:45:64:48 | sb36 [post update] : StrBuilder | StrBuilderTest.java:64:84:64:87 | sb36 : StrBuilder | provenance |  |
-| StrBuilderTest.java:64:66:64:72 | taint(...) : String | StrBuilderTest.java:64:45:64:48 | sb36 [post update] : StrBuilder | provenance | MaD:257 |
+| StrBuilderTest.java:64:66:64:72 | taint(...) : String | StrBuilderTest.java:64:45:64:48 | sb36 [post update] : StrBuilder | provenance | MaD:64 |
 | StrBuilderTest.java:64:84:64:87 | sb36 : StrBuilder | StrBuilderTest.java:64:84:64:98 | toString(...) | provenance | MaD:5 |
-| StrBuilderTest.java:64:84:64:87 | sb36 : StrBuilder | StrBuilderTest.java:64:84:64:98 | toString(...) | provenance | MaD:311 |
+| StrBuilderTest.java:64:84:64:87 | sb36 : StrBuilder | StrBuilderTest.java:64:84:64:98 | toString(...) | provenance | MaD:119 |
 | StrBuilderTest.java:65:45:65:48 | sb37 [post update] : StrBuilder | StrBuilderTest.java:65:92:65:95 | sb37 : StrBuilder | provenance |  |
-| StrBuilderTest.java:65:66:65:72 | taint(...) : String | StrBuilderTest.java:65:45:65:48 | sb37 [post update] : StrBuilder | provenance | MaD:258 |
+| StrBuilderTest.java:65:66:65:72 | taint(...) : String | StrBuilderTest.java:65:45:65:48 | sb37 [post update] : StrBuilder | provenance | MaD:65 |
 | StrBuilderTest.java:65:92:65:95 | sb37 : StrBuilder | StrBuilderTest.java:65:92:65:106 | toString(...) | provenance | MaD:5 |
-| StrBuilderTest.java:65:92:65:95 | sb37 : StrBuilder | StrBuilderTest.java:65:92:65:106 | toString(...) | provenance | MaD:311 |
+| StrBuilderTest.java:65:92:65:95 | sb37 : StrBuilder | StrBuilderTest.java:65:92:65:106 | toString(...) | provenance | MaD:119 |
 | StrBuilderTest.java:66:45:66:48 | sb38 [post update] : StrBuilder | StrBuilderTest.java:66:85:66:88 | sb38 : StrBuilder | provenance |  |
-| StrBuilderTest.java:66:70:66:76 | taint(...) : String | StrBuilderTest.java:66:45:66:48 | sb38 [post update] : StrBuilder | provenance | MaD:258 |
+| StrBuilderTest.java:66:70:66:76 | taint(...) : String | StrBuilderTest.java:66:45:66:48 | sb38 [post update] : StrBuilder | provenance | MaD:65 |
 | StrBuilderTest.java:66:85:66:88 | sb38 : StrBuilder | StrBuilderTest.java:66:85:66:99 | toString(...) | provenance | MaD:5 |
-| StrBuilderTest.java:66:85:66:88 | sb38 : StrBuilder | StrBuilderTest.java:66:85:66:99 | toString(...) | provenance | MaD:311 |
+| StrBuilderTest.java:66:85:66:88 | sb38 : StrBuilder | StrBuilderTest.java:66:85:66:99 | toString(...) | provenance | MaD:119 |
 | StrBuilderTest.java:68:50:68:54 | auxsb [post update] : StrBuilder | StrBuilderTest.java:69:49:69:53 | auxsb : StrBuilder | provenance |  |
-| StrBuilderTest.java:68:65:68:71 | taint(...) : String | StrBuilderTest.java:68:50:68:54 | auxsb [post update] : StrBuilder | provenance | MaD:269 |
-| StrBuilderTest.java:69:49:69:53 | auxsb : StrBuilder | StrBuilderTest.java:69:64:69:67 | sb39 [post update] : StrBuilder | provenance | MaD:259 |
+| StrBuilderTest.java:68:65:68:71 | taint(...) : String | StrBuilderTest.java:68:50:68:54 | auxsb [post update] : StrBuilder | provenance | MaD:76 |
+| StrBuilderTest.java:69:49:69:53 | auxsb : StrBuilder | StrBuilderTest.java:69:64:69:67 | sb39 [post update] : StrBuilder | provenance | MaD:67 |
 | StrBuilderTest.java:69:64:69:67 | sb39 [post update] : StrBuilder | StrBuilderTest.java:69:76:69:79 | sb39 : StrBuilder | provenance |  |
 | StrBuilderTest.java:69:76:69:79 | sb39 : StrBuilder | StrBuilderTest.java:69:76:69:90 | toString(...) | provenance | MaD:5 |
-| StrBuilderTest.java:69:76:69:79 | sb39 : StrBuilder | StrBuilderTest.java:69:76:69:90 | toString(...) | provenance | MaD:311 |
+| StrBuilderTest.java:69:76:69:79 | sb39 : StrBuilder | StrBuilderTest.java:69:76:69:90 | toString(...) | provenance | MaD:119 |
 | StrBuilderTest.java:73:13:73:23 | taintedList [post update] : ArrayList [<element>] : String | StrBuilderTest.java:74:75:74:85 | taintedList : ArrayList [<element>] : String | provenance |  |
 | StrBuilderTest.java:73:13:73:23 | taintedList [post update] : ArrayList [<element>] : String | StrBuilderTest.java:75:75:75:85 | taintedList : ArrayList [<element>] : String | provenance |  |
 | StrBuilderTest.java:73:29:73:35 | taint(...) : String | StrBuilderTest.java:73:13:73:23 | taintedList [post update] : ArrayList [<element>] : String | provenance | MaD:11 |
 | StrBuilderTest.java:74:49:74:52 | sb40 [post update] : StrBuilder | StrBuilderTest.java:74:100:74:103 | sb40 : StrBuilder | provenance |  |
-| StrBuilderTest.java:74:75:74:85 | taintedList : ArrayList [<element>] : String | StrBuilderTest.java:74:49:74:52 | sb40 [post update] : StrBuilder | provenance | MaD:262 |
+| StrBuilderTest.java:74:75:74:85 | taintedList : ArrayList [<element>] : String | StrBuilderTest.java:74:49:74:52 | sb40 [post update] : StrBuilder | provenance | MaD:68 |
 | StrBuilderTest.java:74:100:74:103 | sb40 : StrBuilder | StrBuilderTest.java:74:100:74:114 | toString(...) | provenance | MaD:5 |
-| StrBuilderTest.java:74:100:74:103 | sb40 : StrBuilder | StrBuilderTest.java:74:100:74:114 | toString(...) | provenance | MaD:311 |
+| StrBuilderTest.java:74:100:74:103 | sb40 : StrBuilder | StrBuilderTest.java:74:100:74:114 | toString(...) | provenance | MaD:119 |
 | StrBuilderTest.java:75:49:75:52 | sb41 [post update] : StrBuilder | StrBuilderTest.java:75:111:75:114 | sb41 : StrBuilder | provenance |  |
 | StrBuilderTest.java:75:75:75:85 | taintedList : ArrayList [<element>] : String | StrBuilderTest.java:75:75:75:96 | iterator(...) : Iterator [<element>] : String | provenance | MaD:6 |
-| StrBuilderTest.java:75:75:75:96 | iterator(...) : Iterator [<element>] : String | StrBuilderTest.java:75:49:75:52 | sb41 [post update] : StrBuilder | provenance | MaD:263 |
+| StrBuilderTest.java:75:75:75:96 | iterator(...) : Iterator [<element>] : String | StrBuilderTest.java:75:49:75:52 | sb41 [post update] : StrBuilder | provenance | MaD:69 |
 | StrBuilderTest.java:75:111:75:114 | sb41 : StrBuilder | StrBuilderTest.java:75:111:75:125 | toString(...) | provenance | MaD:5 |
-| StrBuilderTest.java:75:111:75:114 | sb41 : StrBuilder | StrBuilderTest.java:75:111:75:125 | toString(...) | provenance | MaD:311 |
+| StrBuilderTest.java:75:111:75:114 | sb41 : StrBuilder | StrBuilderTest.java:75:111:75:125 | toString(...) | provenance | MaD:119 |
 | StrBuilderTest.java:77:49:77:52 | sb42 [post update] : StrBuilder | StrBuilderTest.java:77:105:77:108 | sb42 : StrBuilder | provenance |  |
-| StrBuilderTest.java:77:90:77:96 | taint(...) : String | StrBuilderTest.java:77:49:77:52 | sb42 [post update] : StrBuilder | provenance | MaD:261 |
+| StrBuilderTest.java:77:90:77:96 | taint(...) : String | StrBuilderTest.java:77:49:77:52 | sb42 [post update] : StrBuilder | provenance | MaD:71 |
 | StrBuilderTest.java:77:105:77:108 | sb42 : StrBuilder | StrBuilderTest.java:77:105:77:119 | toString(...) | provenance | MaD:5 |
-| StrBuilderTest.java:77:105:77:108 | sb42 : StrBuilder | StrBuilderTest.java:77:105:77:119 | toString(...) | provenance | MaD:311 |
+| StrBuilderTest.java:77:105:77:108 | sb42 : StrBuilder | StrBuilderTest.java:77:105:77:119 | toString(...) | provenance | MaD:119 |
 | StrBuilderTest.java:78:49:78:52 | sb43 [post update] : StrBuilder | StrBuilderTest.java:78:116:78:119 | sb43 : StrBuilder | provenance |  |
-| StrBuilderTest.java:78:101:78:107 | taint(...) : String | StrBuilderTest.java:78:49:78:52 | sb43 [post update] : StrBuilder | provenance | MaD:261 |
+| StrBuilderTest.java:78:101:78:107 | taint(...) : String | StrBuilderTest.java:78:49:78:52 | sb43 [post update] : StrBuilder | provenance | MaD:71 |
 | StrBuilderTest.java:78:116:78:119 | sb43 : StrBuilder | StrBuilderTest.java:78:116:78:130 | toString(...) | provenance | MaD:5 |
-| StrBuilderTest.java:78:116:78:119 | sb43 : StrBuilder | StrBuilderTest.java:78:116:78:130 | toString(...) | provenance | MaD:311 |
+| StrBuilderTest.java:78:116:78:119 | sb43 : StrBuilder | StrBuilderTest.java:78:116:78:130 | toString(...) | provenance | MaD:119 |
 | StrBuilderTest.java:79:37:79:60 | {...} : String[] [[]] : String | StrBuilderTest.java:81:75:81:86 | taintedArray : String[] [[]] : String | provenance |  |
 | StrBuilderTest.java:79:52:79:58 | taint(...) : String | StrBuilderTest.java:79:37:79:60 | {...} : String[] [[]] : String | provenance |  |
 | StrBuilderTest.java:81:49:81:52 | sb44 [post update] : StrBuilder | StrBuilderTest.java:81:101:81:104 | sb44 : StrBuilder | provenance |  |
-| StrBuilderTest.java:81:75:81:86 | taintedArray : String[] [[]] : String | StrBuilderTest.java:81:49:81:52 | sb44 [post update] : StrBuilder | provenance | MaD:264 |
+| StrBuilderTest.java:81:75:81:86 | taintedArray : String[] [[]] : String | StrBuilderTest.java:81:49:81:52 | sb44 [post update] : StrBuilder | provenance | MaD:70 |
 | StrBuilderTest.java:81:101:81:104 | sb44 : StrBuilder | StrBuilderTest.java:81:101:81:115 | toString(...) | provenance | MaD:5 |
-| StrBuilderTest.java:81:101:81:104 | sb44 : StrBuilder | StrBuilderTest.java:81:101:81:115 | toString(...) | provenance | MaD:311 |
+| StrBuilderTest.java:81:101:81:104 | sb44 : StrBuilder | StrBuilderTest.java:81:101:81:115 | toString(...) | provenance | MaD:119 |
 | StrBuilderTest.java:82:49:82:52 | sb45 [post update] : StrBuilder | StrBuilderTest.java:82:106:82:109 | sb45 : StrBuilder | provenance |  |
-| StrBuilderTest.java:82:91:82:97 | taint(...) : String | StrBuilderTest.java:82:49:82:52 | sb45 [post update] : StrBuilder | provenance | MaD:261 |
+| StrBuilderTest.java:82:91:82:97 | taint(...) : String | StrBuilderTest.java:82:49:82:52 | sb45 [post update] : StrBuilder | provenance | MaD:71 |
 | StrBuilderTest.java:82:106:82:109 | sb45 : StrBuilder | StrBuilderTest.java:82:106:82:120 | toString(...) | provenance | MaD:5 |
-| StrBuilderTest.java:82:106:82:109 | sb45 : StrBuilder | StrBuilderTest.java:82:106:82:120 | toString(...) | provenance | MaD:311 |
+| StrBuilderTest.java:82:106:82:109 | sb45 : StrBuilder | StrBuilderTest.java:82:106:82:120 | toString(...) | provenance | MaD:119 |
 | StrBuilderTest.java:85:49:85:52 | sb46 [post update] : StrBuilder | StrBuilderTest.java:87:13:87:16 | sb46 : StrBuilder | provenance |  |
-| StrBuilderTest.java:85:61:85:67 | taint(...) : String | StrBuilderTest.java:85:49:85:52 | sb46 [post update] : StrBuilder | provenance | MaD:233 |
-| StrBuilderTest.java:87:13:87:16 | sb46 : StrBuilder | StrBuilderTest.java:87:13:87:27 | asReader(...) : Reader | provenance | MaD:278 |
+| StrBuilderTest.java:85:61:85:67 | taint(...) : String | StrBuilderTest.java:85:49:85:52 | sb46 [post update] : StrBuilder | provenance | MaD:40 |
+| StrBuilderTest.java:87:13:87:16 | sb46 : StrBuilder | StrBuilderTest.java:87:13:87:27 | asReader(...) : Reader | provenance | MaD:86 |
 | StrBuilderTest.java:87:13:87:27 | asReader(...) : Reader | StrBuilderTest.java:87:34:87:39 | target [post update] : char[] | provenance | MaD:1 |
 | StrBuilderTest.java:87:34:87:39 | target [post update] : char[] | StrBuilderTest.java:88:18:88:23 | target | provenance |  |
 | StrBuilderTest.java:90:45:90:48 | sb47 [post update] : StrBuilder | StrBuilderTest.java:90:72:90:75 | sb47 : StrBuilder | provenance |  |
-| StrBuilderTest.java:90:57:90:63 | taint(...) : String | StrBuilderTest.java:90:45:90:48 | sb47 [post update] : StrBuilder | provenance | MaD:233 |
-| StrBuilderTest.java:90:72:90:75 | sb47 : StrBuilder | StrBuilderTest.java:90:72:90:89 | asTokenizer(...) : StrTokenizer | provenance | MaD:279 |
+| StrBuilderTest.java:90:57:90:63 | taint(...) : String | StrBuilderTest.java:90:45:90:48 | sb47 [post update] : StrBuilder | provenance | MaD:40 |
+| StrBuilderTest.java:90:72:90:75 | sb47 : StrBuilder | StrBuilderTest.java:90:72:90:89 | asTokenizer(...) : StrTokenizer | provenance | MaD:87 |
 | StrBuilderTest.java:90:72:90:89 | asTokenizer(...) : StrTokenizer | StrBuilderTest.java:90:72:90:96 | next(...) | provenance | MaD:13 |
-| StrBuilderTest.java:90:72:90:89 | asTokenizer(...) : StrTokenizer | StrBuilderTest.java:90:72:90:96 | next(...) | provenance | MaD:351 |
+| StrBuilderTest.java:90:72:90:89 | asTokenizer(...) : StrTokenizer | StrBuilderTest.java:90:72:90:96 | next(...) | provenance | MaD:159 |
 | StrBuilderTest.java:91:45:91:48 | sb48 [post update] : StrBuilder | StrBuilderTest.java:91:72:91:75 | sb48 : StrBuilder | provenance |  |
-| StrBuilderTest.java:91:57:91:63 | taint(...) : String | StrBuilderTest.java:91:45:91:48 | sb48 [post update] : StrBuilder | provenance | MaD:233 |
-| StrBuilderTest.java:91:72:91:75 | sb48 : StrBuilder | StrBuilderTest.java:91:72:91:83 | build(...) | provenance | MaD:280 |
+| StrBuilderTest.java:91:57:91:63 | taint(...) : String | StrBuilderTest.java:91:45:91:48 | sb48 [post update] : StrBuilder | provenance | MaD:40 |
+| StrBuilderTest.java:91:72:91:75 | sb48 : StrBuilder | StrBuilderTest.java:91:72:91:83 | build(...) | provenance | MaD:88 |
 | StrBuilderTest.java:92:45:92:48 | sb49 [post update] : StrBuilder | StrBuilderTest.java:92:72:92:75 | sb49 : StrBuilder | provenance |  |
-| StrBuilderTest.java:92:57:92:63 | taint(...) : String | StrBuilderTest.java:92:45:92:48 | sb49 [post update] : StrBuilder | provenance | MaD:233 |
-| StrBuilderTest.java:92:72:92:75 | sb49 : StrBuilder | StrBuilderTest.java:92:72:92:90 | getChars(...) | provenance | MaD:287 |
+| StrBuilderTest.java:92:57:92:63 | taint(...) : String | StrBuilderTest.java:92:45:92:48 | sb49 [post update] : StrBuilder | provenance | MaD:40 |
+| StrBuilderTest.java:92:72:92:75 | sb49 : StrBuilder | StrBuilderTest.java:92:72:92:90 | getChars(...) | provenance | MaD:95 |
 | StrBuilderTest.java:94:49:94:52 | sb50 [post update] : StrBuilder | StrBuilderTest.java:96:13:96:16 | sb50 : StrBuilder | provenance |  |
-| StrBuilderTest.java:94:61:94:67 | taint(...) : String | StrBuilderTest.java:94:49:94:52 | sb50 [post update] : StrBuilder | provenance | MaD:233 |
-| StrBuilderTest.java:96:13:96:16 | sb50 : StrBuilder | StrBuilderTest.java:96:27:96:32 | target [post update] : char[] | provenance | MaD:286 |
+| StrBuilderTest.java:94:61:94:67 | taint(...) : String | StrBuilderTest.java:94:49:94:52 | sb50 [post update] : StrBuilder | provenance | MaD:40 |
+| StrBuilderTest.java:96:13:96:16 | sb50 : StrBuilder | StrBuilderTest.java:96:27:96:32 | target [post update] : char[] | provenance | MaD:94 |
 | StrBuilderTest.java:96:27:96:32 | target [post update] : char[] | StrBuilderTest.java:97:18:97:23 | target | provenance |  |
 | StrBuilderTest.java:100:49:100:52 | sb51 [post update] : StrBuilder | StrBuilderTest.java:102:13:102:16 | sb51 : StrBuilder | provenance |  |
-| StrBuilderTest.java:100:61:100:67 | taint(...) : String | StrBuilderTest.java:100:49:100:52 | sb51 [post update] : StrBuilder | provenance | MaD:233 |
-| StrBuilderTest.java:102:13:102:16 | sb51 : StrBuilder | StrBuilderTest.java:102:33:102:38 | target [post update] : char[] | provenance | MaD:288 |
+| StrBuilderTest.java:100:61:100:67 | taint(...) : String | StrBuilderTest.java:100:49:100:52 | sb51 [post update] : StrBuilder | provenance | MaD:40 |
+| StrBuilderTest.java:102:13:102:16 | sb51 : StrBuilder | StrBuilderTest.java:102:33:102:38 | target [post update] : char[] | provenance | MaD:96 |
 | StrBuilderTest.java:102:33:102:38 | target [post update] : char[] | StrBuilderTest.java:103:18:103:23 | target | provenance |  |
 | StrBuilderTest.java:105:45:105:48 | sb52 [post update] : StrBuilder | StrBuilderTest.java:105:89:105:92 | sb52 : StrBuilder | provenance |  |
 | StrBuilderTest.java:105:60:105:66 | taint(...) : String | StrBuilderTest.java:105:60:105:80 | toCharArray(...) : char[] | provenance | MaD:7 |
-| StrBuilderTest.java:105:60:105:80 | toCharArray(...) : char[] | StrBuilderTest.java:105:45:105:48 | sb52 [post update] : StrBuilder | provenance | MaD:290 |
+| StrBuilderTest.java:105:60:105:80 | toCharArray(...) : char[] | StrBuilderTest.java:105:45:105:48 | sb52 [post update] : StrBuilder | provenance | MaD:97 |
 | StrBuilderTest.java:105:89:105:92 | sb52 : StrBuilder | StrBuilderTest.java:105:89:105:103 | toString(...) | provenance | MaD:5 |
-| StrBuilderTest.java:105:89:105:92 | sb52 : StrBuilder | StrBuilderTest.java:105:89:105:103 | toString(...) | provenance | MaD:311 |
+| StrBuilderTest.java:105:89:105:92 | sb52 : StrBuilder | StrBuilderTest.java:105:89:105:103 | toString(...) | provenance | MaD:119 |
 | StrBuilderTest.java:106:45:106:48 | sb53 [post update] : StrBuilder | StrBuilderTest.java:106:95:106:98 | sb53 : StrBuilder | provenance |  |
 | StrBuilderTest.java:106:60:106:66 | taint(...) : String | StrBuilderTest.java:106:60:106:80 | toCharArray(...) : char[] | provenance | MaD:7 |
-| StrBuilderTest.java:106:60:106:80 | toCharArray(...) : char[] | StrBuilderTest.java:106:45:106:48 | sb53 [post update] : StrBuilder | provenance | MaD:290 |
+| StrBuilderTest.java:106:60:106:80 | toCharArray(...) : char[] | StrBuilderTest.java:106:45:106:48 | sb53 [post update] : StrBuilder | provenance | MaD:97 |
 | StrBuilderTest.java:106:95:106:98 | sb53 : StrBuilder | StrBuilderTest.java:106:95:106:109 | toString(...) | provenance | MaD:5 |
-| StrBuilderTest.java:106:95:106:98 | sb53 : StrBuilder | StrBuilderTest.java:106:95:106:109 | toString(...) | provenance | MaD:311 |
+| StrBuilderTest.java:106:95:106:98 | sb53 : StrBuilder | StrBuilderTest.java:106:95:106:109 | toString(...) | provenance | MaD:119 |
 | StrBuilderTest.java:107:45:107:48 | sb54 [post update] : StrBuilder | StrBuilderTest.java:107:75:107:78 | sb54 : StrBuilder | provenance |  |
-| StrBuilderTest.java:107:60:107:66 | taint(...) : String | StrBuilderTest.java:107:45:107:48 | sb54 [post update] : StrBuilder | provenance | MaD:290 |
+| StrBuilderTest.java:107:60:107:66 | taint(...) : String | StrBuilderTest.java:107:45:107:48 | sb54 [post update] : StrBuilder | provenance | MaD:97 |
 | StrBuilderTest.java:107:75:107:78 | sb54 : StrBuilder | StrBuilderTest.java:107:75:107:89 | toString(...) | provenance | MaD:5 |
-| StrBuilderTest.java:107:75:107:78 | sb54 : StrBuilder | StrBuilderTest.java:107:75:107:89 | toString(...) | provenance | MaD:311 |
+| StrBuilderTest.java:107:75:107:78 | sb54 : StrBuilder | StrBuilderTest.java:107:75:107:89 | toString(...) | provenance | MaD:119 |
 | StrBuilderTest.java:108:45:108:48 | sb55 [post update] : StrBuilder | StrBuilderTest.java:108:83:108:86 | sb55 : StrBuilder | provenance |  |
-| StrBuilderTest.java:108:60:108:74 | (...)... : String | StrBuilderTest.java:108:45:108:48 | sb55 [post update] : StrBuilder | provenance | MaD:290 |
+| StrBuilderTest.java:108:60:108:74 | (...)... : String | StrBuilderTest.java:108:45:108:48 | sb55 [post update] : StrBuilder | provenance | MaD:97 |
 | StrBuilderTest.java:108:68:108:74 | taint(...) : String | StrBuilderTest.java:108:60:108:74 | (...)... : String | provenance |  |
 | StrBuilderTest.java:108:83:108:86 | sb55 : StrBuilder | StrBuilderTest.java:108:83:108:97 | toString(...) | provenance | MaD:5 |
-| StrBuilderTest.java:108:83:108:86 | sb55 : StrBuilder | StrBuilderTest.java:108:83:108:97 | toString(...) | provenance | MaD:311 |
+| StrBuilderTest.java:108:83:108:86 | sb55 : StrBuilder | StrBuilderTest.java:108:83:108:97 | toString(...) | provenance | MaD:119 |
 | StrBuilderTest.java:109:45:109:48 | sb56 [post update] : StrBuilder | StrBuilderTest.java:109:72:109:75 | sb56 : StrBuilder | provenance |  |
-| StrBuilderTest.java:109:57:109:63 | taint(...) : String | StrBuilderTest.java:109:45:109:48 | sb56 [post update] : StrBuilder | provenance | MaD:233 |
-| StrBuilderTest.java:109:72:109:75 | sb56 : StrBuilder | StrBuilderTest.java:109:72:109:89 | leftString(...) | provenance | MaD:291 |
+| StrBuilderTest.java:109:57:109:63 | taint(...) : String | StrBuilderTest.java:109:45:109:48 | sb56 [post update] : StrBuilder | provenance | MaD:40 |
+| StrBuilderTest.java:109:72:109:75 | sb56 : StrBuilder | StrBuilderTest.java:109:72:109:89 | leftString(...) | provenance | MaD:99 |
 | StrBuilderTest.java:110:45:110:48 | sb57 [post update] : StrBuilder | StrBuilderTest.java:110:72:110:75 | sb57 : StrBuilder | provenance |  |
-| StrBuilderTest.java:110:57:110:63 | taint(...) : String | StrBuilderTest.java:110:45:110:48 | sb57 [post update] : StrBuilder | provenance | MaD:233 |
-| StrBuilderTest.java:110:72:110:75 | sb57 : StrBuilder | StrBuilderTest.java:110:72:110:91 | midString(...) | provenance | MaD:292 |
+| StrBuilderTest.java:110:57:110:63 | taint(...) : String | StrBuilderTest.java:110:45:110:48 | sb57 [post update] : StrBuilder | provenance | MaD:40 |
+| StrBuilderTest.java:110:72:110:75 | sb57 : StrBuilder | StrBuilderTest.java:110:72:110:91 | midString(...) | provenance | MaD:100 |
 | StrBuilderTest.java:112:35:112:59 | new StringReader(...) : StringReader | StrBuilderTest.java:113:63:113:68 | reader : StringReader | provenance |  |
 | StrBuilderTest.java:112:52:112:58 | taint(...) : String | StrBuilderTest.java:112:35:112:59 | new StringReader(...) : StringReader | provenance | MaD:2 |
 | StrBuilderTest.java:113:49:113:52 | sb58 [post update] : StrBuilder | StrBuilderTest.java:113:77:113:80 | sb58 : StrBuilder | provenance |  |
-| StrBuilderTest.java:113:63:113:68 | reader : StringReader | StrBuilderTest.java:113:49:113:52 | sb58 [post update] : StrBuilder | provenance | MaD:294 |
+| StrBuilderTest.java:113:63:113:68 | reader : StringReader | StrBuilderTest.java:113:49:113:52 | sb58 [post update] : StrBuilder | provenance | MaD:102 |
 | StrBuilderTest.java:113:77:113:80 | sb58 : StrBuilder | StrBuilderTest.java:113:77:113:91 | toString(...) | provenance | MaD:5 |
-| StrBuilderTest.java:113:77:113:80 | sb58 : StrBuilder | StrBuilderTest.java:113:77:113:91 | toString(...) | provenance | MaD:311 |
+| StrBuilderTest.java:113:77:113:80 | sb58 : StrBuilder | StrBuilderTest.java:113:77:113:91 | toString(...) | provenance | MaD:119 |
 | StrBuilderTest.java:115:45:115:48 | sb59 [post update] : StrBuilder | StrBuilderTest.java:115:79:115:82 | sb59 : StrBuilder | provenance |  |
-| StrBuilderTest.java:115:64:115:70 | taint(...) : String | StrBuilderTest.java:115:45:115:48 | sb59 [post update] : StrBuilder | provenance | MaD:296 |
+| StrBuilderTest.java:115:64:115:70 | taint(...) : String | StrBuilderTest.java:115:45:115:48 | sb59 [post update] : StrBuilder | provenance | MaD:103 |
 | StrBuilderTest.java:115:79:115:82 | sb59 : StrBuilder | StrBuilderTest.java:115:79:115:93 | toString(...) | provenance | MaD:5 |
-| StrBuilderTest.java:115:79:115:82 | sb59 : StrBuilder | StrBuilderTest.java:115:79:115:93 | toString(...) | provenance | MaD:311 |
+| StrBuilderTest.java:115:79:115:82 | sb59 : StrBuilder | StrBuilderTest.java:115:79:115:93 | toString(...) | provenance | MaD:119 |
 | StrBuilderTest.java:116:45:116:48 | sb60 [post update] : StrBuilder | StrBuilderTest.java:116:88:116:91 | sb60 : StrBuilder | provenance |  |
-| StrBuilderTest.java:116:64:116:70 | taint(...) : String | StrBuilderTest.java:116:45:116:48 | sb60 [post update] : StrBuilder | provenance | MaD:297 |
+| StrBuilderTest.java:116:64:116:70 | taint(...) : String | StrBuilderTest.java:116:45:116:48 | sb60 [post update] : StrBuilder | provenance | MaD:104 |
 | StrBuilderTest.java:116:88:116:91 | sb60 : StrBuilder | StrBuilderTest.java:116:88:116:102 | toString(...) | provenance | MaD:5 |
-| StrBuilderTest.java:116:88:116:91 | sb60 : StrBuilder | StrBuilderTest.java:116:88:116:102 | toString(...) | provenance | MaD:311 |
+| StrBuilderTest.java:116:88:116:91 | sb60 : StrBuilder | StrBuilderTest.java:116:88:116:102 | toString(...) | provenance | MaD:119 |
 | StrBuilderTest.java:117:45:117:48 | sb61 [post update] : StrBuilder | StrBuilderTest.java:117:94:117:97 | sb61 : StrBuilder | provenance |  |
-| StrBuilderTest.java:117:79:117:85 | taint(...) : String | StrBuilderTest.java:117:45:117:48 | sb61 [post update] : StrBuilder | provenance | MaD:299 |
+| StrBuilderTest.java:117:79:117:85 | taint(...) : String | StrBuilderTest.java:117:45:117:48 | sb61 [post update] : StrBuilder | provenance | MaD:106 |
 | StrBuilderTest.java:117:94:117:97 | sb61 : StrBuilder | StrBuilderTest.java:117:94:117:108 | toString(...) | provenance | MaD:5 |
-| StrBuilderTest.java:117:94:117:97 | sb61 : StrBuilder | StrBuilderTest.java:117:94:117:108 | toString(...) | provenance | MaD:311 |
+| StrBuilderTest.java:117:94:117:97 | sb61 : StrBuilder | StrBuilderTest.java:117:94:117:108 | toString(...) | provenance | MaD:119 |
 | StrBuilderTest.java:118:45:118:48 | sb62 [post update] : StrBuilder | StrBuilderTest.java:118:86:118:89 | sb62 : StrBuilder | provenance |  |
-| StrBuilderTest.java:118:71:118:77 | taint(...) : String | StrBuilderTest.java:118:45:118:48 | sb62 [post update] : StrBuilder | provenance | MaD:299 |
+| StrBuilderTest.java:118:71:118:77 | taint(...) : String | StrBuilderTest.java:118:45:118:48 | sb62 [post update] : StrBuilder | provenance | MaD:106 |
 | StrBuilderTest.java:118:86:118:89 | sb62 : StrBuilder | StrBuilderTest.java:118:86:118:100 | toString(...) | provenance | MaD:5 |
-| StrBuilderTest.java:118:86:118:89 | sb62 : StrBuilder | StrBuilderTest.java:118:86:118:100 | toString(...) | provenance | MaD:311 |
+| StrBuilderTest.java:118:86:118:89 | sb62 : StrBuilder | StrBuilderTest.java:118:86:118:100 | toString(...) | provenance | MaD:119 |
 | StrBuilderTest.java:120:45:120:48 | sb64 [post update] : StrBuilder | StrBuilderTest.java:120:96:120:99 | sb64 : StrBuilder | provenance |  |
-| StrBuilderTest.java:120:81:120:87 | taint(...) : String | StrBuilderTest.java:120:45:120:48 | sb64 [post update] : StrBuilder | provenance | MaD:301 |
+| StrBuilderTest.java:120:81:120:87 | taint(...) : String | StrBuilderTest.java:120:45:120:48 | sb64 [post update] : StrBuilder | provenance | MaD:108 |
 | StrBuilderTest.java:120:96:120:99 | sb64 : StrBuilder | StrBuilderTest.java:120:96:120:110 | toString(...) | provenance | MaD:5 |
-| StrBuilderTest.java:120:96:120:99 | sb64 : StrBuilder | StrBuilderTest.java:120:96:120:110 | toString(...) | provenance | MaD:311 |
+| StrBuilderTest.java:120:96:120:99 | sb64 : StrBuilder | StrBuilderTest.java:120:96:120:110 | toString(...) | provenance | MaD:119 |
 | StrBuilderTest.java:121:45:121:48 | sb65 [post update] : StrBuilder | StrBuilderTest.java:121:88:121:91 | sb65 : StrBuilder | provenance |  |
-| StrBuilderTest.java:121:73:121:79 | taint(...) : String | StrBuilderTest.java:121:45:121:48 | sb65 [post update] : StrBuilder | provenance | MaD:301 |
+| StrBuilderTest.java:121:73:121:79 | taint(...) : String | StrBuilderTest.java:121:45:121:48 | sb65 [post update] : StrBuilder | provenance | MaD:108 |
 | StrBuilderTest.java:121:88:121:91 | sb65 : StrBuilder | StrBuilderTest.java:121:88:121:102 | toString(...) | provenance | MaD:5 |
-| StrBuilderTest.java:121:88:121:91 | sb65 : StrBuilder | StrBuilderTest.java:121:88:121:102 | toString(...) | provenance | MaD:311 |
+| StrBuilderTest.java:121:88:121:91 | sb65 : StrBuilder | StrBuilderTest.java:121:88:121:102 | toString(...) | provenance | MaD:119 |
 | StrBuilderTest.java:123:45:123:48 | sb67 [post update] : StrBuilder | StrBuilderTest.java:123:72:123:75 | sb67 : StrBuilder | provenance |  |
-| StrBuilderTest.java:123:57:123:63 | taint(...) : String | StrBuilderTest.java:123:45:123:48 | sb67 [post update] : StrBuilder | provenance | MaD:233 |
-| StrBuilderTest.java:123:72:123:75 | sb67 : StrBuilder | StrBuilderTest.java:123:72:123:90 | rightString(...) | provenance | MaD:303 |
+| StrBuilderTest.java:123:57:123:63 | taint(...) : String | StrBuilderTest.java:123:45:123:48 | sb67 [post update] : StrBuilder | provenance | MaD:40 |
+| StrBuilderTest.java:123:72:123:75 | sb67 : StrBuilder | StrBuilderTest.java:123:72:123:90 | rightString(...) | provenance | MaD:111 |
 | StrBuilderTest.java:124:45:124:48 | sb68 [post update] : StrBuilder | StrBuilderTest.java:124:72:124:75 | sb68 : StrBuilder | provenance |  |
-| StrBuilderTest.java:124:57:124:63 | taint(...) : String | StrBuilderTest.java:124:45:124:48 | sb68 [post update] : StrBuilder | provenance | MaD:233 |
+| StrBuilderTest.java:124:57:124:63 | taint(...) : String | StrBuilderTest.java:124:45:124:48 | sb68 [post update] : StrBuilder | provenance | MaD:40 |
 | StrBuilderTest.java:124:72:124:75 | sb68 : StrBuilder | StrBuilderTest.java:124:72:124:93 | subSequence(...) | provenance | MaD:4 |
-| StrBuilderTest.java:124:72:124:75 | sb68 : StrBuilder | StrBuilderTest.java:124:72:124:93 | subSequence(...) | provenance | MaD:308 |
+| StrBuilderTest.java:124:72:124:75 | sb68 : StrBuilder | StrBuilderTest.java:124:72:124:93 | subSequence(...) | provenance | MaD:116 |
 | StrBuilderTest.java:125:45:125:48 | sb69 [post update] : StrBuilder | StrBuilderTest.java:125:72:125:75 | sb69 : StrBuilder | provenance |  |
-| StrBuilderTest.java:125:57:125:63 | taint(...) : String | StrBuilderTest.java:125:45:125:48 | sb69 [post update] : StrBuilder | provenance | MaD:233 |
-| StrBuilderTest.java:125:72:125:75 | sb69 : StrBuilder | StrBuilderTest.java:125:72:125:88 | substring(...) | provenance | MaD:309 |
+| StrBuilderTest.java:125:57:125:63 | taint(...) : String | StrBuilderTest.java:125:45:125:48 | sb69 [post update] : StrBuilder | provenance | MaD:40 |
+| StrBuilderTest.java:125:72:125:75 | sb69 : StrBuilder | StrBuilderTest.java:125:72:125:88 | substring(...) | provenance | MaD:117 |
 | StrBuilderTest.java:126:45:126:48 | sb70 [post update] : StrBuilder | StrBuilderTest.java:126:72:126:75 | sb70 : StrBuilder | provenance |  |
-| StrBuilderTest.java:126:57:126:63 | taint(...) : String | StrBuilderTest.java:126:45:126:48 | sb70 [post update] : StrBuilder | provenance | MaD:233 |
-| StrBuilderTest.java:126:72:126:75 | sb70 : StrBuilder | StrBuilderTest.java:126:72:126:91 | substring(...) | provenance | MaD:309 |
+| StrBuilderTest.java:126:57:126:63 | taint(...) : String | StrBuilderTest.java:126:45:126:48 | sb70 [post update] : StrBuilder | provenance | MaD:40 |
+| StrBuilderTest.java:126:72:126:75 | sb70 : StrBuilder | StrBuilderTest.java:126:72:126:91 | substring(...) | provenance | MaD:117 |
 | StrBuilderTest.java:127:45:127:48 | sb71 [post update] : StrBuilder | StrBuilderTest.java:127:72:127:75 | sb71 : StrBuilder | provenance |  |
-| StrBuilderTest.java:127:57:127:63 | taint(...) : String | StrBuilderTest.java:127:45:127:48 | sb71 [post update] : StrBuilder | provenance | MaD:233 |
-| StrBuilderTest.java:127:72:127:75 | sb71 : StrBuilder | StrBuilderTest.java:127:72:127:89 | toCharArray(...) | provenance | MaD:310 |
+| StrBuilderTest.java:127:57:127:63 | taint(...) : String | StrBuilderTest.java:127:45:127:48 | sb71 [post update] : StrBuilder | provenance | MaD:40 |
+| StrBuilderTest.java:127:72:127:75 | sb71 : StrBuilder | StrBuilderTest.java:127:72:127:89 | toCharArray(...) | provenance | MaD:118 |
 | StrBuilderTest.java:128:45:128:48 | sb72 [post update] : StrBuilder | StrBuilderTest.java:128:72:128:75 | sb72 : StrBuilder | provenance |  |
-| StrBuilderTest.java:128:57:128:63 | taint(...) : String | StrBuilderTest.java:128:45:128:48 | sb72 [post update] : StrBuilder | provenance | MaD:233 |
-| StrBuilderTest.java:128:72:128:75 | sb72 : StrBuilder | StrBuilderTest.java:128:72:128:93 | toCharArray(...) | provenance | MaD:310 |
+| StrBuilderTest.java:128:57:128:63 | taint(...) : String | StrBuilderTest.java:128:45:128:48 | sb72 [post update] : StrBuilder | provenance | MaD:40 |
+| StrBuilderTest.java:128:72:128:75 | sb72 : StrBuilder | StrBuilderTest.java:128:72:128:93 | toCharArray(...) | provenance | MaD:118 |
 | StrBuilderTest.java:129:45:129:48 | sb73 [post update] : StrBuilder | StrBuilderTest.java:129:72:129:75 | sb73 : StrBuilder | provenance |  |
-| StrBuilderTest.java:129:57:129:63 | taint(...) : String | StrBuilderTest.java:129:45:129:48 | sb73 [post update] : StrBuilder | provenance | MaD:233 |
-| StrBuilderTest.java:129:72:129:75 | sb73 : StrBuilder | StrBuilderTest.java:129:72:129:92 | toStringBuffer(...) | provenance | MaD:312 |
+| StrBuilderTest.java:129:57:129:63 | taint(...) : String | StrBuilderTest.java:129:45:129:48 | sb73 [post update] : StrBuilder | provenance | MaD:40 |
+| StrBuilderTest.java:129:72:129:75 | sb73 : StrBuilder | StrBuilderTest.java:129:72:129:92 | toStringBuffer(...) | provenance | MaD:120 |
 | StrBuilderTest.java:130:45:130:48 | sb74 [post update] : StrBuilder | StrBuilderTest.java:130:72:130:75 | sb74 : StrBuilder | provenance |  |
-| StrBuilderTest.java:130:57:130:63 | taint(...) : String | StrBuilderTest.java:130:45:130:48 | sb74 [post update] : StrBuilder | provenance | MaD:233 |
-| StrBuilderTest.java:130:72:130:75 | sb74 : StrBuilder | StrBuilderTest.java:130:72:130:93 | toStringBuilder(...) | provenance | MaD:313 |
-| StrBuilderTest.java:135:14:135:58 | append(...) : StrBuilder | StrBuilderTest.java:135:14:135:82 | append(...) : StrBuilder | provenance | MaD:227 |
+| StrBuilderTest.java:130:57:130:63 | taint(...) : String | StrBuilderTest.java:130:45:130:48 | sb74 [post update] : StrBuilder | provenance | MaD:40 |
+| StrBuilderTest.java:130:72:130:75 | sb74 : StrBuilder | StrBuilderTest.java:130:72:130:93 | toStringBuilder(...) | provenance | MaD:121 |
+| StrBuilderTest.java:135:14:135:58 | append(...) : StrBuilder | StrBuilderTest.java:135:14:135:82 | append(...) : StrBuilder | provenance | MaD:51 |
 | StrBuilderTest.java:135:14:135:58 | append(...) : StrBuilder | StrBuilderTest.java:135:14:135:82 | append(...) : StrBuilder | provenance | ValuePreservingMethod |
 | StrBuilderTest.java:135:14:135:82 | append(...) : StrBuilder | StrBuilderTest.java:135:14:135:93 | toString(...) | provenance | MaD:5 |
-| StrBuilderTest.java:135:14:135:82 | append(...) : StrBuilder | StrBuilderTest.java:135:14:135:93 | toString(...) | provenance | MaD:311 |
-| StrBuilderTest.java:135:51:135:57 | taint(...) : String | StrBuilderTest.java:135:14:135:58 | append(...) : StrBuilder | provenance | MaD:233+MaD:227 |
-| StrBuilderTest.java:138:9:138:45 | append(...) [post update] : StrBuilder | StrBuilderTest.java:139:14:139:31 | fluentBackflowTest : StrBuilder | provenance | MaD:227 |
+| StrBuilderTest.java:135:14:135:82 | append(...) : StrBuilder | StrBuilderTest.java:135:14:135:93 | toString(...) | provenance | MaD:119 |
+| StrBuilderTest.java:135:51:135:57 | taint(...) : String | StrBuilderTest.java:135:14:135:58 | append(...) : StrBuilder | provenance | MaD:40+MaD:51 |
+| StrBuilderTest.java:138:9:138:45 | append(...) [post update] : StrBuilder | StrBuilderTest.java:139:14:139:31 | fluentBackflowTest : StrBuilder | provenance | MaD:51 |
 | StrBuilderTest.java:138:9:138:45 | append(...) [post update] : StrBuilder | StrBuilderTest.java:139:14:139:31 | fluentBackflowTest : StrBuilder | provenance | ValuePreservingMethod |
-| StrBuilderTest.java:138:54:138:60 | taint(...) : String | StrBuilderTest.java:138:9:138:45 | append(...) [post update] : StrBuilder | provenance | MaD:233 |
+| StrBuilderTest.java:138:54:138:60 | taint(...) : String | StrBuilderTest.java:138:9:138:45 | append(...) [post update] : StrBuilder | provenance | MaD:40 |
 | StrBuilderTest.java:139:14:139:31 | fluentBackflowTest : StrBuilder | StrBuilderTest.java:139:14:139:42 | toString(...) | provenance | MaD:5 |
-| StrBuilderTest.java:139:14:139:31 | fluentBackflowTest : StrBuilder | StrBuilderTest.java:139:14:139:42 | toString(...) | provenance | MaD:311 |
-| StrBuilderTest.java:143:9:143:46 | append(...) [post update] : StrBuilder | StrBuilderTest.java:144:14:144:32 | fluentBackflowTest2 : StrBuilder | provenance | MaD:227 |
+| StrBuilderTest.java:139:14:139:31 | fluentBackflowTest : StrBuilder | StrBuilderTest.java:139:14:139:42 | toString(...) | provenance | MaD:119 |
+| StrBuilderTest.java:143:9:143:46 | append(...) [post update] : StrBuilder | StrBuilderTest.java:144:14:144:32 | fluentBackflowTest2 : StrBuilder | provenance | MaD:51 |
 | StrBuilderTest.java:143:9:143:46 | append(...) [post update] : StrBuilder | StrBuilderTest.java:144:14:144:32 | fluentBackflowTest2 : StrBuilder | provenance | ValuePreservingMethod |
-| StrBuilderTest.java:143:55:143:61 | taint(...) : String | StrBuilderTest.java:143:9:143:46 | append(...) [post update] : StrBuilder | provenance | MaD:233 |
+| StrBuilderTest.java:143:55:143:61 | taint(...) : String | StrBuilderTest.java:143:9:143:46 | append(...) [post update] : StrBuilder | provenance | MaD:40 |
 | StrBuilderTest.java:144:14:144:32 | fluentBackflowTest2 : StrBuilder | StrBuilderTest.java:144:14:144:43 | toString(...) | provenance | MaD:5 |
-| StrBuilderTest.java:144:14:144:32 | fluentBackflowTest2 : StrBuilder | StrBuilderTest.java:144:14:144:43 | toString(...) | provenance | MaD:311 |
+| StrBuilderTest.java:144:14:144:32 | fluentBackflowTest2 : StrBuilder | StrBuilderTest.java:144:14:144:43 | toString(...) | provenance | MaD:119 |
 | StrBuilderTest.java:147:43:147:65 | new StrBuilder(...) : StrBuilder | StrBuilderTest.java:148:14:148:33 | fluentAllMethodsTest : StrBuilder | provenance |  |
 | StrBuilderTest.java:147:43:147:65 | new StrBuilder(...) : StrBuilder | StrBuilderTest.java:148:14:149:23 | append(...) : StrBuilder | provenance | ValuePreservingMethod |
 | StrBuilderTest.java:147:43:147:65 | new StrBuilder(...) : StrBuilder | StrBuilderTest.java:148:14:150:26 | appendAll(...) : StrBuilder | provenance | ValuePreservingMethod |
@@ -1315,9 +1289,9 @@ edges
 | StrBuilderTest.java:147:43:147:65 | new StrBuilder(...) : StrBuilder | StrBuilderTest.java:148:14:172:34 | setNewLineText(...) : StrBuilder | provenance | ValuePreservingMethod |
 | StrBuilderTest.java:147:43:147:65 | new StrBuilder(...) : StrBuilder | StrBuilderTest.java:148:14:173:28 | setNullText(...) : StrBuilder | provenance | ValuePreservingMethod |
 | StrBuilderTest.java:147:43:147:65 | new StrBuilder(...) : StrBuilder | StrBuilderTest.java:148:14:174:15 | trim(...) | provenance | ValuePreservingMethod |
-| StrBuilderTest.java:147:58:147:64 | taint(...) : String | StrBuilderTest.java:147:43:147:65 | new StrBuilder(...) : StrBuilder | provenance | MaD:226 |
-| StrBuilderTest.java:148:14:148:33 | fluentAllMethodsTest : StrBuilder | StrBuilderTest.java:148:14:149:23 | append(...) : StrBuilder | provenance | MaD:227 |
-| StrBuilderTest.java:148:14:149:23 | append(...) : StrBuilder | StrBuilderTest.java:148:14:150:26 | appendAll(...) : StrBuilder | provenance | MaD:244 |
+| StrBuilderTest.java:147:58:147:64 | taint(...) : String | StrBuilderTest.java:147:43:147:65 | new StrBuilder(...) : StrBuilder | provenance | MaD:34 |
+| StrBuilderTest.java:148:14:148:33 | fluentAllMethodsTest : StrBuilder | StrBuilderTest.java:148:14:149:23 | append(...) : StrBuilder | provenance | MaD:51 |
+| StrBuilderTest.java:148:14:149:23 | append(...) : StrBuilder | StrBuilderTest.java:148:14:150:26 | appendAll(...) : StrBuilder | provenance | MaD:55 |
 | StrBuilderTest.java:148:14:149:23 | append(...) : StrBuilder | StrBuilderTest.java:148:14:150:26 | appendAll(...) : StrBuilder | provenance | ValuePreservingMethod |
 | StrBuilderTest.java:148:14:149:23 | append(...) : StrBuilder | StrBuilderTest.java:148:14:151:48 | appendFixedWidthPadLeft(...) : StrBuilder | provenance | ValuePreservingMethod |
 | StrBuilderTest.java:148:14:149:23 | append(...) : StrBuilder | StrBuilderTest.java:148:14:152:49 | appendFixedWidthPadRight(...) : StrBuilder | provenance | ValuePreservingMethod |
@@ -1343,7 +1317,7 @@ edges
 | StrBuilderTest.java:148:14:149:23 | append(...) : StrBuilder | StrBuilderTest.java:148:14:172:34 | setNewLineText(...) : StrBuilder | provenance | ValuePreservingMethod |
 | StrBuilderTest.java:148:14:149:23 | append(...) : StrBuilder | StrBuilderTest.java:148:14:173:28 | setNullText(...) : StrBuilder | provenance | ValuePreservingMethod |
 | StrBuilderTest.java:148:14:149:23 | append(...) : StrBuilder | StrBuilderTest.java:148:14:174:15 | trim(...) | provenance | ValuePreservingMethod |
-| StrBuilderTest.java:148:14:150:26 | appendAll(...) : StrBuilder | StrBuilderTest.java:148:14:151:48 | appendFixedWidthPadLeft(...) : StrBuilder | provenance | MaD:248 |
+| StrBuilderTest.java:148:14:150:26 | appendAll(...) : StrBuilder | StrBuilderTest.java:148:14:151:48 | appendFixedWidthPadLeft(...) : StrBuilder | provenance | MaD:57 |
 | StrBuilderTest.java:148:14:150:26 | appendAll(...) : StrBuilder | StrBuilderTest.java:148:14:151:48 | appendFixedWidthPadLeft(...) : StrBuilder | provenance | ValuePreservingMethod |
 | StrBuilderTest.java:148:14:150:26 | appendAll(...) : StrBuilder | StrBuilderTest.java:148:14:152:49 | appendFixedWidthPadRight(...) : StrBuilder | provenance | ValuePreservingMethod |
 | StrBuilderTest.java:148:14:150:26 | appendAll(...) : StrBuilder | StrBuilderTest.java:148:14:153:25 | appendln(...) : StrBuilder | provenance | ValuePreservingMethod |
@@ -1368,7 +1342,7 @@ edges
 | StrBuilderTest.java:148:14:150:26 | appendAll(...) : StrBuilder | StrBuilderTest.java:148:14:172:34 | setNewLineText(...) : StrBuilder | provenance | ValuePreservingMethod |
 | StrBuilderTest.java:148:14:150:26 | appendAll(...) : StrBuilder | StrBuilderTest.java:148:14:173:28 | setNullText(...) : StrBuilder | provenance | ValuePreservingMethod |
 | StrBuilderTest.java:148:14:150:26 | appendAll(...) : StrBuilder | StrBuilderTest.java:148:14:174:15 | trim(...) | provenance | ValuePreservingMethod |
-| StrBuilderTest.java:148:14:151:48 | appendFixedWidthPadLeft(...) : StrBuilder | StrBuilderTest.java:148:14:152:49 | appendFixedWidthPadRight(...) : StrBuilder | provenance | MaD:250 |
+| StrBuilderTest.java:148:14:151:48 | appendFixedWidthPadLeft(...) : StrBuilder | StrBuilderTest.java:148:14:152:49 | appendFixedWidthPadRight(...) : StrBuilder | provenance | MaD:59 |
 | StrBuilderTest.java:148:14:151:48 | appendFixedWidthPadLeft(...) : StrBuilder | StrBuilderTest.java:148:14:152:49 | appendFixedWidthPadRight(...) : StrBuilder | provenance | ValuePreservingMethod |
 | StrBuilderTest.java:148:14:151:48 | appendFixedWidthPadLeft(...) : StrBuilder | StrBuilderTest.java:148:14:153:25 | appendln(...) : StrBuilder | provenance | ValuePreservingMethod |
 | StrBuilderTest.java:148:14:151:48 | appendFixedWidthPadLeft(...) : StrBuilder | StrBuilderTest.java:148:14:154:24 | appendNewLine(...) : StrBuilder | provenance | ValuePreservingMethod |
@@ -1392,7 +1366,7 @@ edges
 | StrBuilderTest.java:148:14:151:48 | appendFixedWidthPadLeft(...) : StrBuilder | StrBuilderTest.java:148:14:172:34 | setNewLineText(...) : StrBuilder | provenance | ValuePreservingMethod |
 | StrBuilderTest.java:148:14:151:48 | appendFixedWidthPadLeft(...) : StrBuilder | StrBuilderTest.java:148:14:173:28 | setNullText(...) : StrBuilder | provenance | ValuePreservingMethod |
 | StrBuilderTest.java:148:14:151:48 | appendFixedWidthPadLeft(...) : StrBuilder | StrBuilderTest.java:148:14:174:15 | trim(...) | provenance | ValuePreservingMethod |
-| StrBuilderTest.java:148:14:152:49 | appendFixedWidthPadRight(...) : StrBuilder | StrBuilderTest.java:148:14:153:25 | appendln(...) : StrBuilder | provenance | MaD:265 |
+| StrBuilderTest.java:148:14:152:49 | appendFixedWidthPadRight(...) : StrBuilder | StrBuilderTest.java:148:14:153:25 | appendln(...) : StrBuilder | provenance | MaD:85 |
 | StrBuilderTest.java:148:14:152:49 | appendFixedWidthPadRight(...) : StrBuilder | StrBuilderTest.java:148:14:153:25 | appendln(...) : StrBuilder | provenance | ValuePreservingMethod |
 | StrBuilderTest.java:148:14:152:49 | appendFixedWidthPadRight(...) : StrBuilder | StrBuilderTest.java:148:14:154:24 | appendNewLine(...) : StrBuilder | provenance | ValuePreservingMethod |
 | StrBuilderTest.java:148:14:152:49 | appendFixedWidthPadRight(...) : StrBuilder | StrBuilderTest.java:148:14:155:21 | appendNull(...) : StrBuilder | provenance | ValuePreservingMethod |
@@ -1415,7 +1389,7 @@ edges
 | StrBuilderTest.java:148:14:152:49 | appendFixedWidthPadRight(...) : StrBuilder | StrBuilderTest.java:148:14:172:34 | setNewLineText(...) : StrBuilder | provenance | ValuePreservingMethod |
 | StrBuilderTest.java:148:14:152:49 | appendFixedWidthPadRight(...) : StrBuilder | StrBuilderTest.java:148:14:173:28 | setNullText(...) : StrBuilder | provenance | ValuePreservingMethod |
 | StrBuilderTest.java:148:14:152:49 | appendFixedWidthPadRight(...) : StrBuilder | StrBuilderTest.java:148:14:174:15 | trim(...) | provenance | ValuePreservingMethod |
-| StrBuilderTest.java:148:14:153:25 | appendln(...) : StrBuilder | StrBuilderTest.java:148:14:154:24 | appendNewLine(...) : StrBuilder | provenance | MaD:252 |
+| StrBuilderTest.java:148:14:153:25 | appendln(...) : StrBuilder | StrBuilderTest.java:148:14:154:24 | appendNewLine(...) : StrBuilder | provenance | MaD:60 |
 | StrBuilderTest.java:148:14:153:25 | appendln(...) : StrBuilder | StrBuilderTest.java:148:14:154:24 | appendNewLine(...) : StrBuilder | provenance | ValuePreservingMethod |
 | StrBuilderTest.java:148:14:153:25 | appendln(...) : StrBuilder | StrBuilderTest.java:148:14:155:21 | appendNull(...) : StrBuilder | provenance | ValuePreservingMethod |
 | StrBuilderTest.java:148:14:153:25 | appendln(...) : StrBuilder | StrBuilderTest.java:148:14:156:30 | appendPadding(...) : StrBuilder | provenance | ValuePreservingMethod |
@@ -1437,7 +1411,7 @@ edges
 | StrBuilderTest.java:148:14:153:25 | appendln(...) : StrBuilder | StrBuilderTest.java:148:14:172:34 | setNewLineText(...) : StrBuilder | provenance | ValuePreservingMethod |
 | StrBuilderTest.java:148:14:153:25 | appendln(...) : StrBuilder | StrBuilderTest.java:148:14:173:28 | setNullText(...) : StrBuilder | provenance | ValuePreservingMethod |
 | StrBuilderTest.java:148:14:153:25 | appendln(...) : StrBuilder | StrBuilderTest.java:148:14:174:15 | trim(...) | provenance | ValuePreservingMethod |
-| StrBuilderTest.java:148:14:154:24 | appendNewLine(...) : StrBuilder | StrBuilderTest.java:148:14:155:21 | appendNull(...) : StrBuilder | provenance | MaD:253 |
+| StrBuilderTest.java:148:14:154:24 | appendNewLine(...) : StrBuilder | StrBuilderTest.java:148:14:155:21 | appendNull(...) : StrBuilder | provenance | MaD:61 |
 | StrBuilderTest.java:148:14:154:24 | appendNewLine(...) : StrBuilder | StrBuilderTest.java:148:14:155:21 | appendNull(...) : StrBuilder | provenance | ValuePreservingMethod |
 | StrBuilderTest.java:148:14:154:24 | appendNewLine(...) : StrBuilder | StrBuilderTest.java:148:14:156:30 | appendPadding(...) : StrBuilder | provenance | ValuePreservingMethod |
 | StrBuilderTest.java:148:14:154:24 | appendNewLine(...) : StrBuilder | StrBuilderTest.java:148:14:157:29 | appendSeparator(...) : StrBuilder | provenance | ValuePreservingMethod |
@@ -1458,7 +1432,7 @@ edges
 | StrBuilderTest.java:148:14:154:24 | appendNewLine(...) : StrBuilder | StrBuilderTest.java:148:14:172:34 | setNewLineText(...) : StrBuilder | provenance | ValuePreservingMethod |
 | StrBuilderTest.java:148:14:154:24 | appendNewLine(...) : StrBuilder | StrBuilderTest.java:148:14:173:28 | setNullText(...) : StrBuilder | provenance | ValuePreservingMethod |
 | StrBuilderTest.java:148:14:154:24 | appendNewLine(...) : StrBuilder | StrBuilderTest.java:148:14:174:15 | trim(...) | provenance | ValuePreservingMethod |
-| StrBuilderTest.java:148:14:155:21 | appendNull(...) : StrBuilder | StrBuilderTest.java:148:14:156:30 | appendPadding(...) : StrBuilder | provenance | MaD:254 |
+| StrBuilderTest.java:148:14:155:21 | appendNull(...) : StrBuilder | StrBuilderTest.java:148:14:156:30 | appendPadding(...) : StrBuilder | provenance | MaD:62 |
 | StrBuilderTest.java:148:14:155:21 | appendNull(...) : StrBuilder | StrBuilderTest.java:148:14:156:30 | appendPadding(...) : StrBuilder | provenance | ValuePreservingMethod |
 | StrBuilderTest.java:148:14:155:21 | appendNull(...) : StrBuilder | StrBuilderTest.java:148:14:157:29 | appendSeparator(...) : StrBuilder | provenance | ValuePreservingMethod |
 | StrBuilderTest.java:148:14:155:21 | appendNull(...) : StrBuilder | StrBuilderTest.java:148:14:158:52 | appendWithSeparators(...) : StrBuilder | provenance | ValuePreservingMethod |
@@ -1478,7 +1452,7 @@ edges
 | StrBuilderTest.java:148:14:155:21 | appendNull(...) : StrBuilder | StrBuilderTest.java:148:14:172:34 | setNewLineText(...) : StrBuilder | provenance | ValuePreservingMethod |
 | StrBuilderTest.java:148:14:155:21 | appendNull(...) : StrBuilder | StrBuilderTest.java:148:14:173:28 | setNullText(...) : StrBuilder | provenance | ValuePreservingMethod |
 | StrBuilderTest.java:148:14:155:21 | appendNull(...) : StrBuilder | StrBuilderTest.java:148:14:174:15 | trim(...) | provenance | ValuePreservingMethod |
-| StrBuilderTest.java:148:14:156:30 | appendPadding(...) : StrBuilder | StrBuilderTest.java:148:14:157:29 | appendSeparator(...) : StrBuilder | provenance | MaD:255 |
+| StrBuilderTest.java:148:14:156:30 | appendPadding(...) : StrBuilder | StrBuilderTest.java:148:14:157:29 | appendSeparator(...) : StrBuilder | provenance | MaD:66 |
 | StrBuilderTest.java:148:14:156:30 | appendPadding(...) : StrBuilder | StrBuilderTest.java:148:14:157:29 | appendSeparator(...) : StrBuilder | provenance | ValuePreservingMethod |
 | StrBuilderTest.java:148:14:156:30 | appendPadding(...) : StrBuilder | StrBuilderTest.java:148:14:158:52 | appendWithSeparators(...) : StrBuilder | provenance | ValuePreservingMethod |
 | StrBuilderTest.java:148:14:156:30 | appendPadding(...) : StrBuilder | StrBuilderTest.java:148:14:159:21 | delete(...) : StrBuilder | provenance | ValuePreservingMethod |
@@ -1497,7 +1471,7 @@ edges
 | StrBuilderTest.java:148:14:156:30 | appendPadding(...) : StrBuilder | StrBuilderTest.java:148:14:172:34 | setNewLineText(...) : StrBuilder | provenance | ValuePreservingMethod |
 | StrBuilderTest.java:148:14:156:30 | appendPadding(...) : StrBuilder | StrBuilderTest.java:148:14:173:28 | setNullText(...) : StrBuilder | provenance | ValuePreservingMethod |
 | StrBuilderTest.java:148:14:156:30 | appendPadding(...) : StrBuilder | StrBuilderTest.java:148:14:174:15 | trim(...) | provenance | ValuePreservingMethod |
-| StrBuilderTest.java:148:14:157:29 | appendSeparator(...) : StrBuilder | StrBuilderTest.java:148:14:158:52 | appendWithSeparators(...) : StrBuilder | provenance | MaD:260 |
+| StrBuilderTest.java:148:14:157:29 | appendSeparator(...) : StrBuilder | StrBuilderTest.java:148:14:158:52 | appendWithSeparators(...) : StrBuilder | provenance | MaD:72 |
 | StrBuilderTest.java:148:14:157:29 | appendSeparator(...) : StrBuilder | StrBuilderTest.java:148:14:158:52 | appendWithSeparators(...) : StrBuilder | provenance | ValuePreservingMethod |
 | StrBuilderTest.java:148:14:157:29 | appendSeparator(...) : StrBuilder | StrBuilderTest.java:148:14:159:21 | delete(...) : StrBuilder | provenance | ValuePreservingMethod |
 | StrBuilderTest.java:148:14:157:29 | appendSeparator(...) : StrBuilder | StrBuilderTest.java:148:14:160:23 | deleteAll(...) : StrBuilder | provenance | ValuePreservingMethod |
@@ -1515,7 +1489,7 @@ edges
 | StrBuilderTest.java:148:14:157:29 | appendSeparator(...) : StrBuilder | StrBuilderTest.java:148:14:172:34 | setNewLineText(...) : StrBuilder | provenance | ValuePreservingMethod |
 | StrBuilderTest.java:148:14:157:29 | appendSeparator(...) : StrBuilder | StrBuilderTest.java:148:14:173:28 | setNullText(...) : StrBuilder | provenance | ValuePreservingMethod |
 | StrBuilderTest.java:148:14:157:29 | appendSeparator(...) : StrBuilder | StrBuilderTest.java:148:14:174:15 | trim(...) | provenance | ValuePreservingMethod |
-| StrBuilderTest.java:148:14:158:52 | appendWithSeparators(...) : StrBuilder | StrBuilderTest.java:148:14:159:21 | delete(...) : StrBuilder | provenance | MaD:281 |
+| StrBuilderTest.java:148:14:158:52 | appendWithSeparators(...) : StrBuilder | StrBuilderTest.java:148:14:159:21 | delete(...) : StrBuilder | provenance | MaD:89 |
 | StrBuilderTest.java:148:14:158:52 | appendWithSeparators(...) : StrBuilder | StrBuilderTest.java:148:14:159:21 | delete(...) : StrBuilder | provenance | ValuePreservingMethod |
 | StrBuilderTest.java:148:14:158:52 | appendWithSeparators(...) : StrBuilder | StrBuilderTest.java:148:14:160:23 | deleteAll(...) : StrBuilder | provenance | ValuePreservingMethod |
 | StrBuilderTest.java:148:14:158:52 | appendWithSeparators(...) : StrBuilder | StrBuilderTest.java:148:14:161:24 | deleteCharAt(...) : StrBuilder | provenance | ValuePreservingMethod |
@@ -1532,7 +1506,7 @@ edges
 | StrBuilderTest.java:148:14:158:52 | appendWithSeparators(...) : StrBuilder | StrBuilderTest.java:148:14:172:34 | setNewLineText(...) : StrBuilder | provenance | ValuePreservingMethod |
 | StrBuilderTest.java:148:14:158:52 | appendWithSeparators(...) : StrBuilder | StrBuilderTest.java:148:14:173:28 | setNullText(...) : StrBuilder | provenance | ValuePreservingMethod |
 | StrBuilderTest.java:148:14:158:52 | appendWithSeparators(...) : StrBuilder | StrBuilderTest.java:148:14:174:15 | trim(...) | provenance | ValuePreservingMethod |
-| StrBuilderTest.java:148:14:159:21 | delete(...) : StrBuilder | StrBuilderTest.java:148:14:160:23 | deleteAll(...) : StrBuilder | provenance | MaD:282 |
+| StrBuilderTest.java:148:14:159:21 | delete(...) : StrBuilder | StrBuilderTest.java:148:14:160:23 | deleteAll(...) : StrBuilder | provenance | MaD:90 |
 | StrBuilderTest.java:148:14:159:21 | delete(...) : StrBuilder | StrBuilderTest.java:148:14:160:23 | deleteAll(...) : StrBuilder | provenance | ValuePreservingMethod |
 | StrBuilderTest.java:148:14:159:21 | delete(...) : StrBuilder | StrBuilderTest.java:148:14:161:24 | deleteCharAt(...) : StrBuilder | provenance | ValuePreservingMethod |
 | StrBuilderTest.java:148:14:159:21 | delete(...) : StrBuilder | StrBuilderTest.java:148:14:162:29 | deleteFirst(...) : StrBuilder | provenance | ValuePreservingMethod |
@@ -1548,7 +1522,7 @@ edges
 | StrBuilderTest.java:148:14:159:21 | delete(...) : StrBuilder | StrBuilderTest.java:148:14:172:34 | setNewLineText(...) : StrBuilder | provenance | ValuePreservingMethod |
 | StrBuilderTest.java:148:14:159:21 | delete(...) : StrBuilder | StrBuilderTest.java:148:14:173:28 | setNullText(...) : StrBuilder | provenance | ValuePreservingMethod |
 | StrBuilderTest.java:148:14:159:21 | delete(...) : StrBuilder | StrBuilderTest.java:148:14:174:15 | trim(...) | provenance | ValuePreservingMethod |
-| StrBuilderTest.java:148:14:160:23 | deleteAll(...) : StrBuilder | StrBuilderTest.java:148:14:161:24 | deleteCharAt(...) : StrBuilder | provenance | MaD:283 |
+| StrBuilderTest.java:148:14:160:23 | deleteAll(...) : StrBuilder | StrBuilderTest.java:148:14:161:24 | deleteCharAt(...) : StrBuilder | provenance | MaD:91 |
 | StrBuilderTest.java:148:14:160:23 | deleteAll(...) : StrBuilder | StrBuilderTest.java:148:14:161:24 | deleteCharAt(...) : StrBuilder | provenance | ValuePreservingMethod |
 | StrBuilderTest.java:148:14:160:23 | deleteAll(...) : StrBuilder | StrBuilderTest.java:148:14:162:29 | deleteFirst(...) : StrBuilder | provenance | ValuePreservingMethod |
 | StrBuilderTest.java:148:14:160:23 | deleteAll(...) : StrBuilder | StrBuilderTest.java:148:14:163:28 | ensureCapacity(...) : StrBuilder | provenance | ValuePreservingMethod |
@@ -1563,7 +1537,7 @@ edges
 | StrBuilderTest.java:148:14:160:23 | deleteAll(...) : StrBuilder | StrBuilderTest.java:148:14:172:34 | setNewLineText(...) : StrBuilder | provenance | ValuePreservingMethod |
 | StrBuilderTest.java:148:14:160:23 | deleteAll(...) : StrBuilder | StrBuilderTest.java:148:14:173:28 | setNullText(...) : StrBuilder | provenance | ValuePreservingMethod |
 | StrBuilderTest.java:148:14:160:23 | deleteAll(...) : StrBuilder | StrBuilderTest.java:148:14:174:15 | trim(...) | provenance | ValuePreservingMethod |
-| StrBuilderTest.java:148:14:161:24 | deleteCharAt(...) : StrBuilder | StrBuilderTest.java:148:14:162:29 | deleteFirst(...) : StrBuilder | provenance | MaD:284 |
+| StrBuilderTest.java:148:14:161:24 | deleteCharAt(...) : StrBuilder | StrBuilderTest.java:148:14:162:29 | deleteFirst(...) : StrBuilder | provenance | MaD:92 |
 | StrBuilderTest.java:148:14:161:24 | deleteCharAt(...) : StrBuilder | StrBuilderTest.java:148:14:162:29 | deleteFirst(...) : StrBuilder | provenance | ValuePreservingMethod |
 | StrBuilderTest.java:148:14:161:24 | deleteCharAt(...) : StrBuilder | StrBuilderTest.java:148:14:163:28 | ensureCapacity(...) : StrBuilder | provenance | ValuePreservingMethod |
 | StrBuilderTest.java:148:14:161:24 | deleteCharAt(...) : StrBuilder | StrBuilderTest.java:148:14:164:30 | insert(...) : StrBuilder | provenance | ValuePreservingMethod |
@@ -1577,7 +1551,7 @@ edges
 | StrBuilderTest.java:148:14:161:24 | deleteCharAt(...) : StrBuilder | StrBuilderTest.java:148:14:172:34 | setNewLineText(...) : StrBuilder | provenance | ValuePreservingMethod |
 | StrBuilderTest.java:148:14:161:24 | deleteCharAt(...) : StrBuilder | StrBuilderTest.java:148:14:173:28 | setNullText(...) : StrBuilder | provenance | ValuePreservingMethod |
 | StrBuilderTest.java:148:14:161:24 | deleteCharAt(...) : StrBuilder | StrBuilderTest.java:148:14:174:15 | trim(...) | provenance | ValuePreservingMethod |
-| StrBuilderTest.java:148:14:162:29 | deleteFirst(...) : StrBuilder | StrBuilderTest.java:148:14:163:28 | ensureCapacity(...) : StrBuilder | provenance | MaD:285 |
+| StrBuilderTest.java:148:14:162:29 | deleteFirst(...) : StrBuilder | StrBuilderTest.java:148:14:163:28 | ensureCapacity(...) : StrBuilder | provenance | MaD:93 |
 | StrBuilderTest.java:148:14:162:29 | deleteFirst(...) : StrBuilder | StrBuilderTest.java:148:14:163:28 | ensureCapacity(...) : StrBuilder | provenance | ValuePreservingMethod |
 | StrBuilderTest.java:148:14:162:29 | deleteFirst(...) : StrBuilder | StrBuilderTest.java:148:14:164:30 | insert(...) : StrBuilder | provenance | ValuePreservingMethod |
 | StrBuilderTest.java:148:14:162:29 | deleteFirst(...) : StrBuilder | StrBuilderTest.java:148:14:165:27 | minimizeCapacity(...) : StrBuilder | provenance | ValuePreservingMethod |
@@ -1590,7 +1564,7 @@ edges
 | StrBuilderTest.java:148:14:162:29 | deleteFirst(...) : StrBuilder | StrBuilderTest.java:148:14:172:34 | setNewLineText(...) : StrBuilder | provenance | ValuePreservingMethod |
 | StrBuilderTest.java:148:14:162:29 | deleteFirst(...) : StrBuilder | StrBuilderTest.java:148:14:173:28 | setNullText(...) : StrBuilder | provenance | ValuePreservingMethod |
 | StrBuilderTest.java:148:14:162:29 | deleteFirst(...) : StrBuilder | StrBuilderTest.java:148:14:174:15 | trim(...) | provenance | ValuePreservingMethod |
-| StrBuilderTest.java:148:14:163:28 | ensureCapacity(...) : StrBuilder | StrBuilderTest.java:148:14:164:30 | insert(...) : StrBuilder | provenance | MaD:289 |
+| StrBuilderTest.java:148:14:163:28 | ensureCapacity(...) : StrBuilder | StrBuilderTest.java:148:14:164:30 | insert(...) : StrBuilder | provenance | MaD:98 |
 | StrBuilderTest.java:148:14:163:28 | ensureCapacity(...) : StrBuilder | StrBuilderTest.java:148:14:164:30 | insert(...) : StrBuilder | provenance | ValuePreservingMethod |
 | StrBuilderTest.java:148:14:163:28 | ensureCapacity(...) : StrBuilder | StrBuilderTest.java:148:14:165:27 | minimizeCapacity(...) : StrBuilder | provenance | ValuePreservingMethod |
 | StrBuilderTest.java:148:14:163:28 | ensureCapacity(...) : StrBuilder | StrBuilderTest.java:148:14:166:37 | replace(...) : StrBuilder | provenance | ValuePreservingMethod |
@@ -1602,7 +1576,7 @@ edges
 | StrBuilderTest.java:148:14:163:28 | ensureCapacity(...) : StrBuilder | StrBuilderTest.java:148:14:172:34 | setNewLineText(...) : StrBuilder | provenance | ValuePreservingMethod |
 | StrBuilderTest.java:148:14:163:28 | ensureCapacity(...) : StrBuilder | StrBuilderTest.java:148:14:173:28 | setNullText(...) : StrBuilder | provenance | ValuePreservingMethod |
 | StrBuilderTest.java:148:14:163:28 | ensureCapacity(...) : StrBuilder | StrBuilderTest.java:148:14:174:15 | trim(...) | provenance | ValuePreservingMethod |
-| StrBuilderTest.java:148:14:164:30 | insert(...) : StrBuilder | StrBuilderTest.java:148:14:165:27 | minimizeCapacity(...) : StrBuilder | provenance | MaD:293 |
+| StrBuilderTest.java:148:14:164:30 | insert(...) : StrBuilder | StrBuilderTest.java:148:14:165:27 | minimizeCapacity(...) : StrBuilder | provenance | MaD:101 |
 | StrBuilderTest.java:148:14:164:30 | insert(...) : StrBuilder | StrBuilderTest.java:148:14:165:27 | minimizeCapacity(...) : StrBuilder | provenance | ValuePreservingMethod |
 | StrBuilderTest.java:148:14:164:30 | insert(...) : StrBuilder | StrBuilderTest.java:148:14:166:37 | replace(...) : StrBuilder | provenance | ValuePreservingMethod |
 | StrBuilderTest.java:148:14:164:30 | insert(...) : StrBuilder | StrBuilderTest.java:148:14:167:38 | replaceAll(...) : StrBuilder | provenance | ValuePreservingMethod |
@@ -1613,7 +1587,7 @@ edges
 | StrBuilderTest.java:148:14:164:30 | insert(...) : StrBuilder | StrBuilderTest.java:148:14:172:34 | setNewLineText(...) : StrBuilder | provenance | ValuePreservingMethod |
 | StrBuilderTest.java:148:14:164:30 | insert(...) : StrBuilder | StrBuilderTest.java:148:14:173:28 | setNullText(...) : StrBuilder | provenance | ValuePreservingMethod |
 | StrBuilderTest.java:148:14:164:30 | insert(...) : StrBuilder | StrBuilderTest.java:148:14:174:15 | trim(...) | provenance | ValuePreservingMethod |
-| StrBuilderTest.java:148:14:165:27 | minimizeCapacity(...) : StrBuilder | StrBuilderTest.java:148:14:166:37 | replace(...) : StrBuilder | provenance | MaD:295 |
+| StrBuilderTest.java:148:14:165:27 | minimizeCapacity(...) : StrBuilder | StrBuilderTest.java:148:14:166:37 | replace(...) : StrBuilder | provenance | MaD:105 |
 | StrBuilderTest.java:148:14:165:27 | minimizeCapacity(...) : StrBuilder | StrBuilderTest.java:148:14:166:37 | replace(...) : StrBuilder | provenance | ValuePreservingMethod |
 | StrBuilderTest.java:148:14:165:27 | minimizeCapacity(...) : StrBuilder | StrBuilderTest.java:148:14:167:38 | replaceAll(...) : StrBuilder | provenance | ValuePreservingMethod |
 | StrBuilderTest.java:148:14:165:27 | minimizeCapacity(...) : StrBuilder | StrBuilderTest.java:148:14:168:40 | replaceFirst(...) : StrBuilder | provenance | ValuePreservingMethod |
@@ -1623,7 +1597,7 @@ edges
 | StrBuilderTest.java:148:14:165:27 | minimizeCapacity(...) : StrBuilder | StrBuilderTest.java:148:14:172:34 | setNewLineText(...) : StrBuilder | provenance | ValuePreservingMethod |
 | StrBuilderTest.java:148:14:165:27 | minimizeCapacity(...) : StrBuilder | StrBuilderTest.java:148:14:173:28 | setNullText(...) : StrBuilder | provenance | ValuePreservingMethod |
 | StrBuilderTest.java:148:14:165:27 | minimizeCapacity(...) : StrBuilder | StrBuilderTest.java:148:14:174:15 | trim(...) | provenance | ValuePreservingMethod |
-| StrBuilderTest.java:148:14:166:37 | replace(...) : StrBuilder | StrBuilderTest.java:148:14:167:38 | replaceAll(...) : StrBuilder | provenance | MaD:298 |
+| StrBuilderTest.java:148:14:166:37 | replace(...) : StrBuilder | StrBuilderTest.java:148:14:167:38 | replaceAll(...) : StrBuilder | provenance | MaD:107 |
 | StrBuilderTest.java:148:14:166:37 | replace(...) : StrBuilder | StrBuilderTest.java:148:14:167:38 | replaceAll(...) : StrBuilder | provenance | ValuePreservingMethod |
 | StrBuilderTest.java:148:14:166:37 | replace(...) : StrBuilder | StrBuilderTest.java:148:14:168:40 | replaceFirst(...) : StrBuilder | provenance | ValuePreservingMethod |
 | StrBuilderTest.java:148:14:166:37 | replace(...) : StrBuilder | StrBuilderTest.java:148:14:169:18 | reverse(...) : StrBuilder | provenance | ValuePreservingMethod |
@@ -1632,7 +1606,7 @@ edges
 | StrBuilderTest.java:148:14:166:37 | replace(...) : StrBuilder | StrBuilderTest.java:148:14:172:34 | setNewLineText(...) : StrBuilder | provenance | ValuePreservingMethod |
 | StrBuilderTest.java:148:14:166:37 | replace(...) : StrBuilder | StrBuilderTest.java:148:14:173:28 | setNullText(...) : StrBuilder | provenance | ValuePreservingMethod |
 | StrBuilderTest.java:148:14:166:37 | replace(...) : StrBuilder | StrBuilderTest.java:148:14:174:15 | trim(...) | provenance | ValuePreservingMethod |
-| StrBuilderTest.java:148:14:167:38 | replaceAll(...) : StrBuilder | StrBuilderTest.java:148:14:168:40 | replaceFirst(...) : StrBuilder | provenance | MaD:300 |
+| StrBuilderTest.java:148:14:167:38 | replaceAll(...) : StrBuilder | StrBuilderTest.java:148:14:168:40 | replaceFirst(...) : StrBuilder | provenance | MaD:109 |
 | StrBuilderTest.java:148:14:167:38 | replaceAll(...) : StrBuilder | StrBuilderTest.java:148:14:168:40 | replaceFirst(...) : StrBuilder | provenance | ValuePreservingMethod |
 | StrBuilderTest.java:148:14:167:38 | replaceAll(...) : StrBuilder | StrBuilderTest.java:148:14:169:18 | reverse(...) : StrBuilder | provenance | ValuePreservingMethod |
 | StrBuilderTest.java:148:14:167:38 | replaceAll(...) : StrBuilder | StrBuilderTest.java:148:14:170:26 | setCharAt(...) : StrBuilder | provenance | ValuePreservingMethod |
@@ -1640,119 +1614,119 @@ edges
 | StrBuilderTest.java:148:14:167:38 | replaceAll(...) : StrBuilder | StrBuilderTest.java:148:14:172:34 | setNewLineText(...) : StrBuilder | provenance | ValuePreservingMethod |
 | StrBuilderTest.java:148:14:167:38 | replaceAll(...) : StrBuilder | StrBuilderTest.java:148:14:173:28 | setNullText(...) : StrBuilder | provenance | ValuePreservingMethod |
 | StrBuilderTest.java:148:14:167:38 | replaceAll(...) : StrBuilder | StrBuilderTest.java:148:14:174:15 | trim(...) | provenance | ValuePreservingMethod |
-| StrBuilderTest.java:148:14:168:40 | replaceFirst(...) : StrBuilder | StrBuilderTest.java:148:14:169:18 | reverse(...) : StrBuilder | provenance | MaD:302 |
+| StrBuilderTest.java:148:14:168:40 | replaceFirst(...) : StrBuilder | StrBuilderTest.java:148:14:169:18 | reverse(...) : StrBuilder | provenance | MaD:110 |
 | StrBuilderTest.java:148:14:168:40 | replaceFirst(...) : StrBuilder | StrBuilderTest.java:148:14:169:18 | reverse(...) : StrBuilder | provenance | ValuePreservingMethod |
 | StrBuilderTest.java:148:14:168:40 | replaceFirst(...) : StrBuilder | StrBuilderTest.java:148:14:170:26 | setCharAt(...) : StrBuilder | provenance | ValuePreservingMethod |
 | StrBuilderTest.java:148:14:168:40 | replaceFirst(...) : StrBuilder | StrBuilderTest.java:148:14:171:23 | setLength(...) : StrBuilder | provenance | ValuePreservingMethod |
 | StrBuilderTest.java:148:14:168:40 | replaceFirst(...) : StrBuilder | StrBuilderTest.java:148:14:172:34 | setNewLineText(...) : StrBuilder | provenance | ValuePreservingMethod |
 | StrBuilderTest.java:148:14:168:40 | replaceFirst(...) : StrBuilder | StrBuilderTest.java:148:14:173:28 | setNullText(...) : StrBuilder | provenance | ValuePreservingMethod |
 | StrBuilderTest.java:148:14:168:40 | replaceFirst(...) : StrBuilder | StrBuilderTest.java:148:14:174:15 | trim(...) | provenance | ValuePreservingMethod |
-| StrBuilderTest.java:148:14:169:18 | reverse(...) : StrBuilder | StrBuilderTest.java:148:14:170:26 | setCharAt(...) : StrBuilder | provenance | MaD:304 |
+| StrBuilderTest.java:148:14:169:18 | reverse(...) : StrBuilder | StrBuilderTest.java:148:14:170:26 | setCharAt(...) : StrBuilder | provenance | MaD:112 |
 | StrBuilderTest.java:148:14:169:18 | reverse(...) : StrBuilder | StrBuilderTest.java:148:14:170:26 | setCharAt(...) : StrBuilder | provenance | ValuePreservingMethod |
 | StrBuilderTest.java:148:14:169:18 | reverse(...) : StrBuilder | StrBuilderTest.java:148:14:171:23 | setLength(...) : StrBuilder | provenance | ValuePreservingMethod |
 | StrBuilderTest.java:148:14:169:18 | reverse(...) : StrBuilder | StrBuilderTest.java:148:14:172:34 | setNewLineText(...) : StrBuilder | provenance | ValuePreservingMethod |
 | StrBuilderTest.java:148:14:169:18 | reverse(...) : StrBuilder | StrBuilderTest.java:148:14:173:28 | setNullText(...) : StrBuilder | provenance | ValuePreservingMethod |
 | StrBuilderTest.java:148:14:169:18 | reverse(...) : StrBuilder | StrBuilderTest.java:148:14:174:15 | trim(...) | provenance | ValuePreservingMethod |
-| StrBuilderTest.java:148:14:170:26 | setCharAt(...) : StrBuilder | StrBuilderTest.java:148:14:171:23 | setLength(...) : StrBuilder | provenance | MaD:305 |
+| StrBuilderTest.java:148:14:170:26 | setCharAt(...) : StrBuilder | StrBuilderTest.java:148:14:171:23 | setLength(...) : StrBuilder | provenance | MaD:113 |
 | StrBuilderTest.java:148:14:170:26 | setCharAt(...) : StrBuilder | StrBuilderTest.java:148:14:171:23 | setLength(...) : StrBuilder | provenance | ValuePreservingMethod |
 | StrBuilderTest.java:148:14:170:26 | setCharAt(...) : StrBuilder | StrBuilderTest.java:148:14:172:34 | setNewLineText(...) : StrBuilder | provenance | ValuePreservingMethod |
 | StrBuilderTest.java:148:14:170:26 | setCharAt(...) : StrBuilder | StrBuilderTest.java:148:14:173:28 | setNullText(...) : StrBuilder | provenance | ValuePreservingMethod |
 | StrBuilderTest.java:148:14:170:26 | setCharAt(...) : StrBuilder | StrBuilderTest.java:148:14:174:15 | trim(...) | provenance | ValuePreservingMethod |
-| StrBuilderTest.java:148:14:171:23 | setLength(...) : StrBuilder | StrBuilderTest.java:148:14:172:34 | setNewLineText(...) : StrBuilder | provenance | MaD:306 |
+| StrBuilderTest.java:148:14:171:23 | setLength(...) : StrBuilder | StrBuilderTest.java:148:14:172:34 | setNewLineText(...) : StrBuilder | provenance | MaD:114 |
 | StrBuilderTest.java:148:14:171:23 | setLength(...) : StrBuilder | StrBuilderTest.java:148:14:172:34 | setNewLineText(...) : StrBuilder | provenance | ValuePreservingMethod |
 | StrBuilderTest.java:148:14:171:23 | setLength(...) : StrBuilder | StrBuilderTest.java:148:14:173:28 | setNullText(...) : StrBuilder | provenance | ValuePreservingMethod |
 | StrBuilderTest.java:148:14:171:23 | setLength(...) : StrBuilder | StrBuilderTest.java:148:14:174:15 | trim(...) | provenance | ValuePreservingMethod |
-| StrBuilderTest.java:148:14:172:34 | setNewLineText(...) : StrBuilder | StrBuilderTest.java:148:14:173:28 | setNullText(...) : StrBuilder | provenance | MaD:307 |
+| StrBuilderTest.java:148:14:172:34 | setNewLineText(...) : StrBuilder | StrBuilderTest.java:148:14:173:28 | setNullText(...) : StrBuilder | provenance | MaD:115 |
 | StrBuilderTest.java:148:14:172:34 | setNewLineText(...) : StrBuilder | StrBuilderTest.java:148:14:173:28 | setNullText(...) : StrBuilder | provenance | ValuePreservingMethod |
 | StrBuilderTest.java:148:14:172:34 | setNewLineText(...) : StrBuilder | StrBuilderTest.java:148:14:174:15 | trim(...) | provenance | ValuePreservingMethod |
-| StrBuilderTest.java:148:14:173:28 | setNullText(...) : StrBuilder | StrBuilderTest.java:148:14:174:15 | trim(...) | provenance | MaD:314 |
+| StrBuilderTest.java:148:14:173:28 | setNullText(...) : StrBuilder | StrBuilderTest.java:148:14:174:15 | trim(...) | provenance | MaD:122 |
 | StrBuilderTest.java:148:14:173:28 | setNullText(...) : StrBuilder | StrBuilderTest.java:148:14:174:15 | trim(...) | provenance | ValuePreservingMethod |
-| StrBuilderTest.java:178:9:204:15 | trim(...) [post update] : StrBuilder | StrBuilderTest.java:206:14:206:34 | fluentAllMethodsTest2 | provenance | MaD:314 |
+| StrBuilderTest.java:178:9:204:15 | trim(...) [post update] : StrBuilder | StrBuilderTest.java:206:14:206:34 | fluentAllMethodsTest2 | provenance | MaD:122 |
 | StrBuilderTest.java:178:9:204:15 | trim(...) [post update] : StrBuilder | StrBuilderTest.java:206:14:206:34 | fluentAllMethodsTest2 | provenance | ValuePreservingMethod |
-| StrBuilderTest.java:205:17:205:23 | taint(...) : String | StrBuilderTest.java:178:9:204:15 | trim(...) [post update] : StrBuilder | provenance | MaD:233 |
+| StrBuilderTest.java:205:17:205:23 | taint(...) : String | StrBuilderTest.java:178:9:204:15 | trim(...) [post update] : StrBuilder | provenance | MaD:40 |
 | StrBuilderTextTest.java:17:28:17:50 | new StrBuilder(...) : StrBuilder | StrBuilderTextTest.java:17:58:17:62 | cons1 : StrBuilder | provenance |  |
 | StrBuilderTextTest.java:17:43:17:49 | taint(...) : String | StrBuilderTextTest.java:17:28:17:50 | new StrBuilder(...) : StrBuilder | provenance | MaD:418 |
 | StrBuilderTextTest.java:17:58:17:62 | cons1 : StrBuilder | StrBuilderTextTest.java:17:58:17:73 | toString(...) | provenance | MaD:5 |
 | StrBuilderTextTest.java:17:58:17:62 | cons1 : StrBuilder | StrBuilderTextTest.java:17:58:17:73 | toString(...) | provenance | MaD:503 |
 | StrBuilderTextTest.java:19:44:19:46 | sb1 [post update] : StrBuilder | StrBuilderTextTest.java:19:84:19:86 | sb1 : StrBuilder | provenance |  |
 | StrBuilderTextTest.java:19:55:19:61 | taint(...) : String | StrBuilderTextTest.java:19:55:19:75 | toCharArray(...) : char[] | provenance | MaD:7 |
-| StrBuilderTextTest.java:19:55:19:75 | toCharArray(...) : char[] | StrBuilderTextTest.java:19:44:19:46 | sb1 [post update] : StrBuilder | provenance | MaD:420 |
+| StrBuilderTextTest.java:19:55:19:75 | toCharArray(...) : char[] | StrBuilderTextTest.java:19:44:19:46 | sb1 [post update] : StrBuilder | provenance | MaD:419 |
 | StrBuilderTextTest.java:19:84:19:86 | sb1 : StrBuilder | StrBuilderTextTest.java:19:84:19:97 | toString(...) | provenance | MaD:5 |
 | StrBuilderTextTest.java:19:84:19:86 | sb1 : StrBuilder | StrBuilderTextTest.java:19:84:19:97 | toString(...) | provenance | MaD:503 |
 | StrBuilderTextTest.java:20:44:20:46 | sb2 [post update] : StrBuilder | StrBuilderTextTest.java:20:90:20:92 | sb2 : StrBuilder | provenance |  |
 | StrBuilderTextTest.java:20:55:20:61 | taint(...) : String | StrBuilderTextTest.java:20:55:20:75 | toCharArray(...) : char[] | provenance | MaD:7 |
-| StrBuilderTextTest.java:20:55:20:75 | toCharArray(...) : char[] | StrBuilderTextTest.java:20:44:20:46 | sb2 [post update] : StrBuilder | provenance | MaD:421 |
+| StrBuilderTextTest.java:20:55:20:75 | toCharArray(...) : char[] | StrBuilderTextTest.java:20:44:20:46 | sb2 [post update] : StrBuilder | provenance | MaD:420 |
 | StrBuilderTextTest.java:20:90:20:92 | sb2 : StrBuilder | StrBuilderTextTest.java:20:90:20:103 | toString(...) | provenance | MaD:5 |
 | StrBuilderTextTest.java:20:90:20:92 | sb2 : StrBuilder | StrBuilderTextTest.java:20:90:20:103 | toString(...) | provenance | MaD:503 |
 | StrBuilderTextTest.java:21:44:21:46 | sb3 [post update] : StrBuilder | StrBuilderTextTest.java:21:101:21:103 | sb3 : StrBuilder | provenance |  |
-| StrBuilderTextTest.java:21:55:21:92 | wrap(...) : CharBuffer | StrBuilderTextTest.java:21:44:21:46 | sb3 [post update] : StrBuilder | provenance | MaD:433 |
+| StrBuilderTextTest.java:21:55:21:92 | wrap(...) : CharBuffer | StrBuilderTextTest.java:21:44:21:46 | sb3 [post update] : StrBuilder | provenance | MaD:432 |
 | StrBuilderTextTest.java:21:71:21:77 | taint(...) : String | StrBuilderTextTest.java:21:71:21:91 | toCharArray(...) : char[] | provenance | MaD:7 |
 | StrBuilderTextTest.java:21:71:21:91 | toCharArray(...) : char[] | StrBuilderTextTest.java:21:55:21:92 | wrap(...) : CharBuffer | provenance | MaD:10 |
 | StrBuilderTextTest.java:21:101:21:103 | sb3 : StrBuilder | StrBuilderTextTest.java:21:101:21:114 | toString(...) | provenance | MaD:5 |
 | StrBuilderTextTest.java:21:101:21:103 | sb3 : StrBuilder | StrBuilderTextTest.java:21:101:21:114 | toString(...) | provenance | MaD:503 |
 | StrBuilderTextTest.java:22:44:22:46 | sb4 [post update] : StrBuilder | StrBuilderTextTest.java:22:107:22:109 | sb4 : StrBuilder | provenance |  |
-| StrBuilderTextTest.java:22:55:22:92 | wrap(...) : CharBuffer | StrBuilderTextTest.java:22:44:22:46 | sb4 [post update] : StrBuilder | provenance | MaD:434 |
+| StrBuilderTextTest.java:22:55:22:92 | wrap(...) : CharBuffer | StrBuilderTextTest.java:22:44:22:46 | sb4 [post update] : StrBuilder | provenance | MaD:433 |
 | StrBuilderTextTest.java:22:71:22:77 | taint(...) : String | StrBuilderTextTest.java:22:71:22:91 | toCharArray(...) : char[] | provenance | MaD:7 |
 | StrBuilderTextTest.java:22:71:22:91 | toCharArray(...) : char[] | StrBuilderTextTest.java:22:55:22:92 | wrap(...) : CharBuffer | provenance | MaD:10 |
 | StrBuilderTextTest.java:22:107:22:109 | sb4 : StrBuilder | StrBuilderTextTest.java:22:107:22:120 | toString(...) | provenance | MaD:5 |
 | StrBuilderTextTest.java:22:107:22:109 | sb4 : StrBuilder | StrBuilderTextTest.java:22:107:22:120 | toString(...) | provenance | MaD:503 |
 | StrBuilderTextTest.java:23:44:23:46 | sb5 [post update] : StrBuilder | StrBuilderTextTest.java:23:84:23:86 | sb5 : StrBuilder | provenance |  |
 | StrBuilderTextTest.java:23:55:23:75 | (...)... : String | StrBuilderTextTest.java:23:44:23:46 | sb5 [post update] : StrBuilder | provenance | MaD:3 |
-| StrBuilderTextTest.java:23:55:23:75 | (...)... : String | StrBuilderTextTest.java:23:44:23:46 | sb5 [post update] : StrBuilder | provenance | MaD:422 |
+| StrBuilderTextTest.java:23:55:23:75 | (...)... : String | StrBuilderTextTest.java:23:44:23:46 | sb5 [post update] : StrBuilder | provenance | MaD:421 |
 | StrBuilderTextTest.java:23:69:23:75 | taint(...) : String | StrBuilderTextTest.java:23:55:23:75 | (...)... : String | provenance |  |
 | StrBuilderTextTest.java:23:84:23:86 | sb5 : StrBuilder | StrBuilderTextTest.java:23:84:23:97 | toString(...) | provenance | MaD:5 |
 | StrBuilderTextTest.java:23:84:23:86 | sb5 : StrBuilder | StrBuilderTextTest.java:23:84:23:97 | toString(...) | provenance | MaD:503 |
 | StrBuilderTextTest.java:24:44:24:46 | sb6 [post update] : StrBuilder | StrBuilderTextTest.java:24:90:24:92 | sb6 : StrBuilder | provenance |  |
 | StrBuilderTextTest.java:24:55:24:75 | (...)... : String | StrBuilderTextTest.java:24:44:24:46 | sb6 [post update] : StrBuilder | provenance | MaD:3 |
-| StrBuilderTextTest.java:24:55:24:75 | (...)... : String | StrBuilderTextTest.java:24:44:24:46 | sb6 [post update] : StrBuilder | provenance | MaD:423 |
+| StrBuilderTextTest.java:24:55:24:75 | (...)... : String | StrBuilderTextTest.java:24:44:24:46 | sb6 [post update] : StrBuilder | provenance | MaD:422 |
 | StrBuilderTextTest.java:24:69:24:75 | taint(...) : String | StrBuilderTextTest.java:24:55:24:75 | (...)... : String | provenance |  |
 | StrBuilderTextTest.java:24:90:24:92 | sb6 : StrBuilder | StrBuilderTextTest.java:24:90:24:103 | toString(...) | provenance | MaD:5 |
 | StrBuilderTextTest.java:24:90:24:92 | sb6 : StrBuilder | StrBuilderTextTest.java:24:90:24:103 | toString(...) | provenance | MaD:503 |
 | StrBuilderTextTest.java:25:44:25:46 | sb7 [post update] : StrBuilder | StrBuilderTextTest.java:25:78:25:80 | sb7 : StrBuilder | provenance |  |
-| StrBuilderTextTest.java:25:55:25:69 | (...)... : String | StrBuilderTextTest.java:25:44:25:46 | sb7 [post update] : StrBuilder | provenance | MaD:424 |
+| StrBuilderTextTest.java:25:55:25:69 | (...)... : String | StrBuilderTextTest.java:25:44:25:46 | sb7 [post update] : StrBuilder | provenance | MaD:423 |
 | StrBuilderTextTest.java:25:63:25:69 | taint(...) : String | StrBuilderTextTest.java:25:55:25:69 | (...)... : String | provenance |  |
 | StrBuilderTextTest.java:25:78:25:80 | sb7 : StrBuilder | StrBuilderTextTest.java:25:78:25:91 | toString(...) | provenance | MaD:5 |
 | StrBuilderTextTest.java:25:78:25:80 | sb7 : StrBuilder | StrBuilderTextTest.java:25:78:25:91 | toString(...) | provenance | MaD:503 |
 | StrBuilderTextTest.java:27:50:27:54 | auxsb [post update] : StrBuilder | StrBuilderTextTest.java:28:59:28:63 | auxsb : StrBuilder | provenance |  |
-| StrBuilderTextTest.java:27:63:27:69 | taint(...) : String | StrBuilderTextTest.java:27:50:27:54 | auxsb [post update] : StrBuilder | provenance | MaD:425 |
+| StrBuilderTextTest.java:27:63:27:69 | taint(...) : String | StrBuilderTextTest.java:27:50:27:54 | auxsb [post update] : StrBuilder | provenance | MaD:424 |
 | StrBuilderTextTest.java:28:48:28:50 | sb8 [post update] : StrBuilder | StrBuilderTextTest.java:28:72:28:74 | sb8 : StrBuilder | provenance |  |
-| StrBuilderTextTest.java:28:59:28:63 | auxsb : StrBuilder | StrBuilderTextTest.java:28:48:28:50 | sb8 [post update] : StrBuilder | provenance | MaD:435 |
+| StrBuilderTextTest.java:28:59:28:63 | auxsb : StrBuilder | StrBuilderTextTest.java:28:48:28:50 | sb8 [post update] : StrBuilder | provenance | MaD:434 |
 | StrBuilderTextTest.java:28:72:28:74 | sb8 : StrBuilder | StrBuilderTextTest.java:28:72:28:85 | toString(...) | provenance | MaD:5 |
 | StrBuilderTextTest.java:28:72:28:74 | sb8 : StrBuilder | StrBuilderTextTest.java:28:72:28:85 | toString(...) | provenance | MaD:503 |
 | StrBuilderTextTest.java:30:44:30:46 | sb9 [post update] : StrBuilder | StrBuilderTextTest.java:30:88:30:90 | sb9 : StrBuilder | provenance |  |
-| StrBuilderTextTest.java:30:55:30:79 | new StringBuffer(...) : StringBuffer | StrBuilderTextTest.java:30:44:30:46 | sb9 [post update] : StrBuilder | provenance | MaD:429 |
+| StrBuilderTextTest.java:30:55:30:79 | new StringBuffer(...) : StringBuffer | StrBuilderTextTest.java:30:44:30:46 | sb9 [post update] : StrBuilder | provenance | MaD:428 |
 | StrBuilderTextTest.java:30:72:30:78 | taint(...) : String | StrBuilderTextTest.java:30:55:30:79 | new StringBuffer(...) : StringBuffer | provenance | MaD:8 |
 | StrBuilderTextTest.java:30:88:30:90 | sb9 : StrBuilder | StrBuilderTextTest.java:30:88:30:101 | toString(...) | provenance | MaD:5 |
 | StrBuilderTextTest.java:30:88:30:90 | sb9 : StrBuilder | StrBuilderTextTest.java:30:88:30:101 | toString(...) | provenance | MaD:503 |
 | StrBuilderTextTest.java:31:45:31:48 | sb10 [post update] : StrBuilder | StrBuilderTextTest.java:31:96:31:99 | sb10 : StrBuilder | provenance |  |
-| StrBuilderTextTest.java:31:57:31:81 | new StringBuffer(...) : StringBuffer | StrBuilderTextTest.java:31:45:31:48 | sb10 [post update] : StrBuilder | provenance | MaD:430 |
+| StrBuilderTextTest.java:31:57:31:81 | new StringBuffer(...) : StringBuffer | StrBuilderTextTest.java:31:45:31:48 | sb10 [post update] : StrBuilder | provenance | MaD:429 |
 | StrBuilderTextTest.java:31:74:31:80 | taint(...) : String | StrBuilderTextTest.java:31:57:31:81 | new StringBuffer(...) : StringBuffer | provenance | MaD:8 |
 | StrBuilderTextTest.java:31:96:31:99 | sb10 : StrBuilder | StrBuilderTextTest.java:31:96:31:110 | toString(...) | provenance | MaD:5 |
 | StrBuilderTextTest.java:31:96:31:99 | sb10 : StrBuilder | StrBuilderTextTest.java:31:96:31:110 | toString(...) | provenance | MaD:503 |
 | StrBuilderTextTest.java:32:45:32:48 | sb11 [post update] : StrBuilder | StrBuilderTextTest.java:32:91:32:94 | sb11 : StrBuilder | provenance |  |
-| StrBuilderTextTest.java:32:57:32:82 | new StringBuilder(...) : StringBuilder | StrBuilderTextTest.java:32:45:32:48 | sb11 [post update] : StrBuilder | provenance | MaD:431 |
+| StrBuilderTextTest.java:32:57:32:82 | new StringBuilder(...) : StringBuilder | StrBuilderTextTest.java:32:45:32:48 | sb11 [post update] : StrBuilder | provenance | MaD:430 |
 | StrBuilderTextTest.java:32:75:32:81 | taint(...) : String | StrBuilderTextTest.java:32:57:32:82 | new StringBuilder(...) : StringBuilder | provenance | MaD:9 |
 | StrBuilderTextTest.java:32:91:32:94 | sb11 : StrBuilder | StrBuilderTextTest.java:32:91:32:105 | toString(...) | provenance | MaD:5 |
 | StrBuilderTextTest.java:32:91:32:94 | sb11 : StrBuilder | StrBuilderTextTest.java:32:91:32:105 | toString(...) | provenance | MaD:503 |
 | StrBuilderTextTest.java:33:45:33:48 | sb12 [post update] : StrBuilder | StrBuilderTextTest.java:33:97:33:100 | sb12 : StrBuilder | provenance |  |
-| StrBuilderTextTest.java:33:57:33:82 | new StringBuilder(...) : StringBuilder | StrBuilderTextTest.java:33:45:33:48 | sb12 [post update] : StrBuilder | provenance | MaD:432 |
+| StrBuilderTextTest.java:33:57:33:82 | new StringBuilder(...) : StringBuilder | StrBuilderTextTest.java:33:45:33:48 | sb12 [post update] : StrBuilder | provenance | MaD:431 |
 | StrBuilderTextTest.java:33:75:33:81 | taint(...) : String | StrBuilderTextTest.java:33:57:33:82 | new StringBuilder(...) : StringBuilder | provenance | MaD:9 |
 | StrBuilderTextTest.java:33:97:33:100 | sb12 : StrBuilder | StrBuilderTextTest.java:33:97:33:111 | toString(...) | provenance | MaD:5 |
 | StrBuilderTextTest.java:33:97:33:100 | sb12 : StrBuilder | StrBuilderTextTest.java:33:97:33:111 | toString(...) | provenance | MaD:503 |
 | StrBuilderTextTest.java:34:45:34:48 | sb13 [post update] : StrBuilder | StrBuilderTextTest.java:34:72:34:75 | sb13 : StrBuilder | provenance |  |
-| StrBuilderTextTest.java:34:57:34:63 | taint(...) : String | StrBuilderTextTest.java:34:45:34:48 | sb13 [post update] : StrBuilder | provenance | MaD:425 |
+| StrBuilderTextTest.java:34:57:34:63 | taint(...) : String | StrBuilderTextTest.java:34:45:34:48 | sb13 [post update] : StrBuilder | provenance | MaD:424 |
 | StrBuilderTextTest.java:34:72:34:75 | sb13 : StrBuilder | StrBuilderTextTest.java:34:72:34:86 | toString(...) | provenance | MaD:5 |
 | StrBuilderTextTest.java:34:72:34:75 | sb13 : StrBuilder | StrBuilderTextTest.java:34:72:34:86 | toString(...) | provenance | MaD:503 |
 | StrBuilderTextTest.java:35:45:35:48 | sb14 [post update] : StrBuilder | StrBuilderTextTest.java:35:78:35:81 | sb14 : StrBuilder | provenance |  |
-| StrBuilderTextTest.java:35:57:35:63 | taint(...) : String | StrBuilderTextTest.java:35:45:35:48 | sb14 [post update] : StrBuilder | provenance | MaD:426 |
+| StrBuilderTextTest.java:35:57:35:63 | taint(...) : String | StrBuilderTextTest.java:35:45:35:48 | sb14 [post update] : StrBuilder | provenance | MaD:425 |
 | StrBuilderTextTest.java:35:78:35:81 | sb14 : StrBuilder | StrBuilderTextTest.java:35:78:35:92 | toString(...) | provenance | MaD:5 |
 | StrBuilderTextTest.java:35:78:35:81 | sb14 : StrBuilder | StrBuilderTextTest.java:35:78:35:92 | toString(...) | provenance | MaD:503 |
 | StrBuilderTextTest.java:36:45:36:48 | sb15 [post update] : StrBuilder | StrBuilderTextTest.java:36:90:36:93 | sb15 : StrBuilder | provenance |  |
-| StrBuilderTextTest.java:36:57:36:63 | taint(...) : String | StrBuilderTextTest.java:36:45:36:48 | sb15 [post update] : StrBuilder | provenance | MaD:427 |
+| StrBuilderTextTest.java:36:57:36:63 | taint(...) : String | StrBuilderTextTest.java:36:45:36:48 | sb15 [post update] : StrBuilder | provenance | MaD:426 |
 | StrBuilderTextTest.java:36:90:36:93 | sb15 : StrBuilder | StrBuilderTextTest.java:36:90:36:104 | toString(...) | provenance | MaD:5 |
 | StrBuilderTextTest.java:36:90:36:93 | sb15 : StrBuilder | StrBuilderTextTest.java:36:90:36:104 | toString(...) | provenance | MaD:503 |
 | StrBuilderTextTest.java:37:45:37:48 | sb16 [post update] : StrBuilder | StrBuilderTextTest.java:37:97:37:100 | sb16 : StrBuilder | provenance |  |
-| StrBuilderTextTest.java:37:45:37:89 | new ..[] { .. } : Object[] [[]] : String | StrBuilderTextTest.java:37:45:37:48 | sb16 [post update] : StrBuilder | provenance | MaD:428 |
+| StrBuilderTextTest.java:37:45:37:89 | new ..[] { .. } : Object[] [[]] : String | StrBuilderTextTest.java:37:45:37:48 | sb16 [post update] : StrBuilder | provenance | MaD:427 |
 | StrBuilderTextTest.java:37:74:37:80 | taint(...) : String | StrBuilderTextTest.java:37:45:37:89 | new ..[] { .. } : Object[] [[]] : String | provenance |  |
 | StrBuilderTextTest.java:37:97:37:100 | sb16 : StrBuilder | StrBuilderTextTest.java:37:97:37:111 | toString(...) | provenance | MaD:5 |
 | StrBuilderTextTest.java:37:97:37:100 | sb16 : StrBuilder | StrBuilderTextTest.java:37:97:37:111 | toString(...) | provenance | MaD:503 |
@@ -1760,108 +1734,108 @@ edges
 | StrBuilderTextTest.java:40:13:40:23 | taintedList [post update] : ArrayList [<element>] : String | StrBuilderTextTest.java:42:64:42:74 | taintedList : ArrayList [<element>] : String | provenance |  |
 | StrBuilderTextTest.java:40:29:40:35 | taint(...) : String | StrBuilderTextTest.java:40:13:40:23 | taintedList [post update] : ArrayList [<element>] : String | provenance | MaD:11 |
 | StrBuilderTextTest.java:41:49:41:52 | sb17 [post update] : StrBuilder | StrBuilderTextTest.java:41:83:41:86 | sb17 : StrBuilder | provenance |  |
-| StrBuilderTextTest.java:41:64:41:74 | taintedList : ArrayList [<element>] : String | StrBuilderTextTest.java:41:49:41:52 | sb17 [post update] : StrBuilder | provenance | MaD:437 |
+| StrBuilderTextTest.java:41:64:41:74 | taintedList : ArrayList [<element>] : String | StrBuilderTextTest.java:41:49:41:52 | sb17 [post update] : StrBuilder | provenance | MaD:436 |
 | StrBuilderTextTest.java:41:83:41:86 | sb17 : StrBuilder | StrBuilderTextTest.java:41:83:41:97 | toString(...) | provenance | MaD:5 |
 | StrBuilderTextTest.java:41:83:41:86 | sb17 : StrBuilder | StrBuilderTextTest.java:41:83:41:97 | toString(...) | provenance | MaD:503 |
 | StrBuilderTextTest.java:42:49:42:52 | sb18 [post update] : StrBuilder | StrBuilderTextTest.java:42:94:42:97 | sb18 : StrBuilder | provenance |  |
 | StrBuilderTextTest.java:42:64:42:74 | taintedList : ArrayList [<element>] : String | StrBuilderTextTest.java:42:64:42:85 | iterator(...) : Iterator [<element>] : String | provenance | MaD:6 |
-| StrBuilderTextTest.java:42:64:42:85 | iterator(...) : Iterator [<element>] : String | StrBuilderTextTest.java:42:49:42:52 | sb18 [post update] : StrBuilder | provenance | MaD:438 |
+| StrBuilderTextTest.java:42:64:42:85 | iterator(...) : Iterator [<element>] : String | StrBuilderTextTest.java:42:49:42:52 | sb18 [post update] : StrBuilder | provenance | MaD:437 |
 | StrBuilderTextTest.java:42:94:42:97 | sb18 : StrBuilder | StrBuilderTextTest.java:42:94:42:108 | toString(...) | provenance | MaD:5 |
 | StrBuilderTextTest.java:42:94:42:97 | sb18 : StrBuilder | StrBuilderTextTest.java:42:94:42:108 | toString(...) | provenance | MaD:503 |
 | StrBuilderTextTest.java:44:45:44:48 | sb19 [post update] : StrBuilder | StrBuilderTextTest.java:44:84:44:87 | sb19 : StrBuilder | provenance |  |
-| StrBuilderTextTest.java:44:45:44:76 | new ..[] { .. } : Object[] [[]] : String | StrBuilderTextTest.java:44:45:44:48 | sb19 [post update] : StrBuilder | provenance | MaD:439 |
+| StrBuilderTextTest.java:44:45:44:76 | new ..[] { .. } : Object[] [[]] : String | StrBuilderTextTest.java:44:45:44:48 | sb19 [post update] : StrBuilder | provenance | MaD:438 |
 | StrBuilderTextTest.java:44:69:44:75 | taint(...) : String | StrBuilderTextTest.java:44:45:44:76 | new ..[] { .. } : Object[] [[]] : String | provenance |  |
 | StrBuilderTextTest.java:44:84:44:87 | sb19 : StrBuilder | StrBuilderTextTest.java:44:84:44:98 | toString(...) | provenance | MaD:5 |
 | StrBuilderTextTest.java:44:84:44:87 | sb19 : StrBuilder | StrBuilderTextTest.java:44:84:44:98 | toString(...) | provenance | MaD:503 |
 | StrBuilderTextTest.java:45:45:45:48 | sb20 [post update] : StrBuilder | StrBuilderTextTest.java:45:84:45:87 | sb20 : StrBuilder | provenance |  |
-| StrBuilderTextTest.java:45:45:45:76 | new ..[] { .. } : Object[] [[]] : String | StrBuilderTextTest.java:45:45:45:48 | sb20 [post update] : StrBuilder | provenance | MaD:439 |
+| StrBuilderTextTest.java:45:45:45:76 | new ..[] { .. } : Object[] [[]] : String | StrBuilderTextTest.java:45:45:45:48 | sb20 [post update] : StrBuilder | provenance | MaD:438 |
 | StrBuilderTextTest.java:45:60:45:66 | taint(...) : String | StrBuilderTextTest.java:45:45:45:76 | new ..[] { .. } : Object[] [[]] : String | provenance |  |
 | StrBuilderTextTest.java:45:84:45:87 | sb20 : StrBuilder | StrBuilderTextTest.java:45:84:45:98 | toString(...) | provenance | MaD:5 |
 | StrBuilderTextTest.java:45:84:45:87 | sb20 : StrBuilder | StrBuilderTextTest.java:45:84:45:98 | toString(...) | provenance | MaD:503 |
 | StrBuilderTextTest.java:46:45:46:48 | sb21 [post update] : StrBuilder | StrBuilderTextTest.java:46:97:46:100 | sb21 : StrBuilder | provenance |  |
-| StrBuilderTextTest.java:46:74:46:80 | taint(...) : String | StrBuilderTextTest.java:46:45:46:48 | sb21 [post update] : StrBuilder | provenance | MaD:441 |
+| StrBuilderTextTest.java:46:74:46:80 | taint(...) : String | StrBuilderTextTest.java:46:45:46:48 | sb21 [post update] : StrBuilder | provenance | MaD:440 |
 | StrBuilderTextTest.java:46:97:46:100 | sb21 : StrBuilder | StrBuilderTextTest.java:46:97:46:111 | toString(...) | provenance | MaD:5 |
 | StrBuilderTextTest.java:46:97:46:100 | sb21 : StrBuilder | StrBuilderTextTest.java:46:97:46:111 | toString(...) | provenance | MaD:503 |
 | StrBuilderTextTest.java:47:45:47:48 | sb22 [post update] : StrBuilder | StrBuilderTextTest.java:47:98:47:101 | sb22 : StrBuilder | provenance |  |
-| StrBuilderTextTest.java:47:75:47:81 | taint(...) : String | StrBuilderTextTest.java:47:45:47:48 | sb22 [post update] : StrBuilder | provenance | MaD:443 |
+| StrBuilderTextTest.java:47:75:47:81 | taint(...) : String | StrBuilderTextTest.java:47:45:47:48 | sb22 [post update] : StrBuilder | provenance | MaD:442 |
 | StrBuilderTextTest.java:47:98:47:101 | sb22 : StrBuilder | StrBuilderTextTest.java:47:98:47:112 | toString(...) | provenance | MaD:5 |
 | StrBuilderTextTest.java:47:98:47:101 | sb22 : StrBuilder | StrBuilderTextTest.java:47:98:47:112 | toString(...) | provenance | MaD:503 |
 | StrBuilderTextTest.java:48:45:48:48 | sb23 [post update] : StrBuilder | StrBuilderTextTest.java:48:88:48:91 | sb23 : StrBuilder | provenance |  |
 | StrBuilderTextTest.java:48:59:48:65 | taint(...) : String | StrBuilderTextTest.java:48:59:48:79 | toCharArray(...) : char[] | provenance | MaD:7 |
-| StrBuilderTextTest.java:48:59:48:79 | toCharArray(...) : char[] | StrBuilderTextTest.java:48:45:48:48 | sb23 [post update] : StrBuilder | provenance | MaD:458 |
+| StrBuilderTextTest.java:48:59:48:79 | toCharArray(...) : char[] | StrBuilderTextTest.java:48:45:48:48 | sb23 [post update] : StrBuilder | provenance | MaD:457 |
 | StrBuilderTextTest.java:48:88:48:91 | sb23 : StrBuilder | StrBuilderTextTest.java:48:88:48:102 | toString(...) | provenance | MaD:5 |
 | StrBuilderTextTest.java:48:88:48:91 | sb23 : StrBuilder | StrBuilderTextTest.java:48:88:48:102 | toString(...) | provenance | MaD:503 |
 | StrBuilderTextTest.java:49:45:49:48 | sb24 [post update] : StrBuilder | StrBuilderTextTest.java:49:94:49:97 | sb24 : StrBuilder | provenance |  |
 | StrBuilderTextTest.java:49:59:49:65 | taint(...) : String | StrBuilderTextTest.java:49:59:49:79 | toCharArray(...) : char[] | provenance | MaD:7 |
-| StrBuilderTextTest.java:49:59:49:79 | toCharArray(...) : char[] | StrBuilderTextTest.java:49:45:49:48 | sb24 [post update] : StrBuilder | provenance | MaD:459 |
+| StrBuilderTextTest.java:49:59:49:79 | toCharArray(...) : char[] | StrBuilderTextTest.java:49:45:49:48 | sb24 [post update] : StrBuilder | provenance | MaD:458 |
 | StrBuilderTextTest.java:49:94:49:97 | sb24 : StrBuilder | StrBuilderTextTest.java:49:94:49:108 | toString(...) | provenance | MaD:5 |
 | StrBuilderTextTest.java:49:94:49:97 | sb24 : StrBuilder | StrBuilderTextTest.java:49:94:49:108 | toString(...) | provenance | MaD:503 |
 | StrBuilderTextTest.java:50:45:50:48 | sb25 [post update] : StrBuilder | StrBuilderTextTest.java:50:82:50:85 | sb25 : StrBuilder | provenance |  |
-| StrBuilderTextTest.java:50:59:50:73 | (...)... : String | StrBuilderTextTest.java:50:45:50:48 | sb25 [post update] : StrBuilder | provenance | MaD:460 |
+| StrBuilderTextTest.java:50:59:50:73 | (...)... : String | StrBuilderTextTest.java:50:45:50:48 | sb25 [post update] : StrBuilder | provenance | MaD:459 |
 | StrBuilderTextTest.java:50:67:50:73 | taint(...) : String | StrBuilderTextTest.java:50:59:50:73 | (...)... : String | provenance |  |
 | StrBuilderTextTest.java:50:82:50:85 | sb25 : StrBuilder | StrBuilderTextTest.java:50:82:50:96 | toString(...) | provenance | MaD:5 |
 | StrBuilderTextTest.java:50:82:50:85 | sb25 : StrBuilder | StrBuilderTextTest.java:50:82:50:96 | toString(...) | provenance | MaD:503 |
 | StrBuilderTextTest.java:52:50:52:54 | auxsb [post update] : StrBuilder | StrBuilderTextTest.java:53:63:53:67 | auxsb : StrBuilder | provenance |  |
-| StrBuilderTextTest.java:52:65:52:71 | taint(...) : String | StrBuilderTextTest.java:52:50:52:54 | auxsb [post update] : StrBuilder | provenance | MaD:461 |
+| StrBuilderTextTest.java:52:65:52:71 | taint(...) : String | StrBuilderTextTest.java:52:50:52:54 | auxsb [post update] : StrBuilder | provenance | MaD:460 |
 | StrBuilderTextTest.java:53:49:53:52 | sb26 [post update] : StrBuilder | StrBuilderTextTest.java:53:76:53:79 | sb26 : StrBuilder | provenance |  |
-| StrBuilderTextTest.java:53:63:53:67 | auxsb : StrBuilder | StrBuilderTextTest.java:53:49:53:52 | sb26 [post update] : StrBuilder | provenance | MaD:469 |
+| StrBuilderTextTest.java:53:63:53:67 | auxsb : StrBuilder | StrBuilderTextTest.java:53:49:53:52 | sb26 [post update] : StrBuilder | provenance | MaD:468 |
 | StrBuilderTextTest.java:53:76:53:79 | sb26 : StrBuilder | StrBuilderTextTest.java:53:76:53:90 | toString(...) | provenance | MaD:5 |
 | StrBuilderTextTest.java:53:76:53:79 | sb26 : StrBuilder | StrBuilderTextTest.java:53:76:53:90 | toString(...) | provenance | MaD:503 |
 | StrBuilderTextTest.java:55:45:55:48 | sb27 [post update] : StrBuilder | StrBuilderTextTest.java:55:92:55:95 | sb27 : StrBuilder | provenance |  |
-| StrBuilderTextTest.java:55:59:55:83 | new StringBuffer(...) : StringBuffer | StrBuilderTextTest.java:55:45:55:48 | sb27 [post update] : StrBuilder | provenance | MaD:465 |
+| StrBuilderTextTest.java:55:59:55:83 | new StringBuffer(...) : StringBuffer | StrBuilderTextTest.java:55:45:55:48 | sb27 [post update] : StrBuilder | provenance | MaD:464 |
 | StrBuilderTextTest.java:55:76:55:82 | taint(...) : String | StrBuilderTextTest.java:55:59:55:83 | new StringBuffer(...) : StringBuffer | provenance | MaD:8 |
 | StrBuilderTextTest.java:55:92:55:95 | sb27 : StrBuilder | StrBuilderTextTest.java:55:92:55:106 | toString(...) | provenance | MaD:5 |
 | StrBuilderTextTest.java:55:92:55:95 | sb27 : StrBuilder | StrBuilderTextTest.java:55:92:55:106 | toString(...) | provenance | MaD:503 |
 | StrBuilderTextTest.java:56:45:56:48 | sb28 [post update] : StrBuilder | StrBuilderTextTest.java:56:98:56:101 | sb28 : StrBuilder | provenance |  |
-| StrBuilderTextTest.java:56:59:56:83 | new StringBuffer(...) : StringBuffer | StrBuilderTextTest.java:56:45:56:48 | sb28 [post update] : StrBuilder | provenance | MaD:466 |
+| StrBuilderTextTest.java:56:59:56:83 | new StringBuffer(...) : StringBuffer | StrBuilderTextTest.java:56:45:56:48 | sb28 [post update] : StrBuilder | provenance | MaD:465 |
 | StrBuilderTextTest.java:56:76:56:82 | taint(...) : String | StrBuilderTextTest.java:56:59:56:83 | new StringBuffer(...) : StringBuffer | provenance | MaD:8 |
 | StrBuilderTextTest.java:56:98:56:101 | sb28 : StrBuilder | StrBuilderTextTest.java:56:98:56:112 | toString(...) | provenance | MaD:5 |
 | StrBuilderTextTest.java:56:98:56:101 | sb28 : StrBuilder | StrBuilderTextTest.java:56:98:56:112 | toString(...) | provenance | MaD:503 |
 | StrBuilderTextTest.java:57:45:57:48 | sb29 [post update] : StrBuilder | StrBuilderTextTest.java:57:93:57:96 | sb29 : StrBuilder | provenance |  |
-| StrBuilderTextTest.java:57:59:57:84 | new StringBuilder(...) : StringBuilder | StrBuilderTextTest.java:57:45:57:48 | sb29 [post update] : StrBuilder | provenance | MaD:467 |
+| StrBuilderTextTest.java:57:59:57:84 | new StringBuilder(...) : StringBuilder | StrBuilderTextTest.java:57:45:57:48 | sb29 [post update] : StrBuilder | provenance | MaD:466 |
 | StrBuilderTextTest.java:57:77:57:83 | taint(...) : String | StrBuilderTextTest.java:57:59:57:84 | new StringBuilder(...) : StringBuilder | provenance | MaD:9 |
 | StrBuilderTextTest.java:57:93:57:96 | sb29 : StrBuilder | StrBuilderTextTest.java:57:93:57:107 | toString(...) | provenance | MaD:5 |
 | StrBuilderTextTest.java:57:93:57:96 | sb29 : StrBuilder | StrBuilderTextTest.java:57:93:57:107 | toString(...) | provenance | MaD:503 |
 | StrBuilderTextTest.java:58:45:58:48 | sb30 [post update] : StrBuilder | StrBuilderTextTest.java:58:99:58:102 | sb30 : StrBuilder | provenance |  |
-| StrBuilderTextTest.java:58:59:58:84 | new StringBuilder(...) : StringBuilder | StrBuilderTextTest.java:58:45:58:48 | sb30 [post update] : StrBuilder | provenance | MaD:468 |
+| StrBuilderTextTest.java:58:59:58:84 | new StringBuilder(...) : StringBuilder | StrBuilderTextTest.java:58:45:58:48 | sb30 [post update] : StrBuilder | provenance | MaD:467 |
 | StrBuilderTextTest.java:58:77:58:83 | taint(...) : String | StrBuilderTextTest.java:58:59:58:84 | new StringBuilder(...) : StringBuilder | provenance | MaD:9 |
 | StrBuilderTextTest.java:58:99:58:102 | sb30 : StrBuilder | StrBuilderTextTest.java:58:99:58:113 | toString(...) | provenance | MaD:5 |
 | StrBuilderTextTest.java:58:99:58:102 | sb30 : StrBuilder | StrBuilderTextTest.java:58:99:58:113 | toString(...) | provenance | MaD:503 |
 | StrBuilderTextTest.java:59:45:59:48 | sb31 [post update] : StrBuilder | StrBuilderTextTest.java:59:74:59:77 | sb31 : StrBuilder | provenance |  |
-| StrBuilderTextTest.java:59:59:59:65 | taint(...) : String | StrBuilderTextTest.java:59:45:59:48 | sb31 [post update] : StrBuilder | provenance | MaD:461 |
+| StrBuilderTextTest.java:59:59:59:65 | taint(...) : String | StrBuilderTextTest.java:59:45:59:48 | sb31 [post update] : StrBuilder | provenance | MaD:460 |
 | StrBuilderTextTest.java:59:74:59:77 | sb31 : StrBuilder | StrBuilderTextTest.java:59:74:59:88 | toString(...) | provenance | MaD:5 |
 | StrBuilderTextTest.java:59:74:59:77 | sb31 : StrBuilder | StrBuilderTextTest.java:59:74:59:88 | toString(...) | provenance | MaD:503 |
 | StrBuilderTextTest.java:60:45:60:48 | sb32 [post update] : StrBuilder | StrBuilderTextTest.java:60:80:60:83 | sb32 : StrBuilder | provenance |  |
-| StrBuilderTextTest.java:60:59:60:65 | taint(...) : String | StrBuilderTextTest.java:60:45:60:48 | sb32 [post update] : StrBuilder | provenance | MaD:462 |
+| StrBuilderTextTest.java:60:59:60:65 | taint(...) : String | StrBuilderTextTest.java:60:45:60:48 | sb32 [post update] : StrBuilder | provenance | MaD:461 |
 | StrBuilderTextTest.java:60:80:60:83 | sb32 : StrBuilder | StrBuilderTextTest.java:60:80:60:94 | toString(...) | provenance | MaD:5 |
 | StrBuilderTextTest.java:60:80:60:83 | sb32 : StrBuilder | StrBuilderTextTest.java:60:80:60:94 | toString(...) | provenance | MaD:503 |
 | StrBuilderTextTest.java:61:45:61:48 | sb33 [post update] : StrBuilder | StrBuilderTextTest.java:61:92:61:95 | sb33 : StrBuilder | provenance |  |
-| StrBuilderTextTest.java:61:59:61:65 | taint(...) : String | StrBuilderTextTest.java:61:45:61:48 | sb33 [post update] : StrBuilder | provenance | MaD:463 |
+| StrBuilderTextTest.java:61:59:61:65 | taint(...) : String | StrBuilderTextTest.java:61:45:61:48 | sb33 [post update] : StrBuilder | provenance | MaD:462 |
 | StrBuilderTextTest.java:61:92:61:95 | sb33 : StrBuilder | StrBuilderTextTest.java:61:92:61:106 | toString(...) | provenance | MaD:5 |
 | StrBuilderTextTest.java:61:92:61:95 | sb33 : StrBuilder | StrBuilderTextTest.java:61:92:61:106 | toString(...) | provenance | MaD:503 |
 | StrBuilderTextTest.java:62:45:62:48 | sb34 [post update] : StrBuilder | StrBuilderTextTest.java:62:99:62:102 | sb34 : StrBuilder | provenance |  |
-| StrBuilderTextTest.java:62:45:62:91 | new ..[] { .. } : Object[] [[]] : String | StrBuilderTextTest.java:62:45:62:48 | sb34 [post update] : StrBuilder | provenance | MaD:464 |
+| StrBuilderTextTest.java:62:45:62:91 | new ..[] { .. } : Object[] [[]] : String | StrBuilderTextTest.java:62:45:62:48 | sb34 [post update] : StrBuilder | provenance | MaD:463 |
 | StrBuilderTextTest.java:62:76:62:82 | taint(...) : String | StrBuilderTextTest.java:62:45:62:91 | new ..[] { .. } : Object[] [[]] : String | provenance |  |
 | StrBuilderTextTest.java:62:99:62:102 | sb34 : StrBuilder | StrBuilderTextTest.java:62:99:62:113 | toString(...) | provenance | MaD:5 |
 | StrBuilderTextTest.java:62:99:62:102 | sb34 : StrBuilder | StrBuilderTextTest.java:62:99:62:113 | toString(...) | provenance | MaD:503 |
 | StrBuilderTextTest.java:63:45:63:48 | sb35 [post update] : StrBuilder | StrBuilderTextTest.java:63:81:63:84 | sb35 : StrBuilder | provenance |  |
-| StrBuilderTextTest.java:63:66:63:72 | taint(...) : String | StrBuilderTextTest.java:63:45:63:48 | sb35 [post update] : StrBuilder | provenance | MaD:448 |
+| StrBuilderTextTest.java:63:66:63:72 | taint(...) : String | StrBuilderTextTest.java:63:45:63:48 | sb35 [post update] : StrBuilder | provenance | MaD:447 |
 | StrBuilderTextTest.java:63:81:63:84 | sb35 : StrBuilder | StrBuilderTextTest.java:63:81:63:95 | toString(...) | provenance | MaD:5 |
 | StrBuilderTextTest.java:63:81:63:84 | sb35 : StrBuilder | StrBuilderTextTest.java:63:81:63:95 | toString(...) | provenance | MaD:503 |
 | StrBuilderTextTest.java:64:45:64:48 | sb36 [post update] : StrBuilder | StrBuilderTextTest.java:64:84:64:87 | sb36 : StrBuilder | provenance |  |
-| StrBuilderTextTest.java:64:66:64:72 | taint(...) : String | StrBuilderTextTest.java:64:45:64:48 | sb36 [post update] : StrBuilder | provenance | MaD:449 |
+| StrBuilderTextTest.java:64:66:64:72 | taint(...) : String | StrBuilderTextTest.java:64:45:64:48 | sb36 [post update] : StrBuilder | provenance | MaD:448 |
 | StrBuilderTextTest.java:64:84:64:87 | sb36 : StrBuilder | StrBuilderTextTest.java:64:84:64:98 | toString(...) | provenance | MaD:5 |
 | StrBuilderTextTest.java:64:84:64:87 | sb36 : StrBuilder | StrBuilderTextTest.java:64:84:64:98 | toString(...) | provenance | MaD:503 |
 | StrBuilderTextTest.java:65:45:65:48 | sb37 [post update] : StrBuilder | StrBuilderTextTest.java:65:92:65:95 | sb37 : StrBuilder | provenance |  |
-| StrBuilderTextTest.java:65:66:65:72 | taint(...) : String | StrBuilderTextTest.java:65:45:65:48 | sb37 [post update] : StrBuilder | provenance | MaD:450 |
+| StrBuilderTextTest.java:65:66:65:72 | taint(...) : String | StrBuilderTextTest.java:65:45:65:48 | sb37 [post update] : StrBuilder | provenance | MaD:449 |
 | StrBuilderTextTest.java:65:92:65:95 | sb37 : StrBuilder | StrBuilderTextTest.java:65:92:65:106 | toString(...) | provenance | MaD:5 |
 | StrBuilderTextTest.java:65:92:65:95 | sb37 : StrBuilder | StrBuilderTextTest.java:65:92:65:106 | toString(...) | provenance | MaD:503 |
 | StrBuilderTextTest.java:66:45:66:48 | sb38 [post update] : StrBuilder | StrBuilderTextTest.java:66:85:66:88 | sb38 : StrBuilder | provenance |  |
-| StrBuilderTextTest.java:66:70:66:76 | taint(...) : String | StrBuilderTextTest.java:66:45:66:48 | sb38 [post update] : StrBuilder | provenance | MaD:450 |
+| StrBuilderTextTest.java:66:70:66:76 | taint(...) : String | StrBuilderTextTest.java:66:45:66:48 | sb38 [post update] : StrBuilder | provenance | MaD:449 |
 | StrBuilderTextTest.java:66:85:66:88 | sb38 : StrBuilder | StrBuilderTextTest.java:66:85:66:99 | toString(...) | provenance | MaD:5 |
 | StrBuilderTextTest.java:66:85:66:88 | sb38 : StrBuilder | StrBuilderTextTest.java:66:85:66:99 | toString(...) | provenance | MaD:503 |
 | StrBuilderTextTest.java:68:50:68:54 | auxsb [post update] : StrBuilder | StrBuilderTextTest.java:69:49:69:53 | auxsb : StrBuilder | provenance |  |
-| StrBuilderTextTest.java:68:65:68:71 | taint(...) : String | StrBuilderTextTest.java:68:50:68:54 | auxsb [post update] : StrBuilder | provenance | MaD:461 |
+| StrBuilderTextTest.java:68:65:68:71 | taint(...) : String | StrBuilderTextTest.java:68:50:68:54 | auxsb [post update] : StrBuilder | provenance | MaD:460 |
 | StrBuilderTextTest.java:69:49:69:53 | auxsb : StrBuilder | StrBuilderTextTest.java:69:64:69:67 | sb39 [post update] : StrBuilder | provenance | MaD:451 |
 | StrBuilderTextTest.java:69:64:69:67 | sb39 [post update] : StrBuilder | StrBuilderTextTest.java:69:76:69:79 | sb39 : StrBuilder | provenance |  |
 | StrBuilderTextTest.java:69:76:69:79 | sb39 : StrBuilder | StrBuilderTextTest.java:69:76:69:90 | toString(...) | provenance | MaD:5 |
@@ -1870,80 +1844,80 @@ edges
 | StrBuilderTextTest.java:73:13:73:23 | taintedList [post update] : ArrayList [<element>] : String | StrBuilderTextTest.java:75:75:75:85 | taintedList : ArrayList [<element>] : String | provenance |  |
 | StrBuilderTextTest.java:73:29:73:35 | taint(...) : String | StrBuilderTextTest.java:73:13:73:23 | taintedList [post update] : ArrayList [<element>] : String | provenance | MaD:11 |
 | StrBuilderTextTest.java:74:49:74:52 | sb40 [post update] : StrBuilder | StrBuilderTextTest.java:74:100:74:103 | sb40 : StrBuilder | provenance |  |
-| StrBuilderTextTest.java:74:75:74:85 | taintedList : ArrayList [<element>] : String | StrBuilderTextTest.java:74:49:74:52 | sb40 [post update] : StrBuilder | provenance | MaD:454 |
+| StrBuilderTextTest.java:74:75:74:85 | taintedList : ArrayList [<element>] : String | StrBuilderTextTest.java:74:49:74:52 | sb40 [post update] : StrBuilder | provenance | MaD:452 |
 | StrBuilderTextTest.java:74:100:74:103 | sb40 : StrBuilder | StrBuilderTextTest.java:74:100:74:114 | toString(...) | provenance | MaD:5 |
 | StrBuilderTextTest.java:74:100:74:103 | sb40 : StrBuilder | StrBuilderTextTest.java:74:100:74:114 | toString(...) | provenance | MaD:503 |
 | StrBuilderTextTest.java:75:49:75:52 | sb41 [post update] : StrBuilder | StrBuilderTextTest.java:75:111:75:114 | sb41 : StrBuilder | provenance |  |
 | StrBuilderTextTest.java:75:75:75:85 | taintedList : ArrayList [<element>] : String | StrBuilderTextTest.java:75:75:75:96 | iterator(...) : Iterator [<element>] : String | provenance | MaD:6 |
-| StrBuilderTextTest.java:75:75:75:96 | iterator(...) : Iterator [<element>] : String | StrBuilderTextTest.java:75:49:75:52 | sb41 [post update] : StrBuilder | provenance | MaD:455 |
+| StrBuilderTextTest.java:75:75:75:96 | iterator(...) : Iterator [<element>] : String | StrBuilderTextTest.java:75:49:75:52 | sb41 [post update] : StrBuilder | provenance | MaD:453 |
 | StrBuilderTextTest.java:75:111:75:114 | sb41 : StrBuilder | StrBuilderTextTest.java:75:111:75:125 | toString(...) | provenance | MaD:5 |
 | StrBuilderTextTest.java:75:111:75:114 | sb41 : StrBuilder | StrBuilderTextTest.java:75:111:75:125 | toString(...) | provenance | MaD:503 |
 | StrBuilderTextTest.java:77:49:77:52 | sb42 [post update] : StrBuilder | StrBuilderTextTest.java:77:105:77:108 | sb42 : StrBuilder | provenance |  |
-| StrBuilderTextTest.java:77:90:77:96 | taint(...) : String | StrBuilderTextTest.java:77:49:77:52 | sb42 [post update] : StrBuilder | provenance | MaD:453 |
+| StrBuilderTextTest.java:77:90:77:96 | taint(...) : String | StrBuilderTextTest.java:77:49:77:52 | sb42 [post update] : StrBuilder | provenance | MaD:455 |
 | StrBuilderTextTest.java:77:105:77:108 | sb42 : StrBuilder | StrBuilderTextTest.java:77:105:77:119 | toString(...) | provenance | MaD:5 |
 | StrBuilderTextTest.java:77:105:77:108 | sb42 : StrBuilder | StrBuilderTextTest.java:77:105:77:119 | toString(...) | provenance | MaD:503 |
 | StrBuilderTextTest.java:78:49:78:52 | sb43 [post update] : StrBuilder | StrBuilderTextTest.java:78:116:78:119 | sb43 : StrBuilder | provenance |  |
-| StrBuilderTextTest.java:78:101:78:107 | taint(...) : String | StrBuilderTextTest.java:78:49:78:52 | sb43 [post update] : StrBuilder | provenance | MaD:453 |
+| StrBuilderTextTest.java:78:101:78:107 | taint(...) : String | StrBuilderTextTest.java:78:49:78:52 | sb43 [post update] : StrBuilder | provenance | MaD:455 |
 | StrBuilderTextTest.java:78:116:78:119 | sb43 : StrBuilder | StrBuilderTextTest.java:78:116:78:130 | toString(...) | provenance | MaD:5 |
 | StrBuilderTextTest.java:78:116:78:119 | sb43 : StrBuilder | StrBuilderTextTest.java:78:116:78:130 | toString(...) | provenance | MaD:503 |
 | StrBuilderTextTest.java:79:37:79:60 | {...} : String[] [[]] : String | StrBuilderTextTest.java:81:75:81:86 | taintedArray : String[] [[]] : String | provenance |  |
 | StrBuilderTextTest.java:79:52:79:58 | taint(...) : String | StrBuilderTextTest.java:79:37:79:60 | {...} : String[] [[]] : String | provenance |  |
 | StrBuilderTextTest.java:81:49:81:52 | sb44 [post update] : StrBuilder | StrBuilderTextTest.java:81:101:81:104 | sb44 : StrBuilder | provenance |  |
-| StrBuilderTextTest.java:81:75:81:86 | taintedArray : String[] [[]] : String | StrBuilderTextTest.java:81:49:81:52 | sb44 [post update] : StrBuilder | provenance | MaD:456 |
+| StrBuilderTextTest.java:81:75:81:86 | taintedArray : String[] [[]] : String | StrBuilderTextTest.java:81:49:81:52 | sb44 [post update] : StrBuilder | provenance | MaD:454 |
 | StrBuilderTextTest.java:81:101:81:104 | sb44 : StrBuilder | StrBuilderTextTest.java:81:101:81:115 | toString(...) | provenance | MaD:5 |
 | StrBuilderTextTest.java:81:101:81:104 | sb44 : StrBuilder | StrBuilderTextTest.java:81:101:81:115 | toString(...) | provenance | MaD:503 |
 | StrBuilderTextTest.java:82:49:82:52 | sb45 [post update] : StrBuilder | StrBuilderTextTest.java:82:106:82:109 | sb45 : StrBuilder | provenance |  |
-| StrBuilderTextTest.java:82:91:82:97 | taint(...) : String | StrBuilderTextTest.java:82:49:82:52 | sb45 [post update] : StrBuilder | provenance | MaD:453 |
+| StrBuilderTextTest.java:82:91:82:97 | taint(...) : String | StrBuilderTextTest.java:82:49:82:52 | sb45 [post update] : StrBuilder | provenance | MaD:455 |
 | StrBuilderTextTest.java:82:106:82:109 | sb45 : StrBuilder | StrBuilderTextTest.java:82:106:82:120 | toString(...) | provenance | MaD:5 |
 | StrBuilderTextTest.java:82:106:82:109 | sb45 : StrBuilder | StrBuilderTextTest.java:82:106:82:120 | toString(...) | provenance | MaD:503 |
 | StrBuilderTextTest.java:85:49:85:52 | sb46 [post update] : StrBuilder | StrBuilderTextTest.java:87:13:87:16 | sb46 : StrBuilder | provenance |  |
-| StrBuilderTextTest.java:85:61:85:67 | taint(...) : String | StrBuilderTextTest.java:85:49:85:52 | sb46 [post update] : StrBuilder | provenance | MaD:425 |
+| StrBuilderTextTest.java:85:61:85:67 | taint(...) : String | StrBuilderTextTest.java:85:49:85:52 | sb46 [post update] : StrBuilder | provenance | MaD:424 |
 | StrBuilderTextTest.java:87:13:87:16 | sb46 : StrBuilder | StrBuilderTextTest.java:87:13:87:27 | asReader(...) : Reader | provenance | MaD:470 |
 | StrBuilderTextTest.java:87:13:87:27 | asReader(...) : Reader | StrBuilderTextTest.java:87:34:87:39 | target [post update] : char[] | provenance | MaD:1 |
 | StrBuilderTextTest.java:87:34:87:39 | target [post update] : char[] | StrBuilderTextTest.java:88:18:88:23 | target | provenance |  |
 | StrBuilderTextTest.java:90:45:90:48 | sb47 [post update] : StrBuilder | StrBuilderTextTest.java:90:72:90:75 | sb47 : StrBuilder | provenance |  |
-| StrBuilderTextTest.java:90:57:90:63 | taint(...) : String | StrBuilderTextTest.java:90:45:90:48 | sb47 [post update] : StrBuilder | provenance | MaD:425 |
+| StrBuilderTextTest.java:90:57:90:63 | taint(...) : String | StrBuilderTextTest.java:90:45:90:48 | sb47 [post update] : StrBuilder | provenance | MaD:424 |
 | StrBuilderTextTest.java:90:72:90:75 | sb47 : StrBuilder | StrBuilderTextTest.java:90:72:90:89 | asTokenizer(...) : StrTokenizer | provenance | MaD:471 |
 | StrBuilderTextTest.java:90:72:90:89 | asTokenizer(...) : StrTokenizer | StrBuilderTextTest.java:90:72:90:96 | next(...) | provenance | MaD:13 |
 | StrBuilderTextTest.java:90:72:90:89 | asTokenizer(...) : StrTokenizer | StrBuilderTextTest.java:90:72:90:96 | next(...) | provenance | MaD:514 |
 | StrBuilderTextTest.java:91:45:91:48 | sb48 [post update] : StrBuilder | StrBuilderTextTest.java:91:72:91:75 | sb48 : StrBuilder | provenance |  |
-| StrBuilderTextTest.java:91:57:91:63 | taint(...) : String | StrBuilderTextTest.java:91:45:91:48 | sb48 [post update] : StrBuilder | provenance | MaD:425 |
+| StrBuilderTextTest.java:91:57:91:63 | taint(...) : String | StrBuilderTextTest.java:91:45:91:48 | sb48 [post update] : StrBuilder | provenance | MaD:424 |
 | StrBuilderTextTest.java:91:72:91:75 | sb48 : StrBuilder | StrBuilderTextTest.java:91:72:91:83 | build(...) | provenance | MaD:472 |
 | StrBuilderTextTest.java:92:45:92:48 | sb49 [post update] : StrBuilder | StrBuilderTextTest.java:92:72:92:75 | sb49 : StrBuilder | provenance |  |
-| StrBuilderTextTest.java:92:57:92:63 | taint(...) : String | StrBuilderTextTest.java:92:45:92:48 | sb49 [post update] : StrBuilder | provenance | MaD:425 |
+| StrBuilderTextTest.java:92:57:92:63 | taint(...) : String | StrBuilderTextTest.java:92:45:92:48 | sb49 [post update] : StrBuilder | provenance | MaD:424 |
 | StrBuilderTextTest.java:92:72:92:75 | sb49 : StrBuilder | StrBuilderTextTest.java:92:72:92:90 | getChars(...) | provenance | MaD:479 |
 | StrBuilderTextTest.java:94:49:94:52 | sb50 [post update] : StrBuilder | StrBuilderTextTest.java:96:13:96:16 | sb50 : StrBuilder | provenance |  |
-| StrBuilderTextTest.java:94:61:94:67 | taint(...) : String | StrBuilderTextTest.java:94:49:94:52 | sb50 [post update] : StrBuilder | provenance | MaD:425 |
+| StrBuilderTextTest.java:94:61:94:67 | taint(...) : String | StrBuilderTextTest.java:94:49:94:52 | sb50 [post update] : StrBuilder | provenance | MaD:424 |
 | StrBuilderTextTest.java:96:13:96:16 | sb50 : StrBuilder | StrBuilderTextTest.java:96:27:96:32 | target [post update] : char[] | provenance | MaD:478 |
 | StrBuilderTextTest.java:96:27:96:32 | target [post update] : char[] | StrBuilderTextTest.java:97:18:97:23 | target | provenance |  |
 | StrBuilderTextTest.java:100:49:100:52 | sb51 [post update] : StrBuilder | StrBuilderTextTest.java:102:13:102:16 | sb51 : StrBuilder | provenance |  |
-| StrBuilderTextTest.java:100:61:100:67 | taint(...) : String | StrBuilderTextTest.java:100:49:100:52 | sb51 [post update] : StrBuilder | provenance | MaD:425 |
+| StrBuilderTextTest.java:100:61:100:67 | taint(...) : String | StrBuilderTextTest.java:100:49:100:52 | sb51 [post update] : StrBuilder | provenance | MaD:424 |
 | StrBuilderTextTest.java:102:13:102:16 | sb51 : StrBuilder | StrBuilderTextTest.java:102:33:102:38 | target [post update] : char[] | provenance | MaD:480 |
 | StrBuilderTextTest.java:102:33:102:38 | target [post update] : char[] | StrBuilderTextTest.java:103:18:103:23 | target | provenance |  |
 | StrBuilderTextTest.java:105:45:105:48 | sb52 [post update] : StrBuilder | StrBuilderTextTest.java:105:89:105:92 | sb52 : StrBuilder | provenance |  |
 | StrBuilderTextTest.java:105:60:105:66 | taint(...) : String | StrBuilderTextTest.java:105:60:105:80 | toCharArray(...) : char[] | provenance | MaD:7 |
-| StrBuilderTextTest.java:105:60:105:80 | toCharArray(...) : char[] | StrBuilderTextTest.java:105:45:105:48 | sb52 [post update] : StrBuilder | provenance | MaD:482 |
+| StrBuilderTextTest.java:105:60:105:80 | toCharArray(...) : char[] | StrBuilderTextTest.java:105:45:105:48 | sb52 [post update] : StrBuilder | provenance | MaD:481 |
 | StrBuilderTextTest.java:105:89:105:92 | sb52 : StrBuilder | StrBuilderTextTest.java:105:89:105:103 | toString(...) | provenance | MaD:5 |
 | StrBuilderTextTest.java:105:89:105:92 | sb52 : StrBuilder | StrBuilderTextTest.java:105:89:105:103 | toString(...) | provenance | MaD:503 |
 | StrBuilderTextTest.java:106:45:106:48 | sb53 [post update] : StrBuilder | StrBuilderTextTest.java:106:95:106:98 | sb53 : StrBuilder | provenance |  |
 | StrBuilderTextTest.java:106:60:106:66 | taint(...) : String | StrBuilderTextTest.java:106:60:106:80 | toCharArray(...) : char[] | provenance | MaD:7 |
-| StrBuilderTextTest.java:106:60:106:80 | toCharArray(...) : char[] | StrBuilderTextTest.java:106:45:106:48 | sb53 [post update] : StrBuilder | provenance | MaD:482 |
+| StrBuilderTextTest.java:106:60:106:80 | toCharArray(...) : char[] | StrBuilderTextTest.java:106:45:106:48 | sb53 [post update] : StrBuilder | provenance | MaD:481 |
 | StrBuilderTextTest.java:106:95:106:98 | sb53 : StrBuilder | StrBuilderTextTest.java:106:95:106:109 | toString(...) | provenance | MaD:5 |
 | StrBuilderTextTest.java:106:95:106:98 | sb53 : StrBuilder | StrBuilderTextTest.java:106:95:106:109 | toString(...) | provenance | MaD:503 |
 | StrBuilderTextTest.java:107:45:107:48 | sb54 [post update] : StrBuilder | StrBuilderTextTest.java:107:75:107:78 | sb54 : StrBuilder | provenance |  |
-| StrBuilderTextTest.java:107:60:107:66 | taint(...) : String | StrBuilderTextTest.java:107:45:107:48 | sb54 [post update] : StrBuilder | provenance | MaD:482 |
+| StrBuilderTextTest.java:107:60:107:66 | taint(...) : String | StrBuilderTextTest.java:107:45:107:48 | sb54 [post update] : StrBuilder | provenance | MaD:481 |
 | StrBuilderTextTest.java:107:75:107:78 | sb54 : StrBuilder | StrBuilderTextTest.java:107:75:107:89 | toString(...) | provenance | MaD:5 |
 | StrBuilderTextTest.java:107:75:107:78 | sb54 : StrBuilder | StrBuilderTextTest.java:107:75:107:89 | toString(...) | provenance | MaD:503 |
 | StrBuilderTextTest.java:108:45:108:48 | sb55 [post update] : StrBuilder | StrBuilderTextTest.java:108:83:108:86 | sb55 : StrBuilder | provenance |  |
-| StrBuilderTextTest.java:108:60:108:74 | (...)... : String | StrBuilderTextTest.java:108:45:108:48 | sb55 [post update] : StrBuilder | provenance | MaD:482 |
+| StrBuilderTextTest.java:108:60:108:74 | (...)... : String | StrBuilderTextTest.java:108:45:108:48 | sb55 [post update] : StrBuilder | provenance | MaD:481 |
 | StrBuilderTextTest.java:108:68:108:74 | taint(...) : String | StrBuilderTextTest.java:108:60:108:74 | (...)... : String | provenance |  |
 | StrBuilderTextTest.java:108:83:108:86 | sb55 : StrBuilder | StrBuilderTextTest.java:108:83:108:97 | toString(...) | provenance | MaD:5 |
 | StrBuilderTextTest.java:108:83:108:86 | sb55 : StrBuilder | StrBuilderTextTest.java:108:83:108:97 | toString(...) | provenance | MaD:503 |
 | StrBuilderTextTest.java:109:45:109:48 | sb56 [post update] : StrBuilder | StrBuilderTextTest.java:109:72:109:75 | sb56 : StrBuilder | provenance |  |
-| StrBuilderTextTest.java:109:57:109:63 | taint(...) : String | StrBuilderTextTest.java:109:45:109:48 | sb56 [post update] : StrBuilder | provenance | MaD:425 |
+| StrBuilderTextTest.java:109:57:109:63 | taint(...) : String | StrBuilderTextTest.java:109:45:109:48 | sb56 [post update] : StrBuilder | provenance | MaD:424 |
 | StrBuilderTextTest.java:109:72:109:75 | sb56 : StrBuilder | StrBuilderTextTest.java:109:72:109:89 | leftString(...) | provenance | MaD:483 |
 | StrBuilderTextTest.java:110:45:110:48 | sb57 [post update] : StrBuilder | StrBuilderTextTest.java:110:72:110:75 | sb57 : StrBuilder | provenance |  |
-| StrBuilderTextTest.java:110:57:110:63 | taint(...) : String | StrBuilderTextTest.java:110:45:110:48 | sb57 [post update] : StrBuilder | provenance | MaD:425 |
+| StrBuilderTextTest.java:110:57:110:63 | taint(...) : String | StrBuilderTextTest.java:110:45:110:48 | sb57 [post update] : StrBuilder | provenance | MaD:424 |
 | StrBuilderTextTest.java:110:72:110:75 | sb57 : StrBuilder | StrBuilderTextTest.java:110:72:110:91 | midString(...) | provenance | MaD:484 |
 | StrBuilderTextTest.java:112:35:112:59 | new StringReader(...) : StringReader | StrBuilderTextTest.java:113:63:113:68 | reader : StringReader | provenance |  |
 | StrBuilderTextTest.java:112:52:112:58 | taint(...) : String | StrBuilderTextTest.java:112:35:112:59 | new StringReader(...) : StringReader | provenance | MaD:2 |
@@ -1952,88 +1926,88 @@ edges
 | StrBuilderTextTest.java:113:77:113:80 | sb58 : StrBuilder | StrBuilderTextTest.java:113:77:113:91 | toString(...) | provenance | MaD:5 |
 | StrBuilderTextTest.java:113:77:113:80 | sb58 : StrBuilder | StrBuilderTextTest.java:113:77:113:91 | toString(...) | provenance | MaD:503 |
 | StrBuilderTextTest.java:115:45:115:48 | sb59 [post update] : StrBuilder | StrBuilderTextTest.java:115:79:115:82 | sb59 : StrBuilder | provenance |  |
-| StrBuilderTextTest.java:115:64:115:70 | taint(...) : String | StrBuilderTextTest.java:115:45:115:48 | sb59 [post update] : StrBuilder | provenance | MaD:488 |
+| StrBuilderTextTest.java:115:64:115:70 | taint(...) : String | StrBuilderTextTest.java:115:45:115:48 | sb59 [post update] : StrBuilder | provenance | MaD:487 |
 | StrBuilderTextTest.java:115:79:115:82 | sb59 : StrBuilder | StrBuilderTextTest.java:115:79:115:93 | toString(...) | provenance | MaD:5 |
 | StrBuilderTextTest.java:115:79:115:82 | sb59 : StrBuilder | StrBuilderTextTest.java:115:79:115:93 | toString(...) | provenance | MaD:503 |
 | StrBuilderTextTest.java:116:45:116:48 | sb60 [post update] : StrBuilder | StrBuilderTextTest.java:116:88:116:91 | sb60 : StrBuilder | provenance |  |
-| StrBuilderTextTest.java:116:64:116:70 | taint(...) : String | StrBuilderTextTest.java:116:45:116:48 | sb60 [post update] : StrBuilder | provenance | MaD:489 |
+| StrBuilderTextTest.java:116:64:116:70 | taint(...) : String | StrBuilderTextTest.java:116:45:116:48 | sb60 [post update] : StrBuilder | provenance | MaD:488 |
 | StrBuilderTextTest.java:116:88:116:91 | sb60 : StrBuilder | StrBuilderTextTest.java:116:88:116:102 | toString(...) | provenance | MaD:5 |
 | StrBuilderTextTest.java:116:88:116:91 | sb60 : StrBuilder | StrBuilderTextTest.java:116:88:116:102 | toString(...) | provenance | MaD:503 |
 | StrBuilderTextTest.java:117:45:117:48 | sb61 [post update] : StrBuilder | StrBuilderTextTest.java:117:94:117:97 | sb61 : StrBuilder | provenance |  |
-| StrBuilderTextTest.java:117:79:117:85 | taint(...) : String | StrBuilderTextTest.java:117:45:117:48 | sb61 [post update] : StrBuilder | provenance | MaD:491 |
+| StrBuilderTextTest.java:117:79:117:85 | taint(...) : String | StrBuilderTextTest.java:117:45:117:48 | sb61 [post update] : StrBuilder | provenance | MaD:490 |
 | StrBuilderTextTest.java:117:94:117:97 | sb61 : StrBuilder | StrBuilderTextTest.java:117:94:117:108 | toString(...) | provenance | MaD:5 |
 | StrBuilderTextTest.java:117:94:117:97 | sb61 : StrBuilder | StrBuilderTextTest.java:117:94:117:108 | toString(...) | provenance | MaD:503 |
 | StrBuilderTextTest.java:118:45:118:48 | sb62 [post update] : StrBuilder | StrBuilderTextTest.java:118:86:118:89 | sb62 : StrBuilder | provenance |  |
-| StrBuilderTextTest.java:118:71:118:77 | taint(...) : String | StrBuilderTextTest.java:118:45:118:48 | sb62 [post update] : StrBuilder | provenance | MaD:491 |
+| StrBuilderTextTest.java:118:71:118:77 | taint(...) : String | StrBuilderTextTest.java:118:45:118:48 | sb62 [post update] : StrBuilder | provenance | MaD:490 |
 | StrBuilderTextTest.java:118:86:118:89 | sb62 : StrBuilder | StrBuilderTextTest.java:118:86:118:100 | toString(...) | provenance | MaD:5 |
 | StrBuilderTextTest.java:118:86:118:89 | sb62 : StrBuilder | StrBuilderTextTest.java:118:86:118:100 | toString(...) | provenance | MaD:503 |
 | StrBuilderTextTest.java:120:45:120:48 | sb64 [post update] : StrBuilder | StrBuilderTextTest.java:120:96:120:99 | sb64 : StrBuilder | provenance |  |
-| StrBuilderTextTest.java:120:81:120:87 | taint(...) : String | StrBuilderTextTest.java:120:45:120:48 | sb64 [post update] : StrBuilder | provenance | MaD:493 |
+| StrBuilderTextTest.java:120:81:120:87 | taint(...) : String | StrBuilderTextTest.java:120:45:120:48 | sb64 [post update] : StrBuilder | provenance | MaD:492 |
 | StrBuilderTextTest.java:120:96:120:99 | sb64 : StrBuilder | StrBuilderTextTest.java:120:96:120:110 | toString(...) | provenance | MaD:5 |
 | StrBuilderTextTest.java:120:96:120:99 | sb64 : StrBuilder | StrBuilderTextTest.java:120:96:120:110 | toString(...) | provenance | MaD:503 |
 | StrBuilderTextTest.java:121:45:121:48 | sb65 [post update] : StrBuilder | StrBuilderTextTest.java:121:88:121:91 | sb65 : StrBuilder | provenance |  |
-| StrBuilderTextTest.java:121:73:121:79 | taint(...) : String | StrBuilderTextTest.java:121:45:121:48 | sb65 [post update] : StrBuilder | provenance | MaD:493 |
+| StrBuilderTextTest.java:121:73:121:79 | taint(...) : String | StrBuilderTextTest.java:121:45:121:48 | sb65 [post update] : StrBuilder | provenance | MaD:492 |
 | StrBuilderTextTest.java:121:88:121:91 | sb65 : StrBuilder | StrBuilderTextTest.java:121:88:121:102 | toString(...) | provenance | MaD:5 |
 | StrBuilderTextTest.java:121:88:121:91 | sb65 : StrBuilder | StrBuilderTextTest.java:121:88:121:102 | toString(...) | provenance | MaD:503 |
 | StrBuilderTextTest.java:123:45:123:48 | sb67 [post update] : StrBuilder | StrBuilderTextTest.java:123:72:123:75 | sb67 : StrBuilder | provenance |  |
-| StrBuilderTextTest.java:123:57:123:63 | taint(...) : String | StrBuilderTextTest.java:123:45:123:48 | sb67 [post update] : StrBuilder | provenance | MaD:425 |
+| StrBuilderTextTest.java:123:57:123:63 | taint(...) : String | StrBuilderTextTest.java:123:45:123:48 | sb67 [post update] : StrBuilder | provenance | MaD:424 |
 | StrBuilderTextTest.java:123:72:123:75 | sb67 : StrBuilder | StrBuilderTextTest.java:123:72:123:90 | rightString(...) | provenance | MaD:495 |
 | StrBuilderTextTest.java:124:45:124:48 | sb68 [post update] : StrBuilder | StrBuilderTextTest.java:124:72:124:75 | sb68 : StrBuilder | provenance |  |
-| StrBuilderTextTest.java:124:57:124:63 | taint(...) : String | StrBuilderTextTest.java:124:45:124:48 | sb68 [post update] : StrBuilder | provenance | MaD:425 |
+| StrBuilderTextTest.java:124:57:124:63 | taint(...) : String | StrBuilderTextTest.java:124:45:124:48 | sb68 [post update] : StrBuilder | provenance | MaD:424 |
 | StrBuilderTextTest.java:124:72:124:75 | sb68 : StrBuilder | StrBuilderTextTest.java:124:72:124:93 | subSequence(...) | provenance | MaD:4 |
 | StrBuilderTextTest.java:124:72:124:75 | sb68 : StrBuilder | StrBuilderTextTest.java:124:72:124:93 | subSequence(...) | provenance | MaD:500 |
 | StrBuilderTextTest.java:125:45:125:48 | sb69 [post update] : StrBuilder | StrBuilderTextTest.java:125:72:125:75 | sb69 : StrBuilder | provenance |  |
-| StrBuilderTextTest.java:125:57:125:63 | taint(...) : String | StrBuilderTextTest.java:125:45:125:48 | sb69 [post update] : StrBuilder | provenance | MaD:425 |
+| StrBuilderTextTest.java:125:57:125:63 | taint(...) : String | StrBuilderTextTest.java:125:45:125:48 | sb69 [post update] : StrBuilder | provenance | MaD:424 |
 | StrBuilderTextTest.java:125:72:125:75 | sb69 : StrBuilder | StrBuilderTextTest.java:125:72:125:88 | substring(...) | provenance | MaD:501 |
 | StrBuilderTextTest.java:126:45:126:48 | sb70 [post update] : StrBuilder | StrBuilderTextTest.java:126:72:126:75 | sb70 : StrBuilder | provenance |  |
-| StrBuilderTextTest.java:126:57:126:63 | taint(...) : String | StrBuilderTextTest.java:126:45:126:48 | sb70 [post update] : StrBuilder | provenance | MaD:425 |
+| StrBuilderTextTest.java:126:57:126:63 | taint(...) : String | StrBuilderTextTest.java:126:45:126:48 | sb70 [post update] : StrBuilder | provenance | MaD:424 |
 | StrBuilderTextTest.java:126:72:126:75 | sb70 : StrBuilder | StrBuilderTextTest.java:126:72:126:91 | substring(...) | provenance | MaD:501 |
 | StrBuilderTextTest.java:127:45:127:48 | sb71 [post update] : StrBuilder | StrBuilderTextTest.java:127:72:127:75 | sb71 : StrBuilder | provenance |  |
-| StrBuilderTextTest.java:127:57:127:63 | taint(...) : String | StrBuilderTextTest.java:127:45:127:48 | sb71 [post update] : StrBuilder | provenance | MaD:425 |
+| StrBuilderTextTest.java:127:57:127:63 | taint(...) : String | StrBuilderTextTest.java:127:45:127:48 | sb71 [post update] : StrBuilder | provenance | MaD:424 |
 | StrBuilderTextTest.java:127:72:127:75 | sb71 : StrBuilder | StrBuilderTextTest.java:127:72:127:89 | toCharArray(...) | provenance | MaD:502 |
 | StrBuilderTextTest.java:128:45:128:48 | sb72 [post update] : StrBuilder | StrBuilderTextTest.java:128:72:128:75 | sb72 : StrBuilder | provenance |  |
-| StrBuilderTextTest.java:128:57:128:63 | taint(...) : String | StrBuilderTextTest.java:128:45:128:48 | sb72 [post update] : StrBuilder | provenance | MaD:425 |
+| StrBuilderTextTest.java:128:57:128:63 | taint(...) : String | StrBuilderTextTest.java:128:45:128:48 | sb72 [post update] : StrBuilder | provenance | MaD:424 |
 | StrBuilderTextTest.java:128:72:128:75 | sb72 : StrBuilder | StrBuilderTextTest.java:128:72:128:93 | toCharArray(...) | provenance | MaD:502 |
 | StrBuilderTextTest.java:129:45:129:48 | sb73 [post update] : StrBuilder | StrBuilderTextTest.java:129:72:129:75 | sb73 : StrBuilder | provenance |  |
-| StrBuilderTextTest.java:129:57:129:63 | taint(...) : String | StrBuilderTextTest.java:129:45:129:48 | sb73 [post update] : StrBuilder | provenance | MaD:425 |
+| StrBuilderTextTest.java:129:57:129:63 | taint(...) : String | StrBuilderTextTest.java:129:45:129:48 | sb73 [post update] : StrBuilder | provenance | MaD:424 |
 | StrBuilderTextTest.java:129:72:129:75 | sb73 : StrBuilder | StrBuilderTextTest.java:129:72:129:92 | toStringBuffer(...) | provenance | MaD:504 |
 | StrBuilderTextTest.java:130:45:130:48 | sb74 [post update] : StrBuilder | StrBuilderTextTest.java:130:72:130:75 | sb74 : StrBuilder | provenance |  |
-| StrBuilderTextTest.java:130:57:130:63 | taint(...) : String | StrBuilderTextTest.java:130:45:130:48 | sb74 [post update] : StrBuilder | provenance | MaD:425 |
+| StrBuilderTextTest.java:130:57:130:63 | taint(...) : String | StrBuilderTextTest.java:130:45:130:48 | sb74 [post update] : StrBuilder | provenance | MaD:424 |
 | StrBuilderTextTest.java:130:72:130:75 | sb74 : StrBuilder | StrBuilderTextTest.java:130:72:130:93 | toStringBuilder(...) | provenance | MaD:505 |
-| StrBuilderTextTest.java:135:14:135:58 | append(...) : StrBuilder | StrBuilderTextTest.java:135:14:135:82 | append(...) : StrBuilder | provenance | MaD:419 |
+| StrBuilderTextTest.java:135:14:135:58 | append(...) : StrBuilder | StrBuilderTextTest.java:135:14:135:82 | append(...) : StrBuilder | provenance | MaD:435 |
 | StrBuilderTextTest.java:135:14:135:82 | append(...) : StrBuilder | StrBuilderTextTest.java:135:14:135:93 | toString(...) | provenance | MaD:5 |
 | StrBuilderTextTest.java:135:14:135:82 | append(...) : StrBuilder | StrBuilderTextTest.java:135:14:135:93 | toString(...) | provenance | MaD:503 |
-| StrBuilderTextTest.java:135:51:135:57 | taint(...) : String | StrBuilderTextTest.java:135:14:135:58 | append(...) : StrBuilder | provenance | MaD:425+MaD:419 |
-| StrBuilderTextTest.java:138:9:138:45 | append(...) [post update] : StrBuilder | StrBuilderTextTest.java:139:14:139:31 | fluentBackflowTest : StrBuilder | provenance | MaD:419 |
-| StrBuilderTextTest.java:138:54:138:60 | taint(...) : String | StrBuilderTextTest.java:138:9:138:45 | append(...) [post update] : StrBuilder | provenance | MaD:425 |
+| StrBuilderTextTest.java:135:51:135:57 | taint(...) : String | StrBuilderTextTest.java:135:14:135:58 | append(...) : StrBuilder | provenance | MaD:424+MaD:435 |
+| StrBuilderTextTest.java:138:9:138:45 | append(...) [post update] : StrBuilder | StrBuilderTextTest.java:139:14:139:31 | fluentBackflowTest : StrBuilder | provenance | MaD:435 |
+| StrBuilderTextTest.java:138:54:138:60 | taint(...) : String | StrBuilderTextTest.java:138:9:138:45 | append(...) [post update] : StrBuilder | provenance | MaD:424 |
 | StrBuilderTextTest.java:139:14:139:31 | fluentBackflowTest : StrBuilder | StrBuilderTextTest.java:139:14:139:42 | toString(...) | provenance | MaD:5 |
 | StrBuilderTextTest.java:139:14:139:31 | fluentBackflowTest : StrBuilder | StrBuilderTextTest.java:139:14:139:42 | toString(...) | provenance | MaD:503 |
-| StrBuilderTextTest.java:143:9:143:46 | append(...) [post update] : StrBuilder | StrBuilderTextTest.java:144:14:144:32 | fluentBackflowTest2 : StrBuilder | provenance | MaD:419 |
-| StrBuilderTextTest.java:143:55:143:61 | taint(...) : String | StrBuilderTextTest.java:143:9:143:46 | append(...) [post update] : StrBuilder | provenance | MaD:425 |
+| StrBuilderTextTest.java:143:9:143:46 | append(...) [post update] : StrBuilder | StrBuilderTextTest.java:144:14:144:32 | fluentBackflowTest2 : StrBuilder | provenance | MaD:435 |
+| StrBuilderTextTest.java:143:55:143:61 | taint(...) : String | StrBuilderTextTest.java:143:9:143:46 | append(...) [post update] : StrBuilder | provenance | MaD:424 |
 | StrBuilderTextTest.java:144:14:144:32 | fluentBackflowTest2 : StrBuilder | StrBuilderTextTest.java:144:14:144:43 | toString(...) | provenance | MaD:5 |
 | StrBuilderTextTest.java:144:14:144:32 | fluentBackflowTest2 : StrBuilder | StrBuilderTextTest.java:144:14:144:43 | toString(...) | provenance | MaD:503 |
 | StrBuilderTextTest.java:147:43:147:65 | new StrBuilder(...) : StrBuilder | StrBuilderTextTest.java:148:14:148:33 | fluentAllMethodsTest : StrBuilder | provenance |  |
 | StrBuilderTextTest.java:147:58:147:64 | taint(...) : String | StrBuilderTextTest.java:147:43:147:65 | new StrBuilder(...) : StrBuilder | provenance | MaD:418 |
-| StrBuilderTextTest.java:148:14:148:33 | fluentAllMethodsTest : StrBuilder | StrBuilderTextTest.java:148:14:149:23 | append(...) : StrBuilder | provenance | MaD:419 |
-| StrBuilderTextTest.java:148:14:149:23 | append(...) : StrBuilder | StrBuilderTextTest.java:148:14:150:26 | appendAll(...) : StrBuilder | provenance | MaD:436 |
-| StrBuilderTextTest.java:148:14:150:26 | appendAll(...) : StrBuilder | StrBuilderTextTest.java:148:14:151:48 | appendFixedWidthPadLeft(...) : StrBuilder | provenance | MaD:440 |
-| StrBuilderTextTest.java:148:14:151:48 | appendFixedWidthPadLeft(...) : StrBuilder | StrBuilderTextTest.java:148:14:152:49 | appendFixedWidthPadRight(...) : StrBuilder | provenance | MaD:442 |
-| StrBuilderTextTest.java:148:14:152:49 | appendFixedWidthPadRight(...) : StrBuilder | StrBuilderTextTest.java:148:14:153:25 | appendln(...) : StrBuilder | provenance | MaD:457 |
+| StrBuilderTextTest.java:148:14:148:33 | fluentAllMethodsTest : StrBuilder | StrBuilderTextTest.java:148:14:149:23 | append(...) : StrBuilder | provenance | MaD:435 |
+| StrBuilderTextTest.java:148:14:149:23 | append(...) : StrBuilder | StrBuilderTextTest.java:148:14:150:26 | appendAll(...) : StrBuilder | provenance | MaD:439 |
+| StrBuilderTextTest.java:148:14:150:26 | appendAll(...) : StrBuilder | StrBuilderTextTest.java:148:14:151:48 | appendFixedWidthPadLeft(...) : StrBuilder | provenance | MaD:441 |
+| StrBuilderTextTest.java:148:14:151:48 | appendFixedWidthPadLeft(...) : StrBuilder | StrBuilderTextTest.java:148:14:152:49 | appendFixedWidthPadRight(...) : StrBuilder | provenance | MaD:443 |
+| StrBuilderTextTest.java:148:14:152:49 | appendFixedWidthPadRight(...) : StrBuilder | StrBuilderTextTest.java:148:14:153:25 | appendln(...) : StrBuilder | provenance | MaD:469 |
 | StrBuilderTextTest.java:148:14:153:25 | appendln(...) : StrBuilder | StrBuilderTextTest.java:148:14:154:24 | appendNewLine(...) : StrBuilder | provenance | MaD:444 |
 | StrBuilderTextTest.java:148:14:154:24 | appendNewLine(...) : StrBuilder | StrBuilderTextTest.java:148:14:155:21 | appendNull(...) : StrBuilder | provenance | MaD:445 |
 | StrBuilderTextTest.java:148:14:155:21 | appendNull(...) : StrBuilder | StrBuilderTextTest.java:148:14:156:30 | appendPadding(...) : StrBuilder | provenance | MaD:446 |
-| StrBuilderTextTest.java:148:14:156:30 | appendPadding(...) : StrBuilder | StrBuilderTextTest.java:148:14:157:29 | appendSeparator(...) : StrBuilder | provenance | MaD:447 |
-| StrBuilderTextTest.java:148:14:157:29 | appendSeparator(...) : StrBuilder | StrBuilderTextTest.java:148:14:158:52 | appendWithSeparators(...) : StrBuilder | provenance | MaD:452 |
+| StrBuilderTextTest.java:148:14:156:30 | appendPadding(...) : StrBuilder | StrBuilderTextTest.java:148:14:157:29 | appendSeparator(...) : StrBuilder | provenance | MaD:450 |
+| StrBuilderTextTest.java:148:14:157:29 | appendSeparator(...) : StrBuilder | StrBuilderTextTest.java:148:14:158:52 | appendWithSeparators(...) : StrBuilder | provenance | MaD:456 |
 | StrBuilderTextTest.java:148:14:158:52 | appendWithSeparators(...) : StrBuilder | StrBuilderTextTest.java:148:14:159:21 | delete(...) : StrBuilder | provenance | MaD:473 |
 | StrBuilderTextTest.java:148:14:159:21 | delete(...) : StrBuilder | StrBuilderTextTest.java:148:14:160:23 | deleteAll(...) : StrBuilder | provenance | MaD:474 |
 | StrBuilderTextTest.java:148:14:160:23 | deleteAll(...) : StrBuilder | StrBuilderTextTest.java:148:14:161:24 | deleteCharAt(...) : StrBuilder | provenance | MaD:475 |
 | StrBuilderTextTest.java:148:14:161:24 | deleteCharAt(...) : StrBuilder | StrBuilderTextTest.java:148:14:162:29 | deleteFirst(...) : StrBuilder | provenance | MaD:476 |
 | StrBuilderTextTest.java:148:14:162:29 | deleteFirst(...) : StrBuilder | StrBuilderTextTest.java:148:14:163:28 | ensureCapacity(...) : StrBuilder | provenance | MaD:477 |
-| StrBuilderTextTest.java:148:14:163:28 | ensureCapacity(...) : StrBuilder | StrBuilderTextTest.java:148:14:164:30 | insert(...) : StrBuilder | provenance | MaD:481 |
+| StrBuilderTextTest.java:148:14:163:28 | ensureCapacity(...) : StrBuilder | StrBuilderTextTest.java:148:14:164:30 | insert(...) : StrBuilder | provenance | MaD:482 |
 | StrBuilderTextTest.java:148:14:164:30 | insert(...) : StrBuilder | StrBuilderTextTest.java:148:14:165:27 | minimizeCapacity(...) : StrBuilder | provenance | MaD:485 |
-| StrBuilderTextTest.java:148:14:165:27 | minimizeCapacity(...) : StrBuilder | StrBuilderTextTest.java:148:14:166:37 | replace(...) : StrBuilder | provenance | MaD:487 |
-| StrBuilderTextTest.java:148:14:166:37 | replace(...) : StrBuilder | StrBuilderTextTest.java:148:14:167:38 | replaceAll(...) : StrBuilder | provenance | MaD:490 |
-| StrBuilderTextTest.java:148:14:167:38 | replaceAll(...) : StrBuilder | StrBuilderTextTest.java:148:14:168:40 | replaceFirst(...) : StrBuilder | provenance | MaD:492 |
+| StrBuilderTextTest.java:148:14:165:27 | minimizeCapacity(...) : StrBuilder | StrBuilderTextTest.java:148:14:166:37 | replace(...) : StrBuilder | provenance | MaD:489 |
+| StrBuilderTextTest.java:148:14:166:37 | replace(...) : StrBuilder | StrBuilderTextTest.java:148:14:167:38 | replaceAll(...) : StrBuilder | provenance | MaD:491 |
+| StrBuilderTextTest.java:148:14:167:38 | replaceAll(...) : StrBuilder | StrBuilderTextTest.java:148:14:168:40 | replaceFirst(...) : StrBuilder | provenance | MaD:493 |
 | StrBuilderTextTest.java:148:14:168:40 | replaceFirst(...) : StrBuilder | StrBuilderTextTest.java:148:14:169:18 | reverse(...) : StrBuilder | provenance | MaD:494 |
 | StrBuilderTextTest.java:148:14:169:18 | reverse(...) : StrBuilder | StrBuilderTextTest.java:148:14:170:26 | setCharAt(...) : StrBuilder | provenance | MaD:496 |
 | StrBuilderTextTest.java:148:14:170:26 | setCharAt(...) : StrBuilder | StrBuilderTextTest.java:148:14:171:23 | setLength(...) : StrBuilder | provenance | MaD:497 |
@@ -2041,12 +2015,12 @@ edges
 | StrBuilderTextTest.java:148:14:172:34 | setNewLineText(...) : StrBuilder | StrBuilderTextTest.java:148:14:173:28 | setNullText(...) : StrBuilder | provenance | MaD:499 |
 | StrBuilderTextTest.java:148:14:173:28 | setNullText(...) : StrBuilder | StrBuilderTextTest.java:148:14:174:15 | trim(...) | provenance | MaD:506 |
 | StrBuilderTextTest.java:178:9:204:15 | trim(...) [post update] : StrBuilder | StrBuilderTextTest.java:206:14:206:34 | fluentAllMethodsTest2 | provenance | MaD:506 |
-| StrBuilderTextTest.java:205:17:205:23 | taint(...) : String | StrBuilderTextTest.java:178:9:204:15 | trim(...) [post update] : StrBuilder | provenance | MaD:425 |
+| StrBuilderTextTest.java:205:17:205:23 | taint(...) : String | StrBuilderTextTest.java:178:9:204:15 | trim(...) [post update] : StrBuilder | provenance | MaD:424 |
 | StrLookupTest.java:12:7:12:9 | map [post update] : HashMap [<map.value>] : String | StrLookupTest.java:13:54:13:56 | map : HashMap [<map.value>] : String | provenance |  |
-| StrLookupTest.java:12:22:12:28 | taint(...) : String | StrLookupTest.java:12:7:12:9 | map [post update] : HashMap [<map.value>] : String | provenance | MaD:16 |
+| StrLookupTest.java:12:22:12:28 | taint(...) : String | StrLookupTest.java:12:7:12:9 | map [post update] : HashMap [<map.value>] : String | provenance | MaD:18 |
 | StrLookupTest.java:13:34:13:57 | mapLookup(...) : StrLookup | StrLookupTest.java:14:12:14:17 | lookup : StrLookup | provenance |  |
-| StrLookupTest.java:13:54:13:56 | map : HashMap [<map.value>] : String | StrLookupTest.java:13:34:13:57 | mapLookup(...) : StrLookup | provenance | MaD:316 |
-| StrLookupTest.java:14:12:14:17 | lookup : StrLookup | StrLookupTest.java:14:12:14:31 | lookup(...) | provenance | MaD:315 |
+| StrLookupTest.java:13:54:13:56 | map : HashMap [<map.value>] : String | StrLookupTest.java:13:34:13:57 | mapLookup(...) : StrLookup | provenance | MaD:124 |
+| StrLookupTest.java:14:12:14:17 | lookup : StrLookup | StrLookupTest.java:14:12:14:31 | lookup(...) | provenance | MaD:123 |
 | StrSubstitutorTest.java:16:7:16:16 | taintedMap [post update] : HashMap [<map.value>] : String | StrSubstitutorTest.java:17:61:17:70 | taintedMap : HashMap [<map.value>] : String | provenance |  |
 | StrSubstitutorTest.java:16:7:16:16 | taintedMap [post update] : HashMap [<map.value>] : String | StrSubstitutorTest.java:21:47:21:56 | taintedMap : HashMap [<map.value>] : String | provenance |  |
 | StrSubstitutorTest.java:16:7:16:16 | taintedMap [post update] : HashMap [<map.value>] : String | StrSubstitutorTest.java:22:47:22:56 | taintedMap : HashMap [<map.value>] : String | provenance |  |
@@ -2054,14 +2028,14 @@ edges
 | StrSubstitutorTest.java:16:7:16:16 | taintedMap [post update] : HashMap [<map.value>] : String | StrSubstitutorTest.java:24:47:24:56 | taintedMap : HashMap [<map.value>] : String | provenance |  |
 | StrSubstitutorTest.java:16:7:16:16 | taintedMap [post update] : HashMap [<map.value>] : String | StrSubstitutorTest.java:66:44:66:53 | taintedMap : HashMap [<map.value>] : String | provenance |  |
 | StrSubstitutorTest.java:16:7:16:16 | taintedMap [post update] : HashMap [<map.value>] : String | StrSubstitutorTest.java:67:44:67:53 | taintedMap : HashMap [<map.value>] : String | provenance |  |
-| StrSubstitutorTest.java:16:29:16:35 | taint(...) : String | StrSubstitutorTest.java:16:7:16:16 | taintedMap [post update] : HashMap [<map.value>] : String | provenance | MaD:16 |
+| StrSubstitutorTest.java:16:29:16:35 | taint(...) : String | StrSubstitutorTest.java:16:7:16:16 | taintedMap [post update] : HashMap [<map.value>] : String | provenance | MaD:18 |
 | StrSubstitutorTest.java:17:41:17:71 | mapLookup(...) : StrLookup | StrSubstitutorTest.java:20:74:20:86 | taintedLookup : StrLookup | provenance |  |
 | StrSubstitutorTest.java:17:41:17:71 | mapLookup(...) : StrLookup | StrSubstitutorTest.java:25:47:25:59 | taintedLookup : StrLookup | provenance |  |
 | StrSubstitutorTest.java:17:41:17:71 | mapLookup(...) : StrLookup | StrSubstitutorTest.java:26:47:26:59 | taintedLookup : StrLookup | provenance |  |
 | StrSubstitutorTest.java:17:41:17:71 | mapLookup(...) : StrLookup | StrSubstitutorTest.java:27:47:27:59 | taintedLookup : StrLookup | provenance |  |
 | StrSubstitutorTest.java:17:41:17:71 | mapLookup(...) : StrLookup | StrSubstitutorTest.java:28:47:28:59 | taintedLookup : StrLookup | provenance |  |
 | StrSubstitutorTest.java:17:41:17:71 | mapLookup(...) : StrLookup | StrSubstitutorTest.java:29:48:29:60 | taintedLookup : StrLookup | provenance |  |
-| StrSubstitutorTest.java:17:61:17:70 | taintedMap : HashMap [<map.value>] : String | StrSubstitutorTest.java:17:41:17:71 | mapLookup(...) : StrLookup | provenance | MaD:316 |
+| StrSubstitutorTest.java:17:61:17:70 | taintedMap : HashMap [<map.value>] : String | StrSubstitutorTest.java:17:41:17:71 | mapLookup(...) : StrLookup | provenance | MaD:124 |
 | StrSubstitutorTest.java:20:50:20:52 | ss1 [post update] : StrSubstitutor | StrSubstitutorTest.java:20:95:20:97 | ss1 : StrSubstitutor | provenance |  |
 | StrSubstitutorTest.java:20:50:20:52 | ss1 [post update] : StrSubstitutor | StrSubstitutorTest.java:49:12:49:25 | untaintedSubst : StrSubstitutor | provenance |  |
 | StrSubstitutorTest.java:20:50:20:52 | ss1 [post update] : StrSubstitutor | StrSubstitutorTest.java:50:12:50:25 | untaintedSubst : StrSubstitutor | provenance |  |
@@ -2076,8 +2050,8 @@ edges
 | StrSubstitutorTest.java:20:50:20:52 | ss1 [post update] : StrSubstitutor | StrSubstitutorTest.java:59:12:59:25 | untaintedSubst : StrSubstitutor | provenance |  |
 | StrSubstitutorTest.java:20:50:20:52 | ss1 [post update] : StrSubstitutor | StrSubstitutorTest.java:60:12:60:25 | untaintedSubst : StrSubstitutor | provenance |  |
 | StrSubstitutorTest.java:20:50:20:52 | ss1 [post update] : StrSubstitutor | StrSubstitutorTest.java:61:12:61:25 | untaintedSubst : StrSubstitutor | provenance |  |
-| StrSubstitutorTest.java:20:74:20:86 | taintedLookup : StrLookup | StrSubstitutorTest.java:20:50:20:52 | ss1 [post update] : StrSubstitutor | provenance | MaD:343 |
-| StrSubstitutorTest.java:20:95:20:97 | ss1 : StrSubstitutor | StrSubstitutorTest.java:20:95:20:114 | replace(...) | provenance | MaD:319 |
+| StrSubstitutorTest.java:20:74:20:86 | taintedLookup : StrLookup | StrSubstitutorTest.java:20:50:20:52 | ss1 [post update] : StrSubstitutor | provenance | MaD:151 |
+| StrSubstitutorTest.java:20:95:20:97 | ss1 : StrSubstitutor | StrSubstitutorTest.java:20:95:20:114 | replace(...) | provenance | MaD:144 |
 | StrSubstitutorTest.java:21:28:21:57 | new StrSubstitutor(...) : StrSubstitutor | StrSubstitutorTest.java:21:65:21:67 | ss2 : StrSubstitutor | provenance |  |
 | StrSubstitutorTest.java:21:28:21:57 | new StrSubstitutor(...) : StrSubstitutor | StrSubstitutorTest.java:33:12:33:23 | taintedSubst : StrSubstitutor | provenance |  |
 | StrSubstitutorTest.java:21:28:21:57 | new StrSubstitutor(...) : StrSubstitutor | StrSubstitutorTest.java:34:12:34:23 | taintedSubst : StrSubstitutor | provenance |  |
@@ -2098,180 +2072,180 @@ edges
 | StrSubstitutorTest.java:21:28:21:57 | new StrSubstitutor(...) : StrSubstitutor | StrSubstitutorTest.java:77:59:77:70 | taintedSubst : StrSubstitutor | provenance |  |
 | StrSubstitutorTest.java:21:28:21:57 | new StrSubstitutor(...) : StrSubstitutor | StrSubstitutorTest.java:78:56:78:67 | taintedSubst : StrSubstitutor | provenance |  |
 | StrSubstitutorTest.java:21:28:21:57 | new StrSubstitutor(...) : StrSubstitutor | StrSubstitutorTest.java:79:56:79:67 | taintedSubst : StrSubstitutor | provenance |  |
-| StrSubstitutorTest.java:21:47:21:56 | taintedMap : HashMap [<map.value>] : String | StrSubstitutorTest.java:21:28:21:57 | new StrSubstitutor(...) : StrSubstitutor | provenance | MaD:318 |
-| StrSubstitutorTest.java:21:65:21:67 | ss2 : StrSubstitutor | StrSubstitutorTest.java:21:65:21:84 | replace(...) | provenance | MaD:319 |
+| StrSubstitutorTest.java:21:47:21:56 | taintedMap : HashMap [<map.value>] : String | StrSubstitutorTest.java:21:28:21:57 | new StrSubstitutor(...) : StrSubstitutor | provenance | MaD:125 |
+| StrSubstitutorTest.java:21:65:21:67 | ss2 : StrSubstitutor | StrSubstitutorTest.java:21:65:21:84 | replace(...) | provenance | MaD:144 |
 | StrSubstitutorTest.java:22:28:22:67 | new StrSubstitutor(...) : StrSubstitutor | StrSubstitutorTest.java:22:75:22:77 | ss3 : StrSubstitutor | provenance |  |
-| StrSubstitutorTest.java:22:47:22:56 | taintedMap : HashMap [<map.value>] : String | StrSubstitutorTest.java:22:28:22:67 | new StrSubstitutor(...) : StrSubstitutor | provenance | MaD:318 |
-| StrSubstitutorTest.java:22:75:22:77 | ss3 : StrSubstitutor | StrSubstitutorTest.java:22:75:22:94 | replace(...) | provenance | MaD:319 |
+| StrSubstitutorTest.java:22:47:22:56 | taintedMap : HashMap [<map.value>] : String | StrSubstitutorTest.java:22:28:22:67 | new StrSubstitutor(...) : StrSubstitutor | provenance | MaD:125 |
+| StrSubstitutorTest.java:22:75:22:77 | ss3 : StrSubstitutor | StrSubstitutorTest.java:22:75:22:94 | replace(...) | provenance | MaD:144 |
 | StrSubstitutorTest.java:23:28:23:72 | new StrSubstitutor(...) : StrSubstitutor | StrSubstitutorTest.java:23:80:23:82 | ss4 : StrSubstitutor | provenance |  |
-| StrSubstitutorTest.java:23:47:23:56 | taintedMap : HashMap [<map.value>] : String | StrSubstitutorTest.java:23:28:23:72 | new StrSubstitutor(...) : StrSubstitutor | provenance | MaD:318 |
-| StrSubstitutorTest.java:23:80:23:82 | ss4 : StrSubstitutor | StrSubstitutorTest.java:23:80:23:99 | replace(...) | provenance | MaD:319 |
+| StrSubstitutorTest.java:23:47:23:56 | taintedMap : HashMap [<map.value>] : String | StrSubstitutorTest.java:23:28:23:72 | new StrSubstitutor(...) : StrSubstitutor | provenance | MaD:125 |
+| StrSubstitutorTest.java:23:80:23:82 | ss4 : StrSubstitutor | StrSubstitutorTest.java:23:80:23:99 | replace(...) | provenance | MaD:144 |
 | StrSubstitutorTest.java:24:28:24:77 | new StrSubstitutor(...) : StrSubstitutor | StrSubstitutorTest.java:24:85:24:87 | ss5 : StrSubstitutor | provenance |  |
-| StrSubstitutorTest.java:24:47:24:56 | taintedMap : HashMap [<map.value>] : String | StrSubstitutorTest.java:24:28:24:77 | new StrSubstitutor(...) : StrSubstitutor | provenance | MaD:318 |
-| StrSubstitutorTest.java:24:85:24:87 | ss5 : StrSubstitutor | StrSubstitutorTest.java:24:85:24:104 | replace(...) | provenance | MaD:319 |
+| StrSubstitutorTest.java:24:47:24:56 | taintedMap : HashMap [<map.value>] : String | StrSubstitutorTest.java:24:28:24:77 | new StrSubstitutor(...) : StrSubstitutor | provenance | MaD:125 |
+| StrSubstitutorTest.java:24:85:24:87 | ss5 : StrSubstitutor | StrSubstitutorTest.java:24:85:24:104 | replace(...) | provenance | MaD:144 |
 | StrSubstitutorTest.java:25:28:25:60 | new StrSubstitutor(...) : StrSubstitutor | StrSubstitutorTest.java:25:68:25:70 | ss6 : StrSubstitutor | provenance |  |
-| StrSubstitutorTest.java:25:47:25:59 | taintedLookup : StrLookup | StrSubstitutorTest.java:25:28:25:60 | new StrSubstitutor(...) : StrSubstitutor | provenance | MaD:317 |
-| StrSubstitutorTest.java:25:47:25:59 | taintedLookup : StrLookup | StrSubstitutorTest.java:25:28:25:60 | new StrSubstitutor(...) : StrSubstitutor | provenance | MaD:318 |
-| StrSubstitutorTest.java:25:68:25:70 | ss6 : StrSubstitutor | StrSubstitutorTest.java:25:68:25:87 | replace(...) | provenance | MaD:319 |
+| StrSubstitutorTest.java:25:47:25:59 | taintedLookup : StrLookup | StrSubstitutorTest.java:25:28:25:60 | new StrSubstitutor(...) : StrSubstitutor | provenance | MaD:125 |
+| StrSubstitutorTest.java:25:47:25:59 | taintedLookup : StrLookup | StrSubstitutorTest.java:25:28:25:60 | new StrSubstitutor(...) : StrSubstitutor | provenance | MaD:126 |
+| StrSubstitutorTest.java:25:68:25:70 | ss6 : StrSubstitutor | StrSubstitutorTest.java:25:68:25:87 | replace(...) | provenance | MaD:144 |
 | StrSubstitutorTest.java:26:28:26:75 | new StrSubstitutor(...) : StrSubstitutor | StrSubstitutorTest.java:26:83:26:85 | ss7 : StrSubstitutor | provenance |  |
-| StrSubstitutorTest.java:26:47:26:59 | taintedLookup : StrLookup | StrSubstitutorTest.java:26:28:26:75 | new StrSubstitutor(...) : StrSubstitutor | provenance | MaD:317 |
-| StrSubstitutorTest.java:26:47:26:59 | taintedLookup : StrLookup | StrSubstitutorTest.java:26:28:26:75 | new StrSubstitutor(...) : StrSubstitutor | provenance | MaD:318 |
-| StrSubstitutorTest.java:26:83:26:85 | ss7 : StrSubstitutor | StrSubstitutorTest.java:26:83:26:102 | replace(...) | provenance | MaD:319 |
+| StrSubstitutorTest.java:26:47:26:59 | taintedLookup : StrLookup | StrSubstitutorTest.java:26:28:26:75 | new StrSubstitutor(...) : StrSubstitutor | provenance | MaD:125 |
+| StrSubstitutorTest.java:26:47:26:59 | taintedLookup : StrLookup | StrSubstitutorTest.java:26:28:26:75 | new StrSubstitutor(...) : StrSubstitutor | provenance | MaD:126 |
+| StrSubstitutorTest.java:26:83:26:85 | ss7 : StrSubstitutor | StrSubstitutorTest.java:26:83:26:102 | replace(...) | provenance | MaD:144 |
 | StrSubstitutorTest.java:27:28:27:80 | new StrSubstitutor(...) : StrSubstitutor | StrSubstitutorTest.java:27:88:27:90 | ss8 : StrSubstitutor | provenance |  |
-| StrSubstitutorTest.java:27:47:27:59 | taintedLookup : StrLookup | StrSubstitutorTest.java:27:28:27:80 | new StrSubstitutor(...) : StrSubstitutor | provenance | MaD:317 |
-| StrSubstitutorTest.java:27:47:27:59 | taintedLookup : StrLookup | StrSubstitutorTest.java:27:28:27:80 | new StrSubstitutor(...) : StrSubstitutor | provenance | MaD:318 |
-| StrSubstitutorTest.java:27:88:27:90 | ss8 : StrSubstitutor | StrSubstitutorTest.java:27:88:27:107 | replace(...) | provenance | MaD:319 |
+| StrSubstitutorTest.java:27:47:27:59 | taintedLookup : StrLookup | StrSubstitutorTest.java:27:28:27:80 | new StrSubstitutor(...) : StrSubstitutor | provenance | MaD:125 |
+| StrSubstitutorTest.java:27:47:27:59 | taintedLookup : StrLookup | StrSubstitutorTest.java:27:28:27:80 | new StrSubstitutor(...) : StrSubstitutor | provenance | MaD:126 |
+| StrSubstitutorTest.java:27:88:27:90 | ss8 : StrSubstitutor | StrSubstitutorTest.java:27:88:27:107 | replace(...) | provenance | MaD:144 |
 | StrSubstitutorTest.java:28:28:28:89 | new StrSubstitutor(...) : StrSubstitutor | StrSubstitutorTest.java:28:97:28:99 | ss9 : StrSubstitutor | provenance |  |
-| StrSubstitutorTest.java:28:47:28:59 | taintedLookup : StrLookup | StrSubstitutorTest.java:28:28:28:89 | new StrSubstitutor(...) : StrSubstitutor | provenance | MaD:317 |
-| StrSubstitutorTest.java:28:47:28:59 | taintedLookup : StrLookup | StrSubstitutorTest.java:28:28:28:89 | new StrSubstitutor(...) : StrSubstitutor | provenance | MaD:318 |
-| StrSubstitutorTest.java:28:97:28:99 | ss9 : StrSubstitutor | StrSubstitutorTest.java:28:97:28:116 | replace(...) | provenance | MaD:319 |
+| StrSubstitutorTest.java:28:47:28:59 | taintedLookup : StrLookup | StrSubstitutorTest.java:28:28:28:89 | new StrSubstitutor(...) : StrSubstitutor | provenance | MaD:125 |
+| StrSubstitutorTest.java:28:47:28:59 | taintedLookup : StrLookup | StrSubstitutorTest.java:28:28:28:89 | new StrSubstitutor(...) : StrSubstitutor | provenance | MaD:126 |
+| StrSubstitutorTest.java:28:97:28:99 | ss9 : StrSubstitutor | StrSubstitutorTest.java:28:97:28:116 | replace(...) | provenance | MaD:144 |
 | StrSubstitutorTest.java:29:29:29:96 | new StrSubstitutor(...) : StrSubstitutor | StrSubstitutorTest.java:29:104:29:107 | ss10 : StrSubstitutor | provenance |  |
-| StrSubstitutorTest.java:29:48:29:60 | taintedLookup : StrLookup | StrSubstitutorTest.java:29:29:29:96 | new StrSubstitutor(...) : StrSubstitutor | provenance | MaD:317 |
-| StrSubstitutorTest.java:29:48:29:60 | taintedLookup : StrLookup | StrSubstitutorTest.java:29:29:29:96 | new StrSubstitutor(...) : StrSubstitutor | provenance | MaD:318 |
-| StrSubstitutorTest.java:29:104:29:107 | ss10 : StrSubstitutor | StrSubstitutorTest.java:29:104:29:124 | replace(...) | provenance | MaD:319 |
-| StrSubstitutorTest.java:33:12:33:23 | taintedSubst : StrSubstitutor | StrSubstitutorTest.java:33:12:33:48 | replace(...) | provenance | MaD:319 |
-| StrSubstitutorTest.java:34:12:34:23 | taintedSubst : StrSubstitutor | StrSubstitutorTest.java:34:12:34:40 | replace(...) | provenance | MaD:319 |
-| StrSubstitutorTest.java:35:12:35:23 | taintedSubst : StrSubstitutor | StrSubstitutorTest.java:35:12:35:46 | replace(...) | provenance | MaD:319 |
-| StrSubstitutorTest.java:36:12:36:23 | taintedSubst : StrSubstitutor | StrSubstitutorTest.java:36:12:36:54 | replace(...) | provenance | MaD:319 |
-| StrSubstitutorTest.java:37:12:37:23 | taintedSubst : StrSubstitutor | StrSubstitutorTest.java:37:12:37:60 | replace(...) | provenance | MaD:319 |
-| StrSubstitutorTest.java:38:12:38:23 | taintedSubst : StrSubstitutor | StrSubstitutorTest.java:38:12:38:54 | replace(...) | provenance | MaD:319 |
-| StrSubstitutorTest.java:39:12:39:23 | taintedSubst : StrSubstitutor | StrSubstitutorTest.java:39:12:39:60 | replace(...) | provenance | MaD:319 |
-| StrSubstitutorTest.java:40:12:40:23 | taintedSubst : StrSubstitutor | StrSubstitutorTest.java:40:12:40:56 | replace(...) | provenance | MaD:319 |
-| StrSubstitutorTest.java:41:12:41:23 | taintedSubst : StrSubstitutor | StrSubstitutorTest.java:41:12:41:62 | replace(...) | provenance | MaD:319 |
-| StrSubstitutorTest.java:42:12:42:23 | taintedSubst : StrSubstitutor | StrSubstitutorTest.java:42:12:42:59 | replace(...) | provenance | MaD:319 |
-| StrSubstitutorTest.java:43:12:43:23 | taintedSubst : StrSubstitutor | StrSubstitutorTest.java:43:12:43:65 | replace(...) | provenance | MaD:319 |
-| StrSubstitutorTest.java:44:12:44:23 | taintedSubst : StrSubstitutor | StrSubstitutorTest.java:44:12:44:58 | replace(...) | provenance | MaD:319 |
-| StrSubstitutorTest.java:45:12:45:23 | taintedSubst : StrSubstitutor | StrSubstitutorTest.java:45:12:45:64 | replace(...) | provenance | MaD:319 |
-| StrSubstitutorTest.java:49:12:49:25 | untaintedSubst : StrSubstitutor | StrSubstitutorTest.java:49:12:49:50 | replace(...) | provenance | MaD:319 |
-| StrSubstitutorTest.java:49:35:49:49 | (...)... : String | StrSubstitutorTest.java:49:12:49:50 | replace(...) | provenance | MaD:324 |
+| StrSubstitutorTest.java:29:48:29:60 | taintedLookup : StrLookup | StrSubstitutorTest.java:29:29:29:96 | new StrSubstitutor(...) : StrSubstitutor | provenance | MaD:125 |
+| StrSubstitutorTest.java:29:48:29:60 | taintedLookup : StrLookup | StrSubstitutorTest.java:29:29:29:96 | new StrSubstitutor(...) : StrSubstitutor | provenance | MaD:126 |
+| StrSubstitutorTest.java:29:104:29:107 | ss10 : StrSubstitutor | StrSubstitutorTest.java:29:104:29:124 | replace(...) | provenance | MaD:144 |
+| StrSubstitutorTest.java:33:12:33:23 | taintedSubst : StrSubstitutor | StrSubstitutorTest.java:33:12:33:48 | replace(...) | provenance | MaD:144 |
+| StrSubstitutorTest.java:34:12:34:23 | taintedSubst : StrSubstitutor | StrSubstitutorTest.java:34:12:34:40 | replace(...) | provenance | MaD:144 |
+| StrSubstitutorTest.java:35:12:35:23 | taintedSubst : StrSubstitutor | StrSubstitutorTest.java:35:12:35:46 | replace(...) | provenance | MaD:144 |
+| StrSubstitutorTest.java:36:12:36:23 | taintedSubst : StrSubstitutor | StrSubstitutorTest.java:36:12:36:54 | replace(...) | provenance | MaD:144 |
+| StrSubstitutorTest.java:37:12:37:23 | taintedSubst : StrSubstitutor | StrSubstitutorTest.java:37:12:37:60 | replace(...) | provenance | MaD:144 |
+| StrSubstitutorTest.java:38:12:38:23 | taintedSubst : StrSubstitutor | StrSubstitutorTest.java:38:12:38:54 | replace(...) | provenance | MaD:144 |
+| StrSubstitutorTest.java:39:12:39:23 | taintedSubst : StrSubstitutor | StrSubstitutorTest.java:39:12:39:60 | replace(...) | provenance | MaD:144 |
+| StrSubstitutorTest.java:40:12:40:23 | taintedSubst : StrSubstitutor | StrSubstitutorTest.java:40:12:40:56 | replace(...) | provenance | MaD:144 |
+| StrSubstitutorTest.java:41:12:41:23 | taintedSubst : StrSubstitutor | StrSubstitutorTest.java:41:12:41:62 | replace(...) | provenance | MaD:144 |
+| StrSubstitutorTest.java:42:12:42:23 | taintedSubst : StrSubstitutor | StrSubstitutorTest.java:42:12:42:59 | replace(...) | provenance | MaD:144 |
+| StrSubstitutorTest.java:43:12:43:23 | taintedSubst : StrSubstitutor | StrSubstitutorTest.java:43:12:43:65 | replace(...) | provenance | MaD:144 |
+| StrSubstitutorTest.java:44:12:44:23 | taintedSubst : StrSubstitutor | StrSubstitutorTest.java:44:12:44:58 | replace(...) | provenance | MaD:144 |
+| StrSubstitutorTest.java:45:12:45:23 | taintedSubst : StrSubstitutor | StrSubstitutorTest.java:45:12:45:64 | replace(...) | provenance | MaD:144 |
+| StrSubstitutorTest.java:49:12:49:25 | untaintedSubst : StrSubstitutor | StrSubstitutorTest.java:49:12:49:50 | replace(...) | provenance | MaD:144 |
+| StrSubstitutorTest.java:49:35:49:49 | (...)... : String | StrSubstitutorTest.java:49:12:49:50 | replace(...) | provenance | MaD:131 |
 | StrSubstitutorTest.java:49:43:49:49 | taint(...) : String | StrSubstitutorTest.java:49:35:49:49 | (...)... : String | provenance |  |
-| StrSubstitutorTest.java:50:12:50:25 | untaintedSubst : StrSubstitutor | StrSubstitutorTest.java:50:12:50:42 | replace(...) | provenance | MaD:319 |
-| StrSubstitutorTest.java:50:35:50:41 | taint(...) : String | StrSubstitutorTest.java:50:12:50:42 | replace(...) | provenance | MaD:331 |
-| StrSubstitutorTest.java:51:12:51:25 | untaintedSubst : StrSubstitutor | StrSubstitutorTest.java:51:12:51:48 | replace(...) | provenance | MaD:319 |
-| StrSubstitutorTest.java:51:35:51:41 | taint(...) : String | StrSubstitutorTest.java:51:12:51:48 | replace(...) | provenance | MaD:332 |
-| StrSubstitutorTest.java:52:12:52:25 | untaintedSubst : StrSubstitutor | StrSubstitutorTest.java:52:12:52:56 | replace(...) | provenance | MaD:319 |
+| StrSubstitutorTest.java:50:12:50:25 | untaintedSubst : StrSubstitutor | StrSubstitutorTest.java:50:12:50:42 | replace(...) | provenance | MaD:144 |
+| StrSubstitutorTest.java:50:35:50:41 | taint(...) : String | StrSubstitutorTest.java:50:12:50:42 | replace(...) | provenance | MaD:138 |
+| StrSubstitutorTest.java:51:12:51:25 | untaintedSubst : StrSubstitutor | StrSubstitutorTest.java:51:12:51:48 | replace(...) | provenance | MaD:144 |
+| StrSubstitutorTest.java:51:35:51:41 | taint(...) : String | StrSubstitutorTest.java:51:12:51:48 | replace(...) | provenance | MaD:139 |
+| StrSubstitutorTest.java:52:12:52:25 | untaintedSubst : StrSubstitutor | StrSubstitutorTest.java:52:12:52:56 | replace(...) | provenance | MaD:144 |
 | StrSubstitutorTest.java:52:35:52:41 | taint(...) : String | StrSubstitutorTest.java:52:35:52:55 | toCharArray(...) : char[] | provenance | MaD:7 |
-| StrSubstitutorTest.java:52:35:52:55 | toCharArray(...) : char[] | StrSubstitutorTest.java:52:12:52:56 | replace(...) | provenance | MaD:320 |
-| StrSubstitutorTest.java:53:12:53:25 | untaintedSubst : StrSubstitutor | StrSubstitutorTest.java:53:12:53:62 | replace(...) | provenance | MaD:319 |
+| StrSubstitutorTest.java:52:35:52:55 | toCharArray(...) : char[] | StrSubstitutorTest.java:52:12:52:56 | replace(...) | provenance | MaD:127 |
+| StrSubstitutorTest.java:53:12:53:25 | untaintedSubst : StrSubstitutor | StrSubstitutorTest.java:53:12:53:62 | replace(...) | provenance | MaD:144 |
 | StrSubstitutorTest.java:53:35:53:41 | taint(...) : String | StrSubstitutorTest.java:53:35:53:55 | toCharArray(...) : char[] | provenance | MaD:7 |
-| StrSubstitutorTest.java:53:35:53:55 | toCharArray(...) : char[] | StrSubstitutorTest.java:53:12:53:62 | replace(...) | provenance | MaD:321 |
-| StrSubstitutorTest.java:54:12:54:25 | untaintedSubst : StrSubstitutor | StrSubstitutorTest.java:54:12:54:56 | replace(...) | provenance | MaD:319 |
-| StrSubstitutorTest.java:54:35:54:55 | (...)... : String | StrSubstitutorTest.java:54:12:54:56 | replace(...) | provenance | MaD:322 |
+| StrSubstitutorTest.java:53:35:53:55 | toCharArray(...) : char[] | StrSubstitutorTest.java:53:12:53:62 | replace(...) | provenance | MaD:128 |
+| StrSubstitutorTest.java:54:12:54:25 | untaintedSubst : StrSubstitutor | StrSubstitutorTest.java:54:12:54:56 | replace(...) | provenance | MaD:144 |
+| StrSubstitutorTest.java:54:35:54:55 | (...)... : String | StrSubstitutorTest.java:54:12:54:56 | replace(...) | provenance | MaD:129 |
 | StrSubstitutorTest.java:54:49:54:55 | taint(...) : String | StrSubstitutorTest.java:54:35:54:55 | (...)... : String | provenance |  |
-| StrSubstitutorTest.java:55:12:55:25 | untaintedSubst : StrSubstitutor | StrSubstitutorTest.java:55:12:55:62 | replace(...) | provenance | MaD:319 |
-| StrSubstitutorTest.java:55:35:55:55 | (...)... : String | StrSubstitutorTest.java:55:12:55:62 | replace(...) | provenance | MaD:323 |
+| StrSubstitutorTest.java:55:12:55:25 | untaintedSubst : StrSubstitutor | StrSubstitutorTest.java:55:12:55:62 | replace(...) | provenance | MaD:144 |
+| StrSubstitutorTest.java:55:35:55:55 | (...)... : String | StrSubstitutorTest.java:55:12:55:62 | replace(...) | provenance | MaD:130 |
 | StrSubstitutorTest.java:55:49:55:55 | taint(...) : String | StrSubstitutorTest.java:55:35:55:55 | (...)... : String | provenance |  |
-| StrSubstitutorTest.java:56:12:56:25 | untaintedSubst : StrSubstitutor | StrSubstitutorTest.java:56:12:56:58 | replace(...) | provenance | MaD:319 |
-| StrSubstitutorTest.java:56:35:56:57 | new StrBuilder(...) : StrBuilder | StrSubstitutorTest.java:56:12:56:58 | replace(...) | provenance | MaD:335 |
-| StrSubstitutorTest.java:56:50:56:56 | taint(...) : String | StrSubstitutorTest.java:56:35:56:57 | new StrBuilder(...) : StrBuilder | provenance | MaD:226 |
-| StrSubstitutorTest.java:57:12:57:25 | untaintedSubst : StrSubstitutor | StrSubstitutorTest.java:57:12:57:64 | replace(...) | provenance | MaD:319 |
-| StrSubstitutorTest.java:57:35:57:57 | new StrBuilder(...) : StrBuilder | StrSubstitutorTest.java:57:12:57:64 | replace(...) | provenance | MaD:336 |
-| StrSubstitutorTest.java:57:50:57:56 | taint(...) : String | StrSubstitutorTest.java:57:35:57:57 | new StrBuilder(...) : StrBuilder | provenance | MaD:226 |
-| StrSubstitutorTest.java:58:12:58:25 | untaintedSubst : StrSubstitutor | StrSubstitutorTest.java:58:12:58:61 | replace(...) | provenance | MaD:319 |
-| StrSubstitutorTest.java:58:35:58:60 | new StringBuilder(...) : StringBuilder | StrSubstitutorTest.java:58:12:58:61 | replace(...) | provenance | MaD:322 |
+| StrSubstitutorTest.java:56:12:56:25 | untaintedSubst : StrSubstitutor | StrSubstitutorTest.java:56:12:56:58 | replace(...) | provenance | MaD:144 |
+| StrSubstitutorTest.java:56:35:56:57 | new StrBuilder(...) : StrBuilder | StrSubstitutorTest.java:56:12:56:58 | replace(...) | provenance | MaD:142 |
+| StrSubstitutorTest.java:56:50:56:56 | taint(...) : String | StrSubstitutorTest.java:56:35:56:57 | new StrBuilder(...) : StrBuilder | provenance | MaD:34 |
+| StrSubstitutorTest.java:57:12:57:25 | untaintedSubst : StrSubstitutor | StrSubstitutorTest.java:57:12:57:64 | replace(...) | provenance | MaD:144 |
+| StrSubstitutorTest.java:57:35:57:57 | new StrBuilder(...) : StrBuilder | StrSubstitutorTest.java:57:12:57:64 | replace(...) | provenance | MaD:143 |
+| StrSubstitutorTest.java:57:50:57:56 | taint(...) : String | StrSubstitutorTest.java:57:35:57:57 | new StrBuilder(...) : StrBuilder | provenance | MaD:34 |
+| StrSubstitutorTest.java:58:12:58:25 | untaintedSubst : StrSubstitutor | StrSubstitutorTest.java:58:12:58:61 | replace(...) | provenance | MaD:144 |
+| StrSubstitutorTest.java:58:35:58:60 | new StringBuilder(...) : StringBuilder | StrSubstitutorTest.java:58:12:58:61 | replace(...) | provenance | MaD:129 |
 | StrSubstitutorTest.java:58:53:58:59 | taint(...) : String | StrSubstitutorTest.java:58:35:58:60 | new StringBuilder(...) : StringBuilder | provenance | MaD:9 |
-| StrSubstitutorTest.java:59:12:59:25 | untaintedSubst : StrSubstitutor | StrSubstitutorTest.java:59:12:59:67 | replace(...) | provenance | MaD:319 |
-| StrSubstitutorTest.java:59:35:59:60 | new StringBuilder(...) : StringBuilder | StrSubstitutorTest.java:59:12:59:67 | replace(...) | provenance | MaD:323 |
+| StrSubstitutorTest.java:59:12:59:25 | untaintedSubst : StrSubstitutor | StrSubstitutorTest.java:59:12:59:67 | replace(...) | provenance | MaD:144 |
+| StrSubstitutorTest.java:59:35:59:60 | new StringBuilder(...) : StringBuilder | StrSubstitutorTest.java:59:12:59:67 | replace(...) | provenance | MaD:130 |
 | StrSubstitutorTest.java:59:53:59:59 | taint(...) : String | StrSubstitutorTest.java:59:35:59:60 | new StringBuilder(...) : StringBuilder | provenance | MaD:9 |
-| StrSubstitutorTest.java:60:12:60:25 | untaintedSubst : StrSubstitutor | StrSubstitutorTest.java:60:12:60:60 | replace(...) | provenance | MaD:319 |
-| StrSubstitutorTest.java:60:35:60:59 | new StringBuffer(...) : StringBuffer | StrSubstitutorTest.java:60:12:60:60 | replace(...) | provenance | MaD:333 |
+| StrSubstitutorTest.java:60:12:60:25 | untaintedSubst : StrSubstitutor | StrSubstitutorTest.java:60:12:60:60 | replace(...) | provenance | MaD:144 |
+| StrSubstitutorTest.java:60:35:60:59 | new StringBuffer(...) : StringBuffer | StrSubstitutorTest.java:60:12:60:60 | replace(...) | provenance | MaD:140 |
 | StrSubstitutorTest.java:60:52:60:58 | taint(...) : String | StrSubstitutorTest.java:60:35:60:59 | new StringBuffer(...) : StringBuffer | provenance | MaD:8 |
-| StrSubstitutorTest.java:61:12:61:25 | untaintedSubst : StrSubstitutor | StrSubstitutorTest.java:61:12:61:66 | replace(...) | provenance | MaD:319 |
-| StrSubstitutorTest.java:61:35:61:59 | new StringBuffer(...) : StringBuffer | StrSubstitutorTest.java:61:12:61:66 | replace(...) | provenance | MaD:334 |
+| StrSubstitutorTest.java:61:12:61:25 | untaintedSubst : StrSubstitutor | StrSubstitutorTest.java:61:12:61:66 | replace(...) | provenance | MaD:144 |
+| StrSubstitutorTest.java:61:35:61:59 | new StringBuffer(...) : StringBuffer | StrSubstitutorTest.java:61:12:61:66 | replace(...) | provenance | MaD:141 |
 | StrSubstitutorTest.java:61:52:61:58 | taint(...) : String | StrSubstitutorTest.java:61:35:61:59 | new StringBuffer(...) : StringBuffer | provenance | MaD:8 |
-| StrSubstitutorTest.java:64:35:64:41 | taint(...) : String | StrSubstitutorTest.java:64:12:64:73 | replace(...) | provenance | MaD:325 |
-| StrSubstitutorTest.java:65:35:65:41 | taint(...) : String | StrSubstitutorTest.java:65:12:65:83 | replace(...) | provenance | MaD:327 |
-| StrSubstitutorTest.java:66:44:66:53 | taintedMap : HashMap [<map.value>] : String | StrSubstitutorTest.java:66:12:66:54 | replace(...) | provenance | MaD:326 |
-| StrSubstitutorTest.java:67:44:67:53 | taintedMap : HashMap [<map.value>] : String | StrSubstitutorTest.java:67:12:67:64 | replace(...) | provenance | MaD:328 |
+| StrSubstitutorTest.java:64:35:64:41 | taint(...) : String | StrSubstitutorTest.java:64:12:64:73 | replace(...) | provenance | MaD:132 |
+| StrSubstitutorTest.java:65:35:65:41 | taint(...) : String | StrSubstitutorTest.java:65:12:65:83 | replace(...) | provenance | MaD:134 |
+| StrSubstitutorTest.java:66:44:66:53 | taintedMap : HashMap [<map.value>] : String | StrSubstitutorTest.java:66:12:66:54 | replace(...) | provenance | MaD:133 |
+| StrSubstitutorTest.java:67:44:67:53 | taintedMap : HashMap [<map.value>] : String | StrSubstitutorTest.java:67:12:67:64 | replace(...) | provenance | MaD:135 |
 | StrSubstitutorTest.java:69:7:69:18 | taintedProps [post update] : Properties [<map.value>] : String | StrSubstitutorTest.java:71:44:71:55 | taintedProps : Properties [<map.value>] : String | provenance |  |
 | StrSubstitutorTest.java:69:31:69:37 | taint(...) : String | StrSubstitutorTest.java:69:7:69:18 | taintedProps [post update] : Properties [<map.value>] : String | provenance | MaD:12 |
-| StrSubstitutorTest.java:69:31:69:37 | taint(...) : String | StrSubstitutorTest.java:69:7:69:18 | taintedProps [post update] : Properties [<map.value>] : String | provenance | MaD:16 |
-| StrSubstitutorTest.java:70:35:70:41 | taint(...) : String | StrSubstitutorTest.java:70:12:70:60 | replace(...) | provenance | MaD:329 |
-| StrSubstitutorTest.java:71:44:71:55 | taintedProps : Properties [<map.value>] : String | StrSubstitutorTest.java:71:12:71:56 | replace(...) | provenance | MaD:330 |
-| StrSubstitutorTest.java:74:50:74:61 | taintedSubst : StrSubstitutor | StrSubstitutorTest.java:74:73:74:83 | strBuilder1 [post update] : StrBuilder | provenance | MaD:341 |
+| StrSubstitutorTest.java:69:31:69:37 | taint(...) : String | StrSubstitutorTest.java:69:7:69:18 | taintedProps [post update] : Properties [<map.value>] : String | provenance | MaD:18 |
+| StrSubstitutorTest.java:70:35:70:41 | taint(...) : String | StrSubstitutorTest.java:70:12:70:60 | replace(...) | provenance | MaD:136 |
+| StrSubstitutorTest.java:71:44:71:55 | taintedProps : Properties [<map.value>] : String | StrSubstitutorTest.java:71:12:71:56 | replace(...) | provenance | MaD:137 |
+| StrSubstitutorTest.java:74:50:74:61 | taintedSubst : StrSubstitutor | StrSubstitutorTest.java:74:73:74:83 | strBuilder1 [post update] : StrBuilder | provenance | MaD:149 |
 | StrSubstitutorTest.java:74:73:74:83 | strBuilder1 [post update] : StrBuilder | StrSubstitutorTest.java:74:92:74:102 | strBuilder1 : StrBuilder | provenance |  |
 | StrSubstitutorTest.java:74:92:74:102 | strBuilder1 : StrBuilder | StrSubstitutorTest.java:74:92:74:113 | toString(...) | provenance | MaD:5 |
-| StrSubstitutorTest.java:74:92:74:102 | strBuilder1 : StrBuilder | StrSubstitutorTest.java:74:92:74:113 | toString(...) | provenance | MaD:311 |
-| StrSubstitutorTest.java:75:50:75:61 | taintedSubst : StrSubstitutor | StrSubstitutorTest.java:75:73:75:83 | strBuilder2 [post update] : StrBuilder | provenance | MaD:342 |
+| StrSubstitutorTest.java:74:92:74:102 | strBuilder1 : StrBuilder | StrSubstitutorTest.java:74:92:74:113 | toString(...) | provenance | MaD:119 |
+| StrSubstitutorTest.java:75:50:75:61 | taintedSubst : StrSubstitutor | StrSubstitutorTest.java:75:73:75:83 | strBuilder2 [post update] : StrBuilder | provenance | MaD:150 |
 | StrSubstitutorTest.java:75:73:75:83 | strBuilder2 [post update] : StrBuilder | StrSubstitutorTest.java:75:98:75:108 | strBuilder2 : StrBuilder | provenance |  |
 | StrSubstitutorTest.java:75:98:75:108 | strBuilder2 : StrBuilder | StrSubstitutorTest.java:75:98:75:119 | toString(...) | provenance | MaD:5 |
-| StrSubstitutorTest.java:75:98:75:108 | strBuilder2 : StrBuilder | StrSubstitutorTest.java:75:98:75:119 | toString(...) | provenance | MaD:311 |
-| StrSubstitutorTest.java:76:59:76:70 | taintedSubst : StrSubstitutor | StrSubstitutorTest.java:76:82:76:95 | stringBuilder1 [post update] : StringBuilder | provenance | MaD:339 |
+| StrSubstitutorTest.java:75:98:75:108 | strBuilder2 : StrBuilder | StrSubstitutorTest.java:75:98:75:119 | toString(...) | provenance | MaD:119 |
+| StrSubstitutorTest.java:76:59:76:70 | taintedSubst : StrSubstitutor | StrSubstitutorTest.java:76:82:76:95 | stringBuilder1 [post update] : StringBuilder | provenance | MaD:147 |
 | StrSubstitutorTest.java:76:82:76:95 | stringBuilder1 [post update] : StringBuilder | StrSubstitutorTest.java:76:104:76:117 | stringBuilder1 : StringBuilder | provenance |  |
 | StrSubstitutorTest.java:76:104:76:117 | stringBuilder1 : StringBuilder | StrSubstitutorTest.java:76:104:76:128 | toString(...) | provenance | MaD:5 |
-| StrSubstitutorTest.java:77:59:77:70 | taintedSubst : StrSubstitutor | StrSubstitutorTest.java:77:82:77:95 | stringBuilder2 [post update] : StringBuilder | provenance | MaD:340 |
+| StrSubstitutorTest.java:77:59:77:70 | taintedSubst : StrSubstitutor | StrSubstitutorTest.java:77:82:77:95 | stringBuilder2 [post update] : StringBuilder | provenance | MaD:148 |
 | StrSubstitutorTest.java:77:82:77:95 | stringBuilder2 [post update] : StringBuilder | StrSubstitutorTest.java:77:110:77:123 | stringBuilder2 : StringBuilder | provenance |  |
 | StrSubstitutorTest.java:77:110:77:123 | stringBuilder2 : StringBuilder | StrSubstitutorTest.java:77:110:77:134 | toString(...) | provenance | MaD:5 |
-| StrSubstitutorTest.java:78:56:78:67 | taintedSubst : StrSubstitutor | StrSubstitutorTest.java:78:79:78:91 | stringBuffer1 [post update] : StringBuffer | provenance | MaD:337 |
+| StrSubstitutorTest.java:78:56:78:67 | taintedSubst : StrSubstitutor | StrSubstitutorTest.java:78:79:78:91 | stringBuffer1 [post update] : StringBuffer | provenance | MaD:145 |
 | StrSubstitutorTest.java:78:79:78:91 | stringBuffer1 [post update] : StringBuffer | StrSubstitutorTest.java:78:100:78:112 | stringBuffer1 : StringBuffer | provenance |  |
 | StrSubstitutorTest.java:78:100:78:112 | stringBuffer1 : StringBuffer | StrSubstitutorTest.java:78:100:78:123 | toString(...) | provenance | MaD:5 |
-| StrSubstitutorTest.java:79:56:79:67 | taintedSubst : StrSubstitutor | StrSubstitutorTest.java:79:79:79:91 | stringBuffer2 [post update] : StringBuffer | provenance | MaD:338 |
+| StrSubstitutorTest.java:79:56:79:67 | taintedSubst : StrSubstitutor | StrSubstitutorTest.java:79:79:79:91 | stringBuffer2 [post update] : StringBuffer | provenance | MaD:146 |
 | StrSubstitutorTest.java:79:79:79:91 | stringBuffer2 [post update] : StringBuffer | StrSubstitutorTest.java:79:106:79:118 | stringBuffer2 : StringBuffer | provenance |  |
 | StrSubstitutorTest.java:79:106:79:118 | stringBuffer2 : StringBuffer | StrSubstitutorTest.java:79:106:79:129 | toString(...) | provenance | MaD:5 |
-| StrTokenizerTest.java:12:11:12:49 | new StrTokenizer(...) : StrTokenizer | StrTokenizerTest.java:12:10:12:61 | toString(...) | provenance | MaD:356 |
+| StrTokenizerTest.java:12:11:12:49 | new StrTokenizer(...) : StrTokenizer | StrTokenizerTest.java:12:10:12:61 | toString(...) | provenance | MaD:164 |
 | StrTokenizerTest.java:12:28:12:34 | taint(...) : String | StrTokenizerTest.java:12:28:12:48 | toCharArray(...) : char[] | provenance | MaD:7 |
-| StrTokenizerTest.java:12:28:12:48 | toCharArray(...) : char[] | StrTokenizerTest.java:12:11:12:49 | new StrTokenizer(...) : StrTokenizer | provenance | MaD:344 |
-| StrTokenizerTest.java:13:11:13:54 | new StrTokenizer(...) : StrTokenizer | StrTokenizerTest.java:13:10:13:66 | toString(...) | provenance | MaD:356 |
+| StrTokenizerTest.java:12:28:12:48 | toCharArray(...) : char[] | StrTokenizerTest.java:12:11:12:49 | new StrTokenizer(...) : StrTokenizer | provenance | MaD:152 |
+| StrTokenizerTest.java:13:11:13:54 | new StrTokenizer(...) : StrTokenizer | StrTokenizerTest.java:13:10:13:66 | toString(...) | provenance | MaD:164 |
 | StrTokenizerTest.java:13:28:13:34 | taint(...) : String | StrTokenizerTest.java:13:28:13:48 | toCharArray(...) : char[] | provenance | MaD:7 |
-| StrTokenizerTest.java:13:28:13:48 | toCharArray(...) : char[] | StrTokenizerTest.java:13:11:13:54 | new StrTokenizer(...) : StrTokenizer | provenance | MaD:344 |
-| StrTokenizerTest.java:14:11:14:59 | new StrTokenizer(...) : StrTokenizer | StrTokenizerTest.java:14:10:14:71 | toString(...) | provenance | MaD:356 |
+| StrTokenizerTest.java:13:28:13:48 | toCharArray(...) : char[] | StrTokenizerTest.java:13:11:13:54 | new StrTokenizer(...) : StrTokenizer | provenance | MaD:152 |
+| StrTokenizerTest.java:14:11:14:59 | new StrTokenizer(...) : StrTokenizer | StrTokenizerTest.java:14:10:14:71 | toString(...) | provenance | MaD:164 |
 | StrTokenizerTest.java:14:28:14:34 | taint(...) : String | StrTokenizerTest.java:14:28:14:48 | toCharArray(...) : char[] | provenance | MaD:7 |
-| StrTokenizerTest.java:14:28:14:48 | toCharArray(...) : char[] | StrTokenizerTest.java:14:11:14:59 | new StrTokenizer(...) : StrTokenizer | provenance | MaD:344 |
-| StrTokenizerTest.java:15:11:15:54 | new StrTokenizer(...) : StrTokenizer | StrTokenizerTest.java:15:10:15:66 | toString(...) | provenance | MaD:356 |
+| StrTokenizerTest.java:14:28:14:48 | toCharArray(...) : char[] | StrTokenizerTest.java:14:11:14:59 | new StrTokenizer(...) : StrTokenizer | provenance | MaD:152 |
+| StrTokenizerTest.java:15:11:15:54 | new StrTokenizer(...) : StrTokenizer | StrTokenizerTest.java:15:10:15:66 | toString(...) | provenance | MaD:164 |
 | StrTokenizerTest.java:15:28:15:34 | taint(...) : String | StrTokenizerTest.java:15:28:15:48 | toCharArray(...) : char[] | provenance | MaD:7 |
-| StrTokenizerTest.java:15:28:15:48 | toCharArray(...) : char[] | StrTokenizerTest.java:15:11:15:54 | new StrTokenizer(...) : StrTokenizer | provenance | MaD:344 |
-| StrTokenizerTest.java:16:11:16:67 | new StrTokenizer(...) : StrTokenizer | StrTokenizerTest.java:16:10:16:79 | toString(...) | provenance | MaD:356 |
+| StrTokenizerTest.java:15:28:15:48 | toCharArray(...) : char[] | StrTokenizerTest.java:15:11:15:54 | new StrTokenizer(...) : StrTokenizer | provenance | MaD:152 |
+| StrTokenizerTest.java:16:11:16:67 | new StrTokenizer(...) : StrTokenizer | StrTokenizerTest.java:16:10:16:79 | toString(...) | provenance | MaD:164 |
 | StrTokenizerTest.java:16:28:16:34 | taint(...) : String | StrTokenizerTest.java:16:28:16:48 | toCharArray(...) : char[] | provenance | MaD:7 |
-| StrTokenizerTest.java:16:28:16:48 | toCharArray(...) : char[] | StrTokenizerTest.java:16:11:16:67 | new StrTokenizer(...) : StrTokenizer | provenance | MaD:344 |
-| StrTokenizerTest.java:17:11:17:85 | new StrTokenizer(...) : StrTokenizer | StrTokenizerTest.java:17:10:17:97 | toString(...) | provenance | MaD:356 |
+| StrTokenizerTest.java:16:28:16:48 | toCharArray(...) : char[] | StrTokenizerTest.java:16:11:16:67 | new StrTokenizer(...) : StrTokenizer | provenance | MaD:152 |
+| StrTokenizerTest.java:17:11:17:85 | new StrTokenizer(...) : StrTokenizer | StrTokenizerTest.java:17:10:17:97 | toString(...) | provenance | MaD:164 |
 | StrTokenizerTest.java:17:28:17:34 | taint(...) : String | StrTokenizerTest.java:17:28:17:48 | toCharArray(...) : char[] | provenance | MaD:7 |
-| StrTokenizerTest.java:17:28:17:48 | toCharArray(...) : char[] | StrTokenizerTest.java:17:11:17:85 | new StrTokenizer(...) : StrTokenizer | provenance | MaD:344 |
-| StrTokenizerTest.java:18:11:18:35 | new StrTokenizer(...) : StrTokenizer | StrTokenizerTest.java:18:10:18:47 | toString(...) | provenance | MaD:356 |
-| StrTokenizerTest.java:18:28:18:34 | taint(...) : String | StrTokenizerTest.java:18:11:18:35 | new StrTokenizer(...) : StrTokenizer | provenance | MaD:344 |
-| StrTokenizerTest.java:19:11:19:40 | new StrTokenizer(...) : StrTokenizer | StrTokenizerTest.java:19:10:19:52 | toString(...) | provenance | MaD:356 |
-| StrTokenizerTest.java:19:28:19:34 | taint(...) : String | StrTokenizerTest.java:19:11:19:40 | new StrTokenizer(...) : StrTokenizer | provenance | MaD:344 |
-| StrTokenizerTest.java:20:11:20:45 | new StrTokenizer(...) : StrTokenizer | StrTokenizerTest.java:20:10:20:57 | toString(...) | provenance | MaD:356 |
-| StrTokenizerTest.java:20:28:20:34 | taint(...) : String | StrTokenizerTest.java:20:11:20:45 | new StrTokenizer(...) : StrTokenizer | provenance | MaD:344 |
-| StrTokenizerTest.java:21:11:21:40 | new StrTokenizer(...) : StrTokenizer | StrTokenizerTest.java:21:10:21:52 | toString(...) | provenance | MaD:356 |
-| StrTokenizerTest.java:21:28:21:34 | taint(...) : String | StrTokenizerTest.java:21:11:21:40 | new StrTokenizer(...) : StrTokenizer | provenance | MaD:344 |
-| StrTokenizerTest.java:22:11:22:53 | new StrTokenizer(...) : StrTokenizer | StrTokenizerTest.java:22:10:22:65 | toString(...) | provenance | MaD:356 |
-| StrTokenizerTest.java:22:28:22:34 | taint(...) : String | StrTokenizerTest.java:22:11:22:53 | new StrTokenizer(...) : StrTokenizer | provenance | MaD:344 |
-| StrTokenizerTest.java:23:11:23:71 | new StrTokenizer(...) : StrTokenizer | StrTokenizerTest.java:23:10:23:83 | toString(...) | provenance | MaD:356 |
-| StrTokenizerTest.java:23:28:23:34 | taint(...) : String | StrTokenizerTest.java:23:11:23:71 | new StrTokenizer(...) : StrTokenizer | provenance | MaD:344 |
-| StrTokenizerTest.java:26:10:26:59 | getCSVInstance(...) : StrTokenizer | StrTokenizerTest.java:26:10:26:70 | toString(...) | provenance | MaD:356 |
+| StrTokenizerTest.java:17:28:17:48 | toCharArray(...) : char[] | StrTokenizerTest.java:17:11:17:85 | new StrTokenizer(...) : StrTokenizer | provenance | MaD:152 |
+| StrTokenizerTest.java:18:11:18:35 | new StrTokenizer(...) : StrTokenizer | StrTokenizerTest.java:18:10:18:47 | toString(...) | provenance | MaD:164 |
+| StrTokenizerTest.java:18:28:18:34 | taint(...) : String | StrTokenizerTest.java:18:11:18:35 | new StrTokenizer(...) : StrTokenizer | provenance | MaD:152 |
+| StrTokenizerTest.java:19:11:19:40 | new StrTokenizer(...) : StrTokenizer | StrTokenizerTest.java:19:10:19:52 | toString(...) | provenance | MaD:164 |
+| StrTokenizerTest.java:19:28:19:34 | taint(...) : String | StrTokenizerTest.java:19:11:19:40 | new StrTokenizer(...) : StrTokenizer | provenance | MaD:152 |
+| StrTokenizerTest.java:20:11:20:45 | new StrTokenizer(...) : StrTokenizer | StrTokenizerTest.java:20:10:20:57 | toString(...) | provenance | MaD:164 |
+| StrTokenizerTest.java:20:28:20:34 | taint(...) : String | StrTokenizerTest.java:20:11:20:45 | new StrTokenizer(...) : StrTokenizer | provenance | MaD:152 |
+| StrTokenizerTest.java:21:11:21:40 | new StrTokenizer(...) : StrTokenizer | StrTokenizerTest.java:21:10:21:52 | toString(...) | provenance | MaD:164 |
+| StrTokenizerTest.java:21:28:21:34 | taint(...) : String | StrTokenizerTest.java:21:11:21:40 | new StrTokenizer(...) : StrTokenizer | provenance | MaD:152 |
+| StrTokenizerTest.java:22:11:22:53 | new StrTokenizer(...) : StrTokenizer | StrTokenizerTest.java:22:10:22:65 | toString(...) | provenance | MaD:164 |
+| StrTokenizerTest.java:22:28:22:34 | taint(...) : String | StrTokenizerTest.java:22:11:22:53 | new StrTokenizer(...) : StrTokenizer | provenance | MaD:152 |
+| StrTokenizerTest.java:23:11:23:71 | new StrTokenizer(...) : StrTokenizer | StrTokenizerTest.java:23:10:23:83 | toString(...) | provenance | MaD:164 |
+| StrTokenizerTest.java:23:28:23:34 | taint(...) : String | StrTokenizerTest.java:23:11:23:71 | new StrTokenizer(...) : StrTokenizer | provenance | MaD:152 |
+| StrTokenizerTest.java:26:10:26:59 | getCSVInstance(...) : StrTokenizer | StrTokenizerTest.java:26:10:26:70 | toString(...) | provenance | MaD:164 |
 | StrTokenizerTest.java:26:38:26:44 | taint(...) : String | StrTokenizerTest.java:26:38:26:58 | toCharArray(...) : char[] | provenance | MaD:7 |
-| StrTokenizerTest.java:26:38:26:58 | toCharArray(...) : char[] | StrTokenizerTest.java:26:10:26:59 | getCSVInstance(...) : StrTokenizer | provenance | MaD:346 |
-| StrTokenizerTest.java:27:10:27:45 | getCSVInstance(...) : StrTokenizer | StrTokenizerTest.java:27:10:27:56 | toString(...) | provenance | MaD:356 |
-| StrTokenizerTest.java:27:38:27:44 | taint(...) : String | StrTokenizerTest.java:27:10:27:45 | getCSVInstance(...) : StrTokenizer | provenance | MaD:346 |
-| StrTokenizerTest.java:28:10:28:59 | getTSVInstance(...) : StrTokenizer | StrTokenizerTest.java:28:10:28:70 | toString(...) | provenance | MaD:356 |
+| StrTokenizerTest.java:26:38:26:58 | toCharArray(...) : char[] | StrTokenizerTest.java:26:10:26:59 | getCSVInstance(...) : StrTokenizer | provenance | MaD:154 |
+| StrTokenizerTest.java:27:10:27:45 | getCSVInstance(...) : StrTokenizer | StrTokenizerTest.java:27:10:27:56 | toString(...) | provenance | MaD:164 |
+| StrTokenizerTest.java:27:38:27:44 | taint(...) : String | StrTokenizerTest.java:27:10:27:45 | getCSVInstance(...) : StrTokenizer | provenance | MaD:154 |
+| StrTokenizerTest.java:28:10:28:59 | getTSVInstance(...) : StrTokenizer | StrTokenizerTest.java:28:10:28:70 | toString(...) | provenance | MaD:164 |
 | StrTokenizerTest.java:28:38:28:44 | taint(...) : String | StrTokenizerTest.java:28:38:28:58 | toCharArray(...) : char[] | provenance | MaD:7 |
-| StrTokenizerTest.java:28:38:28:58 | toCharArray(...) : char[] | StrTokenizerTest.java:28:10:28:59 | getTSVInstance(...) : StrTokenizer | provenance | MaD:348 |
-| StrTokenizerTest.java:29:10:29:45 | getTSVInstance(...) : StrTokenizer | StrTokenizerTest.java:29:10:29:56 | toString(...) | provenance | MaD:356 |
-| StrTokenizerTest.java:29:38:29:44 | taint(...) : String | StrTokenizerTest.java:29:10:29:45 | getTSVInstance(...) : StrTokenizer | provenance | MaD:348 |
+| StrTokenizerTest.java:28:38:28:58 | toCharArray(...) : char[] | StrTokenizerTest.java:28:10:28:59 | getTSVInstance(...) : StrTokenizer | provenance | MaD:156 |
+| StrTokenizerTest.java:29:10:29:45 | getTSVInstance(...) : StrTokenizer | StrTokenizerTest.java:29:10:29:56 | toString(...) | provenance | MaD:164 |
+| StrTokenizerTest.java:29:38:29:44 | taint(...) : String | StrTokenizerTest.java:29:10:29:45 | getTSVInstance(...) : StrTokenizer | provenance | MaD:156 |
 | StrTokenizerTest.java:32:11:32:35 | new StrTokenizer(...) : StrTokenizer | StrTokenizerTest.java:32:10:32:44 | clone(...) | provenance | CloneStep |
-| StrTokenizerTest.java:32:11:32:35 | new StrTokenizer(...) : StrTokenizer | StrTokenizerTest.java:32:10:32:44 | clone(...) | provenance | MaD:345 |
-| StrTokenizerTest.java:32:28:32:34 | taint(...) : String | StrTokenizerTest.java:32:11:32:35 | new StrTokenizer(...) : StrTokenizer | provenance | MaD:344 |
-| StrTokenizerTest.java:33:11:33:35 | new StrTokenizer(...) : StrTokenizer | StrTokenizerTest.java:33:10:33:49 | getContent(...) | provenance | MaD:347 |
-| StrTokenizerTest.java:33:28:33:34 | taint(...) : String | StrTokenizerTest.java:33:11:33:35 | new StrTokenizer(...) : StrTokenizer | provenance | MaD:344 |
-| StrTokenizerTest.java:34:11:34:35 | new StrTokenizer(...) : StrTokenizer | StrTokenizerTest.java:34:10:34:52 | getTokenArray(...) | provenance | MaD:349 |
-| StrTokenizerTest.java:34:28:34:34 | taint(...) : String | StrTokenizerTest.java:34:11:34:35 | new StrTokenizer(...) : StrTokenizer | provenance | MaD:344 |
-| StrTokenizerTest.java:35:11:35:35 | new StrTokenizer(...) : StrTokenizer | StrTokenizerTest.java:35:10:35:51 | getTokenList(...) | provenance | MaD:350 |
-| StrTokenizerTest.java:35:28:35:34 | taint(...) : String | StrTokenizerTest.java:35:11:35:35 | new StrTokenizer(...) : StrTokenizer | provenance | MaD:344 |
+| StrTokenizerTest.java:32:11:32:35 | new StrTokenizer(...) : StrTokenizer | StrTokenizerTest.java:32:10:32:44 | clone(...) | provenance | MaD:153 |
+| StrTokenizerTest.java:32:28:32:34 | taint(...) : String | StrTokenizerTest.java:32:11:32:35 | new StrTokenizer(...) : StrTokenizer | provenance | MaD:152 |
+| StrTokenizerTest.java:33:11:33:35 | new StrTokenizer(...) : StrTokenizer | StrTokenizerTest.java:33:10:33:49 | getContent(...) | provenance | MaD:155 |
+| StrTokenizerTest.java:33:28:33:34 | taint(...) : String | StrTokenizerTest.java:33:11:33:35 | new StrTokenizer(...) : StrTokenizer | provenance | MaD:152 |
+| StrTokenizerTest.java:34:11:34:35 | new StrTokenizer(...) : StrTokenizer | StrTokenizerTest.java:34:10:34:52 | getTokenArray(...) | provenance | MaD:157 |
+| StrTokenizerTest.java:34:28:34:34 | taint(...) : String | StrTokenizerTest.java:34:11:34:35 | new StrTokenizer(...) : StrTokenizer | provenance | MaD:152 |
+| StrTokenizerTest.java:35:11:35:35 | new StrTokenizer(...) : StrTokenizer | StrTokenizerTest.java:35:10:35:51 | getTokenList(...) | provenance | MaD:158 |
+| StrTokenizerTest.java:35:28:35:34 | taint(...) : String | StrTokenizerTest.java:35:11:35:35 | new StrTokenizer(...) : StrTokenizer | provenance | MaD:152 |
 | StrTokenizerTest.java:36:11:36:35 | new StrTokenizer(...) : StrTokenizer | StrTokenizerTest.java:36:10:36:43 | next(...) | provenance | MaD:13 |
-| StrTokenizerTest.java:36:11:36:35 | new StrTokenizer(...) : StrTokenizer | StrTokenizerTest.java:36:10:36:43 | next(...) | provenance | MaD:351 |
-| StrTokenizerTest.java:36:28:36:34 | taint(...) : String | StrTokenizerTest.java:36:11:36:35 | new StrTokenizer(...) : StrTokenizer | provenance | MaD:344 |
-| StrTokenizerTest.java:37:11:37:35 | new StrTokenizer(...) : StrTokenizer | StrTokenizerTest.java:37:10:37:48 | nextToken(...) | provenance | MaD:352 |
-| StrTokenizerTest.java:37:28:37:34 | taint(...) : String | StrTokenizerTest.java:37:11:37:35 | new StrTokenizer(...) : StrTokenizer | provenance | MaD:344 |
+| StrTokenizerTest.java:36:11:36:35 | new StrTokenizer(...) : StrTokenizer | StrTokenizerTest.java:36:10:36:43 | next(...) | provenance | MaD:159 |
+| StrTokenizerTest.java:36:28:36:34 | taint(...) : String | StrTokenizerTest.java:36:11:36:35 | new StrTokenizer(...) : StrTokenizer | provenance | MaD:152 |
+| StrTokenizerTest.java:37:11:37:35 | new StrTokenizer(...) : StrTokenizer | StrTokenizerTest.java:37:10:37:48 | nextToken(...) | provenance | MaD:160 |
+| StrTokenizerTest.java:37:28:37:34 | taint(...) : String | StrTokenizerTest.java:37:11:37:35 | new StrTokenizer(...) : StrTokenizer | provenance | MaD:152 |
 | StrTokenizerTest.java:38:11:38:35 | new StrTokenizer(...) : StrTokenizer | StrTokenizerTest.java:38:10:38:47 | previous(...) | provenance | MaD:14 |
-| StrTokenizerTest.java:38:11:38:35 | new StrTokenizer(...) : StrTokenizer | StrTokenizerTest.java:38:10:38:47 | previous(...) | provenance | MaD:353 |
-| StrTokenizerTest.java:38:28:38:34 | taint(...) : String | StrTokenizerTest.java:38:11:38:35 | new StrTokenizer(...) : StrTokenizer | provenance | MaD:344 |
-| StrTokenizerTest.java:39:11:39:35 | new StrTokenizer(...) : StrTokenizer | StrTokenizerTest.java:39:10:39:52 | previousToken(...) | provenance | MaD:354 |
-| StrTokenizerTest.java:39:28:39:34 | taint(...) : String | StrTokenizerTest.java:39:11:39:35 | new StrTokenizer(...) : StrTokenizer | provenance | MaD:344 |
-| StrTokenizerTest.java:42:10:42:58 | reset(...) : StrTokenizer | StrTokenizerTest.java:42:10:42:69 | toString(...) | provenance | MaD:356 |
+| StrTokenizerTest.java:38:11:38:35 | new StrTokenizer(...) : StrTokenizer | StrTokenizerTest.java:38:10:38:47 | previous(...) | provenance | MaD:161 |
+| StrTokenizerTest.java:38:28:38:34 | taint(...) : String | StrTokenizerTest.java:38:11:38:35 | new StrTokenizer(...) : StrTokenizer | provenance | MaD:152 |
+| StrTokenizerTest.java:39:11:39:35 | new StrTokenizer(...) : StrTokenizer | StrTokenizerTest.java:39:10:39:52 | previousToken(...) | provenance | MaD:162 |
+| StrTokenizerTest.java:39:28:39:34 | taint(...) : String | StrTokenizerTest.java:39:11:39:35 | new StrTokenizer(...) : StrTokenizer | provenance | MaD:152 |
+| StrTokenizerTest.java:42:10:42:58 | reset(...) : StrTokenizer | StrTokenizerTest.java:42:10:42:69 | toString(...) | provenance | MaD:164 |
 | StrTokenizerTest.java:42:37:42:43 | taint(...) : String | StrTokenizerTest.java:42:37:42:57 | toCharArray(...) : char[] | provenance | MaD:7 |
-| StrTokenizerTest.java:42:37:42:57 | toCharArray(...) : char[] | StrTokenizerTest.java:42:10:42:58 | reset(...) : StrTokenizer | provenance | MaD:355 |
-| StrTokenizerTest.java:43:10:43:44 | reset(...) : StrTokenizer | StrTokenizerTest.java:43:10:43:55 | toString(...) | provenance | MaD:356 |
-| StrTokenizerTest.java:43:37:43:43 | taint(...) : String | StrTokenizerTest.java:43:10:43:44 | reset(...) : StrTokenizer | provenance | MaD:355 |
+| StrTokenizerTest.java:42:37:42:57 | toCharArray(...) : char[] | StrTokenizerTest.java:42:10:42:58 | reset(...) : StrTokenizer | provenance | MaD:163 |
+| StrTokenizerTest.java:43:10:43:44 | reset(...) : StrTokenizer | StrTokenizerTest.java:43:10:43:55 | toString(...) | provenance | MaD:164 |
+| StrTokenizerTest.java:43:37:43:43 | taint(...) : String | StrTokenizerTest.java:43:10:43:44 | reset(...) : StrTokenizer | provenance | MaD:163 |
 | StrTokenizerTextTest.java:12:11:12:49 | new StrTokenizer(...) : StrTokenizer | StrTokenizerTextTest.java:12:10:12:61 | toString(...) | provenance | MaD:519 |
 | StrTokenizerTextTest.java:12:28:12:34 | taint(...) : String | StrTokenizerTextTest.java:12:28:12:48 | toCharArray(...) : char[] | provenance | MaD:7 |
 | StrTokenizerTextTest.java:12:28:12:48 | toCharArray(...) : char[] | StrTokenizerTextTest.java:12:11:12:49 | new StrTokenizer(...) : StrTokenizer | provenance | MaD:507 |
@@ -2336,9 +2310,9 @@ edges
 | StrTokenizerTextTest.java:42:37:42:57 | toCharArray(...) : char[] | StrTokenizerTextTest.java:42:10:42:58 | reset(...) : StrTokenizer | provenance | MaD:518 |
 | StrTokenizerTextTest.java:43:10:43:44 | reset(...) : StrTokenizer | StrTokenizerTextTest.java:43:10:43:55 | toString(...) | provenance | MaD:519 |
 | StrTokenizerTextTest.java:43:37:43:43 | taint(...) : String | StrTokenizerTextTest.java:43:10:43:44 | reset(...) : StrTokenizer | provenance | MaD:518 |
-| StringEscapeUtilsTest.java:9:39:9:45 | taint(...) : String | StringEscapeUtilsTest.java:9:10:9:46 | escapeJson(...) | provenance | MaD:79 |
+| StringEscapeUtilsTest.java:9:39:9:45 | taint(...) : String | StringEscapeUtilsTest.java:9:10:9:46 | escapeJson(...) | provenance | MaD:272 |
 | StringLookupTextTest.java:13:7:13:9 | map [post update] : HashMap [<map.value>] : String | StringLookupTextTest.java:14:74:14:76 | map : HashMap [<map.value>] : String | provenance |  |
-| StringLookupTextTest.java:13:22:13:28 | taint(...) : String | StringLookupTextTest.java:13:7:13:9 | map [post update] : HashMap [<map.value>] : String | provenance | MaD:16 |
+| StringLookupTextTest.java:13:22:13:28 | taint(...) : String | StringLookupTextTest.java:13:7:13:9 | map [post update] : HashMap [<map.value>] : String | provenance | MaD:18 |
 | StringLookupTextTest.java:14:29:14:77 | mapStringLookup(...) : StringLookup | StringLookupTextTest.java:15:12:15:17 | lookup : StringLookup | provenance |  |
 | StringLookupTextTest.java:14:74:14:76 | map : HashMap [<map.value>] : String | StringLookupTextTest.java:14:29:14:77 | mapStringLookup(...) : StringLookup | provenance | MaD:417 |
 | StringLookupTextTest.java:15:12:15:17 | lookup : StringLookup | StringLookupTextTest.java:15:12:15:31 | lookup(...) | provenance | MaD:416 |
@@ -2349,7 +2323,7 @@ edges
 | StringSubstitutorTextTest.java:17:7:17:16 | taintedMap [post update] : HashMap [<map.value>] : String | StringSubstitutorTextTest.java:25:53:25:62 | taintedMap : HashMap [<map.value>] : String | provenance |  |
 | StringSubstitutorTextTest.java:17:7:17:16 | taintedMap [post update] : HashMap [<map.value>] : String | StringSubstitutorTextTest.java:67:47:67:56 | taintedMap : HashMap [<map.value>] : String | provenance |  |
 | StringSubstitutorTextTest.java:17:7:17:16 | taintedMap [post update] : HashMap [<map.value>] : String | StringSubstitutorTextTest.java:68:47:68:56 | taintedMap : HashMap [<map.value>] : String | provenance |  |
-| StringSubstitutorTextTest.java:17:29:17:35 | taint(...) : String | StringSubstitutorTextTest.java:17:7:17:16 | taintedMap [post update] : HashMap [<map.value>] : String | provenance | MaD:16 |
+| StringSubstitutorTextTest.java:17:29:17:35 | taint(...) : String | StringSubstitutorTextTest.java:17:7:17:16 | taintedMap [post update] : HashMap [<map.value>] : String | provenance | MaD:18 |
 | StringSubstitutorTextTest.java:18:36:18:91 | mapStringLookup(...) : StringLookup | StringSubstitutorTextTest.java:21:80:21:92 | taintedLookup : StringLookup | provenance |  |
 | StringSubstitutorTextTest.java:18:36:18:91 | mapStringLookup(...) : StringLookup | StringSubstitutorTextTest.java:26:53:26:65 | taintedLookup : StringLookup | provenance |  |
 | StringSubstitutorTextTest.java:18:36:18:91 | mapStringLookup(...) : StringLookup | StringSubstitutorTextTest.java:27:53:27:65 | taintedLookup : StringLookup | provenance |  |
@@ -2372,7 +2346,7 @@ edges
 | StringSubstitutorTextTest.java:21:56:21:58 | ss1 [post update] : StringSubstitutor | StringSubstitutorTextTest.java:61:12:61:25 | untaintedSubst : StringSubstitutor | provenance |  |
 | StringSubstitutorTextTest.java:21:56:21:58 | ss1 [post update] : StringSubstitutor | StringSubstitutorTextTest.java:62:12:62:25 | untaintedSubst : StringSubstitutor | provenance |  |
 | StringSubstitutorTextTest.java:21:80:21:92 | taintedLookup : StringLookup | StringSubstitutorTextTest.java:21:56:21:58 | ss1 [post update] : StringSubstitutor | provenance | MaD:546 |
-| StringSubstitutorTextTest.java:21:101:21:103 | ss1 : StringSubstitutor | StringSubstitutorTextTest.java:21:101:21:120 | replace(...) | provenance | MaD:522 |
+| StringSubstitutorTextTest.java:21:101:21:103 | ss1 : StringSubstitutor | StringSubstitutorTextTest.java:21:101:21:120 | replace(...) | provenance | MaD:539 |
 | StringSubstitutorTextTest.java:22:31:22:63 | new StringSubstitutor(...) : StringSubstitutor | StringSubstitutorTextTest.java:22:71:22:73 | ss2 : StringSubstitutor | provenance |  |
 | StringSubstitutorTextTest.java:22:31:22:63 | new StringSubstitutor(...) : StringSubstitutor | StringSubstitutorTextTest.java:34:12:34:23 | taintedSubst : StringSubstitutor | provenance |  |
 | StringSubstitutorTextTest.java:22:31:22:63 | new StringSubstitutor(...) : StringSubstitutor | StringSubstitutorTextTest.java:35:12:35:23 | taintedSubst : StringSubstitutor | provenance |  |
@@ -2393,96 +2367,96 @@ edges
 | StringSubstitutorTextTest.java:22:31:22:63 | new StringSubstitutor(...) : StringSubstitutor | StringSubstitutorTextTest.java:78:59:78:70 | taintedSubst : StringSubstitutor | provenance |  |
 | StringSubstitutorTextTest.java:22:31:22:63 | new StringSubstitutor(...) : StringSubstitutor | StringSubstitutorTextTest.java:79:56:79:67 | taintedSubst : StringSubstitutor | provenance |  |
 | StringSubstitutorTextTest.java:22:31:22:63 | new StringSubstitutor(...) : StringSubstitutor | StringSubstitutorTextTest.java:80:56:80:67 | taintedSubst : StringSubstitutor | provenance |  |
-| StringSubstitutorTextTest.java:22:53:22:62 | taintedMap : HashMap [<map.value>] : String | StringSubstitutorTextTest.java:22:31:22:63 | new StringSubstitutor(...) : StringSubstitutor | provenance | MaD:521 |
-| StringSubstitutorTextTest.java:22:71:22:73 | ss2 : StringSubstitutor | StringSubstitutorTextTest.java:22:71:22:90 | replace(...) | provenance | MaD:522 |
+| StringSubstitutorTextTest.java:22:53:22:62 | taintedMap : HashMap [<map.value>] : String | StringSubstitutorTextTest.java:22:31:22:63 | new StringSubstitutor(...) : StringSubstitutor | provenance | MaD:520 |
+| StringSubstitutorTextTest.java:22:71:22:73 | ss2 : StringSubstitutor | StringSubstitutorTextTest.java:22:71:22:90 | replace(...) | provenance | MaD:539 |
 | StringSubstitutorTextTest.java:23:31:23:73 | new StringSubstitutor(...) : StringSubstitutor | StringSubstitutorTextTest.java:23:81:23:83 | ss3 : StringSubstitutor | provenance |  |
-| StringSubstitutorTextTest.java:23:53:23:62 | taintedMap : HashMap [<map.value>] : String | StringSubstitutorTextTest.java:23:31:23:73 | new StringSubstitutor(...) : StringSubstitutor | provenance | MaD:521 |
-| StringSubstitutorTextTest.java:23:81:23:83 | ss3 : StringSubstitutor | StringSubstitutorTextTest.java:23:81:23:100 | replace(...) | provenance | MaD:522 |
+| StringSubstitutorTextTest.java:23:53:23:62 | taintedMap : HashMap [<map.value>] : String | StringSubstitutorTextTest.java:23:31:23:73 | new StringSubstitutor(...) : StringSubstitutor | provenance | MaD:520 |
+| StringSubstitutorTextTest.java:23:81:23:83 | ss3 : StringSubstitutor | StringSubstitutorTextTest.java:23:81:23:100 | replace(...) | provenance | MaD:539 |
 | StringSubstitutorTextTest.java:24:31:24:78 | new StringSubstitutor(...) : StringSubstitutor | StringSubstitutorTextTest.java:24:86:24:88 | ss4 : StringSubstitutor | provenance |  |
-| StringSubstitutorTextTest.java:24:53:24:62 | taintedMap : HashMap [<map.value>] : String | StringSubstitutorTextTest.java:24:31:24:78 | new StringSubstitutor(...) : StringSubstitutor | provenance | MaD:521 |
-| StringSubstitutorTextTest.java:24:86:24:88 | ss4 : StringSubstitutor | StringSubstitutorTextTest.java:24:86:24:105 | replace(...) | provenance | MaD:522 |
+| StringSubstitutorTextTest.java:24:53:24:62 | taintedMap : HashMap [<map.value>] : String | StringSubstitutorTextTest.java:24:31:24:78 | new StringSubstitutor(...) : StringSubstitutor | provenance | MaD:520 |
+| StringSubstitutorTextTest.java:24:86:24:88 | ss4 : StringSubstitutor | StringSubstitutorTextTest.java:24:86:24:105 | replace(...) | provenance | MaD:539 |
 | StringSubstitutorTextTest.java:25:31:25:83 | new StringSubstitutor(...) : StringSubstitutor | StringSubstitutorTextTest.java:25:91:25:93 | ss5 : StringSubstitutor | provenance |  |
-| StringSubstitutorTextTest.java:25:53:25:62 | taintedMap : HashMap [<map.value>] : String | StringSubstitutorTextTest.java:25:31:25:83 | new StringSubstitutor(...) : StringSubstitutor | provenance | MaD:521 |
-| StringSubstitutorTextTest.java:25:91:25:93 | ss5 : StringSubstitutor | StringSubstitutorTextTest.java:25:91:25:110 | replace(...) | provenance | MaD:522 |
+| StringSubstitutorTextTest.java:25:53:25:62 | taintedMap : HashMap [<map.value>] : String | StringSubstitutorTextTest.java:25:31:25:83 | new StringSubstitutor(...) : StringSubstitutor | provenance | MaD:520 |
+| StringSubstitutorTextTest.java:25:91:25:93 | ss5 : StringSubstitutor | StringSubstitutorTextTest.java:25:91:25:110 | replace(...) | provenance | MaD:539 |
 | StringSubstitutorTextTest.java:26:31:26:66 | new StringSubstitutor(...) : StringSubstitutor | StringSubstitutorTextTest.java:26:74:26:76 | ss6 : StringSubstitutor | provenance |  |
 | StringSubstitutorTextTest.java:26:53:26:65 | taintedLookup : StringLookup | StringSubstitutorTextTest.java:26:31:26:66 | new StringSubstitutor(...) : StringSubstitutor | provenance | MaD:520 |
 | StringSubstitutorTextTest.java:26:53:26:65 | taintedLookup : StringLookup | StringSubstitutorTextTest.java:26:31:26:66 | new StringSubstitutor(...) : StringSubstitutor | provenance | MaD:521 |
-| StringSubstitutorTextTest.java:26:74:26:76 | ss6 : StringSubstitutor | StringSubstitutorTextTest.java:26:74:26:93 | replace(...) | provenance | MaD:522 |
+| StringSubstitutorTextTest.java:26:74:26:76 | ss6 : StringSubstitutor | StringSubstitutorTextTest.java:26:74:26:93 | replace(...) | provenance | MaD:539 |
 | StringSubstitutorTextTest.java:27:31:27:81 | new StringSubstitutor(...) : StringSubstitutor | StringSubstitutorTextTest.java:27:89:27:91 | ss7 : StringSubstitutor | provenance |  |
 | StringSubstitutorTextTest.java:27:53:27:65 | taintedLookup : StringLookup | StringSubstitutorTextTest.java:27:31:27:81 | new StringSubstitutor(...) : StringSubstitutor | provenance | MaD:520 |
 | StringSubstitutorTextTest.java:27:53:27:65 | taintedLookup : StringLookup | StringSubstitutorTextTest.java:27:31:27:81 | new StringSubstitutor(...) : StringSubstitutor | provenance | MaD:521 |
-| StringSubstitutorTextTest.java:27:89:27:91 | ss7 : StringSubstitutor | StringSubstitutorTextTest.java:27:89:27:108 | replace(...) | provenance | MaD:522 |
+| StringSubstitutorTextTest.java:27:89:27:91 | ss7 : StringSubstitutor | StringSubstitutorTextTest.java:27:89:27:108 | replace(...) | provenance | MaD:539 |
 | StringSubstitutorTextTest.java:28:31:28:86 | new StringSubstitutor(...) : StringSubstitutor | StringSubstitutorTextTest.java:28:94:28:96 | ss8 : StringSubstitutor | provenance |  |
 | StringSubstitutorTextTest.java:28:53:28:65 | taintedLookup : StringLookup | StringSubstitutorTextTest.java:28:31:28:86 | new StringSubstitutor(...) : StringSubstitutor | provenance | MaD:520 |
 | StringSubstitutorTextTest.java:28:53:28:65 | taintedLookup : StringLookup | StringSubstitutorTextTest.java:28:31:28:86 | new StringSubstitutor(...) : StringSubstitutor | provenance | MaD:521 |
-| StringSubstitutorTextTest.java:28:94:28:96 | ss8 : StringSubstitutor | StringSubstitutorTextTest.java:28:94:28:113 | replace(...) | provenance | MaD:522 |
+| StringSubstitutorTextTest.java:28:94:28:96 | ss8 : StringSubstitutor | StringSubstitutorTextTest.java:28:94:28:113 | replace(...) | provenance | MaD:539 |
 | StringSubstitutorTextTest.java:29:31:29:98 | new StringSubstitutor(...) : StringSubstitutor | StringSubstitutorTextTest.java:29:106:29:108 | ss9 : StringSubstitutor | provenance |  |
 | StringSubstitutorTextTest.java:29:53:29:65 | taintedLookup : StringLookup | StringSubstitutorTextTest.java:29:31:29:98 | new StringSubstitutor(...) : StringSubstitutor | provenance | MaD:520 |
 | StringSubstitutorTextTest.java:29:53:29:65 | taintedLookup : StringLookup | StringSubstitutorTextTest.java:29:31:29:98 | new StringSubstitutor(...) : StringSubstitutor | provenance | MaD:521 |
-| StringSubstitutorTextTest.java:29:106:29:108 | ss9 : StringSubstitutor | StringSubstitutorTextTest.java:29:106:29:125 | replace(...) | provenance | MaD:522 |
+| StringSubstitutorTextTest.java:29:106:29:108 | ss9 : StringSubstitutor | StringSubstitutorTextTest.java:29:106:29:125 | replace(...) | provenance | MaD:539 |
 | StringSubstitutorTextTest.java:30:32:30:105 | new StringSubstitutor(...) : StringSubstitutor | StringSubstitutorTextTest.java:30:113:30:116 | ss10 : StringSubstitutor | provenance |  |
 | StringSubstitutorTextTest.java:30:54:30:66 | taintedLookup : StringLookup | StringSubstitutorTextTest.java:30:32:30:105 | new StringSubstitutor(...) : StringSubstitutor | provenance | MaD:520 |
 | StringSubstitutorTextTest.java:30:54:30:66 | taintedLookup : StringLookup | StringSubstitutorTextTest.java:30:32:30:105 | new StringSubstitutor(...) : StringSubstitutor | provenance | MaD:521 |
-| StringSubstitutorTextTest.java:30:113:30:116 | ss10 : StringSubstitutor | StringSubstitutorTextTest.java:30:113:30:133 | replace(...) | provenance | MaD:522 |
-| StringSubstitutorTextTest.java:34:12:34:23 | taintedSubst : StringSubstitutor | StringSubstitutorTextTest.java:34:12:34:48 | replace(...) | provenance | MaD:522 |
-| StringSubstitutorTextTest.java:35:12:35:23 | taintedSubst : StringSubstitutor | StringSubstitutorTextTest.java:35:12:35:40 | replace(...) | provenance | MaD:522 |
-| StringSubstitutorTextTest.java:36:12:36:23 | taintedSubst : StringSubstitutor | StringSubstitutorTextTest.java:36:12:36:46 | replace(...) | provenance | MaD:522 |
-| StringSubstitutorTextTest.java:37:12:37:23 | taintedSubst : StringSubstitutor | StringSubstitutorTextTest.java:37:12:37:54 | replace(...) | provenance | MaD:522 |
-| StringSubstitutorTextTest.java:38:12:38:23 | taintedSubst : StringSubstitutor | StringSubstitutorTextTest.java:38:12:38:60 | replace(...) | provenance | MaD:522 |
-| StringSubstitutorTextTest.java:39:12:39:23 | taintedSubst : StringSubstitutor | StringSubstitutorTextTest.java:39:12:39:54 | replace(...) | provenance | MaD:522 |
-| StringSubstitutorTextTest.java:40:12:40:23 | taintedSubst : StringSubstitutor | StringSubstitutorTextTest.java:40:12:40:60 | replace(...) | provenance | MaD:522 |
-| StringSubstitutorTextTest.java:41:12:41:23 | taintedSubst : StringSubstitutor | StringSubstitutorTextTest.java:41:12:41:63 | replace(...) | provenance | MaD:522 |
-| StringSubstitutorTextTest.java:42:12:42:23 | taintedSubst : StringSubstitutor | StringSubstitutorTextTest.java:42:12:42:69 | replace(...) | provenance | MaD:522 |
-| StringSubstitutorTextTest.java:43:12:43:23 | taintedSubst : StringSubstitutor | StringSubstitutorTextTest.java:43:12:43:59 | replace(...) | provenance | MaD:522 |
-| StringSubstitutorTextTest.java:44:12:44:23 | taintedSubst : StringSubstitutor | StringSubstitutorTextTest.java:44:12:44:65 | replace(...) | provenance | MaD:522 |
-| StringSubstitutorTextTest.java:45:12:45:23 | taintedSubst : StringSubstitutor | StringSubstitutorTextTest.java:45:12:45:58 | replace(...) | provenance | MaD:522 |
-| StringSubstitutorTextTest.java:46:12:46:23 | taintedSubst : StringSubstitutor | StringSubstitutorTextTest.java:46:12:46:64 | replace(...) | provenance | MaD:522 |
-| StringSubstitutorTextTest.java:50:12:50:25 | untaintedSubst : StringSubstitutor | StringSubstitutorTextTest.java:50:12:50:50 | replace(...) | provenance | MaD:522 |
-| StringSubstitutorTextTest.java:50:35:50:49 | (...)... : String | StringSubstitutorTextTest.java:50:12:50:50 | replace(...) | provenance | MaD:527 |
+| StringSubstitutorTextTest.java:30:113:30:116 | ss10 : StringSubstitutor | StringSubstitutorTextTest.java:30:113:30:133 | replace(...) | provenance | MaD:539 |
+| StringSubstitutorTextTest.java:34:12:34:23 | taintedSubst : StringSubstitutor | StringSubstitutorTextTest.java:34:12:34:48 | replace(...) | provenance | MaD:539 |
+| StringSubstitutorTextTest.java:35:12:35:23 | taintedSubst : StringSubstitutor | StringSubstitutorTextTest.java:35:12:35:40 | replace(...) | provenance | MaD:539 |
+| StringSubstitutorTextTest.java:36:12:36:23 | taintedSubst : StringSubstitutor | StringSubstitutorTextTest.java:36:12:36:46 | replace(...) | provenance | MaD:539 |
+| StringSubstitutorTextTest.java:37:12:37:23 | taintedSubst : StringSubstitutor | StringSubstitutorTextTest.java:37:12:37:54 | replace(...) | provenance | MaD:539 |
+| StringSubstitutorTextTest.java:38:12:38:23 | taintedSubst : StringSubstitutor | StringSubstitutorTextTest.java:38:12:38:60 | replace(...) | provenance | MaD:539 |
+| StringSubstitutorTextTest.java:39:12:39:23 | taintedSubst : StringSubstitutor | StringSubstitutorTextTest.java:39:12:39:54 | replace(...) | provenance | MaD:539 |
+| StringSubstitutorTextTest.java:40:12:40:23 | taintedSubst : StringSubstitutor | StringSubstitutorTextTest.java:40:12:40:60 | replace(...) | provenance | MaD:539 |
+| StringSubstitutorTextTest.java:41:12:41:23 | taintedSubst : StringSubstitutor | StringSubstitutorTextTest.java:41:12:41:63 | replace(...) | provenance | MaD:539 |
+| StringSubstitutorTextTest.java:42:12:42:23 | taintedSubst : StringSubstitutor | StringSubstitutorTextTest.java:42:12:42:69 | replace(...) | provenance | MaD:539 |
+| StringSubstitutorTextTest.java:43:12:43:23 | taintedSubst : StringSubstitutor | StringSubstitutorTextTest.java:43:12:43:59 | replace(...) | provenance | MaD:539 |
+| StringSubstitutorTextTest.java:44:12:44:23 | taintedSubst : StringSubstitutor | StringSubstitutorTextTest.java:44:12:44:65 | replace(...) | provenance | MaD:539 |
+| StringSubstitutorTextTest.java:45:12:45:23 | taintedSubst : StringSubstitutor | StringSubstitutorTextTest.java:45:12:45:58 | replace(...) | provenance | MaD:539 |
+| StringSubstitutorTextTest.java:46:12:46:23 | taintedSubst : StringSubstitutor | StringSubstitutorTextTest.java:46:12:46:64 | replace(...) | provenance | MaD:539 |
+| StringSubstitutorTextTest.java:50:12:50:25 | untaintedSubst : StringSubstitutor | StringSubstitutorTextTest.java:50:12:50:50 | replace(...) | provenance | MaD:539 |
+| StringSubstitutorTextTest.java:50:35:50:49 | (...)... : String | StringSubstitutorTextTest.java:50:12:50:50 | replace(...) | provenance | MaD:526 |
 | StringSubstitutorTextTest.java:50:43:50:49 | taint(...) : String | StringSubstitutorTextTest.java:50:35:50:49 | (...)... : String | provenance |  |
-| StringSubstitutorTextTest.java:51:12:51:25 | untaintedSubst : StringSubstitutor | StringSubstitutorTextTest.java:51:12:51:42 | replace(...) | provenance | MaD:522 |
-| StringSubstitutorTextTest.java:51:35:51:41 | taint(...) : String | StringSubstitutorTextTest.java:51:12:51:42 | replace(...) | provenance | MaD:534 |
-| StringSubstitutorTextTest.java:52:12:52:25 | untaintedSubst : StringSubstitutor | StringSubstitutorTextTest.java:52:12:52:48 | replace(...) | provenance | MaD:522 |
-| StringSubstitutorTextTest.java:52:35:52:41 | taint(...) : String | StringSubstitutorTextTest.java:52:12:52:48 | replace(...) | provenance | MaD:535 |
-| StringSubstitutorTextTest.java:53:12:53:25 | untaintedSubst : StringSubstitutor | StringSubstitutorTextTest.java:53:12:53:56 | replace(...) | provenance | MaD:522 |
+| StringSubstitutorTextTest.java:51:12:51:25 | untaintedSubst : StringSubstitutor | StringSubstitutorTextTest.java:51:12:51:42 | replace(...) | provenance | MaD:539 |
+| StringSubstitutorTextTest.java:51:35:51:41 | taint(...) : String | StringSubstitutorTextTest.java:51:12:51:42 | replace(...) | provenance | MaD:533 |
+| StringSubstitutorTextTest.java:52:12:52:25 | untaintedSubst : StringSubstitutor | StringSubstitutorTextTest.java:52:12:52:48 | replace(...) | provenance | MaD:539 |
+| StringSubstitutorTextTest.java:52:35:52:41 | taint(...) : String | StringSubstitutorTextTest.java:52:12:52:48 | replace(...) | provenance | MaD:534 |
+| StringSubstitutorTextTest.java:53:12:53:25 | untaintedSubst : StringSubstitutor | StringSubstitutorTextTest.java:53:12:53:56 | replace(...) | provenance | MaD:539 |
 | StringSubstitutorTextTest.java:53:35:53:41 | taint(...) : String | StringSubstitutorTextTest.java:53:35:53:55 | toCharArray(...) : char[] | provenance | MaD:7 |
-| StringSubstitutorTextTest.java:53:35:53:55 | toCharArray(...) : char[] | StringSubstitutorTextTest.java:53:12:53:56 | replace(...) | provenance | MaD:523 |
-| StringSubstitutorTextTest.java:54:12:54:25 | untaintedSubst : StringSubstitutor | StringSubstitutorTextTest.java:54:12:54:62 | replace(...) | provenance | MaD:522 |
+| StringSubstitutorTextTest.java:53:35:53:55 | toCharArray(...) : char[] | StringSubstitutorTextTest.java:53:12:53:56 | replace(...) | provenance | MaD:522 |
+| StringSubstitutorTextTest.java:54:12:54:25 | untaintedSubst : StringSubstitutor | StringSubstitutorTextTest.java:54:12:54:62 | replace(...) | provenance | MaD:539 |
 | StringSubstitutorTextTest.java:54:35:54:41 | taint(...) : String | StringSubstitutorTextTest.java:54:35:54:55 | toCharArray(...) : char[] | provenance | MaD:7 |
-| StringSubstitutorTextTest.java:54:35:54:55 | toCharArray(...) : char[] | StringSubstitutorTextTest.java:54:12:54:62 | replace(...) | provenance | MaD:524 |
-| StringSubstitutorTextTest.java:55:12:55:25 | untaintedSubst : StringSubstitutor | StringSubstitutorTextTest.java:55:12:55:56 | replace(...) | provenance | MaD:522 |
-| StringSubstitutorTextTest.java:55:35:55:55 | (...)... : String | StringSubstitutorTextTest.java:55:12:55:56 | replace(...) | provenance | MaD:525 |
+| StringSubstitutorTextTest.java:54:35:54:55 | toCharArray(...) : char[] | StringSubstitutorTextTest.java:54:12:54:62 | replace(...) | provenance | MaD:523 |
+| StringSubstitutorTextTest.java:55:12:55:25 | untaintedSubst : StringSubstitutor | StringSubstitutorTextTest.java:55:12:55:56 | replace(...) | provenance | MaD:539 |
+| StringSubstitutorTextTest.java:55:35:55:55 | (...)... : String | StringSubstitutorTextTest.java:55:12:55:56 | replace(...) | provenance | MaD:524 |
 | StringSubstitutorTextTest.java:55:49:55:55 | taint(...) : String | StringSubstitutorTextTest.java:55:35:55:55 | (...)... : String | provenance |  |
-| StringSubstitutorTextTest.java:56:12:56:25 | untaintedSubst : StringSubstitutor | StringSubstitutorTextTest.java:56:12:56:62 | replace(...) | provenance | MaD:522 |
-| StringSubstitutorTextTest.java:56:35:56:55 | (...)... : String | StringSubstitutorTextTest.java:56:12:56:62 | replace(...) | provenance | MaD:526 |
+| StringSubstitutorTextTest.java:56:12:56:25 | untaintedSubst : StringSubstitutor | StringSubstitutorTextTest.java:56:12:56:62 | replace(...) | provenance | MaD:539 |
+| StringSubstitutorTextTest.java:56:35:56:55 | (...)... : String | StringSubstitutorTextTest.java:56:12:56:62 | replace(...) | provenance | MaD:525 |
 | StringSubstitutorTextTest.java:56:49:56:55 | taint(...) : String | StringSubstitutorTextTest.java:56:35:56:55 | (...)... : String | provenance |  |
-| StringSubstitutorTextTest.java:57:12:57:25 | untaintedSubst : StringSubstitutor | StringSubstitutorTextTest.java:57:12:57:65 | replace(...) | provenance | MaD:522 |
-| StringSubstitutorTextTest.java:57:35:57:64 | new TextStringBuilder(...) : TextStringBuilder | StringSubstitutorTextTest.java:57:12:57:65 | replace(...) | provenance | MaD:538 |
+| StringSubstitutorTextTest.java:57:12:57:25 | untaintedSubst : StringSubstitutor | StringSubstitutorTextTest.java:57:12:57:65 | replace(...) | provenance | MaD:539 |
+| StringSubstitutorTextTest.java:57:35:57:64 | new TextStringBuilder(...) : TextStringBuilder | StringSubstitutorTextTest.java:57:12:57:65 | replace(...) | provenance | MaD:537 |
 | StringSubstitutorTextTest.java:57:57:57:63 | taint(...) : String | StringSubstitutorTextTest.java:57:35:57:64 | new TextStringBuilder(...) : TextStringBuilder | provenance | MaD:561 |
-| StringSubstitutorTextTest.java:58:12:58:25 | untaintedSubst : StringSubstitutor | StringSubstitutorTextTest.java:58:12:58:71 | replace(...) | provenance | MaD:522 |
-| StringSubstitutorTextTest.java:58:35:58:64 | new TextStringBuilder(...) : TextStringBuilder | StringSubstitutorTextTest.java:58:12:58:71 | replace(...) | provenance | MaD:539 |
+| StringSubstitutorTextTest.java:58:12:58:25 | untaintedSubst : StringSubstitutor | StringSubstitutorTextTest.java:58:12:58:71 | replace(...) | provenance | MaD:539 |
+| StringSubstitutorTextTest.java:58:35:58:64 | new TextStringBuilder(...) : TextStringBuilder | StringSubstitutorTextTest.java:58:12:58:71 | replace(...) | provenance | MaD:538 |
 | StringSubstitutorTextTest.java:58:57:58:63 | taint(...) : String | StringSubstitutorTextTest.java:58:35:58:64 | new TextStringBuilder(...) : TextStringBuilder | provenance | MaD:561 |
-| StringSubstitutorTextTest.java:59:12:59:25 | untaintedSubst : StringSubstitutor | StringSubstitutorTextTest.java:59:12:59:61 | replace(...) | provenance | MaD:522 |
-| StringSubstitutorTextTest.java:59:35:59:60 | new StringBuilder(...) : StringBuilder | StringSubstitutorTextTest.java:59:12:59:61 | replace(...) | provenance | MaD:525 |
+| StringSubstitutorTextTest.java:59:12:59:25 | untaintedSubst : StringSubstitutor | StringSubstitutorTextTest.java:59:12:59:61 | replace(...) | provenance | MaD:539 |
+| StringSubstitutorTextTest.java:59:35:59:60 | new StringBuilder(...) : StringBuilder | StringSubstitutorTextTest.java:59:12:59:61 | replace(...) | provenance | MaD:524 |
 | StringSubstitutorTextTest.java:59:53:59:59 | taint(...) : String | StringSubstitutorTextTest.java:59:35:59:60 | new StringBuilder(...) : StringBuilder | provenance | MaD:9 |
-| StringSubstitutorTextTest.java:60:12:60:25 | untaintedSubst : StringSubstitutor | StringSubstitutorTextTest.java:60:12:60:67 | replace(...) | provenance | MaD:522 |
-| StringSubstitutorTextTest.java:60:35:60:60 | new StringBuilder(...) : StringBuilder | StringSubstitutorTextTest.java:60:12:60:67 | replace(...) | provenance | MaD:526 |
+| StringSubstitutorTextTest.java:60:12:60:25 | untaintedSubst : StringSubstitutor | StringSubstitutorTextTest.java:60:12:60:67 | replace(...) | provenance | MaD:539 |
+| StringSubstitutorTextTest.java:60:35:60:60 | new StringBuilder(...) : StringBuilder | StringSubstitutorTextTest.java:60:12:60:67 | replace(...) | provenance | MaD:525 |
 | StringSubstitutorTextTest.java:60:53:60:59 | taint(...) : String | StringSubstitutorTextTest.java:60:35:60:60 | new StringBuilder(...) : StringBuilder | provenance | MaD:9 |
-| StringSubstitutorTextTest.java:61:12:61:25 | untaintedSubst : StringSubstitutor | StringSubstitutorTextTest.java:61:12:61:60 | replace(...) | provenance | MaD:522 |
-| StringSubstitutorTextTest.java:61:35:61:59 | new StringBuffer(...) : StringBuffer | StringSubstitutorTextTest.java:61:12:61:60 | replace(...) | provenance | MaD:536 |
+| StringSubstitutorTextTest.java:61:12:61:25 | untaintedSubst : StringSubstitutor | StringSubstitutorTextTest.java:61:12:61:60 | replace(...) | provenance | MaD:539 |
+| StringSubstitutorTextTest.java:61:35:61:59 | new StringBuffer(...) : StringBuffer | StringSubstitutorTextTest.java:61:12:61:60 | replace(...) | provenance | MaD:535 |
 | StringSubstitutorTextTest.java:61:52:61:58 | taint(...) : String | StringSubstitutorTextTest.java:61:35:61:59 | new StringBuffer(...) : StringBuffer | provenance | MaD:8 |
-| StringSubstitutorTextTest.java:62:12:62:25 | untaintedSubst : StringSubstitutor | StringSubstitutorTextTest.java:62:12:62:66 | replace(...) | provenance | MaD:522 |
-| StringSubstitutorTextTest.java:62:35:62:59 | new StringBuffer(...) : StringBuffer | StringSubstitutorTextTest.java:62:12:62:66 | replace(...) | provenance | MaD:537 |
+| StringSubstitutorTextTest.java:62:12:62:25 | untaintedSubst : StringSubstitutor | StringSubstitutorTextTest.java:62:12:62:66 | replace(...) | provenance | MaD:539 |
+| StringSubstitutorTextTest.java:62:35:62:59 | new StringBuffer(...) : StringBuffer | StringSubstitutorTextTest.java:62:12:62:66 | replace(...) | provenance | MaD:536 |
 | StringSubstitutorTextTest.java:62:52:62:58 | taint(...) : String | StringSubstitutorTextTest.java:62:35:62:59 | new StringBuffer(...) : StringBuffer | provenance | MaD:8 |
-| StringSubstitutorTextTest.java:65:38:65:44 | taint(...) : String | StringSubstitutorTextTest.java:65:12:65:76 | replace(...) | provenance | MaD:528 |
-| StringSubstitutorTextTest.java:66:38:66:44 | taint(...) : String | StringSubstitutorTextTest.java:66:12:66:86 | replace(...) | provenance | MaD:530 |
-| StringSubstitutorTextTest.java:67:47:67:56 | taintedMap : HashMap [<map.value>] : String | StringSubstitutorTextTest.java:67:12:67:57 | replace(...) | provenance | MaD:529 |
-| StringSubstitutorTextTest.java:68:47:68:56 | taintedMap : HashMap [<map.value>] : String | StringSubstitutorTextTest.java:68:12:68:67 | replace(...) | provenance | MaD:531 |
+| StringSubstitutorTextTest.java:65:38:65:44 | taint(...) : String | StringSubstitutorTextTest.java:65:12:65:76 | replace(...) | provenance | MaD:527 |
+| StringSubstitutorTextTest.java:66:38:66:44 | taint(...) : String | StringSubstitutorTextTest.java:66:12:66:86 | replace(...) | provenance | MaD:529 |
+| StringSubstitutorTextTest.java:67:47:67:56 | taintedMap : HashMap [<map.value>] : String | StringSubstitutorTextTest.java:67:12:67:57 | replace(...) | provenance | MaD:528 |
+| StringSubstitutorTextTest.java:68:47:68:56 | taintedMap : HashMap [<map.value>] : String | StringSubstitutorTextTest.java:68:12:68:67 | replace(...) | provenance | MaD:530 |
 | StringSubstitutorTextTest.java:70:7:70:18 | taintedProps [post update] : Properties [<map.value>] : String | StringSubstitutorTextTest.java:72:47:72:58 | taintedProps : Properties [<map.value>] : String | provenance |  |
 | StringSubstitutorTextTest.java:70:31:70:37 | taint(...) : String | StringSubstitutorTextTest.java:70:7:70:18 | taintedProps [post update] : Properties [<map.value>] : String | provenance | MaD:12 |
-| StringSubstitutorTextTest.java:70:31:70:37 | taint(...) : String | StringSubstitutorTextTest.java:70:7:70:18 | taintedProps [post update] : Properties [<map.value>] : String | provenance | MaD:16 |
-| StringSubstitutorTextTest.java:71:38:71:44 | taint(...) : String | StringSubstitutorTextTest.java:71:12:71:63 | replace(...) | provenance | MaD:532 |
-| StringSubstitutorTextTest.java:72:47:72:58 | taintedProps : Properties [<map.value>] : String | StringSubstitutorTextTest.java:72:12:72:59 | replace(...) | provenance | MaD:533 |
+| StringSubstitutorTextTest.java:70:31:70:37 | taint(...) : String | StringSubstitutorTextTest.java:70:7:70:18 | taintedProps [post update] : Properties [<map.value>] : String | provenance | MaD:18 |
+| StringSubstitutorTextTest.java:71:38:71:44 | taint(...) : String | StringSubstitutorTextTest.java:71:12:71:63 | replace(...) | provenance | MaD:531 |
+| StringSubstitutorTextTest.java:72:47:72:58 | taintedProps : Properties [<map.value>] : String | StringSubstitutorTextTest.java:72:12:72:59 | replace(...) | provenance | MaD:532 |
 | StringSubstitutorTextTest.java:75:64:75:75 | taintedSubst : StringSubstitutor | StringSubstitutorTextTest.java:75:87:75:97 | strBuilder1 [post update] : TextStringBuilder | provenance | MaD:544 |
 | StringSubstitutorTextTest.java:75:87:75:97 | strBuilder1 [post update] : TextStringBuilder | StringSubstitutorTextTest.java:75:106:75:116 | strBuilder1 : TextStringBuilder | provenance |  |
 | StringSubstitutorTextTest.java:75:106:75:116 | strBuilder1 : TextStringBuilder | StringSubstitutorTextTest.java:75:106:75:127 | toString(...) | provenance | MaD:5 |
@@ -2567,57 +2541,57 @@ edges
 | StringTokenizerTest.java:42:40:42:60 | toCharArray(...) : char[] | StringTokenizerTest.java:42:10:42:61 | reset(...) : StringTokenizer | provenance | MaD:558 |
 | StringTokenizerTest.java:43:10:43:47 | reset(...) : StringTokenizer | StringTokenizerTest.java:43:10:43:58 | toString(...) | provenance | MaD:559 |
 | StringTokenizerTest.java:43:40:43:46 | taint(...) : String | StringTokenizerTest.java:43:10:43:47 | reset(...) : StringTokenizer | provenance | MaD:558 |
-| Test.java:15:37:15:43 | taint(...) : String | Test.java:15:14:15:47 | abbreviate(...) | provenance | MaD:80 |
-| Test.java:16:37:16:43 | taint(...) : String | Test.java:16:14:16:50 | abbreviate(...) | provenance | MaD:80 |
-| Test.java:17:37:17:43 | taint(...) : String | Test.java:17:14:17:54 | abbreviate(...) | provenance | MaD:80 |
-| Test.java:18:50:18:56 | taint(...) : String | Test.java:18:14:18:60 | abbreviate(...) | provenance | MaD:81 |
-| Test.java:19:37:19:43 | taint(...) : String | Test.java:19:14:19:57 | abbreviate(...) | provenance | MaD:80 |
-| Test.java:20:50:20:56 | taint(...) : String | Test.java:20:14:20:63 | abbreviate(...) | provenance | MaD:82 |
-| Test.java:21:43:21:49 | taint(...) : String | Test.java:21:14:21:60 | abbreviateMiddle(...) | provenance | MaD:83 |
-| Test.java:22:56:22:62 | taint(...) : String | Test.java:22:14:22:66 | abbreviateMiddle(...) | provenance | MaD:84 |
-| Test.java:23:42:23:48 | taint(...) : String | Test.java:23:14:23:89 | appendIfMissing(...) | provenance | MaD:85 |
-| Test.java:24:52:24:58 | taint(...) : String | Test.java:24:14:24:89 | appendIfMissing(...) | provenance | MaD:86 |
-| Test.java:28:52:28:58 | taint(...) : String | Test.java:28:14:28:99 | appendIfMissingIgnoreCase(...) | provenance | MaD:87 |
-| Test.java:29:62:29:68 | taint(...) : String | Test.java:29:14:29:99 | appendIfMissingIgnoreCase(...) | provenance | MaD:88 |
-| Test.java:33:37:33:43 | taint(...) : String | Test.java:33:14:33:44 | capitalize(...) | provenance | MaD:89 |
-| Test.java:34:33:34:39 | taint(...) : String | Test.java:34:14:34:43 | center(...) | provenance | MaD:90 |
-| Test.java:35:33:35:39 | taint(...) : String | Test.java:35:14:35:48 | center(...) | provenance | MaD:90 |
-| Test.java:36:33:36:39 | taint(...) : String | Test.java:36:14:36:61 | center(...) | provenance | MaD:90 |
-| Test.java:37:49:37:55 | taint(...) : String | Test.java:37:14:37:56 | center(...) | provenance | MaD:91 |
-| Test.java:38:32:38:38 | taint(...) : String | Test.java:38:14:38:39 | chomp(...) | provenance | MaD:92 |
-| Test.java:39:32:39:38 | taint(...) : String | Test.java:39:14:39:52 | chomp(...) | provenance | MaD:93 |
-| Test.java:42:31:42:37 | taint(...) : String | Test.java:42:14:42:38 | chop(...) | provenance | MaD:94 |
-| Test.java:43:41:43:47 | taint(...) : String | Test.java:43:14:43:59 | defaultIfBlank(...) | provenance | MaD:95 |
-| Test.java:44:58:44:64 | taint(...) : String | Test.java:44:14:44:65 | defaultIfBlank(...) | provenance | MaD:95 |
-| Test.java:45:41:45:47 | taint(...) : String | Test.java:45:14:45:59 | defaultIfEmpty(...) | provenance | MaD:96 |
-| Test.java:46:58:46:64 | taint(...) : String | Test.java:46:14:46:65 | defaultIfEmpty(...) | provenance | MaD:96 |
-| Test.java:47:40:47:46 | taint(...) : String | Test.java:47:14:47:47 | defaultString(...) | provenance | MaD:97 |
-| Test.java:48:40:48:46 | taint(...) : String | Test.java:48:14:48:65 | defaultString(...) | provenance | MaD:97 |
-| Test.java:49:56:49:62 | taint(...) : String | Test.java:49:14:49:63 | defaultString(...) | provenance | MaD:97 |
-| Test.java:50:43:50:49 | taint(...) : String | Test.java:50:14:50:50 | deleteWhitespace(...) | provenance | MaD:98 |
-| Test.java:51:37:51:43 | taint(...) : String | Test.java:51:14:51:51 | difference(...) | provenance | MaD:99 |
-| Test.java:52:44:52:50 | taint(...) : String | Test.java:52:14:52:51 | difference(...) | provenance | MaD:99 |
-| Test.java:53:14:53:64 | new ..[] { .. } : CharSequence[] [[]] : String | Test.java:53:14:53:64 | firstNonBlank(...) | provenance | MaD:100 |
+| Test.java:15:37:15:43 | taint(...) : String | Test.java:15:14:15:47 | abbreviate(...) | provenance | MaD:275 |
+| Test.java:16:37:16:43 | taint(...) : String | Test.java:16:14:16:50 | abbreviate(...) | provenance | MaD:275 |
+| Test.java:17:37:17:43 | taint(...) : String | Test.java:17:14:17:54 | abbreviate(...) | provenance | MaD:275 |
+| Test.java:18:50:18:56 | taint(...) : String | Test.java:18:14:18:60 | abbreviate(...) | provenance | MaD:273 |
+| Test.java:19:37:19:43 | taint(...) : String | Test.java:19:14:19:57 | abbreviate(...) | provenance | MaD:275 |
+| Test.java:20:50:20:56 | taint(...) : String | Test.java:20:14:20:63 | abbreviate(...) | provenance | MaD:274 |
+| Test.java:21:43:21:49 | taint(...) : String | Test.java:21:14:21:60 | abbreviateMiddle(...) | provenance | MaD:276 |
+| Test.java:22:56:22:62 | taint(...) : String | Test.java:22:14:22:66 | abbreviateMiddle(...) | provenance | MaD:277 |
+| Test.java:23:42:23:48 | taint(...) : String | Test.java:23:14:23:89 | appendIfMissing(...) | provenance | MaD:278 |
+| Test.java:24:52:24:58 | taint(...) : String | Test.java:24:14:24:89 | appendIfMissing(...) | provenance | MaD:279 |
+| Test.java:28:52:28:58 | taint(...) : String | Test.java:28:14:28:99 | appendIfMissingIgnoreCase(...) | provenance | MaD:280 |
+| Test.java:29:62:29:68 | taint(...) : String | Test.java:29:14:29:99 | appendIfMissingIgnoreCase(...) | provenance | MaD:281 |
+| Test.java:33:37:33:43 | taint(...) : String | Test.java:33:14:33:44 | capitalize(...) | provenance | MaD:282 |
+| Test.java:34:33:34:39 | taint(...) : String | Test.java:34:14:34:43 | center(...) | provenance | MaD:284 |
+| Test.java:35:33:35:39 | taint(...) : String | Test.java:35:14:35:48 | center(...) | provenance | MaD:284 |
+| Test.java:36:33:36:39 | taint(...) : String | Test.java:36:14:36:61 | center(...) | provenance | MaD:284 |
+| Test.java:37:49:37:55 | taint(...) : String | Test.java:37:14:37:56 | center(...) | provenance | MaD:283 |
+| Test.java:38:32:38:38 | taint(...) : String | Test.java:38:14:38:39 | chomp(...) | provenance | MaD:285 |
+| Test.java:39:32:39:38 | taint(...) : String | Test.java:39:14:39:52 | chomp(...) | provenance | MaD:286 |
+| Test.java:42:31:42:37 | taint(...) : String | Test.java:42:14:42:38 | chop(...) | provenance | MaD:287 |
+| Test.java:43:41:43:47 | taint(...) : String | Test.java:43:14:43:59 | defaultIfBlank(...) | provenance | MaD:288 |
+| Test.java:44:58:44:64 | taint(...) : String | Test.java:44:14:44:65 | defaultIfBlank(...) | provenance | MaD:288 |
+| Test.java:45:41:45:47 | taint(...) : String | Test.java:45:14:45:59 | defaultIfEmpty(...) | provenance | MaD:289 |
+| Test.java:46:58:46:64 | taint(...) : String | Test.java:46:14:46:65 | defaultIfEmpty(...) | provenance | MaD:289 |
+| Test.java:47:40:47:46 | taint(...) : String | Test.java:47:14:47:47 | defaultString(...) | provenance | MaD:290 |
+| Test.java:48:40:48:46 | taint(...) : String | Test.java:48:14:48:65 | defaultString(...) | provenance | MaD:290 |
+| Test.java:49:56:49:62 | taint(...) : String | Test.java:49:14:49:63 | defaultString(...) | provenance | MaD:290 |
+| Test.java:50:43:50:49 | taint(...) : String | Test.java:50:14:50:50 | deleteWhitespace(...) | provenance | MaD:291 |
+| Test.java:51:37:51:43 | taint(...) : String | Test.java:51:14:51:51 | difference(...) | provenance | MaD:292 |
+| Test.java:52:44:52:50 | taint(...) : String | Test.java:52:14:52:51 | difference(...) | provenance | MaD:292 |
+| Test.java:53:14:53:64 | new ..[] { .. } : CharSequence[] [[]] : String | Test.java:53:14:53:64 | firstNonBlank(...) | provenance | MaD:293 |
 | Test.java:53:40:53:46 | taint(...) : String | Test.java:53:14:53:64 | new ..[] { .. } : CharSequence[] [[]] : String | provenance |  |
-| Test.java:54:14:54:63 | new ..[] { .. } : CharSequence[] [[]] : String | Test.java:54:14:54:63 | firstNonBlank(...) | provenance | MaD:100 |
+| Test.java:54:14:54:63 | new ..[] { .. } : CharSequence[] [[]] : String | Test.java:54:14:54:63 | firstNonBlank(...) | provenance | MaD:293 |
 | Test.java:54:56:54:62 | taint(...) : String | Test.java:54:14:54:63 | new ..[] { .. } : CharSequence[] [[]] : String | provenance |  |
-| Test.java:55:14:55:64 | new ..[] { .. } : CharSequence[] [[]] : String | Test.java:55:14:55:64 | firstNonEmpty(...) | provenance | MaD:101 |
+| Test.java:55:14:55:64 | new ..[] { .. } : CharSequence[] [[]] : String | Test.java:55:14:55:64 | firstNonEmpty(...) | provenance | MaD:294 |
 | Test.java:55:40:55:46 | taint(...) : String | Test.java:55:14:55:64 | new ..[] { .. } : CharSequence[] [[]] : String | provenance |  |
-| Test.java:56:14:56:63 | new ..[] { .. } : CharSequence[] [[]] : String | Test.java:56:14:56:63 | firstNonEmpty(...) | provenance | MaD:101 |
+| Test.java:56:14:56:63 | new ..[] { .. } : CharSequence[] [[]] : String | Test.java:56:14:56:63 | firstNonEmpty(...) | provenance | MaD:294 |
 | Test.java:56:56:56:62 | taint(...) : String | Test.java:56:14:56:63 | new ..[] { .. } : CharSequence[] [[]] : String | provenance |  |
-| Test.java:57:35:57:41 | taint(...) : String | Test.java:57:14:57:57 | getBytes(...) | provenance | MaD:102 |
-| Test.java:58:35:58:41 | taint(...) : String | Test.java:58:14:58:58 | getBytes(...) | provenance | MaD:102 |
-| Test.java:61:14:61:66 | new ..[] { .. } : String[] [[]] : String | Test.java:61:14:61:66 | getCommonPrefix(...) | provenance | MaD:103 |
+| Test.java:57:35:57:41 | taint(...) : String | Test.java:57:14:57:57 | getBytes(...) | provenance | MaD:295 |
+| Test.java:58:35:58:41 | taint(...) : String | Test.java:58:14:58:58 | getBytes(...) | provenance | MaD:295 |
+| Test.java:61:14:61:66 | new ..[] { .. } : String[] [[]] : String | Test.java:61:14:61:66 | getCommonPrefix(...) | provenance | MaD:296 |
 | Test.java:61:42:61:48 | taint(...) : String | Test.java:61:14:61:66 | new ..[] { .. } : String[] [[]] : String | provenance |  |
-| Test.java:62:14:62:65 | new ..[] { .. } : String[] [[]] : String | Test.java:62:14:62:65 | getCommonPrefix(...) | provenance | MaD:103 |
+| Test.java:62:14:62:65 | new ..[] { .. } : String[] [[]] : String | Test.java:62:14:62:65 | getCommonPrefix(...) | provenance | MaD:296 |
 | Test.java:62:58:62:64 | taint(...) : String | Test.java:62:14:62:65 | new ..[] { .. } : String[] [[]] : String | provenance |  |
-| Test.java:63:36:63:42 | taint(...) : String | Test.java:63:14:63:43 | getDigits(...) | provenance | MaD:104 |
-| Test.java:64:37:64:43 | taint(...) : String | Test.java:64:14:64:61 | getIfBlank(...) | provenance | MaD:105 |
-| Test.java:65:37:65:43 | taint(...) : String | Test.java:65:14:65:61 | getIfEmpty(...) | provenance | MaD:106 |
+| Test.java:63:36:63:42 | taint(...) : String | Test.java:63:14:63:43 | getDigits(...) | provenance | MaD:297 |
+| Test.java:64:37:64:43 | taint(...) : String | Test.java:64:14:64:61 | getIfBlank(...) | provenance | MaD:298 |
+| Test.java:65:37:65:43 | taint(...) : String | Test.java:65:14:65:61 | getIfEmpty(...) | provenance | MaD:299 |
 | Test.java:73:31:73:37 | taint(...) : String | Test.java:73:31:73:51 | toCharArray(...) : char[] | provenance | MaD:7 |
-| Test.java:73:31:73:51 | toCharArray(...) : char[] | Test.java:73:14:73:57 | join(...) | provenance | MaD:107 |
+| Test.java:73:31:73:51 | toCharArray(...) : char[] | Test.java:73:14:73:57 | join(...) | provenance | MaD:307 |
 | Test.java:74:31:74:37 | taint(...) : String | Test.java:74:31:74:51 | toCharArray(...) : char[] | provenance | MaD:7 |
-| Test.java:74:31:74:51 | toCharArray(...) : char[] | Test.java:74:14:74:63 | join(...) | provenance | MaD:108 |
+| Test.java:74:31:74:51 | toCharArray(...) : char[] | Test.java:74:14:74:63 | join(...) | provenance | MaD:308 |
 | Test.java:77:9:77:19 | taintedList [post update] : ArrayList [<element>] : String | Test.java:78:31:78:41 | taintedList : ArrayList [<element>] : String | provenance |  |
 | Test.java:77:9:77:19 | taintedList [post update] : ArrayList [<element>] : String | Test.java:79:31:79:41 | taintedList : ArrayList [<element>] : String | provenance |  |
 | Test.java:77:9:77:19 | taintedList [post update] : ArrayList [<element>] : String | Test.java:83:31:83:41 | taintedList : ArrayList [<element>] : String | provenance |  |
@@ -2625,163 +2599,163 @@ edges
 | Test.java:77:9:77:19 | taintedList [post update] : ArrayList [<element>] : String | Test.java:87:31:87:41 | taintedList : ArrayList [<element>] : String | provenance |  |
 | Test.java:77:9:77:19 | taintedList [post update] : ArrayList [<element>] : String | Test.java:88:31:88:41 | taintedList : ArrayList [<element>] : String | provenance |  |
 | Test.java:77:25:77:31 | taint(...) : String | Test.java:77:9:77:19 | taintedList [post update] : ArrayList [<element>] : String | provenance | MaD:11 |
-| Test.java:78:31:78:41 | taintedList : ArrayList [<element>] : String | Test.java:78:14:78:47 | join(...) | provenance | MaD:109 |
-| Test.java:79:31:79:41 | taintedList : ArrayList [<element>] : String | Test.java:79:14:79:49 | join(...) | provenance | MaD:110 |
-| Test.java:81:46:81:52 | taint(...) : String | Test.java:81:14:81:53 | join(...) | provenance | MaD:111 |
+| Test.java:78:31:78:41 | taintedList : ArrayList [<element>] : String | Test.java:78:14:78:47 | join(...) | provenance | MaD:309 |
+| Test.java:79:31:79:41 | taintedList : ArrayList [<element>] : String | Test.java:79:14:79:49 | join(...) | provenance | MaD:310 |
+| Test.java:81:46:81:52 | taint(...) : String | Test.java:81:14:81:53 | join(...) | provenance | MaD:311 |
 | Test.java:83:31:83:41 | taintedList : ArrayList [<element>] : String | Test.java:83:31:83:52 | iterator(...) : Iterator [<element>] : String | provenance | MaD:6 |
-| Test.java:83:31:83:52 | iterator(...) : Iterator [<element>] : String | Test.java:83:14:83:58 | join(...) | provenance | MaD:119 |
+| Test.java:83:31:83:52 | iterator(...) : Iterator [<element>] : String | Test.java:83:14:83:58 | join(...) | provenance | MaD:312 |
 | Test.java:84:31:84:41 | taintedList : ArrayList [<element>] : String | Test.java:84:31:84:52 | iterator(...) : Iterator [<element>] : String | provenance | MaD:6 |
-| Test.java:84:31:84:52 | iterator(...) : Iterator [<element>] : String | Test.java:84:14:84:60 | join(...) | provenance | MaD:120 |
-| Test.java:85:57:85:63 | taint(...) : String | Test.java:85:14:85:64 | join(...) | provenance | MaD:121 |
-| Test.java:87:31:87:41 | taintedList : ArrayList [<element>] : String | Test.java:87:14:87:53 | join(...) | provenance | MaD:122 |
-| Test.java:88:31:88:41 | taintedList : ArrayList [<element>] : String | Test.java:88:14:88:55 | join(...) | provenance | MaD:123 |
-| Test.java:89:46:89:52 | taint(...) : String | Test.java:89:14:89:59 | join(...) | provenance | MaD:124 |
+| Test.java:84:31:84:52 | iterator(...) : Iterator [<element>] : String | Test.java:84:14:84:60 | join(...) | provenance | MaD:313 |
+| Test.java:85:57:85:63 | taint(...) : String | Test.java:85:14:85:64 | join(...) | provenance | MaD:314 |
+| Test.java:87:31:87:41 | taintedList : ArrayList [<element>] : String | Test.java:87:14:87:53 | join(...) | provenance | MaD:315 |
+| Test.java:88:31:88:41 | taintedList : ArrayList [<element>] : String | Test.java:88:14:88:55 | join(...) | provenance | MaD:316 |
+| Test.java:89:46:89:52 | taint(...) : String | Test.java:89:14:89:59 | join(...) | provenance | MaD:317 |
 | Test.java:91:33:91:56 | {...} : Object[] [[]] : String | Test.java:92:31:92:42 | taintedArray : Object[] [[]] : String | provenance |  |
 | Test.java:91:33:91:56 | {...} : Object[] [[]] : String | Test.java:93:31:93:42 | taintedArray : Object[] [[]] : String | provenance |  |
 | Test.java:91:33:91:56 | {...} : Object[] [[]] : String | Test.java:94:31:94:42 | taintedArray : Object[] [[]] : String | provenance |  |
 | Test.java:91:33:91:56 | {...} : Object[] [[]] : String | Test.java:95:31:95:42 | taintedArray : Object[] [[]] : String | provenance |  |
 | Test.java:91:48:91:54 | taint(...) : String | Test.java:91:33:91:56 | {...} : Object[] [[]] : String | provenance |  |
-| Test.java:92:31:92:42 | taintedArray : Object[] [[]] : String | Test.java:92:14:92:48 | join(...) | provenance | MaD:113 |
-| Test.java:93:31:93:42 | taintedArray : Object[] [[]] : String | Test.java:93:14:93:50 | join(...) | provenance | MaD:115 |
-| Test.java:94:31:94:42 | taintedArray : Object[] [[]] : String | Test.java:94:14:94:54 | join(...) | provenance | MaD:114 |
-| Test.java:95:31:95:42 | taintedArray : Object[] [[]] : String | Test.java:95:14:95:56 | join(...) | provenance | MaD:117 |
-| Test.java:97:47:97:53 | taint(...) : String | Test.java:97:14:97:54 | join(...) | provenance | MaD:116 |
-| Test.java:98:47:98:53 | taint(...) : String | Test.java:98:14:98:60 | join(...) | provenance | MaD:118 |
-| Test.java:100:14:100:54 | new ..[] { .. } : Object[] [[]] : String | Test.java:100:14:100:54 | join(...) | provenance | MaD:112 |
+| Test.java:92:31:92:42 | taintedArray : Object[] [[]] : String | Test.java:92:14:92:48 | join(...) | provenance | MaD:305 |
+| Test.java:93:31:93:42 | taintedArray : Object[] [[]] : String | Test.java:93:14:93:50 | join(...) | provenance | MaD:301 |
+| Test.java:94:31:94:42 | taintedArray : Object[] [[]] : String | Test.java:94:14:94:54 | join(...) | provenance | MaD:306 |
+| Test.java:95:31:95:42 | taintedArray : Object[] [[]] : String | Test.java:95:14:95:56 | join(...) | provenance | MaD:303 |
+| Test.java:97:47:97:53 | taint(...) : String | Test.java:97:14:97:54 | join(...) | provenance | MaD:302 |
+| Test.java:98:47:98:53 | taint(...) : String | Test.java:98:14:98:60 | join(...) | provenance | MaD:304 |
+| Test.java:100:14:100:54 | new ..[] { .. } : Object[] [[]] : String | Test.java:100:14:100:54 | join(...) | provenance | MaD:300 |
 | Test.java:100:31:100:37 | taint(...) : String | Test.java:100:14:100:54 | new ..[] { .. } : Object[] [[]] : String | provenance |  |
-| Test.java:101:14:101:61 | new ..[] { .. } : Object[] [[]] : String | Test.java:101:14:101:61 | join(...) | provenance | MaD:112 |
+| Test.java:101:14:101:61 | new ..[] { .. } : Object[] [[]] : String | Test.java:101:14:101:61 | join(...) | provenance | MaD:300 |
 | Test.java:101:54:101:60 | taint(...) : String | Test.java:101:14:101:61 | new ..[] { .. } : Object[] [[]] : String | provenance |  |
-| Test.java:102:14:102:71 | new ..[] { .. } : Object[] [[]] : String | Test.java:102:14:102:71 | joinWith(...) | provenance | MaD:126 |
+| Test.java:102:14:102:71 | new ..[] { .. } : Object[] [[]] : String | Test.java:102:14:102:71 | joinWith(...) | provenance | MaD:319 |
 | Test.java:102:48:102:54 | taint(...) : String | Test.java:102:14:102:71 | new ..[] { .. } : Object[] [[]] : String | provenance |  |
-| Test.java:103:14:103:78 | new ..[] { .. } : Object[] [[]] : String | Test.java:103:14:103:78 | joinWith(...) | provenance | MaD:126 |
+| Test.java:103:14:103:78 | new ..[] { .. } : Object[] [[]] : String | Test.java:103:14:103:78 | joinWith(...) | provenance | MaD:319 |
 | Test.java:103:71:103:77 | taint(...) : String | Test.java:103:14:103:78 | new ..[] { .. } : Object[] [[]] : String | provenance |  |
-| Test.java:104:35:104:41 | taint(...) : String | Test.java:104:14:104:87 | joinWith(...) | provenance | MaD:125 |
-| Test.java:106:31:106:37 | taint(...) : String | Test.java:106:14:106:41 | left(...) | provenance | MaD:127 |
-| Test.java:107:34:107:40 | taint(...) : String | Test.java:107:14:107:44 | leftPad(...) | provenance | MaD:128 |
-| Test.java:108:34:108:40 | taint(...) : String | Test.java:108:14:108:49 | leftPad(...) | provenance | MaD:128 |
-| Test.java:109:34:109:40 | taint(...) : String | Test.java:109:14:109:55 | leftPad(...) | provenance | MaD:128 |
-| Test.java:110:47:110:53 | taint(...) : String | Test.java:110:14:110:54 | leftPad(...) | provenance | MaD:129 |
-| Test.java:111:36:111:42 | taint(...) : String | Test.java:111:14:111:43 | lowerCase(...) | provenance | MaD:130 |
-| Test.java:112:36:112:42 | taint(...) : String | Test.java:112:14:112:54 | lowerCase(...) | provenance | MaD:131 |
-| Test.java:113:30:113:36 | taint(...) : String | Test.java:113:14:113:43 | mid(...) | provenance | MaD:132 |
-| Test.java:114:41:114:47 | taint(...) : String | Test.java:114:14:114:48 | normalizeSpace(...) | provenance | MaD:133 |
-| Test.java:115:34:115:40 | taint(...) : String | Test.java:115:14:115:58 | overlay(...) | provenance | MaD:134 |
-| Test.java:116:46:116:52 | taint(...) : String | Test.java:116:14:116:59 | overlay(...) | provenance | MaD:135 |
-| Test.java:117:43:117:49 | taint(...) : String | Test.java:117:14:117:103 | prependIfMissing(...) | provenance | MaD:136 |
-| Test.java:118:62:118:68 | taint(...) : String | Test.java:118:14:118:105 | prependIfMissing(...) | provenance | MaD:137 |
-| Test.java:122:53:122:59 | taint(...) : String | Test.java:122:14:122:113 | prependIfMissingIgnoreCase(...) | provenance | MaD:138 |
-| Test.java:123:72:123:78 | taint(...) : String | Test.java:123:14:123:115 | prependIfMissingIgnoreCase(...) | provenance | MaD:139 |
-| Test.java:127:33:127:39 | taint(...) : String | Test.java:127:14:127:45 | remove(...) | provenance | MaD:140 |
-| Test.java:128:33:128:39 | taint(...) : String | Test.java:128:14:128:53 | remove(...) | provenance | MaD:140 |
-| Test.java:129:36:129:42 | taint(...) : String | Test.java:129:14:129:56 | removeAll(...) | provenance | MaD:141 |
-| Test.java:130:36:130:42 | taint(...) : String | Test.java:130:14:130:56 | removeEnd(...) | provenance | MaD:142 |
-| Test.java:131:46:131:52 | taint(...) : String | Test.java:131:14:131:66 | removeEndIgnoreCase(...) | provenance | MaD:143 |
-| Test.java:132:38:132:44 | taint(...) : String | Test.java:132:14:132:58 | removeFirst(...) | provenance | MaD:144 |
-| Test.java:133:43:133:49 | taint(...) : String | Test.java:133:14:133:63 | removeIgnoreCase(...) | provenance | MaD:145 |
-| Test.java:134:40:134:46 | taint(...) : String | Test.java:134:14:134:60 | removePattern(...) | provenance | MaD:146 |
-| Test.java:135:38:135:44 | taint(...) : String | Test.java:135:14:135:58 | removeStart(...) | provenance | MaD:147 |
-| Test.java:136:48:136:54 | taint(...) : String | Test.java:136:14:136:68 | removeStartIgnoreCase(...) | provenance | MaD:148 |
-| Test.java:147:33:147:39 | taint(...) : String | Test.java:147:14:147:43 | repeat(...) | provenance | MaD:149 |
-| Test.java:148:33:148:39 | taint(...) : String | Test.java:148:14:148:56 | repeat(...) | provenance | MaD:149 |
-| Test.java:149:46:149:52 | taint(...) : String | Test.java:149:14:149:56 | repeat(...) | provenance | MaD:150 |
-| Test.java:150:34:150:40 | taint(...) : String | Test.java:150:14:150:66 | replace(...) | provenance | MaD:151 |
-| Test.java:151:56:151:62 | taint(...) : String | Test.java:151:14:151:63 | replace(...) | provenance | MaD:152 |
-| Test.java:152:34:152:40 | taint(...) : String | Test.java:152:14:152:69 | replace(...) | provenance | MaD:151 |
-| Test.java:153:56:153:62 | taint(...) : String | Test.java:153:14:153:66 | replace(...) | provenance | MaD:152 |
-| Test.java:154:37:154:43 | taint(...) : String | Test.java:154:14:154:69 | replaceAll(...) | provenance | MaD:153 |
-| Test.java:155:59:155:65 | taint(...) : String | Test.java:155:14:155:66 | replaceAll(...) | provenance | MaD:154 |
-| Test.java:156:39:156:45 | taint(...) : String | Test.java:156:14:156:56 | replaceChars(...) | provenance | MaD:155 |
-| Test.java:157:39:157:45 | taint(...) : String | Test.java:157:14:157:60 | replaceChars(...) | provenance | MaD:155 |
-| Test.java:158:58:158:64 | taint(...) : String | Test.java:158:14:158:65 | replaceChars(...) | provenance | MaD:156 |
-| Test.java:159:38:159:44 | taint(...) : String | Test.java:159:14:159:104 | replaceEach(...) | provenance | MaD:157 |
-| Test.java:160:77:160:100 | new String[] : String[] [[]] : String | Test.java:160:14:160:101 | replaceEach(...) | provenance | MaD:158 |
+| Test.java:104:35:104:41 | taint(...) : String | Test.java:104:14:104:87 | joinWith(...) | provenance | MaD:318 |
+| Test.java:106:31:106:37 | taint(...) : String | Test.java:106:14:106:41 | left(...) | provenance | MaD:320 |
+| Test.java:107:34:107:40 | taint(...) : String | Test.java:107:14:107:44 | leftPad(...) | provenance | MaD:322 |
+| Test.java:108:34:108:40 | taint(...) : String | Test.java:108:14:108:49 | leftPad(...) | provenance | MaD:322 |
+| Test.java:109:34:109:40 | taint(...) : String | Test.java:109:14:109:55 | leftPad(...) | provenance | MaD:322 |
+| Test.java:110:47:110:53 | taint(...) : String | Test.java:110:14:110:54 | leftPad(...) | provenance | MaD:321 |
+| Test.java:111:36:111:42 | taint(...) : String | Test.java:111:14:111:43 | lowerCase(...) | provenance | MaD:323 |
+| Test.java:112:36:112:42 | taint(...) : String | Test.java:112:14:112:54 | lowerCase(...) | provenance | MaD:324 |
+| Test.java:113:30:113:36 | taint(...) : String | Test.java:113:14:113:43 | mid(...) | provenance | MaD:325 |
+| Test.java:114:41:114:47 | taint(...) : String | Test.java:114:14:114:48 | normalizeSpace(...) | provenance | MaD:326 |
+| Test.java:115:34:115:40 | taint(...) : String | Test.java:115:14:115:58 | overlay(...) | provenance | MaD:327 |
+| Test.java:116:46:116:52 | taint(...) : String | Test.java:116:14:116:59 | overlay(...) | provenance | MaD:328 |
+| Test.java:117:43:117:49 | taint(...) : String | Test.java:117:14:117:103 | prependIfMissing(...) | provenance | MaD:329 |
+| Test.java:118:62:118:68 | taint(...) : String | Test.java:118:14:118:105 | prependIfMissing(...) | provenance | MaD:330 |
+| Test.java:122:53:122:59 | taint(...) : String | Test.java:122:14:122:113 | prependIfMissingIgnoreCase(...) | provenance | MaD:331 |
+| Test.java:123:72:123:78 | taint(...) : String | Test.java:123:14:123:115 | prependIfMissingIgnoreCase(...) | provenance | MaD:332 |
+| Test.java:127:33:127:39 | taint(...) : String | Test.java:127:14:127:45 | remove(...) | provenance | MaD:333 |
+| Test.java:128:33:128:39 | taint(...) : String | Test.java:128:14:128:53 | remove(...) | provenance | MaD:333 |
+| Test.java:129:36:129:42 | taint(...) : String | Test.java:129:14:129:56 | removeAll(...) | provenance | MaD:334 |
+| Test.java:130:36:130:42 | taint(...) : String | Test.java:130:14:130:56 | removeEnd(...) | provenance | MaD:335 |
+| Test.java:131:46:131:52 | taint(...) : String | Test.java:131:14:131:66 | removeEndIgnoreCase(...) | provenance | MaD:336 |
+| Test.java:132:38:132:44 | taint(...) : String | Test.java:132:14:132:58 | removeFirst(...) | provenance | MaD:337 |
+| Test.java:133:43:133:49 | taint(...) : String | Test.java:133:14:133:63 | removeIgnoreCase(...) | provenance | MaD:338 |
+| Test.java:134:40:134:46 | taint(...) : String | Test.java:134:14:134:60 | removePattern(...) | provenance | MaD:339 |
+| Test.java:135:38:135:44 | taint(...) : String | Test.java:135:14:135:58 | removeStart(...) | provenance | MaD:340 |
+| Test.java:136:48:136:54 | taint(...) : String | Test.java:136:14:136:68 | removeStartIgnoreCase(...) | provenance | MaD:341 |
+| Test.java:147:33:147:39 | taint(...) : String | Test.java:147:14:147:43 | repeat(...) | provenance | MaD:343 |
+| Test.java:148:33:148:39 | taint(...) : String | Test.java:148:14:148:56 | repeat(...) | provenance | MaD:343 |
+| Test.java:149:46:149:52 | taint(...) : String | Test.java:149:14:149:56 | repeat(...) | provenance | MaD:342 |
+| Test.java:150:34:150:40 | taint(...) : String | Test.java:150:14:150:66 | replace(...) | provenance | MaD:344 |
+| Test.java:151:56:151:62 | taint(...) : String | Test.java:151:14:151:63 | replace(...) | provenance | MaD:345 |
+| Test.java:152:34:152:40 | taint(...) : String | Test.java:152:14:152:69 | replace(...) | provenance | MaD:344 |
+| Test.java:153:56:153:62 | taint(...) : String | Test.java:153:14:153:66 | replace(...) | provenance | MaD:345 |
+| Test.java:154:37:154:43 | taint(...) : String | Test.java:154:14:154:69 | replaceAll(...) | provenance | MaD:346 |
+| Test.java:155:59:155:65 | taint(...) : String | Test.java:155:14:155:66 | replaceAll(...) | provenance | MaD:347 |
+| Test.java:156:39:156:45 | taint(...) : String | Test.java:156:14:156:56 | replaceChars(...) | provenance | MaD:349 |
+| Test.java:157:39:157:45 | taint(...) : String | Test.java:157:14:157:60 | replaceChars(...) | provenance | MaD:349 |
+| Test.java:158:58:158:64 | taint(...) : String | Test.java:158:14:158:65 | replaceChars(...) | provenance | MaD:348 |
+| Test.java:159:38:159:44 | taint(...) : String | Test.java:159:14:159:104 | replaceEach(...) | provenance | MaD:350 |
+| Test.java:160:77:160:100 | new String[] : String[] [[]] : String | Test.java:160:14:160:101 | replaceEach(...) | provenance | MaD:351 |
 | Test.java:160:77:160:100 | {...} : String[] [[]] : String | Test.java:160:77:160:100 | new String[] : String[] [[]] : String | provenance |  |
 | Test.java:160:92:160:98 | taint(...) : String | Test.java:160:77:160:100 | {...} : String[] [[]] : String | provenance |  |
-| Test.java:161:48:161:54 | taint(...) : String | Test.java:161:14:161:114 | replaceEachRepeatedly(...) | provenance | MaD:159 |
-| Test.java:162:87:162:110 | new String[] : String[] [[]] : String | Test.java:162:14:162:111 | replaceEachRepeatedly(...) | provenance | MaD:160 |
+| Test.java:161:48:161:54 | taint(...) : String | Test.java:161:14:161:114 | replaceEachRepeatedly(...) | provenance | MaD:352 |
+| Test.java:162:87:162:110 | new String[] : String[] [[]] : String | Test.java:162:14:162:111 | replaceEachRepeatedly(...) | provenance | MaD:353 |
 | Test.java:162:87:162:110 | {...} : String[] [[]] : String | Test.java:162:87:162:110 | new String[] : String[] [[]] : String | provenance |  |
 | Test.java:162:102:162:108 | taint(...) : String | Test.java:162:87:162:110 | {...} : String[] [[]] : String | provenance |  |
-| Test.java:163:39:163:45 | taint(...) : String | Test.java:163:14:163:71 | replaceFirst(...) | provenance | MaD:161 |
-| Test.java:164:61:164:67 | taint(...) : String | Test.java:164:14:164:68 | replaceFirst(...) | provenance | MaD:162 |
-| Test.java:165:44:165:50 | taint(...) : String | Test.java:165:14:165:76 | replaceIgnoreCase(...) | provenance | MaD:163 |
-| Test.java:166:66:166:72 | taint(...) : String | Test.java:166:14:166:73 | replaceIgnoreCase(...) | provenance | MaD:164 |
-| Test.java:167:38:167:44 | taint(...) : String | Test.java:167:14:167:70 | replaceOnce(...) | provenance | MaD:165 |
-| Test.java:168:60:168:66 | taint(...) : String | Test.java:168:14:168:67 | replaceOnce(...) | provenance | MaD:166 |
-| Test.java:169:48:169:54 | taint(...) : String | Test.java:169:14:169:80 | replaceOnceIgnoreCase(...) | provenance | MaD:167 |
-| Test.java:170:70:170:76 | taint(...) : String | Test.java:170:14:170:77 | replaceOnceIgnoreCase(...) | provenance | MaD:168 |
-| Test.java:171:41:171:47 | taint(...) : String | Test.java:171:14:171:73 | replacePattern(...) | provenance | MaD:169 |
-| Test.java:172:63:172:69 | taint(...) : String | Test.java:172:14:172:70 | replacePattern(...) | provenance | MaD:170 |
-| Test.java:185:34:185:40 | taint(...) : String | Test.java:185:14:185:41 | reverse(...) | provenance | MaD:171 |
-| Test.java:186:43:186:49 | taint(...) : String | Test.java:186:14:186:55 | reverseDelimited(...) | provenance | MaD:172 |
-| Test.java:187:32:187:38 | taint(...) : String | Test.java:187:14:187:42 | right(...) | provenance | MaD:173 |
-| Test.java:188:35:188:41 | taint(...) : String | Test.java:188:14:188:45 | rightPad(...) | provenance | MaD:174 |
-| Test.java:189:35:189:41 | taint(...) : String | Test.java:189:14:189:50 | rightPad(...) | provenance | MaD:174 |
-| Test.java:190:35:190:41 | taint(...) : String | Test.java:190:14:190:56 | rightPad(...) | provenance | MaD:174 |
-| Test.java:191:48:191:54 | taint(...) : String | Test.java:191:14:191:55 | rightPad(...) | provenance | MaD:175 |
-| Test.java:192:33:192:39 | taint(...) : String | Test.java:192:14:192:43 | rotate(...) | provenance | MaD:176 |
-| Test.java:193:32:193:38 | taint(...) : String | Test.java:193:14:193:39 | split(...) | provenance | MaD:177 |
-| Test.java:194:32:194:38 | taint(...) : String | Test.java:194:14:194:44 | split(...) | provenance | MaD:178 |
-| Test.java:195:32:195:38 | taint(...) : String | Test.java:195:14:195:46 | split(...) | provenance | MaD:179 |
-| Test.java:196:32:196:38 | taint(...) : String | Test.java:196:14:196:49 | split(...) | provenance | MaD:180 |
-| Test.java:197:47:197:53 | taint(...) : String | Test.java:197:14:197:54 | splitByCharacterType(...) | provenance | MaD:181 |
-| Test.java:198:56:198:62 | taint(...) : String | Test.java:198:14:198:63 | splitByCharacterTypeCamelCase(...) | provenance | MaD:182 |
-| Test.java:199:48:199:54 | taint(...) : String | Test.java:199:14:199:68 | splitByWholeSeparator(...) | provenance | MaD:183 |
-| Test.java:200:48:200:54 | taint(...) : String | Test.java:200:14:200:71 | splitByWholeSeparator(...) | provenance | MaD:183 |
-| Test.java:201:65:201:71 | taint(...) : String | Test.java:201:14:201:85 | splitByWholeSeparatorPreserveAllTokens(...) | provenance | MaD:184 |
-| Test.java:202:65:202:71 | taint(...) : String | Test.java:202:14:202:88 | splitByWholeSeparatorPreserveAllTokens(...) | provenance | MaD:184 |
-| Test.java:203:49:203:55 | taint(...) : String | Test.java:203:14:203:56 | splitPreserveAllTokens(...) | provenance | MaD:185 |
-| Test.java:204:49:204:55 | taint(...) : String | Test.java:204:14:204:61 | splitPreserveAllTokens(...) | provenance | MaD:186 |
-| Test.java:205:49:205:55 | taint(...) : String | Test.java:205:14:205:63 | splitPreserveAllTokens(...) | provenance | MaD:187 |
-| Test.java:206:49:206:55 | taint(...) : String | Test.java:206:14:206:66 | splitPreserveAllTokens(...) | provenance | MaD:188 |
-| Test.java:216:32:216:38 | taint(...) : String | Test.java:216:14:216:39 | strip(...) | provenance | MaD:189 |
-| Test.java:217:32:217:38 | taint(...) : String | Test.java:217:14:217:56 | strip(...) | provenance | MaD:190 |
-| Test.java:218:39:218:45 | taint(...) : String | Test.java:218:14:218:46 | stripAccents(...) | provenance | MaD:191 |
+| Test.java:163:39:163:45 | taint(...) : String | Test.java:163:14:163:71 | replaceFirst(...) | provenance | MaD:354 |
+| Test.java:164:61:164:67 | taint(...) : String | Test.java:164:14:164:68 | replaceFirst(...) | provenance | MaD:355 |
+| Test.java:165:44:165:50 | taint(...) : String | Test.java:165:14:165:76 | replaceIgnoreCase(...) | provenance | MaD:356 |
+| Test.java:166:66:166:72 | taint(...) : String | Test.java:166:14:166:73 | replaceIgnoreCase(...) | provenance | MaD:357 |
+| Test.java:167:38:167:44 | taint(...) : String | Test.java:167:14:167:70 | replaceOnce(...) | provenance | MaD:358 |
+| Test.java:168:60:168:66 | taint(...) : String | Test.java:168:14:168:67 | replaceOnce(...) | provenance | MaD:359 |
+| Test.java:169:48:169:54 | taint(...) : String | Test.java:169:14:169:80 | replaceOnceIgnoreCase(...) | provenance | MaD:360 |
+| Test.java:170:70:170:76 | taint(...) : String | Test.java:170:14:170:77 | replaceOnceIgnoreCase(...) | provenance | MaD:361 |
+| Test.java:171:41:171:47 | taint(...) : String | Test.java:171:14:171:73 | replacePattern(...) | provenance | MaD:362 |
+| Test.java:172:63:172:69 | taint(...) : String | Test.java:172:14:172:70 | replacePattern(...) | provenance | MaD:363 |
+| Test.java:185:34:185:40 | taint(...) : String | Test.java:185:14:185:41 | reverse(...) | provenance | MaD:364 |
+| Test.java:186:43:186:49 | taint(...) : String | Test.java:186:14:186:55 | reverseDelimited(...) | provenance | MaD:365 |
+| Test.java:187:32:187:38 | taint(...) : String | Test.java:187:14:187:42 | right(...) | provenance | MaD:366 |
+| Test.java:188:35:188:41 | taint(...) : String | Test.java:188:14:188:45 | rightPad(...) | provenance | MaD:368 |
+| Test.java:189:35:189:41 | taint(...) : String | Test.java:189:14:189:50 | rightPad(...) | provenance | MaD:368 |
+| Test.java:190:35:190:41 | taint(...) : String | Test.java:190:14:190:56 | rightPad(...) | provenance | MaD:368 |
+| Test.java:191:48:191:54 | taint(...) : String | Test.java:191:14:191:55 | rightPad(...) | provenance | MaD:367 |
+| Test.java:192:33:192:39 | taint(...) : String | Test.java:192:14:192:43 | rotate(...) | provenance | MaD:369 |
+| Test.java:193:32:193:38 | taint(...) : String | Test.java:193:14:193:39 | split(...) | provenance | MaD:370 |
+| Test.java:194:32:194:38 | taint(...) : String | Test.java:194:14:194:44 | split(...) | provenance | MaD:371 |
+| Test.java:195:32:195:38 | taint(...) : String | Test.java:195:14:195:46 | split(...) | provenance | MaD:372 |
+| Test.java:196:32:196:38 | taint(...) : String | Test.java:196:14:196:49 | split(...) | provenance | MaD:373 |
+| Test.java:197:47:197:53 | taint(...) : String | Test.java:197:14:197:54 | splitByCharacterType(...) | provenance | MaD:374 |
+| Test.java:198:56:198:62 | taint(...) : String | Test.java:198:14:198:63 | splitByCharacterTypeCamelCase(...) | provenance | MaD:375 |
+| Test.java:199:48:199:54 | taint(...) : String | Test.java:199:14:199:68 | splitByWholeSeparator(...) | provenance | MaD:376 |
+| Test.java:200:48:200:54 | taint(...) : String | Test.java:200:14:200:71 | splitByWholeSeparator(...) | provenance | MaD:376 |
+| Test.java:201:65:201:71 | taint(...) : String | Test.java:201:14:201:85 | splitByWholeSeparatorPreserveAllTokens(...) | provenance | MaD:377 |
+| Test.java:202:65:202:71 | taint(...) : String | Test.java:202:14:202:88 | splitByWholeSeparatorPreserveAllTokens(...) | provenance | MaD:377 |
+| Test.java:203:49:203:55 | taint(...) : String | Test.java:203:14:203:56 | splitPreserveAllTokens(...) | provenance | MaD:378 |
+| Test.java:204:49:204:55 | taint(...) : String | Test.java:204:14:204:61 | splitPreserveAllTokens(...) | provenance | MaD:379 |
+| Test.java:205:49:205:55 | taint(...) : String | Test.java:205:14:205:63 | splitPreserveAllTokens(...) | provenance | MaD:380 |
+| Test.java:206:49:206:55 | taint(...) : String | Test.java:206:14:206:66 | splitPreserveAllTokens(...) | provenance | MaD:381 |
+| Test.java:216:32:216:38 | taint(...) : String | Test.java:216:14:216:39 | strip(...) | provenance | MaD:382 |
+| Test.java:217:32:217:38 | taint(...) : String | Test.java:217:14:217:56 | strip(...) | provenance | MaD:383 |
+| Test.java:218:39:218:45 | taint(...) : String | Test.java:218:14:218:46 | stripAccents(...) | provenance | MaD:384 |
 | Test.java:219:14:219:76 | stripAll(...) : String[] [[]] : Object | Test.java:219:14:219:79 | ...[...] | provenance |  |
-| Test.java:219:35:219:58 | new String[] : String[] [[]] : String | Test.java:219:14:219:76 | stripAll(...) : String[] [[]] : Object | provenance | MaD:192 |
+| Test.java:219:35:219:58 | new String[] : String[] [[]] : String | Test.java:219:14:219:76 | stripAll(...) : String[] [[]] : Object | provenance | MaD:385 |
 | Test.java:219:35:219:58 | {...} : String[] [[]] : String | Test.java:219:35:219:58 | new String[] : String[] [[]] : String | provenance |  |
 | Test.java:219:50:219:56 | taint(...) : String | Test.java:219:35:219:58 | {...} : String[] [[]] : String | provenance |  |
-| Test.java:220:35:220:41 | taint(...) : String | Test.java:220:14:220:59 | stripEnd(...) | provenance | MaD:193 |
-| Test.java:221:37:221:43 | taint(...) : String | Test.java:221:14:221:61 | stripStart(...) | provenance | MaD:194 |
-| Test.java:227:39:227:45 | taint(...) : String | Test.java:227:14:227:46 | stripToEmpty(...) | provenance | MaD:195 |
-| Test.java:228:38:228:44 | taint(...) : String | Test.java:228:14:228:45 | stripToNull(...) | provenance | MaD:196 |
-| Test.java:229:36:229:42 | taint(...) : String | Test.java:229:14:229:46 | substring(...) | provenance | MaD:197 |
-| Test.java:230:36:230:42 | taint(...) : String | Test.java:230:14:230:49 | substring(...) | provenance | MaD:197 |
-| Test.java:231:41:231:47 | taint(...) : String | Test.java:231:14:231:51 | substringAfter(...) | provenance | MaD:198 |
-| Test.java:232:41:232:47 | taint(...) : String | Test.java:232:14:232:61 | substringAfter(...) | provenance | MaD:198 |
-| Test.java:233:45:233:51 | taint(...) : String | Test.java:233:14:233:55 | substringAfterLast(...) | provenance | MaD:199 |
-| Test.java:234:45:234:51 | taint(...) : String | Test.java:234:14:234:65 | substringAfterLast(...) | provenance | MaD:199 |
-| Test.java:235:42:235:48 | taint(...) : String | Test.java:235:14:235:62 | substringBefore(...) | provenance | MaD:200 |
-| Test.java:236:46:236:52 | taint(...) : String | Test.java:236:14:236:66 | substringBeforeLast(...) | provenance | MaD:201 |
-| Test.java:237:43:237:49 | taint(...) : String | Test.java:237:14:237:63 | substringBetween(...) | provenance | MaD:202 |
-| Test.java:238:43:238:49 | taint(...) : String | Test.java:238:14:238:74 | substringBetween(...) | provenance | MaD:202 |
+| Test.java:220:35:220:41 | taint(...) : String | Test.java:220:14:220:59 | stripEnd(...) | provenance | MaD:386 |
+| Test.java:221:37:221:43 | taint(...) : String | Test.java:221:14:221:61 | stripStart(...) | provenance | MaD:387 |
+| Test.java:227:39:227:45 | taint(...) : String | Test.java:227:14:227:46 | stripToEmpty(...) | provenance | MaD:388 |
+| Test.java:228:38:228:44 | taint(...) : String | Test.java:228:14:228:45 | stripToNull(...) | provenance | MaD:389 |
+| Test.java:229:36:229:42 | taint(...) : String | Test.java:229:14:229:46 | substring(...) | provenance | MaD:390 |
+| Test.java:230:36:230:42 | taint(...) : String | Test.java:230:14:230:49 | substring(...) | provenance | MaD:390 |
+| Test.java:231:41:231:47 | taint(...) : String | Test.java:231:14:231:51 | substringAfter(...) | provenance | MaD:391 |
+| Test.java:232:41:232:47 | taint(...) : String | Test.java:232:14:232:61 | substringAfter(...) | provenance | MaD:391 |
+| Test.java:233:45:233:51 | taint(...) : String | Test.java:233:14:233:55 | substringAfterLast(...) | provenance | MaD:392 |
+| Test.java:234:45:234:51 | taint(...) : String | Test.java:234:14:234:65 | substringAfterLast(...) | provenance | MaD:392 |
+| Test.java:235:42:235:48 | taint(...) : String | Test.java:235:14:235:62 | substringBefore(...) | provenance | MaD:393 |
+| Test.java:236:46:236:52 | taint(...) : String | Test.java:236:14:236:66 | substringBeforeLast(...) | provenance | MaD:394 |
+| Test.java:237:43:237:49 | taint(...) : String | Test.java:237:14:237:63 | substringBetween(...) | provenance | MaD:395 |
+| Test.java:238:43:238:49 | taint(...) : String | Test.java:238:14:238:74 | substringBetween(...) | provenance | MaD:395 |
 | Test.java:239:14:239:75 | substringsBetween(...) : String[] | Test.java:239:14:239:78 | ...[...] | provenance |  |
-| Test.java:239:44:239:50 | taint(...) : String | Test.java:239:14:239:75 | substringsBetween(...) : String[] | provenance | MaD:203 |
-| Test.java:250:35:250:41 | taint(...) : String | Test.java:250:14:250:42 | swapCase(...) | provenance | MaD:204 |
-| Test.java:251:39:251:45 | taint(...) : String | Test.java:251:14:251:46 | toCodePoints(...) | provenance | MaD:205 |
-| Test.java:252:42:252:81 | getBytes(...) : byte[] | Test.java:252:14:252:88 | toEncodedString(...) | provenance | MaD:206 |
-| Test.java:252:63:252:69 | taint(...) : String | Test.java:252:42:252:81 | getBytes(...) : byte[] | provenance | MaD:102 |
-| Test.java:253:42:253:48 | taint(...) : String | Test.java:253:14:253:49 | toRootLowerCase(...) | provenance | MaD:207 |
-| Test.java:254:42:254:48 | taint(...) : String | Test.java:254:14:254:49 | toRootUpperCase(...) | provenance | MaD:208 |
-| Test.java:255:35:255:74 | getBytes(...) : byte[] | Test.java:255:14:255:86 | toString(...) | provenance | MaD:209 |
-| Test.java:255:56:255:62 | taint(...) : String | Test.java:255:35:255:74 | getBytes(...) : byte[] | provenance | MaD:102 |
-| Test.java:256:31:256:37 | taint(...) : String | Test.java:256:14:256:38 | trim(...) | provenance | MaD:210 |
-| Test.java:257:38:257:44 | taint(...) : String | Test.java:257:14:257:45 | trimToEmpty(...) | provenance | MaD:211 |
-| Test.java:258:37:258:43 | taint(...) : String | Test.java:258:14:258:44 | trimToNull(...) | provenance | MaD:212 |
-| Test.java:259:35:259:41 | taint(...) : String | Test.java:259:14:259:45 | truncate(...) | provenance | MaD:213 |
-| Test.java:260:35:260:41 | taint(...) : String | Test.java:260:14:260:48 | truncate(...) | provenance | MaD:213 |
-| Test.java:261:39:261:45 | taint(...) : String | Test.java:261:14:261:46 | uncapitalize(...) | provenance | MaD:214 |
-| Test.java:262:33:262:39 | taint(...) : String | Test.java:262:14:262:45 | unwrap(...) | provenance | MaD:215 |
-| Test.java:263:33:263:39 | taint(...) : String | Test.java:263:14:263:53 | unwrap(...) | provenance | MaD:215 |
-| Test.java:266:36:266:42 | taint(...) : String | Test.java:266:14:266:43 | upperCase(...) | provenance | MaD:216 |
-| Test.java:267:36:267:42 | taint(...) : String | Test.java:267:14:267:49 | upperCase(...) | provenance | MaD:217 |
+| Test.java:239:44:239:50 | taint(...) : String | Test.java:239:14:239:75 | substringsBetween(...) : String[] | provenance | MaD:396 |
+| Test.java:250:35:250:41 | taint(...) : String | Test.java:250:14:250:42 | swapCase(...) | provenance | MaD:397 |
+| Test.java:251:39:251:45 | taint(...) : String | Test.java:251:14:251:46 | toCodePoints(...) | provenance | MaD:398 |
+| Test.java:252:42:252:81 | getBytes(...) : byte[] | Test.java:252:14:252:88 | toEncodedString(...) | provenance | MaD:399 |
+| Test.java:252:63:252:69 | taint(...) : String | Test.java:252:42:252:81 | getBytes(...) : byte[] | provenance | MaD:295 |
+| Test.java:253:42:253:48 | taint(...) : String | Test.java:253:14:253:49 | toRootLowerCase(...) | provenance | MaD:400 |
+| Test.java:254:42:254:48 | taint(...) : String | Test.java:254:14:254:49 | toRootUpperCase(...) | provenance | MaD:401 |
+| Test.java:255:35:255:74 | getBytes(...) : byte[] | Test.java:255:14:255:86 | toString(...) | provenance | MaD:402 |
+| Test.java:255:56:255:62 | taint(...) : String | Test.java:255:35:255:74 | getBytes(...) : byte[] | provenance | MaD:295 |
+| Test.java:256:31:256:37 | taint(...) : String | Test.java:256:14:256:38 | trim(...) | provenance | MaD:403 |
+| Test.java:257:38:257:44 | taint(...) : String | Test.java:257:14:257:45 | trimToEmpty(...) | provenance | MaD:404 |
+| Test.java:258:37:258:43 | taint(...) : String | Test.java:258:14:258:44 | trimToNull(...) | provenance | MaD:405 |
+| Test.java:259:35:259:41 | taint(...) : String | Test.java:259:14:259:45 | truncate(...) | provenance | MaD:406 |
+| Test.java:260:35:260:41 | taint(...) : String | Test.java:260:14:260:48 | truncate(...) | provenance | MaD:406 |
+| Test.java:261:39:261:45 | taint(...) : String | Test.java:261:14:261:46 | uncapitalize(...) | provenance | MaD:407 |
+| Test.java:262:33:262:39 | taint(...) : String | Test.java:262:14:262:45 | unwrap(...) | provenance | MaD:408 |
+| Test.java:263:33:263:39 | taint(...) : String | Test.java:263:14:263:53 | unwrap(...) | provenance | MaD:408 |
+| Test.java:266:36:266:42 | taint(...) : String | Test.java:266:14:266:43 | upperCase(...) | provenance | MaD:409 |
+| Test.java:267:36:267:42 | taint(...) : String | Test.java:267:14:267:49 | upperCase(...) | provenance | MaD:410 |
 | Test.java:268:34:268:40 | taint(...) : String | Test.java:268:34:268:54 | toCharArray(...) : char[] | provenance | MaD:7 |
-| Test.java:268:34:268:54 | toCharArray(...) : char[] | Test.java:268:14:268:55 | valueOf(...) | provenance | MaD:218 |
-| Test.java:269:31:269:37 | taint(...) : String | Test.java:269:14:269:43 | wrap(...) | provenance | MaD:219 |
-| Test.java:270:31:270:37 | taint(...) : String | Test.java:270:14:270:55 | wrap(...) | provenance | MaD:220 |
-| Test.java:271:42:271:48 | taint(...) : String | Test.java:271:14:271:49 | wrap(...) | provenance | MaD:220 |
-| Test.java:272:40:272:46 | taint(...) : String | Test.java:272:14:272:52 | wrapIfMissing(...) | provenance | MaD:221 |
-| Test.java:273:40:273:46 | taint(...) : String | Test.java:273:14:273:64 | wrapIfMissing(...) | provenance | MaD:222 |
-| Test.java:274:51:274:57 | taint(...) : String | Test.java:274:14:274:58 | wrapIfMissing(...) | provenance | MaD:222 |
+| Test.java:268:34:268:54 | toCharArray(...) : char[] | Test.java:268:14:268:55 | valueOf(...) | provenance | MaD:411 |
+| Test.java:269:31:269:37 | taint(...) : String | Test.java:269:14:269:43 | wrap(...) | provenance | MaD:412 |
+| Test.java:270:31:270:37 | taint(...) : String | Test.java:270:14:270:55 | wrap(...) | provenance | MaD:413 |
+| Test.java:271:42:271:48 | taint(...) : String | Test.java:271:14:271:49 | wrap(...) | provenance | MaD:413 |
+| Test.java:272:40:272:46 | taint(...) : String | Test.java:272:14:272:52 | wrapIfMissing(...) | provenance | MaD:414 |
+| Test.java:273:40:273:46 | taint(...) : String | Test.java:273:14:273:64 | wrapIfMissing(...) | provenance | MaD:415 |
+| Test.java:274:51:274:57 | taint(...) : String | Test.java:274:14:274:58 | wrapIfMissing(...) | provenance | MaD:415 |
 | TextStringBuilderTest.java:17:35:17:64 | new TextStringBuilder(...) : TextStringBuilder | TextStringBuilderTest.java:17:72:17:76 | cons1 : TextStringBuilder | provenance |  |
 | TextStringBuilderTest.java:17:57:17:63 | taint(...) : String | TextStringBuilderTest.java:17:35:17:64 | new TextStringBuilder(...) : TextStringBuilder | provenance | MaD:561 |
 | TextStringBuilderTest.java:17:72:17:76 | cons1 : TextStringBuilder | TextStringBuilderTest.java:17:72:17:87 | toString(...) | provenance | MaD:5 |
@@ -2793,83 +2767,83 @@ edges
 | TextStringBuilderTest.java:18:86:18:90 | cons2 : TextStringBuilder | TextStringBuilderTest.java:18:86:18:101 | toString(...) | provenance | MaD:646 |
 | TextStringBuilderTest.java:20:58:20:60 | sb1 [post update] : TextStringBuilder | TextStringBuilderTest.java:20:98:20:100 | sb1 : TextStringBuilder | provenance |  |
 | TextStringBuilderTest.java:20:69:20:75 | taint(...) : String | TextStringBuilderTest.java:20:69:20:89 | toCharArray(...) : char[] | provenance | MaD:7 |
-| TextStringBuilderTest.java:20:69:20:89 | toCharArray(...) : char[] | TextStringBuilderTest.java:20:58:20:60 | sb1 [post update] : TextStringBuilder | provenance | MaD:563 |
+| TextStringBuilderTest.java:20:69:20:89 | toCharArray(...) : char[] | TextStringBuilderTest.java:20:58:20:60 | sb1 [post update] : TextStringBuilder | provenance | MaD:562 |
 | TextStringBuilderTest.java:20:98:20:100 | sb1 : TextStringBuilder | TextStringBuilderTest.java:20:98:20:111 | toString(...) | provenance | MaD:5 |
 | TextStringBuilderTest.java:20:98:20:100 | sb1 : TextStringBuilder | TextStringBuilderTest.java:20:98:20:111 | toString(...) | provenance | MaD:646 |
 | TextStringBuilderTest.java:21:58:21:60 | sb2 [post update] : TextStringBuilder | TextStringBuilderTest.java:21:104:21:106 | sb2 : TextStringBuilder | provenance |  |
 | TextStringBuilderTest.java:21:69:21:75 | taint(...) : String | TextStringBuilderTest.java:21:69:21:89 | toCharArray(...) : char[] | provenance | MaD:7 |
-| TextStringBuilderTest.java:21:69:21:89 | toCharArray(...) : char[] | TextStringBuilderTest.java:21:58:21:60 | sb2 [post update] : TextStringBuilder | provenance | MaD:564 |
+| TextStringBuilderTest.java:21:69:21:89 | toCharArray(...) : char[] | TextStringBuilderTest.java:21:58:21:60 | sb2 [post update] : TextStringBuilder | provenance | MaD:563 |
 | TextStringBuilderTest.java:21:104:21:106 | sb2 : TextStringBuilder | TextStringBuilderTest.java:21:104:21:117 | toString(...) | provenance | MaD:5 |
 | TextStringBuilderTest.java:21:104:21:106 | sb2 : TextStringBuilder | TextStringBuilderTest.java:21:104:21:117 | toString(...) | provenance | MaD:646 |
 | TextStringBuilderTest.java:22:58:22:60 | sb3 [post update] : TextStringBuilder | TextStringBuilderTest.java:22:115:22:117 | sb3 : TextStringBuilder | provenance |  |
-| TextStringBuilderTest.java:22:69:22:106 | wrap(...) : CharBuffer | TextStringBuilderTest.java:22:58:22:60 | sb3 [post update] : TextStringBuilder | provenance | MaD:576 |
+| TextStringBuilderTest.java:22:69:22:106 | wrap(...) : CharBuffer | TextStringBuilderTest.java:22:58:22:60 | sb3 [post update] : TextStringBuilder | provenance | MaD:575 |
 | TextStringBuilderTest.java:22:85:22:91 | taint(...) : String | TextStringBuilderTest.java:22:85:22:105 | toCharArray(...) : char[] | provenance | MaD:7 |
 | TextStringBuilderTest.java:22:85:22:105 | toCharArray(...) : char[] | TextStringBuilderTest.java:22:69:22:106 | wrap(...) : CharBuffer | provenance | MaD:10 |
 | TextStringBuilderTest.java:22:115:22:117 | sb3 : TextStringBuilder | TextStringBuilderTest.java:22:115:22:128 | toString(...) | provenance | MaD:5 |
 | TextStringBuilderTest.java:22:115:22:117 | sb3 : TextStringBuilder | TextStringBuilderTest.java:22:115:22:128 | toString(...) | provenance | MaD:646 |
 | TextStringBuilderTest.java:23:58:23:60 | sb4 [post update] : TextStringBuilder | TextStringBuilderTest.java:23:121:23:123 | sb4 : TextStringBuilder | provenance |  |
-| TextStringBuilderTest.java:23:69:23:106 | wrap(...) : CharBuffer | TextStringBuilderTest.java:23:58:23:60 | sb4 [post update] : TextStringBuilder | provenance | MaD:577 |
+| TextStringBuilderTest.java:23:69:23:106 | wrap(...) : CharBuffer | TextStringBuilderTest.java:23:58:23:60 | sb4 [post update] : TextStringBuilder | provenance | MaD:576 |
 | TextStringBuilderTest.java:23:85:23:91 | taint(...) : String | TextStringBuilderTest.java:23:85:23:105 | toCharArray(...) : char[] | provenance | MaD:7 |
 | TextStringBuilderTest.java:23:85:23:105 | toCharArray(...) : char[] | TextStringBuilderTest.java:23:69:23:106 | wrap(...) : CharBuffer | provenance | MaD:10 |
 | TextStringBuilderTest.java:23:121:23:123 | sb4 : TextStringBuilder | TextStringBuilderTest.java:23:121:23:134 | toString(...) | provenance | MaD:5 |
 | TextStringBuilderTest.java:23:121:23:123 | sb4 : TextStringBuilder | TextStringBuilderTest.java:23:121:23:134 | toString(...) | provenance | MaD:646 |
 | TextStringBuilderTest.java:24:58:24:60 | sb5 [post update] : TextStringBuilder | TextStringBuilderTest.java:24:98:24:100 | sb5 : TextStringBuilder | provenance |  |
 | TextStringBuilderTest.java:24:69:24:89 | (...)... : String | TextStringBuilderTest.java:24:58:24:60 | sb5 [post update] : TextStringBuilder | provenance | MaD:3 |
-| TextStringBuilderTest.java:24:69:24:89 | (...)... : String | TextStringBuilderTest.java:24:58:24:60 | sb5 [post update] : TextStringBuilder | provenance | MaD:565 |
+| TextStringBuilderTest.java:24:69:24:89 | (...)... : String | TextStringBuilderTest.java:24:58:24:60 | sb5 [post update] : TextStringBuilder | provenance | MaD:564 |
 | TextStringBuilderTest.java:24:83:24:89 | taint(...) : String | TextStringBuilderTest.java:24:69:24:89 | (...)... : String | provenance |  |
 | TextStringBuilderTest.java:24:98:24:100 | sb5 : TextStringBuilder | TextStringBuilderTest.java:24:98:24:111 | toString(...) | provenance | MaD:5 |
 | TextStringBuilderTest.java:24:98:24:100 | sb5 : TextStringBuilder | TextStringBuilderTest.java:24:98:24:111 | toString(...) | provenance | MaD:646 |
 | TextStringBuilderTest.java:25:58:25:60 | sb6 [post update] : TextStringBuilder | TextStringBuilderTest.java:25:104:25:106 | sb6 : TextStringBuilder | provenance |  |
 | TextStringBuilderTest.java:25:69:25:89 | (...)... : String | TextStringBuilderTest.java:25:58:25:60 | sb6 [post update] : TextStringBuilder | provenance | MaD:3 |
-| TextStringBuilderTest.java:25:69:25:89 | (...)... : String | TextStringBuilderTest.java:25:58:25:60 | sb6 [post update] : TextStringBuilder | provenance | MaD:566 |
+| TextStringBuilderTest.java:25:69:25:89 | (...)... : String | TextStringBuilderTest.java:25:58:25:60 | sb6 [post update] : TextStringBuilder | provenance | MaD:565 |
 | TextStringBuilderTest.java:25:83:25:89 | taint(...) : String | TextStringBuilderTest.java:25:69:25:89 | (...)... : String | provenance |  |
 | TextStringBuilderTest.java:25:104:25:106 | sb6 : TextStringBuilder | TextStringBuilderTest.java:25:104:25:117 | toString(...) | provenance | MaD:5 |
 | TextStringBuilderTest.java:25:104:25:106 | sb6 : TextStringBuilder | TextStringBuilderTest.java:25:104:25:117 | toString(...) | provenance | MaD:646 |
 | TextStringBuilderTest.java:26:58:26:60 | sb7 [post update] : TextStringBuilder | TextStringBuilderTest.java:26:92:26:94 | sb7 : TextStringBuilder | provenance |  |
-| TextStringBuilderTest.java:26:69:26:83 | (...)... : String | TextStringBuilderTest.java:26:58:26:60 | sb7 [post update] : TextStringBuilder | provenance | MaD:567 |
+| TextStringBuilderTest.java:26:69:26:83 | (...)... : String | TextStringBuilderTest.java:26:58:26:60 | sb7 [post update] : TextStringBuilder | provenance | MaD:566 |
 | TextStringBuilderTest.java:26:77:26:83 | taint(...) : String | TextStringBuilderTest.java:26:69:26:83 | (...)... : String | provenance |  |
 | TextStringBuilderTest.java:26:92:26:94 | sb7 : TextStringBuilder | TextStringBuilderTest.java:26:92:26:105 | toString(...) | provenance | MaD:5 |
 | TextStringBuilderTest.java:26:92:26:94 | sb7 : TextStringBuilder | TextStringBuilderTest.java:26:92:26:105 | toString(...) | provenance | MaD:646 |
 | TextStringBuilderTest.java:28:64:28:68 | auxsb [post update] : TextStringBuilder | TextStringBuilderTest.java:29:73:29:77 | auxsb : TextStringBuilder | provenance |  |
-| TextStringBuilderTest.java:28:77:28:83 | taint(...) : String | TextStringBuilderTest.java:28:64:28:68 | auxsb [post update] : TextStringBuilder | provenance | MaD:568 |
+| TextStringBuilderTest.java:28:77:28:83 | taint(...) : String | TextStringBuilderTest.java:28:64:28:68 | auxsb [post update] : TextStringBuilder | provenance | MaD:567 |
 | TextStringBuilderTest.java:29:62:29:64 | sb8 [post update] : TextStringBuilder | TextStringBuilderTest.java:29:86:29:88 | sb8 : TextStringBuilder | provenance |  |
-| TextStringBuilderTest.java:29:73:29:77 | auxsb : TextStringBuilder | TextStringBuilderTest.java:29:62:29:64 | sb8 [post update] : TextStringBuilder | provenance | MaD:578 |
+| TextStringBuilderTest.java:29:73:29:77 | auxsb : TextStringBuilder | TextStringBuilderTest.java:29:62:29:64 | sb8 [post update] : TextStringBuilder | provenance | MaD:577 |
 | TextStringBuilderTest.java:29:86:29:88 | sb8 : TextStringBuilder | TextStringBuilderTest.java:29:86:29:99 | toString(...) | provenance | MaD:5 |
 | TextStringBuilderTest.java:29:86:29:88 | sb8 : TextStringBuilder | TextStringBuilderTest.java:29:86:29:99 | toString(...) | provenance | MaD:646 |
 | TextStringBuilderTest.java:31:58:31:60 | sb9 [post update] : TextStringBuilder | TextStringBuilderTest.java:31:102:31:104 | sb9 : TextStringBuilder | provenance |  |
-| TextStringBuilderTest.java:31:69:31:93 | new StringBuffer(...) : StringBuffer | TextStringBuilderTest.java:31:58:31:60 | sb9 [post update] : TextStringBuilder | provenance | MaD:572 |
+| TextStringBuilderTest.java:31:69:31:93 | new StringBuffer(...) : StringBuffer | TextStringBuilderTest.java:31:58:31:60 | sb9 [post update] : TextStringBuilder | provenance | MaD:571 |
 | TextStringBuilderTest.java:31:86:31:92 | taint(...) : String | TextStringBuilderTest.java:31:69:31:93 | new StringBuffer(...) : StringBuffer | provenance | MaD:8 |
 | TextStringBuilderTest.java:31:102:31:104 | sb9 : TextStringBuilder | TextStringBuilderTest.java:31:102:31:115 | toString(...) | provenance | MaD:5 |
 | TextStringBuilderTest.java:31:102:31:104 | sb9 : TextStringBuilder | TextStringBuilderTest.java:31:102:31:115 | toString(...) | provenance | MaD:646 |
 | TextStringBuilderTest.java:32:59:32:62 | sb10 [post update] : TextStringBuilder | TextStringBuilderTest.java:32:110:32:113 | sb10 : TextStringBuilder | provenance |  |
-| TextStringBuilderTest.java:32:71:32:95 | new StringBuffer(...) : StringBuffer | TextStringBuilderTest.java:32:59:32:62 | sb10 [post update] : TextStringBuilder | provenance | MaD:573 |
+| TextStringBuilderTest.java:32:71:32:95 | new StringBuffer(...) : StringBuffer | TextStringBuilderTest.java:32:59:32:62 | sb10 [post update] : TextStringBuilder | provenance | MaD:572 |
 | TextStringBuilderTest.java:32:88:32:94 | taint(...) : String | TextStringBuilderTest.java:32:71:32:95 | new StringBuffer(...) : StringBuffer | provenance | MaD:8 |
 | TextStringBuilderTest.java:32:110:32:113 | sb10 : TextStringBuilder | TextStringBuilderTest.java:32:110:32:124 | toString(...) | provenance | MaD:5 |
 | TextStringBuilderTest.java:32:110:32:113 | sb10 : TextStringBuilder | TextStringBuilderTest.java:32:110:32:124 | toString(...) | provenance | MaD:646 |
 | TextStringBuilderTest.java:33:59:33:62 | sb11 [post update] : TextStringBuilder | TextStringBuilderTest.java:33:105:33:108 | sb11 : TextStringBuilder | provenance |  |
-| TextStringBuilderTest.java:33:71:33:96 | new StringBuilder(...) : StringBuilder | TextStringBuilderTest.java:33:59:33:62 | sb11 [post update] : TextStringBuilder | provenance | MaD:574 |
+| TextStringBuilderTest.java:33:71:33:96 | new StringBuilder(...) : StringBuilder | TextStringBuilderTest.java:33:59:33:62 | sb11 [post update] : TextStringBuilder | provenance | MaD:573 |
 | TextStringBuilderTest.java:33:89:33:95 | taint(...) : String | TextStringBuilderTest.java:33:71:33:96 | new StringBuilder(...) : StringBuilder | provenance | MaD:9 |
 | TextStringBuilderTest.java:33:105:33:108 | sb11 : TextStringBuilder | TextStringBuilderTest.java:33:105:33:119 | toString(...) | provenance | MaD:5 |
 | TextStringBuilderTest.java:33:105:33:108 | sb11 : TextStringBuilder | TextStringBuilderTest.java:33:105:33:119 | toString(...) | provenance | MaD:646 |
 | TextStringBuilderTest.java:34:59:34:62 | sb12 [post update] : TextStringBuilder | TextStringBuilderTest.java:34:111:34:114 | sb12 : TextStringBuilder | provenance |  |
-| TextStringBuilderTest.java:34:71:34:96 | new StringBuilder(...) : StringBuilder | TextStringBuilderTest.java:34:59:34:62 | sb12 [post update] : TextStringBuilder | provenance | MaD:575 |
+| TextStringBuilderTest.java:34:71:34:96 | new StringBuilder(...) : StringBuilder | TextStringBuilderTest.java:34:59:34:62 | sb12 [post update] : TextStringBuilder | provenance | MaD:574 |
 | TextStringBuilderTest.java:34:89:34:95 | taint(...) : String | TextStringBuilderTest.java:34:71:34:96 | new StringBuilder(...) : StringBuilder | provenance | MaD:9 |
 | TextStringBuilderTest.java:34:111:34:114 | sb12 : TextStringBuilder | TextStringBuilderTest.java:34:111:34:125 | toString(...) | provenance | MaD:5 |
 | TextStringBuilderTest.java:34:111:34:114 | sb12 : TextStringBuilder | TextStringBuilderTest.java:34:111:34:125 | toString(...) | provenance | MaD:646 |
 | TextStringBuilderTest.java:35:59:35:62 | sb13 [post update] : TextStringBuilder | TextStringBuilderTest.java:35:86:35:89 | sb13 : TextStringBuilder | provenance |  |
-| TextStringBuilderTest.java:35:71:35:77 | taint(...) : String | TextStringBuilderTest.java:35:59:35:62 | sb13 [post update] : TextStringBuilder | provenance | MaD:568 |
+| TextStringBuilderTest.java:35:71:35:77 | taint(...) : String | TextStringBuilderTest.java:35:59:35:62 | sb13 [post update] : TextStringBuilder | provenance | MaD:567 |
 | TextStringBuilderTest.java:35:86:35:89 | sb13 : TextStringBuilder | TextStringBuilderTest.java:35:86:35:100 | toString(...) | provenance | MaD:5 |
 | TextStringBuilderTest.java:35:86:35:89 | sb13 : TextStringBuilder | TextStringBuilderTest.java:35:86:35:100 | toString(...) | provenance | MaD:646 |
 | TextStringBuilderTest.java:36:59:36:62 | sb14 [post update] : TextStringBuilder | TextStringBuilderTest.java:36:92:36:95 | sb14 : TextStringBuilder | provenance |  |
-| TextStringBuilderTest.java:36:71:36:77 | taint(...) : String | TextStringBuilderTest.java:36:59:36:62 | sb14 [post update] : TextStringBuilder | provenance | MaD:569 |
+| TextStringBuilderTest.java:36:71:36:77 | taint(...) : String | TextStringBuilderTest.java:36:59:36:62 | sb14 [post update] : TextStringBuilder | provenance | MaD:568 |
 | TextStringBuilderTest.java:36:92:36:95 | sb14 : TextStringBuilder | TextStringBuilderTest.java:36:92:36:106 | toString(...) | provenance | MaD:5 |
 | TextStringBuilderTest.java:36:92:36:95 | sb14 : TextStringBuilder | TextStringBuilderTest.java:36:92:36:106 | toString(...) | provenance | MaD:646 |
 | TextStringBuilderTest.java:37:59:37:62 | sb15 [post update] : TextStringBuilder | TextStringBuilderTest.java:37:104:37:107 | sb15 : TextStringBuilder | provenance |  |
-| TextStringBuilderTest.java:37:71:37:77 | taint(...) : String | TextStringBuilderTest.java:37:59:37:62 | sb15 [post update] : TextStringBuilder | provenance | MaD:570 |
+| TextStringBuilderTest.java:37:71:37:77 | taint(...) : String | TextStringBuilderTest.java:37:59:37:62 | sb15 [post update] : TextStringBuilder | provenance | MaD:569 |
 | TextStringBuilderTest.java:37:104:37:107 | sb15 : TextStringBuilder | TextStringBuilderTest.java:37:104:37:118 | toString(...) | provenance | MaD:5 |
 | TextStringBuilderTest.java:37:104:37:107 | sb15 : TextStringBuilder | TextStringBuilderTest.java:37:104:37:118 | toString(...) | provenance | MaD:646 |
 | TextStringBuilderTest.java:38:59:38:62 | sb16 [post update] : TextStringBuilder | TextStringBuilderTest.java:38:111:38:114 | sb16 : TextStringBuilder | provenance |  |
-| TextStringBuilderTest.java:38:59:38:103 | new ..[] { .. } : Object[] [[]] : String | TextStringBuilderTest.java:38:59:38:62 | sb16 [post update] : TextStringBuilder | provenance | MaD:571 |
+| TextStringBuilderTest.java:38:59:38:103 | new ..[] { .. } : Object[] [[]] : String | TextStringBuilderTest.java:38:59:38:62 | sb16 [post update] : TextStringBuilder | provenance | MaD:570 |
 | TextStringBuilderTest.java:38:88:38:94 | taint(...) : String | TextStringBuilderTest.java:38:59:38:103 | new ..[] { .. } : Object[] [[]] : String | provenance |  |
 | TextStringBuilderTest.java:38:111:38:114 | sb16 : TextStringBuilder | TextStringBuilderTest.java:38:111:38:125 | toString(...) | provenance | MaD:5 |
 | TextStringBuilderTest.java:38:111:38:114 | sb16 : TextStringBuilder | TextStringBuilderTest.java:38:111:38:125 | toString(...) | provenance | MaD:646 |
@@ -2877,108 +2851,108 @@ edges
 | TextStringBuilderTest.java:41:13:41:23 | taintedList [post update] : ArrayList [<element>] : String | TextStringBuilderTest.java:43:78:43:88 | taintedList : ArrayList [<element>] : String | provenance |  |
 | TextStringBuilderTest.java:41:29:41:35 | taint(...) : String | TextStringBuilderTest.java:41:13:41:23 | taintedList [post update] : ArrayList [<element>] : String | provenance | MaD:11 |
 | TextStringBuilderTest.java:42:63:42:66 | sb17 [post update] : TextStringBuilder | TextStringBuilderTest.java:42:97:42:100 | sb17 : TextStringBuilder | provenance |  |
-| TextStringBuilderTest.java:42:78:42:88 | taintedList : ArrayList [<element>] : String | TextStringBuilderTest.java:42:63:42:66 | sb17 [post update] : TextStringBuilder | provenance | MaD:580 |
+| TextStringBuilderTest.java:42:78:42:88 | taintedList : ArrayList [<element>] : String | TextStringBuilderTest.java:42:63:42:66 | sb17 [post update] : TextStringBuilder | provenance | MaD:579 |
 | TextStringBuilderTest.java:42:97:42:100 | sb17 : TextStringBuilder | TextStringBuilderTest.java:42:97:42:111 | toString(...) | provenance | MaD:5 |
 | TextStringBuilderTest.java:42:97:42:100 | sb17 : TextStringBuilder | TextStringBuilderTest.java:42:97:42:111 | toString(...) | provenance | MaD:646 |
 | TextStringBuilderTest.java:43:63:43:66 | sb18 [post update] : TextStringBuilder | TextStringBuilderTest.java:43:108:43:111 | sb18 : TextStringBuilder | provenance |  |
 | TextStringBuilderTest.java:43:78:43:88 | taintedList : ArrayList [<element>] : String | TextStringBuilderTest.java:43:78:43:99 | iterator(...) : Iterator [<element>] : String | provenance | MaD:6 |
-| TextStringBuilderTest.java:43:78:43:99 | iterator(...) : Iterator [<element>] : String | TextStringBuilderTest.java:43:63:43:66 | sb18 [post update] : TextStringBuilder | provenance | MaD:581 |
+| TextStringBuilderTest.java:43:78:43:99 | iterator(...) : Iterator [<element>] : String | TextStringBuilderTest.java:43:63:43:66 | sb18 [post update] : TextStringBuilder | provenance | MaD:580 |
 | TextStringBuilderTest.java:43:108:43:111 | sb18 : TextStringBuilder | TextStringBuilderTest.java:43:108:43:122 | toString(...) | provenance | MaD:5 |
 | TextStringBuilderTest.java:43:108:43:111 | sb18 : TextStringBuilder | TextStringBuilderTest.java:43:108:43:122 | toString(...) | provenance | MaD:646 |
 | TextStringBuilderTest.java:45:59:45:62 | sb19 [post update] : TextStringBuilder | TextStringBuilderTest.java:45:98:45:101 | sb19 : TextStringBuilder | provenance |  |
-| TextStringBuilderTest.java:45:59:45:90 | new ..[] { .. } : Object[] [[]] : String | TextStringBuilderTest.java:45:59:45:62 | sb19 [post update] : TextStringBuilder | provenance | MaD:582 |
+| TextStringBuilderTest.java:45:59:45:90 | new ..[] { .. } : Object[] [[]] : String | TextStringBuilderTest.java:45:59:45:62 | sb19 [post update] : TextStringBuilder | provenance | MaD:581 |
 | TextStringBuilderTest.java:45:83:45:89 | taint(...) : String | TextStringBuilderTest.java:45:59:45:90 | new ..[] { .. } : Object[] [[]] : String | provenance |  |
 | TextStringBuilderTest.java:45:98:45:101 | sb19 : TextStringBuilder | TextStringBuilderTest.java:45:98:45:112 | toString(...) | provenance | MaD:5 |
 | TextStringBuilderTest.java:45:98:45:101 | sb19 : TextStringBuilder | TextStringBuilderTest.java:45:98:45:112 | toString(...) | provenance | MaD:646 |
 | TextStringBuilderTest.java:46:59:46:62 | sb20 [post update] : TextStringBuilder | TextStringBuilderTest.java:46:98:46:101 | sb20 : TextStringBuilder | provenance |  |
-| TextStringBuilderTest.java:46:59:46:90 | new ..[] { .. } : Object[] [[]] : String | TextStringBuilderTest.java:46:59:46:62 | sb20 [post update] : TextStringBuilder | provenance | MaD:582 |
+| TextStringBuilderTest.java:46:59:46:90 | new ..[] { .. } : Object[] [[]] : String | TextStringBuilderTest.java:46:59:46:62 | sb20 [post update] : TextStringBuilder | provenance | MaD:581 |
 | TextStringBuilderTest.java:46:74:46:80 | taint(...) : String | TextStringBuilderTest.java:46:59:46:90 | new ..[] { .. } : Object[] [[]] : String | provenance |  |
 | TextStringBuilderTest.java:46:98:46:101 | sb20 : TextStringBuilder | TextStringBuilderTest.java:46:98:46:112 | toString(...) | provenance | MaD:5 |
 | TextStringBuilderTest.java:46:98:46:101 | sb20 : TextStringBuilder | TextStringBuilderTest.java:46:98:46:112 | toString(...) | provenance | MaD:646 |
 | TextStringBuilderTest.java:47:59:47:62 | sb21 [post update] : TextStringBuilder | TextStringBuilderTest.java:47:111:47:114 | sb21 : TextStringBuilder | provenance |  |
-| TextStringBuilderTest.java:47:88:47:94 | taint(...) : String | TextStringBuilderTest.java:47:59:47:62 | sb21 [post update] : TextStringBuilder | provenance | MaD:584 |
+| TextStringBuilderTest.java:47:88:47:94 | taint(...) : String | TextStringBuilderTest.java:47:59:47:62 | sb21 [post update] : TextStringBuilder | provenance | MaD:583 |
 | TextStringBuilderTest.java:47:111:47:114 | sb21 : TextStringBuilder | TextStringBuilderTest.java:47:111:47:125 | toString(...) | provenance | MaD:5 |
 | TextStringBuilderTest.java:47:111:47:114 | sb21 : TextStringBuilder | TextStringBuilderTest.java:47:111:47:125 | toString(...) | provenance | MaD:646 |
 | TextStringBuilderTest.java:48:59:48:62 | sb22 [post update] : TextStringBuilder | TextStringBuilderTest.java:48:112:48:115 | sb22 : TextStringBuilder | provenance |  |
-| TextStringBuilderTest.java:48:89:48:95 | taint(...) : String | TextStringBuilderTest.java:48:59:48:62 | sb22 [post update] : TextStringBuilder | provenance | MaD:586 |
+| TextStringBuilderTest.java:48:89:48:95 | taint(...) : String | TextStringBuilderTest.java:48:59:48:62 | sb22 [post update] : TextStringBuilder | provenance | MaD:585 |
 | TextStringBuilderTest.java:48:112:48:115 | sb22 : TextStringBuilder | TextStringBuilderTest.java:48:112:48:126 | toString(...) | provenance | MaD:5 |
 | TextStringBuilderTest.java:48:112:48:115 | sb22 : TextStringBuilder | TextStringBuilderTest.java:48:112:48:126 | toString(...) | provenance | MaD:646 |
 | TextStringBuilderTest.java:49:59:49:62 | sb23 [post update] : TextStringBuilder | TextStringBuilderTest.java:49:102:49:105 | sb23 : TextStringBuilder | provenance |  |
 | TextStringBuilderTest.java:49:73:49:79 | taint(...) : String | TextStringBuilderTest.java:49:73:49:93 | toCharArray(...) : char[] | provenance | MaD:7 |
-| TextStringBuilderTest.java:49:73:49:93 | toCharArray(...) : char[] | TextStringBuilderTest.java:49:59:49:62 | sb23 [post update] : TextStringBuilder | provenance | MaD:601 |
+| TextStringBuilderTest.java:49:73:49:93 | toCharArray(...) : char[] | TextStringBuilderTest.java:49:59:49:62 | sb23 [post update] : TextStringBuilder | provenance | MaD:600 |
 | TextStringBuilderTest.java:49:102:49:105 | sb23 : TextStringBuilder | TextStringBuilderTest.java:49:102:49:116 | toString(...) | provenance | MaD:5 |
 | TextStringBuilderTest.java:49:102:49:105 | sb23 : TextStringBuilder | TextStringBuilderTest.java:49:102:49:116 | toString(...) | provenance | MaD:646 |
 | TextStringBuilderTest.java:50:59:50:62 | sb24 [post update] : TextStringBuilder | TextStringBuilderTest.java:50:108:50:111 | sb24 : TextStringBuilder | provenance |  |
 | TextStringBuilderTest.java:50:73:50:79 | taint(...) : String | TextStringBuilderTest.java:50:73:50:93 | toCharArray(...) : char[] | provenance | MaD:7 |
-| TextStringBuilderTest.java:50:73:50:93 | toCharArray(...) : char[] | TextStringBuilderTest.java:50:59:50:62 | sb24 [post update] : TextStringBuilder | provenance | MaD:602 |
+| TextStringBuilderTest.java:50:73:50:93 | toCharArray(...) : char[] | TextStringBuilderTest.java:50:59:50:62 | sb24 [post update] : TextStringBuilder | provenance | MaD:601 |
 | TextStringBuilderTest.java:50:108:50:111 | sb24 : TextStringBuilder | TextStringBuilderTest.java:50:108:50:122 | toString(...) | provenance | MaD:5 |
 | TextStringBuilderTest.java:50:108:50:111 | sb24 : TextStringBuilder | TextStringBuilderTest.java:50:108:50:122 | toString(...) | provenance | MaD:646 |
 | TextStringBuilderTest.java:51:59:51:62 | sb25 [post update] : TextStringBuilder | TextStringBuilderTest.java:51:96:51:99 | sb25 : TextStringBuilder | provenance |  |
-| TextStringBuilderTest.java:51:73:51:87 | (...)... : String | TextStringBuilderTest.java:51:59:51:62 | sb25 [post update] : TextStringBuilder | provenance | MaD:603 |
+| TextStringBuilderTest.java:51:73:51:87 | (...)... : String | TextStringBuilderTest.java:51:59:51:62 | sb25 [post update] : TextStringBuilder | provenance | MaD:602 |
 | TextStringBuilderTest.java:51:81:51:87 | taint(...) : String | TextStringBuilderTest.java:51:73:51:87 | (...)... : String | provenance |  |
 | TextStringBuilderTest.java:51:96:51:99 | sb25 : TextStringBuilder | TextStringBuilderTest.java:51:96:51:110 | toString(...) | provenance | MaD:5 |
 | TextStringBuilderTest.java:51:96:51:99 | sb25 : TextStringBuilder | TextStringBuilderTest.java:51:96:51:110 | toString(...) | provenance | MaD:646 |
 | TextStringBuilderTest.java:53:64:53:68 | auxsb [post update] : TextStringBuilder | TextStringBuilderTest.java:54:77:54:81 | auxsb : TextStringBuilder | provenance |  |
-| TextStringBuilderTest.java:53:79:53:85 | taint(...) : String | TextStringBuilderTest.java:53:64:53:68 | auxsb [post update] : TextStringBuilder | provenance | MaD:604 |
+| TextStringBuilderTest.java:53:79:53:85 | taint(...) : String | TextStringBuilderTest.java:53:64:53:68 | auxsb [post update] : TextStringBuilder | provenance | MaD:603 |
 | TextStringBuilderTest.java:54:63:54:66 | sb26 [post update] : TextStringBuilder | TextStringBuilderTest.java:54:90:54:93 | sb26 : TextStringBuilder | provenance |  |
-| TextStringBuilderTest.java:54:77:54:81 | auxsb : TextStringBuilder | TextStringBuilderTest.java:54:63:54:66 | sb26 [post update] : TextStringBuilder | provenance | MaD:612 |
+| TextStringBuilderTest.java:54:77:54:81 | auxsb : TextStringBuilder | TextStringBuilderTest.java:54:63:54:66 | sb26 [post update] : TextStringBuilder | provenance | MaD:611 |
 | TextStringBuilderTest.java:54:90:54:93 | sb26 : TextStringBuilder | TextStringBuilderTest.java:54:90:54:104 | toString(...) | provenance | MaD:5 |
 | TextStringBuilderTest.java:54:90:54:93 | sb26 : TextStringBuilder | TextStringBuilderTest.java:54:90:54:104 | toString(...) | provenance | MaD:646 |
 | TextStringBuilderTest.java:56:59:56:62 | sb27 [post update] : TextStringBuilder | TextStringBuilderTest.java:56:106:56:109 | sb27 : TextStringBuilder | provenance |  |
-| TextStringBuilderTest.java:56:73:56:97 | new StringBuffer(...) : StringBuffer | TextStringBuilderTest.java:56:59:56:62 | sb27 [post update] : TextStringBuilder | provenance | MaD:608 |
+| TextStringBuilderTest.java:56:73:56:97 | new StringBuffer(...) : StringBuffer | TextStringBuilderTest.java:56:59:56:62 | sb27 [post update] : TextStringBuilder | provenance | MaD:607 |
 | TextStringBuilderTest.java:56:90:56:96 | taint(...) : String | TextStringBuilderTest.java:56:73:56:97 | new StringBuffer(...) : StringBuffer | provenance | MaD:8 |
 | TextStringBuilderTest.java:56:106:56:109 | sb27 : TextStringBuilder | TextStringBuilderTest.java:56:106:56:120 | toString(...) | provenance | MaD:5 |
 | TextStringBuilderTest.java:56:106:56:109 | sb27 : TextStringBuilder | TextStringBuilderTest.java:56:106:56:120 | toString(...) | provenance | MaD:646 |
 | TextStringBuilderTest.java:57:59:57:62 | sb28 [post update] : TextStringBuilder | TextStringBuilderTest.java:57:112:57:115 | sb28 : TextStringBuilder | provenance |  |
-| TextStringBuilderTest.java:57:73:57:97 | new StringBuffer(...) : StringBuffer | TextStringBuilderTest.java:57:59:57:62 | sb28 [post update] : TextStringBuilder | provenance | MaD:609 |
+| TextStringBuilderTest.java:57:73:57:97 | new StringBuffer(...) : StringBuffer | TextStringBuilderTest.java:57:59:57:62 | sb28 [post update] : TextStringBuilder | provenance | MaD:608 |
 | TextStringBuilderTest.java:57:90:57:96 | taint(...) : String | TextStringBuilderTest.java:57:73:57:97 | new StringBuffer(...) : StringBuffer | provenance | MaD:8 |
 | TextStringBuilderTest.java:57:112:57:115 | sb28 : TextStringBuilder | TextStringBuilderTest.java:57:112:57:126 | toString(...) | provenance | MaD:5 |
 | TextStringBuilderTest.java:57:112:57:115 | sb28 : TextStringBuilder | TextStringBuilderTest.java:57:112:57:126 | toString(...) | provenance | MaD:646 |
 | TextStringBuilderTest.java:58:59:58:62 | sb29 [post update] : TextStringBuilder | TextStringBuilderTest.java:58:107:58:110 | sb29 : TextStringBuilder | provenance |  |
-| TextStringBuilderTest.java:58:73:58:98 | new StringBuilder(...) : StringBuilder | TextStringBuilderTest.java:58:59:58:62 | sb29 [post update] : TextStringBuilder | provenance | MaD:610 |
+| TextStringBuilderTest.java:58:73:58:98 | new StringBuilder(...) : StringBuilder | TextStringBuilderTest.java:58:59:58:62 | sb29 [post update] : TextStringBuilder | provenance | MaD:609 |
 | TextStringBuilderTest.java:58:91:58:97 | taint(...) : String | TextStringBuilderTest.java:58:73:58:98 | new StringBuilder(...) : StringBuilder | provenance | MaD:9 |
 | TextStringBuilderTest.java:58:107:58:110 | sb29 : TextStringBuilder | TextStringBuilderTest.java:58:107:58:121 | toString(...) | provenance | MaD:5 |
 | TextStringBuilderTest.java:58:107:58:110 | sb29 : TextStringBuilder | TextStringBuilderTest.java:58:107:58:121 | toString(...) | provenance | MaD:646 |
 | TextStringBuilderTest.java:59:59:59:62 | sb30 [post update] : TextStringBuilder | TextStringBuilderTest.java:59:113:59:116 | sb30 : TextStringBuilder | provenance |  |
-| TextStringBuilderTest.java:59:73:59:98 | new StringBuilder(...) : StringBuilder | TextStringBuilderTest.java:59:59:59:62 | sb30 [post update] : TextStringBuilder | provenance | MaD:611 |
+| TextStringBuilderTest.java:59:73:59:98 | new StringBuilder(...) : StringBuilder | TextStringBuilderTest.java:59:59:59:62 | sb30 [post update] : TextStringBuilder | provenance | MaD:610 |
 | TextStringBuilderTest.java:59:91:59:97 | taint(...) : String | TextStringBuilderTest.java:59:73:59:98 | new StringBuilder(...) : StringBuilder | provenance | MaD:9 |
 | TextStringBuilderTest.java:59:113:59:116 | sb30 : TextStringBuilder | TextStringBuilderTest.java:59:113:59:127 | toString(...) | provenance | MaD:5 |
 | TextStringBuilderTest.java:59:113:59:116 | sb30 : TextStringBuilder | TextStringBuilderTest.java:59:113:59:127 | toString(...) | provenance | MaD:646 |
 | TextStringBuilderTest.java:60:59:60:62 | sb31 [post update] : TextStringBuilder | TextStringBuilderTest.java:60:88:60:91 | sb31 : TextStringBuilder | provenance |  |
-| TextStringBuilderTest.java:60:73:60:79 | taint(...) : String | TextStringBuilderTest.java:60:59:60:62 | sb31 [post update] : TextStringBuilder | provenance | MaD:604 |
+| TextStringBuilderTest.java:60:73:60:79 | taint(...) : String | TextStringBuilderTest.java:60:59:60:62 | sb31 [post update] : TextStringBuilder | provenance | MaD:603 |
 | TextStringBuilderTest.java:60:88:60:91 | sb31 : TextStringBuilder | TextStringBuilderTest.java:60:88:60:102 | toString(...) | provenance | MaD:5 |
 | TextStringBuilderTest.java:60:88:60:91 | sb31 : TextStringBuilder | TextStringBuilderTest.java:60:88:60:102 | toString(...) | provenance | MaD:646 |
 | TextStringBuilderTest.java:61:59:61:62 | sb32 [post update] : TextStringBuilder | TextStringBuilderTest.java:61:94:61:97 | sb32 : TextStringBuilder | provenance |  |
-| TextStringBuilderTest.java:61:73:61:79 | taint(...) : String | TextStringBuilderTest.java:61:59:61:62 | sb32 [post update] : TextStringBuilder | provenance | MaD:605 |
+| TextStringBuilderTest.java:61:73:61:79 | taint(...) : String | TextStringBuilderTest.java:61:59:61:62 | sb32 [post update] : TextStringBuilder | provenance | MaD:604 |
 | TextStringBuilderTest.java:61:94:61:97 | sb32 : TextStringBuilder | TextStringBuilderTest.java:61:94:61:108 | toString(...) | provenance | MaD:5 |
 | TextStringBuilderTest.java:61:94:61:97 | sb32 : TextStringBuilder | TextStringBuilderTest.java:61:94:61:108 | toString(...) | provenance | MaD:646 |
 | TextStringBuilderTest.java:62:59:62:62 | sb33 [post update] : TextStringBuilder | TextStringBuilderTest.java:62:106:62:109 | sb33 : TextStringBuilder | provenance |  |
-| TextStringBuilderTest.java:62:73:62:79 | taint(...) : String | TextStringBuilderTest.java:62:59:62:62 | sb33 [post update] : TextStringBuilder | provenance | MaD:606 |
+| TextStringBuilderTest.java:62:73:62:79 | taint(...) : String | TextStringBuilderTest.java:62:59:62:62 | sb33 [post update] : TextStringBuilder | provenance | MaD:605 |
 | TextStringBuilderTest.java:62:106:62:109 | sb33 : TextStringBuilder | TextStringBuilderTest.java:62:106:62:120 | toString(...) | provenance | MaD:5 |
 | TextStringBuilderTest.java:62:106:62:109 | sb33 : TextStringBuilder | TextStringBuilderTest.java:62:106:62:120 | toString(...) | provenance | MaD:646 |
 | TextStringBuilderTest.java:63:59:63:62 | sb34 [post update] : TextStringBuilder | TextStringBuilderTest.java:63:113:63:116 | sb34 : TextStringBuilder | provenance |  |
-| TextStringBuilderTest.java:63:59:63:105 | new ..[] { .. } : Object[] [[]] : String | TextStringBuilderTest.java:63:59:63:62 | sb34 [post update] : TextStringBuilder | provenance | MaD:607 |
+| TextStringBuilderTest.java:63:59:63:105 | new ..[] { .. } : Object[] [[]] : String | TextStringBuilderTest.java:63:59:63:62 | sb34 [post update] : TextStringBuilder | provenance | MaD:606 |
 | TextStringBuilderTest.java:63:90:63:96 | taint(...) : String | TextStringBuilderTest.java:63:59:63:105 | new ..[] { .. } : Object[] [[]] : String | provenance |  |
 | TextStringBuilderTest.java:63:113:63:116 | sb34 : TextStringBuilder | TextStringBuilderTest.java:63:113:63:127 | toString(...) | provenance | MaD:5 |
 | TextStringBuilderTest.java:63:113:63:116 | sb34 : TextStringBuilder | TextStringBuilderTest.java:63:113:63:127 | toString(...) | provenance | MaD:646 |
 | TextStringBuilderTest.java:64:59:64:62 | sb35 [post update] : TextStringBuilder | TextStringBuilderTest.java:64:95:64:98 | sb35 : TextStringBuilder | provenance |  |
-| TextStringBuilderTest.java:64:80:64:86 | taint(...) : String | TextStringBuilderTest.java:64:59:64:62 | sb35 [post update] : TextStringBuilder | provenance | MaD:591 |
+| TextStringBuilderTest.java:64:80:64:86 | taint(...) : String | TextStringBuilderTest.java:64:59:64:62 | sb35 [post update] : TextStringBuilder | provenance | MaD:590 |
 | TextStringBuilderTest.java:64:95:64:98 | sb35 : TextStringBuilder | TextStringBuilderTest.java:64:95:64:109 | toString(...) | provenance | MaD:5 |
 | TextStringBuilderTest.java:64:95:64:98 | sb35 : TextStringBuilder | TextStringBuilderTest.java:64:95:64:109 | toString(...) | provenance | MaD:646 |
 | TextStringBuilderTest.java:65:59:65:62 | sb36 [post update] : TextStringBuilder | TextStringBuilderTest.java:65:98:65:101 | sb36 : TextStringBuilder | provenance |  |
-| TextStringBuilderTest.java:65:80:65:86 | taint(...) : String | TextStringBuilderTest.java:65:59:65:62 | sb36 [post update] : TextStringBuilder | provenance | MaD:592 |
+| TextStringBuilderTest.java:65:80:65:86 | taint(...) : String | TextStringBuilderTest.java:65:59:65:62 | sb36 [post update] : TextStringBuilder | provenance | MaD:591 |
 | TextStringBuilderTest.java:65:98:65:101 | sb36 : TextStringBuilder | TextStringBuilderTest.java:65:98:65:112 | toString(...) | provenance | MaD:5 |
 | TextStringBuilderTest.java:65:98:65:101 | sb36 : TextStringBuilder | TextStringBuilderTest.java:65:98:65:112 | toString(...) | provenance | MaD:646 |
 | TextStringBuilderTest.java:66:59:66:62 | sb37 [post update] : TextStringBuilder | TextStringBuilderTest.java:66:106:66:109 | sb37 : TextStringBuilder | provenance |  |
-| TextStringBuilderTest.java:66:80:66:86 | taint(...) : String | TextStringBuilderTest.java:66:59:66:62 | sb37 [post update] : TextStringBuilder | provenance | MaD:593 |
+| TextStringBuilderTest.java:66:80:66:86 | taint(...) : String | TextStringBuilderTest.java:66:59:66:62 | sb37 [post update] : TextStringBuilder | provenance | MaD:592 |
 | TextStringBuilderTest.java:66:106:66:109 | sb37 : TextStringBuilder | TextStringBuilderTest.java:66:106:66:120 | toString(...) | provenance | MaD:5 |
 | TextStringBuilderTest.java:66:106:66:109 | sb37 : TextStringBuilder | TextStringBuilderTest.java:66:106:66:120 | toString(...) | provenance | MaD:646 |
 | TextStringBuilderTest.java:67:59:67:62 | sb38 [post update] : TextStringBuilder | TextStringBuilderTest.java:67:99:67:102 | sb38 : TextStringBuilder | provenance |  |
-| TextStringBuilderTest.java:67:84:67:90 | taint(...) : String | TextStringBuilderTest.java:67:59:67:62 | sb38 [post update] : TextStringBuilder | provenance | MaD:593 |
+| TextStringBuilderTest.java:67:84:67:90 | taint(...) : String | TextStringBuilderTest.java:67:59:67:62 | sb38 [post update] : TextStringBuilder | provenance | MaD:592 |
 | TextStringBuilderTest.java:67:99:67:102 | sb38 : TextStringBuilder | TextStringBuilderTest.java:67:99:67:113 | toString(...) | provenance | MaD:5 |
 | TextStringBuilderTest.java:67:99:67:102 | sb38 : TextStringBuilder | TextStringBuilderTest.java:67:99:67:113 | toString(...) | provenance | MaD:646 |
 | TextStringBuilderTest.java:69:64:69:68 | auxsb [post update] : TextStringBuilder | TextStringBuilderTest.java:70:63:70:67 | auxsb : TextStringBuilder | provenance |  |
-| TextStringBuilderTest.java:69:79:69:85 | taint(...) : String | TextStringBuilderTest.java:69:64:69:68 | auxsb [post update] : TextStringBuilder | provenance | MaD:604 |
+| TextStringBuilderTest.java:69:79:69:85 | taint(...) : String | TextStringBuilderTest.java:69:64:69:68 | auxsb [post update] : TextStringBuilder | provenance | MaD:603 |
 | TextStringBuilderTest.java:70:63:70:67 | auxsb : TextStringBuilder | TextStringBuilderTest.java:70:78:70:81 | sb39 [post update] : TextStringBuilder | provenance | MaD:594 |
 | TextStringBuilderTest.java:70:78:70:81 | sb39 [post update] : TextStringBuilder | TextStringBuilderTest.java:70:90:70:93 | sb39 : TextStringBuilder | provenance |  |
 | TextStringBuilderTest.java:70:90:70:93 | sb39 : TextStringBuilder | TextStringBuilderTest.java:70:90:70:104 | toString(...) | provenance | MaD:5 |
@@ -2987,80 +2961,80 @@ edges
 | TextStringBuilderTest.java:74:13:74:23 | taintedList [post update] : ArrayList [<element>] : String | TextStringBuilderTest.java:76:89:76:99 | taintedList : ArrayList [<element>] : String | provenance |  |
 | TextStringBuilderTest.java:74:29:74:35 | taint(...) : String | TextStringBuilderTest.java:74:13:74:23 | taintedList [post update] : ArrayList [<element>] : String | provenance | MaD:11 |
 | TextStringBuilderTest.java:75:63:75:66 | sb40 [post update] : TextStringBuilder | TextStringBuilderTest.java:75:114:75:117 | sb40 : TextStringBuilder | provenance |  |
-| TextStringBuilderTest.java:75:89:75:99 | taintedList : ArrayList [<element>] : String | TextStringBuilderTest.java:75:63:75:66 | sb40 [post update] : TextStringBuilder | provenance | MaD:597 |
+| TextStringBuilderTest.java:75:89:75:99 | taintedList : ArrayList [<element>] : String | TextStringBuilderTest.java:75:63:75:66 | sb40 [post update] : TextStringBuilder | provenance | MaD:595 |
 | TextStringBuilderTest.java:75:114:75:117 | sb40 : TextStringBuilder | TextStringBuilderTest.java:75:114:75:128 | toString(...) | provenance | MaD:5 |
 | TextStringBuilderTest.java:75:114:75:117 | sb40 : TextStringBuilder | TextStringBuilderTest.java:75:114:75:128 | toString(...) | provenance | MaD:646 |
 | TextStringBuilderTest.java:76:63:76:66 | sb41 [post update] : TextStringBuilder | TextStringBuilderTest.java:76:125:76:128 | sb41 : TextStringBuilder | provenance |  |
 | TextStringBuilderTest.java:76:89:76:99 | taintedList : ArrayList [<element>] : String | TextStringBuilderTest.java:76:89:76:110 | iterator(...) : Iterator [<element>] : String | provenance | MaD:6 |
-| TextStringBuilderTest.java:76:89:76:110 | iterator(...) : Iterator [<element>] : String | TextStringBuilderTest.java:76:63:76:66 | sb41 [post update] : TextStringBuilder | provenance | MaD:598 |
+| TextStringBuilderTest.java:76:89:76:110 | iterator(...) : Iterator [<element>] : String | TextStringBuilderTest.java:76:63:76:66 | sb41 [post update] : TextStringBuilder | provenance | MaD:596 |
 | TextStringBuilderTest.java:76:125:76:128 | sb41 : TextStringBuilder | TextStringBuilderTest.java:76:125:76:139 | toString(...) | provenance | MaD:5 |
 | TextStringBuilderTest.java:76:125:76:128 | sb41 : TextStringBuilder | TextStringBuilderTest.java:76:125:76:139 | toString(...) | provenance | MaD:646 |
 | TextStringBuilderTest.java:78:63:78:66 | sb42 [post update] : TextStringBuilder | TextStringBuilderTest.java:78:119:78:122 | sb42 : TextStringBuilder | provenance |  |
-| TextStringBuilderTest.java:78:104:78:110 | taint(...) : String | TextStringBuilderTest.java:78:63:78:66 | sb42 [post update] : TextStringBuilder | provenance | MaD:596 |
+| TextStringBuilderTest.java:78:104:78:110 | taint(...) : String | TextStringBuilderTest.java:78:63:78:66 | sb42 [post update] : TextStringBuilder | provenance | MaD:598 |
 | TextStringBuilderTest.java:78:119:78:122 | sb42 : TextStringBuilder | TextStringBuilderTest.java:78:119:78:133 | toString(...) | provenance | MaD:5 |
 | TextStringBuilderTest.java:78:119:78:122 | sb42 : TextStringBuilder | TextStringBuilderTest.java:78:119:78:133 | toString(...) | provenance | MaD:646 |
 | TextStringBuilderTest.java:79:63:79:66 | sb43 [post update] : TextStringBuilder | TextStringBuilderTest.java:79:130:79:133 | sb43 : TextStringBuilder | provenance |  |
-| TextStringBuilderTest.java:79:115:79:121 | taint(...) : String | TextStringBuilderTest.java:79:63:79:66 | sb43 [post update] : TextStringBuilder | provenance | MaD:596 |
+| TextStringBuilderTest.java:79:115:79:121 | taint(...) : String | TextStringBuilderTest.java:79:63:79:66 | sb43 [post update] : TextStringBuilder | provenance | MaD:598 |
 | TextStringBuilderTest.java:79:130:79:133 | sb43 : TextStringBuilder | TextStringBuilderTest.java:79:130:79:144 | toString(...) | provenance | MaD:5 |
 | TextStringBuilderTest.java:79:130:79:133 | sb43 : TextStringBuilder | TextStringBuilderTest.java:79:130:79:144 | toString(...) | provenance | MaD:646 |
 | TextStringBuilderTest.java:80:37:80:60 | {...} : String[] [[]] : String | TextStringBuilderTest.java:82:89:82:100 | taintedArray : String[] [[]] : String | provenance |  |
 | TextStringBuilderTest.java:80:52:80:58 | taint(...) : String | TextStringBuilderTest.java:80:37:80:60 | {...} : String[] [[]] : String | provenance |  |
 | TextStringBuilderTest.java:82:63:82:66 | sb44 [post update] : TextStringBuilder | TextStringBuilderTest.java:82:115:82:118 | sb44 : TextStringBuilder | provenance |  |
-| TextStringBuilderTest.java:82:89:82:100 | taintedArray : String[] [[]] : String | TextStringBuilderTest.java:82:63:82:66 | sb44 [post update] : TextStringBuilder | provenance | MaD:599 |
+| TextStringBuilderTest.java:82:89:82:100 | taintedArray : String[] [[]] : String | TextStringBuilderTest.java:82:63:82:66 | sb44 [post update] : TextStringBuilder | provenance | MaD:597 |
 | TextStringBuilderTest.java:82:115:82:118 | sb44 : TextStringBuilder | TextStringBuilderTest.java:82:115:82:129 | toString(...) | provenance | MaD:5 |
 | TextStringBuilderTest.java:82:115:82:118 | sb44 : TextStringBuilder | TextStringBuilderTest.java:82:115:82:129 | toString(...) | provenance | MaD:646 |
 | TextStringBuilderTest.java:83:63:83:66 | sb45 [post update] : TextStringBuilder | TextStringBuilderTest.java:83:120:83:123 | sb45 : TextStringBuilder | provenance |  |
-| TextStringBuilderTest.java:83:105:83:111 | taint(...) : String | TextStringBuilderTest.java:83:63:83:66 | sb45 [post update] : TextStringBuilder | provenance | MaD:596 |
+| TextStringBuilderTest.java:83:105:83:111 | taint(...) : String | TextStringBuilderTest.java:83:63:83:66 | sb45 [post update] : TextStringBuilder | provenance | MaD:598 |
 | TextStringBuilderTest.java:83:120:83:123 | sb45 : TextStringBuilder | TextStringBuilderTest.java:83:120:83:134 | toString(...) | provenance | MaD:5 |
 | TextStringBuilderTest.java:83:120:83:123 | sb45 : TextStringBuilder | TextStringBuilderTest.java:83:120:83:134 | toString(...) | provenance | MaD:646 |
 | TextStringBuilderTest.java:86:63:86:66 | sb46 [post update] : TextStringBuilder | TextStringBuilderTest.java:88:13:88:16 | sb46 : TextStringBuilder | provenance |  |
-| TextStringBuilderTest.java:86:75:86:81 | taint(...) : String | TextStringBuilderTest.java:86:63:86:66 | sb46 [post update] : TextStringBuilder | provenance | MaD:568 |
+| TextStringBuilderTest.java:86:75:86:81 | taint(...) : String | TextStringBuilderTest.java:86:63:86:66 | sb46 [post update] : TextStringBuilder | provenance | MaD:567 |
 | TextStringBuilderTest.java:88:13:88:16 | sb46 : TextStringBuilder | TextStringBuilderTest.java:88:13:88:27 | asReader(...) : Reader | provenance | MaD:613 |
 | TextStringBuilderTest.java:88:13:88:27 | asReader(...) : Reader | TextStringBuilderTest.java:88:34:88:39 | target [post update] : char[] | provenance | MaD:1 |
 | TextStringBuilderTest.java:88:34:88:39 | target [post update] : char[] | TextStringBuilderTest.java:89:18:89:23 | target | provenance |  |
 | TextStringBuilderTest.java:91:59:91:62 | sb47 [post update] : TextStringBuilder | TextStringBuilderTest.java:91:86:91:89 | sb47 : TextStringBuilder | provenance |  |
-| TextStringBuilderTest.java:91:71:91:77 | taint(...) : String | TextStringBuilderTest.java:91:59:91:62 | sb47 [post update] : TextStringBuilder | provenance | MaD:568 |
+| TextStringBuilderTest.java:91:71:91:77 | taint(...) : String | TextStringBuilderTest.java:91:59:91:62 | sb47 [post update] : TextStringBuilder | provenance | MaD:567 |
 | TextStringBuilderTest.java:91:86:91:89 | sb47 : TextStringBuilder | TextStringBuilderTest.java:91:86:91:103 | asTokenizer(...) : StringTokenizer | provenance | MaD:614 |
 | TextStringBuilderTest.java:91:86:91:103 | asTokenizer(...) : StringTokenizer | TextStringBuilderTest.java:91:86:91:110 | next(...) | provenance | MaD:13 |
 | TextStringBuilderTest.java:91:86:91:103 | asTokenizer(...) : StringTokenizer | TextStringBuilderTest.java:91:86:91:110 | next(...) | provenance | MaD:554 |
 | TextStringBuilderTest.java:92:59:92:62 | sb48 [post update] : TextStringBuilder | TextStringBuilderTest.java:92:86:92:89 | sb48 : TextStringBuilder | provenance |  |
-| TextStringBuilderTest.java:92:71:92:77 | taint(...) : String | TextStringBuilderTest.java:92:59:92:62 | sb48 [post update] : TextStringBuilder | provenance | MaD:568 |
+| TextStringBuilderTest.java:92:71:92:77 | taint(...) : String | TextStringBuilderTest.java:92:59:92:62 | sb48 [post update] : TextStringBuilder | provenance | MaD:567 |
 | TextStringBuilderTest.java:92:86:92:89 | sb48 : TextStringBuilder | TextStringBuilderTest.java:92:86:92:97 | build(...) | provenance | MaD:615 |
 | TextStringBuilderTest.java:93:59:93:62 | sb49 [post update] : TextStringBuilder | TextStringBuilderTest.java:93:86:93:89 | sb49 : TextStringBuilder | provenance |  |
-| TextStringBuilderTest.java:93:71:93:77 | taint(...) : String | TextStringBuilderTest.java:93:59:93:62 | sb49 [post update] : TextStringBuilder | provenance | MaD:568 |
+| TextStringBuilderTest.java:93:71:93:77 | taint(...) : String | TextStringBuilderTest.java:93:59:93:62 | sb49 [post update] : TextStringBuilder | provenance | MaD:567 |
 | TextStringBuilderTest.java:93:86:93:89 | sb49 : TextStringBuilder | TextStringBuilderTest.java:93:86:93:104 | getChars(...) | provenance | MaD:622 |
 | TextStringBuilderTest.java:95:63:95:66 | sb50 [post update] : TextStringBuilder | TextStringBuilderTest.java:97:13:97:16 | sb50 : TextStringBuilder | provenance |  |
-| TextStringBuilderTest.java:95:75:95:81 | taint(...) : String | TextStringBuilderTest.java:95:63:95:66 | sb50 [post update] : TextStringBuilder | provenance | MaD:568 |
+| TextStringBuilderTest.java:95:75:95:81 | taint(...) : String | TextStringBuilderTest.java:95:63:95:66 | sb50 [post update] : TextStringBuilder | provenance | MaD:567 |
 | TextStringBuilderTest.java:97:13:97:16 | sb50 : TextStringBuilder | TextStringBuilderTest.java:97:27:97:32 | target [post update] : char[] | provenance | MaD:621 |
 | TextStringBuilderTest.java:97:27:97:32 | target [post update] : char[] | TextStringBuilderTest.java:98:18:98:23 | target | provenance |  |
 | TextStringBuilderTest.java:101:63:101:66 | sb51 [post update] : TextStringBuilder | TextStringBuilderTest.java:103:13:103:16 | sb51 : TextStringBuilder | provenance |  |
-| TextStringBuilderTest.java:101:75:101:81 | taint(...) : String | TextStringBuilderTest.java:101:63:101:66 | sb51 [post update] : TextStringBuilder | provenance | MaD:568 |
+| TextStringBuilderTest.java:101:75:101:81 | taint(...) : String | TextStringBuilderTest.java:101:63:101:66 | sb51 [post update] : TextStringBuilder | provenance | MaD:567 |
 | TextStringBuilderTest.java:103:13:103:16 | sb51 : TextStringBuilder | TextStringBuilderTest.java:103:33:103:38 | target [post update] : char[] | provenance | MaD:623 |
 | TextStringBuilderTest.java:103:33:103:38 | target [post update] : char[] | TextStringBuilderTest.java:104:18:104:23 | target | provenance |  |
 | TextStringBuilderTest.java:106:59:106:62 | sb52 [post update] : TextStringBuilder | TextStringBuilderTest.java:106:103:106:106 | sb52 : TextStringBuilder | provenance |  |
 | TextStringBuilderTest.java:106:74:106:80 | taint(...) : String | TextStringBuilderTest.java:106:74:106:94 | toCharArray(...) : char[] | provenance | MaD:7 |
-| TextStringBuilderTest.java:106:74:106:94 | toCharArray(...) : char[] | TextStringBuilderTest.java:106:59:106:62 | sb52 [post update] : TextStringBuilder | provenance | MaD:625 |
+| TextStringBuilderTest.java:106:74:106:94 | toCharArray(...) : char[] | TextStringBuilderTest.java:106:59:106:62 | sb52 [post update] : TextStringBuilder | provenance | MaD:624 |
 | TextStringBuilderTest.java:106:103:106:106 | sb52 : TextStringBuilder | TextStringBuilderTest.java:106:103:106:117 | toString(...) | provenance | MaD:5 |
 | TextStringBuilderTest.java:106:103:106:106 | sb52 : TextStringBuilder | TextStringBuilderTest.java:106:103:106:117 | toString(...) | provenance | MaD:646 |
 | TextStringBuilderTest.java:107:59:107:62 | sb53 [post update] : TextStringBuilder | TextStringBuilderTest.java:107:109:107:112 | sb53 : TextStringBuilder | provenance |  |
 | TextStringBuilderTest.java:107:74:107:80 | taint(...) : String | TextStringBuilderTest.java:107:74:107:94 | toCharArray(...) : char[] | provenance | MaD:7 |
-| TextStringBuilderTest.java:107:74:107:94 | toCharArray(...) : char[] | TextStringBuilderTest.java:107:59:107:62 | sb53 [post update] : TextStringBuilder | provenance | MaD:625 |
+| TextStringBuilderTest.java:107:74:107:94 | toCharArray(...) : char[] | TextStringBuilderTest.java:107:59:107:62 | sb53 [post update] : TextStringBuilder | provenance | MaD:624 |
 | TextStringBuilderTest.java:107:109:107:112 | sb53 : TextStringBuilder | TextStringBuilderTest.java:107:109:107:123 | toString(...) | provenance | MaD:5 |
 | TextStringBuilderTest.java:107:109:107:112 | sb53 : TextStringBuilder | TextStringBuilderTest.java:107:109:107:123 | toString(...) | provenance | MaD:646 |
 | TextStringBuilderTest.java:108:59:108:62 | sb54 [post update] : TextStringBuilder | TextStringBuilderTest.java:108:89:108:92 | sb54 : TextStringBuilder | provenance |  |
-| TextStringBuilderTest.java:108:74:108:80 | taint(...) : String | TextStringBuilderTest.java:108:59:108:62 | sb54 [post update] : TextStringBuilder | provenance | MaD:625 |
+| TextStringBuilderTest.java:108:74:108:80 | taint(...) : String | TextStringBuilderTest.java:108:59:108:62 | sb54 [post update] : TextStringBuilder | provenance | MaD:624 |
 | TextStringBuilderTest.java:108:89:108:92 | sb54 : TextStringBuilder | TextStringBuilderTest.java:108:89:108:103 | toString(...) | provenance | MaD:5 |
 | TextStringBuilderTest.java:108:89:108:92 | sb54 : TextStringBuilder | TextStringBuilderTest.java:108:89:108:103 | toString(...) | provenance | MaD:646 |
 | TextStringBuilderTest.java:109:59:109:62 | sb55 [post update] : TextStringBuilder | TextStringBuilderTest.java:109:97:109:100 | sb55 : TextStringBuilder | provenance |  |
-| TextStringBuilderTest.java:109:74:109:88 | (...)... : String | TextStringBuilderTest.java:109:59:109:62 | sb55 [post update] : TextStringBuilder | provenance | MaD:625 |
+| TextStringBuilderTest.java:109:74:109:88 | (...)... : String | TextStringBuilderTest.java:109:59:109:62 | sb55 [post update] : TextStringBuilder | provenance | MaD:624 |
 | TextStringBuilderTest.java:109:82:109:88 | taint(...) : String | TextStringBuilderTest.java:109:74:109:88 | (...)... : String | provenance |  |
 | TextStringBuilderTest.java:109:97:109:100 | sb55 : TextStringBuilder | TextStringBuilderTest.java:109:97:109:111 | toString(...) | provenance | MaD:5 |
 | TextStringBuilderTest.java:109:97:109:100 | sb55 : TextStringBuilder | TextStringBuilderTest.java:109:97:109:111 | toString(...) | provenance | MaD:646 |
 | TextStringBuilderTest.java:110:59:110:62 | sb56 [post update] : TextStringBuilder | TextStringBuilderTest.java:110:86:110:89 | sb56 : TextStringBuilder | provenance |  |
-| TextStringBuilderTest.java:110:71:110:77 | taint(...) : String | TextStringBuilderTest.java:110:59:110:62 | sb56 [post update] : TextStringBuilder | provenance | MaD:568 |
+| TextStringBuilderTest.java:110:71:110:77 | taint(...) : String | TextStringBuilderTest.java:110:59:110:62 | sb56 [post update] : TextStringBuilder | provenance | MaD:567 |
 | TextStringBuilderTest.java:110:86:110:89 | sb56 : TextStringBuilder | TextStringBuilderTest.java:110:86:110:103 | leftString(...) | provenance | MaD:626 |
 | TextStringBuilderTest.java:111:59:111:62 | sb57 [post update] : TextStringBuilder | TextStringBuilderTest.java:111:86:111:89 | sb57 : TextStringBuilder | provenance |  |
-| TextStringBuilderTest.java:111:71:111:77 | taint(...) : String | TextStringBuilderTest.java:111:59:111:62 | sb57 [post update] : TextStringBuilder | provenance | MaD:568 |
+| TextStringBuilderTest.java:111:71:111:77 | taint(...) : String | TextStringBuilderTest.java:111:59:111:62 | sb57 [post update] : TextStringBuilder | provenance | MaD:567 |
 | TextStringBuilderTest.java:111:86:111:89 | sb57 : TextStringBuilder | TextStringBuilderTest.java:111:86:111:105 | midString(...) | provenance | MaD:627 |
 | TextStringBuilderTest.java:113:35:113:59 | new StringReader(...) : StringReader | TextStringBuilderTest.java:114:77:114:82 | reader : StringReader | provenance |  |
 | TextStringBuilderTest.java:113:52:113:58 | taint(...) : String | TextStringBuilderTest.java:113:35:113:59 | new StringReader(...) : StringReader | provenance | MaD:2 |
@@ -3069,88 +3043,88 @@ edges
 | TextStringBuilderTest.java:114:91:114:94 | sb58 : TextStringBuilder | TextStringBuilderTest.java:114:91:114:105 | toString(...) | provenance | MaD:5 |
 | TextStringBuilderTest.java:114:91:114:94 | sb58 : TextStringBuilder | TextStringBuilderTest.java:114:91:114:105 | toString(...) | provenance | MaD:646 |
 | TextStringBuilderTest.java:116:59:116:62 | sb59 [post update] : TextStringBuilder | TextStringBuilderTest.java:116:93:116:96 | sb59 : TextStringBuilder | provenance |  |
-| TextStringBuilderTest.java:116:78:116:84 | taint(...) : String | TextStringBuilderTest.java:116:59:116:62 | sb59 [post update] : TextStringBuilder | provenance | MaD:631 |
+| TextStringBuilderTest.java:116:78:116:84 | taint(...) : String | TextStringBuilderTest.java:116:59:116:62 | sb59 [post update] : TextStringBuilder | provenance | MaD:630 |
 | TextStringBuilderTest.java:116:93:116:96 | sb59 : TextStringBuilder | TextStringBuilderTest.java:116:93:116:107 | toString(...) | provenance | MaD:5 |
 | TextStringBuilderTest.java:116:93:116:96 | sb59 : TextStringBuilder | TextStringBuilderTest.java:116:93:116:107 | toString(...) | provenance | MaD:646 |
 | TextStringBuilderTest.java:117:59:117:62 | sb60 [post update] : TextStringBuilder | TextStringBuilderTest.java:117:102:117:105 | sb60 : TextStringBuilder | provenance |  |
-| TextStringBuilderTest.java:117:78:117:84 | taint(...) : String | TextStringBuilderTest.java:117:59:117:62 | sb60 [post update] : TextStringBuilder | provenance | MaD:632 |
+| TextStringBuilderTest.java:117:78:117:84 | taint(...) : String | TextStringBuilderTest.java:117:59:117:62 | sb60 [post update] : TextStringBuilder | provenance | MaD:631 |
 | TextStringBuilderTest.java:117:102:117:105 | sb60 : TextStringBuilder | TextStringBuilderTest.java:117:102:117:116 | toString(...) | provenance | MaD:5 |
 | TextStringBuilderTest.java:117:102:117:105 | sb60 : TextStringBuilder | TextStringBuilderTest.java:117:102:117:116 | toString(...) | provenance | MaD:646 |
 | TextStringBuilderTest.java:118:59:118:62 | sb61 [post update] : TextStringBuilder | TextStringBuilderTest.java:118:111:118:114 | sb61 : TextStringBuilder | provenance |  |
-| TextStringBuilderTest.java:118:96:118:102 | taint(...) : String | TextStringBuilderTest.java:118:59:118:62 | sb61 [post update] : TextStringBuilder | provenance | MaD:634 |
+| TextStringBuilderTest.java:118:96:118:102 | taint(...) : String | TextStringBuilderTest.java:118:59:118:62 | sb61 [post update] : TextStringBuilder | provenance | MaD:633 |
 | TextStringBuilderTest.java:118:111:118:114 | sb61 : TextStringBuilder | TextStringBuilderTest.java:118:111:118:125 | toString(...) | provenance | MaD:5 |
 | TextStringBuilderTest.java:118:111:118:114 | sb61 : TextStringBuilder | TextStringBuilderTest.java:118:111:118:125 | toString(...) | provenance | MaD:646 |
 | TextStringBuilderTest.java:119:59:119:62 | sb62 [post update] : TextStringBuilder | TextStringBuilderTest.java:119:100:119:103 | sb62 : TextStringBuilder | provenance |  |
-| TextStringBuilderTest.java:119:85:119:91 | taint(...) : String | TextStringBuilderTest.java:119:59:119:62 | sb62 [post update] : TextStringBuilder | provenance | MaD:634 |
+| TextStringBuilderTest.java:119:85:119:91 | taint(...) : String | TextStringBuilderTest.java:119:59:119:62 | sb62 [post update] : TextStringBuilder | provenance | MaD:633 |
 | TextStringBuilderTest.java:119:100:119:103 | sb62 : TextStringBuilder | TextStringBuilderTest.java:119:100:119:114 | toString(...) | provenance | MaD:5 |
 | TextStringBuilderTest.java:119:100:119:103 | sb62 : TextStringBuilder | TextStringBuilderTest.java:119:100:119:114 | toString(...) | provenance | MaD:646 |
 | TextStringBuilderTest.java:121:59:121:62 | sb64 [post update] : TextStringBuilder | TextStringBuilderTest.java:121:113:121:116 | sb64 : TextStringBuilder | provenance |  |
-| TextStringBuilderTest.java:121:98:121:104 | taint(...) : String | TextStringBuilderTest.java:121:59:121:62 | sb64 [post update] : TextStringBuilder | provenance | MaD:636 |
+| TextStringBuilderTest.java:121:98:121:104 | taint(...) : String | TextStringBuilderTest.java:121:59:121:62 | sb64 [post update] : TextStringBuilder | provenance | MaD:635 |
 | TextStringBuilderTest.java:121:113:121:116 | sb64 : TextStringBuilder | TextStringBuilderTest.java:121:113:121:127 | toString(...) | provenance | MaD:5 |
 | TextStringBuilderTest.java:121:113:121:116 | sb64 : TextStringBuilder | TextStringBuilderTest.java:121:113:121:127 | toString(...) | provenance | MaD:646 |
 | TextStringBuilderTest.java:122:59:122:62 | sb65 [post update] : TextStringBuilder | TextStringBuilderTest.java:122:102:122:105 | sb65 : TextStringBuilder | provenance |  |
-| TextStringBuilderTest.java:122:87:122:93 | taint(...) : String | TextStringBuilderTest.java:122:59:122:62 | sb65 [post update] : TextStringBuilder | provenance | MaD:636 |
+| TextStringBuilderTest.java:122:87:122:93 | taint(...) : String | TextStringBuilderTest.java:122:59:122:62 | sb65 [post update] : TextStringBuilder | provenance | MaD:635 |
 | TextStringBuilderTest.java:122:102:122:105 | sb65 : TextStringBuilder | TextStringBuilderTest.java:122:102:122:116 | toString(...) | provenance | MaD:5 |
 | TextStringBuilderTest.java:122:102:122:105 | sb65 : TextStringBuilder | TextStringBuilderTest.java:122:102:122:116 | toString(...) | provenance | MaD:646 |
 | TextStringBuilderTest.java:124:59:124:62 | sb67 [post update] : TextStringBuilder | TextStringBuilderTest.java:124:86:124:89 | sb67 : TextStringBuilder | provenance |  |
-| TextStringBuilderTest.java:124:71:124:77 | taint(...) : String | TextStringBuilderTest.java:124:59:124:62 | sb67 [post update] : TextStringBuilder | provenance | MaD:568 |
+| TextStringBuilderTest.java:124:71:124:77 | taint(...) : String | TextStringBuilderTest.java:124:59:124:62 | sb67 [post update] : TextStringBuilder | provenance | MaD:567 |
 | TextStringBuilderTest.java:124:86:124:89 | sb67 : TextStringBuilder | TextStringBuilderTest.java:124:86:124:104 | rightString(...) | provenance | MaD:638 |
 | TextStringBuilderTest.java:125:59:125:62 | sb68 [post update] : TextStringBuilder | TextStringBuilderTest.java:125:86:125:89 | sb68 : TextStringBuilder | provenance |  |
-| TextStringBuilderTest.java:125:71:125:77 | taint(...) : String | TextStringBuilderTest.java:125:59:125:62 | sb68 [post update] : TextStringBuilder | provenance | MaD:568 |
+| TextStringBuilderTest.java:125:71:125:77 | taint(...) : String | TextStringBuilderTest.java:125:59:125:62 | sb68 [post update] : TextStringBuilder | provenance | MaD:567 |
 | TextStringBuilderTest.java:125:86:125:89 | sb68 : TextStringBuilder | TextStringBuilderTest.java:125:86:125:107 | subSequence(...) | provenance | MaD:4 |
 | TextStringBuilderTest.java:125:86:125:89 | sb68 : TextStringBuilder | TextStringBuilderTest.java:125:86:125:107 | subSequence(...) | provenance | MaD:643 |
 | TextStringBuilderTest.java:126:59:126:62 | sb69 [post update] : TextStringBuilder | TextStringBuilderTest.java:126:86:126:89 | sb69 : TextStringBuilder | provenance |  |
-| TextStringBuilderTest.java:126:71:126:77 | taint(...) : String | TextStringBuilderTest.java:126:59:126:62 | sb69 [post update] : TextStringBuilder | provenance | MaD:568 |
+| TextStringBuilderTest.java:126:71:126:77 | taint(...) : String | TextStringBuilderTest.java:126:59:126:62 | sb69 [post update] : TextStringBuilder | provenance | MaD:567 |
 | TextStringBuilderTest.java:126:86:126:89 | sb69 : TextStringBuilder | TextStringBuilderTest.java:126:86:126:102 | substring(...) | provenance | MaD:644 |
 | TextStringBuilderTest.java:127:59:127:62 | sb70 [post update] : TextStringBuilder | TextStringBuilderTest.java:127:86:127:89 | sb70 : TextStringBuilder | provenance |  |
-| TextStringBuilderTest.java:127:71:127:77 | taint(...) : String | TextStringBuilderTest.java:127:59:127:62 | sb70 [post update] : TextStringBuilder | provenance | MaD:568 |
+| TextStringBuilderTest.java:127:71:127:77 | taint(...) : String | TextStringBuilderTest.java:127:59:127:62 | sb70 [post update] : TextStringBuilder | provenance | MaD:567 |
 | TextStringBuilderTest.java:127:86:127:89 | sb70 : TextStringBuilder | TextStringBuilderTest.java:127:86:127:105 | substring(...) | provenance | MaD:644 |
 | TextStringBuilderTest.java:128:59:128:62 | sb71 [post update] : TextStringBuilder | TextStringBuilderTest.java:128:86:128:89 | sb71 : TextStringBuilder | provenance |  |
-| TextStringBuilderTest.java:128:71:128:77 | taint(...) : String | TextStringBuilderTest.java:128:59:128:62 | sb71 [post update] : TextStringBuilder | provenance | MaD:568 |
+| TextStringBuilderTest.java:128:71:128:77 | taint(...) : String | TextStringBuilderTest.java:128:59:128:62 | sb71 [post update] : TextStringBuilder | provenance | MaD:567 |
 | TextStringBuilderTest.java:128:86:128:89 | sb71 : TextStringBuilder | TextStringBuilderTest.java:128:86:128:103 | toCharArray(...) | provenance | MaD:645 |
 | TextStringBuilderTest.java:129:59:129:62 | sb72 [post update] : TextStringBuilder | TextStringBuilderTest.java:129:86:129:89 | sb72 : TextStringBuilder | provenance |  |
-| TextStringBuilderTest.java:129:71:129:77 | taint(...) : String | TextStringBuilderTest.java:129:59:129:62 | sb72 [post update] : TextStringBuilder | provenance | MaD:568 |
+| TextStringBuilderTest.java:129:71:129:77 | taint(...) : String | TextStringBuilderTest.java:129:59:129:62 | sb72 [post update] : TextStringBuilder | provenance | MaD:567 |
 | TextStringBuilderTest.java:129:86:129:89 | sb72 : TextStringBuilder | TextStringBuilderTest.java:129:86:129:107 | toCharArray(...) | provenance | MaD:645 |
 | TextStringBuilderTest.java:130:59:130:62 | sb73 [post update] : TextStringBuilder | TextStringBuilderTest.java:130:86:130:89 | sb73 : TextStringBuilder | provenance |  |
-| TextStringBuilderTest.java:130:71:130:77 | taint(...) : String | TextStringBuilderTest.java:130:59:130:62 | sb73 [post update] : TextStringBuilder | provenance | MaD:568 |
+| TextStringBuilderTest.java:130:71:130:77 | taint(...) : String | TextStringBuilderTest.java:130:59:130:62 | sb73 [post update] : TextStringBuilder | provenance | MaD:567 |
 | TextStringBuilderTest.java:130:86:130:89 | sb73 : TextStringBuilder | TextStringBuilderTest.java:130:86:130:106 | toStringBuffer(...) | provenance | MaD:647 |
 | TextStringBuilderTest.java:131:59:131:62 | sb74 [post update] : TextStringBuilder | TextStringBuilderTest.java:131:86:131:89 | sb74 : TextStringBuilder | provenance |  |
-| TextStringBuilderTest.java:131:71:131:77 | taint(...) : String | TextStringBuilderTest.java:131:59:131:62 | sb74 [post update] : TextStringBuilder | provenance | MaD:568 |
+| TextStringBuilderTest.java:131:71:131:77 | taint(...) : String | TextStringBuilderTest.java:131:59:131:62 | sb74 [post update] : TextStringBuilder | provenance | MaD:567 |
 | TextStringBuilderTest.java:131:86:131:89 | sb74 : TextStringBuilder | TextStringBuilderTest.java:131:86:131:107 | toStringBuilder(...) | provenance | MaD:648 |
-| TextStringBuilderTest.java:136:14:136:58 | append(...) : TextStringBuilder | TextStringBuilderTest.java:136:14:136:82 | append(...) : TextStringBuilder | provenance | MaD:562 |
+| TextStringBuilderTest.java:136:14:136:58 | append(...) : TextStringBuilder | TextStringBuilderTest.java:136:14:136:82 | append(...) : TextStringBuilder | provenance | MaD:578 |
 | TextStringBuilderTest.java:136:14:136:82 | append(...) : TextStringBuilder | TextStringBuilderTest.java:136:14:136:93 | toString(...) | provenance | MaD:5 |
 | TextStringBuilderTest.java:136:14:136:82 | append(...) : TextStringBuilder | TextStringBuilderTest.java:136:14:136:93 | toString(...) | provenance | MaD:646 |
-| TextStringBuilderTest.java:136:51:136:57 | taint(...) : String | TextStringBuilderTest.java:136:14:136:58 | append(...) : TextStringBuilder | provenance | MaD:568+MaD:562 |
-| TextStringBuilderTest.java:139:9:139:45 | append(...) [post update] : TextStringBuilder | TextStringBuilderTest.java:140:14:140:31 | fluentBackflowTest : TextStringBuilder | provenance | MaD:562 |
-| TextStringBuilderTest.java:139:54:139:60 | taint(...) : String | TextStringBuilderTest.java:139:9:139:45 | append(...) [post update] : TextStringBuilder | provenance | MaD:568 |
+| TextStringBuilderTest.java:136:51:136:57 | taint(...) : String | TextStringBuilderTest.java:136:14:136:58 | append(...) : TextStringBuilder | provenance | MaD:567+MaD:578 |
+| TextStringBuilderTest.java:139:9:139:45 | append(...) [post update] : TextStringBuilder | TextStringBuilderTest.java:140:14:140:31 | fluentBackflowTest : TextStringBuilder | provenance | MaD:578 |
+| TextStringBuilderTest.java:139:54:139:60 | taint(...) : String | TextStringBuilderTest.java:139:9:139:45 | append(...) [post update] : TextStringBuilder | provenance | MaD:567 |
 | TextStringBuilderTest.java:140:14:140:31 | fluentBackflowTest : TextStringBuilder | TextStringBuilderTest.java:140:14:140:42 | toString(...) | provenance | MaD:5 |
 | TextStringBuilderTest.java:140:14:140:31 | fluentBackflowTest : TextStringBuilder | TextStringBuilderTest.java:140:14:140:42 | toString(...) | provenance | MaD:646 |
-| TextStringBuilderTest.java:144:9:144:46 | append(...) [post update] : TextStringBuilder | TextStringBuilderTest.java:145:14:145:32 | fluentBackflowTest2 : TextStringBuilder | provenance | MaD:562 |
-| TextStringBuilderTest.java:144:55:144:61 | taint(...) : String | TextStringBuilderTest.java:144:9:144:46 | append(...) [post update] : TextStringBuilder | provenance | MaD:568 |
+| TextStringBuilderTest.java:144:9:144:46 | append(...) [post update] : TextStringBuilder | TextStringBuilderTest.java:145:14:145:32 | fluentBackflowTest2 : TextStringBuilder | provenance | MaD:578 |
+| TextStringBuilderTest.java:144:55:144:61 | taint(...) : String | TextStringBuilderTest.java:144:9:144:46 | append(...) [post update] : TextStringBuilder | provenance | MaD:567 |
 | TextStringBuilderTest.java:145:14:145:32 | fluentBackflowTest2 : TextStringBuilder | TextStringBuilderTest.java:145:14:145:43 | toString(...) | provenance | MaD:5 |
 | TextStringBuilderTest.java:145:14:145:32 | fluentBackflowTest2 : TextStringBuilder | TextStringBuilderTest.java:145:14:145:43 | toString(...) | provenance | MaD:646 |
 | TextStringBuilderTest.java:148:50:148:79 | new TextStringBuilder(...) : TextStringBuilder | TextStringBuilderTest.java:149:14:149:33 | fluentAllMethodsTest : TextStringBuilder | provenance |  |
 | TextStringBuilderTest.java:148:72:148:78 | taint(...) : String | TextStringBuilderTest.java:148:50:148:79 | new TextStringBuilder(...) : TextStringBuilder | provenance | MaD:561 |
-| TextStringBuilderTest.java:149:14:149:33 | fluentAllMethodsTest : TextStringBuilder | TextStringBuilderTest.java:149:14:150:23 | append(...) : TextStringBuilder | provenance | MaD:562 |
-| TextStringBuilderTest.java:149:14:150:23 | append(...) : TextStringBuilder | TextStringBuilderTest.java:149:14:151:26 | appendAll(...) : TextStringBuilder | provenance | MaD:579 |
-| TextStringBuilderTest.java:149:14:151:26 | appendAll(...) : TextStringBuilder | TextStringBuilderTest.java:149:14:152:48 | appendFixedWidthPadLeft(...) : TextStringBuilder | provenance | MaD:583 |
-| TextStringBuilderTest.java:149:14:152:48 | appendFixedWidthPadLeft(...) : TextStringBuilder | TextStringBuilderTest.java:149:14:153:49 | appendFixedWidthPadRight(...) : TextStringBuilder | provenance | MaD:585 |
-| TextStringBuilderTest.java:149:14:153:49 | appendFixedWidthPadRight(...) : TextStringBuilder | TextStringBuilderTest.java:149:14:154:25 | appendln(...) : TextStringBuilder | provenance | MaD:600 |
+| TextStringBuilderTest.java:149:14:149:33 | fluentAllMethodsTest : TextStringBuilder | TextStringBuilderTest.java:149:14:150:23 | append(...) : TextStringBuilder | provenance | MaD:578 |
+| TextStringBuilderTest.java:149:14:150:23 | append(...) : TextStringBuilder | TextStringBuilderTest.java:149:14:151:26 | appendAll(...) : TextStringBuilder | provenance | MaD:582 |
+| TextStringBuilderTest.java:149:14:151:26 | appendAll(...) : TextStringBuilder | TextStringBuilderTest.java:149:14:152:48 | appendFixedWidthPadLeft(...) : TextStringBuilder | provenance | MaD:584 |
+| TextStringBuilderTest.java:149:14:152:48 | appendFixedWidthPadLeft(...) : TextStringBuilder | TextStringBuilderTest.java:149:14:153:49 | appendFixedWidthPadRight(...) : TextStringBuilder | provenance | MaD:586 |
+| TextStringBuilderTest.java:149:14:153:49 | appendFixedWidthPadRight(...) : TextStringBuilder | TextStringBuilderTest.java:149:14:154:25 | appendln(...) : TextStringBuilder | provenance | MaD:612 |
 | TextStringBuilderTest.java:149:14:154:25 | appendln(...) : TextStringBuilder | TextStringBuilderTest.java:149:14:155:24 | appendNewLine(...) : TextStringBuilder | provenance | MaD:587 |
 | TextStringBuilderTest.java:149:14:155:24 | appendNewLine(...) : TextStringBuilder | TextStringBuilderTest.java:149:14:156:21 | appendNull(...) : TextStringBuilder | provenance | MaD:588 |
 | TextStringBuilderTest.java:149:14:156:21 | appendNull(...) : TextStringBuilder | TextStringBuilderTest.java:149:14:157:30 | appendPadding(...) : TextStringBuilder | provenance | MaD:589 |
-| TextStringBuilderTest.java:149:14:157:30 | appendPadding(...) : TextStringBuilder | TextStringBuilderTest.java:149:14:158:29 | appendSeparator(...) : TextStringBuilder | provenance | MaD:590 |
-| TextStringBuilderTest.java:149:14:158:29 | appendSeparator(...) : TextStringBuilder | TextStringBuilderTest.java:149:14:159:52 | appendWithSeparators(...) : TextStringBuilder | provenance | MaD:595 |
+| TextStringBuilderTest.java:149:14:157:30 | appendPadding(...) : TextStringBuilder | TextStringBuilderTest.java:149:14:158:29 | appendSeparator(...) : TextStringBuilder | provenance | MaD:593 |
+| TextStringBuilderTest.java:149:14:158:29 | appendSeparator(...) : TextStringBuilder | TextStringBuilderTest.java:149:14:159:52 | appendWithSeparators(...) : TextStringBuilder | provenance | MaD:599 |
 | TextStringBuilderTest.java:149:14:159:52 | appendWithSeparators(...) : TextStringBuilder | TextStringBuilderTest.java:149:14:160:21 | delete(...) : TextStringBuilder | provenance | MaD:616 |
 | TextStringBuilderTest.java:149:14:160:21 | delete(...) : TextStringBuilder | TextStringBuilderTest.java:149:14:161:23 | deleteAll(...) : TextStringBuilder | provenance | MaD:617 |
 | TextStringBuilderTest.java:149:14:161:23 | deleteAll(...) : TextStringBuilder | TextStringBuilderTest.java:149:14:162:24 | deleteCharAt(...) : TextStringBuilder | provenance | MaD:618 |
 | TextStringBuilderTest.java:149:14:162:24 | deleteCharAt(...) : TextStringBuilder | TextStringBuilderTest.java:149:14:163:29 | deleteFirst(...) : TextStringBuilder | provenance | MaD:619 |
 | TextStringBuilderTest.java:149:14:163:29 | deleteFirst(...) : TextStringBuilder | TextStringBuilderTest.java:149:14:164:28 | ensureCapacity(...) : TextStringBuilder | provenance | MaD:620 |
-| TextStringBuilderTest.java:149:14:164:28 | ensureCapacity(...) : TextStringBuilder | TextStringBuilderTest.java:149:14:165:30 | insert(...) : TextStringBuilder | provenance | MaD:624 |
+| TextStringBuilderTest.java:149:14:164:28 | ensureCapacity(...) : TextStringBuilder | TextStringBuilderTest.java:149:14:165:30 | insert(...) : TextStringBuilder | provenance | MaD:625 |
 | TextStringBuilderTest.java:149:14:165:30 | insert(...) : TextStringBuilder | TextStringBuilderTest.java:149:14:166:27 | minimizeCapacity(...) : TextStringBuilder | provenance | MaD:628 |
-| TextStringBuilderTest.java:149:14:166:27 | minimizeCapacity(...) : TextStringBuilder | TextStringBuilderTest.java:149:14:167:37 | replace(...) : TextStringBuilder | provenance | MaD:630 |
-| TextStringBuilderTest.java:149:14:167:37 | replace(...) : TextStringBuilder | TextStringBuilderTest.java:149:14:168:38 | replaceAll(...) : TextStringBuilder | provenance | MaD:633 |
-| TextStringBuilderTest.java:149:14:168:38 | replaceAll(...) : TextStringBuilder | TextStringBuilderTest.java:149:14:169:40 | replaceFirst(...) : TextStringBuilder | provenance | MaD:635 |
+| TextStringBuilderTest.java:149:14:166:27 | minimizeCapacity(...) : TextStringBuilder | TextStringBuilderTest.java:149:14:167:37 | replace(...) : TextStringBuilder | provenance | MaD:632 |
+| TextStringBuilderTest.java:149:14:167:37 | replace(...) : TextStringBuilder | TextStringBuilderTest.java:149:14:168:38 | replaceAll(...) : TextStringBuilder | provenance | MaD:634 |
+| TextStringBuilderTest.java:149:14:168:38 | replaceAll(...) : TextStringBuilder | TextStringBuilderTest.java:149:14:169:40 | replaceFirst(...) : TextStringBuilder | provenance | MaD:636 |
 | TextStringBuilderTest.java:149:14:169:40 | replaceFirst(...) : TextStringBuilder | TextStringBuilderTest.java:149:14:170:18 | reverse(...) : TextStringBuilder | provenance | MaD:637 |
 | TextStringBuilderTest.java:149:14:170:18 | reverse(...) : TextStringBuilder | TextStringBuilderTest.java:149:14:171:26 | setCharAt(...) : TextStringBuilder | provenance | MaD:639 |
 | TextStringBuilderTest.java:149:14:171:26 | setCharAt(...) : TextStringBuilder | TextStringBuilderTest.java:149:14:172:23 | setLength(...) : TextStringBuilder | provenance | MaD:640 |
@@ -3158,29 +3132,29 @@ edges
 | TextStringBuilderTest.java:149:14:173:34 | setNewLineText(...) : TextStringBuilder | TextStringBuilderTest.java:149:14:174:28 | setNullText(...) : TextStringBuilder | provenance | MaD:642 |
 | TextStringBuilderTest.java:149:14:174:28 | setNullText(...) : TextStringBuilder | TextStringBuilderTest.java:149:14:175:15 | trim(...) | provenance | MaD:649 |
 | TextStringBuilderTest.java:179:9:205:15 | trim(...) [post update] : TextStringBuilder | TextStringBuilderTest.java:207:14:207:34 | fluentAllMethodsTest2 | provenance | MaD:649 |
-| TextStringBuilderTest.java:206:17:206:23 | taint(...) : String | TextStringBuilderTest.java:179:9:205:15 | trim(...) [post update] : TextStringBuilder | provenance | MaD:568 |
+| TextStringBuilderTest.java:206:17:206:23 | taint(...) : String | TextStringBuilderTest.java:179:9:205:15 | trim(...) [post update] : TextStringBuilder | provenance | MaD:567 |
 | ToStringBuilderTest.java:10:58:10:60 | sb1 [post update] : ToStringBuilder | ToStringBuilderTest.java:10:92:10:94 | sb1 : ToStringBuilder | provenance |  |
-| ToStringBuilderTest.java:10:69:10:83 | (...)... : String | ToStringBuilderTest.java:10:58:10:60 | sb1 [post update] : ToStringBuilder | provenance | MaD:20 |
+| ToStringBuilderTest.java:10:69:10:83 | (...)... : String | ToStringBuilderTest.java:10:58:10:60 | sb1 [post update] : ToStringBuilder | provenance | MaD:19 |
 | ToStringBuilderTest.java:10:77:10:83 | taint(...) : String | ToStringBuilderTest.java:10:69:10:83 | (...)... : String | provenance |  |
 | ToStringBuilderTest.java:10:92:10:94 | sb1 : ToStringBuilder | ToStringBuilderTest.java:10:92:10:105 | toString(...) | provenance | MaD:30 |
 | ToStringBuilderTest.java:11:58:11:60 | sb2 [post update] : ToStringBuilder | ToStringBuilderTest.java:11:101:11:103 | sb2 : ToStringBuilder | provenance |  |
-| ToStringBuilderTest.java:11:69:11:92 | new Object[] : Object[] [[]] : String | ToStringBuilderTest.java:11:58:11:60 | sb2 [post update] : ToStringBuilder | provenance | MaD:21 |
+| ToStringBuilderTest.java:11:69:11:92 | new Object[] : Object[] [[]] : String | ToStringBuilderTest.java:11:58:11:60 | sb2 [post update] : ToStringBuilder | provenance | MaD:20 |
 | ToStringBuilderTest.java:11:69:11:92 | {...} : Object[] [[]] : String | ToStringBuilderTest.java:11:69:11:92 | new Object[] : Object[] [[]] : String | provenance |  |
 | ToStringBuilderTest.java:11:84:11:90 | taint(...) : String | ToStringBuilderTest.java:11:69:11:92 | {...} : Object[] [[]] : String | provenance |  |
 | ToStringBuilderTest.java:11:101:11:103 | sb2 : ToStringBuilder | ToStringBuilderTest.java:11:101:11:114 | toString(...) | provenance | MaD:30 |
 | ToStringBuilderTest.java:12:58:12:60 | sb3 [post update] : ToStringBuilder | ToStringBuilderTest.java:12:90:12:92 | sb3 : ToStringBuilder | provenance |  |
-| ToStringBuilderTest.java:12:69:12:75 | taint(...) : String | ToStringBuilderTest.java:12:58:12:60 | sb3 [post update] : ToStringBuilder | provenance | MaD:22 |
+| ToStringBuilderTest.java:12:69:12:75 | taint(...) : String | ToStringBuilderTest.java:12:58:12:60 | sb3 [post update] : ToStringBuilder | provenance | MaD:21 |
 | ToStringBuilderTest.java:12:90:12:92 | sb3 : ToStringBuilder | ToStringBuilderTest.java:12:90:12:103 | toString(...) | provenance | MaD:30 |
 | ToStringBuilderTest.java:13:58:13:60 | sb4 [post update] : ToStringBuilder | ToStringBuilderTest.java:13:97:13:99 | sb4 : ToStringBuilder | provenance |  |
-| ToStringBuilderTest.java:13:82:13:88 | taint(...) : String | ToStringBuilderTest.java:13:58:13:60 | sb4 [post update] : ToStringBuilder | provenance | MaD:23 |
+| ToStringBuilderTest.java:13:82:13:88 | taint(...) : String | ToStringBuilderTest.java:13:58:13:60 | sb4 [post update] : ToStringBuilder | provenance | MaD:22 |
 | ToStringBuilderTest.java:13:97:13:99 | sb4 : ToStringBuilder | ToStringBuilderTest.java:13:97:13:110 | toString(...) | provenance | MaD:30 |
 | ToStringBuilderTest.java:14:58:14:60 | sb5 [post update] : ToStringBuilder | ToStringBuilderTest.java:14:114:14:116 | sb5 : ToStringBuilder | provenance |  |
-| ToStringBuilderTest.java:14:82:14:105 | new Object[] : Object[] [[]] : String | ToStringBuilderTest.java:14:58:14:60 | sb5 [post update] : ToStringBuilder | provenance | MaD:24 |
+| ToStringBuilderTest.java:14:82:14:105 | new Object[] : Object[] [[]] : String | ToStringBuilderTest.java:14:58:14:60 | sb5 [post update] : ToStringBuilder | provenance | MaD:23 |
 | ToStringBuilderTest.java:14:82:14:105 | {...} : Object[] [[]] : String | ToStringBuilderTest.java:14:82:14:105 | new Object[] : Object[] [[]] : String | provenance |  |
 | ToStringBuilderTest.java:14:97:14:103 | taint(...) : String | ToStringBuilderTest.java:14:82:14:105 | {...} : Object[] [[]] : String | provenance |  |
 | ToStringBuilderTest.java:14:114:14:116 | sb5 : ToStringBuilder | ToStringBuilderTest.java:14:114:14:127 | toString(...) | provenance | MaD:30 |
 | ToStringBuilderTest.java:15:58:15:60 | sb6 [post update] : ToStringBuilder | ToStringBuilderTest.java:15:120:15:122 | sb6 : ToStringBuilder | provenance |  |
-| ToStringBuilderTest.java:15:82:15:105 | new Object[] : Object[] [[]] : String | ToStringBuilderTest.java:15:58:15:60 | sb6 [post update] : ToStringBuilder | provenance | MaD:25 |
+| ToStringBuilderTest.java:15:82:15:105 | new Object[] : Object[] [[]] : String | ToStringBuilderTest.java:15:58:15:60 | sb6 [post update] : ToStringBuilder | provenance | MaD:24 |
 | ToStringBuilderTest.java:15:82:15:105 | {...} : Object[] [[]] : String | ToStringBuilderTest.java:15:82:15:105 | new Object[] : Object[] [[]] : String | provenance |  |
 | ToStringBuilderTest.java:15:97:15:103 | taint(...) : String | ToStringBuilderTest.java:15:82:15:105 | {...} : Object[] [[]] : String | provenance |  |
 | ToStringBuilderTest.java:15:120:15:122 | sb6 : ToStringBuilder | ToStringBuilderTest.java:15:120:15:133 | toString(...) | provenance | MaD:30 |
@@ -3191,133 +3165,133 @@ edges
 | ToStringBuilderTest.java:19:77:19:83 | taint(...) : String | ToStringBuilderTest.java:19:58:19:60 | sb9 [post update] : ToStringBuilder | provenance | MaD:27 |
 | ToStringBuilderTest.java:19:92:19:94 | sb9 : ToStringBuilder | ToStringBuilderTest.java:19:92:19:105 | toString(...) | provenance | MaD:30 |
 | ToStringBuilderTest.java:20:59:20:62 | sb10 [post update] : ToStringBuilder | ToStringBuilderTest.java:20:94:20:97 | sb10 : ToStringBuilder | provenance |  |
-| ToStringBuilderTest.java:20:71:20:85 | (...)... : String | ToStringBuilderTest.java:20:59:20:62 | sb10 [post update] : ToStringBuilder | provenance | MaD:20 |
+| ToStringBuilderTest.java:20:71:20:85 | (...)... : String | ToStringBuilderTest.java:20:59:20:62 | sb10 [post update] : ToStringBuilder | provenance | MaD:19 |
 | ToStringBuilderTest.java:20:79:20:85 | taint(...) : String | ToStringBuilderTest.java:20:71:20:85 | (...)... : String | provenance |  |
 | ToStringBuilderTest.java:20:94:20:97 | sb10 : ToStringBuilder | ToStringBuilderTest.java:20:94:20:105 | build(...) | provenance | MaD:28 |
 | ToStringBuilderTest.java:21:59:21:62 | sb11 [post update] : ToStringBuilder | ToStringBuilderTest.java:21:94:21:97 | sb11 : ToStringBuilder | provenance |  |
-| ToStringBuilderTest.java:21:71:21:85 | (...)... : String | ToStringBuilderTest.java:21:59:21:62 | sb11 [post update] : ToStringBuilder | provenance | MaD:20 |
+| ToStringBuilderTest.java:21:71:21:85 | (...)... : String | ToStringBuilderTest.java:21:59:21:62 | sb11 [post update] : ToStringBuilder | provenance | MaD:19 |
 | ToStringBuilderTest.java:21:79:21:85 | taint(...) : String | ToStringBuilderTest.java:21:71:21:85 | (...)... : String | provenance |  |
 | ToStringBuilderTest.java:21:94:21:97 | sb11 : ToStringBuilder | ToStringBuilderTest.java:21:94:21:115 | getStringBuffer(...) : StringBuffer | provenance | MaD:29 |
 | ToStringBuilderTest.java:21:94:21:115 | getStringBuffer(...) : StringBuffer | ToStringBuilderTest.java:21:94:21:126 | toString(...) | provenance | MaD:5 |
-| ToStringBuilderTest.java:25:14:25:58 | append(...) : ToStringBuilder | ToStringBuilderTest.java:25:14:25:82 | append(...) : ToStringBuilder | provenance | MaD:19 |
+| ToStringBuilderTest.java:25:14:25:58 | append(...) : ToStringBuilder | ToStringBuilderTest.java:25:14:25:82 | append(...) : ToStringBuilder | provenance | MaD:25 |
 | ToStringBuilderTest.java:25:14:25:82 | append(...) : ToStringBuilder | ToStringBuilderTest.java:25:14:25:93 | toString(...) | provenance | MaD:30 |
-| ToStringBuilderTest.java:25:51:25:57 | taint(...) : String | ToStringBuilderTest.java:25:14:25:58 | append(...) : ToStringBuilder | provenance | MaD:20+MaD:19 |
-| ToStringBuilderTest.java:28:9:28:45 | append(...) [post update] : ToStringBuilder | ToStringBuilderTest.java:29:14:29:31 | fluentBackflowTest : ToStringBuilder | provenance | MaD:19 |
-| ToStringBuilderTest.java:28:54:28:60 | taint(...) : String | ToStringBuilderTest.java:28:9:28:45 | append(...) [post update] : ToStringBuilder | provenance | MaD:20 |
+| ToStringBuilderTest.java:25:51:25:57 | taint(...) : String | ToStringBuilderTest.java:25:14:25:58 | append(...) : ToStringBuilder | provenance | MaD:19+MaD:25 |
+| ToStringBuilderTest.java:28:9:28:45 | append(...) [post update] : ToStringBuilder | ToStringBuilderTest.java:29:14:29:31 | fluentBackflowTest : ToStringBuilder | provenance | MaD:25 |
+| ToStringBuilderTest.java:28:54:28:60 | taint(...) : String | ToStringBuilderTest.java:28:9:28:45 | append(...) [post update] : ToStringBuilder | provenance | MaD:19 |
 | ToStringBuilderTest.java:29:14:29:31 | fluentBackflowTest : ToStringBuilder | ToStringBuilderTest.java:29:14:29:42 | toString(...) | provenance | MaD:30 |
-| ToStringBuilderTest.java:33:9:33:46 | append(...) [post update] : ToStringBuilder | ToStringBuilderTest.java:34:14:34:32 | fluentBackflowTest2 : ToStringBuilder | provenance | MaD:19 |
-| ToStringBuilderTest.java:33:55:33:61 | taint(...) : String | ToStringBuilderTest.java:33:9:33:46 | append(...) [post update] : ToStringBuilder | provenance | MaD:20 |
+| ToStringBuilderTest.java:33:9:33:46 | append(...) [post update] : ToStringBuilder | ToStringBuilderTest.java:34:14:34:32 | fluentBackflowTest2 : ToStringBuilder | provenance | MaD:25 |
+| ToStringBuilderTest.java:33:55:33:61 | taint(...) : String | ToStringBuilderTest.java:33:9:33:46 | append(...) [post update] : ToStringBuilder | provenance | MaD:19 |
 | ToStringBuilderTest.java:34:14:34:32 | fluentBackflowTest2 : ToStringBuilder | ToStringBuilderTest.java:34:14:34:43 | toString(...) | provenance | MaD:30 |
 | TripleTest.java:16:61:16:118 | of(...) : ImmutableTriple [left] : String | TripleTest.java:21:12:21:22 | taintedLeft : ImmutableTriple [left] : String | provenance |  |
 | TripleTest.java:16:61:16:118 | of(...) : ImmutableTriple [left] : String | TripleTest.java:24:12:24:22 | taintedLeft : ImmutableTriple [left] : String | provenance |  |
 | TripleTest.java:16:61:16:118 | of(...) : ImmutableTriple [left] : String | TripleTest.java:45:12:45:23 | taintedLeft2 : ImmutableTriple [left] : String | provenance |  |
-| TripleTest.java:16:80:16:86 | taint(...) : String | TripleTest.java:16:61:16:118 | of(...) : ImmutableTriple [left] : String | provenance | MaD:378 |
+| TripleTest.java:16:80:16:86 | taint(...) : String | TripleTest.java:16:61:16:118 | of(...) : ImmutableTriple [left] : String | provenance | MaD:186 |
 | TripleTest.java:17:63:17:118 | of(...) : ImmutableTriple [middle] : String | TripleTest.java:28:12:28:24 | taintedMiddle : ImmutableTriple [middle] : String | provenance |  |
 | TripleTest.java:17:63:17:118 | of(...) : ImmutableTriple [middle] : String | TripleTest.java:31:12:31:24 | taintedMiddle : ImmutableTriple [middle] : String | provenance |  |
 | TripleTest.java:17:63:17:118 | of(...) : ImmutableTriple [middle] : String | TripleTest.java:49:12:49:25 | taintedMiddle2 : ImmutableTriple [middle] : String | provenance |  |
-| TripleTest.java:17:96:17:102 | taint(...) : String | TripleTest.java:17:63:17:118 | of(...) : ImmutableTriple [middle] : String | provenance | MaD:379 |
+| TripleTest.java:17:96:17:102 | taint(...) : String | TripleTest.java:17:63:17:118 | of(...) : ImmutableTriple [middle] : String | provenance | MaD:187 |
 | TripleTest.java:18:62:18:118 | of(...) : ImmutableTriple [right] : String | TripleTest.java:35:12:35:23 | taintedRight : ImmutableTriple [right] : String | provenance |  |
 | TripleTest.java:18:62:18:118 | of(...) : ImmutableTriple [right] : String | TripleTest.java:38:12:38:23 | taintedRight : ImmutableTriple [right] : String | provenance |  |
 | TripleTest.java:18:62:18:118 | of(...) : ImmutableTriple [right] : String | TripleTest.java:53:12:53:24 | taintedRight2 : ImmutableTriple [right] : String | provenance |  |
-| TripleTest.java:18:111:18:117 | taint(...) : String | TripleTest.java:18:62:18:118 | of(...) : ImmutableTriple [right] : String | provenance | MaD:380 |
-| TripleTest.java:21:12:21:22 | taintedLeft : ImmutableTriple [left] : String | TripleTest.java:21:12:21:32 | getLeft(...) | provenance | MaD:407 |
+| TripleTest.java:18:111:18:117 | taint(...) : String | TripleTest.java:18:62:18:118 | of(...) : ImmutableTriple [right] : String | provenance | MaD:188 |
+| TripleTest.java:21:12:21:22 | taintedLeft : ImmutableTriple [left] : String | TripleTest.java:21:12:21:32 | getLeft(...) | provenance | MaD:218 |
 | TripleTest.java:24:12:24:22 | taintedLeft : ImmutableTriple [left] : String | TripleTest.java:24:12:24:27 | taintedLeft.left | provenance |  |
-| TripleTest.java:28:12:28:24 | taintedMiddle : ImmutableTriple [middle] : String | TripleTest.java:28:12:28:36 | getMiddle(...) | provenance | MaD:409 |
+| TripleTest.java:28:12:28:24 | taintedMiddle : ImmutableTriple [middle] : String | TripleTest.java:28:12:28:36 | getMiddle(...) | provenance | MaD:220 |
 | TripleTest.java:31:12:31:24 | taintedMiddle : ImmutableTriple [middle] : String | TripleTest.java:31:12:31:31 | taintedMiddle.middle | provenance |  |
-| TripleTest.java:35:12:35:23 | taintedRight : ImmutableTriple [right] : String | TripleTest.java:35:12:35:34 | getRight(...) | provenance | MaD:411 |
+| TripleTest.java:35:12:35:23 | taintedRight : ImmutableTriple [right] : String | TripleTest.java:35:12:35:34 | getRight(...) | provenance | MaD:222 |
 | TripleTest.java:38:12:38:23 | taintedRight : ImmutableTriple [right] : String | TripleTest.java:38:12:38:29 | taintedRight.right | provenance |  |
-| TripleTest.java:45:12:45:23 | taintedLeft2 : ImmutableTriple [left] : String | TripleTest.java:45:12:45:33 | getLeft(...) | provenance | MaD:407 |
-| TripleTest.java:49:12:49:25 | taintedMiddle2 : ImmutableTriple [middle] : String | TripleTest.java:49:12:49:37 | getMiddle(...) | provenance | MaD:409 |
-| TripleTest.java:53:12:53:24 | taintedRight2 : ImmutableTriple [right] : String | TripleTest.java:53:12:53:35 | getRight(...) | provenance | MaD:411 |
+| TripleTest.java:45:12:45:23 | taintedLeft2 : ImmutableTriple [left] : String | TripleTest.java:45:12:45:33 | getLeft(...) | provenance | MaD:218 |
+| TripleTest.java:49:12:49:25 | taintedMiddle2 : ImmutableTriple [middle] : String | TripleTest.java:49:12:49:37 | getMiddle(...) | provenance | MaD:220 |
+| TripleTest.java:53:12:53:24 | taintedRight2 : ImmutableTriple [right] : String | TripleTest.java:53:12:53:35 | getRight(...) | provenance | MaD:222 |
 | TripleTest.java:56:53:56:101 | of(...) : Triple [left] : String | TripleTest.java:60:12:60:23 | taintedLeft3 : Triple [left] : String | provenance |  |
-| TripleTest.java:56:63:56:69 | taint(...) : String | TripleTest.java:56:53:56:101 | of(...) : Triple [left] : String | provenance | MaD:413 |
+| TripleTest.java:56:63:56:69 | taint(...) : String | TripleTest.java:56:53:56:101 | of(...) : Triple [left] : String | provenance | MaD:215 |
 | TripleTest.java:57:55:57:101 | of(...) : Triple [middle] : String | TripleTest.java:64:12:64:25 | taintedMiddle3 : Triple [middle] : String | provenance |  |
-| TripleTest.java:57:79:57:85 | taint(...) : String | TripleTest.java:57:55:57:101 | of(...) : Triple [middle] : String | provenance | MaD:414 |
+| TripleTest.java:57:79:57:85 | taint(...) : String | TripleTest.java:57:55:57:101 | of(...) : Triple [middle] : String | provenance | MaD:216 |
 | TripleTest.java:58:54:58:101 | of(...) : Triple [right] : String | TripleTest.java:68:12:68:24 | taintedRight3 : Triple [right] : String | provenance |  |
-| TripleTest.java:58:94:58:100 | taint(...) : String | TripleTest.java:58:54:58:101 | of(...) : Triple [right] : String | provenance | MaD:415 |
-| TripleTest.java:60:12:60:23 | taintedLeft3 : Triple [left] : String | TripleTest.java:60:12:60:33 | getLeft(...) | provenance | MaD:407 |
-| TripleTest.java:64:12:64:25 | taintedMiddle3 : Triple [middle] : String | TripleTest.java:64:12:64:37 | getMiddle(...) | provenance | MaD:409 |
-| TripleTest.java:68:12:68:24 | taintedRight3 : Triple [right] : String | TripleTest.java:68:12:68:35 | getRight(...) | provenance | MaD:411 |
+| TripleTest.java:58:94:58:100 | taint(...) : String | TripleTest.java:58:54:58:101 | of(...) : Triple [right] : String | provenance | MaD:217 |
+| TripleTest.java:60:12:60:23 | taintedLeft3 : Triple [left] : String | TripleTest.java:60:12:60:33 | getLeft(...) | provenance | MaD:218 |
+| TripleTest.java:64:12:64:25 | taintedMiddle3 : Triple [middle] : String | TripleTest.java:64:12:64:37 | getMiddle(...) | provenance | MaD:220 |
+| TripleTest.java:68:12:68:24 | taintedRight3 : Triple [right] : String | TripleTest.java:68:12:68:35 | getRight(...) | provenance | MaD:222 |
 | TripleTest.java:71:62:71:120 | new ImmutableTriple<>(...) : ImmutableTriple [left] : String | TripleTest.java:75:12:75:23 | taintedLeft4 : ImmutableTriple [left] : String | provenance |  |
-| TripleTest.java:71:82:71:88 | taint(...) : String | TripleTest.java:71:62:71:120 | new ImmutableTriple<>(...) : ImmutableTriple [left] : String | provenance | MaD:375 |
+| TripleTest.java:71:82:71:88 | taint(...) : String | TripleTest.java:71:62:71:120 | new ImmutableTriple<>(...) : ImmutableTriple [left] : String | provenance | MaD:183 |
 | TripleTest.java:72:64:72:120 | new ImmutableTriple<>(...) : ImmutableTriple [middle] : String | TripleTest.java:79:12:79:25 | taintedMiddle4 : ImmutableTriple [middle] : String | provenance |  |
-| TripleTest.java:72:98:72:104 | taint(...) : String | TripleTest.java:72:64:72:120 | new ImmutableTriple<>(...) : ImmutableTriple [middle] : String | provenance | MaD:376 |
+| TripleTest.java:72:98:72:104 | taint(...) : String | TripleTest.java:72:64:72:120 | new ImmutableTriple<>(...) : ImmutableTriple [middle] : String | provenance | MaD:184 |
 | TripleTest.java:73:63:73:120 | new ImmutableTriple<>(...) : ImmutableTriple [right] : String | TripleTest.java:83:12:83:24 | taintedRight4 : ImmutableTriple [right] : String | provenance |  |
-| TripleTest.java:73:113:73:119 | taint(...) : String | TripleTest.java:73:63:73:120 | new ImmutableTriple<>(...) : ImmutableTriple [right] : String | provenance | MaD:377 |
-| TripleTest.java:75:12:75:23 | taintedLeft4 : ImmutableTriple [left] : String | TripleTest.java:75:12:75:33 | getLeft(...) | provenance | MaD:407 |
-| TripleTest.java:79:12:79:25 | taintedMiddle4 : ImmutableTriple [middle] : String | TripleTest.java:79:12:79:37 | getMiddle(...) | provenance | MaD:409 |
-| TripleTest.java:83:12:83:24 | taintedRight4 : ImmutableTriple [right] : String | TripleTest.java:83:12:83:35 | getRight(...) | provenance | MaD:411 |
+| TripleTest.java:73:113:73:119 | taint(...) : String | TripleTest.java:73:63:73:120 | new ImmutableTriple<>(...) : ImmutableTriple [right] : String | provenance | MaD:185 |
+| TripleTest.java:75:12:75:23 | taintedLeft4 : ImmutableTriple [left] : String | TripleTest.java:75:12:75:33 | getLeft(...) | provenance | MaD:218 |
+| TripleTest.java:79:12:79:25 | taintedMiddle4 : ImmutableTriple [middle] : String | TripleTest.java:79:12:79:37 | getMiddle(...) | provenance | MaD:220 |
+| TripleTest.java:83:12:83:24 | taintedRight4 : ImmutableTriple [right] : String | TripleTest.java:83:12:83:35 | getRight(...) | provenance | MaD:222 |
 | TripleTest.java:85:66:85:121 | of(...) : MutableTriple [left] : String | TripleTest.java:99:12:99:29 | mutableTaintedLeft : MutableTriple [left] : String | provenance |  |
 | TripleTest.java:85:66:85:121 | of(...) : MutableTriple [left] : String | TripleTest.java:102:12:102:29 | mutableTaintedLeft : MutableTriple [left] : String | provenance |  |
 | TripleTest.java:85:66:85:121 | of(...) : MutableTriple [left] : String | TripleTest.java:162:12:162:30 | mutableTaintedLeft2 : MutableTriple [left] : String | provenance |  |
-| TripleTest.java:85:83:85:89 | taint(...) : String | TripleTest.java:85:66:85:121 | of(...) : MutableTriple [left] : String | provenance | MaD:391 |
+| TripleTest.java:85:83:85:89 | taint(...) : String | TripleTest.java:85:66:85:121 | of(...) : MutableTriple [left] : String | provenance | MaD:199 |
 | TripleTest.java:86:68:86:121 | of(...) : MutableTriple [middle] : String | TripleTest.java:106:12:106:31 | mutableTaintedMiddle : MutableTriple [middle] : String | provenance |  |
 | TripleTest.java:86:68:86:121 | of(...) : MutableTriple [middle] : String | TripleTest.java:109:12:109:31 | mutableTaintedMiddle : MutableTriple [middle] : String | provenance |  |
 | TripleTest.java:86:68:86:121 | of(...) : MutableTriple [middle] : String | TripleTest.java:166:12:166:32 | mutableTaintedMiddle2 : MutableTriple [middle] : String | provenance |  |
-| TripleTest.java:86:99:86:105 | taint(...) : String | TripleTest.java:86:68:86:121 | of(...) : MutableTriple [middle] : String | provenance | MaD:392 |
+| TripleTest.java:86:99:86:105 | taint(...) : String | TripleTest.java:86:68:86:121 | of(...) : MutableTriple [middle] : String | provenance | MaD:200 |
 | TripleTest.java:87:67:87:121 | of(...) : MutableTriple [right] : String | TripleTest.java:113:12:113:30 | mutableTaintedRight : MutableTriple [right] : String | provenance |  |
 | TripleTest.java:87:67:87:121 | of(...) : MutableTriple [right] : String | TripleTest.java:116:12:116:30 | mutableTaintedRight : MutableTriple [right] : String | provenance |  |
 | TripleTest.java:87:67:87:121 | of(...) : MutableTriple [right] : String | TripleTest.java:170:12:170:31 | mutableTaintedRight2 : MutableTriple [right] : String | provenance |  |
-| TripleTest.java:87:114:87:120 | taint(...) : String | TripleTest.java:87:67:87:121 | of(...) : MutableTriple [right] : String | provenance | MaD:393 |
+| TripleTest.java:87:114:87:120 | taint(...) : String | TripleTest.java:87:67:87:121 | of(...) : MutableTriple [right] : String | provenance | MaD:201 |
 | TripleTest.java:89:7:89:20 | setTaintedLeft [post update] : MutableTriple [left] : String | TripleTest.java:117:12:117:25 | setTaintedLeft : MutableTriple [left] : String | provenance |  |
 | TripleTest.java:89:7:89:20 | setTaintedLeft [post update] : MutableTriple [left] : String | TripleTest.java:120:12:120:25 | setTaintedLeft : MutableTriple [left] : String | provenance |  |
 | TripleTest.java:89:7:89:20 | setTaintedLeft [post update] : MutableTriple [left] : String | TripleTest.java:171:12:171:26 | setTaintedLeft2 : MutableTriple [left] : String | provenance |  |
-| TripleTest.java:89:30:89:36 | taint(...) : String | TripleTest.java:89:7:89:20 | setTaintedLeft [post update] : MutableTriple [left] : String | provenance | MaD:394 |
+| TripleTest.java:89:30:89:36 | taint(...) : String | TripleTest.java:89:7:89:20 | setTaintedLeft [post update] : MutableTriple [left] : String | provenance | MaD:202 |
 | TripleTest.java:91:7:91:22 | setTaintedMiddle [post update] : MutableTriple [middle] : String | TripleTest.java:124:12:124:27 | setTaintedMiddle : MutableTriple [middle] : String | provenance |  |
 | TripleTest.java:91:7:91:22 | setTaintedMiddle [post update] : MutableTriple [middle] : String | TripleTest.java:127:12:127:27 | setTaintedMiddle : MutableTriple [middle] : String | provenance |  |
 | TripleTest.java:91:7:91:22 | setTaintedMiddle [post update] : MutableTriple [middle] : String | TripleTest.java:175:12:175:28 | setTaintedMiddle2 : MutableTriple [middle] : String | provenance |  |
-| TripleTest.java:91:34:91:40 | taint(...) : String | TripleTest.java:91:7:91:22 | setTaintedMiddle [post update] : MutableTriple [middle] : String | provenance | MaD:395 |
+| TripleTest.java:91:34:91:40 | taint(...) : String | TripleTest.java:91:7:91:22 | setTaintedMiddle [post update] : MutableTriple [middle] : String | provenance | MaD:203 |
 | TripleTest.java:93:7:93:21 | setTaintedRight [post update] : MutableTriple [right] : String | TripleTest.java:131:12:131:26 | setTaintedRight : MutableTriple [right] : String | provenance |  |
 | TripleTest.java:93:7:93:21 | setTaintedRight [post update] : MutableTriple [right] : String | TripleTest.java:134:12:134:26 | setTaintedRight : MutableTriple [right] : String | provenance |  |
 | TripleTest.java:93:7:93:21 | setTaintedRight [post update] : MutableTriple [right] : String | TripleTest.java:179:12:179:27 | setTaintedRight2 : MutableTriple [right] : String | provenance |  |
-| TripleTest.java:93:32:93:38 | taint(...) : String | TripleTest.java:93:7:93:21 | setTaintedRight [post update] : MutableTriple [right] : String | provenance | MaD:396 |
+| TripleTest.java:93:32:93:38 | taint(...) : String | TripleTest.java:93:7:93:21 | setTaintedRight [post update] : MutableTriple [right] : String | provenance | MaD:204 |
 | TripleTest.java:94:77:94:133 | new MutableTriple<>(...) : MutableTriple [left] : String | TripleTest.java:135:12:135:40 | mutableTaintedLeftConstructed : MutableTriple [left] : String | provenance |  |
 | TripleTest.java:94:77:94:133 | new MutableTriple<>(...) : MutableTriple [left] : String | TripleTest.java:138:12:138:40 | mutableTaintedLeftConstructed : MutableTriple [left] : String | provenance |  |
-| TripleTest.java:94:95:94:101 | taint(...) : String | TripleTest.java:94:77:94:133 | new MutableTriple<>(...) : MutableTriple [left] : String | provenance | MaD:388 |
+| TripleTest.java:94:95:94:101 | taint(...) : String | TripleTest.java:94:77:94:133 | new MutableTriple<>(...) : MutableTriple [left] : String | provenance | MaD:196 |
 | TripleTest.java:95:79:95:133 | new MutableTriple<>(...) : MutableTriple [middle] : String | TripleTest.java:142:12:142:42 | mutableTaintedMiddleConstructed : MutableTriple [middle] : String | provenance |  |
 | TripleTest.java:95:79:95:133 | new MutableTriple<>(...) : MutableTriple [middle] : String | TripleTest.java:145:12:145:42 | mutableTaintedMiddleConstructed : MutableTriple [middle] : String | provenance |  |
-| TripleTest.java:95:111:95:117 | taint(...) : String | TripleTest.java:95:79:95:133 | new MutableTriple<>(...) : MutableTriple [middle] : String | provenance | MaD:389 |
+| TripleTest.java:95:111:95:117 | taint(...) : String | TripleTest.java:95:79:95:133 | new MutableTriple<>(...) : MutableTriple [middle] : String | provenance | MaD:197 |
 | TripleTest.java:96:78:96:133 | new MutableTriple<>(...) : MutableTriple [right] : String | TripleTest.java:149:12:149:41 | mutableTaintedRightConstructed : MutableTriple [right] : String | provenance |  |
 | TripleTest.java:96:78:96:133 | new MutableTriple<>(...) : MutableTriple [right] : String | TripleTest.java:152:12:152:41 | mutableTaintedRightConstructed : MutableTriple [right] : String | provenance |  |
-| TripleTest.java:96:126:96:132 | taint(...) : String | TripleTest.java:96:78:96:133 | new MutableTriple<>(...) : MutableTriple [right] : String | provenance | MaD:390 |
-| TripleTest.java:99:12:99:29 | mutableTaintedLeft : MutableTriple [left] : String | TripleTest.java:99:12:99:39 | getLeft(...) | provenance | MaD:408 |
+| TripleTest.java:96:126:96:132 | taint(...) : String | TripleTest.java:96:78:96:133 | new MutableTriple<>(...) : MutableTriple [right] : String | provenance | MaD:198 |
+| TripleTest.java:99:12:99:29 | mutableTaintedLeft : MutableTriple [left] : String | TripleTest.java:99:12:99:39 | getLeft(...) | provenance | MaD:219 |
 | TripleTest.java:102:12:102:29 | mutableTaintedLeft : MutableTriple [left] : String | TripleTest.java:102:12:102:34 | mutableTaintedLeft.left | provenance |  |
-| TripleTest.java:106:12:106:31 | mutableTaintedMiddle : MutableTriple [middle] : String | TripleTest.java:106:12:106:43 | getMiddle(...) | provenance | MaD:410 |
+| TripleTest.java:106:12:106:31 | mutableTaintedMiddle : MutableTriple [middle] : String | TripleTest.java:106:12:106:43 | getMiddle(...) | provenance | MaD:221 |
 | TripleTest.java:109:12:109:31 | mutableTaintedMiddle : MutableTriple [middle] : String | TripleTest.java:109:12:109:38 | mutableTaintedMiddle.middle | provenance |  |
-| TripleTest.java:113:12:113:30 | mutableTaintedRight : MutableTriple [right] : String | TripleTest.java:113:12:113:41 | getRight(...) | provenance | MaD:412 |
+| TripleTest.java:113:12:113:30 | mutableTaintedRight : MutableTriple [right] : String | TripleTest.java:113:12:113:41 | getRight(...) | provenance | MaD:223 |
 | TripleTest.java:116:12:116:30 | mutableTaintedRight : MutableTriple [right] : String | TripleTest.java:116:12:116:36 | mutableTaintedRight.right | provenance |  |
-| TripleTest.java:117:12:117:25 | setTaintedLeft : MutableTriple [left] : String | TripleTest.java:117:12:117:35 | getLeft(...) | provenance | MaD:408 |
+| TripleTest.java:117:12:117:25 | setTaintedLeft : MutableTriple [left] : String | TripleTest.java:117:12:117:35 | getLeft(...) | provenance | MaD:219 |
 | TripleTest.java:120:12:120:25 | setTaintedLeft : MutableTriple [left] : String | TripleTest.java:120:12:120:30 | setTaintedLeft.left | provenance |  |
-| TripleTest.java:124:12:124:27 | setTaintedMiddle : MutableTriple [middle] : String | TripleTest.java:124:12:124:39 | getMiddle(...) | provenance | MaD:410 |
+| TripleTest.java:124:12:124:27 | setTaintedMiddle : MutableTriple [middle] : String | TripleTest.java:124:12:124:39 | getMiddle(...) | provenance | MaD:221 |
 | TripleTest.java:127:12:127:27 | setTaintedMiddle : MutableTriple [middle] : String | TripleTest.java:127:12:127:34 | setTaintedMiddle.middle | provenance |  |
-| TripleTest.java:131:12:131:26 | setTaintedRight : MutableTriple [right] : String | TripleTest.java:131:12:131:37 | getRight(...) | provenance | MaD:412 |
+| TripleTest.java:131:12:131:26 | setTaintedRight : MutableTriple [right] : String | TripleTest.java:131:12:131:37 | getRight(...) | provenance | MaD:223 |
 | TripleTest.java:134:12:134:26 | setTaintedRight : MutableTriple [right] : String | TripleTest.java:134:12:134:32 | setTaintedRight.right | provenance |  |
-| TripleTest.java:135:12:135:40 | mutableTaintedLeftConstructed : MutableTriple [left] : String | TripleTest.java:135:12:135:50 | getLeft(...) | provenance | MaD:408 |
+| TripleTest.java:135:12:135:40 | mutableTaintedLeftConstructed : MutableTriple [left] : String | TripleTest.java:135:12:135:50 | getLeft(...) | provenance | MaD:219 |
 | TripleTest.java:138:12:138:40 | mutableTaintedLeftConstructed : MutableTriple [left] : String | TripleTest.java:138:12:138:45 | mutableTaintedLeftConstructed.left | provenance |  |
-| TripleTest.java:142:12:142:42 | mutableTaintedMiddleConstructed : MutableTriple [middle] : String | TripleTest.java:142:12:142:54 | getMiddle(...) | provenance | MaD:410 |
+| TripleTest.java:142:12:142:42 | mutableTaintedMiddleConstructed : MutableTriple [middle] : String | TripleTest.java:142:12:142:54 | getMiddle(...) | provenance | MaD:221 |
 | TripleTest.java:145:12:145:42 | mutableTaintedMiddleConstructed : MutableTriple [middle] : String | TripleTest.java:145:12:145:49 | mutableTaintedMiddleConstructed.middle | provenance |  |
-| TripleTest.java:149:12:149:41 | mutableTaintedRightConstructed : MutableTriple [right] : String | TripleTest.java:149:12:149:52 | getRight(...) | provenance | MaD:412 |
+| TripleTest.java:149:12:149:41 | mutableTaintedRightConstructed : MutableTriple [right] : String | TripleTest.java:149:12:149:52 | getRight(...) | provenance | MaD:223 |
 | TripleTest.java:152:12:152:41 | mutableTaintedRightConstructed : MutableTriple [right] : String | TripleTest.java:152:12:152:47 | mutableTaintedRightConstructed.right | provenance |  |
-| TripleTest.java:162:12:162:30 | mutableTaintedLeft2 : MutableTriple [left] : String | TripleTest.java:162:12:162:40 | getLeft(...) | provenance | MaD:408 |
-| TripleTest.java:166:12:166:32 | mutableTaintedMiddle2 : MutableTriple [middle] : String | TripleTest.java:166:12:166:44 | getMiddle(...) | provenance | MaD:410 |
-| TripleTest.java:170:12:170:31 | mutableTaintedRight2 : MutableTriple [right] : String | TripleTest.java:170:12:170:42 | getRight(...) | provenance | MaD:412 |
-| TripleTest.java:171:12:171:26 | setTaintedLeft2 : MutableTriple [left] : String | TripleTest.java:171:12:171:36 | getLeft(...) | provenance | MaD:408 |
-| TripleTest.java:175:12:175:28 | setTaintedMiddle2 : MutableTriple [middle] : String | TripleTest.java:175:12:175:40 | getMiddle(...) | provenance | MaD:410 |
-| TripleTest.java:179:12:179:27 | setTaintedRight2 : MutableTriple [right] : String | TripleTest.java:179:12:179:38 | getRight(...) | provenance | MaD:412 |
-| WordUtilsTest.java:9:31:9:37 | taint(...) : String | WordUtilsTest.java:9:10:9:38 | capitalize(...) | provenance | MaD:357 |
-| WordUtilsTest.java:10:31:10:37 | taint(...) : String | WordUtilsTest.java:10:10:10:48 | capitalize(...) | provenance | MaD:358 |
-| WordUtilsTest.java:11:36:11:42 | taint(...) : String | WordUtilsTest.java:11:10:11:43 | capitalizeFully(...) | provenance | MaD:359 |
-| WordUtilsTest.java:12:36:12:42 | taint(...) : String | WordUtilsTest.java:12:10:12:53 | capitalizeFully(...) | provenance | MaD:360 |
-| WordUtilsTest.java:13:29:13:35 | taint(...) : String | WordUtilsTest.java:13:10:13:36 | initials(...) | provenance | MaD:361 |
-| WordUtilsTest.java:14:29:14:35 | taint(...) : String | WordUtilsTest.java:14:10:14:46 | initials(...) | provenance | MaD:362 |
-| WordUtilsTest.java:15:29:15:35 | taint(...) : String | WordUtilsTest.java:15:10:15:36 | swapCase(...) | provenance | MaD:363 |
-| WordUtilsTest.java:16:33:16:39 | taint(...) : String | WordUtilsTest.java:16:10:16:40 | uncapitalize(...) | provenance | MaD:364 |
-| WordUtilsTest.java:17:33:17:39 | taint(...) : String | WordUtilsTest.java:17:10:17:50 | uncapitalize(...) | provenance | MaD:365 |
-| WordUtilsTest.java:18:25:18:31 | taint(...) : String | WordUtilsTest.java:18:10:18:35 | wrap(...) | provenance | MaD:366 |
-| WordUtilsTest.java:19:25:19:31 | taint(...) : String | WordUtilsTest.java:19:10:19:48 | wrap(...) | provenance | MaD:366 |
-| WordUtilsTest.java:20:39:20:45 | taint(...) : String | WordUtilsTest.java:20:10:20:53 | wrap(...) | provenance | MaD:367 |
-| WordUtilsTest.java:21:25:21:31 | taint(...) : String | WordUtilsTest.java:21:10:21:54 | wrap(...) | provenance | MaD:366 |
-| WordUtilsTest.java:22:39:22:45 | taint(...) : String | WordUtilsTest.java:22:10:22:59 | wrap(...) | provenance | MaD:368 |
+| TripleTest.java:162:12:162:30 | mutableTaintedLeft2 : MutableTriple [left] : String | TripleTest.java:162:12:162:40 | getLeft(...) | provenance | MaD:219 |
+| TripleTest.java:166:12:166:32 | mutableTaintedMiddle2 : MutableTriple [middle] : String | TripleTest.java:166:12:166:44 | getMiddle(...) | provenance | MaD:221 |
+| TripleTest.java:170:12:170:31 | mutableTaintedRight2 : MutableTriple [right] : String | TripleTest.java:170:12:170:42 | getRight(...) | provenance | MaD:223 |
+| TripleTest.java:171:12:171:26 | setTaintedLeft2 : MutableTriple [left] : String | TripleTest.java:171:12:171:36 | getLeft(...) | provenance | MaD:219 |
+| TripleTest.java:175:12:175:28 | setTaintedMiddle2 : MutableTriple [middle] : String | TripleTest.java:175:12:175:40 | getMiddle(...) | provenance | MaD:221 |
+| TripleTest.java:179:12:179:27 | setTaintedRight2 : MutableTriple [right] : String | TripleTest.java:179:12:179:38 | getRight(...) | provenance | MaD:223 |
+| WordUtilsTest.java:9:31:9:37 | taint(...) : String | WordUtilsTest.java:9:10:9:38 | capitalize(...) | provenance | MaD:165 |
+| WordUtilsTest.java:10:31:10:37 | taint(...) : String | WordUtilsTest.java:10:10:10:48 | capitalize(...) | provenance | MaD:166 |
+| WordUtilsTest.java:11:36:11:42 | taint(...) : String | WordUtilsTest.java:11:10:11:43 | capitalizeFully(...) | provenance | MaD:167 |
+| WordUtilsTest.java:12:36:12:42 | taint(...) : String | WordUtilsTest.java:12:10:12:53 | capitalizeFully(...) | provenance | MaD:168 |
+| WordUtilsTest.java:13:29:13:35 | taint(...) : String | WordUtilsTest.java:13:10:13:36 | initials(...) | provenance | MaD:169 |
+| WordUtilsTest.java:14:29:14:35 | taint(...) : String | WordUtilsTest.java:14:10:14:46 | initials(...) | provenance | MaD:170 |
+| WordUtilsTest.java:15:29:15:35 | taint(...) : String | WordUtilsTest.java:15:10:15:36 | swapCase(...) | provenance | MaD:171 |
+| WordUtilsTest.java:16:33:16:39 | taint(...) : String | WordUtilsTest.java:16:10:16:40 | uncapitalize(...) | provenance | MaD:172 |
+| WordUtilsTest.java:17:33:17:39 | taint(...) : String | WordUtilsTest.java:17:10:17:50 | uncapitalize(...) | provenance | MaD:173 |
+| WordUtilsTest.java:18:25:18:31 | taint(...) : String | WordUtilsTest.java:18:10:18:35 | wrap(...) | provenance | MaD:176 |
+| WordUtilsTest.java:19:25:19:31 | taint(...) : String | WordUtilsTest.java:19:10:19:48 | wrap(...) | provenance | MaD:176 |
+| WordUtilsTest.java:20:39:20:45 | taint(...) : String | WordUtilsTest.java:20:10:20:53 | wrap(...) | provenance | MaD:174 |
+| WordUtilsTest.java:21:25:21:31 | taint(...) : String | WordUtilsTest.java:21:10:21:54 | wrap(...) | provenance | MaD:176 |
+| WordUtilsTest.java:22:39:22:45 | taint(...) : String | WordUtilsTest.java:22:10:22:59 | wrap(...) | provenance | MaD:175 |
 | WordUtilsTextTest.java:9:31:9:37 | taint(...) : String | WordUtilsTextTest.java:9:10:9:57 | abbreviate(...) | provenance | MaD:650 |
 | WordUtilsTextTest.java:10:54:10:60 | taint(...) : String | WordUtilsTextTest.java:10:10:10:61 | abbreviate(...) | provenance | MaD:651 |
 | WordUtilsTextTest.java:11:31:11:37 | taint(...) : String | WordUtilsTextTest.java:11:10:11:38 | capitalize(...) | provenance | MaD:652 |
@@ -3329,45 +3303,35 @@ edges
 | WordUtilsTextTest.java:17:29:17:35 | taint(...) : String | WordUtilsTextTest.java:17:10:17:36 | swapCase(...) | provenance | MaD:658 |
 | WordUtilsTextTest.java:18:33:18:39 | taint(...) : String | WordUtilsTextTest.java:18:10:18:40 | uncapitalize(...) | provenance | MaD:659 |
 | WordUtilsTextTest.java:19:33:19:39 | taint(...) : String | WordUtilsTextTest.java:19:10:19:50 | uncapitalize(...) | provenance | MaD:660 |
-| WordUtilsTextTest.java:20:25:20:31 | taint(...) : String | WordUtilsTextTest.java:20:10:20:35 | wrap(...) | provenance | MaD:661 |
-| WordUtilsTextTest.java:21:25:21:31 | taint(...) : String | WordUtilsTextTest.java:21:10:21:48 | wrap(...) | provenance | MaD:661 |
-| WordUtilsTextTest.java:22:39:22:45 | taint(...) : String | WordUtilsTextTest.java:22:10:22:53 | wrap(...) | provenance | MaD:662 |
-| WordUtilsTextTest.java:23:25:23:31 | taint(...) : String | WordUtilsTextTest.java:23:10:23:54 | wrap(...) | provenance | MaD:661 |
-| WordUtilsTextTest.java:24:39:24:45 | taint(...) : String | WordUtilsTextTest.java:24:10:24:59 | wrap(...) | provenance | MaD:663 |
+| WordUtilsTextTest.java:20:25:20:31 | taint(...) : String | WordUtilsTextTest.java:20:10:20:35 | wrap(...) | provenance | MaD:663 |
+| WordUtilsTextTest.java:21:25:21:31 | taint(...) : String | WordUtilsTextTest.java:21:10:21:48 | wrap(...) | provenance | MaD:663 |
+| WordUtilsTextTest.java:22:39:22:45 | taint(...) : String | WordUtilsTextTest.java:22:10:22:53 | wrap(...) | provenance | MaD:661 |
+| WordUtilsTextTest.java:23:25:23:31 | taint(...) : String | WordUtilsTextTest.java:23:10:23:54 | wrap(...) | provenance | MaD:663 |
+| WordUtilsTextTest.java:24:39:24:45 | taint(...) : String | WordUtilsTextTest.java:24:10:24:59 | wrap(...) | provenance | MaD:662 |
 nodes
 | ArrayUtilsTest.java:20:33:20:56 | {...} : String[] [[]] : String | semmle.label | {...} : String[] [[]] : String |
 | ArrayUtilsTest.java:20:48:20:54 | taint(...) : String | semmle.label | taint(...) : String |
 | ArrayUtilsTest.java:23:12:23:44 | add(...) | semmle.label | add(...) |
-| ArrayUtilsTest.java:23:12:23:44 | add(...) : String[] [[]] : String | semmle.label | add(...) : String[] [[]] : String |
 | ArrayUtilsTest.java:23:37:23:43 | taint(...) : String | semmle.label | taint(...) : String |
 | ArrayUtilsTest.java:24:12:24:53 | add(...) | semmle.label | add(...) |
-| ArrayUtilsTest.java:24:12:24:53 | add(...) : String[] [[]] : String | semmle.label | add(...) : String[] [[]] : String |
 | ArrayUtilsTest.java:24:27:24:40 | alreadyTainted : String[] [[]] : String | semmle.label | alreadyTainted : String[] [[]] : String |
 | ArrayUtilsTest.java:26:12:26:41 | add(...) | semmle.label | add(...) |
-| ArrayUtilsTest.java:26:12:26:41 | add(...) : String[] [[]] : String | semmle.label | add(...) : String[] [[]] : String |
 | ArrayUtilsTest.java:26:34:26:40 | taint(...) : String | semmle.label | taint(...) : String |
 | ArrayUtilsTest.java:27:12:27:50 | add(...) | semmle.label | add(...) |
-| ArrayUtilsTest.java:27:12:27:50 | add(...) : String[] [[]] : String | semmle.label | add(...) : String[] [[]] : String |
 | ArrayUtilsTest.java:27:27:27:40 | alreadyTainted : String[] [[]] : String | semmle.label | alreadyTainted : String[] [[]] : String |
 | ArrayUtilsTest.java:28:12:28:53 | addAll(...) | semmle.label | addAll(...) |
-| ArrayUtilsTest.java:28:12:28:53 | addAll(...) : String[] [[]] : String | semmle.label | addAll(...) : String[] [[]] : String |
 | ArrayUtilsTest.java:28:12:28:53 | new ..[] { .. } : Object[] [[]] : String | semmle.label | new ..[] { .. } : Object[] [[]] : String |
 | ArrayUtilsTest.java:28:46:28:52 | taint(...) : String | semmle.label | taint(...) : String |
 | ArrayUtilsTest.java:29:12:29:53 | addAll(...) | semmle.label | addAll(...) |
-| ArrayUtilsTest.java:29:12:29:53 | addAll(...) : String[] [[]] : String | semmle.label | addAll(...) : String[] [[]] : String |
 | ArrayUtilsTest.java:29:12:29:53 | new ..[] { .. } : Object[] [[]] : String | semmle.label | new ..[] { .. } : Object[] [[]] : String |
 | ArrayUtilsTest.java:29:37:29:43 | taint(...) : String | semmle.label | taint(...) : String |
 | ArrayUtilsTest.java:30:12:30:67 | addAll(...) | semmle.label | addAll(...) |
-| ArrayUtilsTest.java:30:12:30:67 | addAll(...) : String[] [[]] : String | semmle.label | addAll(...) : String[] [[]] : String |
 | ArrayUtilsTest.java:30:30:30:43 | alreadyTainted : String[] [[]] : String | semmle.label | alreadyTainted : String[] [[]] : String |
 | ArrayUtilsTest.java:31:12:31:46 | addFirst(...) | semmle.label | addFirst(...) |
-| ArrayUtilsTest.java:31:12:31:46 | addFirst(...) : String[] [[]] : String | semmle.label | addFirst(...) : String[] [[]] : String |
 | ArrayUtilsTest.java:31:39:31:45 | taint(...) : String | semmle.label | taint(...) : String |
 | ArrayUtilsTest.java:32:12:32:55 | addFirst(...) | semmle.label | addFirst(...) |
-| ArrayUtilsTest.java:32:12:32:55 | addFirst(...) : String[] [[]] : String | semmle.label | addFirst(...) : String[] [[]] : String |
 | ArrayUtilsTest.java:32:32:32:45 | alreadyTainted : String[] [[]] : String | semmle.label | alreadyTainted : String[] [[]] : String |
 | ArrayUtilsTest.java:33:12:33:43 | clone(...) | semmle.label | clone(...) |
-| ArrayUtilsTest.java:33:12:33:43 | clone(...) : String[] [[]] : String | semmle.label | clone(...) : String[] [[]] : String |
 | ArrayUtilsTest.java:33:29:33:42 | alreadyTainted : String[] [[]] : String | semmle.label | alreadyTainted : String[] [[]] : String |
 | ArrayUtilsTest.java:34:12:34:44 | get(...) | semmle.label | get(...) |
 | ArrayUtilsTest.java:34:27:34:40 | alreadyTainted : String[] [[]] : String | semmle.label | alreadyTainted : String[] [[]] : String |
@@ -3376,50 +3340,36 @@ nodes
 | ArrayUtilsTest.java:38:12:38:44 | get(...) | semmle.label | get(...) |
 | ArrayUtilsTest.java:38:37:38:43 | taint(...) : String | semmle.label | taint(...) : String |
 | ArrayUtilsTest.java:40:12:40:67 | insert(...) | semmle.label | insert(...) |
-| ArrayUtilsTest.java:40:12:40:67 | insert(...) : String[] [[]] : String | semmle.label | insert(...) : String[] [[]] : String |
 | ArrayUtilsTest.java:40:33:40:46 | alreadyTainted : String[] [[]] : String | semmle.label | alreadyTainted : String[] [[]] : String |
 | ArrayUtilsTest.java:41:12:41:57 | insert(...) | semmle.label | insert(...) |
-| ArrayUtilsTest.java:41:12:41:57 | insert(...) : String[] [[]] : String | semmle.label | insert(...) : String[] [[]] : String |
 | ArrayUtilsTest.java:41:12:41:57 | new ..[] { .. } : Object[] [[]] : String | semmle.label | new ..[] { .. } : Object[] [[]] : String |
 | ArrayUtilsTest.java:41:40:41:46 | taint(...) : String | semmle.label | taint(...) : String |
 | ArrayUtilsTest.java:42:12:42:57 | insert(...) | semmle.label | insert(...) |
-| ArrayUtilsTest.java:42:12:42:57 | insert(...) : String[] [[]] : String | semmle.label | insert(...) : String[] [[]] : String |
 | ArrayUtilsTest.java:42:12:42:57 | new ..[] { .. } : Object[] [[]] : String | semmle.label | new ..[] { .. } : Object[] [[]] : String |
 | ArrayUtilsTest.java:42:50:42:56 | taint(...) : String | semmle.label | taint(...) : String |
 | ArrayUtilsTest.java:43:12:43:49 | nullToEmpty(...) | semmle.label | nullToEmpty(...) |
-| ArrayUtilsTest.java:43:12:43:49 | nullToEmpty(...) : String[] [[]] : String | semmle.label | nullToEmpty(...) : String[] [[]] : String |
 | ArrayUtilsTest.java:43:35:43:48 | alreadyTainted : String[] [[]] : String | semmle.label | alreadyTainted : String[] [[]] : String |
 | ArrayUtilsTest.java:44:12:44:65 | nullToEmpty(...) | semmle.label | nullToEmpty(...) |
-| ArrayUtilsTest.java:44:12:44:65 | nullToEmpty(...) : String[] [[]] : String | semmle.label | nullToEmpty(...) : String[] [[]] : String |
 | ArrayUtilsTest.java:44:35:44:48 | alreadyTainted : String[] [[]] : String | semmle.label | alreadyTainted : String[] [[]] : String |
 | ArrayUtilsTest.java:45:12:45:47 | remove(...) | semmle.label | remove(...) |
-| ArrayUtilsTest.java:45:12:45:47 | remove(...) : String[] [[]] : String | semmle.label | remove(...) : String[] [[]] : String |
 | ArrayUtilsTest.java:45:30:45:43 | alreadyTainted : String[] [[]] : String | semmle.label | alreadyTainted : String[] [[]] : String |
 | ArrayUtilsTest.java:47:12:47:53 | removeAll(...) | semmle.label | removeAll(...) |
-| ArrayUtilsTest.java:47:12:47:53 | removeAll(...) : String[] [[]] : String | semmle.label | removeAll(...) : String[] [[]] : String |
 | ArrayUtilsTest.java:47:33:47:46 | alreadyTainted : String[] [[]] : String | semmle.label | alreadyTainted : String[] [[]] : String |
 | ArrayUtilsTest.java:51:12:51:76 | removeAllOccurences(...) | semmle.label | removeAllOccurences(...) |
-| ArrayUtilsTest.java:51:12:51:76 | removeAllOccurences(...) : String[] [[]] : String | semmle.label | removeAllOccurences(...) : String[] [[]] : String |
 | ArrayUtilsTest.java:51:43:51:56 | alreadyTainted : String[] [[]] : String | semmle.label | alreadyTainted : String[] [[]] : String |
 | ArrayUtilsTest.java:53:12:53:77 | removeAllOccurrences(...) | semmle.label | removeAllOccurrences(...) |
-| ArrayUtilsTest.java:53:12:53:77 | removeAllOccurrences(...) : String[] [[]] : String | semmle.label | removeAllOccurrences(...) : String[] [[]] : String |
 | ArrayUtilsTest.java:53:44:53:57 | alreadyTainted : String[] [[]] : String | semmle.label | alreadyTainted : String[] [[]] : String |
 | ArrayUtilsTest.java:55:12:55:70 | removeElement(...) | semmle.label | removeElement(...) |
-| ArrayUtilsTest.java:55:12:55:70 | removeElement(...) : String[] [[]] : String | semmle.label | removeElement(...) : String[] [[]] : String |
 | ArrayUtilsTest.java:55:37:55:50 | alreadyTainted : String[] [[]] : String | semmle.label | alreadyTainted : String[] [[]] : String |
 | ArrayUtilsTest.java:56:12:56:58 | removeElements(...) | semmle.label | removeElements(...) |
-| ArrayUtilsTest.java:56:12:56:58 | removeElements(...) : Object[] [[]] : String | semmle.label | removeElements(...) : Object[] [[]] : String |
 | ArrayUtilsTest.java:56:38:56:51 | alreadyTainted : String[] [[]] : String | semmle.label | alreadyTainted : String[] [[]] : String |
 | ArrayUtilsTest.java:59:12:59:52 | subarray(...) | semmle.label | subarray(...) |
-| ArrayUtilsTest.java:59:12:59:52 | subarray(...) : String[] [[]] : String | semmle.label | subarray(...) : String[] [[]] : String |
 | ArrayUtilsTest.java:59:32:59:45 | alreadyTainted : String[] [[]] : String | semmle.label | alreadyTainted : String[] [[]] : String |
 | ArrayUtilsTest.java:61:12:61:47 | new ..[] { .. } : Object[] [[]] : String | semmle.label | new ..[] { .. } : Object[] [[]] : String |
 | ArrayUtilsTest.java:61:12:61:47 | toArray(...) | semmle.label | toArray(...) |
-| ArrayUtilsTest.java:61:12:61:47 | toArray(...) : String[] [[]] : String | semmle.label | toArray(...) : String[] [[]] : String |
 | ArrayUtilsTest.java:61:40:61:46 | taint(...) : String | semmle.label | taint(...) : String |
 | ArrayUtilsTest.java:62:12:62:47 | new ..[] { .. } : Object[] [[]] : String | semmle.label | new ..[] { .. } : Object[] [[]] : String |
 | ArrayUtilsTest.java:62:12:62:47 | toArray(...) | semmle.label | toArray(...) |
-| ArrayUtilsTest.java:62:12:62:47 | toArray(...) : String[] [[]] : String | semmle.label | toArray(...) : String[] [[]] : String |
 | ArrayUtilsTest.java:62:31:62:37 | taint(...) : String | semmle.label | taint(...) : String |
 | ArrayUtilsTest.java:63:12:63:43 | toMap(...) : Map [<map.value>] : Object | semmle.label | toMap(...) : Map [<map.value>] : Object |
 | ArrayUtilsTest.java:63:12:63:54 | get(...) | semmle.label | get(...) |
@@ -3430,10 +3380,8 @@ nodes
 | ArrayUtilsTest.java:69:56:69:66 | taintedInts : int[] [[]] : Number | semmle.label | taintedInts : int[] [[]] : Number |
 | ArrayUtilsTest.java:70:12:70:27 | taintedBoxedInts | semmle.label | taintedBoxedInts |
 | ArrayUtilsTest.java:71:12:71:51 | toPrimitive(...) | semmle.label | toPrimitive(...) |
-| ArrayUtilsTest.java:71:12:71:51 | toPrimitive(...) : int[] [[]] : Number | semmle.label | toPrimitive(...) : int[] [[]] : Number |
 | ArrayUtilsTest.java:71:35:71:50 | taintedBoxedInts : Integer[] [[]] : Number | semmle.label | taintedBoxedInts : Integer[] [[]] : Number |
 | ArrayUtilsTest.java:72:12:72:70 | toPrimitive(...) | semmle.label | toPrimitive(...) |
-| ArrayUtilsTest.java:72:12:72:70 | toPrimitive(...) : int[] [[]] : Number | semmle.label | toPrimitive(...) : int[] [[]] : Number |
 | ArrayUtilsTest.java:72:53:72:69 | taint(...) : Number | semmle.label | taint(...) : Number |
 | MutableTest.java:11:39:11:66 | new MutableObject<String>(...) : MutableObject [org.apache.commons.lang3.mutable.MutableObject.value] : String | semmle.label | new MutableObject<String>(...) : MutableObject [org.apache.commons.lang3.mutable.MutableObject.value] : String |
 | MutableTest.java:11:59:11:65 | taint(...) : String | semmle.label | taint(...) : String |
diff --git a/java/ql/test/library-tests/frameworks/apache-http/flow.ql b/java/ql/test/library-tests/frameworks/apache-http/flow.ql
index 2ca4eeafdb3..b2f5b2d023b 100644
--- a/java/ql/test/library-tests/frameworks/apache-http/flow.ql
+++ b/java/ql/test/library-tests/frameworks/apache-http/flow.ql
@@ -9,7 +9,7 @@ module Config implements DataFlow::ConfigSig {
   predicate isSource(DataFlow::Node n) {
     n.asExpr().(MethodCall).getMethod().hasName("taint")
     or
-    n instanceof ThreatModelFlowSource
+    n instanceof ActiveThreatModelSource
   }
 
   predicate isSink(DataFlow::Node n) {
diff --git a/java/ql/test/library-tests/frameworks/gson/test.expected b/java/ql/test/library-tests/frameworks/gson/test.expected
index 374d45f1603..304a01a9d48 100644
--- a/java/ql/test/library-tests/frameworks/gson/test.expected
+++ b/java/ql/test/library-tests/frameworks/gson/test.expected
@@ -1,35 +1,35 @@
 models
-| 1 | Summary: com.google.gson; Gson; false; fromJson; ; ; Argument[0]; ReturnValue; taint; manual |
-| 2 | Summary: com.google.gson; Gson; false; toJson; (JsonElement); ; Argument[0]; ReturnValue; taint; manual |
-| 3 | Summary: com.google.gson; Gson; false; toJson; (JsonElement,JsonWriter); ; Argument[0]; Argument[1]; taint; manual |
-| 4 | Summary: com.google.gson; Gson; false; toJson; (JsonElement,Appendable); ; Argument[0]; Argument[1]; taint; manual |
-| 5 | Summary: com.google.gson; Gson; false; toJson; (Object); ; Argument[0]; ReturnValue; taint; manual |
-| 6 | Summary: com.google.gson; Gson; false; toJson; (Object,Appendable); ; Argument[0]; Argument[1]; taint; manual |
-| 7 | Summary: com.google.gson; Gson; false; toJson; (Object,Type); ; Argument[0]; ReturnValue; taint; manual |
-| 8 | Summary: com.google.gson; Gson; false; toJson; (Object,Type,Appendable); ; Argument[0]; Argument[2]; taint; manual |
-| 9 | Summary: com.google.gson; Gson; false; toJson; (Object,Type,JsonWriter); ; Argument[0]; Argument[2]; taint; manual |
-| 10 | Summary: com.google.gson; Gson; false; toJsonTree; (Object); ; Argument[0]; ReturnValue; taint; manual |
-| 11 | Summary: com.google.gson; Gson; false; toJsonTree; (Object,Type); ; Argument[0]; ReturnValue; taint; manual |
-| 12 | Summary: com.google.gson; Gson; false; newJsonReader; ; ; Argument[0]; ReturnValue; taint; manual |
-| 13 | Summary: com.google.gson; Gson; false; newJsonWriter; ; ; Argument[0]; ReturnValue; taint; manual |
-| 14 | Summary: com.google.gson.stream; JsonReader; false; nextName; ; ; Argument[this]; ReturnValue; taint; manual |
-| 15 | Summary: com.google.gson.stream; JsonReader; false; nextString; ; ; Argument[this]; ReturnValue; taint; manual |
-| 16 | Summary: com.google.gson; JsonElement; true; getAsByte; (); ; Argument[this]; ReturnValue; taint; manual |
-| 17 | Summary: com.google.gson; JsonElement; true; getAsCharacter; (); ; Argument[this]; ReturnValue; taint; manual |
-| 18 | Summary: com.google.gson; JsonElement; true; getAsJsonArray; (); ; Argument[this]; ReturnValue; taint; manual |
-| 19 | Summary: com.google.gson; JsonElement; true; getAsJsonObject; (); ; Argument[this]; ReturnValue; taint; manual |
-| 20 | Summary: com.google.gson; JsonElement; true; getAsJsonPrimitive; (); ; Argument[this]; ReturnValue; taint; manual |
-| 21 | Summary: com.google.gson; JsonElement; true; getAsString; (); ; Argument[this]; ReturnValue; taint; manual |
-| 22 | Summary: com.google.gson; JsonElement; true; toString; (); ; Argument[this]; ReturnValue; taint; manual |
-| 23 | Summary: com.google.gson; JsonArray; true; add; (Boolean); ; Argument[0]; Argument[this].Element; taint; manual |
-| 24 | Summary: com.google.gson; JsonArray; true; add; (Character); ; Argument[0]; Argument[this].Element; taint; manual |
-| 25 | Summary: com.google.gson; JsonArray; true; add; (JsonElement); ; Argument[0]; Argument[this].Element; value; manual |
-| 26 | Summary: com.google.gson; JsonArray; true; add; (Number); ; Argument[0]; Argument[this].Element; taint; manual |
-| 27 | Summary: com.google.gson; JsonArray; true; add; (String); ; Argument[0]; Argument[this].Element; taint; manual |
-| 28 | Summary: com.google.gson; JsonArray; true; addAll; (JsonArray); ; Argument[0].Element; Argument[this].Element; value; manual |
-| 29 | Summary: com.google.gson; JsonArray; true; asList; ; ; Argument[this].Element; ReturnValue.Element; value; manual |
-| 30 | Summary: com.google.gson; JsonArray; true; get; ; ; Argument[this].Element; ReturnValue; value; manual |
-| 31 | Summary: com.google.gson; JsonArray; true; set; ; ; Argument[1]; Argument[this].Element; value; manual |
+| 1 | Summary: com.google.gson.stream; JsonReader; false; nextName; ; ; Argument[this]; ReturnValue; taint; manual |
+| 2 | Summary: com.google.gson.stream; JsonReader; false; nextString; ; ; Argument[this]; ReturnValue; taint; manual |
+| 3 | Summary: com.google.gson; Gson; false; fromJson; ; ; Argument[0]; ReturnValue; taint; manual |
+| 4 | Summary: com.google.gson; Gson; false; newJsonReader; ; ; Argument[0]; ReturnValue; taint; manual |
+| 5 | Summary: com.google.gson; Gson; false; newJsonWriter; ; ; Argument[0]; ReturnValue; taint; manual |
+| 6 | Summary: com.google.gson; Gson; false; toJson; (JsonElement); ; Argument[0]; ReturnValue; taint; manual |
+| 7 | Summary: com.google.gson; Gson; false; toJson; (JsonElement,Appendable); ; Argument[0]; Argument[1]; taint; manual |
+| 8 | Summary: com.google.gson; Gson; false; toJson; (JsonElement,JsonWriter); ; Argument[0]; Argument[1]; taint; manual |
+| 9 | Summary: com.google.gson; Gson; false; toJson; (Object); ; Argument[0]; ReturnValue; taint; manual |
+| 10 | Summary: com.google.gson; Gson; false; toJson; (Object,Appendable); ; Argument[0]; Argument[1]; taint; manual |
+| 11 | Summary: com.google.gson; Gson; false; toJson; (Object,Type); ; Argument[0]; ReturnValue; taint; manual |
+| 12 | Summary: com.google.gson; Gson; false; toJson; (Object,Type,Appendable); ; Argument[0]; Argument[2]; taint; manual |
+| 13 | Summary: com.google.gson; Gson; false; toJson; (Object,Type,JsonWriter); ; Argument[0]; Argument[2]; taint; manual |
+| 14 | Summary: com.google.gson; Gson; false; toJsonTree; (Object); ; Argument[0]; ReturnValue; taint; manual |
+| 15 | Summary: com.google.gson; Gson; false; toJsonTree; (Object,Type); ; Argument[0]; ReturnValue; taint; manual |
+| 16 | Summary: com.google.gson; JsonArray; true; add; (Boolean); ; Argument[0]; Argument[this].Element; taint; manual |
+| 17 | Summary: com.google.gson; JsonArray; true; add; (Character); ; Argument[0]; Argument[this].Element; taint; manual |
+| 18 | Summary: com.google.gson; JsonArray; true; add; (JsonElement); ; Argument[0]; Argument[this].Element; value; manual |
+| 19 | Summary: com.google.gson; JsonArray; true; add; (Number); ; Argument[0]; Argument[this].Element; taint; manual |
+| 20 | Summary: com.google.gson; JsonArray; true; add; (String); ; Argument[0]; Argument[this].Element; taint; manual |
+| 21 | Summary: com.google.gson; JsonArray; true; addAll; (JsonArray); ; Argument[0].Element; Argument[this].Element; value; manual |
+| 22 | Summary: com.google.gson; JsonArray; true; asList; ; ; Argument[this].Element; ReturnValue.Element; value; manual |
+| 23 | Summary: com.google.gson; JsonArray; true; get; ; ; Argument[this].Element; ReturnValue; value; manual |
+| 24 | Summary: com.google.gson; JsonArray; true; set; ; ; Argument[1]; Argument[this].Element; value; manual |
+| 25 | Summary: com.google.gson; JsonElement; true; getAsByte; (); ; Argument[this]; ReturnValue; taint; manual |
+| 26 | Summary: com.google.gson; JsonElement; true; getAsCharacter; (); ; Argument[this]; ReturnValue; taint; manual |
+| 27 | Summary: com.google.gson; JsonElement; true; getAsJsonArray; (); ; Argument[this]; ReturnValue; taint; manual |
+| 28 | Summary: com.google.gson; JsonElement; true; getAsJsonObject; (); ; Argument[this]; ReturnValue; taint; manual |
+| 29 | Summary: com.google.gson; JsonElement; true; getAsJsonPrimitive; (); ; Argument[this]; ReturnValue; taint; manual |
+| 30 | Summary: com.google.gson; JsonElement; true; getAsString; (); ; Argument[this]; ReturnValue; taint; manual |
+| 31 | Summary: com.google.gson; JsonElement; true; toString; (); ; Argument[this]; ReturnValue; taint; manual |
 | 32 | Summary: com.google.gson; JsonObject; true; add; ; ; Argument[0]; Argument[this].MapKey; value; manual |
 | 33 | Summary: com.google.gson; JsonObject; true; add; ; ; Argument[1]; Argument[this].MapValue; value; manual |
 | 34 | Summary: com.google.gson; JsonObject; true; addProperty; (String,String); ; Argument[0]; Argument[this].MapKey; value; manual |
@@ -44,13 +44,13 @@ models
 | 43 | Summary: com.google.gson; JsonPrimitive; true; JsonPrimitive; (String); ; Argument[0]; Argument[this]; taint; manual |
 | 44 | Summary: java.lang; Iterable; true; iterator; (); ; Argument[this].Element; ReturnValue.Element; value; manual |
 | 45 | Summary: java.util; Iterator; true; next; ; ; Argument[this].Element; ReturnValue; value; manual |
-| 46 | Summary: java.util; Map; true; get; ; ; Argument[this].MapValue; ReturnValue; value; manual |
-| 47 | Summary: java.util; Map; true; keySet; (); ; Argument[this].MapKey; ReturnValue.Element; value; manual |
-| 48 | Summary: java.util; Map$Entry; true; getKey; ; ; Argument[this].MapKey; ReturnValue; value; manual |
-| 49 | Summary: java.util; Map$Entry; true; getValue; ; ; Argument[this].MapValue; ReturnValue; value; manual |
+| 46 | Summary: java.util; Map$Entry; true; getKey; ; ; Argument[this].MapKey; ReturnValue; value; manual |
+| 47 | Summary: java.util; Map$Entry; true; getValue; ; ; Argument[this].MapValue; ReturnValue; value; manual |
+| 48 | Summary: java.util; Map; true; get; ; ; Argument[this].MapValue; ReturnValue; value; manual |
+| 49 | Summary: java.util; Map; true; keySet; (); ; Argument[this].MapKey; ReturnValue.Element; value; manual |
 edges
 | Test.java:21:18:21:29 | map : Map [<map.key>] : String | Test.java:21:41:21:43 | map : Map [<map.key>] : String | provenance |  |
-| Test.java:21:41:21:43 | map : Map [<map.key>] : String | Test.java:21:41:21:52 | keySet(...) : Set [<element>] : String | provenance | MaD:47 |
+| Test.java:21:41:21:43 | map : Map [<map.key>] : String | Test.java:21:41:21:52 | keySet(...) : Set [<element>] : String | provenance | MaD:49 |
 | Test.java:21:41:21:52 | keySet(...) : Set [<element>] : String | Test.java:21:41:21:63 | iterator(...) : Iterator [<element>] : String | provenance | MaD:44 |
 | Test.java:21:41:21:63 | iterator(...) : Iterator [<element>] : String | Test.java:21:41:21:70 | next(...) : String | provenance | MaD:45 |
 | Test.java:22:19:22:32 | it : JsonArray [<element>] : JsonElement | Test.java:22:44:22:45 | it : JsonArray [<element>] : JsonElement | provenance |  |
@@ -72,22 +72,22 @@ edges
 | Test.java:22:44:22:56 | iterator(...) : Iterator [<element>] : Object | Test.java:22:44:22:63 | next(...) : Object | provenance | MaD:45 |
 | Test.java:22:44:22:56 | iterator(...) : Iterator [<element>] : String | Test.java:22:44:22:63 | next(...) : String | provenance | MaD:45 |
 | Test.java:23:20:23:31 | map : Map [<map.value>] : JsonElement | Test.java:23:43:23:45 | map : Map [<map.value>] : JsonElement | provenance |  |
-| Test.java:23:43:23:45 | map : Map [<map.value>] : JsonElement | Test.java:23:43:23:55 | get(...) : JsonElement | provenance | MaD:46 |
+| Test.java:23:43:23:45 | map : Map [<map.value>] : JsonElement | Test.java:23:43:23:55 | get(...) : JsonElement | provenance | MaD:48 |
 | Test.java:24:26:24:45 | container : JsonObject [<map.key>] : String | Test.java:24:57:24:65 | container : JsonObject [<map.key>] : String | provenance |  |
 | Test.java:24:57:24:65 | container : JsonObject [<map.key>] : String | Test.java:24:57:24:74 | keySet(...) : Set [<element>] : String | provenance | MaD:41 |
 | Test.java:24:57:24:74 | keySet(...) : Set [<element>] : String | Test.java:24:57:24:85 | iterator(...) : Iterator [<element>] : String | provenance | MaD:44 |
 | Test.java:24:57:24:85 | iterator(...) : Iterator [<element>] : String | Test.java:24:57:24:92 | next(...) : String | provenance | MaD:45 |
 | Test.java:25:25:25:48 | container : Entry [<map.key>] : String | Test.java:25:60:25:68 | container : Entry [<map.key>] : String | provenance |  |
-| Test.java:25:60:25:68 | container : Entry [<map.key>] : String | Test.java:25:60:25:77 | getKey(...) : String | provenance | MaD:48 |
+| Test.java:25:60:25:68 | container : Entry [<map.key>] : String | Test.java:25:60:25:77 | getKey(...) : String | provenance | MaD:46 |
 | Test.java:26:33:26:52 | container : JsonObject [<map.value>] : JsonElement | Test.java:26:64:26:72 | container : JsonObject [<map.value>] : JsonElement | provenance |  |
 | Test.java:26:33:26:52 | container : JsonObject [<map.value>] : Object | Test.java:26:64:26:72 | container : JsonObject [<map.value>] : Object | provenance |  |
 | Test.java:26:64:26:72 | container : JsonObject [<map.value>] : JsonElement | Test.java:26:64:26:82 | get(...) : JsonElement | provenance | MaD:40 |
 | Test.java:26:64:26:72 | container : JsonObject [<map.value>] : Object | Test.java:26:64:26:82 | get(...) : JsonElement | provenance | MaD:40 |
 | Test.java:27:28:27:51 | container : Entry [<map.value>] : JsonElement | Test.java:27:63:27:71 | container : Entry [<map.value>] : JsonElement | provenance |  |
-| Test.java:27:63:27:71 | container : Entry [<map.value>] : JsonElement | Test.java:27:63:27:82 | getValue(...) : JsonElement | provenance | MaD:49 |
+| Test.java:27:63:27:71 | container : Entry [<map.value>] : JsonElement | Test.java:27:63:27:82 | getValue(...) : JsonElement | provenance | MaD:47 |
 | Test.java:28:34:28:52 | element : JsonElement | Test.java:28:94:28:100 | element : JsonElement | provenance |  |
 | Test.java:28:88:28:88 | a [post update] : JsonArray [<element>] : JsonElement | Test.java:28:111:28:111 | a : JsonArray [<element>] : JsonElement | provenance |  |
-| Test.java:28:94:28:100 | element : JsonElement | Test.java:28:88:28:88 | a [post update] : JsonArray [<element>] : JsonElement | provenance | MaD:25 |
+| Test.java:28:94:28:100 | element : JsonElement | Test.java:28:88:28:88 | a [post update] : JsonArray [<element>] : JsonElement | provenance | MaD:18 |
 | Test.java:29:34:29:43 | key : String | Test.java:29:87:29:89 | key : String | provenance |  |
 | Test.java:29:81:29:81 | o [post update] : JsonObject [<map.key>] : String | Test.java:29:120:29:120 | o : JsonObject [<map.key>] : String | provenance |  |
 | Test.java:29:87:29:89 | key : String | Test.java:29:81:29:81 | o [post update] : JsonObject [<map.key>] : String | provenance | MaD:32 |
@@ -96,213 +96,213 @@ edges
 | Test.java:30:104:30:110 | element : JsonElement | Test.java:30:92:30:92 | o [post update] : JsonObject [<map.value>] : JsonElement | provenance | MaD:33 |
 | Test.java:39:20:39:39 | (...)... : JsonReader | Test.java:40:10:40:11 | in : JsonReader | provenance |  |
 | Test.java:39:32:39:39 | source(...) : Object | Test.java:39:20:39:39 | (...)... : JsonReader | provenance |  |
-| Test.java:40:10:40:11 | in : JsonReader | Test.java:40:10:40:22 | nextName(...) : String | provenance | MaD:14 |
+| Test.java:40:10:40:11 | in : JsonReader | Test.java:40:10:40:22 | nextName(...) : String | provenance | MaD:1 |
 | Test.java:40:10:40:22 | nextName(...) : String | Test.java:41:9:41:11 | out | provenance |  |
 | Test.java:46:20:46:39 | (...)... : JsonReader | Test.java:47:10:47:11 | in : JsonReader | provenance |  |
 | Test.java:46:32:46:39 | source(...) : Object | Test.java:46:20:46:39 | (...)... : JsonReader | provenance |  |
-| Test.java:47:10:47:11 | in : JsonReader | Test.java:47:10:47:24 | nextString(...) : String | provenance | MaD:15 |
+| Test.java:47:10:47:11 | in : JsonReader | Test.java:47:10:47:24 | nextString(...) : String | provenance | MaD:2 |
 | Test.java:47:10:47:24 | nextString(...) : String | Test.java:48:9:48:11 | out | provenance |  |
 | Test.java:53:21:53:41 | (...)... : JsonElement | Test.java:55:28:55:29 | in : JsonElement | provenance |  |
 | Test.java:53:34:53:41 | source(...) : Object | Test.java:53:21:53:41 | (...)... : JsonElement | provenance |  |
 | Test.java:55:10:55:43 | fromJson(...) : Object | Test.java:56:9:56:11 | out | provenance |  |
-| Test.java:55:28:55:29 | in : JsonElement | Test.java:55:10:55:43 | fromJson(...) : Object | provenance | MaD:1 |
+| Test.java:55:28:55:29 | in : JsonElement | Test.java:55:10:55:43 | fromJson(...) : Object | provenance | MaD:3 |
 | Test.java:61:21:61:41 | (...)... : JsonElement | Test.java:63:28:63:29 | in : JsonElement | provenance |  |
 | Test.java:61:34:61:41 | source(...) : Object | Test.java:61:21:61:41 | (...)... : JsonElement | provenance |  |
 | Test.java:63:10:63:42 | fromJson(...) : Object | Test.java:64:9:64:11 | out | provenance |  |
-| Test.java:63:28:63:29 | in : JsonElement | Test.java:63:10:63:42 | fromJson(...) : Object | provenance | MaD:1 |
+| Test.java:63:28:63:29 | in : JsonElement | Test.java:63:10:63:42 | fromJson(...) : Object | provenance | MaD:3 |
 | Test.java:69:21:69:41 | (...)... : JsonElement | Test.java:71:28:71:29 | in : JsonElement | provenance |  |
 | Test.java:69:34:69:41 | source(...) : Object | Test.java:69:21:69:41 | (...)... : JsonElement | provenance |  |
 | Test.java:71:10:71:47 | fromJson(...) : Object | Test.java:72:9:72:11 | out | provenance |  |
-| Test.java:71:28:71:29 | in : JsonElement | Test.java:71:10:71:47 | fromJson(...) : Object | provenance | MaD:1 |
+| Test.java:71:28:71:29 | in : JsonElement | Test.java:71:10:71:47 | fromJson(...) : Object | provenance | MaD:3 |
 | Test.java:77:20:77:39 | (...)... : JsonReader | Test.java:79:28:79:29 | in : JsonReader | provenance |  |
 | Test.java:77:32:77:39 | source(...) : Object | Test.java:77:20:77:39 | (...)... : JsonReader | provenance |  |
 | Test.java:79:10:79:42 | fromJson(...) : Object | Test.java:80:9:80:11 | out | provenance |  |
-| Test.java:79:28:79:29 | in : JsonReader | Test.java:79:10:79:42 | fromJson(...) : Object | provenance | MaD:1 |
+| Test.java:79:28:79:29 | in : JsonReader | Test.java:79:10:79:42 | fromJson(...) : Object | provenance | MaD:3 |
 | Test.java:85:20:85:39 | (...)... : JsonReader | Test.java:87:28:87:29 | in : JsonReader | provenance |  |
 | Test.java:85:32:85:39 | source(...) : Object | Test.java:85:20:85:39 | (...)... : JsonReader | provenance |  |
 | Test.java:87:10:87:47 | fromJson(...) : Object | Test.java:88:9:88:11 | out | provenance |  |
-| Test.java:87:28:87:29 | in : JsonReader | Test.java:87:10:87:47 | fromJson(...) : Object | provenance | MaD:1 |
+| Test.java:87:28:87:29 | in : JsonReader | Test.java:87:10:87:47 | fromJson(...) : Object | provenance | MaD:3 |
 | Test.java:93:16:93:31 | (...)... : Reader | Test.java:95:28:95:29 | in : Reader | provenance |  |
 | Test.java:93:24:93:31 | source(...) : Object | Test.java:93:16:93:31 | (...)... : Reader | provenance |  |
 | Test.java:95:10:95:43 | fromJson(...) : Object | Test.java:96:9:96:11 | out | provenance |  |
-| Test.java:95:28:95:29 | in : Reader | Test.java:95:10:95:43 | fromJson(...) : Object | provenance | MaD:1 |
+| Test.java:95:28:95:29 | in : Reader | Test.java:95:10:95:43 | fromJson(...) : Object | provenance | MaD:3 |
 | Test.java:101:16:101:31 | (...)... : Reader | Test.java:103:28:103:29 | in : Reader | provenance |  |
 | Test.java:101:24:101:31 | source(...) : Object | Test.java:101:16:101:31 | (...)... : Reader | provenance |  |
 | Test.java:103:10:103:42 | fromJson(...) : Object | Test.java:104:9:104:11 | out | provenance |  |
-| Test.java:103:28:103:29 | in : Reader | Test.java:103:10:103:42 | fromJson(...) : Object | provenance | MaD:1 |
+| Test.java:103:28:103:29 | in : Reader | Test.java:103:10:103:42 | fromJson(...) : Object | provenance | MaD:3 |
 | Test.java:109:16:109:31 | (...)... : Reader | Test.java:111:28:111:29 | in : Reader | provenance |  |
 | Test.java:109:24:109:31 | source(...) : Object | Test.java:109:16:109:31 | (...)... : Reader | provenance |  |
 | Test.java:111:10:111:47 | fromJson(...) : Object | Test.java:112:9:112:11 | out | provenance |  |
-| Test.java:111:28:111:29 | in : Reader | Test.java:111:10:111:47 | fromJson(...) : Object | provenance | MaD:1 |
+| Test.java:111:28:111:29 | in : Reader | Test.java:111:10:111:47 | fromJson(...) : Object | provenance | MaD:3 |
 | Test.java:117:16:117:31 | (...)... : String | Test.java:119:28:119:29 | in : String | provenance |  |
 | Test.java:117:24:117:31 | source(...) : Object | Test.java:117:16:117:31 | (...)... : String | provenance |  |
 | Test.java:119:10:119:43 | fromJson(...) : Object | Test.java:120:9:120:11 | out | provenance |  |
-| Test.java:119:28:119:29 | in : String | Test.java:119:10:119:43 | fromJson(...) : Object | provenance | MaD:1 |
+| Test.java:119:28:119:29 | in : String | Test.java:119:10:119:43 | fromJson(...) : Object | provenance | MaD:3 |
 | Test.java:125:16:125:31 | (...)... : String | Test.java:127:28:127:29 | in : String | provenance |  |
 | Test.java:125:24:125:31 | source(...) : Object | Test.java:125:16:125:31 | (...)... : String | provenance |  |
 | Test.java:127:10:127:42 | fromJson(...) : Object | Test.java:128:9:128:11 | out | provenance |  |
-| Test.java:127:28:127:29 | in : String | Test.java:127:10:127:42 | fromJson(...) : Object | provenance | MaD:1 |
+| Test.java:127:28:127:29 | in : String | Test.java:127:10:127:42 | fromJson(...) : Object | provenance | MaD:3 |
 | Test.java:133:16:133:31 | (...)... : String | Test.java:135:28:135:29 | in : String | provenance |  |
 | Test.java:133:24:133:31 | source(...) : Object | Test.java:133:16:133:31 | (...)... : String | provenance |  |
 | Test.java:135:10:135:47 | fromJson(...) : Object | Test.java:136:9:136:11 | out | provenance |  |
-| Test.java:135:28:135:29 | in : String | Test.java:135:10:135:47 | fromJson(...) : Object | provenance | MaD:1 |
+| Test.java:135:28:135:29 | in : String | Test.java:135:10:135:47 | fromJson(...) : Object | provenance | MaD:3 |
 | Test.java:141:16:141:31 | (...)... : Reader | Test.java:143:33:143:34 | in : Reader | provenance |  |
 | Test.java:141:24:141:31 | source(...) : Object | Test.java:141:16:141:31 | (...)... : Reader | provenance |  |
 | Test.java:143:10:143:35 | newJsonReader(...) : JsonReader | Test.java:144:9:144:11 | out | provenance |  |
-| Test.java:143:33:143:34 | in : Reader | Test.java:143:10:143:35 | newJsonReader(...) : JsonReader | provenance | MaD:12 |
+| Test.java:143:33:143:34 | in : Reader | Test.java:143:10:143:35 | newJsonReader(...) : JsonReader | provenance | MaD:4 |
 | Test.java:149:16:149:31 | (...)... : Writer | Test.java:151:33:151:34 | in : Writer | provenance |  |
 | Test.java:149:24:149:31 | source(...) : Object | Test.java:149:16:149:31 | (...)... : Writer | provenance |  |
 | Test.java:151:10:151:35 | newJsonWriter(...) : JsonWriter | Test.java:152:9:152:11 | out | provenance |  |
-| Test.java:151:33:151:34 | in : Writer | Test.java:151:10:151:35 | newJsonWriter(...) : JsonWriter | provenance | MaD:13 |
+| Test.java:151:33:151:34 | in : Writer | Test.java:151:10:151:35 | newJsonWriter(...) : JsonWriter | provenance | MaD:5 |
 | Test.java:157:21:157:41 | (...)... : JsonElement | Test.java:159:26:159:27 | in : JsonElement | provenance |  |
 | Test.java:157:34:157:41 | source(...) : Object | Test.java:157:21:157:41 | (...)... : JsonElement | provenance |  |
 | Test.java:159:10:159:28 | toJson(...) : String | Test.java:160:9:160:11 | out | provenance |  |
-| Test.java:159:26:159:27 | in : JsonElement | Test.java:159:10:159:28 | toJson(...) : String | provenance | MaD:2 |
+| Test.java:159:26:159:27 | in : JsonElement | Test.java:159:10:159:28 | toJson(...) : String | provenance | MaD:6 |
 | Test.java:165:21:165:41 | (...)... : JsonElement | Test.java:167:20:167:21 | in : JsonElement | provenance |  |
 | Test.java:165:34:165:41 | source(...) : Object | Test.java:165:21:165:41 | (...)... : JsonElement | provenance |  |
-| Test.java:167:20:167:21 | in : JsonElement | Test.java:167:24:167:26 | out [post update] : Appendable | provenance | MaD:4 |
+| Test.java:167:20:167:21 | in : JsonElement | Test.java:167:24:167:26 | out [post update] : Appendable | provenance | MaD:7 |
 | Test.java:167:24:167:26 | out [post update] : Appendable | Test.java:168:9:168:11 | out | provenance |  |
 | Test.java:173:21:173:41 | (...)... : JsonElement | Test.java:175:20:175:21 | in : JsonElement | provenance |  |
 | Test.java:173:34:173:41 | source(...) : Object | Test.java:173:21:173:41 | (...)... : JsonElement | provenance |  |
-| Test.java:175:20:175:21 | in : JsonElement | Test.java:175:24:175:26 | out [post update] : JsonWriter | provenance | MaD:3 |
+| Test.java:175:20:175:21 | in : JsonElement | Test.java:175:24:175:26 | out [post update] : JsonWriter | provenance | MaD:8 |
 | Test.java:175:24:175:26 | out [post update] : JsonWriter | Test.java:176:9:176:11 | out | provenance |  |
 | Test.java:181:16:181:31 | (...)... : Object | Test.java:183:26:183:27 | in : Object | provenance |  |
 | Test.java:181:24:181:31 | source(...) : Object | Test.java:181:16:181:31 | (...)... : Object | provenance |  |
 | Test.java:183:10:183:28 | toJson(...) : String | Test.java:184:9:184:11 | out | provenance |  |
-| Test.java:183:26:183:27 | in : Object | Test.java:183:10:183:28 | toJson(...) : String | provenance | MaD:5 |
+| Test.java:183:26:183:27 | in : Object | Test.java:183:10:183:28 | toJson(...) : String | provenance | MaD:9 |
 | Test.java:189:16:189:31 | (...)... : Object | Test.java:191:20:191:21 | in : Object | provenance |  |
 | Test.java:189:24:189:31 | source(...) : Object | Test.java:189:16:189:31 | (...)... : Object | provenance |  |
-| Test.java:191:20:191:21 | in : Object | Test.java:191:24:191:26 | out [post update] : Appendable | provenance | MaD:6 |
+| Test.java:191:20:191:21 | in : Object | Test.java:191:24:191:26 | out [post update] : Appendable | provenance | MaD:10 |
 | Test.java:191:24:191:26 | out [post update] : Appendable | Test.java:192:9:192:11 | out | provenance |  |
 | Test.java:197:16:197:31 | (...)... : Object | Test.java:199:26:199:27 | in : Object | provenance |  |
 | Test.java:197:24:197:31 | source(...) : Object | Test.java:197:16:197:31 | (...)... : Object | provenance |  |
 | Test.java:199:10:199:40 | toJson(...) : String | Test.java:200:9:200:11 | out | provenance |  |
-| Test.java:199:26:199:27 | in : Object | Test.java:199:10:199:40 | toJson(...) : String | provenance | MaD:7 |
+| Test.java:199:26:199:27 | in : Object | Test.java:199:10:199:40 | toJson(...) : String | provenance | MaD:11 |
 | Test.java:205:16:205:31 | (...)... : Object | Test.java:207:20:207:21 | in : Object | provenance |  |
 | Test.java:205:24:205:31 | source(...) : Object | Test.java:205:16:205:31 | (...)... : Object | provenance |  |
-| Test.java:207:20:207:21 | in : Object | Test.java:207:36:207:38 | out [post update] : Appendable | provenance | MaD:8 |
+| Test.java:207:20:207:21 | in : Object | Test.java:207:36:207:38 | out [post update] : Appendable | provenance | MaD:12 |
 | Test.java:207:36:207:38 | out [post update] : Appendable | Test.java:208:9:208:11 | out | provenance |  |
 | Test.java:213:16:213:31 | (...)... : Object | Test.java:215:20:215:21 | in : Object | provenance |  |
 | Test.java:213:24:213:31 | source(...) : Object | Test.java:213:16:213:31 | (...)... : Object | provenance |  |
-| Test.java:215:20:215:21 | in : Object | Test.java:215:36:215:38 | out [post update] : JsonWriter | provenance | MaD:9 |
+| Test.java:215:20:215:21 | in : Object | Test.java:215:36:215:38 | out [post update] : JsonWriter | provenance | MaD:13 |
 | Test.java:215:36:215:38 | out [post update] : JsonWriter | Test.java:216:9:216:11 | out | provenance |  |
 | Test.java:221:16:221:31 | (...)... : Object | Test.java:223:30:223:31 | in : Object | provenance |  |
 | Test.java:221:24:221:31 | source(...) : Object | Test.java:221:16:221:31 | (...)... : Object | provenance |  |
 | Test.java:223:10:223:32 | toJsonTree(...) : JsonElement | Test.java:224:9:224:11 | out | provenance |  |
-| Test.java:223:30:223:31 | in : Object | Test.java:223:10:223:32 | toJsonTree(...) : JsonElement | provenance | MaD:10 |
+| Test.java:223:30:223:31 | in : Object | Test.java:223:10:223:32 | toJsonTree(...) : JsonElement | provenance | MaD:14 |
 | Test.java:229:16:229:31 | (...)... : Object | Test.java:231:30:231:31 | in : Object | provenance |  |
 | Test.java:229:24:229:31 | source(...) : Object | Test.java:229:16:229:31 | (...)... : Object | provenance |  |
 | Test.java:231:10:231:38 | toJsonTree(...) : JsonElement | Test.java:232:9:232:11 | out | provenance |  |
-| Test.java:231:30:231:31 | in : Object | Test.java:231:10:231:38 | toJsonTree(...) : JsonElement | provenance | MaD:11 |
+| Test.java:231:30:231:31 | in : Object | Test.java:231:10:231:38 | toJsonTree(...) : JsonElement | provenance | MaD:15 |
 | Test.java:237:17:237:33 | (...)... : Boolean | Test.java:238:12:238:13 | in : Boolean | provenance |  |
 | Test.java:237:26:237:33 | source(...) : Object | Test.java:237:17:237:33 | (...)... : Boolean | provenance |  |
 | Test.java:238:4:238:6 | out [post update] : JsonArray [<element>] : Object | Test.java:239:20:239:22 | out : JsonArray [<element>] : Object | provenance |  |
-| Test.java:238:12:238:13 | in : Boolean | Test.java:238:4:238:6 | out [post update] : JsonArray [<element>] : Object | provenance | MaD:23 |
+| Test.java:238:12:238:13 | in : Boolean | Test.java:238:4:238:6 | out [post update] : JsonArray [<element>] : Object | provenance | MaD:16 |
 | Test.java:239:20:239:22 | out : JsonArray [<element>] : Object | Test.java:22:19:22:32 | it : JsonArray [<element>] : Object | provenance |  |
 | Test.java:239:20:239:22 | out : JsonArray [<element>] : Object | Test.java:239:9:239:23 | getElement(...) | provenance | MaD:44 |
 | Test.java:244:19:244:37 | (...)... : Number | Test.java:245:12:245:13 | in : Number | provenance |  |
 | Test.java:244:30:244:37 | source(...) : Object | Test.java:244:19:244:37 | (...)... : Number | provenance |  |
 | Test.java:245:4:245:6 | out [post update] : JsonArray [<element>] : Object | Test.java:246:20:246:22 | out : JsonArray [<element>] : Object | provenance |  |
-| Test.java:245:12:245:13 | in : Number | Test.java:245:4:245:6 | out [post update] : JsonArray [<element>] : Object | provenance | MaD:24 |
+| Test.java:245:12:245:13 | in : Number | Test.java:245:4:245:6 | out [post update] : JsonArray [<element>] : Object | provenance | MaD:17 |
 | Test.java:246:20:246:22 | out : JsonArray [<element>] : Object | Test.java:22:19:22:32 | it : JsonArray [<element>] : Object | provenance |  |
 | Test.java:246:20:246:22 | out : JsonArray [<element>] : Object | Test.java:246:9:246:23 | getElement(...) | provenance | MaD:44 |
 | Test.java:251:21:251:41 | (...)... : JsonElement | Test.java:252:12:252:13 | in : JsonElement | provenance |  |
 | Test.java:251:34:251:41 | source(...) : Object | Test.java:251:21:251:41 | (...)... : JsonElement | provenance |  |
 | Test.java:252:4:252:6 | out [post update] : JsonArray [<element>] : JsonElement | Test.java:253:20:253:22 | out : JsonArray [<element>] : JsonElement | provenance |  |
-| Test.java:252:12:252:13 | in : JsonElement | Test.java:252:4:252:6 | out [post update] : JsonArray [<element>] : JsonElement | provenance | MaD:25 |
+| Test.java:252:12:252:13 | in : JsonElement | Test.java:252:4:252:6 | out [post update] : JsonArray [<element>] : JsonElement | provenance | MaD:18 |
 | Test.java:253:20:253:22 | out : JsonArray [<element>] : JsonElement | Test.java:22:19:22:32 | it : JsonArray [<element>] : JsonElement | provenance |  |
 | Test.java:253:20:253:22 | out : JsonArray [<element>] : JsonElement | Test.java:253:9:253:23 | getElement(...) | provenance | MaD:44 |
 | Test.java:258:16:258:31 | (...)... : Number | Test.java:259:12:259:13 | in : Number | provenance |  |
 | Test.java:258:24:258:31 | source(...) : Object | Test.java:258:16:258:31 | (...)... : Number | provenance |  |
 | Test.java:259:4:259:6 | out [post update] : JsonArray [<element>] : Object | Test.java:260:20:260:22 | out : JsonArray [<element>] : Object | provenance |  |
-| Test.java:259:12:259:13 | in : Number | Test.java:259:4:259:6 | out [post update] : JsonArray [<element>] : Object | provenance | MaD:26 |
+| Test.java:259:12:259:13 | in : Number | Test.java:259:4:259:6 | out [post update] : JsonArray [<element>] : Object | provenance | MaD:19 |
 | Test.java:260:20:260:22 | out : JsonArray [<element>] : Object | Test.java:22:19:22:32 | it : JsonArray [<element>] : Object | provenance |  |
 | Test.java:260:20:260:22 | out : JsonArray [<element>] : Object | Test.java:260:9:260:23 | getElement(...) | provenance | MaD:44 |
 | Test.java:265:16:265:31 | (...)... : String | Test.java:266:12:266:13 | in : String | provenance |  |
 | Test.java:265:24:265:31 | source(...) : Object | Test.java:265:16:265:31 | (...)... : String | provenance |  |
 | Test.java:266:4:266:6 | out [post update] : JsonArray [<element>] : Object | Test.java:267:20:267:22 | out : JsonArray [<element>] : Object | provenance |  |
-| Test.java:266:12:266:13 | in : String | Test.java:266:4:266:6 | out [post update] : JsonArray [<element>] : Object | provenance | MaD:27 |
+| Test.java:266:12:266:13 | in : String | Test.java:266:4:266:6 | out [post update] : JsonArray [<element>] : Object | provenance | MaD:20 |
 | Test.java:267:20:267:22 | out : JsonArray [<element>] : Object | Test.java:22:19:22:32 | it : JsonArray [<element>] : Object | provenance |  |
 | Test.java:267:20:267:22 | out : JsonArray [<element>] : Object | Test.java:267:9:267:23 | getElement(...) | provenance | MaD:44 |
 | Test.java:272:19:272:63 | newWithElementDefault(...) : JsonArray [<element>] : JsonElement | Test.java:273:15:273:16 | in : JsonArray [<element>] : JsonElement | provenance |  |
 | Test.java:272:41:272:62 | (...)... : JsonElement | Test.java:28:34:28:52 | element : JsonElement | provenance |  |
-| Test.java:272:41:272:62 | (...)... : JsonElement | Test.java:272:19:272:63 | newWithElementDefault(...) : JsonArray [<element>] : JsonElement | provenance | MaD:25 |
+| Test.java:272:41:272:62 | (...)... : JsonElement | Test.java:272:19:272:63 | newWithElementDefault(...) : JsonArray [<element>] : JsonElement | provenance | MaD:18 |
 | Test.java:272:55:272:62 | source(...) : Object | Test.java:272:41:272:62 | (...)... : JsonElement | provenance |  |
 | Test.java:273:4:273:6 | out [post update] : JsonArray [<element>] : JsonElement | Test.java:274:20:274:22 | out : JsonArray [<element>] : JsonElement | provenance |  |
-| Test.java:273:15:273:16 | in : JsonArray [<element>] : JsonElement | Test.java:273:4:273:6 | out [post update] : JsonArray [<element>] : JsonElement | provenance | MaD:28 |
+| Test.java:273:15:273:16 | in : JsonArray [<element>] : JsonElement | Test.java:273:4:273:6 | out [post update] : JsonArray [<element>] : JsonElement | provenance | MaD:21 |
 | Test.java:274:20:274:22 | out : JsonArray [<element>] : JsonElement | Test.java:22:19:22:32 | it : JsonArray [<element>] : JsonElement | provenance |  |
 | Test.java:274:20:274:22 | out : JsonArray [<element>] : JsonElement | Test.java:274:9:274:23 | getElement(...) | provenance | MaD:44 |
 | Test.java:279:19:279:63 | newWithElementDefault(...) : JsonArray [<element>] : JsonElement | Test.java:280:10:280:11 | in : JsonArray [<element>] : JsonElement | provenance |  |
 | Test.java:279:41:279:62 | (...)... : JsonElement | Test.java:28:34:28:52 | element : JsonElement | provenance |  |
-| Test.java:279:41:279:62 | (...)... : JsonElement | Test.java:279:19:279:63 | newWithElementDefault(...) : JsonArray [<element>] : JsonElement | provenance | MaD:25 |
+| Test.java:279:41:279:62 | (...)... : JsonElement | Test.java:279:19:279:63 | newWithElementDefault(...) : JsonArray [<element>] : JsonElement | provenance | MaD:18 |
 | Test.java:279:55:279:62 | source(...) : Object | Test.java:279:41:279:62 | (...)... : JsonElement | provenance |  |
-| Test.java:280:10:280:11 | in : JsonArray [<element>] : JsonElement | Test.java:280:10:280:20 | asList(...) : List [<element>] : JsonElement | provenance | MaD:29 |
+| Test.java:280:10:280:11 | in : JsonArray [<element>] : JsonElement | Test.java:280:10:280:20 | asList(...) : List [<element>] : JsonElement | provenance | MaD:22 |
 | Test.java:280:10:280:20 | asList(...) : List [<element>] : JsonElement | Test.java:281:20:281:22 | out : List [<element>] : JsonElement | provenance |  |
 | Test.java:281:20:281:22 | out : List [<element>] : JsonElement | Test.java:22:19:22:32 | it : List [<element>] : JsonElement | provenance |  |
 | Test.java:281:20:281:22 | out : List [<element>] : JsonElement | Test.java:281:9:281:23 | getElement(...) | provenance | MaD:44 |
 | Test.java:286:19:286:63 | newWithElementDefault(...) : JsonArray [<element>] : JsonElement | Test.java:287:10:287:11 | in : JsonArray [<element>] : JsonElement | provenance |  |
 | Test.java:286:41:286:62 | (...)... : JsonElement | Test.java:28:34:28:52 | element : JsonElement | provenance |  |
-| Test.java:286:41:286:62 | (...)... : JsonElement | Test.java:286:19:286:63 | newWithElementDefault(...) : JsonArray [<element>] : JsonElement | provenance | MaD:25 |
+| Test.java:286:41:286:62 | (...)... : JsonElement | Test.java:286:19:286:63 | newWithElementDefault(...) : JsonArray [<element>] : JsonElement | provenance | MaD:18 |
 | Test.java:286:55:286:62 | source(...) : Object | Test.java:286:41:286:62 | (...)... : JsonElement | provenance |  |
-| Test.java:287:10:287:11 | in : JsonArray [<element>] : JsonElement | Test.java:287:10:287:18 | get(...) : JsonElement | provenance | MaD:30 |
+| Test.java:287:10:287:11 | in : JsonArray [<element>] : JsonElement | Test.java:287:10:287:18 | get(...) : JsonElement | provenance | MaD:23 |
 | Test.java:287:10:287:18 | get(...) : JsonElement | Test.java:288:9:288:11 | out | provenance |  |
 | Test.java:293:21:293:41 | (...)... : JsonElement | Test.java:294:15:294:16 | in : JsonElement | provenance |  |
 | Test.java:293:34:293:41 | source(...) : Object | Test.java:293:21:293:41 | (...)... : JsonElement | provenance |  |
 | Test.java:294:4:294:6 | out [post update] : JsonArray [<element>] : JsonElement | Test.java:295:20:295:22 | out : JsonArray [<element>] : JsonElement | provenance |  |
-| Test.java:294:15:294:16 | in : JsonElement | Test.java:294:4:294:6 | out [post update] : JsonArray [<element>] : JsonElement | provenance | MaD:31 |
+| Test.java:294:15:294:16 | in : JsonElement | Test.java:294:4:294:6 | out [post update] : JsonArray [<element>] : JsonElement | provenance | MaD:24 |
 | Test.java:295:20:295:22 | out : JsonArray [<element>] : JsonElement | Test.java:22:19:22:32 | it : JsonArray [<element>] : JsonElement | provenance |  |
 | Test.java:295:20:295:22 | out : JsonArray [<element>] : JsonElement | Test.java:295:9:295:23 | getElement(...) | provenance | MaD:44 |
 | Test.java:300:19:300:37 | (...)... : JsonArray | Test.java:301:10:301:11 | in : JsonArray | provenance |  |
 | Test.java:300:30:300:37 | source(...) : Object | Test.java:300:19:300:37 | (...)... : JsonArray | provenance |  |
-| Test.java:301:10:301:11 | in : JsonArray | Test.java:301:10:301:23 | getAsByte(...) : Number | provenance | MaD:16 |
+| Test.java:301:10:301:11 | in : JsonArray | Test.java:301:10:301:23 | getAsByte(...) : Number | provenance | MaD:25 |
 | Test.java:301:10:301:23 | getAsByte(...) : Number | Test.java:302:9:302:11 | out | provenance |  |
 | Test.java:307:21:307:41 | (...)... : JsonElement | Test.java:308:10:308:11 | in : JsonElement | provenance |  |
 | Test.java:307:34:307:41 | source(...) : Object | Test.java:307:21:307:41 | (...)... : JsonElement | provenance |  |
-| Test.java:308:10:308:11 | in : JsonElement | Test.java:308:10:308:23 | getAsByte(...) : Number | provenance | MaD:16 |
+| Test.java:308:10:308:11 | in : JsonElement | Test.java:308:10:308:23 | getAsByte(...) : Number | provenance | MaD:25 |
 | Test.java:308:10:308:23 | getAsByte(...) : Number | Test.java:309:9:309:11 | out | provenance |  |
 | Test.java:314:23:314:45 | (...)... : JsonPrimitive | Test.java:315:10:315:11 | in : JsonPrimitive | provenance |  |
 | Test.java:314:38:314:45 | source(...) : Object | Test.java:314:23:314:45 | (...)... : JsonPrimitive | provenance |  |
-| Test.java:315:10:315:11 | in : JsonPrimitive | Test.java:315:10:315:23 | getAsByte(...) : Number | provenance | MaD:16 |
+| Test.java:315:10:315:11 | in : JsonPrimitive | Test.java:315:10:315:23 | getAsByte(...) : Number | provenance | MaD:25 |
 | Test.java:315:10:315:23 | getAsByte(...) : Number | Test.java:316:9:316:11 | out | provenance |  |
 | Test.java:321:19:321:37 | (...)... : JsonArray | Test.java:322:10:322:11 | in : JsonArray | provenance |  |
 | Test.java:321:30:321:37 | source(...) : Object | Test.java:321:19:321:37 | (...)... : JsonArray | provenance |  |
-| Test.java:322:10:322:11 | in : JsonArray | Test.java:322:10:322:28 | getAsCharacter(...) : Number | provenance | MaD:17 |
+| Test.java:322:10:322:11 | in : JsonArray | Test.java:322:10:322:28 | getAsCharacter(...) : Number | provenance | MaD:26 |
 | Test.java:322:10:322:28 | getAsCharacter(...) : Number | Test.java:323:9:323:11 | out | provenance |  |
 | Test.java:328:21:328:41 | (...)... : JsonElement | Test.java:329:10:329:11 | in : JsonElement | provenance |  |
 | Test.java:328:34:328:41 | source(...) : Object | Test.java:328:21:328:41 | (...)... : JsonElement | provenance |  |
-| Test.java:329:10:329:11 | in : JsonElement | Test.java:329:10:329:28 | getAsCharacter(...) : Number | provenance | MaD:17 |
+| Test.java:329:10:329:11 | in : JsonElement | Test.java:329:10:329:28 | getAsCharacter(...) : Number | provenance | MaD:26 |
 | Test.java:329:10:329:28 | getAsCharacter(...) : Number | Test.java:330:9:330:11 | out | provenance |  |
 | Test.java:335:23:335:45 | (...)... : JsonPrimitive | Test.java:336:10:336:11 | in : JsonPrimitive | provenance |  |
 | Test.java:335:38:335:45 | source(...) : Object | Test.java:335:23:335:45 | (...)... : JsonPrimitive | provenance |  |
-| Test.java:336:10:336:11 | in : JsonPrimitive | Test.java:336:10:336:28 | getAsCharacter(...) : Number | provenance | MaD:17 |
+| Test.java:336:10:336:11 | in : JsonPrimitive | Test.java:336:10:336:28 | getAsCharacter(...) : Number | provenance | MaD:26 |
 | Test.java:336:10:336:28 | getAsCharacter(...) : Number | Test.java:337:9:337:11 | out | provenance |  |
 | Test.java:342:21:342:41 | (...)... : JsonElement | Test.java:343:10:343:11 | in : JsonElement | provenance |  |
 | Test.java:342:34:342:41 | source(...) : Object | Test.java:342:21:342:41 | (...)... : JsonElement | provenance |  |
-| Test.java:343:10:343:11 | in : JsonElement | Test.java:343:10:343:28 | getAsJsonArray(...) : JsonArray | provenance | MaD:18 |
+| Test.java:343:10:343:11 | in : JsonElement | Test.java:343:10:343:28 | getAsJsonArray(...) : JsonArray | provenance | MaD:27 |
 | Test.java:343:10:343:28 | getAsJsonArray(...) : JsonArray | Test.java:344:9:344:11 | out | provenance |  |
 | Test.java:349:21:349:41 | (...)... : JsonElement | Test.java:350:10:350:11 | in : JsonElement | provenance |  |
 | Test.java:349:34:349:41 | source(...) : Object | Test.java:349:21:349:41 | (...)... : JsonElement | provenance |  |
-| Test.java:350:10:350:11 | in : JsonElement | Test.java:350:10:350:29 | getAsJsonObject(...) : JsonObject | provenance | MaD:19 |
+| Test.java:350:10:350:11 | in : JsonElement | Test.java:350:10:350:29 | getAsJsonObject(...) : JsonObject | provenance | MaD:28 |
 | Test.java:350:10:350:29 | getAsJsonObject(...) : JsonObject | Test.java:351:9:351:11 | out | provenance |  |
 | Test.java:356:21:356:41 | (...)... : JsonElement | Test.java:357:10:357:11 | in : JsonElement | provenance |  |
 | Test.java:356:34:356:41 | source(...) : Object | Test.java:356:21:356:41 | (...)... : JsonElement | provenance |  |
-| Test.java:357:10:357:11 | in : JsonElement | Test.java:357:10:357:32 | getAsJsonPrimitive(...) : JsonPrimitive | provenance | MaD:20 |
+| Test.java:357:10:357:11 | in : JsonElement | Test.java:357:10:357:32 | getAsJsonPrimitive(...) : JsonPrimitive | provenance | MaD:29 |
 | Test.java:357:10:357:32 | getAsJsonPrimitive(...) : JsonPrimitive | Test.java:358:9:358:11 | out | provenance |  |
 | Test.java:363:19:363:37 | (...)... : JsonArray | Test.java:364:10:364:11 | in : JsonArray | provenance |  |
 | Test.java:363:30:363:37 | source(...) : Object | Test.java:363:19:363:37 | (...)... : JsonArray | provenance |  |
-| Test.java:364:10:364:11 | in : JsonArray | Test.java:364:10:364:25 | getAsString(...) : String | provenance | MaD:21 |
+| Test.java:364:10:364:11 | in : JsonArray | Test.java:364:10:364:25 | getAsString(...) : String | provenance | MaD:30 |
 | Test.java:364:10:364:25 | getAsString(...) : String | Test.java:365:9:365:11 | out | provenance |  |
 | Test.java:370:21:370:41 | (...)... : JsonElement | Test.java:371:10:371:11 | in : JsonElement | provenance |  |
 | Test.java:370:34:370:41 | source(...) : Object | Test.java:370:21:370:41 | (...)... : JsonElement | provenance |  |
-| Test.java:371:10:371:11 | in : JsonElement | Test.java:371:10:371:25 | getAsString(...) : String | provenance | MaD:21 |
+| Test.java:371:10:371:11 | in : JsonElement | Test.java:371:10:371:25 | getAsString(...) : String | provenance | MaD:30 |
 | Test.java:371:10:371:25 | getAsString(...) : String | Test.java:372:9:372:11 | out | provenance |  |
 | Test.java:377:23:377:45 | (...)... : JsonPrimitive | Test.java:378:10:378:11 | in : JsonPrimitive | provenance |  |
 | Test.java:377:38:377:45 | source(...) : Object | Test.java:377:23:377:45 | (...)... : JsonPrimitive | provenance |  |
-| Test.java:378:10:378:11 | in : JsonPrimitive | Test.java:378:10:378:25 | getAsString(...) : String | provenance | MaD:21 |
+| Test.java:378:10:378:11 | in : JsonPrimitive | Test.java:378:10:378:25 | getAsString(...) : String | provenance | MaD:30 |
 | Test.java:378:10:378:25 | getAsString(...) : String | Test.java:379:9:379:11 | out | provenance |  |
 | Test.java:384:21:384:41 | (...)... : JsonElement | Test.java:385:10:385:11 | in : JsonElement | provenance |  |
 | Test.java:384:34:384:41 | source(...) : Object | Test.java:384:21:384:41 | (...)... : JsonElement | provenance |  |
-| Test.java:385:10:385:11 | in : JsonElement | Test.java:385:10:385:22 | toString(...) : String | provenance | MaD:22 |
+| Test.java:385:10:385:11 | in : JsonElement | Test.java:385:10:385:22 | toString(...) : String | provenance | MaD:31 |
 | Test.java:385:10:385:22 | toString(...) : String | Test.java:386:9:386:11 | out | provenance |  |
 | Test.java:391:16:391:31 | (...)... : String | Test.java:392:12:392:13 | in : String | provenance |  |
 | Test.java:391:24:391:31 | source(...) : Object | Test.java:391:16:391:31 | (...)... : String | provenance |  |
@@ -335,7 +335,7 @@ edges
 | Test.java:420:10:420:11 | in : JsonObject [<map.key>] : String | Test.java:420:10:420:19 | asMap(...) : Map [<map.key>] : String | provenance | MaD:36 |
 | Test.java:420:10:420:19 | asMap(...) : Map [<map.key>] : String | Test.java:421:19:421:21 | out : Map [<map.key>] : String | provenance |  |
 | Test.java:421:19:421:21 | out : Map [<map.key>] : String | Test.java:21:18:21:29 | map : Map [<map.key>] : String | provenance |  |
-| Test.java:421:19:421:21 | out : Map [<map.key>] : String | Test.java:421:9:421:22 | getMapKey(...) | provenance | MaD:47 |
+| Test.java:421:19:421:21 | out : Map [<map.key>] : String | Test.java:421:9:421:22 | getMapKey(...) | provenance | MaD:49 |
 | Test.java:426:20:426:65 | newWithMapValueDefault(...) : JsonObject [<map.value>] : JsonElement | Test.java:427:10:427:11 | in : JsonObject [<map.value>] : JsonElement | provenance |  |
 | Test.java:426:43:426:64 | (...)... : JsonElement | Test.java:30:36:30:54 | element : JsonElement | provenance |  |
 | Test.java:426:43:426:64 | (...)... : JsonElement | Test.java:426:20:426:65 | newWithMapValueDefault(...) : JsonObject [<map.value>] : JsonElement | provenance | MaD:33 |
@@ -343,7 +343,7 @@ edges
 | Test.java:427:10:427:11 | in : JsonObject [<map.value>] : JsonElement | Test.java:427:10:427:19 | asMap(...) : Map [<map.value>] : JsonElement | provenance | MaD:37 |
 | Test.java:427:10:427:19 | asMap(...) : Map [<map.value>] : JsonElement | Test.java:428:21:428:23 | out : Map [<map.value>] : JsonElement | provenance |  |
 | Test.java:428:21:428:23 | out : Map [<map.value>] : JsonElement | Test.java:23:20:23:31 | map : Map [<map.value>] : JsonElement | provenance |  |
-| Test.java:428:21:428:23 | out : Map [<map.value>] : JsonElement | Test.java:428:9:428:24 | getMapValue(...) | provenance | MaD:46 |
+| Test.java:428:21:428:23 | out : Map [<map.value>] : JsonElement | Test.java:428:9:428:24 | getMapValue(...) | provenance | MaD:48 |
 | Test.java:433:20:433:58 | newWithMapKeyDefault(...) : JsonObject [<map.key>] : String | Test.java:434:10:434:11 | in : JsonObject [<map.key>] : String | provenance |  |
 | Test.java:433:41:433:57 | (...)... : String | Test.java:29:34:29:43 | key : String | provenance |  |
 | Test.java:433:41:433:57 | (...)... : String | Test.java:433:20:433:58 | newWithMapKeyDefault(...) : JsonObject [<map.key>] : String | provenance | MaD:32 |
@@ -351,7 +351,7 @@ edges
 | Test.java:434:10:434:11 | in : JsonObject [<map.key>] : String | Test.java:434:10:434:22 | entrySet(...) : Set [<element>, <map.key>] : String | provenance | MaD:38 |
 | Test.java:434:10:434:22 | entrySet(...) : Set [<element>, <map.key>] : String | Test.java:435:37:435:39 | out : Set [<element>, <map.key>] : String | provenance |  |
 | Test.java:435:26:435:40 | getElement(...) : Entry [<map.key>] : String | Test.java:25:25:25:48 | container : Entry [<map.key>] : String | provenance |  |
-| Test.java:435:26:435:40 | getElement(...) : Entry [<map.key>] : String | Test.java:435:9:435:41 | getMapKeyDefault(...) | provenance | MaD:48 |
+| Test.java:435:26:435:40 | getElement(...) : Entry [<map.key>] : String | Test.java:435:9:435:41 | getMapKeyDefault(...) | provenance | MaD:46 |
 | Test.java:435:37:435:39 | out : Set [<element>, <map.key>] : String | Test.java:22:19:22:32 | it : Set [<element>, <map.key>] : String | provenance |  |
 | Test.java:435:37:435:39 | out : Set [<element>, <map.key>] : String | Test.java:435:26:435:40 | getElement(...) : Entry [<map.key>] : String | provenance | MaD:44 |
 | Test.java:440:20:440:65 | newWithMapValueDefault(...) : JsonObject [<map.value>] : JsonElement | Test.java:441:10:441:11 | in : JsonObject [<map.value>] : JsonElement | provenance |  |
@@ -361,7 +361,7 @@ edges
 | Test.java:441:10:441:11 | in : JsonObject [<map.value>] : JsonElement | Test.java:441:10:441:22 | entrySet(...) : Set [<element>, <map.value>] : JsonElement | provenance | MaD:39 |
 | Test.java:441:10:441:22 | entrySet(...) : Set [<element>, <map.value>] : JsonElement | Test.java:442:39:442:41 | out : Set [<element>, <map.value>] : JsonElement | provenance |  |
 | Test.java:442:28:442:42 | getElement(...) : Entry [<map.value>] : JsonElement | Test.java:27:28:27:51 | container : Entry [<map.value>] : JsonElement | provenance |  |
-| Test.java:442:28:442:42 | getElement(...) : Entry [<map.value>] : JsonElement | Test.java:442:9:442:43 | getMapValueDefault(...) | provenance | MaD:49 |
+| Test.java:442:28:442:42 | getElement(...) : Entry [<map.value>] : JsonElement | Test.java:442:9:442:43 | getMapValueDefault(...) | provenance | MaD:47 |
 | Test.java:442:39:442:41 | out : Set [<element>, <map.value>] : JsonElement | Test.java:22:19:22:32 | it : Set [<element>, <map.value>] : JsonElement | provenance |  |
 | Test.java:442:39:442:41 | out : Set [<element>, <map.value>] : JsonElement | Test.java:442:28:442:42 | getElement(...) : Entry [<map.value>] : JsonElement | provenance | MaD:44 |
 | Test.java:447:20:447:65 | newWithMapValueDefault(...) : JsonObject [<map.value>] : JsonElement | Test.java:448:10:448:11 | in : JsonObject [<map.value>] : JsonElement | provenance |  |
diff --git a/java/ql/test/library-tests/frameworks/guava/generated/cache/test.expected b/java/ql/test/library-tests/frameworks/guava/generated/cache/test.expected
index a6fddabac83..a4413a612ca 100644
--- a/java/ql/test/library-tests/frameworks/guava/generated/cache/test.expected
+++ b/java/ql/test/library-tests/frameworks/guava/generated/cache/test.expected
@@ -2,8 +2,8 @@ models
 | 1 | Summary: com.google.common.cache; Cache; true; asMap; (); ; Argument[this].MapKey; ReturnValue.MapKey; value; manual |
 | 2 | Summary: com.google.common.cache; Cache; true; asMap; (); ; Argument[this].MapValue; ReturnValue.MapValue; value; manual |
 | 3 | Summary: com.google.common.cache; Cache; true; get; (Object,Callable); ; Argument[this].MapValue; ReturnValue; value; manual |
-| 4 | Summary: com.google.common.cache; Cache; true; getAllPresent; (Iterable); ; Argument[this].MapKey; ReturnValue.MapKey; value; manual |
-| 5 | Summary: com.google.common.cache; Cache; true; getAllPresent; (Iterable); ; Argument[0].Element; ReturnValue.MapKey; value; manual |
+| 4 | Summary: com.google.common.cache; Cache; true; getAllPresent; (Iterable); ; Argument[0].Element; ReturnValue.MapKey; value; manual |
+| 5 | Summary: com.google.common.cache; Cache; true; getAllPresent; (Iterable); ; Argument[this].MapKey; ReturnValue.MapKey; value; manual |
 | 6 | Summary: com.google.common.cache; Cache; true; getIfPresent; (Object); ; Argument[this].MapValue; ReturnValue; value; manual |
 | 7 | Summary: com.google.common.cache; Cache; true; put; (Object,Object); ; Argument[0]; Argument[this].MapKey; value; manual |
 | 8 | Summary: com.google.common.cache; Cache; true; put; (Object,Object); ; Argument[1]; Argument[this].MapValue; value; manual |
@@ -11,9 +11,9 @@ models
 | 10 | Summary: com.google.common.cache; Cache; true; putAll; (Map); ; Argument[0].MapValue; Argument[this].MapValue; value; manual |
 | 11 | Summary: com.google.common.cache; LoadingCache; true; apply; (Object); ; Argument[this].MapValue; ReturnValue; value; manual |
 | 12 | Summary: com.google.common.cache; LoadingCache; true; get; (Object); ; Argument[this].MapValue; ReturnValue; value; manual |
-| 13 | Summary: com.google.common.cache; LoadingCache; true; getAll; (Iterable); ; Argument[this].MapValue; ReturnValue.MapValue; value; manual |
-| 14 | Summary: com.google.common.cache; LoadingCache; true; getAll; (Iterable); ; Argument[0].Element; Argument[this].MapKey; value; manual |
-| 15 | Summary: com.google.common.cache; LoadingCache; true; getAll; (Iterable); ; Argument[0].Element; ReturnValue.MapKey; value; manual |
+| 13 | Summary: com.google.common.cache; LoadingCache; true; getAll; (Iterable); ; Argument[0].Element; Argument[this].MapKey; value; manual |
+| 14 | Summary: com.google.common.cache; LoadingCache; true; getAll; (Iterable); ; Argument[0].Element; ReturnValue.MapKey; value; manual |
+| 15 | Summary: com.google.common.cache; LoadingCache; true; getAll; (Iterable); ; Argument[this].MapValue; ReturnValue.MapValue; value; manual |
 | 16 | Summary: com.google.common.cache; LoadingCache; true; getUnchecked; (Object); ; Argument[this].MapValue; ReturnValue; value; manual |
 | 17 | Summary: java.lang; Iterable; true; iterator; (); ; Argument[this].Element; ReturnValue.Element; value; manual |
 | 18 | Summary: java.util; Collection; true; add; ; ; Argument[0]; Argument[this].Element; value; manual |
@@ -103,13 +103,13 @@ edges
 | Test.java:88:33:88:40 | source(...) : Object | Test.java:20:33:20:41 | element : Object | provenance |  |
 | Test.java:88:33:88:40 | source(...) : Object | Test.java:88:18:88:41 | newWithElement(...) : ArrayList [<element>] : Object | provenance | MaD:18 |
 | Test.java:90:10:90:35 | getAllPresent(...) : ImmutableMap [<map.key>] : Object | Test.java:91:19:91:21 | out : ImmutableMap [<map.key>] : Object | provenance |  |
-| Test.java:90:33:90:34 | in : ArrayList [<element>] : Object | Test.java:90:10:90:35 | getAllPresent(...) : ImmutableMap [<map.key>] : Object | provenance | MaD:5 |
+| Test.java:90:33:90:34 | in : ArrayList [<element>] : Object | Test.java:90:10:90:35 | getAllPresent(...) : ImmutableMap [<map.key>] : Object | provenance | MaD:4 |
 | Test.java:91:19:91:21 | out : ImmutableMap [<map.key>] : Object | Test.java:16:20:16:37 | container : ImmutableMap [<map.key>] : Object | provenance |  |
 | Test.java:91:19:91:21 | out : ImmutableMap [<map.key>] : Object | Test.java:91:9:91:22 | getMapKey(...) | provenance | MaD:20 |
 | Test.java:96:15:96:42 | newCacheWithMapKey(...) : LoadingCache [<map.key>] : Object | Test.java:97:10:97:11 | in : LoadingCache [<map.key>] : Object | provenance |  |
 | Test.java:96:34:96:41 | source(...) : Object | Test.java:30:45:30:53 | element : Object | provenance |  |
 | Test.java:96:34:96:41 | source(...) : Object | Test.java:96:15:96:42 | newCacheWithMapKey(...) : LoadingCache [<map.key>] : Object | provenance | MaD:7 |
-| Test.java:97:10:97:11 | in : LoadingCache [<map.key>] : Object | Test.java:97:10:97:31 | getAllPresent(...) : ImmutableMap [<map.key>] : Object | provenance | MaD:4 |
+| Test.java:97:10:97:11 | in : LoadingCache [<map.key>] : Object | Test.java:97:10:97:31 | getAllPresent(...) : ImmutableMap [<map.key>] : Object | provenance | MaD:5 |
 | Test.java:97:10:97:31 | getAllPresent(...) : ImmutableMap [<map.key>] : Object | Test.java:98:19:98:21 | out : ImmutableMap [<map.key>] : Object | provenance |  |
 | Test.java:98:19:98:21 | out : ImmutableMap [<map.key>] : Object | Test.java:16:20:16:37 | container : ImmutableMap [<map.key>] : Object | provenance |  |
 | Test.java:98:19:98:21 | out : ImmutableMap [<map.key>] : Object | Test.java:98:9:98:22 | getMapKey(...) | provenance | MaD:20 |
@@ -157,7 +157,7 @@ edges
 | Test.java:152:43:152:50 | source(...) : Object | Test.java:20:33:20:41 | element : Object | provenance |  |
 | Test.java:152:43:152:50 | source(...) : Object | Test.java:152:28:152:51 | newWithElement(...) : ArrayList [<element>] : Object | provenance | MaD:18 |
 | Test.java:153:4:153:6 | out [post update] : LoadingCache [<map.key>] : Object | Test.java:154:19:154:21 | out : LoadingCache [<map.key>] : Object | provenance |  |
-| Test.java:153:15:153:16 | in : ArrayList [<element>] : Object | Test.java:153:4:153:6 | out [post update] : LoadingCache [<map.key>] : Object | provenance | MaD:14 |
+| Test.java:153:15:153:16 | in : ArrayList [<element>] : Object | Test.java:153:4:153:6 | out [post update] : LoadingCache [<map.key>] : Object | provenance | MaD:13 |
 | Test.java:154:19:154:21 | out : LoadingCache [<map.key>] : Object | Test.java:17:20:17:39 | container : LoadingCache [<map.key>] : Object | provenance |  |
 | Test.java:154:19:154:21 | out : LoadingCache [<map.key>] : Object | Test.java:154:9:154:22 | getMapKey(...) | provenance | MaD:1 |
 | Test.java:159:18:159:51 | (...)... : ArrayList [<element>] : Object | Test.java:161:26:161:27 | in : ArrayList [<element>] : Object | provenance |  |
@@ -165,13 +165,13 @@ edges
 | Test.java:159:43:159:50 | source(...) : Object | Test.java:20:33:20:41 | element : Object | provenance |  |
 | Test.java:159:43:159:50 | source(...) : Object | Test.java:159:28:159:51 | newWithElement(...) : ArrayList [<element>] : Object | provenance | MaD:18 |
 | Test.java:161:10:161:28 | getAll(...) : ImmutableMap [<map.key>] : Object | Test.java:162:19:162:21 | out : ImmutableMap [<map.key>] : Object | provenance |  |
-| Test.java:161:26:161:27 | in : ArrayList [<element>] : Object | Test.java:161:10:161:28 | getAll(...) : ImmutableMap [<map.key>] : Object | provenance | MaD:15 |
+| Test.java:161:26:161:27 | in : ArrayList [<element>] : Object | Test.java:161:10:161:28 | getAll(...) : ImmutableMap [<map.key>] : Object | provenance | MaD:14 |
 | Test.java:162:19:162:21 | out : ImmutableMap [<map.key>] : Object | Test.java:16:20:16:37 | container : ImmutableMap [<map.key>] : Object | provenance |  |
 | Test.java:162:19:162:21 | out : ImmutableMap [<map.key>] : Object | Test.java:162:9:162:22 | getMapKey(...) | provenance | MaD:20 |
 | Test.java:167:22:167:51 | newCacheWithMapValue(...) : LoadingCache [<map.value>] : Object | Test.java:168:10:168:11 | in : LoadingCache [<map.value>] : Object | provenance |  |
 | Test.java:167:43:167:50 | source(...) : Object | Test.java:40:47:40:55 | element : Object | provenance |  |
 | Test.java:167:43:167:50 | source(...) : Object | Test.java:167:22:167:51 | newCacheWithMapValue(...) : LoadingCache [<map.value>] : Object | provenance | MaD:8 |
-| Test.java:168:10:168:11 | in : LoadingCache [<map.value>] : Object | Test.java:168:10:168:24 | getAll(...) : ImmutableMap [<map.value>] : Object | provenance | MaD:13 |
+| Test.java:168:10:168:11 | in : LoadingCache [<map.value>] : Object | Test.java:168:10:168:24 | getAll(...) : ImmutableMap [<map.value>] : Object | provenance | MaD:15 |
 | Test.java:168:10:168:24 | getAll(...) : ImmutableMap [<map.value>] : Object | Test.java:169:21:169:23 | out : ImmutableMap [<map.value>] : Object | provenance |  |
 | Test.java:169:21:169:23 | out : ImmutableMap [<map.value>] : Object | Test.java:18:22:18:39 | container : ImmutableMap [<map.value>] : Object | provenance |  |
 | Test.java:169:21:169:23 | out : ImmutableMap [<map.value>] : Object | Test.java:169:9:169:24 | getMapValue(...) | provenance | MaD:23 |
diff --git a/java/ql/test/library-tests/frameworks/guava/generated/collect/test.expected b/java/ql/test/library-tests/frameworks/guava/generated/collect/test.expected
index cf50ddca138..0fd10d11f67 100644
--- a/java/ql/test/library-tests/frameworks/guava/generated/collect/test.expected
+++ b/java/ql/test/library-tests/frameworks/guava/generated/collect/test.expected
@@ -12,8 +12,8 @@ models
 | 11 | Summary: com.google.common.collect; BiMap; true; inverse; (); ; Argument[this].MapKey; ReturnValue.MapValue; value; manual |
 | 12 | Summary: com.google.common.collect; BiMap; true; inverse; (); ; Argument[this].MapValue; ReturnValue.MapKey; value; manual |
 | 13 | Summary: com.google.common.collect; ClassToInstanceMap; true; getInstance; (Class); ; Argument[this].MapValue; ReturnValue; value; manual |
-| 14 | Summary: com.google.common.collect; ClassToInstanceMap; true; putInstance; (Class,Object); ; Argument[this].MapValue; ReturnValue; value; manual |
-| 15 | Summary: com.google.common.collect; ClassToInstanceMap; true; putInstance; (Class,Object); ; Argument[1]; Argument[this].MapValue; value; manual |
+| 14 | Summary: com.google.common.collect; ClassToInstanceMap; true; putInstance; (Class,Object); ; Argument[1]; Argument[this].MapValue; value; manual |
+| 15 | Summary: com.google.common.collect; ClassToInstanceMap; true; putInstance; (Class,Object); ; Argument[this].MapValue; ReturnValue; value; manual |
 | 16 | Summary: com.google.common.collect; Collections2; false; filter; (Collection,Predicate); ; Argument[0].Element; ReturnValue.Element; value; manual |
 | 17 | Summary: com.google.common.collect; Collections2; false; orderedPermutations; (Iterable); ; Argument[0].Element; ReturnValue.Element.Element; value; manual |
 | 18 | Summary: com.google.common.collect; Collections2; false; orderedPermutations; (Iterable,Comparator); ; Argument[0].Element; ReturnValue.Element.Element; value; manual |
@@ -41,14 +41,14 @@ models
 | 40 | Summary: com.google.common.collect; ImmutableClassToInstanceMap; true; copyOf; (Map); ; Argument[0].MapValue; ReturnValue.MapValue; value; manual |
 | 41 | Summary: com.google.common.collect; ImmutableClassToInstanceMap; true; of; (Class,Object); ; Argument[0]; ReturnValue.MapKey; value; manual |
 | 42 | Summary: com.google.common.collect; ImmutableClassToInstanceMap; true; of; (Class,Object); ; Argument[1]; ReturnValue.MapValue; value; manual |
-| 43 | Summary: com.google.common.collect; ImmutableCollection; true; asList; (); ; Argument[this].Element; ReturnValue.Element; value; manual |
-| 44 | Summary: com.google.common.collect; ImmutableCollection$Builder; true; add; ; ; Argument[this]; ReturnValue; value; manual |
-| 45 | Summary: com.google.common.collect; ImmutableCollection$Builder; true; add; (Object); ; Argument[0]; Argument[this].Element; value; manual |
-| 46 | Summary: com.google.common.collect; ImmutableCollection$Builder; true; add; (Object[]); ; Argument[0].ArrayElement; Argument[this].Element; value; manual |
-| 47 | Summary: com.google.common.collect; ImmutableCollection$Builder; true; addAll; ; ; Argument[this]; ReturnValue; value; manual |
-| 48 | Summary: com.google.common.collect; ImmutableCollection$Builder; true; addAll; (Iterable); ; Argument[0].Element; Argument[this].Element; value; manual |
-| 49 | Summary: com.google.common.collect; ImmutableCollection$Builder; true; addAll; (Iterator); ; Argument[0].Element; Argument[this].Element; value; manual |
-| 50 | Summary: com.google.common.collect; ImmutableCollection$Builder; true; build; (); ; Argument[this].Element; ReturnValue.Element; value; manual |
+| 43 | Summary: com.google.common.collect; ImmutableCollection$Builder; true; add; (Object); ; Argument[0]; Argument[this].Element; value; manual |
+| 44 | Summary: com.google.common.collect; ImmutableCollection$Builder; true; add; (Object[]); ; Argument[0].ArrayElement; Argument[this].Element; value; manual |
+| 45 | Summary: com.google.common.collect; ImmutableCollection$Builder; true; add; ; ; Argument[this]; ReturnValue; value; manual |
+| 46 | Summary: com.google.common.collect; ImmutableCollection$Builder; true; addAll; (Iterable); ; Argument[0].Element; Argument[this].Element; value; manual |
+| 47 | Summary: com.google.common.collect; ImmutableCollection$Builder; true; addAll; (Iterator); ; Argument[0].Element; Argument[this].Element; value; manual |
+| 48 | Summary: com.google.common.collect; ImmutableCollection$Builder; true; addAll; ; ; Argument[this]; ReturnValue; value; manual |
+| 49 | Summary: com.google.common.collect; ImmutableCollection$Builder; true; build; (); ; Argument[this].Element; ReturnValue.Element; value; manual |
+| 50 | Summary: com.google.common.collect; ImmutableCollection; true; asList; (); ; Argument[this].Element; ReturnValue.Element; value; manual |
 | 51 | Summary: com.google.common.collect; ImmutableList; true; copyOf; (Collection); ; Argument[0].Element; ReturnValue.Element; value; manual |
 | 52 | Summary: com.google.common.collect; ImmutableList; true; copyOf; (Iterable); ; Argument[0].Element; ReturnValue.Element; value; manual |
 | 53 | Summary: com.google.common.collect; ImmutableList; true; copyOf; (Iterator); ; Argument[0].Element; ReturnValue.Element; value; manual |
@@ -68,75 +68,75 @@ models
 | 67 | Summary: com.google.common.collect; ImmutableListMultimap; true; of; ; ; Argument[7]; ReturnValue.MapValue; value; manual |
 | 68 | Summary: com.google.common.collect; ImmutableListMultimap; true; of; ; ; Argument[8]; ReturnValue.MapKey; value; manual |
 | 69 | Summary: com.google.common.collect; ImmutableListMultimap; true; of; ; ; Argument[9]; ReturnValue.MapValue; value; manual |
-| 70 | Summary: com.google.common.collect; ImmutableMap; true; copyOf; (Iterable); ; Argument[0].Element.MapKey; ReturnValue.MapKey; value; manual |
-| 71 | Summary: com.google.common.collect; ImmutableMap; true; copyOf; (Iterable); ; Argument[0].Element.MapValue; ReturnValue.MapValue; value; manual |
-| 72 | Summary: com.google.common.collect; ImmutableMap; true; copyOf; (Map); ; Argument[0].MapKey; ReturnValue.MapKey; value; manual |
-| 73 | Summary: com.google.common.collect; ImmutableMap; true; copyOf; (Map); ; Argument[0].MapValue; ReturnValue.MapValue; value; manual |
-| 74 | Summary: com.google.common.collect; ImmutableMap; true; of; ; ; Argument[0]; ReturnValue.MapKey; value; manual |
-| 75 | Summary: com.google.common.collect; ImmutableMap; true; of; ; ; Argument[1]; ReturnValue.MapValue; value; manual |
-| 76 | Summary: com.google.common.collect; ImmutableMap; true; of; ; ; Argument[2]; ReturnValue.MapKey; value; manual |
-| 77 | Summary: com.google.common.collect; ImmutableMap; true; of; ; ; Argument[3]; ReturnValue.MapValue; value; manual |
-| 78 | Summary: com.google.common.collect; ImmutableMap; true; of; ; ; Argument[4]; ReturnValue.MapKey; value; manual |
-| 79 | Summary: com.google.common.collect; ImmutableMap; true; of; ; ; Argument[5]; ReturnValue.MapValue; value; manual |
-| 80 | Summary: com.google.common.collect; ImmutableMap; true; of; ; ; Argument[6]; ReturnValue.MapKey; value; manual |
-| 81 | Summary: com.google.common.collect; ImmutableMap; true; of; ; ; Argument[7]; ReturnValue.MapValue; value; manual |
-| 82 | Summary: com.google.common.collect; ImmutableMap; true; of; ; ; Argument[8]; ReturnValue.MapKey; value; manual |
-| 83 | Summary: com.google.common.collect; ImmutableMap; true; of; ; ; Argument[9]; ReturnValue.MapValue; value; manual |
-| 84 | Summary: com.google.common.collect; ImmutableMap$Builder; true; build; (); ; Argument[this].MapKey; ReturnValue.MapKey; value; manual |
-| 85 | Summary: com.google.common.collect; ImmutableMap$Builder; true; build; (); ; Argument[this].MapValue; ReturnValue.MapValue; value; manual |
-| 86 | Summary: com.google.common.collect; ImmutableMap$Builder; true; orderEntriesByValue; (Comparator); ; Argument[this]; ReturnValue; value; manual |
-| 87 | Summary: com.google.common.collect; ImmutableMap$Builder; true; put; ; ; Argument[this]; ReturnValue; value; manual |
-| 88 | Summary: com.google.common.collect; ImmutableMap$Builder; true; put; (Map$Entry); ; Argument[0].MapKey; Argument[this].MapKey; value; manual |
-| 89 | Summary: com.google.common.collect; ImmutableMap$Builder; true; put; (Map$Entry); ; Argument[0].MapValue; Argument[this].MapValue; value; manual |
-| 90 | Summary: com.google.common.collect; ImmutableMap$Builder; true; put; (Object,Object); ; Argument[0]; Argument[this].MapKey; value; manual |
-| 91 | Summary: com.google.common.collect; ImmutableMap$Builder; true; put; (Object,Object); ; Argument[1]; Argument[this].MapValue; value; manual |
-| 92 | Summary: com.google.common.collect; ImmutableMap$Builder; true; putAll; ; ; Argument[this]; ReturnValue; value; manual |
-| 93 | Summary: com.google.common.collect; ImmutableMap$Builder; true; putAll; (Iterable); ; Argument[0].Element.MapKey; Argument[this].MapKey; value; manual |
-| 94 | Summary: com.google.common.collect; ImmutableMap$Builder; true; putAll; (Iterable); ; Argument[0].Element.MapValue; Argument[this].MapValue; value; manual |
-| 95 | Summary: com.google.common.collect; ImmutableMap$Builder; true; putAll; (Map); ; Argument[0].MapKey; Argument[this].MapKey; value; manual |
-| 96 | Summary: com.google.common.collect; ImmutableMap$Builder; true; putAll; (Map); ; Argument[0].MapValue; Argument[this].MapValue; value; manual |
-| 97 | Summary: com.google.common.collect; ImmutableMultimap; true; copyOf; (Iterable); ; Argument[0].Element.MapKey; ReturnValue.MapKey; value; manual |
-| 98 | Summary: com.google.common.collect; ImmutableMultimap; true; copyOf; (Iterable); ; Argument[0].Element.MapValue; ReturnValue.MapValue; value; manual |
-| 99 | Summary: com.google.common.collect; ImmutableMultimap; true; copyOf; (Multimap); ; Argument[0].MapKey; ReturnValue.MapKey; value; manual |
-| 100 | Summary: com.google.common.collect; ImmutableMultimap; true; copyOf; (Multimap); ; Argument[0].MapValue; ReturnValue.MapValue; value; manual |
-| 101 | Summary: com.google.common.collect; ImmutableMultimap; true; inverse; (); ; Argument[this].MapKey; ReturnValue.MapValue; value; manual |
-| 102 | Summary: com.google.common.collect; ImmutableMultimap; true; inverse; (); ; Argument[this].MapValue; ReturnValue.MapKey; value; manual |
-| 103 | Summary: com.google.common.collect; ImmutableMultimap; true; of; ; ; Argument[0]; ReturnValue.MapKey; value; manual |
-| 104 | Summary: com.google.common.collect; ImmutableMultimap; true; of; ; ; Argument[1]; ReturnValue.MapValue; value; manual |
-| 105 | Summary: com.google.common.collect; ImmutableMultimap; true; of; ; ; Argument[2]; ReturnValue.MapKey; value; manual |
-| 106 | Summary: com.google.common.collect; ImmutableMultimap; true; of; ; ; Argument[3]; ReturnValue.MapValue; value; manual |
-| 107 | Summary: com.google.common.collect; ImmutableMultimap; true; of; ; ; Argument[4]; ReturnValue.MapKey; value; manual |
-| 108 | Summary: com.google.common.collect; ImmutableMultimap; true; of; ; ; Argument[5]; ReturnValue.MapValue; value; manual |
-| 109 | Summary: com.google.common.collect; ImmutableMultimap; true; of; ; ; Argument[6]; ReturnValue.MapKey; value; manual |
-| 110 | Summary: com.google.common.collect; ImmutableMultimap; true; of; ; ; Argument[7]; ReturnValue.MapValue; value; manual |
-| 111 | Summary: com.google.common.collect; ImmutableMultimap; true; of; ; ; Argument[8]; ReturnValue.MapKey; value; manual |
-| 112 | Summary: com.google.common.collect; ImmutableMultimap; true; of; ; ; Argument[9]; ReturnValue.MapValue; value; manual |
-| 113 | Summary: com.google.common.collect; ImmutableMultimap$Builder; true; build; (); ; Argument[this].MapKey; ReturnValue.MapKey; value; manual |
-| 114 | Summary: com.google.common.collect; ImmutableMultimap$Builder; true; build; (); ; Argument[this].MapValue; ReturnValue.MapValue; value; manual |
-| 115 | Summary: com.google.common.collect; ImmutableMultimap$Builder; true; orderKeysBy; (Comparator); ; Argument[this]; ReturnValue; value; manual |
-| 116 | Summary: com.google.common.collect; ImmutableMultimap$Builder; true; orderValuesBy; (Comparator); ; Argument[this]; ReturnValue; value; manual |
-| 117 | Summary: com.google.common.collect; ImmutableMultimap$Builder; true; put; ; ; Argument[this]; ReturnValue; value; manual |
-| 118 | Summary: com.google.common.collect; ImmutableMultimap$Builder; true; put; (Map$Entry); ; Argument[0].MapKey; Argument[this].MapKey; value; manual |
-| 119 | Summary: com.google.common.collect; ImmutableMultimap$Builder; true; put; (Map$Entry); ; Argument[0].MapValue; Argument[this].MapValue; value; manual |
-| 120 | Summary: com.google.common.collect; ImmutableMultimap$Builder; true; put; (Object,Object); ; Argument[0]; Argument[this].MapKey; value; manual |
-| 121 | Summary: com.google.common.collect; ImmutableMultimap$Builder; true; put; (Object,Object); ; Argument[1]; Argument[this].MapValue; value; manual |
-| 122 | Summary: com.google.common.collect; ImmutableMultimap$Builder; true; putAll; ; ; Argument[this]; ReturnValue; value; manual |
-| 123 | Summary: com.google.common.collect; ImmutableMultimap$Builder; true; putAll; (Iterable); ; Argument[0].Element.MapKey; Argument[this].MapKey; value; manual |
-| 124 | Summary: com.google.common.collect; ImmutableMultimap$Builder; true; putAll; (Iterable); ; Argument[0].Element.MapValue; Argument[this].MapValue; value; manual |
-| 125 | Summary: com.google.common.collect; ImmutableMultimap$Builder; true; putAll; (Multimap); ; Argument[0].MapKey; Argument[this].MapKey; value; manual |
-| 126 | Summary: com.google.common.collect; ImmutableMultimap$Builder; true; putAll; (Multimap); ; Argument[0].MapValue; Argument[this].MapValue; value; manual |
-| 127 | Summary: com.google.common.collect; ImmutableMultimap$Builder; true; putAll; (Object,Iterable); ; Argument[0]; Argument[this].MapKey; value; manual |
-| 128 | Summary: com.google.common.collect; ImmutableMultimap$Builder; true; putAll; (Object,Iterable); ; Argument[1].Element; Argument[this].MapValue; value; manual |
-| 129 | Summary: com.google.common.collect; ImmutableMultimap$Builder; true; putAll; (Object,Object[]); ; Argument[0]; Argument[this].MapKey; value; manual |
-| 130 | Summary: com.google.common.collect; ImmutableMultimap$Builder; true; putAll; (Object,Object[]); ; Argument[1].ArrayElement; Argument[this].MapValue; value; manual |
-| 131 | Summary: com.google.common.collect; ImmutableMultiset; true; copyOf; (Iterable); ; Argument[0].Element; ReturnValue.Element; value; manual |
-| 132 | Summary: com.google.common.collect; ImmutableMultiset; true; copyOf; (Iterator); ; Argument[0].Element; ReturnValue.Element; value; manual |
-| 133 | Summary: com.google.common.collect; ImmutableMultiset; true; copyOf; (Object[]); ; Argument[0].ArrayElement; ReturnValue.Element; value; manual |
-| 134 | Summary: com.google.common.collect; ImmutableMultiset; true; of; ; ; Argument[0..5]; ReturnValue.Element; value; manual |
-| 135 | Summary: com.google.common.collect; ImmutableMultiset; true; of; ; ; Argument[6].ArrayElement; ReturnValue.Element; value; manual |
-| 136 | Summary: com.google.common.collect; ImmutableMultiset$Builder; true; addCopies; (Object,int); ; Argument[this]; ReturnValue; value; manual |
-| 137 | Summary: com.google.common.collect; ImmutableMultiset$Builder; true; addCopies; (Object,int); ; Argument[0]; Argument[this].Element; value; manual |
-| 138 | Summary: com.google.common.collect; ImmutableMultiset$Builder; true; setCount; (Object,int); ; Argument[0]; Argument[this].Element; value; manual |
+| 70 | Summary: com.google.common.collect; ImmutableMap$Builder; true; build; (); ; Argument[this].MapKey; ReturnValue.MapKey; value; manual |
+| 71 | Summary: com.google.common.collect; ImmutableMap$Builder; true; build; (); ; Argument[this].MapValue; ReturnValue.MapValue; value; manual |
+| 72 | Summary: com.google.common.collect; ImmutableMap$Builder; true; orderEntriesByValue; (Comparator); ; Argument[this]; ReturnValue; value; manual |
+| 73 | Summary: com.google.common.collect; ImmutableMap$Builder; true; put; (Map$Entry); ; Argument[0].MapKey; Argument[this].MapKey; value; manual |
+| 74 | Summary: com.google.common.collect; ImmutableMap$Builder; true; put; (Map$Entry); ; Argument[0].MapValue; Argument[this].MapValue; value; manual |
+| 75 | Summary: com.google.common.collect; ImmutableMap$Builder; true; put; (Object,Object); ; Argument[0]; Argument[this].MapKey; value; manual |
+| 76 | Summary: com.google.common.collect; ImmutableMap$Builder; true; put; (Object,Object); ; Argument[1]; Argument[this].MapValue; value; manual |
+| 77 | Summary: com.google.common.collect; ImmutableMap$Builder; true; put; ; ; Argument[this]; ReturnValue; value; manual |
+| 78 | Summary: com.google.common.collect; ImmutableMap$Builder; true; putAll; (Iterable); ; Argument[0].Element.MapKey; Argument[this].MapKey; value; manual |
+| 79 | Summary: com.google.common.collect; ImmutableMap$Builder; true; putAll; (Iterable); ; Argument[0].Element.MapValue; Argument[this].MapValue; value; manual |
+| 80 | Summary: com.google.common.collect; ImmutableMap$Builder; true; putAll; (Map); ; Argument[0].MapKey; Argument[this].MapKey; value; manual |
+| 81 | Summary: com.google.common.collect; ImmutableMap$Builder; true; putAll; (Map); ; Argument[0].MapValue; Argument[this].MapValue; value; manual |
+| 82 | Summary: com.google.common.collect; ImmutableMap$Builder; true; putAll; ; ; Argument[this]; ReturnValue; value; manual |
+| 83 | Summary: com.google.common.collect; ImmutableMap; true; copyOf; (Iterable); ; Argument[0].Element.MapKey; ReturnValue.MapKey; value; manual |
+| 84 | Summary: com.google.common.collect; ImmutableMap; true; copyOf; (Iterable); ; Argument[0].Element.MapValue; ReturnValue.MapValue; value; manual |
+| 85 | Summary: com.google.common.collect; ImmutableMap; true; copyOf; (Map); ; Argument[0].MapKey; ReturnValue.MapKey; value; manual |
+| 86 | Summary: com.google.common.collect; ImmutableMap; true; copyOf; (Map); ; Argument[0].MapValue; ReturnValue.MapValue; value; manual |
+| 87 | Summary: com.google.common.collect; ImmutableMap; true; of; ; ; Argument[0]; ReturnValue.MapKey; value; manual |
+| 88 | Summary: com.google.common.collect; ImmutableMap; true; of; ; ; Argument[1]; ReturnValue.MapValue; value; manual |
+| 89 | Summary: com.google.common.collect; ImmutableMap; true; of; ; ; Argument[2]; ReturnValue.MapKey; value; manual |
+| 90 | Summary: com.google.common.collect; ImmutableMap; true; of; ; ; Argument[3]; ReturnValue.MapValue; value; manual |
+| 91 | Summary: com.google.common.collect; ImmutableMap; true; of; ; ; Argument[4]; ReturnValue.MapKey; value; manual |
+| 92 | Summary: com.google.common.collect; ImmutableMap; true; of; ; ; Argument[5]; ReturnValue.MapValue; value; manual |
+| 93 | Summary: com.google.common.collect; ImmutableMap; true; of; ; ; Argument[6]; ReturnValue.MapKey; value; manual |
+| 94 | Summary: com.google.common.collect; ImmutableMap; true; of; ; ; Argument[7]; ReturnValue.MapValue; value; manual |
+| 95 | Summary: com.google.common.collect; ImmutableMap; true; of; ; ; Argument[8]; ReturnValue.MapKey; value; manual |
+| 96 | Summary: com.google.common.collect; ImmutableMap; true; of; ; ; Argument[9]; ReturnValue.MapValue; value; manual |
+| 97 | Summary: com.google.common.collect; ImmutableMultimap$Builder; true; build; (); ; Argument[this].MapKey; ReturnValue.MapKey; value; manual |
+| 98 | Summary: com.google.common.collect; ImmutableMultimap$Builder; true; build; (); ; Argument[this].MapValue; ReturnValue.MapValue; value; manual |
+| 99 | Summary: com.google.common.collect; ImmutableMultimap$Builder; true; orderKeysBy; (Comparator); ; Argument[this]; ReturnValue; value; manual |
+| 100 | Summary: com.google.common.collect; ImmutableMultimap$Builder; true; orderValuesBy; (Comparator); ; Argument[this]; ReturnValue; value; manual |
+| 101 | Summary: com.google.common.collect; ImmutableMultimap$Builder; true; put; (Map$Entry); ; Argument[0].MapKey; Argument[this].MapKey; value; manual |
+| 102 | Summary: com.google.common.collect; ImmutableMultimap$Builder; true; put; (Map$Entry); ; Argument[0].MapValue; Argument[this].MapValue; value; manual |
+| 103 | Summary: com.google.common.collect; ImmutableMultimap$Builder; true; put; (Object,Object); ; Argument[0]; Argument[this].MapKey; value; manual |
+| 104 | Summary: com.google.common.collect; ImmutableMultimap$Builder; true; put; (Object,Object); ; Argument[1]; Argument[this].MapValue; value; manual |
+| 105 | Summary: com.google.common.collect; ImmutableMultimap$Builder; true; put; ; ; Argument[this]; ReturnValue; value; manual |
+| 106 | Summary: com.google.common.collect; ImmutableMultimap$Builder; true; putAll; (Iterable); ; Argument[0].Element.MapKey; Argument[this].MapKey; value; manual |
+| 107 | Summary: com.google.common.collect; ImmutableMultimap$Builder; true; putAll; (Iterable); ; Argument[0].Element.MapValue; Argument[this].MapValue; value; manual |
+| 108 | Summary: com.google.common.collect; ImmutableMultimap$Builder; true; putAll; (Multimap); ; Argument[0].MapKey; Argument[this].MapKey; value; manual |
+| 109 | Summary: com.google.common.collect; ImmutableMultimap$Builder; true; putAll; (Multimap); ; Argument[0].MapValue; Argument[this].MapValue; value; manual |
+| 110 | Summary: com.google.common.collect; ImmutableMultimap$Builder; true; putAll; (Object,Iterable); ; Argument[0]; Argument[this].MapKey; value; manual |
+| 111 | Summary: com.google.common.collect; ImmutableMultimap$Builder; true; putAll; (Object,Iterable); ; Argument[1].Element; Argument[this].MapValue; value; manual |
+| 112 | Summary: com.google.common.collect; ImmutableMultimap$Builder; true; putAll; (Object,Object[]); ; Argument[0]; Argument[this].MapKey; value; manual |
+| 113 | Summary: com.google.common.collect; ImmutableMultimap$Builder; true; putAll; (Object,Object[]); ; Argument[1].ArrayElement; Argument[this].MapValue; value; manual |
+| 114 | Summary: com.google.common.collect; ImmutableMultimap$Builder; true; putAll; ; ; Argument[this]; ReturnValue; value; manual |
+| 115 | Summary: com.google.common.collect; ImmutableMultimap; true; copyOf; (Iterable); ; Argument[0].Element.MapKey; ReturnValue.MapKey; value; manual |
+| 116 | Summary: com.google.common.collect; ImmutableMultimap; true; copyOf; (Iterable); ; Argument[0].Element.MapValue; ReturnValue.MapValue; value; manual |
+| 117 | Summary: com.google.common.collect; ImmutableMultimap; true; copyOf; (Multimap); ; Argument[0].MapKey; ReturnValue.MapKey; value; manual |
+| 118 | Summary: com.google.common.collect; ImmutableMultimap; true; copyOf; (Multimap); ; Argument[0].MapValue; ReturnValue.MapValue; value; manual |
+| 119 | Summary: com.google.common.collect; ImmutableMultimap; true; inverse; (); ; Argument[this].MapKey; ReturnValue.MapValue; value; manual |
+| 120 | Summary: com.google.common.collect; ImmutableMultimap; true; inverse; (); ; Argument[this].MapValue; ReturnValue.MapKey; value; manual |
+| 121 | Summary: com.google.common.collect; ImmutableMultimap; true; of; ; ; Argument[0]; ReturnValue.MapKey; value; manual |
+| 122 | Summary: com.google.common.collect; ImmutableMultimap; true; of; ; ; Argument[1]; ReturnValue.MapValue; value; manual |
+| 123 | Summary: com.google.common.collect; ImmutableMultimap; true; of; ; ; Argument[2]; ReturnValue.MapKey; value; manual |
+| 124 | Summary: com.google.common.collect; ImmutableMultimap; true; of; ; ; Argument[3]; ReturnValue.MapValue; value; manual |
+| 125 | Summary: com.google.common.collect; ImmutableMultimap; true; of; ; ; Argument[4]; ReturnValue.MapKey; value; manual |
+| 126 | Summary: com.google.common.collect; ImmutableMultimap; true; of; ; ; Argument[5]; ReturnValue.MapValue; value; manual |
+| 127 | Summary: com.google.common.collect; ImmutableMultimap; true; of; ; ; Argument[6]; ReturnValue.MapKey; value; manual |
+| 128 | Summary: com.google.common.collect; ImmutableMultimap; true; of; ; ; Argument[7]; ReturnValue.MapValue; value; manual |
+| 129 | Summary: com.google.common.collect; ImmutableMultimap; true; of; ; ; Argument[8]; ReturnValue.MapKey; value; manual |
+| 130 | Summary: com.google.common.collect; ImmutableMultimap; true; of; ; ; Argument[9]; ReturnValue.MapValue; value; manual |
+| 131 | Summary: com.google.common.collect; ImmutableMultiset$Builder; true; addCopies; (Object,int); ; Argument[0]; Argument[this].Element; value; manual |
+| 132 | Summary: com.google.common.collect; ImmutableMultiset$Builder; true; addCopies; (Object,int); ; Argument[this]; ReturnValue; value; manual |
+| 133 | Summary: com.google.common.collect; ImmutableMultiset$Builder; true; setCount; (Object,int); ; Argument[0]; Argument[this].Element; value; manual |
+| 134 | Summary: com.google.common.collect; ImmutableMultiset; true; copyOf; (Iterable); ; Argument[0].Element; ReturnValue.Element; value; manual |
+| 135 | Summary: com.google.common.collect; ImmutableMultiset; true; copyOf; (Iterator); ; Argument[0].Element; ReturnValue.Element; value; manual |
+| 136 | Summary: com.google.common.collect; ImmutableMultiset; true; copyOf; (Object[]); ; Argument[0].ArrayElement; ReturnValue.Element; value; manual |
+| 137 | Summary: com.google.common.collect; ImmutableMultiset; true; of; ; ; Argument[0..5]; ReturnValue.Element; value; manual |
+| 138 | Summary: com.google.common.collect; ImmutableMultiset; true; of; ; ; Argument[6].ArrayElement; ReturnValue.Element; value; manual |
 | 139 | Summary: com.google.common.collect; ImmutableSet; true; copyOf; (Collection); ; Argument[0].Element; ReturnValue.Element; value; manual |
 | 140 | Summary: com.google.common.collect; ImmutableSet; true; copyOf; (Iterable); ; Argument[0].Element; ReturnValue.Element; value; manual |
 | 141 | Summary: com.google.common.collect; ImmutableSet; true; copyOf; (Iterator); ; Argument[0].Element; ReturnValue.Element; value; manual |
@@ -191,29 +191,29 @@ models
 | 190 | Summary: com.google.common.collect; ImmutableSortedSet; true; copyOfSorted; (SortedSet); ; Argument[0].Element; ReturnValue.Element; value; manual |
 | 191 | Summary: com.google.common.collect; ImmutableSortedSet; true; of; ; ; Argument[0..5]; ReturnValue.Element; value; manual |
 | 192 | Summary: com.google.common.collect; ImmutableSortedSet; true; of; ; ; Argument[6].ArrayElement; ReturnValue.Element; value; manual |
-| 193 | Summary: com.google.common.collect; ImmutableTable; true; copyOf; (Table); ; Argument[0].MapValue; ReturnValue.MapValue; value; manual |
-| 194 | Summary: com.google.common.collect; ImmutableTable; true; copyOf; (Table); ; Argument[0].SyntheticField[com.google.common.collect.Table.columnKey]; ReturnValue.SyntheticField[com.google.common.collect.Table.columnKey]; value; manual |
-| 195 | Summary: com.google.common.collect; ImmutableTable; true; copyOf; (Table); ; Argument[0].SyntheticField[com.google.common.collect.Table.rowKey]; ReturnValue.SyntheticField[com.google.common.collect.Table.rowKey]; value; manual |
-| 196 | Summary: com.google.common.collect; ImmutableTable; true; of; (Object,Object,Object); ; Argument[0]; ReturnValue.SyntheticField[com.google.common.collect.Table.rowKey]; value; manual |
-| 197 | Summary: com.google.common.collect; ImmutableTable; true; of; (Object,Object,Object); ; Argument[1]; ReturnValue.SyntheticField[com.google.common.collect.Table.columnKey]; value; manual |
-| 198 | Summary: com.google.common.collect; ImmutableTable; true; of; (Object,Object,Object); ; Argument[2]; ReturnValue.MapValue; value; manual |
-| 199 | Summary: com.google.common.collect; ImmutableTable$Builder; true; build; (); ; Argument[this].MapValue; ReturnValue.MapValue; value; manual |
-| 200 | Summary: com.google.common.collect; ImmutableTable$Builder; true; build; (); ; Argument[this].SyntheticField[com.google.common.collect.Table.columnKey]; ReturnValue.SyntheticField[com.google.common.collect.Table.columnKey]; value; manual |
-| 201 | Summary: com.google.common.collect; ImmutableTable$Builder; true; build; (); ; Argument[this].SyntheticField[com.google.common.collect.Table.rowKey]; ReturnValue.SyntheticField[com.google.common.collect.Table.rowKey]; value; manual |
-| 202 | Summary: com.google.common.collect; ImmutableTable$Builder; true; orderColumnsBy; (Comparator); ; Argument[this]; ReturnValue; value; manual |
-| 203 | Summary: com.google.common.collect; ImmutableTable$Builder; true; orderRowsBy; (Comparator); ; Argument[this]; ReturnValue; value; manual |
-| 204 | Summary: com.google.common.collect; ImmutableTable$Builder; true; put; (Table$Cell); ; Argument[this]; ReturnValue; value; manual |
-| 205 | Summary: com.google.common.collect; ImmutableTable$Builder; true; put; (Table$Cell); ; Argument[0].MapValue; Argument[this].MapValue; value; manual |
-| 206 | Summary: com.google.common.collect; ImmutableTable$Builder; true; put; (Table$Cell); ; Argument[0].SyntheticField[com.google.common.collect.Table.columnKey]; Argument[this].SyntheticField[com.google.common.collect.Table.columnKey]; value; manual |
-| 207 | Summary: com.google.common.collect; ImmutableTable$Builder; true; put; (Table$Cell); ; Argument[0].SyntheticField[com.google.common.collect.Table.rowKey]; Argument[this].SyntheticField[com.google.common.collect.Table.rowKey]; value; manual |
-| 208 | Summary: com.google.common.collect; ImmutableTable$Builder; true; put; (Object,Object,Object); ; Argument[this]; ReturnValue; value; manual |
-| 209 | Summary: com.google.common.collect; ImmutableTable$Builder; true; put; (Object,Object,Object); ; Argument[0]; Argument[this].SyntheticField[com.google.common.collect.Table.rowKey]; value; manual |
-| 210 | Summary: com.google.common.collect; ImmutableTable$Builder; true; put; (Object,Object,Object); ; Argument[1]; Argument[this].SyntheticField[com.google.common.collect.Table.columnKey]; value; manual |
-| 211 | Summary: com.google.common.collect; ImmutableTable$Builder; true; put; (Object,Object,Object); ; Argument[2]; Argument[this].MapValue; value; manual |
-| 212 | Summary: com.google.common.collect; ImmutableTable$Builder; true; putAll; (Table); ; Argument[this]; ReturnValue; value; manual |
-| 213 | Summary: com.google.common.collect; ImmutableTable$Builder; true; putAll; (Table); ; Argument[0].MapValue; Argument[this].MapValue; value; manual |
-| 214 | Summary: com.google.common.collect; ImmutableTable$Builder; true; putAll; (Table); ; Argument[0].SyntheticField[com.google.common.collect.Table.columnKey]; Argument[this].SyntheticField[com.google.common.collect.Table.columnKey]; value; manual |
-| 215 | Summary: com.google.common.collect; ImmutableTable$Builder; true; putAll; (Table); ; Argument[0].SyntheticField[com.google.common.collect.Table.rowKey]; Argument[this].SyntheticField[com.google.common.collect.Table.rowKey]; value; manual |
+| 193 | Summary: com.google.common.collect; ImmutableTable$Builder; true; build; (); ; Argument[this].MapValue; ReturnValue.MapValue; value; manual |
+| 194 | Summary: com.google.common.collect; ImmutableTable$Builder; true; build; (); ; Argument[this].SyntheticField[com.google.common.collect.Table.columnKey]; ReturnValue.SyntheticField[com.google.common.collect.Table.columnKey]; value; manual |
+| 195 | Summary: com.google.common.collect; ImmutableTable$Builder; true; build; (); ; Argument[this].SyntheticField[com.google.common.collect.Table.rowKey]; ReturnValue.SyntheticField[com.google.common.collect.Table.rowKey]; value; manual |
+| 196 | Summary: com.google.common.collect; ImmutableTable$Builder; true; orderColumnsBy; (Comparator); ; Argument[this]; ReturnValue; value; manual |
+| 197 | Summary: com.google.common.collect; ImmutableTable$Builder; true; orderRowsBy; (Comparator); ; Argument[this]; ReturnValue; value; manual |
+| 198 | Summary: com.google.common.collect; ImmutableTable$Builder; true; put; (Object,Object,Object); ; Argument[0]; Argument[this].SyntheticField[com.google.common.collect.Table.rowKey]; value; manual |
+| 199 | Summary: com.google.common.collect; ImmutableTable$Builder; true; put; (Object,Object,Object); ; Argument[1]; Argument[this].SyntheticField[com.google.common.collect.Table.columnKey]; value; manual |
+| 200 | Summary: com.google.common.collect; ImmutableTable$Builder; true; put; (Object,Object,Object); ; Argument[2]; Argument[this].MapValue; value; manual |
+| 201 | Summary: com.google.common.collect; ImmutableTable$Builder; true; put; (Object,Object,Object); ; Argument[this]; ReturnValue; value; manual |
+| 202 | Summary: com.google.common.collect; ImmutableTable$Builder; true; put; (Table$Cell); ; Argument[0].MapValue; Argument[this].MapValue; value; manual |
+| 203 | Summary: com.google.common.collect; ImmutableTable$Builder; true; put; (Table$Cell); ; Argument[0].SyntheticField[com.google.common.collect.Table.columnKey]; Argument[this].SyntheticField[com.google.common.collect.Table.columnKey]; value; manual |
+| 204 | Summary: com.google.common.collect; ImmutableTable$Builder; true; put; (Table$Cell); ; Argument[0].SyntheticField[com.google.common.collect.Table.rowKey]; Argument[this].SyntheticField[com.google.common.collect.Table.rowKey]; value; manual |
+| 205 | Summary: com.google.common.collect; ImmutableTable$Builder; true; put; (Table$Cell); ; Argument[this]; ReturnValue; value; manual |
+| 206 | Summary: com.google.common.collect; ImmutableTable$Builder; true; putAll; (Table); ; Argument[0].MapValue; Argument[this].MapValue; value; manual |
+| 207 | Summary: com.google.common.collect; ImmutableTable$Builder; true; putAll; (Table); ; Argument[0].SyntheticField[com.google.common.collect.Table.columnKey]; Argument[this].SyntheticField[com.google.common.collect.Table.columnKey]; value; manual |
+| 208 | Summary: com.google.common.collect; ImmutableTable$Builder; true; putAll; (Table); ; Argument[0].SyntheticField[com.google.common.collect.Table.rowKey]; Argument[this].SyntheticField[com.google.common.collect.Table.rowKey]; value; manual |
+| 209 | Summary: com.google.common.collect; ImmutableTable$Builder; true; putAll; (Table); ; Argument[this]; ReturnValue; value; manual |
+| 210 | Summary: com.google.common.collect; ImmutableTable; true; copyOf; (Table); ; Argument[0].MapValue; ReturnValue.MapValue; value; manual |
+| 211 | Summary: com.google.common.collect; ImmutableTable; true; copyOf; (Table); ; Argument[0].SyntheticField[com.google.common.collect.Table.columnKey]; ReturnValue.SyntheticField[com.google.common.collect.Table.columnKey]; value; manual |
+| 212 | Summary: com.google.common.collect; ImmutableTable; true; copyOf; (Table); ; Argument[0].SyntheticField[com.google.common.collect.Table.rowKey]; ReturnValue.SyntheticField[com.google.common.collect.Table.rowKey]; value; manual |
+| 213 | Summary: com.google.common.collect; ImmutableTable; true; of; (Object,Object,Object); ; Argument[0]; ReturnValue.SyntheticField[com.google.common.collect.Table.rowKey]; value; manual |
+| 214 | Summary: com.google.common.collect; ImmutableTable; true; of; (Object,Object,Object); ; Argument[1]; ReturnValue.SyntheticField[com.google.common.collect.Table.columnKey]; value; manual |
+| 215 | Summary: com.google.common.collect; ImmutableTable; true; of; (Object,Object,Object); ; Argument[2]; ReturnValue.MapValue; value; manual |
 | 216 | Summary: com.google.common.collect; Iterables; false; addAll; (Collection,Iterable); ; Argument[1].Element; Argument[0].Element; value; manual |
 | 217 | Summary: com.google.common.collect; Iterables; false; concat; (Iterable); ; Argument[0].Element.Element; ReturnValue.Element; value; manual |
 | 218 | Summary: com.google.common.collect; Iterables; false; concat; (Iterable,Iterable); ; Argument[0..1].Element; ReturnValue.Element; value; manual |
@@ -305,20 +305,20 @@ models
 | 304 | Summary: com.google.common.collect; Lists; false; newLinkedList; (Iterable); ; Argument[0].Element; ReturnValue.Element; value; manual |
 | 305 | Summary: com.google.common.collect; Lists; false; partition; (List,int); ; Argument[0].Element; ReturnValue.Element.Element; value; manual |
 | 306 | Summary: com.google.common.collect; Lists; false; reverse; (List); ; Argument[0].Element; ReturnValue.Element; value; manual |
-| 307 | Summary: com.google.common.collect; MapDifference; true; entriesDiffering; (); ; Argument[this].SyntheticField[com.google.common.collect.MapDifference.left].MapKey; ReturnValue.MapKey; value; manual |
-| 308 | Summary: com.google.common.collect; MapDifference; true; entriesDiffering; (); ; Argument[this].SyntheticField[com.google.common.collect.MapDifference.left].MapValue; ReturnValue.MapValue.SyntheticField[com.google.common.collect.MapDifference.left]; value; manual |
-| 309 | Summary: com.google.common.collect; MapDifference; true; entriesDiffering; (); ; Argument[this].SyntheticField[com.google.common.collect.MapDifference.right].MapKey; ReturnValue.MapKey; value; manual |
-| 310 | Summary: com.google.common.collect; MapDifference; true; entriesDiffering; (); ; Argument[this].SyntheticField[com.google.common.collect.MapDifference.right].MapValue; ReturnValue.MapValue.SyntheticField[com.google.common.collect.MapDifference.right]; value; manual |
-| 311 | Summary: com.google.common.collect; MapDifference; true; entriesInCommon; (); ; Argument[this].SyntheticField[com.google.common.collect.MapDifference.left].MapKey; ReturnValue.MapKey; value; manual |
-| 312 | Summary: com.google.common.collect; MapDifference; true; entriesInCommon; (); ; Argument[this].SyntheticField[com.google.common.collect.MapDifference.left].MapValue; ReturnValue.MapValue; value; manual |
-| 313 | Summary: com.google.common.collect; MapDifference; true; entriesInCommon; (); ; Argument[this].SyntheticField[com.google.common.collect.MapDifference.right].MapKey; ReturnValue.MapKey; value; manual |
-| 314 | Summary: com.google.common.collect; MapDifference; true; entriesInCommon; (); ; Argument[this].SyntheticField[com.google.common.collect.MapDifference.right].MapValue; ReturnValue.MapValue; value; manual |
-| 315 | Summary: com.google.common.collect; MapDifference; true; entriesOnlyOnLeft; (); ; Argument[this].SyntheticField[com.google.common.collect.MapDifference.left].MapKey; ReturnValue.MapKey; value; manual |
-| 316 | Summary: com.google.common.collect; MapDifference; true; entriesOnlyOnLeft; (); ; Argument[this].SyntheticField[com.google.common.collect.MapDifference.left].MapValue; ReturnValue.MapValue; value; manual |
-| 317 | Summary: com.google.common.collect; MapDifference; true; entriesOnlyOnRight; (); ; Argument[this].SyntheticField[com.google.common.collect.MapDifference.right].MapKey; ReturnValue.MapKey; value; manual |
-| 318 | Summary: com.google.common.collect; MapDifference; true; entriesOnlyOnRight; (); ; Argument[this].SyntheticField[com.google.common.collect.MapDifference.right].MapValue; ReturnValue.MapValue; value; manual |
-| 319 | Summary: com.google.common.collect; MapDifference$ValueDifference; true; leftValue; (); ; Argument[this].SyntheticField[com.google.common.collect.MapDifference.left]; ReturnValue; value; manual |
-| 320 | Summary: com.google.common.collect; MapDifference$ValueDifference; true; rightValue; (); ; Argument[this].SyntheticField[com.google.common.collect.MapDifference.right]; ReturnValue; value; manual |
+| 307 | Summary: com.google.common.collect; MapDifference$ValueDifference; true; leftValue; (); ; Argument[this].SyntheticField[com.google.common.collect.MapDifference.left]; ReturnValue; value; manual |
+| 308 | Summary: com.google.common.collect; MapDifference$ValueDifference; true; rightValue; (); ; Argument[this].SyntheticField[com.google.common.collect.MapDifference.right]; ReturnValue; value; manual |
+| 309 | Summary: com.google.common.collect; MapDifference; true; entriesDiffering; (); ; Argument[this].SyntheticField[com.google.common.collect.MapDifference.left].MapKey; ReturnValue.MapKey; value; manual |
+| 310 | Summary: com.google.common.collect; MapDifference; true; entriesDiffering; (); ; Argument[this].SyntheticField[com.google.common.collect.MapDifference.left].MapValue; ReturnValue.MapValue.SyntheticField[com.google.common.collect.MapDifference.left]; value; manual |
+| 311 | Summary: com.google.common.collect; MapDifference; true; entriesDiffering; (); ; Argument[this].SyntheticField[com.google.common.collect.MapDifference.right].MapKey; ReturnValue.MapKey; value; manual |
+| 312 | Summary: com.google.common.collect; MapDifference; true; entriesDiffering; (); ; Argument[this].SyntheticField[com.google.common.collect.MapDifference.right].MapValue; ReturnValue.MapValue.SyntheticField[com.google.common.collect.MapDifference.right]; value; manual |
+| 313 | Summary: com.google.common.collect; MapDifference; true; entriesInCommon; (); ; Argument[this].SyntheticField[com.google.common.collect.MapDifference.left].MapKey; ReturnValue.MapKey; value; manual |
+| 314 | Summary: com.google.common.collect; MapDifference; true; entriesInCommon; (); ; Argument[this].SyntheticField[com.google.common.collect.MapDifference.left].MapValue; ReturnValue.MapValue; value; manual |
+| 315 | Summary: com.google.common.collect; MapDifference; true; entriesInCommon; (); ; Argument[this].SyntheticField[com.google.common.collect.MapDifference.right].MapKey; ReturnValue.MapKey; value; manual |
+| 316 | Summary: com.google.common.collect; MapDifference; true; entriesInCommon; (); ; Argument[this].SyntheticField[com.google.common.collect.MapDifference.right].MapValue; ReturnValue.MapValue; value; manual |
+| 317 | Summary: com.google.common.collect; MapDifference; true; entriesOnlyOnLeft; (); ; Argument[this].SyntheticField[com.google.common.collect.MapDifference.left].MapKey; ReturnValue.MapKey; value; manual |
+| 318 | Summary: com.google.common.collect; MapDifference; true; entriesOnlyOnLeft; (); ; Argument[this].SyntheticField[com.google.common.collect.MapDifference.left].MapValue; ReturnValue.MapValue; value; manual |
+| 319 | Summary: com.google.common.collect; MapDifference; true; entriesOnlyOnRight; (); ; Argument[this].SyntheticField[com.google.common.collect.MapDifference.right].MapKey; ReturnValue.MapKey; value; manual |
+| 320 | Summary: com.google.common.collect; MapDifference; true; entriesOnlyOnRight; (); ; Argument[this].SyntheticField[com.google.common.collect.MapDifference.right].MapValue; ReturnValue.MapValue; value; manual |
 | 321 | Summary: com.google.common.collect; Maps; false; asMap; (NavigableSet,Function); ; Argument[0].Element; ReturnValue.MapKey; value; manual |
 | 322 | Summary: com.google.common.collect; Maps; false; asMap; (Set,Function); ; Argument[0].Element; ReturnValue.MapKey; value; manual |
 | 323 | Summary: com.google.common.collect; Maps; false; asMap; (SortedSet,Function); ; Argument[0].Element; ReturnValue.MapKey; value; manual |
@@ -380,9 +380,9 @@ models
 | 379 | Summary: com.google.common.collect; Multimap; true; putAll; (Object,Iterable); ; Argument[0]; Argument[this].MapKey; value; manual |
 | 380 | Summary: com.google.common.collect; Multimap; true; putAll; (Object,Iterable); ; Argument[1].Element; Argument[this].MapValue; value; manual |
 | 381 | Summary: com.google.common.collect; Multimap; true; removeAll; (Object); ; Argument[this].MapValue; ReturnValue.Element; value; manual |
-| 382 | Summary: com.google.common.collect; Multimap; true; replaceValues; (Object,Iterable); ; Argument[this].MapValue; ReturnValue.Element; value; manual |
-| 383 | Summary: com.google.common.collect; Multimap; true; replaceValues; (Object,Iterable); ; Argument[0]; Argument[this].MapKey; value; manual |
-| 384 | Summary: com.google.common.collect; Multimap; true; replaceValues; (Object,Iterable); ; Argument[1].Element; Argument[this].MapValue; value; manual |
+| 382 | Summary: com.google.common.collect; Multimap; true; replaceValues; (Object,Iterable); ; Argument[0]; Argument[this].MapKey; value; manual |
+| 383 | Summary: com.google.common.collect; Multimap; true; replaceValues; (Object,Iterable); ; Argument[1].Element; Argument[this].MapValue; value; manual |
+| 384 | Summary: com.google.common.collect; Multimap; true; replaceValues; (Object,Iterable); ; Argument[this].MapValue; ReturnValue.Element; value; manual |
 | 385 | Summary: com.google.common.collect; Multimap; true; values; (); ; Argument[this].MapValue; ReturnValue.Element; value; manual |
 | 386 | Summary: com.google.common.collect; Multimaps; false; asMap; (ListMultimap); ; Argument[0].MapKey; ReturnValue.MapKey; value; manual |
 | 387 | Summary: com.google.common.collect; Multimaps; false; asMap; (ListMultimap); ; Argument[0].MapValue; ReturnValue.MapValue.Element; value; manual |
@@ -443,12 +443,12 @@ models
 | 442 | Summary: com.google.common.collect; Multimaps; false; unmodifiableSetMultimap; (SetMultimap); ; Argument[0].MapValue; ReturnValue.MapValue; value; manual |
 | 443 | Summary: com.google.common.collect; Multimaps; false; unmodifiableSortedSetMultimap; (SortedSetMultimap); ; Argument[0].MapKey; ReturnValue.MapKey; value; manual |
 | 444 | Summary: com.google.common.collect; Multimaps; false; unmodifiableSortedSetMultimap; (SortedSetMultimap); ; Argument[0].MapValue; ReturnValue.MapValue; value; manual |
-| 445 | Summary: com.google.common.collect; Multiset; true; add; (Object,int); ; Argument[0]; Argument[this].Element; value; manual |
-| 446 | Summary: com.google.common.collect; Multiset; true; elementSet; (); ; Argument[this].Element; ReturnValue.Element; value; manual |
-| 447 | Summary: com.google.common.collect; Multiset; true; entrySet; (); ; Argument[this].Element; ReturnValue.Element.Element; value; manual |
-| 448 | Summary: com.google.common.collect; Multiset; true; setCount; (Object,int); ; Argument[0]; Argument[this].Element; value; manual |
-| 449 | Summary: com.google.common.collect; Multiset; true; setCount; (Object,int,int); ; Argument[0]; Argument[this].Element; value; manual |
-| 450 | Summary: com.google.common.collect; Multiset$Entry; true; getElement; (); ; Argument[this].Element; ReturnValue; value; manual |
+| 445 | Summary: com.google.common.collect; Multiset$Entry; true; getElement; (); ; Argument[this].Element; ReturnValue; value; manual |
+| 446 | Summary: com.google.common.collect; Multiset; true; add; (Object,int); ; Argument[0]; Argument[this].Element; value; manual |
+| 447 | Summary: com.google.common.collect; Multiset; true; elementSet; (); ; Argument[this].Element; ReturnValue.Element; value; manual |
+| 448 | Summary: com.google.common.collect; Multiset; true; entrySet; (); ; Argument[this].Element; ReturnValue.Element.Element; value; manual |
+| 449 | Summary: com.google.common.collect; Multiset; true; setCount; (Object,int); ; Argument[0]; Argument[this].Element; value; manual |
+| 450 | Summary: com.google.common.collect; Multiset; true; setCount; (Object,int,int); ; Argument[0]; Argument[this].Element; value; manual |
 | 451 | Summary: com.google.common.collect; Multisets; false; copyHighestCountFirst; (Multiset); ; Argument[0].Element; ReturnValue.Element; value; manual |
 | 452 | Summary: com.google.common.collect; Multisets; false; difference; (Multiset,Multiset); ; Argument[0].Element; ReturnValue.Element; value; manual |
 | 453 | Summary: com.google.common.collect; Multisets; false; filter; (Multiset,Predicate); ; Argument[0].Element; ReturnValue.Element; value; manual |
@@ -476,57 +476,57 @@ models
 | 475 | Summary: com.google.common.collect; Queues; false; newPriorityQueue; (Iterable); ; Argument[0].Element; ReturnValue.Element; value; manual |
 | 476 | Summary: com.google.common.collect; Queues; false; synchronizedDeque; (Deque); ; Argument[0].Element; ReturnValue.Element; value; manual |
 | 477 | Summary: com.google.common.collect; Queues; false; synchronizedQueue; (Queue); ; Argument[0].Element; ReturnValue.Element; value; manual |
-| 478 | Summary: com.google.common.collect; Sets; false; cartesianProduct; (List); ; Argument[0].Element.Element; ReturnValue.Element.Element; value; manual |
-| 479 | Summary: com.google.common.collect; Sets; false; cartesianProduct; (Set[]); ; Argument[0].ArrayElement.Element; ReturnValue.Element.Element; value; manual |
-| 480 | Summary: com.google.common.collect; Sets; false; combinations; (Set,int); ; Argument[0].Element; ReturnValue.Element.Element; value; manual |
-| 481 | Summary: com.google.common.collect; Sets; false; difference; (Set,Set); ; Argument[0].Element; ReturnValue.Element; value; manual |
-| 482 | Summary: com.google.common.collect; Sets; false; filter; (NavigableSet,Predicate); ; Argument[0].Element; ReturnValue.Element; value; manual |
-| 483 | Summary: com.google.common.collect; Sets; false; filter; (Set,Predicate); ; Argument[0].Element; ReturnValue.Element; value; manual |
-| 484 | Summary: com.google.common.collect; Sets; false; filter; (SortedSet,Predicate); ; Argument[0].Element; ReturnValue.Element; value; manual |
-| 485 | Summary: com.google.common.collect; Sets; false; intersection; (Set,Set); ; Argument[0..1].Element; ReturnValue.Element; value; manual |
-| 486 | Summary: com.google.common.collect; Sets; false; newConcurrentHashSet; (Iterable); ; Argument[0].Element; ReturnValue.Element; value; manual |
-| 487 | Summary: com.google.common.collect; Sets; false; newCopyOnWriteArraySet; (Iterable); ; Argument[0].Element; ReturnValue.Element; value; manual |
-| 488 | Summary: com.google.common.collect; Sets; false; newHashSet; (Iterable); ; Argument[0].Element; ReturnValue.Element; value; manual |
-| 489 | Summary: com.google.common.collect; Sets; false; newHashSet; (Iterator); ; Argument[0].Element; ReturnValue.Element; value; manual |
-| 490 | Summary: com.google.common.collect; Sets; false; newHashSet; (Object[]); ; Argument[0].ArrayElement; ReturnValue.Element; value; manual |
-| 491 | Summary: com.google.common.collect; Sets; false; newLinkedHashSet; (Iterable); ; Argument[0].Element; ReturnValue.Element; value; manual |
-| 492 | Summary: com.google.common.collect; Sets; false; newSetFromMap; (Map); ; Argument[0].MapKey; ReturnValue.Element; value; manual |
-| 493 | Summary: com.google.common.collect; Sets; false; newTreeSet; (Iterable); ; Argument[0].Element; ReturnValue.Element; value; manual |
-| 494 | Summary: com.google.common.collect; Sets; false; powerSet; (Set); ; Argument[0].Element; ReturnValue.Element.Element; value; manual |
-| 495 | Summary: com.google.common.collect; Sets; false; subSet; (NavigableSet,Range); ; Argument[0].Element; ReturnValue.Element; value; manual |
-| 496 | Summary: com.google.common.collect; Sets; false; symmetricDifference; (Set,Set); ; Argument[0..1].Element; ReturnValue.Element; value; manual |
-| 497 | Summary: com.google.common.collect; Sets; false; synchronizedNavigableSet; (NavigableSet); ; Argument[0].Element; ReturnValue.Element; value; manual |
-| 498 | Summary: com.google.common.collect; Sets; false; union; (Set,Set); ; Argument[0..1].Element; ReturnValue.Element; value; manual |
-| 499 | Summary: com.google.common.collect; Sets; false; unmodifiableNavigableSet; (NavigableSet); ; Argument[0].Element; ReturnValue.Element; value; manual |
-| 500 | Summary: com.google.common.collect; Sets$SetView; true; copyInto; (Set); ; Argument[this].Element; Argument[0].Element; value; manual |
-| 501 | Summary: com.google.common.collect; Sets$SetView; true; immutableCopy; (); ; Argument[this].Element; ReturnValue.Element; value; manual |
-| 502 | Summary: com.google.common.collect; Table; true; cellSet; (); ; Argument[this].MapValue; ReturnValue.Element.MapValue; value; manual |
-| 503 | Summary: com.google.common.collect; Table; true; cellSet; (); ; Argument[this].SyntheticField[com.google.common.collect.Table.columnKey]; ReturnValue.Element.SyntheticField[com.google.common.collect.Table.columnKey]; value; manual |
-| 504 | Summary: com.google.common.collect; Table; true; cellSet; (); ; Argument[this].SyntheticField[com.google.common.collect.Table.rowKey]; ReturnValue.Element.SyntheticField[com.google.common.collect.Table.rowKey]; value; manual |
-| 505 | Summary: com.google.common.collect; Table; true; column; (Object); ; Argument[this].MapValue; ReturnValue.MapValue; value; manual |
-| 506 | Summary: com.google.common.collect; Table; true; column; (Object); ; Argument[this].SyntheticField[com.google.common.collect.Table.rowKey]; ReturnValue.MapKey; value; manual |
-| 507 | Summary: com.google.common.collect; Table; true; columnKeySet; (); ; Argument[this].SyntheticField[com.google.common.collect.Table.columnKey]; ReturnValue.Element; value; manual |
-| 508 | Summary: com.google.common.collect; Table; true; columnMap; (); ; Argument[this].MapValue; ReturnValue.MapValue.MapValue; value; manual |
-| 509 | Summary: com.google.common.collect; Table; true; columnMap; (); ; Argument[this].SyntheticField[com.google.common.collect.Table.columnKey]; ReturnValue.MapKey; value; manual |
-| 510 | Summary: com.google.common.collect; Table; true; columnMap; (); ; Argument[this].SyntheticField[com.google.common.collect.Table.rowKey]; ReturnValue.MapValue.MapKey; value; manual |
-| 511 | Summary: com.google.common.collect; Table; true; get; (Object,Object); ; Argument[this].MapValue; ReturnValue; value; manual |
-| 512 | Summary: com.google.common.collect; Table; true; put; (Object,Object,Object); ; Argument[0]; Argument[this].SyntheticField[com.google.common.collect.Table.rowKey]; value; manual |
-| 513 | Summary: com.google.common.collect; Table; true; put; (Object,Object,Object); ; Argument[1]; Argument[this].SyntheticField[com.google.common.collect.Table.columnKey]; value; manual |
-| 514 | Summary: com.google.common.collect; Table; true; put; (Object,Object,Object); ; Argument[2]; Argument[this].MapValue; value; manual |
-| 515 | Summary: com.google.common.collect; Table; true; putAll; (Table); ; Argument[0].MapValue; Argument[this].MapValue; value; manual |
-| 516 | Summary: com.google.common.collect; Table; true; putAll; (Table); ; Argument[0].SyntheticField[com.google.common.collect.Table.columnKey]; Argument[this].SyntheticField[com.google.common.collect.Table.columnKey]; value; manual |
-| 517 | Summary: com.google.common.collect; Table; true; putAll; (Table); ; Argument[0].SyntheticField[com.google.common.collect.Table.rowKey]; Argument[this].SyntheticField[com.google.common.collect.Table.rowKey]; value; manual |
-| 518 | Summary: com.google.common.collect; Table; true; remove; (Object,Object); ; Argument[this].MapValue; ReturnValue; value; manual |
-| 519 | Summary: com.google.common.collect; Table; true; row; (Object); ; Argument[this].MapValue; ReturnValue.MapValue; value; manual |
-| 520 | Summary: com.google.common.collect; Table; true; row; (Object); ; Argument[this].SyntheticField[com.google.common.collect.Table.columnKey]; ReturnValue.MapKey; value; manual |
-| 521 | Summary: com.google.common.collect; Table; true; rowKeySet; (); ; Argument[this].SyntheticField[com.google.common.collect.Table.rowKey]; ReturnValue.Element; value; manual |
-| 522 | Summary: com.google.common.collect; Table; true; rowMap; (); ; Argument[this].MapValue; ReturnValue.MapValue.MapValue; value; manual |
-| 523 | Summary: com.google.common.collect; Table; true; rowMap; (); ; Argument[this].SyntheticField[com.google.common.collect.Table.columnKey]; ReturnValue.MapValue.MapKey; value; manual |
-| 524 | Summary: com.google.common.collect; Table; true; rowMap; (); ; Argument[this].SyntheticField[com.google.common.collect.Table.rowKey]; ReturnValue.MapKey; value; manual |
-| 525 | Summary: com.google.common.collect; Table; true; values; (); ; Argument[this].MapValue; ReturnValue.Element; value; manual |
-| 526 | Summary: com.google.common.collect; Table$Cell; true; getColumnKey; (); ; Argument[this].SyntheticField[com.google.common.collect.Table.columnKey]; ReturnValue; value; manual |
-| 527 | Summary: com.google.common.collect; Table$Cell; true; getRowKey; (); ; Argument[this].SyntheticField[com.google.common.collect.Table.rowKey]; ReturnValue; value; manual |
-| 528 | Summary: com.google.common.collect; Table$Cell; true; getValue; (); ; Argument[this].MapValue; ReturnValue; value; manual |
+| 478 | Summary: com.google.common.collect; Sets$SetView; true; copyInto; (Set); ; Argument[this].Element; Argument[0].Element; value; manual |
+| 479 | Summary: com.google.common.collect; Sets$SetView; true; immutableCopy; (); ; Argument[this].Element; ReturnValue.Element; value; manual |
+| 480 | Summary: com.google.common.collect; Sets; false; cartesianProduct; (List); ; Argument[0].Element.Element; ReturnValue.Element.Element; value; manual |
+| 481 | Summary: com.google.common.collect; Sets; false; cartesianProduct; (Set[]); ; Argument[0].ArrayElement.Element; ReturnValue.Element.Element; value; manual |
+| 482 | Summary: com.google.common.collect; Sets; false; combinations; (Set,int); ; Argument[0].Element; ReturnValue.Element.Element; value; manual |
+| 483 | Summary: com.google.common.collect; Sets; false; difference; (Set,Set); ; Argument[0].Element; ReturnValue.Element; value; manual |
+| 484 | Summary: com.google.common.collect; Sets; false; filter; (NavigableSet,Predicate); ; Argument[0].Element; ReturnValue.Element; value; manual |
+| 485 | Summary: com.google.common.collect; Sets; false; filter; (Set,Predicate); ; Argument[0].Element; ReturnValue.Element; value; manual |
+| 486 | Summary: com.google.common.collect; Sets; false; filter; (SortedSet,Predicate); ; Argument[0].Element; ReturnValue.Element; value; manual |
+| 487 | Summary: com.google.common.collect; Sets; false; intersection; (Set,Set); ; Argument[0..1].Element; ReturnValue.Element; value; manual |
+| 488 | Summary: com.google.common.collect; Sets; false; newConcurrentHashSet; (Iterable); ; Argument[0].Element; ReturnValue.Element; value; manual |
+| 489 | Summary: com.google.common.collect; Sets; false; newCopyOnWriteArraySet; (Iterable); ; Argument[0].Element; ReturnValue.Element; value; manual |
+| 490 | Summary: com.google.common.collect; Sets; false; newHashSet; (Iterable); ; Argument[0].Element; ReturnValue.Element; value; manual |
+| 491 | Summary: com.google.common.collect; Sets; false; newHashSet; (Iterator); ; Argument[0].Element; ReturnValue.Element; value; manual |
+| 492 | Summary: com.google.common.collect; Sets; false; newHashSet; (Object[]); ; Argument[0].ArrayElement; ReturnValue.Element; value; manual |
+| 493 | Summary: com.google.common.collect; Sets; false; newLinkedHashSet; (Iterable); ; Argument[0].Element; ReturnValue.Element; value; manual |
+| 494 | Summary: com.google.common.collect; Sets; false; newSetFromMap; (Map); ; Argument[0].MapKey; ReturnValue.Element; value; manual |
+| 495 | Summary: com.google.common.collect; Sets; false; newTreeSet; (Iterable); ; Argument[0].Element; ReturnValue.Element; value; manual |
+| 496 | Summary: com.google.common.collect; Sets; false; powerSet; (Set); ; Argument[0].Element; ReturnValue.Element.Element; value; manual |
+| 497 | Summary: com.google.common.collect; Sets; false; subSet; (NavigableSet,Range); ; Argument[0].Element; ReturnValue.Element; value; manual |
+| 498 | Summary: com.google.common.collect; Sets; false; symmetricDifference; (Set,Set); ; Argument[0..1].Element; ReturnValue.Element; value; manual |
+| 499 | Summary: com.google.common.collect; Sets; false; synchronizedNavigableSet; (NavigableSet); ; Argument[0].Element; ReturnValue.Element; value; manual |
+| 500 | Summary: com.google.common.collect; Sets; false; union; (Set,Set); ; Argument[0..1].Element; ReturnValue.Element; value; manual |
+| 501 | Summary: com.google.common.collect; Sets; false; unmodifiableNavigableSet; (NavigableSet); ; Argument[0].Element; ReturnValue.Element; value; manual |
+| 502 | Summary: com.google.common.collect; Table$Cell; true; getColumnKey; (); ; Argument[this].SyntheticField[com.google.common.collect.Table.columnKey]; ReturnValue; value; manual |
+| 503 | Summary: com.google.common.collect; Table$Cell; true; getRowKey; (); ; Argument[this].SyntheticField[com.google.common.collect.Table.rowKey]; ReturnValue; value; manual |
+| 504 | Summary: com.google.common.collect; Table$Cell; true; getValue; (); ; Argument[this].MapValue; ReturnValue; value; manual |
+| 505 | Summary: com.google.common.collect; Table; true; cellSet; (); ; Argument[this].MapValue; ReturnValue.Element.MapValue; value; manual |
+| 506 | Summary: com.google.common.collect; Table; true; cellSet; (); ; Argument[this].SyntheticField[com.google.common.collect.Table.columnKey]; ReturnValue.Element.SyntheticField[com.google.common.collect.Table.columnKey]; value; manual |
+| 507 | Summary: com.google.common.collect; Table; true; cellSet; (); ; Argument[this].SyntheticField[com.google.common.collect.Table.rowKey]; ReturnValue.Element.SyntheticField[com.google.common.collect.Table.rowKey]; value; manual |
+| 508 | Summary: com.google.common.collect; Table; true; column; (Object); ; Argument[this].MapValue; ReturnValue.MapValue; value; manual |
+| 509 | Summary: com.google.common.collect; Table; true; column; (Object); ; Argument[this].SyntheticField[com.google.common.collect.Table.rowKey]; ReturnValue.MapKey; value; manual |
+| 510 | Summary: com.google.common.collect; Table; true; columnKeySet; (); ; Argument[this].SyntheticField[com.google.common.collect.Table.columnKey]; ReturnValue.Element; value; manual |
+| 511 | Summary: com.google.common.collect; Table; true; columnMap; (); ; Argument[this].MapValue; ReturnValue.MapValue.MapValue; value; manual |
+| 512 | Summary: com.google.common.collect; Table; true; columnMap; (); ; Argument[this].SyntheticField[com.google.common.collect.Table.columnKey]; ReturnValue.MapKey; value; manual |
+| 513 | Summary: com.google.common.collect; Table; true; columnMap; (); ; Argument[this].SyntheticField[com.google.common.collect.Table.rowKey]; ReturnValue.MapValue.MapKey; value; manual |
+| 514 | Summary: com.google.common.collect; Table; true; get; (Object,Object); ; Argument[this].MapValue; ReturnValue; value; manual |
+| 515 | Summary: com.google.common.collect; Table; true; put; (Object,Object,Object); ; Argument[0]; Argument[this].SyntheticField[com.google.common.collect.Table.rowKey]; value; manual |
+| 516 | Summary: com.google.common.collect; Table; true; put; (Object,Object,Object); ; Argument[1]; Argument[this].SyntheticField[com.google.common.collect.Table.columnKey]; value; manual |
+| 517 | Summary: com.google.common.collect; Table; true; put; (Object,Object,Object); ; Argument[2]; Argument[this].MapValue; value; manual |
+| 518 | Summary: com.google.common.collect; Table; true; putAll; (Table); ; Argument[0].MapValue; Argument[this].MapValue; value; manual |
+| 519 | Summary: com.google.common.collect; Table; true; putAll; (Table); ; Argument[0].SyntheticField[com.google.common.collect.Table.columnKey]; Argument[this].SyntheticField[com.google.common.collect.Table.columnKey]; value; manual |
+| 520 | Summary: com.google.common.collect; Table; true; putAll; (Table); ; Argument[0].SyntheticField[com.google.common.collect.Table.rowKey]; Argument[this].SyntheticField[com.google.common.collect.Table.rowKey]; value; manual |
+| 521 | Summary: com.google.common.collect; Table; true; remove; (Object,Object); ; Argument[this].MapValue; ReturnValue; value; manual |
+| 522 | Summary: com.google.common.collect; Table; true; row; (Object); ; Argument[this].MapValue; ReturnValue.MapValue; value; manual |
+| 523 | Summary: com.google.common.collect; Table; true; row; (Object); ; Argument[this].SyntheticField[com.google.common.collect.Table.columnKey]; ReturnValue.MapKey; value; manual |
+| 524 | Summary: com.google.common.collect; Table; true; rowKeySet; (); ; Argument[this].SyntheticField[com.google.common.collect.Table.rowKey]; ReturnValue.Element; value; manual |
+| 525 | Summary: com.google.common.collect; Table; true; rowMap; (); ; Argument[this].MapValue; ReturnValue.MapValue.MapValue; value; manual |
+| 526 | Summary: com.google.common.collect; Table; true; rowMap; (); ; Argument[this].SyntheticField[com.google.common.collect.Table.columnKey]; ReturnValue.MapValue.MapKey; value; manual |
+| 527 | Summary: com.google.common.collect; Table; true; rowMap; (); ; Argument[this].SyntheticField[com.google.common.collect.Table.rowKey]; ReturnValue.MapKey; value; manual |
+| 528 | Summary: com.google.common.collect; Table; true; values; (); ; Argument[this].MapValue; ReturnValue.Element; value; manual |
 | 529 | Summary: com.google.common.collect; Tables; false; immutableCell; (Object,Object,Object); ; Argument[0]; ReturnValue.SyntheticField[com.google.common.collect.Table.rowKey]; value; manual |
 | 530 | Summary: com.google.common.collect; Tables; false; immutableCell; (Object,Object,Object); ; Argument[1]; ReturnValue.SyntheticField[com.google.common.collect.Table.columnKey]; value; manual |
 | 531 | Summary: com.google.common.collect; Tables; false; immutableCell; (Object,Object,Object); ; Argument[2]; ReturnValue.MapValue; value; manual |
@@ -553,26 +553,26 @@ models
 | 552 | Summary: com.google.common.collect; TreeMultimap; true; create; (Multimap); ; Argument[0].MapKey; ReturnValue.MapKey; value; manual |
 | 553 | Summary: com.google.common.collect; TreeMultimap; true; create; (Multimap); ; Argument[0].MapValue; ReturnValue.MapValue; value; manual |
 | 554 | Summary: com.google.common.collect; TreeMultiset; true; create; (Iterable); ; Argument[0].Element; ReturnValue.Element; value; manual |
-| 555 | Summary: java.lang; Iterable; true; iterator; (); ; Argument[this].Element; ReturnValue.Element; value; manual |
-| 556 | Summary: java.util; Enumeration; true; nextElement; ; ; Argument[this].Element; ReturnValue; value; manual |
-| 557 | Summary: java.util; Iterator; true; next; ; ; Argument[this].Element; ReturnValue; value; manual |
-| 558 | Summary: java.util; List; false; of; (Object); ; Argument[0]; ReturnValue.Element; value; manual |
-| 559 | Summary: java.util; Map; true; entrySet; ; ; Argument[this].MapKey; ReturnValue.Element.MapKey; value; manual |
-| 560 | Summary: java.util; Map; true; entrySet; ; ; Argument[this].MapValue; ReturnValue.Element.MapValue; value; manual |
-| 561 | Summary: java.util; Map; true; get; ; ; Argument[this].MapValue; ReturnValue; value; manual |
-| 562 | Summary: java.util; Map; true; keySet; (); ; Argument[this].MapKey; ReturnValue.Element; value; manual |
-| 563 | Summary: java.util; Map; false; of; ; ; Argument[0]; ReturnValue.MapKey; value; manual |
-| 564 | Summary: java.util; Map; false; of; ; ; Argument[1]; ReturnValue.MapValue; value; manual |
-| 565 | Summary: java.util; Map$Entry; true; getKey; ; ; Argument[this].MapKey; ReturnValue; value; manual |
-| 566 | Summary: java.util; Map$Entry; true; getValue; ; ; Argument[this].MapValue; ReturnValue; value; manual |
-| 567 | Summary: java.util; Set; false; of; (Object); ; Argument[0]; ReturnValue.Element; value; manual |
-| 568 | Summary: generatedtest; Test; false; newWithElementDefault; (Object); ; Argument[0]; ReturnValue.Element; value; manual |
-| 569 | Summary: generatedtest; Test; false; newWithMapKeyDefault; (Object); ; Argument[0]; ReturnValue.MapKey; value; manual |
-| 570 | Summary: generatedtest; Test; false; newWithMapValueDefault; (Object); ; Argument[0]; ReturnValue.MapValue; value; manual |
+| 555 | Summary: generatedtest; Test; false; newWithElementDefault; (Object); ; Argument[0]; ReturnValue.Element; value; manual |
+| 556 | Summary: generatedtest; Test; false; newWithMapKeyDefault; (Object); ; Argument[0]; ReturnValue.MapKey; value; manual |
+| 557 | Summary: generatedtest; Test; false; newWithMapValueDefault; (Object); ; Argument[0]; ReturnValue.MapValue; value; manual |
+| 558 | Summary: java.lang; Iterable; true; iterator; (); ; Argument[this].Element; ReturnValue.Element; value; manual |
+| 559 | Summary: java.util; Enumeration; true; nextElement; ; ; Argument[this].Element; ReturnValue; value; manual |
+| 560 | Summary: java.util; Iterator; true; next; ; ; Argument[this].Element; ReturnValue; value; manual |
+| 561 | Summary: java.util; List; false; of; (Object); ; Argument[0]; ReturnValue.Element; value; manual |
+| 562 | Summary: java.util; Map$Entry; true; getKey; ; ; Argument[this].MapKey; ReturnValue; value; manual |
+| 563 | Summary: java.util; Map$Entry; true; getValue; ; ; Argument[this].MapValue; ReturnValue; value; manual |
+| 564 | Summary: java.util; Map; false; of; ; ; Argument[0]; ReturnValue.MapKey; value; manual |
+| 565 | Summary: java.util; Map; false; of; ; ; Argument[1]; ReturnValue.MapValue; value; manual |
+| 566 | Summary: java.util; Map; true; entrySet; ; ; Argument[this].MapKey; ReturnValue.Element.MapKey; value; manual |
+| 567 | Summary: java.util; Map; true; entrySet; ; ; Argument[this].MapValue; ReturnValue.Element.MapValue; value; manual |
+| 568 | Summary: java.util; Map; true; get; ; ; Argument[this].MapValue; ReturnValue; value; manual |
+| 569 | Summary: java.util; Map; true; keySet; (); ; Argument[this].MapKey; ReturnValue.Element; value; manual |
+| 570 | Summary: java.util; Set; false; of; (Object); ; Argument[0]; ReturnValue.Element; value; manual |
 edges
 | Test.java:95:27:95:57 | b : Builder [com.google.common.collect.Table.columnKey] : Object | Test.java:95:88:95:88 | b : Builder [com.google.common.collect.Table.columnKey] : Object | provenance |  |
-| Test.java:95:88:95:88 | b : Builder [com.google.common.collect.Table.columnKey] : Object | Test.java:95:88:95:96 | build(...) : ImmutableTable [com.google.common.collect.Table.columnKey] : Object | provenance | MaD:200 |
-| Test.java:95:88:95:96 | build(...) : ImmutableTable [com.google.common.collect.Table.columnKey] : Object | Test.java:95:69:95:97 | getTable_columnKey(...) : Object | provenance | MaD:507 |
+| Test.java:95:88:95:88 | b : Builder [com.google.common.collect.Table.columnKey] : Object | Test.java:95:88:95:96 | build(...) : ImmutableTable [com.google.common.collect.Table.columnKey] : Object | provenance | MaD:194 |
+| Test.java:95:88:95:96 | build(...) : ImmutableTable [com.google.common.collect.Table.columnKey] : Object | Test.java:95:69:95:97 | getTable_columnKey(...) : Object | provenance | MaD:510 |
 | Test.java:95:88:95:96 | build(...) : ImmutableTable [com.google.common.collect.Table.columnKey] : Object | Test.java:96:27:96:40 | t : ImmutableTable [com.google.common.collect.Table.columnKey] : Object | provenance |  |
 | Test.java:96:27:96:40 | t : ArrayTable [com.google.common.collect.Table.columnKey] : Object | Test.java:96:52:96:52 | t : ArrayTable [com.google.common.collect.Table.columnKey] : Object | provenance |  |
 | Test.java:96:27:96:40 | t : HashBasedTable [com.google.common.collect.Table.columnKey] : Object | Test.java:96:52:96:52 | t : HashBasedTable [com.google.common.collect.Table.columnKey] : Object | provenance |  |
@@ -580,42 +580,42 @@ edges
 | Test.java:96:27:96:40 | t : RowSortedTable [com.google.common.collect.Table.columnKey] : Object | Test.java:96:52:96:52 | t : RowSortedTable [com.google.common.collect.Table.columnKey] : Object | provenance |  |
 | Test.java:96:27:96:40 | t : Table [com.google.common.collect.Table.columnKey] : Object | Test.java:96:52:96:52 | t : Table [com.google.common.collect.Table.columnKey] : Object | provenance |  |
 | Test.java:96:27:96:40 | t : TreeBasedTable [com.google.common.collect.Table.columnKey] : Object | Test.java:96:52:96:52 | t : TreeBasedTable [com.google.common.collect.Table.columnKey] : Object | provenance |  |
-| Test.java:96:52:96:52 | t : ArrayTable [com.google.common.collect.Table.columnKey] : Object | Test.java:96:52:96:67 | columnKeySet(...) : Set [<element>] : Object | provenance | MaD:507 |
-| Test.java:96:52:96:52 | t : HashBasedTable [com.google.common.collect.Table.columnKey] : Object | Test.java:96:52:96:67 | columnKeySet(...) : Set [<element>] : Object | provenance | MaD:507 |
-| Test.java:96:52:96:52 | t : ImmutableTable [com.google.common.collect.Table.columnKey] : Object | Test.java:96:52:96:67 | columnKeySet(...) : Set [<element>] : Object | provenance | MaD:507 |
-| Test.java:96:52:96:52 | t : RowSortedTable [com.google.common.collect.Table.columnKey] : Object | Test.java:96:52:96:67 | columnKeySet(...) : Set [<element>] : Object | provenance | MaD:507 |
-| Test.java:96:52:96:52 | t : Table [com.google.common.collect.Table.columnKey] : Object | Test.java:96:52:96:67 | columnKeySet(...) : Set [<element>] : Object | provenance | MaD:507 |
-| Test.java:96:52:96:52 | t : TreeBasedTable [com.google.common.collect.Table.columnKey] : Object | Test.java:96:52:96:67 | columnKeySet(...) : Set [<element>] : Object | provenance | MaD:507 |
-| Test.java:96:52:96:67 | columnKeySet(...) : Set [<element>] : Object | Test.java:96:52:96:78 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:555 |
-| Test.java:96:52:96:67 | columnKeySet(...) : Set [<element>] : Object | Test.java:96:52:96:78 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:555 |
-| Test.java:96:52:96:67 | columnKeySet(...) : Set [<element>] : Object | Test.java:96:52:96:78 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:555 |
-| Test.java:96:52:96:67 | columnKeySet(...) : Set [<element>] : Object | Test.java:96:52:96:78 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:555 |
-| Test.java:96:52:96:67 | columnKeySet(...) : Set [<element>] : Object | Test.java:96:52:96:78 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:555 |
-| Test.java:96:52:96:67 | columnKeySet(...) : Set [<element>] : Object | Test.java:96:52:96:78 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:555 |
-| Test.java:96:52:96:78 | iterator(...) : Iterator [<element>] : Object | Test.java:96:52:96:85 | next(...) : Object | provenance | MaD:557 |
-| Test.java:96:52:96:78 | iterator(...) : Iterator [<element>] : Object | Test.java:96:52:96:85 | next(...) : Object | provenance | MaD:557 |
-| Test.java:96:52:96:78 | iterator(...) : Iterator [<element>] : Object | Test.java:96:52:96:85 | next(...) : Object | provenance | MaD:557 |
-| Test.java:96:52:96:78 | iterator(...) : Iterator [<element>] : Object | Test.java:96:52:96:85 | next(...) : Object | provenance | MaD:557 |
-| Test.java:96:52:96:78 | iterator(...) : Iterator [<element>] : Object | Test.java:96:52:96:85 | next(...) : Object | provenance | MaD:557 |
-| Test.java:96:52:96:78 | iterator(...) : Iterator [<element>] : Object | Test.java:96:52:96:85 | next(...) : Object | provenance | MaD:557 |
+| Test.java:96:52:96:52 | t : ArrayTable [com.google.common.collect.Table.columnKey] : Object | Test.java:96:52:96:67 | columnKeySet(...) : Set [<element>] : Object | provenance | MaD:510 |
+| Test.java:96:52:96:52 | t : HashBasedTable [com.google.common.collect.Table.columnKey] : Object | Test.java:96:52:96:67 | columnKeySet(...) : Set [<element>] : Object | provenance | MaD:510 |
+| Test.java:96:52:96:52 | t : ImmutableTable [com.google.common.collect.Table.columnKey] : Object | Test.java:96:52:96:67 | columnKeySet(...) : Set [<element>] : Object | provenance | MaD:510 |
+| Test.java:96:52:96:52 | t : RowSortedTable [com.google.common.collect.Table.columnKey] : Object | Test.java:96:52:96:67 | columnKeySet(...) : Set [<element>] : Object | provenance | MaD:510 |
+| Test.java:96:52:96:52 | t : Table [com.google.common.collect.Table.columnKey] : Object | Test.java:96:52:96:67 | columnKeySet(...) : Set [<element>] : Object | provenance | MaD:510 |
+| Test.java:96:52:96:52 | t : TreeBasedTable [com.google.common.collect.Table.columnKey] : Object | Test.java:96:52:96:67 | columnKeySet(...) : Set [<element>] : Object | provenance | MaD:510 |
+| Test.java:96:52:96:67 | columnKeySet(...) : Set [<element>] : Object | Test.java:96:52:96:78 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:558 |
+| Test.java:96:52:96:67 | columnKeySet(...) : Set [<element>] : Object | Test.java:96:52:96:78 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:558 |
+| Test.java:96:52:96:67 | columnKeySet(...) : Set [<element>] : Object | Test.java:96:52:96:78 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:558 |
+| Test.java:96:52:96:67 | columnKeySet(...) : Set [<element>] : Object | Test.java:96:52:96:78 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:558 |
+| Test.java:96:52:96:67 | columnKeySet(...) : Set [<element>] : Object | Test.java:96:52:96:78 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:558 |
+| Test.java:96:52:96:67 | columnKeySet(...) : Set [<element>] : Object | Test.java:96:52:96:78 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:558 |
+| Test.java:96:52:96:78 | iterator(...) : Iterator [<element>] : Object | Test.java:96:52:96:85 | next(...) : Object | provenance | MaD:560 |
+| Test.java:96:52:96:78 | iterator(...) : Iterator [<element>] : Object | Test.java:96:52:96:85 | next(...) : Object | provenance | MaD:560 |
+| Test.java:96:52:96:78 | iterator(...) : Iterator [<element>] : Object | Test.java:96:52:96:85 | next(...) : Object | provenance | MaD:560 |
+| Test.java:96:52:96:78 | iterator(...) : Iterator [<element>] : Object | Test.java:96:52:96:85 | next(...) : Object | provenance | MaD:560 |
+| Test.java:96:52:96:78 | iterator(...) : Iterator [<element>] : Object | Test.java:96:52:96:85 | next(...) : Object | provenance | MaD:560 |
+| Test.java:96:52:96:78 | iterator(...) : Iterator [<element>] : Object | Test.java:96:52:96:85 | next(...) : Object | provenance | MaD:560 |
 | Test.java:97:18:97:44 | b : Builder [<map.key>] : Object | Test.java:97:66:97:66 | b : Builder [<map.key>] : Object | provenance |  |
 | Test.java:97:18:97:44 | b : Builder [<map.key>] : Object | Test.java:97:66:97:66 | b : Builder [<map.key>] : Object | provenance |  |
 | Test.java:97:18:97:44 | b : Builder [<map.key>] : Object | Test.java:97:66:97:66 | b : Builder [<map.key>] : Object | provenance |  |
-| Test.java:97:66:97:66 | b : Builder [<map.key>] : Object | Test.java:97:66:97:74 | build(...) : ImmutableMap [<map.key>] : Object | provenance | MaD:84 |
-| Test.java:97:66:97:66 | b : Builder [<map.key>] : Object | Test.java:97:66:97:74 | build(...) : ImmutableMap [<map.key>] : Object | provenance | MaD:84 |
-| Test.java:97:66:97:66 | b : Builder [<map.key>] : Object | Test.java:97:66:97:74 | build(...) : ImmutableMap [<map.key>] : Object | provenance | MaD:84 |
-| Test.java:97:66:97:74 | build(...) : ImmutableMap [<map.key>] : Object | Test.java:97:56:97:75 | getMapKey(...) : Object | provenance | MaD:562 |
-| Test.java:97:66:97:74 | build(...) : ImmutableMap [<map.key>] : Object | Test.java:97:56:97:75 | getMapKey(...) : Object | provenance | MaD:562 |
-| Test.java:97:66:97:74 | build(...) : ImmutableMap [<map.key>] : Object | Test.java:97:56:97:75 | getMapKey(...) : Object | provenance | MaD:562 |
+| Test.java:97:66:97:66 | b : Builder [<map.key>] : Object | Test.java:97:66:97:74 | build(...) : ImmutableMap [<map.key>] : Object | provenance | MaD:70 |
+| Test.java:97:66:97:66 | b : Builder [<map.key>] : Object | Test.java:97:66:97:74 | build(...) : ImmutableMap [<map.key>] : Object | provenance | MaD:70 |
+| Test.java:97:66:97:66 | b : Builder [<map.key>] : Object | Test.java:97:66:97:74 | build(...) : ImmutableMap [<map.key>] : Object | provenance | MaD:70 |
+| Test.java:97:66:97:74 | build(...) : ImmutableMap [<map.key>] : Object | Test.java:97:56:97:75 | getMapKey(...) : Object | provenance | MaD:569 |
+| Test.java:97:66:97:74 | build(...) : ImmutableMap [<map.key>] : Object | Test.java:97:56:97:75 | getMapKey(...) : Object | provenance | MaD:569 |
+| Test.java:97:66:97:74 | build(...) : ImmutableMap [<map.key>] : Object | Test.java:97:56:97:75 | getMapKey(...) : Object | provenance | MaD:569 |
 | Test.java:97:66:97:74 | build(...) : ImmutableMap [<map.key>] : Object | Test.java:99:18:99:29 | map : ImmutableMap [<map.key>] : Object | provenance |  |
 | Test.java:97:66:97:74 | build(...) : ImmutableMap [<map.key>] : Object | Test.java:99:18:99:29 | map : ImmutableMap [<map.key>] : Object | provenance |  |
 | Test.java:97:66:97:74 | build(...) : ImmutableMap [<map.key>] : Object | Test.java:99:18:99:29 | map : ImmutableMap [<map.key>] : Object | provenance |  |
 | Test.java:98:18:98:49 | b : Builder [<map.key>] : Object | Test.java:98:71:98:71 | b : Builder [<map.key>] : Object | provenance |  |
 | Test.java:98:18:98:49 | b : Builder [<map.key>] : Object | Test.java:98:71:98:71 | b : Builder [<map.key>] : Object | provenance |  |
 | Test.java:98:18:98:49 | b : Builder [<map.key>] : Object | Test.java:98:71:98:71 | b : Builder [<map.key>] : Object | provenance |  |
-| Test.java:98:71:98:71 | b : Builder [<map.key>] : Object | Test.java:98:71:98:79 | build(...) : ImmutableMultimap [<map.key>] : Object | provenance | MaD:113 |
-| Test.java:98:71:98:71 | b : Builder [<map.key>] : Object | Test.java:98:71:98:79 | build(...) : ImmutableMultimap [<map.key>] : Object | provenance | MaD:113 |
-| Test.java:98:71:98:71 | b : Builder [<map.key>] : Object | Test.java:98:71:98:79 | build(...) : ImmutableMultimap [<map.key>] : Object | provenance | MaD:113 |
+| Test.java:98:71:98:71 | b : Builder [<map.key>] : Object | Test.java:98:71:98:79 | build(...) : ImmutableMultimap [<map.key>] : Object | provenance | MaD:97 |
+| Test.java:98:71:98:71 | b : Builder [<map.key>] : Object | Test.java:98:71:98:79 | build(...) : ImmutableMultimap [<map.key>] : Object | provenance | MaD:97 |
+| Test.java:98:71:98:71 | b : Builder [<map.key>] : Object | Test.java:98:71:98:79 | build(...) : ImmutableMultimap [<map.key>] : Object | provenance | MaD:97 |
 | Test.java:98:71:98:79 | build(...) : ImmutableMultimap [<map.key>] : Object | Test.java:98:61:98:80 | getMapKey(...) : Object | provenance | MaD:373 |
 | Test.java:98:71:98:79 | build(...) : ImmutableMultimap [<map.key>] : Object | Test.java:98:61:98:80 | getMapKey(...) : Object | provenance | MaD:373 |
 | Test.java:98:71:98:79 | build(...) : ImmutableMultimap [<map.key>] : Object | Test.java:98:61:98:80 | getMapKey(...) : Object | provenance | MaD:373 |
@@ -639,57 +639,57 @@ edges
 | Test.java:99:18:99:29 | map : SortedMap [<map.key>] : Comparable | Test.java:99:41:99:43 | map : SortedMap [<map.key>] : Comparable | provenance |  |
 | Test.java:99:18:99:29 | map : SortedMap [<map.key>] : Object | Test.java:99:41:99:43 | map : SortedMap [<map.key>] : Object | provenance |  |
 | Test.java:99:18:99:29 | map : TreeMap [<map.key>] : Comparable | Test.java:99:41:99:43 | map : TreeMap [<map.key>] : Comparable | provenance |  |
-| Test.java:99:41:99:43 | map : BiMap [<map.key>] : Object | Test.java:99:41:99:52 | keySet(...) : Set [<element>] : Object | provenance | MaD:562 |
-| Test.java:99:41:99:43 | map : HashBiMap [<map.key>] : Object | Test.java:99:41:99:52 | keySet(...) : Set [<element>] : Object | provenance | MaD:562 |
-| Test.java:99:41:99:43 | map : HashMap [<map.key>] : Object | Test.java:99:41:99:52 | keySet(...) : Set [<element>] : Object | provenance | MaD:562 |
-| Test.java:99:41:99:43 | map : ImmutableBiMap [<map.key>] : Object | Test.java:99:41:99:52 | keySet(...) : Set [<element>] : Object | provenance | MaD:562 |
-| Test.java:99:41:99:43 | map : ImmutableClassToInstanceMap [<map.key>] : Class | Test.java:99:41:99:52 | keySet(...) : Set [<element>] : Class | provenance | MaD:562 |
-| Test.java:99:41:99:43 | map : ImmutableClassToInstanceMap [<map.key>] : Object | Test.java:99:41:99:52 | keySet(...) : Set [<element>] : Object | provenance | MaD:562 |
-| Test.java:99:41:99:43 | map : ImmutableMap [<map.key>] : Object | Test.java:99:41:99:52 | keySet(...) : Set [<element>] : Object | provenance | MaD:562 |
-| Test.java:99:41:99:43 | map : ImmutableSortedMap [<map.key>] : Comparable | Test.java:99:41:99:52 | keySet(...) : Set [<element>] : Comparable | provenance | MaD:562 |
-| Test.java:99:41:99:43 | map : ImmutableSortedMap [<map.key>] : Object | Test.java:99:41:99:52 | keySet(...) : Set [<element>] : Object | provenance | MaD:562 |
-| Test.java:99:41:99:43 | map : LinkedHashMap [<map.key>] : Object | Test.java:99:41:99:52 | keySet(...) : Set [<element>] : Object | provenance | MaD:562 |
-| Test.java:99:41:99:43 | map : Map [<map.key>] : Comparable | Test.java:99:41:99:52 | keySet(...) : Set [<element>] : Comparable | provenance | MaD:562 |
-| Test.java:99:41:99:43 | map : Map [<map.key>] : Object | Test.java:99:41:99:52 | keySet(...) : Set [<element>] : Object | provenance | MaD:562 |
-| Test.java:99:41:99:43 | map : MutableClassToInstanceMap [<map.key>] : Object | Test.java:99:41:99:52 | keySet(...) : Set [<element>] : Object | provenance | MaD:562 |
-| Test.java:99:41:99:43 | map : NavigableMap [<map.key>] : Comparable | Test.java:99:41:99:52 | keySet(...) : Set [<element>] : Comparable | provenance | MaD:562 |
-| Test.java:99:41:99:43 | map : SortedMap [<map.key>] : Comparable | Test.java:99:41:99:52 | keySet(...) : Set [<element>] : Comparable | provenance | MaD:562 |
-| Test.java:99:41:99:43 | map : SortedMap [<map.key>] : Object | Test.java:99:41:99:52 | keySet(...) : Set [<element>] : Object | provenance | MaD:562 |
-| Test.java:99:41:99:43 | map : TreeMap [<map.key>] : Comparable | Test.java:99:41:99:52 | keySet(...) : Set [<element>] : Comparable | provenance | MaD:562 |
-| Test.java:99:41:99:52 | keySet(...) : Set [<element>] : Class | Test.java:99:41:99:63 | iterator(...) : Iterator [<element>] : Class | provenance | MaD:555 |
-| Test.java:99:41:99:52 | keySet(...) : Set [<element>] : Comparable | Test.java:99:41:99:63 | iterator(...) : Iterator [<element>] : Comparable | provenance | MaD:555 |
-| Test.java:99:41:99:52 | keySet(...) : Set [<element>] : Comparable | Test.java:99:41:99:63 | iterator(...) : Iterator [<element>] : Comparable | provenance | MaD:555 |
-| Test.java:99:41:99:52 | keySet(...) : Set [<element>] : Comparable | Test.java:99:41:99:63 | iterator(...) : Iterator [<element>] : Comparable | provenance | MaD:555 |
-| Test.java:99:41:99:52 | keySet(...) : Set [<element>] : Comparable | Test.java:99:41:99:63 | iterator(...) : Iterator [<element>] : Comparable | provenance | MaD:555 |
-| Test.java:99:41:99:52 | keySet(...) : Set [<element>] : Comparable | Test.java:99:41:99:63 | iterator(...) : Iterator [<element>] : Comparable | provenance | MaD:555 |
-| Test.java:99:41:99:52 | keySet(...) : Set [<element>] : Object | Test.java:99:41:99:63 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:555 |
-| Test.java:99:41:99:52 | keySet(...) : Set [<element>] : Object | Test.java:99:41:99:63 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:555 |
-| Test.java:99:41:99:52 | keySet(...) : Set [<element>] : Object | Test.java:99:41:99:63 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:555 |
-| Test.java:99:41:99:52 | keySet(...) : Set [<element>] : Object | Test.java:99:41:99:63 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:555 |
-| Test.java:99:41:99:52 | keySet(...) : Set [<element>] : Object | Test.java:99:41:99:63 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:555 |
-| Test.java:99:41:99:52 | keySet(...) : Set [<element>] : Object | Test.java:99:41:99:63 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:555 |
-| Test.java:99:41:99:52 | keySet(...) : Set [<element>] : Object | Test.java:99:41:99:63 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:555 |
-| Test.java:99:41:99:52 | keySet(...) : Set [<element>] : Object | Test.java:99:41:99:63 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:555 |
-| Test.java:99:41:99:52 | keySet(...) : Set [<element>] : Object | Test.java:99:41:99:63 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:555 |
-| Test.java:99:41:99:52 | keySet(...) : Set [<element>] : Object | Test.java:99:41:99:63 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:555 |
-| Test.java:99:41:99:52 | keySet(...) : Set [<element>] : Object | Test.java:99:41:99:63 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:555 |
-| Test.java:99:41:99:63 | iterator(...) : Iterator [<element>] : Class | Test.java:99:41:99:70 | next(...) : Class | provenance | MaD:557 |
-| Test.java:99:41:99:63 | iterator(...) : Iterator [<element>] : Comparable | Test.java:99:41:99:70 | next(...) : Comparable | provenance | MaD:557 |
-| Test.java:99:41:99:63 | iterator(...) : Iterator [<element>] : Comparable | Test.java:99:41:99:70 | next(...) : Comparable | provenance | MaD:557 |
-| Test.java:99:41:99:63 | iterator(...) : Iterator [<element>] : Comparable | Test.java:99:41:99:70 | next(...) : Comparable | provenance | MaD:557 |
-| Test.java:99:41:99:63 | iterator(...) : Iterator [<element>] : Comparable | Test.java:99:41:99:70 | next(...) : Comparable | provenance | MaD:557 |
-| Test.java:99:41:99:63 | iterator(...) : Iterator [<element>] : Comparable | Test.java:99:41:99:70 | next(...) : Comparable | provenance | MaD:557 |
-| Test.java:99:41:99:63 | iterator(...) : Iterator [<element>] : Object | Test.java:99:41:99:70 | next(...) : Object | provenance | MaD:557 |
-| Test.java:99:41:99:63 | iterator(...) : Iterator [<element>] : Object | Test.java:99:41:99:70 | next(...) : Object | provenance | MaD:557 |
-| Test.java:99:41:99:63 | iterator(...) : Iterator [<element>] : Object | Test.java:99:41:99:70 | next(...) : Object | provenance | MaD:557 |
-| Test.java:99:41:99:63 | iterator(...) : Iterator [<element>] : Object | Test.java:99:41:99:70 | next(...) : Object | provenance | MaD:557 |
-| Test.java:99:41:99:63 | iterator(...) : Iterator [<element>] : Object | Test.java:99:41:99:70 | next(...) : Object | provenance | MaD:557 |
-| Test.java:99:41:99:63 | iterator(...) : Iterator [<element>] : Object | Test.java:99:41:99:70 | next(...) : Object | provenance | MaD:557 |
-| Test.java:99:41:99:63 | iterator(...) : Iterator [<element>] : Object | Test.java:99:41:99:70 | next(...) : Object | provenance | MaD:557 |
-| Test.java:99:41:99:63 | iterator(...) : Iterator [<element>] : Object | Test.java:99:41:99:70 | next(...) : Object | provenance | MaD:557 |
-| Test.java:99:41:99:63 | iterator(...) : Iterator [<element>] : Object | Test.java:99:41:99:70 | next(...) : Object | provenance | MaD:557 |
-| Test.java:99:41:99:63 | iterator(...) : Iterator [<element>] : Object | Test.java:99:41:99:70 | next(...) : Object | provenance | MaD:557 |
-| Test.java:99:41:99:63 | iterator(...) : Iterator [<element>] : Object | Test.java:99:41:99:70 | next(...) : Object | provenance | MaD:557 |
+| Test.java:99:41:99:43 | map : BiMap [<map.key>] : Object | Test.java:99:41:99:52 | keySet(...) : Set [<element>] : Object | provenance | MaD:569 |
+| Test.java:99:41:99:43 | map : HashBiMap [<map.key>] : Object | Test.java:99:41:99:52 | keySet(...) : Set [<element>] : Object | provenance | MaD:569 |
+| Test.java:99:41:99:43 | map : HashMap [<map.key>] : Object | Test.java:99:41:99:52 | keySet(...) : Set [<element>] : Object | provenance | MaD:569 |
+| Test.java:99:41:99:43 | map : ImmutableBiMap [<map.key>] : Object | Test.java:99:41:99:52 | keySet(...) : Set [<element>] : Object | provenance | MaD:569 |
+| Test.java:99:41:99:43 | map : ImmutableClassToInstanceMap [<map.key>] : Class | Test.java:99:41:99:52 | keySet(...) : Set [<element>] : Class | provenance | MaD:569 |
+| Test.java:99:41:99:43 | map : ImmutableClassToInstanceMap [<map.key>] : Object | Test.java:99:41:99:52 | keySet(...) : Set [<element>] : Object | provenance | MaD:569 |
+| Test.java:99:41:99:43 | map : ImmutableMap [<map.key>] : Object | Test.java:99:41:99:52 | keySet(...) : Set [<element>] : Object | provenance | MaD:569 |
+| Test.java:99:41:99:43 | map : ImmutableSortedMap [<map.key>] : Comparable | Test.java:99:41:99:52 | keySet(...) : Set [<element>] : Comparable | provenance | MaD:569 |
+| Test.java:99:41:99:43 | map : ImmutableSortedMap [<map.key>] : Object | Test.java:99:41:99:52 | keySet(...) : Set [<element>] : Object | provenance | MaD:569 |
+| Test.java:99:41:99:43 | map : LinkedHashMap [<map.key>] : Object | Test.java:99:41:99:52 | keySet(...) : Set [<element>] : Object | provenance | MaD:569 |
+| Test.java:99:41:99:43 | map : Map [<map.key>] : Comparable | Test.java:99:41:99:52 | keySet(...) : Set [<element>] : Comparable | provenance | MaD:569 |
+| Test.java:99:41:99:43 | map : Map [<map.key>] : Object | Test.java:99:41:99:52 | keySet(...) : Set [<element>] : Object | provenance | MaD:569 |
+| Test.java:99:41:99:43 | map : MutableClassToInstanceMap [<map.key>] : Object | Test.java:99:41:99:52 | keySet(...) : Set [<element>] : Object | provenance | MaD:569 |
+| Test.java:99:41:99:43 | map : NavigableMap [<map.key>] : Comparable | Test.java:99:41:99:52 | keySet(...) : Set [<element>] : Comparable | provenance | MaD:569 |
+| Test.java:99:41:99:43 | map : SortedMap [<map.key>] : Comparable | Test.java:99:41:99:52 | keySet(...) : Set [<element>] : Comparable | provenance | MaD:569 |
+| Test.java:99:41:99:43 | map : SortedMap [<map.key>] : Object | Test.java:99:41:99:52 | keySet(...) : Set [<element>] : Object | provenance | MaD:569 |
+| Test.java:99:41:99:43 | map : TreeMap [<map.key>] : Comparable | Test.java:99:41:99:52 | keySet(...) : Set [<element>] : Comparable | provenance | MaD:569 |
+| Test.java:99:41:99:52 | keySet(...) : Set [<element>] : Class | Test.java:99:41:99:63 | iterator(...) : Iterator [<element>] : Class | provenance | MaD:558 |
+| Test.java:99:41:99:52 | keySet(...) : Set [<element>] : Comparable | Test.java:99:41:99:63 | iterator(...) : Iterator [<element>] : Comparable | provenance | MaD:558 |
+| Test.java:99:41:99:52 | keySet(...) : Set [<element>] : Comparable | Test.java:99:41:99:63 | iterator(...) : Iterator [<element>] : Comparable | provenance | MaD:558 |
+| Test.java:99:41:99:52 | keySet(...) : Set [<element>] : Comparable | Test.java:99:41:99:63 | iterator(...) : Iterator [<element>] : Comparable | provenance | MaD:558 |
+| Test.java:99:41:99:52 | keySet(...) : Set [<element>] : Comparable | Test.java:99:41:99:63 | iterator(...) : Iterator [<element>] : Comparable | provenance | MaD:558 |
+| Test.java:99:41:99:52 | keySet(...) : Set [<element>] : Comparable | Test.java:99:41:99:63 | iterator(...) : Iterator [<element>] : Comparable | provenance | MaD:558 |
+| Test.java:99:41:99:52 | keySet(...) : Set [<element>] : Object | Test.java:99:41:99:63 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:558 |
+| Test.java:99:41:99:52 | keySet(...) : Set [<element>] : Object | Test.java:99:41:99:63 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:558 |
+| Test.java:99:41:99:52 | keySet(...) : Set [<element>] : Object | Test.java:99:41:99:63 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:558 |
+| Test.java:99:41:99:52 | keySet(...) : Set [<element>] : Object | Test.java:99:41:99:63 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:558 |
+| Test.java:99:41:99:52 | keySet(...) : Set [<element>] : Object | Test.java:99:41:99:63 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:558 |
+| Test.java:99:41:99:52 | keySet(...) : Set [<element>] : Object | Test.java:99:41:99:63 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:558 |
+| Test.java:99:41:99:52 | keySet(...) : Set [<element>] : Object | Test.java:99:41:99:63 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:558 |
+| Test.java:99:41:99:52 | keySet(...) : Set [<element>] : Object | Test.java:99:41:99:63 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:558 |
+| Test.java:99:41:99:52 | keySet(...) : Set [<element>] : Object | Test.java:99:41:99:63 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:558 |
+| Test.java:99:41:99:52 | keySet(...) : Set [<element>] : Object | Test.java:99:41:99:63 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:558 |
+| Test.java:99:41:99:52 | keySet(...) : Set [<element>] : Object | Test.java:99:41:99:63 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:558 |
+| Test.java:99:41:99:63 | iterator(...) : Iterator [<element>] : Class | Test.java:99:41:99:70 | next(...) : Class | provenance | MaD:560 |
+| Test.java:99:41:99:63 | iterator(...) : Iterator [<element>] : Comparable | Test.java:99:41:99:70 | next(...) : Comparable | provenance | MaD:560 |
+| Test.java:99:41:99:63 | iterator(...) : Iterator [<element>] : Comparable | Test.java:99:41:99:70 | next(...) : Comparable | provenance | MaD:560 |
+| Test.java:99:41:99:63 | iterator(...) : Iterator [<element>] : Comparable | Test.java:99:41:99:70 | next(...) : Comparable | provenance | MaD:560 |
+| Test.java:99:41:99:63 | iterator(...) : Iterator [<element>] : Comparable | Test.java:99:41:99:70 | next(...) : Comparable | provenance | MaD:560 |
+| Test.java:99:41:99:63 | iterator(...) : Iterator [<element>] : Comparable | Test.java:99:41:99:70 | next(...) : Comparable | provenance | MaD:560 |
+| Test.java:99:41:99:63 | iterator(...) : Iterator [<element>] : Object | Test.java:99:41:99:70 | next(...) : Object | provenance | MaD:560 |
+| Test.java:99:41:99:63 | iterator(...) : Iterator [<element>] : Object | Test.java:99:41:99:70 | next(...) : Object | provenance | MaD:560 |
+| Test.java:99:41:99:63 | iterator(...) : Iterator [<element>] : Object | Test.java:99:41:99:70 | next(...) : Object | provenance | MaD:560 |
+| Test.java:99:41:99:63 | iterator(...) : Iterator [<element>] : Object | Test.java:99:41:99:70 | next(...) : Object | provenance | MaD:560 |
+| Test.java:99:41:99:63 | iterator(...) : Iterator [<element>] : Object | Test.java:99:41:99:70 | next(...) : Object | provenance | MaD:560 |
+| Test.java:99:41:99:63 | iterator(...) : Iterator [<element>] : Object | Test.java:99:41:99:70 | next(...) : Object | provenance | MaD:560 |
+| Test.java:99:41:99:63 | iterator(...) : Iterator [<element>] : Object | Test.java:99:41:99:70 | next(...) : Object | provenance | MaD:560 |
+| Test.java:99:41:99:63 | iterator(...) : Iterator [<element>] : Object | Test.java:99:41:99:70 | next(...) : Object | provenance | MaD:560 |
+| Test.java:99:41:99:63 | iterator(...) : Iterator [<element>] : Object | Test.java:99:41:99:70 | next(...) : Object | provenance | MaD:560 |
+| Test.java:99:41:99:63 | iterator(...) : Iterator [<element>] : Object | Test.java:99:41:99:70 | next(...) : Object | provenance | MaD:560 |
+| Test.java:99:41:99:63 | iterator(...) : Iterator [<element>] : Object | Test.java:99:41:99:70 | next(...) : Object | provenance | MaD:560 |
 | Test.java:100:18:100:34 | map : ArrayListMultimap [<map.key>] : Object | Test.java:100:46:100:48 | map : ArrayListMultimap [<map.key>] : Object | provenance |  |
 | Test.java:100:18:100:34 | map : HashMultimap [<map.key>] : Object | Test.java:100:46:100:48 | map : HashMultimap [<map.key>] : Object | provenance |  |
 | Test.java:100:18:100:34 | map : ImmutableListMultimap [<map.key>] : Object | Test.java:100:46:100:48 | map : ImmutableListMultimap [<map.key>] : Object | provenance |  |
@@ -716,64 +716,64 @@ edges
 | Test.java:100:46:100:48 | map : SortedSetMultimap [<map.key>] : Comparable | Test.java:100:46:100:57 | keySet(...) : Set [<element>] : Comparable | provenance | MaD:373 |
 | Test.java:100:46:100:48 | map : SortedSetMultimap [<map.key>] : Object | Test.java:100:46:100:57 | keySet(...) : Set [<element>] : Object | provenance | MaD:373 |
 | Test.java:100:46:100:48 | map : TreeMultimap [<map.key>] : Object | Test.java:100:46:100:57 | keySet(...) : Set [<element>] : Object | provenance | MaD:373 |
-| Test.java:100:46:100:57 | keySet(...) : Set [<element>] : Comparable | Test.java:100:46:100:68 | iterator(...) : Iterator [<element>] : Comparable | provenance | MaD:555 |
-| Test.java:100:46:100:57 | keySet(...) : Set [<element>] : Object | Test.java:100:46:100:68 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:555 |
-| Test.java:100:46:100:57 | keySet(...) : Set [<element>] : Object | Test.java:100:46:100:68 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:555 |
-| Test.java:100:46:100:57 | keySet(...) : Set [<element>] : Object | Test.java:100:46:100:68 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:555 |
-| Test.java:100:46:100:57 | keySet(...) : Set [<element>] : Object | Test.java:100:46:100:68 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:555 |
-| Test.java:100:46:100:57 | keySet(...) : Set [<element>] : Object | Test.java:100:46:100:68 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:555 |
-| Test.java:100:46:100:57 | keySet(...) : Set [<element>] : Object | Test.java:100:46:100:68 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:555 |
-| Test.java:100:46:100:57 | keySet(...) : Set [<element>] : Object | Test.java:100:46:100:68 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:555 |
-| Test.java:100:46:100:57 | keySet(...) : Set [<element>] : Object | Test.java:100:46:100:68 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:555 |
-| Test.java:100:46:100:57 | keySet(...) : Set [<element>] : Object | Test.java:100:46:100:68 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:555 |
-| Test.java:100:46:100:57 | keySet(...) : Set [<element>] : Object | Test.java:100:46:100:68 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:555 |
-| Test.java:100:46:100:57 | keySet(...) : Set [<element>] : Object | Test.java:100:46:100:68 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:555 |
-| Test.java:100:46:100:57 | keySet(...) : Set [<element>] : Object | Test.java:100:46:100:68 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:555 |
-| Test.java:100:46:100:68 | iterator(...) : Iterator [<element>] : Comparable | Test.java:100:46:100:75 | next(...) : Comparable | provenance | MaD:557 |
-| Test.java:100:46:100:68 | iterator(...) : Iterator [<element>] : Object | Test.java:100:46:100:75 | next(...) : Object | provenance | MaD:557 |
-| Test.java:100:46:100:68 | iterator(...) : Iterator [<element>] : Object | Test.java:100:46:100:75 | next(...) : Object | provenance | MaD:557 |
-| Test.java:100:46:100:68 | iterator(...) : Iterator [<element>] : Object | Test.java:100:46:100:75 | next(...) : Object | provenance | MaD:557 |
-| Test.java:100:46:100:68 | iterator(...) : Iterator [<element>] : Object | Test.java:100:46:100:75 | next(...) : Object | provenance | MaD:557 |
-| Test.java:100:46:100:68 | iterator(...) : Iterator [<element>] : Object | Test.java:100:46:100:75 | next(...) : Object | provenance | MaD:557 |
-| Test.java:100:46:100:68 | iterator(...) : Iterator [<element>] : Object | Test.java:100:46:100:75 | next(...) : Object | provenance | MaD:557 |
-| Test.java:100:46:100:68 | iterator(...) : Iterator [<element>] : Object | Test.java:100:46:100:75 | next(...) : Object | provenance | MaD:557 |
-| Test.java:100:46:100:68 | iterator(...) : Iterator [<element>] : Object | Test.java:100:46:100:75 | next(...) : Object | provenance | MaD:557 |
-| Test.java:100:46:100:68 | iterator(...) : Iterator [<element>] : Object | Test.java:100:46:100:75 | next(...) : Object | provenance | MaD:557 |
-| Test.java:100:46:100:68 | iterator(...) : Iterator [<element>] : Object | Test.java:100:46:100:75 | next(...) : Object | provenance | MaD:557 |
-| Test.java:100:46:100:68 | iterator(...) : Iterator [<element>] : Object | Test.java:100:46:100:75 | next(...) : Object | provenance | MaD:557 |
-| Test.java:100:46:100:68 | iterator(...) : Iterator [<element>] : Object | Test.java:100:46:100:75 | next(...) : Object | provenance | MaD:557 |
+| Test.java:100:46:100:57 | keySet(...) : Set [<element>] : Comparable | Test.java:100:46:100:68 | iterator(...) : Iterator [<element>] : Comparable | provenance | MaD:558 |
+| Test.java:100:46:100:57 | keySet(...) : Set [<element>] : Object | Test.java:100:46:100:68 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:558 |
+| Test.java:100:46:100:57 | keySet(...) : Set [<element>] : Object | Test.java:100:46:100:68 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:558 |
+| Test.java:100:46:100:57 | keySet(...) : Set [<element>] : Object | Test.java:100:46:100:68 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:558 |
+| Test.java:100:46:100:57 | keySet(...) : Set [<element>] : Object | Test.java:100:46:100:68 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:558 |
+| Test.java:100:46:100:57 | keySet(...) : Set [<element>] : Object | Test.java:100:46:100:68 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:558 |
+| Test.java:100:46:100:57 | keySet(...) : Set [<element>] : Object | Test.java:100:46:100:68 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:558 |
+| Test.java:100:46:100:57 | keySet(...) : Set [<element>] : Object | Test.java:100:46:100:68 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:558 |
+| Test.java:100:46:100:57 | keySet(...) : Set [<element>] : Object | Test.java:100:46:100:68 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:558 |
+| Test.java:100:46:100:57 | keySet(...) : Set [<element>] : Object | Test.java:100:46:100:68 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:558 |
+| Test.java:100:46:100:57 | keySet(...) : Set [<element>] : Object | Test.java:100:46:100:68 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:558 |
+| Test.java:100:46:100:57 | keySet(...) : Set [<element>] : Object | Test.java:100:46:100:68 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:558 |
+| Test.java:100:46:100:57 | keySet(...) : Set [<element>] : Object | Test.java:100:46:100:68 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:558 |
+| Test.java:100:46:100:68 | iterator(...) : Iterator [<element>] : Comparable | Test.java:100:46:100:75 | next(...) : Comparable | provenance | MaD:560 |
+| Test.java:100:46:100:68 | iterator(...) : Iterator [<element>] : Object | Test.java:100:46:100:75 | next(...) : Object | provenance | MaD:560 |
+| Test.java:100:46:100:68 | iterator(...) : Iterator [<element>] : Object | Test.java:100:46:100:75 | next(...) : Object | provenance | MaD:560 |
+| Test.java:100:46:100:68 | iterator(...) : Iterator [<element>] : Object | Test.java:100:46:100:75 | next(...) : Object | provenance | MaD:560 |
+| Test.java:100:46:100:68 | iterator(...) : Iterator [<element>] : Object | Test.java:100:46:100:75 | next(...) : Object | provenance | MaD:560 |
+| Test.java:100:46:100:68 | iterator(...) : Iterator [<element>] : Object | Test.java:100:46:100:75 | next(...) : Object | provenance | MaD:560 |
+| Test.java:100:46:100:68 | iterator(...) : Iterator [<element>] : Object | Test.java:100:46:100:75 | next(...) : Object | provenance | MaD:560 |
+| Test.java:100:46:100:68 | iterator(...) : Iterator [<element>] : Object | Test.java:100:46:100:75 | next(...) : Object | provenance | MaD:560 |
+| Test.java:100:46:100:68 | iterator(...) : Iterator [<element>] : Object | Test.java:100:46:100:75 | next(...) : Object | provenance | MaD:560 |
+| Test.java:100:46:100:68 | iterator(...) : Iterator [<element>] : Object | Test.java:100:46:100:75 | next(...) : Object | provenance | MaD:560 |
+| Test.java:100:46:100:68 | iterator(...) : Iterator [<element>] : Object | Test.java:100:46:100:75 | next(...) : Object | provenance | MaD:560 |
+| Test.java:100:46:100:68 | iterator(...) : Iterator [<element>] : Object | Test.java:100:46:100:75 | next(...) : Object | provenance | MaD:560 |
+| Test.java:100:46:100:68 | iterator(...) : Iterator [<element>] : Object | Test.java:100:46:100:75 | next(...) : Object | provenance | MaD:560 |
 | Test.java:101:40:101:44 | key : Object | Test.java:101:63:101:65 | key : Object | provenance |  |
-| Test.java:101:56:101:72 | of(...) : Map [<map.key>] : Object | Test.java:101:56:101:83 | entrySet(...) : Set [<element>, <map.key>] : Object | provenance | MaD:559 |
-| Test.java:101:56:101:83 | entrySet(...) : Set [<element>, <map.key>] : Object | Test.java:101:56:101:94 | iterator(...) : Iterator [<element>, <map.key>] : Object | provenance | MaD:555 |
-| Test.java:101:56:101:94 | iterator(...) : Iterator [<element>, <map.key>] : Object | Test.java:101:56:101:101 | next(...) : Entry [<map.key>] : Object | provenance | MaD:557 |
-| Test.java:101:63:101:65 | key : Object | Test.java:101:56:101:72 | of(...) : Map [<map.key>] : Object | provenance | MaD:563 |
+| Test.java:101:56:101:72 | of(...) : Map [<map.key>] : Object | Test.java:101:56:101:83 | entrySet(...) : Set [<element>, <map.key>] : Object | provenance | MaD:566 |
+| Test.java:101:56:101:83 | entrySet(...) : Set [<element>, <map.key>] : Object | Test.java:101:56:101:94 | iterator(...) : Iterator [<element>, <map.key>] : Object | provenance | MaD:558 |
+| Test.java:101:56:101:94 | iterator(...) : Iterator [<element>, <map.key>] : Object | Test.java:101:56:101:101 | next(...) : Entry [<map.key>] : Object | provenance | MaD:560 |
+| Test.java:101:63:101:65 | key : Object | Test.java:101:56:101:72 | of(...) : Map [<map.key>] : Object | provenance | MaD:564 |
 | Test.java:102:41:102:45 | row : Object | Test.java:102:105:102:107 | row : Object | provenance |  |
 | Test.java:102:48:102:55 | column : Object | Test.java:102:110:102:115 | column : Object | provenance |  |
 | Test.java:102:58:102:64 | value : Object | Test.java:102:118:102:122 | value : Object | provenance |  |
-| Test.java:102:87:102:123 | of(...) : ImmutableTable [<map.value>] : Object | Test.java:102:87:102:133 | cellSet(...) : ImmutableSet [<element>, <map.value>] : Object | provenance | MaD:502 |
-| Test.java:102:87:102:123 | of(...) : ImmutableTable [com.google.common.collect.Table.columnKey] : Object | Test.java:102:87:102:133 | cellSet(...) : ImmutableSet [<element>, com.google.common.collect.Table.columnKey] : Object | provenance | MaD:503 |
-| Test.java:102:87:102:123 | of(...) : ImmutableTable [com.google.common.collect.Table.rowKey] : Object | Test.java:102:87:102:133 | cellSet(...) : ImmutableSet [<element>, com.google.common.collect.Table.rowKey] : Object | provenance | MaD:504 |
-| Test.java:102:87:102:133 | cellSet(...) : ImmutableSet [<element>, <map.value>] : Object | Test.java:102:76:102:134 | getElement(...) : Cell [<map.value>] : Object | provenance | MaD:555 |
+| Test.java:102:87:102:123 | of(...) : ImmutableTable [<map.value>] : Object | Test.java:102:87:102:133 | cellSet(...) : ImmutableSet [<element>, <map.value>] : Object | provenance | MaD:505 |
+| Test.java:102:87:102:123 | of(...) : ImmutableTable [com.google.common.collect.Table.columnKey] : Object | Test.java:102:87:102:133 | cellSet(...) : ImmutableSet [<element>, com.google.common.collect.Table.columnKey] : Object | provenance | MaD:506 |
+| Test.java:102:87:102:123 | of(...) : ImmutableTable [com.google.common.collect.Table.rowKey] : Object | Test.java:102:87:102:133 | cellSet(...) : ImmutableSet [<element>, com.google.common.collect.Table.rowKey] : Object | provenance | MaD:507 |
+| Test.java:102:87:102:133 | cellSet(...) : ImmutableSet [<element>, <map.value>] : Object | Test.java:102:76:102:134 | getElement(...) : Cell [<map.value>] : Object | provenance | MaD:558 |
 | Test.java:102:87:102:133 | cellSet(...) : ImmutableSet [<element>, <map.value>] : Object | Test.java:110:19:110:32 | it : ImmutableSet [<element>, <map.value>] : Object | provenance |  |
-| Test.java:102:87:102:133 | cellSet(...) : ImmutableSet [<element>, com.google.common.collect.Table.columnKey] : Object | Test.java:102:76:102:134 | getElement(...) : Cell [com.google.common.collect.Table.columnKey] : Object | provenance | MaD:555 |
+| Test.java:102:87:102:133 | cellSet(...) : ImmutableSet [<element>, com.google.common.collect.Table.columnKey] : Object | Test.java:102:76:102:134 | getElement(...) : Cell [com.google.common.collect.Table.columnKey] : Object | provenance | MaD:558 |
 | Test.java:102:87:102:133 | cellSet(...) : ImmutableSet [<element>, com.google.common.collect.Table.columnKey] : Object | Test.java:110:19:110:32 | it : ImmutableSet [<element>, com.google.common.collect.Table.columnKey] : Object | provenance |  |
-| Test.java:102:87:102:133 | cellSet(...) : ImmutableSet [<element>, com.google.common.collect.Table.rowKey] : Object | Test.java:102:76:102:134 | getElement(...) : Cell [com.google.common.collect.Table.rowKey] : Object | provenance | MaD:555 |
+| Test.java:102:87:102:133 | cellSet(...) : ImmutableSet [<element>, com.google.common.collect.Table.rowKey] : Object | Test.java:102:76:102:134 | getElement(...) : Cell [com.google.common.collect.Table.rowKey] : Object | provenance | MaD:558 |
 | Test.java:102:87:102:133 | cellSet(...) : ImmutableSet [<element>, com.google.common.collect.Table.rowKey] : Object | Test.java:110:19:110:32 | it : ImmutableSet [<element>, com.google.common.collect.Table.rowKey] : Object | provenance |  |
-| Test.java:102:105:102:107 | row : Object | Test.java:102:87:102:123 | of(...) : ImmutableTable [com.google.common.collect.Table.rowKey] : Object | provenance | MaD:196 |
-| Test.java:102:110:102:115 | column : Object | Test.java:102:87:102:123 | of(...) : ImmutableTable [com.google.common.collect.Table.columnKey] : Object | provenance | MaD:197 |
-| Test.java:102:118:102:122 | value : Object | Test.java:102:87:102:123 | of(...) : ImmutableTable [<map.value>] : Object | provenance | MaD:198 |
+| Test.java:102:105:102:107 | row : Object | Test.java:102:87:102:123 | of(...) : ImmutableTable [com.google.common.collect.Table.rowKey] : Object | provenance | MaD:213 |
+| Test.java:102:110:102:115 | column : Object | Test.java:102:87:102:123 | of(...) : ImmutableTable [com.google.common.collect.Table.columnKey] : Object | provenance | MaD:214 |
+| Test.java:102:118:102:122 | value : Object | Test.java:102:87:102:123 | of(...) : ImmutableTable [<map.value>] : Object | provenance | MaD:215 |
 | Test.java:103:41:103:45 | row : Object | Test.java:103:129:103:131 | row : Object | provenance |  |
 | Test.java:103:48:103:55 | column : Object | Test.java:103:134:103:139 | column : Object | provenance |  |
 | Test.java:103:58:103:64 | value : Object | Test.java:103:142:103:146 | value : Object | provenance |  |
 | Test.java:103:123:103:123 | t [post update] : TreeBasedTable [<map.value>] : Object | Test.java:103:157:103:157 | t : TreeBasedTable [<map.value>] : Object | provenance |  |
 | Test.java:103:123:103:123 | t [post update] : TreeBasedTable [com.google.common.collect.Table.columnKey] : Object | Test.java:103:157:103:157 | t : TreeBasedTable [com.google.common.collect.Table.columnKey] : Object | provenance |  |
 | Test.java:103:123:103:123 | t [post update] : TreeBasedTable [com.google.common.collect.Table.rowKey] : Object | Test.java:103:157:103:157 | t : TreeBasedTable [com.google.common.collect.Table.rowKey] : Object | provenance |  |
-| Test.java:103:129:103:131 | row : Object | Test.java:103:123:103:123 | t [post update] : TreeBasedTable [com.google.common.collect.Table.rowKey] : Object | provenance | MaD:512 |
-| Test.java:103:134:103:139 | column : Object | Test.java:103:123:103:123 | t [post update] : TreeBasedTable [com.google.common.collect.Table.columnKey] : Object | provenance | MaD:513 |
-| Test.java:103:142:103:146 | value : Object | Test.java:103:123:103:123 | t [post update] : TreeBasedTable [<map.value>] : Object | provenance | MaD:514 |
+| Test.java:103:129:103:131 | row : Object | Test.java:103:123:103:123 | t [post update] : TreeBasedTable [com.google.common.collect.Table.rowKey] : Object | provenance | MaD:515 |
+| Test.java:103:134:103:139 | column : Object | Test.java:103:123:103:123 | t [post update] : TreeBasedTable [com.google.common.collect.Table.columnKey] : Object | provenance | MaD:516 |
+| Test.java:103:142:103:146 | value : Object | Test.java:103:123:103:123 | t [post update] : TreeBasedTable [<map.value>] : Object | provenance | MaD:517 |
 | Test.java:104:24:104:54 | b : Builder [com.google.common.collect.Table.rowKey] : Object | Test.java:104:82:104:82 | b : Builder [com.google.common.collect.Table.rowKey] : Object | provenance |  |
-| Test.java:104:82:104:82 | b : Builder [com.google.common.collect.Table.rowKey] : Object | Test.java:104:82:104:90 | build(...) : ImmutableTable [com.google.common.collect.Table.rowKey] : Object | provenance | MaD:201 |
-| Test.java:104:82:104:90 | build(...) : ImmutableTable [com.google.common.collect.Table.rowKey] : Object | Test.java:104:66:104:91 | getTable_rowKey(...) : Object | provenance | MaD:521 |
+| Test.java:104:82:104:82 | b : Builder [com.google.common.collect.Table.rowKey] : Object | Test.java:104:82:104:90 | build(...) : ImmutableTable [com.google.common.collect.Table.rowKey] : Object | provenance | MaD:195 |
+| Test.java:104:82:104:90 | build(...) : ImmutableTable [com.google.common.collect.Table.rowKey] : Object | Test.java:104:66:104:91 | getTable_rowKey(...) : Object | provenance | MaD:524 |
 | Test.java:104:82:104:90 | build(...) : ImmutableTable [com.google.common.collect.Table.rowKey] : Object | Test.java:105:24:105:37 | t : ImmutableTable [com.google.common.collect.Table.rowKey] : Object | provenance |  |
 | Test.java:105:24:105:37 | t : ArrayTable [com.google.common.collect.Table.rowKey] : Object | Test.java:105:49:105:49 | t : ArrayTable [com.google.common.collect.Table.rowKey] : Object | provenance |  |
 | Test.java:105:24:105:37 | t : HashBasedTable [com.google.common.collect.Table.rowKey] : Object | Test.java:105:49:105:49 | t : HashBasedTable [com.google.common.collect.Table.rowKey] : Object | provenance |  |
@@ -781,51 +781,51 @@ edges
 | Test.java:105:24:105:37 | t : RowSortedTable [com.google.common.collect.Table.rowKey] : Object | Test.java:105:49:105:49 | t : RowSortedTable [com.google.common.collect.Table.rowKey] : Object | provenance |  |
 | Test.java:105:24:105:37 | t : Table [com.google.common.collect.Table.rowKey] : Object | Test.java:105:49:105:49 | t : Table [com.google.common.collect.Table.rowKey] : Object | provenance |  |
 | Test.java:105:24:105:37 | t : TreeBasedTable [com.google.common.collect.Table.rowKey] : Object | Test.java:105:49:105:49 | t : TreeBasedTable [com.google.common.collect.Table.rowKey] : Object | provenance |  |
-| Test.java:105:49:105:49 | t : ArrayTable [com.google.common.collect.Table.rowKey] : Object | Test.java:105:49:105:61 | rowKeySet(...) : Set [<element>] : Object | provenance | MaD:521 |
-| Test.java:105:49:105:49 | t : HashBasedTable [com.google.common.collect.Table.rowKey] : Object | Test.java:105:49:105:61 | rowKeySet(...) : Set [<element>] : Object | provenance | MaD:521 |
-| Test.java:105:49:105:49 | t : ImmutableTable [com.google.common.collect.Table.rowKey] : Object | Test.java:105:49:105:61 | rowKeySet(...) : Set [<element>] : Object | provenance | MaD:521 |
-| Test.java:105:49:105:49 | t : RowSortedTable [com.google.common.collect.Table.rowKey] : Object | Test.java:105:49:105:61 | rowKeySet(...) : Set [<element>] : Object | provenance | MaD:521 |
-| Test.java:105:49:105:49 | t : Table [com.google.common.collect.Table.rowKey] : Object | Test.java:105:49:105:61 | rowKeySet(...) : Set [<element>] : Object | provenance | MaD:521 |
-| Test.java:105:49:105:49 | t : TreeBasedTable [com.google.common.collect.Table.rowKey] : Object | Test.java:105:49:105:61 | rowKeySet(...) : Set [<element>] : Object | provenance | MaD:521 |
-| Test.java:105:49:105:61 | rowKeySet(...) : Set [<element>] : Object | Test.java:105:49:105:72 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:555 |
-| Test.java:105:49:105:61 | rowKeySet(...) : Set [<element>] : Object | Test.java:105:49:105:72 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:555 |
-| Test.java:105:49:105:61 | rowKeySet(...) : Set [<element>] : Object | Test.java:105:49:105:72 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:555 |
-| Test.java:105:49:105:61 | rowKeySet(...) : Set [<element>] : Object | Test.java:105:49:105:72 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:555 |
-| Test.java:105:49:105:61 | rowKeySet(...) : Set [<element>] : Object | Test.java:105:49:105:72 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:555 |
-| Test.java:105:49:105:61 | rowKeySet(...) : Set [<element>] : Object | Test.java:105:49:105:72 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:555 |
-| Test.java:105:49:105:72 | iterator(...) : Iterator [<element>] : Object | Test.java:105:49:105:79 | next(...) : Object | provenance | MaD:557 |
-| Test.java:105:49:105:72 | iterator(...) : Iterator [<element>] : Object | Test.java:105:49:105:79 | next(...) : Object | provenance | MaD:557 |
-| Test.java:105:49:105:72 | iterator(...) : Iterator [<element>] : Object | Test.java:105:49:105:79 | next(...) : Object | provenance | MaD:557 |
-| Test.java:105:49:105:72 | iterator(...) : Iterator [<element>] : Object | Test.java:105:49:105:79 | next(...) : Object | provenance | MaD:557 |
-| Test.java:105:49:105:72 | iterator(...) : Iterator [<element>] : Object | Test.java:105:49:105:79 | next(...) : Object | provenance | MaD:557 |
-| Test.java:105:49:105:72 | iterator(...) : Iterator [<element>] : Object | Test.java:105:49:105:79 | next(...) : Object | provenance | MaD:557 |
+| Test.java:105:49:105:49 | t : ArrayTable [com.google.common.collect.Table.rowKey] : Object | Test.java:105:49:105:61 | rowKeySet(...) : Set [<element>] : Object | provenance | MaD:524 |
+| Test.java:105:49:105:49 | t : HashBasedTable [com.google.common.collect.Table.rowKey] : Object | Test.java:105:49:105:61 | rowKeySet(...) : Set [<element>] : Object | provenance | MaD:524 |
+| Test.java:105:49:105:49 | t : ImmutableTable [com.google.common.collect.Table.rowKey] : Object | Test.java:105:49:105:61 | rowKeySet(...) : Set [<element>] : Object | provenance | MaD:524 |
+| Test.java:105:49:105:49 | t : RowSortedTable [com.google.common.collect.Table.rowKey] : Object | Test.java:105:49:105:61 | rowKeySet(...) : Set [<element>] : Object | provenance | MaD:524 |
+| Test.java:105:49:105:49 | t : Table [com.google.common.collect.Table.rowKey] : Object | Test.java:105:49:105:61 | rowKeySet(...) : Set [<element>] : Object | provenance | MaD:524 |
+| Test.java:105:49:105:49 | t : TreeBasedTable [com.google.common.collect.Table.rowKey] : Object | Test.java:105:49:105:61 | rowKeySet(...) : Set [<element>] : Object | provenance | MaD:524 |
+| Test.java:105:49:105:61 | rowKeySet(...) : Set [<element>] : Object | Test.java:105:49:105:72 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:558 |
+| Test.java:105:49:105:61 | rowKeySet(...) : Set [<element>] : Object | Test.java:105:49:105:72 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:558 |
+| Test.java:105:49:105:61 | rowKeySet(...) : Set [<element>] : Object | Test.java:105:49:105:72 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:558 |
+| Test.java:105:49:105:61 | rowKeySet(...) : Set [<element>] : Object | Test.java:105:49:105:72 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:558 |
+| Test.java:105:49:105:61 | rowKeySet(...) : Set [<element>] : Object | Test.java:105:49:105:72 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:558 |
+| Test.java:105:49:105:61 | rowKeySet(...) : Set [<element>] : Object | Test.java:105:49:105:72 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:558 |
+| Test.java:105:49:105:72 | iterator(...) : Iterator [<element>] : Object | Test.java:105:49:105:79 | next(...) : Object | provenance | MaD:560 |
+| Test.java:105:49:105:72 | iterator(...) : Iterator [<element>] : Object | Test.java:105:49:105:79 | next(...) : Object | provenance | MaD:560 |
+| Test.java:105:49:105:72 | iterator(...) : Iterator [<element>] : Object | Test.java:105:49:105:79 | next(...) : Object | provenance | MaD:560 |
+| Test.java:105:49:105:72 | iterator(...) : Iterator [<element>] : Object | Test.java:105:49:105:79 | next(...) : Object | provenance | MaD:560 |
+| Test.java:105:49:105:72 | iterator(...) : Iterator [<element>] : Object | Test.java:105:49:105:79 | next(...) : Object | provenance | MaD:560 |
+| Test.java:105:49:105:72 | iterator(...) : Iterator [<element>] : Object | Test.java:105:49:105:79 | next(...) : Object | provenance | MaD:560 |
 | Test.java:106:44:106:47 | el : Object | Test.java:106:91:106:92 | el : Object | provenance |  |
-| Test.java:106:70:106:93 | of(...) : ImmutableMultiset [<element>] : Object | Test.java:106:70:106:104 | entrySet(...) : ImmutableSet [<element>, <element>] : Object | provenance | MaD:447 |
-| Test.java:106:70:106:104 | entrySet(...) : ImmutableSet [<element>, <element>] : Object | Test.java:106:59:106:105 | getElement(...) : Entry [<element>] : Object | provenance | MaD:555 |
+| Test.java:106:70:106:93 | of(...) : ImmutableMultiset [<element>] : Object | Test.java:106:70:106:104 | entrySet(...) : ImmutableSet [<element>, <element>] : Object | provenance | MaD:448 |
+| Test.java:106:70:106:104 | entrySet(...) : ImmutableSet [<element>, <element>] : Object | Test.java:106:59:106:105 | getElement(...) : Entry [<element>] : Object | provenance | MaD:558 |
 | Test.java:106:70:106:104 | entrySet(...) : ImmutableSet [<element>, <element>] : Object | Test.java:110:19:110:32 | it : ImmutableSet [<element>, <element>] : Object | provenance |  |
-| Test.java:106:91:106:92 | el : Object | Test.java:106:70:106:93 | of(...) : ImmutableMultiset [<element>] : Object | provenance | MaD:134 |
+| Test.java:106:91:106:92 | el : Object | Test.java:106:70:106:93 | of(...) : ImmutableMultiset [<element>] : Object | provenance | MaD:137 |
 | Test.java:107:24:107:32 | array : Object[] [[]] : Object | Test.java:107:44:107:48 | array : Object[] [[]] : Object | provenance |  |
 | Test.java:107:44:107:48 | array : Object[] [[]] : Object | Test.java:107:44:107:51 | ...[...] : Object | provenance |  |
 | Test.java:108:19:108:35 | it : Enumeration [<element>] : Object | Test.java:108:47:108:48 | it : Enumeration [<element>] : Object | provenance |  |
-| Test.java:108:47:108:48 | it : Enumeration [<element>] : Object | Test.java:108:47:108:62 | nextElement(...) : Object | provenance | MaD:556 |
+| Test.java:108:47:108:48 | it : Enumeration [<element>] : Object | Test.java:108:47:108:62 | nextElement(...) : Object | provenance | MaD:559 |
 | Test.java:109:19:109:50 | b : Builder [<element>] : Object | Test.java:109:73:109:73 | b : Builder [<element>] : Object | provenance |  |
 | Test.java:109:19:109:50 | b : Builder [<element>] : Object | Test.java:109:73:109:73 | b : Builder [<element>] : Object | provenance |  |
 | Test.java:109:19:109:50 | b : Builder [<element>] : Object | Test.java:109:73:109:73 | b : Builder [<element>] : Object | provenance |  |
 | Test.java:109:19:109:50 | b : Builder [<element>] : Object | Test.java:109:73:109:73 | b : Builder [<element>] : Object | provenance |  |
 | Test.java:109:19:109:50 | b : Builder [<element>] : Object | Test.java:109:73:109:73 | b : Builder [<element>] : Object | provenance |  |
 | Test.java:109:19:109:50 | b : Builder [<element>] : Object | Test.java:109:73:109:73 | b : Builder [<element>] : Object | provenance |  |
-| Test.java:109:73:109:73 | b : Builder [<element>] : Object | Test.java:109:73:109:81 | build(...) : ImmutableCollection [<element>] : Object | provenance | MaD:50 |
-| Test.java:109:73:109:73 | b : Builder [<element>] : Object | Test.java:109:73:109:81 | build(...) : ImmutableCollection [<element>] : Object | provenance | MaD:50 |
-| Test.java:109:73:109:73 | b : Builder [<element>] : Object | Test.java:109:73:109:81 | build(...) : ImmutableCollection [<element>] : Object | provenance | MaD:50 |
-| Test.java:109:73:109:73 | b : Builder [<element>] : Object | Test.java:109:73:109:81 | build(...) : ImmutableCollection [<element>] : Object | provenance | MaD:50 |
-| Test.java:109:73:109:73 | b : Builder [<element>] : Object | Test.java:109:73:109:81 | build(...) : ImmutableCollection [<element>] : Object | provenance | MaD:50 |
-| Test.java:109:73:109:73 | b : Builder [<element>] : Object | Test.java:109:73:109:81 | build(...) : ImmutableCollection [<element>] : Object | provenance | MaD:50 |
-| Test.java:109:73:109:81 | build(...) : ImmutableCollection [<element>] : Object | Test.java:109:62:109:82 | getElement(...) : Object | provenance | MaD:555 |
-| Test.java:109:73:109:81 | build(...) : ImmutableCollection [<element>] : Object | Test.java:109:62:109:82 | getElement(...) : Object | provenance | MaD:555 |
-| Test.java:109:73:109:81 | build(...) : ImmutableCollection [<element>] : Object | Test.java:109:62:109:82 | getElement(...) : Object | provenance | MaD:555 |
-| Test.java:109:73:109:81 | build(...) : ImmutableCollection [<element>] : Object | Test.java:109:62:109:82 | getElement(...) : Object | provenance | MaD:555 |
-| Test.java:109:73:109:81 | build(...) : ImmutableCollection [<element>] : Object | Test.java:109:62:109:82 | getElement(...) : Object | provenance | MaD:555 |
-| Test.java:109:73:109:81 | build(...) : ImmutableCollection [<element>] : Object | Test.java:109:62:109:82 | getElement(...) : Object | provenance | MaD:555 |
+| Test.java:109:73:109:73 | b : Builder [<element>] : Object | Test.java:109:73:109:81 | build(...) : ImmutableCollection [<element>] : Object | provenance | MaD:49 |
+| Test.java:109:73:109:73 | b : Builder [<element>] : Object | Test.java:109:73:109:81 | build(...) : ImmutableCollection [<element>] : Object | provenance | MaD:49 |
+| Test.java:109:73:109:73 | b : Builder [<element>] : Object | Test.java:109:73:109:81 | build(...) : ImmutableCollection [<element>] : Object | provenance | MaD:49 |
+| Test.java:109:73:109:73 | b : Builder [<element>] : Object | Test.java:109:73:109:81 | build(...) : ImmutableCollection [<element>] : Object | provenance | MaD:49 |
+| Test.java:109:73:109:73 | b : Builder [<element>] : Object | Test.java:109:73:109:81 | build(...) : ImmutableCollection [<element>] : Object | provenance | MaD:49 |
+| Test.java:109:73:109:73 | b : Builder [<element>] : Object | Test.java:109:73:109:81 | build(...) : ImmutableCollection [<element>] : Object | provenance | MaD:49 |
+| Test.java:109:73:109:81 | build(...) : ImmutableCollection [<element>] : Object | Test.java:109:62:109:82 | getElement(...) : Object | provenance | MaD:558 |
+| Test.java:109:73:109:81 | build(...) : ImmutableCollection [<element>] : Object | Test.java:109:62:109:82 | getElement(...) : Object | provenance | MaD:558 |
+| Test.java:109:73:109:81 | build(...) : ImmutableCollection [<element>] : Object | Test.java:109:62:109:82 | getElement(...) : Object | provenance | MaD:558 |
+| Test.java:109:73:109:81 | build(...) : ImmutableCollection [<element>] : Object | Test.java:109:62:109:82 | getElement(...) : Object | provenance | MaD:558 |
+| Test.java:109:73:109:81 | build(...) : ImmutableCollection [<element>] : Object | Test.java:109:62:109:82 | getElement(...) : Object | provenance | MaD:558 |
+| Test.java:109:73:109:81 | build(...) : ImmutableCollection [<element>] : Object | Test.java:109:62:109:82 | getElement(...) : Object | provenance | MaD:558 |
 | Test.java:109:73:109:81 | build(...) : ImmutableCollection [<element>] : Object | Test.java:110:19:110:32 | it : ImmutableCollection [<element>] : Object | provenance |  |
 | Test.java:109:73:109:81 | build(...) : ImmutableCollection [<element>] : Object | Test.java:110:19:110:32 | it : ImmutableCollection [<element>] : Object | provenance |  |
 | Test.java:109:73:109:81 | build(...) : ImmutableCollection [<element>] : Object | Test.java:110:19:110:32 | it : ImmutableCollection [<element>] : Object | provenance |  |
@@ -890,165 +890,165 @@ edges
 | Test.java:110:19:110:32 | it : SortedSet [<element>] : Object | Test.java:110:44:110:45 | it : SortedSet [<element>] : Object | provenance |  |
 | Test.java:110:19:110:32 | it : TreeMultiset [<element>] : Object | Test.java:110:44:110:45 | it : TreeMultiset [<element>] : Object | provenance |  |
 | Test.java:110:19:110:32 | it : TreeSet [<element>] : Object | Test.java:110:44:110:45 | it : TreeSet [<element>] : Object | provenance |  |
-| Test.java:110:44:110:45 | it : ArrayDeque [<element>] : Object | Test.java:110:44:110:56 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:555 |
-| Test.java:110:44:110:45 | it : ArrayList [<element>] : Object | Test.java:110:44:110:56 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:555 |
-| Test.java:110:44:110:45 | it : Collection [<element>, <element>] : Object | Test.java:110:44:110:56 | iterator(...) : Iterator [<element>, <element>] : Object | provenance | MaD:555 |
-| Test.java:110:44:110:45 | it : Collection [<element>, <map.key>] : Object | Test.java:110:44:110:56 | iterator(...) : Iterator [<element>, <map.key>] : Object | provenance | MaD:555 |
-| Test.java:110:44:110:45 | it : Collection [<element>, <map.value>] : Object | Test.java:110:44:110:56 | iterator(...) : Iterator [<element>, <map.value>] : Object | provenance | MaD:555 |
-| Test.java:110:44:110:45 | it : Collection [<element>] : Comparable | Test.java:110:44:110:56 | iterator(...) : Iterator [<element>] : Comparable | provenance | MaD:555 |
-| Test.java:110:44:110:45 | it : Collection [<element>] : Object | Test.java:110:44:110:56 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:555 |
-| Test.java:110:44:110:45 | it : ConcurrentHashMultiset [<element>] : Object | Test.java:110:44:110:56 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:555 |
-| Test.java:110:44:110:45 | it : ConcurrentLinkedQueue [<element>] : Object | Test.java:110:44:110:56 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:555 |
-| Test.java:110:44:110:45 | it : CopyOnWriteArrayList [<element>] : Object | Test.java:110:44:110:56 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:555 |
-| Test.java:110:44:110:45 | it : CopyOnWriteArraySet [<element>] : Object | Test.java:110:44:110:56 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:555 |
-| Test.java:110:44:110:45 | it : Deque [<element>] : Object | Test.java:110:44:110:56 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:555 |
-| Test.java:110:44:110:45 | it : HashMultiset [<element>] : Object | Test.java:110:44:110:56 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:555 |
-| Test.java:110:44:110:45 | it : HashSet [<element>] : Object | Test.java:110:44:110:56 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:555 |
-| Test.java:110:44:110:45 | it : ImmutableCollection [<element>, <map.key>] : Object | Test.java:110:44:110:56 | iterator(...) : Iterator [<element>, <map.key>] : Object | provenance | MaD:555 |
-| Test.java:110:44:110:45 | it : ImmutableCollection [<element>, <map.value>] : Object | Test.java:110:44:110:56 | iterator(...) : Iterator [<element>, <map.value>] : Object | provenance | MaD:555 |
-| Test.java:110:44:110:45 | it : ImmutableCollection [<element>] : Object | Test.java:110:44:110:56 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:555 |
-| Test.java:110:44:110:45 | it : ImmutableList [<element>] : Object | Test.java:110:44:110:56 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:555 |
-| Test.java:110:44:110:45 | it : ImmutableMultiset [<element>] : Object | Test.java:110:44:110:56 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:555 |
-| Test.java:110:44:110:45 | it : ImmutableSet [<element>, <element>] : Object | Test.java:110:44:110:56 | iterator(...) : Iterator [<element>, <element>] : Object | provenance | MaD:555 |
-| Test.java:110:44:110:45 | it : ImmutableSet [<element>, <map.key>] : Object | Test.java:110:44:110:56 | iterator(...) : Iterator [<element>, <map.key>] : Object | provenance | MaD:555 |
-| Test.java:110:44:110:45 | it : ImmutableSet [<element>, <map.value>] : Object | Test.java:110:44:110:56 | iterator(...) : Iterator [<element>, <map.value>] : Object | provenance | MaD:555 |
-| Test.java:110:44:110:45 | it : ImmutableSet [<element>, com.google.common.collect.Table.columnKey] : Object | Test.java:110:44:110:56 | iterator(...) : Iterator [<element>, com.google.common.collect.Table.columnKey] : Object | provenance | MaD:555 |
-| Test.java:110:44:110:45 | it : ImmutableSet [<element>, com.google.common.collect.Table.rowKey] : Object | Test.java:110:44:110:56 | iterator(...) : Iterator [<element>, com.google.common.collect.Table.rowKey] : Object | provenance | MaD:555 |
-| Test.java:110:44:110:45 | it : ImmutableSet [<element>] : Object | Test.java:110:44:110:56 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:555 |
-| Test.java:110:44:110:45 | it : ImmutableSortedMultiset [<element>] : Comparable | Test.java:110:44:110:56 | iterator(...) : Iterator [<element>] : Comparable | provenance | MaD:555 |
-| Test.java:110:44:110:45 | it : ImmutableSortedMultiset [<element>] : Object | Test.java:110:44:110:56 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:555 |
-| Test.java:110:44:110:45 | it : ImmutableSortedSet [<element>] : Comparable | Test.java:110:44:110:56 | iterator(...) : Iterator [<element>] : Comparable | provenance | MaD:555 |
-| Test.java:110:44:110:45 | it : ImmutableSortedSet [<element>] : Object | Test.java:110:44:110:56 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:555 |
-| Test.java:110:44:110:45 | it : Iterable [<element>, <element>] : Object | Test.java:110:44:110:56 | iterator(...) : Iterator [<element>, <element>] : Object | provenance | MaD:555 |
-| Test.java:110:44:110:45 | it : Iterable [<element>] : Object | Test.java:110:44:110:56 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:555 |
-| Test.java:110:44:110:45 | it : LinkedBlockingDeque [<element>] : Object | Test.java:110:44:110:56 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:555 |
-| Test.java:110:44:110:45 | it : LinkedBlockingQueue [<element>] : Object | Test.java:110:44:110:56 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:555 |
-| Test.java:110:44:110:45 | it : LinkedHashMultiset [<element>] : Object | Test.java:110:44:110:56 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:555 |
-| Test.java:110:44:110:45 | it : LinkedHashSet [<element>] : Object | Test.java:110:44:110:56 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:555 |
-| Test.java:110:44:110:45 | it : LinkedList [<element>] : Object | Test.java:110:44:110:56 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:555 |
-| Test.java:110:44:110:45 | it : List [<element>, <element>] : Object | Test.java:110:44:110:56 | iterator(...) : Iterator [<element>, <element>] : Object | provenance | MaD:555 |
-| Test.java:110:44:110:45 | it : List [<element>, <map.key>] : Object | Test.java:110:44:110:56 | iterator(...) : Iterator [<element>, <map.key>] : Object | provenance | MaD:555 |
-| Test.java:110:44:110:45 | it : List [<element>, <map.value>] : Object | Test.java:110:44:110:56 | iterator(...) : Iterator [<element>, <map.value>] : Object | provenance | MaD:555 |
-| Test.java:110:44:110:45 | it : List [<element>] : Object | Test.java:110:44:110:56 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:555 |
-| Test.java:110:44:110:45 | it : Multiset [<element>] : Object | Test.java:110:44:110:56 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:555 |
-| Test.java:110:44:110:45 | it : NavigableSet [<element>] : Comparable | Test.java:110:44:110:56 | iterator(...) : Iterator [<element>] : Comparable | provenance | MaD:555 |
-| Test.java:110:44:110:45 | it : PriorityBlockingQueue [<element>] : Object | Test.java:110:44:110:56 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:555 |
-| Test.java:110:44:110:45 | it : PriorityQueue [<element>] : Object | Test.java:110:44:110:56 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:555 |
-| Test.java:110:44:110:45 | it : Queue [<element>] : Object | Test.java:110:44:110:56 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:555 |
-| Test.java:110:44:110:45 | it : Set [<element>, <element>] : Comparable | Test.java:110:44:110:56 | iterator(...) : Iterator [<element>, <element>] : Comparable | provenance | MaD:555 |
-| Test.java:110:44:110:45 | it : Set [<element>, <element>] : Object | Test.java:110:44:110:56 | iterator(...) : Iterator [<element>, <element>] : Object | provenance | MaD:555 |
-| Test.java:110:44:110:45 | it : Set [<element>, <map.key>] : Object | Test.java:110:44:110:56 | iterator(...) : Iterator [<element>, <map.key>] : Object | provenance | MaD:555 |
-| Test.java:110:44:110:45 | it : Set [<element>, <map.value>] : Object | Test.java:110:44:110:56 | iterator(...) : Iterator [<element>, <map.value>] : Object | provenance | MaD:555 |
-| Test.java:110:44:110:45 | it : Set [<element>, com.google.common.collect.Table.columnKey] : Object | Test.java:110:44:110:56 | iterator(...) : Iterator [<element>, com.google.common.collect.Table.columnKey] : Object | provenance | MaD:555 |
-| Test.java:110:44:110:45 | it : Set [<element>, com.google.common.collect.Table.rowKey] : Object | Test.java:110:44:110:56 | iterator(...) : Iterator [<element>, com.google.common.collect.Table.rowKey] : Object | provenance | MaD:555 |
-| Test.java:110:44:110:45 | it : Set [<element>] : Object | Test.java:110:44:110:56 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:555 |
-| Test.java:110:44:110:45 | it : SetView [<element>] : Object | Test.java:110:44:110:56 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:555 |
-| Test.java:110:44:110:45 | it : SortedMultiset [<element>] : Comparable | Test.java:110:44:110:56 | iterator(...) : Iterator [<element>] : Comparable | provenance | MaD:555 |
-| Test.java:110:44:110:45 | it : SortedSet [<element>] : Comparable | Test.java:110:44:110:56 | iterator(...) : Iterator [<element>] : Comparable | provenance | MaD:555 |
-| Test.java:110:44:110:45 | it : SortedSet [<element>] : Object | Test.java:110:44:110:56 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:555 |
-| Test.java:110:44:110:45 | it : TreeMultiset [<element>] : Object | Test.java:110:44:110:56 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:555 |
-| Test.java:110:44:110:45 | it : TreeSet [<element>] : Object | Test.java:110:44:110:56 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:555 |
-| Test.java:110:44:110:56 | iterator(...) : Iterator [<element>, <element>] : Comparable | Test.java:110:44:110:63 | next(...) : Object [<element>] : Comparable | provenance | MaD:557 |
-| Test.java:110:44:110:56 | iterator(...) : Iterator [<element>, <element>] : Object | Test.java:110:44:110:63 | next(...) : Object [<element>] : Object | provenance | MaD:557 |
-| Test.java:110:44:110:56 | iterator(...) : Iterator [<element>, <element>] : Object | Test.java:110:44:110:63 | next(...) : Object [<element>] : Object | provenance | MaD:557 |
-| Test.java:110:44:110:56 | iterator(...) : Iterator [<element>, <element>] : Object | Test.java:110:44:110:63 | next(...) : Object [<element>] : Object | provenance | MaD:557 |
-| Test.java:110:44:110:56 | iterator(...) : Iterator [<element>, <element>] : Object | Test.java:110:44:110:63 | next(...) : Object [<element>] : Object | provenance | MaD:557 |
-| Test.java:110:44:110:56 | iterator(...) : Iterator [<element>, <element>] : Object | Test.java:110:44:110:63 | next(...) : Object [<element>] : Object | provenance | MaD:557 |
-| Test.java:110:44:110:56 | iterator(...) : Iterator [<element>, <map.key>] : Object | Test.java:110:44:110:63 | next(...) : Object [<map.key>] : Object | provenance | MaD:557 |
-| Test.java:110:44:110:56 | iterator(...) : Iterator [<element>, <map.key>] : Object | Test.java:110:44:110:63 | next(...) : Object [<map.key>] : Object | provenance | MaD:557 |
-| Test.java:110:44:110:56 | iterator(...) : Iterator [<element>, <map.key>] : Object | Test.java:110:44:110:63 | next(...) : Object [<map.key>] : Object | provenance | MaD:557 |
-| Test.java:110:44:110:56 | iterator(...) : Iterator [<element>, <map.key>] : Object | Test.java:110:44:110:63 | next(...) : Object [<map.key>] : Object | provenance | MaD:557 |
-| Test.java:110:44:110:56 | iterator(...) : Iterator [<element>, <map.key>] : Object | Test.java:110:44:110:63 | next(...) : Object [<map.key>] : Object | provenance | MaD:557 |
-| Test.java:110:44:110:56 | iterator(...) : Iterator [<element>, <map.value>] : Object | Test.java:110:44:110:63 | next(...) : Object [<map.value>] : Object | provenance | MaD:557 |
-| Test.java:110:44:110:56 | iterator(...) : Iterator [<element>, <map.value>] : Object | Test.java:110:44:110:63 | next(...) : Object [<map.value>] : Object | provenance | MaD:557 |
-| Test.java:110:44:110:56 | iterator(...) : Iterator [<element>, <map.value>] : Object | Test.java:110:44:110:63 | next(...) : Object [<map.value>] : Object | provenance | MaD:557 |
-| Test.java:110:44:110:56 | iterator(...) : Iterator [<element>, <map.value>] : Object | Test.java:110:44:110:63 | next(...) : Object [<map.value>] : Object | provenance | MaD:557 |
-| Test.java:110:44:110:56 | iterator(...) : Iterator [<element>, <map.value>] : Object | Test.java:110:44:110:63 | next(...) : Object [<map.value>] : Object | provenance | MaD:557 |
-| Test.java:110:44:110:56 | iterator(...) : Iterator [<element>, com.google.common.collect.Table.columnKey] : Object | Test.java:110:44:110:63 | next(...) : Object [com.google.common.collect.Table.columnKey] : Object | provenance | MaD:557 |
-| Test.java:110:44:110:56 | iterator(...) : Iterator [<element>, com.google.common.collect.Table.columnKey] : Object | Test.java:110:44:110:63 | next(...) : Object [com.google.common.collect.Table.columnKey] : Object | provenance | MaD:557 |
-| Test.java:110:44:110:56 | iterator(...) : Iterator [<element>, com.google.common.collect.Table.rowKey] : Object | Test.java:110:44:110:63 | next(...) : Object [com.google.common.collect.Table.rowKey] : Object | provenance | MaD:557 |
-| Test.java:110:44:110:56 | iterator(...) : Iterator [<element>, com.google.common.collect.Table.rowKey] : Object | Test.java:110:44:110:63 | next(...) : Object [com.google.common.collect.Table.rowKey] : Object | provenance | MaD:557 |
-| Test.java:110:44:110:56 | iterator(...) : Iterator [<element>] : Comparable | Test.java:110:44:110:63 | next(...) : Comparable | provenance | MaD:557 |
-| Test.java:110:44:110:56 | iterator(...) : Iterator [<element>] : Comparable | Test.java:110:44:110:63 | next(...) : Comparable | provenance | MaD:557 |
-| Test.java:110:44:110:56 | iterator(...) : Iterator [<element>] : Comparable | Test.java:110:44:110:63 | next(...) : Comparable | provenance | MaD:557 |
-| Test.java:110:44:110:56 | iterator(...) : Iterator [<element>] : Comparable | Test.java:110:44:110:63 | next(...) : Comparable | provenance | MaD:557 |
-| Test.java:110:44:110:56 | iterator(...) : Iterator [<element>] : Comparable | Test.java:110:44:110:63 | next(...) : Comparable | provenance | MaD:557 |
-| Test.java:110:44:110:56 | iterator(...) : Iterator [<element>] : Comparable | Test.java:110:44:110:63 | next(...) : Comparable | provenance | MaD:557 |
-| Test.java:110:44:110:56 | iterator(...) : Iterator [<element>] : Object | Test.java:110:44:110:63 | next(...) : Object | provenance | MaD:557 |
-| Test.java:110:44:110:56 | iterator(...) : Iterator [<element>] : Object | Test.java:110:44:110:63 | next(...) : Object | provenance | MaD:557 |
-| Test.java:110:44:110:56 | iterator(...) : Iterator [<element>] : Object | Test.java:110:44:110:63 | next(...) : Object | provenance | MaD:557 |
-| Test.java:110:44:110:56 | iterator(...) : Iterator [<element>] : Object | Test.java:110:44:110:63 | next(...) : Object | provenance | MaD:557 |
-| Test.java:110:44:110:56 | iterator(...) : Iterator [<element>] : Object | Test.java:110:44:110:63 | next(...) : Object | provenance | MaD:557 |
-| Test.java:110:44:110:56 | iterator(...) : Iterator [<element>] : Object | Test.java:110:44:110:63 | next(...) : Object | provenance | MaD:557 |
-| Test.java:110:44:110:56 | iterator(...) : Iterator [<element>] : Object | Test.java:110:44:110:63 | next(...) : Object | provenance | MaD:557 |
-| Test.java:110:44:110:56 | iterator(...) : Iterator [<element>] : Object | Test.java:110:44:110:63 | next(...) : Object | provenance | MaD:557 |
-| Test.java:110:44:110:56 | iterator(...) : Iterator [<element>] : Object | Test.java:110:44:110:63 | next(...) : Object | provenance | MaD:557 |
-| Test.java:110:44:110:56 | iterator(...) : Iterator [<element>] : Object | Test.java:110:44:110:63 | next(...) : Object | provenance | MaD:557 |
-| Test.java:110:44:110:56 | iterator(...) : Iterator [<element>] : Object | Test.java:110:44:110:63 | next(...) : Object | provenance | MaD:557 |
-| Test.java:110:44:110:56 | iterator(...) : Iterator [<element>] : Object | Test.java:110:44:110:63 | next(...) : Object | provenance | MaD:557 |
-| Test.java:110:44:110:56 | iterator(...) : Iterator [<element>] : Object | Test.java:110:44:110:63 | next(...) : Object | provenance | MaD:557 |
-| Test.java:110:44:110:56 | iterator(...) : Iterator [<element>] : Object | Test.java:110:44:110:63 | next(...) : Object | provenance | MaD:557 |
-| Test.java:110:44:110:56 | iterator(...) : Iterator [<element>] : Object | Test.java:110:44:110:63 | next(...) : Object | provenance | MaD:557 |
-| Test.java:110:44:110:56 | iterator(...) : Iterator [<element>] : Object | Test.java:110:44:110:63 | next(...) : Object | provenance | MaD:557 |
-| Test.java:110:44:110:56 | iterator(...) : Iterator [<element>] : Object | Test.java:110:44:110:63 | next(...) : Object | provenance | MaD:557 |
-| Test.java:110:44:110:56 | iterator(...) : Iterator [<element>] : Object | Test.java:110:44:110:63 | next(...) : Object | provenance | MaD:557 |
-| Test.java:110:44:110:56 | iterator(...) : Iterator [<element>] : Object | Test.java:110:44:110:63 | next(...) : Object | provenance | MaD:557 |
-| Test.java:110:44:110:56 | iterator(...) : Iterator [<element>] : Object | Test.java:110:44:110:63 | next(...) : Object | provenance | MaD:557 |
-| Test.java:110:44:110:56 | iterator(...) : Iterator [<element>] : Object | Test.java:110:44:110:63 | next(...) : Object | provenance | MaD:557 |
-| Test.java:110:44:110:56 | iterator(...) : Iterator [<element>] : Object | Test.java:110:44:110:63 | next(...) : Object | provenance | MaD:557 |
-| Test.java:110:44:110:56 | iterator(...) : Iterator [<element>] : Object | Test.java:110:44:110:63 | next(...) : Object | provenance | MaD:557 |
-| Test.java:110:44:110:56 | iterator(...) : Iterator [<element>] : Object | Test.java:110:44:110:63 | next(...) : Object | provenance | MaD:557 |
-| Test.java:110:44:110:56 | iterator(...) : Iterator [<element>] : Object | Test.java:110:44:110:63 | next(...) : Object | provenance | MaD:557 |
-| Test.java:110:44:110:56 | iterator(...) : Iterator [<element>] : Object | Test.java:110:44:110:63 | next(...) : Object | provenance | MaD:557 |
-| Test.java:110:44:110:56 | iterator(...) : Iterator [<element>] : Object | Test.java:110:44:110:63 | next(...) : Object | provenance | MaD:557 |
-| Test.java:110:44:110:56 | iterator(...) : Iterator [<element>] : Object | Test.java:110:44:110:63 | next(...) : Object | provenance | MaD:557 |
-| Test.java:110:44:110:56 | iterator(...) : Iterator [<element>] : Object | Test.java:110:44:110:63 | next(...) : Object | provenance | MaD:557 |
-| Test.java:110:44:110:56 | iterator(...) : Iterator [<element>] : Object | Test.java:110:44:110:63 | next(...) : Object | provenance | MaD:557 |
-| Test.java:110:44:110:56 | iterator(...) : Iterator [<element>] : Object | Test.java:110:44:110:63 | next(...) : Object | provenance | MaD:557 |
-| Test.java:110:44:110:56 | iterator(...) : Iterator [<element>] : Object | Test.java:110:44:110:63 | next(...) : Object | provenance | MaD:557 |
+| Test.java:110:44:110:45 | it : ArrayDeque [<element>] : Object | Test.java:110:44:110:56 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:558 |
+| Test.java:110:44:110:45 | it : ArrayList [<element>] : Object | Test.java:110:44:110:56 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:558 |
+| Test.java:110:44:110:45 | it : Collection [<element>, <element>] : Object | Test.java:110:44:110:56 | iterator(...) : Iterator [<element>, <element>] : Object | provenance | MaD:558 |
+| Test.java:110:44:110:45 | it : Collection [<element>, <map.key>] : Object | Test.java:110:44:110:56 | iterator(...) : Iterator [<element>, <map.key>] : Object | provenance | MaD:558 |
+| Test.java:110:44:110:45 | it : Collection [<element>, <map.value>] : Object | Test.java:110:44:110:56 | iterator(...) : Iterator [<element>, <map.value>] : Object | provenance | MaD:558 |
+| Test.java:110:44:110:45 | it : Collection [<element>] : Comparable | Test.java:110:44:110:56 | iterator(...) : Iterator [<element>] : Comparable | provenance | MaD:558 |
+| Test.java:110:44:110:45 | it : Collection [<element>] : Object | Test.java:110:44:110:56 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:558 |
+| Test.java:110:44:110:45 | it : ConcurrentHashMultiset [<element>] : Object | Test.java:110:44:110:56 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:558 |
+| Test.java:110:44:110:45 | it : ConcurrentLinkedQueue [<element>] : Object | Test.java:110:44:110:56 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:558 |
+| Test.java:110:44:110:45 | it : CopyOnWriteArrayList [<element>] : Object | Test.java:110:44:110:56 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:558 |
+| Test.java:110:44:110:45 | it : CopyOnWriteArraySet [<element>] : Object | Test.java:110:44:110:56 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:558 |
+| Test.java:110:44:110:45 | it : Deque [<element>] : Object | Test.java:110:44:110:56 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:558 |
+| Test.java:110:44:110:45 | it : HashMultiset [<element>] : Object | Test.java:110:44:110:56 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:558 |
+| Test.java:110:44:110:45 | it : HashSet [<element>] : Object | Test.java:110:44:110:56 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:558 |
+| Test.java:110:44:110:45 | it : ImmutableCollection [<element>, <map.key>] : Object | Test.java:110:44:110:56 | iterator(...) : Iterator [<element>, <map.key>] : Object | provenance | MaD:558 |
+| Test.java:110:44:110:45 | it : ImmutableCollection [<element>, <map.value>] : Object | Test.java:110:44:110:56 | iterator(...) : Iterator [<element>, <map.value>] : Object | provenance | MaD:558 |
+| Test.java:110:44:110:45 | it : ImmutableCollection [<element>] : Object | Test.java:110:44:110:56 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:558 |
+| Test.java:110:44:110:45 | it : ImmutableList [<element>] : Object | Test.java:110:44:110:56 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:558 |
+| Test.java:110:44:110:45 | it : ImmutableMultiset [<element>] : Object | Test.java:110:44:110:56 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:558 |
+| Test.java:110:44:110:45 | it : ImmutableSet [<element>, <element>] : Object | Test.java:110:44:110:56 | iterator(...) : Iterator [<element>, <element>] : Object | provenance | MaD:558 |
+| Test.java:110:44:110:45 | it : ImmutableSet [<element>, <map.key>] : Object | Test.java:110:44:110:56 | iterator(...) : Iterator [<element>, <map.key>] : Object | provenance | MaD:558 |
+| Test.java:110:44:110:45 | it : ImmutableSet [<element>, <map.value>] : Object | Test.java:110:44:110:56 | iterator(...) : Iterator [<element>, <map.value>] : Object | provenance | MaD:558 |
+| Test.java:110:44:110:45 | it : ImmutableSet [<element>, com.google.common.collect.Table.columnKey] : Object | Test.java:110:44:110:56 | iterator(...) : Iterator [<element>, com.google.common.collect.Table.columnKey] : Object | provenance | MaD:558 |
+| Test.java:110:44:110:45 | it : ImmutableSet [<element>, com.google.common.collect.Table.rowKey] : Object | Test.java:110:44:110:56 | iterator(...) : Iterator [<element>, com.google.common.collect.Table.rowKey] : Object | provenance | MaD:558 |
+| Test.java:110:44:110:45 | it : ImmutableSet [<element>] : Object | Test.java:110:44:110:56 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:558 |
+| Test.java:110:44:110:45 | it : ImmutableSortedMultiset [<element>] : Comparable | Test.java:110:44:110:56 | iterator(...) : Iterator [<element>] : Comparable | provenance | MaD:558 |
+| Test.java:110:44:110:45 | it : ImmutableSortedMultiset [<element>] : Object | Test.java:110:44:110:56 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:558 |
+| Test.java:110:44:110:45 | it : ImmutableSortedSet [<element>] : Comparable | Test.java:110:44:110:56 | iterator(...) : Iterator [<element>] : Comparable | provenance | MaD:558 |
+| Test.java:110:44:110:45 | it : ImmutableSortedSet [<element>] : Object | Test.java:110:44:110:56 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:558 |
+| Test.java:110:44:110:45 | it : Iterable [<element>, <element>] : Object | Test.java:110:44:110:56 | iterator(...) : Iterator [<element>, <element>] : Object | provenance | MaD:558 |
+| Test.java:110:44:110:45 | it : Iterable [<element>] : Object | Test.java:110:44:110:56 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:558 |
+| Test.java:110:44:110:45 | it : LinkedBlockingDeque [<element>] : Object | Test.java:110:44:110:56 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:558 |
+| Test.java:110:44:110:45 | it : LinkedBlockingQueue [<element>] : Object | Test.java:110:44:110:56 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:558 |
+| Test.java:110:44:110:45 | it : LinkedHashMultiset [<element>] : Object | Test.java:110:44:110:56 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:558 |
+| Test.java:110:44:110:45 | it : LinkedHashSet [<element>] : Object | Test.java:110:44:110:56 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:558 |
+| Test.java:110:44:110:45 | it : LinkedList [<element>] : Object | Test.java:110:44:110:56 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:558 |
+| Test.java:110:44:110:45 | it : List [<element>, <element>] : Object | Test.java:110:44:110:56 | iterator(...) : Iterator [<element>, <element>] : Object | provenance | MaD:558 |
+| Test.java:110:44:110:45 | it : List [<element>, <map.key>] : Object | Test.java:110:44:110:56 | iterator(...) : Iterator [<element>, <map.key>] : Object | provenance | MaD:558 |
+| Test.java:110:44:110:45 | it : List [<element>, <map.value>] : Object | Test.java:110:44:110:56 | iterator(...) : Iterator [<element>, <map.value>] : Object | provenance | MaD:558 |
+| Test.java:110:44:110:45 | it : List [<element>] : Object | Test.java:110:44:110:56 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:558 |
+| Test.java:110:44:110:45 | it : Multiset [<element>] : Object | Test.java:110:44:110:56 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:558 |
+| Test.java:110:44:110:45 | it : NavigableSet [<element>] : Comparable | Test.java:110:44:110:56 | iterator(...) : Iterator [<element>] : Comparable | provenance | MaD:558 |
+| Test.java:110:44:110:45 | it : PriorityBlockingQueue [<element>] : Object | Test.java:110:44:110:56 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:558 |
+| Test.java:110:44:110:45 | it : PriorityQueue [<element>] : Object | Test.java:110:44:110:56 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:558 |
+| Test.java:110:44:110:45 | it : Queue [<element>] : Object | Test.java:110:44:110:56 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:558 |
+| Test.java:110:44:110:45 | it : Set [<element>, <element>] : Comparable | Test.java:110:44:110:56 | iterator(...) : Iterator [<element>, <element>] : Comparable | provenance | MaD:558 |
+| Test.java:110:44:110:45 | it : Set [<element>, <element>] : Object | Test.java:110:44:110:56 | iterator(...) : Iterator [<element>, <element>] : Object | provenance | MaD:558 |
+| Test.java:110:44:110:45 | it : Set [<element>, <map.key>] : Object | Test.java:110:44:110:56 | iterator(...) : Iterator [<element>, <map.key>] : Object | provenance | MaD:558 |
+| Test.java:110:44:110:45 | it : Set [<element>, <map.value>] : Object | Test.java:110:44:110:56 | iterator(...) : Iterator [<element>, <map.value>] : Object | provenance | MaD:558 |
+| Test.java:110:44:110:45 | it : Set [<element>, com.google.common.collect.Table.columnKey] : Object | Test.java:110:44:110:56 | iterator(...) : Iterator [<element>, com.google.common.collect.Table.columnKey] : Object | provenance | MaD:558 |
+| Test.java:110:44:110:45 | it : Set [<element>, com.google.common.collect.Table.rowKey] : Object | Test.java:110:44:110:56 | iterator(...) : Iterator [<element>, com.google.common.collect.Table.rowKey] : Object | provenance | MaD:558 |
+| Test.java:110:44:110:45 | it : Set [<element>] : Object | Test.java:110:44:110:56 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:558 |
+| Test.java:110:44:110:45 | it : SetView [<element>] : Object | Test.java:110:44:110:56 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:558 |
+| Test.java:110:44:110:45 | it : SortedMultiset [<element>] : Comparable | Test.java:110:44:110:56 | iterator(...) : Iterator [<element>] : Comparable | provenance | MaD:558 |
+| Test.java:110:44:110:45 | it : SortedSet [<element>] : Comparable | Test.java:110:44:110:56 | iterator(...) : Iterator [<element>] : Comparable | provenance | MaD:558 |
+| Test.java:110:44:110:45 | it : SortedSet [<element>] : Object | Test.java:110:44:110:56 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:558 |
+| Test.java:110:44:110:45 | it : TreeMultiset [<element>] : Object | Test.java:110:44:110:56 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:558 |
+| Test.java:110:44:110:45 | it : TreeSet [<element>] : Object | Test.java:110:44:110:56 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:558 |
+| Test.java:110:44:110:56 | iterator(...) : Iterator [<element>, <element>] : Comparable | Test.java:110:44:110:63 | next(...) : Object [<element>] : Comparable | provenance | MaD:560 |
+| Test.java:110:44:110:56 | iterator(...) : Iterator [<element>, <element>] : Object | Test.java:110:44:110:63 | next(...) : Object [<element>] : Object | provenance | MaD:560 |
+| Test.java:110:44:110:56 | iterator(...) : Iterator [<element>, <element>] : Object | Test.java:110:44:110:63 | next(...) : Object [<element>] : Object | provenance | MaD:560 |
+| Test.java:110:44:110:56 | iterator(...) : Iterator [<element>, <element>] : Object | Test.java:110:44:110:63 | next(...) : Object [<element>] : Object | provenance | MaD:560 |
+| Test.java:110:44:110:56 | iterator(...) : Iterator [<element>, <element>] : Object | Test.java:110:44:110:63 | next(...) : Object [<element>] : Object | provenance | MaD:560 |
+| Test.java:110:44:110:56 | iterator(...) : Iterator [<element>, <element>] : Object | Test.java:110:44:110:63 | next(...) : Object [<element>] : Object | provenance | MaD:560 |
+| Test.java:110:44:110:56 | iterator(...) : Iterator [<element>, <map.key>] : Object | Test.java:110:44:110:63 | next(...) : Object [<map.key>] : Object | provenance | MaD:560 |
+| Test.java:110:44:110:56 | iterator(...) : Iterator [<element>, <map.key>] : Object | Test.java:110:44:110:63 | next(...) : Object [<map.key>] : Object | provenance | MaD:560 |
+| Test.java:110:44:110:56 | iterator(...) : Iterator [<element>, <map.key>] : Object | Test.java:110:44:110:63 | next(...) : Object [<map.key>] : Object | provenance | MaD:560 |
+| Test.java:110:44:110:56 | iterator(...) : Iterator [<element>, <map.key>] : Object | Test.java:110:44:110:63 | next(...) : Object [<map.key>] : Object | provenance | MaD:560 |
+| Test.java:110:44:110:56 | iterator(...) : Iterator [<element>, <map.key>] : Object | Test.java:110:44:110:63 | next(...) : Object [<map.key>] : Object | provenance | MaD:560 |
+| Test.java:110:44:110:56 | iterator(...) : Iterator [<element>, <map.value>] : Object | Test.java:110:44:110:63 | next(...) : Object [<map.value>] : Object | provenance | MaD:560 |
+| Test.java:110:44:110:56 | iterator(...) : Iterator [<element>, <map.value>] : Object | Test.java:110:44:110:63 | next(...) : Object [<map.value>] : Object | provenance | MaD:560 |
+| Test.java:110:44:110:56 | iterator(...) : Iterator [<element>, <map.value>] : Object | Test.java:110:44:110:63 | next(...) : Object [<map.value>] : Object | provenance | MaD:560 |
+| Test.java:110:44:110:56 | iterator(...) : Iterator [<element>, <map.value>] : Object | Test.java:110:44:110:63 | next(...) : Object [<map.value>] : Object | provenance | MaD:560 |
+| Test.java:110:44:110:56 | iterator(...) : Iterator [<element>, <map.value>] : Object | Test.java:110:44:110:63 | next(...) : Object [<map.value>] : Object | provenance | MaD:560 |
+| Test.java:110:44:110:56 | iterator(...) : Iterator [<element>, com.google.common.collect.Table.columnKey] : Object | Test.java:110:44:110:63 | next(...) : Object [com.google.common.collect.Table.columnKey] : Object | provenance | MaD:560 |
+| Test.java:110:44:110:56 | iterator(...) : Iterator [<element>, com.google.common.collect.Table.columnKey] : Object | Test.java:110:44:110:63 | next(...) : Object [com.google.common.collect.Table.columnKey] : Object | provenance | MaD:560 |
+| Test.java:110:44:110:56 | iterator(...) : Iterator [<element>, com.google.common.collect.Table.rowKey] : Object | Test.java:110:44:110:63 | next(...) : Object [com.google.common.collect.Table.rowKey] : Object | provenance | MaD:560 |
+| Test.java:110:44:110:56 | iterator(...) : Iterator [<element>, com.google.common.collect.Table.rowKey] : Object | Test.java:110:44:110:63 | next(...) : Object [com.google.common.collect.Table.rowKey] : Object | provenance | MaD:560 |
+| Test.java:110:44:110:56 | iterator(...) : Iterator [<element>] : Comparable | Test.java:110:44:110:63 | next(...) : Comparable | provenance | MaD:560 |
+| Test.java:110:44:110:56 | iterator(...) : Iterator [<element>] : Comparable | Test.java:110:44:110:63 | next(...) : Comparable | provenance | MaD:560 |
+| Test.java:110:44:110:56 | iterator(...) : Iterator [<element>] : Comparable | Test.java:110:44:110:63 | next(...) : Comparable | provenance | MaD:560 |
+| Test.java:110:44:110:56 | iterator(...) : Iterator [<element>] : Comparable | Test.java:110:44:110:63 | next(...) : Comparable | provenance | MaD:560 |
+| Test.java:110:44:110:56 | iterator(...) : Iterator [<element>] : Comparable | Test.java:110:44:110:63 | next(...) : Comparable | provenance | MaD:560 |
+| Test.java:110:44:110:56 | iterator(...) : Iterator [<element>] : Comparable | Test.java:110:44:110:63 | next(...) : Comparable | provenance | MaD:560 |
+| Test.java:110:44:110:56 | iterator(...) : Iterator [<element>] : Object | Test.java:110:44:110:63 | next(...) : Object | provenance | MaD:560 |
+| Test.java:110:44:110:56 | iterator(...) : Iterator [<element>] : Object | Test.java:110:44:110:63 | next(...) : Object | provenance | MaD:560 |
+| Test.java:110:44:110:56 | iterator(...) : Iterator [<element>] : Object | Test.java:110:44:110:63 | next(...) : Object | provenance | MaD:560 |
+| Test.java:110:44:110:56 | iterator(...) : Iterator [<element>] : Object | Test.java:110:44:110:63 | next(...) : Object | provenance | MaD:560 |
+| Test.java:110:44:110:56 | iterator(...) : Iterator [<element>] : Object | Test.java:110:44:110:63 | next(...) : Object | provenance | MaD:560 |
+| Test.java:110:44:110:56 | iterator(...) : Iterator [<element>] : Object | Test.java:110:44:110:63 | next(...) : Object | provenance | MaD:560 |
+| Test.java:110:44:110:56 | iterator(...) : Iterator [<element>] : Object | Test.java:110:44:110:63 | next(...) : Object | provenance | MaD:560 |
+| Test.java:110:44:110:56 | iterator(...) : Iterator [<element>] : Object | Test.java:110:44:110:63 | next(...) : Object | provenance | MaD:560 |
+| Test.java:110:44:110:56 | iterator(...) : Iterator [<element>] : Object | Test.java:110:44:110:63 | next(...) : Object | provenance | MaD:560 |
+| Test.java:110:44:110:56 | iterator(...) : Iterator [<element>] : Object | Test.java:110:44:110:63 | next(...) : Object | provenance | MaD:560 |
+| Test.java:110:44:110:56 | iterator(...) : Iterator [<element>] : Object | Test.java:110:44:110:63 | next(...) : Object | provenance | MaD:560 |
+| Test.java:110:44:110:56 | iterator(...) : Iterator [<element>] : Object | Test.java:110:44:110:63 | next(...) : Object | provenance | MaD:560 |
+| Test.java:110:44:110:56 | iterator(...) : Iterator [<element>] : Object | Test.java:110:44:110:63 | next(...) : Object | provenance | MaD:560 |
+| Test.java:110:44:110:56 | iterator(...) : Iterator [<element>] : Object | Test.java:110:44:110:63 | next(...) : Object | provenance | MaD:560 |
+| Test.java:110:44:110:56 | iterator(...) : Iterator [<element>] : Object | Test.java:110:44:110:63 | next(...) : Object | provenance | MaD:560 |
+| Test.java:110:44:110:56 | iterator(...) : Iterator [<element>] : Object | Test.java:110:44:110:63 | next(...) : Object | provenance | MaD:560 |
+| Test.java:110:44:110:56 | iterator(...) : Iterator [<element>] : Object | Test.java:110:44:110:63 | next(...) : Object | provenance | MaD:560 |
+| Test.java:110:44:110:56 | iterator(...) : Iterator [<element>] : Object | Test.java:110:44:110:63 | next(...) : Object | provenance | MaD:560 |
+| Test.java:110:44:110:56 | iterator(...) : Iterator [<element>] : Object | Test.java:110:44:110:63 | next(...) : Object | provenance | MaD:560 |
+| Test.java:110:44:110:56 | iterator(...) : Iterator [<element>] : Object | Test.java:110:44:110:63 | next(...) : Object | provenance | MaD:560 |
+| Test.java:110:44:110:56 | iterator(...) : Iterator [<element>] : Object | Test.java:110:44:110:63 | next(...) : Object | provenance | MaD:560 |
+| Test.java:110:44:110:56 | iterator(...) : Iterator [<element>] : Object | Test.java:110:44:110:63 | next(...) : Object | provenance | MaD:560 |
+| Test.java:110:44:110:56 | iterator(...) : Iterator [<element>] : Object | Test.java:110:44:110:63 | next(...) : Object | provenance | MaD:560 |
+| Test.java:110:44:110:56 | iterator(...) : Iterator [<element>] : Object | Test.java:110:44:110:63 | next(...) : Object | provenance | MaD:560 |
+| Test.java:110:44:110:56 | iterator(...) : Iterator [<element>] : Object | Test.java:110:44:110:63 | next(...) : Object | provenance | MaD:560 |
+| Test.java:110:44:110:56 | iterator(...) : Iterator [<element>] : Object | Test.java:110:44:110:63 | next(...) : Object | provenance | MaD:560 |
+| Test.java:110:44:110:56 | iterator(...) : Iterator [<element>] : Object | Test.java:110:44:110:63 | next(...) : Object | provenance | MaD:560 |
+| Test.java:110:44:110:56 | iterator(...) : Iterator [<element>] : Object | Test.java:110:44:110:63 | next(...) : Object | provenance | MaD:560 |
+| Test.java:110:44:110:56 | iterator(...) : Iterator [<element>] : Object | Test.java:110:44:110:63 | next(...) : Object | provenance | MaD:560 |
+| Test.java:110:44:110:56 | iterator(...) : Iterator [<element>] : Object | Test.java:110:44:110:63 | next(...) : Object | provenance | MaD:560 |
+| Test.java:110:44:110:56 | iterator(...) : Iterator [<element>] : Object | Test.java:110:44:110:63 | next(...) : Object | provenance | MaD:560 |
+| Test.java:110:44:110:56 | iterator(...) : Iterator [<element>] : Object | Test.java:110:44:110:63 | next(...) : Object | provenance | MaD:560 |
 | Test.java:111:19:111:32 | it : Iterator [<element>] : Object | Test.java:111:44:111:45 | it : Iterator [<element>] : Object | provenance |  |
 | Test.java:111:19:111:32 | it : PeekingIterator [<element>] : Object | Test.java:111:44:111:45 | it : PeekingIterator [<element>] : Object | provenance |  |
 | Test.java:111:19:111:32 | it : UnmodifiableIterator [<element>, <element>] : Object | Test.java:111:44:111:45 | it : UnmodifiableIterator [<element>, <element>] : Object | provenance |  |
 | Test.java:111:19:111:32 | it : UnmodifiableIterator [<element>] : Object | Test.java:111:44:111:45 | it : UnmodifiableIterator [<element>] : Object | provenance |  |
-| Test.java:111:44:111:45 | it : Iterator [<element>] : Object | Test.java:111:44:111:52 | next(...) : Object | provenance | MaD:557 |
-| Test.java:111:44:111:45 | it : PeekingIterator [<element>] : Object | Test.java:111:44:111:52 | next(...) : Object | provenance | MaD:557 |
-| Test.java:111:44:111:45 | it : UnmodifiableIterator [<element>, <element>] : Object | Test.java:111:44:111:52 | next(...) : Object [<element>] : Object | provenance | MaD:557 |
-| Test.java:111:44:111:45 | it : UnmodifiableIterator [<element>] : Object | Test.java:111:44:111:52 | next(...) : Object | provenance | MaD:557 |
+| Test.java:111:44:111:45 | it : Iterator [<element>] : Object | Test.java:111:44:111:52 | next(...) : Object | provenance | MaD:560 |
+| Test.java:111:44:111:45 | it : PeekingIterator [<element>] : Object | Test.java:111:44:111:52 | next(...) : Object | provenance | MaD:560 |
+| Test.java:111:44:111:45 | it : UnmodifiableIterator [<element>, <element>] : Object | Test.java:111:44:111:52 | next(...) : Object [<element>] : Object | provenance | MaD:560 |
+| Test.java:111:44:111:45 | it : UnmodifiableIterator [<element>] : Object | Test.java:111:44:111:52 | next(...) : Object | provenance | MaD:560 |
 | Test.java:112:19:112:31 | o : Optional [<element>] : Object | Test.java:112:43:112:43 | o : Optional [<element>] : Object | provenance |  |
 | Test.java:112:43:112:43 | o : Optional [<element>] : Object | Test.java:112:43:112:49 | get(...) : Object | provenance | MaD:1 |
 | Test.java:113:42:113:48 | value : Object | Test.java:113:73:113:77 | value : Object | provenance |  |
-| Test.java:113:60:113:78 | of(...) : Map [<map.value>] : Object | Test.java:113:60:113:89 | entrySet(...) : Set [<element>, <map.value>] : Object | provenance | MaD:560 |
-| Test.java:113:60:113:89 | entrySet(...) : Set [<element>, <map.value>] : Object | Test.java:113:60:113:100 | iterator(...) : Iterator [<element>, <map.value>] : Object | provenance | MaD:555 |
-| Test.java:113:60:113:100 | iterator(...) : Iterator [<element>, <map.value>] : Object | Test.java:113:60:113:107 | next(...) : Entry [<map.value>] : Object | provenance | MaD:557 |
-| Test.java:113:73:113:77 | value : Object | Test.java:113:60:113:78 | of(...) : Map [<map.value>] : Object | provenance | MaD:564 |
+| Test.java:113:60:113:78 | of(...) : Map [<map.value>] : Object | Test.java:113:60:113:89 | entrySet(...) : Set [<element>, <map.value>] : Object | provenance | MaD:567 |
+| Test.java:113:60:113:89 | entrySet(...) : Set [<element>, <map.value>] : Object | Test.java:113:60:113:100 | iterator(...) : Iterator [<element>, <map.value>] : Object | provenance | MaD:558 |
+| Test.java:113:60:113:100 | iterator(...) : Iterator [<element>, <map.value>] : Object | Test.java:113:60:113:107 | next(...) : Entry [<map.value>] : Object | provenance | MaD:560 |
+| Test.java:113:73:113:77 | value : Object | Test.java:113:60:113:78 | of(...) : Map [<map.value>] : Object | provenance | MaD:565 |
 | Test.java:114:58:114:60 | l : Object | Test.java:114:106:114:106 | l : Object | provenance |  |
 | Test.java:114:63:114:65 | r : Object | Test.java:114:123:114:123 | r : Object | provenance |  |
-| Test.java:114:77:114:125 | difference(...) : MapDifference [com.google.common.collect.MapDifference.left, <map.value>] : Object | Test.java:114:77:114:144 | entriesDiffering(...) : Map [<map.value>, com.google.common.collect.MapDifference.left] : Object | provenance | MaD:308 |
-| Test.java:114:77:114:125 | difference(...) : MapDifference [com.google.common.collect.MapDifference.right, <map.value>] : Object | Test.java:114:77:114:144 | entriesDiffering(...) : Map [<map.value>, com.google.common.collect.MapDifference.right] : Object | provenance | MaD:310 |
-| Test.java:114:77:114:144 | entriesDiffering(...) : Map [<map.value>, com.google.common.collect.MapDifference.left] : Object | Test.java:114:77:114:154 | get(...) : ValueDifference [com.google.common.collect.MapDifference.left] : Object | provenance | MaD:561 |
-| Test.java:114:77:114:144 | entriesDiffering(...) : Map [<map.value>, com.google.common.collect.MapDifference.right] : Object | Test.java:114:77:114:154 | get(...) : ValueDifference [com.google.common.collect.MapDifference.right] : Object | provenance | MaD:561 |
+| Test.java:114:77:114:125 | difference(...) : MapDifference [com.google.common.collect.MapDifference.left, <map.value>] : Object | Test.java:114:77:114:144 | entriesDiffering(...) : Map [<map.value>, com.google.common.collect.MapDifference.left] : Object | provenance | MaD:310 |
+| Test.java:114:77:114:125 | difference(...) : MapDifference [com.google.common.collect.MapDifference.right, <map.value>] : Object | Test.java:114:77:114:144 | entriesDiffering(...) : Map [<map.value>, com.google.common.collect.MapDifference.right] : Object | provenance | MaD:312 |
+| Test.java:114:77:114:144 | entriesDiffering(...) : Map [<map.value>, com.google.common.collect.MapDifference.left] : Object | Test.java:114:77:114:154 | get(...) : ValueDifference [com.google.common.collect.MapDifference.left] : Object | provenance | MaD:568 |
+| Test.java:114:77:114:144 | entriesDiffering(...) : Map [<map.value>, com.google.common.collect.MapDifference.right] : Object | Test.java:114:77:114:154 | get(...) : ValueDifference [com.google.common.collect.MapDifference.right] : Object | provenance | MaD:568 |
 | Test.java:114:93:114:107 | of(...) : Map [<map.value>] : Object | Test.java:114:77:114:125 | difference(...) : MapDifference [com.google.common.collect.MapDifference.left, <map.value>] : Object | provenance | MaD:325 |
-| Test.java:114:106:114:106 | l : Object | Test.java:114:93:114:107 | of(...) : Map [<map.value>] : Object | provenance | MaD:564 |
+| Test.java:114:106:114:106 | l : Object | Test.java:114:93:114:107 | of(...) : Map [<map.value>] : Object | provenance | MaD:565 |
 | Test.java:114:110:114:124 | of(...) : Map [<map.value>] : Object | Test.java:114:77:114:125 | difference(...) : MapDifference [com.google.common.collect.MapDifference.right, <map.value>] : Object | provenance | MaD:327 |
-| Test.java:114:123:114:123 | r : Object | Test.java:114:110:114:124 | of(...) : Map [<map.value>] : Object | provenance | MaD:564 |
+| Test.java:114:123:114:123 | r : Object | Test.java:114:110:114:124 | of(...) : Map [<map.value>] : Object | provenance | MaD:565 |
 | Test.java:115:20:115:46 | b : Builder [<map.value>] : Object | Test.java:115:70:115:70 | b : Builder [<map.value>] : Object | provenance |  |
 | Test.java:115:20:115:46 | b : Builder [<map.value>] : Object | Test.java:115:70:115:70 | b : Builder [<map.value>] : Object | provenance |  |
 | Test.java:115:20:115:46 | b : Builder [<map.value>] : Object | Test.java:115:70:115:70 | b : Builder [<map.value>] : Object | provenance |  |
-| Test.java:115:70:115:70 | b : Builder [<map.value>] : Object | Test.java:115:70:115:78 | build(...) : ImmutableMap [<map.value>] : Object | provenance | MaD:85 |
-| Test.java:115:70:115:70 | b : Builder [<map.value>] : Object | Test.java:115:70:115:78 | build(...) : ImmutableMap [<map.value>] : Object | provenance | MaD:85 |
-| Test.java:115:70:115:70 | b : Builder [<map.value>] : Object | Test.java:115:70:115:78 | build(...) : ImmutableMap [<map.value>] : Object | provenance | MaD:85 |
-| Test.java:115:70:115:78 | build(...) : ImmutableMap [<map.value>] : Object | Test.java:115:58:115:79 | getMapValue(...) : Object | provenance | MaD:561 |
-| Test.java:115:70:115:78 | build(...) : ImmutableMap [<map.value>] : Object | Test.java:115:58:115:79 | getMapValue(...) : Object | provenance | MaD:561 |
-| Test.java:115:70:115:78 | build(...) : ImmutableMap [<map.value>] : Object | Test.java:115:58:115:79 | getMapValue(...) : Object | provenance | MaD:561 |
+| Test.java:115:70:115:70 | b : Builder [<map.value>] : Object | Test.java:115:70:115:78 | build(...) : ImmutableMap [<map.value>] : Object | provenance | MaD:71 |
+| Test.java:115:70:115:70 | b : Builder [<map.value>] : Object | Test.java:115:70:115:78 | build(...) : ImmutableMap [<map.value>] : Object | provenance | MaD:71 |
+| Test.java:115:70:115:70 | b : Builder [<map.value>] : Object | Test.java:115:70:115:78 | build(...) : ImmutableMap [<map.value>] : Object | provenance | MaD:71 |
+| Test.java:115:70:115:78 | build(...) : ImmutableMap [<map.value>] : Object | Test.java:115:58:115:79 | getMapValue(...) : Object | provenance | MaD:568 |
+| Test.java:115:70:115:78 | build(...) : ImmutableMap [<map.value>] : Object | Test.java:115:58:115:79 | getMapValue(...) : Object | provenance | MaD:568 |
+| Test.java:115:70:115:78 | build(...) : ImmutableMap [<map.value>] : Object | Test.java:115:58:115:79 | getMapValue(...) : Object | provenance | MaD:568 |
 | Test.java:115:70:115:78 | build(...) : ImmutableMap [<map.value>] : Object | Test.java:118:20:118:31 | map : ImmutableMap [<map.value>] : Object | provenance |  |
 | Test.java:115:70:115:78 | build(...) : ImmutableMap [<map.value>] : Object | Test.java:118:20:118:31 | map : ImmutableMap [<map.value>] : Object | provenance |  |
 | Test.java:115:70:115:78 | build(...) : ImmutableMap [<map.value>] : Object | Test.java:118:20:118:31 | map : ImmutableMap [<map.value>] : Object | provenance |  |
 | Test.java:116:20:116:51 | b : Builder [<map.value>] : Object | Test.java:116:75:116:75 | b : Builder [<map.value>] : Object | provenance |  |
 | Test.java:116:20:116:51 | b : Builder [<map.value>] : Object | Test.java:116:75:116:75 | b : Builder [<map.value>] : Object | provenance |  |
 | Test.java:116:20:116:51 | b : Builder [<map.value>] : Object | Test.java:116:75:116:75 | b : Builder [<map.value>] : Object | provenance |  |
-| Test.java:116:75:116:75 | b : Builder [<map.value>] : Object | Test.java:116:75:116:83 | build(...) : ImmutableMultimap [<map.value>] : Object | provenance | MaD:114 |
-| Test.java:116:75:116:75 | b : Builder [<map.value>] : Object | Test.java:116:75:116:83 | build(...) : ImmutableMultimap [<map.value>] : Object | provenance | MaD:114 |
-| Test.java:116:75:116:75 | b : Builder [<map.value>] : Object | Test.java:116:75:116:83 | build(...) : ImmutableMultimap [<map.value>] : Object | provenance | MaD:114 |
+| Test.java:116:75:116:75 | b : Builder [<map.value>] : Object | Test.java:116:75:116:83 | build(...) : ImmutableMultimap [<map.value>] : Object | provenance | MaD:98 |
+| Test.java:116:75:116:75 | b : Builder [<map.value>] : Object | Test.java:116:75:116:83 | build(...) : ImmutableMultimap [<map.value>] : Object | provenance | MaD:98 |
+| Test.java:116:75:116:75 | b : Builder [<map.value>] : Object | Test.java:116:75:116:83 | build(...) : ImmutableMultimap [<map.value>] : Object | provenance | MaD:98 |
 | Test.java:116:75:116:83 | build(...) : ImmutableMultimap [<map.value>] : Object | Test.java:116:63:116:84 | getMapValue(...) : Object | provenance | MaD:385 |
 | Test.java:116:75:116:83 | build(...) : ImmutableMultimap [<map.value>] : Object | Test.java:116:63:116:84 | getMapValue(...) : Object | provenance | MaD:385 |
 | Test.java:116:75:116:83 | build(...) : ImmutableMultimap [<map.value>] : Object | Test.java:116:63:116:84 | getMapValue(...) : Object | provenance | MaD:385 |
@@ -1056,8 +1056,8 @@ edges
 | Test.java:116:75:116:83 | build(...) : ImmutableMultimap [<map.value>] : Object | Test.java:119:20:119:36 | map : ImmutableMultimap [<map.value>] : Object | provenance |  |
 | Test.java:116:75:116:83 | build(...) : ImmutableMultimap [<map.value>] : Object | Test.java:119:20:119:36 | map : ImmutableMultimap [<map.value>] : Object | provenance |  |
 | Test.java:117:20:117:50 | b : Builder [<map.value>] : Object | Test.java:117:74:117:74 | b : Builder [<map.value>] : Object | provenance |  |
-| Test.java:117:74:117:74 | b : Builder [<map.value>] : Object | Test.java:117:74:117:82 | build(...) : ImmutableTable [<map.value>] : Object | provenance | MaD:199 |
-| Test.java:117:74:117:82 | build(...) : ImmutableTable [<map.value>] : Object | Test.java:117:62:117:83 | getMapValue(...) : Object | provenance | MaD:525 |
+| Test.java:117:74:117:74 | b : Builder [<map.value>] : Object | Test.java:117:74:117:82 | build(...) : ImmutableTable [<map.value>] : Object | provenance | MaD:193 |
+| Test.java:117:74:117:82 | build(...) : ImmutableTable [<map.value>] : Object | Test.java:117:62:117:83 | getMapValue(...) : Object | provenance | MaD:528 |
 | Test.java:117:74:117:82 | build(...) : ImmutableTable [<map.value>] : Object | Test.java:120:20:120:33 | t : ImmutableTable [<map.value>] : Object | provenance |  |
 | Test.java:118:20:118:31 | map : BiMap [<map.value>] : Object | Test.java:118:43:118:45 | map : BiMap [<map.value>] : Object | provenance |  |
 | Test.java:118:20:118:31 | map : ClassToInstanceMap [<map.value>] : Object | Test.java:118:43:118:45 | map : ClassToInstanceMap [<map.value>] : Object | provenance |  |
@@ -1088,35 +1088,35 @@ edges
 | Test.java:118:20:118:31 | map : SortedMap [<map.value>, com.google.common.collect.MapDifference.right] : Object | Test.java:118:43:118:45 | map : SortedMap [<map.value>, com.google.common.collect.MapDifference.right] : Object | provenance |  |
 | Test.java:118:20:118:31 | map : SortedMap [<map.value>] : Object | Test.java:118:43:118:45 | map : SortedMap [<map.value>] : Object | provenance |  |
 | Test.java:118:20:118:31 | map : TreeMap [<map.value>] : Object | Test.java:118:43:118:45 | map : TreeMap [<map.value>] : Object | provenance |  |
-| Test.java:118:43:118:45 | map : BiMap [<map.value>] : Object | Test.java:118:43:118:55 | get(...) : Object | provenance | MaD:561 |
-| Test.java:118:43:118:45 | map : ClassToInstanceMap [<map.value>] : Object | Test.java:118:43:118:55 | get(...) : Object | provenance | MaD:561 |
-| Test.java:118:43:118:45 | map : EnumMap [<map.value>] : Object | Test.java:118:43:118:55 | get(...) : Object | provenance | MaD:561 |
-| Test.java:118:43:118:45 | map : HashBiMap [<map.value>] : Object | Test.java:118:43:118:55 | get(...) : Object | provenance | MaD:561 |
-| Test.java:118:43:118:45 | map : HashMap [<map.value>] : Object | Test.java:118:43:118:55 | get(...) : Object | provenance | MaD:561 |
-| Test.java:118:43:118:45 | map : ImmutableBiMap [<map.value>] : Object | Test.java:118:43:118:55 | get(...) : Object | provenance | MaD:561 |
-| Test.java:118:43:118:45 | map : ImmutableClassToInstanceMap [<map.value>] : Object | Test.java:118:43:118:55 | get(...) : Object | provenance | MaD:561 |
-| Test.java:118:43:118:45 | map : ImmutableMap [<map.value>, <element>] : Object | Test.java:118:43:118:55 | get(...) : Object [<element>] : Object | provenance | MaD:561 |
-| Test.java:118:43:118:45 | map : ImmutableMap [<map.value>, <map.key>] : Object | Test.java:118:43:118:55 | get(...) : Object [<map.key>] : Object | provenance | MaD:561 |
-| Test.java:118:43:118:45 | map : ImmutableMap [<map.value>, <map.value>] : Object | Test.java:118:43:118:55 | get(...) : Object [<map.value>] : Object | provenance | MaD:561 |
-| Test.java:118:43:118:45 | map : ImmutableMap [<map.value>] : Object | Test.java:118:43:118:55 | get(...) : Object | provenance | MaD:561 |
-| Test.java:118:43:118:45 | map : ImmutableSortedMap [<map.value>] : Object | Test.java:118:43:118:55 | get(...) : Object | provenance | MaD:561 |
-| Test.java:118:43:118:45 | map : LinkedHashMap [<map.value>] : Object | Test.java:118:43:118:55 | get(...) : Object | provenance | MaD:561 |
-| Test.java:118:43:118:45 | map : Map [<map.value>, <element>] : Comparable | Test.java:118:43:118:55 | get(...) : Object [<element>] : Comparable | provenance | MaD:561 |
-| Test.java:118:43:118:45 | map : Map [<map.value>, <element>] : Object | Test.java:118:43:118:55 | get(...) : Object [<element>] : Object | provenance | MaD:561 |
-| Test.java:118:43:118:45 | map : Map [<map.value>, <map.key>] : Object | Test.java:118:43:118:55 | get(...) : Object [<map.key>] : Object | provenance | MaD:561 |
-| Test.java:118:43:118:45 | map : Map [<map.value>, <map.value>] : Object | Test.java:118:43:118:55 | get(...) : Object [<map.value>] : Object | provenance | MaD:561 |
-| Test.java:118:43:118:45 | map : Map [<map.value>, com.google.common.collect.MapDifference.left] : Object | Test.java:118:43:118:55 | get(...) : Object [com.google.common.collect.MapDifference.left] : Object | provenance | MaD:561 |
-| Test.java:118:43:118:45 | map : Map [<map.value>, com.google.common.collect.MapDifference.right] : Object | Test.java:118:43:118:55 | get(...) : Object [com.google.common.collect.MapDifference.right] : Object | provenance | MaD:561 |
-| Test.java:118:43:118:45 | map : Map [<map.value>] : Object | Test.java:118:43:118:55 | get(...) : Object | provenance | MaD:561 |
-| Test.java:118:43:118:45 | map : MutableClassToInstanceMap [<map.value>] : Object | Test.java:118:43:118:55 | get(...) : Object | provenance | MaD:561 |
-| Test.java:118:43:118:45 | map : NavigableMap [<map.value>, <element>] : Comparable | Test.java:118:43:118:55 | get(...) : Object [<element>] : Comparable | provenance | MaD:561 |
-| Test.java:118:43:118:45 | map : NavigableMap [<map.value>] : Object | Test.java:118:43:118:55 | get(...) : Object | provenance | MaD:561 |
-| Test.java:118:43:118:45 | map : SortedMap [<map.value>, <map.key>] : Object | Test.java:118:43:118:55 | get(...) : Object [<map.key>] : Object | provenance | MaD:561 |
-| Test.java:118:43:118:45 | map : SortedMap [<map.value>, <map.value>] : Object | Test.java:118:43:118:55 | get(...) : Object [<map.value>] : Object | provenance | MaD:561 |
-| Test.java:118:43:118:45 | map : SortedMap [<map.value>, com.google.common.collect.MapDifference.left] : Object | Test.java:118:43:118:55 | get(...) : Object [com.google.common.collect.MapDifference.left] : Object | provenance | MaD:561 |
-| Test.java:118:43:118:45 | map : SortedMap [<map.value>, com.google.common.collect.MapDifference.right] : Object | Test.java:118:43:118:55 | get(...) : Object [com.google.common.collect.MapDifference.right] : Object | provenance | MaD:561 |
-| Test.java:118:43:118:45 | map : SortedMap [<map.value>] : Object | Test.java:118:43:118:55 | get(...) : Object | provenance | MaD:561 |
-| Test.java:118:43:118:45 | map : TreeMap [<map.value>] : Object | Test.java:118:43:118:55 | get(...) : Object | provenance | MaD:561 |
+| Test.java:118:43:118:45 | map : BiMap [<map.value>] : Object | Test.java:118:43:118:55 | get(...) : Object | provenance | MaD:568 |
+| Test.java:118:43:118:45 | map : ClassToInstanceMap [<map.value>] : Object | Test.java:118:43:118:55 | get(...) : Object | provenance | MaD:568 |
+| Test.java:118:43:118:45 | map : EnumMap [<map.value>] : Object | Test.java:118:43:118:55 | get(...) : Object | provenance | MaD:568 |
+| Test.java:118:43:118:45 | map : HashBiMap [<map.value>] : Object | Test.java:118:43:118:55 | get(...) : Object | provenance | MaD:568 |
+| Test.java:118:43:118:45 | map : HashMap [<map.value>] : Object | Test.java:118:43:118:55 | get(...) : Object | provenance | MaD:568 |
+| Test.java:118:43:118:45 | map : ImmutableBiMap [<map.value>] : Object | Test.java:118:43:118:55 | get(...) : Object | provenance | MaD:568 |
+| Test.java:118:43:118:45 | map : ImmutableClassToInstanceMap [<map.value>] : Object | Test.java:118:43:118:55 | get(...) : Object | provenance | MaD:568 |
+| Test.java:118:43:118:45 | map : ImmutableMap [<map.value>, <element>] : Object | Test.java:118:43:118:55 | get(...) : Object [<element>] : Object | provenance | MaD:568 |
+| Test.java:118:43:118:45 | map : ImmutableMap [<map.value>, <map.key>] : Object | Test.java:118:43:118:55 | get(...) : Object [<map.key>] : Object | provenance | MaD:568 |
+| Test.java:118:43:118:45 | map : ImmutableMap [<map.value>, <map.value>] : Object | Test.java:118:43:118:55 | get(...) : Object [<map.value>] : Object | provenance | MaD:568 |
+| Test.java:118:43:118:45 | map : ImmutableMap [<map.value>] : Object | Test.java:118:43:118:55 | get(...) : Object | provenance | MaD:568 |
+| Test.java:118:43:118:45 | map : ImmutableSortedMap [<map.value>] : Object | Test.java:118:43:118:55 | get(...) : Object | provenance | MaD:568 |
+| Test.java:118:43:118:45 | map : LinkedHashMap [<map.value>] : Object | Test.java:118:43:118:55 | get(...) : Object | provenance | MaD:568 |
+| Test.java:118:43:118:45 | map : Map [<map.value>, <element>] : Comparable | Test.java:118:43:118:55 | get(...) : Object [<element>] : Comparable | provenance | MaD:568 |
+| Test.java:118:43:118:45 | map : Map [<map.value>, <element>] : Object | Test.java:118:43:118:55 | get(...) : Object [<element>] : Object | provenance | MaD:568 |
+| Test.java:118:43:118:45 | map : Map [<map.value>, <map.key>] : Object | Test.java:118:43:118:55 | get(...) : Object [<map.key>] : Object | provenance | MaD:568 |
+| Test.java:118:43:118:45 | map : Map [<map.value>, <map.value>] : Object | Test.java:118:43:118:55 | get(...) : Object [<map.value>] : Object | provenance | MaD:568 |
+| Test.java:118:43:118:45 | map : Map [<map.value>, com.google.common.collect.MapDifference.left] : Object | Test.java:118:43:118:55 | get(...) : Object [com.google.common.collect.MapDifference.left] : Object | provenance | MaD:568 |
+| Test.java:118:43:118:45 | map : Map [<map.value>, com.google.common.collect.MapDifference.right] : Object | Test.java:118:43:118:55 | get(...) : Object [com.google.common.collect.MapDifference.right] : Object | provenance | MaD:568 |
+| Test.java:118:43:118:45 | map : Map [<map.value>] : Object | Test.java:118:43:118:55 | get(...) : Object | provenance | MaD:568 |
+| Test.java:118:43:118:45 | map : MutableClassToInstanceMap [<map.value>] : Object | Test.java:118:43:118:55 | get(...) : Object | provenance | MaD:568 |
+| Test.java:118:43:118:45 | map : NavigableMap [<map.value>, <element>] : Comparable | Test.java:118:43:118:55 | get(...) : Object [<element>] : Comparable | provenance | MaD:568 |
+| Test.java:118:43:118:45 | map : NavigableMap [<map.value>] : Object | Test.java:118:43:118:55 | get(...) : Object | provenance | MaD:568 |
+| Test.java:118:43:118:45 | map : SortedMap [<map.value>, <map.key>] : Object | Test.java:118:43:118:55 | get(...) : Object [<map.key>] : Object | provenance | MaD:568 |
+| Test.java:118:43:118:45 | map : SortedMap [<map.value>, <map.value>] : Object | Test.java:118:43:118:55 | get(...) : Object [<map.value>] : Object | provenance | MaD:568 |
+| Test.java:118:43:118:45 | map : SortedMap [<map.value>, com.google.common.collect.MapDifference.left] : Object | Test.java:118:43:118:55 | get(...) : Object [com.google.common.collect.MapDifference.left] : Object | provenance | MaD:568 |
+| Test.java:118:43:118:45 | map : SortedMap [<map.value>, com.google.common.collect.MapDifference.right] : Object | Test.java:118:43:118:55 | get(...) : Object [com.google.common.collect.MapDifference.right] : Object | provenance | MaD:568 |
+| Test.java:118:43:118:45 | map : SortedMap [<map.value>] : Object | Test.java:118:43:118:55 | get(...) : Object | provenance | MaD:568 |
+| Test.java:118:43:118:45 | map : TreeMap [<map.value>] : Object | Test.java:118:43:118:55 | get(...) : Object | provenance | MaD:568 |
 | Test.java:119:20:119:36 | map : ArrayListMultimap [<map.value>] : Object | Test.java:119:48:119:50 | map : ArrayListMultimap [<map.value>] : Object | provenance |  |
 | Test.java:119:20:119:36 | map : HashMultimap [<map.value>] : Object | Test.java:119:48:119:50 | map : HashMultimap [<map.value>] : Object | provenance |  |
 | Test.java:119:20:119:36 | map : ImmutableListMultimap [<map.value>] : Object | Test.java:119:48:119:50 | map : ImmutableListMultimap [<map.value>] : Object | provenance |  |
@@ -1143,192 +1143,192 @@ edges
 | Test.java:119:48:119:50 | map : SortedSetMultimap [<map.value>] : Comparable | Test.java:119:48:119:59 | values(...) : Collection [<element>] : Comparable | provenance | MaD:385 |
 | Test.java:119:48:119:50 | map : SortedSetMultimap [<map.value>] : Object | Test.java:119:48:119:59 | values(...) : Collection [<element>] : Object | provenance | MaD:385 |
 | Test.java:119:48:119:50 | map : TreeMultimap [<map.value>] : Object | Test.java:119:48:119:59 | values(...) : Collection [<element>] : Object | provenance | MaD:385 |
-| Test.java:119:48:119:59 | values(...) : Collection [<element>] : Comparable | Test.java:119:48:119:70 | iterator(...) : Iterator [<element>] : Comparable | provenance | MaD:555 |
-| Test.java:119:48:119:59 | values(...) : Collection [<element>] : Object | Test.java:119:48:119:70 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:555 |
-| Test.java:119:48:119:59 | values(...) : Collection [<element>] : Object | Test.java:119:48:119:70 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:555 |
-| Test.java:119:48:119:59 | values(...) : Collection [<element>] : Object | Test.java:119:48:119:70 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:555 |
-| Test.java:119:48:119:59 | values(...) : Collection [<element>] : Object | Test.java:119:48:119:70 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:555 |
-| Test.java:119:48:119:59 | values(...) : Collection [<element>] : Object | Test.java:119:48:119:70 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:555 |
-| Test.java:119:48:119:59 | values(...) : Collection [<element>] : Object | Test.java:119:48:119:70 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:555 |
-| Test.java:119:48:119:59 | values(...) : Collection [<element>] : Object | Test.java:119:48:119:70 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:555 |
-| Test.java:119:48:119:59 | values(...) : Collection [<element>] : Object | Test.java:119:48:119:70 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:555 |
-| Test.java:119:48:119:59 | values(...) : Collection [<element>] : Object | Test.java:119:48:119:70 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:555 |
-| Test.java:119:48:119:59 | values(...) : Collection [<element>] : Object | Test.java:119:48:119:70 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:555 |
-| Test.java:119:48:119:59 | values(...) : Collection [<element>] : Object | Test.java:119:48:119:70 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:555 |
-| Test.java:119:48:119:59 | values(...) : Collection [<element>] : Object | Test.java:119:48:119:70 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:555 |
-| Test.java:119:48:119:70 | iterator(...) : Iterator [<element>] : Comparable | Test.java:119:48:119:77 | next(...) : Comparable | provenance | MaD:557 |
-| Test.java:119:48:119:70 | iterator(...) : Iterator [<element>] : Object | Test.java:119:48:119:77 | next(...) : Object | provenance | MaD:557 |
-| Test.java:119:48:119:70 | iterator(...) : Iterator [<element>] : Object | Test.java:119:48:119:77 | next(...) : Object | provenance | MaD:557 |
-| Test.java:119:48:119:70 | iterator(...) : Iterator [<element>] : Object | Test.java:119:48:119:77 | next(...) : Object | provenance | MaD:557 |
-| Test.java:119:48:119:70 | iterator(...) : Iterator [<element>] : Object | Test.java:119:48:119:77 | next(...) : Object | provenance | MaD:557 |
-| Test.java:119:48:119:70 | iterator(...) : Iterator [<element>] : Object | Test.java:119:48:119:77 | next(...) : Object | provenance | MaD:557 |
-| Test.java:119:48:119:70 | iterator(...) : Iterator [<element>] : Object | Test.java:119:48:119:77 | next(...) : Object | provenance | MaD:557 |
-| Test.java:119:48:119:70 | iterator(...) : Iterator [<element>] : Object | Test.java:119:48:119:77 | next(...) : Object | provenance | MaD:557 |
-| Test.java:119:48:119:70 | iterator(...) : Iterator [<element>] : Object | Test.java:119:48:119:77 | next(...) : Object | provenance | MaD:557 |
-| Test.java:119:48:119:70 | iterator(...) : Iterator [<element>] : Object | Test.java:119:48:119:77 | next(...) : Object | provenance | MaD:557 |
-| Test.java:119:48:119:70 | iterator(...) : Iterator [<element>] : Object | Test.java:119:48:119:77 | next(...) : Object | provenance | MaD:557 |
-| Test.java:119:48:119:70 | iterator(...) : Iterator [<element>] : Object | Test.java:119:48:119:77 | next(...) : Object | provenance | MaD:557 |
-| Test.java:119:48:119:70 | iterator(...) : Iterator [<element>] : Object | Test.java:119:48:119:77 | next(...) : Object | provenance | MaD:557 |
+| Test.java:119:48:119:59 | values(...) : Collection [<element>] : Comparable | Test.java:119:48:119:70 | iterator(...) : Iterator [<element>] : Comparable | provenance | MaD:558 |
+| Test.java:119:48:119:59 | values(...) : Collection [<element>] : Object | Test.java:119:48:119:70 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:558 |
+| Test.java:119:48:119:59 | values(...) : Collection [<element>] : Object | Test.java:119:48:119:70 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:558 |
+| Test.java:119:48:119:59 | values(...) : Collection [<element>] : Object | Test.java:119:48:119:70 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:558 |
+| Test.java:119:48:119:59 | values(...) : Collection [<element>] : Object | Test.java:119:48:119:70 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:558 |
+| Test.java:119:48:119:59 | values(...) : Collection [<element>] : Object | Test.java:119:48:119:70 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:558 |
+| Test.java:119:48:119:59 | values(...) : Collection [<element>] : Object | Test.java:119:48:119:70 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:558 |
+| Test.java:119:48:119:59 | values(...) : Collection [<element>] : Object | Test.java:119:48:119:70 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:558 |
+| Test.java:119:48:119:59 | values(...) : Collection [<element>] : Object | Test.java:119:48:119:70 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:558 |
+| Test.java:119:48:119:59 | values(...) : Collection [<element>] : Object | Test.java:119:48:119:70 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:558 |
+| Test.java:119:48:119:59 | values(...) : Collection [<element>] : Object | Test.java:119:48:119:70 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:558 |
+| Test.java:119:48:119:59 | values(...) : Collection [<element>] : Object | Test.java:119:48:119:70 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:558 |
+| Test.java:119:48:119:59 | values(...) : Collection [<element>] : Object | Test.java:119:48:119:70 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:558 |
+| Test.java:119:48:119:70 | iterator(...) : Iterator [<element>] : Comparable | Test.java:119:48:119:77 | next(...) : Comparable | provenance | MaD:560 |
+| Test.java:119:48:119:70 | iterator(...) : Iterator [<element>] : Object | Test.java:119:48:119:77 | next(...) : Object | provenance | MaD:560 |
+| Test.java:119:48:119:70 | iterator(...) : Iterator [<element>] : Object | Test.java:119:48:119:77 | next(...) : Object | provenance | MaD:560 |
+| Test.java:119:48:119:70 | iterator(...) : Iterator [<element>] : Object | Test.java:119:48:119:77 | next(...) : Object | provenance | MaD:560 |
+| Test.java:119:48:119:70 | iterator(...) : Iterator [<element>] : Object | Test.java:119:48:119:77 | next(...) : Object | provenance | MaD:560 |
+| Test.java:119:48:119:70 | iterator(...) : Iterator [<element>] : Object | Test.java:119:48:119:77 | next(...) : Object | provenance | MaD:560 |
+| Test.java:119:48:119:70 | iterator(...) : Iterator [<element>] : Object | Test.java:119:48:119:77 | next(...) : Object | provenance | MaD:560 |
+| Test.java:119:48:119:70 | iterator(...) : Iterator [<element>] : Object | Test.java:119:48:119:77 | next(...) : Object | provenance | MaD:560 |
+| Test.java:119:48:119:70 | iterator(...) : Iterator [<element>] : Object | Test.java:119:48:119:77 | next(...) : Object | provenance | MaD:560 |
+| Test.java:119:48:119:70 | iterator(...) : Iterator [<element>] : Object | Test.java:119:48:119:77 | next(...) : Object | provenance | MaD:560 |
+| Test.java:119:48:119:70 | iterator(...) : Iterator [<element>] : Object | Test.java:119:48:119:77 | next(...) : Object | provenance | MaD:560 |
+| Test.java:119:48:119:70 | iterator(...) : Iterator [<element>] : Object | Test.java:119:48:119:77 | next(...) : Object | provenance | MaD:560 |
+| Test.java:119:48:119:70 | iterator(...) : Iterator [<element>] : Object | Test.java:119:48:119:77 | next(...) : Object | provenance | MaD:560 |
 | Test.java:120:20:120:33 | t : ArrayTable [<map.value>] : Object | Test.java:120:45:120:45 | t : ArrayTable [<map.value>] : Object | provenance |  |
 | Test.java:120:20:120:33 | t : HashBasedTable [<map.value>] : Object | Test.java:120:45:120:45 | t : HashBasedTable [<map.value>] : Object | provenance |  |
 | Test.java:120:20:120:33 | t : ImmutableTable [<map.value>] : Object | Test.java:120:45:120:45 | t : ImmutableTable [<map.value>] : Object | provenance |  |
 | Test.java:120:20:120:33 | t : RowSortedTable [<map.value>] : Object | Test.java:120:45:120:45 | t : RowSortedTable [<map.value>] : Object | provenance |  |
 | Test.java:120:20:120:33 | t : Table [<map.value>] : Object | Test.java:120:45:120:45 | t : Table [<map.value>] : Object | provenance |  |
 | Test.java:120:20:120:33 | t : TreeBasedTable [<map.value>] : Object | Test.java:120:45:120:45 | t : TreeBasedTable [<map.value>] : Object | provenance |  |
-| Test.java:120:45:120:45 | t : ArrayTable [<map.value>] : Object | Test.java:120:45:120:54 | values(...) : Collection [<element>] : Object | provenance | MaD:525 |
-| Test.java:120:45:120:45 | t : HashBasedTable [<map.value>] : Object | Test.java:120:45:120:54 | values(...) : Collection [<element>] : Object | provenance | MaD:525 |
-| Test.java:120:45:120:45 | t : ImmutableTable [<map.value>] : Object | Test.java:120:45:120:54 | values(...) : Collection [<element>] : Object | provenance | MaD:525 |
-| Test.java:120:45:120:45 | t : RowSortedTable [<map.value>] : Object | Test.java:120:45:120:54 | values(...) : Collection [<element>] : Object | provenance | MaD:525 |
-| Test.java:120:45:120:45 | t : Table [<map.value>] : Object | Test.java:120:45:120:54 | values(...) : Collection [<element>] : Object | provenance | MaD:525 |
-| Test.java:120:45:120:45 | t : TreeBasedTable [<map.value>] : Object | Test.java:120:45:120:54 | values(...) : Collection [<element>] : Object | provenance | MaD:525 |
-| Test.java:120:45:120:54 | values(...) : Collection [<element>] : Object | Test.java:120:45:120:65 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:555 |
-| Test.java:120:45:120:54 | values(...) : Collection [<element>] : Object | Test.java:120:45:120:65 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:555 |
-| Test.java:120:45:120:54 | values(...) : Collection [<element>] : Object | Test.java:120:45:120:65 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:555 |
-| Test.java:120:45:120:54 | values(...) : Collection [<element>] : Object | Test.java:120:45:120:65 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:555 |
-| Test.java:120:45:120:54 | values(...) : Collection [<element>] : Object | Test.java:120:45:120:65 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:555 |
-| Test.java:120:45:120:54 | values(...) : Collection [<element>] : Object | Test.java:120:45:120:65 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:555 |
-| Test.java:120:45:120:65 | iterator(...) : Iterator [<element>] : Object | Test.java:120:45:120:72 | next(...) : Object | provenance | MaD:557 |
-| Test.java:120:45:120:65 | iterator(...) : Iterator [<element>] : Object | Test.java:120:45:120:72 | next(...) : Object | provenance | MaD:557 |
-| Test.java:120:45:120:65 | iterator(...) : Iterator [<element>] : Object | Test.java:120:45:120:72 | next(...) : Object | provenance | MaD:557 |
-| Test.java:120:45:120:65 | iterator(...) : Iterator [<element>] : Object | Test.java:120:45:120:72 | next(...) : Object | provenance | MaD:557 |
-| Test.java:120:45:120:65 | iterator(...) : Iterator [<element>] : Object | Test.java:120:45:120:72 | next(...) : Object | provenance | MaD:557 |
-| Test.java:120:45:120:65 | iterator(...) : Iterator [<element>] : Object | Test.java:120:45:120:72 | next(...) : Object | provenance | MaD:557 |
+| Test.java:120:45:120:45 | t : ArrayTable [<map.value>] : Object | Test.java:120:45:120:54 | values(...) : Collection [<element>] : Object | provenance | MaD:528 |
+| Test.java:120:45:120:45 | t : HashBasedTable [<map.value>] : Object | Test.java:120:45:120:54 | values(...) : Collection [<element>] : Object | provenance | MaD:528 |
+| Test.java:120:45:120:45 | t : ImmutableTable [<map.value>] : Object | Test.java:120:45:120:54 | values(...) : Collection [<element>] : Object | provenance | MaD:528 |
+| Test.java:120:45:120:45 | t : RowSortedTable [<map.value>] : Object | Test.java:120:45:120:54 | values(...) : Collection [<element>] : Object | provenance | MaD:528 |
+| Test.java:120:45:120:45 | t : Table [<map.value>] : Object | Test.java:120:45:120:54 | values(...) : Collection [<element>] : Object | provenance | MaD:528 |
+| Test.java:120:45:120:45 | t : TreeBasedTable [<map.value>] : Object | Test.java:120:45:120:54 | values(...) : Collection [<element>] : Object | provenance | MaD:528 |
+| Test.java:120:45:120:54 | values(...) : Collection [<element>] : Object | Test.java:120:45:120:65 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:558 |
+| Test.java:120:45:120:54 | values(...) : Collection [<element>] : Object | Test.java:120:45:120:65 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:558 |
+| Test.java:120:45:120:54 | values(...) : Collection [<element>] : Object | Test.java:120:45:120:65 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:558 |
+| Test.java:120:45:120:54 | values(...) : Collection [<element>] : Object | Test.java:120:45:120:65 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:558 |
+| Test.java:120:45:120:54 | values(...) : Collection [<element>] : Object | Test.java:120:45:120:65 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:558 |
+| Test.java:120:45:120:54 | values(...) : Collection [<element>] : Object | Test.java:120:45:120:65 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:558 |
+| Test.java:120:45:120:65 | iterator(...) : Iterator [<element>] : Object | Test.java:120:45:120:72 | next(...) : Object | provenance | MaD:560 |
+| Test.java:120:45:120:65 | iterator(...) : Iterator [<element>] : Object | Test.java:120:45:120:72 | next(...) : Object | provenance | MaD:560 |
+| Test.java:120:45:120:65 | iterator(...) : Iterator [<element>] : Object | Test.java:120:45:120:72 | next(...) : Object | provenance | MaD:560 |
+| Test.java:120:45:120:65 | iterator(...) : Iterator [<element>] : Object | Test.java:120:45:120:72 | next(...) : Object | provenance | MaD:560 |
+| Test.java:120:45:120:65 | iterator(...) : Iterator [<element>] : Object | Test.java:120:45:120:72 | next(...) : Object | provenance | MaD:560 |
+| Test.java:120:45:120:65 | iterator(...) : Iterator [<element>] : Object | Test.java:120:45:120:72 | next(...) : Object | provenance | MaD:560 |
 | Test.java:132:18:132:63 | (...)... : ImmutableMultimap [<map.key>] : Object | Test.java:133:35:133:36 | in : ImmutableMultimap [<map.key>] : Object | provenance |  |
 | Test.java:132:28:132:63 | of(...) : ImmutableMultimap [<map.key>] : Object | Test.java:132:18:132:63 | (...)... : ImmutableMultimap [<map.key>] : Object | provenance |  |
-| Test.java:132:49:132:56 | source(...) : Object | Test.java:132:28:132:63 | of(...) : ImmutableMultimap [<map.key>] : Object | provenance | MaD:103 |
+| Test.java:132:49:132:56 | source(...) : Object | Test.java:132:28:132:63 | of(...) : ImmutableMultimap [<map.key>] : Object | provenance | MaD:121 |
 | Test.java:133:10:133:37 | create(...) : ArrayListMultimap [<map.key>] : Object | Test.java:134:19:134:21 | out : ArrayListMultimap [<map.key>] : Object | provenance |  |
 | Test.java:133:35:133:36 | in : ImmutableMultimap [<map.key>] : Object | Test.java:133:10:133:37 | create(...) : ArrayListMultimap [<map.key>] : Object | provenance | MaD:2 |
 | Test.java:134:19:134:21 | out : ArrayListMultimap [<map.key>] : Object | Test.java:100:18:100:34 | map : ArrayListMultimap [<map.key>] : Object | provenance |  |
 | Test.java:134:19:134:21 | out : ArrayListMultimap [<map.key>] : Object | Test.java:134:9:134:22 | getMapKey(...) | provenance | MaD:373 |
 | Test.java:139:18:139:63 | (...)... : ImmutableMultimap [<map.value>] : Object | Test.java:140:35:140:36 | in : ImmutableMultimap [<map.value>] : Object | provenance |  |
 | Test.java:139:28:139:63 | of(...) : ImmutableMultimap [<map.value>] : Object | Test.java:139:18:139:63 | (...)... : ImmutableMultimap [<map.value>] : Object | provenance |  |
-| Test.java:139:55:139:62 | source(...) : Object | Test.java:139:28:139:63 | of(...) : ImmutableMultimap [<map.value>] : Object | provenance | MaD:104 |
+| Test.java:139:55:139:62 | source(...) : Object | Test.java:139:28:139:63 | of(...) : ImmutableMultimap [<map.value>] : Object | provenance | MaD:122 |
 | Test.java:140:10:140:37 | create(...) : ArrayListMultimap [<map.value>] : Object | Test.java:141:21:141:23 | out : ArrayListMultimap [<map.value>] : Object | provenance |  |
 | Test.java:140:35:140:36 | in : ImmutableMultimap [<map.value>] : Object | Test.java:140:10:140:37 | create(...) : ArrayListMultimap [<map.value>] : Object | provenance | MaD:3 |
 | Test.java:141:21:141:23 | out : ArrayListMultimap [<map.value>] : Object | Test.java:119:20:119:36 | map : ArrayListMultimap [<map.value>] : Object | provenance |  |
 | Test.java:141:21:141:23 | out : ArrayListMultimap [<map.value>] : Object | Test.java:141:9:141:24 | getMapValue(...) | provenance | MaD:385 |
 | Test.java:146:18:146:44 | (...)... : List [<element>] : Object | Test.java:147:28:147:29 | in : List [<element>] : Object | provenance |  |
 | Test.java:146:28:146:44 | of(...) : List [<element>] : Object | Test.java:146:18:146:44 | (...)... : List [<element>] : Object | provenance |  |
-| Test.java:146:36:146:43 | source(...) : Object | Test.java:146:28:146:44 | of(...) : List [<element>] : Object | provenance | MaD:558 |
+| Test.java:146:36:146:43 | source(...) : Object | Test.java:146:28:146:44 | of(...) : List [<element>] : Object | provenance | MaD:561 |
 | Test.java:147:10:147:36 | create(...) : ArrayTable [com.google.common.collect.Table.rowKey] : Object | Test.java:148:25:148:27 | out : ArrayTable [com.google.common.collect.Table.rowKey] : Object | provenance |  |
 | Test.java:147:28:147:29 | in : List [<element>] : Object | Test.java:147:10:147:36 | create(...) : ArrayTable [com.google.common.collect.Table.rowKey] : Object | provenance | MaD:4 |
 | Test.java:148:25:148:27 | out : ArrayTable [com.google.common.collect.Table.rowKey] : Object | Test.java:105:24:105:37 | t : ArrayTable [com.google.common.collect.Table.rowKey] : Object | provenance |  |
-| Test.java:148:25:148:27 | out : ArrayTable [com.google.common.collect.Table.rowKey] : Object | Test.java:148:9:148:28 | getTable_rowKey(...) | provenance | MaD:521 |
+| Test.java:148:25:148:27 | out : ArrayTable [com.google.common.collect.Table.rowKey] : Object | Test.java:148:9:148:28 | getTable_rowKey(...) | provenance | MaD:524 |
 | Test.java:153:18:153:44 | (...)... : List [<element>] : Object | Test.java:154:34:154:35 | in : List [<element>] : Object | provenance |  |
 | Test.java:153:28:153:44 | of(...) : List [<element>] : Object | Test.java:153:18:153:44 | (...)... : List [<element>] : Object | provenance |  |
-| Test.java:153:36:153:43 | source(...) : Object | Test.java:153:28:153:44 | of(...) : List [<element>] : Object | provenance | MaD:558 |
+| Test.java:153:36:153:43 | source(...) : Object | Test.java:153:28:153:44 | of(...) : List [<element>] : Object | provenance | MaD:561 |
 | Test.java:154:10:154:36 | create(...) : ArrayTable [com.google.common.collect.Table.columnKey] : Object | Test.java:155:28:155:30 | out : ArrayTable [com.google.common.collect.Table.columnKey] : Object | provenance |  |
 | Test.java:154:34:154:35 | in : List [<element>] : Object | Test.java:154:10:154:36 | create(...) : ArrayTable [com.google.common.collect.Table.columnKey] : Object | provenance | MaD:5 |
 | Test.java:155:28:155:30 | out : ArrayTable [com.google.common.collect.Table.columnKey] : Object | Test.java:96:27:96:40 | t : ArrayTable [com.google.common.collect.Table.columnKey] : Object | provenance |  |
-| Test.java:155:28:155:30 | out : ArrayTable [com.google.common.collect.Table.columnKey] : Object | Test.java:155:9:155:31 | getTable_columnKey(...) | provenance | MaD:507 |
+| Test.java:155:28:155:30 | out : ArrayTable [com.google.common.collect.Table.columnKey] : Object | Test.java:155:9:155:31 | getTable_columnKey(...) | provenance | MaD:510 |
 | Test.java:160:15:160:79 | (...)... : ArrayTable [<map.value>] : Object | Test.java:161:28:161:29 | in : ArrayTable [<map.value>] : Object | provenance |  |
 | Test.java:160:22:160:79 | create(...) : ArrayTable [<map.value>] : Object | Test.java:160:15:160:79 | (...)... : ArrayTable [<map.value>] : Object | provenance |  |
 | Test.java:160:40:160:78 | of(...) : ImmutableTable [<map.value>] : Object | Test.java:160:22:160:79 | create(...) : ArrayTable [<map.value>] : Object | provenance | MaD:6 |
-| Test.java:160:70:160:77 | source(...) : Object | Test.java:160:40:160:78 | of(...) : ImmutableTable [<map.value>] : Object | provenance | MaD:198 |
+| Test.java:160:70:160:77 | source(...) : Object | Test.java:160:40:160:78 | of(...) : ImmutableTable [<map.value>] : Object | provenance | MaD:215 |
 | Test.java:161:10:161:30 | create(...) : ArrayTable [<map.value>] : Object | Test.java:162:21:162:23 | out : ArrayTable [<map.value>] : Object | provenance |  |
 | Test.java:161:28:161:29 | in : ArrayTable [<map.value>] : Object | Test.java:161:10:161:30 | create(...) : ArrayTable [<map.value>] : Object | provenance | MaD:6 |
 | Test.java:162:21:162:23 | out : ArrayTable [<map.value>] : Object | Test.java:120:20:120:33 | t : ArrayTable [<map.value>] : Object | provenance |  |
-| Test.java:162:21:162:23 | out : ArrayTable [<map.value>] : Object | Test.java:162:9:162:24 | getMapValue(...) | provenance | MaD:525 |
+| Test.java:162:21:162:23 | out : ArrayTable [<map.value>] : Object | Test.java:162:9:162:24 | getMapValue(...) | provenance | MaD:528 |
 | Test.java:167:15:167:79 | (...)... : ArrayTable [com.google.common.collect.Table.columnKey] : Object | Test.java:168:28:168:29 | in : ArrayTable [com.google.common.collect.Table.columnKey] : Object | provenance |  |
 | Test.java:167:22:167:79 | create(...) : ArrayTable [com.google.common.collect.Table.columnKey] : Object | Test.java:167:15:167:79 | (...)... : ArrayTable [com.google.common.collect.Table.columnKey] : Object | provenance |  |
 | Test.java:167:40:167:78 | of(...) : ImmutableTable [com.google.common.collect.Table.columnKey] : Object | Test.java:167:22:167:79 | create(...) : ArrayTable [com.google.common.collect.Table.columnKey] : Object | provenance | MaD:7 |
-| Test.java:167:64:167:71 | source(...) : Object | Test.java:167:40:167:78 | of(...) : ImmutableTable [com.google.common.collect.Table.columnKey] : Object | provenance | MaD:197 |
+| Test.java:167:64:167:71 | source(...) : Object | Test.java:167:40:167:78 | of(...) : ImmutableTable [com.google.common.collect.Table.columnKey] : Object | provenance | MaD:214 |
 | Test.java:168:10:168:30 | create(...) : ArrayTable [com.google.common.collect.Table.columnKey] : Object | Test.java:169:28:169:30 | out : ArrayTable [com.google.common.collect.Table.columnKey] : Object | provenance |  |
 | Test.java:168:28:168:29 | in : ArrayTable [com.google.common.collect.Table.columnKey] : Object | Test.java:168:10:168:30 | create(...) : ArrayTable [com.google.common.collect.Table.columnKey] : Object | provenance | MaD:7 |
 | Test.java:169:28:169:30 | out : ArrayTable [com.google.common.collect.Table.columnKey] : Object | Test.java:96:27:96:40 | t : ArrayTable [com.google.common.collect.Table.columnKey] : Object | provenance |  |
-| Test.java:169:28:169:30 | out : ArrayTable [com.google.common.collect.Table.columnKey] : Object | Test.java:169:9:169:31 | getTable_columnKey(...) | provenance | MaD:507 |
+| Test.java:169:28:169:30 | out : ArrayTable [com.google.common.collect.Table.columnKey] : Object | Test.java:169:9:169:31 | getTable_columnKey(...) | provenance | MaD:510 |
 | Test.java:174:15:174:79 | (...)... : ArrayTable [com.google.common.collect.Table.rowKey] : Object | Test.java:175:28:175:29 | in : ArrayTable [com.google.common.collect.Table.rowKey] : Object | provenance |  |
 | Test.java:174:22:174:79 | create(...) : ArrayTable [com.google.common.collect.Table.rowKey] : Object | Test.java:174:15:174:79 | (...)... : ArrayTable [com.google.common.collect.Table.rowKey] : Object | provenance |  |
 | Test.java:174:40:174:78 | of(...) : ImmutableTable [com.google.common.collect.Table.rowKey] : Object | Test.java:174:22:174:79 | create(...) : ArrayTable [com.google.common.collect.Table.rowKey] : Object | provenance | MaD:8 |
-| Test.java:174:58:174:65 | source(...) : Object | Test.java:174:40:174:78 | of(...) : ImmutableTable [com.google.common.collect.Table.rowKey] : Object | provenance | MaD:196 |
+| Test.java:174:58:174:65 | source(...) : Object | Test.java:174:40:174:78 | of(...) : ImmutableTable [com.google.common.collect.Table.rowKey] : Object | provenance | MaD:213 |
 | Test.java:175:10:175:30 | create(...) : ArrayTable [com.google.common.collect.Table.rowKey] : Object | Test.java:176:25:176:27 | out : ArrayTable [com.google.common.collect.Table.rowKey] : Object | provenance |  |
 | Test.java:175:28:175:29 | in : ArrayTable [com.google.common.collect.Table.rowKey] : Object | Test.java:175:10:175:30 | create(...) : ArrayTable [com.google.common.collect.Table.rowKey] : Object | provenance | MaD:8 |
 | Test.java:176:25:176:27 | out : ArrayTable [com.google.common.collect.Table.rowKey] : Object | Test.java:105:24:105:37 | t : ArrayTable [com.google.common.collect.Table.rowKey] : Object | provenance |  |
-| Test.java:176:25:176:27 | out : ArrayTable [com.google.common.collect.Table.rowKey] : Object | Test.java:176:9:176:28 | getTable_rowKey(...) | provenance | MaD:521 |
+| Test.java:176:25:176:27 | out : ArrayTable [com.google.common.collect.Table.rowKey] : Object | Test.java:176:9:176:28 | getTable_rowKey(...) | provenance | MaD:524 |
 | Test.java:181:16:181:31 | (...)... : Object | Test.java:182:17:182:18 | in : Object | provenance |  |
 | Test.java:181:24:181:31 | source(...) : Object | Test.java:181:16:181:31 | (...)... : Object | provenance |  |
 | Test.java:182:4:182:6 | out [post update] : ImmutableBiMap [<map.key>] : Object | Test.java:183:19:183:21 | out : ImmutableBiMap [<map.key>] : Object | provenance |  |
 | Test.java:182:17:182:18 | in : Object | Test.java:182:4:182:6 | out [post update] : ImmutableBiMap [<map.key>] : Object | provenance | MaD:9 |
 | Test.java:183:19:183:21 | out : ImmutableBiMap [<map.key>] : Object | Test.java:99:18:99:29 | map : ImmutableBiMap [<map.key>] : Object | provenance |  |
-| Test.java:183:19:183:21 | out : ImmutableBiMap [<map.key>] : Object | Test.java:183:9:183:22 | getMapKey(...) | provenance | MaD:562 |
+| Test.java:183:19:183:21 | out : ImmutableBiMap [<map.key>] : Object | Test.java:183:9:183:22 | getMapKey(...) | provenance | MaD:569 |
 | Test.java:188:16:188:31 | (...)... : Object | Test.java:189:17:189:18 | in : Object | provenance |  |
 | Test.java:188:24:188:31 | source(...) : Object | Test.java:188:16:188:31 | (...)... : Object | provenance |  |
 | Test.java:189:4:189:6 | out [post update] : HashBiMap [<map.key>] : Object | Test.java:190:19:190:21 | out : HashBiMap [<map.key>] : Object | provenance |  |
 | Test.java:189:17:189:18 | in : Object | Test.java:189:4:189:6 | out [post update] : HashBiMap [<map.key>] : Object | provenance | MaD:9 |
 | Test.java:190:19:190:21 | out : HashBiMap [<map.key>] : Object | Test.java:99:18:99:29 | map : HashBiMap [<map.key>] : Object | provenance |  |
-| Test.java:190:19:190:21 | out : HashBiMap [<map.key>] : Object | Test.java:190:9:190:22 | getMapKey(...) | provenance | MaD:562 |
+| Test.java:190:19:190:21 | out : HashBiMap [<map.key>] : Object | Test.java:190:9:190:22 | getMapKey(...) | provenance | MaD:569 |
 | Test.java:195:16:195:31 | (...)... : Object | Test.java:196:17:196:18 | in : Object | provenance |  |
 | Test.java:195:24:195:31 | source(...) : Object | Test.java:195:16:195:31 | (...)... : Object | provenance |  |
 | Test.java:196:4:196:6 | out [post update] : BiMap [<map.key>] : Object | Test.java:197:19:197:21 | out : BiMap [<map.key>] : Object | provenance |  |
 | Test.java:196:17:196:18 | in : Object | Test.java:196:4:196:6 | out [post update] : BiMap [<map.key>] : Object | provenance | MaD:9 |
 | Test.java:197:19:197:21 | out : BiMap [<map.key>] : Object | Test.java:99:18:99:29 | map : BiMap [<map.key>] : Object | provenance |  |
-| Test.java:197:19:197:21 | out : BiMap [<map.key>] : Object | Test.java:197:9:197:22 | getMapKey(...) | provenance | MaD:562 |
+| Test.java:197:19:197:21 | out : BiMap [<map.key>] : Object | Test.java:197:9:197:22 | getMapKey(...) | provenance | MaD:569 |
 | Test.java:202:16:202:31 | (...)... : Object | Test.java:203:23:203:24 | in : Object | provenance |  |
 | Test.java:202:24:202:31 | source(...) : Object | Test.java:202:16:202:31 | (...)... : Object | provenance |  |
 | Test.java:203:4:203:6 | out [post update] : ImmutableBiMap [<map.value>] : Object | Test.java:204:21:204:23 | out : ImmutableBiMap [<map.value>] : Object | provenance |  |
 | Test.java:203:23:203:24 | in : Object | Test.java:203:4:203:6 | out [post update] : ImmutableBiMap [<map.value>] : Object | provenance | MaD:10 |
 | Test.java:204:21:204:23 | out : ImmutableBiMap [<map.value>] : Object | Test.java:118:20:118:31 | map : ImmutableBiMap [<map.value>] : Object | provenance |  |
-| Test.java:204:21:204:23 | out : ImmutableBiMap [<map.value>] : Object | Test.java:204:9:204:24 | getMapValue(...) | provenance | MaD:561 |
+| Test.java:204:21:204:23 | out : ImmutableBiMap [<map.value>] : Object | Test.java:204:9:204:24 | getMapValue(...) | provenance | MaD:568 |
 | Test.java:209:16:209:31 | (...)... : Object | Test.java:210:23:210:24 | in : Object | provenance |  |
 | Test.java:209:24:209:31 | source(...) : Object | Test.java:209:16:209:31 | (...)... : Object | provenance |  |
 | Test.java:210:4:210:6 | out [post update] : HashBiMap [<map.value>] : Object | Test.java:211:21:211:23 | out : HashBiMap [<map.value>] : Object | provenance |  |
 | Test.java:210:23:210:24 | in : Object | Test.java:210:4:210:6 | out [post update] : HashBiMap [<map.value>] : Object | provenance | MaD:10 |
 | Test.java:211:21:211:23 | out : HashBiMap [<map.value>] : Object | Test.java:118:20:118:31 | map : HashBiMap [<map.value>] : Object | provenance |  |
-| Test.java:211:21:211:23 | out : HashBiMap [<map.value>] : Object | Test.java:211:9:211:24 | getMapValue(...) | provenance | MaD:561 |
+| Test.java:211:21:211:23 | out : HashBiMap [<map.value>] : Object | Test.java:211:9:211:24 | getMapValue(...) | provenance | MaD:568 |
 | Test.java:216:16:216:31 | (...)... : Object | Test.java:217:23:217:24 | in : Object | provenance |  |
 | Test.java:216:24:216:31 | source(...) : Object | Test.java:216:16:216:31 | (...)... : Object | provenance |  |
 | Test.java:217:4:217:6 | out [post update] : BiMap [<map.value>] : Object | Test.java:218:21:218:23 | out : BiMap [<map.value>] : Object | provenance |  |
 | Test.java:217:23:217:24 | in : Object | Test.java:217:4:217:6 | out [post update] : BiMap [<map.value>] : Object | provenance | MaD:10 |
 | Test.java:218:21:218:23 | out : BiMap [<map.value>] : Object | Test.java:118:20:118:31 | map : BiMap [<map.value>] : Object | provenance |  |
-| Test.java:218:21:218:23 | out : BiMap [<map.value>] : Object | Test.java:218:9:218:24 | getMapValue(...) | provenance | MaD:561 |
+| Test.java:218:21:218:23 | out : BiMap [<map.value>] : Object | Test.java:218:9:218:24 | getMapValue(...) | provenance | MaD:568 |
 | Test.java:223:24:223:72 | (...)... : ImmutableBiMap [<map.key>] : Object | Test.java:224:10:224:11 | in : ImmutableBiMap [<map.key>] : Object | provenance |  |
 | Test.java:223:40:223:72 | of(...) : ImmutableBiMap [<map.key>] : Object | Test.java:223:24:223:72 | (...)... : ImmutableBiMap [<map.key>] : Object | provenance |  |
 | Test.java:223:58:223:65 | source(...) : Object | Test.java:223:40:223:72 | of(...) : ImmutableBiMap [<map.key>] : Object | provenance | MaD:29 |
 | Test.java:224:10:224:11 | in : ImmutableBiMap [<map.key>] : Object | Test.java:224:10:224:21 | inverse(...) : ImmutableBiMap [<map.value>] : Object | provenance | MaD:11 |
 | Test.java:224:10:224:21 | inverse(...) : ImmutableBiMap [<map.value>] : Object | Test.java:225:21:225:23 | out : ImmutableBiMap [<map.value>] : Object | provenance |  |
 | Test.java:225:21:225:23 | out : ImmutableBiMap [<map.value>] : Object | Test.java:118:20:118:31 | map : ImmutableBiMap [<map.value>] : Object | provenance |  |
-| Test.java:225:21:225:23 | out : ImmutableBiMap [<map.value>] : Object | Test.java:225:9:225:24 | getMapValue(...) | provenance | MaD:561 |
+| Test.java:225:21:225:23 | out : ImmutableBiMap [<map.value>] : Object | Test.java:225:9:225:24 | getMapValue(...) | provenance | MaD:568 |
 | Test.java:230:19:230:69 | (...)... : HashBiMap [<map.key>] : Object | Test.java:231:10:231:11 | in : HashBiMap [<map.key>] : Object | provenance |  |
 | Test.java:230:30:230:69 | create(...) : HashBiMap [<map.key>] : Object | Test.java:230:19:230:69 | (...)... : HashBiMap [<map.key>] : Object | provenance |  |
 | Test.java:230:47:230:68 | of(...) : Map [<map.key>] : Object | Test.java:230:30:230:69 | create(...) : HashBiMap [<map.key>] : Object | provenance | MaD:24 |
-| Test.java:230:54:230:61 | source(...) : Object | Test.java:230:47:230:68 | of(...) : Map [<map.key>] : Object | provenance | MaD:563 |
+| Test.java:230:54:230:61 | source(...) : Object | Test.java:230:47:230:68 | of(...) : Map [<map.key>] : Object | provenance | MaD:564 |
 | Test.java:231:10:231:11 | in : HashBiMap [<map.key>] : Object | Test.java:231:10:231:21 | inverse(...) : BiMap [<map.value>] : Object | provenance | MaD:11 |
 | Test.java:231:10:231:21 | inverse(...) : BiMap [<map.value>] : Object | Test.java:232:21:232:23 | out : BiMap [<map.value>] : Object | provenance |  |
 | Test.java:232:21:232:23 | out : BiMap [<map.value>] : Object | Test.java:118:20:118:31 | map : BiMap [<map.value>] : Object | provenance |  |
-| Test.java:232:21:232:23 | out : BiMap [<map.value>] : Object | Test.java:232:9:232:24 | getMapValue(...) | provenance | MaD:561 |
+| Test.java:232:21:232:23 | out : BiMap [<map.value>] : Object | Test.java:232:9:232:24 | getMapValue(...) | provenance | MaD:568 |
 | Test.java:237:15:237:54 | (...)... : ImmutableBiMap [<map.key>] : Object | Test.java:238:10:238:11 | in : ImmutableBiMap [<map.key>] : Object | provenance |  |
 | Test.java:237:22:237:54 | of(...) : ImmutableBiMap [<map.key>] : Object | Test.java:237:15:237:54 | (...)... : ImmutableBiMap [<map.key>] : Object | provenance |  |
 | Test.java:237:40:237:47 | source(...) : Object | Test.java:237:22:237:54 | of(...) : ImmutableBiMap [<map.key>] : Object | provenance | MaD:29 |
 | Test.java:238:10:238:11 | in : ImmutableBiMap [<map.key>] : Object | Test.java:238:10:238:21 | inverse(...) : BiMap [<map.value>] : Object | provenance | MaD:11 |
 | Test.java:238:10:238:21 | inverse(...) : BiMap [<map.value>] : Object | Test.java:239:21:239:23 | out : BiMap [<map.value>] : Object | provenance |  |
 | Test.java:239:21:239:23 | out : BiMap [<map.value>] : Object | Test.java:118:20:118:31 | map : BiMap [<map.value>] : Object | provenance |  |
-| Test.java:239:21:239:23 | out : BiMap [<map.value>] : Object | Test.java:239:9:239:24 | getMapValue(...) | provenance | MaD:561 |
+| Test.java:239:21:239:23 | out : BiMap [<map.value>] : Object | Test.java:239:9:239:24 | getMapValue(...) | provenance | MaD:568 |
 | Test.java:244:24:244:72 | (...)... : ImmutableBiMap [<map.value>] : Object | Test.java:245:10:245:11 | in : ImmutableBiMap [<map.value>] : Object | provenance |  |
 | Test.java:244:40:244:72 | of(...) : ImmutableBiMap [<map.value>] : Object | Test.java:244:24:244:72 | (...)... : ImmutableBiMap [<map.value>] : Object | provenance |  |
 | Test.java:244:64:244:71 | source(...) : Object | Test.java:244:40:244:72 | of(...) : ImmutableBiMap [<map.value>] : Object | provenance | MaD:30 |
 | Test.java:245:10:245:11 | in : ImmutableBiMap [<map.value>] : Object | Test.java:245:10:245:21 | inverse(...) : ImmutableBiMap [<map.key>] : Object | provenance | MaD:12 |
 | Test.java:245:10:245:21 | inverse(...) : ImmutableBiMap [<map.key>] : Object | Test.java:246:19:246:21 | out : ImmutableBiMap [<map.key>] : Object | provenance |  |
 | Test.java:246:19:246:21 | out : ImmutableBiMap [<map.key>] : Object | Test.java:99:18:99:29 | map : ImmutableBiMap [<map.key>] : Object | provenance |  |
-| Test.java:246:19:246:21 | out : ImmutableBiMap [<map.key>] : Object | Test.java:246:9:246:22 | getMapKey(...) | provenance | MaD:562 |
+| Test.java:246:19:246:21 | out : ImmutableBiMap [<map.key>] : Object | Test.java:246:9:246:22 | getMapKey(...) | provenance | MaD:569 |
 | Test.java:251:19:251:69 | (...)... : HashBiMap [<map.value>] : Object | Test.java:252:10:252:11 | in : HashBiMap [<map.value>] : Object | provenance |  |
 | Test.java:251:30:251:69 | create(...) : HashBiMap [<map.value>] : Object | Test.java:251:19:251:69 | (...)... : HashBiMap [<map.value>] : Object | provenance |  |
 | Test.java:251:47:251:68 | of(...) : Map [<map.value>] : Object | Test.java:251:30:251:69 | create(...) : HashBiMap [<map.value>] : Object | provenance | MaD:25 |
-| Test.java:251:60:251:67 | source(...) : Object | Test.java:251:47:251:68 | of(...) : Map [<map.value>] : Object | provenance | MaD:564 |
+| Test.java:251:60:251:67 | source(...) : Object | Test.java:251:47:251:68 | of(...) : Map [<map.value>] : Object | provenance | MaD:565 |
 | Test.java:252:10:252:11 | in : HashBiMap [<map.value>] : Object | Test.java:252:10:252:21 | inverse(...) : BiMap [<map.key>] : Object | provenance | MaD:12 |
 | Test.java:252:10:252:21 | inverse(...) : BiMap [<map.key>] : Object | Test.java:253:19:253:21 | out : BiMap [<map.key>] : Object | provenance |  |
 | Test.java:253:19:253:21 | out : BiMap [<map.key>] : Object | Test.java:99:18:99:29 | map : BiMap [<map.key>] : Object | provenance |  |
-| Test.java:253:19:253:21 | out : BiMap [<map.key>] : Object | Test.java:253:9:253:22 | getMapKey(...) | provenance | MaD:562 |
+| Test.java:253:19:253:21 | out : BiMap [<map.key>] : Object | Test.java:253:9:253:22 | getMapKey(...) | provenance | MaD:569 |
 | Test.java:258:15:258:54 | (...)... : ImmutableBiMap [<map.value>] : Object | Test.java:259:10:259:11 | in : ImmutableBiMap [<map.value>] : Object | provenance |  |
 | Test.java:258:22:258:54 | of(...) : ImmutableBiMap [<map.value>] : Object | Test.java:258:15:258:54 | (...)... : ImmutableBiMap [<map.value>] : Object | provenance |  |
 | Test.java:258:46:258:53 | source(...) : Object | Test.java:258:22:258:54 | of(...) : ImmutableBiMap [<map.value>] : Object | provenance | MaD:30 |
 | Test.java:259:10:259:11 | in : ImmutableBiMap [<map.value>] : Object | Test.java:259:10:259:21 | inverse(...) : BiMap [<map.key>] : Object | provenance | MaD:12 |
 | Test.java:259:10:259:21 | inverse(...) : BiMap [<map.key>] : Object | Test.java:260:19:260:21 | out : BiMap [<map.key>] : Object | provenance |  |
 | Test.java:260:19:260:21 | out : BiMap [<map.key>] : Object | Test.java:99:18:99:29 | map : BiMap [<map.key>] : Object | provenance |  |
-| Test.java:260:19:260:21 | out : BiMap [<map.key>] : Object | Test.java:260:9:260:22 | getMapKey(...) | provenance | MaD:562 |
+| Test.java:260:19:260:21 | out : BiMap [<map.key>] : Object | Test.java:260:9:260:22 | getMapKey(...) | provenance | MaD:569 |
 | Test.java:265:35:265:117 | (...)... : MutableClassToInstanceMap [<map.value>] : Object | Test.java:266:10:266:11 | in : MutableClassToInstanceMap [<map.value>] : Object | provenance |  |
 | Test.java:265:62:265:117 | create(...) : MutableClassToInstanceMap [<map.value>] : Object | Test.java:265:35:265:117 | (...)... : MutableClassToInstanceMap [<map.value>] : Object | provenance |  |
 | Test.java:265:95:265:116 | of(...) : Map [<map.value>] : Object | Test.java:265:62:265:117 | create(...) : MutableClassToInstanceMap [<map.value>] : Object | provenance | MaD:462 |
-| Test.java:265:108:265:115 | source(...) : Object | Test.java:265:95:265:116 | of(...) : Map [<map.value>] : Object | provenance | MaD:564 |
+| Test.java:265:108:265:115 | source(...) : Object | Test.java:265:95:265:116 | of(...) : Map [<map.value>] : Object | provenance | MaD:565 |
 | Test.java:266:10:266:11 | in : MutableClassToInstanceMap [<map.value>] : Object | Test.java:266:10:266:29 | getInstance(...) : Object | provenance | MaD:13 |
 | Test.java:266:10:266:29 | getInstance(...) : Object | Test.java:267:9:267:11 | out | provenance |  |
 | Test.java:272:37:272:111 | (...)... : ImmutableClassToInstanceMap [<map.value>] : Object | Test.java:273:10:273:11 | in : ImmutableClassToInstanceMap [<map.value>] : Object | provenance |  |
@@ -1344,1202 +1344,1202 @@ edges
 | Test.java:286:16:286:31 | (...)... : Object | Test.java:287:26:287:27 | in : Object | provenance |  |
 | Test.java:286:24:286:31 | source(...) : Object | Test.java:286:16:286:31 | (...)... : Object | provenance |  |
 | Test.java:287:4:287:6 | out [post update] : MutableClassToInstanceMap [<map.value>] : Object | Test.java:288:21:288:23 | out : MutableClassToInstanceMap [<map.value>] : Object | provenance |  |
-| Test.java:287:26:287:27 | in : Object | Test.java:287:4:287:6 | out [post update] : MutableClassToInstanceMap [<map.value>] : Object | provenance | MaD:15 |
+| Test.java:287:26:287:27 | in : Object | Test.java:287:4:287:6 | out [post update] : MutableClassToInstanceMap [<map.value>] : Object | provenance | MaD:14 |
 | Test.java:288:21:288:23 | out : MutableClassToInstanceMap [<map.value>] : Object | Test.java:118:20:118:31 | map : MutableClassToInstanceMap [<map.value>] : Object | provenance |  |
-| Test.java:288:21:288:23 | out : MutableClassToInstanceMap [<map.value>] : Object | Test.java:288:9:288:24 | getMapValue(...) | provenance | MaD:561 |
+| Test.java:288:21:288:23 | out : MutableClassToInstanceMap [<map.value>] : Object | Test.java:288:9:288:24 | getMapValue(...) | provenance | MaD:568 |
 | Test.java:293:16:293:31 | (...)... : Object | Test.java:294:26:294:27 | in : Object | provenance |  |
 | Test.java:293:24:293:31 | source(...) : Object | Test.java:293:16:293:31 | (...)... : Object | provenance |  |
 | Test.java:294:4:294:6 | out [post update] : ImmutableClassToInstanceMap [<map.value>] : Object | Test.java:295:21:295:23 | out : ImmutableClassToInstanceMap [<map.value>] : Object | provenance |  |
-| Test.java:294:26:294:27 | in : Object | Test.java:294:4:294:6 | out [post update] : ImmutableClassToInstanceMap [<map.value>] : Object | provenance | MaD:15 |
+| Test.java:294:26:294:27 | in : Object | Test.java:294:4:294:6 | out [post update] : ImmutableClassToInstanceMap [<map.value>] : Object | provenance | MaD:14 |
 | Test.java:295:21:295:23 | out : ImmutableClassToInstanceMap [<map.value>] : Object | Test.java:118:20:118:31 | map : ImmutableClassToInstanceMap [<map.value>] : Object | provenance |  |
-| Test.java:295:21:295:23 | out : ImmutableClassToInstanceMap [<map.value>] : Object | Test.java:295:9:295:24 | getMapValue(...) | provenance | MaD:561 |
+| Test.java:295:21:295:23 | out : ImmutableClassToInstanceMap [<map.value>] : Object | Test.java:295:9:295:24 | getMapValue(...) | provenance | MaD:568 |
 | Test.java:300:16:300:31 | (...)... : Object | Test.java:301:26:301:27 | in : Object | provenance |  |
 | Test.java:300:24:300:31 | source(...) : Object | Test.java:300:16:300:31 | (...)... : Object | provenance |  |
 | Test.java:301:4:301:6 | out [post update] : ClassToInstanceMap [<map.value>] : Object | Test.java:302:21:302:23 | out : ClassToInstanceMap [<map.value>] : Object | provenance |  |
-| Test.java:301:26:301:27 | in : Object | Test.java:301:4:301:6 | out [post update] : ClassToInstanceMap [<map.value>] : Object | provenance | MaD:15 |
+| Test.java:301:26:301:27 | in : Object | Test.java:301:4:301:6 | out [post update] : ClassToInstanceMap [<map.value>] : Object | provenance | MaD:14 |
 | Test.java:302:21:302:23 | out : ClassToInstanceMap [<map.value>] : Object | Test.java:118:20:118:31 | map : ClassToInstanceMap [<map.value>] : Object | provenance |  |
-| Test.java:302:21:302:23 | out : ClassToInstanceMap [<map.value>] : Object | Test.java:302:9:302:24 | getMapValue(...) | provenance | MaD:561 |
+| Test.java:302:21:302:23 | out : ClassToInstanceMap [<map.value>] : Object | Test.java:302:9:302:24 | getMapValue(...) | provenance | MaD:568 |
 | Test.java:307:35:307:117 | (...)... : MutableClassToInstanceMap [<map.value>] : Object | Test.java:308:10:308:11 | in : MutableClassToInstanceMap [<map.value>] : Object | provenance |  |
 | Test.java:307:62:307:117 | create(...) : MutableClassToInstanceMap [<map.value>] : Object | Test.java:307:35:307:117 | (...)... : MutableClassToInstanceMap [<map.value>] : Object | provenance |  |
 | Test.java:307:95:307:116 | of(...) : Map [<map.value>] : Object | Test.java:307:62:307:117 | create(...) : MutableClassToInstanceMap [<map.value>] : Object | provenance | MaD:462 |
-| Test.java:307:108:307:115 | source(...) : Object | Test.java:307:95:307:116 | of(...) : Map [<map.value>] : Object | provenance | MaD:564 |
-| Test.java:308:10:308:11 | in : MutableClassToInstanceMap [<map.value>] : Object | Test.java:308:10:308:35 | putInstance(...) : Object | provenance | MaD:14 |
+| Test.java:307:108:307:115 | source(...) : Object | Test.java:307:95:307:116 | of(...) : Map [<map.value>] : Object | provenance | MaD:565 |
+| Test.java:308:10:308:11 | in : MutableClassToInstanceMap [<map.value>] : Object | Test.java:308:10:308:35 | putInstance(...) : Object | provenance | MaD:15 |
 | Test.java:308:10:308:35 | putInstance(...) : Object | Test.java:309:9:309:11 | out | provenance |  |
 | Test.java:314:37:314:111 | (...)... : ImmutableClassToInstanceMap [<map.value>] : Object | Test.java:315:10:315:11 | in : ImmutableClassToInstanceMap [<map.value>] : Object | provenance |  |
 | Test.java:314:66:314:111 | of(...) : ImmutableClassToInstanceMap [<map.value>] : Object | Test.java:314:37:314:111 | (...)... : ImmutableClassToInstanceMap [<map.value>] : Object | provenance |  |
 | Test.java:314:103:314:110 | source(...) : Object | Test.java:314:66:314:111 | of(...) : ImmutableClassToInstanceMap [<map.value>] : Object | provenance | MaD:42 |
-| Test.java:315:10:315:11 | in : ImmutableClassToInstanceMap [<map.value>] : Object | Test.java:315:10:315:35 | putInstance(...) : Object | provenance | MaD:14 |
+| Test.java:315:10:315:11 | in : ImmutableClassToInstanceMap [<map.value>] : Object | Test.java:315:10:315:35 | putInstance(...) : Object | provenance | MaD:15 |
 | Test.java:315:10:315:35 | putInstance(...) : Object | Test.java:316:9:316:11 | out | provenance |  |
 | Test.java:321:28:321:93 | (...)... : ImmutableClassToInstanceMap [<map.value>] : Object | Test.java:322:10:322:11 | in : ImmutableClassToInstanceMap [<map.value>] : Object | provenance |  |
 | Test.java:321:48:321:93 | of(...) : ImmutableClassToInstanceMap [<map.value>] : Object | Test.java:321:28:321:93 | (...)... : ImmutableClassToInstanceMap [<map.value>] : Object | provenance |  |
 | Test.java:321:85:321:92 | source(...) : Object | Test.java:321:48:321:93 | of(...) : ImmutableClassToInstanceMap [<map.value>] : Object | provenance | MaD:42 |
-| Test.java:322:10:322:11 | in : ImmutableClassToInstanceMap [<map.value>] : Object | Test.java:322:10:322:35 | putInstance(...) : Object | provenance | MaD:14 |
+| Test.java:322:10:322:11 | in : ImmutableClassToInstanceMap [<map.value>] : Object | Test.java:322:10:322:35 | putInstance(...) : Object | provenance | MaD:15 |
 | Test.java:322:10:322:35 | putInstance(...) : Object | Test.java:323:9:323:11 | out | provenance |  |
 | Test.java:328:20:328:48 | (...)... : List [<element>] : Object | Test.java:329:30:329:31 | in : List [<element>] : Object | provenance |  |
 | Test.java:328:32:328:48 | of(...) : List [<element>] : Object | Test.java:328:20:328:48 | (...)... : List [<element>] : Object | provenance |  |
-| Test.java:328:40:328:47 | source(...) : Object | Test.java:328:32:328:48 | of(...) : List [<element>] : Object | provenance | MaD:558 |
+| Test.java:328:40:328:47 | source(...) : Object | Test.java:328:32:328:48 | of(...) : List [<element>] : Object | provenance | MaD:561 |
 | Test.java:329:10:329:38 | filter(...) : Collection [<element>] : Object | Test.java:330:20:330:22 | out : Collection [<element>] : Object | provenance |  |
 | Test.java:329:30:329:31 | in : List [<element>] : Object | Test.java:329:10:329:38 | filter(...) : Collection [<element>] : Object | provenance | MaD:16 |
 | Test.java:330:20:330:22 | out : Collection [<element>] : Object | Test.java:110:19:110:32 | it : Collection [<element>] : Object | provenance |  |
-| Test.java:330:20:330:22 | out : Collection [<element>] : Object | Test.java:330:9:330:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:330:20:330:22 | out : Collection [<element>] : Object | Test.java:330:9:330:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:335:18:335:44 | (...)... : List [<element>] : Object | Test.java:336:43:336:44 | in : List [<element>] : Object | provenance |  |
 | Test.java:335:28:335:44 | of(...) : List [<element>] : Object | Test.java:335:18:335:44 | (...)... : List [<element>] : Object | provenance |  |
-| Test.java:335:36:335:43 | source(...) : Object | Test.java:335:28:335:44 | of(...) : List [<element>] : Object | provenance | MaD:558 |
+| Test.java:335:36:335:43 | source(...) : Object | Test.java:335:28:335:44 | of(...) : List [<element>] : Object | provenance | MaD:561 |
 | Test.java:336:10:336:45 | orderedPermutations(...) : Collection [<element>, <element>] : Object | Test.java:337:31:337:33 | out : Collection [<element>, <element>] : Object | provenance |  |
 | Test.java:336:43:336:44 | in : List [<element>] : Object | Test.java:336:10:336:45 | orderedPermutations(...) : Collection [<element>, <element>] : Object | provenance | MaD:17 |
 | Test.java:337:20:337:34 | getElement(...) : List [<element>] : Object | Test.java:110:19:110:32 | it : List [<element>] : Object | provenance |  |
-| Test.java:337:20:337:34 | getElement(...) : List [<element>] : Object | Test.java:337:9:337:35 | getElement(...) | provenance | MaD:555 |
+| Test.java:337:20:337:34 | getElement(...) : List [<element>] : Object | Test.java:337:9:337:35 | getElement(...) | provenance | MaD:558 |
 | Test.java:337:31:337:33 | out : Collection [<element>, <element>] : Object | Test.java:110:19:110:32 | it : Collection [<element>, <element>] : Object | provenance |  |
-| Test.java:337:31:337:33 | out : Collection [<element>, <element>] : Object | Test.java:337:20:337:34 | getElement(...) : List [<element>] : Object | provenance | MaD:555 |
+| Test.java:337:31:337:33 | out : Collection [<element>, <element>] : Object | Test.java:337:20:337:34 | getElement(...) : List [<element>] : Object | provenance | MaD:558 |
 | Test.java:342:18:342:44 | (...)... : List [<element>] : Object | Test.java:343:43:343:44 | in : List [<element>] : Object | provenance |  |
 | Test.java:342:28:342:44 | of(...) : List [<element>] : Object | Test.java:342:18:342:44 | (...)... : List [<element>] : Object | provenance |  |
-| Test.java:342:36:342:43 | source(...) : Object | Test.java:342:28:342:44 | of(...) : List [<element>] : Object | provenance | MaD:558 |
+| Test.java:342:36:342:43 | source(...) : Object | Test.java:342:28:342:44 | of(...) : List [<element>] : Object | provenance | MaD:561 |
 | Test.java:343:10:343:51 | orderedPermutations(...) : Collection [<element>, <element>] : Object | Test.java:344:31:344:33 | out : Collection [<element>, <element>] : Object | provenance |  |
 | Test.java:343:43:343:44 | in : List [<element>] : Object | Test.java:343:10:343:51 | orderedPermutations(...) : Collection [<element>, <element>] : Object | provenance | MaD:18 |
 | Test.java:344:20:344:34 | getElement(...) : List [<element>] : Object | Test.java:110:19:110:32 | it : List [<element>] : Object | provenance |  |
-| Test.java:344:20:344:34 | getElement(...) : List [<element>] : Object | Test.java:344:9:344:35 | getElement(...) | provenance | MaD:555 |
+| Test.java:344:20:344:34 | getElement(...) : List [<element>] : Object | Test.java:344:9:344:35 | getElement(...) | provenance | MaD:558 |
 | Test.java:344:31:344:33 | out : Collection [<element>, <element>] : Object | Test.java:110:19:110:32 | it : Collection [<element>, <element>] : Object | provenance |  |
-| Test.java:344:31:344:33 | out : Collection [<element>, <element>] : Object | Test.java:344:20:344:34 | getElement(...) : List [<element>] : Object | provenance | MaD:555 |
+| Test.java:344:31:344:33 | out : Collection [<element>, <element>] : Object | Test.java:344:20:344:34 | getElement(...) : List [<element>] : Object | provenance | MaD:558 |
 | Test.java:349:20:349:48 | (...)... : List [<element>] : Object | Test.java:350:36:350:37 | in : List [<element>] : Object | provenance |  |
 | Test.java:349:32:349:48 | of(...) : List [<element>] : Object | Test.java:349:20:349:48 | (...)... : List [<element>] : Object | provenance |  |
-| Test.java:349:40:349:47 | source(...) : Object | Test.java:349:32:349:48 | of(...) : List [<element>] : Object | provenance | MaD:558 |
+| Test.java:349:40:349:47 | source(...) : Object | Test.java:349:32:349:48 | of(...) : List [<element>] : Object | provenance | MaD:561 |
 | Test.java:350:10:350:38 | permutations(...) : Collection [<element>, <element>] : Object | Test.java:351:31:351:33 | out : Collection [<element>, <element>] : Object | provenance |  |
 | Test.java:350:36:350:37 | in : List [<element>] : Object | Test.java:350:10:350:38 | permutations(...) : Collection [<element>, <element>] : Object | provenance | MaD:19 |
 | Test.java:351:20:351:34 | getElement(...) : List [<element>] : Object | Test.java:110:19:110:32 | it : List [<element>] : Object | provenance |  |
-| Test.java:351:20:351:34 | getElement(...) : List [<element>] : Object | Test.java:351:9:351:35 | getElement(...) | provenance | MaD:555 |
+| Test.java:351:20:351:34 | getElement(...) : List [<element>] : Object | Test.java:351:9:351:35 | getElement(...) | provenance | MaD:558 |
 | Test.java:351:31:351:33 | out : Collection [<element>, <element>] : Object | Test.java:110:19:110:32 | it : Collection [<element>, <element>] : Object | provenance |  |
-| Test.java:351:31:351:33 | out : Collection [<element>, <element>] : Object | Test.java:351:20:351:34 | getElement(...) : List [<element>] : Object | provenance | MaD:555 |
+| Test.java:351:31:351:33 | out : Collection [<element>, <element>] : Object | Test.java:351:20:351:34 | getElement(...) : List [<element>] : Object | provenance | MaD:558 |
 | Test.java:356:18:356:44 | (...)... : List [<element>] : Object | Test.java:357:40:357:41 | in : List [<element>] : Object | provenance |  |
 | Test.java:356:28:356:44 | of(...) : List [<element>] : Object | Test.java:356:18:356:44 | (...)... : List [<element>] : Object | provenance |  |
-| Test.java:356:36:356:43 | source(...) : Object | Test.java:356:28:356:44 | of(...) : List [<element>] : Object | provenance | MaD:558 |
+| Test.java:356:36:356:43 | source(...) : Object | Test.java:356:28:356:44 | of(...) : List [<element>] : Object | provenance | MaD:561 |
 | Test.java:357:10:357:42 | create(...) : ConcurrentHashMultiset [<element>] : Object | Test.java:358:20:358:22 | out : ConcurrentHashMultiset [<element>] : Object | provenance |  |
 | Test.java:357:40:357:41 | in : List [<element>] : Object | Test.java:357:10:357:42 | create(...) : ConcurrentHashMultiset [<element>] : Object | provenance | MaD:20 |
 | Test.java:358:20:358:22 | out : ConcurrentHashMultiset [<element>] : Object | Test.java:110:19:110:32 | it : ConcurrentHashMultiset [<element>] : Object | provenance |  |
-| Test.java:358:20:358:22 | out : ConcurrentHashMultiset [<element>] : Object | Test.java:358:9:358:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:358:20:358:22 | out : ConcurrentHashMultiset [<element>] : Object | Test.java:358:9:358:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:363:15:363:51 | (...)... : TreeBasedTable [<map.value>] : Object | Test.java:364:32:364:33 | in : TreeBasedTable [<map.value>] : Object | provenance |  |
 | Test.java:363:22:363:51 | newTable(...) : TreeBasedTable [<map.value>] : Object | Test.java:363:15:363:51 | (...)... : TreeBasedTable [<map.value>] : Object | provenance |  |
 | Test.java:363:43:363:50 | source(...) : Object | Test.java:103:58:103:64 | value : Object | provenance |  |
-| Test.java:363:43:363:50 | source(...) : Object | Test.java:363:22:363:51 | newTable(...) : TreeBasedTable [<map.value>] : Object | provenance | MaD:514 |
+| Test.java:363:43:363:50 | source(...) : Object | Test.java:363:22:363:51 | newTable(...) : TreeBasedTable [<map.value>] : Object | provenance | MaD:517 |
 | Test.java:364:10:364:34 | create(...) : HashBasedTable [<map.value>] : Object | Test.java:365:21:365:23 | out : HashBasedTable [<map.value>] : Object | provenance |  |
 | Test.java:364:32:364:33 | in : TreeBasedTable [<map.value>] : Object | Test.java:364:10:364:34 | create(...) : HashBasedTable [<map.value>] : Object | provenance | MaD:21 |
 | Test.java:365:21:365:23 | out : HashBasedTable [<map.value>] : Object | Test.java:120:20:120:33 | t : HashBasedTable [<map.value>] : Object | provenance |  |
-| Test.java:365:21:365:23 | out : HashBasedTable [<map.value>] : Object | Test.java:365:9:365:24 | getMapValue(...) | provenance | MaD:525 |
+| Test.java:365:21:365:23 | out : HashBasedTable [<map.value>] : Object | Test.java:365:9:365:24 | getMapValue(...) | provenance | MaD:528 |
 | Test.java:370:15:370:51 | (...)... : TreeBasedTable [com.google.common.collect.Table.columnKey] : Object | Test.java:371:32:371:33 | in : TreeBasedTable [com.google.common.collect.Table.columnKey] : Object | provenance |  |
 | Test.java:370:22:370:51 | newTable(...) : TreeBasedTable [com.google.common.collect.Table.columnKey] : Object | Test.java:370:15:370:51 | (...)... : TreeBasedTable [com.google.common.collect.Table.columnKey] : Object | provenance |  |
 | Test.java:370:37:370:44 | source(...) : Object | Test.java:103:48:103:55 | column : Object | provenance |  |
-| Test.java:370:37:370:44 | source(...) : Object | Test.java:370:22:370:51 | newTable(...) : TreeBasedTable [com.google.common.collect.Table.columnKey] : Object | provenance | MaD:513 |
+| Test.java:370:37:370:44 | source(...) : Object | Test.java:370:22:370:51 | newTable(...) : TreeBasedTable [com.google.common.collect.Table.columnKey] : Object | provenance | MaD:516 |
 | Test.java:371:10:371:34 | create(...) : HashBasedTable [com.google.common.collect.Table.columnKey] : Object | Test.java:372:28:372:30 | out : HashBasedTable [com.google.common.collect.Table.columnKey] : Object | provenance |  |
 | Test.java:371:32:371:33 | in : TreeBasedTable [com.google.common.collect.Table.columnKey] : Object | Test.java:371:10:371:34 | create(...) : HashBasedTable [com.google.common.collect.Table.columnKey] : Object | provenance | MaD:22 |
 | Test.java:372:28:372:30 | out : HashBasedTable [com.google.common.collect.Table.columnKey] : Object | Test.java:96:27:96:40 | t : HashBasedTable [com.google.common.collect.Table.columnKey] : Object | provenance |  |
-| Test.java:372:28:372:30 | out : HashBasedTable [com.google.common.collect.Table.columnKey] : Object | Test.java:372:9:372:31 | getTable_columnKey(...) | provenance | MaD:507 |
+| Test.java:372:28:372:30 | out : HashBasedTable [com.google.common.collect.Table.columnKey] : Object | Test.java:372:9:372:31 | getTable_columnKey(...) | provenance | MaD:510 |
 | Test.java:377:15:377:51 | (...)... : TreeBasedTable [com.google.common.collect.Table.rowKey] : Object | Test.java:378:32:378:33 | in : TreeBasedTable [com.google.common.collect.Table.rowKey] : Object | provenance |  |
 | Test.java:377:22:377:51 | newTable(...) : TreeBasedTable [com.google.common.collect.Table.rowKey] : Object | Test.java:377:15:377:51 | (...)... : TreeBasedTable [com.google.common.collect.Table.rowKey] : Object | provenance |  |
 | Test.java:377:31:377:38 | source(...) : Object | Test.java:103:41:103:45 | row : Object | provenance |  |
-| Test.java:377:31:377:38 | source(...) : Object | Test.java:377:22:377:51 | newTable(...) : TreeBasedTable [com.google.common.collect.Table.rowKey] : Object | provenance | MaD:512 |
+| Test.java:377:31:377:38 | source(...) : Object | Test.java:377:22:377:51 | newTable(...) : TreeBasedTable [com.google.common.collect.Table.rowKey] : Object | provenance | MaD:515 |
 | Test.java:378:10:378:34 | create(...) : HashBasedTable [com.google.common.collect.Table.rowKey] : Object | Test.java:379:25:379:27 | out : HashBasedTable [com.google.common.collect.Table.rowKey] : Object | provenance |  |
 | Test.java:378:32:378:33 | in : TreeBasedTable [com.google.common.collect.Table.rowKey] : Object | Test.java:378:10:378:34 | create(...) : HashBasedTable [com.google.common.collect.Table.rowKey] : Object | provenance | MaD:23 |
 | Test.java:379:25:379:27 | out : HashBasedTable [com.google.common.collect.Table.rowKey] : Object | Test.java:105:24:105:37 | t : HashBasedTable [com.google.common.collect.Table.rowKey] : Object | provenance |  |
-| Test.java:379:25:379:27 | out : HashBasedTable [com.google.common.collect.Table.rowKey] : Object | Test.java:379:9:379:28 | getTable_rowKey(...) | provenance | MaD:521 |
+| Test.java:379:25:379:27 | out : HashBasedTable [com.google.common.collect.Table.rowKey] : Object | Test.java:379:9:379:28 | getTable_rowKey(...) | provenance | MaD:524 |
 | Test.java:384:13:384:39 | (...)... : Map [<map.key>] : Object | Test.java:385:27:385:28 | in : Map [<map.key>] : Object | provenance |  |
 | Test.java:384:18:384:39 | of(...) : Map [<map.key>] : Object | Test.java:384:13:384:39 | (...)... : Map [<map.key>] : Object | provenance |  |
-| Test.java:384:25:384:32 | source(...) : Object | Test.java:384:18:384:39 | of(...) : Map [<map.key>] : Object | provenance | MaD:563 |
+| Test.java:384:25:384:32 | source(...) : Object | Test.java:384:18:384:39 | of(...) : Map [<map.key>] : Object | provenance | MaD:564 |
 | Test.java:385:10:385:29 | create(...) : HashBiMap [<map.key>] : Object | Test.java:386:19:386:21 | out : HashBiMap [<map.key>] : Object | provenance |  |
 | Test.java:385:27:385:28 | in : Map [<map.key>] : Object | Test.java:385:10:385:29 | create(...) : HashBiMap [<map.key>] : Object | provenance | MaD:24 |
 | Test.java:386:19:386:21 | out : HashBiMap [<map.key>] : Object | Test.java:99:18:99:29 | map : HashBiMap [<map.key>] : Object | provenance |  |
-| Test.java:386:19:386:21 | out : HashBiMap [<map.key>] : Object | Test.java:386:9:386:22 | getMapKey(...) | provenance | MaD:562 |
+| Test.java:386:19:386:21 | out : HashBiMap [<map.key>] : Object | Test.java:386:9:386:22 | getMapKey(...) | provenance | MaD:569 |
 | Test.java:391:13:391:39 | (...)... : Map [<map.value>] : Object | Test.java:392:27:392:28 | in : Map [<map.value>] : Object | provenance |  |
 | Test.java:391:18:391:39 | of(...) : Map [<map.value>] : Object | Test.java:391:13:391:39 | (...)... : Map [<map.value>] : Object | provenance |  |
-| Test.java:391:31:391:38 | source(...) : Object | Test.java:391:18:391:39 | of(...) : Map [<map.value>] : Object | provenance | MaD:564 |
+| Test.java:391:31:391:38 | source(...) : Object | Test.java:391:18:391:39 | of(...) : Map [<map.value>] : Object | provenance | MaD:565 |
 | Test.java:392:10:392:29 | create(...) : HashBiMap [<map.value>] : Object | Test.java:393:21:393:23 | out : HashBiMap [<map.value>] : Object | provenance |  |
 | Test.java:392:27:392:28 | in : Map [<map.value>] : Object | Test.java:392:10:392:29 | create(...) : HashBiMap [<map.value>] : Object | provenance | MaD:25 |
 | Test.java:393:21:393:23 | out : HashBiMap [<map.value>] : Object | Test.java:118:20:118:31 | map : HashBiMap [<map.value>] : Object | provenance |  |
-| Test.java:393:21:393:23 | out : HashBiMap [<map.value>] : Object | Test.java:393:9:393:24 | getMapValue(...) | provenance | MaD:561 |
+| Test.java:393:21:393:23 | out : HashBiMap [<map.value>] : Object | Test.java:393:9:393:24 | getMapValue(...) | provenance | MaD:568 |
 | Test.java:398:18:398:63 | (...)... : ImmutableMultimap [<map.key>] : Object | Test.java:399:30:399:31 | in : ImmutableMultimap [<map.key>] : Object | provenance |  |
 | Test.java:398:28:398:63 | of(...) : ImmutableMultimap [<map.key>] : Object | Test.java:398:18:398:63 | (...)... : ImmutableMultimap [<map.key>] : Object | provenance |  |
-| Test.java:398:49:398:56 | source(...) : Object | Test.java:398:28:398:63 | of(...) : ImmutableMultimap [<map.key>] : Object | provenance | MaD:103 |
+| Test.java:398:49:398:56 | source(...) : Object | Test.java:398:28:398:63 | of(...) : ImmutableMultimap [<map.key>] : Object | provenance | MaD:121 |
 | Test.java:399:10:399:32 | create(...) : HashMultimap [<map.key>] : Object | Test.java:400:19:400:21 | out : HashMultimap [<map.key>] : Object | provenance |  |
 | Test.java:399:30:399:31 | in : ImmutableMultimap [<map.key>] : Object | Test.java:399:10:399:32 | create(...) : HashMultimap [<map.key>] : Object | provenance | MaD:26 |
 | Test.java:400:19:400:21 | out : HashMultimap [<map.key>] : Object | Test.java:100:18:100:34 | map : HashMultimap [<map.key>] : Object | provenance |  |
 | Test.java:400:19:400:21 | out : HashMultimap [<map.key>] : Object | Test.java:400:9:400:22 | getMapKey(...) | provenance | MaD:373 |
 | Test.java:405:18:405:63 | (...)... : ImmutableMultimap [<map.value>] : Object | Test.java:406:30:406:31 | in : ImmutableMultimap [<map.value>] : Object | provenance |  |
 | Test.java:405:28:405:63 | of(...) : ImmutableMultimap [<map.value>] : Object | Test.java:405:18:405:63 | (...)... : ImmutableMultimap [<map.value>] : Object | provenance |  |
-| Test.java:405:55:405:62 | source(...) : Object | Test.java:405:28:405:63 | of(...) : ImmutableMultimap [<map.value>] : Object | provenance | MaD:104 |
+| Test.java:405:55:405:62 | source(...) : Object | Test.java:405:28:405:63 | of(...) : ImmutableMultimap [<map.value>] : Object | provenance | MaD:122 |
 | Test.java:406:10:406:32 | create(...) : HashMultimap [<map.value>] : Object | Test.java:407:21:407:23 | out : HashMultimap [<map.value>] : Object | provenance |  |
 | Test.java:406:30:406:31 | in : ImmutableMultimap [<map.value>] : Object | Test.java:406:10:406:32 | create(...) : HashMultimap [<map.value>] : Object | provenance | MaD:27 |
 | Test.java:407:21:407:23 | out : HashMultimap [<map.value>] : Object | Test.java:119:20:119:36 | map : HashMultimap [<map.value>] : Object | provenance |  |
 | Test.java:407:21:407:23 | out : HashMultimap [<map.value>] : Object | Test.java:407:9:407:24 | getMapValue(...) | provenance | MaD:385 |
 | Test.java:412:18:412:44 | (...)... : List [<element>] : Object | Test.java:413:30:413:31 | in : List [<element>] : Object | provenance |  |
 | Test.java:412:28:412:44 | of(...) : List [<element>] : Object | Test.java:412:18:412:44 | (...)... : List [<element>] : Object | provenance |  |
-| Test.java:412:36:412:43 | source(...) : Object | Test.java:412:28:412:44 | of(...) : List [<element>] : Object | provenance | MaD:558 |
+| Test.java:412:36:412:43 | source(...) : Object | Test.java:412:28:412:44 | of(...) : List [<element>] : Object | provenance | MaD:561 |
 | Test.java:413:10:413:32 | create(...) : HashMultiset [<element>] : Object | Test.java:414:20:414:22 | out : HashMultiset [<element>] : Object | provenance |  |
 | Test.java:413:30:413:31 | in : List [<element>] : Object | Test.java:413:10:413:32 | create(...) : HashMultiset [<element>] : Object | provenance | MaD:28 |
 | Test.java:414:20:414:22 | out : HashMultiset [<element>] : Object | Test.java:110:19:110:32 | it : HashMultiset [<element>] : Object | provenance |  |
-| Test.java:414:20:414:22 | out : HashMultiset [<element>] : Object | Test.java:414:9:414:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:414:20:414:22 | out : HashMultiset [<element>] : Object | Test.java:414:9:414:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:419:16:419:31 | (...)... : Object | Test.java:420:28:420:29 | in : Object | provenance |  |
 | Test.java:419:24:419:31 | source(...) : Object | Test.java:419:16:419:31 | (...)... : Object | provenance |  |
 | Test.java:420:10:420:84 | of(...) : ImmutableBiMap [<map.key>] : Object | Test.java:421:19:421:21 | out : ImmutableBiMap [<map.key>] : Object | provenance |  |
 | Test.java:420:28:420:29 | in : Object | Test.java:420:10:420:84 | of(...) : ImmutableBiMap [<map.key>] : Object | provenance | MaD:29 |
 | Test.java:421:19:421:21 | out : ImmutableBiMap [<map.key>] : Object | Test.java:99:18:99:29 | map : ImmutableBiMap [<map.key>] : Object | provenance |  |
-| Test.java:421:19:421:21 | out : ImmutableBiMap [<map.key>] : Object | Test.java:421:9:421:22 | getMapKey(...) | provenance | MaD:562 |
+| Test.java:421:19:421:21 | out : ImmutableBiMap [<map.key>] : Object | Test.java:421:9:421:22 | getMapKey(...) | provenance | MaD:569 |
 | Test.java:426:16:426:31 | (...)... : Object | Test.java:427:28:427:29 | in : Object | provenance |  |
 | Test.java:426:24:426:31 | source(...) : Object | Test.java:426:16:426:31 | (...)... : Object | provenance |  |
 | Test.java:427:10:427:72 | of(...) : ImmutableBiMap [<map.key>] : Object | Test.java:428:19:428:21 | out : ImmutableBiMap [<map.key>] : Object | provenance |  |
 | Test.java:427:28:427:29 | in : Object | Test.java:427:10:427:72 | of(...) : ImmutableBiMap [<map.key>] : Object | provenance | MaD:29 |
 | Test.java:428:19:428:21 | out : ImmutableBiMap [<map.key>] : Object | Test.java:99:18:99:29 | map : ImmutableBiMap [<map.key>] : Object | provenance |  |
-| Test.java:428:19:428:21 | out : ImmutableBiMap [<map.key>] : Object | Test.java:428:9:428:22 | getMapKey(...) | provenance | MaD:562 |
+| Test.java:428:19:428:21 | out : ImmutableBiMap [<map.key>] : Object | Test.java:428:9:428:22 | getMapKey(...) | provenance | MaD:569 |
 | Test.java:433:16:433:31 | (...)... : Object | Test.java:434:28:434:29 | in : Object | provenance |  |
 | Test.java:433:24:433:31 | source(...) : Object | Test.java:433:16:433:31 | (...)... : Object | provenance |  |
 | Test.java:434:10:434:60 | of(...) : ImmutableBiMap [<map.key>] : Object | Test.java:435:19:435:21 | out : ImmutableBiMap [<map.key>] : Object | provenance |  |
 | Test.java:434:28:434:29 | in : Object | Test.java:434:10:434:60 | of(...) : ImmutableBiMap [<map.key>] : Object | provenance | MaD:29 |
 | Test.java:435:19:435:21 | out : ImmutableBiMap [<map.key>] : Object | Test.java:99:18:99:29 | map : ImmutableBiMap [<map.key>] : Object | provenance |  |
-| Test.java:435:19:435:21 | out : ImmutableBiMap [<map.key>] : Object | Test.java:435:9:435:22 | getMapKey(...) | provenance | MaD:562 |
+| Test.java:435:19:435:21 | out : ImmutableBiMap [<map.key>] : Object | Test.java:435:9:435:22 | getMapKey(...) | provenance | MaD:569 |
 | Test.java:440:16:440:31 | (...)... : Object | Test.java:441:28:441:29 | in : Object | provenance |  |
 | Test.java:440:24:440:31 | source(...) : Object | Test.java:440:16:440:31 | (...)... : Object | provenance |  |
 | Test.java:441:10:441:48 | of(...) : ImmutableBiMap [<map.key>] : Object | Test.java:442:19:442:21 | out : ImmutableBiMap [<map.key>] : Object | provenance |  |
 | Test.java:441:28:441:29 | in : Object | Test.java:441:10:441:48 | of(...) : ImmutableBiMap [<map.key>] : Object | provenance | MaD:29 |
 | Test.java:442:19:442:21 | out : ImmutableBiMap [<map.key>] : Object | Test.java:99:18:99:29 | map : ImmutableBiMap [<map.key>] : Object | provenance |  |
-| Test.java:442:19:442:21 | out : ImmutableBiMap [<map.key>] : Object | Test.java:442:9:442:22 | getMapKey(...) | provenance | MaD:562 |
+| Test.java:442:19:442:21 | out : ImmutableBiMap [<map.key>] : Object | Test.java:442:9:442:22 | getMapKey(...) | provenance | MaD:569 |
 | Test.java:447:16:447:31 | (...)... : Object | Test.java:448:28:448:29 | in : Object | provenance |  |
 | Test.java:447:24:447:31 | source(...) : Object | Test.java:447:16:447:31 | (...)... : Object | provenance |  |
 | Test.java:448:10:448:36 | of(...) : ImmutableBiMap [<map.key>] : Object | Test.java:449:19:449:21 | out : ImmutableBiMap [<map.key>] : Object | provenance |  |
 | Test.java:448:28:448:29 | in : Object | Test.java:448:10:448:36 | of(...) : ImmutableBiMap [<map.key>] : Object | provenance | MaD:29 |
 | Test.java:449:19:449:21 | out : ImmutableBiMap [<map.key>] : Object | Test.java:99:18:99:29 | map : ImmutableBiMap [<map.key>] : Object | provenance |  |
-| Test.java:449:19:449:21 | out : ImmutableBiMap [<map.key>] : Object | Test.java:449:9:449:22 | getMapKey(...) | provenance | MaD:562 |
+| Test.java:449:19:449:21 | out : ImmutableBiMap [<map.key>] : Object | Test.java:449:9:449:22 | getMapKey(...) | provenance | MaD:569 |
 | Test.java:454:16:454:31 | (...)... : Object | Test.java:455:34:455:35 | in : Object | provenance |  |
 | Test.java:454:24:454:31 | source(...) : Object | Test.java:454:16:454:31 | (...)... : Object | provenance |  |
 | Test.java:455:10:455:84 | of(...) : ImmutableBiMap [<map.value>] : Object | Test.java:456:21:456:23 | out : ImmutableBiMap [<map.value>] : Object | provenance |  |
 | Test.java:455:34:455:35 | in : Object | Test.java:455:10:455:84 | of(...) : ImmutableBiMap [<map.value>] : Object | provenance | MaD:30 |
 | Test.java:456:21:456:23 | out : ImmutableBiMap [<map.value>] : Object | Test.java:118:20:118:31 | map : ImmutableBiMap [<map.value>] : Object | provenance |  |
-| Test.java:456:21:456:23 | out : ImmutableBiMap [<map.value>] : Object | Test.java:456:9:456:24 | getMapValue(...) | provenance | MaD:561 |
+| Test.java:456:21:456:23 | out : ImmutableBiMap [<map.value>] : Object | Test.java:456:9:456:24 | getMapValue(...) | provenance | MaD:568 |
 | Test.java:461:16:461:31 | (...)... : Object | Test.java:462:34:462:35 | in : Object | provenance |  |
 | Test.java:461:24:461:31 | source(...) : Object | Test.java:461:16:461:31 | (...)... : Object | provenance |  |
 | Test.java:462:10:462:72 | of(...) : ImmutableBiMap [<map.value>] : Object | Test.java:463:21:463:23 | out : ImmutableBiMap [<map.value>] : Object | provenance |  |
 | Test.java:462:34:462:35 | in : Object | Test.java:462:10:462:72 | of(...) : ImmutableBiMap [<map.value>] : Object | provenance | MaD:30 |
 | Test.java:463:21:463:23 | out : ImmutableBiMap [<map.value>] : Object | Test.java:118:20:118:31 | map : ImmutableBiMap [<map.value>] : Object | provenance |  |
-| Test.java:463:21:463:23 | out : ImmutableBiMap [<map.value>] : Object | Test.java:463:9:463:24 | getMapValue(...) | provenance | MaD:561 |
+| Test.java:463:21:463:23 | out : ImmutableBiMap [<map.value>] : Object | Test.java:463:9:463:24 | getMapValue(...) | provenance | MaD:568 |
 | Test.java:468:16:468:31 | (...)... : Object | Test.java:469:34:469:35 | in : Object | provenance |  |
 | Test.java:468:24:468:31 | source(...) : Object | Test.java:468:16:468:31 | (...)... : Object | provenance |  |
 | Test.java:469:10:469:60 | of(...) : ImmutableBiMap [<map.value>] : Object | Test.java:470:21:470:23 | out : ImmutableBiMap [<map.value>] : Object | provenance |  |
 | Test.java:469:34:469:35 | in : Object | Test.java:469:10:469:60 | of(...) : ImmutableBiMap [<map.value>] : Object | provenance | MaD:30 |
 | Test.java:470:21:470:23 | out : ImmutableBiMap [<map.value>] : Object | Test.java:118:20:118:31 | map : ImmutableBiMap [<map.value>] : Object | provenance |  |
-| Test.java:470:21:470:23 | out : ImmutableBiMap [<map.value>] : Object | Test.java:470:9:470:24 | getMapValue(...) | provenance | MaD:561 |
+| Test.java:470:21:470:23 | out : ImmutableBiMap [<map.value>] : Object | Test.java:470:9:470:24 | getMapValue(...) | provenance | MaD:568 |
 | Test.java:475:16:475:31 | (...)... : Object | Test.java:476:34:476:35 | in : Object | provenance |  |
 | Test.java:475:24:475:31 | source(...) : Object | Test.java:475:16:475:31 | (...)... : Object | provenance |  |
 | Test.java:476:10:476:48 | of(...) : ImmutableBiMap [<map.value>] : Object | Test.java:477:21:477:23 | out : ImmutableBiMap [<map.value>] : Object | provenance |  |
 | Test.java:476:34:476:35 | in : Object | Test.java:476:10:476:48 | of(...) : ImmutableBiMap [<map.value>] : Object | provenance | MaD:30 |
 | Test.java:477:21:477:23 | out : ImmutableBiMap [<map.value>] : Object | Test.java:118:20:118:31 | map : ImmutableBiMap [<map.value>] : Object | provenance |  |
-| Test.java:477:21:477:23 | out : ImmutableBiMap [<map.value>] : Object | Test.java:477:9:477:24 | getMapValue(...) | provenance | MaD:561 |
+| Test.java:477:21:477:23 | out : ImmutableBiMap [<map.value>] : Object | Test.java:477:9:477:24 | getMapValue(...) | provenance | MaD:568 |
 | Test.java:482:16:482:31 | (...)... : Object | Test.java:483:34:483:35 | in : Object | provenance |  |
 | Test.java:482:24:482:31 | source(...) : Object | Test.java:482:16:482:31 | (...)... : Object | provenance |  |
 | Test.java:483:10:483:36 | of(...) : ImmutableBiMap [<map.value>] : Object | Test.java:484:21:484:23 | out : ImmutableBiMap [<map.value>] : Object | provenance |  |
 | Test.java:483:34:483:35 | in : Object | Test.java:483:10:483:36 | of(...) : ImmutableBiMap [<map.value>] : Object | provenance | MaD:30 |
 | Test.java:484:21:484:23 | out : ImmutableBiMap [<map.value>] : Object | Test.java:118:20:118:31 | map : ImmutableBiMap [<map.value>] : Object | provenance |  |
-| Test.java:484:21:484:23 | out : ImmutableBiMap [<map.value>] : Object | Test.java:484:9:484:24 | getMapValue(...) | provenance | MaD:561 |
+| Test.java:484:21:484:23 | out : ImmutableBiMap [<map.value>] : Object | Test.java:484:9:484:24 | getMapValue(...) | provenance | MaD:568 |
 | Test.java:489:16:489:31 | (...)... : Object | Test.java:490:40:490:41 | in : Object | provenance |  |
 | Test.java:489:24:489:31 | source(...) : Object | Test.java:489:16:489:31 | (...)... : Object | provenance |  |
 | Test.java:490:10:490:84 | of(...) : ImmutableBiMap [<map.key>] : Object | Test.java:491:19:491:21 | out : ImmutableBiMap [<map.key>] : Object | provenance |  |
 | Test.java:490:40:490:41 | in : Object | Test.java:490:10:490:84 | of(...) : ImmutableBiMap [<map.key>] : Object | provenance | MaD:31 |
 | Test.java:491:19:491:21 | out : ImmutableBiMap [<map.key>] : Object | Test.java:99:18:99:29 | map : ImmutableBiMap [<map.key>] : Object | provenance |  |
-| Test.java:491:19:491:21 | out : ImmutableBiMap [<map.key>] : Object | Test.java:491:9:491:22 | getMapKey(...) | provenance | MaD:562 |
+| Test.java:491:19:491:21 | out : ImmutableBiMap [<map.key>] : Object | Test.java:491:9:491:22 | getMapKey(...) | provenance | MaD:569 |
 | Test.java:496:16:496:31 | (...)... : Object | Test.java:497:40:497:41 | in : Object | provenance |  |
 | Test.java:496:24:496:31 | source(...) : Object | Test.java:496:16:496:31 | (...)... : Object | provenance |  |
 | Test.java:497:10:497:72 | of(...) : ImmutableBiMap [<map.key>] : Object | Test.java:498:19:498:21 | out : ImmutableBiMap [<map.key>] : Object | provenance |  |
 | Test.java:497:40:497:41 | in : Object | Test.java:497:10:497:72 | of(...) : ImmutableBiMap [<map.key>] : Object | provenance | MaD:31 |
 | Test.java:498:19:498:21 | out : ImmutableBiMap [<map.key>] : Object | Test.java:99:18:99:29 | map : ImmutableBiMap [<map.key>] : Object | provenance |  |
-| Test.java:498:19:498:21 | out : ImmutableBiMap [<map.key>] : Object | Test.java:498:9:498:22 | getMapKey(...) | provenance | MaD:562 |
+| Test.java:498:19:498:21 | out : ImmutableBiMap [<map.key>] : Object | Test.java:498:9:498:22 | getMapKey(...) | provenance | MaD:569 |
 | Test.java:503:16:503:31 | (...)... : Object | Test.java:504:40:504:41 | in : Object | provenance |  |
 | Test.java:503:24:503:31 | source(...) : Object | Test.java:503:16:503:31 | (...)... : Object | provenance |  |
 | Test.java:504:10:504:60 | of(...) : ImmutableBiMap [<map.key>] : Object | Test.java:505:19:505:21 | out : ImmutableBiMap [<map.key>] : Object | provenance |  |
 | Test.java:504:40:504:41 | in : Object | Test.java:504:10:504:60 | of(...) : ImmutableBiMap [<map.key>] : Object | provenance | MaD:31 |
 | Test.java:505:19:505:21 | out : ImmutableBiMap [<map.key>] : Object | Test.java:99:18:99:29 | map : ImmutableBiMap [<map.key>] : Object | provenance |  |
-| Test.java:505:19:505:21 | out : ImmutableBiMap [<map.key>] : Object | Test.java:505:9:505:22 | getMapKey(...) | provenance | MaD:562 |
+| Test.java:505:19:505:21 | out : ImmutableBiMap [<map.key>] : Object | Test.java:505:9:505:22 | getMapKey(...) | provenance | MaD:569 |
 | Test.java:510:16:510:31 | (...)... : Object | Test.java:511:40:511:41 | in : Object | provenance |  |
 | Test.java:510:24:510:31 | source(...) : Object | Test.java:510:16:510:31 | (...)... : Object | provenance |  |
 | Test.java:511:10:511:48 | of(...) : ImmutableBiMap [<map.key>] : Object | Test.java:512:19:512:21 | out : ImmutableBiMap [<map.key>] : Object | provenance |  |
 | Test.java:511:40:511:41 | in : Object | Test.java:511:10:511:48 | of(...) : ImmutableBiMap [<map.key>] : Object | provenance | MaD:31 |
 | Test.java:512:19:512:21 | out : ImmutableBiMap [<map.key>] : Object | Test.java:99:18:99:29 | map : ImmutableBiMap [<map.key>] : Object | provenance |  |
-| Test.java:512:19:512:21 | out : ImmutableBiMap [<map.key>] : Object | Test.java:512:9:512:22 | getMapKey(...) | provenance | MaD:562 |
+| Test.java:512:19:512:21 | out : ImmutableBiMap [<map.key>] : Object | Test.java:512:9:512:22 | getMapKey(...) | provenance | MaD:569 |
 | Test.java:517:16:517:31 | (...)... : Object | Test.java:518:46:518:47 | in : Object | provenance |  |
 | Test.java:517:24:517:31 | source(...) : Object | Test.java:517:16:517:31 | (...)... : Object | provenance |  |
 | Test.java:518:10:518:84 | of(...) : ImmutableBiMap [<map.value>] : Object | Test.java:519:21:519:23 | out : ImmutableBiMap [<map.value>] : Object | provenance |  |
 | Test.java:518:46:518:47 | in : Object | Test.java:518:10:518:84 | of(...) : ImmutableBiMap [<map.value>] : Object | provenance | MaD:32 |
 | Test.java:519:21:519:23 | out : ImmutableBiMap [<map.value>] : Object | Test.java:118:20:118:31 | map : ImmutableBiMap [<map.value>] : Object | provenance |  |
-| Test.java:519:21:519:23 | out : ImmutableBiMap [<map.value>] : Object | Test.java:519:9:519:24 | getMapValue(...) | provenance | MaD:561 |
+| Test.java:519:21:519:23 | out : ImmutableBiMap [<map.value>] : Object | Test.java:519:9:519:24 | getMapValue(...) | provenance | MaD:568 |
 | Test.java:524:16:524:31 | (...)... : Object | Test.java:525:46:525:47 | in : Object | provenance |  |
 | Test.java:524:24:524:31 | source(...) : Object | Test.java:524:16:524:31 | (...)... : Object | provenance |  |
 | Test.java:525:10:525:72 | of(...) : ImmutableBiMap [<map.value>] : Object | Test.java:526:21:526:23 | out : ImmutableBiMap [<map.value>] : Object | provenance |  |
 | Test.java:525:46:525:47 | in : Object | Test.java:525:10:525:72 | of(...) : ImmutableBiMap [<map.value>] : Object | provenance | MaD:32 |
 | Test.java:526:21:526:23 | out : ImmutableBiMap [<map.value>] : Object | Test.java:118:20:118:31 | map : ImmutableBiMap [<map.value>] : Object | provenance |  |
-| Test.java:526:21:526:23 | out : ImmutableBiMap [<map.value>] : Object | Test.java:526:9:526:24 | getMapValue(...) | provenance | MaD:561 |
+| Test.java:526:21:526:23 | out : ImmutableBiMap [<map.value>] : Object | Test.java:526:9:526:24 | getMapValue(...) | provenance | MaD:568 |
 | Test.java:531:16:531:31 | (...)... : Object | Test.java:532:46:532:47 | in : Object | provenance |  |
 | Test.java:531:24:531:31 | source(...) : Object | Test.java:531:16:531:31 | (...)... : Object | provenance |  |
 | Test.java:532:10:532:60 | of(...) : ImmutableBiMap [<map.value>] : Object | Test.java:533:21:533:23 | out : ImmutableBiMap [<map.value>] : Object | provenance |  |
 | Test.java:532:46:532:47 | in : Object | Test.java:532:10:532:60 | of(...) : ImmutableBiMap [<map.value>] : Object | provenance | MaD:32 |
 | Test.java:533:21:533:23 | out : ImmutableBiMap [<map.value>] : Object | Test.java:118:20:118:31 | map : ImmutableBiMap [<map.value>] : Object | provenance |  |
-| Test.java:533:21:533:23 | out : ImmutableBiMap [<map.value>] : Object | Test.java:533:9:533:24 | getMapValue(...) | provenance | MaD:561 |
+| Test.java:533:21:533:23 | out : ImmutableBiMap [<map.value>] : Object | Test.java:533:9:533:24 | getMapValue(...) | provenance | MaD:568 |
 | Test.java:538:16:538:31 | (...)... : Object | Test.java:539:46:539:47 | in : Object | provenance |  |
 | Test.java:538:24:538:31 | source(...) : Object | Test.java:538:16:538:31 | (...)... : Object | provenance |  |
 | Test.java:539:10:539:48 | of(...) : ImmutableBiMap [<map.value>] : Object | Test.java:540:21:540:23 | out : ImmutableBiMap [<map.value>] : Object | provenance |  |
 | Test.java:539:46:539:47 | in : Object | Test.java:539:10:539:48 | of(...) : ImmutableBiMap [<map.value>] : Object | provenance | MaD:32 |
 | Test.java:540:21:540:23 | out : ImmutableBiMap [<map.value>] : Object | Test.java:118:20:118:31 | map : ImmutableBiMap [<map.value>] : Object | provenance |  |
-| Test.java:540:21:540:23 | out : ImmutableBiMap [<map.value>] : Object | Test.java:540:9:540:24 | getMapValue(...) | provenance | MaD:561 |
+| Test.java:540:21:540:23 | out : ImmutableBiMap [<map.value>] : Object | Test.java:540:9:540:24 | getMapValue(...) | provenance | MaD:568 |
 | Test.java:545:16:545:31 | (...)... : Object | Test.java:546:52:546:53 | in : Object | provenance |  |
 | Test.java:545:24:545:31 | source(...) : Object | Test.java:545:16:545:31 | (...)... : Object | provenance |  |
 | Test.java:546:10:546:84 | of(...) : ImmutableBiMap [<map.key>] : Object | Test.java:547:19:547:21 | out : ImmutableBiMap [<map.key>] : Object | provenance |  |
 | Test.java:546:52:546:53 | in : Object | Test.java:546:10:546:84 | of(...) : ImmutableBiMap [<map.key>] : Object | provenance | MaD:33 |
 | Test.java:547:19:547:21 | out : ImmutableBiMap [<map.key>] : Object | Test.java:99:18:99:29 | map : ImmutableBiMap [<map.key>] : Object | provenance |  |
-| Test.java:547:19:547:21 | out : ImmutableBiMap [<map.key>] : Object | Test.java:547:9:547:22 | getMapKey(...) | provenance | MaD:562 |
+| Test.java:547:19:547:21 | out : ImmutableBiMap [<map.key>] : Object | Test.java:547:9:547:22 | getMapKey(...) | provenance | MaD:569 |
 | Test.java:552:16:552:31 | (...)... : Object | Test.java:553:52:553:53 | in : Object | provenance |  |
 | Test.java:552:24:552:31 | source(...) : Object | Test.java:552:16:552:31 | (...)... : Object | provenance |  |
 | Test.java:553:10:553:72 | of(...) : ImmutableBiMap [<map.key>] : Object | Test.java:554:19:554:21 | out : ImmutableBiMap [<map.key>] : Object | provenance |  |
 | Test.java:553:52:553:53 | in : Object | Test.java:553:10:553:72 | of(...) : ImmutableBiMap [<map.key>] : Object | provenance | MaD:33 |
 | Test.java:554:19:554:21 | out : ImmutableBiMap [<map.key>] : Object | Test.java:99:18:99:29 | map : ImmutableBiMap [<map.key>] : Object | provenance |  |
-| Test.java:554:19:554:21 | out : ImmutableBiMap [<map.key>] : Object | Test.java:554:9:554:22 | getMapKey(...) | provenance | MaD:562 |
+| Test.java:554:19:554:21 | out : ImmutableBiMap [<map.key>] : Object | Test.java:554:9:554:22 | getMapKey(...) | provenance | MaD:569 |
 | Test.java:559:16:559:31 | (...)... : Object | Test.java:560:52:560:53 | in : Object | provenance |  |
 | Test.java:559:24:559:31 | source(...) : Object | Test.java:559:16:559:31 | (...)... : Object | provenance |  |
 | Test.java:560:10:560:60 | of(...) : ImmutableBiMap [<map.key>] : Object | Test.java:561:19:561:21 | out : ImmutableBiMap [<map.key>] : Object | provenance |  |
 | Test.java:560:52:560:53 | in : Object | Test.java:560:10:560:60 | of(...) : ImmutableBiMap [<map.key>] : Object | provenance | MaD:33 |
 | Test.java:561:19:561:21 | out : ImmutableBiMap [<map.key>] : Object | Test.java:99:18:99:29 | map : ImmutableBiMap [<map.key>] : Object | provenance |  |
-| Test.java:561:19:561:21 | out : ImmutableBiMap [<map.key>] : Object | Test.java:561:9:561:22 | getMapKey(...) | provenance | MaD:562 |
+| Test.java:561:19:561:21 | out : ImmutableBiMap [<map.key>] : Object | Test.java:561:9:561:22 | getMapKey(...) | provenance | MaD:569 |
 | Test.java:566:16:566:31 | (...)... : Object | Test.java:567:58:567:59 | in : Object | provenance |  |
 | Test.java:566:24:566:31 | source(...) : Object | Test.java:566:16:566:31 | (...)... : Object | provenance |  |
 | Test.java:567:10:567:84 | of(...) : ImmutableBiMap [<map.value>] : Object | Test.java:568:21:568:23 | out : ImmutableBiMap [<map.value>] : Object | provenance |  |
 | Test.java:567:58:567:59 | in : Object | Test.java:567:10:567:84 | of(...) : ImmutableBiMap [<map.value>] : Object | provenance | MaD:34 |
 | Test.java:568:21:568:23 | out : ImmutableBiMap [<map.value>] : Object | Test.java:118:20:118:31 | map : ImmutableBiMap [<map.value>] : Object | provenance |  |
-| Test.java:568:21:568:23 | out : ImmutableBiMap [<map.value>] : Object | Test.java:568:9:568:24 | getMapValue(...) | provenance | MaD:561 |
+| Test.java:568:21:568:23 | out : ImmutableBiMap [<map.value>] : Object | Test.java:568:9:568:24 | getMapValue(...) | provenance | MaD:568 |
 | Test.java:573:16:573:31 | (...)... : Object | Test.java:574:58:574:59 | in : Object | provenance |  |
 | Test.java:573:24:573:31 | source(...) : Object | Test.java:573:16:573:31 | (...)... : Object | provenance |  |
 | Test.java:574:10:574:72 | of(...) : ImmutableBiMap [<map.value>] : Object | Test.java:575:21:575:23 | out : ImmutableBiMap [<map.value>] : Object | provenance |  |
 | Test.java:574:58:574:59 | in : Object | Test.java:574:10:574:72 | of(...) : ImmutableBiMap [<map.value>] : Object | provenance | MaD:34 |
 | Test.java:575:21:575:23 | out : ImmutableBiMap [<map.value>] : Object | Test.java:118:20:118:31 | map : ImmutableBiMap [<map.value>] : Object | provenance |  |
-| Test.java:575:21:575:23 | out : ImmutableBiMap [<map.value>] : Object | Test.java:575:9:575:24 | getMapValue(...) | provenance | MaD:561 |
+| Test.java:575:21:575:23 | out : ImmutableBiMap [<map.value>] : Object | Test.java:575:9:575:24 | getMapValue(...) | provenance | MaD:568 |
 | Test.java:580:16:580:31 | (...)... : Object | Test.java:581:58:581:59 | in : Object | provenance |  |
 | Test.java:580:24:580:31 | source(...) : Object | Test.java:580:16:580:31 | (...)... : Object | provenance |  |
 | Test.java:581:10:581:60 | of(...) : ImmutableBiMap [<map.value>] : Object | Test.java:582:21:582:23 | out : ImmutableBiMap [<map.value>] : Object | provenance |  |
 | Test.java:581:58:581:59 | in : Object | Test.java:581:10:581:60 | of(...) : ImmutableBiMap [<map.value>] : Object | provenance | MaD:34 |
 | Test.java:582:21:582:23 | out : ImmutableBiMap [<map.value>] : Object | Test.java:118:20:118:31 | map : ImmutableBiMap [<map.value>] : Object | provenance |  |
-| Test.java:582:21:582:23 | out : ImmutableBiMap [<map.value>] : Object | Test.java:582:9:582:24 | getMapValue(...) | provenance | MaD:561 |
+| Test.java:582:21:582:23 | out : ImmutableBiMap [<map.value>] : Object | Test.java:582:9:582:24 | getMapValue(...) | provenance | MaD:568 |
 | Test.java:587:16:587:31 | (...)... : Object | Test.java:588:64:588:65 | in : Object | provenance |  |
 | Test.java:587:24:587:31 | source(...) : Object | Test.java:587:16:587:31 | (...)... : Object | provenance |  |
 | Test.java:588:10:588:84 | of(...) : ImmutableBiMap [<map.key>] : Object | Test.java:589:19:589:21 | out : ImmutableBiMap [<map.key>] : Object | provenance |  |
 | Test.java:588:64:588:65 | in : Object | Test.java:588:10:588:84 | of(...) : ImmutableBiMap [<map.key>] : Object | provenance | MaD:35 |
 | Test.java:589:19:589:21 | out : ImmutableBiMap [<map.key>] : Object | Test.java:99:18:99:29 | map : ImmutableBiMap [<map.key>] : Object | provenance |  |
-| Test.java:589:19:589:21 | out : ImmutableBiMap [<map.key>] : Object | Test.java:589:9:589:22 | getMapKey(...) | provenance | MaD:562 |
+| Test.java:589:19:589:21 | out : ImmutableBiMap [<map.key>] : Object | Test.java:589:9:589:22 | getMapKey(...) | provenance | MaD:569 |
 | Test.java:594:16:594:31 | (...)... : Object | Test.java:595:64:595:65 | in : Object | provenance |  |
 | Test.java:594:24:594:31 | source(...) : Object | Test.java:594:16:594:31 | (...)... : Object | provenance |  |
 | Test.java:595:10:595:72 | of(...) : ImmutableBiMap [<map.key>] : Object | Test.java:596:19:596:21 | out : ImmutableBiMap [<map.key>] : Object | provenance |  |
 | Test.java:595:64:595:65 | in : Object | Test.java:595:10:595:72 | of(...) : ImmutableBiMap [<map.key>] : Object | provenance | MaD:35 |
 | Test.java:596:19:596:21 | out : ImmutableBiMap [<map.key>] : Object | Test.java:99:18:99:29 | map : ImmutableBiMap [<map.key>] : Object | provenance |  |
-| Test.java:596:19:596:21 | out : ImmutableBiMap [<map.key>] : Object | Test.java:596:9:596:22 | getMapKey(...) | provenance | MaD:562 |
+| Test.java:596:19:596:21 | out : ImmutableBiMap [<map.key>] : Object | Test.java:596:9:596:22 | getMapKey(...) | provenance | MaD:569 |
 | Test.java:601:16:601:31 | (...)... : Object | Test.java:602:70:602:71 | in : Object | provenance |  |
 | Test.java:601:24:601:31 | source(...) : Object | Test.java:601:16:601:31 | (...)... : Object | provenance |  |
 | Test.java:602:10:602:84 | of(...) : ImmutableBiMap [<map.value>] : Object | Test.java:603:21:603:23 | out : ImmutableBiMap [<map.value>] : Object | provenance |  |
 | Test.java:602:70:602:71 | in : Object | Test.java:602:10:602:84 | of(...) : ImmutableBiMap [<map.value>] : Object | provenance | MaD:36 |
 | Test.java:603:21:603:23 | out : ImmutableBiMap [<map.value>] : Object | Test.java:118:20:118:31 | map : ImmutableBiMap [<map.value>] : Object | provenance |  |
-| Test.java:603:21:603:23 | out : ImmutableBiMap [<map.value>] : Object | Test.java:603:9:603:24 | getMapValue(...) | provenance | MaD:561 |
+| Test.java:603:21:603:23 | out : ImmutableBiMap [<map.value>] : Object | Test.java:603:9:603:24 | getMapValue(...) | provenance | MaD:568 |
 | Test.java:608:16:608:31 | (...)... : Object | Test.java:609:70:609:71 | in : Object | provenance |  |
 | Test.java:608:24:608:31 | source(...) : Object | Test.java:608:16:608:31 | (...)... : Object | provenance |  |
 | Test.java:609:10:609:72 | of(...) : ImmutableBiMap [<map.value>] : Object | Test.java:610:21:610:23 | out : ImmutableBiMap [<map.value>] : Object | provenance |  |
 | Test.java:609:70:609:71 | in : Object | Test.java:609:10:609:72 | of(...) : ImmutableBiMap [<map.value>] : Object | provenance | MaD:36 |
 | Test.java:610:21:610:23 | out : ImmutableBiMap [<map.value>] : Object | Test.java:118:20:118:31 | map : ImmutableBiMap [<map.value>] : Object | provenance |  |
-| Test.java:610:21:610:23 | out : ImmutableBiMap [<map.value>] : Object | Test.java:610:9:610:24 | getMapValue(...) | provenance | MaD:561 |
+| Test.java:610:21:610:23 | out : ImmutableBiMap [<map.value>] : Object | Test.java:610:9:610:24 | getMapValue(...) | provenance | MaD:568 |
 | Test.java:615:16:615:31 | (...)... : Object | Test.java:616:76:616:77 | in : Object | provenance |  |
 | Test.java:615:24:615:31 | source(...) : Object | Test.java:615:16:615:31 | (...)... : Object | provenance |  |
 | Test.java:616:10:616:84 | of(...) : ImmutableBiMap [<map.key>] : Object | Test.java:617:19:617:21 | out : ImmutableBiMap [<map.key>] : Object | provenance |  |
 | Test.java:616:76:616:77 | in : Object | Test.java:616:10:616:84 | of(...) : ImmutableBiMap [<map.key>] : Object | provenance | MaD:37 |
 | Test.java:617:19:617:21 | out : ImmutableBiMap [<map.key>] : Object | Test.java:99:18:99:29 | map : ImmutableBiMap [<map.key>] : Object | provenance |  |
-| Test.java:617:19:617:21 | out : ImmutableBiMap [<map.key>] : Object | Test.java:617:9:617:22 | getMapKey(...) | provenance | MaD:562 |
+| Test.java:617:19:617:21 | out : ImmutableBiMap [<map.key>] : Object | Test.java:617:9:617:22 | getMapKey(...) | provenance | MaD:569 |
 | Test.java:622:16:622:31 | (...)... : Object | Test.java:623:82:623:83 | in : Object | provenance |  |
 | Test.java:622:24:622:31 | source(...) : Object | Test.java:622:16:622:31 | (...)... : Object | provenance |  |
 | Test.java:623:10:623:84 | of(...) : ImmutableBiMap [<map.value>] : Object | Test.java:624:21:624:23 | out : ImmutableBiMap [<map.value>] : Object | provenance |  |
 | Test.java:623:82:623:83 | in : Object | Test.java:623:10:623:84 | of(...) : ImmutableBiMap [<map.value>] : Object | provenance | MaD:38 |
 | Test.java:624:21:624:23 | out : ImmutableBiMap [<map.value>] : Object | Test.java:118:20:118:31 | map : ImmutableBiMap [<map.value>] : Object | provenance |  |
-| Test.java:624:21:624:23 | out : ImmutableBiMap [<map.value>] : Object | Test.java:624:9:624:24 | getMapValue(...) | provenance | MaD:561 |
+| Test.java:624:21:624:23 | out : ImmutableBiMap [<map.value>] : Object | Test.java:624:9:624:24 | getMapValue(...) | provenance | MaD:568 |
 | Test.java:629:13:629:39 | (...)... : Map [<map.key>] : Object | Test.java:630:45:630:46 | in : Map [<map.key>] : Object | provenance |  |
 | Test.java:629:18:629:39 | of(...) : Map [<map.key>] : Object | Test.java:629:13:629:39 | (...)... : Map [<map.key>] : Object | provenance |  |
-| Test.java:629:25:629:32 | source(...) : Object | Test.java:629:18:629:39 | of(...) : Map [<map.key>] : Object | provenance | MaD:563 |
+| Test.java:629:25:629:32 | source(...) : Object | Test.java:629:18:629:39 | of(...) : Map [<map.key>] : Object | provenance | MaD:564 |
 | Test.java:630:10:630:47 | copyOf(...) : ImmutableClassToInstanceMap [<map.key>] : Object | Test.java:631:19:631:21 | out : ImmutableClassToInstanceMap [<map.key>] : Object | provenance |  |
 | Test.java:630:45:630:46 | in : Map [<map.key>] : Object | Test.java:630:10:630:47 | copyOf(...) : ImmutableClassToInstanceMap [<map.key>] : Object | provenance | MaD:39 |
 | Test.java:631:19:631:21 | out : ImmutableClassToInstanceMap [<map.key>] : Object | Test.java:99:18:99:29 | map : ImmutableClassToInstanceMap [<map.key>] : Object | provenance |  |
-| Test.java:631:19:631:21 | out : ImmutableClassToInstanceMap [<map.key>] : Object | Test.java:631:9:631:22 | getMapKey(...) | provenance | MaD:562 |
+| Test.java:631:19:631:21 | out : ImmutableClassToInstanceMap [<map.key>] : Object | Test.java:631:9:631:22 | getMapKey(...) | provenance | MaD:569 |
 | Test.java:636:13:636:39 | (...)... : Map [<map.value>] : Object | Test.java:637:45:637:46 | in : Map [<map.value>] : Object | provenance |  |
 | Test.java:636:18:636:39 | of(...) : Map [<map.value>] : Object | Test.java:636:13:636:39 | (...)... : Map [<map.value>] : Object | provenance |  |
-| Test.java:636:31:636:38 | source(...) : Object | Test.java:636:18:636:39 | of(...) : Map [<map.value>] : Object | provenance | MaD:564 |
+| Test.java:636:31:636:38 | source(...) : Object | Test.java:636:18:636:39 | of(...) : Map [<map.value>] : Object | provenance | MaD:565 |
 | Test.java:637:10:637:47 | copyOf(...) : ImmutableClassToInstanceMap [<map.value>] : Object | Test.java:638:21:638:23 | out : ImmutableClassToInstanceMap [<map.value>] : Object | provenance |  |
 | Test.java:637:45:637:46 | in : Map [<map.value>] : Object | Test.java:637:10:637:47 | copyOf(...) : ImmutableClassToInstanceMap [<map.value>] : Object | provenance | MaD:40 |
 | Test.java:638:21:638:23 | out : ImmutableClassToInstanceMap [<map.value>] : Object | Test.java:118:20:118:31 | map : ImmutableClassToInstanceMap [<map.value>] : Object | provenance |  |
-| Test.java:638:21:638:23 | out : ImmutableClassToInstanceMap [<map.value>] : Object | Test.java:638:9:638:24 | getMapValue(...) | provenance | MaD:561 |
+| Test.java:638:21:638:23 | out : ImmutableClassToInstanceMap [<map.value>] : Object | Test.java:638:9:638:24 | getMapValue(...) | provenance | MaD:568 |
 | Test.java:643:15:643:29 | (...)... : Class | Test.java:644:41:644:42 | in : Class | provenance |  |
 | Test.java:643:22:643:29 | source(...) : Object | Test.java:643:15:643:29 | (...)... : Class | provenance |  |
 | Test.java:644:10:644:49 | of(...) : ImmutableClassToInstanceMap [<map.key>] : Class | Test.java:645:19:645:21 | out : ImmutableClassToInstanceMap [<map.key>] : Class | provenance |  |
 | Test.java:644:41:644:42 | in : Class | Test.java:644:10:644:49 | of(...) : ImmutableClassToInstanceMap [<map.key>] : Class | provenance | MaD:41 |
 | Test.java:645:19:645:21 | out : ImmutableClassToInstanceMap [<map.key>] : Class | Test.java:99:18:99:29 | map : ImmutableClassToInstanceMap [<map.key>] : Class | provenance |  |
-| Test.java:645:19:645:21 | out : ImmutableClassToInstanceMap [<map.key>] : Class | Test.java:645:9:645:22 | getMapKey(...) | provenance | MaD:562 |
+| Test.java:645:19:645:21 | out : ImmutableClassToInstanceMap [<map.key>] : Class | Test.java:645:9:645:22 | getMapKey(...) | provenance | MaD:569 |
 | Test.java:650:16:650:31 | (...)... : Object | Test.java:651:47:651:48 | in : Object | provenance |  |
 | Test.java:650:24:650:31 | source(...) : Object | Test.java:650:16:650:31 | (...)... : Object | provenance |  |
 | Test.java:651:10:651:49 | of(...) : ImmutableClassToInstanceMap [<map.value>] : Object | Test.java:652:21:652:23 | out : ImmutableClassToInstanceMap [<map.value>] : Object | provenance |  |
 | Test.java:651:47:651:48 | in : Object | Test.java:651:10:651:49 | of(...) : ImmutableClassToInstanceMap [<map.value>] : Object | provenance | MaD:42 |
 | Test.java:652:21:652:23 | out : ImmutableClassToInstanceMap [<map.value>] : Object | Test.java:118:20:118:31 | map : ImmutableClassToInstanceMap [<map.value>] : Object | provenance |  |
-| Test.java:652:21:652:23 | out : ImmutableClassToInstanceMap [<map.value>] : Object | Test.java:652:9:652:24 | getMapValue(...) | provenance | MaD:561 |
+| Test.java:652:21:652:23 | out : ImmutableClassToInstanceMap [<map.value>] : Object | Test.java:652:9:652:24 | getMapValue(...) | provenance | MaD:568 |
 | Test.java:657:16:657:31 | (...)... : Object | Test.java:658:12:658:13 | in : Object | provenance |  |
 | Test.java:657:24:657:31 | source(...) : Object | Test.java:657:16:657:31 | (...)... : Object | provenance |  |
 | Test.java:658:4:658:6 | out [post update] : Builder [<element>] : Object | Test.java:659:20:659:22 | out : Builder [<element>] : Object | provenance |  |
-| Test.java:658:12:658:13 | in : Object | Test.java:658:4:658:6 | out [post update] : Builder [<element>] : Object | provenance | MaD:45 |
+| Test.java:658:12:658:13 | in : Object | Test.java:658:4:658:6 | out [post update] : Builder [<element>] : Object | provenance | MaD:43 |
 | Test.java:659:20:659:22 | out : Builder [<element>] : Object | Test.java:109:19:109:50 | b : Builder [<element>] : Object | provenance |  |
-| Test.java:659:20:659:22 | out : Builder [<element>] : Object | Test.java:659:9:659:23 | getElement(...) | provenance | MaD:50 |
+| Test.java:659:20:659:22 | out : Builder [<element>] : Object | Test.java:659:9:659:23 | getElement(...) | provenance | MaD:49 |
 | Test.java:664:16:664:31 | (...)... : Object | Test.java:665:12:665:13 | in : Object | provenance |  |
 | Test.java:664:24:664:31 | source(...) : Object | Test.java:664:16:664:31 | (...)... : Object | provenance |  |
 | Test.java:665:4:665:6 | out [post update] : Builder [<element>] : Object | Test.java:666:20:666:22 | out : Builder [<element>] : Object | provenance |  |
-| Test.java:665:12:665:13 | in : Object | Test.java:665:4:665:6 | out [post update] : Builder [<element>] : Object | provenance | MaD:45 |
+| Test.java:665:12:665:13 | in : Object | Test.java:665:4:665:6 | out [post update] : Builder [<element>] : Object | provenance | MaD:43 |
 | Test.java:666:20:666:22 | out : Builder [<element>] : Object | Test.java:109:19:109:50 | b : Builder [<element>] : Object | provenance |  |
-| Test.java:666:20:666:22 | out : Builder [<element>] : Object | Test.java:666:9:666:23 | getElement(...) | provenance | MaD:50 |
+| Test.java:666:20:666:22 | out : Builder [<element>] : Object | Test.java:666:9:666:23 | getElement(...) | provenance | MaD:49 |
 | Test.java:671:16:671:31 | (...)... : Object | Test.java:672:12:672:13 | in : Object | provenance |  |
 | Test.java:671:24:671:31 | source(...) : Object | Test.java:671:16:671:31 | (...)... : Object | provenance |  |
 | Test.java:672:4:672:6 | out [post update] : Builder [<element>] : Object | Test.java:673:20:673:22 | out : Builder [<element>] : Object | provenance |  |
-| Test.java:672:12:672:13 | in : Object | Test.java:672:4:672:6 | out [post update] : Builder [<element>] : Object | provenance | MaD:45 |
+| Test.java:672:12:672:13 | in : Object | Test.java:672:4:672:6 | out [post update] : Builder [<element>] : Object | provenance | MaD:43 |
 | Test.java:673:20:673:22 | out : Builder [<element>] : Object | Test.java:109:19:109:50 | b : Builder [<element>] : Object | provenance |  |
-| Test.java:673:20:673:22 | out : Builder [<element>] : Object | Test.java:673:9:673:23 | getElement(...) | provenance | MaD:50 |
+| Test.java:673:20:673:22 | out : Builder [<element>] : Object | Test.java:673:9:673:23 | getElement(...) | provenance | MaD:49 |
 | Test.java:678:16:678:31 | (...)... : Object | Test.java:679:12:679:13 | in : Object | provenance |  |
 | Test.java:678:24:678:31 | source(...) : Object | Test.java:678:16:678:31 | (...)... : Object | provenance |  |
 | Test.java:679:4:679:6 | out [post update] : Builder [<element>] : Object | Test.java:680:20:680:22 | out : Builder [<element>] : Object | provenance |  |
-| Test.java:679:12:679:13 | in : Object | Test.java:679:4:679:6 | out [post update] : Builder [<element>] : Object | provenance | MaD:45 |
+| Test.java:679:12:679:13 | in : Object | Test.java:679:4:679:6 | out [post update] : Builder [<element>] : Object | provenance | MaD:43 |
 | Test.java:680:20:680:22 | out : Builder [<element>] : Object | Test.java:109:19:109:50 | b : Builder [<element>] : Object | provenance |  |
-| Test.java:680:20:680:22 | out : Builder [<element>] : Object | Test.java:680:9:680:23 | getElement(...) | provenance | MaD:50 |
+| Test.java:680:20:680:22 | out : Builder [<element>] : Object | Test.java:680:9:680:23 | getElement(...) | provenance | MaD:49 |
 | Test.java:685:16:685:31 | (...)... : Object | Test.java:686:12:686:13 | in : Object | provenance |  |
 | Test.java:685:24:685:31 | source(...) : Object | Test.java:685:16:685:31 | (...)... : Object | provenance |  |
 | Test.java:686:4:686:6 | out [post update] : Builder [<element>] : Object | Test.java:687:20:687:22 | out : Builder [<element>] : Object | provenance |  |
-| Test.java:686:12:686:13 | in : Object | Test.java:686:4:686:6 | out [post update] : Builder [<element>] : Object | provenance | MaD:45 |
+| Test.java:686:12:686:13 | in : Object | Test.java:686:4:686:6 | out [post update] : Builder [<element>] : Object | provenance | MaD:43 |
 | Test.java:687:20:687:22 | out : Builder [<element>] : Object | Test.java:109:19:109:50 | b : Builder [<element>] : Object | provenance |  |
-| Test.java:687:20:687:22 | out : Builder [<element>] : Object | Test.java:687:9:687:23 | getElement(...) | provenance | MaD:50 |
+| Test.java:687:20:687:22 | out : Builder [<element>] : Object | Test.java:687:9:687:23 | getElement(...) | provenance | MaD:49 |
 | Test.java:692:16:692:31 | (...)... : Object | Test.java:693:12:693:13 | in : Object | provenance |  |
 | Test.java:692:24:692:31 | source(...) : Object | Test.java:692:16:692:31 | (...)... : Object | provenance |  |
 | Test.java:693:4:693:6 | out [post update] : Builder [<element>] : Object | Test.java:694:20:694:22 | out : Builder [<element>] : Object | provenance |  |
-| Test.java:693:12:693:13 | in : Object | Test.java:693:4:693:6 | out [post update] : Builder [<element>] : Object | provenance | MaD:45 |
+| Test.java:693:12:693:13 | in : Object | Test.java:693:4:693:6 | out [post update] : Builder [<element>] : Object | provenance | MaD:43 |
 | Test.java:694:20:694:22 | out : Builder [<element>] : Object | Test.java:109:19:109:50 | b : Builder [<element>] : Object | provenance |  |
-| Test.java:694:20:694:22 | out : Builder [<element>] : Object | Test.java:694:9:694:23 | getElement(...) | provenance | MaD:50 |
+| Test.java:694:20:694:22 | out : Builder [<element>] : Object | Test.java:694:9:694:23 | getElement(...) | provenance | MaD:49 |
 | Test.java:699:18:699:49 | (...)... : Object[] [[]] : Object | Test.java:700:12:700:13 | in : Object[] [[]] : Object | provenance |  |
 | Test.java:699:28:699:49 | {...} : Object[] [[]] : Object | Test.java:699:18:699:49 | (...)... : Object[] [[]] : Object | provenance |  |
 | Test.java:699:41:699:48 | source(...) : Object | Test.java:699:28:699:49 | {...} : Object[] [[]] : Object | provenance |  |
 | Test.java:700:4:700:6 | out [post update] : Builder [<element>] : Object | Test.java:701:20:701:22 | out : Builder [<element>] : Object | provenance |  |
-| Test.java:700:12:700:13 | in : Object[] [[]] : Object | Test.java:700:4:700:6 | out [post update] : Builder [<element>] : Object | provenance | MaD:46 |
+| Test.java:700:12:700:13 | in : Object[] [[]] : Object | Test.java:700:4:700:6 | out [post update] : Builder [<element>] : Object | provenance | MaD:44 |
 | Test.java:701:20:701:22 | out : Builder [<element>] : Object | Test.java:109:19:109:50 | b : Builder [<element>] : Object | provenance |  |
-| Test.java:701:20:701:22 | out : Builder [<element>] : Object | Test.java:701:9:701:23 | getElement(...) | provenance | MaD:50 |
+| Test.java:701:20:701:22 | out : Builder [<element>] : Object | Test.java:701:9:701:23 | getElement(...) | provenance | MaD:49 |
 | Test.java:706:18:706:49 | (...)... : Object[] [[]] : Object | Test.java:707:12:707:13 | in : Object[] [[]] : Object | provenance |  |
 | Test.java:706:28:706:49 | {...} : Object[] [[]] : Object | Test.java:706:18:706:49 | (...)... : Object[] [[]] : Object | provenance |  |
 | Test.java:706:41:706:48 | source(...) : Object | Test.java:706:28:706:49 | {...} : Object[] [[]] : Object | provenance |  |
 | Test.java:707:4:707:6 | out [post update] : Builder [<element>] : Object | Test.java:708:20:708:22 | out : Builder [<element>] : Object | provenance |  |
-| Test.java:707:12:707:13 | in : Object[] [[]] : Object | Test.java:707:4:707:6 | out [post update] : Builder [<element>] : Object | provenance | MaD:46 |
+| Test.java:707:12:707:13 | in : Object[] [[]] : Object | Test.java:707:4:707:6 | out [post update] : Builder [<element>] : Object | provenance | MaD:44 |
 | Test.java:708:20:708:22 | out : Builder [<element>] : Object | Test.java:109:19:109:50 | b : Builder [<element>] : Object | provenance |  |
-| Test.java:708:20:708:22 | out : Builder [<element>] : Object | Test.java:708:9:708:23 | getElement(...) | provenance | MaD:50 |
+| Test.java:708:20:708:22 | out : Builder [<element>] : Object | Test.java:708:9:708:23 | getElement(...) | provenance | MaD:49 |
 | Test.java:713:18:713:49 | (...)... : Object[] [[]] : Object | Test.java:714:12:714:13 | in : Object[] [[]] : Object | provenance |  |
 | Test.java:713:28:713:49 | {...} : Object[] [[]] : Object | Test.java:713:18:713:49 | (...)... : Object[] [[]] : Object | provenance |  |
 | Test.java:713:41:713:48 | source(...) : Object | Test.java:713:28:713:49 | {...} : Object[] [[]] : Object | provenance |  |
 | Test.java:714:4:714:6 | out [post update] : Builder [<element>] : Object | Test.java:715:20:715:22 | out : Builder [<element>] : Object | provenance |  |
-| Test.java:714:12:714:13 | in : Object[] [[]] : Object | Test.java:714:4:714:6 | out [post update] : Builder [<element>] : Object | provenance | MaD:46 |
+| Test.java:714:12:714:13 | in : Object[] [[]] : Object | Test.java:714:4:714:6 | out [post update] : Builder [<element>] : Object | provenance | MaD:44 |
 | Test.java:715:20:715:22 | out : Builder [<element>] : Object | Test.java:109:19:109:50 | b : Builder [<element>] : Object | provenance |  |
-| Test.java:715:20:715:22 | out : Builder [<element>] : Object | Test.java:715:9:715:23 | getElement(...) | provenance | MaD:50 |
+| Test.java:715:20:715:22 | out : Builder [<element>] : Object | Test.java:715:9:715:23 | getElement(...) | provenance | MaD:49 |
 | Test.java:720:18:720:49 | (...)... : Object[] [[]] : Object | Test.java:721:12:721:13 | in : Object[] [[]] : Object | provenance |  |
 | Test.java:720:28:720:49 | {...} : Object[] [[]] : Object | Test.java:720:18:720:49 | (...)... : Object[] [[]] : Object | provenance |  |
 | Test.java:720:41:720:48 | source(...) : Object | Test.java:720:28:720:49 | {...} : Object[] [[]] : Object | provenance |  |
 | Test.java:721:4:721:6 | out [post update] : Builder [<element>] : Object | Test.java:722:20:722:22 | out : Builder [<element>] : Object | provenance |  |
-| Test.java:721:12:721:13 | in : Object[] [[]] : Object | Test.java:721:4:721:6 | out [post update] : Builder [<element>] : Object | provenance | MaD:46 |
+| Test.java:721:12:721:13 | in : Object[] [[]] : Object | Test.java:721:4:721:6 | out [post update] : Builder [<element>] : Object | provenance | MaD:44 |
 | Test.java:722:20:722:22 | out : Builder [<element>] : Object | Test.java:109:19:109:50 | b : Builder [<element>] : Object | provenance |  |
-| Test.java:722:20:722:22 | out : Builder [<element>] : Object | Test.java:722:9:722:23 | getElement(...) | provenance | MaD:50 |
+| Test.java:722:20:722:22 | out : Builder [<element>] : Object | Test.java:722:9:722:23 | getElement(...) | provenance | MaD:49 |
 | Test.java:727:18:727:49 | (...)... : Object[] [[]] : Object | Test.java:728:12:728:13 | in : Object[] [[]] : Object | provenance |  |
 | Test.java:727:28:727:49 | {...} : Object[] [[]] : Object | Test.java:727:18:727:49 | (...)... : Object[] [[]] : Object | provenance |  |
 | Test.java:727:41:727:48 | source(...) : Object | Test.java:727:28:727:49 | {...} : Object[] [[]] : Object | provenance |  |
 | Test.java:728:4:728:6 | out [post update] : Builder [<element>] : Object | Test.java:729:20:729:22 | out : Builder [<element>] : Object | provenance |  |
-| Test.java:728:12:728:13 | in : Object[] [[]] : Object | Test.java:728:4:728:6 | out [post update] : Builder [<element>] : Object | provenance | MaD:46 |
+| Test.java:728:12:728:13 | in : Object[] [[]] : Object | Test.java:728:4:728:6 | out [post update] : Builder [<element>] : Object | provenance | MaD:44 |
 | Test.java:729:20:729:22 | out : Builder [<element>] : Object | Test.java:109:19:109:50 | b : Builder [<element>] : Object | provenance |  |
-| Test.java:729:20:729:22 | out : Builder [<element>] : Object | Test.java:729:9:729:23 | getElement(...) | provenance | MaD:50 |
+| Test.java:729:20:729:22 | out : Builder [<element>] : Object | Test.java:729:9:729:23 | getElement(...) | provenance | MaD:49 |
 | Test.java:734:18:734:49 | (...)... : Object[] [[]] : Object | Test.java:735:12:735:13 | in : Object[] [[]] : Object | provenance |  |
 | Test.java:734:28:734:49 | {...} : Object[] [[]] : Object | Test.java:734:18:734:49 | (...)... : Object[] [[]] : Object | provenance |  |
 | Test.java:734:41:734:48 | source(...) : Object | Test.java:734:28:734:49 | {...} : Object[] [[]] : Object | provenance |  |
 | Test.java:735:4:735:6 | out [post update] : Builder [<element>] : Object | Test.java:736:20:736:22 | out : Builder [<element>] : Object | provenance |  |
-| Test.java:735:12:735:13 | in : Object[] [[]] : Object | Test.java:735:4:735:6 | out [post update] : Builder [<element>] : Object | provenance | MaD:46 |
+| Test.java:735:12:735:13 | in : Object[] [[]] : Object | Test.java:735:4:735:6 | out [post update] : Builder [<element>] : Object | provenance | MaD:44 |
 | Test.java:736:20:736:22 | out : Builder [<element>] : Object | Test.java:109:19:109:50 | b : Builder [<element>] : Object | provenance |  |
-| Test.java:736:20:736:22 | out : Builder [<element>] : Object | Test.java:736:9:736:23 | getElement(...) | provenance | MaD:50 |
+| Test.java:736:20:736:22 | out : Builder [<element>] : Object | Test.java:736:9:736:23 | getElement(...) | provenance | MaD:49 |
 | Test.java:741:36:741:71 | (...)... : Builder | Test.java:742:10:742:11 | in : Builder | provenance |  |
 | Test.java:741:64:741:71 | source(...) : Object | Test.java:741:36:741:71 | (...)... : Builder | provenance |  |
-| Test.java:742:10:742:11 | in : Builder | Test.java:742:10:742:31 | add(...) : Builder | provenance | MaD:44 |
+| Test.java:742:10:742:11 | in : Builder | Test.java:742:10:742:31 | add(...) : Builder | provenance | MaD:45 |
 | Test.java:742:10:742:31 | add(...) : Builder | Test.java:743:9:743:11 | out | provenance |  |
 | Test.java:748:36:748:71 | (...)... : Builder | Test.java:749:10:749:11 | in : Builder | provenance |  |
 | Test.java:748:64:748:71 | source(...) : Object | Test.java:748:36:748:71 | (...)... : Builder | provenance |  |
-| Test.java:749:10:749:11 | in : Builder | Test.java:749:10:749:29 | add(...) : Builder | provenance | MaD:44 |
+| Test.java:749:10:749:11 | in : Builder | Test.java:749:10:749:29 | add(...) : Builder | provenance | MaD:45 |
 | Test.java:749:10:749:29 | add(...) : Builder | Test.java:750:9:750:11 | out | provenance |  |
 | Test.java:755:41:755:81 | (...)... : Builder | Test.java:756:10:756:11 | in : Builder | provenance |  |
 | Test.java:755:74:755:81 | source(...) : Object | Test.java:755:41:755:81 | (...)... : Builder | provenance |  |
-| Test.java:756:10:756:11 | in : Builder | Test.java:756:10:756:31 | add(...) : Builder | provenance | MaD:44 |
+| Test.java:756:10:756:11 | in : Builder | Test.java:756:10:756:31 | add(...) : Builder | provenance | MaD:45 |
 | Test.java:756:10:756:31 | add(...) : Builder | Test.java:757:9:757:11 | out | provenance |  |
 | Test.java:762:41:762:81 | (...)... : Builder | Test.java:763:10:763:11 | in : Builder | provenance |  |
 | Test.java:762:74:762:81 | source(...) : Object | Test.java:762:41:762:81 | (...)... : Builder | provenance |  |
-| Test.java:763:10:763:11 | in : Builder | Test.java:763:10:763:29 | add(...) : Builder | provenance | MaD:44 |
+| Test.java:763:10:763:11 | in : Builder | Test.java:763:10:763:29 | add(...) : Builder | provenance | MaD:45 |
 | Test.java:763:10:763:29 | add(...) : Builder | Test.java:764:9:764:11 | out | provenance |  |
 | Test.java:769:30:769:59 | (...)... : Builder | Test.java:770:10:770:11 | in : Builder | provenance |  |
 | Test.java:769:52:769:59 | source(...) : Object | Test.java:769:30:769:59 | (...)... : Builder | provenance |  |
-| Test.java:770:10:770:11 | in : Builder | Test.java:770:10:770:31 | add(...) : Builder | provenance | MaD:44 |
+| Test.java:770:10:770:11 | in : Builder | Test.java:770:10:770:31 | add(...) : Builder | provenance | MaD:45 |
 | Test.java:770:10:770:31 | add(...) : Builder | Test.java:771:9:771:11 | out | provenance |  |
 | Test.java:776:30:776:59 | (...)... : Builder | Test.java:777:10:777:11 | in : Builder | provenance |  |
 | Test.java:776:52:776:59 | source(...) : Object | Test.java:776:30:776:59 | (...)... : Builder | provenance |  |
-| Test.java:777:10:777:11 | in : Builder | Test.java:777:10:777:29 | add(...) : Builder | provenance | MaD:44 |
+| Test.java:777:10:777:11 | in : Builder | Test.java:777:10:777:29 | add(...) : Builder | provenance | MaD:45 |
 | Test.java:777:10:777:29 | add(...) : Builder | Test.java:778:9:778:11 | out | provenance |  |
 | Test.java:783:35:783:69 | (...)... : Builder | Test.java:784:10:784:11 | in : Builder | provenance |  |
 | Test.java:783:62:783:69 | source(...) : Object | Test.java:783:35:783:69 | (...)... : Builder | provenance |  |
-| Test.java:784:10:784:11 | in : Builder | Test.java:784:10:784:31 | add(...) : Builder | provenance | MaD:44 |
+| Test.java:784:10:784:11 | in : Builder | Test.java:784:10:784:31 | add(...) : Builder | provenance | MaD:45 |
 | Test.java:784:10:784:31 | add(...) : Builder | Test.java:785:9:785:11 | out | provenance |  |
 | Test.java:790:35:790:69 | (...)... : Builder | Test.java:791:10:791:11 | in : Builder | provenance |  |
 | Test.java:790:62:790:69 | source(...) : Object | Test.java:790:35:790:69 | (...)... : Builder | provenance |  |
-| Test.java:791:10:791:11 | in : Builder | Test.java:791:10:791:29 | add(...) : Builder | provenance | MaD:44 |
+| Test.java:791:10:791:11 | in : Builder | Test.java:791:10:791:29 | add(...) : Builder | provenance | MaD:45 |
 | Test.java:791:10:791:29 | add(...) : Builder | Test.java:792:9:792:11 | out | provenance |  |
 | Test.java:797:31:797:61 | (...)... : Builder | Test.java:798:10:798:11 | in : Builder | provenance |  |
 | Test.java:797:54:797:61 | source(...) : Object | Test.java:797:31:797:61 | (...)... : Builder | provenance |  |
-| Test.java:798:10:798:11 | in : Builder | Test.java:798:10:798:31 | add(...) : Builder | provenance | MaD:44 |
+| Test.java:798:10:798:11 | in : Builder | Test.java:798:10:798:31 | add(...) : Builder | provenance | MaD:45 |
 | Test.java:798:10:798:31 | add(...) : Builder | Test.java:799:9:799:11 | out | provenance |  |
 | Test.java:804:31:804:61 | (...)... : Builder | Test.java:805:10:805:11 | in : Builder | provenance |  |
 | Test.java:804:54:804:61 | source(...) : Object | Test.java:804:31:804:61 | (...)... : Builder | provenance |  |
-| Test.java:805:10:805:11 | in : Builder | Test.java:805:10:805:29 | add(...) : Builder | provenance | MaD:44 |
+| Test.java:805:10:805:11 | in : Builder | Test.java:805:10:805:29 | add(...) : Builder | provenance | MaD:45 |
 | Test.java:805:10:805:29 | add(...) : Builder | Test.java:806:9:806:11 | out | provenance |  |
 | Test.java:811:37:811:73 | (...)... : Builder | Test.java:812:10:812:11 | in : Builder | provenance |  |
 | Test.java:811:66:811:73 | source(...) : Object | Test.java:811:37:811:73 | (...)... : Builder | provenance |  |
-| Test.java:812:10:812:11 | in : Builder | Test.java:812:10:812:31 | add(...) : Builder | provenance | MaD:44 |
+| Test.java:812:10:812:11 | in : Builder | Test.java:812:10:812:31 | add(...) : Builder | provenance | MaD:45 |
 | Test.java:812:10:812:31 | add(...) : Builder | Test.java:813:9:813:11 | out | provenance |  |
 | Test.java:818:37:818:73 | (...)... : Builder | Test.java:819:10:819:11 | in : Builder | provenance |  |
 | Test.java:818:66:818:73 | source(...) : Object | Test.java:818:37:818:73 | (...)... : Builder | provenance |  |
-| Test.java:819:10:819:11 | in : Builder | Test.java:819:10:819:29 | add(...) : Builder | provenance | MaD:44 |
+| Test.java:819:10:819:11 | in : Builder | Test.java:819:10:819:29 | add(...) : Builder | provenance | MaD:45 |
 | Test.java:819:10:819:29 | add(...) : Builder | Test.java:820:9:820:11 | out | provenance |  |
 | Test.java:825:18:825:44 | (...)... : List [<element>] : Object | Test.java:826:15:826:16 | in : List [<element>] : Object | provenance |  |
 | Test.java:825:28:825:44 | of(...) : List [<element>] : Object | Test.java:825:18:825:44 | (...)... : List [<element>] : Object | provenance |  |
-| Test.java:825:36:825:43 | source(...) : Object | Test.java:825:28:825:44 | of(...) : List [<element>] : Object | provenance | MaD:558 |
+| Test.java:825:36:825:43 | source(...) : Object | Test.java:825:28:825:44 | of(...) : List [<element>] : Object | provenance | MaD:561 |
 | Test.java:826:4:826:6 | out [post update] : Builder [<element>] : Object | Test.java:827:20:827:22 | out : Builder [<element>] : Object | provenance |  |
-| Test.java:826:15:826:16 | in : List [<element>] : Object | Test.java:826:4:826:6 | out [post update] : Builder [<element>] : Object | provenance | MaD:48 |
+| Test.java:826:15:826:16 | in : List [<element>] : Object | Test.java:826:4:826:6 | out [post update] : Builder [<element>] : Object | provenance | MaD:46 |
 | Test.java:827:20:827:22 | out : Builder [<element>] : Object | Test.java:109:19:109:50 | b : Builder [<element>] : Object | provenance |  |
-| Test.java:827:20:827:22 | out : Builder [<element>] : Object | Test.java:827:9:827:23 | getElement(...) | provenance | MaD:50 |
+| Test.java:827:20:827:22 | out : Builder [<element>] : Object | Test.java:827:9:827:23 | getElement(...) | provenance | MaD:49 |
 | Test.java:832:18:832:44 | (...)... : List [<element>] : Object | Test.java:833:15:833:16 | in : List [<element>] : Object | provenance |  |
 | Test.java:832:28:832:44 | of(...) : List [<element>] : Object | Test.java:832:18:832:44 | (...)... : List [<element>] : Object | provenance |  |
-| Test.java:832:36:832:43 | source(...) : Object | Test.java:832:28:832:44 | of(...) : List [<element>] : Object | provenance | MaD:558 |
+| Test.java:832:36:832:43 | source(...) : Object | Test.java:832:28:832:44 | of(...) : List [<element>] : Object | provenance | MaD:561 |
 | Test.java:833:4:833:6 | out [post update] : Builder [<element>] : Object | Test.java:834:20:834:22 | out : Builder [<element>] : Object | provenance |  |
-| Test.java:833:15:833:16 | in : List [<element>] : Object | Test.java:833:4:833:6 | out [post update] : Builder [<element>] : Object | provenance | MaD:48 |
+| Test.java:833:15:833:16 | in : List [<element>] : Object | Test.java:833:4:833:6 | out [post update] : Builder [<element>] : Object | provenance | MaD:46 |
 | Test.java:834:20:834:22 | out : Builder [<element>] : Object | Test.java:109:19:109:50 | b : Builder [<element>] : Object | provenance |  |
-| Test.java:834:20:834:22 | out : Builder [<element>] : Object | Test.java:834:9:834:23 | getElement(...) | provenance | MaD:50 |
+| Test.java:834:20:834:22 | out : Builder [<element>] : Object | Test.java:834:9:834:23 | getElement(...) | provenance | MaD:49 |
 | Test.java:839:18:839:44 | (...)... : List [<element>] : Object | Test.java:840:15:840:16 | in : List [<element>] : Object | provenance |  |
 | Test.java:839:28:839:44 | of(...) : List [<element>] : Object | Test.java:839:18:839:44 | (...)... : List [<element>] : Object | provenance |  |
-| Test.java:839:36:839:43 | source(...) : Object | Test.java:839:28:839:44 | of(...) : List [<element>] : Object | provenance | MaD:558 |
+| Test.java:839:36:839:43 | source(...) : Object | Test.java:839:28:839:44 | of(...) : List [<element>] : Object | provenance | MaD:561 |
 | Test.java:840:4:840:6 | out [post update] : Builder [<element>] : Object | Test.java:841:20:841:22 | out : Builder [<element>] : Object | provenance |  |
-| Test.java:840:15:840:16 | in : List [<element>] : Object | Test.java:840:4:840:6 | out [post update] : Builder [<element>] : Object | provenance | MaD:48 |
+| Test.java:840:15:840:16 | in : List [<element>] : Object | Test.java:840:4:840:6 | out [post update] : Builder [<element>] : Object | provenance | MaD:46 |
 | Test.java:841:20:841:22 | out : Builder [<element>] : Object | Test.java:109:19:109:50 | b : Builder [<element>] : Object | provenance |  |
-| Test.java:841:20:841:22 | out : Builder [<element>] : Object | Test.java:841:9:841:23 | getElement(...) | provenance | MaD:50 |
+| Test.java:841:20:841:22 | out : Builder [<element>] : Object | Test.java:841:9:841:23 | getElement(...) | provenance | MaD:49 |
 | Test.java:846:18:846:44 | (...)... : List [<element>] : Object | Test.java:847:15:847:16 | in : List [<element>] : Object | provenance |  |
 | Test.java:846:28:846:44 | of(...) : List [<element>] : Object | Test.java:846:18:846:44 | (...)... : List [<element>] : Object | provenance |  |
-| Test.java:846:36:846:43 | source(...) : Object | Test.java:846:28:846:44 | of(...) : List [<element>] : Object | provenance | MaD:558 |
+| Test.java:846:36:846:43 | source(...) : Object | Test.java:846:28:846:44 | of(...) : List [<element>] : Object | provenance | MaD:561 |
 | Test.java:847:4:847:6 | out [post update] : Builder [<element>] : Object | Test.java:848:20:848:22 | out : Builder [<element>] : Object | provenance |  |
-| Test.java:847:15:847:16 | in : List [<element>] : Object | Test.java:847:4:847:6 | out [post update] : Builder [<element>] : Object | provenance | MaD:48 |
+| Test.java:847:15:847:16 | in : List [<element>] : Object | Test.java:847:4:847:6 | out [post update] : Builder [<element>] : Object | provenance | MaD:46 |
 | Test.java:848:20:848:22 | out : Builder [<element>] : Object | Test.java:109:19:109:50 | b : Builder [<element>] : Object | provenance |  |
-| Test.java:848:20:848:22 | out : Builder [<element>] : Object | Test.java:848:9:848:23 | getElement(...) | provenance | MaD:50 |
+| Test.java:848:20:848:22 | out : Builder [<element>] : Object | Test.java:848:9:848:23 | getElement(...) | provenance | MaD:49 |
 | Test.java:853:18:853:44 | (...)... : List [<element>] : Object | Test.java:854:15:854:16 | in : List [<element>] : Object | provenance |  |
 | Test.java:853:28:853:44 | of(...) : List [<element>] : Object | Test.java:853:18:853:44 | (...)... : List [<element>] : Object | provenance |  |
-| Test.java:853:36:853:43 | source(...) : Object | Test.java:853:28:853:44 | of(...) : List [<element>] : Object | provenance | MaD:558 |
+| Test.java:853:36:853:43 | source(...) : Object | Test.java:853:28:853:44 | of(...) : List [<element>] : Object | provenance | MaD:561 |
 | Test.java:854:4:854:6 | out [post update] : Builder [<element>] : Object | Test.java:855:20:855:22 | out : Builder [<element>] : Object | provenance |  |
-| Test.java:854:15:854:16 | in : List [<element>] : Object | Test.java:854:4:854:6 | out [post update] : Builder [<element>] : Object | provenance | MaD:48 |
+| Test.java:854:15:854:16 | in : List [<element>] : Object | Test.java:854:4:854:6 | out [post update] : Builder [<element>] : Object | provenance | MaD:46 |
 | Test.java:855:20:855:22 | out : Builder [<element>] : Object | Test.java:109:19:109:50 | b : Builder [<element>] : Object | provenance |  |
-| Test.java:855:20:855:22 | out : Builder [<element>] : Object | Test.java:855:9:855:23 | getElement(...) | provenance | MaD:50 |
+| Test.java:855:20:855:22 | out : Builder [<element>] : Object | Test.java:855:9:855:23 | getElement(...) | provenance | MaD:49 |
 | Test.java:860:18:860:44 | (...)... : List [<element>] : Object | Test.java:861:15:861:16 | in : List [<element>] : Object | provenance |  |
 | Test.java:860:28:860:44 | of(...) : List [<element>] : Object | Test.java:860:18:860:44 | (...)... : List [<element>] : Object | provenance |  |
-| Test.java:860:36:860:43 | source(...) : Object | Test.java:860:28:860:44 | of(...) : List [<element>] : Object | provenance | MaD:558 |
+| Test.java:860:36:860:43 | source(...) : Object | Test.java:860:28:860:44 | of(...) : List [<element>] : Object | provenance | MaD:561 |
 | Test.java:861:4:861:6 | out [post update] : Builder [<element>] : Object | Test.java:862:20:862:22 | out : Builder [<element>] : Object | provenance |  |
-| Test.java:861:15:861:16 | in : List [<element>] : Object | Test.java:861:4:861:6 | out [post update] : Builder [<element>] : Object | provenance | MaD:48 |
+| Test.java:861:15:861:16 | in : List [<element>] : Object | Test.java:861:4:861:6 | out [post update] : Builder [<element>] : Object | provenance | MaD:46 |
 | Test.java:862:20:862:22 | out : Builder [<element>] : Object | Test.java:109:19:109:50 | b : Builder [<element>] : Object | provenance |  |
-| Test.java:862:20:862:22 | out : Builder [<element>] : Object | Test.java:862:9:862:23 | getElement(...) | provenance | MaD:50 |
+| Test.java:862:20:862:22 | out : Builder [<element>] : Object | Test.java:862:9:862:23 | getElement(...) | provenance | MaD:49 |
 | Test.java:867:18:867:55 | (...)... : Iterator [<element>] : Object | Test.java:868:15:868:16 | in : Iterator [<element>] : Object | provenance |  |
-| Test.java:867:28:867:44 | of(...) : List [<element>] : Object | Test.java:867:28:867:55 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:555 |
+| Test.java:867:28:867:44 | of(...) : List [<element>] : Object | Test.java:867:28:867:55 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:558 |
 | Test.java:867:28:867:55 | iterator(...) : Iterator [<element>] : Object | Test.java:867:18:867:55 | (...)... : Iterator [<element>] : Object | provenance |  |
-| Test.java:867:36:867:43 | source(...) : Object | Test.java:867:28:867:44 | of(...) : List [<element>] : Object | provenance | MaD:558 |
+| Test.java:867:36:867:43 | source(...) : Object | Test.java:867:28:867:44 | of(...) : List [<element>] : Object | provenance | MaD:561 |
 | Test.java:868:4:868:6 | out [post update] : Builder [<element>] : Object | Test.java:869:20:869:22 | out : Builder [<element>] : Object | provenance |  |
-| Test.java:868:15:868:16 | in : Iterator [<element>] : Object | Test.java:868:4:868:6 | out [post update] : Builder [<element>] : Object | provenance | MaD:49 |
+| Test.java:868:15:868:16 | in : Iterator [<element>] : Object | Test.java:868:4:868:6 | out [post update] : Builder [<element>] : Object | provenance | MaD:47 |
 | Test.java:869:20:869:22 | out : Builder [<element>] : Object | Test.java:109:19:109:50 | b : Builder [<element>] : Object | provenance |  |
-| Test.java:869:20:869:22 | out : Builder [<element>] : Object | Test.java:869:9:869:23 | getElement(...) | provenance | MaD:50 |
+| Test.java:869:20:869:22 | out : Builder [<element>] : Object | Test.java:869:9:869:23 | getElement(...) | provenance | MaD:49 |
 | Test.java:874:18:874:55 | (...)... : Iterator [<element>] : Object | Test.java:875:15:875:16 | in : Iterator [<element>] : Object | provenance |  |
-| Test.java:874:28:874:44 | of(...) : List [<element>] : Object | Test.java:874:28:874:55 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:555 |
+| Test.java:874:28:874:44 | of(...) : List [<element>] : Object | Test.java:874:28:874:55 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:558 |
 | Test.java:874:28:874:55 | iterator(...) : Iterator [<element>] : Object | Test.java:874:18:874:55 | (...)... : Iterator [<element>] : Object | provenance |  |
-| Test.java:874:36:874:43 | source(...) : Object | Test.java:874:28:874:44 | of(...) : List [<element>] : Object | provenance | MaD:558 |
+| Test.java:874:36:874:43 | source(...) : Object | Test.java:874:28:874:44 | of(...) : List [<element>] : Object | provenance | MaD:561 |
 | Test.java:875:4:875:6 | out [post update] : Builder [<element>] : Object | Test.java:876:20:876:22 | out : Builder [<element>] : Object | provenance |  |
-| Test.java:875:15:875:16 | in : Iterator [<element>] : Object | Test.java:875:4:875:6 | out [post update] : Builder [<element>] : Object | provenance | MaD:49 |
+| Test.java:875:15:875:16 | in : Iterator [<element>] : Object | Test.java:875:4:875:6 | out [post update] : Builder [<element>] : Object | provenance | MaD:47 |
 | Test.java:876:20:876:22 | out : Builder [<element>] : Object | Test.java:109:19:109:50 | b : Builder [<element>] : Object | provenance |  |
-| Test.java:876:20:876:22 | out : Builder [<element>] : Object | Test.java:876:9:876:23 | getElement(...) | provenance | MaD:50 |
+| Test.java:876:20:876:22 | out : Builder [<element>] : Object | Test.java:876:9:876:23 | getElement(...) | provenance | MaD:49 |
 | Test.java:881:18:881:55 | (...)... : Iterator [<element>] : Object | Test.java:882:15:882:16 | in : Iterator [<element>] : Object | provenance |  |
-| Test.java:881:28:881:44 | of(...) : List [<element>] : Object | Test.java:881:28:881:55 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:555 |
+| Test.java:881:28:881:44 | of(...) : List [<element>] : Object | Test.java:881:28:881:55 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:558 |
 | Test.java:881:28:881:55 | iterator(...) : Iterator [<element>] : Object | Test.java:881:18:881:55 | (...)... : Iterator [<element>] : Object | provenance |  |
-| Test.java:881:36:881:43 | source(...) : Object | Test.java:881:28:881:44 | of(...) : List [<element>] : Object | provenance | MaD:558 |
+| Test.java:881:36:881:43 | source(...) : Object | Test.java:881:28:881:44 | of(...) : List [<element>] : Object | provenance | MaD:561 |
 | Test.java:882:4:882:6 | out [post update] : Builder [<element>] : Object | Test.java:883:20:883:22 | out : Builder [<element>] : Object | provenance |  |
-| Test.java:882:15:882:16 | in : Iterator [<element>] : Object | Test.java:882:4:882:6 | out [post update] : Builder [<element>] : Object | provenance | MaD:49 |
+| Test.java:882:15:882:16 | in : Iterator [<element>] : Object | Test.java:882:4:882:6 | out [post update] : Builder [<element>] : Object | provenance | MaD:47 |
 | Test.java:883:20:883:22 | out : Builder [<element>] : Object | Test.java:109:19:109:50 | b : Builder [<element>] : Object | provenance |  |
-| Test.java:883:20:883:22 | out : Builder [<element>] : Object | Test.java:883:9:883:23 | getElement(...) | provenance | MaD:50 |
+| Test.java:883:20:883:22 | out : Builder [<element>] : Object | Test.java:883:9:883:23 | getElement(...) | provenance | MaD:49 |
 | Test.java:888:18:888:55 | (...)... : Iterator [<element>] : Object | Test.java:889:15:889:16 | in : Iterator [<element>] : Object | provenance |  |
-| Test.java:888:28:888:44 | of(...) : List [<element>] : Object | Test.java:888:28:888:55 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:555 |
+| Test.java:888:28:888:44 | of(...) : List [<element>] : Object | Test.java:888:28:888:55 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:558 |
 | Test.java:888:28:888:55 | iterator(...) : Iterator [<element>] : Object | Test.java:888:18:888:55 | (...)... : Iterator [<element>] : Object | provenance |  |
-| Test.java:888:36:888:43 | source(...) : Object | Test.java:888:28:888:44 | of(...) : List [<element>] : Object | provenance | MaD:558 |
+| Test.java:888:36:888:43 | source(...) : Object | Test.java:888:28:888:44 | of(...) : List [<element>] : Object | provenance | MaD:561 |
 | Test.java:889:4:889:6 | out [post update] : Builder [<element>] : Object | Test.java:890:20:890:22 | out : Builder [<element>] : Object | provenance |  |
-| Test.java:889:15:889:16 | in : Iterator [<element>] : Object | Test.java:889:4:889:6 | out [post update] : Builder [<element>] : Object | provenance | MaD:49 |
+| Test.java:889:15:889:16 | in : Iterator [<element>] : Object | Test.java:889:4:889:6 | out [post update] : Builder [<element>] : Object | provenance | MaD:47 |
 | Test.java:890:20:890:22 | out : Builder [<element>] : Object | Test.java:109:19:109:50 | b : Builder [<element>] : Object | provenance |  |
-| Test.java:890:20:890:22 | out : Builder [<element>] : Object | Test.java:890:9:890:23 | getElement(...) | provenance | MaD:50 |
+| Test.java:890:20:890:22 | out : Builder [<element>] : Object | Test.java:890:9:890:23 | getElement(...) | provenance | MaD:49 |
 | Test.java:895:18:895:55 | (...)... : Iterator [<element>] : Object | Test.java:896:15:896:16 | in : Iterator [<element>] : Object | provenance |  |
-| Test.java:895:28:895:44 | of(...) : List [<element>] : Object | Test.java:895:28:895:55 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:555 |
+| Test.java:895:28:895:44 | of(...) : List [<element>] : Object | Test.java:895:28:895:55 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:558 |
 | Test.java:895:28:895:55 | iterator(...) : Iterator [<element>] : Object | Test.java:895:18:895:55 | (...)... : Iterator [<element>] : Object | provenance |  |
-| Test.java:895:36:895:43 | source(...) : Object | Test.java:895:28:895:44 | of(...) : List [<element>] : Object | provenance | MaD:558 |
+| Test.java:895:36:895:43 | source(...) : Object | Test.java:895:28:895:44 | of(...) : List [<element>] : Object | provenance | MaD:561 |
 | Test.java:896:4:896:6 | out [post update] : Builder [<element>] : Object | Test.java:897:20:897:22 | out : Builder [<element>] : Object | provenance |  |
-| Test.java:896:15:896:16 | in : Iterator [<element>] : Object | Test.java:896:4:896:6 | out [post update] : Builder [<element>] : Object | provenance | MaD:49 |
+| Test.java:896:15:896:16 | in : Iterator [<element>] : Object | Test.java:896:4:896:6 | out [post update] : Builder [<element>] : Object | provenance | MaD:47 |
 | Test.java:897:20:897:22 | out : Builder [<element>] : Object | Test.java:109:19:109:50 | b : Builder [<element>] : Object | provenance |  |
-| Test.java:897:20:897:22 | out : Builder [<element>] : Object | Test.java:897:9:897:23 | getElement(...) | provenance | MaD:50 |
+| Test.java:897:20:897:22 | out : Builder [<element>] : Object | Test.java:897:9:897:23 | getElement(...) | provenance | MaD:49 |
 | Test.java:902:18:902:55 | (...)... : Iterator [<element>] : Object | Test.java:903:15:903:16 | in : Iterator [<element>] : Object | provenance |  |
-| Test.java:902:28:902:44 | of(...) : List [<element>] : Object | Test.java:902:28:902:55 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:555 |
+| Test.java:902:28:902:44 | of(...) : List [<element>] : Object | Test.java:902:28:902:55 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:558 |
 | Test.java:902:28:902:55 | iterator(...) : Iterator [<element>] : Object | Test.java:902:18:902:55 | (...)... : Iterator [<element>] : Object | provenance |  |
-| Test.java:902:36:902:43 | source(...) : Object | Test.java:902:28:902:44 | of(...) : List [<element>] : Object | provenance | MaD:558 |
+| Test.java:902:36:902:43 | source(...) : Object | Test.java:902:28:902:44 | of(...) : List [<element>] : Object | provenance | MaD:561 |
 | Test.java:903:4:903:6 | out [post update] : Builder [<element>] : Object | Test.java:904:20:904:22 | out : Builder [<element>] : Object | provenance |  |
-| Test.java:903:15:903:16 | in : Iterator [<element>] : Object | Test.java:903:4:903:6 | out [post update] : Builder [<element>] : Object | provenance | MaD:49 |
+| Test.java:903:15:903:16 | in : Iterator [<element>] : Object | Test.java:903:4:903:6 | out [post update] : Builder [<element>] : Object | provenance | MaD:47 |
 | Test.java:904:20:904:22 | out : Builder [<element>] : Object | Test.java:109:19:109:50 | b : Builder [<element>] : Object | provenance |  |
-| Test.java:904:20:904:22 | out : Builder [<element>] : Object | Test.java:904:9:904:23 | getElement(...) | provenance | MaD:50 |
+| Test.java:904:20:904:22 | out : Builder [<element>] : Object | Test.java:904:9:904:23 | getElement(...) | provenance | MaD:49 |
 | Test.java:909:36:909:71 | (...)... : Builder | Test.java:910:10:910:11 | in : Builder | provenance |  |
 | Test.java:909:64:909:71 | source(...) : Object | Test.java:909:36:909:71 | (...)... : Builder | provenance |  |
-| Test.java:910:10:910:11 | in : Builder | Test.java:910:10:910:34 | addAll(...) : Builder | provenance | MaD:47 |
+| Test.java:910:10:910:11 | in : Builder | Test.java:910:10:910:34 | addAll(...) : Builder | provenance | MaD:48 |
 | Test.java:910:10:910:34 | addAll(...) : Builder | Test.java:911:9:911:11 | out | provenance |  |
 | Test.java:916:36:916:71 | (...)... : Builder | Test.java:917:10:917:11 | in : Builder | provenance |  |
 | Test.java:916:64:916:71 | source(...) : Object | Test.java:916:36:916:71 | (...)... : Builder | provenance |  |
-| Test.java:917:10:917:11 | in : Builder | Test.java:917:10:917:34 | addAll(...) : Builder | provenance | MaD:47 |
+| Test.java:917:10:917:11 | in : Builder | Test.java:917:10:917:34 | addAll(...) : Builder | provenance | MaD:48 |
 | Test.java:917:10:917:34 | addAll(...) : Builder | Test.java:918:9:918:11 | out | provenance |  |
 | Test.java:923:41:923:81 | (...)... : Builder | Test.java:924:10:924:11 | in : Builder | provenance |  |
 | Test.java:923:74:923:81 | source(...) : Object | Test.java:923:41:923:81 | (...)... : Builder | provenance |  |
-| Test.java:924:10:924:11 | in : Builder | Test.java:924:10:924:34 | addAll(...) : Builder | provenance | MaD:47 |
+| Test.java:924:10:924:11 | in : Builder | Test.java:924:10:924:34 | addAll(...) : Builder | provenance | MaD:48 |
 | Test.java:924:10:924:34 | addAll(...) : Builder | Test.java:925:9:925:11 | out | provenance |  |
 | Test.java:930:41:930:81 | (...)... : Builder | Test.java:931:10:931:11 | in : Builder | provenance |  |
 | Test.java:930:74:930:81 | source(...) : Object | Test.java:930:41:930:81 | (...)... : Builder | provenance |  |
-| Test.java:931:10:931:11 | in : Builder | Test.java:931:10:931:34 | addAll(...) : Builder | provenance | MaD:47 |
+| Test.java:931:10:931:11 | in : Builder | Test.java:931:10:931:34 | addAll(...) : Builder | provenance | MaD:48 |
 | Test.java:931:10:931:34 | addAll(...) : Builder | Test.java:932:9:932:11 | out | provenance |  |
 | Test.java:937:30:937:59 | (...)... : Builder | Test.java:938:10:938:11 | in : Builder | provenance |  |
 | Test.java:937:52:937:59 | source(...) : Object | Test.java:937:30:937:59 | (...)... : Builder | provenance |  |
-| Test.java:938:10:938:11 | in : Builder | Test.java:938:10:938:34 | addAll(...) : Builder | provenance | MaD:47 |
+| Test.java:938:10:938:11 | in : Builder | Test.java:938:10:938:34 | addAll(...) : Builder | provenance | MaD:48 |
 | Test.java:938:10:938:34 | addAll(...) : Builder | Test.java:939:9:939:11 | out | provenance |  |
 | Test.java:944:30:944:59 | (...)... : Builder | Test.java:945:10:945:11 | in : Builder | provenance |  |
 | Test.java:944:52:944:59 | source(...) : Object | Test.java:944:30:944:59 | (...)... : Builder | provenance |  |
-| Test.java:945:10:945:11 | in : Builder | Test.java:945:10:945:34 | addAll(...) : Builder | provenance | MaD:47 |
+| Test.java:945:10:945:11 | in : Builder | Test.java:945:10:945:34 | addAll(...) : Builder | provenance | MaD:48 |
 | Test.java:945:10:945:34 | addAll(...) : Builder | Test.java:946:9:946:11 | out | provenance |  |
 | Test.java:951:35:951:69 | (...)... : Builder | Test.java:952:10:952:11 | in : Builder | provenance |  |
 | Test.java:951:62:951:69 | source(...) : Object | Test.java:951:35:951:69 | (...)... : Builder | provenance |  |
-| Test.java:952:10:952:11 | in : Builder | Test.java:952:10:952:34 | addAll(...) : Builder | provenance | MaD:47 |
+| Test.java:952:10:952:11 | in : Builder | Test.java:952:10:952:34 | addAll(...) : Builder | provenance | MaD:48 |
 | Test.java:952:10:952:34 | addAll(...) : Builder | Test.java:953:9:953:11 | out | provenance |  |
 | Test.java:958:35:958:69 | (...)... : Builder | Test.java:959:10:959:11 | in : Builder | provenance |  |
 | Test.java:958:62:958:69 | source(...) : Object | Test.java:958:35:958:69 | (...)... : Builder | provenance |  |
-| Test.java:959:10:959:11 | in : Builder | Test.java:959:10:959:34 | addAll(...) : Builder | provenance | MaD:47 |
+| Test.java:959:10:959:11 | in : Builder | Test.java:959:10:959:34 | addAll(...) : Builder | provenance | MaD:48 |
 | Test.java:959:10:959:34 | addAll(...) : Builder | Test.java:960:9:960:11 | out | provenance |  |
 | Test.java:965:31:965:61 | (...)... : Builder | Test.java:966:10:966:11 | in : Builder | provenance |  |
 | Test.java:965:54:965:61 | source(...) : Object | Test.java:965:31:965:61 | (...)... : Builder | provenance |  |
-| Test.java:966:10:966:11 | in : Builder | Test.java:966:10:966:34 | addAll(...) : Builder | provenance | MaD:47 |
+| Test.java:966:10:966:11 | in : Builder | Test.java:966:10:966:34 | addAll(...) : Builder | provenance | MaD:48 |
 | Test.java:966:10:966:34 | addAll(...) : Builder | Test.java:967:9:967:11 | out | provenance |  |
 | Test.java:972:31:972:61 | (...)... : Builder | Test.java:973:10:973:11 | in : Builder | provenance |  |
 | Test.java:972:54:972:61 | source(...) : Object | Test.java:972:31:972:61 | (...)... : Builder | provenance |  |
-| Test.java:973:10:973:11 | in : Builder | Test.java:973:10:973:34 | addAll(...) : Builder | provenance | MaD:47 |
+| Test.java:973:10:973:11 | in : Builder | Test.java:973:10:973:34 | addAll(...) : Builder | provenance | MaD:48 |
 | Test.java:973:10:973:34 | addAll(...) : Builder | Test.java:974:9:974:11 | out | provenance |  |
 | Test.java:979:37:979:73 | (...)... : Builder | Test.java:980:10:980:11 | in : Builder | provenance |  |
 | Test.java:979:66:979:73 | source(...) : Object | Test.java:979:37:979:73 | (...)... : Builder | provenance |  |
-| Test.java:980:10:980:11 | in : Builder | Test.java:980:10:980:34 | addAll(...) : Builder | provenance | MaD:47 |
+| Test.java:980:10:980:11 | in : Builder | Test.java:980:10:980:34 | addAll(...) : Builder | provenance | MaD:48 |
 | Test.java:980:10:980:34 | addAll(...) : Builder | Test.java:981:9:981:11 | out | provenance |  |
 | Test.java:986:37:986:73 | (...)... : Builder | Test.java:987:10:987:11 | in : Builder | provenance |  |
 | Test.java:986:66:986:73 | source(...) : Object | Test.java:986:37:986:73 | (...)... : Builder | provenance |  |
-| Test.java:987:10:987:11 | in : Builder | Test.java:987:10:987:34 | addAll(...) : Builder | provenance | MaD:47 |
+| Test.java:987:10:987:11 | in : Builder | Test.java:987:10:987:34 | addAll(...) : Builder | provenance | MaD:48 |
 | Test.java:987:10:987:34 | addAll(...) : Builder | Test.java:988:9:988:11 | out | provenance |  |
 | Test.java:993:36:993:105 | (...)... : Builder [<element>] : Object | Test.java:994:10:994:11 | in : Builder [<element>] : Object | provenance |  |
 | Test.java:993:64:993:105 | add(...) : Builder [<element>] : Object | Test.java:993:36:993:105 | (...)... : Builder [<element>] : Object | provenance |  |
-| Test.java:993:97:993:104 | source(...) : Object | Test.java:993:64:993:105 | add(...) : Builder [<element>] : Object | provenance | MaD:45+MaD:44 |
-| Test.java:994:10:994:11 | in : Builder [<element>] : Object | Test.java:994:10:994:19 | build(...) : ImmutableSortedSet [<element>] : Object | provenance | MaD:50 |
+| Test.java:993:97:993:104 | source(...) : Object | Test.java:993:64:993:105 | add(...) : Builder [<element>] : Object | provenance | MaD:43+MaD:45 |
+| Test.java:994:10:994:11 | in : Builder [<element>] : Object | Test.java:994:10:994:19 | build(...) : ImmutableSortedSet [<element>] : Object | provenance | MaD:49 |
 | Test.java:994:10:994:19 | build(...) : ImmutableSortedSet [<element>] : Object | Test.java:995:20:995:22 | out : ImmutableSortedSet [<element>] : Object | provenance |  |
 | Test.java:995:20:995:22 | out : ImmutableSortedSet [<element>] : Object | Test.java:110:19:110:32 | it : ImmutableSortedSet [<element>] : Object | provenance |  |
-| Test.java:995:20:995:22 | out : ImmutableSortedSet [<element>] : Object | Test.java:995:9:995:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:995:20:995:22 | out : ImmutableSortedSet [<element>] : Object | Test.java:995:9:995:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:1000:41:1000:120 | (...)... : Builder [<element>] : Object | Test.java:1001:10:1001:11 | in : Builder [<element>] : Object | provenance |  |
 | Test.java:1000:74:1000:120 | add(...) : Builder [<element>] : Object | Test.java:1000:41:1000:120 | (...)... : Builder [<element>] : Object | provenance |  |
-| Test.java:1000:112:1000:119 | source(...) : Object | Test.java:1000:74:1000:120 | add(...) : Builder [<element>] : Object | provenance | MaD:45+MaD:44 |
-| Test.java:1001:10:1001:11 | in : Builder [<element>] : Object | Test.java:1001:10:1001:19 | build(...) : ImmutableSortedMultiset [<element>] : Object | provenance | MaD:50 |
+| Test.java:1000:112:1000:119 | source(...) : Object | Test.java:1000:74:1000:120 | add(...) : Builder [<element>] : Object | provenance | MaD:43+MaD:45 |
+| Test.java:1001:10:1001:11 | in : Builder [<element>] : Object | Test.java:1001:10:1001:19 | build(...) : ImmutableSortedMultiset [<element>] : Object | provenance | MaD:49 |
 | Test.java:1001:10:1001:19 | build(...) : ImmutableSortedMultiset [<element>] : Object | Test.java:1002:20:1002:22 | out : ImmutableSortedMultiset [<element>] : Object | provenance |  |
 | Test.java:1002:20:1002:22 | out : ImmutableSortedMultiset [<element>] : Object | Test.java:110:19:110:32 | it : ImmutableSortedMultiset [<element>] : Object | provenance |  |
-| Test.java:1002:20:1002:22 | out : ImmutableSortedMultiset [<element>] : Object | Test.java:1002:9:1002:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:1002:20:1002:22 | out : ImmutableSortedMultiset [<element>] : Object | Test.java:1002:9:1002:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:1007:30:1007:87 | (...)... : Builder [<element>] : Object | Test.java:1008:10:1008:11 | in : Builder [<element>] : Object | provenance |  |
 | Test.java:1007:52:1007:87 | add(...) : Builder [<element>] : Object | Test.java:1007:30:1007:87 | (...)... : Builder [<element>] : Object | provenance |  |
-| Test.java:1007:79:1007:86 | source(...) : Object | Test.java:1007:52:1007:87 | add(...) : Builder [<element>] : Object | provenance | MaD:45+MaD:44 |
-| Test.java:1008:10:1008:11 | in : Builder [<element>] : Object | Test.java:1008:10:1008:19 | build(...) : ImmutableSet [<element>] : Object | provenance | MaD:50 |
+| Test.java:1007:79:1007:86 | source(...) : Object | Test.java:1007:52:1007:87 | add(...) : Builder [<element>] : Object | provenance | MaD:43+MaD:45 |
+| Test.java:1008:10:1008:11 | in : Builder [<element>] : Object | Test.java:1008:10:1008:19 | build(...) : ImmutableSet [<element>] : Object | provenance | MaD:49 |
 | Test.java:1008:10:1008:19 | build(...) : ImmutableSet [<element>] : Object | Test.java:1009:20:1009:22 | out : ImmutableSet [<element>] : Object | provenance |  |
 | Test.java:1009:20:1009:22 | out : ImmutableSet [<element>] : Object | Test.java:110:19:110:32 | it : ImmutableSet [<element>] : Object | provenance |  |
-| Test.java:1009:20:1009:22 | out : ImmutableSet [<element>] : Object | Test.java:1009:9:1009:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:1009:20:1009:22 | out : ImmutableSet [<element>] : Object | Test.java:1009:9:1009:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:1014:35:1014:102 | (...)... : Builder [<element>] : Object | Test.java:1015:10:1015:11 | in : Builder [<element>] : Object | provenance |  |
 | Test.java:1014:62:1014:102 | add(...) : Builder [<element>] : Object | Test.java:1014:35:1014:102 | (...)... : Builder [<element>] : Object | provenance |  |
-| Test.java:1014:94:1014:101 | source(...) : Object | Test.java:1014:62:1014:102 | add(...) : Builder [<element>] : Object | provenance | MaD:45+MaD:44 |
-| Test.java:1015:10:1015:11 | in : Builder [<element>] : Object | Test.java:1015:10:1015:19 | build(...) : ImmutableMultiset [<element>] : Object | provenance | MaD:50 |
+| Test.java:1014:94:1014:101 | source(...) : Object | Test.java:1014:62:1014:102 | add(...) : Builder [<element>] : Object | provenance | MaD:43+MaD:45 |
+| Test.java:1015:10:1015:11 | in : Builder [<element>] : Object | Test.java:1015:10:1015:19 | build(...) : ImmutableMultiset [<element>] : Object | provenance | MaD:49 |
 | Test.java:1015:10:1015:19 | build(...) : ImmutableMultiset [<element>] : Object | Test.java:1016:20:1016:22 | out : ImmutableMultiset [<element>] : Object | provenance |  |
 | Test.java:1016:20:1016:22 | out : ImmutableMultiset [<element>] : Object | Test.java:110:19:110:32 | it : ImmutableMultiset [<element>] : Object | provenance |  |
-| Test.java:1016:20:1016:22 | out : ImmutableMultiset [<element>] : Object | Test.java:1016:9:1016:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:1016:20:1016:22 | out : ImmutableMultiset [<element>] : Object | Test.java:1016:9:1016:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:1021:31:1021:90 | (...)... : Builder [<element>] : Object | Test.java:1022:10:1022:11 | in : Builder [<element>] : Object | provenance |  |
 | Test.java:1021:54:1021:90 | add(...) : Builder [<element>] : Object | Test.java:1021:31:1021:90 | (...)... : Builder [<element>] : Object | provenance |  |
-| Test.java:1021:82:1021:89 | source(...) : Object | Test.java:1021:54:1021:90 | add(...) : Builder [<element>] : Object | provenance | MaD:45+MaD:44 |
-| Test.java:1022:10:1022:11 | in : Builder [<element>] : Object | Test.java:1022:10:1022:19 | build(...) : ImmutableList [<element>] : Object | provenance | MaD:50 |
+| Test.java:1021:82:1021:89 | source(...) : Object | Test.java:1021:54:1021:90 | add(...) : Builder [<element>] : Object | provenance | MaD:43+MaD:45 |
+| Test.java:1022:10:1022:11 | in : Builder [<element>] : Object | Test.java:1022:10:1022:19 | build(...) : ImmutableList [<element>] : Object | provenance | MaD:49 |
 | Test.java:1022:10:1022:19 | build(...) : ImmutableList [<element>] : Object | Test.java:1023:20:1023:22 | out : ImmutableList [<element>] : Object | provenance |  |
 | Test.java:1023:20:1023:22 | out : ImmutableList [<element>] : Object | Test.java:110:19:110:32 | it : ImmutableList [<element>] : Object | provenance |  |
-| Test.java:1023:20:1023:22 | out : ImmutableList [<element>] : Object | Test.java:1023:9:1023:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:1023:20:1023:22 | out : ImmutableList [<element>] : Object | Test.java:1023:9:1023:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:1028:37:1028:102 | (...)... : Builder [<element>] : Object | Test.java:1029:10:1029:11 | in : Builder [<element>] : Object | provenance |  |
 | Test.java:1028:66:1028:102 | add(...) : Builder [<element>] : Object | Test.java:1028:37:1028:102 | (...)... : Builder [<element>] : Object | provenance |  |
-| Test.java:1028:94:1028:101 | source(...) : Object | Test.java:1028:66:1028:102 | add(...) : Builder [<element>] : Object | provenance | MaD:45+MaD:44 |
-| Test.java:1029:10:1029:11 | in : Builder [<element>] : Object | Test.java:1029:10:1029:19 | build(...) : ImmutableCollection [<element>] : Object | provenance | MaD:50 |
+| Test.java:1028:94:1028:101 | source(...) : Object | Test.java:1028:66:1028:102 | add(...) : Builder [<element>] : Object | provenance | MaD:43+MaD:45 |
+| Test.java:1029:10:1029:11 | in : Builder [<element>] : Object | Test.java:1029:10:1029:19 | build(...) : ImmutableCollection [<element>] : Object | provenance | MaD:49 |
 | Test.java:1029:10:1029:19 | build(...) : ImmutableCollection [<element>] : Object | Test.java:1030:20:1030:22 | out : ImmutableCollection [<element>] : Object | provenance |  |
 | Test.java:1030:20:1030:22 | out : ImmutableCollection [<element>] : Object | Test.java:110:19:110:32 | it : ImmutableCollection [<element>] : Object | provenance |  |
-| Test.java:1030:20:1030:22 | out : ImmutableCollection [<element>] : Object | Test.java:1030:9:1030:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:1030:20:1030:22 | out : ImmutableCollection [<element>] : Object | Test.java:1030:9:1030:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:1035:22:1035:60 | (...)... : ImmutableSet [<element>] : Object | Test.java:1036:10:1036:11 | in : ImmutableSet [<element>] : Object | provenance |  |
 | Test.java:1035:36:1035:60 | of(...) : ImmutableSet [<element>] : Object | Test.java:1035:22:1035:60 | (...)... : ImmutableSet [<element>] : Object | provenance |  |
 | Test.java:1035:52:1035:59 | source(...) : Object | Test.java:1035:36:1035:60 | of(...) : ImmutableSet [<element>] : Object | provenance | MaD:143 |
-| Test.java:1036:10:1036:11 | in : ImmutableSet [<element>] : Object | Test.java:1036:10:1036:20 | asList(...) : ImmutableList [<element>] : Object | provenance | MaD:43 |
+| Test.java:1036:10:1036:11 | in : ImmutableSet [<element>] : Object | Test.java:1036:10:1036:20 | asList(...) : ImmutableList [<element>] : Object | provenance | MaD:50 |
 | Test.java:1036:10:1036:20 | asList(...) : ImmutableList [<element>] : Object | Test.java:1037:20:1037:22 | out : ImmutableList [<element>] : Object | provenance |  |
 | Test.java:1037:20:1037:22 | out : ImmutableList [<element>] : Object | Test.java:110:19:110:32 | it : ImmutableList [<element>] : Object | provenance |  |
-| Test.java:1037:20:1037:22 | out : ImmutableList [<element>] : Object | Test.java:1037:9:1037:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:1037:20:1037:22 | out : ImmutableList [<element>] : Object | Test.java:1037:9:1037:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:1042:27:1042:75 | (...)... : ImmutableMultiset [<element>] : Object | Test.java:1043:10:1043:11 | in : ImmutableMultiset [<element>] : Object | provenance |  |
 | Test.java:1042:46:1042:75 | of(...) : ImmutableMultiset [<element>] : Object | Test.java:1042:27:1042:75 | (...)... : ImmutableMultiset [<element>] : Object | provenance |  |
-| Test.java:1042:67:1042:74 | source(...) : Object | Test.java:1042:46:1042:75 | of(...) : ImmutableMultiset [<element>] : Object | provenance | MaD:134 |
-| Test.java:1043:10:1043:11 | in : ImmutableMultiset [<element>] : Object | Test.java:1043:10:1043:20 | asList(...) : ImmutableList [<element>] : Object | provenance | MaD:43 |
+| Test.java:1042:67:1042:74 | source(...) : Object | Test.java:1042:46:1042:75 | of(...) : ImmutableMultiset [<element>] : Object | provenance | MaD:137 |
+| Test.java:1043:10:1043:11 | in : ImmutableMultiset [<element>] : Object | Test.java:1043:10:1043:20 | asList(...) : ImmutableList [<element>] : Object | provenance | MaD:50 |
 | Test.java:1043:10:1043:20 | asList(...) : ImmutableList [<element>] : Object | Test.java:1044:20:1044:22 | out : ImmutableList [<element>] : Object | provenance |  |
 | Test.java:1044:20:1044:22 | out : ImmutableList [<element>] : Object | Test.java:110:19:110:32 | it : ImmutableList [<element>] : Object | provenance |  |
-| Test.java:1044:20:1044:22 | out : ImmutableList [<element>] : Object | Test.java:1044:9:1044:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:1044:20:1044:22 | out : ImmutableList [<element>] : Object | Test.java:1044:9:1044:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:1049:23:1049:63 | (...)... : ImmutableList [<element>] : Object | Test.java:1050:10:1050:11 | in : ImmutableList [<element>] : Object | provenance |  |
 | Test.java:1049:38:1049:63 | of(...) : ImmutableList [<element>] : Object | Test.java:1049:23:1049:63 | (...)... : ImmutableList [<element>] : Object | provenance |  |
 | Test.java:1049:55:1049:62 | source(...) : Object | Test.java:1049:38:1049:63 | of(...) : ImmutableList [<element>] : Object | provenance | MaD:55 |
-| Test.java:1050:10:1050:11 | in : ImmutableList [<element>] : Object | Test.java:1050:10:1050:20 | asList(...) : ImmutableList [<element>] : Object | provenance | MaD:43 |
+| Test.java:1050:10:1050:11 | in : ImmutableList [<element>] : Object | Test.java:1050:10:1050:20 | asList(...) : ImmutableList [<element>] : Object | provenance | MaD:50 |
 | Test.java:1050:10:1050:20 | asList(...) : ImmutableList [<element>] : Object | Test.java:1051:20:1051:22 | out : ImmutableList [<element>] : Object | provenance |  |
 | Test.java:1051:20:1051:22 | out : ImmutableList [<element>] : Object | Test.java:110:19:110:32 | it : ImmutableList [<element>] : Object | provenance |  |
-| Test.java:1051:20:1051:22 | out : ImmutableList [<element>] : Object | Test.java:1051:9:1051:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:1051:20:1051:22 | out : ImmutableList [<element>] : Object | Test.java:1051:9:1051:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:1056:29:1056:75 | (...)... : ImmutableList [<element>] : Object | Test.java:1057:10:1057:11 | in : ImmutableList [<element>] : Object | provenance |  |
 | Test.java:1056:50:1056:75 | of(...) : ImmutableList [<element>] : Object | Test.java:1056:29:1056:75 | (...)... : ImmutableList [<element>] : Object | provenance |  |
 | Test.java:1056:67:1056:74 | source(...) : Object | Test.java:1056:50:1056:75 | of(...) : ImmutableList [<element>] : Object | provenance | MaD:55 |
-| Test.java:1057:10:1057:11 | in : ImmutableList [<element>] : Object | Test.java:1057:10:1057:20 | asList(...) : ImmutableList [<element>] : Object | provenance | MaD:43 |
+| Test.java:1057:10:1057:11 | in : ImmutableList [<element>] : Object | Test.java:1057:10:1057:20 | asList(...) : ImmutableList [<element>] : Object | provenance | MaD:50 |
 | Test.java:1057:10:1057:20 | asList(...) : ImmutableList [<element>] : Object | Test.java:1058:20:1058:22 | out : ImmutableList [<element>] : Object | provenance |  |
 | Test.java:1058:20:1058:22 | out : ImmutableList [<element>] : Object | Test.java:110:19:110:32 | it : ImmutableList [<element>] : Object | provenance |  |
-| Test.java:1058:20:1058:22 | out : ImmutableList [<element>] : Object | Test.java:1058:9:1058:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:1058:20:1058:22 | out : ImmutableList [<element>] : Object | Test.java:1058:9:1058:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:1063:20:1063:48 | (...)... : List [<element>] : Object | Test.java:1064:31:1064:32 | in : List [<element>] : Object | provenance |  |
 | Test.java:1063:32:1063:48 | of(...) : List [<element>] : Object | Test.java:1063:20:1063:48 | (...)... : List [<element>] : Object | provenance |  |
-| Test.java:1063:40:1063:47 | source(...) : Object | Test.java:1063:32:1063:48 | of(...) : List [<element>] : Object | provenance | MaD:558 |
+| Test.java:1063:40:1063:47 | source(...) : Object | Test.java:1063:32:1063:48 | of(...) : List [<element>] : Object | provenance | MaD:561 |
 | Test.java:1064:10:1064:33 | copyOf(...) : ImmutableList [<element>] : Object | Test.java:1065:20:1065:22 | out : ImmutableList [<element>] : Object | provenance |  |
 | Test.java:1064:31:1064:32 | in : List [<element>] : Object | Test.java:1064:10:1064:33 | copyOf(...) : ImmutableList [<element>] : Object | provenance | MaD:51 |
 | Test.java:1065:20:1065:22 | out : ImmutableList [<element>] : Object | Test.java:110:19:110:32 | it : ImmutableList [<element>] : Object | provenance |  |
-| Test.java:1065:20:1065:22 | out : ImmutableList [<element>] : Object | Test.java:1065:9:1065:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:1065:20:1065:22 | out : ImmutableList [<element>] : Object | Test.java:1065:9:1065:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:1070:18:1070:44 | (...)... : List [<element>] : Object | Test.java:1071:31:1071:32 | in : List [<element>] : Object | provenance |  |
 | Test.java:1070:28:1070:44 | of(...) : List [<element>] : Object | Test.java:1070:18:1070:44 | (...)... : List [<element>] : Object | provenance |  |
-| Test.java:1070:36:1070:43 | source(...) : Object | Test.java:1070:28:1070:44 | of(...) : List [<element>] : Object | provenance | MaD:558 |
+| Test.java:1070:36:1070:43 | source(...) : Object | Test.java:1070:28:1070:44 | of(...) : List [<element>] : Object | provenance | MaD:561 |
 | Test.java:1071:10:1071:33 | copyOf(...) : ImmutableList [<element>] : Object | Test.java:1072:20:1072:22 | out : ImmutableList [<element>] : Object | provenance |  |
 | Test.java:1071:31:1071:32 | in : List [<element>] : Object | Test.java:1071:10:1071:33 | copyOf(...) : ImmutableList [<element>] : Object | provenance | MaD:52 |
 | Test.java:1072:20:1072:22 | out : ImmutableList [<element>] : Object | Test.java:110:19:110:32 | it : ImmutableList [<element>] : Object | provenance |  |
-| Test.java:1072:20:1072:22 | out : ImmutableList [<element>] : Object | Test.java:1072:9:1072:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:1072:20:1072:22 | out : ImmutableList [<element>] : Object | Test.java:1072:9:1072:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:1077:18:1077:55 | (...)... : Iterator [<element>] : Object | Test.java:1078:31:1078:32 | in : Iterator [<element>] : Object | provenance |  |
-| Test.java:1077:28:1077:44 | of(...) : List [<element>] : Object | Test.java:1077:28:1077:55 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:555 |
+| Test.java:1077:28:1077:44 | of(...) : List [<element>] : Object | Test.java:1077:28:1077:55 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:558 |
 | Test.java:1077:28:1077:55 | iterator(...) : Iterator [<element>] : Object | Test.java:1077:18:1077:55 | (...)... : Iterator [<element>] : Object | provenance |  |
-| Test.java:1077:36:1077:43 | source(...) : Object | Test.java:1077:28:1077:44 | of(...) : List [<element>] : Object | provenance | MaD:558 |
+| Test.java:1077:36:1077:43 | source(...) : Object | Test.java:1077:28:1077:44 | of(...) : List [<element>] : Object | provenance | MaD:561 |
 | Test.java:1078:10:1078:33 | copyOf(...) : ImmutableList [<element>] : Object | Test.java:1079:20:1079:22 | out : ImmutableList [<element>] : Object | provenance |  |
 | Test.java:1078:31:1078:32 | in : Iterator [<element>] : Object | Test.java:1078:10:1078:33 | copyOf(...) : ImmutableList [<element>] : Object | provenance | MaD:53 |
 | Test.java:1079:20:1079:22 | out : ImmutableList [<element>] : Object | Test.java:110:19:110:32 | it : ImmutableList [<element>] : Object | provenance |  |
-| Test.java:1079:20:1079:22 | out : ImmutableList [<element>] : Object | Test.java:1079:9:1079:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:1079:20:1079:22 | out : ImmutableList [<element>] : Object | Test.java:1079:9:1079:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:1084:18:1084:49 | (...)... : Object[] [[]] : Object | Test.java:1085:31:1085:32 | in : Object[] [[]] : Object | provenance |  |
 | Test.java:1084:28:1084:49 | {...} : Object[] [[]] : Object | Test.java:1084:18:1084:49 | (...)... : Object[] [[]] : Object | provenance |  |
 | Test.java:1084:41:1084:48 | source(...) : Object | Test.java:1084:28:1084:49 | {...} : Object[] [[]] : Object | provenance |  |
 | Test.java:1085:10:1085:33 | copyOf(...) : ImmutableList [<element>] : Object | Test.java:1086:20:1086:22 | out : ImmutableList [<element>] : Object | provenance |  |
 | Test.java:1085:31:1085:32 | in : Object[] [[]] : Object | Test.java:1085:10:1085:33 | copyOf(...) : ImmutableList [<element>] : Object | provenance | MaD:54 |
 | Test.java:1086:20:1086:22 | out : ImmutableList [<element>] : Object | Test.java:110:19:110:32 | it : ImmutableList [<element>] : Object | provenance |  |
-| Test.java:1086:20:1086:22 | out : ImmutableList [<element>] : Object | Test.java:1086:9:1086:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:1086:20:1086:22 | out : ImmutableList [<element>] : Object | Test.java:1086:9:1086:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:1091:16:1091:31 | (...)... : Object | Test.java:1092:87:1092:88 | in : Object | provenance |  |
 | Test.java:1091:24:1091:31 | source(...) : Object | Test.java:1091:16:1091:31 | (...)... : Object | provenance |  |
 | Test.java:1092:10:1092:89 | of(...) : ImmutableList [<element>] : Object | Test.java:1093:20:1093:22 | out : ImmutableList [<element>] : Object | provenance |  |
 | Test.java:1092:87:1092:88 | in : Object | Test.java:1092:10:1092:89 | of(...) : ImmutableList [<element>] : Object | provenance | MaD:55 |
 | Test.java:1093:20:1093:22 | out : ImmutableList [<element>] : Object | Test.java:110:19:110:32 | it : ImmutableList [<element>] : Object | provenance |  |
-| Test.java:1093:20:1093:22 | out : ImmutableList [<element>] : Object | Test.java:1093:9:1093:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:1093:20:1093:22 | out : ImmutableList [<element>] : Object | Test.java:1093:9:1093:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:1098:16:1098:31 | (...)... : Object | Test.java:1099:81:1099:82 | in : Object | provenance |  |
 | Test.java:1098:24:1098:31 | source(...) : Object | Test.java:1098:16:1098:31 | (...)... : Object | provenance |  |
 | Test.java:1099:10:1099:89 | of(...) : ImmutableList [<element>] : Object | Test.java:1100:20:1100:22 | out : ImmutableList [<element>] : Object | provenance |  |
 | Test.java:1099:81:1099:82 | in : Object | Test.java:1099:10:1099:89 | of(...) : ImmutableList [<element>] : Object | provenance | MaD:55 |
 | Test.java:1100:20:1100:22 | out : ImmutableList [<element>] : Object | Test.java:110:19:110:32 | it : ImmutableList [<element>] : Object | provenance |  |
-| Test.java:1100:20:1100:22 | out : ImmutableList [<element>] : Object | Test.java:1100:9:1100:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:1100:20:1100:22 | out : ImmutableList [<element>] : Object | Test.java:1100:9:1100:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:1105:16:1105:31 | (...)... : Object | Test.java:1106:81:1106:82 | in : Object | provenance |  |
 | Test.java:1105:24:1105:31 | source(...) : Object | Test.java:1105:16:1105:31 | (...)... : Object | provenance |  |
 | Test.java:1106:10:1106:83 | of(...) : ImmutableList [<element>] : Object | Test.java:1107:20:1107:22 | out : ImmutableList [<element>] : Object | provenance |  |
 | Test.java:1106:81:1106:82 | in : Object | Test.java:1106:10:1106:83 | of(...) : ImmutableList [<element>] : Object | provenance | MaD:55 |
 | Test.java:1107:20:1107:22 | out : ImmutableList [<element>] : Object | Test.java:110:19:110:32 | it : ImmutableList [<element>] : Object | provenance |  |
-| Test.java:1107:20:1107:22 | out : ImmutableList [<element>] : Object | Test.java:1107:9:1107:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:1107:20:1107:22 | out : ImmutableList [<element>] : Object | Test.java:1107:9:1107:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:1112:16:1112:31 | (...)... : Object | Test.java:1113:75:1113:76 | in : Object | provenance |  |
 | Test.java:1112:24:1112:31 | source(...) : Object | Test.java:1112:16:1112:31 | (...)... : Object | provenance |  |
 | Test.java:1113:10:1113:89 | of(...) : ImmutableList [<element>] : Object | Test.java:1114:20:1114:22 | out : ImmutableList [<element>] : Object | provenance |  |
 | Test.java:1113:75:1113:76 | in : Object | Test.java:1113:10:1113:89 | of(...) : ImmutableList [<element>] : Object | provenance | MaD:55 |
 | Test.java:1114:20:1114:22 | out : ImmutableList [<element>] : Object | Test.java:110:19:110:32 | it : ImmutableList [<element>] : Object | provenance |  |
-| Test.java:1114:20:1114:22 | out : ImmutableList [<element>] : Object | Test.java:1114:9:1114:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:1114:20:1114:22 | out : ImmutableList [<element>] : Object | Test.java:1114:9:1114:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:1119:16:1119:31 | (...)... : Object | Test.java:1120:75:1120:76 | in : Object | provenance |  |
 | Test.java:1119:24:1119:31 | source(...) : Object | Test.java:1119:16:1119:31 | (...)... : Object | provenance |  |
 | Test.java:1120:10:1120:83 | of(...) : ImmutableList [<element>] : Object | Test.java:1121:20:1121:22 | out : ImmutableList [<element>] : Object | provenance |  |
 | Test.java:1120:75:1120:76 | in : Object | Test.java:1120:10:1120:83 | of(...) : ImmutableList [<element>] : Object | provenance | MaD:55 |
 | Test.java:1121:20:1121:22 | out : ImmutableList [<element>] : Object | Test.java:110:19:110:32 | it : ImmutableList [<element>] : Object | provenance |  |
-| Test.java:1121:20:1121:22 | out : ImmutableList [<element>] : Object | Test.java:1121:9:1121:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:1121:20:1121:22 | out : ImmutableList [<element>] : Object | Test.java:1121:9:1121:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:1126:16:1126:31 | (...)... : Object | Test.java:1127:75:1127:76 | in : Object | provenance |  |
 | Test.java:1126:24:1126:31 | source(...) : Object | Test.java:1126:16:1126:31 | (...)... : Object | provenance |  |
 | Test.java:1127:10:1127:77 | of(...) : ImmutableList [<element>] : Object | Test.java:1128:20:1128:22 | out : ImmutableList [<element>] : Object | provenance |  |
 | Test.java:1127:75:1127:76 | in : Object | Test.java:1127:10:1127:77 | of(...) : ImmutableList [<element>] : Object | provenance | MaD:55 |
 | Test.java:1128:20:1128:22 | out : ImmutableList [<element>] : Object | Test.java:110:19:110:32 | it : ImmutableList [<element>] : Object | provenance |  |
-| Test.java:1128:20:1128:22 | out : ImmutableList [<element>] : Object | Test.java:1128:9:1128:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:1128:20:1128:22 | out : ImmutableList [<element>] : Object | Test.java:1128:9:1128:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:1133:16:1133:31 | (...)... : Object | Test.java:1134:69:1134:70 | in : Object | provenance |  |
 | Test.java:1133:24:1133:31 | source(...) : Object | Test.java:1133:16:1133:31 | (...)... : Object | provenance |  |
 | Test.java:1134:10:1134:89 | of(...) : ImmutableList [<element>] : Object | Test.java:1135:20:1135:22 | out : ImmutableList [<element>] : Object | provenance |  |
 | Test.java:1134:69:1134:70 | in : Object | Test.java:1134:10:1134:89 | of(...) : ImmutableList [<element>] : Object | provenance | MaD:55 |
 | Test.java:1135:20:1135:22 | out : ImmutableList [<element>] : Object | Test.java:110:19:110:32 | it : ImmutableList [<element>] : Object | provenance |  |
-| Test.java:1135:20:1135:22 | out : ImmutableList [<element>] : Object | Test.java:1135:9:1135:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:1135:20:1135:22 | out : ImmutableList [<element>] : Object | Test.java:1135:9:1135:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:1140:16:1140:31 | (...)... : Object | Test.java:1141:69:1141:70 | in : Object | provenance |  |
 | Test.java:1140:24:1140:31 | source(...) : Object | Test.java:1140:16:1140:31 | (...)... : Object | provenance |  |
 | Test.java:1141:10:1141:83 | of(...) : ImmutableList [<element>] : Object | Test.java:1142:20:1142:22 | out : ImmutableList [<element>] : Object | provenance |  |
 | Test.java:1141:69:1141:70 | in : Object | Test.java:1141:10:1141:83 | of(...) : ImmutableList [<element>] : Object | provenance | MaD:55 |
 | Test.java:1142:20:1142:22 | out : ImmutableList [<element>] : Object | Test.java:110:19:110:32 | it : ImmutableList [<element>] : Object | provenance |  |
-| Test.java:1142:20:1142:22 | out : ImmutableList [<element>] : Object | Test.java:1142:9:1142:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:1142:20:1142:22 | out : ImmutableList [<element>] : Object | Test.java:1142:9:1142:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:1147:16:1147:31 | (...)... : Object | Test.java:1148:69:1148:70 | in : Object | provenance |  |
 | Test.java:1147:24:1147:31 | source(...) : Object | Test.java:1147:16:1147:31 | (...)... : Object | provenance |  |
 | Test.java:1148:10:1148:77 | of(...) : ImmutableList [<element>] : Object | Test.java:1149:20:1149:22 | out : ImmutableList [<element>] : Object | provenance |  |
 | Test.java:1148:69:1148:70 | in : Object | Test.java:1148:10:1148:77 | of(...) : ImmutableList [<element>] : Object | provenance | MaD:55 |
 | Test.java:1149:20:1149:22 | out : ImmutableList [<element>] : Object | Test.java:110:19:110:32 | it : ImmutableList [<element>] : Object | provenance |  |
-| Test.java:1149:20:1149:22 | out : ImmutableList [<element>] : Object | Test.java:1149:9:1149:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:1149:20:1149:22 | out : ImmutableList [<element>] : Object | Test.java:1149:9:1149:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:1154:16:1154:31 | (...)... : Object | Test.java:1155:69:1155:70 | in : Object | provenance |  |
 | Test.java:1154:24:1154:31 | source(...) : Object | Test.java:1154:16:1154:31 | (...)... : Object | provenance |  |
 | Test.java:1155:10:1155:71 | of(...) : ImmutableList [<element>] : Object | Test.java:1156:20:1156:22 | out : ImmutableList [<element>] : Object | provenance |  |
 | Test.java:1155:69:1155:70 | in : Object | Test.java:1155:10:1155:71 | of(...) : ImmutableList [<element>] : Object | provenance | MaD:55 |
 | Test.java:1156:20:1156:22 | out : ImmutableList [<element>] : Object | Test.java:110:19:110:32 | it : ImmutableList [<element>] : Object | provenance |  |
-| Test.java:1156:20:1156:22 | out : ImmutableList [<element>] : Object | Test.java:1156:9:1156:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:1156:20:1156:22 | out : ImmutableList [<element>] : Object | Test.java:1156:9:1156:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:1161:16:1161:31 | (...)... : Object | Test.java:1162:63:1162:64 | in : Object | provenance |  |
 | Test.java:1161:24:1161:31 | source(...) : Object | Test.java:1161:16:1161:31 | (...)... : Object | provenance |  |
 | Test.java:1162:10:1162:89 | of(...) : ImmutableList [<element>] : Object | Test.java:1163:20:1163:22 | out : ImmutableList [<element>] : Object | provenance |  |
 | Test.java:1162:63:1162:64 | in : Object | Test.java:1162:10:1162:89 | of(...) : ImmutableList [<element>] : Object | provenance | MaD:55 |
 | Test.java:1163:20:1163:22 | out : ImmutableList [<element>] : Object | Test.java:110:19:110:32 | it : ImmutableList [<element>] : Object | provenance |  |
-| Test.java:1163:20:1163:22 | out : ImmutableList [<element>] : Object | Test.java:1163:9:1163:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:1163:20:1163:22 | out : ImmutableList [<element>] : Object | Test.java:1163:9:1163:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:1168:16:1168:31 | (...)... : Object | Test.java:1169:63:1169:64 | in : Object | provenance |  |
 | Test.java:1168:24:1168:31 | source(...) : Object | Test.java:1168:16:1168:31 | (...)... : Object | provenance |  |
 | Test.java:1169:10:1169:83 | of(...) : ImmutableList [<element>] : Object | Test.java:1170:20:1170:22 | out : ImmutableList [<element>] : Object | provenance |  |
 | Test.java:1169:63:1169:64 | in : Object | Test.java:1169:10:1169:83 | of(...) : ImmutableList [<element>] : Object | provenance | MaD:55 |
 | Test.java:1170:20:1170:22 | out : ImmutableList [<element>] : Object | Test.java:110:19:110:32 | it : ImmutableList [<element>] : Object | provenance |  |
-| Test.java:1170:20:1170:22 | out : ImmutableList [<element>] : Object | Test.java:1170:9:1170:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:1170:20:1170:22 | out : ImmutableList [<element>] : Object | Test.java:1170:9:1170:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:1175:16:1175:31 | (...)... : Object | Test.java:1176:63:1176:64 | in : Object | provenance |  |
 | Test.java:1175:24:1175:31 | source(...) : Object | Test.java:1175:16:1175:31 | (...)... : Object | provenance |  |
 | Test.java:1176:10:1176:77 | of(...) : ImmutableList [<element>] : Object | Test.java:1177:20:1177:22 | out : ImmutableList [<element>] : Object | provenance |  |
 | Test.java:1176:63:1176:64 | in : Object | Test.java:1176:10:1176:77 | of(...) : ImmutableList [<element>] : Object | provenance | MaD:55 |
 | Test.java:1177:20:1177:22 | out : ImmutableList [<element>] : Object | Test.java:110:19:110:32 | it : ImmutableList [<element>] : Object | provenance |  |
-| Test.java:1177:20:1177:22 | out : ImmutableList [<element>] : Object | Test.java:1177:9:1177:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:1177:20:1177:22 | out : ImmutableList [<element>] : Object | Test.java:1177:9:1177:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:1182:16:1182:31 | (...)... : Object | Test.java:1183:63:1183:64 | in : Object | provenance |  |
 | Test.java:1182:24:1182:31 | source(...) : Object | Test.java:1182:16:1182:31 | (...)... : Object | provenance |  |
 | Test.java:1183:10:1183:71 | of(...) : ImmutableList [<element>] : Object | Test.java:1184:20:1184:22 | out : ImmutableList [<element>] : Object | provenance |  |
 | Test.java:1183:63:1183:64 | in : Object | Test.java:1183:10:1183:71 | of(...) : ImmutableList [<element>] : Object | provenance | MaD:55 |
 | Test.java:1184:20:1184:22 | out : ImmutableList [<element>] : Object | Test.java:110:19:110:32 | it : ImmutableList [<element>] : Object | provenance |  |
-| Test.java:1184:20:1184:22 | out : ImmutableList [<element>] : Object | Test.java:1184:9:1184:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:1184:20:1184:22 | out : ImmutableList [<element>] : Object | Test.java:1184:9:1184:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:1189:16:1189:31 | (...)... : Object | Test.java:1190:63:1190:64 | in : Object | provenance |  |
 | Test.java:1189:24:1189:31 | source(...) : Object | Test.java:1189:16:1189:31 | (...)... : Object | provenance |  |
 | Test.java:1190:10:1190:65 | of(...) : ImmutableList [<element>] : Object | Test.java:1191:20:1191:22 | out : ImmutableList [<element>] : Object | provenance |  |
 | Test.java:1190:63:1190:64 | in : Object | Test.java:1190:10:1190:65 | of(...) : ImmutableList [<element>] : Object | provenance | MaD:55 |
 | Test.java:1191:20:1191:22 | out : ImmutableList [<element>] : Object | Test.java:110:19:110:32 | it : ImmutableList [<element>] : Object | provenance |  |
-| Test.java:1191:20:1191:22 | out : ImmutableList [<element>] : Object | Test.java:1191:9:1191:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:1191:20:1191:22 | out : ImmutableList [<element>] : Object | Test.java:1191:9:1191:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:1196:16:1196:31 | (...)... : Object | Test.java:1197:57:1197:58 | in : Object | provenance |  |
 | Test.java:1196:24:1196:31 | source(...) : Object | Test.java:1196:16:1196:31 | (...)... : Object | provenance |  |
 | Test.java:1197:10:1197:89 | of(...) : ImmutableList [<element>] : Object | Test.java:1198:20:1198:22 | out : ImmutableList [<element>] : Object | provenance |  |
 | Test.java:1197:57:1197:58 | in : Object | Test.java:1197:10:1197:89 | of(...) : ImmutableList [<element>] : Object | provenance | MaD:55 |
 | Test.java:1198:20:1198:22 | out : ImmutableList [<element>] : Object | Test.java:110:19:110:32 | it : ImmutableList [<element>] : Object | provenance |  |
-| Test.java:1198:20:1198:22 | out : ImmutableList [<element>] : Object | Test.java:1198:9:1198:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:1198:20:1198:22 | out : ImmutableList [<element>] : Object | Test.java:1198:9:1198:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:1203:16:1203:31 | (...)... : Object | Test.java:1204:57:1204:58 | in : Object | provenance |  |
 | Test.java:1203:24:1203:31 | source(...) : Object | Test.java:1203:16:1203:31 | (...)... : Object | provenance |  |
 | Test.java:1204:10:1204:83 | of(...) : ImmutableList [<element>] : Object | Test.java:1205:20:1205:22 | out : ImmutableList [<element>] : Object | provenance |  |
 | Test.java:1204:57:1204:58 | in : Object | Test.java:1204:10:1204:83 | of(...) : ImmutableList [<element>] : Object | provenance | MaD:55 |
 | Test.java:1205:20:1205:22 | out : ImmutableList [<element>] : Object | Test.java:110:19:110:32 | it : ImmutableList [<element>] : Object | provenance |  |
-| Test.java:1205:20:1205:22 | out : ImmutableList [<element>] : Object | Test.java:1205:9:1205:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:1205:20:1205:22 | out : ImmutableList [<element>] : Object | Test.java:1205:9:1205:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:1210:16:1210:31 | (...)... : Object | Test.java:1211:57:1211:58 | in : Object | provenance |  |
 | Test.java:1210:24:1210:31 | source(...) : Object | Test.java:1210:16:1210:31 | (...)... : Object | provenance |  |
 | Test.java:1211:10:1211:77 | of(...) : ImmutableList [<element>] : Object | Test.java:1212:20:1212:22 | out : ImmutableList [<element>] : Object | provenance |  |
 | Test.java:1211:57:1211:58 | in : Object | Test.java:1211:10:1211:77 | of(...) : ImmutableList [<element>] : Object | provenance | MaD:55 |
 | Test.java:1212:20:1212:22 | out : ImmutableList [<element>] : Object | Test.java:110:19:110:32 | it : ImmutableList [<element>] : Object | provenance |  |
-| Test.java:1212:20:1212:22 | out : ImmutableList [<element>] : Object | Test.java:1212:9:1212:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:1212:20:1212:22 | out : ImmutableList [<element>] : Object | Test.java:1212:9:1212:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:1217:16:1217:31 | (...)... : Object | Test.java:1218:57:1218:58 | in : Object | provenance |  |
 | Test.java:1217:24:1217:31 | source(...) : Object | Test.java:1217:16:1217:31 | (...)... : Object | provenance |  |
 | Test.java:1218:10:1218:71 | of(...) : ImmutableList [<element>] : Object | Test.java:1219:20:1219:22 | out : ImmutableList [<element>] : Object | provenance |  |
 | Test.java:1218:57:1218:58 | in : Object | Test.java:1218:10:1218:71 | of(...) : ImmutableList [<element>] : Object | provenance | MaD:55 |
 | Test.java:1219:20:1219:22 | out : ImmutableList [<element>] : Object | Test.java:110:19:110:32 | it : ImmutableList [<element>] : Object | provenance |  |
-| Test.java:1219:20:1219:22 | out : ImmutableList [<element>] : Object | Test.java:1219:9:1219:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:1219:20:1219:22 | out : ImmutableList [<element>] : Object | Test.java:1219:9:1219:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:1224:16:1224:31 | (...)... : Object | Test.java:1225:57:1225:58 | in : Object | provenance |  |
 | Test.java:1224:24:1224:31 | source(...) : Object | Test.java:1224:16:1224:31 | (...)... : Object | provenance |  |
 | Test.java:1225:10:1225:65 | of(...) : ImmutableList [<element>] : Object | Test.java:1226:20:1226:22 | out : ImmutableList [<element>] : Object | provenance |  |
 | Test.java:1225:57:1225:58 | in : Object | Test.java:1225:10:1225:65 | of(...) : ImmutableList [<element>] : Object | provenance | MaD:55 |
 | Test.java:1226:20:1226:22 | out : ImmutableList [<element>] : Object | Test.java:110:19:110:32 | it : ImmutableList [<element>] : Object | provenance |  |
-| Test.java:1226:20:1226:22 | out : ImmutableList [<element>] : Object | Test.java:1226:9:1226:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:1226:20:1226:22 | out : ImmutableList [<element>] : Object | Test.java:1226:9:1226:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:1231:16:1231:31 | (...)... : Object | Test.java:1232:57:1232:58 | in : Object | provenance |  |
 | Test.java:1231:24:1231:31 | source(...) : Object | Test.java:1231:16:1231:31 | (...)... : Object | provenance |  |
 | Test.java:1232:10:1232:59 | of(...) : ImmutableList [<element>] : Object | Test.java:1233:20:1233:22 | out : ImmutableList [<element>] : Object | provenance |  |
 | Test.java:1232:57:1232:58 | in : Object | Test.java:1232:10:1232:59 | of(...) : ImmutableList [<element>] : Object | provenance | MaD:55 |
 | Test.java:1233:20:1233:22 | out : ImmutableList [<element>] : Object | Test.java:110:19:110:32 | it : ImmutableList [<element>] : Object | provenance |  |
-| Test.java:1233:20:1233:22 | out : ImmutableList [<element>] : Object | Test.java:1233:9:1233:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:1233:20:1233:22 | out : ImmutableList [<element>] : Object | Test.java:1233:9:1233:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:1238:16:1238:31 | (...)... : Object | Test.java:1239:51:1239:52 | in : Object | provenance |  |
 | Test.java:1238:24:1238:31 | source(...) : Object | Test.java:1238:16:1238:31 | (...)... : Object | provenance |  |
 | Test.java:1239:10:1239:89 | of(...) : ImmutableList [<element>] : Object | Test.java:1240:20:1240:22 | out : ImmutableList [<element>] : Object | provenance |  |
 | Test.java:1239:51:1239:52 | in : Object | Test.java:1239:10:1239:89 | of(...) : ImmutableList [<element>] : Object | provenance | MaD:55 |
 | Test.java:1240:20:1240:22 | out : ImmutableList [<element>] : Object | Test.java:110:19:110:32 | it : ImmutableList [<element>] : Object | provenance |  |
-| Test.java:1240:20:1240:22 | out : ImmutableList [<element>] : Object | Test.java:1240:9:1240:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:1240:20:1240:22 | out : ImmutableList [<element>] : Object | Test.java:1240:9:1240:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:1245:16:1245:31 | (...)... : Object | Test.java:1246:51:1246:52 | in : Object | provenance |  |
 | Test.java:1245:24:1245:31 | source(...) : Object | Test.java:1245:16:1245:31 | (...)... : Object | provenance |  |
 | Test.java:1246:10:1246:83 | of(...) : ImmutableList [<element>] : Object | Test.java:1247:20:1247:22 | out : ImmutableList [<element>] : Object | provenance |  |
 | Test.java:1246:51:1246:52 | in : Object | Test.java:1246:10:1246:83 | of(...) : ImmutableList [<element>] : Object | provenance | MaD:55 |
 | Test.java:1247:20:1247:22 | out : ImmutableList [<element>] : Object | Test.java:110:19:110:32 | it : ImmutableList [<element>] : Object | provenance |  |
-| Test.java:1247:20:1247:22 | out : ImmutableList [<element>] : Object | Test.java:1247:9:1247:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:1247:20:1247:22 | out : ImmutableList [<element>] : Object | Test.java:1247:9:1247:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:1252:16:1252:31 | (...)... : Object | Test.java:1253:51:1253:52 | in : Object | provenance |  |
 | Test.java:1252:24:1252:31 | source(...) : Object | Test.java:1252:16:1252:31 | (...)... : Object | provenance |  |
 | Test.java:1253:10:1253:77 | of(...) : ImmutableList [<element>] : Object | Test.java:1254:20:1254:22 | out : ImmutableList [<element>] : Object | provenance |  |
 | Test.java:1253:51:1253:52 | in : Object | Test.java:1253:10:1253:77 | of(...) : ImmutableList [<element>] : Object | provenance | MaD:55 |
 | Test.java:1254:20:1254:22 | out : ImmutableList [<element>] : Object | Test.java:110:19:110:32 | it : ImmutableList [<element>] : Object | provenance |  |
-| Test.java:1254:20:1254:22 | out : ImmutableList [<element>] : Object | Test.java:1254:9:1254:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:1254:20:1254:22 | out : ImmutableList [<element>] : Object | Test.java:1254:9:1254:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:1259:16:1259:31 | (...)... : Object | Test.java:1260:51:1260:52 | in : Object | provenance |  |
 | Test.java:1259:24:1259:31 | source(...) : Object | Test.java:1259:16:1259:31 | (...)... : Object | provenance |  |
 | Test.java:1260:10:1260:71 | of(...) : ImmutableList [<element>] : Object | Test.java:1261:20:1261:22 | out : ImmutableList [<element>] : Object | provenance |  |
 | Test.java:1260:51:1260:52 | in : Object | Test.java:1260:10:1260:71 | of(...) : ImmutableList [<element>] : Object | provenance | MaD:55 |
 | Test.java:1261:20:1261:22 | out : ImmutableList [<element>] : Object | Test.java:110:19:110:32 | it : ImmutableList [<element>] : Object | provenance |  |
-| Test.java:1261:20:1261:22 | out : ImmutableList [<element>] : Object | Test.java:1261:9:1261:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:1261:20:1261:22 | out : ImmutableList [<element>] : Object | Test.java:1261:9:1261:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:1266:16:1266:31 | (...)... : Object | Test.java:1267:51:1267:52 | in : Object | provenance |  |
 | Test.java:1266:24:1266:31 | source(...) : Object | Test.java:1266:16:1266:31 | (...)... : Object | provenance |  |
 | Test.java:1267:10:1267:65 | of(...) : ImmutableList [<element>] : Object | Test.java:1268:20:1268:22 | out : ImmutableList [<element>] : Object | provenance |  |
 | Test.java:1267:51:1267:52 | in : Object | Test.java:1267:10:1267:65 | of(...) : ImmutableList [<element>] : Object | provenance | MaD:55 |
 | Test.java:1268:20:1268:22 | out : ImmutableList [<element>] : Object | Test.java:110:19:110:32 | it : ImmutableList [<element>] : Object | provenance |  |
-| Test.java:1268:20:1268:22 | out : ImmutableList [<element>] : Object | Test.java:1268:9:1268:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:1268:20:1268:22 | out : ImmutableList [<element>] : Object | Test.java:1268:9:1268:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:1273:16:1273:31 | (...)... : Object | Test.java:1274:51:1274:52 | in : Object | provenance |  |
 | Test.java:1273:24:1273:31 | source(...) : Object | Test.java:1273:16:1273:31 | (...)... : Object | provenance |  |
 | Test.java:1274:10:1274:59 | of(...) : ImmutableList [<element>] : Object | Test.java:1275:20:1275:22 | out : ImmutableList [<element>] : Object | provenance |  |
 | Test.java:1274:51:1274:52 | in : Object | Test.java:1274:10:1274:59 | of(...) : ImmutableList [<element>] : Object | provenance | MaD:55 |
 | Test.java:1275:20:1275:22 | out : ImmutableList [<element>] : Object | Test.java:110:19:110:32 | it : ImmutableList [<element>] : Object | provenance |  |
-| Test.java:1275:20:1275:22 | out : ImmutableList [<element>] : Object | Test.java:1275:9:1275:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:1275:20:1275:22 | out : ImmutableList [<element>] : Object | Test.java:1275:9:1275:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:1280:16:1280:31 | (...)... : Object | Test.java:1281:51:1281:52 | in : Object | provenance |  |
 | Test.java:1280:24:1280:31 | source(...) : Object | Test.java:1280:16:1280:31 | (...)... : Object | provenance |  |
 | Test.java:1281:10:1281:53 | of(...) : ImmutableList [<element>] : Object | Test.java:1282:20:1282:22 | out : ImmutableList [<element>] : Object | provenance |  |
 | Test.java:1281:51:1281:52 | in : Object | Test.java:1281:10:1281:53 | of(...) : ImmutableList [<element>] : Object | provenance | MaD:55 |
 | Test.java:1282:20:1282:22 | out : ImmutableList [<element>] : Object | Test.java:110:19:110:32 | it : ImmutableList [<element>] : Object | provenance |  |
-| Test.java:1282:20:1282:22 | out : ImmutableList [<element>] : Object | Test.java:1282:9:1282:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:1282:20:1282:22 | out : ImmutableList [<element>] : Object | Test.java:1282:9:1282:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:1287:16:1287:31 | (...)... : Object | Test.java:1288:45:1288:46 | in : Object | provenance |  |
 | Test.java:1287:24:1287:31 | source(...) : Object | Test.java:1287:16:1287:31 | (...)... : Object | provenance |  |
 | Test.java:1288:10:1288:89 | of(...) : ImmutableList [<element>] : Object | Test.java:1289:20:1289:22 | out : ImmutableList [<element>] : Object | provenance |  |
 | Test.java:1288:45:1288:46 | in : Object | Test.java:1288:10:1288:89 | of(...) : ImmutableList [<element>] : Object | provenance | MaD:55 |
 | Test.java:1289:20:1289:22 | out : ImmutableList [<element>] : Object | Test.java:110:19:110:32 | it : ImmutableList [<element>] : Object | provenance |  |
-| Test.java:1289:20:1289:22 | out : ImmutableList [<element>] : Object | Test.java:1289:9:1289:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:1289:20:1289:22 | out : ImmutableList [<element>] : Object | Test.java:1289:9:1289:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:1294:16:1294:31 | (...)... : Object | Test.java:1295:45:1295:46 | in : Object | provenance |  |
 | Test.java:1294:24:1294:31 | source(...) : Object | Test.java:1294:16:1294:31 | (...)... : Object | provenance |  |
 | Test.java:1295:10:1295:83 | of(...) : ImmutableList [<element>] : Object | Test.java:1296:20:1296:22 | out : ImmutableList [<element>] : Object | provenance |  |
 | Test.java:1295:45:1295:46 | in : Object | Test.java:1295:10:1295:83 | of(...) : ImmutableList [<element>] : Object | provenance | MaD:55 |
 | Test.java:1296:20:1296:22 | out : ImmutableList [<element>] : Object | Test.java:110:19:110:32 | it : ImmutableList [<element>] : Object | provenance |  |
-| Test.java:1296:20:1296:22 | out : ImmutableList [<element>] : Object | Test.java:1296:9:1296:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:1296:20:1296:22 | out : ImmutableList [<element>] : Object | Test.java:1296:9:1296:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:1301:16:1301:31 | (...)... : Object | Test.java:1302:45:1302:46 | in : Object | provenance |  |
 | Test.java:1301:24:1301:31 | source(...) : Object | Test.java:1301:16:1301:31 | (...)... : Object | provenance |  |
 | Test.java:1302:10:1302:77 | of(...) : ImmutableList [<element>] : Object | Test.java:1303:20:1303:22 | out : ImmutableList [<element>] : Object | provenance |  |
 | Test.java:1302:45:1302:46 | in : Object | Test.java:1302:10:1302:77 | of(...) : ImmutableList [<element>] : Object | provenance | MaD:55 |
 | Test.java:1303:20:1303:22 | out : ImmutableList [<element>] : Object | Test.java:110:19:110:32 | it : ImmutableList [<element>] : Object | provenance |  |
-| Test.java:1303:20:1303:22 | out : ImmutableList [<element>] : Object | Test.java:1303:9:1303:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:1303:20:1303:22 | out : ImmutableList [<element>] : Object | Test.java:1303:9:1303:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:1308:16:1308:31 | (...)... : Object | Test.java:1309:45:1309:46 | in : Object | provenance |  |
 | Test.java:1308:24:1308:31 | source(...) : Object | Test.java:1308:16:1308:31 | (...)... : Object | provenance |  |
 | Test.java:1309:10:1309:71 | of(...) : ImmutableList [<element>] : Object | Test.java:1310:20:1310:22 | out : ImmutableList [<element>] : Object | provenance |  |
 | Test.java:1309:45:1309:46 | in : Object | Test.java:1309:10:1309:71 | of(...) : ImmutableList [<element>] : Object | provenance | MaD:55 |
 | Test.java:1310:20:1310:22 | out : ImmutableList [<element>] : Object | Test.java:110:19:110:32 | it : ImmutableList [<element>] : Object | provenance |  |
-| Test.java:1310:20:1310:22 | out : ImmutableList [<element>] : Object | Test.java:1310:9:1310:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:1310:20:1310:22 | out : ImmutableList [<element>] : Object | Test.java:1310:9:1310:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:1315:16:1315:31 | (...)... : Object | Test.java:1316:45:1316:46 | in : Object | provenance |  |
 | Test.java:1315:24:1315:31 | source(...) : Object | Test.java:1315:16:1315:31 | (...)... : Object | provenance |  |
 | Test.java:1316:10:1316:65 | of(...) : ImmutableList [<element>] : Object | Test.java:1317:20:1317:22 | out : ImmutableList [<element>] : Object | provenance |  |
 | Test.java:1316:45:1316:46 | in : Object | Test.java:1316:10:1316:65 | of(...) : ImmutableList [<element>] : Object | provenance | MaD:55 |
 | Test.java:1317:20:1317:22 | out : ImmutableList [<element>] : Object | Test.java:110:19:110:32 | it : ImmutableList [<element>] : Object | provenance |  |
-| Test.java:1317:20:1317:22 | out : ImmutableList [<element>] : Object | Test.java:1317:9:1317:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:1317:20:1317:22 | out : ImmutableList [<element>] : Object | Test.java:1317:9:1317:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:1322:16:1322:31 | (...)... : Object | Test.java:1323:45:1323:46 | in : Object | provenance |  |
 | Test.java:1322:24:1322:31 | source(...) : Object | Test.java:1322:16:1322:31 | (...)... : Object | provenance |  |
 | Test.java:1323:10:1323:59 | of(...) : ImmutableList [<element>] : Object | Test.java:1324:20:1324:22 | out : ImmutableList [<element>] : Object | provenance |  |
 | Test.java:1323:45:1323:46 | in : Object | Test.java:1323:10:1323:59 | of(...) : ImmutableList [<element>] : Object | provenance | MaD:55 |
 | Test.java:1324:20:1324:22 | out : ImmutableList [<element>] : Object | Test.java:110:19:110:32 | it : ImmutableList [<element>] : Object | provenance |  |
-| Test.java:1324:20:1324:22 | out : ImmutableList [<element>] : Object | Test.java:1324:9:1324:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:1324:20:1324:22 | out : ImmutableList [<element>] : Object | Test.java:1324:9:1324:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:1329:16:1329:31 | (...)... : Object | Test.java:1330:45:1330:46 | in : Object | provenance |  |
 | Test.java:1329:24:1329:31 | source(...) : Object | Test.java:1329:16:1329:31 | (...)... : Object | provenance |  |
 | Test.java:1330:10:1330:53 | of(...) : ImmutableList [<element>] : Object | Test.java:1331:20:1331:22 | out : ImmutableList [<element>] : Object | provenance |  |
 | Test.java:1330:45:1330:46 | in : Object | Test.java:1330:10:1330:53 | of(...) : ImmutableList [<element>] : Object | provenance | MaD:55 |
 | Test.java:1331:20:1331:22 | out : ImmutableList [<element>] : Object | Test.java:110:19:110:32 | it : ImmutableList [<element>] : Object | provenance |  |
-| Test.java:1331:20:1331:22 | out : ImmutableList [<element>] : Object | Test.java:1331:9:1331:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:1331:20:1331:22 | out : ImmutableList [<element>] : Object | Test.java:1331:9:1331:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:1336:16:1336:31 | (...)... : Object | Test.java:1337:45:1337:46 | in : Object | provenance |  |
 | Test.java:1336:24:1336:31 | source(...) : Object | Test.java:1336:16:1336:31 | (...)... : Object | provenance |  |
 | Test.java:1337:10:1337:47 | of(...) : ImmutableList [<element>] : Object | Test.java:1338:20:1338:22 | out : ImmutableList [<element>] : Object | provenance |  |
 | Test.java:1337:45:1337:46 | in : Object | Test.java:1337:10:1337:47 | of(...) : ImmutableList [<element>] : Object | provenance | MaD:55 |
 | Test.java:1338:20:1338:22 | out : ImmutableList [<element>] : Object | Test.java:110:19:110:32 | it : ImmutableList [<element>] : Object | provenance |  |
-| Test.java:1338:20:1338:22 | out : ImmutableList [<element>] : Object | Test.java:1338:9:1338:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:1338:20:1338:22 | out : ImmutableList [<element>] : Object | Test.java:1338:9:1338:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:1343:16:1343:31 | (...)... : Object | Test.java:1344:39:1344:40 | in : Object | provenance |  |
 | Test.java:1343:24:1343:31 | source(...) : Object | Test.java:1343:16:1343:31 | (...)... : Object | provenance |  |
 | Test.java:1344:10:1344:89 | of(...) : ImmutableList [<element>] : Object | Test.java:1345:20:1345:22 | out : ImmutableList [<element>] : Object | provenance |  |
 | Test.java:1344:39:1344:40 | in : Object | Test.java:1344:10:1344:89 | of(...) : ImmutableList [<element>] : Object | provenance | MaD:55 |
 | Test.java:1345:20:1345:22 | out : ImmutableList [<element>] : Object | Test.java:110:19:110:32 | it : ImmutableList [<element>] : Object | provenance |  |
-| Test.java:1345:20:1345:22 | out : ImmutableList [<element>] : Object | Test.java:1345:9:1345:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:1345:20:1345:22 | out : ImmutableList [<element>] : Object | Test.java:1345:9:1345:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:1350:16:1350:31 | (...)... : Object | Test.java:1351:39:1351:40 | in : Object | provenance |  |
 | Test.java:1350:24:1350:31 | source(...) : Object | Test.java:1350:16:1350:31 | (...)... : Object | provenance |  |
 | Test.java:1351:10:1351:83 | of(...) : ImmutableList [<element>] : Object | Test.java:1352:20:1352:22 | out : ImmutableList [<element>] : Object | provenance |  |
 | Test.java:1351:39:1351:40 | in : Object | Test.java:1351:10:1351:83 | of(...) : ImmutableList [<element>] : Object | provenance | MaD:55 |
 | Test.java:1352:20:1352:22 | out : ImmutableList [<element>] : Object | Test.java:110:19:110:32 | it : ImmutableList [<element>] : Object | provenance |  |
-| Test.java:1352:20:1352:22 | out : ImmutableList [<element>] : Object | Test.java:1352:9:1352:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:1352:20:1352:22 | out : ImmutableList [<element>] : Object | Test.java:1352:9:1352:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:1357:16:1357:31 | (...)... : Object | Test.java:1358:39:1358:40 | in : Object | provenance |  |
 | Test.java:1357:24:1357:31 | source(...) : Object | Test.java:1357:16:1357:31 | (...)... : Object | provenance |  |
 | Test.java:1358:10:1358:77 | of(...) : ImmutableList [<element>] : Object | Test.java:1359:20:1359:22 | out : ImmutableList [<element>] : Object | provenance |  |
 | Test.java:1358:39:1358:40 | in : Object | Test.java:1358:10:1358:77 | of(...) : ImmutableList [<element>] : Object | provenance | MaD:55 |
 | Test.java:1359:20:1359:22 | out : ImmutableList [<element>] : Object | Test.java:110:19:110:32 | it : ImmutableList [<element>] : Object | provenance |  |
-| Test.java:1359:20:1359:22 | out : ImmutableList [<element>] : Object | Test.java:1359:9:1359:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:1359:20:1359:22 | out : ImmutableList [<element>] : Object | Test.java:1359:9:1359:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:1364:16:1364:31 | (...)... : Object | Test.java:1365:39:1365:40 | in : Object | provenance |  |
 | Test.java:1364:24:1364:31 | source(...) : Object | Test.java:1364:16:1364:31 | (...)... : Object | provenance |  |
 | Test.java:1365:10:1365:71 | of(...) : ImmutableList [<element>] : Object | Test.java:1366:20:1366:22 | out : ImmutableList [<element>] : Object | provenance |  |
 | Test.java:1365:39:1365:40 | in : Object | Test.java:1365:10:1365:71 | of(...) : ImmutableList [<element>] : Object | provenance | MaD:55 |
 | Test.java:1366:20:1366:22 | out : ImmutableList [<element>] : Object | Test.java:110:19:110:32 | it : ImmutableList [<element>] : Object | provenance |  |
-| Test.java:1366:20:1366:22 | out : ImmutableList [<element>] : Object | Test.java:1366:9:1366:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:1366:20:1366:22 | out : ImmutableList [<element>] : Object | Test.java:1366:9:1366:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:1371:16:1371:31 | (...)... : Object | Test.java:1372:39:1372:40 | in : Object | provenance |  |
 | Test.java:1371:24:1371:31 | source(...) : Object | Test.java:1371:16:1371:31 | (...)... : Object | provenance |  |
 | Test.java:1372:10:1372:65 | of(...) : ImmutableList [<element>] : Object | Test.java:1373:20:1373:22 | out : ImmutableList [<element>] : Object | provenance |  |
 | Test.java:1372:39:1372:40 | in : Object | Test.java:1372:10:1372:65 | of(...) : ImmutableList [<element>] : Object | provenance | MaD:55 |
 | Test.java:1373:20:1373:22 | out : ImmutableList [<element>] : Object | Test.java:110:19:110:32 | it : ImmutableList [<element>] : Object | provenance |  |
-| Test.java:1373:20:1373:22 | out : ImmutableList [<element>] : Object | Test.java:1373:9:1373:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:1373:20:1373:22 | out : ImmutableList [<element>] : Object | Test.java:1373:9:1373:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:1378:16:1378:31 | (...)... : Object | Test.java:1379:39:1379:40 | in : Object | provenance |  |
 | Test.java:1378:24:1378:31 | source(...) : Object | Test.java:1378:16:1378:31 | (...)... : Object | provenance |  |
 | Test.java:1379:10:1379:59 | of(...) : ImmutableList [<element>] : Object | Test.java:1380:20:1380:22 | out : ImmutableList [<element>] : Object | provenance |  |
 | Test.java:1379:39:1379:40 | in : Object | Test.java:1379:10:1379:59 | of(...) : ImmutableList [<element>] : Object | provenance | MaD:55 |
 | Test.java:1380:20:1380:22 | out : ImmutableList [<element>] : Object | Test.java:110:19:110:32 | it : ImmutableList [<element>] : Object | provenance |  |
-| Test.java:1380:20:1380:22 | out : ImmutableList [<element>] : Object | Test.java:1380:9:1380:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:1380:20:1380:22 | out : ImmutableList [<element>] : Object | Test.java:1380:9:1380:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:1385:16:1385:31 | (...)... : Object | Test.java:1386:39:1386:40 | in : Object | provenance |  |
 | Test.java:1385:24:1385:31 | source(...) : Object | Test.java:1385:16:1385:31 | (...)... : Object | provenance |  |
 | Test.java:1386:10:1386:53 | of(...) : ImmutableList [<element>] : Object | Test.java:1387:20:1387:22 | out : ImmutableList [<element>] : Object | provenance |  |
 | Test.java:1386:39:1386:40 | in : Object | Test.java:1386:10:1386:53 | of(...) : ImmutableList [<element>] : Object | provenance | MaD:55 |
 | Test.java:1387:20:1387:22 | out : ImmutableList [<element>] : Object | Test.java:110:19:110:32 | it : ImmutableList [<element>] : Object | provenance |  |
-| Test.java:1387:20:1387:22 | out : ImmutableList [<element>] : Object | Test.java:1387:9:1387:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:1387:20:1387:22 | out : ImmutableList [<element>] : Object | Test.java:1387:9:1387:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:1392:16:1392:31 | (...)... : Object | Test.java:1393:39:1393:40 | in : Object | provenance |  |
 | Test.java:1392:24:1392:31 | source(...) : Object | Test.java:1392:16:1392:31 | (...)... : Object | provenance |  |
 | Test.java:1393:10:1393:47 | of(...) : ImmutableList [<element>] : Object | Test.java:1394:20:1394:22 | out : ImmutableList [<element>] : Object | provenance |  |
 | Test.java:1393:39:1393:40 | in : Object | Test.java:1393:10:1393:47 | of(...) : ImmutableList [<element>] : Object | provenance | MaD:55 |
 | Test.java:1394:20:1394:22 | out : ImmutableList [<element>] : Object | Test.java:110:19:110:32 | it : ImmutableList [<element>] : Object | provenance |  |
-| Test.java:1394:20:1394:22 | out : ImmutableList [<element>] : Object | Test.java:1394:9:1394:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:1394:20:1394:22 | out : ImmutableList [<element>] : Object | Test.java:1394:9:1394:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:1399:16:1399:31 | (...)... : Object | Test.java:1400:39:1400:40 | in : Object | provenance |  |
 | Test.java:1399:24:1399:31 | source(...) : Object | Test.java:1399:16:1399:31 | (...)... : Object | provenance |  |
 | Test.java:1400:10:1400:41 | of(...) : ImmutableList [<element>] : Object | Test.java:1401:20:1401:22 | out : ImmutableList [<element>] : Object | provenance |  |
 | Test.java:1400:39:1400:40 | in : Object | Test.java:1400:10:1400:41 | of(...) : ImmutableList [<element>] : Object | provenance | MaD:55 |
 | Test.java:1401:20:1401:22 | out : ImmutableList [<element>] : Object | Test.java:110:19:110:32 | it : ImmutableList [<element>] : Object | provenance |  |
-| Test.java:1401:20:1401:22 | out : ImmutableList [<element>] : Object | Test.java:1401:9:1401:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:1401:20:1401:22 | out : ImmutableList [<element>] : Object | Test.java:1401:9:1401:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:1406:16:1406:31 | (...)... : Object | Test.java:1407:33:1407:34 | in : Object | provenance |  |
 | Test.java:1406:24:1406:31 | source(...) : Object | Test.java:1406:16:1406:31 | (...)... : Object | provenance |  |
 | Test.java:1407:10:1407:89 | of(...) : ImmutableList [<element>] : Object | Test.java:1408:20:1408:22 | out : ImmutableList [<element>] : Object | provenance |  |
 | Test.java:1407:33:1407:34 | in : Object | Test.java:1407:10:1407:89 | of(...) : ImmutableList [<element>] : Object | provenance | MaD:55 |
 | Test.java:1408:20:1408:22 | out : ImmutableList [<element>] : Object | Test.java:110:19:110:32 | it : ImmutableList [<element>] : Object | provenance |  |
-| Test.java:1408:20:1408:22 | out : ImmutableList [<element>] : Object | Test.java:1408:9:1408:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:1408:20:1408:22 | out : ImmutableList [<element>] : Object | Test.java:1408:9:1408:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:1413:16:1413:31 | (...)... : Object | Test.java:1414:33:1414:34 | in : Object | provenance |  |
 | Test.java:1413:24:1413:31 | source(...) : Object | Test.java:1413:16:1413:31 | (...)... : Object | provenance |  |
 | Test.java:1414:10:1414:83 | of(...) : ImmutableList [<element>] : Object | Test.java:1415:20:1415:22 | out : ImmutableList [<element>] : Object | provenance |  |
 | Test.java:1414:33:1414:34 | in : Object | Test.java:1414:10:1414:83 | of(...) : ImmutableList [<element>] : Object | provenance | MaD:55 |
 | Test.java:1415:20:1415:22 | out : ImmutableList [<element>] : Object | Test.java:110:19:110:32 | it : ImmutableList [<element>] : Object | provenance |  |
-| Test.java:1415:20:1415:22 | out : ImmutableList [<element>] : Object | Test.java:1415:9:1415:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:1415:20:1415:22 | out : ImmutableList [<element>] : Object | Test.java:1415:9:1415:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:1420:16:1420:31 | (...)... : Object | Test.java:1421:33:1421:34 | in : Object | provenance |  |
 | Test.java:1420:24:1420:31 | source(...) : Object | Test.java:1420:16:1420:31 | (...)... : Object | provenance |  |
 | Test.java:1421:10:1421:77 | of(...) : ImmutableList [<element>] : Object | Test.java:1422:20:1422:22 | out : ImmutableList [<element>] : Object | provenance |  |
 | Test.java:1421:33:1421:34 | in : Object | Test.java:1421:10:1421:77 | of(...) : ImmutableList [<element>] : Object | provenance | MaD:55 |
 | Test.java:1422:20:1422:22 | out : ImmutableList [<element>] : Object | Test.java:110:19:110:32 | it : ImmutableList [<element>] : Object | provenance |  |
-| Test.java:1422:20:1422:22 | out : ImmutableList [<element>] : Object | Test.java:1422:9:1422:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:1422:20:1422:22 | out : ImmutableList [<element>] : Object | Test.java:1422:9:1422:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:1427:16:1427:31 | (...)... : Object | Test.java:1428:33:1428:34 | in : Object | provenance |  |
 | Test.java:1427:24:1427:31 | source(...) : Object | Test.java:1427:16:1427:31 | (...)... : Object | provenance |  |
 | Test.java:1428:10:1428:71 | of(...) : ImmutableList [<element>] : Object | Test.java:1429:20:1429:22 | out : ImmutableList [<element>] : Object | provenance |  |
 | Test.java:1428:33:1428:34 | in : Object | Test.java:1428:10:1428:71 | of(...) : ImmutableList [<element>] : Object | provenance | MaD:55 |
 | Test.java:1429:20:1429:22 | out : ImmutableList [<element>] : Object | Test.java:110:19:110:32 | it : ImmutableList [<element>] : Object | provenance |  |
-| Test.java:1429:20:1429:22 | out : ImmutableList [<element>] : Object | Test.java:1429:9:1429:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:1429:20:1429:22 | out : ImmutableList [<element>] : Object | Test.java:1429:9:1429:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:1434:16:1434:31 | (...)... : Object | Test.java:1435:33:1435:34 | in : Object | provenance |  |
 | Test.java:1434:24:1434:31 | source(...) : Object | Test.java:1434:16:1434:31 | (...)... : Object | provenance |  |
 | Test.java:1435:10:1435:65 | of(...) : ImmutableList [<element>] : Object | Test.java:1436:20:1436:22 | out : ImmutableList [<element>] : Object | provenance |  |
 | Test.java:1435:33:1435:34 | in : Object | Test.java:1435:10:1435:65 | of(...) : ImmutableList [<element>] : Object | provenance | MaD:55 |
 | Test.java:1436:20:1436:22 | out : ImmutableList [<element>] : Object | Test.java:110:19:110:32 | it : ImmutableList [<element>] : Object | provenance |  |
-| Test.java:1436:20:1436:22 | out : ImmutableList [<element>] : Object | Test.java:1436:9:1436:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:1436:20:1436:22 | out : ImmutableList [<element>] : Object | Test.java:1436:9:1436:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:1441:16:1441:31 | (...)... : Object | Test.java:1442:33:1442:34 | in : Object | provenance |  |
 | Test.java:1441:24:1441:31 | source(...) : Object | Test.java:1441:16:1441:31 | (...)... : Object | provenance |  |
 | Test.java:1442:10:1442:59 | of(...) : ImmutableList [<element>] : Object | Test.java:1443:20:1443:22 | out : ImmutableList [<element>] : Object | provenance |  |
 | Test.java:1442:33:1442:34 | in : Object | Test.java:1442:10:1442:59 | of(...) : ImmutableList [<element>] : Object | provenance | MaD:55 |
 | Test.java:1443:20:1443:22 | out : ImmutableList [<element>] : Object | Test.java:110:19:110:32 | it : ImmutableList [<element>] : Object | provenance |  |
-| Test.java:1443:20:1443:22 | out : ImmutableList [<element>] : Object | Test.java:1443:9:1443:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:1443:20:1443:22 | out : ImmutableList [<element>] : Object | Test.java:1443:9:1443:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:1448:16:1448:31 | (...)... : Object | Test.java:1449:33:1449:34 | in : Object | provenance |  |
 | Test.java:1448:24:1448:31 | source(...) : Object | Test.java:1448:16:1448:31 | (...)... : Object | provenance |  |
 | Test.java:1449:10:1449:53 | of(...) : ImmutableList [<element>] : Object | Test.java:1450:20:1450:22 | out : ImmutableList [<element>] : Object | provenance |  |
 | Test.java:1449:33:1449:34 | in : Object | Test.java:1449:10:1449:53 | of(...) : ImmutableList [<element>] : Object | provenance | MaD:55 |
 | Test.java:1450:20:1450:22 | out : ImmutableList [<element>] : Object | Test.java:110:19:110:32 | it : ImmutableList [<element>] : Object | provenance |  |
-| Test.java:1450:20:1450:22 | out : ImmutableList [<element>] : Object | Test.java:1450:9:1450:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:1450:20:1450:22 | out : ImmutableList [<element>] : Object | Test.java:1450:9:1450:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:1455:16:1455:31 | (...)... : Object | Test.java:1456:33:1456:34 | in : Object | provenance |  |
 | Test.java:1455:24:1455:31 | source(...) : Object | Test.java:1455:16:1455:31 | (...)... : Object | provenance |  |
 | Test.java:1456:10:1456:47 | of(...) : ImmutableList [<element>] : Object | Test.java:1457:20:1457:22 | out : ImmutableList [<element>] : Object | provenance |  |
 | Test.java:1456:33:1456:34 | in : Object | Test.java:1456:10:1456:47 | of(...) : ImmutableList [<element>] : Object | provenance | MaD:55 |
 | Test.java:1457:20:1457:22 | out : ImmutableList [<element>] : Object | Test.java:110:19:110:32 | it : ImmutableList [<element>] : Object | provenance |  |
-| Test.java:1457:20:1457:22 | out : ImmutableList [<element>] : Object | Test.java:1457:9:1457:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:1457:20:1457:22 | out : ImmutableList [<element>] : Object | Test.java:1457:9:1457:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:1462:16:1462:31 | (...)... : Object | Test.java:1463:33:1463:34 | in : Object | provenance |  |
 | Test.java:1462:24:1462:31 | source(...) : Object | Test.java:1462:16:1462:31 | (...)... : Object | provenance |  |
 | Test.java:1463:10:1463:41 | of(...) : ImmutableList [<element>] : Object | Test.java:1464:20:1464:22 | out : ImmutableList [<element>] : Object | provenance |  |
 | Test.java:1463:33:1463:34 | in : Object | Test.java:1463:10:1463:41 | of(...) : ImmutableList [<element>] : Object | provenance | MaD:55 |
 | Test.java:1464:20:1464:22 | out : ImmutableList [<element>] : Object | Test.java:110:19:110:32 | it : ImmutableList [<element>] : Object | provenance |  |
-| Test.java:1464:20:1464:22 | out : ImmutableList [<element>] : Object | Test.java:1464:9:1464:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:1464:20:1464:22 | out : ImmutableList [<element>] : Object | Test.java:1464:9:1464:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:1469:16:1469:31 | (...)... : Object | Test.java:1470:33:1470:34 | in : Object | provenance |  |
 | Test.java:1469:24:1469:31 | source(...) : Object | Test.java:1469:16:1469:31 | (...)... : Object | provenance |  |
 | Test.java:1470:10:1470:35 | of(...) : ImmutableList [<element>] : Object | Test.java:1471:20:1471:22 | out : ImmutableList [<element>] : Object | provenance |  |
 | Test.java:1470:33:1470:34 | in : Object | Test.java:1470:10:1470:35 | of(...) : ImmutableList [<element>] : Object | provenance | MaD:55 |
 | Test.java:1471:20:1471:22 | out : ImmutableList [<element>] : Object | Test.java:110:19:110:32 | it : ImmutableList [<element>] : Object | provenance |  |
-| Test.java:1471:20:1471:22 | out : ImmutableList [<element>] : Object | Test.java:1471:9:1471:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:1471:20:1471:22 | out : ImmutableList [<element>] : Object | Test.java:1471:9:1471:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:1476:16:1476:31 | (...)... : Object | Test.java:1477:27:1477:28 | in : Object | provenance |  |
 | Test.java:1476:24:1476:31 | source(...) : Object | Test.java:1476:16:1476:31 | (...)... : Object | provenance |  |
 | Test.java:1477:10:1477:89 | of(...) : ImmutableList [<element>] : Object | Test.java:1478:20:1478:22 | out : ImmutableList [<element>] : Object | provenance |  |
 | Test.java:1477:27:1477:28 | in : Object | Test.java:1477:10:1477:89 | of(...) : ImmutableList [<element>] : Object | provenance | MaD:55 |
 | Test.java:1478:20:1478:22 | out : ImmutableList [<element>] : Object | Test.java:110:19:110:32 | it : ImmutableList [<element>] : Object | provenance |  |
-| Test.java:1478:20:1478:22 | out : ImmutableList [<element>] : Object | Test.java:1478:9:1478:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:1478:20:1478:22 | out : ImmutableList [<element>] : Object | Test.java:1478:9:1478:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:1483:16:1483:31 | (...)... : Object | Test.java:1484:27:1484:28 | in : Object | provenance |  |
 | Test.java:1483:24:1483:31 | source(...) : Object | Test.java:1483:16:1483:31 | (...)... : Object | provenance |  |
 | Test.java:1484:10:1484:83 | of(...) : ImmutableList [<element>] : Object | Test.java:1485:20:1485:22 | out : ImmutableList [<element>] : Object | provenance |  |
 | Test.java:1484:27:1484:28 | in : Object | Test.java:1484:10:1484:83 | of(...) : ImmutableList [<element>] : Object | provenance | MaD:55 |
 | Test.java:1485:20:1485:22 | out : ImmutableList [<element>] : Object | Test.java:110:19:110:32 | it : ImmutableList [<element>] : Object | provenance |  |
-| Test.java:1485:20:1485:22 | out : ImmutableList [<element>] : Object | Test.java:1485:9:1485:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:1485:20:1485:22 | out : ImmutableList [<element>] : Object | Test.java:1485:9:1485:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:1490:16:1490:31 | (...)... : Object | Test.java:1491:27:1491:28 | in : Object | provenance |  |
 | Test.java:1490:24:1490:31 | source(...) : Object | Test.java:1490:16:1490:31 | (...)... : Object | provenance |  |
 | Test.java:1491:10:1491:77 | of(...) : ImmutableList [<element>] : Object | Test.java:1492:20:1492:22 | out : ImmutableList [<element>] : Object | provenance |  |
 | Test.java:1491:27:1491:28 | in : Object | Test.java:1491:10:1491:77 | of(...) : ImmutableList [<element>] : Object | provenance | MaD:55 |
 | Test.java:1492:20:1492:22 | out : ImmutableList [<element>] : Object | Test.java:110:19:110:32 | it : ImmutableList [<element>] : Object | provenance |  |
-| Test.java:1492:20:1492:22 | out : ImmutableList [<element>] : Object | Test.java:1492:9:1492:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:1492:20:1492:22 | out : ImmutableList [<element>] : Object | Test.java:1492:9:1492:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:1497:16:1497:31 | (...)... : Object | Test.java:1498:27:1498:28 | in : Object | provenance |  |
 | Test.java:1497:24:1497:31 | source(...) : Object | Test.java:1497:16:1497:31 | (...)... : Object | provenance |  |
 | Test.java:1498:10:1498:71 | of(...) : ImmutableList [<element>] : Object | Test.java:1499:20:1499:22 | out : ImmutableList [<element>] : Object | provenance |  |
 | Test.java:1498:27:1498:28 | in : Object | Test.java:1498:10:1498:71 | of(...) : ImmutableList [<element>] : Object | provenance | MaD:55 |
 | Test.java:1499:20:1499:22 | out : ImmutableList [<element>] : Object | Test.java:110:19:110:32 | it : ImmutableList [<element>] : Object | provenance |  |
-| Test.java:1499:20:1499:22 | out : ImmutableList [<element>] : Object | Test.java:1499:9:1499:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:1499:20:1499:22 | out : ImmutableList [<element>] : Object | Test.java:1499:9:1499:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:1504:16:1504:31 | (...)... : Object | Test.java:1505:27:1505:28 | in : Object | provenance |  |
 | Test.java:1504:24:1504:31 | source(...) : Object | Test.java:1504:16:1504:31 | (...)... : Object | provenance |  |
 | Test.java:1505:10:1505:65 | of(...) : ImmutableList [<element>] : Object | Test.java:1506:20:1506:22 | out : ImmutableList [<element>] : Object | provenance |  |
 | Test.java:1505:27:1505:28 | in : Object | Test.java:1505:10:1505:65 | of(...) : ImmutableList [<element>] : Object | provenance | MaD:55 |
 | Test.java:1506:20:1506:22 | out : ImmutableList [<element>] : Object | Test.java:110:19:110:32 | it : ImmutableList [<element>] : Object | provenance |  |
-| Test.java:1506:20:1506:22 | out : ImmutableList [<element>] : Object | Test.java:1506:9:1506:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:1506:20:1506:22 | out : ImmutableList [<element>] : Object | Test.java:1506:9:1506:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:1511:16:1511:31 | (...)... : Object | Test.java:1512:27:1512:28 | in : Object | provenance |  |
 | Test.java:1511:24:1511:31 | source(...) : Object | Test.java:1511:16:1511:31 | (...)... : Object | provenance |  |
 | Test.java:1512:10:1512:59 | of(...) : ImmutableList [<element>] : Object | Test.java:1513:20:1513:22 | out : ImmutableList [<element>] : Object | provenance |  |
 | Test.java:1512:27:1512:28 | in : Object | Test.java:1512:10:1512:59 | of(...) : ImmutableList [<element>] : Object | provenance | MaD:55 |
 | Test.java:1513:20:1513:22 | out : ImmutableList [<element>] : Object | Test.java:110:19:110:32 | it : ImmutableList [<element>] : Object | provenance |  |
-| Test.java:1513:20:1513:22 | out : ImmutableList [<element>] : Object | Test.java:1513:9:1513:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:1513:20:1513:22 | out : ImmutableList [<element>] : Object | Test.java:1513:9:1513:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:1518:16:1518:31 | (...)... : Object | Test.java:1519:27:1519:28 | in : Object | provenance |  |
 | Test.java:1518:24:1518:31 | source(...) : Object | Test.java:1518:16:1518:31 | (...)... : Object | provenance |  |
 | Test.java:1519:10:1519:53 | of(...) : ImmutableList [<element>] : Object | Test.java:1520:20:1520:22 | out : ImmutableList [<element>] : Object | provenance |  |
 | Test.java:1519:27:1519:28 | in : Object | Test.java:1519:10:1519:53 | of(...) : ImmutableList [<element>] : Object | provenance | MaD:55 |
 | Test.java:1520:20:1520:22 | out : ImmutableList [<element>] : Object | Test.java:110:19:110:32 | it : ImmutableList [<element>] : Object | provenance |  |
-| Test.java:1520:20:1520:22 | out : ImmutableList [<element>] : Object | Test.java:1520:9:1520:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:1520:20:1520:22 | out : ImmutableList [<element>] : Object | Test.java:1520:9:1520:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:1525:16:1525:31 | (...)... : Object | Test.java:1526:27:1526:28 | in : Object | provenance |  |
 | Test.java:1525:24:1525:31 | source(...) : Object | Test.java:1525:16:1525:31 | (...)... : Object | provenance |  |
 | Test.java:1526:10:1526:47 | of(...) : ImmutableList [<element>] : Object | Test.java:1527:20:1527:22 | out : ImmutableList [<element>] : Object | provenance |  |
 | Test.java:1526:27:1526:28 | in : Object | Test.java:1526:10:1526:47 | of(...) : ImmutableList [<element>] : Object | provenance | MaD:55 |
 | Test.java:1527:20:1527:22 | out : ImmutableList [<element>] : Object | Test.java:110:19:110:32 | it : ImmutableList [<element>] : Object | provenance |  |
-| Test.java:1527:20:1527:22 | out : ImmutableList [<element>] : Object | Test.java:1527:9:1527:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:1527:20:1527:22 | out : ImmutableList [<element>] : Object | Test.java:1527:9:1527:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:1532:16:1532:31 | (...)... : Object | Test.java:1533:27:1533:28 | in : Object | provenance |  |
 | Test.java:1532:24:1532:31 | source(...) : Object | Test.java:1532:16:1532:31 | (...)... : Object | provenance |  |
 | Test.java:1533:10:1533:41 | of(...) : ImmutableList [<element>] : Object | Test.java:1534:20:1534:22 | out : ImmutableList [<element>] : Object | provenance |  |
 | Test.java:1533:27:1533:28 | in : Object | Test.java:1533:10:1533:41 | of(...) : ImmutableList [<element>] : Object | provenance | MaD:55 |
 | Test.java:1534:20:1534:22 | out : ImmutableList [<element>] : Object | Test.java:110:19:110:32 | it : ImmutableList [<element>] : Object | provenance |  |
-| Test.java:1534:20:1534:22 | out : ImmutableList [<element>] : Object | Test.java:1534:9:1534:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:1534:20:1534:22 | out : ImmutableList [<element>] : Object | Test.java:1534:9:1534:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:1539:16:1539:31 | (...)... : Object | Test.java:1540:27:1540:28 | in : Object | provenance |  |
 | Test.java:1539:24:1539:31 | source(...) : Object | Test.java:1539:16:1539:31 | (...)... : Object | provenance |  |
 | Test.java:1540:10:1540:35 | of(...) : ImmutableList [<element>] : Object | Test.java:1541:20:1541:22 | out : ImmutableList [<element>] : Object | provenance |  |
 | Test.java:1540:27:1540:28 | in : Object | Test.java:1540:10:1540:35 | of(...) : ImmutableList [<element>] : Object | provenance | MaD:55 |
 | Test.java:1541:20:1541:22 | out : ImmutableList [<element>] : Object | Test.java:110:19:110:32 | it : ImmutableList [<element>] : Object | provenance |  |
-| Test.java:1541:20:1541:22 | out : ImmutableList [<element>] : Object | Test.java:1541:9:1541:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:1541:20:1541:22 | out : ImmutableList [<element>] : Object | Test.java:1541:9:1541:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:1546:16:1546:31 | (...)... : Object | Test.java:1547:27:1547:28 | in : Object | provenance |  |
 | Test.java:1546:24:1546:31 | source(...) : Object | Test.java:1546:16:1546:31 | (...)... : Object | provenance |  |
 | Test.java:1547:10:1547:199 | of(...) : ImmutableList [<element>] : Object | Test.java:1548:20:1548:22 | out : ImmutableList [<element>] : Object | provenance |  |
 | Test.java:1547:27:1547:28 | in : Object | Test.java:1547:10:1547:199 | of(...) : ImmutableList [<element>] : Object | provenance | MaD:55 |
 | Test.java:1548:20:1548:22 | out : ImmutableList [<element>] : Object | Test.java:110:19:110:32 | it : ImmutableList [<element>] : Object | provenance |  |
-| Test.java:1548:20:1548:22 | out : ImmutableList [<element>] : Object | Test.java:1548:9:1548:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:1548:20:1548:22 | out : ImmutableList [<element>] : Object | Test.java:1548:9:1548:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:1553:16:1553:31 | (...)... : Object | Test.java:1554:27:1554:28 | in : Object | provenance |  |
 | Test.java:1553:24:1553:31 | source(...) : Object | Test.java:1553:16:1553:31 | (...)... : Object | provenance |  |
 | Test.java:1554:10:1554:29 | of(...) : ImmutableList [<element>] : Object | Test.java:1555:20:1555:22 | out : ImmutableList [<element>] : Object | provenance |  |
 | Test.java:1554:27:1554:28 | in : Object | Test.java:1554:10:1554:29 | of(...) : ImmutableList [<element>] : Object | provenance | MaD:55 |
 | Test.java:1555:20:1555:22 | out : ImmutableList [<element>] : Object | Test.java:110:19:110:32 | it : ImmutableList [<element>] : Object | provenance |  |
-| Test.java:1555:20:1555:22 | out : ImmutableList [<element>] : Object | Test.java:1555:9:1555:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:1555:20:1555:22 | out : ImmutableList [<element>] : Object | Test.java:1555:9:1555:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:1560:16:1560:31 | (...)... : Object | Test.java:1561:41:1561:42 | in : Object | provenance |  |
 | Test.java:1560:24:1560:31 | source(...) : Object | Test.java:1560:16:1560:31 | (...)... : Object | provenance |  |
 | Test.java:1561:10:1561:199 | of(...) : ImmutableList [<element>] : Object | Test.java:1562:20:1562:22 | out : ImmutableList [<element>] : Object | provenance |  |
 | Test.java:1561:41:1561:42 | in : Object | Test.java:1561:10:1561:199 | of(...) : ImmutableList [<element>] : Object | provenance | MaD:55 |
 | Test.java:1562:20:1562:22 | out : ImmutableList [<element>] : Object | Test.java:110:19:110:32 | it : ImmutableList [<element>] : Object | provenance |  |
-| Test.java:1562:20:1562:22 | out : ImmutableList [<element>] : Object | Test.java:1562:9:1562:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:1562:20:1562:22 | out : ImmutableList [<element>] : Object | Test.java:1562:9:1562:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:1567:16:1567:31 | (...)... : Object | Test.java:1568:55:1568:56 | in : Object | provenance |  |
 | Test.java:1567:24:1567:31 | source(...) : Object | Test.java:1567:16:1567:31 | (...)... : Object | provenance |  |
 | Test.java:1568:10:1568:199 | of(...) : ImmutableList [<element>] : Object | Test.java:1569:20:1569:22 | out : ImmutableList [<element>] : Object | provenance |  |
 | Test.java:1568:55:1568:56 | in : Object | Test.java:1568:10:1568:199 | of(...) : ImmutableList [<element>] : Object | provenance | MaD:55 |
 | Test.java:1569:20:1569:22 | out : ImmutableList [<element>] : Object | Test.java:110:19:110:32 | it : ImmutableList [<element>] : Object | provenance |  |
-| Test.java:1569:20:1569:22 | out : ImmutableList [<element>] : Object | Test.java:1569:9:1569:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:1569:20:1569:22 | out : ImmutableList [<element>] : Object | Test.java:1569:9:1569:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:1574:16:1574:31 | (...)... : Object | Test.java:1575:69:1575:70 | in : Object | provenance |  |
 | Test.java:1574:24:1574:31 | source(...) : Object | Test.java:1574:16:1574:31 | (...)... : Object | provenance |  |
 | Test.java:1575:10:1575:199 | of(...) : ImmutableList [<element>] : Object | Test.java:1576:20:1576:22 | out : ImmutableList [<element>] : Object | provenance |  |
 | Test.java:1575:69:1575:70 | in : Object | Test.java:1575:10:1575:199 | of(...) : ImmutableList [<element>] : Object | provenance | MaD:55 |
 | Test.java:1576:20:1576:22 | out : ImmutableList [<element>] : Object | Test.java:110:19:110:32 | it : ImmutableList [<element>] : Object | provenance |  |
-| Test.java:1576:20:1576:22 | out : ImmutableList [<element>] : Object | Test.java:1576:9:1576:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:1576:20:1576:22 | out : ImmutableList [<element>] : Object | Test.java:1576:9:1576:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:1581:16:1581:31 | (...)... : Object | Test.java:1582:83:1582:84 | in : Object | provenance |  |
 | Test.java:1581:24:1581:31 | source(...) : Object | Test.java:1581:16:1581:31 | (...)... : Object | provenance |  |
 | Test.java:1582:10:1582:199 | of(...) : ImmutableList [<element>] : Object | Test.java:1583:20:1583:22 | out : ImmutableList [<element>] : Object | provenance |  |
 | Test.java:1582:83:1582:84 | in : Object | Test.java:1582:10:1582:199 | of(...) : ImmutableList [<element>] : Object | provenance | MaD:55 |
 | Test.java:1583:20:1583:22 | out : ImmutableList [<element>] : Object | Test.java:110:19:110:32 | it : ImmutableList [<element>] : Object | provenance |  |
-| Test.java:1583:20:1583:22 | out : ImmutableList [<element>] : Object | Test.java:1583:9:1583:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:1583:20:1583:22 | out : ImmutableList [<element>] : Object | Test.java:1583:9:1583:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:1588:16:1588:31 | (...)... : Object | Test.java:1589:97:1589:98 | in : Object | provenance |  |
 | Test.java:1588:24:1588:31 | source(...) : Object | Test.java:1588:16:1588:31 | (...)... : Object | provenance |  |
 | Test.java:1589:10:1589:199 | of(...) : ImmutableList [<element>] : Object | Test.java:1590:20:1590:22 | out : ImmutableList [<element>] : Object | provenance |  |
 | Test.java:1589:97:1589:98 | in : Object | Test.java:1589:10:1589:199 | of(...) : ImmutableList [<element>] : Object | provenance | MaD:55 |
 | Test.java:1590:20:1590:22 | out : ImmutableList [<element>] : Object | Test.java:110:19:110:32 | it : ImmutableList [<element>] : Object | provenance |  |
-| Test.java:1590:20:1590:22 | out : ImmutableList [<element>] : Object | Test.java:1590:9:1590:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:1590:20:1590:22 | out : ImmutableList [<element>] : Object | Test.java:1590:9:1590:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:1595:16:1595:31 | (...)... : Object | Test.java:1596:111:1596:112 | in : Object | provenance |  |
 | Test.java:1595:24:1595:31 | source(...) : Object | Test.java:1595:16:1595:31 | (...)... : Object | provenance |  |
 | Test.java:1596:10:1596:199 | of(...) : ImmutableList [<element>] : Object | Test.java:1597:20:1597:22 | out : ImmutableList [<element>] : Object | provenance |  |
 | Test.java:1596:111:1596:112 | in : Object | Test.java:1596:10:1596:199 | of(...) : ImmutableList [<element>] : Object | provenance | MaD:55 |
 | Test.java:1597:20:1597:22 | out : ImmutableList [<element>] : Object | Test.java:110:19:110:32 | it : ImmutableList [<element>] : Object | provenance |  |
-| Test.java:1597:20:1597:22 | out : ImmutableList [<element>] : Object | Test.java:1597:9:1597:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:1597:20:1597:22 | out : ImmutableList [<element>] : Object | Test.java:1597:9:1597:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:1602:16:1602:31 | (...)... : Object | Test.java:1603:125:1603:126 | in : Object | provenance |  |
 | Test.java:1602:24:1602:31 | source(...) : Object | Test.java:1602:16:1602:31 | (...)... : Object | provenance |  |
 | Test.java:1603:10:1603:199 | of(...) : ImmutableList [<element>] : Object | Test.java:1604:20:1604:22 | out : ImmutableList [<element>] : Object | provenance |  |
 | Test.java:1603:125:1603:126 | in : Object | Test.java:1603:10:1603:199 | of(...) : ImmutableList [<element>] : Object | provenance | MaD:55 |
 | Test.java:1604:20:1604:22 | out : ImmutableList [<element>] : Object | Test.java:110:19:110:32 | it : ImmutableList [<element>] : Object | provenance |  |
-| Test.java:1604:20:1604:22 | out : ImmutableList [<element>] : Object | Test.java:1604:9:1604:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:1604:20:1604:22 | out : ImmutableList [<element>] : Object | Test.java:1604:9:1604:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:1609:16:1609:31 | (...)... : Object | Test.java:1610:139:1610:140 | in : Object | provenance |  |
 | Test.java:1609:24:1609:31 | source(...) : Object | Test.java:1609:16:1609:31 | (...)... : Object | provenance |  |
 | Test.java:1610:10:1610:199 | of(...) : ImmutableList [<element>] : Object | Test.java:1611:20:1611:22 | out : ImmutableList [<element>] : Object | provenance |  |
 | Test.java:1610:139:1610:140 | in : Object | Test.java:1610:10:1610:199 | of(...) : ImmutableList [<element>] : Object | provenance | MaD:55 |
 | Test.java:1611:20:1611:22 | out : ImmutableList [<element>] : Object | Test.java:110:19:110:32 | it : ImmutableList [<element>] : Object | provenance |  |
-| Test.java:1611:20:1611:22 | out : ImmutableList [<element>] : Object | Test.java:1611:9:1611:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:1611:20:1611:22 | out : ImmutableList [<element>] : Object | Test.java:1611:9:1611:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:1616:16:1616:31 | (...)... : Object | Test.java:1617:153:1617:154 | in : Object | provenance |  |
 | Test.java:1616:24:1616:31 | source(...) : Object | Test.java:1616:16:1616:31 | (...)... : Object | provenance |  |
 | Test.java:1617:10:1617:199 | of(...) : ImmutableList [<element>] : Object | Test.java:1618:20:1618:22 | out : ImmutableList [<element>] : Object | provenance |  |
 | Test.java:1617:153:1617:154 | in : Object | Test.java:1617:10:1617:199 | of(...) : ImmutableList [<element>] : Object | provenance | MaD:55 |
 | Test.java:1618:20:1618:22 | out : ImmutableList [<element>] : Object | Test.java:110:19:110:32 | it : ImmutableList [<element>] : Object | provenance |  |
-| Test.java:1618:20:1618:22 | out : ImmutableList [<element>] : Object | Test.java:1618:9:1618:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:1618:20:1618:22 | out : ImmutableList [<element>] : Object | Test.java:1618:9:1618:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:1623:16:1623:31 | (...)... : Object | Test.java:1624:167:1624:168 | in : Object | provenance |  |
 | Test.java:1623:24:1623:31 | source(...) : Object | Test.java:1623:16:1623:31 | (...)... : Object | provenance |  |
 | Test.java:1624:10:1624:199 | of(...) : ImmutableList [<element>] : Object | Test.java:1625:20:1625:22 | out : ImmutableList [<element>] : Object | provenance |  |
 | Test.java:1624:167:1624:168 | in : Object | Test.java:1624:10:1624:199 | of(...) : ImmutableList [<element>] : Object | provenance | MaD:55 |
 | Test.java:1625:20:1625:22 | out : ImmutableList [<element>] : Object | Test.java:110:19:110:32 | it : ImmutableList [<element>] : Object | provenance |  |
-| Test.java:1625:20:1625:22 | out : ImmutableList [<element>] : Object | Test.java:1625:9:1625:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:1625:20:1625:22 | out : ImmutableList [<element>] : Object | Test.java:1625:9:1625:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:1630:16:1630:31 | (...)... : Object | Test.java:1631:181:1631:182 | in : Object | provenance |  |
 | Test.java:1630:24:1630:31 | source(...) : Object | Test.java:1630:16:1630:31 | (...)... : Object | provenance |  |
 | Test.java:1631:10:1631:199 | of(...) : ImmutableList [<element>] : Object | Test.java:1632:20:1632:22 | out : ImmutableList [<element>] : Object | provenance |  |
 | Test.java:1631:181:1631:182 | in : Object | Test.java:1631:10:1631:199 | of(...) : ImmutableList [<element>] : Object | provenance | MaD:55 |
 | Test.java:1632:20:1632:22 | out : ImmutableList [<element>] : Object | Test.java:110:19:110:32 | it : ImmutableList [<element>] : Object | provenance |  |
-| Test.java:1632:20:1632:22 | out : ImmutableList [<element>] : Object | Test.java:1632:9:1632:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:1632:20:1632:22 | out : ImmutableList [<element>] : Object | Test.java:1632:9:1632:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:1637:18:1637:49 | (...)... : Object[] [[]] : Object | Test.java:1638:195:1638:196 | in : Object[] [[]] : Object | provenance |  |
 | Test.java:1637:28:1637:49 | {...} : Object[] [[]] : Object | Test.java:1637:18:1637:49 | (...)... : Object[] [[]] : Object | provenance |  |
 | Test.java:1637:41:1637:48 | source(...) : Object | Test.java:1637:28:1637:49 | {...} : Object[] [[]] : Object | provenance |  |
 | Test.java:1638:10:1638:197 | of(...) : ImmutableList [<element>] : Object | Test.java:1639:20:1639:22 | out : ImmutableList [<element>] : Object | provenance |  |
 | Test.java:1638:195:1638:196 | in : Object[] [[]] : Object | Test.java:1638:10:1638:197 | of(...) : ImmutableList [<element>] : Object | provenance | MaD:56 |
 | Test.java:1639:20:1639:22 | out : ImmutableList [<element>] : Object | Test.java:110:19:110:32 | it : ImmutableList [<element>] : Object | provenance |  |
-| Test.java:1639:20:1639:22 | out : ImmutableList [<element>] : Object | Test.java:1639:9:1639:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:1639:20:1639:22 | out : ImmutableList [<element>] : Object | Test.java:1639:9:1639:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:1644:23:1644:63 | (...)... : ImmutableList [<element>] : Object | Test.java:1645:10:1645:11 | in : ImmutableList [<element>] : Object | provenance |  |
 | Test.java:1644:38:1644:63 | of(...) : ImmutableList [<element>] : Object | Test.java:1644:23:1644:63 | (...)... : ImmutableList [<element>] : Object | provenance |  |
 | Test.java:1644:55:1644:62 | source(...) : Object | Test.java:1644:38:1644:63 | of(...) : ImmutableList [<element>] : Object | provenance | MaD:55 |
 | Test.java:1645:10:1645:11 | in : ImmutableList [<element>] : Object | Test.java:1645:10:1645:21 | reverse(...) : ImmutableList [<element>] : Object | provenance | MaD:57 |
 | Test.java:1645:10:1645:21 | reverse(...) : ImmutableList [<element>] : Object | Test.java:1646:20:1646:22 | out : ImmutableList [<element>] : Object | provenance |  |
 | Test.java:1646:20:1646:22 | out : ImmutableList [<element>] : Object | Test.java:110:19:110:32 | it : ImmutableList [<element>] : Object | provenance |  |
-| Test.java:1646:20:1646:22 | out : ImmutableList [<element>] : Object | Test.java:1646:9:1646:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:1646:20:1646:22 | out : ImmutableList [<element>] : Object | Test.java:1646:9:1646:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:1651:18:1651:44 | (...)... : List [<element>] : Object | Test.java:1652:43:1652:44 | in : List [<element>] : Object | provenance |  |
 | Test.java:1651:28:1651:44 | of(...) : List [<element>] : Object | Test.java:1651:18:1651:44 | (...)... : List [<element>] : Object | provenance |  |
-| Test.java:1651:36:1651:43 | source(...) : Object | Test.java:1651:28:1651:44 | of(...) : List [<element>] : Object | provenance | MaD:558 |
+| Test.java:1651:36:1651:43 | source(...) : Object | Test.java:1651:28:1651:44 | of(...) : List [<element>] : Object | provenance | MaD:561 |
 | Test.java:1652:10:1652:45 | sortedCopyOf(...) : ImmutableList [<element>] : Object | Test.java:1653:20:1653:22 | out : ImmutableList [<element>] : Object | provenance |  |
 | Test.java:1652:43:1652:44 | in : List [<element>] : Object | Test.java:1652:10:1652:45 | sortedCopyOf(...) : ImmutableList [<element>] : Object | provenance | MaD:58 |
 | Test.java:1653:20:1653:22 | out : ImmutableList [<element>] : Object | Test.java:110:19:110:32 | it : ImmutableList [<element>] : Object | provenance |  |
-| Test.java:1653:20:1653:22 | out : ImmutableList [<element>] : Object | Test.java:1653:9:1653:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:1653:20:1653:22 | out : ImmutableList [<element>] : Object | Test.java:1653:9:1653:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:1658:18:1658:44 | (...)... : List [<element>] : Object | Test.java:1659:37:1659:38 | in : List [<element>] : Object | provenance |  |
 | Test.java:1658:28:1658:44 | of(...) : List [<element>] : Object | Test.java:1658:18:1658:44 | (...)... : List [<element>] : Object | provenance |  |
-| Test.java:1658:36:1658:43 | source(...) : Object | Test.java:1658:28:1658:44 | of(...) : List [<element>] : Object | provenance | MaD:558 |
+| Test.java:1658:36:1658:43 | source(...) : Object | Test.java:1658:28:1658:44 | of(...) : List [<element>] : Object | provenance | MaD:561 |
 | Test.java:1659:10:1659:39 | sortedCopyOf(...) : ImmutableList [<element>] : Object | Test.java:1660:20:1660:22 | out : ImmutableList [<element>] : Object | provenance |  |
 | Test.java:1659:37:1659:38 | in : List [<element>] : Object | Test.java:1659:10:1659:39 | sortedCopyOf(...) : ImmutableList [<element>] : Object | provenance | MaD:59 |
 | Test.java:1660:20:1660:22 | out : ImmutableList [<element>] : Object | Test.java:110:19:110:32 | it : ImmutableList [<element>] : Object | provenance |  |
-| Test.java:1660:20:1660:22 | out : ImmutableList [<element>] : Object | Test.java:1660:9:1660:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:1660:20:1660:22 | out : ImmutableList [<element>] : Object | Test.java:1660:9:1660:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:1665:16:1665:31 | (...)... : Object | Test.java:1666:35:1666:36 | in : Object | provenance |  |
 | Test.java:1665:24:1665:31 | source(...) : Object | Test.java:1665:16:1665:31 | (...)... : Object | provenance |  |
 | Test.java:1666:10:1666:91 | of(...) : ImmutableListMultimap [<map.key>] : Object | Test.java:1667:19:1667:21 | out : ImmutableListMultimap [<map.key>] : Object | provenance |  |
@@ -2722,1497 +2722,1497 @@ edges
 | Test.java:1870:21:1870:23 | out : ImmutableListMultimap [<map.value>] : Object | Test.java:1870:9:1870:24 | getMapValue(...) | provenance | MaD:385 |
 | Test.java:1875:36:1875:111 | (...)... : Builder [<map.key>] : Object | Test.java:1876:10:1876:11 | in : Builder [<map.key>] : Object | provenance |  |
 | Test.java:1875:64:1875:111 | put(...) : Builder [<map.key>] : Object | Test.java:1875:36:1875:111 | (...)... : Builder [<map.key>] : Object | provenance |  |
-| Test.java:1875:97:1875:104 | source(...) : Object | Test.java:1875:64:1875:111 | put(...) : Builder [<map.key>] : Object | provenance | MaD:90+MaD:87 |
-| Test.java:1876:10:1876:11 | in : Builder [<map.key>] : Object | Test.java:1876:10:1876:19 | build(...) : ImmutableSortedMap [<map.key>] : Object | provenance | MaD:84 |
+| Test.java:1875:97:1875:104 | source(...) : Object | Test.java:1875:64:1875:111 | put(...) : Builder [<map.key>] : Object | provenance | MaD:75+MaD:77 |
+| Test.java:1876:10:1876:11 | in : Builder [<map.key>] : Object | Test.java:1876:10:1876:19 | build(...) : ImmutableSortedMap [<map.key>] : Object | provenance | MaD:70 |
 | Test.java:1876:10:1876:19 | build(...) : ImmutableSortedMap [<map.key>] : Object | Test.java:1877:19:1877:21 | out : ImmutableSortedMap [<map.key>] : Object | provenance |  |
 | Test.java:1877:19:1877:21 | out : ImmutableSortedMap [<map.key>] : Object | Test.java:99:18:99:29 | map : ImmutableSortedMap [<map.key>] : Object | provenance |  |
-| Test.java:1877:19:1877:21 | out : ImmutableSortedMap [<map.key>] : Object | Test.java:1877:9:1877:22 | getMapKey(...) | provenance | MaD:562 |
+| Test.java:1877:19:1877:21 | out : ImmutableSortedMap [<map.key>] : Object | Test.java:1877:9:1877:22 | getMapKey(...) | provenance | MaD:569 |
 | Test.java:1882:30:1882:93 | (...)... : Builder [<map.key>] : Object | Test.java:1883:10:1883:11 | in : Builder [<map.key>] : Object | provenance |  |
 | Test.java:1882:52:1882:93 | put(...) : Builder [<map.key>] : Object | Test.java:1882:30:1882:93 | (...)... : Builder [<map.key>] : Object | provenance |  |
-| Test.java:1882:79:1882:86 | source(...) : Object | Test.java:1882:52:1882:93 | put(...) : Builder [<map.key>] : Object | provenance | MaD:90+MaD:87 |
-| Test.java:1883:10:1883:11 | in : Builder [<map.key>] : Object | Test.java:1883:10:1883:19 | build(...) : ImmutableMap [<map.key>] : Object | provenance | MaD:84 |
+| Test.java:1882:79:1882:86 | source(...) : Object | Test.java:1882:52:1882:93 | put(...) : Builder [<map.key>] : Object | provenance | MaD:75+MaD:77 |
+| Test.java:1883:10:1883:11 | in : Builder [<map.key>] : Object | Test.java:1883:10:1883:19 | build(...) : ImmutableMap [<map.key>] : Object | provenance | MaD:70 |
 | Test.java:1883:10:1883:19 | build(...) : ImmutableMap [<map.key>] : Object | Test.java:1884:19:1884:21 | out : ImmutableMap [<map.key>] : Object | provenance |  |
 | Test.java:1884:19:1884:21 | out : ImmutableMap [<map.key>] : Object | Test.java:99:18:99:29 | map : ImmutableMap [<map.key>] : Object | provenance |  |
-| Test.java:1884:19:1884:21 | out : ImmutableMap [<map.key>] : Object | Test.java:1884:9:1884:22 | getMapKey(...) | provenance | MaD:562 |
+| Test.java:1884:19:1884:21 | out : ImmutableMap [<map.key>] : Object | Test.java:1884:9:1884:22 | getMapKey(...) | provenance | MaD:569 |
 | Test.java:1889:32:1889:99 | (...)... : Builder [<map.key>] : Object | Test.java:1890:10:1890:11 | in : Builder [<map.key>] : Object | provenance |  |
 | Test.java:1889:56:1889:99 | put(...) : Builder [<map.key>] : Object | Test.java:1889:32:1889:99 | (...)... : Builder [<map.key>] : Object | provenance |  |
-| Test.java:1889:85:1889:92 | source(...) : Object | Test.java:1889:56:1889:99 | put(...) : Builder [<map.key>] : Object | provenance | MaD:90+MaD:87 |
-| Test.java:1890:10:1890:11 | in : Builder [<map.key>] : Object | Test.java:1890:10:1890:19 | build(...) : ImmutableBiMap [<map.key>] : Object | provenance | MaD:84 |
+| Test.java:1889:85:1889:92 | source(...) : Object | Test.java:1889:56:1889:99 | put(...) : Builder [<map.key>] : Object | provenance | MaD:75+MaD:77 |
+| Test.java:1890:10:1890:11 | in : Builder [<map.key>] : Object | Test.java:1890:10:1890:19 | build(...) : ImmutableBiMap [<map.key>] : Object | provenance | MaD:70 |
 | Test.java:1890:10:1890:19 | build(...) : ImmutableBiMap [<map.key>] : Object | Test.java:1891:19:1891:21 | out : ImmutableBiMap [<map.key>] : Object | provenance |  |
 | Test.java:1891:19:1891:21 | out : ImmutableBiMap [<map.key>] : Object | Test.java:99:18:99:29 | map : ImmutableBiMap [<map.key>] : Object | provenance |  |
-| Test.java:1891:19:1891:21 | out : ImmutableBiMap [<map.key>] : Object | Test.java:1891:9:1891:22 | getMapKey(...) | provenance | MaD:562 |
+| Test.java:1891:19:1891:21 | out : ImmutableBiMap [<map.key>] : Object | Test.java:1891:9:1891:22 | getMapKey(...) | provenance | MaD:569 |
 | Test.java:1896:36:1896:111 | (...)... : Builder [<map.value>] : Object | Test.java:1897:10:1897:11 | in : Builder [<map.value>] : Object | provenance |  |
 | Test.java:1896:64:1896:111 | put(...) : Builder [<map.value>] : Object | Test.java:1896:36:1896:111 | (...)... : Builder [<map.value>] : Object | provenance |  |
-| Test.java:1896:103:1896:110 | source(...) : Object | Test.java:1896:64:1896:111 | put(...) : Builder [<map.value>] : Object | provenance | MaD:91+MaD:87 |
-| Test.java:1897:10:1897:11 | in : Builder [<map.value>] : Object | Test.java:1897:10:1897:19 | build(...) : ImmutableSortedMap [<map.value>] : Object | provenance | MaD:85 |
+| Test.java:1896:103:1896:110 | source(...) : Object | Test.java:1896:64:1896:111 | put(...) : Builder [<map.value>] : Object | provenance | MaD:76+MaD:77 |
+| Test.java:1897:10:1897:11 | in : Builder [<map.value>] : Object | Test.java:1897:10:1897:19 | build(...) : ImmutableSortedMap [<map.value>] : Object | provenance | MaD:71 |
 | Test.java:1897:10:1897:19 | build(...) : ImmutableSortedMap [<map.value>] : Object | Test.java:1898:21:1898:23 | out : ImmutableSortedMap [<map.value>] : Object | provenance |  |
 | Test.java:1898:21:1898:23 | out : ImmutableSortedMap [<map.value>] : Object | Test.java:118:20:118:31 | map : ImmutableSortedMap [<map.value>] : Object | provenance |  |
-| Test.java:1898:21:1898:23 | out : ImmutableSortedMap [<map.value>] : Object | Test.java:1898:9:1898:24 | getMapValue(...) | provenance | MaD:561 |
+| Test.java:1898:21:1898:23 | out : ImmutableSortedMap [<map.value>] : Object | Test.java:1898:9:1898:24 | getMapValue(...) | provenance | MaD:568 |
 | Test.java:1903:30:1903:93 | (...)... : Builder [<map.value>] : Object | Test.java:1904:10:1904:11 | in : Builder [<map.value>] : Object | provenance |  |
 | Test.java:1903:52:1903:93 | put(...) : Builder [<map.value>] : Object | Test.java:1903:30:1903:93 | (...)... : Builder [<map.value>] : Object | provenance |  |
-| Test.java:1903:85:1903:92 | source(...) : Object | Test.java:1903:52:1903:93 | put(...) : Builder [<map.value>] : Object | provenance | MaD:91+MaD:87 |
-| Test.java:1904:10:1904:11 | in : Builder [<map.value>] : Object | Test.java:1904:10:1904:19 | build(...) : ImmutableMap [<map.value>] : Object | provenance | MaD:85 |
+| Test.java:1903:85:1903:92 | source(...) : Object | Test.java:1903:52:1903:93 | put(...) : Builder [<map.value>] : Object | provenance | MaD:76+MaD:77 |
+| Test.java:1904:10:1904:11 | in : Builder [<map.value>] : Object | Test.java:1904:10:1904:19 | build(...) : ImmutableMap [<map.value>] : Object | provenance | MaD:71 |
 | Test.java:1904:10:1904:19 | build(...) : ImmutableMap [<map.value>] : Object | Test.java:1905:21:1905:23 | out : ImmutableMap [<map.value>] : Object | provenance |  |
 | Test.java:1905:21:1905:23 | out : ImmutableMap [<map.value>] : Object | Test.java:118:20:118:31 | map : ImmutableMap [<map.value>] : Object | provenance |  |
-| Test.java:1905:21:1905:23 | out : ImmutableMap [<map.value>] : Object | Test.java:1905:9:1905:24 | getMapValue(...) | provenance | MaD:561 |
+| Test.java:1905:21:1905:23 | out : ImmutableMap [<map.value>] : Object | Test.java:1905:9:1905:24 | getMapValue(...) | provenance | MaD:568 |
 | Test.java:1910:32:1910:99 | (...)... : Builder [<map.value>] : Object | Test.java:1911:10:1911:11 | in : Builder [<map.value>] : Object | provenance |  |
 | Test.java:1910:56:1910:99 | put(...) : Builder [<map.value>] : Object | Test.java:1910:32:1910:99 | (...)... : Builder [<map.value>] : Object | provenance |  |
-| Test.java:1910:91:1910:98 | source(...) : Object | Test.java:1910:56:1910:99 | put(...) : Builder [<map.value>] : Object | provenance | MaD:91+MaD:87 |
-| Test.java:1911:10:1911:11 | in : Builder [<map.value>] : Object | Test.java:1911:10:1911:19 | build(...) : ImmutableBiMap [<map.value>] : Object | provenance | MaD:85 |
+| Test.java:1910:91:1910:98 | source(...) : Object | Test.java:1910:56:1910:99 | put(...) : Builder [<map.value>] : Object | provenance | MaD:76+MaD:77 |
+| Test.java:1911:10:1911:11 | in : Builder [<map.value>] : Object | Test.java:1911:10:1911:19 | build(...) : ImmutableBiMap [<map.value>] : Object | provenance | MaD:71 |
 | Test.java:1911:10:1911:19 | build(...) : ImmutableBiMap [<map.value>] : Object | Test.java:1912:21:1912:23 | out : ImmutableBiMap [<map.value>] : Object | provenance |  |
 | Test.java:1912:21:1912:23 | out : ImmutableBiMap [<map.value>] : Object | Test.java:118:20:118:31 | map : ImmutableBiMap [<map.value>] : Object | provenance |  |
-| Test.java:1912:21:1912:23 | out : ImmutableBiMap [<map.value>] : Object | Test.java:1912:9:1912:24 | getMapValue(...) | provenance | MaD:561 |
+| Test.java:1912:21:1912:23 | out : ImmutableBiMap [<map.value>] : Object | Test.java:1912:9:1912:24 | getMapValue(...) | provenance | MaD:568 |
 | Test.java:1917:36:1917:71 | (...)... : Builder | Test.java:1918:10:1918:11 | in : Builder | provenance |  |
 | Test.java:1917:64:1917:71 | source(...) : Object | Test.java:1917:36:1917:71 | (...)... : Builder | provenance |  |
-| Test.java:1918:10:1918:11 | in : Builder | Test.java:1918:10:1918:37 | orderEntriesByValue(...) : Builder | provenance | MaD:86 |
+| Test.java:1918:10:1918:11 | in : Builder | Test.java:1918:10:1918:37 | orderEntriesByValue(...) : Builder | provenance | MaD:72 |
 | Test.java:1918:10:1918:37 | orderEntriesByValue(...) : Builder | Test.java:1919:9:1919:11 | out | provenance |  |
 | Test.java:1924:30:1924:59 | (...)... : Builder | Test.java:1925:10:1925:11 | in : Builder | provenance |  |
 | Test.java:1924:52:1924:59 | source(...) : Object | Test.java:1924:30:1924:59 | (...)... : Builder | provenance |  |
-| Test.java:1925:10:1925:11 | in : Builder | Test.java:1925:10:1925:37 | orderEntriesByValue(...) : Builder | provenance | MaD:86 |
+| Test.java:1925:10:1925:11 | in : Builder | Test.java:1925:10:1925:37 | orderEntriesByValue(...) : Builder | provenance | MaD:72 |
 | Test.java:1925:10:1925:37 | orderEntriesByValue(...) : Builder | Test.java:1926:9:1926:11 | out | provenance |  |
 | Test.java:1931:32:1931:63 | (...)... : Builder | Test.java:1932:10:1932:11 | in : Builder | provenance |  |
 | Test.java:1931:56:1931:63 | source(...) : Object | Test.java:1931:32:1931:63 | (...)... : Builder | provenance |  |
-| Test.java:1932:10:1932:11 | in : Builder | Test.java:1932:10:1932:37 | orderEntriesByValue(...) : Builder | provenance | MaD:86 |
+| Test.java:1932:10:1932:11 | in : Builder | Test.java:1932:10:1932:37 | orderEntriesByValue(...) : Builder | provenance | MaD:72 |
 | Test.java:1932:10:1932:37 | orderEntriesByValue(...) : Builder | Test.java:1933:9:1933:11 | out | provenance |  |
 | Test.java:1938:19:1938:57 | (...)... : Entry [<map.key>] : Object | Test.java:1939:12:1939:13 | in : Entry [<map.key>] : Object | provenance |  |
 | Test.java:1938:30:1938:57 | newEntryWithMapKey(...) : Entry [<map.key>] : Object | Test.java:1938:19:1938:57 | (...)... : Entry [<map.key>] : Object | provenance |  |
 | Test.java:1938:49:1938:56 | source(...) : Object | Test.java:101:40:101:44 | key : Object | provenance |  |
-| Test.java:1938:49:1938:56 | source(...) : Object | Test.java:1938:30:1938:57 | newEntryWithMapKey(...) : Entry [<map.key>] : Object | provenance | MaD:563 |
+| Test.java:1938:49:1938:56 | source(...) : Object | Test.java:1938:30:1938:57 | newEntryWithMapKey(...) : Entry [<map.key>] : Object | provenance | MaD:564 |
 | Test.java:1939:4:1939:6 | out [post update] : Builder [<map.key>] : Object | Test.java:1940:19:1940:21 | out : Builder [<map.key>] : Object | provenance |  |
-| Test.java:1939:12:1939:13 | in : Entry [<map.key>] : Object | Test.java:1939:4:1939:6 | out [post update] : Builder [<map.key>] : Object | provenance | MaD:88 |
+| Test.java:1939:12:1939:13 | in : Entry [<map.key>] : Object | Test.java:1939:4:1939:6 | out [post update] : Builder [<map.key>] : Object | provenance | MaD:73 |
 | Test.java:1940:19:1940:21 | out : Builder [<map.key>] : Object | Test.java:97:18:97:44 | b : Builder [<map.key>] : Object | provenance |  |
-| Test.java:1940:19:1940:21 | out : Builder [<map.key>] : Object | Test.java:1940:9:1940:22 | getMapKey(...) | provenance | MaD:84 |
+| Test.java:1940:19:1940:21 | out : Builder [<map.key>] : Object | Test.java:1940:9:1940:22 | getMapKey(...) | provenance | MaD:70 |
 | Test.java:1945:19:1945:57 | (...)... : Entry [<map.key>] : Object | Test.java:1946:12:1946:13 | in : Entry [<map.key>] : Object | provenance |  |
 | Test.java:1945:30:1945:57 | newEntryWithMapKey(...) : Entry [<map.key>] : Object | Test.java:1945:19:1945:57 | (...)... : Entry [<map.key>] : Object | provenance |  |
 | Test.java:1945:49:1945:56 | source(...) : Object | Test.java:101:40:101:44 | key : Object | provenance |  |
-| Test.java:1945:49:1945:56 | source(...) : Object | Test.java:1945:30:1945:57 | newEntryWithMapKey(...) : Entry [<map.key>] : Object | provenance | MaD:563 |
+| Test.java:1945:49:1945:56 | source(...) : Object | Test.java:1945:30:1945:57 | newEntryWithMapKey(...) : Entry [<map.key>] : Object | provenance | MaD:564 |
 | Test.java:1946:4:1946:6 | out [post update] : Builder [<map.key>] : Object | Test.java:1947:19:1947:21 | out : Builder [<map.key>] : Object | provenance |  |
-| Test.java:1946:12:1946:13 | in : Entry [<map.key>] : Object | Test.java:1946:4:1946:6 | out [post update] : Builder [<map.key>] : Object | provenance | MaD:88 |
+| Test.java:1946:12:1946:13 | in : Entry [<map.key>] : Object | Test.java:1946:4:1946:6 | out [post update] : Builder [<map.key>] : Object | provenance | MaD:73 |
 | Test.java:1947:19:1947:21 | out : Builder [<map.key>] : Object | Test.java:97:18:97:44 | b : Builder [<map.key>] : Object | provenance |  |
-| Test.java:1947:19:1947:21 | out : Builder [<map.key>] : Object | Test.java:1947:9:1947:22 | getMapKey(...) | provenance | MaD:84 |
+| Test.java:1947:19:1947:21 | out : Builder [<map.key>] : Object | Test.java:1947:9:1947:22 | getMapKey(...) | provenance | MaD:70 |
 | Test.java:1952:19:1952:57 | (...)... : Entry [<map.key>] : Object | Test.java:1953:12:1953:13 | in : Entry [<map.key>] : Object | provenance |  |
 | Test.java:1952:30:1952:57 | newEntryWithMapKey(...) : Entry [<map.key>] : Object | Test.java:1952:19:1952:57 | (...)... : Entry [<map.key>] : Object | provenance |  |
 | Test.java:1952:49:1952:56 | source(...) : Object | Test.java:101:40:101:44 | key : Object | provenance |  |
-| Test.java:1952:49:1952:56 | source(...) : Object | Test.java:1952:30:1952:57 | newEntryWithMapKey(...) : Entry [<map.key>] : Object | provenance | MaD:563 |
+| Test.java:1952:49:1952:56 | source(...) : Object | Test.java:1952:30:1952:57 | newEntryWithMapKey(...) : Entry [<map.key>] : Object | provenance | MaD:564 |
 | Test.java:1953:4:1953:6 | out [post update] : Builder [<map.key>] : Object | Test.java:1954:19:1954:21 | out : Builder [<map.key>] : Object | provenance |  |
-| Test.java:1953:12:1953:13 | in : Entry [<map.key>] : Object | Test.java:1953:4:1953:6 | out [post update] : Builder [<map.key>] : Object | provenance | MaD:88 |
+| Test.java:1953:12:1953:13 | in : Entry [<map.key>] : Object | Test.java:1953:4:1953:6 | out [post update] : Builder [<map.key>] : Object | provenance | MaD:73 |
 | Test.java:1954:19:1954:21 | out : Builder [<map.key>] : Object | Test.java:97:18:97:44 | b : Builder [<map.key>] : Object | provenance |  |
-| Test.java:1954:19:1954:21 | out : Builder [<map.key>] : Object | Test.java:1954:9:1954:22 | getMapKey(...) | provenance | MaD:84 |
+| Test.java:1954:19:1954:21 | out : Builder [<map.key>] : Object | Test.java:1954:9:1954:22 | getMapKey(...) | provenance | MaD:70 |
 | Test.java:1959:19:1959:59 | (...)... : Entry [<map.value>] : Object | Test.java:1960:12:1960:13 | in : Entry [<map.value>] : Object | provenance |  |
 | Test.java:1959:30:1959:59 | newEntryWithMapValue(...) : Entry [<map.value>] : Object | Test.java:1959:19:1959:59 | (...)... : Entry [<map.value>] : Object | provenance |  |
 | Test.java:1959:51:1959:58 | source(...) : Object | Test.java:113:42:113:48 | value : Object | provenance |  |
-| Test.java:1959:51:1959:58 | source(...) : Object | Test.java:1959:30:1959:59 | newEntryWithMapValue(...) : Entry [<map.value>] : Object | provenance | MaD:564 |
+| Test.java:1959:51:1959:58 | source(...) : Object | Test.java:1959:30:1959:59 | newEntryWithMapValue(...) : Entry [<map.value>] : Object | provenance | MaD:565 |
 | Test.java:1960:4:1960:6 | out [post update] : Builder [<map.value>] : Object | Test.java:1961:21:1961:23 | out : Builder [<map.value>] : Object | provenance |  |
-| Test.java:1960:12:1960:13 | in : Entry [<map.value>] : Object | Test.java:1960:4:1960:6 | out [post update] : Builder [<map.value>] : Object | provenance | MaD:89 |
+| Test.java:1960:12:1960:13 | in : Entry [<map.value>] : Object | Test.java:1960:4:1960:6 | out [post update] : Builder [<map.value>] : Object | provenance | MaD:74 |
 | Test.java:1961:21:1961:23 | out : Builder [<map.value>] : Object | Test.java:115:20:115:46 | b : Builder [<map.value>] : Object | provenance |  |
-| Test.java:1961:21:1961:23 | out : Builder [<map.value>] : Object | Test.java:1961:9:1961:24 | getMapValue(...) | provenance | MaD:85 |
+| Test.java:1961:21:1961:23 | out : Builder [<map.value>] : Object | Test.java:1961:9:1961:24 | getMapValue(...) | provenance | MaD:71 |
 | Test.java:1966:19:1966:59 | (...)... : Entry [<map.value>] : Object | Test.java:1967:12:1967:13 | in : Entry [<map.value>] : Object | provenance |  |
 | Test.java:1966:30:1966:59 | newEntryWithMapValue(...) : Entry [<map.value>] : Object | Test.java:1966:19:1966:59 | (...)... : Entry [<map.value>] : Object | provenance |  |
 | Test.java:1966:51:1966:58 | source(...) : Object | Test.java:113:42:113:48 | value : Object | provenance |  |
-| Test.java:1966:51:1966:58 | source(...) : Object | Test.java:1966:30:1966:59 | newEntryWithMapValue(...) : Entry [<map.value>] : Object | provenance | MaD:564 |
+| Test.java:1966:51:1966:58 | source(...) : Object | Test.java:1966:30:1966:59 | newEntryWithMapValue(...) : Entry [<map.value>] : Object | provenance | MaD:565 |
 | Test.java:1967:4:1967:6 | out [post update] : Builder [<map.value>] : Object | Test.java:1968:21:1968:23 | out : Builder [<map.value>] : Object | provenance |  |
-| Test.java:1967:12:1967:13 | in : Entry [<map.value>] : Object | Test.java:1967:4:1967:6 | out [post update] : Builder [<map.value>] : Object | provenance | MaD:89 |
+| Test.java:1967:12:1967:13 | in : Entry [<map.value>] : Object | Test.java:1967:4:1967:6 | out [post update] : Builder [<map.value>] : Object | provenance | MaD:74 |
 | Test.java:1968:21:1968:23 | out : Builder [<map.value>] : Object | Test.java:115:20:115:46 | b : Builder [<map.value>] : Object | provenance |  |
-| Test.java:1968:21:1968:23 | out : Builder [<map.value>] : Object | Test.java:1968:9:1968:24 | getMapValue(...) | provenance | MaD:85 |
+| Test.java:1968:21:1968:23 | out : Builder [<map.value>] : Object | Test.java:1968:9:1968:24 | getMapValue(...) | provenance | MaD:71 |
 | Test.java:1973:19:1973:59 | (...)... : Entry [<map.value>] : Object | Test.java:1974:12:1974:13 | in : Entry [<map.value>] : Object | provenance |  |
 | Test.java:1973:30:1973:59 | newEntryWithMapValue(...) : Entry [<map.value>] : Object | Test.java:1973:19:1973:59 | (...)... : Entry [<map.value>] : Object | provenance |  |
 | Test.java:1973:51:1973:58 | source(...) : Object | Test.java:113:42:113:48 | value : Object | provenance |  |
-| Test.java:1973:51:1973:58 | source(...) : Object | Test.java:1973:30:1973:59 | newEntryWithMapValue(...) : Entry [<map.value>] : Object | provenance | MaD:564 |
+| Test.java:1973:51:1973:58 | source(...) : Object | Test.java:1973:30:1973:59 | newEntryWithMapValue(...) : Entry [<map.value>] : Object | provenance | MaD:565 |
 | Test.java:1974:4:1974:6 | out [post update] : Builder [<map.value>] : Object | Test.java:1975:21:1975:23 | out : Builder [<map.value>] : Object | provenance |  |
-| Test.java:1974:12:1974:13 | in : Entry [<map.value>] : Object | Test.java:1974:4:1974:6 | out [post update] : Builder [<map.value>] : Object | provenance | MaD:89 |
+| Test.java:1974:12:1974:13 | in : Entry [<map.value>] : Object | Test.java:1974:4:1974:6 | out [post update] : Builder [<map.value>] : Object | provenance | MaD:74 |
 | Test.java:1975:21:1975:23 | out : Builder [<map.value>] : Object | Test.java:115:20:115:46 | b : Builder [<map.value>] : Object | provenance |  |
-| Test.java:1975:21:1975:23 | out : Builder [<map.value>] : Object | Test.java:1975:9:1975:24 | getMapValue(...) | provenance | MaD:85 |
+| Test.java:1975:21:1975:23 | out : Builder [<map.value>] : Object | Test.java:1975:9:1975:24 | getMapValue(...) | provenance | MaD:71 |
 | Test.java:1980:16:1980:31 | (...)... : Object | Test.java:1981:12:1981:13 | in : Object | provenance |  |
 | Test.java:1980:24:1980:31 | source(...) : Object | Test.java:1980:16:1980:31 | (...)... : Object | provenance |  |
 | Test.java:1981:4:1981:6 | out [post update] : Builder [<map.key>] : Object | Test.java:1982:19:1982:21 | out : Builder [<map.key>] : Object | provenance |  |
-| Test.java:1981:12:1981:13 | in : Object | Test.java:1981:4:1981:6 | out [post update] : Builder [<map.key>] : Object | provenance | MaD:90 |
+| Test.java:1981:12:1981:13 | in : Object | Test.java:1981:4:1981:6 | out [post update] : Builder [<map.key>] : Object | provenance | MaD:75 |
 | Test.java:1982:19:1982:21 | out : Builder [<map.key>] : Object | Test.java:97:18:97:44 | b : Builder [<map.key>] : Object | provenance |  |
-| Test.java:1982:19:1982:21 | out : Builder [<map.key>] : Object | Test.java:1982:9:1982:22 | getMapKey(...) | provenance | MaD:84 |
+| Test.java:1982:19:1982:21 | out : Builder [<map.key>] : Object | Test.java:1982:9:1982:22 | getMapKey(...) | provenance | MaD:70 |
 | Test.java:1987:16:1987:31 | (...)... : Object | Test.java:1988:12:1988:13 | in : Object | provenance |  |
 | Test.java:1987:24:1987:31 | source(...) : Object | Test.java:1987:16:1987:31 | (...)... : Object | provenance |  |
 | Test.java:1988:4:1988:6 | out [post update] : Builder [<map.key>] : Object | Test.java:1989:19:1989:21 | out : Builder [<map.key>] : Object | provenance |  |
-| Test.java:1988:12:1988:13 | in : Object | Test.java:1988:4:1988:6 | out [post update] : Builder [<map.key>] : Object | provenance | MaD:90 |
+| Test.java:1988:12:1988:13 | in : Object | Test.java:1988:4:1988:6 | out [post update] : Builder [<map.key>] : Object | provenance | MaD:75 |
 | Test.java:1989:19:1989:21 | out : Builder [<map.key>] : Object | Test.java:97:18:97:44 | b : Builder [<map.key>] : Object | provenance |  |
-| Test.java:1989:19:1989:21 | out : Builder [<map.key>] : Object | Test.java:1989:9:1989:22 | getMapKey(...) | provenance | MaD:84 |
+| Test.java:1989:19:1989:21 | out : Builder [<map.key>] : Object | Test.java:1989:9:1989:22 | getMapKey(...) | provenance | MaD:70 |
 | Test.java:1994:16:1994:31 | (...)... : Object | Test.java:1995:12:1995:13 | in : Object | provenance |  |
 | Test.java:1994:24:1994:31 | source(...) : Object | Test.java:1994:16:1994:31 | (...)... : Object | provenance |  |
 | Test.java:1995:4:1995:6 | out [post update] : Builder [<map.key>] : Object | Test.java:1996:19:1996:21 | out : Builder [<map.key>] : Object | provenance |  |
-| Test.java:1995:12:1995:13 | in : Object | Test.java:1995:4:1995:6 | out [post update] : Builder [<map.key>] : Object | provenance | MaD:90 |
+| Test.java:1995:12:1995:13 | in : Object | Test.java:1995:4:1995:6 | out [post update] : Builder [<map.key>] : Object | provenance | MaD:75 |
 | Test.java:1996:19:1996:21 | out : Builder [<map.key>] : Object | Test.java:97:18:97:44 | b : Builder [<map.key>] : Object | provenance |  |
-| Test.java:1996:19:1996:21 | out : Builder [<map.key>] : Object | Test.java:1996:9:1996:22 | getMapKey(...) | provenance | MaD:84 |
+| Test.java:1996:19:1996:21 | out : Builder [<map.key>] : Object | Test.java:1996:9:1996:22 | getMapKey(...) | provenance | MaD:70 |
 | Test.java:2001:16:2001:31 | (...)... : Object | Test.java:2002:18:2002:19 | in : Object | provenance |  |
 | Test.java:2001:24:2001:31 | source(...) : Object | Test.java:2001:16:2001:31 | (...)... : Object | provenance |  |
 | Test.java:2002:4:2002:6 | out [post update] : Builder [<map.value>] : Object | Test.java:2003:21:2003:23 | out : Builder [<map.value>] : Object | provenance |  |
-| Test.java:2002:18:2002:19 | in : Object | Test.java:2002:4:2002:6 | out [post update] : Builder [<map.value>] : Object | provenance | MaD:91 |
+| Test.java:2002:18:2002:19 | in : Object | Test.java:2002:4:2002:6 | out [post update] : Builder [<map.value>] : Object | provenance | MaD:76 |
 | Test.java:2003:21:2003:23 | out : Builder [<map.value>] : Object | Test.java:115:20:115:46 | b : Builder [<map.value>] : Object | provenance |  |
-| Test.java:2003:21:2003:23 | out : Builder [<map.value>] : Object | Test.java:2003:9:2003:24 | getMapValue(...) | provenance | MaD:85 |
+| Test.java:2003:21:2003:23 | out : Builder [<map.value>] : Object | Test.java:2003:9:2003:24 | getMapValue(...) | provenance | MaD:71 |
 | Test.java:2008:16:2008:31 | (...)... : Object | Test.java:2009:18:2009:19 | in : Object | provenance |  |
 | Test.java:2008:24:2008:31 | source(...) : Object | Test.java:2008:16:2008:31 | (...)... : Object | provenance |  |
 | Test.java:2009:4:2009:6 | out [post update] : Builder [<map.value>] : Object | Test.java:2010:21:2010:23 | out : Builder [<map.value>] : Object | provenance |  |
-| Test.java:2009:18:2009:19 | in : Object | Test.java:2009:4:2009:6 | out [post update] : Builder [<map.value>] : Object | provenance | MaD:91 |
+| Test.java:2009:18:2009:19 | in : Object | Test.java:2009:4:2009:6 | out [post update] : Builder [<map.value>] : Object | provenance | MaD:76 |
 | Test.java:2010:21:2010:23 | out : Builder [<map.value>] : Object | Test.java:115:20:115:46 | b : Builder [<map.value>] : Object | provenance |  |
-| Test.java:2010:21:2010:23 | out : Builder [<map.value>] : Object | Test.java:2010:9:2010:24 | getMapValue(...) | provenance | MaD:85 |
+| Test.java:2010:21:2010:23 | out : Builder [<map.value>] : Object | Test.java:2010:9:2010:24 | getMapValue(...) | provenance | MaD:71 |
 | Test.java:2015:16:2015:31 | (...)... : Object | Test.java:2016:18:2016:19 | in : Object | provenance |  |
 | Test.java:2015:24:2015:31 | source(...) : Object | Test.java:2015:16:2015:31 | (...)... : Object | provenance |  |
 | Test.java:2016:4:2016:6 | out [post update] : Builder [<map.value>] : Object | Test.java:2017:21:2017:23 | out : Builder [<map.value>] : Object | provenance |  |
-| Test.java:2016:18:2016:19 | in : Object | Test.java:2016:4:2016:6 | out [post update] : Builder [<map.value>] : Object | provenance | MaD:91 |
+| Test.java:2016:18:2016:19 | in : Object | Test.java:2016:4:2016:6 | out [post update] : Builder [<map.value>] : Object | provenance | MaD:76 |
 | Test.java:2017:21:2017:23 | out : Builder [<map.value>] : Object | Test.java:115:20:115:46 | b : Builder [<map.value>] : Object | provenance |  |
-| Test.java:2017:21:2017:23 | out : Builder [<map.value>] : Object | Test.java:2017:9:2017:24 | getMapValue(...) | provenance | MaD:85 |
+| Test.java:2017:21:2017:23 | out : Builder [<map.value>] : Object | Test.java:2017:9:2017:24 | getMapValue(...) | provenance | MaD:71 |
 | Test.java:2022:36:2022:71 | (...)... : Builder | Test.java:2023:10:2023:11 | in : Builder | provenance |  |
 | Test.java:2022:64:2022:71 | source(...) : Object | Test.java:2022:36:2022:71 | (...)... : Builder | provenance |  |
-| Test.java:2023:10:2023:11 | in : Builder | Test.java:2023:10:2023:27 | put(...) : Builder | provenance | MaD:87 |
+| Test.java:2023:10:2023:11 | in : Builder | Test.java:2023:10:2023:27 | put(...) : Builder | provenance | MaD:77 |
 | Test.java:2023:10:2023:27 | put(...) : Builder | Test.java:2024:9:2024:11 | out | provenance |  |
 | Test.java:2029:36:2029:71 | (...)... : Builder | Test.java:2030:10:2030:11 | in : Builder | provenance |  |
 | Test.java:2029:64:2029:71 | source(...) : Object | Test.java:2029:36:2029:71 | (...)... : Builder | provenance |  |
-| Test.java:2030:10:2030:11 | in : Builder | Test.java:2030:10:2030:21 | put(...) : Builder | provenance | MaD:87 |
+| Test.java:2030:10:2030:11 | in : Builder | Test.java:2030:10:2030:21 | put(...) : Builder | provenance | MaD:77 |
 | Test.java:2030:10:2030:21 | put(...) : Builder | Test.java:2031:9:2031:11 | out | provenance |  |
 | Test.java:2036:30:2036:59 | (...)... : Builder | Test.java:2037:10:2037:11 | in : Builder | provenance |  |
 | Test.java:2036:52:2036:59 | source(...) : Object | Test.java:2036:30:2036:59 | (...)... : Builder | provenance |  |
-| Test.java:2037:10:2037:11 | in : Builder | Test.java:2037:10:2037:27 | put(...) : Builder | provenance | MaD:87 |
+| Test.java:2037:10:2037:11 | in : Builder | Test.java:2037:10:2037:27 | put(...) : Builder | provenance | MaD:77 |
 | Test.java:2037:10:2037:27 | put(...) : Builder | Test.java:2038:9:2038:11 | out | provenance |  |
 | Test.java:2043:30:2043:59 | (...)... : Builder | Test.java:2044:10:2044:11 | in : Builder | provenance |  |
 | Test.java:2043:52:2043:59 | source(...) : Object | Test.java:2043:30:2043:59 | (...)... : Builder | provenance |  |
-| Test.java:2044:10:2044:11 | in : Builder | Test.java:2044:10:2044:21 | put(...) : Builder | provenance | MaD:87 |
+| Test.java:2044:10:2044:11 | in : Builder | Test.java:2044:10:2044:21 | put(...) : Builder | provenance | MaD:77 |
 | Test.java:2044:10:2044:21 | put(...) : Builder | Test.java:2045:9:2045:11 | out | provenance |  |
 | Test.java:2050:32:2050:63 | (...)... : Builder | Test.java:2051:10:2051:11 | in : Builder | provenance |  |
 | Test.java:2050:56:2050:63 | source(...) : Object | Test.java:2050:32:2050:63 | (...)... : Builder | provenance |  |
-| Test.java:2051:10:2051:11 | in : Builder | Test.java:2051:10:2051:27 | put(...) : Builder | provenance | MaD:87 |
+| Test.java:2051:10:2051:11 | in : Builder | Test.java:2051:10:2051:27 | put(...) : Builder | provenance | MaD:77 |
 | Test.java:2051:10:2051:27 | put(...) : Builder | Test.java:2052:9:2052:11 | out | provenance |  |
 | Test.java:2057:32:2057:63 | (...)... : Builder | Test.java:2058:10:2058:11 | in : Builder | provenance |  |
 | Test.java:2057:56:2057:63 | source(...) : Object | Test.java:2057:32:2057:63 | (...)... : Builder | provenance |  |
-| Test.java:2058:10:2058:11 | in : Builder | Test.java:2058:10:2058:21 | put(...) : Builder | provenance | MaD:87 |
+| Test.java:2058:10:2058:11 | in : Builder | Test.java:2058:10:2058:21 | put(...) : Builder | provenance | MaD:77 |
 | Test.java:2058:10:2058:21 | put(...) : Builder | Test.java:2059:9:2059:11 | out | provenance |  |
 | Test.java:2064:18:2064:64 | (...)... : List [<element>, <map.key>] : Object | Test.java:2065:15:2065:16 | in : List [<element>, <map.key>] : Object | provenance |  |
 | Test.java:2064:28:2064:64 | of(...) : List [<element>, <map.key>] : Object | Test.java:2064:18:2064:64 | (...)... : List [<element>, <map.key>] : Object | provenance |  |
-| Test.java:2064:36:2064:63 | newEntryWithMapKey(...) : Entry [<map.key>] : Object | Test.java:2064:28:2064:64 | of(...) : List [<element>, <map.key>] : Object | provenance | MaD:558 |
+| Test.java:2064:36:2064:63 | newEntryWithMapKey(...) : Entry [<map.key>] : Object | Test.java:2064:28:2064:64 | of(...) : List [<element>, <map.key>] : Object | provenance | MaD:561 |
 | Test.java:2064:55:2064:62 | source(...) : Object | Test.java:101:40:101:44 | key : Object | provenance |  |
-| Test.java:2064:55:2064:62 | source(...) : Object | Test.java:2064:36:2064:63 | newEntryWithMapKey(...) : Entry [<map.key>] : Object | provenance | MaD:563 |
+| Test.java:2064:55:2064:62 | source(...) : Object | Test.java:2064:36:2064:63 | newEntryWithMapKey(...) : Entry [<map.key>] : Object | provenance | MaD:564 |
 | Test.java:2065:4:2065:6 | out [post update] : Builder [<map.key>] : Object | Test.java:2066:19:2066:21 | out : Builder [<map.key>] : Object | provenance |  |
-| Test.java:2065:15:2065:16 | in : List [<element>, <map.key>] : Object | Test.java:2065:4:2065:6 | out [post update] : Builder [<map.key>] : Object | provenance | MaD:93 |
+| Test.java:2065:15:2065:16 | in : List [<element>, <map.key>] : Object | Test.java:2065:4:2065:6 | out [post update] : Builder [<map.key>] : Object | provenance | MaD:78 |
 | Test.java:2066:19:2066:21 | out : Builder [<map.key>] : Object | Test.java:97:18:97:44 | b : Builder [<map.key>] : Object | provenance |  |
-| Test.java:2066:19:2066:21 | out : Builder [<map.key>] : Object | Test.java:2066:9:2066:22 | getMapKey(...) | provenance | MaD:84 |
+| Test.java:2066:19:2066:21 | out : Builder [<map.key>] : Object | Test.java:2066:9:2066:22 | getMapKey(...) | provenance | MaD:70 |
 | Test.java:2071:18:2071:64 | (...)... : List [<element>, <map.key>] : Object | Test.java:2072:15:2072:16 | in : List [<element>, <map.key>] : Object | provenance |  |
 | Test.java:2071:28:2071:64 | of(...) : List [<element>, <map.key>] : Object | Test.java:2071:18:2071:64 | (...)... : List [<element>, <map.key>] : Object | provenance |  |
-| Test.java:2071:36:2071:63 | newEntryWithMapKey(...) : Entry [<map.key>] : Object | Test.java:2071:28:2071:64 | of(...) : List [<element>, <map.key>] : Object | provenance | MaD:558 |
+| Test.java:2071:36:2071:63 | newEntryWithMapKey(...) : Entry [<map.key>] : Object | Test.java:2071:28:2071:64 | of(...) : List [<element>, <map.key>] : Object | provenance | MaD:561 |
 | Test.java:2071:55:2071:62 | source(...) : Object | Test.java:101:40:101:44 | key : Object | provenance |  |
-| Test.java:2071:55:2071:62 | source(...) : Object | Test.java:2071:36:2071:63 | newEntryWithMapKey(...) : Entry [<map.key>] : Object | provenance | MaD:563 |
+| Test.java:2071:55:2071:62 | source(...) : Object | Test.java:2071:36:2071:63 | newEntryWithMapKey(...) : Entry [<map.key>] : Object | provenance | MaD:564 |
 | Test.java:2072:4:2072:6 | out [post update] : Builder [<map.key>] : Object | Test.java:2073:19:2073:21 | out : Builder [<map.key>] : Object | provenance |  |
-| Test.java:2072:15:2072:16 | in : List [<element>, <map.key>] : Object | Test.java:2072:4:2072:6 | out [post update] : Builder [<map.key>] : Object | provenance | MaD:93 |
+| Test.java:2072:15:2072:16 | in : List [<element>, <map.key>] : Object | Test.java:2072:4:2072:6 | out [post update] : Builder [<map.key>] : Object | provenance | MaD:78 |
 | Test.java:2073:19:2073:21 | out : Builder [<map.key>] : Object | Test.java:97:18:97:44 | b : Builder [<map.key>] : Object | provenance |  |
-| Test.java:2073:19:2073:21 | out : Builder [<map.key>] : Object | Test.java:2073:9:2073:22 | getMapKey(...) | provenance | MaD:84 |
+| Test.java:2073:19:2073:21 | out : Builder [<map.key>] : Object | Test.java:2073:9:2073:22 | getMapKey(...) | provenance | MaD:70 |
 | Test.java:2078:18:2078:64 | (...)... : List [<element>, <map.key>] : Object | Test.java:2079:15:2079:16 | in : List [<element>, <map.key>] : Object | provenance |  |
 | Test.java:2078:28:2078:64 | of(...) : List [<element>, <map.key>] : Object | Test.java:2078:18:2078:64 | (...)... : List [<element>, <map.key>] : Object | provenance |  |
-| Test.java:2078:36:2078:63 | newEntryWithMapKey(...) : Entry [<map.key>] : Object | Test.java:2078:28:2078:64 | of(...) : List [<element>, <map.key>] : Object | provenance | MaD:558 |
+| Test.java:2078:36:2078:63 | newEntryWithMapKey(...) : Entry [<map.key>] : Object | Test.java:2078:28:2078:64 | of(...) : List [<element>, <map.key>] : Object | provenance | MaD:561 |
 | Test.java:2078:55:2078:62 | source(...) : Object | Test.java:101:40:101:44 | key : Object | provenance |  |
-| Test.java:2078:55:2078:62 | source(...) : Object | Test.java:2078:36:2078:63 | newEntryWithMapKey(...) : Entry [<map.key>] : Object | provenance | MaD:563 |
+| Test.java:2078:55:2078:62 | source(...) : Object | Test.java:2078:36:2078:63 | newEntryWithMapKey(...) : Entry [<map.key>] : Object | provenance | MaD:564 |
 | Test.java:2079:4:2079:6 | out [post update] : Builder [<map.key>] : Object | Test.java:2080:19:2080:21 | out : Builder [<map.key>] : Object | provenance |  |
-| Test.java:2079:15:2079:16 | in : List [<element>, <map.key>] : Object | Test.java:2079:4:2079:6 | out [post update] : Builder [<map.key>] : Object | provenance | MaD:93 |
+| Test.java:2079:15:2079:16 | in : List [<element>, <map.key>] : Object | Test.java:2079:4:2079:6 | out [post update] : Builder [<map.key>] : Object | provenance | MaD:78 |
 | Test.java:2080:19:2080:21 | out : Builder [<map.key>] : Object | Test.java:97:18:97:44 | b : Builder [<map.key>] : Object | provenance |  |
-| Test.java:2080:19:2080:21 | out : Builder [<map.key>] : Object | Test.java:2080:9:2080:22 | getMapKey(...) | provenance | MaD:84 |
+| Test.java:2080:19:2080:21 | out : Builder [<map.key>] : Object | Test.java:2080:9:2080:22 | getMapKey(...) | provenance | MaD:70 |
 | Test.java:2085:18:2085:66 | (...)... : List [<element>, <map.value>] : Object | Test.java:2086:15:2086:16 | in : List [<element>, <map.value>] : Object | provenance |  |
 | Test.java:2085:28:2085:66 | of(...) : List [<element>, <map.value>] : Object | Test.java:2085:18:2085:66 | (...)... : List [<element>, <map.value>] : Object | provenance |  |
-| Test.java:2085:36:2085:65 | newEntryWithMapValue(...) : Entry [<map.value>] : Object | Test.java:2085:28:2085:66 | of(...) : List [<element>, <map.value>] : Object | provenance | MaD:558 |
+| Test.java:2085:36:2085:65 | newEntryWithMapValue(...) : Entry [<map.value>] : Object | Test.java:2085:28:2085:66 | of(...) : List [<element>, <map.value>] : Object | provenance | MaD:561 |
 | Test.java:2085:57:2085:64 | source(...) : Object | Test.java:113:42:113:48 | value : Object | provenance |  |
-| Test.java:2085:57:2085:64 | source(...) : Object | Test.java:2085:36:2085:65 | newEntryWithMapValue(...) : Entry [<map.value>] : Object | provenance | MaD:564 |
+| Test.java:2085:57:2085:64 | source(...) : Object | Test.java:2085:36:2085:65 | newEntryWithMapValue(...) : Entry [<map.value>] : Object | provenance | MaD:565 |
 | Test.java:2086:4:2086:6 | out [post update] : Builder [<map.value>] : Object | Test.java:2087:21:2087:23 | out : Builder [<map.value>] : Object | provenance |  |
-| Test.java:2086:15:2086:16 | in : List [<element>, <map.value>] : Object | Test.java:2086:4:2086:6 | out [post update] : Builder [<map.value>] : Object | provenance | MaD:94 |
+| Test.java:2086:15:2086:16 | in : List [<element>, <map.value>] : Object | Test.java:2086:4:2086:6 | out [post update] : Builder [<map.value>] : Object | provenance | MaD:79 |
 | Test.java:2087:21:2087:23 | out : Builder [<map.value>] : Object | Test.java:115:20:115:46 | b : Builder [<map.value>] : Object | provenance |  |
-| Test.java:2087:21:2087:23 | out : Builder [<map.value>] : Object | Test.java:2087:9:2087:24 | getMapValue(...) | provenance | MaD:85 |
+| Test.java:2087:21:2087:23 | out : Builder [<map.value>] : Object | Test.java:2087:9:2087:24 | getMapValue(...) | provenance | MaD:71 |
 | Test.java:2092:18:2092:66 | (...)... : List [<element>, <map.value>] : Object | Test.java:2093:15:2093:16 | in : List [<element>, <map.value>] : Object | provenance |  |
 | Test.java:2092:28:2092:66 | of(...) : List [<element>, <map.value>] : Object | Test.java:2092:18:2092:66 | (...)... : List [<element>, <map.value>] : Object | provenance |  |
-| Test.java:2092:36:2092:65 | newEntryWithMapValue(...) : Entry [<map.value>] : Object | Test.java:2092:28:2092:66 | of(...) : List [<element>, <map.value>] : Object | provenance | MaD:558 |
+| Test.java:2092:36:2092:65 | newEntryWithMapValue(...) : Entry [<map.value>] : Object | Test.java:2092:28:2092:66 | of(...) : List [<element>, <map.value>] : Object | provenance | MaD:561 |
 | Test.java:2092:57:2092:64 | source(...) : Object | Test.java:113:42:113:48 | value : Object | provenance |  |
-| Test.java:2092:57:2092:64 | source(...) : Object | Test.java:2092:36:2092:65 | newEntryWithMapValue(...) : Entry [<map.value>] : Object | provenance | MaD:564 |
+| Test.java:2092:57:2092:64 | source(...) : Object | Test.java:2092:36:2092:65 | newEntryWithMapValue(...) : Entry [<map.value>] : Object | provenance | MaD:565 |
 | Test.java:2093:4:2093:6 | out [post update] : Builder [<map.value>] : Object | Test.java:2094:21:2094:23 | out : Builder [<map.value>] : Object | provenance |  |
-| Test.java:2093:15:2093:16 | in : List [<element>, <map.value>] : Object | Test.java:2093:4:2093:6 | out [post update] : Builder [<map.value>] : Object | provenance | MaD:94 |
+| Test.java:2093:15:2093:16 | in : List [<element>, <map.value>] : Object | Test.java:2093:4:2093:6 | out [post update] : Builder [<map.value>] : Object | provenance | MaD:79 |
 | Test.java:2094:21:2094:23 | out : Builder [<map.value>] : Object | Test.java:115:20:115:46 | b : Builder [<map.value>] : Object | provenance |  |
-| Test.java:2094:21:2094:23 | out : Builder [<map.value>] : Object | Test.java:2094:9:2094:24 | getMapValue(...) | provenance | MaD:85 |
+| Test.java:2094:21:2094:23 | out : Builder [<map.value>] : Object | Test.java:2094:9:2094:24 | getMapValue(...) | provenance | MaD:71 |
 | Test.java:2099:18:2099:66 | (...)... : List [<element>, <map.value>] : Object | Test.java:2100:15:2100:16 | in : List [<element>, <map.value>] : Object | provenance |  |
 | Test.java:2099:28:2099:66 | of(...) : List [<element>, <map.value>] : Object | Test.java:2099:18:2099:66 | (...)... : List [<element>, <map.value>] : Object | provenance |  |
-| Test.java:2099:36:2099:65 | newEntryWithMapValue(...) : Entry [<map.value>] : Object | Test.java:2099:28:2099:66 | of(...) : List [<element>, <map.value>] : Object | provenance | MaD:558 |
+| Test.java:2099:36:2099:65 | newEntryWithMapValue(...) : Entry [<map.value>] : Object | Test.java:2099:28:2099:66 | of(...) : List [<element>, <map.value>] : Object | provenance | MaD:561 |
 | Test.java:2099:57:2099:64 | source(...) : Object | Test.java:113:42:113:48 | value : Object | provenance |  |
-| Test.java:2099:57:2099:64 | source(...) : Object | Test.java:2099:36:2099:65 | newEntryWithMapValue(...) : Entry [<map.value>] : Object | provenance | MaD:564 |
+| Test.java:2099:57:2099:64 | source(...) : Object | Test.java:2099:36:2099:65 | newEntryWithMapValue(...) : Entry [<map.value>] : Object | provenance | MaD:565 |
 | Test.java:2100:4:2100:6 | out [post update] : Builder [<map.value>] : Object | Test.java:2101:21:2101:23 | out : Builder [<map.value>] : Object | provenance |  |
-| Test.java:2100:15:2100:16 | in : List [<element>, <map.value>] : Object | Test.java:2100:4:2100:6 | out [post update] : Builder [<map.value>] : Object | provenance | MaD:94 |
+| Test.java:2100:15:2100:16 | in : List [<element>, <map.value>] : Object | Test.java:2100:4:2100:6 | out [post update] : Builder [<map.value>] : Object | provenance | MaD:79 |
 | Test.java:2101:21:2101:23 | out : Builder [<map.value>] : Object | Test.java:115:20:115:46 | b : Builder [<map.value>] : Object | provenance |  |
-| Test.java:2101:21:2101:23 | out : Builder [<map.value>] : Object | Test.java:2101:9:2101:24 | getMapValue(...) | provenance | MaD:85 |
+| Test.java:2101:21:2101:23 | out : Builder [<map.value>] : Object | Test.java:2101:9:2101:24 | getMapValue(...) | provenance | MaD:71 |
 | Test.java:2106:13:2106:39 | (...)... : Map [<map.key>] : Object | Test.java:2107:15:2107:16 | in : Map [<map.key>] : Object | provenance |  |
 | Test.java:2106:18:2106:39 | of(...) : Map [<map.key>] : Object | Test.java:2106:13:2106:39 | (...)... : Map [<map.key>] : Object | provenance |  |
-| Test.java:2106:25:2106:32 | source(...) : Object | Test.java:2106:18:2106:39 | of(...) : Map [<map.key>] : Object | provenance | MaD:563 |
+| Test.java:2106:25:2106:32 | source(...) : Object | Test.java:2106:18:2106:39 | of(...) : Map [<map.key>] : Object | provenance | MaD:564 |
 | Test.java:2107:4:2107:6 | out [post update] : Builder [<map.key>] : Object | Test.java:2108:19:2108:21 | out : Builder [<map.key>] : Object | provenance |  |
-| Test.java:2107:15:2107:16 | in : Map [<map.key>] : Object | Test.java:2107:4:2107:6 | out [post update] : Builder [<map.key>] : Object | provenance | MaD:95 |
+| Test.java:2107:15:2107:16 | in : Map [<map.key>] : Object | Test.java:2107:4:2107:6 | out [post update] : Builder [<map.key>] : Object | provenance | MaD:80 |
 | Test.java:2108:19:2108:21 | out : Builder [<map.key>] : Object | Test.java:97:18:97:44 | b : Builder [<map.key>] : Object | provenance |  |
-| Test.java:2108:19:2108:21 | out : Builder [<map.key>] : Object | Test.java:2108:9:2108:22 | getMapKey(...) | provenance | MaD:84 |
+| Test.java:2108:19:2108:21 | out : Builder [<map.key>] : Object | Test.java:2108:9:2108:22 | getMapKey(...) | provenance | MaD:70 |
 | Test.java:2113:13:2113:39 | (...)... : Map [<map.key>] : Object | Test.java:2114:15:2114:16 | in : Map [<map.key>] : Object | provenance |  |
 | Test.java:2113:18:2113:39 | of(...) : Map [<map.key>] : Object | Test.java:2113:13:2113:39 | (...)... : Map [<map.key>] : Object | provenance |  |
-| Test.java:2113:25:2113:32 | source(...) : Object | Test.java:2113:18:2113:39 | of(...) : Map [<map.key>] : Object | provenance | MaD:563 |
+| Test.java:2113:25:2113:32 | source(...) : Object | Test.java:2113:18:2113:39 | of(...) : Map [<map.key>] : Object | provenance | MaD:564 |
 | Test.java:2114:4:2114:6 | out [post update] : Builder [<map.key>] : Object | Test.java:2115:19:2115:21 | out : Builder [<map.key>] : Object | provenance |  |
-| Test.java:2114:15:2114:16 | in : Map [<map.key>] : Object | Test.java:2114:4:2114:6 | out [post update] : Builder [<map.key>] : Object | provenance | MaD:95 |
+| Test.java:2114:15:2114:16 | in : Map [<map.key>] : Object | Test.java:2114:4:2114:6 | out [post update] : Builder [<map.key>] : Object | provenance | MaD:80 |
 | Test.java:2115:19:2115:21 | out : Builder [<map.key>] : Object | Test.java:97:18:97:44 | b : Builder [<map.key>] : Object | provenance |  |
-| Test.java:2115:19:2115:21 | out : Builder [<map.key>] : Object | Test.java:2115:9:2115:22 | getMapKey(...) | provenance | MaD:84 |
+| Test.java:2115:19:2115:21 | out : Builder [<map.key>] : Object | Test.java:2115:9:2115:22 | getMapKey(...) | provenance | MaD:70 |
 | Test.java:2120:13:2120:39 | (...)... : Map [<map.key>] : Object | Test.java:2121:15:2121:16 | in : Map [<map.key>] : Object | provenance |  |
 | Test.java:2120:18:2120:39 | of(...) : Map [<map.key>] : Object | Test.java:2120:13:2120:39 | (...)... : Map [<map.key>] : Object | provenance |  |
-| Test.java:2120:25:2120:32 | source(...) : Object | Test.java:2120:18:2120:39 | of(...) : Map [<map.key>] : Object | provenance | MaD:563 |
+| Test.java:2120:25:2120:32 | source(...) : Object | Test.java:2120:18:2120:39 | of(...) : Map [<map.key>] : Object | provenance | MaD:564 |
 | Test.java:2121:4:2121:6 | out [post update] : Builder [<map.key>] : Object | Test.java:2122:19:2122:21 | out : Builder [<map.key>] : Object | provenance |  |
-| Test.java:2121:15:2121:16 | in : Map [<map.key>] : Object | Test.java:2121:4:2121:6 | out [post update] : Builder [<map.key>] : Object | provenance | MaD:95 |
+| Test.java:2121:15:2121:16 | in : Map [<map.key>] : Object | Test.java:2121:4:2121:6 | out [post update] : Builder [<map.key>] : Object | provenance | MaD:80 |
 | Test.java:2122:19:2122:21 | out : Builder [<map.key>] : Object | Test.java:97:18:97:44 | b : Builder [<map.key>] : Object | provenance |  |
-| Test.java:2122:19:2122:21 | out : Builder [<map.key>] : Object | Test.java:2122:9:2122:22 | getMapKey(...) | provenance | MaD:84 |
+| Test.java:2122:19:2122:21 | out : Builder [<map.key>] : Object | Test.java:2122:9:2122:22 | getMapKey(...) | provenance | MaD:70 |
 | Test.java:2127:13:2127:39 | (...)... : Map [<map.value>] : Object | Test.java:2128:15:2128:16 | in : Map [<map.value>] : Object | provenance |  |
 | Test.java:2127:18:2127:39 | of(...) : Map [<map.value>] : Object | Test.java:2127:13:2127:39 | (...)... : Map [<map.value>] : Object | provenance |  |
-| Test.java:2127:31:2127:38 | source(...) : Object | Test.java:2127:18:2127:39 | of(...) : Map [<map.value>] : Object | provenance | MaD:564 |
+| Test.java:2127:31:2127:38 | source(...) : Object | Test.java:2127:18:2127:39 | of(...) : Map [<map.value>] : Object | provenance | MaD:565 |
 | Test.java:2128:4:2128:6 | out [post update] : Builder [<map.value>] : Object | Test.java:2129:21:2129:23 | out : Builder [<map.value>] : Object | provenance |  |
-| Test.java:2128:15:2128:16 | in : Map [<map.value>] : Object | Test.java:2128:4:2128:6 | out [post update] : Builder [<map.value>] : Object | provenance | MaD:96 |
+| Test.java:2128:15:2128:16 | in : Map [<map.value>] : Object | Test.java:2128:4:2128:6 | out [post update] : Builder [<map.value>] : Object | provenance | MaD:81 |
 | Test.java:2129:21:2129:23 | out : Builder [<map.value>] : Object | Test.java:115:20:115:46 | b : Builder [<map.value>] : Object | provenance |  |
-| Test.java:2129:21:2129:23 | out : Builder [<map.value>] : Object | Test.java:2129:9:2129:24 | getMapValue(...) | provenance | MaD:85 |
+| Test.java:2129:21:2129:23 | out : Builder [<map.value>] : Object | Test.java:2129:9:2129:24 | getMapValue(...) | provenance | MaD:71 |
 | Test.java:2134:13:2134:39 | (...)... : Map [<map.value>] : Object | Test.java:2135:15:2135:16 | in : Map [<map.value>] : Object | provenance |  |
 | Test.java:2134:18:2134:39 | of(...) : Map [<map.value>] : Object | Test.java:2134:13:2134:39 | (...)... : Map [<map.value>] : Object | provenance |  |
-| Test.java:2134:31:2134:38 | source(...) : Object | Test.java:2134:18:2134:39 | of(...) : Map [<map.value>] : Object | provenance | MaD:564 |
+| Test.java:2134:31:2134:38 | source(...) : Object | Test.java:2134:18:2134:39 | of(...) : Map [<map.value>] : Object | provenance | MaD:565 |
 | Test.java:2135:4:2135:6 | out [post update] : Builder [<map.value>] : Object | Test.java:2136:21:2136:23 | out : Builder [<map.value>] : Object | provenance |  |
-| Test.java:2135:15:2135:16 | in : Map [<map.value>] : Object | Test.java:2135:4:2135:6 | out [post update] : Builder [<map.value>] : Object | provenance | MaD:96 |
+| Test.java:2135:15:2135:16 | in : Map [<map.value>] : Object | Test.java:2135:4:2135:6 | out [post update] : Builder [<map.value>] : Object | provenance | MaD:81 |
 | Test.java:2136:21:2136:23 | out : Builder [<map.value>] : Object | Test.java:115:20:115:46 | b : Builder [<map.value>] : Object | provenance |  |
-| Test.java:2136:21:2136:23 | out : Builder [<map.value>] : Object | Test.java:2136:9:2136:24 | getMapValue(...) | provenance | MaD:85 |
+| Test.java:2136:21:2136:23 | out : Builder [<map.value>] : Object | Test.java:2136:9:2136:24 | getMapValue(...) | provenance | MaD:71 |
 | Test.java:2141:13:2141:39 | (...)... : Map [<map.value>] : Object | Test.java:2142:15:2142:16 | in : Map [<map.value>] : Object | provenance |  |
 | Test.java:2141:18:2141:39 | of(...) : Map [<map.value>] : Object | Test.java:2141:13:2141:39 | (...)... : Map [<map.value>] : Object | provenance |  |
-| Test.java:2141:31:2141:38 | source(...) : Object | Test.java:2141:18:2141:39 | of(...) : Map [<map.value>] : Object | provenance | MaD:564 |
+| Test.java:2141:31:2141:38 | source(...) : Object | Test.java:2141:18:2141:39 | of(...) : Map [<map.value>] : Object | provenance | MaD:565 |
 | Test.java:2142:4:2142:6 | out [post update] : Builder [<map.value>] : Object | Test.java:2143:21:2143:23 | out : Builder [<map.value>] : Object | provenance |  |
-| Test.java:2142:15:2142:16 | in : Map [<map.value>] : Object | Test.java:2142:4:2142:6 | out [post update] : Builder [<map.value>] : Object | provenance | MaD:96 |
+| Test.java:2142:15:2142:16 | in : Map [<map.value>] : Object | Test.java:2142:4:2142:6 | out [post update] : Builder [<map.value>] : Object | provenance | MaD:81 |
 | Test.java:2143:21:2143:23 | out : Builder [<map.value>] : Object | Test.java:115:20:115:46 | b : Builder [<map.value>] : Object | provenance |  |
-| Test.java:2143:21:2143:23 | out : Builder [<map.value>] : Object | Test.java:2143:9:2143:24 | getMapValue(...) | provenance | MaD:85 |
+| Test.java:2143:21:2143:23 | out : Builder [<map.value>] : Object | Test.java:2143:9:2143:24 | getMapValue(...) | provenance | MaD:71 |
 | Test.java:2148:36:2148:71 | (...)... : Builder | Test.java:2149:10:2149:11 | in : Builder | provenance |  |
 | Test.java:2148:64:2148:71 | source(...) : Object | Test.java:2148:36:2148:71 | (...)... : Builder | provenance |  |
-| Test.java:2149:10:2149:11 | in : Builder | Test.java:2149:10:2149:29 | putAll(...) : Builder | provenance | MaD:92 |
+| Test.java:2149:10:2149:11 | in : Builder | Test.java:2149:10:2149:29 | putAll(...) : Builder | provenance | MaD:82 |
 | Test.java:2149:10:2149:29 | putAll(...) : Builder | Test.java:2150:9:2150:11 | out | provenance |  |
 | Test.java:2155:36:2155:71 | (...)... : Builder | Test.java:2156:10:2156:11 | in : Builder | provenance |  |
 | Test.java:2155:64:2155:71 | source(...) : Object | Test.java:2155:36:2155:71 | (...)... : Builder | provenance |  |
-| Test.java:2156:10:2156:11 | in : Builder | Test.java:2156:10:2156:34 | putAll(...) : Builder | provenance | MaD:92 |
+| Test.java:2156:10:2156:11 | in : Builder | Test.java:2156:10:2156:34 | putAll(...) : Builder | provenance | MaD:82 |
 | Test.java:2156:10:2156:34 | putAll(...) : Builder | Test.java:2157:9:2157:11 | out | provenance |  |
 | Test.java:2162:30:2162:59 | (...)... : Builder | Test.java:2163:10:2163:11 | in : Builder | provenance |  |
 | Test.java:2162:52:2162:59 | source(...) : Object | Test.java:2162:30:2162:59 | (...)... : Builder | provenance |  |
-| Test.java:2163:10:2163:11 | in : Builder | Test.java:2163:10:2163:29 | putAll(...) : Builder | provenance | MaD:92 |
+| Test.java:2163:10:2163:11 | in : Builder | Test.java:2163:10:2163:29 | putAll(...) : Builder | provenance | MaD:82 |
 | Test.java:2163:10:2163:29 | putAll(...) : Builder | Test.java:2164:9:2164:11 | out | provenance |  |
 | Test.java:2169:30:2169:59 | (...)... : Builder | Test.java:2170:10:2170:11 | in : Builder | provenance |  |
 | Test.java:2169:52:2169:59 | source(...) : Object | Test.java:2169:30:2169:59 | (...)... : Builder | provenance |  |
-| Test.java:2170:10:2170:11 | in : Builder | Test.java:2170:10:2170:34 | putAll(...) : Builder | provenance | MaD:92 |
+| Test.java:2170:10:2170:11 | in : Builder | Test.java:2170:10:2170:34 | putAll(...) : Builder | provenance | MaD:82 |
 | Test.java:2170:10:2170:34 | putAll(...) : Builder | Test.java:2171:9:2171:11 | out | provenance |  |
 | Test.java:2176:32:2176:63 | (...)... : Builder | Test.java:2177:10:2177:11 | in : Builder | provenance |  |
 | Test.java:2176:56:2176:63 | source(...) : Object | Test.java:2176:32:2176:63 | (...)... : Builder | provenance |  |
-| Test.java:2177:10:2177:11 | in : Builder | Test.java:2177:10:2177:29 | putAll(...) : Builder | provenance | MaD:92 |
+| Test.java:2177:10:2177:11 | in : Builder | Test.java:2177:10:2177:29 | putAll(...) : Builder | provenance | MaD:82 |
 | Test.java:2177:10:2177:29 | putAll(...) : Builder | Test.java:2178:9:2178:11 | out | provenance |  |
 | Test.java:2183:32:2183:63 | (...)... : Builder | Test.java:2184:10:2184:11 | in : Builder | provenance |  |
 | Test.java:2183:56:2183:63 | source(...) : Object | Test.java:2183:32:2183:63 | (...)... : Builder | provenance |  |
-| Test.java:2184:10:2184:11 | in : Builder | Test.java:2184:10:2184:34 | putAll(...) : Builder | provenance | MaD:92 |
+| Test.java:2184:10:2184:11 | in : Builder | Test.java:2184:10:2184:34 | putAll(...) : Builder | provenance | MaD:82 |
 | Test.java:2184:10:2184:34 | putAll(...) : Builder | Test.java:2185:9:2185:11 | out | provenance |  |
 | Test.java:2190:18:2190:64 | (...)... : List [<element>, <map.key>] : Object | Test.java:2191:30:2191:31 | in : List [<element>, <map.key>] : Object | provenance |  |
 | Test.java:2190:28:2190:64 | of(...) : List [<element>, <map.key>] : Object | Test.java:2190:18:2190:64 | (...)... : List [<element>, <map.key>] : Object | provenance |  |
-| Test.java:2190:36:2190:63 | newEntryWithMapKey(...) : Entry [<map.key>] : Object | Test.java:2190:28:2190:64 | of(...) : List [<element>, <map.key>] : Object | provenance | MaD:558 |
+| Test.java:2190:36:2190:63 | newEntryWithMapKey(...) : Entry [<map.key>] : Object | Test.java:2190:28:2190:64 | of(...) : List [<element>, <map.key>] : Object | provenance | MaD:561 |
 | Test.java:2190:55:2190:62 | source(...) : Object | Test.java:101:40:101:44 | key : Object | provenance |  |
-| Test.java:2190:55:2190:62 | source(...) : Object | Test.java:2190:36:2190:63 | newEntryWithMapKey(...) : Entry [<map.key>] : Object | provenance | MaD:563 |
+| Test.java:2190:55:2190:62 | source(...) : Object | Test.java:2190:36:2190:63 | newEntryWithMapKey(...) : Entry [<map.key>] : Object | provenance | MaD:564 |
 | Test.java:2191:10:2191:32 | copyOf(...) : ImmutableMap [<map.key>] : Object | Test.java:2192:19:2192:21 | out : ImmutableMap [<map.key>] : Object | provenance |  |
-| Test.java:2191:30:2191:31 | in : List [<element>, <map.key>] : Object | Test.java:2191:10:2191:32 | copyOf(...) : ImmutableMap [<map.key>] : Object | provenance | MaD:70 |
+| Test.java:2191:30:2191:31 | in : List [<element>, <map.key>] : Object | Test.java:2191:10:2191:32 | copyOf(...) : ImmutableMap [<map.key>] : Object | provenance | MaD:83 |
 | Test.java:2192:19:2192:21 | out : ImmutableMap [<map.key>] : Object | Test.java:99:18:99:29 | map : ImmutableMap [<map.key>] : Object | provenance |  |
-| Test.java:2192:19:2192:21 | out : ImmutableMap [<map.key>] : Object | Test.java:2192:9:2192:22 | getMapKey(...) | provenance | MaD:562 |
+| Test.java:2192:19:2192:21 | out : ImmutableMap [<map.key>] : Object | Test.java:2192:9:2192:22 | getMapKey(...) | provenance | MaD:569 |
 | Test.java:2197:18:2197:66 | (...)... : List [<element>, <map.value>] : Object | Test.java:2198:30:2198:31 | in : List [<element>, <map.value>] : Object | provenance |  |
 | Test.java:2197:28:2197:66 | of(...) : List [<element>, <map.value>] : Object | Test.java:2197:18:2197:66 | (...)... : List [<element>, <map.value>] : Object | provenance |  |
-| Test.java:2197:36:2197:65 | newEntryWithMapValue(...) : Entry [<map.value>] : Object | Test.java:2197:28:2197:66 | of(...) : List [<element>, <map.value>] : Object | provenance | MaD:558 |
+| Test.java:2197:36:2197:65 | newEntryWithMapValue(...) : Entry [<map.value>] : Object | Test.java:2197:28:2197:66 | of(...) : List [<element>, <map.value>] : Object | provenance | MaD:561 |
 | Test.java:2197:57:2197:64 | source(...) : Object | Test.java:113:42:113:48 | value : Object | provenance |  |
-| Test.java:2197:57:2197:64 | source(...) : Object | Test.java:2197:36:2197:65 | newEntryWithMapValue(...) : Entry [<map.value>] : Object | provenance | MaD:564 |
+| Test.java:2197:57:2197:64 | source(...) : Object | Test.java:2197:36:2197:65 | newEntryWithMapValue(...) : Entry [<map.value>] : Object | provenance | MaD:565 |
 | Test.java:2198:10:2198:32 | copyOf(...) : ImmutableMap [<map.value>] : Object | Test.java:2199:21:2199:23 | out : ImmutableMap [<map.value>] : Object | provenance |  |
-| Test.java:2198:30:2198:31 | in : List [<element>, <map.value>] : Object | Test.java:2198:10:2198:32 | copyOf(...) : ImmutableMap [<map.value>] : Object | provenance | MaD:71 |
+| Test.java:2198:30:2198:31 | in : List [<element>, <map.value>] : Object | Test.java:2198:10:2198:32 | copyOf(...) : ImmutableMap [<map.value>] : Object | provenance | MaD:84 |
 | Test.java:2199:21:2199:23 | out : ImmutableMap [<map.value>] : Object | Test.java:118:20:118:31 | map : ImmutableMap [<map.value>] : Object | provenance |  |
-| Test.java:2199:21:2199:23 | out : ImmutableMap [<map.value>] : Object | Test.java:2199:9:2199:24 | getMapValue(...) | provenance | MaD:561 |
+| Test.java:2199:21:2199:23 | out : ImmutableMap [<map.value>] : Object | Test.java:2199:9:2199:24 | getMapValue(...) | provenance | MaD:568 |
 | Test.java:2204:13:2204:39 | (...)... : Map [<map.key>] : Object | Test.java:2205:30:2205:31 | in : Map [<map.key>] : Object | provenance |  |
 | Test.java:2204:18:2204:39 | of(...) : Map [<map.key>] : Object | Test.java:2204:13:2204:39 | (...)... : Map [<map.key>] : Object | provenance |  |
-| Test.java:2204:25:2204:32 | source(...) : Object | Test.java:2204:18:2204:39 | of(...) : Map [<map.key>] : Object | provenance | MaD:563 |
+| Test.java:2204:25:2204:32 | source(...) : Object | Test.java:2204:18:2204:39 | of(...) : Map [<map.key>] : Object | provenance | MaD:564 |
 | Test.java:2205:10:2205:32 | copyOf(...) : ImmutableMap [<map.key>] : Object | Test.java:2206:19:2206:21 | out : ImmutableMap [<map.key>] : Object | provenance |  |
-| Test.java:2205:30:2205:31 | in : Map [<map.key>] : Object | Test.java:2205:10:2205:32 | copyOf(...) : ImmutableMap [<map.key>] : Object | provenance | MaD:72 |
+| Test.java:2205:30:2205:31 | in : Map [<map.key>] : Object | Test.java:2205:10:2205:32 | copyOf(...) : ImmutableMap [<map.key>] : Object | provenance | MaD:85 |
 | Test.java:2206:19:2206:21 | out : ImmutableMap [<map.key>] : Object | Test.java:99:18:99:29 | map : ImmutableMap [<map.key>] : Object | provenance |  |
-| Test.java:2206:19:2206:21 | out : ImmutableMap [<map.key>] : Object | Test.java:2206:9:2206:22 | getMapKey(...) | provenance | MaD:562 |
+| Test.java:2206:19:2206:21 | out : ImmutableMap [<map.key>] : Object | Test.java:2206:9:2206:22 | getMapKey(...) | provenance | MaD:569 |
 | Test.java:2211:13:2211:39 | (...)... : Map [<map.value>] : Object | Test.java:2212:30:2212:31 | in : Map [<map.value>] : Object | provenance |  |
 | Test.java:2211:18:2211:39 | of(...) : Map [<map.value>] : Object | Test.java:2211:13:2211:39 | (...)... : Map [<map.value>] : Object | provenance |  |
-| Test.java:2211:31:2211:38 | source(...) : Object | Test.java:2211:18:2211:39 | of(...) : Map [<map.value>] : Object | provenance | MaD:564 |
+| Test.java:2211:31:2211:38 | source(...) : Object | Test.java:2211:18:2211:39 | of(...) : Map [<map.value>] : Object | provenance | MaD:565 |
 | Test.java:2212:10:2212:32 | copyOf(...) : ImmutableMap [<map.value>] : Object | Test.java:2213:21:2213:23 | out : ImmutableMap [<map.value>] : Object | provenance |  |
-| Test.java:2212:30:2212:31 | in : Map [<map.value>] : Object | Test.java:2212:10:2212:32 | copyOf(...) : ImmutableMap [<map.value>] : Object | provenance | MaD:73 |
+| Test.java:2212:30:2212:31 | in : Map [<map.value>] : Object | Test.java:2212:10:2212:32 | copyOf(...) : ImmutableMap [<map.value>] : Object | provenance | MaD:86 |
 | Test.java:2213:21:2213:23 | out : ImmutableMap [<map.value>] : Object | Test.java:118:20:118:31 | map : ImmutableMap [<map.value>] : Object | provenance |  |
-| Test.java:2213:21:2213:23 | out : ImmutableMap [<map.value>] : Object | Test.java:2213:9:2213:24 | getMapValue(...) | provenance | MaD:561 |
+| Test.java:2213:21:2213:23 | out : ImmutableMap [<map.value>] : Object | Test.java:2213:9:2213:24 | getMapValue(...) | provenance | MaD:568 |
 | Test.java:2218:16:2218:31 | (...)... : Object | Test.java:2219:26:2219:27 | in : Object | provenance |  |
 | Test.java:2218:24:2218:31 | source(...) : Object | Test.java:2218:16:2218:31 | (...)... : Object | provenance |  |
 | Test.java:2219:10:2219:82 | of(...) : ImmutableMap [<map.key>] : Object | Test.java:2220:19:2220:21 | out : ImmutableMap [<map.key>] : Object | provenance |  |
-| Test.java:2219:26:2219:27 | in : Object | Test.java:2219:10:2219:82 | of(...) : ImmutableMap [<map.key>] : Object | provenance | MaD:74 |
+| Test.java:2219:26:2219:27 | in : Object | Test.java:2219:10:2219:82 | of(...) : ImmutableMap [<map.key>] : Object | provenance | MaD:87 |
 | Test.java:2220:19:2220:21 | out : ImmutableMap [<map.key>] : Object | Test.java:99:18:99:29 | map : ImmutableMap [<map.key>] : Object | provenance |  |
-| Test.java:2220:19:2220:21 | out : ImmutableMap [<map.key>] : Object | Test.java:2220:9:2220:22 | getMapKey(...) | provenance | MaD:562 |
+| Test.java:2220:19:2220:21 | out : ImmutableMap [<map.key>] : Object | Test.java:2220:9:2220:22 | getMapKey(...) | provenance | MaD:569 |
 | Test.java:2225:16:2225:31 | (...)... : Object | Test.java:2226:26:2226:27 | in : Object | provenance |  |
 | Test.java:2225:24:2225:31 | source(...) : Object | Test.java:2225:16:2225:31 | (...)... : Object | provenance |  |
 | Test.java:2226:10:2226:70 | of(...) : ImmutableMap [<map.key>] : Object | Test.java:2227:19:2227:21 | out : ImmutableMap [<map.key>] : Object | provenance |  |
-| Test.java:2226:26:2226:27 | in : Object | Test.java:2226:10:2226:70 | of(...) : ImmutableMap [<map.key>] : Object | provenance | MaD:74 |
+| Test.java:2226:26:2226:27 | in : Object | Test.java:2226:10:2226:70 | of(...) : ImmutableMap [<map.key>] : Object | provenance | MaD:87 |
 | Test.java:2227:19:2227:21 | out : ImmutableMap [<map.key>] : Object | Test.java:99:18:99:29 | map : ImmutableMap [<map.key>] : Object | provenance |  |
-| Test.java:2227:19:2227:21 | out : ImmutableMap [<map.key>] : Object | Test.java:2227:9:2227:22 | getMapKey(...) | provenance | MaD:562 |
+| Test.java:2227:19:2227:21 | out : ImmutableMap [<map.key>] : Object | Test.java:2227:9:2227:22 | getMapKey(...) | provenance | MaD:569 |
 | Test.java:2232:16:2232:31 | (...)... : Object | Test.java:2233:26:2233:27 | in : Object | provenance |  |
 | Test.java:2232:24:2232:31 | source(...) : Object | Test.java:2232:16:2232:31 | (...)... : Object | provenance |  |
 | Test.java:2233:10:2233:58 | of(...) : ImmutableMap [<map.key>] : Object | Test.java:2234:19:2234:21 | out : ImmutableMap [<map.key>] : Object | provenance |  |
-| Test.java:2233:26:2233:27 | in : Object | Test.java:2233:10:2233:58 | of(...) : ImmutableMap [<map.key>] : Object | provenance | MaD:74 |
+| Test.java:2233:26:2233:27 | in : Object | Test.java:2233:10:2233:58 | of(...) : ImmutableMap [<map.key>] : Object | provenance | MaD:87 |
 | Test.java:2234:19:2234:21 | out : ImmutableMap [<map.key>] : Object | Test.java:99:18:99:29 | map : ImmutableMap [<map.key>] : Object | provenance |  |
-| Test.java:2234:19:2234:21 | out : ImmutableMap [<map.key>] : Object | Test.java:2234:9:2234:22 | getMapKey(...) | provenance | MaD:562 |
+| Test.java:2234:19:2234:21 | out : ImmutableMap [<map.key>] : Object | Test.java:2234:9:2234:22 | getMapKey(...) | provenance | MaD:569 |
 | Test.java:2239:16:2239:31 | (...)... : Object | Test.java:2240:26:2240:27 | in : Object | provenance |  |
 | Test.java:2239:24:2239:31 | source(...) : Object | Test.java:2239:16:2239:31 | (...)... : Object | provenance |  |
 | Test.java:2240:10:2240:46 | of(...) : ImmutableMap [<map.key>] : Object | Test.java:2241:19:2241:21 | out : ImmutableMap [<map.key>] : Object | provenance |  |
-| Test.java:2240:26:2240:27 | in : Object | Test.java:2240:10:2240:46 | of(...) : ImmutableMap [<map.key>] : Object | provenance | MaD:74 |
+| Test.java:2240:26:2240:27 | in : Object | Test.java:2240:10:2240:46 | of(...) : ImmutableMap [<map.key>] : Object | provenance | MaD:87 |
 | Test.java:2241:19:2241:21 | out : ImmutableMap [<map.key>] : Object | Test.java:99:18:99:29 | map : ImmutableMap [<map.key>] : Object | provenance |  |
-| Test.java:2241:19:2241:21 | out : ImmutableMap [<map.key>] : Object | Test.java:2241:9:2241:22 | getMapKey(...) | provenance | MaD:562 |
+| Test.java:2241:19:2241:21 | out : ImmutableMap [<map.key>] : Object | Test.java:2241:9:2241:22 | getMapKey(...) | provenance | MaD:569 |
 | Test.java:2246:16:2246:31 | (...)... : Object | Test.java:2247:26:2247:27 | in : Object | provenance |  |
 | Test.java:2246:24:2246:31 | source(...) : Object | Test.java:2246:16:2246:31 | (...)... : Object | provenance |  |
 | Test.java:2247:10:2247:34 | of(...) : ImmutableMap [<map.key>] : Object | Test.java:2248:19:2248:21 | out : ImmutableMap [<map.key>] : Object | provenance |  |
-| Test.java:2247:26:2247:27 | in : Object | Test.java:2247:10:2247:34 | of(...) : ImmutableMap [<map.key>] : Object | provenance | MaD:74 |
+| Test.java:2247:26:2247:27 | in : Object | Test.java:2247:10:2247:34 | of(...) : ImmutableMap [<map.key>] : Object | provenance | MaD:87 |
 | Test.java:2248:19:2248:21 | out : ImmutableMap [<map.key>] : Object | Test.java:99:18:99:29 | map : ImmutableMap [<map.key>] : Object | provenance |  |
-| Test.java:2248:19:2248:21 | out : ImmutableMap [<map.key>] : Object | Test.java:2248:9:2248:22 | getMapKey(...) | provenance | MaD:562 |
+| Test.java:2248:19:2248:21 | out : ImmutableMap [<map.key>] : Object | Test.java:2248:9:2248:22 | getMapKey(...) | provenance | MaD:569 |
 | Test.java:2253:16:2253:31 | (...)... : Object | Test.java:2254:32:2254:33 | in : Object | provenance |  |
 | Test.java:2253:24:2253:31 | source(...) : Object | Test.java:2253:16:2253:31 | (...)... : Object | provenance |  |
 | Test.java:2254:10:2254:82 | of(...) : ImmutableMap [<map.value>] : Object | Test.java:2255:21:2255:23 | out : ImmutableMap [<map.value>] : Object | provenance |  |
-| Test.java:2254:32:2254:33 | in : Object | Test.java:2254:10:2254:82 | of(...) : ImmutableMap [<map.value>] : Object | provenance | MaD:75 |
+| Test.java:2254:32:2254:33 | in : Object | Test.java:2254:10:2254:82 | of(...) : ImmutableMap [<map.value>] : Object | provenance | MaD:88 |
 | Test.java:2255:21:2255:23 | out : ImmutableMap [<map.value>] : Object | Test.java:118:20:118:31 | map : ImmutableMap [<map.value>] : Object | provenance |  |
-| Test.java:2255:21:2255:23 | out : ImmutableMap [<map.value>] : Object | Test.java:2255:9:2255:24 | getMapValue(...) | provenance | MaD:561 |
+| Test.java:2255:21:2255:23 | out : ImmutableMap [<map.value>] : Object | Test.java:2255:9:2255:24 | getMapValue(...) | provenance | MaD:568 |
 | Test.java:2260:16:2260:31 | (...)... : Object | Test.java:2261:32:2261:33 | in : Object | provenance |  |
 | Test.java:2260:24:2260:31 | source(...) : Object | Test.java:2260:16:2260:31 | (...)... : Object | provenance |  |
 | Test.java:2261:10:2261:70 | of(...) : ImmutableMap [<map.value>] : Object | Test.java:2262:21:2262:23 | out : ImmutableMap [<map.value>] : Object | provenance |  |
-| Test.java:2261:32:2261:33 | in : Object | Test.java:2261:10:2261:70 | of(...) : ImmutableMap [<map.value>] : Object | provenance | MaD:75 |
+| Test.java:2261:32:2261:33 | in : Object | Test.java:2261:10:2261:70 | of(...) : ImmutableMap [<map.value>] : Object | provenance | MaD:88 |
 | Test.java:2262:21:2262:23 | out : ImmutableMap [<map.value>] : Object | Test.java:118:20:118:31 | map : ImmutableMap [<map.value>] : Object | provenance |  |
-| Test.java:2262:21:2262:23 | out : ImmutableMap [<map.value>] : Object | Test.java:2262:9:2262:24 | getMapValue(...) | provenance | MaD:561 |
+| Test.java:2262:21:2262:23 | out : ImmutableMap [<map.value>] : Object | Test.java:2262:9:2262:24 | getMapValue(...) | provenance | MaD:568 |
 | Test.java:2267:16:2267:31 | (...)... : Object | Test.java:2268:32:2268:33 | in : Object | provenance |  |
 | Test.java:2267:24:2267:31 | source(...) : Object | Test.java:2267:16:2267:31 | (...)... : Object | provenance |  |
 | Test.java:2268:10:2268:58 | of(...) : ImmutableMap [<map.value>] : Object | Test.java:2269:21:2269:23 | out : ImmutableMap [<map.value>] : Object | provenance |  |
-| Test.java:2268:32:2268:33 | in : Object | Test.java:2268:10:2268:58 | of(...) : ImmutableMap [<map.value>] : Object | provenance | MaD:75 |
+| Test.java:2268:32:2268:33 | in : Object | Test.java:2268:10:2268:58 | of(...) : ImmutableMap [<map.value>] : Object | provenance | MaD:88 |
 | Test.java:2269:21:2269:23 | out : ImmutableMap [<map.value>] : Object | Test.java:118:20:118:31 | map : ImmutableMap [<map.value>] : Object | provenance |  |
-| Test.java:2269:21:2269:23 | out : ImmutableMap [<map.value>] : Object | Test.java:2269:9:2269:24 | getMapValue(...) | provenance | MaD:561 |
+| Test.java:2269:21:2269:23 | out : ImmutableMap [<map.value>] : Object | Test.java:2269:9:2269:24 | getMapValue(...) | provenance | MaD:568 |
 | Test.java:2274:16:2274:31 | (...)... : Object | Test.java:2275:32:2275:33 | in : Object | provenance |  |
 | Test.java:2274:24:2274:31 | source(...) : Object | Test.java:2274:16:2274:31 | (...)... : Object | provenance |  |
 | Test.java:2275:10:2275:46 | of(...) : ImmutableMap [<map.value>] : Object | Test.java:2276:21:2276:23 | out : ImmutableMap [<map.value>] : Object | provenance |  |
-| Test.java:2275:32:2275:33 | in : Object | Test.java:2275:10:2275:46 | of(...) : ImmutableMap [<map.value>] : Object | provenance | MaD:75 |
+| Test.java:2275:32:2275:33 | in : Object | Test.java:2275:10:2275:46 | of(...) : ImmutableMap [<map.value>] : Object | provenance | MaD:88 |
 | Test.java:2276:21:2276:23 | out : ImmutableMap [<map.value>] : Object | Test.java:118:20:118:31 | map : ImmutableMap [<map.value>] : Object | provenance |  |
-| Test.java:2276:21:2276:23 | out : ImmutableMap [<map.value>] : Object | Test.java:2276:9:2276:24 | getMapValue(...) | provenance | MaD:561 |
+| Test.java:2276:21:2276:23 | out : ImmutableMap [<map.value>] : Object | Test.java:2276:9:2276:24 | getMapValue(...) | provenance | MaD:568 |
 | Test.java:2281:16:2281:31 | (...)... : Object | Test.java:2282:32:2282:33 | in : Object | provenance |  |
 | Test.java:2281:24:2281:31 | source(...) : Object | Test.java:2281:16:2281:31 | (...)... : Object | provenance |  |
 | Test.java:2282:10:2282:34 | of(...) : ImmutableMap [<map.value>] : Object | Test.java:2283:21:2283:23 | out : ImmutableMap [<map.value>] : Object | provenance |  |
-| Test.java:2282:32:2282:33 | in : Object | Test.java:2282:10:2282:34 | of(...) : ImmutableMap [<map.value>] : Object | provenance | MaD:75 |
+| Test.java:2282:32:2282:33 | in : Object | Test.java:2282:10:2282:34 | of(...) : ImmutableMap [<map.value>] : Object | provenance | MaD:88 |
 | Test.java:2283:21:2283:23 | out : ImmutableMap [<map.value>] : Object | Test.java:118:20:118:31 | map : ImmutableMap [<map.value>] : Object | provenance |  |
-| Test.java:2283:21:2283:23 | out : ImmutableMap [<map.value>] : Object | Test.java:2283:9:2283:24 | getMapValue(...) | provenance | MaD:561 |
+| Test.java:2283:21:2283:23 | out : ImmutableMap [<map.value>] : Object | Test.java:2283:9:2283:24 | getMapValue(...) | provenance | MaD:568 |
 | Test.java:2288:16:2288:31 | (...)... : Object | Test.java:2289:38:2289:39 | in : Object | provenance |  |
 | Test.java:2288:24:2288:31 | source(...) : Object | Test.java:2288:16:2288:31 | (...)... : Object | provenance |  |
 | Test.java:2289:10:2289:82 | of(...) : ImmutableMap [<map.key>] : Object | Test.java:2290:19:2290:21 | out : ImmutableMap [<map.key>] : Object | provenance |  |
-| Test.java:2289:38:2289:39 | in : Object | Test.java:2289:10:2289:82 | of(...) : ImmutableMap [<map.key>] : Object | provenance | MaD:76 |
+| Test.java:2289:38:2289:39 | in : Object | Test.java:2289:10:2289:82 | of(...) : ImmutableMap [<map.key>] : Object | provenance | MaD:89 |
 | Test.java:2290:19:2290:21 | out : ImmutableMap [<map.key>] : Object | Test.java:99:18:99:29 | map : ImmutableMap [<map.key>] : Object | provenance |  |
-| Test.java:2290:19:2290:21 | out : ImmutableMap [<map.key>] : Object | Test.java:2290:9:2290:22 | getMapKey(...) | provenance | MaD:562 |
+| Test.java:2290:19:2290:21 | out : ImmutableMap [<map.key>] : Object | Test.java:2290:9:2290:22 | getMapKey(...) | provenance | MaD:569 |
 | Test.java:2295:16:2295:31 | (...)... : Object | Test.java:2296:38:2296:39 | in : Object | provenance |  |
 | Test.java:2295:24:2295:31 | source(...) : Object | Test.java:2295:16:2295:31 | (...)... : Object | provenance |  |
 | Test.java:2296:10:2296:70 | of(...) : ImmutableMap [<map.key>] : Object | Test.java:2297:19:2297:21 | out : ImmutableMap [<map.key>] : Object | provenance |  |
-| Test.java:2296:38:2296:39 | in : Object | Test.java:2296:10:2296:70 | of(...) : ImmutableMap [<map.key>] : Object | provenance | MaD:76 |
+| Test.java:2296:38:2296:39 | in : Object | Test.java:2296:10:2296:70 | of(...) : ImmutableMap [<map.key>] : Object | provenance | MaD:89 |
 | Test.java:2297:19:2297:21 | out : ImmutableMap [<map.key>] : Object | Test.java:99:18:99:29 | map : ImmutableMap [<map.key>] : Object | provenance |  |
-| Test.java:2297:19:2297:21 | out : ImmutableMap [<map.key>] : Object | Test.java:2297:9:2297:22 | getMapKey(...) | provenance | MaD:562 |
+| Test.java:2297:19:2297:21 | out : ImmutableMap [<map.key>] : Object | Test.java:2297:9:2297:22 | getMapKey(...) | provenance | MaD:569 |
 | Test.java:2302:16:2302:31 | (...)... : Object | Test.java:2303:38:2303:39 | in : Object | provenance |  |
 | Test.java:2302:24:2302:31 | source(...) : Object | Test.java:2302:16:2302:31 | (...)... : Object | provenance |  |
 | Test.java:2303:10:2303:58 | of(...) : ImmutableMap [<map.key>] : Object | Test.java:2304:19:2304:21 | out : ImmutableMap [<map.key>] : Object | provenance |  |
-| Test.java:2303:38:2303:39 | in : Object | Test.java:2303:10:2303:58 | of(...) : ImmutableMap [<map.key>] : Object | provenance | MaD:76 |
+| Test.java:2303:38:2303:39 | in : Object | Test.java:2303:10:2303:58 | of(...) : ImmutableMap [<map.key>] : Object | provenance | MaD:89 |
 | Test.java:2304:19:2304:21 | out : ImmutableMap [<map.key>] : Object | Test.java:99:18:99:29 | map : ImmutableMap [<map.key>] : Object | provenance |  |
-| Test.java:2304:19:2304:21 | out : ImmutableMap [<map.key>] : Object | Test.java:2304:9:2304:22 | getMapKey(...) | provenance | MaD:562 |
+| Test.java:2304:19:2304:21 | out : ImmutableMap [<map.key>] : Object | Test.java:2304:9:2304:22 | getMapKey(...) | provenance | MaD:569 |
 | Test.java:2309:16:2309:31 | (...)... : Object | Test.java:2310:38:2310:39 | in : Object | provenance |  |
 | Test.java:2309:24:2309:31 | source(...) : Object | Test.java:2309:16:2309:31 | (...)... : Object | provenance |  |
 | Test.java:2310:10:2310:46 | of(...) : ImmutableMap [<map.key>] : Object | Test.java:2311:19:2311:21 | out : ImmutableMap [<map.key>] : Object | provenance |  |
-| Test.java:2310:38:2310:39 | in : Object | Test.java:2310:10:2310:46 | of(...) : ImmutableMap [<map.key>] : Object | provenance | MaD:76 |
+| Test.java:2310:38:2310:39 | in : Object | Test.java:2310:10:2310:46 | of(...) : ImmutableMap [<map.key>] : Object | provenance | MaD:89 |
 | Test.java:2311:19:2311:21 | out : ImmutableMap [<map.key>] : Object | Test.java:99:18:99:29 | map : ImmutableMap [<map.key>] : Object | provenance |  |
-| Test.java:2311:19:2311:21 | out : ImmutableMap [<map.key>] : Object | Test.java:2311:9:2311:22 | getMapKey(...) | provenance | MaD:562 |
+| Test.java:2311:19:2311:21 | out : ImmutableMap [<map.key>] : Object | Test.java:2311:9:2311:22 | getMapKey(...) | provenance | MaD:569 |
 | Test.java:2316:16:2316:31 | (...)... : Object | Test.java:2317:44:2317:45 | in : Object | provenance |  |
 | Test.java:2316:24:2316:31 | source(...) : Object | Test.java:2316:16:2316:31 | (...)... : Object | provenance |  |
 | Test.java:2317:10:2317:82 | of(...) : ImmutableMap [<map.value>] : Object | Test.java:2318:21:2318:23 | out : ImmutableMap [<map.value>] : Object | provenance |  |
-| Test.java:2317:44:2317:45 | in : Object | Test.java:2317:10:2317:82 | of(...) : ImmutableMap [<map.value>] : Object | provenance | MaD:77 |
+| Test.java:2317:44:2317:45 | in : Object | Test.java:2317:10:2317:82 | of(...) : ImmutableMap [<map.value>] : Object | provenance | MaD:90 |
 | Test.java:2318:21:2318:23 | out : ImmutableMap [<map.value>] : Object | Test.java:118:20:118:31 | map : ImmutableMap [<map.value>] : Object | provenance |  |
-| Test.java:2318:21:2318:23 | out : ImmutableMap [<map.value>] : Object | Test.java:2318:9:2318:24 | getMapValue(...) | provenance | MaD:561 |
+| Test.java:2318:21:2318:23 | out : ImmutableMap [<map.value>] : Object | Test.java:2318:9:2318:24 | getMapValue(...) | provenance | MaD:568 |
 | Test.java:2323:16:2323:31 | (...)... : Object | Test.java:2324:44:2324:45 | in : Object | provenance |  |
 | Test.java:2323:24:2323:31 | source(...) : Object | Test.java:2323:16:2323:31 | (...)... : Object | provenance |  |
 | Test.java:2324:10:2324:70 | of(...) : ImmutableMap [<map.value>] : Object | Test.java:2325:21:2325:23 | out : ImmutableMap [<map.value>] : Object | provenance |  |
-| Test.java:2324:44:2324:45 | in : Object | Test.java:2324:10:2324:70 | of(...) : ImmutableMap [<map.value>] : Object | provenance | MaD:77 |
+| Test.java:2324:44:2324:45 | in : Object | Test.java:2324:10:2324:70 | of(...) : ImmutableMap [<map.value>] : Object | provenance | MaD:90 |
 | Test.java:2325:21:2325:23 | out : ImmutableMap [<map.value>] : Object | Test.java:118:20:118:31 | map : ImmutableMap [<map.value>] : Object | provenance |  |
-| Test.java:2325:21:2325:23 | out : ImmutableMap [<map.value>] : Object | Test.java:2325:9:2325:24 | getMapValue(...) | provenance | MaD:561 |
+| Test.java:2325:21:2325:23 | out : ImmutableMap [<map.value>] : Object | Test.java:2325:9:2325:24 | getMapValue(...) | provenance | MaD:568 |
 | Test.java:2330:16:2330:31 | (...)... : Object | Test.java:2331:44:2331:45 | in : Object | provenance |  |
 | Test.java:2330:24:2330:31 | source(...) : Object | Test.java:2330:16:2330:31 | (...)... : Object | provenance |  |
 | Test.java:2331:10:2331:58 | of(...) : ImmutableMap [<map.value>] : Object | Test.java:2332:21:2332:23 | out : ImmutableMap [<map.value>] : Object | provenance |  |
-| Test.java:2331:44:2331:45 | in : Object | Test.java:2331:10:2331:58 | of(...) : ImmutableMap [<map.value>] : Object | provenance | MaD:77 |
+| Test.java:2331:44:2331:45 | in : Object | Test.java:2331:10:2331:58 | of(...) : ImmutableMap [<map.value>] : Object | provenance | MaD:90 |
 | Test.java:2332:21:2332:23 | out : ImmutableMap [<map.value>] : Object | Test.java:118:20:118:31 | map : ImmutableMap [<map.value>] : Object | provenance |  |
-| Test.java:2332:21:2332:23 | out : ImmutableMap [<map.value>] : Object | Test.java:2332:9:2332:24 | getMapValue(...) | provenance | MaD:561 |
+| Test.java:2332:21:2332:23 | out : ImmutableMap [<map.value>] : Object | Test.java:2332:9:2332:24 | getMapValue(...) | provenance | MaD:568 |
 | Test.java:2337:16:2337:31 | (...)... : Object | Test.java:2338:44:2338:45 | in : Object | provenance |  |
 | Test.java:2337:24:2337:31 | source(...) : Object | Test.java:2337:16:2337:31 | (...)... : Object | provenance |  |
 | Test.java:2338:10:2338:46 | of(...) : ImmutableMap [<map.value>] : Object | Test.java:2339:21:2339:23 | out : ImmutableMap [<map.value>] : Object | provenance |  |
-| Test.java:2338:44:2338:45 | in : Object | Test.java:2338:10:2338:46 | of(...) : ImmutableMap [<map.value>] : Object | provenance | MaD:77 |
+| Test.java:2338:44:2338:45 | in : Object | Test.java:2338:10:2338:46 | of(...) : ImmutableMap [<map.value>] : Object | provenance | MaD:90 |
 | Test.java:2339:21:2339:23 | out : ImmutableMap [<map.value>] : Object | Test.java:118:20:118:31 | map : ImmutableMap [<map.value>] : Object | provenance |  |
-| Test.java:2339:21:2339:23 | out : ImmutableMap [<map.value>] : Object | Test.java:2339:9:2339:24 | getMapValue(...) | provenance | MaD:561 |
+| Test.java:2339:21:2339:23 | out : ImmutableMap [<map.value>] : Object | Test.java:2339:9:2339:24 | getMapValue(...) | provenance | MaD:568 |
 | Test.java:2344:16:2344:31 | (...)... : Object | Test.java:2345:50:2345:51 | in : Object | provenance |  |
 | Test.java:2344:24:2344:31 | source(...) : Object | Test.java:2344:16:2344:31 | (...)... : Object | provenance |  |
 | Test.java:2345:10:2345:82 | of(...) : ImmutableMap [<map.key>] : Object | Test.java:2346:19:2346:21 | out : ImmutableMap [<map.key>] : Object | provenance |  |
-| Test.java:2345:50:2345:51 | in : Object | Test.java:2345:10:2345:82 | of(...) : ImmutableMap [<map.key>] : Object | provenance | MaD:78 |
+| Test.java:2345:50:2345:51 | in : Object | Test.java:2345:10:2345:82 | of(...) : ImmutableMap [<map.key>] : Object | provenance | MaD:91 |
 | Test.java:2346:19:2346:21 | out : ImmutableMap [<map.key>] : Object | Test.java:99:18:99:29 | map : ImmutableMap [<map.key>] : Object | provenance |  |
-| Test.java:2346:19:2346:21 | out : ImmutableMap [<map.key>] : Object | Test.java:2346:9:2346:22 | getMapKey(...) | provenance | MaD:562 |
+| Test.java:2346:19:2346:21 | out : ImmutableMap [<map.key>] : Object | Test.java:2346:9:2346:22 | getMapKey(...) | provenance | MaD:569 |
 | Test.java:2351:16:2351:31 | (...)... : Object | Test.java:2352:50:2352:51 | in : Object | provenance |  |
 | Test.java:2351:24:2351:31 | source(...) : Object | Test.java:2351:16:2351:31 | (...)... : Object | provenance |  |
 | Test.java:2352:10:2352:70 | of(...) : ImmutableMap [<map.key>] : Object | Test.java:2353:19:2353:21 | out : ImmutableMap [<map.key>] : Object | provenance |  |
-| Test.java:2352:50:2352:51 | in : Object | Test.java:2352:10:2352:70 | of(...) : ImmutableMap [<map.key>] : Object | provenance | MaD:78 |
+| Test.java:2352:50:2352:51 | in : Object | Test.java:2352:10:2352:70 | of(...) : ImmutableMap [<map.key>] : Object | provenance | MaD:91 |
 | Test.java:2353:19:2353:21 | out : ImmutableMap [<map.key>] : Object | Test.java:99:18:99:29 | map : ImmutableMap [<map.key>] : Object | provenance |  |
-| Test.java:2353:19:2353:21 | out : ImmutableMap [<map.key>] : Object | Test.java:2353:9:2353:22 | getMapKey(...) | provenance | MaD:562 |
+| Test.java:2353:19:2353:21 | out : ImmutableMap [<map.key>] : Object | Test.java:2353:9:2353:22 | getMapKey(...) | provenance | MaD:569 |
 | Test.java:2358:16:2358:31 | (...)... : Object | Test.java:2359:50:2359:51 | in : Object | provenance |  |
 | Test.java:2358:24:2358:31 | source(...) : Object | Test.java:2358:16:2358:31 | (...)... : Object | provenance |  |
 | Test.java:2359:10:2359:58 | of(...) : ImmutableMap [<map.key>] : Object | Test.java:2360:19:2360:21 | out : ImmutableMap [<map.key>] : Object | provenance |  |
-| Test.java:2359:50:2359:51 | in : Object | Test.java:2359:10:2359:58 | of(...) : ImmutableMap [<map.key>] : Object | provenance | MaD:78 |
+| Test.java:2359:50:2359:51 | in : Object | Test.java:2359:10:2359:58 | of(...) : ImmutableMap [<map.key>] : Object | provenance | MaD:91 |
 | Test.java:2360:19:2360:21 | out : ImmutableMap [<map.key>] : Object | Test.java:99:18:99:29 | map : ImmutableMap [<map.key>] : Object | provenance |  |
-| Test.java:2360:19:2360:21 | out : ImmutableMap [<map.key>] : Object | Test.java:2360:9:2360:22 | getMapKey(...) | provenance | MaD:562 |
+| Test.java:2360:19:2360:21 | out : ImmutableMap [<map.key>] : Object | Test.java:2360:9:2360:22 | getMapKey(...) | provenance | MaD:569 |
 | Test.java:2365:16:2365:31 | (...)... : Object | Test.java:2366:56:2366:57 | in : Object | provenance |  |
 | Test.java:2365:24:2365:31 | source(...) : Object | Test.java:2365:16:2365:31 | (...)... : Object | provenance |  |
 | Test.java:2366:10:2366:82 | of(...) : ImmutableMap [<map.value>] : Object | Test.java:2367:21:2367:23 | out : ImmutableMap [<map.value>] : Object | provenance |  |
-| Test.java:2366:56:2366:57 | in : Object | Test.java:2366:10:2366:82 | of(...) : ImmutableMap [<map.value>] : Object | provenance | MaD:79 |
+| Test.java:2366:56:2366:57 | in : Object | Test.java:2366:10:2366:82 | of(...) : ImmutableMap [<map.value>] : Object | provenance | MaD:92 |
 | Test.java:2367:21:2367:23 | out : ImmutableMap [<map.value>] : Object | Test.java:118:20:118:31 | map : ImmutableMap [<map.value>] : Object | provenance |  |
-| Test.java:2367:21:2367:23 | out : ImmutableMap [<map.value>] : Object | Test.java:2367:9:2367:24 | getMapValue(...) | provenance | MaD:561 |
+| Test.java:2367:21:2367:23 | out : ImmutableMap [<map.value>] : Object | Test.java:2367:9:2367:24 | getMapValue(...) | provenance | MaD:568 |
 | Test.java:2372:16:2372:31 | (...)... : Object | Test.java:2373:56:2373:57 | in : Object | provenance |  |
 | Test.java:2372:24:2372:31 | source(...) : Object | Test.java:2372:16:2372:31 | (...)... : Object | provenance |  |
 | Test.java:2373:10:2373:70 | of(...) : ImmutableMap [<map.value>] : Object | Test.java:2374:21:2374:23 | out : ImmutableMap [<map.value>] : Object | provenance |  |
-| Test.java:2373:56:2373:57 | in : Object | Test.java:2373:10:2373:70 | of(...) : ImmutableMap [<map.value>] : Object | provenance | MaD:79 |
+| Test.java:2373:56:2373:57 | in : Object | Test.java:2373:10:2373:70 | of(...) : ImmutableMap [<map.value>] : Object | provenance | MaD:92 |
 | Test.java:2374:21:2374:23 | out : ImmutableMap [<map.value>] : Object | Test.java:118:20:118:31 | map : ImmutableMap [<map.value>] : Object | provenance |  |
-| Test.java:2374:21:2374:23 | out : ImmutableMap [<map.value>] : Object | Test.java:2374:9:2374:24 | getMapValue(...) | provenance | MaD:561 |
+| Test.java:2374:21:2374:23 | out : ImmutableMap [<map.value>] : Object | Test.java:2374:9:2374:24 | getMapValue(...) | provenance | MaD:568 |
 | Test.java:2379:16:2379:31 | (...)... : Object | Test.java:2380:56:2380:57 | in : Object | provenance |  |
 | Test.java:2379:24:2379:31 | source(...) : Object | Test.java:2379:16:2379:31 | (...)... : Object | provenance |  |
 | Test.java:2380:10:2380:58 | of(...) : ImmutableMap [<map.value>] : Object | Test.java:2381:21:2381:23 | out : ImmutableMap [<map.value>] : Object | provenance |  |
-| Test.java:2380:56:2380:57 | in : Object | Test.java:2380:10:2380:58 | of(...) : ImmutableMap [<map.value>] : Object | provenance | MaD:79 |
+| Test.java:2380:56:2380:57 | in : Object | Test.java:2380:10:2380:58 | of(...) : ImmutableMap [<map.value>] : Object | provenance | MaD:92 |
 | Test.java:2381:21:2381:23 | out : ImmutableMap [<map.value>] : Object | Test.java:118:20:118:31 | map : ImmutableMap [<map.value>] : Object | provenance |  |
-| Test.java:2381:21:2381:23 | out : ImmutableMap [<map.value>] : Object | Test.java:2381:9:2381:24 | getMapValue(...) | provenance | MaD:561 |
+| Test.java:2381:21:2381:23 | out : ImmutableMap [<map.value>] : Object | Test.java:2381:9:2381:24 | getMapValue(...) | provenance | MaD:568 |
 | Test.java:2386:16:2386:31 | (...)... : Object | Test.java:2387:62:2387:63 | in : Object | provenance |  |
 | Test.java:2386:24:2386:31 | source(...) : Object | Test.java:2386:16:2386:31 | (...)... : Object | provenance |  |
 | Test.java:2387:10:2387:82 | of(...) : ImmutableMap [<map.key>] : Object | Test.java:2388:19:2388:21 | out : ImmutableMap [<map.key>] : Object | provenance |  |
-| Test.java:2387:62:2387:63 | in : Object | Test.java:2387:10:2387:82 | of(...) : ImmutableMap [<map.key>] : Object | provenance | MaD:80 |
+| Test.java:2387:62:2387:63 | in : Object | Test.java:2387:10:2387:82 | of(...) : ImmutableMap [<map.key>] : Object | provenance | MaD:93 |
 | Test.java:2388:19:2388:21 | out : ImmutableMap [<map.key>] : Object | Test.java:99:18:99:29 | map : ImmutableMap [<map.key>] : Object | provenance |  |
-| Test.java:2388:19:2388:21 | out : ImmutableMap [<map.key>] : Object | Test.java:2388:9:2388:22 | getMapKey(...) | provenance | MaD:562 |
+| Test.java:2388:19:2388:21 | out : ImmutableMap [<map.key>] : Object | Test.java:2388:9:2388:22 | getMapKey(...) | provenance | MaD:569 |
 | Test.java:2393:16:2393:31 | (...)... : Object | Test.java:2394:62:2394:63 | in : Object | provenance |  |
 | Test.java:2393:24:2393:31 | source(...) : Object | Test.java:2393:16:2393:31 | (...)... : Object | provenance |  |
 | Test.java:2394:10:2394:70 | of(...) : ImmutableMap [<map.key>] : Object | Test.java:2395:19:2395:21 | out : ImmutableMap [<map.key>] : Object | provenance |  |
-| Test.java:2394:62:2394:63 | in : Object | Test.java:2394:10:2394:70 | of(...) : ImmutableMap [<map.key>] : Object | provenance | MaD:80 |
+| Test.java:2394:62:2394:63 | in : Object | Test.java:2394:10:2394:70 | of(...) : ImmutableMap [<map.key>] : Object | provenance | MaD:93 |
 | Test.java:2395:19:2395:21 | out : ImmutableMap [<map.key>] : Object | Test.java:99:18:99:29 | map : ImmutableMap [<map.key>] : Object | provenance |  |
-| Test.java:2395:19:2395:21 | out : ImmutableMap [<map.key>] : Object | Test.java:2395:9:2395:22 | getMapKey(...) | provenance | MaD:562 |
+| Test.java:2395:19:2395:21 | out : ImmutableMap [<map.key>] : Object | Test.java:2395:9:2395:22 | getMapKey(...) | provenance | MaD:569 |
 | Test.java:2400:16:2400:31 | (...)... : Object | Test.java:2401:68:2401:69 | in : Object | provenance |  |
 | Test.java:2400:24:2400:31 | source(...) : Object | Test.java:2400:16:2400:31 | (...)... : Object | provenance |  |
 | Test.java:2401:10:2401:82 | of(...) : ImmutableMap [<map.value>] : Object | Test.java:2402:21:2402:23 | out : ImmutableMap [<map.value>] : Object | provenance |  |
-| Test.java:2401:68:2401:69 | in : Object | Test.java:2401:10:2401:82 | of(...) : ImmutableMap [<map.value>] : Object | provenance | MaD:81 |
+| Test.java:2401:68:2401:69 | in : Object | Test.java:2401:10:2401:82 | of(...) : ImmutableMap [<map.value>] : Object | provenance | MaD:94 |
 | Test.java:2402:21:2402:23 | out : ImmutableMap [<map.value>] : Object | Test.java:118:20:118:31 | map : ImmutableMap [<map.value>] : Object | provenance |  |
-| Test.java:2402:21:2402:23 | out : ImmutableMap [<map.value>] : Object | Test.java:2402:9:2402:24 | getMapValue(...) | provenance | MaD:561 |
+| Test.java:2402:21:2402:23 | out : ImmutableMap [<map.value>] : Object | Test.java:2402:9:2402:24 | getMapValue(...) | provenance | MaD:568 |
 | Test.java:2407:16:2407:31 | (...)... : Object | Test.java:2408:68:2408:69 | in : Object | provenance |  |
 | Test.java:2407:24:2407:31 | source(...) : Object | Test.java:2407:16:2407:31 | (...)... : Object | provenance |  |
 | Test.java:2408:10:2408:70 | of(...) : ImmutableMap [<map.value>] : Object | Test.java:2409:21:2409:23 | out : ImmutableMap [<map.value>] : Object | provenance |  |
-| Test.java:2408:68:2408:69 | in : Object | Test.java:2408:10:2408:70 | of(...) : ImmutableMap [<map.value>] : Object | provenance | MaD:81 |
+| Test.java:2408:68:2408:69 | in : Object | Test.java:2408:10:2408:70 | of(...) : ImmutableMap [<map.value>] : Object | provenance | MaD:94 |
 | Test.java:2409:21:2409:23 | out : ImmutableMap [<map.value>] : Object | Test.java:118:20:118:31 | map : ImmutableMap [<map.value>] : Object | provenance |  |
-| Test.java:2409:21:2409:23 | out : ImmutableMap [<map.value>] : Object | Test.java:2409:9:2409:24 | getMapValue(...) | provenance | MaD:561 |
+| Test.java:2409:21:2409:23 | out : ImmutableMap [<map.value>] : Object | Test.java:2409:9:2409:24 | getMapValue(...) | provenance | MaD:568 |
 | Test.java:2414:16:2414:31 | (...)... : Object | Test.java:2415:74:2415:75 | in : Object | provenance |  |
 | Test.java:2414:24:2414:31 | source(...) : Object | Test.java:2414:16:2414:31 | (...)... : Object | provenance |  |
 | Test.java:2415:10:2415:82 | of(...) : ImmutableMap [<map.key>] : Object | Test.java:2416:19:2416:21 | out : ImmutableMap [<map.key>] : Object | provenance |  |
-| Test.java:2415:74:2415:75 | in : Object | Test.java:2415:10:2415:82 | of(...) : ImmutableMap [<map.key>] : Object | provenance | MaD:82 |
+| Test.java:2415:74:2415:75 | in : Object | Test.java:2415:10:2415:82 | of(...) : ImmutableMap [<map.key>] : Object | provenance | MaD:95 |
 | Test.java:2416:19:2416:21 | out : ImmutableMap [<map.key>] : Object | Test.java:99:18:99:29 | map : ImmutableMap [<map.key>] : Object | provenance |  |
-| Test.java:2416:19:2416:21 | out : ImmutableMap [<map.key>] : Object | Test.java:2416:9:2416:22 | getMapKey(...) | provenance | MaD:562 |
+| Test.java:2416:19:2416:21 | out : ImmutableMap [<map.key>] : Object | Test.java:2416:9:2416:22 | getMapKey(...) | provenance | MaD:569 |
 | Test.java:2421:16:2421:31 | (...)... : Object | Test.java:2422:80:2422:81 | in : Object | provenance |  |
 | Test.java:2421:24:2421:31 | source(...) : Object | Test.java:2421:16:2421:31 | (...)... : Object | provenance |  |
 | Test.java:2422:10:2422:82 | of(...) : ImmutableMap [<map.value>] : Object | Test.java:2423:21:2423:23 | out : ImmutableMap [<map.value>] : Object | provenance |  |
-| Test.java:2422:80:2422:81 | in : Object | Test.java:2422:10:2422:82 | of(...) : ImmutableMap [<map.value>] : Object | provenance | MaD:83 |
+| Test.java:2422:80:2422:81 | in : Object | Test.java:2422:10:2422:82 | of(...) : ImmutableMap [<map.value>] : Object | provenance | MaD:96 |
 | Test.java:2423:21:2423:23 | out : ImmutableMap [<map.value>] : Object | Test.java:118:20:118:31 | map : ImmutableMap [<map.value>] : Object | provenance |  |
-| Test.java:2423:21:2423:23 | out : ImmutableMap [<map.value>] : Object | Test.java:2423:9:2423:24 | getMapValue(...) | provenance | MaD:561 |
+| Test.java:2423:21:2423:23 | out : ImmutableMap [<map.value>] : Object | Test.java:2423:9:2423:24 | getMapValue(...) | provenance | MaD:568 |
 | Test.java:2428:38:2428:117 | (...)... : Builder [<map.key>] : Object | Test.java:2429:10:2429:11 | in : Builder [<map.key>] : Object | provenance |  |
 | Test.java:2428:68:2428:117 | put(...) : Builder [<map.key>] : Object | Test.java:2428:38:2428:117 | (...)... : Builder [<map.key>] : Object | provenance |  |
-| Test.java:2428:103:2428:110 | source(...) : Object | Test.java:2428:68:2428:117 | put(...) : Builder [<map.key>] : Object | provenance | MaD:120+MaD:117 |
-| Test.java:2429:10:2429:11 | in : Builder [<map.key>] : Object | Test.java:2429:10:2429:19 | build(...) : ImmutableSetMultimap [<map.key>] : Object | provenance | MaD:113 |
+| Test.java:2428:103:2428:110 | source(...) : Object | Test.java:2428:68:2428:117 | put(...) : Builder [<map.key>] : Object | provenance | MaD:103+MaD:105 |
+| Test.java:2429:10:2429:11 | in : Builder [<map.key>] : Object | Test.java:2429:10:2429:19 | build(...) : ImmutableSetMultimap [<map.key>] : Object | provenance | MaD:97 |
 | Test.java:2429:10:2429:19 | build(...) : ImmutableSetMultimap [<map.key>] : Object | Test.java:2430:19:2430:21 | out : ImmutableSetMultimap [<map.key>] : Object | provenance |  |
 | Test.java:2430:19:2430:21 | out : ImmutableSetMultimap [<map.key>] : Object | Test.java:100:18:100:34 | map : ImmutableSetMultimap [<map.key>] : Object | provenance |  |
 | Test.java:2430:19:2430:21 | out : ImmutableSetMultimap [<map.key>] : Object | Test.java:2430:9:2430:22 | getMapKey(...) | provenance | MaD:373 |
 | Test.java:2435:35:2435:108 | (...)... : Builder [<map.key>] : Object | Test.java:2436:10:2436:11 | in : Builder [<map.key>] : Object | provenance |  |
 | Test.java:2435:62:2435:108 | put(...) : Builder [<map.key>] : Object | Test.java:2435:35:2435:108 | (...)... : Builder [<map.key>] : Object | provenance |  |
-| Test.java:2435:94:2435:101 | source(...) : Object | Test.java:2435:62:2435:108 | put(...) : Builder [<map.key>] : Object | provenance | MaD:120+MaD:117 |
-| Test.java:2436:10:2436:11 | in : Builder [<map.key>] : Object | Test.java:2436:10:2436:19 | build(...) : ImmutableMultimap [<map.key>] : Object | provenance | MaD:113 |
+| Test.java:2435:94:2435:101 | source(...) : Object | Test.java:2435:62:2435:108 | put(...) : Builder [<map.key>] : Object | provenance | MaD:103+MaD:105 |
+| Test.java:2436:10:2436:11 | in : Builder [<map.key>] : Object | Test.java:2436:10:2436:19 | build(...) : ImmutableMultimap [<map.key>] : Object | provenance | MaD:97 |
 | Test.java:2436:10:2436:19 | build(...) : ImmutableMultimap [<map.key>] : Object | Test.java:2437:19:2437:21 | out : ImmutableMultimap [<map.key>] : Object | provenance |  |
 | Test.java:2437:19:2437:21 | out : ImmutableMultimap [<map.key>] : Object | Test.java:100:18:100:34 | map : ImmutableMultimap [<map.key>] : Object | provenance |  |
 | Test.java:2437:19:2437:21 | out : ImmutableMultimap [<map.key>] : Object | Test.java:2437:9:2437:22 | getMapKey(...) | provenance | MaD:373 |
 | Test.java:2442:39:2442:120 | (...)... : Builder [<map.key>] : Object | Test.java:2443:10:2443:11 | in : Builder [<map.key>] : Object | provenance |  |
 | Test.java:2442:70:2442:120 | put(...) : Builder [<map.key>] : Object | Test.java:2442:39:2442:120 | (...)... : Builder [<map.key>] : Object | provenance |  |
-| Test.java:2442:106:2442:113 | source(...) : Object | Test.java:2442:70:2442:120 | put(...) : Builder [<map.key>] : Object | provenance | MaD:120+MaD:117 |
-| Test.java:2443:10:2443:11 | in : Builder [<map.key>] : Object | Test.java:2443:10:2443:19 | build(...) : ImmutableListMultimap [<map.key>] : Object | provenance | MaD:113 |
+| Test.java:2442:106:2442:113 | source(...) : Object | Test.java:2442:70:2442:120 | put(...) : Builder [<map.key>] : Object | provenance | MaD:103+MaD:105 |
+| Test.java:2443:10:2443:11 | in : Builder [<map.key>] : Object | Test.java:2443:10:2443:19 | build(...) : ImmutableListMultimap [<map.key>] : Object | provenance | MaD:97 |
 | Test.java:2443:10:2443:19 | build(...) : ImmutableListMultimap [<map.key>] : Object | Test.java:2444:19:2444:21 | out : ImmutableListMultimap [<map.key>] : Object | provenance |  |
 | Test.java:2444:19:2444:21 | out : ImmutableListMultimap [<map.key>] : Object | Test.java:100:18:100:34 | map : ImmutableListMultimap [<map.key>] : Object | provenance |  |
 | Test.java:2444:19:2444:21 | out : ImmutableListMultimap [<map.key>] : Object | Test.java:2444:9:2444:22 | getMapKey(...) | provenance | MaD:373 |
 | Test.java:2449:38:2449:117 | (...)... : Builder [<map.value>] : Object | Test.java:2450:10:2450:11 | in : Builder [<map.value>] : Object | provenance |  |
 | Test.java:2449:68:2449:117 | put(...) : Builder [<map.value>] : Object | Test.java:2449:38:2449:117 | (...)... : Builder [<map.value>] : Object | provenance |  |
-| Test.java:2449:109:2449:116 | source(...) : Object | Test.java:2449:68:2449:117 | put(...) : Builder [<map.value>] : Object | provenance | MaD:121+MaD:117 |
-| Test.java:2450:10:2450:11 | in : Builder [<map.value>] : Object | Test.java:2450:10:2450:19 | build(...) : ImmutableSetMultimap [<map.value>] : Object | provenance | MaD:114 |
+| Test.java:2449:109:2449:116 | source(...) : Object | Test.java:2449:68:2449:117 | put(...) : Builder [<map.value>] : Object | provenance | MaD:104+MaD:105 |
+| Test.java:2450:10:2450:11 | in : Builder [<map.value>] : Object | Test.java:2450:10:2450:19 | build(...) : ImmutableSetMultimap [<map.value>] : Object | provenance | MaD:98 |
 | Test.java:2450:10:2450:19 | build(...) : ImmutableSetMultimap [<map.value>] : Object | Test.java:2451:21:2451:23 | out : ImmutableSetMultimap [<map.value>] : Object | provenance |  |
 | Test.java:2451:21:2451:23 | out : ImmutableSetMultimap [<map.value>] : Object | Test.java:119:20:119:36 | map : ImmutableSetMultimap [<map.value>] : Object | provenance |  |
 | Test.java:2451:21:2451:23 | out : ImmutableSetMultimap [<map.value>] : Object | Test.java:2451:9:2451:24 | getMapValue(...) | provenance | MaD:385 |
 | Test.java:2456:35:2456:108 | (...)... : Builder [<map.value>] : Object | Test.java:2457:10:2457:11 | in : Builder [<map.value>] : Object | provenance |  |
 | Test.java:2456:62:2456:108 | put(...) : Builder [<map.value>] : Object | Test.java:2456:35:2456:108 | (...)... : Builder [<map.value>] : Object | provenance |  |
-| Test.java:2456:100:2456:107 | source(...) : Object | Test.java:2456:62:2456:108 | put(...) : Builder [<map.value>] : Object | provenance | MaD:121+MaD:117 |
-| Test.java:2457:10:2457:11 | in : Builder [<map.value>] : Object | Test.java:2457:10:2457:19 | build(...) : ImmutableMultimap [<map.value>] : Object | provenance | MaD:114 |
+| Test.java:2456:100:2456:107 | source(...) : Object | Test.java:2456:62:2456:108 | put(...) : Builder [<map.value>] : Object | provenance | MaD:104+MaD:105 |
+| Test.java:2457:10:2457:11 | in : Builder [<map.value>] : Object | Test.java:2457:10:2457:19 | build(...) : ImmutableMultimap [<map.value>] : Object | provenance | MaD:98 |
 | Test.java:2457:10:2457:19 | build(...) : ImmutableMultimap [<map.value>] : Object | Test.java:2458:21:2458:23 | out : ImmutableMultimap [<map.value>] : Object | provenance |  |
 | Test.java:2458:21:2458:23 | out : ImmutableMultimap [<map.value>] : Object | Test.java:119:20:119:36 | map : ImmutableMultimap [<map.value>] : Object | provenance |  |
 | Test.java:2458:21:2458:23 | out : ImmutableMultimap [<map.value>] : Object | Test.java:2458:9:2458:24 | getMapValue(...) | provenance | MaD:385 |
 | Test.java:2463:39:2463:120 | (...)... : Builder [<map.value>] : Object | Test.java:2464:10:2464:11 | in : Builder [<map.value>] : Object | provenance |  |
 | Test.java:2463:70:2463:120 | put(...) : Builder [<map.value>] : Object | Test.java:2463:39:2463:120 | (...)... : Builder [<map.value>] : Object | provenance |  |
-| Test.java:2463:112:2463:119 | source(...) : Object | Test.java:2463:70:2463:120 | put(...) : Builder [<map.value>] : Object | provenance | MaD:121+MaD:117 |
-| Test.java:2464:10:2464:11 | in : Builder [<map.value>] : Object | Test.java:2464:10:2464:19 | build(...) : ImmutableListMultimap [<map.value>] : Object | provenance | MaD:114 |
+| Test.java:2463:112:2463:119 | source(...) : Object | Test.java:2463:70:2463:120 | put(...) : Builder [<map.value>] : Object | provenance | MaD:104+MaD:105 |
+| Test.java:2464:10:2464:11 | in : Builder [<map.value>] : Object | Test.java:2464:10:2464:19 | build(...) : ImmutableListMultimap [<map.value>] : Object | provenance | MaD:98 |
 | Test.java:2464:10:2464:19 | build(...) : ImmutableListMultimap [<map.value>] : Object | Test.java:2465:21:2465:23 | out : ImmutableListMultimap [<map.value>] : Object | provenance |  |
 | Test.java:2465:21:2465:23 | out : ImmutableListMultimap [<map.value>] : Object | Test.java:119:20:119:36 | map : ImmutableListMultimap [<map.value>] : Object | provenance |  |
 | Test.java:2465:21:2465:23 | out : ImmutableListMultimap [<map.value>] : Object | Test.java:2465:9:2465:24 | getMapValue(...) | provenance | MaD:385 |
 | Test.java:2470:38:2470:75 | (...)... : Builder | Test.java:2471:10:2471:11 | in : Builder | provenance |  |
 | Test.java:2470:68:2470:75 | source(...) : Object | Test.java:2470:38:2470:75 | (...)... : Builder | provenance |  |
-| Test.java:2471:10:2471:11 | in : Builder | Test.java:2471:10:2471:29 | orderKeysBy(...) : Builder | provenance | MaD:115 |
+| Test.java:2471:10:2471:11 | in : Builder | Test.java:2471:10:2471:29 | orderKeysBy(...) : Builder | provenance | MaD:99 |
 | Test.java:2471:10:2471:29 | orderKeysBy(...) : Builder | Test.java:2472:9:2472:11 | out | provenance |  |
 | Test.java:2477:35:2477:69 | (...)... : Builder | Test.java:2478:10:2478:11 | in : Builder | provenance |  |
 | Test.java:2477:62:2477:69 | source(...) : Object | Test.java:2477:35:2477:69 | (...)... : Builder | provenance |  |
-| Test.java:2478:10:2478:11 | in : Builder | Test.java:2478:10:2478:29 | orderKeysBy(...) : Builder | provenance | MaD:115 |
+| Test.java:2478:10:2478:11 | in : Builder | Test.java:2478:10:2478:29 | orderKeysBy(...) : Builder | provenance | MaD:99 |
 | Test.java:2478:10:2478:29 | orderKeysBy(...) : Builder | Test.java:2479:9:2479:11 | out | provenance |  |
 | Test.java:2484:39:2484:77 | (...)... : Builder | Test.java:2485:10:2485:11 | in : Builder | provenance |  |
 | Test.java:2484:70:2484:77 | source(...) : Object | Test.java:2484:39:2484:77 | (...)... : Builder | provenance |  |
-| Test.java:2485:10:2485:11 | in : Builder | Test.java:2485:10:2485:29 | orderKeysBy(...) : Builder | provenance | MaD:115 |
+| Test.java:2485:10:2485:11 | in : Builder | Test.java:2485:10:2485:29 | orderKeysBy(...) : Builder | provenance | MaD:99 |
 | Test.java:2485:10:2485:29 | orderKeysBy(...) : Builder | Test.java:2486:9:2486:11 | out | provenance |  |
 | Test.java:2491:38:2491:75 | (...)... : Builder | Test.java:2492:10:2492:11 | in : Builder | provenance |  |
 | Test.java:2491:68:2491:75 | source(...) : Object | Test.java:2491:38:2491:75 | (...)... : Builder | provenance |  |
-| Test.java:2492:10:2492:11 | in : Builder | Test.java:2492:10:2492:31 | orderValuesBy(...) : Builder | provenance | MaD:116 |
+| Test.java:2492:10:2492:11 | in : Builder | Test.java:2492:10:2492:31 | orderValuesBy(...) : Builder | provenance | MaD:100 |
 | Test.java:2492:10:2492:31 | orderValuesBy(...) : Builder | Test.java:2493:9:2493:11 | out | provenance |  |
 | Test.java:2498:35:2498:69 | (...)... : Builder | Test.java:2499:10:2499:11 | in : Builder | provenance |  |
 | Test.java:2498:62:2498:69 | source(...) : Object | Test.java:2498:35:2498:69 | (...)... : Builder | provenance |  |
-| Test.java:2499:10:2499:11 | in : Builder | Test.java:2499:10:2499:31 | orderValuesBy(...) : Builder | provenance | MaD:116 |
+| Test.java:2499:10:2499:11 | in : Builder | Test.java:2499:10:2499:31 | orderValuesBy(...) : Builder | provenance | MaD:100 |
 | Test.java:2499:10:2499:31 | orderValuesBy(...) : Builder | Test.java:2500:9:2500:11 | out | provenance |  |
 | Test.java:2505:39:2505:77 | (...)... : Builder | Test.java:2506:10:2506:11 | in : Builder | provenance |  |
 | Test.java:2505:70:2505:77 | source(...) : Object | Test.java:2505:39:2505:77 | (...)... : Builder | provenance |  |
-| Test.java:2506:10:2506:11 | in : Builder | Test.java:2506:10:2506:31 | orderValuesBy(...) : Builder | provenance | MaD:116 |
+| Test.java:2506:10:2506:11 | in : Builder | Test.java:2506:10:2506:31 | orderValuesBy(...) : Builder | provenance | MaD:100 |
 | Test.java:2506:10:2506:31 | orderValuesBy(...) : Builder | Test.java:2507:9:2507:11 | out | provenance |  |
 | Test.java:2512:19:2512:57 | (...)... : Entry [<map.key>] : Object | Test.java:2513:12:2513:13 | in : Entry [<map.key>] : Object | provenance |  |
 | Test.java:2512:30:2512:57 | newEntryWithMapKey(...) : Entry [<map.key>] : Object | Test.java:2512:19:2512:57 | (...)... : Entry [<map.key>] : Object | provenance |  |
 | Test.java:2512:49:2512:56 | source(...) : Object | Test.java:101:40:101:44 | key : Object | provenance |  |
-| Test.java:2512:49:2512:56 | source(...) : Object | Test.java:2512:30:2512:57 | newEntryWithMapKey(...) : Entry [<map.key>] : Object | provenance | MaD:563 |
+| Test.java:2512:49:2512:56 | source(...) : Object | Test.java:2512:30:2512:57 | newEntryWithMapKey(...) : Entry [<map.key>] : Object | provenance | MaD:564 |
 | Test.java:2513:4:2513:6 | out [post update] : Builder [<map.key>] : Object | Test.java:2514:19:2514:21 | out : Builder [<map.key>] : Object | provenance |  |
-| Test.java:2513:12:2513:13 | in : Entry [<map.key>] : Object | Test.java:2513:4:2513:6 | out [post update] : Builder [<map.key>] : Object | provenance | MaD:118 |
+| Test.java:2513:12:2513:13 | in : Entry [<map.key>] : Object | Test.java:2513:4:2513:6 | out [post update] : Builder [<map.key>] : Object | provenance | MaD:101 |
 | Test.java:2514:19:2514:21 | out : Builder [<map.key>] : Object | Test.java:98:18:98:49 | b : Builder [<map.key>] : Object | provenance |  |
-| Test.java:2514:19:2514:21 | out : Builder [<map.key>] : Object | Test.java:2514:9:2514:22 | getMapKey(...) | provenance | MaD:113 |
+| Test.java:2514:19:2514:21 | out : Builder [<map.key>] : Object | Test.java:2514:9:2514:22 | getMapKey(...) | provenance | MaD:97 |
 | Test.java:2519:19:2519:57 | (...)... : Entry [<map.key>] : Object | Test.java:2520:12:2520:13 | in : Entry [<map.key>] : Object | provenance |  |
 | Test.java:2519:30:2519:57 | newEntryWithMapKey(...) : Entry [<map.key>] : Object | Test.java:2519:19:2519:57 | (...)... : Entry [<map.key>] : Object | provenance |  |
 | Test.java:2519:49:2519:56 | source(...) : Object | Test.java:101:40:101:44 | key : Object | provenance |  |
-| Test.java:2519:49:2519:56 | source(...) : Object | Test.java:2519:30:2519:57 | newEntryWithMapKey(...) : Entry [<map.key>] : Object | provenance | MaD:563 |
+| Test.java:2519:49:2519:56 | source(...) : Object | Test.java:2519:30:2519:57 | newEntryWithMapKey(...) : Entry [<map.key>] : Object | provenance | MaD:564 |
 | Test.java:2520:4:2520:6 | out [post update] : Builder [<map.key>] : Object | Test.java:2521:19:2521:21 | out : Builder [<map.key>] : Object | provenance |  |
-| Test.java:2520:12:2520:13 | in : Entry [<map.key>] : Object | Test.java:2520:4:2520:6 | out [post update] : Builder [<map.key>] : Object | provenance | MaD:118 |
+| Test.java:2520:12:2520:13 | in : Entry [<map.key>] : Object | Test.java:2520:4:2520:6 | out [post update] : Builder [<map.key>] : Object | provenance | MaD:101 |
 | Test.java:2521:19:2521:21 | out : Builder [<map.key>] : Object | Test.java:98:18:98:49 | b : Builder [<map.key>] : Object | provenance |  |
-| Test.java:2521:19:2521:21 | out : Builder [<map.key>] : Object | Test.java:2521:9:2521:22 | getMapKey(...) | provenance | MaD:113 |
+| Test.java:2521:19:2521:21 | out : Builder [<map.key>] : Object | Test.java:2521:9:2521:22 | getMapKey(...) | provenance | MaD:97 |
 | Test.java:2526:19:2526:57 | (...)... : Entry [<map.key>] : Object | Test.java:2527:12:2527:13 | in : Entry [<map.key>] : Object | provenance |  |
 | Test.java:2526:30:2526:57 | newEntryWithMapKey(...) : Entry [<map.key>] : Object | Test.java:2526:19:2526:57 | (...)... : Entry [<map.key>] : Object | provenance |  |
 | Test.java:2526:49:2526:56 | source(...) : Object | Test.java:101:40:101:44 | key : Object | provenance |  |
-| Test.java:2526:49:2526:56 | source(...) : Object | Test.java:2526:30:2526:57 | newEntryWithMapKey(...) : Entry [<map.key>] : Object | provenance | MaD:563 |
+| Test.java:2526:49:2526:56 | source(...) : Object | Test.java:2526:30:2526:57 | newEntryWithMapKey(...) : Entry [<map.key>] : Object | provenance | MaD:564 |
 | Test.java:2527:4:2527:6 | out [post update] : Builder [<map.key>] : Object | Test.java:2528:19:2528:21 | out : Builder [<map.key>] : Object | provenance |  |
-| Test.java:2527:12:2527:13 | in : Entry [<map.key>] : Object | Test.java:2527:4:2527:6 | out [post update] : Builder [<map.key>] : Object | provenance | MaD:118 |
+| Test.java:2527:12:2527:13 | in : Entry [<map.key>] : Object | Test.java:2527:4:2527:6 | out [post update] : Builder [<map.key>] : Object | provenance | MaD:101 |
 | Test.java:2528:19:2528:21 | out : Builder [<map.key>] : Object | Test.java:98:18:98:49 | b : Builder [<map.key>] : Object | provenance |  |
-| Test.java:2528:19:2528:21 | out : Builder [<map.key>] : Object | Test.java:2528:9:2528:22 | getMapKey(...) | provenance | MaD:113 |
+| Test.java:2528:19:2528:21 | out : Builder [<map.key>] : Object | Test.java:2528:9:2528:22 | getMapKey(...) | provenance | MaD:97 |
 | Test.java:2533:19:2533:59 | (...)... : Entry [<map.value>] : Object | Test.java:2534:12:2534:13 | in : Entry [<map.value>] : Object | provenance |  |
 | Test.java:2533:30:2533:59 | newEntryWithMapValue(...) : Entry [<map.value>] : Object | Test.java:2533:19:2533:59 | (...)... : Entry [<map.value>] : Object | provenance |  |
 | Test.java:2533:51:2533:58 | source(...) : Object | Test.java:113:42:113:48 | value : Object | provenance |  |
-| Test.java:2533:51:2533:58 | source(...) : Object | Test.java:2533:30:2533:59 | newEntryWithMapValue(...) : Entry [<map.value>] : Object | provenance | MaD:564 |
+| Test.java:2533:51:2533:58 | source(...) : Object | Test.java:2533:30:2533:59 | newEntryWithMapValue(...) : Entry [<map.value>] : Object | provenance | MaD:565 |
 | Test.java:2534:4:2534:6 | out [post update] : Builder [<map.value>] : Object | Test.java:2535:21:2535:23 | out : Builder [<map.value>] : Object | provenance |  |
-| Test.java:2534:12:2534:13 | in : Entry [<map.value>] : Object | Test.java:2534:4:2534:6 | out [post update] : Builder [<map.value>] : Object | provenance | MaD:119 |
+| Test.java:2534:12:2534:13 | in : Entry [<map.value>] : Object | Test.java:2534:4:2534:6 | out [post update] : Builder [<map.value>] : Object | provenance | MaD:102 |
 | Test.java:2535:21:2535:23 | out : Builder [<map.value>] : Object | Test.java:116:20:116:51 | b : Builder [<map.value>] : Object | provenance |  |
-| Test.java:2535:21:2535:23 | out : Builder [<map.value>] : Object | Test.java:2535:9:2535:24 | getMapValue(...) | provenance | MaD:114 |
+| Test.java:2535:21:2535:23 | out : Builder [<map.value>] : Object | Test.java:2535:9:2535:24 | getMapValue(...) | provenance | MaD:98 |
 | Test.java:2540:19:2540:59 | (...)... : Entry [<map.value>] : Object | Test.java:2541:12:2541:13 | in : Entry [<map.value>] : Object | provenance |  |
 | Test.java:2540:30:2540:59 | newEntryWithMapValue(...) : Entry [<map.value>] : Object | Test.java:2540:19:2540:59 | (...)... : Entry [<map.value>] : Object | provenance |  |
 | Test.java:2540:51:2540:58 | source(...) : Object | Test.java:113:42:113:48 | value : Object | provenance |  |
-| Test.java:2540:51:2540:58 | source(...) : Object | Test.java:2540:30:2540:59 | newEntryWithMapValue(...) : Entry [<map.value>] : Object | provenance | MaD:564 |
+| Test.java:2540:51:2540:58 | source(...) : Object | Test.java:2540:30:2540:59 | newEntryWithMapValue(...) : Entry [<map.value>] : Object | provenance | MaD:565 |
 | Test.java:2541:4:2541:6 | out [post update] : Builder [<map.value>] : Object | Test.java:2542:21:2542:23 | out : Builder [<map.value>] : Object | provenance |  |
-| Test.java:2541:12:2541:13 | in : Entry [<map.value>] : Object | Test.java:2541:4:2541:6 | out [post update] : Builder [<map.value>] : Object | provenance | MaD:119 |
+| Test.java:2541:12:2541:13 | in : Entry [<map.value>] : Object | Test.java:2541:4:2541:6 | out [post update] : Builder [<map.value>] : Object | provenance | MaD:102 |
 | Test.java:2542:21:2542:23 | out : Builder [<map.value>] : Object | Test.java:116:20:116:51 | b : Builder [<map.value>] : Object | provenance |  |
-| Test.java:2542:21:2542:23 | out : Builder [<map.value>] : Object | Test.java:2542:9:2542:24 | getMapValue(...) | provenance | MaD:114 |
+| Test.java:2542:21:2542:23 | out : Builder [<map.value>] : Object | Test.java:2542:9:2542:24 | getMapValue(...) | provenance | MaD:98 |
 | Test.java:2547:19:2547:59 | (...)... : Entry [<map.value>] : Object | Test.java:2548:12:2548:13 | in : Entry [<map.value>] : Object | provenance |  |
 | Test.java:2547:30:2547:59 | newEntryWithMapValue(...) : Entry [<map.value>] : Object | Test.java:2547:19:2547:59 | (...)... : Entry [<map.value>] : Object | provenance |  |
 | Test.java:2547:51:2547:58 | source(...) : Object | Test.java:113:42:113:48 | value : Object | provenance |  |
-| Test.java:2547:51:2547:58 | source(...) : Object | Test.java:2547:30:2547:59 | newEntryWithMapValue(...) : Entry [<map.value>] : Object | provenance | MaD:564 |
+| Test.java:2547:51:2547:58 | source(...) : Object | Test.java:2547:30:2547:59 | newEntryWithMapValue(...) : Entry [<map.value>] : Object | provenance | MaD:565 |
 | Test.java:2548:4:2548:6 | out [post update] : Builder [<map.value>] : Object | Test.java:2549:21:2549:23 | out : Builder [<map.value>] : Object | provenance |  |
-| Test.java:2548:12:2548:13 | in : Entry [<map.value>] : Object | Test.java:2548:4:2548:6 | out [post update] : Builder [<map.value>] : Object | provenance | MaD:119 |
+| Test.java:2548:12:2548:13 | in : Entry [<map.value>] : Object | Test.java:2548:4:2548:6 | out [post update] : Builder [<map.value>] : Object | provenance | MaD:102 |
 | Test.java:2549:21:2549:23 | out : Builder [<map.value>] : Object | Test.java:116:20:116:51 | b : Builder [<map.value>] : Object | provenance |  |
-| Test.java:2549:21:2549:23 | out : Builder [<map.value>] : Object | Test.java:2549:9:2549:24 | getMapValue(...) | provenance | MaD:114 |
+| Test.java:2549:21:2549:23 | out : Builder [<map.value>] : Object | Test.java:2549:9:2549:24 | getMapValue(...) | provenance | MaD:98 |
 | Test.java:2554:16:2554:31 | (...)... : Object | Test.java:2555:12:2555:13 | in : Object | provenance |  |
 | Test.java:2554:24:2554:31 | source(...) : Object | Test.java:2554:16:2554:31 | (...)... : Object | provenance |  |
 | Test.java:2555:4:2555:6 | out [post update] : Builder [<map.key>] : Object | Test.java:2556:19:2556:21 | out : Builder [<map.key>] : Object | provenance |  |
-| Test.java:2555:12:2555:13 | in : Object | Test.java:2555:4:2555:6 | out [post update] : Builder [<map.key>] : Object | provenance | MaD:120 |
+| Test.java:2555:12:2555:13 | in : Object | Test.java:2555:4:2555:6 | out [post update] : Builder [<map.key>] : Object | provenance | MaD:103 |
 | Test.java:2556:19:2556:21 | out : Builder [<map.key>] : Object | Test.java:98:18:98:49 | b : Builder [<map.key>] : Object | provenance |  |
-| Test.java:2556:19:2556:21 | out : Builder [<map.key>] : Object | Test.java:2556:9:2556:22 | getMapKey(...) | provenance | MaD:113 |
+| Test.java:2556:19:2556:21 | out : Builder [<map.key>] : Object | Test.java:2556:9:2556:22 | getMapKey(...) | provenance | MaD:97 |
 | Test.java:2561:16:2561:31 | (...)... : Object | Test.java:2562:12:2562:13 | in : Object | provenance |  |
 | Test.java:2561:24:2561:31 | source(...) : Object | Test.java:2561:16:2561:31 | (...)... : Object | provenance |  |
 | Test.java:2562:4:2562:6 | out [post update] : Builder [<map.key>] : Object | Test.java:2563:19:2563:21 | out : Builder [<map.key>] : Object | provenance |  |
-| Test.java:2562:12:2562:13 | in : Object | Test.java:2562:4:2562:6 | out [post update] : Builder [<map.key>] : Object | provenance | MaD:120 |
+| Test.java:2562:12:2562:13 | in : Object | Test.java:2562:4:2562:6 | out [post update] : Builder [<map.key>] : Object | provenance | MaD:103 |
 | Test.java:2563:19:2563:21 | out : Builder [<map.key>] : Object | Test.java:98:18:98:49 | b : Builder [<map.key>] : Object | provenance |  |
-| Test.java:2563:19:2563:21 | out : Builder [<map.key>] : Object | Test.java:2563:9:2563:22 | getMapKey(...) | provenance | MaD:113 |
+| Test.java:2563:19:2563:21 | out : Builder [<map.key>] : Object | Test.java:2563:9:2563:22 | getMapKey(...) | provenance | MaD:97 |
 | Test.java:2568:16:2568:31 | (...)... : Object | Test.java:2569:12:2569:13 | in : Object | provenance |  |
 | Test.java:2568:24:2568:31 | source(...) : Object | Test.java:2568:16:2568:31 | (...)... : Object | provenance |  |
 | Test.java:2569:4:2569:6 | out [post update] : Builder [<map.key>] : Object | Test.java:2570:19:2570:21 | out : Builder [<map.key>] : Object | provenance |  |
-| Test.java:2569:12:2569:13 | in : Object | Test.java:2569:4:2569:6 | out [post update] : Builder [<map.key>] : Object | provenance | MaD:120 |
+| Test.java:2569:12:2569:13 | in : Object | Test.java:2569:4:2569:6 | out [post update] : Builder [<map.key>] : Object | provenance | MaD:103 |
 | Test.java:2570:19:2570:21 | out : Builder [<map.key>] : Object | Test.java:98:18:98:49 | b : Builder [<map.key>] : Object | provenance |  |
-| Test.java:2570:19:2570:21 | out : Builder [<map.key>] : Object | Test.java:2570:9:2570:22 | getMapKey(...) | provenance | MaD:113 |
+| Test.java:2570:19:2570:21 | out : Builder [<map.key>] : Object | Test.java:2570:9:2570:22 | getMapKey(...) | provenance | MaD:97 |
 | Test.java:2575:16:2575:31 | (...)... : Object | Test.java:2576:18:2576:19 | in : Object | provenance |  |
 | Test.java:2575:24:2575:31 | source(...) : Object | Test.java:2575:16:2575:31 | (...)... : Object | provenance |  |
 | Test.java:2576:4:2576:6 | out [post update] : Builder [<map.value>] : Object | Test.java:2577:21:2577:23 | out : Builder [<map.value>] : Object | provenance |  |
-| Test.java:2576:18:2576:19 | in : Object | Test.java:2576:4:2576:6 | out [post update] : Builder [<map.value>] : Object | provenance | MaD:121 |
+| Test.java:2576:18:2576:19 | in : Object | Test.java:2576:4:2576:6 | out [post update] : Builder [<map.value>] : Object | provenance | MaD:104 |
 | Test.java:2577:21:2577:23 | out : Builder [<map.value>] : Object | Test.java:116:20:116:51 | b : Builder [<map.value>] : Object | provenance |  |
-| Test.java:2577:21:2577:23 | out : Builder [<map.value>] : Object | Test.java:2577:9:2577:24 | getMapValue(...) | provenance | MaD:114 |
+| Test.java:2577:21:2577:23 | out : Builder [<map.value>] : Object | Test.java:2577:9:2577:24 | getMapValue(...) | provenance | MaD:98 |
 | Test.java:2582:16:2582:31 | (...)... : Object | Test.java:2583:18:2583:19 | in : Object | provenance |  |
 | Test.java:2582:24:2582:31 | source(...) : Object | Test.java:2582:16:2582:31 | (...)... : Object | provenance |  |
 | Test.java:2583:4:2583:6 | out [post update] : Builder [<map.value>] : Object | Test.java:2584:21:2584:23 | out : Builder [<map.value>] : Object | provenance |  |
-| Test.java:2583:18:2583:19 | in : Object | Test.java:2583:4:2583:6 | out [post update] : Builder [<map.value>] : Object | provenance | MaD:121 |
+| Test.java:2583:18:2583:19 | in : Object | Test.java:2583:4:2583:6 | out [post update] : Builder [<map.value>] : Object | provenance | MaD:104 |
 | Test.java:2584:21:2584:23 | out : Builder [<map.value>] : Object | Test.java:116:20:116:51 | b : Builder [<map.value>] : Object | provenance |  |
-| Test.java:2584:21:2584:23 | out : Builder [<map.value>] : Object | Test.java:2584:9:2584:24 | getMapValue(...) | provenance | MaD:114 |
+| Test.java:2584:21:2584:23 | out : Builder [<map.value>] : Object | Test.java:2584:9:2584:24 | getMapValue(...) | provenance | MaD:98 |
 | Test.java:2589:16:2589:31 | (...)... : Object | Test.java:2590:18:2590:19 | in : Object | provenance |  |
 | Test.java:2589:24:2589:31 | source(...) : Object | Test.java:2589:16:2589:31 | (...)... : Object | provenance |  |
 | Test.java:2590:4:2590:6 | out [post update] : Builder [<map.value>] : Object | Test.java:2591:21:2591:23 | out : Builder [<map.value>] : Object | provenance |  |
-| Test.java:2590:18:2590:19 | in : Object | Test.java:2590:4:2590:6 | out [post update] : Builder [<map.value>] : Object | provenance | MaD:121 |
+| Test.java:2590:18:2590:19 | in : Object | Test.java:2590:4:2590:6 | out [post update] : Builder [<map.value>] : Object | provenance | MaD:104 |
 | Test.java:2591:21:2591:23 | out : Builder [<map.value>] : Object | Test.java:116:20:116:51 | b : Builder [<map.value>] : Object | provenance |  |
-| Test.java:2591:21:2591:23 | out : Builder [<map.value>] : Object | Test.java:2591:9:2591:24 | getMapValue(...) | provenance | MaD:114 |
+| Test.java:2591:21:2591:23 | out : Builder [<map.value>] : Object | Test.java:2591:9:2591:24 | getMapValue(...) | provenance | MaD:98 |
 | Test.java:2596:38:2596:75 | (...)... : Builder | Test.java:2597:10:2597:11 | in : Builder | provenance |  |
 | Test.java:2596:68:2596:75 | source(...) : Object | Test.java:2596:38:2596:75 | (...)... : Builder | provenance |  |
-| Test.java:2597:10:2597:11 | in : Builder | Test.java:2597:10:2597:27 | put(...) : Builder | provenance | MaD:117 |
+| Test.java:2597:10:2597:11 | in : Builder | Test.java:2597:10:2597:27 | put(...) : Builder | provenance | MaD:105 |
 | Test.java:2597:10:2597:27 | put(...) : Builder | Test.java:2598:9:2598:11 | out | provenance |  |
 | Test.java:2603:38:2603:75 | (...)... : Builder | Test.java:2604:10:2604:11 | in : Builder | provenance |  |
 | Test.java:2603:68:2603:75 | source(...) : Object | Test.java:2603:38:2603:75 | (...)... : Builder | provenance |  |
-| Test.java:2604:10:2604:11 | in : Builder | Test.java:2604:10:2604:21 | put(...) : Builder | provenance | MaD:117 |
+| Test.java:2604:10:2604:11 | in : Builder | Test.java:2604:10:2604:21 | put(...) : Builder | provenance | MaD:105 |
 | Test.java:2604:10:2604:21 | put(...) : Builder | Test.java:2605:9:2605:11 | out | provenance |  |
 | Test.java:2610:35:2610:69 | (...)... : Builder | Test.java:2611:10:2611:11 | in : Builder | provenance |  |
 | Test.java:2610:62:2610:69 | source(...) : Object | Test.java:2610:35:2610:69 | (...)... : Builder | provenance |  |
-| Test.java:2611:10:2611:11 | in : Builder | Test.java:2611:10:2611:27 | put(...) : Builder | provenance | MaD:117 |
+| Test.java:2611:10:2611:11 | in : Builder | Test.java:2611:10:2611:27 | put(...) : Builder | provenance | MaD:105 |
 | Test.java:2611:10:2611:27 | put(...) : Builder | Test.java:2612:9:2612:11 | out | provenance |  |
 | Test.java:2617:35:2617:69 | (...)... : Builder | Test.java:2618:10:2618:11 | in : Builder | provenance |  |
 | Test.java:2617:62:2617:69 | source(...) : Object | Test.java:2617:35:2617:69 | (...)... : Builder | provenance |  |
-| Test.java:2618:10:2618:11 | in : Builder | Test.java:2618:10:2618:21 | put(...) : Builder | provenance | MaD:117 |
+| Test.java:2618:10:2618:11 | in : Builder | Test.java:2618:10:2618:21 | put(...) : Builder | provenance | MaD:105 |
 | Test.java:2618:10:2618:21 | put(...) : Builder | Test.java:2619:9:2619:11 | out | provenance |  |
 | Test.java:2624:39:2624:77 | (...)... : Builder | Test.java:2625:10:2625:11 | in : Builder | provenance |  |
 | Test.java:2624:70:2624:77 | source(...) : Object | Test.java:2624:39:2624:77 | (...)... : Builder | provenance |  |
-| Test.java:2625:10:2625:11 | in : Builder | Test.java:2625:10:2625:27 | put(...) : Builder | provenance | MaD:117 |
+| Test.java:2625:10:2625:11 | in : Builder | Test.java:2625:10:2625:27 | put(...) : Builder | provenance | MaD:105 |
 | Test.java:2625:10:2625:27 | put(...) : Builder | Test.java:2626:9:2626:11 | out | provenance |  |
 | Test.java:2631:39:2631:77 | (...)... : Builder | Test.java:2632:10:2632:11 | in : Builder | provenance |  |
 | Test.java:2631:70:2631:77 | source(...) : Object | Test.java:2631:39:2631:77 | (...)... : Builder | provenance |  |
-| Test.java:2632:10:2632:11 | in : Builder | Test.java:2632:10:2632:21 | put(...) : Builder | provenance | MaD:117 |
+| Test.java:2632:10:2632:11 | in : Builder | Test.java:2632:10:2632:21 | put(...) : Builder | provenance | MaD:105 |
 | Test.java:2632:10:2632:21 | put(...) : Builder | Test.java:2633:9:2633:11 | out | provenance |  |
 | Test.java:2638:18:2638:64 | (...)... : List [<element>, <map.key>] : Object | Test.java:2639:15:2639:16 | in : List [<element>, <map.key>] : Object | provenance |  |
 | Test.java:2638:28:2638:64 | of(...) : List [<element>, <map.key>] : Object | Test.java:2638:18:2638:64 | (...)... : List [<element>, <map.key>] : Object | provenance |  |
-| Test.java:2638:36:2638:63 | newEntryWithMapKey(...) : Entry [<map.key>] : Object | Test.java:2638:28:2638:64 | of(...) : List [<element>, <map.key>] : Object | provenance | MaD:558 |
+| Test.java:2638:36:2638:63 | newEntryWithMapKey(...) : Entry [<map.key>] : Object | Test.java:2638:28:2638:64 | of(...) : List [<element>, <map.key>] : Object | provenance | MaD:561 |
 | Test.java:2638:55:2638:62 | source(...) : Object | Test.java:101:40:101:44 | key : Object | provenance |  |
-| Test.java:2638:55:2638:62 | source(...) : Object | Test.java:2638:36:2638:63 | newEntryWithMapKey(...) : Entry [<map.key>] : Object | provenance | MaD:563 |
+| Test.java:2638:55:2638:62 | source(...) : Object | Test.java:2638:36:2638:63 | newEntryWithMapKey(...) : Entry [<map.key>] : Object | provenance | MaD:564 |
 | Test.java:2639:4:2639:6 | out [post update] : Builder [<map.key>] : Object | Test.java:2640:19:2640:21 | out : Builder [<map.key>] : Object | provenance |  |
-| Test.java:2639:15:2639:16 | in : List [<element>, <map.key>] : Object | Test.java:2639:4:2639:6 | out [post update] : Builder [<map.key>] : Object | provenance | MaD:123 |
+| Test.java:2639:15:2639:16 | in : List [<element>, <map.key>] : Object | Test.java:2639:4:2639:6 | out [post update] : Builder [<map.key>] : Object | provenance | MaD:106 |
 | Test.java:2640:19:2640:21 | out : Builder [<map.key>] : Object | Test.java:98:18:98:49 | b : Builder [<map.key>] : Object | provenance |  |
-| Test.java:2640:19:2640:21 | out : Builder [<map.key>] : Object | Test.java:2640:9:2640:22 | getMapKey(...) | provenance | MaD:113 |
+| Test.java:2640:19:2640:21 | out : Builder [<map.key>] : Object | Test.java:2640:9:2640:22 | getMapKey(...) | provenance | MaD:97 |
 | Test.java:2645:18:2645:64 | (...)... : List [<element>, <map.key>] : Object | Test.java:2646:15:2646:16 | in : List [<element>, <map.key>] : Object | provenance |  |
 | Test.java:2645:28:2645:64 | of(...) : List [<element>, <map.key>] : Object | Test.java:2645:18:2645:64 | (...)... : List [<element>, <map.key>] : Object | provenance |  |
-| Test.java:2645:36:2645:63 | newEntryWithMapKey(...) : Entry [<map.key>] : Object | Test.java:2645:28:2645:64 | of(...) : List [<element>, <map.key>] : Object | provenance | MaD:558 |
+| Test.java:2645:36:2645:63 | newEntryWithMapKey(...) : Entry [<map.key>] : Object | Test.java:2645:28:2645:64 | of(...) : List [<element>, <map.key>] : Object | provenance | MaD:561 |
 | Test.java:2645:55:2645:62 | source(...) : Object | Test.java:101:40:101:44 | key : Object | provenance |  |
-| Test.java:2645:55:2645:62 | source(...) : Object | Test.java:2645:36:2645:63 | newEntryWithMapKey(...) : Entry [<map.key>] : Object | provenance | MaD:563 |
+| Test.java:2645:55:2645:62 | source(...) : Object | Test.java:2645:36:2645:63 | newEntryWithMapKey(...) : Entry [<map.key>] : Object | provenance | MaD:564 |
 | Test.java:2646:4:2646:6 | out [post update] : Builder [<map.key>] : Object | Test.java:2647:19:2647:21 | out : Builder [<map.key>] : Object | provenance |  |
-| Test.java:2646:15:2646:16 | in : List [<element>, <map.key>] : Object | Test.java:2646:4:2646:6 | out [post update] : Builder [<map.key>] : Object | provenance | MaD:123 |
+| Test.java:2646:15:2646:16 | in : List [<element>, <map.key>] : Object | Test.java:2646:4:2646:6 | out [post update] : Builder [<map.key>] : Object | provenance | MaD:106 |
 | Test.java:2647:19:2647:21 | out : Builder [<map.key>] : Object | Test.java:98:18:98:49 | b : Builder [<map.key>] : Object | provenance |  |
-| Test.java:2647:19:2647:21 | out : Builder [<map.key>] : Object | Test.java:2647:9:2647:22 | getMapKey(...) | provenance | MaD:113 |
+| Test.java:2647:19:2647:21 | out : Builder [<map.key>] : Object | Test.java:2647:9:2647:22 | getMapKey(...) | provenance | MaD:97 |
 | Test.java:2652:18:2652:64 | (...)... : List [<element>, <map.key>] : Object | Test.java:2653:15:2653:16 | in : List [<element>, <map.key>] : Object | provenance |  |
 | Test.java:2652:28:2652:64 | of(...) : List [<element>, <map.key>] : Object | Test.java:2652:18:2652:64 | (...)... : List [<element>, <map.key>] : Object | provenance |  |
-| Test.java:2652:36:2652:63 | newEntryWithMapKey(...) : Entry [<map.key>] : Object | Test.java:2652:28:2652:64 | of(...) : List [<element>, <map.key>] : Object | provenance | MaD:558 |
+| Test.java:2652:36:2652:63 | newEntryWithMapKey(...) : Entry [<map.key>] : Object | Test.java:2652:28:2652:64 | of(...) : List [<element>, <map.key>] : Object | provenance | MaD:561 |
 | Test.java:2652:55:2652:62 | source(...) : Object | Test.java:101:40:101:44 | key : Object | provenance |  |
-| Test.java:2652:55:2652:62 | source(...) : Object | Test.java:2652:36:2652:63 | newEntryWithMapKey(...) : Entry [<map.key>] : Object | provenance | MaD:563 |
+| Test.java:2652:55:2652:62 | source(...) : Object | Test.java:2652:36:2652:63 | newEntryWithMapKey(...) : Entry [<map.key>] : Object | provenance | MaD:564 |
 | Test.java:2653:4:2653:6 | out [post update] : Builder [<map.key>] : Object | Test.java:2654:19:2654:21 | out : Builder [<map.key>] : Object | provenance |  |
-| Test.java:2653:15:2653:16 | in : List [<element>, <map.key>] : Object | Test.java:2653:4:2653:6 | out [post update] : Builder [<map.key>] : Object | provenance | MaD:123 |
+| Test.java:2653:15:2653:16 | in : List [<element>, <map.key>] : Object | Test.java:2653:4:2653:6 | out [post update] : Builder [<map.key>] : Object | provenance | MaD:106 |
 | Test.java:2654:19:2654:21 | out : Builder [<map.key>] : Object | Test.java:98:18:98:49 | b : Builder [<map.key>] : Object | provenance |  |
-| Test.java:2654:19:2654:21 | out : Builder [<map.key>] : Object | Test.java:2654:9:2654:22 | getMapKey(...) | provenance | MaD:113 |
+| Test.java:2654:19:2654:21 | out : Builder [<map.key>] : Object | Test.java:2654:9:2654:22 | getMapKey(...) | provenance | MaD:97 |
 | Test.java:2659:18:2659:66 | (...)... : List [<element>, <map.value>] : Object | Test.java:2660:15:2660:16 | in : List [<element>, <map.value>] : Object | provenance |  |
 | Test.java:2659:28:2659:66 | of(...) : List [<element>, <map.value>] : Object | Test.java:2659:18:2659:66 | (...)... : List [<element>, <map.value>] : Object | provenance |  |
-| Test.java:2659:36:2659:65 | newEntryWithMapValue(...) : Entry [<map.value>] : Object | Test.java:2659:28:2659:66 | of(...) : List [<element>, <map.value>] : Object | provenance | MaD:558 |
+| Test.java:2659:36:2659:65 | newEntryWithMapValue(...) : Entry [<map.value>] : Object | Test.java:2659:28:2659:66 | of(...) : List [<element>, <map.value>] : Object | provenance | MaD:561 |
 | Test.java:2659:57:2659:64 | source(...) : Object | Test.java:113:42:113:48 | value : Object | provenance |  |
-| Test.java:2659:57:2659:64 | source(...) : Object | Test.java:2659:36:2659:65 | newEntryWithMapValue(...) : Entry [<map.value>] : Object | provenance | MaD:564 |
+| Test.java:2659:57:2659:64 | source(...) : Object | Test.java:2659:36:2659:65 | newEntryWithMapValue(...) : Entry [<map.value>] : Object | provenance | MaD:565 |
 | Test.java:2660:4:2660:6 | out [post update] : Builder [<map.value>] : Object | Test.java:2661:21:2661:23 | out : Builder [<map.value>] : Object | provenance |  |
-| Test.java:2660:15:2660:16 | in : List [<element>, <map.value>] : Object | Test.java:2660:4:2660:6 | out [post update] : Builder [<map.value>] : Object | provenance | MaD:124 |
+| Test.java:2660:15:2660:16 | in : List [<element>, <map.value>] : Object | Test.java:2660:4:2660:6 | out [post update] : Builder [<map.value>] : Object | provenance | MaD:107 |
 | Test.java:2661:21:2661:23 | out : Builder [<map.value>] : Object | Test.java:116:20:116:51 | b : Builder [<map.value>] : Object | provenance |  |
-| Test.java:2661:21:2661:23 | out : Builder [<map.value>] : Object | Test.java:2661:9:2661:24 | getMapValue(...) | provenance | MaD:114 |
+| Test.java:2661:21:2661:23 | out : Builder [<map.value>] : Object | Test.java:2661:9:2661:24 | getMapValue(...) | provenance | MaD:98 |
 | Test.java:2666:18:2666:66 | (...)... : List [<element>, <map.value>] : Object | Test.java:2667:15:2667:16 | in : List [<element>, <map.value>] : Object | provenance |  |
 | Test.java:2666:28:2666:66 | of(...) : List [<element>, <map.value>] : Object | Test.java:2666:18:2666:66 | (...)... : List [<element>, <map.value>] : Object | provenance |  |
-| Test.java:2666:36:2666:65 | newEntryWithMapValue(...) : Entry [<map.value>] : Object | Test.java:2666:28:2666:66 | of(...) : List [<element>, <map.value>] : Object | provenance | MaD:558 |
+| Test.java:2666:36:2666:65 | newEntryWithMapValue(...) : Entry [<map.value>] : Object | Test.java:2666:28:2666:66 | of(...) : List [<element>, <map.value>] : Object | provenance | MaD:561 |
 | Test.java:2666:57:2666:64 | source(...) : Object | Test.java:113:42:113:48 | value : Object | provenance |  |
-| Test.java:2666:57:2666:64 | source(...) : Object | Test.java:2666:36:2666:65 | newEntryWithMapValue(...) : Entry [<map.value>] : Object | provenance | MaD:564 |
+| Test.java:2666:57:2666:64 | source(...) : Object | Test.java:2666:36:2666:65 | newEntryWithMapValue(...) : Entry [<map.value>] : Object | provenance | MaD:565 |
 | Test.java:2667:4:2667:6 | out [post update] : Builder [<map.value>] : Object | Test.java:2668:21:2668:23 | out : Builder [<map.value>] : Object | provenance |  |
-| Test.java:2667:15:2667:16 | in : List [<element>, <map.value>] : Object | Test.java:2667:4:2667:6 | out [post update] : Builder [<map.value>] : Object | provenance | MaD:124 |
+| Test.java:2667:15:2667:16 | in : List [<element>, <map.value>] : Object | Test.java:2667:4:2667:6 | out [post update] : Builder [<map.value>] : Object | provenance | MaD:107 |
 | Test.java:2668:21:2668:23 | out : Builder [<map.value>] : Object | Test.java:116:20:116:51 | b : Builder [<map.value>] : Object | provenance |  |
-| Test.java:2668:21:2668:23 | out : Builder [<map.value>] : Object | Test.java:2668:9:2668:24 | getMapValue(...) | provenance | MaD:114 |
+| Test.java:2668:21:2668:23 | out : Builder [<map.value>] : Object | Test.java:2668:9:2668:24 | getMapValue(...) | provenance | MaD:98 |
 | Test.java:2673:18:2673:66 | (...)... : List [<element>, <map.value>] : Object | Test.java:2674:15:2674:16 | in : List [<element>, <map.value>] : Object | provenance |  |
 | Test.java:2673:28:2673:66 | of(...) : List [<element>, <map.value>] : Object | Test.java:2673:18:2673:66 | (...)... : List [<element>, <map.value>] : Object | provenance |  |
-| Test.java:2673:36:2673:65 | newEntryWithMapValue(...) : Entry [<map.value>] : Object | Test.java:2673:28:2673:66 | of(...) : List [<element>, <map.value>] : Object | provenance | MaD:558 |
+| Test.java:2673:36:2673:65 | newEntryWithMapValue(...) : Entry [<map.value>] : Object | Test.java:2673:28:2673:66 | of(...) : List [<element>, <map.value>] : Object | provenance | MaD:561 |
 | Test.java:2673:57:2673:64 | source(...) : Object | Test.java:113:42:113:48 | value : Object | provenance |  |
-| Test.java:2673:57:2673:64 | source(...) : Object | Test.java:2673:36:2673:65 | newEntryWithMapValue(...) : Entry [<map.value>] : Object | provenance | MaD:564 |
+| Test.java:2673:57:2673:64 | source(...) : Object | Test.java:2673:36:2673:65 | newEntryWithMapValue(...) : Entry [<map.value>] : Object | provenance | MaD:565 |
 | Test.java:2674:4:2674:6 | out [post update] : Builder [<map.value>] : Object | Test.java:2675:21:2675:23 | out : Builder [<map.value>] : Object | provenance |  |
-| Test.java:2674:15:2674:16 | in : List [<element>, <map.value>] : Object | Test.java:2674:4:2674:6 | out [post update] : Builder [<map.value>] : Object | provenance | MaD:124 |
+| Test.java:2674:15:2674:16 | in : List [<element>, <map.value>] : Object | Test.java:2674:4:2674:6 | out [post update] : Builder [<map.value>] : Object | provenance | MaD:107 |
 | Test.java:2675:21:2675:23 | out : Builder [<map.value>] : Object | Test.java:116:20:116:51 | b : Builder [<map.value>] : Object | provenance |  |
-| Test.java:2675:21:2675:23 | out : Builder [<map.value>] : Object | Test.java:2675:9:2675:24 | getMapValue(...) | provenance | MaD:114 |
+| Test.java:2675:21:2675:23 | out : Builder [<map.value>] : Object | Test.java:2675:9:2675:24 | getMapValue(...) | provenance | MaD:98 |
 | Test.java:2680:18:2680:63 | (...)... : ImmutableMultimap [<map.key>] : Object | Test.java:2681:15:2681:16 | in : ImmutableMultimap [<map.key>] : Object | provenance |  |
 | Test.java:2680:28:2680:63 | of(...) : ImmutableMultimap [<map.key>] : Object | Test.java:2680:18:2680:63 | (...)... : ImmutableMultimap [<map.key>] : Object | provenance |  |
-| Test.java:2680:49:2680:56 | source(...) : Object | Test.java:2680:28:2680:63 | of(...) : ImmutableMultimap [<map.key>] : Object | provenance | MaD:103 |
+| Test.java:2680:49:2680:56 | source(...) : Object | Test.java:2680:28:2680:63 | of(...) : ImmutableMultimap [<map.key>] : Object | provenance | MaD:121 |
 | Test.java:2681:4:2681:6 | out [post update] : Builder [<map.key>] : Object | Test.java:2682:19:2682:21 | out : Builder [<map.key>] : Object | provenance |  |
-| Test.java:2681:15:2681:16 | in : ImmutableMultimap [<map.key>] : Object | Test.java:2681:4:2681:6 | out [post update] : Builder [<map.key>] : Object | provenance | MaD:125 |
+| Test.java:2681:15:2681:16 | in : ImmutableMultimap [<map.key>] : Object | Test.java:2681:4:2681:6 | out [post update] : Builder [<map.key>] : Object | provenance | MaD:108 |
 | Test.java:2682:19:2682:21 | out : Builder [<map.key>] : Object | Test.java:98:18:98:49 | b : Builder [<map.key>] : Object | provenance |  |
-| Test.java:2682:19:2682:21 | out : Builder [<map.key>] : Object | Test.java:2682:9:2682:22 | getMapKey(...) | provenance | MaD:113 |
+| Test.java:2682:19:2682:21 | out : Builder [<map.key>] : Object | Test.java:2682:9:2682:22 | getMapKey(...) | provenance | MaD:97 |
 | Test.java:2687:18:2687:63 | (...)... : ImmutableMultimap [<map.key>] : Object | Test.java:2688:15:2688:16 | in : ImmutableMultimap [<map.key>] : Object | provenance |  |
 | Test.java:2687:28:2687:63 | of(...) : ImmutableMultimap [<map.key>] : Object | Test.java:2687:18:2687:63 | (...)... : ImmutableMultimap [<map.key>] : Object | provenance |  |
-| Test.java:2687:49:2687:56 | source(...) : Object | Test.java:2687:28:2687:63 | of(...) : ImmutableMultimap [<map.key>] : Object | provenance | MaD:103 |
+| Test.java:2687:49:2687:56 | source(...) : Object | Test.java:2687:28:2687:63 | of(...) : ImmutableMultimap [<map.key>] : Object | provenance | MaD:121 |
 | Test.java:2688:4:2688:6 | out [post update] : Builder [<map.key>] : Object | Test.java:2689:19:2689:21 | out : Builder [<map.key>] : Object | provenance |  |
-| Test.java:2688:15:2688:16 | in : ImmutableMultimap [<map.key>] : Object | Test.java:2688:4:2688:6 | out [post update] : Builder [<map.key>] : Object | provenance | MaD:125 |
+| Test.java:2688:15:2688:16 | in : ImmutableMultimap [<map.key>] : Object | Test.java:2688:4:2688:6 | out [post update] : Builder [<map.key>] : Object | provenance | MaD:108 |
 | Test.java:2689:19:2689:21 | out : Builder [<map.key>] : Object | Test.java:98:18:98:49 | b : Builder [<map.key>] : Object | provenance |  |
-| Test.java:2689:19:2689:21 | out : Builder [<map.key>] : Object | Test.java:2689:9:2689:22 | getMapKey(...) | provenance | MaD:113 |
+| Test.java:2689:19:2689:21 | out : Builder [<map.key>] : Object | Test.java:2689:9:2689:22 | getMapKey(...) | provenance | MaD:97 |
 | Test.java:2694:18:2694:63 | (...)... : ImmutableMultimap [<map.key>] : Object | Test.java:2695:15:2695:16 | in : ImmutableMultimap [<map.key>] : Object | provenance |  |
 | Test.java:2694:28:2694:63 | of(...) : ImmutableMultimap [<map.key>] : Object | Test.java:2694:18:2694:63 | (...)... : ImmutableMultimap [<map.key>] : Object | provenance |  |
-| Test.java:2694:49:2694:56 | source(...) : Object | Test.java:2694:28:2694:63 | of(...) : ImmutableMultimap [<map.key>] : Object | provenance | MaD:103 |
+| Test.java:2694:49:2694:56 | source(...) : Object | Test.java:2694:28:2694:63 | of(...) : ImmutableMultimap [<map.key>] : Object | provenance | MaD:121 |
 | Test.java:2695:4:2695:6 | out [post update] : Builder [<map.key>] : Object | Test.java:2696:19:2696:21 | out : Builder [<map.key>] : Object | provenance |  |
-| Test.java:2695:15:2695:16 | in : ImmutableMultimap [<map.key>] : Object | Test.java:2695:4:2695:6 | out [post update] : Builder [<map.key>] : Object | provenance | MaD:125 |
+| Test.java:2695:15:2695:16 | in : ImmutableMultimap [<map.key>] : Object | Test.java:2695:4:2695:6 | out [post update] : Builder [<map.key>] : Object | provenance | MaD:108 |
 | Test.java:2696:19:2696:21 | out : Builder [<map.key>] : Object | Test.java:98:18:98:49 | b : Builder [<map.key>] : Object | provenance |  |
-| Test.java:2696:19:2696:21 | out : Builder [<map.key>] : Object | Test.java:2696:9:2696:22 | getMapKey(...) | provenance | MaD:113 |
+| Test.java:2696:19:2696:21 | out : Builder [<map.key>] : Object | Test.java:2696:9:2696:22 | getMapKey(...) | provenance | MaD:97 |
 | Test.java:2701:18:2701:63 | (...)... : ImmutableMultimap [<map.value>] : Object | Test.java:2702:15:2702:16 | in : ImmutableMultimap [<map.value>] : Object | provenance |  |
 | Test.java:2701:28:2701:63 | of(...) : ImmutableMultimap [<map.value>] : Object | Test.java:2701:18:2701:63 | (...)... : ImmutableMultimap [<map.value>] : Object | provenance |  |
-| Test.java:2701:55:2701:62 | source(...) : Object | Test.java:2701:28:2701:63 | of(...) : ImmutableMultimap [<map.value>] : Object | provenance | MaD:104 |
+| Test.java:2701:55:2701:62 | source(...) : Object | Test.java:2701:28:2701:63 | of(...) : ImmutableMultimap [<map.value>] : Object | provenance | MaD:122 |
 | Test.java:2702:4:2702:6 | out [post update] : Builder [<map.value>] : Object | Test.java:2703:21:2703:23 | out : Builder [<map.value>] : Object | provenance |  |
-| Test.java:2702:15:2702:16 | in : ImmutableMultimap [<map.value>] : Object | Test.java:2702:4:2702:6 | out [post update] : Builder [<map.value>] : Object | provenance | MaD:126 |
+| Test.java:2702:15:2702:16 | in : ImmutableMultimap [<map.value>] : Object | Test.java:2702:4:2702:6 | out [post update] : Builder [<map.value>] : Object | provenance | MaD:109 |
 | Test.java:2703:21:2703:23 | out : Builder [<map.value>] : Object | Test.java:116:20:116:51 | b : Builder [<map.value>] : Object | provenance |  |
-| Test.java:2703:21:2703:23 | out : Builder [<map.value>] : Object | Test.java:2703:9:2703:24 | getMapValue(...) | provenance | MaD:114 |
+| Test.java:2703:21:2703:23 | out : Builder [<map.value>] : Object | Test.java:2703:9:2703:24 | getMapValue(...) | provenance | MaD:98 |
 | Test.java:2708:18:2708:63 | (...)... : ImmutableMultimap [<map.value>] : Object | Test.java:2709:15:2709:16 | in : ImmutableMultimap [<map.value>] : Object | provenance |  |
 | Test.java:2708:28:2708:63 | of(...) : ImmutableMultimap [<map.value>] : Object | Test.java:2708:18:2708:63 | (...)... : ImmutableMultimap [<map.value>] : Object | provenance |  |
-| Test.java:2708:55:2708:62 | source(...) : Object | Test.java:2708:28:2708:63 | of(...) : ImmutableMultimap [<map.value>] : Object | provenance | MaD:104 |
+| Test.java:2708:55:2708:62 | source(...) : Object | Test.java:2708:28:2708:63 | of(...) : ImmutableMultimap [<map.value>] : Object | provenance | MaD:122 |
 | Test.java:2709:4:2709:6 | out [post update] : Builder [<map.value>] : Object | Test.java:2710:21:2710:23 | out : Builder [<map.value>] : Object | provenance |  |
-| Test.java:2709:15:2709:16 | in : ImmutableMultimap [<map.value>] : Object | Test.java:2709:4:2709:6 | out [post update] : Builder [<map.value>] : Object | provenance | MaD:126 |
+| Test.java:2709:15:2709:16 | in : ImmutableMultimap [<map.value>] : Object | Test.java:2709:4:2709:6 | out [post update] : Builder [<map.value>] : Object | provenance | MaD:109 |
 | Test.java:2710:21:2710:23 | out : Builder [<map.value>] : Object | Test.java:116:20:116:51 | b : Builder [<map.value>] : Object | provenance |  |
-| Test.java:2710:21:2710:23 | out : Builder [<map.value>] : Object | Test.java:2710:9:2710:24 | getMapValue(...) | provenance | MaD:114 |
+| Test.java:2710:21:2710:23 | out : Builder [<map.value>] : Object | Test.java:2710:9:2710:24 | getMapValue(...) | provenance | MaD:98 |
 | Test.java:2715:18:2715:63 | (...)... : ImmutableMultimap [<map.value>] : Object | Test.java:2716:15:2716:16 | in : ImmutableMultimap [<map.value>] : Object | provenance |  |
 | Test.java:2715:28:2715:63 | of(...) : ImmutableMultimap [<map.value>] : Object | Test.java:2715:18:2715:63 | (...)... : ImmutableMultimap [<map.value>] : Object | provenance |  |
-| Test.java:2715:55:2715:62 | source(...) : Object | Test.java:2715:28:2715:63 | of(...) : ImmutableMultimap [<map.value>] : Object | provenance | MaD:104 |
+| Test.java:2715:55:2715:62 | source(...) : Object | Test.java:2715:28:2715:63 | of(...) : ImmutableMultimap [<map.value>] : Object | provenance | MaD:122 |
 | Test.java:2716:4:2716:6 | out [post update] : Builder [<map.value>] : Object | Test.java:2717:21:2717:23 | out : Builder [<map.value>] : Object | provenance |  |
-| Test.java:2716:15:2716:16 | in : ImmutableMultimap [<map.value>] : Object | Test.java:2716:4:2716:6 | out [post update] : Builder [<map.value>] : Object | provenance | MaD:126 |
+| Test.java:2716:15:2716:16 | in : ImmutableMultimap [<map.value>] : Object | Test.java:2716:4:2716:6 | out [post update] : Builder [<map.value>] : Object | provenance | MaD:109 |
 | Test.java:2717:21:2717:23 | out : Builder [<map.value>] : Object | Test.java:116:20:116:51 | b : Builder [<map.value>] : Object | provenance |  |
-| Test.java:2717:21:2717:23 | out : Builder [<map.value>] : Object | Test.java:2717:9:2717:24 | getMapValue(...) | provenance | MaD:114 |
+| Test.java:2717:21:2717:23 | out : Builder [<map.value>] : Object | Test.java:2717:9:2717:24 | getMapValue(...) | provenance | MaD:98 |
 | Test.java:2722:16:2722:31 | (...)... : Object | Test.java:2723:15:2723:16 | in : Object | provenance |  |
 | Test.java:2722:24:2722:31 | source(...) : Object | Test.java:2722:16:2722:31 | (...)... : Object | provenance |  |
 | Test.java:2723:4:2723:6 | out [post update] : Builder [<map.key>] : Object | Test.java:2724:19:2724:21 | out : Builder [<map.key>] : Object | provenance |  |
-| Test.java:2723:15:2723:16 | in : Object | Test.java:2723:4:2723:6 | out [post update] : Builder [<map.key>] : Object | provenance | MaD:127 |
+| Test.java:2723:15:2723:16 | in : Object | Test.java:2723:4:2723:6 | out [post update] : Builder [<map.key>] : Object | provenance | MaD:110 |
 | Test.java:2724:19:2724:21 | out : Builder [<map.key>] : Object | Test.java:98:18:98:49 | b : Builder [<map.key>] : Object | provenance |  |
-| Test.java:2724:19:2724:21 | out : Builder [<map.key>] : Object | Test.java:2724:9:2724:22 | getMapKey(...) | provenance | MaD:113 |
+| Test.java:2724:19:2724:21 | out : Builder [<map.key>] : Object | Test.java:2724:9:2724:22 | getMapKey(...) | provenance | MaD:97 |
 | Test.java:2729:16:2729:31 | (...)... : Object | Test.java:2730:15:2730:16 | in : Object | provenance |  |
 | Test.java:2729:24:2729:31 | source(...) : Object | Test.java:2729:16:2729:31 | (...)... : Object | provenance |  |
 | Test.java:2730:4:2730:6 | out [post update] : Builder [<map.key>] : Object | Test.java:2731:19:2731:21 | out : Builder [<map.key>] : Object | provenance |  |
-| Test.java:2730:15:2730:16 | in : Object | Test.java:2730:4:2730:6 | out [post update] : Builder [<map.key>] : Object | provenance | MaD:127 |
+| Test.java:2730:15:2730:16 | in : Object | Test.java:2730:4:2730:6 | out [post update] : Builder [<map.key>] : Object | provenance | MaD:110 |
 | Test.java:2731:19:2731:21 | out : Builder [<map.key>] : Object | Test.java:98:18:98:49 | b : Builder [<map.key>] : Object | provenance |  |
-| Test.java:2731:19:2731:21 | out : Builder [<map.key>] : Object | Test.java:2731:9:2731:22 | getMapKey(...) | provenance | MaD:113 |
+| Test.java:2731:19:2731:21 | out : Builder [<map.key>] : Object | Test.java:2731:9:2731:22 | getMapKey(...) | provenance | MaD:97 |
 | Test.java:2736:16:2736:31 | (...)... : Object | Test.java:2737:15:2737:16 | in : Object | provenance |  |
 | Test.java:2736:24:2736:31 | source(...) : Object | Test.java:2736:16:2736:31 | (...)... : Object | provenance |  |
 | Test.java:2737:4:2737:6 | out [post update] : Builder [<map.key>] : Object | Test.java:2738:19:2738:21 | out : Builder [<map.key>] : Object | provenance |  |
-| Test.java:2737:15:2737:16 | in : Object | Test.java:2737:4:2737:6 | out [post update] : Builder [<map.key>] : Object | provenance | MaD:127 |
+| Test.java:2737:15:2737:16 | in : Object | Test.java:2737:4:2737:6 | out [post update] : Builder [<map.key>] : Object | provenance | MaD:110 |
 | Test.java:2738:19:2738:21 | out : Builder [<map.key>] : Object | Test.java:98:18:98:49 | b : Builder [<map.key>] : Object | provenance |  |
-| Test.java:2738:19:2738:21 | out : Builder [<map.key>] : Object | Test.java:2738:9:2738:22 | getMapKey(...) | provenance | MaD:113 |
+| Test.java:2738:19:2738:21 | out : Builder [<map.key>] : Object | Test.java:2738:9:2738:22 | getMapKey(...) | provenance | MaD:97 |
 | Test.java:2743:18:2743:44 | (...)... : List [<element>] : Object | Test.java:2744:29:2744:30 | in : List [<element>] : Object | provenance |  |
 | Test.java:2743:28:2743:44 | of(...) : List [<element>] : Object | Test.java:2743:18:2743:44 | (...)... : List [<element>] : Object | provenance |  |
-| Test.java:2743:36:2743:43 | source(...) : Object | Test.java:2743:28:2743:44 | of(...) : List [<element>] : Object | provenance | MaD:558 |
+| Test.java:2743:36:2743:43 | source(...) : Object | Test.java:2743:28:2743:44 | of(...) : List [<element>] : Object | provenance | MaD:561 |
 | Test.java:2744:4:2744:6 | out [post update] : Builder [<map.value>] : Object | Test.java:2745:21:2745:23 | out : Builder [<map.value>] : Object | provenance |  |
-| Test.java:2744:29:2744:30 | in : List [<element>] : Object | Test.java:2744:4:2744:6 | out [post update] : Builder [<map.value>] : Object | provenance | MaD:128 |
+| Test.java:2744:29:2744:30 | in : List [<element>] : Object | Test.java:2744:4:2744:6 | out [post update] : Builder [<map.value>] : Object | provenance | MaD:111 |
 | Test.java:2745:21:2745:23 | out : Builder [<map.value>] : Object | Test.java:116:20:116:51 | b : Builder [<map.value>] : Object | provenance |  |
-| Test.java:2745:21:2745:23 | out : Builder [<map.value>] : Object | Test.java:2745:9:2745:24 | getMapValue(...) | provenance | MaD:114 |
+| Test.java:2745:21:2745:23 | out : Builder [<map.value>] : Object | Test.java:2745:9:2745:24 | getMapValue(...) | provenance | MaD:98 |
 | Test.java:2750:18:2750:44 | (...)... : List [<element>] : Object | Test.java:2751:29:2751:30 | in : List [<element>] : Object | provenance |  |
 | Test.java:2750:28:2750:44 | of(...) : List [<element>] : Object | Test.java:2750:18:2750:44 | (...)... : List [<element>] : Object | provenance |  |
-| Test.java:2750:36:2750:43 | source(...) : Object | Test.java:2750:28:2750:44 | of(...) : List [<element>] : Object | provenance | MaD:558 |
+| Test.java:2750:36:2750:43 | source(...) : Object | Test.java:2750:28:2750:44 | of(...) : List [<element>] : Object | provenance | MaD:561 |
 | Test.java:2751:4:2751:6 | out [post update] : Builder [<map.value>] : Object | Test.java:2752:21:2752:23 | out : Builder [<map.value>] : Object | provenance |  |
-| Test.java:2751:29:2751:30 | in : List [<element>] : Object | Test.java:2751:4:2751:6 | out [post update] : Builder [<map.value>] : Object | provenance | MaD:128 |
+| Test.java:2751:29:2751:30 | in : List [<element>] : Object | Test.java:2751:4:2751:6 | out [post update] : Builder [<map.value>] : Object | provenance | MaD:111 |
 | Test.java:2752:21:2752:23 | out : Builder [<map.value>] : Object | Test.java:116:20:116:51 | b : Builder [<map.value>] : Object | provenance |  |
-| Test.java:2752:21:2752:23 | out : Builder [<map.value>] : Object | Test.java:2752:9:2752:24 | getMapValue(...) | provenance | MaD:114 |
+| Test.java:2752:21:2752:23 | out : Builder [<map.value>] : Object | Test.java:2752:9:2752:24 | getMapValue(...) | provenance | MaD:98 |
 | Test.java:2757:18:2757:44 | (...)... : List [<element>] : Object | Test.java:2758:29:2758:30 | in : List [<element>] : Object | provenance |  |
 | Test.java:2757:28:2757:44 | of(...) : List [<element>] : Object | Test.java:2757:18:2757:44 | (...)... : List [<element>] : Object | provenance |  |
-| Test.java:2757:36:2757:43 | source(...) : Object | Test.java:2757:28:2757:44 | of(...) : List [<element>] : Object | provenance | MaD:558 |
+| Test.java:2757:36:2757:43 | source(...) : Object | Test.java:2757:28:2757:44 | of(...) : List [<element>] : Object | provenance | MaD:561 |
 | Test.java:2758:4:2758:6 | out [post update] : Builder [<map.value>] : Object | Test.java:2759:21:2759:23 | out : Builder [<map.value>] : Object | provenance |  |
-| Test.java:2758:29:2758:30 | in : List [<element>] : Object | Test.java:2758:4:2758:6 | out [post update] : Builder [<map.value>] : Object | provenance | MaD:128 |
+| Test.java:2758:29:2758:30 | in : List [<element>] : Object | Test.java:2758:4:2758:6 | out [post update] : Builder [<map.value>] : Object | provenance | MaD:111 |
 | Test.java:2759:21:2759:23 | out : Builder [<map.value>] : Object | Test.java:116:20:116:51 | b : Builder [<map.value>] : Object | provenance |  |
-| Test.java:2759:21:2759:23 | out : Builder [<map.value>] : Object | Test.java:2759:9:2759:24 | getMapValue(...) | provenance | MaD:114 |
+| Test.java:2759:21:2759:23 | out : Builder [<map.value>] : Object | Test.java:2759:9:2759:24 | getMapValue(...) | provenance | MaD:98 |
 | Test.java:2764:16:2764:31 | (...)... : Object | Test.java:2765:15:2765:16 | in : Object | provenance |  |
 | Test.java:2764:24:2764:31 | source(...) : Object | Test.java:2764:16:2764:31 | (...)... : Object | provenance |  |
 | Test.java:2765:4:2765:6 | out [post update] : Builder [<map.key>] : Object | Test.java:2766:19:2766:21 | out : Builder [<map.key>] : Object | provenance |  |
-| Test.java:2765:15:2765:16 | in : Object | Test.java:2765:4:2765:6 | out [post update] : Builder [<map.key>] : Object | provenance | MaD:129 |
+| Test.java:2765:15:2765:16 | in : Object | Test.java:2765:4:2765:6 | out [post update] : Builder [<map.key>] : Object | provenance | MaD:112 |
 | Test.java:2766:19:2766:21 | out : Builder [<map.key>] : Object | Test.java:98:18:98:49 | b : Builder [<map.key>] : Object | provenance |  |
-| Test.java:2766:19:2766:21 | out : Builder [<map.key>] : Object | Test.java:2766:9:2766:22 | getMapKey(...) | provenance | MaD:113 |
+| Test.java:2766:19:2766:21 | out : Builder [<map.key>] : Object | Test.java:2766:9:2766:22 | getMapKey(...) | provenance | MaD:97 |
 | Test.java:2771:16:2771:31 | (...)... : Object | Test.java:2772:15:2772:16 | in : Object | provenance |  |
 | Test.java:2771:24:2771:31 | source(...) : Object | Test.java:2771:16:2771:31 | (...)... : Object | provenance |  |
 | Test.java:2772:4:2772:6 | out [post update] : Builder [<map.key>] : Object | Test.java:2773:19:2773:21 | out : Builder [<map.key>] : Object | provenance |  |
-| Test.java:2772:15:2772:16 | in : Object | Test.java:2772:4:2772:6 | out [post update] : Builder [<map.key>] : Object | provenance | MaD:129 |
+| Test.java:2772:15:2772:16 | in : Object | Test.java:2772:4:2772:6 | out [post update] : Builder [<map.key>] : Object | provenance | MaD:112 |
 | Test.java:2773:19:2773:21 | out : Builder [<map.key>] : Object | Test.java:98:18:98:49 | b : Builder [<map.key>] : Object | provenance |  |
-| Test.java:2773:19:2773:21 | out : Builder [<map.key>] : Object | Test.java:2773:9:2773:22 | getMapKey(...) | provenance | MaD:113 |
+| Test.java:2773:19:2773:21 | out : Builder [<map.key>] : Object | Test.java:2773:9:2773:22 | getMapKey(...) | provenance | MaD:97 |
 | Test.java:2778:16:2778:31 | (...)... : Object | Test.java:2779:15:2779:16 | in : Object | provenance |  |
 | Test.java:2778:24:2778:31 | source(...) : Object | Test.java:2778:16:2778:31 | (...)... : Object | provenance |  |
 | Test.java:2779:4:2779:6 | out [post update] : Builder [<map.key>] : Object | Test.java:2780:19:2780:21 | out : Builder [<map.key>] : Object | provenance |  |
-| Test.java:2779:15:2779:16 | in : Object | Test.java:2779:4:2779:6 | out [post update] : Builder [<map.key>] : Object | provenance | MaD:129 |
+| Test.java:2779:15:2779:16 | in : Object | Test.java:2779:4:2779:6 | out [post update] : Builder [<map.key>] : Object | provenance | MaD:112 |
 | Test.java:2780:19:2780:21 | out : Builder [<map.key>] : Object | Test.java:98:18:98:49 | b : Builder [<map.key>] : Object | provenance |  |
-| Test.java:2780:19:2780:21 | out : Builder [<map.key>] : Object | Test.java:2780:9:2780:22 | getMapKey(...) | provenance | MaD:113 |
+| Test.java:2780:19:2780:21 | out : Builder [<map.key>] : Object | Test.java:2780:9:2780:22 | getMapKey(...) | provenance | MaD:97 |
 | Test.java:2785:18:2785:49 | (...)... : Object[] [[]] : Object | Test.java:2786:29:2786:30 | in : Object[] [[]] : Object | provenance |  |
 | Test.java:2785:28:2785:49 | {...} : Object[] [[]] : Object | Test.java:2785:18:2785:49 | (...)... : Object[] [[]] : Object | provenance |  |
 | Test.java:2785:41:2785:48 | source(...) : Object | Test.java:2785:28:2785:49 | {...} : Object[] [[]] : Object | provenance |  |
 | Test.java:2786:4:2786:6 | out [post update] : Builder [<map.value>] : Object | Test.java:2787:21:2787:23 | out : Builder [<map.value>] : Object | provenance |  |
-| Test.java:2786:29:2786:30 | in : Object[] [[]] : Object | Test.java:2786:4:2786:6 | out [post update] : Builder [<map.value>] : Object | provenance | MaD:130 |
+| Test.java:2786:29:2786:30 | in : Object[] [[]] : Object | Test.java:2786:4:2786:6 | out [post update] : Builder [<map.value>] : Object | provenance | MaD:113 |
 | Test.java:2787:21:2787:23 | out : Builder [<map.value>] : Object | Test.java:116:20:116:51 | b : Builder [<map.value>] : Object | provenance |  |
-| Test.java:2787:21:2787:23 | out : Builder [<map.value>] : Object | Test.java:2787:9:2787:24 | getMapValue(...) | provenance | MaD:114 |
+| Test.java:2787:21:2787:23 | out : Builder [<map.value>] : Object | Test.java:2787:9:2787:24 | getMapValue(...) | provenance | MaD:98 |
 | Test.java:2792:18:2792:49 | (...)... : Object[] [[]] : Object | Test.java:2793:29:2793:30 | in : Object[] [[]] : Object | provenance |  |
 | Test.java:2792:28:2792:49 | {...} : Object[] [[]] : Object | Test.java:2792:18:2792:49 | (...)... : Object[] [[]] : Object | provenance |  |
 | Test.java:2792:41:2792:48 | source(...) : Object | Test.java:2792:28:2792:49 | {...} : Object[] [[]] : Object | provenance |  |
 | Test.java:2793:4:2793:6 | out [post update] : Builder [<map.value>] : Object | Test.java:2794:21:2794:23 | out : Builder [<map.value>] : Object | provenance |  |
-| Test.java:2793:29:2793:30 | in : Object[] [[]] : Object | Test.java:2793:4:2793:6 | out [post update] : Builder [<map.value>] : Object | provenance | MaD:130 |
+| Test.java:2793:29:2793:30 | in : Object[] [[]] : Object | Test.java:2793:4:2793:6 | out [post update] : Builder [<map.value>] : Object | provenance | MaD:113 |
 | Test.java:2794:21:2794:23 | out : Builder [<map.value>] : Object | Test.java:116:20:116:51 | b : Builder [<map.value>] : Object | provenance |  |
-| Test.java:2794:21:2794:23 | out : Builder [<map.value>] : Object | Test.java:2794:9:2794:24 | getMapValue(...) | provenance | MaD:114 |
+| Test.java:2794:21:2794:23 | out : Builder [<map.value>] : Object | Test.java:2794:9:2794:24 | getMapValue(...) | provenance | MaD:98 |
 | Test.java:2799:18:2799:49 | (...)... : Object[] [[]] : Object | Test.java:2800:29:2800:30 | in : Object[] [[]] : Object | provenance |  |
 | Test.java:2799:28:2799:49 | {...} : Object[] [[]] : Object | Test.java:2799:18:2799:49 | (...)... : Object[] [[]] : Object | provenance |  |
 | Test.java:2799:41:2799:48 | source(...) : Object | Test.java:2799:28:2799:49 | {...} : Object[] [[]] : Object | provenance |  |
 | Test.java:2800:4:2800:6 | out [post update] : Builder [<map.value>] : Object | Test.java:2801:21:2801:23 | out : Builder [<map.value>] : Object | provenance |  |
-| Test.java:2800:29:2800:30 | in : Object[] [[]] : Object | Test.java:2800:4:2800:6 | out [post update] : Builder [<map.value>] : Object | provenance | MaD:130 |
+| Test.java:2800:29:2800:30 | in : Object[] [[]] : Object | Test.java:2800:4:2800:6 | out [post update] : Builder [<map.value>] : Object | provenance | MaD:113 |
 | Test.java:2801:21:2801:23 | out : Builder [<map.value>] : Object | Test.java:116:20:116:51 | b : Builder [<map.value>] : Object | provenance |  |
-| Test.java:2801:21:2801:23 | out : Builder [<map.value>] : Object | Test.java:2801:9:2801:24 | getMapValue(...) | provenance | MaD:114 |
+| Test.java:2801:21:2801:23 | out : Builder [<map.value>] : Object | Test.java:2801:9:2801:24 | getMapValue(...) | provenance | MaD:98 |
 | Test.java:2806:38:2806:75 | (...)... : Builder | Test.java:2807:10:2807:11 | in : Builder | provenance |  |
 | Test.java:2806:68:2806:75 | source(...) : Object | Test.java:2806:38:2806:75 | (...)... : Builder | provenance |  |
-| Test.java:2807:10:2807:11 | in : Builder | Test.java:2807:10:2807:48 | putAll(...) : Builder | provenance | MaD:122 |
+| Test.java:2807:10:2807:11 | in : Builder | Test.java:2807:10:2807:48 | putAll(...) : Builder | provenance | MaD:114 |
 | Test.java:2807:10:2807:48 | putAll(...) : Builder | Test.java:2808:9:2808:11 | out | provenance |  |
 | Test.java:2813:38:2813:75 | (...)... : Builder | Test.java:2814:10:2814:11 | in : Builder | provenance |  |
 | Test.java:2813:68:2813:75 | source(...) : Object | Test.java:2813:38:2813:75 | (...)... : Builder | provenance |  |
-| Test.java:2814:10:2814:11 | in : Builder | Test.java:2814:10:2814:48 | putAll(...) : Builder | provenance | MaD:122 |
+| Test.java:2814:10:2814:11 | in : Builder | Test.java:2814:10:2814:48 | putAll(...) : Builder | provenance | MaD:114 |
 | Test.java:2814:10:2814:48 | putAll(...) : Builder | Test.java:2815:9:2815:11 | out | provenance |  |
 | Test.java:2820:38:2820:75 | (...)... : Builder | Test.java:2821:10:2821:11 | in : Builder | provenance |  |
 | Test.java:2820:68:2820:75 | source(...) : Object | Test.java:2820:38:2820:75 | (...)... : Builder | provenance |  |
-| Test.java:2821:10:2821:11 | in : Builder | Test.java:2821:10:2821:34 | putAll(...) : Builder | provenance | MaD:122 |
+| Test.java:2821:10:2821:11 | in : Builder | Test.java:2821:10:2821:34 | putAll(...) : Builder | provenance | MaD:114 |
 | Test.java:2821:10:2821:34 | putAll(...) : Builder | Test.java:2822:9:2822:11 | out | provenance |  |
 | Test.java:2827:38:2827:75 | (...)... : Builder | Test.java:2828:10:2828:11 | in : Builder | provenance |  |
 | Test.java:2827:68:2827:75 | source(...) : Object | Test.java:2827:38:2827:75 | (...)... : Builder | provenance |  |
-| Test.java:2828:10:2828:11 | in : Builder | Test.java:2828:10:2828:34 | putAll(...) : Builder | provenance | MaD:122 |
+| Test.java:2828:10:2828:11 | in : Builder | Test.java:2828:10:2828:34 | putAll(...) : Builder | provenance | MaD:114 |
 | Test.java:2828:10:2828:34 | putAll(...) : Builder | Test.java:2829:9:2829:11 | out | provenance |  |
 | Test.java:2834:35:2834:69 | (...)... : Builder | Test.java:2835:10:2835:11 | in : Builder | provenance |  |
 | Test.java:2834:62:2834:69 | source(...) : Object | Test.java:2834:35:2834:69 | (...)... : Builder | provenance |  |
-| Test.java:2835:10:2835:11 | in : Builder | Test.java:2835:10:2835:48 | putAll(...) : Builder | provenance | MaD:122 |
+| Test.java:2835:10:2835:11 | in : Builder | Test.java:2835:10:2835:48 | putAll(...) : Builder | provenance | MaD:114 |
 | Test.java:2835:10:2835:48 | putAll(...) : Builder | Test.java:2836:9:2836:11 | out | provenance |  |
 | Test.java:2841:35:2841:69 | (...)... : Builder | Test.java:2842:10:2842:11 | in : Builder | provenance |  |
 | Test.java:2841:62:2841:69 | source(...) : Object | Test.java:2841:35:2841:69 | (...)... : Builder | provenance |  |
-| Test.java:2842:10:2842:11 | in : Builder | Test.java:2842:10:2842:48 | putAll(...) : Builder | provenance | MaD:122 |
+| Test.java:2842:10:2842:11 | in : Builder | Test.java:2842:10:2842:48 | putAll(...) : Builder | provenance | MaD:114 |
 | Test.java:2842:10:2842:48 | putAll(...) : Builder | Test.java:2843:9:2843:11 | out | provenance |  |
 | Test.java:2848:35:2848:69 | (...)... : Builder | Test.java:2849:10:2849:11 | in : Builder | provenance |  |
 | Test.java:2848:62:2848:69 | source(...) : Object | Test.java:2848:35:2848:69 | (...)... : Builder | provenance |  |
-| Test.java:2849:10:2849:11 | in : Builder | Test.java:2849:10:2849:34 | putAll(...) : Builder | provenance | MaD:122 |
+| Test.java:2849:10:2849:11 | in : Builder | Test.java:2849:10:2849:34 | putAll(...) : Builder | provenance | MaD:114 |
 | Test.java:2849:10:2849:34 | putAll(...) : Builder | Test.java:2850:9:2850:11 | out | provenance |  |
 | Test.java:2855:35:2855:69 | (...)... : Builder | Test.java:2856:10:2856:11 | in : Builder | provenance |  |
 | Test.java:2855:62:2855:69 | source(...) : Object | Test.java:2855:35:2855:69 | (...)... : Builder | provenance |  |
-| Test.java:2856:10:2856:11 | in : Builder | Test.java:2856:10:2856:34 | putAll(...) : Builder | provenance | MaD:122 |
+| Test.java:2856:10:2856:11 | in : Builder | Test.java:2856:10:2856:34 | putAll(...) : Builder | provenance | MaD:114 |
 | Test.java:2856:10:2856:34 | putAll(...) : Builder | Test.java:2857:9:2857:11 | out | provenance |  |
 | Test.java:2862:39:2862:77 | (...)... : Builder | Test.java:2863:10:2863:11 | in : Builder | provenance |  |
 | Test.java:2862:70:2862:77 | source(...) : Object | Test.java:2862:39:2862:77 | (...)... : Builder | provenance |  |
-| Test.java:2863:10:2863:11 | in : Builder | Test.java:2863:10:2863:48 | putAll(...) : Builder | provenance | MaD:122 |
+| Test.java:2863:10:2863:11 | in : Builder | Test.java:2863:10:2863:48 | putAll(...) : Builder | provenance | MaD:114 |
 | Test.java:2863:10:2863:48 | putAll(...) : Builder | Test.java:2864:9:2864:11 | out | provenance |  |
 | Test.java:2869:39:2869:77 | (...)... : Builder | Test.java:2870:10:2870:11 | in : Builder | provenance |  |
 | Test.java:2869:70:2869:77 | source(...) : Object | Test.java:2869:39:2869:77 | (...)... : Builder | provenance |  |
-| Test.java:2870:10:2870:11 | in : Builder | Test.java:2870:10:2870:48 | putAll(...) : Builder | provenance | MaD:122 |
+| Test.java:2870:10:2870:11 | in : Builder | Test.java:2870:10:2870:48 | putAll(...) : Builder | provenance | MaD:114 |
 | Test.java:2870:10:2870:48 | putAll(...) : Builder | Test.java:2871:9:2871:11 | out | provenance |  |
 | Test.java:2876:39:2876:77 | (...)... : Builder | Test.java:2877:10:2877:11 | in : Builder | provenance |  |
 | Test.java:2876:70:2876:77 | source(...) : Object | Test.java:2876:39:2876:77 | (...)... : Builder | provenance |  |
-| Test.java:2877:10:2877:11 | in : Builder | Test.java:2877:10:2877:34 | putAll(...) : Builder | provenance | MaD:122 |
+| Test.java:2877:10:2877:11 | in : Builder | Test.java:2877:10:2877:34 | putAll(...) : Builder | provenance | MaD:114 |
 | Test.java:2877:10:2877:34 | putAll(...) : Builder | Test.java:2878:9:2878:11 | out | provenance |  |
 | Test.java:2883:39:2883:77 | (...)... : Builder | Test.java:2884:10:2884:11 | in : Builder | provenance |  |
 | Test.java:2883:70:2883:77 | source(...) : Object | Test.java:2883:39:2883:77 | (...)... : Builder | provenance |  |
-| Test.java:2884:10:2884:11 | in : Builder | Test.java:2884:10:2884:34 | putAll(...) : Builder | provenance | MaD:122 |
+| Test.java:2884:10:2884:11 | in : Builder | Test.java:2884:10:2884:34 | putAll(...) : Builder | provenance | MaD:114 |
 | Test.java:2884:10:2884:34 | putAll(...) : Builder | Test.java:2885:9:2885:11 | out | provenance |  |
 | Test.java:2890:18:2890:64 | (...)... : List [<element>, <map.key>] : Object | Test.java:2891:35:2891:36 | in : List [<element>, <map.key>] : Object | provenance |  |
 | Test.java:2890:28:2890:64 | of(...) : List [<element>, <map.key>] : Object | Test.java:2890:18:2890:64 | (...)... : List [<element>, <map.key>] : Object | provenance |  |
-| Test.java:2890:36:2890:63 | newEntryWithMapKey(...) : Entry [<map.key>] : Object | Test.java:2890:28:2890:64 | of(...) : List [<element>, <map.key>] : Object | provenance | MaD:558 |
+| Test.java:2890:36:2890:63 | newEntryWithMapKey(...) : Entry [<map.key>] : Object | Test.java:2890:28:2890:64 | of(...) : List [<element>, <map.key>] : Object | provenance | MaD:561 |
 | Test.java:2890:55:2890:62 | source(...) : Object | Test.java:101:40:101:44 | key : Object | provenance |  |
-| Test.java:2890:55:2890:62 | source(...) : Object | Test.java:2890:36:2890:63 | newEntryWithMapKey(...) : Entry [<map.key>] : Object | provenance | MaD:563 |
+| Test.java:2890:55:2890:62 | source(...) : Object | Test.java:2890:36:2890:63 | newEntryWithMapKey(...) : Entry [<map.key>] : Object | provenance | MaD:564 |
 | Test.java:2891:10:2891:37 | copyOf(...) : ImmutableMultimap [<map.key>] : Object | Test.java:2892:19:2892:21 | out : ImmutableMultimap [<map.key>] : Object | provenance |  |
-| Test.java:2891:35:2891:36 | in : List [<element>, <map.key>] : Object | Test.java:2891:10:2891:37 | copyOf(...) : ImmutableMultimap [<map.key>] : Object | provenance | MaD:97 |
+| Test.java:2891:35:2891:36 | in : List [<element>, <map.key>] : Object | Test.java:2891:10:2891:37 | copyOf(...) : ImmutableMultimap [<map.key>] : Object | provenance | MaD:115 |
 | Test.java:2892:19:2892:21 | out : ImmutableMultimap [<map.key>] : Object | Test.java:100:18:100:34 | map : ImmutableMultimap [<map.key>] : Object | provenance |  |
 | Test.java:2892:19:2892:21 | out : ImmutableMultimap [<map.key>] : Object | Test.java:2892:9:2892:22 | getMapKey(...) | provenance | MaD:373 |
 | Test.java:2897:18:2897:66 | (...)... : List [<element>, <map.value>] : Object | Test.java:2898:35:2898:36 | in : List [<element>, <map.value>] : Object | provenance |  |
 | Test.java:2897:28:2897:66 | of(...) : List [<element>, <map.value>] : Object | Test.java:2897:18:2897:66 | (...)... : List [<element>, <map.value>] : Object | provenance |  |
-| Test.java:2897:36:2897:65 | newEntryWithMapValue(...) : Entry [<map.value>] : Object | Test.java:2897:28:2897:66 | of(...) : List [<element>, <map.value>] : Object | provenance | MaD:558 |
+| Test.java:2897:36:2897:65 | newEntryWithMapValue(...) : Entry [<map.value>] : Object | Test.java:2897:28:2897:66 | of(...) : List [<element>, <map.value>] : Object | provenance | MaD:561 |
 | Test.java:2897:57:2897:64 | source(...) : Object | Test.java:113:42:113:48 | value : Object | provenance |  |
-| Test.java:2897:57:2897:64 | source(...) : Object | Test.java:2897:36:2897:65 | newEntryWithMapValue(...) : Entry [<map.value>] : Object | provenance | MaD:564 |
+| Test.java:2897:57:2897:64 | source(...) : Object | Test.java:2897:36:2897:65 | newEntryWithMapValue(...) : Entry [<map.value>] : Object | provenance | MaD:565 |
 | Test.java:2898:10:2898:37 | copyOf(...) : ImmutableMultimap [<map.value>] : Object | Test.java:2899:21:2899:23 | out : ImmutableMultimap [<map.value>] : Object | provenance |  |
-| Test.java:2898:35:2898:36 | in : List [<element>, <map.value>] : Object | Test.java:2898:10:2898:37 | copyOf(...) : ImmutableMultimap [<map.value>] : Object | provenance | MaD:98 |
+| Test.java:2898:35:2898:36 | in : List [<element>, <map.value>] : Object | Test.java:2898:10:2898:37 | copyOf(...) : ImmutableMultimap [<map.value>] : Object | provenance | MaD:116 |
 | Test.java:2899:21:2899:23 | out : ImmutableMultimap [<map.value>] : Object | Test.java:119:20:119:36 | map : ImmutableMultimap [<map.value>] : Object | provenance |  |
 | Test.java:2899:21:2899:23 | out : ImmutableMultimap [<map.value>] : Object | Test.java:2899:9:2899:24 | getMapValue(...) | provenance | MaD:385 |
 | Test.java:2904:18:2904:63 | (...)... : ImmutableMultimap [<map.key>] : Object | Test.java:2905:35:2905:36 | in : ImmutableMultimap [<map.key>] : Object | provenance |  |
 | Test.java:2904:28:2904:63 | of(...) : ImmutableMultimap [<map.key>] : Object | Test.java:2904:18:2904:63 | (...)... : ImmutableMultimap [<map.key>] : Object | provenance |  |
-| Test.java:2904:49:2904:56 | source(...) : Object | Test.java:2904:28:2904:63 | of(...) : ImmutableMultimap [<map.key>] : Object | provenance | MaD:103 |
+| Test.java:2904:49:2904:56 | source(...) : Object | Test.java:2904:28:2904:63 | of(...) : ImmutableMultimap [<map.key>] : Object | provenance | MaD:121 |
 | Test.java:2905:10:2905:37 | copyOf(...) : ImmutableMultimap [<map.key>] : Object | Test.java:2906:19:2906:21 | out : ImmutableMultimap [<map.key>] : Object | provenance |  |
-| Test.java:2905:35:2905:36 | in : ImmutableMultimap [<map.key>] : Object | Test.java:2905:10:2905:37 | copyOf(...) : ImmutableMultimap [<map.key>] : Object | provenance | MaD:99 |
+| Test.java:2905:35:2905:36 | in : ImmutableMultimap [<map.key>] : Object | Test.java:2905:10:2905:37 | copyOf(...) : ImmutableMultimap [<map.key>] : Object | provenance | MaD:117 |
 | Test.java:2906:19:2906:21 | out : ImmutableMultimap [<map.key>] : Object | Test.java:100:18:100:34 | map : ImmutableMultimap [<map.key>] : Object | provenance |  |
 | Test.java:2906:19:2906:21 | out : ImmutableMultimap [<map.key>] : Object | Test.java:2906:9:2906:22 | getMapKey(...) | provenance | MaD:373 |
 | Test.java:2911:18:2911:63 | (...)... : ImmutableMultimap [<map.value>] : Object | Test.java:2912:35:2912:36 | in : ImmutableMultimap [<map.value>] : Object | provenance |  |
 | Test.java:2911:28:2911:63 | of(...) : ImmutableMultimap [<map.value>] : Object | Test.java:2911:18:2911:63 | (...)... : ImmutableMultimap [<map.value>] : Object | provenance |  |
-| Test.java:2911:55:2911:62 | source(...) : Object | Test.java:2911:28:2911:63 | of(...) : ImmutableMultimap [<map.value>] : Object | provenance | MaD:104 |
+| Test.java:2911:55:2911:62 | source(...) : Object | Test.java:2911:28:2911:63 | of(...) : ImmutableMultimap [<map.value>] : Object | provenance | MaD:122 |
 | Test.java:2912:10:2912:37 | copyOf(...) : ImmutableMultimap [<map.value>] : Object | Test.java:2913:21:2913:23 | out : ImmutableMultimap [<map.value>] : Object | provenance |  |
-| Test.java:2912:35:2912:36 | in : ImmutableMultimap [<map.value>] : Object | Test.java:2912:10:2912:37 | copyOf(...) : ImmutableMultimap [<map.value>] : Object | provenance | MaD:100 |
+| Test.java:2912:35:2912:36 | in : ImmutableMultimap [<map.value>] : Object | Test.java:2912:10:2912:37 | copyOf(...) : ImmutableMultimap [<map.value>] : Object | provenance | MaD:118 |
 | Test.java:2913:21:2913:23 | out : ImmutableMultimap [<map.value>] : Object | Test.java:119:20:119:36 | map : ImmutableMultimap [<map.value>] : Object | provenance |  |
 | Test.java:2913:21:2913:23 | out : ImmutableMultimap [<map.value>] : Object | Test.java:2913:9:2913:24 | getMapValue(...) | provenance | MaD:385 |
 | Test.java:2918:30:2918:90 | (...)... : ImmutableSetMultimap [<map.key>] : Object | Test.java:2919:10:2919:11 | in : ImmutableSetMultimap [<map.key>] : Object | provenance |  |
 | Test.java:2918:52:2918:90 | of(...) : ImmutableSetMultimap [<map.key>] : Object | Test.java:2918:30:2918:90 | (...)... : ImmutableSetMultimap [<map.key>] : Object | provenance |  |
 | Test.java:2918:76:2918:83 | source(...) : Object | Test.java:2918:52:2918:90 | of(...) : ImmutableSetMultimap [<map.key>] : Object | provenance | MaD:145 |
-| Test.java:2919:10:2919:11 | in : ImmutableSetMultimap [<map.key>] : Object | Test.java:2919:10:2919:21 | inverse(...) : ImmutableSetMultimap [<map.value>] : Object | provenance | MaD:101 |
+| Test.java:2919:10:2919:11 | in : ImmutableSetMultimap [<map.key>] : Object | Test.java:2919:10:2919:21 | inverse(...) : ImmutableSetMultimap [<map.value>] : Object | provenance | MaD:119 |
 | Test.java:2919:10:2919:21 | inverse(...) : ImmutableSetMultimap [<map.value>] : Object | Test.java:2920:21:2920:23 | out : ImmutableSetMultimap [<map.value>] : Object | provenance |  |
 | Test.java:2920:21:2920:23 | out : ImmutableSetMultimap [<map.value>] : Object | Test.java:119:20:119:36 | map : ImmutableSetMultimap [<map.value>] : Object | provenance |  |
 | Test.java:2920:21:2920:23 | out : ImmutableSetMultimap [<map.value>] : Object | Test.java:2920:9:2920:24 | getMapValue(...) | provenance | MaD:385 |
 | Test.java:2925:27:2925:81 | (...)... : ImmutableMultimap [<map.key>] : Object | Test.java:2926:10:2926:11 | in : ImmutableMultimap [<map.key>] : Object | provenance |  |
 | Test.java:2925:46:2925:81 | of(...) : ImmutableMultimap [<map.key>] : Object | Test.java:2925:27:2925:81 | (...)... : ImmutableMultimap [<map.key>] : Object | provenance |  |
-| Test.java:2925:67:2925:74 | source(...) : Object | Test.java:2925:46:2925:81 | of(...) : ImmutableMultimap [<map.key>] : Object | provenance | MaD:103 |
-| Test.java:2926:10:2926:11 | in : ImmutableMultimap [<map.key>] : Object | Test.java:2926:10:2926:21 | inverse(...) : ImmutableMultimap [<map.value>] : Object | provenance | MaD:101 |
+| Test.java:2925:67:2925:74 | source(...) : Object | Test.java:2925:46:2925:81 | of(...) : ImmutableMultimap [<map.key>] : Object | provenance | MaD:121 |
+| Test.java:2926:10:2926:11 | in : ImmutableMultimap [<map.key>] : Object | Test.java:2926:10:2926:21 | inverse(...) : ImmutableMultimap [<map.value>] : Object | provenance | MaD:119 |
 | Test.java:2926:10:2926:21 | inverse(...) : ImmutableMultimap [<map.value>] : Object | Test.java:2927:21:2927:23 | out : ImmutableMultimap [<map.value>] : Object | provenance |  |
 | Test.java:2927:21:2927:23 | out : ImmutableMultimap [<map.value>] : Object | Test.java:119:20:119:36 | map : ImmutableMultimap [<map.value>] : Object | provenance |  |
 | Test.java:2927:21:2927:23 | out : ImmutableMultimap [<map.value>] : Object | Test.java:2927:9:2927:24 | getMapValue(...) | provenance | MaD:385 |
 | Test.java:2932:31:2932:93 | (...)... : ImmutableListMultimap [<map.key>] : Object | Test.java:2933:10:2933:11 | in : ImmutableListMultimap [<map.key>] : Object | provenance |  |
 | Test.java:2932:54:2932:93 | of(...) : ImmutableListMultimap [<map.key>] : Object | Test.java:2932:31:2932:93 | (...)... : ImmutableListMultimap [<map.key>] : Object | provenance |  |
 | Test.java:2932:79:2932:86 | source(...) : Object | Test.java:2932:54:2932:93 | of(...) : ImmutableListMultimap [<map.key>] : Object | provenance | MaD:60 |
-| Test.java:2933:10:2933:11 | in : ImmutableListMultimap [<map.key>] : Object | Test.java:2933:10:2933:21 | inverse(...) : ImmutableListMultimap [<map.value>] : Object | provenance | MaD:101 |
+| Test.java:2933:10:2933:11 | in : ImmutableListMultimap [<map.key>] : Object | Test.java:2933:10:2933:21 | inverse(...) : ImmutableListMultimap [<map.value>] : Object | provenance | MaD:119 |
 | Test.java:2933:10:2933:21 | inverse(...) : ImmutableListMultimap [<map.value>] : Object | Test.java:2934:21:2934:23 | out : ImmutableListMultimap [<map.value>] : Object | provenance |  |
 | Test.java:2934:21:2934:23 | out : ImmutableListMultimap [<map.value>] : Object | Test.java:119:20:119:36 | map : ImmutableListMultimap [<map.value>] : Object | provenance |  |
 | Test.java:2934:21:2934:23 | out : ImmutableListMultimap [<map.value>] : Object | Test.java:2934:9:2934:24 | getMapValue(...) | provenance | MaD:385 |
 | Test.java:2939:30:2939:90 | (...)... : ImmutableSetMultimap [<map.value>] : Object | Test.java:2940:10:2940:11 | in : ImmutableSetMultimap [<map.value>] : Object | provenance |  |
 | Test.java:2939:52:2939:90 | of(...) : ImmutableSetMultimap [<map.value>] : Object | Test.java:2939:30:2939:90 | (...)... : ImmutableSetMultimap [<map.value>] : Object | provenance |  |
 | Test.java:2939:82:2939:89 | source(...) : Object | Test.java:2939:52:2939:90 | of(...) : ImmutableSetMultimap [<map.value>] : Object | provenance | MaD:146 |
-| Test.java:2940:10:2940:11 | in : ImmutableSetMultimap [<map.value>] : Object | Test.java:2940:10:2940:21 | inverse(...) : ImmutableSetMultimap [<map.key>] : Object | provenance | MaD:102 |
+| Test.java:2940:10:2940:11 | in : ImmutableSetMultimap [<map.value>] : Object | Test.java:2940:10:2940:21 | inverse(...) : ImmutableSetMultimap [<map.key>] : Object | provenance | MaD:120 |
 | Test.java:2940:10:2940:21 | inverse(...) : ImmutableSetMultimap [<map.key>] : Object | Test.java:2941:19:2941:21 | out : ImmutableSetMultimap [<map.key>] : Object | provenance |  |
 | Test.java:2941:19:2941:21 | out : ImmutableSetMultimap [<map.key>] : Object | Test.java:100:18:100:34 | map : ImmutableSetMultimap [<map.key>] : Object | provenance |  |
 | Test.java:2941:19:2941:21 | out : ImmutableSetMultimap [<map.key>] : Object | Test.java:2941:9:2941:22 | getMapKey(...) | provenance | MaD:373 |
 | Test.java:2946:27:2946:81 | (...)... : ImmutableMultimap [<map.value>] : Object | Test.java:2947:10:2947:11 | in : ImmutableMultimap [<map.value>] : Object | provenance |  |
 | Test.java:2946:46:2946:81 | of(...) : ImmutableMultimap [<map.value>] : Object | Test.java:2946:27:2946:81 | (...)... : ImmutableMultimap [<map.value>] : Object | provenance |  |
-| Test.java:2946:73:2946:80 | source(...) : Object | Test.java:2946:46:2946:81 | of(...) : ImmutableMultimap [<map.value>] : Object | provenance | MaD:104 |
-| Test.java:2947:10:2947:11 | in : ImmutableMultimap [<map.value>] : Object | Test.java:2947:10:2947:21 | inverse(...) : ImmutableMultimap [<map.key>] : Object | provenance | MaD:102 |
+| Test.java:2946:73:2946:80 | source(...) : Object | Test.java:2946:46:2946:81 | of(...) : ImmutableMultimap [<map.value>] : Object | provenance | MaD:122 |
+| Test.java:2947:10:2947:11 | in : ImmutableMultimap [<map.value>] : Object | Test.java:2947:10:2947:21 | inverse(...) : ImmutableMultimap [<map.key>] : Object | provenance | MaD:120 |
 | Test.java:2947:10:2947:21 | inverse(...) : ImmutableMultimap [<map.key>] : Object | Test.java:2948:19:2948:21 | out : ImmutableMultimap [<map.key>] : Object | provenance |  |
 | Test.java:2948:19:2948:21 | out : ImmutableMultimap [<map.key>] : Object | Test.java:100:18:100:34 | map : ImmutableMultimap [<map.key>] : Object | provenance |  |
 | Test.java:2948:19:2948:21 | out : ImmutableMultimap [<map.key>] : Object | Test.java:2948:9:2948:22 | getMapKey(...) | provenance | MaD:373 |
 | Test.java:2953:31:2953:93 | (...)... : ImmutableListMultimap [<map.value>] : Object | Test.java:2954:10:2954:11 | in : ImmutableListMultimap [<map.value>] : Object | provenance |  |
 | Test.java:2953:54:2953:93 | of(...) : ImmutableListMultimap [<map.value>] : Object | Test.java:2953:31:2953:93 | (...)... : ImmutableListMultimap [<map.value>] : Object | provenance |  |
 | Test.java:2953:85:2953:92 | source(...) : Object | Test.java:2953:54:2953:93 | of(...) : ImmutableListMultimap [<map.value>] : Object | provenance | MaD:61 |
-| Test.java:2954:10:2954:11 | in : ImmutableListMultimap [<map.value>] : Object | Test.java:2954:10:2954:21 | inverse(...) : ImmutableListMultimap [<map.key>] : Object | provenance | MaD:102 |
+| Test.java:2954:10:2954:11 | in : ImmutableListMultimap [<map.value>] : Object | Test.java:2954:10:2954:21 | inverse(...) : ImmutableListMultimap [<map.key>] : Object | provenance | MaD:120 |
 | Test.java:2954:10:2954:21 | inverse(...) : ImmutableListMultimap [<map.key>] : Object | Test.java:2955:19:2955:21 | out : ImmutableListMultimap [<map.key>] : Object | provenance |  |
 | Test.java:2955:19:2955:21 | out : ImmutableListMultimap [<map.key>] : Object | Test.java:100:18:100:34 | map : ImmutableListMultimap [<map.key>] : Object | provenance |  |
 | Test.java:2955:19:2955:21 | out : ImmutableListMultimap [<map.key>] : Object | Test.java:2955:9:2955:22 | getMapKey(...) | provenance | MaD:373 |
 | Test.java:2960:16:2960:31 | (...)... : Object | Test.java:2961:31:2961:32 | in : Object | provenance |  |
 | Test.java:2960:24:2960:31 | source(...) : Object | Test.java:2960:16:2960:31 | (...)... : Object | provenance |  |
 | Test.java:2961:10:2961:87 | of(...) : ImmutableMultimap [<map.key>] : Object | Test.java:2962:19:2962:21 | out : ImmutableMultimap [<map.key>] : Object | provenance |  |
-| Test.java:2961:31:2961:32 | in : Object | Test.java:2961:10:2961:87 | of(...) : ImmutableMultimap [<map.key>] : Object | provenance | MaD:103 |
+| Test.java:2961:31:2961:32 | in : Object | Test.java:2961:10:2961:87 | of(...) : ImmutableMultimap [<map.key>] : Object | provenance | MaD:121 |
 | Test.java:2962:19:2962:21 | out : ImmutableMultimap [<map.key>] : Object | Test.java:100:18:100:34 | map : ImmutableMultimap [<map.key>] : Object | provenance |  |
 | Test.java:2962:19:2962:21 | out : ImmutableMultimap [<map.key>] : Object | Test.java:2962:9:2962:22 | getMapKey(...) | provenance | MaD:373 |
 | Test.java:2967:16:2967:31 | (...)... : Object | Test.java:2968:31:2968:32 | in : Object | provenance |  |
 | Test.java:2967:24:2967:31 | source(...) : Object | Test.java:2967:16:2967:31 | (...)... : Object | provenance |  |
 | Test.java:2968:10:2968:75 | of(...) : ImmutableMultimap [<map.key>] : Object | Test.java:2969:19:2969:21 | out : ImmutableMultimap [<map.key>] : Object | provenance |  |
-| Test.java:2968:31:2968:32 | in : Object | Test.java:2968:10:2968:75 | of(...) : ImmutableMultimap [<map.key>] : Object | provenance | MaD:103 |
+| Test.java:2968:31:2968:32 | in : Object | Test.java:2968:10:2968:75 | of(...) : ImmutableMultimap [<map.key>] : Object | provenance | MaD:121 |
 | Test.java:2969:19:2969:21 | out : ImmutableMultimap [<map.key>] : Object | Test.java:100:18:100:34 | map : ImmutableMultimap [<map.key>] : Object | provenance |  |
 | Test.java:2969:19:2969:21 | out : ImmutableMultimap [<map.key>] : Object | Test.java:2969:9:2969:22 | getMapKey(...) | provenance | MaD:373 |
 | Test.java:2974:16:2974:31 | (...)... : Object | Test.java:2975:31:2975:32 | in : Object | provenance |  |
 | Test.java:2974:24:2974:31 | source(...) : Object | Test.java:2974:16:2974:31 | (...)... : Object | provenance |  |
 | Test.java:2975:10:2975:63 | of(...) : ImmutableMultimap [<map.key>] : Object | Test.java:2976:19:2976:21 | out : ImmutableMultimap [<map.key>] : Object | provenance |  |
-| Test.java:2975:31:2975:32 | in : Object | Test.java:2975:10:2975:63 | of(...) : ImmutableMultimap [<map.key>] : Object | provenance | MaD:103 |
+| Test.java:2975:31:2975:32 | in : Object | Test.java:2975:10:2975:63 | of(...) : ImmutableMultimap [<map.key>] : Object | provenance | MaD:121 |
 | Test.java:2976:19:2976:21 | out : ImmutableMultimap [<map.key>] : Object | Test.java:100:18:100:34 | map : ImmutableMultimap [<map.key>] : Object | provenance |  |
 | Test.java:2976:19:2976:21 | out : ImmutableMultimap [<map.key>] : Object | Test.java:2976:9:2976:22 | getMapKey(...) | provenance | MaD:373 |
 | Test.java:2981:16:2981:31 | (...)... : Object | Test.java:2982:31:2982:32 | in : Object | provenance |  |
 | Test.java:2981:24:2981:31 | source(...) : Object | Test.java:2981:16:2981:31 | (...)... : Object | provenance |  |
 | Test.java:2982:10:2982:51 | of(...) : ImmutableMultimap [<map.key>] : Object | Test.java:2983:19:2983:21 | out : ImmutableMultimap [<map.key>] : Object | provenance |  |
-| Test.java:2982:31:2982:32 | in : Object | Test.java:2982:10:2982:51 | of(...) : ImmutableMultimap [<map.key>] : Object | provenance | MaD:103 |
+| Test.java:2982:31:2982:32 | in : Object | Test.java:2982:10:2982:51 | of(...) : ImmutableMultimap [<map.key>] : Object | provenance | MaD:121 |
 | Test.java:2983:19:2983:21 | out : ImmutableMultimap [<map.key>] : Object | Test.java:100:18:100:34 | map : ImmutableMultimap [<map.key>] : Object | provenance |  |
 | Test.java:2983:19:2983:21 | out : ImmutableMultimap [<map.key>] : Object | Test.java:2983:9:2983:22 | getMapKey(...) | provenance | MaD:373 |
 | Test.java:2988:16:2988:31 | (...)... : Object | Test.java:2989:31:2989:32 | in : Object | provenance |  |
 | Test.java:2988:24:2988:31 | source(...) : Object | Test.java:2988:16:2988:31 | (...)... : Object | provenance |  |
 | Test.java:2989:10:2989:39 | of(...) : ImmutableMultimap [<map.key>] : Object | Test.java:2990:19:2990:21 | out : ImmutableMultimap [<map.key>] : Object | provenance |  |
-| Test.java:2989:31:2989:32 | in : Object | Test.java:2989:10:2989:39 | of(...) : ImmutableMultimap [<map.key>] : Object | provenance | MaD:103 |
+| Test.java:2989:31:2989:32 | in : Object | Test.java:2989:10:2989:39 | of(...) : ImmutableMultimap [<map.key>] : Object | provenance | MaD:121 |
 | Test.java:2990:19:2990:21 | out : ImmutableMultimap [<map.key>] : Object | Test.java:100:18:100:34 | map : ImmutableMultimap [<map.key>] : Object | provenance |  |
 | Test.java:2990:19:2990:21 | out : ImmutableMultimap [<map.key>] : Object | Test.java:2990:9:2990:22 | getMapKey(...) | provenance | MaD:373 |
 | Test.java:2995:16:2995:31 | (...)... : Object | Test.java:2996:37:2996:38 | in : Object | provenance |  |
 | Test.java:2995:24:2995:31 | source(...) : Object | Test.java:2995:16:2995:31 | (...)... : Object | provenance |  |
 | Test.java:2996:10:2996:87 | of(...) : ImmutableMultimap [<map.value>] : Object | Test.java:2997:21:2997:23 | out : ImmutableMultimap [<map.value>] : Object | provenance |  |
-| Test.java:2996:37:2996:38 | in : Object | Test.java:2996:10:2996:87 | of(...) : ImmutableMultimap [<map.value>] : Object | provenance | MaD:104 |
+| Test.java:2996:37:2996:38 | in : Object | Test.java:2996:10:2996:87 | of(...) : ImmutableMultimap [<map.value>] : Object | provenance | MaD:122 |
 | Test.java:2997:21:2997:23 | out : ImmutableMultimap [<map.value>] : Object | Test.java:119:20:119:36 | map : ImmutableMultimap [<map.value>] : Object | provenance |  |
 | Test.java:2997:21:2997:23 | out : ImmutableMultimap [<map.value>] : Object | Test.java:2997:9:2997:24 | getMapValue(...) | provenance | MaD:385 |
 | Test.java:3002:16:3002:31 | (...)... : Object | Test.java:3003:37:3003:38 | in : Object | provenance |  |
 | Test.java:3002:24:3002:31 | source(...) : Object | Test.java:3002:16:3002:31 | (...)... : Object | provenance |  |
 | Test.java:3003:10:3003:75 | of(...) : ImmutableMultimap [<map.value>] : Object | Test.java:3004:21:3004:23 | out : ImmutableMultimap [<map.value>] : Object | provenance |  |
-| Test.java:3003:37:3003:38 | in : Object | Test.java:3003:10:3003:75 | of(...) : ImmutableMultimap [<map.value>] : Object | provenance | MaD:104 |
+| Test.java:3003:37:3003:38 | in : Object | Test.java:3003:10:3003:75 | of(...) : ImmutableMultimap [<map.value>] : Object | provenance | MaD:122 |
 | Test.java:3004:21:3004:23 | out : ImmutableMultimap [<map.value>] : Object | Test.java:119:20:119:36 | map : ImmutableMultimap [<map.value>] : Object | provenance |  |
 | Test.java:3004:21:3004:23 | out : ImmutableMultimap [<map.value>] : Object | Test.java:3004:9:3004:24 | getMapValue(...) | provenance | MaD:385 |
 | Test.java:3009:16:3009:31 | (...)... : Object | Test.java:3010:37:3010:38 | in : Object | provenance |  |
 | Test.java:3009:24:3009:31 | source(...) : Object | Test.java:3009:16:3009:31 | (...)... : Object | provenance |  |
 | Test.java:3010:10:3010:63 | of(...) : ImmutableMultimap [<map.value>] : Object | Test.java:3011:21:3011:23 | out : ImmutableMultimap [<map.value>] : Object | provenance |  |
-| Test.java:3010:37:3010:38 | in : Object | Test.java:3010:10:3010:63 | of(...) : ImmutableMultimap [<map.value>] : Object | provenance | MaD:104 |
+| Test.java:3010:37:3010:38 | in : Object | Test.java:3010:10:3010:63 | of(...) : ImmutableMultimap [<map.value>] : Object | provenance | MaD:122 |
 | Test.java:3011:21:3011:23 | out : ImmutableMultimap [<map.value>] : Object | Test.java:119:20:119:36 | map : ImmutableMultimap [<map.value>] : Object | provenance |  |
 | Test.java:3011:21:3011:23 | out : ImmutableMultimap [<map.value>] : Object | Test.java:3011:9:3011:24 | getMapValue(...) | provenance | MaD:385 |
 | Test.java:3016:16:3016:31 | (...)... : Object | Test.java:3017:37:3017:38 | in : Object | provenance |  |
 | Test.java:3016:24:3016:31 | source(...) : Object | Test.java:3016:16:3016:31 | (...)... : Object | provenance |  |
 | Test.java:3017:10:3017:51 | of(...) : ImmutableMultimap [<map.value>] : Object | Test.java:3018:21:3018:23 | out : ImmutableMultimap [<map.value>] : Object | provenance |  |
-| Test.java:3017:37:3017:38 | in : Object | Test.java:3017:10:3017:51 | of(...) : ImmutableMultimap [<map.value>] : Object | provenance | MaD:104 |
+| Test.java:3017:37:3017:38 | in : Object | Test.java:3017:10:3017:51 | of(...) : ImmutableMultimap [<map.value>] : Object | provenance | MaD:122 |
 | Test.java:3018:21:3018:23 | out : ImmutableMultimap [<map.value>] : Object | Test.java:119:20:119:36 | map : ImmutableMultimap [<map.value>] : Object | provenance |  |
 | Test.java:3018:21:3018:23 | out : ImmutableMultimap [<map.value>] : Object | Test.java:3018:9:3018:24 | getMapValue(...) | provenance | MaD:385 |
 | Test.java:3023:16:3023:31 | (...)... : Object | Test.java:3024:37:3024:38 | in : Object | provenance |  |
 | Test.java:3023:24:3023:31 | source(...) : Object | Test.java:3023:16:3023:31 | (...)... : Object | provenance |  |
 | Test.java:3024:10:3024:39 | of(...) : ImmutableMultimap [<map.value>] : Object | Test.java:3025:21:3025:23 | out : ImmutableMultimap [<map.value>] : Object | provenance |  |
-| Test.java:3024:37:3024:38 | in : Object | Test.java:3024:10:3024:39 | of(...) : ImmutableMultimap [<map.value>] : Object | provenance | MaD:104 |
+| Test.java:3024:37:3024:38 | in : Object | Test.java:3024:10:3024:39 | of(...) : ImmutableMultimap [<map.value>] : Object | provenance | MaD:122 |
 | Test.java:3025:21:3025:23 | out : ImmutableMultimap [<map.value>] : Object | Test.java:119:20:119:36 | map : ImmutableMultimap [<map.value>] : Object | provenance |  |
 | Test.java:3025:21:3025:23 | out : ImmutableMultimap [<map.value>] : Object | Test.java:3025:9:3025:24 | getMapValue(...) | provenance | MaD:385 |
 | Test.java:3030:16:3030:31 | (...)... : Object | Test.java:3031:43:3031:44 | in : Object | provenance |  |
 | Test.java:3030:24:3030:31 | source(...) : Object | Test.java:3030:16:3030:31 | (...)... : Object | provenance |  |
 | Test.java:3031:10:3031:87 | of(...) : ImmutableMultimap [<map.key>] : Object | Test.java:3032:19:3032:21 | out : ImmutableMultimap [<map.key>] : Object | provenance |  |
-| Test.java:3031:43:3031:44 | in : Object | Test.java:3031:10:3031:87 | of(...) : ImmutableMultimap [<map.key>] : Object | provenance | MaD:105 |
+| Test.java:3031:43:3031:44 | in : Object | Test.java:3031:10:3031:87 | of(...) : ImmutableMultimap [<map.key>] : Object | provenance | MaD:123 |
 | Test.java:3032:19:3032:21 | out : ImmutableMultimap [<map.key>] : Object | Test.java:100:18:100:34 | map : ImmutableMultimap [<map.key>] : Object | provenance |  |
 | Test.java:3032:19:3032:21 | out : ImmutableMultimap [<map.key>] : Object | Test.java:3032:9:3032:22 | getMapKey(...) | provenance | MaD:373 |
 | Test.java:3037:16:3037:31 | (...)... : Object | Test.java:3038:43:3038:44 | in : Object | provenance |  |
 | Test.java:3037:24:3037:31 | source(...) : Object | Test.java:3037:16:3037:31 | (...)... : Object | provenance |  |
 | Test.java:3038:10:3038:75 | of(...) : ImmutableMultimap [<map.key>] : Object | Test.java:3039:19:3039:21 | out : ImmutableMultimap [<map.key>] : Object | provenance |  |
-| Test.java:3038:43:3038:44 | in : Object | Test.java:3038:10:3038:75 | of(...) : ImmutableMultimap [<map.key>] : Object | provenance | MaD:105 |
+| Test.java:3038:43:3038:44 | in : Object | Test.java:3038:10:3038:75 | of(...) : ImmutableMultimap [<map.key>] : Object | provenance | MaD:123 |
 | Test.java:3039:19:3039:21 | out : ImmutableMultimap [<map.key>] : Object | Test.java:100:18:100:34 | map : ImmutableMultimap [<map.key>] : Object | provenance |  |
 | Test.java:3039:19:3039:21 | out : ImmutableMultimap [<map.key>] : Object | Test.java:3039:9:3039:22 | getMapKey(...) | provenance | MaD:373 |
 | Test.java:3044:16:3044:31 | (...)... : Object | Test.java:3045:43:3045:44 | in : Object | provenance |  |
 | Test.java:3044:24:3044:31 | source(...) : Object | Test.java:3044:16:3044:31 | (...)... : Object | provenance |  |
 | Test.java:3045:10:3045:63 | of(...) : ImmutableMultimap [<map.key>] : Object | Test.java:3046:19:3046:21 | out : ImmutableMultimap [<map.key>] : Object | provenance |  |
-| Test.java:3045:43:3045:44 | in : Object | Test.java:3045:10:3045:63 | of(...) : ImmutableMultimap [<map.key>] : Object | provenance | MaD:105 |
+| Test.java:3045:43:3045:44 | in : Object | Test.java:3045:10:3045:63 | of(...) : ImmutableMultimap [<map.key>] : Object | provenance | MaD:123 |
 | Test.java:3046:19:3046:21 | out : ImmutableMultimap [<map.key>] : Object | Test.java:100:18:100:34 | map : ImmutableMultimap [<map.key>] : Object | provenance |  |
 | Test.java:3046:19:3046:21 | out : ImmutableMultimap [<map.key>] : Object | Test.java:3046:9:3046:22 | getMapKey(...) | provenance | MaD:373 |
 | Test.java:3051:16:3051:31 | (...)... : Object | Test.java:3052:43:3052:44 | in : Object | provenance |  |
 | Test.java:3051:24:3051:31 | source(...) : Object | Test.java:3051:16:3051:31 | (...)... : Object | provenance |  |
 | Test.java:3052:10:3052:51 | of(...) : ImmutableMultimap [<map.key>] : Object | Test.java:3053:19:3053:21 | out : ImmutableMultimap [<map.key>] : Object | provenance |  |
-| Test.java:3052:43:3052:44 | in : Object | Test.java:3052:10:3052:51 | of(...) : ImmutableMultimap [<map.key>] : Object | provenance | MaD:105 |
+| Test.java:3052:43:3052:44 | in : Object | Test.java:3052:10:3052:51 | of(...) : ImmutableMultimap [<map.key>] : Object | provenance | MaD:123 |
 | Test.java:3053:19:3053:21 | out : ImmutableMultimap [<map.key>] : Object | Test.java:100:18:100:34 | map : ImmutableMultimap [<map.key>] : Object | provenance |  |
 | Test.java:3053:19:3053:21 | out : ImmutableMultimap [<map.key>] : Object | Test.java:3053:9:3053:22 | getMapKey(...) | provenance | MaD:373 |
 | Test.java:3058:16:3058:31 | (...)... : Object | Test.java:3059:49:3059:50 | in : Object | provenance |  |
 | Test.java:3058:24:3058:31 | source(...) : Object | Test.java:3058:16:3058:31 | (...)... : Object | provenance |  |
 | Test.java:3059:10:3059:87 | of(...) : ImmutableMultimap [<map.value>] : Object | Test.java:3060:21:3060:23 | out : ImmutableMultimap [<map.value>] : Object | provenance |  |
-| Test.java:3059:49:3059:50 | in : Object | Test.java:3059:10:3059:87 | of(...) : ImmutableMultimap [<map.value>] : Object | provenance | MaD:106 |
+| Test.java:3059:49:3059:50 | in : Object | Test.java:3059:10:3059:87 | of(...) : ImmutableMultimap [<map.value>] : Object | provenance | MaD:124 |
 | Test.java:3060:21:3060:23 | out : ImmutableMultimap [<map.value>] : Object | Test.java:119:20:119:36 | map : ImmutableMultimap [<map.value>] : Object | provenance |  |
 | Test.java:3060:21:3060:23 | out : ImmutableMultimap [<map.value>] : Object | Test.java:3060:9:3060:24 | getMapValue(...) | provenance | MaD:385 |
 | Test.java:3065:16:3065:31 | (...)... : Object | Test.java:3066:49:3066:50 | in : Object | provenance |  |
 | Test.java:3065:24:3065:31 | source(...) : Object | Test.java:3065:16:3065:31 | (...)... : Object | provenance |  |
 | Test.java:3066:10:3066:75 | of(...) : ImmutableMultimap [<map.value>] : Object | Test.java:3067:21:3067:23 | out : ImmutableMultimap [<map.value>] : Object | provenance |  |
-| Test.java:3066:49:3066:50 | in : Object | Test.java:3066:10:3066:75 | of(...) : ImmutableMultimap [<map.value>] : Object | provenance | MaD:106 |
+| Test.java:3066:49:3066:50 | in : Object | Test.java:3066:10:3066:75 | of(...) : ImmutableMultimap [<map.value>] : Object | provenance | MaD:124 |
 | Test.java:3067:21:3067:23 | out : ImmutableMultimap [<map.value>] : Object | Test.java:119:20:119:36 | map : ImmutableMultimap [<map.value>] : Object | provenance |  |
 | Test.java:3067:21:3067:23 | out : ImmutableMultimap [<map.value>] : Object | Test.java:3067:9:3067:24 | getMapValue(...) | provenance | MaD:385 |
 | Test.java:3072:16:3072:31 | (...)... : Object | Test.java:3073:49:3073:50 | in : Object | provenance |  |
 | Test.java:3072:24:3072:31 | source(...) : Object | Test.java:3072:16:3072:31 | (...)... : Object | provenance |  |
 | Test.java:3073:10:3073:63 | of(...) : ImmutableMultimap [<map.value>] : Object | Test.java:3074:21:3074:23 | out : ImmutableMultimap [<map.value>] : Object | provenance |  |
-| Test.java:3073:49:3073:50 | in : Object | Test.java:3073:10:3073:63 | of(...) : ImmutableMultimap [<map.value>] : Object | provenance | MaD:106 |
+| Test.java:3073:49:3073:50 | in : Object | Test.java:3073:10:3073:63 | of(...) : ImmutableMultimap [<map.value>] : Object | provenance | MaD:124 |
 | Test.java:3074:21:3074:23 | out : ImmutableMultimap [<map.value>] : Object | Test.java:119:20:119:36 | map : ImmutableMultimap [<map.value>] : Object | provenance |  |
 | Test.java:3074:21:3074:23 | out : ImmutableMultimap [<map.value>] : Object | Test.java:3074:9:3074:24 | getMapValue(...) | provenance | MaD:385 |
 | Test.java:3079:16:3079:31 | (...)... : Object | Test.java:3080:49:3080:50 | in : Object | provenance |  |
 | Test.java:3079:24:3079:31 | source(...) : Object | Test.java:3079:16:3079:31 | (...)... : Object | provenance |  |
 | Test.java:3080:10:3080:51 | of(...) : ImmutableMultimap [<map.value>] : Object | Test.java:3081:21:3081:23 | out : ImmutableMultimap [<map.value>] : Object | provenance |  |
-| Test.java:3080:49:3080:50 | in : Object | Test.java:3080:10:3080:51 | of(...) : ImmutableMultimap [<map.value>] : Object | provenance | MaD:106 |
+| Test.java:3080:49:3080:50 | in : Object | Test.java:3080:10:3080:51 | of(...) : ImmutableMultimap [<map.value>] : Object | provenance | MaD:124 |
 | Test.java:3081:21:3081:23 | out : ImmutableMultimap [<map.value>] : Object | Test.java:119:20:119:36 | map : ImmutableMultimap [<map.value>] : Object | provenance |  |
 | Test.java:3081:21:3081:23 | out : ImmutableMultimap [<map.value>] : Object | Test.java:3081:9:3081:24 | getMapValue(...) | provenance | MaD:385 |
 | Test.java:3086:16:3086:31 | (...)... : Object | Test.java:3087:55:3087:56 | in : Object | provenance |  |
 | Test.java:3086:24:3086:31 | source(...) : Object | Test.java:3086:16:3086:31 | (...)... : Object | provenance |  |
 | Test.java:3087:10:3087:87 | of(...) : ImmutableMultimap [<map.key>] : Object | Test.java:3088:19:3088:21 | out : ImmutableMultimap [<map.key>] : Object | provenance |  |
-| Test.java:3087:55:3087:56 | in : Object | Test.java:3087:10:3087:87 | of(...) : ImmutableMultimap [<map.key>] : Object | provenance | MaD:107 |
+| Test.java:3087:55:3087:56 | in : Object | Test.java:3087:10:3087:87 | of(...) : ImmutableMultimap [<map.key>] : Object | provenance | MaD:125 |
 | Test.java:3088:19:3088:21 | out : ImmutableMultimap [<map.key>] : Object | Test.java:100:18:100:34 | map : ImmutableMultimap [<map.key>] : Object | provenance |  |
 | Test.java:3088:19:3088:21 | out : ImmutableMultimap [<map.key>] : Object | Test.java:3088:9:3088:22 | getMapKey(...) | provenance | MaD:373 |
 | Test.java:3093:16:3093:31 | (...)... : Object | Test.java:3094:55:3094:56 | in : Object | provenance |  |
 | Test.java:3093:24:3093:31 | source(...) : Object | Test.java:3093:16:3093:31 | (...)... : Object | provenance |  |
 | Test.java:3094:10:3094:75 | of(...) : ImmutableMultimap [<map.key>] : Object | Test.java:3095:19:3095:21 | out : ImmutableMultimap [<map.key>] : Object | provenance |  |
-| Test.java:3094:55:3094:56 | in : Object | Test.java:3094:10:3094:75 | of(...) : ImmutableMultimap [<map.key>] : Object | provenance | MaD:107 |
+| Test.java:3094:55:3094:56 | in : Object | Test.java:3094:10:3094:75 | of(...) : ImmutableMultimap [<map.key>] : Object | provenance | MaD:125 |
 | Test.java:3095:19:3095:21 | out : ImmutableMultimap [<map.key>] : Object | Test.java:100:18:100:34 | map : ImmutableMultimap [<map.key>] : Object | provenance |  |
 | Test.java:3095:19:3095:21 | out : ImmutableMultimap [<map.key>] : Object | Test.java:3095:9:3095:22 | getMapKey(...) | provenance | MaD:373 |
 | Test.java:3100:16:3100:31 | (...)... : Object | Test.java:3101:55:3101:56 | in : Object | provenance |  |
 | Test.java:3100:24:3100:31 | source(...) : Object | Test.java:3100:16:3100:31 | (...)... : Object | provenance |  |
 | Test.java:3101:10:3101:63 | of(...) : ImmutableMultimap [<map.key>] : Object | Test.java:3102:19:3102:21 | out : ImmutableMultimap [<map.key>] : Object | provenance |  |
-| Test.java:3101:55:3101:56 | in : Object | Test.java:3101:10:3101:63 | of(...) : ImmutableMultimap [<map.key>] : Object | provenance | MaD:107 |
+| Test.java:3101:55:3101:56 | in : Object | Test.java:3101:10:3101:63 | of(...) : ImmutableMultimap [<map.key>] : Object | provenance | MaD:125 |
 | Test.java:3102:19:3102:21 | out : ImmutableMultimap [<map.key>] : Object | Test.java:100:18:100:34 | map : ImmutableMultimap [<map.key>] : Object | provenance |  |
 | Test.java:3102:19:3102:21 | out : ImmutableMultimap [<map.key>] : Object | Test.java:3102:9:3102:22 | getMapKey(...) | provenance | MaD:373 |
 | Test.java:3107:16:3107:31 | (...)... : Object | Test.java:3108:61:3108:62 | in : Object | provenance |  |
 | Test.java:3107:24:3107:31 | source(...) : Object | Test.java:3107:16:3107:31 | (...)... : Object | provenance |  |
 | Test.java:3108:10:3108:87 | of(...) : ImmutableMultimap [<map.value>] : Object | Test.java:3109:21:3109:23 | out : ImmutableMultimap [<map.value>] : Object | provenance |  |
-| Test.java:3108:61:3108:62 | in : Object | Test.java:3108:10:3108:87 | of(...) : ImmutableMultimap [<map.value>] : Object | provenance | MaD:108 |
+| Test.java:3108:61:3108:62 | in : Object | Test.java:3108:10:3108:87 | of(...) : ImmutableMultimap [<map.value>] : Object | provenance | MaD:126 |
 | Test.java:3109:21:3109:23 | out : ImmutableMultimap [<map.value>] : Object | Test.java:119:20:119:36 | map : ImmutableMultimap [<map.value>] : Object | provenance |  |
 | Test.java:3109:21:3109:23 | out : ImmutableMultimap [<map.value>] : Object | Test.java:3109:9:3109:24 | getMapValue(...) | provenance | MaD:385 |
 | Test.java:3114:16:3114:31 | (...)... : Object | Test.java:3115:61:3115:62 | in : Object | provenance |  |
 | Test.java:3114:24:3114:31 | source(...) : Object | Test.java:3114:16:3114:31 | (...)... : Object | provenance |  |
 | Test.java:3115:10:3115:75 | of(...) : ImmutableMultimap [<map.value>] : Object | Test.java:3116:21:3116:23 | out : ImmutableMultimap [<map.value>] : Object | provenance |  |
-| Test.java:3115:61:3115:62 | in : Object | Test.java:3115:10:3115:75 | of(...) : ImmutableMultimap [<map.value>] : Object | provenance | MaD:108 |
+| Test.java:3115:61:3115:62 | in : Object | Test.java:3115:10:3115:75 | of(...) : ImmutableMultimap [<map.value>] : Object | provenance | MaD:126 |
 | Test.java:3116:21:3116:23 | out : ImmutableMultimap [<map.value>] : Object | Test.java:119:20:119:36 | map : ImmutableMultimap [<map.value>] : Object | provenance |  |
 | Test.java:3116:21:3116:23 | out : ImmutableMultimap [<map.value>] : Object | Test.java:3116:9:3116:24 | getMapValue(...) | provenance | MaD:385 |
 | Test.java:3121:16:3121:31 | (...)... : Object | Test.java:3122:61:3122:62 | in : Object | provenance |  |
 | Test.java:3121:24:3121:31 | source(...) : Object | Test.java:3121:16:3121:31 | (...)... : Object | provenance |  |
 | Test.java:3122:10:3122:63 | of(...) : ImmutableMultimap [<map.value>] : Object | Test.java:3123:21:3123:23 | out : ImmutableMultimap [<map.value>] : Object | provenance |  |
-| Test.java:3122:61:3122:62 | in : Object | Test.java:3122:10:3122:63 | of(...) : ImmutableMultimap [<map.value>] : Object | provenance | MaD:108 |
+| Test.java:3122:61:3122:62 | in : Object | Test.java:3122:10:3122:63 | of(...) : ImmutableMultimap [<map.value>] : Object | provenance | MaD:126 |
 | Test.java:3123:21:3123:23 | out : ImmutableMultimap [<map.value>] : Object | Test.java:119:20:119:36 | map : ImmutableMultimap [<map.value>] : Object | provenance |  |
 | Test.java:3123:21:3123:23 | out : ImmutableMultimap [<map.value>] : Object | Test.java:3123:9:3123:24 | getMapValue(...) | provenance | MaD:385 |
 | Test.java:3128:16:3128:31 | (...)... : Object | Test.java:3129:67:3129:68 | in : Object | provenance |  |
 | Test.java:3128:24:3128:31 | source(...) : Object | Test.java:3128:16:3128:31 | (...)... : Object | provenance |  |
 | Test.java:3129:10:3129:87 | of(...) : ImmutableMultimap [<map.key>] : Object | Test.java:3130:19:3130:21 | out : ImmutableMultimap [<map.key>] : Object | provenance |  |
-| Test.java:3129:67:3129:68 | in : Object | Test.java:3129:10:3129:87 | of(...) : ImmutableMultimap [<map.key>] : Object | provenance | MaD:109 |
+| Test.java:3129:67:3129:68 | in : Object | Test.java:3129:10:3129:87 | of(...) : ImmutableMultimap [<map.key>] : Object | provenance | MaD:127 |
 | Test.java:3130:19:3130:21 | out : ImmutableMultimap [<map.key>] : Object | Test.java:100:18:100:34 | map : ImmutableMultimap [<map.key>] : Object | provenance |  |
 | Test.java:3130:19:3130:21 | out : ImmutableMultimap [<map.key>] : Object | Test.java:3130:9:3130:22 | getMapKey(...) | provenance | MaD:373 |
 | Test.java:3135:16:3135:31 | (...)... : Object | Test.java:3136:67:3136:68 | in : Object | provenance |  |
 | Test.java:3135:24:3135:31 | source(...) : Object | Test.java:3135:16:3135:31 | (...)... : Object | provenance |  |
 | Test.java:3136:10:3136:75 | of(...) : ImmutableMultimap [<map.key>] : Object | Test.java:3137:19:3137:21 | out : ImmutableMultimap [<map.key>] : Object | provenance |  |
-| Test.java:3136:67:3136:68 | in : Object | Test.java:3136:10:3136:75 | of(...) : ImmutableMultimap [<map.key>] : Object | provenance | MaD:109 |
+| Test.java:3136:67:3136:68 | in : Object | Test.java:3136:10:3136:75 | of(...) : ImmutableMultimap [<map.key>] : Object | provenance | MaD:127 |
 | Test.java:3137:19:3137:21 | out : ImmutableMultimap [<map.key>] : Object | Test.java:100:18:100:34 | map : ImmutableMultimap [<map.key>] : Object | provenance |  |
 | Test.java:3137:19:3137:21 | out : ImmutableMultimap [<map.key>] : Object | Test.java:3137:9:3137:22 | getMapKey(...) | provenance | MaD:373 |
 | Test.java:3142:16:3142:31 | (...)... : Object | Test.java:3143:73:3143:74 | in : Object | provenance |  |
 | Test.java:3142:24:3142:31 | source(...) : Object | Test.java:3142:16:3142:31 | (...)... : Object | provenance |  |
 | Test.java:3143:10:3143:87 | of(...) : ImmutableMultimap [<map.value>] : Object | Test.java:3144:21:3144:23 | out : ImmutableMultimap [<map.value>] : Object | provenance |  |
-| Test.java:3143:73:3143:74 | in : Object | Test.java:3143:10:3143:87 | of(...) : ImmutableMultimap [<map.value>] : Object | provenance | MaD:110 |
+| Test.java:3143:73:3143:74 | in : Object | Test.java:3143:10:3143:87 | of(...) : ImmutableMultimap [<map.value>] : Object | provenance | MaD:128 |
 | Test.java:3144:21:3144:23 | out : ImmutableMultimap [<map.value>] : Object | Test.java:119:20:119:36 | map : ImmutableMultimap [<map.value>] : Object | provenance |  |
 | Test.java:3144:21:3144:23 | out : ImmutableMultimap [<map.value>] : Object | Test.java:3144:9:3144:24 | getMapValue(...) | provenance | MaD:385 |
 | Test.java:3149:16:3149:31 | (...)... : Object | Test.java:3150:73:3150:74 | in : Object | provenance |  |
 | Test.java:3149:24:3149:31 | source(...) : Object | Test.java:3149:16:3149:31 | (...)... : Object | provenance |  |
 | Test.java:3150:10:3150:75 | of(...) : ImmutableMultimap [<map.value>] : Object | Test.java:3151:21:3151:23 | out : ImmutableMultimap [<map.value>] : Object | provenance |  |
-| Test.java:3150:73:3150:74 | in : Object | Test.java:3150:10:3150:75 | of(...) : ImmutableMultimap [<map.value>] : Object | provenance | MaD:110 |
+| Test.java:3150:73:3150:74 | in : Object | Test.java:3150:10:3150:75 | of(...) : ImmutableMultimap [<map.value>] : Object | provenance | MaD:128 |
 | Test.java:3151:21:3151:23 | out : ImmutableMultimap [<map.value>] : Object | Test.java:119:20:119:36 | map : ImmutableMultimap [<map.value>] : Object | provenance |  |
 | Test.java:3151:21:3151:23 | out : ImmutableMultimap [<map.value>] : Object | Test.java:3151:9:3151:24 | getMapValue(...) | provenance | MaD:385 |
 | Test.java:3156:16:3156:31 | (...)... : Object | Test.java:3157:79:3157:80 | in : Object | provenance |  |
 | Test.java:3156:24:3156:31 | source(...) : Object | Test.java:3156:16:3156:31 | (...)... : Object | provenance |  |
 | Test.java:3157:10:3157:87 | of(...) : ImmutableMultimap [<map.key>] : Object | Test.java:3158:19:3158:21 | out : ImmutableMultimap [<map.key>] : Object | provenance |  |
-| Test.java:3157:79:3157:80 | in : Object | Test.java:3157:10:3157:87 | of(...) : ImmutableMultimap [<map.key>] : Object | provenance | MaD:111 |
+| Test.java:3157:79:3157:80 | in : Object | Test.java:3157:10:3157:87 | of(...) : ImmutableMultimap [<map.key>] : Object | provenance | MaD:129 |
 | Test.java:3158:19:3158:21 | out : ImmutableMultimap [<map.key>] : Object | Test.java:100:18:100:34 | map : ImmutableMultimap [<map.key>] : Object | provenance |  |
 | Test.java:3158:19:3158:21 | out : ImmutableMultimap [<map.key>] : Object | Test.java:3158:9:3158:22 | getMapKey(...) | provenance | MaD:373 |
 | Test.java:3163:16:3163:31 | (...)... : Object | Test.java:3164:85:3164:86 | in : Object | provenance |  |
 | Test.java:3163:24:3163:31 | source(...) : Object | Test.java:3163:16:3163:31 | (...)... : Object | provenance |  |
 | Test.java:3164:10:3164:87 | of(...) : ImmutableMultimap [<map.value>] : Object | Test.java:3165:21:3165:23 | out : ImmutableMultimap [<map.value>] : Object | provenance |  |
-| Test.java:3164:85:3164:86 | in : Object | Test.java:3164:10:3164:87 | of(...) : ImmutableMultimap [<map.value>] : Object | provenance | MaD:112 |
+| Test.java:3164:85:3164:86 | in : Object | Test.java:3164:10:3164:87 | of(...) : ImmutableMultimap [<map.value>] : Object | provenance | MaD:130 |
 | Test.java:3165:21:3165:23 | out : ImmutableMultimap [<map.value>] : Object | Test.java:119:20:119:36 | map : ImmutableMultimap [<map.value>] : Object | provenance |  |
 | Test.java:3165:21:3165:23 | out : ImmutableMultimap [<map.value>] : Object | Test.java:3165:9:3165:24 | getMapValue(...) | provenance | MaD:385 |
 | Test.java:3170:41:3170:81 | (...)... : Builder | Test.java:3171:10:3171:11 | in : Builder | provenance |  |
 | Test.java:3170:74:3170:81 | source(...) : Object | Test.java:3170:41:3170:81 | (...)... : Builder | provenance |  |
-| Test.java:3171:10:3171:11 | in : Builder | Test.java:3171:10:3171:30 | addCopies(...) : Builder | provenance | MaD:136 |
+| Test.java:3171:10:3171:11 | in : Builder | Test.java:3171:10:3171:30 | addCopies(...) : Builder | provenance | MaD:132 |
 | Test.java:3171:10:3171:30 | addCopies(...) : Builder | Test.java:3172:9:3172:11 | out | provenance |  |
 | Test.java:3177:35:3177:69 | (...)... : Builder | Test.java:3178:10:3178:11 | in : Builder | provenance |  |
 | Test.java:3177:62:3177:69 | source(...) : Object | Test.java:3177:35:3177:69 | (...)... : Builder | provenance |  |
-| Test.java:3178:10:3178:11 | in : Builder | Test.java:3178:10:3178:30 | addCopies(...) : Builder | provenance | MaD:136 |
+| Test.java:3178:10:3178:11 | in : Builder | Test.java:3178:10:3178:30 | addCopies(...) : Builder | provenance | MaD:132 |
 | Test.java:3178:10:3178:30 | addCopies(...) : Builder | Test.java:3179:9:3179:11 | out | provenance |  |
 | Test.java:3184:16:3184:31 | (...)... : Object | Test.java:3185:18:3185:19 | in : Object | provenance |  |
 | Test.java:3184:24:3184:31 | source(...) : Object | Test.java:3184:16:3184:31 | (...)... : Object | provenance |  |
 | Test.java:3185:4:3185:6 | out [post update] : Builder [<element>] : Object | Test.java:3186:20:3186:22 | out : Builder [<element>] : Object | provenance |  |
-| Test.java:3185:18:3185:19 | in : Object | Test.java:3185:4:3185:6 | out [post update] : Builder [<element>] : Object | provenance | MaD:137 |
+| Test.java:3185:18:3185:19 | in : Object | Test.java:3185:4:3185:6 | out [post update] : Builder [<element>] : Object | provenance | MaD:131 |
 | Test.java:3186:20:3186:22 | out : Builder [<element>] : Object | Test.java:109:19:109:50 | b : Builder [<element>] : Object | provenance |  |
-| Test.java:3186:20:3186:22 | out : Builder [<element>] : Object | Test.java:3186:9:3186:23 | getElement(...) | provenance | MaD:50 |
+| Test.java:3186:20:3186:22 | out : Builder [<element>] : Object | Test.java:3186:9:3186:23 | getElement(...) | provenance | MaD:49 |
 | Test.java:3191:16:3191:31 | (...)... : Object | Test.java:3192:18:3192:19 | in : Object | provenance |  |
 | Test.java:3191:24:3191:31 | source(...) : Object | Test.java:3191:16:3191:31 | (...)... : Object | provenance |  |
 | Test.java:3192:4:3192:6 | out [post update] : Builder [<element>] : Object | Test.java:3193:20:3193:22 | out : Builder [<element>] : Object | provenance |  |
-| Test.java:3192:18:3192:19 | in : Object | Test.java:3192:4:3192:6 | out [post update] : Builder [<element>] : Object | provenance | MaD:137 |
+| Test.java:3192:18:3192:19 | in : Object | Test.java:3192:4:3192:6 | out [post update] : Builder [<element>] : Object | provenance | MaD:131 |
 | Test.java:3193:20:3193:22 | out : Builder [<element>] : Object | Test.java:109:19:109:50 | b : Builder [<element>] : Object | provenance |  |
-| Test.java:3193:20:3193:22 | out : Builder [<element>] : Object | Test.java:3193:9:3193:23 | getElement(...) | provenance | MaD:50 |
+| Test.java:3193:20:3193:22 | out : Builder [<element>] : Object | Test.java:3193:9:3193:23 | getElement(...) | provenance | MaD:49 |
 | Test.java:3198:16:3198:31 | (...)... : Object | Test.java:3199:17:3199:18 | in : Object | provenance |  |
 | Test.java:3198:24:3198:31 | source(...) : Object | Test.java:3198:16:3198:31 | (...)... : Object | provenance |  |
 | Test.java:3199:4:3199:6 | out [post update] : Builder [<element>] : Object | Test.java:3200:20:3200:22 | out : Builder [<element>] : Object | provenance |  |
-| Test.java:3199:17:3199:18 | in : Object | Test.java:3199:4:3199:6 | out [post update] : Builder [<element>] : Object | provenance | MaD:138 |
+| Test.java:3199:17:3199:18 | in : Object | Test.java:3199:4:3199:6 | out [post update] : Builder [<element>] : Object | provenance | MaD:133 |
 | Test.java:3200:20:3200:22 | out : Builder [<element>] : Object | Test.java:109:19:109:50 | b : Builder [<element>] : Object | provenance |  |
-| Test.java:3200:20:3200:22 | out : Builder [<element>] : Object | Test.java:3200:9:3200:23 | getElement(...) | provenance | MaD:50 |
+| Test.java:3200:20:3200:22 | out : Builder [<element>] : Object | Test.java:3200:9:3200:23 | getElement(...) | provenance | MaD:49 |
 | Test.java:3205:16:3205:31 | (...)... : Object | Test.java:3206:17:3206:18 | in : Object | provenance |  |
 | Test.java:3205:24:3205:31 | source(...) : Object | Test.java:3205:16:3205:31 | (...)... : Object | provenance |  |
 | Test.java:3206:4:3206:6 | out [post update] : Builder [<element>] : Object | Test.java:3207:20:3207:22 | out : Builder [<element>] : Object | provenance |  |
-| Test.java:3206:17:3206:18 | in : Object | Test.java:3206:4:3206:6 | out [post update] : Builder [<element>] : Object | provenance | MaD:138 |
+| Test.java:3206:17:3206:18 | in : Object | Test.java:3206:4:3206:6 | out [post update] : Builder [<element>] : Object | provenance | MaD:133 |
 | Test.java:3207:20:3207:22 | out : Builder [<element>] : Object | Test.java:109:19:109:50 | b : Builder [<element>] : Object | provenance |  |
-| Test.java:3207:20:3207:22 | out : Builder [<element>] : Object | Test.java:3207:9:3207:23 | getElement(...) | provenance | MaD:50 |
+| Test.java:3207:20:3207:22 | out : Builder [<element>] : Object | Test.java:3207:9:3207:23 | getElement(...) | provenance | MaD:49 |
 | Test.java:3212:18:3212:44 | (...)... : List [<element>] : Object | Test.java:3213:35:3213:36 | in : List [<element>] : Object | provenance |  |
 | Test.java:3212:28:3212:44 | of(...) : List [<element>] : Object | Test.java:3212:18:3212:44 | (...)... : List [<element>] : Object | provenance |  |
-| Test.java:3212:36:3212:43 | source(...) : Object | Test.java:3212:28:3212:44 | of(...) : List [<element>] : Object | provenance | MaD:558 |
+| Test.java:3212:36:3212:43 | source(...) : Object | Test.java:3212:28:3212:44 | of(...) : List [<element>] : Object | provenance | MaD:561 |
 | Test.java:3213:10:3213:37 | copyOf(...) : ImmutableMultiset [<element>] : Object | Test.java:3214:20:3214:22 | out : ImmutableMultiset [<element>] : Object | provenance |  |
-| Test.java:3213:35:3213:36 | in : List [<element>] : Object | Test.java:3213:10:3213:37 | copyOf(...) : ImmutableMultiset [<element>] : Object | provenance | MaD:131 |
+| Test.java:3213:35:3213:36 | in : List [<element>] : Object | Test.java:3213:10:3213:37 | copyOf(...) : ImmutableMultiset [<element>] : Object | provenance | MaD:134 |
 | Test.java:3214:20:3214:22 | out : ImmutableMultiset [<element>] : Object | Test.java:110:19:110:32 | it : ImmutableMultiset [<element>] : Object | provenance |  |
-| Test.java:3214:20:3214:22 | out : ImmutableMultiset [<element>] : Object | Test.java:3214:9:3214:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:3214:20:3214:22 | out : ImmutableMultiset [<element>] : Object | Test.java:3214:9:3214:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:3219:18:3219:55 | (...)... : Iterator [<element>] : Object | Test.java:3220:35:3220:36 | in : Iterator [<element>] : Object | provenance |  |
-| Test.java:3219:28:3219:44 | of(...) : List [<element>] : Object | Test.java:3219:28:3219:55 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:555 |
+| Test.java:3219:28:3219:44 | of(...) : List [<element>] : Object | Test.java:3219:28:3219:55 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:558 |
 | Test.java:3219:28:3219:55 | iterator(...) : Iterator [<element>] : Object | Test.java:3219:18:3219:55 | (...)... : Iterator [<element>] : Object | provenance |  |
-| Test.java:3219:36:3219:43 | source(...) : Object | Test.java:3219:28:3219:44 | of(...) : List [<element>] : Object | provenance | MaD:558 |
+| Test.java:3219:36:3219:43 | source(...) : Object | Test.java:3219:28:3219:44 | of(...) : List [<element>] : Object | provenance | MaD:561 |
 | Test.java:3220:10:3220:37 | copyOf(...) : ImmutableMultiset [<element>] : Object | Test.java:3221:20:3221:22 | out : ImmutableMultiset [<element>] : Object | provenance |  |
-| Test.java:3220:35:3220:36 | in : Iterator [<element>] : Object | Test.java:3220:10:3220:37 | copyOf(...) : ImmutableMultiset [<element>] : Object | provenance | MaD:132 |
+| Test.java:3220:35:3220:36 | in : Iterator [<element>] : Object | Test.java:3220:10:3220:37 | copyOf(...) : ImmutableMultiset [<element>] : Object | provenance | MaD:135 |
 | Test.java:3221:20:3221:22 | out : ImmutableMultiset [<element>] : Object | Test.java:110:19:110:32 | it : ImmutableMultiset [<element>] : Object | provenance |  |
-| Test.java:3221:20:3221:22 | out : ImmutableMultiset [<element>] : Object | Test.java:3221:9:3221:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:3221:20:3221:22 | out : ImmutableMultiset [<element>] : Object | Test.java:3221:9:3221:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:3226:18:3226:49 | (...)... : Object[] [[]] : Object | Test.java:3227:35:3227:36 | in : Object[] [[]] : Object | provenance |  |
 | Test.java:3226:28:3226:49 | {...} : Object[] [[]] : Object | Test.java:3226:18:3226:49 | (...)... : Object[] [[]] : Object | provenance |  |
 | Test.java:3226:41:3226:48 | source(...) : Object | Test.java:3226:28:3226:49 | {...} : Object[] [[]] : Object | provenance |  |
 | Test.java:3227:10:3227:37 | copyOf(...) : ImmutableMultiset [<element>] : Object | Test.java:3228:20:3228:22 | out : ImmutableMultiset [<element>] : Object | provenance |  |
-| Test.java:3227:35:3227:36 | in : Object[] [[]] : Object | Test.java:3227:10:3227:37 | copyOf(...) : ImmutableMultiset [<element>] : Object | provenance | MaD:133 |
+| Test.java:3227:35:3227:36 | in : Object[] [[]] : Object | Test.java:3227:10:3227:37 | copyOf(...) : ImmutableMultiset [<element>] : Object | provenance | MaD:136 |
 | Test.java:3228:20:3228:22 | out : ImmutableMultiset [<element>] : Object | Test.java:110:19:110:32 | it : ImmutableMultiset [<element>] : Object | provenance |  |
-| Test.java:3228:20:3228:22 | out : ImmutableMultiset [<element>] : Object | Test.java:3228:9:3228:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:3228:20:3228:22 | out : ImmutableMultiset [<element>] : Object | Test.java:3228:9:3228:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:3233:16:3233:31 | (...)... : Object | Test.java:3234:55:3234:56 | in : Object | provenance |  |
 | Test.java:3233:24:3233:31 | source(...) : Object | Test.java:3233:16:3233:31 | (...)... : Object | provenance |  |
 | Test.java:3234:10:3234:57 | of(...) : ImmutableMultiset [<element>] : Object | Test.java:3235:20:3235:22 | out : ImmutableMultiset [<element>] : Object | provenance |  |
-| Test.java:3234:55:3234:56 | in : Object | Test.java:3234:10:3234:57 | of(...) : ImmutableMultiset [<element>] : Object | provenance | MaD:134 |
+| Test.java:3234:55:3234:56 | in : Object | Test.java:3234:10:3234:57 | of(...) : ImmutableMultiset [<element>] : Object | provenance | MaD:137 |
 | Test.java:3235:20:3235:22 | out : ImmutableMultiset [<element>] : Object | Test.java:110:19:110:32 | it : ImmutableMultiset [<element>] : Object | provenance |  |
-| Test.java:3235:20:3235:22 | out : ImmutableMultiset [<element>] : Object | Test.java:3235:9:3235:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:3235:20:3235:22 | out : ImmutableMultiset [<element>] : Object | Test.java:3235:9:3235:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:3240:16:3240:31 | (...)... : Object | Test.java:3241:49:3241:50 | in : Object | provenance |  |
 | Test.java:3240:24:3240:31 | source(...) : Object | Test.java:3240:16:3240:31 | (...)... : Object | provenance |  |
 | Test.java:3241:10:3241:57 | of(...) : ImmutableMultiset [<element>] : Object | Test.java:3242:20:3242:22 | out : ImmutableMultiset [<element>] : Object | provenance |  |
-| Test.java:3241:49:3241:50 | in : Object | Test.java:3241:10:3241:57 | of(...) : ImmutableMultiset [<element>] : Object | provenance | MaD:134 |
+| Test.java:3241:49:3241:50 | in : Object | Test.java:3241:10:3241:57 | of(...) : ImmutableMultiset [<element>] : Object | provenance | MaD:137 |
 | Test.java:3242:20:3242:22 | out : ImmutableMultiset [<element>] : Object | Test.java:110:19:110:32 | it : ImmutableMultiset [<element>] : Object | provenance |  |
-| Test.java:3242:20:3242:22 | out : ImmutableMultiset [<element>] : Object | Test.java:3242:9:3242:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:3242:20:3242:22 | out : ImmutableMultiset [<element>] : Object | Test.java:3242:9:3242:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:3247:16:3247:31 | (...)... : Object | Test.java:3248:49:3248:50 | in : Object | provenance |  |
 | Test.java:3247:24:3247:31 | source(...) : Object | Test.java:3247:16:3247:31 | (...)... : Object | provenance |  |
 | Test.java:3248:10:3248:51 | of(...) : ImmutableMultiset [<element>] : Object | Test.java:3249:20:3249:22 | out : ImmutableMultiset [<element>] : Object | provenance |  |
-| Test.java:3248:49:3248:50 | in : Object | Test.java:3248:10:3248:51 | of(...) : ImmutableMultiset [<element>] : Object | provenance | MaD:134 |
+| Test.java:3248:49:3248:50 | in : Object | Test.java:3248:10:3248:51 | of(...) : ImmutableMultiset [<element>] : Object | provenance | MaD:137 |
 | Test.java:3249:20:3249:22 | out : ImmutableMultiset [<element>] : Object | Test.java:110:19:110:32 | it : ImmutableMultiset [<element>] : Object | provenance |  |
-| Test.java:3249:20:3249:22 | out : ImmutableMultiset [<element>] : Object | Test.java:3249:9:3249:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:3249:20:3249:22 | out : ImmutableMultiset [<element>] : Object | Test.java:3249:9:3249:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:3254:16:3254:31 | (...)... : Object | Test.java:3255:43:3255:44 | in : Object | provenance |  |
 | Test.java:3254:24:3254:31 | source(...) : Object | Test.java:3254:16:3254:31 | (...)... : Object | provenance |  |
 | Test.java:3255:10:3255:57 | of(...) : ImmutableMultiset [<element>] : Object | Test.java:3256:20:3256:22 | out : ImmutableMultiset [<element>] : Object | provenance |  |
-| Test.java:3255:43:3255:44 | in : Object | Test.java:3255:10:3255:57 | of(...) : ImmutableMultiset [<element>] : Object | provenance | MaD:134 |
+| Test.java:3255:43:3255:44 | in : Object | Test.java:3255:10:3255:57 | of(...) : ImmutableMultiset [<element>] : Object | provenance | MaD:137 |
 | Test.java:3256:20:3256:22 | out : ImmutableMultiset [<element>] : Object | Test.java:110:19:110:32 | it : ImmutableMultiset [<element>] : Object | provenance |  |
-| Test.java:3256:20:3256:22 | out : ImmutableMultiset [<element>] : Object | Test.java:3256:9:3256:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:3256:20:3256:22 | out : ImmutableMultiset [<element>] : Object | Test.java:3256:9:3256:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:3261:16:3261:31 | (...)... : Object | Test.java:3262:43:3262:44 | in : Object | provenance |  |
 | Test.java:3261:24:3261:31 | source(...) : Object | Test.java:3261:16:3261:31 | (...)... : Object | provenance |  |
 | Test.java:3262:10:3262:51 | of(...) : ImmutableMultiset [<element>] : Object | Test.java:3263:20:3263:22 | out : ImmutableMultiset [<element>] : Object | provenance |  |
-| Test.java:3262:43:3262:44 | in : Object | Test.java:3262:10:3262:51 | of(...) : ImmutableMultiset [<element>] : Object | provenance | MaD:134 |
+| Test.java:3262:43:3262:44 | in : Object | Test.java:3262:10:3262:51 | of(...) : ImmutableMultiset [<element>] : Object | provenance | MaD:137 |
 | Test.java:3263:20:3263:22 | out : ImmutableMultiset [<element>] : Object | Test.java:110:19:110:32 | it : ImmutableMultiset [<element>] : Object | provenance |  |
-| Test.java:3263:20:3263:22 | out : ImmutableMultiset [<element>] : Object | Test.java:3263:9:3263:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:3263:20:3263:22 | out : ImmutableMultiset [<element>] : Object | Test.java:3263:9:3263:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:3268:16:3268:31 | (...)... : Object | Test.java:3269:43:3269:44 | in : Object | provenance |  |
 | Test.java:3268:24:3268:31 | source(...) : Object | Test.java:3268:16:3268:31 | (...)... : Object | provenance |  |
 | Test.java:3269:10:3269:45 | of(...) : ImmutableMultiset [<element>] : Object | Test.java:3270:20:3270:22 | out : ImmutableMultiset [<element>] : Object | provenance |  |
-| Test.java:3269:43:3269:44 | in : Object | Test.java:3269:10:3269:45 | of(...) : ImmutableMultiset [<element>] : Object | provenance | MaD:134 |
+| Test.java:3269:43:3269:44 | in : Object | Test.java:3269:10:3269:45 | of(...) : ImmutableMultiset [<element>] : Object | provenance | MaD:137 |
 | Test.java:3270:20:3270:22 | out : ImmutableMultiset [<element>] : Object | Test.java:110:19:110:32 | it : ImmutableMultiset [<element>] : Object | provenance |  |
-| Test.java:3270:20:3270:22 | out : ImmutableMultiset [<element>] : Object | Test.java:3270:9:3270:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:3270:20:3270:22 | out : ImmutableMultiset [<element>] : Object | Test.java:3270:9:3270:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:3275:16:3275:31 | (...)... : Object | Test.java:3276:37:3276:38 | in : Object | provenance |  |
 | Test.java:3275:24:3275:31 | source(...) : Object | Test.java:3275:16:3275:31 | (...)... : Object | provenance |  |
 | Test.java:3276:10:3276:57 | of(...) : ImmutableMultiset [<element>] : Object | Test.java:3277:20:3277:22 | out : ImmutableMultiset [<element>] : Object | provenance |  |
-| Test.java:3276:37:3276:38 | in : Object | Test.java:3276:10:3276:57 | of(...) : ImmutableMultiset [<element>] : Object | provenance | MaD:134 |
+| Test.java:3276:37:3276:38 | in : Object | Test.java:3276:10:3276:57 | of(...) : ImmutableMultiset [<element>] : Object | provenance | MaD:137 |
 | Test.java:3277:20:3277:22 | out : ImmutableMultiset [<element>] : Object | Test.java:110:19:110:32 | it : ImmutableMultiset [<element>] : Object | provenance |  |
-| Test.java:3277:20:3277:22 | out : ImmutableMultiset [<element>] : Object | Test.java:3277:9:3277:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:3277:20:3277:22 | out : ImmutableMultiset [<element>] : Object | Test.java:3277:9:3277:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:3282:16:3282:31 | (...)... : Object | Test.java:3283:37:3283:38 | in : Object | provenance |  |
 | Test.java:3282:24:3282:31 | source(...) : Object | Test.java:3282:16:3282:31 | (...)... : Object | provenance |  |
 | Test.java:3283:10:3283:51 | of(...) : ImmutableMultiset [<element>] : Object | Test.java:3284:20:3284:22 | out : ImmutableMultiset [<element>] : Object | provenance |  |
-| Test.java:3283:37:3283:38 | in : Object | Test.java:3283:10:3283:51 | of(...) : ImmutableMultiset [<element>] : Object | provenance | MaD:134 |
+| Test.java:3283:37:3283:38 | in : Object | Test.java:3283:10:3283:51 | of(...) : ImmutableMultiset [<element>] : Object | provenance | MaD:137 |
 | Test.java:3284:20:3284:22 | out : ImmutableMultiset [<element>] : Object | Test.java:110:19:110:32 | it : ImmutableMultiset [<element>] : Object | provenance |  |
-| Test.java:3284:20:3284:22 | out : ImmutableMultiset [<element>] : Object | Test.java:3284:9:3284:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:3284:20:3284:22 | out : ImmutableMultiset [<element>] : Object | Test.java:3284:9:3284:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:3289:16:3289:31 | (...)... : Object | Test.java:3290:37:3290:38 | in : Object | provenance |  |
 | Test.java:3289:24:3289:31 | source(...) : Object | Test.java:3289:16:3289:31 | (...)... : Object | provenance |  |
 | Test.java:3290:10:3290:45 | of(...) : ImmutableMultiset [<element>] : Object | Test.java:3291:20:3291:22 | out : ImmutableMultiset [<element>] : Object | provenance |  |
-| Test.java:3290:37:3290:38 | in : Object | Test.java:3290:10:3290:45 | of(...) : ImmutableMultiset [<element>] : Object | provenance | MaD:134 |
+| Test.java:3290:37:3290:38 | in : Object | Test.java:3290:10:3290:45 | of(...) : ImmutableMultiset [<element>] : Object | provenance | MaD:137 |
 | Test.java:3291:20:3291:22 | out : ImmutableMultiset [<element>] : Object | Test.java:110:19:110:32 | it : ImmutableMultiset [<element>] : Object | provenance |  |
-| Test.java:3291:20:3291:22 | out : ImmutableMultiset [<element>] : Object | Test.java:3291:9:3291:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:3291:20:3291:22 | out : ImmutableMultiset [<element>] : Object | Test.java:3291:9:3291:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:3296:16:3296:31 | (...)... : Object | Test.java:3297:37:3297:38 | in : Object | provenance |  |
 | Test.java:3296:24:3296:31 | source(...) : Object | Test.java:3296:16:3296:31 | (...)... : Object | provenance |  |
 | Test.java:3297:10:3297:39 | of(...) : ImmutableMultiset [<element>] : Object | Test.java:3298:20:3298:22 | out : ImmutableMultiset [<element>] : Object | provenance |  |
-| Test.java:3297:37:3297:38 | in : Object | Test.java:3297:10:3297:39 | of(...) : ImmutableMultiset [<element>] : Object | provenance | MaD:134 |
+| Test.java:3297:37:3297:38 | in : Object | Test.java:3297:10:3297:39 | of(...) : ImmutableMultiset [<element>] : Object | provenance | MaD:137 |
 | Test.java:3298:20:3298:22 | out : ImmutableMultiset [<element>] : Object | Test.java:110:19:110:32 | it : ImmutableMultiset [<element>] : Object | provenance |  |
-| Test.java:3298:20:3298:22 | out : ImmutableMultiset [<element>] : Object | Test.java:3298:9:3298:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:3298:20:3298:22 | out : ImmutableMultiset [<element>] : Object | Test.java:3298:9:3298:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:3303:16:3303:31 | (...)... : Object | Test.java:3304:31:3304:32 | in : Object | provenance |  |
 | Test.java:3303:24:3303:31 | source(...) : Object | Test.java:3303:16:3303:31 | (...)... : Object | provenance |  |
 | Test.java:3304:10:3304:57 | of(...) : ImmutableMultiset [<element>] : Object | Test.java:3305:20:3305:22 | out : ImmutableMultiset [<element>] : Object | provenance |  |
-| Test.java:3304:31:3304:32 | in : Object | Test.java:3304:10:3304:57 | of(...) : ImmutableMultiset [<element>] : Object | provenance | MaD:134 |
+| Test.java:3304:31:3304:32 | in : Object | Test.java:3304:10:3304:57 | of(...) : ImmutableMultiset [<element>] : Object | provenance | MaD:137 |
 | Test.java:3305:20:3305:22 | out : ImmutableMultiset [<element>] : Object | Test.java:110:19:110:32 | it : ImmutableMultiset [<element>] : Object | provenance |  |
-| Test.java:3305:20:3305:22 | out : ImmutableMultiset [<element>] : Object | Test.java:3305:9:3305:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:3305:20:3305:22 | out : ImmutableMultiset [<element>] : Object | Test.java:3305:9:3305:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:3310:16:3310:31 | (...)... : Object | Test.java:3311:31:3311:32 | in : Object | provenance |  |
 | Test.java:3310:24:3310:31 | source(...) : Object | Test.java:3310:16:3310:31 | (...)... : Object | provenance |  |
 | Test.java:3311:10:3311:51 | of(...) : ImmutableMultiset [<element>] : Object | Test.java:3312:20:3312:22 | out : ImmutableMultiset [<element>] : Object | provenance |  |
-| Test.java:3311:31:3311:32 | in : Object | Test.java:3311:10:3311:51 | of(...) : ImmutableMultiset [<element>] : Object | provenance | MaD:134 |
+| Test.java:3311:31:3311:32 | in : Object | Test.java:3311:10:3311:51 | of(...) : ImmutableMultiset [<element>] : Object | provenance | MaD:137 |
 | Test.java:3312:20:3312:22 | out : ImmutableMultiset [<element>] : Object | Test.java:110:19:110:32 | it : ImmutableMultiset [<element>] : Object | provenance |  |
-| Test.java:3312:20:3312:22 | out : ImmutableMultiset [<element>] : Object | Test.java:3312:9:3312:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:3312:20:3312:22 | out : ImmutableMultiset [<element>] : Object | Test.java:3312:9:3312:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:3317:16:3317:31 | (...)... : Object | Test.java:3318:31:3318:32 | in : Object | provenance |  |
 | Test.java:3317:24:3317:31 | source(...) : Object | Test.java:3317:16:3317:31 | (...)... : Object | provenance |  |
 | Test.java:3318:10:3318:45 | of(...) : ImmutableMultiset [<element>] : Object | Test.java:3319:20:3319:22 | out : ImmutableMultiset [<element>] : Object | provenance |  |
-| Test.java:3318:31:3318:32 | in : Object | Test.java:3318:10:3318:45 | of(...) : ImmutableMultiset [<element>] : Object | provenance | MaD:134 |
+| Test.java:3318:31:3318:32 | in : Object | Test.java:3318:10:3318:45 | of(...) : ImmutableMultiset [<element>] : Object | provenance | MaD:137 |
 | Test.java:3319:20:3319:22 | out : ImmutableMultiset [<element>] : Object | Test.java:110:19:110:32 | it : ImmutableMultiset [<element>] : Object | provenance |  |
-| Test.java:3319:20:3319:22 | out : ImmutableMultiset [<element>] : Object | Test.java:3319:9:3319:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:3319:20:3319:22 | out : ImmutableMultiset [<element>] : Object | Test.java:3319:9:3319:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:3324:16:3324:31 | (...)... : Object | Test.java:3325:31:3325:32 | in : Object | provenance |  |
 | Test.java:3324:24:3324:31 | source(...) : Object | Test.java:3324:16:3324:31 | (...)... : Object | provenance |  |
 | Test.java:3325:10:3325:39 | of(...) : ImmutableMultiset [<element>] : Object | Test.java:3326:20:3326:22 | out : ImmutableMultiset [<element>] : Object | provenance |  |
-| Test.java:3325:31:3325:32 | in : Object | Test.java:3325:10:3325:39 | of(...) : ImmutableMultiset [<element>] : Object | provenance | MaD:134 |
+| Test.java:3325:31:3325:32 | in : Object | Test.java:3325:10:3325:39 | of(...) : ImmutableMultiset [<element>] : Object | provenance | MaD:137 |
 | Test.java:3326:20:3326:22 | out : ImmutableMultiset [<element>] : Object | Test.java:110:19:110:32 | it : ImmutableMultiset [<element>] : Object | provenance |  |
-| Test.java:3326:20:3326:22 | out : ImmutableMultiset [<element>] : Object | Test.java:3326:9:3326:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:3326:20:3326:22 | out : ImmutableMultiset [<element>] : Object | Test.java:3326:9:3326:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:3331:16:3331:31 | (...)... : Object | Test.java:3332:31:3332:32 | in : Object | provenance |  |
 | Test.java:3331:24:3331:31 | source(...) : Object | Test.java:3331:16:3331:31 | (...)... : Object | provenance |  |
 | Test.java:3332:10:3332:119 | of(...) : ImmutableMultiset [<element>] : Object | Test.java:3333:20:3333:22 | out : ImmutableMultiset [<element>] : Object | provenance |  |
-| Test.java:3332:31:3332:32 | in : Object | Test.java:3332:10:3332:119 | of(...) : ImmutableMultiset [<element>] : Object | provenance | MaD:134 |
+| Test.java:3332:31:3332:32 | in : Object | Test.java:3332:10:3332:119 | of(...) : ImmutableMultiset [<element>] : Object | provenance | MaD:137 |
 | Test.java:3333:20:3333:22 | out : ImmutableMultiset [<element>] : Object | Test.java:110:19:110:32 | it : ImmutableMultiset [<element>] : Object | provenance |  |
-| Test.java:3333:20:3333:22 | out : ImmutableMultiset [<element>] : Object | Test.java:3333:9:3333:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:3333:20:3333:22 | out : ImmutableMultiset [<element>] : Object | Test.java:3333:9:3333:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:3338:16:3338:31 | (...)... : Object | Test.java:3339:31:3339:32 | in : Object | provenance |  |
 | Test.java:3338:24:3338:31 | source(...) : Object | Test.java:3338:16:3338:31 | (...)... : Object | provenance |  |
 | Test.java:3339:10:3339:33 | of(...) : ImmutableMultiset [<element>] : Object | Test.java:3340:20:3340:22 | out : ImmutableMultiset [<element>] : Object | provenance |  |
-| Test.java:3339:31:3339:32 | in : Object | Test.java:3339:10:3339:33 | of(...) : ImmutableMultiset [<element>] : Object | provenance | MaD:134 |
+| Test.java:3339:31:3339:32 | in : Object | Test.java:3339:10:3339:33 | of(...) : ImmutableMultiset [<element>] : Object | provenance | MaD:137 |
 | Test.java:3340:20:3340:22 | out : ImmutableMultiset [<element>] : Object | Test.java:110:19:110:32 | it : ImmutableMultiset [<element>] : Object | provenance |  |
-| Test.java:3340:20:3340:22 | out : ImmutableMultiset [<element>] : Object | Test.java:3340:9:3340:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:3340:20:3340:22 | out : ImmutableMultiset [<element>] : Object | Test.java:3340:9:3340:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:3345:16:3345:31 | (...)... : Object | Test.java:3346:45:3346:46 | in : Object | provenance |  |
 | Test.java:3345:24:3345:31 | source(...) : Object | Test.java:3345:16:3345:31 | (...)... : Object | provenance |  |
 | Test.java:3346:10:3346:119 | of(...) : ImmutableMultiset [<element>] : Object | Test.java:3347:20:3347:22 | out : ImmutableMultiset [<element>] : Object | provenance |  |
-| Test.java:3346:45:3346:46 | in : Object | Test.java:3346:10:3346:119 | of(...) : ImmutableMultiset [<element>] : Object | provenance | MaD:134 |
+| Test.java:3346:45:3346:46 | in : Object | Test.java:3346:10:3346:119 | of(...) : ImmutableMultiset [<element>] : Object | provenance | MaD:137 |
 | Test.java:3347:20:3347:22 | out : ImmutableMultiset [<element>] : Object | Test.java:110:19:110:32 | it : ImmutableMultiset [<element>] : Object | provenance |  |
-| Test.java:3347:20:3347:22 | out : ImmutableMultiset [<element>] : Object | Test.java:3347:9:3347:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:3347:20:3347:22 | out : ImmutableMultiset [<element>] : Object | Test.java:3347:9:3347:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:3352:16:3352:31 | (...)... : Object | Test.java:3353:59:3353:60 | in : Object | provenance |  |
 | Test.java:3352:24:3352:31 | source(...) : Object | Test.java:3352:16:3352:31 | (...)... : Object | provenance |  |
 | Test.java:3353:10:3353:119 | of(...) : ImmutableMultiset [<element>] : Object | Test.java:3354:20:3354:22 | out : ImmutableMultiset [<element>] : Object | provenance |  |
-| Test.java:3353:59:3353:60 | in : Object | Test.java:3353:10:3353:119 | of(...) : ImmutableMultiset [<element>] : Object | provenance | MaD:134 |
+| Test.java:3353:59:3353:60 | in : Object | Test.java:3353:10:3353:119 | of(...) : ImmutableMultiset [<element>] : Object | provenance | MaD:137 |
 | Test.java:3354:20:3354:22 | out : ImmutableMultiset [<element>] : Object | Test.java:110:19:110:32 | it : ImmutableMultiset [<element>] : Object | provenance |  |
-| Test.java:3354:20:3354:22 | out : ImmutableMultiset [<element>] : Object | Test.java:3354:9:3354:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:3354:20:3354:22 | out : ImmutableMultiset [<element>] : Object | Test.java:3354:9:3354:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:3359:16:3359:31 | (...)... : Object | Test.java:3360:73:3360:74 | in : Object | provenance |  |
 | Test.java:3359:24:3359:31 | source(...) : Object | Test.java:3359:16:3359:31 | (...)... : Object | provenance |  |
 | Test.java:3360:10:3360:119 | of(...) : ImmutableMultiset [<element>] : Object | Test.java:3361:20:3361:22 | out : ImmutableMultiset [<element>] : Object | provenance |  |
-| Test.java:3360:73:3360:74 | in : Object | Test.java:3360:10:3360:119 | of(...) : ImmutableMultiset [<element>] : Object | provenance | MaD:134 |
+| Test.java:3360:73:3360:74 | in : Object | Test.java:3360:10:3360:119 | of(...) : ImmutableMultiset [<element>] : Object | provenance | MaD:137 |
 | Test.java:3361:20:3361:22 | out : ImmutableMultiset [<element>] : Object | Test.java:110:19:110:32 | it : ImmutableMultiset [<element>] : Object | provenance |  |
-| Test.java:3361:20:3361:22 | out : ImmutableMultiset [<element>] : Object | Test.java:3361:9:3361:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:3361:20:3361:22 | out : ImmutableMultiset [<element>] : Object | Test.java:3361:9:3361:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:3366:16:3366:31 | (...)... : Object | Test.java:3367:87:3367:88 | in : Object | provenance |  |
 | Test.java:3366:24:3366:31 | source(...) : Object | Test.java:3366:16:3366:31 | (...)... : Object | provenance |  |
 | Test.java:3367:10:3367:119 | of(...) : ImmutableMultiset [<element>] : Object | Test.java:3368:20:3368:22 | out : ImmutableMultiset [<element>] : Object | provenance |  |
-| Test.java:3367:87:3367:88 | in : Object | Test.java:3367:10:3367:119 | of(...) : ImmutableMultiset [<element>] : Object | provenance | MaD:134 |
+| Test.java:3367:87:3367:88 | in : Object | Test.java:3367:10:3367:119 | of(...) : ImmutableMultiset [<element>] : Object | provenance | MaD:137 |
 | Test.java:3368:20:3368:22 | out : ImmutableMultiset [<element>] : Object | Test.java:110:19:110:32 | it : ImmutableMultiset [<element>] : Object | provenance |  |
-| Test.java:3368:20:3368:22 | out : ImmutableMultiset [<element>] : Object | Test.java:3368:9:3368:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:3368:20:3368:22 | out : ImmutableMultiset [<element>] : Object | Test.java:3368:9:3368:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:3373:16:3373:31 | (...)... : Object | Test.java:3374:101:3374:102 | in : Object | provenance |  |
 | Test.java:3373:24:3373:31 | source(...) : Object | Test.java:3373:16:3373:31 | (...)... : Object | provenance |  |
 | Test.java:3374:10:3374:119 | of(...) : ImmutableMultiset [<element>] : Object | Test.java:3375:20:3375:22 | out : ImmutableMultiset [<element>] : Object | provenance |  |
-| Test.java:3374:101:3374:102 | in : Object | Test.java:3374:10:3374:119 | of(...) : ImmutableMultiset [<element>] : Object | provenance | MaD:134 |
+| Test.java:3374:101:3374:102 | in : Object | Test.java:3374:10:3374:119 | of(...) : ImmutableMultiset [<element>] : Object | provenance | MaD:137 |
 | Test.java:3375:20:3375:22 | out : ImmutableMultiset [<element>] : Object | Test.java:110:19:110:32 | it : ImmutableMultiset [<element>] : Object | provenance |  |
-| Test.java:3375:20:3375:22 | out : ImmutableMultiset [<element>] : Object | Test.java:3375:9:3375:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:3375:20:3375:22 | out : ImmutableMultiset [<element>] : Object | Test.java:3375:9:3375:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:3380:18:3380:49 | (...)... : Object[] [[]] : Object | Test.java:3381:115:3381:116 | in : Object[] [[]] : Object | provenance |  |
 | Test.java:3380:28:3380:49 | {...} : Object[] [[]] : Object | Test.java:3380:18:3380:49 | (...)... : Object[] [[]] : Object | provenance |  |
 | Test.java:3380:41:3380:48 | source(...) : Object | Test.java:3380:28:3380:49 | {...} : Object[] [[]] : Object | provenance |  |
 | Test.java:3381:10:3381:117 | of(...) : ImmutableMultiset [<element>] : Object | Test.java:3382:20:3382:22 | out : ImmutableMultiset [<element>] : Object | provenance |  |
-| Test.java:3381:115:3381:116 | in : Object[] [[]] : Object | Test.java:3381:10:3381:117 | of(...) : ImmutableMultiset [<element>] : Object | provenance | MaD:135 |
+| Test.java:3381:115:3381:116 | in : Object[] [[]] : Object | Test.java:3381:10:3381:117 | of(...) : ImmutableMultiset [<element>] : Object | provenance | MaD:138 |
 | Test.java:3382:20:3382:22 | out : ImmutableMultiset [<element>] : Object | Test.java:110:19:110:32 | it : ImmutableMultiset [<element>] : Object | provenance |  |
-| Test.java:3382:20:3382:22 | out : ImmutableMultiset [<element>] : Object | Test.java:3382:9:3382:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:3382:20:3382:22 | out : ImmutableMultiset [<element>] : Object | Test.java:3382:9:3382:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:3387:20:3387:48 | (...)... : List [<element>] : Object | Test.java:3388:30:3388:31 | in : List [<element>] : Object | provenance |  |
 | Test.java:3387:32:3387:48 | of(...) : List [<element>] : Object | Test.java:3387:20:3387:48 | (...)... : List [<element>] : Object | provenance |  |
-| Test.java:3387:40:3387:47 | source(...) : Object | Test.java:3387:32:3387:48 | of(...) : List [<element>] : Object | provenance | MaD:558 |
+| Test.java:3387:40:3387:47 | source(...) : Object | Test.java:3387:32:3387:48 | of(...) : List [<element>] : Object | provenance | MaD:561 |
 | Test.java:3388:10:3388:32 | copyOf(...) : ImmutableSet [<element>] : Object | Test.java:3389:20:3389:22 | out : ImmutableSet [<element>] : Object | provenance |  |
 | Test.java:3388:30:3388:31 | in : List [<element>] : Object | Test.java:3388:10:3388:32 | copyOf(...) : ImmutableSet [<element>] : Object | provenance | MaD:139 |
 | Test.java:3389:20:3389:22 | out : ImmutableSet [<element>] : Object | Test.java:110:19:110:32 | it : ImmutableSet [<element>] : Object | provenance |  |
-| Test.java:3389:20:3389:22 | out : ImmutableSet [<element>] : Object | Test.java:3389:9:3389:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:3389:20:3389:22 | out : ImmutableSet [<element>] : Object | Test.java:3389:9:3389:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:3394:18:3394:44 | (...)... : List [<element>] : Object | Test.java:3395:30:3395:31 | in : List [<element>] : Object | provenance |  |
 | Test.java:3394:28:3394:44 | of(...) : List [<element>] : Object | Test.java:3394:18:3394:44 | (...)... : List [<element>] : Object | provenance |  |
-| Test.java:3394:36:3394:43 | source(...) : Object | Test.java:3394:28:3394:44 | of(...) : List [<element>] : Object | provenance | MaD:558 |
+| Test.java:3394:36:3394:43 | source(...) : Object | Test.java:3394:28:3394:44 | of(...) : List [<element>] : Object | provenance | MaD:561 |
 | Test.java:3395:10:3395:32 | copyOf(...) : ImmutableSet [<element>] : Object | Test.java:3396:20:3396:22 | out : ImmutableSet [<element>] : Object | provenance |  |
 | Test.java:3395:30:3395:31 | in : List [<element>] : Object | Test.java:3395:10:3395:32 | copyOf(...) : ImmutableSet [<element>] : Object | provenance | MaD:140 |
 | Test.java:3396:20:3396:22 | out : ImmutableSet [<element>] : Object | Test.java:110:19:110:32 | it : ImmutableSet [<element>] : Object | provenance |  |
-| Test.java:3396:20:3396:22 | out : ImmutableSet [<element>] : Object | Test.java:3396:9:3396:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:3396:20:3396:22 | out : ImmutableSet [<element>] : Object | Test.java:3396:9:3396:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:3401:18:3401:55 | (...)... : Iterator [<element>] : Object | Test.java:3402:30:3402:31 | in : Iterator [<element>] : Object | provenance |  |
-| Test.java:3401:28:3401:44 | of(...) : List [<element>] : Object | Test.java:3401:28:3401:55 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:555 |
+| Test.java:3401:28:3401:44 | of(...) : List [<element>] : Object | Test.java:3401:28:3401:55 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:558 |
 | Test.java:3401:28:3401:55 | iterator(...) : Iterator [<element>] : Object | Test.java:3401:18:3401:55 | (...)... : Iterator [<element>] : Object | provenance |  |
-| Test.java:3401:36:3401:43 | source(...) : Object | Test.java:3401:28:3401:44 | of(...) : List [<element>] : Object | provenance | MaD:558 |
+| Test.java:3401:36:3401:43 | source(...) : Object | Test.java:3401:28:3401:44 | of(...) : List [<element>] : Object | provenance | MaD:561 |
 | Test.java:3402:10:3402:32 | copyOf(...) : ImmutableSet [<element>] : Object | Test.java:3403:20:3403:22 | out : ImmutableSet [<element>] : Object | provenance |  |
 | Test.java:3402:30:3402:31 | in : Iterator [<element>] : Object | Test.java:3402:10:3402:32 | copyOf(...) : ImmutableSet [<element>] : Object | provenance | MaD:141 |
 | Test.java:3403:20:3403:22 | out : ImmutableSet [<element>] : Object | Test.java:110:19:110:32 | it : ImmutableSet [<element>] : Object | provenance |  |
-| Test.java:3403:20:3403:22 | out : ImmutableSet [<element>] : Object | Test.java:3403:9:3403:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:3403:20:3403:22 | out : ImmutableSet [<element>] : Object | Test.java:3403:9:3403:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:3408:18:3408:49 | (...)... : Object[] [[]] : Object | Test.java:3409:30:3409:31 | in : Object[] [[]] : Object | provenance |  |
 | Test.java:3408:28:3408:49 | {...} : Object[] [[]] : Object | Test.java:3408:18:3408:49 | (...)... : Object[] [[]] : Object | provenance |  |
 | Test.java:3408:41:3408:48 | source(...) : Object | Test.java:3408:28:3408:49 | {...} : Object[] [[]] : Object | provenance |  |
 | Test.java:3409:10:3409:32 | copyOf(...) : ImmutableSet [<element>] : Object | Test.java:3410:20:3410:22 | out : ImmutableSet [<element>] : Object | provenance |  |
 | Test.java:3409:30:3409:31 | in : Object[] [[]] : Object | Test.java:3409:10:3409:32 | copyOf(...) : ImmutableSet [<element>] : Object | provenance | MaD:142 |
 | Test.java:3410:20:3410:22 | out : ImmutableSet [<element>] : Object | Test.java:110:19:110:32 | it : ImmutableSet [<element>] : Object | provenance |  |
-| Test.java:3410:20:3410:22 | out : ImmutableSet [<element>] : Object | Test.java:3410:9:3410:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:3410:20:3410:22 | out : ImmutableSet [<element>] : Object | Test.java:3410:9:3410:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:3415:16:3415:31 | (...)... : Object | Test.java:3416:50:3416:51 | in : Object | provenance |  |
 | Test.java:3415:24:3415:31 | source(...) : Object | Test.java:3415:16:3415:31 | (...)... : Object | provenance |  |
 | Test.java:3416:10:3416:52 | of(...) : ImmutableSet [<element>] : Object | Test.java:3417:20:3417:22 | out : ImmutableSet [<element>] : Object | provenance |  |
 | Test.java:3416:50:3416:51 | in : Object | Test.java:3416:10:3416:52 | of(...) : ImmutableSet [<element>] : Object | provenance | MaD:143 |
 | Test.java:3417:20:3417:22 | out : ImmutableSet [<element>] : Object | Test.java:110:19:110:32 | it : ImmutableSet [<element>] : Object | provenance |  |
-| Test.java:3417:20:3417:22 | out : ImmutableSet [<element>] : Object | Test.java:3417:9:3417:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:3417:20:3417:22 | out : ImmutableSet [<element>] : Object | Test.java:3417:9:3417:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:3422:16:3422:31 | (...)... : Object | Test.java:3423:44:3423:45 | in : Object | provenance |  |
 | Test.java:3422:24:3422:31 | source(...) : Object | Test.java:3422:16:3422:31 | (...)... : Object | provenance |  |
 | Test.java:3423:10:3423:52 | of(...) : ImmutableSet [<element>] : Object | Test.java:3424:20:3424:22 | out : ImmutableSet [<element>] : Object | provenance |  |
 | Test.java:3423:44:3423:45 | in : Object | Test.java:3423:10:3423:52 | of(...) : ImmutableSet [<element>] : Object | provenance | MaD:143 |
 | Test.java:3424:20:3424:22 | out : ImmutableSet [<element>] : Object | Test.java:110:19:110:32 | it : ImmutableSet [<element>] : Object | provenance |  |
-| Test.java:3424:20:3424:22 | out : ImmutableSet [<element>] : Object | Test.java:3424:9:3424:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:3424:20:3424:22 | out : ImmutableSet [<element>] : Object | Test.java:3424:9:3424:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:3429:16:3429:31 | (...)... : Object | Test.java:3430:44:3430:45 | in : Object | provenance |  |
 | Test.java:3429:24:3429:31 | source(...) : Object | Test.java:3429:16:3429:31 | (...)... : Object | provenance |  |
 | Test.java:3430:10:3430:46 | of(...) : ImmutableSet [<element>] : Object | Test.java:3431:20:3431:22 | out : ImmutableSet [<element>] : Object | provenance |  |
 | Test.java:3430:44:3430:45 | in : Object | Test.java:3430:10:3430:46 | of(...) : ImmutableSet [<element>] : Object | provenance | MaD:143 |
 | Test.java:3431:20:3431:22 | out : ImmutableSet [<element>] : Object | Test.java:110:19:110:32 | it : ImmutableSet [<element>] : Object | provenance |  |
-| Test.java:3431:20:3431:22 | out : ImmutableSet [<element>] : Object | Test.java:3431:9:3431:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:3431:20:3431:22 | out : ImmutableSet [<element>] : Object | Test.java:3431:9:3431:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:3436:16:3436:31 | (...)... : Object | Test.java:3437:38:3437:39 | in : Object | provenance |  |
 | Test.java:3436:24:3436:31 | source(...) : Object | Test.java:3436:16:3436:31 | (...)... : Object | provenance |  |
 | Test.java:3437:10:3437:52 | of(...) : ImmutableSet [<element>] : Object | Test.java:3438:20:3438:22 | out : ImmutableSet [<element>] : Object | provenance |  |
 | Test.java:3437:38:3437:39 | in : Object | Test.java:3437:10:3437:52 | of(...) : ImmutableSet [<element>] : Object | provenance | MaD:143 |
 | Test.java:3438:20:3438:22 | out : ImmutableSet [<element>] : Object | Test.java:110:19:110:32 | it : ImmutableSet [<element>] : Object | provenance |  |
-| Test.java:3438:20:3438:22 | out : ImmutableSet [<element>] : Object | Test.java:3438:9:3438:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:3438:20:3438:22 | out : ImmutableSet [<element>] : Object | Test.java:3438:9:3438:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:3443:16:3443:31 | (...)... : Object | Test.java:3444:38:3444:39 | in : Object | provenance |  |
 | Test.java:3443:24:3443:31 | source(...) : Object | Test.java:3443:16:3443:31 | (...)... : Object | provenance |  |
 | Test.java:3444:10:3444:46 | of(...) : ImmutableSet [<element>] : Object | Test.java:3445:20:3445:22 | out : ImmutableSet [<element>] : Object | provenance |  |
 | Test.java:3444:38:3444:39 | in : Object | Test.java:3444:10:3444:46 | of(...) : ImmutableSet [<element>] : Object | provenance | MaD:143 |
 | Test.java:3445:20:3445:22 | out : ImmutableSet [<element>] : Object | Test.java:110:19:110:32 | it : ImmutableSet [<element>] : Object | provenance |  |
-| Test.java:3445:20:3445:22 | out : ImmutableSet [<element>] : Object | Test.java:3445:9:3445:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:3445:20:3445:22 | out : ImmutableSet [<element>] : Object | Test.java:3445:9:3445:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:3450:16:3450:31 | (...)... : Object | Test.java:3451:38:3451:39 | in : Object | provenance |  |
 | Test.java:3450:24:3450:31 | source(...) : Object | Test.java:3450:16:3450:31 | (...)... : Object | provenance |  |
 | Test.java:3451:10:3451:40 | of(...) : ImmutableSet [<element>] : Object | Test.java:3452:20:3452:22 | out : ImmutableSet [<element>] : Object | provenance |  |
 | Test.java:3451:38:3451:39 | in : Object | Test.java:3451:10:3451:40 | of(...) : ImmutableSet [<element>] : Object | provenance | MaD:143 |
 | Test.java:3452:20:3452:22 | out : ImmutableSet [<element>] : Object | Test.java:110:19:110:32 | it : ImmutableSet [<element>] : Object | provenance |  |
-| Test.java:3452:20:3452:22 | out : ImmutableSet [<element>] : Object | Test.java:3452:9:3452:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:3452:20:3452:22 | out : ImmutableSet [<element>] : Object | Test.java:3452:9:3452:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:3457:16:3457:31 | (...)... : Object | Test.java:3458:32:3458:33 | in : Object | provenance |  |
 | Test.java:3457:24:3457:31 | source(...) : Object | Test.java:3457:16:3457:31 | (...)... : Object | provenance |  |
 | Test.java:3458:10:3458:52 | of(...) : ImmutableSet [<element>] : Object | Test.java:3459:20:3459:22 | out : ImmutableSet [<element>] : Object | provenance |  |
 | Test.java:3458:32:3458:33 | in : Object | Test.java:3458:10:3458:52 | of(...) : ImmutableSet [<element>] : Object | provenance | MaD:143 |
 | Test.java:3459:20:3459:22 | out : ImmutableSet [<element>] : Object | Test.java:110:19:110:32 | it : ImmutableSet [<element>] : Object | provenance |  |
-| Test.java:3459:20:3459:22 | out : ImmutableSet [<element>] : Object | Test.java:3459:9:3459:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:3459:20:3459:22 | out : ImmutableSet [<element>] : Object | Test.java:3459:9:3459:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:3464:16:3464:31 | (...)... : Object | Test.java:3465:32:3465:33 | in : Object | provenance |  |
 | Test.java:3464:24:3464:31 | source(...) : Object | Test.java:3464:16:3464:31 | (...)... : Object | provenance |  |
 | Test.java:3465:10:3465:46 | of(...) : ImmutableSet [<element>] : Object | Test.java:3466:20:3466:22 | out : ImmutableSet [<element>] : Object | provenance |  |
 | Test.java:3465:32:3465:33 | in : Object | Test.java:3465:10:3465:46 | of(...) : ImmutableSet [<element>] : Object | provenance | MaD:143 |
 | Test.java:3466:20:3466:22 | out : ImmutableSet [<element>] : Object | Test.java:110:19:110:32 | it : ImmutableSet [<element>] : Object | provenance |  |
-| Test.java:3466:20:3466:22 | out : ImmutableSet [<element>] : Object | Test.java:3466:9:3466:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:3466:20:3466:22 | out : ImmutableSet [<element>] : Object | Test.java:3466:9:3466:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:3471:16:3471:31 | (...)... : Object | Test.java:3472:32:3472:33 | in : Object | provenance |  |
 | Test.java:3471:24:3471:31 | source(...) : Object | Test.java:3471:16:3471:31 | (...)... : Object | provenance |  |
 | Test.java:3472:10:3472:40 | of(...) : ImmutableSet [<element>] : Object | Test.java:3473:20:3473:22 | out : ImmutableSet [<element>] : Object | provenance |  |
 | Test.java:3472:32:3472:33 | in : Object | Test.java:3472:10:3472:40 | of(...) : ImmutableSet [<element>] : Object | provenance | MaD:143 |
 | Test.java:3473:20:3473:22 | out : ImmutableSet [<element>] : Object | Test.java:110:19:110:32 | it : ImmutableSet [<element>] : Object | provenance |  |
-| Test.java:3473:20:3473:22 | out : ImmutableSet [<element>] : Object | Test.java:3473:9:3473:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:3473:20:3473:22 | out : ImmutableSet [<element>] : Object | Test.java:3473:9:3473:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:3478:16:3478:31 | (...)... : Object | Test.java:3479:32:3479:33 | in : Object | provenance |  |
 | Test.java:3478:24:3478:31 | source(...) : Object | Test.java:3478:16:3478:31 | (...)... : Object | provenance |  |
 | Test.java:3479:10:3479:34 | of(...) : ImmutableSet [<element>] : Object | Test.java:3480:20:3480:22 | out : ImmutableSet [<element>] : Object | provenance |  |
 | Test.java:3479:32:3479:33 | in : Object | Test.java:3479:10:3479:34 | of(...) : ImmutableSet [<element>] : Object | provenance | MaD:143 |
 | Test.java:3480:20:3480:22 | out : ImmutableSet [<element>] : Object | Test.java:110:19:110:32 | it : ImmutableSet [<element>] : Object | provenance |  |
-| Test.java:3480:20:3480:22 | out : ImmutableSet [<element>] : Object | Test.java:3480:9:3480:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:3480:20:3480:22 | out : ImmutableSet [<element>] : Object | Test.java:3480:9:3480:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:3485:16:3485:31 | (...)... : Object | Test.java:3486:26:3486:27 | in : Object | provenance |  |
 | Test.java:3485:24:3485:31 | source(...) : Object | Test.java:3485:16:3485:31 | (...)... : Object | provenance |  |
 | Test.java:3486:10:3486:52 | of(...) : ImmutableSet [<element>] : Object | Test.java:3487:20:3487:22 | out : ImmutableSet [<element>] : Object | provenance |  |
 | Test.java:3486:26:3486:27 | in : Object | Test.java:3486:10:3486:52 | of(...) : ImmutableSet [<element>] : Object | provenance | MaD:143 |
 | Test.java:3487:20:3487:22 | out : ImmutableSet [<element>] : Object | Test.java:110:19:110:32 | it : ImmutableSet [<element>] : Object | provenance |  |
-| Test.java:3487:20:3487:22 | out : ImmutableSet [<element>] : Object | Test.java:3487:9:3487:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:3487:20:3487:22 | out : ImmutableSet [<element>] : Object | Test.java:3487:9:3487:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:3492:16:3492:31 | (...)... : Object | Test.java:3493:26:3493:27 | in : Object | provenance |  |
 | Test.java:3492:24:3492:31 | source(...) : Object | Test.java:3492:16:3492:31 | (...)... : Object | provenance |  |
 | Test.java:3493:10:3493:46 | of(...) : ImmutableSet [<element>] : Object | Test.java:3494:20:3494:22 | out : ImmutableSet [<element>] : Object | provenance |  |
 | Test.java:3493:26:3493:27 | in : Object | Test.java:3493:10:3493:46 | of(...) : ImmutableSet [<element>] : Object | provenance | MaD:143 |
 | Test.java:3494:20:3494:22 | out : ImmutableSet [<element>] : Object | Test.java:110:19:110:32 | it : ImmutableSet [<element>] : Object | provenance |  |
-| Test.java:3494:20:3494:22 | out : ImmutableSet [<element>] : Object | Test.java:3494:9:3494:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:3494:20:3494:22 | out : ImmutableSet [<element>] : Object | Test.java:3494:9:3494:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:3499:16:3499:31 | (...)... : Object | Test.java:3500:26:3500:27 | in : Object | provenance |  |
 | Test.java:3499:24:3499:31 | source(...) : Object | Test.java:3499:16:3499:31 | (...)... : Object | provenance |  |
 | Test.java:3500:10:3500:40 | of(...) : ImmutableSet [<element>] : Object | Test.java:3501:20:3501:22 | out : ImmutableSet [<element>] : Object | provenance |  |
 | Test.java:3500:26:3500:27 | in : Object | Test.java:3500:10:3500:40 | of(...) : ImmutableSet [<element>] : Object | provenance | MaD:143 |
 | Test.java:3501:20:3501:22 | out : ImmutableSet [<element>] : Object | Test.java:110:19:110:32 | it : ImmutableSet [<element>] : Object | provenance |  |
-| Test.java:3501:20:3501:22 | out : ImmutableSet [<element>] : Object | Test.java:3501:9:3501:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:3501:20:3501:22 | out : ImmutableSet [<element>] : Object | Test.java:3501:9:3501:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:3506:16:3506:31 | (...)... : Object | Test.java:3507:26:3507:27 | in : Object | provenance |  |
 | Test.java:3506:24:3506:31 | source(...) : Object | Test.java:3506:16:3506:31 | (...)... : Object | provenance |  |
 | Test.java:3507:10:3507:34 | of(...) : ImmutableSet [<element>] : Object | Test.java:3508:20:3508:22 | out : ImmutableSet [<element>] : Object | provenance |  |
 | Test.java:3507:26:3507:27 | in : Object | Test.java:3507:10:3507:34 | of(...) : ImmutableSet [<element>] : Object | provenance | MaD:143 |
 | Test.java:3508:20:3508:22 | out : ImmutableSet [<element>] : Object | Test.java:110:19:110:32 | it : ImmutableSet [<element>] : Object | provenance |  |
-| Test.java:3508:20:3508:22 | out : ImmutableSet [<element>] : Object | Test.java:3508:9:3508:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:3508:20:3508:22 | out : ImmutableSet [<element>] : Object | Test.java:3508:9:3508:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:3513:16:3513:31 | (...)... : Object | Test.java:3514:26:3514:27 | in : Object | provenance |  |
 | Test.java:3513:24:3513:31 | source(...) : Object | Test.java:3513:16:3513:31 | (...)... : Object | provenance |  |
 | Test.java:3514:10:3514:114 | of(...) : ImmutableSet [<element>] : Object | Test.java:3515:20:3515:22 | out : ImmutableSet [<element>] : Object | provenance |  |
 | Test.java:3514:26:3514:27 | in : Object | Test.java:3514:10:3514:114 | of(...) : ImmutableSet [<element>] : Object | provenance | MaD:143 |
 | Test.java:3515:20:3515:22 | out : ImmutableSet [<element>] : Object | Test.java:110:19:110:32 | it : ImmutableSet [<element>] : Object | provenance |  |
-| Test.java:3515:20:3515:22 | out : ImmutableSet [<element>] : Object | Test.java:3515:9:3515:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:3515:20:3515:22 | out : ImmutableSet [<element>] : Object | Test.java:3515:9:3515:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:3520:16:3520:31 | (...)... : Object | Test.java:3521:26:3521:27 | in : Object | provenance |  |
 | Test.java:3520:24:3520:31 | source(...) : Object | Test.java:3520:16:3520:31 | (...)... : Object | provenance |  |
 | Test.java:3521:10:3521:28 | of(...) : ImmutableSet [<element>] : Object | Test.java:3522:20:3522:22 | out : ImmutableSet [<element>] : Object | provenance |  |
 | Test.java:3521:26:3521:27 | in : Object | Test.java:3521:10:3521:28 | of(...) : ImmutableSet [<element>] : Object | provenance | MaD:143 |
 | Test.java:3522:20:3522:22 | out : ImmutableSet [<element>] : Object | Test.java:110:19:110:32 | it : ImmutableSet [<element>] : Object | provenance |  |
-| Test.java:3522:20:3522:22 | out : ImmutableSet [<element>] : Object | Test.java:3522:9:3522:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:3522:20:3522:22 | out : ImmutableSet [<element>] : Object | Test.java:3522:9:3522:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:3527:16:3527:31 | (...)... : Object | Test.java:3528:40:3528:41 | in : Object | provenance |  |
 | Test.java:3527:24:3527:31 | source(...) : Object | Test.java:3527:16:3527:31 | (...)... : Object | provenance |  |
 | Test.java:3528:10:3528:114 | of(...) : ImmutableSet [<element>] : Object | Test.java:3529:20:3529:22 | out : ImmutableSet [<element>] : Object | provenance |  |
 | Test.java:3528:40:3528:41 | in : Object | Test.java:3528:10:3528:114 | of(...) : ImmutableSet [<element>] : Object | provenance | MaD:143 |
 | Test.java:3529:20:3529:22 | out : ImmutableSet [<element>] : Object | Test.java:110:19:110:32 | it : ImmutableSet [<element>] : Object | provenance |  |
-| Test.java:3529:20:3529:22 | out : ImmutableSet [<element>] : Object | Test.java:3529:9:3529:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:3529:20:3529:22 | out : ImmutableSet [<element>] : Object | Test.java:3529:9:3529:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:3534:16:3534:31 | (...)... : Object | Test.java:3535:54:3535:55 | in : Object | provenance |  |
 | Test.java:3534:24:3534:31 | source(...) : Object | Test.java:3534:16:3534:31 | (...)... : Object | provenance |  |
 | Test.java:3535:10:3535:114 | of(...) : ImmutableSet [<element>] : Object | Test.java:3536:20:3536:22 | out : ImmutableSet [<element>] : Object | provenance |  |
 | Test.java:3535:54:3535:55 | in : Object | Test.java:3535:10:3535:114 | of(...) : ImmutableSet [<element>] : Object | provenance | MaD:143 |
 | Test.java:3536:20:3536:22 | out : ImmutableSet [<element>] : Object | Test.java:110:19:110:32 | it : ImmutableSet [<element>] : Object | provenance |  |
-| Test.java:3536:20:3536:22 | out : ImmutableSet [<element>] : Object | Test.java:3536:9:3536:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:3536:20:3536:22 | out : ImmutableSet [<element>] : Object | Test.java:3536:9:3536:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:3541:16:3541:31 | (...)... : Object | Test.java:3542:68:3542:69 | in : Object | provenance |  |
 | Test.java:3541:24:3541:31 | source(...) : Object | Test.java:3541:16:3541:31 | (...)... : Object | provenance |  |
 | Test.java:3542:10:3542:114 | of(...) : ImmutableSet [<element>] : Object | Test.java:3543:20:3543:22 | out : ImmutableSet [<element>] : Object | provenance |  |
 | Test.java:3542:68:3542:69 | in : Object | Test.java:3542:10:3542:114 | of(...) : ImmutableSet [<element>] : Object | provenance | MaD:143 |
 | Test.java:3543:20:3543:22 | out : ImmutableSet [<element>] : Object | Test.java:110:19:110:32 | it : ImmutableSet [<element>] : Object | provenance |  |
-| Test.java:3543:20:3543:22 | out : ImmutableSet [<element>] : Object | Test.java:3543:9:3543:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:3543:20:3543:22 | out : ImmutableSet [<element>] : Object | Test.java:3543:9:3543:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:3548:16:3548:31 | (...)... : Object | Test.java:3549:82:3549:83 | in : Object | provenance |  |
 | Test.java:3548:24:3548:31 | source(...) : Object | Test.java:3548:16:3548:31 | (...)... : Object | provenance |  |
 | Test.java:3549:10:3549:114 | of(...) : ImmutableSet [<element>] : Object | Test.java:3550:20:3550:22 | out : ImmutableSet [<element>] : Object | provenance |  |
 | Test.java:3549:82:3549:83 | in : Object | Test.java:3549:10:3549:114 | of(...) : ImmutableSet [<element>] : Object | provenance | MaD:143 |
 | Test.java:3550:20:3550:22 | out : ImmutableSet [<element>] : Object | Test.java:110:19:110:32 | it : ImmutableSet [<element>] : Object | provenance |  |
-| Test.java:3550:20:3550:22 | out : ImmutableSet [<element>] : Object | Test.java:3550:9:3550:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:3550:20:3550:22 | out : ImmutableSet [<element>] : Object | Test.java:3550:9:3550:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:3555:16:3555:31 | (...)... : Object | Test.java:3556:96:3556:97 | in : Object | provenance |  |
 | Test.java:3555:24:3555:31 | source(...) : Object | Test.java:3555:16:3555:31 | (...)... : Object | provenance |  |
 | Test.java:3556:10:3556:114 | of(...) : ImmutableSet [<element>] : Object | Test.java:3557:20:3557:22 | out : ImmutableSet [<element>] : Object | provenance |  |
 | Test.java:3556:96:3556:97 | in : Object | Test.java:3556:10:3556:114 | of(...) : ImmutableSet [<element>] : Object | provenance | MaD:143 |
 | Test.java:3557:20:3557:22 | out : ImmutableSet [<element>] : Object | Test.java:110:19:110:32 | it : ImmutableSet [<element>] : Object | provenance |  |
-| Test.java:3557:20:3557:22 | out : ImmutableSet [<element>] : Object | Test.java:3557:9:3557:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:3557:20:3557:22 | out : ImmutableSet [<element>] : Object | Test.java:3557:9:3557:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:3562:18:3562:49 | (...)... : Object[] [[]] : Object | Test.java:3563:110:3563:111 | in : Object[] [[]] : Object | provenance |  |
 | Test.java:3562:28:3562:49 | {...} : Object[] [[]] : Object | Test.java:3562:18:3562:49 | (...)... : Object[] [[]] : Object | provenance |  |
 | Test.java:3562:41:3562:48 | source(...) : Object | Test.java:3562:28:3562:49 | {...} : Object[] [[]] : Object | provenance |  |
 | Test.java:3563:10:3563:112 | of(...) : ImmutableSet [<element>] : Object | Test.java:3564:20:3564:22 | out : ImmutableSet [<element>] : Object | provenance |  |
 | Test.java:3563:110:3563:111 | in : Object[] [[]] : Object | Test.java:3563:10:3563:112 | of(...) : ImmutableSet [<element>] : Object | provenance | MaD:144 |
 | Test.java:3564:20:3564:22 | out : ImmutableSet [<element>] : Object | Test.java:110:19:110:32 | it : ImmutableSet [<element>] : Object | provenance |  |
-| Test.java:3564:20:3564:22 | out : ImmutableSet [<element>] : Object | Test.java:3564:9:3564:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:3564:20:3564:22 | out : ImmutableSet [<element>] : Object | Test.java:3564:9:3564:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:3569:16:3569:31 | (...)... : Object | Test.java:3570:34:3570:35 | in : Object | provenance |  |
 | Test.java:3569:24:3569:31 | source(...) : Object | Test.java:3569:16:3569:31 | (...)... : Object | provenance |  |
 | Test.java:3570:10:3570:90 | of(...) : ImmutableSetMultimap [<map.key>] : Object | Test.java:3571:19:3571:21 | out : ImmutableSetMultimap [<map.key>] : Object | provenance |  |
@@ -4395,68 +4395,68 @@ edges
 | Test.java:3774:21:3774:23 | out : ImmutableSetMultimap [<map.value>] : Object | Test.java:3774:9:3774:24 | getMapValue(...) | provenance | MaD:385 |
 | Test.java:3779:18:3779:64 | (...)... : List [<element>, <map.key>] : Object | Test.java:3780:36:3780:37 | in : List [<element>, <map.key>] : Object | provenance |  |
 | Test.java:3779:28:3779:64 | of(...) : List [<element>, <map.key>] : Object | Test.java:3779:18:3779:64 | (...)... : List [<element>, <map.key>] : Object | provenance |  |
-| Test.java:3779:36:3779:63 | newEntryWithMapKey(...) : Entry [<map.key>] : Object | Test.java:3779:28:3779:64 | of(...) : List [<element>, <map.key>] : Object | provenance | MaD:558 |
+| Test.java:3779:36:3779:63 | newEntryWithMapKey(...) : Entry [<map.key>] : Object | Test.java:3779:28:3779:64 | of(...) : List [<element>, <map.key>] : Object | provenance | MaD:561 |
 | Test.java:3779:55:3779:62 | source(...) : Object | Test.java:101:40:101:44 | key : Object | provenance |  |
-| Test.java:3779:55:3779:62 | source(...) : Object | Test.java:3779:36:3779:63 | newEntryWithMapKey(...) : Entry [<map.key>] : Object | provenance | MaD:563 |
+| Test.java:3779:55:3779:62 | source(...) : Object | Test.java:3779:36:3779:63 | newEntryWithMapKey(...) : Entry [<map.key>] : Object | provenance | MaD:564 |
 | Test.java:3780:10:3780:38 | copyOf(...) : ImmutableSortedMap [<map.key>] : Object | Test.java:3781:19:3781:21 | out : ImmutableSortedMap [<map.key>] : Object | provenance |  |
 | Test.java:3780:36:3780:37 | in : List [<element>, <map.key>] : Object | Test.java:3780:10:3780:38 | copyOf(...) : ImmutableSortedMap [<map.key>] : Object | provenance | MaD:155 |
 | Test.java:3781:19:3781:21 | out : ImmutableSortedMap [<map.key>] : Object | Test.java:99:18:99:29 | map : ImmutableSortedMap [<map.key>] : Object | provenance |  |
-| Test.java:3781:19:3781:21 | out : ImmutableSortedMap [<map.key>] : Object | Test.java:3781:9:3781:22 | getMapKey(...) | provenance | MaD:562 |
+| Test.java:3781:19:3781:21 | out : ImmutableSortedMap [<map.key>] : Object | Test.java:3781:9:3781:22 | getMapKey(...) | provenance | MaD:569 |
 | Test.java:3786:18:3786:66 | (...)... : List [<element>, <map.value>] : Object | Test.java:3787:36:3787:37 | in : List [<element>, <map.value>] : Object | provenance |  |
 | Test.java:3786:28:3786:66 | of(...) : List [<element>, <map.value>] : Object | Test.java:3786:18:3786:66 | (...)... : List [<element>, <map.value>] : Object | provenance |  |
-| Test.java:3786:36:3786:65 | newEntryWithMapValue(...) : Entry [<map.value>] : Object | Test.java:3786:28:3786:66 | of(...) : List [<element>, <map.value>] : Object | provenance | MaD:558 |
+| Test.java:3786:36:3786:65 | newEntryWithMapValue(...) : Entry [<map.value>] : Object | Test.java:3786:28:3786:66 | of(...) : List [<element>, <map.value>] : Object | provenance | MaD:561 |
 | Test.java:3786:57:3786:64 | source(...) : Object | Test.java:113:42:113:48 | value : Object | provenance |  |
-| Test.java:3786:57:3786:64 | source(...) : Object | Test.java:3786:36:3786:65 | newEntryWithMapValue(...) : Entry [<map.value>] : Object | provenance | MaD:564 |
+| Test.java:3786:57:3786:64 | source(...) : Object | Test.java:3786:36:3786:65 | newEntryWithMapValue(...) : Entry [<map.value>] : Object | provenance | MaD:565 |
 | Test.java:3787:10:3787:38 | copyOf(...) : ImmutableSortedMap [<map.value>] : Object | Test.java:3788:21:3788:23 | out : ImmutableSortedMap [<map.value>] : Object | provenance |  |
 | Test.java:3787:36:3787:37 | in : List [<element>, <map.value>] : Object | Test.java:3787:10:3787:38 | copyOf(...) : ImmutableSortedMap [<map.value>] : Object | provenance | MaD:156 |
 | Test.java:3788:21:3788:23 | out : ImmutableSortedMap [<map.value>] : Object | Test.java:118:20:118:31 | map : ImmutableSortedMap [<map.value>] : Object | provenance |  |
-| Test.java:3788:21:3788:23 | out : ImmutableSortedMap [<map.value>] : Object | Test.java:3788:9:3788:24 | getMapValue(...) | provenance | MaD:561 |
+| Test.java:3788:21:3788:23 | out : ImmutableSortedMap [<map.value>] : Object | Test.java:3788:9:3788:24 | getMapValue(...) | provenance | MaD:568 |
 | Test.java:3793:18:3793:64 | (...)... : List [<element>, <map.key>] : Object | Test.java:3794:36:3794:37 | in : List [<element>, <map.key>] : Object | provenance |  |
 | Test.java:3793:28:3793:64 | of(...) : List [<element>, <map.key>] : Object | Test.java:3793:18:3793:64 | (...)... : List [<element>, <map.key>] : Object | provenance |  |
-| Test.java:3793:36:3793:63 | newEntryWithMapKey(...) : Entry [<map.key>] : Object | Test.java:3793:28:3793:64 | of(...) : List [<element>, <map.key>] : Object | provenance | MaD:558 |
+| Test.java:3793:36:3793:63 | newEntryWithMapKey(...) : Entry [<map.key>] : Object | Test.java:3793:28:3793:64 | of(...) : List [<element>, <map.key>] : Object | provenance | MaD:561 |
 | Test.java:3793:55:3793:62 | source(...) : Object | Test.java:101:40:101:44 | key : Object | provenance |  |
-| Test.java:3793:55:3793:62 | source(...) : Object | Test.java:3793:36:3793:63 | newEntryWithMapKey(...) : Entry [<map.key>] : Object | provenance | MaD:563 |
+| Test.java:3793:55:3793:62 | source(...) : Object | Test.java:3793:36:3793:63 | newEntryWithMapKey(...) : Entry [<map.key>] : Object | provenance | MaD:564 |
 | Test.java:3794:10:3794:56 | copyOf(...) : ImmutableSortedMap [<map.key>] : Object | Test.java:3795:19:3795:21 | out : ImmutableSortedMap [<map.key>] : Object | provenance |  |
 | Test.java:3794:36:3794:37 | in : List [<element>, <map.key>] : Object | Test.java:3794:10:3794:56 | copyOf(...) : ImmutableSortedMap [<map.key>] : Object | provenance | MaD:157 |
 | Test.java:3795:19:3795:21 | out : ImmutableSortedMap [<map.key>] : Object | Test.java:99:18:99:29 | map : ImmutableSortedMap [<map.key>] : Object | provenance |  |
-| Test.java:3795:19:3795:21 | out : ImmutableSortedMap [<map.key>] : Object | Test.java:3795:9:3795:22 | getMapKey(...) | provenance | MaD:562 |
+| Test.java:3795:19:3795:21 | out : ImmutableSortedMap [<map.key>] : Object | Test.java:3795:9:3795:22 | getMapKey(...) | provenance | MaD:569 |
 | Test.java:3800:18:3800:66 | (...)... : List [<element>, <map.value>] : Object | Test.java:3801:36:3801:37 | in : List [<element>, <map.value>] : Object | provenance |  |
 | Test.java:3800:28:3800:66 | of(...) : List [<element>, <map.value>] : Object | Test.java:3800:18:3800:66 | (...)... : List [<element>, <map.value>] : Object | provenance |  |
-| Test.java:3800:36:3800:65 | newEntryWithMapValue(...) : Entry [<map.value>] : Object | Test.java:3800:28:3800:66 | of(...) : List [<element>, <map.value>] : Object | provenance | MaD:558 |
+| Test.java:3800:36:3800:65 | newEntryWithMapValue(...) : Entry [<map.value>] : Object | Test.java:3800:28:3800:66 | of(...) : List [<element>, <map.value>] : Object | provenance | MaD:561 |
 | Test.java:3800:57:3800:64 | source(...) : Object | Test.java:113:42:113:48 | value : Object | provenance |  |
-| Test.java:3800:57:3800:64 | source(...) : Object | Test.java:3800:36:3800:65 | newEntryWithMapValue(...) : Entry [<map.value>] : Object | provenance | MaD:564 |
+| Test.java:3800:57:3800:64 | source(...) : Object | Test.java:3800:36:3800:65 | newEntryWithMapValue(...) : Entry [<map.value>] : Object | provenance | MaD:565 |
 | Test.java:3801:10:3801:56 | copyOf(...) : ImmutableSortedMap [<map.value>] : Object | Test.java:3802:21:3802:23 | out : ImmutableSortedMap [<map.value>] : Object | provenance |  |
 | Test.java:3801:36:3801:37 | in : List [<element>, <map.value>] : Object | Test.java:3801:10:3801:56 | copyOf(...) : ImmutableSortedMap [<map.value>] : Object | provenance | MaD:158 |
 | Test.java:3802:21:3802:23 | out : ImmutableSortedMap [<map.value>] : Object | Test.java:118:20:118:31 | map : ImmutableSortedMap [<map.value>] : Object | provenance |  |
-| Test.java:3802:21:3802:23 | out : ImmutableSortedMap [<map.value>] : Object | Test.java:3802:9:3802:24 | getMapValue(...) | provenance | MaD:561 |
+| Test.java:3802:21:3802:23 | out : ImmutableSortedMap [<map.value>] : Object | Test.java:3802:9:3802:24 | getMapValue(...) | provenance | MaD:568 |
 | Test.java:3807:13:3807:39 | (...)... : Map [<map.key>] : Object | Test.java:3808:36:3808:37 | in : Map [<map.key>] : Object | provenance |  |
 | Test.java:3807:18:3807:39 | of(...) : Map [<map.key>] : Object | Test.java:3807:13:3807:39 | (...)... : Map [<map.key>] : Object | provenance |  |
-| Test.java:3807:25:3807:32 | source(...) : Object | Test.java:3807:18:3807:39 | of(...) : Map [<map.key>] : Object | provenance | MaD:563 |
+| Test.java:3807:25:3807:32 | source(...) : Object | Test.java:3807:18:3807:39 | of(...) : Map [<map.key>] : Object | provenance | MaD:564 |
 | Test.java:3808:10:3808:38 | copyOf(...) : ImmutableSortedMap [<map.key>] : Object | Test.java:3809:19:3809:21 | out : ImmutableSortedMap [<map.key>] : Object | provenance |  |
 | Test.java:3808:36:3808:37 | in : Map [<map.key>] : Object | Test.java:3808:10:3808:38 | copyOf(...) : ImmutableSortedMap [<map.key>] : Object | provenance | MaD:159 |
 | Test.java:3809:19:3809:21 | out : ImmutableSortedMap [<map.key>] : Object | Test.java:99:18:99:29 | map : ImmutableSortedMap [<map.key>] : Object | provenance |  |
-| Test.java:3809:19:3809:21 | out : ImmutableSortedMap [<map.key>] : Object | Test.java:3809:9:3809:22 | getMapKey(...) | provenance | MaD:562 |
+| Test.java:3809:19:3809:21 | out : ImmutableSortedMap [<map.key>] : Object | Test.java:3809:9:3809:22 | getMapKey(...) | provenance | MaD:569 |
 | Test.java:3814:13:3814:39 | (...)... : Map [<map.value>] : Object | Test.java:3815:36:3815:37 | in : Map [<map.value>] : Object | provenance |  |
 | Test.java:3814:18:3814:39 | of(...) : Map [<map.value>] : Object | Test.java:3814:13:3814:39 | (...)... : Map [<map.value>] : Object | provenance |  |
-| Test.java:3814:31:3814:38 | source(...) : Object | Test.java:3814:18:3814:39 | of(...) : Map [<map.value>] : Object | provenance | MaD:564 |
+| Test.java:3814:31:3814:38 | source(...) : Object | Test.java:3814:18:3814:39 | of(...) : Map [<map.value>] : Object | provenance | MaD:565 |
 | Test.java:3815:10:3815:38 | copyOf(...) : ImmutableSortedMap [<map.value>] : Object | Test.java:3816:21:3816:23 | out : ImmutableSortedMap [<map.value>] : Object | provenance |  |
 | Test.java:3815:36:3815:37 | in : Map [<map.value>] : Object | Test.java:3815:10:3815:38 | copyOf(...) : ImmutableSortedMap [<map.value>] : Object | provenance | MaD:160 |
 | Test.java:3816:21:3816:23 | out : ImmutableSortedMap [<map.value>] : Object | Test.java:118:20:118:31 | map : ImmutableSortedMap [<map.value>] : Object | provenance |  |
-| Test.java:3816:21:3816:23 | out : ImmutableSortedMap [<map.value>] : Object | Test.java:3816:9:3816:24 | getMapValue(...) | provenance | MaD:561 |
+| Test.java:3816:21:3816:23 | out : ImmutableSortedMap [<map.value>] : Object | Test.java:3816:9:3816:24 | getMapValue(...) | provenance | MaD:568 |
 | Test.java:3821:13:3821:39 | (...)... : Map [<map.key>] : Object | Test.java:3822:36:3822:37 | in : Map [<map.key>] : Object | provenance |  |
 | Test.java:3821:18:3821:39 | of(...) : Map [<map.key>] : Object | Test.java:3821:13:3821:39 | (...)... : Map [<map.key>] : Object | provenance |  |
-| Test.java:3821:25:3821:32 | source(...) : Object | Test.java:3821:18:3821:39 | of(...) : Map [<map.key>] : Object | provenance | MaD:563 |
+| Test.java:3821:25:3821:32 | source(...) : Object | Test.java:3821:18:3821:39 | of(...) : Map [<map.key>] : Object | provenance | MaD:564 |
 | Test.java:3822:10:3822:56 | copyOf(...) : ImmutableSortedMap [<map.key>] : Object | Test.java:3823:19:3823:21 | out : ImmutableSortedMap [<map.key>] : Object | provenance |  |
 | Test.java:3822:36:3822:37 | in : Map [<map.key>] : Object | Test.java:3822:10:3822:56 | copyOf(...) : ImmutableSortedMap [<map.key>] : Object | provenance | MaD:161 |
 | Test.java:3823:19:3823:21 | out : ImmutableSortedMap [<map.key>] : Object | Test.java:99:18:99:29 | map : ImmutableSortedMap [<map.key>] : Object | provenance |  |
-| Test.java:3823:19:3823:21 | out : ImmutableSortedMap [<map.key>] : Object | Test.java:3823:9:3823:22 | getMapKey(...) | provenance | MaD:562 |
+| Test.java:3823:19:3823:21 | out : ImmutableSortedMap [<map.key>] : Object | Test.java:3823:9:3823:22 | getMapKey(...) | provenance | MaD:569 |
 | Test.java:3828:13:3828:39 | (...)... : Map [<map.value>] : Object | Test.java:3829:36:3829:37 | in : Map [<map.value>] : Object | provenance |  |
 | Test.java:3828:18:3828:39 | of(...) : Map [<map.value>] : Object | Test.java:3828:13:3828:39 | (...)... : Map [<map.value>] : Object | provenance |  |
-| Test.java:3828:31:3828:38 | source(...) : Object | Test.java:3828:18:3828:39 | of(...) : Map [<map.value>] : Object | provenance | MaD:564 |
+| Test.java:3828:31:3828:38 | source(...) : Object | Test.java:3828:18:3828:39 | of(...) : Map [<map.value>] : Object | provenance | MaD:565 |
 | Test.java:3829:10:3829:56 | copyOf(...) : ImmutableSortedMap [<map.value>] : Object | Test.java:3830:21:3830:23 | out : ImmutableSortedMap [<map.value>] : Object | provenance |  |
 | Test.java:3829:36:3829:37 | in : Map [<map.value>] : Object | Test.java:3829:10:3829:56 | copyOf(...) : ImmutableSortedMap [<map.value>] : Object | provenance | MaD:162 |
 | Test.java:3830:21:3830:23 | out : ImmutableSortedMap [<map.value>] : Object | Test.java:118:20:118:31 | map : ImmutableSortedMap [<map.value>] : Object | provenance |  |
-| Test.java:3830:21:3830:23 | out : ImmutableSortedMap [<map.value>] : Object | Test.java:3830:9:3830:24 | getMapValue(...) | provenance | MaD:561 |
+| Test.java:3830:21:3830:23 | out : ImmutableSortedMap [<map.value>] : Object | Test.java:3830:9:3830:24 | getMapValue(...) | provenance | MaD:568 |
 | Test.java:3835:19:3835:78 | (...)... : ImmutableSortedMap [<map.key>] : Comparable | Test.java:3836:42:3836:43 | in : ImmutableSortedMap [<map.key>] : Comparable | provenance |  |
 | Test.java:3835:30:3835:78 | of(...) : ImmutableSortedMap [<map.key>] : Comparable | Test.java:3835:19:3835:78 | (...)... : ImmutableSortedMap [<map.key>] : Comparable | provenance |  |
 | Test.java:3835:52:3835:71 | (...)... : Comparable | Test.java:3835:30:3835:78 | of(...) : ImmutableSortedMap [<map.key>] : Comparable | provenance | MaD:165 |
@@ -4464,194 +4464,194 @@ edges
 | Test.java:3836:10:3836:44 | copyOfSorted(...) : ImmutableSortedMap [<map.key>] : Comparable | Test.java:3837:19:3837:21 | out : ImmutableSortedMap [<map.key>] : Comparable | provenance |  |
 | Test.java:3836:42:3836:43 | in : ImmutableSortedMap [<map.key>] : Comparable | Test.java:3836:10:3836:44 | copyOfSorted(...) : ImmutableSortedMap [<map.key>] : Comparable | provenance | MaD:163 |
 | Test.java:3837:19:3837:21 | out : ImmutableSortedMap [<map.key>] : Comparable | Test.java:99:18:99:29 | map : ImmutableSortedMap [<map.key>] : Comparable | provenance |  |
-| Test.java:3837:19:3837:21 | out : ImmutableSortedMap [<map.key>] : Comparable | Test.java:3837:9:3837:22 | getMapKey(...) | provenance | MaD:562 |
+| Test.java:3837:19:3837:21 | out : ImmutableSortedMap [<map.key>] : Comparable | Test.java:3837:9:3837:22 | getMapKey(...) | provenance | MaD:569 |
 | Test.java:3842:19:3842:78 | (...)... : ImmutableSortedMap [<map.value>] : Object | Test.java:3843:42:3843:43 | in : ImmutableSortedMap [<map.value>] : Object | provenance |  |
 | Test.java:3842:30:3842:78 | of(...) : ImmutableSortedMap [<map.value>] : Object | Test.java:3842:19:3842:78 | (...)... : ImmutableSortedMap [<map.value>] : Object | provenance |  |
 | Test.java:3842:70:3842:77 | source(...) : Object | Test.java:3842:30:3842:78 | of(...) : ImmutableSortedMap [<map.value>] : Object | provenance | MaD:166 |
 | Test.java:3843:10:3843:44 | copyOfSorted(...) : ImmutableSortedMap [<map.value>] : Object | Test.java:3844:21:3844:23 | out : ImmutableSortedMap [<map.value>] : Object | provenance |  |
 | Test.java:3843:42:3843:43 | in : ImmutableSortedMap [<map.value>] : Object | Test.java:3843:10:3843:44 | copyOfSorted(...) : ImmutableSortedMap [<map.value>] : Object | provenance | MaD:164 |
 | Test.java:3844:21:3844:23 | out : ImmutableSortedMap [<map.value>] : Object | Test.java:118:20:118:31 | map : ImmutableSortedMap [<map.value>] : Object | provenance |  |
-| Test.java:3844:21:3844:23 | out : ImmutableSortedMap [<map.value>] : Object | Test.java:3844:9:3844:24 | getMapValue(...) | provenance | MaD:561 |
+| Test.java:3844:21:3844:23 | out : ImmutableSortedMap [<map.value>] : Object | Test.java:3844:9:3844:24 | getMapValue(...) | provenance | MaD:568 |
 | Test.java:3849:20:3849:39 | (...)... : Comparable | Test.java:3850:32:3850:33 | in : Comparable | provenance |  |
 | Test.java:3849:32:3849:39 | source(...) : Object | Test.java:3849:20:3849:39 | (...)... : Comparable | provenance |  |
 | Test.java:3850:10:3850:88 | of(...) : ImmutableSortedMap [<map.key>] : Comparable | Test.java:3851:19:3851:21 | out : ImmutableSortedMap [<map.key>] : Comparable | provenance |  |
 | Test.java:3850:32:3850:33 | in : Comparable | Test.java:3850:10:3850:88 | of(...) : ImmutableSortedMap [<map.key>] : Comparable | provenance | MaD:165 |
 | Test.java:3851:19:3851:21 | out : ImmutableSortedMap [<map.key>] : Comparable | Test.java:99:18:99:29 | map : ImmutableSortedMap [<map.key>] : Comparable | provenance |  |
-| Test.java:3851:19:3851:21 | out : ImmutableSortedMap [<map.key>] : Comparable | Test.java:3851:9:3851:22 | getMapKey(...) | provenance | MaD:562 |
+| Test.java:3851:19:3851:21 | out : ImmutableSortedMap [<map.key>] : Comparable | Test.java:3851:9:3851:22 | getMapKey(...) | provenance | MaD:569 |
 | Test.java:3856:20:3856:39 | (...)... : Comparable | Test.java:3857:32:3857:33 | in : Comparable | provenance |  |
 | Test.java:3856:32:3856:39 | source(...) : Object | Test.java:3856:20:3856:39 | (...)... : Comparable | provenance |  |
 | Test.java:3857:10:3857:76 | of(...) : ImmutableSortedMap [<map.key>] : Comparable | Test.java:3858:19:3858:21 | out : ImmutableSortedMap [<map.key>] : Comparable | provenance |  |
 | Test.java:3857:32:3857:33 | in : Comparable | Test.java:3857:10:3857:76 | of(...) : ImmutableSortedMap [<map.key>] : Comparable | provenance | MaD:165 |
 | Test.java:3858:19:3858:21 | out : ImmutableSortedMap [<map.key>] : Comparable | Test.java:99:18:99:29 | map : ImmutableSortedMap [<map.key>] : Comparable | provenance |  |
-| Test.java:3858:19:3858:21 | out : ImmutableSortedMap [<map.key>] : Comparable | Test.java:3858:9:3858:22 | getMapKey(...) | provenance | MaD:562 |
+| Test.java:3858:19:3858:21 | out : ImmutableSortedMap [<map.key>] : Comparable | Test.java:3858:9:3858:22 | getMapKey(...) | provenance | MaD:569 |
 | Test.java:3863:20:3863:39 | (...)... : Comparable | Test.java:3864:32:3864:33 | in : Comparable | provenance |  |
 | Test.java:3863:32:3863:39 | source(...) : Object | Test.java:3863:20:3863:39 | (...)... : Comparable | provenance |  |
 | Test.java:3864:10:3864:64 | of(...) : ImmutableSortedMap [<map.key>] : Comparable | Test.java:3865:19:3865:21 | out : ImmutableSortedMap [<map.key>] : Comparable | provenance |  |
 | Test.java:3864:32:3864:33 | in : Comparable | Test.java:3864:10:3864:64 | of(...) : ImmutableSortedMap [<map.key>] : Comparable | provenance | MaD:165 |
 | Test.java:3865:19:3865:21 | out : ImmutableSortedMap [<map.key>] : Comparable | Test.java:99:18:99:29 | map : ImmutableSortedMap [<map.key>] : Comparable | provenance |  |
-| Test.java:3865:19:3865:21 | out : ImmutableSortedMap [<map.key>] : Comparable | Test.java:3865:9:3865:22 | getMapKey(...) | provenance | MaD:562 |
+| Test.java:3865:19:3865:21 | out : ImmutableSortedMap [<map.key>] : Comparable | Test.java:3865:9:3865:22 | getMapKey(...) | provenance | MaD:569 |
 | Test.java:3870:20:3870:39 | (...)... : Comparable | Test.java:3871:32:3871:33 | in : Comparable | provenance |  |
 | Test.java:3870:32:3870:39 | source(...) : Object | Test.java:3870:20:3870:39 | (...)... : Comparable | provenance |  |
 | Test.java:3871:10:3871:52 | of(...) : ImmutableSortedMap [<map.key>] : Comparable | Test.java:3872:19:3872:21 | out : ImmutableSortedMap [<map.key>] : Comparable | provenance |  |
 | Test.java:3871:32:3871:33 | in : Comparable | Test.java:3871:10:3871:52 | of(...) : ImmutableSortedMap [<map.key>] : Comparable | provenance | MaD:165 |
 | Test.java:3872:19:3872:21 | out : ImmutableSortedMap [<map.key>] : Comparable | Test.java:99:18:99:29 | map : ImmutableSortedMap [<map.key>] : Comparable | provenance |  |
-| Test.java:3872:19:3872:21 | out : ImmutableSortedMap [<map.key>] : Comparable | Test.java:3872:9:3872:22 | getMapKey(...) | provenance | MaD:562 |
+| Test.java:3872:19:3872:21 | out : ImmutableSortedMap [<map.key>] : Comparable | Test.java:3872:9:3872:22 | getMapKey(...) | provenance | MaD:569 |
 | Test.java:3877:20:3877:39 | (...)... : Comparable | Test.java:3878:32:3878:33 | in : Comparable | provenance |  |
 | Test.java:3877:32:3877:39 | source(...) : Object | Test.java:3877:20:3877:39 | (...)... : Comparable | provenance |  |
 | Test.java:3878:10:3878:40 | of(...) : ImmutableSortedMap [<map.key>] : Comparable | Test.java:3879:19:3879:21 | out : ImmutableSortedMap [<map.key>] : Comparable | provenance |  |
 | Test.java:3878:32:3878:33 | in : Comparable | Test.java:3878:10:3878:40 | of(...) : ImmutableSortedMap [<map.key>] : Comparable | provenance | MaD:165 |
 | Test.java:3879:19:3879:21 | out : ImmutableSortedMap [<map.key>] : Comparable | Test.java:99:18:99:29 | map : ImmutableSortedMap [<map.key>] : Comparable | provenance |  |
-| Test.java:3879:19:3879:21 | out : ImmutableSortedMap [<map.key>] : Comparable | Test.java:3879:9:3879:22 | getMapKey(...) | provenance | MaD:562 |
+| Test.java:3879:19:3879:21 | out : ImmutableSortedMap [<map.key>] : Comparable | Test.java:3879:9:3879:22 | getMapKey(...) | provenance | MaD:569 |
 | Test.java:3884:16:3884:31 | (...)... : Object | Test.java:3885:38:3885:39 | in : Object | provenance |  |
 | Test.java:3884:24:3884:31 | source(...) : Object | Test.java:3884:16:3884:31 | (...)... : Object | provenance |  |
 | Test.java:3885:10:3885:88 | of(...) : ImmutableSortedMap [<map.value>] : Object | Test.java:3886:21:3886:23 | out : ImmutableSortedMap [<map.value>] : Object | provenance |  |
 | Test.java:3885:38:3885:39 | in : Object | Test.java:3885:10:3885:88 | of(...) : ImmutableSortedMap [<map.value>] : Object | provenance | MaD:166 |
 | Test.java:3886:21:3886:23 | out : ImmutableSortedMap [<map.value>] : Object | Test.java:118:20:118:31 | map : ImmutableSortedMap [<map.value>] : Object | provenance |  |
-| Test.java:3886:21:3886:23 | out : ImmutableSortedMap [<map.value>] : Object | Test.java:3886:9:3886:24 | getMapValue(...) | provenance | MaD:561 |
+| Test.java:3886:21:3886:23 | out : ImmutableSortedMap [<map.value>] : Object | Test.java:3886:9:3886:24 | getMapValue(...) | provenance | MaD:568 |
 | Test.java:3891:16:3891:31 | (...)... : Object | Test.java:3892:38:3892:39 | in : Object | provenance |  |
 | Test.java:3891:24:3891:31 | source(...) : Object | Test.java:3891:16:3891:31 | (...)... : Object | provenance |  |
 | Test.java:3892:10:3892:76 | of(...) : ImmutableSortedMap [<map.value>] : Object | Test.java:3893:21:3893:23 | out : ImmutableSortedMap [<map.value>] : Object | provenance |  |
 | Test.java:3892:38:3892:39 | in : Object | Test.java:3892:10:3892:76 | of(...) : ImmutableSortedMap [<map.value>] : Object | provenance | MaD:166 |
 | Test.java:3893:21:3893:23 | out : ImmutableSortedMap [<map.value>] : Object | Test.java:118:20:118:31 | map : ImmutableSortedMap [<map.value>] : Object | provenance |  |
-| Test.java:3893:21:3893:23 | out : ImmutableSortedMap [<map.value>] : Object | Test.java:3893:9:3893:24 | getMapValue(...) | provenance | MaD:561 |
+| Test.java:3893:21:3893:23 | out : ImmutableSortedMap [<map.value>] : Object | Test.java:3893:9:3893:24 | getMapValue(...) | provenance | MaD:568 |
 | Test.java:3898:16:3898:31 | (...)... : Object | Test.java:3899:38:3899:39 | in : Object | provenance |  |
 | Test.java:3898:24:3898:31 | source(...) : Object | Test.java:3898:16:3898:31 | (...)... : Object | provenance |  |
 | Test.java:3899:10:3899:64 | of(...) : ImmutableSortedMap [<map.value>] : Object | Test.java:3900:21:3900:23 | out : ImmutableSortedMap [<map.value>] : Object | provenance |  |
 | Test.java:3899:38:3899:39 | in : Object | Test.java:3899:10:3899:64 | of(...) : ImmutableSortedMap [<map.value>] : Object | provenance | MaD:166 |
 | Test.java:3900:21:3900:23 | out : ImmutableSortedMap [<map.value>] : Object | Test.java:118:20:118:31 | map : ImmutableSortedMap [<map.value>] : Object | provenance |  |
-| Test.java:3900:21:3900:23 | out : ImmutableSortedMap [<map.value>] : Object | Test.java:3900:9:3900:24 | getMapValue(...) | provenance | MaD:561 |
+| Test.java:3900:21:3900:23 | out : ImmutableSortedMap [<map.value>] : Object | Test.java:3900:9:3900:24 | getMapValue(...) | provenance | MaD:568 |
 | Test.java:3905:16:3905:31 | (...)... : Object | Test.java:3906:38:3906:39 | in : Object | provenance |  |
 | Test.java:3905:24:3905:31 | source(...) : Object | Test.java:3905:16:3905:31 | (...)... : Object | provenance |  |
 | Test.java:3906:10:3906:52 | of(...) : ImmutableSortedMap [<map.value>] : Object | Test.java:3907:21:3907:23 | out : ImmutableSortedMap [<map.value>] : Object | provenance |  |
 | Test.java:3906:38:3906:39 | in : Object | Test.java:3906:10:3906:52 | of(...) : ImmutableSortedMap [<map.value>] : Object | provenance | MaD:166 |
 | Test.java:3907:21:3907:23 | out : ImmutableSortedMap [<map.value>] : Object | Test.java:118:20:118:31 | map : ImmutableSortedMap [<map.value>] : Object | provenance |  |
-| Test.java:3907:21:3907:23 | out : ImmutableSortedMap [<map.value>] : Object | Test.java:3907:9:3907:24 | getMapValue(...) | provenance | MaD:561 |
+| Test.java:3907:21:3907:23 | out : ImmutableSortedMap [<map.value>] : Object | Test.java:3907:9:3907:24 | getMapValue(...) | provenance | MaD:568 |
 | Test.java:3912:16:3912:31 | (...)... : Object | Test.java:3913:38:3913:39 | in : Object | provenance |  |
 | Test.java:3912:24:3912:31 | source(...) : Object | Test.java:3912:16:3912:31 | (...)... : Object | provenance |  |
 | Test.java:3913:10:3913:40 | of(...) : ImmutableSortedMap [<map.value>] : Object | Test.java:3914:21:3914:23 | out : ImmutableSortedMap [<map.value>] : Object | provenance |  |
 | Test.java:3913:38:3913:39 | in : Object | Test.java:3913:10:3913:40 | of(...) : ImmutableSortedMap [<map.value>] : Object | provenance | MaD:166 |
 | Test.java:3914:21:3914:23 | out : ImmutableSortedMap [<map.value>] : Object | Test.java:118:20:118:31 | map : ImmutableSortedMap [<map.value>] : Object | provenance |  |
-| Test.java:3914:21:3914:23 | out : ImmutableSortedMap [<map.value>] : Object | Test.java:3914:9:3914:24 | getMapValue(...) | provenance | MaD:561 |
+| Test.java:3914:21:3914:23 | out : ImmutableSortedMap [<map.value>] : Object | Test.java:3914:9:3914:24 | getMapValue(...) | provenance | MaD:568 |
 | Test.java:3919:20:3919:39 | (...)... : Comparable | Test.java:3920:44:3920:45 | in : Comparable | provenance |  |
 | Test.java:3919:32:3919:39 | source(...) : Object | Test.java:3919:20:3919:39 | (...)... : Comparable | provenance |  |
 | Test.java:3920:10:3920:88 | of(...) : ImmutableSortedMap [<map.key>] : Comparable | Test.java:3921:19:3921:21 | out : ImmutableSortedMap [<map.key>] : Comparable | provenance |  |
 | Test.java:3920:44:3920:45 | in : Comparable | Test.java:3920:10:3920:88 | of(...) : ImmutableSortedMap [<map.key>] : Comparable | provenance | MaD:167 |
 | Test.java:3921:19:3921:21 | out : ImmutableSortedMap [<map.key>] : Comparable | Test.java:99:18:99:29 | map : ImmutableSortedMap [<map.key>] : Comparable | provenance |  |
-| Test.java:3921:19:3921:21 | out : ImmutableSortedMap [<map.key>] : Comparable | Test.java:3921:9:3921:22 | getMapKey(...) | provenance | MaD:562 |
+| Test.java:3921:19:3921:21 | out : ImmutableSortedMap [<map.key>] : Comparable | Test.java:3921:9:3921:22 | getMapKey(...) | provenance | MaD:569 |
 | Test.java:3926:20:3926:39 | (...)... : Comparable | Test.java:3927:44:3927:45 | in : Comparable | provenance |  |
 | Test.java:3926:32:3926:39 | source(...) : Object | Test.java:3926:20:3926:39 | (...)... : Comparable | provenance |  |
 | Test.java:3927:10:3927:76 | of(...) : ImmutableSortedMap [<map.key>] : Comparable | Test.java:3928:19:3928:21 | out : ImmutableSortedMap [<map.key>] : Comparable | provenance |  |
 | Test.java:3927:44:3927:45 | in : Comparable | Test.java:3927:10:3927:76 | of(...) : ImmutableSortedMap [<map.key>] : Comparable | provenance | MaD:167 |
 | Test.java:3928:19:3928:21 | out : ImmutableSortedMap [<map.key>] : Comparable | Test.java:99:18:99:29 | map : ImmutableSortedMap [<map.key>] : Comparable | provenance |  |
-| Test.java:3928:19:3928:21 | out : ImmutableSortedMap [<map.key>] : Comparable | Test.java:3928:9:3928:22 | getMapKey(...) | provenance | MaD:562 |
+| Test.java:3928:19:3928:21 | out : ImmutableSortedMap [<map.key>] : Comparable | Test.java:3928:9:3928:22 | getMapKey(...) | provenance | MaD:569 |
 | Test.java:3933:20:3933:39 | (...)... : Comparable | Test.java:3934:44:3934:45 | in : Comparable | provenance |  |
 | Test.java:3933:32:3933:39 | source(...) : Object | Test.java:3933:20:3933:39 | (...)... : Comparable | provenance |  |
 | Test.java:3934:10:3934:64 | of(...) : ImmutableSortedMap [<map.key>] : Comparable | Test.java:3935:19:3935:21 | out : ImmutableSortedMap [<map.key>] : Comparable | provenance |  |
 | Test.java:3934:44:3934:45 | in : Comparable | Test.java:3934:10:3934:64 | of(...) : ImmutableSortedMap [<map.key>] : Comparable | provenance | MaD:167 |
 | Test.java:3935:19:3935:21 | out : ImmutableSortedMap [<map.key>] : Comparable | Test.java:99:18:99:29 | map : ImmutableSortedMap [<map.key>] : Comparable | provenance |  |
-| Test.java:3935:19:3935:21 | out : ImmutableSortedMap [<map.key>] : Comparable | Test.java:3935:9:3935:22 | getMapKey(...) | provenance | MaD:562 |
+| Test.java:3935:19:3935:21 | out : ImmutableSortedMap [<map.key>] : Comparable | Test.java:3935:9:3935:22 | getMapKey(...) | provenance | MaD:569 |
 | Test.java:3940:20:3940:39 | (...)... : Comparable | Test.java:3941:44:3941:45 | in : Comparable | provenance |  |
 | Test.java:3940:32:3940:39 | source(...) : Object | Test.java:3940:20:3940:39 | (...)... : Comparable | provenance |  |
 | Test.java:3941:10:3941:52 | of(...) : ImmutableSortedMap [<map.key>] : Comparable | Test.java:3942:19:3942:21 | out : ImmutableSortedMap [<map.key>] : Comparable | provenance |  |
 | Test.java:3941:44:3941:45 | in : Comparable | Test.java:3941:10:3941:52 | of(...) : ImmutableSortedMap [<map.key>] : Comparable | provenance | MaD:167 |
 | Test.java:3942:19:3942:21 | out : ImmutableSortedMap [<map.key>] : Comparable | Test.java:99:18:99:29 | map : ImmutableSortedMap [<map.key>] : Comparable | provenance |  |
-| Test.java:3942:19:3942:21 | out : ImmutableSortedMap [<map.key>] : Comparable | Test.java:3942:9:3942:22 | getMapKey(...) | provenance | MaD:562 |
+| Test.java:3942:19:3942:21 | out : ImmutableSortedMap [<map.key>] : Comparable | Test.java:3942:9:3942:22 | getMapKey(...) | provenance | MaD:569 |
 | Test.java:3947:16:3947:31 | (...)... : Object | Test.java:3948:50:3948:51 | in : Object | provenance |  |
 | Test.java:3947:24:3947:31 | source(...) : Object | Test.java:3947:16:3947:31 | (...)... : Object | provenance |  |
 | Test.java:3948:10:3948:88 | of(...) : ImmutableSortedMap [<map.value>] : Object | Test.java:3949:21:3949:23 | out : ImmutableSortedMap [<map.value>] : Object | provenance |  |
 | Test.java:3948:50:3948:51 | in : Object | Test.java:3948:10:3948:88 | of(...) : ImmutableSortedMap [<map.value>] : Object | provenance | MaD:168 |
 | Test.java:3949:21:3949:23 | out : ImmutableSortedMap [<map.value>] : Object | Test.java:118:20:118:31 | map : ImmutableSortedMap [<map.value>] : Object | provenance |  |
-| Test.java:3949:21:3949:23 | out : ImmutableSortedMap [<map.value>] : Object | Test.java:3949:9:3949:24 | getMapValue(...) | provenance | MaD:561 |
+| Test.java:3949:21:3949:23 | out : ImmutableSortedMap [<map.value>] : Object | Test.java:3949:9:3949:24 | getMapValue(...) | provenance | MaD:568 |
 | Test.java:3954:16:3954:31 | (...)... : Object | Test.java:3955:50:3955:51 | in : Object | provenance |  |
 | Test.java:3954:24:3954:31 | source(...) : Object | Test.java:3954:16:3954:31 | (...)... : Object | provenance |  |
 | Test.java:3955:10:3955:76 | of(...) : ImmutableSortedMap [<map.value>] : Object | Test.java:3956:21:3956:23 | out : ImmutableSortedMap [<map.value>] : Object | provenance |  |
 | Test.java:3955:50:3955:51 | in : Object | Test.java:3955:10:3955:76 | of(...) : ImmutableSortedMap [<map.value>] : Object | provenance | MaD:168 |
 | Test.java:3956:21:3956:23 | out : ImmutableSortedMap [<map.value>] : Object | Test.java:118:20:118:31 | map : ImmutableSortedMap [<map.value>] : Object | provenance |  |
-| Test.java:3956:21:3956:23 | out : ImmutableSortedMap [<map.value>] : Object | Test.java:3956:9:3956:24 | getMapValue(...) | provenance | MaD:561 |
+| Test.java:3956:21:3956:23 | out : ImmutableSortedMap [<map.value>] : Object | Test.java:3956:9:3956:24 | getMapValue(...) | provenance | MaD:568 |
 | Test.java:3961:16:3961:31 | (...)... : Object | Test.java:3962:50:3962:51 | in : Object | provenance |  |
 | Test.java:3961:24:3961:31 | source(...) : Object | Test.java:3961:16:3961:31 | (...)... : Object | provenance |  |
 | Test.java:3962:10:3962:64 | of(...) : ImmutableSortedMap [<map.value>] : Object | Test.java:3963:21:3963:23 | out : ImmutableSortedMap [<map.value>] : Object | provenance |  |
 | Test.java:3962:50:3962:51 | in : Object | Test.java:3962:10:3962:64 | of(...) : ImmutableSortedMap [<map.value>] : Object | provenance | MaD:168 |
 | Test.java:3963:21:3963:23 | out : ImmutableSortedMap [<map.value>] : Object | Test.java:118:20:118:31 | map : ImmutableSortedMap [<map.value>] : Object | provenance |  |
-| Test.java:3963:21:3963:23 | out : ImmutableSortedMap [<map.value>] : Object | Test.java:3963:9:3963:24 | getMapValue(...) | provenance | MaD:561 |
+| Test.java:3963:21:3963:23 | out : ImmutableSortedMap [<map.value>] : Object | Test.java:3963:9:3963:24 | getMapValue(...) | provenance | MaD:568 |
 | Test.java:3968:16:3968:31 | (...)... : Object | Test.java:3969:50:3969:51 | in : Object | provenance |  |
 | Test.java:3968:24:3968:31 | source(...) : Object | Test.java:3968:16:3968:31 | (...)... : Object | provenance |  |
 | Test.java:3969:10:3969:52 | of(...) : ImmutableSortedMap [<map.value>] : Object | Test.java:3970:21:3970:23 | out : ImmutableSortedMap [<map.value>] : Object | provenance |  |
 | Test.java:3969:50:3969:51 | in : Object | Test.java:3969:10:3969:52 | of(...) : ImmutableSortedMap [<map.value>] : Object | provenance | MaD:168 |
 | Test.java:3970:21:3970:23 | out : ImmutableSortedMap [<map.value>] : Object | Test.java:118:20:118:31 | map : ImmutableSortedMap [<map.value>] : Object | provenance |  |
-| Test.java:3970:21:3970:23 | out : ImmutableSortedMap [<map.value>] : Object | Test.java:3970:9:3970:24 | getMapValue(...) | provenance | MaD:561 |
+| Test.java:3970:21:3970:23 | out : ImmutableSortedMap [<map.value>] : Object | Test.java:3970:9:3970:24 | getMapValue(...) | provenance | MaD:568 |
 | Test.java:3975:20:3975:39 | (...)... : Comparable | Test.java:3976:56:3976:57 | in : Comparable | provenance |  |
 | Test.java:3975:32:3975:39 | source(...) : Object | Test.java:3975:20:3975:39 | (...)... : Comparable | provenance |  |
 | Test.java:3976:10:3976:88 | of(...) : ImmutableSortedMap [<map.key>] : Comparable | Test.java:3977:19:3977:21 | out : ImmutableSortedMap [<map.key>] : Comparable | provenance |  |
 | Test.java:3976:56:3976:57 | in : Comparable | Test.java:3976:10:3976:88 | of(...) : ImmutableSortedMap [<map.key>] : Comparable | provenance | MaD:169 |
 | Test.java:3977:19:3977:21 | out : ImmutableSortedMap [<map.key>] : Comparable | Test.java:99:18:99:29 | map : ImmutableSortedMap [<map.key>] : Comparable | provenance |  |
-| Test.java:3977:19:3977:21 | out : ImmutableSortedMap [<map.key>] : Comparable | Test.java:3977:9:3977:22 | getMapKey(...) | provenance | MaD:562 |
+| Test.java:3977:19:3977:21 | out : ImmutableSortedMap [<map.key>] : Comparable | Test.java:3977:9:3977:22 | getMapKey(...) | provenance | MaD:569 |
 | Test.java:3982:20:3982:39 | (...)... : Comparable | Test.java:3983:56:3983:57 | in : Comparable | provenance |  |
 | Test.java:3982:32:3982:39 | source(...) : Object | Test.java:3982:20:3982:39 | (...)... : Comparable | provenance |  |
 | Test.java:3983:10:3983:76 | of(...) : ImmutableSortedMap [<map.key>] : Comparable | Test.java:3984:19:3984:21 | out : ImmutableSortedMap [<map.key>] : Comparable | provenance |  |
 | Test.java:3983:56:3983:57 | in : Comparable | Test.java:3983:10:3983:76 | of(...) : ImmutableSortedMap [<map.key>] : Comparable | provenance | MaD:169 |
 | Test.java:3984:19:3984:21 | out : ImmutableSortedMap [<map.key>] : Comparable | Test.java:99:18:99:29 | map : ImmutableSortedMap [<map.key>] : Comparable | provenance |  |
-| Test.java:3984:19:3984:21 | out : ImmutableSortedMap [<map.key>] : Comparable | Test.java:3984:9:3984:22 | getMapKey(...) | provenance | MaD:562 |
+| Test.java:3984:19:3984:21 | out : ImmutableSortedMap [<map.key>] : Comparable | Test.java:3984:9:3984:22 | getMapKey(...) | provenance | MaD:569 |
 | Test.java:3989:20:3989:39 | (...)... : Comparable | Test.java:3990:56:3990:57 | in : Comparable | provenance |  |
 | Test.java:3989:32:3989:39 | source(...) : Object | Test.java:3989:20:3989:39 | (...)... : Comparable | provenance |  |
 | Test.java:3990:10:3990:64 | of(...) : ImmutableSortedMap [<map.key>] : Comparable | Test.java:3991:19:3991:21 | out : ImmutableSortedMap [<map.key>] : Comparable | provenance |  |
 | Test.java:3990:56:3990:57 | in : Comparable | Test.java:3990:10:3990:64 | of(...) : ImmutableSortedMap [<map.key>] : Comparable | provenance | MaD:169 |
 | Test.java:3991:19:3991:21 | out : ImmutableSortedMap [<map.key>] : Comparable | Test.java:99:18:99:29 | map : ImmutableSortedMap [<map.key>] : Comparable | provenance |  |
-| Test.java:3991:19:3991:21 | out : ImmutableSortedMap [<map.key>] : Comparable | Test.java:3991:9:3991:22 | getMapKey(...) | provenance | MaD:562 |
+| Test.java:3991:19:3991:21 | out : ImmutableSortedMap [<map.key>] : Comparable | Test.java:3991:9:3991:22 | getMapKey(...) | provenance | MaD:569 |
 | Test.java:3996:16:3996:31 | (...)... : Object | Test.java:3997:62:3997:63 | in : Object | provenance |  |
 | Test.java:3996:24:3996:31 | source(...) : Object | Test.java:3996:16:3996:31 | (...)... : Object | provenance |  |
 | Test.java:3997:10:3997:88 | of(...) : ImmutableSortedMap [<map.value>] : Object | Test.java:3998:21:3998:23 | out : ImmutableSortedMap [<map.value>] : Object | provenance |  |
 | Test.java:3997:62:3997:63 | in : Object | Test.java:3997:10:3997:88 | of(...) : ImmutableSortedMap [<map.value>] : Object | provenance | MaD:170 |
 | Test.java:3998:21:3998:23 | out : ImmutableSortedMap [<map.value>] : Object | Test.java:118:20:118:31 | map : ImmutableSortedMap [<map.value>] : Object | provenance |  |
-| Test.java:3998:21:3998:23 | out : ImmutableSortedMap [<map.value>] : Object | Test.java:3998:9:3998:24 | getMapValue(...) | provenance | MaD:561 |
+| Test.java:3998:21:3998:23 | out : ImmutableSortedMap [<map.value>] : Object | Test.java:3998:9:3998:24 | getMapValue(...) | provenance | MaD:568 |
 | Test.java:4003:16:4003:31 | (...)... : Object | Test.java:4004:62:4004:63 | in : Object | provenance |  |
 | Test.java:4003:24:4003:31 | source(...) : Object | Test.java:4003:16:4003:31 | (...)... : Object | provenance |  |
 | Test.java:4004:10:4004:76 | of(...) : ImmutableSortedMap [<map.value>] : Object | Test.java:4005:21:4005:23 | out : ImmutableSortedMap [<map.value>] : Object | provenance |  |
 | Test.java:4004:62:4004:63 | in : Object | Test.java:4004:10:4004:76 | of(...) : ImmutableSortedMap [<map.value>] : Object | provenance | MaD:170 |
 | Test.java:4005:21:4005:23 | out : ImmutableSortedMap [<map.value>] : Object | Test.java:118:20:118:31 | map : ImmutableSortedMap [<map.value>] : Object | provenance |  |
-| Test.java:4005:21:4005:23 | out : ImmutableSortedMap [<map.value>] : Object | Test.java:4005:9:4005:24 | getMapValue(...) | provenance | MaD:561 |
+| Test.java:4005:21:4005:23 | out : ImmutableSortedMap [<map.value>] : Object | Test.java:4005:9:4005:24 | getMapValue(...) | provenance | MaD:568 |
 | Test.java:4010:16:4010:31 | (...)... : Object | Test.java:4011:62:4011:63 | in : Object | provenance |  |
 | Test.java:4010:24:4010:31 | source(...) : Object | Test.java:4010:16:4010:31 | (...)... : Object | provenance |  |
 | Test.java:4011:10:4011:64 | of(...) : ImmutableSortedMap [<map.value>] : Object | Test.java:4012:21:4012:23 | out : ImmutableSortedMap [<map.value>] : Object | provenance |  |
 | Test.java:4011:62:4011:63 | in : Object | Test.java:4011:10:4011:64 | of(...) : ImmutableSortedMap [<map.value>] : Object | provenance | MaD:170 |
 | Test.java:4012:21:4012:23 | out : ImmutableSortedMap [<map.value>] : Object | Test.java:118:20:118:31 | map : ImmutableSortedMap [<map.value>] : Object | provenance |  |
-| Test.java:4012:21:4012:23 | out : ImmutableSortedMap [<map.value>] : Object | Test.java:4012:9:4012:24 | getMapValue(...) | provenance | MaD:561 |
+| Test.java:4012:21:4012:23 | out : ImmutableSortedMap [<map.value>] : Object | Test.java:4012:9:4012:24 | getMapValue(...) | provenance | MaD:568 |
 | Test.java:4017:20:4017:39 | (...)... : Comparable | Test.java:4018:68:4018:69 | in : Comparable | provenance |  |
 | Test.java:4017:32:4017:39 | source(...) : Object | Test.java:4017:20:4017:39 | (...)... : Comparable | provenance |  |
 | Test.java:4018:10:4018:88 | of(...) : ImmutableSortedMap [<map.key>] : Comparable | Test.java:4019:19:4019:21 | out : ImmutableSortedMap [<map.key>] : Comparable | provenance |  |
 | Test.java:4018:68:4018:69 | in : Comparable | Test.java:4018:10:4018:88 | of(...) : ImmutableSortedMap [<map.key>] : Comparable | provenance | MaD:171 |
 | Test.java:4019:19:4019:21 | out : ImmutableSortedMap [<map.key>] : Comparable | Test.java:99:18:99:29 | map : ImmutableSortedMap [<map.key>] : Comparable | provenance |  |
-| Test.java:4019:19:4019:21 | out : ImmutableSortedMap [<map.key>] : Comparable | Test.java:4019:9:4019:22 | getMapKey(...) | provenance | MaD:562 |
+| Test.java:4019:19:4019:21 | out : ImmutableSortedMap [<map.key>] : Comparable | Test.java:4019:9:4019:22 | getMapKey(...) | provenance | MaD:569 |
 | Test.java:4024:20:4024:39 | (...)... : Comparable | Test.java:4025:68:4025:69 | in : Comparable | provenance |  |
 | Test.java:4024:32:4024:39 | source(...) : Object | Test.java:4024:20:4024:39 | (...)... : Comparable | provenance |  |
 | Test.java:4025:10:4025:76 | of(...) : ImmutableSortedMap [<map.key>] : Comparable | Test.java:4026:19:4026:21 | out : ImmutableSortedMap [<map.key>] : Comparable | provenance |  |
 | Test.java:4025:68:4025:69 | in : Comparable | Test.java:4025:10:4025:76 | of(...) : ImmutableSortedMap [<map.key>] : Comparable | provenance | MaD:171 |
 | Test.java:4026:19:4026:21 | out : ImmutableSortedMap [<map.key>] : Comparable | Test.java:99:18:99:29 | map : ImmutableSortedMap [<map.key>] : Comparable | provenance |  |
-| Test.java:4026:19:4026:21 | out : ImmutableSortedMap [<map.key>] : Comparable | Test.java:4026:9:4026:22 | getMapKey(...) | provenance | MaD:562 |
+| Test.java:4026:19:4026:21 | out : ImmutableSortedMap [<map.key>] : Comparable | Test.java:4026:9:4026:22 | getMapKey(...) | provenance | MaD:569 |
 | Test.java:4031:16:4031:31 | (...)... : Object | Test.java:4032:74:4032:75 | in : Object | provenance |  |
 | Test.java:4031:24:4031:31 | source(...) : Object | Test.java:4031:16:4031:31 | (...)... : Object | provenance |  |
 | Test.java:4032:10:4032:88 | of(...) : ImmutableSortedMap [<map.value>] : Object | Test.java:4033:21:4033:23 | out : ImmutableSortedMap [<map.value>] : Object | provenance |  |
 | Test.java:4032:74:4032:75 | in : Object | Test.java:4032:10:4032:88 | of(...) : ImmutableSortedMap [<map.value>] : Object | provenance | MaD:172 |
 | Test.java:4033:21:4033:23 | out : ImmutableSortedMap [<map.value>] : Object | Test.java:118:20:118:31 | map : ImmutableSortedMap [<map.value>] : Object | provenance |  |
-| Test.java:4033:21:4033:23 | out : ImmutableSortedMap [<map.value>] : Object | Test.java:4033:9:4033:24 | getMapValue(...) | provenance | MaD:561 |
+| Test.java:4033:21:4033:23 | out : ImmutableSortedMap [<map.value>] : Object | Test.java:4033:9:4033:24 | getMapValue(...) | provenance | MaD:568 |
 | Test.java:4038:16:4038:31 | (...)... : Object | Test.java:4039:74:4039:75 | in : Object | provenance |  |
 | Test.java:4038:24:4038:31 | source(...) : Object | Test.java:4038:16:4038:31 | (...)... : Object | provenance |  |
 | Test.java:4039:10:4039:76 | of(...) : ImmutableSortedMap [<map.value>] : Object | Test.java:4040:21:4040:23 | out : ImmutableSortedMap [<map.value>] : Object | provenance |  |
 | Test.java:4039:74:4039:75 | in : Object | Test.java:4039:10:4039:76 | of(...) : ImmutableSortedMap [<map.value>] : Object | provenance | MaD:172 |
 | Test.java:4040:21:4040:23 | out : ImmutableSortedMap [<map.value>] : Object | Test.java:118:20:118:31 | map : ImmutableSortedMap [<map.value>] : Object | provenance |  |
-| Test.java:4040:21:4040:23 | out : ImmutableSortedMap [<map.value>] : Object | Test.java:4040:9:4040:24 | getMapValue(...) | provenance | MaD:561 |
+| Test.java:4040:21:4040:23 | out : ImmutableSortedMap [<map.value>] : Object | Test.java:4040:9:4040:24 | getMapValue(...) | provenance | MaD:568 |
 | Test.java:4045:20:4045:39 | (...)... : Comparable | Test.java:4046:80:4046:81 | in : Comparable | provenance |  |
 | Test.java:4045:32:4045:39 | source(...) : Object | Test.java:4045:20:4045:39 | (...)... : Comparable | provenance |  |
 | Test.java:4046:10:4046:88 | of(...) : ImmutableSortedMap [<map.key>] : Comparable | Test.java:4047:19:4047:21 | out : ImmutableSortedMap [<map.key>] : Comparable | provenance |  |
 | Test.java:4046:80:4046:81 | in : Comparable | Test.java:4046:10:4046:88 | of(...) : ImmutableSortedMap [<map.key>] : Comparable | provenance | MaD:173 |
 | Test.java:4047:19:4047:21 | out : ImmutableSortedMap [<map.key>] : Comparable | Test.java:99:18:99:29 | map : ImmutableSortedMap [<map.key>] : Comparable | provenance |  |
-| Test.java:4047:19:4047:21 | out : ImmutableSortedMap [<map.key>] : Comparable | Test.java:4047:9:4047:22 | getMapKey(...) | provenance | MaD:562 |
+| Test.java:4047:19:4047:21 | out : ImmutableSortedMap [<map.key>] : Comparable | Test.java:4047:9:4047:22 | getMapKey(...) | provenance | MaD:569 |
 | Test.java:4052:16:4052:31 | (...)... : Object | Test.java:4053:86:4053:87 | in : Object | provenance |  |
 | Test.java:4052:24:4052:31 | source(...) : Object | Test.java:4052:16:4052:31 | (...)... : Object | provenance |  |
 | Test.java:4053:10:4053:88 | of(...) : ImmutableSortedMap [<map.value>] : Object | Test.java:4054:21:4054:23 | out : ImmutableSortedMap [<map.value>] : Object | provenance |  |
 | Test.java:4053:86:4053:87 | in : Object | Test.java:4053:10:4053:88 | of(...) : ImmutableSortedMap [<map.value>] : Object | provenance | MaD:174 |
 | Test.java:4054:21:4054:23 | out : ImmutableSortedMap [<map.value>] : Object | Test.java:118:20:118:31 | map : ImmutableSortedMap [<map.value>] : Object | provenance |  |
-| Test.java:4054:21:4054:23 | out : ImmutableSortedMap [<map.value>] : Object | Test.java:4054:9:4054:24 | getMapValue(...) | provenance | MaD:561 |
+| Test.java:4054:21:4054:23 | out : ImmutableSortedMap [<map.value>] : Object | Test.java:4054:9:4054:24 | getMapValue(...) | provenance | MaD:568 |
 | Test.java:4059:22:4059:73 | (...)... : Comparable[] [[]] : Comparable | Test.java:4060:41:4060:42 | in : Comparable[] [[]] : Comparable | provenance |  |
 | Test.java:4059:36:4059:73 | {...} : Comparable[] [[]] : Comparable | Test.java:4059:22:4059:73 | (...)... : Comparable[] [[]] : Comparable | provenance |  |
 | Test.java:4059:53:4059:72 | (...)... : Comparable | Test.java:4059:36:4059:73 | {...} : Comparable[] [[]] : Comparable | provenance |  |
@@ -4659,37 +4659,37 @@ edges
 | Test.java:4060:10:4060:43 | copyOf(...) : ImmutableSortedMultiset [<element>] : Comparable | Test.java:4061:20:4061:22 | out : ImmutableSortedMultiset [<element>] : Comparable | provenance |  |
 | Test.java:4060:41:4060:42 | in : Comparable[] [[]] : Comparable | Test.java:4060:10:4060:43 | copyOf(...) : ImmutableSortedMultiset [<element>] : Comparable | provenance | MaD:175 |
 | Test.java:4061:20:4061:22 | out : ImmutableSortedMultiset [<element>] : Comparable | Test.java:110:19:110:32 | it : ImmutableSortedMultiset [<element>] : Comparable | provenance |  |
-| Test.java:4061:20:4061:22 | out : ImmutableSortedMultiset [<element>] : Comparable | Test.java:4061:9:4061:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:4061:20:4061:22 | out : ImmutableSortedMultiset [<element>] : Comparable | Test.java:4061:9:4061:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:4066:18:4066:44 | (...)... : List [<element>] : Object | Test.java:4067:59:4067:60 | in : List [<element>] : Object | provenance |  |
 | Test.java:4066:28:4066:44 | of(...) : List [<element>] : Object | Test.java:4066:18:4066:44 | (...)... : List [<element>] : Object | provenance |  |
-| Test.java:4066:36:4066:43 | source(...) : Object | Test.java:4066:28:4066:44 | of(...) : List [<element>] : Object | provenance | MaD:558 |
+| Test.java:4066:36:4066:43 | source(...) : Object | Test.java:4066:28:4066:44 | of(...) : List [<element>] : Object | provenance | MaD:561 |
 | Test.java:4067:10:4067:61 | copyOf(...) : ImmutableSortedMultiset [<element>] : Object | Test.java:4068:20:4068:22 | out : ImmutableSortedMultiset [<element>] : Object | provenance |  |
 | Test.java:4067:59:4067:60 | in : List [<element>] : Object | Test.java:4067:10:4067:61 | copyOf(...) : ImmutableSortedMultiset [<element>] : Object | provenance | MaD:176 |
 | Test.java:4068:20:4068:22 | out : ImmutableSortedMultiset [<element>] : Object | Test.java:110:19:110:32 | it : ImmutableSortedMultiset [<element>] : Object | provenance |  |
-| Test.java:4068:20:4068:22 | out : ImmutableSortedMultiset [<element>] : Object | Test.java:4068:9:4068:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:4068:20:4068:22 | out : ImmutableSortedMultiset [<element>] : Object | Test.java:4068:9:4068:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:4073:18:4073:55 | (...)... : Iterator [<element>] : Object | Test.java:4074:59:4074:60 | in : Iterator [<element>] : Object | provenance |  |
-| Test.java:4073:28:4073:44 | of(...) : List [<element>] : Object | Test.java:4073:28:4073:55 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:555 |
+| Test.java:4073:28:4073:44 | of(...) : List [<element>] : Object | Test.java:4073:28:4073:55 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:558 |
 | Test.java:4073:28:4073:55 | iterator(...) : Iterator [<element>] : Object | Test.java:4073:18:4073:55 | (...)... : Iterator [<element>] : Object | provenance |  |
-| Test.java:4073:36:4073:43 | source(...) : Object | Test.java:4073:28:4073:44 | of(...) : List [<element>] : Object | provenance | MaD:558 |
+| Test.java:4073:36:4073:43 | source(...) : Object | Test.java:4073:28:4073:44 | of(...) : List [<element>] : Object | provenance | MaD:561 |
 | Test.java:4074:10:4074:61 | copyOf(...) : ImmutableSortedMultiset [<element>] : Object | Test.java:4075:20:4075:22 | out : ImmutableSortedMultiset [<element>] : Object | provenance |  |
 | Test.java:4074:59:4074:60 | in : Iterator [<element>] : Object | Test.java:4074:10:4074:61 | copyOf(...) : ImmutableSortedMultiset [<element>] : Object | provenance | MaD:177 |
 | Test.java:4075:20:4075:22 | out : ImmutableSortedMultiset [<element>] : Object | Test.java:110:19:110:32 | it : ImmutableSortedMultiset [<element>] : Object | provenance |  |
-| Test.java:4075:20:4075:22 | out : ImmutableSortedMultiset [<element>] : Object | Test.java:4075:9:4075:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:4075:20:4075:22 | out : ImmutableSortedMultiset [<element>] : Object | Test.java:4075:9:4075:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:4080:18:4080:44 | (...)... : List [<element>] : Object | Test.java:4081:41:4081:42 | in : List [<element>] : Object | provenance |  |
 | Test.java:4080:28:4080:44 | of(...) : List [<element>] : Object | Test.java:4080:18:4080:44 | (...)... : List [<element>] : Object | provenance |  |
-| Test.java:4080:36:4080:43 | source(...) : Object | Test.java:4080:28:4080:44 | of(...) : List [<element>] : Object | provenance | MaD:558 |
+| Test.java:4080:36:4080:43 | source(...) : Object | Test.java:4080:28:4080:44 | of(...) : List [<element>] : Object | provenance | MaD:561 |
 | Test.java:4081:10:4081:43 | copyOf(...) : ImmutableSortedMultiset [<element>] : Object | Test.java:4082:20:4082:22 | out : ImmutableSortedMultiset [<element>] : Object | provenance |  |
 | Test.java:4081:41:4081:42 | in : List [<element>] : Object | Test.java:4081:10:4081:43 | copyOf(...) : ImmutableSortedMultiset [<element>] : Object | provenance | MaD:178 |
 | Test.java:4082:20:4082:22 | out : ImmutableSortedMultiset [<element>] : Object | Test.java:110:19:110:32 | it : ImmutableSortedMultiset [<element>] : Object | provenance |  |
-| Test.java:4082:20:4082:22 | out : ImmutableSortedMultiset [<element>] : Object | Test.java:4082:9:4082:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:4082:20:4082:22 | out : ImmutableSortedMultiset [<element>] : Object | Test.java:4082:9:4082:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:4087:18:4087:55 | (...)... : Iterator [<element>] : Object | Test.java:4088:41:4088:42 | in : Iterator [<element>] : Object | provenance |  |
-| Test.java:4087:28:4087:44 | of(...) : List [<element>] : Object | Test.java:4087:28:4087:55 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:555 |
+| Test.java:4087:28:4087:44 | of(...) : List [<element>] : Object | Test.java:4087:28:4087:55 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:558 |
 | Test.java:4087:28:4087:55 | iterator(...) : Iterator [<element>] : Object | Test.java:4087:18:4087:55 | (...)... : Iterator [<element>] : Object | provenance |  |
-| Test.java:4087:36:4087:43 | source(...) : Object | Test.java:4087:28:4087:44 | of(...) : List [<element>] : Object | provenance | MaD:558 |
+| Test.java:4087:36:4087:43 | source(...) : Object | Test.java:4087:28:4087:44 | of(...) : List [<element>] : Object | provenance | MaD:561 |
 | Test.java:4088:10:4088:43 | copyOf(...) : ImmutableSortedMultiset [<element>] : Object | Test.java:4089:20:4089:22 | out : ImmutableSortedMultiset [<element>] : Object | provenance |  |
 | Test.java:4088:41:4088:42 | in : Iterator [<element>] : Object | Test.java:4088:10:4088:43 | copyOf(...) : ImmutableSortedMultiset [<element>] : Object | provenance | MaD:179 |
 | Test.java:4089:20:4089:22 | out : ImmutableSortedMultiset [<element>] : Object | Test.java:110:19:110:32 | it : ImmutableSortedMultiset [<element>] : Object | provenance |  |
-| Test.java:4089:20:4089:22 | out : ImmutableSortedMultiset [<element>] : Object | Test.java:4089:9:4089:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:4089:20:4089:22 | out : ImmutableSortedMultiset [<element>] : Object | Test.java:4089:9:4089:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:4094:24:4094:87 | (...)... : ImmutableSortedMultiset [<element>] : Comparable | Test.java:4095:47:4095:48 | in : ImmutableSortedMultiset [<element>] : Comparable | provenance |  |
 | Test.java:4094:40:4094:87 | of(...) : ImmutableSortedMultiset [<element>] : Comparable | Test.java:4094:24:4094:87 | (...)... : ImmutableSortedMultiset [<element>] : Comparable | provenance |  |
 | Test.java:4094:67:4094:86 | (...)... : Comparable | Test.java:4094:40:4094:87 | of(...) : ImmutableSortedMultiset [<element>] : Comparable | provenance | MaD:181 |
@@ -4697,133 +4697,133 @@ edges
 | Test.java:4095:10:4095:49 | copyOfSorted(...) : ImmutableSortedMultiset [<element>] : Comparable | Test.java:4096:20:4096:22 | out : ImmutableSortedMultiset [<element>] : Comparable | provenance |  |
 | Test.java:4095:47:4095:48 | in : ImmutableSortedMultiset [<element>] : Comparable | Test.java:4095:10:4095:49 | copyOfSorted(...) : ImmutableSortedMultiset [<element>] : Comparable | provenance | MaD:180 |
 | Test.java:4096:20:4096:22 | out : ImmutableSortedMultiset [<element>] : Comparable | Test.java:110:19:110:32 | it : ImmutableSortedMultiset [<element>] : Comparable | provenance |  |
-| Test.java:4096:20:4096:22 | out : ImmutableSortedMultiset [<element>] : Comparable | Test.java:4096:9:4096:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:4096:20:4096:22 | out : ImmutableSortedMultiset [<element>] : Comparable | Test.java:4096:9:4096:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:4101:20:4101:39 | (...)... : Comparable | Test.java:4102:61:4102:62 | in : Comparable | provenance |  |
 | Test.java:4101:32:4101:39 | source(...) : Object | Test.java:4101:20:4101:39 | (...)... : Comparable | provenance |  |
 | Test.java:4102:10:4102:63 | of(...) : ImmutableSortedMultiset [<element>] : Comparable | Test.java:4103:20:4103:22 | out : ImmutableSortedMultiset [<element>] : Comparable | provenance |  |
 | Test.java:4102:61:4102:62 | in : Comparable | Test.java:4102:10:4102:63 | of(...) : ImmutableSortedMultiset [<element>] : Comparable | provenance | MaD:181 |
 | Test.java:4103:20:4103:22 | out : ImmutableSortedMultiset [<element>] : Comparable | Test.java:110:19:110:32 | it : ImmutableSortedMultiset [<element>] : Comparable | provenance |  |
-| Test.java:4103:20:4103:22 | out : ImmutableSortedMultiset [<element>] : Comparable | Test.java:4103:9:4103:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:4103:20:4103:22 | out : ImmutableSortedMultiset [<element>] : Comparable | Test.java:4103:9:4103:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:4108:20:4108:39 | (...)... : Comparable | Test.java:4109:55:4109:56 | in : Comparable | provenance |  |
 | Test.java:4108:32:4108:39 | source(...) : Object | Test.java:4108:20:4108:39 | (...)... : Comparable | provenance |  |
 | Test.java:4109:10:4109:63 | of(...) : ImmutableSortedMultiset [<element>] : Comparable | Test.java:4110:20:4110:22 | out : ImmutableSortedMultiset [<element>] : Comparable | provenance |  |
 | Test.java:4109:55:4109:56 | in : Comparable | Test.java:4109:10:4109:63 | of(...) : ImmutableSortedMultiset [<element>] : Comparable | provenance | MaD:181 |
 | Test.java:4110:20:4110:22 | out : ImmutableSortedMultiset [<element>] : Comparable | Test.java:110:19:110:32 | it : ImmutableSortedMultiset [<element>] : Comparable | provenance |  |
-| Test.java:4110:20:4110:22 | out : ImmutableSortedMultiset [<element>] : Comparable | Test.java:4110:9:4110:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:4110:20:4110:22 | out : ImmutableSortedMultiset [<element>] : Comparable | Test.java:4110:9:4110:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:4115:20:4115:39 | (...)... : Comparable | Test.java:4116:55:4116:56 | in : Comparable | provenance |  |
 | Test.java:4115:32:4115:39 | source(...) : Object | Test.java:4115:20:4115:39 | (...)... : Comparable | provenance |  |
 | Test.java:4116:10:4116:57 | of(...) : ImmutableSortedMultiset [<element>] : Comparable | Test.java:4117:20:4117:22 | out : ImmutableSortedMultiset [<element>] : Comparable | provenance |  |
 | Test.java:4116:55:4116:56 | in : Comparable | Test.java:4116:10:4116:57 | of(...) : ImmutableSortedMultiset [<element>] : Comparable | provenance | MaD:181 |
 | Test.java:4117:20:4117:22 | out : ImmutableSortedMultiset [<element>] : Comparable | Test.java:110:19:110:32 | it : ImmutableSortedMultiset [<element>] : Comparable | provenance |  |
-| Test.java:4117:20:4117:22 | out : ImmutableSortedMultiset [<element>] : Comparable | Test.java:4117:9:4117:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:4117:20:4117:22 | out : ImmutableSortedMultiset [<element>] : Comparable | Test.java:4117:9:4117:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:4122:20:4122:39 | (...)... : Comparable | Test.java:4123:49:4123:50 | in : Comparable | provenance |  |
 | Test.java:4122:32:4122:39 | source(...) : Object | Test.java:4122:20:4122:39 | (...)... : Comparable | provenance |  |
 | Test.java:4123:10:4123:63 | of(...) : ImmutableSortedMultiset [<element>] : Comparable | Test.java:4124:20:4124:22 | out : ImmutableSortedMultiset [<element>] : Comparable | provenance |  |
 | Test.java:4123:49:4123:50 | in : Comparable | Test.java:4123:10:4123:63 | of(...) : ImmutableSortedMultiset [<element>] : Comparable | provenance | MaD:181 |
 | Test.java:4124:20:4124:22 | out : ImmutableSortedMultiset [<element>] : Comparable | Test.java:110:19:110:32 | it : ImmutableSortedMultiset [<element>] : Comparable | provenance |  |
-| Test.java:4124:20:4124:22 | out : ImmutableSortedMultiset [<element>] : Comparable | Test.java:4124:9:4124:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:4124:20:4124:22 | out : ImmutableSortedMultiset [<element>] : Comparable | Test.java:4124:9:4124:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:4129:20:4129:39 | (...)... : Comparable | Test.java:4130:49:4130:50 | in : Comparable | provenance |  |
 | Test.java:4129:32:4129:39 | source(...) : Object | Test.java:4129:20:4129:39 | (...)... : Comparable | provenance |  |
 | Test.java:4130:10:4130:57 | of(...) : ImmutableSortedMultiset [<element>] : Comparable | Test.java:4131:20:4131:22 | out : ImmutableSortedMultiset [<element>] : Comparable | provenance |  |
 | Test.java:4130:49:4130:50 | in : Comparable | Test.java:4130:10:4130:57 | of(...) : ImmutableSortedMultiset [<element>] : Comparable | provenance | MaD:181 |
 | Test.java:4131:20:4131:22 | out : ImmutableSortedMultiset [<element>] : Comparable | Test.java:110:19:110:32 | it : ImmutableSortedMultiset [<element>] : Comparable | provenance |  |
-| Test.java:4131:20:4131:22 | out : ImmutableSortedMultiset [<element>] : Comparable | Test.java:4131:9:4131:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:4131:20:4131:22 | out : ImmutableSortedMultiset [<element>] : Comparable | Test.java:4131:9:4131:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:4136:20:4136:39 | (...)... : Comparable | Test.java:4137:49:4137:50 | in : Comparable | provenance |  |
 | Test.java:4136:32:4136:39 | source(...) : Object | Test.java:4136:20:4136:39 | (...)... : Comparable | provenance |  |
 | Test.java:4137:10:4137:51 | of(...) : ImmutableSortedMultiset [<element>] : Comparable | Test.java:4138:20:4138:22 | out : ImmutableSortedMultiset [<element>] : Comparable | provenance |  |
 | Test.java:4137:49:4137:50 | in : Comparable | Test.java:4137:10:4137:51 | of(...) : ImmutableSortedMultiset [<element>] : Comparable | provenance | MaD:181 |
 | Test.java:4138:20:4138:22 | out : ImmutableSortedMultiset [<element>] : Comparable | Test.java:110:19:110:32 | it : ImmutableSortedMultiset [<element>] : Comparable | provenance |  |
-| Test.java:4138:20:4138:22 | out : ImmutableSortedMultiset [<element>] : Comparable | Test.java:4138:9:4138:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:4138:20:4138:22 | out : ImmutableSortedMultiset [<element>] : Comparable | Test.java:4138:9:4138:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:4143:20:4143:39 | (...)... : Comparable | Test.java:4144:43:4144:44 | in : Comparable | provenance |  |
 | Test.java:4143:32:4143:39 | source(...) : Object | Test.java:4143:20:4143:39 | (...)... : Comparable | provenance |  |
 | Test.java:4144:10:4144:63 | of(...) : ImmutableSortedMultiset [<element>] : Comparable | Test.java:4145:20:4145:22 | out : ImmutableSortedMultiset [<element>] : Comparable | provenance |  |
 | Test.java:4144:43:4144:44 | in : Comparable | Test.java:4144:10:4144:63 | of(...) : ImmutableSortedMultiset [<element>] : Comparable | provenance | MaD:181 |
 | Test.java:4145:20:4145:22 | out : ImmutableSortedMultiset [<element>] : Comparable | Test.java:110:19:110:32 | it : ImmutableSortedMultiset [<element>] : Comparable | provenance |  |
-| Test.java:4145:20:4145:22 | out : ImmutableSortedMultiset [<element>] : Comparable | Test.java:4145:9:4145:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:4145:20:4145:22 | out : ImmutableSortedMultiset [<element>] : Comparable | Test.java:4145:9:4145:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:4150:20:4150:39 | (...)... : Comparable | Test.java:4151:43:4151:44 | in : Comparable | provenance |  |
 | Test.java:4150:32:4150:39 | source(...) : Object | Test.java:4150:20:4150:39 | (...)... : Comparable | provenance |  |
 | Test.java:4151:10:4151:57 | of(...) : ImmutableSortedMultiset [<element>] : Comparable | Test.java:4152:20:4152:22 | out : ImmutableSortedMultiset [<element>] : Comparable | provenance |  |
 | Test.java:4151:43:4151:44 | in : Comparable | Test.java:4151:10:4151:57 | of(...) : ImmutableSortedMultiset [<element>] : Comparable | provenance | MaD:181 |
 | Test.java:4152:20:4152:22 | out : ImmutableSortedMultiset [<element>] : Comparable | Test.java:110:19:110:32 | it : ImmutableSortedMultiset [<element>] : Comparable | provenance |  |
-| Test.java:4152:20:4152:22 | out : ImmutableSortedMultiset [<element>] : Comparable | Test.java:4152:9:4152:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:4152:20:4152:22 | out : ImmutableSortedMultiset [<element>] : Comparable | Test.java:4152:9:4152:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:4157:20:4157:39 | (...)... : Comparable | Test.java:4158:43:4158:44 | in : Comparable | provenance |  |
 | Test.java:4157:32:4157:39 | source(...) : Object | Test.java:4157:20:4157:39 | (...)... : Comparable | provenance |  |
 | Test.java:4158:10:4158:51 | of(...) : ImmutableSortedMultiset [<element>] : Comparable | Test.java:4159:20:4159:22 | out : ImmutableSortedMultiset [<element>] : Comparable | provenance |  |
 | Test.java:4158:43:4158:44 | in : Comparable | Test.java:4158:10:4158:51 | of(...) : ImmutableSortedMultiset [<element>] : Comparable | provenance | MaD:181 |
 | Test.java:4159:20:4159:22 | out : ImmutableSortedMultiset [<element>] : Comparable | Test.java:110:19:110:32 | it : ImmutableSortedMultiset [<element>] : Comparable | provenance |  |
-| Test.java:4159:20:4159:22 | out : ImmutableSortedMultiset [<element>] : Comparable | Test.java:4159:9:4159:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:4159:20:4159:22 | out : ImmutableSortedMultiset [<element>] : Comparable | Test.java:4159:9:4159:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:4164:20:4164:39 | (...)... : Comparable | Test.java:4165:43:4165:44 | in : Comparable | provenance |  |
 | Test.java:4164:32:4164:39 | source(...) : Object | Test.java:4164:20:4164:39 | (...)... : Comparable | provenance |  |
 | Test.java:4165:10:4165:45 | of(...) : ImmutableSortedMultiset [<element>] : Comparable | Test.java:4166:20:4166:22 | out : ImmutableSortedMultiset [<element>] : Comparable | provenance |  |
 | Test.java:4165:43:4165:44 | in : Comparable | Test.java:4165:10:4165:45 | of(...) : ImmutableSortedMultiset [<element>] : Comparable | provenance | MaD:181 |
 | Test.java:4166:20:4166:22 | out : ImmutableSortedMultiset [<element>] : Comparable | Test.java:110:19:110:32 | it : ImmutableSortedMultiset [<element>] : Comparable | provenance |  |
-| Test.java:4166:20:4166:22 | out : ImmutableSortedMultiset [<element>] : Comparable | Test.java:4166:9:4166:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:4166:20:4166:22 | out : ImmutableSortedMultiset [<element>] : Comparable | Test.java:4166:9:4166:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:4171:20:4171:39 | (...)... : Comparable | Test.java:4172:37:4172:38 | in : Comparable | provenance |  |
 | Test.java:4171:32:4171:39 | source(...) : Object | Test.java:4171:20:4171:39 | (...)... : Comparable | provenance |  |
 | Test.java:4172:10:4172:63 | of(...) : ImmutableSortedMultiset [<element>] : Comparable | Test.java:4173:20:4173:22 | out : ImmutableSortedMultiset [<element>] : Comparable | provenance |  |
 | Test.java:4172:37:4172:38 | in : Comparable | Test.java:4172:10:4172:63 | of(...) : ImmutableSortedMultiset [<element>] : Comparable | provenance | MaD:181 |
 | Test.java:4173:20:4173:22 | out : ImmutableSortedMultiset [<element>] : Comparable | Test.java:110:19:110:32 | it : ImmutableSortedMultiset [<element>] : Comparable | provenance |  |
-| Test.java:4173:20:4173:22 | out : ImmutableSortedMultiset [<element>] : Comparable | Test.java:4173:9:4173:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:4173:20:4173:22 | out : ImmutableSortedMultiset [<element>] : Comparable | Test.java:4173:9:4173:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:4178:20:4178:39 | (...)... : Comparable | Test.java:4179:37:4179:38 | in : Comparable | provenance |  |
 | Test.java:4178:32:4178:39 | source(...) : Object | Test.java:4178:20:4178:39 | (...)... : Comparable | provenance |  |
 | Test.java:4179:10:4179:57 | of(...) : ImmutableSortedMultiset [<element>] : Comparable | Test.java:4180:20:4180:22 | out : ImmutableSortedMultiset [<element>] : Comparable | provenance |  |
 | Test.java:4179:37:4179:38 | in : Comparable | Test.java:4179:10:4179:57 | of(...) : ImmutableSortedMultiset [<element>] : Comparable | provenance | MaD:181 |
 | Test.java:4180:20:4180:22 | out : ImmutableSortedMultiset [<element>] : Comparable | Test.java:110:19:110:32 | it : ImmutableSortedMultiset [<element>] : Comparable | provenance |  |
-| Test.java:4180:20:4180:22 | out : ImmutableSortedMultiset [<element>] : Comparable | Test.java:4180:9:4180:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:4180:20:4180:22 | out : ImmutableSortedMultiset [<element>] : Comparable | Test.java:4180:9:4180:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:4185:20:4185:39 | (...)... : Comparable | Test.java:4186:37:4186:38 | in : Comparable | provenance |  |
 | Test.java:4185:32:4185:39 | source(...) : Object | Test.java:4185:20:4185:39 | (...)... : Comparable | provenance |  |
 | Test.java:4186:10:4186:51 | of(...) : ImmutableSortedMultiset [<element>] : Comparable | Test.java:4187:20:4187:22 | out : ImmutableSortedMultiset [<element>] : Comparable | provenance |  |
 | Test.java:4186:37:4186:38 | in : Comparable | Test.java:4186:10:4186:51 | of(...) : ImmutableSortedMultiset [<element>] : Comparable | provenance | MaD:181 |
 | Test.java:4187:20:4187:22 | out : ImmutableSortedMultiset [<element>] : Comparable | Test.java:110:19:110:32 | it : ImmutableSortedMultiset [<element>] : Comparable | provenance |  |
-| Test.java:4187:20:4187:22 | out : ImmutableSortedMultiset [<element>] : Comparable | Test.java:4187:9:4187:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:4187:20:4187:22 | out : ImmutableSortedMultiset [<element>] : Comparable | Test.java:4187:9:4187:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:4192:20:4192:39 | (...)... : Comparable | Test.java:4193:37:4193:38 | in : Comparable | provenance |  |
 | Test.java:4192:32:4192:39 | source(...) : Object | Test.java:4192:20:4192:39 | (...)... : Comparable | provenance |  |
 | Test.java:4193:10:4193:45 | of(...) : ImmutableSortedMultiset [<element>] : Comparable | Test.java:4194:20:4194:22 | out : ImmutableSortedMultiset [<element>] : Comparable | provenance |  |
 | Test.java:4193:37:4193:38 | in : Comparable | Test.java:4193:10:4193:45 | of(...) : ImmutableSortedMultiset [<element>] : Comparable | provenance | MaD:181 |
 | Test.java:4194:20:4194:22 | out : ImmutableSortedMultiset [<element>] : Comparable | Test.java:110:19:110:32 | it : ImmutableSortedMultiset [<element>] : Comparable | provenance |  |
-| Test.java:4194:20:4194:22 | out : ImmutableSortedMultiset [<element>] : Comparable | Test.java:4194:9:4194:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:4194:20:4194:22 | out : ImmutableSortedMultiset [<element>] : Comparable | Test.java:4194:9:4194:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:4199:20:4199:39 | (...)... : Comparable | Test.java:4200:37:4200:38 | in : Comparable | provenance |  |
 | Test.java:4199:32:4199:39 | source(...) : Object | Test.java:4199:20:4199:39 | (...)... : Comparable | provenance |  |
 | Test.java:4200:10:4200:149 | of(...) : ImmutableSortedMultiset [<element>] : Comparable | Test.java:4201:20:4201:22 | out : ImmutableSortedMultiset [<element>] : Comparable | provenance |  |
 | Test.java:4200:37:4200:38 | in : Comparable | Test.java:4200:10:4200:149 | of(...) : ImmutableSortedMultiset [<element>] : Comparable | provenance | MaD:181 |
 | Test.java:4201:20:4201:22 | out : ImmutableSortedMultiset [<element>] : Comparable | Test.java:110:19:110:32 | it : ImmutableSortedMultiset [<element>] : Comparable | provenance |  |
-| Test.java:4201:20:4201:22 | out : ImmutableSortedMultiset [<element>] : Comparable | Test.java:4201:9:4201:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:4201:20:4201:22 | out : ImmutableSortedMultiset [<element>] : Comparable | Test.java:4201:9:4201:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:4206:20:4206:39 | (...)... : Comparable | Test.java:4207:37:4207:38 | in : Comparable | provenance |  |
 | Test.java:4206:32:4206:39 | source(...) : Object | Test.java:4206:20:4206:39 | (...)... : Comparable | provenance |  |
 | Test.java:4207:10:4207:39 | of(...) : ImmutableSortedMultiset [<element>] : Comparable | Test.java:4208:20:4208:22 | out : ImmutableSortedMultiset [<element>] : Comparable | provenance |  |
 | Test.java:4207:37:4207:38 | in : Comparable | Test.java:4207:10:4207:39 | of(...) : ImmutableSortedMultiset [<element>] : Comparable | provenance | MaD:181 |
 | Test.java:4208:20:4208:22 | out : ImmutableSortedMultiset [<element>] : Comparable | Test.java:110:19:110:32 | it : ImmutableSortedMultiset [<element>] : Comparable | provenance |  |
-| Test.java:4208:20:4208:22 | out : ImmutableSortedMultiset [<element>] : Comparable | Test.java:4208:9:4208:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:4208:20:4208:22 | out : ImmutableSortedMultiset [<element>] : Comparable | Test.java:4208:9:4208:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:4213:20:4213:39 | (...)... : Comparable | Test.java:4214:55:4214:56 | in : Comparable | provenance |  |
 | Test.java:4213:32:4213:39 | source(...) : Object | Test.java:4213:20:4213:39 | (...)... : Comparable | provenance |  |
 | Test.java:4214:10:4214:149 | of(...) : ImmutableSortedMultiset [<element>] : Comparable | Test.java:4215:20:4215:22 | out : ImmutableSortedMultiset [<element>] : Comparable | provenance |  |
 | Test.java:4214:55:4214:56 | in : Comparable | Test.java:4214:10:4214:149 | of(...) : ImmutableSortedMultiset [<element>] : Comparable | provenance | MaD:181 |
 | Test.java:4215:20:4215:22 | out : ImmutableSortedMultiset [<element>] : Comparable | Test.java:110:19:110:32 | it : ImmutableSortedMultiset [<element>] : Comparable | provenance |  |
-| Test.java:4215:20:4215:22 | out : ImmutableSortedMultiset [<element>] : Comparable | Test.java:4215:9:4215:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:4215:20:4215:22 | out : ImmutableSortedMultiset [<element>] : Comparable | Test.java:4215:9:4215:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:4220:20:4220:39 | (...)... : Comparable | Test.java:4221:73:4221:74 | in : Comparable | provenance |  |
 | Test.java:4220:32:4220:39 | source(...) : Object | Test.java:4220:20:4220:39 | (...)... : Comparable | provenance |  |
 | Test.java:4221:10:4221:149 | of(...) : ImmutableSortedMultiset [<element>] : Comparable | Test.java:4222:20:4222:22 | out : ImmutableSortedMultiset [<element>] : Comparable | provenance |  |
 | Test.java:4221:73:4221:74 | in : Comparable | Test.java:4221:10:4221:149 | of(...) : ImmutableSortedMultiset [<element>] : Comparable | provenance | MaD:181 |
 | Test.java:4222:20:4222:22 | out : ImmutableSortedMultiset [<element>] : Comparable | Test.java:110:19:110:32 | it : ImmutableSortedMultiset [<element>] : Comparable | provenance |  |
-| Test.java:4222:20:4222:22 | out : ImmutableSortedMultiset [<element>] : Comparable | Test.java:4222:9:4222:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:4222:20:4222:22 | out : ImmutableSortedMultiset [<element>] : Comparable | Test.java:4222:9:4222:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:4227:20:4227:39 | (...)... : Comparable | Test.java:4228:91:4228:92 | in : Comparable | provenance |  |
 | Test.java:4227:32:4227:39 | source(...) : Object | Test.java:4227:20:4227:39 | (...)... : Comparable | provenance |  |
 | Test.java:4228:10:4228:149 | of(...) : ImmutableSortedMultiset [<element>] : Comparable | Test.java:4229:20:4229:22 | out : ImmutableSortedMultiset [<element>] : Comparable | provenance |  |
 | Test.java:4228:91:4228:92 | in : Comparable | Test.java:4228:10:4228:149 | of(...) : ImmutableSortedMultiset [<element>] : Comparable | provenance | MaD:181 |
 | Test.java:4229:20:4229:22 | out : ImmutableSortedMultiset [<element>] : Comparable | Test.java:110:19:110:32 | it : ImmutableSortedMultiset [<element>] : Comparable | provenance |  |
-| Test.java:4229:20:4229:22 | out : ImmutableSortedMultiset [<element>] : Comparable | Test.java:4229:9:4229:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:4229:20:4229:22 | out : ImmutableSortedMultiset [<element>] : Comparable | Test.java:4229:9:4229:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:4234:20:4234:39 | (...)... : Comparable | Test.java:4235:109:4235:110 | in : Comparable | provenance |  |
 | Test.java:4234:32:4234:39 | source(...) : Object | Test.java:4234:20:4234:39 | (...)... : Comparable | provenance |  |
 | Test.java:4235:10:4235:149 | of(...) : ImmutableSortedMultiset [<element>] : Comparable | Test.java:4236:20:4236:22 | out : ImmutableSortedMultiset [<element>] : Comparable | provenance |  |
 | Test.java:4235:109:4235:110 | in : Comparable | Test.java:4235:10:4235:149 | of(...) : ImmutableSortedMultiset [<element>] : Comparable | provenance | MaD:181 |
 | Test.java:4236:20:4236:22 | out : ImmutableSortedMultiset [<element>] : Comparable | Test.java:110:19:110:32 | it : ImmutableSortedMultiset [<element>] : Comparable | provenance |  |
-| Test.java:4236:20:4236:22 | out : ImmutableSortedMultiset [<element>] : Comparable | Test.java:4236:9:4236:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:4236:20:4236:22 | out : ImmutableSortedMultiset [<element>] : Comparable | Test.java:4236:9:4236:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:4241:20:4241:39 | (...)... : Comparable | Test.java:4242:127:4242:128 | in : Comparable | provenance |  |
 | Test.java:4241:32:4241:39 | source(...) : Object | Test.java:4241:20:4241:39 | (...)... : Comparable | provenance |  |
 | Test.java:4242:10:4242:149 | of(...) : ImmutableSortedMultiset [<element>] : Comparable | Test.java:4243:20:4243:22 | out : ImmutableSortedMultiset [<element>] : Comparable | provenance |  |
 | Test.java:4242:127:4242:128 | in : Comparable | Test.java:4242:10:4242:149 | of(...) : ImmutableSortedMultiset [<element>] : Comparable | provenance | MaD:181 |
 | Test.java:4243:20:4243:22 | out : ImmutableSortedMultiset [<element>] : Comparable | Test.java:110:19:110:32 | it : ImmutableSortedMultiset [<element>] : Comparable | provenance |  |
-| Test.java:4243:20:4243:22 | out : ImmutableSortedMultiset [<element>] : Comparable | Test.java:4243:9:4243:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:4243:20:4243:22 | out : ImmutableSortedMultiset [<element>] : Comparable | Test.java:4243:9:4243:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:4248:22:4248:73 | (...)... : Comparable[] [[]] : Comparable | Test.java:4249:145:4249:146 | in : Comparable[] [[]] : Comparable | provenance |  |
 | Test.java:4248:36:4248:73 | {...} : Comparable[] [[]] : Comparable | Test.java:4248:22:4248:73 | (...)... : Comparable[] [[]] : Comparable | provenance |  |
 | Test.java:4248:53:4248:72 | (...)... : Comparable | Test.java:4248:36:4248:73 | {...} : Comparable[] [[]] : Comparable | provenance |  |
@@ -4831,14 +4831,14 @@ edges
 | Test.java:4249:10:4249:147 | of(...) : ImmutableSortedMultiset [<element>] : Comparable | Test.java:4250:20:4250:22 | out : ImmutableSortedMultiset [<element>] : Comparable | provenance |  |
 | Test.java:4249:145:4249:146 | in : Comparable[] [[]] : Comparable | Test.java:4249:10:4249:147 | of(...) : ImmutableSortedMultiset [<element>] : Comparable | provenance | MaD:182 |
 | Test.java:4250:20:4250:22 | out : ImmutableSortedMultiset [<element>] : Comparable | Test.java:110:19:110:32 | it : ImmutableSortedMultiset [<element>] : Comparable | provenance |  |
-| Test.java:4250:20:4250:22 | out : ImmutableSortedMultiset [<element>] : Comparable | Test.java:4250:9:4250:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:4250:20:4250:22 | out : ImmutableSortedMultiset [<element>] : Comparable | Test.java:4250:9:4250:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:4255:20:4255:48 | (...)... : List [<element>] : Object | Test.java:4256:36:4256:37 | in : List [<element>] : Object | provenance |  |
 | Test.java:4255:32:4255:48 | of(...) : List [<element>] : Object | Test.java:4255:20:4255:48 | (...)... : List [<element>] : Object | provenance |  |
-| Test.java:4255:40:4255:47 | source(...) : Object | Test.java:4255:32:4255:48 | of(...) : List [<element>] : Object | provenance | MaD:558 |
+| Test.java:4255:40:4255:47 | source(...) : Object | Test.java:4255:32:4255:48 | of(...) : List [<element>] : Object | provenance | MaD:561 |
 | Test.java:4256:10:4256:38 | copyOf(...) : ImmutableSortedSet [<element>] : Object | Test.java:4257:20:4257:22 | out : ImmutableSortedSet [<element>] : Object | provenance |  |
 | Test.java:4256:36:4256:37 | in : List [<element>] : Object | Test.java:4256:10:4256:38 | copyOf(...) : ImmutableSortedSet [<element>] : Object | provenance | MaD:183 |
 | Test.java:4257:20:4257:22 | out : ImmutableSortedSet [<element>] : Object | Test.java:110:19:110:32 | it : ImmutableSortedSet [<element>] : Object | provenance |  |
-| Test.java:4257:20:4257:22 | out : ImmutableSortedSet [<element>] : Object | Test.java:4257:9:4257:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:4257:20:4257:22 | out : ImmutableSortedSet [<element>] : Object | Test.java:4257:9:4257:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:4262:22:4262:73 | (...)... : Comparable[] [[]] : Comparable | Test.java:4263:36:4263:37 | in : Comparable[] [[]] : Comparable | provenance |  |
 | Test.java:4262:36:4262:73 | {...} : Comparable[] [[]] : Comparable | Test.java:4262:22:4262:73 | (...)... : Comparable[] [[]] : Comparable | provenance |  |
 | Test.java:4262:53:4262:72 | (...)... : Comparable | Test.java:4262:36:4262:73 | {...} : Comparable[] [[]] : Comparable | provenance |  |
@@ -4846,44 +4846,44 @@ edges
 | Test.java:4263:10:4263:38 | copyOf(...) : ImmutableSortedSet [<element>] : Comparable | Test.java:4264:20:4264:22 | out : ImmutableSortedSet [<element>] : Comparable | provenance |  |
 | Test.java:4263:36:4263:37 | in : Comparable[] [[]] : Comparable | Test.java:4263:10:4263:38 | copyOf(...) : ImmutableSortedSet [<element>] : Comparable | provenance | MaD:184 |
 | Test.java:4264:20:4264:22 | out : ImmutableSortedSet [<element>] : Comparable | Test.java:110:19:110:32 | it : ImmutableSortedSet [<element>] : Comparable | provenance |  |
-| Test.java:4264:20:4264:22 | out : ImmutableSortedSet [<element>] : Comparable | Test.java:4264:9:4264:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:4264:20:4264:22 | out : ImmutableSortedSet [<element>] : Comparable | Test.java:4264:9:4264:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:4269:20:4269:48 | (...)... : List [<element>] : Object | Test.java:4270:54:4270:55 | in : List [<element>] : Object | provenance |  |
 | Test.java:4269:32:4269:48 | of(...) : List [<element>] : Object | Test.java:4269:20:4269:48 | (...)... : List [<element>] : Object | provenance |  |
-| Test.java:4269:40:4269:47 | source(...) : Object | Test.java:4269:32:4269:48 | of(...) : List [<element>] : Object | provenance | MaD:558 |
+| Test.java:4269:40:4269:47 | source(...) : Object | Test.java:4269:32:4269:48 | of(...) : List [<element>] : Object | provenance | MaD:561 |
 | Test.java:4270:10:4270:56 | copyOf(...) : ImmutableSortedSet [<element>] : Object | Test.java:4271:20:4271:22 | out : ImmutableSortedSet [<element>] : Object | provenance |  |
 | Test.java:4270:54:4270:55 | in : List [<element>] : Object | Test.java:4270:10:4270:56 | copyOf(...) : ImmutableSortedSet [<element>] : Object | provenance | MaD:185 |
 | Test.java:4271:20:4271:22 | out : ImmutableSortedSet [<element>] : Object | Test.java:110:19:110:32 | it : ImmutableSortedSet [<element>] : Object | provenance |  |
-| Test.java:4271:20:4271:22 | out : ImmutableSortedSet [<element>] : Object | Test.java:4271:9:4271:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:4271:20:4271:22 | out : ImmutableSortedSet [<element>] : Object | Test.java:4271:9:4271:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:4276:18:4276:44 | (...)... : List [<element>] : Object | Test.java:4277:54:4277:55 | in : List [<element>] : Object | provenance |  |
 | Test.java:4276:28:4276:44 | of(...) : List [<element>] : Object | Test.java:4276:18:4276:44 | (...)... : List [<element>] : Object | provenance |  |
-| Test.java:4276:36:4276:43 | source(...) : Object | Test.java:4276:28:4276:44 | of(...) : List [<element>] : Object | provenance | MaD:558 |
+| Test.java:4276:36:4276:43 | source(...) : Object | Test.java:4276:28:4276:44 | of(...) : List [<element>] : Object | provenance | MaD:561 |
 | Test.java:4277:10:4277:56 | copyOf(...) : ImmutableSortedSet [<element>] : Object | Test.java:4278:20:4278:22 | out : ImmutableSortedSet [<element>] : Object | provenance |  |
 | Test.java:4277:54:4277:55 | in : List [<element>] : Object | Test.java:4277:10:4277:56 | copyOf(...) : ImmutableSortedSet [<element>] : Object | provenance | MaD:186 |
 | Test.java:4278:20:4278:22 | out : ImmutableSortedSet [<element>] : Object | Test.java:110:19:110:32 | it : ImmutableSortedSet [<element>] : Object | provenance |  |
-| Test.java:4278:20:4278:22 | out : ImmutableSortedSet [<element>] : Object | Test.java:4278:9:4278:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:4278:20:4278:22 | out : ImmutableSortedSet [<element>] : Object | Test.java:4278:9:4278:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:4283:18:4283:55 | (...)... : Iterator [<element>] : Object | Test.java:4284:54:4284:55 | in : Iterator [<element>] : Object | provenance |  |
-| Test.java:4283:28:4283:44 | of(...) : List [<element>] : Object | Test.java:4283:28:4283:55 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:555 |
+| Test.java:4283:28:4283:44 | of(...) : List [<element>] : Object | Test.java:4283:28:4283:55 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:558 |
 | Test.java:4283:28:4283:55 | iterator(...) : Iterator [<element>] : Object | Test.java:4283:18:4283:55 | (...)... : Iterator [<element>] : Object | provenance |  |
-| Test.java:4283:36:4283:43 | source(...) : Object | Test.java:4283:28:4283:44 | of(...) : List [<element>] : Object | provenance | MaD:558 |
+| Test.java:4283:36:4283:43 | source(...) : Object | Test.java:4283:28:4283:44 | of(...) : List [<element>] : Object | provenance | MaD:561 |
 | Test.java:4284:10:4284:56 | copyOf(...) : ImmutableSortedSet [<element>] : Object | Test.java:4285:20:4285:22 | out : ImmutableSortedSet [<element>] : Object | provenance |  |
 | Test.java:4284:54:4284:55 | in : Iterator [<element>] : Object | Test.java:4284:10:4284:56 | copyOf(...) : ImmutableSortedSet [<element>] : Object | provenance | MaD:187 |
 | Test.java:4285:20:4285:22 | out : ImmutableSortedSet [<element>] : Object | Test.java:110:19:110:32 | it : ImmutableSortedSet [<element>] : Object | provenance |  |
-| Test.java:4285:20:4285:22 | out : ImmutableSortedSet [<element>] : Object | Test.java:4285:9:4285:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:4285:20:4285:22 | out : ImmutableSortedSet [<element>] : Object | Test.java:4285:9:4285:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:4290:18:4290:44 | (...)... : List [<element>] : Object | Test.java:4291:36:4291:37 | in : List [<element>] : Object | provenance |  |
 | Test.java:4290:28:4290:44 | of(...) : List [<element>] : Object | Test.java:4290:18:4290:44 | (...)... : List [<element>] : Object | provenance |  |
-| Test.java:4290:36:4290:43 | source(...) : Object | Test.java:4290:28:4290:44 | of(...) : List [<element>] : Object | provenance | MaD:558 |
+| Test.java:4290:36:4290:43 | source(...) : Object | Test.java:4290:28:4290:44 | of(...) : List [<element>] : Object | provenance | MaD:561 |
 | Test.java:4291:10:4291:38 | copyOf(...) : ImmutableSortedSet [<element>] : Object | Test.java:4292:20:4292:22 | out : ImmutableSortedSet [<element>] : Object | provenance |  |
 | Test.java:4291:36:4291:37 | in : List [<element>] : Object | Test.java:4291:10:4291:38 | copyOf(...) : ImmutableSortedSet [<element>] : Object | provenance | MaD:188 |
 | Test.java:4292:20:4292:22 | out : ImmutableSortedSet [<element>] : Object | Test.java:110:19:110:32 | it : ImmutableSortedSet [<element>] : Object | provenance |  |
-| Test.java:4292:20:4292:22 | out : ImmutableSortedSet [<element>] : Object | Test.java:4292:9:4292:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:4292:20:4292:22 | out : ImmutableSortedSet [<element>] : Object | Test.java:4292:9:4292:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:4297:18:4297:55 | (...)... : Iterator [<element>] : Object | Test.java:4298:36:4298:37 | in : Iterator [<element>] : Object | provenance |  |
-| Test.java:4297:28:4297:44 | of(...) : List [<element>] : Object | Test.java:4297:28:4297:55 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:555 |
+| Test.java:4297:28:4297:44 | of(...) : List [<element>] : Object | Test.java:4297:28:4297:55 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:558 |
 | Test.java:4297:28:4297:55 | iterator(...) : Iterator [<element>] : Object | Test.java:4297:18:4297:55 | (...)... : Iterator [<element>] : Object | provenance |  |
-| Test.java:4297:36:4297:43 | source(...) : Object | Test.java:4297:28:4297:44 | of(...) : List [<element>] : Object | provenance | MaD:558 |
+| Test.java:4297:36:4297:43 | source(...) : Object | Test.java:4297:28:4297:44 | of(...) : List [<element>] : Object | provenance | MaD:561 |
 | Test.java:4298:10:4298:38 | copyOf(...) : ImmutableSortedSet [<element>] : Object | Test.java:4299:20:4299:22 | out : ImmutableSortedSet [<element>] : Object | provenance |  |
 | Test.java:4298:36:4298:37 | in : Iterator [<element>] : Object | Test.java:4298:10:4298:38 | copyOf(...) : ImmutableSortedSet [<element>] : Object | provenance | MaD:189 |
 | Test.java:4299:20:4299:22 | out : ImmutableSortedSet [<element>] : Object | Test.java:110:19:110:32 | it : ImmutableSortedSet [<element>] : Object | provenance |  |
-| Test.java:4299:20:4299:22 | out : ImmutableSortedSet [<element>] : Object | Test.java:4299:9:4299:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:4299:20:4299:22 | out : ImmutableSortedSet [<element>] : Object | Test.java:4299:9:4299:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:4304:19:4304:72 | (...)... : ImmutableSortedSet [<element>] : Comparable | Test.java:4305:42:4305:43 | in : ImmutableSortedSet [<element>] : Comparable | provenance |  |
 | Test.java:4304:30:4304:72 | of(...) : ImmutableSortedSet [<element>] : Comparable | Test.java:4304:19:4304:72 | (...)... : ImmutableSortedSet [<element>] : Comparable | provenance |  |
 | Test.java:4304:52:4304:71 | (...)... : Comparable | Test.java:4304:30:4304:72 | of(...) : ImmutableSortedSet [<element>] : Comparable | provenance | MaD:191 |
@@ -4891,133 +4891,133 @@ edges
 | Test.java:4305:10:4305:44 | copyOfSorted(...) : ImmutableSortedSet [<element>] : Comparable | Test.java:4306:20:4306:22 | out : ImmutableSortedSet [<element>] : Comparable | provenance |  |
 | Test.java:4305:42:4305:43 | in : ImmutableSortedSet [<element>] : Comparable | Test.java:4305:10:4305:44 | copyOfSorted(...) : ImmutableSortedSet [<element>] : Comparable | provenance | MaD:190 |
 | Test.java:4306:20:4306:22 | out : ImmutableSortedSet [<element>] : Comparable | Test.java:110:19:110:32 | it : ImmutableSortedSet [<element>] : Comparable | provenance |  |
-| Test.java:4306:20:4306:22 | out : ImmutableSortedSet [<element>] : Comparable | Test.java:4306:9:4306:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:4306:20:4306:22 | out : ImmutableSortedSet [<element>] : Comparable | Test.java:4306:9:4306:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:4311:20:4311:39 | (...)... : Comparable | Test.java:4312:56:4312:57 | in : Comparable | provenance |  |
 | Test.java:4311:32:4311:39 | source(...) : Object | Test.java:4311:20:4311:39 | (...)... : Comparable | provenance |  |
 | Test.java:4312:10:4312:58 | of(...) : ImmutableSortedSet [<element>] : Comparable | Test.java:4313:20:4313:22 | out : ImmutableSortedSet [<element>] : Comparable | provenance |  |
 | Test.java:4312:56:4312:57 | in : Comparable | Test.java:4312:10:4312:58 | of(...) : ImmutableSortedSet [<element>] : Comparable | provenance | MaD:191 |
 | Test.java:4313:20:4313:22 | out : ImmutableSortedSet [<element>] : Comparable | Test.java:110:19:110:32 | it : ImmutableSortedSet [<element>] : Comparable | provenance |  |
-| Test.java:4313:20:4313:22 | out : ImmutableSortedSet [<element>] : Comparable | Test.java:4313:9:4313:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:4313:20:4313:22 | out : ImmutableSortedSet [<element>] : Comparable | Test.java:4313:9:4313:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:4318:20:4318:39 | (...)... : Comparable | Test.java:4319:50:4319:51 | in : Comparable | provenance |  |
 | Test.java:4318:32:4318:39 | source(...) : Object | Test.java:4318:20:4318:39 | (...)... : Comparable | provenance |  |
 | Test.java:4319:10:4319:58 | of(...) : ImmutableSortedSet [<element>] : Comparable | Test.java:4320:20:4320:22 | out : ImmutableSortedSet [<element>] : Comparable | provenance |  |
 | Test.java:4319:50:4319:51 | in : Comparable | Test.java:4319:10:4319:58 | of(...) : ImmutableSortedSet [<element>] : Comparable | provenance | MaD:191 |
 | Test.java:4320:20:4320:22 | out : ImmutableSortedSet [<element>] : Comparable | Test.java:110:19:110:32 | it : ImmutableSortedSet [<element>] : Comparable | provenance |  |
-| Test.java:4320:20:4320:22 | out : ImmutableSortedSet [<element>] : Comparable | Test.java:4320:9:4320:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:4320:20:4320:22 | out : ImmutableSortedSet [<element>] : Comparable | Test.java:4320:9:4320:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:4325:20:4325:39 | (...)... : Comparable | Test.java:4326:50:4326:51 | in : Comparable | provenance |  |
 | Test.java:4325:32:4325:39 | source(...) : Object | Test.java:4325:20:4325:39 | (...)... : Comparable | provenance |  |
 | Test.java:4326:10:4326:52 | of(...) : ImmutableSortedSet [<element>] : Comparable | Test.java:4327:20:4327:22 | out : ImmutableSortedSet [<element>] : Comparable | provenance |  |
 | Test.java:4326:50:4326:51 | in : Comparable | Test.java:4326:10:4326:52 | of(...) : ImmutableSortedSet [<element>] : Comparable | provenance | MaD:191 |
 | Test.java:4327:20:4327:22 | out : ImmutableSortedSet [<element>] : Comparable | Test.java:110:19:110:32 | it : ImmutableSortedSet [<element>] : Comparable | provenance |  |
-| Test.java:4327:20:4327:22 | out : ImmutableSortedSet [<element>] : Comparable | Test.java:4327:9:4327:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:4327:20:4327:22 | out : ImmutableSortedSet [<element>] : Comparable | Test.java:4327:9:4327:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:4332:20:4332:39 | (...)... : Comparable | Test.java:4333:44:4333:45 | in : Comparable | provenance |  |
 | Test.java:4332:32:4332:39 | source(...) : Object | Test.java:4332:20:4332:39 | (...)... : Comparable | provenance |  |
 | Test.java:4333:10:4333:58 | of(...) : ImmutableSortedSet [<element>] : Comparable | Test.java:4334:20:4334:22 | out : ImmutableSortedSet [<element>] : Comparable | provenance |  |
 | Test.java:4333:44:4333:45 | in : Comparable | Test.java:4333:10:4333:58 | of(...) : ImmutableSortedSet [<element>] : Comparable | provenance | MaD:191 |
 | Test.java:4334:20:4334:22 | out : ImmutableSortedSet [<element>] : Comparable | Test.java:110:19:110:32 | it : ImmutableSortedSet [<element>] : Comparable | provenance |  |
-| Test.java:4334:20:4334:22 | out : ImmutableSortedSet [<element>] : Comparable | Test.java:4334:9:4334:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:4334:20:4334:22 | out : ImmutableSortedSet [<element>] : Comparable | Test.java:4334:9:4334:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:4339:20:4339:39 | (...)... : Comparable | Test.java:4340:44:4340:45 | in : Comparable | provenance |  |
 | Test.java:4339:32:4339:39 | source(...) : Object | Test.java:4339:20:4339:39 | (...)... : Comparable | provenance |  |
 | Test.java:4340:10:4340:52 | of(...) : ImmutableSortedSet [<element>] : Comparable | Test.java:4341:20:4341:22 | out : ImmutableSortedSet [<element>] : Comparable | provenance |  |
 | Test.java:4340:44:4340:45 | in : Comparable | Test.java:4340:10:4340:52 | of(...) : ImmutableSortedSet [<element>] : Comparable | provenance | MaD:191 |
 | Test.java:4341:20:4341:22 | out : ImmutableSortedSet [<element>] : Comparable | Test.java:110:19:110:32 | it : ImmutableSortedSet [<element>] : Comparable | provenance |  |
-| Test.java:4341:20:4341:22 | out : ImmutableSortedSet [<element>] : Comparable | Test.java:4341:9:4341:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:4341:20:4341:22 | out : ImmutableSortedSet [<element>] : Comparable | Test.java:4341:9:4341:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:4346:20:4346:39 | (...)... : Comparable | Test.java:4347:44:4347:45 | in : Comparable | provenance |  |
 | Test.java:4346:32:4346:39 | source(...) : Object | Test.java:4346:20:4346:39 | (...)... : Comparable | provenance |  |
 | Test.java:4347:10:4347:46 | of(...) : ImmutableSortedSet [<element>] : Comparable | Test.java:4348:20:4348:22 | out : ImmutableSortedSet [<element>] : Comparable | provenance |  |
 | Test.java:4347:44:4347:45 | in : Comparable | Test.java:4347:10:4347:46 | of(...) : ImmutableSortedSet [<element>] : Comparable | provenance | MaD:191 |
 | Test.java:4348:20:4348:22 | out : ImmutableSortedSet [<element>] : Comparable | Test.java:110:19:110:32 | it : ImmutableSortedSet [<element>] : Comparable | provenance |  |
-| Test.java:4348:20:4348:22 | out : ImmutableSortedSet [<element>] : Comparable | Test.java:4348:9:4348:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:4348:20:4348:22 | out : ImmutableSortedSet [<element>] : Comparable | Test.java:4348:9:4348:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:4353:20:4353:39 | (...)... : Comparable | Test.java:4354:38:4354:39 | in : Comparable | provenance |  |
 | Test.java:4353:32:4353:39 | source(...) : Object | Test.java:4353:20:4353:39 | (...)... : Comparable | provenance |  |
 | Test.java:4354:10:4354:58 | of(...) : ImmutableSortedSet [<element>] : Comparable | Test.java:4355:20:4355:22 | out : ImmutableSortedSet [<element>] : Comparable | provenance |  |
 | Test.java:4354:38:4354:39 | in : Comparable | Test.java:4354:10:4354:58 | of(...) : ImmutableSortedSet [<element>] : Comparable | provenance | MaD:191 |
 | Test.java:4355:20:4355:22 | out : ImmutableSortedSet [<element>] : Comparable | Test.java:110:19:110:32 | it : ImmutableSortedSet [<element>] : Comparable | provenance |  |
-| Test.java:4355:20:4355:22 | out : ImmutableSortedSet [<element>] : Comparable | Test.java:4355:9:4355:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:4355:20:4355:22 | out : ImmutableSortedSet [<element>] : Comparable | Test.java:4355:9:4355:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:4360:20:4360:39 | (...)... : Comparable | Test.java:4361:38:4361:39 | in : Comparable | provenance |  |
 | Test.java:4360:32:4360:39 | source(...) : Object | Test.java:4360:20:4360:39 | (...)... : Comparable | provenance |  |
 | Test.java:4361:10:4361:52 | of(...) : ImmutableSortedSet [<element>] : Comparable | Test.java:4362:20:4362:22 | out : ImmutableSortedSet [<element>] : Comparable | provenance |  |
 | Test.java:4361:38:4361:39 | in : Comparable | Test.java:4361:10:4361:52 | of(...) : ImmutableSortedSet [<element>] : Comparable | provenance | MaD:191 |
 | Test.java:4362:20:4362:22 | out : ImmutableSortedSet [<element>] : Comparable | Test.java:110:19:110:32 | it : ImmutableSortedSet [<element>] : Comparable | provenance |  |
-| Test.java:4362:20:4362:22 | out : ImmutableSortedSet [<element>] : Comparable | Test.java:4362:9:4362:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:4362:20:4362:22 | out : ImmutableSortedSet [<element>] : Comparable | Test.java:4362:9:4362:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:4367:20:4367:39 | (...)... : Comparable | Test.java:4368:38:4368:39 | in : Comparable | provenance |  |
 | Test.java:4367:32:4367:39 | source(...) : Object | Test.java:4367:20:4367:39 | (...)... : Comparable | provenance |  |
 | Test.java:4368:10:4368:46 | of(...) : ImmutableSortedSet [<element>] : Comparable | Test.java:4369:20:4369:22 | out : ImmutableSortedSet [<element>] : Comparable | provenance |  |
 | Test.java:4368:38:4368:39 | in : Comparable | Test.java:4368:10:4368:46 | of(...) : ImmutableSortedSet [<element>] : Comparable | provenance | MaD:191 |
 | Test.java:4369:20:4369:22 | out : ImmutableSortedSet [<element>] : Comparable | Test.java:110:19:110:32 | it : ImmutableSortedSet [<element>] : Comparable | provenance |  |
-| Test.java:4369:20:4369:22 | out : ImmutableSortedSet [<element>] : Comparable | Test.java:4369:9:4369:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:4369:20:4369:22 | out : ImmutableSortedSet [<element>] : Comparable | Test.java:4369:9:4369:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:4374:20:4374:39 | (...)... : Comparable | Test.java:4375:38:4375:39 | in : Comparable | provenance |  |
 | Test.java:4374:32:4374:39 | source(...) : Object | Test.java:4374:20:4374:39 | (...)... : Comparable | provenance |  |
 | Test.java:4375:10:4375:40 | of(...) : ImmutableSortedSet [<element>] : Comparable | Test.java:4376:20:4376:22 | out : ImmutableSortedSet [<element>] : Comparable | provenance |  |
 | Test.java:4375:38:4375:39 | in : Comparable | Test.java:4375:10:4375:40 | of(...) : ImmutableSortedSet [<element>] : Comparable | provenance | MaD:191 |
 | Test.java:4376:20:4376:22 | out : ImmutableSortedSet [<element>] : Comparable | Test.java:110:19:110:32 | it : ImmutableSortedSet [<element>] : Comparable | provenance |  |
-| Test.java:4376:20:4376:22 | out : ImmutableSortedSet [<element>] : Comparable | Test.java:4376:9:4376:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:4376:20:4376:22 | out : ImmutableSortedSet [<element>] : Comparable | Test.java:4376:9:4376:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:4381:20:4381:39 | (...)... : Comparable | Test.java:4382:32:4382:33 | in : Comparable | provenance |  |
 | Test.java:4381:32:4381:39 | source(...) : Object | Test.java:4381:20:4381:39 | (...)... : Comparable | provenance |  |
 | Test.java:4382:10:4382:58 | of(...) : ImmutableSortedSet [<element>] : Comparable | Test.java:4383:20:4383:22 | out : ImmutableSortedSet [<element>] : Comparable | provenance |  |
 | Test.java:4382:32:4382:33 | in : Comparable | Test.java:4382:10:4382:58 | of(...) : ImmutableSortedSet [<element>] : Comparable | provenance | MaD:191 |
 | Test.java:4383:20:4383:22 | out : ImmutableSortedSet [<element>] : Comparable | Test.java:110:19:110:32 | it : ImmutableSortedSet [<element>] : Comparable | provenance |  |
-| Test.java:4383:20:4383:22 | out : ImmutableSortedSet [<element>] : Comparable | Test.java:4383:9:4383:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:4383:20:4383:22 | out : ImmutableSortedSet [<element>] : Comparable | Test.java:4383:9:4383:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:4388:20:4388:39 | (...)... : Comparable | Test.java:4389:32:4389:33 | in : Comparable | provenance |  |
 | Test.java:4388:32:4388:39 | source(...) : Object | Test.java:4388:20:4388:39 | (...)... : Comparable | provenance |  |
 | Test.java:4389:10:4389:52 | of(...) : ImmutableSortedSet [<element>] : Comparable | Test.java:4390:20:4390:22 | out : ImmutableSortedSet [<element>] : Comparable | provenance |  |
 | Test.java:4389:32:4389:33 | in : Comparable | Test.java:4389:10:4389:52 | of(...) : ImmutableSortedSet [<element>] : Comparable | provenance | MaD:191 |
 | Test.java:4390:20:4390:22 | out : ImmutableSortedSet [<element>] : Comparable | Test.java:110:19:110:32 | it : ImmutableSortedSet [<element>] : Comparable | provenance |  |
-| Test.java:4390:20:4390:22 | out : ImmutableSortedSet [<element>] : Comparable | Test.java:4390:9:4390:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:4390:20:4390:22 | out : ImmutableSortedSet [<element>] : Comparable | Test.java:4390:9:4390:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:4395:20:4395:39 | (...)... : Comparable | Test.java:4396:32:4396:33 | in : Comparable | provenance |  |
 | Test.java:4395:32:4395:39 | source(...) : Object | Test.java:4395:20:4395:39 | (...)... : Comparable | provenance |  |
 | Test.java:4396:10:4396:46 | of(...) : ImmutableSortedSet [<element>] : Comparable | Test.java:4397:20:4397:22 | out : ImmutableSortedSet [<element>] : Comparable | provenance |  |
 | Test.java:4396:32:4396:33 | in : Comparable | Test.java:4396:10:4396:46 | of(...) : ImmutableSortedSet [<element>] : Comparable | provenance | MaD:191 |
 | Test.java:4397:20:4397:22 | out : ImmutableSortedSet [<element>] : Comparable | Test.java:110:19:110:32 | it : ImmutableSortedSet [<element>] : Comparable | provenance |  |
-| Test.java:4397:20:4397:22 | out : ImmutableSortedSet [<element>] : Comparable | Test.java:4397:9:4397:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:4397:20:4397:22 | out : ImmutableSortedSet [<element>] : Comparable | Test.java:4397:9:4397:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:4402:20:4402:39 | (...)... : Comparable | Test.java:4403:32:4403:33 | in : Comparable | provenance |  |
 | Test.java:4402:32:4402:39 | source(...) : Object | Test.java:4402:20:4402:39 | (...)... : Comparable | provenance |  |
 | Test.java:4403:10:4403:40 | of(...) : ImmutableSortedSet [<element>] : Comparable | Test.java:4404:20:4404:22 | out : ImmutableSortedSet [<element>] : Comparable | provenance |  |
 | Test.java:4403:32:4403:33 | in : Comparable | Test.java:4403:10:4403:40 | of(...) : ImmutableSortedSet [<element>] : Comparable | provenance | MaD:191 |
 | Test.java:4404:20:4404:22 | out : ImmutableSortedSet [<element>] : Comparable | Test.java:110:19:110:32 | it : ImmutableSortedSet [<element>] : Comparable | provenance |  |
-| Test.java:4404:20:4404:22 | out : ImmutableSortedSet [<element>] : Comparable | Test.java:4404:9:4404:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:4404:20:4404:22 | out : ImmutableSortedSet [<element>] : Comparable | Test.java:4404:9:4404:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:4409:20:4409:39 | (...)... : Comparable | Test.java:4410:32:4410:33 | in : Comparable | provenance |  |
 | Test.java:4409:32:4409:39 | source(...) : Object | Test.java:4409:20:4409:39 | (...)... : Comparable | provenance |  |
 | Test.java:4410:10:4410:144 | of(...) : ImmutableSortedSet [<element>] : Comparable | Test.java:4411:20:4411:22 | out : ImmutableSortedSet [<element>] : Comparable | provenance |  |
 | Test.java:4410:32:4410:33 | in : Comparable | Test.java:4410:10:4410:144 | of(...) : ImmutableSortedSet [<element>] : Comparable | provenance | MaD:191 |
 | Test.java:4411:20:4411:22 | out : ImmutableSortedSet [<element>] : Comparable | Test.java:110:19:110:32 | it : ImmutableSortedSet [<element>] : Comparable | provenance |  |
-| Test.java:4411:20:4411:22 | out : ImmutableSortedSet [<element>] : Comparable | Test.java:4411:9:4411:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:4411:20:4411:22 | out : ImmutableSortedSet [<element>] : Comparable | Test.java:4411:9:4411:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:4416:20:4416:39 | (...)... : Comparable | Test.java:4417:32:4417:33 | in : Comparable | provenance |  |
 | Test.java:4416:32:4416:39 | source(...) : Object | Test.java:4416:20:4416:39 | (...)... : Comparable | provenance |  |
 | Test.java:4417:10:4417:34 | of(...) : ImmutableSortedSet [<element>] : Comparable | Test.java:4418:20:4418:22 | out : ImmutableSortedSet [<element>] : Comparable | provenance |  |
 | Test.java:4417:32:4417:33 | in : Comparable | Test.java:4417:10:4417:34 | of(...) : ImmutableSortedSet [<element>] : Comparable | provenance | MaD:191 |
 | Test.java:4418:20:4418:22 | out : ImmutableSortedSet [<element>] : Comparable | Test.java:110:19:110:32 | it : ImmutableSortedSet [<element>] : Comparable | provenance |  |
-| Test.java:4418:20:4418:22 | out : ImmutableSortedSet [<element>] : Comparable | Test.java:4418:9:4418:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:4418:20:4418:22 | out : ImmutableSortedSet [<element>] : Comparable | Test.java:4418:9:4418:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:4423:20:4423:39 | (...)... : Comparable | Test.java:4424:50:4424:51 | in : Comparable | provenance |  |
 | Test.java:4423:32:4423:39 | source(...) : Object | Test.java:4423:20:4423:39 | (...)... : Comparable | provenance |  |
 | Test.java:4424:10:4424:144 | of(...) : ImmutableSortedSet [<element>] : Comparable | Test.java:4425:20:4425:22 | out : ImmutableSortedSet [<element>] : Comparable | provenance |  |
 | Test.java:4424:50:4424:51 | in : Comparable | Test.java:4424:10:4424:144 | of(...) : ImmutableSortedSet [<element>] : Comparable | provenance | MaD:191 |
 | Test.java:4425:20:4425:22 | out : ImmutableSortedSet [<element>] : Comparable | Test.java:110:19:110:32 | it : ImmutableSortedSet [<element>] : Comparable | provenance |  |
-| Test.java:4425:20:4425:22 | out : ImmutableSortedSet [<element>] : Comparable | Test.java:4425:9:4425:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:4425:20:4425:22 | out : ImmutableSortedSet [<element>] : Comparable | Test.java:4425:9:4425:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:4430:20:4430:39 | (...)... : Comparable | Test.java:4431:68:4431:69 | in : Comparable | provenance |  |
 | Test.java:4430:32:4430:39 | source(...) : Object | Test.java:4430:20:4430:39 | (...)... : Comparable | provenance |  |
 | Test.java:4431:10:4431:144 | of(...) : ImmutableSortedSet [<element>] : Comparable | Test.java:4432:20:4432:22 | out : ImmutableSortedSet [<element>] : Comparable | provenance |  |
 | Test.java:4431:68:4431:69 | in : Comparable | Test.java:4431:10:4431:144 | of(...) : ImmutableSortedSet [<element>] : Comparable | provenance | MaD:191 |
 | Test.java:4432:20:4432:22 | out : ImmutableSortedSet [<element>] : Comparable | Test.java:110:19:110:32 | it : ImmutableSortedSet [<element>] : Comparable | provenance |  |
-| Test.java:4432:20:4432:22 | out : ImmutableSortedSet [<element>] : Comparable | Test.java:4432:9:4432:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:4432:20:4432:22 | out : ImmutableSortedSet [<element>] : Comparable | Test.java:4432:9:4432:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:4437:20:4437:39 | (...)... : Comparable | Test.java:4438:86:4438:87 | in : Comparable | provenance |  |
 | Test.java:4437:32:4437:39 | source(...) : Object | Test.java:4437:20:4437:39 | (...)... : Comparable | provenance |  |
 | Test.java:4438:10:4438:144 | of(...) : ImmutableSortedSet [<element>] : Comparable | Test.java:4439:20:4439:22 | out : ImmutableSortedSet [<element>] : Comparable | provenance |  |
 | Test.java:4438:86:4438:87 | in : Comparable | Test.java:4438:10:4438:144 | of(...) : ImmutableSortedSet [<element>] : Comparable | provenance | MaD:191 |
 | Test.java:4439:20:4439:22 | out : ImmutableSortedSet [<element>] : Comparable | Test.java:110:19:110:32 | it : ImmutableSortedSet [<element>] : Comparable | provenance |  |
-| Test.java:4439:20:4439:22 | out : ImmutableSortedSet [<element>] : Comparable | Test.java:4439:9:4439:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:4439:20:4439:22 | out : ImmutableSortedSet [<element>] : Comparable | Test.java:4439:9:4439:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:4444:20:4444:39 | (...)... : Comparable | Test.java:4445:104:4445:105 | in : Comparable | provenance |  |
 | Test.java:4444:32:4444:39 | source(...) : Object | Test.java:4444:20:4444:39 | (...)... : Comparable | provenance |  |
 | Test.java:4445:10:4445:144 | of(...) : ImmutableSortedSet [<element>] : Comparable | Test.java:4446:20:4446:22 | out : ImmutableSortedSet [<element>] : Comparable | provenance |  |
 | Test.java:4445:104:4445:105 | in : Comparable | Test.java:4445:10:4445:144 | of(...) : ImmutableSortedSet [<element>] : Comparable | provenance | MaD:191 |
 | Test.java:4446:20:4446:22 | out : ImmutableSortedSet [<element>] : Comparable | Test.java:110:19:110:32 | it : ImmutableSortedSet [<element>] : Comparable | provenance |  |
-| Test.java:4446:20:4446:22 | out : ImmutableSortedSet [<element>] : Comparable | Test.java:4446:9:4446:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:4446:20:4446:22 | out : ImmutableSortedSet [<element>] : Comparable | Test.java:4446:9:4446:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:4451:20:4451:39 | (...)... : Comparable | Test.java:4452:122:4452:123 | in : Comparable | provenance |  |
 | Test.java:4451:32:4451:39 | source(...) : Object | Test.java:4451:20:4451:39 | (...)... : Comparable | provenance |  |
 | Test.java:4452:10:4452:144 | of(...) : ImmutableSortedSet [<element>] : Comparable | Test.java:4453:20:4453:22 | out : ImmutableSortedSet [<element>] : Comparable | provenance |  |
 | Test.java:4452:122:4452:123 | in : Comparable | Test.java:4452:10:4452:144 | of(...) : ImmutableSortedSet [<element>] : Comparable | provenance | MaD:191 |
 | Test.java:4453:20:4453:22 | out : ImmutableSortedSet [<element>] : Comparable | Test.java:110:19:110:32 | it : ImmutableSortedSet [<element>] : Comparable | provenance |  |
-| Test.java:4453:20:4453:22 | out : ImmutableSortedSet [<element>] : Comparable | Test.java:4453:9:4453:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:4453:20:4453:22 | out : ImmutableSortedSet [<element>] : Comparable | Test.java:4453:9:4453:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:4458:22:4458:73 | (...)... : Comparable[] [[]] : Comparable | Test.java:4459:140:4459:141 | in : Comparable[] [[]] : Comparable | provenance |  |
 | Test.java:4458:36:4458:73 | {...} : Comparable[] [[]] : Comparable | Test.java:4458:22:4458:73 | (...)... : Comparable[] [[]] : Comparable | provenance |  |
 | Test.java:4458:53:4458:72 | (...)... : Comparable | Test.java:4458:36:4458:73 | {...} : Comparable[] [[]] : Comparable | provenance |  |
@@ -5025,275 +5025,275 @@ edges
 | Test.java:4459:10:4459:142 | of(...) : ImmutableSortedSet [<element>] : Comparable | Test.java:4460:20:4460:22 | out : ImmutableSortedSet [<element>] : Comparable | provenance |  |
 | Test.java:4459:140:4459:141 | in : Comparable[] [[]] : Comparable | Test.java:4459:10:4459:142 | of(...) : ImmutableSortedSet [<element>] : Comparable | provenance | MaD:192 |
 | Test.java:4460:20:4460:22 | out : ImmutableSortedSet [<element>] : Comparable | Test.java:110:19:110:32 | it : ImmutableSortedSet [<element>] : Comparable | provenance |  |
-| Test.java:4460:20:4460:22 | out : ImmutableSortedSet [<element>] : Comparable | Test.java:4460:9:4460:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:4460:20:4460:22 | out : ImmutableSortedSet [<element>] : Comparable | Test.java:4460:9:4460:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:4465:32:4465:105 | (...)... : Builder [<map.value>] : Object | Test.java:4466:10:4466:11 | in : Builder [<map.value>] : Object | provenance |  |
 | Test.java:4465:56:4465:105 | put(...) : Builder [<map.value>] : Object | Test.java:4465:32:4465:105 | (...)... : Builder [<map.value>] : Object | provenance |  |
-| Test.java:4465:97:4465:104 | source(...) : Object | Test.java:4465:56:4465:105 | put(...) : Builder [<map.value>] : Object | provenance | MaD:211+MaD:208 |
-| Test.java:4466:10:4466:11 | in : Builder [<map.value>] : Object | Test.java:4466:10:4466:19 | build(...) : ImmutableTable [<map.value>] : Object | provenance | MaD:199 |
+| Test.java:4465:97:4465:104 | source(...) : Object | Test.java:4465:56:4465:105 | put(...) : Builder [<map.value>] : Object | provenance | MaD:200+MaD:201 |
+| Test.java:4466:10:4466:11 | in : Builder [<map.value>] : Object | Test.java:4466:10:4466:19 | build(...) : ImmutableTable [<map.value>] : Object | provenance | MaD:193 |
 | Test.java:4466:10:4466:19 | build(...) : ImmutableTable [<map.value>] : Object | Test.java:4467:21:4467:23 | out : ImmutableTable [<map.value>] : Object | provenance |  |
 | Test.java:4467:21:4467:23 | out : ImmutableTable [<map.value>] : Object | Test.java:120:20:120:33 | t : ImmutableTable [<map.value>] : Object | provenance |  |
-| Test.java:4467:21:4467:23 | out : ImmutableTable [<map.value>] : Object | Test.java:4467:9:4467:24 | getMapValue(...) | provenance | MaD:525 |
+| Test.java:4467:21:4467:23 | out : ImmutableTable [<map.value>] : Object | Test.java:4467:9:4467:24 | getMapValue(...) | provenance | MaD:528 |
 | Test.java:4472:32:4472:105 | (...)... : Builder [com.google.common.collect.Table.columnKey] : Object | Test.java:4473:10:4473:11 | in : Builder [com.google.common.collect.Table.columnKey] : Object | provenance |  |
 | Test.java:4472:56:4472:105 | put(...) : Builder [com.google.common.collect.Table.columnKey] : Object | Test.java:4472:32:4472:105 | (...)... : Builder [com.google.common.collect.Table.columnKey] : Object | provenance |  |
-| Test.java:4472:91:4472:98 | source(...) : Object | Test.java:4472:56:4472:105 | put(...) : Builder [com.google.common.collect.Table.columnKey] : Object | provenance | MaD:210+MaD:208 |
-| Test.java:4473:10:4473:11 | in : Builder [com.google.common.collect.Table.columnKey] : Object | Test.java:4473:10:4473:19 | build(...) : ImmutableTable [com.google.common.collect.Table.columnKey] : Object | provenance | MaD:200 |
+| Test.java:4472:91:4472:98 | source(...) : Object | Test.java:4472:56:4472:105 | put(...) : Builder [com.google.common.collect.Table.columnKey] : Object | provenance | MaD:199+MaD:201 |
+| Test.java:4473:10:4473:11 | in : Builder [com.google.common.collect.Table.columnKey] : Object | Test.java:4473:10:4473:19 | build(...) : ImmutableTable [com.google.common.collect.Table.columnKey] : Object | provenance | MaD:194 |
 | Test.java:4473:10:4473:19 | build(...) : ImmutableTable [com.google.common.collect.Table.columnKey] : Object | Test.java:4474:28:4474:30 | out : ImmutableTable [com.google.common.collect.Table.columnKey] : Object | provenance |  |
 | Test.java:4474:28:4474:30 | out : ImmutableTable [com.google.common.collect.Table.columnKey] : Object | Test.java:96:27:96:40 | t : ImmutableTable [com.google.common.collect.Table.columnKey] : Object | provenance |  |
-| Test.java:4474:28:4474:30 | out : ImmutableTable [com.google.common.collect.Table.columnKey] : Object | Test.java:4474:9:4474:31 | getTable_columnKey(...) | provenance | MaD:507 |
+| Test.java:4474:28:4474:30 | out : ImmutableTable [com.google.common.collect.Table.columnKey] : Object | Test.java:4474:9:4474:31 | getTable_columnKey(...) | provenance | MaD:510 |
 | Test.java:4479:32:4479:105 | (...)... : Builder [com.google.common.collect.Table.rowKey] : Object | Test.java:4480:10:4480:11 | in : Builder [com.google.common.collect.Table.rowKey] : Object | provenance |  |
 | Test.java:4479:56:4479:105 | put(...) : Builder [com.google.common.collect.Table.rowKey] : Object | Test.java:4479:32:4479:105 | (...)... : Builder [com.google.common.collect.Table.rowKey] : Object | provenance |  |
-| Test.java:4479:85:4479:92 | source(...) : Object | Test.java:4479:56:4479:105 | put(...) : Builder [com.google.common.collect.Table.rowKey] : Object | provenance | MaD:209+MaD:208 |
-| Test.java:4480:10:4480:11 | in : Builder [com.google.common.collect.Table.rowKey] : Object | Test.java:4480:10:4480:19 | build(...) : ImmutableTable [com.google.common.collect.Table.rowKey] : Object | provenance | MaD:201 |
+| Test.java:4479:85:4479:92 | source(...) : Object | Test.java:4479:56:4479:105 | put(...) : Builder [com.google.common.collect.Table.rowKey] : Object | provenance | MaD:198+MaD:201 |
+| Test.java:4480:10:4480:11 | in : Builder [com.google.common.collect.Table.rowKey] : Object | Test.java:4480:10:4480:19 | build(...) : ImmutableTable [com.google.common.collect.Table.rowKey] : Object | provenance | MaD:195 |
 | Test.java:4480:10:4480:19 | build(...) : ImmutableTable [com.google.common.collect.Table.rowKey] : Object | Test.java:4481:25:4481:27 | out : ImmutableTable [com.google.common.collect.Table.rowKey] : Object | provenance |  |
 | Test.java:4481:25:4481:27 | out : ImmutableTable [com.google.common.collect.Table.rowKey] : Object | Test.java:105:24:105:37 | t : ImmutableTable [com.google.common.collect.Table.rowKey] : Object | provenance |  |
-| Test.java:4481:25:4481:27 | out : ImmutableTable [com.google.common.collect.Table.rowKey] : Object | Test.java:4481:9:4481:28 | getTable_rowKey(...) | provenance | MaD:521 |
+| Test.java:4481:25:4481:27 | out : ImmutableTable [com.google.common.collect.Table.rowKey] : Object | Test.java:4481:9:4481:28 | getTable_rowKey(...) | provenance | MaD:524 |
 | Test.java:4486:32:4486:63 | (...)... : Builder | Test.java:4487:10:4487:11 | in : Builder | provenance |  |
 | Test.java:4486:56:4486:63 | source(...) : Object | Test.java:4486:32:4486:63 | (...)... : Builder | provenance |  |
-| Test.java:4487:10:4487:11 | in : Builder | Test.java:4487:10:4487:32 | orderColumnsBy(...) : Builder | provenance | MaD:202 |
+| Test.java:4487:10:4487:11 | in : Builder | Test.java:4487:10:4487:32 | orderColumnsBy(...) : Builder | provenance | MaD:196 |
 | Test.java:4487:10:4487:32 | orderColumnsBy(...) : Builder | Test.java:4488:9:4488:11 | out | provenance |  |
 | Test.java:4493:32:4493:63 | (...)... : Builder | Test.java:4494:10:4494:11 | in : Builder | provenance |  |
 | Test.java:4493:56:4493:63 | source(...) : Object | Test.java:4493:32:4493:63 | (...)... : Builder | provenance |  |
-| Test.java:4494:10:4494:11 | in : Builder | Test.java:4494:10:4494:29 | orderRowsBy(...) : Builder | provenance | MaD:203 |
+| Test.java:4494:10:4494:11 | in : Builder | Test.java:4494:10:4494:29 | orderRowsBy(...) : Builder | provenance | MaD:197 |
 | Test.java:4494:10:4494:29 | orderRowsBy(...) : Builder | Test.java:4495:9:4495:11 | out | provenance |  |
 | Test.java:4500:32:4500:63 | (...)... : Builder | Test.java:4501:10:4501:11 | in : Builder | provenance |  |
 | Test.java:4500:56:4500:63 | source(...) : Object | Test.java:4500:32:4500:63 | (...)... : Builder | provenance |  |
-| Test.java:4501:10:4501:11 | in : Builder | Test.java:4501:10:4501:21 | put(...) : Builder | provenance | MaD:204 |
+| Test.java:4501:10:4501:11 | in : Builder | Test.java:4501:10:4501:21 | put(...) : Builder | provenance | MaD:205 |
 | Test.java:4501:10:4501:21 | put(...) : Builder | Test.java:4502:9:4502:11 | out | provenance |  |
 | Test.java:4507:20:4507:65 | (...)... : Cell [<map.value>] : Object | Test.java:4508:12:4508:13 | in : Cell [<map.value>] : Object | provenance |  |
 | Test.java:4507:32:4507:65 | newTableCell(...) : Cell [<map.value>] : Object | Test.java:4507:20:4507:65 | (...)... : Cell [<map.value>] : Object | provenance |  |
 | Test.java:4507:57:4507:64 | source(...) : Object | Test.java:102:58:102:64 | value : Object | provenance |  |
-| Test.java:4507:57:4507:64 | source(...) : Object | Test.java:4507:32:4507:65 | newTableCell(...) : Cell [<map.value>] : Object | provenance | MaD:198 |
+| Test.java:4507:57:4507:64 | source(...) : Object | Test.java:4507:32:4507:65 | newTableCell(...) : Cell [<map.value>] : Object | provenance | MaD:215 |
 | Test.java:4508:4:4508:6 | out [post update] : Builder [<map.value>] : Object | Test.java:4509:21:4509:23 | out : Builder [<map.value>] : Object | provenance |  |
-| Test.java:4508:12:4508:13 | in : Cell [<map.value>] : Object | Test.java:4508:4:4508:6 | out [post update] : Builder [<map.value>] : Object | provenance | MaD:205 |
+| Test.java:4508:12:4508:13 | in : Cell [<map.value>] : Object | Test.java:4508:4:4508:6 | out [post update] : Builder [<map.value>] : Object | provenance | MaD:202 |
 | Test.java:4509:21:4509:23 | out : Builder [<map.value>] : Object | Test.java:117:20:117:50 | b : Builder [<map.value>] : Object | provenance |  |
-| Test.java:4509:21:4509:23 | out : Builder [<map.value>] : Object | Test.java:4509:9:4509:24 | getMapValue(...) | provenance | MaD:199 |
+| Test.java:4509:21:4509:23 | out : Builder [<map.value>] : Object | Test.java:4509:9:4509:24 | getMapValue(...) | provenance | MaD:193 |
 | Test.java:4514:20:4514:65 | (...)... : Cell [com.google.common.collect.Table.columnKey] : Object | Test.java:4515:12:4515:13 | in : Cell [com.google.common.collect.Table.columnKey] : Object | provenance |  |
 | Test.java:4514:32:4514:65 | newTableCell(...) : Cell [com.google.common.collect.Table.columnKey] : Object | Test.java:4514:20:4514:65 | (...)... : Cell [com.google.common.collect.Table.columnKey] : Object | provenance |  |
 | Test.java:4514:51:4514:58 | source(...) : Object | Test.java:102:48:102:55 | column : Object | provenance |  |
-| Test.java:4514:51:4514:58 | source(...) : Object | Test.java:4514:32:4514:65 | newTableCell(...) : Cell [com.google.common.collect.Table.columnKey] : Object | provenance | MaD:197 |
+| Test.java:4514:51:4514:58 | source(...) : Object | Test.java:4514:32:4514:65 | newTableCell(...) : Cell [com.google.common.collect.Table.columnKey] : Object | provenance | MaD:214 |
 | Test.java:4515:4:4515:6 | out [post update] : Builder [com.google.common.collect.Table.columnKey] : Object | Test.java:4516:28:4516:30 | out : Builder [com.google.common.collect.Table.columnKey] : Object | provenance |  |
-| Test.java:4515:12:4515:13 | in : Cell [com.google.common.collect.Table.columnKey] : Object | Test.java:4515:4:4515:6 | out [post update] : Builder [com.google.common.collect.Table.columnKey] : Object | provenance | MaD:206 |
+| Test.java:4515:12:4515:13 | in : Cell [com.google.common.collect.Table.columnKey] : Object | Test.java:4515:4:4515:6 | out [post update] : Builder [com.google.common.collect.Table.columnKey] : Object | provenance | MaD:203 |
 | Test.java:4516:28:4516:30 | out : Builder [com.google.common.collect.Table.columnKey] : Object | Test.java:95:27:95:57 | b : Builder [com.google.common.collect.Table.columnKey] : Object | provenance |  |
-| Test.java:4516:28:4516:30 | out : Builder [com.google.common.collect.Table.columnKey] : Object | Test.java:4516:9:4516:31 | getTable_columnKey(...) | provenance | MaD:200 |
+| Test.java:4516:28:4516:30 | out : Builder [com.google.common.collect.Table.columnKey] : Object | Test.java:4516:9:4516:31 | getTable_columnKey(...) | provenance | MaD:194 |
 | Test.java:4521:20:4521:65 | (...)... : Cell [com.google.common.collect.Table.rowKey] : Object | Test.java:4522:12:4522:13 | in : Cell [com.google.common.collect.Table.rowKey] : Object | provenance |  |
 | Test.java:4521:32:4521:65 | newTableCell(...) : Cell [com.google.common.collect.Table.rowKey] : Object | Test.java:4521:20:4521:65 | (...)... : Cell [com.google.common.collect.Table.rowKey] : Object | provenance |  |
 | Test.java:4521:45:4521:52 | source(...) : Object | Test.java:102:41:102:45 | row : Object | provenance |  |
-| Test.java:4521:45:4521:52 | source(...) : Object | Test.java:4521:32:4521:65 | newTableCell(...) : Cell [com.google.common.collect.Table.rowKey] : Object | provenance | MaD:196 |
+| Test.java:4521:45:4521:52 | source(...) : Object | Test.java:4521:32:4521:65 | newTableCell(...) : Cell [com.google.common.collect.Table.rowKey] : Object | provenance | MaD:213 |
 | Test.java:4522:4:4522:6 | out [post update] : Builder [com.google.common.collect.Table.rowKey] : Object | Test.java:4523:25:4523:27 | out : Builder [com.google.common.collect.Table.rowKey] : Object | provenance |  |
-| Test.java:4522:12:4522:13 | in : Cell [com.google.common.collect.Table.rowKey] : Object | Test.java:4522:4:4522:6 | out [post update] : Builder [com.google.common.collect.Table.rowKey] : Object | provenance | MaD:207 |
+| Test.java:4522:12:4522:13 | in : Cell [com.google.common.collect.Table.rowKey] : Object | Test.java:4522:4:4522:6 | out [post update] : Builder [com.google.common.collect.Table.rowKey] : Object | provenance | MaD:204 |
 | Test.java:4523:25:4523:27 | out : Builder [com.google.common.collect.Table.rowKey] : Object | Test.java:104:24:104:54 | b : Builder [com.google.common.collect.Table.rowKey] : Object | provenance |  |
-| Test.java:4523:25:4523:27 | out : Builder [com.google.common.collect.Table.rowKey] : Object | Test.java:4523:9:4523:28 | getTable_rowKey(...) | provenance | MaD:201 |
+| Test.java:4523:25:4523:27 | out : Builder [com.google.common.collect.Table.rowKey] : Object | Test.java:4523:9:4523:28 | getTable_rowKey(...) | provenance | MaD:195 |
 | Test.java:4528:32:4528:63 | (...)... : Builder | Test.java:4529:10:4529:11 | in : Builder | provenance |  |
 | Test.java:4528:56:4528:63 | source(...) : Object | Test.java:4528:32:4528:63 | (...)... : Builder | provenance |  |
-| Test.java:4529:10:4529:11 | in : Builder | Test.java:4529:10:4529:33 | put(...) : Builder | provenance | MaD:208 |
+| Test.java:4529:10:4529:11 | in : Builder | Test.java:4529:10:4529:33 | put(...) : Builder | provenance | MaD:201 |
 | Test.java:4529:10:4529:33 | put(...) : Builder | Test.java:4530:9:4530:11 | out | provenance |  |
 | Test.java:4535:16:4535:31 | (...)... : Object | Test.java:4536:12:4536:13 | in : Object | provenance |  |
 | Test.java:4535:24:4535:31 | source(...) : Object | Test.java:4535:16:4535:31 | (...)... : Object | provenance |  |
 | Test.java:4536:4:4536:6 | out [post update] : Builder [com.google.common.collect.Table.rowKey] : Object | Test.java:4537:25:4537:27 | out : Builder [com.google.common.collect.Table.rowKey] : Object | provenance |  |
-| Test.java:4536:12:4536:13 | in : Object | Test.java:4536:4:4536:6 | out [post update] : Builder [com.google.common.collect.Table.rowKey] : Object | provenance | MaD:209 |
+| Test.java:4536:12:4536:13 | in : Object | Test.java:4536:4:4536:6 | out [post update] : Builder [com.google.common.collect.Table.rowKey] : Object | provenance | MaD:198 |
 | Test.java:4537:25:4537:27 | out : Builder [com.google.common.collect.Table.rowKey] : Object | Test.java:104:24:104:54 | b : Builder [com.google.common.collect.Table.rowKey] : Object | provenance |  |
-| Test.java:4537:25:4537:27 | out : Builder [com.google.common.collect.Table.rowKey] : Object | Test.java:4537:9:4537:28 | getTable_rowKey(...) | provenance | MaD:201 |
+| Test.java:4537:25:4537:27 | out : Builder [com.google.common.collect.Table.rowKey] : Object | Test.java:4537:9:4537:28 | getTable_rowKey(...) | provenance | MaD:195 |
 | Test.java:4542:16:4542:31 | (...)... : Object | Test.java:4543:18:4543:19 | in : Object | provenance |  |
 | Test.java:4542:24:4542:31 | source(...) : Object | Test.java:4542:16:4542:31 | (...)... : Object | provenance |  |
 | Test.java:4543:4:4543:6 | out [post update] : Builder [com.google.common.collect.Table.columnKey] : Object | Test.java:4544:28:4544:30 | out : Builder [com.google.common.collect.Table.columnKey] : Object | provenance |  |
-| Test.java:4543:18:4543:19 | in : Object | Test.java:4543:4:4543:6 | out [post update] : Builder [com.google.common.collect.Table.columnKey] : Object | provenance | MaD:210 |
+| Test.java:4543:18:4543:19 | in : Object | Test.java:4543:4:4543:6 | out [post update] : Builder [com.google.common.collect.Table.columnKey] : Object | provenance | MaD:199 |
 | Test.java:4544:28:4544:30 | out : Builder [com.google.common.collect.Table.columnKey] : Object | Test.java:95:27:95:57 | b : Builder [com.google.common.collect.Table.columnKey] : Object | provenance |  |
-| Test.java:4544:28:4544:30 | out : Builder [com.google.common.collect.Table.columnKey] : Object | Test.java:4544:9:4544:31 | getTable_columnKey(...) | provenance | MaD:200 |
+| Test.java:4544:28:4544:30 | out : Builder [com.google.common.collect.Table.columnKey] : Object | Test.java:4544:9:4544:31 | getTable_columnKey(...) | provenance | MaD:194 |
 | Test.java:4549:16:4549:31 | (...)... : Object | Test.java:4550:24:4550:25 | in : Object | provenance |  |
 | Test.java:4549:24:4549:31 | source(...) : Object | Test.java:4549:16:4549:31 | (...)... : Object | provenance |  |
 | Test.java:4550:4:4550:6 | out [post update] : Builder [<map.value>] : Object | Test.java:4551:21:4551:23 | out : Builder [<map.value>] : Object | provenance |  |
-| Test.java:4550:24:4550:25 | in : Object | Test.java:4550:4:4550:6 | out [post update] : Builder [<map.value>] : Object | provenance | MaD:211 |
+| Test.java:4550:24:4550:25 | in : Object | Test.java:4550:4:4550:6 | out [post update] : Builder [<map.value>] : Object | provenance | MaD:200 |
 | Test.java:4551:21:4551:23 | out : Builder [<map.value>] : Object | Test.java:117:20:117:50 | b : Builder [<map.value>] : Object | provenance |  |
-| Test.java:4551:21:4551:23 | out : Builder [<map.value>] : Object | Test.java:4551:9:4551:24 | getMapValue(...) | provenance | MaD:199 |
+| Test.java:4551:21:4551:23 | out : Builder [<map.value>] : Object | Test.java:4551:9:4551:24 | getMapValue(...) | provenance | MaD:193 |
 | Test.java:4556:32:4556:63 | (...)... : Builder | Test.java:4557:10:4557:11 | in : Builder | provenance |  |
 | Test.java:4556:56:4556:63 | source(...) : Object | Test.java:4556:32:4556:63 | (...)... : Builder | provenance |  |
-| Test.java:4557:10:4557:11 | in : Builder | Test.java:4557:10:4557:24 | putAll(...) : Builder | provenance | MaD:212 |
+| Test.java:4557:10:4557:11 | in : Builder | Test.java:4557:10:4557:24 | putAll(...) : Builder | provenance | MaD:209 |
 | Test.java:4557:10:4557:24 | putAll(...) : Builder | Test.java:4558:9:4558:11 | out | provenance |  |
 | Test.java:4563:15:4563:60 | (...)... : ImmutableTable [<map.value>] : Object | Test.java:4564:15:4564:16 | in : ImmutableTable [<map.value>] : Object | provenance |  |
 | Test.java:4563:22:4563:60 | of(...) : ImmutableTable [<map.value>] : Object | Test.java:4563:15:4563:60 | (...)... : ImmutableTable [<map.value>] : Object | provenance |  |
-| Test.java:4563:52:4563:59 | source(...) : Object | Test.java:4563:22:4563:60 | of(...) : ImmutableTable [<map.value>] : Object | provenance | MaD:198 |
+| Test.java:4563:52:4563:59 | source(...) : Object | Test.java:4563:22:4563:60 | of(...) : ImmutableTable [<map.value>] : Object | provenance | MaD:215 |
 | Test.java:4564:4:4564:6 | out [post update] : Builder [<map.value>] : Object | Test.java:4565:21:4565:23 | out : Builder [<map.value>] : Object | provenance |  |
-| Test.java:4564:15:4564:16 | in : ImmutableTable [<map.value>] : Object | Test.java:4564:4:4564:6 | out [post update] : Builder [<map.value>] : Object | provenance | MaD:213 |
+| Test.java:4564:15:4564:16 | in : ImmutableTable [<map.value>] : Object | Test.java:4564:4:4564:6 | out [post update] : Builder [<map.value>] : Object | provenance | MaD:206 |
 | Test.java:4565:21:4565:23 | out : Builder [<map.value>] : Object | Test.java:117:20:117:50 | b : Builder [<map.value>] : Object | provenance |  |
-| Test.java:4565:21:4565:23 | out : Builder [<map.value>] : Object | Test.java:4565:9:4565:24 | getMapValue(...) | provenance | MaD:199 |
+| Test.java:4565:21:4565:23 | out : Builder [<map.value>] : Object | Test.java:4565:9:4565:24 | getMapValue(...) | provenance | MaD:193 |
 | Test.java:4570:15:4570:60 | (...)... : ImmutableTable [com.google.common.collect.Table.columnKey] : Object | Test.java:4571:15:4571:16 | in : ImmutableTable [com.google.common.collect.Table.columnKey] : Object | provenance |  |
 | Test.java:4570:22:4570:60 | of(...) : ImmutableTable [com.google.common.collect.Table.columnKey] : Object | Test.java:4570:15:4570:60 | (...)... : ImmutableTable [com.google.common.collect.Table.columnKey] : Object | provenance |  |
-| Test.java:4570:46:4570:53 | source(...) : Object | Test.java:4570:22:4570:60 | of(...) : ImmutableTable [com.google.common.collect.Table.columnKey] : Object | provenance | MaD:197 |
+| Test.java:4570:46:4570:53 | source(...) : Object | Test.java:4570:22:4570:60 | of(...) : ImmutableTable [com.google.common.collect.Table.columnKey] : Object | provenance | MaD:214 |
 | Test.java:4571:4:4571:6 | out [post update] : Builder [com.google.common.collect.Table.columnKey] : Object | Test.java:4572:28:4572:30 | out : Builder [com.google.common.collect.Table.columnKey] : Object | provenance |  |
-| Test.java:4571:15:4571:16 | in : ImmutableTable [com.google.common.collect.Table.columnKey] : Object | Test.java:4571:4:4571:6 | out [post update] : Builder [com.google.common.collect.Table.columnKey] : Object | provenance | MaD:214 |
+| Test.java:4571:15:4571:16 | in : ImmutableTable [com.google.common.collect.Table.columnKey] : Object | Test.java:4571:4:4571:6 | out [post update] : Builder [com.google.common.collect.Table.columnKey] : Object | provenance | MaD:207 |
 | Test.java:4572:28:4572:30 | out : Builder [com.google.common.collect.Table.columnKey] : Object | Test.java:95:27:95:57 | b : Builder [com.google.common.collect.Table.columnKey] : Object | provenance |  |
-| Test.java:4572:28:4572:30 | out : Builder [com.google.common.collect.Table.columnKey] : Object | Test.java:4572:9:4572:31 | getTable_columnKey(...) | provenance | MaD:200 |
+| Test.java:4572:28:4572:30 | out : Builder [com.google.common.collect.Table.columnKey] : Object | Test.java:4572:9:4572:31 | getTable_columnKey(...) | provenance | MaD:194 |
 | Test.java:4577:15:4577:60 | (...)... : ImmutableTable [com.google.common.collect.Table.rowKey] : Object | Test.java:4578:15:4578:16 | in : ImmutableTable [com.google.common.collect.Table.rowKey] : Object | provenance |  |
 | Test.java:4577:22:4577:60 | of(...) : ImmutableTable [com.google.common.collect.Table.rowKey] : Object | Test.java:4577:15:4577:60 | (...)... : ImmutableTable [com.google.common.collect.Table.rowKey] : Object | provenance |  |
-| Test.java:4577:40:4577:47 | source(...) : Object | Test.java:4577:22:4577:60 | of(...) : ImmutableTable [com.google.common.collect.Table.rowKey] : Object | provenance | MaD:196 |
+| Test.java:4577:40:4577:47 | source(...) : Object | Test.java:4577:22:4577:60 | of(...) : ImmutableTable [com.google.common.collect.Table.rowKey] : Object | provenance | MaD:213 |
 | Test.java:4578:4:4578:6 | out [post update] : Builder [com.google.common.collect.Table.rowKey] : Object | Test.java:4579:25:4579:27 | out : Builder [com.google.common.collect.Table.rowKey] : Object | provenance |  |
-| Test.java:4578:15:4578:16 | in : ImmutableTable [com.google.common.collect.Table.rowKey] : Object | Test.java:4578:4:4578:6 | out [post update] : Builder [com.google.common.collect.Table.rowKey] : Object | provenance | MaD:215 |
+| Test.java:4578:15:4578:16 | in : ImmutableTable [com.google.common.collect.Table.rowKey] : Object | Test.java:4578:4:4578:6 | out [post update] : Builder [com.google.common.collect.Table.rowKey] : Object | provenance | MaD:208 |
 | Test.java:4579:25:4579:27 | out : Builder [com.google.common.collect.Table.rowKey] : Object | Test.java:104:24:104:54 | b : Builder [com.google.common.collect.Table.rowKey] : Object | provenance |  |
-| Test.java:4579:25:4579:27 | out : Builder [com.google.common.collect.Table.rowKey] : Object | Test.java:4579:9:4579:28 | getTable_rowKey(...) | provenance | MaD:201 |
+| Test.java:4579:25:4579:27 | out : Builder [com.google.common.collect.Table.rowKey] : Object | Test.java:4579:9:4579:28 | getTable_rowKey(...) | provenance | MaD:195 |
 | Test.java:4584:15:4584:60 | (...)... : ImmutableTable [<map.value>] : Object | Test.java:4585:32:4585:33 | in : ImmutableTable [<map.value>] : Object | provenance |  |
 | Test.java:4584:22:4584:60 | of(...) : ImmutableTable [<map.value>] : Object | Test.java:4584:15:4584:60 | (...)... : ImmutableTable [<map.value>] : Object | provenance |  |
-| Test.java:4584:52:4584:59 | source(...) : Object | Test.java:4584:22:4584:60 | of(...) : ImmutableTable [<map.value>] : Object | provenance | MaD:198 |
+| Test.java:4584:52:4584:59 | source(...) : Object | Test.java:4584:22:4584:60 | of(...) : ImmutableTable [<map.value>] : Object | provenance | MaD:215 |
 | Test.java:4585:10:4585:34 | copyOf(...) : ImmutableTable [<map.value>] : Object | Test.java:4586:21:4586:23 | out : ImmutableTable [<map.value>] : Object | provenance |  |
-| Test.java:4585:32:4585:33 | in : ImmutableTable [<map.value>] : Object | Test.java:4585:10:4585:34 | copyOf(...) : ImmutableTable [<map.value>] : Object | provenance | MaD:193 |
+| Test.java:4585:32:4585:33 | in : ImmutableTable [<map.value>] : Object | Test.java:4585:10:4585:34 | copyOf(...) : ImmutableTable [<map.value>] : Object | provenance | MaD:210 |
 | Test.java:4586:21:4586:23 | out : ImmutableTable [<map.value>] : Object | Test.java:120:20:120:33 | t : ImmutableTable [<map.value>] : Object | provenance |  |
-| Test.java:4586:21:4586:23 | out : ImmutableTable [<map.value>] : Object | Test.java:4586:9:4586:24 | getMapValue(...) | provenance | MaD:525 |
+| Test.java:4586:21:4586:23 | out : ImmutableTable [<map.value>] : Object | Test.java:4586:9:4586:24 | getMapValue(...) | provenance | MaD:528 |
 | Test.java:4591:15:4591:60 | (...)... : ImmutableTable [com.google.common.collect.Table.columnKey] : Object | Test.java:4592:32:4592:33 | in : ImmutableTable [com.google.common.collect.Table.columnKey] : Object | provenance |  |
 | Test.java:4591:22:4591:60 | of(...) : ImmutableTable [com.google.common.collect.Table.columnKey] : Object | Test.java:4591:15:4591:60 | (...)... : ImmutableTable [com.google.common.collect.Table.columnKey] : Object | provenance |  |
-| Test.java:4591:46:4591:53 | source(...) : Object | Test.java:4591:22:4591:60 | of(...) : ImmutableTable [com.google.common.collect.Table.columnKey] : Object | provenance | MaD:197 |
+| Test.java:4591:46:4591:53 | source(...) : Object | Test.java:4591:22:4591:60 | of(...) : ImmutableTable [com.google.common.collect.Table.columnKey] : Object | provenance | MaD:214 |
 | Test.java:4592:10:4592:34 | copyOf(...) : ImmutableTable [com.google.common.collect.Table.columnKey] : Object | Test.java:4593:28:4593:30 | out : ImmutableTable [com.google.common.collect.Table.columnKey] : Object | provenance |  |
-| Test.java:4592:32:4592:33 | in : ImmutableTable [com.google.common.collect.Table.columnKey] : Object | Test.java:4592:10:4592:34 | copyOf(...) : ImmutableTable [com.google.common.collect.Table.columnKey] : Object | provenance | MaD:194 |
+| Test.java:4592:32:4592:33 | in : ImmutableTable [com.google.common.collect.Table.columnKey] : Object | Test.java:4592:10:4592:34 | copyOf(...) : ImmutableTable [com.google.common.collect.Table.columnKey] : Object | provenance | MaD:211 |
 | Test.java:4593:28:4593:30 | out : ImmutableTable [com.google.common.collect.Table.columnKey] : Object | Test.java:96:27:96:40 | t : ImmutableTable [com.google.common.collect.Table.columnKey] : Object | provenance |  |
-| Test.java:4593:28:4593:30 | out : ImmutableTable [com.google.common.collect.Table.columnKey] : Object | Test.java:4593:9:4593:31 | getTable_columnKey(...) | provenance | MaD:507 |
+| Test.java:4593:28:4593:30 | out : ImmutableTable [com.google.common.collect.Table.columnKey] : Object | Test.java:4593:9:4593:31 | getTable_columnKey(...) | provenance | MaD:510 |
 | Test.java:4598:15:4598:60 | (...)... : ImmutableTable [com.google.common.collect.Table.rowKey] : Object | Test.java:4599:32:4599:33 | in : ImmutableTable [com.google.common.collect.Table.rowKey] : Object | provenance |  |
 | Test.java:4598:22:4598:60 | of(...) : ImmutableTable [com.google.common.collect.Table.rowKey] : Object | Test.java:4598:15:4598:60 | (...)... : ImmutableTable [com.google.common.collect.Table.rowKey] : Object | provenance |  |
-| Test.java:4598:40:4598:47 | source(...) : Object | Test.java:4598:22:4598:60 | of(...) : ImmutableTable [com.google.common.collect.Table.rowKey] : Object | provenance | MaD:196 |
+| Test.java:4598:40:4598:47 | source(...) : Object | Test.java:4598:22:4598:60 | of(...) : ImmutableTable [com.google.common.collect.Table.rowKey] : Object | provenance | MaD:213 |
 | Test.java:4599:10:4599:34 | copyOf(...) : ImmutableTable [com.google.common.collect.Table.rowKey] : Object | Test.java:4600:25:4600:27 | out : ImmutableTable [com.google.common.collect.Table.rowKey] : Object | provenance |  |
-| Test.java:4599:32:4599:33 | in : ImmutableTable [com.google.common.collect.Table.rowKey] : Object | Test.java:4599:10:4599:34 | copyOf(...) : ImmutableTable [com.google.common.collect.Table.rowKey] : Object | provenance | MaD:195 |
+| Test.java:4599:32:4599:33 | in : ImmutableTable [com.google.common.collect.Table.rowKey] : Object | Test.java:4599:10:4599:34 | copyOf(...) : ImmutableTable [com.google.common.collect.Table.rowKey] : Object | provenance | MaD:212 |
 | Test.java:4600:25:4600:27 | out : ImmutableTable [com.google.common.collect.Table.rowKey] : Object | Test.java:105:24:105:37 | t : ImmutableTable [com.google.common.collect.Table.rowKey] : Object | provenance |  |
-| Test.java:4600:25:4600:27 | out : ImmutableTable [com.google.common.collect.Table.rowKey] : Object | Test.java:4600:9:4600:28 | getTable_rowKey(...) | provenance | MaD:521 |
+| Test.java:4600:25:4600:27 | out : ImmutableTable [com.google.common.collect.Table.rowKey] : Object | Test.java:4600:9:4600:28 | getTable_rowKey(...) | provenance | MaD:524 |
 | Test.java:4605:16:4605:31 | (...)... : Object | Test.java:4606:28:4606:29 | in : Object | provenance |  |
 | Test.java:4605:24:4605:31 | source(...) : Object | Test.java:4605:16:4605:31 | (...)... : Object | provenance |  |
 | Test.java:4606:10:4606:42 | of(...) : ImmutableTable [com.google.common.collect.Table.rowKey] : Object | Test.java:4607:25:4607:27 | out : ImmutableTable [com.google.common.collect.Table.rowKey] : Object | provenance |  |
-| Test.java:4606:28:4606:29 | in : Object | Test.java:4606:10:4606:42 | of(...) : ImmutableTable [com.google.common.collect.Table.rowKey] : Object | provenance | MaD:196 |
+| Test.java:4606:28:4606:29 | in : Object | Test.java:4606:10:4606:42 | of(...) : ImmutableTable [com.google.common.collect.Table.rowKey] : Object | provenance | MaD:213 |
 | Test.java:4607:25:4607:27 | out : ImmutableTable [com.google.common.collect.Table.rowKey] : Object | Test.java:105:24:105:37 | t : ImmutableTable [com.google.common.collect.Table.rowKey] : Object | provenance |  |
-| Test.java:4607:25:4607:27 | out : ImmutableTable [com.google.common.collect.Table.rowKey] : Object | Test.java:4607:9:4607:28 | getTable_rowKey(...) | provenance | MaD:521 |
+| Test.java:4607:25:4607:27 | out : ImmutableTable [com.google.common.collect.Table.rowKey] : Object | Test.java:4607:9:4607:28 | getTable_rowKey(...) | provenance | MaD:524 |
 | Test.java:4612:16:4612:31 | (...)... : Object | Test.java:4613:34:4613:35 | in : Object | provenance |  |
 | Test.java:4612:24:4612:31 | source(...) : Object | Test.java:4612:16:4612:31 | (...)... : Object | provenance |  |
 | Test.java:4613:10:4613:42 | of(...) : ImmutableTable [com.google.common.collect.Table.columnKey] : Object | Test.java:4614:28:4614:30 | out : ImmutableTable [com.google.common.collect.Table.columnKey] : Object | provenance |  |
-| Test.java:4613:34:4613:35 | in : Object | Test.java:4613:10:4613:42 | of(...) : ImmutableTable [com.google.common.collect.Table.columnKey] : Object | provenance | MaD:197 |
+| Test.java:4613:34:4613:35 | in : Object | Test.java:4613:10:4613:42 | of(...) : ImmutableTable [com.google.common.collect.Table.columnKey] : Object | provenance | MaD:214 |
 | Test.java:4614:28:4614:30 | out : ImmutableTable [com.google.common.collect.Table.columnKey] : Object | Test.java:96:27:96:40 | t : ImmutableTable [com.google.common.collect.Table.columnKey] : Object | provenance |  |
-| Test.java:4614:28:4614:30 | out : ImmutableTable [com.google.common.collect.Table.columnKey] : Object | Test.java:4614:9:4614:31 | getTable_columnKey(...) | provenance | MaD:507 |
+| Test.java:4614:28:4614:30 | out : ImmutableTable [com.google.common.collect.Table.columnKey] : Object | Test.java:4614:9:4614:31 | getTable_columnKey(...) | provenance | MaD:510 |
 | Test.java:4619:16:4619:31 | (...)... : Object | Test.java:4620:40:4620:41 | in : Object | provenance |  |
 | Test.java:4619:24:4619:31 | source(...) : Object | Test.java:4619:16:4619:31 | (...)... : Object | provenance |  |
 | Test.java:4620:10:4620:42 | of(...) : ImmutableTable [<map.value>] : Object | Test.java:4621:21:4621:23 | out : ImmutableTable [<map.value>] : Object | provenance |  |
-| Test.java:4620:40:4620:41 | in : Object | Test.java:4620:10:4620:42 | of(...) : ImmutableTable [<map.value>] : Object | provenance | MaD:198 |
+| Test.java:4620:40:4620:41 | in : Object | Test.java:4620:10:4620:42 | of(...) : ImmutableTable [<map.value>] : Object | provenance | MaD:215 |
 | Test.java:4621:21:4621:23 | out : ImmutableTable [<map.value>] : Object | Test.java:120:20:120:33 | t : ImmutableTable [<map.value>] : Object | provenance |  |
-| Test.java:4621:21:4621:23 | out : ImmutableTable [<map.value>] : Object | Test.java:4621:9:4621:24 | getMapValue(...) | provenance | MaD:525 |
+| Test.java:4621:21:4621:23 | out : ImmutableTable [<map.value>] : Object | Test.java:4621:9:4621:24 | getMapValue(...) | provenance | MaD:528 |
 | Test.java:4626:18:4626:44 | (...)... : List [<element>] : Object | Test.java:4627:26:4627:27 | in : List [<element>] : Object | provenance |  |
 | Test.java:4626:28:4626:44 | of(...) : List [<element>] : Object | Test.java:4626:18:4626:44 | (...)... : List [<element>] : Object | provenance |  |
-| Test.java:4626:36:4626:43 | source(...) : Object | Test.java:4626:28:4626:44 | of(...) : List [<element>] : Object | provenance | MaD:558 |
+| Test.java:4626:36:4626:43 | source(...) : Object | Test.java:4626:28:4626:44 | of(...) : List [<element>] : Object | provenance | MaD:561 |
 | Test.java:4627:21:4627:23 | out [post update] : Collection [<element>] : Object | Test.java:4628:20:4628:22 | out : Collection [<element>] : Object | provenance |  |
 | Test.java:4627:26:4627:27 | in : List [<element>] : Object | Test.java:4627:21:4627:23 | out [post update] : Collection [<element>] : Object | provenance | MaD:216 |
 | Test.java:4628:20:4628:22 | out : Collection [<element>] : Object | Test.java:110:19:110:32 | it : Collection [<element>] : Object | provenance |  |
-| Test.java:4628:20:4628:22 | out : Collection [<element>] : Object | Test.java:4628:9:4628:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:4628:20:4628:22 | out : Collection [<element>] : Object | Test.java:4628:9:4628:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:4633:18:4633:53 | (...)... : List [<element>, <element>] : Object | Test.java:4634:27:4634:28 | in : List [<element>, <element>] : Object | provenance |  |
 | Test.java:4633:28:4633:53 | of(...) : List [<element>, <element>] : Object | Test.java:4633:18:4633:53 | (...)... : List [<element>, <element>] : Object | provenance |  |
-| Test.java:4633:36:4633:52 | of(...) : List [<element>] : Object | Test.java:4633:28:4633:53 | of(...) : List [<element>, <element>] : Object | provenance | MaD:558 |
-| Test.java:4633:44:4633:51 | source(...) : Object | Test.java:4633:36:4633:52 | of(...) : List [<element>] : Object | provenance | MaD:558 |
+| Test.java:4633:36:4633:52 | of(...) : List [<element>] : Object | Test.java:4633:28:4633:53 | of(...) : List [<element>, <element>] : Object | provenance | MaD:561 |
+| Test.java:4633:44:4633:51 | source(...) : Object | Test.java:4633:36:4633:52 | of(...) : List [<element>] : Object | provenance | MaD:561 |
 | Test.java:4634:10:4634:29 | concat(...) : Iterable [<element>] : Object | Test.java:4635:20:4635:22 | out : Iterable [<element>] : Object | provenance |  |
 | Test.java:4634:27:4634:28 | in : List [<element>, <element>] : Object | Test.java:4634:10:4634:29 | concat(...) : Iterable [<element>] : Object | provenance | MaD:217 |
 | Test.java:4635:20:4635:22 | out : Iterable [<element>] : Object | Test.java:110:19:110:32 | it : Iterable [<element>] : Object | provenance |  |
-| Test.java:4635:20:4635:22 | out : Iterable [<element>] : Object | Test.java:4635:9:4635:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:4635:20:4635:22 | out : Iterable [<element>] : Object | Test.java:4635:9:4635:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:4640:18:4640:44 | (...)... : List [<element>] : Object | Test.java:4641:33:4641:34 | in : List [<element>] : Object | provenance |  |
 | Test.java:4640:28:4640:44 | of(...) : List [<element>] : Object | Test.java:4640:18:4640:44 | (...)... : List [<element>] : Object | provenance |  |
-| Test.java:4640:36:4640:43 | source(...) : Object | Test.java:4640:28:4640:44 | of(...) : List [<element>] : Object | provenance | MaD:558 |
+| Test.java:4640:36:4640:43 | source(...) : Object | Test.java:4640:28:4640:44 | of(...) : List [<element>] : Object | provenance | MaD:561 |
 | Test.java:4641:10:4641:35 | concat(...) : Iterable [<element>] : Object | Test.java:4642:20:4642:22 | out : Iterable [<element>] : Object | provenance |  |
 | Test.java:4641:33:4641:34 | in : List [<element>] : Object | Test.java:4641:10:4641:35 | concat(...) : Iterable [<element>] : Object | provenance | MaD:218 |
 | Test.java:4642:20:4642:22 | out : Iterable [<element>] : Object | Test.java:110:19:110:32 | it : Iterable [<element>] : Object | provenance |  |
-| Test.java:4642:20:4642:22 | out : Iterable [<element>] : Object | Test.java:4642:9:4642:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:4642:20:4642:22 | out : Iterable [<element>] : Object | Test.java:4642:9:4642:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:4647:18:4647:44 | (...)... : List [<element>] : Object | Test.java:4648:27:4648:28 | in : List [<element>] : Object | provenance |  |
 | Test.java:4647:28:4647:44 | of(...) : List [<element>] : Object | Test.java:4647:18:4647:44 | (...)... : List [<element>] : Object | provenance |  |
-| Test.java:4647:36:4647:43 | source(...) : Object | Test.java:4647:28:4647:44 | of(...) : List [<element>] : Object | provenance | MaD:558 |
+| Test.java:4647:36:4647:43 | source(...) : Object | Test.java:4647:28:4647:44 | of(...) : List [<element>] : Object | provenance | MaD:561 |
 | Test.java:4648:10:4648:35 | concat(...) : Iterable [<element>] : Object | Test.java:4649:20:4649:22 | out : Iterable [<element>] : Object | provenance |  |
 | Test.java:4648:27:4648:28 | in : List [<element>] : Object | Test.java:4648:10:4648:35 | concat(...) : Iterable [<element>] : Object | provenance | MaD:218 |
 | Test.java:4649:20:4649:22 | out : Iterable [<element>] : Object | Test.java:110:19:110:32 | it : Iterable [<element>] : Object | provenance |  |
-| Test.java:4649:20:4649:22 | out : Iterable [<element>] : Object | Test.java:4649:9:4649:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:4649:20:4649:22 | out : Iterable [<element>] : Object | Test.java:4649:9:4649:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:4654:18:4654:44 | (...)... : List [<element>] : Object | Test.java:4655:39:4655:40 | in : List [<element>] : Object | provenance |  |
 | Test.java:4654:28:4654:44 | of(...) : List [<element>] : Object | Test.java:4654:18:4654:44 | (...)... : List [<element>] : Object | provenance |  |
-| Test.java:4654:36:4654:43 | source(...) : Object | Test.java:4654:28:4654:44 | of(...) : List [<element>] : Object | provenance | MaD:558 |
+| Test.java:4654:36:4654:43 | source(...) : Object | Test.java:4654:28:4654:44 | of(...) : List [<element>] : Object | provenance | MaD:561 |
 | Test.java:4655:10:4655:41 | concat(...) : Iterable [<element>] : Object | Test.java:4656:20:4656:22 | out : Iterable [<element>] : Object | provenance |  |
 | Test.java:4655:39:4655:40 | in : List [<element>] : Object | Test.java:4655:10:4655:41 | concat(...) : Iterable [<element>] : Object | provenance | MaD:219 |
 | Test.java:4656:20:4656:22 | out : Iterable [<element>] : Object | Test.java:110:19:110:32 | it : Iterable [<element>] : Object | provenance |  |
-| Test.java:4656:20:4656:22 | out : Iterable [<element>] : Object | Test.java:4656:9:4656:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:4656:20:4656:22 | out : Iterable [<element>] : Object | Test.java:4656:9:4656:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:4661:18:4661:44 | (...)... : List [<element>] : Object | Test.java:4662:33:4662:34 | in : List [<element>] : Object | provenance |  |
 | Test.java:4661:28:4661:44 | of(...) : List [<element>] : Object | Test.java:4661:18:4661:44 | (...)... : List [<element>] : Object | provenance |  |
-| Test.java:4661:36:4661:43 | source(...) : Object | Test.java:4661:28:4661:44 | of(...) : List [<element>] : Object | provenance | MaD:558 |
+| Test.java:4661:36:4661:43 | source(...) : Object | Test.java:4661:28:4661:44 | of(...) : List [<element>] : Object | provenance | MaD:561 |
 | Test.java:4662:10:4662:41 | concat(...) : Iterable [<element>] : Object | Test.java:4663:20:4663:22 | out : Iterable [<element>] : Object | provenance |  |
 | Test.java:4662:33:4662:34 | in : List [<element>] : Object | Test.java:4662:10:4662:41 | concat(...) : Iterable [<element>] : Object | provenance | MaD:219 |
 | Test.java:4663:20:4663:22 | out : Iterable [<element>] : Object | Test.java:110:19:110:32 | it : Iterable [<element>] : Object | provenance |  |
-| Test.java:4663:20:4663:22 | out : Iterable [<element>] : Object | Test.java:4663:9:4663:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:4663:20:4663:22 | out : Iterable [<element>] : Object | Test.java:4663:9:4663:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:4668:18:4668:44 | (...)... : List [<element>] : Object | Test.java:4669:27:4669:28 | in : List [<element>] : Object | provenance |  |
 | Test.java:4668:28:4668:44 | of(...) : List [<element>] : Object | Test.java:4668:18:4668:44 | (...)... : List [<element>] : Object | provenance |  |
-| Test.java:4668:36:4668:43 | source(...) : Object | Test.java:4668:28:4668:44 | of(...) : List [<element>] : Object | provenance | MaD:558 |
+| Test.java:4668:36:4668:43 | source(...) : Object | Test.java:4668:28:4668:44 | of(...) : List [<element>] : Object | provenance | MaD:561 |
 | Test.java:4669:10:4669:41 | concat(...) : Iterable [<element>] : Object | Test.java:4670:20:4670:22 | out : Iterable [<element>] : Object | provenance |  |
 | Test.java:4669:27:4669:28 | in : List [<element>] : Object | Test.java:4669:10:4669:41 | concat(...) : Iterable [<element>] : Object | provenance | MaD:219 |
 | Test.java:4670:20:4670:22 | out : Iterable [<element>] : Object | Test.java:110:19:110:32 | it : Iterable [<element>] : Object | provenance |  |
-| Test.java:4670:20:4670:22 | out : Iterable [<element>] : Object | Test.java:4670:9:4670:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:4670:20:4670:22 | out : Iterable [<element>] : Object | Test.java:4670:9:4670:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:4675:18:4675:44 | (...)... : List [<element>] : Object | Test.java:4676:45:4676:46 | in : List [<element>] : Object | provenance |  |
 | Test.java:4675:28:4675:44 | of(...) : List [<element>] : Object | Test.java:4675:18:4675:44 | (...)... : List [<element>] : Object | provenance |  |
-| Test.java:4675:36:4675:43 | source(...) : Object | Test.java:4675:28:4675:44 | of(...) : List [<element>] : Object | provenance | MaD:558 |
+| Test.java:4675:36:4675:43 | source(...) : Object | Test.java:4675:28:4675:44 | of(...) : List [<element>] : Object | provenance | MaD:561 |
 | Test.java:4676:10:4676:47 | concat(...) : Iterable [<element>] : Object | Test.java:4677:20:4677:22 | out : Iterable [<element>] : Object | provenance |  |
 | Test.java:4676:45:4676:46 | in : List [<element>] : Object | Test.java:4676:10:4676:47 | concat(...) : Iterable [<element>] : Object | provenance | MaD:220 |
 | Test.java:4677:20:4677:22 | out : Iterable [<element>] : Object | Test.java:110:19:110:32 | it : Iterable [<element>] : Object | provenance |  |
-| Test.java:4677:20:4677:22 | out : Iterable [<element>] : Object | Test.java:4677:9:4677:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:4677:20:4677:22 | out : Iterable [<element>] : Object | Test.java:4677:9:4677:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:4682:18:4682:44 | (...)... : List [<element>] : Object | Test.java:4683:39:4683:40 | in : List [<element>] : Object | provenance |  |
 | Test.java:4682:28:4682:44 | of(...) : List [<element>] : Object | Test.java:4682:18:4682:44 | (...)... : List [<element>] : Object | provenance |  |
-| Test.java:4682:36:4682:43 | source(...) : Object | Test.java:4682:28:4682:44 | of(...) : List [<element>] : Object | provenance | MaD:558 |
+| Test.java:4682:36:4682:43 | source(...) : Object | Test.java:4682:28:4682:44 | of(...) : List [<element>] : Object | provenance | MaD:561 |
 | Test.java:4683:10:4683:47 | concat(...) : Iterable [<element>] : Object | Test.java:4684:20:4684:22 | out : Iterable [<element>] : Object | provenance |  |
 | Test.java:4683:39:4683:40 | in : List [<element>] : Object | Test.java:4683:10:4683:47 | concat(...) : Iterable [<element>] : Object | provenance | MaD:220 |
 | Test.java:4684:20:4684:22 | out : Iterable [<element>] : Object | Test.java:110:19:110:32 | it : Iterable [<element>] : Object | provenance |  |
-| Test.java:4684:20:4684:22 | out : Iterable [<element>] : Object | Test.java:4684:9:4684:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:4684:20:4684:22 | out : Iterable [<element>] : Object | Test.java:4684:9:4684:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:4689:18:4689:44 | (...)... : List [<element>] : Object | Test.java:4690:33:4690:34 | in : List [<element>] : Object | provenance |  |
 | Test.java:4689:28:4689:44 | of(...) : List [<element>] : Object | Test.java:4689:18:4689:44 | (...)... : List [<element>] : Object | provenance |  |
-| Test.java:4689:36:4689:43 | source(...) : Object | Test.java:4689:28:4689:44 | of(...) : List [<element>] : Object | provenance | MaD:558 |
+| Test.java:4689:36:4689:43 | source(...) : Object | Test.java:4689:28:4689:44 | of(...) : List [<element>] : Object | provenance | MaD:561 |
 | Test.java:4690:10:4690:47 | concat(...) : Iterable [<element>] : Object | Test.java:4691:20:4691:22 | out : Iterable [<element>] : Object | provenance |  |
 | Test.java:4690:33:4690:34 | in : List [<element>] : Object | Test.java:4690:10:4690:47 | concat(...) : Iterable [<element>] : Object | provenance | MaD:220 |
 | Test.java:4691:20:4691:22 | out : Iterable [<element>] : Object | Test.java:110:19:110:32 | it : Iterable [<element>] : Object | provenance |  |
-| Test.java:4691:20:4691:22 | out : Iterable [<element>] : Object | Test.java:4691:9:4691:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:4691:20:4691:22 | out : Iterable [<element>] : Object | Test.java:4691:9:4691:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:4696:18:4696:44 | (...)... : List [<element>] : Object | Test.java:4697:27:4697:28 | in : List [<element>] : Object | provenance |  |
 | Test.java:4696:28:4696:44 | of(...) : List [<element>] : Object | Test.java:4696:18:4696:44 | (...)... : List [<element>] : Object | provenance |  |
-| Test.java:4696:36:4696:43 | source(...) : Object | Test.java:4696:28:4696:44 | of(...) : List [<element>] : Object | provenance | MaD:558 |
+| Test.java:4696:36:4696:43 | source(...) : Object | Test.java:4696:28:4696:44 | of(...) : List [<element>] : Object | provenance | MaD:561 |
 | Test.java:4697:10:4697:47 | concat(...) : Iterable [<element>] : Object | Test.java:4698:20:4698:22 | out : Iterable [<element>] : Object | provenance |  |
 | Test.java:4697:27:4697:28 | in : List [<element>] : Object | Test.java:4697:10:4697:47 | concat(...) : Iterable [<element>] : Object | provenance | MaD:220 |
 | Test.java:4698:20:4698:22 | out : Iterable [<element>] : Object | Test.java:110:19:110:32 | it : Iterable [<element>] : Object | provenance |  |
-| Test.java:4698:20:4698:22 | out : Iterable [<element>] : Object | Test.java:4698:9:4698:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:4698:20:4698:22 | out : Iterable [<element>] : Object | Test.java:4698:9:4698:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:4703:20:4703:74 | (...)... : Iterable[] [[], <element>] : Object | Test.java:4704:27:4704:28 | in : Iterable[] [[], <element>] : Object | provenance |  |
 | Test.java:4703:32:4703:74 | {...} : Iterable[] [[], <element>] : Object | Test.java:4703:20:4703:74 | (...)... : Iterable[] [[], <element>] : Object | provenance |  |
 | Test.java:4703:47:4703:73 | (...)... : List [<element>] : Object | Test.java:4703:32:4703:74 | {...} : Iterable[] [[], <element>] : Object | provenance |  |
 | Test.java:4703:57:4703:73 | of(...) : List [<element>] : Object | Test.java:4703:47:4703:73 | (...)... : List [<element>] : Object | provenance |  |
-| Test.java:4703:65:4703:72 | source(...) : Object | Test.java:4703:57:4703:73 | of(...) : List [<element>] : Object | provenance | MaD:558 |
+| Test.java:4703:65:4703:72 | source(...) : Object | Test.java:4703:57:4703:73 | of(...) : List [<element>] : Object | provenance | MaD:561 |
 | Test.java:4704:10:4704:29 | concat(...) : Iterable [<element>] : Object | Test.java:4705:20:4705:22 | out : Iterable [<element>] : Object | provenance |  |
 | Test.java:4704:27:4704:28 | in : Iterable[] [[], <element>] : Object | Test.java:4704:10:4704:29 | concat(...) : Iterable [<element>] : Object | provenance | MaD:221 |
 | Test.java:4705:20:4705:22 | out : Iterable [<element>] : Object | Test.java:110:19:110:32 | it : Iterable [<element>] : Object | provenance |  |
-| Test.java:4705:20:4705:22 | out : Iterable [<element>] : Object | Test.java:4705:9:4705:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:4705:20:4705:22 | out : Iterable [<element>] : Object | Test.java:4705:9:4705:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:4710:18:4710:44 | (...)... : List [<element>] : Object | Test.java:4711:38:4711:39 | in : List [<element>] : Object | provenance |  |
 | Test.java:4710:28:4710:44 | of(...) : List [<element>] : Object | Test.java:4710:18:4710:44 | (...)... : List [<element>] : Object | provenance |  |
-| Test.java:4710:36:4710:43 | source(...) : Object | Test.java:4710:28:4710:44 | of(...) : List [<element>] : Object | provenance | MaD:558 |
+| Test.java:4710:36:4710:43 | source(...) : Object | Test.java:4710:28:4710:44 | of(...) : List [<element>] : Object | provenance | MaD:561 |
 | Test.java:4711:10:4711:40 | consumingIterable(...) : Iterable [<element>] : Object | Test.java:4712:20:4712:22 | out : Iterable [<element>] : Object | provenance |  |
 | Test.java:4711:38:4711:39 | in : List [<element>] : Object | Test.java:4711:10:4711:40 | consumingIterable(...) : Iterable [<element>] : Object | provenance | MaD:222 |
 | Test.java:4712:20:4712:22 | out : Iterable [<element>] : Object | Test.java:110:19:110:32 | it : Iterable [<element>] : Object | provenance |  |
-| Test.java:4712:20:4712:22 | out : Iterable [<element>] : Object | Test.java:4712:9:4712:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:4712:20:4712:22 | out : Iterable [<element>] : Object | Test.java:4712:9:4712:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:4717:18:4717:44 | (...)... : List [<element>] : Object | Test.java:4718:26:4718:27 | in : List [<element>] : Object | provenance |  |
 | Test.java:4717:28:4717:44 | of(...) : List [<element>] : Object | Test.java:4717:18:4717:44 | (...)... : List [<element>] : Object | provenance |  |
-| Test.java:4717:36:4717:43 | source(...) : Object | Test.java:4717:28:4717:44 | of(...) : List [<element>] : Object | provenance | MaD:558 |
+| Test.java:4717:36:4717:43 | source(...) : Object | Test.java:4717:28:4717:44 | of(...) : List [<element>] : Object | provenance | MaD:561 |
 | Test.java:4718:10:4718:28 | cycle(...) : Iterable [<element>] : Object | Test.java:4719:20:4719:22 | out : Iterable [<element>] : Object | provenance |  |
 | Test.java:4718:26:4718:27 | in : List [<element>] : Object | Test.java:4718:10:4718:28 | cycle(...) : Iterable [<element>] : Object | provenance | MaD:223 |
 | Test.java:4719:20:4719:22 | out : Iterable [<element>] : Object | Test.java:110:19:110:32 | it : Iterable [<element>] : Object | provenance |  |
-| Test.java:4719:20:4719:22 | out : Iterable [<element>] : Object | Test.java:4719:9:4719:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:4719:20:4719:22 | out : Iterable [<element>] : Object | Test.java:4719:9:4719:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:4724:18:4724:49 | (...)... : Object[] [[]] : Object | Test.java:4725:26:4725:27 | in : Object[] [[]] : Object | provenance |  |
 | Test.java:4724:28:4724:49 | {...} : Object[] [[]] : Object | Test.java:4724:18:4724:49 | (...)... : Object[] [[]] : Object | provenance |  |
 | Test.java:4724:41:4724:48 | source(...) : Object | Test.java:4724:28:4724:49 | {...} : Object[] [[]] : Object | provenance |  |
 | Test.java:4725:10:4725:28 | cycle(...) : Iterable [<element>] : Object | Test.java:4726:20:4726:22 | out : Iterable [<element>] : Object | provenance |  |
 | Test.java:4725:26:4725:27 | in : Object[] [[]] : Object | Test.java:4725:10:4725:28 | cycle(...) : Iterable [<element>] : Object | provenance | MaD:224 |
 | Test.java:4726:20:4726:22 | out : Iterable [<element>] : Object | Test.java:110:19:110:32 | it : Iterable [<element>] : Object | provenance |  |
-| Test.java:4726:20:4726:22 | out : Iterable [<element>] : Object | Test.java:4726:9:4726:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:4726:20:4726:22 | out : Iterable [<element>] : Object | Test.java:4726:9:4726:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:4731:18:4731:44 | (...)... : List [<element>] : Object | Test.java:4732:27:4732:28 | in : List [<element>] : Object | provenance |  |
 | Test.java:4731:28:4731:44 | of(...) : List [<element>] : Object | Test.java:4731:18:4731:44 | (...)... : List [<element>] : Object | provenance |  |
-| Test.java:4731:36:4731:43 | source(...) : Object | Test.java:4731:28:4731:44 | of(...) : List [<element>] : Object | provenance | MaD:558 |
+| Test.java:4731:36:4731:43 | source(...) : Object | Test.java:4731:28:4731:44 | of(...) : List [<element>] : Object | provenance | MaD:561 |
 | Test.java:4732:10:4732:42 | filter(...) : Iterable [<element>] : Object | Test.java:4733:20:4733:22 | out : Iterable [<element>] : Object | provenance |  |
 | Test.java:4732:27:4732:28 | in : List [<element>] : Object | Test.java:4732:10:4732:42 | filter(...) : Iterable [<element>] : Object | provenance | MaD:225 |
 | Test.java:4733:20:4733:22 | out : Iterable [<element>] : Object | Test.java:110:19:110:32 | it : Iterable [<element>] : Object | provenance |  |
-| Test.java:4733:20:4733:22 | out : Iterable [<element>] : Object | Test.java:4733:9:4733:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:4733:20:4733:22 | out : Iterable [<element>] : Object | Test.java:4733:9:4733:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:4738:18:4738:44 | (...)... : List [<element>] : Object | Test.java:4739:27:4739:28 | in : List [<element>] : Object | provenance |  |
 | Test.java:4738:28:4738:44 | of(...) : List [<element>] : Object | Test.java:4738:18:4738:44 | (...)... : List [<element>] : Object | provenance |  |
-| Test.java:4738:36:4738:43 | source(...) : Object | Test.java:4738:28:4738:44 | of(...) : List [<element>] : Object | provenance | MaD:558 |
+| Test.java:4738:36:4738:43 | source(...) : Object | Test.java:4738:28:4738:44 | of(...) : List [<element>] : Object | provenance | MaD:561 |
 | Test.java:4739:10:4739:46 | filter(...) : Iterable [<element>] : Object | Test.java:4740:20:4740:22 | out : Iterable [<element>] : Object | provenance |  |
 | Test.java:4739:27:4739:28 | in : List [<element>] : Object | Test.java:4739:10:4739:46 | filter(...) : Iterable [<element>] : Object | provenance | MaD:226 |
 | Test.java:4740:20:4740:22 | out : Iterable [<element>] : Object | Test.java:110:19:110:32 | it : Iterable [<element>] : Object | provenance |  |
-| Test.java:4740:20:4740:22 | out : Iterable [<element>] : Object | Test.java:4740:9:4740:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:4740:20:4740:22 | out : Iterable [<element>] : Object | Test.java:4740:9:4740:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:4745:18:4745:44 | (...)... : List [<element>] : Object | Test.java:4746:25:4746:26 | in : List [<element>] : Object | provenance |  |
 | Test.java:4745:28:4745:44 | of(...) : List [<element>] : Object | Test.java:4745:18:4745:44 | (...)... : List [<element>] : Object | provenance |  |
-| Test.java:4745:36:4745:43 | source(...) : Object | Test.java:4745:28:4745:44 | of(...) : List [<element>] : Object | provenance | MaD:558 |
+| Test.java:4745:36:4745:43 | source(...) : Object | Test.java:4745:28:4745:44 | of(...) : List [<element>] : Object | provenance | MaD:561 |
 | Test.java:4746:10:4746:33 | find(...) : Object | Test.java:4747:9:4747:11 | out | provenance |  |
 | Test.java:4746:25:4746:26 | in : List [<element>] : Object | Test.java:4746:10:4746:33 | find(...) : Object | provenance | MaD:227 |
 | Test.java:4752:16:4752:31 | (...)... : Object | Test.java:4753:37:4753:38 | in : Object | provenance |  |
@@ -5302,12 +5302,12 @@ edges
 | Test.java:4753:37:4753:38 | in : Object | Test.java:4753:10:4753:39 | find(...) : Object | provenance | MaD:229 |
 | Test.java:4759:18:4759:44 | (...)... : List [<element>] : Object | Test.java:4760:25:4760:26 | in : List [<element>] : Object | provenance |  |
 | Test.java:4759:28:4759:44 | of(...) : List [<element>] : Object | Test.java:4759:18:4759:44 | (...)... : List [<element>] : Object | provenance |  |
-| Test.java:4759:36:4759:43 | source(...) : Object | Test.java:4759:28:4759:44 | of(...) : List [<element>] : Object | provenance | MaD:558 |
+| Test.java:4759:36:4759:43 | source(...) : Object | Test.java:4759:28:4759:44 | of(...) : List [<element>] : Object | provenance | MaD:561 |
 | Test.java:4760:10:4760:39 | find(...) : Object | Test.java:4761:9:4761:11 | out | provenance |  |
 | Test.java:4760:25:4760:26 | in : List [<element>] : Object | Test.java:4760:10:4760:39 | find(...) : Object | provenance | MaD:228 |
 | Test.java:4766:18:4766:44 | (...)... : List [<element>] : Object | Test.java:4767:24:4767:25 | in : List [<element>] : Object | provenance |  |
 | Test.java:4766:28:4766:44 | of(...) : List [<element>] : Object | Test.java:4766:18:4766:44 | (...)... : List [<element>] : Object | provenance |  |
-| Test.java:4766:36:4766:43 | source(...) : Object | Test.java:4766:28:4766:44 | of(...) : List [<element>] : Object | provenance | MaD:558 |
+| Test.java:4766:36:4766:43 | source(...) : Object | Test.java:4766:28:4766:44 | of(...) : List [<element>] : Object | provenance | MaD:561 |
 | Test.java:4767:10:4767:29 | get(...) : Object | Test.java:4768:9:4768:11 | out | provenance |  |
 | Test.java:4767:24:4767:25 | in : List [<element>] : Object | Test.java:4767:10:4767:29 | get(...) : Object | provenance | MaD:230 |
 | Test.java:4773:16:4773:31 | (...)... : Object | Test.java:4774:33:4774:34 | in : Object | provenance |  |
@@ -5316,12 +5316,12 @@ edges
 | Test.java:4774:33:4774:34 | in : Object | Test.java:4774:10:4774:35 | get(...) : Object | provenance | MaD:232 |
 | Test.java:4780:18:4780:44 | (...)... : List [<element>] : Object | Test.java:4781:24:4781:25 | in : List [<element>] : Object | provenance |  |
 | Test.java:4780:28:4780:44 | of(...) : List [<element>] : Object | Test.java:4780:18:4780:44 | (...)... : List [<element>] : Object | provenance |  |
-| Test.java:4780:36:4780:43 | source(...) : Object | Test.java:4780:28:4780:44 | of(...) : List [<element>] : Object | provenance | MaD:558 |
+| Test.java:4780:36:4780:43 | source(...) : Object | Test.java:4780:28:4780:44 | of(...) : List [<element>] : Object | provenance | MaD:561 |
 | Test.java:4781:10:4781:35 | get(...) : Object | Test.java:4782:9:4782:11 | out | provenance |  |
 | Test.java:4781:24:4781:25 | in : List [<element>] : Object | Test.java:4781:10:4781:35 | get(...) : Object | provenance | MaD:231 |
 | Test.java:4787:18:4787:44 | (...)... : List [<element>] : Object | Test.java:4788:28:4788:29 | in : List [<element>] : Object | provenance |  |
 | Test.java:4787:28:4787:44 | of(...) : List [<element>] : Object | Test.java:4787:18:4787:44 | (...)... : List [<element>] : Object | provenance |  |
-| Test.java:4787:36:4787:43 | source(...) : Object | Test.java:4787:28:4787:44 | of(...) : List [<element>] : Object | provenance | MaD:558 |
+| Test.java:4787:36:4787:43 | source(...) : Object | Test.java:4787:28:4787:44 | of(...) : List [<element>] : Object | provenance | MaD:561 |
 | Test.java:4788:10:4788:30 | getLast(...) : Object | Test.java:4789:9:4789:11 | out | provenance |  |
 | Test.java:4788:28:4788:29 | in : List [<element>] : Object | Test.java:4788:10:4788:30 | getLast(...) : Object | provenance | MaD:233 |
 | Test.java:4794:16:4794:31 | (...)... : Object | Test.java:4795:34:4795:35 | in : Object | provenance |  |
@@ -5330,12 +5330,12 @@ edges
 | Test.java:4795:34:4795:35 | in : Object | Test.java:4795:10:4795:36 | getLast(...) : Object | provenance | MaD:235 |
 | Test.java:4801:18:4801:44 | (...)... : List [<element>] : Object | Test.java:4802:28:4802:29 | in : List [<element>] : Object | provenance |  |
 | Test.java:4801:28:4801:44 | of(...) : List [<element>] : Object | Test.java:4801:18:4801:44 | (...)... : List [<element>] : Object | provenance |  |
-| Test.java:4801:36:4801:43 | source(...) : Object | Test.java:4801:28:4801:44 | of(...) : List [<element>] : Object | provenance | MaD:558 |
+| Test.java:4801:36:4801:43 | source(...) : Object | Test.java:4801:28:4801:44 | of(...) : List [<element>] : Object | provenance | MaD:561 |
 | Test.java:4802:10:4802:36 | getLast(...) : Object | Test.java:4803:9:4803:11 | out | provenance |  |
 | Test.java:4802:28:4802:29 | in : List [<element>] : Object | Test.java:4802:10:4802:36 | getLast(...) : Object | provenance | MaD:234 |
 | Test.java:4808:18:4808:44 | (...)... : List [<element>] : Object | Test.java:4809:35:4809:36 | in : List [<element>] : Object | provenance |  |
 | Test.java:4808:28:4808:44 | of(...) : List [<element>] : Object | Test.java:4808:18:4808:44 | (...)... : List [<element>] : Object | provenance |  |
-| Test.java:4808:36:4808:43 | source(...) : Object | Test.java:4808:28:4808:44 | of(...) : List [<element>] : Object | provenance | MaD:558 |
+| Test.java:4808:36:4808:43 | source(...) : Object | Test.java:4808:28:4808:44 | of(...) : List [<element>] : Object | provenance | MaD:561 |
 | Test.java:4809:10:4809:37 | getOnlyElement(...) : Object | Test.java:4810:9:4810:11 | out | provenance |  |
 | Test.java:4809:35:4809:36 | in : List [<element>] : Object | Test.java:4809:10:4809:37 | getOnlyElement(...) : Object | provenance | MaD:236 |
 | Test.java:4815:16:4815:31 | (...)... : Object | Test.java:4816:41:4816:42 | in : Object | provenance |  |
@@ -5344,59 +5344,59 @@ edges
 | Test.java:4816:41:4816:42 | in : Object | Test.java:4816:10:4816:43 | getOnlyElement(...) : Object | provenance | MaD:238 |
 | Test.java:4822:18:4822:44 | (...)... : List [<element>] : Object | Test.java:4823:35:4823:36 | in : List [<element>] : Object | provenance |  |
 | Test.java:4822:28:4822:44 | of(...) : List [<element>] : Object | Test.java:4822:18:4822:44 | (...)... : List [<element>] : Object | provenance |  |
-| Test.java:4822:36:4822:43 | source(...) : Object | Test.java:4822:28:4822:44 | of(...) : List [<element>] : Object | provenance | MaD:558 |
+| Test.java:4822:36:4822:43 | source(...) : Object | Test.java:4822:28:4822:44 | of(...) : List [<element>] : Object | provenance | MaD:561 |
 | Test.java:4823:10:4823:43 | getOnlyElement(...) : Object | Test.java:4824:9:4824:11 | out | provenance |  |
 | Test.java:4823:35:4823:36 | in : List [<element>] : Object | Test.java:4823:10:4823:43 | getOnlyElement(...) : Object | provenance | MaD:237 |
 | Test.java:4829:18:4829:44 | (...)... : List [<element>] : Object | Test.java:4830:26:4830:27 | in : List [<element>] : Object | provenance |  |
 | Test.java:4829:28:4829:44 | of(...) : List [<element>] : Object | Test.java:4829:18:4829:44 | (...)... : List [<element>] : Object | provenance |  |
-| Test.java:4829:36:4829:43 | source(...) : Object | Test.java:4829:28:4829:44 | of(...) : List [<element>] : Object | provenance | MaD:558 |
+| Test.java:4829:36:4829:43 | source(...) : Object | Test.java:4829:28:4829:44 | of(...) : List [<element>] : Object | provenance | MaD:561 |
 | Test.java:4830:10:4830:31 | limit(...) : Iterable [<element>] : Object | Test.java:4831:20:4831:22 | out : Iterable [<element>] : Object | provenance |  |
 | Test.java:4830:26:4830:27 | in : List [<element>] : Object | Test.java:4830:10:4830:31 | limit(...) : Iterable [<element>] : Object | provenance | MaD:239 |
 | Test.java:4831:20:4831:22 | out : Iterable [<element>] : Object | Test.java:110:19:110:32 | it : Iterable [<element>] : Object | provenance |  |
-| Test.java:4831:20:4831:22 | out : Iterable [<element>] : Object | Test.java:4831:9:4831:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:4831:20:4831:22 | out : Iterable [<element>] : Object | Test.java:4831:9:4831:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:4836:18:4836:53 | (...)... : List [<element>, <element>] : Object | Test.java:4837:32:4837:33 | in : List [<element>, <element>] : Object | provenance |  |
 | Test.java:4836:28:4836:53 | of(...) : List [<element>, <element>] : Object | Test.java:4836:18:4836:53 | (...)... : List [<element>, <element>] : Object | provenance |  |
-| Test.java:4836:36:4836:52 | of(...) : List [<element>] : Object | Test.java:4836:28:4836:53 | of(...) : List [<element>, <element>] : Object | provenance | MaD:558 |
-| Test.java:4836:44:4836:51 | source(...) : Object | Test.java:4836:36:4836:52 | of(...) : List [<element>] : Object | provenance | MaD:558 |
+| Test.java:4836:36:4836:52 | of(...) : List [<element>] : Object | Test.java:4836:28:4836:53 | of(...) : List [<element>, <element>] : Object | provenance | MaD:561 |
+| Test.java:4836:44:4836:51 | source(...) : Object | Test.java:4836:36:4836:52 | of(...) : List [<element>] : Object | provenance | MaD:561 |
 | Test.java:4837:10:4837:40 | mergeSorted(...) : Iterable [<element>] : Object | Test.java:4838:20:4838:22 | out : Iterable [<element>] : Object | provenance |  |
 | Test.java:4837:32:4837:33 | in : List [<element>, <element>] : Object | Test.java:4837:10:4837:40 | mergeSorted(...) : Iterable [<element>] : Object | provenance | MaD:240 |
 | Test.java:4838:20:4838:22 | out : Iterable [<element>] : Object | Test.java:110:19:110:32 | it : Iterable [<element>] : Object | provenance |  |
-| Test.java:4838:20:4838:22 | out : Iterable [<element>] : Object | Test.java:4838:9:4838:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:4838:20:4838:22 | out : Iterable [<element>] : Object | Test.java:4838:9:4838:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:4843:18:4843:44 | (...)... : List [<element>] : Object | Test.java:4844:36:4844:37 | in : List [<element>] : Object | provenance |  |
 | Test.java:4843:28:4843:44 | of(...) : List [<element>] : Object | Test.java:4843:18:4843:44 | (...)... : List [<element>] : Object | provenance |  |
-| Test.java:4843:36:4843:43 | source(...) : Object | Test.java:4843:28:4843:44 | of(...) : List [<element>] : Object | provenance | MaD:558 |
+| Test.java:4843:36:4843:43 | source(...) : Object | Test.java:4843:28:4843:44 | of(...) : List [<element>] : Object | provenance | MaD:561 |
 | Test.java:4844:10:4844:41 | paddedPartition(...) : Iterable [<element>, <element>] : Object | Test.java:4845:31:4845:33 | out : Iterable [<element>, <element>] : Object | provenance |  |
 | Test.java:4844:36:4844:37 | in : List [<element>] : Object | Test.java:4844:10:4844:41 | paddedPartition(...) : Iterable [<element>, <element>] : Object | provenance | MaD:241 |
 | Test.java:4845:20:4845:34 | getElement(...) : List [<element>] : Object | Test.java:110:19:110:32 | it : List [<element>] : Object | provenance |  |
-| Test.java:4845:20:4845:34 | getElement(...) : List [<element>] : Object | Test.java:4845:9:4845:35 | getElement(...) | provenance | MaD:555 |
+| Test.java:4845:20:4845:34 | getElement(...) : List [<element>] : Object | Test.java:4845:9:4845:35 | getElement(...) | provenance | MaD:558 |
 | Test.java:4845:31:4845:33 | out : Iterable [<element>, <element>] : Object | Test.java:110:19:110:32 | it : Iterable [<element>, <element>] : Object | provenance |  |
-| Test.java:4845:31:4845:33 | out : Iterable [<element>, <element>] : Object | Test.java:4845:20:4845:34 | getElement(...) : List [<element>] : Object | provenance | MaD:555 |
+| Test.java:4845:31:4845:33 | out : Iterable [<element>, <element>] : Object | Test.java:4845:20:4845:34 | getElement(...) : List [<element>] : Object | provenance | MaD:558 |
 | Test.java:4850:18:4850:44 | (...)... : List [<element>] : Object | Test.java:4851:30:4851:31 | in : List [<element>] : Object | provenance |  |
 | Test.java:4850:28:4850:44 | of(...) : List [<element>] : Object | Test.java:4850:18:4850:44 | (...)... : List [<element>] : Object | provenance |  |
-| Test.java:4850:36:4850:43 | source(...) : Object | Test.java:4850:28:4850:44 | of(...) : List [<element>] : Object | provenance | MaD:558 |
+| Test.java:4850:36:4850:43 | source(...) : Object | Test.java:4850:28:4850:44 | of(...) : List [<element>] : Object | provenance | MaD:561 |
 | Test.java:4851:10:4851:35 | partition(...) : Iterable [<element>, <element>] : Object | Test.java:4852:31:4852:33 | out : Iterable [<element>, <element>] : Object | provenance |  |
 | Test.java:4851:30:4851:31 | in : List [<element>] : Object | Test.java:4851:10:4851:35 | partition(...) : Iterable [<element>, <element>] : Object | provenance | MaD:242 |
 | Test.java:4852:20:4852:34 | getElement(...) : List [<element>] : Object | Test.java:110:19:110:32 | it : List [<element>] : Object | provenance |  |
-| Test.java:4852:20:4852:34 | getElement(...) : List [<element>] : Object | Test.java:4852:9:4852:35 | getElement(...) | provenance | MaD:555 |
+| Test.java:4852:20:4852:34 | getElement(...) : List [<element>] : Object | Test.java:4852:9:4852:35 | getElement(...) | provenance | MaD:558 |
 | Test.java:4852:31:4852:33 | out : Iterable [<element>, <element>] : Object | Test.java:110:19:110:32 | it : Iterable [<element>, <element>] : Object | provenance |  |
-| Test.java:4852:31:4852:33 | out : Iterable [<element>, <element>] : Object | Test.java:4852:20:4852:34 | getElement(...) : List [<element>] : Object | provenance | MaD:555 |
+| Test.java:4852:31:4852:33 | out : Iterable [<element>, <element>] : Object | Test.java:4852:20:4852:34 | getElement(...) : List [<element>] : Object | provenance | MaD:558 |
 | Test.java:4857:18:4857:44 | (...)... : List [<element>] : Object | Test.java:4858:25:4858:26 | in : List [<element>] : Object | provenance |  |
 | Test.java:4857:28:4857:44 | of(...) : List [<element>] : Object | Test.java:4857:18:4857:44 | (...)... : List [<element>] : Object | provenance |  |
-| Test.java:4857:36:4857:43 | source(...) : Object | Test.java:4857:28:4857:44 | of(...) : List [<element>] : Object | provenance | MaD:558 |
+| Test.java:4857:36:4857:43 | source(...) : Object | Test.java:4857:28:4857:44 | of(...) : List [<element>] : Object | provenance | MaD:561 |
 | Test.java:4858:10:4858:30 | skip(...) : Iterable [<element>] : Object | Test.java:4859:20:4859:22 | out : Iterable [<element>] : Object | provenance |  |
 | Test.java:4858:25:4858:26 | in : List [<element>] : Object | Test.java:4858:10:4858:30 | skip(...) : Iterable [<element>] : Object | provenance | MaD:243 |
 | Test.java:4859:20:4859:22 | out : Iterable [<element>] : Object | Test.java:110:19:110:32 | it : Iterable [<element>] : Object | provenance |  |
-| Test.java:4859:20:4859:22 | out : Iterable [<element>] : Object | Test.java:4859:9:4859:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:4859:20:4859:22 | out : Iterable [<element>] : Object | Test.java:4859:9:4859:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:4864:18:4864:44 | (...)... : List [<element>] : Object | Test.java:4865:28:4865:29 | in : List [<element>] : Object | provenance |  |
 | Test.java:4864:28:4864:44 | of(...) : List [<element>] : Object | Test.java:4864:18:4864:44 | (...)... : List [<element>] : Object | provenance |  |
-| Test.java:4864:36:4864:43 | source(...) : Object | Test.java:4864:28:4864:44 | of(...) : List [<element>] : Object | provenance | MaD:558 |
+| Test.java:4864:36:4864:43 | source(...) : Object | Test.java:4864:28:4864:44 | of(...) : List [<element>] : Object | provenance | MaD:561 |
 | Test.java:4865:10:4865:43 | toArray(...) : Object[] [[]] : Object | Test.java:4866:25:4866:27 | out : Object[] [[]] : Object | provenance |  |
 | Test.java:4865:28:4865:29 | in : List [<element>] : Object | Test.java:4865:10:4865:43 | toArray(...) : Object[] [[]] : Object | provenance | MaD:244 |
 | Test.java:4866:25:4866:27 | out : Object[] [[]] : Object | Test.java:107:24:107:32 | array : Object[] [[]] : Object | provenance |  |
 | Test.java:4866:25:4866:27 | out : Object[] [[]] : Object | Test.java:4866:9:4866:28 | getArrayElement(...) | provenance |  |
 | Test.java:4878:18:4878:44 | (...)... : List [<element>] : Object | Test.java:4879:28:4879:29 | in : List [<element>] : Object | provenance |  |
 | Test.java:4878:28:4878:44 | of(...) : List [<element>] : Object | Test.java:4878:18:4878:44 | (...)... : List [<element>] : Object | provenance |  |
-| Test.java:4878:36:4878:43 | source(...) : Object | Test.java:4878:28:4878:44 | of(...) : List [<element>] : Object | provenance | MaD:558 |
+| Test.java:4878:36:4878:43 | source(...) : Object | Test.java:4878:28:4878:44 | of(...) : List [<element>] : Object | provenance | MaD:561 |
 | Test.java:4879:10:4879:36 | tryFind(...) : Optional [<element>] : Object | Test.java:4880:20:4880:22 | out : Optional [<element>] : Object | provenance |  |
 | Test.java:4879:28:4879:29 | in : List [<element>] : Object | Test.java:4879:10:4879:36 | tryFind(...) : Optional [<element>] : Object | provenance | MaD:245 |
 | Test.java:4880:20:4880:22 | out : Optional [<element>] : Object | Test.java:112:19:112:31 | o : Optional [<element>] : Object | provenance |  |
@@ -5407,164 +5407,164 @@ edges
 | Test.java:4886:10:4886:43 | unmodifiableIterable(...) : Iterable [<element>] : Object | Test.java:4887:20:4887:22 | out : Iterable [<element>] : Object | provenance |  |
 | Test.java:4886:41:4886:42 | in : ImmutableList [<element>] : Object | Test.java:4886:10:4886:43 | unmodifiableIterable(...) : Iterable [<element>] : Object | provenance | MaD:246 |
 | Test.java:4887:20:4887:22 | out : Iterable [<element>] : Object | Test.java:110:19:110:32 | it : Iterable [<element>] : Object | provenance |  |
-| Test.java:4887:20:4887:22 | out : Iterable [<element>] : Object | Test.java:4887:9:4887:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:4887:20:4887:22 | out : Iterable [<element>] : Object | Test.java:4887:9:4887:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:4892:18:4892:44 | (...)... : List [<element>] : Object | Test.java:4893:41:4893:42 | in : List [<element>] : Object | provenance |  |
 | Test.java:4892:28:4892:44 | of(...) : List [<element>] : Object | Test.java:4892:18:4892:44 | (...)... : List [<element>] : Object | provenance |  |
-| Test.java:4892:36:4892:43 | source(...) : Object | Test.java:4892:28:4892:44 | of(...) : List [<element>] : Object | provenance | MaD:558 |
+| Test.java:4892:36:4892:43 | source(...) : Object | Test.java:4892:28:4892:44 | of(...) : List [<element>] : Object | provenance | MaD:561 |
 | Test.java:4893:10:4893:43 | unmodifiableIterable(...) : Iterable [<element>] : Object | Test.java:4894:20:4894:22 | out : Iterable [<element>] : Object | provenance |  |
 | Test.java:4893:41:4893:42 | in : List [<element>] : Object | Test.java:4893:10:4893:43 | unmodifiableIterable(...) : Iterable [<element>] : Object | provenance | MaD:247 |
 | Test.java:4894:20:4894:22 | out : Iterable [<element>] : Object | Test.java:110:19:110:32 | it : Iterable [<element>] : Object | provenance |  |
-| Test.java:4894:20:4894:22 | out : Iterable [<element>] : Object | Test.java:4894:9:4894:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:4894:20:4894:22 | out : Iterable [<element>] : Object | Test.java:4894:9:4894:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:4899:18:4899:55 | (...)... : Iterator [<element>] : Object | Test.java:4900:26:4900:27 | in : Iterator [<element>] : Object | provenance |  |
-| Test.java:4899:28:4899:44 | of(...) : List [<element>] : Object | Test.java:4899:28:4899:55 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:555 |
+| Test.java:4899:28:4899:44 | of(...) : List [<element>] : Object | Test.java:4899:28:4899:55 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:558 |
 | Test.java:4899:28:4899:55 | iterator(...) : Iterator [<element>] : Object | Test.java:4899:18:4899:55 | (...)... : Iterator [<element>] : Object | provenance |  |
-| Test.java:4899:36:4899:43 | source(...) : Object | Test.java:4899:28:4899:44 | of(...) : List [<element>] : Object | provenance | MaD:558 |
+| Test.java:4899:36:4899:43 | source(...) : Object | Test.java:4899:28:4899:44 | of(...) : List [<element>] : Object | provenance | MaD:561 |
 | Test.java:4900:21:4900:23 | out [post update] : Collection [<element>] : Object | Test.java:4901:20:4901:22 | out : Collection [<element>] : Object | provenance |  |
 | Test.java:4900:26:4900:27 | in : Iterator [<element>] : Object | Test.java:4900:21:4900:23 | out [post update] : Collection [<element>] : Object | provenance | MaD:248 |
 | Test.java:4901:20:4901:22 | out : Collection [<element>] : Object | Test.java:110:19:110:32 | it : Collection [<element>] : Object | provenance |  |
-| Test.java:4901:20:4901:22 | out : Collection [<element>] : Object | Test.java:4901:9:4901:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:4901:20:4901:22 | out : Collection [<element>] : Object | Test.java:4901:9:4901:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:4906:18:4906:55 | (...)... : Iterator [<element>] : Object | Test.java:4907:34:4907:35 | in : Iterator [<element>] : Object | provenance |  |
-| Test.java:4906:28:4906:44 | of(...) : List [<element>] : Object | Test.java:4906:28:4906:55 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:555 |
+| Test.java:4906:28:4906:44 | of(...) : List [<element>] : Object | Test.java:4906:28:4906:55 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:558 |
 | Test.java:4906:28:4906:55 | iterator(...) : Iterator [<element>] : Object | Test.java:4906:18:4906:55 | (...)... : Iterator [<element>] : Object | provenance |  |
-| Test.java:4906:36:4906:43 | source(...) : Object | Test.java:4906:28:4906:44 | of(...) : List [<element>] : Object | provenance | MaD:558 |
+| Test.java:4906:36:4906:43 | source(...) : Object | Test.java:4906:28:4906:44 | of(...) : List [<element>] : Object | provenance | MaD:561 |
 | Test.java:4907:10:4907:36 | asEnumeration(...) : Enumeration [<element>] : Object | Test.java:4908:20:4908:22 | out : Enumeration [<element>] : Object | provenance |  |
 | Test.java:4907:34:4907:35 | in : Iterator [<element>] : Object | Test.java:4907:10:4907:36 | asEnumeration(...) : Enumeration [<element>] : Object | provenance | MaD:249 |
 | Test.java:4908:20:4908:22 | out : Enumeration [<element>] : Object | Test.java:108:19:108:35 | it : Enumeration [<element>] : Object | provenance |  |
-| Test.java:4908:20:4908:22 | out : Enumeration [<element>] : Object | Test.java:4908:9:4908:23 | getElement(...) | provenance | MaD:556 |
+| Test.java:4908:20:4908:22 | out : Enumeration [<element>] : Object | Test.java:4908:9:4908:23 | getElement(...) | provenance | MaD:559 |
 | Test.java:4913:18:4913:75 | (...)... : Iterator [<element>, <element>] : Object | Test.java:4914:27:4914:28 | in : Iterator [<element>, <element>] : Object | provenance |  |
-| Test.java:4913:28:4913:64 | of(...) : List [<element>, <element>] : Object | Test.java:4913:28:4913:75 | iterator(...) : Iterator [<element>, <element>] : Object | provenance | MaD:555 |
+| Test.java:4913:28:4913:64 | of(...) : List [<element>, <element>] : Object | Test.java:4913:28:4913:75 | iterator(...) : Iterator [<element>, <element>] : Object | provenance | MaD:558 |
 | Test.java:4913:28:4913:75 | iterator(...) : Iterator [<element>, <element>] : Object | Test.java:4913:18:4913:75 | (...)... : Iterator [<element>, <element>] : Object | provenance |  |
-| Test.java:4913:36:4913:52 | of(...) : List [<element>] : Object | Test.java:4913:36:4913:63 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:555 |
-| Test.java:4913:36:4913:63 | iterator(...) : Iterator [<element>] : Object | Test.java:4913:28:4913:64 | of(...) : List [<element>, <element>] : Object | provenance | MaD:558 |
-| Test.java:4913:44:4913:51 | source(...) : Object | Test.java:4913:36:4913:52 | of(...) : List [<element>] : Object | provenance | MaD:558 |
+| Test.java:4913:36:4913:52 | of(...) : List [<element>] : Object | Test.java:4913:36:4913:63 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:558 |
+| Test.java:4913:36:4913:63 | iterator(...) : Iterator [<element>] : Object | Test.java:4913:28:4913:64 | of(...) : List [<element>, <element>] : Object | provenance | MaD:561 |
+| Test.java:4913:44:4913:51 | source(...) : Object | Test.java:4913:36:4913:52 | of(...) : List [<element>] : Object | provenance | MaD:561 |
 | Test.java:4914:10:4914:29 | concat(...) : Iterator [<element>] : Object | Test.java:4915:20:4915:22 | out : Iterator [<element>] : Object | provenance |  |
 | Test.java:4914:27:4914:28 | in : Iterator [<element>, <element>] : Object | Test.java:4914:10:4914:29 | concat(...) : Iterator [<element>] : Object | provenance | MaD:250 |
 | Test.java:4915:20:4915:22 | out : Iterator [<element>] : Object | Test.java:111:19:111:32 | it : Iterator [<element>] : Object | provenance |  |
-| Test.java:4915:20:4915:22 | out : Iterator [<element>] : Object | Test.java:4915:9:4915:23 | getElement(...) | provenance | MaD:557 |
+| Test.java:4915:20:4915:22 | out : Iterator [<element>] : Object | Test.java:4915:9:4915:23 | getElement(...) | provenance | MaD:560 |
 | Test.java:4920:18:4920:55 | (...)... : Iterator [<element>] : Object | Test.java:4921:33:4921:34 | in : Iterator [<element>] : Object | provenance |  |
-| Test.java:4920:28:4920:44 | of(...) : List [<element>] : Object | Test.java:4920:28:4920:55 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:555 |
+| Test.java:4920:28:4920:44 | of(...) : List [<element>] : Object | Test.java:4920:28:4920:55 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:558 |
 | Test.java:4920:28:4920:55 | iterator(...) : Iterator [<element>] : Object | Test.java:4920:18:4920:55 | (...)... : Iterator [<element>] : Object | provenance |  |
-| Test.java:4920:36:4920:43 | source(...) : Object | Test.java:4920:28:4920:44 | of(...) : List [<element>] : Object | provenance | MaD:558 |
+| Test.java:4920:36:4920:43 | source(...) : Object | Test.java:4920:28:4920:44 | of(...) : List [<element>] : Object | provenance | MaD:561 |
 | Test.java:4921:10:4921:35 | concat(...) : Iterator [<element>] : Object | Test.java:4922:20:4922:22 | out : Iterator [<element>] : Object | provenance |  |
 | Test.java:4921:33:4921:34 | in : Iterator [<element>] : Object | Test.java:4921:10:4921:35 | concat(...) : Iterator [<element>] : Object | provenance | MaD:251 |
 | Test.java:4922:20:4922:22 | out : Iterator [<element>] : Object | Test.java:111:19:111:32 | it : Iterator [<element>] : Object | provenance |  |
-| Test.java:4922:20:4922:22 | out : Iterator [<element>] : Object | Test.java:4922:9:4922:23 | getElement(...) | provenance | MaD:557 |
+| Test.java:4922:20:4922:22 | out : Iterator [<element>] : Object | Test.java:4922:9:4922:23 | getElement(...) | provenance | MaD:560 |
 | Test.java:4927:18:4927:55 | (...)... : Iterator [<element>] : Object | Test.java:4928:27:4928:28 | in : Iterator [<element>] : Object | provenance |  |
-| Test.java:4927:28:4927:44 | of(...) : List [<element>] : Object | Test.java:4927:28:4927:55 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:555 |
+| Test.java:4927:28:4927:44 | of(...) : List [<element>] : Object | Test.java:4927:28:4927:55 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:558 |
 | Test.java:4927:28:4927:55 | iterator(...) : Iterator [<element>] : Object | Test.java:4927:18:4927:55 | (...)... : Iterator [<element>] : Object | provenance |  |
-| Test.java:4927:36:4927:43 | source(...) : Object | Test.java:4927:28:4927:44 | of(...) : List [<element>] : Object | provenance | MaD:558 |
+| Test.java:4927:36:4927:43 | source(...) : Object | Test.java:4927:28:4927:44 | of(...) : List [<element>] : Object | provenance | MaD:561 |
 | Test.java:4928:10:4928:35 | concat(...) : Iterator [<element>] : Object | Test.java:4929:20:4929:22 | out : Iterator [<element>] : Object | provenance |  |
 | Test.java:4928:27:4928:28 | in : Iterator [<element>] : Object | Test.java:4928:10:4928:35 | concat(...) : Iterator [<element>] : Object | provenance | MaD:251 |
 | Test.java:4929:20:4929:22 | out : Iterator [<element>] : Object | Test.java:111:19:111:32 | it : Iterator [<element>] : Object | provenance |  |
-| Test.java:4929:20:4929:22 | out : Iterator [<element>] : Object | Test.java:4929:9:4929:23 | getElement(...) | provenance | MaD:557 |
+| Test.java:4929:20:4929:22 | out : Iterator [<element>] : Object | Test.java:4929:9:4929:23 | getElement(...) | provenance | MaD:560 |
 | Test.java:4934:18:4934:55 | (...)... : Iterator [<element>] : Object | Test.java:4935:39:4935:40 | in : Iterator [<element>] : Object | provenance |  |
-| Test.java:4934:28:4934:44 | of(...) : List [<element>] : Object | Test.java:4934:28:4934:55 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:555 |
+| Test.java:4934:28:4934:44 | of(...) : List [<element>] : Object | Test.java:4934:28:4934:55 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:558 |
 | Test.java:4934:28:4934:55 | iterator(...) : Iterator [<element>] : Object | Test.java:4934:18:4934:55 | (...)... : Iterator [<element>] : Object | provenance |  |
-| Test.java:4934:36:4934:43 | source(...) : Object | Test.java:4934:28:4934:44 | of(...) : List [<element>] : Object | provenance | MaD:558 |
+| Test.java:4934:36:4934:43 | source(...) : Object | Test.java:4934:28:4934:44 | of(...) : List [<element>] : Object | provenance | MaD:561 |
 | Test.java:4935:10:4935:41 | concat(...) : Iterator [<element>] : Object | Test.java:4936:20:4936:22 | out : Iterator [<element>] : Object | provenance |  |
 | Test.java:4935:39:4935:40 | in : Iterator [<element>] : Object | Test.java:4935:10:4935:41 | concat(...) : Iterator [<element>] : Object | provenance | MaD:252 |
 | Test.java:4936:20:4936:22 | out : Iterator [<element>] : Object | Test.java:111:19:111:32 | it : Iterator [<element>] : Object | provenance |  |
-| Test.java:4936:20:4936:22 | out : Iterator [<element>] : Object | Test.java:4936:9:4936:23 | getElement(...) | provenance | MaD:557 |
+| Test.java:4936:20:4936:22 | out : Iterator [<element>] : Object | Test.java:4936:9:4936:23 | getElement(...) | provenance | MaD:560 |
 | Test.java:4941:18:4941:55 | (...)... : Iterator [<element>] : Object | Test.java:4942:33:4942:34 | in : Iterator [<element>] : Object | provenance |  |
-| Test.java:4941:28:4941:44 | of(...) : List [<element>] : Object | Test.java:4941:28:4941:55 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:555 |
+| Test.java:4941:28:4941:44 | of(...) : List [<element>] : Object | Test.java:4941:28:4941:55 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:558 |
 | Test.java:4941:28:4941:55 | iterator(...) : Iterator [<element>] : Object | Test.java:4941:18:4941:55 | (...)... : Iterator [<element>] : Object | provenance |  |
-| Test.java:4941:36:4941:43 | source(...) : Object | Test.java:4941:28:4941:44 | of(...) : List [<element>] : Object | provenance | MaD:558 |
+| Test.java:4941:36:4941:43 | source(...) : Object | Test.java:4941:28:4941:44 | of(...) : List [<element>] : Object | provenance | MaD:561 |
 | Test.java:4942:10:4942:41 | concat(...) : Iterator [<element>] : Object | Test.java:4943:20:4943:22 | out : Iterator [<element>] : Object | provenance |  |
 | Test.java:4942:33:4942:34 | in : Iterator [<element>] : Object | Test.java:4942:10:4942:41 | concat(...) : Iterator [<element>] : Object | provenance | MaD:252 |
 | Test.java:4943:20:4943:22 | out : Iterator [<element>] : Object | Test.java:111:19:111:32 | it : Iterator [<element>] : Object | provenance |  |
-| Test.java:4943:20:4943:22 | out : Iterator [<element>] : Object | Test.java:4943:9:4943:23 | getElement(...) | provenance | MaD:557 |
+| Test.java:4943:20:4943:22 | out : Iterator [<element>] : Object | Test.java:4943:9:4943:23 | getElement(...) | provenance | MaD:560 |
 | Test.java:4948:18:4948:55 | (...)... : Iterator [<element>] : Object | Test.java:4949:27:4949:28 | in : Iterator [<element>] : Object | provenance |  |
-| Test.java:4948:28:4948:44 | of(...) : List [<element>] : Object | Test.java:4948:28:4948:55 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:555 |
+| Test.java:4948:28:4948:44 | of(...) : List [<element>] : Object | Test.java:4948:28:4948:55 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:558 |
 | Test.java:4948:28:4948:55 | iterator(...) : Iterator [<element>] : Object | Test.java:4948:18:4948:55 | (...)... : Iterator [<element>] : Object | provenance |  |
-| Test.java:4948:36:4948:43 | source(...) : Object | Test.java:4948:28:4948:44 | of(...) : List [<element>] : Object | provenance | MaD:558 |
+| Test.java:4948:36:4948:43 | source(...) : Object | Test.java:4948:28:4948:44 | of(...) : List [<element>] : Object | provenance | MaD:561 |
 | Test.java:4949:10:4949:41 | concat(...) : Iterator [<element>] : Object | Test.java:4950:20:4950:22 | out : Iterator [<element>] : Object | provenance |  |
 | Test.java:4949:27:4949:28 | in : Iterator [<element>] : Object | Test.java:4949:10:4949:41 | concat(...) : Iterator [<element>] : Object | provenance | MaD:252 |
 | Test.java:4950:20:4950:22 | out : Iterator [<element>] : Object | Test.java:111:19:111:32 | it : Iterator [<element>] : Object | provenance |  |
-| Test.java:4950:20:4950:22 | out : Iterator [<element>] : Object | Test.java:4950:9:4950:23 | getElement(...) | provenance | MaD:557 |
+| Test.java:4950:20:4950:22 | out : Iterator [<element>] : Object | Test.java:4950:9:4950:23 | getElement(...) | provenance | MaD:560 |
 | Test.java:4955:18:4955:55 | (...)... : Iterator [<element>] : Object | Test.java:4956:45:4956:46 | in : Iterator [<element>] : Object | provenance |  |
-| Test.java:4955:28:4955:44 | of(...) : List [<element>] : Object | Test.java:4955:28:4955:55 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:555 |
+| Test.java:4955:28:4955:44 | of(...) : List [<element>] : Object | Test.java:4955:28:4955:55 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:558 |
 | Test.java:4955:28:4955:55 | iterator(...) : Iterator [<element>] : Object | Test.java:4955:18:4955:55 | (...)... : Iterator [<element>] : Object | provenance |  |
-| Test.java:4955:36:4955:43 | source(...) : Object | Test.java:4955:28:4955:44 | of(...) : List [<element>] : Object | provenance | MaD:558 |
+| Test.java:4955:36:4955:43 | source(...) : Object | Test.java:4955:28:4955:44 | of(...) : List [<element>] : Object | provenance | MaD:561 |
 | Test.java:4956:10:4956:47 | concat(...) : Iterator [<element>] : Object | Test.java:4957:20:4957:22 | out : Iterator [<element>] : Object | provenance |  |
 | Test.java:4956:45:4956:46 | in : Iterator [<element>] : Object | Test.java:4956:10:4956:47 | concat(...) : Iterator [<element>] : Object | provenance | MaD:253 |
 | Test.java:4957:20:4957:22 | out : Iterator [<element>] : Object | Test.java:111:19:111:32 | it : Iterator [<element>] : Object | provenance |  |
-| Test.java:4957:20:4957:22 | out : Iterator [<element>] : Object | Test.java:4957:9:4957:23 | getElement(...) | provenance | MaD:557 |
+| Test.java:4957:20:4957:22 | out : Iterator [<element>] : Object | Test.java:4957:9:4957:23 | getElement(...) | provenance | MaD:560 |
 | Test.java:4962:18:4962:55 | (...)... : Iterator [<element>] : Object | Test.java:4963:39:4963:40 | in : Iterator [<element>] : Object | provenance |  |
-| Test.java:4962:28:4962:44 | of(...) : List [<element>] : Object | Test.java:4962:28:4962:55 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:555 |
+| Test.java:4962:28:4962:44 | of(...) : List [<element>] : Object | Test.java:4962:28:4962:55 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:558 |
 | Test.java:4962:28:4962:55 | iterator(...) : Iterator [<element>] : Object | Test.java:4962:18:4962:55 | (...)... : Iterator [<element>] : Object | provenance |  |
-| Test.java:4962:36:4962:43 | source(...) : Object | Test.java:4962:28:4962:44 | of(...) : List [<element>] : Object | provenance | MaD:558 |
+| Test.java:4962:36:4962:43 | source(...) : Object | Test.java:4962:28:4962:44 | of(...) : List [<element>] : Object | provenance | MaD:561 |
 | Test.java:4963:10:4963:47 | concat(...) : Iterator [<element>] : Object | Test.java:4964:20:4964:22 | out : Iterator [<element>] : Object | provenance |  |
 | Test.java:4963:39:4963:40 | in : Iterator [<element>] : Object | Test.java:4963:10:4963:47 | concat(...) : Iterator [<element>] : Object | provenance | MaD:253 |
 | Test.java:4964:20:4964:22 | out : Iterator [<element>] : Object | Test.java:111:19:111:32 | it : Iterator [<element>] : Object | provenance |  |
-| Test.java:4964:20:4964:22 | out : Iterator [<element>] : Object | Test.java:4964:9:4964:23 | getElement(...) | provenance | MaD:557 |
+| Test.java:4964:20:4964:22 | out : Iterator [<element>] : Object | Test.java:4964:9:4964:23 | getElement(...) | provenance | MaD:560 |
 | Test.java:4969:18:4969:55 | (...)... : Iterator [<element>] : Object | Test.java:4970:33:4970:34 | in : Iterator [<element>] : Object | provenance |  |
-| Test.java:4969:28:4969:44 | of(...) : List [<element>] : Object | Test.java:4969:28:4969:55 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:555 |
+| Test.java:4969:28:4969:44 | of(...) : List [<element>] : Object | Test.java:4969:28:4969:55 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:558 |
 | Test.java:4969:28:4969:55 | iterator(...) : Iterator [<element>] : Object | Test.java:4969:18:4969:55 | (...)... : Iterator [<element>] : Object | provenance |  |
-| Test.java:4969:36:4969:43 | source(...) : Object | Test.java:4969:28:4969:44 | of(...) : List [<element>] : Object | provenance | MaD:558 |
+| Test.java:4969:36:4969:43 | source(...) : Object | Test.java:4969:28:4969:44 | of(...) : List [<element>] : Object | provenance | MaD:561 |
 | Test.java:4970:10:4970:47 | concat(...) : Iterator [<element>] : Object | Test.java:4971:20:4971:22 | out : Iterator [<element>] : Object | provenance |  |
 | Test.java:4970:33:4970:34 | in : Iterator [<element>] : Object | Test.java:4970:10:4970:47 | concat(...) : Iterator [<element>] : Object | provenance | MaD:253 |
 | Test.java:4971:20:4971:22 | out : Iterator [<element>] : Object | Test.java:111:19:111:32 | it : Iterator [<element>] : Object | provenance |  |
-| Test.java:4971:20:4971:22 | out : Iterator [<element>] : Object | Test.java:4971:9:4971:23 | getElement(...) | provenance | MaD:557 |
+| Test.java:4971:20:4971:22 | out : Iterator [<element>] : Object | Test.java:4971:9:4971:23 | getElement(...) | provenance | MaD:560 |
 | Test.java:4976:18:4976:55 | (...)... : Iterator [<element>] : Object | Test.java:4977:27:4977:28 | in : Iterator [<element>] : Object | provenance |  |
-| Test.java:4976:28:4976:44 | of(...) : List [<element>] : Object | Test.java:4976:28:4976:55 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:555 |
+| Test.java:4976:28:4976:44 | of(...) : List [<element>] : Object | Test.java:4976:28:4976:55 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:558 |
 | Test.java:4976:28:4976:55 | iterator(...) : Iterator [<element>] : Object | Test.java:4976:18:4976:55 | (...)... : Iterator [<element>] : Object | provenance |  |
-| Test.java:4976:36:4976:43 | source(...) : Object | Test.java:4976:28:4976:44 | of(...) : List [<element>] : Object | provenance | MaD:558 |
+| Test.java:4976:36:4976:43 | source(...) : Object | Test.java:4976:28:4976:44 | of(...) : List [<element>] : Object | provenance | MaD:561 |
 | Test.java:4977:10:4977:47 | concat(...) : Iterator [<element>] : Object | Test.java:4978:20:4978:22 | out : Iterator [<element>] : Object | provenance |  |
 | Test.java:4977:27:4977:28 | in : Iterator [<element>] : Object | Test.java:4977:10:4977:47 | concat(...) : Iterator [<element>] : Object | provenance | MaD:253 |
 | Test.java:4978:20:4978:22 | out : Iterator [<element>] : Object | Test.java:111:19:111:32 | it : Iterator [<element>] : Object | provenance |  |
-| Test.java:4978:20:4978:22 | out : Iterator [<element>] : Object | Test.java:4978:9:4978:23 | getElement(...) | provenance | MaD:557 |
+| Test.java:4978:20:4978:22 | out : Iterator [<element>] : Object | Test.java:4978:9:4978:23 | getElement(...) | provenance | MaD:560 |
 | Test.java:4983:20:4983:85 | (...)... : Iterator[] [[], <element>] : Object | Test.java:4984:27:4984:28 | in : Iterator[] [[], <element>] : Object | provenance |  |
 | Test.java:4983:32:4983:85 | {...} : Iterator[] [[], <element>] : Object | Test.java:4983:20:4983:85 | (...)... : Iterator[] [[], <element>] : Object | provenance |  |
 | Test.java:4983:47:4983:84 | (...)... : Iterator [<element>] : Object | Test.java:4983:32:4983:85 | {...} : Iterator[] [[], <element>] : Object | provenance |  |
-| Test.java:4983:57:4983:73 | of(...) : List [<element>] : Object | Test.java:4983:57:4983:84 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:555 |
+| Test.java:4983:57:4983:73 | of(...) : List [<element>] : Object | Test.java:4983:57:4983:84 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:558 |
 | Test.java:4983:57:4983:84 | iterator(...) : Iterator [<element>] : Object | Test.java:4983:47:4983:84 | (...)... : Iterator [<element>] : Object | provenance |  |
-| Test.java:4983:65:4983:72 | source(...) : Object | Test.java:4983:57:4983:73 | of(...) : List [<element>] : Object | provenance | MaD:558 |
+| Test.java:4983:65:4983:72 | source(...) : Object | Test.java:4983:57:4983:73 | of(...) : List [<element>] : Object | provenance | MaD:561 |
 | Test.java:4984:10:4984:29 | concat(...) : Iterator [<element>] : Object | Test.java:4985:20:4985:22 | out : Iterator [<element>] : Object | provenance |  |
 | Test.java:4984:27:4984:28 | in : Iterator[] [[], <element>] : Object | Test.java:4984:10:4984:29 | concat(...) : Iterator [<element>] : Object | provenance | MaD:254 |
 | Test.java:4985:20:4985:22 | out : Iterator [<element>] : Object | Test.java:111:19:111:32 | it : Iterator [<element>] : Object | provenance |  |
-| Test.java:4985:20:4985:22 | out : Iterator [<element>] : Object | Test.java:4985:9:4985:23 | getElement(...) | provenance | MaD:557 |
+| Test.java:4985:20:4985:22 | out : Iterator [<element>] : Object | Test.java:4985:9:4985:23 | getElement(...) | provenance | MaD:560 |
 | Test.java:4990:18:4990:55 | (...)... : Iterator [<element>] : Object | Test.java:4991:38:4991:39 | in : Iterator [<element>] : Object | provenance |  |
-| Test.java:4990:28:4990:44 | of(...) : List [<element>] : Object | Test.java:4990:28:4990:55 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:555 |
+| Test.java:4990:28:4990:44 | of(...) : List [<element>] : Object | Test.java:4990:28:4990:55 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:558 |
 | Test.java:4990:28:4990:55 | iterator(...) : Iterator [<element>] : Object | Test.java:4990:18:4990:55 | (...)... : Iterator [<element>] : Object | provenance |  |
-| Test.java:4990:36:4990:43 | source(...) : Object | Test.java:4990:28:4990:44 | of(...) : List [<element>] : Object | provenance | MaD:558 |
+| Test.java:4990:36:4990:43 | source(...) : Object | Test.java:4990:28:4990:44 | of(...) : List [<element>] : Object | provenance | MaD:561 |
 | Test.java:4991:10:4991:40 | consumingIterator(...) : Iterator [<element>] : Object | Test.java:4992:20:4992:22 | out : Iterator [<element>] : Object | provenance |  |
 | Test.java:4991:38:4991:39 | in : Iterator [<element>] : Object | Test.java:4991:10:4991:40 | consumingIterator(...) : Iterator [<element>] : Object | provenance | MaD:255 |
 | Test.java:4992:20:4992:22 | out : Iterator [<element>] : Object | Test.java:111:19:111:32 | it : Iterator [<element>] : Object | provenance |  |
-| Test.java:4992:20:4992:22 | out : Iterator [<element>] : Object | Test.java:4992:9:4992:23 | getElement(...) | provenance | MaD:557 |
+| Test.java:4992:20:4992:22 | out : Iterator [<element>] : Object | Test.java:4992:9:4992:23 | getElement(...) | provenance | MaD:560 |
 | Test.java:4997:18:4997:44 | (...)... : List [<element>] : Object | Test.java:4998:26:4998:27 | in : List [<element>] : Object | provenance |  |
 | Test.java:4997:28:4997:44 | of(...) : List [<element>] : Object | Test.java:4997:18:4997:44 | (...)... : List [<element>] : Object | provenance |  |
-| Test.java:4997:36:4997:43 | source(...) : Object | Test.java:4997:28:4997:44 | of(...) : List [<element>] : Object | provenance | MaD:558 |
+| Test.java:4997:36:4997:43 | source(...) : Object | Test.java:4997:28:4997:44 | of(...) : List [<element>] : Object | provenance | MaD:561 |
 | Test.java:4998:10:4998:28 | cycle(...) : Iterator [<element>] : Object | Test.java:4999:20:4999:22 | out : Iterator [<element>] : Object | provenance |  |
 | Test.java:4998:26:4998:27 | in : List [<element>] : Object | Test.java:4998:10:4998:28 | cycle(...) : Iterator [<element>] : Object | provenance | MaD:256 |
 | Test.java:4999:20:4999:22 | out : Iterator [<element>] : Object | Test.java:111:19:111:32 | it : Iterator [<element>] : Object | provenance |  |
-| Test.java:4999:20:4999:22 | out : Iterator [<element>] : Object | Test.java:4999:9:4999:23 | getElement(...) | provenance | MaD:557 |
+| Test.java:4999:20:4999:22 | out : Iterator [<element>] : Object | Test.java:4999:9:4999:23 | getElement(...) | provenance | MaD:560 |
 | Test.java:5004:18:5004:49 | (...)... : Object[] [[]] : Object | Test.java:5005:26:5005:27 | in : Object[] [[]] : Object | provenance |  |
 | Test.java:5004:28:5004:49 | {...} : Object[] [[]] : Object | Test.java:5004:18:5004:49 | (...)... : Object[] [[]] : Object | provenance |  |
 | Test.java:5004:41:5004:48 | source(...) : Object | Test.java:5004:28:5004:49 | {...} : Object[] [[]] : Object | provenance |  |
 | Test.java:5005:10:5005:28 | cycle(...) : Iterator [<element>] : Object | Test.java:5006:20:5006:22 | out : Iterator [<element>] : Object | provenance |  |
 | Test.java:5005:26:5005:27 | in : Object[] [[]] : Object | Test.java:5005:10:5005:28 | cycle(...) : Iterator [<element>] : Object | provenance | MaD:257 |
 | Test.java:5006:20:5006:22 | out : Iterator [<element>] : Object | Test.java:111:19:111:32 | it : Iterator [<element>] : Object | provenance |  |
-| Test.java:5006:20:5006:22 | out : Iterator [<element>] : Object | Test.java:5006:9:5006:23 | getElement(...) | provenance | MaD:557 |
+| Test.java:5006:20:5006:22 | out : Iterator [<element>] : Object | Test.java:5006:9:5006:23 | getElement(...) | provenance | MaD:560 |
 | Test.java:5011:18:5011:55 | (...)... : Iterator [<element>] : Object | Test.java:5012:27:5012:28 | in : Iterator [<element>] : Object | provenance |  |
-| Test.java:5011:28:5011:44 | of(...) : List [<element>] : Object | Test.java:5011:28:5011:55 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:555 |
+| Test.java:5011:28:5011:44 | of(...) : List [<element>] : Object | Test.java:5011:28:5011:55 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:558 |
 | Test.java:5011:28:5011:55 | iterator(...) : Iterator [<element>] : Object | Test.java:5011:18:5011:55 | (...)... : Iterator [<element>] : Object | provenance |  |
-| Test.java:5011:36:5011:43 | source(...) : Object | Test.java:5011:28:5011:44 | of(...) : List [<element>] : Object | provenance | MaD:558 |
+| Test.java:5011:36:5011:43 | source(...) : Object | Test.java:5011:28:5011:44 | of(...) : List [<element>] : Object | provenance | MaD:561 |
 | Test.java:5012:10:5012:42 | filter(...) : UnmodifiableIterator [<element>] : Object | Test.java:5013:20:5013:22 | out : UnmodifiableIterator [<element>] : Object | provenance |  |
 | Test.java:5012:27:5012:28 | in : Iterator [<element>] : Object | Test.java:5012:10:5012:42 | filter(...) : UnmodifiableIterator [<element>] : Object | provenance | MaD:258 |
 | Test.java:5013:20:5013:22 | out : UnmodifiableIterator [<element>] : Object | Test.java:111:19:111:32 | it : UnmodifiableIterator [<element>] : Object | provenance |  |
-| Test.java:5013:20:5013:22 | out : UnmodifiableIterator [<element>] : Object | Test.java:5013:9:5013:23 | getElement(...) | provenance | MaD:557 |
+| Test.java:5013:20:5013:22 | out : UnmodifiableIterator [<element>] : Object | Test.java:5013:9:5013:23 | getElement(...) | provenance | MaD:560 |
 | Test.java:5018:18:5018:55 | (...)... : Iterator [<element>] : Object | Test.java:5019:27:5019:28 | in : Iterator [<element>] : Object | provenance |  |
-| Test.java:5018:28:5018:44 | of(...) : List [<element>] : Object | Test.java:5018:28:5018:55 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:555 |
+| Test.java:5018:28:5018:44 | of(...) : List [<element>] : Object | Test.java:5018:28:5018:55 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:558 |
 | Test.java:5018:28:5018:55 | iterator(...) : Iterator [<element>] : Object | Test.java:5018:18:5018:55 | (...)... : Iterator [<element>] : Object | provenance |  |
-| Test.java:5018:36:5018:43 | source(...) : Object | Test.java:5018:28:5018:44 | of(...) : List [<element>] : Object | provenance | MaD:558 |
+| Test.java:5018:36:5018:43 | source(...) : Object | Test.java:5018:28:5018:44 | of(...) : List [<element>] : Object | provenance | MaD:561 |
 | Test.java:5019:10:5019:46 | filter(...) : UnmodifiableIterator [<element>] : Object | Test.java:5020:20:5020:22 | out : UnmodifiableIterator [<element>] : Object | provenance |  |
 | Test.java:5019:27:5019:28 | in : Iterator [<element>] : Object | Test.java:5019:10:5019:46 | filter(...) : UnmodifiableIterator [<element>] : Object | provenance | MaD:259 |
 | Test.java:5020:20:5020:22 | out : UnmodifiableIterator [<element>] : Object | Test.java:111:19:111:32 | it : UnmodifiableIterator [<element>] : Object | provenance |  |
-| Test.java:5020:20:5020:22 | out : UnmodifiableIterator [<element>] : Object | Test.java:5020:9:5020:23 | getElement(...) | provenance | MaD:557 |
+| Test.java:5020:20:5020:22 | out : UnmodifiableIterator [<element>] : Object | Test.java:5020:9:5020:23 | getElement(...) | provenance | MaD:560 |
 | Test.java:5025:18:5025:55 | (...)... : Iterator [<element>] : Object | Test.java:5026:25:5026:26 | in : Iterator [<element>] : Object | provenance |  |
-| Test.java:5025:28:5025:44 | of(...) : List [<element>] : Object | Test.java:5025:28:5025:55 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:555 |
+| Test.java:5025:28:5025:44 | of(...) : List [<element>] : Object | Test.java:5025:28:5025:55 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:558 |
 | Test.java:5025:28:5025:55 | iterator(...) : Iterator [<element>] : Object | Test.java:5025:18:5025:55 | (...)... : Iterator [<element>] : Object | provenance |  |
-| Test.java:5025:36:5025:43 | source(...) : Object | Test.java:5025:28:5025:44 | of(...) : List [<element>] : Object | provenance | MaD:558 |
+| Test.java:5025:36:5025:43 | source(...) : Object | Test.java:5025:28:5025:44 | of(...) : List [<element>] : Object | provenance | MaD:561 |
 | Test.java:5026:10:5026:33 | find(...) : Object | Test.java:5027:9:5027:11 | out | provenance |  |
 | Test.java:5026:25:5026:26 | in : Iterator [<element>] : Object | Test.java:5026:10:5026:33 | find(...) : Object | provenance | MaD:260 |
 | Test.java:5032:16:5032:31 | (...)... : Object | Test.java:5033:37:5033:38 | in : Object | provenance |  |
@@ -5572,9 +5572,9 @@ edges
 | Test.java:5033:10:5033:39 | find(...) : Object | Test.java:5034:9:5034:11 | out | provenance |  |
 | Test.java:5033:37:5033:38 | in : Object | Test.java:5033:10:5033:39 | find(...) : Object | provenance | MaD:262 |
 | Test.java:5039:18:5039:55 | (...)... : Iterator [<element>] : Object | Test.java:5040:25:5040:26 | in : Iterator [<element>] : Object | provenance |  |
-| Test.java:5039:28:5039:44 | of(...) : List [<element>] : Object | Test.java:5039:28:5039:55 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:555 |
+| Test.java:5039:28:5039:44 | of(...) : List [<element>] : Object | Test.java:5039:28:5039:55 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:558 |
 | Test.java:5039:28:5039:55 | iterator(...) : Iterator [<element>] : Object | Test.java:5039:18:5039:55 | (...)... : Iterator [<element>] : Object | provenance |  |
-| Test.java:5039:36:5039:43 | source(...) : Object | Test.java:5039:28:5039:44 | of(...) : List [<element>] : Object | provenance | MaD:558 |
+| Test.java:5039:36:5039:43 | source(...) : Object | Test.java:5039:28:5039:44 | of(...) : List [<element>] : Object | provenance | MaD:561 |
 | Test.java:5040:10:5040:39 | find(...) : Object | Test.java:5041:9:5041:11 | out | provenance |  |
 | Test.java:5040:25:5040:26 | in : Iterator [<element>] : Object | Test.java:5040:10:5040:39 | find(...) : Object | provenance | MaD:261 |
 | Test.java:5046:18:5046:49 | (...)... : Object[] [[]] : Object | Test.java:5047:29:5047:30 | in : Object[] [[]] : Object | provenance |  |
@@ -5583,18 +5583,18 @@ edges
 | Test.java:5047:10:5047:31 | forArray(...) : UnmodifiableIterator [<element>] : Object | Test.java:5048:20:5048:22 | out : UnmodifiableIterator [<element>] : Object | provenance |  |
 | Test.java:5047:29:5047:30 | in : Object[] [[]] : Object | Test.java:5047:10:5047:31 | forArray(...) : UnmodifiableIterator [<element>] : Object | provenance | MaD:263 |
 | Test.java:5048:20:5048:22 | out : UnmodifiableIterator [<element>] : Object | Test.java:111:19:111:32 | it : UnmodifiableIterator [<element>] : Object | provenance |  |
-| Test.java:5048:20:5048:22 | out : UnmodifiableIterator [<element>] : Object | Test.java:5048:9:5048:23 | getElement(...) | provenance | MaD:557 |
+| Test.java:5048:20:5048:22 | out : UnmodifiableIterator [<element>] : Object | Test.java:5048:9:5048:23 | getElement(...) | provenance | MaD:560 |
 | Test.java:5053:21:5053:64 | (...)... : Enumeration [<element>] : Object | Test.java:5054:35:5054:36 | in : Enumeration [<element>] : Object | provenance |  |
 | Test.java:5053:34:5053:64 | newWithElementDefault(...) : Object [<element>] : Object | Test.java:5053:21:5053:64 | (...)... : Enumeration [<element>] : Object | provenance |  |
-| Test.java:5053:56:5053:63 | source(...) : Object | Test.java:5053:34:5053:64 | newWithElementDefault(...) : Object [<element>] : Object | provenance | MaD:568 |
+| Test.java:5053:56:5053:63 | source(...) : Object | Test.java:5053:34:5053:64 | newWithElementDefault(...) : Object [<element>] : Object | provenance | MaD:555 |
 | Test.java:5054:10:5054:37 | forEnumeration(...) : UnmodifiableIterator [<element>] : Object | Test.java:5055:20:5055:22 | out : UnmodifiableIterator [<element>] : Object | provenance |  |
 | Test.java:5054:35:5054:36 | in : Enumeration [<element>] : Object | Test.java:5054:10:5054:37 | forEnumeration(...) : UnmodifiableIterator [<element>] : Object | provenance | MaD:264 |
 | Test.java:5055:20:5055:22 | out : UnmodifiableIterator [<element>] : Object | Test.java:111:19:111:32 | it : UnmodifiableIterator [<element>] : Object | provenance |  |
-| Test.java:5055:20:5055:22 | out : UnmodifiableIterator [<element>] : Object | Test.java:5055:9:5055:23 | getElement(...) | provenance | MaD:557 |
+| Test.java:5055:20:5055:22 | out : UnmodifiableIterator [<element>] : Object | Test.java:5055:9:5055:23 | getElement(...) | provenance | MaD:560 |
 | Test.java:5060:18:5060:55 | (...)... : Iterator [<element>] : Object | Test.java:5061:24:5061:25 | in : Iterator [<element>] : Object | provenance |  |
-| Test.java:5060:28:5060:44 | of(...) : List [<element>] : Object | Test.java:5060:28:5060:55 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:555 |
+| Test.java:5060:28:5060:44 | of(...) : List [<element>] : Object | Test.java:5060:28:5060:55 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:558 |
 | Test.java:5060:28:5060:55 | iterator(...) : Iterator [<element>] : Object | Test.java:5060:18:5060:55 | (...)... : Iterator [<element>] : Object | provenance |  |
-| Test.java:5060:36:5060:43 | source(...) : Object | Test.java:5060:28:5060:44 | of(...) : List [<element>] : Object | provenance | MaD:558 |
+| Test.java:5060:36:5060:43 | source(...) : Object | Test.java:5060:28:5060:44 | of(...) : List [<element>] : Object | provenance | MaD:561 |
 | Test.java:5061:10:5061:29 | get(...) : Object | Test.java:5062:9:5062:11 | out | provenance |  |
 | Test.java:5061:24:5061:25 | in : Iterator [<element>] : Object | Test.java:5061:10:5061:29 | get(...) : Object | provenance | MaD:265 |
 | Test.java:5067:16:5067:31 | (...)... : Object | Test.java:5068:33:5068:34 | in : Object | provenance |  |
@@ -5602,15 +5602,15 @@ edges
 | Test.java:5068:10:5068:35 | get(...) : Object | Test.java:5069:9:5069:11 | out | provenance |  |
 | Test.java:5068:33:5068:34 | in : Object | Test.java:5068:10:5068:35 | get(...) : Object | provenance | MaD:267 |
 | Test.java:5074:18:5074:55 | (...)... : Iterator [<element>] : Object | Test.java:5075:24:5075:25 | in : Iterator [<element>] : Object | provenance |  |
-| Test.java:5074:28:5074:44 | of(...) : List [<element>] : Object | Test.java:5074:28:5074:55 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:555 |
+| Test.java:5074:28:5074:44 | of(...) : List [<element>] : Object | Test.java:5074:28:5074:55 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:558 |
 | Test.java:5074:28:5074:55 | iterator(...) : Iterator [<element>] : Object | Test.java:5074:18:5074:55 | (...)... : Iterator [<element>] : Object | provenance |  |
-| Test.java:5074:36:5074:43 | source(...) : Object | Test.java:5074:28:5074:44 | of(...) : List [<element>] : Object | provenance | MaD:558 |
+| Test.java:5074:36:5074:43 | source(...) : Object | Test.java:5074:28:5074:44 | of(...) : List [<element>] : Object | provenance | MaD:561 |
 | Test.java:5075:10:5075:35 | get(...) : Object | Test.java:5076:9:5076:11 | out | provenance |  |
 | Test.java:5075:24:5075:25 | in : Iterator [<element>] : Object | Test.java:5075:10:5075:35 | get(...) : Object | provenance | MaD:266 |
 | Test.java:5081:18:5081:55 | (...)... : Iterator [<element>] : Object | Test.java:5082:28:5082:29 | in : Iterator [<element>] : Object | provenance |  |
-| Test.java:5081:28:5081:44 | of(...) : List [<element>] : Object | Test.java:5081:28:5081:55 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:555 |
+| Test.java:5081:28:5081:44 | of(...) : List [<element>] : Object | Test.java:5081:28:5081:55 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:558 |
 | Test.java:5081:28:5081:55 | iterator(...) : Iterator [<element>] : Object | Test.java:5081:18:5081:55 | (...)... : Iterator [<element>] : Object | provenance |  |
-| Test.java:5081:36:5081:43 | source(...) : Object | Test.java:5081:28:5081:44 | of(...) : List [<element>] : Object | provenance | MaD:558 |
+| Test.java:5081:36:5081:43 | source(...) : Object | Test.java:5081:28:5081:44 | of(...) : List [<element>] : Object | provenance | MaD:561 |
 | Test.java:5082:10:5082:30 | getLast(...) : Object | Test.java:5083:9:5083:11 | out | provenance |  |
 | Test.java:5082:28:5082:29 | in : Iterator [<element>] : Object | Test.java:5082:10:5082:30 | getLast(...) : Object | provenance | MaD:268 |
 | Test.java:5088:16:5088:31 | (...)... : Object | Test.java:5089:34:5089:35 | in : Object | provenance |  |
@@ -5618,9 +5618,9 @@ edges
 | Test.java:5089:10:5089:36 | getLast(...) : Object | Test.java:5090:9:5090:11 | out | provenance |  |
 | Test.java:5089:34:5089:35 | in : Object | Test.java:5089:10:5089:36 | getLast(...) : Object | provenance | MaD:270 |
 | Test.java:5095:18:5095:55 | (...)... : Iterator [<element>] : Object | Test.java:5096:28:5096:29 | in : Iterator [<element>] : Object | provenance |  |
-| Test.java:5095:28:5095:44 | of(...) : List [<element>] : Object | Test.java:5095:28:5095:55 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:555 |
+| Test.java:5095:28:5095:44 | of(...) : List [<element>] : Object | Test.java:5095:28:5095:55 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:558 |
 | Test.java:5095:28:5095:55 | iterator(...) : Iterator [<element>] : Object | Test.java:5095:18:5095:55 | (...)... : Iterator [<element>] : Object | provenance |  |
-| Test.java:5095:36:5095:43 | source(...) : Object | Test.java:5095:28:5095:44 | of(...) : List [<element>] : Object | provenance | MaD:558 |
+| Test.java:5095:36:5095:43 | source(...) : Object | Test.java:5095:28:5095:44 | of(...) : List [<element>] : Object | provenance | MaD:561 |
 | Test.java:5096:10:5096:36 | getLast(...) : Object | Test.java:5097:9:5097:11 | out | provenance |  |
 | Test.java:5096:28:5096:29 | in : Iterator [<element>] : Object | Test.java:5096:10:5096:36 | getLast(...) : Object | provenance | MaD:269 |
 | Test.java:5102:16:5102:31 | (...)... : Object | Test.java:5103:34:5103:35 | in : Object | provenance |  |
@@ -5628,15 +5628,15 @@ edges
 | Test.java:5103:10:5103:36 | getNext(...) : Object | Test.java:5104:9:5104:11 | out | provenance |  |
 | Test.java:5103:34:5103:35 | in : Object | Test.java:5103:10:5103:36 | getNext(...) : Object | provenance | MaD:272 |
 | Test.java:5109:18:5109:55 | (...)... : Iterator [<element>] : Object | Test.java:5110:28:5110:29 | in : Iterator [<element>] : Object | provenance |  |
-| Test.java:5109:28:5109:44 | of(...) : List [<element>] : Object | Test.java:5109:28:5109:55 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:555 |
+| Test.java:5109:28:5109:44 | of(...) : List [<element>] : Object | Test.java:5109:28:5109:55 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:558 |
 | Test.java:5109:28:5109:55 | iterator(...) : Iterator [<element>] : Object | Test.java:5109:18:5109:55 | (...)... : Iterator [<element>] : Object | provenance |  |
-| Test.java:5109:36:5109:43 | source(...) : Object | Test.java:5109:28:5109:44 | of(...) : List [<element>] : Object | provenance | MaD:558 |
+| Test.java:5109:36:5109:43 | source(...) : Object | Test.java:5109:28:5109:44 | of(...) : List [<element>] : Object | provenance | MaD:561 |
 | Test.java:5110:10:5110:36 | getNext(...) : Object | Test.java:5111:9:5111:11 | out | provenance |  |
 | Test.java:5110:28:5110:29 | in : Iterator [<element>] : Object | Test.java:5110:10:5110:36 | getNext(...) : Object | provenance | MaD:271 |
 | Test.java:5116:18:5116:55 | (...)... : Iterator [<element>] : Object | Test.java:5117:35:5117:36 | in : Iterator [<element>] : Object | provenance |  |
-| Test.java:5116:28:5116:44 | of(...) : List [<element>] : Object | Test.java:5116:28:5116:55 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:555 |
+| Test.java:5116:28:5116:44 | of(...) : List [<element>] : Object | Test.java:5116:28:5116:55 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:558 |
 | Test.java:5116:28:5116:55 | iterator(...) : Iterator [<element>] : Object | Test.java:5116:18:5116:55 | (...)... : Iterator [<element>] : Object | provenance |  |
-| Test.java:5116:36:5116:43 | source(...) : Object | Test.java:5116:28:5116:44 | of(...) : List [<element>] : Object | provenance | MaD:558 |
+| Test.java:5116:36:5116:43 | source(...) : Object | Test.java:5116:28:5116:44 | of(...) : List [<element>] : Object | provenance | MaD:561 |
 | Test.java:5117:10:5117:37 | getOnlyElement(...) : Object | Test.java:5118:9:5118:11 | out | provenance |  |
 | Test.java:5117:35:5117:36 | in : Iterator [<element>] : Object | Test.java:5117:10:5117:37 | getOnlyElement(...) : Object | provenance | MaD:273 |
 | Test.java:5123:16:5123:31 | (...)... : Object | Test.java:5124:41:5124:42 | in : Object | provenance |  |
@@ -5644,135 +5644,135 @@ edges
 | Test.java:5124:10:5124:43 | getOnlyElement(...) : Object | Test.java:5125:9:5125:11 | out | provenance |  |
 | Test.java:5124:41:5124:42 | in : Object | Test.java:5124:10:5124:43 | getOnlyElement(...) : Object | provenance | MaD:275 |
 | Test.java:5130:18:5130:55 | (...)... : Iterator [<element>] : Object | Test.java:5131:35:5131:36 | in : Iterator [<element>] : Object | provenance |  |
-| Test.java:5130:28:5130:44 | of(...) : List [<element>] : Object | Test.java:5130:28:5130:55 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:555 |
+| Test.java:5130:28:5130:44 | of(...) : List [<element>] : Object | Test.java:5130:28:5130:55 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:558 |
 | Test.java:5130:28:5130:55 | iterator(...) : Iterator [<element>] : Object | Test.java:5130:18:5130:55 | (...)... : Iterator [<element>] : Object | provenance |  |
-| Test.java:5130:36:5130:43 | source(...) : Object | Test.java:5130:28:5130:44 | of(...) : List [<element>] : Object | provenance | MaD:558 |
+| Test.java:5130:36:5130:43 | source(...) : Object | Test.java:5130:28:5130:44 | of(...) : List [<element>] : Object | provenance | MaD:561 |
 | Test.java:5131:10:5131:43 | getOnlyElement(...) : Object | Test.java:5132:9:5132:11 | out | provenance |  |
 | Test.java:5131:35:5131:36 | in : Iterator [<element>] : Object | Test.java:5131:10:5131:43 | getOnlyElement(...) : Object | provenance | MaD:274 |
 | Test.java:5137:18:5137:55 | (...)... : Iterator [<element>] : Object | Test.java:5138:26:5138:27 | in : Iterator [<element>] : Object | provenance |  |
-| Test.java:5137:28:5137:44 | of(...) : List [<element>] : Object | Test.java:5137:28:5137:55 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:555 |
+| Test.java:5137:28:5137:44 | of(...) : List [<element>] : Object | Test.java:5137:28:5137:55 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:558 |
 | Test.java:5137:28:5137:55 | iterator(...) : Iterator [<element>] : Object | Test.java:5137:18:5137:55 | (...)... : Iterator [<element>] : Object | provenance |  |
-| Test.java:5137:36:5137:43 | source(...) : Object | Test.java:5137:28:5137:44 | of(...) : List [<element>] : Object | provenance | MaD:558 |
+| Test.java:5137:36:5137:43 | source(...) : Object | Test.java:5137:28:5137:44 | of(...) : List [<element>] : Object | provenance | MaD:561 |
 | Test.java:5138:10:5138:31 | limit(...) : Iterator [<element>] : Object | Test.java:5139:20:5139:22 | out : Iterator [<element>] : Object | provenance |  |
 | Test.java:5138:26:5138:27 | in : Iterator [<element>] : Object | Test.java:5138:10:5138:31 | limit(...) : Iterator [<element>] : Object | provenance | MaD:276 |
 | Test.java:5139:20:5139:22 | out : Iterator [<element>] : Object | Test.java:111:19:111:32 | it : Iterator [<element>] : Object | provenance |  |
-| Test.java:5139:20:5139:22 | out : Iterator [<element>] : Object | Test.java:5139:9:5139:23 | getElement(...) | provenance | MaD:557 |
+| Test.java:5139:20:5139:22 | out : Iterator [<element>] : Object | Test.java:5139:9:5139:23 | getElement(...) | provenance | MaD:560 |
 | Test.java:5144:18:5144:64 | (...)... : List [<element>, <element>] : Object | Test.java:5145:32:5145:33 | in : List [<element>, <element>] : Object | provenance |  |
 | Test.java:5144:28:5144:64 | of(...) : List [<element>, <element>] : Object | Test.java:5144:18:5144:64 | (...)... : List [<element>, <element>] : Object | provenance |  |
-| Test.java:5144:36:5144:52 | of(...) : List [<element>] : Object | Test.java:5144:36:5144:63 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:555 |
-| Test.java:5144:36:5144:63 | iterator(...) : Iterator [<element>] : Object | Test.java:5144:28:5144:64 | of(...) : List [<element>, <element>] : Object | provenance | MaD:558 |
-| Test.java:5144:44:5144:51 | source(...) : Object | Test.java:5144:36:5144:52 | of(...) : List [<element>] : Object | provenance | MaD:558 |
+| Test.java:5144:36:5144:52 | of(...) : List [<element>] : Object | Test.java:5144:36:5144:63 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:558 |
+| Test.java:5144:36:5144:63 | iterator(...) : Iterator [<element>] : Object | Test.java:5144:28:5144:64 | of(...) : List [<element>, <element>] : Object | provenance | MaD:561 |
+| Test.java:5144:44:5144:51 | source(...) : Object | Test.java:5144:36:5144:52 | of(...) : List [<element>] : Object | provenance | MaD:561 |
 | Test.java:5145:10:5145:40 | mergeSorted(...) : UnmodifiableIterator [<element>] : Object | Test.java:5146:20:5146:22 | out : UnmodifiableIterator [<element>] : Object | provenance |  |
 | Test.java:5145:32:5145:33 | in : List [<element>, <element>] : Object | Test.java:5145:10:5145:40 | mergeSorted(...) : UnmodifiableIterator [<element>] : Object | provenance | MaD:277 |
 | Test.java:5146:20:5146:22 | out : UnmodifiableIterator [<element>] : Object | Test.java:111:19:111:32 | it : UnmodifiableIterator [<element>] : Object | provenance |  |
-| Test.java:5146:20:5146:22 | out : UnmodifiableIterator [<element>] : Object | Test.java:5146:9:5146:23 | getElement(...) | provenance | MaD:557 |
+| Test.java:5146:20:5146:22 | out : UnmodifiableIterator [<element>] : Object | Test.java:5146:9:5146:23 | getElement(...) | provenance | MaD:560 |
 | Test.java:5151:18:5151:55 | (...)... : Iterator [<element>] : Object | Test.java:5152:36:5152:37 | in : Iterator [<element>] : Object | provenance |  |
-| Test.java:5151:28:5151:44 | of(...) : List [<element>] : Object | Test.java:5151:28:5151:55 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:555 |
+| Test.java:5151:28:5151:44 | of(...) : List [<element>] : Object | Test.java:5151:28:5151:55 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:558 |
 | Test.java:5151:28:5151:55 | iterator(...) : Iterator [<element>] : Object | Test.java:5151:18:5151:55 | (...)... : Iterator [<element>] : Object | provenance |  |
-| Test.java:5151:36:5151:43 | source(...) : Object | Test.java:5151:28:5151:44 | of(...) : List [<element>] : Object | provenance | MaD:558 |
+| Test.java:5151:36:5151:43 | source(...) : Object | Test.java:5151:28:5151:44 | of(...) : List [<element>] : Object | provenance | MaD:561 |
 | Test.java:5152:10:5152:41 | paddedPartition(...) : UnmodifiableIterator [<element>, <element>] : Object | Test.java:5153:31:5153:33 | out : UnmodifiableIterator [<element>, <element>] : Object | provenance |  |
 | Test.java:5152:36:5152:37 | in : Iterator [<element>] : Object | Test.java:5152:10:5152:41 | paddedPartition(...) : UnmodifiableIterator [<element>, <element>] : Object | provenance | MaD:278 |
 | Test.java:5153:20:5153:34 | getElement(...) : List [<element>] : Object | Test.java:110:19:110:32 | it : List [<element>] : Object | provenance |  |
-| Test.java:5153:20:5153:34 | getElement(...) : List [<element>] : Object | Test.java:5153:9:5153:35 | getElement(...) | provenance | MaD:555 |
+| Test.java:5153:20:5153:34 | getElement(...) : List [<element>] : Object | Test.java:5153:9:5153:35 | getElement(...) | provenance | MaD:558 |
 | Test.java:5153:31:5153:33 | out : UnmodifiableIterator [<element>, <element>] : Object | Test.java:111:19:111:32 | it : UnmodifiableIterator [<element>, <element>] : Object | provenance |  |
-| Test.java:5153:31:5153:33 | out : UnmodifiableIterator [<element>, <element>] : Object | Test.java:5153:20:5153:34 | getElement(...) : List [<element>] : Object | provenance | MaD:557 |
+| Test.java:5153:31:5153:33 | out : UnmodifiableIterator [<element>, <element>] : Object | Test.java:5153:20:5153:34 | getElement(...) : List [<element>] : Object | provenance | MaD:560 |
 | Test.java:5158:18:5158:55 | (...)... : Iterator [<element>] : Object | Test.java:5159:30:5159:31 | in : Iterator [<element>] : Object | provenance |  |
-| Test.java:5158:28:5158:44 | of(...) : List [<element>] : Object | Test.java:5158:28:5158:55 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:555 |
+| Test.java:5158:28:5158:44 | of(...) : List [<element>] : Object | Test.java:5158:28:5158:55 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:558 |
 | Test.java:5158:28:5158:55 | iterator(...) : Iterator [<element>] : Object | Test.java:5158:18:5158:55 | (...)... : Iterator [<element>] : Object | provenance |  |
-| Test.java:5158:36:5158:43 | source(...) : Object | Test.java:5158:28:5158:44 | of(...) : List [<element>] : Object | provenance | MaD:558 |
+| Test.java:5158:36:5158:43 | source(...) : Object | Test.java:5158:28:5158:44 | of(...) : List [<element>] : Object | provenance | MaD:561 |
 | Test.java:5159:10:5159:35 | partition(...) : UnmodifiableIterator [<element>, <element>] : Object | Test.java:5160:31:5160:33 | out : UnmodifiableIterator [<element>, <element>] : Object | provenance |  |
 | Test.java:5159:30:5159:31 | in : Iterator [<element>] : Object | Test.java:5159:10:5159:35 | partition(...) : UnmodifiableIterator [<element>, <element>] : Object | provenance | MaD:279 |
 | Test.java:5160:20:5160:34 | getElement(...) : List [<element>] : Object | Test.java:110:19:110:32 | it : List [<element>] : Object | provenance |  |
-| Test.java:5160:20:5160:34 | getElement(...) : List [<element>] : Object | Test.java:5160:9:5160:35 | getElement(...) | provenance | MaD:555 |
+| Test.java:5160:20:5160:34 | getElement(...) : List [<element>] : Object | Test.java:5160:9:5160:35 | getElement(...) | provenance | MaD:558 |
 | Test.java:5160:31:5160:33 | out : UnmodifiableIterator [<element>, <element>] : Object | Test.java:111:19:111:32 | it : UnmodifiableIterator [<element>, <element>] : Object | provenance |  |
-| Test.java:5160:31:5160:33 | out : UnmodifiableIterator [<element>, <element>] : Object | Test.java:5160:20:5160:34 | getElement(...) : List [<element>] : Object | provenance | MaD:557 |
+| Test.java:5160:31:5160:33 | out : UnmodifiableIterator [<element>, <element>] : Object | Test.java:5160:20:5160:34 | getElement(...) : List [<element>] : Object | provenance | MaD:560 |
 | Test.java:5165:18:5165:55 | (...)... : Iterator [<element>] : Object | Test.java:5166:36:5166:37 | in : Iterator [<element>] : Object | provenance |  |
-| Test.java:5165:28:5165:44 | of(...) : List [<element>] : Object | Test.java:5165:28:5165:55 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:555 |
+| Test.java:5165:28:5165:44 | of(...) : List [<element>] : Object | Test.java:5165:28:5165:55 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:558 |
 | Test.java:5165:28:5165:55 | iterator(...) : Iterator [<element>] : Object | Test.java:5165:18:5165:55 | (...)... : Iterator [<element>] : Object | provenance |  |
-| Test.java:5165:36:5165:43 | source(...) : Object | Test.java:5165:28:5165:44 | of(...) : List [<element>] : Object | provenance | MaD:558 |
+| Test.java:5165:36:5165:43 | source(...) : Object | Test.java:5165:28:5165:44 | of(...) : List [<element>] : Object | provenance | MaD:561 |
 | Test.java:5166:10:5166:38 | peekingIterator(...) : PeekingIterator [<element>] : Object | Test.java:5167:20:5167:22 | out : PeekingIterator [<element>] : Object | provenance |  |
 | Test.java:5166:36:5166:37 | in : Iterator [<element>] : Object | Test.java:5166:10:5166:38 | peekingIterator(...) : PeekingIterator [<element>] : Object | provenance | MaD:280 |
 | Test.java:5167:20:5167:22 | out : PeekingIterator [<element>] : Object | Test.java:111:19:111:32 | it : PeekingIterator [<element>] : Object | provenance |  |
-| Test.java:5167:20:5167:22 | out : PeekingIterator [<element>] : Object | Test.java:5167:9:5167:23 | getElement(...) | provenance | MaD:557 |
+| Test.java:5167:20:5167:22 | out : PeekingIterator [<element>] : Object | Test.java:5167:9:5167:23 | getElement(...) | provenance | MaD:560 |
 | Test.java:5172:25:5172:96 | (...)... : PeekingIterator [<element>] : Object | Test.java:5173:36:5173:37 | in : PeekingIterator [<element>] : Object | provenance |  |
 | Test.java:5172:42:5172:96 | peekingIterator(...) : PeekingIterator [<element>] : Object | Test.java:5172:25:5172:96 | (...)... : PeekingIterator [<element>] : Object | provenance |  |
-| Test.java:5172:68:5172:84 | of(...) : List [<element>] : Object | Test.java:5172:68:5172:95 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:555 |
+| Test.java:5172:68:5172:84 | of(...) : List [<element>] : Object | Test.java:5172:68:5172:95 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:558 |
 | Test.java:5172:68:5172:95 | iterator(...) : Iterator [<element>] : Object | Test.java:5172:42:5172:96 | peekingIterator(...) : PeekingIterator [<element>] : Object | provenance | MaD:280 |
-| Test.java:5172:76:5172:83 | source(...) : Object | Test.java:5172:68:5172:84 | of(...) : List [<element>] : Object | provenance | MaD:558 |
+| Test.java:5172:76:5172:83 | source(...) : Object | Test.java:5172:68:5172:84 | of(...) : List [<element>] : Object | provenance | MaD:561 |
 | Test.java:5173:10:5173:38 | peekingIterator(...) : PeekingIterator [<element>] : Object | Test.java:5174:20:5174:22 | out : PeekingIterator [<element>] : Object | provenance |  |
 | Test.java:5173:36:5173:37 | in : PeekingIterator [<element>] : Object | Test.java:5173:10:5173:38 | peekingIterator(...) : PeekingIterator [<element>] : Object | provenance | MaD:281 |
 | Test.java:5174:20:5174:22 | out : PeekingIterator [<element>] : Object | Test.java:111:19:111:32 | it : PeekingIterator [<element>] : Object | provenance |  |
-| Test.java:5174:20:5174:22 | out : PeekingIterator [<element>] : Object | Test.java:5174:9:5174:23 | getElement(...) | provenance | MaD:557 |
+| Test.java:5174:20:5174:22 | out : PeekingIterator [<element>] : Object | Test.java:5174:9:5174:23 | getElement(...) | provenance | MaD:560 |
 | Test.java:5179:16:5179:31 | (...)... : Object | Test.java:5180:38:5180:39 | in : Object | provenance |  |
 | Test.java:5179:24:5179:31 | source(...) : Object | Test.java:5179:16:5179:31 | (...)... : Object | provenance |  |
 | Test.java:5180:10:5180:40 | singletonIterator(...) : UnmodifiableIterator [<element>] : Object | Test.java:5181:20:5181:22 | out : UnmodifiableIterator [<element>] : Object | provenance |  |
 | Test.java:5180:38:5180:39 | in : Object | Test.java:5180:10:5180:40 | singletonIterator(...) : UnmodifiableIterator [<element>] : Object | provenance | MaD:282 |
 | Test.java:5181:20:5181:22 | out : UnmodifiableIterator [<element>] : Object | Test.java:111:19:111:32 | it : UnmodifiableIterator [<element>] : Object | provenance |  |
-| Test.java:5181:20:5181:22 | out : UnmodifiableIterator [<element>] : Object | Test.java:5181:9:5181:23 | getElement(...) | provenance | MaD:557 |
+| Test.java:5181:20:5181:22 | out : UnmodifiableIterator [<element>] : Object | Test.java:5181:9:5181:23 | getElement(...) | provenance | MaD:560 |
 | Test.java:5186:18:5186:55 | (...)... : Iterator [<element>] : Object | Test.java:5187:28:5187:29 | in : Iterator [<element>] : Object | provenance |  |
-| Test.java:5186:28:5186:44 | of(...) : List [<element>] : Object | Test.java:5186:28:5186:55 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:555 |
+| Test.java:5186:28:5186:44 | of(...) : List [<element>] : Object | Test.java:5186:28:5186:55 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:558 |
 | Test.java:5186:28:5186:55 | iterator(...) : Iterator [<element>] : Object | Test.java:5186:18:5186:55 | (...)... : Iterator [<element>] : Object | provenance |  |
-| Test.java:5186:36:5186:43 | source(...) : Object | Test.java:5186:28:5186:44 | of(...) : List [<element>] : Object | provenance | MaD:558 |
+| Test.java:5186:36:5186:43 | source(...) : Object | Test.java:5186:28:5186:44 | of(...) : List [<element>] : Object | provenance | MaD:561 |
 | Test.java:5187:10:5187:36 | toArray(...) : Object[] [[]] : Object | Test.java:5188:25:5188:27 | out : Object[] [[]] : Object | provenance |  |
 | Test.java:5187:28:5187:29 | in : Iterator [<element>] : Object | Test.java:5187:10:5187:36 | toArray(...) : Object[] [[]] : Object | provenance | MaD:283 |
 | Test.java:5188:25:5188:27 | out : Object[] [[]] : Object | Test.java:107:24:107:32 | array : Object[] [[]] : Object | provenance |  |
 | Test.java:5188:25:5188:27 | out : Object[] [[]] : Object | Test.java:5188:9:5188:28 | getArrayElement(...) | provenance |  |
 | Test.java:5193:18:5193:55 | (...)... : Iterator [<element>] : Object | Test.java:5194:28:5194:29 | in : Iterator [<element>] : Object | provenance |  |
-| Test.java:5193:28:5193:44 | of(...) : List [<element>] : Object | Test.java:5193:28:5193:55 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:555 |
+| Test.java:5193:28:5193:44 | of(...) : List [<element>] : Object | Test.java:5193:28:5193:55 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:558 |
 | Test.java:5193:28:5193:55 | iterator(...) : Iterator [<element>] : Object | Test.java:5193:18:5193:55 | (...)... : Iterator [<element>] : Object | provenance |  |
-| Test.java:5193:36:5193:43 | source(...) : Object | Test.java:5193:28:5193:44 | of(...) : List [<element>] : Object | provenance | MaD:558 |
+| Test.java:5193:36:5193:43 | source(...) : Object | Test.java:5193:28:5193:44 | of(...) : List [<element>] : Object | provenance | MaD:561 |
 | Test.java:5194:10:5194:36 | tryFind(...) : Optional [<element>] : Object | Test.java:5195:20:5195:22 | out : Optional [<element>] : Object | provenance |  |
 | Test.java:5194:28:5194:29 | in : Iterator [<element>] : Object | Test.java:5194:10:5194:36 | tryFind(...) : Optional [<element>] : Object | provenance | MaD:284 |
 | Test.java:5195:20:5195:22 | out : Optional [<element>] : Object | Test.java:112:19:112:31 | o : Optional [<element>] : Object | provenance |  |
 | Test.java:5195:20:5195:22 | out : Optional [<element>] : Object | Test.java:5195:9:5195:23 | getElement(...) | provenance | MaD:1 |
 | Test.java:5200:18:5200:55 | (...)... : Iterator [<element>] : Object | Test.java:5201:41:5201:42 | in : Iterator [<element>] : Object | provenance |  |
-| Test.java:5200:28:5200:44 | of(...) : List [<element>] : Object | Test.java:5200:28:5200:55 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:555 |
+| Test.java:5200:28:5200:44 | of(...) : List [<element>] : Object | Test.java:5200:28:5200:55 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:558 |
 | Test.java:5200:28:5200:55 | iterator(...) : Iterator [<element>] : Object | Test.java:5200:18:5200:55 | (...)... : Iterator [<element>] : Object | provenance |  |
-| Test.java:5200:36:5200:43 | source(...) : Object | Test.java:5200:28:5200:44 | of(...) : List [<element>] : Object | provenance | MaD:558 |
+| Test.java:5200:36:5200:43 | source(...) : Object | Test.java:5200:28:5200:44 | of(...) : List [<element>] : Object | provenance | MaD:561 |
 | Test.java:5201:10:5201:43 | unmodifiableIterator(...) : UnmodifiableIterator [<element>] : Object | Test.java:5202:20:5202:22 | out : UnmodifiableIterator [<element>] : Object | provenance |  |
 | Test.java:5201:41:5201:42 | in : Iterator [<element>] : Object | Test.java:5201:10:5201:43 | unmodifiableIterator(...) : UnmodifiableIterator [<element>] : Object | provenance | MaD:285 |
 | Test.java:5202:20:5202:22 | out : UnmodifiableIterator [<element>] : Object | Test.java:111:19:111:32 | it : UnmodifiableIterator [<element>] : Object | provenance |  |
-| Test.java:5202:20:5202:22 | out : UnmodifiableIterator [<element>] : Object | Test.java:5202:9:5202:23 | getElement(...) | provenance | MaD:557 |
+| Test.java:5202:20:5202:22 | out : UnmodifiableIterator [<element>] : Object | Test.java:5202:9:5202:23 | getElement(...) | provenance | MaD:560 |
 | Test.java:5207:30:5207:111 | (...)... : UnmodifiableIterator [<element>] : Object | Test.java:5208:41:5208:42 | in : UnmodifiableIterator [<element>] : Object | provenance |  |
 | Test.java:5207:52:5207:111 | unmodifiableIterator(...) : UnmodifiableIterator [<element>] : Object | Test.java:5207:30:5207:111 | (...)... : UnmodifiableIterator [<element>] : Object | provenance |  |
-| Test.java:5207:83:5207:99 | of(...) : List [<element>] : Object | Test.java:5207:83:5207:110 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:555 |
+| Test.java:5207:83:5207:99 | of(...) : List [<element>] : Object | Test.java:5207:83:5207:110 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:558 |
 | Test.java:5207:83:5207:110 | iterator(...) : Iterator [<element>] : Object | Test.java:5207:52:5207:111 | unmodifiableIterator(...) : UnmodifiableIterator [<element>] : Object | provenance | MaD:285 |
-| Test.java:5207:91:5207:98 | source(...) : Object | Test.java:5207:83:5207:99 | of(...) : List [<element>] : Object | provenance | MaD:558 |
+| Test.java:5207:91:5207:98 | source(...) : Object | Test.java:5207:83:5207:99 | of(...) : List [<element>] : Object | provenance | MaD:561 |
 | Test.java:5208:10:5208:43 | unmodifiableIterator(...) : UnmodifiableIterator [<element>] : Object | Test.java:5209:20:5209:22 | out : UnmodifiableIterator [<element>] : Object | provenance |  |
 | Test.java:5208:41:5208:42 | in : UnmodifiableIterator [<element>] : Object | Test.java:5208:10:5208:43 | unmodifiableIterator(...) : UnmodifiableIterator [<element>] : Object | provenance | MaD:286 |
 | Test.java:5209:20:5209:22 | out : UnmodifiableIterator [<element>] : Object | Test.java:111:19:111:32 | it : UnmodifiableIterator [<element>] : Object | provenance |  |
-| Test.java:5209:20:5209:22 | out : UnmodifiableIterator [<element>] : Object | Test.java:5209:9:5209:23 | getElement(...) | provenance | MaD:557 |
+| Test.java:5209:20:5209:22 | out : UnmodifiableIterator [<element>] : Object | Test.java:5209:9:5209:23 | getElement(...) | provenance | MaD:560 |
 | Test.java:5214:18:5214:63 | (...)... : ImmutableMultimap [<map.key>] : Object | Test.java:5215:36:5215:37 | in : ImmutableMultimap [<map.key>] : Object | provenance |  |
 | Test.java:5214:28:5214:63 | of(...) : ImmutableMultimap [<map.key>] : Object | Test.java:5214:18:5214:63 | (...)... : ImmutableMultimap [<map.key>] : Object | provenance |  |
-| Test.java:5214:49:5214:56 | source(...) : Object | Test.java:5214:28:5214:63 | of(...) : ImmutableMultimap [<map.key>] : Object | provenance | MaD:103 |
+| Test.java:5214:49:5214:56 | source(...) : Object | Test.java:5214:28:5214:63 | of(...) : ImmutableMultimap [<map.key>] : Object | provenance | MaD:121 |
 | Test.java:5215:10:5215:38 | create(...) : LinkedHashMultimap [<map.key>] : Object | Test.java:5216:19:5216:21 | out : LinkedHashMultimap [<map.key>] : Object | provenance |  |
 | Test.java:5215:36:5215:37 | in : ImmutableMultimap [<map.key>] : Object | Test.java:5215:10:5215:38 | create(...) : LinkedHashMultimap [<map.key>] : Object | provenance | MaD:287 |
 | Test.java:5216:19:5216:21 | out : LinkedHashMultimap [<map.key>] : Object | Test.java:100:18:100:34 | map : LinkedHashMultimap [<map.key>] : Object | provenance |  |
 | Test.java:5216:19:5216:21 | out : LinkedHashMultimap [<map.key>] : Object | Test.java:5216:9:5216:22 | getMapKey(...) | provenance | MaD:373 |
 | Test.java:5221:18:5221:63 | (...)... : ImmutableMultimap [<map.value>] : Object | Test.java:5222:36:5222:37 | in : ImmutableMultimap [<map.value>] : Object | provenance |  |
 | Test.java:5221:28:5221:63 | of(...) : ImmutableMultimap [<map.value>] : Object | Test.java:5221:18:5221:63 | (...)... : ImmutableMultimap [<map.value>] : Object | provenance |  |
-| Test.java:5221:55:5221:62 | source(...) : Object | Test.java:5221:28:5221:63 | of(...) : ImmutableMultimap [<map.value>] : Object | provenance | MaD:104 |
+| Test.java:5221:55:5221:62 | source(...) : Object | Test.java:5221:28:5221:63 | of(...) : ImmutableMultimap [<map.value>] : Object | provenance | MaD:122 |
 | Test.java:5222:10:5222:38 | create(...) : LinkedHashMultimap [<map.value>] : Object | Test.java:5223:21:5223:23 | out : LinkedHashMultimap [<map.value>] : Object | provenance |  |
 | Test.java:5222:36:5222:37 | in : ImmutableMultimap [<map.value>] : Object | Test.java:5222:10:5222:38 | create(...) : LinkedHashMultimap [<map.value>] : Object | provenance | MaD:288 |
 | Test.java:5223:21:5223:23 | out : LinkedHashMultimap [<map.value>] : Object | Test.java:119:20:119:36 | map : LinkedHashMultimap [<map.value>] : Object | provenance |  |
 | Test.java:5223:21:5223:23 | out : LinkedHashMultimap [<map.value>] : Object | Test.java:5223:9:5223:24 | getMapValue(...) | provenance | MaD:385 |
 | Test.java:5228:18:5228:44 | (...)... : List [<element>] : Object | Test.java:5229:36:5229:37 | in : List [<element>] : Object | provenance |  |
 | Test.java:5228:28:5228:44 | of(...) : List [<element>] : Object | Test.java:5228:18:5228:44 | (...)... : List [<element>] : Object | provenance |  |
-| Test.java:5228:36:5228:43 | source(...) : Object | Test.java:5228:28:5228:44 | of(...) : List [<element>] : Object | provenance | MaD:558 |
+| Test.java:5228:36:5228:43 | source(...) : Object | Test.java:5228:28:5228:44 | of(...) : List [<element>] : Object | provenance | MaD:561 |
 | Test.java:5229:10:5229:38 | create(...) : LinkedHashMultiset [<element>] : Object | Test.java:5230:20:5230:22 | out : LinkedHashMultiset [<element>] : Object | provenance |  |
 | Test.java:5229:36:5229:37 | in : List [<element>] : Object | Test.java:5229:10:5229:38 | create(...) : LinkedHashMultiset [<element>] : Object | provenance | MaD:289 |
 | Test.java:5230:20:5230:22 | out : LinkedHashMultiset [<element>] : Object | Test.java:110:19:110:32 | it : LinkedHashMultiset [<element>] : Object | provenance |  |
-| Test.java:5230:20:5230:22 | out : LinkedHashMultiset [<element>] : Object | Test.java:5230:9:5230:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:5230:20:5230:22 | out : LinkedHashMultiset [<element>] : Object | Test.java:5230:9:5230:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:5235:18:5235:63 | (...)... : ImmutableMultimap [<map.key>] : Object | Test.java:5236:36:5236:37 | in : ImmutableMultimap [<map.key>] : Object | provenance |  |
 | Test.java:5235:28:5235:63 | of(...) : ImmutableMultimap [<map.key>] : Object | Test.java:5235:18:5235:63 | (...)... : ImmutableMultimap [<map.key>] : Object | provenance |  |
-| Test.java:5235:49:5235:56 | source(...) : Object | Test.java:5235:28:5235:63 | of(...) : ImmutableMultimap [<map.key>] : Object | provenance | MaD:103 |
+| Test.java:5235:49:5235:56 | source(...) : Object | Test.java:5235:28:5235:63 | of(...) : ImmutableMultimap [<map.key>] : Object | provenance | MaD:121 |
 | Test.java:5236:10:5236:38 | create(...) : LinkedListMultimap [<map.key>] : Object | Test.java:5237:19:5237:21 | out : LinkedListMultimap [<map.key>] : Object | provenance |  |
 | Test.java:5236:36:5236:37 | in : ImmutableMultimap [<map.key>] : Object | Test.java:5236:10:5236:38 | create(...) : LinkedListMultimap [<map.key>] : Object | provenance | MaD:290 |
 | Test.java:5237:19:5237:21 | out : LinkedListMultimap [<map.key>] : Object | Test.java:100:18:100:34 | map : LinkedListMultimap [<map.key>] : Object | provenance |  |
 | Test.java:5237:19:5237:21 | out : LinkedListMultimap [<map.key>] : Object | Test.java:5237:9:5237:22 | getMapKey(...) | provenance | MaD:373 |
 | Test.java:5242:18:5242:63 | (...)... : ImmutableMultimap [<map.value>] : Object | Test.java:5243:36:5243:37 | in : ImmutableMultimap [<map.value>] : Object | provenance |  |
 | Test.java:5242:28:5242:63 | of(...) : ImmutableMultimap [<map.value>] : Object | Test.java:5242:18:5242:63 | (...)... : ImmutableMultimap [<map.value>] : Object | provenance |  |
-| Test.java:5242:55:5242:62 | source(...) : Object | Test.java:5242:28:5242:63 | of(...) : ImmutableMultimap [<map.value>] : Object | provenance | MaD:104 |
+| Test.java:5242:55:5242:62 | source(...) : Object | Test.java:5242:28:5242:63 | of(...) : ImmutableMultimap [<map.value>] : Object | provenance | MaD:122 |
 | Test.java:5243:10:5243:38 | create(...) : LinkedListMultimap [<map.value>] : Object | Test.java:5244:21:5244:23 | out : LinkedListMultimap [<map.value>] : Object | provenance |  |
 | Test.java:5243:36:5243:37 | in : ImmutableMultimap [<map.value>] : Object | Test.java:5243:10:5243:38 | create(...) : LinkedListMultimap [<map.value>] : Object | provenance | MaD:291 |
 | Test.java:5244:21:5244:23 | out : LinkedListMultimap [<map.value>] : Object | Test.java:119:20:119:36 | map : LinkedListMultimap [<map.value>] : Object | provenance |  |
@@ -5782,332 +5782,332 @@ edges
 | Test.java:5250:10:5250:37 | asList(...) : List [<element>] : Object | Test.java:5251:20:5251:22 | out : List [<element>] : Object | provenance |  |
 | Test.java:5250:29:5250:30 | in : Object | Test.java:5250:10:5250:37 | asList(...) : List [<element>] : Object | provenance | MaD:292 |
 | Test.java:5251:20:5251:22 | out : List [<element>] : Object | Test.java:110:19:110:32 | it : List [<element>] : Object | provenance |  |
-| Test.java:5251:20:5251:22 | out : List [<element>] : Object | Test.java:5251:9:5251:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:5251:20:5251:22 | out : List [<element>] : Object | Test.java:5251:9:5251:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:5256:16:5256:31 | (...)... : Object | Test.java:5257:23:5257:24 | in : Object | provenance |  |
 | Test.java:5256:24:5256:31 | source(...) : Object | Test.java:5256:16:5256:31 | (...)... : Object | provenance |  |
 | Test.java:5257:10:5257:37 | asList(...) : List [<element>] : Object | Test.java:5258:20:5258:22 | out : List [<element>] : Object | provenance |  |
 | Test.java:5257:23:5257:24 | in : Object | Test.java:5257:10:5257:37 | asList(...) : List [<element>] : Object | provenance | MaD:292 |
 | Test.java:5258:20:5258:22 | out : List [<element>] : Object | Test.java:110:19:110:32 | it : List [<element>] : Object | provenance |  |
-| Test.java:5258:20:5258:22 | out : List [<element>] : Object | Test.java:5258:9:5258:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:5258:20:5258:22 | out : List [<element>] : Object | Test.java:5258:9:5258:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:5263:18:5263:49 | (...)... : Object[] [[]] : Object | Test.java:5264:35:5264:36 | in : Object[] [[]] : Object | provenance |  |
 | Test.java:5263:28:5263:49 | {...} : Object[] [[]] : Object | Test.java:5263:18:5263:49 | (...)... : Object[] [[]] : Object | provenance |  |
 | Test.java:5263:41:5263:48 | source(...) : Object | Test.java:5263:28:5263:49 | {...} : Object[] [[]] : Object | provenance |  |
 | Test.java:5264:10:5264:37 | asList(...) : List [<element>] : Object | Test.java:5265:20:5265:22 | out : List [<element>] : Object | provenance |  |
 | Test.java:5264:35:5264:36 | in : Object[] [[]] : Object | Test.java:5264:10:5264:37 | asList(...) : List [<element>] : Object | provenance | MaD:293 |
 | Test.java:5265:20:5265:22 | out : List [<element>] : Object | Test.java:110:19:110:32 | it : List [<element>] : Object | provenance |  |
-| Test.java:5265:20:5265:22 | out : List [<element>] : Object | Test.java:5265:9:5265:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:5265:20:5265:22 | out : List [<element>] : Object | Test.java:5265:9:5265:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:5270:16:5270:31 | (...)... : Object | Test.java:5271:23:5271:24 | in : Object | provenance |  |
 | Test.java:5270:24:5270:31 | source(...) : Object | Test.java:5270:16:5270:31 | (...)... : Object | provenance |  |
 | Test.java:5271:10:5271:31 | asList(...) : List [<element>] : Object | Test.java:5272:20:5272:22 | out : List [<element>] : Object | provenance |  |
 | Test.java:5271:23:5271:24 | in : Object | Test.java:5271:10:5271:31 | asList(...) : List [<element>] : Object | provenance | MaD:294 |
 | Test.java:5272:20:5272:22 | out : List [<element>] : Object | Test.java:110:19:110:32 | it : List [<element>] : Object | provenance |  |
-| Test.java:5272:20:5272:22 | out : List [<element>] : Object | Test.java:5272:9:5272:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:5272:20:5272:22 | out : List [<element>] : Object | Test.java:5272:9:5272:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:5277:18:5277:49 | (...)... : Object[] [[]] : Object | Test.java:5278:29:5278:30 | in : Object[] [[]] : Object | provenance |  |
 | Test.java:5277:28:5277:49 | {...} : Object[] [[]] : Object | Test.java:5277:18:5277:49 | (...)... : Object[] [[]] : Object | provenance |  |
 | Test.java:5277:41:5277:48 | source(...) : Object | Test.java:5277:28:5277:49 | {...} : Object[] [[]] : Object | provenance |  |
 | Test.java:5278:10:5278:31 | asList(...) : List [<element>] : Object | Test.java:5279:20:5279:22 | out : List [<element>] : Object | provenance |  |
 | Test.java:5278:29:5278:30 | in : Object[] [[]] : Object | Test.java:5278:10:5278:31 | asList(...) : List [<element>] : Object | provenance | MaD:295 |
 | Test.java:5279:20:5279:22 | out : List [<element>] : Object | Test.java:110:19:110:32 | it : List [<element>] : Object | provenance |  |
-| Test.java:5279:20:5279:22 | out : List [<element>] : Object | Test.java:5279:9:5279:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:5279:20:5279:22 | out : List [<element>] : Object | Test.java:5279:9:5279:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:5284:14:5284:45 | (...)... : List [<element>, <element>] : Object | Test.java:5285:33:5285:34 | in : List [<element>, <element>] : Object | provenance |  |
 | Test.java:5284:20:5284:45 | of(...) : List [<element>, <element>] : Object | Test.java:5284:14:5284:45 | (...)... : List [<element>, <element>] : Object | provenance |  |
-| Test.java:5284:28:5284:44 | of(...) : List [<element>] : Object | Test.java:5284:20:5284:45 | of(...) : List [<element>, <element>] : Object | provenance | MaD:558 |
-| Test.java:5284:36:5284:43 | source(...) : Object | Test.java:5284:28:5284:44 | of(...) : List [<element>] : Object | provenance | MaD:558 |
+| Test.java:5284:28:5284:44 | of(...) : List [<element>] : Object | Test.java:5284:20:5284:45 | of(...) : List [<element>, <element>] : Object | provenance | MaD:561 |
+| Test.java:5284:36:5284:43 | source(...) : Object | Test.java:5284:28:5284:44 | of(...) : List [<element>] : Object | provenance | MaD:561 |
 | Test.java:5285:10:5285:35 | cartesianProduct(...) : List [<element>, <element>] : Object | Test.java:5286:31:5286:33 | out : List [<element>, <element>] : Object | provenance |  |
 | Test.java:5285:33:5285:34 | in : List [<element>, <element>] : Object | Test.java:5285:10:5285:35 | cartesianProduct(...) : List [<element>, <element>] : Object | provenance | MaD:296 |
 | Test.java:5286:20:5286:34 | getElement(...) : List [<element>] : Object | Test.java:110:19:110:32 | it : List [<element>] : Object | provenance |  |
-| Test.java:5286:20:5286:34 | getElement(...) : List [<element>] : Object | Test.java:5286:9:5286:35 | getElement(...) | provenance | MaD:555 |
+| Test.java:5286:20:5286:34 | getElement(...) : List [<element>] : Object | Test.java:5286:9:5286:35 | getElement(...) | provenance | MaD:558 |
 | Test.java:5286:31:5286:33 | out : List [<element>, <element>] : Object | Test.java:110:19:110:32 | it : List [<element>, <element>] : Object | provenance |  |
-| Test.java:5286:31:5286:33 | out : List [<element>, <element>] : Object | Test.java:5286:20:5286:34 | getElement(...) : List [<element>] : Object | provenance | MaD:555 |
+| Test.java:5286:31:5286:33 | out : List [<element>, <element>] : Object | Test.java:5286:20:5286:34 | getElement(...) : List [<element>] : Object | provenance | MaD:558 |
 | Test.java:5291:16:5291:58 | (...)... : List[] [[], <element>] : Object | Test.java:5292:33:5292:34 | in : List[] [[], <element>] : Object | provenance |  |
 | Test.java:5291:24:5291:58 | {...} : List[] [[], <element>] : Object | Test.java:5291:16:5291:58 | (...)... : List[] [[], <element>] : Object | provenance |  |
 | Test.java:5291:35:5291:57 | (...)... : List [<element>] : Object | Test.java:5291:24:5291:58 | {...} : List[] [[], <element>] : Object | provenance |  |
 | Test.java:5291:41:5291:57 | of(...) : List [<element>] : Object | Test.java:5291:35:5291:57 | (...)... : List [<element>] : Object | provenance |  |
-| Test.java:5291:49:5291:56 | source(...) : Object | Test.java:5291:41:5291:57 | of(...) : List [<element>] : Object | provenance | MaD:558 |
+| Test.java:5291:49:5291:56 | source(...) : Object | Test.java:5291:41:5291:57 | of(...) : List [<element>] : Object | provenance | MaD:561 |
 | Test.java:5292:10:5292:35 | cartesianProduct(...) : List [<element>, <element>] : Object | Test.java:5293:31:5293:33 | out : List [<element>, <element>] : Object | provenance |  |
 | Test.java:5292:33:5292:34 | in : List[] [[], <element>] : Object | Test.java:5292:10:5292:35 | cartesianProduct(...) : List [<element>, <element>] : Object | provenance | MaD:297 |
 | Test.java:5293:20:5293:34 | getElement(...) : List [<element>] : Object | Test.java:110:19:110:32 | it : List [<element>] : Object | provenance |  |
-| Test.java:5293:20:5293:34 | getElement(...) : List [<element>] : Object | Test.java:5293:9:5293:35 | getElement(...) | provenance | MaD:555 |
+| Test.java:5293:20:5293:34 | getElement(...) : List [<element>] : Object | Test.java:5293:9:5293:35 | getElement(...) | provenance | MaD:558 |
 | Test.java:5293:31:5293:33 | out : List [<element>, <element>] : Object | Test.java:110:19:110:32 | it : List [<element>, <element>] : Object | provenance |  |
-| Test.java:5293:31:5293:33 | out : List [<element>, <element>] : Object | Test.java:5293:20:5293:34 | getElement(...) : List [<element>] : Object | provenance | MaD:555 |
+| Test.java:5293:31:5293:33 | out : List [<element>, <element>] : Object | Test.java:5293:20:5293:34 | getElement(...) : List [<element>] : Object | provenance | MaD:558 |
 | Test.java:5298:22:5298:43 | (...)... : CharSequence | Test.java:5299:29:5299:30 | in : CharSequence | provenance |  |
 | Test.java:5298:36:5298:43 | source(...) : Object | Test.java:5298:22:5298:43 | (...)... : CharSequence | provenance |  |
 | Test.java:5299:10:5299:31 | charactersOf(...) : List [<element>] : Object | Test.java:5300:20:5300:22 | out : List [<element>] : Object | provenance |  |
 | Test.java:5299:29:5299:30 | in : CharSequence | Test.java:5299:10:5299:31 | charactersOf(...) : List [<element>] : Object | provenance | MaD:298 |
 | Test.java:5300:20:5300:22 | out : List [<element>] : Object | Test.java:110:19:110:32 | it : List [<element>] : Object | provenance |  |
-| Test.java:5300:20:5300:22 | out : List [<element>] : Object | Test.java:5300:9:5300:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:5300:20:5300:22 | out : List [<element>] : Object | Test.java:5300:9:5300:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:5305:16:5305:31 | (...)... : String | Test.java:5306:29:5306:30 | in : String | provenance |  |
 | Test.java:5305:24:5305:31 | source(...) : Object | Test.java:5305:16:5305:31 | (...)... : String | provenance |  |
 | Test.java:5306:10:5306:31 | charactersOf(...) : ImmutableList [<element>] : Object | Test.java:5307:20:5307:22 | out : ImmutableList [<element>] : Object | provenance |  |
 | Test.java:5306:29:5306:30 | in : String | Test.java:5306:10:5306:31 | charactersOf(...) : ImmutableList [<element>] : Object | provenance | MaD:299 |
 | Test.java:5307:20:5307:22 | out : ImmutableList [<element>] : Object | Test.java:110:19:110:32 | it : ImmutableList [<element>] : Object | provenance |  |
-| Test.java:5307:20:5307:22 | out : ImmutableList [<element>] : Object | Test.java:5307:9:5307:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:5307:20:5307:22 | out : ImmutableList [<element>] : Object | Test.java:5307:9:5307:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:5312:18:5312:44 | (...)... : List [<element>] : Object | Test.java:5313:29:5313:30 | in : List [<element>] : Object | provenance |  |
 | Test.java:5312:28:5312:44 | of(...) : List [<element>] : Object | Test.java:5312:18:5312:44 | (...)... : List [<element>] : Object | provenance |  |
-| Test.java:5312:36:5312:43 | source(...) : Object | Test.java:5312:28:5312:44 | of(...) : List [<element>] : Object | provenance | MaD:558 |
+| Test.java:5312:36:5312:43 | source(...) : Object | Test.java:5312:28:5312:44 | of(...) : List [<element>] : Object | provenance | MaD:561 |
 | Test.java:5313:10:5313:31 | newArrayList(...) : ArrayList [<element>] : Object | Test.java:5314:20:5314:22 | out : ArrayList [<element>] : Object | provenance |  |
 | Test.java:5313:29:5313:30 | in : List [<element>] : Object | Test.java:5313:10:5313:31 | newArrayList(...) : ArrayList [<element>] : Object | provenance | MaD:300 |
 | Test.java:5314:20:5314:22 | out : ArrayList [<element>] : Object | Test.java:110:19:110:32 | it : ArrayList [<element>] : Object | provenance |  |
-| Test.java:5314:20:5314:22 | out : ArrayList [<element>] : Object | Test.java:5314:9:5314:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:5314:20:5314:22 | out : ArrayList [<element>] : Object | Test.java:5314:9:5314:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:5319:18:5319:55 | (...)... : Iterator [<element>] : Object | Test.java:5320:29:5320:30 | in : Iterator [<element>] : Object | provenance |  |
-| Test.java:5319:28:5319:44 | of(...) : List [<element>] : Object | Test.java:5319:28:5319:55 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:555 |
+| Test.java:5319:28:5319:44 | of(...) : List [<element>] : Object | Test.java:5319:28:5319:55 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:558 |
 | Test.java:5319:28:5319:55 | iterator(...) : Iterator [<element>] : Object | Test.java:5319:18:5319:55 | (...)... : Iterator [<element>] : Object | provenance |  |
-| Test.java:5319:36:5319:43 | source(...) : Object | Test.java:5319:28:5319:44 | of(...) : List [<element>] : Object | provenance | MaD:558 |
+| Test.java:5319:36:5319:43 | source(...) : Object | Test.java:5319:28:5319:44 | of(...) : List [<element>] : Object | provenance | MaD:561 |
 | Test.java:5320:10:5320:31 | newArrayList(...) : ArrayList [<element>] : Object | Test.java:5321:20:5321:22 | out : ArrayList [<element>] : Object | provenance |  |
 | Test.java:5320:29:5320:30 | in : Iterator [<element>] : Object | Test.java:5320:10:5320:31 | newArrayList(...) : ArrayList [<element>] : Object | provenance | MaD:301 |
 | Test.java:5321:20:5321:22 | out : ArrayList [<element>] : Object | Test.java:110:19:110:32 | it : ArrayList [<element>] : Object | provenance |  |
-| Test.java:5321:20:5321:22 | out : ArrayList [<element>] : Object | Test.java:5321:9:5321:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:5321:20:5321:22 | out : ArrayList [<element>] : Object | Test.java:5321:9:5321:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:5326:18:5326:49 | (...)... : Object[] [[]] : Object | Test.java:5327:29:5327:30 | in : Object[] [[]] : Object | provenance |  |
 | Test.java:5326:28:5326:49 | {...} : Object[] [[]] : Object | Test.java:5326:18:5326:49 | (...)... : Object[] [[]] : Object | provenance |  |
 | Test.java:5326:41:5326:48 | source(...) : Object | Test.java:5326:28:5326:49 | {...} : Object[] [[]] : Object | provenance |  |
 | Test.java:5327:10:5327:31 | newArrayList(...) : ArrayList [<element>] : Object | Test.java:5328:20:5328:22 | out : ArrayList [<element>] : Object | provenance |  |
 | Test.java:5327:29:5327:30 | in : Object[] [[]] : Object | Test.java:5327:10:5327:31 | newArrayList(...) : ArrayList [<element>] : Object | provenance | MaD:302 |
 | Test.java:5328:20:5328:22 | out : ArrayList [<element>] : Object | Test.java:110:19:110:32 | it : ArrayList [<element>] : Object | provenance |  |
-| Test.java:5328:20:5328:22 | out : ArrayList [<element>] : Object | Test.java:5328:9:5328:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:5328:20:5328:22 | out : ArrayList [<element>] : Object | Test.java:5328:9:5328:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:5333:18:5333:44 | (...)... : List [<element>] : Object | Test.java:5334:40:5334:41 | in : List [<element>] : Object | provenance |  |
 | Test.java:5333:28:5333:44 | of(...) : List [<element>] : Object | Test.java:5333:18:5333:44 | (...)... : List [<element>] : Object | provenance |  |
-| Test.java:5333:36:5333:43 | source(...) : Object | Test.java:5333:28:5333:44 | of(...) : List [<element>] : Object | provenance | MaD:558 |
+| Test.java:5333:36:5333:43 | source(...) : Object | Test.java:5333:28:5333:44 | of(...) : List [<element>] : Object | provenance | MaD:561 |
 | Test.java:5334:10:5334:42 | newCopyOnWriteArrayList(...) : CopyOnWriteArrayList [<element>] : Object | Test.java:5335:20:5335:22 | out : CopyOnWriteArrayList [<element>] : Object | provenance |  |
 | Test.java:5334:40:5334:41 | in : List [<element>] : Object | Test.java:5334:10:5334:42 | newCopyOnWriteArrayList(...) : CopyOnWriteArrayList [<element>] : Object | provenance | MaD:303 |
 | Test.java:5335:20:5335:22 | out : CopyOnWriteArrayList [<element>] : Object | Test.java:110:19:110:32 | it : CopyOnWriteArrayList [<element>] : Object | provenance |  |
-| Test.java:5335:20:5335:22 | out : CopyOnWriteArrayList [<element>] : Object | Test.java:5335:9:5335:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:5335:20:5335:22 | out : CopyOnWriteArrayList [<element>] : Object | Test.java:5335:9:5335:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:5340:18:5340:44 | (...)... : List [<element>] : Object | Test.java:5341:30:5341:31 | in : List [<element>] : Object | provenance |  |
 | Test.java:5340:28:5340:44 | of(...) : List [<element>] : Object | Test.java:5340:18:5340:44 | (...)... : List [<element>] : Object | provenance |  |
-| Test.java:5340:36:5340:43 | source(...) : Object | Test.java:5340:28:5340:44 | of(...) : List [<element>] : Object | provenance | MaD:558 |
+| Test.java:5340:36:5340:43 | source(...) : Object | Test.java:5340:28:5340:44 | of(...) : List [<element>] : Object | provenance | MaD:561 |
 | Test.java:5341:10:5341:32 | newLinkedList(...) : LinkedList [<element>] : Object | Test.java:5342:20:5342:22 | out : LinkedList [<element>] : Object | provenance |  |
 | Test.java:5341:30:5341:31 | in : List [<element>] : Object | Test.java:5341:10:5341:32 | newLinkedList(...) : LinkedList [<element>] : Object | provenance | MaD:304 |
 | Test.java:5342:20:5342:22 | out : LinkedList [<element>] : Object | Test.java:110:19:110:32 | it : LinkedList [<element>] : Object | provenance |  |
-| Test.java:5342:20:5342:22 | out : LinkedList [<element>] : Object | Test.java:5342:9:5342:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:5342:20:5342:22 | out : LinkedList [<element>] : Object | Test.java:5342:9:5342:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:5347:14:5347:36 | (...)... : List [<element>] : Object | Test.java:5348:26:5348:27 | in : List [<element>] : Object | provenance |  |
 | Test.java:5347:20:5347:36 | of(...) : List [<element>] : Object | Test.java:5347:14:5347:36 | (...)... : List [<element>] : Object | provenance |  |
-| Test.java:5347:28:5347:35 | source(...) : Object | Test.java:5347:20:5347:36 | of(...) : List [<element>] : Object | provenance | MaD:558 |
+| Test.java:5347:28:5347:35 | source(...) : Object | Test.java:5347:20:5347:36 | of(...) : List [<element>] : Object | provenance | MaD:561 |
 | Test.java:5348:10:5348:31 | partition(...) : List [<element>, <element>] : Object | Test.java:5349:31:5349:33 | out : List [<element>, <element>] : Object | provenance |  |
 | Test.java:5348:26:5348:27 | in : List [<element>] : Object | Test.java:5348:10:5348:31 | partition(...) : List [<element>, <element>] : Object | provenance | MaD:305 |
 | Test.java:5349:20:5349:34 | getElement(...) : List [<element>] : Object | Test.java:110:19:110:32 | it : List [<element>] : Object | provenance |  |
-| Test.java:5349:20:5349:34 | getElement(...) : List [<element>] : Object | Test.java:5349:9:5349:35 | getElement(...) | provenance | MaD:555 |
+| Test.java:5349:20:5349:34 | getElement(...) : List [<element>] : Object | Test.java:5349:9:5349:35 | getElement(...) | provenance | MaD:558 |
 | Test.java:5349:31:5349:33 | out : List [<element>, <element>] : Object | Test.java:110:19:110:32 | it : List [<element>, <element>] : Object | provenance |  |
-| Test.java:5349:31:5349:33 | out : List [<element>, <element>] : Object | Test.java:5349:20:5349:34 | getElement(...) : List [<element>] : Object | provenance | MaD:555 |
+| Test.java:5349:31:5349:33 | out : List [<element>, <element>] : Object | Test.java:5349:20:5349:34 | getElement(...) : List [<element>] : Object | provenance | MaD:558 |
 | Test.java:5354:14:5354:36 | (...)... : List [<element>] : Object | Test.java:5355:24:5355:25 | in : List [<element>] : Object | provenance |  |
 | Test.java:5354:20:5354:36 | of(...) : List [<element>] : Object | Test.java:5354:14:5354:36 | (...)... : List [<element>] : Object | provenance |  |
-| Test.java:5354:28:5354:35 | source(...) : Object | Test.java:5354:20:5354:36 | of(...) : List [<element>] : Object | provenance | MaD:558 |
+| Test.java:5354:28:5354:35 | source(...) : Object | Test.java:5354:20:5354:36 | of(...) : List [<element>] : Object | provenance | MaD:561 |
 | Test.java:5355:10:5355:26 | reverse(...) : List [<element>] : Object | Test.java:5356:20:5356:22 | out : List [<element>] : Object | provenance |  |
 | Test.java:5355:24:5355:25 | in : List [<element>] : Object | Test.java:5355:10:5355:26 | reverse(...) : List [<element>] : Object | provenance | MaD:306 |
 | Test.java:5356:20:5356:22 | out : List [<element>] : Object | Test.java:110:19:110:32 | it : List [<element>] : Object | provenance |  |
-| Test.java:5356:20:5356:22 | out : List [<element>] : Object | Test.java:5356:9:5356:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:5356:20:5356:22 | out : List [<element>] : Object | Test.java:5356:9:5356:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:5361:39:5361:106 | (...)... : ValueDifference [com.google.common.collect.MapDifference.left] : Object | Test.java:5362:10:5362:11 | in : ValueDifference [com.google.common.collect.MapDifference.left] : Object | provenance |  |
 | Test.java:5361:70:5361:106 | newMapValueDifference(...) : ValueDifference [com.google.common.collect.MapDifference.left] : Object | Test.java:5361:39:5361:106 | (...)... : ValueDifference [com.google.common.collect.MapDifference.left] : Object | provenance |  |
 | Test.java:5361:92:5361:99 | source(...) : Object | Test.java:114:58:114:60 | l : Object | provenance |  |
-| Test.java:5361:92:5361:99 | source(...) : Object | Test.java:5361:70:5361:106 | newMapValueDifference(...) : ValueDifference [com.google.common.collect.MapDifference.left] : Object | provenance | MaD:564 |
-| Test.java:5362:10:5362:11 | in : ValueDifference [com.google.common.collect.MapDifference.left] : Object | Test.java:5362:10:5362:23 | leftValue(...) : Object | provenance | MaD:319 |
+| Test.java:5361:92:5361:99 | source(...) : Object | Test.java:5361:70:5361:106 | newMapValueDifference(...) : ValueDifference [com.google.common.collect.MapDifference.left] : Object | provenance | MaD:565 |
+| Test.java:5362:10:5362:11 | in : ValueDifference [com.google.common.collect.MapDifference.left] : Object | Test.java:5362:10:5362:23 | leftValue(...) : Object | provenance | MaD:307 |
 | Test.java:5362:10:5362:23 | leftValue(...) : Object | Test.java:5363:9:5363:11 | out | provenance |  |
 | Test.java:5368:39:5368:106 | (...)... : ValueDifference [com.google.common.collect.MapDifference.right] : Object | Test.java:5369:10:5369:11 | in : ValueDifference [com.google.common.collect.MapDifference.right] : Object | provenance |  |
 | Test.java:5368:70:5368:106 | newMapValueDifference(...) : ValueDifference [com.google.common.collect.MapDifference.right] : Object | Test.java:5368:39:5368:106 | (...)... : ValueDifference [com.google.common.collect.MapDifference.right] : Object | provenance |  |
 | Test.java:5368:98:5368:105 | source(...) : Object | Test.java:114:63:114:65 | r : Object | provenance |  |
-| Test.java:5368:98:5368:105 | source(...) : Object | Test.java:5368:70:5368:106 | newMapValueDifference(...) : ValueDifference [com.google.common.collect.MapDifference.right] : Object | provenance | MaD:564 |
-| Test.java:5369:10:5369:11 | in : ValueDifference [com.google.common.collect.MapDifference.right] : Object | Test.java:5369:10:5369:24 | rightValue(...) : Object | provenance | MaD:320 |
+| Test.java:5368:98:5368:105 | source(...) : Object | Test.java:5368:70:5368:106 | newMapValueDifference(...) : ValueDifference [com.google.common.collect.MapDifference.right] : Object | provenance | MaD:565 |
+| Test.java:5369:10:5369:11 | in : ValueDifference [com.google.common.collect.MapDifference.right] : Object | Test.java:5369:10:5369:24 | rightValue(...) : Object | provenance | MaD:308 |
 | Test.java:5369:10:5369:24 | rightValue(...) : Object | Test.java:5370:9:5370:11 | out | provenance |  |
 | Test.java:5375:29:5375:121 | (...)... : SortedMapDifference [com.google.common.collect.MapDifference.left, <map.key>] : Comparable | Test.java:5376:10:5376:11 | in : SortedMapDifference [com.google.common.collect.MapDifference.left, <map.key>] : Comparable | provenance |  |
 | Test.java:5375:50:5375:121 | difference(...) : SortedMapDifference [com.google.common.collect.MapDifference.left, <map.key>] : Comparable | Test.java:5375:29:5375:121 | (...)... : SortedMapDifference [com.google.common.collect.MapDifference.left, <map.key>] : Comparable | provenance |  |
 | Test.java:5375:66:5375:114 | of(...) : ImmutableSortedMap [<map.key>] : Comparable | Test.java:5375:50:5375:121 | difference(...) : SortedMapDifference [com.google.common.collect.MapDifference.left, <map.key>] : Comparable | provenance | MaD:332 |
 | Test.java:5375:88:5375:107 | (...)... : Comparable | Test.java:5375:66:5375:114 | of(...) : ImmutableSortedMap [<map.key>] : Comparable | provenance | MaD:165 |
 | Test.java:5375:100:5375:107 | source(...) : Object | Test.java:5375:88:5375:107 | (...)... : Comparable | provenance |  |
-| Test.java:5376:10:5376:11 | in : SortedMapDifference [com.google.common.collect.MapDifference.left, <map.key>] : Comparable | Test.java:5376:10:5376:30 | entriesDiffering(...) : SortedMap [<map.key>] : Comparable | provenance | MaD:307 |
+| Test.java:5376:10:5376:11 | in : SortedMapDifference [com.google.common.collect.MapDifference.left, <map.key>] : Comparable | Test.java:5376:10:5376:30 | entriesDiffering(...) : SortedMap [<map.key>] : Comparable | provenance | MaD:309 |
 | Test.java:5376:10:5376:30 | entriesDiffering(...) : SortedMap [<map.key>] : Comparable | Test.java:5377:19:5377:21 | out : SortedMap [<map.key>] : Comparable | provenance |  |
 | Test.java:5377:19:5377:21 | out : SortedMap [<map.key>] : Comparable | Test.java:99:18:99:29 | map : SortedMap [<map.key>] : Comparable | provenance |  |
-| Test.java:5377:19:5377:21 | out : SortedMap [<map.key>] : Comparable | Test.java:5377:9:5377:22 | getMapKey(...) | provenance | MaD:562 |
+| Test.java:5377:19:5377:21 | out : SortedMap [<map.key>] : Comparable | Test.java:5377:9:5377:22 | getMapKey(...) | provenance | MaD:569 |
 | Test.java:5382:23:5382:82 | (...)... : MapDifference [com.google.common.collect.MapDifference.left, <map.key>] : Object | Test.java:5383:10:5383:11 | in : MapDifference [com.google.common.collect.MapDifference.left, <map.key>] : Object | provenance |  |
 | Test.java:5382:38:5382:82 | difference(...) : MapDifference [com.google.common.collect.MapDifference.left, <map.key>] : Object | Test.java:5382:23:5382:82 | (...)... : MapDifference [com.google.common.collect.MapDifference.left, <map.key>] : Object | provenance |  |
 | Test.java:5382:54:5382:75 | of(...) : Map [<map.key>] : Object | Test.java:5382:38:5382:82 | difference(...) : MapDifference [com.google.common.collect.MapDifference.left, <map.key>] : Object | provenance | MaD:324 |
-| Test.java:5382:61:5382:68 | source(...) : Object | Test.java:5382:54:5382:75 | of(...) : Map [<map.key>] : Object | provenance | MaD:563 |
-| Test.java:5383:10:5383:11 | in : MapDifference [com.google.common.collect.MapDifference.left, <map.key>] : Object | Test.java:5383:10:5383:30 | entriesDiffering(...) : Map [<map.key>] : Object | provenance | MaD:307 |
+| Test.java:5382:61:5382:68 | source(...) : Object | Test.java:5382:54:5382:75 | of(...) : Map [<map.key>] : Object | provenance | MaD:564 |
+| Test.java:5383:10:5383:11 | in : MapDifference [com.google.common.collect.MapDifference.left, <map.key>] : Object | Test.java:5383:10:5383:30 | entriesDiffering(...) : Map [<map.key>] : Object | provenance | MaD:309 |
 | Test.java:5383:10:5383:30 | entriesDiffering(...) : Map [<map.key>] : Object | Test.java:5384:19:5384:21 | out : Map [<map.key>] : Object | provenance |  |
 | Test.java:5384:19:5384:21 | out : Map [<map.key>] : Object | Test.java:99:18:99:29 | map : Map [<map.key>] : Object | provenance |  |
-| Test.java:5384:19:5384:21 | out : Map [<map.key>] : Object | Test.java:5384:9:5384:22 | getMapKey(...) | provenance | MaD:562 |
+| Test.java:5384:19:5384:21 | out : Map [<map.key>] : Object | Test.java:5384:9:5384:22 | getMapKey(...) | provenance | MaD:569 |
 | Test.java:5389:29:5389:121 | (...)... : SortedMapDifference [com.google.common.collect.MapDifference.right, <map.key>] : Comparable | Test.java:5390:10:5390:11 | in : SortedMapDifference [com.google.common.collect.MapDifference.right, <map.key>] : Comparable | provenance |  |
 | Test.java:5389:50:5389:121 | difference(...) : SortedMapDifference [com.google.common.collect.MapDifference.right, <map.key>] : Comparable | Test.java:5389:29:5389:121 | (...)... : SortedMapDifference [com.google.common.collect.MapDifference.right, <map.key>] : Comparable | provenance |  |
 | Test.java:5389:72:5389:120 | of(...) : ImmutableSortedMap [<map.key>] : Comparable | Test.java:5389:50:5389:121 | difference(...) : SortedMapDifference [com.google.common.collect.MapDifference.right, <map.key>] : Comparable | provenance | MaD:334 |
 | Test.java:5389:94:5389:113 | (...)... : Comparable | Test.java:5389:72:5389:120 | of(...) : ImmutableSortedMap [<map.key>] : Comparable | provenance | MaD:165 |
 | Test.java:5389:106:5389:113 | source(...) : Object | Test.java:5389:94:5389:113 | (...)... : Comparable | provenance |  |
-| Test.java:5390:10:5390:11 | in : SortedMapDifference [com.google.common.collect.MapDifference.right, <map.key>] : Comparable | Test.java:5390:10:5390:30 | entriesDiffering(...) : SortedMap [<map.key>] : Comparable | provenance | MaD:309 |
+| Test.java:5390:10:5390:11 | in : SortedMapDifference [com.google.common.collect.MapDifference.right, <map.key>] : Comparable | Test.java:5390:10:5390:30 | entriesDiffering(...) : SortedMap [<map.key>] : Comparable | provenance | MaD:311 |
 | Test.java:5390:10:5390:30 | entriesDiffering(...) : SortedMap [<map.key>] : Comparable | Test.java:5391:19:5391:21 | out : SortedMap [<map.key>] : Comparable | provenance |  |
 | Test.java:5391:19:5391:21 | out : SortedMap [<map.key>] : Comparable | Test.java:99:18:99:29 | map : SortedMap [<map.key>] : Comparable | provenance |  |
-| Test.java:5391:19:5391:21 | out : SortedMap [<map.key>] : Comparable | Test.java:5391:9:5391:22 | getMapKey(...) | provenance | MaD:562 |
+| Test.java:5391:19:5391:21 | out : SortedMap [<map.key>] : Comparable | Test.java:5391:9:5391:22 | getMapKey(...) | provenance | MaD:569 |
 | Test.java:5396:23:5396:82 | (...)... : SortedMapDifference [com.google.common.collect.MapDifference.right, <map.key>] : Object | Test.java:5397:10:5397:11 | in : SortedMapDifference [com.google.common.collect.MapDifference.right, <map.key>] : Object | provenance |  |
 | Test.java:5396:38:5396:82 | difference(...) : SortedMapDifference [com.google.common.collect.MapDifference.right, <map.key>] : Object | Test.java:5396:23:5396:82 | (...)... : SortedMapDifference [com.google.common.collect.MapDifference.right, <map.key>] : Object | provenance |  |
 | Test.java:5396:60:5396:81 | of(...) : Map [<map.key>] : Object | Test.java:5396:38:5396:82 | difference(...) : SortedMapDifference [com.google.common.collect.MapDifference.right, <map.key>] : Object | provenance | MaD:334 |
-| Test.java:5396:67:5396:74 | source(...) : Object | Test.java:5396:60:5396:81 | of(...) : Map [<map.key>] : Object | provenance | MaD:563 |
-| Test.java:5397:10:5397:11 | in : SortedMapDifference [com.google.common.collect.MapDifference.right, <map.key>] : Object | Test.java:5397:10:5397:30 | entriesDiffering(...) : Map [<map.key>] : Object | provenance | MaD:309 |
+| Test.java:5396:67:5396:74 | source(...) : Object | Test.java:5396:60:5396:81 | of(...) : Map [<map.key>] : Object | provenance | MaD:564 |
+| Test.java:5397:10:5397:11 | in : SortedMapDifference [com.google.common.collect.MapDifference.right, <map.key>] : Object | Test.java:5397:10:5397:30 | entriesDiffering(...) : Map [<map.key>] : Object | provenance | MaD:311 |
 | Test.java:5397:10:5397:30 | entriesDiffering(...) : Map [<map.key>] : Object | Test.java:5398:19:5398:21 | out : Map [<map.key>] : Object | provenance |  |
 | Test.java:5398:19:5398:21 | out : Map [<map.key>] : Object | Test.java:99:18:99:29 | map : Map [<map.key>] : Object | provenance |  |
-| Test.java:5398:19:5398:21 | out : Map [<map.key>] : Object | Test.java:5398:9:5398:22 | getMapKey(...) | provenance | MaD:562 |
+| Test.java:5398:19:5398:21 | out : Map [<map.key>] : Object | Test.java:5398:9:5398:22 | getMapKey(...) | provenance | MaD:569 |
 | Test.java:5403:29:5403:121 | (...)... : SortedMapDifference [com.google.common.collect.MapDifference.left, <map.value>] : Object | Test.java:5404:10:5404:11 | in : SortedMapDifference [com.google.common.collect.MapDifference.left, <map.value>] : Object | provenance |  |
 | Test.java:5403:50:5403:121 | difference(...) : SortedMapDifference [com.google.common.collect.MapDifference.left, <map.value>] : Object | Test.java:5403:29:5403:121 | (...)... : SortedMapDifference [com.google.common.collect.MapDifference.left, <map.value>] : Object | provenance |  |
 | Test.java:5403:66:5403:114 | of(...) : ImmutableSortedMap [<map.value>] : Object | Test.java:5403:50:5403:121 | difference(...) : SortedMapDifference [com.google.common.collect.MapDifference.left, <map.value>] : Object | provenance | MaD:333 |
 | Test.java:5403:106:5403:113 | source(...) : Object | Test.java:5403:66:5403:114 | of(...) : ImmutableSortedMap [<map.value>] : Object | provenance | MaD:166 |
-| Test.java:5404:10:5404:11 | in : SortedMapDifference [com.google.common.collect.MapDifference.left, <map.value>] : Object | Test.java:5404:10:5404:30 | entriesDiffering(...) : SortedMap [<map.value>, com.google.common.collect.MapDifference.left] : Object | provenance | MaD:308 |
+| Test.java:5404:10:5404:11 | in : SortedMapDifference [com.google.common.collect.MapDifference.left, <map.value>] : Object | Test.java:5404:10:5404:30 | entriesDiffering(...) : SortedMap [<map.value>, com.google.common.collect.MapDifference.left] : Object | provenance | MaD:310 |
 | Test.java:5404:10:5404:30 | entriesDiffering(...) : SortedMap [<map.value>, com.google.common.collect.MapDifference.left] : Object | Test.java:5405:21:5405:23 | out : SortedMap [<map.value>, com.google.common.collect.MapDifference.left] : Object | provenance |  |
-| Test.java:5405:9:5405:24 | getMapValue(...) : ValueDifference [com.google.common.collect.MapDifference.left] : Object | Test.java:5405:9:5405:36 | leftValue(...) | provenance | MaD:319 |
+| Test.java:5405:9:5405:24 | getMapValue(...) : ValueDifference [com.google.common.collect.MapDifference.left] : Object | Test.java:5405:9:5405:36 | leftValue(...) | provenance | MaD:307 |
 | Test.java:5405:21:5405:23 | out : SortedMap [<map.value>, com.google.common.collect.MapDifference.left] : Object | Test.java:118:20:118:31 | map : SortedMap [<map.value>, com.google.common.collect.MapDifference.left] : Object | provenance |  |
-| Test.java:5405:21:5405:23 | out : SortedMap [<map.value>, com.google.common.collect.MapDifference.left] : Object | Test.java:5405:9:5405:24 | getMapValue(...) : ValueDifference [com.google.common.collect.MapDifference.left] : Object | provenance | MaD:561 |
+| Test.java:5405:21:5405:23 | out : SortedMap [<map.value>, com.google.common.collect.MapDifference.left] : Object | Test.java:5405:9:5405:24 | getMapValue(...) : ValueDifference [com.google.common.collect.MapDifference.left] : Object | provenance | MaD:568 |
 | Test.java:5410:23:5410:82 | (...)... : MapDifference [com.google.common.collect.MapDifference.left, <map.value>] : Object | Test.java:5411:10:5411:11 | in : MapDifference [com.google.common.collect.MapDifference.left, <map.value>] : Object | provenance |  |
 | Test.java:5410:38:5410:82 | difference(...) : MapDifference [com.google.common.collect.MapDifference.left, <map.value>] : Object | Test.java:5410:23:5410:82 | (...)... : MapDifference [com.google.common.collect.MapDifference.left, <map.value>] : Object | provenance |  |
 | Test.java:5410:54:5410:75 | of(...) : Map [<map.value>] : Object | Test.java:5410:38:5410:82 | difference(...) : MapDifference [com.google.common.collect.MapDifference.left, <map.value>] : Object | provenance | MaD:325 |
-| Test.java:5410:67:5410:74 | source(...) : Object | Test.java:5410:54:5410:75 | of(...) : Map [<map.value>] : Object | provenance | MaD:564 |
-| Test.java:5411:10:5411:11 | in : MapDifference [com.google.common.collect.MapDifference.left, <map.value>] : Object | Test.java:5411:10:5411:30 | entriesDiffering(...) : Map [<map.value>, com.google.common.collect.MapDifference.left] : Object | provenance | MaD:308 |
+| Test.java:5410:67:5410:74 | source(...) : Object | Test.java:5410:54:5410:75 | of(...) : Map [<map.value>] : Object | provenance | MaD:565 |
+| Test.java:5411:10:5411:11 | in : MapDifference [com.google.common.collect.MapDifference.left, <map.value>] : Object | Test.java:5411:10:5411:30 | entriesDiffering(...) : Map [<map.value>, com.google.common.collect.MapDifference.left] : Object | provenance | MaD:310 |
 | Test.java:5411:10:5411:30 | entriesDiffering(...) : Map [<map.value>, com.google.common.collect.MapDifference.left] : Object | Test.java:5412:21:5412:23 | out : Map [<map.value>, com.google.common.collect.MapDifference.left] : Object | provenance |  |
-| Test.java:5412:9:5412:24 | getMapValue(...) : ValueDifference [com.google.common.collect.MapDifference.left] : Object | Test.java:5412:9:5412:36 | leftValue(...) | provenance | MaD:319 |
+| Test.java:5412:9:5412:24 | getMapValue(...) : ValueDifference [com.google.common.collect.MapDifference.left] : Object | Test.java:5412:9:5412:36 | leftValue(...) | provenance | MaD:307 |
 | Test.java:5412:21:5412:23 | out : Map [<map.value>, com.google.common.collect.MapDifference.left] : Object | Test.java:118:20:118:31 | map : Map [<map.value>, com.google.common.collect.MapDifference.left] : Object | provenance |  |
-| Test.java:5412:21:5412:23 | out : Map [<map.value>, com.google.common.collect.MapDifference.left] : Object | Test.java:5412:9:5412:24 | getMapValue(...) : ValueDifference [com.google.common.collect.MapDifference.left] : Object | provenance | MaD:561 |
+| Test.java:5412:21:5412:23 | out : Map [<map.value>, com.google.common.collect.MapDifference.left] : Object | Test.java:5412:9:5412:24 | getMapValue(...) : ValueDifference [com.google.common.collect.MapDifference.left] : Object | provenance | MaD:568 |
 | Test.java:5417:29:5417:121 | (...)... : SortedMapDifference [com.google.common.collect.MapDifference.right, <map.value>] : Object | Test.java:5418:10:5418:11 | in : SortedMapDifference [com.google.common.collect.MapDifference.right, <map.value>] : Object | provenance |  |
 | Test.java:5417:50:5417:121 | difference(...) : SortedMapDifference [com.google.common.collect.MapDifference.right, <map.value>] : Object | Test.java:5417:29:5417:121 | (...)... : SortedMapDifference [com.google.common.collect.MapDifference.right, <map.value>] : Object | provenance |  |
 | Test.java:5417:72:5417:120 | of(...) : ImmutableSortedMap [<map.value>] : Object | Test.java:5417:50:5417:121 | difference(...) : SortedMapDifference [com.google.common.collect.MapDifference.right, <map.value>] : Object | provenance | MaD:335 |
 | Test.java:5417:112:5417:119 | source(...) : Object | Test.java:5417:72:5417:120 | of(...) : ImmutableSortedMap [<map.value>] : Object | provenance | MaD:166 |
-| Test.java:5418:10:5418:11 | in : SortedMapDifference [com.google.common.collect.MapDifference.right, <map.value>] : Object | Test.java:5418:10:5418:30 | entriesDiffering(...) : SortedMap [<map.value>, com.google.common.collect.MapDifference.right] : Object | provenance | MaD:310 |
+| Test.java:5418:10:5418:11 | in : SortedMapDifference [com.google.common.collect.MapDifference.right, <map.value>] : Object | Test.java:5418:10:5418:30 | entriesDiffering(...) : SortedMap [<map.value>, com.google.common.collect.MapDifference.right] : Object | provenance | MaD:312 |
 | Test.java:5418:10:5418:30 | entriesDiffering(...) : SortedMap [<map.value>, com.google.common.collect.MapDifference.right] : Object | Test.java:5419:21:5419:23 | out : SortedMap [<map.value>, com.google.common.collect.MapDifference.right] : Object | provenance |  |
-| Test.java:5419:9:5419:24 | getMapValue(...) : ValueDifference [com.google.common.collect.MapDifference.right] : Object | Test.java:5419:9:5419:37 | rightValue(...) | provenance | MaD:320 |
+| Test.java:5419:9:5419:24 | getMapValue(...) : ValueDifference [com.google.common.collect.MapDifference.right] : Object | Test.java:5419:9:5419:37 | rightValue(...) | provenance | MaD:308 |
 | Test.java:5419:21:5419:23 | out : SortedMap [<map.value>, com.google.common.collect.MapDifference.right] : Object | Test.java:118:20:118:31 | map : SortedMap [<map.value>, com.google.common.collect.MapDifference.right] : Object | provenance |  |
-| Test.java:5419:21:5419:23 | out : SortedMap [<map.value>, com.google.common.collect.MapDifference.right] : Object | Test.java:5419:9:5419:24 | getMapValue(...) : ValueDifference [com.google.common.collect.MapDifference.right] : Object | provenance | MaD:561 |
+| Test.java:5419:21:5419:23 | out : SortedMap [<map.value>, com.google.common.collect.MapDifference.right] : Object | Test.java:5419:9:5419:24 | getMapValue(...) : ValueDifference [com.google.common.collect.MapDifference.right] : Object | provenance | MaD:568 |
 | Test.java:5424:23:5424:82 | (...)... : SortedMapDifference [com.google.common.collect.MapDifference.right, <map.value>] : Object | Test.java:5425:10:5425:11 | in : SortedMapDifference [com.google.common.collect.MapDifference.right, <map.value>] : Object | provenance |  |
 | Test.java:5424:38:5424:82 | difference(...) : SortedMapDifference [com.google.common.collect.MapDifference.right, <map.value>] : Object | Test.java:5424:23:5424:82 | (...)... : SortedMapDifference [com.google.common.collect.MapDifference.right, <map.value>] : Object | provenance |  |
 | Test.java:5424:60:5424:81 | of(...) : Map [<map.value>] : Object | Test.java:5424:38:5424:82 | difference(...) : SortedMapDifference [com.google.common.collect.MapDifference.right, <map.value>] : Object | provenance | MaD:335 |
-| Test.java:5424:73:5424:80 | source(...) : Object | Test.java:5424:60:5424:81 | of(...) : Map [<map.value>] : Object | provenance | MaD:564 |
-| Test.java:5425:10:5425:11 | in : SortedMapDifference [com.google.common.collect.MapDifference.right, <map.value>] : Object | Test.java:5425:10:5425:30 | entriesDiffering(...) : Map [<map.value>, com.google.common.collect.MapDifference.right] : Object | provenance | MaD:310 |
+| Test.java:5424:73:5424:80 | source(...) : Object | Test.java:5424:60:5424:81 | of(...) : Map [<map.value>] : Object | provenance | MaD:565 |
+| Test.java:5425:10:5425:11 | in : SortedMapDifference [com.google.common.collect.MapDifference.right, <map.value>] : Object | Test.java:5425:10:5425:30 | entriesDiffering(...) : Map [<map.value>, com.google.common.collect.MapDifference.right] : Object | provenance | MaD:312 |
 | Test.java:5425:10:5425:30 | entriesDiffering(...) : Map [<map.value>, com.google.common.collect.MapDifference.right] : Object | Test.java:5426:21:5426:23 | out : Map [<map.value>, com.google.common.collect.MapDifference.right] : Object | provenance |  |
-| Test.java:5426:9:5426:24 | getMapValue(...) : ValueDifference [com.google.common.collect.MapDifference.right] : Object | Test.java:5426:9:5426:37 | rightValue(...) | provenance | MaD:320 |
+| Test.java:5426:9:5426:24 | getMapValue(...) : ValueDifference [com.google.common.collect.MapDifference.right] : Object | Test.java:5426:9:5426:37 | rightValue(...) | provenance | MaD:308 |
 | Test.java:5426:21:5426:23 | out : Map [<map.value>, com.google.common.collect.MapDifference.right] : Object | Test.java:118:20:118:31 | map : Map [<map.value>, com.google.common.collect.MapDifference.right] : Object | provenance |  |
-| Test.java:5426:21:5426:23 | out : Map [<map.value>, com.google.common.collect.MapDifference.right] : Object | Test.java:5426:9:5426:24 | getMapValue(...) : ValueDifference [com.google.common.collect.MapDifference.right] : Object | provenance | MaD:561 |
+| Test.java:5426:21:5426:23 | out : Map [<map.value>, com.google.common.collect.MapDifference.right] : Object | Test.java:5426:9:5426:24 | getMapValue(...) : ValueDifference [com.google.common.collect.MapDifference.right] : Object | provenance | MaD:568 |
 | Test.java:5431:29:5431:121 | (...)... : SortedMapDifference [com.google.common.collect.MapDifference.left, <map.key>] : Comparable | Test.java:5432:10:5432:11 | in : SortedMapDifference [com.google.common.collect.MapDifference.left, <map.key>] : Comparable | provenance |  |
 | Test.java:5431:50:5431:121 | difference(...) : SortedMapDifference [com.google.common.collect.MapDifference.left, <map.key>] : Comparable | Test.java:5431:29:5431:121 | (...)... : SortedMapDifference [com.google.common.collect.MapDifference.left, <map.key>] : Comparable | provenance |  |
 | Test.java:5431:66:5431:114 | of(...) : ImmutableSortedMap [<map.key>] : Comparable | Test.java:5431:50:5431:121 | difference(...) : SortedMapDifference [com.google.common.collect.MapDifference.left, <map.key>] : Comparable | provenance | MaD:332 |
 | Test.java:5431:88:5431:107 | (...)... : Comparable | Test.java:5431:66:5431:114 | of(...) : ImmutableSortedMap [<map.key>] : Comparable | provenance | MaD:165 |
 | Test.java:5431:100:5431:107 | source(...) : Object | Test.java:5431:88:5431:107 | (...)... : Comparable | provenance |  |
-| Test.java:5432:10:5432:11 | in : SortedMapDifference [com.google.common.collect.MapDifference.left, <map.key>] : Comparable | Test.java:5432:10:5432:29 | entriesInCommon(...) : SortedMap [<map.key>] : Comparable | provenance | MaD:311 |
+| Test.java:5432:10:5432:11 | in : SortedMapDifference [com.google.common.collect.MapDifference.left, <map.key>] : Comparable | Test.java:5432:10:5432:29 | entriesInCommon(...) : SortedMap [<map.key>] : Comparable | provenance | MaD:313 |
 | Test.java:5432:10:5432:29 | entriesInCommon(...) : SortedMap [<map.key>] : Comparable | Test.java:5433:19:5433:21 | out : SortedMap [<map.key>] : Comparable | provenance |  |
 | Test.java:5433:19:5433:21 | out : SortedMap [<map.key>] : Comparable | Test.java:99:18:99:29 | map : SortedMap [<map.key>] : Comparable | provenance |  |
-| Test.java:5433:19:5433:21 | out : SortedMap [<map.key>] : Comparable | Test.java:5433:9:5433:22 | getMapKey(...) | provenance | MaD:562 |
+| Test.java:5433:19:5433:21 | out : SortedMap [<map.key>] : Comparable | Test.java:5433:9:5433:22 | getMapKey(...) | provenance | MaD:569 |
 | Test.java:5438:23:5438:82 | (...)... : MapDifference [com.google.common.collect.MapDifference.left, <map.key>] : Object | Test.java:5439:10:5439:11 | in : MapDifference [com.google.common.collect.MapDifference.left, <map.key>] : Object | provenance |  |
 | Test.java:5438:38:5438:82 | difference(...) : MapDifference [com.google.common.collect.MapDifference.left, <map.key>] : Object | Test.java:5438:23:5438:82 | (...)... : MapDifference [com.google.common.collect.MapDifference.left, <map.key>] : Object | provenance |  |
 | Test.java:5438:54:5438:75 | of(...) : Map [<map.key>] : Object | Test.java:5438:38:5438:82 | difference(...) : MapDifference [com.google.common.collect.MapDifference.left, <map.key>] : Object | provenance | MaD:324 |
-| Test.java:5438:61:5438:68 | source(...) : Object | Test.java:5438:54:5438:75 | of(...) : Map [<map.key>] : Object | provenance | MaD:563 |
-| Test.java:5439:10:5439:11 | in : MapDifference [com.google.common.collect.MapDifference.left, <map.key>] : Object | Test.java:5439:10:5439:29 | entriesInCommon(...) : Map [<map.key>] : Object | provenance | MaD:311 |
+| Test.java:5438:61:5438:68 | source(...) : Object | Test.java:5438:54:5438:75 | of(...) : Map [<map.key>] : Object | provenance | MaD:564 |
+| Test.java:5439:10:5439:11 | in : MapDifference [com.google.common.collect.MapDifference.left, <map.key>] : Object | Test.java:5439:10:5439:29 | entriesInCommon(...) : Map [<map.key>] : Object | provenance | MaD:313 |
 | Test.java:5439:10:5439:29 | entriesInCommon(...) : Map [<map.key>] : Object | Test.java:5440:19:5440:21 | out : Map [<map.key>] : Object | provenance |  |
 | Test.java:5440:19:5440:21 | out : Map [<map.key>] : Object | Test.java:99:18:99:29 | map : Map [<map.key>] : Object | provenance |  |
-| Test.java:5440:19:5440:21 | out : Map [<map.key>] : Object | Test.java:5440:9:5440:22 | getMapKey(...) | provenance | MaD:562 |
+| Test.java:5440:19:5440:21 | out : Map [<map.key>] : Object | Test.java:5440:9:5440:22 | getMapKey(...) | provenance | MaD:569 |
 | Test.java:5445:29:5445:121 | (...)... : SortedMapDifference [com.google.common.collect.MapDifference.right, <map.key>] : Comparable | Test.java:5446:10:5446:11 | in : SortedMapDifference [com.google.common.collect.MapDifference.right, <map.key>] : Comparable | provenance |  |
 | Test.java:5445:50:5445:121 | difference(...) : SortedMapDifference [com.google.common.collect.MapDifference.right, <map.key>] : Comparable | Test.java:5445:29:5445:121 | (...)... : SortedMapDifference [com.google.common.collect.MapDifference.right, <map.key>] : Comparable | provenance |  |
 | Test.java:5445:72:5445:120 | of(...) : ImmutableSortedMap [<map.key>] : Comparable | Test.java:5445:50:5445:121 | difference(...) : SortedMapDifference [com.google.common.collect.MapDifference.right, <map.key>] : Comparable | provenance | MaD:334 |
 | Test.java:5445:94:5445:113 | (...)... : Comparable | Test.java:5445:72:5445:120 | of(...) : ImmutableSortedMap [<map.key>] : Comparable | provenance | MaD:165 |
 | Test.java:5445:106:5445:113 | source(...) : Object | Test.java:5445:94:5445:113 | (...)... : Comparable | provenance |  |
-| Test.java:5446:10:5446:11 | in : SortedMapDifference [com.google.common.collect.MapDifference.right, <map.key>] : Comparable | Test.java:5446:10:5446:29 | entriesInCommon(...) : SortedMap [<map.key>] : Comparable | provenance | MaD:313 |
+| Test.java:5446:10:5446:11 | in : SortedMapDifference [com.google.common.collect.MapDifference.right, <map.key>] : Comparable | Test.java:5446:10:5446:29 | entriesInCommon(...) : SortedMap [<map.key>] : Comparable | provenance | MaD:315 |
 | Test.java:5446:10:5446:29 | entriesInCommon(...) : SortedMap [<map.key>] : Comparable | Test.java:5447:19:5447:21 | out : SortedMap [<map.key>] : Comparable | provenance |  |
 | Test.java:5447:19:5447:21 | out : SortedMap [<map.key>] : Comparable | Test.java:99:18:99:29 | map : SortedMap [<map.key>] : Comparable | provenance |  |
-| Test.java:5447:19:5447:21 | out : SortedMap [<map.key>] : Comparable | Test.java:5447:9:5447:22 | getMapKey(...) | provenance | MaD:562 |
+| Test.java:5447:19:5447:21 | out : SortedMap [<map.key>] : Comparable | Test.java:5447:9:5447:22 | getMapKey(...) | provenance | MaD:569 |
 | Test.java:5452:23:5452:82 | (...)... : SortedMapDifference [com.google.common.collect.MapDifference.right, <map.key>] : Object | Test.java:5453:10:5453:11 | in : SortedMapDifference [com.google.common.collect.MapDifference.right, <map.key>] : Object | provenance |  |
 | Test.java:5452:38:5452:82 | difference(...) : SortedMapDifference [com.google.common.collect.MapDifference.right, <map.key>] : Object | Test.java:5452:23:5452:82 | (...)... : SortedMapDifference [com.google.common.collect.MapDifference.right, <map.key>] : Object | provenance |  |
 | Test.java:5452:60:5452:81 | of(...) : Map [<map.key>] : Object | Test.java:5452:38:5452:82 | difference(...) : SortedMapDifference [com.google.common.collect.MapDifference.right, <map.key>] : Object | provenance | MaD:334 |
-| Test.java:5452:67:5452:74 | source(...) : Object | Test.java:5452:60:5452:81 | of(...) : Map [<map.key>] : Object | provenance | MaD:563 |
-| Test.java:5453:10:5453:11 | in : SortedMapDifference [com.google.common.collect.MapDifference.right, <map.key>] : Object | Test.java:5453:10:5453:29 | entriesInCommon(...) : Map [<map.key>] : Object | provenance | MaD:313 |
+| Test.java:5452:67:5452:74 | source(...) : Object | Test.java:5452:60:5452:81 | of(...) : Map [<map.key>] : Object | provenance | MaD:564 |
+| Test.java:5453:10:5453:11 | in : SortedMapDifference [com.google.common.collect.MapDifference.right, <map.key>] : Object | Test.java:5453:10:5453:29 | entriesInCommon(...) : Map [<map.key>] : Object | provenance | MaD:315 |
 | Test.java:5453:10:5453:29 | entriesInCommon(...) : Map [<map.key>] : Object | Test.java:5454:19:5454:21 | out : Map [<map.key>] : Object | provenance |  |
 | Test.java:5454:19:5454:21 | out : Map [<map.key>] : Object | Test.java:99:18:99:29 | map : Map [<map.key>] : Object | provenance |  |
-| Test.java:5454:19:5454:21 | out : Map [<map.key>] : Object | Test.java:5454:9:5454:22 | getMapKey(...) | provenance | MaD:562 |
+| Test.java:5454:19:5454:21 | out : Map [<map.key>] : Object | Test.java:5454:9:5454:22 | getMapKey(...) | provenance | MaD:569 |
 | Test.java:5459:29:5459:121 | (...)... : SortedMapDifference [com.google.common.collect.MapDifference.left, <map.value>] : Object | Test.java:5460:10:5460:11 | in : SortedMapDifference [com.google.common.collect.MapDifference.left, <map.value>] : Object | provenance |  |
 | Test.java:5459:50:5459:121 | difference(...) : SortedMapDifference [com.google.common.collect.MapDifference.left, <map.value>] : Object | Test.java:5459:29:5459:121 | (...)... : SortedMapDifference [com.google.common.collect.MapDifference.left, <map.value>] : Object | provenance |  |
 | Test.java:5459:66:5459:114 | of(...) : ImmutableSortedMap [<map.value>] : Object | Test.java:5459:50:5459:121 | difference(...) : SortedMapDifference [com.google.common.collect.MapDifference.left, <map.value>] : Object | provenance | MaD:333 |
 | Test.java:5459:106:5459:113 | source(...) : Object | Test.java:5459:66:5459:114 | of(...) : ImmutableSortedMap [<map.value>] : Object | provenance | MaD:166 |
-| Test.java:5460:10:5460:11 | in : SortedMapDifference [com.google.common.collect.MapDifference.left, <map.value>] : Object | Test.java:5460:10:5460:29 | entriesInCommon(...) : SortedMap [<map.value>] : Object | provenance | MaD:312 |
+| Test.java:5460:10:5460:11 | in : SortedMapDifference [com.google.common.collect.MapDifference.left, <map.value>] : Object | Test.java:5460:10:5460:29 | entriesInCommon(...) : SortedMap [<map.value>] : Object | provenance | MaD:314 |
 | Test.java:5460:10:5460:29 | entriesInCommon(...) : SortedMap [<map.value>] : Object | Test.java:5461:21:5461:23 | out : SortedMap [<map.value>] : Object | provenance |  |
 | Test.java:5461:21:5461:23 | out : SortedMap [<map.value>] : Object | Test.java:118:20:118:31 | map : SortedMap [<map.value>] : Object | provenance |  |
-| Test.java:5461:21:5461:23 | out : SortedMap [<map.value>] : Object | Test.java:5461:9:5461:24 | getMapValue(...) | provenance | MaD:561 |
+| Test.java:5461:21:5461:23 | out : SortedMap [<map.value>] : Object | Test.java:5461:9:5461:24 | getMapValue(...) | provenance | MaD:568 |
 | Test.java:5466:23:5466:82 | (...)... : MapDifference [com.google.common.collect.MapDifference.left, <map.value>] : Object | Test.java:5467:10:5467:11 | in : MapDifference [com.google.common.collect.MapDifference.left, <map.value>] : Object | provenance |  |
 | Test.java:5466:38:5466:82 | difference(...) : MapDifference [com.google.common.collect.MapDifference.left, <map.value>] : Object | Test.java:5466:23:5466:82 | (...)... : MapDifference [com.google.common.collect.MapDifference.left, <map.value>] : Object | provenance |  |
 | Test.java:5466:54:5466:75 | of(...) : Map [<map.value>] : Object | Test.java:5466:38:5466:82 | difference(...) : MapDifference [com.google.common.collect.MapDifference.left, <map.value>] : Object | provenance | MaD:325 |
-| Test.java:5466:67:5466:74 | source(...) : Object | Test.java:5466:54:5466:75 | of(...) : Map [<map.value>] : Object | provenance | MaD:564 |
-| Test.java:5467:10:5467:11 | in : MapDifference [com.google.common.collect.MapDifference.left, <map.value>] : Object | Test.java:5467:10:5467:29 | entriesInCommon(...) : Map [<map.value>] : Object | provenance | MaD:312 |
+| Test.java:5466:67:5466:74 | source(...) : Object | Test.java:5466:54:5466:75 | of(...) : Map [<map.value>] : Object | provenance | MaD:565 |
+| Test.java:5467:10:5467:11 | in : MapDifference [com.google.common.collect.MapDifference.left, <map.value>] : Object | Test.java:5467:10:5467:29 | entriesInCommon(...) : Map [<map.value>] : Object | provenance | MaD:314 |
 | Test.java:5467:10:5467:29 | entriesInCommon(...) : Map [<map.value>] : Object | Test.java:5468:21:5468:23 | out : Map [<map.value>] : Object | provenance |  |
 | Test.java:5468:21:5468:23 | out : Map [<map.value>] : Object | Test.java:118:20:118:31 | map : Map [<map.value>] : Object | provenance |  |
-| Test.java:5468:21:5468:23 | out : Map [<map.value>] : Object | Test.java:5468:9:5468:24 | getMapValue(...) | provenance | MaD:561 |
+| Test.java:5468:21:5468:23 | out : Map [<map.value>] : Object | Test.java:5468:9:5468:24 | getMapValue(...) | provenance | MaD:568 |
 | Test.java:5473:29:5473:121 | (...)... : SortedMapDifference [com.google.common.collect.MapDifference.right, <map.value>] : Object | Test.java:5474:10:5474:11 | in : SortedMapDifference [com.google.common.collect.MapDifference.right, <map.value>] : Object | provenance |  |
 | Test.java:5473:50:5473:121 | difference(...) : SortedMapDifference [com.google.common.collect.MapDifference.right, <map.value>] : Object | Test.java:5473:29:5473:121 | (...)... : SortedMapDifference [com.google.common.collect.MapDifference.right, <map.value>] : Object | provenance |  |
 | Test.java:5473:72:5473:120 | of(...) : ImmutableSortedMap [<map.value>] : Object | Test.java:5473:50:5473:121 | difference(...) : SortedMapDifference [com.google.common.collect.MapDifference.right, <map.value>] : Object | provenance | MaD:335 |
 | Test.java:5473:112:5473:119 | source(...) : Object | Test.java:5473:72:5473:120 | of(...) : ImmutableSortedMap [<map.value>] : Object | provenance | MaD:166 |
-| Test.java:5474:10:5474:11 | in : SortedMapDifference [com.google.common.collect.MapDifference.right, <map.value>] : Object | Test.java:5474:10:5474:29 | entriesInCommon(...) : SortedMap [<map.value>] : Object | provenance | MaD:314 |
+| Test.java:5474:10:5474:11 | in : SortedMapDifference [com.google.common.collect.MapDifference.right, <map.value>] : Object | Test.java:5474:10:5474:29 | entriesInCommon(...) : SortedMap [<map.value>] : Object | provenance | MaD:316 |
 | Test.java:5474:10:5474:29 | entriesInCommon(...) : SortedMap [<map.value>] : Object | Test.java:5475:21:5475:23 | out : SortedMap [<map.value>] : Object | provenance |  |
 | Test.java:5475:21:5475:23 | out : SortedMap [<map.value>] : Object | Test.java:118:20:118:31 | map : SortedMap [<map.value>] : Object | provenance |  |
-| Test.java:5475:21:5475:23 | out : SortedMap [<map.value>] : Object | Test.java:5475:9:5475:24 | getMapValue(...) | provenance | MaD:561 |
+| Test.java:5475:21:5475:23 | out : SortedMap [<map.value>] : Object | Test.java:5475:9:5475:24 | getMapValue(...) | provenance | MaD:568 |
 | Test.java:5480:23:5480:82 | (...)... : SortedMapDifference [com.google.common.collect.MapDifference.right, <map.value>] : Object | Test.java:5481:10:5481:11 | in : SortedMapDifference [com.google.common.collect.MapDifference.right, <map.value>] : Object | provenance |  |
 | Test.java:5480:38:5480:82 | difference(...) : SortedMapDifference [com.google.common.collect.MapDifference.right, <map.value>] : Object | Test.java:5480:23:5480:82 | (...)... : SortedMapDifference [com.google.common.collect.MapDifference.right, <map.value>] : Object | provenance |  |
 | Test.java:5480:60:5480:81 | of(...) : Map [<map.value>] : Object | Test.java:5480:38:5480:82 | difference(...) : SortedMapDifference [com.google.common.collect.MapDifference.right, <map.value>] : Object | provenance | MaD:335 |
-| Test.java:5480:73:5480:80 | source(...) : Object | Test.java:5480:60:5480:81 | of(...) : Map [<map.value>] : Object | provenance | MaD:564 |
-| Test.java:5481:10:5481:11 | in : SortedMapDifference [com.google.common.collect.MapDifference.right, <map.value>] : Object | Test.java:5481:10:5481:29 | entriesInCommon(...) : Map [<map.value>] : Object | provenance | MaD:314 |
+| Test.java:5480:73:5480:80 | source(...) : Object | Test.java:5480:60:5480:81 | of(...) : Map [<map.value>] : Object | provenance | MaD:565 |
+| Test.java:5481:10:5481:11 | in : SortedMapDifference [com.google.common.collect.MapDifference.right, <map.value>] : Object | Test.java:5481:10:5481:29 | entriesInCommon(...) : Map [<map.value>] : Object | provenance | MaD:316 |
 | Test.java:5481:10:5481:29 | entriesInCommon(...) : Map [<map.value>] : Object | Test.java:5482:21:5482:23 | out : Map [<map.value>] : Object | provenance |  |
 | Test.java:5482:21:5482:23 | out : Map [<map.value>] : Object | Test.java:118:20:118:31 | map : Map [<map.value>] : Object | provenance |  |
-| Test.java:5482:21:5482:23 | out : Map [<map.value>] : Object | Test.java:5482:9:5482:24 | getMapValue(...) | provenance | MaD:561 |
+| Test.java:5482:21:5482:23 | out : Map [<map.value>] : Object | Test.java:5482:9:5482:24 | getMapValue(...) | provenance | MaD:568 |
 | Test.java:5487:29:5487:121 | (...)... : SortedMapDifference [com.google.common.collect.MapDifference.left, <map.key>] : Comparable | Test.java:5488:10:5488:11 | in : SortedMapDifference [com.google.common.collect.MapDifference.left, <map.key>] : Comparable | provenance |  |
 | Test.java:5487:50:5487:121 | difference(...) : SortedMapDifference [com.google.common.collect.MapDifference.left, <map.key>] : Comparable | Test.java:5487:29:5487:121 | (...)... : SortedMapDifference [com.google.common.collect.MapDifference.left, <map.key>] : Comparable | provenance |  |
 | Test.java:5487:66:5487:114 | of(...) : ImmutableSortedMap [<map.key>] : Comparable | Test.java:5487:50:5487:121 | difference(...) : SortedMapDifference [com.google.common.collect.MapDifference.left, <map.key>] : Comparable | provenance | MaD:332 |
 | Test.java:5487:88:5487:107 | (...)... : Comparable | Test.java:5487:66:5487:114 | of(...) : ImmutableSortedMap [<map.key>] : Comparable | provenance | MaD:165 |
 | Test.java:5487:100:5487:107 | source(...) : Object | Test.java:5487:88:5487:107 | (...)... : Comparable | provenance |  |
-| Test.java:5488:10:5488:11 | in : SortedMapDifference [com.google.common.collect.MapDifference.left, <map.key>] : Comparable | Test.java:5488:10:5488:31 | entriesOnlyOnLeft(...) : SortedMap [<map.key>] : Comparable | provenance | MaD:315 |
+| Test.java:5488:10:5488:11 | in : SortedMapDifference [com.google.common.collect.MapDifference.left, <map.key>] : Comparable | Test.java:5488:10:5488:31 | entriesOnlyOnLeft(...) : SortedMap [<map.key>] : Comparable | provenance | MaD:317 |
 | Test.java:5488:10:5488:31 | entriesOnlyOnLeft(...) : SortedMap [<map.key>] : Comparable | Test.java:5489:19:5489:21 | out : SortedMap [<map.key>] : Comparable | provenance |  |
 | Test.java:5489:19:5489:21 | out : SortedMap [<map.key>] : Comparable | Test.java:99:18:99:29 | map : SortedMap [<map.key>] : Comparable | provenance |  |
-| Test.java:5489:19:5489:21 | out : SortedMap [<map.key>] : Comparable | Test.java:5489:9:5489:22 | getMapKey(...) | provenance | MaD:562 |
+| Test.java:5489:19:5489:21 | out : SortedMap [<map.key>] : Comparable | Test.java:5489:9:5489:22 | getMapKey(...) | provenance | MaD:569 |
 | Test.java:5494:23:5494:82 | (...)... : MapDifference [com.google.common.collect.MapDifference.left, <map.key>] : Object | Test.java:5495:10:5495:11 | in : MapDifference [com.google.common.collect.MapDifference.left, <map.key>] : Object | provenance |  |
 | Test.java:5494:38:5494:82 | difference(...) : MapDifference [com.google.common.collect.MapDifference.left, <map.key>] : Object | Test.java:5494:23:5494:82 | (...)... : MapDifference [com.google.common.collect.MapDifference.left, <map.key>] : Object | provenance |  |
 | Test.java:5494:54:5494:75 | of(...) : Map [<map.key>] : Object | Test.java:5494:38:5494:82 | difference(...) : MapDifference [com.google.common.collect.MapDifference.left, <map.key>] : Object | provenance | MaD:324 |
-| Test.java:5494:61:5494:68 | source(...) : Object | Test.java:5494:54:5494:75 | of(...) : Map [<map.key>] : Object | provenance | MaD:563 |
-| Test.java:5495:10:5495:11 | in : MapDifference [com.google.common.collect.MapDifference.left, <map.key>] : Object | Test.java:5495:10:5495:31 | entriesOnlyOnLeft(...) : Map [<map.key>] : Object | provenance | MaD:315 |
+| Test.java:5494:61:5494:68 | source(...) : Object | Test.java:5494:54:5494:75 | of(...) : Map [<map.key>] : Object | provenance | MaD:564 |
+| Test.java:5495:10:5495:11 | in : MapDifference [com.google.common.collect.MapDifference.left, <map.key>] : Object | Test.java:5495:10:5495:31 | entriesOnlyOnLeft(...) : Map [<map.key>] : Object | provenance | MaD:317 |
 | Test.java:5495:10:5495:31 | entriesOnlyOnLeft(...) : Map [<map.key>] : Object | Test.java:5496:19:5496:21 | out : Map [<map.key>] : Object | provenance |  |
 | Test.java:5496:19:5496:21 | out : Map [<map.key>] : Object | Test.java:99:18:99:29 | map : Map [<map.key>] : Object | provenance |  |
-| Test.java:5496:19:5496:21 | out : Map [<map.key>] : Object | Test.java:5496:9:5496:22 | getMapKey(...) | provenance | MaD:562 |
+| Test.java:5496:19:5496:21 | out : Map [<map.key>] : Object | Test.java:5496:9:5496:22 | getMapKey(...) | provenance | MaD:569 |
 | Test.java:5501:29:5501:121 | (...)... : SortedMapDifference [com.google.common.collect.MapDifference.left, <map.value>] : Object | Test.java:5502:10:5502:11 | in : SortedMapDifference [com.google.common.collect.MapDifference.left, <map.value>] : Object | provenance |  |
 | Test.java:5501:50:5501:121 | difference(...) : SortedMapDifference [com.google.common.collect.MapDifference.left, <map.value>] : Object | Test.java:5501:29:5501:121 | (...)... : SortedMapDifference [com.google.common.collect.MapDifference.left, <map.value>] : Object | provenance |  |
 | Test.java:5501:66:5501:114 | of(...) : ImmutableSortedMap [<map.value>] : Object | Test.java:5501:50:5501:121 | difference(...) : SortedMapDifference [com.google.common.collect.MapDifference.left, <map.value>] : Object | provenance | MaD:333 |
 | Test.java:5501:106:5501:113 | source(...) : Object | Test.java:5501:66:5501:114 | of(...) : ImmutableSortedMap [<map.value>] : Object | provenance | MaD:166 |
-| Test.java:5502:10:5502:11 | in : SortedMapDifference [com.google.common.collect.MapDifference.left, <map.value>] : Object | Test.java:5502:10:5502:31 | entriesOnlyOnLeft(...) : SortedMap [<map.value>] : Object | provenance | MaD:316 |
+| Test.java:5502:10:5502:11 | in : SortedMapDifference [com.google.common.collect.MapDifference.left, <map.value>] : Object | Test.java:5502:10:5502:31 | entriesOnlyOnLeft(...) : SortedMap [<map.value>] : Object | provenance | MaD:318 |
 | Test.java:5502:10:5502:31 | entriesOnlyOnLeft(...) : SortedMap [<map.value>] : Object | Test.java:5503:21:5503:23 | out : SortedMap [<map.value>] : Object | provenance |  |
 | Test.java:5503:21:5503:23 | out : SortedMap [<map.value>] : Object | Test.java:118:20:118:31 | map : SortedMap [<map.value>] : Object | provenance |  |
-| Test.java:5503:21:5503:23 | out : SortedMap [<map.value>] : Object | Test.java:5503:9:5503:24 | getMapValue(...) | provenance | MaD:561 |
+| Test.java:5503:21:5503:23 | out : SortedMap [<map.value>] : Object | Test.java:5503:9:5503:24 | getMapValue(...) | provenance | MaD:568 |
 | Test.java:5508:23:5508:82 | (...)... : MapDifference [com.google.common.collect.MapDifference.left, <map.value>] : Object | Test.java:5509:10:5509:11 | in : MapDifference [com.google.common.collect.MapDifference.left, <map.value>] : Object | provenance |  |
 | Test.java:5508:38:5508:82 | difference(...) : MapDifference [com.google.common.collect.MapDifference.left, <map.value>] : Object | Test.java:5508:23:5508:82 | (...)... : MapDifference [com.google.common.collect.MapDifference.left, <map.value>] : Object | provenance |  |
 | Test.java:5508:54:5508:75 | of(...) : Map [<map.value>] : Object | Test.java:5508:38:5508:82 | difference(...) : MapDifference [com.google.common.collect.MapDifference.left, <map.value>] : Object | provenance | MaD:325 |
-| Test.java:5508:67:5508:74 | source(...) : Object | Test.java:5508:54:5508:75 | of(...) : Map [<map.value>] : Object | provenance | MaD:564 |
-| Test.java:5509:10:5509:11 | in : MapDifference [com.google.common.collect.MapDifference.left, <map.value>] : Object | Test.java:5509:10:5509:31 | entriesOnlyOnLeft(...) : Map [<map.value>] : Object | provenance | MaD:316 |
+| Test.java:5508:67:5508:74 | source(...) : Object | Test.java:5508:54:5508:75 | of(...) : Map [<map.value>] : Object | provenance | MaD:565 |
+| Test.java:5509:10:5509:11 | in : MapDifference [com.google.common.collect.MapDifference.left, <map.value>] : Object | Test.java:5509:10:5509:31 | entriesOnlyOnLeft(...) : Map [<map.value>] : Object | provenance | MaD:318 |
 | Test.java:5509:10:5509:31 | entriesOnlyOnLeft(...) : Map [<map.value>] : Object | Test.java:5510:21:5510:23 | out : Map [<map.value>] : Object | provenance |  |
 | Test.java:5510:21:5510:23 | out : Map [<map.value>] : Object | Test.java:118:20:118:31 | map : Map [<map.value>] : Object | provenance |  |
-| Test.java:5510:21:5510:23 | out : Map [<map.value>] : Object | Test.java:5510:9:5510:24 | getMapValue(...) | provenance | MaD:561 |
+| Test.java:5510:21:5510:23 | out : Map [<map.value>] : Object | Test.java:5510:9:5510:24 | getMapValue(...) | provenance | MaD:568 |
 | Test.java:5515:29:5515:120 | (...)... : SortedMapDifference [com.google.common.collect.MapDifference.right, <map.key>] : Comparable | Test.java:5516:10:5516:11 | in : SortedMapDifference [com.google.common.collect.MapDifference.right, <map.key>] : Comparable | provenance |  |
 | Test.java:5515:50:5515:120 | difference(...) : SortedMapDifference [com.google.common.collect.MapDifference.right, <map.key>] : Comparable | Test.java:5515:29:5515:120 | (...)... : SortedMapDifference [com.google.common.collect.MapDifference.right, <map.key>] : Comparable | provenance |  |
 | Test.java:5515:72:5515:119 | of(...) : ImmutableSortedMap [<map.key>] : Comparable | Test.java:5515:50:5515:120 | difference(...) : SortedMapDifference [com.google.common.collect.MapDifference.right, <map.key>] : Comparable | provenance | MaD:334 |
 | Test.java:5515:94:5515:113 | (...)... : Comparable | Test.java:5515:72:5515:119 | of(...) : ImmutableSortedMap [<map.key>] : Comparable | provenance | MaD:165 |
 | Test.java:5515:106:5515:113 | source(...) : Object | Test.java:5515:94:5515:113 | (...)... : Comparable | provenance |  |
-| Test.java:5516:10:5516:11 | in : SortedMapDifference [com.google.common.collect.MapDifference.right, <map.key>] : Comparable | Test.java:5516:10:5516:32 | entriesOnlyOnRight(...) : SortedMap [<map.key>] : Comparable | provenance | MaD:317 |
+| Test.java:5516:10:5516:11 | in : SortedMapDifference [com.google.common.collect.MapDifference.right, <map.key>] : Comparable | Test.java:5516:10:5516:32 | entriesOnlyOnRight(...) : SortedMap [<map.key>] : Comparable | provenance | MaD:319 |
 | Test.java:5516:10:5516:32 | entriesOnlyOnRight(...) : SortedMap [<map.key>] : Comparable | Test.java:5517:19:5517:21 | out : SortedMap [<map.key>] : Comparable | provenance |  |
 | Test.java:5517:19:5517:21 | out : SortedMap [<map.key>] : Comparable | Test.java:99:18:99:29 | map : SortedMap [<map.key>] : Comparable | provenance |  |
-| Test.java:5517:19:5517:21 | out : SortedMap [<map.key>] : Comparable | Test.java:5517:9:5517:22 | getMapKey(...) | provenance | MaD:562 |
+| Test.java:5517:19:5517:21 | out : SortedMap [<map.key>] : Comparable | Test.java:5517:9:5517:22 | getMapKey(...) | provenance | MaD:569 |
 | Test.java:5522:23:5522:82 | (...)... : SortedMapDifference [com.google.common.collect.MapDifference.right, <map.key>] : Object | Test.java:5523:10:5523:11 | in : SortedMapDifference [com.google.common.collect.MapDifference.right, <map.key>] : Object | provenance |  |
 | Test.java:5522:38:5522:82 | difference(...) : SortedMapDifference [com.google.common.collect.MapDifference.right, <map.key>] : Object | Test.java:5522:23:5522:82 | (...)... : SortedMapDifference [com.google.common.collect.MapDifference.right, <map.key>] : Object | provenance |  |
 | Test.java:5522:60:5522:81 | of(...) : Map [<map.key>] : Object | Test.java:5522:38:5522:82 | difference(...) : SortedMapDifference [com.google.common.collect.MapDifference.right, <map.key>] : Object | provenance | MaD:334 |
-| Test.java:5522:67:5522:74 | source(...) : Object | Test.java:5522:60:5522:81 | of(...) : Map [<map.key>] : Object | provenance | MaD:563 |
-| Test.java:5523:10:5523:11 | in : SortedMapDifference [com.google.common.collect.MapDifference.right, <map.key>] : Object | Test.java:5523:10:5523:32 | entriesOnlyOnRight(...) : Map [<map.key>] : Object | provenance | MaD:317 |
+| Test.java:5522:67:5522:74 | source(...) : Object | Test.java:5522:60:5522:81 | of(...) : Map [<map.key>] : Object | provenance | MaD:564 |
+| Test.java:5523:10:5523:11 | in : SortedMapDifference [com.google.common.collect.MapDifference.right, <map.key>] : Object | Test.java:5523:10:5523:32 | entriesOnlyOnRight(...) : Map [<map.key>] : Object | provenance | MaD:319 |
 | Test.java:5523:10:5523:32 | entriesOnlyOnRight(...) : Map [<map.key>] : Object | Test.java:5524:19:5524:21 | out : Map [<map.key>] : Object | provenance |  |
 | Test.java:5524:19:5524:21 | out : Map [<map.key>] : Object | Test.java:99:18:99:29 | map : Map [<map.key>] : Object | provenance |  |
-| Test.java:5524:19:5524:21 | out : Map [<map.key>] : Object | Test.java:5524:9:5524:22 | getMapKey(...) | provenance | MaD:562 |
+| Test.java:5524:19:5524:21 | out : Map [<map.key>] : Object | Test.java:5524:9:5524:22 | getMapKey(...) | provenance | MaD:569 |
 | Test.java:5529:29:5529:121 | (...)... : SortedMapDifference [com.google.common.collect.MapDifference.right, <map.value>] : Object | Test.java:5530:10:5530:11 | in : SortedMapDifference [com.google.common.collect.MapDifference.right, <map.value>] : Object | provenance |  |
 | Test.java:5529:50:5529:121 | difference(...) : SortedMapDifference [com.google.common.collect.MapDifference.right, <map.value>] : Object | Test.java:5529:29:5529:121 | (...)... : SortedMapDifference [com.google.common.collect.MapDifference.right, <map.value>] : Object | provenance |  |
 | Test.java:5529:72:5529:120 | of(...) : ImmutableSortedMap [<map.value>] : Object | Test.java:5529:50:5529:121 | difference(...) : SortedMapDifference [com.google.common.collect.MapDifference.right, <map.value>] : Object | provenance | MaD:335 |
 | Test.java:5529:112:5529:119 | source(...) : Object | Test.java:5529:72:5529:120 | of(...) : ImmutableSortedMap [<map.value>] : Object | provenance | MaD:166 |
-| Test.java:5530:10:5530:11 | in : SortedMapDifference [com.google.common.collect.MapDifference.right, <map.value>] : Object | Test.java:5530:10:5530:32 | entriesOnlyOnRight(...) : SortedMap [<map.value>] : Object | provenance | MaD:318 |
+| Test.java:5530:10:5530:11 | in : SortedMapDifference [com.google.common.collect.MapDifference.right, <map.value>] : Object | Test.java:5530:10:5530:32 | entriesOnlyOnRight(...) : SortedMap [<map.value>] : Object | provenance | MaD:320 |
 | Test.java:5530:10:5530:32 | entriesOnlyOnRight(...) : SortedMap [<map.value>] : Object | Test.java:5531:21:5531:23 | out : SortedMap [<map.value>] : Object | provenance |  |
 | Test.java:5531:21:5531:23 | out : SortedMap [<map.value>] : Object | Test.java:118:20:118:31 | map : SortedMap [<map.value>] : Object | provenance |  |
-| Test.java:5531:21:5531:23 | out : SortedMap [<map.value>] : Object | Test.java:5531:9:5531:24 | getMapValue(...) | provenance | MaD:561 |
+| Test.java:5531:21:5531:23 | out : SortedMap [<map.value>] : Object | Test.java:5531:9:5531:24 | getMapValue(...) | provenance | MaD:568 |
 | Test.java:5536:23:5536:82 | (...)... : SortedMapDifference [com.google.common.collect.MapDifference.right, <map.value>] : Object | Test.java:5537:10:5537:11 | in : SortedMapDifference [com.google.common.collect.MapDifference.right, <map.value>] : Object | provenance |  |
 | Test.java:5536:38:5536:82 | difference(...) : SortedMapDifference [com.google.common.collect.MapDifference.right, <map.value>] : Object | Test.java:5536:23:5536:82 | (...)... : SortedMapDifference [com.google.common.collect.MapDifference.right, <map.value>] : Object | provenance |  |
 | Test.java:5536:60:5536:81 | of(...) : Map [<map.value>] : Object | Test.java:5536:38:5536:82 | difference(...) : SortedMapDifference [com.google.common.collect.MapDifference.right, <map.value>] : Object | provenance | MaD:335 |
-| Test.java:5536:73:5536:80 | source(...) : Object | Test.java:5536:60:5536:81 | of(...) : Map [<map.value>] : Object | provenance | MaD:564 |
-| Test.java:5537:10:5537:11 | in : SortedMapDifference [com.google.common.collect.MapDifference.right, <map.value>] : Object | Test.java:5537:10:5537:32 | entriesOnlyOnRight(...) : Map [<map.value>] : Object | provenance | MaD:318 |
+| Test.java:5536:73:5536:80 | source(...) : Object | Test.java:5536:60:5536:81 | of(...) : Map [<map.value>] : Object | provenance | MaD:565 |
+| Test.java:5537:10:5537:11 | in : SortedMapDifference [com.google.common.collect.MapDifference.right, <map.value>] : Object | Test.java:5537:10:5537:32 | entriesOnlyOnRight(...) : Map [<map.value>] : Object | provenance | MaD:320 |
 | Test.java:5537:10:5537:32 | entriesOnlyOnRight(...) : Map [<map.value>] : Object | Test.java:5538:21:5538:23 | out : Map [<map.value>] : Object | provenance |  |
 | Test.java:5538:21:5538:23 | out : Map [<map.value>] : Object | Test.java:118:20:118:31 | map : Map [<map.value>] : Object | provenance |  |
-| Test.java:5538:21:5538:23 | out : Map [<map.value>] : Object | Test.java:5538:9:5538:24 | getMapValue(...) | provenance | MaD:561 |
+| Test.java:5538:21:5538:23 | out : Map [<map.value>] : Object | Test.java:5538:9:5538:24 | getMapValue(...) | provenance | MaD:568 |
 | Test.java:5543:22:5543:78 | (...)... : ImmutableSortedSet [<element>] : Comparable | Test.java:5544:21:5544:22 | in : ImmutableSortedSet [<element>] : Comparable | provenance |  |
 | Test.java:5543:36:5543:78 | of(...) : ImmutableSortedSet [<element>] : Comparable | Test.java:5543:22:5543:78 | (...)... : ImmutableSortedSet [<element>] : Comparable | provenance |  |
 | Test.java:5543:58:5543:77 | (...)... : Comparable | Test.java:5543:36:5543:78 | of(...) : ImmutableSortedSet [<element>] : Comparable | provenance | MaD:191 |
@@ -6115,14 +6115,14 @@ edges
 | Test.java:5544:10:5544:39 | asMap(...) : NavigableMap [<map.key>] : Comparable | Test.java:5545:19:5545:21 | out : NavigableMap [<map.key>] : Comparable | provenance |  |
 | Test.java:5544:21:5544:22 | in : ImmutableSortedSet [<element>] : Comparable | Test.java:5544:10:5544:39 | asMap(...) : NavigableMap [<map.key>] : Comparable | provenance | MaD:321 |
 | Test.java:5545:19:5545:21 | out : NavigableMap [<map.key>] : Comparable | Test.java:99:18:99:29 | map : NavigableMap [<map.key>] : Comparable | provenance |  |
-| Test.java:5545:19:5545:21 | out : NavigableMap [<map.key>] : Comparable | Test.java:5545:9:5545:22 | getMapKey(...) | provenance | MaD:562 |
+| Test.java:5545:19:5545:21 | out : NavigableMap [<map.key>] : Comparable | Test.java:5545:9:5545:22 | getMapKey(...) | provenance | MaD:569 |
 | Test.java:5550:13:5550:33 | (...)... : Set [<element>] : Object | Test.java:5551:21:5551:22 | in : Set [<element>] : Object | provenance |  |
 | Test.java:5550:18:5550:33 | of(...) : Set [<element>] : Object | Test.java:5550:13:5550:33 | (...)... : Set [<element>] : Object | provenance |  |
-| Test.java:5550:25:5550:32 | source(...) : Object | Test.java:5550:18:5550:33 | of(...) : Set [<element>] : Object | provenance | MaD:567 |
+| Test.java:5550:25:5550:32 | source(...) : Object | Test.java:5550:18:5550:33 | of(...) : Set [<element>] : Object | provenance | MaD:570 |
 | Test.java:5551:10:5551:39 | asMap(...) : Map [<map.key>] : Object | Test.java:5552:19:5552:21 | out : Map [<map.key>] : Object | provenance |  |
 | Test.java:5551:21:5551:22 | in : Set [<element>] : Object | Test.java:5551:10:5551:39 | asMap(...) : Map [<map.key>] : Object | provenance | MaD:322 |
 | Test.java:5552:19:5552:21 | out : Map [<map.key>] : Object | Test.java:99:18:99:29 | map : Map [<map.key>] : Object | provenance |  |
-| Test.java:5552:19:5552:21 | out : Map [<map.key>] : Object | Test.java:5552:9:5552:22 | getMapKey(...) | provenance | MaD:562 |
+| Test.java:5552:19:5552:21 | out : Map [<map.key>] : Object | Test.java:5552:9:5552:22 | getMapKey(...) | provenance | MaD:569 |
 | Test.java:5557:19:5557:72 | (...)... : ImmutableSortedSet [<element>] : Comparable | Test.java:5558:21:5558:22 | in : ImmutableSortedSet [<element>] : Comparable | provenance |  |
 | Test.java:5557:30:5557:72 | of(...) : ImmutableSortedSet [<element>] : Comparable | Test.java:5557:19:5557:72 | (...)... : ImmutableSortedSet [<element>] : Comparable | provenance |  |
 | Test.java:5557:52:5557:71 | (...)... : Comparable | Test.java:5557:30:5557:72 | of(...) : ImmutableSortedSet [<element>] : Comparable | provenance | MaD:191 |
@@ -6130,104 +6130,104 @@ edges
 | Test.java:5558:10:5558:39 | asMap(...) : SortedMap [<map.key>] : Comparable | Test.java:5559:19:5559:21 | out : SortedMap [<map.key>] : Comparable | provenance |  |
 | Test.java:5558:21:5558:22 | in : ImmutableSortedSet [<element>] : Comparable | Test.java:5558:10:5558:39 | asMap(...) : SortedMap [<map.key>] : Comparable | provenance | MaD:323 |
 | Test.java:5559:19:5559:21 | out : SortedMap [<map.key>] : Comparable | Test.java:99:18:99:29 | map : SortedMap [<map.key>] : Comparable | provenance |  |
-| Test.java:5559:19:5559:21 | out : SortedMap [<map.key>] : Comparable | Test.java:5559:9:5559:22 | getMapKey(...) | provenance | MaD:562 |
+| Test.java:5559:19:5559:21 | out : SortedMap [<map.key>] : Comparable | Test.java:5559:9:5559:22 | getMapKey(...) | provenance | MaD:569 |
 | Test.java:5564:13:5564:39 | (...)... : Map [<map.key>] : Object | Test.java:5565:26:5565:27 | in : Map [<map.key>] : Object | provenance |  |
 | Test.java:5564:18:5564:39 | of(...) : Map [<map.key>] : Object | Test.java:5564:13:5564:39 | (...)... : Map [<map.key>] : Object | provenance |  |
-| Test.java:5564:25:5564:32 | source(...) : Object | Test.java:5564:18:5564:39 | of(...) : Map [<map.key>] : Object | provenance | MaD:563 |
+| Test.java:5564:25:5564:32 | source(...) : Object | Test.java:5564:18:5564:39 | of(...) : Map [<map.key>] : Object | provenance | MaD:564 |
 | Test.java:5565:10:5565:39 | difference(...) : MapDifference [com.google.common.collect.MapDifference.left, <map.key>] : Object | Test.java:5566:19:5566:21 | out : MapDifference [com.google.common.collect.MapDifference.left, <map.key>] : Object | provenance |  |
 | Test.java:5565:26:5565:27 | in : Map [<map.key>] : Object | Test.java:5565:10:5565:39 | difference(...) : MapDifference [com.google.common.collect.MapDifference.left, <map.key>] : Object | provenance | MaD:324 |
-| Test.java:5566:19:5566:21 | out : MapDifference [com.google.common.collect.MapDifference.left, <map.key>] : Object | Test.java:5566:19:5566:41 | entriesOnlyOnLeft(...) : Map [<map.key>] : Object | provenance | MaD:315 |
+| Test.java:5566:19:5566:21 | out : MapDifference [com.google.common.collect.MapDifference.left, <map.key>] : Object | Test.java:5566:19:5566:41 | entriesOnlyOnLeft(...) : Map [<map.key>] : Object | provenance | MaD:317 |
 | Test.java:5566:19:5566:41 | entriesOnlyOnLeft(...) : Map [<map.key>] : Object | Test.java:99:18:99:29 | map : Map [<map.key>] : Object | provenance |  |
-| Test.java:5566:19:5566:41 | entriesOnlyOnLeft(...) : Map [<map.key>] : Object | Test.java:5566:9:5566:42 | getMapKey(...) | provenance | MaD:562 |
+| Test.java:5566:19:5566:41 | entriesOnlyOnLeft(...) : Map [<map.key>] : Object | Test.java:5566:9:5566:42 | getMapKey(...) | provenance | MaD:569 |
 | Test.java:5571:13:5571:39 | (...)... : Map [<map.key>] : Object | Test.java:5572:37:5572:38 | in : Map [<map.key>] : Object | provenance |  |
 | Test.java:5571:18:5571:39 | of(...) : Map [<map.key>] : Object | Test.java:5571:13:5571:39 | (...)... : Map [<map.key>] : Object | provenance |  |
-| Test.java:5571:25:5571:32 | source(...) : Object | Test.java:5571:18:5571:39 | of(...) : Map [<map.key>] : Object | provenance | MaD:563 |
+| Test.java:5571:25:5571:32 | source(...) : Object | Test.java:5571:18:5571:39 | of(...) : Map [<map.key>] : Object | provenance | MaD:564 |
 | Test.java:5572:10:5572:39 | difference(...) : MapDifference [com.google.common.collect.MapDifference.right, <map.key>] : Object | Test.java:5573:19:5573:21 | out : MapDifference [com.google.common.collect.MapDifference.right, <map.key>] : Object | provenance |  |
 | Test.java:5572:37:5572:38 | in : Map [<map.key>] : Object | Test.java:5572:10:5572:39 | difference(...) : MapDifference [com.google.common.collect.MapDifference.right, <map.key>] : Object | provenance | MaD:326 |
-| Test.java:5573:19:5573:21 | out : MapDifference [com.google.common.collect.MapDifference.right, <map.key>] : Object | Test.java:5573:19:5573:42 | entriesOnlyOnRight(...) : Map [<map.key>] : Object | provenance | MaD:317 |
+| Test.java:5573:19:5573:21 | out : MapDifference [com.google.common.collect.MapDifference.right, <map.key>] : Object | Test.java:5573:19:5573:42 | entriesOnlyOnRight(...) : Map [<map.key>] : Object | provenance | MaD:319 |
 | Test.java:5573:19:5573:42 | entriesOnlyOnRight(...) : Map [<map.key>] : Object | Test.java:99:18:99:29 | map : Map [<map.key>] : Object | provenance |  |
-| Test.java:5573:19:5573:42 | entriesOnlyOnRight(...) : Map [<map.key>] : Object | Test.java:5573:9:5573:43 | getMapKey(...) | provenance | MaD:562 |
+| Test.java:5573:19:5573:42 | entriesOnlyOnRight(...) : Map [<map.key>] : Object | Test.java:5573:9:5573:43 | getMapKey(...) | provenance | MaD:569 |
 | Test.java:5578:13:5578:39 | (...)... : Map [<map.value>] : Object | Test.java:5579:26:5579:27 | in : Map [<map.value>] : Object | provenance |  |
 | Test.java:5578:18:5578:39 | of(...) : Map [<map.value>] : Object | Test.java:5578:13:5578:39 | (...)... : Map [<map.value>] : Object | provenance |  |
-| Test.java:5578:31:5578:38 | source(...) : Object | Test.java:5578:18:5578:39 | of(...) : Map [<map.value>] : Object | provenance | MaD:564 |
+| Test.java:5578:31:5578:38 | source(...) : Object | Test.java:5578:18:5578:39 | of(...) : Map [<map.value>] : Object | provenance | MaD:565 |
 | Test.java:5579:10:5579:39 | difference(...) : MapDifference [com.google.common.collect.MapDifference.left, <map.value>] : Object | Test.java:5580:21:5580:23 | out : MapDifference [com.google.common.collect.MapDifference.left, <map.value>] : Object | provenance |  |
 | Test.java:5579:26:5579:27 | in : Map [<map.value>] : Object | Test.java:5579:10:5579:39 | difference(...) : MapDifference [com.google.common.collect.MapDifference.left, <map.value>] : Object | provenance | MaD:325 |
-| Test.java:5580:21:5580:23 | out : MapDifference [com.google.common.collect.MapDifference.left, <map.value>] : Object | Test.java:5580:21:5580:43 | entriesOnlyOnLeft(...) : Map [<map.value>] : Object | provenance | MaD:316 |
+| Test.java:5580:21:5580:23 | out : MapDifference [com.google.common.collect.MapDifference.left, <map.value>] : Object | Test.java:5580:21:5580:43 | entriesOnlyOnLeft(...) : Map [<map.value>] : Object | provenance | MaD:318 |
 | Test.java:5580:21:5580:43 | entriesOnlyOnLeft(...) : Map [<map.value>] : Object | Test.java:118:20:118:31 | map : Map [<map.value>] : Object | provenance |  |
-| Test.java:5580:21:5580:43 | entriesOnlyOnLeft(...) : Map [<map.value>] : Object | Test.java:5580:9:5580:44 | getMapValue(...) | provenance | MaD:561 |
+| Test.java:5580:21:5580:43 | entriesOnlyOnLeft(...) : Map [<map.value>] : Object | Test.java:5580:9:5580:44 | getMapValue(...) | provenance | MaD:568 |
 | Test.java:5585:13:5585:39 | (...)... : Map [<map.value>] : Object | Test.java:5586:37:5586:38 | in : Map [<map.value>] : Object | provenance |  |
 | Test.java:5585:18:5585:39 | of(...) : Map [<map.value>] : Object | Test.java:5585:13:5585:39 | (...)... : Map [<map.value>] : Object | provenance |  |
-| Test.java:5585:31:5585:38 | source(...) : Object | Test.java:5585:18:5585:39 | of(...) : Map [<map.value>] : Object | provenance | MaD:564 |
+| Test.java:5585:31:5585:38 | source(...) : Object | Test.java:5585:18:5585:39 | of(...) : Map [<map.value>] : Object | provenance | MaD:565 |
 | Test.java:5586:10:5586:39 | difference(...) : MapDifference [com.google.common.collect.MapDifference.right, <map.value>] : Object | Test.java:5587:21:5587:23 | out : MapDifference [com.google.common.collect.MapDifference.right, <map.value>] : Object | provenance |  |
 | Test.java:5586:37:5586:38 | in : Map [<map.value>] : Object | Test.java:5586:10:5586:39 | difference(...) : MapDifference [com.google.common.collect.MapDifference.right, <map.value>] : Object | provenance | MaD:327 |
-| Test.java:5587:21:5587:23 | out : MapDifference [com.google.common.collect.MapDifference.right, <map.value>] : Object | Test.java:5587:21:5587:44 | entriesOnlyOnRight(...) : Map [<map.value>] : Object | provenance | MaD:318 |
+| Test.java:5587:21:5587:23 | out : MapDifference [com.google.common.collect.MapDifference.right, <map.value>] : Object | Test.java:5587:21:5587:44 | entriesOnlyOnRight(...) : Map [<map.value>] : Object | provenance | MaD:320 |
 | Test.java:5587:21:5587:44 | entriesOnlyOnRight(...) : Map [<map.value>] : Object | Test.java:118:20:118:31 | map : Map [<map.value>] : Object | provenance |  |
-| Test.java:5587:21:5587:44 | entriesOnlyOnRight(...) : Map [<map.value>] : Object | Test.java:5587:9:5587:45 | getMapValue(...) | provenance | MaD:561 |
+| Test.java:5587:21:5587:44 | entriesOnlyOnRight(...) : Map [<map.value>] : Object | Test.java:5587:9:5587:45 | getMapValue(...) | provenance | MaD:568 |
 | Test.java:5592:13:5592:39 | (...)... : Map [<map.key>] : Object | Test.java:5593:26:5593:27 | in : Map [<map.key>] : Object | provenance |  |
 | Test.java:5592:18:5592:39 | of(...) : Map [<map.key>] : Object | Test.java:5592:13:5592:39 | (...)... : Map [<map.key>] : Object | provenance |  |
-| Test.java:5592:25:5592:32 | source(...) : Object | Test.java:5592:18:5592:39 | of(...) : Map [<map.key>] : Object | provenance | MaD:563 |
+| Test.java:5592:25:5592:32 | source(...) : Object | Test.java:5592:18:5592:39 | of(...) : Map [<map.key>] : Object | provenance | MaD:564 |
 | Test.java:5593:10:5593:40 | difference(...) : MapDifference [com.google.common.collect.MapDifference.left, <map.key>] : Object | Test.java:5594:19:5594:21 | out : MapDifference [com.google.common.collect.MapDifference.left, <map.key>] : Object | provenance |  |
 | Test.java:5593:26:5593:27 | in : Map [<map.key>] : Object | Test.java:5593:10:5593:40 | difference(...) : MapDifference [com.google.common.collect.MapDifference.left, <map.key>] : Object | provenance | MaD:328 |
-| Test.java:5594:19:5594:21 | out : MapDifference [com.google.common.collect.MapDifference.left, <map.key>] : Object | Test.java:5594:19:5594:41 | entriesOnlyOnLeft(...) : Map [<map.key>] : Object | provenance | MaD:315 |
+| Test.java:5594:19:5594:21 | out : MapDifference [com.google.common.collect.MapDifference.left, <map.key>] : Object | Test.java:5594:19:5594:41 | entriesOnlyOnLeft(...) : Map [<map.key>] : Object | provenance | MaD:317 |
 | Test.java:5594:19:5594:41 | entriesOnlyOnLeft(...) : Map [<map.key>] : Object | Test.java:99:18:99:29 | map : Map [<map.key>] : Object | provenance |  |
-| Test.java:5594:19:5594:41 | entriesOnlyOnLeft(...) : Map [<map.key>] : Object | Test.java:5594:9:5594:42 | getMapKey(...) | provenance | MaD:562 |
+| Test.java:5594:19:5594:41 | entriesOnlyOnLeft(...) : Map [<map.key>] : Object | Test.java:5594:9:5594:42 | getMapKey(...) | provenance | MaD:569 |
 | Test.java:5599:13:5599:39 | (...)... : Map [<map.key>] : Object | Test.java:5600:32:5600:33 | in : Map [<map.key>] : Object | provenance |  |
 | Test.java:5599:18:5599:39 | of(...) : Map [<map.key>] : Object | Test.java:5599:13:5599:39 | (...)... : Map [<map.key>] : Object | provenance |  |
-| Test.java:5599:25:5599:32 | source(...) : Object | Test.java:5599:18:5599:39 | of(...) : Map [<map.key>] : Object | provenance | MaD:563 |
+| Test.java:5599:25:5599:32 | source(...) : Object | Test.java:5599:18:5599:39 | of(...) : Map [<map.key>] : Object | provenance | MaD:564 |
 | Test.java:5600:10:5600:40 | difference(...) : MapDifference [com.google.common.collect.MapDifference.right, <map.key>] : Object | Test.java:5601:19:5601:21 | out : MapDifference [com.google.common.collect.MapDifference.right, <map.key>] : Object | provenance |  |
 | Test.java:5600:32:5600:33 | in : Map [<map.key>] : Object | Test.java:5600:10:5600:40 | difference(...) : MapDifference [com.google.common.collect.MapDifference.right, <map.key>] : Object | provenance | MaD:330 |
-| Test.java:5601:19:5601:21 | out : MapDifference [com.google.common.collect.MapDifference.right, <map.key>] : Object | Test.java:5601:19:5601:42 | entriesOnlyOnRight(...) : Map [<map.key>] : Object | provenance | MaD:317 |
+| Test.java:5601:19:5601:21 | out : MapDifference [com.google.common.collect.MapDifference.right, <map.key>] : Object | Test.java:5601:19:5601:42 | entriesOnlyOnRight(...) : Map [<map.key>] : Object | provenance | MaD:319 |
 | Test.java:5601:19:5601:42 | entriesOnlyOnRight(...) : Map [<map.key>] : Object | Test.java:99:18:99:29 | map : Map [<map.key>] : Object | provenance |  |
-| Test.java:5601:19:5601:42 | entriesOnlyOnRight(...) : Map [<map.key>] : Object | Test.java:5601:9:5601:43 | getMapKey(...) | provenance | MaD:562 |
+| Test.java:5601:19:5601:42 | entriesOnlyOnRight(...) : Map [<map.key>] : Object | Test.java:5601:9:5601:43 | getMapKey(...) | provenance | MaD:569 |
 | Test.java:5606:13:5606:39 | (...)... : Map [<map.value>] : Object | Test.java:5607:26:5607:27 | in : Map [<map.value>] : Object | provenance |  |
 | Test.java:5606:18:5606:39 | of(...) : Map [<map.value>] : Object | Test.java:5606:13:5606:39 | (...)... : Map [<map.value>] : Object | provenance |  |
-| Test.java:5606:31:5606:38 | source(...) : Object | Test.java:5606:18:5606:39 | of(...) : Map [<map.value>] : Object | provenance | MaD:564 |
+| Test.java:5606:31:5606:38 | source(...) : Object | Test.java:5606:18:5606:39 | of(...) : Map [<map.value>] : Object | provenance | MaD:565 |
 | Test.java:5607:10:5607:40 | difference(...) : MapDifference [com.google.common.collect.MapDifference.left, <map.value>] : Object | Test.java:5608:21:5608:23 | out : MapDifference [com.google.common.collect.MapDifference.left, <map.value>] : Object | provenance |  |
 | Test.java:5607:26:5607:27 | in : Map [<map.value>] : Object | Test.java:5607:10:5607:40 | difference(...) : MapDifference [com.google.common.collect.MapDifference.left, <map.value>] : Object | provenance | MaD:329 |
-| Test.java:5608:21:5608:23 | out : MapDifference [com.google.common.collect.MapDifference.left, <map.value>] : Object | Test.java:5608:21:5608:43 | entriesOnlyOnLeft(...) : Map [<map.value>] : Object | provenance | MaD:316 |
+| Test.java:5608:21:5608:23 | out : MapDifference [com.google.common.collect.MapDifference.left, <map.value>] : Object | Test.java:5608:21:5608:43 | entriesOnlyOnLeft(...) : Map [<map.value>] : Object | provenance | MaD:318 |
 | Test.java:5608:21:5608:43 | entriesOnlyOnLeft(...) : Map [<map.value>] : Object | Test.java:118:20:118:31 | map : Map [<map.value>] : Object | provenance |  |
-| Test.java:5608:21:5608:43 | entriesOnlyOnLeft(...) : Map [<map.value>] : Object | Test.java:5608:9:5608:44 | getMapValue(...) | provenance | MaD:561 |
+| Test.java:5608:21:5608:43 | entriesOnlyOnLeft(...) : Map [<map.value>] : Object | Test.java:5608:9:5608:44 | getMapValue(...) | provenance | MaD:568 |
 | Test.java:5613:13:5613:39 | (...)... : Map [<map.value>] : Object | Test.java:5614:32:5614:33 | in : Map [<map.value>] : Object | provenance |  |
 | Test.java:5613:18:5613:39 | of(...) : Map [<map.value>] : Object | Test.java:5613:13:5613:39 | (...)... : Map [<map.value>] : Object | provenance |  |
-| Test.java:5613:31:5613:38 | source(...) : Object | Test.java:5613:18:5613:39 | of(...) : Map [<map.value>] : Object | provenance | MaD:564 |
+| Test.java:5613:31:5613:38 | source(...) : Object | Test.java:5613:18:5613:39 | of(...) : Map [<map.value>] : Object | provenance | MaD:565 |
 | Test.java:5614:10:5614:40 | difference(...) : MapDifference [com.google.common.collect.MapDifference.right, <map.value>] : Object | Test.java:5615:21:5615:23 | out : MapDifference [com.google.common.collect.MapDifference.right, <map.value>] : Object | provenance |  |
 | Test.java:5614:32:5614:33 | in : Map [<map.value>] : Object | Test.java:5614:10:5614:40 | difference(...) : MapDifference [com.google.common.collect.MapDifference.right, <map.value>] : Object | provenance | MaD:331 |
-| Test.java:5615:21:5615:23 | out : MapDifference [com.google.common.collect.MapDifference.right, <map.value>] : Object | Test.java:5615:21:5615:44 | entriesOnlyOnRight(...) : Map [<map.value>] : Object | provenance | MaD:318 |
+| Test.java:5615:21:5615:23 | out : MapDifference [com.google.common.collect.MapDifference.right, <map.value>] : Object | Test.java:5615:21:5615:44 | entriesOnlyOnRight(...) : Map [<map.value>] : Object | provenance | MaD:320 |
 | Test.java:5615:21:5615:44 | entriesOnlyOnRight(...) : Map [<map.value>] : Object | Test.java:118:20:118:31 | map : Map [<map.value>] : Object | provenance |  |
-| Test.java:5615:21:5615:44 | entriesOnlyOnRight(...) : Map [<map.value>] : Object | Test.java:5615:9:5615:45 | getMapValue(...) | provenance | MaD:561 |
+| Test.java:5615:21:5615:44 | entriesOnlyOnRight(...) : Map [<map.value>] : Object | Test.java:5615:9:5615:45 | getMapValue(...) | provenance | MaD:568 |
 | Test.java:5620:19:5620:78 | (...)... : ImmutableSortedMap [<map.key>] : Comparable | Test.java:5621:26:5621:27 | in : ImmutableSortedMap [<map.key>] : Comparable | provenance |  |
 | Test.java:5620:30:5620:78 | of(...) : ImmutableSortedMap [<map.key>] : Comparable | Test.java:5620:19:5620:78 | (...)... : ImmutableSortedMap [<map.key>] : Comparable | provenance |  |
 | Test.java:5620:52:5620:71 | (...)... : Comparable | Test.java:5620:30:5620:78 | of(...) : ImmutableSortedMap [<map.key>] : Comparable | provenance | MaD:165 |
 | Test.java:5620:64:5620:71 | source(...) : Object | Test.java:5620:52:5620:71 | (...)... : Comparable | provenance |  |
 | Test.java:5621:10:5621:39 | difference(...) : SortedMapDifference [com.google.common.collect.MapDifference.left, <map.key>] : Comparable | Test.java:5622:19:5622:21 | out : SortedMapDifference [com.google.common.collect.MapDifference.left, <map.key>] : Comparable | provenance |  |
 | Test.java:5621:26:5621:27 | in : ImmutableSortedMap [<map.key>] : Comparable | Test.java:5621:10:5621:39 | difference(...) : SortedMapDifference [com.google.common.collect.MapDifference.left, <map.key>] : Comparable | provenance | MaD:332 |
-| Test.java:5622:19:5622:21 | out : SortedMapDifference [com.google.common.collect.MapDifference.left, <map.key>] : Comparable | Test.java:5622:19:5622:41 | entriesOnlyOnLeft(...) : SortedMap [<map.key>] : Comparable | provenance | MaD:315 |
+| Test.java:5622:19:5622:21 | out : SortedMapDifference [com.google.common.collect.MapDifference.left, <map.key>] : Comparable | Test.java:5622:19:5622:41 | entriesOnlyOnLeft(...) : SortedMap [<map.key>] : Comparable | provenance | MaD:317 |
 | Test.java:5622:19:5622:41 | entriesOnlyOnLeft(...) : SortedMap [<map.key>] : Comparable | Test.java:99:18:99:29 | map : SortedMap [<map.key>] : Comparable | provenance |  |
-| Test.java:5622:19:5622:41 | entriesOnlyOnLeft(...) : SortedMap [<map.key>] : Comparable | Test.java:5622:9:5622:42 | getMapKey(...) | provenance | MaD:562 |
+| Test.java:5622:19:5622:41 | entriesOnlyOnLeft(...) : SortedMap [<map.key>] : Comparable | Test.java:5622:9:5622:42 | getMapKey(...) | provenance | MaD:569 |
 | Test.java:5627:13:5627:39 | (...)... : Map [<map.key>] : Object | Test.java:5628:43:5628:44 | in : Map [<map.key>] : Object | provenance |  |
 | Test.java:5627:18:5627:39 | of(...) : Map [<map.key>] : Object | Test.java:5627:13:5627:39 | (...)... : Map [<map.key>] : Object | provenance |  |
-| Test.java:5627:25:5627:32 | source(...) : Object | Test.java:5627:18:5627:39 | of(...) : Map [<map.key>] : Object | provenance | MaD:563 |
+| Test.java:5627:25:5627:32 | source(...) : Object | Test.java:5627:18:5627:39 | of(...) : Map [<map.key>] : Object | provenance | MaD:564 |
 | Test.java:5628:10:5628:45 | difference(...) : SortedMapDifference [com.google.common.collect.MapDifference.right, <map.key>] : Object | Test.java:5629:19:5629:21 | out : SortedMapDifference [com.google.common.collect.MapDifference.right, <map.key>] : Object | provenance |  |
 | Test.java:5628:43:5628:44 | in : Map [<map.key>] : Object | Test.java:5628:10:5628:45 | difference(...) : SortedMapDifference [com.google.common.collect.MapDifference.right, <map.key>] : Object | provenance | MaD:334 |
-| Test.java:5629:19:5629:21 | out : SortedMapDifference [com.google.common.collect.MapDifference.right, <map.key>] : Object | Test.java:5629:19:5629:42 | entriesOnlyOnRight(...) : SortedMap [<map.key>] : Object | provenance | MaD:317 |
+| Test.java:5629:19:5629:21 | out : SortedMapDifference [com.google.common.collect.MapDifference.right, <map.key>] : Object | Test.java:5629:19:5629:42 | entriesOnlyOnRight(...) : SortedMap [<map.key>] : Object | provenance | MaD:319 |
 | Test.java:5629:19:5629:42 | entriesOnlyOnRight(...) : SortedMap [<map.key>] : Object | Test.java:99:18:99:29 | map : SortedMap [<map.key>] : Object | provenance |  |
-| Test.java:5629:19:5629:42 | entriesOnlyOnRight(...) : SortedMap [<map.key>] : Object | Test.java:5629:9:5629:43 | getMapKey(...) | provenance | MaD:562 |
+| Test.java:5629:19:5629:42 | entriesOnlyOnRight(...) : SortedMap [<map.key>] : Object | Test.java:5629:9:5629:43 | getMapKey(...) | provenance | MaD:569 |
 | Test.java:5634:19:5634:78 | (...)... : ImmutableSortedMap [<map.value>] : Object | Test.java:5635:26:5635:27 | in : ImmutableSortedMap [<map.value>] : Object | provenance |  |
 | Test.java:5634:30:5634:78 | of(...) : ImmutableSortedMap [<map.value>] : Object | Test.java:5634:19:5634:78 | (...)... : ImmutableSortedMap [<map.value>] : Object | provenance |  |
 | Test.java:5634:70:5634:77 | source(...) : Object | Test.java:5634:30:5634:78 | of(...) : ImmutableSortedMap [<map.value>] : Object | provenance | MaD:166 |
 | Test.java:5635:10:5635:39 | difference(...) : SortedMapDifference [com.google.common.collect.MapDifference.left, <map.value>] : Object | Test.java:5636:21:5636:23 | out : SortedMapDifference [com.google.common.collect.MapDifference.left, <map.value>] : Object | provenance |  |
 | Test.java:5635:26:5635:27 | in : ImmutableSortedMap [<map.value>] : Object | Test.java:5635:10:5635:39 | difference(...) : SortedMapDifference [com.google.common.collect.MapDifference.left, <map.value>] : Object | provenance | MaD:333 |
-| Test.java:5636:21:5636:23 | out : SortedMapDifference [com.google.common.collect.MapDifference.left, <map.value>] : Object | Test.java:5636:21:5636:43 | entriesOnlyOnLeft(...) : SortedMap [<map.value>] : Object | provenance | MaD:316 |
+| Test.java:5636:21:5636:23 | out : SortedMapDifference [com.google.common.collect.MapDifference.left, <map.value>] : Object | Test.java:5636:21:5636:43 | entriesOnlyOnLeft(...) : SortedMap [<map.value>] : Object | provenance | MaD:318 |
 | Test.java:5636:21:5636:43 | entriesOnlyOnLeft(...) : SortedMap [<map.value>] : Object | Test.java:118:20:118:31 | map : SortedMap [<map.value>] : Object | provenance |  |
-| Test.java:5636:21:5636:43 | entriesOnlyOnLeft(...) : SortedMap [<map.value>] : Object | Test.java:5636:9:5636:44 | getMapValue(...) | provenance | MaD:561 |
+| Test.java:5636:21:5636:43 | entriesOnlyOnLeft(...) : SortedMap [<map.value>] : Object | Test.java:5636:9:5636:44 | getMapValue(...) | provenance | MaD:568 |
 | Test.java:5641:13:5641:39 | (...)... : Map [<map.value>] : Object | Test.java:5642:43:5642:44 | in : Map [<map.value>] : Object | provenance |  |
 | Test.java:5641:18:5641:39 | of(...) : Map [<map.value>] : Object | Test.java:5641:13:5641:39 | (...)... : Map [<map.value>] : Object | provenance |  |
-| Test.java:5641:31:5641:38 | source(...) : Object | Test.java:5641:18:5641:39 | of(...) : Map [<map.value>] : Object | provenance | MaD:564 |
+| Test.java:5641:31:5641:38 | source(...) : Object | Test.java:5641:18:5641:39 | of(...) : Map [<map.value>] : Object | provenance | MaD:565 |
 | Test.java:5642:10:5642:45 | difference(...) : SortedMapDifference [com.google.common.collect.MapDifference.right, <map.value>] : Object | Test.java:5643:21:5643:23 | out : SortedMapDifference [com.google.common.collect.MapDifference.right, <map.value>] : Object | provenance |  |
 | Test.java:5642:43:5642:44 | in : Map [<map.value>] : Object | Test.java:5642:10:5642:45 | difference(...) : SortedMapDifference [com.google.common.collect.MapDifference.right, <map.value>] : Object | provenance | MaD:335 |
-| Test.java:5643:21:5643:23 | out : SortedMapDifference [com.google.common.collect.MapDifference.right, <map.value>] : Object | Test.java:5643:21:5643:44 | entriesOnlyOnRight(...) : SortedMap [<map.value>] : Object | provenance | MaD:318 |
+| Test.java:5643:21:5643:23 | out : SortedMapDifference [com.google.common.collect.MapDifference.right, <map.value>] : Object | Test.java:5643:21:5643:44 | entriesOnlyOnRight(...) : SortedMap [<map.value>] : Object | provenance | MaD:320 |
 | Test.java:5643:21:5643:44 | entriesOnlyOnRight(...) : SortedMap [<map.value>] : Object | Test.java:118:20:118:31 | map : SortedMap [<map.value>] : Object | provenance |  |
-| Test.java:5643:21:5643:44 | entriesOnlyOnRight(...) : SortedMap [<map.value>] : Object | Test.java:5643:9:5643:45 | getMapValue(...) | provenance | MaD:561 |
+| Test.java:5643:21:5643:44 | entriesOnlyOnRight(...) : SortedMap [<map.value>] : Object | Test.java:5643:9:5643:45 | getMapValue(...) | provenance | MaD:568 |
 | Test.java:5648:19:5648:78 | (...)... : ImmutableSortedMap [<map.key>] : Comparable | Test.java:5649:29:5649:30 | in : ImmutableSortedMap [<map.key>] : Comparable | provenance |  |
 | Test.java:5648:30:5648:78 | of(...) : ImmutableSortedMap [<map.key>] : Comparable | Test.java:5648:19:5648:78 | (...)... : ImmutableSortedMap [<map.key>] : Comparable | provenance |  |
 | Test.java:5648:52:5648:71 | (...)... : Comparable | Test.java:5648:30:5648:78 | of(...) : ImmutableSortedMap [<map.key>] : Comparable | provenance | MaD:165 |
@@ -6235,7 +6235,7 @@ edges
 | Test.java:5649:10:5649:48 | filterEntries(...) : SortedMap [<map.key>] : Comparable | Test.java:5650:19:5650:21 | out : SortedMap [<map.key>] : Comparable | provenance |  |
 | Test.java:5649:29:5649:30 | in : ImmutableSortedMap [<map.key>] : Comparable | Test.java:5649:10:5649:48 | filterEntries(...) : SortedMap [<map.key>] : Comparable | provenance | MaD:336 |
 | Test.java:5650:19:5650:21 | out : SortedMap [<map.key>] : Comparable | Test.java:99:18:99:29 | map : SortedMap [<map.key>] : Comparable | provenance |  |
-| Test.java:5650:19:5650:21 | out : SortedMap [<map.key>] : Comparable | Test.java:5650:9:5650:22 | getMapKey(...) | provenance | MaD:562 |
+| Test.java:5650:19:5650:21 | out : SortedMap [<map.key>] : Comparable | Test.java:5650:9:5650:22 | getMapKey(...) | provenance | MaD:569 |
 | Test.java:5655:22:5655:84 | (...)... : ImmutableSortedMap [<map.key>] : Comparable | Test.java:5656:29:5656:30 | in : ImmutableSortedMap [<map.key>] : Comparable | provenance |  |
 | Test.java:5655:36:5655:84 | of(...) : ImmutableSortedMap [<map.key>] : Comparable | Test.java:5655:22:5655:84 | (...)... : ImmutableSortedMap [<map.key>] : Comparable | provenance |  |
 | Test.java:5655:58:5655:77 | (...)... : Comparable | Test.java:5655:36:5655:84 | of(...) : ImmutableSortedMap [<map.key>] : Comparable | provenance | MaD:165 |
@@ -6243,21 +6243,21 @@ edges
 | Test.java:5656:10:5656:48 | filterEntries(...) : NavigableMap [<map.key>] : Comparable | Test.java:5657:19:5657:21 | out : NavigableMap [<map.key>] : Comparable | provenance |  |
 | Test.java:5656:29:5656:30 | in : ImmutableSortedMap [<map.key>] : Comparable | Test.java:5656:10:5656:48 | filterEntries(...) : NavigableMap [<map.key>] : Comparable | provenance | MaD:336 |
 | Test.java:5657:19:5657:21 | out : NavigableMap [<map.key>] : Comparable | Test.java:99:18:99:29 | map : NavigableMap [<map.key>] : Comparable | provenance |  |
-| Test.java:5657:19:5657:21 | out : NavigableMap [<map.key>] : Comparable | Test.java:5657:9:5657:22 | getMapKey(...) | provenance | MaD:562 |
+| Test.java:5657:19:5657:21 | out : NavigableMap [<map.key>] : Comparable | Test.java:5657:9:5657:22 | getMapKey(...) | provenance | MaD:569 |
 | Test.java:5662:13:5662:39 | (...)... : Map [<map.key>] : Object | Test.java:5663:29:5663:30 | in : Map [<map.key>] : Object | provenance |  |
 | Test.java:5662:18:5662:39 | of(...) : Map [<map.key>] : Object | Test.java:5662:13:5662:39 | (...)... : Map [<map.key>] : Object | provenance |  |
-| Test.java:5662:25:5662:32 | source(...) : Object | Test.java:5662:18:5662:39 | of(...) : Map [<map.key>] : Object | provenance | MaD:563 |
+| Test.java:5662:25:5662:32 | source(...) : Object | Test.java:5662:18:5662:39 | of(...) : Map [<map.key>] : Object | provenance | MaD:564 |
 | Test.java:5663:10:5663:48 | filterEntries(...) : Map [<map.key>] : Object | Test.java:5664:19:5664:21 | out : Map [<map.key>] : Object | provenance |  |
 | Test.java:5663:29:5663:30 | in : Map [<map.key>] : Object | Test.java:5663:10:5663:48 | filterEntries(...) : Map [<map.key>] : Object | provenance | MaD:336 |
 | Test.java:5664:19:5664:21 | out : Map [<map.key>] : Object | Test.java:99:18:99:29 | map : Map [<map.key>] : Object | provenance |  |
-| Test.java:5664:19:5664:21 | out : Map [<map.key>] : Object | Test.java:5664:9:5664:22 | getMapKey(...) | provenance | MaD:562 |
+| Test.java:5664:19:5664:21 | out : Map [<map.key>] : Object | Test.java:5664:9:5664:22 | getMapKey(...) | provenance | MaD:569 |
 | Test.java:5669:15:5669:54 | (...)... : ImmutableBiMap [<map.key>] : Object | Test.java:5670:29:5670:30 | in : ImmutableBiMap [<map.key>] : Object | provenance |  |
 | Test.java:5669:22:5669:54 | of(...) : ImmutableBiMap [<map.key>] : Object | Test.java:5669:15:5669:54 | (...)... : ImmutableBiMap [<map.key>] : Object | provenance |  |
 | Test.java:5669:40:5669:47 | source(...) : Object | Test.java:5669:22:5669:54 | of(...) : ImmutableBiMap [<map.key>] : Object | provenance | MaD:29 |
 | Test.java:5670:10:5670:48 | filterEntries(...) : BiMap [<map.key>] : Object | Test.java:5671:19:5671:21 | out : BiMap [<map.key>] : Object | provenance |  |
 | Test.java:5670:29:5670:30 | in : ImmutableBiMap [<map.key>] : Object | Test.java:5670:10:5670:48 | filterEntries(...) : BiMap [<map.key>] : Object | provenance | MaD:336 |
 | Test.java:5671:19:5671:21 | out : BiMap [<map.key>] : Object | Test.java:99:18:99:29 | map : BiMap [<map.key>] : Object | provenance |  |
-| Test.java:5671:19:5671:21 | out : BiMap [<map.key>] : Object | Test.java:5671:9:5671:22 | getMapKey(...) | provenance | MaD:562 |
+| Test.java:5671:19:5671:21 | out : BiMap [<map.key>] : Object | Test.java:5671:9:5671:22 | getMapKey(...) | provenance | MaD:569 |
 | Test.java:5676:19:5676:78 | (...)... : ImmutableSortedMap [<map.key>] : Comparable | Test.java:5677:26:5677:27 | in : ImmutableSortedMap [<map.key>] : Comparable | provenance |  |
 | Test.java:5676:30:5676:78 | of(...) : ImmutableSortedMap [<map.key>] : Comparable | Test.java:5676:19:5676:78 | (...)... : ImmutableSortedMap [<map.key>] : Comparable | provenance |  |
 | Test.java:5676:52:5676:71 | (...)... : Comparable | Test.java:5676:30:5676:78 | of(...) : ImmutableSortedMap [<map.key>] : Comparable | provenance | MaD:165 |
@@ -6265,7 +6265,7 @@ edges
 | Test.java:5677:10:5677:45 | filterKeys(...) : SortedMap [<map.key>] : Comparable | Test.java:5678:19:5678:21 | out : SortedMap [<map.key>] : Comparable | provenance |  |
 | Test.java:5677:26:5677:27 | in : ImmutableSortedMap [<map.key>] : Comparable | Test.java:5677:10:5677:45 | filterKeys(...) : SortedMap [<map.key>] : Comparable | provenance | MaD:337 |
 | Test.java:5678:19:5678:21 | out : SortedMap [<map.key>] : Comparable | Test.java:99:18:99:29 | map : SortedMap [<map.key>] : Comparable | provenance |  |
-| Test.java:5678:19:5678:21 | out : SortedMap [<map.key>] : Comparable | Test.java:5678:9:5678:22 | getMapKey(...) | provenance | MaD:562 |
+| Test.java:5678:19:5678:21 | out : SortedMap [<map.key>] : Comparable | Test.java:5678:9:5678:22 | getMapKey(...) | provenance | MaD:569 |
 | Test.java:5683:22:5683:84 | (...)... : ImmutableSortedMap [<map.key>] : Comparable | Test.java:5684:26:5684:27 | in : ImmutableSortedMap [<map.key>] : Comparable | provenance |  |
 | Test.java:5683:36:5683:84 | of(...) : ImmutableSortedMap [<map.key>] : Comparable | Test.java:5683:22:5683:84 | (...)... : ImmutableSortedMap [<map.key>] : Comparable | provenance |  |
 | Test.java:5683:58:5683:77 | (...)... : Comparable | Test.java:5683:36:5683:84 | of(...) : ImmutableSortedMap [<map.key>] : Comparable | provenance | MaD:165 |
@@ -6273,21 +6273,21 @@ edges
 | Test.java:5684:10:5684:45 | filterKeys(...) : NavigableMap [<map.key>] : Comparable | Test.java:5685:19:5685:21 | out : NavigableMap [<map.key>] : Comparable | provenance |  |
 | Test.java:5684:26:5684:27 | in : ImmutableSortedMap [<map.key>] : Comparable | Test.java:5684:10:5684:45 | filterKeys(...) : NavigableMap [<map.key>] : Comparable | provenance | MaD:337 |
 | Test.java:5685:19:5685:21 | out : NavigableMap [<map.key>] : Comparable | Test.java:99:18:99:29 | map : NavigableMap [<map.key>] : Comparable | provenance |  |
-| Test.java:5685:19:5685:21 | out : NavigableMap [<map.key>] : Comparable | Test.java:5685:9:5685:22 | getMapKey(...) | provenance | MaD:562 |
+| Test.java:5685:19:5685:21 | out : NavigableMap [<map.key>] : Comparable | Test.java:5685:9:5685:22 | getMapKey(...) | provenance | MaD:569 |
 | Test.java:5690:13:5690:39 | (...)... : Map [<map.key>] : Object | Test.java:5691:26:5691:27 | in : Map [<map.key>] : Object | provenance |  |
 | Test.java:5690:18:5690:39 | of(...) : Map [<map.key>] : Object | Test.java:5690:13:5690:39 | (...)... : Map [<map.key>] : Object | provenance |  |
-| Test.java:5690:25:5690:32 | source(...) : Object | Test.java:5690:18:5690:39 | of(...) : Map [<map.key>] : Object | provenance | MaD:563 |
+| Test.java:5690:25:5690:32 | source(...) : Object | Test.java:5690:18:5690:39 | of(...) : Map [<map.key>] : Object | provenance | MaD:564 |
 | Test.java:5691:10:5691:45 | filterKeys(...) : Map [<map.key>] : Object | Test.java:5692:19:5692:21 | out : Map [<map.key>] : Object | provenance |  |
 | Test.java:5691:26:5691:27 | in : Map [<map.key>] : Object | Test.java:5691:10:5691:45 | filterKeys(...) : Map [<map.key>] : Object | provenance | MaD:337 |
 | Test.java:5692:19:5692:21 | out : Map [<map.key>] : Object | Test.java:99:18:99:29 | map : Map [<map.key>] : Object | provenance |  |
-| Test.java:5692:19:5692:21 | out : Map [<map.key>] : Object | Test.java:5692:9:5692:22 | getMapKey(...) | provenance | MaD:562 |
+| Test.java:5692:19:5692:21 | out : Map [<map.key>] : Object | Test.java:5692:9:5692:22 | getMapKey(...) | provenance | MaD:569 |
 | Test.java:5697:15:5697:54 | (...)... : ImmutableBiMap [<map.key>] : Object | Test.java:5698:26:5698:27 | in : ImmutableBiMap [<map.key>] : Object | provenance |  |
 | Test.java:5697:22:5697:54 | of(...) : ImmutableBiMap [<map.key>] : Object | Test.java:5697:15:5697:54 | (...)... : ImmutableBiMap [<map.key>] : Object | provenance |  |
 | Test.java:5697:40:5697:47 | source(...) : Object | Test.java:5697:22:5697:54 | of(...) : ImmutableBiMap [<map.key>] : Object | provenance | MaD:29 |
 | Test.java:5698:10:5698:45 | filterKeys(...) : BiMap [<map.key>] : Object | Test.java:5699:19:5699:21 | out : BiMap [<map.key>] : Object | provenance |  |
 | Test.java:5698:26:5698:27 | in : ImmutableBiMap [<map.key>] : Object | Test.java:5698:10:5698:45 | filterKeys(...) : BiMap [<map.key>] : Object | provenance | MaD:337 |
 | Test.java:5699:19:5699:21 | out : BiMap [<map.key>] : Object | Test.java:99:18:99:29 | map : BiMap [<map.key>] : Object | provenance |  |
-| Test.java:5699:19:5699:21 | out : BiMap [<map.key>] : Object | Test.java:5699:9:5699:22 | getMapKey(...) | provenance | MaD:562 |
+| Test.java:5699:19:5699:21 | out : BiMap [<map.key>] : Object | Test.java:5699:9:5699:22 | getMapKey(...) | provenance | MaD:569 |
 | Test.java:5704:19:5704:78 | (...)... : ImmutableSortedMap [<map.key>] : Comparable | Test.java:5705:28:5705:29 | in : ImmutableSortedMap [<map.key>] : Comparable | provenance |  |
 | Test.java:5704:30:5704:78 | of(...) : ImmutableSortedMap [<map.key>] : Comparable | Test.java:5704:19:5704:78 | (...)... : ImmutableSortedMap [<map.key>] : Comparable | provenance |  |
 | Test.java:5704:52:5704:71 | (...)... : Comparable | Test.java:5704:30:5704:78 | of(...) : ImmutableSortedMap [<map.key>] : Comparable | provenance | MaD:165 |
@@ -6295,7 +6295,7 @@ edges
 | Test.java:5705:10:5705:47 | filterValues(...) : SortedMap [<map.key>] : Comparable | Test.java:5706:19:5706:21 | out : SortedMap [<map.key>] : Comparable | provenance |  |
 | Test.java:5705:28:5705:29 | in : ImmutableSortedMap [<map.key>] : Comparable | Test.java:5705:10:5705:47 | filterValues(...) : SortedMap [<map.key>] : Comparable | provenance | MaD:338 |
 | Test.java:5706:19:5706:21 | out : SortedMap [<map.key>] : Comparable | Test.java:99:18:99:29 | map : SortedMap [<map.key>] : Comparable | provenance |  |
-| Test.java:5706:19:5706:21 | out : SortedMap [<map.key>] : Comparable | Test.java:5706:9:5706:22 | getMapKey(...) | provenance | MaD:562 |
+| Test.java:5706:19:5706:21 | out : SortedMap [<map.key>] : Comparable | Test.java:5706:9:5706:22 | getMapKey(...) | provenance | MaD:569 |
 | Test.java:5711:22:5711:84 | (...)... : ImmutableSortedMap [<map.key>] : Comparable | Test.java:5712:28:5712:29 | in : ImmutableSortedMap [<map.key>] : Comparable | provenance |  |
 | Test.java:5711:36:5711:84 | of(...) : ImmutableSortedMap [<map.key>] : Comparable | Test.java:5711:22:5711:84 | (...)... : ImmutableSortedMap [<map.key>] : Comparable | provenance |  |
 | Test.java:5711:58:5711:77 | (...)... : Comparable | Test.java:5711:36:5711:84 | of(...) : ImmutableSortedMap [<map.key>] : Comparable | provenance | MaD:165 |
@@ -6303,87 +6303,87 @@ edges
 | Test.java:5712:10:5712:47 | filterValues(...) : NavigableMap [<map.key>] : Comparable | Test.java:5713:19:5713:21 | out : NavigableMap [<map.key>] : Comparable | provenance |  |
 | Test.java:5712:28:5712:29 | in : ImmutableSortedMap [<map.key>] : Comparable | Test.java:5712:10:5712:47 | filterValues(...) : NavigableMap [<map.key>] : Comparable | provenance | MaD:338 |
 | Test.java:5713:19:5713:21 | out : NavigableMap [<map.key>] : Comparable | Test.java:99:18:99:29 | map : NavigableMap [<map.key>] : Comparable | provenance |  |
-| Test.java:5713:19:5713:21 | out : NavigableMap [<map.key>] : Comparable | Test.java:5713:9:5713:22 | getMapKey(...) | provenance | MaD:562 |
+| Test.java:5713:19:5713:21 | out : NavigableMap [<map.key>] : Comparable | Test.java:5713:9:5713:22 | getMapKey(...) | provenance | MaD:569 |
 | Test.java:5718:13:5718:39 | (...)... : Map [<map.key>] : Object | Test.java:5719:28:5719:29 | in : Map [<map.key>] : Object | provenance |  |
 | Test.java:5718:18:5718:39 | of(...) : Map [<map.key>] : Object | Test.java:5718:13:5718:39 | (...)... : Map [<map.key>] : Object | provenance |  |
-| Test.java:5718:25:5718:32 | source(...) : Object | Test.java:5718:18:5718:39 | of(...) : Map [<map.key>] : Object | provenance | MaD:563 |
+| Test.java:5718:25:5718:32 | source(...) : Object | Test.java:5718:18:5718:39 | of(...) : Map [<map.key>] : Object | provenance | MaD:564 |
 | Test.java:5719:10:5719:47 | filterValues(...) : Map [<map.key>] : Object | Test.java:5720:19:5720:21 | out : Map [<map.key>] : Object | provenance |  |
 | Test.java:5719:28:5719:29 | in : Map [<map.key>] : Object | Test.java:5719:10:5719:47 | filterValues(...) : Map [<map.key>] : Object | provenance | MaD:338 |
 | Test.java:5720:19:5720:21 | out : Map [<map.key>] : Object | Test.java:99:18:99:29 | map : Map [<map.key>] : Object | provenance |  |
-| Test.java:5720:19:5720:21 | out : Map [<map.key>] : Object | Test.java:5720:9:5720:22 | getMapKey(...) | provenance | MaD:562 |
+| Test.java:5720:19:5720:21 | out : Map [<map.key>] : Object | Test.java:5720:9:5720:22 | getMapKey(...) | provenance | MaD:569 |
 | Test.java:5725:15:5725:54 | (...)... : ImmutableBiMap [<map.key>] : Object | Test.java:5726:28:5726:29 | in : ImmutableBiMap [<map.key>] : Object | provenance |  |
 | Test.java:5725:22:5725:54 | of(...) : ImmutableBiMap [<map.key>] : Object | Test.java:5725:15:5725:54 | (...)... : ImmutableBiMap [<map.key>] : Object | provenance |  |
 | Test.java:5725:40:5725:47 | source(...) : Object | Test.java:5725:22:5725:54 | of(...) : ImmutableBiMap [<map.key>] : Object | provenance | MaD:29 |
 | Test.java:5726:10:5726:47 | filterValues(...) : BiMap [<map.key>] : Object | Test.java:5727:19:5727:21 | out : BiMap [<map.key>] : Object | provenance |  |
 | Test.java:5726:28:5726:29 | in : ImmutableBiMap [<map.key>] : Object | Test.java:5726:10:5726:47 | filterValues(...) : BiMap [<map.key>] : Object | provenance | MaD:338 |
 | Test.java:5727:19:5727:21 | out : BiMap [<map.key>] : Object | Test.java:99:18:99:29 | map : BiMap [<map.key>] : Object | provenance |  |
-| Test.java:5727:19:5727:21 | out : BiMap [<map.key>] : Object | Test.java:5727:9:5727:22 | getMapKey(...) | provenance | MaD:562 |
+| Test.java:5727:19:5727:21 | out : BiMap [<map.key>] : Object | Test.java:5727:9:5727:22 | getMapKey(...) | provenance | MaD:569 |
 | Test.java:5732:20:5732:61 | (...)... : Properties [<map.key>] : Object | Test.java:5733:30:5733:31 | in : Properties [<map.key>] : Object | provenance |  |
 | Test.java:5732:32:5732:61 | newWithMapKeyDefault(...) : Object [<map.key>] : Object | Test.java:5732:20:5732:61 | (...)... : Properties [<map.key>] : Object | provenance |  |
-| Test.java:5732:53:5732:60 | source(...) : Object | Test.java:5732:32:5732:61 | newWithMapKeyDefault(...) : Object [<map.key>] : Object | provenance | MaD:569 |
+| Test.java:5732:53:5732:60 | source(...) : Object | Test.java:5732:32:5732:61 | newWithMapKeyDefault(...) : Object [<map.key>] : Object | provenance | MaD:556 |
 | Test.java:5733:10:5733:32 | fromProperties(...) : ImmutableMap [<map.key>] : Object | Test.java:5734:19:5734:21 | out : ImmutableMap [<map.key>] : Object | provenance |  |
 | Test.java:5733:30:5733:31 | in : Properties [<map.key>] : Object | Test.java:5733:10:5733:32 | fromProperties(...) : ImmutableMap [<map.key>] : Object | provenance | MaD:339 |
 | Test.java:5734:19:5734:21 | out : ImmutableMap [<map.key>] : Object | Test.java:99:18:99:29 | map : ImmutableMap [<map.key>] : Object | provenance |  |
-| Test.java:5734:19:5734:21 | out : ImmutableMap [<map.key>] : Object | Test.java:5734:9:5734:22 | getMapKey(...) | provenance | MaD:562 |
+| Test.java:5734:19:5734:21 | out : ImmutableMap [<map.key>] : Object | Test.java:5734:9:5734:22 | getMapKey(...) | provenance | MaD:569 |
 | Test.java:5739:20:5739:63 | (...)... : Properties [<map.value>] : Object | Test.java:5740:30:5740:31 | in : Properties [<map.value>] : Object | provenance |  |
 | Test.java:5739:32:5739:63 | newWithMapValueDefault(...) : Object [<map.value>] : Object | Test.java:5739:20:5739:63 | (...)... : Properties [<map.value>] : Object | provenance |  |
-| Test.java:5739:55:5739:62 | source(...) : Object | Test.java:5739:32:5739:63 | newWithMapValueDefault(...) : Object [<map.value>] : Object | provenance | MaD:570 |
+| Test.java:5739:55:5739:62 | source(...) : Object | Test.java:5739:32:5739:63 | newWithMapValueDefault(...) : Object [<map.value>] : Object | provenance | MaD:557 |
 | Test.java:5740:10:5740:32 | fromProperties(...) : ImmutableMap [<map.value>] : Object | Test.java:5741:21:5741:23 | out : ImmutableMap [<map.value>] : Object | provenance |  |
 | Test.java:5740:30:5740:31 | in : Properties [<map.value>] : Object | Test.java:5740:10:5740:32 | fromProperties(...) : ImmutableMap [<map.value>] : Object | provenance | MaD:340 |
 | Test.java:5741:21:5741:23 | out : ImmutableMap [<map.value>] : Object | Test.java:118:20:118:31 | map : ImmutableMap [<map.value>] : Object | provenance |  |
-| Test.java:5741:21:5741:23 | out : ImmutableMap [<map.value>] : Object | Test.java:5741:9:5741:24 | getMapValue(...) | provenance | MaD:561 |
+| Test.java:5741:21:5741:23 | out : ImmutableMap [<map.value>] : Object | Test.java:5741:9:5741:24 | getMapValue(...) | provenance | MaD:568 |
 | Test.java:5746:16:5746:31 | (...)... : Object | Test.java:5747:30:5747:31 | in : Object | provenance |  |
 | Test.java:5746:24:5746:31 | source(...) : Object | Test.java:5746:16:5746:31 | (...)... : Object | provenance |  |
 | Test.java:5747:10:5747:38 | immutableEntry(...) : Entry [<map.key>] : Object | Test.java:5748:9:5748:11 | out : Entry [<map.key>] : Object | provenance |  |
 | Test.java:5747:30:5747:31 | in : Object | Test.java:5747:10:5747:38 | immutableEntry(...) : Entry [<map.key>] : Object | provenance | MaD:341 |
-| Test.java:5748:9:5748:11 | out : Entry [<map.key>] : Object | Test.java:5748:9:5748:20 | getKey(...) | provenance | MaD:565 |
+| Test.java:5748:9:5748:11 | out : Entry [<map.key>] : Object | Test.java:5748:9:5748:20 | getKey(...) | provenance | MaD:562 |
 | Test.java:5753:16:5753:31 | (...)... : Object | Test.java:5754:36:5754:37 | in : Object | provenance |  |
 | Test.java:5753:24:5753:31 | source(...) : Object | Test.java:5753:16:5753:31 | (...)... : Object | provenance |  |
 | Test.java:5754:10:5754:38 | immutableEntry(...) : Entry [<map.value>] : Object | Test.java:5755:9:5755:11 | out : Entry [<map.value>] : Object | provenance |  |
 | Test.java:5754:36:5754:37 | in : Object | Test.java:5754:10:5754:38 | immutableEntry(...) : Entry [<map.value>] : Object | provenance | MaD:342 |
-| Test.java:5755:9:5755:11 | out : Entry [<map.value>] : Object | Test.java:5755:9:5755:22 | getValue(...) | provenance | MaD:566 |
+| Test.java:5755:9:5755:11 | out : Entry [<map.value>] : Object | Test.java:5755:9:5755:22 | getValue(...) | provenance | MaD:563 |
 | Test.java:5760:13:5760:39 | (...)... : Map [<map.value>] : Object | Test.java:5761:32:5761:33 | in : Map [<map.value>] : Object | provenance |  |
 | Test.java:5760:18:5760:39 | of(...) : Map [<map.value>] : Object | Test.java:5760:13:5760:39 | (...)... : Map [<map.value>] : Object | provenance |  |
-| Test.java:5760:31:5760:38 | source(...) : Object | Test.java:5760:18:5760:39 | of(...) : Map [<map.value>] : Object | provenance | MaD:564 |
+| Test.java:5760:31:5760:38 | source(...) : Object | Test.java:5760:18:5760:39 | of(...) : Map [<map.value>] : Object | provenance | MaD:565 |
 | Test.java:5761:10:5761:34 | immutableEnumMap(...) : ImmutableMap [<map.value>] : Object | Test.java:5762:21:5762:23 | out : ImmutableMap [<map.value>] : Object | provenance |  |
 | Test.java:5761:32:5761:33 | in : Map [<map.value>] : Object | Test.java:5761:10:5761:34 | immutableEnumMap(...) : ImmutableMap [<map.value>] : Object | provenance | MaD:343 |
 | Test.java:5762:21:5762:23 | out : ImmutableMap [<map.value>] : Object | Test.java:118:20:118:31 | map : ImmutableMap [<map.value>] : Object | provenance |  |
-| Test.java:5762:21:5762:23 | out : ImmutableMap [<map.value>] : Object | Test.java:5762:9:5762:24 | getMapValue(...) | provenance | MaD:561 |
+| Test.java:5762:21:5762:23 | out : ImmutableMap [<map.value>] : Object | Test.java:5762:9:5762:24 | getMapValue(...) | provenance | MaD:568 |
 | Test.java:5767:13:5767:39 | (...)... : Map [<map.value>] : Object | Test.java:5768:26:5768:27 | in : Map [<map.value>] : Object | provenance |  |
 | Test.java:5767:18:5767:39 | of(...) : Map [<map.value>] : Object | Test.java:5767:13:5767:39 | (...)... : Map [<map.value>] : Object | provenance |  |
-| Test.java:5767:31:5767:38 | source(...) : Object | Test.java:5767:18:5767:39 | of(...) : Map [<map.value>] : Object | provenance | MaD:564 |
+| Test.java:5767:31:5767:38 | source(...) : Object | Test.java:5767:18:5767:39 | of(...) : Map [<map.value>] : Object | provenance | MaD:565 |
 | Test.java:5768:10:5768:28 | newEnumMap(...) : EnumMap [<map.value>] : Object | Test.java:5769:21:5769:23 | out : EnumMap [<map.value>] : Object | provenance |  |
 | Test.java:5768:26:5768:27 | in : Map [<map.value>] : Object | Test.java:5768:10:5768:28 | newEnumMap(...) : EnumMap [<map.value>] : Object | provenance | MaD:344 |
 | Test.java:5769:21:5769:23 | out : EnumMap [<map.value>] : Object | Test.java:118:20:118:31 | map : EnumMap [<map.value>] : Object | provenance |  |
-| Test.java:5769:21:5769:23 | out : EnumMap [<map.value>] : Object | Test.java:5769:9:5769:24 | getMapValue(...) | provenance | MaD:561 |
+| Test.java:5769:21:5769:23 | out : EnumMap [<map.value>] : Object | Test.java:5769:9:5769:24 | getMapValue(...) | provenance | MaD:568 |
 | Test.java:5774:13:5774:39 | (...)... : Map [<map.key>] : Object | Test.java:5775:26:5775:27 | in : Map [<map.key>] : Object | provenance |  |
 | Test.java:5774:18:5774:39 | of(...) : Map [<map.key>] : Object | Test.java:5774:13:5774:39 | (...)... : Map [<map.key>] : Object | provenance |  |
-| Test.java:5774:25:5774:32 | source(...) : Object | Test.java:5774:18:5774:39 | of(...) : Map [<map.key>] : Object | provenance | MaD:563 |
+| Test.java:5774:25:5774:32 | source(...) : Object | Test.java:5774:18:5774:39 | of(...) : Map [<map.key>] : Object | provenance | MaD:564 |
 | Test.java:5775:10:5775:28 | newHashMap(...) : HashMap [<map.key>] : Object | Test.java:5776:19:5776:21 | out : HashMap [<map.key>] : Object | provenance |  |
 | Test.java:5775:26:5775:27 | in : Map [<map.key>] : Object | Test.java:5775:10:5775:28 | newHashMap(...) : HashMap [<map.key>] : Object | provenance | MaD:345 |
 | Test.java:5776:19:5776:21 | out : HashMap [<map.key>] : Object | Test.java:99:18:99:29 | map : HashMap [<map.key>] : Object | provenance |  |
-| Test.java:5776:19:5776:21 | out : HashMap [<map.key>] : Object | Test.java:5776:9:5776:22 | getMapKey(...) | provenance | MaD:562 |
+| Test.java:5776:19:5776:21 | out : HashMap [<map.key>] : Object | Test.java:5776:9:5776:22 | getMapKey(...) | provenance | MaD:569 |
 | Test.java:5781:13:5781:39 | (...)... : Map [<map.value>] : Object | Test.java:5782:26:5782:27 | in : Map [<map.value>] : Object | provenance |  |
 | Test.java:5781:18:5781:39 | of(...) : Map [<map.value>] : Object | Test.java:5781:13:5781:39 | (...)... : Map [<map.value>] : Object | provenance |  |
-| Test.java:5781:31:5781:38 | source(...) : Object | Test.java:5781:18:5781:39 | of(...) : Map [<map.value>] : Object | provenance | MaD:564 |
+| Test.java:5781:31:5781:38 | source(...) : Object | Test.java:5781:18:5781:39 | of(...) : Map [<map.value>] : Object | provenance | MaD:565 |
 | Test.java:5782:10:5782:28 | newHashMap(...) : HashMap [<map.value>] : Object | Test.java:5783:21:5783:23 | out : HashMap [<map.value>] : Object | provenance |  |
 | Test.java:5782:26:5782:27 | in : Map [<map.value>] : Object | Test.java:5782:10:5782:28 | newHashMap(...) : HashMap [<map.value>] : Object | provenance | MaD:346 |
 | Test.java:5783:21:5783:23 | out : HashMap [<map.value>] : Object | Test.java:118:20:118:31 | map : HashMap [<map.value>] : Object | provenance |  |
-| Test.java:5783:21:5783:23 | out : HashMap [<map.value>] : Object | Test.java:5783:9:5783:24 | getMapValue(...) | provenance | MaD:561 |
+| Test.java:5783:21:5783:23 | out : HashMap [<map.value>] : Object | Test.java:5783:9:5783:24 | getMapValue(...) | provenance | MaD:568 |
 | Test.java:5788:13:5788:39 | (...)... : Map [<map.key>] : Object | Test.java:5789:32:5789:33 | in : Map [<map.key>] : Object | provenance |  |
 | Test.java:5788:18:5788:39 | of(...) : Map [<map.key>] : Object | Test.java:5788:13:5788:39 | (...)... : Map [<map.key>] : Object | provenance |  |
-| Test.java:5788:25:5788:32 | source(...) : Object | Test.java:5788:18:5788:39 | of(...) : Map [<map.key>] : Object | provenance | MaD:563 |
+| Test.java:5788:25:5788:32 | source(...) : Object | Test.java:5788:18:5788:39 | of(...) : Map [<map.key>] : Object | provenance | MaD:564 |
 | Test.java:5789:10:5789:34 | newLinkedHashMap(...) : LinkedHashMap [<map.key>] : Object | Test.java:5790:19:5790:21 | out : LinkedHashMap [<map.key>] : Object | provenance |  |
 | Test.java:5789:32:5789:33 | in : Map [<map.key>] : Object | Test.java:5789:10:5789:34 | newLinkedHashMap(...) : LinkedHashMap [<map.key>] : Object | provenance | MaD:347 |
 | Test.java:5790:19:5790:21 | out : LinkedHashMap [<map.key>] : Object | Test.java:99:18:99:29 | map : LinkedHashMap [<map.key>] : Object | provenance |  |
-| Test.java:5790:19:5790:21 | out : LinkedHashMap [<map.key>] : Object | Test.java:5790:9:5790:22 | getMapKey(...) | provenance | MaD:562 |
+| Test.java:5790:19:5790:21 | out : LinkedHashMap [<map.key>] : Object | Test.java:5790:9:5790:22 | getMapKey(...) | provenance | MaD:569 |
 | Test.java:5795:13:5795:39 | (...)... : Map [<map.value>] : Object | Test.java:5796:32:5796:33 | in : Map [<map.value>] : Object | provenance |  |
 | Test.java:5795:18:5795:39 | of(...) : Map [<map.value>] : Object | Test.java:5795:13:5795:39 | (...)... : Map [<map.value>] : Object | provenance |  |
-| Test.java:5795:31:5795:38 | source(...) : Object | Test.java:5795:18:5795:39 | of(...) : Map [<map.value>] : Object | provenance | MaD:564 |
+| Test.java:5795:31:5795:38 | source(...) : Object | Test.java:5795:18:5795:39 | of(...) : Map [<map.value>] : Object | provenance | MaD:565 |
 | Test.java:5796:10:5796:34 | newLinkedHashMap(...) : LinkedHashMap [<map.value>] : Object | Test.java:5797:21:5797:23 | out : LinkedHashMap [<map.value>] : Object | provenance |  |
 | Test.java:5796:32:5796:33 | in : Map [<map.value>] : Object | Test.java:5796:10:5796:34 | newLinkedHashMap(...) : LinkedHashMap [<map.value>] : Object | provenance | MaD:348 |
 | Test.java:5797:21:5797:23 | out : LinkedHashMap [<map.value>] : Object | Test.java:118:20:118:31 | map : LinkedHashMap [<map.value>] : Object | provenance |  |
-| Test.java:5797:21:5797:23 | out : LinkedHashMap [<map.value>] : Object | Test.java:5797:9:5797:24 | getMapValue(...) | provenance | MaD:561 |
+| Test.java:5797:21:5797:23 | out : LinkedHashMap [<map.value>] : Object | Test.java:5797:9:5797:24 | getMapValue(...) | provenance | MaD:568 |
 | Test.java:5802:19:5802:78 | (...)... : ImmutableSortedMap [<map.key>] : Comparable | Test.java:5803:26:5803:27 | in : ImmutableSortedMap [<map.key>] : Comparable | provenance |  |
 | Test.java:5802:30:5802:78 | of(...) : ImmutableSortedMap [<map.key>] : Comparable | Test.java:5802:19:5802:78 | (...)... : ImmutableSortedMap [<map.key>] : Comparable | provenance |  |
 | Test.java:5802:52:5802:71 | (...)... : Comparable | Test.java:5802:30:5802:78 | of(...) : ImmutableSortedMap [<map.key>] : Comparable | provenance | MaD:165 |
@@ -6391,14 +6391,14 @@ edges
 | Test.java:5803:10:5803:28 | newTreeMap(...) : TreeMap [<map.key>] : Comparable | Test.java:5804:19:5804:21 | out : TreeMap [<map.key>] : Comparable | provenance |  |
 | Test.java:5803:26:5803:27 | in : ImmutableSortedMap [<map.key>] : Comparable | Test.java:5803:10:5803:28 | newTreeMap(...) : TreeMap [<map.key>] : Comparable | provenance | MaD:349 |
 | Test.java:5804:19:5804:21 | out : TreeMap [<map.key>] : Comparable | Test.java:99:18:99:29 | map : TreeMap [<map.key>] : Comparable | provenance |  |
-| Test.java:5804:19:5804:21 | out : TreeMap [<map.key>] : Comparable | Test.java:5804:9:5804:22 | getMapKey(...) | provenance | MaD:562 |
+| Test.java:5804:19:5804:21 | out : TreeMap [<map.key>] : Comparable | Test.java:5804:9:5804:22 | getMapKey(...) | provenance | MaD:569 |
 | Test.java:5809:19:5809:78 | (...)... : ImmutableSortedMap [<map.value>] : Object | Test.java:5810:26:5810:27 | in : ImmutableSortedMap [<map.value>] : Object | provenance |  |
 | Test.java:5809:30:5809:78 | of(...) : ImmutableSortedMap [<map.value>] : Object | Test.java:5809:19:5809:78 | (...)... : ImmutableSortedMap [<map.value>] : Object | provenance |  |
 | Test.java:5809:70:5809:77 | source(...) : Object | Test.java:5809:30:5809:78 | of(...) : ImmutableSortedMap [<map.value>] : Object | provenance | MaD:166 |
 | Test.java:5810:10:5810:28 | newTreeMap(...) : TreeMap [<map.value>] : Object | Test.java:5811:21:5811:23 | out : TreeMap [<map.value>] : Object | provenance |  |
 | Test.java:5810:26:5810:27 | in : ImmutableSortedMap [<map.value>] : Object | Test.java:5810:10:5810:28 | newTreeMap(...) : TreeMap [<map.value>] : Object | provenance | MaD:350 |
 | Test.java:5811:21:5811:23 | out : TreeMap [<map.value>] : Object | Test.java:118:20:118:31 | map : TreeMap [<map.value>] : Object | provenance |  |
-| Test.java:5811:21:5811:23 | out : TreeMap [<map.value>] : Object | Test.java:5811:9:5811:24 | getMapValue(...) | provenance | MaD:561 |
+| Test.java:5811:21:5811:23 | out : TreeMap [<map.value>] : Object | Test.java:5811:9:5811:24 | getMapValue(...) | provenance | MaD:568 |
 | Test.java:5816:22:5816:84 | (...)... : ImmutableSortedMap [<map.key>] : Comparable | Test.java:5817:22:5817:23 | in : ImmutableSortedMap [<map.key>] : Comparable | provenance |  |
 | Test.java:5816:36:5816:84 | of(...) : ImmutableSortedMap [<map.key>] : Comparable | Test.java:5816:22:5816:84 | (...)... : ImmutableSortedMap [<map.key>] : Comparable | provenance |  |
 | Test.java:5816:58:5816:77 | (...)... : Comparable | Test.java:5816:36:5816:84 | of(...) : ImmutableSortedMap [<map.key>] : Comparable | provenance | MaD:165 |
@@ -6406,28 +6406,28 @@ edges
 | Test.java:5817:10:5817:30 | subMap(...) : NavigableMap [<map.key>] : Comparable | Test.java:5818:19:5818:21 | out : NavigableMap [<map.key>] : Comparable | provenance |  |
 | Test.java:5817:22:5817:23 | in : ImmutableSortedMap [<map.key>] : Comparable | Test.java:5817:10:5817:30 | subMap(...) : NavigableMap [<map.key>] : Comparable | provenance | MaD:351 |
 | Test.java:5818:19:5818:21 | out : NavigableMap [<map.key>] : Comparable | Test.java:99:18:99:29 | map : NavigableMap [<map.key>] : Comparable | provenance |  |
-| Test.java:5818:19:5818:21 | out : NavigableMap [<map.key>] : Comparable | Test.java:5818:9:5818:22 | getMapKey(...) | provenance | MaD:562 |
+| Test.java:5818:19:5818:21 | out : NavigableMap [<map.key>] : Comparable | Test.java:5818:9:5818:22 | getMapKey(...) | provenance | MaD:569 |
 | Test.java:5823:22:5823:84 | (...)... : ImmutableSortedMap [<map.value>] : Object | Test.java:5824:22:5824:23 | in : ImmutableSortedMap [<map.value>] : Object | provenance |  |
 | Test.java:5823:36:5823:84 | of(...) : ImmutableSortedMap [<map.value>] : Object | Test.java:5823:22:5823:84 | (...)... : ImmutableSortedMap [<map.value>] : Object | provenance |  |
 | Test.java:5823:76:5823:83 | source(...) : Object | Test.java:5823:36:5823:84 | of(...) : ImmutableSortedMap [<map.value>] : Object | provenance | MaD:166 |
 | Test.java:5824:10:5824:30 | subMap(...) : NavigableMap [<map.value>] : Object | Test.java:5825:21:5825:23 | out : NavigableMap [<map.value>] : Object | provenance |  |
 | Test.java:5824:22:5824:23 | in : ImmutableSortedMap [<map.value>] : Object | Test.java:5824:10:5824:30 | subMap(...) : NavigableMap [<map.value>] : Object | provenance | MaD:352 |
 | Test.java:5825:21:5825:23 | out : NavigableMap [<map.value>] : Object | Test.java:118:20:118:31 | map : NavigableMap [<map.value>] : Object | provenance |  |
-| Test.java:5825:21:5825:23 | out : NavigableMap [<map.value>] : Object | Test.java:5825:9:5825:24 | getMapValue(...) | provenance | MaD:561 |
+| Test.java:5825:21:5825:23 | out : NavigableMap [<map.value>] : Object | Test.java:5825:9:5825:24 | getMapValue(...) | provenance | MaD:568 |
 | Test.java:5830:15:5830:54 | (...)... : ImmutableBiMap [<map.key>] : Object | Test.java:5831:33:5831:34 | in : ImmutableBiMap [<map.key>] : Object | provenance |  |
 | Test.java:5830:22:5830:54 | of(...) : ImmutableBiMap [<map.key>] : Object | Test.java:5830:15:5830:54 | (...)... : ImmutableBiMap [<map.key>] : Object | provenance |  |
 | Test.java:5830:40:5830:47 | source(...) : Object | Test.java:5830:22:5830:54 | of(...) : ImmutableBiMap [<map.key>] : Object | provenance | MaD:29 |
 | Test.java:5831:10:5831:35 | synchronizedBiMap(...) : BiMap [<map.key>] : Object | Test.java:5832:19:5832:21 | out : BiMap [<map.key>] : Object | provenance |  |
 | Test.java:5831:33:5831:34 | in : ImmutableBiMap [<map.key>] : Object | Test.java:5831:10:5831:35 | synchronizedBiMap(...) : BiMap [<map.key>] : Object | provenance | MaD:353 |
 | Test.java:5832:19:5832:21 | out : BiMap [<map.key>] : Object | Test.java:99:18:99:29 | map : BiMap [<map.key>] : Object | provenance |  |
-| Test.java:5832:19:5832:21 | out : BiMap [<map.key>] : Object | Test.java:5832:9:5832:22 | getMapKey(...) | provenance | MaD:562 |
+| Test.java:5832:19:5832:21 | out : BiMap [<map.key>] : Object | Test.java:5832:9:5832:22 | getMapKey(...) | provenance | MaD:569 |
 | Test.java:5837:15:5837:54 | (...)... : ImmutableBiMap [<map.value>] : Object | Test.java:5838:33:5838:34 | in : ImmutableBiMap [<map.value>] : Object | provenance |  |
 | Test.java:5837:22:5837:54 | of(...) : ImmutableBiMap [<map.value>] : Object | Test.java:5837:15:5837:54 | (...)... : ImmutableBiMap [<map.value>] : Object | provenance |  |
 | Test.java:5837:46:5837:53 | source(...) : Object | Test.java:5837:22:5837:54 | of(...) : ImmutableBiMap [<map.value>] : Object | provenance | MaD:30 |
 | Test.java:5838:10:5838:35 | synchronizedBiMap(...) : BiMap [<map.value>] : Object | Test.java:5839:21:5839:23 | out : BiMap [<map.value>] : Object | provenance |  |
 | Test.java:5838:33:5838:34 | in : ImmutableBiMap [<map.value>] : Object | Test.java:5838:10:5838:35 | synchronizedBiMap(...) : BiMap [<map.value>] : Object | provenance | MaD:354 |
 | Test.java:5839:21:5839:23 | out : BiMap [<map.value>] : Object | Test.java:118:20:118:31 | map : BiMap [<map.value>] : Object | provenance |  |
-| Test.java:5839:21:5839:23 | out : BiMap [<map.value>] : Object | Test.java:5839:9:5839:24 | getMapValue(...) | provenance | MaD:561 |
+| Test.java:5839:21:5839:23 | out : BiMap [<map.value>] : Object | Test.java:5839:9:5839:24 | getMapValue(...) | provenance | MaD:568 |
 | Test.java:5844:22:5844:84 | (...)... : ImmutableSortedMap [<map.key>] : Comparable | Test.java:5845:40:5845:41 | in : ImmutableSortedMap [<map.key>] : Comparable | provenance |  |
 | Test.java:5844:36:5844:84 | of(...) : ImmutableSortedMap [<map.key>] : Comparable | Test.java:5844:22:5844:84 | (...)... : ImmutableSortedMap [<map.key>] : Comparable | provenance |  |
 | Test.java:5844:58:5844:77 | (...)... : Comparable | Test.java:5844:36:5844:84 | of(...) : ImmutableSortedMap [<map.key>] : Comparable | provenance | MaD:165 |
@@ -6435,36 +6435,36 @@ edges
 | Test.java:5845:10:5845:42 | synchronizedNavigableMap(...) : NavigableMap [<map.key>] : Comparable | Test.java:5846:19:5846:21 | out : NavigableMap [<map.key>] : Comparable | provenance |  |
 | Test.java:5845:40:5845:41 | in : ImmutableSortedMap [<map.key>] : Comparable | Test.java:5845:10:5845:42 | synchronizedNavigableMap(...) : NavigableMap [<map.key>] : Comparable | provenance | MaD:355 |
 | Test.java:5846:19:5846:21 | out : NavigableMap [<map.key>] : Comparable | Test.java:99:18:99:29 | map : NavigableMap [<map.key>] : Comparable | provenance |  |
-| Test.java:5846:19:5846:21 | out : NavigableMap [<map.key>] : Comparable | Test.java:5846:9:5846:22 | getMapKey(...) | provenance | MaD:562 |
+| Test.java:5846:19:5846:21 | out : NavigableMap [<map.key>] : Comparable | Test.java:5846:9:5846:22 | getMapKey(...) | provenance | MaD:569 |
 | Test.java:5851:22:5851:84 | (...)... : ImmutableSortedMap [<map.value>] : Object | Test.java:5852:40:5852:41 | in : ImmutableSortedMap [<map.value>] : Object | provenance |  |
 | Test.java:5851:36:5851:84 | of(...) : ImmutableSortedMap [<map.value>] : Object | Test.java:5851:22:5851:84 | (...)... : ImmutableSortedMap [<map.value>] : Object | provenance |  |
 | Test.java:5851:76:5851:83 | source(...) : Object | Test.java:5851:36:5851:84 | of(...) : ImmutableSortedMap [<map.value>] : Object | provenance | MaD:166 |
 | Test.java:5852:10:5852:42 | synchronizedNavigableMap(...) : NavigableMap [<map.value>] : Object | Test.java:5853:21:5853:23 | out : NavigableMap [<map.value>] : Object | provenance |  |
 | Test.java:5852:40:5852:41 | in : ImmutableSortedMap [<map.value>] : Object | Test.java:5852:10:5852:42 | synchronizedNavigableMap(...) : NavigableMap [<map.value>] : Object | provenance | MaD:356 |
 | Test.java:5853:21:5853:23 | out : NavigableMap [<map.value>] : Object | Test.java:118:20:118:31 | map : NavigableMap [<map.value>] : Object | provenance |  |
-| Test.java:5853:21:5853:23 | out : NavigableMap [<map.value>] : Object | Test.java:5853:9:5853:24 | getMapValue(...) | provenance | MaD:561 |
+| Test.java:5853:21:5853:23 | out : NavigableMap [<map.value>] : Object | Test.java:5853:9:5853:24 | getMapValue(...) | provenance | MaD:568 |
 | Test.java:5858:18:5858:44 | (...)... : List [<element>] : Object | Test.java:5859:21:5859:22 | in : List [<element>] : Object | provenance |  |
 | Test.java:5858:28:5858:44 | of(...) : List [<element>] : Object | Test.java:5858:18:5858:44 | (...)... : List [<element>] : Object | provenance |  |
-| Test.java:5858:36:5858:43 | source(...) : Object | Test.java:5858:28:5858:44 | of(...) : List [<element>] : Object | provenance | MaD:558 |
+| Test.java:5858:36:5858:43 | source(...) : Object | Test.java:5858:28:5858:44 | of(...) : List [<element>] : Object | provenance | MaD:561 |
 | Test.java:5859:10:5859:39 | toMap(...) : ImmutableMap [<map.key>] : Object | Test.java:5860:19:5860:21 | out : ImmutableMap [<map.key>] : Object | provenance |  |
 | Test.java:5859:21:5859:22 | in : List [<element>] : Object | Test.java:5859:10:5859:39 | toMap(...) : ImmutableMap [<map.key>] : Object | provenance | MaD:357 |
 | Test.java:5860:19:5860:21 | out : ImmutableMap [<map.key>] : Object | Test.java:99:18:99:29 | map : ImmutableMap [<map.key>] : Object | provenance |  |
-| Test.java:5860:19:5860:21 | out : ImmutableMap [<map.key>] : Object | Test.java:5860:9:5860:22 | getMapKey(...) | provenance | MaD:562 |
+| Test.java:5860:19:5860:21 | out : ImmutableMap [<map.key>] : Object | Test.java:5860:9:5860:22 | getMapKey(...) | provenance | MaD:569 |
 | Test.java:5865:18:5865:55 | (...)... : Iterator [<element>] : Object | Test.java:5866:21:5866:22 | in : Iterator [<element>] : Object | provenance |  |
-| Test.java:5865:28:5865:44 | of(...) : List [<element>] : Object | Test.java:5865:28:5865:55 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:555 |
+| Test.java:5865:28:5865:44 | of(...) : List [<element>] : Object | Test.java:5865:28:5865:55 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:558 |
 | Test.java:5865:28:5865:55 | iterator(...) : Iterator [<element>] : Object | Test.java:5865:18:5865:55 | (...)... : Iterator [<element>] : Object | provenance |  |
-| Test.java:5865:36:5865:43 | source(...) : Object | Test.java:5865:28:5865:44 | of(...) : List [<element>] : Object | provenance | MaD:558 |
+| Test.java:5865:36:5865:43 | source(...) : Object | Test.java:5865:28:5865:44 | of(...) : List [<element>] : Object | provenance | MaD:561 |
 | Test.java:5866:10:5866:39 | toMap(...) : ImmutableMap [<map.key>] : Object | Test.java:5867:19:5867:21 | out : ImmutableMap [<map.key>] : Object | provenance |  |
 | Test.java:5866:21:5866:22 | in : Iterator [<element>] : Object | Test.java:5866:10:5866:39 | toMap(...) : ImmutableMap [<map.key>] : Object | provenance | MaD:358 |
 | Test.java:5867:19:5867:21 | out : ImmutableMap [<map.key>] : Object | Test.java:99:18:99:29 | map : ImmutableMap [<map.key>] : Object | provenance |  |
-| Test.java:5867:19:5867:21 | out : ImmutableMap [<map.key>] : Object | Test.java:5867:9:5867:22 | getMapKey(...) | provenance | MaD:562 |
+| Test.java:5867:19:5867:21 | out : ImmutableMap [<map.key>] : Object | Test.java:5867:9:5867:22 | getMapKey(...) | provenance | MaD:569 |
 | Test.java:5872:13:5872:39 | (...)... : Map [<map.key>] : Object | Test.java:5873:31:5873:32 | in : Map [<map.key>] : Object | provenance |  |
 | Test.java:5872:18:5872:39 | of(...) : Map [<map.key>] : Object | Test.java:5872:13:5872:39 | (...)... : Map [<map.key>] : Object | provenance |  |
-| Test.java:5872:25:5872:32 | source(...) : Object | Test.java:5872:18:5872:39 | of(...) : Map [<map.key>] : Object | provenance | MaD:563 |
+| Test.java:5872:25:5872:32 | source(...) : Object | Test.java:5872:18:5872:39 | of(...) : Map [<map.key>] : Object | provenance | MaD:564 |
 | Test.java:5873:10:5873:49 | transformValues(...) : Map [<map.key>] : Object | Test.java:5874:19:5874:21 | out : Map [<map.key>] : Object | provenance |  |
 | Test.java:5873:31:5873:32 | in : Map [<map.key>] : Object | Test.java:5873:10:5873:49 | transformValues(...) : Map [<map.key>] : Object | provenance | MaD:359 |
 | Test.java:5874:19:5874:21 | out : Map [<map.key>] : Object | Test.java:99:18:99:29 | map : Map [<map.key>] : Object | provenance |  |
-| Test.java:5874:19:5874:21 | out : Map [<map.key>] : Object | Test.java:5874:9:5874:22 | getMapKey(...) | provenance | MaD:562 |
+| Test.java:5874:19:5874:21 | out : Map [<map.key>] : Object | Test.java:5874:9:5874:22 | getMapKey(...) | provenance | MaD:569 |
 | Test.java:5879:22:5879:84 | (...)... : ImmutableSortedMap [<map.key>] : Comparable | Test.java:5880:31:5880:32 | in : ImmutableSortedMap [<map.key>] : Comparable | provenance |  |
 | Test.java:5879:36:5879:84 | of(...) : ImmutableSortedMap [<map.key>] : Comparable | Test.java:5879:22:5879:84 | (...)... : ImmutableSortedMap [<map.key>] : Comparable | provenance |  |
 | Test.java:5879:58:5879:77 | (...)... : Comparable | Test.java:5879:36:5879:84 | of(...) : ImmutableSortedMap [<map.key>] : Comparable | provenance | MaD:165 |
@@ -6472,7 +6472,7 @@ edges
 | Test.java:5880:10:5880:49 | transformValues(...) : NavigableMap [<map.key>] : Comparable | Test.java:5881:19:5881:21 | out : NavigableMap [<map.key>] : Comparable | provenance |  |
 | Test.java:5880:31:5880:32 | in : ImmutableSortedMap [<map.key>] : Comparable | Test.java:5880:10:5880:49 | transformValues(...) : NavigableMap [<map.key>] : Comparable | provenance | MaD:360 |
 | Test.java:5881:19:5881:21 | out : NavigableMap [<map.key>] : Comparable | Test.java:99:18:99:29 | map : NavigableMap [<map.key>] : Comparable | provenance |  |
-| Test.java:5881:19:5881:21 | out : NavigableMap [<map.key>] : Comparable | Test.java:5881:9:5881:22 | getMapKey(...) | provenance | MaD:562 |
+| Test.java:5881:19:5881:21 | out : NavigableMap [<map.key>] : Comparable | Test.java:5881:9:5881:22 | getMapKey(...) | provenance | MaD:569 |
 | Test.java:5886:19:5886:78 | (...)... : ImmutableSortedMap [<map.key>] : Comparable | Test.java:5887:31:5887:32 | in : ImmutableSortedMap [<map.key>] : Comparable | provenance |  |
 | Test.java:5886:30:5886:78 | of(...) : ImmutableSortedMap [<map.key>] : Comparable | Test.java:5886:19:5886:78 | (...)... : ImmutableSortedMap [<map.key>] : Comparable | provenance |  |
 | Test.java:5886:52:5886:71 | (...)... : Comparable | Test.java:5886:30:5886:78 | of(...) : ImmutableSortedMap [<map.key>] : Comparable | provenance | MaD:165 |
@@ -6480,36 +6480,36 @@ edges
 | Test.java:5887:10:5887:49 | transformValues(...) : SortedMap [<map.key>] : Comparable | Test.java:5888:19:5888:21 | out : SortedMap [<map.key>] : Comparable | provenance |  |
 | Test.java:5887:31:5887:32 | in : ImmutableSortedMap [<map.key>] : Comparable | Test.java:5887:10:5887:49 | transformValues(...) : SortedMap [<map.key>] : Comparable | provenance | MaD:361 |
 | Test.java:5888:19:5888:21 | out : SortedMap [<map.key>] : Comparable | Test.java:99:18:99:29 | map : SortedMap [<map.key>] : Comparable | provenance |  |
-| Test.java:5888:19:5888:21 | out : SortedMap [<map.key>] : Comparable | Test.java:5888:9:5888:22 | getMapKey(...) | provenance | MaD:562 |
+| Test.java:5888:19:5888:21 | out : SortedMap [<map.key>] : Comparable | Test.java:5888:9:5888:22 | getMapKey(...) | provenance | MaD:569 |
 | Test.java:5893:18:5893:44 | (...)... : List [<element>] : Object | Test.java:5894:27:5894:28 | in : List [<element>] : Object | provenance |  |
 | Test.java:5893:28:5893:44 | of(...) : List [<element>] : Object | Test.java:5893:18:5893:44 | (...)... : List [<element>] : Object | provenance |  |
-| Test.java:5893:36:5893:43 | source(...) : Object | Test.java:5893:28:5893:44 | of(...) : List [<element>] : Object | provenance | MaD:558 |
+| Test.java:5893:36:5893:43 | source(...) : Object | Test.java:5893:28:5893:44 | of(...) : List [<element>] : Object | provenance | MaD:561 |
 | Test.java:5894:10:5894:45 | uniqueIndex(...) : ImmutableMap [<map.value>] : Object | Test.java:5895:21:5895:23 | out : ImmutableMap [<map.value>] : Object | provenance |  |
 | Test.java:5894:27:5894:28 | in : List [<element>] : Object | Test.java:5894:10:5894:45 | uniqueIndex(...) : ImmutableMap [<map.value>] : Object | provenance | MaD:362 |
 | Test.java:5895:21:5895:23 | out : ImmutableMap [<map.value>] : Object | Test.java:118:20:118:31 | map : ImmutableMap [<map.value>] : Object | provenance |  |
-| Test.java:5895:21:5895:23 | out : ImmutableMap [<map.value>] : Object | Test.java:5895:9:5895:24 | getMapValue(...) | provenance | MaD:561 |
+| Test.java:5895:21:5895:23 | out : ImmutableMap [<map.value>] : Object | Test.java:5895:9:5895:24 | getMapValue(...) | provenance | MaD:568 |
 | Test.java:5900:18:5900:55 | (...)... : Iterator [<element>] : Object | Test.java:5901:27:5901:28 | in : Iterator [<element>] : Object | provenance |  |
-| Test.java:5900:28:5900:44 | of(...) : List [<element>] : Object | Test.java:5900:28:5900:55 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:555 |
+| Test.java:5900:28:5900:44 | of(...) : List [<element>] : Object | Test.java:5900:28:5900:55 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:558 |
 | Test.java:5900:28:5900:55 | iterator(...) : Iterator [<element>] : Object | Test.java:5900:18:5900:55 | (...)... : Iterator [<element>] : Object | provenance |  |
-| Test.java:5900:36:5900:43 | source(...) : Object | Test.java:5900:28:5900:44 | of(...) : List [<element>] : Object | provenance | MaD:558 |
+| Test.java:5900:36:5900:43 | source(...) : Object | Test.java:5900:28:5900:44 | of(...) : List [<element>] : Object | provenance | MaD:561 |
 | Test.java:5901:10:5901:45 | uniqueIndex(...) : ImmutableMap [<map.value>] : Object | Test.java:5902:21:5902:23 | out : ImmutableMap [<map.value>] : Object | provenance |  |
 | Test.java:5901:27:5901:28 | in : Iterator [<element>] : Object | Test.java:5901:10:5901:45 | uniqueIndex(...) : ImmutableMap [<map.value>] : Object | provenance | MaD:363 |
 | Test.java:5902:21:5902:23 | out : ImmutableMap [<map.value>] : Object | Test.java:118:20:118:31 | map : ImmutableMap [<map.value>] : Object | provenance |  |
-| Test.java:5902:21:5902:23 | out : ImmutableMap [<map.value>] : Object | Test.java:5902:9:5902:24 | getMapValue(...) | provenance | MaD:561 |
+| Test.java:5902:21:5902:23 | out : ImmutableMap [<map.value>] : Object | Test.java:5902:9:5902:24 | getMapValue(...) | provenance | MaD:568 |
 | Test.java:5907:15:5907:54 | (...)... : ImmutableBiMap [<map.key>] : Object | Test.java:5908:33:5908:34 | in : ImmutableBiMap [<map.key>] : Object | provenance |  |
 | Test.java:5907:22:5907:54 | of(...) : ImmutableBiMap [<map.key>] : Object | Test.java:5907:15:5907:54 | (...)... : ImmutableBiMap [<map.key>] : Object | provenance |  |
 | Test.java:5907:40:5907:47 | source(...) : Object | Test.java:5907:22:5907:54 | of(...) : ImmutableBiMap [<map.key>] : Object | provenance | MaD:29 |
 | Test.java:5908:10:5908:35 | unmodifiableBiMap(...) : BiMap [<map.key>] : Object | Test.java:5909:19:5909:21 | out : BiMap [<map.key>] : Object | provenance |  |
 | Test.java:5908:33:5908:34 | in : ImmutableBiMap [<map.key>] : Object | Test.java:5908:10:5908:35 | unmodifiableBiMap(...) : BiMap [<map.key>] : Object | provenance | MaD:364 |
 | Test.java:5909:19:5909:21 | out : BiMap [<map.key>] : Object | Test.java:99:18:99:29 | map : BiMap [<map.key>] : Object | provenance |  |
-| Test.java:5909:19:5909:21 | out : BiMap [<map.key>] : Object | Test.java:5909:9:5909:22 | getMapKey(...) | provenance | MaD:562 |
+| Test.java:5909:19:5909:21 | out : BiMap [<map.key>] : Object | Test.java:5909:9:5909:22 | getMapKey(...) | provenance | MaD:569 |
 | Test.java:5914:15:5914:54 | (...)... : ImmutableBiMap [<map.value>] : Object | Test.java:5915:33:5915:34 | in : ImmutableBiMap [<map.value>] : Object | provenance |  |
 | Test.java:5914:22:5914:54 | of(...) : ImmutableBiMap [<map.value>] : Object | Test.java:5914:15:5914:54 | (...)... : ImmutableBiMap [<map.value>] : Object | provenance |  |
 | Test.java:5914:46:5914:53 | source(...) : Object | Test.java:5914:22:5914:54 | of(...) : ImmutableBiMap [<map.value>] : Object | provenance | MaD:30 |
 | Test.java:5915:10:5915:35 | unmodifiableBiMap(...) : BiMap [<map.value>] : Object | Test.java:5916:21:5916:23 | out : BiMap [<map.value>] : Object | provenance |  |
 | Test.java:5915:33:5915:34 | in : ImmutableBiMap [<map.value>] : Object | Test.java:5915:10:5915:35 | unmodifiableBiMap(...) : BiMap [<map.value>] : Object | provenance | MaD:365 |
 | Test.java:5916:21:5916:23 | out : BiMap [<map.value>] : Object | Test.java:118:20:118:31 | map : BiMap [<map.value>] : Object | provenance |  |
-| Test.java:5916:21:5916:23 | out : BiMap [<map.value>] : Object | Test.java:5916:9:5916:24 | getMapValue(...) | provenance | MaD:561 |
+| Test.java:5916:21:5916:23 | out : BiMap [<map.value>] : Object | Test.java:5916:9:5916:24 | getMapValue(...) | provenance | MaD:568 |
 | Test.java:5921:22:5921:84 | (...)... : ImmutableSortedMap [<map.key>] : Comparable | Test.java:5922:40:5922:41 | in : ImmutableSortedMap [<map.key>] : Comparable | provenance |  |
 | Test.java:5921:36:5921:84 | of(...) : ImmutableSortedMap [<map.key>] : Comparable | Test.java:5921:22:5921:84 | (...)... : ImmutableSortedMap [<map.key>] : Comparable | provenance |  |
 | Test.java:5921:58:5921:77 | (...)... : Comparable | Test.java:5921:36:5921:84 | of(...) : ImmutableSortedMap [<map.key>] : Comparable | provenance | MaD:165 |
@@ -6517,331 +6517,331 @@ edges
 | Test.java:5922:10:5922:42 | unmodifiableNavigableMap(...) : NavigableMap [<map.key>] : Comparable | Test.java:5923:19:5923:21 | out : NavigableMap [<map.key>] : Comparable | provenance |  |
 | Test.java:5922:40:5922:41 | in : ImmutableSortedMap [<map.key>] : Comparable | Test.java:5922:10:5922:42 | unmodifiableNavigableMap(...) : NavigableMap [<map.key>] : Comparable | provenance | MaD:366 |
 | Test.java:5923:19:5923:21 | out : NavigableMap [<map.key>] : Comparable | Test.java:99:18:99:29 | map : NavigableMap [<map.key>] : Comparable | provenance |  |
-| Test.java:5923:19:5923:21 | out : NavigableMap [<map.key>] : Comparable | Test.java:5923:9:5923:22 | getMapKey(...) | provenance | MaD:562 |
+| Test.java:5923:19:5923:21 | out : NavigableMap [<map.key>] : Comparable | Test.java:5923:9:5923:22 | getMapKey(...) | provenance | MaD:569 |
 | Test.java:5928:22:5928:84 | (...)... : ImmutableSortedMap [<map.value>] : Object | Test.java:5929:40:5929:41 | in : ImmutableSortedMap [<map.value>] : Object | provenance |  |
 | Test.java:5928:36:5928:84 | of(...) : ImmutableSortedMap [<map.value>] : Object | Test.java:5928:22:5928:84 | (...)... : ImmutableSortedMap [<map.value>] : Object | provenance |  |
 | Test.java:5928:76:5928:83 | source(...) : Object | Test.java:5928:36:5928:84 | of(...) : ImmutableSortedMap [<map.value>] : Object | provenance | MaD:166 |
 | Test.java:5929:10:5929:42 | unmodifiableNavigableMap(...) : NavigableMap [<map.value>] : Object | Test.java:5930:21:5930:23 | out : NavigableMap [<map.value>] : Object | provenance |  |
 | Test.java:5929:40:5929:41 | in : ImmutableSortedMap [<map.value>] : Object | Test.java:5929:10:5929:42 | unmodifiableNavigableMap(...) : NavigableMap [<map.value>] : Object | provenance | MaD:367 |
 | Test.java:5930:21:5930:23 | out : NavigableMap [<map.value>] : Object | Test.java:118:20:118:31 | map : NavigableMap [<map.value>] : Object | provenance |  |
-| Test.java:5930:21:5930:23 | out : NavigableMap [<map.value>] : Object | Test.java:5930:9:5930:24 | getMapValue(...) | provenance | MaD:561 |
+| Test.java:5930:21:5930:23 | out : NavigableMap [<map.value>] : Object | Test.java:5930:9:5930:24 | getMapValue(...) | provenance | MaD:568 |
 | Test.java:5935:22:5935:104 | (...)... : TreeMultimap [<map.key>] : Comparable | Test.java:5936:10:5936:11 | in : TreeMultimap [<map.key>] : Comparable | provenance |  |
 | Test.java:5935:36:5935:104 | create(...) : TreeMultimap [<map.key>] : Comparable | Test.java:5935:22:5935:104 | (...)... : TreeMultimap [<map.key>] : Comparable | provenance |  |
 | Test.java:5935:56:5935:103 | of(...) : ImmutableMultimap [<map.key>] : Comparable | Test.java:5935:36:5935:104 | create(...) : TreeMultimap [<map.key>] : Comparable | provenance | MaD:552 |
-| Test.java:5935:77:5935:96 | (...)... : Comparable | Test.java:5935:56:5935:103 | of(...) : ImmutableMultimap [<map.key>] : Comparable | provenance | MaD:103 |
+| Test.java:5935:77:5935:96 | (...)... : Comparable | Test.java:5935:56:5935:103 | of(...) : ImmutableMultimap [<map.key>] : Comparable | provenance | MaD:121 |
 | Test.java:5935:89:5935:96 | source(...) : Object | Test.java:5935:77:5935:96 | (...)... : Comparable | provenance |  |
 | Test.java:5936:10:5936:11 | in : TreeMultimap [<map.key>] : Comparable | Test.java:5936:10:5936:19 | asMap(...) : NavigableMap [<map.key>] : Comparable | provenance | MaD:368 |
 | Test.java:5936:10:5936:19 | asMap(...) : NavigableMap [<map.key>] : Comparable | Test.java:5937:19:5937:21 | out : NavigableMap [<map.key>] : Comparable | provenance |  |
 | Test.java:5937:19:5937:21 | out : NavigableMap [<map.key>] : Comparable | Test.java:99:18:99:29 | map : NavigableMap [<map.key>] : Comparable | provenance |  |
-| Test.java:5937:19:5937:21 | out : NavigableMap [<map.key>] : Comparable | Test.java:5937:9:5937:22 | getMapKey(...) | provenance | MaD:562 |
+| Test.java:5937:19:5937:21 | out : NavigableMap [<map.key>] : Comparable | Test.java:5937:9:5937:22 | getMapKey(...) | provenance | MaD:569 |
 | Test.java:5942:27:5942:114 | (...)... : TreeMultimap [<map.key>] : Comparable | Test.java:5943:10:5943:11 | in : TreeMultimap [<map.key>] : Comparable | provenance |  |
 | Test.java:5942:46:5942:114 | create(...) : TreeMultimap [<map.key>] : Comparable | Test.java:5942:27:5942:114 | (...)... : TreeMultimap [<map.key>] : Comparable | provenance |  |
 | Test.java:5942:66:5942:113 | of(...) : ImmutableMultimap [<map.key>] : Comparable | Test.java:5942:46:5942:114 | create(...) : TreeMultimap [<map.key>] : Comparable | provenance | MaD:552 |
-| Test.java:5942:87:5942:106 | (...)... : Comparable | Test.java:5942:66:5942:113 | of(...) : ImmutableMultimap [<map.key>] : Comparable | provenance | MaD:103 |
+| Test.java:5942:87:5942:106 | (...)... : Comparable | Test.java:5942:66:5942:113 | of(...) : ImmutableMultimap [<map.key>] : Comparable | provenance | MaD:121 |
 | Test.java:5942:99:5942:106 | source(...) : Object | Test.java:5942:87:5942:106 | (...)... : Comparable | provenance |  |
 | Test.java:5943:10:5943:11 | in : TreeMultimap [<map.key>] : Comparable | Test.java:5943:10:5943:19 | asMap(...) : Map [<map.key>] : Comparable | provenance | MaD:368 |
 | Test.java:5943:10:5943:19 | asMap(...) : Map [<map.key>] : Comparable | Test.java:5944:19:5944:21 | out : Map [<map.key>] : Comparable | provenance |  |
 | Test.java:5944:19:5944:21 | out : Map [<map.key>] : Comparable | Test.java:99:18:99:29 | map : Map [<map.key>] : Comparable | provenance |  |
-| Test.java:5944:19:5944:21 | out : Map [<map.key>] : Comparable | Test.java:5944:9:5944:22 | getMapKey(...) | provenance | MaD:562 |
+| Test.java:5944:19:5944:21 | out : Map [<map.key>] : Comparable | Test.java:5944:9:5944:22 | getMapKey(...) | provenance | MaD:569 |
 | Test.java:5949:21:5949:72 | (...)... : ImmutableSetMultimap [<map.key>] : Object | Test.java:5950:10:5950:11 | in : ImmutableSetMultimap [<map.key>] : Object | provenance |  |
 | Test.java:5949:34:5949:72 | of(...) : ImmutableSetMultimap [<map.key>] : Object | Test.java:5949:21:5949:72 | (...)... : ImmutableSetMultimap [<map.key>] : Object | provenance |  |
 | Test.java:5949:58:5949:65 | source(...) : Object | Test.java:5949:34:5949:72 | of(...) : ImmutableSetMultimap [<map.key>] : Object | provenance | MaD:145 |
 | Test.java:5950:10:5950:11 | in : ImmutableSetMultimap [<map.key>] : Object | Test.java:5950:10:5950:19 | asMap(...) : Map [<map.key>] : Object | provenance | MaD:368 |
 | Test.java:5950:10:5950:19 | asMap(...) : Map [<map.key>] : Object | Test.java:5951:19:5951:21 | out : Map [<map.key>] : Object | provenance |  |
 | Test.java:5951:19:5951:21 | out : Map [<map.key>] : Object | Test.java:99:18:99:29 | map : Map [<map.key>] : Object | provenance |  |
-| Test.java:5951:19:5951:21 | out : Map [<map.key>] : Object | Test.java:5951:9:5951:22 | getMapKey(...) | provenance | MaD:562 |
+| Test.java:5951:19:5951:21 | out : Map [<map.key>] : Object | Test.java:5951:9:5951:22 | getMapKey(...) | provenance | MaD:569 |
 | Test.java:5956:18:5956:63 | (...)... : ImmutableMultimap [<map.key>] : Object | Test.java:5957:10:5957:11 | in : ImmutableMultimap [<map.key>] : Object | provenance |  |
 | Test.java:5956:28:5956:63 | of(...) : ImmutableMultimap [<map.key>] : Object | Test.java:5956:18:5956:63 | (...)... : ImmutableMultimap [<map.key>] : Object | provenance |  |
-| Test.java:5956:49:5956:56 | source(...) : Object | Test.java:5956:28:5956:63 | of(...) : ImmutableMultimap [<map.key>] : Object | provenance | MaD:103 |
+| Test.java:5956:49:5956:56 | source(...) : Object | Test.java:5956:28:5956:63 | of(...) : ImmutableMultimap [<map.key>] : Object | provenance | MaD:121 |
 | Test.java:5957:10:5957:11 | in : ImmutableMultimap [<map.key>] : Object | Test.java:5957:10:5957:19 | asMap(...) : Map [<map.key>] : Object | provenance | MaD:368 |
 | Test.java:5957:10:5957:19 | asMap(...) : Map [<map.key>] : Object | Test.java:5958:19:5958:21 | out : Map [<map.key>] : Object | provenance |  |
 | Test.java:5958:19:5958:21 | out : Map [<map.key>] : Object | Test.java:99:18:99:29 | map : Map [<map.key>] : Object | provenance |  |
-| Test.java:5958:19:5958:21 | out : Map [<map.key>] : Object | Test.java:5958:9:5958:22 | getMapKey(...) | provenance | MaD:562 |
+| Test.java:5958:19:5958:21 | out : Map [<map.key>] : Object | Test.java:5958:9:5958:22 | getMapKey(...) | provenance | MaD:569 |
 | Test.java:5963:22:5963:75 | (...)... : ImmutableListMultimap [<map.key>] : Object | Test.java:5964:10:5964:11 | in : ImmutableListMultimap [<map.key>] : Object | provenance |  |
 | Test.java:5963:36:5963:75 | of(...) : ImmutableListMultimap [<map.key>] : Object | Test.java:5963:22:5963:75 | (...)... : ImmutableListMultimap [<map.key>] : Object | provenance |  |
 | Test.java:5963:61:5963:68 | source(...) : Object | Test.java:5963:36:5963:75 | of(...) : ImmutableListMultimap [<map.key>] : Object | provenance | MaD:60 |
 | Test.java:5964:10:5964:11 | in : ImmutableListMultimap [<map.key>] : Object | Test.java:5964:10:5964:19 | asMap(...) : Map [<map.key>] : Object | provenance | MaD:368 |
 | Test.java:5964:10:5964:19 | asMap(...) : Map [<map.key>] : Object | Test.java:5965:19:5965:21 | out : Map [<map.key>] : Object | provenance |  |
 | Test.java:5965:19:5965:21 | out : Map [<map.key>] : Object | Test.java:99:18:99:29 | map : Map [<map.key>] : Object | provenance |  |
-| Test.java:5965:19:5965:21 | out : Map [<map.key>] : Object | Test.java:5965:9:5965:22 | getMapKey(...) | provenance | MaD:562 |
+| Test.java:5965:19:5965:21 | out : Map [<map.key>] : Object | Test.java:5965:9:5965:22 | getMapKey(...) | provenance | MaD:569 |
 | Test.java:5970:27:5970:81 | (...)... : ImmutableMultimap [<map.key>] : Object | Test.java:5971:10:5971:11 | in : ImmutableMultimap [<map.key>] : Object | provenance |  |
 | Test.java:5970:46:5970:81 | of(...) : ImmutableMultimap [<map.key>] : Object | Test.java:5970:27:5970:81 | (...)... : ImmutableMultimap [<map.key>] : Object | provenance |  |
-| Test.java:5970:67:5970:74 | source(...) : Object | Test.java:5970:46:5970:81 | of(...) : ImmutableMultimap [<map.key>] : Object | provenance | MaD:103 |
+| Test.java:5970:67:5970:74 | source(...) : Object | Test.java:5970:46:5970:81 | of(...) : ImmutableMultimap [<map.key>] : Object | provenance | MaD:121 |
 | Test.java:5971:10:5971:11 | in : ImmutableMultimap [<map.key>] : Object | Test.java:5971:10:5971:19 | asMap(...) : ImmutableMap [<map.key>] : Object | provenance | MaD:368 |
 | Test.java:5971:10:5971:19 | asMap(...) : ImmutableMap [<map.key>] : Object | Test.java:5972:19:5972:21 | out : ImmutableMap [<map.key>] : Object | provenance |  |
 | Test.java:5972:19:5972:21 | out : ImmutableMap [<map.key>] : Object | Test.java:99:18:99:29 | map : ImmutableMap [<map.key>] : Object | provenance |  |
-| Test.java:5972:19:5972:21 | out : ImmutableMap [<map.key>] : Object | Test.java:5972:9:5972:22 | getMapKey(...) | provenance | MaD:562 |
+| Test.java:5972:19:5972:21 | out : ImmutableMap [<map.key>] : Object | Test.java:5972:9:5972:22 | getMapKey(...) | provenance | MaD:569 |
 | Test.java:5977:22:5977:104 | (...)... : TreeMultimap [<map.value>] : Comparable | Test.java:5978:10:5978:11 | in : TreeMultimap [<map.value>] : Comparable | provenance |  |
 | Test.java:5977:36:5977:104 | create(...) : TreeMultimap [<map.value>] : Comparable | Test.java:5977:22:5977:104 | (...)... : TreeMultimap [<map.value>] : Comparable | provenance |  |
 | Test.java:5977:56:5977:103 | of(...) : ImmutableMultimap [<map.value>] : Comparable | Test.java:5977:36:5977:104 | create(...) : TreeMultimap [<map.value>] : Comparable | provenance | MaD:553 |
-| Test.java:5977:83:5977:102 | (...)... : Comparable | Test.java:5977:56:5977:103 | of(...) : ImmutableMultimap [<map.value>] : Comparable | provenance | MaD:104 |
+| Test.java:5977:83:5977:102 | (...)... : Comparable | Test.java:5977:56:5977:103 | of(...) : ImmutableMultimap [<map.value>] : Comparable | provenance | MaD:122 |
 | Test.java:5977:95:5977:102 | source(...) : Object | Test.java:5977:83:5977:102 | (...)... : Comparable | provenance |  |
 | Test.java:5978:10:5978:11 | in : TreeMultimap [<map.value>] : Comparable | Test.java:5978:10:5978:19 | asMap(...) : NavigableMap [<map.value>, <element>] : Comparable | provenance | MaD:369 |
 | Test.java:5978:10:5978:19 | asMap(...) : NavigableMap [<map.value>, <element>] : Comparable | Test.java:5979:32:5979:34 | out : NavigableMap [<map.value>, <element>] : Comparable | provenance |  |
 | Test.java:5979:20:5979:35 | getMapValue(...) : Collection [<element>] : Comparable | Test.java:110:19:110:32 | it : Collection [<element>] : Comparable | provenance |  |
-| Test.java:5979:20:5979:35 | getMapValue(...) : Collection [<element>] : Comparable | Test.java:5979:9:5979:36 | getElement(...) | provenance | MaD:555 |
+| Test.java:5979:20:5979:35 | getMapValue(...) : Collection [<element>] : Comparable | Test.java:5979:9:5979:36 | getElement(...) | provenance | MaD:558 |
 | Test.java:5979:32:5979:34 | out : NavigableMap [<map.value>, <element>] : Comparable | Test.java:118:20:118:31 | map : NavigableMap [<map.value>, <element>] : Comparable | provenance |  |
-| Test.java:5979:32:5979:34 | out : NavigableMap [<map.value>, <element>] : Comparable | Test.java:5979:20:5979:35 | getMapValue(...) : Collection [<element>] : Comparable | provenance | MaD:561 |
+| Test.java:5979:32:5979:34 | out : NavigableMap [<map.value>, <element>] : Comparable | Test.java:5979:20:5979:35 | getMapValue(...) : Collection [<element>] : Comparable | provenance | MaD:568 |
 | Test.java:5984:27:5984:114 | (...)... : TreeMultimap [<map.value>] : Comparable | Test.java:5985:10:5985:11 | in : TreeMultimap [<map.value>] : Comparable | provenance |  |
 | Test.java:5984:46:5984:114 | create(...) : TreeMultimap [<map.value>] : Comparable | Test.java:5984:27:5984:114 | (...)... : TreeMultimap [<map.value>] : Comparable | provenance |  |
 | Test.java:5984:66:5984:113 | of(...) : ImmutableMultimap [<map.value>] : Comparable | Test.java:5984:46:5984:114 | create(...) : TreeMultimap [<map.value>] : Comparable | provenance | MaD:553 |
-| Test.java:5984:93:5984:112 | (...)... : Comparable | Test.java:5984:66:5984:113 | of(...) : ImmutableMultimap [<map.value>] : Comparable | provenance | MaD:104 |
+| Test.java:5984:93:5984:112 | (...)... : Comparable | Test.java:5984:66:5984:113 | of(...) : ImmutableMultimap [<map.value>] : Comparable | provenance | MaD:122 |
 | Test.java:5984:105:5984:112 | source(...) : Object | Test.java:5984:93:5984:112 | (...)... : Comparable | provenance |  |
 | Test.java:5985:10:5985:11 | in : TreeMultimap [<map.value>] : Comparable | Test.java:5985:10:5985:19 | asMap(...) : Map [<map.value>, <element>] : Comparable | provenance | MaD:369 |
 | Test.java:5985:10:5985:19 | asMap(...) : Map [<map.value>, <element>] : Comparable | Test.java:5986:32:5986:34 | out : Map [<map.value>, <element>] : Comparable | provenance |  |
 | Test.java:5986:20:5986:35 | getMapValue(...) : Collection [<element>] : Comparable | Test.java:110:19:110:32 | it : Collection [<element>] : Comparable | provenance |  |
-| Test.java:5986:20:5986:35 | getMapValue(...) : Collection [<element>] : Comparable | Test.java:5986:9:5986:36 | getElement(...) | provenance | MaD:555 |
+| Test.java:5986:20:5986:35 | getMapValue(...) : Collection [<element>] : Comparable | Test.java:5986:9:5986:36 | getElement(...) | provenance | MaD:558 |
 | Test.java:5986:32:5986:34 | out : Map [<map.value>, <element>] : Comparable | Test.java:118:20:118:31 | map : Map [<map.value>, <element>] : Comparable | provenance |  |
-| Test.java:5986:32:5986:34 | out : Map [<map.value>, <element>] : Comparable | Test.java:5986:20:5986:35 | getMapValue(...) : Collection [<element>] : Comparable | provenance | MaD:561 |
+| Test.java:5986:32:5986:34 | out : Map [<map.value>, <element>] : Comparable | Test.java:5986:20:5986:35 | getMapValue(...) : Collection [<element>] : Comparable | provenance | MaD:568 |
 | Test.java:5991:21:5991:72 | (...)... : ImmutableSetMultimap [<map.value>] : Object | Test.java:5992:10:5992:11 | in : ImmutableSetMultimap [<map.value>] : Object | provenance |  |
 | Test.java:5991:34:5991:72 | of(...) : ImmutableSetMultimap [<map.value>] : Object | Test.java:5991:21:5991:72 | (...)... : ImmutableSetMultimap [<map.value>] : Object | provenance |  |
 | Test.java:5991:64:5991:71 | source(...) : Object | Test.java:5991:34:5991:72 | of(...) : ImmutableSetMultimap [<map.value>] : Object | provenance | MaD:146 |
 | Test.java:5992:10:5992:11 | in : ImmutableSetMultimap [<map.value>] : Object | Test.java:5992:10:5992:19 | asMap(...) : Map [<map.value>, <element>] : Object | provenance | MaD:369 |
 | Test.java:5992:10:5992:19 | asMap(...) : Map [<map.value>, <element>] : Object | Test.java:5993:32:5993:34 | out : Map [<map.value>, <element>] : Object | provenance |  |
 | Test.java:5993:20:5993:35 | getMapValue(...) : Collection [<element>] : Object | Test.java:110:19:110:32 | it : Collection [<element>] : Object | provenance |  |
-| Test.java:5993:20:5993:35 | getMapValue(...) : Collection [<element>] : Object | Test.java:5993:9:5993:36 | getElement(...) | provenance | MaD:555 |
+| Test.java:5993:20:5993:35 | getMapValue(...) : Collection [<element>] : Object | Test.java:5993:9:5993:36 | getElement(...) | provenance | MaD:558 |
 | Test.java:5993:32:5993:34 | out : Map [<map.value>, <element>] : Object | Test.java:118:20:118:31 | map : Map [<map.value>, <element>] : Object | provenance |  |
-| Test.java:5993:32:5993:34 | out : Map [<map.value>, <element>] : Object | Test.java:5993:20:5993:35 | getMapValue(...) : Collection [<element>] : Object | provenance | MaD:561 |
+| Test.java:5993:32:5993:34 | out : Map [<map.value>, <element>] : Object | Test.java:5993:20:5993:35 | getMapValue(...) : Collection [<element>] : Object | provenance | MaD:568 |
 | Test.java:5998:18:5998:63 | (...)... : ImmutableMultimap [<map.value>] : Object | Test.java:5999:10:5999:11 | in : ImmutableMultimap [<map.value>] : Object | provenance |  |
 | Test.java:5998:28:5998:63 | of(...) : ImmutableMultimap [<map.value>] : Object | Test.java:5998:18:5998:63 | (...)... : ImmutableMultimap [<map.value>] : Object | provenance |  |
-| Test.java:5998:55:5998:62 | source(...) : Object | Test.java:5998:28:5998:63 | of(...) : ImmutableMultimap [<map.value>] : Object | provenance | MaD:104 |
+| Test.java:5998:55:5998:62 | source(...) : Object | Test.java:5998:28:5998:63 | of(...) : ImmutableMultimap [<map.value>] : Object | provenance | MaD:122 |
 | Test.java:5999:10:5999:11 | in : ImmutableMultimap [<map.value>] : Object | Test.java:5999:10:5999:19 | asMap(...) : Map [<map.value>, <element>] : Object | provenance | MaD:369 |
 | Test.java:5999:10:5999:19 | asMap(...) : Map [<map.value>, <element>] : Object | Test.java:6000:32:6000:34 | out : Map [<map.value>, <element>] : Object | provenance |  |
 | Test.java:6000:20:6000:35 | getMapValue(...) : Collection [<element>] : Object | Test.java:110:19:110:32 | it : Collection [<element>] : Object | provenance |  |
-| Test.java:6000:20:6000:35 | getMapValue(...) : Collection [<element>] : Object | Test.java:6000:9:6000:36 | getElement(...) | provenance | MaD:555 |
+| Test.java:6000:20:6000:35 | getMapValue(...) : Collection [<element>] : Object | Test.java:6000:9:6000:36 | getElement(...) | provenance | MaD:558 |
 | Test.java:6000:32:6000:34 | out : Map [<map.value>, <element>] : Object | Test.java:118:20:118:31 | map : Map [<map.value>, <element>] : Object | provenance |  |
-| Test.java:6000:32:6000:34 | out : Map [<map.value>, <element>] : Object | Test.java:6000:20:6000:35 | getMapValue(...) : Collection [<element>] : Object | provenance | MaD:561 |
+| Test.java:6000:32:6000:34 | out : Map [<map.value>, <element>] : Object | Test.java:6000:20:6000:35 | getMapValue(...) : Collection [<element>] : Object | provenance | MaD:568 |
 | Test.java:6005:22:6005:75 | (...)... : ImmutableListMultimap [<map.value>] : Object | Test.java:6006:10:6006:11 | in : ImmutableListMultimap [<map.value>] : Object | provenance |  |
 | Test.java:6005:36:6005:75 | of(...) : ImmutableListMultimap [<map.value>] : Object | Test.java:6005:22:6005:75 | (...)... : ImmutableListMultimap [<map.value>] : Object | provenance |  |
 | Test.java:6005:67:6005:74 | source(...) : Object | Test.java:6005:36:6005:75 | of(...) : ImmutableListMultimap [<map.value>] : Object | provenance | MaD:61 |
 | Test.java:6006:10:6006:11 | in : ImmutableListMultimap [<map.value>] : Object | Test.java:6006:10:6006:19 | asMap(...) : Map [<map.value>, <element>] : Object | provenance | MaD:369 |
 | Test.java:6006:10:6006:19 | asMap(...) : Map [<map.value>, <element>] : Object | Test.java:6007:32:6007:34 | out : Map [<map.value>, <element>] : Object | provenance |  |
 | Test.java:6007:20:6007:35 | getMapValue(...) : Collection [<element>] : Object | Test.java:110:19:110:32 | it : Collection [<element>] : Object | provenance |  |
-| Test.java:6007:20:6007:35 | getMapValue(...) : Collection [<element>] : Object | Test.java:6007:9:6007:36 | getElement(...) | provenance | MaD:555 |
+| Test.java:6007:20:6007:35 | getMapValue(...) : Collection [<element>] : Object | Test.java:6007:9:6007:36 | getElement(...) | provenance | MaD:558 |
 | Test.java:6007:32:6007:34 | out : Map [<map.value>, <element>] : Object | Test.java:118:20:118:31 | map : Map [<map.value>, <element>] : Object | provenance |  |
-| Test.java:6007:32:6007:34 | out : Map [<map.value>, <element>] : Object | Test.java:6007:20:6007:35 | getMapValue(...) : Collection [<element>] : Object | provenance | MaD:561 |
+| Test.java:6007:32:6007:34 | out : Map [<map.value>, <element>] : Object | Test.java:6007:20:6007:35 | getMapValue(...) : Collection [<element>] : Object | provenance | MaD:568 |
 | Test.java:6012:27:6012:81 | (...)... : ImmutableMultimap [<map.value>] : Object | Test.java:6013:10:6013:11 | in : ImmutableMultimap [<map.value>] : Object | provenance |  |
 | Test.java:6012:46:6012:81 | of(...) : ImmutableMultimap [<map.value>] : Object | Test.java:6012:27:6012:81 | (...)... : ImmutableMultimap [<map.value>] : Object | provenance |  |
-| Test.java:6012:73:6012:80 | source(...) : Object | Test.java:6012:46:6012:81 | of(...) : ImmutableMultimap [<map.value>] : Object | provenance | MaD:104 |
+| Test.java:6012:73:6012:80 | source(...) : Object | Test.java:6012:46:6012:81 | of(...) : ImmutableMultimap [<map.value>] : Object | provenance | MaD:122 |
 | Test.java:6013:10:6013:11 | in : ImmutableMultimap [<map.value>] : Object | Test.java:6013:10:6013:19 | asMap(...) : ImmutableMap [<map.value>, <element>] : Object | provenance | MaD:369 |
 | Test.java:6013:10:6013:19 | asMap(...) : ImmutableMap [<map.value>, <element>] : Object | Test.java:6014:32:6014:34 | out : ImmutableMap [<map.value>, <element>] : Object | provenance |  |
 | Test.java:6014:20:6014:35 | getMapValue(...) : Collection [<element>] : Object | Test.java:110:19:110:32 | it : Collection [<element>] : Object | provenance |  |
-| Test.java:6014:20:6014:35 | getMapValue(...) : Collection [<element>] : Object | Test.java:6014:9:6014:36 | getElement(...) | provenance | MaD:555 |
+| Test.java:6014:20:6014:35 | getMapValue(...) : Collection [<element>] : Object | Test.java:6014:9:6014:36 | getElement(...) | provenance | MaD:558 |
 | Test.java:6014:32:6014:34 | out : ImmutableMap [<map.value>, <element>] : Object | Test.java:118:20:118:31 | map : ImmutableMap [<map.value>, <element>] : Object | provenance |  |
-| Test.java:6014:32:6014:34 | out : ImmutableMap [<map.value>, <element>] : Object | Test.java:6014:20:6014:35 | getMapValue(...) : Collection [<element>] : Object | provenance | MaD:561 |
+| Test.java:6014:32:6014:34 | out : ImmutableMap [<map.value>, <element>] : Object | Test.java:6014:20:6014:35 | getMapValue(...) : Collection [<element>] : Object | provenance | MaD:568 |
 | Test.java:6019:21:6019:72 | (...)... : ImmutableSetMultimap [<map.key>] : Object | Test.java:6020:10:6020:11 | in : ImmutableSetMultimap [<map.key>] : Object | provenance |  |
 | Test.java:6019:34:6019:72 | of(...) : ImmutableSetMultimap [<map.key>] : Object | Test.java:6019:21:6019:72 | (...)... : ImmutableSetMultimap [<map.key>] : Object | provenance |  |
 | Test.java:6019:58:6019:65 | source(...) : Object | Test.java:6019:34:6019:72 | of(...) : ImmutableSetMultimap [<map.key>] : Object | provenance | MaD:145 |
 | Test.java:6020:10:6020:11 | in : ImmutableSetMultimap [<map.key>] : Object | Test.java:6020:10:6020:21 | entries(...) : Set [<element>, <map.key>] : Object | provenance | MaD:370 |
 | Test.java:6020:10:6020:21 | entries(...) : Set [<element>, <map.key>] : Object | Test.java:6021:20:6021:22 | out : Set [<element>, <map.key>] : Object | provenance |  |
-| Test.java:6021:9:6021:23 | getElement(...) : Entry [<map.key>] : Object | Test.java:6021:9:6021:32 | getKey(...) | provenance | MaD:565 |
+| Test.java:6021:9:6021:23 | getElement(...) : Entry [<map.key>] : Object | Test.java:6021:9:6021:32 | getKey(...) | provenance | MaD:562 |
 | Test.java:6021:20:6021:22 | out : Set [<element>, <map.key>] : Object | Test.java:110:19:110:32 | it : Set [<element>, <map.key>] : Object | provenance |  |
-| Test.java:6021:20:6021:22 | out : Set [<element>, <map.key>] : Object | Test.java:6021:9:6021:23 | getElement(...) : Entry [<map.key>] : Object | provenance | MaD:555 |
+| Test.java:6021:20:6021:22 | out : Set [<element>, <map.key>] : Object | Test.java:6021:9:6021:23 | getElement(...) : Entry [<map.key>] : Object | provenance | MaD:558 |
 | Test.java:6026:28:6026:110 | (...)... : LinkedHashMultimap [<map.key>] : Object | Test.java:6027:10:6027:11 | in : LinkedHashMultimap [<map.key>] : Object | provenance |  |
 | Test.java:6026:48:6026:110 | create(...) : LinkedHashMultimap [<map.key>] : Object | Test.java:6026:28:6026:110 | (...)... : LinkedHashMultimap [<map.key>] : Object | provenance |  |
 | Test.java:6026:74:6026:109 | of(...) : ImmutableMultimap [<map.key>] : Object | Test.java:6026:48:6026:110 | create(...) : LinkedHashMultimap [<map.key>] : Object | provenance | MaD:287 |
-| Test.java:6026:95:6026:102 | source(...) : Object | Test.java:6026:74:6026:109 | of(...) : ImmutableMultimap [<map.key>] : Object | provenance | MaD:103 |
+| Test.java:6026:95:6026:102 | source(...) : Object | Test.java:6026:74:6026:109 | of(...) : ImmutableMultimap [<map.key>] : Object | provenance | MaD:121 |
 | Test.java:6027:10:6027:11 | in : LinkedHashMultimap [<map.key>] : Object | Test.java:6027:10:6027:21 | entries(...) : Set [<element>, <map.key>] : Object | provenance | MaD:370 |
 | Test.java:6027:10:6027:21 | entries(...) : Set [<element>, <map.key>] : Object | Test.java:6028:20:6028:22 | out : Set [<element>, <map.key>] : Object | provenance |  |
-| Test.java:6028:9:6028:23 | getElement(...) : Entry [<map.key>] : Object | Test.java:6028:9:6028:32 | getKey(...) | provenance | MaD:565 |
+| Test.java:6028:9:6028:23 | getElement(...) : Entry [<map.key>] : Object | Test.java:6028:9:6028:32 | getKey(...) | provenance | MaD:562 |
 | Test.java:6028:20:6028:22 | out : Set [<element>, <map.key>] : Object | Test.java:110:19:110:32 | it : Set [<element>, <map.key>] : Object | provenance |  |
-| Test.java:6028:20:6028:22 | out : Set [<element>, <map.key>] : Object | Test.java:6028:9:6028:23 | getElement(...) : Entry [<map.key>] : Object | provenance | MaD:555 |
+| Test.java:6028:20:6028:22 | out : Set [<element>, <map.key>] : Object | Test.java:6028:9:6028:23 | getElement(...) : Entry [<map.key>] : Object | provenance | MaD:558 |
 | Test.java:6033:28:6033:110 | (...)... : LinkedListMultimap [<map.key>] : Object | Test.java:6034:10:6034:11 | in : LinkedListMultimap [<map.key>] : Object | provenance |  |
 | Test.java:6033:48:6033:110 | create(...) : LinkedListMultimap [<map.key>] : Object | Test.java:6033:28:6033:110 | (...)... : LinkedListMultimap [<map.key>] : Object | provenance |  |
 | Test.java:6033:74:6033:109 | of(...) : ImmutableMultimap [<map.key>] : Object | Test.java:6033:48:6033:110 | create(...) : LinkedListMultimap [<map.key>] : Object | provenance | MaD:290 |
-| Test.java:6033:95:6033:102 | source(...) : Object | Test.java:6033:74:6033:109 | of(...) : ImmutableMultimap [<map.key>] : Object | provenance | MaD:103 |
+| Test.java:6033:95:6033:102 | source(...) : Object | Test.java:6033:74:6033:109 | of(...) : ImmutableMultimap [<map.key>] : Object | provenance | MaD:121 |
 | Test.java:6034:10:6034:11 | in : LinkedListMultimap [<map.key>] : Object | Test.java:6034:10:6034:21 | entries(...) : List [<element>, <map.key>] : Object | provenance | MaD:370 |
 | Test.java:6034:10:6034:21 | entries(...) : List [<element>, <map.key>] : Object | Test.java:6035:20:6035:22 | out : List [<element>, <map.key>] : Object | provenance |  |
-| Test.java:6035:9:6035:23 | getElement(...) : Entry [<map.key>] : Object | Test.java:6035:9:6035:32 | getKey(...) | provenance | MaD:565 |
+| Test.java:6035:9:6035:23 | getElement(...) : Entry [<map.key>] : Object | Test.java:6035:9:6035:32 | getKey(...) | provenance | MaD:562 |
 | Test.java:6035:20:6035:22 | out : List [<element>, <map.key>] : Object | Test.java:110:19:110:32 | it : List [<element>, <map.key>] : Object | provenance |  |
-| Test.java:6035:20:6035:22 | out : List [<element>, <map.key>] : Object | Test.java:6035:9:6035:23 | getElement(...) : Entry [<map.key>] : Object | provenance | MaD:555 |
+| Test.java:6035:20:6035:22 | out : List [<element>, <map.key>] : Object | Test.java:6035:9:6035:23 | getElement(...) : Entry [<map.key>] : Object | provenance | MaD:558 |
 | Test.java:6040:30:6040:90 | (...)... : ImmutableSetMultimap [<map.key>] : Object | Test.java:6041:10:6041:11 | in : ImmutableSetMultimap [<map.key>] : Object | provenance |  |
 | Test.java:6040:52:6040:90 | of(...) : ImmutableSetMultimap [<map.key>] : Object | Test.java:6040:30:6040:90 | (...)... : ImmutableSetMultimap [<map.key>] : Object | provenance |  |
 | Test.java:6040:76:6040:83 | source(...) : Object | Test.java:6040:52:6040:90 | of(...) : ImmutableSetMultimap [<map.key>] : Object | provenance | MaD:145 |
 | Test.java:6041:10:6041:11 | in : ImmutableSetMultimap [<map.key>] : Object | Test.java:6041:10:6041:21 | entries(...) : ImmutableSet [<element>, <map.key>] : Object | provenance | MaD:370 |
 | Test.java:6041:10:6041:21 | entries(...) : ImmutableSet [<element>, <map.key>] : Object | Test.java:6042:20:6042:22 | out : ImmutableSet [<element>, <map.key>] : Object | provenance |  |
-| Test.java:6042:9:6042:23 | getElement(...) : Entry [<map.key>] : Object | Test.java:6042:9:6042:32 | getKey(...) | provenance | MaD:565 |
+| Test.java:6042:9:6042:23 | getElement(...) : Entry [<map.key>] : Object | Test.java:6042:9:6042:32 | getKey(...) | provenance | MaD:562 |
 | Test.java:6042:20:6042:22 | out : ImmutableSet [<element>, <map.key>] : Object | Test.java:110:19:110:32 | it : ImmutableSet [<element>, <map.key>] : Object | provenance |  |
-| Test.java:6042:20:6042:22 | out : ImmutableSet [<element>, <map.key>] : Object | Test.java:6042:9:6042:23 | getElement(...) : Entry [<map.key>] : Object | provenance | MaD:555 |
+| Test.java:6042:20:6042:22 | out : ImmutableSet [<element>, <map.key>] : Object | Test.java:6042:9:6042:23 | getElement(...) : Entry [<map.key>] : Object | provenance | MaD:558 |
 | Test.java:6047:27:6047:81 | (...)... : ImmutableMultimap [<map.key>] : Object | Test.java:6048:10:6048:11 | in : ImmutableMultimap [<map.key>] : Object | provenance |  |
 | Test.java:6047:46:6047:81 | of(...) : ImmutableMultimap [<map.key>] : Object | Test.java:6047:27:6047:81 | (...)... : ImmutableMultimap [<map.key>] : Object | provenance |  |
-| Test.java:6047:67:6047:74 | source(...) : Object | Test.java:6047:46:6047:81 | of(...) : ImmutableMultimap [<map.key>] : Object | provenance | MaD:103 |
+| Test.java:6047:67:6047:74 | source(...) : Object | Test.java:6047:46:6047:81 | of(...) : ImmutableMultimap [<map.key>] : Object | provenance | MaD:121 |
 | Test.java:6048:10:6048:11 | in : ImmutableMultimap [<map.key>] : Object | Test.java:6048:10:6048:21 | entries(...) : ImmutableCollection [<element>, <map.key>] : Object | provenance | MaD:370 |
 | Test.java:6048:10:6048:21 | entries(...) : ImmutableCollection [<element>, <map.key>] : Object | Test.java:6049:20:6049:22 | out : ImmutableCollection [<element>, <map.key>] : Object | provenance |  |
-| Test.java:6049:9:6049:23 | getElement(...) : Entry [<map.key>] : Object | Test.java:6049:9:6049:32 | getKey(...) | provenance | MaD:565 |
+| Test.java:6049:9:6049:23 | getElement(...) : Entry [<map.key>] : Object | Test.java:6049:9:6049:32 | getKey(...) | provenance | MaD:562 |
 | Test.java:6049:20:6049:22 | out : ImmutableCollection [<element>, <map.key>] : Object | Test.java:110:19:110:32 | it : ImmutableCollection [<element>, <map.key>] : Object | provenance |  |
-| Test.java:6049:20:6049:22 | out : ImmutableCollection [<element>, <map.key>] : Object | Test.java:6049:9:6049:23 | getElement(...) : Entry [<map.key>] : Object | provenance | MaD:555 |
+| Test.java:6049:20:6049:22 | out : ImmutableCollection [<element>, <map.key>] : Object | Test.java:6049:9:6049:23 | getElement(...) : Entry [<map.key>] : Object | provenance | MaD:558 |
 | Test.java:6054:18:6054:63 | (...)... : ImmutableMultimap [<map.key>] : Object | Test.java:6055:10:6055:11 | in : ImmutableMultimap [<map.key>] : Object | provenance |  |
 | Test.java:6054:28:6054:63 | of(...) : ImmutableMultimap [<map.key>] : Object | Test.java:6054:18:6054:63 | (...)... : ImmutableMultimap [<map.key>] : Object | provenance |  |
-| Test.java:6054:49:6054:56 | source(...) : Object | Test.java:6054:28:6054:63 | of(...) : ImmutableMultimap [<map.key>] : Object | provenance | MaD:103 |
+| Test.java:6054:49:6054:56 | source(...) : Object | Test.java:6054:28:6054:63 | of(...) : ImmutableMultimap [<map.key>] : Object | provenance | MaD:121 |
 | Test.java:6055:10:6055:11 | in : ImmutableMultimap [<map.key>] : Object | Test.java:6055:10:6055:21 | entries(...) : Collection [<element>, <map.key>] : Object | provenance | MaD:370 |
 | Test.java:6055:10:6055:21 | entries(...) : Collection [<element>, <map.key>] : Object | Test.java:6056:20:6056:22 | out : Collection [<element>, <map.key>] : Object | provenance |  |
-| Test.java:6056:9:6056:23 | getElement(...) : Entry [<map.key>] : Object | Test.java:6056:9:6056:32 | getKey(...) | provenance | MaD:565 |
+| Test.java:6056:9:6056:23 | getElement(...) : Entry [<map.key>] : Object | Test.java:6056:9:6056:32 | getKey(...) | provenance | MaD:562 |
 | Test.java:6056:20:6056:22 | out : Collection [<element>, <map.key>] : Object | Test.java:110:19:110:32 | it : Collection [<element>, <map.key>] : Object | provenance |  |
-| Test.java:6056:20:6056:22 | out : Collection [<element>, <map.key>] : Object | Test.java:6056:9:6056:23 | getElement(...) : Entry [<map.key>] : Object | provenance | MaD:555 |
+| Test.java:6056:20:6056:22 | out : Collection [<element>, <map.key>] : Object | Test.java:6056:9:6056:23 | getElement(...) : Entry [<map.key>] : Object | provenance | MaD:558 |
 | Test.java:6061:21:6061:72 | (...)... : ImmutableSetMultimap [<map.value>] : Object | Test.java:6062:10:6062:11 | in : ImmutableSetMultimap [<map.value>] : Object | provenance |  |
 | Test.java:6061:34:6061:72 | of(...) : ImmutableSetMultimap [<map.value>] : Object | Test.java:6061:21:6061:72 | (...)... : ImmutableSetMultimap [<map.value>] : Object | provenance |  |
 | Test.java:6061:64:6061:71 | source(...) : Object | Test.java:6061:34:6061:72 | of(...) : ImmutableSetMultimap [<map.value>] : Object | provenance | MaD:146 |
 | Test.java:6062:10:6062:11 | in : ImmutableSetMultimap [<map.value>] : Object | Test.java:6062:10:6062:21 | entries(...) : Set [<element>, <map.value>] : Object | provenance | MaD:371 |
 | Test.java:6062:10:6062:21 | entries(...) : Set [<element>, <map.value>] : Object | Test.java:6063:20:6063:22 | out : Set [<element>, <map.value>] : Object | provenance |  |
-| Test.java:6063:9:6063:23 | getElement(...) : Entry [<map.value>] : Object | Test.java:6063:9:6063:34 | getValue(...) | provenance | MaD:566 |
+| Test.java:6063:9:6063:23 | getElement(...) : Entry [<map.value>] : Object | Test.java:6063:9:6063:34 | getValue(...) | provenance | MaD:563 |
 | Test.java:6063:20:6063:22 | out : Set [<element>, <map.value>] : Object | Test.java:110:19:110:32 | it : Set [<element>, <map.value>] : Object | provenance |  |
-| Test.java:6063:20:6063:22 | out : Set [<element>, <map.value>] : Object | Test.java:6063:9:6063:23 | getElement(...) : Entry [<map.value>] : Object | provenance | MaD:555 |
+| Test.java:6063:20:6063:22 | out : Set [<element>, <map.value>] : Object | Test.java:6063:9:6063:23 | getElement(...) : Entry [<map.value>] : Object | provenance | MaD:558 |
 | Test.java:6068:28:6068:110 | (...)... : LinkedHashMultimap [<map.value>] : Object | Test.java:6069:10:6069:11 | in : LinkedHashMultimap [<map.value>] : Object | provenance |  |
 | Test.java:6068:48:6068:110 | create(...) : LinkedHashMultimap [<map.value>] : Object | Test.java:6068:28:6068:110 | (...)... : LinkedHashMultimap [<map.value>] : Object | provenance |  |
 | Test.java:6068:74:6068:109 | of(...) : ImmutableMultimap [<map.value>] : Object | Test.java:6068:48:6068:110 | create(...) : LinkedHashMultimap [<map.value>] : Object | provenance | MaD:288 |
-| Test.java:6068:101:6068:108 | source(...) : Object | Test.java:6068:74:6068:109 | of(...) : ImmutableMultimap [<map.value>] : Object | provenance | MaD:104 |
+| Test.java:6068:101:6068:108 | source(...) : Object | Test.java:6068:74:6068:109 | of(...) : ImmutableMultimap [<map.value>] : Object | provenance | MaD:122 |
 | Test.java:6069:10:6069:11 | in : LinkedHashMultimap [<map.value>] : Object | Test.java:6069:10:6069:21 | entries(...) : Set [<element>, <map.value>] : Object | provenance | MaD:371 |
 | Test.java:6069:10:6069:21 | entries(...) : Set [<element>, <map.value>] : Object | Test.java:6070:20:6070:22 | out : Set [<element>, <map.value>] : Object | provenance |  |
-| Test.java:6070:9:6070:23 | getElement(...) : Entry [<map.value>] : Object | Test.java:6070:9:6070:34 | getValue(...) | provenance | MaD:566 |
+| Test.java:6070:9:6070:23 | getElement(...) : Entry [<map.value>] : Object | Test.java:6070:9:6070:34 | getValue(...) | provenance | MaD:563 |
 | Test.java:6070:20:6070:22 | out : Set [<element>, <map.value>] : Object | Test.java:110:19:110:32 | it : Set [<element>, <map.value>] : Object | provenance |  |
-| Test.java:6070:20:6070:22 | out : Set [<element>, <map.value>] : Object | Test.java:6070:9:6070:23 | getElement(...) : Entry [<map.value>] : Object | provenance | MaD:555 |
+| Test.java:6070:20:6070:22 | out : Set [<element>, <map.value>] : Object | Test.java:6070:9:6070:23 | getElement(...) : Entry [<map.value>] : Object | provenance | MaD:558 |
 | Test.java:6075:28:6075:110 | (...)... : LinkedListMultimap [<map.value>] : Object | Test.java:6076:10:6076:11 | in : LinkedListMultimap [<map.value>] : Object | provenance |  |
 | Test.java:6075:48:6075:110 | create(...) : LinkedListMultimap [<map.value>] : Object | Test.java:6075:28:6075:110 | (...)... : LinkedListMultimap [<map.value>] : Object | provenance |  |
 | Test.java:6075:74:6075:109 | of(...) : ImmutableMultimap [<map.value>] : Object | Test.java:6075:48:6075:110 | create(...) : LinkedListMultimap [<map.value>] : Object | provenance | MaD:291 |
-| Test.java:6075:101:6075:108 | source(...) : Object | Test.java:6075:74:6075:109 | of(...) : ImmutableMultimap [<map.value>] : Object | provenance | MaD:104 |
+| Test.java:6075:101:6075:108 | source(...) : Object | Test.java:6075:74:6075:109 | of(...) : ImmutableMultimap [<map.value>] : Object | provenance | MaD:122 |
 | Test.java:6076:10:6076:11 | in : LinkedListMultimap [<map.value>] : Object | Test.java:6076:10:6076:21 | entries(...) : List [<element>, <map.value>] : Object | provenance | MaD:371 |
 | Test.java:6076:10:6076:21 | entries(...) : List [<element>, <map.value>] : Object | Test.java:6077:20:6077:22 | out : List [<element>, <map.value>] : Object | provenance |  |
-| Test.java:6077:9:6077:23 | getElement(...) : Entry [<map.value>] : Object | Test.java:6077:9:6077:34 | getValue(...) | provenance | MaD:566 |
+| Test.java:6077:9:6077:23 | getElement(...) : Entry [<map.value>] : Object | Test.java:6077:9:6077:34 | getValue(...) | provenance | MaD:563 |
 | Test.java:6077:20:6077:22 | out : List [<element>, <map.value>] : Object | Test.java:110:19:110:32 | it : List [<element>, <map.value>] : Object | provenance |  |
-| Test.java:6077:20:6077:22 | out : List [<element>, <map.value>] : Object | Test.java:6077:9:6077:23 | getElement(...) : Entry [<map.value>] : Object | provenance | MaD:555 |
+| Test.java:6077:20:6077:22 | out : List [<element>, <map.value>] : Object | Test.java:6077:9:6077:23 | getElement(...) : Entry [<map.value>] : Object | provenance | MaD:558 |
 | Test.java:6082:30:6082:90 | (...)... : ImmutableSetMultimap [<map.value>] : Object | Test.java:6083:10:6083:11 | in : ImmutableSetMultimap [<map.value>] : Object | provenance |  |
 | Test.java:6082:52:6082:90 | of(...) : ImmutableSetMultimap [<map.value>] : Object | Test.java:6082:30:6082:90 | (...)... : ImmutableSetMultimap [<map.value>] : Object | provenance |  |
 | Test.java:6082:82:6082:89 | source(...) : Object | Test.java:6082:52:6082:90 | of(...) : ImmutableSetMultimap [<map.value>] : Object | provenance | MaD:146 |
 | Test.java:6083:10:6083:11 | in : ImmutableSetMultimap [<map.value>] : Object | Test.java:6083:10:6083:21 | entries(...) : ImmutableSet [<element>, <map.value>] : Object | provenance | MaD:371 |
 | Test.java:6083:10:6083:21 | entries(...) : ImmutableSet [<element>, <map.value>] : Object | Test.java:6084:20:6084:22 | out : ImmutableSet [<element>, <map.value>] : Object | provenance |  |
-| Test.java:6084:9:6084:23 | getElement(...) : Entry [<map.value>] : Object | Test.java:6084:9:6084:34 | getValue(...) | provenance | MaD:566 |
+| Test.java:6084:9:6084:23 | getElement(...) : Entry [<map.value>] : Object | Test.java:6084:9:6084:34 | getValue(...) | provenance | MaD:563 |
 | Test.java:6084:20:6084:22 | out : ImmutableSet [<element>, <map.value>] : Object | Test.java:110:19:110:32 | it : ImmutableSet [<element>, <map.value>] : Object | provenance |  |
-| Test.java:6084:20:6084:22 | out : ImmutableSet [<element>, <map.value>] : Object | Test.java:6084:9:6084:23 | getElement(...) : Entry [<map.value>] : Object | provenance | MaD:555 |
+| Test.java:6084:20:6084:22 | out : ImmutableSet [<element>, <map.value>] : Object | Test.java:6084:9:6084:23 | getElement(...) : Entry [<map.value>] : Object | provenance | MaD:558 |
 | Test.java:6089:27:6089:81 | (...)... : ImmutableMultimap [<map.value>] : Object | Test.java:6090:10:6090:11 | in : ImmutableMultimap [<map.value>] : Object | provenance |  |
 | Test.java:6089:46:6089:81 | of(...) : ImmutableMultimap [<map.value>] : Object | Test.java:6089:27:6089:81 | (...)... : ImmutableMultimap [<map.value>] : Object | provenance |  |
-| Test.java:6089:73:6089:80 | source(...) : Object | Test.java:6089:46:6089:81 | of(...) : ImmutableMultimap [<map.value>] : Object | provenance | MaD:104 |
+| Test.java:6089:73:6089:80 | source(...) : Object | Test.java:6089:46:6089:81 | of(...) : ImmutableMultimap [<map.value>] : Object | provenance | MaD:122 |
 | Test.java:6090:10:6090:11 | in : ImmutableMultimap [<map.value>] : Object | Test.java:6090:10:6090:21 | entries(...) : ImmutableCollection [<element>, <map.value>] : Object | provenance | MaD:371 |
 | Test.java:6090:10:6090:21 | entries(...) : ImmutableCollection [<element>, <map.value>] : Object | Test.java:6091:20:6091:22 | out : ImmutableCollection [<element>, <map.value>] : Object | provenance |  |
-| Test.java:6091:9:6091:23 | getElement(...) : Entry [<map.value>] : Object | Test.java:6091:9:6091:34 | getValue(...) | provenance | MaD:566 |
+| Test.java:6091:9:6091:23 | getElement(...) : Entry [<map.value>] : Object | Test.java:6091:9:6091:34 | getValue(...) | provenance | MaD:563 |
 | Test.java:6091:20:6091:22 | out : ImmutableCollection [<element>, <map.value>] : Object | Test.java:110:19:110:32 | it : ImmutableCollection [<element>, <map.value>] : Object | provenance |  |
-| Test.java:6091:20:6091:22 | out : ImmutableCollection [<element>, <map.value>] : Object | Test.java:6091:9:6091:23 | getElement(...) : Entry [<map.value>] : Object | provenance | MaD:555 |
+| Test.java:6091:20:6091:22 | out : ImmutableCollection [<element>, <map.value>] : Object | Test.java:6091:9:6091:23 | getElement(...) : Entry [<map.value>] : Object | provenance | MaD:558 |
 | Test.java:6096:18:6096:63 | (...)... : ImmutableMultimap [<map.value>] : Object | Test.java:6097:10:6097:11 | in : ImmutableMultimap [<map.value>] : Object | provenance |  |
 | Test.java:6096:28:6096:63 | of(...) : ImmutableMultimap [<map.value>] : Object | Test.java:6096:18:6096:63 | (...)... : ImmutableMultimap [<map.value>] : Object | provenance |  |
-| Test.java:6096:55:6096:62 | source(...) : Object | Test.java:6096:28:6096:63 | of(...) : ImmutableMultimap [<map.value>] : Object | provenance | MaD:104 |
+| Test.java:6096:55:6096:62 | source(...) : Object | Test.java:6096:28:6096:63 | of(...) : ImmutableMultimap [<map.value>] : Object | provenance | MaD:122 |
 | Test.java:6097:10:6097:11 | in : ImmutableMultimap [<map.value>] : Object | Test.java:6097:10:6097:21 | entries(...) : Collection [<element>, <map.value>] : Object | provenance | MaD:371 |
 | Test.java:6097:10:6097:21 | entries(...) : Collection [<element>, <map.value>] : Object | Test.java:6098:20:6098:22 | out : Collection [<element>, <map.value>] : Object | provenance |  |
-| Test.java:6098:9:6098:23 | getElement(...) : Entry [<map.value>] : Object | Test.java:6098:9:6098:34 | getValue(...) | provenance | MaD:566 |
+| Test.java:6098:9:6098:23 | getElement(...) : Entry [<map.value>] : Object | Test.java:6098:9:6098:34 | getValue(...) | provenance | MaD:563 |
 | Test.java:6098:20:6098:22 | out : Collection [<element>, <map.value>] : Object | Test.java:110:19:110:32 | it : Collection [<element>, <map.value>] : Object | provenance |  |
-| Test.java:6098:20:6098:22 | out : Collection [<element>, <map.value>] : Object | Test.java:6098:9:6098:23 | getElement(...) : Entry [<map.value>] : Object | provenance | MaD:555 |
+| Test.java:6098:20:6098:22 | out : Collection [<element>, <map.value>] : Object | Test.java:6098:9:6098:23 | getElement(...) : Entry [<map.value>] : Object | provenance | MaD:558 |
 | Test.java:6103:27:6103:114 | (...)... : TreeMultimap [<map.value>] : Comparable | Test.java:6104:10:6104:11 | in : TreeMultimap [<map.value>] : Comparable | provenance |  |
 | Test.java:6103:46:6103:114 | create(...) : TreeMultimap [<map.value>] : Comparable | Test.java:6103:27:6103:114 | (...)... : TreeMultimap [<map.value>] : Comparable | provenance |  |
 | Test.java:6103:66:6103:113 | of(...) : ImmutableMultimap [<map.value>] : Comparable | Test.java:6103:46:6103:114 | create(...) : TreeMultimap [<map.value>] : Comparable | provenance | MaD:553 |
-| Test.java:6103:93:6103:112 | (...)... : Comparable | Test.java:6103:66:6103:113 | of(...) : ImmutableMultimap [<map.value>] : Comparable | provenance | MaD:104 |
+| Test.java:6103:93:6103:112 | (...)... : Comparable | Test.java:6103:66:6103:113 | of(...) : ImmutableMultimap [<map.value>] : Comparable | provenance | MaD:122 |
 | Test.java:6103:105:6103:112 | source(...) : Object | Test.java:6103:93:6103:112 | (...)... : Comparable | provenance |  |
 | Test.java:6104:10:6104:11 | in : TreeMultimap [<map.value>] : Comparable | Test.java:6104:10:6104:21 | get(...) : SortedSet [<element>] : Comparable | provenance | MaD:372 |
 | Test.java:6104:10:6104:21 | get(...) : SortedSet [<element>] : Comparable | Test.java:6105:20:6105:22 | out : SortedSet [<element>] : Comparable | provenance |  |
 | Test.java:6105:20:6105:22 | out : SortedSet [<element>] : Comparable | Test.java:110:19:110:32 | it : SortedSet [<element>] : Comparable | provenance |  |
-| Test.java:6105:20:6105:22 | out : SortedSet [<element>] : Comparable | Test.java:6105:9:6105:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:6105:20:6105:22 | out : SortedSet [<element>] : Comparable | Test.java:6105:9:6105:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:6110:21:6110:72 | (...)... : ImmutableSetMultimap [<map.value>] : Object | Test.java:6111:10:6111:11 | in : ImmutableSetMultimap [<map.value>] : Object | provenance |  |
 | Test.java:6110:34:6110:72 | of(...) : ImmutableSetMultimap [<map.value>] : Object | Test.java:6110:21:6110:72 | (...)... : ImmutableSetMultimap [<map.value>] : Object | provenance |  |
 | Test.java:6110:64:6110:71 | source(...) : Object | Test.java:6110:34:6110:72 | of(...) : ImmutableSetMultimap [<map.value>] : Object | provenance | MaD:146 |
 | Test.java:6111:10:6111:11 | in : ImmutableSetMultimap [<map.value>] : Object | Test.java:6111:10:6111:21 | get(...) : Set [<element>] : Object | provenance | MaD:372 |
 | Test.java:6111:10:6111:21 | get(...) : Set [<element>] : Object | Test.java:6112:20:6112:22 | out : Set [<element>] : Object | provenance |  |
 | Test.java:6112:20:6112:22 | out : Set [<element>] : Object | Test.java:110:19:110:32 | it : Set [<element>] : Object | provenance |  |
-| Test.java:6112:20:6112:22 | out : Set [<element>] : Object | Test.java:6112:9:6112:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:6112:20:6112:22 | out : Set [<element>] : Object | Test.java:6112:9:6112:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:6117:22:6117:104 | (...)... : TreeMultimap [<map.value>] : Comparable | Test.java:6118:10:6118:11 | in : TreeMultimap [<map.value>] : Comparable | provenance |  |
 | Test.java:6117:36:6117:104 | create(...) : TreeMultimap [<map.value>] : Comparable | Test.java:6117:22:6117:104 | (...)... : TreeMultimap [<map.value>] : Comparable | provenance |  |
 | Test.java:6117:56:6117:103 | of(...) : ImmutableMultimap [<map.value>] : Comparable | Test.java:6117:36:6117:104 | create(...) : TreeMultimap [<map.value>] : Comparable | provenance | MaD:553 |
-| Test.java:6117:83:6117:102 | (...)... : Comparable | Test.java:6117:56:6117:103 | of(...) : ImmutableMultimap [<map.value>] : Comparable | provenance | MaD:104 |
+| Test.java:6117:83:6117:102 | (...)... : Comparable | Test.java:6117:56:6117:103 | of(...) : ImmutableMultimap [<map.value>] : Comparable | provenance | MaD:122 |
 | Test.java:6117:95:6117:102 | source(...) : Object | Test.java:6117:83:6117:102 | (...)... : Comparable | provenance |  |
 | Test.java:6118:10:6118:11 | in : TreeMultimap [<map.value>] : Comparable | Test.java:6118:10:6118:21 | get(...) : NavigableSet [<element>] : Comparable | provenance | MaD:372 |
 | Test.java:6118:10:6118:21 | get(...) : NavigableSet [<element>] : Comparable | Test.java:6119:20:6119:22 | out : NavigableSet [<element>] : Comparable | provenance |  |
 | Test.java:6119:20:6119:22 | out : NavigableSet [<element>] : Comparable | Test.java:110:19:110:32 | it : NavigableSet [<element>] : Comparable | provenance |  |
-| Test.java:6119:20:6119:22 | out : NavigableSet [<element>] : Comparable | Test.java:6119:9:6119:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:6119:20:6119:22 | out : NavigableSet [<element>] : Comparable | Test.java:6119:9:6119:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:6124:22:6124:75 | (...)... : ImmutableListMultimap [<map.value>] : Object | Test.java:6125:10:6125:11 | in : ImmutableListMultimap [<map.value>] : Object | provenance |  |
 | Test.java:6124:36:6124:75 | of(...) : ImmutableListMultimap [<map.value>] : Object | Test.java:6124:22:6124:75 | (...)... : ImmutableListMultimap [<map.value>] : Object | provenance |  |
 | Test.java:6124:67:6124:74 | source(...) : Object | Test.java:6124:36:6124:75 | of(...) : ImmutableListMultimap [<map.value>] : Object | provenance | MaD:61 |
 | Test.java:6125:10:6125:11 | in : ImmutableListMultimap [<map.value>] : Object | Test.java:6125:10:6125:21 | get(...) : List [<element>] : Object | provenance | MaD:372 |
 | Test.java:6125:10:6125:21 | get(...) : List [<element>] : Object | Test.java:6126:20:6126:22 | out : List [<element>] : Object | provenance |  |
 | Test.java:6126:20:6126:22 | out : List [<element>] : Object | Test.java:110:19:110:32 | it : List [<element>] : Object | provenance |  |
-| Test.java:6126:20:6126:22 | out : List [<element>] : Object | Test.java:6126:9:6126:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:6126:20:6126:22 | out : List [<element>] : Object | Test.java:6126:9:6126:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:6131:28:6131:110 | (...)... : LinkedListMultimap [<map.value>] : Object | Test.java:6132:10:6132:11 | in : LinkedListMultimap [<map.value>] : Object | provenance |  |
 | Test.java:6131:48:6131:110 | create(...) : LinkedListMultimap [<map.value>] : Object | Test.java:6131:28:6131:110 | (...)... : LinkedListMultimap [<map.value>] : Object | provenance |  |
 | Test.java:6131:74:6131:109 | of(...) : ImmutableMultimap [<map.value>] : Object | Test.java:6131:48:6131:110 | create(...) : LinkedListMultimap [<map.value>] : Object | provenance | MaD:291 |
-| Test.java:6131:101:6131:108 | source(...) : Object | Test.java:6131:74:6131:109 | of(...) : ImmutableMultimap [<map.value>] : Object | provenance | MaD:104 |
+| Test.java:6131:101:6131:108 | source(...) : Object | Test.java:6131:74:6131:109 | of(...) : ImmutableMultimap [<map.value>] : Object | provenance | MaD:122 |
 | Test.java:6132:10:6132:11 | in : LinkedListMultimap [<map.value>] : Object | Test.java:6132:10:6132:21 | get(...) : List [<element>] : Object | provenance | MaD:372 |
 | Test.java:6132:10:6132:21 | get(...) : List [<element>] : Object | Test.java:6133:20:6133:22 | out : List [<element>] : Object | provenance |  |
 | Test.java:6133:20:6133:22 | out : List [<element>] : Object | Test.java:110:19:110:32 | it : List [<element>] : Object | provenance |  |
-| Test.java:6133:20:6133:22 | out : List [<element>] : Object | Test.java:6133:9:6133:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:6133:20:6133:22 | out : List [<element>] : Object | Test.java:6133:9:6133:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:6138:30:6138:90 | (...)... : ImmutableSetMultimap [<map.value>] : Object | Test.java:6139:10:6139:11 | in : ImmutableSetMultimap [<map.value>] : Object | provenance |  |
 | Test.java:6138:52:6138:90 | of(...) : ImmutableSetMultimap [<map.value>] : Object | Test.java:6138:30:6138:90 | (...)... : ImmutableSetMultimap [<map.value>] : Object | provenance |  |
 | Test.java:6138:82:6138:89 | source(...) : Object | Test.java:6138:52:6138:90 | of(...) : ImmutableSetMultimap [<map.value>] : Object | provenance | MaD:146 |
 | Test.java:6139:10:6139:11 | in : ImmutableSetMultimap [<map.value>] : Object | Test.java:6139:10:6139:21 | get(...) : ImmutableSet [<element>] : Object | provenance | MaD:372 |
 | Test.java:6139:10:6139:21 | get(...) : ImmutableSet [<element>] : Object | Test.java:6140:20:6140:22 | out : ImmutableSet [<element>] : Object | provenance |  |
 | Test.java:6140:20:6140:22 | out : ImmutableSet [<element>] : Object | Test.java:110:19:110:32 | it : ImmutableSet [<element>] : Object | provenance |  |
-| Test.java:6140:20:6140:22 | out : ImmutableSet [<element>] : Object | Test.java:6140:9:6140:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:6140:20:6140:22 | out : ImmutableSet [<element>] : Object | Test.java:6140:9:6140:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:6145:31:6145:93 | (...)... : ImmutableListMultimap [<map.value>] : Object | Test.java:6146:10:6146:11 | in : ImmutableListMultimap [<map.value>] : Object | provenance |  |
 | Test.java:6145:54:6145:93 | of(...) : ImmutableListMultimap [<map.value>] : Object | Test.java:6145:31:6145:93 | (...)... : ImmutableListMultimap [<map.value>] : Object | provenance |  |
 | Test.java:6145:85:6145:92 | source(...) : Object | Test.java:6145:54:6145:93 | of(...) : ImmutableListMultimap [<map.value>] : Object | provenance | MaD:61 |
 | Test.java:6146:10:6146:11 | in : ImmutableListMultimap [<map.value>] : Object | Test.java:6146:10:6146:21 | get(...) : ImmutableList [<element>] : Object | provenance | MaD:372 |
 | Test.java:6146:10:6146:21 | get(...) : ImmutableList [<element>] : Object | Test.java:6147:20:6147:22 | out : ImmutableList [<element>] : Object | provenance |  |
 | Test.java:6147:20:6147:22 | out : ImmutableList [<element>] : Object | Test.java:110:19:110:32 | it : ImmutableList [<element>] : Object | provenance |  |
-| Test.java:6147:20:6147:22 | out : ImmutableList [<element>] : Object | Test.java:6147:9:6147:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:6147:20:6147:22 | out : ImmutableList [<element>] : Object | Test.java:6147:9:6147:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:6152:27:6152:81 | (...)... : ImmutableMultimap [<map.value>] : Object | Test.java:6153:10:6153:11 | in : ImmutableMultimap [<map.value>] : Object | provenance |  |
 | Test.java:6152:46:6152:81 | of(...) : ImmutableMultimap [<map.value>] : Object | Test.java:6152:27:6152:81 | (...)... : ImmutableMultimap [<map.value>] : Object | provenance |  |
-| Test.java:6152:73:6152:80 | source(...) : Object | Test.java:6152:46:6152:81 | of(...) : ImmutableMultimap [<map.value>] : Object | provenance | MaD:104 |
+| Test.java:6152:73:6152:80 | source(...) : Object | Test.java:6152:46:6152:81 | of(...) : ImmutableMultimap [<map.value>] : Object | provenance | MaD:122 |
 | Test.java:6153:10:6153:11 | in : ImmutableMultimap [<map.value>] : Object | Test.java:6153:10:6153:21 | get(...) : ImmutableCollection [<element>] : Object | provenance | MaD:372 |
 | Test.java:6153:10:6153:21 | get(...) : ImmutableCollection [<element>] : Object | Test.java:6154:20:6154:22 | out : ImmutableCollection [<element>] : Object | provenance |  |
 | Test.java:6154:20:6154:22 | out : ImmutableCollection [<element>] : Object | Test.java:110:19:110:32 | it : ImmutableCollection [<element>] : Object | provenance |  |
-| Test.java:6154:20:6154:22 | out : ImmutableCollection [<element>] : Object | Test.java:6154:9:6154:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:6154:20:6154:22 | out : ImmutableCollection [<element>] : Object | Test.java:6154:9:6154:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:6159:18:6159:63 | (...)... : ImmutableMultimap [<map.value>] : Object | Test.java:6160:10:6160:11 | in : ImmutableMultimap [<map.value>] : Object | provenance |  |
 | Test.java:6159:28:6159:63 | of(...) : ImmutableMultimap [<map.value>] : Object | Test.java:6159:18:6159:63 | (...)... : ImmutableMultimap [<map.value>] : Object | provenance |  |
-| Test.java:6159:55:6159:62 | source(...) : Object | Test.java:6159:28:6159:63 | of(...) : ImmutableMultimap [<map.value>] : Object | provenance | MaD:104 |
+| Test.java:6159:55:6159:62 | source(...) : Object | Test.java:6159:28:6159:63 | of(...) : ImmutableMultimap [<map.value>] : Object | provenance | MaD:122 |
 | Test.java:6160:10:6160:11 | in : ImmutableMultimap [<map.value>] : Object | Test.java:6160:10:6160:21 | get(...) : Collection [<element>] : Object | provenance | MaD:372 |
 | Test.java:6160:10:6160:21 | get(...) : Collection [<element>] : Object | Test.java:6161:20:6161:22 | out : Collection [<element>] : Object | provenance |  |
 | Test.java:6161:20:6161:22 | out : Collection [<element>] : Object | Test.java:110:19:110:32 | it : Collection [<element>] : Object | provenance |  |
-| Test.java:6161:20:6161:22 | out : Collection [<element>] : Object | Test.java:6161:9:6161:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:6161:20:6161:22 | out : Collection [<element>] : Object | Test.java:6161:9:6161:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:6166:18:6166:63 | (...)... : ImmutableMultimap [<map.key>] : Object | Test.java:6167:10:6167:11 | in : ImmutableMultimap [<map.key>] : Object | provenance |  |
 | Test.java:6166:28:6166:63 | of(...) : ImmutableMultimap [<map.key>] : Object | Test.java:6166:18:6166:63 | (...)... : ImmutableMultimap [<map.key>] : Object | provenance |  |
-| Test.java:6166:49:6166:56 | source(...) : Object | Test.java:6166:28:6166:63 | of(...) : ImmutableMultimap [<map.key>] : Object | provenance | MaD:103 |
+| Test.java:6166:49:6166:56 | source(...) : Object | Test.java:6166:28:6166:63 | of(...) : ImmutableMultimap [<map.key>] : Object | provenance | MaD:121 |
 | Test.java:6167:10:6167:11 | in : ImmutableMultimap [<map.key>] : Object | Test.java:6167:10:6167:20 | keySet(...) : Set [<element>] : Object | provenance | MaD:373 |
 | Test.java:6167:10:6167:20 | keySet(...) : Set [<element>] : Object | Test.java:6168:20:6168:22 | out : Set [<element>] : Object | provenance |  |
 | Test.java:6168:20:6168:22 | out : Set [<element>] : Object | Test.java:110:19:110:32 | it : Set [<element>] : Object | provenance |  |
-| Test.java:6168:20:6168:22 | out : Set [<element>] : Object | Test.java:6168:9:6168:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:6168:20:6168:22 | out : Set [<element>] : Object | Test.java:6168:9:6168:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:6173:28:6173:110 | (...)... : LinkedHashMultimap [<map.key>] : Object | Test.java:6174:10:6174:11 | in : LinkedHashMultimap [<map.key>] : Object | provenance |  |
 | Test.java:6173:48:6173:110 | create(...) : LinkedHashMultimap [<map.key>] : Object | Test.java:6173:28:6173:110 | (...)... : LinkedHashMultimap [<map.key>] : Object | provenance |  |
 | Test.java:6173:74:6173:109 | of(...) : ImmutableMultimap [<map.key>] : Object | Test.java:6173:48:6173:110 | create(...) : LinkedHashMultimap [<map.key>] : Object | provenance | MaD:287 |
-| Test.java:6173:95:6173:102 | source(...) : Object | Test.java:6173:74:6173:109 | of(...) : ImmutableMultimap [<map.key>] : Object | provenance | MaD:103 |
+| Test.java:6173:95:6173:102 | source(...) : Object | Test.java:6173:74:6173:109 | of(...) : ImmutableMultimap [<map.key>] : Object | provenance | MaD:121 |
 | Test.java:6174:10:6174:11 | in : LinkedHashMultimap [<map.key>] : Object | Test.java:6174:10:6174:20 | keySet(...) : Set [<element>] : Object | provenance | MaD:373 |
 | Test.java:6174:10:6174:20 | keySet(...) : Set [<element>] : Object | Test.java:6175:20:6175:22 | out : Set [<element>] : Object | provenance |  |
 | Test.java:6175:20:6175:22 | out : Set [<element>] : Object | Test.java:110:19:110:32 | it : Set [<element>] : Object | provenance |  |
-| Test.java:6175:20:6175:22 | out : Set [<element>] : Object | Test.java:6175:9:6175:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:6175:20:6175:22 | out : Set [<element>] : Object | Test.java:6175:9:6175:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:6180:22:6180:104 | (...)... : TreeMultimap [<map.key>] : Comparable | Test.java:6181:10:6181:11 | in : TreeMultimap [<map.key>] : Comparable | provenance |  |
 | Test.java:6180:36:6180:104 | create(...) : TreeMultimap [<map.key>] : Comparable | Test.java:6180:22:6180:104 | (...)... : TreeMultimap [<map.key>] : Comparable | provenance |  |
 | Test.java:6180:56:6180:103 | of(...) : ImmutableMultimap [<map.key>] : Comparable | Test.java:6180:36:6180:104 | create(...) : TreeMultimap [<map.key>] : Comparable | provenance | MaD:552 |
-| Test.java:6180:77:6180:96 | (...)... : Comparable | Test.java:6180:56:6180:103 | of(...) : ImmutableMultimap [<map.key>] : Comparable | provenance | MaD:103 |
+| Test.java:6180:77:6180:96 | (...)... : Comparable | Test.java:6180:56:6180:103 | of(...) : ImmutableMultimap [<map.key>] : Comparable | provenance | MaD:121 |
 | Test.java:6180:89:6180:96 | source(...) : Object | Test.java:6180:77:6180:96 | (...)... : Comparable | provenance |  |
 | Test.java:6181:10:6181:11 | in : TreeMultimap [<map.key>] : Comparable | Test.java:6181:10:6181:20 | keySet(...) : NavigableSet [<element>] : Comparable | provenance | MaD:373 |
 | Test.java:6181:10:6181:20 | keySet(...) : NavigableSet [<element>] : Comparable | Test.java:6182:20:6182:22 | out : NavigableSet [<element>] : Comparable | provenance |  |
 | Test.java:6182:20:6182:22 | out : NavigableSet [<element>] : Comparable | Test.java:110:19:110:32 | it : NavigableSet [<element>] : Comparable | provenance |  |
-| Test.java:6182:20:6182:22 | out : NavigableSet [<element>] : Comparable | Test.java:6182:9:6182:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:6182:20:6182:22 | out : NavigableSet [<element>] : Comparable | Test.java:6182:9:6182:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:6187:27:6187:81 | (...)... : ImmutableMultimap [<map.key>] : Object | Test.java:6188:10:6188:11 | in : ImmutableMultimap [<map.key>] : Object | provenance |  |
 | Test.java:6187:46:6187:81 | of(...) : ImmutableMultimap [<map.key>] : Object | Test.java:6187:27:6187:81 | (...)... : ImmutableMultimap [<map.key>] : Object | provenance |  |
-| Test.java:6187:67:6187:74 | source(...) : Object | Test.java:6187:46:6187:81 | of(...) : ImmutableMultimap [<map.key>] : Object | provenance | MaD:103 |
+| Test.java:6187:67:6187:74 | source(...) : Object | Test.java:6187:46:6187:81 | of(...) : ImmutableMultimap [<map.key>] : Object | provenance | MaD:121 |
 | Test.java:6188:10:6188:11 | in : ImmutableMultimap [<map.key>] : Object | Test.java:6188:10:6188:20 | keySet(...) : ImmutableSet [<element>] : Object | provenance | MaD:373 |
 | Test.java:6188:10:6188:20 | keySet(...) : ImmutableSet [<element>] : Object | Test.java:6189:20:6189:22 | out : ImmutableSet [<element>] : Object | provenance |  |
 | Test.java:6189:20:6189:22 | out : ImmutableSet [<element>] : Object | Test.java:110:19:110:32 | it : ImmutableSet [<element>] : Object | provenance |  |
-| Test.java:6189:20:6189:22 | out : ImmutableSet [<element>] : Object | Test.java:6189:9:6189:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:6189:20:6189:22 | out : ImmutableSet [<element>] : Object | Test.java:6189:9:6189:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:6194:18:6194:63 | (...)... : ImmutableMultimap [<map.key>] : Object | Test.java:6195:10:6195:11 | in : ImmutableMultimap [<map.key>] : Object | provenance |  |
 | Test.java:6194:28:6194:63 | of(...) : ImmutableMultimap [<map.key>] : Object | Test.java:6194:18:6194:63 | (...)... : ImmutableMultimap [<map.key>] : Object | provenance |  |
-| Test.java:6194:49:6194:56 | source(...) : Object | Test.java:6194:28:6194:63 | of(...) : ImmutableMultimap [<map.key>] : Object | provenance | MaD:103 |
+| Test.java:6194:49:6194:56 | source(...) : Object | Test.java:6194:28:6194:63 | of(...) : ImmutableMultimap [<map.key>] : Object | provenance | MaD:121 |
 | Test.java:6195:10:6195:11 | in : ImmutableMultimap [<map.key>] : Object | Test.java:6195:10:6195:18 | keys(...) : Multiset [<element>] : Object | provenance | MaD:374 |
 | Test.java:6195:10:6195:18 | keys(...) : Multiset [<element>] : Object | Test.java:6196:20:6196:22 | out : Multiset [<element>] : Object | provenance |  |
 | Test.java:6196:20:6196:22 | out : Multiset [<element>] : Object | Test.java:110:19:110:32 | it : Multiset [<element>] : Object | provenance |  |
-| Test.java:6196:20:6196:22 | out : Multiset [<element>] : Object | Test.java:6196:9:6196:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:6196:20:6196:22 | out : Multiset [<element>] : Object | Test.java:6196:9:6196:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:6201:27:6201:81 | (...)... : ImmutableMultimap [<map.key>] : Object | Test.java:6202:10:6202:11 | in : ImmutableMultimap [<map.key>] : Object | provenance |  |
 | Test.java:6201:46:6201:81 | of(...) : ImmutableMultimap [<map.key>] : Object | Test.java:6201:27:6201:81 | (...)... : ImmutableMultimap [<map.key>] : Object | provenance |  |
-| Test.java:6201:67:6201:74 | source(...) : Object | Test.java:6201:46:6201:81 | of(...) : ImmutableMultimap [<map.key>] : Object | provenance | MaD:103 |
+| Test.java:6201:67:6201:74 | source(...) : Object | Test.java:6201:46:6201:81 | of(...) : ImmutableMultimap [<map.key>] : Object | provenance | MaD:121 |
 | Test.java:6202:10:6202:11 | in : ImmutableMultimap [<map.key>] : Object | Test.java:6202:10:6202:18 | keys(...) : ImmutableMultiset [<element>] : Object | provenance | MaD:374 |
 | Test.java:6202:10:6202:18 | keys(...) : ImmutableMultiset [<element>] : Object | Test.java:6203:20:6203:22 | out : ImmutableMultiset [<element>] : Object | provenance |  |
 | Test.java:6203:20:6203:22 | out : ImmutableMultiset [<element>] : Object | Test.java:110:19:110:32 | it : ImmutableMultiset [<element>] : Object | provenance |  |
-| Test.java:6203:20:6203:22 | out : ImmutableMultiset [<element>] : Object | Test.java:6203:9:6203:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:6203:20:6203:22 | out : ImmutableMultiset [<element>] : Object | Test.java:6203:9:6203:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:6208:16:6208:31 | (...)... : Object | Test.java:6209:12:6209:13 | in : Object | provenance |  |
 | Test.java:6208:24:6208:31 | source(...) : Object | Test.java:6208:16:6208:31 | (...)... : Object | provenance |  |
 | Test.java:6209:4:6209:6 | out [post update] : Multimap [<map.key>] : Object | Test.java:6210:19:6210:21 | out : Multimap [<map.key>] : Object | provenance |  |
@@ -6880,28 +6880,28 @@ edges
 | Test.java:6245:21:6245:23 | out : ImmutableMultimap [<map.value>] : Object | Test.java:6245:9:6245:24 | getMapValue(...) | provenance | MaD:385 |
 | Test.java:6250:18:6250:63 | (...)... : ImmutableMultimap [<map.key>] : Object | Test.java:6251:15:6251:16 | in : ImmutableMultimap [<map.key>] : Object | provenance |  |
 | Test.java:6250:28:6250:63 | of(...) : ImmutableMultimap [<map.key>] : Object | Test.java:6250:18:6250:63 | (...)... : ImmutableMultimap [<map.key>] : Object | provenance |  |
-| Test.java:6250:49:6250:56 | source(...) : Object | Test.java:6250:28:6250:63 | of(...) : ImmutableMultimap [<map.key>] : Object | provenance | MaD:103 |
+| Test.java:6250:49:6250:56 | source(...) : Object | Test.java:6250:28:6250:63 | of(...) : ImmutableMultimap [<map.key>] : Object | provenance | MaD:121 |
 | Test.java:6251:4:6251:6 | out [post update] : Multimap [<map.key>] : Object | Test.java:6252:19:6252:21 | out : Multimap [<map.key>] : Object | provenance |  |
 | Test.java:6251:15:6251:16 | in : ImmutableMultimap [<map.key>] : Object | Test.java:6251:4:6251:6 | out [post update] : Multimap [<map.key>] : Object | provenance | MaD:377 |
 | Test.java:6252:19:6252:21 | out : Multimap [<map.key>] : Object | Test.java:100:18:100:34 | map : Multimap [<map.key>] : Object | provenance |  |
 | Test.java:6252:19:6252:21 | out : Multimap [<map.key>] : Object | Test.java:6252:9:6252:22 | getMapKey(...) | provenance | MaD:373 |
 | Test.java:6257:18:6257:63 | (...)... : ImmutableMultimap [<map.key>] : Object | Test.java:6258:15:6258:16 | in : ImmutableMultimap [<map.key>] : Object | provenance |  |
 | Test.java:6257:28:6257:63 | of(...) : ImmutableMultimap [<map.key>] : Object | Test.java:6257:18:6257:63 | (...)... : ImmutableMultimap [<map.key>] : Object | provenance |  |
-| Test.java:6257:49:6257:56 | source(...) : Object | Test.java:6257:28:6257:63 | of(...) : ImmutableMultimap [<map.key>] : Object | provenance | MaD:103 |
+| Test.java:6257:49:6257:56 | source(...) : Object | Test.java:6257:28:6257:63 | of(...) : ImmutableMultimap [<map.key>] : Object | provenance | MaD:121 |
 | Test.java:6258:4:6258:6 | out [post update] : ImmutableMultimap [<map.key>] : Object | Test.java:6259:19:6259:21 | out : ImmutableMultimap [<map.key>] : Object | provenance |  |
 | Test.java:6258:15:6258:16 | in : ImmutableMultimap [<map.key>] : Object | Test.java:6258:4:6258:6 | out [post update] : ImmutableMultimap [<map.key>] : Object | provenance | MaD:377 |
 | Test.java:6259:19:6259:21 | out : ImmutableMultimap [<map.key>] : Object | Test.java:100:18:100:34 | map : ImmutableMultimap [<map.key>] : Object | provenance |  |
 | Test.java:6259:19:6259:21 | out : ImmutableMultimap [<map.key>] : Object | Test.java:6259:9:6259:22 | getMapKey(...) | provenance | MaD:373 |
 | Test.java:6264:18:6264:63 | (...)... : ImmutableMultimap [<map.value>] : Object | Test.java:6265:15:6265:16 | in : ImmutableMultimap [<map.value>] : Object | provenance |  |
 | Test.java:6264:28:6264:63 | of(...) : ImmutableMultimap [<map.value>] : Object | Test.java:6264:18:6264:63 | (...)... : ImmutableMultimap [<map.value>] : Object | provenance |  |
-| Test.java:6264:55:6264:62 | source(...) : Object | Test.java:6264:28:6264:63 | of(...) : ImmutableMultimap [<map.value>] : Object | provenance | MaD:104 |
+| Test.java:6264:55:6264:62 | source(...) : Object | Test.java:6264:28:6264:63 | of(...) : ImmutableMultimap [<map.value>] : Object | provenance | MaD:122 |
 | Test.java:6265:4:6265:6 | out [post update] : Multimap [<map.value>] : Object | Test.java:6266:21:6266:23 | out : Multimap [<map.value>] : Object | provenance |  |
 | Test.java:6265:15:6265:16 | in : ImmutableMultimap [<map.value>] : Object | Test.java:6265:4:6265:6 | out [post update] : Multimap [<map.value>] : Object | provenance | MaD:378 |
 | Test.java:6266:21:6266:23 | out : Multimap [<map.value>] : Object | Test.java:119:20:119:36 | map : Multimap [<map.value>] : Object | provenance |  |
 | Test.java:6266:21:6266:23 | out : Multimap [<map.value>] : Object | Test.java:6266:9:6266:24 | getMapValue(...) | provenance | MaD:385 |
 | Test.java:6271:18:6271:63 | (...)... : ImmutableMultimap [<map.value>] : Object | Test.java:6272:15:6272:16 | in : ImmutableMultimap [<map.value>] : Object | provenance |  |
 | Test.java:6271:28:6271:63 | of(...) : ImmutableMultimap [<map.value>] : Object | Test.java:6271:18:6271:63 | (...)... : ImmutableMultimap [<map.value>] : Object | provenance |  |
-| Test.java:6271:55:6271:62 | source(...) : Object | Test.java:6271:28:6271:63 | of(...) : ImmutableMultimap [<map.value>] : Object | provenance | MaD:104 |
+| Test.java:6271:55:6271:62 | source(...) : Object | Test.java:6271:28:6271:63 | of(...) : ImmutableMultimap [<map.value>] : Object | provenance | MaD:122 |
 | Test.java:6272:4:6272:6 | out [post update] : ImmutableMultimap [<map.value>] : Object | Test.java:6273:21:6273:23 | out : ImmutableMultimap [<map.value>] : Object | provenance |  |
 | Test.java:6272:15:6272:16 | in : ImmutableMultimap [<map.value>] : Object | Test.java:6272:4:6272:6 | out [post update] : ImmutableMultimap [<map.value>] : Object | provenance | MaD:378 |
 | Test.java:6273:21:6273:23 | out : ImmutableMultimap [<map.value>] : Object | Test.java:119:20:119:36 | map : ImmutableMultimap [<map.value>] : Object | provenance |  |
@@ -6920,14 +6920,14 @@ edges
 | Test.java:6287:19:6287:21 | out : ImmutableMultimap [<map.key>] : Object | Test.java:6287:9:6287:22 | getMapKey(...) | provenance | MaD:373 |
 | Test.java:6292:18:6292:44 | (...)... : List [<element>] : Object | Test.java:6293:21:6293:22 | in : List [<element>] : Object | provenance |  |
 | Test.java:6292:28:6292:44 | of(...) : List [<element>] : Object | Test.java:6292:18:6292:44 | (...)... : List [<element>] : Object | provenance |  |
-| Test.java:6292:36:6292:43 | source(...) : Object | Test.java:6292:28:6292:44 | of(...) : List [<element>] : Object | provenance | MaD:558 |
+| Test.java:6292:36:6292:43 | source(...) : Object | Test.java:6292:28:6292:44 | of(...) : List [<element>] : Object | provenance | MaD:561 |
 | Test.java:6293:4:6293:6 | out [post update] : Multimap [<map.value>] : Object | Test.java:6294:21:6294:23 | out : Multimap [<map.value>] : Object | provenance |  |
 | Test.java:6293:21:6293:22 | in : List [<element>] : Object | Test.java:6293:4:6293:6 | out [post update] : Multimap [<map.value>] : Object | provenance | MaD:380 |
 | Test.java:6294:21:6294:23 | out : Multimap [<map.value>] : Object | Test.java:119:20:119:36 | map : Multimap [<map.value>] : Object | provenance |  |
 | Test.java:6294:21:6294:23 | out : Multimap [<map.value>] : Object | Test.java:6294:9:6294:24 | getMapValue(...) | provenance | MaD:385 |
 | Test.java:6299:18:6299:44 | (...)... : List [<element>] : Object | Test.java:6300:21:6300:22 | in : List [<element>] : Object | provenance |  |
 | Test.java:6299:28:6299:44 | of(...) : List [<element>] : Object | Test.java:6299:18:6299:44 | (...)... : List [<element>] : Object | provenance |  |
-| Test.java:6299:36:6299:43 | source(...) : Object | Test.java:6299:28:6299:44 | of(...) : List [<element>] : Object | provenance | MaD:558 |
+| Test.java:6299:36:6299:43 | source(...) : Object | Test.java:6299:28:6299:44 | of(...) : List [<element>] : Object | provenance | MaD:561 |
 | Test.java:6300:4:6300:6 | out [post update] : ImmutableMultimap [<map.value>] : Object | Test.java:6301:21:6301:23 | out : ImmutableMultimap [<map.value>] : Object | provenance |  |
 | Test.java:6300:21:6300:22 | in : List [<element>] : Object | Test.java:6300:4:6300:6 | out [post update] : ImmutableMultimap [<map.value>] : Object | provenance | MaD:380 |
 | Test.java:6301:21:6301:23 | out : ImmutableMultimap [<map.value>] : Object | Test.java:119:20:119:36 | map : ImmutableMultimap [<map.value>] : Object | provenance |  |
@@ -6935,354 +6935,354 @@ edges
 | Test.java:6306:27:6306:114 | (...)... : TreeMultimap [<map.value>] : Comparable | Test.java:6307:10:6307:11 | in : TreeMultimap [<map.value>] : Comparable | provenance |  |
 | Test.java:6306:46:6306:114 | create(...) : TreeMultimap [<map.value>] : Comparable | Test.java:6306:27:6306:114 | (...)... : TreeMultimap [<map.value>] : Comparable | provenance |  |
 | Test.java:6306:66:6306:113 | of(...) : ImmutableMultimap [<map.value>] : Comparable | Test.java:6306:46:6306:114 | create(...) : TreeMultimap [<map.value>] : Comparable | provenance | MaD:553 |
-| Test.java:6306:93:6306:112 | (...)... : Comparable | Test.java:6306:66:6306:113 | of(...) : ImmutableMultimap [<map.value>] : Comparable | provenance | MaD:104 |
+| Test.java:6306:93:6306:112 | (...)... : Comparable | Test.java:6306:66:6306:113 | of(...) : ImmutableMultimap [<map.value>] : Comparable | provenance | MaD:122 |
 | Test.java:6306:105:6306:112 | source(...) : Object | Test.java:6306:93:6306:112 | (...)... : Comparable | provenance |  |
 | Test.java:6307:10:6307:11 | in : TreeMultimap [<map.value>] : Comparable | Test.java:6307:10:6307:27 | removeAll(...) : SortedSet [<element>] : Comparable | provenance | MaD:381 |
 | Test.java:6307:10:6307:27 | removeAll(...) : SortedSet [<element>] : Comparable | Test.java:6308:20:6308:22 | out : SortedSet [<element>] : Comparable | provenance |  |
 | Test.java:6308:20:6308:22 | out : SortedSet [<element>] : Comparable | Test.java:110:19:110:32 | it : SortedSet [<element>] : Comparable | provenance |  |
-| Test.java:6308:20:6308:22 | out : SortedSet [<element>] : Comparable | Test.java:6308:9:6308:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:6308:20:6308:22 | out : SortedSet [<element>] : Comparable | Test.java:6308:9:6308:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:6313:21:6313:72 | (...)... : ImmutableSetMultimap [<map.value>] : Object | Test.java:6314:10:6314:11 | in : ImmutableSetMultimap [<map.value>] : Object | provenance |  |
 | Test.java:6313:34:6313:72 | of(...) : ImmutableSetMultimap [<map.value>] : Object | Test.java:6313:21:6313:72 | (...)... : ImmutableSetMultimap [<map.value>] : Object | provenance |  |
 | Test.java:6313:64:6313:71 | source(...) : Object | Test.java:6313:34:6313:72 | of(...) : ImmutableSetMultimap [<map.value>] : Object | provenance | MaD:146 |
 | Test.java:6314:10:6314:11 | in : ImmutableSetMultimap [<map.value>] : Object | Test.java:6314:10:6314:27 | removeAll(...) : Set [<element>] : Object | provenance | MaD:381 |
 | Test.java:6314:10:6314:27 | removeAll(...) : Set [<element>] : Object | Test.java:6315:20:6315:22 | out : Set [<element>] : Object | provenance |  |
 | Test.java:6315:20:6315:22 | out : Set [<element>] : Object | Test.java:110:19:110:32 | it : Set [<element>] : Object | provenance |  |
-| Test.java:6315:20:6315:22 | out : Set [<element>] : Object | Test.java:6315:9:6315:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:6315:20:6315:22 | out : Set [<element>] : Object | Test.java:6315:9:6315:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:6320:22:6320:75 | (...)... : ImmutableListMultimap [<map.value>] : Object | Test.java:6321:10:6321:11 | in : ImmutableListMultimap [<map.value>] : Object | provenance |  |
 | Test.java:6320:36:6320:75 | of(...) : ImmutableListMultimap [<map.value>] : Object | Test.java:6320:22:6320:75 | (...)... : ImmutableListMultimap [<map.value>] : Object | provenance |  |
 | Test.java:6320:67:6320:74 | source(...) : Object | Test.java:6320:36:6320:75 | of(...) : ImmutableListMultimap [<map.value>] : Object | provenance | MaD:61 |
 | Test.java:6321:10:6321:11 | in : ImmutableListMultimap [<map.value>] : Object | Test.java:6321:10:6321:27 | removeAll(...) : List [<element>] : Object | provenance | MaD:381 |
 | Test.java:6321:10:6321:27 | removeAll(...) : List [<element>] : Object | Test.java:6322:20:6322:22 | out : List [<element>] : Object | provenance |  |
 | Test.java:6322:20:6322:22 | out : List [<element>] : Object | Test.java:110:19:110:32 | it : List [<element>] : Object | provenance |  |
-| Test.java:6322:20:6322:22 | out : List [<element>] : Object | Test.java:6322:9:6322:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:6322:20:6322:22 | out : List [<element>] : Object | Test.java:6322:9:6322:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:6327:28:6327:110 | (...)... : LinkedListMultimap [<map.value>] : Object | Test.java:6328:10:6328:11 | in : LinkedListMultimap [<map.value>] : Object | provenance |  |
 | Test.java:6327:48:6327:110 | create(...) : LinkedListMultimap [<map.value>] : Object | Test.java:6327:28:6327:110 | (...)... : LinkedListMultimap [<map.value>] : Object | provenance |  |
 | Test.java:6327:74:6327:109 | of(...) : ImmutableMultimap [<map.value>] : Object | Test.java:6327:48:6327:110 | create(...) : LinkedListMultimap [<map.value>] : Object | provenance | MaD:291 |
-| Test.java:6327:101:6327:108 | source(...) : Object | Test.java:6327:74:6327:109 | of(...) : ImmutableMultimap [<map.value>] : Object | provenance | MaD:104 |
+| Test.java:6327:101:6327:108 | source(...) : Object | Test.java:6327:74:6327:109 | of(...) : ImmutableMultimap [<map.value>] : Object | provenance | MaD:122 |
 | Test.java:6328:10:6328:11 | in : LinkedListMultimap [<map.value>] : Object | Test.java:6328:10:6328:27 | removeAll(...) : List [<element>] : Object | provenance | MaD:381 |
 | Test.java:6328:10:6328:27 | removeAll(...) : List [<element>] : Object | Test.java:6329:20:6329:22 | out : List [<element>] : Object | provenance |  |
 | Test.java:6329:20:6329:22 | out : List [<element>] : Object | Test.java:110:19:110:32 | it : List [<element>] : Object | provenance |  |
-| Test.java:6329:20:6329:22 | out : List [<element>] : Object | Test.java:6329:9:6329:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:6329:20:6329:22 | out : List [<element>] : Object | Test.java:6329:9:6329:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:6334:30:6334:90 | (...)... : ImmutableSetMultimap [<map.value>] : Object | Test.java:6335:10:6335:11 | in : ImmutableSetMultimap [<map.value>] : Object | provenance |  |
 | Test.java:6334:52:6334:90 | of(...) : ImmutableSetMultimap [<map.value>] : Object | Test.java:6334:30:6334:90 | (...)... : ImmutableSetMultimap [<map.value>] : Object | provenance |  |
 | Test.java:6334:82:6334:89 | source(...) : Object | Test.java:6334:52:6334:90 | of(...) : ImmutableSetMultimap [<map.value>] : Object | provenance | MaD:146 |
 | Test.java:6335:10:6335:11 | in : ImmutableSetMultimap [<map.value>] : Object | Test.java:6335:10:6335:27 | removeAll(...) : ImmutableSet [<element>] : Object | provenance | MaD:381 |
 | Test.java:6335:10:6335:27 | removeAll(...) : ImmutableSet [<element>] : Object | Test.java:6336:20:6336:22 | out : ImmutableSet [<element>] : Object | provenance |  |
 | Test.java:6336:20:6336:22 | out : ImmutableSet [<element>] : Object | Test.java:110:19:110:32 | it : ImmutableSet [<element>] : Object | provenance |  |
-| Test.java:6336:20:6336:22 | out : ImmutableSet [<element>] : Object | Test.java:6336:9:6336:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:6336:20:6336:22 | out : ImmutableSet [<element>] : Object | Test.java:6336:9:6336:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:6341:31:6341:93 | (...)... : ImmutableListMultimap [<map.value>] : Object | Test.java:6342:10:6342:11 | in : ImmutableListMultimap [<map.value>] : Object | provenance |  |
 | Test.java:6341:54:6341:93 | of(...) : ImmutableListMultimap [<map.value>] : Object | Test.java:6341:31:6341:93 | (...)... : ImmutableListMultimap [<map.value>] : Object | provenance |  |
 | Test.java:6341:85:6341:92 | source(...) : Object | Test.java:6341:54:6341:93 | of(...) : ImmutableListMultimap [<map.value>] : Object | provenance | MaD:61 |
 | Test.java:6342:10:6342:11 | in : ImmutableListMultimap [<map.value>] : Object | Test.java:6342:10:6342:27 | removeAll(...) : ImmutableList [<element>] : Object | provenance | MaD:381 |
 | Test.java:6342:10:6342:27 | removeAll(...) : ImmutableList [<element>] : Object | Test.java:6343:20:6343:22 | out : ImmutableList [<element>] : Object | provenance |  |
 | Test.java:6343:20:6343:22 | out : ImmutableList [<element>] : Object | Test.java:110:19:110:32 | it : ImmutableList [<element>] : Object | provenance |  |
-| Test.java:6343:20:6343:22 | out : ImmutableList [<element>] : Object | Test.java:6343:9:6343:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:6343:20:6343:22 | out : ImmutableList [<element>] : Object | Test.java:6343:9:6343:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:6348:27:6348:81 | (...)... : ImmutableMultimap [<map.value>] : Object | Test.java:6349:10:6349:11 | in : ImmutableMultimap [<map.value>] : Object | provenance |  |
 | Test.java:6348:46:6348:81 | of(...) : ImmutableMultimap [<map.value>] : Object | Test.java:6348:27:6348:81 | (...)... : ImmutableMultimap [<map.value>] : Object | provenance |  |
-| Test.java:6348:73:6348:80 | source(...) : Object | Test.java:6348:46:6348:81 | of(...) : ImmutableMultimap [<map.value>] : Object | provenance | MaD:104 |
+| Test.java:6348:73:6348:80 | source(...) : Object | Test.java:6348:46:6348:81 | of(...) : ImmutableMultimap [<map.value>] : Object | provenance | MaD:122 |
 | Test.java:6349:10:6349:11 | in : ImmutableMultimap [<map.value>] : Object | Test.java:6349:10:6349:27 | removeAll(...) : ImmutableCollection [<element>] : Object | provenance | MaD:381 |
 | Test.java:6349:10:6349:27 | removeAll(...) : ImmutableCollection [<element>] : Object | Test.java:6350:20:6350:22 | out : ImmutableCollection [<element>] : Object | provenance |  |
 | Test.java:6350:20:6350:22 | out : ImmutableCollection [<element>] : Object | Test.java:110:19:110:32 | it : ImmutableCollection [<element>] : Object | provenance |  |
-| Test.java:6350:20:6350:22 | out : ImmutableCollection [<element>] : Object | Test.java:6350:9:6350:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:6350:20:6350:22 | out : ImmutableCollection [<element>] : Object | Test.java:6350:9:6350:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:6355:18:6355:63 | (...)... : ImmutableMultimap [<map.value>] : Object | Test.java:6356:10:6356:11 | in : ImmutableMultimap [<map.value>] : Object | provenance |  |
 | Test.java:6355:28:6355:63 | of(...) : ImmutableMultimap [<map.value>] : Object | Test.java:6355:18:6355:63 | (...)... : ImmutableMultimap [<map.value>] : Object | provenance |  |
-| Test.java:6355:55:6355:62 | source(...) : Object | Test.java:6355:28:6355:63 | of(...) : ImmutableMultimap [<map.value>] : Object | provenance | MaD:104 |
+| Test.java:6355:55:6355:62 | source(...) : Object | Test.java:6355:28:6355:63 | of(...) : ImmutableMultimap [<map.value>] : Object | provenance | MaD:122 |
 | Test.java:6356:10:6356:11 | in : ImmutableMultimap [<map.value>] : Object | Test.java:6356:10:6356:27 | removeAll(...) : Collection [<element>] : Object | provenance | MaD:381 |
 | Test.java:6356:10:6356:27 | removeAll(...) : Collection [<element>] : Object | Test.java:6357:20:6357:22 | out : Collection [<element>] : Object | provenance |  |
 | Test.java:6357:20:6357:22 | out : Collection [<element>] : Object | Test.java:110:19:110:32 | it : Collection [<element>] : Object | provenance |  |
-| Test.java:6357:20:6357:22 | out : Collection [<element>] : Object | Test.java:6357:9:6357:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:6357:20:6357:22 | out : Collection [<element>] : Object | Test.java:6357:9:6357:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:6362:16:6362:31 | (...)... : Object | Test.java:6363:22:6363:23 | in : Object | provenance |  |
 | Test.java:6362:24:6362:31 | source(...) : Object | Test.java:6362:16:6362:31 | (...)... : Object | provenance |  |
 | Test.java:6363:4:6363:6 | out [post update] : SortedSetMultimap [<map.key>] : Object | Test.java:6364:19:6364:21 | out : SortedSetMultimap [<map.key>] : Object | provenance |  |
-| Test.java:6363:22:6363:23 | in : Object | Test.java:6363:4:6363:6 | out [post update] : SortedSetMultimap [<map.key>] : Object | provenance | MaD:383 |
+| Test.java:6363:22:6363:23 | in : Object | Test.java:6363:4:6363:6 | out [post update] : SortedSetMultimap [<map.key>] : Object | provenance | MaD:382 |
 | Test.java:6364:19:6364:21 | out : SortedSetMultimap [<map.key>] : Object | Test.java:100:18:100:34 | map : SortedSetMultimap [<map.key>] : Object | provenance |  |
 | Test.java:6364:19:6364:21 | out : SortedSetMultimap [<map.key>] : Object | Test.java:6364:9:6364:22 | getMapKey(...) | provenance | MaD:373 |
 | Test.java:6369:16:6369:31 | (...)... : Object | Test.java:6370:22:6370:23 | in : Object | provenance |  |
 | Test.java:6369:24:6369:31 | source(...) : Object | Test.java:6369:16:6369:31 | (...)... : Object | provenance |  |
 | Test.java:6370:4:6370:6 | out [post update] : SetMultimap [<map.key>] : Object | Test.java:6371:19:6371:21 | out : SetMultimap [<map.key>] : Object | provenance |  |
-| Test.java:6370:22:6370:23 | in : Object | Test.java:6370:4:6370:6 | out [post update] : SetMultimap [<map.key>] : Object | provenance | MaD:383 |
+| Test.java:6370:22:6370:23 | in : Object | Test.java:6370:4:6370:6 | out [post update] : SetMultimap [<map.key>] : Object | provenance | MaD:382 |
 | Test.java:6371:19:6371:21 | out : SetMultimap [<map.key>] : Object | Test.java:100:18:100:34 | map : SetMultimap [<map.key>] : Object | provenance |  |
 | Test.java:6371:19:6371:21 | out : SetMultimap [<map.key>] : Object | Test.java:6371:9:6371:22 | getMapKey(...) | provenance | MaD:373 |
 | Test.java:6376:16:6376:31 | (...)... : Object | Test.java:6377:22:6377:23 | in : Object | provenance |  |
 | Test.java:6376:24:6376:31 | source(...) : Object | Test.java:6376:16:6376:31 | (...)... : Object | provenance |  |
 | Test.java:6377:4:6377:6 | out [post update] : Multimap [<map.key>] : Object | Test.java:6378:19:6378:21 | out : Multimap [<map.key>] : Object | provenance |  |
-| Test.java:6377:22:6377:23 | in : Object | Test.java:6377:4:6377:6 | out [post update] : Multimap [<map.key>] : Object | provenance | MaD:383 |
+| Test.java:6377:22:6377:23 | in : Object | Test.java:6377:4:6377:6 | out [post update] : Multimap [<map.key>] : Object | provenance | MaD:382 |
 | Test.java:6378:19:6378:21 | out : Multimap [<map.key>] : Object | Test.java:100:18:100:34 | map : Multimap [<map.key>] : Object | provenance |  |
 | Test.java:6378:19:6378:21 | out : Multimap [<map.key>] : Object | Test.java:6378:9:6378:22 | getMapKey(...) | provenance | MaD:373 |
 | Test.java:6383:16:6383:31 | (...)... : Object | Test.java:6384:22:6384:23 | in : Object | provenance |  |
 | Test.java:6383:24:6383:31 | source(...) : Object | Test.java:6383:16:6383:31 | (...)... : Object | provenance |  |
 | Test.java:6384:4:6384:6 | out [post update] : ListMultimap [<map.key>] : Object | Test.java:6385:19:6385:21 | out : ListMultimap [<map.key>] : Object | provenance |  |
-| Test.java:6384:22:6384:23 | in : Object | Test.java:6384:4:6384:6 | out [post update] : ListMultimap [<map.key>] : Object | provenance | MaD:383 |
+| Test.java:6384:22:6384:23 | in : Object | Test.java:6384:4:6384:6 | out [post update] : ListMultimap [<map.key>] : Object | provenance | MaD:382 |
 | Test.java:6385:19:6385:21 | out : ListMultimap [<map.key>] : Object | Test.java:100:18:100:34 | map : ListMultimap [<map.key>] : Object | provenance |  |
 | Test.java:6385:19:6385:21 | out : ListMultimap [<map.key>] : Object | Test.java:6385:9:6385:22 | getMapKey(...) | provenance | MaD:373 |
 | Test.java:6390:16:6390:31 | (...)... : Object | Test.java:6391:22:6391:23 | in : Object | provenance |  |
 | Test.java:6390:24:6390:31 | source(...) : Object | Test.java:6390:16:6390:31 | (...)... : Object | provenance |  |
 | Test.java:6391:4:6391:6 | out [post update] : LinkedListMultimap [<map.key>] : Object | Test.java:6392:19:6392:21 | out : LinkedListMultimap [<map.key>] : Object | provenance |  |
-| Test.java:6391:22:6391:23 | in : Object | Test.java:6391:4:6391:6 | out [post update] : LinkedListMultimap [<map.key>] : Object | provenance | MaD:383 |
+| Test.java:6391:22:6391:23 | in : Object | Test.java:6391:4:6391:6 | out [post update] : LinkedListMultimap [<map.key>] : Object | provenance | MaD:382 |
 | Test.java:6392:19:6392:21 | out : LinkedListMultimap [<map.key>] : Object | Test.java:100:18:100:34 | map : LinkedListMultimap [<map.key>] : Object | provenance |  |
 | Test.java:6392:19:6392:21 | out : LinkedListMultimap [<map.key>] : Object | Test.java:6392:9:6392:22 | getMapKey(...) | provenance | MaD:373 |
 | Test.java:6397:16:6397:31 | (...)... : Object | Test.java:6398:22:6398:23 | in : Object | provenance |  |
 | Test.java:6397:24:6397:31 | source(...) : Object | Test.java:6397:16:6397:31 | (...)... : Object | provenance |  |
 | Test.java:6398:4:6398:6 | out [post update] : LinkedHashMultimap [<map.key>] : Object | Test.java:6399:19:6399:21 | out : LinkedHashMultimap [<map.key>] : Object | provenance |  |
-| Test.java:6398:22:6398:23 | in : Object | Test.java:6398:4:6398:6 | out [post update] : LinkedHashMultimap [<map.key>] : Object | provenance | MaD:383 |
+| Test.java:6398:22:6398:23 | in : Object | Test.java:6398:4:6398:6 | out [post update] : LinkedHashMultimap [<map.key>] : Object | provenance | MaD:382 |
 | Test.java:6399:19:6399:21 | out : LinkedHashMultimap [<map.key>] : Object | Test.java:100:18:100:34 | map : LinkedHashMultimap [<map.key>] : Object | provenance |  |
 | Test.java:6399:19:6399:21 | out : LinkedHashMultimap [<map.key>] : Object | Test.java:6399:9:6399:22 | getMapKey(...) | provenance | MaD:373 |
 | Test.java:6404:16:6404:31 | (...)... : Object | Test.java:6405:22:6405:23 | in : Object | provenance |  |
 | Test.java:6404:24:6404:31 | source(...) : Object | Test.java:6404:16:6404:31 | (...)... : Object | provenance |  |
 | Test.java:6405:4:6405:6 | out [post update] : ImmutableSetMultimap [<map.key>] : Object | Test.java:6406:19:6406:21 | out : ImmutableSetMultimap [<map.key>] : Object | provenance |  |
-| Test.java:6405:22:6405:23 | in : Object | Test.java:6405:4:6405:6 | out [post update] : ImmutableSetMultimap [<map.key>] : Object | provenance | MaD:383 |
+| Test.java:6405:22:6405:23 | in : Object | Test.java:6405:4:6405:6 | out [post update] : ImmutableSetMultimap [<map.key>] : Object | provenance | MaD:382 |
 | Test.java:6406:19:6406:21 | out : ImmutableSetMultimap [<map.key>] : Object | Test.java:100:18:100:34 | map : ImmutableSetMultimap [<map.key>] : Object | provenance |  |
 | Test.java:6406:19:6406:21 | out : ImmutableSetMultimap [<map.key>] : Object | Test.java:6406:9:6406:22 | getMapKey(...) | provenance | MaD:373 |
 | Test.java:6411:16:6411:31 | (...)... : Object | Test.java:6412:22:6412:23 | in : Object | provenance |  |
 | Test.java:6411:24:6411:31 | source(...) : Object | Test.java:6411:16:6411:31 | (...)... : Object | provenance |  |
 | Test.java:6412:4:6412:6 | out [post update] : ImmutableMultimap [<map.key>] : Object | Test.java:6413:19:6413:21 | out : ImmutableMultimap [<map.key>] : Object | provenance |  |
-| Test.java:6412:22:6412:23 | in : Object | Test.java:6412:4:6412:6 | out [post update] : ImmutableMultimap [<map.key>] : Object | provenance | MaD:383 |
+| Test.java:6412:22:6412:23 | in : Object | Test.java:6412:4:6412:6 | out [post update] : ImmutableMultimap [<map.key>] : Object | provenance | MaD:382 |
 | Test.java:6413:19:6413:21 | out : ImmutableMultimap [<map.key>] : Object | Test.java:100:18:100:34 | map : ImmutableMultimap [<map.key>] : Object | provenance |  |
 | Test.java:6413:19:6413:21 | out : ImmutableMultimap [<map.key>] : Object | Test.java:6413:9:6413:22 | getMapKey(...) | provenance | MaD:373 |
 | Test.java:6418:16:6418:31 | (...)... : Object | Test.java:6419:22:6419:23 | in : Object | provenance |  |
 | Test.java:6418:24:6418:31 | source(...) : Object | Test.java:6418:16:6418:31 | (...)... : Object | provenance |  |
 | Test.java:6419:4:6419:6 | out [post update] : ImmutableListMultimap [<map.key>] : Object | Test.java:6420:19:6420:21 | out : ImmutableListMultimap [<map.key>] : Object | provenance |  |
-| Test.java:6419:22:6419:23 | in : Object | Test.java:6419:4:6419:6 | out [post update] : ImmutableListMultimap [<map.key>] : Object | provenance | MaD:383 |
+| Test.java:6419:22:6419:23 | in : Object | Test.java:6419:4:6419:6 | out [post update] : ImmutableListMultimap [<map.key>] : Object | provenance | MaD:382 |
 | Test.java:6420:19:6420:21 | out : ImmutableListMultimap [<map.key>] : Object | Test.java:100:18:100:34 | map : ImmutableListMultimap [<map.key>] : Object | provenance |  |
 | Test.java:6420:19:6420:21 | out : ImmutableListMultimap [<map.key>] : Object | Test.java:6420:9:6420:22 | getMapKey(...) | provenance | MaD:373 |
 | Test.java:6425:18:6425:44 | (...)... : List [<element>] : Object | Test.java:6426:28:6426:29 | in : List [<element>] : Object | provenance |  |
 | Test.java:6425:28:6425:44 | of(...) : List [<element>] : Object | Test.java:6425:18:6425:44 | (...)... : List [<element>] : Object | provenance |  |
-| Test.java:6425:36:6425:43 | source(...) : Object | Test.java:6425:28:6425:44 | of(...) : List [<element>] : Object | provenance | MaD:558 |
+| Test.java:6425:36:6425:43 | source(...) : Object | Test.java:6425:28:6425:44 | of(...) : List [<element>] : Object | provenance | MaD:561 |
 | Test.java:6426:4:6426:6 | out [post update] : SortedSetMultimap [<map.value>] : Object | Test.java:6427:21:6427:23 | out : SortedSetMultimap [<map.value>] : Object | provenance |  |
-| Test.java:6426:28:6426:29 | in : List [<element>] : Object | Test.java:6426:4:6426:6 | out [post update] : SortedSetMultimap [<map.value>] : Object | provenance | MaD:384 |
+| Test.java:6426:28:6426:29 | in : List [<element>] : Object | Test.java:6426:4:6426:6 | out [post update] : SortedSetMultimap [<map.value>] : Object | provenance | MaD:383 |
 | Test.java:6427:21:6427:23 | out : SortedSetMultimap [<map.value>] : Object | Test.java:119:20:119:36 | map : SortedSetMultimap [<map.value>] : Object | provenance |  |
 | Test.java:6427:21:6427:23 | out : SortedSetMultimap [<map.value>] : Object | Test.java:6427:9:6427:24 | getMapValue(...) | provenance | MaD:385 |
 | Test.java:6432:18:6432:44 | (...)... : List [<element>] : Object | Test.java:6433:28:6433:29 | in : List [<element>] : Object | provenance |  |
 | Test.java:6432:28:6432:44 | of(...) : List [<element>] : Object | Test.java:6432:18:6432:44 | (...)... : List [<element>] : Object | provenance |  |
-| Test.java:6432:36:6432:43 | source(...) : Object | Test.java:6432:28:6432:44 | of(...) : List [<element>] : Object | provenance | MaD:558 |
+| Test.java:6432:36:6432:43 | source(...) : Object | Test.java:6432:28:6432:44 | of(...) : List [<element>] : Object | provenance | MaD:561 |
 | Test.java:6433:4:6433:6 | out [post update] : SetMultimap [<map.value>] : Object | Test.java:6434:21:6434:23 | out : SetMultimap [<map.value>] : Object | provenance |  |
-| Test.java:6433:28:6433:29 | in : List [<element>] : Object | Test.java:6433:4:6433:6 | out [post update] : SetMultimap [<map.value>] : Object | provenance | MaD:384 |
+| Test.java:6433:28:6433:29 | in : List [<element>] : Object | Test.java:6433:4:6433:6 | out [post update] : SetMultimap [<map.value>] : Object | provenance | MaD:383 |
 | Test.java:6434:21:6434:23 | out : SetMultimap [<map.value>] : Object | Test.java:119:20:119:36 | map : SetMultimap [<map.value>] : Object | provenance |  |
 | Test.java:6434:21:6434:23 | out : SetMultimap [<map.value>] : Object | Test.java:6434:9:6434:24 | getMapValue(...) | provenance | MaD:385 |
 | Test.java:6439:18:6439:44 | (...)... : List [<element>] : Object | Test.java:6440:28:6440:29 | in : List [<element>] : Object | provenance |  |
 | Test.java:6439:28:6439:44 | of(...) : List [<element>] : Object | Test.java:6439:18:6439:44 | (...)... : List [<element>] : Object | provenance |  |
-| Test.java:6439:36:6439:43 | source(...) : Object | Test.java:6439:28:6439:44 | of(...) : List [<element>] : Object | provenance | MaD:558 |
+| Test.java:6439:36:6439:43 | source(...) : Object | Test.java:6439:28:6439:44 | of(...) : List [<element>] : Object | provenance | MaD:561 |
 | Test.java:6440:4:6440:6 | out [post update] : Multimap [<map.value>] : Object | Test.java:6441:21:6441:23 | out : Multimap [<map.value>] : Object | provenance |  |
-| Test.java:6440:28:6440:29 | in : List [<element>] : Object | Test.java:6440:4:6440:6 | out [post update] : Multimap [<map.value>] : Object | provenance | MaD:384 |
+| Test.java:6440:28:6440:29 | in : List [<element>] : Object | Test.java:6440:4:6440:6 | out [post update] : Multimap [<map.value>] : Object | provenance | MaD:383 |
 | Test.java:6441:21:6441:23 | out : Multimap [<map.value>] : Object | Test.java:119:20:119:36 | map : Multimap [<map.value>] : Object | provenance |  |
 | Test.java:6441:21:6441:23 | out : Multimap [<map.value>] : Object | Test.java:6441:9:6441:24 | getMapValue(...) | provenance | MaD:385 |
 | Test.java:6446:18:6446:44 | (...)... : List [<element>] : Object | Test.java:6447:28:6447:29 | in : List [<element>] : Object | provenance |  |
 | Test.java:6446:28:6446:44 | of(...) : List [<element>] : Object | Test.java:6446:18:6446:44 | (...)... : List [<element>] : Object | provenance |  |
-| Test.java:6446:36:6446:43 | source(...) : Object | Test.java:6446:28:6446:44 | of(...) : List [<element>] : Object | provenance | MaD:558 |
+| Test.java:6446:36:6446:43 | source(...) : Object | Test.java:6446:28:6446:44 | of(...) : List [<element>] : Object | provenance | MaD:561 |
 | Test.java:6447:4:6447:6 | out [post update] : ListMultimap [<map.value>] : Object | Test.java:6448:21:6448:23 | out : ListMultimap [<map.value>] : Object | provenance |  |
-| Test.java:6447:28:6447:29 | in : List [<element>] : Object | Test.java:6447:4:6447:6 | out [post update] : ListMultimap [<map.value>] : Object | provenance | MaD:384 |
+| Test.java:6447:28:6447:29 | in : List [<element>] : Object | Test.java:6447:4:6447:6 | out [post update] : ListMultimap [<map.value>] : Object | provenance | MaD:383 |
 | Test.java:6448:21:6448:23 | out : ListMultimap [<map.value>] : Object | Test.java:119:20:119:36 | map : ListMultimap [<map.value>] : Object | provenance |  |
 | Test.java:6448:21:6448:23 | out : ListMultimap [<map.value>] : Object | Test.java:6448:9:6448:24 | getMapValue(...) | provenance | MaD:385 |
 | Test.java:6453:18:6453:44 | (...)... : List [<element>] : Object | Test.java:6454:28:6454:29 | in : List [<element>] : Object | provenance |  |
 | Test.java:6453:28:6453:44 | of(...) : List [<element>] : Object | Test.java:6453:18:6453:44 | (...)... : List [<element>] : Object | provenance |  |
-| Test.java:6453:36:6453:43 | source(...) : Object | Test.java:6453:28:6453:44 | of(...) : List [<element>] : Object | provenance | MaD:558 |
+| Test.java:6453:36:6453:43 | source(...) : Object | Test.java:6453:28:6453:44 | of(...) : List [<element>] : Object | provenance | MaD:561 |
 | Test.java:6454:4:6454:6 | out [post update] : LinkedListMultimap [<map.value>] : Object | Test.java:6455:21:6455:23 | out : LinkedListMultimap [<map.value>] : Object | provenance |  |
-| Test.java:6454:28:6454:29 | in : List [<element>] : Object | Test.java:6454:4:6454:6 | out [post update] : LinkedListMultimap [<map.value>] : Object | provenance | MaD:384 |
+| Test.java:6454:28:6454:29 | in : List [<element>] : Object | Test.java:6454:4:6454:6 | out [post update] : LinkedListMultimap [<map.value>] : Object | provenance | MaD:383 |
 | Test.java:6455:21:6455:23 | out : LinkedListMultimap [<map.value>] : Object | Test.java:119:20:119:36 | map : LinkedListMultimap [<map.value>] : Object | provenance |  |
 | Test.java:6455:21:6455:23 | out : LinkedListMultimap [<map.value>] : Object | Test.java:6455:9:6455:24 | getMapValue(...) | provenance | MaD:385 |
 | Test.java:6460:18:6460:44 | (...)... : List [<element>] : Object | Test.java:6461:28:6461:29 | in : List [<element>] : Object | provenance |  |
 | Test.java:6460:28:6460:44 | of(...) : List [<element>] : Object | Test.java:6460:18:6460:44 | (...)... : List [<element>] : Object | provenance |  |
-| Test.java:6460:36:6460:43 | source(...) : Object | Test.java:6460:28:6460:44 | of(...) : List [<element>] : Object | provenance | MaD:558 |
+| Test.java:6460:36:6460:43 | source(...) : Object | Test.java:6460:28:6460:44 | of(...) : List [<element>] : Object | provenance | MaD:561 |
 | Test.java:6461:4:6461:6 | out [post update] : LinkedHashMultimap [<map.value>] : Object | Test.java:6462:21:6462:23 | out : LinkedHashMultimap [<map.value>] : Object | provenance |  |
-| Test.java:6461:28:6461:29 | in : List [<element>] : Object | Test.java:6461:4:6461:6 | out [post update] : LinkedHashMultimap [<map.value>] : Object | provenance | MaD:384 |
+| Test.java:6461:28:6461:29 | in : List [<element>] : Object | Test.java:6461:4:6461:6 | out [post update] : LinkedHashMultimap [<map.value>] : Object | provenance | MaD:383 |
 | Test.java:6462:21:6462:23 | out : LinkedHashMultimap [<map.value>] : Object | Test.java:119:20:119:36 | map : LinkedHashMultimap [<map.value>] : Object | provenance |  |
 | Test.java:6462:21:6462:23 | out : LinkedHashMultimap [<map.value>] : Object | Test.java:6462:9:6462:24 | getMapValue(...) | provenance | MaD:385 |
 | Test.java:6467:18:6467:44 | (...)... : List [<element>] : Object | Test.java:6468:28:6468:29 | in : List [<element>] : Object | provenance |  |
 | Test.java:6467:28:6467:44 | of(...) : List [<element>] : Object | Test.java:6467:18:6467:44 | (...)... : List [<element>] : Object | provenance |  |
-| Test.java:6467:36:6467:43 | source(...) : Object | Test.java:6467:28:6467:44 | of(...) : List [<element>] : Object | provenance | MaD:558 |
+| Test.java:6467:36:6467:43 | source(...) : Object | Test.java:6467:28:6467:44 | of(...) : List [<element>] : Object | provenance | MaD:561 |
 | Test.java:6468:4:6468:6 | out [post update] : ImmutableSetMultimap [<map.value>] : Object | Test.java:6469:21:6469:23 | out : ImmutableSetMultimap [<map.value>] : Object | provenance |  |
-| Test.java:6468:28:6468:29 | in : List [<element>] : Object | Test.java:6468:4:6468:6 | out [post update] : ImmutableSetMultimap [<map.value>] : Object | provenance | MaD:384 |
+| Test.java:6468:28:6468:29 | in : List [<element>] : Object | Test.java:6468:4:6468:6 | out [post update] : ImmutableSetMultimap [<map.value>] : Object | provenance | MaD:383 |
 | Test.java:6469:21:6469:23 | out : ImmutableSetMultimap [<map.value>] : Object | Test.java:119:20:119:36 | map : ImmutableSetMultimap [<map.value>] : Object | provenance |  |
 | Test.java:6469:21:6469:23 | out : ImmutableSetMultimap [<map.value>] : Object | Test.java:6469:9:6469:24 | getMapValue(...) | provenance | MaD:385 |
 | Test.java:6474:18:6474:44 | (...)... : List [<element>] : Object | Test.java:6475:28:6475:29 | in : List [<element>] : Object | provenance |  |
 | Test.java:6474:28:6474:44 | of(...) : List [<element>] : Object | Test.java:6474:18:6474:44 | (...)... : List [<element>] : Object | provenance |  |
-| Test.java:6474:36:6474:43 | source(...) : Object | Test.java:6474:28:6474:44 | of(...) : List [<element>] : Object | provenance | MaD:558 |
+| Test.java:6474:36:6474:43 | source(...) : Object | Test.java:6474:28:6474:44 | of(...) : List [<element>] : Object | provenance | MaD:561 |
 | Test.java:6475:4:6475:6 | out [post update] : ImmutableMultimap [<map.value>] : Object | Test.java:6476:21:6476:23 | out : ImmutableMultimap [<map.value>] : Object | provenance |  |
-| Test.java:6475:28:6475:29 | in : List [<element>] : Object | Test.java:6475:4:6475:6 | out [post update] : ImmutableMultimap [<map.value>] : Object | provenance | MaD:384 |
+| Test.java:6475:28:6475:29 | in : List [<element>] : Object | Test.java:6475:4:6475:6 | out [post update] : ImmutableMultimap [<map.value>] : Object | provenance | MaD:383 |
 | Test.java:6476:21:6476:23 | out : ImmutableMultimap [<map.value>] : Object | Test.java:119:20:119:36 | map : ImmutableMultimap [<map.value>] : Object | provenance |  |
 | Test.java:6476:21:6476:23 | out : ImmutableMultimap [<map.value>] : Object | Test.java:6476:9:6476:24 | getMapValue(...) | provenance | MaD:385 |
 | Test.java:6481:18:6481:44 | (...)... : List [<element>] : Object | Test.java:6482:28:6482:29 | in : List [<element>] : Object | provenance |  |
 | Test.java:6481:28:6481:44 | of(...) : List [<element>] : Object | Test.java:6481:18:6481:44 | (...)... : List [<element>] : Object | provenance |  |
-| Test.java:6481:36:6481:43 | source(...) : Object | Test.java:6481:28:6481:44 | of(...) : List [<element>] : Object | provenance | MaD:558 |
+| Test.java:6481:36:6481:43 | source(...) : Object | Test.java:6481:28:6481:44 | of(...) : List [<element>] : Object | provenance | MaD:561 |
 | Test.java:6482:4:6482:6 | out [post update] : ImmutableListMultimap [<map.value>] : Object | Test.java:6483:21:6483:23 | out : ImmutableListMultimap [<map.value>] : Object | provenance |  |
-| Test.java:6482:28:6482:29 | in : List [<element>] : Object | Test.java:6482:4:6482:6 | out [post update] : ImmutableListMultimap [<map.value>] : Object | provenance | MaD:384 |
+| Test.java:6482:28:6482:29 | in : List [<element>] : Object | Test.java:6482:4:6482:6 | out [post update] : ImmutableListMultimap [<map.value>] : Object | provenance | MaD:383 |
 | Test.java:6483:21:6483:23 | out : ImmutableListMultimap [<map.value>] : Object | Test.java:119:20:119:36 | map : ImmutableListMultimap [<map.value>] : Object | provenance |  |
 | Test.java:6483:21:6483:23 | out : ImmutableListMultimap [<map.value>] : Object | Test.java:6483:9:6483:24 | getMapValue(...) | provenance | MaD:385 |
 | Test.java:6488:27:6488:114 | (...)... : TreeMultimap [<map.value>] : Comparable | Test.java:6489:10:6489:11 | in : TreeMultimap [<map.value>] : Comparable | provenance |  |
 | Test.java:6488:46:6488:114 | create(...) : TreeMultimap [<map.value>] : Comparable | Test.java:6488:27:6488:114 | (...)... : TreeMultimap [<map.value>] : Comparable | provenance |  |
 | Test.java:6488:66:6488:113 | of(...) : ImmutableMultimap [<map.value>] : Comparable | Test.java:6488:46:6488:114 | create(...) : TreeMultimap [<map.value>] : Comparable | provenance | MaD:553 |
-| Test.java:6488:93:6488:112 | (...)... : Comparable | Test.java:6488:66:6488:113 | of(...) : ImmutableMultimap [<map.value>] : Comparable | provenance | MaD:104 |
+| Test.java:6488:93:6488:112 | (...)... : Comparable | Test.java:6488:66:6488:113 | of(...) : ImmutableMultimap [<map.value>] : Comparable | provenance | MaD:122 |
 | Test.java:6488:105:6488:112 | source(...) : Object | Test.java:6488:93:6488:112 | (...)... : Comparable | provenance |  |
-| Test.java:6489:10:6489:11 | in : TreeMultimap [<map.value>] : Comparable | Test.java:6489:10:6489:37 | replaceValues(...) : SortedSet [<element>] : Comparable | provenance | MaD:382 |
+| Test.java:6489:10:6489:11 | in : TreeMultimap [<map.value>] : Comparable | Test.java:6489:10:6489:37 | replaceValues(...) : SortedSet [<element>] : Comparable | provenance | MaD:384 |
 | Test.java:6489:10:6489:37 | replaceValues(...) : SortedSet [<element>] : Comparable | Test.java:6490:20:6490:22 | out : SortedSet [<element>] : Comparable | provenance |  |
 | Test.java:6490:20:6490:22 | out : SortedSet [<element>] : Comparable | Test.java:110:19:110:32 | it : SortedSet [<element>] : Comparable | provenance |  |
-| Test.java:6490:20:6490:22 | out : SortedSet [<element>] : Comparable | Test.java:6490:9:6490:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:6490:20:6490:22 | out : SortedSet [<element>] : Comparable | Test.java:6490:9:6490:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:6495:21:6495:72 | (...)... : ImmutableSetMultimap [<map.value>] : Object | Test.java:6496:10:6496:11 | in : ImmutableSetMultimap [<map.value>] : Object | provenance |  |
 | Test.java:6495:34:6495:72 | of(...) : ImmutableSetMultimap [<map.value>] : Object | Test.java:6495:21:6495:72 | (...)... : ImmutableSetMultimap [<map.value>] : Object | provenance |  |
 | Test.java:6495:64:6495:71 | source(...) : Object | Test.java:6495:34:6495:72 | of(...) : ImmutableSetMultimap [<map.value>] : Object | provenance | MaD:146 |
-| Test.java:6496:10:6496:11 | in : ImmutableSetMultimap [<map.value>] : Object | Test.java:6496:10:6496:37 | replaceValues(...) : Set [<element>] : Object | provenance | MaD:382 |
+| Test.java:6496:10:6496:11 | in : ImmutableSetMultimap [<map.value>] : Object | Test.java:6496:10:6496:37 | replaceValues(...) : Set [<element>] : Object | provenance | MaD:384 |
 | Test.java:6496:10:6496:37 | replaceValues(...) : Set [<element>] : Object | Test.java:6497:20:6497:22 | out : Set [<element>] : Object | provenance |  |
 | Test.java:6497:20:6497:22 | out : Set [<element>] : Object | Test.java:110:19:110:32 | it : Set [<element>] : Object | provenance |  |
-| Test.java:6497:20:6497:22 | out : Set [<element>] : Object | Test.java:6497:9:6497:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:6497:20:6497:22 | out : Set [<element>] : Object | Test.java:6497:9:6497:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:6502:28:6502:110 | (...)... : LinkedHashMultimap [<map.value>] : Object | Test.java:6503:10:6503:11 | in : LinkedHashMultimap [<map.value>] : Object | provenance |  |
 | Test.java:6502:48:6502:110 | create(...) : LinkedHashMultimap [<map.value>] : Object | Test.java:6502:28:6502:110 | (...)... : LinkedHashMultimap [<map.value>] : Object | provenance |  |
 | Test.java:6502:74:6502:109 | of(...) : ImmutableMultimap [<map.value>] : Object | Test.java:6502:48:6502:110 | create(...) : LinkedHashMultimap [<map.value>] : Object | provenance | MaD:288 |
-| Test.java:6502:101:6502:108 | source(...) : Object | Test.java:6502:74:6502:109 | of(...) : ImmutableMultimap [<map.value>] : Object | provenance | MaD:104 |
-| Test.java:6503:10:6503:11 | in : LinkedHashMultimap [<map.value>] : Object | Test.java:6503:10:6503:37 | replaceValues(...) : Set [<element>] : Object | provenance | MaD:382 |
+| Test.java:6502:101:6502:108 | source(...) : Object | Test.java:6502:74:6502:109 | of(...) : ImmutableMultimap [<map.value>] : Object | provenance | MaD:122 |
+| Test.java:6503:10:6503:11 | in : LinkedHashMultimap [<map.value>] : Object | Test.java:6503:10:6503:37 | replaceValues(...) : Set [<element>] : Object | provenance | MaD:384 |
 | Test.java:6503:10:6503:37 | replaceValues(...) : Set [<element>] : Object | Test.java:6504:20:6504:22 | out : Set [<element>] : Object | provenance |  |
 | Test.java:6504:20:6504:22 | out : Set [<element>] : Object | Test.java:110:19:110:32 | it : Set [<element>] : Object | provenance |  |
-| Test.java:6504:20:6504:22 | out : Set [<element>] : Object | Test.java:6504:9:6504:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:6504:20:6504:22 | out : Set [<element>] : Object | Test.java:6504:9:6504:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:6509:22:6509:75 | (...)... : ImmutableListMultimap [<map.value>] : Object | Test.java:6510:10:6510:11 | in : ImmutableListMultimap [<map.value>] : Object | provenance |  |
 | Test.java:6509:36:6509:75 | of(...) : ImmutableListMultimap [<map.value>] : Object | Test.java:6509:22:6509:75 | (...)... : ImmutableListMultimap [<map.value>] : Object | provenance |  |
 | Test.java:6509:67:6509:74 | source(...) : Object | Test.java:6509:36:6509:75 | of(...) : ImmutableListMultimap [<map.value>] : Object | provenance | MaD:61 |
-| Test.java:6510:10:6510:11 | in : ImmutableListMultimap [<map.value>] : Object | Test.java:6510:10:6510:37 | replaceValues(...) : List [<element>] : Object | provenance | MaD:382 |
+| Test.java:6510:10:6510:11 | in : ImmutableListMultimap [<map.value>] : Object | Test.java:6510:10:6510:37 | replaceValues(...) : List [<element>] : Object | provenance | MaD:384 |
 | Test.java:6510:10:6510:37 | replaceValues(...) : List [<element>] : Object | Test.java:6511:20:6511:22 | out : List [<element>] : Object | provenance |  |
 | Test.java:6511:20:6511:22 | out : List [<element>] : Object | Test.java:110:19:110:32 | it : List [<element>] : Object | provenance |  |
-| Test.java:6511:20:6511:22 | out : List [<element>] : Object | Test.java:6511:9:6511:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:6511:20:6511:22 | out : List [<element>] : Object | Test.java:6511:9:6511:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:6516:28:6516:110 | (...)... : LinkedListMultimap [<map.value>] : Object | Test.java:6517:10:6517:11 | in : LinkedListMultimap [<map.value>] : Object | provenance |  |
 | Test.java:6516:48:6516:110 | create(...) : LinkedListMultimap [<map.value>] : Object | Test.java:6516:28:6516:110 | (...)... : LinkedListMultimap [<map.value>] : Object | provenance |  |
 | Test.java:6516:74:6516:109 | of(...) : ImmutableMultimap [<map.value>] : Object | Test.java:6516:48:6516:110 | create(...) : LinkedListMultimap [<map.value>] : Object | provenance | MaD:291 |
-| Test.java:6516:101:6516:108 | source(...) : Object | Test.java:6516:74:6516:109 | of(...) : ImmutableMultimap [<map.value>] : Object | provenance | MaD:104 |
-| Test.java:6517:10:6517:11 | in : LinkedListMultimap [<map.value>] : Object | Test.java:6517:10:6517:37 | replaceValues(...) : List [<element>] : Object | provenance | MaD:382 |
+| Test.java:6516:101:6516:108 | source(...) : Object | Test.java:6516:74:6516:109 | of(...) : ImmutableMultimap [<map.value>] : Object | provenance | MaD:122 |
+| Test.java:6517:10:6517:11 | in : LinkedListMultimap [<map.value>] : Object | Test.java:6517:10:6517:37 | replaceValues(...) : List [<element>] : Object | provenance | MaD:384 |
 | Test.java:6517:10:6517:37 | replaceValues(...) : List [<element>] : Object | Test.java:6518:20:6518:22 | out : List [<element>] : Object | provenance |  |
 | Test.java:6518:20:6518:22 | out : List [<element>] : Object | Test.java:110:19:110:32 | it : List [<element>] : Object | provenance |  |
-| Test.java:6518:20:6518:22 | out : List [<element>] : Object | Test.java:6518:9:6518:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:6518:20:6518:22 | out : List [<element>] : Object | Test.java:6518:9:6518:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:6523:30:6523:90 | (...)... : ImmutableSetMultimap [<map.value>] : Object | Test.java:6524:10:6524:11 | in : ImmutableSetMultimap [<map.value>] : Object | provenance |  |
 | Test.java:6523:52:6523:90 | of(...) : ImmutableSetMultimap [<map.value>] : Object | Test.java:6523:30:6523:90 | (...)... : ImmutableSetMultimap [<map.value>] : Object | provenance |  |
 | Test.java:6523:82:6523:89 | source(...) : Object | Test.java:6523:52:6523:90 | of(...) : ImmutableSetMultimap [<map.value>] : Object | provenance | MaD:146 |
-| Test.java:6524:10:6524:11 | in : ImmutableSetMultimap [<map.value>] : Object | Test.java:6524:10:6524:37 | replaceValues(...) : ImmutableSet [<element>] : Object | provenance | MaD:382 |
+| Test.java:6524:10:6524:11 | in : ImmutableSetMultimap [<map.value>] : Object | Test.java:6524:10:6524:37 | replaceValues(...) : ImmutableSet [<element>] : Object | provenance | MaD:384 |
 | Test.java:6524:10:6524:37 | replaceValues(...) : ImmutableSet [<element>] : Object | Test.java:6525:20:6525:22 | out : ImmutableSet [<element>] : Object | provenance |  |
 | Test.java:6525:20:6525:22 | out : ImmutableSet [<element>] : Object | Test.java:110:19:110:32 | it : ImmutableSet [<element>] : Object | provenance |  |
-| Test.java:6525:20:6525:22 | out : ImmutableSet [<element>] : Object | Test.java:6525:9:6525:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:6525:20:6525:22 | out : ImmutableSet [<element>] : Object | Test.java:6525:9:6525:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:6530:31:6530:93 | (...)... : ImmutableListMultimap [<map.value>] : Object | Test.java:6531:10:6531:11 | in : ImmutableListMultimap [<map.value>] : Object | provenance |  |
 | Test.java:6530:54:6530:93 | of(...) : ImmutableListMultimap [<map.value>] : Object | Test.java:6530:31:6530:93 | (...)... : ImmutableListMultimap [<map.value>] : Object | provenance |  |
 | Test.java:6530:85:6530:92 | source(...) : Object | Test.java:6530:54:6530:93 | of(...) : ImmutableListMultimap [<map.value>] : Object | provenance | MaD:61 |
-| Test.java:6531:10:6531:11 | in : ImmutableListMultimap [<map.value>] : Object | Test.java:6531:10:6531:37 | replaceValues(...) : ImmutableList [<element>] : Object | provenance | MaD:382 |
+| Test.java:6531:10:6531:11 | in : ImmutableListMultimap [<map.value>] : Object | Test.java:6531:10:6531:37 | replaceValues(...) : ImmutableList [<element>] : Object | provenance | MaD:384 |
 | Test.java:6531:10:6531:37 | replaceValues(...) : ImmutableList [<element>] : Object | Test.java:6532:20:6532:22 | out : ImmutableList [<element>] : Object | provenance |  |
 | Test.java:6532:20:6532:22 | out : ImmutableList [<element>] : Object | Test.java:110:19:110:32 | it : ImmutableList [<element>] : Object | provenance |  |
-| Test.java:6532:20:6532:22 | out : ImmutableList [<element>] : Object | Test.java:6532:9:6532:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:6532:20:6532:22 | out : ImmutableList [<element>] : Object | Test.java:6532:9:6532:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:6537:27:6537:81 | (...)... : ImmutableMultimap [<map.value>] : Object | Test.java:6538:10:6538:11 | in : ImmutableMultimap [<map.value>] : Object | provenance |  |
 | Test.java:6537:46:6537:81 | of(...) : ImmutableMultimap [<map.value>] : Object | Test.java:6537:27:6537:81 | (...)... : ImmutableMultimap [<map.value>] : Object | provenance |  |
-| Test.java:6537:73:6537:80 | source(...) : Object | Test.java:6537:46:6537:81 | of(...) : ImmutableMultimap [<map.value>] : Object | provenance | MaD:104 |
-| Test.java:6538:10:6538:11 | in : ImmutableMultimap [<map.value>] : Object | Test.java:6538:10:6538:37 | replaceValues(...) : ImmutableCollection [<element>] : Object | provenance | MaD:382 |
+| Test.java:6537:73:6537:80 | source(...) : Object | Test.java:6537:46:6537:81 | of(...) : ImmutableMultimap [<map.value>] : Object | provenance | MaD:122 |
+| Test.java:6538:10:6538:11 | in : ImmutableMultimap [<map.value>] : Object | Test.java:6538:10:6538:37 | replaceValues(...) : ImmutableCollection [<element>] : Object | provenance | MaD:384 |
 | Test.java:6538:10:6538:37 | replaceValues(...) : ImmutableCollection [<element>] : Object | Test.java:6539:20:6539:22 | out : ImmutableCollection [<element>] : Object | provenance |  |
 | Test.java:6539:20:6539:22 | out : ImmutableCollection [<element>] : Object | Test.java:110:19:110:32 | it : ImmutableCollection [<element>] : Object | provenance |  |
-| Test.java:6539:20:6539:22 | out : ImmutableCollection [<element>] : Object | Test.java:6539:9:6539:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:6539:20:6539:22 | out : ImmutableCollection [<element>] : Object | Test.java:6539:9:6539:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:6544:18:6544:63 | (...)... : ImmutableMultimap [<map.value>] : Object | Test.java:6545:10:6545:11 | in : ImmutableMultimap [<map.value>] : Object | provenance |  |
 | Test.java:6544:28:6544:63 | of(...) : ImmutableMultimap [<map.value>] : Object | Test.java:6544:18:6544:63 | (...)... : ImmutableMultimap [<map.value>] : Object | provenance |  |
-| Test.java:6544:55:6544:62 | source(...) : Object | Test.java:6544:28:6544:63 | of(...) : ImmutableMultimap [<map.value>] : Object | provenance | MaD:104 |
-| Test.java:6545:10:6545:11 | in : ImmutableMultimap [<map.value>] : Object | Test.java:6545:10:6545:37 | replaceValues(...) : Collection [<element>] : Object | provenance | MaD:382 |
+| Test.java:6544:55:6544:62 | source(...) : Object | Test.java:6544:28:6544:63 | of(...) : ImmutableMultimap [<map.value>] : Object | provenance | MaD:122 |
+| Test.java:6545:10:6545:11 | in : ImmutableMultimap [<map.value>] : Object | Test.java:6545:10:6545:37 | replaceValues(...) : Collection [<element>] : Object | provenance | MaD:384 |
 | Test.java:6545:10:6545:37 | replaceValues(...) : Collection [<element>] : Object | Test.java:6546:20:6546:22 | out : Collection [<element>] : Object | provenance |  |
 | Test.java:6546:20:6546:22 | out : Collection [<element>] : Object | Test.java:110:19:110:32 | it : Collection [<element>] : Object | provenance |  |
-| Test.java:6546:20:6546:22 | out : Collection [<element>] : Object | Test.java:6546:9:6546:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:6546:20:6546:22 | out : Collection [<element>] : Object | Test.java:6546:9:6546:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:6551:28:6551:110 | (...)... : LinkedListMultimap [<map.value>] : Object | Test.java:6552:10:6552:11 | in : LinkedListMultimap [<map.value>] : Object | provenance |  |
 | Test.java:6551:48:6551:110 | create(...) : LinkedListMultimap [<map.value>] : Object | Test.java:6551:28:6551:110 | (...)... : LinkedListMultimap [<map.value>] : Object | provenance |  |
 | Test.java:6551:74:6551:109 | of(...) : ImmutableMultimap [<map.value>] : Object | Test.java:6551:48:6551:110 | create(...) : LinkedListMultimap [<map.value>] : Object | provenance | MaD:291 |
-| Test.java:6551:101:6551:108 | source(...) : Object | Test.java:6551:74:6551:109 | of(...) : ImmutableMultimap [<map.value>] : Object | provenance | MaD:104 |
+| Test.java:6551:101:6551:108 | source(...) : Object | Test.java:6551:74:6551:109 | of(...) : ImmutableMultimap [<map.value>] : Object | provenance | MaD:122 |
 | Test.java:6552:10:6552:11 | in : LinkedListMultimap [<map.value>] : Object | Test.java:6552:10:6552:20 | values(...) : List [<element>] : Object | provenance | MaD:385 |
 | Test.java:6552:10:6552:20 | values(...) : List [<element>] : Object | Test.java:6553:20:6553:22 | out : List [<element>] : Object | provenance |  |
 | Test.java:6553:20:6553:22 | out : List [<element>] : Object | Test.java:110:19:110:32 | it : List [<element>] : Object | provenance |  |
-| Test.java:6553:20:6553:22 | out : List [<element>] : Object | Test.java:6553:9:6553:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:6553:20:6553:22 | out : List [<element>] : Object | Test.java:6553:9:6553:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:6558:27:6558:81 | (...)... : ImmutableMultimap [<map.value>] : Object | Test.java:6559:10:6559:11 | in : ImmutableMultimap [<map.value>] : Object | provenance |  |
 | Test.java:6558:46:6558:81 | of(...) : ImmutableMultimap [<map.value>] : Object | Test.java:6558:27:6558:81 | (...)... : ImmutableMultimap [<map.value>] : Object | provenance |  |
-| Test.java:6558:73:6558:80 | source(...) : Object | Test.java:6558:46:6558:81 | of(...) : ImmutableMultimap [<map.value>] : Object | provenance | MaD:104 |
+| Test.java:6558:73:6558:80 | source(...) : Object | Test.java:6558:46:6558:81 | of(...) : ImmutableMultimap [<map.value>] : Object | provenance | MaD:122 |
 | Test.java:6559:10:6559:11 | in : ImmutableMultimap [<map.value>] : Object | Test.java:6559:10:6559:20 | values(...) : ImmutableCollection [<element>] : Object | provenance | MaD:385 |
 | Test.java:6559:10:6559:20 | values(...) : ImmutableCollection [<element>] : Object | Test.java:6560:20:6560:22 | out : ImmutableCollection [<element>] : Object | provenance |  |
 | Test.java:6560:20:6560:22 | out : ImmutableCollection [<element>] : Object | Test.java:110:19:110:32 | it : ImmutableCollection [<element>] : Object | provenance |  |
-| Test.java:6560:20:6560:22 | out : ImmutableCollection [<element>] : Object | Test.java:6560:9:6560:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:6560:20:6560:22 | out : ImmutableCollection [<element>] : Object | Test.java:6560:9:6560:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:6565:18:6565:63 | (...)... : ImmutableMultimap [<map.value>] : Object | Test.java:6566:10:6566:11 | in : ImmutableMultimap [<map.value>] : Object | provenance |  |
 | Test.java:6565:28:6565:63 | of(...) : ImmutableMultimap [<map.value>] : Object | Test.java:6565:18:6565:63 | (...)... : ImmutableMultimap [<map.value>] : Object | provenance |  |
-| Test.java:6565:55:6565:62 | source(...) : Object | Test.java:6565:28:6565:63 | of(...) : ImmutableMultimap [<map.value>] : Object | provenance | MaD:104 |
+| Test.java:6565:55:6565:62 | source(...) : Object | Test.java:6565:28:6565:63 | of(...) : ImmutableMultimap [<map.value>] : Object | provenance | MaD:122 |
 | Test.java:6566:10:6566:11 | in : ImmutableMultimap [<map.value>] : Object | Test.java:6566:10:6566:20 | values(...) : Collection [<element>] : Object | provenance | MaD:385 |
 | Test.java:6566:10:6566:20 | values(...) : Collection [<element>] : Object | Test.java:6567:20:6567:22 | out : Collection [<element>] : Object | provenance |  |
 | Test.java:6567:20:6567:22 | out : Collection [<element>] : Object | Test.java:110:19:110:32 | it : Collection [<element>] : Object | provenance |  |
-| Test.java:6567:20:6567:22 | out : Collection [<element>] : Object | Test.java:6567:9:6567:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:6567:20:6567:22 | out : Collection [<element>] : Object | Test.java:6567:9:6567:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:6572:28:6572:110 | (...)... : LinkedHashMultimap [<map.value>] : Object | Test.java:6573:10:6573:11 | in : LinkedHashMultimap [<map.value>] : Object | provenance |  |
 | Test.java:6572:48:6572:110 | create(...) : LinkedHashMultimap [<map.value>] : Object | Test.java:6572:28:6572:110 | (...)... : LinkedHashMultimap [<map.value>] : Object | provenance |  |
 | Test.java:6572:74:6572:109 | of(...) : ImmutableMultimap [<map.value>] : Object | Test.java:6572:48:6572:110 | create(...) : LinkedHashMultimap [<map.value>] : Object | provenance | MaD:288 |
-| Test.java:6572:101:6572:108 | source(...) : Object | Test.java:6572:74:6572:109 | of(...) : ImmutableMultimap [<map.value>] : Object | provenance | MaD:104 |
+| Test.java:6572:101:6572:108 | source(...) : Object | Test.java:6572:74:6572:109 | of(...) : ImmutableMultimap [<map.value>] : Object | provenance | MaD:122 |
 | Test.java:6573:10:6573:11 | in : LinkedHashMultimap [<map.value>] : Object | Test.java:6573:10:6573:20 | values(...) : Collection [<element>] : Object | provenance | MaD:385 |
 | Test.java:6573:10:6573:20 | values(...) : Collection [<element>] : Object | Test.java:6574:20:6574:22 | out : Collection [<element>] : Object | provenance |  |
 | Test.java:6574:20:6574:22 | out : Collection [<element>] : Object | Test.java:110:19:110:32 | it : Collection [<element>] : Object | provenance |  |
-| Test.java:6574:20:6574:22 | out : Collection [<element>] : Object | Test.java:6574:9:6574:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:6574:20:6574:22 | out : Collection [<element>] : Object | Test.java:6574:9:6574:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:6579:22:6579:75 | (...)... : ImmutableListMultimap [<map.key>] : Object | Test.java:6580:26:6580:27 | in : ImmutableListMultimap [<map.key>] : Object | provenance |  |
 | Test.java:6579:36:6579:75 | of(...) : ImmutableListMultimap [<map.key>] : Object | Test.java:6579:22:6579:75 | (...)... : ImmutableListMultimap [<map.key>] : Object | provenance |  |
 | Test.java:6579:61:6579:68 | source(...) : Object | Test.java:6579:36:6579:75 | of(...) : ImmutableListMultimap [<map.key>] : Object | provenance | MaD:60 |
 | Test.java:6580:10:6580:28 | asMap(...) : Map [<map.key>] : Object | Test.java:6581:19:6581:21 | out : Map [<map.key>] : Object | provenance |  |
 | Test.java:6580:26:6580:27 | in : ImmutableListMultimap [<map.key>] : Object | Test.java:6580:10:6580:28 | asMap(...) : Map [<map.key>] : Object | provenance | MaD:386 |
 | Test.java:6581:19:6581:21 | out : Map [<map.key>] : Object | Test.java:99:18:99:29 | map : Map [<map.key>] : Object | provenance |  |
-| Test.java:6581:19:6581:21 | out : Map [<map.key>] : Object | Test.java:6581:9:6581:22 | getMapKey(...) | provenance | MaD:562 |
+| Test.java:6581:19:6581:21 | out : Map [<map.key>] : Object | Test.java:6581:9:6581:22 | getMapKey(...) | provenance | MaD:569 |
 | Test.java:6586:22:6586:75 | (...)... : ImmutableListMultimap [<map.value>] : Object | Test.java:6587:26:6587:27 | in : ImmutableListMultimap [<map.value>] : Object | provenance |  |
 | Test.java:6586:36:6586:75 | of(...) : ImmutableListMultimap [<map.value>] : Object | Test.java:6586:22:6586:75 | (...)... : ImmutableListMultimap [<map.value>] : Object | provenance |  |
 | Test.java:6586:67:6586:74 | source(...) : Object | Test.java:6586:36:6586:75 | of(...) : ImmutableListMultimap [<map.value>] : Object | provenance | MaD:61 |
 | Test.java:6587:10:6587:28 | asMap(...) : Map [<map.value>, <element>] : Object | Test.java:6588:32:6588:34 | out : Map [<map.value>, <element>] : Object | provenance |  |
 | Test.java:6587:26:6587:27 | in : ImmutableListMultimap [<map.value>] : Object | Test.java:6587:10:6587:28 | asMap(...) : Map [<map.value>, <element>] : Object | provenance | MaD:387 |
 | Test.java:6588:20:6588:35 | getMapValue(...) : Collection [<element>] : Object | Test.java:110:19:110:32 | it : Collection [<element>] : Object | provenance |  |
-| Test.java:6588:20:6588:35 | getMapValue(...) : Collection [<element>] : Object | Test.java:6588:9:6588:36 | getElement(...) | provenance | MaD:555 |
+| Test.java:6588:20:6588:35 | getMapValue(...) : Collection [<element>] : Object | Test.java:6588:9:6588:36 | getElement(...) | provenance | MaD:558 |
 | Test.java:6588:32:6588:34 | out : Map [<map.value>, <element>] : Object | Test.java:118:20:118:31 | map : Map [<map.value>, <element>] : Object | provenance |  |
-| Test.java:6588:32:6588:34 | out : Map [<map.value>, <element>] : Object | Test.java:6588:20:6588:35 | getMapValue(...) : Collection [<element>] : Object | provenance | MaD:561 |
+| Test.java:6588:32:6588:34 | out : Map [<map.value>, <element>] : Object | Test.java:6588:20:6588:35 | getMapValue(...) : Collection [<element>] : Object | provenance | MaD:568 |
 | Test.java:6593:18:6593:63 | (...)... : ImmutableMultimap [<map.key>] : Object | Test.java:6594:26:6594:27 | in : ImmutableMultimap [<map.key>] : Object | provenance |  |
 | Test.java:6593:28:6593:63 | of(...) : ImmutableMultimap [<map.key>] : Object | Test.java:6593:18:6593:63 | (...)... : ImmutableMultimap [<map.key>] : Object | provenance |  |
-| Test.java:6593:49:6593:56 | source(...) : Object | Test.java:6593:28:6593:63 | of(...) : ImmutableMultimap [<map.key>] : Object | provenance | MaD:103 |
+| Test.java:6593:49:6593:56 | source(...) : Object | Test.java:6593:28:6593:63 | of(...) : ImmutableMultimap [<map.key>] : Object | provenance | MaD:121 |
 | Test.java:6594:10:6594:28 | asMap(...) : Map [<map.key>] : Object | Test.java:6595:19:6595:21 | out : Map [<map.key>] : Object | provenance |  |
 | Test.java:6594:26:6594:27 | in : ImmutableMultimap [<map.key>] : Object | Test.java:6594:10:6594:28 | asMap(...) : Map [<map.key>] : Object | provenance | MaD:388 |
 | Test.java:6595:19:6595:21 | out : Map [<map.key>] : Object | Test.java:99:18:99:29 | map : Map [<map.key>] : Object | provenance |  |
-| Test.java:6595:19:6595:21 | out : Map [<map.key>] : Object | Test.java:6595:9:6595:22 | getMapKey(...) | provenance | MaD:562 |
+| Test.java:6595:19:6595:21 | out : Map [<map.key>] : Object | Test.java:6595:9:6595:22 | getMapKey(...) | provenance | MaD:569 |
 | Test.java:6600:18:6600:63 | (...)... : ImmutableMultimap [<map.value>] : Object | Test.java:6601:26:6601:27 | in : ImmutableMultimap [<map.value>] : Object | provenance |  |
 | Test.java:6600:28:6600:63 | of(...) : ImmutableMultimap [<map.value>] : Object | Test.java:6600:18:6600:63 | (...)... : ImmutableMultimap [<map.value>] : Object | provenance |  |
-| Test.java:6600:55:6600:62 | source(...) : Object | Test.java:6600:28:6600:63 | of(...) : ImmutableMultimap [<map.value>] : Object | provenance | MaD:104 |
+| Test.java:6600:55:6600:62 | source(...) : Object | Test.java:6600:28:6600:63 | of(...) : ImmutableMultimap [<map.value>] : Object | provenance | MaD:122 |
 | Test.java:6601:10:6601:28 | asMap(...) : Map [<map.value>, <element>] : Object | Test.java:6602:32:6602:34 | out : Map [<map.value>, <element>] : Object | provenance |  |
 | Test.java:6601:26:6601:27 | in : ImmutableMultimap [<map.value>] : Object | Test.java:6601:10:6601:28 | asMap(...) : Map [<map.value>, <element>] : Object | provenance | MaD:389 |
 | Test.java:6602:20:6602:35 | getMapValue(...) : Collection [<element>] : Object | Test.java:110:19:110:32 | it : Collection [<element>] : Object | provenance |  |
-| Test.java:6602:20:6602:35 | getMapValue(...) : Collection [<element>] : Object | Test.java:6602:9:6602:36 | getElement(...) | provenance | MaD:555 |
+| Test.java:6602:20:6602:35 | getMapValue(...) : Collection [<element>] : Object | Test.java:6602:9:6602:36 | getElement(...) | provenance | MaD:558 |
 | Test.java:6602:32:6602:34 | out : Map [<map.value>, <element>] : Object | Test.java:118:20:118:31 | map : Map [<map.value>, <element>] : Object | provenance |  |
-| Test.java:6602:32:6602:34 | out : Map [<map.value>, <element>] : Object | Test.java:6602:20:6602:35 | getMapValue(...) : Collection [<element>] : Object | provenance | MaD:561 |
+| Test.java:6602:32:6602:34 | out : Map [<map.value>, <element>] : Object | Test.java:6602:20:6602:35 | getMapValue(...) : Collection [<element>] : Object | provenance | MaD:568 |
 | Test.java:6607:21:6607:72 | (...)... : ImmutableSetMultimap [<map.key>] : Object | Test.java:6608:26:6608:27 | in : ImmutableSetMultimap [<map.key>] : Object | provenance |  |
 | Test.java:6607:34:6607:72 | of(...) : ImmutableSetMultimap [<map.key>] : Object | Test.java:6607:21:6607:72 | (...)... : ImmutableSetMultimap [<map.key>] : Object | provenance |  |
 | Test.java:6607:58:6607:65 | source(...) : Object | Test.java:6607:34:6607:72 | of(...) : ImmutableSetMultimap [<map.key>] : Object | provenance | MaD:145 |
 | Test.java:6608:10:6608:28 | asMap(...) : Map [<map.key>] : Object | Test.java:6609:19:6609:21 | out : Map [<map.key>] : Object | provenance |  |
 | Test.java:6608:26:6608:27 | in : ImmutableSetMultimap [<map.key>] : Object | Test.java:6608:10:6608:28 | asMap(...) : Map [<map.key>] : Object | provenance | MaD:390 |
 | Test.java:6609:19:6609:21 | out : Map [<map.key>] : Object | Test.java:99:18:99:29 | map : Map [<map.key>] : Object | provenance |  |
-| Test.java:6609:19:6609:21 | out : Map [<map.key>] : Object | Test.java:6609:9:6609:22 | getMapKey(...) | provenance | MaD:562 |
+| Test.java:6609:19:6609:21 | out : Map [<map.key>] : Object | Test.java:6609:9:6609:22 | getMapKey(...) | provenance | MaD:569 |
 | Test.java:6614:21:6614:72 | (...)... : ImmutableSetMultimap [<map.value>] : Object | Test.java:6615:26:6615:27 | in : ImmutableSetMultimap [<map.value>] : Object | provenance |  |
 | Test.java:6614:34:6614:72 | of(...) : ImmutableSetMultimap [<map.value>] : Object | Test.java:6614:21:6614:72 | (...)... : ImmutableSetMultimap [<map.value>] : Object | provenance |  |
 | Test.java:6614:64:6614:71 | source(...) : Object | Test.java:6614:34:6614:72 | of(...) : ImmutableSetMultimap [<map.value>] : Object | provenance | MaD:146 |
 | Test.java:6615:10:6615:28 | asMap(...) : Map [<map.value>, <element>] : Object | Test.java:6616:32:6616:34 | out : Map [<map.value>, <element>] : Object | provenance |  |
 | Test.java:6615:26:6615:27 | in : ImmutableSetMultimap [<map.value>] : Object | Test.java:6615:10:6615:28 | asMap(...) : Map [<map.value>, <element>] : Object | provenance | MaD:391 |
 | Test.java:6616:20:6616:35 | getMapValue(...) : Collection [<element>] : Object | Test.java:110:19:110:32 | it : Collection [<element>] : Object | provenance |  |
-| Test.java:6616:20:6616:35 | getMapValue(...) : Collection [<element>] : Object | Test.java:6616:9:6616:36 | getElement(...) | provenance | MaD:555 |
+| Test.java:6616:20:6616:35 | getMapValue(...) : Collection [<element>] : Object | Test.java:6616:9:6616:36 | getElement(...) | provenance | MaD:558 |
 | Test.java:6616:32:6616:34 | out : Map [<map.value>, <element>] : Object | Test.java:118:20:118:31 | map : Map [<map.value>, <element>] : Object | provenance |  |
-| Test.java:6616:32:6616:34 | out : Map [<map.value>, <element>] : Object | Test.java:6616:20:6616:35 | getMapValue(...) : Collection [<element>] : Object | provenance | MaD:561 |
+| Test.java:6616:32:6616:34 | out : Map [<map.value>, <element>] : Object | Test.java:6616:20:6616:35 | getMapValue(...) : Collection [<element>] : Object | provenance | MaD:568 |
 | Test.java:6621:27:6621:114 | (...)... : TreeMultimap [<map.key>] : Comparable | Test.java:6622:26:6622:27 | in : TreeMultimap [<map.key>] : Comparable | provenance |  |
 | Test.java:6621:46:6621:114 | create(...) : TreeMultimap [<map.key>] : Comparable | Test.java:6621:27:6621:114 | (...)... : TreeMultimap [<map.key>] : Comparable | provenance |  |
 | Test.java:6621:66:6621:113 | of(...) : ImmutableMultimap [<map.key>] : Comparable | Test.java:6621:46:6621:114 | create(...) : TreeMultimap [<map.key>] : Comparable | provenance | MaD:552 |
-| Test.java:6621:87:6621:106 | (...)... : Comparable | Test.java:6621:66:6621:113 | of(...) : ImmutableMultimap [<map.key>] : Comparable | provenance | MaD:103 |
+| Test.java:6621:87:6621:106 | (...)... : Comparable | Test.java:6621:66:6621:113 | of(...) : ImmutableMultimap [<map.key>] : Comparable | provenance | MaD:121 |
 | Test.java:6621:99:6621:106 | source(...) : Object | Test.java:6621:87:6621:106 | (...)... : Comparable | provenance |  |
 | Test.java:6622:10:6622:28 | asMap(...) : Map [<map.key>] : Comparable | Test.java:6623:19:6623:21 | out : Map [<map.key>] : Comparable | provenance |  |
 | Test.java:6622:26:6622:27 | in : TreeMultimap [<map.key>] : Comparable | Test.java:6622:10:6622:28 | asMap(...) : Map [<map.key>] : Comparable | provenance | MaD:392 |
 | Test.java:6623:19:6623:21 | out : Map [<map.key>] : Comparable | Test.java:99:18:99:29 | map : Map [<map.key>] : Comparable | provenance |  |
-| Test.java:6623:19:6623:21 | out : Map [<map.key>] : Comparable | Test.java:6623:9:6623:22 | getMapKey(...) | provenance | MaD:562 |
+| Test.java:6623:19:6623:21 | out : Map [<map.key>] : Comparable | Test.java:6623:9:6623:22 | getMapKey(...) | provenance | MaD:569 |
 | Test.java:6628:27:6628:114 | (...)... : TreeMultimap [<map.value>] : Comparable | Test.java:6629:26:6629:27 | in : TreeMultimap [<map.value>] : Comparable | provenance |  |
 | Test.java:6628:46:6628:114 | create(...) : TreeMultimap [<map.value>] : Comparable | Test.java:6628:27:6628:114 | (...)... : TreeMultimap [<map.value>] : Comparable | provenance |  |
 | Test.java:6628:66:6628:113 | of(...) : ImmutableMultimap [<map.value>] : Comparable | Test.java:6628:46:6628:114 | create(...) : TreeMultimap [<map.value>] : Comparable | provenance | MaD:553 |
-| Test.java:6628:93:6628:112 | (...)... : Comparable | Test.java:6628:66:6628:113 | of(...) : ImmutableMultimap [<map.value>] : Comparable | provenance | MaD:104 |
+| Test.java:6628:93:6628:112 | (...)... : Comparable | Test.java:6628:66:6628:113 | of(...) : ImmutableMultimap [<map.value>] : Comparable | provenance | MaD:122 |
 | Test.java:6628:105:6628:112 | source(...) : Object | Test.java:6628:93:6628:112 | (...)... : Comparable | provenance |  |
 | Test.java:6629:10:6629:28 | asMap(...) : Map [<map.value>, <element>] : Comparable | Test.java:6630:32:6630:34 | out : Map [<map.value>, <element>] : Comparable | provenance |  |
 | Test.java:6629:26:6629:27 | in : TreeMultimap [<map.value>] : Comparable | Test.java:6629:10:6629:28 | asMap(...) : Map [<map.value>, <element>] : Comparable | provenance | MaD:393 |
 | Test.java:6630:20:6630:35 | getMapValue(...) : Collection [<element>] : Comparable | Test.java:110:19:110:32 | it : Collection [<element>] : Comparable | provenance |  |
-| Test.java:6630:20:6630:35 | getMapValue(...) : Collection [<element>] : Comparable | Test.java:6630:9:6630:36 | getElement(...) | provenance | MaD:555 |
+| Test.java:6630:20:6630:35 | getMapValue(...) : Collection [<element>] : Comparable | Test.java:6630:9:6630:36 | getElement(...) | provenance | MaD:558 |
 | Test.java:6630:32:6630:34 | out : Map [<map.value>, <element>] : Comparable | Test.java:118:20:118:31 | map : Map [<map.value>, <element>] : Comparable | provenance |  |
-| Test.java:6630:32:6630:34 | out : Map [<map.value>, <element>] : Comparable | Test.java:6630:20:6630:35 | getMapValue(...) : Collection [<element>] : Comparable | provenance | MaD:561 |
+| Test.java:6630:32:6630:34 | out : Map [<map.value>, <element>] : Comparable | Test.java:6630:20:6630:35 | getMapValue(...) : Collection [<element>] : Comparable | provenance | MaD:568 |
 | Test.java:6635:18:6635:63 | (...)... : ImmutableMultimap [<map.key>] : Object | Test.java:6636:34:6636:35 | in : ImmutableMultimap [<map.key>] : Object | provenance |  |
 | Test.java:6635:28:6635:63 | of(...) : ImmutableMultimap [<map.key>] : Object | Test.java:6635:18:6635:63 | (...)... : ImmutableMultimap [<map.key>] : Object | provenance |  |
-| Test.java:6635:49:6635:56 | source(...) : Object | Test.java:6635:28:6635:63 | of(...) : ImmutableMultimap [<map.key>] : Object | provenance | MaD:103 |
+| Test.java:6635:49:6635:56 | source(...) : Object | Test.java:6635:28:6635:63 | of(...) : ImmutableMultimap [<map.key>] : Object | provenance | MaD:121 |
 | Test.java:6636:10:6636:53 | filterEntries(...) : Multimap [<map.key>] : Object | Test.java:6637:19:6637:21 | out : Multimap [<map.key>] : Object | provenance |  |
 | Test.java:6636:34:6636:35 | in : ImmutableMultimap [<map.key>] : Object | Test.java:6636:10:6636:53 | filterEntries(...) : Multimap [<map.key>] : Object | provenance | MaD:394 |
 | Test.java:6637:19:6637:21 | out : Multimap [<map.key>] : Object | Test.java:100:18:100:34 | map : Multimap [<map.key>] : Object | provenance |  |
 | Test.java:6637:19:6637:21 | out : Multimap [<map.key>] : Object | Test.java:6637:9:6637:22 | getMapKey(...) | provenance | MaD:373 |
 | Test.java:6642:18:6642:63 | (...)... : ImmutableMultimap [<map.value>] : Object | Test.java:6643:34:6643:35 | in : ImmutableMultimap [<map.value>] : Object | provenance |  |
 | Test.java:6642:28:6642:63 | of(...) : ImmutableMultimap [<map.value>] : Object | Test.java:6642:18:6642:63 | (...)... : ImmutableMultimap [<map.value>] : Object | provenance |  |
-| Test.java:6642:55:6642:62 | source(...) : Object | Test.java:6642:28:6642:63 | of(...) : ImmutableMultimap [<map.value>] : Object | provenance | MaD:104 |
+| Test.java:6642:55:6642:62 | source(...) : Object | Test.java:6642:28:6642:63 | of(...) : ImmutableMultimap [<map.value>] : Object | provenance | MaD:122 |
 | Test.java:6643:10:6643:53 | filterEntries(...) : Multimap [<map.value>] : Object | Test.java:6644:21:6644:23 | out : Multimap [<map.value>] : Object | provenance |  |
 | Test.java:6643:34:6643:35 | in : ImmutableMultimap [<map.value>] : Object | Test.java:6643:10:6643:53 | filterEntries(...) : Multimap [<map.value>] : Object | provenance | MaD:395 |
 | Test.java:6644:21:6644:23 | out : Multimap [<map.value>] : Object | Test.java:119:20:119:36 | map : Multimap [<map.value>] : Object | provenance |  |
@@ -7303,14 +7303,14 @@ edges
 | Test.java:6658:21:6658:23 | out : SetMultimap [<map.value>] : Object | Test.java:6658:9:6658:24 | getMapValue(...) | provenance | MaD:385 |
 | Test.java:6663:18:6663:63 | (...)... : ImmutableMultimap [<map.key>] : Object | Test.java:6664:31:6664:32 | in : ImmutableMultimap [<map.key>] : Object | provenance |  |
 | Test.java:6663:28:6663:63 | of(...) : ImmutableMultimap [<map.key>] : Object | Test.java:6663:18:6663:63 | (...)... : ImmutableMultimap [<map.key>] : Object | provenance |  |
-| Test.java:6663:49:6663:56 | source(...) : Object | Test.java:6663:28:6663:63 | of(...) : ImmutableMultimap [<map.key>] : Object | provenance | MaD:103 |
+| Test.java:6663:49:6663:56 | source(...) : Object | Test.java:6663:28:6663:63 | of(...) : ImmutableMultimap [<map.key>] : Object | provenance | MaD:121 |
 | Test.java:6664:10:6664:50 | filterKeys(...) : Multimap [<map.key>] : Object | Test.java:6665:19:6665:21 | out : Multimap [<map.key>] : Object | provenance |  |
 | Test.java:6664:31:6664:32 | in : ImmutableMultimap [<map.key>] : Object | Test.java:6664:10:6664:50 | filterKeys(...) : Multimap [<map.key>] : Object | provenance | MaD:398 |
 | Test.java:6665:19:6665:21 | out : Multimap [<map.key>] : Object | Test.java:100:18:100:34 | map : Multimap [<map.key>] : Object | provenance |  |
 | Test.java:6665:19:6665:21 | out : Multimap [<map.key>] : Object | Test.java:6665:9:6665:22 | getMapKey(...) | provenance | MaD:373 |
 | Test.java:6670:18:6670:63 | (...)... : ImmutableMultimap [<map.value>] : Object | Test.java:6671:31:6671:32 | in : ImmutableMultimap [<map.value>] : Object | provenance |  |
 | Test.java:6670:28:6670:63 | of(...) : ImmutableMultimap [<map.value>] : Object | Test.java:6670:18:6670:63 | (...)... : ImmutableMultimap [<map.value>] : Object | provenance |  |
-| Test.java:6670:55:6670:62 | source(...) : Object | Test.java:6670:28:6670:63 | of(...) : ImmutableMultimap [<map.value>] : Object | provenance | MaD:104 |
+| Test.java:6670:55:6670:62 | source(...) : Object | Test.java:6670:28:6670:63 | of(...) : ImmutableMultimap [<map.value>] : Object | provenance | MaD:122 |
 | Test.java:6671:10:6671:50 | filterKeys(...) : Multimap [<map.value>] : Object | Test.java:6672:21:6672:23 | out : Multimap [<map.value>] : Object | provenance |  |
 | Test.java:6671:31:6671:32 | in : ImmutableMultimap [<map.value>] : Object | Test.java:6671:10:6671:50 | filterKeys(...) : Multimap [<map.value>] : Object | provenance | MaD:399 |
 | Test.java:6672:21:6672:23 | out : Multimap [<map.value>] : Object | Test.java:119:20:119:36 | map : Multimap [<map.value>] : Object | provenance |  |
@@ -7331,14 +7331,14 @@ edges
 | Test.java:6686:21:6686:23 | out : SetMultimap [<map.value>] : Object | Test.java:6686:9:6686:24 | getMapValue(...) | provenance | MaD:385 |
 | Test.java:6691:18:6691:63 | (...)... : ImmutableMultimap [<map.key>] : Object | Test.java:6692:33:6692:34 | in : ImmutableMultimap [<map.key>] : Object | provenance |  |
 | Test.java:6691:28:6691:63 | of(...) : ImmutableMultimap [<map.key>] : Object | Test.java:6691:18:6691:63 | (...)... : ImmutableMultimap [<map.key>] : Object | provenance |  |
-| Test.java:6691:49:6691:56 | source(...) : Object | Test.java:6691:28:6691:63 | of(...) : ImmutableMultimap [<map.key>] : Object | provenance | MaD:103 |
+| Test.java:6691:49:6691:56 | source(...) : Object | Test.java:6691:28:6691:63 | of(...) : ImmutableMultimap [<map.key>] : Object | provenance | MaD:121 |
 | Test.java:6692:10:6692:52 | filterValues(...) : Multimap [<map.key>] : Object | Test.java:6693:19:6693:21 | out : Multimap [<map.key>] : Object | provenance |  |
 | Test.java:6692:33:6692:34 | in : ImmutableMultimap [<map.key>] : Object | Test.java:6692:10:6692:52 | filterValues(...) : Multimap [<map.key>] : Object | provenance | MaD:402 |
 | Test.java:6693:19:6693:21 | out : Multimap [<map.key>] : Object | Test.java:100:18:100:34 | map : Multimap [<map.key>] : Object | provenance |  |
 | Test.java:6693:19:6693:21 | out : Multimap [<map.key>] : Object | Test.java:6693:9:6693:22 | getMapKey(...) | provenance | MaD:373 |
 | Test.java:6698:18:6698:63 | (...)... : ImmutableMultimap [<map.value>] : Object | Test.java:6699:33:6699:34 | in : ImmutableMultimap [<map.value>] : Object | provenance |  |
 | Test.java:6698:28:6698:63 | of(...) : ImmutableMultimap [<map.value>] : Object | Test.java:6698:18:6698:63 | (...)... : ImmutableMultimap [<map.value>] : Object | provenance |  |
-| Test.java:6698:55:6698:62 | source(...) : Object | Test.java:6698:28:6698:63 | of(...) : ImmutableMultimap [<map.value>] : Object | provenance | MaD:104 |
+| Test.java:6698:55:6698:62 | source(...) : Object | Test.java:6698:28:6698:63 | of(...) : ImmutableMultimap [<map.value>] : Object | provenance | MaD:122 |
 | Test.java:6699:10:6699:52 | filterValues(...) : Multimap [<map.value>] : Object | Test.java:6700:21:6700:23 | out : Multimap [<map.value>] : Object | provenance |  |
 | Test.java:6699:33:6699:34 | in : ImmutableMultimap [<map.value>] : Object | Test.java:6699:10:6699:52 | filterValues(...) : Multimap [<map.value>] : Object | provenance | MaD:403 |
 | Test.java:6700:21:6700:23 | out : Multimap [<map.value>] : Object | Test.java:119:20:119:36 | map : Multimap [<map.value>] : Object | provenance |  |
@@ -7359,29 +7359,29 @@ edges
 | Test.java:6714:21:6714:23 | out : SetMultimap [<map.value>] : Object | Test.java:6714:9:6714:24 | getMapValue(...) | provenance | MaD:385 |
 | Test.java:6719:13:6719:39 | (...)... : Map [<map.key>] : Object | Test.java:6720:27:6720:28 | in : Map [<map.key>] : Object | provenance |  |
 | Test.java:6719:18:6719:39 | of(...) : Map [<map.key>] : Object | Test.java:6719:13:6719:39 | (...)... : Map [<map.key>] : Object | provenance |  |
-| Test.java:6719:25:6719:32 | source(...) : Object | Test.java:6719:18:6719:39 | of(...) : Map [<map.key>] : Object | provenance | MaD:563 |
+| Test.java:6719:25:6719:32 | source(...) : Object | Test.java:6719:18:6719:39 | of(...) : Map [<map.key>] : Object | provenance | MaD:564 |
 | Test.java:6720:10:6720:29 | forMap(...) : SetMultimap [<map.key>] : Object | Test.java:6721:19:6721:21 | out : SetMultimap [<map.key>] : Object | provenance |  |
 | Test.java:6720:27:6720:28 | in : Map [<map.key>] : Object | Test.java:6720:10:6720:29 | forMap(...) : SetMultimap [<map.key>] : Object | provenance | MaD:406 |
 | Test.java:6721:19:6721:21 | out : SetMultimap [<map.key>] : Object | Test.java:100:18:100:34 | map : SetMultimap [<map.key>] : Object | provenance |  |
 | Test.java:6721:19:6721:21 | out : SetMultimap [<map.key>] : Object | Test.java:6721:9:6721:22 | getMapKey(...) | provenance | MaD:373 |
 | Test.java:6726:13:6726:39 | (...)... : Map [<map.value>] : Object | Test.java:6727:27:6727:28 | in : Map [<map.value>] : Object | provenance |  |
 | Test.java:6726:18:6726:39 | of(...) : Map [<map.value>] : Object | Test.java:6726:13:6726:39 | (...)... : Map [<map.value>] : Object | provenance |  |
-| Test.java:6726:31:6726:38 | source(...) : Object | Test.java:6726:18:6726:39 | of(...) : Map [<map.value>] : Object | provenance | MaD:564 |
+| Test.java:6726:31:6726:38 | source(...) : Object | Test.java:6726:18:6726:39 | of(...) : Map [<map.value>] : Object | provenance | MaD:565 |
 | Test.java:6727:10:6727:29 | forMap(...) : SetMultimap [<map.value>] : Object | Test.java:6728:21:6728:23 | out : SetMultimap [<map.value>] : Object | provenance |  |
 | Test.java:6727:27:6727:28 | in : Map [<map.value>] : Object | Test.java:6727:10:6727:29 | forMap(...) : SetMultimap [<map.value>] : Object | provenance | MaD:407 |
 | Test.java:6728:21:6728:23 | out : SetMultimap [<map.value>] : Object | Test.java:119:20:119:36 | map : SetMultimap [<map.value>] : Object | provenance |  |
 | Test.java:6728:21:6728:23 | out : SetMultimap [<map.value>] : Object | Test.java:6728:9:6728:24 | getMapValue(...) | provenance | MaD:385 |
 | Test.java:6733:18:6733:44 | (...)... : List [<element>] : Object | Test.java:6734:26:6734:27 | in : List [<element>] : Object | provenance |  |
 | Test.java:6733:28:6733:44 | of(...) : List [<element>] : Object | Test.java:6733:18:6733:44 | (...)... : List [<element>] : Object | provenance |  |
-| Test.java:6733:36:6733:43 | source(...) : Object | Test.java:6733:28:6733:44 | of(...) : List [<element>] : Object | provenance | MaD:558 |
+| Test.java:6733:36:6733:43 | source(...) : Object | Test.java:6733:28:6733:44 | of(...) : List [<element>] : Object | provenance | MaD:561 |
 | Test.java:6734:10:6734:44 | index(...) : ImmutableListMultimap [<map.value>] : Object | Test.java:6735:21:6735:23 | out : ImmutableListMultimap [<map.value>] : Object | provenance |  |
 | Test.java:6734:26:6734:27 | in : List [<element>] : Object | Test.java:6734:10:6734:44 | index(...) : ImmutableListMultimap [<map.value>] : Object | provenance | MaD:408 |
 | Test.java:6735:21:6735:23 | out : ImmutableListMultimap [<map.value>] : Object | Test.java:119:20:119:36 | map : ImmutableListMultimap [<map.value>] : Object | provenance |  |
 | Test.java:6735:21:6735:23 | out : ImmutableListMultimap [<map.value>] : Object | Test.java:6735:9:6735:24 | getMapValue(...) | provenance | MaD:385 |
 | Test.java:6740:18:6740:55 | (...)... : Iterator [<element>] : Object | Test.java:6741:26:6741:27 | in : Iterator [<element>] : Object | provenance |  |
-| Test.java:6740:28:6740:44 | of(...) : List [<element>] : Object | Test.java:6740:28:6740:55 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:555 |
+| Test.java:6740:28:6740:44 | of(...) : List [<element>] : Object | Test.java:6740:28:6740:55 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:558 |
 | Test.java:6740:28:6740:55 | iterator(...) : Iterator [<element>] : Object | Test.java:6740:18:6740:55 | (...)... : Iterator [<element>] : Object | provenance |  |
-| Test.java:6740:36:6740:43 | source(...) : Object | Test.java:6740:28:6740:44 | of(...) : List [<element>] : Object | provenance | MaD:558 |
+| Test.java:6740:36:6740:43 | source(...) : Object | Test.java:6740:28:6740:44 | of(...) : List [<element>] : Object | provenance | MaD:561 |
 | Test.java:6741:10:6741:44 | index(...) : ImmutableListMultimap [<map.value>] : Object | Test.java:6742:21:6742:23 | out : ImmutableListMultimap [<map.value>] : Object | provenance |  |
 | Test.java:6741:26:6741:27 | in : Iterator [<element>] : Object | Test.java:6741:10:6741:44 | index(...) : ImmutableListMultimap [<map.value>] : Object | provenance | MaD:409 |
 | Test.java:6742:21:6742:23 | out : ImmutableListMultimap [<map.value>] : Object | Test.java:119:20:119:36 | map : ImmutableListMultimap [<map.value>] : Object | provenance |  |
@@ -7392,74 +7392,74 @@ edges
 | Test.java:6748:37:6748:38 | in : Multimap | Test.java:6748:10:6748:39 | invertFrom(...) : Multimap | provenance | MaD:412 |
 | Test.java:6754:18:6754:63 | (...)... : ImmutableMultimap [<map.key>] : Object | Test.java:6755:25:6755:26 | in : ImmutableMultimap [<map.key>] : Object | provenance |  |
 | Test.java:6754:28:6754:63 | of(...) : ImmutableMultimap [<map.key>] : Object | Test.java:6754:18:6754:63 | (...)... : ImmutableMultimap [<map.key>] : Object | provenance |  |
-| Test.java:6754:49:6754:56 | source(...) : Object | Test.java:6754:28:6754:63 | of(...) : ImmutableMultimap [<map.key>] : Object | provenance | MaD:103 |
+| Test.java:6754:49:6754:56 | source(...) : Object | Test.java:6754:28:6754:63 | of(...) : ImmutableMultimap [<map.key>] : Object | provenance | MaD:121 |
 | Test.java:6755:25:6755:26 | in : ImmutableMultimap [<map.key>] : Object | Test.java:6755:29:6755:31 | out [post update] : Multimap [<map.value>] : Object | provenance | MaD:410 |
 | Test.java:6755:29:6755:31 | out [post update] : Multimap [<map.value>] : Object | Test.java:6756:21:6756:23 | out : Multimap [<map.value>] : Object | provenance |  |
 | Test.java:6756:21:6756:23 | out : Multimap [<map.value>] : Object | Test.java:119:20:119:36 | map : Multimap [<map.value>] : Object | provenance |  |
 | Test.java:6756:21:6756:23 | out : Multimap [<map.value>] : Object | Test.java:6756:9:6756:24 | getMapValue(...) | provenance | MaD:385 |
 | Test.java:6761:18:6761:63 | (...)... : ImmutableMultimap [<map.value>] : Object | Test.java:6762:25:6762:26 | in : ImmutableMultimap [<map.value>] : Object | provenance |  |
 | Test.java:6761:28:6761:63 | of(...) : ImmutableMultimap [<map.value>] : Object | Test.java:6761:18:6761:63 | (...)... : ImmutableMultimap [<map.value>] : Object | provenance |  |
-| Test.java:6761:55:6761:62 | source(...) : Object | Test.java:6761:28:6761:63 | of(...) : ImmutableMultimap [<map.value>] : Object | provenance | MaD:104 |
+| Test.java:6761:55:6761:62 | source(...) : Object | Test.java:6761:28:6761:63 | of(...) : ImmutableMultimap [<map.value>] : Object | provenance | MaD:122 |
 | Test.java:6762:25:6762:26 | in : ImmutableMultimap [<map.value>] : Object | Test.java:6762:29:6762:31 | out [post update] : Multimap [<map.key>] : Object | provenance | MaD:411 |
 | Test.java:6762:29:6762:31 | out [post update] : Multimap [<map.key>] : Object | Test.java:6763:19:6763:21 | out : Multimap [<map.key>] : Object | provenance |  |
 | Test.java:6763:19:6763:21 | out : Multimap [<map.key>] : Object | Test.java:100:18:100:34 | map : Multimap [<map.key>] : Object | provenance |  |
 | Test.java:6763:19:6763:21 | out : Multimap [<map.key>] : Object | Test.java:6763:9:6763:22 | getMapKey(...) | provenance | MaD:373 |
 | Test.java:6768:13:6768:62 | (...)... : Map [<map.value>, <element>] : Object | Test.java:6769:36:6769:37 | in : Map [<map.value>, <element>] : Object | provenance |  |
 | Test.java:6768:18:6768:62 | of(...) : Map [<map.value>, <element>] : Object | Test.java:6768:13:6768:62 | (...)... : Map [<map.value>, <element>] : Object | provenance |  |
-| Test.java:6768:31:6768:61 | newWithElementDefault(...) : Object [<element>] : Object | Test.java:6768:18:6768:62 | of(...) : Map [<map.value>, <element>] : Object | provenance | MaD:564 |
-| Test.java:6768:53:6768:60 | source(...) : Object | Test.java:6768:31:6768:61 | newWithElementDefault(...) : Object [<element>] : Object | provenance | MaD:568 |
+| Test.java:6768:31:6768:61 | newWithElementDefault(...) : Object [<element>] : Object | Test.java:6768:18:6768:62 | of(...) : Map [<map.value>, <element>] : Object | provenance | MaD:565 |
+| Test.java:6768:53:6768:60 | source(...) : Object | Test.java:6768:31:6768:61 | newWithElementDefault(...) : Object [<element>] : Object | provenance | MaD:555 |
 | Test.java:6769:10:6769:44 | newListMultimap(...) : ListMultimap [<map.value>] : Object | Test.java:6770:21:6770:23 | out : ListMultimap [<map.value>] : Object | provenance |  |
 | Test.java:6769:36:6769:37 | in : Map [<map.value>, <element>] : Object | Test.java:6769:10:6769:44 | newListMultimap(...) : ListMultimap [<map.value>] : Object | provenance | MaD:414 |
 | Test.java:6770:21:6770:23 | out : ListMultimap [<map.value>] : Object | Test.java:119:20:119:36 | map : ListMultimap [<map.value>] : Object | provenance |  |
 | Test.java:6770:21:6770:23 | out : ListMultimap [<map.value>] : Object | Test.java:6770:9:6770:24 | getMapValue(...) | provenance | MaD:385 |
 | Test.java:6775:13:6775:39 | (...)... : Map [<map.key>] : Object | Test.java:6776:36:6776:37 | in : Map [<map.key>] : Object | provenance |  |
 | Test.java:6775:18:6775:39 | of(...) : Map [<map.key>] : Object | Test.java:6775:13:6775:39 | (...)... : Map [<map.key>] : Object | provenance |  |
-| Test.java:6775:25:6775:32 | source(...) : Object | Test.java:6775:18:6775:39 | of(...) : Map [<map.key>] : Object | provenance | MaD:563 |
+| Test.java:6775:25:6775:32 | source(...) : Object | Test.java:6775:18:6775:39 | of(...) : Map [<map.key>] : Object | provenance | MaD:564 |
 | Test.java:6776:10:6776:44 | newListMultimap(...) : ListMultimap [<map.key>] : Object | Test.java:6777:19:6777:21 | out : ListMultimap [<map.key>] : Object | provenance |  |
 | Test.java:6776:36:6776:37 | in : Map [<map.key>] : Object | Test.java:6776:10:6776:44 | newListMultimap(...) : ListMultimap [<map.key>] : Object | provenance | MaD:413 |
 | Test.java:6777:19:6777:21 | out : ListMultimap [<map.key>] : Object | Test.java:100:18:100:34 | map : ListMultimap [<map.key>] : Object | provenance |  |
 | Test.java:6777:19:6777:21 | out : ListMultimap [<map.key>] : Object | Test.java:6777:9:6777:22 | getMapKey(...) | provenance | MaD:373 |
 | Test.java:6782:13:6782:62 | (...)... : Map [<map.value>, <element>] : Object | Test.java:6783:32:6783:33 | in : Map [<map.value>, <element>] : Object | provenance |  |
 | Test.java:6782:18:6782:62 | of(...) : Map [<map.value>, <element>] : Object | Test.java:6782:13:6782:62 | (...)... : Map [<map.value>, <element>] : Object | provenance |  |
-| Test.java:6782:31:6782:61 | newWithElementDefault(...) : Object [<element>] : Object | Test.java:6782:18:6782:62 | of(...) : Map [<map.value>, <element>] : Object | provenance | MaD:564 |
-| Test.java:6782:53:6782:60 | source(...) : Object | Test.java:6782:31:6782:61 | newWithElementDefault(...) : Object [<element>] : Object | provenance | MaD:568 |
+| Test.java:6782:31:6782:61 | newWithElementDefault(...) : Object [<element>] : Object | Test.java:6782:18:6782:62 | of(...) : Map [<map.value>, <element>] : Object | provenance | MaD:565 |
+| Test.java:6782:53:6782:60 | source(...) : Object | Test.java:6782:31:6782:61 | newWithElementDefault(...) : Object [<element>] : Object | provenance | MaD:555 |
 | Test.java:6783:10:6783:40 | newMultimap(...) : Multimap [<map.value>] : Object | Test.java:6784:21:6784:23 | out : Multimap [<map.value>] : Object | provenance |  |
 | Test.java:6783:32:6783:33 | in : Map [<map.value>, <element>] : Object | Test.java:6783:10:6783:40 | newMultimap(...) : Multimap [<map.value>] : Object | provenance | MaD:416 |
 | Test.java:6784:21:6784:23 | out : Multimap [<map.value>] : Object | Test.java:119:20:119:36 | map : Multimap [<map.value>] : Object | provenance |  |
 | Test.java:6784:21:6784:23 | out : Multimap [<map.value>] : Object | Test.java:6784:9:6784:24 | getMapValue(...) | provenance | MaD:385 |
 | Test.java:6789:13:6789:39 | (...)... : Map [<map.key>] : Object | Test.java:6790:32:6790:33 | in : Map [<map.key>] : Object | provenance |  |
 | Test.java:6789:18:6789:39 | of(...) : Map [<map.key>] : Object | Test.java:6789:13:6789:39 | (...)... : Map [<map.key>] : Object | provenance |  |
-| Test.java:6789:25:6789:32 | source(...) : Object | Test.java:6789:18:6789:39 | of(...) : Map [<map.key>] : Object | provenance | MaD:563 |
+| Test.java:6789:25:6789:32 | source(...) : Object | Test.java:6789:18:6789:39 | of(...) : Map [<map.key>] : Object | provenance | MaD:564 |
 | Test.java:6790:10:6790:40 | newMultimap(...) : Multimap [<map.key>] : Object | Test.java:6791:19:6791:21 | out : Multimap [<map.key>] : Object | provenance |  |
 | Test.java:6790:32:6790:33 | in : Map [<map.key>] : Object | Test.java:6790:10:6790:40 | newMultimap(...) : Multimap [<map.key>] : Object | provenance | MaD:415 |
 | Test.java:6791:19:6791:21 | out : Multimap [<map.key>] : Object | Test.java:100:18:100:34 | map : Multimap [<map.key>] : Object | provenance |  |
 | Test.java:6791:19:6791:21 | out : Multimap [<map.key>] : Object | Test.java:6791:9:6791:22 | getMapKey(...) | provenance | MaD:373 |
 | Test.java:6796:13:6796:62 | (...)... : Map [<map.value>, <element>] : Object | Test.java:6797:35:6797:36 | in : Map [<map.value>, <element>] : Object | provenance |  |
 | Test.java:6796:18:6796:62 | of(...) : Map [<map.value>, <element>] : Object | Test.java:6796:13:6796:62 | (...)... : Map [<map.value>, <element>] : Object | provenance |  |
-| Test.java:6796:31:6796:61 | newWithElementDefault(...) : Object [<element>] : Object | Test.java:6796:18:6796:62 | of(...) : Map [<map.value>, <element>] : Object | provenance | MaD:564 |
-| Test.java:6796:53:6796:60 | source(...) : Object | Test.java:6796:31:6796:61 | newWithElementDefault(...) : Object [<element>] : Object | provenance | MaD:568 |
+| Test.java:6796:31:6796:61 | newWithElementDefault(...) : Object [<element>] : Object | Test.java:6796:18:6796:62 | of(...) : Map [<map.value>, <element>] : Object | provenance | MaD:565 |
+| Test.java:6796:53:6796:60 | source(...) : Object | Test.java:6796:31:6796:61 | newWithElementDefault(...) : Object [<element>] : Object | provenance | MaD:555 |
 | Test.java:6797:10:6797:43 | newSetMultimap(...) : SetMultimap [<map.value>] : Object | Test.java:6798:21:6798:23 | out : SetMultimap [<map.value>] : Object | provenance |  |
 | Test.java:6797:35:6797:36 | in : Map [<map.value>, <element>] : Object | Test.java:6797:10:6797:43 | newSetMultimap(...) : SetMultimap [<map.value>] : Object | provenance | MaD:418 |
 | Test.java:6798:21:6798:23 | out : SetMultimap [<map.value>] : Object | Test.java:119:20:119:36 | map : SetMultimap [<map.value>] : Object | provenance |  |
 | Test.java:6798:21:6798:23 | out : SetMultimap [<map.value>] : Object | Test.java:6798:9:6798:24 | getMapValue(...) | provenance | MaD:385 |
 | Test.java:6803:13:6803:39 | (...)... : Map [<map.key>] : Object | Test.java:6804:35:6804:36 | in : Map [<map.key>] : Object | provenance |  |
 | Test.java:6803:18:6803:39 | of(...) : Map [<map.key>] : Object | Test.java:6803:13:6803:39 | (...)... : Map [<map.key>] : Object | provenance |  |
-| Test.java:6803:25:6803:32 | source(...) : Object | Test.java:6803:18:6803:39 | of(...) : Map [<map.key>] : Object | provenance | MaD:563 |
+| Test.java:6803:25:6803:32 | source(...) : Object | Test.java:6803:18:6803:39 | of(...) : Map [<map.key>] : Object | provenance | MaD:564 |
 | Test.java:6804:10:6804:43 | newSetMultimap(...) : SetMultimap [<map.key>] : Object | Test.java:6805:19:6805:21 | out : SetMultimap [<map.key>] : Object | provenance |  |
 | Test.java:6804:35:6804:36 | in : Map [<map.key>] : Object | Test.java:6804:10:6804:43 | newSetMultimap(...) : SetMultimap [<map.key>] : Object | provenance | MaD:417 |
 | Test.java:6805:19:6805:21 | out : SetMultimap [<map.key>] : Object | Test.java:100:18:100:34 | map : SetMultimap [<map.key>] : Object | provenance |  |
 | Test.java:6805:19:6805:21 | out : SetMultimap [<map.key>] : Object | Test.java:6805:9:6805:22 | getMapKey(...) | provenance | MaD:373 |
 | Test.java:6810:13:6810:62 | (...)... : Map [<map.value>, <element>] : Object | Test.java:6811:41:6811:42 | in : Map [<map.value>, <element>] : Object | provenance |  |
 | Test.java:6810:18:6810:62 | of(...) : Map [<map.value>, <element>] : Object | Test.java:6810:13:6810:62 | (...)... : Map [<map.value>, <element>] : Object | provenance |  |
-| Test.java:6810:31:6810:61 | newWithElementDefault(...) : Object [<element>] : Object | Test.java:6810:18:6810:62 | of(...) : Map [<map.value>, <element>] : Object | provenance | MaD:564 |
-| Test.java:6810:53:6810:60 | source(...) : Object | Test.java:6810:31:6810:61 | newWithElementDefault(...) : Object [<element>] : Object | provenance | MaD:568 |
+| Test.java:6810:31:6810:61 | newWithElementDefault(...) : Object [<element>] : Object | Test.java:6810:18:6810:62 | of(...) : Map [<map.value>, <element>] : Object | provenance | MaD:565 |
+| Test.java:6810:53:6810:60 | source(...) : Object | Test.java:6810:31:6810:61 | newWithElementDefault(...) : Object [<element>] : Object | provenance | MaD:555 |
 | Test.java:6811:10:6811:49 | newSortedSetMultimap(...) : SortedSetMultimap [<map.value>] : Object | Test.java:6812:21:6812:23 | out : SortedSetMultimap [<map.value>] : Object | provenance |  |
 | Test.java:6811:41:6811:42 | in : Map [<map.value>, <element>] : Object | Test.java:6811:10:6811:49 | newSortedSetMultimap(...) : SortedSetMultimap [<map.value>] : Object | provenance | MaD:420 |
 | Test.java:6812:21:6812:23 | out : SortedSetMultimap [<map.value>] : Object | Test.java:119:20:119:36 | map : SortedSetMultimap [<map.value>] : Object | provenance |  |
 | Test.java:6812:21:6812:23 | out : SortedSetMultimap [<map.value>] : Object | Test.java:6812:9:6812:24 | getMapValue(...) | provenance | MaD:385 |
 | Test.java:6817:13:6817:39 | (...)... : Map [<map.key>] : Object | Test.java:6818:41:6818:42 | in : Map [<map.key>] : Object | provenance |  |
 | Test.java:6817:18:6817:39 | of(...) : Map [<map.key>] : Object | Test.java:6817:13:6817:39 | (...)... : Map [<map.key>] : Object | provenance |  |
-| Test.java:6817:25:6817:32 | source(...) : Object | Test.java:6817:18:6817:39 | of(...) : Map [<map.key>] : Object | provenance | MaD:563 |
+| Test.java:6817:25:6817:32 | source(...) : Object | Test.java:6817:18:6817:39 | of(...) : Map [<map.key>] : Object | provenance | MaD:564 |
 | Test.java:6818:10:6818:49 | newSortedSetMultimap(...) : SortedSetMultimap [<map.key>] : Object | Test.java:6819:19:6819:21 | out : SortedSetMultimap [<map.key>] : Object | provenance |  |
 | Test.java:6818:41:6818:42 | in : Map [<map.key>] : Object | Test.java:6818:10:6818:49 | newSortedSetMultimap(...) : SortedSetMultimap [<map.key>] : Object | provenance | MaD:419 |
 | Test.java:6819:19:6819:21 | out : SortedSetMultimap [<map.key>] : Object | Test.java:100:18:100:34 | map : SortedSetMultimap [<map.key>] : Object | provenance |  |
@@ -7480,14 +7480,14 @@ edges
 | Test.java:6833:21:6833:23 | out : ListMultimap [<map.value>] : Object | Test.java:6833:9:6833:24 | getMapValue(...) | provenance | MaD:385 |
 | Test.java:6838:18:6838:63 | (...)... : ImmutableMultimap [<map.key>] : Object | Test.java:6839:41:6839:42 | in : ImmutableMultimap [<map.key>] : Object | provenance |  |
 | Test.java:6838:28:6838:63 | of(...) : ImmutableMultimap [<map.key>] : Object | Test.java:6838:18:6838:63 | (...)... : ImmutableMultimap [<map.key>] : Object | provenance |  |
-| Test.java:6838:49:6838:56 | source(...) : Object | Test.java:6838:28:6838:63 | of(...) : ImmutableMultimap [<map.key>] : Object | provenance | MaD:103 |
+| Test.java:6838:49:6838:56 | source(...) : Object | Test.java:6838:28:6838:63 | of(...) : ImmutableMultimap [<map.key>] : Object | provenance | MaD:121 |
 | Test.java:6839:10:6839:43 | synchronizedMultimap(...) : Multimap [<map.key>] : Object | Test.java:6840:19:6840:21 | out : Multimap [<map.key>] : Object | provenance |  |
 | Test.java:6839:41:6839:42 | in : ImmutableMultimap [<map.key>] : Object | Test.java:6839:10:6839:43 | synchronizedMultimap(...) : Multimap [<map.key>] : Object | provenance | MaD:423 |
 | Test.java:6840:19:6840:21 | out : Multimap [<map.key>] : Object | Test.java:100:18:100:34 | map : Multimap [<map.key>] : Object | provenance |  |
 | Test.java:6840:19:6840:21 | out : Multimap [<map.key>] : Object | Test.java:6840:9:6840:22 | getMapKey(...) | provenance | MaD:373 |
 | Test.java:6845:18:6845:63 | (...)... : ImmutableMultimap [<map.value>] : Object | Test.java:6846:41:6846:42 | in : ImmutableMultimap [<map.value>] : Object | provenance |  |
 | Test.java:6845:28:6845:63 | of(...) : ImmutableMultimap [<map.value>] : Object | Test.java:6845:18:6845:63 | (...)... : ImmutableMultimap [<map.value>] : Object | provenance |  |
-| Test.java:6845:55:6845:62 | source(...) : Object | Test.java:6845:28:6845:63 | of(...) : ImmutableMultimap [<map.value>] : Object | provenance | MaD:104 |
+| Test.java:6845:55:6845:62 | source(...) : Object | Test.java:6845:28:6845:63 | of(...) : ImmutableMultimap [<map.value>] : Object | provenance | MaD:122 |
 | Test.java:6846:10:6846:43 | synchronizedMultimap(...) : Multimap [<map.value>] : Object | Test.java:6847:21:6847:23 | out : Multimap [<map.value>] : Object | provenance |  |
 | Test.java:6846:41:6846:42 | in : ImmutableMultimap [<map.value>] : Object | Test.java:6846:10:6846:43 | synchronizedMultimap(...) : Multimap [<map.value>] : Object | provenance | MaD:424 |
 | Test.java:6847:21:6847:23 | out : Multimap [<map.value>] : Object | Test.java:119:20:119:36 | map : Multimap [<map.value>] : Object | provenance |  |
@@ -7509,7 +7509,7 @@ edges
 | Test.java:6866:27:6866:114 | (...)... : TreeMultimap [<map.key>] : Comparable | Test.java:6867:50:6867:51 | in : TreeMultimap [<map.key>] : Comparable | provenance |  |
 | Test.java:6866:46:6866:114 | create(...) : TreeMultimap [<map.key>] : Comparable | Test.java:6866:27:6866:114 | (...)... : TreeMultimap [<map.key>] : Comparable | provenance |  |
 | Test.java:6866:66:6866:113 | of(...) : ImmutableMultimap [<map.key>] : Comparable | Test.java:6866:46:6866:114 | create(...) : TreeMultimap [<map.key>] : Comparable | provenance | MaD:552 |
-| Test.java:6866:87:6866:106 | (...)... : Comparable | Test.java:6866:66:6866:113 | of(...) : ImmutableMultimap [<map.key>] : Comparable | provenance | MaD:103 |
+| Test.java:6866:87:6866:106 | (...)... : Comparable | Test.java:6866:66:6866:113 | of(...) : ImmutableMultimap [<map.key>] : Comparable | provenance | MaD:121 |
 | Test.java:6866:99:6866:106 | source(...) : Object | Test.java:6866:87:6866:106 | (...)... : Comparable | provenance |  |
 | Test.java:6867:10:6867:52 | synchronizedSortedSetMultimap(...) : SortedSetMultimap [<map.key>] : Comparable | Test.java:6868:19:6868:21 | out : SortedSetMultimap [<map.key>] : Comparable | provenance |  |
 | Test.java:6867:50:6867:51 | in : TreeMultimap [<map.key>] : Comparable | Test.java:6867:10:6867:52 | synchronizedSortedSetMultimap(...) : SortedSetMultimap [<map.key>] : Comparable | provenance | MaD:427 |
@@ -7518,7 +7518,7 @@ edges
 | Test.java:6873:27:6873:114 | (...)... : TreeMultimap [<map.value>] : Comparable | Test.java:6874:50:6874:51 | in : TreeMultimap [<map.value>] : Comparable | provenance |  |
 | Test.java:6873:46:6873:114 | create(...) : TreeMultimap [<map.value>] : Comparable | Test.java:6873:27:6873:114 | (...)... : TreeMultimap [<map.value>] : Comparable | provenance |  |
 | Test.java:6873:66:6873:113 | of(...) : ImmutableMultimap [<map.value>] : Comparable | Test.java:6873:46:6873:114 | create(...) : TreeMultimap [<map.value>] : Comparable | provenance | MaD:553 |
-| Test.java:6873:93:6873:112 | (...)... : Comparable | Test.java:6873:66:6873:113 | of(...) : ImmutableMultimap [<map.value>] : Comparable | provenance | MaD:104 |
+| Test.java:6873:93:6873:112 | (...)... : Comparable | Test.java:6873:66:6873:113 | of(...) : ImmutableMultimap [<map.value>] : Comparable | provenance | MaD:122 |
 | Test.java:6873:105:6873:112 | source(...) : Object | Test.java:6873:93:6873:112 | (...)... : Comparable | provenance |  |
 | Test.java:6874:10:6874:52 | synchronizedSortedSetMultimap(...) : SortedSetMultimap [<map.value>] : Comparable | Test.java:6875:21:6875:23 | out : SortedSetMultimap [<map.value>] : Comparable | provenance |  |
 | Test.java:6874:50:6874:51 | in : TreeMultimap [<map.value>] : Comparable | Test.java:6874:10:6874:52 | synchronizedSortedSetMultimap(...) : SortedSetMultimap [<map.value>] : Comparable | provenance | MaD:428 |
@@ -7533,7 +7533,7 @@ edges
 | Test.java:6882:19:6882:21 | out : ListMultimap [<map.key>] : Object | Test.java:6882:9:6882:22 | getMapKey(...) | provenance | MaD:373 |
 | Test.java:6887:18:6887:63 | (...)... : ImmutableMultimap [<map.key>] : Object | Test.java:6888:36:6888:37 | in : ImmutableMultimap [<map.key>] : Object | provenance |  |
 | Test.java:6887:28:6887:63 | of(...) : ImmutableMultimap [<map.key>] : Object | Test.java:6887:18:6887:63 | (...)... : ImmutableMultimap [<map.key>] : Object | provenance |  |
-| Test.java:6887:49:6887:56 | source(...) : Object | Test.java:6887:28:6887:63 | of(...) : ImmutableMultimap [<map.key>] : Object | provenance | MaD:103 |
+| Test.java:6887:49:6887:56 | source(...) : Object | Test.java:6887:28:6887:63 | of(...) : ImmutableMultimap [<map.key>] : Object | provenance | MaD:121 |
 | Test.java:6888:10:6888:54 | transformValues(...) : Multimap [<map.key>] : Object | Test.java:6889:19:6889:21 | out : Multimap [<map.key>] : Object | provenance |  |
 | Test.java:6888:36:6888:37 | in : ImmutableMultimap [<map.key>] : Object | Test.java:6888:10:6888:54 | transformValues(...) : Multimap [<map.key>] : Object | provenance | MaD:430 |
 | Test.java:6889:19:6889:21 | out : Multimap [<map.key>] : Object | Test.java:100:18:100:34 | map : Multimap [<map.key>] : Object | provenance |  |
@@ -7568,28 +7568,28 @@ edges
 | Test.java:6917:21:6917:23 | out : ListMultimap [<map.value>] : Object | Test.java:6917:9:6917:24 | getMapValue(...) | provenance | MaD:385 |
 | Test.java:6922:27:6922:81 | (...)... : ImmutableMultimap [<map.key>] : Object | Test.java:6923:41:6923:42 | in : ImmutableMultimap [<map.key>] : Object | provenance |  |
 | Test.java:6922:46:6922:81 | of(...) : ImmutableMultimap [<map.key>] : Object | Test.java:6922:27:6922:81 | (...)... : ImmutableMultimap [<map.key>] : Object | provenance |  |
-| Test.java:6922:67:6922:74 | source(...) : Object | Test.java:6922:46:6922:81 | of(...) : ImmutableMultimap [<map.key>] : Object | provenance | MaD:103 |
+| Test.java:6922:67:6922:74 | source(...) : Object | Test.java:6922:46:6922:81 | of(...) : ImmutableMultimap [<map.key>] : Object | provenance | MaD:121 |
 | Test.java:6923:10:6923:43 | unmodifiableMultimap(...) : Multimap [<map.key>] : Object | Test.java:6924:19:6924:21 | out : Multimap [<map.key>] : Object | provenance |  |
 | Test.java:6923:41:6923:42 | in : ImmutableMultimap [<map.key>] : Object | Test.java:6923:10:6923:43 | unmodifiableMultimap(...) : Multimap [<map.key>] : Object | provenance | MaD:435 |
 | Test.java:6924:19:6924:21 | out : Multimap [<map.key>] : Object | Test.java:100:18:100:34 | map : Multimap [<map.key>] : Object | provenance |  |
 | Test.java:6924:19:6924:21 | out : Multimap [<map.key>] : Object | Test.java:6924:9:6924:22 | getMapKey(...) | provenance | MaD:373 |
 | Test.java:6929:27:6929:81 | (...)... : ImmutableMultimap [<map.value>] : Object | Test.java:6930:41:6930:42 | in : ImmutableMultimap [<map.value>] : Object | provenance |  |
 | Test.java:6929:46:6929:81 | of(...) : ImmutableMultimap [<map.value>] : Object | Test.java:6929:27:6929:81 | (...)... : ImmutableMultimap [<map.value>] : Object | provenance |  |
-| Test.java:6929:73:6929:80 | source(...) : Object | Test.java:6929:46:6929:81 | of(...) : ImmutableMultimap [<map.value>] : Object | provenance | MaD:104 |
+| Test.java:6929:73:6929:80 | source(...) : Object | Test.java:6929:46:6929:81 | of(...) : ImmutableMultimap [<map.value>] : Object | provenance | MaD:122 |
 | Test.java:6930:10:6930:43 | unmodifiableMultimap(...) : Multimap [<map.value>] : Object | Test.java:6931:21:6931:23 | out : Multimap [<map.value>] : Object | provenance |  |
 | Test.java:6930:41:6930:42 | in : ImmutableMultimap [<map.value>] : Object | Test.java:6930:10:6930:43 | unmodifiableMultimap(...) : Multimap [<map.value>] : Object | provenance | MaD:436 |
 | Test.java:6931:21:6931:23 | out : Multimap [<map.value>] : Object | Test.java:119:20:119:36 | map : Multimap [<map.value>] : Object | provenance |  |
 | Test.java:6931:21:6931:23 | out : Multimap [<map.value>] : Object | Test.java:6931:9:6931:24 | getMapValue(...) | provenance | MaD:385 |
 | Test.java:6936:18:6936:63 | (...)... : ImmutableMultimap [<map.key>] : Object | Test.java:6937:41:6937:42 | in : ImmutableMultimap [<map.key>] : Object | provenance |  |
 | Test.java:6936:28:6936:63 | of(...) : ImmutableMultimap [<map.key>] : Object | Test.java:6936:18:6936:63 | (...)... : ImmutableMultimap [<map.key>] : Object | provenance |  |
-| Test.java:6936:49:6936:56 | source(...) : Object | Test.java:6936:28:6936:63 | of(...) : ImmutableMultimap [<map.key>] : Object | provenance | MaD:103 |
+| Test.java:6936:49:6936:56 | source(...) : Object | Test.java:6936:28:6936:63 | of(...) : ImmutableMultimap [<map.key>] : Object | provenance | MaD:121 |
 | Test.java:6937:10:6937:43 | unmodifiableMultimap(...) : Multimap [<map.key>] : Object | Test.java:6938:19:6938:21 | out : Multimap [<map.key>] : Object | provenance |  |
 | Test.java:6937:41:6937:42 | in : ImmutableMultimap [<map.key>] : Object | Test.java:6937:10:6937:43 | unmodifiableMultimap(...) : Multimap [<map.key>] : Object | provenance | MaD:437 |
 | Test.java:6938:19:6938:21 | out : Multimap [<map.key>] : Object | Test.java:100:18:100:34 | map : Multimap [<map.key>] : Object | provenance |  |
 | Test.java:6938:19:6938:21 | out : Multimap [<map.key>] : Object | Test.java:6938:9:6938:22 | getMapKey(...) | provenance | MaD:373 |
 | Test.java:6943:18:6943:63 | (...)... : ImmutableMultimap [<map.value>] : Object | Test.java:6944:41:6944:42 | in : ImmutableMultimap [<map.value>] : Object | provenance |  |
 | Test.java:6943:28:6943:63 | of(...) : ImmutableMultimap [<map.value>] : Object | Test.java:6943:18:6943:63 | (...)... : ImmutableMultimap [<map.value>] : Object | provenance |  |
-| Test.java:6943:55:6943:62 | source(...) : Object | Test.java:6943:28:6943:63 | of(...) : ImmutableMultimap [<map.value>] : Object | provenance | MaD:104 |
+| Test.java:6943:55:6943:62 | source(...) : Object | Test.java:6943:28:6943:63 | of(...) : ImmutableMultimap [<map.value>] : Object | provenance | MaD:122 |
 | Test.java:6944:10:6944:43 | unmodifiableMultimap(...) : Multimap [<map.value>] : Object | Test.java:6945:21:6945:23 | out : Multimap [<map.value>] : Object | provenance |  |
 | Test.java:6944:41:6944:42 | in : ImmutableMultimap [<map.value>] : Object | Test.java:6944:10:6944:43 | unmodifiableMultimap(...) : Multimap [<map.value>] : Object | provenance | MaD:438 |
 | Test.java:6945:21:6945:23 | out : Multimap [<map.value>] : Object | Test.java:119:20:119:36 | map : Multimap [<map.value>] : Object | provenance |  |
@@ -7625,7 +7625,7 @@ edges
 | Test.java:6978:27:6978:114 | (...)... : TreeMultimap [<map.key>] : Comparable | Test.java:6979:50:6979:51 | in : TreeMultimap [<map.key>] : Comparable | provenance |  |
 | Test.java:6978:46:6978:114 | create(...) : TreeMultimap [<map.key>] : Comparable | Test.java:6978:27:6978:114 | (...)... : TreeMultimap [<map.key>] : Comparable | provenance |  |
 | Test.java:6978:66:6978:113 | of(...) : ImmutableMultimap [<map.key>] : Comparable | Test.java:6978:46:6978:114 | create(...) : TreeMultimap [<map.key>] : Comparable | provenance | MaD:552 |
-| Test.java:6978:87:6978:106 | (...)... : Comparable | Test.java:6978:66:6978:113 | of(...) : ImmutableMultimap [<map.key>] : Comparable | provenance | MaD:103 |
+| Test.java:6978:87:6978:106 | (...)... : Comparable | Test.java:6978:66:6978:113 | of(...) : ImmutableMultimap [<map.key>] : Comparable | provenance | MaD:121 |
 | Test.java:6978:99:6978:106 | source(...) : Object | Test.java:6978:87:6978:106 | (...)... : Comparable | provenance |  |
 | Test.java:6979:10:6979:52 | unmodifiableSortedSetMultimap(...) : SortedSetMultimap [<map.key>] : Comparable | Test.java:6980:19:6980:21 | out : SortedSetMultimap [<map.key>] : Comparable | provenance |  |
 | Test.java:6979:50:6979:51 | in : TreeMultimap [<map.key>] : Comparable | Test.java:6979:10:6979:52 | unmodifiableSortedSetMultimap(...) : SortedSetMultimap [<map.key>] : Comparable | provenance | MaD:443 |
@@ -7634,7 +7634,7 @@ edges
 | Test.java:6985:27:6985:114 | (...)... : TreeMultimap [<map.value>] : Comparable | Test.java:6986:50:6986:51 | in : TreeMultimap [<map.value>] : Comparable | provenance |  |
 | Test.java:6985:46:6985:114 | create(...) : TreeMultimap [<map.value>] : Comparable | Test.java:6985:27:6985:114 | (...)... : TreeMultimap [<map.value>] : Comparable | provenance |  |
 | Test.java:6985:66:6985:113 | of(...) : ImmutableMultimap [<map.value>] : Comparable | Test.java:6985:46:6985:114 | create(...) : TreeMultimap [<map.value>] : Comparable | provenance | MaD:553 |
-| Test.java:6985:93:6985:112 | (...)... : Comparable | Test.java:6985:66:6985:113 | of(...) : ImmutableMultimap [<map.value>] : Comparable | provenance | MaD:104 |
+| Test.java:6985:93:6985:112 | (...)... : Comparable | Test.java:6985:66:6985:113 | of(...) : ImmutableMultimap [<map.value>] : Comparable | provenance | MaD:122 |
 | Test.java:6985:105:6985:112 | source(...) : Object | Test.java:6985:93:6985:112 | (...)... : Comparable | provenance |  |
 | Test.java:6986:10:6986:52 | unmodifiableSortedSetMultimap(...) : SortedSetMultimap [<map.value>] : Comparable | Test.java:6987:21:6987:23 | out : SortedSetMultimap [<map.value>] : Comparable | provenance |  |
 | Test.java:6986:50:6986:51 | in : TreeMultimap [<map.value>] : Comparable | Test.java:6986:10:6986:52 | unmodifiableSortedSetMultimap(...) : SortedSetMultimap [<map.value>] : Comparable | provenance | MaD:444 |
@@ -7643,218 +7643,218 @@ edges
 | Test.java:6992:24:6992:68 | (...)... : Entry [<element>] : Object | Test.java:6993:10:6993:11 | in : Entry [<element>] : Object | provenance |  |
 | Test.java:6992:40:6992:68 | newEntryWithElement(...) : Entry [<element>] : Object | Test.java:6992:24:6992:68 | (...)... : Entry [<element>] : Object | provenance |  |
 | Test.java:6992:60:6992:67 | source(...) : Object | Test.java:106:44:106:47 | el : Object | provenance |  |
-| Test.java:6992:60:6992:67 | source(...) : Object | Test.java:6992:40:6992:68 | newEntryWithElement(...) : Entry [<element>] : Object | provenance | MaD:134 |
-| Test.java:6993:10:6993:11 | in : Entry [<element>] : Object | Test.java:6993:10:6993:24 | getElement(...) : Object | provenance | MaD:450 |
+| Test.java:6992:60:6992:67 | source(...) : Object | Test.java:6992:40:6992:68 | newEntryWithElement(...) : Entry [<element>] : Object | provenance | MaD:137 |
+| Test.java:6993:10:6993:11 | in : Entry [<element>] : Object | Test.java:6993:10:6993:24 | getElement(...) : Object | provenance | MaD:445 |
 | Test.java:6993:10:6993:24 | getElement(...) : Object | Test.java:6994:9:6994:11 | out | provenance |  |
 | Test.java:6999:16:6999:31 | (...)... : Object | Test.java:7000:12:7000:13 | in : Object | provenance |  |
 | Test.java:6999:24:6999:31 | source(...) : Object | Test.java:6999:16:6999:31 | (...)... : Object | provenance |  |
 | Test.java:7000:4:7000:6 | out [post update] : TreeMultiset [<element>] : Object | Test.java:7001:20:7001:22 | out : TreeMultiset [<element>] : Object | provenance |  |
-| Test.java:7000:12:7000:13 | in : Object | Test.java:7000:4:7000:6 | out [post update] : TreeMultiset [<element>] : Object | provenance | MaD:445 |
+| Test.java:7000:12:7000:13 | in : Object | Test.java:7000:4:7000:6 | out [post update] : TreeMultiset [<element>] : Object | provenance | MaD:446 |
 | Test.java:7001:20:7001:22 | out : TreeMultiset [<element>] : Object | Test.java:110:19:110:32 | it : TreeMultiset [<element>] : Object | provenance |  |
-| Test.java:7001:20:7001:22 | out : TreeMultiset [<element>] : Object | Test.java:7001:9:7001:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:7001:20:7001:22 | out : TreeMultiset [<element>] : Object | Test.java:7001:9:7001:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:7006:16:7006:31 | (...)... : Object | Test.java:7007:12:7007:13 | in : Object | provenance |  |
 | Test.java:7006:24:7006:31 | source(...) : Object | Test.java:7006:16:7006:31 | (...)... : Object | provenance |  |
 | Test.java:7007:4:7007:6 | out [post update] : Multiset [<element>] : Object | Test.java:7008:20:7008:22 | out : Multiset [<element>] : Object | provenance |  |
-| Test.java:7007:12:7007:13 | in : Object | Test.java:7007:4:7007:6 | out [post update] : Multiset [<element>] : Object | provenance | MaD:445 |
+| Test.java:7007:12:7007:13 | in : Object | Test.java:7007:4:7007:6 | out [post update] : Multiset [<element>] : Object | provenance | MaD:446 |
 | Test.java:7008:20:7008:22 | out : Multiset [<element>] : Object | Test.java:110:19:110:32 | it : Multiset [<element>] : Object | provenance |  |
-| Test.java:7008:20:7008:22 | out : Multiset [<element>] : Object | Test.java:7008:9:7008:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:7008:20:7008:22 | out : Multiset [<element>] : Object | Test.java:7008:9:7008:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:7013:16:7013:31 | (...)... : Object | Test.java:7014:12:7014:13 | in : Object | provenance |  |
 | Test.java:7013:24:7013:31 | source(...) : Object | Test.java:7013:16:7013:31 | (...)... : Object | provenance |  |
 | Test.java:7014:4:7014:6 | out [post update] : ImmutableMultiset [<element>] : Object | Test.java:7015:20:7015:22 | out : ImmutableMultiset [<element>] : Object | provenance |  |
-| Test.java:7014:12:7014:13 | in : Object | Test.java:7014:4:7014:6 | out [post update] : ImmutableMultiset [<element>] : Object | provenance | MaD:445 |
+| Test.java:7014:12:7014:13 | in : Object | Test.java:7014:4:7014:6 | out [post update] : ImmutableMultiset [<element>] : Object | provenance | MaD:446 |
 | Test.java:7015:20:7015:22 | out : ImmutableMultiset [<element>] : Object | Test.java:110:19:110:32 | it : ImmutableMultiset [<element>] : Object | provenance |  |
-| Test.java:7015:20:7015:22 | out : ImmutableMultiset [<element>] : Object | Test.java:7015:9:7015:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:7015:20:7015:22 | out : ImmutableMultiset [<element>] : Object | Test.java:7015:9:7015:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:7020:16:7020:31 | (...)... : Object | Test.java:7021:12:7021:13 | in : Object | provenance |  |
 | Test.java:7020:24:7020:31 | source(...) : Object | Test.java:7020:16:7020:31 | (...)... : Object | provenance |  |
 | Test.java:7021:4:7021:6 | out [post update] : ConcurrentHashMultiset [<element>] : Object | Test.java:7022:20:7022:22 | out : ConcurrentHashMultiset [<element>] : Object | provenance |  |
-| Test.java:7021:12:7021:13 | in : Object | Test.java:7021:4:7021:6 | out [post update] : ConcurrentHashMultiset [<element>] : Object | provenance | MaD:445 |
+| Test.java:7021:12:7021:13 | in : Object | Test.java:7021:4:7021:6 | out [post update] : ConcurrentHashMultiset [<element>] : Object | provenance | MaD:446 |
 | Test.java:7022:20:7022:22 | out : ConcurrentHashMultiset [<element>] : Object | Test.java:110:19:110:32 | it : ConcurrentHashMultiset [<element>] : Object | provenance |  |
-| Test.java:7022:20:7022:22 | out : ConcurrentHashMultiset [<element>] : Object | Test.java:7022:9:7022:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:7022:20:7022:22 | out : ConcurrentHashMultiset [<element>] : Object | Test.java:7022:9:7022:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:7027:18:7027:57 | (...)... : ImmutableMultiset [<element>] : Object | Test.java:7028:10:7028:11 | in : ImmutableMultiset [<element>] : Object | provenance |  |
 | Test.java:7027:28:7027:57 | of(...) : ImmutableMultiset [<element>] : Object | Test.java:7027:18:7027:57 | (...)... : ImmutableMultiset [<element>] : Object | provenance |  |
-| Test.java:7027:49:7027:56 | source(...) : Object | Test.java:7027:28:7027:57 | of(...) : ImmutableMultiset [<element>] : Object | provenance | MaD:134 |
-| Test.java:7028:10:7028:11 | in : ImmutableMultiset [<element>] : Object | Test.java:7028:10:7028:24 | elementSet(...) : Set [<element>] : Object | provenance | MaD:446 |
+| Test.java:7027:49:7027:56 | source(...) : Object | Test.java:7027:28:7027:57 | of(...) : ImmutableMultiset [<element>] : Object | provenance | MaD:137 |
+| Test.java:7028:10:7028:11 | in : ImmutableMultiset [<element>] : Object | Test.java:7028:10:7028:24 | elementSet(...) : Set [<element>] : Object | provenance | MaD:447 |
 | Test.java:7028:10:7028:24 | elementSet(...) : Set [<element>] : Object | Test.java:7029:20:7029:22 | out : Set [<element>] : Object | provenance |  |
 | Test.java:7029:20:7029:22 | out : Set [<element>] : Object | Test.java:110:19:110:32 | it : Set [<element>] : Object | provenance |  |
-| Test.java:7029:20:7029:22 | out : Set [<element>] : Object | Test.java:7029:9:7029:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:7029:20:7029:22 | out : Set [<element>] : Object | Test.java:7029:9:7029:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:7034:24:7034:87 | (...)... : ImmutableSortedMultiset [<element>] : Comparable | Test.java:7035:10:7035:11 | in : ImmutableSortedMultiset [<element>] : Comparable | provenance |  |
 | Test.java:7034:40:7034:87 | of(...) : ImmutableSortedMultiset [<element>] : Comparable | Test.java:7034:24:7034:87 | (...)... : ImmutableSortedMultiset [<element>] : Comparable | provenance |  |
 | Test.java:7034:67:7034:86 | (...)... : Comparable | Test.java:7034:40:7034:87 | of(...) : ImmutableSortedMultiset [<element>] : Comparable | provenance | MaD:181 |
 | Test.java:7034:79:7034:86 | source(...) : Object | Test.java:7034:67:7034:86 | (...)... : Comparable | provenance |  |
-| Test.java:7035:10:7035:11 | in : ImmutableSortedMultiset [<element>] : Comparable | Test.java:7035:10:7035:24 | elementSet(...) : NavigableSet [<element>] : Comparable | provenance | MaD:446 |
+| Test.java:7035:10:7035:11 | in : ImmutableSortedMultiset [<element>] : Comparable | Test.java:7035:10:7035:24 | elementSet(...) : NavigableSet [<element>] : Comparable | provenance | MaD:447 |
 | Test.java:7035:10:7035:24 | elementSet(...) : NavigableSet [<element>] : Comparable | Test.java:7036:20:7036:22 | out : NavigableSet [<element>] : Comparable | provenance |  |
 | Test.java:7036:20:7036:22 | out : NavigableSet [<element>] : Comparable | Test.java:110:19:110:32 | it : NavigableSet [<element>] : Comparable | provenance |  |
-| Test.java:7036:20:7036:22 | out : NavigableSet [<element>] : Comparable | Test.java:7036:9:7036:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:7036:20:7036:22 | out : NavigableSet [<element>] : Comparable | Test.java:7036:9:7036:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:7041:33:7041:105 | (...)... : ImmutableSortedMultiset [<element>] : Comparable | Test.java:7042:10:7042:11 | in : ImmutableSortedMultiset [<element>] : Comparable | provenance |  |
 | Test.java:7041:58:7041:105 | of(...) : ImmutableSortedMultiset [<element>] : Comparable | Test.java:7041:33:7041:105 | (...)... : ImmutableSortedMultiset [<element>] : Comparable | provenance |  |
 | Test.java:7041:85:7041:104 | (...)... : Comparable | Test.java:7041:58:7041:105 | of(...) : ImmutableSortedMultiset [<element>] : Comparable | provenance | MaD:181 |
 | Test.java:7041:97:7041:104 | source(...) : Object | Test.java:7041:85:7041:104 | (...)... : Comparable | provenance |  |
-| Test.java:7042:10:7042:11 | in : ImmutableSortedMultiset [<element>] : Comparable | Test.java:7042:10:7042:24 | elementSet(...) : ImmutableSortedSet [<element>] : Comparable | provenance | MaD:446 |
+| Test.java:7042:10:7042:11 | in : ImmutableSortedMultiset [<element>] : Comparable | Test.java:7042:10:7042:24 | elementSet(...) : ImmutableSortedSet [<element>] : Comparable | provenance | MaD:447 |
 | Test.java:7042:10:7042:24 | elementSet(...) : ImmutableSortedSet [<element>] : Comparable | Test.java:7043:20:7043:22 | out : ImmutableSortedSet [<element>] : Comparable | provenance |  |
 | Test.java:7043:20:7043:22 | out : ImmutableSortedSet [<element>] : Comparable | Test.java:110:19:110:32 | it : ImmutableSortedSet [<element>] : Comparable | provenance |  |
-| Test.java:7043:20:7043:22 | out : ImmutableSortedSet [<element>] : Comparable | Test.java:7043:9:7043:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:7043:20:7043:22 | out : ImmutableSortedSet [<element>] : Comparable | Test.java:7043:9:7043:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:7048:27:7048:75 | (...)... : ImmutableMultiset [<element>] : Object | Test.java:7049:10:7049:11 | in : ImmutableMultiset [<element>] : Object | provenance |  |
 | Test.java:7048:46:7048:75 | of(...) : ImmutableMultiset [<element>] : Object | Test.java:7048:27:7048:75 | (...)... : ImmutableMultiset [<element>] : Object | provenance |  |
-| Test.java:7048:67:7048:74 | source(...) : Object | Test.java:7048:46:7048:75 | of(...) : ImmutableMultiset [<element>] : Object | provenance | MaD:134 |
-| Test.java:7049:10:7049:11 | in : ImmutableMultiset [<element>] : Object | Test.java:7049:10:7049:24 | elementSet(...) : ImmutableSet [<element>] : Object | provenance | MaD:446 |
+| Test.java:7048:67:7048:74 | source(...) : Object | Test.java:7048:46:7048:75 | of(...) : ImmutableMultiset [<element>] : Object | provenance | MaD:137 |
+| Test.java:7049:10:7049:11 | in : ImmutableMultiset [<element>] : Object | Test.java:7049:10:7049:24 | elementSet(...) : ImmutableSet [<element>] : Object | provenance | MaD:447 |
 | Test.java:7049:10:7049:24 | elementSet(...) : ImmutableSet [<element>] : Object | Test.java:7050:20:7050:22 | out : ImmutableSet [<element>] : Object | provenance |  |
 | Test.java:7050:20:7050:22 | out : ImmutableSet [<element>] : Object | Test.java:110:19:110:32 | it : ImmutableSet [<element>] : Object | provenance |  |
-| Test.java:7050:20:7050:22 | out : ImmutableSet [<element>] : Object | Test.java:7050:9:7050:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:7050:20:7050:22 | out : ImmutableSet [<element>] : Object | Test.java:7050:9:7050:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:7055:24:7055:87 | (...)... : ImmutableSortedMultiset [<element>] : Comparable | Test.java:7056:10:7056:11 | in : ImmutableSortedMultiset [<element>] : Comparable | provenance |  |
 | Test.java:7055:40:7055:87 | of(...) : ImmutableSortedMultiset [<element>] : Comparable | Test.java:7055:24:7055:87 | (...)... : ImmutableSortedMultiset [<element>] : Comparable | provenance |  |
 | Test.java:7055:67:7055:86 | (...)... : Comparable | Test.java:7055:40:7055:87 | of(...) : ImmutableSortedMultiset [<element>] : Comparable | provenance | MaD:181 |
 | Test.java:7055:79:7055:86 | source(...) : Object | Test.java:7055:67:7055:86 | (...)... : Comparable | provenance |  |
-| Test.java:7056:10:7056:11 | in : ImmutableSortedMultiset [<element>] : Comparable | Test.java:7056:10:7056:22 | entrySet(...) : Set [<element>, <element>] : Comparable | provenance | MaD:447 |
+| Test.java:7056:10:7056:11 | in : ImmutableSortedMultiset [<element>] : Comparable | Test.java:7056:10:7056:22 | entrySet(...) : Set [<element>, <element>] : Comparable | provenance | MaD:448 |
 | Test.java:7056:10:7056:22 | entrySet(...) : Set [<element>, <element>] : Comparable | Test.java:7057:20:7057:22 | out : Set [<element>, <element>] : Comparable | provenance |  |
-| Test.java:7057:9:7057:23 | getElement(...) : Entry [<element>] : Comparable | Test.java:7057:9:7057:36 | getElement(...) | provenance | MaD:450 |
+| Test.java:7057:9:7057:23 | getElement(...) : Entry [<element>] : Comparable | Test.java:7057:9:7057:36 | getElement(...) | provenance | MaD:445 |
 | Test.java:7057:20:7057:22 | out : Set [<element>, <element>] : Comparable | Test.java:110:19:110:32 | it : Set [<element>, <element>] : Comparable | provenance |  |
-| Test.java:7057:20:7057:22 | out : Set [<element>, <element>] : Comparable | Test.java:7057:9:7057:23 | getElement(...) : Entry [<element>] : Comparable | provenance | MaD:555 |
+| Test.java:7057:20:7057:22 | out : Set [<element>, <element>] : Comparable | Test.java:7057:9:7057:23 | getElement(...) : Entry [<element>] : Comparable | provenance | MaD:558 |
 | Test.java:7062:18:7062:57 | (...)... : ImmutableMultiset [<element>] : Object | Test.java:7063:10:7063:11 | in : ImmutableMultiset [<element>] : Object | provenance |  |
 | Test.java:7062:28:7062:57 | of(...) : ImmutableMultiset [<element>] : Object | Test.java:7062:18:7062:57 | (...)... : ImmutableMultiset [<element>] : Object | provenance |  |
-| Test.java:7062:49:7062:56 | source(...) : Object | Test.java:7062:28:7062:57 | of(...) : ImmutableMultiset [<element>] : Object | provenance | MaD:134 |
-| Test.java:7063:10:7063:11 | in : ImmutableMultiset [<element>] : Object | Test.java:7063:10:7063:22 | entrySet(...) : Set [<element>, <element>] : Object | provenance | MaD:447 |
+| Test.java:7062:49:7062:56 | source(...) : Object | Test.java:7062:28:7062:57 | of(...) : ImmutableMultiset [<element>] : Object | provenance | MaD:137 |
+| Test.java:7063:10:7063:11 | in : ImmutableMultiset [<element>] : Object | Test.java:7063:10:7063:22 | entrySet(...) : Set [<element>, <element>] : Object | provenance | MaD:448 |
 | Test.java:7063:10:7063:22 | entrySet(...) : Set [<element>, <element>] : Object | Test.java:7064:20:7064:22 | out : Set [<element>, <element>] : Object | provenance |  |
-| Test.java:7064:9:7064:23 | getElement(...) : Entry [<element>] : Object | Test.java:7064:9:7064:36 | getElement(...) | provenance | MaD:450 |
+| Test.java:7064:9:7064:23 | getElement(...) : Entry [<element>] : Object | Test.java:7064:9:7064:36 | getElement(...) | provenance | MaD:445 |
 | Test.java:7064:20:7064:22 | out : Set [<element>, <element>] : Object | Test.java:110:19:110:32 | it : Set [<element>, <element>] : Object | provenance |  |
-| Test.java:7064:20:7064:22 | out : Set [<element>, <element>] : Object | Test.java:7064:9:7064:23 | getElement(...) : Entry [<element>] : Object | provenance | MaD:555 |
+| Test.java:7064:20:7064:22 | out : Set [<element>, <element>] : Object | Test.java:7064:9:7064:23 | getElement(...) : Entry [<element>] : Object | provenance | MaD:558 |
 | Test.java:7069:27:7069:75 | (...)... : ImmutableMultiset [<element>] : Object | Test.java:7070:10:7070:11 | in : ImmutableMultiset [<element>] : Object | provenance |  |
 | Test.java:7069:46:7069:75 | of(...) : ImmutableMultiset [<element>] : Object | Test.java:7069:27:7069:75 | (...)... : ImmutableMultiset [<element>] : Object | provenance |  |
-| Test.java:7069:67:7069:74 | source(...) : Object | Test.java:7069:46:7069:75 | of(...) : ImmutableMultiset [<element>] : Object | provenance | MaD:134 |
-| Test.java:7070:10:7070:11 | in : ImmutableMultiset [<element>] : Object | Test.java:7070:10:7070:22 | entrySet(...) : ImmutableSet [<element>, <element>] : Object | provenance | MaD:447 |
+| Test.java:7069:67:7069:74 | source(...) : Object | Test.java:7069:46:7069:75 | of(...) : ImmutableMultiset [<element>] : Object | provenance | MaD:137 |
+| Test.java:7070:10:7070:11 | in : ImmutableMultiset [<element>] : Object | Test.java:7070:10:7070:22 | entrySet(...) : ImmutableSet [<element>, <element>] : Object | provenance | MaD:448 |
 | Test.java:7070:10:7070:22 | entrySet(...) : ImmutableSet [<element>, <element>] : Object | Test.java:7071:20:7071:22 | out : ImmutableSet [<element>, <element>] : Object | provenance |  |
-| Test.java:7071:9:7071:23 | getElement(...) : Entry [<element>] : Object | Test.java:7071:9:7071:36 | getElement(...) | provenance | MaD:450 |
+| Test.java:7071:9:7071:23 | getElement(...) : Entry [<element>] : Object | Test.java:7071:9:7071:36 | getElement(...) | provenance | MaD:445 |
 | Test.java:7071:20:7071:22 | out : ImmutableSet [<element>, <element>] : Object | Test.java:110:19:110:32 | it : ImmutableSet [<element>, <element>] : Object | provenance |  |
-| Test.java:7071:20:7071:22 | out : ImmutableSet [<element>, <element>] : Object | Test.java:7071:9:7071:23 | getElement(...) : Entry [<element>] : Object | provenance | MaD:555 |
+| Test.java:7071:20:7071:22 | out : ImmutableSet [<element>, <element>] : Object | Test.java:7071:9:7071:23 | getElement(...) : Entry [<element>] : Object | provenance | MaD:558 |
 | Test.java:7076:16:7076:31 | (...)... : Object | Test.java:7077:17:7077:18 | in : Object | provenance |  |
 | Test.java:7076:24:7076:31 | source(...) : Object | Test.java:7076:16:7076:31 | (...)... : Object | provenance |  |
 | Test.java:7077:4:7077:6 | out [post update] : TreeMultiset [<element>] : Object | Test.java:7078:20:7078:22 | out : TreeMultiset [<element>] : Object | provenance |  |
-| Test.java:7077:17:7077:18 | in : Object | Test.java:7077:4:7077:6 | out [post update] : TreeMultiset [<element>] : Object | provenance | MaD:448 |
+| Test.java:7077:17:7077:18 | in : Object | Test.java:7077:4:7077:6 | out [post update] : TreeMultiset [<element>] : Object | provenance | MaD:449 |
 | Test.java:7078:20:7078:22 | out : TreeMultiset [<element>] : Object | Test.java:110:19:110:32 | it : TreeMultiset [<element>] : Object | provenance |  |
-| Test.java:7078:20:7078:22 | out : TreeMultiset [<element>] : Object | Test.java:7078:9:7078:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:7078:20:7078:22 | out : TreeMultiset [<element>] : Object | Test.java:7078:9:7078:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:7083:16:7083:31 | (...)... : Object | Test.java:7084:17:7084:18 | in : Object | provenance |  |
 | Test.java:7083:24:7083:31 | source(...) : Object | Test.java:7083:16:7083:31 | (...)... : Object | provenance |  |
 | Test.java:7084:4:7084:6 | out [post update] : Multiset [<element>] : Object | Test.java:7085:20:7085:22 | out : Multiset [<element>] : Object | provenance |  |
-| Test.java:7084:17:7084:18 | in : Object | Test.java:7084:4:7084:6 | out [post update] : Multiset [<element>] : Object | provenance | MaD:448 |
+| Test.java:7084:17:7084:18 | in : Object | Test.java:7084:4:7084:6 | out [post update] : Multiset [<element>] : Object | provenance | MaD:449 |
 | Test.java:7085:20:7085:22 | out : Multiset [<element>] : Object | Test.java:110:19:110:32 | it : Multiset [<element>] : Object | provenance |  |
-| Test.java:7085:20:7085:22 | out : Multiset [<element>] : Object | Test.java:7085:9:7085:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:7085:20:7085:22 | out : Multiset [<element>] : Object | Test.java:7085:9:7085:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:7090:16:7090:31 | (...)... : Object | Test.java:7091:17:7091:18 | in : Object | provenance |  |
 | Test.java:7090:24:7090:31 | source(...) : Object | Test.java:7090:16:7090:31 | (...)... : Object | provenance |  |
 | Test.java:7091:4:7091:6 | out [post update] : ImmutableMultiset [<element>] : Object | Test.java:7092:20:7092:22 | out : ImmutableMultiset [<element>] : Object | provenance |  |
-| Test.java:7091:17:7091:18 | in : Object | Test.java:7091:4:7091:6 | out [post update] : ImmutableMultiset [<element>] : Object | provenance | MaD:448 |
+| Test.java:7091:17:7091:18 | in : Object | Test.java:7091:4:7091:6 | out [post update] : ImmutableMultiset [<element>] : Object | provenance | MaD:449 |
 | Test.java:7092:20:7092:22 | out : ImmutableMultiset [<element>] : Object | Test.java:110:19:110:32 | it : ImmutableMultiset [<element>] : Object | provenance |  |
-| Test.java:7092:20:7092:22 | out : ImmutableMultiset [<element>] : Object | Test.java:7092:9:7092:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:7092:20:7092:22 | out : ImmutableMultiset [<element>] : Object | Test.java:7092:9:7092:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:7097:16:7097:31 | (...)... : Object | Test.java:7098:17:7098:18 | in : Object | provenance |  |
 | Test.java:7097:24:7097:31 | source(...) : Object | Test.java:7097:16:7097:31 | (...)... : Object | provenance |  |
 | Test.java:7098:4:7098:6 | out [post update] : ConcurrentHashMultiset [<element>] : Object | Test.java:7099:20:7099:22 | out : ConcurrentHashMultiset [<element>] : Object | provenance |  |
-| Test.java:7098:17:7098:18 | in : Object | Test.java:7098:4:7098:6 | out [post update] : ConcurrentHashMultiset [<element>] : Object | provenance | MaD:448 |
+| Test.java:7098:17:7098:18 | in : Object | Test.java:7098:4:7098:6 | out [post update] : ConcurrentHashMultiset [<element>] : Object | provenance | MaD:449 |
 | Test.java:7099:20:7099:22 | out : ConcurrentHashMultiset [<element>] : Object | Test.java:110:19:110:32 | it : ConcurrentHashMultiset [<element>] : Object | provenance |  |
-| Test.java:7099:20:7099:22 | out : ConcurrentHashMultiset [<element>] : Object | Test.java:7099:9:7099:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:7099:20:7099:22 | out : ConcurrentHashMultiset [<element>] : Object | Test.java:7099:9:7099:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:7104:16:7104:31 | (...)... : Object | Test.java:7105:17:7105:18 | in : Object | provenance |  |
 | Test.java:7104:24:7104:31 | source(...) : Object | Test.java:7104:16:7104:31 | (...)... : Object | provenance |  |
 | Test.java:7105:4:7105:6 | out [post update] : TreeMultiset [<element>] : Object | Test.java:7106:20:7106:22 | out : TreeMultiset [<element>] : Object | provenance |  |
-| Test.java:7105:17:7105:18 | in : Object | Test.java:7105:4:7105:6 | out [post update] : TreeMultiset [<element>] : Object | provenance | MaD:449 |
+| Test.java:7105:17:7105:18 | in : Object | Test.java:7105:4:7105:6 | out [post update] : TreeMultiset [<element>] : Object | provenance | MaD:450 |
 | Test.java:7106:20:7106:22 | out : TreeMultiset [<element>] : Object | Test.java:110:19:110:32 | it : TreeMultiset [<element>] : Object | provenance |  |
-| Test.java:7106:20:7106:22 | out : TreeMultiset [<element>] : Object | Test.java:7106:9:7106:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:7106:20:7106:22 | out : TreeMultiset [<element>] : Object | Test.java:7106:9:7106:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:7111:16:7111:31 | (...)... : Object | Test.java:7112:17:7112:18 | in : Object | provenance |  |
 | Test.java:7111:24:7111:31 | source(...) : Object | Test.java:7111:16:7111:31 | (...)... : Object | provenance |  |
 | Test.java:7112:4:7112:6 | out [post update] : Multiset [<element>] : Object | Test.java:7113:20:7113:22 | out : Multiset [<element>] : Object | provenance |  |
-| Test.java:7112:17:7112:18 | in : Object | Test.java:7112:4:7112:6 | out [post update] : Multiset [<element>] : Object | provenance | MaD:449 |
+| Test.java:7112:17:7112:18 | in : Object | Test.java:7112:4:7112:6 | out [post update] : Multiset [<element>] : Object | provenance | MaD:450 |
 | Test.java:7113:20:7113:22 | out : Multiset [<element>] : Object | Test.java:110:19:110:32 | it : Multiset [<element>] : Object | provenance |  |
-| Test.java:7113:20:7113:22 | out : Multiset [<element>] : Object | Test.java:7113:9:7113:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:7113:20:7113:22 | out : Multiset [<element>] : Object | Test.java:7113:9:7113:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:7118:16:7118:31 | (...)... : Object | Test.java:7119:17:7119:18 | in : Object | provenance |  |
 | Test.java:7118:24:7118:31 | source(...) : Object | Test.java:7118:16:7118:31 | (...)... : Object | provenance |  |
 | Test.java:7119:4:7119:6 | out [post update] : ImmutableMultiset [<element>] : Object | Test.java:7120:20:7120:22 | out : ImmutableMultiset [<element>] : Object | provenance |  |
-| Test.java:7119:17:7119:18 | in : Object | Test.java:7119:4:7119:6 | out [post update] : ImmutableMultiset [<element>] : Object | provenance | MaD:449 |
+| Test.java:7119:17:7119:18 | in : Object | Test.java:7119:4:7119:6 | out [post update] : ImmutableMultiset [<element>] : Object | provenance | MaD:450 |
 | Test.java:7120:20:7120:22 | out : ImmutableMultiset [<element>] : Object | Test.java:110:19:110:32 | it : ImmutableMultiset [<element>] : Object | provenance |  |
-| Test.java:7120:20:7120:22 | out : ImmutableMultiset [<element>] : Object | Test.java:7120:9:7120:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:7120:20:7120:22 | out : ImmutableMultiset [<element>] : Object | Test.java:7120:9:7120:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:7125:16:7125:31 | (...)... : Object | Test.java:7126:17:7126:18 | in : Object | provenance |  |
 | Test.java:7125:24:7125:31 | source(...) : Object | Test.java:7125:16:7125:31 | (...)... : Object | provenance |  |
 | Test.java:7126:4:7126:6 | out [post update] : ConcurrentHashMultiset [<element>] : Object | Test.java:7127:20:7127:22 | out : ConcurrentHashMultiset [<element>] : Object | provenance |  |
-| Test.java:7126:17:7126:18 | in : Object | Test.java:7126:4:7126:6 | out [post update] : ConcurrentHashMultiset [<element>] : Object | provenance | MaD:449 |
+| Test.java:7126:17:7126:18 | in : Object | Test.java:7126:4:7126:6 | out [post update] : ConcurrentHashMultiset [<element>] : Object | provenance | MaD:450 |
 | Test.java:7127:20:7127:22 | out : ConcurrentHashMultiset [<element>] : Object | Test.java:110:19:110:32 | it : ConcurrentHashMultiset [<element>] : Object | provenance |  |
-| Test.java:7127:20:7127:22 | out : ConcurrentHashMultiset [<element>] : Object | Test.java:7127:9:7127:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:7127:20:7127:22 | out : ConcurrentHashMultiset [<element>] : Object | Test.java:7127:9:7127:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:7132:18:7132:57 | (...)... : ImmutableMultiset [<element>] : Object | Test.java:7133:42:7133:43 | in : ImmutableMultiset [<element>] : Object | provenance |  |
 | Test.java:7132:28:7132:57 | of(...) : ImmutableMultiset [<element>] : Object | Test.java:7132:18:7132:57 | (...)... : ImmutableMultiset [<element>] : Object | provenance |  |
-| Test.java:7132:49:7132:56 | source(...) : Object | Test.java:7132:28:7132:57 | of(...) : ImmutableMultiset [<element>] : Object | provenance | MaD:134 |
+| Test.java:7132:49:7132:56 | source(...) : Object | Test.java:7132:28:7132:57 | of(...) : ImmutableMultiset [<element>] : Object | provenance | MaD:137 |
 | Test.java:7133:10:7133:44 | copyHighestCountFirst(...) : ImmutableMultiset [<element>] : Object | Test.java:7134:20:7134:22 | out : ImmutableMultiset [<element>] : Object | provenance |  |
 | Test.java:7133:42:7133:43 | in : ImmutableMultiset [<element>] : Object | Test.java:7133:10:7133:44 | copyHighestCountFirst(...) : ImmutableMultiset [<element>] : Object | provenance | MaD:451 |
 | Test.java:7134:20:7134:22 | out : ImmutableMultiset [<element>] : Object | Test.java:110:19:110:32 | it : ImmutableMultiset [<element>] : Object | provenance |  |
-| Test.java:7134:20:7134:22 | out : ImmutableMultiset [<element>] : Object | Test.java:7134:9:7134:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:7134:20:7134:22 | out : ImmutableMultiset [<element>] : Object | Test.java:7134:9:7134:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:7139:18:7139:57 | (...)... : ImmutableMultiset [<element>] : Object | Test.java:7140:31:7140:32 | in : ImmutableMultiset [<element>] : Object | provenance |  |
 | Test.java:7139:28:7139:57 | of(...) : ImmutableMultiset [<element>] : Object | Test.java:7139:18:7139:57 | (...)... : ImmutableMultiset [<element>] : Object | provenance |  |
-| Test.java:7139:49:7139:56 | source(...) : Object | Test.java:7139:28:7139:57 | of(...) : ImmutableMultiset [<element>] : Object | provenance | MaD:134 |
+| Test.java:7139:49:7139:56 | source(...) : Object | Test.java:7139:28:7139:57 | of(...) : ImmutableMultiset [<element>] : Object | provenance | MaD:137 |
 | Test.java:7140:10:7140:39 | difference(...) : Multiset [<element>] : Object | Test.java:7141:20:7141:22 | out : Multiset [<element>] : Object | provenance |  |
 | Test.java:7140:31:7140:32 | in : ImmutableMultiset [<element>] : Object | Test.java:7140:10:7140:39 | difference(...) : Multiset [<element>] : Object | provenance | MaD:452 |
 | Test.java:7141:20:7141:22 | out : Multiset [<element>] : Object | Test.java:110:19:110:32 | it : Multiset [<element>] : Object | provenance |  |
-| Test.java:7141:20:7141:22 | out : Multiset [<element>] : Object | Test.java:7141:9:7141:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:7141:20:7141:22 | out : Multiset [<element>] : Object | Test.java:7141:9:7141:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:7146:18:7146:57 | (...)... : ImmutableMultiset [<element>] : Object | Test.java:7147:27:7147:28 | in : ImmutableMultiset [<element>] : Object | provenance |  |
 | Test.java:7146:28:7146:57 | of(...) : ImmutableMultiset [<element>] : Object | Test.java:7146:18:7146:57 | (...)... : ImmutableMultiset [<element>] : Object | provenance |  |
-| Test.java:7146:49:7146:56 | source(...) : Object | Test.java:7146:28:7146:57 | of(...) : ImmutableMultiset [<element>] : Object | provenance | MaD:134 |
+| Test.java:7146:49:7146:56 | source(...) : Object | Test.java:7146:28:7146:57 | of(...) : ImmutableMultiset [<element>] : Object | provenance | MaD:137 |
 | Test.java:7147:10:7147:35 | filter(...) : Multiset [<element>] : Object | Test.java:7148:20:7148:22 | out : Multiset [<element>] : Object | provenance |  |
 | Test.java:7147:27:7147:28 | in : ImmutableMultiset [<element>] : Object | Test.java:7147:10:7147:35 | filter(...) : Multiset [<element>] : Object | provenance | MaD:453 |
 | Test.java:7148:20:7148:22 | out : Multiset [<element>] : Object | Test.java:110:19:110:32 | it : Multiset [<element>] : Object | provenance |  |
-| Test.java:7148:20:7148:22 | out : Multiset [<element>] : Object | Test.java:7148:9:7148:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:7148:20:7148:22 | out : Multiset [<element>] : Object | Test.java:7148:9:7148:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:7153:16:7153:31 | (...)... : Object | Test.java:7154:35:7154:36 | in : Object | provenance |  |
 | Test.java:7153:24:7153:31 | source(...) : Object | Test.java:7153:16:7153:31 | (...)... : Object | provenance |  |
 | Test.java:7154:10:7154:40 | immutableEntry(...) : Entry [<element>] : Object | Test.java:7155:9:7155:11 | out : Entry [<element>] : Object | provenance |  |
 | Test.java:7154:35:7154:36 | in : Object | Test.java:7154:10:7154:40 | immutableEntry(...) : Entry [<element>] : Object | provenance | MaD:454 |
-| Test.java:7155:9:7155:11 | out : Entry [<element>] : Object | Test.java:7155:9:7155:24 | getElement(...) | provenance | MaD:450 |
+| Test.java:7155:9:7155:11 | out : Entry [<element>] : Object | Test.java:7155:9:7155:24 | getElement(...) | provenance | MaD:445 |
 | Test.java:7160:18:7160:57 | (...)... : ImmutableMultiset [<element>] : Object | Test.java:7161:39:7161:40 | in : ImmutableMultiset [<element>] : Object | provenance |  |
 | Test.java:7160:28:7160:57 | of(...) : ImmutableMultiset [<element>] : Object | Test.java:7160:18:7160:57 | (...)... : ImmutableMultiset [<element>] : Object | provenance |  |
-| Test.java:7160:49:7160:56 | source(...) : Object | Test.java:7160:28:7160:57 | of(...) : ImmutableMultiset [<element>] : Object | provenance | MaD:134 |
+| Test.java:7160:49:7160:56 | source(...) : Object | Test.java:7160:28:7160:57 | of(...) : ImmutableMultiset [<element>] : Object | provenance | MaD:137 |
 | Test.java:7161:10:7161:41 | intersection(...) : Multiset [<element>] : Object | Test.java:7162:20:7162:22 | out : Multiset [<element>] : Object | provenance |  |
 | Test.java:7161:39:7161:40 | in : ImmutableMultiset [<element>] : Object | Test.java:7161:10:7161:41 | intersection(...) : Multiset [<element>] : Object | provenance | MaD:455 |
 | Test.java:7162:20:7162:22 | out : Multiset [<element>] : Object | Test.java:110:19:110:32 | it : Multiset [<element>] : Object | provenance |  |
-| Test.java:7162:20:7162:22 | out : Multiset [<element>] : Object | Test.java:7162:9:7162:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:7162:20:7162:22 | out : Multiset [<element>] : Object | Test.java:7162:9:7162:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:7167:18:7167:57 | (...)... : ImmutableMultiset [<element>] : Object | Test.java:7168:33:7168:34 | in : ImmutableMultiset [<element>] : Object | provenance |  |
 | Test.java:7167:28:7167:57 | of(...) : ImmutableMultiset [<element>] : Object | Test.java:7167:18:7167:57 | (...)... : ImmutableMultiset [<element>] : Object | provenance |  |
-| Test.java:7167:49:7167:56 | source(...) : Object | Test.java:7167:28:7167:57 | of(...) : ImmutableMultiset [<element>] : Object | provenance | MaD:134 |
+| Test.java:7167:49:7167:56 | source(...) : Object | Test.java:7167:28:7167:57 | of(...) : ImmutableMultiset [<element>] : Object | provenance | MaD:137 |
 | Test.java:7168:10:7168:41 | intersection(...) : Multiset [<element>] : Object | Test.java:7169:20:7169:22 | out : Multiset [<element>] : Object | provenance |  |
 | Test.java:7168:33:7168:34 | in : ImmutableMultiset [<element>] : Object | Test.java:7168:10:7168:41 | intersection(...) : Multiset [<element>] : Object | provenance | MaD:455 |
 | Test.java:7169:20:7169:22 | out : Multiset [<element>] : Object | Test.java:110:19:110:32 | it : Multiset [<element>] : Object | provenance |  |
-| Test.java:7169:20:7169:22 | out : Multiset [<element>] : Object | Test.java:7169:9:7169:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:7169:20:7169:22 | out : Multiset [<element>] : Object | Test.java:7169:9:7169:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:7174:18:7174:57 | (...)... : ImmutableMultiset [<element>] : Object | Test.java:7175:30:7175:31 | in : ImmutableMultiset [<element>] : Object | provenance |  |
 | Test.java:7174:28:7174:57 | of(...) : ImmutableMultiset [<element>] : Object | Test.java:7174:18:7174:57 | (...)... : ImmutableMultiset [<element>] : Object | provenance |  |
-| Test.java:7174:49:7174:56 | source(...) : Object | Test.java:7174:28:7174:57 | of(...) : ImmutableMultiset [<element>] : Object | provenance | MaD:134 |
+| Test.java:7174:49:7174:56 | source(...) : Object | Test.java:7174:28:7174:57 | of(...) : ImmutableMultiset [<element>] : Object | provenance | MaD:137 |
 | Test.java:7175:10:7175:32 | sum(...) : Multiset [<element>] : Object | Test.java:7176:20:7176:22 | out : Multiset [<element>] : Object | provenance |  |
 | Test.java:7175:30:7175:31 | in : ImmutableMultiset [<element>] : Object | Test.java:7175:10:7175:32 | sum(...) : Multiset [<element>] : Object | provenance | MaD:456 |
 | Test.java:7176:20:7176:22 | out : Multiset [<element>] : Object | Test.java:110:19:110:32 | it : Multiset [<element>] : Object | provenance |  |
-| Test.java:7176:20:7176:22 | out : Multiset [<element>] : Object | Test.java:7176:9:7176:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:7176:20:7176:22 | out : Multiset [<element>] : Object | Test.java:7176:9:7176:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:7181:18:7181:57 | (...)... : ImmutableMultiset [<element>] : Object | Test.java:7182:24:7182:25 | in : ImmutableMultiset [<element>] : Object | provenance |  |
 | Test.java:7181:28:7181:57 | of(...) : ImmutableMultiset [<element>] : Object | Test.java:7181:18:7181:57 | (...)... : ImmutableMultiset [<element>] : Object | provenance |  |
-| Test.java:7181:49:7181:56 | source(...) : Object | Test.java:7181:28:7181:57 | of(...) : ImmutableMultiset [<element>] : Object | provenance | MaD:134 |
+| Test.java:7181:49:7181:56 | source(...) : Object | Test.java:7181:28:7181:57 | of(...) : ImmutableMultiset [<element>] : Object | provenance | MaD:137 |
 | Test.java:7182:10:7182:32 | sum(...) : Multiset [<element>] : Object | Test.java:7183:20:7183:22 | out : Multiset [<element>] : Object | provenance |  |
 | Test.java:7182:24:7182:25 | in : ImmutableMultiset [<element>] : Object | Test.java:7182:10:7182:32 | sum(...) : Multiset [<element>] : Object | provenance | MaD:456 |
 | Test.java:7183:20:7183:22 | out : Multiset [<element>] : Object | Test.java:110:19:110:32 | it : Multiset [<element>] : Object | provenance |  |
-| Test.java:7183:20:7183:22 | out : Multiset [<element>] : Object | Test.java:7183:9:7183:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:7183:20:7183:22 | out : Multiset [<element>] : Object | Test.java:7183:9:7183:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:7188:18:7188:57 | (...)... : ImmutableMultiset [<element>] : Object | Test.java:7189:32:7189:33 | in : ImmutableMultiset [<element>] : Object | provenance |  |
 | Test.java:7188:28:7188:57 | of(...) : ImmutableMultiset [<element>] : Object | Test.java:7188:18:7188:57 | (...)... : ImmutableMultiset [<element>] : Object | provenance |  |
-| Test.java:7188:49:7188:56 | source(...) : Object | Test.java:7188:28:7188:57 | of(...) : ImmutableMultiset [<element>] : Object | provenance | MaD:134 |
+| Test.java:7188:49:7188:56 | source(...) : Object | Test.java:7188:28:7188:57 | of(...) : ImmutableMultiset [<element>] : Object | provenance | MaD:137 |
 | Test.java:7189:10:7189:34 | union(...) : Multiset [<element>] : Object | Test.java:7190:20:7190:22 | out : Multiset [<element>] : Object | provenance |  |
 | Test.java:7189:32:7189:33 | in : ImmutableMultiset [<element>] : Object | Test.java:7189:10:7189:34 | union(...) : Multiset [<element>] : Object | provenance | MaD:457 |
 | Test.java:7190:20:7190:22 | out : Multiset [<element>] : Object | Test.java:110:19:110:32 | it : Multiset [<element>] : Object | provenance |  |
-| Test.java:7190:20:7190:22 | out : Multiset [<element>] : Object | Test.java:7190:9:7190:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:7190:20:7190:22 | out : Multiset [<element>] : Object | Test.java:7190:9:7190:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:7195:18:7195:57 | (...)... : ImmutableMultiset [<element>] : Object | Test.java:7196:26:7196:27 | in : ImmutableMultiset [<element>] : Object | provenance |  |
 | Test.java:7195:28:7195:57 | of(...) : ImmutableMultiset [<element>] : Object | Test.java:7195:18:7195:57 | (...)... : ImmutableMultiset [<element>] : Object | provenance |  |
-| Test.java:7195:49:7195:56 | source(...) : Object | Test.java:7195:28:7195:57 | of(...) : ImmutableMultiset [<element>] : Object | provenance | MaD:134 |
+| Test.java:7195:49:7195:56 | source(...) : Object | Test.java:7195:28:7195:57 | of(...) : ImmutableMultiset [<element>] : Object | provenance | MaD:137 |
 | Test.java:7196:10:7196:34 | union(...) : Multiset [<element>] : Object | Test.java:7197:20:7197:22 | out : Multiset [<element>] : Object | provenance |  |
 | Test.java:7196:26:7196:27 | in : ImmutableMultiset [<element>] : Object | Test.java:7196:10:7196:34 | union(...) : Multiset [<element>] : Object | provenance | MaD:457 |
 | Test.java:7197:20:7197:22 | out : Multiset [<element>] : Object | Test.java:110:19:110:32 | it : Multiset [<element>] : Object | provenance |  |
-| Test.java:7197:20:7197:22 | out : Multiset [<element>] : Object | Test.java:7197:9:7197:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:7197:20:7197:22 | out : Multiset [<element>] : Object | Test.java:7197:9:7197:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:7202:27:7202:75 | (...)... : ImmutableMultiset [<element>] : Object | Test.java:7203:41:7203:42 | in : ImmutableMultiset [<element>] : Object | provenance |  |
 | Test.java:7202:46:7202:75 | of(...) : ImmutableMultiset [<element>] : Object | Test.java:7202:27:7202:75 | (...)... : ImmutableMultiset [<element>] : Object | provenance |  |
-| Test.java:7202:67:7202:74 | source(...) : Object | Test.java:7202:46:7202:75 | of(...) : ImmutableMultiset [<element>] : Object | provenance | MaD:134 |
+| Test.java:7202:67:7202:74 | source(...) : Object | Test.java:7202:46:7202:75 | of(...) : ImmutableMultiset [<element>] : Object | provenance | MaD:137 |
 | Test.java:7203:10:7203:43 | unmodifiableMultiset(...) : Multiset [<element>] : Object | Test.java:7204:20:7204:22 | out : Multiset [<element>] : Object | provenance |  |
 | Test.java:7203:41:7203:42 | in : ImmutableMultiset [<element>] : Object | Test.java:7203:10:7203:43 | unmodifiableMultiset(...) : Multiset [<element>] : Object | provenance | MaD:458 |
 | Test.java:7204:20:7204:22 | out : Multiset [<element>] : Object | Test.java:110:19:110:32 | it : Multiset [<element>] : Object | provenance |  |
-| Test.java:7204:20:7204:22 | out : Multiset [<element>] : Object | Test.java:7204:9:7204:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:7204:20:7204:22 | out : Multiset [<element>] : Object | Test.java:7204:9:7204:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:7209:18:7209:57 | (...)... : ImmutableMultiset [<element>] : Object | Test.java:7210:41:7210:42 | in : ImmutableMultiset [<element>] : Object | provenance |  |
 | Test.java:7209:28:7209:57 | of(...) : ImmutableMultiset [<element>] : Object | Test.java:7209:18:7209:57 | (...)... : ImmutableMultiset [<element>] : Object | provenance |  |
-| Test.java:7209:49:7209:56 | source(...) : Object | Test.java:7209:28:7209:57 | of(...) : ImmutableMultiset [<element>] : Object | provenance | MaD:134 |
+| Test.java:7209:49:7209:56 | source(...) : Object | Test.java:7209:28:7209:57 | of(...) : ImmutableMultiset [<element>] : Object | provenance | MaD:137 |
 | Test.java:7210:10:7210:43 | unmodifiableMultiset(...) : Multiset [<element>] : Object | Test.java:7211:20:7211:22 | out : Multiset [<element>] : Object | provenance |  |
 | Test.java:7210:41:7210:42 | in : ImmutableMultiset [<element>] : Object | Test.java:7210:10:7210:43 | unmodifiableMultiset(...) : Multiset [<element>] : Object | provenance | MaD:459 |
 | Test.java:7211:20:7211:22 | out : Multiset [<element>] : Object | Test.java:110:19:110:32 | it : Multiset [<element>] : Object | provenance |  |
-| Test.java:7211:20:7211:22 | out : Multiset [<element>] : Object | Test.java:7211:9:7211:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:7211:20:7211:22 | out : Multiset [<element>] : Object | Test.java:7211:9:7211:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:7216:24:7216:87 | (...)... : ImmutableSortedMultiset [<element>] : Comparable | Test.java:7217:47:7217:48 | in : ImmutableSortedMultiset [<element>] : Comparable | provenance |  |
 | Test.java:7216:40:7216:87 | of(...) : ImmutableSortedMultiset [<element>] : Comparable | Test.java:7216:24:7216:87 | (...)... : ImmutableSortedMultiset [<element>] : Comparable | provenance |  |
 | Test.java:7216:67:7216:86 | (...)... : Comparable | Test.java:7216:40:7216:87 | of(...) : ImmutableSortedMultiset [<element>] : Comparable | provenance | MaD:181 |
@@ -7862,21 +7862,21 @@ edges
 | Test.java:7217:10:7217:49 | unmodifiableSortedMultiset(...) : SortedMultiset [<element>] : Comparable | Test.java:7218:20:7218:22 | out : SortedMultiset [<element>] : Comparable | provenance |  |
 | Test.java:7217:47:7217:48 | in : ImmutableSortedMultiset [<element>] : Comparable | Test.java:7217:10:7217:49 | unmodifiableSortedMultiset(...) : SortedMultiset [<element>] : Comparable | provenance | MaD:460 |
 | Test.java:7218:20:7218:22 | out : SortedMultiset [<element>] : Comparable | Test.java:110:19:110:32 | it : SortedMultiset [<element>] : Comparable | provenance |  |
-| Test.java:7218:20:7218:22 | out : SortedMultiset [<element>] : Comparable | Test.java:7218:9:7218:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:7218:20:7218:22 | out : SortedMultiset [<element>] : Comparable | Test.java:7218:9:7218:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:7223:13:7223:39 | (...)... : Map [<map.key>] : Object | Test.java:7224:43:7224:44 | in : Map [<map.key>] : Object | provenance |  |
 | Test.java:7223:18:7223:39 | of(...) : Map [<map.key>] : Object | Test.java:7223:13:7223:39 | (...)... : Map [<map.key>] : Object | provenance |  |
-| Test.java:7223:25:7223:32 | source(...) : Object | Test.java:7223:18:7223:39 | of(...) : Map [<map.key>] : Object | provenance | MaD:563 |
+| Test.java:7223:25:7223:32 | source(...) : Object | Test.java:7223:18:7223:39 | of(...) : Map [<map.key>] : Object | provenance | MaD:564 |
 | Test.java:7224:10:7224:45 | create(...) : MutableClassToInstanceMap [<map.key>] : Object | Test.java:7225:19:7225:21 | out : MutableClassToInstanceMap [<map.key>] : Object | provenance |  |
 | Test.java:7224:43:7224:44 | in : Map [<map.key>] : Object | Test.java:7224:10:7224:45 | create(...) : MutableClassToInstanceMap [<map.key>] : Object | provenance | MaD:461 |
 | Test.java:7225:19:7225:21 | out : MutableClassToInstanceMap [<map.key>] : Object | Test.java:99:18:99:29 | map : MutableClassToInstanceMap [<map.key>] : Object | provenance |  |
-| Test.java:7225:19:7225:21 | out : MutableClassToInstanceMap [<map.key>] : Object | Test.java:7225:9:7225:22 | getMapKey(...) | provenance | MaD:562 |
+| Test.java:7225:19:7225:21 | out : MutableClassToInstanceMap [<map.key>] : Object | Test.java:7225:9:7225:22 | getMapKey(...) | provenance | MaD:569 |
 | Test.java:7230:13:7230:39 | (...)... : Map [<map.value>] : Object | Test.java:7231:43:7231:44 | in : Map [<map.value>] : Object | provenance |  |
 | Test.java:7230:18:7230:39 | of(...) : Map [<map.value>] : Object | Test.java:7230:13:7230:39 | (...)... : Map [<map.value>] : Object | provenance |  |
-| Test.java:7230:31:7230:38 | source(...) : Object | Test.java:7230:18:7230:39 | of(...) : Map [<map.value>] : Object | provenance | MaD:564 |
+| Test.java:7230:31:7230:38 | source(...) : Object | Test.java:7230:18:7230:39 | of(...) : Map [<map.value>] : Object | provenance | MaD:565 |
 | Test.java:7231:10:7231:45 | create(...) : MutableClassToInstanceMap [<map.value>] : Object | Test.java:7232:21:7232:23 | out : MutableClassToInstanceMap [<map.value>] : Object | provenance |  |
 | Test.java:7231:43:7231:44 | in : Map [<map.value>] : Object | Test.java:7231:10:7231:45 | create(...) : MutableClassToInstanceMap [<map.value>] : Object | provenance | MaD:462 |
 | Test.java:7232:21:7232:23 | out : MutableClassToInstanceMap [<map.value>] : Object | Test.java:118:20:118:31 | map : MutableClassToInstanceMap [<map.value>] : Object | provenance |  |
-| Test.java:7232:21:7232:23 | out : MutableClassToInstanceMap [<map.value>] : Object | Test.java:7232:9:7232:24 | getMapValue(...) | provenance | MaD:561 |
+| Test.java:7232:21:7232:23 | out : MutableClassToInstanceMap [<map.value>] : Object | Test.java:7232:9:7232:24 | getMapValue(...) | provenance | MaD:568 |
 | Test.java:7237:16:7237:31 | (...)... : Object | Test.java:7238:30:7238:31 | in : Object | provenance |  |
 | Test.java:7237:24:7237:31 | source(...) : Object | Test.java:7237:16:7237:31 | (...)... : Object | provenance |  |
 | Test.java:7238:10:7238:48 | concat(...) : Object[] [[]] : Object | Test.java:7239:25:7239:27 | out : Object[] [[]] : Object | provenance |  |
@@ -7919,1147 +7919,1147 @@ edges
 | Test.java:7274:25:7274:27 | out : Object[] [[]] : Object | Test.java:7274:9:7274:28 | getArrayElement(...) | provenance |  |
 | Test.java:7279:23:7279:68 | (...)... : BlockingQueue [<element>] : Object | Test.java:7280:17:7280:18 | in : BlockingQueue [<element>] : Object | provenance |  |
 | Test.java:7279:38:7279:68 | newWithElementDefault(...) : Object [<element>] : Object | Test.java:7279:23:7279:68 | (...)... : BlockingQueue [<element>] : Object | provenance |  |
-| Test.java:7279:60:7279:67 | source(...) : Object | Test.java:7279:38:7279:68 | newWithElementDefault(...) : Object [<element>] : Object | provenance | MaD:568 |
+| Test.java:7279:60:7279:67 | source(...) : Object | Test.java:7279:38:7279:68 | newWithElementDefault(...) : Object [<element>] : Object | provenance | MaD:555 |
 | Test.java:7280:17:7280:18 | in : BlockingQueue [<element>] : Object | Test.java:7280:21:7280:23 | out [post update] : Collection [<element>] : Object | provenance | MaD:468 |
 | Test.java:7280:21:7280:23 | out [post update] : Collection [<element>] : Object | Test.java:7281:20:7281:22 | out : Collection [<element>] : Object | provenance |  |
 | Test.java:7281:20:7281:22 | out : Collection [<element>] : Object | Test.java:110:19:110:32 | it : Collection [<element>] : Object | provenance |  |
-| Test.java:7281:20:7281:22 | out : Collection [<element>] : Object | Test.java:7281:9:7281:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:7281:20:7281:22 | out : Collection [<element>] : Object | Test.java:7281:9:7281:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:7286:23:7286:68 | (...)... : BlockingQueue [<element>] : Object | Test.java:7287:17:7287:18 | in : BlockingQueue [<element>] : Object | provenance |  |
 | Test.java:7286:38:7286:68 | newWithElementDefault(...) : Object [<element>] : Object | Test.java:7286:23:7286:68 | (...)... : BlockingQueue [<element>] : Object | provenance |  |
-| Test.java:7286:60:7286:67 | source(...) : Object | Test.java:7286:38:7286:68 | newWithElementDefault(...) : Object [<element>] : Object | provenance | MaD:568 |
+| Test.java:7286:60:7286:67 | source(...) : Object | Test.java:7286:38:7286:68 | newWithElementDefault(...) : Object [<element>] : Object | provenance | MaD:555 |
 | Test.java:7287:17:7287:18 | in : BlockingQueue [<element>] : Object | Test.java:7287:21:7287:23 | out [post update] : Collection [<element>] : Object | provenance | MaD:469 |
 | Test.java:7287:21:7287:23 | out [post update] : Collection [<element>] : Object | Test.java:7288:20:7288:22 | out : Collection [<element>] : Object | provenance |  |
 | Test.java:7288:20:7288:22 | out : Collection [<element>] : Object | Test.java:110:19:110:32 | it : Collection [<element>] : Object | provenance |  |
-| Test.java:7288:20:7288:22 | out : Collection [<element>] : Object | Test.java:7288:9:7288:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:7288:20:7288:22 | out : Collection [<element>] : Object | Test.java:7288:9:7288:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:7293:18:7293:44 | (...)... : List [<element>] : Object | Test.java:7294:31:7294:32 | in : List [<element>] : Object | provenance |  |
 | Test.java:7293:28:7293:44 | of(...) : List [<element>] : Object | Test.java:7293:18:7293:44 | (...)... : List [<element>] : Object | provenance |  |
-| Test.java:7293:36:7293:43 | source(...) : Object | Test.java:7293:28:7293:44 | of(...) : List [<element>] : Object | provenance | MaD:558 |
+| Test.java:7293:36:7293:43 | source(...) : Object | Test.java:7293:28:7293:44 | of(...) : List [<element>] : Object | provenance | MaD:561 |
 | Test.java:7294:10:7294:33 | newArrayDeque(...) : ArrayDeque [<element>] : Object | Test.java:7295:20:7295:22 | out : ArrayDeque [<element>] : Object | provenance |  |
 | Test.java:7294:31:7294:32 | in : List [<element>] : Object | Test.java:7294:10:7294:33 | newArrayDeque(...) : ArrayDeque [<element>] : Object | provenance | MaD:470 |
 | Test.java:7295:20:7295:22 | out : ArrayDeque [<element>] : Object | Test.java:110:19:110:32 | it : ArrayDeque [<element>] : Object | provenance |  |
-| Test.java:7295:20:7295:22 | out : ArrayDeque [<element>] : Object | Test.java:7295:9:7295:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:7295:20:7295:22 | out : ArrayDeque [<element>] : Object | Test.java:7295:9:7295:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:7300:18:7300:44 | (...)... : List [<element>] : Object | Test.java:7301:42:7301:43 | in : List [<element>] : Object | provenance |  |
 | Test.java:7300:28:7300:44 | of(...) : List [<element>] : Object | Test.java:7300:18:7300:44 | (...)... : List [<element>] : Object | provenance |  |
-| Test.java:7300:36:7300:43 | source(...) : Object | Test.java:7300:28:7300:44 | of(...) : List [<element>] : Object | provenance | MaD:558 |
+| Test.java:7300:36:7300:43 | source(...) : Object | Test.java:7300:28:7300:44 | of(...) : List [<element>] : Object | provenance | MaD:561 |
 | Test.java:7301:10:7301:44 | newConcurrentLinkedQueue(...) : ConcurrentLinkedQueue [<element>] : Object | Test.java:7302:20:7302:22 | out : ConcurrentLinkedQueue [<element>] : Object | provenance |  |
 | Test.java:7301:42:7301:43 | in : List [<element>] : Object | Test.java:7301:10:7301:44 | newConcurrentLinkedQueue(...) : ConcurrentLinkedQueue [<element>] : Object | provenance | MaD:471 |
 | Test.java:7302:20:7302:22 | out : ConcurrentLinkedQueue [<element>] : Object | Test.java:110:19:110:32 | it : ConcurrentLinkedQueue [<element>] : Object | provenance |  |
-| Test.java:7302:20:7302:22 | out : ConcurrentLinkedQueue [<element>] : Object | Test.java:7302:9:7302:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:7302:20:7302:22 | out : ConcurrentLinkedQueue [<element>] : Object | Test.java:7302:9:7302:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:7307:18:7307:44 | (...)... : List [<element>] : Object | Test.java:7308:40:7308:41 | in : List [<element>] : Object | provenance |  |
 | Test.java:7307:28:7307:44 | of(...) : List [<element>] : Object | Test.java:7307:18:7307:44 | (...)... : List [<element>] : Object | provenance |  |
-| Test.java:7307:36:7307:43 | source(...) : Object | Test.java:7307:28:7307:44 | of(...) : List [<element>] : Object | provenance | MaD:558 |
+| Test.java:7307:36:7307:43 | source(...) : Object | Test.java:7307:28:7307:44 | of(...) : List [<element>] : Object | provenance | MaD:561 |
 | Test.java:7308:10:7308:42 | newLinkedBlockingDeque(...) : LinkedBlockingDeque [<element>] : Object | Test.java:7309:20:7309:22 | out : LinkedBlockingDeque [<element>] : Object | provenance |  |
 | Test.java:7308:40:7308:41 | in : List [<element>] : Object | Test.java:7308:10:7308:42 | newLinkedBlockingDeque(...) : LinkedBlockingDeque [<element>] : Object | provenance | MaD:472 |
 | Test.java:7309:20:7309:22 | out : LinkedBlockingDeque [<element>] : Object | Test.java:110:19:110:32 | it : LinkedBlockingDeque [<element>] : Object | provenance |  |
-| Test.java:7309:20:7309:22 | out : LinkedBlockingDeque [<element>] : Object | Test.java:7309:9:7309:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:7309:20:7309:22 | out : LinkedBlockingDeque [<element>] : Object | Test.java:7309:9:7309:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:7314:18:7314:44 | (...)... : List [<element>] : Object | Test.java:7315:40:7315:41 | in : List [<element>] : Object | provenance |  |
 | Test.java:7314:28:7314:44 | of(...) : List [<element>] : Object | Test.java:7314:18:7314:44 | (...)... : List [<element>] : Object | provenance |  |
-| Test.java:7314:36:7314:43 | source(...) : Object | Test.java:7314:28:7314:44 | of(...) : List [<element>] : Object | provenance | MaD:558 |
+| Test.java:7314:36:7314:43 | source(...) : Object | Test.java:7314:28:7314:44 | of(...) : List [<element>] : Object | provenance | MaD:561 |
 | Test.java:7315:10:7315:42 | newLinkedBlockingQueue(...) : LinkedBlockingQueue [<element>] : Object | Test.java:7316:20:7316:22 | out : LinkedBlockingQueue [<element>] : Object | provenance |  |
 | Test.java:7315:40:7315:41 | in : List [<element>] : Object | Test.java:7315:10:7315:42 | newLinkedBlockingQueue(...) : LinkedBlockingQueue [<element>] : Object | provenance | MaD:473 |
 | Test.java:7316:20:7316:22 | out : LinkedBlockingQueue [<element>] : Object | Test.java:110:19:110:32 | it : LinkedBlockingQueue [<element>] : Object | provenance |  |
-| Test.java:7316:20:7316:22 | out : LinkedBlockingQueue [<element>] : Object | Test.java:7316:9:7316:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:7316:20:7316:22 | out : LinkedBlockingQueue [<element>] : Object | Test.java:7316:9:7316:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:7321:18:7321:44 | (...)... : List [<element>] : Object | Test.java:7322:42:7322:43 | in : List [<element>] : Object | provenance |  |
 | Test.java:7321:28:7321:44 | of(...) : List [<element>] : Object | Test.java:7321:18:7321:44 | (...)... : List [<element>] : Object | provenance |  |
-| Test.java:7321:36:7321:43 | source(...) : Object | Test.java:7321:28:7321:44 | of(...) : List [<element>] : Object | provenance | MaD:558 |
+| Test.java:7321:36:7321:43 | source(...) : Object | Test.java:7321:28:7321:44 | of(...) : List [<element>] : Object | provenance | MaD:561 |
 | Test.java:7322:10:7322:44 | newPriorityBlockingQueue(...) : PriorityBlockingQueue [<element>] : Object | Test.java:7323:20:7323:22 | out : PriorityBlockingQueue [<element>] : Object | provenance |  |
 | Test.java:7322:42:7322:43 | in : List [<element>] : Object | Test.java:7322:10:7322:44 | newPriorityBlockingQueue(...) : PriorityBlockingQueue [<element>] : Object | provenance | MaD:474 |
 | Test.java:7323:20:7323:22 | out : PriorityBlockingQueue [<element>] : Object | Test.java:110:19:110:32 | it : PriorityBlockingQueue [<element>] : Object | provenance |  |
-| Test.java:7323:20:7323:22 | out : PriorityBlockingQueue [<element>] : Object | Test.java:7323:9:7323:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:7323:20:7323:22 | out : PriorityBlockingQueue [<element>] : Object | Test.java:7323:9:7323:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:7328:18:7328:44 | (...)... : List [<element>] : Object | Test.java:7329:34:7329:35 | in : List [<element>] : Object | provenance |  |
 | Test.java:7328:28:7328:44 | of(...) : List [<element>] : Object | Test.java:7328:18:7328:44 | (...)... : List [<element>] : Object | provenance |  |
-| Test.java:7328:36:7328:43 | source(...) : Object | Test.java:7328:28:7328:44 | of(...) : List [<element>] : Object | provenance | MaD:558 |
+| Test.java:7328:36:7328:43 | source(...) : Object | Test.java:7328:28:7328:44 | of(...) : List [<element>] : Object | provenance | MaD:561 |
 | Test.java:7329:10:7329:36 | newPriorityQueue(...) : PriorityQueue [<element>] : Object | Test.java:7330:20:7330:22 | out : PriorityQueue [<element>] : Object | provenance |  |
 | Test.java:7329:34:7329:35 | in : List [<element>] : Object | Test.java:7329:10:7329:36 | newPriorityQueue(...) : PriorityQueue [<element>] : Object | provenance | MaD:475 |
 | Test.java:7330:20:7330:22 | out : PriorityQueue [<element>] : Object | Test.java:110:19:110:32 | it : PriorityQueue [<element>] : Object | provenance |  |
-| Test.java:7330:20:7330:22 | out : PriorityQueue [<element>] : Object | Test.java:7330:9:7330:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:7330:20:7330:22 | out : PriorityQueue [<element>] : Object | Test.java:7330:9:7330:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:7335:15:7335:52 | (...)... : Deque [<element>] : Object | Test.java:7336:35:7336:36 | in : Deque [<element>] : Object | provenance |  |
 | Test.java:7335:22:7335:52 | newWithElementDefault(...) : Object [<element>] : Object | Test.java:7335:15:7335:52 | (...)... : Deque [<element>] : Object | provenance |  |
-| Test.java:7335:44:7335:51 | source(...) : Object | Test.java:7335:22:7335:52 | newWithElementDefault(...) : Object [<element>] : Object | provenance | MaD:568 |
+| Test.java:7335:44:7335:51 | source(...) : Object | Test.java:7335:22:7335:52 | newWithElementDefault(...) : Object [<element>] : Object | provenance | MaD:555 |
 | Test.java:7336:10:7336:37 | synchronizedDeque(...) : Deque [<element>] : Object | Test.java:7337:20:7337:22 | out : Deque [<element>] : Object | provenance |  |
 | Test.java:7336:35:7336:36 | in : Deque [<element>] : Object | Test.java:7336:10:7336:37 | synchronizedDeque(...) : Deque [<element>] : Object | provenance | MaD:476 |
 | Test.java:7337:20:7337:22 | out : Deque [<element>] : Object | Test.java:110:19:110:32 | it : Deque [<element>] : Object | provenance |  |
-| Test.java:7337:20:7337:22 | out : Deque [<element>] : Object | Test.java:7337:9:7337:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:7337:20:7337:22 | out : Deque [<element>] : Object | Test.java:7337:9:7337:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:7342:15:7342:52 | (...)... : Queue [<element>] : Object | Test.java:7343:35:7343:36 | in : Queue [<element>] : Object | provenance |  |
 | Test.java:7342:22:7342:52 | newWithElementDefault(...) : Object [<element>] : Object | Test.java:7342:15:7342:52 | (...)... : Queue [<element>] : Object | provenance |  |
-| Test.java:7342:44:7342:51 | source(...) : Object | Test.java:7342:22:7342:52 | newWithElementDefault(...) : Object [<element>] : Object | provenance | MaD:568 |
+| Test.java:7342:44:7342:51 | source(...) : Object | Test.java:7342:22:7342:52 | newWithElementDefault(...) : Object [<element>] : Object | provenance | MaD:555 |
 | Test.java:7343:10:7343:37 | synchronizedQueue(...) : Queue [<element>] : Object | Test.java:7344:20:7344:22 | out : Queue [<element>] : Object | provenance |  |
 | Test.java:7343:35:7343:36 | in : Queue [<element>] : Object | Test.java:7343:10:7343:37 | synchronizedQueue(...) : Queue [<element>] : Object | provenance | MaD:477 |
 | Test.java:7344:20:7344:22 | out : Queue [<element>] : Object | Test.java:110:19:110:32 | it : Queue [<element>] : Object | provenance |  |
-| Test.java:7344:20:7344:22 | out : Queue [<element>] : Object | Test.java:7344:9:7344:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:7344:20:7344:22 | out : Queue [<element>] : Object | Test.java:7344:9:7344:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:7349:22:7349:69 | (...)... : SetView [<element>] : Object | Test.java:7350:4:7350:5 | in : SetView [<element>] : Object | provenance |  |
 | Test.java:7349:36:7349:69 | union(...) : SetView [<element>] : Object | Test.java:7349:22:7349:69 | (...)... : SetView [<element>] : Object | provenance |  |
-| Test.java:7349:47:7349:62 | of(...) : Set [<element>] : Object | Test.java:7349:36:7349:69 | union(...) : SetView [<element>] : Object | provenance | MaD:498 |
-| Test.java:7349:54:7349:61 | source(...) : Object | Test.java:7349:47:7349:62 | of(...) : Set [<element>] : Object | provenance | MaD:567 |
-| Test.java:7350:4:7350:5 | in : SetView [<element>] : Object | Test.java:7350:16:7350:18 | out [post update] : Set [<element>] : Object | provenance | MaD:500 |
+| Test.java:7349:47:7349:62 | of(...) : Set [<element>] : Object | Test.java:7349:36:7349:69 | union(...) : SetView [<element>] : Object | provenance | MaD:500 |
+| Test.java:7349:54:7349:61 | source(...) : Object | Test.java:7349:47:7349:62 | of(...) : Set [<element>] : Object | provenance | MaD:570 |
+| Test.java:7350:4:7350:5 | in : SetView [<element>] : Object | Test.java:7350:16:7350:18 | out [post update] : Set [<element>] : Object | provenance | MaD:478 |
 | Test.java:7350:16:7350:18 | out [post update] : Set [<element>] : Object | Test.java:7351:20:7351:22 | out : Set [<element>] : Object | provenance |  |
 | Test.java:7351:20:7351:22 | out : Set [<element>] : Object | Test.java:110:19:110:32 | it : Set [<element>] : Object | provenance |  |
-| Test.java:7351:20:7351:22 | out : Set [<element>] : Object | Test.java:7351:9:7351:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:7351:20:7351:22 | out : Set [<element>] : Object | Test.java:7351:9:7351:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:7356:22:7356:69 | (...)... : SetView [<element>] : Object | Test.java:7357:10:7357:11 | in : SetView [<element>] : Object | provenance |  |
 | Test.java:7356:36:7356:69 | union(...) : SetView [<element>] : Object | Test.java:7356:22:7356:69 | (...)... : SetView [<element>] : Object | provenance |  |
-| Test.java:7356:47:7356:62 | of(...) : Set [<element>] : Object | Test.java:7356:36:7356:69 | union(...) : SetView [<element>] : Object | provenance | MaD:498 |
-| Test.java:7356:54:7356:61 | source(...) : Object | Test.java:7356:47:7356:62 | of(...) : Set [<element>] : Object | provenance | MaD:567 |
-| Test.java:7357:10:7357:11 | in : SetView [<element>] : Object | Test.java:7357:10:7357:27 | immutableCopy(...) : ImmutableSet [<element>] : Object | provenance | MaD:501 |
+| Test.java:7356:47:7356:62 | of(...) : Set [<element>] : Object | Test.java:7356:36:7356:69 | union(...) : SetView [<element>] : Object | provenance | MaD:500 |
+| Test.java:7356:54:7356:61 | source(...) : Object | Test.java:7356:47:7356:62 | of(...) : Set [<element>] : Object | provenance | MaD:570 |
+| Test.java:7357:10:7357:11 | in : SetView [<element>] : Object | Test.java:7357:10:7357:27 | immutableCopy(...) : ImmutableSet [<element>] : Object | provenance | MaD:479 |
 | Test.java:7357:10:7357:27 | immutableCopy(...) : ImmutableSet [<element>] : Object | Test.java:7358:20:7358:22 | out : ImmutableSet [<element>] : Object | provenance |  |
 | Test.java:7358:20:7358:22 | out : ImmutableSet [<element>] : Object | Test.java:110:19:110:32 | it : ImmutableSet [<element>] : Object | provenance |  |
-| Test.java:7358:20:7358:22 | out : ImmutableSet [<element>] : Object | Test.java:7358:9:7358:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:7358:20:7358:22 | out : ImmutableSet [<element>] : Object | Test.java:7358:9:7358:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:7363:14:7363:44 | (...)... : List [<element>, <element>] : Object | Test.java:7364:32:7364:33 | in : List [<element>, <element>] : Object | provenance |  |
 | Test.java:7363:20:7363:44 | of(...) : List [<element>, <element>] : Object | Test.java:7363:14:7363:44 | (...)... : List [<element>, <element>] : Object | provenance |  |
-| Test.java:7363:28:7363:43 | of(...) : Set [<element>] : Object | Test.java:7363:20:7363:44 | of(...) : List [<element>, <element>] : Object | provenance | MaD:558 |
-| Test.java:7363:35:7363:42 | source(...) : Object | Test.java:7363:28:7363:43 | of(...) : Set [<element>] : Object | provenance | MaD:567 |
+| Test.java:7363:28:7363:43 | of(...) : Set [<element>] : Object | Test.java:7363:20:7363:44 | of(...) : List [<element>, <element>] : Object | provenance | MaD:561 |
+| Test.java:7363:35:7363:42 | source(...) : Object | Test.java:7363:28:7363:43 | of(...) : Set [<element>] : Object | provenance | MaD:570 |
 | Test.java:7364:10:7364:34 | cartesianProduct(...) : Set [<element>, <element>] : Object | Test.java:7365:31:7365:33 | out : Set [<element>, <element>] : Object | provenance |  |
-| Test.java:7364:32:7364:33 | in : List [<element>, <element>] : Object | Test.java:7364:10:7364:34 | cartesianProduct(...) : Set [<element>, <element>] : Object | provenance | MaD:478 |
+| Test.java:7364:32:7364:33 | in : List [<element>, <element>] : Object | Test.java:7364:10:7364:34 | cartesianProduct(...) : Set [<element>, <element>] : Object | provenance | MaD:480 |
 | Test.java:7365:20:7365:34 | getElement(...) : List [<element>] : Object | Test.java:110:19:110:32 | it : List [<element>] : Object | provenance |  |
-| Test.java:7365:20:7365:34 | getElement(...) : List [<element>] : Object | Test.java:7365:9:7365:35 | getElement(...) | provenance | MaD:555 |
+| Test.java:7365:20:7365:34 | getElement(...) : List [<element>] : Object | Test.java:7365:9:7365:35 | getElement(...) | provenance | MaD:558 |
 | Test.java:7365:31:7365:33 | out : Set [<element>, <element>] : Object | Test.java:110:19:110:32 | it : Set [<element>, <element>] : Object | provenance |  |
-| Test.java:7365:31:7365:33 | out : Set [<element>, <element>] : Object | Test.java:7365:20:7365:34 | getElement(...) : List [<element>] : Object | provenance | MaD:555 |
+| Test.java:7365:31:7365:33 | out : Set [<element>, <element>] : Object | Test.java:7365:20:7365:34 | getElement(...) : List [<element>] : Object | provenance | MaD:558 |
 | Test.java:7370:15:7370:48 | (...)... : Set[] [[], <element>] : Object | Test.java:7371:32:7371:33 | in : Set[] [[], <element>] : Object | provenance |  |
 | Test.java:7370:22:7370:48 | {...} : Set[] [[], <element>] : Object | Test.java:7370:15:7370:48 | (...)... : Set[] [[], <element>] : Object | provenance |  |
 | Test.java:7370:32:7370:47 | of(...) : Set [<element>] : Object | Test.java:7370:22:7370:48 | {...} : Set[] [[], <element>] : Object | provenance |  |
-| Test.java:7370:39:7370:46 | source(...) : Object | Test.java:7370:32:7370:47 | of(...) : Set [<element>] : Object | provenance | MaD:567 |
+| Test.java:7370:39:7370:46 | source(...) : Object | Test.java:7370:32:7370:47 | of(...) : Set [<element>] : Object | provenance | MaD:570 |
 | Test.java:7371:10:7371:34 | cartesianProduct(...) : Set [<element>, <element>] : Object | Test.java:7372:31:7372:33 | out : Set [<element>, <element>] : Object | provenance |  |
-| Test.java:7371:32:7371:33 | in : Set[] [[], <element>] : Object | Test.java:7371:10:7371:34 | cartesianProduct(...) : Set [<element>, <element>] : Object | provenance | MaD:479 |
+| Test.java:7371:32:7371:33 | in : Set[] [[], <element>] : Object | Test.java:7371:10:7371:34 | cartesianProduct(...) : Set [<element>, <element>] : Object | provenance | MaD:481 |
 | Test.java:7372:20:7372:34 | getElement(...) : List [<element>] : Object | Test.java:110:19:110:32 | it : List [<element>] : Object | provenance |  |
-| Test.java:7372:20:7372:34 | getElement(...) : List [<element>] : Object | Test.java:7372:9:7372:35 | getElement(...) | provenance | MaD:555 |
+| Test.java:7372:20:7372:34 | getElement(...) : List [<element>] : Object | Test.java:7372:9:7372:35 | getElement(...) | provenance | MaD:558 |
 | Test.java:7372:31:7372:33 | out : Set [<element>, <element>] : Object | Test.java:110:19:110:32 | it : Set [<element>, <element>] : Object | provenance |  |
-| Test.java:7372:31:7372:33 | out : Set [<element>, <element>] : Object | Test.java:7372:20:7372:34 | getElement(...) : List [<element>] : Object | provenance | MaD:555 |
+| Test.java:7372:31:7372:33 | out : Set [<element>, <element>] : Object | Test.java:7372:20:7372:34 | getElement(...) : List [<element>] : Object | provenance | MaD:558 |
 | Test.java:7377:13:7377:33 | (...)... : Set [<element>] : Object | Test.java:7378:28:7378:29 | in : Set [<element>] : Object | provenance |  |
 | Test.java:7377:18:7377:33 | of(...) : Set [<element>] : Object | Test.java:7377:13:7377:33 | (...)... : Set [<element>] : Object | provenance |  |
-| Test.java:7377:25:7377:32 | source(...) : Object | Test.java:7377:18:7377:33 | of(...) : Set [<element>] : Object | provenance | MaD:567 |
+| Test.java:7377:25:7377:32 | source(...) : Object | Test.java:7377:18:7377:33 | of(...) : Set [<element>] : Object | provenance | MaD:570 |
 | Test.java:7378:10:7378:33 | combinations(...) : Set [<element>, <element>] : Object | Test.java:7379:31:7379:33 | out : Set [<element>, <element>] : Object | provenance |  |
-| Test.java:7378:28:7378:29 | in : Set [<element>] : Object | Test.java:7378:10:7378:33 | combinations(...) : Set [<element>, <element>] : Object | provenance | MaD:480 |
+| Test.java:7378:28:7378:29 | in : Set [<element>] : Object | Test.java:7378:10:7378:33 | combinations(...) : Set [<element>, <element>] : Object | provenance | MaD:482 |
 | Test.java:7379:20:7379:34 | getElement(...) : Set [<element>] : Object | Test.java:110:19:110:32 | it : Set [<element>] : Object | provenance |  |
-| Test.java:7379:20:7379:34 | getElement(...) : Set [<element>] : Object | Test.java:7379:9:7379:35 | getElement(...) | provenance | MaD:555 |
+| Test.java:7379:20:7379:34 | getElement(...) : Set [<element>] : Object | Test.java:7379:9:7379:35 | getElement(...) | provenance | MaD:558 |
 | Test.java:7379:31:7379:33 | out : Set [<element>, <element>] : Object | Test.java:110:19:110:32 | it : Set [<element>, <element>] : Object | provenance |  |
-| Test.java:7379:31:7379:33 | out : Set [<element>, <element>] : Object | Test.java:7379:20:7379:34 | getElement(...) : Set [<element>] : Object | provenance | MaD:555 |
+| Test.java:7379:31:7379:33 | out : Set [<element>, <element>] : Object | Test.java:7379:20:7379:34 | getElement(...) : Set [<element>] : Object | provenance | MaD:558 |
 | Test.java:7384:13:7384:33 | (...)... : Set [<element>] : Object | Test.java:7385:26:7385:27 | in : Set [<element>] : Object | provenance |  |
 | Test.java:7384:18:7384:33 | of(...) : Set [<element>] : Object | Test.java:7384:13:7384:33 | (...)... : Set [<element>] : Object | provenance |  |
-| Test.java:7384:25:7384:32 | source(...) : Object | Test.java:7384:18:7384:33 | of(...) : Set [<element>] : Object | provenance | MaD:567 |
+| Test.java:7384:25:7384:32 | source(...) : Object | Test.java:7384:18:7384:33 | of(...) : Set [<element>] : Object | provenance | MaD:570 |
 | Test.java:7385:10:7385:34 | difference(...) : SetView [<element>] : Object | Test.java:7386:20:7386:22 | out : SetView [<element>] : Object | provenance |  |
-| Test.java:7385:26:7385:27 | in : Set [<element>] : Object | Test.java:7385:10:7385:34 | difference(...) : SetView [<element>] : Object | provenance | MaD:481 |
+| Test.java:7385:26:7385:27 | in : Set [<element>] : Object | Test.java:7385:10:7385:34 | difference(...) : SetView [<element>] : Object | provenance | MaD:483 |
 | Test.java:7386:20:7386:22 | out : SetView [<element>] : Object | Test.java:110:19:110:32 | it : SetView [<element>] : Object | provenance |  |
-| Test.java:7386:20:7386:22 | out : SetView [<element>] : Object | Test.java:7386:9:7386:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:7386:20:7386:22 | out : SetView [<element>] : Object | Test.java:7386:9:7386:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:7391:22:7391:78 | (...)... : ImmutableSortedSet [<element>] : Comparable | Test.java:7392:22:7392:23 | in : ImmutableSortedSet [<element>] : Comparable | provenance |  |
 | Test.java:7391:36:7391:78 | of(...) : ImmutableSortedSet [<element>] : Comparable | Test.java:7391:22:7391:78 | (...)... : ImmutableSortedSet [<element>] : Comparable | provenance |  |
 | Test.java:7391:58:7391:77 | (...)... : Comparable | Test.java:7391:36:7391:78 | of(...) : ImmutableSortedSet [<element>] : Comparable | provenance | MaD:191 |
 | Test.java:7391:70:7391:77 | source(...) : Object | Test.java:7391:58:7391:77 | (...)... : Comparable | provenance |  |
 | Test.java:7392:10:7392:41 | filter(...) : NavigableSet [<element>] : Comparable | Test.java:7393:20:7393:22 | out : NavigableSet [<element>] : Comparable | provenance |  |
-| Test.java:7392:22:7392:23 | in : ImmutableSortedSet [<element>] : Comparable | Test.java:7392:10:7392:41 | filter(...) : NavigableSet [<element>] : Comparable | provenance | MaD:482 |
+| Test.java:7392:22:7392:23 | in : ImmutableSortedSet [<element>] : Comparable | Test.java:7392:10:7392:41 | filter(...) : NavigableSet [<element>] : Comparable | provenance | MaD:484 |
 | Test.java:7393:20:7393:22 | out : NavigableSet [<element>] : Comparable | Test.java:110:19:110:32 | it : NavigableSet [<element>] : Comparable | provenance |  |
-| Test.java:7393:20:7393:22 | out : NavigableSet [<element>] : Comparable | Test.java:7393:9:7393:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:7393:20:7393:22 | out : NavigableSet [<element>] : Comparable | Test.java:7393:9:7393:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:7398:13:7398:33 | (...)... : Set [<element>] : Object | Test.java:7399:22:7399:23 | in : Set [<element>] : Object | provenance |  |
 | Test.java:7398:18:7398:33 | of(...) : Set [<element>] : Object | Test.java:7398:13:7398:33 | (...)... : Set [<element>] : Object | provenance |  |
-| Test.java:7398:25:7398:32 | source(...) : Object | Test.java:7398:18:7398:33 | of(...) : Set [<element>] : Object | provenance | MaD:567 |
+| Test.java:7398:25:7398:32 | source(...) : Object | Test.java:7398:18:7398:33 | of(...) : Set [<element>] : Object | provenance | MaD:570 |
 | Test.java:7399:10:7399:41 | filter(...) : Set [<element>] : Object | Test.java:7400:20:7400:22 | out : Set [<element>] : Object | provenance |  |
-| Test.java:7399:22:7399:23 | in : Set [<element>] : Object | Test.java:7399:10:7399:41 | filter(...) : Set [<element>] : Object | provenance | MaD:483 |
+| Test.java:7399:22:7399:23 | in : Set [<element>] : Object | Test.java:7399:10:7399:41 | filter(...) : Set [<element>] : Object | provenance | MaD:485 |
 | Test.java:7400:20:7400:22 | out : Set [<element>] : Object | Test.java:110:19:110:32 | it : Set [<element>] : Object | provenance |  |
-| Test.java:7400:20:7400:22 | out : Set [<element>] : Object | Test.java:7400:9:7400:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:7400:20:7400:22 | out : Set [<element>] : Object | Test.java:7400:9:7400:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:7405:19:7405:72 | (...)... : ImmutableSortedSet [<element>] : Comparable | Test.java:7406:22:7406:23 | in : ImmutableSortedSet [<element>] : Comparable | provenance |  |
 | Test.java:7405:30:7405:72 | of(...) : ImmutableSortedSet [<element>] : Comparable | Test.java:7405:19:7405:72 | (...)... : ImmutableSortedSet [<element>] : Comparable | provenance |  |
 | Test.java:7405:52:7405:71 | (...)... : Comparable | Test.java:7405:30:7405:72 | of(...) : ImmutableSortedSet [<element>] : Comparable | provenance | MaD:191 |
 | Test.java:7405:64:7405:71 | source(...) : Object | Test.java:7405:52:7405:71 | (...)... : Comparable | provenance |  |
 | Test.java:7406:10:7406:41 | filter(...) : SortedSet [<element>] : Comparable | Test.java:7407:20:7407:22 | out : SortedSet [<element>] : Comparable | provenance |  |
-| Test.java:7406:22:7406:23 | in : ImmutableSortedSet [<element>] : Comparable | Test.java:7406:10:7406:41 | filter(...) : SortedSet [<element>] : Comparable | provenance | MaD:484 |
+| Test.java:7406:22:7406:23 | in : ImmutableSortedSet [<element>] : Comparable | Test.java:7406:10:7406:41 | filter(...) : SortedSet [<element>] : Comparable | provenance | MaD:486 |
 | Test.java:7407:20:7407:22 | out : SortedSet [<element>] : Comparable | Test.java:110:19:110:32 | it : SortedSet [<element>] : Comparable | provenance |  |
-| Test.java:7407:20:7407:22 | out : SortedSet [<element>] : Comparable | Test.java:7407:9:7407:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:7407:20:7407:22 | out : SortedSet [<element>] : Comparable | Test.java:7407:9:7407:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:7412:13:7412:33 | (...)... : Set [<element>] : Object | Test.java:7413:34:7413:35 | in : Set [<element>] : Object | provenance |  |
 | Test.java:7412:18:7412:33 | of(...) : Set [<element>] : Object | Test.java:7412:13:7412:33 | (...)... : Set [<element>] : Object | provenance |  |
-| Test.java:7412:25:7412:32 | source(...) : Object | Test.java:7412:18:7412:33 | of(...) : Set [<element>] : Object | provenance | MaD:567 |
+| Test.java:7412:25:7412:32 | source(...) : Object | Test.java:7412:18:7412:33 | of(...) : Set [<element>] : Object | provenance | MaD:570 |
 | Test.java:7413:10:7413:36 | intersection(...) : SetView [<element>] : Object | Test.java:7414:20:7414:22 | out : SetView [<element>] : Object | provenance |  |
-| Test.java:7413:34:7413:35 | in : Set [<element>] : Object | Test.java:7413:10:7413:36 | intersection(...) : SetView [<element>] : Object | provenance | MaD:485 |
+| Test.java:7413:34:7413:35 | in : Set [<element>] : Object | Test.java:7413:10:7413:36 | intersection(...) : SetView [<element>] : Object | provenance | MaD:487 |
 | Test.java:7414:20:7414:22 | out : SetView [<element>] : Object | Test.java:110:19:110:32 | it : SetView [<element>] : Object | provenance |  |
-| Test.java:7414:20:7414:22 | out : SetView [<element>] : Object | Test.java:7414:9:7414:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:7414:20:7414:22 | out : SetView [<element>] : Object | Test.java:7414:9:7414:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:7419:13:7419:33 | (...)... : Set [<element>] : Object | Test.java:7420:28:7420:29 | in : Set [<element>] : Object | provenance |  |
 | Test.java:7419:18:7419:33 | of(...) : Set [<element>] : Object | Test.java:7419:13:7419:33 | (...)... : Set [<element>] : Object | provenance |  |
-| Test.java:7419:25:7419:32 | source(...) : Object | Test.java:7419:18:7419:33 | of(...) : Set [<element>] : Object | provenance | MaD:567 |
+| Test.java:7419:25:7419:32 | source(...) : Object | Test.java:7419:18:7419:33 | of(...) : Set [<element>] : Object | provenance | MaD:570 |
 | Test.java:7420:10:7420:36 | intersection(...) : SetView [<element>] : Object | Test.java:7421:20:7421:22 | out : SetView [<element>] : Object | provenance |  |
-| Test.java:7420:28:7420:29 | in : Set [<element>] : Object | Test.java:7420:10:7420:36 | intersection(...) : SetView [<element>] : Object | provenance | MaD:485 |
+| Test.java:7420:28:7420:29 | in : Set [<element>] : Object | Test.java:7420:10:7420:36 | intersection(...) : SetView [<element>] : Object | provenance | MaD:487 |
 | Test.java:7421:20:7421:22 | out : SetView [<element>] : Object | Test.java:110:19:110:32 | it : SetView [<element>] : Object | provenance |  |
-| Test.java:7421:20:7421:22 | out : SetView [<element>] : Object | Test.java:7421:9:7421:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:7421:20:7421:22 | out : SetView [<element>] : Object | Test.java:7421:9:7421:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:7426:18:7426:44 | (...)... : List [<element>] : Object | Test.java:7427:36:7427:37 | in : List [<element>] : Object | provenance |  |
 | Test.java:7426:28:7426:44 | of(...) : List [<element>] : Object | Test.java:7426:18:7426:44 | (...)... : List [<element>] : Object | provenance |  |
-| Test.java:7426:36:7426:43 | source(...) : Object | Test.java:7426:28:7426:44 | of(...) : List [<element>] : Object | provenance | MaD:558 |
+| Test.java:7426:36:7426:43 | source(...) : Object | Test.java:7426:28:7426:44 | of(...) : List [<element>] : Object | provenance | MaD:561 |
 | Test.java:7427:10:7427:38 | newConcurrentHashSet(...) : Set [<element>] : Object | Test.java:7428:20:7428:22 | out : Set [<element>] : Object | provenance |  |
-| Test.java:7427:36:7427:37 | in : List [<element>] : Object | Test.java:7427:10:7427:38 | newConcurrentHashSet(...) : Set [<element>] : Object | provenance | MaD:486 |
+| Test.java:7427:36:7427:37 | in : List [<element>] : Object | Test.java:7427:10:7427:38 | newConcurrentHashSet(...) : Set [<element>] : Object | provenance | MaD:488 |
 | Test.java:7428:20:7428:22 | out : Set [<element>] : Object | Test.java:110:19:110:32 | it : Set [<element>] : Object | provenance |  |
-| Test.java:7428:20:7428:22 | out : Set [<element>] : Object | Test.java:7428:9:7428:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:7428:20:7428:22 | out : Set [<element>] : Object | Test.java:7428:9:7428:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:7433:18:7433:44 | (...)... : List [<element>] : Object | Test.java:7434:38:7434:39 | in : List [<element>] : Object | provenance |  |
 | Test.java:7433:28:7433:44 | of(...) : List [<element>] : Object | Test.java:7433:18:7433:44 | (...)... : List [<element>] : Object | provenance |  |
-| Test.java:7433:36:7433:43 | source(...) : Object | Test.java:7433:28:7433:44 | of(...) : List [<element>] : Object | provenance | MaD:558 |
+| Test.java:7433:36:7433:43 | source(...) : Object | Test.java:7433:28:7433:44 | of(...) : List [<element>] : Object | provenance | MaD:561 |
 | Test.java:7434:10:7434:40 | newCopyOnWriteArraySet(...) : CopyOnWriteArraySet [<element>] : Object | Test.java:7435:20:7435:22 | out : CopyOnWriteArraySet [<element>] : Object | provenance |  |
-| Test.java:7434:38:7434:39 | in : List [<element>] : Object | Test.java:7434:10:7434:40 | newCopyOnWriteArraySet(...) : CopyOnWriteArraySet [<element>] : Object | provenance | MaD:487 |
+| Test.java:7434:38:7434:39 | in : List [<element>] : Object | Test.java:7434:10:7434:40 | newCopyOnWriteArraySet(...) : CopyOnWriteArraySet [<element>] : Object | provenance | MaD:489 |
 | Test.java:7435:20:7435:22 | out : CopyOnWriteArraySet [<element>] : Object | Test.java:110:19:110:32 | it : CopyOnWriteArraySet [<element>] : Object | provenance |  |
-| Test.java:7435:20:7435:22 | out : CopyOnWriteArraySet [<element>] : Object | Test.java:7435:9:7435:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:7435:20:7435:22 | out : CopyOnWriteArraySet [<element>] : Object | Test.java:7435:9:7435:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:7440:18:7440:44 | (...)... : List [<element>] : Object | Test.java:7441:26:7441:27 | in : List [<element>] : Object | provenance |  |
 | Test.java:7440:28:7440:44 | of(...) : List [<element>] : Object | Test.java:7440:18:7440:44 | (...)... : List [<element>] : Object | provenance |  |
-| Test.java:7440:36:7440:43 | source(...) : Object | Test.java:7440:28:7440:44 | of(...) : List [<element>] : Object | provenance | MaD:558 |
+| Test.java:7440:36:7440:43 | source(...) : Object | Test.java:7440:28:7440:44 | of(...) : List [<element>] : Object | provenance | MaD:561 |
 | Test.java:7441:10:7441:28 | newHashSet(...) : HashSet [<element>] : Object | Test.java:7442:20:7442:22 | out : HashSet [<element>] : Object | provenance |  |
-| Test.java:7441:26:7441:27 | in : List [<element>] : Object | Test.java:7441:10:7441:28 | newHashSet(...) : HashSet [<element>] : Object | provenance | MaD:488 |
+| Test.java:7441:26:7441:27 | in : List [<element>] : Object | Test.java:7441:10:7441:28 | newHashSet(...) : HashSet [<element>] : Object | provenance | MaD:490 |
 | Test.java:7442:20:7442:22 | out : HashSet [<element>] : Object | Test.java:110:19:110:32 | it : HashSet [<element>] : Object | provenance |  |
-| Test.java:7442:20:7442:22 | out : HashSet [<element>] : Object | Test.java:7442:9:7442:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:7442:20:7442:22 | out : HashSet [<element>] : Object | Test.java:7442:9:7442:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:7447:18:7447:55 | (...)... : Iterator [<element>] : Object | Test.java:7448:26:7448:27 | in : Iterator [<element>] : Object | provenance |  |
-| Test.java:7447:28:7447:44 | of(...) : List [<element>] : Object | Test.java:7447:28:7447:55 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:555 |
+| Test.java:7447:28:7447:44 | of(...) : List [<element>] : Object | Test.java:7447:28:7447:55 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:558 |
 | Test.java:7447:28:7447:55 | iterator(...) : Iterator [<element>] : Object | Test.java:7447:18:7447:55 | (...)... : Iterator [<element>] : Object | provenance |  |
-| Test.java:7447:36:7447:43 | source(...) : Object | Test.java:7447:28:7447:44 | of(...) : List [<element>] : Object | provenance | MaD:558 |
+| Test.java:7447:36:7447:43 | source(...) : Object | Test.java:7447:28:7447:44 | of(...) : List [<element>] : Object | provenance | MaD:561 |
 | Test.java:7448:10:7448:28 | newHashSet(...) : HashSet [<element>] : Object | Test.java:7449:20:7449:22 | out : HashSet [<element>] : Object | provenance |  |
-| Test.java:7448:26:7448:27 | in : Iterator [<element>] : Object | Test.java:7448:10:7448:28 | newHashSet(...) : HashSet [<element>] : Object | provenance | MaD:489 |
+| Test.java:7448:26:7448:27 | in : Iterator [<element>] : Object | Test.java:7448:10:7448:28 | newHashSet(...) : HashSet [<element>] : Object | provenance | MaD:491 |
 | Test.java:7449:20:7449:22 | out : HashSet [<element>] : Object | Test.java:110:19:110:32 | it : HashSet [<element>] : Object | provenance |  |
-| Test.java:7449:20:7449:22 | out : HashSet [<element>] : Object | Test.java:7449:9:7449:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:7449:20:7449:22 | out : HashSet [<element>] : Object | Test.java:7449:9:7449:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:7454:18:7454:49 | (...)... : Object[] [[]] : Object | Test.java:7455:26:7455:27 | in : Object[] [[]] : Object | provenance |  |
 | Test.java:7454:28:7454:49 | {...} : Object[] [[]] : Object | Test.java:7454:18:7454:49 | (...)... : Object[] [[]] : Object | provenance |  |
 | Test.java:7454:41:7454:48 | source(...) : Object | Test.java:7454:28:7454:49 | {...} : Object[] [[]] : Object | provenance |  |
 | Test.java:7455:10:7455:28 | newHashSet(...) : HashSet [<element>] : Object | Test.java:7456:20:7456:22 | out : HashSet [<element>] : Object | provenance |  |
-| Test.java:7455:26:7455:27 | in : Object[] [[]] : Object | Test.java:7455:10:7455:28 | newHashSet(...) : HashSet [<element>] : Object | provenance | MaD:490 |
+| Test.java:7455:26:7455:27 | in : Object[] [[]] : Object | Test.java:7455:10:7455:28 | newHashSet(...) : HashSet [<element>] : Object | provenance | MaD:492 |
 | Test.java:7456:20:7456:22 | out : HashSet [<element>] : Object | Test.java:110:19:110:32 | it : HashSet [<element>] : Object | provenance |  |
-| Test.java:7456:20:7456:22 | out : HashSet [<element>] : Object | Test.java:7456:9:7456:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:7456:20:7456:22 | out : HashSet [<element>] : Object | Test.java:7456:9:7456:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:7461:18:7461:44 | (...)... : List [<element>] : Object | Test.java:7462:32:7462:33 | in : List [<element>] : Object | provenance |  |
 | Test.java:7461:28:7461:44 | of(...) : List [<element>] : Object | Test.java:7461:18:7461:44 | (...)... : List [<element>] : Object | provenance |  |
-| Test.java:7461:36:7461:43 | source(...) : Object | Test.java:7461:28:7461:44 | of(...) : List [<element>] : Object | provenance | MaD:558 |
+| Test.java:7461:36:7461:43 | source(...) : Object | Test.java:7461:28:7461:44 | of(...) : List [<element>] : Object | provenance | MaD:561 |
 | Test.java:7462:10:7462:34 | newLinkedHashSet(...) : LinkedHashSet [<element>] : Object | Test.java:7463:20:7463:22 | out : LinkedHashSet [<element>] : Object | provenance |  |
-| Test.java:7462:32:7462:33 | in : List [<element>] : Object | Test.java:7462:10:7462:34 | newLinkedHashSet(...) : LinkedHashSet [<element>] : Object | provenance | MaD:491 |
+| Test.java:7462:32:7462:33 | in : List [<element>] : Object | Test.java:7462:10:7462:34 | newLinkedHashSet(...) : LinkedHashSet [<element>] : Object | provenance | MaD:493 |
 | Test.java:7463:20:7463:22 | out : LinkedHashSet [<element>] : Object | Test.java:110:19:110:32 | it : LinkedHashSet [<element>] : Object | provenance |  |
-| Test.java:7463:20:7463:22 | out : LinkedHashSet [<element>] : Object | Test.java:7463:9:7463:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:7463:20:7463:22 | out : LinkedHashSet [<element>] : Object | Test.java:7463:9:7463:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:7468:13:7468:39 | (...)... : Map [<map.key>] : Object | Test.java:7469:29:7469:30 | in : Map [<map.key>] : Object | provenance |  |
 | Test.java:7468:18:7468:39 | of(...) : Map [<map.key>] : Object | Test.java:7468:13:7468:39 | (...)... : Map [<map.key>] : Object | provenance |  |
-| Test.java:7468:25:7468:32 | source(...) : Object | Test.java:7468:18:7468:39 | of(...) : Map [<map.key>] : Object | provenance | MaD:563 |
+| Test.java:7468:25:7468:32 | source(...) : Object | Test.java:7468:18:7468:39 | of(...) : Map [<map.key>] : Object | provenance | MaD:564 |
 | Test.java:7469:10:7469:31 | newSetFromMap(...) : Set [<element>] : Object | Test.java:7470:20:7470:22 | out : Set [<element>] : Object | provenance |  |
-| Test.java:7469:29:7469:30 | in : Map [<map.key>] : Object | Test.java:7469:10:7469:31 | newSetFromMap(...) : Set [<element>] : Object | provenance | MaD:492 |
+| Test.java:7469:29:7469:30 | in : Map [<map.key>] : Object | Test.java:7469:10:7469:31 | newSetFromMap(...) : Set [<element>] : Object | provenance | MaD:494 |
 | Test.java:7470:20:7470:22 | out : Set [<element>] : Object | Test.java:110:19:110:32 | it : Set [<element>] : Object | provenance |  |
-| Test.java:7470:20:7470:22 | out : Set [<element>] : Object | Test.java:7470:9:7470:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:7470:20:7470:22 | out : Set [<element>] : Object | Test.java:7470:9:7470:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:7475:18:7475:44 | (...)... : List [<element>] : Object | Test.java:7476:26:7476:27 | in : List [<element>] : Object | provenance |  |
 | Test.java:7475:28:7475:44 | of(...) : List [<element>] : Object | Test.java:7475:18:7475:44 | (...)... : List [<element>] : Object | provenance |  |
-| Test.java:7475:36:7475:43 | source(...) : Object | Test.java:7475:28:7475:44 | of(...) : List [<element>] : Object | provenance | MaD:558 |
+| Test.java:7475:36:7475:43 | source(...) : Object | Test.java:7475:28:7475:44 | of(...) : List [<element>] : Object | provenance | MaD:561 |
 | Test.java:7476:10:7476:28 | newTreeSet(...) : TreeSet [<element>] : Object | Test.java:7477:20:7477:22 | out : TreeSet [<element>] : Object | provenance |  |
-| Test.java:7476:26:7476:27 | in : List [<element>] : Object | Test.java:7476:10:7476:28 | newTreeSet(...) : TreeSet [<element>] : Object | provenance | MaD:493 |
+| Test.java:7476:26:7476:27 | in : List [<element>] : Object | Test.java:7476:10:7476:28 | newTreeSet(...) : TreeSet [<element>] : Object | provenance | MaD:495 |
 | Test.java:7477:20:7477:22 | out : TreeSet [<element>] : Object | Test.java:110:19:110:32 | it : TreeSet [<element>] : Object | provenance |  |
-| Test.java:7477:20:7477:22 | out : TreeSet [<element>] : Object | Test.java:7477:9:7477:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:7477:20:7477:22 | out : TreeSet [<element>] : Object | Test.java:7477:9:7477:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:7482:13:7482:33 | (...)... : Set [<element>] : Object | Test.java:7483:24:7483:25 | in : Set [<element>] : Object | provenance |  |
 | Test.java:7482:18:7482:33 | of(...) : Set [<element>] : Object | Test.java:7482:13:7482:33 | (...)... : Set [<element>] : Object | provenance |  |
-| Test.java:7482:25:7482:32 | source(...) : Object | Test.java:7482:18:7482:33 | of(...) : Set [<element>] : Object | provenance | MaD:567 |
+| Test.java:7482:25:7482:32 | source(...) : Object | Test.java:7482:18:7482:33 | of(...) : Set [<element>] : Object | provenance | MaD:570 |
 | Test.java:7483:10:7483:26 | powerSet(...) : Set [<element>, <element>] : Object | Test.java:7484:31:7484:33 | out : Set [<element>, <element>] : Object | provenance |  |
-| Test.java:7483:24:7483:25 | in : Set [<element>] : Object | Test.java:7483:10:7483:26 | powerSet(...) : Set [<element>, <element>] : Object | provenance | MaD:494 |
+| Test.java:7483:24:7483:25 | in : Set [<element>] : Object | Test.java:7483:10:7483:26 | powerSet(...) : Set [<element>, <element>] : Object | provenance | MaD:496 |
 | Test.java:7484:20:7484:34 | getElement(...) : Set [<element>] : Object | Test.java:110:19:110:32 | it : Set [<element>] : Object | provenance |  |
-| Test.java:7484:20:7484:34 | getElement(...) : Set [<element>] : Object | Test.java:7484:9:7484:35 | getElement(...) | provenance | MaD:555 |
+| Test.java:7484:20:7484:34 | getElement(...) : Set [<element>] : Object | Test.java:7484:9:7484:35 | getElement(...) | provenance | MaD:558 |
 | Test.java:7484:31:7484:33 | out : Set [<element>, <element>] : Object | Test.java:110:19:110:32 | it : Set [<element>, <element>] : Object | provenance |  |
-| Test.java:7484:31:7484:33 | out : Set [<element>, <element>] : Object | Test.java:7484:20:7484:34 | getElement(...) : Set [<element>] : Object | provenance | MaD:555 |
+| Test.java:7484:31:7484:33 | out : Set [<element>, <element>] : Object | Test.java:7484:20:7484:34 | getElement(...) : Set [<element>] : Object | provenance | MaD:558 |
 | Test.java:7489:22:7489:78 | (...)... : ImmutableSortedSet [<element>] : Comparable | Test.java:7490:22:7490:23 | in : ImmutableSortedSet [<element>] : Comparable | provenance |  |
 | Test.java:7489:36:7489:78 | of(...) : ImmutableSortedSet [<element>] : Comparable | Test.java:7489:22:7489:78 | (...)... : ImmutableSortedSet [<element>] : Comparable | provenance |  |
 | Test.java:7489:58:7489:77 | (...)... : Comparable | Test.java:7489:36:7489:78 | of(...) : ImmutableSortedSet [<element>] : Comparable | provenance | MaD:191 |
 | Test.java:7489:70:7489:77 | source(...) : Object | Test.java:7489:58:7489:77 | (...)... : Comparable | provenance |  |
 | Test.java:7490:10:7490:30 | subSet(...) : NavigableSet [<element>] : Comparable | Test.java:7491:20:7491:22 | out : NavigableSet [<element>] : Comparable | provenance |  |
-| Test.java:7490:22:7490:23 | in : ImmutableSortedSet [<element>] : Comparable | Test.java:7490:10:7490:30 | subSet(...) : NavigableSet [<element>] : Comparable | provenance | MaD:495 |
+| Test.java:7490:22:7490:23 | in : ImmutableSortedSet [<element>] : Comparable | Test.java:7490:10:7490:30 | subSet(...) : NavigableSet [<element>] : Comparable | provenance | MaD:497 |
 | Test.java:7491:20:7491:22 | out : NavigableSet [<element>] : Comparable | Test.java:110:19:110:32 | it : NavigableSet [<element>] : Comparable | provenance |  |
-| Test.java:7491:20:7491:22 | out : NavigableSet [<element>] : Comparable | Test.java:7491:9:7491:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:7491:20:7491:22 | out : NavigableSet [<element>] : Comparable | Test.java:7491:9:7491:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:7496:13:7496:33 | (...)... : Set [<element>] : Object | Test.java:7497:41:7497:42 | in : Set [<element>] : Object | provenance |  |
 | Test.java:7496:18:7496:33 | of(...) : Set [<element>] : Object | Test.java:7496:13:7496:33 | (...)... : Set [<element>] : Object | provenance |  |
-| Test.java:7496:25:7496:32 | source(...) : Object | Test.java:7496:18:7496:33 | of(...) : Set [<element>] : Object | provenance | MaD:567 |
+| Test.java:7496:25:7496:32 | source(...) : Object | Test.java:7496:18:7496:33 | of(...) : Set [<element>] : Object | provenance | MaD:570 |
 | Test.java:7497:10:7497:43 | symmetricDifference(...) : SetView [<element>] : Object | Test.java:7498:20:7498:22 | out : SetView [<element>] : Object | provenance |  |
-| Test.java:7497:41:7497:42 | in : Set [<element>] : Object | Test.java:7497:10:7497:43 | symmetricDifference(...) : SetView [<element>] : Object | provenance | MaD:496 |
+| Test.java:7497:41:7497:42 | in : Set [<element>] : Object | Test.java:7497:10:7497:43 | symmetricDifference(...) : SetView [<element>] : Object | provenance | MaD:498 |
 | Test.java:7498:20:7498:22 | out : SetView [<element>] : Object | Test.java:110:19:110:32 | it : SetView [<element>] : Object | provenance |  |
-| Test.java:7498:20:7498:22 | out : SetView [<element>] : Object | Test.java:7498:9:7498:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:7498:20:7498:22 | out : SetView [<element>] : Object | Test.java:7498:9:7498:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:7503:13:7503:33 | (...)... : Set [<element>] : Object | Test.java:7504:35:7504:36 | in : Set [<element>] : Object | provenance |  |
 | Test.java:7503:18:7503:33 | of(...) : Set [<element>] : Object | Test.java:7503:13:7503:33 | (...)... : Set [<element>] : Object | provenance |  |
-| Test.java:7503:25:7503:32 | source(...) : Object | Test.java:7503:18:7503:33 | of(...) : Set [<element>] : Object | provenance | MaD:567 |
+| Test.java:7503:25:7503:32 | source(...) : Object | Test.java:7503:18:7503:33 | of(...) : Set [<element>] : Object | provenance | MaD:570 |
 | Test.java:7504:10:7504:43 | symmetricDifference(...) : SetView [<element>] : Object | Test.java:7505:20:7505:22 | out : SetView [<element>] : Object | provenance |  |
-| Test.java:7504:35:7504:36 | in : Set [<element>] : Object | Test.java:7504:10:7504:43 | symmetricDifference(...) : SetView [<element>] : Object | provenance | MaD:496 |
+| Test.java:7504:35:7504:36 | in : Set [<element>] : Object | Test.java:7504:10:7504:43 | symmetricDifference(...) : SetView [<element>] : Object | provenance | MaD:498 |
 | Test.java:7505:20:7505:22 | out : SetView [<element>] : Object | Test.java:110:19:110:32 | it : SetView [<element>] : Object | provenance |  |
-| Test.java:7505:20:7505:22 | out : SetView [<element>] : Object | Test.java:7505:9:7505:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:7505:20:7505:22 | out : SetView [<element>] : Object | Test.java:7505:9:7505:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:7510:22:7510:78 | (...)... : ImmutableSortedSet [<element>] : Comparable | Test.java:7511:40:7511:41 | in : ImmutableSortedSet [<element>] : Comparable | provenance |  |
 | Test.java:7510:36:7510:78 | of(...) : ImmutableSortedSet [<element>] : Comparable | Test.java:7510:22:7510:78 | (...)... : ImmutableSortedSet [<element>] : Comparable | provenance |  |
 | Test.java:7510:58:7510:77 | (...)... : Comparable | Test.java:7510:36:7510:78 | of(...) : ImmutableSortedSet [<element>] : Comparable | provenance | MaD:191 |
 | Test.java:7510:70:7510:77 | source(...) : Object | Test.java:7510:58:7510:77 | (...)... : Comparable | provenance |  |
 | Test.java:7511:10:7511:42 | synchronizedNavigableSet(...) : NavigableSet [<element>] : Comparable | Test.java:7512:20:7512:22 | out : NavigableSet [<element>] : Comparable | provenance |  |
-| Test.java:7511:40:7511:41 | in : ImmutableSortedSet [<element>] : Comparable | Test.java:7511:10:7511:42 | synchronizedNavigableSet(...) : NavigableSet [<element>] : Comparable | provenance | MaD:497 |
+| Test.java:7511:40:7511:41 | in : ImmutableSortedSet [<element>] : Comparable | Test.java:7511:10:7511:42 | synchronizedNavigableSet(...) : NavigableSet [<element>] : Comparable | provenance | MaD:499 |
 | Test.java:7512:20:7512:22 | out : NavigableSet [<element>] : Comparable | Test.java:110:19:110:32 | it : NavigableSet [<element>] : Comparable | provenance |  |
-| Test.java:7512:20:7512:22 | out : NavigableSet [<element>] : Comparable | Test.java:7512:9:7512:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:7512:20:7512:22 | out : NavigableSet [<element>] : Comparable | Test.java:7512:9:7512:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:7517:13:7517:33 | (...)... : Set [<element>] : Object | Test.java:7518:27:7518:28 | in : Set [<element>] : Object | provenance |  |
 | Test.java:7517:18:7517:33 | of(...) : Set [<element>] : Object | Test.java:7517:13:7517:33 | (...)... : Set [<element>] : Object | provenance |  |
-| Test.java:7517:25:7517:32 | source(...) : Object | Test.java:7517:18:7517:33 | of(...) : Set [<element>] : Object | provenance | MaD:567 |
+| Test.java:7517:25:7517:32 | source(...) : Object | Test.java:7517:18:7517:33 | of(...) : Set [<element>] : Object | provenance | MaD:570 |
 | Test.java:7518:10:7518:29 | union(...) : SetView [<element>] : Object | Test.java:7519:20:7519:22 | out : SetView [<element>] : Object | provenance |  |
-| Test.java:7518:27:7518:28 | in : Set [<element>] : Object | Test.java:7518:10:7518:29 | union(...) : SetView [<element>] : Object | provenance | MaD:498 |
+| Test.java:7518:27:7518:28 | in : Set [<element>] : Object | Test.java:7518:10:7518:29 | union(...) : SetView [<element>] : Object | provenance | MaD:500 |
 | Test.java:7519:20:7519:22 | out : SetView [<element>] : Object | Test.java:110:19:110:32 | it : SetView [<element>] : Object | provenance |  |
-| Test.java:7519:20:7519:22 | out : SetView [<element>] : Object | Test.java:7519:9:7519:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:7519:20:7519:22 | out : SetView [<element>] : Object | Test.java:7519:9:7519:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:7524:13:7524:33 | (...)... : Set [<element>] : Object | Test.java:7525:21:7525:22 | in : Set [<element>] : Object | provenance |  |
 | Test.java:7524:18:7524:33 | of(...) : Set [<element>] : Object | Test.java:7524:13:7524:33 | (...)... : Set [<element>] : Object | provenance |  |
-| Test.java:7524:25:7524:32 | source(...) : Object | Test.java:7524:18:7524:33 | of(...) : Set [<element>] : Object | provenance | MaD:567 |
+| Test.java:7524:25:7524:32 | source(...) : Object | Test.java:7524:18:7524:33 | of(...) : Set [<element>] : Object | provenance | MaD:570 |
 | Test.java:7525:10:7525:29 | union(...) : SetView [<element>] : Object | Test.java:7526:20:7526:22 | out : SetView [<element>] : Object | provenance |  |
-| Test.java:7525:21:7525:22 | in : Set [<element>] : Object | Test.java:7525:10:7525:29 | union(...) : SetView [<element>] : Object | provenance | MaD:498 |
+| Test.java:7525:21:7525:22 | in : Set [<element>] : Object | Test.java:7525:10:7525:29 | union(...) : SetView [<element>] : Object | provenance | MaD:500 |
 | Test.java:7526:20:7526:22 | out : SetView [<element>] : Object | Test.java:110:19:110:32 | it : SetView [<element>] : Object | provenance |  |
-| Test.java:7526:20:7526:22 | out : SetView [<element>] : Object | Test.java:7526:9:7526:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:7526:20:7526:22 | out : SetView [<element>] : Object | Test.java:7526:9:7526:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:7531:22:7531:78 | (...)... : ImmutableSortedSet [<element>] : Comparable | Test.java:7532:40:7532:41 | in : ImmutableSortedSet [<element>] : Comparable | provenance |  |
 | Test.java:7531:36:7531:78 | of(...) : ImmutableSortedSet [<element>] : Comparable | Test.java:7531:22:7531:78 | (...)... : ImmutableSortedSet [<element>] : Comparable | provenance |  |
 | Test.java:7531:58:7531:77 | (...)... : Comparable | Test.java:7531:36:7531:78 | of(...) : ImmutableSortedSet [<element>] : Comparable | provenance | MaD:191 |
 | Test.java:7531:70:7531:77 | source(...) : Object | Test.java:7531:58:7531:77 | (...)... : Comparable | provenance |  |
 | Test.java:7532:10:7532:42 | unmodifiableNavigableSet(...) : NavigableSet [<element>] : Comparable | Test.java:7533:20:7533:22 | out : NavigableSet [<element>] : Comparable | provenance |  |
-| Test.java:7532:40:7532:41 | in : ImmutableSortedSet [<element>] : Comparable | Test.java:7532:10:7532:42 | unmodifiableNavigableSet(...) : NavigableSet [<element>] : Comparable | provenance | MaD:499 |
+| Test.java:7532:40:7532:41 | in : ImmutableSortedSet [<element>] : Comparable | Test.java:7532:10:7532:42 | unmodifiableNavigableSet(...) : NavigableSet [<element>] : Comparable | provenance | MaD:501 |
 | Test.java:7533:20:7533:22 | out : NavigableSet [<element>] : Comparable | Test.java:110:19:110:32 | it : NavigableSet [<element>] : Comparable | provenance |  |
-| Test.java:7533:20:7533:22 | out : NavigableSet [<element>] : Comparable | Test.java:7533:9:7533:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:7533:20:7533:22 | out : NavigableSet [<element>] : Comparable | Test.java:7533:9:7533:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:7538:20:7538:65 | (...)... : Cell [com.google.common.collect.Table.columnKey] : Object | Test.java:7539:10:7539:11 | in : Cell [com.google.common.collect.Table.columnKey] : Object | provenance |  |
 | Test.java:7538:32:7538:65 | newTableCell(...) : Cell [com.google.common.collect.Table.columnKey] : Object | Test.java:7538:20:7538:65 | (...)... : Cell [com.google.common.collect.Table.columnKey] : Object | provenance |  |
 | Test.java:7538:51:7538:58 | source(...) : Object | Test.java:102:48:102:55 | column : Object | provenance |  |
-| Test.java:7538:51:7538:58 | source(...) : Object | Test.java:7538:32:7538:65 | newTableCell(...) : Cell [com.google.common.collect.Table.columnKey] : Object | provenance | MaD:197 |
-| Test.java:7539:10:7539:11 | in : Cell [com.google.common.collect.Table.columnKey] : Object | Test.java:7539:10:7539:26 | getColumnKey(...) : Object | provenance | MaD:526 |
+| Test.java:7538:51:7538:58 | source(...) : Object | Test.java:7538:32:7538:65 | newTableCell(...) : Cell [com.google.common.collect.Table.columnKey] : Object | provenance | MaD:214 |
+| Test.java:7539:10:7539:11 | in : Cell [com.google.common.collect.Table.columnKey] : Object | Test.java:7539:10:7539:26 | getColumnKey(...) : Object | provenance | MaD:502 |
 | Test.java:7539:10:7539:26 | getColumnKey(...) : Object | Test.java:7540:9:7540:11 | out | provenance |  |
 | Test.java:7545:20:7545:65 | (...)... : Cell [com.google.common.collect.Table.rowKey] : Object | Test.java:7546:10:7546:11 | in : Cell [com.google.common.collect.Table.rowKey] : Object | provenance |  |
 | Test.java:7545:32:7545:65 | newTableCell(...) : Cell [com.google.common.collect.Table.rowKey] : Object | Test.java:7545:20:7545:65 | (...)... : Cell [com.google.common.collect.Table.rowKey] : Object | provenance |  |
 | Test.java:7545:45:7545:52 | source(...) : Object | Test.java:102:41:102:45 | row : Object | provenance |  |
-| Test.java:7545:45:7545:52 | source(...) : Object | Test.java:7545:32:7545:65 | newTableCell(...) : Cell [com.google.common.collect.Table.rowKey] : Object | provenance | MaD:196 |
-| Test.java:7546:10:7546:11 | in : Cell [com.google.common.collect.Table.rowKey] : Object | Test.java:7546:10:7546:23 | getRowKey(...) : Object | provenance | MaD:527 |
+| Test.java:7545:45:7545:52 | source(...) : Object | Test.java:7545:32:7545:65 | newTableCell(...) : Cell [com.google.common.collect.Table.rowKey] : Object | provenance | MaD:213 |
+| Test.java:7546:10:7546:11 | in : Cell [com.google.common.collect.Table.rowKey] : Object | Test.java:7546:10:7546:23 | getRowKey(...) : Object | provenance | MaD:503 |
 | Test.java:7546:10:7546:23 | getRowKey(...) : Object | Test.java:7547:9:7547:11 | out | provenance |  |
 | Test.java:7552:20:7552:65 | (...)... : Cell [<map.value>] : Object | Test.java:7553:10:7553:11 | in : Cell [<map.value>] : Object | provenance |  |
 | Test.java:7552:32:7552:65 | newTableCell(...) : Cell [<map.value>] : Object | Test.java:7552:20:7552:65 | (...)... : Cell [<map.value>] : Object | provenance |  |
 | Test.java:7552:57:7552:64 | source(...) : Object | Test.java:102:58:102:64 | value : Object | provenance |  |
-| Test.java:7552:57:7552:64 | source(...) : Object | Test.java:7552:32:7552:65 | newTableCell(...) : Cell [<map.value>] : Object | provenance | MaD:198 |
-| Test.java:7553:10:7553:11 | in : Cell [<map.value>] : Object | Test.java:7553:10:7553:22 | getValue(...) : Object | provenance | MaD:528 |
+| Test.java:7552:57:7552:64 | source(...) : Object | Test.java:7552:32:7552:65 | newTableCell(...) : Cell [<map.value>] : Object | provenance | MaD:215 |
+| Test.java:7553:10:7553:11 | in : Cell [<map.value>] : Object | Test.java:7553:10:7553:22 | getValue(...) : Object | provenance | MaD:504 |
 | Test.java:7553:10:7553:22 | getValue(...) : Object | Test.java:7554:9:7554:11 | out | provenance |  |
 | Test.java:7559:15:7559:51 | (...)... : TreeBasedTable [<map.value>] : Object | Test.java:7560:10:7560:11 | in : TreeBasedTable [<map.value>] : Object | provenance |  |
 | Test.java:7559:22:7559:51 | newTable(...) : TreeBasedTable [<map.value>] : Object | Test.java:7559:15:7559:51 | (...)... : TreeBasedTable [<map.value>] : Object | provenance |  |
 | Test.java:7559:43:7559:50 | source(...) : Object | Test.java:103:58:103:64 | value : Object | provenance |  |
-| Test.java:7559:43:7559:50 | source(...) : Object | Test.java:7559:22:7559:51 | newTable(...) : TreeBasedTable [<map.value>] : Object | provenance | MaD:514 |
-| Test.java:7560:10:7560:11 | in : TreeBasedTable [<map.value>] : Object | Test.java:7560:10:7560:21 | cellSet(...) : Set [<element>, <map.value>] : Object | provenance | MaD:502 |
+| Test.java:7559:43:7559:50 | source(...) : Object | Test.java:7559:22:7559:51 | newTable(...) : TreeBasedTable [<map.value>] : Object | provenance | MaD:517 |
+| Test.java:7560:10:7560:11 | in : TreeBasedTable [<map.value>] : Object | Test.java:7560:10:7560:21 | cellSet(...) : Set [<element>, <map.value>] : Object | provenance | MaD:505 |
 | Test.java:7560:10:7560:21 | cellSet(...) : Set [<element>, <map.value>] : Object | Test.java:7561:20:7561:22 | out : Set [<element>, <map.value>] : Object | provenance |  |
-| Test.java:7561:9:7561:23 | getElement(...) : Cell [<map.value>] : Object | Test.java:7561:9:7561:34 | getValue(...) | provenance | MaD:528 |
+| Test.java:7561:9:7561:23 | getElement(...) : Cell [<map.value>] : Object | Test.java:7561:9:7561:34 | getValue(...) | provenance | MaD:504 |
 | Test.java:7561:20:7561:22 | out : Set [<element>, <map.value>] : Object | Test.java:110:19:110:32 | it : Set [<element>, <map.value>] : Object | provenance |  |
-| Test.java:7561:20:7561:22 | out : Set [<element>, <map.value>] : Object | Test.java:7561:9:7561:23 | getElement(...) : Cell [<map.value>] : Object | provenance | MaD:555 |
+| Test.java:7561:20:7561:22 | out : Set [<element>, <map.value>] : Object | Test.java:7561:9:7561:23 | getElement(...) : Cell [<map.value>] : Object | provenance | MaD:558 |
 | Test.java:7566:20:7566:89 | (...)... : ArrayTable [<map.value>] : Object | Test.java:7567:10:7567:11 | in : ArrayTable [<map.value>] : Object | provenance |  |
 | Test.java:7566:32:7566:89 | create(...) : ArrayTable [<map.value>] : Object | Test.java:7566:20:7566:89 | (...)... : ArrayTable [<map.value>] : Object | provenance |  |
 | Test.java:7566:50:7566:88 | of(...) : ImmutableTable [<map.value>] : Object | Test.java:7566:32:7566:89 | create(...) : ArrayTable [<map.value>] : Object | provenance | MaD:6 |
-| Test.java:7566:80:7566:87 | source(...) : Object | Test.java:7566:50:7566:88 | of(...) : ImmutableTable [<map.value>] : Object | provenance | MaD:198 |
-| Test.java:7567:10:7567:11 | in : ArrayTable [<map.value>] : Object | Test.java:7567:10:7567:21 | cellSet(...) : Set [<element>, <map.value>] : Object | provenance | MaD:502 |
+| Test.java:7566:80:7566:87 | source(...) : Object | Test.java:7566:50:7566:88 | of(...) : ImmutableTable [<map.value>] : Object | provenance | MaD:215 |
+| Test.java:7567:10:7567:11 | in : ArrayTable [<map.value>] : Object | Test.java:7567:10:7567:21 | cellSet(...) : Set [<element>, <map.value>] : Object | provenance | MaD:505 |
 | Test.java:7567:10:7567:21 | cellSet(...) : Set [<element>, <map.value>] : Object | Test.java:7568:20:7568:22 | out : Set [<element>, <map.value>] : Object | provenance |  |
-| Test.java:7568:9:7568:23 | getElement(...) : Cell [<map.value>] : Object | Test.java:7568:9:7568:34 | getValue(...) | provenance | MaD:528 |
+| Test.java:7568:9:7568:23 | getElement(...) : Cell [<map.value>] : Object | Test.java:7568:9:7568:34 | getValue(...) | provenance | MaD:504 |
 | Test.java:7568:20:7568:22 | out : Set [<element>, <map.value>] : Object | Test.java:110:19:110:32 | it : Set [<element>, <map.value>] : Object | provenance |  |
-| Test.java:7568:20:7568:22 | out : Set [<element>, <map.value>] : Object | Test.java:7568:9:7568:23 | getElement(...) : Cell [<map.value>] : Object | provenance | MaD:555 |
+| Test.java:7568:20:7568:22 | out : Set [<element>, <map.value>] : Object | Test.java:7568:9:7568:23 | getElement(...) : Cell [<map.value>] : Object | provenance | MaD:558 |
 | Test.java:7573:24:7573:78 | (...)... : ImmutableTable [<map.value>] : Object | Test.java:7574:10:7574:11 | in : ImmutableTable [<map.value>] : Object | provenance |  |
 | Test.java:7573:40:7573:78 | of(...) : ImmutableTable [<map.value>] : Object | Test.java:7573:24:7573:78 | (...)... : ImmutableTable [<map.value>] : Object | provenance |  |
-| Test.java:7573:70:7573:77 | source(...) : Object | Test.java:7573:40:7573:78 | of(...) : ImmutableTable [<map.value>] : Object | provenance | MaD:198 |
-| Test.java:7574:10:7574:11 | in : ImmutableTable [<map.value>] : Object | Test.java:7574:10:7574:21 | cellSet(...) : ImmutableSet [<element>, <map.value>] : Object | provenance | MaD:502 |
+| Test.java:7573:70:7573:77 | source(...) : Object | Test.java:7573:40:7573:78 | of(...) : ImmutableTable [<map.value>] : Object | provenance | MaD:215 |
+| Test.java:7574:10:7574:11 | in : ImmutableTable [<map.value>] : Object | Test.java:7574:10:7574:21 | cellSet(...) : ImmutableSet [<element>, <map.value>] : Object | provenance | MaD:505 |
 | Test.java:7574:10:7574:21 | cellSet(...) : ImmutableSet [<element>, <map.value>] : Object | Test.java:7575:20:7575:22 | out : ImmutableSet [<element>, <map.value>] : Object | provenance |  |
-| Test.java:7575:9:7575:23 | getElement(...) : Cell [<map.value>] : Object | Test.java:7575:9:7575:34 | getValue(...) | provenance | MaD:528 |
+| Test.java:7575:9:7575:23 | getElement(...) : Cell [<map.value>] : Object | Test.java:7575:9:7575:34 | getValue(...) | provenance | MaD:504 |
 | Test.java:7575:20:7575:22 | out : ImmutableSet [<element>, <map.value>] : Object | Test.java:110:19:110:32 | it : ImmutableSet [<element>, <map.value>] : Object | provenance |  |
-| Test.java:7575:20:7575:22 | out : ImmutableSet [<element>, <map.value>] : Object | Test.java:7575:9:7575:23 | getElement(...) : Cell [<map.value>] : Object | provenance | MaD:555 |
+| Test.java:7575:20:7575:22 | out : ImmutableSet [<element>, <map.value>] : Object | Test.java:7575:9:7575:23 | getElement(...) : Cell [<map.value>] : Object | provenance | MaD:558 |
 | Test.java:7580:15:7580:51 | (...)... : TreeBasedTable [com.google.common.collect.Table.columnKey] : Object | Test.java:7581:10:7581:11 | in : TreeBasedTable [com.google.common.collect.Table.columnKey] : Object | provenance |  |
 | Test.java:7580:22:7580:51 | newTable(...) : TreeBasedTable [com.google.common.collect.Table.columnKey] : Object | Test.java:7580:15:7580:51 | (...)... : TreeBasedTable [com.google.common.collect.Table.columnKey] : Object | provenance |  |
 | Test.java:7580:37:7580:44 | source(...) : Object | Test.java:103:48:103:55 | column : Object | provenance |  |
-| Test.java:7580:37:7580:44 | source(...) : Object | Test.java:7580:22:7580:51 | newTable(...) : TreeBasedTable [com.google.common.collect.Table.columnKey] : Object | provenance | MaD:513 |
-| Test.java:7581:10:7581:11 | in : TreeBasedTable [com.google.common.collect.Table.columnKey] : Object | Test.java:7581:10:7581:21 | cellSet(...) : Set [<element>, com.google.common.collect.Table.columnKey] : Object | provenance | MaD:503 |
+| Test.java:7580:37:7580:44 | source(...) : Object | Test.java:7580:22:7580:51 | newTable(...) : TreeBasedTable [com.google.common.collect.Table.columnKey] : Object | provenance | MaD:516 |
+| Test.java:7581:10:7581:11 | in : TreeBasedTable [com.google.common.collect.Table.columnKey] : Object | Test.java:7581:10:7581:21 | cellSet(...) : Set [<element>, com.google.common.collect.Table.columnKey] : Object | provenance | MaD:506 |
 | Test.java:7581:10:7581:21 | cellSet(...) : Set [<element>, com.google.common.collect.Table.columnKey] : Object | Test.java:7582:20:7582:22 | out : Set [<element>, com.google.common.collect.Table.columnKey] : Object | provenance |  |
-| Test.java:7582:9:7582:23 | getElement(...) : Cell [com.google.common.collect.Table.columnKey] : Object | Test.java:7582:9:7582:38 | getColumnKey(...) | provenance | MaD:526 |
+| Test.java:7582:9:7582:23 | getElement(...) : Cell [com.google.common.collect.Table.columnKey] : Object | Test.java:7582:9:7582:38 | getColumnKey(...) | provenance | MaD:502 |
 | Test.java:7582:20:7582:22 | out : Set [<element>, com.google.common.collect.Table.columnKey] : Object | Test.java:110:19:110:32 | it : Set [<element>, com.google.common.collect.Table.columnKey] : Object | provenance |  |
-| Test.java:7582:20:7582:22 | out : Set [<element>, com.google.common.collect.Table.columnKey] : Object | Test.java:7582:9:7582:23 | getElement(...) : Cell [com.google.common.collect.Table.columnKey] : Object | provenance | MaD:555 |
+| Test.java:7582:20:7582:22 | out : Set [<element>, com.google.common.collect.Table.columnKey] : Object | Test.java:7582:9:7582:23 | getElement(...) : Cell [com.google.common.collect.Table.columnKey] : Object | provenance | MaD:558 |
 | Test.java:7587:20:7587:89 | (...)... : ArrayTable [com.google.common.collect.Table.columnKey] : Object | Test.java:7588:10:7588:11 | in : ArrayTable [com.google.common.collect.Table.columnKey] : Object | provenance |  |
 | Test.java:7587:32:7587:89 | create(...) : ArrayTable [com.google.common.collect.Table.columnKey] : Object | Test.java:7587:20:7587:89 | (...)... : ArrayTable [com.google.common.collect.Table.columnKey] : Object | provenance |  |
 | Test.java:7587:50:7587:88 | of(...) : ImmutableTable [com.google.common.collect.Table.columnKey] : Object | Test.java:7587:32:7587:89 | create(...) : ArrayTable [com.google.common.collect.Table.columnKey] : Object | provenance | MaD:7 |
-| Test.java:7587:74:7587:81 | source(...) : Object | Test.java:7587:50:7587:88 | of(...) : ImmutableTable [com.google.common.collect.Table.columnKey] : Object | provenance | MaD:197 |
-| Test.java:7588:10:7588:11 | in : ArrayTable [com.google.common.collect.Table.columnKey] : Object | Test.java:7588:10:7588:21 | cellSet(...) : Set [<element>, com.google.common.collect.Table.columnKey] : Object | provenance | MaD:503 |
+| Test.java:7587:74:7587:81 | source(...) : Object | Test.java:7587:50:7587:88 | of(...) : ImmutableTable [com.google.common.collect.Table.columnKey] : Object | provenance | MaD:214 |
+| Test.java:7588:10:7588:11 | in : ArrayTable [com.google.common.collect.Table.columnKey] : Object | Test.java:7588:10:7588:21 | cellSet(...) : Set [<element>, com.google.common.collect.Table.columnKey] : Object | provenance | MaD:506 |
 | Test.java:7588:10:7588:21 | cellSet(...) : Set [<element>, com.google.common.collect.Table.columnKey] : Object | Test.java:7589:20:7589:22 | out : Set [<element>, com.google.common.collect.Table.columnKey] : Object | provenance |  |
-| Test.java:7589:9:7589:23 | getElement(...) : Cell [com.google.common.collect.Table.columnKey] : Object | Test.java:7589:9:7589:38 | getColumnKey(...) | provenance | MaD:526 |
+| Test.java:7589:9:7589:23 | getElement(...) : Cell [com.google.common.collect.Table.columnKey] : Object | Test.java:7589:9:7589:38 | getColumnKey(...) | provenance | MaD:502 |
 | Test.java:7589:20:7589:22 | out : Set [<element>, com.google.common.collect.Table.columnKey] : Object | Test.java:110:19:110:32 | it : Set [<element>, com.google.common.collect.Table.columnKey] : Object | provenance |  |
-| Test.java:7589:20:7589:22 | out : Set [<element>, com.google.common.collect.Table.columnKey] : Object | Test.java:7589:9:7589:23 | getElement(...) : Cell [com.google.common.collect.Table.columnKey] : Object | provenance | MaD:555 |
+| Test.java:7589:20:7589:22 | out : Set [<element>, com.google.common.collect.Table.columnKey] : Object | Test.java:7589:9:7589:23 | getElement(...) : Cell [com.google.common.collect.Table.columnKey] : Object | provenance | MaD:558 |
 | Test.java:7594:24:7594:78 | (...)... : ImmutableTable [com.google.common.collect.Table.columnKey] : Object | Test.java:7595:10:7595:11 | in : ImmutableTable [com.google.common.collect.Table.columnKey] : Object | provenance |  |
 | Test.java:7594:40:7594:78 | of(...) : ImmutableTable [com.google.common.collect.Table.columnKey] : Object | Test.java:7594:24:7594:78 | (...)... : ImmutableTable [com.google.common.collect.Table.columnKey] : Object | provenance |  |
-| Test.java:7594:64:7594:71 | source(...) : Object | Test.java:7594:40:7594:78 | of(...) : ImmutableTable [com.google.common.collect.Table.columnKey] : Object | provenance | MaD:197 |
-| Test.java:7595:10:7595:11 | in : ImmutableTable [com.google.common.collect.Table.columnKey] : Object | Test.java:7595:10:7595:21 | cellSet(...) : ImmutableSet [<element>, com.google.common.collect.Table.columnKey] : Object | provenance | MaD:503 |
+| Test.java:7594:64:7594:71 | source(...) : Object | Test.java:7594:40:7594:78 | of(...) : ImmutableTable [com.google.common.collect.Table.columnKey] : Object | provenance | MaD:214 |
+| Test.java:7595:10:7595:11 | in : ImmutableTable [com.google.common.collect.Table.columnKey] : Object | Test.java:7595:10:7595:21 | cellSet(...) : ImmutableSet [<element>, com.google.common.collect.Table.columnKey] : Object | provenance | MaD:506 |
 | Test.java:7595:10:7595:21 | cellSet(...) : ImmutableSet [<element>, com.google.common.collect.Table.columnKey] : Object | Test.java:7596:20:7596:22 | out : ImmutableSet [<element>, com.google.common.collect.Table.columnKey] : Object | provenance |  |
-| Test.java:7596:9:7596:23 | getElement(...) : Cell [com.google.common.collect.Table.columnKey] : Object | Test.java:7596:9:7596:38 | getColumnKey(...) | provenance | MaD:526 |
+| Test.java:7596:9:7596:23 | getElement(...) : Cell [com.google.common.collect.Table.columnKey] : Object | Test.java:7596:9:7596:38 | getColumnKey(...) | provenance | MaD:502 |
 | Test.java:7596:20:7596:22 | out : ImmutableSet [<element>, com.google.common.collect.Table.columnKey] : Object | Test.java:110:19:110:32 | it : ImmutableSet [<element>, com.google.common.collect.Table.columnKey] : Object | provenance |  |
-| Test.java:7596:20:7596:22 | out : ImmutableSet [<element>, com.google.common.collect.Table.columnKey] : Object | Test.java:7596:9:7596:23 | getElement(...) : Cell [com.google.common.collect.Table.columnKey] : Object | provenance | MaD:555 |
+| Test.java:7596:20:7596:22 | out : ImmutableSet [<element>, com.google.common.collect.Table.columnKey] : Object | Test.java:7596:9:7596:23 | getElement(...) : Cell [com.google.common.collect.Table.columnKey] : Object | provenance | MaD:558 |
 | Test.java:7601:15:7601:51 | (...)... : TreeBasedTable [com.google.common.collect.Table.rowKey] : Object | Test.java:7602:10:7602:11 | in : TreeBasedTable [com.google.common.collect.Table.rowKey] : Object | provenance |  |
 | Test.java:7601:22:7601:51 | newTable(...) : TreeBasedTable [com.google.common.collect.Table.rowKey] : Object | Test.java:7601:15:7601:51 | (...)... : TreeBasedTable [com.google.common.collect.Table.rowKey] : Object | provenance |  |
 | Test.java:7601:31:7601:38 | source(...) : Object | Test.java:103:41:103:45 | row : Object | provenance |  |
-| Test.java:7601:31:7601:38 | source(...) : Object | Test.java:7601:22:7601:51 | newTable(...) : TreeBasedTable [com.google.common.collect.Table.rowKey] : Object | provenance | MaD:512 |
-| Test.java:7602:10:7602:11 | in : TreeBasedTable [com.google.common.collect.Table.rowKey] : Object | Test.java:7602:10:7602:21 | cellSet(...) : Set [<element>, com.google.common.collect.Table.rowKey] : Object | provenance | MaD:504 |
+| Test.java:7601:31:7601:38 | source(...) : Object | Test.java:7601:22:7601:51 | newTable(...) : TreeBasedTable [com.google.common.collect.Table.rowKey] : Object | provenance | MaD:515 |
+| Test.java:7602:10:7602:11 | in : TreeBasedTable [com.google.common.collect.Table.rowKey] : Object | Test.java:7602:10:7602:21 | cellSet(...) : Set [<element>, com.google.common.collect.Table.rowKey] : Object | provenance | MaD:507 |
 | Test.java:7602:10:7602:21 | cellSet(...) : Set [<element>, com.google.common.collect.Table.rowKey] : Object | Test.java:7603:20:7603:22 | out : Set [<element>, com.google.common.collect.Table.rowKey] : Object | provenance |  |
-| Test.java:7603:9:7603:23 | getElement(...) : Cell [com.google.common.collect.Table.rowKey] : Object | Test.java:7603:9:7603:35 | getRowKey(...) | provenance | MaD:527 |
+| Test.java:7603:9:7603:23 | getElement(...) : Cell [com.google.common.collect.Table.rowKey] : Object | Test.java:7603:9:7603:35 | getRowKey(...) | provenance | MaD:503 |
 | Test.java:7603:20:7603:22 | out : Set [<element>, com.google.common.collect.Table.rowKey] : Object | Test.java:110:19:110:32 | it : Set [<element>, com.google.common.collect.Table.rowKey] : Object | provenance |  |
-| Test.java:7603:20:7603:22 | out : Set [<element>, com.google.common.collect.Table.rowKey] : Object | Test.java:7603:9:7603:23 | getElement(...) : Cell [com.google.common.collect.Table.rowKey] : Object | provenance | MaD:555 |
+| Test.java:7603:20:7603:22 | out : Set [<element>, com.google.common.collect.Table.rowKey] : Object | Test.java:7603:9:7603:23 | getElement(...) : Cell [com.google.common.collect.Table.rowKey] : Object | provenance | MaD:558 |
 | Test.java:7608:20:7608:89 | (...)... : ArrayTable [com.google.common.collect.Table.rowKey] : Object | Test.java:7609:10:7609:11 | in : ArrayTable [com.google.common.collect.Table.rowKey] : Object | provenance |  |
 | Test.java:7608:32:7608:89 | create(...) : ArrayTable [com.google.common.collect.Table.rowKey] : Object | Test.java:7608:20:7608:89 | (...)... : ArrayTable [com.google.common.collect.Table.rowKey] : Object | provenance |  |
 | Test.java:7608:50:7608:88 | of(...) : ImmutableTable [com.google.common.collect.Table.rowKey] : Object | Test.java:7608:32:7608:89 | create(...) : ArrayTable [com.google.common.collect.Table.rowKey] : Object | provenance | MaD:8 |
-| Test.java:7608:68:7608:75 | source(...) : Object | Test.java:7608:50:7608:88 | of(...) : ImmutableTable [com.google.common.collect.Table.rowKey] : Object | provenance | MaD:196 |
-| Test.java:7609:10:7609:11 | in : ArrayTable [com.google.common.collect.Table.rowKey] : Object | Test.java:7609:10:7609:21 | cellSet(...) : Set [<element>, com.google.common.collect.Table.rowKey] : Object | provenance | MaD:504 |
+| Test.java:7608:68:7608:75 | source(...) : Object | Test.java:7608:50:7608:88 | of(...) : ImmutableTable [com.google.common.collect.Table.rowKey] : Object | provenance | MaD:213 |
+| Test.java:7609:10:7609:11 | in : ArrayTable [com.google.common.collect.Table.rowKey] : Object | Test.java:7609:10:7609:21 | cellSet(...) : Set [<element>, com.google.common.collect.Table.rowKey] : Object | provenance | MaD:507 |
 | Test.java:7609:10:7609:21 | cellSet(...) : Set [<element>, com.google.common.collect.Table.rowKey] : Object | Test.java:7610:20:7610:22 | out : Set [<element>, com.google.common.collect.Table.rowKey] : Object | provenance |  |
-| Test.java:7610:9:7610:23 | getElement(...) : Cell [com.google.common.collect.Table.rowKey] : Object | Test.java:7610:9:7610:35 | getRowKey(...) | provenance | MaD:527 |
+| Test.java:7610:9:7610:23 | getElement(...) : Cell [com.google.common.collect.Table.rowKey] : Object | Test.java:7610:9:7610:35 | getRowKey(...) | provenance | MaD:503 |
 | Test.java:7610:20:7610:22 | out : Set [<element>, com.google.common.collect.Table.rowKey] : Object | Test.java:110:19:110:32 | it : Set [<element>, com.google.common.collect.Table.rowKey] : Object | provenance |  |
-| Test.java:7610:20:7610:22 | out : Set [<element>, com.google.common.collect.Table.rowKey] : Object | Test.java:7610:9:7610:23 | getElement(...) : Cell [com.google.common.collect.Table.rowKey] : Object | provenance | MaD:555 |
+| Test.java:7610:20:7610:22 | out : Set [<element>, com.google.common.collect.Table.rowKey] : Object | Test.java:7610:9:7610:23 | getElement(...) : Cell [com.google.common.collect.Table.rowKey] : Object | provenance | MaD:558 |
 | Test.java:7615:24:7615:78 | (...)... : ImmutableTable [com.google.common.collect.Table.rowKey] : Object | Test.java:7616:10:7616:11 | in : ImmutableTable [com.google.common.collect.Table.rowKey] : Object | provenance |  |
 | Test.java:7615:40:7615:78 | of(...) : ImmutableTable [com.google.common.collect.Table.rowKey] : Object | Test.java:7615:24:7615:78 | (...)... : ImmutableTable [com.google.common.collect.Table.rowKey] : Object | provenance |  |
-| Test.java:7615:58:7615:65 | source(...) : Object | Test.java:7615:40:7615:78 | of(...) : ImmutableTable [com.google.common.collect.Table.rowKey] : Object | provenance | MaD:196 |
-| Test.java:7616:10:7616:11 | in : ImmutableTable [com.google.common.collect.Table.rowKey] : Object | Test.java:7616:10:7616:21 | cellSet(...) : ImmutableSet [<element>, com.google.common.collect.Table.rowKey] : Object | provenance | MaD:504 |
+| Test.java:7615:58:7615:65 | source(...) : Object | Test.java:7615:40:7615:78 | of(...) : ImmutableTable [com.google.common.collect.Table.rowKey] : Object | provenance | MaD:213 |
+| Test.java:7616:10:7616:11 | in : ImmutableTable [com.google.common.collect.Table.rowKey] : Object | Test.java:7616:10:7616:21 | cellSet(...) : ImmutableSet [<element>, com.google.common.collect.Table.rowKey] : Object | provenance | MaD:507 |
 | Test.java:7616:10:7616:21 | cellSet(...) : ImmutableSet [<element>, com.google.common.collect.Table.rowKey] : Object | Test.java:7617:20:7617:22 | out : ImmutableSet [<element>, com.google.common.collect.Table.rowKey] : Object | provenance |  |
-| Test.java:7617:9:7617:23 | getElement(...) : Cell [com.google.common.collect.Table.rowKey] : Object | Test.java:7617:9:7617:35 | getRowKey(...) | provenance | MaD:527 |
+| Test.java:7617:9:7617:23 | getElement(...) : Cell [com.google.common.collect.Table.rowKey] : Object | Test.java:7617:9:7617:35 | getRowKey(...) | provenance | MaD:503 |
 | Test.java:7617:20:7617:22 | out : ImmutableSet [<element>, com.google.common.collect.Table.rowKey] : Object | Test.java:110:19:110:32 | it : ImmutableSet [<element>, com.google.common.collect.Table.rowKey] : Object | provenance |  |
-| Test.java:7617:20:7617:22 | out : ImmutableSet [<element>, com.google.common.collect.Table.rowKey] : Object | Test.java:7617:9:7617:23 | getElement(...) : Cell [com.google.common.collect.Table.rowKey] : Object | provenance | MaD:555 |
+| Test.java:7617:20:7617:22 | out : ImmutableSet [<element>, com.google.common.collect.Table.rowKey] : Object | Test.java:7617:9:7617:23 | getElement(...) : Cell [com.google.common.collect.Table.rowKey] : Object | provenance | MaD:558 |
 | Test.java:7622:15:7622:51 | (...)... : TreeBasedTable [<map.value>] : Object | Test.java:7623:10:7623:11 | in : TreeBasedTable [<map.value>] : Object | provenance |  |
 | Test.java:7622:22:7622:51 | newTable(...) : TreeBasedTable [<map.value>] : Object | Test.java:7622:15:7622:51 | (...)... : TreeBasedTable [<map.value>] : Object | provenance |  |
 | Test.java:7622:43:7622:50 | source(...) : Object | Test.java:103:58:103:64 | value : Object | provenance |  |
-| Test.java:7622:43:7622:50 | source(...) : Object | Test.java:7622:22:7622:51 | newTable(...) : TreeBasedTable [<map.value>] : Object | provenance | MaD:514 |
-| Test.java:7623:10:7623:11 | in : TreeBasedTable [<map.value>] : Object | Test.java:7623:10:7623:24 | column(...) : Map [<map.value>] : Object | provenance | MaD:505 |
+| Test.java:7622:43:7622:50 | source(...) : Object | Test.java:7622:22:7622:51 | newTable(...) : TreeBasedTable [<map.value>] : Object | provenance | MaD:517 |
+| Test.java:7623:10:7623:11 | in : TreeBasedTable [<map.value>] : Object | Test.java:7623:10:7623:24 | column(...) : Map [<map.value>] : Object | provenance | MaD:508 |
 | Test.java:7623:10:7623:24 | column(...) : Map [<map.value>] : Object | Test.java:7624:21:7624:23 | out : Map [<map.value>] : Object | provenance |  |
 | Test.java:7624:21:7624:23 | out : Map [<map.value>] : Object | Test.java:118:20:118:31 | map : Map [<map.value>] : Object | provenance |  |
-| Test.java:7624:21:7624:23 | out : Map [<map.value>] : Object | Test.java:7624:9:7624:24 | getMapValue(...) | provenance | MaD:561 |
+| Test.java:7624:21:7624:23 | out : Map [<map.value>] : Object | Test.java:7624:9:7624:24 | getMapValue(...) | provenance | MaD:568 |
 | Test.java:7629:20:7629:89 | (...)... : ArrayTable [<map.value>] : Object | Test.java:7630:10:7630:11 | in : ArrayTable [<map.value>] : Object | provenance |  |
 | Test.java:7629:32:7629:89 | create(...) : ArrayTable [<map.value>] : Object | Test.java:7629:20:7629:89 | (...)... : ArrayTable [<map.value>] : Object | provenance |  |
 | Test.java:7629:50:7629:88 | of(...) : ImmutableTable [<map.value>] : Object | Test.java:7629:32:7629:89 | create(...) : ArrayTable [<map.value>] : Object | provenance | MaD:6 |
-| Test.java:7629:80:7629:87 | source(...) : Object | Test.java:7629:50:7629:88 | of(...) : ImmutableTable [<map.value>] : Object | provenance | MaD:198 |
-| Test.java:7630:10:7630:11 | in : ArrayTable [<map.value>] : Object | Test.java:7630:10:7630:24 | column(...) : Map [<map.value>] : Object | provenance | MaD:505 |
+| Test.java:7629:80:7629:87 | source(...) : Object | Test.java:7629:50:7629:88 | of(...) : ImmutableTable [<map.value>] : Object | provenance | MaD:215 |
+| Test.java:7630:10:7630:11 | in : ArrayTable [<map.value>] : Object | Test.java:7630:10:7630:24 | column(...) : Map [<map.value>] : Object | provenance | MaD:508 |
 | Test.java:7630:10:7630:24 | column(...) : Map [<map.value>] : Object | Test.java:7631:21:7631:23 | out : Map [<map.value>] : Object | provenance |  |
 | Test.java:7631:21:7631:23 | out : Map [<map.value>] : Object | Test.java:118:20:118:31 | map : Map [<map.value>] : Object | provenance |  |
-| Test.java:7631:21:7631:23 | out : Map [<map.value>] : Object | Test.java:7631:9:7631:24 | getMapValue(...) | provenance | MaD:561 |
+| Test.java:7631:21:7631:23 | out : Map [<map.value>] : Object | Test.java:7631:9:7631:24 | getMapValue(...) | provenance | MaD:568 |
 | Test.java:7636:24:7636:78 | (...)... : ImmutableTable [<map.value>] : Object | Test.java:7637:10:7637:11 | in : ImmutableTable [<map.value>] : Object | provenance |  |
 | Test.java:7636:40:7636:78 | of(...) : ImmutableTable [<map.value>] : Object | Test.java:7636:24:7636:78 | (...)... : ImmutableTable [<map.value>] : Object | provenance |  |
-| Test.java:7636:70:7636:77 | source(...) : Object | Test.java:7636:40:7636:78 | of(...) : ImmutableTable [<map.value>] : Object | provenance | MaD:198 |
-| Test.java:7637:10:7637:11 | in : ImmutableTable [<map.value>] : Object | Test.java:7637:10:7637:24 | column(...) : ImmutableMap [<map.value>] : Object | provenance | MaD:505 |
+| Test.java:7636:70:7636:77 | source(...) : Object | Test.java:7636:40:7636:78 | of(...) : ImmutableTable [<map.value>] : Object | provenance | MaD:215 |
+| Test.java:7637:10:7637:11 | in : ImmutableTable [<map.value>] : Object | Test.java:7637:10:7637:24 | column(...) : ImmutableMap [<map.value>] : Object | provenance | MaD:508 |
 | Test.java:7637:10:7637:24 | column(...) : ImmutableMap [<map.value>] : Object | Test.java:7638:21:7638:23 | out : ImmutableMap [<map.value>] : Object | provenance |  |
 | Test.java:7638:21:7638:23 | out : ImmutableMap [<map.value>] : Object | Test.java:118:20:118:31 | map : ImmutableMap [<map.value>] : Object | provenance |  |
-| Test.java:7638:21:7638:23 | out : ImmutableMap [<map.value>] : Object | Test.java:7638:9:7638:24 | getMapValue(...) | provenance | MaD:561 |
+| Test.java:7638:21:7638:23 | out : ImmutableMap [<map.value>] : Object | Test.java:7638:9:7638:24 | getMapValue(...) | provenance | MaD:568 |
 | Test.java:7643:15:7643:51 | (...)... : TreeBasedTable [com.google.common.collect.Table.rowKey] : Object | Test.java:7644:10:7644:11 | in : TreeBasedTable [com.google.common.collect.Table.rowKey] : Object | provenance |  |
 | Test.java:7643:22:7643:51 | newTable(...) : TreeBasedTable [com.google.common.collect.Table.rowKey] : Object | Test.java:7643:15:7643:51 | (...)... : TreeBasedTable [com.google.common.collect.Table.rowKey] : Object | provenance |  |
 | Test.java:7643:31:7643:38 | source(...) : Object | Test.java:103:41:103:45 | row : Object | provenance |  |
-| Test.java:7643:31:7643:38 | source(...) : Object | Test.java:7643:22:7643:51 | newTable(...) : TreeBasedTable [com.google.common.collect.Table.rowKey] : Object | provenance | MaD:512 |
-| Test.java:7644:10:7644:11 | in : TreeBasedTable [com.google.common.collect.Table.rowKey] : Object | Test.java:7644:10:7644:24 | column(...) : Map [<map.key>] : Object | provenance | MaD:506 |
+| Test.java:7643:31:7643:38 | source(...) : Object | Test.java:7643:22:7643:51 | newTable(...) : TreeBasedTable [com.google.common.collect.Table.rowKey] : Object | provenance | MaD:515 |
+| Test.java:7644:10:7644:11 | in : TreeBasedTable [com.google.common.collect.Table.rowKey] : Object | Test.java:7644:10:7644:24 | column(...) : Map [<map.key>] : Object | provenance | MaD:509 |
 | Test.java:7644:10:7644:24 | column(...) : Map [<map.key>] : Object | Test.java:7645:19:7645:21 | out : Map [<map.key>] : Object | provenance |  |
 | Test.java:7645:19:7645:21 | out : Map [<map.key>] : Object | Test.java:99:18:99:29 | map : Map [<map.key>] : Object | provenance |  |
-| Test.java:7645:19:7645:21 | out : Map [<map.key>] : Object | Test.java:7645:9:7645:22 | getMapKey(...) | provenance | MaD:562 |
+| Test.java:7645:19:7645:21 | out : Map [<map.key>] : Object | Test.java:7645:9:7645:22 | getMapKey(...) | provenance | MaD:569 |
 | Test.java:7650:20:7650:89 | (...)... : ArrayTable [com.google.common.collect.Table.rowKey] : Object | Test.java:7651:10:7651:11 | in : ArrayTable [com.google.common.collect.Table.rowKey] : Object | provenance |  |
 | Test.java:7650:32:7650:89 | create(...) : ArrayTable [com.google.common.collect.Table.rowKey] : Object | Test.java:7650:20:7650:89 | (...)... : ArrayTable [com.google.common.collect.Table.rowKey] : Object | provenance |  |
 | Test.java:7650:50:7650:88 | of(...) : ImmutableTable [com.google.common.collect.Table.rowKey] : Object | Test.java:7650:32:7650:89 | create(...) : ArrayTable [com.google.common.collect.Table.rowKey] : Object | provenance | MaD:8 |
-| Test.java:7650:68:7650:75 | source(...) : Object | Test.java:7650:50:7650:88 | of(...) : ImmutableTable [com.google.common.collect.Table.rowKey] : Object | provenance | MaD:196 |
-| Test.java:7651:10:7651:11 | in : ArrayTable [com.google.common.collect.Table.rowKey] : Object | Test.java:7651:10:7651:24 | column(...) : Map [<map.key>] : Object | provenance | MaD:506 |
+| Test.java:7650:68:7650:75 | source(...) : Object | Test.java:7650:50:7650:88 | of(...) : ImmutableTable [com.google.common.collect.Table.rowKey] : Object | provenance | MaD:213 |
+| Test.java:7651:10:7651:11 | in : ArrayTable [com.google.common.collect.Table.rowKey] : Object | Test.java:7651:10:7651:24 | column(...) : Map [<map.key>] : Object | provenance | MaD:509 |
 | Test.java:7651:10:7651:24 | column(...) : Map [<map.key>] : Object | Test.java:7652:19:7652:21 | out : Map [<map.key>] : Object | provenance |  |
 | Test.java:7652:19:7652:21 | out : Map [<map.key>] : Object | Test.java:99:18:99:29 | map : Map [<map.key>] : Object | provenance |  |
-| Test.java:7652:19:7652:21 | out : Map [<map.key>] : Object | Test.java:7652:9:7652:22 | getMapKey(...) | provenance | MaD:562 |
+| Test.java:7652:19:7652:21 | out : Map [<map.key>] : Object | Test.java:7652:9:7652:22 | getMapKey(...) | provenance | MaD:569 |
 | Test.java:7657:24:7657:78 | (...)... : ImmutableTable [com.google.common.collect.Table.rowKey] : Object | Test.java:7658:10:7658:11 | in : ImmutableTable [com.google.common.collect.Table.rowKey] : Object | provenance |  |
 | Test.java:7657:40:7657:78 | of(...) : ImmutableTable [com.google.common.collect.Table.rowKey] : Object | Test.java:7657:24:7657:78 | (...)... : ImmutableTable [com.google.common.collect.Table.rowKey] : Object | provenance |  |
-| Test.java:7657:58:7657:65 | source(...) : Object | Test.java:7657:40:7657:78 | of(...) : ImmutableTable [com.google.common.collect.Table.rowKey] : Object | provenance | MaD:196 |
-| Test.java:7658:10:7658:11 | in : ImmutableTable [com.google.common.collect.Table.rowKey] : Object | Test.java:7658:10:7658:24 | column(...) : ImmutableMap [<map.key>] : Object | provenance | MaD:506 |
+| Test.java:7657:58:7657:65 | source(...) : Object | Test.java:7657:40:7657:78 | of(...) : ImmutableTable [com.google.common.collect.Table.rowKey] : Object | provenance | MaD:213 |
+| Test.java:7658:10:7658:11 | in : ImmutableTable [com.google.common.collect.Table.rowKey] : Object | Test.java:7658:10:7658:24 | column(...) : ImmutableMap [<map.key>] : Object | provenance | MaD:509 |
 | Test.java:7658:10:7658:24 | column(...) : ImmutableMap [<map.key>] : Object | Test.java:7659:19:7659:21 | out : ImmutableMap [<map.key>] : Object | provenance |  |
 | Test.java:7659:19:7659:21 | out : ImmutableMap [<map.key>] : Object | Test.java:99:18:99:29 | map : ImmutableMap [<map.key>] : Object | provenance |  |
-| Test.java:7659:19:7659:21 | out : ImmutableMap [<map.key>] : Object | Test.java:7659:9:7659:22 | getMapKey(...) | provenance | MaD:562 |
+| Test.java:7659:19:7659:21 | out : ImmutableMap [<map.key>] : Object | Test.java:7659:9:7659:22 | getMapKey(...) | provenance | MaD:569 |
 | Test.java:7664:15:7664:51 | (...)... : TreeBasedTable [com.google.common.collect.Table.columnKey] : Object | Test.java:7665:10:7665:11 | in : TreeBasedTable [com.google.common.collect.Table.columnKey] : Object | provenance |  |
 | Test.java:7664:22:7664:51 | newTable(...) : TreeBasedTable [com.google.common.collect.Table.columnKey] : Object | Test.java:7664:15:7664:51 | (...)... : TreeBasedTable [com.google.common.collect.Table.columnKey] : Object | provenance |  |
 | Test.java:7664:37:7664:44 | source(...) : Object | Test.java:103:48:103:55 | column : Object | provenance |  |
-| Test.java:7664:37:7664:44 | source(...) : Object | Test.java:7664:22:7664:51 | newTable(...) : TreeBasedTable [com.google.common.collect.Table.columnKey] : Object | provenance | MaD:513 |
-| Test.java:7665:10:7665:11 | in : TreeBasedTable [com.google.common.collect.Table.columnKey] : Object | Test.java:7665:10:7665:26 | columnKeySet(...) : Set [<element>] : Object | provenance | MaD:507 |
+| Test.java:7664:37:7664:44 | source(...) : Object | Test.java:7664:22:7664:51 | newTable(...) : TreeBasedTable [com.google.common.collect.Table.columnKey] : Object | provenance | MaD:516 |
+| Test.java:7665:10:7665:11 | in : TreeBasedTable [com.google.common.collect.Table.columnKey] : Object | Test.java:7665:10:7665:26 | columnKeySet(...) : Set [<element>] : Object | provenance | MaD:510 |
 | Test.java:7665:10:7665:26 | columnKeySet(...) : Set [<element>] : Object | Test.java:7666:20:7666:22 | out : Set [<element>] : Object | provenance |  |
 | Test.java:7666:20:7666:22 | out : Set [<element>] : Object | Test.java:110:19:110:32 | it : Set [<element>] : Object | provenance |  |
-| Test.java:7666:20:7666:22 | out : Set [<element>] : Object | Test.java:7666:9:7666:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:7666:20:7666:22 | out : Set [<element>] : Object | Test.java:7666:9:7666:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:7671:24:7671:78 | (...)... : ImmutableTable [com.google.common.collect.Table.columnKey] : Object | Test.java:7672:10:7672:11 | in : ImmutableTable [com.google.common.collect.Table.columnKey] : Object | provenance |  |
 | Test.java:7671:40:7671:78 | of(...) : ImmutableTable [com.google.common.collect.Table.columnKey] : Object | Test.java:7671:24:7671:78 | (...)... : ImmutableTable [com.google.common.collect.Table.columnKey] : Object | provenance |  |
-| Test.java:7671:64:7671:71 | source(...) : Object | Test.java:7671:40:7671:78 | of(...) : ImmutableTable [com.google.common.collect.Table.columnKey] : Object | provenance | MaD:197 |
-| Test.java:7672:10:7672:11 | in : ImmutableTable [com.google.common.collect.Table.columnKey] : Object | Test.java:7672:10:7672:26 | columnKeySet(...) : ImmutableSet [<element>] : Object | provenance | MaD:507 |
+| Test.java:7671:64:7671:71 | source(...) : Object | Test.java:7671:40:7671:78 | of(...) : ImmutableTable [com.google.common.collect.Table.columnKey] : Object | provenance | MaD:214 |
+| Test.java:7672:10:7672:11 | in : ImmutableTable [com.google.common.collect.Table.columnKey] : Object | Test.java:7672:10:7672:26 | columnKeySet(...) : ImmutableSet [<element>] : Object | provenance | MaD:510 |
 | Test.java:7672:10:7672:26 | columnKeySet(...) : ImmutableSet [<element>] : Object | Test.java:7673:20:7673:22 | out : ImmutableSet [<element>] : Object | provenance |  |
 | Test.java:7673:20:7673:22 | out : ImmutableSet [<element>] : Object | Test.java:110:19:110:32 | it : ImmutableSet [<element>] : Object | provenance |  |
-| Test.java:7673:20:7673:22 | out : ImmutableSet [<element>] : Object | Test.java:7673:9:7673:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:7673:20:7673:22 | out : ImmutableSet [<element>] : Object | Test.java:7673:9:7673:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:7678:20:7678:89 | (...)... : ArrayTable [com.google.common.collect.Table.columnKey] : Object | Test.java:7679:10:7679:11 | in : ArrayTable [com.google.common.collect.Table.columnKey] : Object | provenance |  |
 | Test.java:7678:32:7678:89 | create(...) : ArrayTable [com.google.common.collect.Table.columnKey] : Object | Test.java:7678:20:7678:89 | (...)... : ArrayTable [com.google.common.collect.Table.columnKey] : Object | provenance |  |
 | Test.java:7678:50:7678:88 | of(...) : ImmutableTable [com.google.common.collect.Table.columnKey] : Object | Test.java:7678:32:7678:89 | create(...) : ArrayTable [com.google.common.collect.Table.columnKey] : Object | provenance | MaD:7 |
-| Test.java:7678:74:7678:81 | source(...) : Object | Test.java:7678:50:7678:88 | of(...) : ImmutableTable [com.google.common.collect.Table.columnKey] : Object | provenance | MaD:197 |
-| Test.java:7679:10:7679:11 | in : ArrayTable [com.google.common.collect.Table.columnKey] : Object | Test.java:7679:10:7679:26 | columnKeySet(...) : ImmutableSet [<element>] : Object | provenance | MaD:507 |
+| Test.java:7678:74:7678:81 | source(...) : Object | Test.java:7678:50:7678:88 | of(...) : ImmutableTable [com.google.common.collect.Table.columnKey] : Object | provenance | MaD:214 |
+| Test.java:7679:10:7679:11 | in : ArrayTable [com.google.common.collect.Table.columnKey] : Object | Test.java:7679:10:7679:26 | columnKeySet(...) : ImmutableSet [<element>] : Object | provenance | MaD:510 |
 | Test.java:7679:10:7679:26 | columnKeySet(...) : ImmutableSet [<element>] : Object | Test.java:7680:20:7680:22 | out : ImmutableSet [<element>] : Object | provenance |  |
 | Test.java:7680:20:7680:22 | out : ImmutableSet [<element>] : Object | Test.java:110:19:110:32 | it : ImmutableSet [<element>] : Object | provenance |  |
-| Test.java:7680:20:7680:22 | out : ImmutableSet [<element>] : Object | Test.java:7680:9:7680:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:7680:20:7680:22 | out : ImmutableSet [<element>] : Object | Test.java:7680:9:7680:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:7685:15:7685:51 | (...)... : TreeBasedTable [<map.value>] : Object | Test.java:7686:10:7686:11 | in : TreeBasedTable [<map.value>] : Object | provenance |  |
 | Test.java:7685:22:7685:51 | newTable(...) : TreeBasedTable [<map.value>] : Object | Test.java:7685:15:7685:51 | (...)... : TreeBasedTable [<map.value>] : Object | provenance |  |
 | Test.java:7685:43:7685:50 | source(...) : Object | Test.java:103:58:103:64 | value : Object | provenance |  |
-| Test.java:7685:43:7685:50 | source(...) : Object | Test.java:7685:22:7685:51 | newTable(...) : TreeBasedTable [<map.value>] : Object | provenance | MaD:514 |
-| Test.java:7686:10:7686:11 | in : TreeBasedTable [<map.value>] : Object | Test.java:7686:10:7686:23 | columnMap(...) : Map [<map.value>, <map.value>] : Object | provenance | MaD:508 |
+| Test.java:7685:43:7685:50 | source(...) : Object | Test.java:7685:22:7685:51 | newTable(...) : TreeBasedTable [<map.value>] : Object | provenance | MaD:517 |
+| Test.java:7686:10:7686:11 | in : TreeBasedTable [<map.value>] : Object | Test.java:7686:10:7686:23 | columnMap(...) : Map [<map.value>, <map.value>] : Object | provenance | MaD:511 |
 | Test.java:7686:10:7686:23 | columnMap(...) : Map [<map.value>, <map.value>] : Object | Test.java:7687:33:7687:35 | out : Map [<map.value>, <map.value>] : Object | provenance |  |
 | Test.java:7687:21:7687:36 | getMapValue(...) : Map [<map.value>] : Object | Test.java:118:20:118:31 | map : Map [<map.value>] : Object | provenance |  |
-| Test.java:7687:21:7687:36 | getMapValue(...) : Map [<map.value>] : Object | Test.java:7687:9:7687:37 | getMapValue(...) | provenance | MaD:561 |
+| Test.java:7687:21:7687:36 | getMapValue(...) : Map [<map.value>] : Object | Test.java:7687:9:7687:37 | getMapValue(...) | provenance | MaD:568 |
 | Test.java:7687:33:7687:35 | out : Map [<map.value>, <map.value>] : Object | Test.java:118:20:118:31 | map : Map [<map.value>, <map.value>] : Object | provenance |  |
-| Test.java:7687:33:7687:35 | out : Map [<map.value>, <map.value>] : Object | Test.java:7687:21:7687:36 | getMapValue(...) : Map [<map.value>] : Object | provenance | MaD:561 |
+| Test.java:7687:33:7687:35 | out : Map [<map.value>, <map.value>] : Object | Test.java:7687:21:7687:36 | getMapValue(...) : Map [<map.value>] : Object | provenance | MaD:568 |
 | Test.java:7692:20:7692:89 | (...)... : ArrayTable [<map.value>] : Object | Test.java:7693:10:7693:11 | in : ArrayTable [<map.value>] : Object | provenance |  |
 | Test.java:7692:32:7692:89 | create(...) : ArrayTable [<map.value>] : Object | Test.java:7692:20:7692:89 | (...)... : ArrayTable [<map.value>] : Object | provenance |  |
 | Test.java:7692:50:7692:88 | of(...) : ImmutableTable [<map.value>] : Object | Test.java:7692:32:7692:89 | create(...) : ArrayTable [<map.value>] : Object | provenance | MaD:6 |
-| Test.java:7692:80:7692:87 | source(...) : Object | Test.java:7692:50:7692:88 | of(...) : ImmutableTable [<map.value>] : Object | provenance | MaD:198 |
-| Test.java:7693:10:7693:11 | in : ArrayTable [<map.value>] : Object | Test.java:7693:10:7693:23 | columnMap(...) : Map [<map.value>, <map.value>] : Object | provenance | MaD:508 |
+| Test.java:7692:80:7692:87 | source(...) : Object | Test.java:7692:50:7692:88 | of(...) : ImmutableTable [<map.value>] : Object | provenance | MaD:215 |
+| Test.java:7693:10:7693:11 | in : ArrayTable [<map.value>] : Object | Test.java:7693:10:7693:23 | columnMap(...) : Map [<map.value>, <map.value>] : Object | provenance | MaD:511 |
 | Test.java:7693:10:7693:23 | columnMap(...) : Map [<map.value>, <map.value>] : Object | Test.java:7694:33:7694:35 | out : Map [<map.value>, <map.value>] : Object | provenance |  |
 | Test.java:7694:21:7694:36 | getMapValue(...) : Map [<map.value>] : Object | Test.java:118:20:118:31 | map : Map [<map.value>] : Object | provenance |  |
-| Test.java:7694:21:7694:36 | getMapValue(...) : Map [<map.value>] : Object | Test.java:7694:9:7694:37 | getMapValue(...) | provenance | MaD:561 |
+| Test.java:7694:21:7694:36 | getMapValue(...) : Map [<map.value>] : Object | Test.java:7694:9:7694:37 | getMapValue(...) | provenance | MaD:568 |
 | Test.java:7694:33:7694:35 | out : Map [<map.value>, <map.value>] : Object | Test.java:118:20:118:31 | map : Map [<map.value>, <map.value>] : Object | provenance |  |
-| Test.java:7694:33:7694:35 | out : Map [<map.value>, <map.value>] : Object | Test.java:7694:21:7694:36 | getMapValue(...) : Map [<map.value>] : Object | provenance | MaD:561 |
+| Test.java:7694:33:7694:35 | out : Map [<map.value>, <map.value>] : Object | Test.java:7694:21:7694:36 | getMapValue(...) : Map [<map.value>] : Object | provenance | MaD:568 |
 | Test.java:7699:24:7699:78 | (...)... : ImmutableTable [<map.value>] : Object | Test.java:7700:10:7700:11 | in : ImmutableTable [<map.value>] : Object | provenance |  |
 | Test.java:7699:40:7699:78 | of(...) : ImmutableTable [<map.value>] : Object | Test.java:7699:24:7699:78 | (...)... : ImmutableTable [<map.value>] : Object | provenance |  |
-| Test.java:7699:70:7699:77 | source(...) : Object | Test.java:7699:40:7699:78 | of(...) : ImmutableTable [<map.value>] : Object | provenance | MaD:198 |
-| Test.java:7700:10:7700:11 | in : ImmutableTable [<map.value>] : Object | Test.java:7700:10:7700:23 | columnMap(...) : ImmutableMap [<map.value>, <map.value>] : Object | provenance | MaD:508 |
+| Test.java:7699:70:7699:77 | source(...) : Object | Test.java:7699:40:7699:78 | of(...) : ImmutableTable [<map.value>] : Object | provenance | MaD:215 |
+| Test.java:7700:10:7700:11 | in : ImmutableTable [<map.value>] : Object | Test.java:7700:10:7700:23 | columnMap(...) : ImmutableMap [<map.value>, <map.value>] : Object | provenance | MaD:511 |
 | Test.java:7700:10:7700:23 | columnMap(...) : ImmutableMap [<map.value>, <map.value>] : Object | Test.java:7701:33:7701:35 | out : ImmutableMap [<map.value>, <map.value>] : Object | provenance |  |
 | Test.java:7701:21:7701:36 | getMapValue(...) : Map [<map.value>] : Object | Test.java:118:20:118:31 | map : Map [<map.value>] : Object | provenance |  |
-| Test.java:7701:21:7701:36 | getMapValue(...) : Map [<map.value>] : Object | Test.java:7701:9:7701:37 | getMapValue(...) | provenance | MaD:561 |
+| Test.java:7701:21:7701:36 | getMapValue(...) : Map [<map.value>] : Object | Test.java:7701:9:7701:37 | getMapValue(...) | provenance | MaD:568 |
 | Test.java:7701:33:7701:35 | out : ImmutableMap [<map.value>, <map.value>] : Object | Test.java:118:20:118:31 | map : ImmutableMap [<map.value>, <map.value>] : Object | provenance |  |
-| Test.java:7701:33:7701:35 | out : ImmutableMap [<map.value>, <map.value>] : Object | Test.java:7701:21:7701:36 | getMapValue(...) : Map [<map.value>] : Object | provenance | MaD:561 |
+| Test.java:7701:33:7701:35 | out : ImmutableMap [<map.value>, <map.value>] : Object | Test.java:7701:21:7701:36 | getMapValue(...) : Map [<map.value>] : Object | provenance | MaD:568 |
 | Test.java:7706:15:7706:51 | (...)... : TreeBasedTable [com.google.common.collect.Table.columnKey] : Object | Test.java:7707:10:7707:11 | in : TreeBasedTable [com.google.common.collect.Table.columnKey] : Object | provenance |  |
 | Test.java:7706:22:7706:51 | newTable(...) : TreeBasedTable [com.google.common.collect.Table.columnKey] : Object | Test.java:7706:15:7706:51 | (...)... : TreeBasedTable [com.google.common.collect.Table.columnKey] : Object | provenance |  |
 | Test.java:7706:37:7706:44 | source(...) : Object | Test.java:103:48:103:55 | column : Object | provenance |  |
-| Test.java:7706:37:7706:44 | source(...) : Object | Test.java:7706:22:7706:51 | newTable(...) : TreeBasedTable [com.google.common.collect.Table.columnKey] : Object | provenance | MaD:513 |
-| Test.java:7707:10:7707:11 | in : TreeBasedTable [com.google.common.collect.Table.columnKey] : Object | Test.java:7707:10:7707:23 | columnMap(...) : Map [<map.key>] : Object | provenance | MaD:509 |
+| Test.java:7706:37:7706:44 | source(...) : Object | Test.java:7706:22:7706:51 | newTable(...) : TreeBasedTable [com.google.common.collect.Table.columnKey] : Object | provenance | MaD:516 |
+| Test.java:7707:10:7707:11 | in : TreeBasedTable [com.google.common.collect.Table.columnKey] : Object | Test.java:7707:10:7707:23 | columnMap(...) : Map [<map.key>] : Object | provenance | MaD:512 |
 | Test.java:7707:10:7707:23 | columnMap(...) : Map [<map.key>] : Object | Test.java:7708:19:7708:21 | out : Map [<map.key>] : Object | provenance |  |
 | Test.java:7708:19:7708:21 | out : Map [<map.key>] : Object | Test.java:99:18:99:29 | map : Map [<map.key>] : Object | provenance |  |
-| Test.java:7708:19:7708:21 | out : Map [<map.key>] : Object | Test.java:7708:9:7708:22 | getMapKey(...) | provenance | MaD:562 |
+| Test.java:7708:19:7708:21 | out : Map [<map.key>] : Object | Test.java:7708:9:7708:22 | getMapKey(...) | provenance | MaD:569 |
 | Test.java:7713:20:7713:89 | (...)... : ArrayTable [com.google.common.collect.Table.columnKey] : Object | Test.java:7714:10:7714:11 | in : ArrayTable [com.google.common.collect.Table.columnKey] : Object | provenance |  |
 | Test.java:7713:32:7713:89 | create(...) : ArrayTable [com.google.common.collect.Table.columnKey] : Object | Test.java:7713:20:7713:89 | (...)... : ArrayTable [com.google.common.collect.Table.columnKey] : Object | provenance |  |
 | Test.java:7713:50:7713:88 | of(...) : ImmutableTable [com.google.common.collect.Table.columnKey] : Object | Test.java:7713:32:7713:89 | create(...) : ArrayTable [com.google.common.collect.Table.columnKey] : Object | provenance | MaD:7 |
-| Test.java:7713:74:7713:81 | source(...) : Object | Test.java:7713:50:7713:88 | of(...) : ImmutableTable [com.google.common.collect.Table.columnKey] : Object | provenance | MaD:197 |
-| Test.java:7714:10:7714:11 | in : ArrayTable [com.google.common.collect.Table.columnKey] : Object | Test.java:7714:10:7714:23 | columnMap(...) : Map [<map.key>] : Object | provenance | MaD:509 |
+| Test.java:7713:74:7713:81 | source(...) : Object | Test.java:7713:50:7713:88 | of(...) : ImmutableTable [com.google.common.collect.Table.columnKey] : Object | provenance | MaD:214 |
+| Test.java:7714:10:7714:11 | in : ArrayTable [com.google.common.collect.Table.columnKey] : Object | Test.java:7714:10:7714:23 | columnMap(...) : Map [<map.key>] : Object | provenance | MaD:512 |
 | Test.java:7714:10:7714:23 | columnMap(...) : Map [<map.key>] : Object | Test.java:7715:19:7715:21 | out : Map [<map.key>] : Object | provenance |  |
 | Test.java:7715:19:7715:21 | out : Map [<map.key>] : Object | Test.java:99:18:99:29 | map : Map [<map.key>] : Object | provenance |  |
-| Test.java:7715:19:7715:21 | out : Map [<map.key>] : Object | Test.java:7715:9:7715:22 | getMapKey(...) | provenance | MaD:562 |
+| Test.java:7715:19:7715:21 | out : Map [<map.key>] : Object | Test.java:7715:9:7715:22 | getMapKey(...) | provenance | MaD:569 |
 | Test.java:7720:24:7720:78 | (...)... : ImmutableTable [com.google.common.collect.Table.columnKey] : Object | Test.java:7721:10:7721:11 | in : ImmutableTable [com.google.common.collect.Table.columnKey] : Object | provenance |  |
 | Test.java:7720:40:7720:78 | of(...) : ImmutableTable [com.google.common.collect.Table.columnKey] : Object | Test.java:7720:24:7720:78 | (...)... : ImmutableTable [com.google.common.collect.Table.columnKey] : Object | provenance |  |
-| Test.java:7720:64:7720:71 | source(...) : Object | Test.java:7720:40:7720:78 | of(...) : ImmutableTable [com.google.common.collect.Table.columnKey] : Object | provenance | MaD:197 |
-| Test.java:7721:10:7721:11 | in : ImmutableTable [com.google.common.collect.Table.columnKey] : Object | Test.java:7721:10:7721:23 | columnMap(...) : ImmutableMap [<map.key>] : Object | provenance | MaD:509 |
+| Test.java:7720:64:7720:71 | source(...) : Object | Test.java:7720:40:7720:78 | of(...) : ImmutableTable [com.google.common.collect.Table.columnKey] : Object | provenance | MaD:214 |
+| Test.java:7721:10:7721:11 | in : ImmutableTable [com.google.common.collect.Table.columnKey] : Object | Test.java:7721:10:7721:23 | columnMap(...) : ImmutableMap [<map.key>] : Object | provenance | MaD:512 |
 | Test.java:7721:10:7721:23 | columnMap(...) : ImmutableMap [<map.key>] : Object | Test.java:7722:19:7722:21 | out : ImmutableMap [<map.key>] : Object | provenance |  |
 | Test.java:7722:19:7722:21 | out : ImmutableMap [<map.key>] : Object | Test.java:99:18:99:29 | map : ImmutableMap [<map.key>] : Object | provenance |  |
-| Test.java:7722:19:7722:21 | out : ImmutableMap [<map.key>] : Object | Test.java:7722:9:7722:22 | getMapKey(...) | provenance | MaD:562 |
+| Test.java:7722:19:7722:21 | out : ImmutableMap [<map.key>] : Object | Test.java:7722:9:7722:22 | getMapKey(...) | provenance | MaD:569 |
 | Test.java:7727:15:7727:51 | (...)... : TreeBasedTable [com.google.common.collect.Table.rowKey] : Object | Test.java:7728:10:7728:11 | in : TreeBasedTable [com.google.common.collect.Table.rowKey] : Object | provenance |  |
 | Test.java:7727:22:7727:51 | newTable(...) : TreeBasedTable [com.google.common.collect.Table.rowKey] : Object | Test.java:7727:15:7727:51 | (...)... : TreeBasedTable [com.google.common.collect.Table.rowKey] : Object | provenance |  |
 | Test.java:7727:31:7727:38 | source(...) : Object | Test.java:103:41:103:45 | row : Object | provenance |  |
-| Test.java:7727:31:7727:38 | source(...) : Object | Test.java:7727:22:7727:51 | newTable(...) : TreeBasedTable [com.google.common.collect.Table.rowKey] : Object | provenance | MaD:512 |
-| Test.java:7728:10:7728:11 | in : TreeBasedTable [com.google.common.collect.Table.rowKey] : Object | Test.java:7728:10:7728:23 | columnMap(...) : Map [<map.value>, <map.key>] : Object | provenance | MaD:510 |
+| Test.java:7727:31:7727:38 | source(...) : Object | Test.java:7727:22:7727:51 | newTable(...) : TreeBasedTable [com.google.common.collect.Table.rowKey] : Object | provenance | MaD:515 |
+| Test.java:7728:10:7728:11 | in : TreeBasedTable [com.google.common.collect.Table.rowKey] : Object | Test.java:7728:10:7728:23 | columnMap(...) : Map [<map.value>, <map.key>] : Object | provenance | MaD:513 |
 | Test.java:7728:10:7728:23 | columnMap(...) : Map [<map.value>, <map.key>] : Object | Test.java:7729:31:7729:33 | out : Map [<map.value>, <map.key>] : Object | provenance |  |
 | Test.java:7729:19:7729:34 | getMapValue(...) : Map [<map.key>] : Object | Test.java:99:18:99:29 | map : Map [<map.key>] : Object | provenance |  |
-| Test.java:7729:19:7729:34 | getMapValue(...) : Map [<map.key>] : Object | Test.java:7729:9:7729:35 | getMapKey(...) | provenance | MaD:562 |
+| Test.java:7729:19:7729:34 | getMapValue(...) : Map [<map.key>] : Object | Test.java:7729:9:7729:35 | getMapKey(...) | provenance | MaD:569 |
 | Test.java:7729:31:7729:33 | out : Map [<map.value>, <map.key>] : Object | Test.java:118:20:118:31 | map : Map [<map.value>, <map.key>] : Object | provenance |  |
-| Test.java:7729:31:7729:33 | out : Map [<map.value>, <map.key>] : Object | Test.java:7729:19:7729:34 | getMapValue(...) : Map [<map.key>] : Object | provenance | MaD:561 |
+| Test.java:7729:31:7729:33 | out : Map [<map.value>, <map.key>] : Object | Test.java:7729:19:7729:34 | getMapValue(...) : Map [<map.key>] : Object | provenance | MaD:568 |
 | Test.java:7734:20:7734:89 | (...)... : ArrayTable [com.google.common.collect.Table.rowKey] : Object | Test.java:7735:10:7735:11 | in : ArrayTable [com.google.common.collect.Table.rowKey] : Object | provenance |  |
 | Test.java:7734:32:7734:89 | create(...) : ArrayTable [com.google.common.collect.Table.rowKey] : Object | Test.java:7734:20:7734:89 | (...)... : ArrayTable [com.google.common.collect.Table.rowKey] : Object | provenance |  |
 | Test.java:7734:50:7734:88 | of(...) : ImmutableTable [com.google.common.collect.Table.rowKey] : Object | Test.java:7734:32:7734:89 | create(...) : ArrayTable [com.google.common.collect.Table.rowKey] : Object | provenance | MaD:8 |
-| Test.java:7734:68:7734:75 | source(...) : Object | Test.java:7734:50:7734:88 | of(...) : ImmutableTable [com.google.common.collect.Table.rowKey] : Object | provenance | MaD:196 |
-| Test.java:7735:10:7735:11 | in : ArrayTable [com.google.common.collect.Table.rowKey] : Object | Test.java:7735:10:7735:23 | columnMap(...) : Map [<map.value>, <map.key>] : Object | provenance | MaD:510 |
+| Test.java:7734:68:7734:75 | source(...) : Object | Test.java:7734:50:7734:88 | of(...) : ImmutableTable [com.google.common.collect.Table.rowKey] : Object | provenance | MaD:213 |
+| Test.java:7735:10:7735:11 | in : ArrayTable [com.google.common.collect.Table.rowKey] : Object | Test.java:7735:10:7735:23 | columnMap(...) : Map [<map.value>, <map.key>] : Object | provenance | MaD:513 |
 | Test.java:7735:10:7735:23 | columnMap(...) : Map [<map.value>, <map.key>] : Object | Test.java:7736:31:7736:33 | out : Map [<map.value>, <map.key>] : Object | provenance |  |
 | Test.java:7736:19:7736:34 | getMapValue(...) : Map [<map.key>] : Object | Test.java:99:18:99:29 | map : Map [<map.key>] : Object | provenance |  |
-| Test.java:7736:19:7736:34 | getMapValue(...) : Map [<map.key>] : Object | Test.java:7736:9:7736:35 | getMapKey(...) | provenance | MaD:562 |
+| Test.java:7736:19:7736:34 | getMapValue(...) : Map [<map.key>] : Object | Test.java:7736:9:7736:35 | getMapKey(...) | provenance | MaD:569 |
 | Test.java:7736:31:7736:33 | out : Map [<map.value>, <map.key>] : Object | Test.java:118:20:118:31 | map : Map [<map.value>, <map.key>] : Object | provenance |  |
-| Test.java:7736:31:7736:33 | out : Map [<map.value>, <map.key>] : Object | Test.java:7736:19:7736:34 | getMapValue(...) : Map [<map.key>] : Object | provenance | MaD:561 |
+| Test.java:7736:31:7736:33 | out : Map [<map.value>, <map.key>] : Object | Test.java:7736:19:7736:34 | getMapValue(...) : Map [<map.key>] : Object | provenance | MaD:568 |
 | Test.java:7741:24:7741:78 | (...)... : ImmutableTable [com.google.common.collect.Table.rowKey] : Object | Test.java:7742:10:7742:11 | in : ImmutableTable [com.google.common.collect.Table.rowKey] : Object | provenance |  |
 | Test.java:7741:40:7741:78 | of(...) : ImmutableTable [com.google.common.collect.Table.rowKey] : Object | Test.java:7741:24:7741:78 | (...)... : ImmutableTable [com.google.common.collect.Table.rowKey] : Object | provenance |  |
-| Test.java:7741:58:7741:65 | source(...) : Object | Test.java:7741:40:7741:78 | of(...) : ImmutableTable [com.google.common.collect.Table.rowKey] : Object | provenance | MaD:196 |
-| Test.java:7742:10:7742:11 | in : ImmutableTable [com.google.common.collect.Table.rowKey] : Object | Test.java:7742:10:7742:23 | columnMap(...) : ImmutableMap [<map.value>, <map.key>] : Object | provenance | MaD:510 |
+| Test.java:7741:58:7741:65 | source(...) : Object | Test.java:7741:40:7741:78 | of(...) : ImmutableTable [com.google.common.collect.Table.rowKey] : Object | provenance | MaD:213 |
+| Test.java:7742:10:7742:11 | in : ImmutableTable [com.google.common.collect.Table.rowKey] : Object | Test.java:7742:10:7742:23 | columnMap(...) : ImmutableMap [<map.value>, <map.key>] : Object | provenance | MaD:513 |
 | Test.java:7742:10:7742:23 | columnMap(...) : ImmutableMap [<map.value>, <map.key>] : Object | Test.java:7743:31:7743:33 | out : ImmutableMap [<map.value>, <map.key>] : Object | provenance |  |
 | Test.java:7743:19:7743:34 | getMapValue(...) : Map [<map.key>] : Object | Test.java:99:18:99:29 | map : Map [<map.key>] : Object | provenance |  |
-| Test.java:7743:19:7743:34 | getMapValue(...) : Map [<map.key>] : Object | Test.java:7743:9:7743:35 | getMapKey(...) | provenance | MaD:562 |
+| Test.java:7743:19:7743:34 | getMapValue(...) : Map [<map.key>] : Object | Test.java:7743:9:7743:35 | getMapKey(...) | provenance | MaD:569 |
 | Test.java:7743:31:7743:33 | out : ImmutableMap [<map.value>, <map.key>] : Object | Test.java:118:20:118:31 | map : ImmutableMap [<map.value>, <map.key>] : Object | provenance |  |
-| Test.java:7743:31:7743:33 | out : ImmutableMap [<map.value>, <map.key>] : Object | Test.java:7743:19:7743:34 | getMapValue(...) : Map [<map.key>] : Object | provenance | MaD:561 |
+| Test.java:7743:31:7743:33 | out : ImmutableMap [<map.value>, <map.key>] : Object | Test.java:7743:19:7743:34 | getMapValue(...) : Map [<map.key>] : Object | provenance | MaD:568 |
 | Test.java:7748:15:7748:51 | (...)... : TreeBasedTable [<map.value>] : Object | Test.java:7749:10:7749:11 | in : TreeBasedTable [<map.value>] : Object | provenance |  |
 | Test.java:7748:22:7748:51 | newTable(...) : TreeBasedTable [<map.value>] : Object | Test.java:7748:15:7748:51 | (...)... : TreeBasedTable [<map.value>] : Object | provenance |  |
 | Test.java:7748:43:7748:50 | source(...) : Object | Test.java:103:58:103:64 | value : Object | provenance |  |
-| Test.java:7748:43:7748:50 | source(...) : Object | Test.java:7748:22:7748:51 | newTable(...) : TreeBasedTable [<map.value>] : Object | provenance | MaD:514 |
-| Test.java:7749:10:7749:11 | in : TreeBasedTable [<map.value>] : Object | Test.java:7749:10:7749:27 | get(...) : Object | provenance | MaD:511 |
+| Test.java:7748:43:7748:50 | source(...) : Object | Test.java:7748:22:7748:51 | newTable(...) : TreeBasedTable [<map.value>] : Object | provenance | MaD:517 |
+| Test.java:7749:10:7749:11 | in : TreeBasedTable [<map.value>] : Object | Test.java:7749:10:7749:27 | get(...) : Object | provenance | MaD:514 |
 | Test.java:7749:10:7749:27 | get(...) : Object | Test.java:7750:9:7750:11 | out | provenance |  |
 | Test.java:7755:24:7755:101 | (...)... : HashBasedTable [<map.value>] : Object | Test.java:7756:10:7756:11 | in : HashBasedTable [<map.value>] : Object | provenance |  |
 | Test.java:7755:40:7755:101 | create(...) : HashBasedTable [<map.value>] : Object | Test.java:7755:24:7755:101 | (...)... : HashBasedTable [<map.value>] : Object | provenance |  |
 | Test.java:7755:62:7755:100 | of(...) : ImmutableTable [<map.value>] : Object | Test.java:7755:40:7755:101 | create(...) : HashBasedTable [<map.value>] : Object | provenance | MaD:21 |
-| Test.java:7755:92:7755:99 | source(...) : Object | Test.java:7755:62:7755:100 | of(...) : ImmutableTable [<map.value>] : Object | provenance | MaD:198 |
-| Test.java:7756:10:7756:11 | in : HashBasedTable [<map.value>] : Object | Test.java:7756:10:7756:27 | get(...) : Object | provenance | MaD:511 |
+| Test.java:7755:92:7755:99 | source(...) : Object | Test.java:7755:62:7755:100 | of(...) : ImmutableTable [<map.value>] : Object | provenance | MaD:215 |
+| Test.java:7756:10:7756:11 | in : HashBasedTable [<map.value>] : Object | Test.java:7756:10:7756:27 | get(...) : Object | provenance | MaD:514 |
 | Test.java:7756:10:7756:27 | get(...) : Object | Test.java:7757:9:7757:11 | out | provenance |  |
 | Test.java:7762:20:7762:89 | (...)... : ArrayTable [<map.value>] : Object | Test.java:7763:10:7763:11 | in : ArrayTable [<map.value>] : Object | provenance |  |
 | Test.java:7762:32:7762:89 | create(...) : ArrayTable [<map.value>] : Object | Test.java:7762:20:7762:89 | (...)... : ArrayTable [<map.value>] : Object | provenance |  |
 | Test.java:7762:50:7762:88 | of(...) : ImmutableTable [<map.value>] : Object | Test.java:7762:32:7762:89 | create(...) : ArrayTable [<map.value>] : Object | provenance | MaD:6 |
-| Test.java:7762:80:7762:87 | source(...) : Object | Test.java:7762:50:7762:88 | of(...) : ImmutableTable [<map.value>] : Object | provenance | MaD:198 |
-| Test.java:7763:10:7763:11 | in : ArrayTable [<map.value>] : Object | Test.java:7763:10:7763:27 | get(...) : Object | provenance | MaD:511 |
+| Test.java:7762:80:7762:87 | source(...) : Object | Test.java:7762:50:7762:88 | of(...) : ImmutableTable [<map.value>] : Object | provenance | MaD:215 |
+| Test.java:7763:10:7763:11 | in : ArrayTable [<map.value>] : Object | Test.java:7763:10:7763:27 | get(...) : Object | provenance | MaD:514 |
 | Test.java:7763:10:7763:27 | get(...) : Object | Test.java:7764:9:7764:11 | out | provenance |  |
 | Test.java:7769:16:7769:31 | (...)... : Object | Test.java:7770:12:7770:13 | in : Object | provenance |  |
 | Test.java:7769:24:7769:31 | source(...) : Object | Test.java:7769:16:7769:31 | (...)... : Object | provenance |  |
 | Test.java:7770:4:7770:6 | out [post update] : Table [com.google.common.collect.Table.rowKey] : Object | Test.java:7771:25:7771:27 | out : Table [com.google.common.collect.Table.rowKey] : Object | provenance |  |
-| Test.java:7770:12:7770:13 | in : Object | Test.java:7770:4:7770:6 | out [post update] : Table [com.google.common.collect.Table.rowKey] : Object | provenance | MaD:512 |
+| Test.java:7770:12:7770:13 | in : Object | Test.java:7770:4:7770:6 | out [post update] : Table [com.google.common.collect.Table.rowKey] : Object | provenance | MaD:515 |
 | Test.java:7771:25:7771:27 | out : Table [com.google.common.collect.Table.rowKey] : Object | Test.java:105:24:105:37 | t : Table [com.google.common.collect.Table.rowKey] : Object | provenance |  |
-| Test.java:7771:25:7771:27 | out : Table [com.google.common.collect.Table.rowKey] : Object | Test.java:7771:9:7771:28 | getTable_rowKey(...) | provenance | MaD:521 |
+| Test.java:7771:25:7771:27 | out : Table [com.google.common.collect.Table.rowKey] : Object | Test.java:7771:9:7771:28 | getTable_rowKey(...) | provenance | MaD:524 |
 | Test.java:7776:16:7776:31 | (...)... : Object | Test.java:7777:12:7777:13 | in : Object | provenance |  |
 | Test.java:7776:24:7776:31 | source(...) : Object | Test.java:7776:16:7776:31 | (...)... : Object | provenance |  |
 | Test.java:7777:4:7777:6 | out [post update] : ImmutableTable [com.google.common.collect.Table.rowKey] : Object | Test.java:7778:25:7778:27 | out : ImmutableTable [com.google.common.collect.Table.rowKey] : Object | provenance |  |
-| Test.java:7777:12:7777:13 | in : Object | Test.java:7777:4:7777:6 | out [post update] : ImmutableTable [com.google.common.collect.Table.rowKey] : Object | provenance | MaD:512 |
+| Test.java:7777:12:7777:13 | in : Object | Test.java:7777:4:7777:6 | out [post update] : ImmutableTable [com.google.common.collect.Table.rowKey] : Object | provenance | MaD:515 |
 | Test.java:7778:25:7778:27 | out : ImmutableTable [com.google.common.collect.Table.rowKey] : Object | Test.java:105:24:105:37 | t : ImmutableTable [com.google.common.collect.Table.rowKey] : Object | provenance |  |
-| Test.java:7778:25:7778:27 | out : ImmutableTable [com.google.common.collect.Table.rowKey] : Object | Test.java:7778:9:7778:28 | getTable_rowKey(...) | provenance | MaD:521 |
+| Test.java:7778:25:7778:27 | out : ImmutableTable [com.google.common.collect.Table.rowKey] : Object | Test.java:7778:9:7778:28 | getTable_rowKey(...) | provenance | MaD:524 |
 | Test.java:7783:16:7783:31 | (...)... : Object | Test.java:7784:12:7784:13 | in : Object | provenance |  |
 | Test.java:7783:24:7783:31 | source(...) : Object | Test.java:7783:16:7783:31 | (...)... : Object | provenance |  |
 | Test.java:7784:4:7784:6 | out [post update] : ArrayTable [com.google.common.collect.Table.rowKey] : Object | Test.java:7785:25:7785:27 | out : ArrayTable [com.google.common.collect.Table.rowKey] : Object | provenance |  |
-| Test.java:7784:12:7784:13 | in : Object | Test.java:7784:4:7784:6 | out [post update] : ArrayTable [com.google.common.collect.Table.rowKey] : Object | provenance | MaD:512 |
+| Test.java:7784:12:7784:13 | in : Object | Test.java:7784:4:7784:6 | out [post update] : ArrayTable [com.google.common.collect.Table.rowKey] : Object | provenance | MaD:515 |
 | Test.java:7785:25:7785:27 | out : ArrayTable [com.google.common.collect.Table.rowKey] : Object | Test.java:105:24:105:37 | t : ArrayTable [com.google.common.collect.Table.rowKey] : Object | provenance |  |
-| Test.java:7785:25:7785:27 | out : ArrayTable [com.google.common.collect.Table.rowKey] : Object | Test.java:7785:9:7785:28 | getTable_rowKey(...) | provenance | MaD:521 |
+| Test.java:7785:25:7785:27 | out : ArrayTable [com.google.common.collect.Table.rowKey] : Object | Test.java:7785:9:7785:28 | getTable_rowKey(...) | provenance | MaD:524 |
 | Test.java:7790:16:7790:31 | (...)... : Object | Test.java:7791:18:7791:19 | in : Object | provenance |  |
 | Test.java:7790:24:7790:31 | source(...) : Object | Test.java:7790:16:7790:31 | (...)... : Object | provenance |  |
 | Test.java:7791:4:7791:6 | out [post update] : Table [com.google.common.collect.Table.columnKey] : Object | Test.java:7792:28:7792:30 | out : Table [com.google.common.collect.Table.columnKey] : Object | provenance |  |
-| Test.java:7791:18:7791:19 | in : Object | Test.java:7791:4:7791:6 | out [post update] : Table [com.google.common.collect.Table.columnKey] : Object | provenance | MaD:513 |
+| Test.java:7791:18:7791:19 | in : Object | Test.java:7791:4:7791:6 | out [post update] : Table [com.google.common.collect.Table.columnKey] : Object | provenance | MaD:516 |
 | Test.java:7792:28:7792:30 | out : Table [com.google.common.collect.Table.columnKey] : Object | Test.java:96:27:96:40 | t : Table [com.google.common.collect.Table.columnKey] : Object | provenance |  |
-| Test.java:7792:28:7792:30 | out : Table [com.google.common.collect.Table.columnKey] : Object | Test.java:7792:9:7792:31 | getTable_columnKey(...) | provenance | MaD:507 |
+| Test.java:7792:28:7792:30 | out : Table [com.google.common.collect.Table.columnKey] : Object | Test.java:7792:9:7792:31 | getTable_columnKey(...) | provenance | MaD:510 |
 | Test.java:7797:16:7797:31 | (...)... : Object | Test.java:7798:18:7798:19 | in : Object | provenance |  |
 | Test.java:7797:24:7797:31 | source(...) : Object | Test.java:7797:16:7797:31 | (...)... : Object | provenance |  |
 | Test.java:7798:4:7798:6 | out [post update] : ImmutableTable [com.google.common.collect.Table.columnKey] : Object | Test.java:7799:28:7799:30 | out : ImmutableTable [com.google.common.collect.Table.columnKey] : Object | provenance |  |
-| Test.java:7798:18:7798:19 | in : Object | Test.java:7798:4:7798:6 | out [post update] : ImmutableTable [com.google.common.collect.Table.columnKey] : Object | provenance | MaD:513 |
+| Test.java:7798:18:7798:19 | in : Object | Test.java:7798:4:7798:6 | out [post update] : ImmutableTable [com.google.common.collect.Table.columnKey] : Object | provenance | MaD:516 |
 | Test.java:7799:28:7799:30 | out : ImmutableTable [com.google.common.collect.Table.columnKey] : Object | Test.java:96:27:96:40 | t : ImmutableTable [com.google.common.collect.Table.columnKey] : Object | provenance |  |
-| Test.java:7799:28:7799:30 | out : ImmutableTable [com.google.common.collect.Table.columnKey] : Object | Test.java:7799:9:7799:31 | getTable_columnKey(...) | provenance | MaD:507 |
+| Test.java:7799:28:7799:30 | out : ImmutableTable [com.google.common.collect.Table.columnKey] : Object | Test.java:7799:9:7799:31 | getTable_columnKey(...) | provenance | MaD:510 |
 | Test.java:7804:16:7804:31 | (...)... : Object | Test.java:7805:18:7805:19 | in : Object | provenance |  |
 | Test.java:7804:24:7804:31 | source(...) : Object | Test.java:7804:16:7804:31 | (...)... : Object | provenance |  |
 | Test.java:7805:4:7805:6 | out [post update] : ArrayTable [com.google.common.collect.Table.columnKey] : Object | Test.java:7806:28:7806:30 | out : ArrayTable [com.google.common.collect.Table.columnKey] : Object | provenance |  |
-| Test.java:7805:18:7805:19 | in : Object | Test.java:7805:4:7805:6 | out [post update] : ArrayTable [com.google.common.collect.Table.columnKey] : Object | provenance | MaD:513 |
+| Test.java:7805:18:7805:19 | in : Object | Test.java:7805:4:7805:6 | out [post update] : ArrayTable [com.google.common.collect.Table.columnKey] : Object | provenance | MaD:516 |
 | Test.java:7806:28:7806:30 | out : ArrayTable [com.google.common.collect.Table.columnKey] : Object | Test.java:96:27:96:40 | t : ArrayTable [com.google.common.collect.Table.columnKey] : Object | provenance |  |
-| Test.java:7806:28:7806:30 | out : ArrayTable [com.google.common.collect.Table.columnKey] : Object | Test.java:7806:9:7806:31 | getTable_columnKey(...) | provenance | MaD:507 |
+| Test.java:7806:28:7806:30 | out : ArrayTable [com.google.common.collect.Table.columnKey] : Object | Test.java:7806:9:7806:31 | getTable_columnKey(...) | provenance | MaD:510 |
 | Test.java:7811:16:7811:31 | (...)... : Object | Test.java:7812:24:7812:25 | in : Object | provenance |  |
 | Test.java:7811:24:7811:31 | source(...) : Object | Test.java:7811:16:7811:31 | (...)... : Object | provenance |  |
 | Test.java:7812:4:7812:6 | out [post update] : Table [<map.value>] : Object | Test.java:7813:21:7813:23 | out : Table [<map.value>] : Object | provenance |  |
-| Test.java:7812:24:7812:25 | in : Object | Test.java:7812:4:7812:6 | out [post update] : Table [<map.value>] : Object | provenance | MaD:514 |
+| Test.java:7812:24:7812:25 | in : Object | Test.java:7812:4:7812:6 | out [post update] : Table [<map.value>] : Object | provenance | MaD:517 |
 | Test.java:7813:21:7813:23 | out : Table [<map.value>] : Object | Test.java:120:20:120:33 | t : Table [<map.value>] : Object | provenance |  |
-| Test.java:7813:21:7813:23 | out : Table [<map.value>] : Object | Test.java:7813:9:7813:24 | getMapValue(...) | provenance | MaD:525 |
+| Test.java:7813:21:7813:23 | out : Table [<map.value>] : Object | Test.java:7813:9:7813:24 | getMapValue(...) | provenance | MaD:528 |
 | Test.java:7818:16:7818:31 | (...)... : Object | Test.java:7819:24:7819:25 | in : Object | provenance |  |
 | Test.java:7818:24:7818:31 | source(...) : Object | Test.java:7818:16:7818:31 | (...)... : Object | provenance |  |
 | Test.java:7819:4:7819:6 | out [post update] : ImmutableTable [<map.value>] : Object | Test.java:7820:21:7820:23 | out : ImmutableTable [<map.value>] : Object | provenance |  |
-| Test.java:7819:24:7819:25 | in : Object | Test.java:7819:4:7819:6 | out [post update] : ImmutableTable [<map.value>] : Object | provenance | MaD:514 |
+| Test.java:7819:24:7819:25 | in : Object | Test.java:7819:4:7819:6 | out [post update] : ImmutableTable [<map.value>] : Object | provenance | MaD:517 |
 | Test.java:7820:21:7820:23 | out : ImmutableTable [<map.value>] : Object | Test.java:120:20:120:33 | t : ImmutableTable [<map.value>] : Object | provenance |  |
-| Test.java:7820:21:7820:23 | out : ImmutableTable [<map.value>] : Object | Test.java:7820:9:7820:24 | getMapValue(...) | provenance | MaD:525 |
+| Test.java:7820:21:7820:23 | out : ImmutableTable [<map.value>] : Object | Test.java:7820:9:7820:24 | getMapValue(...) | provenance | MaD:528 |
 | Test.java:7825:16:7825:31 | (...)... : Object | Test.java:7826:24:7826:25 | in : Object | provenance |  |
 | Test.java:7825:24:7825:31 | source(...) : Object | Test.java:7825:16:7825:31 | (...)... : Object | provenance |  |
 | Test.java:7826:4:7826:6 | out [post update] : ArrayTable [<map.value>] : Object | Test.java:7827:21:7827:23 | out : ArrayTable [<map.value>] : Object | provenance |  |
-| Test.java:7826:24:7826:25 | in : Object | Test.java:7826:4:7826:6 | out [post update] : ArrayTable [<map.value>] : Object | provenance | MaD:514 |
+| Test.java:7826:24:7826:25 | in : Object | Test.java:7826:4:7826:6 | out [post update] : ArrayTable [<map.value>] : Object | provenance | MaD:517 |
 | Test.java:7827:21:7827:23 | out : ArrayTable [<map.value>] : Object | Test.java:120:20:120:33 | t : ArrayTable [<map.value>] : Object | provenance |  |
-| Test.java:7827:21:7827:23 | out : ArrayTable [<map.value>] : Object | Test.java:7827:9:7827:24 | getMapValue(...) | provenance | MaD:525 |
+| Test.java:7827:21:7827:23 | out : ArrayTable [<map.value>] : Object | Test.java:7827:9:7827:24 | getMapValue(...) | provenance | MaD:528 |
 | Test.java:7832:15:7832:51 | (...)... : TreeBasedTable [<map.value>] : Object | Test.java:7833:15:7833:16 | in : TreeBasedTable [<map.value>] : Object | provenance |  |
 | Test.java:7832:22:7832:51 | newTable(...) : TreeBasedTable [<map.value>] : Object | Test.java:7832:15:7832:51 | (...)... : TreeBasedTable [<map.value>] : Object | provenance |  |
 | Test.java:7832:43:7832:50 | source(...) : Object | Test.java:103:58:103:64 | value : Object | provenance |  |
-| Test.java:7832:43:7832:50 | source(...) : Object | Test.java:7832:22:7832:51 | newTable(...) : TreeBasedTable [<map.value>] : Object | provenance | MaD:514 |
+| Test.java:7832:43:7832:50 | source(...) : Object | Test.java:7832:22:7832:51 | newTable(...) : TreeBasedTable [<map.value>] : Object | provenance | MaD:517 |
 | Test.java:7833:4:7833:6 | out [post update] : Table [<map.value>] : Object | Test.java:7834:21:7834:23 | out : Table [<map.value>] : Object | provenance |  |
-| Test.java:7833:15:7833:16 | in : TreeBasedTable [<map.value>] : Object | Test.java:7833:4:7833:6 | out [post update] : Table [<map.value>] : Object | provenance | MaD:515 |
+| Test.java:7833:15:7833:16 | in : TreeBasedTable [<map.value>] : Object | Test.java:7833:4:7833:6 | out [post update] : Table [<map.value>] : Object | provenance | MaD:518 |
 | Test.java:7834:21:7834:23 | out : Table [<map.value>] : Object | Test.java:120:20:120:33 | t : Table [<map.value>] : Object | provenance |  |
-| Test.java:7834:21:7834:23 | out : Table [<map.value>] : Object | Test.java:7834:9:7834:24 | getMapValue(...) | provenance | MaD:525 |
+| Test.java:7834:21:7834:23 | out : Table [<map.value>] : Object | Test.java:7834:9:7834:24 | getMapValue(...) | provenance | MaD:528 |
 | Test.java:7839:15:7839:60 | (...)... : ImmutableTable [<map.value>] : Object | Test.java:7840:15:7840:16 | in : ImmutableTable [<map.value>] : Object | provenance |  |
 | Test.java:7839:22:7839:60 | of(...) : ImmutableTable [<map.value>] : Object | Test.java:7839:15:7839:60 | (...)... : ImmutableTable [<map.value>] : Object | provenance |  |
-| Test.java:7839:52:7839:59 | source(...) : Object | Test.java:7839:22:7839:60 | of(...) : ImmutableTable [<map.value>] : Object | provenance | MaD:198 |
+| Test.java:7839:52:7839:59 | source(...) : Object | Test.java:7839:22:7839:60 | of(...) : ImmutableTable [<map.value>] : Object | provenance | MaD:215 |
 | Test.java:7840:4:7840:6 | out [post update] : ImmutableTable [<map.value>] : Object | Test.java:7841:21:7841:23 | out : ImmutableTable [<map.value>] : Object | provenance |  |
-| Test.java:7840:15:7840:16 | in : ImmutableTable [<map.value>] : Object | Test.java:7840:4:7840:6 | out [post update] : ImmutableTable [<map.value>] : Object | provenance | MaD:515 |
+| Test.java:7840:15:7840:16 | in : ImmutableTable [<map.value>] : Object | Test.java:7840:4:7840:6 | out [post update] : ImmutableTable [<map.value>] : Object | provenance | MaD:518 |
 | Test.java:7841:21:7841:23 | out : ImmutableTable [<map.value>] : Object | Test.java:120:20:120:33 | t : ImmutableTable [<map.value>] : Object | provenance |  |
-| Test.java:7841:21:7841:23 | out : ImmutableTable [<map.value>] : Object | Test.java:7841:9:7841:24 | getMapValue(...) | provenance | MaD:525 |
+| Test.java:7841:21:7841:23 | out : ImmutableTable [<map.value>] : Object | Test.java:7841:9:7841:24 | getMapValue(...) | provenance | MaD:528 |
 | Test.java:7846:15:7846:79 | (...)... : ArrayTable [<map.value>] : Object | Test.java:7847:15:7847:16 | in : ArrayTable [<map.value>] : Object | provenance |  |
 | Test.java:7846:22:7846:79 | create(...) : ArrayTable [<map.value>] : Object | Test.java:7846:15:7846:79 | (...)... : ArrayTable [<map.value>] : Object | provenance |  |
 | Test.java:7846:40:7846:78 | of(...) : ImmutableTable [<map.value>] : Object | Test.java:7846:22:7846:79 | create(...) : ArrayTable [<map.value>] : Object | provenance | MaD:6 |
-| Test.java:7846:70:7846:77 | source(...) : Object | Test.java:7846:40:7846:78 | of(...) : ImmutableTable [<map.value>] : Object | provenance | MaD:198 |
+| Test.java:7846:70:7846:77 | source(...) : Object | Test.java:7846:40:7846:78 | of(...) : ImmutableTable [<map.value>] : Object | provenance | MaD:215 |
 | Test.java:7847:4:7847:6 | out [post update] : ArrayTable [<map.value>] : Object | Test.java:7848:21:7848:23 | out : ArrayTable [<map.value>] : Object | provenance |  |
-| Test.java:7847:15:7847:16 | in : ArrayTable [<map.value>] : Object | Test.java:7847:4:7847:6 | out [post update] : ArrayTable [<map.value>] : Object | provenance | MaD:515 |
+| Test.java:7847:15:7847:16 | in : ArrayTable [<map.value>] : Object | Test.java:7847:4:7847:6 | out [post update] : ArrayTable [<map.value>] : Object | provenance | MaD:518 |
 | Test.java:7848:21:7848:23 | out : ArrayTable [<map.value>] : Object | Test.java:120:20:120:33 | t : ArrayTable [<map.value>] : Object | provenance |  |
-| Test.java:7848:21:7848:23 | out : ArrayTable [<map.value>] : Object | Test.java:7848:9:7848:24 | getMapValue(...) | provenance | MaD:525 |
+| Test.java:7848:21:7848:23 | out : ArrayTable [<map.value>] : Object | Test.java:7848:9:7848:24 | getMapValue(...) | provenance | MaD:528 |
 | Test.java:7853:15:7853:51 | (...)... : TreeBasedTable [com.google.common.collect.Table.columnKey] : Object | Test.java:7854:15:7854:16 | in : TreeBasedTable [com.google.common.collect.Table.columnKey] : Object | provenance |  |
 | Test.java:7853:22:7853:51 | newTable(...) : TreeBasedTable [com.google.common.collect.Table.columnKey] : Object | Test.java:7853:15:7853:51 | (...)... : TreeBasedTable [com.google.common.collect.Table.columnKey] : Object | provenance |  |
 | Test.java:7853:37:7853:44 | source(...) : Object | Test.java:103:48:103:55 | column : Object | provenance |  |
-| Test.java:7853:37:7853:44 | source(...) : Object | Test.java:7853:22:7853:51 | newTable(...) : TreeBasedTable [com.google.common.collect.Table.columnKey] : Object | provenance | MaD:513 |
+| Test.java:7853:37:7853:44 | source(...) : Object | Test.java:7853:22:7853:51 | newTable(...) : TreeBasedTable [com.google.common.collect.Table.columnKey] : Object | provenance | MaD:516 |
 | Test.java:7854:4:7854:6 | out [post update] : Table [com.google.common.collect.Table.columnKey] : Object | Test.java:7855:28:7855:30 | out : Table [com.google.common.collect.Table.columnKey] : Object | provenance |  |
-| Test.java:7854:15:7854:16 | in : TreeBasedTable [com.google.common.collect.Table.columnKey] : Object | Test.java:7854:4:7854:6 | out [post update] : Table [com.google.common.collect.Table.columnKey] : Object | provenance | MaD:516 |
+| Test.java:7854:15:7854:16 | in : TreeBasedTable [com.google.common.collect.Table.columnKey] : Object | Test.java:7854:4:7854:6 | out [post update] : Table [com.google.common.collect.Table.columnKey] : Object | provenance | MaD:519 |
 | Test.java:7855:28:7855:30 | out : Table [com.google.common.collect.Table.columnKey] : Object | Test.java:96:27:96:40 | t : Table [com.google.common.collect.Table.columnKey] : Object | provenance |  |
-| Test.java:7855:28:7855:30 | out : Table [com.google.common.collect.Table.columnKey] : Object | Test.java:7855:9:7855:31 | getTable_columnKey(...) | provenance | MaD:507 |
+| Test.java:7855:28:7855:30 | out : Table [com.google.common.collect.Table.columnKey] : Object | Test.java:7855:9:7855:31 | getTable_columnKey(...) | provenance | MaD:510 |
 | Test.java:7860:15:7860:60 | (...)... : ImmutableTable [com.google.common.collect.Table.columnKey] : Object | Test.java:7861:15:7861:16 | in : ImmutableTable [com.google.common.collect.Table.columnKey] : Object | provenance |  |
 | Test.java:7860:22:7860:60 | of(...) : ImmutableTable [com.google.common.collect.Table.columnKey] : Object | Test.java:7860:15:7860:60 | (...)... : ImmutableTable [com.google.common.collect.Table.columnKey] : Object | provenance |  |
-| Test.java:7860:46:7860:53 | source(...) : Object | Test.java:7860:22:7860:60 | of(...) : ImmutableTable [com.google.common.collect.Table.columnKey] : Object | provenance | MaD:197 |
+| Test.java:7860:46:7860:53 | source(...) : Object | Test.java:7860:22:7860:60 | of(...) : ImmutableTable [com.google.common.collect.Table.columnKey] : Object | provenance | MaD:214 |
 | Test.java:7861:4:7861:6 | out [post update] : ImmutableTable [com.google.common.collect.Table.columnKey] : Object | Test.java:7862:28:7862:30 | out : ImmutableTable [com.google.common.collect.Table.columnKey] : Object | provenance |  |
-| Test.java:7861:15:7861:16 | in : ImmutableTable [com.google.common.collect.Table.columnKey] : Object | Test.java:7861:4:7861:6 | out [post update] : ImmutableTable [com.google.common.collect.Table.columnKey] : Object | provenance | MaD:516 |
+| Test.java:7861:15:7861:16 | in : ImmutableTable [com.google.common.collect.Table.columnKey] : Object | Test.java:7861:4:7861:6 | out [post update] : ImmutableTable [com.google.common.collect.Table.columnKey] : Object | provenance | MaD:519 |
 | Test.java:7862:28:7862:30 | out : ImmutableTable [com.google.common.collect.Table.columnKey] : Object | Test.java:96:27:96:40 | t : ImmutableTable [com.google.common.collect.Table.columnKey] : Object | provenance |  |
-| Test.java:7862:28:7862:30 | out : ImmutableTable [com.google.common.collect.Table.columnKey] : Object | Test.java:7862:9:7862:31 | getTable_columnKey(...) | provenance | MaD:507 |
+| Test.java:7862:28:7862:30 | out : ImmutableTable [com.google.common.collect.Table.columnKey] : Object | Test.java:7862:9:7862:31 | getTable_columnKey(...) | provenance | MaD:510 |
 | Test.java:7867:15:7867:79 | (...)... : ArrayTable [com.google.common.collect.Table.columnKey] : Object | Test.java:7868:15:7868:16 | in : ArrayTable [com.google.common.collect.Table.columnKey] : Object | provenance |  |
 | Test.java:7867:22:7867:79 | create(...) : ArrayTable [com.google.common.collect.Table.columnKey] : Object | Test.java:7867:15:7867:79 | (...)... : ArrayTable [com.google.common.collect.Table.columnKey] : Object | provenance |  |
 | Test.java:7867:40:7867:78 | of(...) : ImmutableTable [com.google.common.collect.Table.columnKey] : Object | Test.java:7867:22:7867:79 | create(...) : ArrayTable [com.google.common.collect.Table.columnKey] : Object | provenance | MaD:7 |
-| Test.java:7867:64:7867:71 | source(...) : Object | Test.java:7867:40:7867:78 | of(...) : ImmutableTable [com.google.common.collect.Table.columnKey] : Object | provenance | MaD:197 |
+| Test.java:7867:64:7867:71 | source(...) : Object | Test.java:7867:40:7867:78 | of(...) : ImmutableTable [com.google.common.collect.Table.columnKey] : Object | provenance | MaD:214 |
 | Test.java:7868:4:7868:6 | out [post update] : ArrayTable [com.google.common.collect.Table.columnKey] : Object | Test.java:7869:28:7869:30 | out : ArrayTable [com.google.common.collect.Table.columnKey] : Object | provenance |  |
-| Test.java:7868:15:7868:16 | in : ArrayTable [com.google.common.collect.Table.columnKey] : Object | Test.java:7868:4:7868:6 | out [post update] : ArrayTable [com.google.common.collect.Table.columnKey] : Object | provenance | MaD:516 |
+| Test.java:7868:15:7868:16 | in : ArrayTable [com.google.common.collect.Table.columnKey] : Object | Test.java:7868:4:7868:6 | out [post update] : ArrayTable [com.google.common.collect.Table.columnKey] : Object | provenance | MaD:519 |
 | Test.java:7869:28:7869:30 | out : ArrayTable [com.google.common.collect.Table.columnKey] : Object | Test.java:96:27:96:40 | t : ArrayTable [com.google.common.collect.Table.columnKey] : Object | provenance |  |
-| Test.java:7869:28:7869:30 | out : ArrayTable [com.google.common.collect.Table.columnKey] : Object | Test.java:7869:9:7869:31 | getTable_columnKey(...) | provenance | MaD:507 |
+| Test.java:7869:28:7869:30 | out : ArrayTable [com.google.common.collect.Table.columnKey] : Object | Test.java:7869:9:7869:31 | getTable_columnKey(...) | provenance | MaD:510 |
 | Test.java:7874:15:7874:51 | (...)... : TreeBasedTable [com.google.common.collect.Table.rowKey] : Object | Test.java:7875:15:7875:16 | in : TreeBasedTable [com.google.common.collect.Table.rowKey] : Object | provenance |  |
 | Test.java:7874:22:7874:51 | newTable(...) : TreeBasedTable [com.google.common.collect.Table.rowKey] : Object | Test.java:7874:15:7874:51 | (...)... : TreeBasedTable [com.google.common.collect.Table.rowKey] : Object | provenance |  |
 | Test.java:7874:31:7874:38 | source(...) : Object | Test.java:103:41:103:45 | row : Object | provenance |  |
-| Test.java:7874:31:7874:38 | source(...) : Object | Test.java:7874:22:7874:51 | newTable(...) : TreeBasedTable [com.google.common.collect.Table.rowKey] : Object | provenance | MaD:512 |
+| Test.java:7874:31:7874:38 | source(...) : Object | Test.java:7874:22:7874:51 | newTable(...) : TreeBasedTable [com.google.common.collect.Table.rowKey] : Object | provenance | MaD:515 |
 | Test.java:7875:4:7875:6 | out [post update] : Table [com.google.common.collect.Table.rowKey] : Object | Test.java:7876:25:7876:27 | out : Table [com.google.common.collect.Table.rowKey] : Object | provenance |  |
-| Test.java:7875:15:7875:16 | in : TreeBasedTable [com.google.common.collect.Table.rowKey] : Object | Test.java:7875:4:7875:6 | out [post update] : Table [com.google.common.collect.Table.rowKey] : Object | provenance | MaD:517 |
+| Test.java:7875:15:7875:16 | in : TreeBasedTable [com.google.common.collect.Table.rowKey] : Object | Test.java:7875:4:7875:6 | out [post update] : Table [com.google.common.collect.Table.rowKey] : Object | provenance | MaD:520 |
 | Test.java:7876:25:7876:27 | out : Table [com.google.common.collect.Table.rowKey] : Object | Test.java:105:24:105:37 | t : Table [com.google.common.collect.Table.rowKey] : Object | provenance |  |
-| Test.java:7876:25:7876:27 | out : Table [com.google.common.collect.Table.rowKey] : Object | Test.java:7876:9:7876:28 | getTable_rowKey(...) | provenance | MaD:521 |
+| Test.java:7876:25:7876:27 | out : Table [com.google.common.collect.Table.rowKey] : Object | Test.java:7876:9:7876:28 | getTable_rowKey(...) | provenance | MaD:524 |
 | Test.java:7881:15:7881:60 | (...)... : ImmutableTable [com.google.common.collect.Table.rowKey] : Object | Test.java:7882:15:7882:16 | in : ImmutableTable [com.google.common.collect.Table.rowKey] : Object | provenance |  |
 | Test.java:7881:22:7881:60 | of(...) : ImmutableTable [com.google.common.collect.Table.rowKey] : Object | Test.java:7881:15:7881:60 | (...)... : ImmutableTable [com.google.common.collect.Table.rowKey] : Object | provenance |  |
-| Test.java:7881:40:7881:47 | source(...) : Object | Test.java:7881:22:7881:60 | of(...) : ImmutableTable [com.google.common.collect.Table.rowKey] : Object | provenance | MaD:196 |
+| Test.java:7881:40:7881:47 | source(...) : Object | Test.java:7881:22:7881:60 | of(...) : ImmutableTable [com.google.common.collect.Table.rowKey] : Object | provenance | MaD:213 |
 | Test.java:7882:4:7882:6 | out [post update] : ImmutableTable [com.google.common.collect.Table.rowKey] : Object | Test.java:7883:25:7883:27 | out : ImmutableTable [com.google.common.collect.Table.rowKey] : Object | provenance |  |
-| Test.java:7882:15:7882:16 | in : ImmutableTable [com.google.common.collect.Table.rowKey] : Object | Test.java:7882:4:7882:6 | out [post update] : ImmutableTable [com.google.common.collect.Table.rowKey] : Object | provenance | MaD:517 |
+| Test.java:7882:15:7882:16 | in : ImmutableTable [com.google.common.collect.Table.rowKey] : Object | Test.java:7882:4:7882:6 | out [post update] : ImmutableTable [com.google.common.collect.Table.rowKey] : Object | provenance | MaD:520 |
 | Test.java:7883:25:7883:27 | out : ImmutableTable [com.google.common.collect.Table.rowKey] : Object | Test.java:105:24:105:37 | t : ImmutableTable [com.google.common.collect.Table.rowKey] : Object | provenance |  |
-| Test.java:7883:25:7883:27 | out : ImmutableTable [com.google.common.collect.Table.rowKey] : Object | Test.java:7883:9:7883:28 | getTable_rowKey(...) | provenance | MaD:521 |
+| Test.java:7883:25:7883:27 | out : ImmutableTable [com.google.common.collect.Table.rowKey] : Object | Test.java:7883:9:7883:28 | getTable_rowKey(...) | provenance | MaD:524 |
 | Test.java:7888:15:7888:79 | (...)... : ArrayTable [com.google.common.collect.Table.rowKey] : Object | Test.java:7889:15:7889:16 | in : ArrayTable [com.google.common.collect.Table.rowKey] : Object | provenance |  |
 | Test.java:7888:22:7888:79 | create(...) : ArrayTable [com.google.common.collect.Table.rowKey] : Object | Test.java:7888:15:7888:79 | (...)... : ArrayTable [com.google.common.collect.Table.rowKey] : Object | provenance |  |
 | Test.java:7888:40:7888:78 | of(...) : ImmutableTable [com.google.common.collect.Table.rowKey] : Object | Test.java:7888:22:7888:79 | create(...) : ArrayTable [com.google.common.collect.Table.rowKey] : Object | provenance | MaD:8 |
-| Test.java:7888:58:7888:65 | source(...) : Object | Test.java:7888:40:7888:78 | of(...) : ImmutableTable [com.google.common.collect.Table.rowKey] : Object | provenance | MaD:196 |
+| Test.java:7888:58:7888:65 | source(...) : Object | Test.java:7888:40:7888:78 | of(...) : ImmutableTable [com.google.common.collect.Table.rowKey] : Object | provenance | MaD:213 |
 | Test.java:7889:4:7889:6 | out [post update] : ArrayTable [com.google.common.collect.Table.rowKey] : Object | Test.java:7890:25:7890:27 | out : ArrayTable [com.google.common.collect.Table.rowKey] : Object | provenance |  |
-| Test.java:7889:15:7889:16 | in : ArrayTable [com.google.common.collect.Table.rowKey] : Object | Test.java:7889:4:7889:6 | out [post update] : ArrayTable [com.google.common.collect.Table.rowKey] : Object | provenance | MaD:517 |
+| Test.java:7889:15:7889:16 | in : ArrayTable [com.google.common.collect.Table.rowKey] : Object | Test.java:7889:4:7889:6 | out [post update] : ArrayTable [com.google.common.collect.Table.rowKey] : Object | provenance | MaD:520 |
 | Test.java:7890:25:7890:27 | out : ArrayTable [com.google.common.collect.Table.rowKey] : Object | Test.java:105:24:105:37 | t : ArrayTable [com.google.common.collect.Table.rowKey] : Object | provenance |  |
-| Test.java:7890:25:7890:27 | out : ArrayTable [com.google.common.collect.Table.rowKey] : Object | Test.java:7890:9:7890:28 | getTable_rowKey(...) | provenance | MaD:521 |
+| Test.java:7890:25:7890:27 | out : ArrayTable [com.google.common.collect.Table.rowKey] : Object | Test.java:7890:9:7890:28 | getTable_rowKey(...) | provenance | MaD:524 |
 | Test.java:7895:15:7895:51 | (...)... : TreeBasedTable [<map.value>] : Object | Test.java:7896:10:7896:11 | in : TreeBasedTable [<map.value>] : Object | provenance |  |
 | Test.java:7895:22:7895:51 | newTable(...) : TreeBasedTable [<map.value>] : Object | Test.java:7895:15:7895:51 | (...)... : TreeBasedTable [<map.value>] : Object | provenance |  |
 | Test.java:7895:43:7895:50 | source(...) : Object | Test.java:103:58:103:64 | value : Object | provenance |  |
-| Test.java:7895:43:7895:50 | source(...) : Object | Test.java:7895:22:7895:51 | newTable(...) : TreeBasedTable [<map.value>] : Object | provenance | MaD:514 |
-| Test.java:7896:10:7896:11 | in : TreeBasedTable [<map.value>] : Object | Test.java:7896:10:7896:30 | remove(...) : Object | provenance | MaD:518 |
+| Test.java:7895:43:7895:50 | source(...) : Object | Test.java:7895:22:7895:51 | newTable(...) : TreeBasedTable [<map.value>] : Object | provenance | MaD:517 |
+| Test.java:7896:10:7896:11 | in : TreeBasedTable [<map.value>] : Object | Test.java:7896:10:7896:30 | remove(...) : Object | provenance | MaD:521 |
 | Test.java:7896:10:7896:30 | remove(...) : Object | Test.java:7897:9:7897:11 | out | provenance |  |
 | Test.java:7902:24:7902:78 | (...)... : ImmutableTable [<map.value>] : Object | Test.java:7903:10:7903:11 | in : ImmutableTable [<map.value>] : Object | provenance |  |
 | Test.java:7902:40:7902:78 | of(...) : ImmutableTable [<map.value>] : Object | Test.java:7902:24:7902:78 | (...)... : ImmutableTable [<map.value>] : Object | provenance |  |
-| Test.java:7902:70:7902:77 | source(...) : Object | Test.java:7902:40:7902:78 | of(...) : ImmutableTable [<map.value>] : Object | provenance | MaD:198 |
-| Test.java:7903:10:7903:11 | in : ImmutableTable [<map.value>] : Object | Test.java:7903:10:7903:30 | remove(...) : Object | provenance | MaD:518 |
+| Test.java:7902:70:7902:77 | source(...) : Object | Test.java:7902:40:7902:78 | of(...) : ImmutableTable [<map.value>] : Object | provenance | MaD:215 |
+| Test.java:7903:10:7903:11 | in : ImmutableTable [<map.value>] : Object | Test.java:7903:10:7903:30 | remove(...) : Object | provenance | MaD:521 |
 | Test.java:7903:10:7903:30 | remove(...) : Object | Test.java:7904:9:7904:11 | out | provenance |  |
 | Test.java:7909:24:7909:101 | (...)... : HashBasedTable [<map.value>] : Object | Test.java:7910:10:7910:11 | in : HashBasedTable [<map.value>] : Object | provenance |  |
 | Test.java:7909:40:7909:101 | create(...) : HashBasedTable [<map.value>] : Object | Test.java:7909:24:7909:101 | (...)... : HashBasedTable [<map.value>] : Object | provenance |  |
 | Test.java:7909:62:7909:100 | of(...) : ImmutableTable [<map.value>] : Object | Test.java:7909:40:7909:101 | create(...) : HashBasedTable [<map.value>] : Object | provenance | MaD:21 |
-| Test.java:7909:92:7909:99 | source(...) : Object | Test.java:7909:62:7909:100 | of(...) : ImmutableTable [<map.value>] : Object | provenance | MaD:198 |
-| Test.java:7910:10:7910:11 | in : HashBasedTable [<map.value>] : Object | Test.java:7910:10:7910:30 | remove(...) : Object | provenance | MaD:518 |
+| Test.java:7909:92:7909:99 | source(...) : Object | Test.java:7909:62:7909:100 | of(...) : ImmutableTable [<map.value>] : Object | provenance | MaD:215 |
+| Test.java:7910:10:7910:11 | in : HashBasedTable [<map.value>] : Object | Test.java:7910:10:7910:30 | remove(...) : Object | provenance | MaD:521 |
 | Test.java:7910:10:7910:30 | remove(...) : Object | Test.java:7911:9:7911:11 | out | provenance |  |
 | Test.java:7916:20:7916:89 | (...)... : ArrayTable [<map.value>] : Object | Test.java:7917:10:7917:11 | in : ArrayTable [<map.value>] : Object | provenance |  |
 | Test.java:7916:32:7916:89 | create(...) : ArrayTable [<map.value>] : Object | Test.java:7916:20:7916:89 | (...)... : ArrayTable [<map.value>] : Object | provenance |  |
 | Test.java:7916:50:7916:88 | of(...) : ImmutableTable [<map.value>] : Object | Test.java:7916:32:7916:89 | create(...) : ArrayTable [<map.value>] : Object | provenance | MaD:6 |
-| Test.java:7916:80:7916:87 | source(...) : Object | Test.java:7916:50:7916:88 | of(...) : ImmutableTable [<map.value>] : Object | provenance | MaD:198 |
-| Test.java:7917:10:7917:11 | in : ArrayTable [<map.value>] : Object | Test.java:7917:10:7917:30 | remove(...) : Object | provenance | MaD:518 |
+| Test.java:7916:80:7916:87 | source(...) : Object | Test.java:7916:50:7916:88 | of(...) : ImmutableTable [<map.value>] : Object | provenance | MaD:215 |
+| Test.java:7917:10:7917:11 | in : ArrayTable [<map.value>] : Object | Test.java:7917:10:7917:30 | remove(...) : Object | provenance | MaD:521 |
 | Test.java:7917:10:7917:30 | remove(...) : Object | Test.java:7918:9:7918:11 | out | provenance |  |
 | Test.java:7923:24:7923:69 | (...)... : TreeBasedTable [<map.value>] : Object | Test.java:7924:10:7924:11 | in : TreeBasedTable [<map.value>] : Object | provenance |  |
 | Test.java:7923:40:7923:69 | newTable(...) : TreeBasedTable [<map.value>] : Object | Test.java:7923:24:7923:69 | (...)... : TreeBasedTable [<map.value>] : Object | provenance |  |
 | Test.java:7923:61:7923:68 | source(...) : Object | Test.java:103:58:103:64 | value : Object | provenance |  |
-| Test.java:7923:61:7923:68 | source(...) : Object | Test.java:7923:40:7923:69 | newTable(...) : TreeBasedTable [<map.value>] : Object | provenance | MaD:514 |
-| Test.java:7924:10:7924:11 | in : TreeBasedTable [<map.value>] : Object | Test.java:7924:10:7924:21 | row(...) : SortedMap [<map.value>] : Object | provenance | MaD:519 |
+| Test.java:7923:61:7923:68 | source(...) : Object | Test.java:7923:40:7923:69 | newTable(...) : TreeBasedTable [<map.value>] : Object | provenance | MaD:517 |
+| Test.java:7924:10:7924:11 | in : TreeBasedTable [<map.value>] : Object | Test.java:7924:10:7924:21 | row(...) : SortedMap [<map.value>] : Object | provenance | MaD:522 |
 | Test.java:7924:10:7924:21 | row(...) : SortedMap [<map.value>] : Object | Test.java:7925:21:7925:23 | out : SortedMap [<map.value>] : Object | provenance |  |
 | Test.java:7925:21:7925:23 | out : SortedMap [<map.value>] : Object | Test.java:118:20:118:31 | map : SortedMap [<map.value>] : Object | provenance |  |
-| Test.java:7925:21:7925:23 | out : SortedMap [<map.value>] : Object | Test.java:7925:9:7925:24 | getMapValue(...) | provenance | MaD:561 |
+| Test.java:7925:21:7925:23 | out : SortedMap [<map.value>] : Object | Test.java:7925:9:7925:24 | getMapValue(...) | provenance | MaD:568 |
 | Test.java:7930:15:7930:51 | (...)... : TreeBasedTable [<map.value>] : Object | Test.java:7931:10:7931:11 | in : TreeBasedTable [<map.value>] : Object | provenance |  |
 | Test.java:7930:22:7930:51 | newTable(...) : TreeBasedTable [<map.value>] : Object | Test.java:7930:15:7930:51 | (...)... : TreeBasedTable [<map.value>] : Object | provenance |  |
 | Test.java:7930:43:7930:50 | source(...) : Object | Test.java:103:58:103:64 | value : Object | provenance |  |
-| Test.java:7930:43:7930:50 | source(...) : Object | Test.java:7930:22:7930:51 | newTable(...) : TreeBasedTable [<map.value>] : Object | provenance | MaD:514 |
-| Test.java:7931:10:7931:11 | in : TreeBasedTable [<map.value>] : Object | Test.java:7931:10:7931:21 | row(...) : Map [<map.value>] : Object | provenance | MaD:519 |
+| Test.java:7930:43:7930:50 | source(...) : Object | Test.java:7930:22:7930:51 | newTable(...) : TreeBasedTable [<map.value>] : Object | provenance | MaD:517 |
+| Test.java:7931:10:7931:11 | in : TreeBasedTable [<map.value>] : Object | Test.java:7931:10:7931:21 | row(...) : Map [<map.value>] : Object | provenance | MaD:522 |
 | Test.java:7931:10:7931:21 | row(...) : Map [<map.value>] : Object | Test.java:7932:21:7932:23 | out : Map [<map.value>] : Object | provenance |  |
 | Test.java:7932:21:7932:23 | out : Map [<map.value>] : Object | Test.java:118:20:118:31 | map : Map [<map.value>] : Object | provenance |  |
-| Test.java:7932:21:7932:23 | out : Map [<map.value>] : Object | Test.java:7932:9:7932:24 | getMapValue(...) | provenance | MaD:561 |
+| Test.java:7932:21:7932:23 | out : Map [<map.value>] : Object | Test.java:7932:9:7932:24 | getMapValue(...) | provenance | MaD:568 |
 | Test.java:7937:20:7937:89 | (...)... : ArrayTable [<map.value>] : Object | Test.java:7938:10:7938:11 | in : ArrayTable [<map.value>] : Object | provenance |  |
 | Test.java:7937:32:7937:89 | create(...) : ArrayTable [<map.value>] : Object | Test.java:7937:20:7937:89 | (...)... : ArrayTable [<map.value>] : Object | provenance |  |
 | Test.java:7937:50:7937:88 | of(...) : ImmutableTable [<map.value>] : Object | Test.java:7937:32:7937:89 | create(...) : ArrayTable [<map.value>] : Object | provenance | MaD:6 |
-| Test.java:7937:80:7937:87 | source(...) : Object | Test.java:7937:50:7937:88 | of(...) : ImmutableTable [<map.value>] : Object | provenance | MaD:198 |
-| Test.java:7938:10:7938:11 | in : ArrayTable [<map.value>] : Object | Test.java:7938:10:7938:21 | row(...) : Map [<map.value>] : Object | provenance | MaD:519 |
+| Test.java:7937:80:7937:87 | source(...) : Object | Test.java:7937:50:7937:88 | of(...) : ImmutableTable [<map.value>] : Object | provenance | MaD:215 |
+| Test.java:7938:10:7938:11 | in : ArrayTable [<map.value>] : Object | Test.java:7938:10:7938:21 | row(...) : Map [<map.value>] : Object | provenance | MaD:522 |
 | Test.java:7938:10:7938:21 | row(...) : Map [<map.value>] : Object | Test.java:7939:21:7939:23 | out : Map [<map.value>] : Object | provenance |  |
 | Test.java:7939:21:7939:23 | out : Map [<map.value>] : Object | Test.java:118:20:118:31 | map : Map [<map.value>] : Object | provenance |  |
-| Test.java:7939:21:7939:23 | out : Map [<map.value>] : Object | Test.java:7939:9:7939:24 | getMapValue(...) | provenance | MaD:561 |
+| Test.java:7939:21:7939:23 | out : Map [<map.value>] : Object | Test.java:7939:9:7939:24 | getMapValue(...) | provenance | MaD:568 |
 | Test.java:7944:24:7944:78 | (...)... : ImmutableTable [<map.value>] : Object | Test.java:7945:10:7945:11 | in : ImmutableTable [<map.value>] : Object | provenance |  |
 | Test.java:7944:40:7944:78 | of(...) : ImmutableTable [<map.value>] : Object | Test.java:7944:24:7944:78 | (...)... : ImmutableTable [<map.value>] : Object | provenance |  |
-| Test.java:7944:70:7944:77 | source(...) : Object | Test.java:7944:40:7944:78 | of(...) : ImmutableTable [<map.value>] : Object | provenance | MaD:198 |
-| Test.java:7945:10:7945:11 | in : ImmutableTable [<map.value>] : Object | Test.java:7945:10:7945:21 | row(...) : ImmutableMap [<map.value>] : Object | provenance | MaD:519 |
+| Test.java:7944:70:7944:77 | source(...) : Object | Test.java:7944:40:7944:78 | of(...) : ImmutableTable [<map.value>] : Object | provenance | MaD:215 |
+| Test.java:7945:10:7945:11 | in : ImmutableTable [<map.value>] : Object | Test.java:7945:10:7945:21 | row(...) : ImmutableMap [<map.value>] : Object | provenance | MaD:522 |
 | Test.java:7945:10:7945:21 | row(...) : ImmutableMap [<map.value>] : Object | Test.java:7946:21:7946:23 | out : ImmutableMap [<map.value>] : Object | provenance |  |
 | Test.java:7946:21:7946:23 | out : ImmutableMap [<map.value>] : Object | Test.java:118:20:118:31 | map : ImmutableMap [<map.value>] : Object | provenance |  |
-| Test.java:7946:21:7946:23 | out : ImmutableMap [<map.value>] : Object | Test.java:7946:9:7946:24 | getMapValue(...) | provenance | MaD:561 |
+| Test.java:7946:21:7946:23 | out : ImmutableMap [<map.value>] : Object | Test.java:7946:9:7946:24 | getMapValue(...) | provenance | MaD:568 |
 | Test.java:7951:24:7951:69 | (...)... : TreeBasedTable [com.google.common.collect.Table.columnKey] : Object | Test.java:7952:10:7952:11 | in : TreeBasedTable [com.google.common.collect.Table.columnKey] : Object | provenance |  |
 | Test.java:7951:40:7951:69 | newTable(...) : TreeBasedTable [com.google.common.collect.Table.columnKey] : Object | Test.java:7951:24:7951:69 | (...)... : TreeBasedTable [com.google.common.collect.Table.columnKey] : Object | provenance |  |
 | Test.java:7951:55:7951:62 | source(...) : Object | Test.java:103:48:103:55 | column : Object | provenance |  |
-| Test.java:7951:55:7951:62 | source(...) : Object | Test.java:7951:40:7951:69 | newTable(...) : TreeBasedTable [com.google.common.collect.Table.columnKey] : Object | provenance | MaD:513 |
-| Test.java:7952:10:7952:11 | in : TreeBasedTable [com.google.common.collect.Table.columnKey] : Object | Test.java:7952:10:7952:21 | row(...) : SortedMap [<map.key>] : Object | provenance | MaD:520 |
+| Test.java:7951:55:7951:62 | source(...) : Object | Test.java:7951:40:7951:69 | newTable(...) : TreeBasedTable [com.google.common.collect.Table.columnKey] : Object | provenance | MaD:516 |
+| Test.java:7952:10:7952:11 | in : TreeBasedTable [com.google.common.collect.Table.columnKey] : Object | Test.java:7952:10:7952:21 | row(...) : SortedMap [<map.key>] : Object | provenance | MaD:523 |
 | Test.java:7952:10:7952:21 | row(...) : SortedMap [<map.key>] : Object | Test.java:7953:19:7953:21 | out : SortedMap [<map.key>] : Object | provenance |  |
 | Test.java:7953:19:7953:21 | out : SortedMap [<map.key>] : Object | Test.java:99:18:99:29 | map : SortedMap [<map.key>] : Object | provenance |  |
-| Test.java:7953:19:7953:21 | out : SortedMap [<map.key>] : Object | Test.java:7953:9:7953:22 | getMapKey(...) | provenance | MaD:562 |
+| Test.java:7953:19:7953:21 | out : SortedMap [<map.key>] : Object | Test.java:7953:9:7953:22 | getMapKey(...) | provenance | MaD:569 |
 | Test.java:7958:15:7958:51 | (...)... : TreeBasedTable [com.google.common.collect.Table.columnKey] : Object | Test.java:7959:10:7959:11 | in : TreeBasedTable [com.google.common.collect.Table.columnKey] : Object | provenance |  |
 | Test.java:7958:22:7958:51 | newTable(...) : TreeBasedTable [com.google.common.collect.Table.columnKey] : Object | Test.java:7958:15:7958:51 | (...)... : TreeBasedTable [com.google.common.collect.Table.columnKey] : Object | provenance |  |
 | Test.java:7958:37:7958:44 | source(...) : Object | Test.java:103:48:103:55 | column : Object | provenance |  |
-| Test.java:7958:37:7958:44 | source(...) : Object | Test.java:7958:22:7958:51 | newTable(...) : TreeBasedTable [com.google.common.collect.Table.columnKey] : Object | provenance | MaD:513 |
-| Test.java:7959:10:7959:11 | in : TreeBasedTable [com.google.common.collect.Table.columnKey] : Object | Test.java:7959:10:7959:21 | row(...) : Map [<map.key>] : Object | provenance | MaD:520 |
+| Test.java:7958:37:7958:44 | source(...) : Object | Test.java:7958:22:7958:51 | newTable(...) : TreeBasedTable [com.google.common.collect.Table.columnKey] : Object | provenance | MaD:516 |
+| Test.java:7959:10:7959:11 | in : TreeBasedTable [com.google.common.collect.Table.columnKey] : Object | Test.java:7959:10:7959:21 | row(...) : Map [<map.key>] : Object | provenance | MaD:523 |
 | Test.java:7959:10:7959:21 | row(...) : Map [<map.key>] : Object | Test.java:7960:19:7960:21 | out : Map [<map.key>] : Object | provenance |  |
 | Test.java:7960:19:7960:21 | out : Map [<map.key>] : Object | Test.java:99:18:99:29 | map : Map [<map.key>] : Object | provenance |  |
-| Test.java:7960:19:7960:21 | out : Map [<map.key>] : Object | Test.java:7960:9:7960:22 | getMapKey(...) | provenance | MaD:562 |
+| Test.java:7960:19:7960:21 | out : Map [<map.key>] : Object | Test.java:7960:9:7960:22 | getMapKey(...) | provenance | MaD:569 |
 | Test.java:7965:20:7965:89 | (...)... : ArrayTable [com.google.common.collect.Table.columnKey] : Object | Test.java:7966:10:7966:11 | in : ArrayTable [com.google.common.collect.Table.columnKey] : Object | provenance |  |
 | Test.java:7965:32:7965:89 | create(...) : ArrayTable [com.google.common.collect.Table.columnKey] : Object | Test.java:7965:20:7965:89 | (...)... : ArrayTable [com.google.common.collect.Table.columnKey] : Object | provenance |  |
 | Test.java:7965:50:7965:88 | of(...) : ImmutableTable [com.google.common.collect.Table.columnKey] : Object | Test.java:7965:32:7965:89 | create(...) : ArrayTable [com.google.common.collect.Table.columnKey] : Object | provenance | MaD:7 |
-| Test.java:7965:74:7965:81 | source(...) : Object | Test.java:7965:50:7965:88 | of(...) : ImmutableTable [com.google.common.collect.Table.columnKey] : Object | provenance | MaD:197 |
-| Test.java:7966:10:7966:11 | in : ArrayTable [com.google.common.collect.Table.columnKey] : Object | Test.java:7966:10:7966:21 | row(...) : Map [<map.key>] : Object | provenance | MaD:520 |
+| Test.java:7965:74:7965:81 | source(...) : Object | Test.java:7965:50:7965:88 | of(...) : ImmutableTable [com.google.common.collect.Table.columnKey] : Object | provenance | MaD:214 |
+| Test.java:7966:10:7966:11 | in : ArrayTable [com.google.common.collect.Table.columnKey] : Object | Test.java:7966:10:7966:21 | row(...) : Map [<map.key>] : Object | provenance | MaD:523 |
 | Test.java:7966:10:7966:21 | row(...) : Map [<map.key>] : Object | Test.java:7967:19:7967:21 | out : Map [<map.key>] : Object | provenance |  |
 | Test.java:7967:19:7967:21 | out : Map [<map.key>] : Object | Test.java:99:18:99:29 | map : Map [<map.key>] : Object | provenance |  |
-| Test.java:7967:19:7967:21 | out : Map [<map.key>] : Object | Test.java:7967:9:7967:22 | getMapKey(...) | provenance | MaD:562 |
+| Test.java:7967:19:7967:21 | out : Map [<map.key>] : Object | Test.java:7967:9:7967:22 | getMapKey(...) | provenance | MaD:569 |
 | Test.java:7972:24:7972:78 | (...)... : ImmutableTable [com.google.common.collect.Table.columnKey] : Object | Test.java:7973:10:7973:11 | in : ImmutableTable [com.google.common.collect.Table.columnKey] : Object | provenance |  |
 | Test.java:7972:40:7972:78 | of(...) : ImmutableTable [com.google.common.collect.Table.columnKey] : Object | Test.java:7972:24:7972:78 | (...)... : ImmutableTable [com.google.common.collect.Table.columnKey] : Object | provenance |  |
-| Test.java:7972:64:7972:71 | source(...) : Object | Test.java:7972:40:7972:78 | of(...) : ImmutableTable [com.google.common.collect.Table.columnKey] : Object | provenance | MaD:197 |
-| Test.java:7973:10:7973:11 | in : ImmutableTable [com.google.common.collect.Table.columnKey] : Object | Test.java:7973:10:7973:21 | row(...) : ImmutableMap [<map.key>] : Object | provenance | MaD:520 |
+| Test.java:7972:64:7972:71 | source(...) : Object | Test.java:7972:40:7972:78 | of(...) : ImmutableTable [com.google.common.collect.Table.columnKey] : Object | provenance | MaD:214 |
+| Test.java:7973:10:7973:11 | in : ImmutableTable [com.google.common.collect.Table.columnKey] : Object | Test.java:7973:10:7973:21 | row(...) : ImmutableMap [<map.key>] : Object | provenance | MaD:523 |
 | Test.java:7973:10:7973:21 | row(...) : ImmutableMap [<map.key>] : Object | Test.java:7974:19:7974:21 | out : ImmutableMap [<map.key>] : Object | provenance |  |
 | Test.java:7974:19:7974:21 | out : ImmutableMap [<map.key>] : Object | Test.java:99:18:99:29 | map : ImmutableMap [<map.key>] : Object | provenance |  |
-| Test.java:7974:19:7974:21 | out : ImmutableMap [<map.key>] : Object | Test.java:7974:9:7974:22 | getMapKey(...) | provenance | MaD:562 |
+| Test.java:7974:19:7974:21 | out : ImmutableMap [<map.key>] : Object | Test.java:7974:9:7974:22 | getMapKey(...) | provenance | MaD:569 |
 | Test.java:7979:24:7979:69 | (...)... : TreeBasedTable [com.google.common.collect.Table.rowKey] : Object | Test.java:7980:10:7980:11 | in : TreeBasedTable [com.google.common.collect.Table.rowKey] : Object | provenance |  |
 | Test.java:7979:40:7979:69 | newTable(...) : TreeBasedTable [com.google.common.collect.Table.rowKey] : Object | Test.java:7979:24:7979:69 | (...)... : TreeBasedTable [com.google.common.collect.Table.rowKey] : Object | provenance |  |
 | Test.java:7979:49:7979:56 | source(...) : Object | Test.java:103:41:103:45 | row : Object | provenance |  |
-| Test.java:7979:49:7979:56 | source(...) : Object | Test.java:7979:40:7979:69 | newTable(...) : TreeBasedTable [com.google.common.collect.Table.rowKey] : Object | provenance | MaD:512 |
-| Test.java:7980:10:7980:11 | in : TreeBasedTable [com.google.common.collect.Table.rowKey] : Object | Test.java:7980:10:7980:23 | rowKeySet(...) : SortedSet [<element>] : Object | provenance | MaD:521 |
+| Test.java:7979:49:7979:56 | source(...) : Object | Test.java:7979:40:7979:69 | newTable(...) : TreeBasedTable [com.google.common.collect.Table.rowKey] : Object | provenance | MaD:515 |
+| Test.java:7980:10:7980:11 | in : TreeBasedTable [com.google.common.collect.Table.rowKey] : Object | Test.java:7980:10:7980:23 | rowKeySet(...) : SortedSet [<element>] : Object | provenance | MaD:524 |
 | Test.java:7980:10:7980:23 | rowKeySet(...) : SortedSet [<element>] : Object | Test.java:7981:20:7981:22 | out : SortedSet [<element>] : Object | provenance |  |
 | Test.java:7981:20:7981:22 | out : SortedSet [<element>] : Object | Test.java:110:19:110:32 | it : SortedSet [<element>] : Object | provenance |  |
-| Test.java:7981:20:7981:22 | out : SortedSet [<element>] : Object | Test.java:7981:9:7981:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:7981:20:7981:22 | out : SortedSet [<element>] : Object | Test.java:7981:9:7981:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:7986:24:7986:69 | (...)... : TreeBasedTable [com.google.common.collect.Table.rowKey] : Object | Test.java:7987:10:7987:11 | in : TreeBasedTable [com.google.common.collect.Table.rowKey] : Object | provenance |  |
 | Test.java:7986:40:7986:69 | newTable(...) : TreeBasedTable [com.google.common.collect.Table.rowKey] : Object | Test.java:7986:24:7986:69 | (...)... : TreeBasedTable [com.google.common.collect.Table.rowKey] : Object | provenance |  |
 | Test.java:7986:49:7986:56 | source(...) : Object | Test.java:103:41:103:45 | row : Object | provenance |  |
-| Test.java:7986:49:7986:56 | source(...) : Object | Test.java:7986:40:7986:69 | newTable(...) : TreeBasedTable [com.google.common.collect.Table.rowKey] : Object | provenance | MaD:512 |
-| Test.java:7987:10:7987:11 | in : TreeBasedTable [com.google.common.collect.Table.rowKey] : Object | Test.java:7987:10:7987:23 | rowKeySet(...) : SortedSet [<element>] : Object | provenance | MaD:521 |
+| Test.java:7986:49:7986:56 | source(...) : Object | Test.java:7986:40:7986:69 | newTable(...) : TreeBasedTable [com.google.common.collect.Table.rowKey] : Object | provenance | MaD:515 |
+| Test.java:7987:10:7987:11 | in : TreeBasedTable [com.google.common.collect.Table.rowKey] : Object | Test.java:7987:10:7987:23 | rowKeySet(...) : SortedSet [<element>] : Object | provenance | MaD:524 |
 | Test.java:7987:10:7987:23 | rowKeySet(...) : SortedSet [<element>] : Object | Test.java:7988:20:7988:22 | out : SortedSet [<element>] : Object | provenance |  |
 | Test.java:7988:20:7988:22 | out : SortedSet [<element>] : Object | Test.java:110:19:110:32 | it : SortedSet [<element>] : Object | provenance |  |
-| Test.java:7988:20:7988:22 | out : SortedSet [<element>] : Object | Test.java:7988:9:7988:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:7988:20:7988:22 | out : SortedSet [<element>] : Object | Test.java:7988:9:7988:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:7993:15:7993:51 | (...)... : TreeBasedTable [com.google.common.collect.Table.rowKey] : Object | Test.java:7994:10:7994:11 | in : TreeBasedTable [com.google.common.collect.Table.rowKey] : Object | provenance |  |
 | Test.java:7993:22:7993:51 | newTable(...) : TreeBasedTable [com.google.common.collect.Table.rowKey] : Object | Test.java:7993:15:7993:51 | (...)... : TreeBasedTable [com.google.common.collect.Table.rowKey] : Object | provenance |  |
 | Test.java:7993:31:7993:38 | source(...) : Object | Test.java:103:41:103:45 | row : Object | provenance |  |
-| Test.java:7993:31:7993:38 | source(...) : Object | Test.java:7993:22:7993:51 | newTable(...) : TreeBasedTable [com.google.common.collect.Table.rowKey] : Object | provenance | MaD:512 |
-| Test.java:7994:10:7994:11 | in : TreeBasedTable [com.google.common.collect.Table.rowKey] : Object | Test.java:7994:10:7994:23 | rowKeySet(...) : Set [<element>] : Object | provenance | MaD:521 |
+| Test.java:7993:31:7993:38 | source(...) : Object | Test.java:7993:22:7993:51 | newTable(...) : TreeBasedTable [com.google.common.collect.Table.rowKey] : Object | provenance | MaD:515 |
+| Test.java:7994:10:7994:11 | in : TreeBasedTable [com.google.common.collect.Table.rowKey] : Object | Test.java:7994:10:7994:23 | rowKeySet(...) : Set [<element>] : Object | provenance | MaD:524 |
 | Test.java:7994:10:7994:23 | rowKeySet(...) : Set [<element>] : Object | Test.java:7995:20:7995:22 | out : Set [<element>] : Object | provenance |  |
 | Test.java:7995:20:7995:22 | out : Set [<element>] : Object | Test.java:110:19:110:32 | it : Set [<element>] : Object | provenance |  |
-| Test.java:7995:20:7995:22 | out : Set [<element>] : Object | Test.java:7995:9:7995:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:7995:20:7995:22 | out : Set [<element>] : Object | Test.java:7995:9:7995:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:8000:24:8000:78 | (...)... : ImmutableTable [com.google.common.collect.Table.rowKey] : Object | Test.java:8001:10:8001:11 | in : ImmutableTable [com.google.common.collect.Table.rowKey] : Object | provenance |  |
 | Test.java:8000:40:8000:78 | of(...) : ImmutableTable [com.google.common.collect.Table.rowKey] : Object | Test.java:8000:24:8000:78 | (...)... : ImmutableTable [com.google.common.collect.Table.rowKey] : Object | provenance |  |
-| Test.java:8000:58:8000:65 | source(...) : Object | Test.java:8000:40:8000:78 | of(...) : ImmutableTable [com.google.common.collect.Table.rowKey] : Object | provenance | MaD:196 |
-| Test.java:8001:10:8001:11 | in : ImmutableTable [com.google.common.collect.Table.rowKey] : Object | Test.java:8001:10:8001:23 | rowKeySet(...) : ImmutableSet [<element>] : Object | provenance | MaD:521 |
+| Test.java:8000:58:8000:65 | source(...) : Object | Test.java:8000:40:8000:78 | of(...) : ImmutableTable [com.google.common.collect.Table.rowKey] : Object | provenance | MaD:213 |
+| Test.java:8001:10:8001:11 | in : ImmutableTable [com.google.common.collect.Table.rowKey] : Object | Test.java:8001:10:8001:23 | rowKeySet(...) : ImmutableSet [<element>] : Object | provenance | MaD:524 |
 | Test.java:8001:10:8001:23 | rowKeySet(...) : ImmutableSet [<element>] : Object | Test.java:8002:20:8002:22 | out : ImmutableSet [<element>] : Object | provenance |  |
 | Test.java:8002:20:8002:22 | out : ImmutableSet [<element>] : Object | Test.java:110:19:110:32 | it : ImmutableSet [<element>] : Object | provenance |  |
-| Test.java:8002:20:8002:22 | out : ImmutableSet [<element>] : Object | Test.java:8002:9:8002:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:8002:20:8002:22 | out : ImmutableSet [<element>] : Object | Test.java:8002:9:8002:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:8007:20:8007:89 | (...)... : ArrayTable [com.google.common.collect.Table.rowKey] : Object | Test.java:8008:10:8008:11 | in : ArrayTable [com.google.common.collect.Table.rowKey] : Object | provenance |  |
 | Test.java:8007:32:8007:89 | create(...) : ArrayTable [com.google.common.collect.Table.rowKey] : Object | Test.java:8007:20:8007:89 | (...)... : ArrayTable [com.google.common.collect.Table.rowKey] : Object | provenance |  |
 | Test.java:8007:50:8007:88 | of(...) : ImmutableTable [com.google.common.collect.Table.rowKey] : Object | Test.java:8007:32:8007:89 | create(...) : ArrayTable [com.google.common.collect.Table.rowKey] : Object | provenance | MaD:8 |
-| Test.java:8007:68:8007:75 | source(...) : Object | Test.java:8007:50:8007:88 | of(...) : ImmutableTable [com.google.common.collect.Table.rowKey] : Object | provenance | MaD:196 |
-| Test.java:8008:10:8008:11 | in : ArrayTable [com.google.common.collect.Table.rowKey] : Object | Test.java:8008:10:8008:23 | rowKeySet(...) : ImmutableSet [<element>] : Object | provenance | MaD:521 |
+| Test.java:8007:68:8007:75 | source(...) : Object | Test.java:8007:50:8007:88 | of(...) : ImmutableTable [com.google.common.collect.Table.rowKey] : Object | provenance | MaD:213 |
+| Test.java:8008:10:8008:11 | in : ArrayTable [com.google.common.collect.Table.rowKey] : Object | Test.java:8008:10:8008:23 | rowKeySet(...) : ImmutableSet [<element>] : Object | provenance | MaD:524 |
 | Test.java:8008:10:8008:23 | rowKeySet(...) : ImmutableSet [<element>] : Object | Test.java:8009:20:8009:22 | out : ImmutableSet [<element>] : Object | provenance |  |
 | Test.java:8009:20:8009:22 | out : ImmutableSet [<element>] : Object | Test.java:110:19:110:32 | it : ImmutableSet [<element>] : Object | provenance |  |
-| Test.java:8009:20:8009:22 | out : ImmutableSet [<element>] : Object | Test.java:8009:9:8009:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:8009:20:8009:22 | out : ImmutableSet [<element>] : Object | Test.java:8009:9:8009:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:8014:24:8014:69 | (...)... : TreeBasedTable [<map.value>] : Object | Test.java:8015:10:8015:11 | in : TreeBasedTable [<map.value>] : Object | provenance |  |
 | Test.java:8014:40:8014:69 | newTable(...) : TreeBasedTable [<map.value>] : Object | Test.java:8014:24:8014:69 | (...)... : TreeBasedTable [<map.value>] : Object | provenance |  |
 | Test.java:8014:61:8014:68 | source(...) : Object | Test.java:103:58:103:64 | value : Object | provenance |  |
-| Test.java:8014:61:8014:68 | source(...) : Object | Test.java:8014:40:8014:69 | newTable(...) : TreeBasedTable [<map.value>] : Object | provenance | MaD:514 |
-| Test.java:8015:10:8015:11 | in : TreeBasedTable [<map.value>] : Object | Test.java:8015:10:8015:20 | rowMap(...) : SortedMap [<map.value>, <map.value>] : Object | provenance | MaD:522 |
+| Test.java:8014:61:8014:68 | source(...) : Object | Test.java:8014:40:8014:69 | newTable(...) : TreeBasedTable [<map.value>] : Object | provenance | MaD:517 |
+| Test.java:8015:10:8015:11 | in : TreeBasedTable [<map.value>] : Object | Test.java:8015:10:8015:20 | rowMap(...) : SortedMap [<map.value>, <map.value>] : Object | provenance | MaD:525 |
 | Test.java:8015:10:8015:20 | rowMap(...) : SortedMap [<map.value>, <map.value>] : Object | Test.java:8016:33:8016:35 | out : SortedMap [<map.value>, <map.value>] : Object | provenance |  |
 | Test.java:8016:21:8016:36 | getMapValue(...) : Map [<map.value>] : Object | Test.java:118:20:118:31 | map : Map [<map.value>] : Object | provenance |  |
-| Test.java:8016:21:8016:36 | getMapValue(...) : Map [<map.value>] : Object | Test.java:8016:9:8016:37 | getMapValue(...) | provenance | MaD:561 |
+| Test.java:8016:21:8016:36 | getMapValue(...) : Map [<map.value>] : Object | Test.java:8016:9:8016:37 | getMapValue(...) | provenance | MaD:568 |
 | Test.java:8016:33:8016:35 | out : SortedMap [<map.value>, <map.value>] : Object | Test.java:118:20:118:31 | map : SortedMap [<map.value>, <map.value>] : Object | provenance |  |
-| Test.java:8016:33:8016:35 | out : SortedMap [<map.value>, <map.value>] : Object | Test.java:8016:21:8016:36 | getMapValue(...) : Map [<map.value>] : Object | provenance | MaD:561 |
+| Test.java:8016:33:8016:35 | out : SortedMap [<map.value>, <map.value>] : Object | Test.java:8016:21:8016:36 | getMapValue(...) : Map [<map.value>] : Object | provenance | MaD:568 |
 | Test.java:8021:24:8021:69 | (...)... : TreeBasedTable [<map.value>] : Object | Test.java:8022:10:8022:11 | in : TreeBasedTable [<map.value>] : Object | provenance |  |
 | Test.java:8021:40:8021:69 | newTable(...) : TreeBasedTable [<map.value>] : Object | Test.java:8021:24:8021:69 | (...)... : TreeBasedTable [<map.value>] : Object | provenance |  |
 | Test.java:8021:61:8021:68 | source(...) : Object | Test.java:103:58:103:64 | value : Object | provenance |  |
-| Test.java:8021:61:8021:68 | source(...) : Object | Test.java:8021:40:8021:69 | newTable(...) : TreeBasedTable [<map.value>] : Object | provenance | MaD:514 |
-| Test.java:8022:10:8022:11 | in : TreeBasedTable [<map.value>] : Object | Test.java:8022:10:8022:20 | rowMap(...) : SortedMap [<map.value>, <map.value>] : Object | provenance | MaD:522 |
+| Test.java:8021:61:8021:68 | source(...) : Object | Test.java:8021:40:8021:69 | newTable(...) : TreeBasedTable [<map.value>] : Object | provenance | MaD:517 |
+| Test.java:8022:10:8022:11 | in : TreeBasedTable [<map.value>] : Object | Test.java:8022:10:8022:20 | rowMap(...) : SortedMap [<map.value>, <map.value>] : Object | provenance | MaD:525 |
 | Test.java:8022:10:8022:20 | rowMap(...) : SortedMap [<map.value>, <map.value>] : Object | Test.java:8023:33:8023:35 | out : SortedMap [<map.value>, <map.value>] : Object | provenance |  |
 | Test.java:8023:21:8023:36 | getMapValue(...) : Map [<map.value>] : Object | Test.java:118:20:118:31 | map : Map [<map.value>] : Object | provenance |  |
-| Test.java:8023:21:8023:36 | getMapValue(...) : Map [<map.value>] : Object | Test.java:8023:9:8023:37 | getMapValue(...) | provenance | MaD:561 |
+| Test.java:8023:21:8023:36 | getMapValue(...) : Map [<map.value>] : Object | Test.java:8023:9:8023:37 | getMapValue(...) | provenance | MaD:568 |
 | Test.java:8023:33:8023:35 | out : SortedMap [<map.value>, <map.value>] : Object | Test.java:118:20:118:31 | map : SortedMap [<map.value>, <map.value>] : Object | provenance |  |
-| Test.java:8023:33:8023:35 | out : SortedMap [<map.value>, <map.value>] : Object | Test.java:8023:21:8023:36 | getMapValue(...) : Map [<map.value>] : Object | provenance | MaD:561 |
+| Test.java:8023:33:8023:35 | out : SortedMap [<map.value>, <map.value>] : Object | Test.java:8023:21:8023:36 | getMapValue(...) : Map [<map.value>] : Object | provenance | MaD:568 |
 | Test.java:8028:15:8028:51 | (...)... : TreeBasedTable [<map.value>] : Object | Test.java:8029:10:8029:11 | in : TreeBasedTable [<map.value>] : Object | provenance |  |
 | Test.java:8028:22:8028:51 | newTable(...) : TreeBasedTable [<map.value>] : Object | Test.java:8028:15:8028:51 | (...)... : TreeBasedTable [<map.value>] : Object | provenance |  |
 | Test.java:8028:43:8028:50 | source(...) : Object | Test.java:103:58:103:64 | value : Object | provenance |  |
-| Test.java:8028:43:8028:50 | source(...) : Object | Test.java:8028:22:8028:51 | newTable(...) : TreeBasedTable [<map.value>] : Object | provenance | MaD:514 |
-| Test.java:8029:10:8029:11 | in : TreeBasedTable [<map.value>] : Object | Test.java:8029:10:8029:20 | rowMap(...) : Map [<map.value>, <map.value>] : Object | provenance | MaD:522 |
+| Test.java:8028:43:8028:50 | source(...) : Object | Test.java:8028:22:8028:51 | newTable(...) : TreeBasedTable [<map.value>] : Object | provenance | MaD:517 |
+| Test.java:8029:10:8029:11 | in : TreeBasedTable [<map.value>] : Object | Test.java:8029:10:8029:20 | rowMap(...) : Map [<map.value>, <map.value>] : Object | provenance | MaD:525 |
 | Test.java:8029:10:8029:20 | rowMap(...) : Map [<map.value>, <map.value>] : Object | Test.java:8030:33:8030:35 | out : Map [<map.value>, <map.value>] : Object | provenance |  |
 | Test.java:8030:21:8030:36 | getMapValue(...) : Map [<map.value>] : Object | Test.java:118:20:118:31 | map : Map [<map.value>] : Object | provenance |  |
-| Test.java:8030:21:8030:36 | getMapValue(...) : Map [<map.value>] : Object | Test.java:8030:9:8030:37 | getMapValue(...) | provenance | MaD:561 |
+| Test.java:8030:21:8030:36 | getMapValue(...) : Map [<map.value>] : Object | Test.java:8030:9:8030:37 | getMapValue(...) | provenance | MaD:568 |
 | Test.java:8030:33:8030:35 | out : Map [<map.value>, <map.value>] : Object | Test.java:118:20:118:31 | map : Map [<map.value>, <map.value>] : Object | provenance |  |
-| Test.java:8030:33:8030:35 | out : Map [<map.value>, <map.value>] : Object | Test.java:8030:21:8030:36 | getMapValue(...) : Map [<map.value>] : Object | provenance | MaD:561 |
+| Test.java:8030:33:8030:35 | out : Map [<map.value>, <map.value>] : Object | Test.java:8030:21:8030:36 | getMapValue(...) : Map [<map.value>] : Object | provenance | MaD:568 |
 | Test.java:8035:20:8035:89 | (...)... : ArrayTable [<map.value>] : Object | Test.java:8036:10:8036:11 | in : ArrayTable [<map.value>] : Object | provenance |  |
 | Test.java:8035:32:8035:89 | create(...) : ArrayTable [<map.value>] : Object | Test.java:8035:20:8035:89 | (...)... : ArrayTable [<map.value>] : Object | provenance |  |
 | Test.java:8035:50:8035:88 | of(...) : ImmutableTable [<map.value>] : Object | Test.java:8035:32:8035:89 | create(...) : ArrayTable [<map.value>] : Object | provenance | MaD:6 |
-| Test.java:8035:80:8035:87 | source(...) : Object | Test.java:8035:50:8035:88 | of(...) : ImmutableTable [<map.value>] : Object | provenance | MaD:198 |
-| Test.java:8036:10:8036:11 | in : ArrayTable [<map.value>] : Object | Test.java:8036:10:8036:20 | rowMap(...) : Map [<map.value>, <map.value>] : Object | provenance | MaD:522 |
+| Test.java:8035:80:8035:87 | source(...) : Object | Test.java:8035:50:8035:88 | of(...) : ImmutableTable [<map.value>] : Object | provenance | MaD:215 |
+| Test.java:8036:10:8036:11 | in : ArrayTable [<map.value>] : Object | Test.java:8036:10:8036:20 | rowMap(...) : Map [<map.value>, <map.value>] : Object | provenance | MaD:525 |
 | Test.java:8036:10:8036:20 | rowMap(...) : Map [<map.value>, <map.value>] : Object | Test.java:8037:33:8037:35 | out : Map [<map.value>, <map.value>] : Object | provenance |  |
 | Test.java:8037:21:8037:36 | getMapValue(...) : Map [<map.value>] : Object | Test.java:118:20:118:31 | map : Map [<map.value>] : Object | provenance |  |
-| Test.java:8037:21:8037:36 | getMapValue(...) : Map [<map.value>] : Object | Test.java:8037:9:8037:37 | getMapValue(...) | provenance | MaD:561 |
+| Test.java:8037:21:8037:36 | getMapValue(...) : Map [<map.value>] : Object | Test.java:8037:9:8037:37 | getMapValue(...) | provenance | MaD:568 |
 | Test.java:8037:33:8037:35 | out : Map [<map.value>, <map.value>] : Object | Test.java:118:20:118:31 | map : Map [<map.value>, <map.value>] : Object | provenance |  |
-| Test.java:8037:33:8037:35 | out : Map [<map.value>, <map.value>] : Object | Test.java:8037:21:8037:36 | getMapValue(...) : Map [<map.value>] : Object | provenance | MaD:561 |
+| Test.java:8037:33:8037:35 | out : Map [<map.value>, <map.value>] : Object | Test.java:8037:21:8037:36 | getMapValue(...) : Map [<map.value>] : Object | provenance | MaD:568 |
 | Test.java:8042:24:8042:78 | (...)... : ImmutableTable [<map.value>] : Object | Test.java:8043:10:8043:11 | in : ImmutableTable [<map.value>] : Object | provenance |  |
 | Test.java:8042:40:8042:78 | of(...) : ImmutableTable [<map.value>] : Object | Test.java:8042:24:8042:78 | (...)... : ImmutableTable [<map.value>] : Object | provenance |  |
-| Test.java:8042:70:8042:77 | source(...) : Object | Test.java:8042:40:8042:78 | of(...) : ImmutableTable [<map.value>] : Object | provenance | MaD:198 |
-| Test.java:8043:10:8043:11 | in : ImmutableTable [<map.value>] : Object | Test.java:8043:10:8043:20 | rowMap(...) : ImmutableMap [<map.value>, <map.value>] : Object | provenance | MaD:522 |
+| Test.java:8042:70:8042:77 | source(...) : Object | Test.java:8042:40:8042:78 | of(...) : ImmutableTable [<map.value>] : Object | provenance | MaD:215 |
+| Test.java:8043:10:8043:11 | in : ImmutableTable [<map.value>] : Object | Test.java:8043:10:8043:20 | rowMap(...) : ImmutableMap [<map.value>, <map.value>] : Object | provenance | MaD:525 |
 | Test.java:8043:10:8043:20 | rowMap(...) : ImmutableMap [<map.value>, <map.value>] : Object | Test.java:8044:33:8044:35 | out : ImmutableMap [<map.value>, <map.value>] : Object | provenance |  |
 | Test.java:8044:21:8044:36 | getMapValue(...) : Map [<map.value>] : Object | Test.java:118:20:118:31 | map : Map [<map.value>] : Object | provenance |  |
-| Test.java:8044:21:8044:36 | getMapValue(...) : Map [<map.value>] : Object | Test.java:8044:9:8044:37 | getMapValue(...) | provenance | MaD:561 |
+| Test.java:8044:21:8044:36 | getMapValue(...) : Map [<map.value>] : Object | Test.java:8044:9:8044:37 | getMapValue(...) | provenance | MaD:568 |
 | Test.java:8044:33:8044:35 | out : ImmutableMap [<map.value>, <map.value>] : Object | Test.java:118:20:118:31 | map : ImmutableMap [<map.value>, <map.value>] : Object | provenance |  |
-| Test.java:8044:33:8044:35 | out : ImmutableMap [<map.value>, <map.value>] : Object | Test.java:8044:21:8044:36 | getMapValue(...) : Map [<map.value>] : Object | provenance | MaD:561 |
+| Test.java:8044:33:8044:35 | out : ImmutableMap [<map.value>, <map.value>] : Object | Test.java:8044:21:8044:36 | getMapValue(...) : Map [<map.value>] : Object | provenance | MaD:568 |
 | Test.java:8049:24:8049:69 | (...)... : TreeBasedTable [com.google.common.collect.Table.columnKey] : Object | Test.java:8050:10:8050:11 | in : TreeBasedTable [com.google.common.collect.Table.columnKey] : Object | provenance |  |
 | Test.java:8049:40:8049:69 | newTable(...) : TreeBasedTable [com.google.common.collect.Table.columnKey] : Object | Test.java:8049:24:8049:69 | (...)... : TreeBasedTable [com.google.common.collect.Table.columnKey] : Object | provenance |  |
 | Test.java:8049:55:8049:62 | source(...) : Object | Test.java:103:48:103:55 | column : Object | provenance |  |
-| Test.java:8049:55:8049:62 | source(...) : Object | Test.java:8049:40:8049:69 | newTable(...) : TreeBasedTable [com.google.common.collect.Table.columnKey] : Object | provenance | MaD:513 |
-| Test.java:8050:10:8050:11 | in : TreeBasedTable [com.google.common.collect.Table.columnKey] : Object | Test.java:8050:10:8050:20 | rowMap(...) : SortedMap [<map.value>, <map.key>] : Object | provenance | MaD:523 |
+| Test.java:8049:55:8049:62 | source(...) : Object | Test.java:8049:40:8049:69 | newTable(...) : TreeBasedTable [com.google.common.collect.Table.columnKey] : Object | provenance | MaD:516 |
+| Test.java:8050:10:8050:11 | in : TreeBasedTable [com.google.common.collect.Table.columnKey] : Object | Test.java:8050:10:8050:20 | rowMap(...) : SortedMap [<map.value>, <map.key>] : Object | provenance | MaD:526 |
 | Test.java:8050:10:8050:20 | rowMap(...) : SortedMap [<map.value>, <map.key>] : Object | Test.java:8051:31:8051:33 | out : SortedMap [<map.value>, <map.key>] : Object | provenance |  |
 | Test.java:8051:19:8051:34 | getMapValue(...) : Map [<map.key>] : Object | Test.java:99:18:99:29 | map : Map [<map.key>] : Object | provenance |  |
-| Test.java:8051:19:8051:34 | getMapValue(...) : Map [<map.key>] : Object | Test.java:8051:9:8051:35 | getMapKey(...) | provenance | MaD:562 |
+| Test.java:8051:19:8051:34 | getMapValue(...) : Map [<map.key>] : Object | Test.java:8051:9:8051:35 | getMapKey(...) | provenance | MaD:569 |
 | Test.java:8051:31:8051:33 | out : SortedMap [<map.value>, <map.key>] : Object | Test.java:118:20:118:31 | map : SortedMap [<map.value>, <map.key>] : Object | provenance |  |
-| Test.java:8051:31:8051:33 | out : SortedMap [<map.value>, <map.key>] : Object | Test.java:8051:19:8051:34 | getMapValue(...) : Map [<map.key>] : Object | provenance | MaD:561 |
+| Test.java:8051:31:8051:33 | out : SortedMap [<map.value>, <map.key>] : Object | Test.java:8051:19:8051:34 | getMapValue(...) : Map [<map.key>] : Object | provenance | MaD:568 |
 | Test.java:8056:24:8056:69 | (...)... : TreeBasedTable [com.google.common.collect.Table.columnKey] : Object | Test.java:8057:10:8057:11 | in : TreeBasedTable [com.google.common.collect.Table.columnKey] : Object | provenance |  |
 | Test.java:8056:40:8056:69 | newTable(...) : TreeBasedTable [com.google.common.collect.Table.columnKey] : Object | Test.java:8056:24:8056:69 | (...)... : TreeBasedTable [com.google.common.collect.Table.columnKey] : Object | provenance |  |
 | Test.java:8056:55:8056:62 | source(...) : Object | Test.java:103:48:103:55 | column : Object | provenance |  |
-| Test.java:8056:55:8056:62 | source(...) : Object | Test.java:8056:40:8056:69 | newTable(...) : TreeBasedTable [com.google.common.collect.Table.columnKey] : Object | provenance | MaD:513 |
-| Test.java:8057:10:8057:11 | in : TreeBasedTable [com.google.common.collect.Table.columnKey] : Object | Test.java:8057:10:8057:20 | rowMap(...) : SortedMap [<map.value>, <map.key>] : Object | provenance | MaD:523 |
+| Test.java:8056:55:8056:62 | source(...) : Object | Test.java:8056:40:8056:69 | newTable(...) : TreeBasedTable [com.google.common.collect.Table.columnKey] : Object | provenance | MaD:516 |
+| Test.java:8057:10:8057:11 | in : TreeBasedTable [com.google.common.collect.Table.columnKey] : Object | Test.java:8057:10:8057:20 | rowMap(...) : SortedMap [<map.value>, <map.key>] : Object | provenance | MaD:526 |
 | Test.java:8057:10:8057:20 | rowMap(...) : SortedMap [<map.value>, <map.key>] : Object | Test.java:8058:31:8058:33 | out : SortedMap [<map.value>, <map.key>] : Object | provenance |  |
 | Test.java:8058:19:8058:34 | getMapValue(...) : Map [<map.key>] : Object | Test.java:99:18:99:29 | map : Map [<map.key>] : Object | provenance |  |
-| Test.java:8058:19:8058:34 | getMapValue(...) : Map [<map.key>] : Object | Test.java:8058:9:8058:35 | getMapKey(...) | provenance | MaD:562 |
+| Test.java:8058:19:8058:34 | getMapValue(...) : Map [<map.key>] : Object | Test.java:8058:9:8058:35 | getMapKey(...) | provenance | MaD:569 |
 | Test.java:8058:31:8058:33 | out : SortedMap [<map.value>, <map.key>] : Object | Test.java:118:20:118:31 | map : SortedMap [<map.value>, <map.key>] : Object | provenance |  |
-| Test.java:8058:31:8058:33 | out : SortedMap [<map.value>, <map.key>] : Object | Test.java:8058:19:8058:34 | getMapValue(...) : Map [<map.key>] : Object | provenance | MaD:561 |
+| Test.java:8058:31:8058:33 | out : SortedMap [<map.value>, <map.key>] : Object | Test.java:8058:19:8058:34 | getMapValue(...) : Map [<map.key>] : Object | provenance | MaD:568 |
 | Test.java:8063:15:8063:51 | (...)... : TreeBasedTable [com.google.common.collect.Table.columnKey] : Object | Test.java:8064:10:8064:11 | in : TreeBasedTable [com.google.common.collect.Table.columnKey] : Object | provenance |  |
 | Test.java:8063:22:8063:51 | newTable(...) : TreeBasedTable [com.google.common.collect.Table.columnKey] : Object | Test.java:8063:15:8063:51 | (...)... : TreeBasedTable [com.google.common.collect.Table.columnKey] : Object | provenance |  |
 | Test.java:8063:37:8063:44 | source(...) : Object | Test.java:103:48:103:55 | column : Object | provenance |  |
-| Test.java:8063:37:8063:44 | source(...) : Object | Test.java:8063:22:8063:51 | newTable(...) : TreeBasedTable [com.google.common.collect.Table.columnKey] : Object | provenance | MaD:513 |
-| Test.java:8064:10:8064:11 | in : TreeBasedTable [com.google.common.collect.Table.columnKey] : Object | Test.java:8064:10:8064:20 | rowMap(...) : Map [<map.value>, <map.key>] : Object | provenance | MaD:523 |
+| Test.java:8063:37:8063:44 | source(...) : Object | Test.java:8063:22:8063:51 | newTable(...) : TreeBasedTable [com.google.common.collect.Table.columnKey] : Object | provenance | MaD:516 |
+| Test.java:8064:10:8064:11 | in : TreeBasedTable [com.google.common.collect.Table.columnKey] : Object | Test.java:8064:10:8064:20 | rowMap(...) : Map [<map.value>, <map.key>] : Object | provenance | MaD:526 |
 | Test.java:8064:10:8064:20 | rowMap(...) : Map [<map.value>, <map.key>] : Object | Test.java:8065:31:8065:33 | out : Map [<map.value>, <map.key>] : Object | provenance |  |
 | Test.java:8065:19:8065:34 | getMapValue(...) : Map [<map.key>] : Object | Test.java:99:18:99:29 | map : Map [<map.key>] : Object | provenance |  |
-| Test.java:8065:19:8065:34 | getMapValue(...) : Map [<map.key>] : Object | Test.java:8065:9:8065:35 | getMapKey(...) | provenance | MaD:562 |
+| Test.java:8065:19:8065:34 | getMapValue(...) : Map [<map.key>] : Object | Test.java:8065:9:8065:35 | getMapKey(...) | provenance | MaD:569 |
 | Test.java:8065:31:8065:33 | out : Map [<map.value>, <map.key>] : Object | Test.java:118:20:118:31 | map : Map [<map.value>, <map.key>] : Object | provenance |  |
-| Test.java:8065:31:8065:33 | out : Map [<map.value>, <map.key>] : Object | Test.java:8065:19:8065:34 | getMapValue(...) : Map [<map.key>] : Object | provenance | MaD:561 |
+| Test.java:8065:31:8065:33 | out : Map [<map.value>, <map.key>] : Object | Test.java:8065:19:8065:34 | getMapValue(...) : Map [<map.key>] : Object | provenance | MaD:568 |
 | Test.java:8070:20:8070:89 | (...)... : ArrayTable [com.google.common.collect.Table.columnKey] : Object | Test.java:8071:10:8071:11 | in : ArrayTable [com.google.common.collect.Table.columnKey] : Object | provenance |  |
 | Test.java:8070:32:8070:89 | create(...) : ArrayTable [com.google.common.collect.Table.columnKey] : Object | Test.java:8070:20:8070:89 | (...)... : ArrayTable [com.google.common.collect.Table.columnKey] : Object | provenance |  |
 | Test.java:8070:50:8070:88 | of(...) : ImmutableTable [com.google.common.collect.Table.columnKey] : Object | Test.java:8070:32:8070:89 | create(...) : ArrayTable [com.google.common.collect.Table.columnKey] : Object | provenance | MaD:7 |
-| Test.java:8070:74:8070:81 | source(...) : Object | Test.java:8070:50:8070:88 | of(...) : ImmutableTable [com.google.common.collect.Table.columnKey] : Object | provenance | MaD:197 |
-| Test.java:8071:10:8071:11 | in : ArrayTable [com.google.common.collect.Table.columnKey] : Object | Test.java:8071:10:8071:20 | rowMap(...) : Map [<map.value>, <map.key>] : Object | provenance | MaD:523 |
+| Test.java:8070:74:8070:81 | source(...) : Object | Test.java:8070:50:8070:88 | of(...) : ImmutableTable [com.google.common.collect.Table.columnKey] : Object | provenance | MaD:214 |
+| Test.java:8071:10:8071:11 | in : ArrayTable [com.google.common.collect.Table.columnKey] : Object | Test.java:8071:10:8071:20 | rowMap(...) : Map [<map.value>, <map.key>] : Object | provenance | MaD:526 |
 | Test.java:8071:10:8071:20 | rowMap(...) : Map [<map.value>, <map.key>] : Object | Test.java:8072:31:8072:33 | out : Map [<map.value>, <map.key>] : Object | provenance |  |
 | Test.java:8072:19:8072:34 | getMapValue(...) : Map [<map.key>] : Object | Test.java:99:18:99:29 | map : Map [<map.key>] : Object | provenance |  |
-| Test.java:8072:19:8072:34 | getMapValue(...) : Map [<map.key>] : Object | Test.java:8072:9:8072:35 | getMapKey(...) | provenance | MaD:562 |
+| Test.java:8072:19:8072:34 | getMapValue(...) : Map [<map.key>] : Object | Test.java:8072:9:8072:35 | getMapKey(...) | provenance | MaD:569 |
 | Test.java:8072:31:8072:33 | out : Map [<map.value>, <map.key>] : Object | Test.java:118:20:118:31 | map : Map [<map.value>, <map.key>] : Object | provenance |  |
-| Test.java:8072:31:8072:33 | out : Map [<map.value>, <map.key>] : Object | Test.java:8072:19:8072:34 | getMapValue(...) : Map [<map.key>] : Object | provenance | MaD:561 |
+| Test.java:8072:31:8072:33 | out : Map [<map.value>, <map.key>] : Object | Test.java:8072:19:8072:34 | getMapValue(...) : Map [<map.key>] : Object | provenance | MaD:568 |
 | Test.java:8077:24:8077:78 | (...)... : ImmutableTable [com.google.common.collect.Table.columnKey] : Object | Test.java:8078:10:8078:11 | in : ImmutableTable [com.google.common.collect.Table.columnKey] : Object | provenance |  |
 | Test.java:8077:40:8077:78 | of(...) : ImmutableTable [com.google.common.collect.Table.columnKey] : Object | Test.java:8077:24:8077:78 | (...)... : ImmutableTable [com.google.common.collect.Table.columnKey] : Object | provenance |  |
-| Test.java:8077:64:8077:71 | source(...) : Object | Test.java:8077:40:8077:78 | of(...) : ImmutableTable [com.google.common.collect.Table.columnKey] : Object | provenance | MaD:197 |
-| Test.java:8078:10:8078:11 | in : ImmutableTable [com.google.common.collect.Table.columnKey] : Object | Test.java:8078:10:8078:20 | rowMap(...) : ImmutableMap [<map.value>, <map.key>] : Object | provenance | MaD:523 |
+| Test.java:8077:64:8077:71 | source(...) : Object | Test.java:8077:40:8077:78 | of(...) : ImmutableTable [com.google.common.collect.Table.columnKey] : Object | provenance | MaD:214 |
+| Test.java:8078:10:8078:11 | in : ImmutableTable [com.google.common.collect.Table.columnKey] : Object | Test.java:8078:10:8078:20 | rowMap(...) : ImmutableMap [<map.value>, <map.key>] : Object | provenance | MaD:526 |
 | Test.java:8078:10:8078:20 | rowMap(...) : ImmutableMap [<map.value>, <map.key>] : Object | Test.java:8079:31:8079:33 | out : ImmutableMap [<map.value>, <map.key>] : Object | provenance |  |
 | Test.java:8079:19:8079:34 | getMapValue(...) : Map [<map.key>] : Object | Test.java:99:18:99:29 | map : Map [<map.key>] : Object | provenance |  |
-| Test.java:8079:19:8079:34 | getMapValue(...) : Map [<map.key>] : Object | Test.java:8079:9:8079:35 | getMapKey(...) | provenance | MaD:562 |
+| Test.java:8079:19:8079:34 | getMapValue(...) : Map [<map.key>] : Object | Test.java:8079:9:8079:35 | getMapKey(...) | provenance | MaD:569 |
 | Test.java:8079:31:8079:33 | out : ImmutableMap [<map.value>, <map.key>] : Object | Test.java:118:20:118:31 | map : ImmutableMap [<map.value>, <map.key>] : Object | provenance |  |
-| Test.java:8079:31:8079:33 | out : ImmutableMap [<map.value>, <map.key>] : Object | Test.java:8079:19:8079:34 | getMapValue(...) : Map [<map.key>] : Object | provenance | MaD:561 |
+| Test.java:8079:31:8079:33 | out : ImmutableMap [<map.value>, <map.key>] : Object | Test.java:8079:19:8079:34 | getMapValue(...) : Map [<map.key>] : Object | provenance | MaD:568 |
 | Test.java:8084:24:8084:69 | (...)... : TreeBasedTable [com.google.common.collect.Table.rowKey] : Object | Test.java:8085:10:8085:11 | in : TreeBasedTable [com.google.common.collect.Table.rowKey] : Object | provenance |  |
 | Test.java:8084:40:8084:69 | newTable(...) : TreeBasedTable [com.google.common.collect.Table.rowKey] : Object | Test.java:8084:24:8084:69 | (...)... : TreeBasedTable [com.google.common.collect.Table.rowKey] : Object | provenance |  |
 | Test.java:8084:49:8084:56 | source(...) : Object | Test.java:103:41:103:45 | row : Object | provenance |  |
-| Test.java:8084:49:8084:56 | source(...) : Object | Test.java:8084:40:8084:69 | newTable(...) : TreeBasedTable [com.google.common.collect.Table.rowKey] : Object | provenance | MaD:512 |
-| Test.java:8085:10:8085:11 | in : TreeBasedTable [com.google.common.collect.Table.rowKey] : Object | Test.java:8085:10:8085:20 | rowMap(...) : SortedMap [<map.key>] : Object | provenance | MaD:524 |
+| Test.java:8084:49:8084:56 | source(...) : Object | Test.java:8084:40:8084:69 | newTable(...) : TreeBasedTable [com.google.common.collect.Table.rowKey] : Object | provenance | MaD:515 |
+| Test.java:8085:10:8085:11 | in : TreeBasedTable [com.google.common.collect.Table.rowKey] : Object | Test.java:8085:10:8085:20 | rowMap(...) : SortedMap [<map.key>] : Object | provenance | MaD:527 |
 | Test.java:8085:10:8085:20 | rowMap(...) : SortedMap [<map.key>] : Object | Test.java:8086:19:8086:21 | out : SortedMap [<map.key>] : Object | provenance |  |
 | Test.java:8086:19:8086:21 | out : SortedMap [<map.key>] : Object | Test.java:99:18:99:29 | map : SortedMap [<map.key>] : Object | provenance |  |
-| Test.java:8086:19:8086:21 | out : SortedMap [<map.key>] : Object | Test.java:8086:9:8086:22 | getMapKey(...) | provenance | MaD:562 |
+| Test.java:8086:19:8086:21 | out : SortedMap [<map.key>] : Object | Test.java:8086:9:8086:22 | getMapKey(...) | provenance | MaD:569 |
 | Test.java:8091:24:8091:69 | (...)... : TreeBasedTable [com.google.common.collect.Table.rowKey] : Object | Test.java:8092:10:8092:11 | in : TreeBasedTable [com.google.common.collect.Table.rowKey] : Object | provenance |  |
 | Test.java:8091:40:8091:69 | newTable(...) : TreeBasedTable [com.google.common.collect.Table.rowKey] : Object | Test.java:8091:24:8091:69 | (...)... : TreeBasedTable [com.google.common.collect.Table.rowKey] : Object | provenance |  |
 | Test.java:8091:49:8091:56 | source(...) : Object | Test.java:103:41:103:45 | row : Object | provenance |  |
-| Test.java:8091:49:8091:56 | source(...) : Object | Test.java:8091:40:8091:69 | newTable(...) : TreeBasedTable [com.google.common.collect.Table.rowKey] : Object | provenance | MaD:512 |
-| Test.java:8092:10:8092:11 | in : TreeBasedTable [com.google.common.collect.Table.rowKey] : Object | Test.java:8092:10:8092:20 | rowMap(...) : SortedMap [<map.key>] : Object | provenance | MaD:524 |
+| Test.java:8091:49:8091:56 | source(...) : Object | Test.java:8091:40:8091:69 | newTable(...) : TreeBasedTable [com.google.common.collect.Table.rowKey] : Object | provenance | MaD:515 |
+| Test.java:8092:10:8092:11 | in : TreeBasedTable [com.google.common.collect.Table.rowKey] : Object | Test.java:8092:10:8092:20 | rowMap(...) : SortedMap [<map.key>] : Object | provenance | MaD:527 |
 | Test.java:8092:10:8092:20 | rowMap(...) : SortedMap [<map.key>] : Object | Test.java:8093:19:8093:21 | out : SortedMap [<map.key>] : Object | provenance |  |
 | Test.java:8093:19:8093:21 | out : SortedMap [<map.key>] : Object | Test.java:99:18:99:29 | map : SortedMap [<map.key>] : Object | provenance |  |
-| Test.java:8093:19:8093:21 | out : SortedMap [<map.key>] : Object | Test.java:8093:9:8093:22 | getMapKey(...) | provenance | MaD:562 |
+| Test.java:8093:19:8093:21 | out : SortedMap [<map.key>] : Object | Test.java:8093:9:8093:22 | getMapKey(...) | provenance | MaD:569 |
 | Test.java:8098:15:8098:51 | (...)... : TreeBasedTable [com.google.common.collect.Table.rowKey] : Object | Test.java:8099:10:8099:11 | in : TreeBasedTable [com.google.common.collect.Table.rowKey] : Object | provenance |  |
 | Test.java:8098:22:8098:51 | newTable(...) : TreeBasedTable [com.google.common.collect.Table.rowKey] : Object | Test.java:8098:15:8098:51 | (...)... : TreeBasedTable [com.google.common.collect.Table.rowKey] : Object | provenance |  |
 | Test.java:8098:31:8098:38 | source(...) : Object | Test.java:103:41:103:45 | row : Object | provenance |  |
-| Test.java:8098:31:8098:38 | source(...) : Object | Test.java:8098:22:8098:51 | newTable(...) : TreeBasedTable [com.google.common.collect.Table.rowKey] : Object | provenance | MaD:512 |
-| Test.java:8099:10:8099:11 | in : TreeBasedTable [com.google.common.collect.Table.rowKey] : Object | Test.java:8099:10:8099:20 | rowMap(...) : Map [<map.key>] : Object | provenance | MaD:524 |
+| Test.java:8098:31:8098:38 | source(...) : Object | Test.java:8098:22:8098:51 | newTable(...) : TreeBasedTable [com.google.common.collect.Table.rowKey] : Object | provenance | MaD:515 |
+| Test.java:8099:10:8099:11 | in : TreeBasedTable [com.google.common.collect.Table.rowKey] : Object | Test.java:8099:10:8099:20 | rowMap(...) : Map [<map.key>] : Object | provenance | MaD:527 |
 | Test.java:8099:10:8099:20 | rowMap(...) : Map [<map.key>] : Object | Test.java:8100:19:8100:21 | out : Map [<map.key>] : Object | provenance |  |
 | Test.java:8100:19:8100:21 | out : Map [<map.key>] : Object | Test.java:99:18:99:29 | map : Map [<map.key>] : Object | provenance |  |
-| Test.java:8100:19:8100:21 | out : Map [<map.key>] : Object | Test.java:8100:9:8100:22 | getMapKey(...) | provenance | MaD:562 |
+| Test.java:8100:19:8100:21 | out : Map [<map.key>] : Object | Test.java:8100:9:8100:22 | getMapKey(...) | provenance | MaD:569 |
 | Test.java:8105:20:8105:89 | (...)... : ArrayTable [com.google.common.collect.Table.rowKey] : Object | Test.java:8106:10:8106:11 | in : ArrayTable [com.google.common.collect.Table.rowKey] : Object | provenance |  |
 | Test.java:8105:32:8105:89 | create(...) : ArrayTable [com.google.common.collect.Table.rowKey] : Object | Test.java:8105:20:8105:89 | (...)... : ArrayTable [com.google.common.collect.Table.rowKey] : Object | provenance |  |
 | Test.java:8105:50:8105:88 | of(...) : ImmutableTable [com.google.common.collect.Table.rowKey] : Object | Test.java:8105:32:8105:89 | create(...) : ArrayTable [com.google.common.collect.Table.rowKey] : Object | provenance | MaD:8 |
-| Test.java:8105:68:8105:75 | source(...) : Object | Test.java:8105:50:8105:88 | of(...) : ImmutableTable [com.google.common.collect.Table.rowKey] : Object | provenance | MaD:196 |
-| Test.java:8106:10:8106:11 | in : ArrayTable [com.google.common.collect.Table.rowKey] : Object | Test.java:8106:10:8106:20 | rowMap(...) : Map [<map.key>] : Object | provenance | MaD:524 |
+| Test.java:8105:68:8105:75 | source(...) : Object | Test.java:8105:50:8105:88 | of(...) : ImmutableTable [com.google.common.collect.Table.rowKey] : Object | provenance | MaD:213 |
+| Test.java:8106:10:8106:11 | in : ArrayTable [com.google.common.collect.Table.rowKey] : Object | Test.java:8106:10:8106:20 | rowMap(...) : Map [<map.key>] : Object | provenance | MaD:527 |
 | Test.java:8106:10:8106:20 | rowMap(...) : Map [<map.key>] : Object | Test.java:8107:19:8107:21 | out : Map [<map.key>] : Object | provenance |  |
 | Test.java:8107:19:8107:21 | out : Map [<map.key>] : Object | Test.java:99:18:99:29 | map : Map [<map.key>] : Object | provenance |  |
-| Test.java:8107:19:8107:21 | out : Map [<map.key>] : Object | Test.java:8107:9:8107:22 | getMapKey(...) | provenance | MaD:562 |
+| Test.java:8107:19:8107:21 | out : Map [<map.key>] : Object | Test.java:8107:9:8107:22 | getMapKey(...) | provenance | MaD:569 |
 | Test.java:8112:24:8112:78 | (...)... : ImmutableTable [com.google.common.collect.Table.rowKey] : Object | Test.java:8113:10:8113:11 | in : ImmutableTable [com.google.common.collect.Table.rowKey] : Object | provenance |  |
 | Test.java:8112:40:8112:78 | of(...) : ImmutableTable [com.google.common.collect.Table.rowKey] : Object | Test.java:8112:24:8112:78 | (...)... : ImmutableTable [com.google.common.collect.Table.rowKey] : Object | provenance |  |
-| Test.java:8112:58:8112:65 | source(...) : Object | Test.java:8112:40:8112:78 | of(...) : ImmutableTable [com.google.common.collect.Table.rowKey] : Object | provenance | MaD:196 |
-| Test.java:8113:10:8113:11 | in : ImmutableTable [com.google.common.collect.Table.rowKey] : Object | Test.java:8113:10:8113:20 | rowMap(...) : ImmutableMap [<map.key>] : Object | provenance | MaD:524 |
+| Test.java:8112:58:8112:65 | source(...) : Object | Test.java:8112:40:8112:78 | of(...) : ImmutableTable [com.google.common.collect.Table.rowKey] : Object | provenance | MaD:213 |
+| Test.java:8113:10:8113:11 | in : ImmutableTable [com.google.common.collect.Table.rowKey] : Object | Test.java:8113:10:8113:20 | rowMap(...) : ImmutableMap [<map.key>] : Object | provenance | MaD:527 |
 | Test.java:8113:10:8113:20 | rowMap(...) : ImmutableMap [<map.key>] : Object | Test.java:8114:19:8114:21 | out : ImmutableMap [<map.key>] : Object | provenance |  |
 | Test.java:8114:19:8114:21 | out : ImmutableMap [<map.key>] : Object | Test.java:99:18:99:29 | map : ImmutableMap [<map.key>] : Object | provenance |  |
-| Test.java:8114:19:8114:21 | out : ImmutableMap [<map.key>] : Object | Test.java:8114:9:8114:22 | getMapKey(...) | provenance | MaD:562 |
+| Test.java:8114:19:8114:21 | out : ImmutableMap [<map.key>] : Object | Test.java:8114:9:8114:22 | getMapKey(...) | provenance | MaD:569 |
 | Test.java:8119:24:8119:78 | (...)... : ImmutableTable [<map.value>] : Object | Test.java:8120:10:8120:11 | in : ImmutableTable [<map.value>] : Object | provenance |  |
 | Test.java:8119:40:8119:78 | of(...) : ImmutableTable [<map.value>] : Object | Test.java:8119:24:8119:78 | (...)... : ImmutableTable [<map.value>] : Object | provenance |  |
-| Test.java:8119:70:8119:77 | source(...) : Object | Test.java:8119:40:8119:78 | of(...) : ImmutableTable [<map.value>] : Object | provenance | MaD:198 |
-| Test.java:8120:10:8120:11 | in : ImmutableTable [<map.value>] : Object | Test.java:8120:10:8120:20 | values(...) : ImmutableCollection [<element>] : Object | provenance | MaD:525 |
+| Test.java:8119:70:8119:77 | source(...) : Object | Test.java:8119:40:8119:78 | of(...) : ImmutableTable [<map.value>] : Object | provenance | MaD:215 |
+| Test.java:8120:10:8120:11 | in : ImmutableTable [<map.value>] : Object | Test.java:8120:10:8120:20 | values(...) : ImmutableCollection [<element>] : Object | provenance | MaD:528 |
 | Test.java:8120:10:8120:20 | values(...) : ImmutableCollection [<element>] : Object | Test.java:8121:20:8121:22 | out : ImmutableCollection [<element>] : Object | provenance |  |
 | Test.java:8121:20:8121:22 | out : ImmutableCollection [<element>] : Object | Test.java:110:19:110:32 | it : ImmutableCollection [<element>] : Object | provenance |  |
-| Test.java:8121:20:8121:22 | out : ImmutableCollection [<element>] : Object | Test.java:8121:9:8121:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:8121:20:8121:22 | out : ImmutableCollection [<element>] : Object | Test.java:8121:9:8121:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:8126:15:8126:51 | (...)... : TreeBasedTable [<map.value>] : Object | Test.java:8127:10:8127:11 | in : TreeBasedTable [<map.value>] : Object | provenance |  |
 | Test.java:8126:22:8126:51 | newTable(...) : TreeBasedTable [<map.value>] : Object | Test.java:8126:15:8126:51 | (...)... : TreeBasedTable [<map.value>] : Object | provenance |  |
 | Test.java:8126:43:8126:50 | source(...) : Object | Test.java:103:58:103:64 | value : Object | provenance |  |
-| Test.java:8126:43:8126:50 | source(...) : Object | Test.java:8126:22:8126:51 | newTable(...) : TreeBasedTable [<map.value>] : Object | provenance | MaD:514 |
-| Test.java:8127:10:8127:11 | in : TreeBasedTable [<map.value>] : Object | Test.java:8127:10:8127:20 | values(...) : Collection [<element>] : Object | provenance | MaD:525 |
+| Test.java:8126:43:8126:50 | source(...) : Object | Test.java:8126:22:8126:51 | newTable(...) : TreeBasedTable [<map.value>] : Object | provenance | MaD:517 |
+| Test.java:8127:10:8127:11 | in : TreeBasedTable [<map.value>] : Object | Test.java:8127:10:8127:20 | values(...) : Collection [<element>] : Object | provenance | MaD:528 |
 | Test.java:8127:10:8127:20 | values(...) : Collection [<element>] : Object | Test.java:8128:20:8128:22 | out : Collection [<element>] : Object | provenance |  |
 | Test.java:8128:20:8128:22 | out : Collection [<element>] : Object | Test.java:110:19:110:32 | it : Collection [<element>] : Object | provenance |  |
-| Test.java:8128:20:8128:22 | out : Collection [<element>] : Object | Test.java:8128:9:8128:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:8128:20:8128:22 | out : Collection [<element>] : Object | Test.java:8128:9:8128:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:8133:20:8133:89 | (...)... : ArrayTable [<map.value>] : Object | Test.java:8134:10:8134:11 | in : ArrayTable [<map.value>] : Object | provenance |  |
 | Test.java:8133:32:8133:89 | create(...) : ArrayTable [<map.value>] : Object | Test.java:8133:20:8133:89 | (...)... : ArrayTable [<map.value>] : Object | provenance |  |
 | Test.java:8133:50:8133:88 | of(...) : ImmutableTable [<map.value>] : Object | Test.java:8133:32:8133:89 | create(...) : ArrayTable [<map.value>] : Object | provenance | MaD:6 |
-| Test.java:8133:80:8133:87 | source(...) : Object | Test.java:8133:50:8133:88 | of(...) : ImmutableTable [<map.value>] : Object | provenance | MaD:198 |
-| Test.java:8134:10:8134:11 | in : ArrayTable [<map.value>] : Object | Test.java:8134:10:8134:20 | values(...) : Collection [<element>] : Object | provenance | MaD:525 |
+| Test.java:8133:80:8133:87 | source(...) : Object | Test.java:8133:50:8133:88 | of(...) : ImmutableTable [<map.value>] : Object | provenance | MaD:215 |
+| Test.java:8134:10:8134:11 | in : ArrayTable [<map.value>] : Object | Test.java:8134:10:8134:20 | values(...) : Collection [<element>] : Object | provenance | MaD:528 |
 | Test.java:8134:10:8134:20 | values(...) : Collection [<element>] : Object | Test.java:8135:20:8135:22 | out : Collection [<element>] : Object | provenance |  |
 | Test.java:8135:20:8135:22 | out : Collection [<element>] : Object | Test.java:110:19:110:32 | it : Collection [<element>] : Object | provenance |  |
-| Test.java:8135:20:8135:22 | out : Collection [<element>] : Object | Test.java:8135:9:8135:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:8135:20:8135:22 | out : Collection [<element>] : Object | Test.java:8135:9:8135:23 | getElement(...) | provenance | MaD:558 |
 | Test.java:8140:16:8140:31 | (...)... : Object | Test.java:8141:31:8141:32 | in : Object | provenance |  |
 | Test.java:8140:24:8140:31 | source(...) : Object | Test.java:8140:16:8140:31 | (...)... : Object | provenance |  |
 | Test.java:8141:10:8141:45 | immutableCell(...) : Cell [com.google.common.collect.Table.rowKey] : Object | Test.java:8142:9:8142:11 | out : Cell [com.google.common.collect.Table.rowKey] : Object | provenance |  |
 | Test.java:8141:31:8141:32 | in : Object | Test.java:8141:10:8141:45 | immutableCell(...) : Cell [com.google.common.collect.Table.rowKey] : Object | provenance | MaD:529 |
-| Test.java:8142:9:8142:11 | out : Cell [com.google.common.collect.Table.rowKey] : Object | Test.java:8142:9:8142:23 | getRowKey(...) | provenance | MaD:527 |
+| Test.java:8142:9:8142:11 | out : Cell [com.google.common.collect.Table.rowKey] : Object | Test.java:8142:9:8142:23 | getRowKey(...) | provenance | MaD:503 |
 | Test.java:8147:16:8147:31 | (...)... : Object | Test.java:8148:37:8148:38 | in : Object | provenance |  |
 | Test.java:8147:24:8147:31 | source(...) : Object | Test.java:8147:16:8147:31 | (...)... : Object | provenance |  |
 | Test.java:8148:10:8148:45 | immutableCell(...) : Cell [com.google.common.collect.Table.columnKey] : Object | Test.java:8149:9:8149:11 | out : Cell [com.google.common.collect.Table.columnKey] : Object | provenance |  |
 | Test.java:8148:37:8148:38 | in : Object | Test.java:8148:10:8148:45 | immutableCell(...) : Cell [com.google.common.collect.Table.columnKey] : Object | provenance | MaD:530 |
-| Test.java:8149:9:8149:11 | out : Cell [com.google.common.collect.Table.columnKey] : Object | Test.java:8149:9:8149:26 | getColumnKey(...) | provenance | MaD:526 |
+| Test.java:8149:9:8149:11 | out : Cell [com.google.common.collect.Table.columnKey] : Object | Test.java:8149:9:8149:26 | getColumnKey(...) | provenance | MaD:502 |
 | Test.java:8154:16:8154:31 | (...)... : Object | Test.java:8155:43:8155:44 | in : Object | provenance |  |
 | Test.java:8154:24:8154:31 | source(...) : Object | Test.java:8154:16:8154:31 | (...)... : Object | provenance |  |
 | Test.java:8155:10:8155:45 | immutableCell(...) : Cell [<map.value>] : Object | Test.java:8156:9:8156:11 | out : Cell [<map.value>] : Object | provenance |  |
 | Test.java:8155:43:8155:44 | in : Object | Test.java:8155:10:8155:45 | immutableCell(...) : Cell [<map.value>] : Object | provenance | MaD:531 |
-| Test.java:8156:9:8156:11 | out : Cell [<map.value>] : Object | Test.java:8156:9:8156:22 | getValue(...) | provenance | MaD:528 |
+| Test.java:8156:9:8156:11 | out : Cell [<map.value>] : Object | Test.java:8156:9:8156:22 | getValue(...) | provenance | MaD:504 |
 | Test.java:8161:13:8161:39 | (...)... : Map [<map.key>] : Object | Test.java:8162:32:8162:33 | in : Map [<map.key>] : Object | provenance |  |
 | Test.java:8161:18:8161:39 | of(...) : Map [<map.key>] : Object | Test.java:8161:13:8161:39 | (...)... : Map [<map.key>] : Object | provenance |  |
-| Test.java:8161:25:8161:32 | source(...) : Object | Test.java:8161:18:8161:39 | of(...) : Map [<map.key>] : Object | provenance | MaD:563 |
+| Test.java:8161:25:8161:32 | source(...) : Object | Test.java:8161:18:8161:39 | of(...) : Map [<map.key>] : Object | provenance | MaD:564 |
 | Test.java:8162:10:8162:40 | newCustomTable(...) : Table [com.google.common.collect.Table.rowKey] : Object | Test.java:8163:25:8163:27 | out : Table [com.google.common.collect.Table.rowKey] : Object | provenance |  |
 | Test.java:8162:32:8162:33 | in : Map [<map.key>] : Object | Test.java:8162:10:8162:40 | newCustomTable(...) : Table [com.google.common.collect.Table.rowKey] : Object | provenance | MaD:532 |
 | Test.java:8163:25:8163:27 | out : Table [com.google.common.collect.Table.rowKey] : Object | Test.java:105:24:105:37 | t : Table [com.google.common.collect.Table.rowKey] : Object | provenance |  |
-| Test.java:8163:25:8163:27 | out : Table [com.google.common.collect.Table.rowKey] : Object | Test.java:8163:9:8163:28 | getTable_rowKey(...) | provenance | MaD:521 |
+| Test.java:8163:25:8163:27 | out : Table [com.google.common.collect.Table.rowKey] : Object | Test.java:8163:9:8163:28 | getTable_rowKey(...) | provenance | MaD:524 |
 | Test.java:8168:13:8168:53 | (...)... : Map [<map.value>, <map.key>] : Object | Test.java:8169:32:8169:33 | in : Map [<map.value>, <map.key>] : Object | provenance |  |
 | Test.java:8168:18:8168:53 | of(...) : Map [<map.value>, <map.key>] : Object | Test.java:8168:13:8168:53 | (...)... : Map [<map.value>, <map.key>] : Object | provenance |  |
-| Test.java:8168:31:8168:52 | of(...) : Map [<map.key>] : Object | Test.java:8168:18:8168:53 | of(...) : Map [<map.value>, <map.key>] : Object | provenance | MaD:564 |
-| Test.java:8168:38:8168:45 | source(...) : Object | Test.java:8168:31:8168:52 | of(...) : Map [<map.key>] : Object | provenance | MaD:563 |
+| Test.java:8168:31:8168:52 | of(...) : Map [<map.key>] : Object | Test.java:8168:18:8168:53 | of(...) : Map [<map.value>, <map.key>] : Object | provenance | MaD:565 |
+| Test.java:8168:38:8168:45 | source(...) : Object | Test.java:8168:31:8168:52 | of(...) : Map [<map.key>] : Object | provenance | MaD:564 |
 | Test.java:8169:10:8169:40 | newCustomTable(...) : Table [com.google.common.collect.Table.columnKey] : Object | Test.java:8170:28:8170:30 | out : Table [com.google.common.collect.Table.columnKey] : Object | provenance |  |
 | Test.java:8169:32:8169:33 | in : Map [<map.value>, <map.key>] : Object | Test.java:8169:10:8169:40 | newCustomTable(...) : Table [com.google.common.collect.Table.columnKey] : Object | provenance | MaD:533 |
 | Test.java:8170:28:8170:30 | out : Table [com.google.common.collect.Table.columnKey] : Object | Test.java:96:27:96:40 | t : Table [com.google.common.collect.Table.columnKey] : Object | provenance |  |
-| Test.java:8170:28:8170:30 | out : Table [com.google.common.collect.Table.columnKey] : Object | Test.java:8170:9:8170:31 | getTable_columnKey(...) | provenance | MaD:507 |
+| Test.java:8170:28:8170:30 | out : Table [com.google.common.collect.Table.columnKey] : Object | Test.java:8170:9:8170:31 | getTable_columnKey(...) | provenance | MaD:510 |
 | Test.java:8175:13:8175:53 | (...)... : Map [<map.value>, <map.value>] : Object | Test.java:8176:32:8176:33 | in : Map [<map.value>, <map.value>] : Object | provenance |  |
 | Test.java:8175:18:8175:53 | of(...) : Map [<map.value>, <map.value>] : Object | Test.java:8175:13:8175:53 | (...)... : Map [<map.value>, <map.value>] : Object | provenance |  |
-| Test.java:8175:31:8175:52 | of(...) : Map [<map.value>] : Object | Test.java:8175:18:8175:53 | of(...) : Map [<map.value>, <map.value>] : Object | provenance | MaD:564 |
-| Test.java:8175:44:8175:51 | source(...) : Object | Test.java:8175:31:8175:52 | of(...) : Map [<map.value>] : Object | provenance | MaD:564 |
+| Test.java:8175:31:8175:52 | of(...) : Map [<map.value>] : Object | Test.java:8175:18:8175:53 | of(...) : Map [<map.value>, <map.value>] : Object | provenance | MaD:565 |
+| Test.java:8175:44:8175:51 | source(...) : Object | Test.java:8175:31:8175:52 | of(...) : Map [<map.value>] : Object | provenance | MaD:565 |
 | Test.java:8176:10:8176:40 | newCustomTable(...) : Table [<map.value>] : Object | Test.java:8177:21:8177:23 | out : Table [<map.value>] : Object | provenance |  |
 | Test.java:8176:32:8176:33 | in : Map [<map.value>, <map.value>] : Object | Test.java:8176:10:8176:40 | newCustomTable(...) : Table [<map.value>] : Object | provenance | MaD:534 |
 | Test.java:8177:21:8177:23 | out : Table [<map.value>] : Object | Test.java:120:20:120:33 | t : Table [<map.value>] : Object | provenance |  |
-| Test.java:8177:21:8177:23 | out : Table [<map.value>] : Object | Test.java:8177:9:8177:24 | getMapValue(...) | provenance | MaD:525 |
+| Test.java:8177:21:8177:23 | out : Table [<map.value>] : Object | Test.java:8177:9:8177:24 | getMapValue(...) | provenance | MaD:528 |
 | Test.java:8182:15:8182:51 | (...)... : TreeBasedTable [<map.value>] : Object | Test.java:8183:35:8183:36 | in : TreeBasedTable [<map.value>] : Object | provenance |  |
 | Test.java:8182:22:8182:51 | newTable(...) : TreeBasedTable [<map.value>] : Object | Test.java:8182:15:8182:51 | (...)... : TreeBasedTable [<map.value>] : Object | provenance |  |
 | Test.java:8182:43:8182:50 | source(...) : Object | Test.java:103:58:103:64 | value : Object | provenance |  |
-| Test.java:8182:43:8182:50 | source(...) : Object | Test.java:8182:22:8182:51 | newTable(...) : TreeBasedTable [<map.value>] : Object | provenance | MaD:514 |
+| Test.java:8182:43:8182:50 | source(...) : Object | Test.java:8182:22:8182:51 | newTable(...) : TreeBasedTable [<map.value>] : Object | provenance | MaD:517 |
 | Test.java:8183:10:8183:37 | synchronizedTable(...) : Table [<map.value>] : Object | Test.java:8184:21:8184:23 | out : Table [<map.value>] : Object | provenance |  |
 | Test.java:8183:35:8183:36 | in : TreeBasedTable [<map.value>] : Object | Test.java:8183:10:8183:37 | synchronizedTable(...) : Table [<map.value>] : Object | provenance | MaD:535 |
 | Test.java:8184:21:8184:23 | out : Table [<map.value>] : Object | Test.java:120:20:120:33 | t : Table [<map.value>] : Object | provenance |  |
-| Test.java:8184:21:8184:23 | out : Table [<map.value>] : Object | Test.java:8184:9:8184:24 | getMapValue(...) | provenance | MaD:525 |
+| Test.java:8184:21:8184:23 | out : Table [<map.value>] : Object | Test.java:8184:9:8184:24 | getMapValue(...) | provenance | MaD:528 |
 | Test.java:8189:15:8189:51 | (...)... : TreeBasedTable [com.google.common.collect.Table.columnKey] : Object | Test.java:8190:35:8190:36 | in : TreeBasedTable [com.google.common.collect.Table.columnKey] : Object | provenance |  |
 | Test.java:8189:22:8189:51 | newTable(...) : TreeBasedTable [com.google.common.collect.Table.columnKey] : Object | Test.java:8189:15:8189:51 | (...)... : TreeBasedTable [com.google.common.collect.Table.columnKey] : Object | provenance |  |
 | Test.java:8189:37:8189:44 | source(...) : Object | Test.java:103:48:103:55 | column : Object | provenance |  |
-| Test.java:8189:37:8189:44 | source(...) : Object | Test.java:8189:22:8189:51 | newTable(...) : TreeBasedTable [com.google.common.collect.Table.columnKey] : Object | provenance | MaD:513 |
+| Test.java:8189:37:8189:44 | source(...) : Object | Test.java:8189:22:8189:51 | newTable(...) : TreeBasedTable [com.google.common.collect.Table.columnKey] : Object | provenance | MaD:516 |
 | Test.java:8190:10:8190:37 | synchronizedTable(...) : Table [com.google.common.collect.Table.columnKey] : Object | Test.java:8191:28:8191:30 | out : Table [com.google.common.collect.Table.columnKey] : Object | provenance |  |
 | Test.java:8190:35:8190:36 | in : TreeBasedTable [com.google.common.collect.Table.columnKey] : Object | Test.java:8190:10:8190:37 | synchronizedTable(...) : Table [com.google.common.collect.Table.columnKey] : Object | provenance | MaD:536 |
 | Test.java:8191:28:8191:30 | out : Table [com.google.common.collect.Table.columnKey] : Object | Test.java:96:27:96:40 | t : Table [com.google.common.collect.Table.columnKey] : Object | provenance |  |
-| Test.java:8191:28:8191:30 | out : Table [com.google.common.collect.Table.columnKey] : Object | Test.java:8191:9:8191:31 | getTable_columnKey(...) | provenance | MaD:507 |
+| Test.java:8191:28:8191:30 | out : Table [com.google.common.collect.Table.columnKey] : Object | Test.java:8191:9:8191:31 | getTable_columnKey(...) | provenance | MaD:510 |
 | Test.java:8196:15:8196:51 | (...)... : TreeBasedTable [com.google.common.collect.Table.rowKey] : Object | Test.java:8197:35:8197:36 | in : TreeBasedTable [com.google.common.collect.Table.rowKey] : Object | provenance |  |
 | Test.java:8196:22:8196:51 | newTable(...) : TreeBasedTable [com.google.common.collect.Table.rowKey] : Object | Test.java:8196:15:8196:51 | (...)... : TreeBasedTable [com.google.common.collect.Table.rowKey] : Object | provenance |  |
 | Test.java:8196:31:8196:38 | source(...) : Object | Test.java:103:41:103:45 | row : Object | provenance |  |
-| Test.java:8196:31:8196:38 | source(...) : Object | Test.java:8196:22:8196:51 | newTable(...) : TreeBasedTable [com.google.common.collect.Table.rowKey] : Object | provenance | MaD:512 |
+| Test.java:8196:31:8196:38 | source(...) : Object | Test.java:8196:22:8196:51 | newTable(...) : TreeBasedTable [com.google.common.collect.Table.rowKey] : Object | provenance | MaD:515 |
 | Test.java:8197:10:8197:37 | synchronizedTable(...) : Table [com.google.common.collect.Table.rowKey] : Object | Test.java:8198:25:8198:27 | out : Table [com.google.common.collect.Table.rowKey] : Object | provenance |  |
 | Test.java:8197:35:8197:36 | in : TreeBasedTable [com.google.common.collect.Table.rowKey] : Object | Test.java:8197:10:8197:37 | synchronizedTable(...) : Table [com.google.common.collect.Table.rowKey] : Object | provenance | MaD:537 |
 | Test.java:8198:25:8198:27 | out : Table [com.google.common.collect.Table.rowKey] : Object | Test.java:105:24:105:37 | t : Table [com.google.common.collect.Table.rowKey] : Object | provenance |  |
-| Test.java:8198:25:8198:27 | out : Table [com.google.common.collect.Table.rowKey] : Object | Test.java:8198:9:8198:28 | getTable_rowKey(...) | provenance | MaD:521 |
+| Test.java:8198:25:8198:27 | out : Table [com.google.common.collect.Table.rowKey] : Object | Test.java:8198:9:8198:28 | getTable_rowKey(...) | provenance | MaD:524 |
 | Test.java:8203:15:8203:51 | (...)... : TreeBasedTable [com.google.common.collect.Table.columnKey] : Object | Test.java:8204:33:8204:34 | in : TreeBasedTable [com.google.common.collect.Table.columnKey] : Object | provenance |  |
 | Test.java:8203:22:8203:51 | newTable(...) : TreeBasedTable [com.google.common.collect.Table.columnKey] : Object | Test.java:8203:15:8203:51 | (...)... : TreeBasedTable [com.google.common.collect.Table.columnKey] : Object | provenance |  |
 | Test.java:8203:37:8203:44 | source(...) : Object | Test.java:103:48:103:55 | column : Object | provenance |  |
-| Test.java:8203:37:8203:44 | source(...) : Object | Test.java:8203:22:8203:51 | newTable(...) : TreeBasedTable [com.google.common.collect.Table.columnKey] : Object | provenance | MaD:513 |
+| Test.java:8203:37:8203:44 | source(...) : Object | Test.java:8203:22:8203:51 | newTable(...) : TreeBasedTable [com.google.common.collect.Table.columnKey] : Object | provenance | MaD:516 |
 | Test.java:8204:10:8204:41 | transformValues(...) : Table [com.google.common.collect.Table.columnKey] : Object | Test.java:8205:28:8205:30 | out : Table [com.google.common.collect.Table.columnKey] : Object | provenance |  |
 | Test.java:8204:33:8204:34 | in : TreeBasedTable [com.google.common.collect.Table.columnKey] : Object | Test.java:8204:10:8204:41 | transformValues(...) : Table [com.google.common.collect.Table.columnKey] : Object | provenance | MaD:538 |
 | Test.java:8205:28:8205:30 | out : Table [com.google.common.collect.Table.columnKey] : Object | Test.java:96:27:96:40 | t : Table [com.google.common.collect.Table.columnKey] : Object | provenance |  |
-| Test.java:8205:28:8205:30 | out : Table [com.google.common.collect.Table.columnKey] : Object | Test.java:8205:9:8205:31 | getTable_columnKey(...) | provenance | MaD:507 |
+| Test.java:8205:28:8205:30 | out : Table [com.google.common.collect.Table.columnKey] : Object | Test.java:8205:9:8205:31 | getTable_columnKey(...) | provenance | MaD:510 |
 | Test.java:8210:15:8210:51 | (...)... : TreeBasedTable [com.google.common.collect.Table.rowKey] : Object | Test.java:8211:33:8211:34 | in : TreeBasedTable [com.google.common.collect.Table.rowKey] : Object | provenance |  |
 | Test.java:8210:22:8210:51 | newTable(...) : TreeBasedTable [com.google.common.collect.Table.rowKey] : Object | Test.java:8210:15:8210:51 | (...)... : TreeBasedTable [com.google.common.collect.Table.rowKey] : Object | provenance |  |
 | Test.java:8210:31:8210:38 | source(...) : Object | Test.java:103:41:103:45 | row : Object | provenance |  |
-| Test.java:8210:31:8210:38 | source(...) : Object | Test.java:8210:22:8210:51 | newTable(...) : TreeBasedTable [com.google.common.collect.Table.rowKey] : Object | provenance | MaD:512 |
+| Test.java:8210:31:8210:38 | source(...) : Object | Test.java:8210:22:8210:51 | newTable(...) : TreeBasedTable [com.google.common.collect.Table.rowKey] : Object | provenance | MaD:515 |
 | Test.java:8211:10:8211:41 | transformValues(...) : Table [com.google.common.collect.Table.rowKey] : Object | Test.java:8212:25:8212:27 | out : Table [com.google.common.collect.Table.rowKey] : Object | provenance |  |
 | Test.java:8211:33:8211:34 | in : TreeBasedTable [com.google.common.collect.Table.rowKey] : Object | Test.java:8211:10:8211:41 | transformValues(...) : Table [com.google.common.collect.Table.rowKey] : Object | provenance | MaD:539 |
 | Test.java:8212:25:8212:27 | out : Table [com.google.common.collect.Table.rowKey] : Object | Test.java:105:24:105:37 | t : Table [com.google.common.collect.Table.rowKey] : Object | provenance |  |
-| Test.java:8212:25:8212:27 | out : Table [com.google.common.collect.Table.rowKey] : Object | Test.java:8212:9:8212:28 | getTable_rowKey(...) | provenance | MaD:521 |
+| Test.java:8212:25:8212:27 | out : Table [com.google.common.collect.Table.rowKey] : Object | Test.java:8212:9:8212:28 | getTable_rowKey(...) | provenance | MaD:524 |
 | Test.java:8217:15:8217:51 | (...)... : TreeBasedTable [<map.value>] : Object | Test.java:8218:27:8218:28 | in : TreeBasedTable [<map.value>] : Object | provenance |  |
 | Test.java:8217:22:8217:51 | newTable(...) : TreeBasedTable [<map.value>] : Object | Test.java:8217:15:8217:51 | (...)... : TreeBasedTable [<map.value>] : Object | provenance |  |
 | Test.java:8217:43:8217:50 | source(...) : Object | Test.java:103:58:103:64 | value : Object | provenance |  |
-| Test.java:8217:43:8217:50 | source(...) : Object | Test.java:8217:22:8217:51 | newTable(...) : TreeBasedTable [<map.value>] : Object | provenance | MaD:514 |
+| Test.java:8217:43:8217:50 | source(...) : Object | Test.java:8217:22:8217:51 | newTable(...) : TreeBasedTable [<map.value>] : Object | provenance | MaD:517 |
 | Test.java:8218:10:8218:29 | transpose(...) : Table [<map.value>] : Object | Test.java:8219:21:8219:23 | out : Table [<map.value>] : Object | provenance |  |
 | Test.java:8218:27:8218:28 | in : TreeBasedTable [<map.value>] : Object | Test.java:8218:10:8218:29 | transpose(...) : Table [<map.value>] : Object | provenance | MaD:540 |
 | Test.java:8219:21:8219:23 | out : Table [<map.value>] : Object | Test.java:120:20:120:33 | t : Table [<map.value>] : Object | provenance |  |
-| Test.java:8219:21:8219:23 | out : Table [<map.value>] : Object | Test.java:8219:9:8219:24 | getMapValue(...) | provenance | MaD:525 |
+| Test.java:8219:21:8219:23 | out : Table [<map.value>] : Object | Test.java:8219:9:8219:24 | getMapValue(...) | provenance | MaD:528 |
 | Test.java:8224:15:8224:51 | (...)... : TreeBasedTable [com.google.common.collect.Table.columnKey] : Object | Test.java:8225:27:8225:28 | in : TreeBasedTable [com.google.common.collect.Table.columnKey] : Object | provenance |  |
 | Test.java:8224:22:8224:51 | newTable(...) : TreeBasedTable [com.google.common.collect.Table.columnKey] : Object | Test.java:8224:15:8224:51 | (...)... : TreeBasedTable [com.google.common.collect.Table.columnKey] : Object | provenance |  |
 | Test.java:8224:37:8224:44 | source(...) : Object | Test.java:103:48:103:55 | column : Object | provenance |  |
-| Test.java:8224:37:8224:44 | source(...) : Object | Test.java:8224:22:8224:51 | newTable(...) : TreeBasedTable [com.google.common.collect.Table.columnKey] : Object | provenance | MaD:513 |
+| Test.java:8224:37:8224:44 | source(...) : Object | Test.java:8224:22:8224:51 | newTable(...) : TreeBasedTable [com.google.common.collect.Table.columnKey] : Object | provenance | MaD:516 |
 | Test.java:8225:10:8225:29 | transpose(...) : Table [com.google.common.collect.Table.rowKey] : Object | Test.java:8226:25:8226:27 | out : Table [com.google.common.collect.Table.rowKey] : Object | provenance |  |
 | Test.java:8225:27:8225:28 | in : TreeBasedTable [com.google.common.collect.Table.columnKey] : Object | Test.java:8225:10:8225:29 | transpose(...) : Table [com.google.common.collect.Table.rowKey] : Object | provenance | MaD:541 |
 | Test.java:8226:25:8226:27 | out : Table [com.google.common.collect.Table.rowKey] : Object | Test.java:105:24:105:37 | t : Table [com.google.common.collect.Table.rowKey] : Object | provenance |  |
-| Test.java:8226:25:8226:27 | out : Table [com.google.common.collect.Table.rowKey] : Object | Test.java:8226:9:8226:28 | getTable_rowKey(...) | provenance | MaD:521 |
+| Test.java:8226:25:8226:27 | out : Table [com.google.common.collect.Table.rowKey] : Object | Test.java:8226:9:8226:28 | getTable_rowKey(...) | provenance | MaD:524 |
 | Test.java:8231:15:8231:51 | (...)... : TreeBasedTable [com.google.common.collect.Table.rowKey] : Object | Test.java:8232:27:8232:28 | in : TreeBasedTable [com.google.common.collect.Table.rowKey] : Object | provenance |  |
 | Test.java:8231:22:8231:51 | newTable(...) : TreeBasedTable [com.google.common.collect.Table.rowKey] : Object | Test.java:8231:15:8231:51 | (...)... : TreeBasedTable [com.google.common.collect.Table.rowKey] : Object | provenance |  |
 | Test.java:8231:31:8231:38 | source(...) : Object | Test.java:103:41:103:45 | row : Object | provenance |  |
-| Test.java:8231:31:8231:38 | source(...) : Object | Test.java:8231:22:8231:51 | newTable(...) : TreeBasedTable [com.google.common.collect.Table.rowKey] : Object | provenance | MaD:512 |
+| Test.java:8231:31:8231:38 | source(...) : Object | Test.java:8231:22:8231:51 | newTable(...) : TreeBasedTable [com.google.common.collect.Table.rowKey] : Object | provenance | MaD:515 |
 | Test.java:8232:10:8232:29 | transpose(...) : Table [com.google.common.collect.Table.columnKey] : Object | Test.java:8233:28:8233:30 | out : Table [com.google.common.collect.Table.columnKey] : Object | provenance |  |
 | Test.java:8232:27:8232:28 | in : TreeBasedTable [com.google.common.collect.Table.rowKey] : Object | Test.java:8232:10:8232:29 | transpose(...) : Table [com.google.common.collect.Table.columnKey] : Object | provenance | MaD:542 |
 | Test.java:8233:28:8233:30 | out : Table [com.google.common.collect.Table.columnKey] : Object | Test.java:96:27:96:40 | t : Table [com.google.common.collect.Table.columnKey] : Object | provenance |  |
-| Test.java:8233:28:8233:30 | out : Table [com.google.common.collect.Table.columnKey] : Object | Test.java:8233:9:8233:31 | getTable_columnKey(...) | provenance | MaD:507 |
+| Test.java:8233:28:8233:30 | out : Table [com.google.common.collect.Table.columnKey] : Object | Test.java:8233:9:8233:31 | getTable_columnKey(...) | provenance | MaD:510 |
 | Test.java:8238:24:8238:69 | (...)... : TreeBasedTable [<map.value>] : Object | Test.java:8239:44:8239:45 | in : TreeBasedTable [<map.value>] : Object | provenance |  |
 | Test.java:8238:40:8238:69 | newTable(...) : TreeBasedTable [<map.value>] : Object | Test.java:8238:24:8238:69 | (...)... : TreeBasedTable [<map.value>] : Object | provenance |  |
 | Test.java:8238:61:8238:68 | source(...) : Object | Test.java:103:58:103:64 | value : Object | provenance |  |
-| Test.java:8238:61:8238:68 | source(...) : Object | Test.java:8238:40:8238:69 | newTable(...) : TreeBasedTable [<map.value>] : Object | provenance | MaD:514 |
+| Test.java:8238:61:8238:68 | source(...) : Object | Test.java:8238:40:8238:69 | newTable(...) : TreeBasedTable [<map.value>] : Object | provenance | MaD:517 |
 | Test.java:8239:10:8239:46 | unmodifiableRowSortedTable(...) : RowSortedTable [<map.value>] : Object | Test.java:8240:21:8240:23 | out : RowSortedTable [<map.value>] : Object | provenance |  |
 | Test.java:8239:44:8239:45 | in : TreeBasedTable [<map.value>] : Object | Test.java:8239:10:8239:46 | unmodifiableRowSortedTable(...) : RowSortedTable [<map.value>] : Object | provenance | MaD:543 |
 | Test.java:8240:21:8240:23 | out : RowSortedTable [<map.value>] : Object | Test.java:120:20:120:33 | t : RowSortedTable [<map.value>] : Object | provenance |  |
-| Test.java:8240:21:8240:23 | out : RowSortedTable [<map.value>] : Object | Test.java:8240:9:8240:24 | getMapValue(...) | provenance | MaD:525 |
+| Test.java:8240:21:8240:23 | out : RowSortedTable [<map.value>] : Object | Test.java:8240:9:8240:24 | getMapValue(...) | provenance | MaD:528 |
 | Test.java:8245:24:8245:69 | (...)... : TreeBasedTable [com.google.common.collect.Table.columnKey] : Object | Test.java:8246:44:8246:45 | in : TreeBasedTable [com.google.common.collect.Table.columnKey] : Object | provenance |  |
 | Test.java:8245:40:8245:69 | newTable(...) : TreeBasedTable [com.google.common.collect.Table.columnKey] : Object | Test.java:8245:24:8245:69 | (...)... : TreeBasedTable [com.google.common.collect.Table.columnKey] : Object | provenance |  |
 | Test.java:8245:55:8245:62 | source(...) : Object | Test.java:103:48:103:55 | column : Object | provenance |  |
-| Test.java:8245:55:8245:62 | source(...) : Object | Test.java:8245:40:8245:69 | newTable(...) : TreeBasedTable [com.google.common.collect.Table.columnKey] : Object | provenance | MaD:513 |
+| Test.java:8245:55:8245:62 | source(...) : Object | Test.java:8245:40:8245:69 | newTable(...) : TreeBasedTable [com.google.common.collect.Table.columnKey] : Object | provenance | MaD:516 |
 | Test.java:8246:10:8246:46 | unmodifiableRowSortedTable(...) : RowSortedTable [com.google.common.collect.Table.columnKey] : Object | Test.java:8247:28:8247:30 | out : RowSortedTable [com.google.common.collect.Table.columnKey] : Object | provenance |  |
 | Test.java:8246:44:8246:45 | in : TreeBasedTable [com.google.common.collect.Table.columnKey] : Object | Test.java:8246:10:8246:46 | unmodifiableRowSortedTable(...) : RowSortedTable [com.google.common.collect.Table.columnKey] : Object | provenance | MaD:544 |
 | Test.java:8247:28:8247:30 | out : RowSortedTable [com.google.common.collect.Table.columnKey] : Object | Test.java:96:27:96:40 | t : RowSortedTable [com.google.common.collect.Table.columnKey] : Object | provenance |  |
-| Test.java:8247:28:8247:30 | out : RowSortedTable [com.google.common.collect.Table.columnKey] : Object | Test.java:8247:9:8247:31 | getTable_columnKey(...) | provenance | MaD:507 |
+| Test.java:8247:28:8247:30 | out : RowSortedTable [com.google.common.collect.Table.columnKey] : Object | Test.java:8247:9:8247:31 | getTable_columnKey(...) | provenance | MaD:510 |
 | Test.java:8252:24:8252:69 | (...)... : TreeBasedTable [com.google.common.collect.Table.rowKey] : Object | Test.java:8253:44:8253:45 | in : TreeBasedTable [com.google.common.collect.Table.rowKey] : Object | provenance |  |
 | Test.java:8252:40:8252:69 | newTable(...) : TreeBasedTable [com.google.common.collect.Table.rowKey] : Object | Test.java:8252:24:8252:69 | (...)... : TreeBasedTable [com.google.common.collect.Table.rowKey] : Object | provenance |  |
 | Test.java:8252:49:8252:56 | source(...) : Object | Test.java:103:41:103:45 | row : Object | provenance |  |
-| Test.java:8252:49:8252:56 | source(...) : Object | Test.java:8252:40:8252:69 | newTable(...) : TreeBasedTable [com.google.common.collect.Table.rowKey] : Object | provenance | MaD:512 |
+| Test.java:8252:49:8252:56 | source(...) : Object | Test.java:8252:40:8252:69 | newTable(...) : TreeBasedTable [com.google.common.collect.Table.rowKey] : Object | provenance | MaD:515 |
 | Test.java:8253:10:8253:46 | unmodifiableRowSortedTable(...) : RowSortedTable [com.google.common.collect.Table.rowKey] : Object | Test.java:8254:25:8254:27 | out : RowSortedTable [com.google.common.collect.Table.rowKey] : Object | provenance |  |
 | Test.java:8253:44:8253:45 | in : TreeBasedTable [com.google.common.collect.Table.rowKey] : Object | Test.java:8253:10:8253:46 | unmodifiableRowSortedTable(...) : RowSortedTable [com.google.common.collect.Table.rowKey] : Object | provenance | MaD:545 |
 | Test.java:8254:25:8254:27 | out : RowSortedTable [com.google.common.collect.Table.rowKey] : Object | Test.java:105:24:105:37 | t : RowSortedTable [com.google.common.collect.Table.rowKey] : Object | provenance |  |
-| Test.java:8254:25:8254:27 | out : RowSortedTable [com.google.common.collect.Table.rowKey] : Object | Test.java:8254:9:8254:28 | getTable_rowKey(...) | provenance | MaD:521 |
+| Test.java:8254:25:8254:27 | out : RowSortedTable [com.google.common.collect.Table.rowKey] : Object | Test.java:8254:9:8254:28 | getTable_rowKey(...) | provenance | MaD:524 |
 | Test.java:8259:15:8259:51 | (...)... : TreeBasedTable [<map.value>] : Object | Test.java:8260:35:8260:36 | in : TreeBasedTable [<map.value>] : Object | provenance |  |
 | Test.java:8259:22:8259:51 | newTable(...) : TreeBasedTable [<map.value>] : Object | Test.java:8259:15:8259:51 | (...)... : TreeBasedTable [<map.value>] : Object | provenance |  |
 | Test.java:8259:43:8259:50 | source(...) : Object | Test.java:103:58:103:64 | value : Object | provenance |  |
-| Test.java:8259:43:8259:50 | source(...) : Object | Test.java:8259:22:8259:51 | newTable(...) : TreeBasedTable [<map.value>] : Object | provenance | MaD:514 |
+| Test.java:8259:43:8259:50 | source(...) : Object | Test.java:8259:22:8259:51 | newTable(...) : TreeBasedTable [<map.value>] : Object | provenance | MaD:517 |
 | Test.java:8260:10:8260:37 | unmodifiableTable(...) : Table [<map.value>] : Object | Test.java:8261:21:8261:23 | out : Table [<map.value>] : Object | provenance |  |
 | Test.java:8260:35:8260:36 | in : TreeBasedTable [<map.value>] : Object | Test.java:8260:10:8260:37 | unmodifiableTable(...) : Table [<map.value>] : Object | provenance | MaD:546 |
 | Test.java:8261:21:8261:23 | out : Table [<map.value>] : Object | Test.java:120:20:120:33 | t : Table [<map.value>] : Object | provenance |  |
-| Test.java:8261:21:8261:23 | out : Table [<map.value>] : Object | Test.java:8261:9:8261:24 | getMapValue(...) | provenance | MaD:525 |
+| Test.java:8261:21:8261:23 | out : Table [<map.value>] : Object | Test.java:8261:9:8261:24 | getMapValue(...) | provenance | MaD:528 |
 | Test.java:8266:15:8266:51 | (...)... : TreeBasedTable [com.google.common.collect.Table.columnKey] : Object | Test.java:8267:35:8267:36 | in : TreeBasedTable [com.google.common.collect.Table.columnKey] : Object | provenance |  |
 | Test.java:8266:22:8266:51 | newTable(...) : TreeBasedTable [com.google.common.collect.Table.columnKey] : Object | Test.java:8266:15:8266:51 | (...)... : TreeBasedTable [com.google.common.collect.Table.columnKey] : Object | provenance |  |
 | Test.java:8266:37:8266:44 | source(...) : Object | Test.java:103:48:103:55 | column : Object | provenance |  |
-| Test.java:8266:37:8266:44 | source(...) : Object | Test.java:8266:22:8266:51 | newTable(...) : TreeBasedTable [com.google.common.collect.Table.columnKey] : Object | provenance | MaD:513 |
+| Test.java:8266:37:8266:44 | source(...) : Object | Test.java:8266:22:8266:51 | newTable(...) : TreeBasedTable [com.google.common.collect.Table.columnKey] : Object | provenance | MaD:516 |
 | Test.java:8267:10:8267:37 | unmodifiableTable(...) : Table [com.google.common.collect.Table.columnKey] : Object | Test.java:8268:28:8268:30 | out : Table [com.google.common.collect.Table.columnKey] : Object | provenance |  |
 | Test.java:8267:35:8267:36 | in : TreeBasedTable [com.google.common.collect.Table.columnKey] : Object | Test.java:8267:10:8267:37 | unmodifiableTable(...) : Table [com.google.common.collect.Table.columnKey] : Object | provenance | MaD:547 |
 | Test.java:8268:28:8268:30 | out : Table [com.google.common.collect.Table.columnKey] : Object | Test.java:96:27:96:40 | t : Table [com.google.common.collect.Table.columnKey] : Object | provenance |  |
-| Test.java:8268:28:8268:30 | out : Table [com.google.common.collect.Table.columnKey] : Object | Test.java:8268:9:8268:31 | getTable_columnKey(...) | provenance | MaD:507 |
+| Test.java:8268:28:8268:30 | out : Table [com.google.common.collect.Table.columnKey] : Object | Test.java:8268:9:8268:31 | getTable_columnKey(...) | provenance | MaD:510 |
 | Test.java:8273:15:8273:51 | (...)... : TreeBasedTable [com.google.common.collect.Table.rowKey] : Object | Test.java:8274:35:8274:36 | in : TreeBasedTable [com.google.common.collect.Table.rowKey] : Object | provenance |  |
 | Test.java:8273:22:8273:51 | newTable(...) : TreeBasedTable [com.google.common.collect.Table.rowKey] : Object | Test.java:8273:15:8273:51 | (...)... : TreeBasedTable [com.google.common.collect.Table.rowKey] : Object | provenance |  |
 | Test.java:8273:31:8273:38 | source(...) : Object | Test.java:103:41:103:45 | row : Object | provenance |  |
-| Test.java:8273:31:8273:38 | source(...) : Object | Test.java:8273:22:8273:51 | newTable(...) : TreeBasedTable [com.google.common.collect.Table.rowKey] : Object | provenance | MaD:512 |
+| Test.java:8273:31:8273:38 | source(...) : Object | Test.java:8273:22:8273:51 | newTable(...) : TreeBasedTable [com.google.common.collect.Table.rowKey] : Object | provenance | MaD:515 |
 | Test.java:8274:10:8274:37 | unmodifiableTable(...) : Table [com.google.common.collect.Table.rowKey] : Object | Test.java:8275:25:8275:27 | out : Table [com.google.common.collect.Table.rowKey] : Object | provenance |  |
 | Test.java:8274:35:8274:36 | in : TreeBasedTable [com.google.common.collect.Table.rowKey] : Object | Test.java:8274:10:8274:37 | unmodifiableTable(...) : Table [com.google.common.collect.Table.rowKey] : Object | provenance | MaD:548 |
 | Test.java:8275:25:8275:27 | out : Table [com.google.common.collect.Table.rowKey] : Object | Test.java:105:24:105:37 | t : Table [com.google.common.collect.Table.rowKey] : Object | provenance |  |
-| Test.java:8275:25:8275:27 | out : Table [com.google.common.collect.Table.rowKey] : Object | Test.java:8275:9:8275:28 | getTable_rowKey(...) | provenance | MaD:521 |
+| Test.java:8275:25:8275:27 | out : Table [com.google.common.collect.Table.rowKey] : Object | Test.java:8275:9:8275:28 | getTable_rowKey(...) | provenance | MaD:524 |
 | Test.java:8280:24:8280:69 | (...)... : TreeBasedTable [<map.value>] : Object | Test.java:8281:32:8281:33 | in : TreeBasedTable [<map.value>] : Object | provenance |  |
 | Test.java:8280:40:8280:69 | newTable(...) : TreeBasedTable [<map.value>] : Object | Test.java:8280:24:8280:69 | (...)... : TreeBasedTable [<map.value>] : Object | provenance |  |
 | Test.java:8280:61:8280:68 | source(...) : Object | Test.java:103:58:103:64 | value : Object | provenance |  |
-| Test.java:8280:61:8280:68 | source(...) : Object | Test.java:8280:40:8280:69 | newTable(...) : TreeBasedTable [<map.value>] : Object | provenance | MaD:514 |
+| Test.java:8280:61:8280:68 | source(...) : Object | Test.java:8280:40:8280:69 | newTable(...) : TreeBasedTable [<map.value>] : Object | provenance | MaD:517 |
 | Test.java:8281:10:8281:34 | create(...) : TreeBasedTable [<map.value>] : Object | Test.java:8282:21:8282:23 | out : TreeBasedTable [<map.value>] : Object | provenance |  |
 | Test.java:8281:32:8281:33 | in : TreeBasedTable [<map.value>] : Object | Test.java:8281:10:8281:34 | create(...) : TreeBasedTable [<map.value>] : Object | provenance | MaD:549 |
 | Test.java:8282:21:8282:23 | out : TreeBasedTable [<map.value>] : Object | Test.java:120:20:120:33 | t : TreeBasedTable [<map.value>] : Object | provenance |  |
-| Test.java:8282:21:8282:23 | out : TreeBasedTable [<map.value>] : Object | Test.java:8282:9:8282:24 | getMapValue(...) | provenance | MaD:525 |
+| Test.java:8282:21:8282:23 | out : TreeBasedTable [<map.value>] : Object | Test.java:8282:9:8282:24 | getMapValue(...) | provenance | MaD:528 |
 | Test.java:8287:24:8287:69 | (...)... : TreeBasedTable [com.google.common.collect.Table.columnKey] : Object | Test.java:8288:32:8288:33 | in : TreeBasedTable [com.google.common.collect.Table.columnKey] : Object | provenance |  |
 | Test.java:8287:40:8287:69 | newTable(...) : TreeBasedTable [com.google.common.collect.Table.columnKey] : Object | Test.java:8287:24:8287:69 | (...)... : TreeBasedTable [com.google.common.collect.Table.columnKey] : Object | provenance |  |
 | Test.java:8287:55:8287:62 | source(...) : Object | Test.java:103:48:103:55 | column : Object | provenance |  |
-| Test.java:8287:55:8287:62 | source(...) : Object | Test.java:8287:40:8287:69 | newTable(...) : TreeBasedTable [com.google.common.collect.Table.columnKey] : Object | provenance | MaD:513 |
+| Test.java:8287:55:8287:62 | source(...) : Object | Test.java:8287:40:8287:69 | newTable(...) : TreeBasedTable [com.google.common.collect.Table.columnKey] : Object | provenance | MaD:516 |
 | Test.java:8288:10:8288:34 | create(...) : TreeBasedTable [com.google.common.collect.Table.columnKey] : Object | Test.java:8289:28:8289:30 | out : TreeBasedTable [com.google.common.collect.Table.columnKey] : Object | provenance |  |
 | Test.java:8288:32:8288:33 | in : TreeBasedTable [com.google.common.collect.Table.columnKey] : Object | Test.java:8288:10:8288:34 | create(...) : TreeBasedTable [com.google.common.collect.Table.columnKey] : Object | provenance | MaD:550 |
 | Test.java:8289:28:8289:30 | out : TreeBasedTable [com.google.common.collect.Table.columnKey] : Object | Test.java:96:27:96:40 | t : TreeBasedTable [com.google.common.collect.Table.columnKey] : Object | provenance |  |
-| Test.java:8289:28:8289:30 | out : TreeBasedTable [com.google.common.collect.Table.columnKey] : Object | Test.java:8289:9:8289:31 | getTable_columnKey(...) | provenance | MaD:507 |
+| Test.java:8289:28:8289:30 | out : TreeBasedTable [com.google.common.collect.Table.columnKey] : Object | Test.java:8289:9:8289:31 | getTable_columnKey(...) | provenance | MaD:510 |
 | Test.java:8294:24:8294:69 | (...)... : TreeBasedTable [com.google.common.collect.Table.rowKey] : Object | Test.java:8295:32:8295:33 | in : TreeBasedTable [com.google.common.collect.Table.rowKey] : Object | provenance |  |
 | Test.java:8294:40:8294:69 | newTable(...) : TreeBasedTable [com.google.common.collect.Table.rowKey] : Object | Test.java:8294:24:8294:69 | (...)... : TreeBasedTable [com.google.common.collect.Table.rowKey] : Object | provenance |  |
 | Test.java:8294:49:8294:56 | source(...) : Object | Test.java:103:41:103:45 | row : Object | provenance |  |
-| Test.java:8294:49:8294:56 | source(...) : Object | Test.java:8294:40:8294:69 | newTable(...) : TreeBasedTable [com.google.common.collect.Table.rowKey] : Object | provenance | MaD:512 |
+| Test.java:8294:49:8294:56 | source(...) : Object | Test.java:8294:40:8294:69 | newTable(...) : TreeBasedTable [com.google.common.collect.Table.rowKey] : Object | provenance | MaD:515 |
 | Test.java:8295:10:8295:34 | create(...) : TreeBasedTable [com.google.common.collect.Table.rowKey] : Object | Test.java:8296:25:8296:27 | out : TreeBasedTable [com.google.common.collect.Table.rowKey] : Object | provenance |  |
 | Test.java:8295:32:8295:33 | in : TreeBasedTable [com.google.common.collect.Table.rowKey] : Object | Test.java:8295:10:8295:34 | create(...) : TreeBasedTable [com.google.common.collect.Table.rowKey] : Object | provenance | MaD:551 |
 | Test.java:8296:25:8296:27 | out : TreeBasedTable [com.google.common.collect.Table.rowKey] : Object | Test.java:105:24:105:37 | t : TreeBasedTable [com.google.common.collect.Table.rowKey] : Object | provenance |  |
-| Test.java:8296:25:8296:27 | out : TreeBasedTable [com.google.common.collect.Table.rowKey] : Object | Test.java:8296:9:8296:28 | getTable_rowKey(...) | provenance | MaD:521 |
+| Test.java:8296:25:8296:27 | out : TreeBasedTable [com.google.common.collect.Table.rowKey] : Object | Test.java:8296:9:8296:28 | getTable_rowKey(...) | provenance | MaD:524 |
 | Test.java:8301:18:8301:63 | (...)... : ImmutableMultimap [<map.key>] : Object | Test.java:8302:30:8302:31 | in : ImmutableMultimap [<map.key>] : Object | provenance |  |
 | Test.java:8301:28:8301:63 | of(...) : ImmutableMultimap [<map.key>] : Object | Test.java:8301:18:8301:63 | (...)... : ImmutableMultimap [<map.key>] : Object | provenance |  |
-| Test.java:8301:49:8301:56 | source(...) : Object | Test.java:8301:28:8301:63 | of(...) : ImmutableMultimap [<map.key>] : Object | provenance | MaD:103 |
+| Test.java:8301:49:8301:56 | source(...) : Object | Test.java:8301:28:8301:63 | of(...) : ImmutableMultimap [<map.key>] : Object | provenance | MaD:121 |
 | Test.java:8302:10:8302:32 | create(...) : TreeMultimap [<map.key>] : Object | Test.java:8303:19:8303:21 | out : TreeMultimap [<map.key>] : Object | provenance |  |
 | Test.java:8302:30:8302:31 | in : ImmutableMultimap [<map.key>] : Object | Test.java:8302:10:8302:32 | create(...) : TreeMultimap [<map.key>] : Object | provenance | MaD:552 |
 | Test.java:8303:19:8303:21 | out : TreeMultimap [<map.key>] : Object | Test.java:100:18:100:34 | map : TreeMultimap [<map.key>] : Object | provenance |  |
 | Test.java:8303:19:8303:21 | out : TreeMultimap [<map.key>] : Object | Test.java:8303:9:8303:22 | getMapKey(...) | provenance | MaD:373 |
 | Test.java:8308:18:8308:63 | (...)... : ImmutableMultimap [<map.value>] : Object | Test.java:8309:30:8309:31 | in : ImmutableMultimap [<map.value>] : Object | provenance |  |
 | Test.java:8308:28:8308:63 | of(...) : ImmutableMultimap [<map.value>] : Object | Test.java:8308:18:8308:63 | (...)... : ImmutableMultimap [<map.value>] : Object | provenance |  |
-| Test.java:8308:55:8308:62 | source(...) : Object | Test.java:8308:28:8308:63 | of(...) : ImmutableMultimap [<map.value>] : Object | provenance | MaD:104 |
+| Test.java:8308:55:8308:62 | source(...) : Object | Test.java:8308:28:8308:63 | of(...) : ImmutableMultimap [<map.value>] : Object | provenance | MaD:122 |
 | Test.java:8309:10:8309:32 | create(...) : TreeMultimap [<map.value>] : Object | Test.java:8310:21:8310:23 | out : TreeMultimap [<map.value>] : Object | provenance |  |
 | Test.java:8309:30:8309:31 | in : ImmutableMultimap [<map.value>] : Object | Test.java:8309:10:8309:32 | create(...) : TreeMultimap [<map.value>] : Object | provenance | MaD:553 |
 | Test.java:8310:21:8310:23 | out : TreeMultimap [<map.value>] : Object | Test.java:119:20:119:36 | map : TreeMultimap [<map.value>] : Object | provenance |  |
 | Test.java:8310:21:8310:23 | out : TreeMultimap [<map.value>] : Object | Test.java:8310:9:8310:24 | getMapValue(...) | provenance | MaD:385 |
 | Test.java:8315:18:8315:44 | (...)... : List [<element>] : Object | Test.java:8316:30:8316:31 | in : List [<element>] : Object | provenance |  |
 | Test.java:8315:28:8315:44 | of(...) : List [<element>] : Object | Test.java:8315:18:8315:44 | (...)... : List [<element>] : Object | provenance |  |
-| Test.java:8315:36:8315:43 | source(...) : Object | Test.java:8315:28:8315:44 | of(...) : List [<element>] : Object | provenance | MaD:558 |
+| Test.java:8315:36:8315:43 | source(...) : Object | Test.java:8315:28:8315:44 | of(...) : List [<element>] : Object | provenance | MaD:561 |
 | Test.java:8316:10:8316:32 | create(...) : TreeMultiset [<element>] : Object | Test.java:8317:20:8317:22 | out : TreeMultiset [<element>] : Object | provenance |  |
 | Test.java:8316:30:8316:31 | in : List [<element>] : Object | Test.java:8316:10:8316:32 | create(...) : TreeMultiset [<element>] : Object | provenance | MaD:554 |
 | Test.java:8317:20:8317:22 | out : TreeMultiset [<element>] : Object | Test.java:110:19:110:32 | it : TreeMultiset [<element>] : Object | provenance |  |
-| Test.java:8317:20:8317:22 | out : TreeMultiset [<element>] : Object | Test.java:8317:9:8317:23 | getElement(...) | provenance | MaD:555 |
+| Test.java:8317:20:8317:22 | out : TreeMultiset [<element>] : Object | Test.java:8317:9:8317:23 | getElement(...) | provenance | MaD:558 |
 nodes
 | Test.java:95:27:95:57 | b : Builder [com.google.common.collect.Table.columnKey] : Object | semmle.label | b : Builder [com.google.common.collect.Table.columnKey] : Object |
 | Test.java:95:69:95:97 | getTable_columnKey(...) : Object | semmle.label | getTable_columnKey(...) : Object |
diff --git a/java/ql/test/library-tests/frameworks/guice/flow.ql b/java/ql/test/library-tests/frameworks/guice/flow.ql
index 37a478bc3a7..629341a0383 100644
--- a/java/ql/test/library-tests/frameworks/guice/flow.ql
+++ b/java/ql/test/library-tests/frameworks/guice/flow.ql
@@ -3,7 +3,7 @@ import semmle.code.java.dataflow.FlowSources
 import semmle.code.java.dataflow.TaintTracking
 
 module Config implements DataFlow::ConfigSig {
-  predicate isSource(DataFlow::Node src) { src instanceof ThreatModelFlowSource }
+  predicate isSource(DataFlow::Node src) { src instanceof ActiveThreatModelSource }
 
   predicate isSink(DataFlow::Node sink) {
     exists(MethodCall ma |
diff --git a/java/ql/test/library-tests/frameworks/jackson/test.expected b/java/ql/test/library-tests/frameworks/jackson/test.expected
index d832af31cd4..ef130a21dfa 100644
--- a/java/ql/test/library-tests/frameworks/jackson/test.expected
+++ b/java/ql/test/library-tests/frameworks/jackson/test.expected
@@ -1,10 +1,10 @@
 models
 | 1 | Summary: com.fasterxml.jackson.core; JsonFactory; false; createParser; ; ; Argument[0]; ReturnValue; taint; manual |
-| 2 | Summary: com.fasterxml.jackson.databind; ObjectMapper; true; convertValue; ; ; Argument[0]; ReturnValue; taint; manual |
-| 3 | Summary: com.fasterxml.jackson.databind; ObjectMapper; false; createParser; ; ; Argument[0]; ReturnValue; taint; manual |
-| 4 | Summary: com.fasterxml.jackson.databind; ObjectMapper; true; valueToTree; ; ; Argument[0]; ReturnValue; taint; manual |
+| 2 | Summary: com.fasterxml.jackson.databind; ObjectMapper; false; createParser; ; ; Argument[0]; ReturnValue; taint; manual |
+| 3 | Summary: com.fasterxml.jackson.databind; ObjectMapper; true; convertValue; ; ; Argument[0]; ReturnValue; taint; manual |
+| 4 | Summary: com.fasterxml.jackson.databind; ObjectMapper; true; valueToTree; ; ; Argument[0].MapValue.Element; ReturnValue; taint; manual |
 | 5 | Summary: com.fasterxml.jackson.databind; ObjectMapper; true; valueToTree; ; ; Argument[0].MapValue; ReturnValue; taint; manual |
-| 6 | Summary: com.fasterxml.jackson.databind; ObjectMapper; true; valueToTree; ; ; Argument[0].MapValue.Element; ReturnValue; taint; manual |
+| 6 | Summary: com.fasterxml.jackson.databind; ObjectMapper; true; valueToTree; ; ; Argument[0]; ReturnValue; taint; manual |
 | 7 | Summary: com.fasterxml.jackson.databind; ObjectReader; false; createParser; ; ; Argument[0]; ReturnValue; taint; manual |
 | 8 | Summary: java.util; Map; false; of; ; ; Argument[1]; ReturnValue.MapValue; value; manual |
 edges
@@ -53,55 +53,55 @@ edges
 | Test.java:115:16:115:32 | (...)... : char[] | Test.java:117:32:117:33 | in : char[] | provenance |  |
 | Test.java:115:25:115:32 | source(...) : Object | Test.java:115:16:115:32 | (...)... : char[] | provenance |  |
 | Test.java:117:10:117:40 | createParser(...) : JsonParser | Test.java:118:9:118:11 | out | provenance |  |
-| Test.java:117:32:117:33 | in : char[] | Test.java:117:10:117:40 | createParser(...) : JsonParser | provenance | MaD:3 |
+| Test.java:117:32:117:33 | in : char[] | Test.java:117:10:117:40 | createParser(...) : JsonParser | provenance | MaD:2 |
 | Test.java:123:16:123:32 | (...)... : char[] | Test.java:125:32:125:33 | in : char[] | provenance |  |
 | Test.java:123:25:123:32 | source(...) : Object | Test.java:123:16:123:32 | (...)... : char[] | provenance |  |
 | Test.java:125:10:125:34 | createParser(...) : JsonParser | Test.java:126:9:126:11 | out | provenance |  |
-| Test.java:125:32:125:33 | in : char[] | Test.java:125:10:125:34 | createParser(...) : JsonParser | provenance | MaD:3 |
+| Test.java:125:32:125:33 | in : char[] | Test.java:125:10:125:34 | createParser(...) : JsonParser | provenance | MaD:2 |
 | Test.java:131:16:131:32 | (...)... : byte[] | Test.java:133:32:133:33 | in : byte[] | provenance |  |
 | Test.java:131:25:131:32 | source(...) : Object | Test.java:131:16:131:32 | (...)... : byte[] | provenance |  |
 | Test.java:133:10:133:40 | createParser(...) : JsonParser | Test.java:134:9:134:11 | out | provenance |  |
-| Test.java:133:32:133:33 | in : byte[] | Test.java:133:10:133:40 | createParser(...) : JsonParser | provenance | MaD:3 |
+| Test.java:133:32:133:33 | in : byte[] | Test.java:133:10:133:40 | createParser(...) : JsonParser | provenance | MaD:2 |
 | Test.java:139:16:139:32 | (...)... : byte[] | Test.java:141:32:141:33 | in : byte[] | provenance |  |
 | Test.java:139:25:139:32 | source(...) : Object | Test.java:139:16:139:32 | (...)... : byte[] | provenance |  |
 | Test.java:141:10:141:34 | createParser(...) : JsonParser | Test.java:142:9:142:11 | out | provenance |  |
-| Test.java:141:32:141:33 | in : byte[] | Test.java:141:10:141:34 | createParser(...) : JsonParser | provenance | MaD:3 |
+| Test.java:141:32:141:33 | in : byte[] | Test.java:141:10:141:34 | createParser(...) : JsonParser | provenance | MaD:2 |
 | Test.java:147:13:147:26 | (...)... : URL | Test.java:149:32:149:33 | in : URL | provenance |  |
 | Test.java:147:19:147:26 | source(...) : Object | Test.java:147:13:147:26 | (...)... : URL | provenance |  |
 | Test.java:149:10:149:34 | createParser(...) : JsonParser | Test.java:150:9:150:11 | out | provenance |  |
-| Test.java:149:32:149:33 | in : URL | Test.java:149:10:149:34 | createParser(...) : JsonParser | provenance | MaD:3 |
+| Test.java:149:32:149:33 | in : URL | Test.java:149:10:149:34 | createParser(...) : JsonParser | provenance | MaD:2 |
 | Test.java:155:16:155:32 | (...)... : String | Test.java:157:32:157:33 | in : String | provenance |  |
 | Test.java:155:25:155:32 | source(...) : Object | Test.java:155:16:155:32 | (...)... : String | provenance |  |
 | Test.java:157:10:157:34 | createParser(...) : JsonParser | Test.java:158:9:158:11 | out | provenance |  |
-| Test.java:157:32:157:33 | in : String | Test.java:157:10:157:34 | createParser(...) : JsonParser | provenance | MaD:3 |
+| Test.java:157:32:157:33 | in : String | Test.java:157:10:157:34 | createParser(...) : JsonParser | provenance | MaD:2 |
 | Test.java:163:16:163:32 | (...)... : Reader | Test.java:165:32:165:33 | in : Reader | provenance |  |
 | Test.java:163:25:163:32 | source(...) : Object | Test.java:163:16:163:32 | (...)... : Reader | provenance |  |
 | Test.java:165:10:165:34 | createParser(...) : JsonParser | Test.java:166:9:166:11 | out | provenance |  |
-| Test.java:165:32:165:33 | in : Reader | Test.java:165:10:165:34 | createParser(...) : JsonParser | provenance | MaD:3 |
+| Test.java:165:32:165:33 | in : Reader | Test.java:165:10:165:34 | createParser(...) : JsonParser | provenance | MaD:2 |
 | Test.java:171:21:171:42 | (...)... : InputStream | Test.java:173:32:173:33 | in : InputStream | provenance |  |
 | Test.java:171:35:171:42 | source(...) : Object | Test.java:171:21:171:42 | (...)... : InputStream | provenance |  |
 | Test.java:173:10:173:34 | createParser(...) : JsonParser | Test.java:174:9:174:11 | out | provenance |  |
-| Test.java:173:32:173:33 | in : InputStream | Test.java:173:10:173:34 | createParser(...) : JsonParser | provenance | MaD:3 |
+| Test.java:173:32:173:33 | in : InputStream | Test.java:173:10:173:34 | createParser(...) : JsonParser | provenance | MaD:2 |
 | Test.java:179:14:179:28 | (...)... : File | Test.java:181:32:181:33 | in : File | provenance |  |
 | Test.java:179:21:179:28 | source(...) : Object | Test.java:179:14:179:28 | (...)... : File | provenance |  |
 | Test.java:181:10:181:34 | createParser(...) : JsonParser | Test.java:182:9:182:11 | out | provenance |  |
-| Test.java:181:32:181:33 | in : File | Test.java:181:10:181:34 | createParser(...) : JsonParser | provenance | MaD:3 |
+| Test.java:181:32:181:33 | in : File | Test.java:181:10:181:34 | createParser(...) : JsonParser | provenance | MaD:2 |
 | Test.java:187:19:187:38 | (...)... : DataInput | Test.java:189:32:189:33 | in : DataInput | provenance |  |
 | Test.java:187:31:187:38 | source(...) : Object | Test.java:187:19:187:38 | (...)... : DataInput | provenance |  |
 | Test.java:189:10:189:34 | createParser(...) : JsonParser | Test.java:190:9:190:11 | out | provenance |  |
-| Test.java:189:32:189:33 | in : DataInput | Test.java:189:10:189:34 | createParser(...) : JsonParser | provenance | MaD:3 |
+| Test.java:189:32:189:33 | in : DataInput | Test.java:189:10:189:34 | createParser(...) : JsonParser | provenance | MaD:2 |
 | Test.java:195:16:195:32 | (...)... : Object | Test.java:197:32:197:33 | in : Object | provenance |  |
 | Test.java:195:25:195:32 | source(...) : Object | Test.java:195:16:195:32 | (...)... : Object | provenance |  |
 | Test.java:197:10:197:56 | convertValue(...) : Object | Test.java:198:9:198:11 | out | provenance |  |
-| Test.java:197:32:197:33 | in : Object | Test.java:197:10:197:56 | convertValue(...) : Object | provenance | MaD:2 |
+| Test.java:197:32:197:33 | in : Object | Test.java:197:10:197:56 | convertValue(...) : Object | provenance | MaD:3 |
 | Test.java:203:16:203:32 | (...)... : Object | Test.java:205:32:205:33 | in : Object | provenance |  |
 | Test.java:203:25:203:32 | source(...) : Object | Test.java:203:16:203:32 | (...)... : Object | provenance |  |
 | Test.java:205:10:205:51 | convertValue(...) : Object | Test.java:206:9:206:11 | out | provenance |  |
-| Test.java:205:32:205:33 | in : Object | Test.java:205:10:205:51 | convertValue(...) : Object | provenance | MaD:2 |
+| Test.java:205:32:205:33 | in : Object | Test.java:205:10:205:51 | convertValue(...) : Object | provenance | MaD:3 |
 | Test.java:211:16:211:32 | (...)... : Object | Test.java:213:32:213:33 | in : Object | provenance |  |
 | Test.java:211:25:211:32 | source(...) : Object | Test.java:211:16:211:32 | (...)... : Object | provenance |  |
 | Test.java:213:10:213:48 | convertValue(...) : Object | Test.java:214:9:214:11 | out | provenance |  |
-| Test.java:213:32:213:33 | in : Object | Test.java:213:10:213:48 | convertValue(...) : Object | provenance | MaD:2 |
+| Test.java:213:32:213:33 | in : Object | Test.java:213:10:213:48 | convertValue(...) : Object | provenance | MaD:3 |
 | Test.java:219:16:219:32 | (...)... : Object | Test.java:221:31:221:32 | in : Object | provenance |  |
 | Test.java:219:25:219:32 | source(...) : Object | Test.java:219:16:219:32 | (...)... : Object | provenance |  |
 | Test.java:221:10:221:33 | valueToTree(...) : JsonNode | Test.java:222:9:222:11 | out | provenance |  |
@@ -113,8 +113,8 @@ edges
 | Test.java:228:41:228:48 | source(...) : Object | Test.java:20:25:20:38 | element : Object | provenance |  |
 | Test.java:228:41:228:48 | source(...) : Object | Test.java:228:25:228:49 | newWithMapValue(...) : Map [<map.value>] : Object | provenance | MaD:8 |
 | Test.java:230:10:230:33 | valueToTree(...) : JsonNode | Test.java:231:9:231:11 | out | provenance |  |
+| Test.java:230:31:230:32 | in : Map [<map.value>] : Object | Test.java:230:10:230:33 | valueToTree(...) : JsonNode | provenance | MaD:4 |
 | Test.java:230:31:230:32 | in : Map [<map.value>] : Object | Test.java:230:10:230:33 | valueToTree(...) : JsonNode | provenance | MaD:5 |
-| Test.java:230:31:230:32 | in : Map [<map.value>] : Object | Test.java:230:10:230:33 | valueToTree(...) : JsonNode | provenance | MaD:6 |
 | Test.java:236:16:236:32 | (...)... : char[] | Test.java:238:32:238:33 | in : char[] | provenance |  |
 | Test.java:236:25:236:32 | source(...) : Object | Test.java:236:16:236:32 | (...)... : char[] | provenance |  |
 | Test.java:238:10:238:40 | createParser(...) : JsonParser | Test.java:239:9:239:11 | out | provenance |  |
diff --git a/java/ql/test/library-tests/frameworks/javax-json/test.expected b/java/ql/test/library-tests/frameworks/javax-json/test.expected
index 80f9222b32d..b2bc9f1e1f2 100644
--- a/java/ql/test/library-tests/frameworks/javax-json/test.expected
+++ b/java/ql/test/library-tests/frameworks/javax-json/test.expected
@@ -1,32 +1,32 @@
 models
-| 1 | Summary: jakarta.json; Json; false; createArrayBuilder; (Collection); ; Argument[0].Element; ReturnValue; taint; manual |
-| 2 | Summary: jakarta.json; Json; false; createArrayBuilder; (JsonArray); ; Argument[0]; ReturnValue; taint; manual |
-| 3 | Summary: jakarta.json; Json; false; createDiff; ; ; Argument[0..1]; ReturnValue; taint; manual |
-| 4 | Summary: jakarta.json; Json; false; createMergeDiff; ; ; Argument[0..1]; ReturnValue; taint; manual |
-| 5 | Summary: jakarta.json; Json; false; createMergePatch; ; ; Argument[0]; ReturnValue; taint; manual |
-| 6 | Summary: jakarta.json; Json; false; createObjectBuilder; (JsonObject); ; Argument[0]; ReturnValue; taint; manual |
-| 7 | Summary: jakarta.json; Json; false; createObjectBuilder; (Map); ; Argument[0].MapKey; ReturnValue; taint; manual |
-| 8 | Summary: jakarta.json; Json; false; createObjectBuilder; (Map); ; Argument[0].MapValue; ReturnValue; taint; manual |
-| 9 | Summary: jakarta.json; Json; false; createPatch; ; ; Argument[0]; ReturnValue; taint; manual |
-| 10 | Summary: jakarta.json; Json; false; createPatchBuilder; ; ; Argument[0]; ReturnValue; taint; manual |
-| 11 | Summary: jakarta.json; Json; false; createPointer; ; ; Argument[0]; ReturnValue; taint; manual |
-| 12 | Summary: jakarta.json; Json; false; createReader; ; ; Argument[0]; ReturnValue; taint; manual |
-| 13 | Summary: jakarta.json; Json; false; createValue; ; ; Argument[0]; ReturnValue; taint; manual |
-| 14 | Summary: jakarta.json; Json; false; createWriter; ; ; Argument[0]; ReturnValue; taint; manual |
-| 15 | Summary: jakarta.json; Json; false; decodePointer; ; ; Argument[0]; ReturnValue; taint; manual |
-| 16 | Summary: jakarta.json; Json; false; encodePointer; ; ; Argument[0]; ReturnValue; taint; manual |
-| 17 | Summary: jakarta.json; JsonArray; false; getBoolean; ; ; Argument[this]; ReturnValue; taint; manual |
+| 1 | Summary: jakarta.json.stream; JsonParserFactory; false; createParser; ; ; Argument[0]; ReturnValue; taint; manual |
+| 2 | Summary: jakarta.json; Json; false; createArrayBuilder; (Collection); ; Argument[0].Element; ReturnValue; taint; manual |
+| 3 | Summary: jakarta.json; Json; false; createArrayBuilder; (JsonArray); ; Argument[0]; ReturnValue; taint; manual |
+| 4 | Summary: jakarta.json; Json; false; createDiff; ; ; Argument[0..1]; ReturnValue; taint; manual |
+| 5 | Summary: jakarta.json; Json; false; createMergeDiff; ; ; Argument[0..1]; ReturnValue; taint; manual |
+| 6 | Summary: jakarta.json; Json; false; createMergePatch; ; ; Argument[0]; ReturnValue; taint; manual |
+| 7 | Summary: jakarta.json; Json; false; createObjectBuilder; (JsonObject); ; Argument[0]; ReturnValue; taint; manual |
+| 8 | Summary: jakarta.json; Json; false; createObjectBuilder; (Map); ; Argument[0].MapKey; ReturnValue; taint; manual |
+| 9 | Summary: jakarta.json; Json; false; createObjectBuilder; (Map); ; Argument[0].MapValue; ReturnValue; taint; manual |
+| 10 | Summary: jakarta.json; Json; false; createPatch; ; ; Argument[0]; ReturnValue; taint; manual |
+| 11 | Summary: jakarta.json; Json; false; createPatchBuilder; ; ; Argument[0]; ReturnValue; taint; manual |
+| 12 | Summary: jakarta.json; Json; false; createPointer; ; ; Argument[0]; ReturnValue; taint; manual |
+| 13 | Summary: jakarta.json; Json; false; createReader; ; ; Argument[0]; ReturnValue; taint; manual |
+| 14 | Summary: jakarta.json; Json; false; createValue; ; ; Argument[0]; ReturnValue; taint; manual |
+| 15 | Summary: jakarta.json; Json; false; createWriter; ; ; Argument[0]; ReturnValue; taint; manual |
+| 16 | Summary: jakarta.json; Json; false; decodePointer; ; ; Argument[0]; ReturnValue; taint; manual |
+| 17 | Summary: jakarta.json; Json; false; encodePointer; ; ; Argument[0]; ReturnValue; taint; manual |
 | 18 | Summary: jakarta.json; JsonArray; false; getBoolean; ; ; Argument[1]; ReturnValue; value; manual |
-| 19 | Summary: jakarta.json; JsonArray; false; getInt; ; ; Argument[this]; ReturnValue; taint; manual |
+| 19 | Summary: jakarta.json; JsonArray; false; getBoolean; ; ; Argument[this]; ReturnValue; taint; manual |
 | 20 | Summary: jakarta.json; JsonArray; false; getInt; ; ; Argument[1]; ReturnValue; value; manual |
-| 21 | Summary: jakarta.json; JsonArray; false; getJsonArray; ; ; Argument[this]; ReturnValue; taint; manual |
-| 22 | Summary: jakarta.json; JsonArray; false; getJsonNumber; ; ; Argument[this]; ReturnValue; taint; manual |
-| 23 | Summary: jakarta.json; JsonArray; false; getJsonObject; ; ; Argument[this]; ReturnValue; taint; manual |
-| 24 | Summary: jakarta.json; JsonArray; false; getJsonString; ; ; Argument[this]; ReturnValue; taint; manual |
-| 25 | Summary: jakarta.json; JsonArray; false; getString; ; ; Argument[this]; ReturnValue; taint; manual |
+| 21 | Summary: jakarta.json; JsonArray; false; getInt; ; ; Argument[this]; ReturnValue; taint; manual |
+| 22 | Summary: jakarta.json; JsonArray; false; getJsonArray; ; ; Argument[this]; ReturnValue; taint; manual |
+| 23 | Summary: jakarta.json; JsonArray; false; getJsonNumber; ; ; Argument[this]; ReturnValue; taint; manual |
+| 24 | Summary: jakarta.json; JsonArray; false; getJsonObject; ; ; Argument[this]; ReturnValue; taint; manual |
+| 25 | Summary: jakarta.json; JsonArray; false; getJsonString; ; ; Argument[this]; ReturnValue; taint; manual |
 | 26 | Summary: jakarta.json; JsonArray; false; getString; ; ; Argument[1]; ReturnValue; value; manual |
-| 27 | Summary: jakarta.json; JsonArray; false; getValuesAs; ; ; Argument[this]; ReturnValue; taint; manual |
-| 28 | Summary: jakarta.json; JsonArrayBuilder; false; add; ; ; Argument[this]; ReturnValue; value; manual |
+| 27 | Summary: jakarta.json; JsonArray; false; getString; ; ; Argument[this]; ReturnValue; taint; manual |
+| 28 | Summary: jakarta.json; JsonArray; false; getValuesAs; ; ; Argument[this]; ReturnValue; taint; manual |
 | 29 | Summary: jakarta.json; JsonArrayBuilder; false; add; (BigDecimal); ; Argument[0]; Argument[this]; taint; manual |
 | 30 | Summary: jakarta.json; JsonArrayBuilder; false; add; (BigInteger); ; Argument[0]; Argument[this]; taint; manual |
 | 31 | Summary: jakarta.json; JsonArrayBuilder; false; add; (JsonArrayBuilder); ; Argument[0]; Argument[this]; taint; manual |
@@ -47,112 +47,112 @@ models
 | 46 | Summary: jakarta.json; JsonArrayBuilder; false; add; (int,int); ; Argument[1]; Argument[this]; taint; manual |
 | 47 | Summary: jakarta.json; JsonArrayBuilder; false; add; (int,long); ; Argument[1]; Argument[this]; taint; manual |
 | 48 | Summary: jakarta.json; JsonArrayBuilder; false; add; (long); ; Argument[0]; Argument[this]; taint; manual |
-| 49 | Summary: jakarta.json; JsonArrayBuilder; false; addAll; ; ; Argument[this]; ReturnValue; value; manual |
+| 49 | Summary: jakarta.json; JsonArrayBuilder; false; add; ; ; Argument[this]; ReturnValue; value; manual |
 | 50 | Summary: jakarta.json; JsonArrayBuilder; false; addAll; ; ; Argument[0]; Argument[this]; taint; manual |
-| 51 | Summary: jakarta.json; JsonArrayBuilder; false; addNull; ; ; Argument[this]; ReturnValue; value; manual |
-| 52 | Summary: jakarta.json; JsonArrayBuilder; false; build; ; ; Argument[this]; ReturnValue; taint; manual |
-| 53 | Summary: jakarta.json; JsonArrayBuilder; false; remove; ; ; Argument[this]; ReturnValue; value; manual |
-| 54 | Summary: jakarta.json; JsonArrayBuilder; false; set; ; ; Argument[this]; ReturnValue; value; manual |
+| 51 | Summary: jakarta.json; JsonArrayBuilder; false; addAll; ; ; Argument[this]; ReturnValue; value; manual |
+| 52 | Summary: jakarta.json; JsonArrayBuilder; false; addNull; ; ; Argument[this]; ReturnValue; value; manual |
+| 53 | Summary: jakarta.json; JsonArrayBuilder; false; build; ; ; Argument[this]; ReturnValue; taint; manual |
+| 54 | Summary: jakarta.json; JsonArrayBuilder; false; remove; ; ; Argument[this]; ReturnValue; value; manual |
 | 55 | Summary: jakarta.json; JsonArrayBuilder; false; set; ; ; Argument[1]; Argument[this]; taint; manual |
-| 56 | Summary: jakarta.json; JsonArrayBuilder; false; setNull; ; ; Argument[this]; ReturnValue; value; manual |
-| 57 | Summary: jakarta.json; JsonMergePatch; false; apply; ; ; Argument[this]; ReturnValue; taint; manual |
+| 56 | Summary: jakarta.json; JsonArrayBuilder; false; set; ; ; Argument[this]; ReturnValue; value; manual |
+| 57 | Summary: jakarta.json; JsonArrayBuilder; false; setNull; ; ; Argument[this]; ReturnValue; value; manual |
 | 58 | Summary: jakarta.json; JsonMergePatch; false; apply; ; ; Argument[0]; ReturnValue; taint; manual |
-| 59 | Summary: jakarta.json; JsonMergePatch; false; toJsonValue; ; ; Argument[this]; ReturnValue; taint; manual |
-| 60 | Summary: jakarta.json; JsonNumber; false; bigDecimalValue; ; ; Argument[this]; ReturnValue; taint; manual |
-| 61 | Summary: jakarta.json; JsonNumber; false; bigIntegerValue; ; ; Argument[this]; ReturnValue; taint; manual |
-| 62 | Summary: jakarta.json; JsonNumber; false; bigIntegerValueExact; ; ; Argument[this]; ReturnValue; taint; manual |
-| 63 | Summary: jakarta.json; JsonNumber; false; doubleValue; ; ; Argument[this]; ReturnValue; taint; manual |
-| 64 | Summary: jakarta.json; JsonNumber; false; intValue; ; ; Argument[this]; ReturnValue; taint; manual |
-| 65 | Summary: jakarta.json; JsonNumber; false; intValueExact; ; ; Argument[this]; ReturnValue; taint; manual |
-| 66 | Summary: jakarta.json; JsonNumber; false; longValue; ; ; Argument[this]; ReturnValue; taint; manual |
-| 67 | Summary: jakarta.json; JsonNumber; false; longValueExact; ; ; Argument[this]; ReturnValue; taint; manual |
-| 68 | Summary: jakarta.json; JsonNumber; false; numberValue; ; ; Argument[this]; ReturnValue; taint; manual |
-| 69 | Summary: jakarta.json; JsonObject; false; getBoolean; ; ; Argument[this]; ReturnValue; taint; manual |
+| 59 | Summary: jakarta.json; JsonMergePatch; false; apply; ; ; Argument[this]; ReturnValue; taint; manual |
+| 60 | Summary: jakarta.json; JsonMergePatch; false; toJsonValue; ; ; Argument[this]; ReturnValue; taint; manual |
+| 61 | Summary: jakarta.json; JsonNumber; false; bigDecimalValue; ; ; Argument[this]; ReturnValue; taint; manual |
+| 62 | Summary: jakarta.json; JsonNumber; false; bigIntegerValue; ; ; Argument[this]; ReturnValue; taint; manual |
+| 63 | Summary: jakarta.json; JsonNumber; false; bigIntegerValueExact; ; ; Argument[this]; ReturnValue; taint; manual |
+| 64 | Summary: jakarta.json; JsonNumber; false; doubleValue; ; ; Argument[this]; ReturnValue; taint; manual |
+| 65 | Summary: jakarta.json; JsonNumber; false; intValue; ; ; Argument[this]; ReturnValue; taint; manual |
+| 66 | Summary: jakarta.json; JsonNumber; false; intValueExact; ; ; Argument[this]; ReturnValue; taint; manual |
+| 67 | Summary: jakarta.json; JsonNumber; false; longValue; ; ; Argument[this]; ReturnValue; taint; manual |
+| 68 | Summary: jakarta.json; JsonNumber; false; longValueExact; ; ; Argument[this]; ReturnValue; taint; manual |
+| 69 | Summary: jakarta.json; JsonNumber; false; numberValue; ; ; Argument[this]; ReturnValue; taint; manual |
 | 70 | Summary: jakarta.json; JsonObject; false; getBoolean; ; ; Argument[1]; ReturnValue; value; manual |
-| 71 | Summary: jakarta.json; JsonObject; false; getInt; ; ; Argument[this]; ReturnValue; taint; manual |
+| 71 | Summary: jakarta.json; JsonObject; false; getBoolean; ; ; Argument[this]; ReturnValue; taint; manual |
 | 72 | Summary: jakarta.json; JsonObject; false; getInt; ; ; Argument[1]; ReturnValue; value; manual |
-| 73 | Summary: jakarta.json; JsonObject; false; getJsonArray; ; ; Argument[this]; ReturnValue; taint; manual |
-| 74 | Summary: jakarta.json; JsonObject; false; getJsonNumber; ; ; Argument[this]; ReturnValue; taint; manual |
-| 75 | Summary: jakarta.json; JsonObject; false; getJsonObject; ; ; Argument[this]; ReturnValue; taint; manual |
-| 76 | Summary: jakarta.json; JsonObject; false; getJsonString; ; ; Argument[this]; ReturnValue; taint; manual |
-| 77 | Summary: jakarta.json; JsonObject; false; getString; ; ; Argument[this]; ReturnValue; taint; manual |
+| 73 | Summary: jakarta.json; JsonObject; false; getInt; ; ; Argument[this]; ReturnValue; taint; manual |
+| 74 | Summary: jakarta.json; JsonObject; false; getJsonArray; ; ; Argument[this]; ReturnValue; taint; manual |
+| 75 | Summary: jakarta.json; JsonObject; false; getJsonNumber; ; ; Argument[this]; ReturnValue; taint; manual |
+| 76 | Summary: jakarta.json; JsonObject; false; getJsonObject; ; ; Argument[this]; ReturnValue; taint; manual |
+| 77 | Summary: jakarta.json; JsonObject; false; getJsonString; ; ; Argument[this]; ReturnValue; taint; manual |
 | 78 | Summary: jakarta.json; JsonObject; false; getString; ; ; Argument[1]; ReturnValue; value; manual |
-| 79 | Summary: jakarta.json; JsonObjectBuilder; false; add; ; ; Argument[this]; ReturnValue; value; manual |
+| 79 | Summary: jakarta.json; JsonObject; false; getString; ; ; Argument[this]; ReturnValue; taint; manual |
 | 80 | Summary: jakarta.json; JsonObjectBuilder; false; add; ; ; Argument[1]; Argument[this]; taint; manual |
-| 81 | Summary: jakarta.json; JsonObjectBuilder; false; addAll; ; ; Argument[this]; ReturnValue; value; manual |
+| 81 | Summary: jakarta.json; JsonObjectBuilder; false; add; ; ; Argument[this]; ReturnValue; value; manual |
 | 82 | Summary: jakarta.json; JsonObjectBuilder; false; addAll; ; ; Argument[0]; ReturnValue; value; manual |
-| 83 | Summary: jakarta.json; JsonObjectBuilder; false; addNull; ; ; Argument[this]; ReturnValue; value; manual |
-| 84 | Summary: jakarta.json; JsonObjectBuilder; false; build; ; ; Argument[this]; ReturnValue; taint; manual |
-| 85 | Summary: jakarta.json; JsonObjectBuilder; false; remove; ; ; Argument[this]; ReturnValue; value; manual |
-| 86 | Summary: jakarta.json; JsonPatch; false; apply; ; ; Argument[this]; ReturnValue; taint; manual |
+| 83 | Summary: jakarta.json; JsonObjectBuilder; false; addAll; ; ; Argument[this]; ReturnValue; value; manual |
+| 84 | Summary: jakarta.json; JsonObjectBuilder; false; addNull; ; ; Argument[this]; ReturnValue; value; manual |
+| 85 | Summary: jakarta.json; JsonObjectBuilder; false; build; ; ; Argument[this]; ReturnValue; taint; manual |
+| 86 | Summary: jakarta.json; JsonObjectBuilder; false; remove; ; ; Argument[this]; ReturnValue; value; manual |
 | 87 | Summary: jakarta.json; JsonPatch; false; apply; ; ; Argument[0]; ReturnValue; taint; manual |
-| 88 | Summary: jakarta.json; JsonPatch; false; toJsonArray; ; ; Argument[this]; ReturnValue; taint; manual |
-| 89 | Summary: jakarta.json; JsonPatchBuilder; false; add; ; ; Argument[this]; ReturnValue; value; manual |
+| 88 | Summary: jakarta.json; JsonPatch; false; apply; ; ; Argument[this]; ReturnValue; taint; manual |
+| 89 | Summary: jakarta.json; JsonPatch; false; toJsonArray; ; ; Argument[this]; ReturnValue; taint; manual |
 | 90 | Summary: jakarta.json; JsonPatchBuilder; false; add; ; ; Argument[0..1]; ReturnValue; taint; manual |
-| 91 | Summary: jakarta.json; JsonPatchBuilder; false; build; ; ; Argument[this]; ReturnValue; taint; manual |
-| 92 | Summary: jakarta.json; JsonPatchBuilder; false; copy; ; ; Argument[this]; ReturnValue; value; manual |
+| 91 | Summary: jakarta.json; JsonPatchBuilder; false; add; ; ; Argument[this]; ReturnValue; value; manual |
+| 92 | Summary: jakarta.json; JsonPatchBuilder; false; build; ; ; Argument[this]; ReturnValue; taint; manual |
 | 93 | Summary: jakarta.json; JsonPatchBuilder; false; copy; ; ; Argument[0..1]; ReturnValue; taint; manual |
-| 94 | Summary: jakarta.json; JsonPatchBuilder; false; move; ; ; Argument[this]; ReturnValue; value; manual |
+| 94 | Summary: jakarta.json; JsonPatchBuilder; false; copy; ; ; Argument[this]; ReturnValue; value; manual |
 | 95 | Summary: jakarta.json; JsonPatchBuilder; false; move; ; ; Argument[0..1]; ReturnValue; taint; manual |
-| 96 | Summary: jakarta.json; JsonPatchBuilder; false; remove; ; ; Argument[this]; ReturnValue; value; manual |
+| 96 | Summary: jakarta.json; JsonPatchBuilder; false; move; ; ; Argument[this]; ReturnValue; value; manual |
 | 97 | Summary: jakarta.json; JsonPatchBuilder; false; remove; ; ; Argument[0]; ReturnValue; taint; manual |
-| 98 | Summary: jakarta.json; JsonPatchBuilder; false; replace; ; ; Argument[this]; ReturnValue; value; manual |
+| 98 | Summary: jakarta.json; JsonPatchBuilder; false; remove; ; ; Argument[this]; ReturnValue; value; manual |
 | 99 | Summary: jakarta.json; JsonPatchBuilder; false; replace; ; ; Argument[0..1]; ReturnValue; taint; manual |
-| 100 | Summary: jakarta.json; JsonPatchBuilder; false; test; ; ; Argument[this]; ReturnValue; value; manual |
+| 100 | Summary: jakarta.json; JsonPatchBuilder; false; replace; ; ; Argument[this]; ReturnValue; value; manual |
 | 101 | Summary: jakarta.json; JsonPatchBuilder; false; test; ; ; Argument[0..1]; ReturnValue; taint; manual |
-| 102 | Summary: jakarta.json; JsonPointer; false; add; ; ; Argument[this]; ReturnValue; taint; manual |
+| 102 | Summary: jakarta.json; JsonPatchBuilder; false; test; ; ; Argument[this]; ReturnValue; value; manual |
 | 103 | Summary: jakarta.json; JsonPointer; false; add; ; ; Argument[0..1]; ReturnValue; taint; manual |
-| 104 | Summary: jakarta.json; JsonPointer; false; getValue; ; ; Argument[0]; ReturnValue; taint; manual |
-| 105 | Summary: jakarta.json; JsonPointer; false; remove; ; ; Argument[0]; ReturnValue; taint; manual |
-| 106 | Summary: jakarta.json; JsonPointer; false; replace; ; ; Argument[0..1]; ReturnValue; taint; manual |
-| 107 | Summary: jakarta.json; JsonPointer; false; toString; ; ; Argument[this]; ReturnValue; taint; manual |
-| 108 | Summary: jakarta.json; JsonReader; false; read; ; ; Argument[this]; ReturnValue; taint; manual |
-| 109 | Summary: jakarta.json; JsonReader; false; readArray; ; ; Argument[this]; ReturnValue; taint; manual |
-| 110 | Summary: jakarta.json; JsonReader; false; readObject; ; ; Argument[this]; ReturnValue; taint; manual |
-| 111 | Summary: jakarta.json; JsonReader; false; readValue; ; ; Argument[this]; ReturnValue; taint; manual |
-| 112 | Summary: jakarta.json; JsonReaderFactory; false; createReader; ; ; Argument[0]; ReturnValue; taint; manual |
-| 113 | Summary: jakarta.json; JsonString; false; getChars; ; ; Argument[this]; ReturnValue; taint; manual |
-| 114 | Summary: jakarta.json; JsonString; false; getString; ; ; Argument[this]; ReturnValue; taint; manual |
-| 115 | Summary: jakarta.json; JsonStructure; true; getValue; ; ; Argument[this]; ReturnValue; taint; manual |
-| 116 | Summary: jakarta.json; JsonValue; true; asJsonArray; ; ; Argument[this]; ReturnValue; taint; manual |
-| 117 | Summary: jakarta.json; JsonValue; true; asJsonObject; ; ; Argument[this]; ReturnValue; taint; manual |
-| 118 | Summary: jakarta.json; JsonValue; true; toString; ; ; Argument[this]; ReturnValue; taint; manual |
-| 119 | Summary: jakarta.json; JsonWriter; false; write; ; ; Argument[0]; Argument[this]; taint; manual |
-| 120 | Summary: jakarta.json; JsonWriter; false; writeArray; ; ; Argument[0]; Argument[this]; taint; manual |
-| 121 | Summary: jakarta.json; JsonWriter; false; writeObject; ; ; Argument[0]; Argument[this]; taint; manual |
-| 122 | Summary: jakarta.json; JsonWriterFactory; false; createWriter; ; ; Argument[this]; Argument[0]; taint; manual |
-| 123 | Summary: jakarta.json.stream; JsonParserFactory; false; createParser; ; ; Argument[0]; ReturnValue; taint; manual |
+| 104 | Summary: jakarta.json; JsonPointer; false; add; ; ; Argument[this]; ReturnValue; taint; manual |
+| 105 | Summary: jakarta.json; JsonPointer; false; getValue; ; ; Argument[0]; ReturnValue; taint; manual |
+| 106 | Summary: jakarta.json; JsonPointer; false; remove; ; ; Argument[0]; ReturnValue; taint; manual |
+| 107 | Summary: jakarta.json; JsonPointer; false; replace; ; ; Argument[0..1]; ReturnValue; taint; manual |
+| 108 | Summary: jakarta.json; JsonPointer; false; toString; ; ; Argument[this]; ReturnValue; taint; manual |
+| 109 | Summary: jakarta.json; JsonReader; false; read; ; ; Argument[this]; ReturnValue; taint; manual |
+| 110 | Summary: jakarta.json; JsonReader; false; readArray; ; ; Argument[this]; ReturnValue; taint; manual |
+| 111 | Summary: jakarta.json; JsonReader; false; readObject; ; ; Argument[this]; ReturnValue; taint; manual |
+| 112 | Summary: jakarta.json; JsonReader; false; readValue; ; ; Argument[this]; ReturnValue; taint; manual |
+| 113 | Summary: jakarta.json; JsonReaderFactory; false; createReader; ; ; Argument[0]; ReturnValue; taint; manual |
+| 114 | Summary: jakarta.json; JsonString; false; getChars; ; ; Argument[this]; ReturnValue; taint; manual |
+| 115 | Summary: jakarta.json; JsonString; false; getString; ; ; Argument[this]; ReturnValue; taint; manual |
+| 116 | Summary: jakarta.json; JsonStructure; true; getValue; ; ; Argument[this]; ReturnValue; taint; manual |
+| 117 | Summary: jakarta.json; JsonValue; true; asJsonArray; ; ; Argument[this]; ReturnValue; taint; manual |
+| 118 | Summary: jakarta.json; JsonValue; true; asJsonObject; ; ; Argument[this]; ReturnValue; taint; manual |
+| 119 | Summary: jakarta.json; JsonValue; true; toString; ; ; Argument[this]; ReturnValue; taint; manual |
+| 120 | Summary: jakarta.json; JsonWriter; false; write; ; ; Argument[0]; Argument[this]; taint; manual |
+| 121 | Summary: jakarta.json; JsonWriter; false; writeArray; ; ; Argument[0]; Argument[this]; taint; manual |
+| 122 | Summary: jakarta.json; JsonWriter; false; writeObject; ; ; Argument[0]; Argument[this]; taint; manual |
+| 123 | Summary: jakarta.json; JsonWriterFactory; false; createWriter; ; ; Argument[this]; Argument[0]; taint; manual |
 | 124 | Summary: java.util; List; false; of; (Object); ; Argument[0]; ReturnValue.Element; value; manual |
 | 125 | Summary: java.util; Map; false; of; ; ; Argument[0]; ReturnValue.MapKey; value; manual |
 | 126 | Summary: java.util; Map; false; of; ; ; Argument[1]; ReturnValue.MapValue; value; manual |
-| 127 | Summary: javax.json; Json; false; createArrayBuilder; (Collection); ; Argument[0].Element; ReturnValue; taint; manual |
-| 128 | Summary: javax.json; Json; false; createArrayBuilder; (JsonArray); ; Argument[0]; ReturnValue; taint; manual |
-| 129 | Summary: javax.json; Json; false; createDiff; ; ; Argument[0..1]; ReturnValue; taint; manual |
-| 130 | Summary: javax.json; Json; false; createMergeDiff; ; ; Argument[0..1]; ReturnValue; taint; manual |
-| 131 | Summary: javax.json; Json; false; createMergePatch; ; ; Argument[0]; ReturnValue; taint; manual |
-| 132 | Summary: javax.json; Json; false; createObjectBuilder; (JsonObject); ; Argument[0]; ReturnValue; taint; manual |
-| 133 | Summary: javax.json; Json; false; createObjectBuilder; (Map); ; Argument[0].MapKey; ReturnValue; taint; manual |
-| 134 | Summary: javax.json; Json; false; createObjectBuilder; (Map); ; Argument[0].MapValue; ReturnValue; taint; manual |
-| 135 | Summary: javax.json; Json; false; createPatch; ; ; Argument[0]; ReturnValue; taint; manual |
-| 136 | Summary: javax.json; Json; false; createPatchBuilder; ; ; Argument[0]; ReturnValue; taint; manual |
-| 137 | Summary: javax.json; Json; false; createPointer; ; ; Argument[0]; ReturnValue; taint; manual |
-| 138 | Summary: javax.json; Json; false; createReader; ; ; Argument[0]; ReturnValue; taint; manual |
-| 139 | Summary: javax.json; Json; false; createValue; ; ; Argument[0]; ReturnValue; taint; manual |
-| 140 | Summary: javax.json; Json; false; createWriter; ; ; Argument[0]; ReturnValue; taint; manual |
-| 141 | Summary: javax.json; Json; false; decodePointer; ; ; Argument[0]; ReturnValue; taint; manual |
-| 142 | Summary: javax.json; Json; false; encodePointer; ; ; Argument[0]; ReturnValue; taint; manual |
-| 143 | Summary: javax.json; JsonArray; false; getBoolean; ; ; Argument[this]; ReturnValue; taint; manual |
+| 127 | Summary: javax.json.stream; JsonParserFactory; false; createParser; ; ; Argument[0]; ReturnValue; taint; manual |
+| 128 | Summary: javax.json; Json; false; createArrayBuilder; (Collection); ; Argument[0].Element; ReturnValue; taint; manual |
+| 129 | Summary: javax.json; Json; false; createArrayBuilder; (JsonArray); ; Argument[0]; ReturnValue; taint; manual |
+| 130 | Summary: javax.json; Json; false; createDiff; ; ; Argument[0..1]; ReturnValue; taint; manual |
+| 131 | Summary: javax.json; Json; false; createMergeDiff; ; ; Argument[0..1]; ReturnValue; taint; manual |
+| 132 | Summary: javax.json; Json; false; createMergePatch; ; ; Argument[0]; ReturnValue; taint; manual |
+| 133 | Summary: javax.json; Json; false; createObjectBuilder; (JsonObject); ; Argument[0]; ReturnValue; taint; manual |
+| 134 | Summary: javax.json; Json; false; createObjectBuilder; (Map); ; Argument[0].MapKey; ReturnValue; taint; manual |
+| 135 | Summary: javax.json; Json; false; createObjectBuilder; (Map); ; Argument[0].MapValue; ReturnValue; taint; manual |
+| 136 | Summary: javax.json; Json; false; createPatch; ; ; Argument[0]; ReturnValue; taint; manual |
+| 137 | Summary: javax.json; Json; false; createPatchBuilder; ; ; Argument[0]; ReturnValue; taint; manual |
+| 138 | Summary: javax.json; Json; false; createPointer; ; ; Argument[0]; ReturnValue; taint; manual |
+| 139 | Summary: javax.json; Json; false; createReader; ; ; Argument[0]; ReturnValue; taint; manual |
+| 140 | Summary: javax.json; Json; false; createValue; ; ; Argument[0]; ReturnValue; taint; manual |
+| 141 | Summary: javax.json; Json; false; createWriter; ; ; Argument[0]; ReturnValue; taint; manual |
+| 142 | Summary: javax.json; Json; false; decodePointer; ; ; Argument[0]; ReturnValue; taint; manual |
+| 143 | Summary: javax.json; Json; false; encodePointer; ; ; Argument[0]; ReturnValue; taint; manual |
 | 144 | Summary: javax.json; JsonArray; false; getBoolean; ; ; Argument[1]; ReturnValue; value; manual |
-| 145 | Summary: javax.json; JsonArray; false; getInt; ; ; Argument[this]; ReturnValue; taint; manual |
+| 145 | Summary: javax.json; JsonArray; false; getBoolean; ; ; Argument[this]; ReturnValue; taint; manual |
 | 146 | Summary: javax.json; JsonArray; false; getInt; ; ; Argument[1]; ReturnValue; value; manual |
-| 147 | Summary: javax.json; JsonArray; false; getJsonArray; ; ; Argument[this]; ReturnValue; taint; manual |
-| 148 | Summary: javax.json; JsonArray; false; getJsonNumber; ; ; Argument[this]; ReturnValue; taint; manual |
-| 149 | Summary: javax.json; JsonArray; false; getJsonObject; ; ; Argument[this]; ReturnValue; taint; manual |
-| 150 | Summary: javax.json; JsonArray; false; getJsonString; ; ; Argument[this]; ReturnValue; taint; manual |
-| 151 | Summary: javax.json; JsonArray; false; getString; ; ; Argument[this]; ReturnValue; taint; manual |
+| 147 | Summary: javax.json; JsonArray; false; getInt; ; ; Argument[this]; ReturnValue; taint; manual |
+| 148 | Summary: javax.json; JsonArray; false; getJsonArray; ; ; Argument[this]; ReturnValue; taint; manual |
+| 149 | Summary: javax.json; JsonArray; false; getJsonNumber; ; ; Argument[this]; ReturnValue; taint; manual |
+| 150 | Summary: javax.json; JsonArray; false; getJsonObject; ; ; Argument[this]; ReturnValue; taint; manual |
+| 151 | Summary: javax.json; JsonArray; false; getJsonString; ; ; Argument[this]; ReturnValue; taint; manual |
 | 152 | Summary: javax.json; JsonArray; false; getString; ; ; Argument[1]; ReturnValue; value; manual |
-| 153 | Summary: javax.json; JsonArray; false; getValuesAs; ; ; Argument[this]; ReturnValue; taint; manual |
-| 154 | Summary: javax.json; JsonArrayBuilder; false; add; ; ; Argument[this]; ReturnValue; value; manual |
+| 153 | Summary: javax.json; JsonArray; false; getString; ; ; Argument[this]; ReturnValue; taint; manual |
+| 154 | Summary: javax.json; JsonArray; false; getValuesAs; ; ; Argument[this]; ReturnValue; taint; manual |
 | 155 | Summary: javax.json; JsonArrayBuilder; false; add; (BigDecimal); ; Argument[0]; Argument[this]; taint; manual |
 | 156 | Summary: javax.json; JsonArrayBuilder; false; add; (BigInteger); ; Argument[0]; Argument[this]; taint; manual |
 | 157 | Summary: javax.json; JsonArrayBuilder; false; add; (JsonArrayBuilder); ; Argument[0]; Argument[this]; taint; manual |
@@ -173,80 +173,80 @@ models
 | 172 | Summary: javax.json; JsonArrayBuilder; false; add; (int,int); ; Argument[1]; Argument[this]; taint; manual |
 | 173 | Summary: javax.json; JsonArrayBuilder; false; add; (int,long); ; Argument[1]; Argument[this]; taint; manual |
 | 174 | Summary: javax.json; JsonArrayBuilder; false; add; (long); ; Argument[0]; Argument[this]; taint; manual |
-| 175 | Summary: javax.json; JsonArrayBuilder; false; addAll; ; ; Argument[this]; ReturnValue; value; manual |
+| 175 | Summary: javax.json; JsonArrayBuilder; false; add; ; ; Argument[this]; ReturnValue; value; manual |
 | 176 | Summary: javax.json; JsonArrayBuilder; false; addAll; ; ; Argument[0]; Argument[this]; taint; manual |
-| 177 | Summary: javax.json; JsonArrayBuilder; false; addNull; ; ; Argument[this]; ReturnValue; value; manual |
-| 178 | Summary: javax.json; JsonArrayBuilder; false; build; ; ; Argument[this]; ReturnValue; taint; manual |
-| 179 | Summary: javax.json; JsonArrayBuilder; false; remove; ; ; Argument[this]; ReturnValue; value; manual |
-| 180 | Summary: javax.json; JsonArrayBuilder; false; set; ; ; Argument[this]; ReturnValue; value; manual |
+| 177 | Summary: javax.json; JsonArrayBuilder; false; addAll; ; ; Argument[this]; ReturnValue; value; manual |
+| 178 | Summary: javax.json; JsonArrayBuilder; false; addNull; ; ; Argument[this]; ReturnValue; value; manual |
+| 179 | Summary: javax.json; JsonArrayBuilder; false; build; ; ; Argument[this]; ReturnValue; taint; manual |
+| 180 | Summary: javax.json; JsonArrayBuilder; false; remove; ; ; Argument[this]; ReturnValue; value; manual |
 | 181 | Summary: javax.json; JsonArrayBuilder; false; set; ; ; Argument[1]; Argument[this]; taint; manual |
-| 182 | Summary: javax.json; JsonArrayBuilder; false; setNull; ; ; Argument[this]; ReturnValue; value; manual |
-| 183 | Summary: javax.json; JsonMergePatch; false; apply; ; ; Argument[this]; ReturnValue; taint; manual |
+| 182 | Summary: javax.json; JsonArrayBuilder; false; set; ; ; Argument[this]; ReturnValue; value; manual |
+| 183 | Summary: javax.json; JsonArrayBuilder; false; setNull; ; ; Argument[this]; ReturnValue; value; manual |
 | 184 | Summary: javax.json; JsonMergePatch; false; apply; ; ; Argument[0]; ReturnValue; taint; manual |
-| 185 | Summary: javax.json; JsonMergePatch; false; toJsonValue; ; ; Argument[this]; ReturnValue; taint; manual |
-| 186 | Summary: javax.json; JsonNumber; false; bigDecimalValue; ; ; Argument[this]; ReturnValue; taint; manual |
-| 187 | Summary: javax.json; JsonNumber; false; bigIntegerValue; ; ; Argument[this]; ReturnValue; taint; manual |
-| 188 | Summary: javax.json; JsonNumber; false; bigIntegerValueExact; ; ; Argument[this]; ReturnValue; taint; manual |
-| 189 | Summary: javax.json; JsonNumber; false; doubleValue; ; ; Argument[this]; ReturnValue; taint; manual |
-| 190 | Summary: javax.json; JsonNumber; false; intValue; ; ; Argument[this]; ReturnValue; taint; manual |
-| 191 | Summary: javax.json; JsonNumber; false; intValueExact; ; ; Argument[this]; ReturnValue; taint; manual |
-| 192 | Summary: javax.json; JsonNumber; false; longValue; ; ; Argument[this]; ReturnValue; taint; manual |
-| 193 | Summary: javax.json; JsonNumber; false; longValueExact; ; ; Argument[this]; ReturnValue; taint; manual |
-| 194 | Summary: javax.json; JsonNumber; false; numberValue; ; ; Argument[this]; ReturnValue; taint; manual |
-| 195 | Summary: javax.json; JsonObject; false; getBoolean; ; ; Argument[this]; ReturnValue; taint; manual |
+| 185 | Summary: javax.json; JsonMergePatch; false; apply; ; ; Argument[this]; ReturnValue; taint; manual |
+| 186 | Summary: javax.json; JsonMergePatch; false; toJsonValue; ; ; Argument[this]; ReturnValue; taint; manual |
+| 187 | Summary: javax.json; JsonNumber; false; bigDecimalValue; ; ; Argument[this]; ReturnValue; taint; manual |
+| 188 | Summary: javax.json; JsonNumber; false; bigIntegerValue; ; ; Argument[this]; ReturnValue; taint; manual |
+| 189 | Summary: javax.json; JsonNumber; false; bigIntegerValueExact; ; ; Argument[this]; ReturnValue; taint; manual |
+| 190 | Summary: javax.json; JsonNumber; false; doubleValue; ; ; Argument[this]; ReturnValue; taint; manual |
+| 191 | Summary: javax.json; JsonNumber; false; intValue; ; ; Argument[this]; ReturnValue; taint; manual |
+| 192 | Summary: javax.json; JsonNumber; false; intValueExact; ; ; Argument[this]; ReturnValue; taint; manual |
+| 193 | Summary: javax.json; JsonNumber; false; longValue; ; ; Argument[this]; ReturnValue; taint; manual |
+| 194 | Summary: javax.json; JsonNumber; false; longValueExact; ; ; Argument[this]; ReturnValue; taint; manual |
+| 195 | Summary: javax.json; JsonNumber; false; numberValue; ; ; Argument[this]; ReturnValue; taint; manual |
 | 196 | Summary: javax.json; JsonObject; false; getBoolean; ; ; Argument[1]; ReturnValue; value; manual |
-| 197 | Summary: javax.json; JsonObject; false; getInt; ; ; Argument[this]; ReturnValue; taint; manual |
+| 197 | Summary: javax.json; JsonObject; false; getBoolean; ; ; Argument[this]; ReturnValue; taint; manual |
 | 198 | Summary: javax.json; JsonObject; false; getInt; ; ; Argument[1]; ReturnValue; value; manual |
-| 199 | Summary: javax.json; JsonObject; false; getJsonArray; ; ; Argument[this]; ReturnValue; taint; manual |
-| 200 | Summary: javax.json; JsonObject; false; getJsonNumber; ; ; Argument[this]; ReturnValue; taint; manual |
-| 201 | Summary: javax.json; JsonObject; false; getJsonObject; ; ; Argument[this]; ReturnValue; taint; manual |
-| 202 | Summary: javax.json; JsonObject; false; getJsonString; ; ; Argument[this]; ReturnValue; taint; manual |
-| 203 | Summary: javax.json; JsonObject; false; getString; ; ; Argument[this]; ReturnValue; taint; manual |
+| 199 | Summary: javax.json; JsonObject; false; getInt; ; ; Argument[this]; ReturnValue; taint; manual |
+| 200 | Summary: javax.json; JsonObject; false; getJsonArray; ; ; Argument[this]; ReturnValue; taint; manual |
+| 201 | Summary: javax.json; JsonObject; false; getJsonNumber; ; ; Argument[this]; ReturnValue; taint; manual |
+| 202 | Summary: javax.json; JsonObject; false; getJsonObject; ; ; Argument[this]; ReturnValue; taint; manual |
+| 203 | Summary: javax.json; JsonObject; false; getJsonString; ; ; Argument[this]; ReturnValue; taint; manual |
 | 204 | Summary: javax.json; JsonObject; false; getString; ; ; Argument[1]; ReturnValue; value; manual |
-| 205 | Summary: javax.json; JsonObjectBuilder; false; add; ; ; Argument[this]; ReturnValue; value; manual |
+| 205 | Summary: javax.json; JsonObject; false; getString; ; ; Argument[this]; ReturnValue; taint; manual |
 | 206 | Summary: javax.json; JsonObjectBuilder; false; add; ; ; Argument[1]; Argument[this]; taint; manual |
-| 207 | Summary: javax.json; JsonObjectBuilder; false; addAll; ; ; Argument[this]; ReturnValue; value; manual |
+| 207 | Summary: javax.json; JsonObjectBuilder; false; add; ; ; Argument[this]; ReturnValue; value; manual |
 | 208 | Summary: javax.json; JsonObjectBuilder; false; addAll; ; ; Argument[0]; ReturnValue; value; manual |
-| 209 | Summary: javax.json; JsonObjectBuilder; false; addNull; ; ; Argument[this]; ReturnValue; value; manual |
-| 210 | Summary: javax.json; JsonObjectBuilder; false; build; ; ; Argument[this]; ReturnValue; taint; manual |
-| 211 | Summary: javax.json; JsonObjectBuilder; false; remove; ; ; Argument[this]; ReturnValue; value; manual |
-| 212 | Summary: javax.json; JsonPatch; false; apply; ; ; Argument[this]; ReturnValue; taint; manual |
+| 209 | Summary: javax.json; JsonObjectBuilder; false; addAll; ; ; Argument[this]; ReturnValue; value; manual |
+| 210 | Summary: javax.json; JsonObjectBuilder; false; addNull; ; ; Argument[this]; ReturnValue; value; manual |
+| 211 | Summary: javax.json; JsonObjectBuilder; false; build; ; ; Argument[this]; ReturnValue; taint; manual |
+| 212 | Summary: javax.json; JsonObjectBuilder; false; remove; ; ; Argument[this]; ReturnValue; value; manual |
 | 213 | Summary: javax.json; JsonPatch; false; apply; ; ; Argument[0]; ReturnValue; taint; manual |
-| 214 | Summary: javax.json; JsonPatch; false; toJsonArray; ; ; Argument[this]; ReturnValue; taint; manual |
-| 215 | Summary: javax.json; JsonPatchBuilder; false; add; ; ; Argument[this]; ReturnValue; value; manual |
+| 214 | Summary: javax.json; JsonPatch; false; apply; ; ; Argument[this]; ReturnValue; taint; manual |
+| 215 | Summary: javax.json; JsonPatch; false; toJsonArray; ; ; Argument[this]; ReturnValue; taint; manual |
 | 216 | Summary: javax.json; JsonPatchBuilder; false; add; ; ; Argument[0..1]; ReturnValue; taint; manual |
-| 217 | Summary: javax.json; JsonPatchBuilder; false; build; ; ; Argument[this]; ReturnValue; taint; manual |
-| 218 | Summary: javax.json; JsonPatchBuilder; false; copy; ; ; Argument[this]; ReturnValue; value; manual |
+| 217 | Summary: javax.json; JsonPatchBuilder; false; add; ; ; Argument[this]; ReturnValue; value; manual |
+| 218 | Summary: javax.json; JsonPatchBuilder; false; build; ; ; Argument[this]; ReturnValue; taint; manual |
 | 219 | Summary: javax.json; JsonPatchBuilder; false; copy; ; ; Argument[0..1]; ReturnValue; taint; manual |
-| 220 | Summary: javax.json; JsonPatchBuilder; false; move; ; ; Argument[this]; ReturnValue; value; manual |
+| 220 | Summary: javax.json; JsonPatchBuilder; false; copy; ; ; Argument[this]; ReturnValue; value; manual |
 | 221 | Summary: javax.json; JsonPatchBuilder; false; move; ; ; Argument[0..1]; ReturnValue; taint; manual |
-| 222 | Summary: javax.json; JsonPatchBuilder; false; remove; ; ; Argument[this]; ReturnValue; value; manual |
+| 222 | Summary: javax.json; JsonPatchBuilder; false; move; ; ; Argument[this]; ReturnValue; value; manual |
 | 223 | Summary: javax.json; JsonPatchBuilder; false; remove; ; ; Argument[0]; ReturnValue; taint; manual |
-| 224 | Summary: javax.json; JsonPatchBuilder; false; replace; ; ; Argument[this]; ReturnValue; value; manual |
+| 224 | Summary: javax.json; JsonPatchBuilder; false; remove; ; ; Argument[this]; ReturnValue; value; manual |
 | 225 | Summary: javax.json; JsonPatchBuilder; false; replace; ; ; Argument[0..1]; ReturnValue; taint; manual |
-| 226 | Summary: javax.json; JsonPatchBuilder; false; test; ; ; Argument[this]; ReturnValue; value; manual |
+| 226 | Summary: javax.json; JsonPatchBuilder; false; replace; ; ; Argument[this]; ReturnValue; value; manual |
 | 227 | Summary: javax.json; JsonPatchBuilder; false; test; ; ; Argument[0..1]; ReturnValue; taint; manual |
-| 228 | Summary: javax.json; JsonPointer; false; add; ; ; Argument[this]; ReturnValue; taint; manual |
+| 228 | Summary: javax.json; JsonPatchBuilder; false; test; ; ; Argument[this]; ReturnValue; value; manual |
 | 229 | Summary: javax.json; JsonPointer; false; add; ; ; Argument[0..1]; ReturnValue; taint; manual |
-| 230 | Summary: javax.json; JsonPointer; false; getValue; ; ; Argument[0]; ReturnValue; taint; manual |
-| 231 | Summary: javax.json; JsonPointer; false; remove; ; ; Argument[0]; ReturnValue; taint; manual |
-| 232 | Summary: javax.json; JsonPointer; false; replace; ; ; Argument[0..1]; ReturnValue; taint; manual |
-| 233 | Summary: javax.json; JsonReader; false; read; ; ; Argument[this]; ReturnValue; taint; manual |
-| 234 | Summary: javax.json; JsonReader; false; readArray; ; ; Argument[this]; ReturnValue; taint; manual |
-| 235 | Summary: javax.json; JsonReader; false; readObject; ; ; Argument[this]; ReturnValue; taint; manual |
-| 236 | Summary: javax.json; JsonReader; false; readValue; ; ; Argument[this]; ReturnValue; taint; manual |
-| 237 | Summary: javax.json; JsonReaderFactory; false; createReader; ; ; Argument[0]; ReturnValue; taint; manual |
-| 238 | Summary: javax.json; JsonString; false; getChars; ; ; Argument[this]; ReturnValue; taint; manual |
-| 239 | Summary: javax.json; JsonString; false; getString; ; ; Argument[this]; ReturnValue; taint; manual |
-| 240 | Summary: javax.json; JsonStructure; true; getValue; ; ; Argument[this]; ReturnValue; taint; manual |
-| 241 | Summary: javax.json; JsonValue; true; asJsonArray; ; ; Argument[this]; ReturnValue; taint; manual |
-| 242 | Summary: javax.json; JsonValue; true; asJsonObject; ; ; Argument[this]; ReturnValue; taint; manual |
-| 243 | Summary: javax.json; JsonValue; true; toString; ; ; Argument[this]; ReturnValue; taint; manual |
-| 244 | Summary: javax.json; JsonWriter; false; write; ; ; Argument[0]; Argument[this]; taint; manual |
-| 245 | Summary: javax.json; JsonWriter; false; writeArray; ; ; Argument[0]; Argument[this]; taint; manual |
-| 246 | Summary: javax.json; JsonWriter; false; writeObject; ; ; Argument[0]; Argument[this]; taint; manual |
-| 247 | Summary: javax.json; JsonWriterFactory; false; createWriter; ; ; Argument[this]; Argument[0]; taint; manual |
-| 248 | Summary: javax.json.stream; JsonParserFactory; false; createParser; ; ; Argument[0]; ReturnValue; taint; manual |
+| 230 | Summary: javax.json; JsonPointer; false; add; ; ; Argument[this]; ReturnValue; taint; manual |
+| 231 | Summary: javax.json; JsonPointer; false; getValue; ; ; Argument[0]; ReturnValue; taint; manual |
+| 232 | Summary: javax.json; JsonPointer; false; remove; ; ; Argument[0]; ReturnValue; taint; manual |
+| 233 | Summary: javax.json; JsonPointer; false; replace; ; ; Argument[0..1]; ReturnValue; taint; manual |
+| 234 | Summary: javax.json; JsonReader; false; read; ; ; Argument[this]; ReturnValue; taint; manual |
+| 235 | Summary: javax.json; JsonReader; false; readArray; ; ; Argument[this]; ReturnValue; taint; manual |
+| 236 | Summary: javax.json; JsonReader; false; readObject; ; ; Argument[this]; ReturnValue; taint; manual |
+| 237 | Summary: javax.json; JsonReader; false; readValue; ; ; Argument[this]; ReturnValue; taint; manual |
+| 238 | Summary: javax.json; JsonReaderFactory; false; createReader; ; ; Argument[0]; ReturnValue; taint; manual |
+| 239 | Summary: javax.json; JsonString; false; getChars; ; ; Argument[this]; ReturnValue; taint; manual |
+| 240 | Summary: javax.json; JsonString; false; getString; ; ; Argument[this]; ReturnValue; taint; manual |
+| 241 | Summary: javax.json; JsonStructure; true; getValue; ; ; Argument[this]; ReturnValue; taint; manual |
+| 242 | Summary: javax.json; JsonValue; true; asJsonArray; ; ; Argument[this]; ReturnValue; taint; manual |
+| 243 | Summary: javax.json; JsonValue; true; asJsonObject; ; ; Argument[this]; ReturnValue; taint; manual |
+| 244 | Summary: javax.json; JsonValue; true; toString; ; ; Argument[this]; ReturnValue; taint; manual |
+| 245 | Summary: javax.json; JsonWriter; false; write; ; ; Argument[0]; Argument[this]; taint; manual |
+| 246 | Summary: javax.json; JsonWriter; false; writeArray; ; ; Argument[0]; Argument[this]; taint; manual |
+| 247 | Summary: javax.json; JsonWriter; false; writeObject; ; ; Argument[0]; Argument[this]; taint; manual |
+| 248 | Summary: javax.json; JsonWriterFactory; false; createWriter; ; ; Argument[this]; Argument[0]; taint; manual |
 edges
 | Test.java:17:28:17:41 | element : Object | Test.java:17:61:17:67 | element : Object | provenance |  |
 | Test.java:17:61:17:67 | element : Object | Test.java:17:53:17:68 | of(...) : List [<element>] : Object | provenance | MaD:124 |
@@ -257,136 +257,136 @@ edges
 | Test.java:28:33:28:65 | (...)... : JsonObject | Test.java:30:32:30:33 | in : JsonObject | provenance |  |
 | Test.java:28:58:28:65 | source(...) : Object | Test.java:28:33:28:65 | (...)... : JsonObject | provenance |  |
 | Test.java:30:10:30:34 | createParser(...) : JsonParser | Test.java:31:9:31:11 | out | provenance |  |
-| Test.java:30:32:30:33 | in : JsonObject | Test.java:30:10:30:34 | createParser(...) : JsonParser | provenance | MaD:123 |
+| Test.java:30:32:30:33 | in : JsonObject | Test.java:30:10:30:34 | createParser(...) : JsonParser | provenance | MaD:1 |
 | Test.java:36:32:36:63 | (...)... : JsonArray | Test.java:38:32:38:33 | in : JsonArray | provenance |  |
 | Test.java:36:56:36:63 | source(...) : Object | Test.java:36:32:36:63 | (...)... : JsonArray | provenance |  |
 | Test.java:38:10:38:34 | createParser(...) : JsonParser | Test.java:39:9:39:11 | out | provenance |  |
-| Test.java:38:32:38:33 | in : JsonArray | Test.java:38:10:38:34 | createParser(...) : JsonParser | provenance | MaD:123 |
+| Test.java:38:32:38:33 | in : JsonArray | Test.java:38:10:38:34 | createParser(...) : JsonParser | provenance | MaD:1 |
 | Test.java:44:16:44:31 | (...)... : Reader | Test.java:46:32:46:33 | in : Reader | provenance |  |
 | Test.java:44:24:44:31 | source(...) : Object | Test.java:44:16:44:31 | (...)... : Reader | provenance |  |
 | Test.java:46:10:46:34 | createParser(...) : JsonParser | Test.java:47:9:47:11 | out | provenance |  |
-| Test.java:46:32:46:33 | in : Reader | Test.java:46:10:46:34 | createParser(...) : JsonParser | provenance | MaD:123 |
+| Test.java:46:32:46:33 | in : Reader | Test.java:46:10:46:34 | createParser(...) : JsonParser | provenance | MaD:1 |
 | Test.java:52:21:52:41 | (...)... : InputStream | Test.java:54:32:54:33 | in : InputStream | provenance |  |
 | Test.java:52:34:52:41 | source(...) : Object | Test.java:52:21:52:41 | (...)... : InputStream | provenance |  |
 | Test.java:54:10:54:40 | createParser(...) : JsonParser | Test.java:55:9:55:11 | out | provenance |  |
-| Test.java:54:32:54:33 | in : InputStream | Test.java:54:10:54:40 | createParser(...) : JsonParser | provenance | MaD:123 |
+| Test.java:54:32:54:33 | in : InputStream | Test.java:54:10:54:40 | createParser(...) : JsonParser | provenance | MaD:1 |
 | Test.java:60:21:60:41 | (...)... : InputStream | Test.java:62:32:62:33 | in : InputStream | provenance |  |
 | Test.java:60:34:60:41 | source(...) : Object | Test.java:60:21:60:41 | (...)... : InputStream | provenance |  |
 | Test.java:62:10:62:34 | createParser(...) : JsonParser | Test.java:63:9:63:11 | out | provenance |  |
-| Test.java:62:32:62:33 | in : InputStream | Test.java:62:10:62:34 | createParser(...) : JsonParser | provenance | MaD:123 |
+| Test.java:62:32:62:33 | in : InputStream | Test.java:62:10:62:34 | createParser(...) : JsonParser | provenance | MaD:1 |
 | Test.java:68:20:68:55 | (...)... : List [<element>] : Object | Test.java:69:47:69:48 | in : List [<element>] : Object | provenance |  |
 | Test.java:68:32:68:55 | newWithElement(...) : List [<element>] : Object | Test.java:68:20:68:55 | (...)... : List [<element>] : Object | provenance |  |
 | Test.java:68:47:68:54 | source(...) : Object | Test.java:17:28:17:41 | element : Object | provenance |  |
 | Test.java:68:47:68:54 | source(...) : Object | Test.java:68:32:68:55 | newWithElement(...) : List [<element>] : Object | provenance | MaD:124 |
 | Test.java:69:10:69:49 | createArrayBuilder(...) : JsonArrayBuilder | Test.java:70:9:70:11 | out | provenance |  |
-| Test.java:69:47:69:48 | in : List [<element>] : Object | Test.java:69:10:69:49 | createArrayBuilder(...) : JsonArrayBuilder | provenance | MaD:1 |
+| Test.java:69:47:69:48 | in : List [<element>] : Object | Test.java:69:10:69:49 | createArrayBuilder(...) : JsonArrayBuilder | provenance | MaD:2 |
 | Test.java:75:32:75:63 | (...)... : JsonArray | Test.java:76:47:76:48 | in : JsonArray | provenance |  |
 | Test.java:75:56:75:63 | source(...) : Object | Test.java:75:32:75:63 | (...)... : JsonArray | provenance |  |
 | Test.java:76:10:76:49 | createArrayBuilder(...) : JsonArrayBuilder | Test.java:77:9:77:11 | out | provenance |  |
-| Test.java:76:47:76:48 | in : JsonArray | Test.java:76:10:76:49 | createArrayBuilder(...) : JsonArrayBuilder | provenance | MaD:2 |
+| Test.java:76:47:76:48 | in : JsonArray | Test.java:76:10:76:49 | createArrayBuilder(...) : JsonArrayBuilder | provenance | MaD:3 |
 | Test.java:82:36:82:71 | (...)... : JsonStructure | Test.java:83:45:83:46 | in : JsonStructure | provenance |  |
 | Test.java:82:64:82:71 | source(...) : Object | Test.java:82:36:82:71 | (...)... : JsonStructure | provenance |  |
 | Test.java:83:10:83:47 | createDiff(...) : JsonPatch | Test.java:84:9:84:11 | out | provenance |  |
-| Test.java:83:45:83:46 | in : JsonStructure | Test.java:83:10:83:47 | createDiff(...) : JsonPatch | provenance | MaD:3 |
+| Test.java:83:45:83:46 | in : JsonStructure | Test.java:83:10:83:47 | createDiff(...) : JsonPatch | provenance | MaD:4 |
 | Test.java:89:36:89:71 | (...)... : JsonStructure | Test.java:90:39:90:40 | in : JsonStructure | provenance |  |
 | Test.java:89:64:89:71 | source(...) : Object | Test.java:89:36:89:71 | (...)... : JsonStructure | provenance |  |
 | Test.java:90:10:90:47 | createDiff(...) : JsonPatch | Test.java:91:9:91:11 | out | provenance |  |
-| Test.java:90:39:90:40 | in : JsonStructure | Test.java:90:10:90:47 | createDiff(...) : JsonPatch | provenance | MaD:3 |
+| Test.java:90:39:90:40 | in : JsonStructure | Test.java:90:10:90:47 | createDiff(...) : JsonPatch | provenance | MaD:4 |
 | Test.java:96:32:96:63 | (...)... : JsonValue | Test.java:97:50:97:51 | in : JsonValue | provenance |  |
 | Test.java:96:56:96:63 | source(...) : Object | Test.java:96:32:96:63 | (...)... : JsonValue | provenance |  |
 | Test.java:97:10:97:52 | createMergeDiff(...) : JsonMergePatch | Test.java:98:9:98:11 | out | provenance |  |
-| Test.java:97:50:97:51 | in : JsonValue | Test.java:97:10:97:52 | createMergeDiff(...) : JsonMergePatch | provenance | MaD:4 |
+| Test.java:97:50:97:51 | in : JsonValue | Test.java:97:10:97:52 | createMergeDiff(...) : JsonMergePatch | provenance | MaD:5 |
 | Test.java:103:32:103:63 | (...)... : JsonValue | Test.java:104:44:104:45 | in : JsonValue | provenance |  |
 | Test.java:103:56:103:63 | source(...) : Object | Test.java:103:32:103:63 | (...)... : JsonValue | provenance |  |
 | Test.java:104:10:104:52 | createMergeDiff(...) : JsonMergePatch | Test.java:105:9:105:11 | out | provenance |  |
-| Test.java:104:44:104:45 | in : JsonValue | Test.java:104:10:104:52 | createMergeDiff(...) : JsonMergePatch | provenance | MaD:4 |
+| Test.java:104:44:104:45 | in : JsonValue | Test.java:104:10:104:52 | createMergeDiff(...) : JsonMergePatch | provenance | MaD:5 |
 | Test.java:110:32:110:63 | (...)... : JsonValue | Test.java:111:45:111:46 | in : JsonValue | provenance |  |
 | Test.java:110:56:110:63 | source(...) : Object | Test.java:110:32:110:63 | (...)... : JsonValue | provenance |  |
 | Test.java:111:10:111:47 | createMergePatch(...) : JsonMergePatch | Test.java:112:9:112:11 | out | provenance |  |
-| Test.java:111:45:111:46 | in : JsonValue | Test.java:111:10:111:47 | createMergePatch(...) : JsonMergePatch | provenance | MaD:5 |
+| Test.java:111:45:111:46 | in : JsonValue | Test.java:111:10:111:47 | createMergePatch(...) : JsonMergePatch | provenance | MaD:6 |
 | Test.java:117:33:117:65 | (...)... : JsonObject | Test.java:118:48:118:49 | in : JsonObject | provenance |  |
 | Test.java:117:58:117:65 | source(...) : Object | Test.java:117:33:117:65 | (...)... : JsonObject | provenance |  |
 | Test.java:118:10:118:50 | createObjectBuilder(...) : JsonObjectBuilder | Test.java:119:9:119:11 | out | provenance |  |
-| Test.java:118:48:118:49 | in : JsonObject | Test.java:118:10:118:50 | createObjectBuilder(...) : JsonObjectBuilder | provenance | MaD:6 |
+| Test.java:118:48:118:49 | in : JsonObject | Test.java:118:10:118:50 | createObjectBuilder(...) : JsonObjectBuilder | provenance | MaD:7 |
 | Test.java:124:13:124:40 | (...)... : Map [<map.key>] : Object | Test.java:125:48:125:49 | in : Map [<map.key>] : Object | provenance |  |
 | Test.java:124:18:124:40 | newWithMapKey(...) : Map [<map.key>] : Object | Test.java:124:13:124:40 | (...)... : Map [<map.key>] : Object | provenance |  |
 | Test.java:124:32:124:39 | source(...) : Object | Test.java:18:20:18:33 | element : Object | provenance |  |
 | Test.java:124:32:124:39 | source(...) : Object | Test.java:124:18:124:40 | newWithMapKey(...) : Map [<map.key>] : Object | provenance | MaD:125 |
 | Test.java:125:10:125:50 | createObjectBuilder(...) : JsonObjectBuilder | Test.java:126:9:126:11 | out | provenance |  |
-| Test.java:125:48:125:49 | in : Map [<map.key>] : Object | Test.java:125:10:125:50 | createObjectBuilder(...) : JsonObjectBuilder | provenance | MaD:7 |
+| Test.java:125:48:125:49 | in : Map [<map.key>] : Object | Test.java:125:10:125:50 | createObjectBuilder(...) : JsonObjectBuilder | provenance | MaD:8 |
 | Test.java:131:13:131:42 | (...)... : Map [<map.value>] : Object | Test.java:132:48:132:49 | in : Map [<map.value>] : Object | provenance |  |
 | Test.java:131:18:131:42 | newWithMapValue(...) : Map [<map.value>] : Object | Test.java:131:13:131:42 | (...)... : Map [<map.value>] : Object | provenance |  |
 | Test.java:131:34:131:41 | source(...) : Object | Test.java:19:22:19:35 | element : Object | provenance |  |
 | Test.java:131:34:131:41 | source(...) : Object | Test.java:131:18:131:42 | newWithMapValue(...) : Map [<map.value>] : Object | provenance | MaD:126 |
 | Test.java:132:10:132:50 | createObjectBuilder(...) : JsonObjectBuilder | Test.java:133:9:133:11 | out | provenance |  |
-| Test.java:132:48:132:49 | in : Map [<map.value>] : Object | Test.java:132:10:132:50 | createObjectBuilder(...) : JsonObjectBuilder | provenance | MaD:8 |
+| Test.java:132:48:132:49 | in : Map [<map.value>] : Object | Test.java:132:10:132:50 | createObjectBuilder(...) : JsonObjectBuilder | provenance | MaD:9 |
 | Test.java:138:32:138:63 | (...)... : JsonArray | Test.java:139:40:139:41 | in : JsonArray | provenance |  |
 | Test.java:138:56:138:63 | source(...) : Object | Test.java:138:32:138:63 | (...)... : JsonArray | provenance |  |
 | Test.java:139:10:139:42 | createPatch(...) : JsonPatch | Test.java:140:9:140:11 | out | provenance |  |
-| Test.java:139:40:139:41 | in : JsonArray | Test.java:139:10:139:42 | createPatch(...) : JsonPatch | provenance | MaD:9 |
+| Test.java:139:40:139:41 | in : JsonArray | Test.java:139:10:139:42 | createPatch(...) : JsonPatch | provenance | MaD:10 |
 | Test.java:145:32:145:63 | (...)... : JsonArray | Test.java:146:47:146:48 | in : JsonArray | provenance |  |
 | Test.java:145:56:145:63 | source(...) : Object | Test.java:145:32:145:63 | (...)... : JsonArray | provenance |  |
 | Test.java:146:10:146:49 | createPatchBuilder(...) : JsonPatchBuilder | Test.java:147:9:147:11 | out | provenance |  |
-| Test.java:146:47:146:48 | in : JsonArray | Test.java:146:10:146:49 | createPatchBuilder(...) : JsonPatchBuilder | provenance | MaD:10 |
+| Test.java:146:47:146:48 | in : JsonArray | Test.java:146:10:146:49 | createPatchBuilder(...) : JsonPatchBuilder | provenance | MaD:11 |
 | Test.java:152:16:152:31 | (...)... : String | Test.java:153:42:153:43 | in : String | provenance |  |
 | Test.java:152:24:152:31 | source(...) : Object | Test.java:152:16:152:31 | (...)... : String | provenance |  |
 | Test.java:153:10:153:44 | createPointer(...) : JsonPointer | Test.java:154:9:154:11 | out | provenance |  |
-| Test.java:153:42:153:43 | in : String | Test.java:153:10:153:44 | createPointer(...) : JsonPointer | provenance | MaD:11 |
+| Test.java:153:42:153:43 | in : String | Test.java:153:10:153:44 | createPointer(...) : JsonPointer | provenance | MaD:12 |
 | Test.java:159:16:159:31 | (...)... : Reader | Test.java:160:41:160:42 | in : Reader | provenance |  |
 | Test.java:159:24:159:31 | source(...) : Object | Test.java:159:16:159:31 | (...)... : Reader | provenance |  |
 | Test.java:160:10:160:43 | createReader(...) : JsonReader | Test.java:161:9:161:11 | out | provenance |  |
-| Test.java:160:41:160:42 | in : Reader | Test.java:160:10:160:43 | createReader(...) : JsonReader | provenance | MaD:12 |
+| Test.java:160:41:160:42 | in : Reader | Test.java:160:10:160:43 | createReader(...) : JsonReader | provenance | MaD:13 |
 | Test.java:166:21:166:41 | (...)... : InputStream | Test.java:167:41:167:42 | in : InputStream | provenance |  |
 | Test.java:166:34:166:41 | source(...) : Object | Test.java:166:21:166:41 | (...)... : InputStream | provenance |  |
 | Test.java:167:10:167:43 | createReader(...) : JsonReader | Test.java:168:9:168:11 | out | provenance |  |
-| Test.java:167:41:167:42 | in : InputStream | Test.java:167:10:167:43 | createReader(...) : JsonReader | provenance | MaD:12 |
+| Test.java:167:41:167:42 | in : InputStream | Test.java:167:10:167:43 | createReader(...) : JsonReader | provenance | MaD:13 |
 | Test.java:173:16:173:31 | (...)... : String | Test.java:174:40:174:41 | in : String | provenance |  |
 | Test.java:173:24:173:31 | source(...) : Object | Test.java:173:16:173:31 | (...)... : String | provenance |  |
 | Test.java:174:10:174:42 | createValue(...) : JsonString | Test.java:175:9:175:11 | out | provenance |  |
-| Test.java:174:40:174:41 | in : String | Test.java:174:10:174:42 | createValue(...) : JsonString | provenance | MaD:13 |
+| Test.java:174:40:174:41 | in : String | Test.java:174:10:174:42 | createValue(...) : JsonString | provenance | MaD:14 |
 | Test.java:180:14:180:27 | (...)... : Number | Test.java:181:40:181:41 | in : Number | provenance |  |
 | Test.java:180:20:180:27 | source(...) : Object | Test.java:180:14:180:27 | (...)... : Number | provenance |  |
 | Test.java:181:10:181:42 | createValue(...) : JsonNumber | Test.java:182:9:182:11 | out | provenance |  |
-| Test.java:181:40:181:41 | in : Number | Test.java:181:10:181:42 | createValue(...) : JsonNumber | provenance | MaD:13 |
+| Test.java:181:40:181:41 | in : Number | Test.java:181:10:181:42 | createValue(...) : JsonNumber | provenance | MaD:14 |
 | Test.java:187:13:187:25 | (...)... : Number | Test.java:188:40:188:41 | in : Number | provenance |  |
 | Test.java:187:18:187:25 | source(...) : Object | Test.java:187:13:187:25 | (...)... : Number | provenance |  |
 | Test.java:188:10:188:42 | createValue(...) : JsonNumber | Test.java:189:9:189:11 | out | provenance |  |
-| Test.java:188:40:188:41 | in : Number | Test.java:188:10:188:42 | createValue(...) : JsonNumber | provenance | MaD:13 |
+| Test.java:188:40:188:41 | in : Number | Test.java:188:10:188:42 | createValue(...) : JsonNumber | provenance | MaD:14 |
 | Test.java:194:16:194:31 | (...)... : Number | Test.java:195:40:195:41 | in : Number | provenance |  |
 | Test.java:194:24:194:31 | source(...) : Object | Test.java:194:16:194:31 | (...)... : Number | provenance |  |
 | Test.java:195:10:195:42 | createValue(...) : JsonNumber | Test.java:196:9:196:11 | out | provenance |  |
-| Test.java:195:40:195:41 | in : Number | Test.java:195:10:195:42 | createValue(...) : JsonNumber | provenance | MaD:13 |
+| Test.java:195:40:195:41 | in : Number | Test.java:195:10:195:42 | createValue(...) : JsonNumber | provenance | MaD:14 |
 | Test.java:201:20:201:39 | (...)... : BigInteger | Test.java:202:40:202:41 | in : BigInteger | provenance |  |
 | Test.java:201:32:201:39 | source(...) : Object | Test.java:201:20:201:39 | (...)... : BigInteger | provenance |  |
 | Test.java:202:10:202:42 | createValue(...) : JsonNumber | Test.java:203:9:203:11 | out | provenance |  |
-| Test.java:202:40:202:41 | in : BigInteger | Test.java:202:10:202:42 | createValue(...) : JsonNumber | provenance | MaD:13 |
+| Test.java:202:40:202:41 | in : BigInteger | Test.java:202:10:202:42 | createValue(...) : JsonNumber | provenance | MaD:14 |
 | Test.java:208:20:208:39 | (...)... : BigDecimal | Test.java:209:40:209:41 | in : BigDecimal | provenance |  |
 | Test.java:208:32:208:39 | source(...) : Object | Test.java:208:20:208:39 | (...)... : BigDecimal | provenance |  |
 | Test.java:209:10:209:42 | createValue(...) : JsonNumber | Test.java:210:9:210:11 | out | provenance |  |
-| Test.java:209:40:209:41 | in : BigDecimal | Test.java:209:10:209:42 | createValue(...) : JsonNumber | provenance | MaD:13 |
+| Test.java:209:40:209:41 | in : BigDecimal | Test.java:209:10:209:42 | createValue(...) : JsonNumber | provenance | MaD:14 |
 | Test.java:215:16:215:31 | (...)... : Writer | Test.java:216:41:216:42 | in : Writer | provenance |  |
 | Test.java:215:24:215:31 | source(...) : Object | Test.java:215:16:215:31 | (...)... : Writer | provenance |  |
 | Test.java:216:10:216:43 | createWriter(...) : JsonWriter | Test.java:217:9:217:11 | out | provenance |  |
-| Test.java:216:41:216:42 | in : Writer | Test.java:216:10:216:43 | createWriter(...) : JsonWriter | provenance | MaD:14 |
+| Test.java:216:41:216:42 | in : Writer | Test.java:216:10:216:43 | createWriter(...) : JsonWriter | provenance | MaD:15 |
 | Test.java:222:22:222:43 | (...)... : OutputStream | Test.java:223:41:223:42 | in : OutputStream | provenance |  |
 | Test.java:222:36:222:43 | source(...) : Object | Test.java:222:22:222:43 | (...)... : OutputStream | provenance |  |
 | Test.java:223:10:223:43 | createWriter(...) : JsonWriter | Test.java:224:9:224:11 | out | provenance |  |
-| Test.java:223:41:223:42 | in : OutputStream | Test.java:223:10:223:43 | createWriter(...) : JsonWriter | provenance | MaD:14 |
+| Test.java:223:41:223:42 | in : OutputStream | Test.java:223:10:223:43 | createWriter(...) : JsonWriter | provenance | MaD:15 |
 | Test.java:229:16:229:31 | (...)... : String | Test.java:230:42:230:43 | in : String | provenance |  |
 | Test.java:229:24:229:31 | source(...) : Object | Test.java:229:16:229:31 | (...)... : String | provenance |  |
 | Test.java:230:10:230:44 | decodePointer(...) : String | Test.java:231:9:231:11 | out | provenance |  |
-| Test.java:230:42:230:43 | in : String | Test.java:230:10:230:44 | decodePointer(...) : String | provenance | MaD:15 |
+| Test.java:230:42:230:43 | in : String | Test.java:230:10:230:44 | decodePointer(...) : String | provenance | MaD:16 |
 | Test.java:236:16:236:31 | (...)... : String | Test.java:237:42:237:43 | in : String | provenance |  |
 | Test.java:236:24:236:31 | source(...) : Object | Test.java:236:16:236:31 | (...)... : String | provenance |  |
 | Test.java:237:10:237:44 | encodePointer(...) : String | Test.java:238:9:238:11 | out | provenance |  |
-| Test.java:237:42:237:43 | in : String | Test.java:237:10:237:44 | encodePointer(...) : String | provenance | MaD:16 |
+| Test.java:237:42:237:43 | in : String | Test.java:237:10:237:44 | encodePointer(...) : String | provenance | MaD:17 |
 | Test.java:243:32:243:63 | (...)... : JsonArray | Test.java:244:10:244:11 | in : JsonArray | provenance |  |
 | Test.java:243:56:243:63 | source(...) : Object | Test.java:243:32:243:63 | (...)... : JsonArray | provenance |  |
-| Test.java:244:10:244:11 | in : JsonArray | Test.java:244:10:244:32 | getBoolean(...) : Boolean | provenance | MaD:17 |
+| Test.java:244:10:244:11 | in : JsonArray | Test.java:244:10:244:32 | getBoolean(...) : Boolean | provenance | MaD:19 |
 | Test.java:244:10:244:32 | getBoolean(...) : Boolean | Test.java:245:9:245:11 | out | provenance |  |
 | Test.java:250:32:250:63 | (...)... : JsonArray | Test.java:251:10:251:11 | in : JsonArray | provenance |  |
 | Test.java:250:56:250:63 | source(...) : Object | Test.java:250:32:250:63 | (...)... : JsonArray | provenance |  |
-| Test.java:251:10:251:11 | in : JsonArray | Test.java:251:10:251:25 | getBoolean(...) : Boolean | provenance | MaD:17 |
+| Test.java:251:10:251:11 | in : JsonArray | Test.java:251:10:251:25 | getBoolean(...) : Boolean | provenance | MaD:19 |
 | Test.java:251:10:251:25 | getBoolean(...) : Boolean | Test.java:252:9:252:11 | out | provenance |  |
 | Test.java:257:17:257:33 | (...)... : Boolean | Test.java:259:33:259:34 | in : Boolean | provenance |  |
 | Test.java:257:26:257:33 | source(...) : Object | Test.java:257:17:257:33 | (...)... : Boolean | provenance |  |
@@ -394,11 +394,11 @@ edges
 | Test.java:259:33:259:34 | in : Boolean | Test.java:259:10:259:35 | getBoolean(...) : Boolean | provenance | MaD:18 |
 | Test.java:265:32:265:63 | (...)... : JsonArray | Test.java:266:10:266:11 | in : JsonArray | provenance |  |
 | Test.java:265:56:265:63 | source(...) : Object | Test.java:265:32:265:63 | (...)... : JsonArray | provenance |  |
-| Test.java:266:10:266:11 | in : JsonArray | Test.java:266:10:266:24 | getInt(...) : Number | provenance | MaD:19 |
+| Test.java:266:10:266:11 | in : JsonArray | Test.java:266:10:266:24 | getInt(...) : Number | provenance | MaD:21 |
 | Test.java:266:10:266:24 | getInt(...) : Number | Test.java:267:9:267:11 | out | provenance |  |
 | Test.java:272:32:272:63 | (...)... : JsonArray | Test.java:273:10:273:11 | in : JsonArray | provenance |  |
 | Test.java:272:56:272:63 | source(...) : Object | Test.java:272:32:272:63 | (...)... : JsonArray | provenance |  |
-| Test.java:273:10:273:11 | in : JsonArray | Test.java:273:10:273:21 | getInt(...) : Number | provenance | MaD:19 |
+| Test.java:273:10:273:11 | in : JsonArray | Test.java:273:10:273:21 | getInt(...) : Number | provenance | MaD:21 |
 | Test.java:273:10:273:21 | getInt(...) : Number | Test.java:274:9:274:11 | out | provenance |  |
 | Test.java:279:13:279:25 | (...)... : Number | Test.java:281:29:281:30 | in : Number | provenance |  |
 | Test.java:279:18:279:25 | source(...) : Object | Test.java:279:13:279:25 | (...)... : Number | provenance |  |
@@ -406,27 +406,27 @@ edges
 | Test.java:281:29:281:30 | in : Number | Test.java:281:10:281:31 | getInt(...) : Number | provenance | MaD:20 |
 | Test.java:287:32:287:63 | (...)... : JsonArray | Test.java:288:10:288:11 | in : JsonArray | provenance |  |
 | Test.java:287:56:287:63 | source(...) : Object | Test.java:287:32:287:63 | (...)... : JsonArray | provenance |  |
-| Test.java:288:10:288:11 | in : JsonArray | Test.java:288:10:288:27 | getJsonArray(...) : JsonArray | provenance | MaD:21 |
+| Test.java:288:10:288:11 | in : JsonArray | Test.java:288:10:288:27 | getJsonArray(...) : JsonArray | provenance | MaD:22 |
 | Test.java:288:10:288:27 | getJsonArray(...) : JsonArray | Test.java:289:9:289:11 | out | provenance |  |
 | Test.java:294:32:294:63 | (...)... : JsonArray | Test.java:295:10:295:11 | in : JsonArray | provenance |  |
 | Test.java:294:56:294:63 | source(...) : Object | Test.java:294:32:294:63 | (...)... : JsonArray | provenance |  |
-| Test.java:295:10:295:11 | in : JsonArray | Test.java:295:10:295:28 | getJsonNumber(...) : JsonNumber | provenance | MaD:22 |
+| Test.java:295:10:295:11 | in : JsonArray | Test.java:295:10:295:28 | getJsonNumber(...) : JsonNumber | provenance | MaD:23 |
 | Test.java:295:10:295:28 | getJsonNumber(...) : JsonNumber | Test.java:296:9:296:11 | out | provenance |  |
 | Test.java:301:32:301:63 | (...)... : JsonArray | Test.java:302:10:302:11 | in : JsonArray | provenance |  |
 | Test.java:301:56:301:63 | source(...) : Object | Test.java:301:32:301:63 | (...)... : JsonArray | provenance |  |
-| Test.java:302:10:302:11 | in : JsonArray | Test.java:302:10:302:28 | getJsonObject(...) : JsonObject | provenance | MaD:23 |
+| Test.java:302:10:302:11 | in : JsonArray | Test.java:302:10:302:28 | getJsonObject(...) : JsonObject | provenance | MaD:24 |
 | Test.java:302:10:302:28 | getJsonObject(...) : JsonObject | Test.java:303:9:303:11 | out | provenance |  |
 | Test.java:308:32:308:63 | (...)... : JsonArray | Test.java:309:10:309:11 | in : JsonArray | provenance |  |
 | Test.java:308:56:308:63 | source(...) : Object | Test.java:308:32:308:63 | (...)... : JsonArray | provenance |  |
-| Test.java:309:10:309:11 | in : JsonArray | Test.java:309:10:309:28 | getJsonString(...) : JsonString | provenance | MaD:24 |
+| Test.java:309:10:309:11 | in : JsonArray | Test.java:309:10:309:28 | getJsonString(...) : JsonString | provenance | MaD:25 |
 | Test.java:309:10:309:28 | getJsonString(...) : JsonString | Test.java:310:9:310:11 | out | provenance |  |
 | Test.java:315:32:315:63 | (...)... : JsonArray | Test.java:316:10:316:11 | in : JsonArray | provenance |  |
 | Test.java:315:56:315:63 | source(...) : Object | Test.java:315:32:315:63 | (...)... : JsonArray | provenance |  |
-| Test.java:316:10:316:11 | in : JsonArray | Test.java:316:10:316:30 | getString(...) : String | provenance | MaD:25 |
+| Test.java:316:10:316:11 | in : JsonArray | Test.java:316:10:316:30 | getString(...) : String | provenance | MaD:27 |
 | Test.java:316:10:316:30 | getString(...) : String | Test.java:317:9:317:11 | out | provenance |  |
 | Test.java:322:32:322:63 | (...)... : JsonArray | Test.java:323:10:323:11 | in : JsonArray | provenance |  |
 | Test.java:322:56:322:63 | source(...) : Object | Test.java:322:32:322:63 | (...)... : JsonArray | provenance |  |
-| Test.java:323:10:323:11 | in : JsonArray | Test.java:323:10:323:24 | getString(...) : String | provenance | MaD:25 |
+| Test.java:323:10:323:11 | in : JsonArray | Test.java:323:10:323:24 | getString(...) : String | provenance | MaD:27 |
 | Test.java:323:10:323:24 | getString(...) : String | Test.java:324:9:324:11 | out | provenance |  |
 | Test.java:329:16:329:31 | (...)... : String | Test.java:331:32:331:33 | in : String | provenance |  |
 | Test.java:329:24:329:31 | source(...) : Object | Test.java:329:16:329:31 | (...)... : String | provenance |  |
@@ -434,11 +434,11 @@ edges
 | Test.java:331:32:331:33 | in : String | Test.java:331:10:331:34 | getString(...) : String | provenance | MaD:26 |
 | Test.java:337:32:337:63 | (...)... : JsonArray | Test.java:338:10:338:11 | in : JsonArray | provenance |  |
 | Test.java:337:56:337:63 | source(...) : Object | Test.java:337:32:337:63 | (...)... : JsonArray | provenance |  |
-| Test.java:338:10:338:11 | in : JsonArray | Test.java:338:10:338:39 | getValuesAs(...) : List | provenance | MaD:27 |
+| Test.java:338:10:338:11 | in : JsonArray | Test.java:338:10:338:39 | getValuesAs(...) : List | provenance | MaD:28 |
 | Test.java:338:10:338:39 | getValuesAs(...) : List | Test.java:339:9:339:11 | out | provenance |  |
 | Test.java:344:32:344:63 | (...)... : JsonArray | Test.java:345:10:345:11 | in : JsonArray | provenance |  |
 | Test.java:344:56:344:63 | source(...) : Object | Test.java:344:32:344:63 | (...)... : JsonArray | provenance |  |
-| Test.java:345:10:345:11 | in : JsonArray | Test.java:345:10:345:36 | getValuesAs(...) : List | provenance | MaD:27 |
+| Test.java:345:10:345:11 | in : JsonArray | Test.java:345:10:345:36 | getValuesAs(...) : List | provenance | MaD:28 |
 | Test.java:345:10:345:36 | getValuesAs(...) : List | Test.java:346:9:346:11 | out | provenance |  |
 | Test.java:351:20:351:39 | (...)... : BigDecimal | Test.java:352:12:352:13 | in : BigDecimal | provenance |  |
 | Test.java:351:32:351:39 | source(...) : Object | Test.java:351:20:351:39 | (...)... : BigDecimal | provenance |  |
@@ -522,87 +522,87 @@ edges
 | Test.java:485:12:485:13 | in : Number | Test.java:485:4:485:6 | out [post update] : JsonArrayBuilder | provenance | MaD:48 |
 | Test.java:491:39:491:77 | (...)... : JsonArrayBuilder | Test.java:492:10:492:11 | in : JsonArrayBuilder | provenance |  |
 | Test.java:491:70:491:77 | source(...) : Object | Test.java:491:39:491:77 | (...)... : JsonArrayBuilder | provenance |  |
-| Test.java:492:10:492:11 | in : JsonArrayBuilder | Test.java:492:10:492:22 | add(...) : JsonArrayBuilder | provenance | MaD:28 |
+| Test.java:492:10:492:11 | in : JsonArrayBuilder | Test.java:492:10:492:22 | add(...) : JsonArrayBuilder | provenance | MaD:49 |
 | Test.java:492:10:492:22 | add(...) : JsonArrayBuilder | Test.java:493:9:493:11 | out | provenance |  |
 | Test.java:498:39:498:77 | (...)... : JsonArrayBuilder | Test.java:499:10:499:11 | in : JsonArrayBuilder | provenance |  |
 | Test.java:498:70:498:77 | source(...) : Object | Test.java:498:39:498:77 | (...)... : JsonArrayBuilder | provenance |  |
-| Test.java:499:10:499:11 | in : JsonArrayBuilder | Test.java:499:10:499:19 | add(...) : JsonArrayBuilder | provenance | MaD:28 |
+| Test.java:499:10:499:11 | in : JsonArrayBuilder | Test.java:499:10:499:19 | add(...) : JsonArrayBuilder | provenance | MaD:49 |
 | Test.java:499:10:499:19 | add(...) : JsonArrayBuilder | Test.java:500:9:500:11 | out | provenance |  |
 | Test.java:505:39:505:77 | (...)... : JsonArrayBuilder | Test.java:506:10:506:11 | in : JsonArrayBuilder | provenance |  |
 | Test.java:505:70:505:77 | source(...) : Object | Test.java:505:39:505:77 | (...)... : JsonArrayBuilder | provenance |  |
-| Test.java:506:10:506:11 | in : JsonArrayBuilder | Test.java:506:10:506:20 | add(...) : JsonArrayBuilder | provenance | MaD:28 |
+| Test.java:506:10:506:11 | in : JsonArrayBuilder | Test.java:506:10:506:20 | add(...) : JsonArrayBuilder | provenance | MaD:49 |
 | Test.java:506:10:506:20 | add(...) : JsonArrayBuilder | Test.java:507:9:507:11 | out | provenance |  |
 | Test.java:512:39:512:77 | (...)... : JsonArrayBuilder | Test.java:513:10:513:11 | in : JsonArrayBuilder | provenance |  |
 | Test.java:512:70:512:77 | source(...) : Object | Test.java:512:39:512:77 | (...)... : JsonArrayBuilder | provenance |  |
-| Test.java:513:10:513:11 | in : JsonArrayBuilder | Test.java:513:10:513:25 | add(...) : JsonArrayBuilder | provenance | MaD:28 |
+| Test.java:513:10:513:11 | in : JsonArrayBuilder | Test.java:513:10:513:25 | add(...) : JsonArrayBuilder | provenance | MaD:49 |
 | Test.java:513:10:513:25 | add(...) : JsonArrayBuilder | Test.java:514:9:514:11 | out | provenance |  |
 | Test.java:519:39:519:77 | (...)... : JsonArrayBuilder | Test.java:520:10:520:11 | in : JsonArrayBuilder | provenance |  |
 | Test.java:519:70:519:77 | source(...) : Object | Test.java:519:39:519:77 | (...)... : JsonArrayBuilder | provenance |  |
-| Test.java:520:10:520:11 | in : JsonArrayBuilder | Test.java:520:10:520:22 | add(...) : JsonArrayBuilder | provenance | MaD:28 |
+| Test.java:520:10:520:11 | in : JsonArrayBuilder | Test.java:520:10:520:22 | add(...) : JsonArrayBuilder | provenance | MaD:49 |
 | Test.java:520:10:520:22 | add(...) : JsonArrayBuilder | Test.java:521:9:521:11 | out | provenance |  |
 | Test.java:526:39:526:77 | (...)... : JsonArrayBuilder | Test.java:527:10:527:11 | in : JsonArrayBuilder | provenance |  |
 | Test.java:526:70:526:77 | source(...) : Object | Test.java:526:39:526:77 | (...)... : JsonArrayBuilder | provenance |  |
-| Test.java:527:10:527:11 | in : JsonArrayBuilder | Test.java:527:10:527:23 | add(...) : JsonArrayBuilder | provenance | MaD:28 |
+| Test.java:527:10:527:11 | in : JsonArrayBuilder | Test.java:527:10:527:23 | add(...) : JsonArrayBuilder | provenance | MaD:49 |
 | Test.java:527:10:527:23 | add(...) : JsonArrayBuilder | Test.java:528:9:528:11 | out | provenance |  |
 | Test.java:533:39:533:77 | (...)... : JsonArrayBuilder | Test.java:534:10:534:11 | in : JsonArrayBuilder | provenance |  |
 | Test.java:533:70:533:77 | source(...) : Object | Test.java:533:39:533:77 | (...)... : JsonArrayBuilder | provenance |  |
-| Test.java:534:10:534:11 | in : JsonArrayBuilder | Test.java:534:10:534:21 | add(...) : JsonArrayBuilder | provenance | MaD:28 |
+| Test.java:534:10:534:11 | in : JsonArrayBuilder | Test.java:534:10:534:21 | add(...) : JsonArrayBuilder | provenance | MaD:49 |
 | Test.java:534:10:534:21 | add(...) : JsonArrayBuilder | Test.java:535:9:535:11 | out | provenance |  |
 | Test.java:540:39:540:77 | (...)... : JsonArrayBuilder | Test.java:541:10:541:11 | in : JsonArrayBuilder | provenance |  |
 | Test.java:540:70:540:77 | source(...) : Object | Test.java:540:39:540:77 | (...)... : JsonArrayBuilder | provenance |  |
-| Test.java:541:10:541:11 | in : JsonArrayBuilder | Test.java:541:10:541:48 | add(...) : JsonArrayBuilder | provenance | MaD:28 |
+| Test.java:541:10:541:11 | in : JsonArrayBuilder | Test.java:541:10:541:48 | add(...) : JsonArrayBuilder | provenance | MaD:49 |
 | Test.java:541:10:541:48 | add(...) : JsonArrayBuilder | Test.java:542:9:542:11 | out | provenance |  |
 | Test.java:547:39:547:77 | (...)... : JsonArrayBuilder | Test.java:548:10:548:11 | in : JsonArrayBuilder | provenance |  |
 | Test.java:547:70:547:77 | source(...) : Object | Test.java:547:39:547:77 | (...)... : JsonArrayBuilder | provenance |  |
-| Test.java:548:10:548:11 | in : JsonArrayBuilder | Test.java:548:10:548:56 | add(...) : JsonArrayBuilder | provenance | MaD:28 |
+| Test.java:548:10:548:11 | in : JsonArrayBuilder | Test.java:548:10:548:56 | add(...) : JsonArrayBuilder | provenance | MaD:49 |
 | Test.java:548:10:548:56 | add(...) : JsonArrayBuilder | Test.java:549:9:549:11 | out | provenance |  |
 | Test.java:554:39:554:77 | (...)... : JsonArrayBuilder | Test.java:555:10:555:11 | in : JsonArrayBuilder | provenance |  |
 | Test.java:554:70:554:77 | source(...) : Object | Test.java:554:39:554:77 | (...)... : JsonArrayBuilder | provenance |  |
-| Test.java:555:10:555:11 | in : JsonArrayBuilder | Test.java:555:10:555:55 | add(...) : JsonArrayBuilder | provenance | MaD:28 |
+| Test.java:555:10:555:11 | in : JsonArrayBuilder | Test.java:555:10:555:55 | add(...) : JsonArrayBuilder | provenance | MaD:49 |
 | Test.java:555:10:555:55 | add(...) : JsonArrayBuilder | Test.java:556:9:556:11 | out | provenance |  |
 | Test.java:561:39:561:77 | (...)... : JsonArrayBuilder | Test.java:562:10:562:11 | in : JsonArrayBuilder | provenance |  |
 | Test.java:561:70:561:77 | source(...) : Object | Test.java:561:39:561:77 | (...)... : JsonArrayBuilder | provenance |  |
-| Test.java:562:10:562:11 | in : JsonArrayBuilder | Test.java:562:10:562:32 | add(...) : JsonArrayBuilder | provenance | MaD:28 |
+| Test.java:562:10:562:11 | in : JsonArrayBuilder | Test.java:562:10:562:32 | add(...) : JsonArrayBuilder | provenance | MaD:49 |
 | Test.java:562:10:562:32 | add(...) : JsonArrayBuilder | Test.java:563:9:563:11 | out | provenance |  |
 | Test.java:568:39:568:77 | (...)... : JsonArrayBuilder | Test.java:569:10:569:11 | in : JsonArrayBuilder | provenance |  |
 | Test.java:568:70:568:77 | source(...) : Object | Test.java:568:39:568:77 | (...)... : JsonArrayBuilder | provenance |  |
-| Test.java:569:10:569:11 | in : JsonArrayBuilder | Test.java:569:10:569:36 | add(...) : JsonArrayBuilder | provenance | MaD:28 |
+| Test.java:569:10:569:11 | in : JsonArrayBuilder | Test.java:569:10:569:36 | add(...) : JsonArrayBuilder | provenance | MaD:49 |
 | Test.java:569:10:569:36 | add(...) : JsonArrayBuilder | Test.java:570:9:570:11 | out | provenance |  |
 | Test.java:575:39:575:77 | (...)... : JsonArrayBuilder | Test.java:576:10:576:11 | in : JsonArrayBuilder | provenance |  |
 | Test.java:575:70:575:77 | source(...) : Object | Test.java:575:39:575:77 | (...)... : JsonArrayBuilder | provenance |  |
-| Test.java:576:10:576:11 | in : JsonArrayBuilder | Test.java:576:10:576:36 | add(...) : JsonArrayBuilder | provenance | MaD:28 |
+| Test.java:576:10:576:11 | in : JsonArrayBuilder | Test.java:576:10:576:36 | add(...) : JsonArrayBuilder | provenance | MaD:49 |
 | Test.java:576:10:576:36 | add(...) : JsonArrayBuilder | Test.java:577:9:577:11 | out | provenance |  |
 | Test.java:582:39:582:77 | (...)... : JsonArrayBuilder | Test.java:583:10:583:11 | in : JsonArrayBuilder | provenance |  |
 | Test.java:582:70:582:77 | source(...) : Object | Test.java:582:39:582:77 | (...)... : JsonArrayBuilder | provenance |  |
-| Test.java:583:10:583:11 | in : JsonArrayBuilder | Test.java:583:10:583:18 | add(...) : JsonArrayBuilder | provenance | MaD:28 |
+| Test.java:583:10:583:11 | in : JsonArrayBuilder | Test.java:583:10:583:18 | add(...) : JsonArrayBuilder | provenance | MaD:49 |
 | Test.java:583:10:583:18 | add(...) : JsonArrayBuilder | Test.java:584:9:584:11 | out | provenance |  |
 | Test.java:589:39:589:77 | (...)... : JsonArrayBuilder | Test.java:590:10:590:11 | in : JsonArrayBuilder | provenance |  |
 | Test.java:589:70:589:77 | source(...) : Object | Test.java:589:39:589:77 | (...)... : JsonArrayBuilder | provenance |  |
-| Test.java:590:10:590:11 | in : JsonArrayBuilder | Test.java:590:10:590:45 | add(...) : JsonArrayBuilder | provenance | MaD:28 |
+| Test.java:590:10:590:11 | in : JsonArrayBuilder | Test.java:590:10:590:45 | add(...) : JsonArrayBuilder | provenance | MaD:49 |
 | Test.java:590:10:590:45 | add(...) : JsonArrayBuilder | Test.java:591:9:591:11 | out | provenance |  |
 | Test.java:596:39:596:77 | (...)... : JsonArrayBuilder | Test.java:597:10:597:11 | in : JsonArrayBuilder | provenance |  |
 | Test.java:596:70:596:77 | source(...) : Object | Test.java:596:39:596:77 | (...)... : JsonArrayBuilder | provenance |  |
-| Test.java:597:10:597:11 | in : JsonArrayBuilder | Test.java:597:10:597:53 | add(...) : JsonArrayBuilder | provenance | MaD:28 |
+| Test.java:597:10:597:11 | in : JsonArrayBuilder | Test.java:597:10:597:53 | add(...) : JsonArrayBuilder | provenance | MaD:49 |
 | Test.java:597:10:597:53 | add(...) : JsonArrayBuilder | Test.java:598:9:598:11 | out | provenance |  |
 | Test.java:603:39:603:77 | (...)... : JsonArrayBuilder | Test.java:604:10:604:11 | in : JsonArrayBuilder | provenance |  |
 | Test.java:603:70:603:77 | source(...) : Object | Test.java:603:39:603:77 | (...)... : JsonArrayBuilder | provenance |  |
-| Test.java:604:10:604:11 | in : JsonArrayBuilder | Test.java:604:10:604:52 | add(...) : JsonArrayBuilder | provenance | MaD:28 |
+| Test.java:604:10:604:11 | in : JsonArrayBuilder | Test.java:604:10:604:52 | add(...) : JsonArrayBuilder | provenance | MaD:49 |
 | Test.java:604:10:604:52 | add(...) : JsonArrayBuilder | Test.java:605:9:605:11 | out | provenance |  |
 | Test.java:610:39:610:77 | (...)... : JsonArrayBuilder | Test.java:611:10:611:11 | in : JsonArrayBuilder | provenance |  |
 | Test.java:610:70:610:77 | source(...) : Object | Test.java:610:39:610:77 | (...)... : JsonArrayBuilder | provenance |  |
-| Test.java:611:10:611:11 | in : JsonArrayBuilder | Test.java:611:10:611:29 | add(...) : JsonArrayBuilder | provenance | MaD:28 |
+| Test.java:611:10:611:11 | in : JsonArrayBuilder | Test.java:611:10:611:29 | add(...) : JsonArrayBuilder | provenance | MaD:49 |
 | Test.java:611:10:611:29 | add(...) : JsonArrayBuilder | Test.java:612:9:612:11 | out | provenance |  |
 | Test.java:617:39:617:77 | (...)... : JsonArrayBuilder | Test.java:618:10:618:11 | in : JsonArrayBuilder | provenance |  |
 | Test.java:617:70:617:77 | source(...) : Object | Test.java:617:39:617:77 | (...)... : JsonArrayBuilder | provenance |  |
-| Test.java:618:10:618:11 | in : JsonArrayBuilder | Test.java:618:10:618:33 | add(...) : JsonArrayBuilder | provenance | MaD:28 |
+| Test.java:618:10:618:11 | in : JsonArrayBuilder | Test.java:618:10:618:33 | add(...) : JsonArrayBuilder | provenance | MaD:49 |
 | Test.java:618:10:618:33 | add(...) : JsonArrayBuilder | Test.java:619:9:619:11 | out | provenance |  |
 | Test.java:624:39:624:77 | (...)... : JsonArrayBuilder | Test.java:625:10:625:11 | in : JsonArrayBuilder | provenance |  |
 | Test.java:624:70:624:77 | source(...) : Object | Test.java:624:39:624:77 | (...)... : JsonArrayBuilder | provenance |  |
-| Test.java:625:10:625:11 | in : JsonArrayBuilder | Test.java:625:10:625:33 | add(...) : JsonArrayBuilder | provenance | MaD:28 |
+| Test.java:625:10:625:11 | in : JsonArrayBuilder | Test.java:625:10:625:33 | add(...) : JsonArrayBuilder | provenance | MaD:49 |
 | Test.java:625:10:625:33 | add(...) : JsonArrayBuilder | Test.java:626:9:626:11 | out | provenance |  |
 | Test.java:631:39:631:77 | (...)... : JsonArrayBuilder | Test.java:632:10:632:11 | in : JsonArrayBuilder | provenance |  |
 | Test.java:631:70:631:77 | source(...) : Object | Test.java:631:39:631:77 | (...)... : JsonArrayBuilder | provenance |  |
-| Test.java:632:10:632:11 | in : JsonArrayBuilder | Test.java:632:10:632:24 | addAll(...) : JsonArrayBuilder | provenance | MaD:49 |
+| Test.java:632:10:632:11 | in : JsonArrayBuilder | Test.java:632:10:632:24 | addAll(...) : JsonArrayBuilder | provenance | MaD:51 |
 | Test.java:632:10:632:24 | addAll(...) : JsonArrayBuilder | Test.java:633:9:633:11 | out | provenance |  |
 | Test.java:638:39:638:77 | (...)... : JsonArrayBuilder | Test.java:639:15:639:16 | in : JsonArrayBuilder | provenance |  |
 | Test.java:638:70:638:77 | source(...) : Object | Test.java:638:39:638:77 | (...)... : JsonArrayBuilder | provenance |  |
@@ -610,59 +610,59 @@ edges
 | Test.java:639:15:639:16 | in : JsonArrayBuilder | Test.java:639:4:639:6 | out [post update] : JsonArrayBuilder | provenance | MaD:50 |
 | Test.java:645:39:645:77 | (...)... : JsonArrayBuilder | Test.java:646:10:646:11 | in : JsonArrayBuilder | provenance |  |
 | Test.java:645:70:645:77 | source(...) : Object | Test.java:645:39:645:77 | (...)... : JsonArrayBuilder | provenance |  |
-| Test.java:646:10:646:11 | in : JsonArrayBuilder | Test.java:646:10:646:22 | addNull(...) : JsonArrayBuilder | provenance | MaD:51 |
+| Test.java:646:10:646:11 | in : JsonArrayBuilder | Test.java:646:10:646:22 | addNull(...) : JsonArrayBuilder | provenance | MaD:52 |
 | Test.java:646:10:646:22 | addNull(...) : JsonArrayBuilder | Test.java:647:9:647:11 | out | provenance |  |
 | Test.java:652:39:652:77 | (...)... : JsonArrayBuilder | Test.java:653:10:653:11 | in : JsonArrayBuilder | provenance |  |
 | Test.java:652:70:652:77 | source(...) : Object | Test.java:652:39:652:77 | (...)... : JsonArrayBuilder | provenance |  |
-| Test.java:653:10:653:11 | in : JsonArrayBuilder | Test.java:653:10:653:21 | addNull(...) : JsonArrayBuilder | provenance | MaD:51 |
+| Test.java:653:10:653:11 | in : JsonArrayBuilder | Test.java:653:10:653:21 | addNull(...) : JsonArrayBuilder | provenance | MaD:52 |
 | Test.java:653:10:653:21 | addNull(...) : JsonArrayBuilder | Test.java:654:9:654:11 | out | provenance |  |
 | Test.java:659:39:659:77 | (...)... : JsonArrayBuilder | Test.java:660:10:660:11 | in : JsonArrayBuilder | provenance |  |
 | Test.java:659:70:659:77 | source(...) : Object | Test.java:659:39:659:77 | (...)... : JsonArrayBuilder | provenance |  |
-| Test.java:660:10:660:11 | in : JsonArrayBuilder | Test.java:660:10:660:19 | build(...) : JsonArray | provenance | MaD:52 |
+| Test.java:660:10:660:11 | in : JsonArrayBuilder | Test.java:660:10:660:19 | build(...) : JsonArray | provenance | MaD:53 |
 | Test.java:660:10:660:19 | build(...) : JsonArray | Test.java:661:9:661:11 | out | provenance |  |
 | Test.java:666:39:666:77 | (...)... : JsonArrayBuilder | Test.java:667:10:667:11 | in : JsonArrayBuilder | provenance |  |
 | Test.java:666:70:666:77 | source(...) : Object | Test.java:666:39:666:77 | (...)... : JsonArrayBuilder | provenance |  |
-| Test.java:667:10:667:11 | in : JsonArrayBuilder | Test.java:667:10:667:21 | remove(...) : JsonArrayBuilder | provenance | MaD:53 |
+| Test.java:667:10:667:11 | in : JsonArrayBuilder | Test.java:667:10:667:21 | remove(...) : JsonArrayBuilder | provenance | MaD:54 |
 | Test.java:667:10:667:21 | remove(...) : JsonArrayBuilder | Test.java:668:9:668:11 | out | provenance |  |
 | Test.java:673:39:673:77 | (...)... : JsonArrayBuilder | Test.java:674:10:674:11 | in : JsonArrayBuilder | provenance |  |
 | Test.java:673:70:673:77 | source(...) : Object | Test.java:673:39:673:77 | (...)... : JsonArrayBuilder | provenance |  |
-| Test.java:674:10:674:11 | in : JsonArrayBuilder | Test.java:674:10:674:25 | set(...) : JsonArrayBuilder | provenance | MaD:54 |
+| Test.java:674:10:674:11 | in : JsonArrayBuilder | Test.java:674:10:674:25 | set(...) : JsonArrayBuilder | provenance | MaD:56 |
 | Test.java:674:10:674:25 | set(...) : JsonArrayBuilder | Test.java:675:9:675:11 | out | provenance |  |
 | Test.java:680:39:680:77 | (...)... : JsonArrayBuilder | Test.java:681:10:681:11 | in : JsonArrayBuilder | provenance |  |
 | Test.java:680:70:680:77 | source(...) : Object | Test.java:680:39:680:77 | (...)... : JsonArrayBuilder | provenance |  |
-| Test.java:681:10:681:11 | in : JsonArrayBuilder | Test.java:681:10:681:22 | set(...) : JsonArrayBuilder | provenance | MaD:54 |
+| Test.java:681:10:681:11 | in : JsonArrayBuilder | Test.java:681:10:681:22 | set(...) : JsonArrayBuilder | provenance | MaD:56 |
 | Test.java:681:10:681:22 | set(...) : JsonArrayBuilder | Test.java:682:9:682:11 | out | provenance |  |
 | Test.java:687:39:687:77 | (...)... : JsonArrayBuilder | Test.java:688:10:688:11 | in : JsonArrayBuilder | provenance |  |
 | Test.java:687:70:687:77 | source(...) : Object | Test.java:687:39:687:77 | (...)... : JsonArrayBuilder | provenance |  |
-| Test.java:688:10:688:11 | in : JsonArrayBuilder | Test.java:688:10:688:23 | set(...) : JsonArrayBuilder | provenance | MaD:54 |
+| Test.java:688:10:688:11 | in : JsonArrayBuilder | Test.java:688:10:688:23 | set(...) : JsonArrayBuilder | provenance | MaD:56 |
 | Test.java:688:10:688:23 | set(...) : JsonArrayBuilder | Test.java:689:9:689:11 | out | provenance |  |
 | Test.java:694:39:694:77 | (...)... : JsonArrayBuilder | Test.java:695:10:695:11 | in : JsonArrayBuilder | provenance |  |
 | Test.java:694:70:694:77 | source(...) : Object | Test.java:694:39:694:77 | (...)... : JsonArrayBuilder | provenance |  |
-| Test.java:695:10:695:11 | in : JsonArrayBuilder | Test.java:695:10:695:21 | set(...) : JsonArrayBuilder | provenance | MaD:54 |
+| Test.java:695:10:695:11 | in : JsonArrayBuilder | Test.java:695:10:695:21 | set(...) : JsonArrayBuilder | provenance | MaD:56 |
 | Test.java:695:10:695:21 | set(...) : JsonArrayBuilder | Test.java:696:9:696:11 | out | provenance |  |
 | Test.java:701:39:701:77 | (...)... : JsonArrayBuilder | Test.java:702:10:702:11 | in : JsonArrayBuilder | provenance |  |
 | Test.java:701:70:701:77 | source(...) : Object | Test.java:701:39:701:77 | (...)... : JsonArrayBuilder | provenance |  |
-| Test.java:702:10:702:11 | in : JsonArrayBuilder | Test.java:702:10:702:48 | set(...) : JsonArrayBuilder | provenance | MaD:54 |
+| Test.java:702:10:702:11 | in : JsonArrayBuilder | Test.java:702:10:702:48 | set(...) : JsonArrayBuilder | provenance | MaD:56 |
 | Test.java:702:10:702:48 | set(...) : JsonArrayBuilder | Test.java:703:9:703:11 | out | provenance |  |
 | Test.java:708:39:708:77 | (...)... : JsonArrayBuilder | Test.java:709:10:709:11 | in : JsonArrayBuilder | provenance |  |
 | Test.java:708:70:708:77 | source(...) : Object | Test.java:708:39:708:77 | (...)... : JsonArrayBuilder | provenance |  |
-| Test.java:709:10:709:11 | in : JsonArrayBuilder | Test.java:709:10:709:56 | set(...) : JsonArrayBuilder | provenance | MaD:54 |
+| Test.java:709:10:709:11 | in : JsonArrayBuilder | Test.java:709:10:709:56 | set(...) : JsonArrayBuilder | provenance | MaD:56 |
 | Test.java:709:10:709:56 | set(...) : JsonArrayBuilder | Test.java:710:9:710:11 | out | provenance |  |
 | Test.java:715:39:715:77 | (...)... : JsonArrayBuilder | Test.java:716:10:716:11 | in : JsonArrayBuilder | provenance |  |
 | Test.java:715:70:715:77 | source(...) : Object | Test.java:715:39:715:77 | (...)... : JsonArrayBuilder | provenance |  |
-| Test.java:716:10:716:11 | in : JsonArrayBuilder | Test.java:716:10:716:55 | set(...) : JsonArrayBuilder | provenance | MaD:54 |
+| Test.java:716:10:716:11 | in : JsonArrayBuilder | Test.java:716:10:716:55 | set(...) : JsonArrayBuilder | provenance | MaD:56 |
 | Test.java:716:10:716:55 | set(...) : JsonArrayBuilder | Test.java:717:9:717:11 | out | provenance |  |
 | Test.java:722:39:722:77 | (...)... : JsonArrayBuilder | Test.java:723:10:723:11 | in : JsonArrayBuilder | provenance |  |
 | Test.java:722:70:722:77 | source(...) : Object | Test.java:722:39:722:77 | (...)... : JsonArrayBuilder | provenance |  |
-| Test.java:723:10:723:11 | in : JsonArrayBuilder | Test.java:723:10:723:32 | set(...) : JsonArrayBuilder | provenance | MaD:54 |
+| Test.java:723:10:723:11 | in : JsonArrayBuilder | Test.java:723:10:723:32 | set(...) : JsonArrayBuilder | provenance | MaD:56 |
 | Test.java:723:10:723:32 | set(...) : JsonArrayBuilder | Test.java:724:9:724:11 | out | provenance |  |
 | Test.java:729:39:729:77 | (...)... : JsonArrayBuilder | Test.java:730:10:730:11 | in : JsonArrayBuilder | provenance |  |
 | Test.java:729:70:729:77 | source(...) : Object | Test.java:729:39:729:77 | (...)... : JsonArrayBuilder | provenance |  |
-| Test.java:730:10:730:11 | in : JsonArrayBuilder | Test.java:730:10:730:36 | set(...) : JsonArrayBuilder | provenance | MaD:54 |
+| Test.java:730:10:730:11 | in : JsonArrayBuilder | Test.java:730:10:730:36 | set(...) : JsonArrayBuilder | provenance | MaD:56 |
 | Test.java:730:10:730:36 | set(...) : JsonArrayBuilder | Test.java:731:9:731:11 | out | provenance |  |
 | Test.java:736:39:736:77 | (...)... : JsonArrayBuilder | Test.java:737:10:737:11 | in : JsonArrayBuilder | provenance |  |
 | Test.java:736:70:736:77 | source(...) : Object | Test.java:736:39:736:77 | (...)... : JsonArrayBuilder | provenance |  |
-| Test.java:737:10:737:11 | in : JsonArrayBuilder | Test.java:737:10:737:36 | set(...) : JsonArrayBuilder | provenance | MaD:54 |
+| Test.java:737:10:737:11 | in : JsonArrayBuilder | Test.java:737:10:737:36 | set(...) : JsonArrayBuilder | provenance | MaD:56 |
 | Test.java:737:10:737:36 | set(...) : JsonArrayBuilder | Test.java:738:9:738:11 | out | provenance |  |
 | Test.java:743:14:743:27 | (...)... : Number | Test.java:744:15:744:16 | in : Number | provenance |  |
 | Test.java:743:20:743:27 | source(...) : Object | Test.java:743:14:743:27 | (...)... : Number | provenance |  |
@@ -706,11 +706,11 @@ edges
 | Test.java:807:15:807:16 | in : BigDecimal | Test.java:807:4:807:6 | out [post update] : JsonArrayBuilder | provenance | MaD:55 |
 | Test.java:813:39:813:77 | (...)... : JsonArrayBuilder | Test.java:814:10:814:11 | in : JsonArrayBuilder | provenance |  |
 | Test.java:813:70:813:77 | source(...) : Object | Test.java:813:39:813:77 | (...)... : JsonArrayBuilder | provenance |  |
-| Test.java:814:10:814:11 | in : JsonArrayBuilder | Test.java:814:10:814:22 | setNull(...) : JsonArrayBuilder | provenance | MaD:56 |
+| Test.java:814:10:814:11 | in : JsonArrayBuilder | Test.java:814:10:814:22 | setNull(...) : JsonArrayBuilder | provenance | MaD:57 |
 | Test.java:814:10:814:22 | setNull(...) : JsonArrayBuilder | Test.java:815:9:815:11 | out | provenance |  |
 | Test.java:820:37:820:73 | (...)... : JsonMergePatch | Test.java:821:10:821:11 | in : JsonMergePatch | provenance |  |
 | Test.java:820:66:820:73 | source(...) : Object | Test.java:820:37:820:73 | (...)... : JsonMergePatch | provenance |  |
-| Test.java:821:10:821:11 | in : JsonMergePatch | Test.java:821:10:821:23 | apply(...) : JsonValue | provenance | MaD:57 |
+| Test.java:821:10:821:11 | in : JsonMergePatch | Test.java:821:10:821:23 | apply(...) : JsonValue | provenance | MaD:59 |
 | Test.java:821:10:821:23 | apply(...) : JsonValue | Test.java:822:9:822:11 | out | provenance |  |
 | Test.java:827:32:827:63 | (...)... : JsonValue | Test.java:829:25:829:26 | in : JsonValue | provenance |  |
 | Test.java:827:56:827:63 | source(...) : Object | Test.java:827:32:827:63 | (...)... : JsonValue | provenance |  |
@@ -718,51 +718,51 @@ edges
 | Test.java:829:25:829:26 | in : JsonValue | Test.java:829:10:829:27 | apply(...) : JsonValue | provenance | MaD:58 |
 | Test.java:835:37:835:73 | (...)... : JsonMergePatch | Test.java:836:10:836:11 | in : JsonMergePatch | provenance |  |
 | Test.java:835:66:835:73 | source(...) : Object | Test.java:835:37:835:73 | (...)... : JsonMergePatch | provenance |  |
-| Test.java:836:10:836:11 | in : JsonMergePatch | Test.java:836:10:836:25 | toJsonValue(...) : JsonValue | provenance | MaD:59 |
+| Test.java:836:10:836:11 | in : JsonMergePatch | Test.java:836:10:836:25 | toJsonValue(...) : JsonValue | provenance | MaD:60 |
 | Test.java:836:10:836:25 | toJsonValue(...) : JsonValue | Test.java:837:9:837:11 | out | provenance |  |
 | Test.java:842:33:842:65 | (...)... : JsonNumber | Test.java:843:10:843:11 | in : JsonNumber | provenance |  |
 | Test.java:842:58:842:65 | source(...) : Object | Test.java:842:33:842:65 | (...)... : JsonNumber | provenance |  |
-| Test.java:843:10:843:11 | in : JsonNumber | Test.java:843:10:843:29 | bigDecimalValue(...) : BigDecimal | provenance | MaD:60 |
+| Test.java:843:10:843:11 | in : JsonNumber | Test.java:843:10:843:29 | bigDecimalValue(...) : BigDecimal | provenance | MaD:61 |
 | Test.java:843:10:843:29 | bigDecimalValue(...) : BigDecimal | Test.java:844:9:844:11 | out | provenance |  |
 | Test.java:849:33:849:65 | (...)... : JsonNumber | Test.java:850:10:850:11 | in : JsonNumber | provenance |  |
 | Test.java:849:58:849:65 | source(...) : Object | Test.java:849:33:849:65 | (...)... : JsonNumber | provenance |  |
-| Test.java:850:10:850:11 | in : JsonNumber | Test.java:850:10:850:29 | bigIntegerValue(...) : BigInteger | provenance | MaD:61 |
+| Test.java:850:10:850:11 | in : JsonNumber | Test.java:850:10:850:29 | bigIntegerValue(...) : BigInteger | provenance | MaD:62 |
 | Test.java:850:10:850:29 | bigIntegerValue(...) : BigInteger | Test.java:851:9:851:11 | out | provenance |  |
 | Test.java:856:33:856:65 | (...)... : JsonNumber | Test.java:857:10:857:11 | in : JsonNumber | provenance |  |
 | Test.java:856:58:856:65 | source(...) : Object | Test.java:856:33:856:65 | (...)... : JsonNumber | provenance |  |
-| Test.java:857:10:857:11 | in : JsonNumber | Test.java:857:10:857:34 | bigIntegerValueExact(...) : BigInteger | provenance | MaD:62 |
+| Test.java:857:10:857:11 | in : JsonNumber | Test.java:857:10:857:34 | bigIntegerValueExact(...) : BigInteger | provenance | MaD:63 |
 | Test.java:857:10:857:34 | bigIntegerValueExact(...) : BigInteger | Test.java:858:9:858:11 | out | provenance |  |
 | Test.java:863:33:863:65 | (...)... : JsonNumber | Test.java:864:10:864:11 | in : JsonNumber | provenance |  |
 | Test.java:863:58:863:65 | source(...) : Object | Test.java:863:33:863:65 | (...)... : JsonNumber | provenance |  |
-| Test.java:864:10:864:11 | in : JsonNumber | Test.java:864:10:864:25 | doubleValue(...) : Number | provenance | MaD:63 |
+| Test.java:864:10:864:11 | in : JsonNumber | Test.java:864:10:864:25 | doubleValue(...) : Number | provenance | MaD:64 |
 | Test.java:864:10:864:25 | doubleValue(...) : Number | Test.java:865:9:865:11 | out | provenance |  |
 | Test.java:870:33:870:65 | (...)... : JsonNumber | Test.java:871:10:871:11 | in : JsonNumber | provenance |  |
 | Test.java:870:58:870:65 | source(...) : Object | Test.java:870:33:870:65 | (...)... : JsonNumber | provenance |  |
-| Test.java:871:10:871:11 | in : JsonNumber | Test.java:871:10:871:22 | intValue(...) : Number | provenance | MaD:64 |
+| Test.java:871:10:871:11 | in : JsonNumber | Test.java:871:10:871:22 | intValue(...) : Number | provenance | MaD:65 |
 | Test.java:871:10:871:22 | intValue(...) : Number | Test.java:872:9:872:11 | out | provenance |  |
 | Test.java:877:33:877:65 | (...)... : JsonNumber | Test.java:878:10:878:11 | in : JsonNumber | provenance |  |
 | Test.java:877:58:877:65 | source(...) : Object | Test.java:877:33:877:65 | (...)... : JsonNumber | provenance |  |
-| Test.java:878:10:878:11 | in : JsonNumber | Test.java:878:10:878:27 | intValueExact(...) : Number | provenance | MaD:65 |
+| Test.java:878:10:878:11 | in : JsonNumber | Test.java:878:10:878:27 | intValueExact(...) : Number | provenance | MaD:66 |
 | Test.java:878:10:878:27 | intValueExact(...) : Number | Test.java:879:9:879:11 | out | provenance |  |
 | Test.java:884:33:884:65 | (...)... : JsonNumber | Test.java:885:10:885:11 | in : JsonNumber | provenance |  |
 | Test.java:884:58:884:65 | source(...) : Object | Test.java:884:33:884:65 | (...)... : JsonNumber | provenance |  |
-| Test.java:885:10:885:11 | in : JsonNumber | Test.java:885:10:885:23 | longValue(...) : Number | provenance | MaD:66 |
+| Test.java:885:10:885:11 | in : JsonNumber | Test.java:885:10:885:23 | longValue(...) : Number | provenance | MaD:67 |
 | Test.java:885:10:885:23 | longValue(...) : Number | Test.java:886:9:886:11 | out | provenance |  |
 | Test.java:891:33:891:65 | (...)... : JsonNumber | Test.java:892:10:892:11 | in : JsonNumber | provenance |  |
 | Test.java:891:58:891:65 | source(...) : Object | Test.java:891:33:891:65 | (...)... : JsonNumber | provenance |  |
-| Test.java:892:10:892:11 | in : JsonNumber | Test.java:892:10:892:28 | longValueExact(...) : Number | provenance | MaD:67 |
+| Test.java:892:10:892:11 | in : JsonNumber | Test.java:892:10:892:28 | longValueExact(...) : Number | provenance | MaD:68 |
 | Test.java:892:10:892:28 | longValueExact(...) : Number | Test.java:893:9:893:11 | out | provenance |  |
 | Test.java:898:33:898:65 | (...)... : JsonNumber | Test.java:899:10:899:11 | in : JsonNumber | provenance |  |
 | Test.java:898:58:898:65 | source(...) : Object | Test.java:898:33:898:65 | (...)... : JsonNumber | provenance |  |
-| Test.java:899:10:899:11 | in : JsonNumber | Test.java:899:10:899:25 | numberValue(...) : Number | provenance | MaD:68 |
+| Test.java:899:10:899:11 | in : JsonNumber | Test.java:899:10:899:25 | numberValue(...) : Number | provenance | MaD:69 |
 | Test.java:899:10:899:25 | numberValue(...) : Number | Test.java:900:9:900:11 | out | provenance |  |
 | Test.java:905:33:905:65 | (...)... : JsonObject | Test.java:906:10:906:11 | in : JsonObject | provenance |  |
 | Test.java:905:58:905:65 | source(...) : Object | Test.java:905:33:905:65 | (...)... : JsonObject | provenance |  |
-| Test.java:906:10:906:11 | in : JsonObject | Test.java:906:10:906:35 | getBoolean(...) : Boolean | provenance | MaD:69 |
+| Test.java:906:10:906:11 | in : JsonObject | Test.java:906:10:906:35 | getBoolean(...) : Boolean | provenance | MaD:71 |
 | Test.java:906:10:906:35 | getBoolean(...) : Boolean | Test.java:907:9:907:11 | out | provenance |  |
 | Test.java:912:33:912:65 | (...)... : JsonObject | Test.java:913:10:913:11 | in : JsonObject | provenance |  |
 | Test.java:912:58:912:65 | source(...) : Object | Test.java:912:33:912:65 | (...)... : JsonObject | provenance |  |
-| Test.java:913:10:913:11 | in : JsonObject | Test.java:913:10:913:28 | getBoolean(...) : Boolean | provenance | MaD:69 |
+| Test.java:913:10:913:11 | in : JsonObject | Test.java:913:10:913:28 | getBoolean(...) : Boolean | provenance | MaD:71 |
 | Test.java:913:10:913:28 | getBoolean(...) : Boolean | Test.java:914:9:914:11 | out | provenance |  |
 | Test.java:919:17:919:33 | (...)... : Boolean | Test.java:921:36:921:37 | in : Boolean | provenance |  |
 | Test.java:919:26:919:33 | source(...) : Object | Test.java:919:17:919:33 | (...)... : Boolean | provenance |  |
@@ -770,11 +770,11 @@ edges
 | Test.java:921:36:921:37 | in : Boolean | Test.java:921:10:921:38 | getBoolean(...) : Boolean | provenance | MaD:70 |
 | Test.java:927:33:927:65 | (...)... : JsonObject | Test.java:928:10:928:11 | in : JsonObject | provenance |  |
 | Test.java:927:58:927:65 | source(...) : Object | Test.java:927:33:927:65 | (...)... : JsonObject | provenance |  |
-| Test.java:928:10:928:11 | in : JsonObject | Test.java:928:10:928:27 | getInt(...) : Number | provenance | MaD:71 |
+| Test.java:928:10:928:11 | in : JsonObject | Test.java:928:10:928:27 | getInt(...) : Number | provenance | MaD:73 |
 | Test.java:928:10:928:27 | getInt(...) : Number | Test.java:929:9:929:11 | out | provenance |  |
 | Test.java:934:33:934:65 | (...)... : JsonObject | Test.java:935:10:935:11 | in : JsonObject | provenance |  |
 | Test.java:934:58:934:65 | source(...) : Object | Test.java:934:33:934:65 | (...)... : JsonObject | provenance |  |
-| Test.java:935:10:935:11 | in : JsonObject | Test.java:935:10:935:24 | getInt(...) : Number | provenance | MaD:71 |
+| Test.java:935:10:935:11 | in : JsonObject | Test.java:935:10:935:24 | getInt(...) : Number | provenance | MaD:73 |
 | Test.java:935:10:935:24 | getInt(...) : Number | Test.java:936:9:936:11 | out | provenance |  |
 | Test.java:941:13:941:25 | (...)... : Number | Test.java:943:32:943:33 | in : Number | provenance |  |
 | Test.java:941:18:941:25 | source(...) : Object | Test.java:941:13:941:25 | (...)... : Number | provenance |  |
@@ -782,27 +782,27 @@ edges
 | Test.java:943:32:943:33 | in : Number | Test.java:943:10:943:34 | getInt(...) : Number | provenance | MaD:72 |
 | Test.java:949:33:949:65 | (...)... : JsonObject | Test.java:950:10:950:11 | in : JsonObject | provenance |  |
 | Test.java:949:58:949:65 | source(...) : Object | Test.java:949:33:949:65 | (...)... : JsonObject | provenance |  |
-| Test.java:950:10:950:11 | in : JsonObject | Test.java:950:10:950:30 | getJsonArray(...) : JsonArray | provenance | MaD:73 |
+| Test.java:950:10:950:11 | in : JsonObject | Test.java:950:10:950:30 | getJsonArray(...) : JsonArray | provenance | MaD:74 |
 | Test.java:950:10:950:30 | getJsonArray(...) : JsonArray | Test.java:951:9:951:11 | out | provenance |  |
 | Test.java:956:33:956:65 | (...)... : JsonObject | Test.java:957:10:957:11 | in : JsonObject | provenance |  |
 | Test.java:956:58:956:65 | source(...) : Object | Test.java:956:33:956:65 | (...)... : JsonObject | provenance |  |
-| Test.java:957:10:957:11 | in : JsonObject | Test.java:957:10:957:31 | getJsonNumber(...) : JsonNumber | provenance | MaD:74 |
+| Test.java:957:10:957:11 | in : JsonObject | Test.java:957:10:957:31 | getJsonNumber(...) : JsonNumber | provenance | MaD:75 |
 | Test.java:957:10:957:31 | getJsonNumber(...) : JsonNumber | Test.java:958:9:958:11 | out | provenance |  |
 | Test.java:963:33:963:65 | (...)... : JsonObject | Test.java:964:10:964:11 | in : JsonObject | provenance |  |
 | Test.java:963:58:963:65 | source(...) : Object | Test.java:963:33:963:65 | (...)... : JsonObject | provenance |  |
-| Test.java:964:10:964:11 | in : JsonObject | Test.java:964:10:964:31 | getJsonObject(...) : JsonObject | provenance | MaD:75 |
+| Test.java:964:10:964:11 | in : JsonObject | Test.java:964:10:964:31 | getJsonObject(...) : JsonObject | provenance | MaD:76 |
 | Test.java:964:10:964:31 | getJsonObject(...) : JsonObject | Test.java:965:9:965:11 | out | provenance |  |
 | Test.java:970:33:970:65 | (...)... : JsonObject | Test.java:971:10:971:11 | in : JsonObject | provenance |  |
 | Test.java:970:58:970:65 | source(...) : Object | Test.java:970:33:970:65 | (...)... : JsonObject | provenance |  |
-| Test.java:971:10:971:11 | in : JsonObject | Test.java:971:10:971:31 | getJsonString(...) : JsonString | provenance | MaD:76 |
+| Test.java:971:10:971:11 | in : JsonObject | Test.java:971:10:971:31 | getJsonString(...) : JsonString | provenance | MaD:77 |
 | Test.java:971:10:971:31 | getJsonString(...) : JsonString | Test.java:972:9:972:11 | out | provenance |  |
 | Test.java:977:33:977:65 | (...)... : JsonObject | Test.java:978:10:978:11 | in : JsonObject | provenance |  |
 | Test.java:977:58:977:65 | source(...) : Object | Test.java:977:33:977:65 | (...)... : JsonObject | provenance |  |
-| Test.java:978:10:978:11 | in : JsonObject | Test.java:978:10:978:33 | getString(...) : String | provenance | MaD:77 |
+| Test.java:978:10:978:11 | in : JsonObject | Test.java:978:10:978:33 | getString(...) : String | provenance | MaD:79 |
 | Test.java:978:10:978:33 | getString(...) : String | Test.java:979:9:979:11 | out | provenance |  |
 | Test.java:984:33:984:65 | (...)... : JsonObject | Test.java:985:10:985:11 | in : JsonObject | provenance |  |
 | Test.java:984:58:984:65 | source(...) : Object | Test.java:984:33:984:65 | (...)... : JsonObject | provenance |  |
-| Test.java:985:10:985:11 | in : JsonObject | Test.java:985:10:985:27 | getString(...) : String | provenance | MaD:77 |
+| Test.java:985:10:985:11 | in : JsonObject | Test.java:985:10:985:27 | getString(...) : String | provenance | MaD:79 |
 | Test.java:985:10:985:27 | getString(...) : String | Test.java:986:9:986:11 | out | provenance |  |
 | Test.java:991:16:991:31 | (...)... : String | Test.java:993:35:993:36 | in : String | provenance |  |
 | Test.java:991:24:991:31 | source(...) : Object | Test.java:991:16:991:31 | (...)... : String | provenance |  |
@@ -810,43 +810,43 @@ edges
 | Test.java:993:35:993:36 | in : String | Test.java:993:10:993:37 | getString(...) : String | provenance | MaD:78 |
 | Test.java:999:40:999:79 | (...)... : JsonObjectBuilder | Test.java:1000:10:1000:11 | in : JsonObjectBuilder | provenance |  |
 | Test.java:999:72:999:79 | source(...) : Object | Test.java:999:40:999:79 | (...)... : JsonObjectBuilder | provenance |  |
-| Test.java:1000:10:1000:11 | in : JsonObjectBuilder | Test.java:1000:10:1000:36 | add(...) : JsonObjectBuilder | provenance | MaD:79 |
+| Test.java:1000:10:1000:11 | in : JsonObjectBuilder | Test.java:1000:10:1000:36 | add(...) : JsonObjectBuilder | provenance | MaD:81 |
 | Test.java:1000:10:1000:36 | add(...) : JsonObjectBuilder | Test.java:1001:9:1001:11 | out | provenance |  |
 | Test.java:1006:40:1006:79 | (...)... : JsonObjectBuilder | Test.java:1007:10:1007:11 | in : JsonObjectBuilder | provenance |  |
 | Test.java:1006:72:1006:79 | source(...) : Object | Test.java:1006:40:1006:79 | (...)... : JsonObjectBuilder | provenance |  |
-| Test.java:1007:10:1007:11 | in : JsonObjectBuilder | Test.java:1007:10:1007:33 | add(...) : JsonObjectBuilder | provenance | MaD:79 |
+| Test.java:1007:10:1007:11 | in : JsonObjectBuilder | Test.java:1007:10:1007:33 | add(...) : JsonObjectBuilder | provenance | MaD:81 |
 | Test.java:1007:10:1007:33 | add(...) : JsonObjectBuilder | Test.java:1008:9:1008:11 | out | provenance |  |
 | Test.java:1013:40:1013:79 | (...)... : JsonObjectBuilder | Test.java:1014:10:1014:11 | in : JsonObjectBuilder | provenance |  |
 | Test.java:1013:72:1013:79 | source(...) : Object | Test.java:1013:40:1013:79 | (...)... : JsonObjectBuilder | provenance |  |
-| Test.java:1014:10:1014:11 | in : JsonObjectBuilder | Test.java:1014:10:1014:34 | add(...) : JsonObjectBuilder | provenance | MaD:79 |
+| Test.java:1014:10:1014:11 | in : JsonObjectBuilder | Test.java:1014:10:1014:34 | add(...) : JsonObjectBuilder | provenance | MaD:81 |
 | Test.java:1014:10:1014:34 | add(...) : JsonObjectBuilder | Test.java:1015:9:1015:11 | out | provenance |  |
 | Test.java:1020:40:1020:79 | (...)... : JsonObjectBuilder | Test.java:1021:10:1021:11 | in : JsonObjectBuilder | provenance |  |
 | Test.java:1020:72:1020:79 | source(...) : Object | Test.java:1020:40:1020:79 | (...)... : JsonObjectBuilder | provenance |  |
-| Test.java:1021:10:1021:11 | in : JsonObjectBuilder | Test.java:1021:10:1021:32 | add(...) : JsonObjectBuilder | provenance | MaD:79 |
+| Test.java:1021:10:1021:11 | in : JsonObjectBuilder | Test.java:1021:10:1021:32 | add(...) : JsonObjectBuilder | provenance | MaD:81 |
 | Test.java:1021:10:1021:32 | add(...) : JsonObjectBuilder | Test.java:1022:9:1022:11 | out | provenance |  |
 | Test.java:1027:40:1027:79 | (...)... : JsonObjectBuilder | Test.java:1028:10:1028:11 | in : JsonObjectBuilder | provenance |  |
 | Test.java:1027:72:1027:79 | source(...) : Object | Test.java:1027:40:1027:79 | (...)... : JsonObjectBuilder | provenance |  |
-| Test.java:1028:10:1028:11 | in : JsonObjectBuilder | Test.java:1028:10:1028:59 | add(...) : JsonObjectBuilder | provenance | MaD:79 |
+| Test.java:1028:10:1028:11 | in : JsonObjectBuilder | Test.java:1028:10:1028:59 | add(...) : JsonObjectBuilder | provenance | MaD:81 |
 | Test.java:1028:10:1028:59 | add(...) : JsonObjectBuilder | Test.java:1029:9:1029:11 | out | provenance |  |
 | Test.java:1034:40:1034:79 | (...)... : JsonObjectBuilder | Test.java:1035:10:1035:11 | in : JsonObjectBuilder | provenance |  |
 | Test.java:1034:72:1034:79 | source(...) : Object | Test.java:1034:40:1034:79 | (...)... : JsonObjectBuilder | provenance |  |
-| Test.java:1035:10:1035:11 | in : JsonObjectBuilder | Test.java:1035:10:1035:67 | add(...) : JsonObjectBuilder | provenance | MaD:79 |
+| Test.java:1035:10:1035:11 | in : JsonObjectBuilder | Test.java:1035:10:1035:67 | add(...) : JsonObjectBuilder | provenance | MaD:81 |
 | Test.java:1035:10:1035:67 | add(...) : JsonObjectBuilder | Test.java:1036:9:1036:11 | out | provenance |  |
 | Test.java:1041:40:1041:79 | (...)... : JsonObjectBuilder | Test.java:1042:10:1042:11 | in : JsonObjectBuilder | provenance |  |
 | Test.java:1041:72:1041:79 | source(...) : Object | Test.java:1041:40:1041:79 | (...)... : JsonObjectBuilder | provenance |  |
-| Test.java:1042:10:1042:11 | in : JsonObjectBuilder | Test.java:1042:10:1042:66 | add(...) : JsonObjectBuilder | provenance | MaD:79 |
+| Test.java:1042:10:1042:11 | in : JsonObjectBuilder | Test.java:1042:10:1042:66 | add(...) : JsonObjectBuilder | provenance | MaD:81 |
 | Test.java:1042:10:1042:66 | add(...) : JsonObjectBuilder | Test.java:1043:9:1043:11 | out | provenance |  |
 | Test.java:1048:40:1048:79 | (...)... : JsonObjectBuilder | Test.java:1049:10:1049:11 | in : JsonObjectBuilder | provenance |  |
 | Test.java:1048:72:1048:79 | source(...) : Object | Test.java:1048:40:1048:79 | (...)... : JsonObjectBuilder | provenance |  |
-| Test.java:1049:10:1049:11 | in : JsonObjectBuilder | Test.java:1049:10:1049:43 | add(...) : JsonObjectBuilder | provenance | MaD:79 |
+| Test.java:1049:10:1049:11 | in : JsonObjectBuilder | Test.java:1049:10:1049:43 | add(...) : JsonObjectBuilder | provenance | MaD:81 |
 | Test.java:1049:10:1049:43 | add(...) : JsonObjectBuilder | Test.java:1050:9:1050:11 | out | provenance |  |
 | Test.java:1055:40:1055:79 | (...)... : JsonObjectBuilder | Test.java:1056:10:1056:11 | in : JsonObjectBuilder | provenance |  |
 | Test.java:1055:72:1055:79 | source(...) : Object | Test.java:1055:40:1055:79 | (...)... : JsonObjectBuilder | provenance |  |
-| Test.java:1056:10:1056:11 | in : JsonObjectBuilder | Test.java:1056:10:1056:47 | add(...) : JsonObjectBuilder | provenance | MaD:79 |
+| Test.java:1056:10:1056:11 | in : JsonObjectBuilder | Test.java:1056:10:1056:47 | add(...) : JsonObjectBuilder | provenance | MaD:81 |
 | Test.java:1056:10:1056:47 | add(...) : JsonObjectBuilder | Test.java:1057:9:1057:11 | out | provenance |  |
 | Test.java:1062:40:1062:79 | (...)... : JsonObjectBuilder | Test.java:1063:10:1063:11 | in : JsonObjectBuilder | provenance |  |
 | Test.java:1062:72:1062:79 | source(...) : Object | Test.java:1062:40:1062:79 | (...)... : JsonObjectBuilder | provenance |  |
-| Test.java:1063:10:1063:11 | in : JsonObjectBuilder | Test.java:1063:10:1063:47 | add(...) : JsonObjectBuilder | provenance | MaD:79 |
+| Test.java:1063:10:1063:11 | in : JsonObjectBuilder | Test.java:1063:10:1063:47 | add(...) : JsonObjectBuilder | provenance | MaD:81 |
 | Test.java:1063:10:1063:47 | add(...) : JsonObjectBuilder | Test.java:1064:9:1064:11 | out | provenance |  |
 | Test.java:1069:14:1069:27 | (...)... : Number | Test.java:1070:26:1070:27 | in : Number | provenance |  |
 | Test.java:1069:20:1069:27 | source(...) : Object | Test.java:1069:14:1069:27 | (...)... : Number | provenance |  |
@@ -890,7 +890,7 @@ edges
 | Test.java:1133:26:1133:27 | in : BigDecimal | Test.java:1133:4:1133:6 | out [post update] : JsonObjectBuilder | provenance | MaD:80 |
 | Test.java:1139:40:1139:79 | (...)... : JsonObjectBuilder | Test.java:1140:10:1140:11 | in : JsonObjectBuilder | provenance |  |
 | Test.java:1139:72:1139:79 | source(...) : Object | Test.java:1139:40:1139:79 | (...)... : JsonObjectBuilder | provenance |  |
-| Test.java:1140:10:1140:11 | in : JsonObjectBuilder | Test.java:1140:10:1140:24 | addAll(...) : JsonObjectBuilder | provenance | MaD:81 |
+| Test.java:1140:10:1140:11 | in : JsonObjectBuilder | Test.java:1140:10:1140:24 | addAll(...) : JsonObjectBuilder | provenance | MaD:83 |
 | Test.java:1140:10:1140:24 | addAll(...) : JsonObjectBuilder | Test.java:1141:9:1141:11 | out | provenance |  |
 | Test.java:1146:40:1146:79 | (...)... : JsonObjectBuilder | Test.java:1148:26:1148:27 | in : JsonObjectBuilder | provenance |  |
 | Test.java:1146:72:1146:79 | source(...) : Object | Test.java:1146:40:1146:79 | (...)... : JsonObjectBuilder | provenance |  |
@@ -898,19 +898,19 @@ edges
 | Test.java:1148:26:1148:27 | in : JsonObjectBuilder | Test.java:1148:10:1148:28 | addAll(...) : JsonObjectBuilder | provenance | MaD:82 |
 | Test.java:1154:40:1154:79 | (...)... : JsonObjectBuilder | Test.java:1155:10:1155:11 | in : JsonObjectBuilder | provenance |  |
 | Test.java:1154:72:1154:79 | source(...) : Object | Test.java:1154:40:1154:79 | (...)... : JsonObjectBuilder | provenance |  |
-| Test.java:1155:10:1155:11 | in : JsonObjectBuilder | Test.java:1155:10:1155:25 | addNull(...) : JsonObjectBuilder | provenance | MaD:83 |
+| Test.java:1155:10:1155:11 | in : JsonObjectBuilder | Test.java:1155:10:1155:25 | addNull(...) : JsonObjectBuilder | provenance | MaD:84 |
 | Test.java:1155:10:1155:25 | addNull(...) : JsonObjectBuilder | Test.java:1156:9:1156:11 | out | provenance |  |
 | Test.java:1161:40:1161:79 | (...)... : JsonObjectBuilder | Test.java:1162:10:1162:11 | in : JsonObjectBuilder | provenance |  |
 | Test.java:1161:72:1161:79 | source(...) : Object | Test.java:1161:40:1161:79 | (...)... : JsonObjectBuilder | provenance |  |
-| Test.java:1162:10:1162:11 | in : JsonObjectBuilder | Test.java:1162:10:1162:19 | build(...) : JsonObject | provenance | MaD:84 |
+| Test.java:1162:10:1162:11 | in : JsonObjectBuilder | Test.java:1162:10:1162:19 | build(...) : JsonObject | provenance | MaD:85 |
 | Test.java:1162:10:1162:19 | build(...) : JsonObject | Test.java:1163:9:1163:11 | out | provenance |  |
 | Test.java:1168:40:1168:79 | (...)... : JsonObjectBuilder | Test.java:1169:10:1169:11 | in : JsonObjectBuilder | provenance |  |
 | Test.java:1168:72:1168:79 | source(...) : Object | Test.java:1168:40:1168:79 | (...)... : JsonObjectBuilder | provenance |  |
-| Test.java:1169:10:1169:11 | in : JsonObjectBuilder | Test.java:1169:10:1169:24 | remove(...) : JsonObjectBuilder | provenance | MaD:85 |
+| Test.java:1169:10:1169:11 | in : JsonObjectBuilder | Test.java:1169:10:1169:24 | remove(...) : JsonObjectBuilder | provenance | MaD:86 |
 | Test.java:1169:10:1169:24 | remove(...) : JsonObjectBuilder | Test.java:1170:9:1170:11 | out | provenance |  |
 | Test.java:1175:32:1175:63 | (...)... : JsonPatch | Test.java:1176:10:1176:11 | in : JsonPatch | provenance |  |
 | Test.java:1175:56:1175:63 | source(...) : Object | Test.java:1175:32:1175:63 | (...)... : JsonPatch | provenance |  |
-| Test.java:1176:10:1176:11 | in : JsonPatch | Test.java:1176:10:1176:23 | apply(...) : JsonStructure | provenance | MaD:86 |
+| Test.java:1176:10:1176:11 | in : JsonPatch | Test.java:1176:10:1176:23 | apply(...) : JsonStructure | provenance | MaD:88 |
 | Test.java:1176:10:1176:23 | apply(...) : JsonStructure | Test.java:1177:9:1177:11 | out | provenance |  |
 | Test.java:1182:36:1182:71 | (...)... : JsonStructure | Test.java:1184:25:1184:26 | in : JsonStructure | provenance |  |
 | Test.java:1182:64:1182:71 | source(...) : Object | Test.java:1182:36:1182:71 | (...)... : JsonStructure | provenance |  |
@@ -918,23 +918,23 @@ edges
 | Test.java:1184:25:1184:26 | in : JsonStructure | Test.java:1184:10:1184:27 | apply(...) : JsonStructure | provenance | MaD:87 |
 | Test.java:1190:32:1190:63 | (...)... : JsonPatch | Test.java:1191:10:1191:11 | in : JsonPatch | provenance |  |
 | Test.java:1190:56:1190:63 | source(...) : Object | Test.java:1190:32:1190:63 | (...)... : JsonPatch | provenance |  |
-| Test.java:1191:10:1191:11 | in : JsonPatch | Test.java:1191:10:1191:25 | toJsonArray(...) : JsonArray | provenance | MaD:88 |
+| Test.java:1191:10:1191:11 | in : JsonPatch | Test.java:1191:10:1191:25 | toJsonArray(...) : JsonArray | provenance | MaD:89 |
 | Test.java:1191:10:1191:25 | toJsonArray(...) : JsonArray | Test.java:1192:9:1192:11 | out | provenance |  |
 | Test.java:1197:39:1197:77 | (...)... : JsonPatchBuilder | Test.java:1198:10:1198:11 | in : JsonPatchBuilder | provenance |  |
 | Test.java:1197:70:1197:77 | source(...) : Object | Test.java:1197:39:1197:77 | (...)... : JsonPatchBuilder | provenance |  |
-| Test.java:1198:10:1198:11 | in : JsonPatchBuilder | Test.java:1198:10:1198:36 | add(...) : JsonPatchBuilder | provenance | MaD:89 |
+| Test.java:1198:10:1198:11 | in : JsonPatchBuilder | Test.java:1198:10:1198:36 | add(...) : JsonPatchBuilder | provenance | MaD:91 |
 | Test.java:1198:10:1198:36 | add(...) : JsonPatchBuilder | Test.java:1199:9:1199:11 | out | provenance |  |
 | Test.java:1204:39:1204:77 | (...)... : JsonPatchBuilder | Test.java:1205:10:1205:11 | in : JsonPatchBuilder | provenance |  |
 | Test.java:1204:70:1204:77 | source(...) : Object | Test.java:1204:39:1204:77 | (...)... : JsonPatchBuilder | provenance |  |
-| Test.java:1205:10:1205:11 | in : JsonPatchBuilder | Test.java:1205:10:1205:32 | add(...) : JsonPatchBuilder | provenance | MaD:89 |
+| Test.java:1205:10:1205:11 | in : JsonPatchBuilder | Test.java:1205:10:1205:32 | add(...) : JsonPatchBuilder | provenance | MaD:91 |
 | Test.java:1205:10:1205:32 | add(...) : JsonPatchBuilder | Test.java:1206:9:1206:11 | out | provenance |  |
 | Test.java:1211:39:1211:77 | (...)... : JsonPatchBuilder | Test.java:1212:10:1212:11 | in : JsonPatchBuilder | provenance |  |
 | Test.java:1211:70:1211:77 | source(...) : Object | Test.java:1211:39:1211:77 | (...)... : JsonPatchBuilder | provenance |  |
-| Test.java:1212:10:1212:11 | in : JsonPatchBuilder | Test.java:1212:10:1212:59 | add(...) : JsonPatchBuilder | provenance | MaD:89 |
+| Test.java:1212:10:1212:11 | in : JsonPatchBuilder | Test.java:1212:10:1212:59 | add(...) : JsonPatchBuilder | provenance | MaD:91 |
 | Test.java:1212:10:1212:59 | add(...) : JsonPatchBuilder | Test.java:1213:9:1213:11 | out | provenance |  |
 | Test.java:1218:39:1218:77 | (...)... : JsonPatchBuilder | Test.java:1219:10:1219:11 | in : JsonPatchBuilder | provenance |  |
 | Test.java:1218:70:1218:77 | source(...) : Object | Test.java:1218:39:1218:77 | (...)... : JsonPatchBuilder | provenance |  |
-| Test.java:1219:10:1219:11 | in : JsonPatchBuilder | Test.java:1219:10:1219:43 | add(...) : JsonPatchBuilder | provenance | MaD:89 |
+| Test.java:1219:10:1219:11 | in : JsonPatchBuilder | Test.java:1219:10:1219:43 | add(...) : JsonPatchBuilder | provenance | MaD:91 |
 | Test.java:1219:10:1219:43 | add(...) : JsonPatchBuilder | Test.java:1220:9:1220:11 | out | provenance |  |
 | Test.java:1225:32:1225:63 | (...)... : JsonValue | Test.java:1227:37:1227:38 | in : JsonValue | provenance |  |
 | Test.java:1225:56:1225:63 | source(...) : Object | Test.java:1225:32:1225:63 | (...)... : JsonValue | provenance |  |
@@ -970,11 +970,11 @@ edges
 | Test.java:1283:37:1283:38 | in : String | Test.java:1283:10:1283:39 | add(...) : JsonPatchBuilder | provenance | MaD:90 |
 | Test.java:1289:39:1289:77 | (...)... : JsonPatchBuilder | Test.java:1290:10:1290:11 | in : JsonPatchBuilder | provenance |  |
 | Test.java:1289:70:1289:77 | source(...) : Object | Test.java:1289:39:1289:77 | (...)... : JsonPatchBuilder | provenance |  |
-| Test.java:1290:10:1290:11 | in : JsonPatchBuilder | Test.java:1290:10:1290:19 | build(...) : JsonPatch | provenance | MaD:91 |
+| Test.java:1290:10:1290:11 | in : JsonPatchBuilder | Test.java:1290:10:1290:19 | build(...) : JsonPatch | provenance | MaD:92 |
 | Test.java:1290:10:1290:19 | build(...) : JsonPatch | Test.java:1291:9:1291:11 | out | provenance |  |
 | Test.java:1296:39:1296:77 | (...)... : JsonPatchBuilder | Test.java:1297:10:1297:11 | in : JsonPatchBuilder | provenance |  |
 | Test.java:1296:70:1296:77 | source(...) : Object | Test.java:1296:39:1296:77 | (...)... : JsonPatchBuilder | provenance |  |
-| Test.java:1297:10:1297:11 | in : JsonPatchBuilder | Test.java:1297:10:1297:28 | copy(...) : JsonPatchBuilder | provenance | MaD:92 |
+| Test.java:1297:10:1297:11 | in : JsonPatchBuilder | Test.java:1297:10:1297:28 | copy(...) : JsonPatchBuilder | provenance | MaD:94 |
 | Test.java:1297:10:1297:28 | copy(...) : JsonPatchBuilder | Test.java:1298:9:1298:11 | out | provenance |  |
 | Test.java:1303:16:1303:31 | (...)... : String | Test.java:1305:30:1305:31 | in : String | provenance |  |
 | Test.java:1303:24:1303:31 | source(...) : Object | Test.java:1303:16:1303:31 | (...)... : String | provenance |  |
@@ -986,7 +986,7 @@ edges
 | Test.java:1313:24:1313:25 | in : String | Test.java:1313:10:1313:32 | copy(...) : JsonPatchBuilder | provenance | MaD:93 |
 | Test.java:1319:39:1319:77 | (...)... : JsonPatchBuilder | Test.java:1320:10:1320:11 | in : JsonPatchBuilder | provenance |  |
 | Test.java:1319:70:1319:77 | source(...) : Object | Test.java:1319:39:1319:77 | (...)... : JsonPatchBuilder | provenance |  |
-| Test.java:1320:10:1320:11 | in : JsonPatchBuilder | Test.java:1320:10:1320:28 | move(...) : JsonPatchBuilder | provenance | MaD:94 |
+| Test.java:1320:10:1320:11 | in : JsonPatchBuilder | Test.java:1320:10:1320:28 | move(...) : JsonPatchBuilder | provenance | MaD:96 |
 | Test.java:1320:10:1320:28 | move(...) : JsonPatchBuilder | Test.java:1321:9:1321:11 | out | provenance |  |
 | Test.java:1326:16:1326:31 | (...)... : String | Test.java:1328:30:1328:31 | in : String | provenance |  |
 | Test.java:1326:24:1326:31 | source(...) : Object | Test.java:1326:16:1326:31 | (...)... : String | provenance |  |
@@ -998,7 +998,7 @@ edges
 | Test.java:1336:24:1336:25 | in : String | Test.java:1336:10:1336:32 | move(...) : JsonPatchBuilder | provenance | MaD:95 |
 | Test.java:1342:39:1342:77 | (...)... : JsonPatchBuilder | Test.java:1343:10:1343:11 | in : JsonPatchBuilder | provenance |  |
 | Test.java:1342:70:1342:77 | source(...) : Object | Test.java:1342:39:1342:77 | (...)... : JsonPatchBuilder | provenance |  |
-| Test.java:1343:10:1343:11 | in : JsonPatchBuilder | Test.java:1343:10:1343:24 | remove(...) : JsonPatchBuilder | provenance | MaD:96 |
+| Test.java:1343:10:1343:11 | in : JsonPatchBuilder | Test.java:1343:10:1343:24 | remove(...) : JsonPatchBuilder | provenance | MaD:98 |
 | Test.java:1343:10:1343:24 | remove(...) : JsonPatchBuilder | Test.java:1344:9:1344:11 | out | provenance |  |
 | Test.java:1349:16:1349:31 | (...)... : String | Test.java:1351:26:1351:27 | in : String | provenance |  |
 | Test.java:1349:24:1349:31 | source(...) : Object | Test.java:1349:16:1349:31 | (...)... : String | provenance |  |
@@ -1006,19 +1006,19 @@ edges
 | Test.java:1351:26:1351:27 | in : String | Test.java:1351:10:1351:28 | remove(...) : JsonPatchBuilder | provenance | MaD:97 |
 | Test.java:1357:39:1357:77 | (...)... : JsonPatchBuilder | Test.java:1358:10:1358:11 | in : JsonPatchBuilder | provenance |  |
 | Test.java:1357:70:1357:77 | source(...) : Object | Test.java:1357:39:1357:77 | (...)... : JsonPatchBuilder | provenance |  |
-| Test.java:1358:10:1358:11 | in : JsonPatchBuilder | Test.java:1358:10:1358:40 | replace(...) : JsonPatchBuilder | provenance | MaD:98 |
+| Test.java:1358:10:1358:11 | in : JsonPatchBuilder | Test.java:1358:10:1358:40 | replace(...) : JsonPatchBuilder | provenance | MaD:100 |
 | Test.java:1358:10:1358:40 | replace(...) : JsonPatchBuilder | Test.java:1359:9:1359:11 | out | provenance |  |
 | Test.java:1364:39:1364:77 | (...)... : JsonPatchBuilder | Test.java:1365:10:1365:11 | in : JsonPatchBuilder | provenance |  |
 | Test.java:1364:70:1364:77 | source(...) : Object | Test.java:1364:39:1364:77 | (...)... : JsonPatchBuilder | provenance |  |
-| Test.java:1365:10:1365:11 | in : JsonPatchBuilder | Test.java:1365:10:1365:36 | replace(...) : JsonPatchBuilder | provenance | MaD:98 |
+| Test.java:1365:10:1365:11 | in : JsonPatchBuilder | Test.java:1365:10:1365:36 | replace(...) : JsonPatchBuilder | provenance | MaD:100 |
 | Test.java:1365:10:1365:36 | replace(...) : JsonPatchBuilder | Test.java:1366:9:1366:11 | out | provenance |  |
 | Test.java:1371:39:1371:77 | (...)... : JsonPatchBuilder | Test.java:1372:10:1372:11 | in : JsonPatchBuilder | provenance |  |
 | Test.java:1371:70:1371:77 | source(...) : Object | Test.java:1371:39:1371:77 | (...)... : JsonPatchBuilder | provenance |  |
-| Test.java:1372:10:1372:11 | in : JsonPatchBuilder | Test.java:1372:10:1372:63 | replace(...) : JsonPatchBuilder | provenance | MaD:98 |
+| Test.java:1372:10:1372:11 | in : JsonPatchBuilder | Test.java:1372:10:1372:63 | replace(...) : JsonPatchBuilder | provenance | MaD:100 |
 | Test.java:1372:10:1372:63 | replace(...) : JsonPatchBuilder | Test.java:1373:9:1373:11 | out | provenance |  |
 | Test.java:1378:39:1378:77 | (...)... : JsonPatchBuilder | Test.java:1379:10:1379:11 | in : JsonPatchBuilder | provenance |  |
 | Test.java:1378:70:1378:77 | source(...) : Object | Test.java:1378:39:1378:77 | (...)... : JsonPatchBuilder | provenance |  |
-| Test.java:1379:10:1379:11 | in : JsonPatchBuilder | Test.java:1379:10:1379:47 | replace(...) : JsonPatchBuilder | provenance | MaD:98 |
+| Test.java:1379:10:1379:11 | in : JsonPatchBuilder | Test.java:1379:10:1379:47 | replace(...) : JsonPatchBuilder | provenance | MaD:100 |
 | Test.java:1379:10:1379:47 | replace(...) : JsonPatchBuilder | Test.java:1380:9:1380:11 | out | provenance |  |
 | Test.java:1385:32:1385:63 | (...)... : JsonValue | Test.java:1387:41:1387:42 | in : JsonValue | provenance |  |
 | Test.java:1385:56:1385:63 | source(...) : Object | Test.java:1385:32:1385:63 | (...)... : JsonValue | provenance |  |
@@ -1054,19 +1054,19 @@ edges
 | Test.java:1443:41:1443:42 | in : String | Test.java:1443:10:1443:43 | replace(...) : JsonPatchBuilder | provenance | MaD:99 |
 | Test.java:1449:39:1449:77 | (...)... : JsonPatchBuilder | Test.java:1450:10:1450:11 | in : JsonPatchBuilder | provenance |  |
 | Test.java:1449:70:1449:77 | source(...) : Object | Test.java:1449:39:1449:77 | (...)... : JsonPatchBuilder | provenance |  |
-| Test.java:1450:10:1450:11 | in : JsonPatchBuilder | Test.java:1450:10:1450:37 | test(...) : JsonPatchBuilder | provenance | MaD:100 |
+| Test.java:1450:10:1450:11 | in : JsonPatchBuilder | Test.java:1450:10:1450:37 | test(...) : JsonPatchBuilder | provenance | MaD:102 |
 | Test.java:1450:10:1450:37 | test(...) : JsonPatchBuilder | Test.java:1451:9:1451:11 | out | provenance |  |
 | Test.java:1456:39:1456:77 | (...)... : JsonPatchBuilder | Test.java:1457:10:1457:11 | in : JsonPatchBuilder | provenance |  |
 | Test.java:1456:70:1456:77 | source(...) : Object | Test.java:1456:39:1456:77 | (...)... : JsonPatchBuilder | provenance |  |
-| Test.java:1457:10:1457:11 | in : JsonPatchBuilder | Test.java:1457:10:1457:33 | test(...) : JsonPatchBuilder | provenance | MaD:100 |
+| Test.java:1457:10:1457:11 | in : JsonPatchBuilder | Test.java:1457:10:1457:33 | test(...) : JsonPatchBuilder | provenance | MaD:102 |
 | Test.java:1457:10:1457:33 | test(...) : JsonPatchBuilder | Test.java:1458:9:1458:11 | out | provenance |  |
 | Test.java:1463:39:1463:77 | (...)... : JsonPatchBuilder | Test.java:1464:10:1464:11 | in : JsonPatchBuilder | provenance |  |
 | Test.java:1463:70:1463:77 | source(...) : Object | Test.java:1463:39:1463:77 | (...)... : JsonPatchBuilder | provenance |  |
-| Test.java:1464:10:1464:11 | in : JsonPatchBuilder | Test.java:1464:10:1464:60 | test(...) : JsonPatchBuilder | provenance | MaD:100 |
+| Test.java:1464:10:1464:11 | in : JsonPatchBuilder | Test.java:1464:10:1464:60 | test(...) : JsonPatchBuilder | provenance | MaD:102 |
 | Test.java:1464:10:1464:60 | test(...) : JsonPatchBuilder | Test.java:1465:9:1465:11 | out | provenance |  |
 | Test.java:1470:39:1470:77 | (...)... : JsonPatchBuilder | Test.java:1471:10:1471:11 | in : JsonPatchBuilder | provenance |  |
 | Test.java:1470:70:1470:77 | source(...) : Object | Test.java:1470:39:1470:77 | (...)... : JsonPatchBuilder | provenance |  |
-| Test.java:1471:10:1471:11 | in : JsonPatchBuilder | Test.java:1471:10:1471:44 | test(...) : JsonPatchBuilder | provenance | MaD:100 |
+| Test.java:1471:10:1471:11 | in : JsonPatchBuilder | Test.java:1471:10:1471:44 | test(...) : JsonPatchBuilder | provenance | MaD:102 |
 | Test.java:1471:10:1471:44 | test(...) : JsonPatchBuilder | Test.java:1472:9:1472:11 | out | provenance |  |
 | Test.java:1477:32:1477:63 | (...)... : JsonValue | Test.java:1479:38:1479:39 | in : JsonValue | provenance |  |
 | Test.java:1477:56:1477:63 | source(...) : Object | Test.java:1477:32:1477:63 | (...)... : JsonValue | provenance |  |
@@ -1102,7 +1102,7 @@ edges
 | Test.java:1535:38:1535:39 | in : String | Test.java:1535:10:1535:40 | test(...) : JsonPatchBuilder | provenance | MaD:101 |
 | Test.java:1541:34:1541:67 | (...)... : JsonPointer | Test.java:1542:10:1542:11 | in : JsonPointer | provenance |  |
 | Test.java:1541:60:1541:67 | source(...) : Object | Test.java:1541:34:1541:67 | (...)... : JsonPointer | provenance |  |
-| Test.java:1542:10:1542:11 | in : JsonPointer | Test.java:1542:10:1542:27 | add(...) : JsonStructure | provenance | MaD:102 |
+| Test.java:1542:10:1542:11 | in : JsonPointer | Test.java:1542:10:1542:27 | add(...) : JsonStructure | provenance | MaD:104 |
 | Test.java:1542:10:1542:27 | add(...) : JsonStructure | Test.java:1543:9:1543:11 | out | provenance |  |
 | Test.java:1548:32:1548:63 | (...)... : JsonValue | Test.java:1550:29:1550:30 | in : JsonValue | provenance |  |
 | Test.java:1548:56:1548:63 | source(...) : Object | Test.java:1548:32:1548:63 | (...)... : JsonValue | provenance |  |
@@ -1115,240 +1115,240 @@ edges
 | Test.java:1564:36:1564:71 | (...)... : JsonStructure | Test.java:1566:28:1566:29 | in : JsonStructure | provenance |  |
 | Test.java:1564:64:1564:71 | source(...) : Object | Test.java:1564:36:1564:71 | (...)... : JsonStructure | provenance |  |
 | Test.java:1566:10:1566:30 | getValue(...) : JsonValue | Test.java:1567:9:1567:11 | out | provenance |  |
-| Test.java:1566:28:1566:29 | in : JsonStructure | Test.java:1566:10:1566:30 | getValue(...) : JsonValue | provenance | MaD:104 |
+| Test.java:1566:28:1566:29 | in : JsonStructure | Test.java:1566:10:1566:30 | getValue(...) : JsonValue | provenance | MaD:105 |
 | Test.java:1572:36:1572:71 | (...)... : JsonStructure | Test.java:1574:26:1574:27 | in : JsonStructure | provenance |  |
 | Test.java:1572:64:1572:71 | source(...) : Object | Test.java:1572:36:1572:71 | (...)... : JsonStructure | provenance |  |
 | Test.java:1574:10:1574:28 | remove(...) : JsonStructure | Test.java:1575:9:1575:11 | out | provenance |  |
-| Test.java:1574:26:1574:27 | in : JsonStructure | Test.java:1574:10:1574:28 | remove(...) : JsonStructure | provenance | MaD:105 |
+| Test.java:1574:26:1574:27 | in : JsonStructure | Test.java:1574:10:1574:28 | remove(...) : JsonStructure | provenance | MaD:106 |
 | Test.java:1580:32:1580:63 | (...)... : JsonValue | Test.java:1582:33:1582:34 | in : JsonValue | provenance |  |
 | Test.java:1580:56:1580:63 | source(...) : Object | Test.java:1580:32:1580:63 | (...)... : JsonValue | provenance |  |
 | Test.java:1582:10:1582:35 | replace(...) : JsonStructure | Test.java:1583:9:1583:11 | out | provenance |  |
-| Test.java:1582:33:1582:34 | in : JsonValue | Test.java:1582:10:1582:35 | replace(...) : JsonStructure | provenance | MaD:106 |
+| Test.java:1582:33:1582:34 | in : JsonValue | Test.java:1582:10:1582:35 | replace(...) : JsonStructure | provenance | MaD:107 |
 | Test.java:1588:36:1588:71 | (...)... : JsonStructure | Test.java:1590:27:1590:28 | in : JsonStructure | provenance |  |
 | Test.java:1588:64:1588:71 | source(...) : Object | Test.java:1588:36:1588:71 | (...)... : JsonStructure | provenance |  |
 | Test.java:1590:10:1590:35 | replace(...) : JsonStructure | Test.java:1591:9:1591:11 | out | provenance |  |
-| Test.java:1590:27:1590:28 | in : JsonStructure | Test.java:1590:10:1590:35 | replace(...) : JsonStructure | provenance | MaD:106 |
+| Test.java:1590:27:1590:28 | in : JsonStructure | Test.java:1590:10:1590:35 | replace(...) : JsonStructure | provenance | MaD:107 |
 | Test.java:1596:34:1596:67 | (...)... : JsonPointer | Test.java:1597:10:1597:11 | in : JsonPointer | provenance |  |
 | Test.java:1596:60:1596:67 | source(...) : Object | Test.java:1596:34:1596:67 | (...)... : JsonPointer | provenance |  |
-| Test.java:1597:10:1597:11 | in : JsonPointer | Test.java:1597:10:1597:22 | toString(...) : String | provenance | MaD:107 |
+| Test.java:1597:10:1597:11 | in : JsonPointer | Test.java:1597:10:1597:22 | toString(...) : String | provenance | MaD:108 |
 | Test.java:1597:10:1597:22 | toString(...) : String | Test.java:1598:9:1598:11 | out | provenance |  |
 | Test.java:1603:33:1603:65 | (...)... : JsonReader | Test.java:1604:10:1604:11 | in : JsonReader | provenance |  |
 | Test.java:1603:58:1603:65 | source(...) : Object | Test.java:1603:33:1603:65 | (...)... : JsonReader | provenance |  |
-| Test.java:1604:10:1604:11 | in : JsonReader | Test.java:1604:10:1604:18 | read(...) : JsonStructure | provenance | MaD:108 |
+| Test.java:1604:10:1604:11 | in : JsonReader | Test.java:1604:10:1604:18 | read(...) : JsonStructure | provenance | MaD:109 |
 | Test.java:1604:10:1604:18 | read(...) : JsonStructure | Test.java:1605:9:1605:11 | out | provenance |  |
 | Test.java:1610:33:1610:65 | (...)... : JsonReader | Test.java:1611:10:1611:11 | in : JsonReader | provenance |  |
 | Test.java:1610:58:1610:65 | source(...) : Object | Test.java:1610:33:1610:65 | (...)... : JsonReader | provenance |  |
-| Test.java:1611:10:1611:11 | in : JsonReader | Test.java:1611:10:1611:23 | readArray(...) : JsonArray | provenance | MaD:109 |
+| Test.java:1611:10:1611:11 | in : JsonReader | Test.java:1611:10:1611:23 | readArray(...) : JsonArray | provenance | MaD:110 |
 | Test.java:1611:10:1611:23 | readArray(...) : JsonArray | Test.java:1612:9:1612:11 | out | provenance |  |
 | Test.java:1617:33:1617:65 | (...)... : JsonReader | Test.java:1618:10:1618:11 | in : JsonReader | provenance |  |
 | Test.java:1617:58:1617:65 | source(...) : Object | Test.java:1617:33:1617:65 | (...)... : JsonReader | provenance |  |
-| Test.java:1618:10:1618:11 | in : JsonReader | Test.java:1618:10:1618:24 | readObject(...) : JsonObject | provenance | MaD:110 |
+| Test.java:1618:10:1618:11 | in : JsonReader | Test.java:1618:10:1618:24 | readObject(...) : JsonObject | provenance | MaD:111 |
 | Test.java:1618:10:1618:24 | readObject(...) : JsonObject | Test.java:1619:9:1619:11 | out | provenance |  |
 | Test.java:1624:33:1624:65 | (...)... : JsonReader | Test.java:1625:10:1625:11 | in : JsonReader | provenance |  |
 | Test.java:1624:58:1624:65 | source(...) : Object | Test.java:1624:33:1624:65 | (...)... : JsonReader | provenance |  |
-| Test.java:1625:10:1625:11 | in : JsonReader | Test.java:1625:10:1625:23 | readValue(...) : JsonValue | provenance | MaD:111 |
+| Test.java:1625:10:1625:11 | in : JsonReader | Test.java:1625:10:1625:23 | readValue(...) : JsonValue | provenance | MaD:112 |
 | Test.java:1625:10:1625:23 | readValue(...) : JsonValue | Test.java:1626:9:1626:11 | out | provenance |  |
 | Test.java:1631:16:1631:31 | (...)... : Reader | Test.java:1633:32:1633:33 | in : Reader | provenance |  |
 | Test.java:1631:24:1631:31 | source(...) : Object | Test.java:1631:16:1631:31 | (...)... : Reader | provenance |  |
 | Test.java:1633:10:1633:34 | createReader(...) : JsonReader | Test.java:1634:9:1634:11 | out | provenance |  |
-| Test.java:1633:32:1633:33 | in : Reader | Test.java:1633:10:1633:34 | createReader(...) : JsonReader | provenance | MaD:112 |
+| Test.java:1633:32:1633:33 | in : Reader | Test.java:1633:10:1633:34 | createReader(...) : JsonReader | provenance | MaD:113 |
 | Test.java:1639:21:1639:41 | (...)... : InputStream | Test.java:1641:32:1641:33 | in : InputStream | provenance |  |
 | Test.java:1639:34:1639:41 | source(...) : Object | Test.java:1639:21:1639:41 | (...)... : InputStream | provenance |  |
 | Test.java:1641:10:1641:40 | createReader(...) : JsonReader | Test.java:1642:9:1642:11 | out | provenance |  |
-| Test.java:1641:32:1641:33 | in : InputStream | Test.java:1641:10:1641:40 | createReader(...) : JsonReader | provenance | MaD:112 |
+| Test.java:1641:32:1641:33 | in : InputStream | Test.java:1641:10:1641:40 | createReader(...) : JsonReader | provenance | MaD:113 |
 | Test.java:1647:21:1647:41 | (...)... : InputStream | Test.java:1649:32:1649:33 | in : InputStream | provenance |  |
 | Test.java:1647:34:1647:41 | source(...) : Object | Test.java:1647:21:1647:41 | (...)... : InputStream | provenance |  |
 | Test.java:1649:10:1649:34 | createReader(...) : JsonReader | Test.java:1650:9:1650:11 | out | provenance |  |
-| Test.java:1649:32:1649:33 | in : InputStream | Test.java:1649:10:1649:34 | createReader(...) : JsonReader | provenance | MaD:112 |
+| Test.java:1649:32:1649:33 | in : InputStream | Test.java:1649:10:1649:34 | createReader(...) : JsonReader | provenance | MaD:113 |
 | Test.java:1655:33:1655:65 | (...)... : JsonString | Test.java:1656:10:1656:11 | in : JsonString | provenance |  |
 | Test.java:1655:58:1655:65 | source(...) : Object | Test.java:1655:33:1655:65 | (...)... : JsonString | provenance |  |
-| Test.java:1656:10:1656:11 | in : JsonString | Test.java:1656:10:1656:22 | getChars(...) : CharSequence | provenance | MaD:113 |
+| Test.java:1656:10:1656:11 | in : JsonString | Test.java:1656:10:1656:22 | getChars(...) : CharSequence | provenance | MaD:114 |
 | Test.java:1656:10:1656:22 | getChars(...) : CharSequence | Test.java:1657:9:1657:11 | out | provenance |  |
 | Test.java:1662:33:1662:65 | (...)... : JsonString | Test.java:1663:10:1663:11 | in : JsonString | provenance |  |
 | Test.java:1662:58:1662:65 | source(...) : Object | Test.java:1662:33:1662:65 | (...)... : JsonString | provenance |  |
-| Test.java:1663:10:1663:11 | in : JsonString | Test.java:1663:10:1663:23 | getString(...) : String | provenance | MaD:114 |
+| Test.java:1663:10:1663:11 | in : JsonString | Test.java:1663:10:1663:23 | getString(...) : String | provenance | MaD:115 |
 | Test.java:1663:10:1663:23 | getString(...) : String | Test.java:1664:9:1664:11 | out | provenance |  |
 | Test.java:1669:36:1669:71 | (...)... : JsonStructure | Test.java:1670:10:1670:11 | in : JsonStructure | provenance |  |
 | Test.java:1669:64:1669:71 | source(...) : Object | Test.java:1669:36:1669:71 | (...)... : JsonStructure | provenance |  |
-| Test.java:1670:10:1670:11 | in : JsonStructure | Test.java:1670:10:1670:26 | getValue(...) : JsonValue | provenance | MaD:115 |
+| Test.java:1670:10:1670:11 | in : JsonStructure | Test.java:1670:10:1670:26 | getValue(...) : JsonValue | provenance | MaD:116 |
 | Test.java:1670:10:1670:26 | getValue(...) : JsonValue | Test.java:1671:9:1671:11 | out | provenance |  |
 | Test.java:1676:32:1676:63 | (...)... : JsonValue | Test.java:1677:10:1677:11 | in : JsonValue | provenance |  |
 | Test.java:1676:56:1676:63 | source(...) : Object | Test.java:1676:32:1676:63 | (...)... : JsonValue | provenance |  |
-| Test.java:1677:10:1677:11 | in : JsonValue | Test.java:1677:10:1677:25 | asJsonArray(...) : JsonArray | provenance | MaD:116 |
+| Test.java:1677:10:1677:11 | in : JsonValue | Test.java:1677:10:1677:25 | asJsonArray(...) : JsonArray | provenance | MaD:117 |
 | Test.java:1677:10:1677:25 | asJsonArray(...) : JsonArray | Test.java:1678:9:1678:11 | out | provenance |  |
 | Test.java:1683:32:1683:63 | (...)... : JsonValue | Test.java:1684:10:1684:11 | in : JsonValue | provenance |  |
 | Test.java:1683:56:1683:63 | source(...) : Object | Test.java:1683:32:1683:63 | (...)... : JsonValue | provenance |  |
-| Test.java:1684:10:1684:11 | in : JsonValue | Test.java:1684:10:1684:26 | asJsonObject(...) : JsonObject | provenance | MaD:117 |
+| Test.java:1684:10:1684:11 | in : JsonValue | Test.java:1684:10:1684:26 | asJsonObject(...) : JsonObject | provenance | MaD:118 |
 | Test.java:1684:10:1684:26 | asJsonObject(...) : JsonObject | Test.java:1685:9:1685:11 | out | provenance |  |
 | Test.java:1690:32:1690:63 | (...)... : JsonValue | Test.java:1691:10:1691:11 | in : JsonValue | provenance |  |
 | Test.java:1690:56:1690:63 | source(...) : Object | Test.java:1690:32:1690:63 | (...)... : JsonValue | provenance |  |
-| Test.java:1691:10:1691:11 | in : JsonValue | Test.java:1691:10:1691:22 | toString(...) : String | provenance | MaD:118 |
+| Test.java:1691:10:1691:11 | in : JsonValue | Test.java:1691:10:1691:22 | toString(...) : String | provenance | MaD:119 |
 | Test.java:1691:10:1691:22 | toString(...) : String | Test.java:1692:9:1692:11 | out | provenance |  |
 | Test.java:1697:33:1697:65 | (...)... : JsonNumber | Test.java:1698:10:1698:11 | in : JsonNumber | provenance |  |
 | Test.java:1697:58:1697:65 | source(...) : Object | Test.java:1697:33:1697:65 | (...)... : JsonNumber | provenance |  |
-| Test.java:1698:10:1698:11 | in : JsonNumber | Test.java:1698:10:1698:22 | toString(...) : String | provenance | MaD:118 |
+| Test.java:1698:10:1698:11 | in : JsonNumber | Test.java:1698:10:1698:22 | toString(...) : String | provenance | MaD:119 |
 | Test.java:1698:10:1698:22 | toString(...) : String | Test.java:1699:9:1699:11 | out | provenance |  |
 | Test.java:1704:32:1704:63 | (...)... : JsonValue | Test.java:1705:14:1705:15 | in : JsonValue | provenance |  |
 | Test.java:1704:56:1704:63 | source(...) : Object | Test.java:1704:32:1704:63 | (...)... : JsonValue | provenance |  |
 | Test.java:1705:4:1705:6 | out [post update] : JsonWriter | Test.java:1706:9:1706:11 | out | provenance |  |
-| Test.java:1705:14:1705:15 | in : JsonValue | Test.java:1705:4:1705:6 | out [post update] : JsonWriter | provenance | MaD:119 |
+| Test.java:1705:14:1705:15 | in : JsonValue | Test.java:1705:4:1705:6 | out [post update] : JsonWriter | provenance | MaD:120 |
 | Test.java:1711:36:1711:71 | (...)... : JsonStructure | Test.java:1712:14:1712:15 | in : JsonStructure | provenance |  |
 | Test.java:1711:64:1711:71 | source(...) : Object | Test.java:1711:36:1711:71 | (...)... : JsonStructure | provenance |  |
 | Test.java:1712:4:1712:6 | out [post update] : JsonWriter | Test.java:1713:9:1713:11 | out | provenance |  |
-| Test.java:1712:14:1712:15 | in : JsonStructure | Test.java:1712:4:1712:6 | out [post update] : JsonWriter | provenance | MaD:119 |
+| Test.java:1712:14:1712:15 | in : JsonStructure | Test.java:1712:4:1712:6 | out [post update] : JsonWriter | provenance | MaD:120 |
 | Test.java:1718:32:1718:63 | (...)... : JsonArray | Test.java:1719:19:1719:20 | in : JsonArray | provenance |  |
 | Test.java:1718:56:1718:63 | source(...) : Object | Test.java:1718:32:1718:63 | (...)... : JsonArray | provenance |  |
 | Test.java:1719:4:1719:6 | out [post update] : JsonWriter | Test.java:1720:9:1720:11 | out | provenance |  |
-| Test.java:1719:19:1719:20 | in : JsonArray | Test.java:1719:4:1719:6 | out [post update] : JsonWriter | provenance | MaD:120 |
+| Test.java:1719:19:1719:20 | in : JsonArray | Test.java:1719:4:1719:6 | out [post update] : JsonWriter | provenance | MaD:121 |
 | Test.java:1725:33:1725:65 | (...)... : JsonObject | Test.java:1726:20:1726:21 | in : JsonObject | provenance |  |
 | Test.java:1725:58:1725:65 | source(...) : Object | Test.java:1725:33:1725:65 | (...)... : JsonObject | provenance |  |
 | Test.java:1726:4:1726:6 | out [post update] : JsonWriter | Test.java:1727:9:1727:11 | out | provenance |  |
-| Test.java:1726:20:1726:21 | in : JsonObject | Test.java:1726:4:1726:6 | out [post update] : JsonWriter | provenance | MaD:121 |
+| Test.java:1726:20:1726:21 | in : JsonObject | Test.java:1726:4:1726:6 | out [post update] : JsonWriter | provenance | MaD:122 |
 | Test.java:1732:40:1732:79 | (...)... : JsonWriterFactory | Test.java:1733:4:1733:5 | in : JsonWriterFactory | provenance |  |
 | Test.java:1732:72:1732:79 | source(...) : Object | Test.java:1732:40:1732:79 | (...)... : JsonWriterFactory | provenance |  |
-| Test.java:1733:4:1733:5 | in : JsonWriterFactory | Test.java:1733:20:1733:22 | out [post update] : Writer | provenance | MaD:122 |
+| Test.java:1733:4:1733:5 | in : JsonWriterFactory | Test.java:1733:20:1733:22 | out [post update] : Writer | provenance | MaD:123 |
 | Test.java:1733:20:1733:22 | out [post update] : Writer | Test.java:1734:9:1734:11 | out | provenance |  |
 | Test.java:1739:40:1739:79 | (...)... : JsonWriterFactory | Test.java:1740:4:1740:5 | in : JsonWriterFactory | provenance |  |
 | Test.java:1739:72:1739:79 | source(...) : Object | Test.java:1739:40:1739:79 | (...)... : JsonWriterFactory | provenance |  |
-| Test.java:1740:4:1740:5 | in : JsonWriterFactory | Test.java:1740:20:1740:22 | out [post update] : OutputStream | provenance | MaD:122 |
+| Test.java:1740:4:1740:5 | in : JsonWriterFactory | Test.java:1740:20:1740:22 | out [post update] : OutputStream | provenance | MaD:123 |
 | Test.java:1740:20:1740:22 | out [post update] : OutputStream | Test.java:1741:9:1741:11 | out | provenance |  |
 | Test.java:1746:40:1746:79 | (...)... : JsonWriterFactory | Test.java:1747:4:1747:5 | in : JsonWriterFactory | provenance |  |
 | Test.java:1746:72:1746:79 | source(...) : Object | Test.java:1746:40:1746:79 | (...)... : JsonWriterFactory | provenance |  |
-| Test.java:1747:4:1747:5 | in : JsonWriterFactory | Test.java:1747:20:1747:22 | out [post update] : OutputStream | provenance | MaD:122 |
+| Test.java:1747:4:1747:5 | in : JsonWriterFactory | Test.java:1747:20:1747:22 | out [post update] : OutputStream | provenance | MaD:123 |
 | Test.java:1747:20:1747:22 | out [post update] : OutputStream | Test.java:1748:9:1748:11 | out | provenance |  |
 | Test.java:1753:31:1753:61 | (...)... : JsonObject | Test.java:1755:32:1755:33 | in : JsonObject | provenance |  |
 | Test.java:1753:54:1753:61 | source(...) : Object | Test.java:1753:31:1753:61 | (...)... : JsonObject | provenance |  |
 | Test.java:1755:10:1755:34 | createParser(...) : JsonParser | Test.java:1756:9:1756:11 | out | provenance |  |
-| Test.java:1755:32:1755:33 | in : JsonObject | Test.java:1755:10:1755:34 | createParser(...) : JsonParser | provenance | MaD:248 |
+| Test.java:1755:32:1755:33 | in : JsonObject | Test.java:1755:10:1755:34 | createParser(...) : JsonParser | provenance | MaD:127 |
 | Test.java:1761:30:1761:59 | (...)... : JsonArray | Test.java:1763:32:1763:33 | in : JsonArray | provenance |  |
 | Test.java:1761:52:1761:59 | source(...) : Object | Test.java:1761:30:1761:59 | (...)... : JsonArray | provenance |  |
 | Test.java:1763:10:1763:34 | createParser(...) : JsonParser | Test.java:1764:9:1764:11 | out | provenance |  |
-| Test.java:1763:32:1763:33 | in : JsonArray | Test.java:1763:10:1763:34 | createParser(...) : JsonParser | provenance | MaD:248 |
+| Test.java:1763:32:1763:33 | in : JsonArray | Test.java:1763:10:1763:34 | createParser(...) : JsonParser | provenance | MaD:127 |
 | Test.java:1769:16:1769:31 | (...)... : Reader | Test.java:1771:32:1771:33 | in : Reader | provenance |  |
 | Test.java:1769:24:1769:31 | source(...) : Object | Test.java:1769:16:1769:31 | (...)... : Reader | provenance |  |
 | Test.java:1771:10:1771:34 | createParser(...) : JsonParser | Test.java:1772:9:1772:11 | out | provenance |  |
-| Test.java:1771:32:1771:33 | in : Reader | Test.java:1771:10:1771:34 | createParser(...) : JsonParser | provenance | MaD:248 |
+| Test.java:1771:32:1771:33 | in : Reader | Test.java:1771:10:1771:34 | createParser(...) : JsonParser | provenance | MaD:127 |
 | Test.java:1777:21:1777:41 | (...)... : InputStream | Test.java:1779:32:1779:33 | in : InputStream | provenance |  |
 | Test.java:1777:34:1777:41 | source(...) : Object | Test.java:1777:21:1777:41 | (...)... : InputStream | provenance |  |
 | Test.java:1779:10:1779:40 | createParser(...) : JsonParser | Test.java:1780:9:1780:11 | out | provenance |  |
-| Test.java:1779:32:1779:33 | in : InputStream | Test.java:1779:10:1779:40 | createParser(...) : JsonParser | provenance | MaD:248 |
+| Test.java:1779:32:1779:33 | in : InputStream | Test.java:1779:10:1779:40 | createParser(...) : JsonParser | provenance | MaD:127 |
 | Test.java:1785:21:1785:41 | (...)... : InputStream | Test.java:1787:32:1787:33 | in : InputStream | provenance |  |
 | Test.java:1785:34:1785:41 | source(...) : Object | Test.java:1785:21:1785:41 | (...)... : InputStream | provenance |  |
 | Test.java:1787:10:1787:34 | createParser(...) : JsonParser | Test.java:1788:9:1788:11 | out | provenance |  |
-| Test.java:1787:32:1787:33 | in : InputStream | Test.java:1787:10:1787:34 | createParser(...) : JsonParser | provenance | MaD:248 |
+| Test.java:1787:32:1787:33 | in : InputStream | Test.java:1787:10:1787:34 | createParser(...) : JsonParser | provenance | MaD:127 |
 | Test.java:1793:20:1793:55 | (...)... : List [<element>] : Object | Test.java:1794:45:1794:46 | in : List [<element>] : Object | provenance |  |
 | Test.java:1793:32:1793:55 | newWithElement(...) : List [<element>] : Object | Test.java:1793:20:1793:55 | (...)... : List [<element>] : Object | provenance |  |
 | Test.java:1793:47:1793:54 | source(...) : Object | Test.java:17:28:17:41 | element : Object | provenance |  |
 | Test.java:1793:47:1793:54 | source(...) : Object | Test.java:1793:32:1793:55 | newWithElement(...) : List [<element>] : Object | provenance | MaD:124 |
 | Test.java:1794:10:1794:47 | createArrayBuilder(...) : JsonArrayBuilder | Test.java:1795:9:1795:11 | out | provenance |  |
-| Test.java:1794:45:1794:46 | in : List [<element>] : Object | Test.java:1794:10:1794:47 | createArrayBuilder(...) : JsonArrayBuilder | provenance | MaD:127 |
+| Test.java:1794:45:1794:46 | in : List [<element>] : Object | Test.java:1794:10:1794:47 | createArrayBuilder(...) : JsonArrayBuilder | provenance | MaD:128 |
 | Test.java:1800:30:1800:59 | (...)... : JsonArray | Test.java:1801:45:1801:46 | in : JsonArray | provenance |  |
 | Test.java:1800:52:1800:59 | source(...) : Object | Test.java:1800:30:1800:59 | (...)... : JsonArray | provenance |  |
 | Test.java:1801:10:1801:47 | createArrayBuilder(...) : JsonArrayBuilder | Test.java:1802:9:1802:11 | out | provenance |  |
-| Test.java:1801:45:1801:46 | in : JsonArray | Test.java:1801:10:1801:47 | createArrayBuilder(...) : JsonArrayBuilder | provenance | MaD:128 |
+| Test.java:1801:45:1801:46 | in : JsonArray | Test.java:1801:10:1801:47 | createArrayBuilder(...) : JsonArrayBuilder | provenance | MaD:129 |
 | Test.java:1807:34:1807:67 | (...)... : JsonStructure | Test.java:1808:43:1808:44 | in : JsonStructure | provenance |  |
 | Test.java:1807:60:1807:67 | source(...) : Object | Test.java:1807:34:1807:67 | (...)... : JsonStructure | provenance |  |
 | Test.java:1808:10:1808:45 | createDiff(...) : JsonPatch | Test.java:1809:9:1809:11 | out | provenance |  |
-| Test.java:1808:43:1808:44 | in : JsonStructure | Test.java:1808:10:1808:45 | createDiff(...) : JsonPatch | provenance | MaD:129 |
+| Test.java:1808:43:1808:44 | in : JsonStructure | Test.java:1808:10:1808:45 | createDiff(...) : JsonPatch | provenance | MaD:130 |
 | Test.java:1814:34:1814:67 | (...)... : JsonStructure | Test.java:1815:37:1815:38 | in : JsonStructure | provenance |  |
 | Test.java:1814:60:1814:67 | source(...) : Object | Test.java:1814:34:1814:67 | (...)... : JsonStructure | provenance |  |
 | Test.java:1815:10:1815:45 | createDiff(...) : JsonPatch | Test.java:1816:9:1816:11 | out | provenance |  |
-| Test.java:1815:37:1815:38 | in : JsonStructure | Test.java:1815:10:1815:45 | createDiff(...) : JsonPatch | provenance | MaD:129 |
+| Test.java:1815:37:1815:38 | in : JsonStructure | Test.java:1815:10:1815:45 | createDiff(...) : JsonPatch | provenance | MaD:130 |
 | Test.java:1821:30:1821:59 | (...)... : JsonValue | Test.java:1822:48:1822:49 | in : JsonValue | provenance |  |
 | Test.java:1821:52:1821:59 | source(...) : Object | Test.java:1821:30:1821:59 | (...)... : JsonValue | provenance |  |
 | Test.java:1822:10:1822:50 | createMergeDiff(...) : JsonMergePatch | Test.java:1823:9:1823:11 | out | provenance |  |
-| Test.java:1822:48:1822:49 | in : JsonValue | Test.java:1822:10:1822:50 | createMergeDiff(...) : JsonMergePatch | provenance | MaD:130 |
+| Test.java:1822:48:1822:49 | in : JsonValue | Test.java:1822:10:1822:50 | createMergeDiff(...) : JsonMergePatch | provenance | MaD:131 |
 | Test.java:1828:30:1828:59 | (...)... : JsonValue | Test.java:1829:42:1829:43 | in : JsonValue | provenance |  |
 | Test.java:1828:52:1828:59 | source(...) : Object | Test.java:1828:30:1828:59 | (...)... : JsonValue | provenance |  |
 | Test.java:1829:10:1829:50 | createMergeDiff(...) : JsonMergePatch | Test.java:1830:9:1830:11 | out | provenance |  |
-| Test.java:1829:42:1829:43 | in : JsonValue | Test.java:1829:10:1829:50 | createMergeDiff(...) : JsonMergePatch | provenance | MaD:130 |
+| Test.java:1829:42:1829:43 | in : JsonValue | Test.java:1829:10:1829:50 | createMergeDiff(...) : JsonMergePatch | provenance | MaD:131 |
 | Test.java:1835:30:1835:59 | (...)... : JsonValue | Test.java:1836:43:1836:44 | in : JsonValue | provenance |  |
 | Test.java:1835:52:1835:59 | source(...) : Object | Test.java:1835:30:1835:59 | (...)... : JsonValue | provenance |  |
 | Test.java:1836:10:1836:45 | createMergePatch(...) : JsonMergePatch | Test.java:1837:9:1837:11 | out | provenance |  |
-| Test.java:1836:43:1836:44 | in : JsonValue | Test.java:1836:10:1836:45 | createMergePatch(...) : JsonMergePatch | provenance | MaD:131 |
+| Test.java:1836:43:1836:44 | in : JsonValue | Test.java:1836:10:1836:45 | createMergePatch(...) : JsonMergePatch | provenance | MaD:132 |
 | Test.java:1842:31:1842:61 | (...)... : JsonObject | Test.java:1843:46:1843:47 | in : JsonObject | provenance |  |
 | Test.java:1842:54:1842:61 | source(...) : Object | Test.java:1842:31:1842:61 | (...)... : JsonObject | provenance |  |
 | Test.java:1843:10:1843:48 | createObjectBuilder(...) : JsonObjectBuilder | Test.java:1844:9:1844:11 | out | provenance |  |
-| Test.java:1843:46:1843:47 | in : JsonObject | Test.java:1843:10:1843:48 | createObjectBuilder(...) : JsonObjectBuilder | provenance | MaD:132 |
+| Test.java:1843:46:1843:47 | in : JsonObject | Test.java:1843:10:1843:48 | createObjectBuilder(...) : JsonObjectBuilder | provenance | MaD:133 |
 | Test.java:1849:13:1849:40 | (...)... : Map [<map.key>] : Object | Test.java:1850:46:1850:47 | in : Map [<map.key>] : Object | provenance |  |
 | Test.java:1849:18:1849:40 | newWithMapKey(...) : Map [<map.key>] : Object | Test.java:1849:13:1849:40 | (...)... : Map [<map.key>] : Object | provenance |  |
 | Test.java:1849:32:1849:39 | source(...) : Object | Test.java:18:20:18:33 | element : Object | provenance |  |
 | Test.java:1849:32:1849:39 | source(...) : Object | Test.java:1849:18:1849:40 | newWithMapKey(...) : Map [<map.key>] : Object | provenance | MaD:125 |
 | Test.java:1850:10:1850:48 | createObjectBuilder(...) : JsonObjectBuilder | Test.java:1851:9:1851:11 | out | provenance |  |
-| Test.java:1850:46:1850:47 | in : Map [<map.key>] : Object | Test.java:1850:10:1850:48 | createObjectBuilder(...) : JsonObjectBuilder | provenance | MaD:133 |
+| Test.java:1850:46:1850:47 | in : Map [<map.key>] : Object | Test.java:1850:10:1850:48 | createObjectBuilder(...) : JsonObjectBuilder | provenance | MaD:134 |
 | Test.java:1856:13:1856:42 | (...)... : Map [<map.value>] : Object | Test.java:1857:46:1857:47 | in : Map [<map.value>] : Object | provenance |  |
 | Test.java:1856:18:1856:42 | newWithMapValue(...) : Map [<map.value>] : Object | Test.java:1856:13:1856:42 | (...)... : Map [<map.value>] : Object | provenance |  |
 | Test.java:1856:34:1856:41 | source(...) : Object | Test.java:19:22:19:35 | element : Object | provenance |  |
 | Test.java:1856:34:1856:41 | source(...) : Object | Test.java:1856:18:1856:42 | newWithMapValue(...) : Map [<map.value>] : Object | provenance | MaD:126 |
 | Test.java:1857:10:1857:48 | createObjectBuilder(...) : JsonObjectBuilder | Test.java:1858:9:1858:11 | out | provenance |  |
-| Test.java:1857:46:1857:47 | in : Map [<map.value>] : Object | Test.java:1857:10:1857:48 | createObjectBuilder(...) : JsonObjectBuilder | provenance | MaD:134 |
+| Test.java:1857:46:1857:47 | in : Map [<map.value>] : Object | Test.java:1857:10:1857:48 | createObjectBuilder(...) : JsonObjectBuilder | provenance | MaD:135 |
 | Test.java:1863:30:1863:59 | (...)... : JsonArray | Test.java:1864:38:1864:39 | in : JsonArray | provenance |  |
 | Test.java:1863:52:1863:59 | source(...) : Object | Test.java:1863:30:1863:59 | (...)... : JsonArray | provenance |  |
 | Test.java:1864:10:1864:40 | createPatch(...) : JsonPatch | Test.java:1865:9:1865:11 | out | provenance |  |
-| Test.java:1864:38:1864:39 | in : JsonArray | Test.java:1864:10:1864:40 | createPatch(...) : JsonPatch | provenance | MaD:135 |
+| Test.java:1864:38:1864:39 | in : JsonArray | Test.java:1864:10:1864:40 | createPatch(...) : JsonPatch | provenance | MaD:136 |
 | Test.java:1870:30:1870:59 | (...)... : JsonArray | Test.java:1871:45:1871:46 | in : JsonArray | provenance |  |
 | Test.java:1870:52:1870:59 | source(...) : Object | Test.java:1870:30:1870:59 | (...)... : JsonArray | provenance |  |
 | Test.java:1871:10:1871:47 | createPatchBuilder(...) : JsonPatchBuilder | Test.java:1872:9:1872:11 | out | provenance |  |
-| Test.java:1871:45:1871:46 | in : JsonArray | Test.java:1871:10:1871:47 | createPatchBuilder(...) : JsonPatchBuilder | provenance | MaD:136 |
+| Test.java:1871:45:1871:46 | in : JsonArray | Test.java:1871:10:1871:47 | createPatchBuilder(...) : JsonPatchBuilder | provenance | MaD:137 |
 | Test.java:1877:16:1877:31 | (...)... : String | Test.java:1878:40:1878:41 | in : String | provenance |  |
 | Test.java:1877:24:1877:31 | source(...) : Object | Test.java:1877:16:1877:31 | (...)... : String | provenance |  |
 | Test.java:1878:10:1878:42 | createPointer(...) : JsonPointer | Test.java:1879:9:1879:11 | out | provenance |  |
-| Test.java:1878:40:1878:41 | in : String | Test.java:1878:10:1878:42 | createPointer(...) : JsonPointer | provenance | MaD:137 |
+| Test.java:1878:40:1878:41 | in : String | Test.java:1878:10:1878:42 | createPointer(...) : JsonPointer | provenance | MaD:138 |
 | Test.java:1884:16:1884:31 | (...)... : Reader | Test.java:1885:39:1885:40 | in : Reader | provenance |  |
 | Test.java:1884:24:1884:31 | source(...) : Object | Test.java:1884:16:1884:31 | (...)... : Reader | provenance |  |
 | Test.java:1885:10:1885:41 | createReader(...) : JsonReader | Test.java:1886:9:1886:11 | out | provenance |  |
-| Test.java:1885:39:1885:40 | in : Reader | Test.java:1885:10:1885:41 | createReader(...) : JsonReader | provenance | MaD:138 |
+| Test.java:1885:39:1885:40 | in : Reader | Test.java:1885:10:1885:41 | createReader(...) : JsonReader | provenance | MaD:139 |
 | Test.java:1891:21:1891:41 | (...)... : InputStream | Test.java:1892:39:1892:40 | in : InputStream | provenance |  |
 | Test.java:1891:34:1891:41 | source(...) : Object | Test.java:1891:21:1891:41 | (...)... : InputStream | provenance |  |
 | Test.java:1892:10:1892:41 | createReader(...) : JsonReader | Test.java:1893:9:1893:11 | out | provenance |  |
-| Test.java:1892:39:1892:40 | in : InputStream | Test.java:1892:10:1892:41 | createReader(...) : JsonReader | provenance | MaD:138 |
+| Test.java:1892:39:1892:40 | in : InputStream | Test.java:1892:10:1892:41 | createReader(...) : JsonReader | provenance | MaD:139 |
 | Test.java:1898:16:1898:31 | (...)... : String | Test.java:1899:38:1899:39 | in : String | provenance |  |
 | Test.java:1898:24:1898:31 | source(...) : Object | Test.java:1898:16:1898:31 | (...)... : String | provenance |  |
 | Test.java:1899:10:1899:40 | createValue(...) : JsonString | Test.java:1900:9:1900:11 | out | provenance |  |
-| Test.java:1899:38:1899:39 | in : String | Test.java:1899:10:1899:40 | createValue(...) : JsonString | provenance | MaD:139 |
+| Test.java:1899:38:1899:39 | in : String | Test.java:1899:10:1899:40 | createValue(...) : JsonString | provenance | MaD:140 |
 | Test.java:1905:14:1905:27 | (...)... : Number | Test.java:1906:38:1906:39 | in : Number | provenance |  |
 | Test.java:1905:20:1905:27 | source(...) : Object | Test.java:1905:14:1905:27 | (...)... : Number | provenance |  |
 | Test.java:1906:10:1906:40 | createValue(...) : JsonNumber | Test.java:1907:9:1907:11 | out | provenance |  |
-| Test.java:1906:38:1906:39 | in : Number | Test.java:1906:10:1906:40 | createValue(...) : JsonNumber | provenance | MaD:139 |
+| Test.java:1906:38:1906:39 | in : Number | Test.java:1906:10:1906:40 | createValue(...) : JsonNumber | provenance | MaD:140 |
 | Test.java:1912:13:1912:25 | (...)... : Number | Test.java:1913:38:1913:39 | in : Number | provenance |  |
 | Test.java:1912:18:1912:25 | source(...) : Object | Test.java:1912:13:1912:25 | (...)... : Number | provenance |  |
 | Test.java:1913:10:1913:40 | createValue(...) : JsonNumber | Test.java:1914:9:1914:11 | out | provenance |  |
-| Test.java:1913:38:1913:39 | in : Number | Test.java:1913:10:1913:40 | createValue(...) : JsonNumber | provenance | MaD:139 |
+| Test.java:1913:38:1913:39 | in : Number | Test.java:1913:10:1913:40 | createValue(...) : JsonNumber | provenance | MaD:140 |
 | Test.java:1919:16:1919:31 | (...)... : Number | Test.java:1920:38:1920:39 | in : Number | provenance |  |
 | Test.java:1919:24:1919:31 | source(...) : Object | Test.java:1919:16:1919:31 | (...)... : Number | provenance |  |
 | Test.java:1920:10:1920:40 | createValue(...) : JsonNumber | Test.java:1921:9:1921:11 | out | provenance |  |
-| Test.java:1920:38:1920:39 | in : Number | Test.java:1920:10:1920:40 | createValue(...) : JsonNumber | provenance | MaD:139 |
+| Test.java:1920:38:1920:39 | in : Number | Test.java:1920:10:1920:40 | createValue(...) : JsonNumber | provenance | MaD:140 |
 | Test.java:1926:20:1926:39 | (...)... : BigInteger | Test.java:1927:38:1927:39 | in : BigInteger | provenance |  |
 | Test.java:1926:32:1926:39 | source(...) : Object | Test.java:1926:20:1926:39 | (...)... : BigInteger | provenance |  |
 | Test.java:1927:10:1927:40 | createValue(...) : JsonNumber | Test.java:1928:9:1928:11 | out | provenance |  |
-| Test.java:1927:38:1927:39 | in : BigInteger | Test.java:1927:10:1927:40 | createValue(...) : JsonNumber | provenance | MaD:139 |
+| Test.java:1927:38:1927:39 | in : BigInteger | Test.java:1927:10:1927:40 | createValue(...) : JsonNumber | provenance | MaD:140 |
 | Test.java:1933:20:1933:39 | (...)... : BigDecimal | Test.java:1934:38:1934:39 | in : BigDecimal | provenance |  |
 | Test.java:1933:32:1933:39 | source(...) : Object | Test.java:1933:20:1933:39 | (...)... : BigDecimal | provenance |  |
 | Test.java:1934:10:1934:40 | createValue(...) : JsonNumber | Test.java:1935:9:1935:11 | out | provenance |  |
-| Test.java:1934:38:1934:39 | in : BigDecimal | Test.java:1934:10:1934:40 | createValue(...) : JsonNumber | provenance | MaD:139 |
+| Test.java:1934:38:1934:39 | in : BigDecimal | Test.java:1934:10:1934:40 | createValue(...) : JsonNumber | provenance | MaD:140 |
 | Test.java:1940:16:1940:31 | (...)... : Writer | Test.java:1941:39:1941:40 | in : Writer | provenance |  |
 | Test.java:1940:24:1940:31 | source(...) : Object | Test.java:1940:16:1940:31 | (...)... : Writer | provenance |  |
 | Test.java:1941:10:1941:41 | createWriter(...) : JsonWriter | Test.java:1942:9:1942:11 | out | provenance |  |
-| Test.java:1941:39:1941:40 | in : Writer | Test.java:1941:10:1941:41 | createWriter(...) : JsonWriter | provenance | MaD:140 |
+| Test.java:1941:39:1941:40 | in : Writer | Test.java:1941:10:1941:41 | createWriter(...) : JsonWriter | provenance | MaD:141 |
 | Test.java:1947:22:1947:43 | (...)... : OutputStream | Test.java:1948:39:1948:40 | in : OutputStream | provenance |  |
 | Test.java:1947:36:1947:43 | source(...) : Object | Test.java:1947:22:1947:43 | (...)... : OutputStream | provenance |  |
 | Test.java:1948:10:1948:41 | createWriter(...) : JsonWriter | Test.java:1949:9:1949:11 | out | provenance |  |
-| Test.java:1948:39:1948:40 | in : OutputStream | Test.java:1948:10:1948:41 | createWriter(...) : JsonWriter | provenance | MaD:140 |
+| Test.java:1948:39:1948:40 | in : OutputStream | Test.java:1948:10:1948:41 | createWriter(...) : JsonWriter | provenance | MaD:141 |
 | Test.java:1954:16:1954:31 | (...)... : String | Test.java:1955:40:1955:41 | in : String | provenance |  |
 | Test.java:1954:24:1954:31 | source(...) : Object | Test.java:1954:16:1954:31 | (...)... : String | provenance |  |
 | Test.java:1955:10:1955:42 | decodePointer(...) : String | Test.java:1956:9:1956:11 | out | provenance |  |
-| Test.java:1955:40:1955:41 | in : String | Test.java:1955:10:1955:42 | decodePointer(...) : String | provenance | MaD:141 |
+| Test.java:1955:40:1955:41 | in : String | Test.java:1955:10:1955:42 | decodePointer(...) : String | provenance | MaD:142 |
 | Test.java:1961:16:1961:31 | (...)... : String | Test.java:1962:40:1962:41 | in : String | provenance |  |
 | Test.java:1961:24:1961:31 | source(...) : Object | Test.java:1961:16:1961:31 | (...)... : String | provenance |  |
 | Test.java:1962:10:1962:42 | encodePointer(...) : String | Test.java:1963:9:1963:11 | out | provenance |  |
-| Test.java:1962:40:1962:41 | in : String | Test.java:1962:10:1962:42 | encodePointer(...) : String | provenance | MaD:142 |
+| Test.java:1962:40:1962:41 | in : String | Test.java:1962:10:1962:42 | encodePointer(...) : String | provenance | MaD:143 |
 | Test.java:1968:30:1968:59 | (...)... : JsonArray | Test.java:1969:10:1969:11 | in : JsonArray | provenance |  |
 | Test.java:1968:52:1968:59 | source(...) : Object | Test.java:1968:30:1968:59 | (...)... : JsonArray | provenance |  |
-| Test.java:1969:10:1969:11 | in : JsonArray | Test.java:1969:10:1969:32 | getBoolean(...) : Boolean | provenance | MaD:143 |
+| Test.java:1969:10:1969:11 | in : JsonArray | Test.java:1969:10:1969:32 | getBoolean(...) : Boolean | provenance | MaD:145 |
 | Test.java:1969:10:1969:32 | getBoolean(...) : Boolean | Test.java:1970:9:1970:11 | out | provenance |  |
 | Test.java:1975:30:1975:59 | (...)... : JsonArray | Test.java:1976:10:1976:11 | in : JsonArray | provenance |  |
 | Test.java:1975:52:1975:59 | source(...) : Object | Test.java:1975:30:1975:59 | (...)... : JsonArray | provenance |  |
-| Test.java:1976:10:1976:11 | in : JsonArray | Test.java:1976:10:1976:25 | getBoolean(...) : Boolean | provenance | MaD:143 |
+| Test.java:1976:10:1976:11 | in : JsonArray | Test.java:1976:10:1976:25 | getBoolean(...) : Boolean | provenance | MaD:145 |
 | Test.java:1976:10:1976:25 | getBoolean(...) : Boolean | Test.java:1977:9:1977:11 | out | provenance |  |
 | Test.java:1982:17:1982:33 | (...)... : Boolean | Test.java:1984:33:1984:34 | in : Boolean | provenance |  |
 | Test.java:1982:26:1982:33 | source(...) : Object | Test.java:1982:17:1982:33 | (...)... : Boolean | provenance |  |
@@ -1356,11 +1356,11 @@ edges
 | Test.java:1984:33:1984:34 | in : Boolean | Test.java:1984:10:1984:35 | getBoolean(...) : Boolean | provenance | MaD:144 |
 | Test.java:1990:30:1990:59 | (...)... : JsonArray | Test.java:1991:10:1991:11 | in : JsonArray | provenance |  |
 | Test.java:1990:52:1990:59 | source(...) : Object | Test.java:1990:30:1990:59 | (...)... : JsonArray | provenance |  |
-| Test.java:1991:10:1991:11 | in : JsonArray | Test.java:1991:10:1991:24 | getInt(...) : Number | provenance | MaD:145 |
+| Test.java:1991:10:1991:11 | in : JsonArray | Test.java:1991:10:1991:24 | getInt(...) : Number | provenance | MaD:147 |
 | Test.java:1991:10:1991:24 | getInt(...) : Number | Test.java:1992:9:1992:11 | out | provenance |  |
 | Test.java:1997:30:1997:59 | (...)... : JsonArray | Test.java:1998:10:1998:11 | in : JsonArray | provenance |  |
 | Test.java:1997:52:1997:59 | source(...) : Object | Test.java:1997:30:1997:59 | (...)... : JsonArray | provenance |  |
-| Test.java:1998:10:1998:11 | in : JsonArray | Test.java:1998:10:1998:21 | getInt(...) : Number | provenance | MaD:145 |
+| Test.java:1998:10:1998:11 | in : JsonArray | Test.java:1998:10:1998:21 | getInt(...) : Number | provenance | MaD:147 |
 | Test.java:1998:10:1998:21 | getInt(...) : Number | Test.java:1999:9:1999:11 | out | provenance |  |
 | Test.java:2004:13:2004:25 | (...)... : Number | Test.java:2006:29:2006:30 | in : Number | provenance |  |
 | Test.java:2004:18:2004:25 | source(...) : Object | Test.java:2004:13:2004:25 | (...)... : Number | provenance |  |
@@ -1368,27 +1368,27 @@ edges
 | Test.java:2006:29:2006:30 | in : Number | Test.java:2006:10:2006:31 | getInt(...) : Number | provenance | MaD:146 |
 | Test.java:2012:30:2012:59 | (...)... : JsonArray | Test.java:2013:10:2013:11 | in : JsonArray | provenance |  |
 | Test.java:2012:52:2012:59 | source(...) : Object | Test.java:2012:30:2012:59 | (...)... : JsonArray | provenance |  |
-| Test.java:2013:10:2013:11 | in : JsonArray | Test.java:2013:10:2013:27 | getJsonArray(...) : JsonArray | provenance | MaD:147 |
+| Test.java:2013:10:2013:11 | in : JsonArray | Test.java:2013:10:2013:27 | getJsonArray(...) : JsonArray | provenance | MaD:148 |
 | Test.java:2013:10:2013:27 | getJsonArray(...) : JsonArray | Test.java:2014:9:2014:11 | out | provenance |  |
 | Test.java:2019:30:2019:59 | (...)... : JsonArray | Test.java:2020:10:2020:11 | in : JsonArray | provenance |  |
 | Test.java:2019:52:2019:59 | source(...) : Object | Test.java:2019:30:2019:59 | (...)... : JsonArray | provenance |  |
-| Test.java:2020:10:2020:11 | in : JsonArray | Test.java:2020:10:2020:28 | getJsonNumber(...) : JsonNumber | provenance | MaD:148 |
+| Test.java:2020:10:2020:11 | in : JsonArray | Test.java:2020:10:2020:28 | getJsonNumber(...) : JsonNumber | provenance | MaD:149 |
 | Test.java:2020:10:2020:28 | getJsonNumber(...) : JsonNumber | Test.java:2021:9:2021:11 | out | provenance |  |
 | Test.java:2026:30:2026:59 | (...)... : JsonArray | Test.java:2027:10:2027:11 | in : JsonArray | provenance |  |
 | Test.java:2026:52:2026:59 | source(...) : Object | Test.java:2026:30:2026:59 | (...)... : JsonArray | provenance |  |
-| Test.java:2027:10:2027:11 | in : JsonArray | Test.java:2027:10:2027:28 | getJsonObject(...) : JsonObject | provenance | MaD:149 |
+| Test.java:2027:10:2027:11 | in : JsonArray | Test.java:2027:10:2027:28 | getJsonObject(...) : JsonObject | provenance | MaD:150 |
 | Test.java:2027:10:2027:28 | getJsonObject(...) : JsonObject | Test.java:2028:9:2028:11 | out | provenance |  |
 | Test.java:2033:30:2033:59 | (...)... : JsonArray | Test.java:2034:10:2034:11 | in : JsonArray | provenance |  |
 | Test.java:2033:52:2033:59 | source(...) : Object | Test.java:2033:30:2033:59 | (...)... : JsonArray | provenance |  |
-| Test.java:2034:10:2034:11 | in : JsonArray | Test.java:2034:10:2034:28 | getJsonString(...) : JsonString | provenance | MaD:150 |
+| Test.java:2034:10:2034:11 | in : JsonArray | Test.java:2034:10:2034:28 | getJsonString(...) : JsonString | provenance | MaD:151 |
 | Test.java:2034:10:2034:28 | getJsonString(...) : JsonString | Test.java:2035:9:2035:11 | out | provenance |  |
 | Test.java:2040:30:2040:59 | (...)... : JsonArray | Test.java:2041:10:2041:11 | in : JsonArray | provenance |  |
 | Test.java:2040:52:2040:59 | source(...) : Object | Test.java:2040:30:2040:59 | (...)... : JsonArray | provenance |  |
-| Test.java:2041:10:2041:11 | in : JsonArray | Test.java:2041:10:2041:30 | getString(...) : String | provenance | MaD:151 |
+| Test.java:2041:10:2041:11 | in : JsonArray | Test.java:2041:10:2041:30 | getString(...) : String | provenance | MaD:153 |
 | Test.java:2041:10:2041:30 | getString(...) : String | Test.java:2042:9:2042:11 | out | provenance |  |
 | Test.java:2047:30:2047:59 | (...)... : JsonArray | Test.java:2048:10:2048:11 | in : JsonArray | provenance |  |
 | Test.java:2047:52:2047:59 | source(...) : Object | Test.java:2047:30:2047:59 | (...)... : JsonArray | provenance |  |
-| Test.java:2048:10:2048:11 | in : JsonArray | Test.java:2048:10:2048:24 | getString(...) : String | provenance | MaD:151 |
+| Test.java:2048:10:2048:11 | in : JsonArray | Test.java:2048:10:2048:24 | getString(...) : String | provenance | MaD:153 |
 | Test.java:2048:10:2048:24 | getString(...) : String | Test.java:2049:9:2049:11 | out | provenance |  |
 | Test.java:2054:16:2054:31 | (...)... : String | Test.java:2056:32:2056:33 | in : String | provenance |  |
 | Test.java:2054:24:2054:31 | source(...) : Object | Test.java:2054:16:2054:31 | (...)... : String | provenance |  |
@@ -1396,11 +1396,11 @@ edges
 | Test.java:2056:32:2056:33 | in : String | Test.java:2056:10:2056:34 | getString(...) : String | provenance | MaD:152 |
 | Test.java:2062:30:2062:59 | (...)... : JsonArray | Test.java:2063:10:2063:11 | in : JsonArray | provenance |  |
 | Test.java:2062:52:2062:59 | source(...) : Object | Test.java:2062:30:2062:59 | (...)... : JsonArray | provenance |  |
-| Test.java:2063:10:2063:11 | in : JsonArray | Test.java:2063:10:2063:39 | getValuesAs(...) : List | provenance | MaD:153 |
+| Test.java:2063:10:2063:11 | in : JsonArray | Test.java:2063:10:2063:39 | getValuesAs(...) : List | provenance | MaD:154 |
 | Test.java:2063:10:2063:39 | getValuesAs(...) : List | Test.java:2064:9:2064:11 | out | provenance |  |
 | Test.java:2069:30:2069:59 | (...)... : JsonArray | Test.java:2070:10:2070:11 | in : JsonArray | provenance |  |
 | Test.java:2069:52:2069:59 | source(...) : Object | Test.java:2069:30:2069:59 | (...)... : JsonArray | provenance |  |
-| Test.java:2070:10:2070:11 | in : JsonArray | Test.java:2070:10:2070:36 | getValuesAs(...) : List | provenance | MaD:153 |
+| Test.java:2070:10:2070:11 | in : JsonArray | Test.java:2070:10:2070:36 | getValuesAs(...) : List | provenance | MaD:154 |
 | Test.java:2070:10:2070:36 | getValuesAs(...) : List | Test.java:2071:9:2071:11 | out | provenance |  |
 | Test.java:2076:20:2076:39 | (...)... : BigDecimal | Test.java:2077:12:2077:13 | in : BigDecimal | provenance |  |
 | Test.java:2076:32:2076:39 | source(...) : Object | Test.java:2076:20:2076:39 | (...)... : BigDecimal | provenance |  |
@@ -1484,87 +1484,87 @@ edges
 | Test.java:2210:12:2210:13 | in : Number | Test.java:2210:4:2210:6 | out [post update] : JsonArrayBuilder | provenance | MaD:174 |
 | Test.java:2216:37:2216:73 | (...)... : JsonArrayBuilder | Test.java:2217:10:2217:11 | in : JsonArrayBuilder | provenance |  |
 | Test.java:2216:66:2216:73 | source(...) : Object | Test.java:2216:37:2216:73 | (...)... : JsonArrayBuilder | provenance |  |
-| Test.java:2217:10:2217:11 | in : JsonArrayBuilder | Test.java:2217:10:2217:22 | add(...) : JsonArrayBuilder | provenance | MaD:154 |
+| Test.java:2217:10:2217:11 | in : JsonArrayBuilder | Test.java:2217:10:2217:22 | add(...) : JsonArrayBuilder | provenance | MaD:175 |
 | Test.java:2217:10:2217:22 | add(...) : JsonArrayBuilder | Test.java:2218:9:2218:11 | out | provenance |  |
 | Test.java:2223:37:2223:73 | (...)... : JsonArrayBuilder | Test.java:2224:10:2224:11 | in : JsonArrayBuilder | provenance |  |
 | Test.java:2223:66:2223:73 | source(...) : Object | Test.java:2223:37:2223:73 | (...)... : JsonArrayBuilder | provenance |  |
-| Test.java:2224:10:2224:11 | in : JsonArrayBuilder | Test.java:2224:10:2224:19 | add(...) : JsonArrayBuilder | provenance | MaD:154 |
+| Test.java:2224:10:2224:11 | in : JsonArrayBuilder | Test.java:2224:10:2224:19 | add(...) : JsonArrayBuilder | provenance | MaD:175 |
 | Test.java:2224:10:2224:19 | add(...) : JsonArrayBuilder | Test.java:2225:9:2225:11 | out | provenance |  |
 | Test.java:2230:37:2230:73 | (...)... : JsonArrayBuilder | Test.java:2231:10:2231:11 | in : JsonArrayBuilder | provenance |  |
 | Test.java:2230:66:2230:73 | source(...) : Object | Test.java:2230:37:2230:73 | (...)... : JsonArrayBuilder | provenance |  |
-| Test.java:2231:10:2231:11 | in : JsonArrayBuilder | Test.java:2231:10:2231:20 | add(...) : JsonArrayBuilder | provenance | MaD:154 |
+| Test.java:2231:10:2231:11 | in : JsonArrayBuilder | Test.java:2231:10:2231:20 | add(...) : JsonArrayBuilder | provenance | MaD:175 |
 | Test.java:2231:10:2231:20 | add(...) : JsonArrayBuilder | Test.java:2232:9:2232:11 | out | provenance |  |
 | Test.java:2237:37:2237:73 | (...)... : JsonArrayBuilder | Test.java:2238:10:2238:11 | in : JsonArrayBuilder | provenance |  |
 | Test.java:2237:66:2237:73 | source(...) : Object | Test.java:2237:37:2237:73 | (...)... : JsonArrayBuilder | provenance |  |
-| Test.java:2238:10:2238:11 | in : JsonArrayBuilder | Test.java:2238:10:2238:25 | add(...) : JsonArrayBuilder | provenance | MaD:154 |
+| Test.java:2238:10:2238:11 | in : JsonArrayBuilder | Test.java:2238:10:2238:25 | add(...) : JsonArrayBuilder | provenance | MaD:175 |
 | Test.java:2238:10:2238:25 | add(...) : JsonArrayBuilder | Test.java:2239:9:2239:11 | out | provenance |  |
 | Test.java:2244:37:2244:73 | (...)... : JsonArrayBuilder | Test.java:2245:10:2245:11 | in : JsonArrayBuilder | provenance |  |
 | Test.java:2244:66:2244:73 | source(...) : Object | Test.java:2244:37:2244:73 | (...)... : JsonArrayBuilder | provenance |  |
-| Test.java:2245:10:2245:11 | in : JsonArrayBuilder | Test.java:2245:10:2245:22 | add(...) : JsonArrayBuilder | provenance | MaD:154 |
+| Test.java:2245:10:2245:11 | in : JsonArrayBuilder | Test.java:2245:10:2245:22 | add(...) : JsonArrayBuilder | provenance | MaD:175 |
 | Test.java:2245:10:2245:22 | add(...) : JsonArrayBuilder | Test.java:2246:9:2246:11 | out | provenance |  |
 | Test.java:2251:37:2251:73 | (...)... : JsonArrayBuilder | Test.java:2252:10:2252:11 | in : JsonArrayBuilder | provenance |  |
 | Test.java:2251:66:2251:73 | source(...) : Object | Test.java:2251:37:2251:73 | (...)... : JsonArrayBuilder | provenance |  |
-| Test.java:2252:10:2252:11 | in : JsonArrayBuilder | Test.java:2252:10:2252:23 | add(...) : JsonArrayBuilder | provenance | MaD:154 |
+| Test.java:2252:10:2252:11 | in : JsonArrayBuilder | Test.java:2252:10:2252:23 | add(...) : JsonArrayBuilder | provenance | MaD:175 |
 | Test.java:2252:10:2252:23 | add(...) : JsonArrayBuilder | Test.java:2253:9:2253:11 | out | provenance |  |
 | Test.java:2258:37:2258:73 | (...)... : JsonArrayBuilder | Test.java:2259:10:2259:11 | in : JsonArrayBuilder | provenance |  |
 | Test.java:2258:66:2258:73 | source(...) : Object | Test.java:2258:37:2258:73 | (...)... : JsonArrayBuilder | provenance |  |
-| Test.java:2259:10:2259:11 | in : JsonArrayBuilder | Test.java:2259:10:2259:21 | add(...) : JsonArrayBuilder | provenance | MaD:154 |
+| Test.java:2259:10:2259:11 | in : JsonArrayBuilder | Test.java:2259:10:2259:21 | add(...) : JsonArrayBuilder | provenance | MaD:175 |
 | Test.java:2259:10:2259:21 | add(...) : JsonArrayBuilder | Test.java:2260:9:2260:11 | out | provenance |  |
 | Test.java:2265:37:2265:73 | (...)... : JsonArrayBuilder | Test.java:2266:10:2266:11 | in : JsonArrayBuilder | provenance |  |
 | Test.java:2265:66:2265:73 | source(...) : Object | Test.java:2265:37:2265:73 | (...)... : JsonArrayBuilder | provenance |  |
-| Test.java:2266:10:2266:11 | in : JsonArrayBuilder | Test.java:2266:10:2266:46 | add(...) : JsonArrayBuilder | provenance | MaD:154 |
+| Test.java:2266:10:2266:11 | in : JsonArrayBuilder | Test.java:2266:10:2266:46 | add(...) : JsonArrayBuilder | provenance | MaD:175 |
 | Test.java:2266:10:2266:46 | add(...) : JsonArrayBuilder | Test.java:2267:9:2267:11 | out | provenance |  |
 | Test.java:2272:37:2272:73 | (...)... : JsonArrayBuilder | Test.java:2273:10:2273:11 | in : JsonArrayBuilder | provenance |  |
 | Test.java:2272:66:2272:73 | source(...) : Object | Test.java:2272:37:2272:73 | (...)... : JsonArrayBuilder | provenance |  |
-| Test.java:2273:10:2273:11 | in : JsonArrayBuilder | Test.java:2273:10:2273:54 | add(...) : JsonArrayBuilder | provenance | MaD:154 |
+| Test.java:2273:10:2273:11 | in : JsonArrayBuilder | Test.java:2273:10:2273:54 | add(...) : JsonArrayBuilder | provenance | MaD:175 |
 | Test.java:2273:10:2273:54 | add(...) : JsonArrayBuilder | Test.java:2274:9:2274:11 | out | provenance |  |
 | Test.java:2279:37:2279:73 | (...)... : JsonArrayBuilder | Test.java:2280:10:2280:11 | in : JsonArrayBuilder | provenance |  |
 | Test.java:2279:66:2279:73 | source(...) : Object | Test.java:2279:37:2279:73 | (...)... : JsonArrayBuilder | provenance |  |
-| Test.java:2280:10:2280:11 | in : JsonArrayBuilder | Test.java:2280:10:2280:53 | add(...) : JsonArrayBuilder | provenance | MaD:154 |
+| Test.java:2280:10:2280:11 | in : JsonArrayBuilder | Test.java:2280:10:2280:53 | add(...) : JsonArrayBuilder | provenance | MaD:175 |
 | Test.java:2280:10:2280:53 | add(...) : JsonArrayBuilder | Test.java:2281:9:2281:11 | out | provenance |  |
 | Test.java:2286:37:2286:73 | (...)... : JsonArrayBuilder | Test.java:2287:10:2287:11 | in : JsonArrayBuilder | provenance |  |
 | Test.java:2286:66:2286:73 | source(...) : Object | Test.java:2286:37:2286:73 | (...)... : JsonArrayBuilder | provenance |  |
-| Test.java:2287:10:2287:11 | in : JsonArrayBuilder | Test.java:2287:10:2287:32 | add(...) : JsonArrayBuilder | provenance | MaD:154 |
+| Test.java:2287:10:2287:11 | in : JsonArrayBuilder | Test.java:2287:10:2287:32 | add(...) : JsonArrayBuilder | provenance | MaD:175 |
 | Test.java:2287:10:2287:32 | add(...) : JsonArrayBuilder | Test.java:2288:9:2288:11 | out | provenance |  |
 | Test.java:2293:37:2293:73 | (...)... : JsonArrayBuilder | Test.java:2294:10:2294:11 | in : JsonArrayBuilder | provenance |  |
 | Test.java:2293:66:2293:73 | source(...) : Object | Test.java:2293:37:2293:73 | (...)... : JsonArrayBuilder | provenance |  |
-| Test.java:2294:10:2294:11 | in : JsonArrayBuilder | Test.java:2294:10:2294:36 | add(...) : JsonArrayBuilder | provenance | MaD:154 |
+| Test.java:2294:10:2294:11 | in : JsonArrayBuilder | Test.java:2294:10:2294:36 | add(...) : JsonArrayBuilder | provenance | MaD:175 |
 | Test.java:2294:10:2294:36 | add(...) : JsonArrayBuilder | Test.java:2295:9:2295:11 | out | provenance |  |
 | Test.java:2300:37:2300:73 | (...)... : JsonArrayBuilder | Test.java:2301:10:2301:11 | in : JsonArrayBuilder | provenance |  |
 | Test.java:2300:66:2300:73 | source(...) : Object | Test.java:2300:37:2300:73 | (...)... : JsonArrayBuilder | provenance |  |
-| Test.java:2301:10:2301:11 | in : JsonArrayBuilder | Test.java:2301:10:2301:36 | add(...) : JsonArrayBuilder | provenance | MaD:154 |
+| Test.java:2301:10:2301:11 | in : JsonArrayBuilder | Test.java:2301:10:2301:36 | add(...) : JsonArrayBuilder | provenance | MaD:175 |
 | Test.java:2301:10:2301:36 | add(...) : JsonArrayBuilder | Test.java:2302:9:2302:11 | out | provenance |  |
 | Test.java:2307:37:2307:73 | (...)... : JsonArrayBuilder | Test.java:2308:10:2308:11 | in : JsonArrayBuilder | provenance |  |
 | Test.java:2307:66:2307:73 | source(...) : Object | Test.java:2307:37:2307:73 | (...)... : JsonArrayBuilder | provenance |  |
-| Test.java:2308:10:2308:11 | in : JsonArrayBuilder | Test.java:2308:10:2308:18 | add(...) : JsonArrayBuilder | provenance | MaD:154 |
+| Test.java:2308:10:2308:11 | in : JsonArrayBuilder | Test.java:2308:10:2308:18 | add(...) : JsonArrayBuilder | provenance | MaD:175 |
 | Test.java:2308:10:2308:18 | add(...) : JsonArrayBuilder | Test.java:2309:9:2309:11 | out | provenance |  |
 | Test.java:2314:37:2314:73 | (...)... : JsonArrayBuilder | Test.java:2315:10:2315:11 | in : JsonArrayBuilder | provenance |  |
 | Test.java:2314:66:2314:73 | source(...) : Object | Test.java:2314:37:2314:73 | (...)... : JsonArrayBuilder | provenance |  |
-| Test.java:2315:10:2315:11 | in : JsonArrayBuilder | Test.java:2315:10:2315:43 | add(...) : JsonArrayBuilder | provenance | MaD:154 |
+| Test.java:2315:10:2315:11 | in : JsonArrayBuilder | Test.java:2315:10:2315:43 | add(...) : JsonArrayBuilder | provenance | MaD:175 |
 | Test.java:2315:10:2315:43 | add(...) : JsonArrayBuilder | Test.java:2316:9:2316:11 | out | provenance |  |
 | Test.java:2321:37:2321:73 | (...)... : JsonArrayBuilder | Test.java:2322:10:2322:11 | in : JsonArrayBuilder | provenance |  |
 | Test.java:2321:66:2321:73 | source(...) : Object | Test.java:2321:37:2321:73 | (...)... : JsonArrayBuilder | provenance |  |
-| Test.java:2322:10:2322:11 | in : JsonArrayBuilder | Test.java:2322:10:2322:51 | add(...) : JsonArrayBuilder | provenance | MaD:154 |
+| Test.java:2322:10:2322:11 | in : JsonArrayBuilder | Test.java:2322:10:2322:51 | add(...) : JsonArrayBuilder | provenance | MaD:175 |
 | Test.java:2322:10:2322:51 | add(...) : JsonArrayBuilder | Test.java:2323:9:2323:11 | out | provenance |  |
 | Test.java:2328:37:2328:73 | (...)... : JsonArrayBuilder | Test.java:2329:10:2329:11 | in : JsonArrayBuilder | provenance |  |
 | Test.java:2328:66:2328:73 | source(...) : Object | Test.java:2328:37:2328:73 | (...)... : JsonArrayBuilder | provenance |  |
-| Test.java:2329:10:2329:11 | in : JsonArrayBuilder | Test.java:2329:10:2329:50 | add(...) : JsonArrayBuilder | provenance | MaD:154 |
+| Test.java:2329:10:2329:11 | in : JsonArrayBuilder | Test.java:2329:10:2329:50 | add(...) : JsonArrayBuilder | provenance | MaD:175 |
 | Test.java:2329:10:2329:50 | add(...) : JsonArrayBuilder | Test.java:2330:9:2330:11 | out | provenance |  |
 | Test.java:2335:37:2335:73 | (...)... : JsonArrayBuilder | Test.java:2336:10:2336:11 | in : JsonArrayBuilder | provenance |  |
 | Test.java:2335:66:2335:73 | source(...) : Object | Test.java:2335:37:2335:73 | (...)... : JsonArrayBuilder | provenance |  |
-| Test.java:2336:10:2336:11 | in : JsonArrayBuilder | Test.java:2336:10:2336:29 | add(...) : JsonArrayBuilder | provenance | MaD:154 |
+| Test.java:2336:10:2336:11 | in : JsonArrayBuilder | Test.java:2336:10:2336:29 | add(...) : JsonArrayBuilder | provenance | MaD:175 |
 | Test.java:2336:10:2336:29 | add(...) : JsonArrayBuilder | Test.java:2337:9:2337:11 | out | provenance |  |
 | Test.java:2342:37:2342:73 | (...)... : JsonArrayBuilder | Test.java:2343:10:2343:11 | in : JsonArrayBuilder | provenance |  |
 | Test.java:2342:66:2342:73 | source(...) : Object | Test.java:2342:37:2342:73 | (...)... : JsonArrayBuilder | provenance |  |
-| Test.java:2343:10:2343:11 | in : JsonArrayBuilder | Test.java:2343:10:2343:33 | add(...) : JsonArrayBuilder | provenance | MaD:154 |
+| Test.java:2343:10:2343:11 | in : JsonArrayBuilder | Test.java:2343:10:2343:33 | add(...) : JsonArrayBuilder | provenance | MaD:175 |
 | Test.java:2343:10:2343:33 | add(...) : JsonArrayBuilder | Test.java:2344:9:2344:11 | out | provenance |  |
 | Test.java:2349:37:2349:73 | (...)... : JsonArrayBuilder | Test.java:2350:10:2350:11 | in : JsonArrayBuilder | provenance |  |
 | Test.java:2349:66:2349:73 | source(...) : Object | Test.java:2349:37:2349:73 | (...)... : JsonArrayBuilder | provenance |  |
-| Test.java:2350:10:2350:11 | in : JsonArrayBuilder | Test.java:2350:10:2350:33 | add(...) : JsonArrayBuilder | provenance | MaD:154 |
+| Test.java:2350:10:2350:11 | in : JsonArrayBuilder | Test.java:2350:10:2350:33 | add(...) : JsonArrayBuilder | provenance | MaD:175 |
 | Test.java:2350:10:2350:33 | add(...) : JsonArrayBuilder | Test.java:2351:9:2351:11 | out | provenance |  |
 | Test.java:2356:37:2356:73 | (...)... : JsonArrayBuilder | Test.java:2357:10:2357:11 | in : JsonArrayBuilder | provenance |  |
 | Test.java:2356:66:2356:73 | source(...) : Object | Test.java:2356:37:2356:73 | (...)... : JsonArrayBuilder | provenance |  |
-| Test.java:2357:10:2357:11 | in : JsonArrayBuilder | Test.java:2357:10:2357:24 | addAll(...) : JsonArrayBuilder | provenance | MaD:175 |
+| Test.java:2357:10:2357:11 | in : JsonArrayBuilder | Test.java:2357:10:2357:24 | addAll(...) : JsonArrayBuilder | provenance | MaD:177 |
 | Test.java:2357:10:2357:24 | addAll(...) : JsonArrayBuilder | Test.java:2358:9:2358:11 | out | provenance |  |
 | Test.java:2363:37:2363:73 | (...)... : JsonArrayBuilder | Test.java:2364:15:2364:16 | in : JsonArrayBuilder | provenance |  |
 | Test.java:2363:66:2363:73 | source(...) : Object | Test.java:2363:37:2363:73 | (...)... : JsonArrayBuilder | provenance |  |
@@ -1572,59 +1572,59 @@ edges
 | Test.java:2364:15:2364:16 | in : JsonArrayBuilder | Test.java:2364:4:2364:6 | out [post update] : JsonArrayBuilder | provenance | MaD:176 |
 | Test.java:2370:37:2370:73 | (...)... : JsonArrayBuilder | Test.java:2371:10:2371:11 | in : JsonArrayBuilder | provenance |  |
 | Test.java:2370:66:2370:73 | source(...) : Object | Test.java:2370:37:2370:73 | (...)... : JsonArrayBuilder | provenance |  |
-| Test.java:2371:10:2371:11 | in : JsonArrayBuilder | Test.java:2371:10:2371:22 | addNull(...) : JsonArrayBuilder | provenance | MaD:177 |
+| Test.java:2371:10:2371:11 | in : JsonArrayBuilder | Test.java:2371:10:2371:22 | addNull(...) : JsonArrayBuilder | provenance | MaD:178 |
 | Test.java:2371:10:2371:22 | addNull(...) : JsonArrayBuilder | Test.java:2372:9:2372:11 | out | provenance |  |
 | Test.java:2377:37:2377:73 | (...)... : JsonArrayBuilder | Test.java:2378:10:2378:11 | in : JsonArrayBuilder | provenance |  |
 | Test.java:2377:66:2377:73 | source(...) : Object | Test.java:2377:37:2377:73 | (...)... : JsonArrayBuilder | provenance |  |
-| Test.java:2378:10:2378:11 | in : JsonArrayBuilder | Test.java:2378:10:2378:21 | addNull(...) : JsonArrayBuilder | provenance | MaD:177 |
+| Test.java:2378:10:2378:11 | in : JsonArrayBuilder | Test.java:2378:10:2378:21 | addNull(...) : JsonArrayBuilder | provenance | MaD:178 |
 | Test.java:2378:10:2378:21 | addNull(...) : JsonArrayBuilder | Test.java:2379:9:2379:11 | out | provenance |  |
 | Test.java:2384:37:2384:73 | (...)... : JsonArrayBuilder | Test.java:2385:10:2385:11 | in : JsonArrayBuilder | provenance |  |
 | Test.java:2384:66:2384:73 | source(...) : Object | Test.java:2384:37:2384:73 | (...)... : JsonArrayBuilder | provenance |  |
-| Test.java:2385:10:2385:11 | in : JsonArrayBuilder | Test.java:2385:10:2385:19 | build(...) : JsonArray | provenance | MaD:178 |
+| Test.java:2385:10:2385:11 | in : JsonArrayBuilder | Test.java:2385:10:2385:19 | build(...) : JsonArray | provenance | MaD:179 |
 | Test.java:2385:10:2385:19 | build(...) : JsonArray | Test.java:2386:9:2386:11 | out | provenance |  |
 | Test.java:2391:37:2391:73 | (...)... : JsonArrayBuilder | Test.java:2392:10:2392:11 | in : JsonArrayBuilder | provenance |  |
 | Test.java:2391:66:2391:73 | source(...) : Object | Test.java:2391:37:2391:73 | (...)... : JsonArrayBuilder | provenance |  |
-| Test.java:2392:10:2392:11 | in : JsonArrayBuilder | Test.java:2392:10:2392:21 | remove(...) : JsonArrayBuilder | provenance | MaD:179 |
+| Test.java:2392:10:2392:11 | in : JsonArrayBuilder | Test.java:2392:10:2392:21 | remove(...) : JsonArrayBuilder | provenance | MaD:180 |
 | Test.java:2392:10:2392:21 | remove(...) : JsonArrayBuilder | Test.java:2393:9:2393:11 | out | provenance |  |
 | Test.java:2398:37:2398:73 | (...)... : JsonArrayBuilder | Test.java:2399:10:2399:11 | in : JsonArrayBuilder | provenance |  |
 | Test.java:2398:66:2398:73 | source(...) : Object | Test.java:2398:37:2398:73 | (...)... : JsonArrayBuilder | provenance |  |
-| Test.java:2399:10:2399:11 | in : JsonArrayBuilder | Test.java:2399:10:2399:25 | set(...) : JsonArrayBuilder | provenance | MaD:180 |
+| Test.java:2399:10:2399:11 | in : JsonArrayBuilder | Test.java:2399:10:2399:25 | set(...) : JsonArrayBuilder | provenance | MaD:182 |
 | Test.java:2399:10:2399:25 | set(...) : JsonArrayBuilder | Test.java:2400:9:2400:11 | out | provenance |  |
 | Test.java:2405:37:2405:73 | (...)... : JsonArrayBuilder | Test.java:2406:10:2406:11 | in : JsonArrayBuilder | provenance |  |
 | Test.java:2405:66:2405:73 | source(...) : Object | Test.java:2405:37:2405:73 | (...)... : JsonArrayBuilder | provenance |  |
-| Test.java:2406:10:2406:11 | in : JsonArrayBuilder | Test.java:2406:10:2406:22 | set(...) : JsonArrayBuilder | provenance | MaD:180 |
+| Test.java:2406:10:2406:11 | in : JsonArrayBuilder | Test.java:2406:10:2406:22 | set(...) : JsonArrayBuilder | provenance | MaD:182 |
 | Test.java:2406:10:2406:22 | set(...) : JsonArrayBuilder | Test.java:2407:9:2407:11 | out | provenance |  |
 | Test.java:2412:37:2412:73 | (...)... : JsonArrayBuilder | Test.java:2413:10:2413:11 | in : JsonArrayBuilder | provenance |  |
 | Test.java:2412:66:2412:73 | source(...) : Object | Test.java:2412:37:2412:73 | (...)... : JsonArrayBuilder | provenance |  |
-| Test.java:2413:10:2413:11 | in : JsonArrayBuilder | Test.java:2413:10:2413:23 | set(...) : JsonArrayBuilder | provenance | MaD:180 |
+| Test.java:2413:10:2413:11 | in : JsonArrayBuilder | Test.java:2413:10:2413:23 | set(...) : JsonArrayBuilder | provenance | MaD:182 |
 | Test.java:2413:10:2413:23 | set(...) : JsonArrayBuilder | Test.java:2414:9:2414:11 | out | provenance |  |
 | Test.java:2419:37:2419:73 | (...)... : JsonArrayBuilder | Test.java:2420:10:2420:11 | in : JsonArrayBuilder | provenance |  |
 | Test.java:2419:66:2419:73 | source(...) : Object | Test.java:2419:37:2419:73 | (...)... : JsonArrayBuilder | provenance |  |
-| Test.java:2420:10:2420:11 | in : JsonArrayBuilder | Test.java:2420:10:2420:21 | set(...) : JsonArrayBuilder | provenance | MaD:180 |
+| Test.java:2420:10:2420:11 | in : JsonArrayBuilder | Test.java:2420:10:2420:21 | set(...) : JsonArrayBuilder | provenance | MaD:182 |
 | Test.java:2420:10:2420:21 | set(...) : JsonArrayBuilder | Test.java:2421:9:2421:11 | out | provenance |  |
 | Test.java:2426:37:2426:73 | (...)... : JsonArrayBuilder | Test.java:2427:10:2427:11 | in : JsonArrayBuilder | provenance |  |
 | Test.java:2426:66:2426:73 | source(...) : Object | Test.java:2426:37:2426:73 | (...)... : JsonArrayBuilder | provenance |  |
-| Test.java:2427:10:2427:11 | in : JsonArrayBuilder | Test.java:2427:10:2427:46 | set(...) : JsonArrayBuilder | provenance | MaD:180 |
+| Test.java:2427:10:2427:11 | in : JsonArrayBuilder | Test.java:2427:10:2427:46 | set(...) : JsonArrayBuilder | provenance | MaD:182 |
 | Test.java:2427:10:2427:46 | set(...) : JsonArrayBuilder | Test.java:2428:9:2428:11 | out | provenance |  |
 | Test.java:2433:37:2433:73 | (...)... : JsonArrayBuilder | Test.java:2434:10:2434:11 | in : JsonArrayBuilder | provenance |  |
 | Test.java:2433:66:2433:73 | source(...) : Object | Test.java:2433:37:2433:73 | (...)... : JsonArrayBuilder | provenance |  |
-| Test.java:2434:10:2434:11 | in : JsonArrayBuilder | Test.java:2434:10:2434:54 | set(...) : JsonArrayBuilder | provenance | MaD:180 |
+| Test.java:2434:10:2434:11 | in : JsonArrayBuilder | Test.java:2434:10:2434:54 | set(...) : JsonArrayBuilder | provenance | MaD:182 |
 | Test.java:2434:10:2434:54 | set(...) : JsonArrayBuilder | Test.java:2435:9:2435:11 | out | provenance |  |
 | Test.java:2440:37:2440:73 | (...)... : JsonArrayBuilder | Test.java:2441:10:2441:11 | in : JsonArrayBuilder | provenance |  |
 | Test.java:2440:66:2440:73 | source(...) : Object | Test.java:2440:37:2440:73 | (...)... : JsonArrayBuilder | provenance |  |
-| Test.java:2441:10:2441:11 | in : JsonArrayBuilder | Test.java:2441:10:2441:53 | set(...) : JsonArrayBuilder | provenance | MaD:180 |
+| Test.java:2441:10:2441:11 | in : JsonArrayBuilder | Test.java:2441:10:2441:53 | set(...) : JsonArrayBuilder | provenance | MaD:182 |
 | Test.java:2441:10:2441:53 | set(...) : JsonArrayBuilder | Test.java:2442:9:2442:11 | out | provenance |  |
 | Test.java:2447:37:2447:73 | (...)... : JsonArrayBuilder | Test.java:2448:10:2448:11 | in : JsonArrayBuilder | provenance |  |
 | Test.java:2447:66:2447:73 | source(...) : Object | Test.java:2447:37:2447:73 | (...)... : JsonArrayBuilder | provenance |  |
-| Test.java:2448:10:2448:11 | in : JsonArrayBuilder | Test.java:2448:10:2448:32 | set(...) : JsonArrayBuilder | provenance | MaD:180 |
+| Test.java:2448:10:2448:11 | in : JsonArrayBuilder | Test.java:2448:10:2448:32 | set(...) : JsonArrayBuilder | provenance | MaD:182 |
 | Test.java:2448:10:2448:32 | set(...) : JsonArrayBuilder | Test.java:2449:9:2449:11 | out | provenance |  |
 | Test.java:2454:37:2454:73 | (...)... : JsonArrayBuilder | Test.java:2455:10:2455:11 | in : JsonArrayBuilder | provenance |  |
 | Test.java:2454:66:2454:73 | source(...) : Object | Test.java:2454:37:2454:73 | (...)... : JsonArrayBuilder | provenance |  |
-| Test.java:2455:10:2455:11 | in : JsonArrayBuilder | Test.java:2455:10:2455:36 | set(...) : JsonArrayBuilder | provenance | MaD:180 |
+| Test.java:2455:10:2455:11 | in : JsonArrayBuilder | Test.java:2455:10:2455:36 | set(...) : JsonArrayBuilder | provenance | MaD:182 |
 | Test.java:2455:10:2455:36 | set(...) : JsonArrayBuilder | Test.java:2456:9:2456:11 | out | provenance |  |
 | Test.java:2461:37:2461:73 | (...)... : JsonArrayBuilder | Test.java:2462:10:2462:11 | in : JsonArrayBuilder | provenance |  |
 | Test.java:2461:66:2461:73 | source(...) : Object | Test.java:2461:37:2461:73 | (...)... : JsonArrayBuilder | provenance |  |
-| Test.java:2462:10:2462:11 | in : JsonArrayBuilder | Test.java:2462:10:2462:36 | set(...) : JsonArrayBuilder | provenance | MaD:180 |
+| Test.java:2462:10:2462:11 | in : JsonArrayBuilder | Test.java:2462:10:2462:36 | set(...) : JsonArrayBuilder | provenance | MaD:182 |
 | Test.java:2462:10:2462:36 | set(...) : JsonArrayBuilder | Test.java:2463:9:2463:11 | out | provenance |  |
 | Test.java:2468:14:2468:27 | (...)... : Number | Test.java:2469:15:2469:16 | in : Number | provenance |  |
 | Test.java:2468:20:2468:27 | source(...) : Object | Test.java:2468:14:2468:27 | (...)... : Number | provenance |  |
@@ -1668,11 +1668,11 @@ edges
 | Test.java:2532:15:2532:16 | in : BigDecimal | Test.java:2532:4:2532:6 | out [post update] : JsonArrayBuilder | provenance | MaD:181 |
 | Test.java:2538:37:2538:73 | (...)... : JsonArrayBuilder | Test.java:2539:10:2539:11 | in : JsonArrayBuilder | provenance |  |
 | Test.java:2538:66:2538:73 | source(...) : Object | Test.java:2538:37:2538:73 | (...)... : JsonArrayBuilder | provenance |  |
-| Test.java:2539:10:2539:11 | in : JsonArrayBuilder | Test.java:2539:10:2539:22 | setNull(...) : JsonArrayBuilder | provenance | MaD:182 |
+| Test.java:2539:10:2539:11 | in : JsonArrayBuilder | Test.java:2539:10:2539:22 | setNull(...) : JsonArrayBuilder | provenance | MaD:183 |
 | Test.java:2539:10:2539:22 | setNull(...) : JsonArrayBuilder | Test.java:2540:9:2540:11 | out | provenance |  |
 | Test.java:2545:35:2545:69 | (...)... : JsonMergePatch | Test.java:2546:10:2546:11 | in : JsonMergePatch | provenance |  |
 | Test.java:2545:62:2545:69 | source(...) : Object | Test.java:2545:35:2545:69 | (...)... : JsonMergePatch | provenance |  |
-| Test.java:2546:10:2546:11 | in : JsonMergePatch | Test.java:2546:10:2546:23 | apply(...) : JsonValue | provenance | MaD:183 |
+| Test.java:2546:10:2546:11 | in : JsonMergePatch | Test.java:2546:10:2546:23 | apply(...) : JsonValue | provenance | MaD:185 |
 | Test.java:2546:10:2546:23 | apply(...) : JsonValue | Test.java:2547:9:2547:11 | out | provenance |  |
 | Test.java:2552:30:2552:59 | (...)... : JsonValue | Test.java:2554:25:2554:26 | in : JsonValue | provenance |  |
 | Test.java:2552:52:2552:59 | source(...) : Object | Test.java:2552:30:2552:59 | (...)... : JsonValue | provenance |  |
@@ -1680,51 +1680,51 @@ edges
 | Test.java:2554:25:2554:26 | in : JsonValue | Test.java:2554:10:2554:27 | apply(...) : JsonValue | provenance | MaD:184 |
 | Test.java:2560:35:2560:69 | (...)... : JsonMergePatch | Test.java:2561:10:2561:11 | in : JsonMergePatch | provenance |  |
 | Test.java:2560:62:2560:69 | source(...) : Object | Test.java:2560:35:2560:69 | (...)... : JsonMergePatch | provenance |  |
-| Test.java:2561:10:2561:11 | in : JsonMergePatch | Test.java:2561:10:2561:25 | toJsonValue(...) : JsonValue | provenance | MaD:185 |
+| Test.java:2561:10:2561:11 | in : JsonMergePatch | Test.java:2561:10:2561:25 | toJsonValue(...) : JsonValue | provenance | MaD:186 |
 | Test.java:2561:10:2561:25 | toJsonValue(...) : JsonValue | Test.java:2562:9:2562:11 | out | provenance |  |
 | Test.java:2567:31:2567:61 | (...)... : JsonNumber | Test.java:2568:10:2568:11 | in : JsonNumber | provenance |  |
 | Test.java:2567:54:2567:61 | source(...) : Object | Test.java:2567:31:2567:61 | (...)... : JsonNumber | provenance |  |
-| Test.java:2568:10:2568:11 | in : JsonNumber | Test.java:2568:10:2568:29 | bigDecimalValue(...) : BigDecimal | provenance | MaD:186 |
+| Test.java:2568:10:2568:11 | in : JsonNumber | Test.java:2568:10:2568:29 | bigDecimalValue(...) : BigDecimal | provenance | MaD:187 |
 | Test.java:2568:10:2568:29 | bigDecimalValue(...) : BigDecimal | Test.java:2569:9:2569:11 | out | provenance |  |
 | Test.java:2574:31:2574:61 | (...)... : JsonNumber | Test.java:2575:10:2575:11 | in : JsonNumber | provenance |  |
 | Test.java:2574:54:2574:61 | source(...) : Object | Test.java:2574:31:2574:61 | (...)... : JsonNumber | provenance |  |
-| Test.java:2575:10:2575:11 | in : JsonNumber | Test.java:2575:10:2575:29 | bigIntegerValue(...) : BigInteger | provenance | MaD:187 |
+| Test.java:2575:10:2575:11 | in : JsonNumber | Test.java:2575:10:2575:29 | bigIntegerValue(...) : BigInteger | provenance | MaD:188 |
 | Test.java:2575:10:2575:29 | bigIntegerValue(...) : BigInteger | Test.java:2576:9:2576:11 | out | provenance |  |
 | Test.java:2581:31:2581:61 | (...)... : JsonNumber | Test.java:2582:10:2582:11 | in : JsonNumber | provenance |  |
 | Test.java:2581:54:2581:61 | source(...) : Object | Test.java:2581:31:2581:61 | (...)... : JsonNumber | provenance |  |
-| Test.java:2582:10:2582:11 | in : JsonNumber | Test.java:2582:10:2582:34 | bigIntegerValueExact(...) : BigInteger | provenance | MaD:188 |
+| Test.java:2582:10:2582:11 | in : JsonNumber | Test.java:2582:10:2582:34 | bigIntegerValueExact(...) : BigInteger | provenance | MaD:189 |
 | Test.java:2582:10:2582:34 | bigIntegerValueExact(...) : BigInteger | Test.java:2583:9:2583:11 | out | provenance |  |
 | Test.java:2588:31:2588:61 | (...)... : JsonNumber | Test.java:2589:10:2589:11 | in : JsonNumber | provenance |  |
 | Test.java:2588:54:2588:61 | source(...) : Object | Test.java:2588:31:2588:61 | (...)... : JsonNumber | provenance |  |
-| Test.java:2589:10:2589:11 | in : JsonNumber | Test.java:2589:10:2589:25 | doubleValue(...) : Number | provenance | MaD:189 |
+| Test.java:2589:10:2589:11 | in : JsonNumber | Test.java:2589:10:2589:25 | doubleValue(...) : Number | provenance | MaD:190 |
 | Test.java:2589:10:2589:25 | doubleValue(...) : Number | Test.java:2590:9:2590:11 | out | provenance |  |
 | Test.java:2595:31:2595:61 | (...)... : JsonNumber | Test.java:2596:10:2596:11 | in : JsonNumber | provenance |  |
 | Test.java:2595:54:2595:61 | source(...) : Object | Test.java:2595:31:2595:61 | (...)... : JsonNumber | provenance |  |
-| Test.java:2596:10:2596:11 | in : JsonNumber | Test.java:2596:10:2596:22 | intValue(...) : Number | provenance | MaD:190 |
+| Test.java:2596:10:2596:11 | in : JsonNumber | Test.java:2596:10:2596:22 | intValue(...) : Number | provenance | MaD:191 |
 | Test.java:2596:10:2596:22 | intValue(...) : Number | Test.java:2597:9:2597:11 | out | provenance |  |
 | Test.java:2602:31:2602:61 | (...)... : JsonNumber | Test.java:2603:10:2603:11 | in : JsonNumber | provenance |  |
 | Test.java:2602:54:2602:61 | source(...) : Object | Test.java:2602:31:2602:61 | (...)... : JsonNumber | provenance |  |
-| Test.java:2603:10:2603:11 | in : JsonNumber | Test.java:2603:10:2603:27 | intValueExact(...) : Number | provenance | MaD:191 |
+| Test.java:2603:10:2603:11 | in : JsonNumber | Test.java:2603:10:2603:27 | intValueExact(...) : Number | provenance | MaD:192 |
 | Test.java:2603:10:2603:27 | intValueExact(...) : Number | Test.java:2604:9:2604:11 | out | provenance |  |
 | Test.java:2609:31:2609:61 | (...)... : JsonNumber | Test.java:2610:10:2610:11 | in : JsonNumber | provenance |  |
 | Test.java:2609:54:2609:61 | source(...) : Object | Test.java:2609:31:2609:61 | (...)... : JsonNumber | provenance |  |
-| Test.java:2610:10:2610:11 | in : JsonNumber | Test.java:2610:10:2610:23 | longValue(...) : Number | provenance | MaD:192 |
+| Test.java:2610:10:2610:11 | in : JsonNumber | Test.java:2610:10:2610:23 | longValue(...) : Number | provenance | MaD:193 |
 | Test.java:2610:10:2610:23 | longValue(...) : Number | Test.java:2611:9:2611:11 | out | provenance |  |
 | Test.java:2616:31:2616:61 | (...)... : JsonNumber | Test.java:2617:10:2617:11 | in : JsonNumber | provenance |  |
 | Test.java:2616:54:2616:61 | source(...) : Object | Test.java:2616:31:2616:61 | (...)... : JsonNumber | provenance |  |
-| Test.java:2617:10:2617:11 | in : JsonNumber | Test.java:2617:10:2617:28 | longValueExact(...) : Number | provenance | MaD:193 |
+| Test.java:2617:10:2617:11 | in : JsonNumber | Test.java:2617:10:2617:28 | longValueExact(...) : Number | provenance | MaD:194 |
 | Test.java:2617:10:2617:28 | longValueExact(...) : Number | Test.java:2618:9:2618:11 | out | provenance |  |
 | Test.java:2623:31:2623:61 | (...)... : JsonNumber | Test.java:2624:10:2624:11 | in : JsonNumber | provenance |  |
 | Test.java:2623:54:2623:61 | source(...) : Object | Test.java:2623:31:2623:61 | (...)... : JsonNumber | provenance |  |
-| Test.java:2624:10:2624:11 | in : JsonNumber | Test.java:2624:10:2624:25 | numberValue(...) : Number | provenance | MaD:194 |
+| Test.java:2624:10:2624:11 | in : JsonNumber | Test.java:2624:10:2624:25 | numberValue(...) : Number | provenance | MaD:195 |
 | Test.java:2624:10:2624:25 | numberValue(...) : Number | Test.java:2625:9:2625:11 | out | provenance |  |
 | Test.java:2630:31:2630:61 | (...)... : JsonObject | Test.java:2631:10:2631:11 | in : JsonObject | provenance |  |
 | Test.java:2630:54:2630:61 | source(...) : Object | Test.java:2630:31:2630:61 | (...)... : JsonObject | provenance |  |
-| Test.java:2631:10:2631:11 | in : JsonObject | Test.java:2631:10:2631:35 | getBoolean(...) : Boolean | provenance | MaD:195 |
+| Test.java:2631:10:2631:11 | in : JsonObject | Test.java:2631:10:2631:35 | getBoolean(...) : Boolean | provenance | MaD:197 |
 | Test.java:2631:10:2631:35 | getBoolean(...) : Boolean | Test.java:2632:9:2632:11 | out | provenance |  |
 | Test.java:2637:31:2637:61 | (...)... : JsonObject | Test.java:2638:10:2638:11 | in : JsonObject | provenance |  |
 | Test.java:2637:54:2637:61 | source(...) : Object | Test.java:2637:31:2637:61 | (...)... : JsonObject | provenance |  |
-| Test.java:2638:10:2638:11 | in : JsonObject | Test.java:2638:10:2638:28 | getBoolean(...) : Boolean | provenance | MaD:195 |
+| Test.java:2638:10:2638:11 | in : JsonObject | Test.java:2638:10:2638:28 | getBoolean(...) : Boolean | provenance | MaD:197 |
 | Test.java:2638:10:2638:28 | getBoolean(...) : Boolean | Test.java:2639:9:2639:11 | out | provenance |  |
 | Test.java:2644:17:2644:33 | (...)... : Boolean | Test.java:2646:36:2646:37 | in : Boolean | provenance |  |
 | Test.java:2644:26:2644:33 | source(...) : Object | Test.java:2644:17:2644:33 | (...)... : Boolean | provenance |  |
@@ -1732,11 +1732,11 @@ edges
 | Test.java:2646:36:2646:37 | in : Boolean | Test.java:2646:10:2646:38 | getBoolean(...) : Boolean | provenance | MaD:196 |
 | Test.java:2652:31:2652:61 | (...)... : JsonObject | Test.java:2653:10:2653:11 | in : JsonObject | provenance |  |
 | Test.java:2652:54:2652:61 | source(...) : Object | Test.java:2652:31:2652:61 | (...)... : JsonObject | provenance |  |
-| Test.java:2653:10:2653:11 | in : JsonObject | Test.java:2653:10:2653:27 | getInt(...) : Number | provenance | MaD:197 |
+| Test.java:2653:10:2653:11 | in : JsonObject | Test.java:2653:10:2653:27 | getInt(...) : Number | provenance | MaD:199 |
 | Test.java:2653:10:2653:27 | getInt(...) : Number | Test.java:2654:9:2654:11 | out | provenance |  |
 | Test.java:2659:31:2659:61 | (...)... : JsonObject | Test.java:2660:10:2660:11 | in : JsonObject | provenance |  |
 | Test.java:2659:54:2659:61 | source(...) : Object | Test.java:2659:31:2659:61 | (...)... : JsonObject | provenance |  |
-| Test.java:2660:10:2660:11 | in : JsonObject | Test.java:2660:10:2660:24 | getInt(...) : Number | provenance | MaD:197 |
+| Test.java:2660:10:2660:11 | in : JsonObject | Test.java:2660:10:2660:24 | getInt(...) : Number | provenance | MaD:199 |
 | Test.java:2660:10:2660:24 | getInt(...) : Number | Test.java:2661:9:2661:11 | out | provenance |  |
 | Test.java:2666:13:2666:25 | (...)... : Number | Test.java:2668:32:2668:33 | in : Number | provenance |  |
 | Test.java:2666:18:2666:25 | source(...) : Object | Test.java:2666:13:2666:25 | (...)... : Number | provenance |  |
@@ -1744,27 +1744,27 @@ edges
 | Test.java:2668:32:2668:33 | in : Number | Test.java:2668:10:2668:34 | getInt(...) : Number | provenance | MaD:198 |
 | Test.java:2674:31:2674:61 | (...)... : JsonObject | Test.java:2675:10:2675:11 | in : JsonObject | provenance |  |
 | Test.java:2674:54:2674:61 | source(...) : Object | Test.java:2674:31:2674:61 | (...)... : JsonObject | provenance |  |
-| Test.java:2675:10:2675:11 | in : JsonObject | Test.java:2675:10:2675:30 | getJsonArray(...) : JsonArray | provenance | MaD:199 |
+| Test.java:2675:10:2675:11 | in : JsonObject | Test.java:2675:10:2675:30 | getJsonArray(...) : JsonArray | provenance | MaD:200 |
 | Test.java:2675:10:2675:30 | getJsonArray(...) : JsonArray | Test.java:2676:9:2676:11 | out | provenance |  |
 | Test.java:2681:31:2681:61 | (...)... : JsonObject | Test.java:2682:10:2682:11 | in : JsonObject | provenance |  |
 | Test.java:2681:54:2681:61 | source(...) : Object | Test.java:2681:31:2681:61 | (...)... : JsonObject | provenance |  |
-| Test.java:2682:10:2682:11 | in : JsonObject | Test.java:2682:10:2682:31 | getJsonNumber(...) : JsonNumber | provenance | MaD:200 |
+| Test.java:2682:10:2682:11 | in : JsonObject | Test.java:2682:10:2682:31 | getJsonNumber(...) : JsonNumber | provenance | MaD:201 |
 | Test.java:2682:10:2682:31 | getJsonNumber(...) : JsonNumber | Test.java:2683:9:2683:11 | out | provenance |  |
 | Test.java:2688:31:2688:61 | (...)... : JsonObject | Test.java:2689:10:2689:11 | in : JsonObject | provenance |  |
 | Test.java:2688:54:2688:61 | source(...) : Object | Test.java:2688:31:2688:61 | (...)... : JsonObject | provenance |  |
-| Test.java:2689:10:2689:11 | in : JsonObject | Test.java:2689:10:2689:31 | getJsonObject(...) : JsonObject | provenance | MaD:201 |
+| Test.java:2689:10:2689:11 | in : JsonObject | Test.java:2689:10:2689:31 | getJsonObject(...) : JsonObject | provenance | MaD:202 |
 | Test.java:2689:10:2689:31 | getJsonObject(...) : JsonObject | Test.java:2690:9:2690:11 | out | provenance |  |
 | Test.java:2695:31:2695:61 | (...)... : JsonObject | Test.java:2696:10:2696:11 | in : JsonObject | provenance |  |
 | Test.java:2695:54:2695:61 | source(...) : Object | Test.java:2695:31:2695:61 | (...)... : JsonObject | provenance |  |
-| Test.java:2696:10:2696:11 | in : JsonObject | Test.java:2696:10:2696:31 | getJsonString(...) : JsonString | provenance | MaD:202 |
+| Test.java:2696:10:2696:11 | in : JsonObject | Test.java:2696:10:2696:31 | getJsonString(...) : JsonString | provenance | MaD:203 |
 | Test.java:2696:10:2696:31 | getJsonString(...) : JsonString | Test.java:2697:9:2697:11 | out | provenance |  |
 | Test.java:2702:31:2702:61 | (...)... : JsonObject | Test.java:2703:10:2703:11 | in : JsonObject | provenance |  |
 | Test.java:2702:54:2702:61 | source(...) : Object | Test.java:2702:31:2702:61 | (...)... : JsonObject | provenance |  |
-| Test.java:2703:10:2703:11 | in : JsonObject | Test.java:2703:10:2703:33 | getString(...) : String | provenance | MaD:203 |
+| Test.java:2703:10:2703:11 | in : JsonObject | Test.java:2703:10:2703:33 | getString(...) : String | provenance | MaD:205 |
 | Test.java:2703:10:2703:33 | getString(...) : String | Test.java:2704:9:2704:11 | out | provenance |  |
 | Test.java:2709:31:2709:61 | (...)... : JsonObject | Test.java:2710:10:2710:11 | in : JsonObject | provenance |  |
 | Test.java:2709:54:2709:61 | source(...) : Object | Test.java:2709:31:2709:61 | (...)... : JsonObject | provenance |  |
-| Test.java:2710:10:2710:11 | in : JsonObject | Test.java:2710:10:2710:27 | getString(...) : String | provenance | MaD:203 |
+| Test.java:2710:10:2710:11 | in : JsonObject | Test.java:2710:10:2710:27 | getString(...) : String | provenance | MaD:205 |
 | Test.java:2710:10:2710:27 | getString(...) : String | Test.java:2711:9:2711:11 | out | provenance |  |
 | Test.java:2716:16:2716:31 | (...)... : String | Test.java:2718:35:2718:36 | in : String | provenance |  |
 | Test.java:2716:24:2716:31 | source(...) : Object | Test.java:2716:16:2716:31 | (...)... : String | provenance |  |
@@ -1772,43 +1772,43 @@ edges
 | Test.java:2718:35:2718:36 | in : String | Test.java:2718:10:2718:37 | getString(...) : String | provenance | MaD:204 |
 | Test.java:2724:38:2724:75 | (...)... : JsonObjectBuilder | Test.java:2725:10:2725:11 | in : JsonObjectBuilder | provenance |  |
 | Test.java:2724:68:2724:75 | source(...) : Object | Test.java:2724:38:2724:75 | (...)... : JsonObjectBuilder | provenance |  |
-| Test.java:2725:10:2725:11 | in : JsonObjectBuilder | Test.java:2725:10:2725:36 | add(...) : JsonObjectBuilder | provenance | MaD:205 |
+| Test.java:2725:10:2725:11 | in : JsonObjectBuilder | Test.java:2725:10:2725:36 | add(...) : JsonObjectBuilder | provenance | MaD:207 |
 | Test.java:2725:10:2725:36 | add(...) : JsonObjectBuilder | Test.java:2726:9:2726:11 | out | provenance |  |
 | Test.java:2731:38:2731:75 | (...)... : JsonObjectBuilder | Test.java:2732:10:2732:11 | in : JsonObjectBuilder | provenance |  |
 | Test.java:2731:68:2731:75 | source(...) : Object | Test.java:2731:38:2731:75 | (...)... : JsonObjectBuilder | provenance |  |
-| Test.java:2732:10:2732:11 | in : JsonObjectBuilder | Test.java:2732:10:2732:33 | add(...) : JsonObjectBuilder | provenance | MaD:205 |
+| Test.java:2732:10:2732:11 | in : JsonObjectBuilder | Test.java:2732:10:2732:33 | add(...) : JsonObjectBuilder | provenance | MaD:207 |
 | Test.java:2732:10:2732:33 | add(...) : JsonObjectBuilder | Test.java:2733:9:2733:11 | out | provenance |  |
 | Test.java:2738:38:2738:75 | (...)... : JsonObjectBuilder | Test.java:2739:10:2739:11 | in : JsonObjectBuilder | provenance |  |
 | Test.java:2738:68:2738:75 | source(...) : Object | Test.java:2738:38:2738:75 | (...)... : JsonObjectBuilder | provenance |  |
-| Test.java:2739:10:2739:11 | in : JsonObjectBuilder | Test.java:2739:10:2739:34 | add(...) : JsonObjectBuilder | provenance | MaD:205 |
+| Test.java:2739:10:2739:11 | in : JsonObjectBuilder | Test.java:2739:10:2739:34 | add(...) : JsonObjectBuilder | provenance | MaD:207 |
 | Test.java:2739:10:2739:34 | add(...) : JsonObjectBuilder | Test.java:2740:9:2740:11 | out | provenance |  |
 | Test.java:2745:38:2745:75 | (...)... : JsonObjectBuilder | Test.java:2746:10:2746:11 | in : JsonObjectBuilder | provenance |  |
 | Test.java:2745:68:2745:75 | source(...) : Object | Test.java:2745:38:2745:75 | (...)... : JsonObjectBuilder | provenance |  |
-| Test.java:2746:10:2746:11 | in : JsonObjectBuilder | Test.java:2746:10:2746:32 | add(...) : JsonObjectBuilder | provenance | MaD:205 |
+| Test.java:2746:10:2746:11 | in : JsonObjectBuilder | Test.java:2746:10:2746:32 | add(...) : JsonObjectBuilder | provenance | MaD:207 |
 | Test.java:2746:10:2746:32 | add(...) : JsonObjectBuilder | Test.java:2747:9:2747:11 | out | provenance |  |
 | Test.java:2752:38:2752:75 | (...)... : JsonObjectBuilder | Test.java:2753:10:2753:11 | in : JsonObjectBuilder | provenance |  |
 | Test.java:2752:68:2752:75 | source(...) : Object | Test.java:2752:38:2752:75 | (...)... : JsonObjectBuilder | provenance |  |
-| Test.java:2753:10:2753:11 | in : JsonObjectBuilder | Test.java:2753:10:2753:57 | add(...) : JsonObjectBuilder | provenance | MaD:205 |
+| Test.java:2753:10:2753:11 | in : JsonObjectBuilder | Test.java:2753:10:2753:57 | add(...) : JsonObjectBuilder | provenance | MaD:207 |
 | Test.java:2753:10:2753:57 | add(...) : JsonObjectBuilder | Test.java:2754:9:2754:11 | out | provenance |  |
 | Test.java:2759:38:2759:75 | (...)... : JsonObjectBuilder | Test.java:2760:10:2760:11 | in : JsonObjectBuilder | provenance |  |
 | Test.java:2759:68:2759:75 | source(...) : Object | Test.java:2759:38:2759:75 | (...)... : JsonObjectBuilder | provenance |  |
-| Test.java:2760:10:2760:11 | in : JsonObjectBuilder | Test.java:2760:10:2760:65 | add(...) : JsonObjectBuilder | provenance | MaD:205 |
+| Test.java:2760:10:2760:11 | in : JsonObjectBuilder | Test.java:2760:10:2760:65 | add(...) : JsonObjectBuilder | provenance | MaD:207 |
 | Test.java:2760:10:2760:65 | add(...) : JsonObjectBuilder | Test.java:2761:9:2761:11 | out | provenance |  |
 | Test.java:2766:38:2766:75 | (...)... : JsonObjectBuilder | Test.java:2767:10:2767:11 | in : JsonObjectBuilder | provenance |  |
 | Test.java:2766:68:2766:75 | source(...) : Object | Test.java:2766:38:2766:75 | (...)... : JsonObjectBuilder | provenance |  |
-| Test.java:2767:10:2767:11 | in : JsonObjectBuilder | Test.java:2767:10:2767:64 | add(...) : JsonObjectBuilder | provenance | MaD:205 |
+| Test.java:2767:10:2767:11 | in : JsonObjectBuilder | Test.java:2767:10:2767:64 | add(...) : JsonObjectBuilder | provenance | MaD:207 |
 | Test.java:2767:10:2767:64 | add(...) : JsonObjectBuilder | Test.java:2768:9:2768:11 | out | provenance |  |
 | Test.java:2773:38:2773:75 | (...)... : JsonObjectBuilder | Test.java:2774:10:2774:11 | in : JsonObjectBuilder | provenance |  |
 | Test.java:2773:68:2773:75 | source(...) : Object | Test.java:2773:38:2773:75 | (...)... : JsonObjectBuilder | provenance |  |
-| Test.java:2774:10:2774:11 | in : JsonObjectBuilder | Test.java:2774:10:2774:43 | add(...) : JsonObjectBuilder | provenance | MaD:205 |
+| Test.java:2774:10:2774:11 | in : JsonObjectBuilder | Test.java:2774:10:2774:43 | add(...) : JsonObjectBuilder | provenance | MaD:207 |
 | Test.java:2774:10:2774:43 | add(...) : JsonObjectBuilder | Test.java:2775:9:2775:11 | out | provenance |  |
 | Test.java:2780:38:2780:75 | (...)... : JsonObjectBuilder | Test.java:2781:10:2781:11 | in : JsonObjectBuilder | provenance |  |
 | Test.java:2780:68:2780:75 | source(...) : Object | Test.java:2780:38:2780:75 | (...)... : JsonObjectBuilder | provenance |  |
-| Test.java:2781:10:2781:11 | in : JsonObjectBuilder | Test.java:2781:10:2781:47 | add(...) : JsonObjectBuilder | provenance | MaD:205 |
+| Test.java:2781:10:2781:11 | in : JsonObjectBuilder | Test.java:2781:10:2781:47 | add(...) : JsonObjectBuilder | provenance | MaD:207 |
 | Test.java:2781:10:2781:47 | add(...) : JsonObjectBuilder | Test.java:2782:9:2782:11 | out | provenance |  |
 | Test.java:2787:38:2787:75 | (...)... : JsonObjectBuilder | Test.java:2788:10:2788:11 | in : JsonObjectBuilder | provenance |  |
 | Test.java:2787:68:2787:75 | source(...) : Object | Test.java:2787:38:2787:75 | (...)... : JsonObjectBuilder | provenance |  |
-| Test.java:2788:10:2788:11 | in : JsonObjectBuilder | Test.java:2788:10:2788:47 | add(...) : JsonObjectBuilder | provenance | MaD:205 |
+| Test.java:2788:10:2788:11 | in : JsonObjectBuilder | Test.java:2788:10:2788:47 | add(...) : JsonObjectBuilder | provenance | MaD:207 |
 | Test.java:2788:10:2788:47 | add(...) : JsonObjectBuilder | Test.java:2789:9:2789:11 | out | provenance |  |
 | Test.java:2794:14:2794:27 | (...)... : Number | Test.java:2795:26:2795:27 | in : Number | provenance |  |
 | Test.java:2794:20:2794:27 | source(...) : Object | Test.java:2794:14:2794:27 | (...)... : Number | provenance |  |
@@ -1852,7 +1852,7 @@ edges
 | Test.java:2858:26:2858:27 | in : BigDecimal | Test.java:2858:4:2858:6 | out [post update] : JsonObjectBuilder | provenance | MaD:206 |
 | Test.java:2864:38:2864:75 | (...)... : JsonObjectBuilder | Test.java:2865:10:2865:11 | in : JsonObjectBuilder | provenance |  |
 | Test.java:2864:68:2864:75 | source(...) : Object | Test.java:2864:38:2864:75 | (...)... : JsonObjectBuilder | provenance |  |
-| Test.java:2865:10:2865:11 | in : JsonObjectBuilder | Test.java:2865:10:2865:24 | addAll(...) : JsonObjectBuilder | provenance | MaD:207 |
+| Test.java:2865:10:2865:11 | in : JsonObjectBuilder | Test.java:2865:10:2865:24 | addAll(...) : JsonObjectBuilder | provenance | MaD:209 |
 | Test.java:2865:10:2865:24 | addAll(...) : JsonObjectBuilder | Test.java:2866:9:2866:11 | out | provenance |  |
 | Test.java:2871:38:2871:75 | (...)... : JsonObjectBuilder | Test.java:2873:26:2873:27 | in : JsonObjectBuilder | provenance |  |
 | Test.java:2871:68:2871:75 | source(...) : Object | Test.java:2871:38:2871:75 | (...)... : JsonObjectBuilder | provenance |  |
@@ -1860,19 +1860,19 @@ edges
 | Test.java:2873:26:2873:27 | in : JsonObjectBuilder | Test.java:2873:10:2873:28 | addAll(...) : JsonObjectBuilder | provenance | MaD:208 |
 | Test.java:2879:38:2879:75 | (...)... : JsonObjectBuilder | Test.java:2880:10:2880:11 | in : JsonObjectBuilder | provenance |  |
 | Test.java:2879:68:2879:75 | source(...) : Object | Test.java:2879:38:2879:75 | (...)... : JsonObjectBuilder | provenance |  |
-| Test.java:2880:10:2880:11 | in : JsonObjectBuilder | Test.java:2880:10:2880:25 | addNull(...) : JsonObjectBuilder | provenance | MaD:209 |
+| Test.java:2880:10:2880:11 | in : JsonObjectBuilder | Test.java:2880:10:2880:25 | addNull(...) : JsonObjectBuilder | provenance | MaD:210 |
 | Test.java:2880:10:2880:25 | addNull(...) : JsonObjectBuilder | Test.java:2881:9:2881:11 | out | provenance |  |
 | Test.java:2886:38:2886:75 | (...)... : JsonObjectBuilder | Test.java:2887:10:2887:11 | in : JsonObjectBuilder | provenance |  |
 | Test.java:2886:68:2886:75 | source(...) : Object | Test.java:2886:38:2886:75 | (...)... : JsonObjectBuilder | provenance |  |
-| Test.java:2887:10:2887:11 | in : JsonObjectBuilder | Test.java:2887:10:2887:19 | build(...) : JsonObject | provenance | MaD:210 |
+| Test.java:2887:10:2887:11 | in : JsonObjectBuilder | Test.java:2887:10:2887:19 | build(...) : JsonObject | provenance | MaD:211 |
 | Test.java:2887:10:2887:19 | build(...) : JsonObject | Test.java:2888:9:2888:11 | out | provenance |  |
 | Test.java:2893:38:2893:75 | (...)... : JsonObjectBuilder | Test.java:2894:10:2894:11 | in : JsonObjectBuilder | provenance |  |
 | Test.java:2893:68:2893:75 | source(...) : Object | Test.java:2893:38:2893:75 | (...)... : JsonObjectBuilder | provenance |  |
-| Test.java:2894:10:2894:11 | in : JsonObjectBuilder | Test.java:2894:10:2894:24 | remove(...) : JsonObjectBuilder | provenance | MaD:211 |
+| Test.java:2894:10:2894:11 | in : JsonObjectBuilder | Test.java:2894:10:2894:24 | remove(...) : JsonObjectBuilder | provenance | MaD:212 |
 | Test.java:2894:10:2894:24 | remove(...) : JsonObjectBuilder | Test.java:2895:9:2895:11 | out | provenance |  |
 | Test.java:2900:30:2900:59 | (...)... : JsonPatch | Test.java:2901:10:2901:11 | in : JsonPatch | provenance |  |
 | Test.java:2900:52:2900:59 | source(...) : Object | Test.java:2900:30:2900:59 | (...)... : JsonPatch | provenance |  |
-| Test.java:2901:10:2901:11 | in : JsonPatch | Test.java:2901:10:2901:23 | apply(...) : JsonStructure | provenance | MaD:212 |
+| Test.java:2901:10:2901:11 | in : JsonPatch | Test.java:2901:10:2901:23 | apply(...) : JsonStructure | provenance | MaD:214 |
 | Test.java:2901:10:2901:23 | apply(...) : JsonStructure | Test.java:2902:9:2902:11 | out | provenance |  |
 | Test.java:2907:34:2907:67 | (...)... : JsonStructure | Test.java:2909:25:2909:26 | in : JsonStructure | provenance |  |
 | Test.java:2907:60:2907:67 | source(...) : Object | Test.java:2907:34:2907:67 | (...)... : JsonStructure | provenance |  |
@@ -1880,23 +1880,23 @@ edges
 | Test.java:2909:25:2909:26 | in : JsonStructure | Test.java:2909:10:2909:27 | apply(...) : JsonStructure | provenance | MaD:213 |
 | Test.java:2915:30:2915:59 | (...)... : JsonPatch | Test.java:2916:10:2916:11 | in : JsonPatch | provenance |  |
 | Test.java:2915:52:2915:59 | source(...) : Object | Test.java:2915:30:2915:59 | (...)... : JsonPatch | provenance |  |
-| Test.java:2916:10:2916:11 | in : JsonPatch | Test.java:2916:10:2916:25 | toJsonArray(...) : JsonArray | provenance | MaD:214 |
+| Test.java:2916:10:2916:11 | in : JsonPatch | Test.java:2916:10:2916:25 | toJsonArray(...) : JsonArray | provenance | MaD:215 |
 | Test.java:2916:10:2916:25 | toJsonArray(...) : JsonArray | Test.java:2917:9:2917:11 | out | provenance |  |
 | Test.java:2922:37:2922:73 | (...)... : JsonPatchBuilder | Test.java:2923:10:2923:11 | in : JsonPatchBuilder | provenance |  |
 | Test.java:2922:66:2922:73 | source(...) : Object | Test.java:2922:37:2922:73 | (...)... : JsonPatchBuilder | provenance |  |
-| Test.java:2923:10:2923:11 | in : JsonPatchBuilder | Test.java:2923:10:2923:36 | add(...) : JsonPatchBuilder | provenance | MaD:215 |
+| Test.java:2923:10:2923:11 | in : JsonPatchBuilder | Test.java:2923:10:2923:36 | add(...) : JsonPatchBuilder | provenance | MaD:217 |
 | Test.java:2923:10:2923:36 | add(...) : JsonPatchBuilder | Test.java:2924:9:2924:11 | out | provenance |  |
 | Test.java:2929:37:2929:73 | (...)... : JsonPatchBuilder | Test.java:2930:10:2930:11 | in : JsonPatchBuilder | provenance |  |
 | Test.java:2929:66:2929:73 | source(...) : Object | Test.java:2929:37:2929:73 | (...)... : JsonPatchBuilder | provenance |  |
-| Test.java:2930:10:2930:11 | in : JsonPatchBuilder | Test.java:2930:10:2930:32 | add(...) : JsonPatchBuilder | provenance | MaD:215 |
+| Test.java:2930:10:2930:11 | in : JsonPatchBuilder | Test.java:2930:10:2930:32 | add(...) : JsonPatchBuilder | provenance | MaD:217 |
 | Test.java:2930:10:2930:32 | add(...) : JsonPatchBuilder | Test.java:2931:9:2931:11 | out | provenance |  |
 | Test.java:2936:37:2936:73 | (...)... : JsonPatchBuilder | Test.java:2937:10:2937:11 | in : JsonPatchBuilder | provenance |  |
 | Test.java:2936:66:2936:73 | source(...) : Object | Test.java:2936:37:2936:73 | (...)... : JsonPatchBuilder | provenance |  |
-| Test.java:2937:10:2937:11 | in : JsonPatchBuilder | Test.java:2937:10:2937:57 | add(...) : JsonPatchBuilder | provenance | MaD:215 |
+| Test.java:2937:10:2937:11 | in : JsonPatchBuilder | Test.java:2937:10:2937:57 | add(...) : JsonPatchBuilder | provenance | MaD:217 |
 | Test.java:2937:10:2937:57 | add(...) : JsonPatchBuilder | Test.java:2938:9:2938:11 | out | provenance |  |
 | Test.java:2943:37:2943:73 | (...)... : JsonPatchBuilder | Test.java:2944:10:2944:11 | in : JsonPatchBuilder | provenance |  |
 | Test.java:2943:66:2943:73 | source(...) : Object | Test.java:2943:37:2943:73 | (...)... : JsonPatchBuilder | provenance |  |
-| Test.java:2944:10:2944:11 | in : JsonPatchBuilder | Test.java:2944:10:2944:43 | add(...) : JsonPatchBuilder | provenance | MaD:215 |
+| Test.java:2944:10:2944:11 | in : JsonPatchBuilder | Test.java:2944:10:2944:43 | add(...) : JsonPatchBuilder | provenance | MaD:217 |
 | Test.java:2944:10:2944:43 | add(...) : JsonPatchBuilder | Test.java:2945:9:2945:11 | out | provenance |  |
 | Test.java:2950:30:2950:59 | (...)... : JsonValue | Test.java:2952:37:2952:38 | in : JsonValue | provenance |  |
 | Test.java:2950:52:2950:59 | source(...) : Object | Test.java:2950:30:2950:59 | (...)... : JsonValue | provenance |  |
@@ -1932,11 +1932,11 @@ edges
 | Test.java:3008:37:3008:38 | in : String | Test.java:3008:10:3008:39 | add(...) : JsonPatchBuilder | provenance | MaD:216 |
 | Test.java:3014:37:3014:73 | (...)... : JsonPatchBuilder | Test.java:3015:10:3015:11 | in : JsonPatchBuilder | provenance |  |
 | Test.java:3014:66:3014:73 | source(...) : Object | Test.java:3014:37:3014:73 | (...)... : JsonPatchBuilder | provenance |  |
-| Test.java:3015:10:3015:11 | in : JsonPatchBuilder | Test.java:3015:10:3015:19 | build(...) : JsonPatch | provenance | MaD:217 |
+| Test.java:3015:10:3015:11 | in : JsonPatchBuilder | Test.java:3015:10:3015:19 | build(...) : JsonPatch | provenance | MaD:218 |
 | Test.java:3015:10:3015:19 | build(...) : JsonPatch | Test.java:3016:9:3016:11 | out | provenance |  |
 | Test.java:3021:37:3021:73 | (...)... : JsonPatchBuilder | Test.java:3022:10:3022:11 | in : JsonPatchBuilder | provenance |  |
 | Test.java:3021:66:3021:73 | source(...) : Object | Test.java:3021:37:3021:73 | (...)... : JsonPatchBuilder | provenance |  |
-| Test.java:3022:10:3022:11 | in : JsonPatchBuilder | Test.java:3022:10:3022:28 | copy(...) : JsonPatchBuilder | provenance | MaD:218 |
+| Test.java:3022:10:3022:11 | in : JsonPatchBuilder | Test.java:3022:10:3022:28 | copy(...) : JsonPatchBuilder | provenance | MaD:220 |
 | Test.java:3022:10:3022:28 | copy(...) : JsonPatchBuilder | Test.java:3023:9:3023:11 | out | provenance |  |
 | Test.java:3028:16:3028:31 | (...)... : String | Test.java:3030:30:3030:31 | in : String | provenance |  |
 | Test.java:3028:24:3028:31 | source(...) : Object | Test.java:3028:16:3028:31 | (...)... : String | provenance |  |
@@ -1948,7 +1948,7 @@ edges
 | Test.java:3038:24:3038:25 | in : String | Test.java:3038:10:3038:32 | copy(...) : JsonPatchBuilder | provenance | MaD:219 |
 | Test.java:3044:37:3044:73 | (...)... : JsonPatchBuilder | Test.java:3045:10:3045:11 | in : JsonPatchBuilder | provenance |  |
 | Test.java:3044:66:3044:73 | source(...) : Object | Test.java:3044:37:3044:73 | (...)... : JsonPatchBuilder | provenance |  |
-| Test.java:3045:10:3045:11 | in : JsonPatchBuilder | Test.java:3045:10:3045:28 | move(...) : JsonPatchBuilder | provenance | MaD:220 |
+| Test.java:3045:10:3045:11 | in : JsonPatchBuilder | Test.java:3045:10:3045:28 | move(...) : JsonPatchBuilder | provenance | MaD:222 |
 | Test.java:3045:10:3045:28 | move(...) : JsonPatchBuilder | Test.java:3046:9:3046:11 | out | provenance |  |
 | Test.java:3051:16:3051:31 | (...)... : String | Test.java:3053:30:3053:31 | in : String | provenance |  |
 | Test.java:3051:24:3051:31 | source(...) : Object | Test.java:3051:16:3051:31 | (...)... : String | provenance |  |
@@ -1960,7 +1960,7 @@ edges
 | Test.java:3061:24:3061:25 | in : String | Test.java:3061:10:3061:32 | move(...) : JsonPatchBuilder | provenance | MaD:221 |
 | Test.java:3067:37:3067:73 | (...)... : JsonPatchBuilder | Test.java:3068:10:3068:11 | in : JsonPatchBuilder | provenance |  |
 | Test.java:3067:66:3067:73 | source(...) : Object | Test.java:3067:37:3067:73 | (...)... : JsonPatchBuilder | provenance |  |
-| Test.java:3068:10:3068:11 | in : JsonPatchBuilder | Test.java:3068:10:3068:24 | remove(...) : JsonPatchBuilder | provenance | MaD:222 |
+| Test.java:3068:10:3068:11 | in : JsonPatchBuilder | Test.java:3068:10:3068:24 | remove(...) : JsonPatchBuilder | provenance | MaD:224 |
 | Test.java:3068:10:3068:24 | remove(...) : JsonPatchBuilder | Test.java:3069:9:3069:11 | out | provenance |  |
 | Test.java:3074:16:3074:31 | (...)... : String | Test.java:3076:26:3076:27 | in : String | provenance |  |
 | Test.java:3074:24:3074:31 | source(...) : Object | Test.java:3074:16:3074:31 | (...)... : String | provenance |  |
@@ -1968,19 +1968,19 @@ edges
 | Test.java:3076:26:3076:27 | in : String | Test.java:3076:10:3076:28 | remove(...) : JsonPatchBuilder | provenance | MaD:223 |
 | Test.java:3082:37:3082:73 | (...)... : JsonPatchBuilder | Test.java:3083:10:3083:11 | in : JsonPatchBuilder | provenance |  |
 | Test.java:3082:66:3082:73 | source(...) : Object | Test.java:3082:37:3082:73 | (...)... : JsonPatchBuilder | provenance |  |
-| Test.java:3083:10:3083:11 | in : JsonPatchBuilder | Test.java:3083:10:3083:40 | replace(...) : JsonPatchBuilder | provenance | MaD:224 |
+| Test.java:3083:10:3083:11 | in : JsonPatchBuilder | Test.java:3083:10:3083:40 | replace(...) : JsonPatchBuilder | provenance | MaD:226 |
 | Test.java:3083:10:3083:40 | replace(...) : JsonPatchBuilder | Test.java:3084:9:3084:11 | out | provenance |  |
 | Test.java:3089:37:3089:73 | (...)... : JsonPatchBuilder | Test.java:3090:10:3090:11 | in : JsonPatchBuilder | provenance |  |
 | Test.java:3089:66:3089:73 | source(...) : Object | Test.java:3089:37:3089:73 | (...)... : JsonPatchBuilder | provenance |  |
-| Test.java:3090:10:3090:11 | in : JsonPatchBuilder | Test.java:3090:10:3090:36 | replace(...) : JsonPatchBuilder | provenance | MaD:224 |
+| Test.java:3090:10:3090:11 | in : JsonPatchBuilder | Test.java:3090:10:3090:36 | replace(...) : JsonPatchBuilder | provenance | MaD:226 |
 | Test.java:3090:10:3090:36 | replace(...) : JsonPatchBuilder | Test.java:3091:9:3091:11 | out | provenance |  |
 | Test.java:3096:37:3096:73 | (...)... : JsonPatchBuilder | Test.java:3097:10:3097:11 | in : JsonPatchBuilder | provenance |  |
 | Test.java:3096:66:3096:73 | source(...) : Object | Test.java:3096:37:3096:73 | (...)... : JsonPatchBuilder | provenance |  |
-| Test.java:3097:10:3097:11 | in : JsonPatchBuilder | Test.java:3097:10:3097:61 | replace(...) : JsonPatchBuilder | provenance | MaD:224 |
+| Test.java:3097:10:3097:11 | in : JsonPatchBuilder | Test.java:3097:10:3097:61 | replace(...) : JsonPatchBuilder | provenance | MaD:226 |
 | Test.java:3097:10:3097:61 | replace(...) : JsonPatchBuilder | Test.java:3098:9:3098:11 | out | provenance |  |
 | Test.java:3103:37:3103:73 | (...)... : JsonPatchBuilder | Test.java:3104:10:3104:11 | in : JsonPatchBuilder | provenance |  |
 | Test.java:3103:66:3103:73 | source(...) : Object | Test.java:3103:37:3103:73 | (...)... : JsonPatchBuilder | provenance |  |
-| Test.java:3104:10:3104:11 | in : JsonPatchBuilder | Test.java:3104:10:3104:47 | replace(...) : JsonPatchBuilder | provenance | MaD:224 |
+| Test.java:3104:10:3104:11 | in : JsonPatchBuilder | Test.java:3104:10:3104:47 | replace(...) : JsonPatchBuilder | provenance | MaD:226 |
 | Test.java:3104:10:3104:47 | replace(...) : JsonPatchBuilder | Test.java:3105:9:3105:11 | out | provenance |  |
 | Test.java:3110:30:3110:59 | (...)... : JsonValue | Test.java:3112:41:3112:42 | in : JsonValue | provenance |  |
 | Test.java:3110:52:3110:59 | source(...) : Object | Test.java:3110:30:3110:59 | (...)... : JsonValue | provenance |  |
@@ -2016,19 +2016,19 @@ edges
 | Test.java:3168:41:3168:42 | in : String | Test.java:3168:10:3168:43 | replace(...) : JsonPatchBuilder | provenance | MaD:225 |
 | Test.java:3174:37:3174:73 | (...)... : JsonPatchBuilder | Test.java:3175:10:3175:11 | in : JsonPatchBuilder | provenance |  |
 | Test.java:3174:66:3174:73 | source(...) : Object | Test.java:3174:37:3174:73 | (...)... : JsonPatchBuilder | provenance |  |
-| Test.java:3175:10:3175:11 | in : JsonPatchBuilder | Test.java:3175:10:3175:37 | test(...) : JsonPatchBuilder | provenance | MaD:226 |
+| Test.java:3175:10:3175:11 | in : JsonPatchBuilder | Test.java:3175:10:3175:37 | test(...) : JsonPatchBuilder | provenance | MaD:228 |
 | Test.java:3175:10:3175:37 | test(...) : JsonPatchBuilder | Test.java:3176:9:3176:11 | out | provenance |  |
 | Test.java:3181:37:3181:73 | (...)... : JsonPatchBuilder | Test.java:3182:10:3182:11 | in : JsonPatchBuilder | provenance |  |
 | Test.java:3181:66:3181:73 | source(...) : Object | Test.java:3181:37:3181:73 | (...)... : JsonPatchBuilder | provenance |  |
-| Test.java:3182:10:3182:11 | in : JsonPatchBuilder | Test.java:3182:10:3182:33 | test(...) : JsonPatchBuilder | provenance | MaD:226 |
+| Test.java:3182:10:3182:11 | in : JsonPatchBuilder | Test.java:3182:10:3182:33 | test(...) : JsonPatchBuilder | provenance | MaD:228 |
 | Test.java:3182:10:3182:33 | test(...) : JsonPatchBuilder | Test.java:3183:9:3183:11 | out | provenance |  |
 | Test.java:3188:37:3188:73 | (...)... : JsonPatchBuilder | Test.java:3189:10:3189:11 | in : JsonPatchBuilder | provenance |  |
 | Test.java:3188:66:3188:73 | source(...) : Object | Test.java:3188:37:3188:73 | (...)... : JsonPatchBuilder | provenance |  |
-| Test.java:3189:10:3189:11 | in : JsonPatchBuilder | Test.java:3189:10:3189:58 | test(...) : JsonPatchBuilder | provenance | MaD:226 |
+| Test.java:3189:10:3189:11 | in : JsonPatchBuilder | Test.java:3189:10:3189:58 | test(...) : JsonPatchBuilder | provenance | MaD:228 |
 | Test.java:3189:10:3189:58 | test(...) : JsonPatchBuilder | Test.java:3190:9:3190:11 | out | provenance |  |
 | Test.java:3195:37:3195:73 | (...)... : JsonPatchBuilder | Test.java:3196:10:3196:11 | in : JsonPatchBuilder | provenance |  |
 | Test.java:3195:66:3195:73 | source(...) : Object | Test.java:3195:37:3195:73 | (...)... : JsonPatchBuilder | provenance |  |
-| Test.java:3196:10:3196:11 | in : JsonPatchBuilder | Test.java:3196:10:3196:44 | test(...) : JsonPatchBuilder | provenance | MaD:226 |
+| Test.java:3196:10:3196:11 | in : JsonPatchBuilder | Test.java:3196:10:3196:44 | test(...) : JsonPatchBuilder | provenance | MaD:228 |
 | Test.java:3196:10:3196:44 | test(...) : JsonPatchBuilder | Test.java:3197:9:3197:11 | out | provenance |  |
 | Test.java:3202:30:3202:59 | (...)... : JsonValue | Test.java:3204:38:3204:39 | in : JsonValue | provenance |  |
 | Test.java:3202:52:3202:59 | source(...) : Object | Test.java:3202:30:3202:59 | (...)... : JsonValue | provenance |  |
@@ -2064,7 +2064,7 @@ edges
 | Test.java:3260:38:3260:39 | in : String | Test.java:3260:10:3260:40 | test(...) : JsonPatchBuilder | provenance | MaD:227 |
 | Test.java:3266:32:3266:63 | (...)... : JsonPointer | Test.java:3267:10:3267:11 | in : JsonPointer | provenance |  |
 | Test.java:3266:56:3266:63 | source(...) : Object | Test.java:3266:32:3266:63 | (...)... : JsonPointer | provenance |  |
-| Test.java:3267:10:3267:11 | in : JsonPointer | Test.java:3267:10:3267:27 | add(...) : JsonStructure | provenance | MaD:228 |
+| Test.java:3267:10:3267:11 | in : JsonPointer | Test.java:3267:10:3267:27 | add(...) : JsonStructure | provenance | MaD:230 |
 | Test.java:3267:10:3267:27 | add(...) : JsonStructure | Test.java:3268:9:3268:11 | out | provenance |  |
 | Test.java:3273:30:3273:59 | (...)... : JsonValue | Test.java:3275:29:3275:30 | in : JsonValue | provenance |  |
 | Test.java:3273:52:3273:59 | source(...) : Object | Test.java:3273:30:3273:59 | (...)... : JsonValue | provenance |  |
@@ -2077,102 +2077,102 @@ edges
 | Test.java:3289:34:3289:67 | (...)... : JsonStructure | Test.java:3291:28:3291:29 | in : JsonStructure | provenance |  |
 | Test.java:3289:60:3289:67 | source(...) : Object | Test.java:3289:34:3289:67 | (...)... : JsonStructure | provenance |  |
 | Test.java:3291:10:3291:30 | getValue(...) : JsonValue | Test.java:3292:9:3292:11 | out | provenance |  |
-| Test.java:3291:28:3291:29 | in : JsonStructure | Test.java:3291:10:3291:30 | getValue(...) : JsonValue | provenance | MaD:230 |
+| Test.java:3291:28:3291:29 | in : JsonStructure | Test.java:3291:10:3291:30 | getValue(...) : JsonValue | provenance | MaD:231 |
 | Test.java:3297:34:3297:67 | (...)... : JsonStructure | Test.java:3299:26:3299:27 | in : JsonStructure | provenance |  |
 | Test.java:3297:60:3297:67 | source(...) : Object | Test.java:3297:34:3297:67 | (...)... : JsonStructure | provenance |  |
 | Test.java:3299:10:3299:28 | remove(...) : JsonStructure | Test.java:3300:9:3300:11 | out | provenance |  |
-| Test.java:3299:26:3299:27 | in : JsonStructure | Test.java:3299:10:3299:28 | remove(...) : JsonStructure | provenance | MaD:231 |
+| Test.java:3299:26:3299:27 | in : JsonStructure | Test.java:3299:10:3299:28 | remove(...) : JsonStructure | provenance | MaD:232 |
 | Test.java:3305:30:3305:59 | (...)... : JsonValue | Test.java:3307:33:3307:34 | in : JsonValue | provenance |  |
 | Test.java:3305:52:3305:59 | source(...) : Object | Test.java:3305:30:3305:59 | (...)... : JsonValue | provenance |  |
 | Test.java:3307:10:3307:35 | replace(...) : JsonStructure | Test.java:3308:9:3308:11 | out | provenance |  |
-| Test.java:3307:33:3307:34 | in : JsonValue | Test.java:3307:10:3307:35 | replace(...) : JsonStructure | provenance | MaD:232 |
+| Test.java:3307:33:3307:34 | in : JsonValue | Test.java:3307:10:3307:35 | replace(...) : JsonStructure | provenance | MaD:233 |
 | Test.java:3313:34:3313:67 | (...)... : JsonStructure | Test.java:3315:27:3315:28 | in : JsonStructure | provenance |  |
 | Test.java:3313:60:3313:67 | source(...) : Object | Test.java:3313:34:3313:67 | (...)... : JsonStructure | provenance |  |
 | Test.java:3315:10:3315:35 | replace(...) : JsonStructure | Test.java:3316:9:3316:11 | out | provenance |  |
-| Test.java:3315:27:3315:28 | in : JsonStructure | Test.java:3315:10:3315:35 | replace(...) : JsonStructure | provenance | MaD:232 |
+| Test.java:3315:27:3315:28 | in : JsonStructure | Test.java:3315:10:3315:35 | replace(...) : JsonStructure | provenance | MaD:233 |
 | Test.java:3321:31:3321:61 | (...)... : JsonReader | Test.java:3322:10:3322:11 | in : JsonReader | provenance |  |
 | Test.java:3321:54:3321:61 | source(...) : Object | Test.java:3321:31:3321:61 | (...)... : JsonReader | provenance |  |
-| Test.java:3322:10:3322:11 | in : JsonReader | Test.java:3322:10:3322:18 | read(...) : JsonStructure | provenance | MaD:233 |
+| Test.java:3322:10:3322:11 | in : JsonReader | Test.java:3322:10:3322:18 | read(...) : JsonStructure | provenance | MaD:234 |
 | Test.java:3322:10:3322:18 | read(...) : JsonStructure | Test.java:3323:9:3323:11 | out | provenance |  |
 | Test.java:3328:31:3328:61 | (...)... : JsonReader | Test.java:3329:10:3329:11 | in : JsonReader | provenance |  |
 | Test.java:3328:54:3328:61 | source(...) : Object | Test.java:3328:31:3328:61 | (...)... : JsonReader | provenance |  |
-| Test.java:3329:10:3329:11 | in : JsonReader | Test.java:3329:10:3329:23 | readArray(...) : JsonArray | provenance | MaD:234 |
+| Test.java:3329:10:3329:11 | in : JsonReader | Test.java:3329:10:3329:23 | readArray(...) : JsonArray | provenance | MaD:235 |
 | Test.java:3329:10:3329:23 | readArray(...) : JsonArray | Test.java:3330:9:3330:11 | out | provenance |  |
 | Test.java:3335:31:3335:61 | (...)... : JsonReader | Test.java:3336:10:3336:11 | in : JsonReader | provenance |  |
 | Test.java:3335:54:3335:61 | source(...) : Object | Test.java:3335:31:3335:61 | (...)... : JsonReader | provenance |  |
-| Test.java:3336:10:3336:11 | in : JsonReader | Test.java:3336:10:3336:24 | readObject(...) : JsonObject | provenance | MaD:235 |
+| Test.java:3336:10:3336:11 | in : JsonReader | Test.java:3336:10:3336:24 | readObject(...) : JsonObject | provenance | MaD:236 |
 | Test.java:3336:10:3336:24 | readObject(...) : JsonObject | Test.java:3337:9:3337:11 | out | provenance |  |
 | Test.java:3342:31:3342:61 | (...)... : JsonReader | Test.java:3343:10:3343:11 | in : JsonReader | provenance |  |
 | Test.java:3342:54:3342:61 | source(...) : Object | Test.java:3342:31:3342:61 | (...)... : JsonReader | provenance |  |
-| Test.java:3343:10:3343:11 | in : JsonReader | Test.java:3343:10:3343:23 | readValue(...) : JsonValue | provenance | MaD:236 |
+| Test.java:3343:10:3343:11 | in : JsonReader | Test.java:3343:10:3343:23 | readValue(...) : JsonValue | provenance | MaD:237 |
 | Test.java:3343:10:3343:23 | readValue(...) : JsonValue | Test.java:3344:9:3344:11 | out | provenance |  |
 | Test.java:3349:16:3349:31 | (...)... : Reader | Test.java:3351:32:3351:33 | in : Reader | provenance |  |
 | Test.java:3349:24:3349:31 | source(...) : Object | Test.java:3349:16:3349:31 | (...)... : Reader | provenance |  |
 | Test.java:3351:10:3351:34 | createReader(...) : JsonReader | Test.java:3352:9:3352:11 | out | provenance |  |
-| Test.java:3351:32:3351:33 | in : Reader | Test.java:3351:10:3351:34 | createReader(...) : JsonReader | provenance | MaD:237 |
+| Test.java:3351:32:3351:33 | in : Reader | Test.java:3351:10:3351:34 | createReader(...) : JsonReader | provenance | MaD:238 |
 | Test.java:3357:21:3357:41 | (...)... : InputStream | Test.java:3359:32:3359:33 | in : InputStream | provenance |  |
 | Test.java:3357:34:3357:41 | source(...) : Object | Test.java:3357:21:3357:41 | (...)... : InputStream | provenance |  |
 | Test.java:3359:10:3359:40 | createReader(...) : JsonReader | Test.java:3360:9:3360:11 | out | provenance |  |
-| Test.java:3359:32:3359:33 | in : InputStream | Test.java:3359:10:3359:40 | createReader(...) : JsonReader | provenance | MaD:237 |
+| Test.java:3359:32:3359:33 | in : InputStream | Test.java:3359:10:3359:40 | createReader(...) : JsonReader | provenance | MaD:238 |
 | Test.java:3365:21:3365:41 | (...)... : InputStream | Test.java:3367:32:3367:33 | in : InputStream | provenance |  |
 | Test.java:3365:34:3365:41 | source(...) : Object | Test.java:3365:21:3365:41 | (...)... : InputStream | provenance |  |
 | Test.java:3367:10:3367:34 | createReader(...) : JsonReader | Test.java:3368:9:3368:11 | out | provenance |  |
-| Test.java:3367:32:3367:33 | in : InputStream | Test.java:3367:10:3367:34 | createReader(...) : JsonReader | provenance | MaD:237 |
+| Test.java:3367:32:3367:33 | in : InputStream | Test.java:3367:10:3367:34 | createReader(...) : JsonReader | provenance | MaD:238 |
 | Test.java:3373:31:3373:61 | (...)... : JsonString | Test.java:3374:10:3374:11 | in : JsonString | provenance |  |
 | Test.java:3373:54:3373:61 | source(...) : Object | Test.java:3373:31:3373:61 | (...)... : JsonString | provenance |  |
-| Test.java:3374:10:3374:11 | in : JsonString | Test.java:3374:10:3374:22 | getChars(...) : CharSequence | provenance | MaD:238 |
+| Test.java:3374:10:3374:11 | in : JsonString | Test.java:3374:10:3374:22 | getChars(...) : CharSequence | provenance | MaD:239 |
 | Test.java:3374:10:3374:22 | getChars(...) : CharSequence | Test.java:3375:9:3375:11 | out | provenance |  |
 | Test.java:3380:31:3380:61 | (...)... : JsonString | Test.java:3381:10:3381:11 | in : JsonString | provenance |  |
 | Test.java:3380:54:3380:61 | source(...) : Object | Test.java:3380:31:3380:61 | (...)... : JsonString | provenance |  |
-| Test.java:3381:10:3381:11 | in : JsonString | Test.java:3381:10:3381:23 | getString(...) : String | provenance | MaD:239 |
+| Test.java:3381:10:3381:11 | in : JsonString | Test.java:3381:10:3381:23 | getString(...) : String | provenance | MaD:240 |
 | Test.java:3381:10:3381:23 | getString(...) : String | Test.java:3382:9:3382:11 | out | provenance |  |
 | Test.java:3387:34:3387:67 | (...)... : JsonStructure | Test.java:3388:10:3388:11 | in : JsonStructure | provenance |  |
 | Test.java:3387:60:3387:67 | source(...) : Object | Test.java:3387:34:3387:67 | (...)... : JsonStructure | provenance |  |
-| Test.java:3388:10:3388:11 | in : JsonStructure | Test.java:3388:10:3388:26 | getValue(...) : JsonValue | provenance | MaD:240 |
+| Test.java:3388:10:3388:11 | in : JsonStructure | Test.java:3388:10:3388:26 | getValue(...) : JsonValue | provenance | MaD:241 |
 | Test.java:3388:10:3388:26 | getValue(...) : JsonValue | Test.java:3389:9:3389:11 | out | provenance |  |
 | Test.java:3394:30:3394:59 | (...)... : JsonValue | Test.java:3395:10:3395:11 | in : JsonValue | provenance |  |
 | Test.java:3394:52:3394:59 | source(...) : Object | Test.java:3394:30:3394:59 | (...)... : JsonValue | provenance |  |
-| Test.java:3395:10:3395:11 | in : JsonValue | Test.java:3395:10:3395:25 | asJsonArray(...) : JsonArray | provenance | MaD:241 |
+| Test.java:3395:10:3395:11 | in : JsonValue | Test.java:3395:10:3395:25 | asJsonArray(...) : JsonArray | provenance | MaD:242 |
 | Test.java:3395:10:3395:25 | asJsonArray(...) : JsonArray | Test.java:3396:9:3396:11 | out | provenance |  |
 | Test.java:3401:30:3401:59 | (...)... : JsonValue | Test.java:3402:10:3402:11 | in : JsonValue | provenance |  |
 | Test.java:3401:52:3401:59 | source(...) : Object | Test.java:3401:30:3401:59 | (...)... : JsonValue | provenance |  |
-| Test.java:3402:10:3402:11 | in : JsonValue | Test.java:3402:10:3402:26 | asJsonObject(...) : JsonObject | provenance | MaD:242 |
+| Test.java:3402:10:3402:11 | in : JsonValue | Test.java:3402:10:3402:26 | asJsonObject(...) : JsonObject | provenance | MaD:243 |
 | Test.java:3402:10:3402:26 | asJsonObject(...) : JsonObject | Test.java:3403:9:3403:11 | out | provenance |  |
 | Test.java:3408:30:3408:59 | (...)... : JsonValue | Test.java:3409:10:3409:11 | in : JsonValue | provenance |  |
 | Test.java:3408:52:3408:59 | source(...) : Object | Test.java:3408:30:3408:59 | (...)... : JsonValue | provenance |  |
-| Test.java:3409:10:3409:11 | in : JsonValue | Test.java:3409:10:3409:22 | toString(...) : String | provenance | MaD:243 |
+| Test.java:3409:10:3409:11 | in : JsonValue | Test.java:3409:10:3409:22 | toString(...) : String | provenance | MaD:244 |
 | Test.java:3409:10:3409:22 | toString(...) : String | Test.java:3410:9:3410:11 | out | provenance |  |
 | Test.java:3415:31:3415:61 | (...)... : JsonNumber | Test.java:3416:10:3416:11 | in : JsonNumber | provenance |  |
 | Test.java:3415:54:3415:61 | source(...) : Object | Test.java:3415:31:3415:61 | (...)... : JsonNumber | provenance |  |
-| Test.java:3416:10:3416:11 | in : JsonNumber | Test.java:3416:10:3416:22 | toString(...) : String | provenance | MaD:243 |
+| Test.java:3416:10:3416:11 | in : JsonNumber | Test.java:3416:10:3416:22 | toString(...) : String | provenance | MaD:244 |
 | Test.java:3416:10:3416:22 | toString(...) : String | Test.java:3417:9:3417:11 | out | provenance |  |
 | Test.java:3422:30:3422:59 | (...)... : JsonValue | Test.java:3423:14:3423:15 | in : JsonValue | provenance |  |
 | Test.java:3422:52:3422:59 | source(...) : Object | Test.java:3422:30:3422:59 | (...)... : JsonValue | provenance |  |
 | Test.java:3423:4:3423:6 | out [post update] : JsonWriter | Test.java:3424:9:3424:11 | out | provenance |  |
-| Test.java:3423:14:3423:15 | in : JsonValue | Test.java:3423:4:3423:6 | out [post update] : JsonWriter | provenance | MaD:244 |
+| Test.java:3423:14:3423:15 | in : JsonValue | Test.java:3423:4:3423:6 | out [post update] : JsonWriter | provenance | MaD:245 |
 | Test.java:3429:34:3429:67 | (...)... : JsonStructure | Test.java:3430:14:3430:15 | in : JsonStructure | provenance |  |
 | Test.java:3429:60:3429:67 | source(...) : Object | Test.java:3429:34:3429:67 | (...)... : JsonStructure | provenance |  |
 | Test.java:3430:4:3430:6 | out [post update] : JsonWriter | Test.java:3431:9:3431:11 | out | provenance |  |
-| Test.java:3430:14:3430:15 | in : JsonStructure | Test.java:3430:4:3430:6 | out [post update] : JsonWriter | provenance | MaD:244 |
+| Test.java:3430:14:3430:15 | in : JsonStructure | Test.java:3430:4:3430:6 | out [post update] : JsonWriter | provenance | MaD:245 |
 | Test.java:3436:30:3436:59 | (...)... : JsonArray | Test.java:3437:19:3437:20 | in : JsonArray | provenance |  |
 | Test.java:3436:52:3436:59 | source(...) : Object | Test.java:3436:30:3436:59 | (...)... : JsonArray | provenance |  |
 | Test.java:3437:4:3437:6 | out [post update] : JsonWriter | Test.java:3438:9:3438:11 | out | provenance |  |
-| Test.java:3437:19:3437:20 | in : JsonArray | Test.java:3437:4:3437:6 | out [post update] : JsonWriter | provenance | MaD:245 |
+| Test.java:3437:19:3437:20 | in : JsonArray | Test.java:3437:4:3437:6 | out [post update] : JsonWriter | provenance | MaD:246 |
 | Test.java:3443:31:3443:61 | (...)... : JsonObject | Test.java:3444:20:3444:21 | in : JsonObject | provenance |  |
 | Test.java:3443:54:3443:61 | source(...) : Object | Test.java:3443:31:3443:61 | (...)... : JsonObject | provenance |  |
 | Test.java:3444:4:3444:6 | out [post update] : JsonWriter | Test.java:3445:9:3445:11 | out | provenance |  |
-| Test.java:3444:20:3444:21 | in : JsonObject | Test.java:3444:4:3444:6 | out [post update] : JsonWriter | provenance | MaD:246 |
+| Test.java:3444:20:3444:21 | in : JsonObject | Test.java:3444:4:3444:6 | out [post update] : JsonWriter | provenance | MaD:247 |
 | Test.java:3450:38:3450:75 | (...)... : JsonWriterFactory | Test.java:3451:4:3451:5 | in : JsonWriterFactory | provenance |  |
 | Test.java:3450:68:3450:75 | source(...) : Object | Test.java:3450:38:3450:75 | (...)... : JsonWriterFactory | provenance |  |
-| Test.java:3451:4:3451:5 | in : JsonWriterFactory | Test.java:3451:20:3451:22 | out [post update] : Writer | provenance | MaD:247 |
+| Test.java:3451:4:3451:5 | in : JsonWriterFactory | Test.java:3451:20:3451:22 | out [post update] : Writer | provenance | MaD:248 |
 | Test.java:3451:20:3451:22 | out [post update] : Writer | Test.java:3452:9:3452:11 | out | provenance |  |
 | Test.java:3457:38:3457:75 | (...)... : JsonWriterFactory | Test.java:3458:4:3458:5 | in : JsonWriterFactory | provenance |  |
 | Test.java:3457:68:3457:75 | source(...) : Object | Test.java:3457:38:3457:75 | (...)... : JsonWriterFactory | provenance |  |
-| Test.java:3458:4:3458:5 | in : JsonWriterFactory | Test.java:3458:20:3458:22 | out [post update] : OutputStream | provenance | MaD:247 |
+| Test.java:3458:4:3458:5 | in : JsonWriterFactory | Test.java:3458:20:3458:22 | out [post update] : OutputStream | provenance | MaD:248 |
 | Test.java:3458:20:3458:22 | out [post update] : OutputStream | Test.java:3459:9:3459:11 | out | provenance |  |
 | Test.java:3464:38:3464:75 | (...)... : JsonWriterFactory | Test.java:3465:4:3465:5 | in : JsonWriterFactory | provenance |  |
 | Test.java:3464:68:3464:75 | source(...) : Object | Test.java:3464:38:3464:75 | (...)... : JsonWriterFactory | provenance |  |
-| Test.java:3465:4:3465:5 | in : JsonWriterFactory | Test.java:3465:20:3465:22 | out [post update] : OutputStream | provenance | MaD:247 |
+| Test.java:3465:4:3465:5 | in : JsonWriterFactory | Test.java:3465:20:3465:22 | out [post update] : OutputStream | provenance | MaD:248 |
 | Test.java:3465:20:3465:22 | out [post update] : OutputStream | Test.java:3466:9:3466:11 | out | provenance |  |
 nodes
 | Test.java:17:28:17:41 | element : Object | semmle.label | element : Object |
diff --git a/java/ql/test/library-tests/frameworks/jdk/java.io/test.expected b/java/ql/test/library-tests/frameworks/jdk/java.io/test.expected
index 60f215203c4..4b2f3cd5f12 100644
--- a/java/ql/test/library-tests/frameworks/jdk/java.io/test.expected
+++ b/java/ql/test/library-tests/frameworks/jdk/java.io/test.expected
@@ -1,481 +1,481 @@
 models
-| 1 | Summary: java.io; BufferedInputStream; false; BufferedInputStream; ; ; Argument[0]; Argument[this]; taint; manual |
-| 2 | Summary: java.io; BufferedReader; false; BufferedReader; ; ; Argument[0]; Argument[this]; taint; manual |
-| 3 | Summary: java.io; BufferedReader; true; readLine; ; ; Argument[this]; ReturnValue; taint; manual |
-| 4 | Summary: java.io; ByteArrayInputStream; false; ByteArrayInputStream; ; ; Argument[0]; Argument[this]; taint; manual |
-| 5 | Summary: java.io; ByteArrayOutputStream; false; toByteArray; ; ; Argument[this]; ReturnValue; taint; manual |
-| 6 | Summary: java.io; ByteArrayOutputStream; false; toString; ; ; Argument[this]; ReturnValue; taint; manual |
-| 7 | Summary: java.io; ByteArrayOutputStream; false; writeTo; ; ; Argument[this]; Argument[0]; taint; manual |
-| 8 | Summary: java.io; CharArrayReader; false; CharArrayReader; ; ; Argument[0]; Argument[this]; taint; manual |
-| 9 | Summary: java.io; CharArrayWriter; true; toCharArray; ; ; Argument[this]; ReturnValue; taint; manual |
-| 10 | Summary: java.io; DataInput; true; readFully; ; ; Argument[this]; Argument[0]; taint; manual |
-| 11 | Summary: java.io; DataInput; true; readLine; (); ; Argument[this]; ReturnValue; taint; manual |
-| 12 | Summary: java.io; DataInput; true; readUTF; (); ; Argument[this]; ReturnValue; taint; manual |
-| 13 | Summary: java.io; DataInputStream; false; DataInputStream; ; ; Argument[0]; Argument[this]; taint; manual |
-| 14 | Summary: java.io; File; false; File; ; ; Argument[0]; Argument[this]; taint; manual |
-| 15 | Summary: java.io; File; false; File; ; ; Argument[1]; Argument[this]; taint; manual |
-| 16 | Summary: java.io; File; true; getAbsoluteFile; ; ; Argument[this]; ReturnValue; taint; manual |
-| 17 | Summary: java.io; File; true; getAbsolutePath; ; ; Argument[this]; ReturnValue; taint; manual |
-| 18 | Summary: java.io; File; true; getCanonicalFile; ; ; Argument[this]; ReturnValue; taint; manual |
-| 19 | Summary: java.io; File; true; getCanonicalPath; ; ; Argument[this]; ReturnValue; taint; manual |
-| 20 | Summary: java.io; File; true; getName; (); ; Argument[this]; ReturnValue; taint; manual |
-| 21 | Summary: java.io; File; true; toPath; ; ; Argument[this]; ReturnValue; taint; manual |
-| 22 | Summary: java.io; File; true; toString; ; ; Argument[this]; ReturnValue; taint; manual |
-| 23 | Summary: java.io; File; true; toURI; ; ; Argument[this]; ReturnValue; taint; manual |
-| 24 | Summary: java.io; FilterOutputStream; true; FilterOutputStream; (OutputStream); ; Argument[0]; Argument[this]; taint; manual |
-| 25 | Summary: java.io; InputStream; true; read; (byte[]); ; Argument[this]; Argument[0]; taint; manual |
-| 26 | Summary: java.io; InputStream; true; read; (byte[],int,int); ; Argument[this]; Argument[0]; taint; manual |
-| 27 | Summary: java.io; InputStream; true; readAllBytes; ; ; Argument[this]; ReturnValue; taint; manual |
-| 28 | Summary: java.io; InputStream; true; readNBytes; (byte[],int,int); ; Argument[this]; Argument[0]; taint; manual |
-| 29 | Summary: java.io; InputStream; true; readNBytes; (int); ; Argument[this]; ReturnValue; taint; manual |
-| 30 | Summary: java.io; InputStream; true; transferTo; (OutputStream); ; Argument[this]; Argument[0]; taint; manual |
-| 31 | Summary: java.io; InputStreamReader; false; InputStreamReader; ; ; Argument[0]; Argument[this]; taint; manual |
-| 32 | Summary: java.io; IOException; false; IOException; (String); ; Argument[0]; Argument[this].SyntheticField[java.lang.Throwable.message]; value; manual |
-| 33 | Summary: java.io; ObjectInput; true; read; ; ; Argument[this]; Argument[0]; taint; manual |
-| 34 | Summary: java.io; ObjectInputStream; false; ObjectInputStream; ; ; Argument[0]; Argument[this]; taint; manual |
-| 35 | Summary: java.io; OutputStream; true; write; (byte[]); ; Argument[0]; Argument[this]; taint; manual |
-| 36 | Summary: java.io; OutputStream; true; write; (byte[],int,int); ; Argument[0]; Argument[this]; taint; manual |
-| 37 | Summary: java.io; OutputStream; true; write; (int); ; Argument[0]; Argument[this]; taint; manual |
-| 38 | Summary: java.io; Reader; true; read; ; ; Argument[this]; Argument[0]; taint; manual |
-| 39 | Summary: java.io; StringReader; false; StringReader; ; ; Argument[0]; Argument[this]; taint; manual |
-| 40 | Summary: java.io; Writer; true; write; ; ; Argument[0]; Argument[this]; taint; manual |
-| 41 | Summary: generatedtest; Test; false; getThrowable_messageDefault; (Object); ; Argument[0].SyntheticField[java.lang.Throwable.message]; ReturnValue; value; manual |
+| 1 | Summary: generatedtest; Test; false; getThrowable_messageDefault; (Object); ; Argument[0].SyntheticField[java.lang.Throwable.message]; ReturnValue; value; manual |
+| 2 | Summary: java.io; BufferedInputStream; false; BufferedInputStream; ; ; Argument[0]; Argument[this]; taint; manual |
+| 3 | Summary: java.io; BufferedReader; false; BufferedReader; ; ; Argument[0]; Argument[this]; taint; manual |
+| 4 | Summary: java.io; BufferedReader; true; readLine; ; ; Argument[this]; ReturnValue; taint; manual |
+| 5 | Summary: java.io; ByteArrayInputStream; false; ByteArrayInputStream; ; ; Argument[0]; Argument[this]; taint; manual |
+| 6 | Summary: java.io; ByteArrayOutputStream; false; toByteArray; ; ; Argument[this]; ReturnValue; taint; manual |
+| 7 | Summary: java.io; ByteArrayOutputStream; false; toString; ; ; Argument[this]; ReturnValue; taint; manual |
+| 8 | Summary: java.io; ByteArrayOutputStream; false; writeTo; ; ; Argument[this]; Argument[0]; taint; manual |
+| 9 | Summary: java.io; CharArrayReader; false; CharArrayReader; ; ; Argument[0]; Argument[this]; taint; manual |
+| 10 | Summary: java.io; CharArrayWriter; true; toCharArray; ; ; Argument[this]; ReturnValue; taint; manual |
+| 11 | Summary: java.io; DataInput; true; readFully; ; ; Argument[this]; Argument[0]; taint; manual |
+| 12 | Summary: java.io; DataInput; true; readLine; (); ; Argument[this]; ReturnValue; taint; manual |
+| 13 | Summary: java.io; DataInput; true; readUTF; (); ; Argument[this]; ReturnValue; taint; manual |
+| 14 | Summary: java.io; DataInputStream; false; DataInputStream; ; ; Argument[0]; Argument[this]; taint; manual |
+| 15 | Summary: java.io; File; false; File; ; ; Argument[0]; Argument[this]; taint; manual |
+| 16 | Summary: java.io; File; false; File; ; ; Argument[1]; Argument[this]; taint; manual |
+| 17 | Summary: java.io; File; true; getAbsoluteFile; ; ; Argument[this]; ReturnValue; taint; manual |
+| 18 | Summary: java.io; File; true; getAbsolutePath; ; ; Argument[this]; ReturnValue; taint; manual |
+| 19 | Summary: java.io; File; true; getCanonicalFile; ; ; Argument[this]; ReturnValue; taint; manual |
+| 20 | Summary: java.io; File; true; getCanonicalPath; ; ; Argument[this]; ReturnValue; taint; manual |
+| 21 | Summary: java.io; File; true; getName; (); ; Argument[this]; ReturnValue; taint; manual |
+| 22 | Summary: java.io; File; true; toPath; ; ; Argument[this]; ReturnValue; taint; manual |
+| 23 | Summary: java.io; File; true; toString; ; ; Argument[this]; ReturnValue; taint; manual |
+| 24 | Summary: java.io; File; true; toURI; ; ; Argument[this]; ReturnValue; taint; manual |
+| 25 | Summary: java.io; FilterOutputStream; true; FilterOutputStream; (OutputStream); ; Argument[0]; Argument[this]; taint; manual |
+| 26 | Summary: java.io; IOException; false; IOException; (String); ; Argument[0]; Argument[this].SyntheticField[java.lang.Throwable.message]; value; manual |
+| 27 | Summary: java.io; InputStream; true; read; (byte[]); ; Argument[this]; Argument[0]; taint; manual |
+| 28 | Summary: java.io; InputStream; true; read; (byte[],int,int); ; Argument[this]; Argument[0]; taint; manual |
+| 29 | Summary: java.io; InputStream; true; readAllBytes; ; ; Argument[this]; ReturnValue; taint; manual |
+| 30 | Summary: java.io; InputStream; true; readNBytes; (byte[],int,int); ; Argument[this]; Argument[0]; taint; manual |
+| 31 | Summary: java.io; InputStream; true; readNBytes; (int); ; Argument[this]; ReturnValue; taint; manual |
+| 32 | Summary: java.io; InputStream; true; transferTo; (OutputStream); ; Argument[this]; Argument[0]; taint; manual |
+| 33 | Summary: java.io; InputStreamReader; false; InputStreamReader; ; ; Argument[0]; Argument[this]; taint; manual |
+| 34 | Summary: java.io; ObjectInput; true; read; ; ; Argument[this]; Argument[0]; taint; manual |
+| 35 | Summary: java.io; ObjectInputStream; false; ObjectInputStream; ; ; Argument[0]; Argument[this]; taint; manual |
+| 36 | Summary: java.io; OutputStream; true; write; (byte[]); ; Argument[0]; Argument[this]; taint; manual |
+| 37 | Summary: java.io; OutputStream; true; write; (byte[],int,int); ; Argument[0]; Argument[this]; taint; manual |
+| 38 | Summary: java.io; OutputStream; true; write; (int); ; Argument[0]; Argument[this]; taint; manual |
+| 39 | Summary: java.io; Reader; true; read; ; ; Argument[this]; Argument[0]; taint; manual |
+| 40 | Summary: java.io; StringReader; false; StringReader; ; ; Argument[0]; Argument[this]; taint; manual |
+| 41 | Summary: java.io; Writer; true; write; ; ; Argument[0]; Argument[this]; taint; manual |
 edges
 | Test.java:50:21:50:42 | (...)... : InputStream | Test.java:51:34:51:35 | in : InputStream | provenance |  |
 | Test.java:50:21:50:42 | (...)... : InputStream | Test.java:52:9:52:11 | out | provenance | inputStreamWrapper |
 | Test.java:50:35:50:42 | source(...) : Object | Test.java:50:21:50:42 | (...)... : InputStream | provenance |  |
 | Test.java:51:10:51:36 | new BufferedInputStream(...) : BufferedInputStream | Test.java:52:9:52:11 | out | provenance |  |
-| Test.java:51:34:51:35 | in : InputStream | Test.java:51:10:51:36 | new BufferedInputStream(...) : BufferedInputStream | provenance | MaD:1 |
+| Test.java:51:34:51:35 | in : InputStream | Test.java:51:10:51:36 | new BufferedInputStream(...) : BufferedInputStream | provenance | MaD:2 |
 | Test.java:57:21:57:42 | (...)... : InputStream | Test.java:58:34:58:35 | in : InputStream | provenance |  |
 | Test.java:57:21:57:42 | (...)... : InputStream | Test.java:59:9:59:11 | out | provenance | inputStreamWrapper |
 | Test.java:57:35:57:42 | source(...) : Object | Test.java:57:21:57:42 | (...)... : InputStream | provenance |  |
 | Test.java:58:10:58:39 | new BufferedInputStream(...) : BufferedInputStream | Test.java:59:9:59:11 | out | provenance |  |
-| Test.java:58:34:58:35 | in : InputStream | Test.java:58:10:58:39 | new BufferedInputStream(...) : BufferedInputStream | provenance | MaD:1 |
+| Test.java:58:34:58:35 | in : InputStream | Test.java:58:10:58:39 | new BufferedInputStream(...) : BufferedInputStream | provenance | MaD:2 |
 | Test.java:64:16:64:32 | (...)... : Reader | Test.java:65:29:65:30 | in : Reader | provenance |  |
 | Test.java:64:25:64:32 | source(...) : Object | Test.java:64:16:64:32 | (...)... : Reader | provenance |  |
 | Test.java:65:10:65:31 | new BufferedReader(...) : BufferedReader | Test.java:66:9:66:11 | out | provenance |  |
-| Test.java:65:29:65:30 | in : Reader | Test.java:65:10:65:31 | new BufferedReader(...) : BufferedReader | provenance | MaD:2 |
+| Test.java:65:29:65:30 | in : Reader | Test.java:65:10:65:31 | new BufferedReader(...) : BufferedReader | provenance | MaD:3 |
 | Test.java:71:16:71:32 | (...)... : Reader | Test.java:72:29:72:30 | in : Reader | provenance |  |
 | Test.java:71:25:71:32 | source(...) : Object | Test.java:71:16:71:32 | (...)... : Reader | provenance |  |
 | Test.java:72:10:72:34 | new BufferedReader(...) : BufferedReader | Test.java:73:9:73:11 | out | provenance |  |
-| Test.java:72:29:72:30 | in : Reader | Test.java:72:10:72:34 | new BufferedReader(...) : BufferedReader | provenance | MaD:2 |
+| Test.java:72:29:72:30 | in : Reader | Test.java:72:10:72:34 | new BufferedReader(...) : BufferedReader | provenance | MaD:3 |
 | Test.java:78:24:78:48 | (...)... : BufferedReader | Test.java:79:10:79:11 | in : BufferedReader | provenance |  |
 | Test.java:78:41:78:48 | source(...) : Object | Test.java:78:24:78:48 | (...)... : BufferedReader | provenance |  |
-| Test.java:79:10:79:11 | in : BufferedReader | Test.java:79:10:79:22 | readLine(...) : String | provenance | MaD:3 |
+| Test.java:79:10:79:11 | in : BufferedReader | Test.java:79:10:79:22 | readLine(...) : String | provenance | MaD:4 |
 | Test.java:79:10:79:22 | readLine(...) : String | Test.java:80:9:80:11 | out | provenance |  |
 | Test.java:85:16:85:32 | (...)... : byte[] | Test.java:86:35:86:36 | in : byte[] | provenance |  |
 | Test.java:85:16:85:32 | (...)... : byte[] | Test.java:87:9:87:11 | out | provenance | inputStreamWrapper |
 | Test.java:85:25:85:32 | source(...) : Object | Test.java:85:16:85:32 | (...)... : byte[] | provenance |  |
 | Test.java:86:10:86:37 | new ByteArrayInputStream(...) : ByteArrayInputStream | Test.java:87:9:87:11 | out | provenance |  |
-| Test.java:86:35:86:36 | in : byte[] | Test.java:86:10:86:37 | new ByteArrayInputStream(...) : ByteArrayInputStream | provenance | MaD:4 |
+| Test.java:86:35:86:36 | in : byte[] | Test.java:86:10:86:37 | new ByteArrayInputStream(...) : ByteArrayInputStream | provenance | MaD:5 |
 | Test.java:92:16:92:32 | (...)... : byte[] | Test.java:93:35:93:36 | in : byte[] | provenance |  |
 | Test.java:92:16:92:32 | (...)... : byte[] | Test.java:94:9:94:11 | out | provenance | inputStreamWrapper |
 | Test.java:92:25:92:32 | source(...) : Object | Test.java:92:16:92:32 | (...)... : byte[] | provenance |  |
 | Test.java:93:10:93:43 | new ByteArrayInputStream(...) : ByteArrayInputStream | Test.java:94:9:94:11 | out | provenance |  |
-| Test.java:93:35:93:36 | in : byte[] | Test.java:93:10:93:43 | new ByteArrayInputStream(...) : ByteArrayInputStream | provenance | MaD:4 |
+| Test.java:93:35:93:36 | in : byte[] | Test.java:93:10:93:43 | new ByteArrayInputStream(...) : ByteArrayInputStream | provenance | MaD:5 |
 | Test.java:99:31:99:62 | (...)... : ByteArrayOutputStream | Test.java:100:10:100:11 | in : ByteArrayOutputStream | provenance |  |
 | Test.java:99:55:99:62 | source(...) : Object | Test.java:99:31:99:62 | (...)... : ByteArrayOutputStream | provenance |  |
-| Test.java:100:10:100:11 | in : ByteArrayOutputStream | Test.java:100:10:100:25 | toByteArray(...) : byte[] | provenance | MaD:5 |
+| Test.java:100:10:100:11 | in : ByteArrayOutputStream | Test.java:100:10:100:25 | toByteArray(...) : byte[] | provenance | MaD:6 |
 | Test.java:100:10:100:25 | toByteArray(...) : byte[] | Test.java:101:9:101:11 | out | provenance |  |
 | Test.java:106:31:106:62 | (...)... : ByteArrayOutputStream | Test.java:107:10:107:11 | in : ByteArrayOutputStream | provenance |  |
 | Test.java:106:55:106:62 | source(...) : Object | Test.java:106:31:106:62 | (...)... : ByteArrayOutputStream | provenance |  |
-| Test.java:107:10:107:11 | in : ByteArrayOutputStream | Test.java:107:10:107:36 | toString(...) : String | provenance | MaD:6 |
+| Test.java:107:10:107:11 | in : ByteArrayOutputStream | Test.java:107:10:107:36 | toString(...) : String | provenance | MaD:7 |
 | Test.java:107:10:107:36 | toString(...) : String | Test.java:108:9:108:11 | out | provenance |  |
 | Test.java:113:31:113:62 | (...)... : ByteArrayOutputStream | Test.java:114:10:114:11 | in : ByteArrayOutputStream | provenance |  |
 | Test.java:113:55:113:62 | source(...) : Object | Test.java:113:31:113:62 | (...)... : ByteArrayOutputStream | provenance |  |
-| Test.java:114:10:114:11 | in : ByteArrayOutputStream | Test.java:114:10:114:35 | toString(...) : String | provenance | MaD:6 |
+| Test.java:114:10:114:11 | in : ByteArrayOutputStream | Test.java:114:10:114:35 | toString(...) : String | provenance | MaD:7 |
 | Test.java:114:10:114:35 | toString(...) : String | Test.java:115:9:115:11 | out | provenance |  |
 | Test.java:120:31:120:62 | (...)... : ByteArrayOutputStream | Test.java:121:10:121:11 | in : ByteArrayOutputStream | provenance |  |
 | Test.java:120:55:120:62 | source(...) : Object | Test.java:120:31:120:62 | (...)... : ByteArrayOutputStream | provenance |  |
-| Test.java:121:10:121:11 | in : ByteArrayOutputStream | Test.java:121:10:121:22 | toString(...) : String | provenance | MaD:6 |
+| Test.java:121:10:121:11 | in : ByteArrayOutputStream | Test.java:121:10:121:22 | toString(...) : String | provenance | MaD:7 |
 | Test.java:121:10:121:22 | toString(...) : String | Test.java:122:9:122:11 | out | provenance |  |
 | Test.java:127:31:127:62 | (...)... : ByteArrayOutputStream | Test.java:128:10:128:11 | in : ByteArrayOutputStream | provenance |  |
 | Test.java:127:55:127:62 | source(...) : Object | Test.java:127:31:127:62 | (...)... : ByteArrayOutputStream | provenance |  |
-| Test.java:128:10:128:11 | in : ByteArrayOutputStream | Test.java:128:10:128:23 | toString(...) : String | provenance | MaD:6 |
+| Test.java:128:10:128:11 | in : ByteArrayOutputStream | Test.java:128:10:128:23 | toString(...) : String | provenance | MaD:7 |
 | Test.java:128:10:128:23 | toString(...) : String | Test.java:129:9:129:11 | out | provenance |  |
 | Test.java:134:31:134:62 | (...)... : ByteArrayOutputStream | Test.java:135:4:135:5 | in : ByteArrayOutputStream | provenance |  |
 | Test.java:134:55:134:62 | source(...) : Object | Test.java:134:31:134:62 | (...)... : ByteArrayOutputStream | provenance |  |
-| Test.java:135:4:135:5 | in : ByteArrayOutputStream | Test.java:135:15:135:17 | out [post update] : OutputStream | provenance | MaD:7 |
+| Test.java:135:4:135:5 | in : ByteArrayOutputStream | Test.java:135:15:135:17 | out [post update] : OutputStream | provenance | MaD:8 |
 | Test.java:135:15:135:17 | out [post update] : OutputStream | Test.java:136:9:136:11 | out | provenance |  |
 | Test.java:141:16:141:32 | (...)... : char[] | Test.java:142:30:142:31 | in : char[] | provenance |  |
 | Test.java:141:25:141:32 | source(...) : Object | Test.java:141:16:141:32 | (...)... : char[] | provenance |  |
 | Test.java:142:10:142:32 | new CharArrayReader(...) : CharArrayReader | Test.java:143:9:143:11 | out | provenance |  |
-| Test.java:142:30:142:31 | in : char[] | Test.java:142:10:142:32 | new CharArrayReader(...) : CharArrayReader | provenance | MaD:8 |
+| Test.java:142:30:142:31 | in : char[] | Test.java:142:10:142:32 | new CharArrayReader(...) : CharArrayReader | provenance | MaD:9 |
 | Test.java:148:16:148:32 | (...)... : char[] | Test.java:149:30:149:31 | in : char[] | provenance |  |
 | Test.java:148:25:148:32 | source(...) : Object | Test.java:148:16:148:32 | (...)... : char[] | provenance |  |
 | Test.java:149:10:149:38 | new CharArrayReader(...) : CharArrayReader | Test.java:150:9:150:11 | out | provenance |  |
-| Test.java:149:30:149:31 | in : char[] | Test.java:149:10:149:38 | new CharArrayReader(...) : CharArrayReader | provenance | MaD:8 |
+| Test.java:149:30:149:31 | in : char[] | Test.java:149:10:149:38 | new CharArrayReader(...) : CharArrayReader | provenance | MaD:9 |
 | Test.java:155:25:155:50 | (...)... : CharArrayWriter | Test.java:156:10:156:11 | in : CharArrayWriter | provenance |  |
 | Test.java:155:43:155:50 | source(...) : Object | Test.java:155:25:155:50 | (...)... : CharArrayWriter | provenance |  |
-| Test.java:156:10:156:11 | in : CharArrayWriter | Test.java:156:10:156:25 | toCharArray(...) : char[] | provenance | MaD:9 |
+| Test.java:156:10:156:11 | in : CharArrayWriter | Test.java:156:10:156:25 | toCharArray(...) : char[] | provenance | MaD:10 |
 | Test.java:156:10:156:25 | toCharArray(...) : char[] | Test.java:157:9:157:11 | out | provenance |  |
 | Test.java:162:19:162:38 | (...)... : DataInput | Test.java:163:4:163:5 | in : DataInput | provenance |  |
 | Test.java:162:31:162:38 | source(...) : Object | Test.java:162:19:162:38 | (...)... : DataInput | provenance |  |
-| Test.java:163:4:163:5 | in : DataInput | Test.java:163:17:163:19 | out [post update] : byte[] | provenance | MaD:10 |
+| Test.java:163:4:163:5 | in : DataInput | Test.java:163:17:163:19 | out [post update] : byte[] | provenance | MaD:11 |
 | Test.java:163:17:163:19 | out [post update] : byte[] | Test.java:164:9:164:11 | out | provenance |  |
 | Test.java:169:19:169:38 | (...)... : DataInput | Test.java:170:4:170:5 | in : DataInput | provenance |  |
 | Test.java:169:31:169:38 | source(...) : Object | Test.java:169:19:169:38 | (...)... : DataInput | provenance |  |
-| Test.java:170:4:170:5 | in : DataInput | Test.java:170:17:170:19 | out [post update] : byte[] | provenance | MaD:10 |
+| Test.java:170:4:170:5 | in : DataInput | Test.java:170:17:170:19 | out [post update] : byte[] | provenance | MaD:11 |
 | Test.java:170:17:170:19 | out [post update] : byte[] | Test.java:171:9:171:11 | out | provenance |  |
 | Test.java:176:25:176:50 | (...)... : DataInputStream | Test.java:177:4:177:5 | in : DataInputStream | provenance |  |
 | Test.java:176:43:176:50 | source(...) : Object | Test.java:176:25:176:50 | (...)... : DataInputStream | provenance |  |
-| Test.java:177:4:177:5 | in : DataInputStream | Test.java:177:17:177:19 | out [post update] : byte[] | provenance | MaD:10 |
+| Test.java:177:4:177:5 | in : DataInputStream | Test.java:177:17:177:19 | out [post update] : byte[] | provenance | MaD:11 |
 | Test.java:177:17:177:19 | out [post update] : byte[] | Test.java:178:9:178:11 | out | provenance |  |
 | Test.java:183:25:183:50 | (...)... : DataInputStream | Test.java:184:4:184:5 | in : DataInputStream | provenance |  |
 | Test.java:183:43:183:50 | source(...) : Object | Test.java:183:25:183:50 | (...)... : DataInputStream | provenance |  |
-| Test.java:184:4:184:5 | in : DataInputStream | Test.java:184:17:184:19 | out [post update] : byte[] | provenance | MaD:10 |
+| Test.java:184:4:184:5 | in : DataInputStream | Test.java:184:17:184:19 | out [post update] : byte[] | provenance | MaD:11 |
 | Test.java:184:17:184:19 | out [post update] : byte[] | Test.java:185:9:185:11 | out | provenance |  |
 | Test.java:190:27:190:54 | (...)... : ObjectInputStream | Test.java:191:4:191:5 | in : ObjectInputStream | provenance |  |
 | Test.java:190:47:190:54 | source(...) : Object | Test.java:190:27:190:54 | (...)... : ObjectInputStream | provenance |  |
-| Test.java:191:4:191:5 | in : ObjectInputStream | Test.java:191:17:191:19 | out [post update] : byte[] | provenance | MaD:10 |
+| Test.java:191:4:191:5 | in : ObjectInputStream | Test.java:191:17:191:19 | out [post update] : byte[] | provenance | MaD:11 |
 | Test.java:191:17:191:19 | out [post update] : byte[] | Test.java:192:9:192:11 | out | provenance |  |
 | Test.java:197:27:197:54 | (...)... : ObjectInputStream | Test.java:198:4:198:5 | in : ObjectInputStream | provenance |  |
 | Test.java:197:47:197:54 | source(...) : Object | Test.java:197:27:197:54 | (...)... : ObjectInputStream | provenance |  |
-| Test.java:198:4:198:5 | in : ObjectInputStream | Test.java:198:17:198:19 | out [post update] : byte[] | provenance | MaD:10 |
+| Test.java:198:4:198:5 | in : ObjectInputStream | Test.java:198:17:198:19 | out [post update] : byte[] | provenance | MaD:11 |
 | Test.java:198:17:198:19 | out [post update] : byte[] | Test.java:199:9:199:11 | out | provenance |  |
 | Test.java:204:19:204:38 | (...)... : DataInput | Test.java:205:10:205:11 | in : DataInput | provenance |  |
 | Test.java:204:31:204:38 | source(...) : Object | Test.java:204:19:204:38 | (...)... : DataInput | provenance |  |
-| Test.java:205:10:205:11 | in : DataInput | Test.java:205:10:205:22 | readLine(...) : String | provenance | MaD:11 |
+| Test.java:205:10:205:11 | in : DataInput | Test.java:205:10:205:22 | readLine(...) : String | provenance | MaD:12 |
 | Test.java:205:10:205:22 | readLine(...) : String | Test.java:206:9:206:11 | out | provenance |  |
 | Test.java:211:25:211:50 | (...)... : DataInputStream | Test.java:212:10:212:11 | in : DataInputStream | provenance |  |
 | Test.java:211:43:211:50 | source(...) : Object | Test.java:211:25:211:50 | (...)... : DataInputStream | provenance |  |
-| Test.java:212:10:212:11 | in : DataInputStream | Test.java:212:10:212:22 | readLine(...) : String | provenance | MaD:11 |
+| Test.java:212:10:212:11 | in : DataInputStream | Test.java:212:10:212:22 | readLine(...) : String | provenance | MaD:12 |
 | Test.java:212:10:212:22 | readLine(...) : String | Test.java:213:9:213:11 | out | provenance |  |
 | Test.java:218:27:218:54 | (...)... : ObjectInputStream | Test.java:219:10:219:11 | in : ObjectInputStream | provenance |  |
 | Test.java:218:27:218:54 | (...)... : ObjectInputStream | Test.java:220:9:220:11 | out | provenance | TypeObjectInputStream.read% |
 | Test.java:218:47:218:54 | source(...) : Object | Test.java:218:27:218:54 | (...)... : ObjectInputStream | provenance |  |
-| Test.java:219:10:219:11 | in : ObjectInputStream | Test.java:219:10:219:22 | readLine(...) : String | provenance | MaD:11 |
+| Test.java:219:10:219:11 | in : ObjectInputStream | Test.java:219:10:219:22 | readLine(...) : String | provenance | MaD:12 |
 | Test.java:219:10:219:22 | readLine(...) : String | Test.java:220:9:220:11 | out | provenance |  |
 | Test.java:225:19:225:38 | (...)... : DataInput | Test.java:226:10:226:11 | in : DataInput | provenance |  |
 | Test.java:225:31:225:38 | source(...) : Object | Test.java:225:19:225:38 | (...)... : DataInput | provenance |  |
-| Test.java:226:10:226:11 | in : DataInput | Test.java:226:10:226:21 | readUTF(...) : String | provenance | MaD:12 |
+| Test.java:226:10:226:11 | in : DataInput | Test.java:226:10:226:21 | readUTF(...) : String | provenance | MaD:13 |
 | Test.java:226:10:226:21 | readUTF(...) : String | Test.java:227:9:227:11 | out | provenance |  |
 | Test.java:232:25:232:50 | (...)... : DataInputStream | Test.java:233:10:233:11 | in : DataInputStream | provenance |  |
 | Test.java:232:43:232:50 | source(...) : Object | Test.java:232:25:232:50 | (...)... : DataInputStream | provenance |  |
-| Test.java:233:10:233:11 | in : DataInputStream | Test.java:233:10:233:21 | readUTF(...) : String | provenance | MaD:12 |
+| Test.java:233:10:233:11 | in : DataInputStream | Test.java:233:10:233:21 | readUTF(...) : String | provenance | MaD:13 |
 | Test.java:233:10:233:21 | readUTF(...) : String | Test.java:234:9:234:11 | out | provenance |  |
 | Test.java:239:27:239:54 | (...)... : ObjectInputStream | Test.java:240:10:240:11 | in : ObjectInputStream | provenance |  |
 | Test.java:239:27:239:54 | (...)... : ObjectInputStream | Test.java:241:9:241:11 | out | provenance | TypeObjectInputStream.read% |
 | Test.java:239:47:239:54 | source(...) : Object | Test.java:239:27:239:54 | (...)... : ObjectInputStream | provenance |  |
-| Test.java:240:10:240:11 | in : ObjectInputStream | Test.java:240:10:240:21 | readUTF(...) : String | provenance | MaD:12 |
+| Test.java:240:10:240:11 | in : ObjectInputStream | Test.java:240:10:240:21 | readUTF(...) : String | provenance | MaD:13 |
 | Test.java:240:10:240:21 | readUTF(...) : String | Test.java:241:9:241:11 | out | provenance |  |
 | Test.java:246:21:246:42 | (...)... : InputStream | Test.java:247:30:247:31 | in : InputStream | provenance |  |
 | Test.java:246:21:246:42 | (...)... : InputStream | Test.java:248:9:248:11 | out | provenance | inputStreamWrapper |
 | Test.java:246:35:246:42 | source(...) : Object | Test.java:246:21:246:42 | (...)... : InputStream | provenance |  |
 | Test.java:247:10:247:32 | new DataInputStream(...) : DataInputStream | Test.java:248:9:248:11 | out | provenance |  |
-| Test.java:247:30:247:31 | in : InputStream | Test.java:247:10:247:32 | new DataInputStream(...) : DataInputStream | provenance | MaD:13 |
+| Test.java:247:30:247:31 | in : InputStream | Test.java:247:10:247:32 | new DataInputStream(...) : DataInputStream | provenance | MaD:14 |
 | Test.java:253:14:253:28 | (...)... : File | Test.java:254:19:254:20 | in : File | provenance |  |
 | Test.java:253:21:253:28 | source(...) : Object | Test.java:253:14:253:28 | (...)... : File | provenance |  |
 | Test.java:254:10:254:36 | new File(...) : File | Test.java:255:9:255:11 | out | provenance |  |
-| Test.java:254:19:254:20 | in : File | Test.java:254:10:254:36 | new File(...) : File | provenance | MaD:14 |
+| Test.java:254:19:254:20 | in : File | Test.java:254:10:254:36 | new File(...) : File | provenance | MaD:15 |
 | Test.java:260:16:260:32 | (...)... : String | Test.java:261:19:261:20 | in : String | provenance |  |
 | Test.java:260:25:260:32 | source(...) : Object | Test.java:260:16:260:32 | (...)... : String | provenance |  |
 | Test.java:261:10:261:21 | new File(...) : File | Test.java:262:9:262:11 | out | provenance |  |
-| Test.java:261:19:261:20 | in : String | Test.java:261:10:261:21 | new File(...) : File | provenance | MaD:14 |
+| Test.java:261:19:261:20 | in : String | Test.java:261:10:261:21 | new File(...) : File | provenance | MaD:15 |
 | Test.java:267:16:267:32 | (...)... : String | Test.java:268:19:268:20 | in : String | provenance |  |
 | Test.java:267:25:267:32 | source(...) : Object | Test.java:267:16:267:32 | (...)... : String | provenance |  |
 | Test.java:268:10:268:36 | new File(...) : File | Test.java:269:9:269:11 | out | provenance |  |
-| Test.java:268:19:268:20 | in : String | Test.java:268:10:268:36 | new File(...) : File | provenance | MaD:14 |
+| Test.java:268:19:268:20 | in : String | Test.java:268:10:268:36 | new File(...) : File | provenance | MaD:15 |
 | Test.java:274:13:274:26 | (...)... : URI | Test.java:275:19:275:20 | in : URI | provenance |  |
 | Test.java:274:19:274:26 | source(...) : Object | Test.java:274:13:274:26 | (...)... : URI | provenance |  |
 | Test.java:275:10:275:21 | new File(...) : File | Test.java:276:9:276:11 | out | provenance |  |
-| Test.java:275:19:275:20 | in : URI | Test.java:275:10:275:21 | new File(...) : File | provenance | MaD:14 |
+| Test.java:275:19:275:20 | in : URI | Test.java:275:10:275:21 | new File(...) : File | provenance | MaD:15 |
 | Test.java:281:16:281:32 | (...)... : String | Test.java:282:32:282:33 | in : String | provenance |  |
 | Test.java:281:25:281:32 | source(...) : Object | Test.java:281:16:281:32 | (...)... : String | provenance |  |
 | Test.java:282:10:282:34 | new File(...) : File | Test.java:283:9:283:11 | out | provenance |  |
-| Test.java:282:32:282:33 | in : String | Test.java:282:10:282:34 | new File(...) : File | provenance | MaD:15 |
+| Test.java:282:32:282:33 | in : String | Test.java:282:10:282:34 | new File(...) : File | provenance | MaD:16 |
 | Test.java:288:16:288:32 | (...)... : String | Test.java:289:34:289:35 | in : String | provenance |  |
 | Test.java:288:25:288:32 | source(...) : Object | Test.java:288:16:288:32 | (...)... : String | provenance |  |
 | Test.java:289:10:289:36 | new File(...) : File | Test.java:290:9:290:11 | out | provenance |  |
-| Test.java:289:34:289:35 | in : String | Test.java:289:10:289:36 | new File(...) : File | provenance | MaD:15 |
+| Test.java:289:34:289:35 | in : String | Test.java:289:10:289:36 | new File(...) : File | provenance | MaD:16 |
 | Test.java:295:14:295:28 | (...)... : File | Test.java:296:10:296:11 | in : File | provenance |  |
 | Test.java:295:21:295:28 | source(...) : Object | Test.java:295:14:295:28 | (...)... : File | provenance |  |
-| Test.java:296:10:296:11 | in : File | Test.java:296:10:296:29 | getAbsoluteFile(...) : File | provenance | MaD:16 |
+| Test.java:296:10:296:11 | in : File | Test.java:296:10:296:29 | getAbsoluteFile(...) : File | provenance | MaD:17 |
 | Test.java:296:10:296:29 | getAbsoluteFile(...) : File | Test.java:297:9:297:11 | out | provenance |  |
 | Test.java:302:14:302:28 | (...)... : File | Test.java:303:10:303:11 | in : File | provenance |  |
 | Test.java:302:21:302:28 | source(...) : Object | Test.java:302:14:302:28 | (...)... : File | provenance |  |
-| Test.java:303:10:303:11 | in : File | Test.java:303:10:303:29 | getAbsolutePath(...) : String | provenance | MaD:17 |
+| Test.java:303:10:303:11 | in : File | Test.java:303:10:303:29 | getAbsolutePath(...) : String | provenance | MaD:18 |
 | Test.java:303:10:303:29 | getAbsolutePath(...) : String | Test.java:304:9:304:11 | out | provenance |  |
 | Test.java:309:14:309:28 | (...)... : File | Test.java:310:10:310:11 | in : File | provenance |  |
 | Test.java:309:21:309:28 | source(...) : Object | Test.java:309:14:309:28 | (...)... : File | provenance |  |
-| Test.java:310:10:310:11 | in : File | Test.java:310:10:310:30 | getCanonicalFile(...) : File | provenance | MaD:18 |
+| Test.java:310:10:310:11 | in : File | Test.java:310:10:310:30 | getCanonicalFile(...) : File | provenance | MaD:19 |
 | Test.java:310:10:310:30 | getCanonicalFile(...) : File | Test.java:311:9:311:11 | out | provenance |  |
 | Test.java:316:14:316:28 | (...)... : File | Test.java:317:10:317:11 | in : File | provenance |  |
 | Test.java:316:21:316:28 | source(...) : Object | Test.java:316:14:316:28 | (...)... : File | provenance |  |
-| Test.java:317:10:317:11 | in : File | Test.java:317:10:317:30 | getCanonicalPath(...) : String | provenance | MaD:19 |
+| Test.java:317:10:317:11 | in : File | Test.java:317:10:317:30 | getCanonicalPath(...) : String | provenance | MaD:20 |
 | Test.java:317:10:317:30 | getCanonicalPath(...) : String | Test.java:318:9:318:11 | out | provenance |  |
 | Test.java:323:14:323:28 | (...)... : File | Test.java:324:10:324:11 | in : File | provenance |  |
 | Test.java:323:21:323:28 | source(...) : Object | Test.java:323:14:323:28 | (...)... : File | provenance |  |
-| Test.java:324:10:324:11 | in : File | Test.java:324:10:324:21 | getName(...) : String | provenance | MaD:20 |
+| Test.java:324:10:324:11 | in : File | Test.java:324:10:324:21 | getName(...) : String | provenance | MaD:21 |
 | Test.java:324:10:324:21 | getName(...) : String | Test.java:325:9:325:11 | out | provenance |  |
 | Test.java:330:14:330:28 | (...)... : File | Test.java:331:10:331:11 | in : File | provenance |  |
 | Test.java:330:21:330:28 | source(...) : Object | Test.java:330:14:330:28 | (...)... : File | provenance |  |
-| Test.java:331:10:331:11 | in : File | Test.java:331:10:331:20 | toPath(...) : Path | provenance | MaD:21 |
+| Test.java:331:10:331:11 | in : File | Test.java:331:10:331:20 | toPath(...) : Path | provenance | MaD:22 |
 | Test.java:331:10:331:20 | toPath(...) : Path | Test.java:332:9:332:11 | out | provenance |  |
 | Test.java:337:14:337:28 | (...)... : File | Test.java:338:10:338:11 | in : File | provenance |  |
 | Test.java:337:21:337:28 | source(...) : Object | Test.java:337:14:337:28 | (...)... : File | provenance |  |
-| Test.java:338:10:338:11 | in : File | Test.java:338:10:338:22 | toString(...) : String | provenance | MaD:22 |
+| Test.java:338:10:338:11 | in : File | Test.java:338:10:338:22 | toString(...) : String | provenance | MaD:23 |
 | Test.java:338:10:338:22 | toString(...) : String | Test.java:339:9:339:11 | out | provenance |  |
 | Test.java:344:14:344:28 | (...)... : File | Test.java:345:10:345:11 | in : File | provenance |  |
 | Test.java:344:21:344:28 | source(...) : Object | Test.java:344:14:344:28 | (...)... : File | provenance |  |
-| Test.java:345:10:345:11 | in : File | Test.java:345:10:345:19 | toURI(...) : URI | provenance | MaD:23 |
+| Test.java:345:10:345:11 | in : File | Test.java:345:10:345:19 | toURI(...) : URI | provenance | MaD:24 |
 | Test.java:345:10:345:19 | toURI(...) : URI | Test.java:346:9:346:11 | out | provenance |  |
 | Test.java:351:22:351:44 | (...)... : OutputStream | Test.java:352:33:352:34 | in : OutputStream | provenance |  |
 | Test.java:351:37:351:44 | source(...) : Object | Test.java:351:22:351:44 | (...)... : OutputStream | provenance |  |
 | Test.java:352:10:352:35 | new FilterOutputStream(...) : FilterOutputStream | Test.java:353:9:353:11 | out | provenance |  |
-| Test.java:352:33:352:34 | in : OutputStream | Test.java:352:10:352:35 | new FilterOutputStream(...) : FilterOutputStream | provenance | MaD:24 |
+| Test.java:352:33:352:34 | in : OutputStream | Test.java:352:10:352:35 | new FilterOutputStream(...) : FilterOutputStream | provenance | MaD:25 |
 | Test.java:358:16:358:32 | (...)... : String | Test.java:359:26:359:27 | in : String | provenance |  |
 | Test.java:358:25:358:32 | source(...) : Object | Test.java:358:16:358:32 | (...)... : String | provenance |  |
 | Test.java:359:10:359:28 | new IOException(...) : IOException [java.lang.Throwable.message] : String | Test.java:360:37:360:39 | out : IOException [java.lang.Throwable.message] : String | provenance |  |
-| Test.java:359:26:359:27 | in : String | Test.java:359:10:359:28 | new IOException(...) : IOException [java.lang.Throwable.message] : String | provenance | MaD:32 |
-| Test.java:360:37:360:39 | out : IOException [java.lang.Throwable.message] : String | Test.java:360:9:360:40 | getThrowable_messageDefault(...) | provenance | MaD:41 |
+| Test.java:359:26:359:27 | in : String | Test.java:359:10:359:28 | new IOException(...) : IOException [java.lang.Throwable.message] : String | provenance | MaD:26 |
+| Test.java:360:37:360:39 | out : IOException [java.lang.Throwable.message] : String | Test.java:360:9:360:40 | getThrowable_messageDefault(...) | provenance | MaD:1 |
 | Test.java:365:25:365:50 | (...)... : DataInputStream | Test.java:366:4:366:5 | in : DataInputStream | provenance |  |
 | Test.java:365:43:365:50 | source(...) : Object | Test.java:365:25:365:50 | (...)... : DataInputStream | provenance |  |
-| Test.java:366:4:366:5 | in : DataInputStream | Test.java:366:12:366:14 | out [post update] : byte[] | provenance | MaD:25 |
+| Test.java:366:4:366:5 | in : DataInputStream | Test.java:366:12:366:14 | out [post update] : byte[] | provenance | MaD:27 |
 | Test.java:366:12:366:14 | out [post update] : byte[] | Test.java:367:9:367:11 | out | provenance |  |
 | Test.java:372:27:372:54 | (...)... : FilterInputStream | Test.java:373:4:373:5 | in : FilterInputStream | provenance |  |
 | Test.java:372:47:372:54 | source(...) : Object | Test.java:372:27:372:54 | (...)... : FilterInputStream | provenance |  |
-| Test.java:373:4:373:5 | in : FilterInputStream | Test.java:373:12:373:14 | out [post update] : byte[] | provenance | MaD:25 |
+| Test.java:373:4:373:5 | in : FilterInputStream | Test.java:373:12:373:14 | out [post update] : byte[] | provenance | MaD:27 |
 | Test.java:373:12:373:14 | out [post update] : byte[] | Test.java:374:9:374:11 | out | provenance |  |
 | Test.java:379:21:379:42 | (...)... : InputStream | Test.java:380:4:380:5 | in : InputStream | provenance |  |
 | Test.java:379:35:379:42 | source(...) : Object | Test.java:379:21:379:42 | (...)... : InputStream | provenance |  |
-| Test.java:380:4:380:5 | in : InputStream | Test.java:380:12:380:14 | out [post update] : byte[] | provenance | MaD:25 |
+| Test.java:380:4:380:5 | in : InputStream | Test.java:380:12:380:14 | out [post update] : byte[] | provenance | MaD:27 |
 | Test.java:380:12:380:14 | out [post update] : byte[] | Test.java:381:9:381:11 | out | provenance |  |
 | Test.java:386:29:386:58 | (...)... : BufferedInputStream | Test.java:387:4:387:5 | in : BufferedInputStream | provenance |  |
 | Test.java:386:51:386:58 | source(...) : Object | Test.java:386:29:386:58 | (...)... : BufferedInputStream | provenance |  |
-| Test.java:387:4:387:5 | in : BufferedInputStream | Test.java:387:12:387:14 | out [post update] : byte[] | provenance | MaD:26 |
+| Test.java:387:4:387:5 | in : BufferedInputStream | Test.java:387:12:387:14 | out [post update] : byte[] | provenance | MaD:28 |
 | Test.java:387:12:387:14 | out [post update] : byte[] | Test.java:388:9:388:11 | out | provenance |  |
 | Test.java:393:30:393:60 | (...)... : ByteArrayInputStream | Test.java:394:4:394:5 | in : ByteArrayInputStream | provenance |  |
 | Test.java:393:53:393:60 | source(...) : Object | Test.java:393:30:393:60 | (...)... : ByteArrayInputStream | provenance |  |
-| Test.java:394:4:394:5 | in : ByteArrayInputStream | Test.java:394:12:394:14 | out [post update] : byte[] | provenance | MaD:26 |
+| Test.java:394:4:394:5 | in : ByteArrayInputStream | Test.java:394:12:394:14 | out [post update] : byte[] | provenance | MaD:28 |
 | Test.java:394:12:394:14 | out [post update] : byte[] | Test.java:395:9:395:11 | out | provenance |  |
 | Test.java:400:25:400:50 | (...)... : DataInputStream | Test.java:401:4:401:5 | in : DataInputStream | provenance |  |
 | Test.java:400:43:400:50 | source(...) : Object | Test.java:400:25:400:50 | (...)... : DataInputStream | provenance |  |
-| Test.java:401:4:401:5 | in : DataInputStream | Test.java:401:12:401:14 | out [post update] : byte[] | provenance | MaD:26 |
+| Test.java:401:4:401:5 | in : DataInputStream | Test.java:401:12:401:14 | out [post update] : byte[] | provenance | MaD:28 |
 | Test.java:401:12:401:14 | out [post update] : byte[] | Test.java:402:9:402:11 | out | provenance |  |
 | Test.java:407:27:407:54 | (...)... : FilterInputStream | Test.java:408:4:408:5 | in : FilterInputStream | provenance |  |
 | Test.java:407:47:407:54 | source(...) : Object | Test.java:407:27:407:54 | (...)... : FilterInputStream | provenance |  |
-| Test.java:408:4:408:5 | in : FilterInputStream | Test.java:408:12:408:14 | out [post update] : byte[] | provenance | MaD:26 |
+| Test.java:408:4:408:5 | in : FilterInputStream | Test.java:408:12:408:14 | out [post update] : byte[] | provenance | MaD:28 |
 | Test.java:408:12:408:14 | out [post update] : byte[] | Test.java:409:9:409:11 | out | provenance |  |
 | Test.java:414:21:414:42 | (...)... : InputStream | Test.java:415:4:415:5 | in : InputStream | provenance |  |
 | Test.java:414:35:414:42 | source(...) : Object | Test.java:414:21:414:42 | (...)... : InputStream | provenance |  |
-| Test.java:415:4:415:5 | in : InputStream | Test.java:415:12:415:14 | out [post update] : byte[] | provenance | MaD:26 |
+| Test.java:415:4:415:5 | in : InputStream | Test.java:415:12:415:14 | out [post update] : byte[] | provenance | MaD:28 |
 | Test.java:415:12:415:14 | out [post update] : byte[] | Test.java:416:9:416:11 | out | provenance |  |
 | Test.java:421:27:421:54 | (...)... : ObjectInputStream | Test.java:422:4:422:5 | in : ObjectInputStream | provenance |  |
 | Test.java:421:47:421:54 | source(...) : Object | Test.java:421:27:421:54 | (...)... : ObjectInputStream | provenance |  |
-| Test.java:422:4:422:5 | in : ObjectInputStream | Test.java:422:12:422:14 | out [post update] : byte[] | provenance | MaD:26 |
-| Test.java:422:4:422:5 | in : ObjectInputStream | Test.java:422:12:422:14 | out [post update] : byte[] | provenance | MaD:33 |
+| Test.java:422:4:422:5 | in : ObjectInputStream | Test.java:422:12:422:14 | out [post update] : byte[] | provenance | MaD:28 |
+| Test.java:422:4:422:5 | in : ObjectInputStream | Test.java:422:12:422:14 | out [post update] : byte[] | provenance | MaD:34 |
 | Test.java:422:12:422:14 | out [post update] : byte[] | Test.java:423:9:423:11 | out | provenance |  |
 | Test.java:428:30:428:60 | (...)... : ByteArrayInputStream | Test.java:429:10:429:11 | in : ByteArrayInputStream | provenance |  |
 | Test.java:428:53:428:60 | source(...) : Object | Test.java:428:30:428:60 | (...)... : ByteArrayInputStream | provenance |  |
-| Test.java:429:10:429:11 | in : ByteArrayInputStream | Test.java:429:10:429:26 | readAllBytes(...) : byte[] | provenance | MaD:27 |
+| Test.java:429:10:429:11 | in : ByteArrayInputStream | Test.java:429:10:429:26 | readAllBytes(...) : byte[] | provenance | MaD:29 |
 | Test.java:429:10:429:26 | readAllBytes(...) : byte[] | Test.java:430:9:430:11 | out | provenance |  |
 | Test.java:435:21:435:42 | (...)... : InputStream | Test.java:436:10:436:11 | in : InputStream | provenance |  |
 | Test.java:435:35:435:42 | source(...) : Object | Test.java:435:21:435:42 | (...)... : InputStream | provenance |  |
-| Test.java:436:10:436:11 | in : InputStream | Test.java:436:10:436:26 | readAllBytes(...) : byte[] | provenance | MaD:27 |
+| Test.java:436:10:436:11 | in : InputStream | Test.java:436:10:436:26 | readAllBytes(...) : byte[] | provenance | MaD:29 |
 | Test.java:436:10:436:26 | readAllBytes(...) : byte[] | Test.java:437:9:437:11 | out | provenance |  |
 | Test.java:442:30:442:60 | (...)... : ByteArrayInputStream | Test.java:443:4:443:5 | in : ByteArrayInputStream | provenance |  |
 | Test.java:442:53:442:60 | source(...) : Object | Test.java:442:30:442:60 | (...)... : ByteArrayInputStream | provenance |  |
-| Test.java:443:4:443:5 | in : ByteArrayInputStream | Test.java:443:18:443:20 | out [post update] : byte[] | provenance | MaD:28 |
+| Test.java:443:4:443:5 | in : ByteArrayInputStream | Test.java:443:18:443:20 | out [post update] : byte[] | provenance | MaD:30 |
 | Test.java:443:18:443:20 | out [post update] : byte[] | Test.java:444:9:444:11 | out | provenance |  |
 | Test.java:449:21:449:42 | (...)... : InputStream | Test.java:450:4:450:5 | in : InputStream | provenance |  |
 | Test.java:449:35:449:42 | source(...) : Object | Test.java:449:21:449:42 | (...)... : InputStream | provenance |  |
-| Test.java:450:4:450:5 | in : InputStream | Test.java:450:18:450:20 | out [post update] : byte[] | provenance | MaD:28 |
+| Test.java:450:4:450:5 | in : InputStream | Test.java:450:18:450:20 | out [post update] : byte[] | provenance | MaD:30 |
 | Test.java:450:18:450:20 | out [post update] : byte[] | Test.java:451:9:451:11 | out | provenance |  |
 | Test.java:456:21:456:42 | (...)... : InputStream | Test.java:457:10:457:11 | in : InputStream | provenance |  |
 | Test.java:456:35:456:42 | source(...) : Object | Test.java:456:21:456:42 | (...)... : InputStream | provenance |  |
-| Test.java:457:10:457:11 | in : InputStream | Test.java:457:10:457:25 | readNBytes(...) : byte[] | provenance | MaD:29 |
+| Test.java:457:10:457:11 | in : InputStream | Test.java:457:10:457:25 | readNBytes(...) : byte[] | provenance | MaD:31 |
 | Test.java:457:10:457:25 | readNBytes(...) : byte[] | Test.java:458:9:458:11 | out | provenance |  |
 | Test.java:463:30:463:60 | (...)... : ByteArrayInputStream | Test.java:464:4:464:5 | in : ByteArrayInputStream | provenance |  |
 | Test.java:463:53:463:60 | source(...) : Object | Test.java:463:30:463:60 | (...)... : ByteArrayInputStream | provenance |  |
-| Test.java:464:4:464:5 | in : ByteArrayInputStream | Test.java:464:18:464:20 | out [post update] : OutputStream | provenance | MaD:30 |
+| Test.java:464:4:464:5 | in : ByteArrayInputStream | Test.java:464:18:464:20 | out [post update] : OutputStream | provenance | MaD:32 |
 | Test.java:464:18:464:20 | out [post update] : OutputStream | Test.java:465:9:465:11 | out | provenance |  |
 | Test.java:470:21:470:42 | (...)... : InputStream | Test.java:471:4:471:5 | in : InputStream | provenance |  |
 | Test.java:470:35:470:42 | source(...) : Object | Test.java:470:21:470:42 | (...)... : InputStream | provenance |  |
-| Test.java:471:4:471:5 | in : InputStream | Test.java:471:18:471:20 | out [post update] : OutputStream | provenance | MaD:30 |
+| Test.java:471:4:471:5 | in : InputStream | Test.java:471:18:471:20 | out [post update] : OutputStream | provenance | MaD:32 |
 | Test.java:471:18:471:20 | out [post update] : OutputStream | Test.java:472:9:472:11 | out | provenance |  |
 | Test.java:477:21:477:42 | (...)... : InputStream | Test.java:478:32:478:33 | in : InputStream | provenance |  |
 | Test.java:477:35:477:42 | source(...) : Object | Test.java:477:21:477:42 | (...)... : InputStream | provenance |  |
 | Test.java:478:10:478:34 | new InputStreamReader(...) : InputStreamReader | Test.java:479:9:479:11 | out | provenance |  |
-| Test.java:478:32:478:33 | in : InputStream | Test.java:478:10:478:34 | new InputStreamReader(...) : InputStreamReader | provenance | MaD:31 |
+| Test.java:478:32:478:33 | in : InputStream | Test.java:478:10:478:34 | new InputStreamReader(...) : InputStreamReader | provenance | MaD:33 |
 | Test.java:484:21:484:42 | (...)... : InputStream | Test.java:485:32:485:33 | in : InputStream | provenance |  |
 | Test.java:484:35:484:42 | source(...) : Object | Test.java:484:21:484:42 | (...)... : InputStream | provenance |  |
 | Test.java:485:10:485:50 | new InputStreamReader(...) : InputStreamReader | Test.java:486:9:486:11 | out | provenance |  |
-| Test.java:485:32:485:33 | in : InputStream | Test.java:485:10:485:50 | new InputStreamReader(...) : InputStreamReader | provenance | MaD:31 |
+| Test.java:485:32:485:33 | in : InputStream | Test.java:485:10:485:50 | new InputStreamReader(...) : InputStreamReader | provenance | MaD:33 |
 | Test.java:491:21:491:42 | (...)... : InputStream | Test.java:492:32:492:33 | in : InputStream | provenance |  |
 | Test.java:491:35:491:42 | source(...) : Object | Test.java:491:21:491:42 | (...)... : InputStream | provenance |  |
 | Test.java:492:10:492:57 | new InputStreamReader(...) : InputStreamReader | Test.java:493:9:493:11 | out | provenance |  |
-| Test.java:492:32:492:33 | in : InputStream | Test.java:492:10:492:57 | new InputStreamReader(...) : InputStreamReader | provenance | MaD:31 |
+| Test.java:492:32:492:33 | in : InputStream | Test.java:492:10:492:57 | new InputStreamReader(...) : InputStreamReader | provenance | MaD:33 |
 | Test.java:498:21:498:42 | (...)... : InputStream | Test.java:499:32:499:33 | in : InputStream | provenance |  |
 | Test.java:498:35:498:42 | source(...) : Object | Test.java:498:21:498:42 | (...)... : InputStream | provenance |  |
 | Test.java:499:10:499:49 | new InputStreamReader(...) : InputStreamReader | Test.java:500:9:500:11 | out | provenance |  |
-| Test.java:499:32:499:33 | in : InputStream | Test.java:499:10:499:49 | new InputStreamReader(...) : InputStreamReader | provenance | MaD:31 |
+| Test.java:499:32:499:33 | in : InputStream | Test.java:499:10:499:49 | new InputStreamReader(...) : InputStreamReader | provenance | MaD:33 |
 | Test.java:505:21:505:42 | (...)... : ObjectInput | Test.java:506:4:506:5 | in : ObjectInput | provenance |  |
 | Test.java:505:35:505:42 | source(...) : Object | Test.java:505:21:505:42 | (...)... : ObjectInput | provenance |  |
-| Test.java:506:4:506:5 | in : ObjectInput | Test.java:506:12:506:14 | out [post update] : byte[] | provenance | MaD:33 |
+| Test.java:506:4:506:5 | in : ObjectInput | Test.java:506:12:506:14 | out [post update] : byte[] | provenance | MaD:34 |
 | Test.java:506:12:506:14 | out [post update] : byte[] | Test.java:507:9:507:11 | out | provenance |  |
 | Test.java:512:21:512:42 | (...)... : ObjectInput | Test.java:513:4:513:5 | in : ObjectInput | provenance |  |
 | Test.java:512:35:512:42 | source(...) : Object | Test.java:512:21:512:42 | (...)... : ObjectInput | provenance |  |
-| Test.java:513:4:513:5 | in : ObjectInput | Test.java:513:12:513:14 | out [post update] : byte[] | provenance | MaD:33 |
+| Test.java:513:4:513:5 | in : ObjectInput | Test.java:513:12:513:14 | out [post update] : byte[] | provenance | MaD:34 |
 | Test.java:513:12:513:14 | out [post update] : byte[] | Test.java:514:9:514:11 | out | provenance |  |
 | Test.java:519:27:519:54 | (...)... : ObjectInputStream | Test.java:520:4:520:5 | in : ObjectInputStream | provenance |  |
 | Test.java:519:47:519:54 | source(...) : Object | Test.java:519:27:519:54 | (...)... : ObjectInputStream | provenance |  |
-| Test.java:520:4:520:5 | in : ObjectInputStream | Test.java:520:12:520:14 | out [post update] : byte[] | provenance | MaD:26 |
-| Test.java:520:4:520:5 | in : ObjectInputStream | Test.java:520:12:520:14 | out [post update] : byte[] | provenance | MaD:33 |
+| Test.java:520:4:520:5 | in : ObjectInputStream | Test.java:520:12:520:14 | out [post update] : byte[] | provenance | MaD:28 |
+| Test.java:520:4:520:5 | in : ObjectInputStream | Test.java:520:12:520:14 | out [post update] : byte[] | provenance | MaD:34 |
 | Test.java:520:12:520:14 | out [post update] : byte[] | Test.java:521:9:521:11 | out | provenance |  |
 | Test.java:526:21:526:42 | (...)... : InputStream | Test.java:527:32:527:33 | in : InputStream | provenance |  |
 | Test.java:526:21:526:42 | (...)... : InputStream | Test.java:528:9:528:11 | out | provenance | inputStreamWrapper |
 | Test.java:526:35:526:42 | source(...) : Object | Test.java:526:21:526:42 | (...)... : InputStream | provenance |  |
 | Test.java:527:10:527:34 | new ObjectInputStream(...) : ObjectInputStream | Test.java:528:9:528:11 | out | provenance |  |
-| Test.java:527:32:527:33 | in : InputStream | Test.java:527:10:527:34 | new ObjectInputStream(...) : ObjectInputStream | provenance | MaD:34 |
+| Test.java:527:32:527:33 | in : InputStream | Test.java:527:10:527:34 | new ObjectInputStream(...) : ObjectInputStream | provenance | MaD:35 |
 | Test.java:533:16:533:32 | (...)... : byte[] | Test.java:534:14:534:15 | in : byte[] | provenance |  |
 | Test.java:533:25:533:32 | source(...) : Object | Test.java:533:16:533:32 | (...)... : byte[] | provenance |  |
 | Test.java:534:4:534:6 | out [post update] : FilterOutputStream | Test.java:535:9:535:11 | out | provenance |  |
-| Test.java:534:14:534:15 | in : byte[] | Test.java:534:4:534:6 | out [post update] : FilterOutputStream | provenance | MaD:35 |
+| Test.java:534:14:534:15 | in : byte[] | Test.java:534:4:534:6 | out [post update] : FilterOutputStream | provenance | MaD:36 |
 | Test.java:540:16:540:32 | (...)... : byte[] | Test.java:541:14:541:15 | in : byte[] | provenance |  |
 | Test.java:540:25:540:32 | source(...) : Object | Test.java:540:16:540:32 | (...)... : byte[] | provenance |  |
 | Test.java:541:4:541:6 | out [post update] : ObjectOutputStream | Test.java:542:9:542:11 | out | provenance |  |
-| Test.java:541:14:541:15 | in : byte[] | Test.java:541:4:541:6 | out [post update] : ObjectOutputStream | provenance | MaD:35 |
+| Test.java:541:14:541:15 | in : byte[] | Test.java:541:4:541:6 | out [post update] : ObjectOutputStream | provenance | MaD:36 |
 | Test.java:547:16:547:32 | (...)... : byte[] | Test.java:548:14:548:15 | in : byte[] | provenance |  |
 | Test.java:547:25:547:32 | source(...) : Object | Test.java:547:16:547:32 | (...)... : byte[] | provenance |  |
 | Test.java:548:4:548:6 | out [post update] : OutputStream | Test.java:549:9:549:11 | out | provenance |  |
-| Test.java:548:14:548:15 | in : byte[] | Test.java:548:4:548:6 | out [post update] : OutputStream | provenance | MaD:35 |
+| Test.java:548:14:548:15 | in : byte[] | Test.java:548:4:548:6 | out [post update] : OutputStream | provenance | MaD:36 |
 | Test.java:554:16:554:32 | (...)... : byte[] | Test.java:555:14:555:15 | in : byte[] | provenance |  |
 | Test.java:554:25:554:32 | source(...) : Object | Test.java:554:16:554:32 | (...)... : byte[] | provenance |  |
 | Test.java:555:4:555:6 | out [post update] : PrintStream | Test.java:556:9:556:11 | out | provenance |  |
-| Test.java:555:14:555:15 | in : byte[] | Test.java:555:4:555:6 | out [post update] : PrintStream | provenance | MaD:35 |
+| Test.java:555:14:555:15 | in : byte[] | Test.java:555:4:555:6 | out [post update] : PrintStream | provenance | MaD:36 |
 | Test.java:561:16:561:32 | (...)... : byte[] | Test.java:562:14:562:15 | in : byte[] | provenance |  |
 | Test.java:561:25:561:32 | source(...) : Object | Test.java:561:16:561:32 | (...)... : byte[] | provenance |  |
 | Test.java:562:4:562:6 | out [post update] : ByteArrayOutputStream | Test.java:563:9:563:11 | out | provenance |  |
-| Test.java:562:14:562:15 | in : byte[] | Test.java:562:4:562:6 | out [post update] : ByteArrayOutputStream | provenance | MaD:36 |
+| Test.java:562:14:562:15 | in : byte[] | Test.java:562:4:562:6 | out [post update] : ByteArrayOutputStream | provenance | MaD:37 |
 | Test.java:568:16:568:32 | (...)... : byte[] | Test.java:569:14:569:15 | in : byte[] | provenance |  |
 | Test.java:568:25:568:32 | source(...) : Object | Test.java:568:16:568:32 | (...)... : byte[] | provenance |  |
 | Test.java:569:4:569:6 | out [post update] : FilterOutputStream | Test.java:570:9:570:11 | out | provenance |  |
-| Test.java:569:14:569:15 | in : byte[] | Test.java:569:4:569:6 | out [post update] : FilterOutputStream | provenance | MaD:36 |
+| Test.java:569:14:569:15 | in : byte[] | Test.java:569:4:569:6 | out [post update] : FilterOutputStream | provenance | MaD:37 |
 | Test.java:575:16:575:32 | (...)... : byte[] | Test.java:576:14:576:15 | in : byte[] | provenance |  |
 | Test.java:575:25:575:32 | source(...) : Object | Test.java:575:16:575:32 | (...)... : byte[] | provenance |  |
 | Test.java:576:4:576:6 | out [post update] : ObjectOutputStream | Test.java:577:9:577:11 | out | provenance |  |
-| Test.java:576:14:576:15 | in : byte[] | Test.java:576:4:576:6 | out [post update] : ObjectOutputStream | provenance | MaD:36 |
+| Test.java:576:14:576:15 | in : byte[] | Test.java:576:4:576:6 | out [post update] : ObjectOutputStream | provenance | MaD:37 |
 | Test.java:582:16:582:32 | (...)... : byte[] | Test.java:583:14:583:15 | in : byte[] | provenance |  |
 | Test.java:582:25:582:32 | source(...) : Object | Test.java:582:16:582:32 | (...)... : byte[] | provenance |  |
 | Test.java:583:4:583:6 | out [post update] : OutputStream | Test.java:584:9:584:11 | out | provenance |  |
-| Test.java:583:14:583:15 | in : byte[] | Test.java:583:4:583:6 | out [post update] : OutputStream | provenance | MaD:36 |
+| Test.java:583:14:583:15 | in : byte[] | Test.java:583:4:583:6 | out [post update] : OutputStream | provenance | MaD:37 |
 | Test.java:589:16:589:32 | (...)... : byte[] | Test.java:590:14:590:15 | in : byte[] | provenance |  |
 | Test.java:589:25:589:32 | source(...) : Object | Test.java:589:16:589:32 | (...)... : byte[] | provenance |  |
 | Test.java:590:4:590:6 | out [post update] : PrintStream | Test.java:591:9:591:11 | out | provenance |  |
-| Test.java:590:14:590:15 | in : byte[] | Test.java:590:4:590:6 | out [post update] : PrintStream | provenance | MaD:36 |
+| Test.java:590:14:590:15 | in : byte[] | Test.java:590:4:590:6 | out [post update] : PrintStream | provenance | MaD:37 |
 | Test.java:596:13:596:26 | (...)... : Number | Test.java:597:14:597:15 | in : Number | provenance |  |
 | Test.java:596:19:596:26 | source(...) : Object | Test.java:596:13:596:26 | (...)... : Number | provenance |  |
 | Test.java:597:4:597:6 | out [post update] : ByteArrayOutputStream | Test.java:598:9:598:11 | out | provenance |  |
-| Test.java:597:14:597:15 | in : Number | Test.java:597:4:597:6 | out [post update] : ByteArrayOutputStream | provenance | MaD:37 |
+| Test.java:597:14:597:15 | in : Number | Test.java:597:4:597:6 | out [post update] : ByteArrayOutputStream | provenance | MaD:38 |
 | Test.java:603:13:603:26 | (...)... : Number | Test.java:604:14:604:15 | in : Number | provenance |  |
 | Test.java:603:19:603:26 | source(...) : Object | Test.java:603:13:603:26 | (...)... : Number | provenance |  |
 | Test.java:604:4:604:6 | out [post update] : FilterOutputStream | Test.java:605:9:605:11 | out | provenance |  |
-| Test.java:604:14:604:15 | in : Number | Test.java:604:4:604:6 | out [post update] : FilterOutputStream | provenance | MaD:37 |
+| Test.java:604:14:604:15 | in : Number | Test.java:604:4:604:6 | out [post update] : FilterOutputStream | provenance | MaD:38 |
 | Test.java:610:13:610:26 | (...)... : Number | Test.java:611:14:611:15 | in : Number | provenance |  |
 | Test.java:610:19:610:26 | source(...) : Object | Test.java:610:13:610:26 | (...)... : Number | provenance |  |
 | Test.java:611:4:611:6 | out [post update] : ObjectOutputStream | Test.java:612:9:612:11 | out | provenance |  |
-| Test.java:611:14:611:15 | in : Number | Test.java:611:4:611:6 | out [post update] : ObjectOutputStream | provenance | MaD:37 |
+| Test.java:611:14:611:15 | in : Number | Test.java:611:4:611:6 | out [post update] : ObjectOutputStream | provenance | MaD:38 |
 | Test.java:617:13:617:26 | (...)... : Number | Test.java:618:14:618:15 | in : Number | provenance |  |
 | Test.java:617:19:617:26 | source(...) : Object | Test.java:617:13:617:26 | (...)... : Number | provenance |  |
 | Test.java:618:4:618:6 | out [post update] : OutputStream | Test.java:619:9:619:11 | out | provenance |  |
-| Test.java:618:14:618:15 | in : Number | Test.java:618:4:618:6 | out [post update] : OutputStream | provenance | MaD:37 |
+| Test.java:618:14:618:15 | in : Number | Test.java:618:4:618:6 | out [post update] : OutputStream | provenance | MaD:38 |
 | Test.java:624:13:624:26 | (...)... : Number | Test.java:625:14:625:15 | in : Number | provenance |  |
 | Test.java:624:19:624:26 | source(...) : Object | Test.java:624:13:624:26 | (...)... : Number | provenance |  |
 | Test.java:625:4:625:6 | out [post update] : PrintStream | Test.java:626:9:626:11 | out | provenance |  |
-| Test.java:625:14:625:15 | in : Number | Test.java:625:4:625:6 | out [post update] : PrintStream | provenance | MaD:37 |
+| Test.java:625:14:625:15 | in : Number | Test.java:625:4:625:6 | out [post update] : PrintStream | provenance | MaD:38 |
 | Test.java:631:25:631:50 | (...)... : CharArrayReader | Test.java:632:4:632:5 | in : CharArrayReader | provenance |  |
 | Test.java:631:43:631:50 | source(...) : Object | Test.java:631:25:631:50 | (...)... : CharArrayReader | provenance |  |
-| Test.java:632:4:632:5 | in : CharArrayReader | Test.java:632:12:632:14 | out [post update] : CharBuffer | provenance | MaD:38 |
+| Test.java:632:4:632:5 | in : CharArrayReader | Test.java:632:12:632:14 | out [post update] : CharBuffer | provenance | MaD:39 |
 | Test.java:632:12:632:14 | out [post update] : CharBuffer | Test.java:633:9:633:11 | out | provenance |  |
 | Test.java:638:27:638:54 | (...)... : InputStreamReader | Test.java:639:4:639:5 | in : InputStreamReader | provenance |  |
 | Test.java:638:47:638:54 | source(...) : Object | Test.java:638:27:638:54 | (...)... : InputStreamReader | provenance |  |
-| Test.java:639:4:639:5 | in : InputStreamReader | Test.java:639:12:639:14 | out [post update] : CharBuffer | provenance | MaD:38 |
+| Test.java:639:4:639:5 | in : InputStreamReader | Test.java:639:12:639:14 | out [post update] : CharBuffer | provenance | MaD:39 |
 | Test.java:639:12:639:14 | out [post update] : CharBuffer | Test.java:640:9:640:11 | out | provenance |  |
 | Test.java:645:16:645:32 | (...)... : Reader | Test.java:646:4:646:5 | in : Reader | provenance |  |
 | Test.java:645:25:645:32 | source(...) : Object | Test.java:645:16:645:32 | (...)... : Reader | provenance |  |
-| Test.java:646:4:646:5 | in : Reader | Test.java:646:12:646:14 | out [post update] : CharBuffer | provenance | MaD:38 |
+| Test.java:646:4:646:5 | in : Reader | Test.java:646:12:646:14 | out [post update] : CharBuffer | provenance | MaD:39 |
 | Test.java:646:12:646:14 | out [post update] : CharBuffer | Test.java:647:9:647:11 | out | provenance |  |
 | Test.java:652:24:652:48 | (...)... : BufferedReader | Test.java:653:4:653:5 | in : BufferedReader | provenance |  |
 | Test.java:652:41:652:48 | source(...) : Object | Test.java:652:24:652:48 | (...)... : BufferedReader | provenance |  |
-| Test.java:653:4:653:5 | in : BufferedReader | Test.java:653:12:653:14 | out [post update] : char[] | provenance | MaD:38 |
+| Test.java:653:4:653:5 | in : BufferedReader | Test.java:653:12:653:14 | out [post update] : char[] | provenance | MaD:39 |
 | Test.java:653:12:653:14 | out [post update] : char[] | Test.java:654:9:654:11 | out | provenance |  |
 | Test.java:659:25:659:50 | (...)... : CharArrayReader | Test.java:660:4:660:5 | in : CharArrayReader | provenance |  |
 | Test.java:659:43:659:50 | source(...) : Object | Test.java:659:25:659:50 | (...)... : CharArrayReader | provenance |  |
-| Test.java:660:4:660:5 | in : CharArrayReader | Test.java:660:12:660:14 | out [post update] : char[] | provenance | MaD:38 |
+| Test.java:660:4:660:5 | in : CharArrayReader | Test.java:660:12:660:14 | out [post update] : char[] | provenance | MaD:39 |
 | Test.java:660:12:660:14 | out [post update] : char[] | Test.java:661:9:661:11 | out | provenance |  |
 | Test.java:666:27:666:54 | (...)... : InputStreamReader | Test.java:667:4:667:5 | in : InputStreamReader | provenance |  |
 | Test.java:666:47:666:54 | source(...) : Object | Test.java:666:27:666:54 | (...)... : InputStreamReader | provenance |  |
-| Test.java:667:4:667:5 | in : InputStreamReader | Test.java:667:12:667:14 | out [post update] : char[] | provenance | MaD:38 |
+| Test.java:667:4:667:5 | in : InputStreamReader | Test.java:667:12:667:14 | out [post update] : char[] | provenance | MaD:39 |
 | Test.java:667:12:667:14 | out [post update] : char[] | Test.java:668:9:668:11 | out | provenance |  |
 | Test.java:673:16:673:32 | (...)... : Reader | Test.java:674:4:674:5 | in : Reader | provenance |  |
 | Test.java:673:25:673:32 | source(...) : Object | Test.java:673:16:673:32 | (...)... : Reader | provenance |  |
-| Test.java:674:4:674:5 | in : Reader | Test.java:674:12:674:14 | out [post update] : char[] | provenance | MaD:38 |
+| Test.java:674:4:674:5 | in : Reader | Test.java:674:12:674:14 | out [post update] : char[] | provenance | MaD:39 |
 | Test.java:674:12:674:14 | out [post update] : char[] | Test.java:675:9:675:11 | out | provenance |  |
 | Test.java:680:16:680:32 | (...)... : Reader | Test.java:681:4:681:5 | in : Reader | provenance |  |
 | Test.java:680:25:680:32 | source(...) : Object | Test.java:680:16:680:32 | (...)... : Reader | provenance |  |
-| Test.java:681:4:681:5 | in : Reader | Test.java:681:12:681:14 | out [post update] : char[] | provenance | MaD:38 |
+| Test.java:681:4:681:5 | in : Reader | Test.java:681:12:681:14 | out [post update] : char[] | provenance | MaD:39 |
 | Test.java:681:12:681:14 | out [post update] : char[] | Test.java:682:9:682:11 | out | provenance |  |
 | Test.java:687:22:687:44 | (...)... : StringReader | Test.java:688:4:688:5 | in : StringReader | provenance |  |
 | Test.java:687:37:687:44 | source(...) : Object | Test.java:687:22:687:44 | (...)... : StringReader | provenance |  |
-| Test.java:688:4:688:5 | in : StringReader | Test.java:688:12:688:14 | out [post update] : char[] | provenance | MaD:38 |
+| Test.java:688:4:688:5 | in : StringReader | Test.java:688:12:688:14 | out [post update] : char[] | provenance | MaD:39 |
 | Test.java:688:12:688:14 | out [post update] : char[] | Test.java:689:9:689:11 | out | provenance |  |
 | Test.java:694:16:694:32 | (...)... : String | Test.java:695:27:695:28 | in : String | provenance |  |
 | Test.java:694:25:694:32 | source(...) : Object | Test.java:694:16:694:32 | (...)... : String | provenance |  |
 | Test.java:695:10:695:29 | new StringReader(...) : StringReader | Test.java:696:9:696:11 | out | provenance |  |
-| Test.java:695:27:695:28 | in : String | Test.java:695:10:695:29 | new StringReader(...) : StringReader | provenance | MaD:39 |
+| Test.java:695:27:695:28 | in : String | Test.java:695:10:695:29 | new StringReader(...) : StringReader | provenance | MaD:40 |
 | Test.java:701:16:701:32 | (...)... : String | Test.java:702:14:702:15 | in : String | provenance |  |
 | Test.java:701:25:701:32 | source(...) : Object | Test.java:701:16:701:32 | (...)... : String | provenance |  |
 | Test.java:702:4:702:6 | out [post update] : CharArrayWriter | Test.java:703:9:703:11 | out | provenance |  |
-| Test.java:702:14:702:15 | in : String | Test.java:702:4:702:6 | out [post update] : CharArrayWriter | provenance | MaD:40 |
+| Test.java:702:14:702:15 | in : String | Test.java:702:4:702:6 | out [post update] : CharArrayWriter | provenance | MaD:41 |
 | Test.java:708:16:708:32 | (...)... : char[] | Test.java:709:14:709:15 | in : char[] | provenance |  |
 | Test.java:708:25:708:32 | source(...) : Object | Test.java:708:16:708:32 | (...)... : char[] | provenance |  |
 | Test.java:709:4:709:6 | out [post update] : CharArrayWriter | Test.java:710:9:710:11 | out | provenance |  |
-| Test.java:709:14:709:15 | in : char[] | Test.java:709:4:709:6 | out [post update] : CharArrayWriter | provenance | MaD:40 |
+| Test.java:709:14:709:15 | in : char[] | Test.java:709:4:709:6 | out [post update] : CharArrayWriter | provenance | MaD:41 |
 | Test.java:715:13:715:26 | (...)... : Number | Test.java:716:14:716:15 | in : Number | provenance |  |
 | Test.java:715:19:715:26 | source(...) : Object | Test.java:715:13:715:26 | (...)... : Number | provenance |  |
 | Test.java:716:4:716:6 | out [post update] : CharArrayWriter | Test.java:717:9:717:11 | out | provenance |  |
-| Test.java:716:14:716:15 | in : Number | Test.java:716:4:716:6 | out [post update] : CharArrayWriter | provenance | MaD:40 |
+| Test.java:716:14:716:15 | in : Number | Test.java:716:4:716:6 | out [post update] : CharArrayWriter | provenance | MaD:41 |
 | Test.java:722:16:722:32 | (...)... : String | Test.java:723:14:723:15 | in : String | provenance |  |
 | Test.java:722:25:722:32 | source(...) : Object | Test.java:722:16:722:32 | (...)... : String | provenance |  |
 | Test.java:723:4:723:6 | out [post update] : PrintWriter | Test.java:724:9:724:11 | out | provenance |  |
-| Test.java:723:14:723:15 | in : String | Test.java:723:4:723:6 | out [post update] : PrintWriter | provenance | MaD:40 |
+| Test.java:723:14:723:15 | in : String | Test.java:723:4:723:6 | out [post update] : PrintWriter | provenance | MaD:41 |
 | Test.java:729:16:729:32 | (...)... : String | Test.java:730:14:730:15 | in : String | provenance |  |
 | Test.java:729:25:729:32 | source(...) : Object | Test.java:729:16:729:32 | (...)... : String | provenance |  |
 | Test.java:730:4:730:6 | out [post update] : PrintWriter | Test.java:731:9:731:11 | out | provenance |  |
-| Test.java:730:14:730:15 | in : String | Test.java:730:4:730:6 | out [post update] : PrintWriter | provenance | MaD:40 |
+| Test.java:730:14:730:15 | in : String | Test.java:730:4:730:6 | out [post update] : PrintWriter | provenance | MaD:41 |
 | Test.java:736:16:736:32 | (...)... : char[] | Test.java:737:14:737:15 | in : char[] | provenance |  |
 | Test.java:736:25:736:32 | source(...) : Object | Test.java:736:16:736:32 | (...)... : char[] | provenance |  |
 | Test.java:737:4:737:6 | out [post update] : PrintWriter | Test.java:738:9:738:11 | out | provenance |  |
-| Test.java:737:14:737:15 | in : char[] | Test.java:737:4:737:6 | out [post update] : PrintWriter | provenance | MaD:40 |
+| Test.java:737:14:737:15 | in : char[] | Test.java:737:4:737:6 | out [post update] : PrintWriter | provenance | MaD:41 |
 | Test.java:743:16:743:32 | (...)... : char[] | Test.java:744:14:744:15 | in : char[] | provenance |  |
 | Test.java:743:25:743:32 | source(...) : Object | Test.java:743:16:743:32 | (...)... : char[] | provenance |  |
 | Test.java:744:4:744:6 | out [post update] : PrintWriter | Test.java:745:9:745:11 | out | provenance |  |
-| Test.java:744:14:744:15 | in : char[] | Test.java:744:4:744:6 | out [post update] : PrintWriter | provenance | MaD:40 |
+| Test.java:744:14:744:15 | in : char[] | Test.java:744:4:744:6 | out [post update] : PrintWriter | provenance | MaD:41 |
 | Test.java:750:13:750:26 | (...)... : Number | Test.java:751:14:751:15 | in : Number | provenance |  |
 | Test.java:750:19:750:26 | source(...) : Object | Test.java:750:13:750:26 | (...)... : Number | provenance |  |
 | Test.java:751:4:751:6 | out [post update] : PrintWriter | Test.java:752:9:752:11 | out | provenance |  |
-| Test.java:751:14:751:15 | in : Number | Test.java:751:4:751:6 | out [post update] : PrintWriter | provenance | MaD:40 |
+| Test.java:751:14:751:15 | in : Number | Test.java:751:4:751:6 | out [post update] : PrintWriter | provenance | MaD:41 |
 | Test.java:757:16:757:32 | (...)... : String | Test.java:758:14:758:15 | in : String | provenance |  |
 | Test.java:757:25:757:32 | source(...) : Object | Test.java:757:16:757:32 | (...)... : String | provenance |  |
 | Test.java:758:4:758:6 | out [post update] : Writer | Test.java:759:9:759:11 | out | provenance |  |
-| Test.java:758:14:758:15 | in : String | Test.java:758:4:758:6 | out [post update] : Writer | provenance | MaD:40 |
+| Test.java:758:14:758:15 | in : String | Test.java:758:4:758:6 | out [post update] : Writer | provenance | MaD:41 |
 | Test.java:764:16:764:32 | (...)... : String | Test.java:765:14:765:15 | in : String | provenance |  |
 | Test.java:764:25:764:32 | source(...) : Object | Test.java:764:16:764:32 | (...)... : String | provenance |  |
 | Test.java:765:4:765:6 | out [post update] : Writer | Test.java:766:9:766:11 | out | provenance |  |
-| Test.java:765:14:765:15 | in : String | Test.java:765:4:765:6 | out [post update] : Writer | provenance | MaD:40 |
+| Test.java:765:14:765:15 | in : String | Test.java:765:4:765:6 | out [post update] : Writer | provenance | MaD:41 |
 | Test.java:771:16:771:32 | (...)... : char[] | Test.java:772:14:772:15 | in : char[] | provenance |  |
 | Test.java:771:25:771:32 | source(...) : Object | Test.java:771:16:771:32 | (...)... : char[] | provenance |  |
 | Test.java:772:4:772:6 | out [post update] : Writer | Test.java:773:9:773:11 | out | provenance |  |
-| Test.java:772:14:772:15 | in : char[] | Test.java:772:4:772:6 | out [post update] : Writer | provenance | MaD:40 |
+| Test.java:772:14:772:15 | in : char[] | Test.java:772:4:772:6 | out [post update] : Writer | provenance | MaD:41 |
 | Test.java:778:16:778:32 | (...)... : char[] | Test.java:779:14:779:15 | in : char[] | provenance |  |
 | Test.java:778:25:778:32 | source(...) : Object | Test.java:778:16:778:32 | (...)... : char[] | provenance |  |
 | Test.java:779:4:779:6 | out [post update] : Writer | Test.java:780:9:780:11 | out | provenance |  |
-| Test.java:779:14:779:15 | in : char[] | Test.java:779:4:779:6 | out [post update] : Writer | provenance | MaD:40 |
+| Test.java:779:14:779:15 | in : char[] | Test.java:779:4:779:6 | out [post update] : Writer | provenance | MaD:41 |
 | Test.java:785:13:785:26 | (...)... : Number | Test.java:786:14:786:15 | in : Number | provenance |  |
 | Test.java:785:19:785:26 | source(...) : Object | Test.java:785:13:785:26 | (...)... : Number | provenance |  |
 | Test.java:786:4:786:6 | out [post update] : Writer | Test.java:787:9:787:11 | out | provenance |  |
-| Test.java:786:14:786:15 | in : Number | Test.java:786:4:786:6 | out [post update] : Writer | provenance | MaD:40 |
+| Test.java:786:14:786:15 | in : Number | Test.java:786:4:786:6 | out [post update] : Writer | provenance | MaD:41 |
 nodes
 | Test.java:50:21:50:42 | (...)... : InputStream | semmle.label | (...)... : InputStream |
 | Test.java:50:35:50:42 | source(...) : Object | semmle.label | source(...) : Object |
diff --git a/java/ql/test/library-tests/frameworks/jdk/java.net/test.expected b/java/ql/test/library-tests/frameworks/jdk/java.net/test.expected
index 1e386a76c8f..c8293d3c00a 100644
--- a/java/ql/test/library-tests/frameworks/jdk/java.net/test.expected
+++ b/java/ql/test/library-tests/frameworks/jdk/java.net/test.expected
@@ -1,7 +1,7 @@
 models
 | 1 | Summary: java.net; InetAddress; true; getByName; (String); ; Argument[0]; ReturnValue; taint; ai-manual |
-| 2 | Summary: java.net; InetSocketAddress; true; createUnresolved; (String,int); ; Argument[0]; ReturnValue; taint; ai-manual |
-| 3 | Summary: java.net; InetSocketAddress; true; InetSocketAddress; (String,int); ; Argument[0]; Argument[this]; taint; ai-manual |
+| 2 | Summary: java.net; InetSocketAddress; true; InetSocketAddress; (String,int); ; Argument[0]; Argument[this]; taint; ai-manual |
+| 3 | Summary: java.net; InetSocketAddress; true; createUnresolved; (String,int); ; Argument[0]; ReturnValue; taint; ai-manual |
 | 4 | Summary: java.net; URI; false; URI; (String); ; Argument[0]; Argument[this]; taint; manual |
 | 5 | Summary: java.net; URI; false; create; ; ; Argument[0]; ReturnValue; taint; manual |
 | 6 | Summary: java.net; URI; false; resolve; (String); ; Argument[0]; ReturnValue; taint; ai-manual |
@@ -9,10 +9,10 @@ models
 | 8 | Summary: java.net; URI; false; toASCIIString; ; ; Argument[this]; ReturnValue; taint; manual |
 | 9 | Summary: java.net; URI; false; toString; ; ; Argument[this]; ReturnValue; taint; manual |
 | 10 | Summary: java.net; URI; false; toURL; ; ; Argument[this]; ReturnValue; taint; manual |
-| 11 | Summary: java.net; URL; false; getPath; (); ; Argument[this].SyntheticField[java.net.URL.path]; ReturnValue; taint; ai-manual |
-| 12 | Summary: java.net; URL; false; URL; (String); ; Argument[0]; Argument[this]; taint; manual |
-| 13 | Summary: java.net; URL; false; URL; (URL,String); ; Argument[0]; Argument[this]; taint; ai-manual |
-| 14 | Summary: java.net; URL; false; URL; (URL,String); ; Argument[1]; Argument[this]; taint; ai-manual |
+| 11 | Summary: java.net; URL; false; URL; (String); ; Argument[0]; Argument[this]; taint; manual |
+| 12 | Summary: java.net; URL; false; URL; (URL,String); ; Argument[0]; Argument[this]; taint; ai-manual |
+| 13 | Summary: java.net; URL; false; URL; (URL,String); ; Argument[1]; Argument[this]; taint; ai-manual |
+| 14 | Summary: java.net; URL; false; getPath; (); ; Argument[this].SyntheticField[java.net.URL.path]; ReturnValue; taint; ai-manual |
 | 15 | Summary: java.net; URL; false; toExternalForm; ; ; Argument[this]; ReturnValue; taint; manual |
 | 16 | Summary: java.net; URL; false; toURI; ; ; Argument[this]; ReturnValue; taint; manual |
 | 17 | Summary: java.net; URLDecoder; false; decode; ; ; Argument[0]; ReturnValue; taint; manual |
@@ -24,11 +24,11 @@ edges
 | Test.java:31:16:31:32 | (...)... : String | Test.java:32:32:32:33 | in : String | provenance |  |
 | Test.java:31:25:31:32 | source(...) : Object | Test.java:31:16:31:32 | (...)... : String | provenance |  |
 | Test.java:32:10:32:37 | new InetSocketAddress(...) : InetSocketAddress | Test.java:33:9:33:11 | out | provenance |  |
-| Test.java:32:32:32:33 | in : String | Test.java:32:10:32:37 | new InetSocketAddress(...) : InetSocketAddress | provenance | MaD:3 |
+| Test.java:32:32:32:33 | in : String | Test.java:32:10:32:37 | new InetSocketAddress(...) : InetSocketAddress | provenance | MaD:2 |
 | Test.java:38:16:38:32 | (...)... : String | Test.java:39:45:39:46 | in : String | provenance |  |
 | Test.java:38:25:38:32 | source(...) : Object | Test.java:38:16:38:32 | (...)... : String | provenance |  |
 | Test.java:39:10:39:50 | createUnresolved(...) : InetSocketAddress | Test.java:40:9:40:11 | out | provenance |  |
-| Test.java:39:45:39:46 | in : String | Test.java:39:10:39:50 | createUnresolved(...) : InetSocketAddress | provenance | MaD:2 |
+| Test.java:39:45:39:46 | in : String | Test.java:39:10:39:50 | createUnresolved(...) : InetSocketAddress | provenance | MaD:3 |
 | Test.java:45:16:45:32 | (...)... : String | Test.java:46:18:46:19 | in : String | provenance |  |
 | Test.java:45:25:45:32 | source(...) : Object | Test.java:45:16:45:32 | (...)... : String | provenance |  |
 | Test.java:46:10:46:20 | new URI(...) : URI | Test.java:47:9:47:11 | out | provenance |  |
@@ -61,24 +61,24 @@ edges
 | Test.java:97:19:97:26 | source(...) : Object | Test.java:97:13:97:26 | (...)... : URI | provenance |  |
 | Test.java:98:10:98:11 | in : URI | Test.java:98:10:98:19 | toURL(...) : URL | provenance | MaD:10 |
 | Test.java:98:10:98:19 | toURL(...) : URL | Test.java:99:9:99:11 | out : URL | provenance |  |
-| Test.java:99:9:99:11 | out : URL | Test.java:99:9:99:21 | getPath(...) | provenance | MaD:11 |
+| Test.java:99:9:99:11 | out : URL | Test.java:99:9:99:21 | getPath(...) | provenance | MaD:14 |
 | Test.java:104:16:104:32 | (...)... : String | Test.java:105:18:105:19 | in : String | provenance |  |
 | Test.java:104:25:104:32 | source(...) : Object | Test.java:104:16:104:32 | (...)... : String | provenance |  |
 | Test.java:105:10:105:20 | new URL(...) : URL | Test.java:106:9:106:11 | out | provenance |  |
-| Test.java:105:18:105:19 | in : String | Test.java:105:10:105:20 | new URL(...) : URL | provenance | MaD:12 |
+| Test.java:105:18:105:19 | in : String | Test.java:105:10:105:20 | new URL(...) : URL | provenance | MaD:11 |
 | Test.java:112:16:112:32 | (...)... : String | Test.java:113:18:113:19 | in : String | provenance |  |
 | Test.java:112:25:112:32 | source(...) : Object | Test.java:112:16:112:32 | (...)... : String | provenance |  |
 | Test.java:113:10:113:20 | new URL(...) : URL | Test.java:114:9:114:11 | out : URL | provenance |  |
-| Test.java:113:18:113:19 | in : String | Test.java:113:10:113:20 | new URL(...) : URL | provenance | MaD:12 |
-| Test.java:114:9:114:11 | out : URL | Test.java:114:9:114:21 | getPath(...) | provenance | MaD:11 |
+| Test.java:113:18:113:19 | in : String | Test.java:113:10:113:20 | new URL(...) : URL | provenance | MaD:11 |
+| Test.java:114:9:114:11 | out : URL | Test.java:114:9:114:21 | getPath(...) | provenance | MaD:14 |
 | Test.java:119:13:119:26 | (...)... : URL | Test.java:120:18:120:19 | in : URL | provenance |  |
 | Test.java:119:19:119:26 | source(...) : Object | Test.java:119:13:119:26 | (...)... : URL | provenance |  |
 | Test.java:120:10:120:26 | new URL(...) : URL | Test.java:121:9:121:11 | out | provenance |  |
-| Test.java:120:18:120:19 | in : URL | Test.java:120:10:120:26 | new URL(...) : URL | provenance | MaD:13 |
+| Test.java:120:18:120:19 | in : URL | Test.java:120:10:120:26 | new URL(...) : URL | provenance | MaD:12 |
 | Test.java:126:16:126:32 | (...)... : String | Test.java:127:24:127:25 | in : String | provenance |  |
 | Test.java:126:25:126:32 | source(...) : Object | Test.java:126:16:126:32 | (...)... : String | provenance |  |
 | Test.java:127:10:127:26 | new URL(...) : URL | Test.java:128:9:128:11 | out | provenance |  |
-| Test.java:127:24:127:25 | in : String | Test.java:127:10:127:26 | new URL(...) : URL | provenance | MaD:14 |
+| Test.java:127:24:127:25 | in : String | Test.java:127:10:127:26 | new URL(...) : URL | provenance | MaD:13 |
 | Test.java:133:13:133:26 | (...)... : URL | Test.java:134:10:134:11 | in : URL | provenance |  |
 | Test.java:133:19:133:26 | source(...) : Object | Test.java:133:13:133:26 | (...)... : URL | provenance |  |
 | Test.java:134:10:134:11 | in : URL | Test.java:134:10:134:28 | toExternalForm(...) : String | provenance | MaD:15 |
diff --git a/java/ql/test/library-tests/frameworks/jdk/java.nio.file/test.expected b/java/ql/test/library-tests/frameworks/jdk/java.nio.file/test.expected
index 16cd0040eb2..a9be7646e77 100644
--- a/java/ql/test/library-tests/frameworks/jdk/java.nio.file/test.expected
+++ b/java/ql/test/library-tests/frameworks/jdk/java.nio.file/test.expected
@@ -1,11 +1,11 @@
 models
 | 1 | Summary: java.nio.file; FileSystem; true; getPath; (String,String[]); ; Argument[0]; ReturnValue; taint; manual |
-| 2 | Summary: java.nio.file; Path; true; getParent; ; ; Argument[this]; ReturnValue; taint; manual |
-| 3 | Summary: java.nio.file; Path; true; normalize; ; ; Argument[this]; ReturnValue; taint; manual |
-| 4 | Summary: java.nio.file; Path; true; resolve; ; ; Argument[0]; ReturnValue; taint; manual |
-| 5 | Summary: java.nio.file; Path; true; resolve; ; ; Argument[this]; ReturnValue; taint; manual |
-| 6 | Summary: java.nio.file; Path; true; toAbsolutePath; ; ; Argument[this]; ReturnValue; taint; manual |
-| 7 | Summary: java.nio.file; Path; false; toFile; ; ; Argument[this]; ReturnValue; taint; manual |
+| 2 | Summary: java.nio.file; Path; false; toFile; ; ; Argument[this]; ReturnValue; taint; manual |
+| 3 | Summary: java.nio.file; Path; true; getParent; ; ; Argument[this]; ReturnValue; taint; manual |
+| 4 | Summary: java.nio.file; Path; true; normalize; ; ; Argument[this]; ReturnValue; taint; manual |
+| 5 | Summary: java.nio.file; Path; true; resolve; ; ; Argument[0]; ReturnValue; taint; manual |
+| 6 | Summary: java.nio.file; Path; true; resolve; ; ; Argument[this]; ReturnValue; taint; manual |
+| 7 | Summary: java.nio.file; Path; true; toAbsolutePath; ; ; Argument[this]; ReturnValue; taint; manual |
 | 8 | Summary: java.nio.file; Path; true; toString; ; ; Argument[this]; ReturnValue; taint; manual |
 | 9 | Summary: java.nio.file; Path; true; toUri; ; ; Argument[this]; ReturnValue; taint; manual |
 | 10 | Summary: java.nio.file; Paths; true; get; ; ; Argument[0]; ReturnValue; taint; manual |
@@ -17,35 +17,35 @@ edges
 | Test.java:25:27:25:28 | in : String | Test.java:25:10:25:46 | getPath(...) : Path | provenance | MaD:1 |
 | Test.java:31:14:31:28 | (...)... : Path | Test.java:32:10:32:11 | in : Path | provenance |  |
 | Test.java:31:21:31:28 | source(...) : Object | Test.java:31:14:31:28 | (...)... : Path | provenance |  |
-| Test.java:32:10:32:11 | in : Path | Test.java:32:10:32:20 | toFile(...) : File | provenance | MaD:7 |
+| Test.java:32:10:32:11 | in : Path | Test.java:32:10:32:20 | toFile(...) : File | provenance | MaD:2 |
 | Test.java:32:10:32:20 | toFile(...) : File | Test.java:33:9:33:11 | out | provenance |  |
 | Test.java:38:14:38:28 | (...)... : Path | Test.java:39:10:39:11 | in : Path | provenance |  |
 | Test.java:38:21:38:28 | source(...) : Object | Test.java:38:14:38:28 | (...)... : Path | provenance |  |
-| Test.java:39:10:39:11 | in : Path | Test.java:39:10:39:23 | getParent(...) : Path | provenance | MaD:2 |
+| Test.java:39:10:39:11 | in : Path | Test.java:39:10:39:23 | getParent(...) : Path | provenance | MaD:3 |
 | Test.java:39:10:39:23 | getParent(...) : Path | Test.java:40:9:40:11 | out | provenance |  |
 | Test.java:45:14:45:28 | (...)... : Path | Test.java:46:10:46:11 | in : Path | provenance |  |
 | Test.java:45:21:45:28 | source(...) : Object | Test.java:45:14:45:28 | (...)... : Path | provenance |  |
-| Test.java:46:10:46:11 | in : Path | Test.java:46:10:46:23 | normalize(...) : Path | provenance | MaD:3 |
+| Test.java:46:10:46:11 | in : Path | Test.java:46:10:46:23 | normalize(...) : Path | provenance | MaD:4 |
 | Test.java:46:10:46:23 | normalize(...) : Path | Test.java:47:9:47:11 | out | provenance |  |
 | Test.java:52:14:52:28 | (...)... : Path | Test.java:54:27:54:28 | in : Path | provenance |  |
 | Test.java:52:21:52:28 | source(...) : Object | Test.java:52:14:52:28 | (...)... : Path | provenance |  |
 | Test.java:54:10:54:29 | resolve(...) : Path | Test.java:55:9:55:11 | out | provenance |  |
-| Test.java:54:27:54:28 | in : Path | Test.java:54:10:54:29 | resolve(...) : Path | provenance | MaD:4 |
+| Test.java:54:27:54:28 | in : Path | Test.java:54:10:54:29 | resolve(...) : Path | provenance | MaD:5 |
 | Test.java:60:14:60:28 | (...)... : Path | Test.java:61:10:61:11 | in : Path | provenance |  |
 | Test.java:60:21:60:28 | source(...) : Object | Test.java:60:14:60:28 | (...)... : Path | provenance |  |
-| Test.java:61:10:61:11 | in : Path | Test.java:61:10:61:32 | resolve(...) : Path | provenance | MaD:5 |
+| Test.java:61:10:61:11 | in : Path | Test.java:61:10:61:32 | resolve(...) : Path | provenance | MaD:6 |
 | Test.java:61:10:61:32 | resolve(...) : Path | Test.java:62:9:62:11 | out | provenance |  |
 | Test.java:67:14:67:28 | (...)... : Path | Test.java:68:10:68:11 | in : Path | provenance |  |
 | Test.java:67:21:67:28 | source(...) : Object | Test.java:67:14:67:28 | (...)... : Path | provenance |  |
-| Test.java:68:10:68:11 | in : Path | Test.java:68:10:68:34 | resolve(...) : Path | provenance | MaD:5 |
+| Test.java:68:10:68:11 | in : Path | Test.java:68:10:68:34 | resolve(...) : Path | provenance | MaD:6 |
 | Test.java:68:10:68:34 | resolve(...) : Path | Test.java:69:9:69:11 | out | provenance |  |
 | Test.java:74:16:74:32 | (...)... : String | Test.java:76:27:76:28 | in : String | provenance |  |
 | Test.java:74:25:74:32 | source(...) : Object | Test.java:74:16:74:32 | (...)... : String | provenance |  |
 | Test.java:76:10:76:29 | resolve(...) : Path | Test.java:77:9:77:11 | out | provenance |  |
-| Test.java:76:27:76:28 | in : String | Test.java:76:10:76:29 | resolve(...) : Path | provenance | MaD:4 |
+| Test.java:76:27:76:28 | in : String | Test.java:76:10:76:29 | resolve(...) : Path | provenance | MaD:5 |
 | Test.java:82:14:82:28 | (...)... : Path | Test.java:83:10:83:11 | in : Path | provenance |  |
 | Test.java:82:21:82:28 | source(...) : Object | Test.java:82:14:82:28 | (...)... : Path | provenance |  |
-| Test.java:83:10:83:11 | in : Path | Test.java:83:10:83:28 | toAbsolutePath(...) : Path | provenance | MaD:6 |
+| Test.java:83:10:83:11 | in : Path | Test.java:83:10:83:28 | toAbsolutePath(...) : Path | provenance | MaD:7 |
 | Test.java:83:10:83:28 | toAbsolutePath(...) : Path | Test.java:84:9:84:11 | out | provenance |  |
 | Test.java:89:14:89:28 | (...)... : Path | Test.java:90:10:90:11 | in : Path | provenance |  |
 | Test.java:89:21:89:28 | source(...) : Object | Test.java:89:14:89:28 | (...)... : Path | provenance |  |
diff --git a/java/ql/test/library-tests/frameworks/jms/FlowTest.ql b/java/ql/test/library-tests/frameworks/jms/FlowTest.ql
index b203bc93682..b63aedbf984 100644
--- a/java/ql/test/library-tests/frameworks/jms/FlowTest.ql
+++ b/java/ql/test/library-tests/frameworks/jms/FlowTest.ql
@@ -3,7 +3,7 @@ import semmle.code.java.dataflow.FlowSources
 import TestUtilities.InlineExpectationsTest
 
 module TestConfig implements DataFlow::ConfigSig {
-  predicate isSource(DataFlow::Node source) { source instanceof ThreatModelFlowSource }
+  predicate isSource(DataFlow::Node source) { source instanceof ActiveThreatModelSource }
 
   predicate isSink(DataFlow::Node sink) {
     exists(MethodCall call |
diff --git a/java/ql/test/library-tests/frameworks/json-java/test.expected b/java/ql/test/library-tests/frameworks/json-java/test.expected
index c1e052f26e2..7aa0dc43106 100644
--- a/java/ql/test/library-tests/frameworks/json-java/test.expected
+++ b/java/ql/test/library-tests/frameworks/json-java/test.expected
@@ -2,10 +2,10 @@ models
 | 1 | Summary: java.lang; Iterable; true; iterator; (); ; Argument[this].Element; ReturnValue.Element; value; manual |
 | 2 | Summary: java.util; Iterator; true; next; ; ; Argument[this].Element; ReturnValue; value; manual |
 | 3 | Summary: java.util; List; false; of; (Object); ; Argument[0]; ReturnValue.Element; value; manual |
-| 4 | Summary: java.util; Map; true; get; ; ; Argument[this].MapValue; ReturnValue; value; manual |
-| 5 | Summary: java.util; Map; true; keySet; (); ; Argument[this].MapKey; ReturnValue.Element; value; manual |
-| 6 | Summary: java.util; Map; false; of; ; ; Argument[0]; ReturnValue.MapKey; value; manual |
-| 7 | Summary: java.util; Map; false; of; ; ; Argument[1]; ReturnValue.MapValue; value; manual |
+| 4 | Summary: java.util; Map; false; of; ; ; Argument[0]; ReturnValue.MapKey; value; manual |
+| 5 | Summary: java.util; Map; false; of; ; ; Argument[1]; ReturnValue.MapValue; value; manual |
+| 6 | Summary: java.util; Map; true; get; ; ; Argument[this].MapValue; ReturnValue; value; manual |
+| 7 | Summary: java.util; Map; true; keySet; (); ; Argument[this].MapKey; ReturnValue.Element; value; manual |
 | 8 | Summary: org.json; CDL; false; rowToJSONArray; ; ; Argument[0]; ReturnValue; taint; manual |
 | 9 | Summary: org.json; CDL; false; rowToJSONObject; ; ; Argument[0..1]; ReturnValue; taint; manual |
 | 10 | Summary: org.json; CDL; false; rowToString; ; ; Argument[0]; ReturnValue; taint; manual |
@@ -41,63 +41,63 @@ models
 | 40 | Summary: org.json; JSONArray; false; getNumber; ; ; Argument[this]; ReturnValue; taint; manual |
 | 41 | Summary: org.json; JSONArray; false; getString; ; ; Argument[this]; ReturnValue; taint; manual |
 | 42 | Summary: org.json; JSONArray; false; iterator; ; ; Argument[this]; ReturnValue.Element; taint; manual |
-| 43 | Summary: org.json; JSONArray; false; join; ; ; Argument[this]; ReturnValue; taint; manual |
-| 44 | Summary: org.json; JSONArray; false; join; ; ; Argument[0]; ReturnValue; taint; manual |
+| 43 | Summary: org.json; JSONArray; false; join; ; ; Argument[0]; ReturnValue; taint; manual |
+| 44 | Summary: org.json; JSONArray; false; join; ; ; Argument[this]; ReturnValue; taint; manual |
 | 45 | Summary: org.json; JSONArray; false; opt; ; ; Argument[this]; ReturnValue; taint; manual |
-| 46 | Summary: org.json; JSONArray; false; optBigDecimal; ; ; Argument[this]; ReturnValue; taint; manual |
-| 47 | Summary: org.json; JSONArray; false; optBigDecimal; ; ; Argument[1]; ReturnValue; value; manual |
-| 48 | Summary: org.json; JSONArray; false; optBigInteger; ; ; Argument[this]; ReturnValue; taint; manual |
-| 49 | Summary: org.json; JSONArray; false; optBigInteger; ; ; Argument[1]; ReturnValue; value; manual |
-| 50 | Summary: org.json; JSONArray; false; optBoolean; ; ; Argument[this]; ReturnValue; taint; manual |
-| 51 | Summary: org.json; JSONArray; false; optBoolean; ; ; Argument[1]; ReturnValue; value; manual |
-| 52 | Summary: org.json; JSONArray; false; optDouble; ; ; Argument[this]; ReturnValue; taint; manual |
-| 53 | Summary: org.json; JSONArray; false; optDouble; ; ; Argument[1]; ReturnValue; value; manual |
-| 54 | Summary: org.json; JSONArray; false; optEnum; ; ; Argument[this]; ReturnValue; taint; manual |
-| 55 | Summary: org.json; JSONArray; false; optEnum; ; ; Argument[2]; ReturnValue; value; manual |
-| 56 | Summary: org.json; JSONArray; false; optFloat; ; ; Argument[this]; ReturnValue; taint; manual |
-| 57 | Summary: org.json; JSONArray; false; optFloat; ; ; Argument[1]; ReturnValue; value; manual |
-| 58 | Summary: org.json; JSONArray; false; optInt; ; ; Argument[this]; ReturnValue; taint; manual |
-| 59 | Summary: org.json; JSONArray; false; optInt; ; ; Argument[1]; ReturnValue; value; manual |
+| 46 | Summary: org.json; JSONArray; false; optBigDecimal; ; ; Argument[1]; ReturnValue; value; manual |
+| 47 | Summary: org.json; JSONArray; false; optBigDecimal; ; ; Argument[this]; ReturnValue; taint; manual |
+| 48 | Summary: org.json; JSONArray; false; optBigInteger; ; ; Argument[1]; ReturnValue; value; manual |
+| 49 | Summary: org.json; JSONArray; false; optBigInteger; ; ; Argument[this]; ReturnValue; taint; manual |
+| 50 | Summary: org.json; JSONArray; false; optBoolean; ; ; Argument[1]; ReturnValue; value; manual |
+| 51 | Summary: org.json; JSONArray; false; optBoolean; ; ; Argument[this]; ReturnValue; taint; manual |
+| 52 | Summary: org.json; JSONArray; false; optDouble; ; ; Argument[1]; ReturnValue; value; manual |
+| 53 | Summary: org.json; JSONArray; false; optDouble; ; ; Argument[this]; ReturnValue; taint; manual |
+| 54 | Summary: org.json; JSONArray; false; optEnum; ; ; Argument[2]; ReturnValue; value; manual |
+| 55 | Summary: org.json; JSONArray; false; optEnum; ; ; Argument[this]; ReturnValue; taint; manual |
+| 56 | Summary: org.json; JSONArray; false; optFloat; ; ; Argument[1]; ReturnValue; value; manual |
+| 57 | Summary: org.json; JSONArray; false; optFloat; ; ; Argument[this]; ReturnValue; taint; manual |
+| 58 | Summary: org.json; JSONArray; false; optInt; ; ; Argument[1]; ReturnValue; value; manual |
+| 59 | Summary: org.json; JSONArray; false; optInt; ; ; Argument[this]; ReturnValue; taint; manual |
 | 60 | Summary: org.json; JSONArray; false; optJSONArray; ; ; Argument[this]; ReturnValue; taint; manual |
 | 61 | Summary: org.json; JSONArray; false; optJSONObject; ; ; Argument[this]; ReturnValue; taint; manual |
-| 62 | Summary: org.json; JSONArray; false; optLong; ; ; Argument[this]; ReturnValue; taint; manual |
-| 63 | Summary: org.json; JSONArray; false; optLong; ; ; Argument[1]; ReturnValue; value; manual |
-| 64 | Summary: org.json; JSONArray; false; optNumber; ; ; Argument[this]; ReturnValue; taint; manual |
-| 65 | Summary: org.json; JSONArray; false; optNumber; ; ; Argument[1]; ReturnValue; value; manual |
+| 62 | Summary: org.json; JSONArray; false; optLong; ; ; Argument[1]; ReturnValue; value; manual |
+| 63 | Summary: org.json; JSONArray; false; optLong; ; ; Argument[this]; ReturnValue; taint; manual |
+| 64 | Summary: org.json; JSONArray; false; optNumber; ; ; Argument[1]; ReturnValue; value; manual |
+| 65 | Summary: org.json; JSONArray; false; optNumber; ; ; Argument[this]; ReturnValue; taint; manual |
 | 66 | Summary: org.json; JSONArray; false; optQuery; ; ; Argument[this]; ReturnValue; taint; manual |
-| 67 | Summary: org.json; JSONArray; false; optString; ; ; Argument[this]; ReturnValue; taint; manual |
-| 68 | Summary: org.json; JSONArray; false; optString; ; ; Argument[1]; ReturnValue; value; manual |
-| 69 | Summary: org.json; JSONArray; false; put; ; ; Argument[this]; ReturnValue; value; manual |
-| 70 | Summary: org.json; JSONArray; false; put; (Collection); ; Argument[0].Element; Argument[this]; taint; manual |
-| 71 | Summary: org.json; JSONArray; false; put; (Map); ; Argument[0].MapKey; Argument[this]; taint; manual |
-| 72 | Summary: org.json; JSONArray; false; put; (Map); ; Argument[0].MapValue; Argument[this]; taint; manual |
-| 73 | Summary: org.json; JSONArray; false; put; (Object); ; Argument[0]; Argument[this]; taint; manual |
-| 74 | Summary: org.json; JSONArray; false; put; (boolean); ; Argument[0]; Argument[this]; taint; manual |
-| 75 | Summary: org.json; JSONArray; false; put; (double); ; Argument[0]; Argument[this]; taint; manual |
-| 76 | Summary: org.json; JSONArray; false; put; (float); ; Argument[0]; Argument[this]; taint; manual |
-| 77 | Summary: org.json; JSONArray; false; put; (int); ; Argument[0]; Argument[this]; taint; manual |
-| 78 | Summary: org.json; JSONArray; false; put; (int,Collection); ; Argument[1].Element; Argument[this]; taint; manual |
-| 79 | Summary: org.json; JSONArray; false; put; (int,Map); ; Argument[1].MapKey; Argument[this]; taint; manual |
-| 80 | Summary: org.json; JSONArray; false; put; (int,Map); ; Argument[1].MapValue; Argument[this]; taint; manual |
-| 81 | Summary: org.json; JSONArray; false; put; (int,Object); ; Argument[1]; Argument[this]; taint; manual |
-| 82 | Summary: org.json; JSONArray; false; put; (int,boolean); ; Argument[1]; Argument[this]; taint; manual |
-| 83 | Summary: org.json; JSONArray; false; put; (int,double); ; Argument[1]; Argument[this]; taint; manual |
-| 84 | Summary: org.json; JSONArray; false; put; (int,float); ; Argument[1]; Argument[this]; taint; manual |
-| 85 | Summary: org.json; JSONArray; false; put; (int,int); ; Argument[1]; Argument[this]; taint; manual |
-| 86 | Summary: org.json; JSONArray; false; put; (int,long); ; Argument[1]; Argument[this]; taint; manual |
-| 87 | Summary: org.json; JSONArray; false; put; (long); ; Argument[0]; Argument[this]; taint; manual |
-| 88 | Summary: org.json; JSONArray; false; putAll; ; ; Argument[this]; ReturnValue; value; manual |
-| 89 | Summary: org.json; JSONArray; false; putAll; (Collection); ; Argument[0].Element; Argument[this]; taint; manual |
-| 90 | Summary: org.json; JSONArray; false; putAll; (Iterable); ; Argument[0].Element; Argument[this]; taint; manual |
-| 91 | Summary: org.json; JSONArray; false; putAll; (JSONArray); ; Argument[0]; Argument[this]; taint; manual |
-| 92 | Summary: org.json; JSONArray; false; putAll; (Object); ; Argument[0]; Argument[this]; taint; manual |
+| 67 | Summary: org.json; JSONArray; false; optString; ; ; Argument[1]; ReturnValue; value; manual |
+| 68 | Summary: org.json; JSONArray; false; optString; ; ; Argument[this]; ReturnValue; taint; manual |
+| 69 | Summary: org.json; JSONArray; false; put; (Collection); ; Argument[0].Element; Argument[this]; taint; manual |
+| 70 | Summary: org.json; JSONArray; false; put; (Map); ; Argument[0].MapKey; Argument[this]; taint; manual |
+| 71 | Summary: org.json; JSONArray; false; put; (Map); ; Argument[0].MapValue; Argument[this]; taint; manual |
+| 72 | Summary: org.json; JSONArray; false; put; (Object); ; Argument[0]; Argument[this]; taint; manual |
+| 73 | Summary: org.json; JSONArray; false; put; (boolean); ; Argument[0]; Argument[this]; taint; manual |
+| 74 | Summary: org.json; JSONArray; false; put; (double); ; Argument[0]; Argument[this]; taint; manual |
+| 75 | Summary: org.json; JSONArray; false; put; (float); ; Argument[0]; Argument[this]; taint; manual |
+| 76 | Summary: org.json; JSONArray; false; put; (int); ; Argument[0]; Argument[this]; taint; manual |
+| 77 | Summary: org.json; JSONArray; false; put; (int,Collection); ; Argument[1].Element; Argument[this]; taint; manual |
+| 78 | Summary: org.json; JSONArray; false; put; (int,Map); ; Argument[1].MapKey; Argument[this]; taint; manual |
+| 79 | Summary: org.json; JSONArray; false; put; (int,Map); ; Argument[1].MapValue; Argument[this]; taint; manual |
+| 80 | Summary: org.json; JSONArray; false; put; (int,Object); ; Argument[1]; Argument[this]; taint; manual |
+| 81 | Summary: org.json; JSONArray; false; put; (int,boolean); ; Argument[1]; Argument[this]; taint; manual |
+| 82 | Summary: org.json; JSONArray; false; put; (int,double); ; Argument[1]; Argument[this]; taint; manual |
+| 83 | Summary: org.json; JSONArray; false; put; (int,float); ; Argument[1]; Argument[this]; taint; manual |
+| 84 | Summary: org.json; JSONArray; false; put; (int,int); ; Argument[1]; Argument[this]; taint; manual |
+| 85 | Summary: org.json; JSONArray; false; put; (int,long); ; Argument[1]; Argument[this]; taint; manual |
+| 86 | Summary: org.json; JSONArray; false; put; (long); ; Argument[0]; Argument[this]; taint; manual |
+| 87 | Summary: org.json; JSONArray; false; put; ; ; Argument[this]; ReturnValue; value; manual |
+| 88 | Summary: org.json; JSONArray; false; putAll; (Collection); ; Argument[0].Element; Argument[this]; taint; manual |
+| 89 | Summary: org.json; JSONArray; false; putAll; (Iterable); ; Argument[0].Element; Argument[this]; taint; manual |
+| 90 | Summary: org.json; JSONArray; false; putAll; (JSONArray); ; Argument[0]; Argument[this]; taint; manual |
+| 91 | Summary: org.json; JSONArray; false; putAll; (Object); ; Argument[0]; Argument[this]; taint; manual |
+| 92 | Summary: org.json; JSONArray; false; putAll; ; ; Argument[this]; ReturnValue; value; manual |
 | 93 | Summary: org.json; JSONArray; false; query; ; ; Argument[this]; ReturnValue; taint; manual |
 | 94 | Summary: org.json; JSONArray; false; remove; ; ; Argument[this]; ReturnValue; taint; manual |
-| 95 | Summary: org.json; JSONArray; false; toJSONObject; ; ; Argument[this]; ReturnValue; taint; manual |
-| 96 | Summary: org.json; JSONArray; false; toJSONObject; ; ; Argument[0]; ReturnValue; taint; manual |
+| 95 | Summary: org.json; JSONArray; false; toJSONObject; ; ; Argument[0]; ReturnValue; taint; manual |
+| 96 | Summary: org.json; JSONArray; false; toJSONObject; ; ; Argument[this]; ReturnValue; taint; manual |
 | 97 | Summary: org.json; JSONArray; false; toString; ; ; Argument[0]; ReturnValue; taint; manual |
-| 98 | Summary: org.json; JSONArray; false; write; ; ; Argument[this]; Argument[0]; taint; manual |
-| 99 | Summary: org.json; JSONArray; false; write; ; ; Argument[0]; ReturnValue; value; manual |
+| 98 | Summary: org.json; JSONArray; false; write; ; ; Argument[0]; ReturnValue; value; manual |
+| 99 | Summary: org.json; JSONArray; false; write; ; ; Argument[this]; Argument[0]; taint; manual |
 | 100 | Summary: org.json; JSONML; false; toJSONArray; ; ; Argument[0]; ReturnValue; taint; manual |
 | 101 | Summary: org.json; JSONML; false; toJSONObject; ; ; Argument[0]; ReturnValue; taint; manual |
 | 102 | Summary: org.json; JSONML; false; toString; ; ; Argument[0]; ReturnValue; taint; manual |
@@ -111,10 +111,10 @@ models
 | 110 | Summary: org.json; JSONObject; false; JSONObject; (Object,String[]); ; Argument[1].ArrayElement; Argument[this]; taint; manual |
 | 111 | Summary: org.json; JSONObject; false; JSONObject; (String); ; Argument[0]; Argument[this]; taint; manual |
 | 112 | Summary: org.json; JSONObject; false; JSONObject; (String,Locale); ; Argument[0]; Argument[this]; taint; manual |
-| 113 | Summary: org.json; JSONObject; false; accumulate; ; ; Argument[this]; ReturnValue; value; manual |
-| 114 | Summary: org.json; JSONObject; false; accumulate; ; ; Argument[0..1]; Argument[this]; taint; manual |
-| 115 | Summary: org.json; JSONObject; false; append; ; ; Argument[this]; ReturnValue; value; manual |
-| 116 | Summary: org.json; JSONObject; false; append; ; ; Argument[0..1]; Argument[this]; taint; manual |
+| 113 | Summary: org.json; JSONObject; false; accumulate; ; ; Argument[0..1]; Argument[this]; taint; manual |
+| 114 | Summary: org.json; JSONObject; false; accumulate; ; ; Argument[this]; ReturnValue; value; manual |
+| 115 | Summary: org.json; JSONObject; false; append; ; ; Argument[0..1]; Argument[this]; taint; manual |
+| 116 | Summary: org.json; JSONObject; false; append; ; ; Argument[this]; ReturnValue; value; manual |
 | 117 | Summary: org.json; JSONObject; false; doubleToString; ; ; Argument[0]; ReturnValue; taint; manual |
 | 118 | Summary: org.json; JSONObject; false; get; ; ; Argument[this]; ReturnValue; taint; manual |
 | 119 | Summary: org.json; JSONObject; false; getBigDecimal; ; ; Argument[this]; ReturnValue; taint; manual |
@@ -130,58 +130,58 @@ models
 | 129 | Summary: org.json; JSONObject; false; getNames; ; ; Argument[0]; ReturnValue.ArrayElement; taint; manual |
 | 130 | Summary: org.json; JSONObject; false; getNumber; ; ; Argument[this]; ReturnValue; taint; manual |
 | 131 | Summary: org.json; JSONObject; false; getString; ; ; Argument[this]; ReturnValue; taint; manual |
-| 132 | Summary: org.json; JSONObject; false; increment; ; ; Argument[this]; ReturnValue; value; manual |
-| 133 | Summary: org.json; JSONObject; false; increment; ; ; Argument[0]; Argument[this]; taint; manual |
+| 132 | Summary: org.json; JSONObject; false; increment; ; ; Argument[0]; Argument[this]; taint; manual |
+| 133 | Summary: org.json; JSONObject; false; increment; ; ; Argument[this]; ReturnValue; value; manual |
 | 134 | Summary: org.json; JSONObject; false; keySet; ; ; Argument[this]; ReturnValue.Element; taint; manual |
 | 135 | Summary: org.json; JSONObject; false; keys; ; ; Argument[this]; ReturnValue.Element; taint; manual |
 | 136 | Summary: org.json; JSONObject; false; names; ; ; Argument[this]; ReturnValue; taint; manual |
 | 137 | Summary: org.json; JSONObject; false; numberToString; ; ; Argument[0]; ReturnValue; taint; manual |
 | 138 | Summary: org.json; JSONObject; false; opt; ; ; Argument[this]; ReturnValue; taint; manual |
-| 139 | Summary: org.json; JSONObject; false; optBigDecimal; ; ; Argument[this]; ReturnValue; taint; manual |
-| 140 | Summary: org.json; JSONObject; false; optBigDecimal; ; ; Argument[1]; ReturnValue; value; manual |
-| 141 | Summary: org.json; JSONObject; false; optBigInteger; ; ; Argument[this]; ReturnValue; taint; manual |
-| 142 | Summary: org.json; JSONObject; false; optBigInteger; ; ; Argument[1]; ReturnValue; value; manual |
-| 143 | Summary: org.json; JSONObject; false; optBoolean; ; ; Argument[this]; ReturnValue; taint; manual |
-| 144 | Summary: org.json; JSONObject; false; optBoolean; ; ; Argument[1]; ReturnValue; value; manual |
-| 145 | Summary: org.json; JSONObject; false; optDouble; ; ; Argument[this]; ReturnValue; taint; manual |
-| 146 | Summary: org.json; JSONObject; false; optDouble; ; ; Argument[1]; ReturnValue; value; manual |
-| 147 | Summary: org.json; JSONObject; false; optEnum; ; ; Argument[this]; ReturnValue; taint; manual |
-| 148 | Summary: org.json; JSONObject; false; optEnum; ; ; Argument[2]; ReturnValue; value; manual |
-| 149 | Summary: org.json; JSONObject; false; optFloat; ; ; Argument[this]; ReturnValue; taint; manual |
-| 150 | Summary: org.json; JSONObject; false; optFloat; ; ; Argument[1]; ReturnValue; value; manual |
-| 151 | Summary: org.json; JSONObject; false; optInt; ; ; Argument[this]; ReturnValue; taint; manual |
-| 152 | Summary: org.json; JSONObject; false; optInt; ; ; Argument[1]; ReturnValue; value; manual |
+| 139 | Summary: org.json; JSONObject; false; optBigDecimal; ; ; Argument[1]; ReturnValue; value; manual |
+| 140 | Summary: org.json; JSONObject; false; optBigDecimal; ; ; Argument[this]; ReturnValue; taint; manual |
+| 141 | Summary: org.json; JSONObject; false; optBigInteger; ; ; Argument[1]; ReturnValue; value; manual |
+| 142 | Summary: org.json; JSONObject; false; optBigInteger; ; ; Argument[this]; ReturnValue; taint; manual |
+| 143 | Summary: org.json; JSONObject; false; optBoolean; ; ; Argument[1]; ReturnValue; value; manual |
+| 144 | Summary: org.json; JSONObject; false; optBoolean; ; ; Argument[this]; ReturnValue; taint; manual |
+| 145 | Summary: org.json; JSONObject; false; optDouble; ; ; Argument[1]; ReturnValue; value; manual |
+| 146 | Summary: org.json; JSONObject; false; optDouble; ; ; Argument[this]; ReturnValue; taint; manual |
+| 147 | Summary: org.json; JSONObject; false; optEnum; ; ; Argument[2]; ReturnValue; value; manual |
+| 148 | Summary: org.json; JSONObject; false; optEnum; ; ; Argument[this]; ReturnValue; taint; manual |
+| 149 | Summary: org.json; JSONObject; false; optFloat; ; ; Argument[1]; ReturnValue; value; manual |
+| 150 | Summary: org.json; JSONObject; false; optFloat; ; ; Argument[this]; ReturnValue; taint; manual |
+| 151 | Summary: org.json; JSONObject; false; optInt; ; ; Argument[1]; ReturnValue; value; manual |
+| 152 | Summary: org.json; JSONObject; false; optInt; ; ; Argument[this]; ReturnValue; taint; manual |
 | 153 | Summary: org.json; JSONObject; false; optJSONArray; ; ; Argument[this]; ReturnValue; taint; manual |
 | 154 | Summary: org.json; JSONObject; false; optJSONObject; ; ; Argument[this]; ReturnValue; taint; manual |
-| 155 | Summary: org.json; JSONObject; false; optLong; ; ; Argument[this]; ReturnValue; taint; manual |
-| 156 | Summary: org.json; JSONObject; false; optLong; ; ; Argument[1]; ReturnValue; value; manual |
-| 157 | Summary: org.json; JSONObject; false; optNumber; ; ; Argument[this]; ReturnValue; taint; manual |
-| 158 | Summary: org.json; JSONObject; false; optNumber; ; ; Argument[1]; ReturnValue; value; manual |
+| 155 | Summary: org.json; JSONObject; false; optLong; ; ; Argument[1]; ReturnValue; value; manual |
+| 156 | Summary: org.json; JSONObject; false; optLong; ; ; Argument[this]; ReturnValue; taint; manual |
+| 157 | Summary: org.json; JSONObject; false; optNumber; ; ; Argument[1]; ReturnValue; value; manual |
+| 158 | Summary: org.json; JSONObject; false; optNumber; ; ; Argument[this]; ReturnValue; taint; manual |
 | 159 | Summary: org.json; JSONObject; false; optQuery; ; ; Argument[this]; ReturnValue; taint; manual |
-| 160 | Summary: org.json; JSONObject; false; optString; ; ; Argument[this]; ReturnValue; taint; manual |
-| 161 | Summary: org.json; JSONObject; false; optString; ; ; Argument[1]; ReturnValue; value; manual |
-| 162 | Summary: org.json; JSONObject; false; put; ; ; Argument[this]; ReturnValue; value; manual |
-| 163 | Summary: org.json; JSONObject; false; put; (String,Collection); ; Argument[0]; Argument[this]; taint; manual |
-| 164 | Summary: org.json; JSONObject; false; put; (String,Collection); ; Argument[1].Element; Argument[this]; taint; manual |
-| 165 | Summary: org.json; JSONObject; false; put; (String,Map); ; Argument[0]; Argument[this]; taint; manual |
-| 166 | Summary: org.json; JSONObject; false; put; (String,Map); ; Argument[1].MapKey; Argument[this]; taint; manual |
-| 167 | Summary: org.json; JSONObject; false; put; (String,Map); ; Argument[1].MapValue; Argument[this]; taint; manual |
-| 168 | Summary: org.json; JSONObject; false; put; (String,Object); ; Argument[0]; Argument[this]; taint; manual |
-| 169 | Summary: org.json; JSONObject; false; put; (String,Object); ; Argument[1]; Argument[this]; taint; manual |
-| 170 | Summary: org.json; JSONObject; false; put; (String,boolean); ; Argument[0]; Argument[this]; taint; manual |
-| 171 | Summary: org.json; JSONObject; false; put; (String,boolean); ; Argument[1]; Argument[this]; taint; manual |
-| 172 | Summary: org.json; JSONObject; false; put; (String,double); ; Argument[0]; Argument[this]; taint; manual |
-| 173 | Summary: org.json; JSONObject; false; put; (String,double); ; Argument[1]; Argument[this]; taint; manual |
-| 174 | Summary: org.json; JSONObject; false; put; (String,float); ; Argument[0]; Argument[this]; taint; manual |
-| 175 | Summary: org.json; JSONObject; false; put; (String,float); ; Argument[1]; Argument[this]; taint; manual |
-| 176 | Summary: org.json; JSONObject; false; put; (String,int); ; Argument[0]; Argument[this]; taint; manual |
-| 177 | Summary: org.json; JSONObject; false; put; (String,int); ; Argument[1]; Argument[this]; taint; manual |
-| 178 | Summary: org.json; JSONObject; false; put; (String,long); ; Argument[0]; Argument[this]; taint; manual |
-| 179 | Summary: org.json; JSONObject; false; put; (String,long); ; Argument[1]; Argument[this]; taint; manual |
-| 180 | Summary: org.json; JSONObject; false; putOnce; ; ; Argument[this]; ReturnValue; value; manual |
-| 181 | Summary: org.json; JSONObject; false; putOnce; ; ; Argument[0..1]; Argument[this]; taint; manual |
-| 182 | Summary: org.json; JSONObject; false; putOpt; ; ; Argument[this]; ReturnValue; value; manual |
-| 183 | Summary: org.json; JSONObject; false; putOpt; ; ; Argument[0..1]; Argument[this]; taint; manual |
+| 160 | Summary: org.json; JSONObject; false; optString; ; ; Argument[1]; ReturnValue; value; manual |
+| 161 | Summary: org.json; JSONObject; false; optString; ; ; Argument[this]; ReturnValue; taint; manual |
+| 162 | Summary: org.json; JSONObject; false; put; (String,Collection); ; Argument[0]; Argument[this]; taint; manual |
+| 163 | Summary: org.json; JSONObject; false; put; (String,Collection); ; Argument[1].Element; Argument[this]; taint; manual |
+| 164 | Summary: org.json; JSONObject; false; put; (String,Map); ; Argument[0]; Argument[this]; taint; manual |
+| 165 | Summary: org.json; JSONObject; false; put; (String,Map); ; Argument[1].MapKey; Argument[this]; taint; manual |
+| 166 | Summary: org.json; JSONObject; false; put; (String,Map); ; Argument[1].MapValue; Argument[this]; taint; manual |
+| 167 | Summary: org.json; JSONObject; false; put; (String,Object); ; Argument[0]; Argument[this]; taint; manual |
+| 168 | Summary: org.json; JSONObject; false; put; (String,Object); ; Argument[1]; Argument[this]; taint; manual |
+| 169 | Summary: org.json; JSONObject; false; put; (String,boolean); ; Argument[0]; Argument[this]; taint; manual |
+| 170 | Summary: org.json; JSONObject; false; put; (String,boolean); ; Argument[1]; Argument[this]; taint; manual |
+| 171 | Summary: org.json; JSONObject; false; put; (String,double); ; Argument[0]; Argument[this]; taint; manual |
+| 172 | Summary: org.json; JSONObject; false; put; (String,double); ; Argument[1]; Argument[this]; taint; manual |
+| 173 | Summary: org.json; JSONObject; false; put; (String,float); ; Argument[0]; Argument[this]; taint; manual |
+| 174 | Summary: org.json; JSONObject; false; put; (String,float); ; Argument[1]; Argument[this]; taint; manual |
+| 175 | Summary: org.json; JSONObject; false; put; (String,int); ; Argument[0]; Argument[this]; taint; manual |
+| 176 | Summary: org.json; JSONObject; false; put; (String,int); ; Argument[1]; Argument[this]; taint; manual |
+| 177 | Summary: org.json; JSONObject; false; put; (String,long); ; Argument[0]; Argument[this]; taint; manual |
+| 178 | Summary: org.json; JSONObject; false; put; (String,long); ; Argument[1]; Argument[this]; taint; manual |
+| 179 | Summary: org.json; JSONObject; false; put; ; ; Argument[this]; ReturnValue; value; manual |
+| 180 | Summary: org.json; JSONObject; false; putOnce; ; ; Argument[0..1]; Argument[this]; taint; manual |
+| 181 | Summary: org.json; JSONObject; false; putOnce; ; ; Argument[this]; ReturnValue; value; manual |
+| 182 | Summary: org.json; JSONObject; false; putOpt; ; ; Argument[0..1]; Argument[this]; taint; manual |
+| 183 | Summary: org.json; JSONObject; false; putOpt; ; ; Argument[this]; ReturnValue; value; manual |
 | 184 | Summary: org.json; JSONObject; false; query; ; ; Argument[this]; ReturnValue; taint; manual |
 | 185 | Summary: org.json; JSONObject; false; quote; (String); ; Argument[0]; ReturnValue; taint; manual |
 | 186 | Summary: org.json; JSONObject; false; quote; (String,Writer); ; Argument[0]; Argument[1]; taint; manual |
@@ -194,16 +194,16 @@ models
 | 193 | Summary: org.json; JSONObject; false; toString; ; ; Argument[this]; ReturnValue; taint; manual |
 | 194 | Summary: org.json; JSONObject; false; valueToString; ; ; Argument[0]; ReturnValue; taint; manual |
 | 195 | Summary: org.json; JSONObject; false; wrap; ; ; Argument[0]; ReturnValue; taint; manual |
-| 196 | Summary: org.json; JSONObject; false; write; ; ; Argument[this]; Argument[0]; taint; manual |
-| 197 | Summary: org.json; JSONObject; false; write; ; ; Argument[0]; ReturnValue; value; manual |
-| 198 | Summary: org.json; JSONPointer; false; JSONPointer; (List); ; Argument[0].Element; Argument[this]; taint; manual |
-| 199 | Summary: org.json; JSONPointer; false; JSONPointer; (String); ; Argument[0]; Argument[this]; taint; manual |
-| 200 | Summary: org.json; JSONPointer; false; queryFrom; ; ; Argument[0]; ReturnValue; taint; manual |
-| 201 | Summary: org.json; JSONPointer; false; toString; ; ; Argument[this]; ReturnValue; taint; manual |
-| 202 | Summary: org.json; JSONPointer; false; toURIFragment; ; ; Argument[this]; ReturnValue; taint; manual |
-| 203 | Summary: org.json; JSONPointer$Builder; false; append; ; ; Argument[this]; ReturnValue; value; manual |
-| 204 | Summary: org.json; JSONPointer$Builder; false; append; ; ; Argument[0]; Argument[this]; taint; manual |
-| 205 | Summary: org.json; JSONPointer$Builder; false; build; ; ; Argument[this]; ReturnValue; taint; manual |
+| 196 | Summary: org.json; JSONObject; false; write; ; ; Argument[0]; ReturnValue; value; manual |
+| 197 | Summary: org.json; JSONObject; false; write; ; ; Argument[this]; Argument[0]; taint; manual |
+| 198 | Summary: org.json; JSONPointer$Builder; false; append; ; ; Argument[0]; Argument[this]; taint; manual |
+| 199 | Summary: org.json; JSONPointer$Builder; false; append; ; ; Argument[this]; ReturnValue; value; manual |
+| 200 | Summary: org.json; JSONPointer$Builder; false; build; ; ; Argument[this]; ReturnValue; taint; manual |
+| 201 | Summary: org.json; JSONPointer; false; JSONPointer; (List); ; Argument[0].Element; Argument[this]; taint; manual |
+| 202 | Summary: org.json; JSONPointer; false; JSONPointer; (String); ; Argument[0]; Argument[this]; taint; manual |
+| 203 | Summary: org.json; JSONPointer; false; queryFrom; ; ; Argument[0]; ReturnValue; taint; manual |
+| 204 | Summary: org.json; JSONPointer; false; toString; ; ; Argument[this]; ReturnValue; taint; manual |
+| 205 | Summary: org.json; JSONPointer; false; toURIFragment; ; ; Argument[this]; ReturnValue; taint; manual |
 | 206 | Summary: org.json; JSONString; true; toJSONString; ; ; Argument[this]; ReturnValue; taint; manual |
 | 207 | Summary: org.json; JSONStringer; false; toString; ; ; Argument[this]; ReturnValue; taint; manual |
 | 208 | Summary: org.json; JSONTokener; true; JSONTokener; ; ; Argument[0]; Argument[this]; taint; manual |
@@ -217,11 +217,11 @@ models
 | 216 | Summary: org.json; JSONWriter; true; array; ; ; Argument[this]; ReturnValue; value; manual |
 | 217 | Summary: org.json; JSONWriter; true; endArray; ; ; Argument[this]; ReturnValue; value; manual |
 | 218 | Summary: org.json; JSONWriter; true; endObject; ; ; Argument[this]; ReturnValue; value; manual |
-| 219 | Summary: org.json; JSONWriter; true; key; ; ; Argument[this]; ReturnValue; value; manual |
-| 220 | Summary: org.json; JSONWriter; true; key; ; ; Argument[0]; Argument[this]; taint; manual |
+| 219 | Summary: org.json; JSONWriter; true; key; ; ; Argument[0]; Argument[this]; taint; manual |
+| 220 | Summary: org.json; JSONWriter; true; key; ; ; Argument[this]; ReturnValue; value; manual |
 | 221 | Summary: org.json; JSONWriter; true; object; ; ; Argument[this]; ReturnValue; value; manual |
-| 222 | Summary: org.json; JSONWriter; true; value; ; ; Argument[this]; ReturnValue; value; manual |
-| 223 | Summary: org.json; JSONWriter; true; value; ; ; Argument[0]; Argument[this]; taint; manual |
+| 222 | Summary: org.json; JSONWriter; true; value; ; ; Argument[0]; Argument[this]; taint; manual |
+| 223 | Summary: org.json; JSONWriter; true; value; ; ; Argument[this]; ReturnValue; value; manual |
 | 224 | Summary: org.json; JSONWriter; true; valueToString; ; ; Argument[0]; ReturnValue; taint; manual |
 | 225 | Summary: org.json; Property; false; toJSONObject; ; ; Argument[0].MapKey; ReturnValue; taint; manual |
 | 226 | Summary: org.json; Property; false; toJSONObject; ; ; Argument[0].MapValue; ReturnValue; taint; manual |
@@ -249,25 +249,25 @@ edges
 | Test.java:40:42:40:43 | it : Iterator [<element>] : Object | Test.java:40:42:40:50 | next(...) : Object | provenance | MaD:2 |
 | Test.java:41:19:41:31 | container : Map [<map.key>] : Object | Test.java:41:43:41:51 | container : Map [<map.key>] : Object | provenance |  |
 | Test.java:41:19:41:31 | container : Properties [<map.key>] : Object | Test.java:41:43:41:51 | container : Properties [<map.key>] : Object | provenance |  |
-| Test.java:41:43:41:51 | container : Map [<map.key>] : Object | Test.java:41:43:41:60 | keySet(...) : Set [<element>] : Object | provenance | MaD:5 |
-| Test.java:41:43:41:51 | container : Properties [<map.key>] : Object | Test.java:41:43:41:60 | keySet(...) : Set [<element>] : Object | provenance | MaD:5 |
+| Test.java:41:43:41:51 | container : Map [<map.key>] : Object | Test.java:41:43:41:60 | keySet(...) : Set [<element>] : Object | provenance | MaD:7 |
+| Test.java:41:43:41:51 | container : Properties [<map.key>] : Object | Test.java:41:43:41:60 | keySet(...) : Set [<element>] : Object | provenance | MaD:7 |
 | Test.java:41:43:41:60 | keySet(...) : Set [<element>] : Object | Test.java:41:43:41:71 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:1 |
 | Test.java:41:43:41:60 | keySet(...) : Set [<element>] : Object | Test.java:41:43:41:71 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:1 |
 | Test.java:41:43:41:71 | iterator(...) : Iterator [<element>] : Object | Test.java:41:43:41:78 | next(...) : Object | provenance | MaD:2 |
 | Test.java:41:43:41:71 | iterator(...) : Iterator [<element>] : Object | Test.java:41:43:41:78 | next(...) : Object | provenance | MaD:2 |
 | Test.java:42:21:42:33 | container : Map [<map.value>] : Object | Test.java:42:45:42:53 | container : Map [<map.value>] : Object | provenance |  |
 | Test.java:42:21:42:33 | container : Properties [<map.value>] : Object | Test.java:42:45:42:53 | container : Properties [<map.value>] : Object | provenance |  |
-| Test.java:42:45:42:53 | container : Map [<map.value>] : Object | Test.java:42:45:42:63 | get(...) : Object | provenance | MaD:4 |
-| Test.java:42:45:42:53 | container : Properties [<map.value>] : Object | Test.java:42:45:42:63 | get(...) : Object | provenance | MaD:4 |
+| Test.java:42:45:42:53 | container : Map [<map.value>] : Object | Test.java:42:45:42:63 | get(...) : Object | provenance | MaD:6 |
+| Test.java:42:45:42:53 | container : Properties [<map.value>] : Object | Test.java:42:45:42:63 | get(...) : Object | provenance | MaD:6 |
 | Test.java:43:31:43:44 | element : Object | Test.java:43:71:43:77 | element : Object | provenance |  |
 | Test.java:43:56:43:79 | {...} : Object[] [[]] : Object | Test.java:43:56:43:79 | new Object[] : Object[] [[]] : Object | provenance |  |
 | Test.java:43:71:43:77 | element : Object | Test.java:43:56:43:79 | {...} : Object[] [[]] : Object | provenance |  |
 | Test.java:44:22:44:35 | element : Object | Test.java:44:55:44:61 | element : Object | provenance |  |
 | Test.java:44:55:44:61 | element : Object | Test.java:44:47:44:62 | of(...) : List [<element>] : Object | provenance | MaD:3 |
 | Test.java:45:20:45:33 | element : Object | Test.java:45:52:45:58 | element : Object | provenance |  |
-| Test.java:45:52:45:58 | element : Object | Test.java:45:45:45:65 | of(...) : Map [<map.key>] : Object | provenance | MaD:6 |
+| Test.java:45:52:45:58 | element : Object | Test.java:45:45:45:65 | of(...) : Map [<map.key>] : Object | provenance | MaD:4 |
 | Test.java:46:22:46:35 | element : Object | Test.java:46:60:46:66 | element : Object | provenance |  |
-| Test.java:46:60:46:66 | element : Object | Test.java:46:47:46:67 | of(...) : Map [<map.value>] : Object | provenance | MaD:7 |
+| Test.java:46:60:46:66 | element : Object | Test.java:46:47:46:67 | of(...) : Map [<map.value>] : Object | provenance | MaD:5 |
 | Test.java:55:21:55:41 | (...)... : JSONTokener | Test.java:56:29:56:30 | in : JSONTokener | provenance |  |
 | Test.java:55:34:55:41 | source(...) : Object | Test.java:55:21:55:41 | (...)... : JSONTokener | provenance |  |
 | Test.java:56:10:56:31 | rowToJSONArray(...) : JSONArray | Test.java:57:9:57:11 | out | provenance |  |
@@ -451,92 +451,92 @@ edges
 | Test.java:351:20:351:22 | out : Iterator [<element>] : Object | Test.java:351:9:351:23 | getElement(...) | provenance | MaD:2 |
 | Test.java:356:19:356:37 | (...)... : JSONArray | Test.java:357:10:357:11 | in : JSONArray | provenance |  |
 | Test.java:356:30:356:37 | source(...) : Object | Test.java:356:19:356:37 | (...)... : JSONArray | provenance |  |
-| Test.java:357:10:357:11 | in : JSONArray | Test.java:357:10:357:22 | join(...) : String | provenance | MaD:43 |
+| Test.java:357:10:357:11 | in : JSONArray | Test.java:357:10:357:22 | join(...) : String | provenance | MaD:44 |
 | Test.java:357:10:357:22 | join(...) : String | Test.java:358:9:358:11 | out | provenance |  |
 | Test.java:363:16:363:31 | (...)... : String | Test.java:365:24:365:25 | in : String | provenance |  |
 | Test.java:363:24:363:31 | source(...) : Object | Test.java:363:16:363:31 | (...)... : String | provenance |  |
 | Test.java:365:10:365:26 | join(...) : String | Test.java:366:9:366:11 | out | provenance |  |
-| Test.java:365:24:365:25 | in : String | Test.java:365:10:365:26 | join(...) : String | provenance | MaD:44 |
+| Test.java:365:24:365:25 | in : String | Test.java:365:10:365:26 | join(...) : String | provenance | MaD:43 |
 | Test.java:371:19:371:37 | (...)... : JSONArray | Test.java:372:10:372:11 | in : JSONArray | provenance |  |
 | Test.java:371:30:371:37 | source(...) : Object | Test.java:371:19:371:37 | (...)... : JSONArray | provenance |  |
 | Test.java:372:10:372:11 | in : JSONArray | Test.java:372:10:372:18 | opt(...) : Object | provenance | MaD:45 |
 | Test.java:372:10:372:18 | opt(...) : Object | Test.java:373:9:373:11 | out | provenance |  |
 | Test.java:378:19:378:37 | (...)... : JSONArray | Test.java:379:10:379:11 | in : JSONArray | provenance |  |
 | Test.java:378:30:378:37 | source(...) : Object | Test.java:378:19:378:37 | (...)... : JSONArray | provenance |  |
-| Test.java:379:10:379:11 | in : JSONArray | Test.java:379:10:379:34 | optBigDecimal(...) : BigDecimal | provenance | MaD:46 |
+| Test.java:379:10:379:11 | in : JSONArray | Test.java:379:10:379:34 | optBigDecimal(...) : BigDecimal | provenance | MaD:47 |
 | Test.java:379:10:379:34 | optBigDecimal(...) : BigDecimal | Test.java:380:9:380:11 | out | provenance |  |
 | Test.java:385:20:385:39 | (...)... : BigDecimal | Test.java:387:36:387:37 | in : BigDecimal | provenance |  |
 | Test.java:385:32:385:39 | source(...) : Object | Test.java:385:20:385:39 | (...)... : BigDecimal | provenance |  |
 | Test.java:387:10:387:38 | optBigDecimal(...) : BigDecimal | Test.java:388:9:388:11 | out | provenance |  |
-| Test.java:387:36:387:37 | in : BigDecimal | Test.java:387:10:387:38 | optBigDecimal(...) : BigDecimal | provenance | MaD:47 |
+| Test.java:387:36:387:37 | in : BigDecimal | Test.java:387:10:387:38 | optBigDecimal(...) : BigDecimal | provenance | MaD:46 |
 | Test.java:393:19:393:37 | (...)... : JSONArray | Test.java:394:10:394:11 | in : JSONArray | provenance |  |
 | Test.java:393:30:393:37 | source(...) : Object | Test.java:393:19:393:37 | (...)... : JSONArray | provenance |  |
-| Test.java:394:10:394:11 | in : JSONArray | Test.java:394:10:394:34 | optBigInteger(...) : BigInteger | provenance | MaD:48 |
+| Test.java:394:10:394:11 | in : JSONArray | Test.java:394:10:394:34 | optBigInteger(...) : BigInteger | provenance | MaD:49 |
 | Test.java:394:10:394:34 | optBigInteger(...) : BigInteger | Test.java:395:9:395:11 | out | provenance |  |
 | Test.java:400:20:400:39 | (...)... : BigInteger | Test.java:402:36:402:37 | in : BigInteger | provenance |  |
 | Test.java:400:32:400:39 | source(...) : Object | Test.java:400:20:400:39 | (...)... : BigInteger | provenance |  |
 | Test.java:402:10:402:38 | optBigInteger(...) : BigInteger | Test.java:403:9:403:11 | out | provenance |  |
-| Test.java:402:36:402:37 | in : BigInteger | Test.java:402:10:402:38 | optBigInteger(...) : BigInteger | provenance | MaD:49 |
+| Test.java:402:36:402:37 | in : BigInteger | Test.java:402:10:402:38 | optBigInteger(...) : BigInteger | provenance | MaD:48 |
 | Test.java:408:19:408:37 | (...)... : JSONArray | Test.java:409:10:409:11 | in : JSONArray | provenance |  |
 | Test.java:408:30:408:37 | source(...) : Object | Test.java:408:19:408:37 | (...)... : JSONArray | provenance |  |
-| Test.java:409:10:409:11 | in : JSONArray | Test.java:409:10:409:32 | optBoolean(...) : Boolean | provenance | MaD:50 |
+| Test.java:409:10:409:11 | in : JSONArray | Test.java:409:10:409:32 | optBoolean(...) : Boolean | provenance | MaD:51 |
 | Test.java:409:10:409:32 | optBoolean(...) : Boolean | Test.java:410:9:410:11 | out | provenance |  |
 | Test.java:415:19:415:37 | (...)... : JSONArray | Test.java:416:10:416:11 | in : JSONArray | provenance |  |
 | Test.java:415:30:415:37 | source(...) : Object | Test.java:415:19:415:37 | (...)... : JSONArray | provenance |  |
-| Test.java:416:10:416:11 | in : JSONArray | Test.java:416:10:416:25 | optBoolean(...) : Boolean | provenance | MaD:50 |
+| Test.java:416:10:416:11 | in : JSONArray | Test.java:416:10:416:25 | optBoolean(...) : Boolean | provenance | MaD:51 |
 | Test.java:416:10:416:25 | optBoolean(...) : Boolean | Test.java:417:9:417:11 | out | provenance |  |
 | Test.java:422:17:422:33 | (...)... : Boolean | Test.java:424:33:424:34 | in : Boolean | provenance |  |
 | Test.java:422:26:422:33 | source(...) : Object | Test.java:422:17:422:33 | (...)... : Boolean | provenance |  |
 | Test.java:424:10:424:35 | optBoolean(...) : Boolean | Test.java:425:9:425:11 | out | provenance |  |
-| Test.java:424:33:424:34 | in : Boolean | Test.java:424:10:424:35 | optBoolean(...) : Boolean | provenance | MaD:51 |
+| Test.java:424:33:424:34 | in : Boolean | Test.java:424:10:424:35 | optBoolean(...) : Boolean | provenance | MaD:50 |
 | Test.java:430:19:430:37 | (...)... : JSONArray | Test.java:431:10:431:11 | in : JSONArray | provenance |  |
 | Test.java:430:30:430:37 | source(...) : Object | Test.java:430:19:430:37 | (...)... : JSONArray | provenance |  |
-| Test.java:431:10:431:11 | in : JSONArray | Test.java:431:10:431:29 | optDouble(...) : Number | provenance | MaD:52 |
+| Test.java:431:10:431:11 | in : JSONArray | Test.java:431:10:431:29 | optDouble(...) : Number | provenance | MaD:53 |
 | Test.java:431:10:431:29 | optDouble(...) : Number | Test.java:432:9:432:11 | out | provenance |  |
 | Test.java:437:19:437:37 | (...)... : JSONArray | Test.java:438:10:438:11 | in : JSONArray | provenance |  |
 | Test.java:437:30:437:37 | source(...) : Object | Test.java:437:19:437:37 | (...)... : JSONArray | provenance |  |
-| Test.java:438:10:438:11 | in : JSONArray | Test.java:438:10:438:24 | optDouble(...) : Number | provenance | MaD:52 |
+| Test.java:438:10:438:11 | in : JSONArray | Test.java:438:10:438:24 | optDouble(...) : Number | provenance | MaD:53 |
 | Test.java:438:10:438:24 | optDouble(...) : Number | Test.java:439:9:439:11 | out | provenance |  |
 | Test.java:444:16:444:31 | (...)... : Number | Test.java:446:32:446:33 | in : Number | provenance |  |
 | Test.java:444:24:444:31 | source(...) : Object | Test.java:444:16:444:31 | (...)... : Number | provenance |  |
 | Test.java:446:10:446:34 | optDouble(...) : Number | Test.java:447:9:447:11 | out | provenance |  |
-| Test.java:446:32:446:33 | in : Number | Test.java:446:10:446:34 | optDouble(...) : Number | provenance | MaD:53 |
+| Test.java:446:32:446:33 | in : Number | Test.java:446:10:446:34 | optDouble(...) : Number | provenance | MaD:52 |
 | Test.java:452:19:452:37 | (...)... : JSONArray | Test.java:453:10:453:11 | in : JSONArray | provenance |  |
 | Test.java:452:30:452:37 | source(...) : Object | Test.java:452:19:452:37 | (...)... : JSONArray | provenance |  |
-| Test.java:453:10:453:11 | in : JSONArray | Test.java:453:10:453:34 | optEnum(...) : Enum | provenance | MaD:54 |
+| Test.java:453:10:453:11 | in : JSONArray | Test.java:453:10:453:34 | optEnum(...) : Enum | provenance | MaD:55 |
 | Test.java:453:10:453:34 | optEnum(...) : Enum | Test.java:454:9:454:11 | out | provenance |  |
 | Test.java:459:19:459:37 | (...)... : JSONArray | Test.java:460:10:460:11 | in : JSONArray | provenance |  |
 | Test.java:459:30:459:37 | source(...) : Object | Test.java:459:19:459:37 | (...)... : JSONArray | provenance |  |
-| Test.java:460:10:460:11 | in : JSONArray | Test.java:460:10:460:28 | optEnum(...) : Enum | provenance | MaD:54 |
+| Test.java:460:10:460:11 | in : JSONArray | Test.java:460:10:460:28 | optEnum(...) : Enum | provenance | MaD:55 |
 | Test.java:460:10:460:28 | optEnum(...) : Enum | Test.java:461:9:461:11 | out | provenance |  |
 | Test.java:466:14:466:27 | (...)... : Enum | Test.java:468:36:468:37 | in : Enum | provenance |  |
 | Test.java:466:20:466:27 | source(...) : Object | Test.java:466:14:466:27 | (...)... : Enum | provenance |  |
 | Test.java:468:10:468:38 | optEnum(...) : Enum | Test.java:469:9:469:11 | out | provenance |  |
-| Test.java:468:36:468:37 | in : Enum | Test.java:468:10:468:38 | optEnum(...) : Enum | provenance | MaD:55 |
+| Test.java:468:36:468:37 | in : Enum | Test.java:468:10:468:38 | optEnum(...) : Enum | provenance | MaD:54 |
 | Test.java:474:19:474:37 | (...)... : JSONArray | Test.java:475:10:475:11 | in : JSONArray | provenance |  |
 | Test.java:474:30:474:37 | source(...) : Object | Test.java:474:19:474:37 | (...)... : JSONArray | provenance |  |
-| Test.java:475:10:475:11 | in : JSONArray | Test.java:475:10:475:29 | optFloat(...) : Number | provenance | MaD:56 |
+| Test.java:475:10:475:11 | in : JSONArray | Test.java:475:10:475:29 | optFloat(...) : Number | provenance | MaD:57 |
 | Test.java:475:10:475:29 | optFloat(...) : Number | Test.java:476:9:476:11 | out | provenance |  |
 | Test.java:481:19:481:37 | (...)... : JSONArray | Test.java:482:10:482:11 | in : JSONArray | provenance |  |
 | Test.java:481:30:481:37 | source(...) : Object | Test.java:481:19:481:37 | (...)... : JSONArray | provenance |  |
-| Test.java:482:10:482:11 | in : JSONArray | Test.java:482:10:482:23 | optFloat(...) : Number | provenance | MaD:56 |
+| Test.java:482:10:482:11 | in : JSONArray | Test.java:482:10:482:23 | optFloat(...) : Number | provenance | MaD:57 |
 | Test.java:482:10:482:23 | optFloat(...) : Number | Test.java:483:9:483:11 | out | provenance |  |
 | Test.java:488:15:488:29 | (...)... : Number | Test.java:490:31:490:32 | in : Number | provenance |  |
 | Test.java:488:22:488:29 | source(...) : Object | Test.java:488:15:488:29 | (...)... : Number | provenance |  |
 | Test.java:490:10:490:33 | optFloat(...) : Number | Test.java:491:9:491:11 | out | provenance |  |
-| Test.java:490:31:490:32 | in : Number | Test.java:490:10:490:33 | optFloat(...) : Number | provenance | MaD:57 |
+| Test.java:490:31:490:32 | in : Number | Test.java:490:10:490:33 | optFloat(...) : Number | provenance | MaD:56 |
 | Test.java:496:19:496:37 | (...)... : JSONArray | Test.java:497:10:497:11 | in : JSONArray | provenance |  |
 | Test.java:496:30:496:37 | source(...) : Object | Test.java:496:19:496:37 | (...)... : JSONArray | provenance |  |
-| Test.java:497:10:497:11 | in : JSONArray | Test.java:497:10:497:24 | optInt(...) : Number | provenance | MaD:58 |
+| Test.java:497:10:497:11 | in : JSONArray | Test.java:497:10:497:24 | optInt(...) : Number | provenance | MaD:59 |
 | Test.java:497:10:497:24 | optInt(...) : Number | Test.java:498:9:498:11 | out | provenance |  |
 | Test.java:503:19:503:37 | (...)... : JSONArray | Test.java:504:10:504:11 | in : JSONArray | provenance |  |
 | Test.java:503:30:503:37 | source(...) : Object | Test.java:503:19:503:37 | (...)... : JSONArray | provenance |  |
-| Test.java:504:10:504:11 | in : JSONArray | Test.java:504:10:504:21 | optInt(...) : Number | provenance | MaD:58 |
+| Test.java:504:10:504:11 | in : JSONArray | Test.java:504:10:504:21 | optInt(...) : Number | provenance | MaD:59 |
 | Test.java:504:10:504:21 | optInt(...) : Number | Test.java:505:9:505:11 | out | provenance |  |
 | Test.java:510:13:510:25 | (...)... : Number | Test.java:512:29:512:30 | in : Number | provenance |  |
 | Test.java:510:18:510:25 | source(...) : Object | Test.java:510:13:510:25 | (...)... : Number | provenance |  |
 | Test.java:512:10:512:31 | optInt(...) : Number | Test.java:513:9:513:11 | out | provenance |  |
-| Test.java:512:29:512:30 | in : Number | Test.java:512:10:512:31 | optInt(...) : Number | provenance | MaD:59 |
+| Test.java:512:29:512:30 | in : Number | Test.java:512:10:512:31 | optInt(...) : Number | provenance | MaD:58 |
 | Test.java:518:19:518:37 | (...)... : JSONArray | Test.java:519:10:519:11 | in : JSONArray | provenance |  |
 | Test.java:518:30:518:37 | source(...) : Object | Test.java:518:19:518:37 | (...)... : JSONArray | provenance |  |
 | Test.java:519:10:519:11 | in : JSONArray | Test.java:519:10:519:27 | optJSONArray(...) : JSONArray | provenance | MaD:60 |
@@ -547,28 +547,28 @@ edges
 | Test.java:526:10:526:28 | optJSONObject(...) : JSONObject | Test.java:527:9:527:11 | out | provenance |  |
 | Test.java:532:19:532:37 | (...)... : JSONArray | Test.java:533:10:533:11 | in : JSONArray | provenance |  |
 | Test.java:532:30:532:37 | source(...) : Object | Test.java:532:19:532:37 | (...)... : JSONArray | provenance |  |
-| Test.java:533:10:533:11 | in : JSONArray | Test.java:533:10:533:26 | optLong(...) : Number | provenance | MaD:62 |
+| Test.java:533:10:533:11 | in : JSONArray | Test.java:533:10:533:26 | optLong(...) : Number | provenance | MaD:63 |
 | Test.java:533:10:533:26 | optLong(...) : Number | Test.java:534:9:534:11 | out | provenance |  |
 | Test.java:539:19:539:37 | (...)... : JSONArray | Test.java:540:10:540:11 | in : JSONArray | provenance |  |
 | Test.java:539:30:539:37 | source(...) : Object | Test.java:539:19:539:37 | (...)... : JSONArray | provenance |  |
-| Test.java:540:10:540:11 | in : JSONArray | Test.java:540:10:540:22 | optLong(...) : Number | provenance | MaD:62 |
+| Test.java:540:10:540:11 | in : JSONArray | Test.java:540:10:540:22 | optLong(...) : Number | provenance | MaD:63 |
 | Test.java:540:10:540:22 | optLong(...) : Number | Test.java:541:9:541:11 | out | provenance |  |
 | Test.java:546:14:546:27 | (...)... : Number | Test.java:548:30:548:31 | in : Number | provenance |  |
 | Test.java:546:20:546:27 | source(...) : Object | Test.java:546:14:546:27 | (...)... : Number | provenance |  |
 | Test.java:548:10:548:32 | optLong(...) : Number | Test.java:549:9:549:11 | out | provenance |  |
-| Test.java:548:30:548:31 | in : Number | Test.java:548:10:548:32 | optLong(...) : Number | provenance | MaD:63 |
+| Test.java:548:30:548:31 | in : Number | Test.java:548:10:548:32 | optLong(...) : Number | provenance | MaD:62 |
 | Test.java:554:19:554:37 | (...)... : JSONArray | Test.java:555:10:555:11 | in : JSONArray | provenance |  |
 | Test.java:554:30:554:37 | source(...) : Object | Test.java:554:19:554:37 | (...)... : JSONArray | provenance |  |
-| Test.java:555:10:555:11 | in : JSONArray | Test.java:555:10:555:30 | optNumber(...) : Number | provenance | MaD:64 |
+| Test.java:555:10:555:11 | in : JSONArray | Test.java:555:10:555:30 | optNumber(...) : Number | provenance | MaD:65 |
 | Test.java:555:10:555:30 | optNumber(...) : Number | Test.java:556:9:556:11 | out | provenance |  |
 | Test.java:561:19:561:37 | (...)... : JSONArray | Test.java:562:10:562:11 | in : JSONArray | provenance |  |
 | Test.java:561:30:561:37 | source(...) : Object | Test.java:561:19:561:37 | (...)... : JSONArray | provenance |  |
-| Test.java:562:10:562:11 | in : JSONArray | Test.java:562:10:562:24 | optNumber(...) : Number | provenance | MaD:64 |
+| Test.java:562:10:562:11 | in : JSONArray | Test.java:562:10:562:24 | optNumber(...) : Number | provenance | MaD:65 |
 | Test.java:562:10:562:24 | optNumber(...) : Number | Test.java:563:9:563:11 | out | provenance |  |
 | Test.java:568:16:568:31 | (...)... : Number | Test.java:570:32:570:33 | in : Number | provenance |  |
 | Test.java:568:24:568:31 | source(...) : Object | Test.java:568:16:568:31 | (...)... : Number | provenance |  |
 | Test.java:570:10:570:34 | optNumber(...) : Number | Test.java:571:9:571:11 | out | provenance |  |
-| Test.java:570:32:570:33 | in : Number | Test.java:570:10:570:34 | optNumber(...) : Number | provenance | MaD:65 |
+| Test.java:570:32:570:33 | in : Number | Test.java:570:10:570:34 | optNumber(...) : Number | provenance | MaD:64 |
 | Test.java:576:19:576:37 | (...)... : JSONArray | Test.java:577:10:577:11 | in : JSONArray | provenance |  |
 | Test.java:576:30:576:37 | source(...) : Object | Test.java:576:19:576:37 | (...)... : JSONArray | provenance |  |
 | Test.java:577:10:577:11 | in : JSONArray | Test.java:577:10:577:34 | optQuery(...) : Object | provenance | MaD:66 |
@@ -579,199 +579,199 @@ edges
 | Test.java:584:10:584:39 | optQuery(...) : Object | Test.java:585:9:585:11 | out | provenance |  |
 | Test.java:590:19:590:37 | (...)... : JSONArray | Test.java:591:10:591:11 | in : JSONArray | provenance |  |
 | Test.java:590:30:590:37 | source(...) : Object | Test.java:590:19:590:37 | (...)... : JSONArray | provenance |  |
-| Test.java:591:10:591:11 | in : JSONArray | Test.java:591:10:591:30 | optString(...) : String | provenance | MaD:67 |
+| Test.java:591:10:591:11 | in : JSONArray | Test.java:591:10:591:30 | optString(...) : String | provenance | MaD:68 |
 | Test.java:591:10:591:30 | optString(...) : String | Test.java:592:9:592:11 | out | provenance |  |
 | Test.java:597:19:597:37 | (...)... : JSONArray | Test.java:598:10:598:11 | in : JSONArray | provenance |  |
 | Test.java:597:30:597:37 | source(...) : Object | Test.java:597:19:597:37 | (...)... : JSONArray | provenance |  |
-| Test.java:598:10:598:11 | in : JSONArray | Test.java:598:10:598:24 | optString(...) : String | provenance | MaD:67 |
+| Test.java:598:10:598:11 | in : JSONArray | Test.java:598:10:598:24 | optString(...) : String | provenance | MaD:68 |
 | Test.java:598:10:598:24 | optString(...) : String | Test.java:599:9:599:11 | out | provenance |  |
 | Test.java:604:16:604:31 | (...)... : String | Test.java:606:32:606:33 | in : String | provenance |  |
 | Test.java:604:24:604:31 | source(...) : Object | Test.java:604:16:604:31 | (...)... : String | provenance |  |
 | Test.java:606:10:606:34 | optString(...) : String | Test.java:607:9:607:11 | out | provenance |  |
-| Test.java:606:32:606:33 | in : String | Test.java:606:10:606:34 | optString(...) : String | provenance | MaD:68 |
+| Test.java:606:32:606:33 | in : String | Test.java:606:10:606:34 | optString(...) : String | provenance | MaD:67 |
 | Test.java:612:20:612:55 | (...)... : List [<element>] : Object | Test.java:613:12:613:13 | in : List [<element>] : Object | provenance |  |
 | Test.java:612:32:612:55 | newWithElement(...) : List [<element>] : Object | Test.java:612:20:612:55 | (...)... : List [<element>] : Object | provenance |  |
 | Test.java:612:47:612:54 | source(...) : Object | Test.java:44:22:44:35 | element : Object | provenance |  |
 | Test.java:612:47:612:54 | source(...) : Object | Test.java:612:32:612:55 | newWithElement(...) : List [<element>] : Object | provenance | MaD:3 |
 | Test.java:613:4:613:6 | out [post update] : JSONArray | Test.java:614:9:614:11 | out | provenance |  |
-| Test.java:613:12:613:13 | in : List [<element>] : Object | Test.java:613:4:613:6 | out [post update] : JSONArray | provenance | MaD:70 |
+| Test.java:613:12:613:13 | in : List [<element>] : Object | Test.java:613:4:613:6 | out [post update] : JSONArray | provenance | MaD:69 |
 | Test.java:619:13:619:40 | (...)... : Map [<map.key>] : Object | Test.java:620:12:620:13 | in : Map [<map.key>] : Object | provenance |  |
 | Test.java:619:18:619:40 | newWithMapKey(...) : Map [<map.key>] : Object | Test.java:619:13:619:40 | (...)... : Map [<map.key>] : Object | provenance |  |
 | Test.java:619:32:619:39 | source(...) : Object | Test.java:45:20:45:33 | element : Object | provenance |  |
-| Test.java:619:32:619:39 | source(...) : Object | Test.java:619:18:619:40 | newWithMapKey(...) : Map [<map.key>] : Object | provenance | MaD:6 |
+| Test.java:619:32:619:39 | source(...) : Object | Test.java:619:18:619:40 | newWithMapKey(...) : Map [<map.key>] : Object | provenance | MaD:4 |
 | Test.java:620:4:620:6 | out [post update] : JSONArray | Test.java:621:9:621:11 | out | provenance |  |
-| Test.java:620:12:620:13 | in : Map [<map.key>] : Object | Test.java:620:4:620:6 | out [post update] : JSONArray | provenance | MaD:71 |
+| Test.java:620:12:620:13 | in : Map [<map.key>] : Object | Test.java:620:4:620:6 | out [post update] : JSONArray | provenance | MaD:70 |
 | Test.java:626:13:626:42 | (...)... : Map [<map.value>] : Object | Test.java:627:12:627:13 | in : Map [<map.value>] : Object | provenance |  |
 | Test.java:626:18:626:42 | newWithMapValue(...) : Map [<map.value>] : Object | Test.java:626:13:626:42 | (...)... : Map [<map.value>] : Object | provenance |  |
 | Test.java:626:34:626:41 | source(...) : Object | Test.java:46:22:46:35 | element : Object | provenance |  |
-| Test.java:626:34:626:41 | source(...) : Object | Test.java:626:18:626:42 | newWithMapValue(...) : Map [<map.value>] : Object | provenance | MaD:7 |
+| Test.java:626:34:626:41 | source(...) : Object | Test.java:626:18:626:42 | newWithMapValue(...) : Map [<map.value>] : Object | provenance | MaD:5 |
 | Test.java:627:4:627:6 | out [post update] : JSONArray | Test.java:628:9:628:11 | out | provenance |  |
-| Test.java:627:12:627:13 | in : Map [<map.value>] : Object | Test.java:627:4:627:6 | out [post update] : JSONArray | provenance | MaD:72 |
+| Test.java:627:12:627:13 | in : Map [<map.value>] : Object | Test.java:627:4:627:6 | out [post update] : JSONArray | provenance | MaD:71 |
 | Test.java:633:16:633:31 | (...)... : Object | Test.java:634:12:634:13 | in : Object | provenance |  |
 | Test.java:633:24:633:31 | source(...) : Object | Test.java:633:16:633:31 | (...)... : Object | provenance |  |
 | Test.java:634:4:634:6 | out [post update] : JSONArray | Test.java:635:9:635:11 | out | provenance |  |
-| Test.java:634:12:634:13 | in : Object | Test.java:634:4:634:6 | out [post update] : JSONArray | provenance | MaD:73 |
+| Test.java:634:12:634:13 | in : Object | Test.java:634:4:634:6 | out [post update] : JSONArray | provenance | MaD:72 |
 | Test.java:640:17:640:33 | (...)... : Boolean | Test.java:641:12:641:13 | in : Boolean | provenance |  |
 | Test.java:640:26:640:33 | source(...) : Object | Test.java:640:17:640:33 | (...)... : Boolean | provenance |  |
 | Test.java:641:4:641:6 | out [post update] : JSONArray | Test.java:642:9:642:11 | out | provenance |  |
-| Test.java:641:12:641:13 | in : Boolean | Test.java:641:4:641:6 | out [post update] : JSONArray | provenance | MaD:74 |
+| Test.java:641:12:641:13 | in : Boolean | Test.java:641:4:641:6 | out [post update] : JSONArray | provenance | MaD:73 |
 | Test.java:647:16:647:31 | (...)... : Number | Test.java:648:12:648:13 | in : Number | provenance |  |
 | Test.java:647:24:647:31 | source(...) : Object | Test.java:647:16:647:31 | (...)... : Number | provenance |  |
 | Test.java:648:4:648:6 | out [post update] : JSONArray | Test.java:649:9:649:11 | out | provenance |  |
-| Test.java:648:12:648:13 | in : Number | Test.java:648:4:648:6 | out [post update] : JSONArray | provenance | MaD:75 |
+| Test.java:648:12:648:13 | in : Number | Test.java:648:4:648:6 | out [post update] : JSONArray | provenance | MaD:74 |
 | Test.java:654:15:654:29 | (...)... : Number | Test.java:655:12:655:13 | in : Number | provenance |  |
 | Test.java:654:22:654:29 | source(...) : Object | Test.java:654:15:654:29 | (...)... : Number | provenance |  |
 | Test.java:655:4:655:6 | out [post update] : JSONArray | Test.java:656:9:656:11 | out | provenance |  |
-| Test.java:655:12:655:13 | in : Number | Test.java:655:4:655:6 | out [post update] : JSONArray | provenance | MaD:76 |
+| Test.java:655:12:655:13 | in : Number | Test.java:655:4:655:6 | out [post update] : JSONArray | provenance | MaD:75 |
 | Test.java:661:13:661:25 | (...)... : Number | Test.java:662:12:662:13 | in : Number | provenance |  |
 | Test.java:661:18:661:25 | source(...) : Object | Test.java:661:13:661:25 | (...)... : Number | provenance |  |
 | Test.java:662:4:662:6 | out [post update] : JSONArray | Test.java:663:9:663:11 | out | provenance |  |
-| Test.java:662:12:662:13 | in : Number | Test.java:662:4:662:6 | out [post update] : JSONArray | provenance | MaD:77 |
+| Test.java:662:12:662:13 | in : Number | Test.java:662:4:662:6 | out [post update] : JSONArray | provenance | MaD:76 |
 | Test.java:668:20:668:55 | (...)... : List [<element>] : Object | Test.java:669:15:669:16 | in : List [<element>] : Object | provenance |  |
 | Test.java:668:32:668:55 | newWithElement(...) : List [<element>] : Object | Test.java:668:20:668:55 | (...)... : List [<element>] : Object | provenance |  |
 | Test.java:668:47:668:54 | source(...) : Object | Test.java:44:22:44:35 | element : Object | provenance |  |
 | Test.java:668:47:668:54 | source(...) : Object | Test.java:668:32:668:55 | newWithElement(...) : List [<element>] : Object | provenance | MaD:3 |
 | Test.java:669:4:669:6 | out [post update] : JSONArray | Test.java:670:9:670:11 | out | provenance |  |
-| Test.java:669:15:669:16 | in : List [<element>] : Object | Test.java:669:4:669:6 | out [post update] : JSONArray | provenance | MaD:78 |
+| Test.java:669:15:669:16 | in : List [<element>] : Object | Test.java:669:4:669:6 | out [post update] : JSONArray | provenance | MaD:77 |
 | Test.java:675:13:675:40 | (...)... : Map [<map.key>] : Object | Test.java:676:15:676:16 | in : Map [<map.key>] : Object | provenance |  |
 | Test.java:675:18:675:40 | newWithMapKey(...) : Map [<map.key>] : Object | Test.java:675:13:675:40 | (...)... : Map [<map.key>] : Object | provenance |  |
 | Test.java:675:32:675:39 | source(...) : Object | Test.java:45:20:45:33 | element : Object | provenance |  |
-| Test.java:675:32:675:39 | source(...) : Object | Test.java:675:18:675:40 | newWithMapKey(...) : Map [<map.key>] : Object | provenance | MaD:6 |
+| Test.java:675:32:675:39 | source(...) : Object | Test.java:675:18:675:40 | newWithMapKey(...) : Map [<map.key>] : Object | provenance | MaD:4 |
 | Test.java:676:4:676:6 | out [post update] : JSONArray | Test.java:677:9:677:11 | out | provenance |  |
-| Test.java:676:15:676:16 | in : Map [<map.key>] : Object | Test.java:676:4:676:6 | out [post update] : JSONArray | provenance | MaD:79 |
+| Test.java:676:15:676:16 | in : Map [<map.key>] : Object | Test.java:676:4:676:6 | out [post update] : JSONArray | provenance | MaD:78 |
 | Test.java:682:13:682:42 | (...)... : Map [<map.value>] : Object | Test.java:683:15:683:16 | in : Map [<map.value>] : Object | provenance |  |
 | Test.java:682:18:682:42 | newWithMapValue(...) : Map [<map.value>] : Object | Test.java:682:13:682:42 | (...)... : Map [<map.value>] : Object | provenance |  |
 | Test.java:682:34:682:41 | source(...) : Object | Test.java:46:22:46:35 | element : Object | provenance |  |
-| Test.java:682:34:682:41 | source(...) : Object | Test.java:682:18:682:42 | newWithMapValue(...) : Map [<map.value>] : Object | provenance | MaD:7 |
+| Test.java:682:34:682:41 | source(...) : Object | Test.java:682:18:682:42 | newWithMapValue(...) : Map [<map.value>] : Object | provenance | MaD:5 |
 | Test.java:683:4:683:6 | out [post update] : JSONArray | Test.java:684:9:684:11 | out | provenance |  |
-| Test.java:683:15:683:16 | in : Map [<map.value>] : Object | Test.java:683:4:683:6 | out [post update] : JSONArray | provenance | MaD:80 |
+| Test.java:683:15:683:16 | in : Map [<map.value>] : Object | Test.java:683:4:683:6 | out [post update] : JSONArray | provenance | MaD:79 |
 | Test.java:689:16:689:31 | (...)... : Object | Test.java:690:15:690:16 | in : Object | provenance |  |
 | Test.java:689:24:689:31 | source(...) : Object | Test.java:689:16:689:31 | (...)... : Object | provenance |  |
 | Test.java:690:4:690:6 | out [post update] : JSONArray | Test.java:691:9:691:11 | out | provenance |  |
-| Test.java:690:15:690:16 | in : Object | Test.java:690:4:690:6 | out [post update] : JSONArray | provenance | MaD:81 |
+| Test.java:690:15:690:16 | in : Object | Test.java:690:4:690:6 | out [post update] : JSONArray | provenance | MaD:80 |
 | Test.java:696:17:696:33 | (...)... : Boolean | Test.java:697:15:697:16 | in : Boolean | provenance |  |
 | Test.java:696:26:696:33 | source(...) : Object | Test.java:696:17:696:33 | (...)... : Boolean | provenance |  |
 | Test.java:697:4:697:6 | out [post update] : JSONArray | Test.java:698:9:698:11 | out | provenance |  |
-| Test.java:697:15:697:16 | in : Boolean | Test.java:697:4:697:6 | out [post update] : JSONArray | provenance | MaD:82 |
+| Test.java:697:15:697:16 | in : Boolean | Test.java:697:4:697:6 | out [post update] : JSONArray | provenance | MaD:81 |
 | Test.java:703:16:703:31 | (...)... : Number | Test.java:704:15:704:16 | in : Number | provenance |  |
 | Test.java:703:24:703:31 | source(...) : Object | Test.java:703:16:703:31 | (...)... : Number | provenance |  |
 | Test.java:704:4:704:6 | out [post update] : JSONArray | Test.java:705:9:705:11 | out | provenance |  |
-| Test.java:704:15:704:16 | in : Number | Test.java:704:4:704:6 | out [post update] : JSONArray | provenance | MaD:83 |
+| Test.java:704:15:704:16 | in : Number | Test.java:704:4:704:6 | out [post update] : JSONArray | provenance | MaD:82 |
 | Test.java:710:15:710:29 | (...)... : Number | Test.java:711:15:711:16 | in : Number | provenance |  |
 | Test.java:710:22:710:29 | source(...) : Object | Test.java:710:15:710:29 | (...)... : Number | provenance |  |
 | Test.java:711:4:711:6 | out [post update] : JSONArray | Test.java:712:9:712:11 | out | provenance |  |
-| Test.java:711:15:711:16 | in : Number | Test.java:711:4:711:6 | out [post update] : JSONArray | provenance | MaD:84 |
+| Test.java:711:15:711:16 | in : Number | Test.java:711:4:711:6 | out [post update] : JSONArray | provenance | MaD:83 |
 | Test.java:717:13:717:25 | (...)... : Number | Test.java:718:15:718:16 | in : Number | provenance |  |
 | Test.java:717:18:717:25 | source(...) : Object | Test.java:717:13:717:25 | (...)... : Number | provenance |  |
 | Test.java:718:4:718:6 | out [post update] : JSONArray | Test.java:719:9:719:11 | out | provenance |  |
-| Test.java:718:15:718:16 | in : Number | Test.java:718:4:718:6 | out [post update] : JSONArray | provenance | MaD:85 |
+| Test.java:718:15:718:16 | in : Number | Test.java:718:4:718:6 | out [post update] : JSONArray | provenance | MaD:84 |
 | Test.java:724:14:724:27 | (...)... : Number | Test.java:725:15:725:16 | in : Number | provenance |  |
 | Test.java:724:20:724:27 | source(...) : Object | Test.java:724:14:724:27 | (...)... : Number | provenance |  |
 | Test.java:725:4:725:6 | out [post update] : JSONArray | Test.java:726:9:726:11 | out | provenance |  |
-| Test.java:725:15:725:16 | in : Number | Test.java:725:4:725:6 | out [post update] : JSONArray | provenance | MaD:86 |
+| Test.java:725:15:725:16 | in : Number | Test.java:725:4:725:6 | out [post update] : JSONArray | provenance | MaD:85 |
 | Test.java:731:14:731:27 | (...)... : Number | Test.java:732:12:732:13 | in : Number | provenance |  |
 | Test.java:731:20:731:27 | source(...) : Object | Test.java:731:14:731:27 | (...)... : Number | provenance |  |
 | Test.java:732:4:732:6 | out [post update] : JSONArray | Test.java:733:9:733:11 | out | provenance |  |
-| Test.java:732:12:732:13 | in : Number | Test.java:732:4:732:6 | out [post update] : JSONArray | provenance | MaD:87 |
+| Test.java:732:12:732:13 | in : Number | Test.java:732:4:732:6 | out [post update] : JSONArray | provenance | MaD:86 |
 | Test.java:738:19:738:37 | (...)... : JSONArray | Test.java:739:10:739:11 | in : JSONArray | provenance |  |
 | Test.java:738:30:738:37 | source(...) : Object | Test.java:738:19:738:37 | (...)... : JSONArray | provenance |  |
-| Test.java:739:10:739:11 | in : JSONArray | Test.java:739:10:739:22 | put(...) : JSONArray | provenance | MaD:69 |
+| Test.java:739:10:739:11 | in : JSONArray | Test.java:739:10:739:22 | put(...) : JSONArray | provenance | MaD:87 |
 | Test.java:739:10:739:22 | put(...) : JSONArray | Test.java:740:9:740:11 | out | provenance |  |
 | Test.java:745:19:745:37 | (...)... : JSONArray | Test.java:746:10:746:11 | in : JSONArray | provenance |  |
 | Test.java:745:30:745:37 | source(...) : Object | Test.java:745:19:745:37 | (...)... : JSONArray | provenance |  |
-| Test.java:746:10:746:11 | in : JSONArray | Test.java:746:10:746:19 | put(...) : JSONArray | provenance | MaD:69 |
+| Test.java:746:10:746:11 | in : JSONArray | Test.java:746:10:746:19 | put(...) : JSONArray | provenance | MaD:87 |
 | Test.java:746:10:746:19 | put(...) : JSONArray | Test.java:747:9:747:11 | out | provenance |  |
 | Test.java:752:19:752:37 | (...)... : JSONArray | Test.java:753:10:753:11 | in : JSONArray | provenance |  |
 | Test.java:752:30:752:37 | source(...) : Object | Test.java:752:19:752:37 | (...)... : JSONArray | provenance |  |
-| Test.java:753:10:753:11 | in : JSONArray | Test.java:753:10:753:21 | put(...) : JSONArray | provenance | MaD:69 |
+| Test.java:753:10:753:11 | in : JSONArray | Test.java:753:10:753:21 | put(...) : JSONArray | provenance | MaD:87 |
 | Test.java:753:10:753:21 | put(...) : JSONArray | Test.java:754:9:754:11 | out | provenance |  |
 | Test.java:759:19:759:37 | (...)... : JSONArray | Test.java:760:10:760:11 | in : JSONArray | provenance |  |
 | Test.java:759:30:759:37 | source(...) : Object | Test.java:759:19:759:37 | (...)... : JSONArray | provenance |  |
-| Test.java:760:10:760:11 | in : JSONArray | Test.java:760:10:760:20 | put(...) : JSONArray | provenance | MaD:69 |
+| Test.java:760:10:760:11 | in : JSONArray | Test.java:760:10:760:20 | put(...) : JSONArray | provenance | MaD:87 |
 | Test.java:760:10:760:20 | put(...) : JSONArray | Test.java:761:9:761:11 | out | provenance |  |
 | Test.java:766:19:766:37 | (...)... : JSONArray | Test.java:767:10:767:11 | in : JSONArray | provenance |  |
 | Test.java:766:30:766:37 | source(...) : Object | Test.java:766:19:766:37 | (...)... : JSONArray | provenance |  |
-| Test.java:767:10:767:11 | in : JSONArray | Test.java:767:10:767:25 | put(...) : JSONArray | provenance | MaD:69 |
+| Test.java:767:10:767:11 | in : JSONArray | Test.java:767:10:767:25 | put(...) : JSONArray | provenance | MaD:87 |
 | Test.java:767:10:767:25 | put(...) : JSONArray | Test.java:768:9:768:11 | out | provenance |  |
 | Test.java:773:19:773:37 | (...)... : JSONArray | Test.java:774:10:774:11 | in : JSONArray | provenance |  |
 | Test.java:773:30:773:37 | source(...) : Object | Test.java:773:19:773:37 | (...)... : JSONArray | provenance |  |
-| Test.java:774:10:774:11 | in : JSONArray | Test.java:774:10:774:22 | put(...) : JSONArray | provenance | MaD:69 |
+| Test.java:774:10:774:11 | in : JSONArray | Test.java:774:10:774:22 | put(...) : JSONArray | provenance | MaD:87 |
 | Test.java:774:10:774:22 | put(...) : JSONArray | Test.java:775:9:775:11 | out | provenance |  |
 | Test.java:780:19:780:37 | (...)... : JSONArray | Test.java:781:10:781:11 | in : JSONArray | provenance |  |
 | Test.java:780:30:780:37 | source(...) : Object | Test.java:780:19:780:37 | (...)... : JSONArray | provenance |  |
-| Test.java:781:10:781:11 | in : JSONArray | Test.java:781:10:781:24 | put(...) : JSONArray | provenance | MaD:69 |
+| Test.java:781:10:781:11 | in : JSONArray | Test.java:781:10:781:24 | put(...) : JSONArray | provenance | MaD:87 |
 | Test.java:781:10:781:24 | put(...) : JSONArray | Test.java:782:9:782:11 | out | provenance |  |
 | Test.java:787:19:787:37 | (...)... : JSONArray | Test.java:788:10:788:11 | in : JSONArray | provenance |  |
 | Test.java:787:30:787:37 | source(...) : Object | Test.java:787:19:787:37 | (...)... : JSONArray | provenance |  |
-| Test.java:788:10:788:11 | in : JSONArray | Test.java:788:10:788:23 | put(...) : JSONArray | provenance | MaD:69 |
+| Test.java:788:10:788:11 | in : JSONArray | Test.java:788:10:788:23 | put(...) : JSONArray | provenance | MaD:87 |
 | Test.java:788:10:788:23 | put(...) : JSONArray | Test.java:789:9:789:11 | out | provenance |  |
 | Test.java:794:19:794:37 | (...)... : JSONArray | Test.java:795:10:795:11 | in : JSONArray | provenance |  |
 | Test.java:794:30:794:37 | source(...) : Object | Test.java:794:19:794:37 | (...)... : JSONArray | provenance |  |
-| Test.java:795:10:795:11 | in : JSONArray | Test.java:795:10:795:21 | put(...) : JSONArray | provenance | MaD:69 |
+| Test.java:795:10:795:11 | in : JSONArray | Test.java:795:10:795:21 | put(...) : JSONArray | provenance | MaD:87 |
 | Test.java:795:10:795:21 | put(...) : JSONArray | Test.java:796:9:796:11 | out | provenance |  |
 | Test.java:801:19:801:37 | (...)... : JSONArray | Test.java:802:10:802:11 | in : JSONArray | provenance |  |
 | Test.java:801:30:801:37 | source(...) : Object | Test.java:801:19:801:37 | (...)... : JSONArray | provenance |  |
-| Test.java:802:10:802:11 | in : JSONArray | Test.java:802:10:802:32 | put(...) : JSONArray | provenance | MaD:69 |
+| Test.java:802:10:802:11 | in : JSONArray | Test.java:802:10:802:32 | put(...) : JSONArray | provenance | MaD:87 |
 | Test.java:802:10:802:32 | put(...) : JSONArray | Test.java:803:9:803:11 | out | provenance |  |
 | Test.java:808:19:808:37 | (...)... : JSONArray | Test.java:809:10:809:11 | in : JSONArray | provenance |  |
 | Test.java:808:30:808:37 | source(...) : Object | Test.java:808:19:808:37 | (...)... : JSONArray | provenance |  |
-| Test.java:809:10:809:11 | in : JSONArray | Test.java:809:10:809:29 | put(...) : JSONArray | provenance | MaD:69 |
+| Test.java:809:10:809:11 | in : JSONArray | Test.java:809:10:809:29 | put(...) : JSONArray | provenance | MaD:87 |
 | Test.java:809:10:809:29 | put(...) : JSONArray | Test.java:810:9:810:11 | out | provenance |  |
 | Test.java:815:19:815:37 | (...)... : JSONArray | Test.java:816:10:816:11 | in : JSONArray | provenance |  |
 | Test.java:815:30:815:37 | source(...) : Object | Test.java:815:19:815:37 | (...)... : JSONArray | provenance |  |
-| Test.java:816:10:816:11 | in : JSONArray | Test.java:816:10:816:36 | put(...) : JSONArray | provenance | MaD:69 |
+| Test.java:816:10:816:11 | in : JSONArray | Test.java:816:10:816:36 | put(...) : JSONArray | provenance | MaD:87 |
 | Test.java:816:10:816:36 | put(...) : JSONArray | Test.java:817:9:817:11 | out | provenance |  |
 | Test.java:822:19:822:37 | (...)... : JSONArray | Test.java:823:10:823:11 | in : JSONArray | provenance |  |
 | Test.java:822:30:822:37 | source(...) : Object | Test.java:822:19:822:37 | (...)... : JSONArray | provenance |  |
-| Test.java:823:10:823:11 | in : JSONArray | Test.java:823:10:823:18 | put(...) : JSONArray | provenance | MaD:69 |
+| Test.java:823:10:823:11 | in : JSONArray | Test.java:823:10:823:18 | put(...) : JSONArray | provenance | MaD:87 |
 | Test.java:823:10:823:18 | put(...) : JSONArray | Test.java:824:9:824:11 | out | provenance |  |
 | Test.java:829:19:829:37 | (...)... : JSONArray | Test.java:830:10:830:11 | in : JSONArray | provenance |  |
 | Test.java:829:30:829:37 | source(...) : Object | Test.java:829:19:829:37 | (...)... : JSONArray | provenance |  |
-| Test.java:830:10:830:11 | in : JSONArray | Test.java:830:10:830:29 | put(...) : JSONArray | provenance | MaD:69 |
+| Test.java:830:10:830:11 | in : JSONArray | Test.java:830:10:830:29 | put(...) : JSONArray | provenance | MaD:87 |
 | Test.java:830:10:830:29 | put(...) : JSONArray | Test.java:831:9:831:11 | out | provenance |  |
 | Test.java:836:19:836:37 | (...)... : JSONArray | Test.java:837:10:837:11 | in : JSONArray | provenance |  |
 | Test.java:836:30:836:37 | source(...) : Object | Test.java:836:19:836:37 | (...)... : JSONArray | provenance |  |
-| Test.java:837:10:837:11 | in : JSONArray | Test.java:837:10:837:26 | put(...) : JSONArray | provenance | MaD:69 |
+| Test.java:837:10:837:11 | in : JSONArray | Test.java:837:10:837:26 | put(...) : JSONArray | provenance | MaD:87 |
 | Test.java:837:10:837:26 | put(...) : JSONArray | Test.java:838:9:838:11 | out | provenance |  |
 | Test.java:843:19:843:37 | (...)... : JSONArray | Test.java:844:10:844:11 | in : JSONArray | provenance |  |
 | Test.java:843:30:843:37 | source(...) : Object | Test.java:843:19:843:37 | (...)... : JSONArray | provenance |  |
-| Test.java:844:10:844:11 | in : JSONArray | Test.java:844:10:844:33 | put(...) : JSONArray | provenance | MaD:69 |
+| Test.java:844:10:844:11 | in : JSONArray | Test.java:844:10:844:33 | put(...) : JSONArray | provenance | MaD:87 |
 | Test.java:844:10:844:33 | put(...) : JSONArray | Test.java:845:9:845:11 | out | provenance |  |
 | Test.java:850:20:850:55 | (...)... : List [<element>] : Object | Test.java:851:15:851:16 | in : List [<element>] : Object | provenance |  |
 | Test.java:850:32:850:55 | newWithElement(...) : List [<element>] : Object | Test.java:850:20:850:55 | (...)... : List [<element>] : Object | provenance |  |
 | Test.java:850:47:850:54 | source(...) : Object | Test.java:44:22:44:35 | element : Object | provenance |  |
 | Test.java:850:47:850:54 | source(...) : Object | Test.java:850:32:850:55 | newWithElement(...) : List [<element>] : Object | provenance | MaD:3 |
 | Test.java:851:4:851:6 | out [post update] : JSONArray | Test.java:852:9:852:11 | out | provenance |  |
-| Test.java:851:15:851:16 | in : List [<element>] : Object | Test.java:851:4:851:6 | out [post update] : JSONArray | provenance | MaD:89 |
+| Test.java:851:15:851:16 | in : List [<element>] : Object | Test.java:851:4:851:6 | out [post update] : JSONArray | provenance | MaD:88 |
 | Test.java:857:18:857:51 | (...)... : List [<element>] : Object | Test.java:858:15:858:16 | in : List [<element>] : Object | provenance |  |
 | Test.java:857:28:857:51 | newWithElement(...) : List [<element>] : Object | Test.java:857:18:857:51 | (...)... : List [<element>] : Object | provenance |  |
 | Test.java:857:43:857:50 | source(...) : Object | Test.java:44:22:44:35 | element : Object | provenance |  |
 | Test.java:857:43:857:50 | source(...) : Object | Test.java:857:28:857:51 | newWithElement(...) : List [<element>] : Object | provenance | MaD:3 |
 | Test.java:858:4:858:6 | out [post update] : JSONArray | Test.java:859:9:859:11 | out | provenance |  |
-| Test.java:858:15:858:16 | in : List [<element>] : Object | Test.java:858:4:858:6 | out [post update] : JSONArray | provenance | MaD:90 |
+| Test.java:858:15:858:16 | in : List [<element>] : Object | Test.java:858:4:858:6 | out [post update] : JSONArray | provenance | MaD:89 |
 | Test.java:864:19:864:37 | (...)... : JSONArray | Test.java:865:15:865:16 | in : JSONArray | provenance |  |
 | Test.java:864:30:864:37 | source(...) : Object | Test.java:864:19:864:37 | (...)... : JSONArray | provenance |  |
 | Test.java:865:4:865:6 | out [post update] : JSONArray | Test.java:866:9:866:11 | out | provenance |  |
-| Test.java:865:15:865:16 | in : JSONArray | Test.java:865:4:865:6 | out [post update] : JSONArray | provenance | MaD:91 |
+| Test.java:865:15:865:16 | in : JSONArray | Test.java:865:4:865:6 | out [post update] : JSONArray | provenance | MaD:90 |
 | Test.java:871:16:871:31 | (...)... : Object | Test.java:872:15:872:16 | in : Object | provenance |  |
 | Test.java:871:24:871:31 | source(...) : Object | Test.java:871:16:871:31 | (...)... : Object | provenance |  |
 | Test.java:872:4:872:6 | out [post update] : JSONArray | Test.java:873:9:873:11 | out | provenance |  |
-| Test.java:872:15:872:16 | in : Object | Test.java:872:4:872:6 | out [post update] : JSONArray | provenance | MaD:92 |
+| Test.java:872:15:872:16 | in : Object | Test.java:872:4:872:6 | out [post update] : JSONArray | provenance | MaD:91 |
 | Test.java:878:19:878:37 | (...)... : JSONArray | Test.java:879:10:879:11 | in : JSONArray | provenance |  |
 | Test.java:878:30:878:37 | source(...) : Object | Test.java:878:19:878:37 | (...)... : JSONArray | provenance |  |
-| Test.java:879:10:879:11 | in : JSONArray | Test.java:879:10:879:32 | putAll(...) : JSONArray | provenance | MaD:88 |
+| Test.java:879:10:879:11 | in : JSONArray | Test.java:879:10:879:32 | putAll(...) : JSONArray | provenance | MaD:92 |
 | Test.java:879:10:879:32 | putAll(...) : JSONArray | Test.java:880:9:880:11 | out | provenance |  |
 | Test.java:885:19:885:37 | (...)... : JSONArray | Test.java:886:10:886:11 | in : JSONArray | provenance |  |
 | Test.java:885:30:885:37 | source(...) : Object | Test.java:885:19:885:37 | (...)... : JSONArray | provenance |  |
-| Test.java:886:10:886:11 | in : JSONArray | Test.java:886:10:886:35 | putAll(...) : JSONArray | provenance | MaD:88 |
+| Test.java:886:10:886:11 | in : JSONArray | Test.java:886:10:886:35 | putAll(...) : JSONArray | provenance | MaD:92 |
 | Test.java:886:10:886:35 | putAll(...) : JSONArray | Test.java:887:9:887:11 | out | provenance |  |
 | Test.java:892:19:892:37 | (...)... : JSONArray | Test.java:893:10:893:11 | in : JSONArray | provenance |  |
 | Test.java:892:30:892:37 | source(...) : Object | Test.java:892:19:892:37 | (...)... : JSONArray | provenance |  |
-| Test.java:893:10:893:11 | in : JSONArray | Test.java:893:10:893:34 | putAll(...) : JSONArray | provenance | MaD:88 |
+| Test.java:893:10:893:11 | in : JSONArray | Test.java:893:10:893:34 | putAll(...) : JSONArray | provenance | MaD:92 |
 | Test.java:893:10:893:34 | putAll(...) : JSONArray | Test.java:894:9:894:11 | out | provenance |  |
 | Test.java:899:19:899:37 | (...)... : JSONArray | Test.java:900:10:900:11 | in : JSONArray | provenance |  |
 | Test.java:899:30:899:37 | source(...) : Object | Test.java:899:19:899:37 | (...)... : JSONArray | provenance |  |
-| Test.java:900:10:900:11 | in : JSONArray | Test.java:900:10:900:36 | putAll(...) : JSONArray | provenance | MaD:88 |
+| Test.java:900:10:900:11 | in : JSONArray | Test.java:900:10:900:36 | putAll(...) : JSONArray | provenance | MaD:92 |
 | Test.java:900:10:900:36 | putAll(...) : JSONArray | Test.java:901:9:901:11 | out | provenance |  |
 | Test.java:906:19:906:37 | (...)... : JSONArray | Test.java:907:10:907:11 | in : JSONArray | provenance |  |
 | Test.java:906:30:906:37 | source(...) : Object | Test.java:906:19:906:37 | (...)... : JSONArray | provenance |  |
@@ -787,32 +787,32 @@ edges
 | Test.java:921:10:921:21 | remove(...) : Object | Test.java:922:9:922:11 | out | provenance |  |
 | Test.java:927:19:927:37 | (...)... : JSONArray | Test.java:928:10:928:11 | in : JSONArray | provenance |  |
 | Test.java:927:30:927:37 | source(...) : Object | Test.java:927:19:927:37 | (...)... : JSONArray | provenance |  |
-| Test.java:928:10:928:11 | in : JSONArray | Test.java:928:10:928:30 | toJSONObject(...) : JSONObject | provenance | MaD:95 |
+| Test.java:928:10:928:11 | in : JSONArray | Test.java:928:10:928:30 | toJSONObject(...) : JSONObject | provenance | MaD:96 |
 | Test.java:928:10:928:30 | toJSONObject(...) : JSONObject | Test.java:929:9:929:11 | out | provenance |  |
 | Test.java:934:19:934:37 | (...)... : JSONArray | Test.java:936:32:936:33 | in : JSONArray | provenance |  |
 | Test.java:934:30:934:37 | source(...) : Object | Test.java:934:19:934:37 | (...)... : JSONArray | provenance |  |
 | Test.java:936:10:936:34 | toJSONObject(...) : JSONObject | Test.java:937:9:937:11 | out | provenance |  |
-| Test.java:936:32:936:33 | in : JSONArray | Test.java:936:10:936:34 | toJSONObject(...) : JSONObject | provenance | MaD:96 |
+| Test.java:936:32:936:33 | in : JSONArray | Test.java:936:10:936:34 | toJSONObject(...) : JSONObject | provenance | MaD:95 |
 | Test.java:942:13:942:25 | (...)... : Number | Test.java:944:28:944:29 | in : Number | provenance |  |
 | Test.java:942:18:942:25 | source(...) : Object | Test.java:942:13:942:25 | (...)... : Number | provenance |  |
 | Test.java:944:10:944:30 | toString(...) : String | Test.java:945:9:945:11 | out | provenance |  |
 | Test.java:944:28:944:29 | in : Number | Test.java:944:10:944:30 | toString(...) : String | provenance | MaD:97 |
 | Test.java:950:19:950:37 | (...)... : JSONArray | Test.java:951:4:951:5 | in : JSONArray | provenance |  |
 | Test.java:950:30:950:37 | source(...) : Object | Test.java:950:19:950:37 | (...)... : JSONArray | provenance |  |
-| Test.java:951:4:951:5 | in : JSONArray | Test.java:951:13:951:15 | out [post update] : Writer | provenance | MaD:98 |
+| Test.java:951:4:951:5 | in : JSONArray | Test.java:951:13:951:15 | out [post update] : Writer | provenance | MaD:99 |
 | Test.java:951:13:951:15 | out [post update] : Writer | Test.java:952:9:952:11 | out | provenance |  |
 | Test.java:957:19:957:37 | (...)... : JSONArray | Test.java:958:4:958:5 | in : JSONArray | provenance |  |
 | Test.java:957:30:957:37 | source(...) : Object | Test.java:957:19:957:37 | (...)... : JSONArray | provenance |  |
-| Test.java:958:4:958:5 | in : JSONArray | Test.java:958:13:958:15 | out [post update] : Writer | provenance | MaD:98 |
+| Test.java:958:4:958:5 | in : JSONArray | Test.java:958:13:958:15 | out [post update] : Writer | provenance | MaD:99 |
 | Test.java:958:13:958:15 | out [post update] : Writer | Test.java:959:9:959:11 | out | provenance |  |
 | Test.java:964:16:964:31 | (...)... : Writer | Test.java:966:25:966:26 | in : Writer | provenance |  |
 | Test.java:964:24:964:31 | source(...) : Object | Test.java:964:16:964:31 | (...)... : Writer | provenance |  |
 | Test.java:966:10:966:33 | write(...) : Writer | Test.java:967:9:967:11 | out | provenance |  |
-| Test.java:966:25:966:26 | in : Writer | Test.java:966:10:966:33 | write(...) : Writer | provenance | MaD:99 |
+| Test.java:966:25:966:26 | in : Writer | Test.java:966:10:966:33 | write(...) : Writer | provenance | MaD:98 |
 | Test.java:972:16:972:31 | (...)... : Writer | Test.java:974:25:974:26 | in : Writer | provenance |  |
 | Test.java:972:24:972:31 | source(...) : Object | Test.java:972:16:972:31 | (...)... : Writer | provenance |  |
 | Test.java:974:10:974:27 | write(...) : Writer | Test.java:975:9:975:11 | out | provenance |  |
-| Test.java:974:25:974:26 | in : Writer | Test.java:974:10:974:27 | write(...) : Writer | provenance | MaD:99 |
+| Test.java:974:25:974:26 | in : Writer | Test.java:974:10:974:27 | write(...) : Writer | provenance | MaD:98 |
 | Test.java:980:20:980:39 | (...)... : XMLTokener | Test.java:981:29:981:30 | in : XMLTokener | provenance |  |
 | Test.java:980:32:980:39 | source(...) : Object | Test.java:980:20:980:39 | (...)... : XMLTokener | provenance |  |
 | Test.java:981:10:981:38 | toJSONArray(...) : JSONArray | Test.java:982:9:982:11 | out | provenance |  |
@@ -870,13 +870,13 @@ edges
 | Test.java:1071:13:1071:40 | (...)... : Map [<map.key>] : Object | Test.java:1072:25:1072:26 | in : Map [<map.key>] : Object | provenance |  |
 | Test.java:1071:18:1071:40 | newWithMapKey(...) : Map [<map.key>] : Object | Test.java:1071:13:1071:40 | (...)... : Map [<map.key>] : Object | provenance |  |
 | Test.java:1071:32:1071:39 | source(...) : Object | Test.java:45:20:45:33 | element : Object | provenance |  |
-| Test.java:1071:32:1071:39 | source(...) : Object | Test.java:1071:18:1071:40 | newWithMapKey(...) : Map [<map.key>] : Object | provenance | MaD:6 |
+| Test.java:1071:32:1071:39 | source(...) : Object | Test.java:1071:18:1071:40 | newWithMapKey(...) : Map [<map.key>] : Object | provenance | MaD:4 |
 | Test.java:1072:10:1072:27 | new JSONObject(...) : JSONObject | Test.java:1073:9:1073:11 | out | provenance |  |
 | Test.java:1072:25:1072:26 | in : Map [<map.key>] : Object | Test.java:1072:10:1072:27 | new JSONObject(...) : JSONObject | provenance | MaD:106 |
 | Test.java:1078:13:1078:42 | (...)... : Map [<map.value>] : Object | Test.java:1079:25:1079:26 | in : Map [<map.value>] : Object | provenance |  |
 | Test.java:1078:18:1078:42 | newWithMapValue(...) : Map [<map.value>] : Object | Test.java:1078:13:1078:42 | (...)... : Map [<map.value>] : Object | provenance |  |
 | Test.java:1078:34:1078:41 | source(...) : Object | Test.java:46:22:46:35 | element : Object | provenance |  |
-| Test.java:1078:34:1078:41 | source(...) : Object | Test.java:1078:18:1078:42 | newWithMapValue(...) : Map [<map.value>] : Object | provenance | MaD:7 |
+| Test.java:1078:34:1078:41 | source(...) : Object | Test.java:1078:18:1078:42 | newWithMapValue(...) : Map [<map.value>] : Object | provenance | MaD:5 |
 | Test.java:1079:10:1079:27 | new JSONObject(...) : JSONObject | Test.java:1080:9:1080:11 | out | provenance |  |
 | Test.java:1079:25:1079:26 | in : Map [<map.value>] : Object | Test.java:1079:10:1079:27 | new JSONObject(...) : JSONObject | provenance | MaD:107 |
 | Test.java:1085:16:1085:31 | (...)... : Object | Test.java:1086:25:1086:26 | in : Object | provenance |  |
@@ -903,28 +903,28 @@ edges
 | Test.java:1114:25:1114:26 | in : String | Test.java:1114:10:1114:41 | new JSONObject(...) : JSONObject | provenance | MaD:112 |
 | Test.java:1120:20:1120:39 | (...)... : JSONObject | Test.java:1121:10:1121:11 | in : JSONObject | provenance |  |
 | Test.java:1120:32:1120:39 | source(...) : Object | Test.java:1120:20:1120:39 | (...)... : JSONObject | provenance |  |
-| Test.java:1121:10:1121:11 | in : JSONObject | Test.java:1121:10:1121:34 | accumulate(...) : JSONObject | provenance | MaD:113 |
+| Test.java:1121:10:1121:11 | in : JSONObject | Test.java:1121:10:1121:34 | accumulate(...) : JSONObject | provenance | MaD:114 |
 | Test.java:1121:10:1121:34 | accumulate(...) : JSONObject | Test.java:1122:9:1122:11 | out | provenance |  |
 | Test.java:1127:16:1127:31 | (...)... : String | Test.java:1128:19:1128:20 | in : String | provenance |  |
 | Test.java:1127:24:1127:31 | source(...) : Object | Test.java:1127:16:1127:31 | (...)... : String | provenance |  |
 | Test.java:1128:4:1128:6 | out [post update] : JSONObject | Test.java:1129:9:1129:11 | out | provenance |  |
-| Test.java:1128:19:1128:20 | in : String | Test.java:1128:4:1128:6 | out [post update] : JSONObject | provenance | MaD:114 |
+| Test.java:1128:19:1128:20 | in : String | Test.java:1128:4:1128:6 | out [post update] : JSONObject | provenance | MaD:113 |
 | Test.java:1134:16:1134:31 | (...)... : Object | Test.java:1135:25:1135:26 | in : Object | provenance |  |
 | Test.java:1134:24:1134:31 | source(...) : Object | Test.java:1134:16:1134:31 | (...)... : Object | provenance |  |
 | Test.java:1135:4:1135:6 | out [post update] : JSONObject | Test.java:1136:9:1136:11 | out | provenance |  |
-| Test.java:1135:25:1135:26 | in : Object | Test.java:1135:4:1135:6 | out [post update] : JSONObject | provenance | MaD:114 |
+| Test.java:1135:25:1135:26 | in : Object | Test.java:1135:4:1135:6 | out [post update] : JSONObject | provenance | MaD:113 |
 | Test.java:1141:20:1141:39 | (...)... : JSONObject | Test.java:1142:10:1142:11 | in : JSONObject | provenance |  |
 | Test.java:1141:32:1141:39 | source(...) : Object | Test.java:1141:20:1141:39 | (...)... : JSONObject | provenance |  |
-| Test.java:1142:10:1142:11 | in : JSONObject | Test.java:1142:10:1142:30 | append(...) : JSONObject | provenance | MaD:115 |
+| Test.java:1142:10:1142:11 | in : JSONObject | Test.java:1142:10:1142:30 | append(...) : JSONObject | provenance | MaD:116 |
 | Test.java:1142:10:1142:30 | append(...) : JSONObject | Test.java:1143:9:1143:11 | out | provenance |  |
 | Test.java:1148:16:1148:31 | (...)... : String | Test.java:1149:15:1149:16 | in : String | provenance |  |
 | Test.java:1148:24:1148:31 | source(...) : Object | Test.java:1148:16:1148:31 | (...)... : String | provenance |  |
 | Test.java:1149:4:1149:6 | out [post update] : JSONObject | Test.java:1150:9:1150:11 | out | provenance |  |
-| Test.java:1149:15:1149:16 | in : String | Test.java:1149:4:1149:6 | out [post update] : JSONObject | provenance | MaD:116 |
+| Test.java:1149:15:1149:16 | in : String | Test.java:1149:4:1149:6 | out [post update] : JSONObject | provenance | MaD:115 |
 | Test.java:1155:16:1155:31 | (...)... : Object | Test.java:1156:21:1156:22 | in : Object | provenance |  |
 | Test.java:1155:24:1155:31 | source(...) : Object | Test.java:1155:16:1155:31 | (...)... : Object | provenance |  |
 | Test.java:1156:4:1156:6 | out [post update] : JSONObject | Test.java:1157:9:1157:11 | out | provenance |  |
-| Test.java:1156:21:1156:22 | in : Object | Test.java:1156:4:1156:6 | out [post update] : JSONObject | provenance | MaD:116 |
+| Test.java:1156:21:1156:22 | in : Object | Test.java:1156:4:1156:6 | out [post update] : JSONObject | provenance | MaD:115 |
 | Test.java:1162:16:1162:31 | (...)... : Number | Test.java:1163:36:1163:37 | in : Number | provenance |  |
 | Test.java:1162:24:1162:31 | source(...) : Object | Test.java:1162:16:1162:31 | (...)... : Number | provenance |  |
 | Test.java:1163:10:1163:38 | doubleToString(...) : String | Test.java:1164:9:1164:11 | out | provenance |  |
@@ -995,12 +995,12 @@ edges
 | Test.java:1268:10:1268:27 | getString(...) : String | Test.java:1269:9:1269:11 | out | provenance |  |
 | Test.java:1274:20:1274:39 | (...)... : JSONObject | Test.java:1275:10:1275:11 | in : JSONObject | provenance |  |
 | Test.java:1274:32:1274:39 | source(...) : Object | Test.java:1274:20:1274:39 | (...)... : JSONObject | provenance |  |
-| Test.java:1275:10:1275:11 | in : JSONObject | Test.java:1275:10:1275:27 | increment(...) : JSONObject | provenance | MaD:132 |
+| Test.java:1275:10:1275:11 | in : JSONObject | Test.java:1275:10:1275:27 | increment(...) : JSONObject | provenance | MaD:133 |
 | Test.java:1275:10:1275:27 | increment(...) : JSONObject | Test.java:1276:9:1276:11 | out | provenance |  |
 | Test.java:1281:16:1281:31 | (...)... : String | Test.java:1282:18:1282:19 | in : String | provenance |  |
 | Test.java:1281:24:1281:31 | source(...) : Object | Test.java:1281:16:1281:31 | (...)... : String | provenance |  |
 | Test.java:1282:4:1282:6 | out [post update] : JSONObject | Test.java:1283:9:1283:11 | out | provenance |  |
-| Test.java:1282:18:1282:19 | in : String | Test.java:1282:4:1282:6 | out [post update] : JSONObject | provenance | MaD:133 |
+| Test.java:1282:18:1282:19 | in : String | Test.java:1282:4:1282:6 | out [post update] : JSONObject | provenance | MaD:132 |
 | Test.java:1288:20:1288:39 | (...)... : JSONObject | Test.java:1289:10:1289:11 | in : JSONObject | provenance |  |
 | Test.java:1288:32:1288:39 | source(...) : Object | Test.java:1288:20:1288:39 | (...)... : JSONObject | provenance |  |
 | Test.java:1289:10:1289:11 | in : JSONObject | Test.java:1289:10:1289:20 | keySet(...) : Set [<element>] : Object | provenance | MaD:134 |
@@ -1027,80 +1027,80 @@ edges
 | Test.java:1317:10:1317:21 | opt(...) : Object | Test.java:1318:9:1318:11 | out | provenance |  |
 | Test.java:1323:20:1323:39 | (...)... : JSONObject | Test.java:1324:10:1324:11 | in : JSONObject | provenance |  |
 | Test.java:1323:32:1323:39 | source(...) : Object | Test.java:1323:20:1323:39 | (...)... : JSONObject | provenance |  |
-| Test.java:1324:10:1324:11 | in : JSONObject | Test.java:1324:10:1324:37 | optBigDecimal(...) : BigDecimal | provenance | MaD:139 |
+| Test.java:1324:10:1324:11 | in : JSONObject | Test.java:1324:10:1324:37 | optBigDecimal(...) : BigDecimal | provenance | MaD:140 |
 | Test.java:1324:10:1324:37 | optBigDecimal(...) : BigDecimal | Test.java:1325:9:1325:11 | out | provenance |  |
 | Test.java:1330:20:1330:39 | (...)... : BigDecimal | Test.java:1332:39:1332:40 | in : BigDecimal | provenance |  |
 | Test.java:1330:32:1330:39 | source(...) : Object | Test.java:1330:20:1330:39 | (...)... : BigDecimal | provenance |  |
 | Test.java:1332:10:1332:41 | optBigDecimal(...) : BigDecimal | Test.java:1333:9:1333:11 | out | provenance |  |
-| Test.java:1332:39:1332:40 | in : BigDecimal | Test.java:1332:10:1332:41 | optBigDecimal(...) : BigDecimal | provenance | MaD:140 |
+| Test.java:1332:39:1332:40 | in : BigDecimal | Test.java:1332:10:1332:41 | optBigDecimal(...) : BigDecimal | provenance | MaD:139 |
 | Test.java:1338:20:1338:39 | (...)... : JSONObject | Test.java:1339:10:1339:11 | in : JSONObject | provenance |  |
 | Test.java:1338:32:1338:39 | source(...) : Object | Test.java:1338:20:1338:39 | (...)... : JSONObject | provenance |  |
-| Test.java:1339:10:1339:11 | in : JSONObject | Test.java:1339:10:1339:37 | optBigInteger(...) : BigInteger | provenance | MaD:141 |
+| Test.java:1339:10:1339:11 | in : JSONObject | Test.java:1339:10:1339:37 | optBigInteger(...) : BigInteger | provenance | MaD:142 |
 | Test.java:1339:10:1339:37 | optBigInteger(...) : BigInteger | Test.java:1340:9:1340:11 | out | provenance |  |
 | Test.java:1345:20:1345:39 | (...)... : BigInteger | Test.java:1347:39:1347:40 | in : BigInteger | provenance |  |
 | Test.java:1345:32:1345:39 | source(...) : Object | Test.java:1345:20:1345:39 | (...)... : BigInteger | provenance |  |
 | Test.java:1347:10:1347:41 | optBigInteger(...) : BigInteger | Test.java:1348:9:1348:11 | out | provenance |  |
-| Test.java:1347:39:1347:40 | in : BigInteger | Test.java:1347:10:1347:41 | optBigInteger(...) : BigInteger | provenance | MaD:142 |
+| Test.java:1347:39:1347:40 | in : BigInteger | Test.java:1347:10:1347:41 | optBigInteger(...) : BigInteger | provenance | MaD:141 |
 | Test.java:1353:20:1353:39 | (...)... : JSONObject | Test.java:1354:10:1354:11 | in : JSONObject | provenance |  |
 | Test.java:1353:32:1353:39 | source(...) : Object | Test.java:1353:20:1353:39 | (...)... : JSONObject | provenance |  |
-| Test.java:1354:10:1354:11 | in : JSONObject | Test.java:1354:10:1354:35 | optBoolean(...) : Boolean | provenance | MaD:143 |
+| Test.java:1354:10:1354:11 | in : JSONObject | Test.java:1354:10:1354:35 | optBoolean(...) : Boolean | provenance | MaD:144 |
 | Test.java:1354:10:1354:35 | optBoolean(...) : Boolean | Test.java:1355:9:1355:11 | out | provenance |  |
 | Test.java:1360:20:1360:39 | (...)... : JSONObject | Test.java:1361:10:1361:11 | in : JSONObject | provenance |  |
 | Test.java:1360:32:1360:39 | source(...) : Object | Test.java:1360:20:1360:39 | (...)... : JSONObject | provenance |  |
-| Test.java:1361:10:1361:11 | in : JSONObject | Test.java:1361:10:1361:28 | optBoolean(...) : Boolean | provenance | MaD:143 |
+| Test.java:1361:10:1361:11 | in : JSONObject | Test.java:1361:10:1361:28 | optBoolean(...) : Boolean | provenance | MaD:144 |
 | Test.java:1361:10:1361:28 | optBoolean(...) : Boolean | Test.java:1362:9:1362:11 | out | provenance |  |
 | Test.java:1367:17:1367:33 | (...)... : Boolean | Test.java:1369:36:1369:37 | in : Boolean | provenance |  |
 | Test.java:1367:26:1367:33 | source(...) : Object | Test.java:1367:17:1367:33 | (...)... : Boolean | provenance |  |
 | Test.java:1369:10:1369:38 | optBoolean(...) : Boolean | Test.java:1370:9:1370:11 | out | provenance |  |
-| Test.java:1369:36:1369:37 | in : Boolean | Test.java:1369:10:1369:38 | optBoolean(...) : Boolean | provenance | MaD:144 |
+| Test.java:1369:36:1369:37 | in : Boolean | Test.java:1369:10:1369:38 | optBoolean(...) : Boolean | provenance | MaD:143 |
 | Test.java:1375:20:1375:39 | (...)... : JSONObject | Test.java:1376:10:1376:11 | in : JSONObject | provenance |  |
 | Test.java:1375:32:1375:39 | source(...) : Object | Test.java:1375:20:1375:39 | (...)... : JSONObject | provenance |  |
-| Test.java:1376:10:1376:11 | in : JSONObject | Test.java:1376:10:1376:32 | optDouble(...) : Number | provenance | MaD:145 |
+| Test.java:1376:10:1376:11 | in : JSONObject | Test.java:1376:10:1376:32 | optDouble(...) : Number | provenance | MaD:146 |
 | Test.java:1376:10:1376:32 | optDouble(...) : Number | Test.java:1377:9:1377:11 | out | provenance |  |
 | Test.java:1382:20:1382:39 | (...)... : JSONObject | Test.java:1383:10:1383:11 | in : JSONObject | provenance |  |
 | Test.java:1382:32:1382:39 | source(...) : Object | Test.java:1382:20:1382:39 | (...)... : JSONObject | provenance |  |
-| Test.java:1383:10:1383:11 | in : JSONObject | Test.java:1383:10:1383:27 | optDouble(...) : Number | provenance | MaD:145 |
+| Test.java:1383:10:1383:11 | in : JSONObject | Test.java:1383:10:1383:27 | optDouble(...) : Number | provenance | MaD:146 |
 | Test.java:1383:10:1383:27 | optDouble(...) : Number | Test.java:1384:9:1384:11 | out | provenance |  |
 | Test.java:1389:16:1389:31 | (...)... : Number | Test.java:1391:35:1391:36 | in : Number | provenance |  |
 | Test.java:1389:24:1389:31 | source(...) : Object | Test.java:1389:16:1389:31 | (...)... : Number | provenance |  |
 | Test.java:1391:10:1391:37 | optDouble(...) : Number | Test.java:1392:9:1392:11 | out | provenance |  |
-| Test.java:1391:35:1391:36 | in : Number | Test.java:1391:10:1391:37 | optDouble(...) : Number | provenance | MaD:146 |
+| Test.java:1391:35:1391:36 | in : Number | Test.java:1391:10:1391:37 | optDouble(...) : Number | provenance | MaD:145 |
 | Test.java:1397:20:1397:39 | (...)... : JSONObject | Test.java:1398:10:1398:11 | in : JSONObject | provenance |  |
 | Test.java:1397:32:1397:39 | source(...) : Object | Test.java:1397:20:1397:39 | (...)... : JSONObject | provenance |  |
-| Test.java:1398:10:1398:11 | in : JSONObject | Test.java:1398:10:1398:37 | optEnum(...) : Enum | provenance | MaD:147 |
+| Test.java:1398:10:1398:11 | in : JSONObject | Test.java:1398:10:1398:37 | optEnum(...) : Enum | provenance | MaD:148 |
 | Test.java:1398:10:1398:37 | optEnum(...) : Enum | Test.java:1399:9:1399:11 | out | provenance |  |
 | Test.java:1404:20:1404:39 | (...)... : JSONObject | Test.java:1405:10:1405:11 | in : JSONObject | provenance |  |
 | Test.java:1404:32:1404:39 | source(...) : Object | Test.java:1404:20:1404:39 | (...)... : JSONObject | provenance |  |
-| Test.java:1405:10:1405:11 | in : JSONObject | Test.java:1405:10:1405:31 | optEnum(...) : Enum | provenance | MaD:147 |
+| Test.java:1405:10:1405:11 | in : JSONObject | Test.java:1405:10:1405:31 | optEnum(...) : Enum | provenance | MaD:148 |
 | Test.java:1405:10:1405:31 | optEnum(...) : Enum | Test.java:1406:9:1406:11 | out | provenance |  |
 | Test.java:1411:14:1411:27 | (...)... : Enum | Test.java:1413:39:1413:40 | in : Enum | provenance |  |
 | Test.java:1411:20:1411:27 | source(...) : Object | Test.java:1411:14:1411:27 | (...)... : Enum | provenance |  |
 | Test.java:1413:10:1413:41 | optEnum(...) : Enum | Test.java:1414:9:1414:11 | out | provenance |  |
-| Test.java:1413:39:1413:40 | in : Enum | Test.java:1413:10:1413:41 | optEnum(...) : Enum | provenance | MaD:148 |
+| Test.java:1413:39:1413:40 | in : Enum | Test.java:1413:10:1413:41 | optEnum(...) : Enum | provenance | MaD:147 |
 | Test.java:1419:20:1419:39 | (...)... : JSONObject | Test.java:1420:10:1420:11 | in : JSONObject | provenance |  |
 | Test.java:1419:32:1419:39 | source(...) : Object | Test.java:1419:20:1419:39 | (...)... : JSONObject | provenance |  |
-| Test.java:1420:10:1420:11 | in : JSONObject | Test.java:1420:10:1420:32 | optFloat(...) : Number | provenance | MaD:149 |
+| Test.java:1420:10:1420:11 | in : JSONObject | Test.java:1420:10:1420:32 | optFloat(...) : Number | provenance | MaD:150 |
 | Test.java:1420:10:1420:32 | optFloat(...) : Number | Test.java:1421:9:1421:11 | out | provenance |  |
 | Test.java:1426:20:1426:39 | (...)... : JSONObject | Test.java:1427:10:1427:11 | in : JSONObject | provenance |  |
 | Test.java:1426:32:1426:39 | source(...) : Object | Test.java:1426:20:1426:39 | (...)... : JSONObject | provenance |  |
-| Test.java:1427:10:1427:11 | in : JSONObject | Test.java:1427:10:1427:26 | optFloat(...) : Number | provenance | MaD:149 |
+| Test.java:1427:10:1427:11 | in : JSONObject | Test.java:1427:10:1427:26 | optFloat(...) : Number | provenance | MaD:150 |
 | Test.java:1427:10:1427:26 | optFloat(...) : Number | Test.java:1428:9:1428:11 | out | provenance |  |
 | Test.java:1433:15:1433:29 | (...)... : Number | Test.java:1435:34:1435:35 | in : Number | provenance |  |
 | Test.java:1433:22:1433:29 | source(...) : Object | Test.java:1433:15:1433:29 | (...)... : Number | provenance |  |
 | Test.java:1435:10:1435:36 | optFloat(...) : Number | Test.java:1436:9:1436:11 | out | provenance |  |
-| Test.java:1435:34:1435:35 | in : Number | Test.java:1435:10:1435:36 | optFloat(...) : Number | provenance | MaD:150 |
+| Test.java:1435:34:1435:35 | in : Number | Test.java:1435:10:1435:36 | optFloat(...) : Number | provenance | MaD:149 |
 | Test.java:1441:20:1441:39 | (...)... : JSONObject | Test.java:1442:10:1442:11 | in : JSONObject | provenance |  |
 | Test.java:1441:32:1441:39 | source(...) : Object | Test.java:1441:20:1441:39 | (...)... : JSONObject | provenance |  |
-| Test.java:1442:10:1442:11 | in : JSONObject | Test.java:1442:10:1442:27 | optInt(...) : Number | provenance | MaD:151 |
+| Test.java:1442:10:1442:11 | in : JSONObject | Test.java:1442:10:1442:27 | optInt(...) : Number | provenance | MaD:152 |
 | Test.java:1442:10:1442:27 | optInt(...) : Number | Test.java:1443:9:1443:11 | out | provenance |  |
 | Test.java:1448:20:1448:39 | (...)... : JSONObject | Test.java:1449:10:1449:11 | in : JSONObject | provenance |  |
 | Test.java:1448:32:1448:39 | source(...) : Object | Test.java:1448:20:1448:39 | (...)... : JSONObject | provenance |  |
-| Test.java:1449:10:1449:11 | in : JSONObject | Test.java:1449:10:1449:24 | optInt(...) : Number | provenance | MaD:151 |
+| Test.java:1449:10:1449:11 | in : JSONObject | Test.java:1449:10:1449:24 | optInt(...) : Number | provenance | MaD:152 |
 | Test.java:1449:10:1449:24 | optInt(...) : Number | Test.java:1450:9:1450:11 | out | provenance |  |
 | Test.java:1455:13:1455:25 | (...)... : Number | Test.java:1457:32:1457:33 | in : Number | provenance |  |
 | Test.java:1455:18:1455:25 | source(...) : Object | Test.java:1455:13:1455:25 | (...)... : Number | provenance |  |
 | Test.java:1457:10:1457:34 | optInt(...) : Number | Test.java:1458:9:1458:11 | out | provenance |  |
-| Test.java:1457:32:1457:33 | in : Number | Test.java:1457:10:1457:34 | optInt(...) : Number | provenance | MaD:152 |
+| Test.java:1457:32:1457:33 | in : Number | Test.java:1457:10:1457:34 | optInt(...) : Number | provenance | MaD:151 |
 | Test.java:1463:20:1463:39 | (...)... : JSONObject | Test.java:1464:10:1464:11 | in : JSONObject | provenance |  |
 | Test.java:1463:32:1463:39 | source(...) : Object | Test.java:1463:20:1463:39 | (...)... : JSONObject | provenance |  |
 | Test.java:1464:10:1464:11 | in : JSONObject | Test.java:1464:10:1464:30 | optJSONArray(...) : JSONArray | provenance | MaD:153 |
@@ -1111,28 +1111,28 @@ edges
 | Test.java:1471:10:1471:31 | optJSONObject(...) : JSONObject | Test.java:1472:9:1472:11 | out | provenance |  |
 | Test.java:1477:20:1477:39 | (...)... : JSONObject | Test.java:1478:10:1478:11 | in : JSONObject | provenance |  |
 | Test.java:1477:32:1477:39 | source(...) : Object | Test.java:1477:20:1477:39 | (...)... : JSONObject | provenance |  |
-| Test.java:1478:10:1478:11 | in : JSONObject | Test.java:1478:10:1478:29 | optLong(...) : Number | provenance | MaD:155 |
+| Test.java:1478:10:1478:11 | in : JSONObject | Test.java:1478:10:1478:29 | optLong(...) : Number | provenance | MaD:156 |
 | Test.java:1478:10:1478:29 | optLong(...) : Number | Test.java:1479:9:1479:11 | out | provenance |  |
 | Test.java:1484:20:1484:39 | (...)... : JSONObject | Test.java:1485:10:1485:11 | in : JSONObject | provenance |  |
 | Test.java:1484:32:1484:39 | source(...) : Object | Test.java:1484:20:1484:39 | (...)... : JSONObject | provenance |  |
-| Test.java:1485:10:1485:11 | in : JSONObject | Test.java:1485:10:1485:25 | optLong(...) : Number | provenance | MaD:155 |
+| Test.java:1485:10:1485:11 | in : JSONObject | Test.java:1485:10:1485:25 | optLong(...) : Number | provenance | MaD:156 |
 | Test.java:1485:10:1485:25 | optLong(...) : Number | Test.java:1486:9:1486:11 | out | provenance |  |
 | Test.java:1491:14:1491:27 | (...)... : Number | Test.java:1493:33:1493:34 | in : Number | provenance |  |
 | Test.java:1491:20:1491:27 | source(...) : Object | Test.java:1491:14:1491:27 | (...)... : Number | provenance |  |
 | Test.java:1493:10:1493:35 | optLong(...) : Number | Test.java:1494:9:1494:11 | out | provenance |  |
-| Test.java:1493:33:1493:34 | in : Number | Test.java:1493:10:1493:35 | optLong(...) : Number | provenance | MaD:156 |
+| Test.java:1493:33:1493:34 | in : Number | Test.java:1493:10:1493:35 | optLong(...) : Number | provenance | MaD:155 |
 | Test.java:1499:20:1499:39 | (...)... : JSONObject | Test.java:1500:10:1500:11 | in : JSONObject | provenance |  |
 | Test.java:1499:32:1499:39 | source(...) : Object | Test.java:1499:20:1499:39 | (...)... : JSONObject | provenance |  |
-| Test.java:1500:10:1500:11 | in : JSONObject | Test.java:1500:10:1500:33 | optNumber(...) : Number | provenance | MaD:157 |
+| Test.java:1500:10:1500:11 | in : JSONObject | Test.java:1500:10:1500:33 | optNumber(...) : Number | provenance | MaD:158 |
 | Test.java:1500:10:1500:33 | optNumber(...) : Number | Test.java:1501:9:1501:11 | out | provenance |  |
 | Test.java:1506:20:1506:39 | (...)... : JSONObject | Test.java:1507:10:1507:11 | in : JSONObject | provenance |  |
 | Test.java:1506:32:1506:39 | source(...) : Object | Test.java:1506:20:1506:39 | (...)... : JSONObject | provenance |  |
-| Test.java:1507:10:1507:11 | in : JSONObject | Test.java:1507:10:1507:27 | optNumber(...) : Number | provenance | MaD:157 |
+| Test.java:1507:10:1507:11 | in : JSONObject | Test.java:1507:10:1507:27 | optNumber(...) : Number | provenance | MaD:158 |
 | Test.java:1507:10:1507:27 | optNumber(...) : Number | Test.java:1508:9:1508:11 | out | provenance |  |
 | Test.java:1513:16:1513:31 | (...)... : Number | Test.java:1515:35:1515:36 | in : Number | provenance |  |
 | Test.java:1513:24:1513:31 | source(...) : Object | Test.java:1513:16:1513:31 | (...)... : Number | provenance |  |
 | Test.java:1515:10:1515:37 | optNumber(...) : Number | Test.java:1516:9:1516:11 | out | provenance |  |
-| Test.java:1515:35:1515:36 | in : Number | Test.java:1515:10:1515:37 | optNumber(...) : Number | provenance | MaD:158 |
+| Test.java:1515:35:1515:36 | in : Number | Test.java:1515:10:1515:37 | optNumber(...) : Number | provenance | MaD:157 |
 | Test.java:1521:20:1521:39 | (...)... : JSONObject | Test.java:1522:10:1522:11 | in : JSONObject | provenance |  |
 | Test.java:1521:32:1521:39 | source(...) : Object | Test.java:1521:20:1521:39 | (...)... : JSONObject | provenance |  |
 | Test.java:1522:10:1522:11 | in : JSONObject | Test.java:1522:10:1522:34 | optQuery(...) : Object | provenance | MaD:159 |
@@ -1143,146 +1143,146 @@ edges
 | Test.java:1529:10:1529:39 | optQuery(...) : Object | Test.java:1530:9:1530:11 | out | provenance |  |
 | Test.java:1535:20:1535:39 | (...)... : JSONObject | Test.java:1536:10:1536:11 | in : JSONObject | provenance |  |
 | Test.java:1535:32:1535:39 | source(...) : Object | Test.java:1535:20:1535:39 | (...)... : JSONObject | provenance |  |
-| Test.java:1536:10:1536:11 | in : JSONObject | Test.java:1536:10:1536:33 | optString(...) : String | provenance | MaD:160 |
+| Test.java:1536:10:1536:11 | in : JSONObject | Test.java:1536:10:1536:33 | optString(...) : String | provenance | MaD:161 |
 | Test.java:1536:10:1536:33 | optString(...) : String | Test.java:1537:9:1537:11 | out | provenance |  |
 | Test.java:1542:20:1542:39 | (...)... : JSONObject | Test.java:1543:10:1543:11 | in : JSONObject | provenance |  |
 | Test.java:1542:32:1542:39 | source(...) : Object | Test.java:1542:20:1542:39 | (...)... : JSONObject | provenance |  |
-| Test.java:1543:10:1543:11 | in : JSONObject | Test.java:1543:10:1543:27 | optString(...) : String | provenance | MaD:160 |
+| Test.java:1543:10:1543:11 | in : JSONObject | Test.java:1543:10:1543:27 | optString(...) : String | provenance | MaD:161 |
 | Test.java:1543:10:1543:27 | optString(...) : String | Test.java:1544:9:1544:11 | out | provenance |  |
 | Test.java:1549:16:1549:31 | (...)... : String | Test.java:1551:35:1551:36 | in : String | provenance |  |
 | Test.java:1549:24:1549:31 | source(...) : Object | Test.java:1549:16:1549:31 | (...)... : String | provenance |  |
 | Test.java:1551:10:1551:37 | optString(...) : String | Test.java:1552:9:1552:11 | out | provenance |  |
-| Test.java:1551:35:1551:36 | in : String | Test.java:1551:10:1551:37 | optString(...) : String | provenance | MaD:161 |
+| Test.java:1551:35:1551:36 | in : String | Test.java:1551:10:1551:37 | optString(...) : String | provenance | MaD:160 |
 | Test.java:1557:16:1557:31 | (...)... : String | Test.java:1558:12:1558:13 | in : String | provenance |  |
 | Test.java:1557:24:1557:31 | source(...) : Object | Test.java:1557:16:1557:31 | (...)... : String | provenance |  |
 | Test.java:1558:4:1558:6 | out [post update] : JSONObject | Test.java:1559:9:1559:11 | out | provenance |  |
-| Test.java:1558:12:1558:13 | in : String | Test.java:1558:4:1558:6 | out [post update] : JSONObject | provenance | MaD:163 |
+| Test.java:1558:12:1558:13 | in : String | Test.java:1558:4:1558:6 | out [post update] : JSONObject | provenance | MaD:162 |
 | Test.java:1564:20:1564:55 | (...)... : List [<element>] : Object | Test.java:1565:26:1565:27 | in : List [<element>] : Object | provenance |  |
 | Test.java:1564:32:1564:55 | newWithElement(...) : List [<element>] : Object | Test.java:1564:20:1564:55 | (...)... : List [<element>] : Object | provenance |  |
 | Test.java:1564:47:1564:54 | source(...) : Object | Test.java:44:22:44:35 | element : Object | provenance |  |
 | Test.java:1564:47:1564:54 | source(...) : Object | Test.java:1564:32:1564:55 | newWithElement(...) : List [<element>] : Object | provenance | MaD:3 |
 | Test.java:1565:4:1565:6 | out [post update] : JSONObject | Test.java:1566:9:1566:11 | out | provenance |  |
-| Test.java:1565:26:1565:27 | in : List [<element>] : Object | Test.java:1565:4:1565:6 | out [post update] : JSONObject | provenance | MaD:164 |
+| Test.java:1565:26:1565:27 | in : List [<element>] : Object | Test.java:1565:4:1565:6 | out [post update] : JSONObject | provenance | MaD:163 |
 | Test.java:1571:16:1571:31 | (...)... : String | Test.java:1572:12:1572:13 | in : String | provenance |  |
 | Test.java:1571:24:1571:31 | source(...) : Object | Test.java:1571:16:1571:31 | (...)... : String | provenance |  |
 | Test.java:1572:4:1572:6 | out [post update] : JSONObject | Test.java:1573:9:1573:11 | out | provenance |  |
-| Test.java:1572:12:1572:13 | in : String | Test.java:1572:4:1572:6 | out [post update] : JSONObject | provenance | MaD:165 |
+| Test.java:1572:12:1572:13 | in : String | Test.java:1572:4:1572:6 | out [post update] : JSONObject | provenance | MaD:164 |
 | Test.java:1578:13:1578:40 | (...)... : Map [<map.key>] : Object | Test.java:1579:26:1579:27 | in : Map [<map.key>] : Object | provenance |  |
 | Test.java:1578:18:1578:40 | newWithMapKey(...) : Map [<map.key>] : Object | Test.java:1578:13:1578:40 | (...)... : Map [<map.key>] : Object | provenance |  |
 | Test.java:1578:32:1578:39 | source(...) : Object | Test.java:45:20:45:33 | element : Object | provenance |  |
-| Test.java:1578:32:1578:39 | source(...) : Object | Test.java:1578:18:1578:40 | newWithMapKey(...) : Map [<map.key>] : Object | provenance | MaD:6 |
+| Test.java:1578:32:1578:39 | source(...) : Object | Test.java:1578:18:1578:40 | newWithMapKey(...) : Map [<map.key>] : Object | provenance | MaD:4 |
 | Test.java:1579:4:1579:6 | out [post update] : JSONObject | Test.java:1580:9:1580:11 | out | provenance |  |
-| Test.java:1579:26:1579:27 | in : Map [<map.key>] : Object | Test.java:1579:4:1579:6 | out [post update] : JSONObject | provenance | MaD:166 |
+| Test.java:1579:26:1579:27 | in : Map [<map.key>] : Object | Test.java:1579:4:1579:6 | out [post update] : JSONObject | provenance | MaD:165 |
 | Test.java:1585:13:1585:42 | (...)... : Map [<map.value>] : Object | Test.java:1586:26:1586:27 | in : Map [<map.value>] : Object | provenance |  |
 | Test.java:1585:18:1585:42 | newWithMapValue(...) : Map [<map.value>] : Object | Test.java:1585:13:1585:42 | (...)... : Map [<map.value>] : Object | provenance |  |
 | Test.java:1585:34:1585:41 | source(...) : Object | Test.java:46:22:46:35 | element : Object | provenance |  |
-| Test.java:1585:34:1585:41 | source(...) : Object | Test.java:1585:18:1585:42 | newWithMapValue(...) : Map [<map.value>] : Object | provenance | MaD:7 |
+| Test.java:1585:34:1585:41 | source(...) : Object | Test.java:1585:18:1585:42 | newWithMapValue(...) : Map [<map.value>] : Object | provenance | MaD:5 |
 | Test.java:1586:4:1586:6 | out [post update] : JSONObject | Test.java:1587:9:1587:11 | out | provenance |  |
-| Test.java:1586:26:1586:27 | in : Map [<map.value>] : Object | Test.java:1586:4:1586:6 | out [post update] : JSONObject | provenance | MaD:167 |
+| Test.java:1586:26:1586:27 | in : Map [<map.value>] : Object | Test.java:1586:4:1586:6 | out [post update] : JSONObject | provenance | MaD:166 |
 | Test.java:1592:16:1592:31 | (...)... : String | Test.java:1593:12:1593:13 | in : String | provenance |  |
 | Test.java:1592:24:1592:31 | source(...) : Object | Test.java:1592:16:1592:31 | (...)... : String | provenance |  |
 | Test.java:1593:4:1593:6 | out [post update] : JSONObject | Test.java:1594:9:1594:11 | out | provenance |  |
-| Test.java:1593:12:1593:13 | in : String | Test.java:1593:4:1593:6 | out [post update] : JSONObject | provenance | MaD:168 |
+| Test.java:1593:12:1593:13 | in : String | Test.java:1593:4:1593:6 | out [post update] : JSONObject | provenance | MaD:167 |
 | Test.java:1599:16:1599:31 | (...)... : Object | Test.java:1600:26:1600:27 | in : Object | provenance |  |
 | Test.java:1599:24:1599:31 | source(...) : Object | Test.java:1599:16:1599:31 | (...)... : Object | provenance |  |
 | Test.java:1600:4:1600:6 | out [post update] : JSONObject | Test.java:1601:9:1601:11 | out | provenance |  |
-| Test.java:1600:26:1600:27 | in : Object | Test.java:1600:4:1600:6 | out [post update] : JSONObject | provenance | MaD:169 |
+| Test.java:1600:26:1600:27 | in : Object | Test.java:1600:4:1600:6 | out [post update] : JSONObject | provenance | MaD:168 |
 | Test.java:1606:16:1606:31 | (...)... : String | Test.java:1607:12:1607:13 | in : String | provenance |  |
 | Test.java:1606:24:1606:31 | source(...) : Object | Test.java:1606:16:1606:31 | (...)... : String | provenance |  |
 | Test.java:1607:4:1607:6 | out [post update] : JSONObject | Test.java:1608:9:1608:11 | out | provenance |  |
-| Test.java:1607:12:1607:13 | in : String | Test.java:1607:4:1607:6 | out [post update] : JSONObject | provenance | MaD:170 |
+| Test.java:1607:12:1607:13 | in : String | Test.java:1607:4:1607:6 | out [post update] : JSONObject | provenance | MaD:169 |
 | Test.java:1613:17:1613:33 | (...)... : Boolean | Test.java:1614:26:1614:27 | in : Boolean | provenance |  |
 | Test.java:1613:26:1613:33 | source(...) : Object | Test.java:1613:17:1613:33 | (...)... : Boolean | provenance |  |
 | Test.java:1614:4:1614:6 | out [post update] : JSONObject | Test.java:1615:9:1615:11 | out | provenance |  |
-| Test.java:1614:26:1614:27 | in : Boolean | Test.java:1614:4:1614:6 | out [post update] : JSONObject | provenance | MaD:171 |
+| Test.java:1614:26:1614:27 | in : Boolean | Test.java:1614:4:1614:6 | out [post update] : JSONObject | provenance | MaD:170 |
 | Test.java:1620:16:1620:31 | (...)... : String | Test.java:1621:12:1621:13 | in : String | provenance |  |
 | Test.java:1620:24:1620:31 | source(...) : Object | Test.java:1620:16:1620:31 | (...)... : String | provenance |  |
 | Test.java:1621:4:1621:6 | out [post update] : JSONObject | Test.java:1622:9:1622:11 | out | provenance |  |
-| Test.java:1621:12:1621:13 | in : String | Test.java:1621:4:1621:6 | out [post update] : JSONObject | provenance | MaD:172 |
+| Test.java:1621:12:1621:13 | in : String | Test.java:1621:4:1621:6 | out [post update] : JSONObject | provenance | MaD:171 |
 | Test.java:1627:16:1627:31 | (...)... : Number | Test.java:1628:26:1628:27 | in : Number | provenance |  |
 | Test.java:1627:24:1627:31 | source(...) : Object | Test.java:1627:16:1627:31 | (...)... : Number | provenance |  |
 | Test.java:1628:4:1628:6 | out [post update] : JSONObject | Test.java:1629:9:1629:11 | out | provenance |  |
-| Test.java:1628:26:1628:27 | in : Number | Test.java:1628:4:1628:6 | out [post update] : JSONObject | provenance | MaD:173 |
+| Test.java:1628:26:1628:27 | in : Number | Test.java:1628:4:1628:6 | out [post update] : JSONObject | provenance | MaD:172 |
 | Test.java:1634:16:1634:31 | (...)... : String | Test.java:1635:12:1635:13 | in : String | provenance |  |
 | Test.java:1634:24:1634:31 | source(...) : Object | Test.java:1634:16:1634:31 | (...)... : String | provenance |  |
 | Test.java:1635:4:1635:6 | out [post update] : JSONObject | Test.java:1636:9:1636:11 | out | provenance |  |
-| Test.java:1635:12:1635:13 | in : String | Test.java:1635:4:1635:6 | out [post update] : JSONObject | provenance | MaD:174 |
+| Test.java:1635:12:1635:13 | in : String | Test.java:1635:4:1635:6 | out [post update] : JSONObject | provenance | MaD:173 |
 | Test.java:1641:15:1641:29 | (...)... : Number | Test.java:1642:26:1642:27 | in : Number | provenance |  |
 | Test.java:1641:22:1641:29 | source(...) : Object | Test.java:1641:15:1641:29 | (...)... : Number | provenance |  |
 | Test.java:1642:4:1642:6 | out [post update] : JSONObject | Test.java:1643:9:1643:11 | out | provenance |  |
-| Test.java:1642:26:1642:27 | in : Number | Test.java:1642:4:1642:6 | out [post update] : JSONObject | provenance | MaD:175 |
+| Test.java:1642:26:1642:27 | in : Number | Test.java:1642:4:1642:6 | out [post update] : JSONObject | provenance | MaD:174 |
 | Test.java:1648:16:1648:31 | (...)... : String | Test.java:1649:12:1649:13 | in : String | provenance |  |
 | Test.java:1648:24:1648:31 | source(...) : Object | Test.java:1648:16:1648:31 | (...)... : String | provenance |  |
 | Test.java:1649:4:1649:6 | out [post update] : JSONObject | Test.java:1650:9:1650:11 | out | provenance |  |
-| Test.java:1649:12:1649:13 | in : String | Test.java:1649:4:1649:6 | out [post update] : JSONObject | provenance | MaD:176 |
+| Test.java:1649:12:1649:13 | in : String | Test.java:1649:4:1649:6 | out [post update] : JSONObject | provenance | MaD:175 |
 | Test.java:1655:13:1655:25 | (...)... : Number | Test.java:1656:26:1656:27 | in : Number | provenance |  |
 | Test.java:1655:18:1655:25 | source(...) : Object | Test.java:1655:13:1655:25 | (...)... : Number | provenance |  |
 | Test.java:1656:4:1656:6 | out [post update] : JSONObject | Test.java:1657:9:1657:11 | out | provenance |  |
-| Test.java:1656:26:1656:27 | in : Number | Test.java:1656:4:1656:6 | out [post update] : JSONObject | provenance | MaD:177 |
+| Test.java:1656:26:1656:27 | in : Number | Test.java:1656:4:1656:6 | out [post update] : JSONObject | provenance | MaD:176 |
 | Test.java:1662:16:1662:31 | (...)... : String | Test.java:1663:12:1663:13 | in : String | provenance |  |
 | Test.java:1662:24:1662:31 | source(...) : Object | Test.java:1662:16:1662:31 | (...)... : String | provenance |  |
 | Test.java:1663:4:1663:6 | out [post update] : JSONObject | Test.java:1664:9:1664:11 | out | provenance |  |
-| Test.java:1663:12:1663:13 | in : String | Test.java:1663:4:1663:6 | out [post update] : JSONObject | provenance | MaD:178 |
+| Test.java:1663:12:1663:13 | in : String | Test.java:1663:4:1663:6 | out [post update] : JSONObject | provenance | MaD:177 |
 | Test.java:1669:14:1669:27 | (...)... : Number | Test.java:1670:26:1670:27 | in : Number | provenance |  |
 | Test.java:1669:20:1669:27 | source(...) : Object | Test.java:1669:14:1669:27 | (...)... : Number | provenance |  |
 | Test.java:1670:4:1670:6 | out [post update] : JSONObject | Test.java:1671:9:1671:11 | out | provenance |  |
-| Test.java:1670:26:1670:27 | in : Number | Test.java:1670:4:1670:6 | out [post update] : JSONObject | provenance | MaD:179 |
+| Test.java:1670:26:1670:27 | in : Number | Test.java:1670:4:1670:6 | out [post update] : JSONObject | provenance | MaD:178 |
 | Test.java:1676:20:1676:39 | (...)... : JSONObject | Test.java:1677:10:1677:11 | in : JSONObject | provenance |  |
 | Test.java:1676:32:1676:39 | source(...) : Object | Test.java:1676:20:1676:39 | (...)... : JSONObject | provenance |  |
-| Test.java:1677:10:1677:11 | in : JSONObject | Test.java:1677:10:1677:36 | put(...) : JSONObject | provenance | MaD:162 |
+| Test.java:1677:10:1677:11 | in : JSONObject | Test.java:1677:10:1677:36 | put(...) : JSONObject | provenance | MaD:179 |
 | Test.java:1677:10:1677:36 | put(...) : JSONObject | Test.java:1678:9:1678:11 | out | provenance |  |
 | Test.java:1683:20:1683:39 | (...)... : JSONObject | Test.java:1684:10:1684:11 | in : JSONObject | provenance |  |
 | Test.java:1683:32:1683:39 | source(...) : Object | Test.java:1683:20:1683:39 | (...)... : JSONObject | provenance |  |
-| Test.java:1684:10:1684:11 | in : JSONObject | Test.java:1684:10:1684:33 | put(...) : JSONObject | provenance | MaD:162 |
+| Test.java:1684:10:1684:11 | in : JSONObject | Test.java:1684:10:1684:33 | put(...) : JSONObject | provenance | MaD:179 |
 | Test.java:1684:10:1684:33 | put(...) : JSONObject | Test.java:1685:9:1685:11 | out | provenance |  |
 | Test.java:1690:20:1690:39 | (...)... : JSONObject | Test.java:1691:10:1691:11 | in : JSONObject | provenance |  |
 | Test.java:1690:32:1690:39 | source(...) : Object | Test.java:1690:20:1690:39 | (...)... : JSONObject | provenance |  |
-| Test.java:1691:10:1691:11 | in : JSONObject | Test.java:1691:10:1691:35 | put(...) : JSONObject | provenance | MaD:162 |
+| Test.java:1691:10:1691:11 | in : JSONObject | Test.java:1691:10:1691:35 | put(...) : JSONObject | provenance | MaD:179 |
 | Test.java:1691:10:1691:35 | put(...) : JSONObject | Test.java:1692:9:1692:11 | out | provenance |  |
 | Test.java:1697:20:1697:39 | (...)... : JSONObject | Test.java:1698:10:1698:11 | in : JSONObject | provenance |  |
 | Test.java:1697:32:1697:39 | source(...) : Object | Test.java:1697:20:1697:39 | (...)... : JSONObject | provenance |  |
-| Test.java:1698:10:1698:11 | in : JSONObject | Test.java:1698:10:1698:34 | put(...) : JSONObject | provenance | MaD:162 |
+| Test.java:1698:10:1698:11 | in : JSONObject | Test.java:1698:10:1698:34 | put(...) : JSONObject | provenance | MaD:179 |
 | Test.java:1698:10:1698:34 | put(...) : JSONObject | Test.java:1699:9:1699:11 | out | provenance |  |
 | Test.java:1704:20:1704:39 | (...)... : JSONObject | Test.java:1705:10:1705:11 | in : JSONObject | provenance |  |
 | Test.java:1704:32:1704:39 | source(...) : Object | Test.java:1704:20:1704:39 | (...)... : JSONObject | provenance |  |
-| Test.java:1705:10:1705:11 | in : JSONObject | Test.java:1705:10:1705:32 | put(...) : JSONObject | provenance | MaD:162 |
+| Test.java:1705:10:1705:11 | in : JSONObject | Test.java:1705:10:1705:32 | put(...) : JSONObject | provenance | MaD:179 |
 | Test.java:1705:10:1705:32 | put(...) : JSONObject | Test.java:1706:9:1706:11 | out | provenance |  |
 | Test.java:1711:20:1711:39 | (...)... : JSONObject | Test.java:1712:10:1712:11 | in : JSONObject | provenance |  |
 | Test.java:1711:32:1711:39 | source(...) : Object | Test.java:1711:20:1711:39 | (...)... : JSONObject | provenance |  |
-| Test.java:1712:10:1712:11 | in : JSONObject | Test.java:1712:10:1712:43 | put(...) : JSONObject | provenance | MaD:162 |
+| Test.java:1712:10:1712:11 | in : JSONObject | Test.java:1712:10:1712:43 | put(...) : JSONObject | provenance | MaD:179 |
 | Test.java:1712:10:1712:43 | put(...) : JSONObject | Test.java:1713:9:1713:11 | out | provenance |  |
 | Test.java:1718:20:1718:39 | (...)... : JSONObject | Test.java:1719:10:1719:11 | in : JSONObject | provenance |  |
 | Test.java:1718:32:1718:39 | source(...) : Object | Test.java:1718:20:1718:39 | (...)... : JSONObject | provenance |  |
-| Test.java:1719:10:1719:11 | in : JSONObject | Test.java:1719:10:1719:40 | put(...) : JSONObject | provenance | MaD:162 |
+| Test.java:1719:10:1719:11 | in : JSONObject | Test.java:1719:10:1719:40 | put(...) : JSONObject | provenance | MaD:179 |
 | Test.java:1719:10:1719:40 | put(...) : JSONObject | Test.java:1720:9:1720:11 | out | provenance |  |
 | Test.java:1725:20:1725:39 | (...)... : JSONObject | Test.java:1726:10:1726:11 | in : JSONObject | provenance |  |
 | Test.java:1725:32:1725:39 | source(...) : Object | Test.java:1725:20:1725:39 | (...)... : JSONObject | provenance |  |
-| Test.java:1726:10:1726:11 | in : JSONObject | Test.java:1726:10:1726:47 | put(...) : JSONObject | provenance | MaD:162 |
+| Test.java:1726:10:1726:11 | in : JSONObject | Test.java:1726:10:1726:47 | put(...) : JSONObject | provenance | MaD:179 |
 | Test.java:1726:10:1726:47 | put(...) : JSONObject | Test.java:1727:9:1727:11 | out | provenance |  |
 | Test.java:1732:20:1732:39 | (...)... : JSONObject | Test.java:1733:10:1733:11 | in : JSONObject | provenance |  |
 | Test.java:1732:32:1732:39 | source(...) : Object | Test.java:1732:20:1732:39 | (...)... : JSONObject | provenance |  |
-| Test.java:1733:10:1733:11 | in : JSONObject | Test.java:1733:10:1733:31 | putOnce(...) : JSONObject | provenance | MaD:180 |
+| Test.java:1733:10:1733:11 | in : JSONObject | Test.java:1733:10:1733:31 | putOnce(...) : JSONObject | provenance | MaD:181 |
 | Test.java:1733:10:1733:31 | putOnce(...) : JSONObject | Test.java:1734:9:1734:11 | out | provenance |  |
 | Test.java:1739:16:1739:31 | (...)... : String | Test.java:1740:16:1740:17 | in : String | provenance |  |
 | Test.java:1739:24:1739:31 | source(...) : Object | Test.java:1739:16:1739:31 | (...)... : String | provenance |  |
 | Test.java:1740:4:1740:6 | out [post update] : JSONObject | Test.java:1741:9:1741:11 | out | provenance |  |
-| Test.java:1740:16:1740:17 | in : String | Test.java:1740:4:1740:6 | out [post update] : JSONObject | provenance | MaD:181 |
+| Test.java:1740:16:1740:17 | in : String | Test.java:1740:4:1740:6 | out [post update] : JSONObject | provenance | MaD:180 |
 | Test.java:1746:16:1746:31 | (...)... : Object | Test.java:1747:22:1747:23 | in : Object | provenance |  |
 | Test.java:1746:24:1746:31 | source(...) : Object | Test.java:1746:16:1746:31 | (...)... : Object | provenance |  |
 | Test.java:1747:4:1747:6 | out [post update] : JSONObject | Test.java:1748:9:1748:11 | out | provenance |  |
-| Test.java:1747:22:1747:23 | in : Object | Test.java:1747:4:1747:6 | out [post update] : JSONObject | provenance | MaD:181 |
+| Test.java:1747:22:1747:23 | in : Object | Test.java:1747:4:1747:6 | out [post update] : JSONObject | provenance | MaD:180 |
 | Test.java:1753:20:1753:39 | (...)... : JSONObject | Test.java:1754:10:1754:11 | in : JSONObject | provenance |  |
 | Test.java:1753:32:1753:39 | source(...) : Object | Test.java:1753:20:1753:39 | (...)... : JSONObject | provenance |  |
-| Test.java:1754:10:1754:11 | in : JSONObject | Test.java:1754:10:1754:30 | putOpt(...) : JSONObject | provenance | MaD:182 |
+| Test.java:1754:10:1754:11 | in : JSONObject | Test.java:1754:10:1754:30 | putOpt(...) : JSONObject | provenance | MaD:183 |
 | Test.java:1754:10:1754:30 | putOpt(...) : JSONObject | Test.java:1755:9:1755:11 | out | provenance |  |
 | Test.java:1760:16:1760:31 | (...)... : String | Test.java:1761:15:1761:16 | in : String | provenance |  |
 | Test.java:1760:24:1760:31 | source(...) : Object | Test.java:1760:16:1760:31 | (...)... : String | provenance |  |
 | Test.java:1761:4:1761:6 | out [post update] : JSONObject | Test.java:1762:9:1762:11 | out | provenance |  |
-| Test.java:1761:15:1761:16 | in : String | Test.java:1761:4:1761:6 | out [post update] : JSONObject | provenance | MaD:183 |
+| Test.java:1761:15:1761:16 | in : String | Test.java:1761:4:1761:6 | out [post update] : JSONObject | provenance | MaD:182 |
 | Test.java:1767:16:1767:31 | (...)... : Object | Test.java:1768:21:1768:22 | in : Object | provenance |  |
 | Test.java:1767:24:1767:31 | source(...) : Object | Test.java:1767:16:1767:31 | (...)... : Object | provenance |  |
 | Test.java:1768:4:1768:6 | out [post update] : JSONObject | Test.java:1769:9:1769:11 | out | provenance |  |
-| Test.java:1768:21:1768:22 | in : Object | Test.java:1768:4:1768:6 | out [post update] : JSONObject | provenance | MaD:183 |
+| Test.java:1768:21:1768:22 | in : Object | Test.java:1768:4:1768:6 | out [post update] : JSONObject | provenance | MaD:182 |
 | Test.java:1774:20:1774:39 | (...)... : JSONObject | Test.java:1775:10:1775:11 | in : JSONObject | provenance |  |
 | Test.java:1774:32:1774:39 | source(...) : Object | Test.java:1774:20:1774:39 | (...)... : JSONObject | provenance |  |
 | Test.java:1775:10:1775:11 | in : JSONObject | Test.java:1775:10:1775:31 | query(...) : Object | provenance | MaD:184 |
@@ -1320,13 +1320,13 @@ edges
 | Test.java:1831:10:1831:11 | in : JSONObject | Test.java:1831:10:1831:19 | toMap(...) : Map [<map.key>] : Object | provenance | MaD:191 |
 | Test.java:1831:10:1831:19 | toMap(...) : Map [<map.key>] : Object | Test.java:1832:19:1832:21 | out : Map [<map.key>] : Object | provenance |  |
 | Test.java:1832:19:1832:21 | out : Map [<map.key>] : Object | Test.java:41:19:41:31 | container : Map [<map.key>] : Object | provenance |  |
-| Test.java:1832:19:1832:21 | out : Map [<map.key>] : Object | Test.java:1832:9:1832:22 | getMapKey(...) | provenance | MaD:5 |
+| Test.java:1832:19:1832:21 | out : Map [<map.key>] : Object | Test.java:1832:9:1832:22 | getMapKey(...) | provenance | MaD:7 |
 | Test.java:1837:20:1837:39 | (...)... : JSONObject | Test.java:1838:10:1838:11 | in : JSONObject | provenance |  |
 | Test.java:1837:32:1837:39 | source(...) : Object | Test.java:1837:20:1837:39 | (...)... : JSONObject | provenance |  |
 | Test.java:1838:10:1838:11 | in : JSONObject | Test.java:1838:10:1838:19 | toMap(...) : Map [<map.value>] : Object | provenance | MaD:192 |
 | Test.java:1838:10:1838:19 | toMap(...) : Map [<map.value>] : Object | Test.java:1839:21:1839:23 | out : Map [<map.value>] : Object | provenance |  |
 | Test.java:1839:21:1839:23 | out : Map [<map.value>] : Object | Test.java:42:21:42:33 | container : Map [<map.value>] : Object | provenance |  |
-| Test.java:1839:21:1839:23 | out : Map [<map.value>] : Object | Test.java:1839:9:1839:24 | getMapValue(...) | provenance | MaD:4 |
+| Test.java:1839:21:1839:23 | out : Map [<map.value>] : Object | Test.java:1839:9:1839:24 | getMapValue(...) | provenance | MaD:6 |
 | Test.java:1844:20:1844:39 | (...)... : JSONObject | Test.java:1845:10:1845:11 | in : JSONObject | provenance |  |
 | Test.java:1844:32:1844:39 | source(...) : Object | Test.java:1844:20:1844:39 | (...)... : JSONObject | provenance |  |
 | Test.java:1845:10:1845:11 | in : JSONObject | Test.java:1845:10:1845:23 | toString(...) : String | provenance | MaD:193 |
@@ -1345,61 +1345,61 @@ edges
 | Test.java:1866:26:1866:27 | in : Object | Test.java:1866:10:1866:28 | wrap(...) : Object | provenance | MaD:195 |
 | Test.java:1872:20:1872:39 | (...)... : JSONObject | Test.java:1873:4:1873:5 | in : JSONObject | provenance |  |
 | Test.java:1872:32:1872:39 | source(...) : Object | Test.java:1872:20:1872:39 | (...)... : JSONObject | provenance |  |
-| Test.java:1873:4:1873:5 | in : JSONObject | Test.java:1873:13:1873:15 | out [post update] : Writer | provenance | MaD:196 |
+| Test.java:1873:4:1873:5 | in : JSONObject | Test.java:1873:13:1873:15 | out [post update] : Writer | provenance | MaD:197 |
 | Test.java:1873:13:1873:15 | out [post update] : Writer | Test.java:1874:9:1874:11 | out | provenance |  |
 | Test.java:1879:20:1879:39 | (...)... : JSONObject | Test.java:1880:4:1880:5 | in : JSONObject | provenance |  |
 | Test.java:1879:32:1879:39 | source(...) : Object | Test.java:1879:20:1879:39 | (...)... : JSONObject | provenance |  |
-| Test.java:1880:4:1880:5 | in : JSONObject | Test.java:1880:13:1880:15 | out [post update] : Writer | provenance | MaD:196 |
+| Test.java:1880:4:1880:5 | in : JSONObject | Test.java:1880:13:1880:15 | out [post update] : Writer | provenance | MaD:197 |
 | Test.java:1880:13:1880:15 | out [post update] : Writer | Test.java:1881:9:1881:11 | out | provenance |  |
 | Test.java:1886:16:1886:31 | (...)... : Writer | Test.java:1888:25:1888:26 | in : Writer | provenance |  |
 | Test.java:1886:24:1886:31 | source(...) : Object | Test.java:1886:16:1886:31 | (...)... : Writer | provenance |  |
 | Test.java:1888:10:1888:33 | write(...) : Writer | Test.java:1889:9:1889:11 | out | provenance |  |
-| Test.java:1888:25:1888:26 | in : Writer | Test.java:1888:10:1888:33 | write(...) : Writer | provenance | MaD:197 |
+| Test.java:1888:25:1888:26 | in : Writer | Test.java:1888:10:1888:33 | write(...) : Writer | provenance | MaD:196 |
 | Test.java:1894:16:1894:31 | (...)... : Writer | Test.java:1896:25:1896:26 | in : Writer | provenance |  |
 | Test.java:1894:24:1894:31 | source(...) : Object | Test.java:1894:16:1894:31 | (...)... : Writer | provenance |  |
 | Test.java:1896:10:1896:27 | write(...) : Writer | Test.java:1897:9:1897:11 | out | provenance |  |
-| Test.java:1896:25:1896:26 | in : Writer | Test.java:1896:10:1896:27 | write(...) : Writer | provenance | MaD:197 |
+| Test.java:1896:25:1896:26 | in : Writer | Test.java:1896:10:1896:27 | write(...) : Writer | provenance | MaD:196 |
 | Test.java:1902:29:1902:57 | (...)... : Builder | Test.java:1903:10:1903:11 | in : Builder | provenance |  |
 | Test.java:1902:50:1902:57 | source(...) : Object | Test.java:1902:29:1902:57 | (...)... : Builder | provenance |  |
-| Test.java:1903:10:1903:11 | in : Builder | Test.java:1903:10:1903:21 | append(...) : Builder | provenance | MaD:203 |
+| Test.java:1903:10:1903:11 | in : Builder | Test.java:1903:10:1903:21 | append(...) : Builder | provenance | MaD:199 |
 | Test.java:1903:10:1903:21 | append(...) : Builder | Test.java:1904:9:1904:11 | out | provenance |  |
 | Test.java:1909:29:1909:57 | (...)... : Builder | Test.java:1910:10:1910:11 | in : Builder | provenance |  |
 | Test.java:1909:50:1909:57 | source(...) : Object | Test.java:1909:29:1909:57 | (...)... : Builder | provenance |  |
-| Test.java:1910:10:1910:11 | in : Builder | Test.java:1910:10:1910:32 | append(...) : Builder | provenance | MaD:203 |
+| Test.java:1910:10:1910:11 | in : Builder | Test.java:1910:10:1910:32 | append(...) : Builder | provenance | MaD:199 |
 | Test.java:1910:10:1910:32 | append(...) : Builder | Test.java:1911:9:1911:11 | out | provenance |  |
 | Test.java:1916:13:1916:25 | (...)... : Number | Test.java:1917:15:1917:16 | in : Number | provenance |  |
 | Test.java:1916:18:1916:25 | source(...) : Object | Test.java:1916:13:1916:25 | (...)... : Number | provenance |  |
 | Test.java:1917:4:1917:6 | out [post update] : Builder | Test.java:1918:9:1918:11 | out | provenance |  |
-| Test.java:1917:15:1917:16 | in : Number | Test.java:1917:4:1917:6 | out [post update] : Builder | provenance | MaD:204 |
+| Test.java:1917:15:1917:16 | in : Number | Test.java:1917:4:1917:6 | out [post update] : Builder | provenance | MaD:198 |
 | Test.java:1923:16:1923:31 | (...)... : String | Test.java:1924:15:1924:16 | in : String | provenance |  |
 | Test.java:1923:24:1923:31 | source(...) : Object | Test.java:1923:16:1923:31 | (...)... : String | provenance |  |
 | Test.java:1924:4:1924:6 | out [post update] : Builder | Test.java:1925:9:1925:11 | out | provenance |  |
-| Test.java:1924:15:1924:16 | in : String | Test.java:1924:4:1924:6 | out [post update] : Builder | provenance | MaD:204 |
+| Test.java:1924:15:1924:16 | in : String | Test.java:1924:4:1924:6 | out [post update] : Builder | provenance | MaD:198 |
 | Test.java:1930:29:1930:57 | (...)... : Builder | Test.java:1931:10:1931:11 | in : Builder | provenance |  |
 | Test.java:1930:50:1930:57 | source(...) : Object | Test.java:1930:29:1930:57 | (...)... : Builder | provenance |  |
-| Test.java:1931:10:1931:11 | in : Builder | Test.java:1931:10:1931:19 | build(...) : JSONPointer | provenance | MaD:205 |
+| Test.java:1931:10:1931:11 | in : Builder | Test.java:1931:10:1931:19 | build(...) : JSONPointer | provenance | MaD:200 |
 | Test.java:1931:10:1931:19 | build(...) : JSONPointer | Test.java:1932:9:1932:11 | out | provenance |  |
 | Test.java:1937:14:1937:43 | (...)... : List [<element>] : Object | Test.java:1938:26:1938:27 | in : List [<element>] : Object | provenance |  |
 | Test.java:1937:20:1937:43 | newWithElement(...) : List [<element>] : Object | Test.java:1937:14:1937:43 | (...)... : List [<element>] : Object | provenance |  |
 | Test.java:1937:35:1937:42 | source(...) : Object | Test.java:44:22:44:35 | element : Object | provenance |  |
 | Test.java:1937:35:1937:42 | source(...) : Object | Test.java:1937:20:1937:43 | newWithElement(...) : List [<element>] : Object | provenance | MaD:3 |
 | Test.java:1938:10:1938:28 | new JSONPointer(...) : JSONPointer | Test.java:1939:9:1939:11 | out | provenance |  |
-| Test.java:1938:26:1938:27 | in : List [<element>] : Object | Test.java:1938:10:1938:28 | new JSONPointer(...) : JSONPointer | provenance | MaD:198 |
+| Test.java:1938:26:1938:27 | in : List [<element>] : Object | Test.java:1938:10:1938:28 | new JSONPointer(...) : JSONPointer | provenance | MaD:201 |
 | Test.java:1944:16:1944:31 | (...)... : String | Test.java:1945:26:1945:27 | in : String | provenance |  |
 | Test.java:1944:24:1944:31 | source(...) : Object | Test.java:1944:16:1944:31 | (...)... : String | provenance |  |
 | Test.java:1945:10:1945:28 | new JSONPointer(...) : JSONPointer | Test.java:1946:9:1946:11 | out | provenance |  |
-| Test.java:1945:26:1945:27 | in : String | Test.java:1945:10:1945:28 | new JSONPointer(...) : JSONPointer | provenance | MaD:199 |
+| Test.java:1945:26:1945:27 | in : String | Test.java:1945:10:1945:28 | new JSONPointer(...) : JSONPointer | provenance | MaD:202 |
 | Test.java:1951:16:1951:31 | (...)... : Object | Test.java:1953:29:1953:30 | in : Object | provenance |  |
 | Test.java:1951:24:1951:31 | source(...) : Object | Test.java:1951:16:1951:31 | (...)... : Object | provenance |  |
 | Test.java:1953:10:1953:31 | queryFrom(...) : Object | Test.java:1954:9:1954:11 | out | provenance |  |
-| Test.java:1953:29:1953:30 | in : Object | Test.java:1953:10:1953:31 | queryFrom(...) : Object | provenance | MaD:200 |
+| Test.java:1953:29:1953:30 | in : Object | Test.java:1953:10:1953:31 | queryFrom(...) : Object | provenance | MaD:203 |
 | Test.java:1959:21:1959:41 | (...)... : JSONPointer | Test.java:1960:10:1960:11 | in : JSONPointer | provenance |  |
 | Test.java:1959:34:1959:41 | source(...) : Object | Test.java:1959:21:1959:41 | (...)... : JSONPointer | provenance |  |
-| Test.java:1960:10:1960:11 | in : JSONPointer | Test.java:1960:10:1960:22 | toString(...) : String | provenance | MaD:201 |
+| Test.java:1960:10:1960:11 | in : JSONPointer | Test.java:1960:10:1960:22 | toString(...) : String | provenance | MaD:204 |
 | Test.java:1960:10:1960:22 | toString(...) : String | Test.java:1961:9:1961:11 | out | provenance |  |
 | Test.java:1966:21:1966:41 | (...)... : JSONPointer | Test.java:1967:10:1967:11 | in : JSONPointer | provenance |  |
 | Test.java:1966:34:1966:41 | source(...) : Object | Test.java:1966:21:1966:41 | (...)... : JSONPointer | provenance |  |
-| Test.java:1967:10:1967:11 | in : JSONPointer | Test.java:1967:10:1967:27 | toURIFragment(...) : String | provenance | MaD:202 |
+| Test.java:1967:10:1967:11 | in : JSONPointer | Test.java:1967:10:1967:27 | toURIFragment(...) : String | provenance | MaD:205 |
 | Test.java:1967:10:1967:27 | toURIFragment(...) : String | Test.java:1968:9:1968:11 | out | provenance |  |
 | Test.java:1973:20:1973:39 | (...)... : JSONString | Test.java:1974:10:1974:11 | in : JSONString | provenance |  |
 | Test.java:1973:32:1973:39 | source(...) : Object | Test.java:1973:20:1973:39 | (...)... : JSONString | provenance |  |
@@ -1483,48 +1483,48 @@ edges
 | Test.java:2110:10:2110:23 | endObject(...) : JSONWriter | Test.java:2111:9:2111:11 | out | provenance |  |
 | Test.java:2116:20:2116:39 | (...)... : JSONWriter | Test.java:2117:10:2117:11 | in : JSONWriter | provenance |  |
 | Test.java:2116:32:2116:39 | source(...) : Object | Test.java:2116:20:2116:39 | (...)... : JSONWriter | provenance |  |
-| Test.java:2117:10:2117:11 | in : JSONWriter | Test.java:2117:10:2117:21 | key(...) : JSONWriter | provenance | MaD:219 |
+| Test.java:2117:10:2117:11 | in : JSONWriter | Test.java:2117:10:2117:21 | key(...) : JSONWriter | provenance | MaD:220 |
 | Test.java:2117:10:2117:21 | key(...) : JSONWriter | Test.java:2118:9:2118:11 | out | provenance |  |
 | Test.java:2123:16:2123:31 | (...)... : String | Test.java:2124:12:2124:13 | in : String | provenance |  |
 | Test.java:2123:24:2123:31 | source(...) : Object | Test.java:2123:16:2123:31 | (...)... : String | provenance |  |
 | Test.java:2124:4:2124:6 | out [post update] : JSONWriter | Test.java:2125:9:2125:11 | out | provenance |  |
-| Test.java:2124:12:2124:13 | in : String | Test.java:2124:4:2124:6 | out [post update] : JSONWriter | provenance | MaD:220 |
+| Test.java:2124:12:2124:13 | in : String | Test.java:2124:4:2124:6 | out [post update] : JSONWriter | provenance | MaD:219 |
 | Test.java:2130:20:2130:39 | (...)... : JSONWriter | Test.java:2131:10:2131:11 | in : JSONWriter | provenance |  |
 | Test.java:2130:32:2130:39 | source(...) : Object | Test.java:2130:20:2130:39 | (...)... : JSONWriter | provenance |  |
 | Test.java:2131:10:2131:11 | in : JSONWriter | Test.java:2131:10:2131:20 | object(...) : JSONWriter | provenance | MaD:221 |
 | Test.java:2131:10:2131:20 | object(...) : JSONWriter | Test.java:2132:9:2132:11 | out | provenance |  |
 | Test.java:2137:20:2137:39 | (...)... : JSONWriter | Test.java:2138:10:2138:11 | in : JSONWriter | provenance |  |
 | Test.java:2137:32:2137:39 | source(...) : Object | Test.java:2137:20:2137:39 | (...)... : JSONWriter | provenance |  |
-| Test.java:2138:10:2138:11 | in : JSONWriter | Test.java:2138:10:2138:24 | value(...) : JSONWriter | provenance | MaD:222 |
+| Test.java:2138:10:2138:11 | in : JSONWriter | Test.java:2138:10:2138:24 | value(...) : JSONWriter | provenance | MaD:223 |
 | Test.java:2138:10:2138:24 | value(...) : JSONWriter | Test.java:2139:9:2139:11 | out | provenance |  |
 | Test.java:2144:20:2144:39 | (...)... : JSONWriter | Test.java:2145:10:2145:11 | in : JSONWriter | provenance |  |
 | Test.java:2144:32:2144:39 | source(...) : Object | Test.java:2144:20:2144:39 | (...)... : JSONWriter | provenance |  |
-| Test.java:2145:10:2145:11 | in : JSONWriter | Test.java:2145:10:2145:21 | value(...) : JSONWriter | provenance | MaD:222 |
+| Test.java:2145:10:2145:11 | in : JSONWriter | Test.java:2145:10:2145:21 | value(...) : JSONWriter | provenance | MaD:223 |
 | Test.java:2145:10:2145:21 | value(...) : JSONWriter | Test.java:2146:9:2146:11 | out | provenance |  |
 | Test.java:2151:20:2151:39 | (...)... : JSONWriter | Test.java:2152:10:2152:11 | in : JSONWriter | provenance |  |
 | Test.java:2151:32:2151:39 | source(...) : Object | Test.java:2151:20:2151:39 | (...)... : JSONWriter | provenance |  |
-| Test.java:2152:10:2152:11 | in : JSONWriter | Test.java:2152:10:2152:22 | value(...) : JSONWriter | provenance | MaD:222 |
+| Test.java:2152:10:2152:11 | in : JSONWriter | Test.java:2152:10:2152:22 | value(...) : JSONWriter | provenance | MaD:223 |
 | Test.java:2152:10:2152:22 | value(...) : JSONWriter | Test.java:2153:9:2153:11 | out | provenance |  |
 | Test.java:2158:20:2158:39 | (...)... : JSONWriter | Test.java:2159:10:2159:11 | in : JSONWriter | provenance |  |
 | Test.java:2158:32:2158:39 | source(...) : Object | Test.java:2158:20:2158:39 | (...)... : JSONWriter | provenance |  |
-| Test.java:2159:10:2159:11 | in : JSONWriter | Test.java:2159:10:2159:31 | value(...) : JSONWriter | provenance | MaD:222 |
+| Test.java:2159:10:2159:11 | in : JSONWriter | Test.java:2159:10:2159:31 | value(...) : JSONWriter | provenance | MaD:223 |
 | Test.java:2159:10:2159:31 | value(...) : JSONWriter | Test.java:2160:9:2160:11 | out | provenance |  |
 | Test.java:2165:14:2165:27 | (...)... : Number | Test.java:2166:14:2166:15 | in : Number | provenance |  |
 | Test.java:2165:20:2165:27 | source(...) : Object | Test.java:2165:14:2165:27 | (...)... : Number | provenance |  |
 | Test.java:2166:4:2166:6 | out [post update] : JSONWriter | Test.java:2167:9:2167:11 | out | provenance |  |
-| Test.java:2166:14:2166:15 | in : Number | Test.java:2166:4:2166:6 | out [post update] : JSONWriter | provenance | MaD:223 |
+| Test.java:2166:14:2166:15 | in : Number | Test.java:2166:4:2166:6 | out [post update] : JSONWriter | provenance | MaD:222 |
 | Test.java:2172:16:2172:31 | (...)... : Number | Test.java:2173:14:2173:15 | in : Number | provenance |  |
 | Test.java:2172:24:2172:31 | source(...) : Object | Test.java:2172:16:2172:31 | (...)... : Number | provenance |  |
 | Test.java:2173:4:2173:6 | out [post update] : JSONWriter | Test.java:2174:9:2174:11 | out | provenance |  |
-| Test.java:2173:14:2173:15 | in : Number | Test.java:2173:4:2173:6 | out [post update] : JSONWriter | provenance | MaD:223 |
+| Test.java:2173:14:2173:15 | in : Number | Test.java:2173:4:2173:6 | out [post update] : JSONWriter | provenance | MaD:222 |
 | Test.java:2179:17:2179:33 | (...)... : Boolean | Test.java:2180:14:2180:15 | in : Boolean | provenance |  |
 | Test.java:2179:26:2179:33 | source(...) : Object | Test.java:2179:17:2179:33 | (...)... : Boolean | provenance |  |
 | Test.java:2180:4:2180:6 | out [post update] : JSONWriter | Test.java:2181:9:2181:11 | out | provenance |  |
-| Test.java:2180:14:2180:15 | in : Boolean | Test.java:2180:4:2180:6 | out [post update] : JSONWriter | provenance | MaD:223 |
+| Test.java:2180:14:2180:15 | in : Boolean | Test.java:2180:4:2180:6 | out [post update] : JSONWriter | provenance | MaD:222 |
 | Test.java:2186:16:2186:31 | (...)... : Object | Test.java:2187:14:2187:15 | in : Object | provenance |  |
 | Test.java:2186:24:2186:31 | source(...) : Object | Test.java:2186:16:2186:31 | (...)... : Object | provenance |  |
 | Test.java:2187:4:2187:6 | out [post update] : JSONWriter | Test.java:2188:9:2188:11 | out | provenance |  |
-| Test.java:2187:14:2187:15 | in : Object | Test.java:2187:4:2187:6 | out [post update] : JSONWriter | provenance | MaD:223 |
+| Test.java:2187:14:2187:15 | in : Object | Test.java:2187:4:2187:6 | out [post update] : JSONWriter | provenance | MaD:222 |
 | Test.java:2193:16:2193:31 | (...)... : Object | Test.java:2194:35:2194:36 | in : Object | provenance |  |
 | Test.java:2193:24:2193:31 | source(...) : Object | Test.java:2193:16:2193:31 | (...)... : Object | provenance |  |
 | Test.java:2194:10:2194:37 | valueToString(...) : String | Test.java:2195:9:2195:11 | out | provenance |  |
@@ -1532,13 +1532,13 @@ edges
 | Test.java:2200:20:2200:54 | (...)... : Properties [<map.key>] : Object | Test.java:2201:32:2201:33 | in : Properties [<map.key>] : Object | provenance |  |
 | Test.java:2200:32:2200:54 | newWithMapKey(...) : Map [<map.key>] : Object | Test.java:2200:20:2200:54 | (...)... : Properties [<map.key>] : Object | provenance |  |
 | Test.java:2200:46:2200:53 | source(...) : Object | Test.java:45:20:45:33 | element : Object | provenance |  |
-| Test.java:2200:46:2200:53 | source(...) : Object | Test.java:2200:32:2200:54 | newWithMapKey(...) : Map [<map.key>] : Object | provenance | MaD:6 |
+| Test.java:2200:46:2200:53 | source(...) : Object | Test.java:2200:32:2200:54 | newWithMapKey(...) : Map [<map.key>] : Object | provenance | MaD:4 |
 | Test.java:2201:10:2201:34 | toJSONObject(...) : JSONObject | Test.java:2202:9:2202:11 | out | provenance |  |
 | Test.java:2201:32:2201:33 | in : Properties [<map.key>] : Object | Test.java:2201:10:2201:34 | toJSONObject(...) : JSONObject | provenance | MaD:225 |
 | Test.java:2207:20:2207:56 | (...)... : Properties [<map.value>] : Object | Test.java:2208:32:2208:33 | in : Properties [<map.value>] : Object | provenance |  |
 | Test.java:2207:32:2207:56 | newWithMapValue(...) : Map [<map.value>] : Object | Test.java:2207:20:2207:56 | (...)... : Properties [<map.value>] : Object | provenance |  |
 | Test.java:2207:48:2207:55 | source(...) : Object | Test.java:46:22:46:35 | element : Object | provenance |  |
-| Test.java:2207:48:2207:55 | source(...) : Object | Test.java:2207:32:2207:56 | newWithMapValue(...) : Map [<map.value>] : Object | provenance | MaD:7 |
+| Test.java:2207:48:2207:55 | source(...) : Object | Test.java:2207:32:2207:56 | newWithMapValue(...) : Map [<map.value>] : Object | provenance | MaD:5 |
 | Test.java:2208:10:2208:34 | toJSONObject(...) : JSONObject | Test.java:2209:9:2209:11 | out | provenance |  |
 | Test.java:2208:32:2208:33 | in : Properties [<map.value>] : Object | Test.java:2208:10:2208:34 | toJSONObject(...) : JSONObject | provenance | MaD:226 |
 | Test.java:2214:20:2214:39 | (...)... : JSONObject | Test.java:2215:32:2215:33 | in : JSONObject | provenance |  |
@@ -1546,13 +1546,13 @@ edges
 | Test.java:2215:10:2215:34 | toProperties(...) : Properties [<map.key>] : Object | Test.java:2216:19:2216:21 | out : Properties [<map.key>] : Object | provenance |  |
 | Test.java:2215:32:2215:33 | in : JSONObject | Test.java:2215:10:2215:34 | toProperties(...) : Properties [<map.key>] : Object | provenance | MaD:227 |
 | Test.java:2216:19:2216:21 | out : Properties [<map.key>] : Object | Test.java:41:19:41:31 | container : Properties [<map.key>] : Object | provenance |  |
-| Test.java:2216:19:2216:21 | out : Properties [<map.key>] : Object | Test.java:2216:9:2216:22 | getMapKey(...) | provenance | MaD:5 |
+| Test.java:2216:19:2216:21 | out : Properties [<map.key>] : Object | Test.java:2216:9:2216:22 | getMapKey(...) | provenance | MaD:7 |
 | Test.java:2221:20:2221:39 | (...)... : JSONObject | Test.java:2222:32:2222:33 | in : JSONObject | provenance |  |
 | Test.java:2221:32:2221:39 | source(...) : Object | Test.java:2221:20:2221:39 | (...)... : JSONObject | provenance |  |
 | Test.java:2222:10:2222:34 | toProperties(...) : Properties [<map.value>] : Object | Test.java:2223:21:2223:23 | out : Properties [<map.value>] : Object | provenance |  |
 | Test.java:2222:32:2222:33 | in : JSONObject | Test.java:2222:10:2222:34 | toProperties(...) : Properties [<map.value>] : Object | provenance | MaD:228 |
 | Test.java:2223:21:2223:23 | out : Properties [<map.value>] : Object | Test.java:42:21:42:33 | container : Properties [<map.value>] : Object | provenance |  |
-| Test.java:2223:21:2223:23 | out : Properties [<map.value>] : Object | Test.java:2223:9:2223:24 | getMapValue(...) | provenance | MaD:4 |
+| Test.java:2223:21:2223:23 | out : Properties [<map.value>] : Object | Test.java:2223:9:2223:24 | getMapValue(...) | provenance | MaD:6 |
 | Test.java:2228:16:2228:31 | (...)... : String | Test.java:2229:21:2229:22 | in : String | provenance |  |
 | Test.java:2228:24:2228:31 | source(...) : Object | Test.java:2228:16:2228:31 | (...)... : String | provenance |  |
 | Test.java:2229:10:2229:23 | escape(...) : String | Test.java:2230:9:2230:11 | out | provenance |  |
diff --git a/java/ql/test/library-tests/frameworks/netty/generated/test.expected b/java/ql/test/library-tests/frameworks/netty/generated/test.expected
index b92f6cde91b..4b719c8fd34 100644
--- a/java/ql/test/library-tests/frameworks/netty/generated/test.expected
+++ b/java/ql/test/library-tests/frameworks/netty/generated/test.expected
@@ -1,503 +1,501 @@
 models
-| 1 | Summary: io.netty.buffer; ByteBufConvertible; true; asByteBuf; (); ; Argument[this]; ReturnValue; taint; manual |
-| 2 | Summary: io.netty.buffer; ByteBuf; true; array; (); ; Argument[this]; ReturnValue; taint; manual |
-| 3 | Summary: io.netty.buffer; ByteBuf; true; asReadOnly; (); ; Argument[this]; ReturnValue; taint; manual |
-| 4 | Summary: io.netty.buffer; ByteBuf; true; capacity; (int); ; Argument[this]; ReturnValue; value; manual |
-| 5 | Summary: io.netty.buffer; ByteBuf; true; copy; ; ; Argument[this]; ReturnValue; taint; manual |
-| 6 | Summary: io.netty.buffer; ByteBuf; true; discardReadBytes; (); ; Argument[this]; ReturnValue; value; manual |
-| 7 | Summary: io.netty.buffer; ByteBuf; true; discardSomeReadBytes; (); ; Argument[this]; ReturnValue; value; manual |
-| 8 | Summary: io.netty.buffer; ByteBuf; true; duplicate; (); ; Argument[this]; ReturnValue; taint; manual |
-| 9 | Summary: io.netty.buffer; ByteBuf; true; ensureWritable; (int); ; Argument[this]; ReturnValue; value; manual |
-| 10 | Summary: io.netty.buffer; ByteBuf; true; getBytes; (int,byte[]); ; Argument[this]; ReturnValue; value; manual |
-| 11 | Summary: io.netty.buffer; ByteBuf; true; getBytes; (int,byte[],int,int); ; Argument[this]; ReturnValue; value; manual |
-| 12 | Summary: io.netty.buffer; ByteBuf; true; getBytes; (int,ByteBuf); ; Argument[this]; ReturnValue; value; manual |
-| 13 | Summary: io.netty.buffer; ByteBuf; true; getBytes; (int,ByteBuffer); ; Argument[this]; ReturnValue; value; manual |
-| 14 | Summary: io.netty.buffer; ByteBuf; true; getBytes; (int,ByteBuf,int); ; Argument[this]; ReturnValue; value; manual |
-| 15 | Summary: io.netty.buffer; ByteBuf; true; getBytes; (int,ByteBuf,int,int); ; Argument[this]; ReturnValue; value; manual |
-| 16 | Summary: io.netty.buffer; ByteBuf; true; getBytes; (int,OutputStream,int); ; Argument[this]; ReturnValue; value; manual |
-| 17 | Summary: io.netty.buffer; ByteBuf; true; markReaderIndex; (); ; Argument[this]; ReturnValue; value; manual |
-| 18 | Summary: io.netty.buffer; ByteBuf; true; markWriterIndex; (); ; Argument[this]; ReturnValue; value; manual |
-| 19 | Summary: io.netty.buffer; ByteBuf; true; nioBuffer; ; ; Argument[this]; ReturnValue; taint; manual |
-| 20 | Summary: io.netty.buffer; ByteBuf; true; nioBuffers; ; ; Argument[this]; ReturnValue; taint; manual |
-| 21 | Summary: io.netty.buffer; ByteBuf; true; order; (ByteOrder); ; Argument[this]; ReturnValue; taint; manual |
-| 22 | Summary: io.netty.buffer; ByteBuf; true; readBytes; (byte[]); ; Argument[this]; ReturnValue; value; manual |
-| 23 | Summary: io.netty.buffer; ByteBuf; true; readBytes; (byte[],int,int); ; Argument[this]; ReturnValue; value; manual |
-| 24 | Summary: io.netty.buffer; ByteBuf; true; readBytes; (ByteBuf); ; Argument[this]; ReturnValue; value; manual |
-| 25 | Summary: io.netty.buffer; ByteBuf; true; readBytes; (ByteBuffer); ; Argument[this]; ReturnValue; value; manual |
-| 26 | Summary: io.netty.buffer; ByteBuf; true; readBytes; (ByteBuf,int); ; Argument[this]; ReturnValue; value; manual |
-| 27 | Summary: io.netty.buffer; ByteBuf; true; readBytes; (ByteBuf,int,int); ; Argument[this]; ReturnValue; value; manual |
-| 28 | Summary: io.netty.buffer; ByteBuf; true; readBytes; (OutputStream,int); ; Argument[this]; ReturnValue; value; manual |
-| 29 | Summary: io.netty.buffer; ByteBuf; true; readerIndex; (int); ; Argument[this]; ReturnValue; value; manual |
-| 30 | Summary: io.netty.buffer; ByteBuf; true; resetReaderIndex; (); ; Argument[this]; ReturnValue; value; manual |
-| 31 | Summary: io.netty.buffer; ByteBuf; true; resetWriterIndex; (); ; Argument[this]; ReturnValue; value; manual |
-| 32 | Summary: io.netty.buffer; ByteBuf; true; retainedDuplicate; (); ; Argument[this]; ReturnValue; taint; manual |
-| 33 | Summary: io.netty.buffer; ByteBuf; true; retainedSlice; ; ; Argument[this]; ReturnValue; taint; manual |
-| 34 | Summary: io.netty.buffer; ByteBuf; true; setBoolean; ; ; Argument[this]; ReturnValue; value; manual |
-| 35 | Summary: io.netty.buffer; ByteBuf; true; setByte; ; ; Argument[this]; ReturnValue; value; manual |
-| 36 | Summary: io.netty.buffer; ByteBuf; true; setBytes; (int,byte[]); ; Argument[this]; ReturnValue; value; manual |
-| 37 | Summary: io.netty.buffer; ByteBuf; true; setBytes; (int,byte[],int,int); ; Argument[this]; ReturnValue; value; manual |
-| 38 | Summary: io.netty.buffer; ByteBuf; true; setBytes; (int,ByteBuf); ; Argument[this]; ReturnValue; value; manual |
-| 39 | Summary: io.netty.buffer; ByteBuf; true; setBytes; (int,ByteBuffer); ; Argument[this]; ReturnValue; value; manual |
-| 40 | Summary: io.netty.buffer; ByteBuf; true; setBytes; (int,ByteBuf,int); ; Argument[this]; ReturnValue; value; manual |
-| 41 | Summary: io.netty.buffer; ByteBuf; true; setBytes; (int,ByteBuf,int,int); ; Argument[this]; ReturnValue; value; manual |
-| 42 | Summary: io.netty.buffer; ByteBuf; true; setChar; ; ; Argument[this]; ReturnValue; value; manual |
-| 43 | Summary: io.netty.buffer; ByteBuf; true; setDouble; ; ; Argument[this]; ReturnValue; value; manual |
-| 44 | Summary: io.netty.buffer; ByteBuf; true; setDoubleLE; ; ; Argument[this]; ReturnValue; value; manual |
-| 45 | Summary: io.netty.buffer; ByteBuf; true; setFloat; ; ; Argument[this]; ReturnValue; value; manual |
-| 46 | Summary: io.netty.buffer; ByteBuf; true; setFloatLE; ; ; Argument[this]; ReturnValue; value; manual |
-| 47 | Summary: io.netty.buffer; ByteBuf; true; setIndex; ; ; Argument[this]; ReturnValue; value; manual |
-| 48 | Summary: io.netty.buffer; ByteBuf; true; setInt; ; ; Argument[this]; ReturnValue; value; manual |
-| 49 | Summary: io.netty.buffer; ByteBuf; true; setIntLE; ; ; Argument[this]; ReturnValue; value; manual |
-| 50 | Summary: io.netty.buffer; ByteBuf; true; setLong; ; ; Argument[this]; ReturnValue; value; manual |
-| 51 | Summary: io.netty.buffer; ByteBuf; true; setLongLE; ; ; Argument[this]; ReturnValue; value; manual |
-| 52 | Summary: io.netty.buffer; ByteBuf; true; setMedium; ; ; Argument[this]; ReturnValue; value; manual |
-| 53 | Summary: io.netty.buffer; ByteBuf; true; setMediumLE; ; ; Argument[this]; ReturnValue; value; manual |
-| 54 | Summary: io.netty.buffer; ByteBuf; true; setShort; ; ; Argument[this]; ReturnValue; value; manual |
-| 55 | Summary: io.netty.buffer; ByteBuf; true; setShortLE; ; ; Argument[this]; ReturnValue; value; manual |
-| 56 | Summary: io.netty.buffer; ByteBuf; true; setZero; ; ; Argument[this]; ReturnValue; value; manual |
-| 57 | Summary: io.netty.buffer; ByteBuf; true; skipBytes; (int); ; Argument[this]; ReturnValue; value; manual |
-| 58 | Summary: io.netty.buffer; ByteBuf; true; slice; ; ; Argument[this]; ReturnValue; taint; manual |
-| 59 | Summary: io.netty.buffer; ByteBuf; true; toString; ; ; Argument[this]; ReturnValue; taint; manual |
-| 60 | Summary: io.netty.buffer; ByteBuf; true; unwrap; (); ; Argument[this]; ReturnValue; taint; manual |
-| 61 | Summary: io.netty.buffer; ByteBuf; true; writeBoolean; ; ; Argument[this]; ReturnValue; value; manual |
-| 62 | Summary: io.netty.buffer; ByteBuf; true; writeByte; ; ; Argument[this]; ReturnValue; value; manual |
-| 63 | Summary: io.netty.buffer; ByteBuf; true; writeBytes; (byte[]); ; Argument[this]; ReturnValue; value; manual |
-| 64 | Summary: io.netty.buffer; ByteBuf; true; writeBytes; (byte[],int,int); ; Argument[this]; ReturnValue; value; manual |
-| 65 | Summary: io.netty.buffer; ByteBuf; true; writeBytes; (ByteBuf); ; Argument[this]; ReturnValue; value; manual |
-| 66 | Summary: io.netty.buffer; ByteBuf; true; writeBytes; (ByteBuffer); ; Argument[this]; ReturnValue; value; manual |
-| 67 | Summary: io.netty.buffer; ByteBuf; true; writeBytes; (ByteBuf,int); ; Argument[this]; ReturnValue; value; manual |
-| 68 | Summary: io.netty.buffer; ByteBuf; true; writeBytes; (ByteBuf,int,int); ; Argument[this]; ReturnValue; value; manual |
-| 69 | Summary: io.netty.buffer; ByteBuf; true; writeChar; ; ; Argument[this]; ReturnValue; value; manual |
-| 70 | Summary: io.netty.buffer; ByteBuf; true; writeDouble; ; ; Argument[this]; ReturnValue; value; manual |
-| 71 | Summary: io.netty.buffer; ByteBuf; true; writeDoubleLE; ; ; Argument[this]; ReturnValue; value; manual |
-| 72 | Summary: io.netty.buffer; ByteBuf; true; writeFloat; ; ; Argument[this]; ReturnValue; value; manual |
-| 73 | Summary: io.netty.buffer; ByteBuf; true; writeFloatLE; ; ; Argument[this]; ReturnValue; value; manual |
-| 74 | Summary: io.netty.buffer; ByteBuf; true; writeInt; ; ; Argument[this]; ReturnValue; value; manual |
-| 75 | Summary: io.netty.buffer; ByteBuf; true; writeIntLE; ; ; Argument[this]; ReturnValue; value; manual |
-| 76 | Summary: io.netty.buffer; ByteBuf; true; writeLong; ; ; Argument[this]; ReturnValue; value; manual |
-| 77 | Summary: io.netty.buffer; ByteBuf; true; writeLongLE; ; ; Argument[this]; ReturnValue; value; manual |
-| 78 | Summary: io.netty.buffer; ByteBuf; true; writeMedium; ; ; Argument[this]; ReturnValue; value; manual |
-| 79 | Summary: io.netty.buffer; ByteBuf; true; writeMediumLE; ; ; Argument[this]; ReturnValue; value; manual |
-| 80 | Summary: io.netty.buffer; ByteBuf; true; writeShort; ; ; Argument[this]; ReturnValue; value; manual |
-| 81 | Summary: io.netty.buffer; ByteBuf; true; writeShortLE; ; ; Argument[this]; ReturnValue; value; manual |
-| 82 | Summary: io.netty.buffer; ByteBuf; true; writeZero; ; ; Argument[this]; ReturnValue; value; manual |
-| 83 | Summary: io.netty.buffer; ByteBuf; true; writerIndex; (int); ; Argument[this]; ReturnValue; value; manual |
-| 84 | Summary: io.netty.buffer; ByteBufHolder; true; copy; (); ; Argument[this]; ReturnValue; taint; manual |
-| 85 | Summary: io.netty.buffer; ByteBufHolder; true; content; (); ; Argument[this]; ReturnValue; taint; manual |
-| 86 | Summary: io.netty.buffer; ByteBufHolder; true; duplicate; (); ; Argument[this]; ReturnValue; taint; manual |
-| 87 | Summary: io.netty.buffer; ByteBufHolder; true; retainedDuplicate; (); ; Argument[this]; ReturnValue; taint; manual |
-| 88 | Summary: io.netty.buffer; ByteBufHolder; true; replace; (ByteBuf); ; Argument[0]; ReturnValue; taint; manual |
-| 89 | Summary: io.netty.buffer; ByteBuf; true; getBytes; (int,byte[]); ; Argument[this]; Argument[1]; taint; manual |
-| 90 | Summary: io.netty.buffer; ByteBuf; true; getBytes; (int,byte[],int,int); ; Argument[this]; Argument[1]; taint; manual |
-| 91 | Summary: io.netty.buffer; ByteBuf; true; getBytes; (int,ByteBuf); ; Argument[this]; Argument[1]; taint; manual |
-| 92 | Summary: io.netty.buffer; ByteBuf; true; getBytes; (int,ByteBuffer); ; Argument[this]; Argument[1]; taint; manual |
-| 93 | Summary: io.netty.buffer; ByteBuf; true; getBytes; (int,ByteBuf,int); ; Argument[this]; Argument[1]; taint; manual |
-| 94 | Summary: io.netty.buffer; ByteBuf; true; getBytes; (int,ByteBuf,int,int); ; Argument[this]; Argument[1]; taint; manual |
-| 95 | Summary: io.netty.buffer; ByteBuf; true; getBytes; (int,FileChannel,long,int); ; Argument[this]; Argument[1]; taint; manual |
-| 96 | Summary: io.netty.buffer; ByteBuf; true; getBytes; (int,GatheringByteChannel,int); ; Argument[this]; Argument[1]; taint; manual |
-| 97 | Summary: io.netty.buffer; ByteBuf; true; getBytes; (int,OutputStream,int); ; Argument[this]; Argument[1]; taint; manual |
-| 98 | Summary: io.netty.buffer; ByteBuf; true; getChar; ; ; Argument[this]; ReturnValue; taint; manual |
-| 99 | Summary: io.netty.buffer; ByteBuf; true; getCharSequence; ; ; Argument[this]; ReturnValue; taint; manual |
-| 100 | Summary: io.netty.buffer; ByteBuf; true; readBytes; (byte[]); ; Argument[this]; Argument[0]; taint; manual |
-| 101 | Summary: io.netty.buffer; ByteBuf; true; readBytes; (byte[],int,int); ; Argument[this]; Argument[0]; taint; manual |
-| 102 | Summary: io.netty.buffer; ByteBuf; true; readBytes; (ByteBuf); ; Argument[this]; Argument[0]; taint; manual |
-| 103 | Summary: io.netty.buffer; ByteBuf; true; readBytes; (ByteBuffer); ; Argument[this]; Argument[0]; taint; manual |
-| 104 | Summary: io.netty.buffer; ByteBuf; true; readBytes; (ByteBuf,int); ; Argument[this]; Argument[0]; taint; manual |
-| 105 | Summary: io.netty.buffer; ByteBuf; true; readBytes; (ByteBuf,int,int); ; Argument[this]; Argument[0]; taint; manual |
-| 106 | Summary: io.netty.buffer; ByteBuf; true; readBytes; (FileChannel,long,int); ; Argument[this]; Argument[0]; taint; manual |
-| 107 | Summary: io.netty.buffer; ByteBuf; true; readBytes; (GatheringByteChannel,int); ; Argument[this]; Argument[0]; taint; manual |
-| 108 | Summary: io.netty.buffer; ByteBuf; true; readBytes; (OutputStream,int); ; Argument[this]; Argument[0]; taint; manual |
-| 109 | Summary: io.netty.buffer; ByteBuf; true; readBytes; (int); ; Argument[this]; ReturnValue; taint; manual |
-| 110 | Summary: io.netty.buffer; ByteBuf; true; readChar; ; ; Argument[this]; ReturnValue; taint; manual |
-| 111 | Summary: io.netty.buffer; ByteBuf; true; readCharSequence; ; ; Argument[this]; ReturnValue; taint; manual |
-| 112 | Summary: io.netty.buffer; ByteBuf; true; readSlice; (int); ; Argument[this]; ReturnValue; taint; manual |
-| 113 | Summary: io.netty.buffer; ByteBuf; true; readRetainedSlice; (int); ; Argument[this]; ReturnValue; taint; manual |
-| 114 | Summary: io.netty.buffer; ByteBuf; true; setBytes; (int,byte[]); ; Argument[1]; Argument[this]; taint; manual |
-| 115 | Summary: io.netty.buffer; ByteBuf; true; setBytes; (int,byte[],int,int); ; Argument[1]; Argument[this]; taint; manual |
-| 116 | Summary: io.netty.buffer; ByteBuf; true; setBytes; (int,ByteBuf); ; Argument[1]; Argument[this]; taint; manual |
-| 117 | Summary: io.netty.buffer; ByteBuf; true; setBytes; (int,ByteBuffer); ; Argument[1]; Argument[this]; taint; manual |
-| 118 | Summary: io.netty.buffer; ByteBuf; true; setBytes; (int,ByteBuf,int); ; Argument[1]; Argument[this]; taint; manual |
-| 119 | Summary: io.netty.buffer; ByteBuf; true; setBytes; (int,ByteBuf,int,int); ; Argument[1]; Argument[this]; taint; manual |
-| 120 | Summary: io.netty.buffer; ByteBuf; true; setBytes; (int,FileChannel,long,int); ; Argument[1]; Argument[this]; taint; manual |
-| 121 | Summary: io.netty.buffer; ByteBuf; true; setBytes; (int,ScatteringByteChannel,int); ; Argument[1]; Argument[this]; taint; manual |
-| 122 | Summary: io.netty.buffer; ByteBuf; true; setBytes; (int,InputStream,int); ; Argument[1]; Argument[this]; taint; manual |
-| 123 | Summary: io.netty.buffer; ByteBuf; true; setChar; ; ; Argument[1]; Argument[this]; taint; manual |
-| 124 | Summary: io.netty.buffer; ByteBuf; true; setCharSequence; ; ; Argument[1]; Argument[this]; taint; manual |
-| 125 | Summary: io.netty.buffer; ByteBuf; true; writeByte; ; ; Argument[0]; Argument[this]; taint; manual |
-| 126 | Summary: io.netty.buffer; ByteBuf; true; writeBytes; (byte[]); ; Argument[0]; Argument[this]; taint; manual |
-| 127 | Summary: io.netty.buffer; ByteBuf; true; writeBytes; (byte[],int,int); ; Argument[0]; Argument[this]; taint; manual |
-| 128 | Summary: io.netty.buffer; ByteBuf; true; writeBytes; (ByteBuf); ; Argument[0]; Argument[this]; taint; manual |
-| 129 | Summary: io.netty.buffer; ByteBuf; true; writeBytes; (ByteBuffer); ; Argument[0]; Argument[this]; taint; manual |
-| 130 | Summary: io.netty.buffer; ByteBuf; true; writeBytes; (ByteBuf,int); ; Argument[0]; Argument[this]; taint; manual |
-| 131 | Summary: io.netty.buffer; ByteBuf; true; writeBytes; (ByteBuf,int,int); ; Argument[0]; Argument[this]; taint; manual |
-| 132 | Summary: io.netty.buffer; ByteBuf; true; writeBytes; (FileChannel,long,int); ; Argument[0]; Argument[this]; taint; manual |
-| 133 | Summary: io.netty.buffer; ByteBuf; true; writeBytes; (ScatteringByteChannel,int); ; Argument[0]; Argument[this]; taint; manual |
-| 134 | Summary: io.netty.buffer; ByteBuf; true; writeBytes; (InputStream,int); ; Argument[0]; Argument[this]; taint; manual |
-| 135 | Summary: io.netty.buffer; ByteBuf; true; writeChar; ; ; Argument[0]; Argument[this]; taint; manual |
-| 136 | Summary: io.netty.buffer; ByteBuf; true; writeCharSequence; ; ; Argument[0]; Argument[this]; taint; manual |
-| 137 | Summary: io.netty.buffer; CompositeByteBuf; false; CompositeByteBuf; (ByteBufAllocator,boolean,int,ByteBuf[]); ; Argument[3].ArrayElement; Argument[this]; taint; manual |
-| 138 | Summary: io.netty.buffer; CompositeByteBuf; false; CompositeByteBuf; (ByteBufAllocator,boolean,int,Iterable); ; Argument[3].Element; Argument[this]; taint; manual |
-| 139 | Summary: io.netty.buffer; CompositeByteBuf; true; addComponent; (ByteBuf); ; Argument[0]; Argument[this]; taint; manual |
-| 140 | Summary: io.netty.buffer; CompositeByteBuf; true; addComponent; (int,ByteBuf); ; Argument[1]; Argument[this]; taint; manual |
-| 141 | Summary: io.netty.buffer; CompositeByteBuf; true; addComponent; (boolean,ByteBuf); ; Argument[1]; Argument[this]; taint; manual |
-| 142 | Summary: io.netty.buffer; CompositeByteBuf; true; addComponent; (boolean,int,ByteBuf); ; Argument[2]; Argument[this]; taint; manual |
-| 143 | Summary: io.netty.buffer; CompositeByteBuf; true; addComponents; (ByteBuf[]); ; Argument[0].ArrayElement; Argument[this]; taint; manual |
-| 144 | Summary: io.netty.buffer; CompositeByteBuf; true; addComponents; (int,ByteBuf[]); ; Argument[1].ArrayElement; Argument[this]; taint; manual |
-| 145 | Summary: io.netty.buffer; CompositeByteBuf; true; addComponents; (boolean,ByteBuf[]); ; Argument[1].ArrayElement; Argument[this]; taint; manual |
-| 146 | Summary: io.netty.buffer; CompositeByteBuf; true; addComponents; (Iterable); ; Argument[0].Element; Argument[this]; taint; manual |
-| 147 | Summary: io.netty.buffer; CompositeByteBuf; true; addComponents; (int,Iterable); ; Argument[1].Element; Argument[this]; taint; manual |
-| 148 | Summary: io.netty.buffer; CompositeByteBuf; true; addComponents; (boolean,Iterable); ; Argument[1].Element; Argument[this]; taint; manual |
-| 149 | Summary: io.netty.buffer; CompositeByteBuf; true; addFlattenedComponents; (boolean,ByteBuf); ; Argument[1]; Argument[this]; taint; manual |
-| 150 | Summary: io.netty.buffer; CompositeByteBuf; true; addComponent; ; ; Argument[this]; ReturnValue; value; manual |
-| 151 | Summary: io.netty.buffer; CompositeByteBuf; true; addComponents; ; ; Argument[this]; ReturnValue; value; manual |
-| 152 | Summary: io.netty.buffer; CompositeByteBuf; true; addFlattenedComponents; ; ; Argument[this]; ReturnValue; value; manual |
-| 153 | Summary: io.netty.buffer; CompositeByteBuf; true; component; (int); ; Argument[this]; ReturnValue; taint; manual |
-| 154 | Summary: io.netty.buffer; CompositeByteBuf; true; componentAtOffset; (int); ; Argument[this]; ReturnValue; taint; manual |
-| 155 | Summary: io.netty.buffer; CompositeByteBuf; true; consolidate; (); ; Argument[this]; ReturnValue; taint; manual |
-| 156 | Summary: io.netty.buffer; CompositeByteBuf; true; consolidate; (int,int); ; Argument[this]; ReturnValue; taint; manual |
-| 157 | Summary: io.netty.buffer; CompositeByteBuf; true; decompose; (int,int); ; Argument[this]; ReturnValue.Element; taint; manual |
-| 158 | Summary: io.netty.buffer; Unpooled; false; copiedBuffer; (byte[]); ; Argument[0]; ReturnValue; taint; manual |
-| 159 | Summary: io.netty.buffer; Unpooled; false; copiedBuffer; (byte[][]); ; Argument[0].ArrayElement; ReturnValue; taint; manual |
-| 160 | Summary: io.netty.buffer; Unpooled; false; copiedBuffer; (byte[],int,int); ; Argument[0]; ReturnValue; taint; manual |
-| 161 | Summary: io.netty.buffer; Unpooled; false; copiedBuffer; (ByteBuf); ; Argument[0]; ReturnValue; taint; manual |
-| 162 | Summary: io.netty.buffer; Unpooled; false; copiedBuffer; (ByteBuf[]); ; Argument[0].ArrayElement; ReturnValue; taint; manual |
-| 163 | Summary: io.netty.buffer; Unpooled; false; copiedBuffer; (ByteBuffer); ; Argument[0]; ReturnValue; taint; manual |
-| 164 | Summary: io.netty.buffer; Unpooled; false; copiedBuffer; (ByteBuffer[]); ; Argument[0].ArrayElement; ReturnValue; taint; manual |
-| 165 | Summary: io.netty.buffer; Unpooled; false; copiedBuffer; (char[],Charset); ; Argument[0]; ReturnValue; taint; manual |
-| 166 | Summary: io.netty.buffer; Unpooled; false; copiedBuffer; (char[],int,int,Charset); ; Argument[0]; ReturnValue; taint; manual |
-| 167 | Summary: io.netty.buffer; Unpooled; false; copiedBuffer; (CharSequence,Charset); ; Argument[0]; ReturnValue; taint; manual |
-| 168 | Summary: io.netty.buffer; Unpooled; false; copiedBuffer; (CharSequence,int,int,Charset); ; Argument[0]; ReturnValue; taint; manual |
-| 169 | Summary: io.netty.buffer; Unpooled; false; unmodifiableBuffer; (ByteBuf); ; Argument[0]; ReturnValue; taint; manual |
-| 170 | Summary: io.netty.buffer; Unpooled; false; unmodifiableBuffer; (ByteBuf[]); ; Argument[0].ArrayElement; ReturnValue; taint; manual |
-| 171 | Summary: io.netty.buffer; Unpooled; false; unreleasableBuffer; (ByteBuf); ; Argument[0]; ReturnValue; taint; manual |
-| 172 | Summary: io.netty.buffer; Unpooled; false; wrappedBuffer; (byte[]); ; Argument[0]; ReturnValue; taint; manual |
-| 173 | Summary: io.netty.buffer; Unpooled; false; wrappedBuffer; (byte[][]); ; Argument[0].ArrayElement; ReturnValue; taint; manual |
-| 174 | Summary: io.netty.buffer; Unpooled; false; wrappedBuffer; (byte[],int,int); ; Argument[0]; ReturnValue; taint; manual |
-| 175 | Summary: io.netty.buffer; Unpooled; false; wrappedBuffer; (ByteBuf); ; Argument[0]; ReturnValue; taint; manual |
-| 176 | Summary: io.netty.buffer; Unpooled; false; wrappedBuffer; (ByteBuf[]); ; Argument[0].ArrayElement; ReturnValue; taint; manual |
-| 177 | Summary: io.netty.buffer; Unpooled; false; wrappedBuffer; (ByteBuffer); ; Argument[0]; ReturnValue; taint; manual |
-| 178 | Summary: io.netty.buffer; Unpooled; false; wrappedBuffer; (ByteBuffer[]); ; Argument[0].ArrayElement; ReturnValue; taint; manual |
-| 179 | Summary: io.netty.buffer; Unpooled; false; wrappedBuffer; (int,byte[][]); ; Argument[1].ArrayElement; ReturnValue; taint; manual |
-| 180 | Summary: io.netty.buffer; Unpooled; false; wrappedBuffer; (int,ByteBuf[]); ; Argument[1].ArrayElement; ReturnValue; taint; manual |
-| 181 | Summary: io.netty.buffer; Unpooled; false; wrappedBuffer; (int,ByteBuffer[]); ; Argument[1].ArrayElement; ReturnValue; taint; manual |
-| 182 | Summary: io.netty.buffer; Unpooled; false; wrappedUnmodifiableBuffer; (ByteBuf[]); ; Argument[0].ArrayElement; ReturnValue; taint; manual |
-| 183 | Summary: io.netty.buffer; ByteBufUtil; false; copy; (AsciiString,ByteBuf); ; Argument[0]; Argument[1]; taint; manual |
-| 184 | Summary: io.netty.buffer; ByteBufUtil; false; copy; (AsciiString,int,ByteBuf,int); ; Argument[0]; Argument[2]; taint; manual |
-| 185 | Summary: io.netty.buffer; ByteBufUtil; false; copy; (AsciiString,int,ByteBuf,int,int); ; Argument[0]; Argument[2]; taint; manual |
-| 186 | Summary: io.netty.buffer; ByteBufUtil; false; decodeHexDump; (CharSequence); ; Argument[0]; ReturnValue; taint; manual |
-| 187 | Summary: io.netty.buffer; ByteBufUtil; false; decodeHexDump; (CharSequence,int,int); ; Argument[0]; ReturnValue; taint; manual |
-| 188 | Summary: io.netty.buffer; ByteBufUtil; false; encodeString; (ByteBufAllocator,CharBuffer,Charset); ; Argument[1]; ReturnValue; taint; manual |
-| 189 | Summary: io.netty.buffer; ByteBufUtil; false; encodeString; (ByteBufAllocator,CharBuffer,Charset,int); ; Argument[1]; ReturnValue; taint; manual |
-| 190 | Summary: io.netty.buffer; ByteBufUtil; false; ensureAccessible; (ByteBuf); ; Argument[0]; ReturnValue; value; manual |
-| 191 | Summary: io.netty.buffer; ByteBufUtil; false; getBytes; (ByteBuf); ; Argument[0]; ReturnValue; taint; manual |
-| 192 | Summary: io.netty.buffer; ByteBufUtil; false; getBytes; (ByteBuf,int,int); ; Argument[0]; ReturnValue; taint; manual |
-| 193 | Summary: io.netty.buffer; ByteBufUtil; false; getBytes; (ByteBuf,int,int,boolean); ; Argument[0]; ReturnValue; taint; manual |
-| 194 | Summary: io.netty.buffer; ByteBufUtil; false; readBytes; (ByteBufAllocator,ByteBuf,int); ; Argument[1]; ReturnValue; taint; manual |
-| 195 | Summary: io.netty.buffer; ByteBufUtil; false; reserveAndWriteUtf8; (ByteBuf,CharSequence,int); ; Argument[1]; Argument[0]; taint; manual |
-| 196 | Summary: io.netty.buffer; ByteBufUtil; false; reserveAndWriteUtf8; (ByteBuf,CharSequence,int,int,int); ; Argument[1]; Argument[0]; taint; manual |
-| 197 | Summary: io.netty.buffer; ByteBufUtil; false; setShortBE; (ByteBuf,int,int); ; Argument[0]; ReturnValue; value; manual |
-| 198 | Summary: io.netty.buffer; ByteBufUtil; false; writeAscii; (ByteBuf,CharSequence); ; Argument[1]; Argument[0]; taint; manual |
-| 199 | Summary: io.netty.buffer; ByteBufUtil; false; writeAscii; (ByteBufAllocator,CharSequence); ; Argument[1]; ReturnValue; taint; manual |
-| 200 | Summary: io.netty.buffer; ByteBufUtil; false; writeShortBE; (ByteBuf,int); ; Argument[0]; ReturnValue; value; manual |
-| 201 | Summary: io.netty.buffer; ByteBufUtil; false; writeMediumBE; (ByteBuf,int); ; Argument[0]; ReturnValue; value; manual |
-| 202 | Summary: io.netty.buffer; ByteBufUtil; false; writeUtf8; (ByteBuf,CharSequence); ; Argument[1]; Argument[0]; taint; manual |
-| 203 | Summary: io.netty.buffer; ByteBufUtil; false; writeUtf8; (ByteBuf,CharSequence,int,int); ; Argument[1]; Argument[0]; taint; manual |
-| 204 | Summary: io.netty.buffer; ByteBufUtil; false; writeUtf8; (ByteBufAllocator,CharSequence); ; Argument[1]; ReturnValue; taint; manual |
-| 205 | Summary: io.netty.buffer; ByteBufInputStream; true; ByteBufInputStream; ; ; Argument[0]; Argument[this]; taint; manual |
-| 206 | Summary: io.netty.buffer; ByteBufOutputStream; true; ByteBufOutputStream; ; ; Argument[0]; Argument[this]; taint; manual |
-| 207 | Summary: io.netty.buffer; ByteBufOutputStream; true; buffer; (); ; Argument[this]; ReturnValue; taint; manual |
-| 208 | Summary: io.netty.handler.codec.base64; Base64; true; decode; ; ; Argument[0]; ReturnValue; taint; manual |
-| 209 | Summary: io.netty.handler.codec.base64; Base64; true; encode; ; ; Argument[0]; ReturnValue; taint; manual |
-| 210 | Summary: io.netty.handler.codec.http.cookie; Cookie; true; domain; (); ; Argument[this]; ReturnValue; taint; manual |
-| 211 | Summary: io.netty.handler.codec.http.cookie; Cookie; true; name; (); ; Argument[this]; ReturnValue; taint; manual |
-| 212 | Summary: io.netty.handler.codec.http.cookie; Cookie; true; path; (); ; Argument[this]; ReturnValue; taint; manual |
-| 213 | Summary: io.netty.handler.codec.http.cookie; Cookie; true; value; (); ; Argument[this]; ReturnValue; taint; manual |
-| 214 | Summary: io.netty.handler.codec.http.cookie; Cookie; true; setDomain; (String); ; Argument[0]; Argument[this]; taint; manual |
-| 215 | Summary: io.netty.handler.codec.http.cookie; Cookie; true; setPath; (String); ; Argument[0]; Argument[this]; taint; manual |
-| 216 | Summary: io.netty.handler.codec.http.cookie; Cookie; true; setValue; (String); ; Argument[0]; Argument[this]; taint; manual |
-| 217 | Summary: io.netty.handler.codec.http.cookie; ServerCookieDecoder; true; decode; (String); ; Argument[0]; ReturnValue.Element; taint; manual |
-| 218 | Summary: io.netty.handler.codec.http.cookie; ServerCookieDecoder; true; decodeAll; (String); ; Argument[0]; ReturnValue.Element; taint; manual |
-| 219 | Summary: io.netty.handler.codec.http.cookie; ServerCookieEncoder; true; encode; (Cookie); ; Argument[0]; ReturnValue; taint; manual |
-| 220 | Summary: io.netty.handler.codec.http.cookie; ServerCookieEncoder; true; encode; (Cookie[]); ; Argument[0].ArrayElement; ReturnValue.Element; taint; manual |
-| 221 | Summary: io.netty.handler.codec.http.cookie; ServerCookieEncoder; true; encode; (Collection); ; Argument[0].Element; ReturnValue.Element; taint; manual |
-| 222 | Summary: io.netty.handler.codec.http.cookie; ServerCookieEncoder; true; encode; (Iterable); ; Argument[0].Element; ReturnValue.Element; taint; manual |
-| 223 | Summary: io.netty.handler.codec.http.cookie; ServerCookieEncoder; true; encode; (String,String); ; Argument[1..2]; ReturnValue; taint; manual |
-| 224 | Summary: io.netty.handler.codec.http; HttpHeaders; true; add; ; ; Argument[this]; ReturnValue; value; manual |
-| 225 | Summary: io.netty.handler.codec.http; HttpHeaders; true; add; (CharSequence,Iterable); ; Argument[0]; Argument[this].Element.MapKey; taint; manual |
-| 226 | Summary: io.netty.handler.codec.http; HttpHeaders; true; add; (CharSequence,Iterable); ; Argument[1].Element; Argument[this].Element.MapValue; taint; manual |
-| 227 | Summary: io.netty.handler.codec.http; HttpHeaders; true; add; (CharSequence,Object); ; Argument[0]; Argument[this].Element.MapKey; taint; manual |
-| 228 | Summary: io.netty.handler.codec.http; HttpHeaders; true; add; (CharSequence,Object); ; Argument[1]; Argument[this].Element.MapValue; taint; manual |
-| 229 | Summary: io.netty.handler.codec.http; HttpHeaders; true; add; (String,Iterable); ; Argument[0]; Argument[this].Element.MapKey; value; manual |
-| 230 | Summary: io.netty.handler.codec.http; HttpHeaders; true; add; (String,Iterable); ; Argument[1].Element; Argument[this].Element.MapValue; taint; manual |
-| 231 | Summary: io.netty.handler.codec.http; HttpHeaders; true; add; (String,Object); ; Argument[0]; Argument[this].Element.MapKey; value; manual |
-| 232 | Summary: io.netty.handler.codec.http; HttpHeaders; true; add; (String,Object); ; Argument[1]; Argument[this].Element.MapValue; taint; manual |
-| 233 | Summary: io.netty.handler.codec.http; HttpHeaders; true; add; (HttpHeaders); ; Argument[0].Element.MapKey; Argument[this].Element.MapKey; value; manual |
-| 234 | Summary: io.netty.handler.codec.http; HttpHeaders; true; add; (HttpHeaders); ; Argument[0].Element.MapValue; Argument[this].Element.MapValue; taint; manual |
-| 235 | Summary: io.netty.handler.codec.http; HttpHeaders; true; addInt; (CharSequence,int); ; Argument[this]; ReturnValue; value; manual |
-| 236 | Summary: io.netty.handler.codec.http; HttpHeaders; true; addInt; (CharSequence,int); ; Argument[0]; Argument[this].Element.MapKey; value; manual |
-| 237 | Summary: io.netty.handler.codec.http; HttpHeaders; true; addShort; (CharSequence,short); ; Argument[this]; ReturnValue; value; manual |
-| 238 | Summary: io.netty.handler.codec.http; HttpHeaders; true; addShort; (CharSequence,short); ; Argument[0]; Argument[this].Element.MapKey; value; manual |
-| 239 | Summary: io.netty.handler.codec.http; HttpHeaders; true; copy; (); ; Argument[this].Element.MapKey; ReturnValue.Element.MapKey; value; manual |
-| 240 | Summary: io.netty.handler.codec.http; HttpHeaders; true; copy; (); ; Argument[this].Element.MapValue; ReturnValue.Element.MapValue; value; manual |
-| 241 | Summary: io.netty.handler.codec.http; HttpHeaders; true; entries; (); ; Argument[this].Element.MapKey; ReturnValue.Element.MapKey; value; manual |
-| 242 | Summary: io.netty.handler.codec.http; HttpHeaders; true; entries; (); ; Argument[this].Element.MapValue; ReturnValue.Element.MapValue; value; manual |
-| 243 | Summary: io.netty.handler.codec.http; HttpHeaders; true; get; ; ; Argument[this].Element.MapValue; ReturnValue; value; manual |
-| 244 | Summary: io.netty.handler.codec.http; HttpHeaders; true; get; ; ; Argument[1]; ReturnValue; value; manual |
-| 245 | Summary: io.netty.handler.codec.http; HttpHeaders; true; getAll; ; ; Argument[this].Element.MapValue; ReturnValue.Element; value; manual |
-| 246 | Summary: io.netty.handler.codec.http; HttpHeaders; true; getAllAsString; ; ; Argument[this].Element.MapValue; ReturnValue.Element; value; manual |
-| 247 | Summary: io.netty.handler.codec.http; HttpHeaders; true; getAsString; ; ; Argument[this].Element.MapValue; ReturnValue; value; manual |
-| 248 | Summary: io.netty.handler.codec.http; HttpHeaders; true; getHeader; ; ; Argument[0]; ReturnValue; taint; manual |
-| 249 | Summary: io.netty.handler.codec.http; HttpHeaders; true; getHeader; ; ; Argument[2]; ReturnValue; value; manual |
-| 250 | Summary: io.netty.handler.codec.http; HttpHeaders; true; getHost; ; ; Argument[0]; ReturnValue; taint; manual |
-| 251 | Summary: io.netty.handler.codec.http; HttpHeaders; true; getHost; ; ; Argument[1]; ReturnValue; value; manual |
-| 252 | Summary: io.netty.handler.codec.http; HttpHeaders; true; iteratorAsString; (); ; Argument[this].Element.MapKey; ReturnValue.Element.MapKey; value; manual |
-| 253 | Summary: io.netty.handler.codec.http; HttpHeaders; true; iteratorAsString; (); ; Argument[this].Element.MapValue; ReturnValue.Element.MapValue; value; manual |
-| 254 | Summary: io.netty.handler.codec.http; HttpHeaders; true; iteratorCharSequence; (); ; Argument[this].Element.MapKey; ReturnValue.Element.MapKey; taint; manual |
-| 255 | Summary: io.netty.handler.codec.http; HttpHeaders; true; iteratorCharSequence; (); ; Argument[this].Element.MapValue; ReturnValue.Element.MapValue; taint; manual |
-| 256 | Summary: io.netty.handler.codec.http; HttpHeaders; true; names; (); ; Argument[this].Element.MapKey; ReturnValue.Element; value; manual |
-| 257 | Summary: io.netty.handler.codec.http; HttpHeaders; true; newEntity; ; ; Argument[0]; ReturnValue; taint; manual |
-| 258 | Summary: io.netty.handler.codec.http; HttpHeaders; true; remove; ; ; Argument[this]; ReturnValue; value; manual |
-| 259 | Summary: io.netty.handler.codec.http; HttpHeaders; true; set; ; ; Argument[this]; ReturnValue; value; manual |
-| 260 | Summary: io.netty.handler.codec.http; HttpHeaders; true; set; (CharSequence,Iterable); ; Argument[0]; Argument[this].Element.MapKey; taint; manual |
-| 261 | Summary: io.netty.handler.codec.http; HttpHeaders; true; set; (CharSequence,Iterable); ; Argument[1].Element; Argument[this].Element.MapValue; taint; manual |
-| 262 | Summary: io.netty.handler.codec.http; HttpHeaders; true; set; (CharSequence,Object); ; Argument[0]; Argument[this].Element.MapKey; taint; manual |
-| 263 | Summary: io.netty.handler.codec.http; HttpHeaders; true; set; (CharSequence,Object); ; Argument[1]; Argument[this].Element.MapValue; taint; manual |
-| 264 | Summary: io.netty.handler.codec.http; HttpHeaders; true; set; (String,Iterable); ; Argument[0]; Argument[this].Element.MapKey; value; manual |
-| 265 | Summary: io.netty.handler.codec.http; HttpHeaders; true; set; (String,Iterable); ; Argument[1].Element; Argument[this].Element.MapValue; taint; manual |
-| 266 | Summary: io.netty.handler.codec.http; HttpHeaders; true; set; (String,Object); ; Argument[0]; Argument[this].Element.MapKey; value; manual |
-| 267 | Summary: io.netty.handler.codec.http; HttpHeaders; true; set; (String,Object); ; Argument[1]; Argument[this].Element.MapValue; taint; manual |
-| 268 | Summary: io.netty.handler.codec.http; HttpHeaders; true; set; (HttpHeaders); ; Argument[0].Element.MapKey; Argument[this].Element.MapKey; value; manual |
-| 269 | Summary: io.netty.handler.codec.http; HttpHeaders; true; set; (HttpHeaders); ; Argument[0].Element.MapValue; Argument[this].Element.MapValue; taint; manual |
-| 270 | Summary: io.netty.handler.codec.http; HttpHeaders; true; setAll; (HttpHeaders); ; Argument[this]; ReturnValue; value; manual |
-| 271 | Summary: io.netty.handler.codec.http; HttpHeaders; true; setAll; (HttpHeaders); ; Argument[0].Element.MapKey; Argument[this].Element.MapKey; value; manual |
-| 272 | Summary: io.netty.handler.codec.http; HttpHeaders; true; setAll; (HttpHeaders); ; Argument[0].Element.MapValue; Argument[this].Element.MapValue; taint; manual |
-| 273 | Summary: io.netty.handler.codec.http; HttpHeaders; true; setInt; (CharSequence,int); ; Argument[this]; ReturnValue; value; manual |
-| 274 | Summary: io.netty.handler.codec.http; HttpHeaders; true; setInt; (CharSequence,int); ; Argument[0]; Argument[this].Element.MapKey; value; manual |
-| 275 | Summary: io.netty.handler.codec.http; HttpHeaders; true; setShort; (CharSequence,short); ; Argument[this]; ReturnValue; value; manual |
-| 276 | Summary: io.netty.handler.codec.http; HttpHeaders; true; setShort; (CharSequence,short); ; Argument[0]; Argument[this].Element.MapKey; value; manual |
-| 277 | Summary: io.netty.handler.codec.http; HttpHeaders; true; valueStringIterator; (CharSequence); ; Argument[this].Element.MapValue; ReturnValue.Element; value; manual |
-| 278 | Summary: io.netty.handler.codec.http; HttpHeaders; true; valueCharSequenceIterator; (CharSequence); ; Argument[this].Element.MapValue; ReturnValue.Element; taint; manual |
-| 279 | Summary: io.netty.handler.codec.http; HttpHeaders; true; toString; ; ; Argument[this].Element.MapKey; ReturnValue; taint; manual |
-| 280 | Summary: io.netty.handler.codec.http; HttpHeaders; true; toString; ; ; Argument[this].Element.MapValue; ReturnValue; taint; manual |
-| 281 | Summary: io.netty.handler.codec.http; HttpMessage; true; headers; ; ; Argument[this]; ReturnValue; taint; manual |
-| 282 | Summary: io.netty.handler.codec.http; LastHttpContent; true; trailingHeaders; ; ; Argument[this]; ReturnValue; taint; manual |
-| 283 | Summary: io.netty.handler.codec.http; HttpRequest; true; getUri; ; ; Argument[this]; ReturnValue; taint; manual |
-| 284 | Summary: io.netty.handler.codec.http; HttpRequest; true; uri; ; ; Argument[this]; ReturnValue; taint; manual |
-| 285 | Summary: io.netty.handler.codec.http; QueryStringDecoder; true; QueryStringDecoder; ; ; Argument[0]; Argument[this]; taint; manual |
-| 286 | Summary: io.netty.handler.codec.http; QueryStringDecoder; true; decodeComponent; ; ; Argument[0]; ReturnValue; taint; manual |
-| 287 | Summary: io.netty.handler.codec.http; QueryStringDecoder; true; parameters; ; ; Argument[this]; ReturnValue; taint; manual |
-| 288 | Summary: io.netty.handler.codec.http; QueryStringDecoder; true; path; ; ; Argument[this]; ReturnValue; taint; manual |
-| 289 | Summary: io.netty.handler.codec.http; QueryStringDecoder; true; rawPath; ; ; Argument[this]; ReturnValue; taint; manual |
-| 290 | Summary: io.netty.handler.codec.http; QueryStringDecoder; true; rawQuery; ; ; Argument[this]; ReturnValue; taint; manual |
-| 291 | Summary: io.netty.handler.codec.http; QueryStringDecoder; true; toString; ; ; Argument[this]; ReturnValue; taint; manual |
-| 292 | Summary: io.netty.handler.codec.http; QueryStringDecoder; true; uri; ; ; Argument[this]; ReturnValue; taint; manual |
-| 293 | Summary: io.netty.handler.codec.http.multipart; InterfaceHttpPostRequestDecoder; true; currentPartialHttpData; (); ; Argument[this]; ReturnValue; taint; manual |
-| 294 | Summary: io.netty.handler.codec.http.multipart; InterfaceHttpPostRequestDecoder; true; getBodyHttpData; (String); ; Argument[this]; ReturnValue; taint; manual |
-| 295 | Summary: io.netty.handler.codec.http.multipart; InterfaceHttpPostRequestDecoder; true; getBodyHttpDatas; (); ; Argument[this]; ReturnValue; taint; manual |
-| 296 | Summary: io.netty.handler.codec.http.multipart; InterfaceHttpPostRequestDecoder; true; getBodyHttpDatas; (String); ; Argument[this]; ReturnValue; taint; manual |
-| 297 | Summary: io.netty.handler.codec.http.multipart; InterfaceHttpPostRequestDecoder; true; next; (); ; Argument[this]; ReturnValue; taint; manual |
-| 298 | Summary: io.netty.handler.codec.http.multipart; InterfaceHttpPostRequestDecoder; true; offer; (HttpContent); ; Argument[0]; Argument[this]; taint; manual |
-| 299 | Summary: io.netty.handler.codec.http.multipart; InterfaceHttpPostRequestDecoder; true; offer; (HttpContent); ; Argument[this]; ReturnValue; value; manual |
-| 300 | Summary: io.netty.handler.codec.http.multipart; HttpPostRequestDecoder; true; HttpPostRequestDecoder; (HttpRequest); ; Argument[0]; Argument[this]; taint; manual |
-| 301 | Summary: io.netty.handler.codec.http.multipart; HttpPostRequestDecoder; true; HttpPostRequestDecoder; (HttpDataFactory,HttpRequest); ; Argument[1]; Argument[this]; taint; manual |
-| 302 | Summary: io.netty.handler.codec.http.multipart; HttpPostRequestDecoder; true; HttpPostRequestDecoder; (HttpDataFactory,HttpRequest,Charset); ; Argument[1]; Argument[this]; taint; manual |
-| 303 | Summary: io.netty.handler.codec.http.multipart; HttpPostStandardRequestDecoder; true; HttpPostStandardRequestDecoder; (HttpRequest); ; Argument[0]; Argument[this]; taint; manual |
-| 304 | Summary: io.netty.handler.codec.http.multipart; HttpPostStandardRequestDecoder; true; HttpPostStandardRequestDecoder; (HttpDataFactory,HttpRequest); ; Argument[1]; Argument[this]; taint; manual |
-| 305 | Summary: io.netty.handler.codec.http.multipart; HttpPostStandardRequestDecoder; true; HttpPostStandardRequestDecoder; (HttpDataFactory,HttpRequest,Charset); ; Argument[1]; Argument[this]; taint; manual |
-| 306 | Summary: io.netty.handler.codec.http.multipart; HttpPostMultipartRequestDecoder; true; HttpPostMultipartRequestDecoder; (HttpRequest); ; Argument[0]; Argument[this]; taint; manual |
-| 307 | Summary: io.netty.handler.codec.http.multipart; HttpPostMultipartRequestDecoder; true; HttpPostMultipartRequestDecoder; (HttpDataFactory,HttpRequest); ; Argument[1]; Argument[this]; taint; manual |
-| 308 | Summary: io.netty.handler.codec.http.multipart; HttpPostMultipartRequestDecoder; true; HttpPostMultipartRequestDecoder; (HttpDataFactory,HttpRequest,Charset); ; Argument[1]; Argument[this]; taint; manual |
-| 309 | Summary: io.netty.handler.codec.http.multipart; InterfaceHttpData; true; getName; (); ; Argument[this]; ReturnValue; taint; manual |
-| 310 | Summary: io.netty.handler.codec.http.multipart; HttpData; true; addContent; (ByteBuf,boolean); ; Argument[0]; Argument[this]; taint; manual |
-| 311 | Summary: io.netty.handler.codec.http.multipart; HttpData; true; get; (); ; Argument[this]; ReturnValue; taint; manual |
-| 312 | Summary: io.netty.handler.codec.http.multipart; HttpData; true; getByteBuf; (); ; Argument[this]; ReturnValue; taint; manual |
-| 313 | Summary: io.netty.handler.codec.http.multipart; HttpData; true; getChunk; (int); ; Argument[this]; ReturnValue; taint; manual |
-| 314 | Summary: io.netty.handler.codec.http.multipart; HttpData; true; getString; (); ; Argument[this]; ReturnValue; taint; manual |
-| 315 | Summary: io.netty.handler.codec.http.multipart; HttpData; true; getString; (Charset); ; Argument[this]; ReturnValue; taint; manual |
-| 316 | Summary: io.netty.handler.codec.http.multipart; Attribute; true; getValue; (); ; Argument[this]; ReturnValue; taint; manual |
-| 317 | Summary: io.netty.handler.codec.http.multipart; Attribute; true; setValue; (String); ; Argument[0]; Argument[this]; taint; manual |
-| 318 | Summary: io.netty.handler.codec.http.multipart; FileUpload; true; getContentTransferEncoding; (); ; Argument[this]; ReturnValue; taint; manual |
-| 319 | Summary: io.netty.handler.codec.http.multipart; FileUpload; true; getContentType; (); ; Argument[this]; ReturnValue; taint; manual |
-| 320 | Summary: io.netty.handler.codec.http.multipart; FileUpload; true; getFilename; (); ; Argument[this]; ReturnValue; taint; manual |
-| 321 | Summary: io.netty.handler.codec.http.multipart; FileUpload; true; setContentTransferEncoding; (String); ; Argument[0]; Argument[this]; taint; manual |
-| 322 | Summary: io.netty.handler.codec.http.multipart; FileUpload; true; setContentType; (String); ; Argument[0]; Argument[this]; taint; manual |
-| 323 | Summary: io.netty.handler.codec.http.multipart; FileUpload; true; setFilename; (String); ; Argument[0]; Argument[this]; taint; manual |
-| 324 | Summary: io.netty.handler.codec.http.multipart; HttpData; true; setContent; (ByteBuf); ; Argument[0]; Argument[this]; taint; manual |
-| 325 | Summary: io.netty.handler.codec.http.multipart; HttpData; true; setContent; (InputStream); ; Argument[0]; Argument[this]; taint; manual |
-| 326 | Summary: io.netty.handler.codec.http.websocketx; CloseWebSocketFrame; true; CloseWebSocketFrame; (boolean,int,ByteBuf); ; Argument[2]; Argument[this]; taint; manual |
-| 327 | Summary: io.netty.handler.codec.http.websocketx; CloseWebSocketFrame; true; CloseWebSocketFrame; (boolean,int,int,String); ; Argument[3]; Argument[this]; taint; manual |
-| 328 | Summary: io.netty.handler.codec.http.websocketx; CloseWebSocketFrame; true; CloseWebSocketFrame; (int,String); ; Argument[1]; Argument[this]; taint; manual |
-| 329 | Summary: io.netty.handler.codec.http.websocketx; CloseWebSocketFrame; true; CloseWebSocketFrame; (WebSocketCloseStatus,String); ; Argument[1]; Argument[this]; taint; manual |
-| 330 | Summary: io.netty.handler.codec.http.websocketx; CloseWebSocketFrame; true; reasonText; (); ; Argument[this]; ReturnValue; taint; manual |
-| 331 | Summary: io.netty.handler.codec.http.websocketx; BinaryWebSocketFrame; true; BinaryWebSocketFrame; (boolean,int,ByteBuf); ; Argument[2]; Argument[this]; taint; manual |
-| 332 | Summary: io.netty.handler.codec.http.websocketx; BinaryWebSocketFrame; true; BinaryWebSocketFrame; (ByteBuf); ; Argument[0]; Argument[this]; taint; manual |
-| 333 | Summary: io.netty.handler.codec.http.websocketx; ContinuationWebSocketFrame; true; ContinuationWebSocketFrame; (boolean,int,ByteBuf); ; Argument[2]; Argument[this]; taint; manual |
-| 334 | Summary: io.netty.handler.codec.http.websocketx; ContinuationWebSocketFrame; true; ContinuationWebSocketFrame; (boolean,int,String); ; Argument[2]; Argument[this]; taint; manual |
-| 335 | Summary: io.netty.handler.codec.http.websocketx; ContinuationWebSocketFrame; true; ContinuationWebSocketFrame; (ByteBuf); ; Argument[0]; Argument[this]; taint; manual |
-| 336 | Summary: io.netty.handler.codec.http.websocketx; ContinuationWebSocketFrame; true; text; (); ; Argument[this]; ReturnValue; taint; manual |
-| 337 | Summary: io.netty.handler.codec.http.websocketx; PingWebSocketFrame; true; PingWebSocketFrame; (boolean,int,ByteBuf); ; Argument[2]; Argument[this]; taint; manual |
-| 338 | Summary: io.netty.handler.codec.http.websocketx; PingWebSocketFrame; true; PingWebSocketFrame; (ByteBuf); ; Argument[0]; Argument[this]; taint; manual |
-| 339 | Summary: io.netty.handler.codec.http.websocketx; PongWebSocketFrame; true; PongWebSocketFrame; (boolean,int,ByteBuf); ; Argument[2]; Argument[this]; taint; manual |
-| 340 | Summary: io.netty.handler.codec.http.websocketx; PongWebSocketFrame; true; PongWebSocketFrame; (ByteBuf); ; Argument[0]; Argument[this]; taint; manual |
-| 341 | Summary: io.netty.handler.codec.http.websocketx; TextWebSocketFrame; true; TextWebSocketFrame; (boolean,int,ByteBuf); ; Argument[2]; Argument[this]; taint; manual |
-| 342 | Summary: io.netty.handler.codec.http.websocketx; TextWebSocketFrame; true; TextWebSocketFrame; (boolean,int,String); ; Argument[2]; Argument[this]; taint; manual |
-| 343 | Summary: io.netty.handler.codec.http.websocketx; TextWebSocketFrame; true; TextWebSocketFrame; (String); ; Argument[0]; Argument[this]; taint; manual |
-| 344 | Summary: io.netty.handler.codec.http.websocketx; TextWebSocketFrame; true; TextWebSocketFrame; (ByteBuf); ; Argument[0]; Argument[this]; taint; manual |
-| 345 | Summary: io.netty.handler.codec.http.websocketx; TextWebSocketFrame; true; text; (); ; Argument[this]; ReturnValue; taint; manual |
-| 346 | Summary: io.netty.handler.codec.http2; Http2Headers; true; authority; (); ; Argument[this].Element.MapValue; ReturnValue; value; manual |
-| 347 | Summary: io.netty.handler.codec.http2; Http2Headers; true; authority; (CharSequence); ; Argument[0]; Argument[this].Element.MapValue; value; manual |
-| 348 | Summary: io.netty.handler.codec.http2; Http2Headers; true; authority; (CharSequence); ; Argument[this]; ReturnValue; value; manual |
-| 349 | Summary: io.netty.handler.codec.http2; Http2Headers; true; method; (); ; Argument[this].Element.MapValue; ReturnValue; value; manual |
-| 350 | Summary: io.netty.handler.codec.http2; Http2Headers; true; method; (CharSequence); ; Argument[0]; Argument[this].Element.MapValue; value; manual |
-| 351 | Summary: io.netty.handler.codec.http2; Http2Headers; true; method; (CharSequence); ; Argument[this]; ReturnValue; value; manual |
-| 352 | Summary: io.netty.handler.codec.http2; Http2Headers; true; path; (); ; Argument[this].Element.MapValue; ReturnValue; value; manual |
-| 353 | Summary: io.netty.handler.codec.http2; Http2Headers; true; path; (CharSequence); ; Argument[0]; Argument[this].Element.MapValue; value; manual |
-| 354 | Summary: io.netty.handler.codec.http2; Http2Headers; true; path; (CharSequence); ; Argument[this]; ReturnValue; value; manual |
-| 355 | Summary: io.netty.handler.codec.http2; Http2Headers; true; scheme; (); ; Argument[this].Element.MapValue; ReturnValue; value; manual |
-| 356 | Summary: io.netty.handler.codec.http2; Http2Headers; true; scheme; (CharSequence); ; Argument[0]; Argument[this].Element.MapValue; value; manual |
-| 357 | Summary: io.netty.handler.codec.http2; Http2Headers; true; scheme; (CharSequence); ; Argument[this]; ReturnValue; value; manual |
-| 358 | Summary: io.netty.handler.codec.http2; Http2Headers; true; status; (); ; Argument[this].Element.MapValue; ReturnValue; value; manual |
-| 359 | Summary: io.netty.handler.codec.http2; Http2Headers; true; status; (CharSequence); ; Argument[0]; Argument[this].Element.MapValue; value; manual |
-| 360 | Summary: io.netty.handler.codec.http2; Http2Headers; true; status; (CharSequence); ; Argument[this]; ReturnValue; value; manual |
-| 361 | Summary: io.netty.handler.codec.http2; Http2Headers; true; valueIterator; (CharSequence); ; Argument[this].Element.MapValue; ReturnValue.Element; value; manual |
-| 362 | Summary: io.netty.handler.codec.http2; Http2HeadersFrame; true; headers; (); ; Argument[this]; ReturnValue; taint; manual |
-| 363 | Summary: io.netty.handler.codec.http2; Http2PushPromiseFrame; true; http2Headers; (); ; Argument[this]; ReturnValue; taint; manual |
-| 364 | Summary: io.netty.handler.codec.http2; HttpConversionUtil; false; addHttp2ToHttpHeaders; (int,Http2Headers,FullHttpMessage,boolean); ; Argument[1].Element.MapKey; Argument[2]; taint; manual |
-| 365 | Summary: io.netty.handler.codec.http2; HttpConversionUtil; false; addHttp2ToHttpHeaders; (int,Http2Headers,FullHttpMessage,boolean); ; Argument[1].Element.MapValue; Argument[2]; taint; manual |
-| 366 | Summary: io.netty.handler.codec.http2; HttpConversionUtil; false; addHttp2ToHttpHeaders; (int,Http2Headers,HttpHeaders,HttpVersion,boolean,boolean); ; Argument[1].Element.MapKey; Argument[2].Element.MapKey; taint; manual |
-| 367 | Summary: io.netty.handler.codec.http2; HttpConversionUtil; false; addHttp2ToHttpHeaders; (int,Http2Headers,HttpHeaders,HttpVersion,boolean,boolean); ; Argument[1].Element.MapValue; Argument[2].Element.MapValue; taint; manual |
-| 368 | Summary: io.netty.handler.codec.http2; HttpConversionUtil; false; toFullHttpRequest; ; ; Argument[1].Element.MapKey; ReturnValue; taint; manual |
-| 369 | Summary: io.netty.handler.codec.http2; HttpConversionUtil; false; toFullHttpRequest; ; ; Argument[1].Element.MapValue; ReturnValue; taint; manual |
-| 370 | Summary: io.netty.handler.codec.http2; HttpConversionUtil; false; toFullHttpRequest; (int,Http2Headers,ByteBuf,boolean); ; Argument[2]; ReturnValue; taint; manual |
-| 371 | Summary: io.netty.handler.codec.http2; HttpConversionUtil; false; toFullHttpResponse; ; ; Argument[1].Element.MapKey; ReturnValue; taint; manual |
-| 372 | Summary: io.netty.handler.codec.http2; HttpConversionUtil; false; toFullHttpResponse; ; ; Argument[1].Element.MapValue; ReturnValue; taint; manual |
-| 373 | Summary: io.netty.handler.codec.http2; HttpConversionUtil; false; toFullHttpResponse; (int,Http2Headers,ByteBuf,boolean); ; Argument[2]; ReturnValue; taint; manual |
-| 374 | Summary: io.netty.handler.codec.http2; HttpConversionUtil; false; toHttp2Headers; (HttpHeaders,boolean); ; Argument[0].Element.MapKey; ReturnValue.Element.MapKey; taint; manual |
-| 375 | Summary: io.netty.handler.codec.http2; HttpConversionUtil; false; toHttp2Headers; (HttpHeaders,boolean); ; Argument[0].Element.MapValue; ReturnValue.Element.MapValue; taint; manual |
-| 376 | Summary: io.netty.handler.codec.http2; HttpConversionUtil; false; toHttp2Headers; (HttpHeaders,Http2Headers); ; Argument[0].Element.MapKey; Argument[1].Element.MapKey; taint; manual |
-| 377 | Summary: io.netty.handler.codec.http2; HttpConversionUtil; false; toHttp2Headers; (HttpHeaders,Http2Headers); ; Argument[0].Element.MapValue; Argument[1].Element.MapValue; taint; manual |
-| 378 | Summary: io.netty.handler.codec.http2; HttpConversionUtil; false; toHttpRequest; ; ; Argument[1].Element.MapKey; ReturnValue; taint; manual |
-| 379 | Summary: io.netty.handler.codec.http2; HttpConversionUtil; false; toHttpRequest; ; ; Argument[1].Element.MapValue; ReturnValue; taint; manual |
-| 380 | Summary: io.netty.handler.codec.http2; HttpConversionUtil; false; toHttpResponse; ; ; Argument[1].Element.MapKey; ReturnValue; taint; manual |
-| 381 | Summary: io.netty.handler.codec.http2; HttpConversionUtil; false; toHttpResponse; ; ; Argument[1].Element.MapValue; ReturnValue; taint; manual |
-| 382 | Summary: io.netty.handler.codec; ByteToMessageDecoder$Cumulator; true; cumulate; (ByteBufAllocator,ByteBuf,ByteBuf); ; Argument[1..2]; ReturnValue; taint; manual |
-| 383 | Summary: io.netty.handler.codec; HeadersUtils; false; getAsString; (Headers,Object); ; Argument[0].Element.MapValue; ReturnValue; taint; manual |
-| 384 | Summary: io.netty.handler.codec; HeadersUtils; false; getAllAsString; (Headers,Object); ; Argument[0].Element.MapValue; ReturnValue; taint; manual |
-| 385 | Summary: io.netty.handler.codec; HeadersUtils; false; namesAsString; (Headers); ; Argument[0].Element.MapKey; ReturnValue.Element; value; manual |
-| 386 | Summary: io.netty.handler.codec; HeadersUtils; false; iteratorAsString; (Iterable); ; Argument[0].Element.MapKey; ReturnValue; taint; manual |
-| 387 | Summary: io.netty.handler.codec; HeadersUtils; false; iteratorAsString; (Iterable); ; Argument[0].Element.MapValue; ReturnValue; taint; manual |
-| 388 | Summary: io.netty.handler.codec; HeadersUtils; false; toString; (Class,Iterator,int); ; Argument[1].Element.MapKey; ReturnValue; taint; manual |
-| 389 | Summary: io.netty.handler.codec; HeadersUtils; false; toString; (Class,Iterator,int); ; Argument[1].Element.MapValue; ReturnValue; taint; manual |
-| 390 | Summary: io.netty.handler.codec; Headers; true; get; (Object); ; Argument[this].Element.MapValue; ReturnValue; taint; manual |
-| 391 | Summary: io.netty.handler.codec; Headers; true; get; (Object,Object); ; Argument[this].Element.MapValue; ReturnValue; taint; manual |
-| 392 | Summary: io.netty.handler.codec; Headers; true; get; (Object,Object); ; Argument[1]; ReturnValue; value; manual |
-| 393 | Summary: io.netty.handler.codec; Headers; true; getAll; (Object); ; Argument[this].Element.MapValue; ReturnValue.Element; taint; manual |
-| 394 | Summary: io.netty.handler.codec; Headers; true; getAllAndRemove; (Object); ; Argument[this].Element.MapValue; ReturnValue.Element; taint; manual |
-| 395 | Summary: io.netty.handler.codec; Headers; true; getAndRemove; (Object); ; Argument[this].Element.MapValue; ReturnValue; taint; manual |
-| 396 | Summary: io.netty.handler.codec; Headers; true; getAndRemove; (Object); ; Argument[this].Element.MapValue; ReturnValue; taint; manual |
-| 397 | Summary: io.netty.handler.codec; Headers; true; getAndRemove; (Object,Object); ; Argument[1]; ReturnValue; value; manual |
-| 398 | Summary: io.netty.handler.codec; Headers; true; names; (); ; Argument[this].Element.MapKey; ReturnValue.Element; taint; manual |
-| 399 | Summary: io.netty.handler.codec; Headers; true; add; ; ; Argument[this]; ReturnValue; value; manual |
-| 400 | Summary: io.netty.handler.codec; Headers; true; add; (Headers); ; Argument[0].Element.MapKey; Argument[this].Element.MapKey; value; manual |
-| 401 | Summary: io.netty.handler.codec; Headers; true; add; (Headers); ; Argument[0].Element.MapValue; Argument[this].Element.MapValue; value; manual |
-| 402 | Summary: io.netty.handler.codec; Headers; true; add; (Object,Iterable); ; Argument[0]; Argument[this].Element.MapKey; value; manual |
-| 403 | Summary: io.netty.handler.codec; Headers; true; add; (Object,Iterable); ; Argument[1].Element; Argument[this].Element.MapValue; value; manual |
-| 404 | Summary: io.netty.handler.codec; Headers; true; add; (Object,Object[]); ; Argument[0]; Argument[this].Element.MapKey; value; manual |
-| 405 | Summary: io.netty.handler.codec; Headers; true; add; (Object,Object[]); ; Argument[1].ArrayElement; Argument[this].Element.MapValue; value; manual |
-| 406 | Summary: io.netty.handler.codec; Headers; true; add; (Object,Object); ; Argument[0]; Argument[this].Element.MapKey; value; manual |
-| 407 | Summary: io.netty.handler.codec; Headers; true; add; (Object,Object); ; Argument[1]; Argument[this].Element.MapValue; value; manual |
-| 408 | Summary: io.netty.handler.codec; Headers; true; addObject; (Object,Iterable); ; Argument[0]; Argument[this].Element.MapKey; value; manual |
-| 409 | Summary: io.netty.handler.codec; Headers; true; addObject; (Object,Iterable); ; Argument[1].Element; Argument[this].Element.MapValue; taint; manual |
-| 410 | Summary: io.netty.handler.codec; Headers; true; addObject; (Object,Object[]); ; Argument[0]; Argument[this].Element.MapKey; value; manual |
-| 411 | Summary: io.netty.handler.codec; Headers; true; addObject; (Object,Object[]); ; Argument[1].ArrayElement; Argument[this].Element.MapValue; taint; manual |
-| 412 | Summary: io.netty.handler.codec; Headers; true; addObject; (Object,Object); ; Argument[0]; Argument[this].Element.MapKey; value; manual |
-| 413 | Summary: io.netty.handler.codec; Headers; true; addObject; (Object,Object); ; Argument[1]; Argument[this].Element.MapValue; taint; manual |
-| 414 | Summary: io.netty.handler.codec; Headers; true; addBoolean; ; ; Argument[this]; ReturnValue; value; manual |
-| 415 | Summary: io.netty.handler.codec; Headers; true; addBoolean; ; ; Argument[0]; Argument[this].Element.MapKey; value; manual |
-| 416 | Summary: io.netty.handler.codec; Headers; true; addByte; ; ; Argument[this]; ReturnValue; value; manual |
-| 417 | Summary: io.netty.handler.codec; Headers; true; addByte; ; ; Argument[0]; Argument[this].Element.MapKey; value; manual |
-| 418 | Summary: io.netty.handler.codec; Headers; true; addChar; ; ; Argument[this]; ReturnValue; value; manual |
-| 419 | Summary: io.netty.handler.codec; Headers; true; addChar; ; ; Argument[0]; Argument[this].Element.MapKey; value; manual |
-| 420 | Summary: io.netty.handler.codec; Headers; true; addDouble; ; ; Argument[this]; ReturnValue; value; manual |
-| 421 | Summary: io.netty.handler.codec; Headers; true; addDouble; ; ; Argument[0]; Argument[this].Element.MapKey; value; manual |
-| 422 | Summary: io.netty.handler.codec; Headers; true; addFloat; ; ; Argument[this]; ReturnValue; value; manual |
-| 423 | Summary: io.netty.handler.codec; Headers; true; addFloat; ; ; Argument[0]; Argument[this].Element.MapKey; value; manual |
-| 424 | Summary: io.netty.handler.codec; Headers; true; addInt; ; ; Argument[this]; ReturnValue; value; manual |
-| 425 | Summary: io.netty.handler.codec; Headers; true; addInt; ; ; Argument[0]; Argument[this].Element.MapKey; value; manual |
-| 426 | Summary: io.netty.handler.codec; Headers; true; addLong; ; ; Argument[this]; ReturnValue; value; manual |
-| 427 | Summary: io.netty.handler.codec; Headers; true; addLong; ; ; Argument[0]; Argument[this].Element.MapKey; value; manual |
-| 428 | Summary: io.netty.handler.codec; Headers; true; addShort; ; ; Argument[this]; ReturnValue; value; manual |
-| 429 | Summary: io.netty.handler.codec; Headers; true; addShort; ; ; Argument[0]; Argument[this].Element.MapKey; value; manual |
-| 430 | Summary: io.netty.handler.codec; Headers; true; addTimeMillis; ; ; Argument[this]; ReturnValue; value; manual |
-| 431 | Summary: io.netty.handler.codec; Headers; true; addTimeMillis; ; ; Argument[0]; Argument[this].Element.MapKey; value; manual |
-| 432 | Summary: io.netty.handler.codec; Headers; true; set; ; ; Argument[this]; ReturnValue; value; manual |
-| 433 | Summary: io.netty.handler.codec; Headers; true; set; (Headers); ; Argument[0].Element.MapKey; Argument[this].Element.MapKey; value; manual |
-| 434 | Summary: io.netty.handler.codec; Headers; true; set; (Headers); ; Argument[0].Element.MapValue; Argument[this].Element.MapValue; value; manual |
-| 435 | Summary: io.netty.handler.codec; Headers; true; set; (Object,Iterable); ; Argument[0]; Argument[this].Element.MapKey; value; manual |
-| 436 | Summary: io.netty.handler.codec; Headers; true; set; (Object,Iterable); ; Argument[1].Element; Argument[this].Element.MapValue; value; manual |
-| 437 | Summary: io.netty.handler.codec; Headers; true; set; (Object,Object[]); ; Argument[0]; Argument[this].Element.MapKey; value; manual |
-| 438 | Summary: io.netty.handler.codec; Headers; true; set; (Object,Object[]); ; Argument[1].ArrayElement; Argument[this].Element.MapValue; value; manual |
-| 439 | Summary: io.netty.handler.codec; Headers; true; set; (Object,Object); ; Argument[0]; Argument[this].Element.MapKey; value; manual |
-| 440 | Summary: io.netty.handler.codec; Headers; true; set; (Object,Object); ; Argument[1]; Argument[this].Element.MapValue; value; manual |
-| 441 | Summary: io.netty.handler.codec; Headers; true; setAll; (Headers); ; Argument[0].Element.MapKey; Argument[this].Element.MapKey; value; manual |
-| 442 | Summary: io.netty.handler.codec; Headers; true; setAll; (Headers); ; Argument[0].Element.MapValue; Argument[this].Element.MapValue; value; manual |
-| 443 | Summary: io.netty.handler.codec; Headers; true; setObject; (Object,Iterable); ; Argument[0]; Argument[this].Element.MapKey; value; manual |
-| 444 | Summary: io.netty.handler.codec; Headers; true; setObject; (Object,Iterable); ; Argument[1].Element; Argument[this].Element.MapValue; taint; manual |
-| 445 | Summary: io.netty.handler.codec; Headers; true; setObject; (Object,Object[]); ; Argument[0]; Argument[this].Element.MapKey; value; manual |
-| 446 | Summary: io.netty.handler.codec; Headers; true; setObject; (Object,Object[]); ; Argument[1].ArrayElement; Argument[this].Element.MapValue; taint; manual |
-| 447 | Summary: io.netty.handler.codec; Headers; true; setObject; (Object,Object); ; Argument[0]; Argument[this].Element.MapKey; value; manual |
-| 448 | Summary: io.netty.handler.codec; Headers; true; setObject; (Object,Object); ; Argument[1]; Argument[this].Element.MapValue; taint; manual |
-| 449 | Summary: io.netty.handler.codec; Headers; true; setBoolean; ; ; Argument[this]; ReturnValue; value; manual |
-| 450 | Summary: io.netty.handler.codec; Headers; true; setBoolean; ; ; Argument[0]; Argument[this].Element.MapKey; value; manual |
-| 451 | Summary: io.netty.handler.codec; Headers; true; setByte; ; ; Argument[this]; ReturnValue; value; manual |
-| 452 | Summary: io.netty.handler.codec; Headers; true; setByte; ; ; Argument[0]; Argument[this].Element.MapKey; value; manual |
-| 453 | Summary: io.netty.handler.codec; Headers; true; setChar; ; ; Argument[this]; ReturnValue; value; manual |
-| 454 | Summary: io.netty.handler.codec; Headers; true; setChar; ; ; Argument[0]; Argument[this].Element.MapKey; value; manual |
-| 455 | Summary: io.netty.handler.codec; Headers; true; setDouble; ; ; Argument[this]; ReturnValue; value; manual |
-| 456 | Summary: io.netty.handler.codec; Headers; true; setDouble; ; ; Argument[0]; Argument[this].Element.MapKey; value; manual |
-| 457 | Summary: io.netty.handler.codec; Headers; true; setFloat; ; ; Argument[this]; ReturnValue; value; manual |
-| 458 | Summary: io.netty.handler.codec; Headers; true; setFloat; ; ; Argument[0]; Argument[this].Element.MapKey; value; manual |
-| 459 | Summary: io.netty.handler.codec; Headers; true; setInt; ; ; Argument[this]; ReturnValue; value; manual |
-| 460 | Summary: io.netty.handler.codec; Headers; true; setInt; ; ; Argument[0]; Argument[this].Element.MapKey; value; manual |
-| 461 | Summary: io.netty.handler.codec; Headers; true; setLong; ; ; Argument[this]; ReturnValue; value; manual |
-| 462 | Summary: io.netty.handler.codec; Headers; true; setLong; ; ; Argument[0]; Argument[this].Element.MapKey; value; manual |
-| 463 | Summary: io.netty.handler.codec; Headers; true; setShort; ; ; Argument[this]; ReturnValue; value; manual |
-| 464 | Summary: io.netty.handler.codec; Headers; true; setShort; ; ; Argument[0]; Argument[this].Element.MapKey; value; manual |
-| 465 | Summary: io.netty.handler.codec; Headers; true; setTimeMillis; ; ; Argument[this]; ReturnValue; value; manual |
-| 466 | Summary: io.netty.handler.codec; Headers; true; setTimeMillis; ; ; Argument[0]; Argument[this].Element.MapKey; value; manual |
-| 467 | Summary: io.netty.resolver; SimpleNameResolver; false; resolve; (String); ; Argument[0]; ReturnValue; taint; ai-manual |
-| 468 | Summary: io.netty.util; ReferenceCounted; true; retain; ; ; Argument[this]; ReturnValue; value; manual |
-| 469 | Summary: io.netty.util; ReferenceCounted; true; touch; ; ; Argument[this]; ReturnValue; value; manual |
-| 470 | Summary: io.netty.util; AsciiString; false; AsciiString; ; ; Argument[0]; Argument[this]; taint; manual |
-| 471 | Summary: io.netty.util; AsciiString; false; array; (); ; Argument[this]; ReturnValue; taint; manual |
-| 472 | Summary: io.netty.util; AsciiString; false; cached; (String); ; Argument[0]; ReturnValue; taint; manual |
-| 473 | Summary: io.netty.util; AsciiString; false; concat; (CharSequence); ; Argument[this]; ReturnValue; taint; manual |
-| 474 | Summary: io.netty.util; AsciiString; false; concat; (CharSequence); ; Argument[0]; ReturnValue; taint; manual |
-| 475 | Summary: io.netty.util; AsciiString; false; copy; (int,byte[],int,int); ; Argument[this]; Argument[1]; taint; manual |
-| 476 | Summary: io.netty.util; AsciiString; false; copy; (int,char[],int,int); ; Argument[this]; Argument[1]; taint; manual |
-| 477 | Summary: io.netty.util; AsciiString; false; of; (CharSequence); ; Argument[0]; ReturnValue; taint; manual |
-| 478 | Summary: io.netty.util; AsciiString; false; replace; (char,char); ; Argument[this]; ReturnValue; taint; manual |
-| 479 | Summary: io.netty.util; AsciiString; false; split; (char); ; Argument[this]; ReturnValue; taint; manual |
-| 480 | Summary: io.netty.util; AsciiString; false; split; (String,int); ; Argument[this]; ReturnValue; taint; manual |
-| 481 | Summary: io.netty.util; AsciiString; false; split; (char); ; Argument[this]; ReturnValue; taint; manual |
-| 482 | Summary: io.netty.util; AsciiString; false; subSequence; ; ; Argument[this]; ReturnValue; taint; manual |
-| 483 | Summary: io.netty.util; AsciiString; false; toByteArray; ; ; Argument[this]; ReturnValue; taint; manual |
-| 484 | Summary: io.netty.util; AsciiString; false; toCharArray; ; ; Argument[this]; ReturnValue; taint; manual |
-| 485 | Summary: io.netty.util; AsciiString; false; toString; ; ; Argument[this]; ReturnValue; taint; manual |
+| 1 | Summary: generatedtest; Test; false; getMapKeyDefault; (Object); ; Argument[0].MapKey; ReturnValue; value; manual |
+| 2 | Summary: generatedtest; Test; false; getMapValueDefault; (Object); ; Argument[0].MapValue; ReturnValue; value; manual |
+| 3 | Summary: generatedtest; Test; false; newWithElementDefault; (Object); ; Argument[0]; ReturnValue.Element; value; manual |
+| 4 | Summary: generatedtest; Test; false; newWithMapKeyDefault; (Object); ; Argument[0]; ReturnValue.MapKey; value; manual |
+| 5 | Summary: generatedtest; Test; false; newWithMapValueDefault; (Object); ; Argument[0]; ReturnValue.MapValue; value; manual |
+| 6 | Summary: io.netty.buffer; ByteBuf; true; array; (); ; Argument[this]; ReturnValue; taint; manual |
+| 7 | Summary: io.netty.buffer; ByteBuf; true; asReadOnly; (); ; Argument[this]; ReturnValue; taint; manual |
+| 8 | Summary: io.netty.buffer; ByteBuf; true; capacity; (int); ; Argument[this]; ReturnValue; value; manual |
+| 9 | Summary: io.netty.buffer; ByteBuf; true; copy; ; ; Argument[this]; ReturnValue; taint; manual |
+| 10 | Summary: io.netty.buffer; ByteBuf; true; discardReadBytes; (); ; Argument[this]; ReturnValue; value; manual |
+| 11 | Summary: io.netty.buffer; ByteBuf; true; discardSomeReadBytes; (); ; Argument[this]; ReturnValue; value; manual |
+| 12 | Summary: io.netty.buffer; ByteBuf; true; duplicate; (); ; Argument[this]; ReturnValue; taint; manual |
+| 13 | Summary: io.netty.buffer; ByteBuf; true; ensureWritable; (int); ; Argument[this]; ReturnValue; value; manual |
+| 14 | Summary: io.netty.buffer; ByteBuf; true; getBytes; (int,ByteBuf); ; Argument[this]; Argument[1]; taint; manual |
+| 15 | Summary: io.netty.buffer; ByteBuf; true; getBytes; (int,ByteBuf); ; Argument[this]; ReturnValue; value; manual |
+| 16 | Summary: io.netty.buffer; ByteBuf; true; getBytes; (int,ByteBuf,int); ; Argument[this]; Argument[1]; taint; manual |
+| 17 | Summary: io.netty.buffer; ByteBuf; true; getBytes; (int,ByteBuf,int); ; Argument[this]; ReturnValue; value; manual |
+| 18 | Summary: io.netty.buffer; ByteBuf; true; getBytes; (int,ByteBuf,int,int); ; Argument[this]; Argument[1]; taint; manual |
+| 19 | Summary: io.netty.buffer; ByteBuf; true; getBytes; (int,ByteBuf,int,int); ; Argument[this]; ReturnValue; value; manual |
+| 20 | Summary: io.netty.buffer; ByteBuf; true; getBytes; (int,ByteBuffer); ; Argument[this]; Argument[1]; taint; manual |
+| 21 | Summary: io.netty.buffer; ByteBuf; true; getBytes; (int,ByteBuffer); ; Argument[this]; ReturnValue; value; manual |
+| 22 | Summary: io.netty.buffer; ByteBuf; true; getBytes; (int,FileChannel,long,int); ; Argument[this]; Argument[1]; taint; manual |
+| 23 | Summary: io.netty.buffer; ByteBuf; true; getBytes; (int,GatheringByteChannel,int); ; Argument[this]; Argument[1]; taint; manual |
+| 24 | Summary: io.netty.buffer; ByteBuf; true; getBytes; (int,OutputStream,int); ; Argument[this]; Argument[1]; taint; manual |
+| 25 | Summary: io.netty.buffer; ByteBuf; true; getBytes; (int,OutputStream,int); ; Argument[this]; ReturnValue; value; manual |
+| 26 | Summary: io.netty.buffer; ByteBuf; true; getBytes; (int,byte[]); ; Argument[this]; Argument[1]; taint; manual |
+| 27 | Summary: io.netty.buffer; ByteBuf; true; getBytes; (int,byte[]); ; Argument[this]; ReturnValue; value; manual |
+| 28 | Summary: io.netty.buffer; ByteBuf; true; getBytes; (int,byte[],int,int); ; Argument[this]; Argument[1]; taint; manual |
+| 29 | Summary: io.netty.buffer; ByteBuf; true; getBytes; (int,byte[],int,int); ; Argument[this]; ReturnValue; value; manual |
+| 30 | Summary: io.netty.buffer; ByteBuf; true; getChar; ; ; Argument[this]; ReturnValue; taint; manual |
+| 31 | Summary: io.netty.buffer; ByteBuf; true; getCharSequence; ; ; Argument[this]; ReturnValue; taint; manual |
+| 32 | Summary: io.netty.buffer; ByteBuf; true; markReaderIndex; (); ; Argument[this]; ReturnValue; value; manual |
+| 33 | Summary: io.netty.buffer; ByteBuf; true; markWriterIndex; (); ; Argument[this]; ReturnValue; value; manual |
+| 34 | Summary: io.netty.buffer; ByteBuf; true; nioBuffer; ; ; Argument[this]; ReturnValue; taint; manual |
+| 35 | Summary: io.netty.buffer; ByteBuf; true; nioBuffers; ; ; Argument[this]; ReturnValue; taint; manual |
+| 36 | Summary: io.netty.buffer; ByteBuf; true; order; (ByteOrder); ; Argument[this]; ReturnValue; taint; manual |
+| 37 | Summary: io.netty.buffer; ByteBuf; true; readBytes; (ByteBuf); ; Argument[this]; Argument[0]; taint; manual |
+| 38 | Summary: io.netty.buffer; ByteBuf; true; readBytes; (ByteBuf); ; Argument[this]; ReturnValue; value; manual |
+| 39 | Summary: io.netty.buffer; ByteBuf; true; readBytes; (ByteBuf,int); ; Argument[this]; Argument[0]; taint; manual |
+| 40 | Summary: io.netty.buffer; ByteBuf; true; readBytes; (ByteBuf,int); ; Argument[this]; ReturnValue; value; manual |
+| 41 | Summary: io.netty.buffer; ByteBuf; true; readBytes; (ByteBuf,int,int); ; Argument[this]; Argument[0]; taint; manual |
+| 42 | Summary: io.netty.buffer; ByteBuf; true; readBytes; (ByteBuf,int,int); ; Argument[this]; ReturnValue; value; manual |
+| 43 | Summary: io.netty.buffer; ByteBuf; true; readBytes; (ByteBuffer); ; Argument[this]; Argument[0]; taint; manual |
+| 44 | Summary: io.netty.buffer; ByteBuf; true; readBytes; (ByteBuffer); ; Argument[this]; ReturnValue; value; manual |
+| 45 | Summary: io.netty.buffer; ByteBuf; true; readBytes; (FileChannel,long,int); ; Argument[this]; Argument[0]; taint; manual |
+| 46 | Summary: io.netty.buffer; ByteBuf; true; readBytes; (GatheringByteChannel,int); ; Argument[this]; Argument[0]; taint; manual |
+| 47 | Summary: io.netty.buffer; ByteBuf; true; readBytes; (OutputStream,int); ; Argument[this]; Argument[0]; taint; manual |
+| 48 | Summary: io.netty.buffer; ByteBuf; true; readBytes; (OutputStream,int); ; Argument[this]; ReturnValue; value; manual |
+| 49 | Summary: io.netty.buffer; ByteBuf; true; readBytes; (byte[]); ; Argument[this]; Argument[0]; taint; manual |
+| 50 | Summary: io.netty.buffer; ByteBuf; true; readBytes; (byte[]); ; Argument[this]; ReturnValue; value; manual |
+| 51 | Summary: io.netty.buffer; ByteBuf; true; readBytes; (byte[],int,int); ; Argument[this]; Argument[0]; taint; manual |
+| 52 | Summary: io.netty.buffer; ByteBuf; true; readBytes; (byte[],int,int); ; Argument[this]; ReturnValue; value; manual |
+| 53 | Summary: io.netty.buffer; ByteBuf; true; readBytes; (int); ; Argument[this]; ReturnValue; taint; manual |
+| 54 | Summary: io.netty.buffer; ByteBuf; true; readChar; ; ; Argument[this]; ReturnValue; taint; manual |
+| 55 | Summary: io.netty.buffer; ByteBuf; true; readCharSequence; ; ; Argument[this]; ReturnValue; taint; manual |
+| 56 | Summary: io.netty.buffer; ByteBuf; true; readRetainedSlice; (int); ; Argument[this]; ReturnValue; taint; manual |
+| 57 | Summary: io.netty.buffer; ByteBuf; true; readSlice; (int); ; Argument[this]; ReturnValue; taint; manual |
+| 58 | Summary: io.netty.buffer; ByteBuf; true; readerIndex; (int); ; Argument[this]; ReturnValue; value; manual |
+| 59 | Summary: io.netty.buffer; ByteBuf; true; resetReaderIndex; (); ; Argument[this]; ReturnValue; value; manual |
+| 60 | Summary: io.netty.buffer; ByteBuf; true; resetWriterIndex; (); ; Argument[this]; ReturnValue; value; manual |
+| 61 | Summary: io.netty.buffer; ByteBuf; true; retainedDuplicate; (); ; Argument[this]; ReturnValue; taint; manual |
+| 62 | Summary: io.netty.buffer; ByteBuf; true; retainedSlice; ; ; Argument[this]; ReturnValue; taint; manual |
+| 63 | Summary: io.netty.buffer; ByteBuf; true; setBoolean; ; ; Argument[this]; ReturnValue; value; manual |
+| 64 | Summary: io.netty.buffer; ByteBuf; true; setByte; ; ; Argument[this]; ReturnValue; value; manual |
+| 65 | Summary: io.netty.buffer; ByteBuf; true; setBytes; (int,ByteBuf); ; Argument[1]; Argument[this]; taint; manual |
+| 66 | Summary: io.netty.buffer; ByteBuf; true; setBytes; (int,ByteBuf); ; Argument[this]; ReturnValue; value; manual |
+| 67 | Summary: io.netty.buffer; ByteBuf; true; setBytes; (int,ByteBuf,int); ; Argument[1]; Argument[this]; taint; manual |
+| 68 | Summary: io.netty.buffer; ByteBuf; true; setBytes; (int,ByteBuf,int); ; Argument[this]; ReturnValue; value; manual |
+| 69 | Summary: io.netty.buffer; ByteBuf; true; setBytes; (int,ByteBuf,int,int); ; Argument[1]; Argument[this]; taint; manual |
+| 70 | Summary: io.netty.buffer; ByteBuf; true; setBytes; (int,ByteBuf,int,int); ; Argument[this]; ReturnValue; value; manual |
+| 71 | Summary: io.netty.buffer; ByteBuf; true; setBytes; (int,ByteBuffer); ; Argument[1]; Argument[this]; taint; manual |
+| 72 | Summary: io.netty.buffer; ByteBuf; true; setBytes; (int,ByteBuffer); ; Argument[this]; ReturnValue; value; manual |
+| 73 | Summary: io.netty.buffer; ByteBuf; true; setBytes; (int,FileChannel,long,int); ; Argument[1]; Argument[this]; taint; manual |
+| 74 | Summary: io.netty.buffer; ByteBuf; true; setBytes; (int,InputStream,int); ; Argument[1]; Argument[this]; taint; manual |
+| 75 | Summary: io.netty.buffer; ByteBuf; true; setBytes; (int,ScatteringByteChannel,int); ; Argument[1]; Argument[this]; taint; manual |
+| 76 | Summary: io.netty.buffer; ByteBuf; true; setBytes; (int,byte[]); ; Argument[1]; Argument[this]; taint; manual |
+| 77 | Summary: io.netty.buffer; ByteBuf; true; setBytes; (int,byte[]); ; Argument[this]; ReturnValue; value; manual |
+| 78 | Summary: io.netty.buffer; ByteBuf; true; setBytes; (int,byte[],int,int); ; Argument[1]; Argument[this]; taint; manual |
+| 79 | Summary: io.netty.buffer; ByteBuf; true; setBytes; (int,byte[],int,int); ; Argument[this]; ReturnValue; value; manual |
+| 80 | Summary: io.netty.buffer; ByteBuf; true; setChar; ; ; Argument[1]; Argument[this]; taint; manual |
+| 81 | Summary: io.netty.buffer; ByteBuf; true; setChar; ; ; Argument[this]; ReturnValue; value; manual |
+| 82 | Summary: io.netty.buffer; ByteBuf; true; setCharSequence; ; ; Argument[1]; Argument[this]; taint; manual |
+| 83 | Summary: io.netty.buffer; ByteBuf; true; setDouble; ; ; Argument[this]; ReturnValue; value; manual |
+| 84 | Summary: io.netty.buffer; ByteBuf; true; setDoubleLE; ; ; Argument[this]; ReturnValue; value; manual |
+| 85 | Summary: io.netty.buffer; ByteBuf; true; setFloat; ; ; Argument[this]; ReturnValue; value; manual |
+| 86 | Summary: io.netty.buffer; ByteBuf; true; setFloatLE; ; ; Argument[this]; ReturnValue; value; manual |
+| 87 | Summary: io.netty.buffer; ByteBuf; true; setIndex; ; ; Argument[this]; ReturnValue; value; manual |
+| 88 | Summary: io.netty.buffer; ByteBuf; true; setInt; ; ; Argument[this]; ReturnValue; value; manual |
+| 89 | Summary: io.netty.buffer; ByteBuf; true; setIntLE; ; ; Argument[this]; ReturnValue; value; manual |
+| 90 | Summary: io.netty.buffer; ByteBuf; true; setLong; ; ; Argument[this]; ReturnValue; value; manual |
+| 91 | Summary: io.netty.buffer; ByteBuf; true; setLongLE; ; ; Argument[this]; ReturnValue; value; manual |
+| 92 | Summary: io.netty.buffer; ByteBuf; true; setMedium; ; ; Argument[this]; ReturnValue; value; manual |
+| 93 | Summary: io.netty.buffer; ByteBuf; true; setMediumLE; ; ; Argument[this]; ReturnValue; value; manual |
+| 94 | Summary: io.netty.buffer; ByteBuf; true; setShort; ; ; Argument[this]; ReturnValue; value; manual |
+| 95 | Summary: io.netty.buffer; ByteBuf; true; setShortLE; ; ; Argument[this]; ReturnValue; value; manual |
+| 96 | Summary: io.netty.buffer; ByteBuf; true; setZero; ; ; Argument[this]; ReturnValue; value; manual |
+| 97 | Summary: io.netty.buffer; ByteBuf; true; skipBytes; (int); ; Argument[this]; ReturnValue; value; manual |
+| 98 | Summary: io.netty.buffer; ByteBuf; true; slice; ; ; Argument[this]; ReturnValue; taint; manual |
+| 99 | Summary: io.netty.buffer; ByteBuf; true; toString; ; ; Argument[this]; ReturnValue; taint; manual |
+| 100 | Summary: io.netty.buffer; ByteBuf; true; unwrap; (); ; Argument[this]; ReturnValue; taint; manual |
+| 101 | Summary: io.netty.buffer; ByteBuf; true; writeBoolean; ; ; Argument[this]; ReturnValue; value; manual |
+| 102 | Summary: io.netty.buffer; ByteBuf; true; writeByte; ; ; Argument[0]; Argument[this]; taint; manual |
+| 103 | Summary: io.netty.buffer; ByteBuf; true; writeByte; ; ; Argument[this]; ReturnValue; value; manual |
+| 104 | Summary: io.netty.buffer; ByteBuf; true; writeBytes; (ByteBuf); ; Argument[0]; Argument[this]; taint; manual |
+| 105 | Summary: io.netty.buffer; ByteBuf; true; writeBytes; (ByteBuf); ; Argument[this]; ReturnValue; value; manual |
+| 106 | Summary: io.netty.buffer; ByteBuf; true; writeBytes; (ByteBuf,int); ; Argument[0]; Argument[this]; taint; manual |
+| 107 | Summary: io.netty.buffer; ByteBuf; true; writeBytes; (ByteBuf,int); ; Argument[this]; ReturnValue; value; manual |
+| 108 | Summary: io.netty.buffer; ByteBuf; true; writeBytes; (ByteBuf,int,int); ; Argument[0]; Argument[this]; taint; manual |
+| 109 | Summary: io.netty.buffer; ByteBuf; true; writeBytes; (ByteBuf,int,int); ; Argument[this]; ReturnValue; value; manual |
+| 110 | Summary: io.netty.buffer; ByteBuf; true; writeBytes; (ByteBuffer); ; Argument[0]; Argument[this]; taint; manual |
+| 111 | Summary: io.netty.buffer; ByteBuf; true; writeBytes; (ByteBuffer); ; Argument[this]; ReturnValue; value; manual |
+| 112 | Summary: io.netty.buffer; ByteBuf; true; writeBytes; (FileChannel,long,int); ; Argument[0]; Argument[this]; taint; manual |
+| 113 | Summary: io.netty.buffer; ByteBuf; true; writeBytes; (InputStream,int); ; Argument[0]; Argument[this]; taint; manual |
+| 114 | Summary: io.netty.buffer; ByteBuf; true; writeBytes; (ScatteringByteChannel,int); ; Argument[0]; Argument[this]; taint; manual |
+| 115 | Summary: io.netty.buffer; ByteBuf; true; writeBytes; (byte[]); ; Argument[0]; Argument[this]; taint; manual |
+| 116 | Summary: io.netty.buffer; ByteBuf; true; writeBytes; (byte[]); ; Argument[this]; ReturnValue; value; manual |
+| 117 | Summary: io.netty.buffer; ByteBuf; true; writeBytes; (byte[],int,int); ; Argument[0]; Argument[this]; taint; manual |
+| 118 | Summary: io.netty.buffer; ByteBuf; true; writeBytes; (byte[],int,int); ; Argument[this]; ReturnValue; value; manual |
+| 119 | Summary: io.netty.buffer; ByteBuf; true; writeChar; ; ; Argument[0]; Argument[this]; taint; manual |
+| 120 | Summary: io.netty.buffer; ByteBuf; true; writeChar; ; ; Argument[this]; ReturnValue; value; manual |
+| 121 | Summary: io.netty.buffer; ByteBuf; true; writeCharSequence; ; ; Argument[0]; Argument[this]; taint; manual |
+| 122 | Summary: io.netty.buffer; ByteBuf; true; writeDouble; ; ; Argument[this]; ReturnValue; value; manual |
+| 123 | Summary: io.netty.buffer; ByteBuf; true; writeDoubleLE; ; ; Argument[this]; ReturnValue; value; manual |
+| 124 | Summary: io.netty.buffer; ByteBuf; true; writeFloat; ; ; Argument[this]; ReturnValue; value; manual |
+| 125 | Summary: io.netty.buffer; ByteBuf; true; writeFloatLE; ; ; Argument[this]; ReturnValue; value; manual |
+| 126 | Summary: io.netty.buffer; ByteBuf; true; writeInt; ; ; Argument[this]; ReturnValue; value; manual |
+| 127 | Summary: io.netty.buffer; ByteBuf; true; writeIntLE; ; ; Argument[this]; ReturnValue; value; manual |
+| 128 | Summary: io.netty.buffer; ByteBuf; true; writeLong; ; ; Argument[this]; ReturnValue; value; manual |
+| 129 | Summary: io.netty.buffer; ByteBuf; true; writeLongLE; ; ; Argument[this]; ReturnValue; value; manual |
+| 130 | Summary: io.netty.buffer; ByteBuf; true; writeMedium; ; ; Argument[this]; ReturnValue; value; manual |
+| 131 | Summary: io.netty.buffer; ByteBuf; true; writeMediumLE; ; ; Argument[this]; ReturnValue; value; manual |
+| 132 | Summary: io.netty.buffer; ByteBuf; true; writeShort; ; ; Argument[this]; ReturnValue; value; manual |
+| 133 | Summary: io.netty.buffer; ByteBuf; true; writeShortLE; ; ; Argument[this]; ReturnValue; value; manual |
+| 134 | Summary: io.netty.buffer; ByteBuf; true; writeZero; ; ; Argument[this]; ReturnValue; value; manual |
+| 135 | Summary: io.netty.buffer; ByteBuf; true; writerIndex; (int); ; Argument[this]; ReturnValue; value; manual |
+| 136 | Summary: io.netty.buffer; ByteBufConvertible; true; asByteBuf; (); ; Argument[this]; ReturnValue; taint; manual |
+| 137 | Summary: io.netty.buffer; ByteBufHolder; true; content; (); ; Argument[this]; ReturnValue; taint; manual |
+| 138 | Summary: io.netty.buffer; ByteBufHolder; true; copy; (); ; Argument[this]; ReturnValue; taint; manual |
+| 139 | Summary: io.netty.buffer; ByteBufHolder; true; duplicate; (); ; Argument[this]; ReturnValue; taint; manual |
+| 140 | Summary: io.netty.buffer; ByteBufHolder; true; replace; (ByteBuf); ; Argument[0]; ReturnValue; taint; manual |
+| 141 | Summary: io.netty.buffer; ByteBufHolder; true; retainedDuplicate; (); ; Argument[this]; ReturnValue; taint; manual |
+| 142 | Summary: io.netty.buffer; ByteBufInputStream; true; ByteBufInputStream; ; ; Argument[0]; Argument[this]; taint; manual |
+| 143 | Summary: io.netty.buffer; ByteBufOutputStream; true; ByteBufOutputStream; ; ; Argument[0]; Argument[this]; taint; manual |
+| 144 | Summary: io.netty.buffer; ByteBufOutputStream; true; buffer; (); ; Argument[this]; ReturnValue; taint; manual |
+| 145 | Summary: io.netty.buffer; ByteBufUtil; false; copy; (AsciiString,ByteBuf); ; Argument[0]; Argument[1]; taint; manual |
+| 146 | Summary: io.netty.buffer; ByteBufUtil; false; copy; (AsciiString,int,ByteBuf,int); ; Argument[0]; Argument[2]; taint; manual |
+| 147 | Summary: io.netty.buffer; ByteBufUtil; false; copy; (AsciiString,int,ByteBuf,int,int); ; Argument[0]; Argument[2]; taint; manual |
+| 148 | Summary: io.netty.buffer; ByteBufUtil; false; decodeHexDump; (CharSequence); ; Argument[0]; ReturnValue; taint; manual |
+| 149 | Summary: io.netty.buffer; ByteBufUtil; false; decodeHexDump; (CharSequence,int,int); ; Argument[0]; ReturnValue; taint; manual |
+| 150 | Summary: io.netty.buffer; ByteBufUtil; false; encodeString; (ByteBufAllocator,CharBuffer,Charset); ; Argument[1]; ReturnValue; taint; manual |
+| 151 | Summary: io.netty.buffer; ByteBufUtil; false; encodeString; (ByteBufAllocator,CharBuffer,Charset,int); ; Argument[1]; ReturnValue; taint; manual |
+| 152 | Summary: io.netty.buffer; ByteBufUtil; false; ensureAccessible; (ByteBuf); ; Argument[0]; ReturnValue; value; manual |
+| 153 | Summary: io.netty.buffer; ByteBufUtil; false; getBytes; (ByteBuf); ; Argument[0]; ReturnValue; taint; manual |
+| 154 | Summary: io.netty.buffer; ByteBufUtil; false; getBytes; (ByteBuf,int,int); ; Argument[0]; ReturnValue; taint; manual |
+| 155 | Summary: io.netty.buffer; ByteBufUtil; false; getBytes; (ByteBuf,int,int,boolean); ; Argument[0]; ReturnValue; taint; manual |
+| 156 | Summary: io.netty.buffer; ByteBufUtil; false; readBytes; (ByteBufAllocator,ByteBuf,int); ; Argument[1]; ReturnValue; taint; manual |
+| 157 | Summary: io.netty.buffer; ByteBufUtil; false; reserveAndWriteUtf8; (ByteBuf,CharSequence,int); ; Argument[1]; Argument[0]; taint; manual |
+| 158 | Summary: io.netty.buffer; ByteBufUtil; false; reserveAndWriteUtf8; (ByteBuf,CharSequence,int,int,int); ; Argument[1]; Argument[0]; taint; manual |
+| 159 | Summary: io.netty.buffer; ByteBufUtil; false; setShortBE; (ByteBuf,int,int); ; Argument[0]; ReturnValue; value; manual |
+| 160 | Summary: io.netty.buffer; ByteBufUtil; false; writeAscii; (ByteBuf,CharSequence); ; Argument[1]; Argument[0]; taint; manual |
+| 161 | Summary: io.netty.buffer; ByteBufUtil; false; writeAscii; (ByteBufAllocator,CharSequence); ; Argument[1]; ReturnValue; taint; manual |
+| 162 | Summary: io.netty.buffer; ByteBufUtil; false; writeMediumBE; (ByteBuf,int); ; Argument[0]; ReturnValue; value; manual |
+| 163 | Summary: io.netty.buffer; ByteBufUtil; false; writeShortBE; (ByteBuf,int); ; Argument[0]; ReturnValue; value; manual |
+| 164 | Summary: io.netty.buffer; ByteBufUtil; false; writeUtf8; (ByteBuf,CharSequence); ; Argument[1]; Argument[0]; taint; manual |
+| 165 | Summary: io.netty.buffer; ByteBufUtil; false; writeUtf8; (ByteBuf,CharSequence,int,int); ; Argument[1]; Argument[0]; taint; manual |
+| 166 | Summary: io.netty.buffer; ByteBufUtil; false; writeUtf8; (ByteBufAllocator,CharSequence); ; Argument[1]; ReturnValue; taint; manual |
+| 167 | Summary: io.netty.buffer; CompositeByteBuf; false; CompositeByteBuf; (ByteBufAllocator,boolean,int,ByteBuf[]); ; Argument[3].ArrayElement; Argument[this]; taint; manual |
+| 168 | Summary: io.netty.buffer; CompositeByteBuf; false; CompositeByteBuf; (ByteBufAllocator,boolean,int,Iterable); ; Argument[3].Element; Argument[this]; taint; manual |
+| 169 | Summary: io.netty.buffer; CompositeByteBuf; true; addComponent; (ByteBuf); ; Argument[0]; Argument[this]; taint; manual |
+| 170 | Summary: io.netty.buffer; CompositeByteBuf; true; addComponent; (boolean,ByteBuf); ; Argument[1]; Argument[this]; taint; manual |
+| 171 | Summary: io.netty.buffer; CompositeByteBuf; true; addComponent; (boolean,int,ByteBuf); ; Argument[2]; Argument[this]; taint; manual |
+| 172 | Summary: io.netty.buffer; CompositeByteBuf; true; addComponent; (int,ByteBuf); ; Argument[1]; Argument[this]; taint; manual |
+| 173 | Summary: io.netty.buffer; CompositeByteBuf; true; addComponent; ; ; Argument[this]; ReturnValue; value; manual |
+| 174 | Summary: io.netty.buffer; CompositeByteBuf; true; addComponents; (ByteBuf[]); ; Argument[0].ArrayElement; Argument[this]; taint; manual |
+| 175 | Summary: io.netty.buffer; CompositeByteBuf; true; addComponents; (Iterable); ; Argument[0].Element; Argument[this]; taint; manual |
+| 176 | Summary: io.netty.buffer; CompositeByteBuf; true; addComponents; (boolean,ByteBuf[]); ; Argument[1].ArrayElement; Argument[this]; taint; manual |
+| 177 | Summary: io.netty.buffer; CompositeByteBuf; true; addComponents; (boolean,Iterable); ; Argument[1].Element; Argument[this]; taint; manual |
+| 178 | Summary: io.netty.buffer; CompositeByteBuf; true; addComponents; (int,ByteBuf[]); ; Argument[1].ArrayElement; Argument[this]; taint; manual |
+| 179 | Summary: io.netty.buffer; CompositeByteBuf; true; addComponents; (int,Iterable); ; Argument[1].Element; Argument[this]; taint; manual |
+| 180 | Summary: io.netty.buffer; CompositeByteBuf; true; addComponents; ; ; Argument[this]; ReturnValue; value; manual |
+| 181 | Summary: io.netty.buffer; CompositeByteBuf; true; addFlattenedComponents; (boolean,ByteBuf); ; Argument[1]; Argument[this]; taint; manual |
+| 182 | Summary: io.netty.buffer; CompositeByteBuf; true; addFlattenedComponents; ; ; Argument[this]; ReturnValue; value; manual |
+| 183 | Summary: io.netty.buffer; CompositeByteBuf; true; component; (int); ; Argument[this]; ReturnValue; taint; manual |
+| 184 | Summary: io.netty.buffer; CompositeByteBuf; true; componentAtOffset; (int); ; Argument[this]; ReturnValue; taint; manual |
+| 185 | Summary: io.netty.buffer; CompositeByteBuf; true; consolidate; (); ; Argument[this]; ReturnValue; taint; manual |
+| 186 | Summary: io.netty.buffer; CompositeByteBuf; true; consolidate; (int,int); ; Argument[this]; ReturnValue; taint; manual |
+| 187 | Summary: io.netty.buffer; CompositeByteBuf; true; decompose; (int,int); ; Argument[this]; ReturnValue.Element; taint; manual |
+| 188 | Summary: io.netty.buffer; Unpooled; false; copiedBuffer; (ByteBuf); ; Argument[0]; ReturnValue; taint; manual |
+| 189 | Summary: io.netty.buffer; Unpooled; false; copiedBuffer; (ByteBuf[]); ; Argument[0].ArrayElement; ReturnValue; taint; manual |
+| 190 | Summary: io.netty.buffer; Unpooled; false; copiedBuffer; (ByteBuffer); ; Argument[0]; ReturnValue; taint; manual |
+| 191 | Summary: io.netty.buffer; Unpooled; false; copiedBuffer; (ByteBuffer[]); ; Argument[0].ArrayElement; ReturnValue; taint; manual |
+| 192 | Summary: io.netty.buffer; Unpooled; false; copiedBuffer; (CharSequence,Charset); ; Argument[0]; ReturnValue; taint; manual |
+| 193 | Summary: io.netty.buffer; Unpooled; false; copiedBuffer; (CharSequence,int,int,Charset); ; Argument[0]; ReturnValue; taint; manual |
+| 194 | Summary: io.netty.buffer; Unpooled; false; copiedBuffer; (byte[]); ; Argument[0]; ReturnValue; taint; manual |
+| 195 | Summary: io.netty.buffer; Unpooled; false; copiedBuffer; (byte[],int,int); ; Argument[0]; ReturnValue; taint; manual |
+| 196 | Summary: io.netty.buffer; Unpooled; false; copiedBuffer; (byte[][]); ; Argument[0].ArrayElement; ReturnValue; taint; manual |
+| 197 | Summary: io.netty.buffer; Unpooled; false; copiedBuffer; (char[],Charset); ; Argument[0]; ReturnValue; taint; manual |
+| 198 | Summary: io.netty.buffer; Unpooled; false; copiedBuffer; (char[],int,int,Charset); ; Argument[0]; ReturnValue; taint; manual |
+| 199 | Summary: io.netty.buffer; Unpooled; false; unmodifiableBuffer; (ByteBuf); ; Argument[0]; ReturnValue; taint; manual |
+| 200 | Summary: io.netty.buffer; Unpooled; false; unmodifiableBuffer; (ByteBuf[]); ; Argument[0].ArrayElement; ReturnValue; taint; manual |
+| 201 | Summary: io.netty.buffer; Unpooled; false; unreleasableBuffer; (ByteBuf); ; Argument[0]; ReturnValue; taint; manual |
+| 202 | Summary: io.netty.buffer; Unpooled; false; wrappedBuffer; (ByteBuf); ; Argument[0]; ReturnValue; taint; manual |
+| 203 | Summary: io.netty.buffer; Unpooled; false; wrappedBuffer; (ByteBuf[]); ; Argument[0].ArrayElement; ReturnValue; taint; manual |
+| 204 | Summary: io.netty.buffer; Unpooled; false; wrappedBuffer; (ByteBuffer); ; Argument[0]; ReturnValue; taint; manual |
+| 205 | Summary: io.netty.buffer; Unpooled; false; wrappedBuffer; (ByteBuffer[]); ; Argument[0].ArrayElement; ReturnValue; taint; manual |
+| 206 | Summary: io.netty.buffer; Unpooled; false; wrappedBuffer; (byte[]); ; Argument[0]; ReturnValue; taint; manual |
+| 207 | Summary: io.netty.buffer; Unpooled; false; wrappedBuffer; (byte[],int,int); ; Argument[0]; ReturnValue; taint; manual |
+| 208 | Summary: io.netty.buffer; Unpooled; false; wrappedBuffer; (byte[][]); ; Argument[0].ArrayElement; ReturnValue; taint; manual |
+| 209 | Summary: io.netty.buffer; Unpooled; false; wrappedBuffer; (int,ByteBuf[]); ; Argument[1].ArrayElement; ReturnValue; taint; manual |
+| 210 | Summary: io.netty.buffer; Unpooled; false; wrappedBuffer; (int,ByteBuffer[]); ; Argument[1].ArrayElement; ReturnValue; taint; manual |
+| 211 | Summary: io.netty.buffer; Unpooled; false; wrappedBuffer; (int,byte[][]); ; Argument[1].ArrayElement; ReturnValue; taint; manual |
+| 212 | Summary: io.netty.buffer; Unpooled; false; wrappedUnmodifiableBuffer; (ByteBuf[]); ; Argument[0].ArrayElement; ReturnValue; taint; manual |
+| 213 | Summary: io.netty.handler.codec.base64; Base64; true; decode; ; ; Argument[0]; ReturnValue; taint; manual |
+| 214 | Summary: io.netty.handler.codec.base64; Base64; true; encode; ; ; Argument[0]; ReturnValue; taint; manual |
+| 215 | Summary: io.netty.handler.codec.http.cookie; Cookie; true; domain; (); ; Argument[this]; ReturnValue; taint; manual |
+| 216 | Summary: io.netty.handler.codec.http.cookie; Cookie; true; name; (); ; Argument[this]; ReturnValue; taint; manual |
+| 217 | Summary: io.netty.handler.codec.http.cookie; Cookie; true; path; (); ; Argument[this]; ReturnValue; taint; manual |
+| 218 | Summary: io.netty.handler.codec.http.cookie; Cookie; true; setDomain; (String); ; Argument[0]; Argument[this]; taint; manual |
+| 219 | Summary: io.netty.handler.codec.http.cookie; Cookie; true; setPath; (String); ; Argument[0]; Argument[this]; taint; manual |
+| 220 | Summary: io.netty.handler.codec.http.cookie; Cookie; true; setValue; (String); ; Argument[0]; Argument[this]; taint; manual |
+| 221 | Summary: io.netty.handler.codec.http.cookie; Cookie; true; value; (); ; Argument[this]; ReturnValue; taint; manual |
+| 222 | Summary: io.netty.handler.codec.http.cookie; ServerCookieDecoder; true; decode; (String); ; Argument[0]; ReturnValue.Element; taint; manual |
+| 223 | Summary: io.netty.handler.codec.http.cookie; ServerCookieDecoder; true; decodeAll; (String); ; Argument[0]; ReturnValue.Element; taint; manual |
+| 224 | Summary: io.netty.handler.codec.http.cookie; ServerCookieEncoder; true; encode; (Collection); ; Argument[0].Element; ReturnValue.Element; taint; manual |
+| 225 | Summary: io.netty.handler.codec.http.cookie; ServerCookieEncoder; true; encode; (Cookie); ; Argument[0]; ReturnValue; taint; manual |
+| 226 | Summary: io.netty.handler.codec.http.cookie; ServerCookieEncoder; true; encode; (Cookie[]); ; Argument[0].ArrayElement; ReturnValue.Element; taint; manual |
+| 227 | Summary: io.netty.handler.codec.http.cookie; ServerCookieEncoder; true; encode; (Iterable); ; Argument[0].Element; ReturnValue.Element; taint; manual |
+| 228 | Summary: io.netty.handler.codec.http.cookie; ServerCookieEncoder; true; encode; (String,String); ; Argument[1..2]; ReturnValue; taint; manual |
+| 229 | Summary: io.netty.handler.codec.http.multipart; Attribute; true; getValue; (); ; Argument[this]; ReturnValue; taint; manual |
+| 230 | Summary: io.netty.handler.codec.http.multipart; Attribute; true; setValue; (String); ; Argument[0]; Argument[this]; taint; manual |
+| 231 | Summary: io.netty.handler.codec.http.multipart; FileUpload; true; getContentTransferEncoding; (); ; Argument[this]; ReturnValue; taint; manual |
+| 232 | Summary: io.netty.handler.codec.http.multipart; FileUpload; true; getContentType; (); ; Argument[this]; ReturnValue; taint; manual |
+| 233 | Summary: io.netty.handler.codec.http.multipart; FileUpload; true; getFilename; (); ; Argument[this]; ReturnValue; taint; manual |
+| 234 | Summary: io.netty.handler.codec.http.multipart; FileUpload; true; setContentTransferEncoding; (String); ; Argument[0]; Argument[this]; taint; manual |
+| 235 | Summary: io.netty.handler.codec.http.multipart; FileUpload; true; setContentType; (String); ; Argument[0]; Argument[this]; taint; manual |
+| 236 | Summary: io.netty.handler.codec.http.multipart; FileUpload; true; setFilename; (String); ; Argument[0]; Argument[this]; taint; manual |
+| 237 | Summary: io.netty.handler.codec.http.multipart; HttpData; true; addContent; (ByteBuf,boolean); ; Argument[0]; Argument[this]; taint; manual |
+| 238 | Summary: io.netty.handler.codec.http.multipart; HttpData; true; get; (); ; Argument[this]; ReturnValue; taint; manual |
+| 239 | Summary: io.netty.handler.codec.http.multipart; HttpData; true; getByteBuf; (); ; Argument[this]; ReturnValue; taint; manual |
+| 240 | Summary: io.netty.handler.codec.http.multipart; HttpData; true; getChunk; (int); ; Argument[this]; ReturnValue; taint; manual |
+| 241 | Summary: io.netty.handler.codec.http.multipart; HttpData; true; getString; (); ; Argument[this]; ReturnValue; taint; manual |
+| 242 | Summary: io.netty.handler.codec.http.multipart; HttpData; true; getString; (Charset); ; Argument[this]; ReturnValue; taint; manual |
+| 243 | Summary: io.netty.handler.codec.http.multipart; HttpData; true; setContent; (ByteBuf); ; Argument[0]; Argument[this]; taint; manual |
+| 244 | Summary: io.netty.handler.codec.http.multipart; HttpData; true; setContent; (InputStream); ; Argument[0]; Argument[this]; taint; manual |
+| 245 | Summary: io.netty.handler.codec.http.multipart; HttpPostMultipartRequestDecoder; true; HttpPostMultipartRequestDecoder; (HttpDataFactory,HttpRequest); ; Argument[1]; Argument[this]; taint; manual |
+| 246 | Summary: io.netty.handler.codec.http.multipart; HttpPostMultipartRequestDecoder; true; HttpPostMultipartRequestDecoder; (HttpDataFactory,HttpRequest,Charset); ; Argument[1]; Argument[this]; taint; manual |
+| 247 | Summary: io.netty.handler.codec.http.multipart; HttpPostMultipartRequestDecoder; true; HttpPostMultipartRequestDecoder; (HttpRequest); ; Argument[0]; Argument[this]; taint; manual |
+| 248 | Summary: io.netty.handler.codec.http.multipart; HttpPostRequestDecoder; true; HttpPostRequestDecoder; (HttpDataFactory,HttpRequest); ; Argument[1]; Argument[this]; taint; manual |
+| 249 | Summary: io.netty.handler.codec.http.multipart; HttpPostRequestDecoder; true; HttpPostRequestDecoder; (HttpDataFactory,HttpRequest,Charset); ; Argument[1]; Argument[this]; taint; manual |
+| 250 | Summary: io.netty.handler.codec.http.multipart; HttpPostRequestDecoder; true; HttpPostRequestDecoder; (HttpRequest); ; Argument[0]; Argument[this]; taint; manual |
+| 251 | Summary: io.netty.handler.codec.http.multipart; HttpPostStandardRequestDecoder; true; HttpPostStandardRequestDecoder; (HttpDataFactory,HttpRequest); ; Argument[1]; Argument[this]; taint; manual |
+| 252 | Summary: io.netty.handler.codec.http.multipart; HttpPostStandardRequestDecoder; true; HttpPostStandardRequestDecoder; (HttpDataFactory,HttpRequest,Charset); ; Argument[1]; Argument[this]; taint; manual |
+| 253 | Summary: io.netty.handler.codec.http.multipart; HttpPostStandardRequestDecoder; true; HttpPostStandardRequestDecoder; (HttpRequest); ; Argument[0]; Argument[this]; taint; manual |
+| 254 | Summary: io.netty.handler.codec.http.multipart; InterfaceHttpData; true; getName; (); ; Argument[this]; ReturnValue; taint; manual |
+| 255 | Summary: io.netty.handler.codec.http.multipart; InterfaceHttpPostRequestDecoder; true; currentPartialHttpData; (); ; Argument[this]; ReturnValue; taint; manual |
+| 256 | Summary: io.netty.handler.codec.http.multipart; InterfaceHttpPostRequestDecoder; true; getBodyHttpData; (String); ; Argument[this]; ReturnValue; taint; manual |
+| 257 | Summary: io.netty.handler.codec.http.multipart; InterfaceHttpPostRequestDecoder; true; getBodyHttpDatas; (); ; Argument[this]; ReturnValue; taint; manual |
+| 258 | Summary: io.netty.handler.codec.http.multipart; InterfaceHttpPostRequestDecoder; true; getBodyHttpDatas; (String); ; Argument[this]; ReturnValue; taint; manual |
+| 259 | Summary: io.netty.handler.codec.http.multipart; InterfaceHttpPostRequestDecoder; true; next; (); ; Argument[this]; ReturnValue; taint; manual |
+| 260 | Summary: io.netty.handler.codec.http.multipart; InterfaceHttpPostRequestDecoder; true; offer; (HttpContent); ; Argument[0]; Argument[this]; taint; manual |
+| 261 | Summary: io.netty.handler.codec.http.multipart; InterfaceHttpPostRequestDecoder; true; offer; (HttpContent); ; Argument[this]; ReturnValue; value; manual |
+| 262 | Summary: io.netty.handler.codec.http.websocketx; BinaryWebSocketFrame; true; BinaryWebSocketFrame; (ByteBuf); ; Argument[0]; Argument[this]; taint; manual |
+| 263 | Summary: io.netty.handler.codec.http.websocketx; BinaryWebSocketFrame; true; BinaryWebSocketFrame; (boolean,int,ByteBuf); ; Argument[2]; Argument[this]; taint; manual |
+| 264 | Summary: io.netty.handler.codec.http.websocketx; CloseWebSocketFrame; true; CloseWebSocketFrame; (WebSocketCloseStatus,String); ; Argument[1]; Argument[this]; taint; manual |
+| 265 | Summary: io.netty.handler.codec.http.websocketx; CloseWebSocketFrame; true; CloseWebSocketFrame; (boolean,int,ByteBuf); ; Argument[2]; Argument[this]; taint; manual |
+| 266 | Summary: io.netty.handler.codec.http.websocketx; CloseWebSocketFrame; true; CloseWebSocketFrame; (boolean,int,int,String); ; Argument[3]; Argument[this]; taint; manual |
+| 267 | Summary: io.netty.handler.codec.http.websocketx; CloseWebSocketFrame; true; CloseWebSocketFrame; (int,String); ; Argument[1]; Argument[this]; taint; manual |
+| 268 | Summary: io.netty.handler.codec.http.websocketx; CloseWebSocketFrame; true; reasonText; (); ; Argument[this]; ReturnValue; taint; manual |
+| 269 | Summary: io.netty.handler.codec.http.websocketx; ContinuationWebSocketFrame; true; ContinuationWebSocketFrame; (ByteBuf); ; Argument[0]; Argument[this]; taint; manual |
+| 270 | Summary: io.netty.handler.codec.http.websocketx; ContinuationWebSocketFrame; true; ContinuationWebSocketFrame; (boolean,int,ByteBuf); ; Argument[2]; Argument[this]; taint; manual |
+| 271 | Summary: io.netty.handler.codec.http.websocketx; ContinuationWebSocketFrame; true; ContinuationWebSocketFrame; (boolean,int,String); ; Argument[2]; Argument[this]; taint; manual |
+| 272 | Summary: io.netty.handler.codec.http.websocketx; ContinuationWebSocketFrame; true; text; (); ; Argument[this]; ReturnValue; taint; manual |
+| 273 | Summary: io.netty.handler.codec.http.websocketx; PingWebSocketFrame; true; PingWebSocketFrame; (ByteBuf); ; Argument[0]; Argument[this]; taint; manual |
+| 274 | Summary: io.netty.handler.codec.http.websocketx; PingWebSocketFrame; true; PingWebSocketFrame; (boolean,int,ByteBuf); ; Argument[2]; Argument[this]; taint; manual |
+| 275 | Summary: io.netty.handler.codec.http.websocketx; PongWebSocketFrame; true; PongWebSocketFrame; (ByteBuf); ; Argument[0]; Argument[this]; taint; manual |
+| 276 | Summary: io.netty.handler.codec.http.websocketx; PongWebSocketFrame; true; PongWebSocketFrame; (boolean,int,ByteBuf); ; Argument[2]; Argument[this]; taint; manual |
+| 277 | Summary: io.netty.handler.codec.http.websocketx; TextWebSocketFrame; true; TextWebSocketFrame; (ByteBuf); ; Argument[0]; Argument[this]; taint; manual |
+| 278 | Summary: io.netty.handler.codec.http.websocketx; TextWebSocketFrame; true; TextWebSocketFrame; (String); ; Argument[0]; Argument[this]; taint; manual |
+| 279 | Summary: io.netty.handler.codec.http.websocketx; TextWebSocketFrame; true; TextWebSocketFrame; (boolean,int,ByteBuf); ; Argument[2]; Argument[this]; taint; manual |
+| 280 | Summary: io.netty.handler.codec.http.websocketx; TextWebSocketFrame; true; TextWebSocketFrame; (boolean,int,String); ; Argument[2]; Argument[this]; taint; manual |
+| 281 | Summary: io.netty.handler.codec.http.websocketx; TextWebSocketFrame; true; text; (); ; Argument[this]; ReturnValue; taint; manual |
+| 282 | Summary: io.netty.handler.codec.http2; Http2Headers; true; authority; (); ; Argument[this].Element.MapValue; ReturnValue; value; manual |
+| 283 | Summary: io.netty.handler.codec.http2; Http2Headers; true; authority; (CharSequence); ; Argument[0]; Argument[this].Element.MapValue; value; manual |
+| 284 | Summary: io.netty.handler.codec.http2; Http2Headers; true; authority; (CharSequence); ; Argument[this]; ReturnValue; value; manual |
+| 285 | Summary: io.netty.handler.codec.http2; Http2Headers; true; method; (); ; Argument[this].Element.MapValue; ReturnValue; value; manual |
+| 286 | Summary: io.netty.handler.codec.http2; Http2Headers; true; method; (CharSequence); ; Argument[0]; Argument[this].Element.MapValue; value; manual |
+| 287 | Summary: io.netty.handler.codec.http2; Http2Headers; true; method; (CharSequence); ; Argument[this]; ReturnValue; value; manual |
+| 288 | Summary: io.netty.handler.codec.http2; Http2Headers; true; path; (); ; Argument[this].Element.MapValue; ReturnValue; value; manual |
+| 289 | Summary: io.netty.handler.codec.http2; Http2Headers; true; path; (CharSequence); ; Argument[0]; Argument[this].Element.MapValue; value; manual |
+| 290 | Summary: io.netty.handler.codec.http2; Http2Headers; true; path; (CharSequence); ; Argument[this]; ReturnValue; value; manual |
+| 291 | Summary: io.netty.handler.codec.http2; Http2Headers; true; scheme; (); ; Argument[this].Element.MapValue; ReturnValue; value; manual |
+| 292 | Summary: io.netty.handler.codec.http2; Http2Headers; true; scheme; (CharSequence); ; Argument[0]; Argument[this].Element.MapValue; value; manual |
+| 293 | Summary: io.netty.handler.codec.http2; Http2Headers; true; scheme; (CharSequence); ; Argument[this]; ReturnValue; value; manual |
+| 294 | Summary: io.netty.handler.codec.http2; Http2Headers; true; status; (); ; Argument[this].Element.MapValue; ReturnValue; value; manual |
+| 295 | Summary: io.netty.handler.codec.http2; Http2Headers; true; status; (CharSequence); ; Argument[0]; Argument[this].Element.MapValue; value; manual |
+| 296 | Summary: io.netty.handler.codec.http2; Http2Headers; true; status; (CharSequence); ; Argument[this]; ReturnValue; value; manual |
+| 297 | Summary: io.netty.handler.codec.http2; Http2Headers; true; valueIterator; (CharSequence); ; Argument[this].Element.MapValue; ReturnValue.Element; value; manual |
+| 298 | Summary: io.netty.handler.codec.http2; Http2HeadersFrame; true; headers; (); ; Argument[this]; ReturnValue; taint; manual |
+| 299 | Summary: io.netty.handler.codec.http2; Http2PushPromiseFrame; true; http2Headers; (); ; Argument[this]; ReturnValue; taint; manual |
+| 300 | Summary: io.netty.handler.codec.http2; HttpConversionUtil; false; addHttp2ToHttpHeaders; (int,Http2Headers,FullHttpMessage,boolean); ; Argument[1].Element.MapKey; Argument[2]; taint; manual |
+| 301 | Summary: io.netty.handler.codec.http2; HttpConversionUtil; false; addHttp2ToHttpHeaders; (int,Http2Headers,FullHttpMessage,boolean); ; Argument[1].Element.MapValue; Argument[2]; taint; manual |
+| 302 | Summary: io.netty.handler.codec.http2; HttpConversionUtil; false; addHttp2ToHttpHeaders; (int,Http2Headers,HttpHeaders,HttpVersion,boolean,boolean); ; Argument[1].Element.MapKey; Argument[2].Element.MapKey; taint; manual |
+| 303 | Summary: io.netty.handler.codec.http2; HttpConversionUtil; false; addHttp2ToHttpHeaders; (int,Http2Headers,HttpHeaders,HttpVersion,boolean,boolean); ; Argument[1].Element.MapValue; Argument[2].Element.MapValue; taint; manual |
+| 304 | Summary: io.netty.handler.codec.http2; HttpConversionUtil; false; toFullHttpRequest; (int,Http2Headers,ByteBuf,boolean); ; Argument[2]; ReturnValue; taint; manual |
+| 305 | Summary: io.netty.handler.codec.http2; HttpConversionUtil; false; toFullHttpRequest; ; ; Argument[1].Element.MapKey; ReturnValue; taint; manual |
+| 306 | Summary: io.netty.handler.codec.http2; HttpConversionUtil; false; toFullHttpRequest; ; ; Argument[1].Element.MapValue; ReturnValue; taint; manual |
+| 307 | Summary: io.netty.handler.codec.http2; HttpConversionUtil; false; toFullHttpResponse; (int,Http2Headers,ByteBuf,boolean); ; Argument[2]; ReturnValue; taint; manual |
+| 308 | Summary: io.netty.handler.codec.http2; HttpConversionUtil; false; toFullHttpResponse; ; ; Argument[1].Element.MapKey; ReturnValue; taint; manual |
+| 309 | Summary: io.netty.handler.codec.http2; HttpConversionUtil; false; toFullHttpResponse; ; ; Argument[1].Element.MapValue; ReturnValue; taint; manual |
+| 310 | Summary: io.netty.handler.codec.http2; HttpConversionUtil; false; toHttp2Headers; (HttpHeaders,Http2Headers); ; Argument[0].Element.MapKey; Argument[1].Element.MapKey; taint; manual |
+| 311 | Summary: io.netty.handler.codec.http2; HttpConversionUtil; false; toHttp2Headers; (HttpHeaders,Http2Headers); ; Argument[0].Element.MapValue; Argument[1].Element.MapValue; taint; manual |
+| 312 | Summary: io.netty.handler.codec.http2; HttpConversionUtil; false; toHttp2Headers; (HttpHeaders,boolean); ; Argument[0].Element.MapKey; ReturnValue.Element.MapKey; taint; manual |
+| 313 | Summary: io.netty.handler.codec.http2; HttpConversionUtil; false; toHttp2Headers; (HttpHeaders,boolean); ; Argument[0].Element.MapValue; ReturnValue.Element.MapValue; taint; manual |
+| 314 | Summary: io.netty.handler.codec.http2; HttpConversionUtil; false; toHttpRequest; ; ; Argument[1].Element.MapKey; ReturnValue; taint; manual |
+| 315 | Summary: io.netty.handler.codec.http2; HttpConversionUtil; false; toHttpRequest; ; ; Argument[1].Element.MapValue; ReturnValue; taint; manual |
+| 316 | Summary: io.netty.handler.codec.http2; HttpConversionUtil; false; toHttpResponse; ; ; Argument[1].Element.MapKey; ReturnValue; taint; manual |
+| 317 | Summary: io.netty.handler.codec.http2; HttpConversionUtil; false; toHttpResponse; ; ; Argument[1].Element.MapValue; ReturnValue; taint; manual |
+| 318 | Summary: io.netty.handler.codec.http; HttpHeaders; true; add; (CharSequence,Iterable); ; Argument[0]; Argument[this].Element.MapKey; taint; manual |
+| 319 | Summary: io.netty.handler.codec.http; HttpHeaders; true; add; (CharSequence,Iterable); ; Argument[1].Element; Argument[this].Element.MapValue; taint; manual |
+| 320 | Summary: io.netty.handler.codec.http; HttpHeaders; true; add; (CharSequence,Object); ; Argument[0]; Argument[this].Element.MapKey; taint; manual |
+| 321 | Summary: io.netty.handler.codec.http; HttpHeaders; true; add; (CharSequence,Object); ; Argument[1]; Argument[this].Element.MapValue; taint; manual |
+| 322 | Summary: io.netty.handler.codec.http; HttpHeaders; true; add; (HttpHeaders); ; Argument[0].Element.MapKey; Argument[this].Element.MapKey; value; manual |
+| 323 | Summary: io.netty.handler.codec.http; HttpHeaders; true; add; (HttpHeaders); ; Argument[0].Element.MapValue; Argument[this].Element.MapValue; taint; manual |
+| 324 | Summary: io.netty.handler.codec.http; HttpHeaders; true; add; (String,Iterable); ; Argument[0]; Argument[this].Element.MapKey; value; manual |
+| 325 | Summary: io.netty.handler.codec.http; HttpHeaders; true; add; (String,Iterable); ; Argument[1].Element; Argument[this].Element.MapValue; taint; manual |
+| 326 | Summary: io.netty.handler.codec.http; HttpHeaders; true; add; (String,Object); ; Argument[0]; Argument[this].Element.MapKey; value; manual |
+| 327 | Summary: io.netty.handler.codec.http; HttpHeaders; true; add; (String,Object); ; Argument[1]; Argument[this].Element.MapValue; taint; manual |
+| 328 | Summary: io.netty.handler.codec.http; HttpHeaders; true; add; ; ; Argument[this]; ReturnValue; value; manual |
+| 329 | Summary: io.netty.handler.codec.http; HttpHeaders; true; addInt; (CharSequence,int); ; Argument[0]; Argument[this].Element.MapKey; value; manual |
+| 330 | Summary: io.netty.handler.codec.http; HttpHeaders; true; addInt; (CharSequence,int); ; Argument[this]; ReturnValue; value; manual |
+| 331 | Summary: io.netty.handler.codec.http; HttpHeaders; true; addShort; (CharSequence,short); ; Argument[0]; Argument[this].Element.MapKey; value; manual |
+| 332 | Summary: io.netty.handler.codec.http; HttpHeaders; true; addShort; (CharSequence,short); ; Argument[this]; ReturnValue; value; manual |
+| 333 | Summary: io.netty.handler.codec.http; HttpHeaders; true; copy; (); ; Argument[this].Element.MapKey; ReturnValue.Element.MapKey; value; manual |
+| 334 | Summary: io.netty.handler.codec.http; HttpHeaders; true; copy; (); ; Argument[this].Element.MapValue; ReturnValue.Element.MapValue; value; manual |
+| 335 | Summary: io.netty.handler.codec.http; HttpHeaders; true; entries; (); ; Argument[this].Element.MapKey; ReturnValue.Element.MapKey; value; manual |
+| 336 | Summary: io.netty.handler.codec.http; HttpHeaders; true; entries; (); ; Argument[this].Element.MapValue; ReturnValue.Element.MapValue; value; manual |
+| 337 | Summary: io.netty.handler.codec.http; HttpHeaders; true; get; ; ; Argument[1]; ReturnValue; value; manual |
+| 338 | Summary: io.netty.handler.codec.http; HttpHeaders; true; get; ; ; Argument[this].Element.MapValue; ReturnValue; value; manual |
+| 339 | Summary: io.netty.handler.codec.http; HttpHeaders; true; getAll; ; ; Argument[this].Element.MapValue; ReturnValue.Element; value; manual |
+| 340 | Summary: io.netty.handler.codec.http; HttpHeaders; true; getAllAsString; ; ; Argument[this].Element.MapValue; ReturnValue.Element; value; manual |
+| 341 | Summary: io.netty.handler.codec.http; HttpHeaders; true; getAsString; ; ; Argument[this].Element.MapValue; ReturnValue; value; manual |
+| 342 | Summary: io.netty.handler.codec.http; HttpHeaders; true; getHeader; ; ; Argument[0]; ReturnValue; taint; manual |
+| 343 | Summary: io.netty.handler.codec.http; HttpHeaders; true; getHeader; ; ; Argument[2]; ReturnValue; value; manual |
+| 344 | Summary: io.netty.handler.codec.http; HttpHeaders; true; getHost; ; ; Argument[0]; ReturnValue; taint; manual |
+| 345 | Summary: io.netty.handler.codec.http; HttpHeaders; true; getHost; ; ; Argument[1]; ReturnValue; value; manual |
+| 346 | Summary: io.netty.handler.codec.http; HttpHeaders; true; iteratorAsString; (); ; Argument[this].Element.MapKey; ReturnValue.Element.MapKey; value; manual |
+| 347 | Summary: io.netty.handler.codec.http; HttpHeaders; true; iteratorAsString; (); ; Argument[this].Element.MapValue; ReturnValue.Element.MapValue; value; manual |
+| 348 | Summary: io.netty.handler.codec.http; HttpHeaders; true; iteratorCharSequence; (); ; Argument[this].Element.MapKey; ReturnValue.Element.MapKey; taint; manual |
+| 349 | Summary: io.netty.handler.codec.http; HttpHeaders; true; iteratorCharSequence; (); ; Argument[this].Element.MapValue; ReturnValue.Element.MapValue; taint; manual |
+| 350 | Summary: io.netty.handler.codec.http; HttpHeaders; true; names; (); ; Argument[this].Element.MapKey; ReturnValue.Element; value; manual |
+| 351 | Summary: io.netty.handler.codec.http; HttpHeaders; true; newEntity; ; ; Argument[0]; ReturnValue; taint; manual |
+| 352 | Summary: io.netty.handler.codec.http; HttpHeaders; true; remove; ; ; Argument[this]; ReturnValue; value; manual |
+| 353 | Summary: io.netty.handler.codec.http; HttpHeaders; true; set; (CharSequence,Iterable); ; Argument[0]; Argument[this].Element.MapKey; taint; manual |
+| 354 | Summary: io.netty.handler.codec.http; HttpHeaders; true; set; (CharSequence,Iterable); ; Argument[1].Element; Argument[this].Element.MapValue; taint; manual |
+| 355 | Summary: io.netty.handler.codec.http; HttpHeaders; true; set; (CharSequence,Object); ; Argument[0]; Argument[this].Element.MapKey; taint; manual |
+| 356 | Summary: io.netty.handler.codec.http; HttpHeaders; true; set; (CharSequence,Object); ; Argument[1]; Argument[this].Element.MapValue; taint; manual |
+| 357 | Summary: io.netty.handler.codec.http; HttpHeaders; true; set; (HttpHeaders); ; Argument[0].Element.MapKey; Argument[this].Element.MapKey; value; manual |
+| 358 | Summary: io.netty.handler.codec.http; HttpHeaders; true; set; (HttpHeaders); ; Argument[0].Element.MapValue; Argument[this].Element.MapValue; taint; manual |
+| 359 | Summary: io.netty.handler.codec.http; HttpHeaders; true; set; (String,Iterable); ; Argument[0]; Argument[this].Element.MapKey; value; manual |
+| 360 | Summary: io.netty.handler.codec.http; HttpHeaders; true; set; (String,Iterable); ; Argument[1].Element; Argument[this].Element.MapValue; taint; manual |
+| 361 | Summary: io.netty.handler.codec.http; HttpHeaders; true; set; (String,Object); ; Argument[0]; Argument[this].Element.MapKey; value; manual |
+| 362 | Summary: io.netty.handler.codec.http; HttpHeaders; true; set; (String,Object); ; Argument[1]; Argument[this].Element.MapValue; taint; manual |
+| 363 | Summary: io.netty.handler.codec.http; HttpHeaders; true; set; ; ; Argument[this]; ReturnValue; value; manual |
+| 364 | Summary: io.netty.handler.codec.http; HttpHeaders; true; setAll; (HttpHeaders); ; Argument[0].Element.MapKey; Argument[this].Element.MapKey; value; manual |
+| 365 | Summary: io.netty.handler.codec.http; HttpHeaders; true; setAll; (HttpHeaders); ; Argument[0].Element.MapValue; Argument[this].Element.MapValue; taint; manual |
+| 366 | Summary: io.netty.handler.codec.http; HttpHeaders; true; setAll; (HttpHeaders); ; Argument[this]; ReturnValue; value; manual |
+| 367 | Summary: io.netty.handler.codec.http; HttpHeaders; true; setInt; (CharSequence,int); ; Argument[0]; Argument[this].Element.MapKey; value; manual |
+| 368 | Summary: io.netty.handler.codec.http; HttpHeaders; true; setInt; (CharSequence,int); ; Argument[this]; ReturnValue; value; manual |
+| 369 | Summary: io.netty.handler.codec.http; HttpHeaders; true; setShort; (CharSequence,short); ; Argument[0]; Argument[this].Element.MapKey; value; manual |
+| 370 | Summary: io.netty.handler.codec.http; HttpHeaders; true; setShort; (CharSequence,short); ; Argument[this]; ReturnValue; value; manual |
+| 371 | Summary: io.netty.handler.codec.http; HttpHeaders; true; toString; ; ; Argument[this].Element.MapKey; ReturnValue; taint; manual |
+| 372 | Summary: io.netty.handler.codec.http; HttpHeaders; true; toString; ; ; Argument[this].Element.MapValue; ReturnValue; taint; manual |
+| 373 | Summary: io.netty.handler.codec.http; HttpHeaders; true; valueCharSequenceIterator; (CharSequence); ; Argument[this].Element.MapValue; ReturnValue.Element; taint; manual |
+| 374 | Summary: io.netty.handler.codec.http; HttpHeaders; true; valueStringIterator; (CharSequence); ; Argument[this].Element.MapValue; ReturnValue.Element; value; manual |
+| 375 | Summary: io.netty.handler.codec.http; HttpMessage; true; headers; ; ; Argument[this]; ReturnValue; taint; manual |
+| 376 | Summary: io.netty.handler.codec.http; HttpRequest; true; getUri; ; ; Argument[this]; ReturnValue; taint; manual |
+| 377 | Summary: io.netty.handler.codec.http; HttpRequest; true; uri; ; ; Argument[this]; ReturnValue; taint; manual |
+| 378 | Summary: io.netty.handler.codec.http; LastHttpContent; true; trailingHeaders; ; ; Argument[this]; ReturnValue; taint; manual |
+| 379 | Summary: io.netty.handler.codec.http; QueryStringDecoder; true; QueryStringDecoder; ; ; Argument[0]; Argument[this]; taint; manual |
+| 380 | Summary: io.netty.handler.codec.http; QueryStringDecoder; true; decodeComponent; ; ; Argument[0]; ReturnValue; taint; manual |
+| 381 | Summary: io.netty.handler.codec.http; QueryStringDecoder; true; parameters; ; ; Argument[this]; ReturnValue; taint; manual |
+| 382 | Summary: io.netty.handler.codec.http; QueryStringDecoder; true; path; ; ; Argument[this]; ReturnValue; taint; manual |
+| 383 | Summary: io.netty.handler.codec.http; QueryStringDecoder; true; rawPath; ; ; Argument[this]; ReturnValue; taint; manual |
+| 384 | Summary: io.netty.handler.codec.http; QueryStringDecoder; true; rawQuery; ; ; Argument[this]; ReturnValue; taint; manual |
+| 385 | Summary: io.netty.handler.codec.http; QueryStringDecoder; true; toString; ; ; Argument[this]; ReturnValue; taint; manual |
+| 386 | Summary: io.netty.handler.codec.http; QueryStringDecoder; true; uri; ; ; Argument[this]; ReturnValue; taint; manual |
+| 387 | Summary: io.netty.handler.codec; ByteToMessageDecoder$Cumulator; true; cumulate; (ByteBufAllocator,ByteBuf,ByteBuf); ; Argument[1..2]; ReturnValue; taint; manual |
+| 388 | Summary: io.netty.handler.codec; Headers; true; add; (Headers); ; Argument[0].Element.MapKey; Argument[this].Element.MapKey; value; manual |
+| 389 | Summary: io.netty.handler.codec; Headers; true; add; (Headers); ; Argument[0].Element.MapValue; Argument[this].Element.MapValue; value; manual |
+| 390 | Summary: io.netty.handler.codec; Headers; true; add; (Object,Iterable); ; Argument[0]; Argument[this].Element.MapKey; value; manual |
+| 391 | Summary: io.netty.handler.codec; Headers; true; add; (Object,Iterable); ; Argument[1].Element; Argument[this].Element.MapValue; value; manual |
+| 392 | Summary: io.netty.handler.codec; Headers; true; add; (Object,Object); ; Argument[0]; Argument[this].Element.MapKey; value; manual |
+| 393 | Summary: io.netty.handler.codec; Headers; true; add; (Object,Object); ; Argument[1]; Argument[this].Element.MapValue; value; manual |
+| 394 | Summary: io.netty.handler.codec; Headers; true; add; (Object,Object[]); ; Argument[0]; Argument[this].Element.MapKey; value; manual |
+| 395 | Summary: io.netty.handler.codec; Headers; true; add; (Object,Object[]); ; Argument[1].ArrayElement; Argument[this].Element.MapValue; value; manual |
+| 396 | Summary: io.netty.handler.codec; Headers; true; add; ; ; Argument[this]; ReturnValue; value; manual |
+| 397 | Summary: io.netty.handler.codec; Headers; true; addBoolean; ; ; Argument[0]; Argument[this].Element.MapKey; value; manual |
+| 398 | Summary: io.netty.handler.codec; Headers; true; addBoolean; ; ; Argument[this]; ReturnValue; value; manual |
+| 399 | Summary: io.netty.handler.codec; Headers; true; addByte; ; ; Argument[0]; Argument[this].Element.MapKey; value; manual |
+| 400 | Summary: io.netty.handler.codec; Headers; true; addByte; ; ; Argument[this]; ReturnValue; value; manual |
+| 401 | Summary: io.netty.handler.codec; Headers; true; addChar; ; ; Argument[0]; Argument[this].Element.MapKey; value; manual |
+| 402 | Summary: io.netty.handler.codec; Headers; true; addChar; ; ; Argument[this]; ReturnValue; value; manual |
+| 403 | Summary: io.netty.handler.codec; Headers; true; addDouble; ; ; Argument[0]; Argument[this].Element.MapKey; value; manual |
+| 404 | Summary: io.netty.handler.codec; Headers; true; addDouble; ; ; Argument[this]; ReturnValue; value; manual |
+| 405 | Summary: io.netty.handler.codec; Headers; true; addFloat; ; ; Argument[0]; Argument[this].Element.MapKey; value; manual |
+| 406 | Summary: io.netty.handler.codec; Headers; true; addFloat; ; ; Argument[this]; ReturnValue; value; manual |
+| 407 | Summary: io.netty.handler.codec; Headers; true; addInt; ; ; Argument[0]; Argument[this].Element.MapKey; value; manual |
+| 408 | Summary: io.netty.handler.codec; Headers; true; addInt; ; ; Argument[this]; ReturnValue; value; manual |
+| 409 | Summary: io.netty.handler.codec; Headers; true; addLong; ; ; Argument[0]; Argument[this].Element.MapKey; value; manual |
+| 410 | Summary: io.netty.handler.codec; Headers; true; addLong; ; ; Argument[this]; ReturnValue; value; manual |
+| 411 | Summary: io.netty.handler.codec; Headers; true; addObject; (Object,Iterable); ; Argument[0]; Argument[this].Element.MapKey; value; manual |
+| 412 | Summary: io.netty.handler.codec; Headers; true; addObject; (Object,Iterable); ; Argument[1].Element; Argument[this].Element.MapValue; taint; manual |
+| 413 | Summary: io.netty.handler.codec; Headers; true; addObject; (Object,Object); ; Argument[0]; Argument[this].Element.MapKey; value; manual |
+| 414 | Summary: io.netty.handler.codec; Headers; true; addObject; (Object,Object); ; Argument[1]; Argument[this].Element.MapValue; taint; manual |
+| 415 | Summary: io.netty.handler.codec; Headers; true; addObject; (Object,Object[]); ; Argument[0]; Argument[this].Element.MapKey; value; manual |
+| 416 | Summary: io.netty.handler.codec; Headers; true; addObject; (Object,Object[]); ; Argument[1].ArrayElement; Argument[this].Element.MapValue; taint; manual |
+| 417 | Summary: io.netty.handler.codec; Headers; true; addShort; ; ; Argument[0]; Argument[this].Element.MapKey; value; manual |
+| 418 | Summary: io.netty.handler.codec; Headers; true; addShort; ; ; Argument[this]; ReturnValue; value; manual |
+| 419 | Summary: io.netty.handler.codec; Headers; true; addTimeMillis; ; ; Argument[0]; Argument[this].Element.MapKey; value; manual |
+| 420 | Summary: io.netty.handler.codec; Headers; true; addTimeMillis; ; ; Argument[this]; ReturnValue; value; manual |
+| 421 | Summary: io.netty.handler.codec; Headers; true; get; (Object); ; Argument[this].Element.MapValue; ReturnValue; taint; manual |
+| 422 | Summary: io.netty.handler.codec; Headers; true; get; (Object,Object); ; Argument[1]; ReturnValue; value; manual |
+| 423 | Summary: io.netty.handler.codec; Headers; true; get; (Object,Object); ; Argument[this].Element.MapValue; ReturnValue; taint; manual |
+| 424 | Summary: io.netty.handler.codec; Headers; true; getAll; (Object); ; Argument[this].Element.MapValue; ReturnValue.Element; taint; manual |
+| 425 | Summary: io.netty.handler.codec; Headers; true; getAllAndRemove; (Object); ; Argument[this].Element.MapValue; ReturnValue.Element; taint; manual |
+| 426 | Summary: io.netty.handler.codec; Headers; true; getAndRemove; (Object); ; Argument[this].Element.MapValue; ReturnValue; taint; manual |
+| 427 | Summary: io.netty.handler.codec; Headers; true; getAndRemove; (Object,Object); ; Argument[1]; ReturnValue; value; manual |
+| 428 | Summary: io.netty.handler.codec; Headers; true; names; (); ; Argument[this].Element.MapKey; ReturnValue.Element; taint; manual |
+| 429 | Summary: io.netty.handler.codec; Headers; true; set; (Headers); ; Argument[0].Element.MapKey; Argument[this].Element.MapKey; value; manual |
+| 430 | Summary: io.netty.handler.codec; Headers; true; set; (Headers); ; Argument[0].Element.MapValue; Argument[this].Element.MapValue; value; manual |
+| 431 | Summary: io.netty.handler.codec; Headers; true; set; (Object,Iterable); ; Argument[0]; Argument[this].Element.MapKey; value; manual |
+| 432 | Summary: io.netty.handler.codec; Headers; true; set; (Object,Iterable); ; Argument[1].Element; Argument[this].Element.MapValue; value; manual |
+| 433 | Summary: io.netty.handler.codec; Headers; true; set; (Object,Object); ; Argument[0]; Argument[this].Element.MapKey; value; manual |
+| 434 | Summary: io.netty.handler.codec; Headers; true; set; (Object,Object); ; Argument[1]; Argument[this].Element.MapValue; value; manual |
+| 435 | Summary: io.netty.handler.codec; Headers; true; set; (Object,Object[]); ; Argument[0]; Argument[this].Element.MapKey; value; manual |
+| 436 | Summary: io.netty.handler.codec; Headers; true; set; (Object,Object[]); ; Argument[1].ArrayElement; Argument[this].Element.MapValue; value; manual |
+| 437 | Summary: io.netty.handler.codec; Headers; true; set; ; ; Argument[this]; ReturnValue; value; manual |
+| 438 | Summary: io.netty.handler.codec; Headers; true; setAll; (Headers); ; Argument[0].Element.MapKey; Argument[this].Element.MapKey; value; manual |
+| 439 | Summary: io.netty.handler.codec; Headers; true; setAll; (Headers); ; Argument[0].Element.MapValue; Argument[this].Element.MapValue; value; manual |
+| 440 | Summary: io.netty.handler.codec; Headers; true; setBoolean; ; ; Argument[0]; Argument[this].Element.MapKey; value; manual |
+| 441 | Summary: io.netty.handler.codec; Headers; true; setBoolean; ; ; Argument[this]; ReturnValue; value; manual |
+| 442 | Summary: io.netty.handler.codec; Headers; true; setByte; ; ; Argument[0]; Argument[this].Element.MapKey; value; manual |
+| 443 | Summary: io.netty.handler.codec; Headers; true; setByte; ; ; Argument[this]; ReturnValue; value; manual |
+| 444 | Summary: io.netty.handler.codec; Headers; true; setChar; ; ; Argument[0]; Argument[this].Element.MapKey; value; manual |
+| 445 | Summary: io.netty.handler.codec; Headers; true; setChar; ; ; Argument[this]; ReturnValue; value; manual |
+| 446 | Summary: io.netty.handler.codec; Headers; true; setDouble; ; ; Argument[0]; Argument[this].Element.MapKey; value; manual |
+| 447 | Summary: io.netty.handler.codec; Headers; true; setDouble; ; ; Argument[this]; ReturnValue; value; manual |
+| 448 | Summary: io.netty.handler.codec; Headers; true; setFloat; ; ; Argument[0]; Argument[this].Element.MapKey; value; manual |
+| 449 | Summary: io.netty.handler.codec; Headers; true; setFloat; ; ; Argument[this]; ReturnValue; value; manual |
+| 450 | Summary: io.netty.handler.codec; Headers; true; setInt; ; ; Argument[0]; Argument[this].Element.MapKey; value; manual |
+| 451 | Summary: io.netty.handler.codec; Headers; true; setInt; ; ; Argument[this]; ReturnValue; value; manual |
+| 452 | Summary: io.netty.handler.codec; Headers; true; setLong; ; ; Argument[0]; Argument[this].Element.MapKey; value; manual |
+| 453 | Summary: io.netty.handler.codec; Headers; true; setLong; ; ; Argument[this]; ReturnValue; value; manual |
+| 454 | Summary: io.netty.handler.codec; Headers; true; setObject; (Object,Iterable); ; Argument[0]; Argument[this].Element.MapKey; value; manual |
+| 455 | Summary: io.netty.handler.codec; Headers; true; setObject; (Object,Iterable); ; Argument[1].Element; Argument[this].Element.MapValue; taint; manual |
+| 456 | Summary: io.netty.handler.codec; Headers; true; setObject; (Object,Object); ; Argument[0]; Argument[this].Element.MapKey; value; manual |
+| 457 | Summary: io.netty.handler.codec; Headers; true; setObject; (Object,Object); ; Argument[1]; Argument[this].Element.MapValue; taint; manual |
+| 458 | Summary: io.netty.handler.codec; Headers; true; setObject; (Object,Object[]); ; Argument[0]; Argument[this].Element.MapKey; value; manual |
+| 459 | Summary: io.netty.handler.codec; Headers; true; setObject; (Object,Object[]); ; Argument[1].ArrayElement; Argument[this].Element.MapValue; taint; manual |
+| 460 | Summary: io.netty.handler.codec; Headers; true; setShort; ; ; Argument[0]; Argument[this].Element.MapKey; value; manual |
+| 461 | Summary: io.netty.handler.codec; Headers; true; setShort; ; ; Argument[this]; ReturnValue; value; manual |
+| 462 | Summary: io.netty.handler.codec; Headers; true; setTimeMillis; ; ; Argument[0]; Argument[this].Element.MapKey; value; manual |
+| 463 | Summary: io.netty.handler.codec; Headers; true; setTimeMillis; ; ; Argument[this]; ReturnValue; value; manual |
+| 464 | Summary: io.netty.handler.codec; HeadersUtils; false; getAllAsString; (Headers,Object); ; Argument[0].Element.MapValue; ReturnValue; taint; manual |
+| 465 | Summary: io.netty.handler.codec; HeadersUtils; false; getAsString; (Headers,Object); ; Argument[0].Element.MapValue; ReturnValue; taint; manual |
+| 466 | Summary: io.netty.handler.codec; HeadersUtils; false; iteratorAsString; (Iterable); ; Argument[0].Element.MapKey; ReturnValue; taint; manual |
+| 467 | Summary: io.netty.handler.codec; HeadersUtils; false; iteratorAsString; (Iterable); ; Argument[0].Element.MapValue; ReturnValue; taint; manual |
+| 468 | Summary: io.netty.handler.codec; HeadersUtils; false; namesAsString; (Headers); ; Argument[0].Element.MapKey; ReturnValue.Element; value; manual |
+| 469 | Summary: io.netty.handler.codec; HeadersUtils; false; toString; (Class,Iterator,int); ; Argument[1].Element.MapKey; ReturnValue; taint; manual |
+| 470 | Summary: io.netty.handler.codec; HeadersUtils; false; toString; (Class,Iterator,int); ; Argument[1].Element.MapValue; ReturnValue; taint; manual |
+| 471 | Summary: io.netty.resolver; SimpleNameResolver; false; resolve; (String); ; Argument[0]; ReturnValue; taint; ai-manual |
+| 472 | Summary: io.netty.util; AsciiString; false; AsciiString; ; ; Argument[0]; Argument[this]; taint; manual |
+| 473 | Summary: io.netty.util; AsciiString; false; array; (); ; Argument[this]; ReturnValue; taint; manual |
+| 474 | Summary: io.netty.util; AsciiString; false; cached; (String); ; Argument[0]; ReturnValue; taint; manual |
+| 475 | Summary: io.netty.util; AsciiString; false; concat; (CharSequence); ; Argument[0]; ReturnValue; taint; manual |
+| 476 | Summary: io.netty.util; AsciiString; false; concat; (CharSequence); ; Argument[this]; ReturnValue; taint; manual |
+| 477 | Summary: io.netty.util; AsciiString; false; copy; (int,byte[],int,int); ; Argument[this]; Argument[1]; taint; manual |
+| 478 | Summary: io.netty.util; AsciiString; false; copy; (int,char[],int,int); ; Argument[this]; Argument[1]; taint; manual |
+| 479 | Summary: io.netty.util; AsciiString; false; of; (CharSequence); ; Argument[0]; ReturnValue; taint; manual |
+| 480 | Summary: io.netty.util; AsciiString; false; replace; (char,char); ; Argument[this]; ReturnValue; taint; manual |
+| 481 | Summary: io.netty.util; AsciiString; false; split; (String,int); ; Argument[this]; ReturnValue; taint; manual |
+| 482 | Summary: io.netty.util; AsciiString; false; split; (char); ; Argument[this]; ReturnValue; taint; manual |
+| 483 | Summary: io.netty.util; AsciiString; false; subSequence; ; ; Argument[this]; ReturnValue; taint; manual |
+| 484 | Summary: io.netty.util; AsciiString; false; toByteArray; ; ; Argument[this]; ReturnValue; taint; manual |
+| 485 | Summary: io.netty.util; AsciiString; false; toCharArray; ; ; Argument[this]; ReturnValue; taint; manual |
 | 486 | Summary: io.netty.util; AsciiString; false; toLowerCase; (); ; Argument[this]; ReturnValue; taint; manual |
-| 487 | Summary: io.netty.util; AsciiString; false; toUpperCase; (); ; Argument[this]; ReturnValue; taint; manual |
-| 488 | Summary: io.netty.util; AsciiString; false; trim; (); ; Argument[this]; ReturnValue; taint; manual |
-| 489 | Summary: io.netty.util; AsciiString; false; trim; (CharSequence); ; Argument[0]; ReturnValue; taint; manual |
-| 490 | Summary: java.lang; CharSequence; true; subSequence; ; ; Argument[this]; ReturnValue; taint; manual |
-| 491 | Summary: java.lang; CharSequence; true; toString; ; ; Argument[this]; ReturnValue; taint; manual |
-| 492 | Summary: java.lang; Iterable; true; iterator; (); ; Argument[this].Element; ReturnValue.Element; value; manual |
-| 493 | Summary: java.util; Iterator; true; next; ; ; Argument[this].Element; ReturnValue; value; manual |
-| 494 | Summary: java.util; List; false; of; (Object); ; Argument[0]; ReturnValue.Element; value; manual |
-| 495 | Summary: generatedtest; Test; false; newWithMapValueDefault; (Object); ; Argument[0]; ReturnValue.MapValue; value; manual |
-| 496 | Summary: generatedtest; Test; false; newWithMapKeyDefault; (Object); ; Argument[0]; ReturnValue.MapKey; value; manual |
-| 497 | Summary: generatedtest; Test; false; newWithElementDefault; (Object); ; Argument[0]; ReturnValue.Element; value; manual |
-| 498 | Summary: generatedtest; Test; false; getMapValueDefault; (Object); ; Argument[0].MapValue; ReturnValue; value; manual |
-| 499 | Summary: generatedtest; Test; false; getMapKeyDefault; (Object); ; Argument[0].MapKey; ReturnValue; value; manual |
+| 487 | Summary: io.netty.util; AsciiString; false; toString; ; ; Argument[this]; ReturnValue; taint; manual |
+| 488 | Summary: io.netty.util; AsciiString; false; toUpperCase; (); ; Argument[this]; ReturnValue; taint; manual |
+| 489 | Summary: io.netty.util; AsciiString; false; trim; (); ; Argument[this]; ReturnValue; taint; manual |
+| 490 | Summary: io.netty.util; AsciiString; false; trim; (CharSequence); ; Argument[0]; ReturnValue; taint; manual |
+| 491 | Summary: io.netty.util; ReferenceCounted; true; retain; ; ; Argument[this]; ReturnValue; value; manual |
+| 492 | Summary: io.netty.util; ReferenceCounted; true; touch; ; ; Argument[this]; ReturnValue; value; manual |
+| 493 | Summary: java.lang; CharSequence; true; subSequence; ; ; Argument[this]; ReturnValue; taint; manual |
+| 494 | Summary: java.lang; CharSequence; true; toString; ; ; Argument[this]; ReturnValue; taint; manual |
+| 495 | Summary: java.lang; Iterable; true; iterator; (); ; Argument[this].Element; ReturnValue.Element; value; manual |
+| 496 | Summary: java.util; Iterator; true; next; ; ; Argument[this].Element; ReturnValue; value; manual |
+| 497 | Summary: java.util; List; false; of; (Object); ; Argument[0]; ReturnValue.Element; value; manual |
 edges
 | Test.java:79:19:79:32 | it : Headers [<element>, <map.key>] : Object | Test.java:79:44:79:45 | it : Headers [<element>, <map.key>] : Object | provenance |  |
 | Test.java:79:19:79:32 | it : Headers [<element>, <map.value>] : Object | Test.java:79:44:79:45 | it : Headers [<element>, <map.value>] : Object | provenance |  |
@@ -512,4539 +510,4537 @@ edges
 | Test.java:79:19:79:32 | it : List [<element>, <map.value>] : Object | Test.java:79:44:79:45 | it : List [<element>, <map.value>] : Object | provenance |  |
 | Test.java:79:19:79:32 | it : List [<element>] : Object | Test.java:79:44:79:45 | it : List [<element>] : Object | provenance |  |
 | Test.java:79:19:79:32 | it : Set [<element>] : Object | Test.java:79:44:79:45 | it : Set [<element>] : Object | provenance |  |
-| Test.java:79:44:79:45 | it : Headers [<element>, <map.key>] : Object | Test.java:79:44:79:56 | iterator(...) : Iterator [<element>, <map.key>] : Object | provenance | MaD:492 |
-| Test.java:79:44:79:45 | it : Headers [<element>, <map.value>] : Object | Test.java:79:44:79:56 | iterator(...) : Iterator [<element>, <map.value>] : Object | provenance | MaD:492 |
-| Test.java:79:44:79:45 | it : Http2Headers [<element>, <map.key>] : Object | Test.java:79:44:79:56 | iterator(...) : Iterator [<element>, <map.key>] : Object | provenance | MaD:492 |
-| Test.java:79:44:79:45 | it : Http2Headers [<element>, <map.value>] : CharSequence | Test.java:79:44:79:56 | iterator(...) : Iterator [<element>, <map.value>] : CharSequence | provenance | MaD:492 |
-| Test.java:79:44:79:45 | it : Http2Headers [<element>, <map.value>] : Object | Test.java:79:44:79:56 | iterator(...) : Iterator [<element>, <map.value>] : Object | provenance | MaD:492 |
-| Test.java:79:44:79:45 | it : HttpHeaders [<element>, <map.key>] : CharSequence | Test.java:79:44:79:56 | iterator(...) : Iterator [<element>, <map.key>] : CharSequence | provenance | MaD:492 |
-| Test.java:79:44:79:45 | it : HttpHeaders [<element>, <map.key>] : Object | Test.java:79:44:79:56 | iterator(...) : Iterator [<element>, <map.key>] : Object | provenance | MaD:492 |
-| Test.java:79:44:79:45 | it : HttpHeaders [<element>, <map.key>] : String | Test.java:79:44:79:56 | iterator(...) : Iterator [<element>, <map.key>] : String | provenance | MaD:492 |
-| Test.java:79:44:79:45 | it : HttpHeaders [<element>, <map.value>] : Object | Test.java:79:44:79:56 | iterator(...) : Iterator [<element>, <map.value>] : Object | provenance | MaD:492 |
-| Test.java:79:44:79:45 | it : List [<element>, <map.key>] : Object | Test.java:79:44:79:56 | iterator(...) : Iterator [<element>, <map.key>] : Object | provenance | MaD:492 |
-| Test.java:79:44:79:45 | it : List [<element>, <map.value>] : Object | Test.java:79:44:79:56 | iterator(...) : Iterator [<element>, <map.value>] : Object | provenance | MaD:492 |
-| Test.java:79:44:79:45 | it : List [<element>] : Object | Test.java:79:44:79:56 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:492 |
-| Test.java:79:44:79:45 | it : Set [<element>] : Object | Test.java:79:44:79:56 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:492 |
-| Test.java:79:44:79:56 | iterator(...) : Iterator [<element>, <map.key>] : CharSequence | Test.java:79:44:79:63 | next(...) : Object [<map.key>] : CharSequence | provenance | MaD:493 |
-| Test.java:79:44:79:56 | iterator(...) : Iterator [<element>, <map.key>] : Object | Test.java:79:44:79:63 | next(...) : Object [<map.key>] : Object | provenance | MaD:493 |
-| Test.java:79:44:79:56 | iterator(...) : Iterator [<element>, <map.key>] : Object | Test.java:79:44:79:63 | next(...) : Object [<map.key>] : Object | provenance | MaD:493 |
-| Test.java:79:44:79:56 | iterator(...) : Iterator [<element>, <map.key>] : Object | Test.java:79:44:79:63 | next(...) : Object [<map.key>] : Object | provenance | MaD:493 |
-| Test.java:79:44:79:56 | iterator(...) : Iterator [<element>, <map.key>] : Object | Test.java:79:44:79:63 | next(...) : Object [<map.key>] : Object | provenance | MaD:493 |
-| Test.java:79:44:79:56 | iterator(...) : Iterator [<element>, <map.key>] : String | Test.java:79:44:79:63 | next(...) : Object [<map.key>] : String | provenance | MaD:493 |
-| Test.java:79:44:79:56 | iterator(...) : Iterator [<element>, <map.value>] : CharSequence | Test.java:79:44:79:63 | next(...) : Object [<map.value>] : CharSequence | provenance | MaD:493 |
-| Test.java:79:44:79:56 | iterator(...) : Iterator [<element>, <map.value>] : Object | Test.java:79:44:79:63 | next(...) : Object [<map.value>] : Object | provenance | MaD:493 |
-| Test.java:79:44:79:56 | iterator(...) : Iterator [<element>, <map.value>] : Object | Test.java:79:44:79:63 | next(...) : Object [<map.value>] : Object | provenance | MaD:493 |
-| Test.java:79:44:79:56 | iterator(...) : Iterator [<element>, <map.value>] : Object | Test.java:79:44:79:63 | next(...) : Object [<map.value>] : Object | provenance | MaD:493 |
-| Test.java:79:44:79:56 | iterator(...) : Iterator [<element>, <map.value>] : Object | Test.java:79:44:79:63 | next(...) : Object [<map.value>] : Object | provenance | MaD:493 |
-| Test.java:79:44:79:56 | iterator(...) : Iterator [<element>] : Object | Test.java:79:44:79:63 | next(...) : Object | provenance | MaD:493 |
-| Test.java:79:44:79:56 | iterator(...) : Iterator [<element>] : Object | Test.java:79:44:79:63 | next(...) : Object | provenance | MaD:493 |
+| Test.java:79:44:79:45 | it : Headers [<element>, <map.key>] : Object | Test.java:79:44:79:56 | iterator(...) : Iterator [<element>, <map.key>] : Object | provenance | MaD:495 |
+| Test.java:79:44:79:45 | it : Headers [<element>, <map.value>] : Object | Test.java:79:44:79:56 | iterator(...) : Iterator [<element>, <map.value>] : Object | provenance | MaD:495 |
+| Test.java:79:44:79:45 | it : Http2Headers [<element>, <map.key>] : Object | Test.java:79:44:79:56 | iterator(...) : Iterator [<element>, <map.key>] : Object | provenance | MaD:495 |
+| Test.java:79:44:79:45 | it : Http2Headers [<element>, <map.value>] : CharSequence | Test.java:79:44:79:56 | iterator(...) : Iterator [<element>, <map.value>] : CharSequence | provenance | MaD:495 |
+| Test.java:79:44:79:45 | it : Http2Headers [<element>, <map.value>] : Object | Test.java:79:44:79:56 | iterator(...) : Iterator [<element>, <map.value>] : Object | provenance | MaD:495 |
+| Test.java:79:44:79:45 | it : HttpHeaders [<element>, <map.key>] : CharSequence | Test.java:79:44:79:56 | iterator(...) : Iterator [<element>, <map.key>] : CharSequence | provenance | MaD:495 |
+| Test.java:79:44:79:45 | it : HttpHeaders [<element>, <map.key>] : Object | Test.java:79:44:79:56 | iterator(...) : Iterator [<element>, <map.key>] : Object | provenance | MaD:495 |
+| Test.java:79:44:79:45 | it : HttpHeaders [<element>, <map.key>] : String | Test.java:79:44:79:56 | iterator(...) : Iterator [<element>, <map.key>] : String | provenance | MaD:495 |
+| Test.java:79:44:79:45 | it : HttpHeaders [<element>, <map.value>] : Object | Test.java:79:44:79:56 | iterator(...) : Iterator [<element>, <map.value>] : Object | provenance | MaD:495 |
+| Test.java:79:44:79:45 | it : List [<element>, <map.key>] : Object | Test.java:79:44:79:56 | iterator(...) : Iterator [<element>, <map.key>] : Object | provenance | MaD:495 |
+| Test.java:79:44:79:45 | it : List [<element>, <map.value>] : Object | Test.java:79:44:79:56 | iterator(...) : Iterator [<element>, <map.value>] : Object | provenance | MaD:495 |
+| Test.java:79:44:79:45 | it : List [<element>] : Object | Test.java:79:44:79:56 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:495 |
+| Test.java:79:44:79:45 | it : Set [<element>] : Object | Test.java:79:44:79:56 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:495 |
+| Test.java:79:44:79:56 | iterator(...) : Iterator [<element>, <map.key>] : CharSequence | Test.java:79:44:79:63 | next(...) : Object [<map.key>] : CharSequence | provenance | MaD:496 |
+| Test.java:79:44:79:56 | iterator(...) : Iterator [<element>, <map.key>] : Object | Test.java:79:44:79:63 | next(...) : Object [<map.key>] : Object | provenance | MaD:496 |
+| Test.java:79:44:79:56 | iterator(...) : Iterator [<element>, <map.key>] : Object | Test.java:79:44:79:63 | next(...) : Object [<map.key>] : Object | provenance | MaD:496 |
+| Test.java:79:44:79:56 | iterator(...) : Iterator [<element>, <map.key>] : Object | Test.java:79:44:79:63 | next(...) : Object [<map.key>] : Object | provenance | MaD:496 |
+| Test.java:79:44:79:56 | iterator(...) : Iterator [<element>, <map.key>] : Object | Test.java:79:44:79:63 | next(...) : Object [<map.key>] : Object | provenance | MaD:496 |
+| Test.java:79:44:79:56 | iterator(...) : Iterator [<element>, <map.key>] : String | Test.java:79:44:79:63 | next(...) : Object [<map.key>] : String | provenance | MaD:496 |
+| Test.java:79:44:79:56 | iterator(...) : Iterator [<element>, <map.value>] : CharSequence | Test.java:79:44:79:63 | next(...) : Object [<map.value>] : CharSequence | provenance | MaD:496 |
+| Test.java:79:44:79:56 | iterator(...) : Iterator [<element>, <map.value>] : Object | Test.java:79:44:79:63 | next(...) : Object [<map.value>] : Object | provenance | MaD:496 |
+| Test.java:79:44:79:56 | iterator(...) : Iterator [<element>, <map.value>] : Object | Test.java:79:44:79:63 | next(...) : Object [<map.value>] : Object | provenance | MaD:496 |
+| Test.java:79:44:79:56 | iterator(...) : Iterator [<element>, <map.value>] : Object | Test.java:79:44:79:63 | next(...) : Object [<map.value>] : Object | provenance | MaD:496 |
+| Test.java:79:44:79:56 | iterator(...) : Iterator [<element>, <map.value>] : Object | Test.java:79:44:79:63 | next(...) : Object [<map.value>] : Object | provenance | MaD:496 |
+| Test.java:79:44:79:56 | iterator(...) : Iterator [<element>] : Object | Test.java:79:44:79:63 | next(...) : Object | provenance | MaD:496 |
+| Test.java:79:44:79:56 | iterator(...) : Iterator [<element>] : Object | Test.java:79:44:79:63 | next(...) : Object | provenance | MaD:496 |
 | Test.java:80:19:80:32 | it : Iterator [<element>, <map.key>] : Object | Test.java:80:44:80:45 | it : Iterator [<element>, <map.key>] : Object | provenance |  |
 | Test.java:80:19:80:32 | it : Iterator [<element>, <map.value>] : Object | Test.java:80:44:80:45 | it : Iterator [<element>, <map.value>] : Object | provenance |  |
 | Test.java:80:19:80:32 | it : Iterator [<element>] : Object | Test.java:80:44:80:45 | it : Iterator [<element>] : Object | provenance |  |
-| Test.java:80:44:80:45 | it : Iterator [<element>, <map.key>] : Object | Test.java:80:44:80:52 | next(...) : Object [<map.key>] : Object | provenance | MaD:493 |
-| Test.java:80:44:80:45 | it : Iterator [<element>, <map.value>] : Object | Test.java:80:44:80:52 | next(...) : Object [<map.value>] : Object | provenance | MaD:493 |
-| Test.java:80:44:80:45 | it : Iterator [<element>] : Object | Test.java:80:44:80:52 | next(...) : Object | provenance | MaD:493 |
+| Test.java:80:44:80:45 | it : Iterator [<element>, <map.key>] : Object | Test.java:80:44:80:52 | next(...) : Object [<map.key>] : Object | provenance | MaD:496 |
+| Test.java:80:44:80:45 | it : Iterator [<element>, <map.value>] : Object | Test.java:80:44:80:52 | next(...) : Object [<map.value>] : Object | provenance | MaD:496 |
+| Test.java:80:44:80:45 | it : Iterator [<element>] : Object | Test.java:80:44:80:52 | next(...) : Object | provenance | MaD:496 |
 | Test.java:95:17:95:33 | (...)... : ByteBuf | Test.java:96:10:96:11 | in : ByteBuf | provenance |  |
 | Test.java:95:26:95:33 | source(...) : Object | Test.java:95:17:95:33 | (...)... : ByteBuf | provenance |  |
-| Test.java:96:10:96:11 | in : ByteBuf | Test.java:96:10:96:19 | array(...) : byte[] | provenance | MaD:2 |
+| Test.java:96:10:96:11 | in : ByteBuf | Test.java:96:10:96:19 | array(...) : byte[] | provenance | MaD:6 |
 | Test.java:96:10:96:19 | array(...) : byte[] | Test.java:97:9:97:11 | out | provenance |  |
 | Test.java:102:26:102:51 | (...)... : CompositeByteBuf | Test.java:103:10:103:11 | in : CompositeByteBuf | provenance |  |
 | Test.java:102:44:102:51 | source(...) : Object | Test.java:102:26:102:51 | (...)... : CompositeByteBuf | provenance |  |
-| Test.java:103:10:103:11 | in : CompositeByteBuf | Test.java:103:10:103:19 | array(...) : byte[] | provenance | MaD:2 |
+| Test.java:103:10:103:11 | in : CompositeByteBuf | Test.java:103:10:103:19 | array(...) : byte[] | provenance | MaD:6 |
 | Test.java:103:10:103:19 | array(...) : byte[] | Test.java:104:9:104:11 | out | provenance |  |
 | Test.java:109:24:109:47 | (...)... : SwappedByteBuf | Test.java:110:10:110:11 | in : SwappedByteBuf | provenance |  |
 | Test.java:109:40:109:47 | source(...) : Object | Test.java:109:24:109:47 | (...)... : SwappedByteBuf | provenance |  |
-| Test.java:110:10:110:11 | in : SwappedByteBuf | Test.java:110:10:110:19 | array(...) : byte[] | provenance | MaD:2 |
+| Test.java:110:10:110:11 | in : SwappedByteBuf | Test.java:110:10:110:19 | array(...) : byte[] | provenance | MaD:6 |
 | Test.java:110:10:110:19 | array(...) : byte[] | Test.java:111:9:111:11 | out | provenance |  |
 | Test.java:116:25:116:49 | (...)... : AbstractByteBuf | Test.java:117:10:117:11 | in : AbstractByteBuf | provenance |  |
 | Test.java:116:42:116:49 | source(...) : Object | Test.java:116:25:116:49 | (...)... : AbstractByteBuf | provenance |  |
-| Test.java:117:10:117:11 | in : AbstractByteBuf | Test.java:117:10:117:24 | asReadOnly(...) : ByteBuf | provenance | MaD:3 |
+| Test.java:117:10:117:11 | in : AbstractByteBuf | Test.java:117:10:117:24 | asReadOnly(...) : ByteBuf | provenance | MaD:7 |
 | Test.java:117:10:117:24 | asReadOnly(...) : ByteBuf | Test.java:118:9:118:11 | out | provenance |  |
 | Test.java:123:17:123:33 | (...)... : ByteBuf | Test.java:124:10:124:11 | in : ByteBuf | provenance |  |
 | Test.java:123:26:123:33 | source(...) : Object | Test.java:123:17:123:33 | (...)... : ByteBuf | provenance |  |
-| Test.java:124:10:124:11 | in : ByteBuf | Test.java:124:10:124:24 | asReadOnly(...) : ByteBuf | provenance | MaD:3 |
+| Test.java:124:10:124:11 | in : ByteBuf | Test.java:124:10:124:24 | asReadOnly(...) : ByteBuf | provenance | MaD:7 |
 | Test.java:124:10:124:24 | asReadOnly(...) : ByteBuf | Test.java:125:9:125:11 | out | provenance |  |
 | Test.java:130:24:130:47 | (...)... : SwappedByteBuf | Test.java:131:10:131:11 | in : SwappedByteBuf | provenance |  |
 | Test.java:130:40:130:47 | source(...) : Object | Test.java:130:24:130:47 | (...)... : SwappedByteBuf | provenance |  |
-| Test.java:131:10:131:11 | in : SwappedByteBuf | Test.java:131:10:131:24 | asReadOnly(...) : ByteBuf | provenance | MaD:3 |
+| Test.java:131:10:131:11 | in : SwappedByteBuf | Test.java:131:10:131:24 | asReadOnly(...) : ByteBuf | provenance | MaD:7 |
 | Test.java:131:10:131:24 | asReadOnly(...) : ByteBuf | Test.java:132:9:132:11 | out | provenance |  |
 | Test.java:137:17:137:33 | (...)... : ByteBuf | Test.java:138:10:138:11 | in : ByteBuf | provenance |  |
 | Test.java:137:26:137:33 | source(...) : Object | Test.java:137:17:137:33 | (...)... : ByteBuf | provenance |  |
-| Test.java:138:10:138:11 | in : ByteBuf | Test.java:138:10:138:23 | capacity(...) : ByteBuf | provenance | MaD:4 |
+| Test.java:138:10:138:11 | in : ByteBuf | Test.java:138:10:138:23 | capacity(...) : ByteBuf | provenance | MaD:8 |
 | Test.java:138:10:138:23 | capacity(...) : ByteBuf | Test.java:139:9:139:11 | out | provenance |  |
 | Test.java:144:24:144:47 | (...)... : SwappedByteBuf | Test.java:145:10:145:11 | in : SwappedByteBuf | provenance |  |
 | Test.java:144:40:144:47 | source(...) : Object | Test.java:144:24:144:47 | (...)... : SwappedByteBuf | provenance |  |
-| Test.java:145:10:145:11 | in : SwappedByteBuf | Test.java:145:10:145:23 | capacity(...) : SwappedByteBuf | provenance | MaD:4 |
+| Test.java:145:10:145:11 | in : SwappedByteBuf | Test.java:145:10:145:23 | capacity(...) : SwappedByteBuf | provenance | MaD:8 |
 | Test.java:145:10:145:23 | capacity(...) : SwappedByteBuf | Test.java:146:9:146:11 | out | provenance |  |
 | Test.java:151:26:151:51 | (...)... : CompositeByteBuf | Test.java:152:10:152:11 | in : CompositeByteBuf | provenance |  |
 | Test.java:151:44:151:51 | source(...) : Object | Test.java:151:26:151:51 | (...)... : CompositeByteBuf | provenance |  |
-| Test.java:152:10:152:11 | in : CompositeByteBuf | Test.java:152:10:152:23 | capacity(...) : CompositeByteBuf | provenance | MaD:4 |
+| Test.java:152:10:152:11 | in : CompositeByteBuf | Test.java:152:10:152:23 | capacity(...) : CompositeByteBuf | provenance | MaD:8 |
 | Test.java:152:10:152:23 | capacity(...) : CompositeByteBuf | Test.java:153:9:153:11 | out | provenance |  |
 | Test.java:158:25:158:49 | (...)... : AbstractByteBuf | Test.java:159:10:159:11 | in : AbstractByteBuf | provenance |  |
 | Test.java:158:42:158:49 | source(...) : Object | Test.java:158:25:158:49 | (...)... : AbstractByteBuf | provenance |  |
-| Test.java:159:10:159:11 | in : AbstractByteBuf | Test.java:159:10:159:18 | copy(...) : ByteBuf | provenance | MaD:5 |
+| Test.java:159:10:159:11 | in : AbstractByteBuf | Test.java:159:10:159:18 | copy(...) : ByteBuf | provenance | MaD:9 |
 | Test.java:159:10:159:18 | copy(...) : ByteBuf | Test.java:160:9:160:11 | out | provenance |  |
 | Test.java:165:17:165:33 | (...)... : ByteBuf | Test.java:166:10:166:11 | in : ByteBuf | provenance |  |
 | Test.java:165:26:165:33 | source(...) : Object | Test.java:165:17:165:33 | (...)... : ByteBuf | provenance |  |
-| Test.java:166:10:166:11 | in : ByteBuf | Test.java:166:10:166:18 | copy(...) : ByteBuf | provenance | MaD:5 |
+| Test.java:166:10:166:11 | in : ByteBuf | Test.java:166:10:166:18 | copy(...) : ByteBuf | provenance | MaD:9 |
 | Test.java:166:10:166:18 | copy(...) : ByteBuf | Test.java:167:9:167:11 | out | provenance |  |
 | Test.java:172:17:172:33 | (...)... : ByteBuf | Test.java:173:10:173:11 | in : ByteBuf | provenance |  |
 | Test.java:172:26:172:33 | source(...) : Object | Test.java:172:17:172:33 | (...)... : ByteBuf | provenance |  |
-| Test.java:173:10:173:11 | in : ByteBuf | Test.java:173:10:173:22 | copy(...) : ByteBuf | provenance | MaD:5 |
+| Test.java:173:10:173:11 | in : ByteBuf | Test.java:173:10:173:22 | copy(...) : ByteBuf | provenance | MaD:9 |
 | Test.java:173:10:173:22 | copy(...) : ByteBuf | Test.java:174:9:174:11 | out | provenance |  |
 | Test.java:179:26:179:51 | (...)... : CompositeByteBuf | Test.java:180:10:180:11 | in : CompositeByteBuf | provenance |  |
 | Test.java:179:44:179:51 | source(...) : Object | Test.java:179:26:179:51 | (...)... : CompositeByteBuf | provenance |  |
-| Test.java:180:10:180:11 | in : CompositeByteBuf | Test.java:180:10:180:22 | copy(...) : ByteBuf | provenance | MaD:5 |
+| Test.java:180:10:180:11 | in : CompositeByteBuf | Test.java:180:10:180:22 | copy(...) : ByteBuf | provenance | MaD:9 |
 | Test.java:180:10:180:22 | copy(...) : ByteBuf | Test.java:181:9:181:11 | out | provenance |  |
 | Test.java:186:24:186:47 | (...)... : SwappedByteBuf | Test.java:187:10:187:11 | in : SwappedByteBuf | provenance |  |
 | Test.java:186:40:186:47 | source(...) : Object | Test.java:186:24:186:47 | (...)... : SwappedByteBuf | provenance |  |
-| Test.java:187:10:187:11 | in : SwappedByteBuf | Test.java:187:10:187:18 | copy(...) : ByteBuf | provenance | MaD:5 |
+| Test.java:187:10:187:11 | in : SwappedByteBuf | Test.java:187:10:187:18 | copy(...) : ByteBuf | provenance | MaD:9 |
 | Test.java:187:10:187:18 | copy(...) : ByteBuf | Test.java:188:9:188:11 | out | provenance |  |
 | Test.java:193:24:193:47 | (...)... : SwappedByteBuf | Test.java:194:10:194:11 | in : SwappedByteBuf | provenance |  |
 | Test.java:193:40:193:47 | source(...) : Object | Test.java:193:24:193:47 | (...)... : SwappedByteBuf | provenance |  |
-| Test.java:194:10:194:11 | in : SwappedByteBuf | Test.java:194:10:194:22 | copy(...) : ByteBuf | provenance | MaD:5 |
+| Test.java:194:10:194:11 | in : SwappedByteBuf | Test.java:194:10:194:22 | copy(...) : ByteBuf | provenance | MaD:9 |
 | Test.java:194:10:194:22 | copy(...) : ByteBuf | Test.java:195:9:195:11 | out | provenance |  |
 | Test.java:200:25:200:49 | (...)... : AbstractByteBuf | Test.java:201:10:201:11 | in : AbstractByteBuf | provenance |  |
 | Test.java:200:42:200:49 | source(...) : Object | Test.java:200:25:200:49 | (...)... : AbstractByteBuf | provenance |  |
-| Test.java:201:10:201:11 | in : AbstractByteBuf | Test.java:201:10:201:30 | discardReadBytes(...) : AbstractByteBuf | provenance | MaD:6 |
+| Test.java:201:10:201:11 | in : AbstractByteBuf | Test.java:201:10:201:30 | discardReadBytes(...) : AbstractByteBuf | provenance | MaD:10 |
 | Test.java:201:10:201:30 | discardReadBytes(...) : AbstractByteBuf | Test.java:202:9:202:11 | out | provenance |  |
 | Test.java:207:17:207:33 | (...)... : ByteBuf | Test.java:208:10:208:11 | in : ByteBuf | provenance |  |
 | Test.java:207:26:207:33 | source(...) : Object | Test.java:207:17:207:33 | (...)... : ByteBuf | provenance |  |
-| Test.java:208:10:208:11 | in : ByteBuf | Test.java:208:10:208:30 | discardReadBytes(...) : ByteBuf | provenance | MaD:6 |
+| Test.java:208:10:208:11 | in : ByteBuf | Test.java:208:10:208:30 | discardReadBytes(...) : ByteBuf | provenance | MaD:10 |
 | Test.java:208:10:208:30 | discardReadBytes(...) : ByteBuf | Test.java:209:9:209:11 | out | provenance |  |
 | Test.java:214:24:214:47 | (...)... : SwappedByteBuf | Test.java:215:10:215:11 | in : SwappedByteBuf | provenance |  |
 | Test.java:214:40:214:47 | source(...) : Object | Test.java:214:24:214:47 | (...)... : SwappedByteBuf | provenance |  |
-| Test.java:215:10:215:11 | in : SwappedByteBuf | Test.java:215:10:215:30 | discardReadBytes(...) : SwappedByteBuf | provenance | MaD:6 |
+| Test.java:215:10:215:11 | in : SwappedByteBuf | Test.java:215:10:215:30 | discardReadBytes(...) : SwappedByteBuf | provenance | MaD:10 |
 | Test.java:215:10:215:30 | discardReadBytes(...) : SwappedByteBuf | Test.java:216:9:216:11 | out | provenance |  |
 | Test.java:221:26:221:51 | (...)... : CompositeByteBuf | Test.java:222:10:222:11 | in : CompositeByteBuf | provenance |  |
 | Test.java:221:44:221:51 | source(...) : Object | Test.java:221:26:221:51 | (...)... : CompositeByteBuf | provenance |  |
-| Test.java:222:10:222:11 | in : CompositeByteBuf | Test.java:222:10:222:30 | discardReadBytes(...) : CompositeByteBuf | provenance | MaD:6 |
+| Test.java:222:10:222:11 | in : CompositeByteBuf | Test.java:222:10:222:30 | discardReadBytes(...) : CompositeByteBuf | provenance | MaD:10 |
 | Test.java:222:10:222:30 | discardReadBytes(...) : CompositeByteBuf | Test.java:223:9:223:11 | out | provenance |  |
 | Test.java:228:25:228:49 | (...)... : AbstractByteBuf | Test.java:229:10:229:11 | in : AbstractByteBuf | provenance |  |
 | Test.java:228:42:228:49 | source(...) : Object | Test.java:228:25:228:49 | (...)... : AbstractByteBuf | provenance |  |
-| Test.java:229:10:229:11 | in : AbstractByteBuf | Test.java:229:10:229:34 | discardSomeReadBytes(...) : AbstractByteBuf | provenance | MaD:7 |
+| Test.java:229:10:229:11 | in : AbstractByteBuf | Test.java:229:10:229:34 | discardSomeReadBytes(...) : AbstractByteBuf | provenance | MaD:11 |
 | Test.java:229:10:229:34 | discardSomeReadBytes(...) : AbstractByteBuf | Test.java:230:9:230:11 | out | provenance |  |
 | Test.java:235:17:235:33 | (...)... : ByteBuf | Test.java:236:10:236:11 | in : ByteBuf | provenance |  |
 | Test.java:235:26:235:33 | source(...) : Object | Test.java:235:17:235:33 | (...)... : ByteBuf | provenance |  |
-| Test.java:236:10:236:11 | in : ByteBuf | Test.java:236:10:236:34 | discardSomeReadBytes(...) : ByteBuf | provenance | MaD:7 |
+| Test.java:236:10:236:11 | in : ByteBuf | Test.java:236:10:236:34 | discardSomeReadBytes(...) : ByteBuf | provenance | MaD:11 |
 | Test.java:236:10:236:34 | discardSomeReadBytes(...) : ByteBuf | Test.java:237:9:237:11 | out | provenance |  |
 | Test.java:242:24:242:47 | (...)... : SwappedByteBuf | Test.java:243:10:243:11 | in : SwappedByteBuf | provenance |  |
 | Test.java:242:40:242:47 | source(...) : Object | Test.java:242:24:242:47 | (...)... : SwappedByteBuf | provenance |  |
-| Test.java:243:10:243:11 | in : SwappedByteBuf | Test.java:243:10:243:34 | discardSomeReadBytes(...) : SwappedByteBuf | provenance | MaD:7 |
+| Test.java:243:10:243:11 | in : SwappedByteBuf | Test.java:243:10:243:34 | discardSomeReadBytes(...) : SwappedByteBuf | provenance | MaD:11 |
 | Test.java:243:10:243:34 | discardSomeReadBytes(...) : SwappedByteBuf | Test.java:244:9:244:11 | out | provenance |  |
 | Test.java:249:26:249:51 | (...)... : CompositeByteBuf | Test.java:250:10:250:11 | in : CompositeByteBuf | provenance |  |
 | Test.java:249:44:249:51 | source(...) : Object | Test.java:249:26:249:51 | (...)... : CompositeByteBuf | provenance |  |
-| Test.java:250:10:250:11 | in : CompositeByteBuf | Test.java:250:10:250:34 | discardSomeReadBytes(...) : CompositeByteBuf | provenance | MaD:7 |
+| Test.java:250:10:250:11 | in : CompositeByteBuf | Test.java:250:10:250:34 | discardSomeReadBytes(...) : CompositeByteBuf | provenance | MaD:11 |
 | Test.java:250:10:250:34 | discardSomeReadBytes(...) : CompositeByteBuf | Test.java:251:9:251:11 | out | provenance |  |
 | Test.java:256:25:256:49 | (...)... : AbstractByteBuf | Test.java:257:10:257:11 | in : AbstractByteBuf | provenance |  |
 | Test.java:256:42:256:49 | source(...) : Object | Test.java:256:25:256:49 | (...)... : AbstractByteBuf | provenance |  |
-| Test.java:257:10:257:11 | in : AbstractByteBuf | Test.java:257:10:257:23 | duplicate(...) : ByteBuf | provenance | MaD:8 |
+| Test.java:257:10:257:11 | in : AbstractByteBuf | Test.java:257:10:257:23 | duplicate(...) : ByteBuf | provenance | MaD:12 |
 | Test.java:257:10:257:23 | duplicate(...) : ByteBuf | Test.java:258:9:258:11 | out | provenance |  |
 | Test.java:263:17:263:33 | (...)... : ByteBuf | Test.java:264:10:264:11 | in : ByteBuf | provenance |  |
 | Test.java:263:26:263:33 | source(...) : Object | Test.java:263:17:263:33 | (...)... : ByteBuf | provenance |  |
-| Test.java:264:10:264:11 | in : ByteBuf | Test.java:264:10:264:23 | duplicate(...) : ByteBuf | provenance | MaD:8 |
+| Test.java:264:10:264:11 | in : ByteBuf | Test.java:264:10:264:23 | duplicate(...) : ByteBuf | provenance | MaD:12 |
 | Test.java:264:10:264:23 | duplicate(...) : ByteBuf | Test.java:265:9:265:11 | out | provenance |  |
 | Test.java:270:24:270:47 | (...)... : SwappedByteBuf | Test.java:271:10:271:11 | in : SwappedByteBuf | provenance |  |
 | Test.java:270:40:270:47 | source(...) : Object | Test.java:270:24:270:47 | (...)... : SwappedByteBuf | provenance |  |
-| Test.java:271:10:271:11 | in : SwappedByteBuf | Test.java:271:10:271:23 | duplicate(...) : ByteBuf | provenance | MaD:8 |
+| Test.java:271:10:271:11 | in : SwappedByteBuf | Test.java:271:10:271:23 | duplicate(...) : ByteBuf | provenance | MaD:12 |
 | Test.java:271:10:271:23 | duplicate(...) : ByteBuf | Test.java:272:9:272:11 | out | provenance |  |
 | Test.java:277:25:277:49 | (...)... : AbstractByteBuf | Test.java:278:10:278:11 | in : AbstractByteBuf | provenance |  |
 | Test.java:277:42:277:49 | source(...) : Object | Test.java:277:25:277:49 | (...)... : AbstractByteBuf | provenance |  |
-| Test.java:278:10:278:11 | in : AbstractByteBuf | Test.java:278:10:278:29 | ensureWritable(...) : AbstractByteBuf | provenance | MaD:9 |
+| Test.java:278:10:278:11 | in : AbstractByteBuf | Test.java:278:10:278:29 | ensureWritable(...) : AbstractByteBuf | provenance | MaD:13 |
 | Test.java:278:10:278:29 | ensureWritable(...) : AbstractByteBuf | Test.java:279:9:279:11 | out | provenance |  |
 | Test.java:284:17:284:33 | (...)... : ByteBuf | Test.java:285:10:285:11 | in : ByteBuf | provenance |  |
 | Test.java:284:26:284:33 | source(...) : Object | Test.java:284:17:284:33 | (...)... : ByteBuf | provenance |  |
-| Test.java:285:10:285:11 | in : ByteBuf | Test.java:285:10:285:29 | ensureWritable(...) : ByteBuf | provenance | MaD:9 |
+| Test.java:285:10:285:11 | in : ByteBuf | Test.java:285:10:285:29 | ensureWritable(...) : ByteBuf | provenance | MaD:13 |
 | Test.java:285:10:285:29 | ensureWritable(...) : ByteBuf | Test.java:286:9:286:11 | out | provenance |  |
 | Test.java:291:24:291:47 | (...)... : SwappedByteBuf | Test.java:292:10:292:11 | in : SwappedByteBuf | provenance |  |
 | Test.java:291:40:291:47 | source(...) : Object | Test.java:291:24:291:47 | (...)... : SwappedByteBuf | provenance |  |
-| Test.java:292:10:292:11 | in : SwappedByteBuf | Test.java:292:10:292:29 | ensureWritable(...) : SwappedByteBuf | provenance | MaD:9 |
+| Test.java:292:10:292:11 | in : SwappedByteBuf | Test.java:292:10:292:29 | ensureWritable(...) : SwappedByteBuf | provenance | MaD:13 |
 | Test.java:292:10:292:29 | ensureWritable(...) : SwappedByteBuf | Test.java:293:9:293:11 | out | provenance |  |
 | Test.java:298:26:298:51 | (...)... : CompositeByteBuf | Test.java:299:10:299:11 | in : CompositeByteBuf | provenance |  |
 | Test.java:298:44:298:51 | source(...) : Object | Test.java:298:26:298:51 | (...)... : CompositeByteBuf | provenance |  |
-| Test.java:299:10:299:11 | in : CompositeByteBuf | Test.java:299:10:299:29 | ensureWritable(...) : CompositeByteBuf | provenance | MaD:9 |
+| Test.java:299:10:299:11 | in : CompositeByteBuf | Test.java:299:10:299:29 | ensureWritable(...) : CompositeByteBuf | provenance | MaD:13 |
 | Test.java:299:10:299:29 | ensureWritable(...) : CompositeByteBuf | Test.java:300:9:300:11 | out | provenance |  |
 | Test.java:305:25:305:49 | (...)... : AbstractByteBuf | Test.java:306:4:306:5 | in : AbstractByteBuf | provenance |  |
 | Test.java:305:42:305:49 | source(...) : Object | Test.java:305:25:305:49 | (...)... : AbstractByteBuf | provenance |  |
-| Test.java:306:4:306:5 | in : AbstractByteBuf | Test.java:306:19:306:21 | out [post update] : ByteBuf | provenance | MaD:91 |
+| Test.java:306:4:306:5 | in : AbstractByteBuf | Test.java:306:19:306:21 | out [post update] : ByteBuf | provenance | MaD:14 |
 | Test.java:306:19:306:21 | out [post update] : ByteBuf | Test.java:307:9:307:11 | out | provenance |  |
 | Test.java:312:17:312:33 | (...)... : ByteBuf | Test.java:313:4:313:5 | in : ByteBuf | provenance |  |
 | Test.java:312:26:312:33 | source(...) : Object | Test.java:312:17:312:33 | (...)... : ByteBuf | provenance |  |
-| Test.java:313:4:313:5 | in : ByteBuf | Test.java:313:19:313:21 | out [post update] : ByteBuf | provenance | MaD:91 |
+| Test.java:313:4:313:5 | in : ByteBuf | Test.java:313:19:313:21 | out [post update] : ByteBuf | provenance | MaD:14 |
 | Test.java:313:19:313:21 | out [post update] : ByteBuf | Test.java:314:9:314:11 | out | provenance |  |
 | Test.java:319:26:319:51 | (...)... : CompositeByteBuf | Test.java:320:4:320:5 | in : CompositeByteBuf | provenance |  |
 | Test.java:319:44:319:51 | source(...) : Object | Test.java:319:26:319:51 | (...)... : CompositeByteBuf | provenance |  |
-| Test.java:320:4:320:5 | in : CompositeByteBuf | Test.java:320:19:320:21 | out [post update] : ByteBuf | provenance | MaD:91 |
+| Test.java:320:4:320:5 | in : CompositeByteBuf | Test.java:320:19:320:21 | out [post update] : ByteBuf | provenance | MaD:14 |
 | Test.java:320:19:320:21 | out [post update] : ByteBuf | Test.java:321:9:321:11 | out | provenance |  |
 | Test.java:326:24:326:47 | (...)... : SwappedByteBuf | Test.java:327:4:327:5 | in : SwappedByteBuf | provenance |  |
 | Test.java:326:40:326:47 | source(...) : Object | Test.java:326:24:326:47 | (...)... : SwappedByteBuf | provenance |  |
-| Test.java:327:4:327:5 | in : SwappedByteBuf | Test.java:327:19:327:21 | out [post update] : ByteBuf | provenance | MaD:91 |
+| Test.java:327:4:327:5 | in : SwappedByteBuf | Test.java:327:19:327:21 | out [post update] : ByteBuf | provenance | MaD:14 |
 | Test.java:327:19:327:21 | out [post update] : ByteBuf | Test.java:328:9:328:11 | out | provenance |  |
 | Test.java:333:25:333:49 | (...)... : AbstractByteBuf | Test.java:334:10:334:11 | in : AbstractByteBuf | provenance |  |
 | Test.java:333:42:333:49 | source(...) : Object | Test.java:333:25:333:49 | (...)... : AbstractByteBuf | provenance |  |
-| Test.java:334:10:334:11 | in : AbstractByteBuf | Test.java:334:10:334:38 | getBytes(...) : AbstractByteBuf | provenance | MaD:12 |
+| Test.java:334:10:334:11 | in : AbstractByteBuf | Test.java:334:10:334:38 | getBytes(...) : AbstractByteBuf | provenance | MaD:15 |
 | Test.java:334:10:334:38 | getBytes(...) : AbstractByteBuf | Test.java:335:9:335:11 | out | provenance |  |
 | Test.java:340:17:340:33 | (...)... : ByteBuf | Test.java:341:10:341:11 | in : ByteBuf | provenance |  |
 | Test.java:340:26:340:33 | source(...) : Object | Test.java:340:17:340:33 | (...)... : ByteBuf | provenance |  |
-| Test.java:341:10:341:11 | in : ByteBuf | Test.java:341:10:341:38 | getBytes(...) : ByteBuf | provenance | MaD:12 |
+| Test.java:341:10:341:11 | in : ByteBuf | Test.java:341:10:341:38 | getBytes(...) : ByteBuf | provenance | MaD:15 |
 | Test.java:341:10:341:38 | getBytes(...) : ByteBuf | Test.java:342:9:342:11 | out | provenance |  |
 | Test.java:347:24:347:47 | (...)... : SwappedByteBuf | Test.java:348:10:348:11 | in : SwappedByteBuf | provenance |  |
 | Test.java:347:40:347:47 | source(...) : Object | Test.java:347:24:347:47 | (...)... : SwappedByteBuf | provenance |  |
-| Test.java:348:10:348:11 | in : SwappedByteBuf | Test.java:348:10:348:38 | getBytes(...) : SwappedByteBuf | provenance | MaD:12 |
+| Test.java:348:10:348:11 | in : SwappedByteBuf | Test.java:348:10:348:38 | getBytes(...) : SwappedByteBuf | provenance | MaD:15 |
 | Test.java:348:10:348:38 | getBytes(...) : SwappedByteBuf | Test.java:349:9:349:11 | out | provenance |  |
 | Test.java:354:26:354:51 | (...)... : CompositeByteBuf | Test.java:355:10:355:11 | in : CompositeByteBuf | provenance |  |
 | Test.java:354:44:354:51 | source(...) : Object | Test.java:354:26:354:51 | (...)... : CompositeByteBuf | provenance |  |
-| Test.java:355:10:355:11 | in : CompositeByteBuf | Test.java:355:10:355:38 | getBytes(...) : CompositeByteBuf | provenance | MaD:12 |
+| Test.java:355:10:355:11 | in : CompositeByteBuf | Test.java:355:10:355:38 | getBytes(...) : CompositeByteBuf | provenance | MaD:15 |
 | Test.java:355:10:355:38 | getBytes(...) : CompositeByteBuf | Test.java:356:9:356:11 | out | provenance |  |
 | Test.java:361:25:361:49 | (...)... : AbstractByteBuf | Test.java:362:4:362:5 | in : AbstractByteBuf | provenance |  |
 | Test.java:361:42:361:49 | source(...) : Object | Test.java:361:25:361:49 | (...)... : AbstractByteBuf | provenance |  |
-| Test.java:362:4:362:5 | in : AbstractByteBuf | Test.java:362:19:362:21 | out [post update] : ByteBuf | provenance | MaD:93 |
+| Test.java:362:4:362:5 | in : AbstractByteBuf | Test.java:362:19:362:21 | out [post update] : ByteBuf | provenance | MaD:16 |
 | Test.java:362:19:362:21 | out [post update] : ByteBuf | Test.java:363:9:363:11 | out | provenance |  |
 | Test.java:368:17:368:33 | (...)... : ByteBuf | Test.java:369:4:369:5 | in : ByteBuf | provenance |  |
 | Test.java:368:26:368:33 | source(...) : Object | Test.java:368:17:368:33 | (...)... : ByteBuf | provenance |  |
-| Test.java:369:4:369:5 | in : ByteBuf | Test.java:369:19:369:21 | out [post update] : ByteBuf | provenance | MaD:93 |
+| Test.java:369:4:369:5 | in : ByteBuf | Test.java:369:19:369:21 | out [post update] : ByteBuf | provenance | MaD:16 |
 | Test.java:369:19:369:21 | out [post update] : ByteBuf | Test.java:370:9:370:11 | out | provenance |  |
 | Test.java:375:26:375:51 | (...)... : CompositeByteBuf | Test.java:376:4:376:5 | in : CompositeByteBuf | provenance |  |
 | Test.java:375:44:375:51 | source(...) : Object | Test.java:375:26:375:51 | (...)... : CompositeByteBuf | provenance |  |
-| Test.java:376:4:376:5 | in : CompositeByteBuf | Test.java:376:19:376:21 | out [post update] : ByteBuf | provenance | MaD:93 |
+| Test.java:376:4:376:5 | in : CompositeByteBuf | Test.java:376:19:376:21 | out [post update] : ByteBuf | provenance | MaD:16 |
 | Test.java:376:19:376:21 | out [post update] : ByteBuf | Test.java:377:9:377:11 | out | provenance |  |
 | Test.java:382:24:382:47 | (...)... : SwappedByteBuf | Test.java:383:4:383:5 | in : SwappedByteBuf | provenance |  |
 | Test.java:382:40:382:47 | source(...) : Object | Test.java:382:24:382:47 | (...)... : SwappedByteBuf | provenance |  |
-| Test.java:383:4:383:5 | in : SwappedByteBuf | Test.java:383:19:383:21 | out [post update] : ByteBuf | provenance | MaD:93 |
+| Test.java:383:4:383:5 | in : SwappedByteBuf | Test.java:383:19:383:21 | out [post update] : ByteBuf | provenance | MaD:16 |
 | Test.java:383:19:383:21 | out [post update] : ByteBuf | Test.java:384:9:384:11 | out | provenance |  |
 | Test.java:389:25:389:49 | (...)... : AbstractByteBuf | Test.java:390:10:390:11 | in : AbstractByteBuf | provenance |  |
 | Test.java:389:42:389:49 | source(...) : Object | Test.java:389:25:389:49 | (...)... : AbstractByteBuf | provenance |  |
-| Test.java:390:10:390:11 | in : AbstractByteBuf | Test.java:390:10:390:41 | getBytes(...) : AbstractByteBuf | provenance | MaD:14 |
+| Test.java:390:10:390:11 | in : AbstractByteBuf | Test.java:390:10:390:41 | getBytes(...) : AbstractByteBuf | provenance | MaD:17 |
 | Test.java:390:10:390:41 | getBytes(...) : AbstractByteBuf | Test.java:391:9:391:11 | out | provenance |  |
 | Test.java:396:17:396:33 | (...)... : ByteBuf | Test.java:397:10:397:11 | in : ByteBuf | provenance |  |
 | Test.java:396:26:396:33 | source(...) : Object | Test.java:396:17:396:33 | (...)... : ByteBuf | provenance |  |
-| Test.java:397:10:397:11 | in : ByteBuf | Test.java:397:10:397:41 | getBytes(...) : ByteBuf | provenance | MaD:14 |
+| Test.java:397:10:397:11 | in : ByteBuf | Test.java:397:10:397:41 | getBytes(...) : ByteBuf | provenance | MaD:17 |
 | Test.java:397:10:397:41 | getBytes(...) : ByteBuf | Test.java:398:9:398:11 | out | provenance |  |
 | Test.java:403:24:403:47 | (...)... : SwappedByteBuf | Test.java:404:10:404:11 | in : SwappedByteBuf | provenance |  |
 | Test.java:403:40:403:47 | source(...) : Object | Test.java:403:24:403:47 | (...)... : SwappedByteBuf | provenance |  |
-| Test.java:404:10:404:11 | in : SwappedByteBuf | Test.java:404:10:404:41 | getBytes(...) : SwappedByteBuf | provenance | MaD:14 |
+| Test.java:404:10:404:11 | in : SwappedByteBuf | Test.java:404:10:404:41 | getBytes(...) : SwappedByteBuf | provenance | MaD:17 |
 | Test.java:404:10:404:41 | getBytes(...) : SwappedByteBuf | Test.java:405:9:405:11 | out | provenance |  |
 | Test.java:410:26:410:51 | (...)... : CompositeByteBuf | Test.java:411:10:411:11 | in : CompositeByteBuf | provenance |  |
 | Test.java:410:44:410:51 | source(...) : Object | Test.java:410:26:410:51 | (...)... : CompositeByteBuf | provenance |  |
-| Test.java:411:10:411:11 | in : CompositeByteBuf | Test.java:411:10:411:41 | getBytes(...) : CompositeByteBuf | provenance | MaD:14 |
+| Test.java:411:10:411:11 | in : CompositeByteBuf | Test.java:411:10:411:41 | getBytes(...) : CompositeByteBuf | provenance | MaD:17 |
 | Test.java:411:10:411:41 | getBytes(...) : CompositeByteBuf | Test.java:412:9:412:11 | out | provenance |  |
 | Test.java:417:17:417:33 | (...)... : ByteBuf | Test.java:418:4:418:5 | in : ByteBuf | provenance |  |
 | Test.java:417:26:417:33 | source(...) : Object | Test.java:417:17:417:33 | (...)... : ByteBuf | provenance |  |
-| Test.java:418:4:418:5 | in : ByteBuf | Test.java:418:19:418:21 | out [post update] : ByteBuf | provenance | MaD:94 |
+| Test.java:418:4:418:5 | in : ByteBuf | Test.java:418:19:418:21 | out [post update] : ByteBuf | provenance | MaD:18 |
 | Test.java:418:19:418:21 | out [post update] : ByteBuf | Test.java:419:9:419:11 | out | provenance |  |
 | Test.java:424:26:424:51 | (...)... : CompositeByteBuf | Test.java:425:4:425:5 | in : CompositeByteBuf | provenance |  |
 | Test.java:424:44:424:51 | source(...) : Object | Test.java:424:26:424:51 | (...)... : CompositeByteBuf | provenance |  |
-| Test.java:425:4:425:5 | in : CompositeByteBuf | Test.java:425:19:425:21 | out [post update] : ByteBuf | provenance | MaD:94 |
+| Test.java:425:4:425:5 | in : CompositeByteBuf | Test.java:425:19:425:21 | out [post update] : ByteBuf | provenance | MaD:18 |
 | Test.java:425:19:425:21 | out [post update] : ByteBuf | Test.java:426:9:426:11 | out | provenance |  |
 | Test.java:431:24:431:47 | (...)... : SwappedByteBuf | Test.java:432:4:432:5 | in : SwappedByteBuf | provenance |  |
 | Test.java:431:40:431:47 | source(...) : Object | Test.java:431:24:431:47 | (...)... : SwappedByteBuf | provenance |  |
-| Test.java:432:4:432:5 | in : SwappedByteBuf | Test.java:432:19:432:21 | out [post update] : ByteBuf | provenance | MaD:94 |
+| Test.java:432:4:432:5 | in : SwappedByteBuf | Test.java:432:19:432:21 | out [post update] : ByteBuf | provenance | MaD:18 |
 | Test.java:432:19:432:21 | out [post update] : ByteBuf | Test.java:433:9:433:11 | out | provenance |  |
 | Test.java:438:17:438:33 | (...)... : ByteBuf | Test.java:439:10:439:11 | in : ByteBuf | provenance |  |
 | Test.java:438:26:438:33 | source(...) : Object | Test.java:438:17:438:33 | (...)... : ByteBuf | provenance |  |
-| Test.java:439:10:439:11 | in : ByteBuf | Test.java:439:10:439:44 | getBytes(...) : ByteBuf | provenance | MaD:15 |
+| Test.java:439:10:439:11 | in : ByteBuf | Test.java:439:10:439:44 | getBytes(...) : ByteBuf | provenance | MaD:19 |
 | Test.java:439:10:439:44 | getBytes(...) : ByteBuf | Test.java:440:9:440:11 | out | provenance |  |
 | Test.java:445:24:445:47 | (...)... : SwappedByteBuf | Test.java:446:10:446:11 | in : SwappedByteBuf | provenance |  |
 | Test.java:445:40:445:47 | source(...) : Object | Test.java:445:24:445:47 | (...)... : SwappedByteBuf | provenance |  |
-| Test.java:446:10:446:11 | in : SwappedByteBuf | Test.java:446:10:446:44 | getBytes(...) : SwappedByteBuf | provenance | MaD:15 |
+| Test.java:446:10:446:11 | in : SwappedByteBuf | Test.java:446:10:446:44 | getBytes(...) : SwappedByteBuf | provenance | MaD:19 |
 | Test.java:446:10:446:44 | getBytes(...) : SwappedByteBuf | Test.java:447:9:447:11 | out | provenance |  |
 | Test.java:452:26:452:51 | (...)... : CompositeByteBuf | Test.java:453:10:453:11 | in : CompositeByteBuf | provenance |  |
 | Test.java:452:44:452:51 | source(...) : Object | Test.java:452:26:452:51 | (...)... : CompositeByteBuf | provenance |  |
-| Test.java:453:10:453:11 | in : CompositeByteBuf | Test.java:453:10:453:44 | getBytes(...) : CompositeByteBuf | provenance | MaD:15 |
+| Test.java:453:10:453:11 | in : CompositeByteBuf | Test.java:453:10:453:44 | getBytes(...) : CompositeByteBuf | provenance | MaD:19 |
 | Test.java:453:10:453:44 | getBytes(...) : CompositeByteBuf | Test.java:454:9:454:11 | out | provenance |  |
 | Test.java:459:17:459:33 | (...)... : ByteBuf | Test.java:460:4:460:5 | in : ByteBuf | provenance |  |
 | Test.java:459:26:459:33 | source(...) : Object | Test.java:459:17:459:33 | (...)... : ByteBuf | provenance |  |
-| Test.java:460:4:460:5 | in : ByteBuf | Test.java:460:19:460:21 | out [post update] : ByteBuffer | provenance | MaD:92 |
+| Test.java:460:4:460:5 | in : ByteBuf | Test.java:460:19:460:21 | out [post update] : ByteBuffer | provenance | MaD:20 |
 | Test.java:460:19:460:21 | out [post update] : ByteBuffer | Test.java:461:9:461:11 | out | provenance |  |
 | Test.java:466:26:466:51 | (...)... : CompositeByteBuf | Test.java:467:4:467:5 | in : CompositeByteBuf | provenance |  |
 | Test.java:466:44:466:51 | source(...) : Object | Test.java:466:26:466:51 | (...)... : CompositeByteBuf | provenance |  |
-| Test.java:467:4:467:5 | in : CompositeByteBuf | Test.java:467:19:467:21 | out [post update] : ByteBuffer | provenance | MaD:92 |
+| Test.java:467:4:467:5 | in : CompositeByteBuf | Test.java:467:19:467:21 | out [post update] : ByteBuffer | provenance | MaD:20 |
 | Test.java:467:19:467:21 | out [post update] : ByteBuffer | Test.java:468:9:468:11 | out | provenance |  |
 | Test.java:473:24:473:47 | (...)... : SwappedByteBuf | Test.java:474:4:474:5 | in : SwappedByteBuf | provenance |  |
 | Test.java:473:40:473:47 | source(...) : Object | Test.java:473:24:473:47 | (...)... : SwappedByteBuf | provenance |  |
-| Test.java:474:4:474:5 | in : SwappedByteBuf | Test.java:474:19:474:21 | out [post update] : ByteBuffer | provenance | MaD:92 |
+| Test.java:474:4:474:5 | in : SwappedByteBuf | Test.java:474:19:474:21 | out [post update] : ByteBuffer | provenance | MaD:20 |
 | Test.java:474:19:474:21 | out [post update] : ByteBuffer | Test.java:475:9:475:11 | out | provenance |  |
 | Test.java:480:17:480:33 | (...)... : ByteBuf | Test.java:481:10:481:11 | in : ByteBuf | provenance |  |
 | Test.java:480:26:480:33 | source(...) : Object | Test.java:480:17:480:33 | (...)... : ByteBuf | provenance |  |
-| Test.java:481:10:481:11 | in : ByteBuf | Test.java:481:10:481:41 | getBytes(...) : ByteBuf | provenance | MaD:13 |
+| Test.java:481:10:481:11 | in : ByteBuf | Test.java:481:10:481:41 | getBytes(...) : ByteBuf | provenance | MaD:21 |
 | Test.java:481:10:481:41 | getBytes(...) : ByteBuf | Test.java:482:9:482:11 | out | provenance |  |
 | Test.java:487:24:487:47 | (...)... : SwappedByteBuf | Test.java:488:10:488:11 | in : SwappedByteBuf | provenance |  |
 | Test.java:487:40:487:47 | source(...) : Object | Test.java:487:24:487:47 | (...)... : SwappedByteBuf | provenance |  |
-| Test.java:488:10:488:11 | in : SwappedByteBuf | Test.java:488:10:488:41 | getBytes(...) : SwappedByteBuf | provenance | MaD:13 |
+| Test.java:488:10:488:11 | in : SwappedByteBuf | Test.java:488:10:488:41 | getBytes(...) : SwappedByteBuf | provenance | MaD:21 |
 | Test.java:488:10:488:41 | getBytes(...) : SwappedByteBuf | Test.java:489:9:489:11 | out | provenance |  |
 | Test.java:494:26:494:51 | (...)... : CompositeByteBuf | Test.java:495:10:495:11 | in : CompositeByteBuf | provenance |  |
 | Test.java:494:44:494:51 | source(...) : Object | Test.java:494:26:494:51 | (...)... : CompositeByteBuf | provenance |  |
-| Test.java:495:10:495:11 | in : CompositeByteBuf | Test.java:495:10:495:41 | getBytes(...) : CompositeByteBuf | provenance | MaD:13 |
+| Test.java:495:10:495:11 | in : CompositeByteBuf | Test.java:495:10:495:41 | getBytes(...) : CompositeByteBuf | provenance | MaD:21 |
 | Test.java:495:10:495:41 | getBytes(...) : CompositeByteBuf | Test.java:496:9:496:11 | out | provenance |  |
 | Test.java:501:17:501:33 | (...)... : ByteBuf | Test.java:502:4:502:5 | in : ByteBuf | provenance |  |
 | Test.java:501:26:501:33 | source(...) : Object | Test.java:501:17:501:33 | (...)... : ByteBuf | provenance |  |
-| Test.java:502:4:502:5 | in : ByteBuf | Test.java:502:19:502:21 | out [post update] : FileChannel | provenance | MaD:95 |
+| Test.java:502:4:502:5 | in : ByteBuf | Test.java:502:19:502:21 | out [post update] : FileChannel | provenance | MaD:22 |
 | Test.java:502:19:502:21 | out [post update] : FileChannel | Test.java:503:9:503:11 | out | provenance |  |
 | Test.java:508:26:508:51 | (...)... : CompositeByteBuf | Test.java:509:4:509:5 | in : CompositeByteBuf | provenance |  |
 | Test.java:508:44:508:51 | source(...) : Object | Test.java:508:26:508:51 | (...)... : CompositeByteBuf | provenance |  |
-| Test.java:509:4:509:5 | in : CompositeByteBuf | Test.java:509:19:509:21 | out [post update] : FileChannel | provenance | MaD:95 |
+| Test.java:509:4:509:5 | in : CompositeByteBuf | Test.java:509:19:509:21 | out [post update] : FileChannel | provenance | MaD:22 |
 | Test.java:509:19:509:21 | out [post update] : FileChannel | Test.java:510:9:510:11 | out | provenance |  |
 | Test.java:515:24:515:47 | (...)... : SwappedByteBuf | Test.java:516:4:516:5 | in : SwappedByteBuf | provenance |  |
 | Test.java:515:40:515:47 | source(...) : Object | Test.java:515:24:515:47 | (...)... : SwappedByteBuf | provenance |  |
-| Test.java:516:4:516:5 | in : SwappedByteBuf | Test.java:516:19:516:21 | out [post update] : FileChannel | provenance | MaD:95 |
+| Test.java:516:4:516:5 | in : SwappedByteBuf | Test.java:516:19:516:21 | out [post update] : FileChannel | provenance | MaD:22 |
 | Test.java:516:19:516:21 | out [post update] : FileChannel | Test.java:517:9:517:11 | out | provenance |  |
 | Test.java:522:17:522:33 | (...)... : ByteBuf | Test.java:523:4:523:5 | in : ByteBuf | provenance |  |
 | Test.java:522:26:522:33 | source(...) : Object | Test.java:522:17:522:33 | (...)... : ByteBuf | provenance |  |
-| Test.java:523:4:523:5 | in : ByteBuf | Test.java:523:19:523:21 | out [post update] : GatheringByteChannel | provenance | MaD:96 |
+| Test.java:523:4:523:5 | in : ByteBuf | Test.java:523:19:523:21 | out [post update] : GatheringByteChannel | provenance | MaD:23 |
 | Test.java:523:19:523:21 | out [post update] : GatheringByteChannel | Test.java:524:9:524:11 | out | provenance |  |
 | Test.java:529:26:529:51 | (...)... : CompositeByteBuf | Test.java:530:4:530:5 | in : CompositeByteBuf | provenance |  |
 | Test.java:529:44:529:51 | source(...) : Object | Test.java:529:26:529:51 | (...)... : CompositeByteBuf | provenance |  |
-| Test.java:530:4:530:5 | in : CompositeByteBuf | Test.java:530:19:530:21 | out [post update] : GatheringByteChannel | provenance | MaD:96 |
+| Test.java:530:4:530:5 | in : CompositeByteBuf | Test.java:530:19:530:21 | out [post update] : GatheringByteChannel | provenance | MaD:23 |
 | Test.java:530:19:530:21 | out [post update] : GatheringByteChannel | Test.java:531:9:531:11 | out | provenance |  |
 | Test.java:536:24:536:47 | (...)... : SwappedByteBuf | Test.java:537:4:537:5 | in : SwappedByteBuf | provenance |  |
 | Test.java:536:40:536:47 | source(...) : Object | Test.java:536:24:536:47 | (...)... : SwappedByteBuf | provenance |  |
-| Test.java:537:4:537:5 | in : SwappedByteBuf | Test.java:537:19:537:21 | out [post update] : GatheringByteChannel | provenance | MaD:96 |
+| Test.java:537:4:537:5 | in : SwappedByteBuf | Test.java:537:19:537:21 | out [post update] : GatheringByteChannel | provenance | MaD:23 |
 | Test.java:537:19:537:21 | out [post update] : GatheringByteChannel | Test.java:538:9:538:11 | out | provenance |  |
 | Test.java:543:17:543:33 | (...)... : ByteBuf | Test.java:544:4:544:5 | in : ByteBuf | provenance |  |
 | Test.java:543:26:543:33 | source(...) : Object | Test.java:543:17:543:33 | (...)... : ByteBuf | provenance |  |
-| Test.java:544:4:544:5 | in : ByteBuf | Test.java:544:19:544:21 | out [post update] : OutputStream | provenance | MaD:97 |
+| Test.java:544:4:544:5 | in : ByteBuf | Test.java:544:19:544:21 | out [post update] : OutputStream | provenance | MaD:24 |
 | Test.java:544:19:544:21 | out [post update] : OutputStream | Test.java:545:9:545:11 | out | provenance |  |
 | Test.java:550:26:550:51 | (...)... : CompositeByteBuf | Test.java:551:4:551:5 | in : CompositeByteBuf | provenance |  |
 | Test.java:550:44:550:51 | source(...) : Object | Test.java:550:26:550:51 | (...)... : CompositeByteBuf | provenance |  |
-| Test.java:551:4:551:5 | in : CompositeByteBuf | Test.java:551:19:551:21 | out [post update] : OutputStream | provenance | MaD:97 |
+| Test.java:551:4:551:5 | in : CompositeByteBuf | Test.java:551:19:551:21 | out [post update] : OutputStream | provenance | MaD:24 |
 | Test.java:551:19:551:21 | out [post update] : OutputStream | Test.java:552:9:552:11 | out | provenance |  |
 | Test.java:557:24:557:47 | (...)... : SwappedByteBuf | Test.java:558:4:558:5 | in : SwappedByteBuf | provenance |  |
 | Test.java:557:40:557:47 | source(...) : Object | Test.java:557:24:557:47 | (...)... : SwappedByteBuf | provenance |  |
-| Test.java:558:4:558:5 | in : SwappedByteBuf | Test.java:558:19:558:21 | out [post update] : OutputStream | provenance | MaD:97 |
+| Test.java:558:4:558:5 | in : SwappedByteBuf | Test.java:558:19:558:21 | out [post update] : OutputStream | provenance | MaD:24 |
 | Test.java:558:19:558:21 | out [post update] : OutputStream | Test.java:559:9:559:11 | out | provenance |  |
 | Test.java:564:17:564:33 | (...)... : ByteBuf | Test.java:565:10:565:11 | in : ByteBuf | provenance |  |
 | Test.java:564:26:564:33 | source(...) : Object | Test.java:564:17:564:33 | (...)... : ByteBuf | provenance |  |
-| Test.java:565:10:565:11 | in : ByteBuf | Test.java:565:10:565:46 | getBytes(...) : ByteBuf | provenance | MaD:16 |
+| Test.java:565:10:565:11 | in : ByteBuf | Test.java:565:10:565:46 | getBytes(...) : ByteBuf | provenance | MaD:25 |
 | Test.java:565:10:565:46 | getBytes(...) : ByteBuf | Test.java:566:9:566:11 | out | provenance |  |
 | Test.java:571:24:571:47 | (...)... : SwappedByteBuf | Test.java:572:10:572:11 | in : SwappedByteBuf | provenance |  |
 | Test.java:571:40:571:47 | source(...) : Object | Test.java:571:24:571:47 | (...)... : SwappedByteBuf | provenance |  |
-| Test.java:572:10:572:11 | in : SwappedByteBuf | Test.java:572:10:572:46 | getBytes(...) : SwappedByteBuf | provenance | MaD:16 |
+| Test.java:572:10:572:11 | in : SwappedByteBuf | Test.java:572:10:572:46 | getBytes(...) : SwappedByteBuf | provenance | MaD:25 |
 | Test.java:572:10:572:46 | getBytes(...) : SwappedByteBuf | Test.java:573:9:573:11 | out | provenance |  |
 | Test.java:578:26:578:51 | (...)... : CompositeByteBuf | Test.java:579:10:579:11 | in : CompositeByteBuf | provenance |  |
 | Test.java:578:44:578:51 | source(...) : Object | Test.java:578:26:578:51 | (...)... : CompositeByteBuf | provenance |  |
-| Test.java:579:10:579:11 | in : CompositeByteBuf | Test.java:579:10:579:46 | getBytes(...) : CompositeByteBuf | provenance | MaD:16 |
+| Test.java:579:10:579:11 | in : CompositeByteBuf | Test.java:579:10:579:46 | getBytes(...) : CompositeByteBuf | provenance | MaD:25 |
 | Test.java:579:10:579:46 | getBytes(...) : CompositeByteBuf | Test.java:580:9:580:11 | out | provenance |  |
 | Test.java:585:25:585:49 | (...)... : AbstractByteBuf | Test.java:586:4:586:5 | in : AbstractByteBuf | provenance |  |
 | Test.java:585:42:585:49 | source(...) : Object | Test.java:585:25:585:49 | (...)... : AbstractByteBuf | provenance |  |
-| Test.java:586:4:586:5 | in : AbstractByteBuf | Test.java:586:19:586:21 | out [post update] : byte[] | provenance | MaD:89 |
+| Test.java:586:4:586:5 | in : AbstractByteBuf | Test.java:586:19:586:21 | out [post update] : byte[] | provenance | MaD:26 |
 | Test.java:586:19:586:21 | out [post update] : byte[] | Test.java:587:9:587:11 | out | provenance |  |
 | Test.java:592:17:592:33 | (...)... : ByteBuf | Test.java:593:4:593:5 | in : ByteBuf | provenance |  |
 | Test.java:592:26:592:33 | source(...) : Object | Test.java:592:17:592:33 | (...)... : ByteBuf | provenance |  |
-| Test.java:593:4:593:5 | in : ByteBuf | Test.java:593:19:593:21 | out [post update] : byte[] | provenance | MaD:89 |
+| Test.java:593:4:593:5 | in : ByteBuf | Test.java:593:19:593:21 | out [post update] : byte[] | provenance | MaD:26 |
 | Test.java:593:19:593:21 | out [post update] : byte[] | Test.java:594:9:594:11 | out | provenance |  |
 | Test.java:599:26:599:51 | (...)... : CompositeByteBuf | Test.java:600:4:600:5 | in : CompositeByteBuf | provenance |  |
 | Test.java:599:44:599:51 | source(...) : Object | Test.java:599:26:599:51 | (...)... : CompositeByteBuf | provenance |  |
-| Test.java:600:4:600:5 | in : CompositeByteBuf | Test.java:600:19:600:21 | out [post update] : byte[] | provenance | MaD:89 |
+| Test.java:600:4:600:5 | in : CompositeByteBuf | Test.java:600:19:600:21 | out [post update] : byte[] | provenance | MaD:26 |
 | Test.java:600:19:600:21 | out [post update] : byte[] | Test.java:601:9:601:11 | out | provenance |  |
 | Test.java:606:24:606:47 | (...)... : SwappedByteBuf | Test.java:607:4:607:5 | in : SwappedByteBuf | provenance |  |
 | Test.java:606:40:606:47 | source(...) : Object | Test.java:606:24:606:47 | (...)... : SwappedByteBuf | provenance |  |
-| Test.java:607:4:607:5 | in : SwappedByteBuf | Test.java:607:19:607:21 | out [post update] : byte[] | provenance | MaD:89 |
+| Test.java:607:4:607:5 | in : SwappedByteBuf | Test.java:607:19:607:21 | out [post update] : byte[] | provenance | MaD:26 |
 | Test.java:607:19:607:21 | out [post update] : byte[] | Test.java:608:9:608:11 | out | provenance |  |
 | Test.java:613:25:613:49 | (...)... : AbstractByteBuf | Test.java:614:10:614:11 | in : AbstractByteBuf | provenance |  |
 | Test.java:613:42:613:49 | source(...) : Object | Test.java:613:25:613:49 | (...)... : AbstractByteBuf | provenance |  |
-| Test.java:614:10:614:11 | in : AbstractByteBuf | Test.java:614:10:614:37 | getBytes(...) : AbstractByteBuf | provenance | MaD:10 |
+| Test.java:614:10:614:11 | in : AbstractByteBuf | Test.java:614:10:614:37 | getBytes(...) : AbstractByteBuf | provenance | MaD:27 |
 | Test.java:614:10:614:37 | getBytes(...) : AbstractByteBuf | Test.java:615:9:615:11 | out | provenance |  |
 | Test.java:620:17:620:33 | (...)... : ByteBuf | Test.java:621:10:621:11 | in : ByteBuf | provenance |  |
 | Test.java:620:26:620:33 | source(...) : Object | Test.java:620:17:620:33 | (...)... : ByteBuf | provenance |  |
-| Test.java:621:10:621:11 | in : ByteBuf | Test.java:621:10:621:37 | getBytes(...) : ByteBuf | provenance | MaD:10 |
+| Test.java:621:10:621:11 | in : ByteBuf | Test.java:621:10:621:37 | getBytes(...) : ByteBuf | provenance | MaD:27 |
 | Test.java:621:10:621:37 | getBytes(...) : ByteBuf | Test.java:622:9:622:11 | out | provenance |  |
 | Test.java:627:24:627:47 | (...)... : SwappedByteBuf | Test.java:628:10:628:11 | in : SwappedByteBuf | provenance |  |
 | Test.java:627:40:627:47 | source(...) : Object | Test.java:627:24:627:47 | (...)... : SwappedByteBuf | provenance |  |
-| Test.java:628:10:628:11 | in : SwappedByteBuf | Test.java:628:10:628:37 | getBytes(...) : SwappedByteBuf | provenance | MaD:10 |
+| Test.java:628:10:628:11 | in : SwappedByteBuf | Test.java:628:10:628:37 | getBytes(...) : SwappedByteBuf | provenance | MaD:27 |
 | Test.java:628:10:628:37 | getBytes(...) : SwappedByteBuf | Test.java:629:9:629:11 | out | provenance |  |
 | Test.java:634:26:634:51 | (...)... : CompositeByteBuf | Test.java:635:10:635:11 | in : CompositeByteBuf | provenance |  |
 | Test.java:634:44:634:51 | source(...) : Object | Test.java:634:26:634:51 | (...)... : CompositeByteBuf | provenance |  |
-| Test.java:635:10:635:11 | in : CompositeByteBuf | Test.java:635:10:635:37 | getBytes(...) : CompositeByteBuf | provenance | MaD:10 |
+| Test.java:635:10:635:11 | in : CompositeByteBuf | Test.java:635:10:635:37 | getBytes(...) : CompositeByteBuf | provenance | MaD:27 |
 | Test.java:635:10:635:37 | getBytes(...) : CompositeByteBuf | Test.java:636:9:636:11 | out | provenance |  |
 | Test.java:641:17:641:33 | (...)... : ByteBuf | Test.java:642:4:642:5 | in : ByteBuf | provenance |  |
 | Test.java:641:26:641:33 | source(...) : Object | Test.java:641:17:641:33 | (...)... : ByteBuf | provenance |  |
-| Test.java:642:4:642:5 | in : ByteBuf | Test.java:642:19:642:21 | out [post update] : byte[] | provenance | MaD:90 |
+| Test.java:642:4:642:5 | in : ByteBuf | Test.java:642:19:642:21 | out [post update] : byte[] | provenance | MaD:28 |
 | Test.java:642:19:642:21 | out [post update] : byte[] | Test.java:643:9:643:11 | out | provenance |  |
 | Test.java:648:26:648:51 | (...)... : CompositeByteBuf | Test.java:649:4:649:5 | in : CompositeByteBuf | provenance |  |
 | Test.java:648:44:648:51 | source(...) : Object | Test.java:648:26:648:51 | (...)... : CompositeByteBuf | provenance |  |
-| Test.java:649:4:649:5 | in : CompositeByteBuf | Test.java:649:19:649:21 | out [post update] : byte[] | provenance | MaD:90 |
+| Test.java:649:4:649:5 | in : CompositeByteBuf | Test.java:649:19:649:21 | out [post update] : byte[] | provenance | MaD:28 |
 | Test.java:649:19:649:21 | out [post update] : byte[] | Test.java:650:9:650:11 | out | provenance |  |
 | Test.java:655:24:655:47 | (...)... : SwappedByteBuf | Test.java:656:4:656:5 | in : SwappedByteBuf | provenance |  |
 | Test.java:655:40:655:47 | source(...) : Object | Test.java:655:24:655:47 | (...)... : SwappedByteBuf | provenance |  |
-| Test.java:656:4:656:5 | in : SwappedByteBuf | Test.java:656:19:656:21 | out [post update] : byte[] | provenance | MaD:90 |
+| Test.java:656:4:656:5 | in : SwappedByteBuf | Test.java:656:19:656:21 | out [post update] : byte[] | provenance | MaD:28 |
 | Test.java:656:19:656:21 | out [post update] : byte[] | Test.java:657:9:657:11 | out | provenance |  |
 | Test.java:662:17:662:33 | (...)... : ByteBuf | Test.java:663:10:663:11 | in : ByteBuf | provenance |  |
 | Test.java:662:26:662:33 | source(...) : Object | Test.java:662:17:662:33 | (...)... : ByteBuf | provenance |  |
-| Test.java:663:10:663:11 | in : ByteBuf | Test.java:663:10:663:43 | getBytes(...) : ByteBuf | provenance | MaD:11 |
+| Test.java:663:10:663:11 | in : ByteBuf | Test.java:663:10:663:43 | getBytes(...) : ByteBuf | provenance | MaD:29 |
 | Test.java:663:10:663:43 | getBytes(...) : ByteBuf | Test.java:664:9:664:11 | out | provenance |  |
 | Test.java:669:24:669:47 | (...)... : SwappedByteBuf | Test.java:670:10:670:11 | in : SwappedByteBuf | provenance |  |
 | Test.java:669:40:669:47 | source(...) : Object | Test.java:669:24:669:47 | (...)... : SwappedByteBuf | provenance |  |
-| Test.java:670:10:670:11 | in : SwappedByteBuf | Test.java:670:10:670:43 | getBytes(...) : SwappedByteBuf | provenance | MaD:11 |
+| Test.java:670:10:670:11 | in : SwappedByteBuf | Test.java:670:10:670:43 | getBytes(...) : SwappedByteBuf | provenance | MaD:29 |
 | Test.java:670:10:670:43 | getBytes(...) : SwappedByteBuf | Test.java:671:9:671:11 | out | provenance |  |
 | Test.java:676:26:676:51 | (...)... : CompositeByteBuf | Test.java:677:10:677:11 | in : CompositeByteBuf | provenance |  |
 | Test.java:676:44:676:51 | source(...) : Object | Test.java:676:26:676:51 | (...)... : CompositeByteBuf | provenance |  |
-| Test.java:677:10:677:11 | in : CompositeByteBuf | Test.java:677:10:677:43 | getBytes(...) : CompositeByteBuf | provenance | MaD:11 |
+| Test.java:677:10:677:11 | in : CompositeByteBuf | Test.java:677:10:677:43 | getBytes(...) : CompositeByteBuf | provenance | MaD:29 |
 | Test.java:677:10:677:43 | getBytes(...) : CompositeByteBuf | Test.java:678:9:678:11 | out | provenance |  |
 | Test.java:683:25:683:49 | (...)... : AbstractByteBuf | Test.java:684:10:684:11 | in : AbstractByteBuf | provenance |  |
 | Test.java:683:42:683:49 | source(...) : Object | Test.java:683:25:683:49 | (...)... : AbstractByteBuf | provenance |  |
-| Test.java:684:10:684:11 | in : AbstractByteBuf | Test.java:684:10:684:22 | getChar(...) : Number | provenance | MaD:98 |
+| Test.java:684:10:684:11 | in : AbstractByteBuf | Test.java:684:10:684:22 | getChar(...) : Number | provenance | MaD:30 |
 | Test.java:684:10:684:22 | getChar(...) : Number | Test.java:685:9:685:11 | out | provenance |  |
 | Test.java:690:17:690:33 | (...)... : ByteBuf | Test.java:691:10:691:11 | in : ByteBuf | provenance |  |
 | Test.java:690:26:690:33 | source(...) : Object | Test.java:690:17:690:33 | (...)... : ByteBuf | provenance |  |
-| Test.java:691:10:691:11 | in : ByteBuf | Test.java:691:10:691:22 | getChar(...) : Number | provenance | MaD:98 |
+| Test.java:691:10:691:11 | in : ByteBuf | Test.java:691:10:691:22 | getChar(...) : Number | provenance | MaD:30 |
 | Test.java:691:10:691:22 | getChar(...) : Number | Test.java:692:9:692:11 | out | provenance |  |
 | Test.java:697:24:697:47 | (...)... : SwappedByteBuf | Test.java:698:10:698:11 | in : SwappedByteBuf | provenance |  |
 | Test.java:697:40:697:47 | source(...) : Object | Test.java:697:24:697:47 | (...)... : SwappedByteBuf | provenance |  |
-| Test.java:698:10:698:11 | in : SwappedByteBuf | Test.java:698:10:698:22 | getChar(...) : Number | provenance | MaD:98 |
+| Test.java:698:10:698:11 | in : SwappedByteBuf | Test.java:698:10:698:22 | getChar(...) : Number | provenance | MaD:30 |
 | Test.java:698:10:698:22 | getChar(...) : Number | Test.java:699:9:699:11 | out | provenance |  |
 | Test.java:704:25:704:49 | (...)... : AbstractByteBuf | Test.java:705:10:705:11 | in : AbstractByteBuf | provenance |  |
 | Test.java:704:42:704:49 | source(...) : Object | Test.java:704:25:704:49 | (...)... : AbstractByteBuf | provenance |  |
-| Test.java:705:10:705:11 | in : AbstractByteBuf | Test.java:705:10:705:39 | getCharSequence(...) : CharSequence | provenance | MaD:99 |
+| Test.java:705:10:705:11 | in : AbstractByteBuf | Test.java:705:10:705:39 | getCharSequence(...) : CharSequence | provenance | MaD:31 |
 | Test.java:705:10:705:39 | getCharSequence(...) : CharSequence | Test.java:706:9:706:11 | out | provenance |  |
 | Test.java:711:17:711:33 | (...)... : ByteBuf | Test.java:712:10:712:11 | in : ByteBuf | provenance |  |
 | Test.java:711:26:711:33 | source(...) : Object | Test.java:711:17:711:33 | (...)... : ByteBuf | provenance |  |
-| Test.java:712:10:712:11 | in : ByteBuf | Test.java:712:10:712:39 | getCharSequence(...) : CharSequence | provenance | MaD:99 |
+| Test.java:712:10:712:11 | in : ByteBuf | Test.java:712:10:712:39 | getCharSequence(...) : CharSequence | provenance | MaD:31 |
 | Test.java:712:10:712:39 | getCharSequence(...) : CharSequence | Test.java:713:9:713:11 | out | provenance |  |
 | Test.java:718:24:718:47 | (...)... : SwappedByteBuf | Test.java:719:10:719:11 | in : SwappedByteBuf | provenance |  |
 | Test.java:718:40:718:47 | source(...) : Object | Test.java:718:24:718:47 | (...)... : SwappedByteBuf | provenance |  |
-| Test.java:719:10:719:11 | in : SwappedByteBuf | Test.java:719:10:719:39 | getCharSequence(...) : CharSequence | provenance | MaD:99 |
+| Test.java:719:10:719:11 | in : SwappedByteBuf | Test.java:719:10:719:39 | getCharSequence(...) : CharSequence | provenance | MaD:31 |
 | Test.java:719:10:719:39 | getCharSequence(...) : CharSequence | Test.java:720:9:720:11 | out | provenance |  |
 | Test.java:725:25:725:49 | (...)... : AbstractByteBuf | Test.java:726:10:726:11 | in : AbstractByteBuf | provenance |  |
 | Test.java:725:42:725:49 | source(...) : Object | Test.java:725:25:725:49 | (...)... : AbstractByteBuf | provenance |  |
-| Test.java:726:10:726:11 | in : AbstractByteBuf | Test.java:726:10:726:29 | markReaderIndex(...) : AbstractByteBuf | provenance | MaD:17 |
+| Test.java:726:10:726:11 | in : AbstractByteBuf | Test.java:726:10:726:29 | markReaderIndex(...) : AbstractByteBuf | provenance | MaD:32 |
 | Test.java:726:10:726:29 | markReaderIndex(...) : AbstractByteBuf | Test.java:727:9:727:11 | out | provenance |  |
 | Test.java:732:17:732:33 | (...)... : ByteBuf | Test.java:733:10:733:11 | in : ByteBuf | provenance |  |
 | Test.java:732:26:732:33 | source(...) : Object | Test.java:732:17:732:33 | (...)... : ByteBuf | provenance |  |
-| Test.java:733:10:733:11 | in : ByteBuf | Test.java:733:10:733:29 | markReaderIndex(...) : ByteBuf | provenance | MaD:17 |
+| Test.java:733:10:733:11 | in : ByteBuf | Test.java:733:10:733:29 | markReaderIndex(...) : ByteBuf | provenance | MaD:32 |
 | Test.java:733:10:733:29 | markReaderIndex(...) : ByteBuf | Test.java:734:9:734:11 | out | provenance |  |
 | Test.java:739:24:739:47 | (...)... : SwappedByteBuf | Test.java:740:10:740:11 | in : SwappedByteBuf | provenance |  |
 | Test.java:739:40:739:47 | source(...) : Object | Test.java:739:24:739:47 | (...)... : SwappedByteBuf | provenance |  |
-| Test.java:740:10:740:11 | in : SwappedByteBuf | Test.java:740:10:740:29 | markReaderIndex(...) : SwappedByteBuf | provenance | MaD:17 |
+| Test.java:740:10:740:11 | in : SwappedByteBuf | Test.java:740:10:740:29 | markReaderIndex(...) : SwappedByteBuf | provenance | MaD:32 |
 | Test.java:740:10:740:29 | markReaderIndex(...) : SwappedByteBuf | Test.java:741:9:741:11 | out | provenance |  |
 | Test.java:746:26:746:51 | (...)... : CompositeByteBuf | Test.java:747:10:747:11 | in : CompositeByteBuf | provenance |  |
 | Test.java:746:44:746:51 | source(...) : Object | Test.java:746:26:746:51 | (...)... : CompositeByteBuf | provenance |  |
-| Test.java:747:10:747:11 | in : CompositeByteBuf | Test.java:747:10:747:29 | markReaderIndex(...) : CompositeByteBuf | provenance | MaD:17 |
+| Test.java:747:10:747:11 | in : CompositeByteBuf | Test.java:747:10:747:29 | markReaderIndex(...) : CompositeByteBuf | provenance | MaD:32 |
 | Test.java:747:10:747:29 | markReaderIndex(...) : CompositeByteBuf | Test.java:748:9:748:11 | out | provenance |  |
 | Test.java:753:25:753:49 | (...)... : AbstractByteBuf | Test.java:754:10:754:11 | in : AbstractByteBuf | provenance |  |
 | Test.java:753:42:753:49 | source(...) : Object | Test.java:753:25:753:49 | (...)... : AbstractByteBuf | provenance |  |
-| Test.java:754:10:754:11 | in : AbstractByteBuf | Test.java:754:10:754:29 | markWriterIndex(...) : AbstractByteBuf | provenance | MaD:18 |
+| Test.java:754:10:754:11 | in : AbstractByteBuf | Test.java:754:10:754:29 | markWriterIndex(...) : AbstractByteBuf | provenance | MaD:33 |
 | Test.java:754:10:754:29 | markWriterIndex(...) : AbstractByteBuf | Test.java:755:9:755:11 | out | provenance |  |
 | Test.java:760:17:760:33 | (...)... : ByteBuf | Test.java:761:10:761:11 | in : ByteBuf | provenance |  |
 | Test.java:760:26:760:33 | source(...) : Object | Test.java:760:17:760:33 | (...)... : ByteBuf | provenance |  |
-| Test.java:761:10:761:11 | in : ByteBuf | Test.java:761:10:761:29 | markWriterIndex(...) : ByteBuf | provenance | MaD:18 |
+| Test.java:761:10:761:11 | in : ByteBuf | Test.java:761:10:761:29 | markWriterIndex(...) : ByteBuf | provenance | MaD:33 |
 | Test.java:761:10:761:29 | markWriterIndex(...) : ByteBuf | Test.java:762:9:762:11 | out | provenance |  |
 | Test.java:767:24:767:47 | (...)... : SwappedByteBuf | Test.java:768:10:768:11 | in : SwappedByteBuf | provenance |  |
 | Test.java:767:40:767:47 | source(...) : Object | Test.java:767:24:767:47 | (...)... : SwappedByteBuf | provenance |  |
-| Test.java:768:10:768:11 | in : SwappedByteBuf | Test.java:768:10:768:29 | markWriterIndex(...) : SwappedByteBuf | provenance | MaD:18 |
+| Test.java:768:10:768:11 | in : SwappedByteBuf | Test.java:768:10:768:29 | markWriterIndex(...) : SwappedByteBuf | provenance | MaD:33 |
 | Test.java:768:10:768:29 | markWriterIndex(...) : SwappedByteBuf | Test.java:769:9:769:11 | out | provenance |  |
 | Test.java:774:26:774:51 | (...)... : CompositeByteBuf | Test.java:775:10:775:11 | in : CompositeByteBuf | provenance |  |
 | Test.java:774:44:774:51 | source(...) : Object | Test.java:774:26:774:51 | (...)... : CompositeByteBuf | provenance |  |
-| Test.java:775:10:775:11 | in : CompositeByteBuf | Test.java:775:10:775:29 | markWriterIndex(...) : CompositeByteBuf | provenance | MaD:18 |
+| Test.java:775:10:775:11 | in : CompositeByteBuf | Test.java:775:10:775:29 | markWriterIndex(...) : CompositeByteBuf | provenance | MaD:33 |
 | Test.java:775:10:775:29 | markWriterIndex(...) : CompositeByteBuf | Test.java:776:9:776:11 | out | provenance |  |
 | Test.java:781:25:781:49 | (...)... : AbstractByteBuf | Test.java:782:10:782:11 | in : AbstractByteBuf | provenance |  |
 | Test.java:781:42:781:49 | source(...) : Object | Test.java:781:25:781:49 | (...)... : AbstractByteBuf | provenance |  |
-| Test.java:782:10:782:11 | in : AbstractByteBuf | Test.java:782:10:782:23 | nioBuffer(...) : ByteBuffer | provenance | MaD:19 |
+| Test.java:782:10:782:11 | in : AbstractByteBuf | Test.java:782:10:782:23 | nioBuffer(...) : ByteBuffer | provenance | MaD:34 |
 | Test.java:782:10:782:23 | nioBuffer(...) : ByteBuffer | Test.java:783:9:783:11 | out | provenance |  |
 | Test.java:788:17:788:33 | (...)... : ByteBuf | Test.java:789:10:789:11 | in : ByteBuf | provenance |  |
 | Test.java:788:26:788:33 | source(...) : Object | Test.java:788:17:788:33 | (...)... : ByteBuf | provenance |  |
-| Test.java:789:10:789:11 | in : ByteBuf | Test.java:789:10:789:23 | nioBuffer(...) : ByteBuffer | provenance | MaD:19 |
+| Test.java:789:10:789:11 | in : ByteBuf | Test.java:789:10:789:23 | nioBuffer(...) : ByteBuffer | provenance | MaD:34 |
 | Test.java:789:10:789:23 | nioBuffer(...) : ByteBuffer | Test.java:790:9:790:11 | out | provenance |  |
 | Test.java:795:17:795:33 | (...)... : ByteBuf | Test.java:796:10:796:11 | in : ByteBuf | provenance |  |
 | Test.java:795:26:795:33 | source(...) : Object | Test.java:795:17:795:33 | (...)... : ByteBuf | provenance |  |
-| Test.java:796:10:796:11 | in : ByteBuf | Test.java:796:10:796:27 | nioBuffer(...) : ByteBuffer | provenance | MaD:19 |
+| Test.java:796:10:796:11 | in : ByteBuf | Test.java:796:10:796:27 | nioBuffer(...) : ByteBuffer | provenance | MaD:34 |
 | Test.java:796:10:796:27 | nioBuffer(...) : ByteBuffer | Test.java:797:9:797:11 | out | provenance |  |
 | Test.java:802:26:802:51 | (...)... : CompositeByteBuf | Test.java:803:10:803:11 | in : CompositeByteBuf | provenance |  |
 | Test.java:802:44:802:51 | source(...) : Object | Test.java:802:26:802:51 | (...)... : CompositeByteBuf | provenance |  |
-| Test.java:803:10:803:11 | in : CompositeByteBuf | Test.java:803:10:803:27 | nioBuffer(...) : ByteBuffer | provenance | MaD:19 |
+| Test.java:803:10:803:11 | in : CompositeByteBuf | Test.java:803:10:803:27 | nioBuffer(...) : ByteBuffer | provenance | MaD:34 |
 | Test.java:803:10:803:27 | nioBuffer(...) : ByteBuffer | Test.java:804:9:804:11 | out | provenance |  |
 | Test.java:809:24:809:47 | (...)... : SwappedByteBuf | Test.java:810:10:810:11 | in : SwappedByteBuf | provenance |  |
 | Test.java:809:40:809:47 | source(...) : Object | Test.java:809:24:809:47 | (...)... : SwappedByteBuf | provenance |  |
-| Test.java:810:10:810:11 | in : SwappedByteBuf | Test.java:810:10:810:23 | nioBuffer(...) : ByteBuffer | provenance | MaD:19 |
+| Test.java:810:10:810:11 | in : SwappedByteBuf | Test.java:810:10:810:23 | nioBuffer(...) : ByteBuffer | provenance | MaD:34 |
 | Test.java:810:10:810:23 | nioBuffer(...) : ByteBuffer | Test.java:811:9:811:11 | out | provenance |  |
 | Test.java:816:24:816:47 | (...)... : SwappedByteBuf | Test.java:817:10:817:11 | in : SwappedByteBuf | provenance |  |
 | Test.java:816:40:816:47 | source(...) : Object | Test.java:816:24:816:47 | (...)... : SwappedByteBuf | provenance |  |
-| Test.java:817:10:817:11 | in : SwappedByteBuf | Test.java:817:10:817:27 | nioBuffer(...) : ByteBuffer | provenance | MaD:19 |
+| Test.java:817:10:817:11 | in : SwappedByteBuf | Test.java:817:10:817:27 | nioBuffer(...) : ByteBuffer | provenance | MaD:34 |
 | Test.java:817:10:817:27 | nioBuffer(...) : ByteBuffer | Test.java:818:9:818:11 | out | provenance |  |
 | Test.java:823:25:823:49 | (...)... : AbstractByteBuf | Test.java:824:10:824:11 | in : AbstractByteBuf | provenance |  |
 | Test.java:823:42:823:49 | source(...) : Object | Test.java:823:25:823:49 | (...)... : AbstractByteBuf | provenance |  |
-| Test.java:824:10:824:11 | in : AbstractByteBuf | Test.java:824:10:824:24 | nioBuffers(...) : ByteBuffer[] | provenance | MaD:20 |
+| Test.java:824:10:824:11 | in : AbstractByteBuf | Test.java:824:10:824:24 | nioBuffers(...) : ByteBuffer[] | provenance | MaD:35 |
 | Test.java:824:10:824:24 | nioBuffers(...) : ByteBuffer[] | Test.java:825:9:825:11 | out | provenance |  |
 | Test.java:830:17:830:33 | (...)... : ByteBuf | Test.java:831:10:831:11 | in : ByteBuf | provenance |  |
 | Test.java:830:26:830:33 | source(...) : Object | Test.java:830:17:830:33 | (...)... : ByteBuf | provenance |  |
-| Test.java:831:10:831:11 | in : ByteBuf | Test.java:831:10:831:24 | nioBuffers(...) : ByteBuffer[] | provenance | MaD:20 |
+| Test.java:831:10:831:11 | in : ByteBuf | Test.java:831:10:831:24 | nioBuffers(...) : ByteBuffer[] | provenance | MaD:35 |
 | Test.java:831:10:831:24 | nioBuffers(...) : ByteBuffer[] | Test.java:832:9:832:11 | out | provenance |  |
 | Test.java:837:17:837:33 | (...)... : ByteBuf | Test.java:838:10:838:11 | in : ByteBuf | provenance |  |
 | Test.java:837:26:837:33 | source(...) : Object | Test.java:837:17:837:33 | (...)... : ByteBuf | provenance |  |
-| Test.java:838:10:838:11 | in : ByteBuf | Test.java:838:10:838:28 | nioBuffers(...) : ByteBuffer[] | provenance | MaD:20 |
+| Test.java:838:10:838:11 | in : ByteBuf | Test.java:838:10:838:28 | nioBuffers(...) : ByteBuffer[] | provenance | MaD:35 |
 | Test.java:838:10:838:28 | nioBuffers(...) : ByteBuffer[] | Test.java:839:9:839:11 | out | provenance |  |
 | Test.java:844:26:844:51 | (...)... : CompositeByteBuf | Test.java:845:10:845:11 | in : CompositeByteBuf | provenance |  |
 | Test.java:844:44:844:51 | source(...) : Object | Test.java:844:26:844:51 | (...)... : CompositeByteBuf | provenance |  |
-| Test.java:845:10:845:11 | in : CompositeByteBuf | Test.java:845:10:845:24 | nioBuffers(...) : ByteBuffer[] | provenance | MaD:20 |
+| Test.java:845:10:845:11 | in : CompositeByteBuf | Test.java:845:10:845:24 | nioBuffers(...) : ByteBuffer[] | provenance | MaD:35 |
 | Test.java:845:10:845:24 | nioBuffers(...) : ByteBuffer[] | Test.java:846:9:846:11 | out | provenance |  |
 | Test.java:851:26:851:51 | (...)... : CompositeByteBuf | Test.java:852:10:852:11 | in : CompositeByteBuf | provenance |  |
 | Test.java:851:44:851:51 | source(...) : Object | Test.java:851:26:851:51 | (...)... : CompositeByteBuf | provenance |  |
-| Test.java:852:10:852:11 | in : CompositeByteBuf | Test.java:852:10:852:28 | nioBuffers(...) : ByteBuffer[] | provenance | MaD:20 |
+| Test.java:852:10:852:11 | in : CompositeByteBuf | Test.java:852:10:852:28 | nioBuffers(...) : ByteBuffer[] | provenance | MaD:35 |
 | Test.java:852:10:852:28 | nioBuffers(...) : ByteBuffer[] | Test.java:853:9:853:11 | out | provenance |  |
 | Test.java:858:24:858:47 | (...)... : SwappedByteBuf | Test.java:859:10:859:11 | in : SwappedByteBuf | provenance |  |
 | Test.java:858:40:858:47 | source(...) : Object | Test.java:858:24:858:47 | (...)... : SwappedByteBuf | provenance |  |
-| Test.java:859:10:859:11 | in : SwappedByteBuf | Test.java:859:10:859:24 | nioBuffers(...) : ByteBuffer[] | provenance | MaD:20 |
+| Test.java:859:10:859:11 | in : SwappedByteBuf | Test.java:859:10:859:24 | nioBuffers(...) : ByteBuffer[] | provenance | MaD:35 |
 | Test.java:859:10:859:24 | nioBuffers(...) : ByteBuffer[] | Test.java:860:9:860:11 | out | provenance |  |
 | Test.java:865:24:865:47 | (...)... : SwappedByteBuf | Test.java:866:10:866:11 | in : SwappedByteBuf | provenance |  |
 | Test.java:865:40:865:47 | source(...) : Object | Test.java:865:24:865:47 | (...)... : SwappedByteBuf | provenance |  |
-| Test.java:866:10:866:11 | in : SwappedByteBuf | Test.java:866:10:866:28 | nioBuffers(...) : ByteBuffer[] | provenance | MaD:20 |
+| Test.java:866:10:866:11 | in : SwappedByteBuf | Test.java:866:10:866:28 | nioBuffers(...) : ByteBuffer[] | provenance | MaD:35 |
 | Test.java:866:10:866:28 | nioBuffers(...) : ByteBuffer[] | Test.java:867:9:867:11 | out | provenance |  |
 | Test.java:872:25:872:49 | (...)... : AbstractByteBuf | Test.java:873:10:873:11 | in : AbstractByteBuf | provenance |  |
 | Test.java:872:42:872:49 | source(...) : Object | Test.java:872:25:872:49 | (...)... : AbstractByteBuf | provenance |  |
-| Test.java:873:10:873:11 | in : AbstractByteBuf | Test.java:873:10:873:23 | order(...) : ByteBuf | provenance | MaD:21 |
+| Test.java:873:10:873:11 | in : AbstractByteBuf | Test.java:873:10:873:23 | order(...) : ByteBuf | provenance | MaD:36 |
 | Test.java:873:10:873:23 | order(...) : ByteBuf | Test.java:874:9:874:11 | out | provenance |  |
 | Test.java:879:17:879:33 | (...)... : ByteBuf | Test.java:880:10:880:11 | in : ByteBuf | provenance |  |
 | Test.java:879:26:879:33 | source(...) : Object | Test.java:879:17:879:33 | (...)... : ByteBuf | provenance |  |
-| Test.java:880:10:880:11 | in : ByteBuf | Test.java:880:10:880:23 | order(...) : ByteBuf | provenance | MaD:21 |
+| Test.java:880:10:880:11 | in : ByteBuf | Test.java:880:10:880:23 | order(...) : ByteBuf | provenance | MaD:36 |
 | Test.java:880:10:880:23 | order(...) : ByteBuf | Test.java:881:9:881:11 | out | provenance |  |
 | Test.java:886:24:886:47 | (...)... : SwappedByteBuf | Test.java:887:10:887:11 | in : SwappedByteBuf | provenance |  |
 | Test.java:886:40:886:47 | source(...) : Object | Test.java:886:24:886:47 | (...)... : SwappedByteBuf | provenance |  |
-| Test.java:887:10:887:11 | in : SwappedByteBuf | Test.java:887:10:887:23 | order(...) : ByteBuf | provenance | MaD:21 |
+| Test.java:887:10:887:11 | in : SwappedByteBuf | Test.java:887:10:887:23 | order(...) : ByteBuf | provenance | MaD:36 |
 | Test.java:887:10:887:23 | order(...) : ByteBuf | Test.java:888:9:888:11 | out | provenance |  |
 | Test.java:893:25:893:49 | (...)... : AbstractByteBuf | Test.java:894:4:894:5 | in : AbstractByteBuf | provenance |  |
 | Test.java:893:42:893:49 | source(...) : Object | Test.java:893:25:893:49 | (...)... : AbstractByteBuf | provenance |  |
-| Test.java:894:4:894:5 | in : AbstractByteBuf | Test.java:894:17:894:19 | out [post update] : ByteBuf | provenance | MaD:102 |
+| Test.java:894:4:894:5 | in : AbstractByteBuf | Test.java:894:17:894:19 | out [post update] : ByteBuf | provenance | MaD:37 |
 | Test.java:894:17:894:19 | out [post update] : ByteBuf | Test.java:895:9:895:11 | out | provenance |  |
 | Test.java:900:17:900:33 | (...)... : ByteBuf | Test.java:901:4:901:5 | in : ByteBuf | provenance |  |
 | Test.java:900:26:900:33 | source(...) : Object | Test.java:900:17:900:33 | (...)... : ByteBuf | provenance |  |
-| Test.java:901:4:901:5 | in : ByteBuf | Test.java:901:17:901:19 | out [post update] : ByteBuf | provenance | MaD:102 |
+| Test.java:901:4:901:5 | in : ByteBuf | Test.java:901:17:901:19 | out [post update] : ByteBuf | provenance | MaD:37 |
 | Test.java:901:17:901:19 | out [post update] : ByteBuf | Test.java:902:9:902:11 | out | provenance |  |
 | Test.java:907:26:907:51 | (...)... : CompositeByteBuf | Test.java:908:4:908:5 | in : CompositeByteBuf | provenance |  |
 | Test.java:907:44:907:51 | source(...) : Object | Test.java:907:26:907:51 | (...)... : CompositeByteBuf | provenance |  |
-| Test.java:908:4:908:5 | in : CompositeByteBuf | Test.java:908:17:908:19 | out [post update] : ByteBuf | provenance | MaD:102 |
+| Test.java:908:4:908:5 | in : CompositeByteBuf | Test.java:908:17:908:19 | out [post update] : ByteBuf | provenance | MaD:37 |
 | Test.java:908:17:908:19 | out [post update] : ByteBuf | Test.java:909:9:909:11 | out | provenance |  |
 | Test.java:914:24:914:47 | (...)... : SwappedByteBuf | Test.java:915:4:915:5 | in : SwappedByteBuf | provenance |  |
 | Test.java:914:40:914:47 | source(...) : Object | Test.java:914:24:914:47 | (...)... : SwappedByteBuf | provenance |  |
-| Test.java:915:4:915:5 | in : SwappedByteBuf | Test.java:915:17:915:19 | out [post update] : ByteBuf | provenance | MaD:102 |
+| Test.java:915:4:915:5 | in : SwappedByteBuf | Test.java:915:17:915:19 | out [post update] : ByteBuf | provenance | MaD:37 |
 | Test.java:915:17:915:19 | out [post update] : ByteBuf | Test.java:916:9:916:11 | out | provenance |  |
 | Test.java:921:25:921:49 | (...)... : AbstractByteBuf | Test.java:922:10:922:11 | in : AbstractByteBuf | provenance |  |
 | Test.java:921:42:921:49 | source(...) : Object | Test.java:921:25:921:49 | (...)... : AbstractByteBuf | provenance |  |
-| Test.java:922:10:922:11 | in : AbstractByteBuf | Test.java:922:10:922:36 | readBytes(...) : AbstractByteBuf | provenance | MaD:24 |
+| Test.java:922:10:922:11 | in : AbstractByteBuf | Test.java:922:10:922:36 | readBytes(...) : AbstractByteBuf | provenance | MaD:38 |
 | Test.java:922:10:922:36 | readBytes(...) : AbstractByteBuf | Test.java:923:9:923:11 | out | provenance |  |
 | Test.java:928:17:928:33 | (...)... : ByteBuf | Test.java:929:10:929:11 | in : ByteBuf | provenance |  |
 | Test.java:928:26:928:33 | source(...) : Object | Test.java:928:17:928:33 | (...)... : ByteBuf | provenance |  |
-| Test.java:929:10:929:11 | in : ByteBuf | Test.java:929:10:929:36 | readBytes(...) : ByteBuf | provenance | MaD:24 |
+| Test.java:929:10:929:11 | in : ByteBuf | Test.java:929:10:929:36 | readBytes(...) : ByteBuf | provenance | MaD:38 |
 | Test.java:929:10:929:36 | readBytes(...) : ByteBuf | Test.java:930:9:930:11 | out | provenance |  |
 | Test.java:935:24:935:47 | (...)... : SwappedByteBuf | Test.java:936:10:936:11 | in : SwappedByteBuf | provenance |  |
 | Test.java:935:40:935:47 | source(...) : Object | Test.java:935:24:935:47 | (...)... : SwappedByteBuf | provenance |  |
-| Test.java:936:10:936:11 | in : SwappedByteBuf | Test.java:936:10:936:36 | readBytes(...) : SwappedByteBuf | provenance | MaD:24 |
+| Test.java:936:10:936:11 | in : SwappedByteBuf | Test.java:936:10:936:36 | readBytes(...) : SwappedByteBuf | provenance | MaD:38 |
 | Test.java:936:10:936:36 | readBytes(...) : SwappedByteBuf | Test.java:937:9:937:11 | out | provenance |  |
 | Test.java:942:26:942:51 | (...)... : CompositeByteBuf | Test.java:943:10:943:11 | in : CompositeByteBuf | provenance |  |
 | Test.java:942:44:942:51 | source(...) : Object | Test.java:942:26:942:51 | (...)... : CompositeByteBuf | provenance |  |
-| Test.java:943:10:943:11 | in : CompositeByteBuf | Test.java:943:10:943:36 | readBytes(...) : CompositeByteBuf | provenance | MaD:24 |
+| Test.java:943:10:943:11 | in : CompositeByteBuf | Test.java:943:10:943:36 | readBytes(...) : CompositeByteBuf | provenance | MaD:38 |
 | Test.java:943:10:943:36 | readBytes(...) : CompositeByteBuf | Test.java:944:9:944:11 | out | provenance |  |
 | Test.java:949:25:949:49 | (...)... : AbstractByteBuf | Test.java:950:4:950:5 | in : AbstractByteBuf | provenance |  |
 | Test.java:949:42:949:49 | source(...) : Object | Test.java:949:25:949:49 | (...)... : AbstractByteBuf | provenance |  |
-| Test.java:950:4:950:5 | in : AbstractByteBuf | Test.java:950:17:950:19 | out [post update] : ByteBuf | provenance | MaD:104 |
+| Test.java:950:4:950:5 | in : AbstractByteBuf | Test.java:950:17:950:19 | out [post update] : ByteBuf | provenance | MaD:39 |
 | Test.java:950:17:950:19 | out [post update] : ByteBuf | Test.java:951:9:951:11 | out | provenance |  |
 | Test.java:956:17:956:33 | (...)... : ByteBuf | Test.java:957:4:957:5 | in : ByteBuf | provenance |  |
 | Test.java:956:26:956:33 | source(...) : Object | Test.java:956:17:956:33 | (...)... : ByteBuf | provenance |  |
-| Test.java:957:4:957:5 | in : ByteBuf | Test.java:957:17:957:19 | out [post update] : ByteBuf | provenance | MaD:104 |
+| Test.java:957:4:957:5 | in : ByteBuf | Test.java:957:17:957:19 | out [post update] : ByteBuf | provenance | MaD:39 |
 | Test.java:957:17:957:19 | out [post update] : ByteBuf | Test.java:958:9:958:11 | out | provenance |  |
 | Test.java:963:26:963:51 | (...)... : CompositeByteBuf | Test.java:964:4:964:5 | in : CompositeByteBuf | provenance |  |
 | Test.java:963:44:963:51 | source(...) : Object | Test.java:963:26:963:51 | (...)... : CompositeByteBuf | provenance |  |
-| Test.java:964:4:964:5 | in : CompositeByteBuf | Test.java:964:17:964:19 | out [post update] : ByteBuf | provenance | MaD:104 |
+| Test.java:964:4:964:5 | in : CompositeByteBuf | Test.java:964:17:964:19 | out [post update] : ByteBuf | provenance | MaD:39 |
 | Test.java:964:17:964:19 | out [post update] : ByteBuf | Test.java:965:9:965:11 | out | provenance |  |
 | Test.java:970:24:970:47 | (...)... : SwappedByteBuf | Test.java:971:4:971:5 | in : SwappedByteBuf | provenance |  |
 | Test.java:970:40:970:47 | source(...) : Object | Test.java:970:24:970:47 | (...)... : SwappedByteBuf | provenance |  |
-| Test.java:971:4:971:5 | in : SwappedByteBuf | Test.java:971:17:971:19 | out [post update] : ByteBuf | provenance | MaD:104 |
+| Test.java:971:4:971:5 | in : SwappedByteBuf | Test.java:971:17:971:19 | out [post update] : ByteBuf | provenance | MaD:39 |
 | Test.java:971:17:971:19 | out [post update] : ByteBuf | Test.java:972:9:972:11 | out | provenance |  |
 | Test.java:977:25:977:49 | (...)... : AbstractByteBuf | Test.java:978:10:978:11 | in : AbstractByteBuf | provenance |  |
 | Test.java:977:42:977:49 | source(...) : Object | Test.java:977:25:977:49 | (...)... : AbstractByteBuf | provenance |  |
-| Test.java:978:10:978:11 | in : AbstractByteBuf | Test.java:978:10:978:39 | readBytes(...) : AbstractByteBuf | provenance | MaD:26 |
+| Test.java:978:10:978:11 | in : AbstractByteBuf | Test.java:978:10:978:39 | readBytes(...) : AbstractByteBuf | provenance | MaD:40 |
 | Test.java:978:10:978:39 | readBytes(...) : AbstractByteBuf | Test.java:979:9:979:11 | out | provenance |  |
 | Test.java:984:17:984:33 | (...)... : ByteBuf | Test.java:985:10:985:11 | in : ByteBuf | provenance |  |
 | Test.java:984:26:984:33 | source(...) : Object | Test.java:984:17:984:33 | (...)... : ByteBuf | provenance |  |
-| Test.java:985:10:985:11 | in : ByteBuf | Test.java:985:10:985:39 | readBytes(...) : ByteBuf | provenance | MaD:26 |
+| Test.java:985:10:985:11 | in : ByteBuf | Test.java:985:10:985:39 | readBytes(...) : ByteBuf | provenance | MaD:40 |
 | Test.java:985:10:985:39 | readBytes(...) : ByteBuf | Test.java:986:9:986:11 | out | provenance |  |
 | Test.java:991:24:991:47 | (...)... : SwappedByteBuf | Test.java:992:10:992:11 | in : SwappedByteBuf | provenance |  |
 | Test.java:991:40:991:47 | source(...) : Object | Test.java:991:24:991:47 | (...)... : SwappedByteBuf | provenance |  |
-| Test.java:992:10:992:11 | in : SwappedByteBuf | Test.java:992:10:992:39 | readBytes(...) : SwappedByteBuf | provenance | MaD:26 |
+| Test.java:992:10:992:11 | in : SwappedByteBuf | Test.java:992:10:992:39 | readBytes(...) : SwappedByteBuf | provenance | MaD:40 |
 | Test.java:992:10:992:39 | readBytes(...) : SwappedByteBuf | Test.java:993:9:993:11 | out | provenance |  |
 | Test.java:998:26:998:51 | (...)... : CompositeByteBuf | Test.java:999:10:999:11 | in : CompositeByteBuf | provenance |  |
 | Test.java:998:44:998:51 | source(...) : Object | Test.java:998:26:998:51 | (...)... : CompositeByteBuf | provenance |  |
-| Test.java:999:10:999:11 | in : CompositeByteBuf | Test.java:999:10:999:39 | readBytes(...) : CompositeByteBuf | provenance | MaD:26 |
+| Test.java:999:10:999:11 | in : CompositeByteBuf | Test.java:999:10:999:39 | readBytes(...) : CompositeByteBuf | provenance | MaD:40 |
 | Test.java:999:10:999:39 | readBytes(...) : CompositeByteBuf | Test.java:1000:9:1000:11 | out | provenance |  |
 | Test.java:1005:25:1005:49 | (...)... : AbstractByteBuf | Test.java:1006:4:1006:5 | in : AbstractByteBuf | provenance |  |
 | Test.java:1005:42:1005:49 | source(...) : Object | Test.java:1005:25:1005:49 | (...)... : AbstractByteBuf | provenance |  |
-| Test.java:1006:4:1006:5 | in : AbstractByteBuf | Test.java:1006:17:1006:19 | out [post update] : ByteBuf | provenance | MaD:105 |
+| Test.java:1006:4:1006:5 | in : AbstractByteBuf | Test.java:1006:17:1006:19 | out [post update] : ByteBuf | provenance | MaD:41 |
 | Test.java:1006:17:1006:19 | out [post update] : ByteBuf | Test.java:1007:9:1007:11 | out | provenance |  |
 | Test.java:1012:17:1012:33 | (...)... : ByteBuf | Test.java:1013:4:1013:5 | in : ByteBuf | provenance |  |
 | Test.java:1012:26:1012:33 | source(...) : Object | Test.java:1012:17:1012:33 | (...)... : ByteBuf | provenance |  |
-| Test.java:1013:4:1013:5 | in : ByteBuf | Test.java:1013:17:1013:19 | out [post update] : ByteBuf | provenance | MaD:105 |
+| Test.java:1013:4:1013:5 | in : ByteBuf | Test.java:1013:17:1013:19 | out [post update] : ByteBuf | provenance | MaD:41 |
 | Test.java:1013:17:1013:19 | out [post update] : ByteBuf | Test.java:1014:9:1014:11 | out | provenance |  |
 | Test.java:1019:26:1019:51 | (...)... : CompositeByteBuf | Test.java:1020:4:1020:5 | in : CompositeByteBuf | provenance |  |
 | Test.java:1019:44:1019:51 | source(...) : Object | Test.java:1019:26:1019:51 | (...)... : CompositeByteBuf | provenance |  |
-| Test.java:1020:4:1020:5 | in : CompositeByteBuf | Test.java:1020:17:1020:19 | out [post update] : ByteBuf | provenance | MaD:105 |
+| Test.java:1020:4:1020:5 | in : CompositeByteBuf | Test.java:1020:17:1020:19 | out [post update] : ByteBuf | provenance | MaD:41 |
 | Test.java:1020:17:1020:19 | out [post update] : ByteBuf | Test.java:1021:9:1021:11 | out | provenance |  |
 | Test.java:1026:24:1026:47 | (...)... : SwappedByteBuf | Test.java:1027:4:1027:5 | in : SwappedByteBuf | provenance |  |
 | Test.java:1026:40:1026:47 | source(...) : Object | Test.java:1026:24:1026:47 | (...)... : SwappedByteBuf | provenance |  |
-| Test.java:1027:4:1027:5 | in : SwappedByteBuf | Test.java:1027:17:1027:19 | out [post update] : ByteBuf | provenance | MaD:105 |
+| Test.java:1027:4:1027:5 | in : SwappedByteBuf | Test.java:1027:17:1027:19 | out [post update] : ByteBuf | provenance | MaD:41 |
 | Test.java:1027:17:1027:19 | out [post update] : ByteBuf | Test.java:1028:9:1028:11 | out | provenance |  |
 | Test.java:1033:25:1033:49 | (...)... : AbstractByteBuf | Test.java:1034:10:1034:11 | in : AbstractByteBuf | provenance |  |
 | Test.java:1033:42:1033:49 | source(...) : Object | Test.java:1033:25:1033:49 | (...)... : AbstractByteBuf | provenance |  |
-| Test.java:1034:10:1034:11 | in : AbstractByteBuf | Test.java:1034:10:1034:42 | readBytes(...) : AbstractByteBuf | provenance | MaD:27 |
+| Test.java:1034:10:1034:11 | in : AbstractByteBuf | Test.java:1034:10:1034:42 | readBytes(...) : AbstractByteBuf | provenance | MaD:42 |
 | Test.java:1034:10:1034:42 | readBytes(...) : AbstractByteBuf | Test.java:1035:9:1035:11 | out | provenance |  |
 | Test.java:1040:17:1040:33 | (...)... : ByteBuf | Test.java:1041:10:1041:11 | in : ByteBuf | provenance |  |
 | Test.java:1040:26:1040:33 | source(...) : Object | Test.java:1040:17:1040:33 | (...)... : ByteBuf | provenance |  |
-| Test.java:1041:10:1041:11 | in : ByteBuf | Test.java:1041:10:1041:42 | readBytes(...) : ByteBuf | provenance | MaD:27 |
+| Test.java:1041:10:1041:11 | in : ByteBuf | Test.java:1041:10:1041:42 | readBytes(...) : ByteBuf | provenance | MaD:42 |
 | Test.java:1041:10:1041:42 | readBytes(...) : ByteBuf | Test.java:1042:9:1042:11 | out | provenance |  |
 | Test.java:1047:24:1047:47 | (...)... : SwappedByteBuf | Test.java:1048:10:1048:11 | in : SwappedByteBuf | provenance |  |
 | Test.java:1047:40:1047:47 | source(...) : Object | Test.java:1047:24:1047:47 | (...)... : SwappedByteBuf | provenance |  |
-| Test.java:1048:10:1048:11 | in : SwappedByteBuf | Test.java:1048:10:1048:42 | readBytes(...) : SwappedByteBuf | provenance | MaD:27 |
+| Test.java:1048:10:1048:11 | in : SwappedByteBuf | Test.java:1048:10:1048:42 | readBytes(...) : SwappedByteBuf | provenance | MaD:42 |
 | Test.java:1048:10:1048:42 | readBytes(...) : SwappedByteBuf | Test.java:1049:9:1049:11 | out | provenance |  |
 | Test.java:1054:26:1054:51 | (...)... : CompositeByteBuf | Test.java:1055:10:1055:11 | in : CompositeByteBuf | provenance |  |
 | Test.java:1054:44:1054:51 | source(...) : Object | Test.java:1054:26:1054:51 | (...)... : CompositeByteBuf | provenance |  |
-| Test.java:1055:10:1055:11 | in : CompositeByteBuf | Test.java:1055:10:1055:42 | readBytes(...) : CompositeByteBuf | provenance | MaD:27 |
+| Test.java:1055:10:1055:11 | in : CompositeByteBuf | Test.java:1055:10:1055:42 | readBytes(...) : CompositeByteBuf | provenance | MaD:42 |
 | Test.java:1055:10:1055:42 | readBytes(...) : CompositeByteBuf | Test.java:1056:9:1056:11 | out | provenance |  |
 | Test.java:1061:25:1061:49 | (...)... : AbstractByteBuf | Test.java:1062:4:1062:5 | in : AbstractByteBuf | provenance |  |
 | Test.java:1061:42:1061:49 | source(...) : Object | Test.java:1061:25:1061:49 | (...)... : AbstractByteBuf | provenance |  |
-| Test.java:1062:4:1062:5 | in : AbstractByteBuf | Test.java:1062:17:1062:19 | out [post update] : ByteBuffer | provenance | MaD:103 |
+| Test.java:1062:4:1062:5 | in : AbstractByteBuf | Test.java:1062:17:1062:19 | out [post update] : ByteBuffer | provenance | MaD:43 |
 | Test.java:1062:17:1062:19 | out [post update] : ByteBuffer | Test.java:1063:9:1063:11 | out | provenance |  |
 | Test.java:1068:17:1068:33 | (...)... : ByteBuf | Test.java:1069:4:1069:5 | in : ByteBuf | provenance |  |
 | Test.java:1068:26:1068:33 | source(...) : Object | Test.java:1068:17:1068:33 | (...)... : ByteBuf | provenance |  |
-| Test.java:1069:4:1069:5 | in : ByteBuf | Test.java:1069:17:1069:19 | out [post update] : ByteBuffer | provenance | MaD:103 |
+| Test.java:1069:4:1069:5 | in : ByteBuf | Test.java:1069:17:1069:19 | out [post update] : ByteBuffer | provenance | MaD:43 |
 | Test.java:1069:17:1069:19 | out [post update] : ByteBuffer | Test.java:1070:9:1070:11 | out | provenance |  |
 | Test.java:1075:26:1075:51 | (...)... : CompositeByteBuf | Test.java:1076:4:1076:5 | in : CompositeByteBuf | provenance |  |
 | Test.java:1075:44:1075:51 | source(...) : Object | Test.java:1075:26:1075:51 | (...)... : CompositeByteBuf | provenance |  |
-| Test.java:1076:4:1076:5 | in : CompositeByteBuf | Test.java:1076:17:1076:19 | out [post update] : ByteBuffer | provenance | MaD:103 |
+| Test.java:1076:4:1076:5 | in : CompositeByteBuf | Test.java:1076:17:1076:19 | out [post update] : ByteBuffer | provenance | MaD:43 |
 | Test.java:1076:17:1076:19 | out [post update] : ByteBuffer | Test.java:1077:9:1077:11 | out | provenance |  |
 | Test.java:1082:24:1082:47 | (...)... : SwappedByteBuf | Test.java:1083:4:1083:5 | in : SwappedByteBuf | provenance |  |
 | Test.java:1082:40:1082:47 | source(...) : Object | Test.java:1082:24:1082:47 | (...)... : SwappedByteBuf | provenance |  |
-| Test.java:1083:4:1083:5 | in : SwappedByteBuf | Test.java:1083:17:1083:19 | out [post update] : ByteBuffer | provenance | MaD:103 |
+| Test.java:1083:4:1083:5 | in : SwappedByteBuf | Test.java:1083:17:1083:19 | out [post update] : ByteBuffer | provenance | MaD:43 |
 | Test.java:1083:17:1083:19 | out [post update] : ByteBuffer | Test.java:1084:9:1084:11 | out | provenance |  |
 | Test.java:1089:25:1089:49 | (...)... : AbstractByteBuf | Test.java:1090:10:1090:11 | in : AbstractByteBuf | provenance |  |
 | Test.java:1089:42:1089:49 | source(...) : Object | Test.java:1089:25:1089:49 | (...)... : AbstractByteBuf | provenance |  |
-| Test.java:1090:10:1090:11 | in : AbstractByteBuf | Test.java:1090:10:1090:39 | readBytes(...) : AbstractByteBuf | provenance | MaD:25 |
+| Test.java:1090:10:1090:11 | in : AbstractByteBuf | Test.java:1090:10:1090:39 | readBytes(...) : AbstractByteBuf | provenance | MaD:44 |
 | Test.java:1090:10:1090:39 | readBytes(...) : AbstractByteBuf | Test.java:1091:9:1091:11 | out | provenance |  |
 | Test.java:1096:17:1096:33 | (...)... : ByteBuf | Test.java:1097:10:1097:11 | in : ByteBuf | provenance |  |
 | Test.java:1096:26:1096:33 | source(...) : Object | Test.java:1096:17:1096:33 | (...)... : ByteBuf | provenance |  |
-| Test.java:1097:10:1097:11 | in : ByteBuf | Test.java:1097:10:1097:39 | readBytes(...) : ByteBuf | provenance | MaD:25 |
+| Test.java:1097:10:1097:11 | in : ByteBuf | Test.java:1097:10:1097:39 | readBytes(...) : ByteBuf | provenance | MaD:44 |
 | Test.java:1097:10:1097:39 | readBytes(...) : ByteBuf | Test.java:1098:9:1098:11 | out | provenance |  |
 | Test.java:1103:24:1103:47 | (...)... : SwappedByteBuf | Test.java:1104:10:1104:11 | in : SwappedByteBuf | provenance |  |
 | Test.java:1103:40:1103:47 | source(...) : Object | Test.java:1103:24:1103:47 | (...)... : SwappedByteBuf | provenance |  |
-| Test.java:1104:10:1104:11 | in : SwappedByteBuf | Test.java:1104:10:1104:39 | readBytes(...) : SwappedByteBuf | provenance | MaD:25 |
+| Test.java:1104:10:1104:11 | in : SwappedByteBuf | Test.java:1104:10:1104:39 | readBytes(...) : SwappedByteBuf | provenance | MaD:44 |
 | Test.java:1104:10:1104:39 | readBytes(...) : SwappedByteBuf | Test.java:1105:9:1105:11 | out | provenance |  |
 | Test.java:1110:26:1110:51 | (...)... : CompositeByteBuf | Test.java:1111:10:1111:11 | in : CompositeByteBuf | provenance |  |
 | Test.java:1110:44:1110:51 | source(...) : Object | Test.java:1110:26:1110:51 | (...)... : CompositeByteBuf | provenance |  |
-| Test.java:1111:10:1111:11 | in : CompositeByteBuf | Test.java:1111:10:1111:39 | readBytes(...) : CompositeByteBuf | provenance | MaD:25 |
+| Test.java:1111:10:1111:11 | in : CompositeByteBuf | Test.java:1111:10:1111:39 | readBytes(...) : CompositeByteBuf | provenance | MaD:44 |
 | Test.java:1111:10:1111:39 | readBytes(...) : CompositeByteBuf | Test.java:1112:9:1112:11 | out | provenance |  |
 | Test.java:1117:25:1117:49 | (...)... : AbstractByteBuf | Test.java:1118:4:1118:5 | in : AbstractByteBuf | provenance |  |
 | Test.java:1117:42:1117:49 | source(...) : Object | Test.java:1117:25:1117:49 | (...)... : AbstractByteBuf | provenance |  |
-| Test.java:1118:4:1118:5 | in : AbstractByteBuf | Test.java:1118:17:1118:19 | out [post update] : FileChannel | provenance | MaD:106 |
+| Test.java:1118:4:1118:5 | in : AbstractByteBuf | Test.java:1118:17:1118:19 | out [post update] : FileChannel | provenance | MaD:45 |
 | Test.java:1118:17:1118:19 | out [post update] : FileChannel | Test.java:1119:9:1119:11 | out | provenance |  |
 | Test.java:1124:17:1124:33 | (...)... : ByteBuf | Test.java:1125:4:1125:5 | in : ByteBuf | provenance |  |
 | Test.java:1124:26:1124:33 | source(...) : Object | Test.java:1124:17:1124:33 | (...)... : ByteBuf | provenance |  |
-| Test.java:1125:4:1125:5 | in : ByteBuf | Test.java:1125:17:1125:19 | out [post update] : FileChannel | provenance | MaD:106 |
+| Test.java:1125:4:1125:5 | in : ByteBuf | Test.java:1125:17:1125:19 | out [post update] : FileChannel | provenance | MaD:45 |
 | Test.java:1125:17:1125:19 | out [post update] : FileChannel | Test.java:1126:9:1126:11 | out | provenance |  |
 | Test.java:1131:24:1131:47 | (...)... : SwappedByteBuf | Test.java:1132:4:1132:5 | in : SwappedByteBuf | provenance |  |
 | Test.java:1131:40:1131:47 | source(...) : Object | Test.java:1131:24:1131:47 | (...)... : SwappedByteBuf | provenance |  |
-| Test.java:1132:4:1132:5 | in : SwappedByteBuf | Test.java:1132:17:1132:19 | out [post update] : FileChannel | provenance | MaD:106 |
+| Test.java:1132:4:1132:5 | in : SwappedByteBuf | Test.java:1132:17:1132:19 | out [post update] : FileChannel | provenance | MaD:45 |
 | Test.java:1132:17:1132:19 | out [post update] : FileChannel | Test.java:1133:9:1133:11 | out | provenance |  |
 | Test.java:1138:25:1138:49 | (...)... : AbstractByteBuf | Test.java:1139:4:1139:5 | in : AbstractByteBuf | provenance |  |
 | Test.java:1138:42:1138:49 | source(...) : Object | Test.java:1138:25:1138:49 | (...)... : AbstractByteBuf | provenance |  |
-| Test.java:1139:4:1139:5 | in : AbstractByteBuf | Test.java:1139:17:1139:19 | out [post update] : GatheringByteChannel | provenance | MaD:107 |
+| Test.java:1139:4:1139:5 | in : AbstractByteBuf | Test.java:1139:17:1139:19 | out [post update] : GatheringByteChannel | provenance | MaD:46 |
 | Test.java:1139:17:1139:19 | out [post update] : GatheringByteChannel | Test.java:1140:9:1140:11 | out | provenance |  |
 | Test.java:1145:17:1145:33 | (...)... : ByteBuf | Test.java:1146:4:1146:5 | in : ByteBuf | provenance |  |
 | Test.java:1145:26:1145:33 | source(...) : Object | Test.java:1145:17:1145:33 | (...)... : ByteBuf | provenance |  |
-| Test.java:1146:4:1146:5 | in : ByteBuf | Test.java:1146:17:1146:19 | out [post update] : GatheringByteChannel | provenance | MaD:107 |
+| Test.java:1146:4:1146:5 | in : ByteBuf | Test.java:1146:17:1146:19 | out [post update] : GatheringByteChannel | provenance | MaD:46 |
 | Test.java:1146:17:1146:19 | out [post update] : GatheringByteChannel | Test.java:1147:9:1147:11 | out | provenance |  |
 | Test.java:1152:24:1152:47 | (...)... : SwappedByteBuf | Test.java:1153:4:1153:5 | in : SwappedByteBuf | provenance |  |
 | Test.java:1152:40:1152:47 | source(...) : Object | Test.java:1152:24:1152:47 | (...)... : SwappedByteBuf | provenance |  |
-| Test.java:1153:4:1153:5 | in : SwappedByteBuf | Test.java:1153:17:1153:19 | out [post update] : GatheringByteChannel | provenance | MaD:107 |
+| Test.java:1153:4:1153:5 | in : SwappedByteBuf | Test.java:1153:17:1153:19 | out [post update] : GatheringByteChannel | provenance | MaD:46 |
 | Test.java:1153:17:1153:19 | out [post update] : GatheringByteChannel | Test.java:1154:9:1154:11 | out | provenance |  |
 | Test.java:1159:25:1159:49 | (...)... : AbstractByteBuf | Test.java:1160:4:1160:5 | in : AbstractByteBuf | provenance |  |
 | Test.java:1159:42:1159:49 | source(...) : Object | Test.java:1159:25:1159:49 | (...)... : AbstractByteBuf | provenance |  |
-| Test.java:1160:4:1160:5 | in : AbstractByteBuf | Test.java:1160:17:1160:19 | out [post update] : OutputStream | provenance | MaD:108 |
+| Test.java:1160:4:1160:5 | in : AbstractByteBuf | Test.java:1160:17:1160:19 | out [post update] : OutputStream | provenance | MaD:47 |
 | Test.java:1160:17:1160:19 | out [post update] : OutputStream | Test.java:1161:9:1161:11 | out | provenance |  |
 | Test.java:1166:17:1166:33 | (...)... : ByteBuf | Test.java:1167:4:1167:5 | in : ByteBuf | provenance |  |
 | Test.java:1166:26:1166:33 | source(...) : Object | Test.java:1166:17:1166:33 | (...)... : ByteBuf | provenance |  |
-| Test.java:1167:4:1167:5 | in : ByteBuf | Test.java:1167:17:1167:19 | out [post update] : OutputStream | provenance | MaD:108 |
+| Test.java:1167:4:1167:5 | in : ByteBuf | Test.java:1167:17:1167:19 | out [post update] : OutputStream | provenance | MaD:47 |
 | Test.java:1167:17:1167:19 | out [post update] : OutputStream | Test.java:1168:9:1168:11 | out | provenance |  |
 | Test.java:1173:26:1173:51 | (...)... : CompositeByteBuf | Test.java:1174:4:1174:5 | in : CompositeByteBuf | provenance |  |
 | Test.java:1173:44:1173:51 | source(...) : Object | Test.java:1173:26:1173:51 | (...)... : CompositeByteBuf | provenance |  |
-| Test.java:1174:4:1174:5 | in : CompositeByteBuf | Test.java:1174:17:1174:19 | out [post update] : OutputStream | provenance | MaD:108 |
+| Test.java:1174:4:1174:5 | in : CompositeByteBuf | Test.java:1174:17:1174:19 | out [post update] : OutputStream | provenance | MaD:47 |
 | Test.java:1174:17:1174:19 | out [post update] : OutputStream | Test.java:1175:9:1175:11 | out | provenance |  |
 | Test.java:1180:24:1180:47 | (...)... : SwappedByteBuf | Test.java:1181:4:1181:5 | in : SwappedByteBuf | provenance |  |
 | Test.java:1180:40:1180:47 | source(...) : Object | Test.java:1180:24:1180:47 | (...)... : SwappedByteBuf | provenance |  |
-| Test.java:1181:4:1181:5 | in : SwappedByteBuf | Test.java:1181:17:1181:19 | out [post update] : OutputStream | provenance | MaD:108 |
+| Test.java:1181:4:1181:5 | in : SwappedByteBuf | Test.java:1181:17:1181:19 | out [post update] : OutputStream | provenance | MaD:47 |
 | Test.java:1181:17:1181:19 | out [post update] : OutputStream | Test.java:1182:9:1182:11 | out | provenance |  |
 | Test.java:1187:25:1187:49 | (...)... : AbstractByteBuf | Test.java:1188:10:1188:11 | in : AbstractByteBuf | provenance |  |
 | Test.java:1187:42:1187:49 | source(...) : Object | Test.java:1187:25:1187:49 | (...)... : AbstractByteBuf | provenance |  |
-| Test.java:1188:10:1188:11 | in : AbstractByteBuf | Test.java:1188:10:1188:44 | readBytes(...) : AbstractByteBuf | provenance | MaD:28 |
+| Test.java:1188:10:1188:11 | in : AbstractByteBuf | Test.java:1188:10:1188:44 | readBytes(...) : AbstractByteBuf | provenance | MaD:48 |
 | Test.java:1188:10:1188:44 | readBytes(...) : AbstractByteBuf | Test.java:1189:9:1189:11 | out | provenance |  |
 | Test.java:1194:17:1194:33 | (...)... : ByteBuf | Test.java:1195:10:1195:11 | in : ByteBuf | provenance |  |
 | Test.java:1194:26:1194:33 | source(...) : Object | Test.java:1194:17:1194:33 | (...)... : ByteBuf | provenance |  |
-| Test.java:1195:10:1195:11 | in : ByteBuf | Test.java:1195:10:1195:44 | readBytes(...) : ByteBuf | provenance | MaD:28 |
+| Test.java:1195:10:1195:11 | in : ByteBuf | Test.java:1195:10:1195:44 | readBytes(...) : ByteBuf | provenance | MaD:48 |
 | Test.java:1195:10:1195:44 | readBytes(...) : ByteBuf | Test.java:1196:9:1196:11 | out | provenance |  |
 | Test.java:1201:24:1201:47 | (...)... : SwappedByteBuf | Test.java:1202:10:1202:11 | in : SwappedByteBuf | provenance |  |
 | Test.java:1201:40:1201:47 | source(...) : Object | Test.java:1201:24:1201:47 | (...)... : SwappedByteBuf | provenance |  |
-| Test.java:1202:10:1202:11 | in : SwappedByteBuf | Test.java:1202:10:1202:44 | readBytes(...) : SwappedByteBuf | provenance | MaD:28 |
+| Test.java:1202:10:1202:11 | in : SwappedByteBuf | Test.java:1202:10:1202:44 | readBytes(...) : SwappedByteBuf | provenance | MaD:48 |
 | Test.java:1202:10:1202:44 | readBytes(...) : SwappedByteBuf | Test.java:1203:9:1203:11 | out | provenance |  |
 | Test.java:1208:26:1208:51 | (...)... : CompositeByteBuf | Test.java:1209:10:1209:11 | in : CompositeByteBuf | provenance |  |
 | Test.java:1208:44:1208:51 | source(...) : Object | Test.java:1208:26:1208:51 | (...)... : CompositeByteBuf | provenance |  |
-| Test.java:1209:10:1209:11 | in : CompositeByteBuf | Test.java:1209:10:1209:44 | readBytes(...) : CompositeByteBuf | provenance | MaD:28 |
+| Test.java:1209:10:1209:11 | in : CompositeByteBuf | Test.java:1209:10:1209:44 | readBytes(...) : CompositeByteBuf | provenance | MaD:48 |
 | Test.java:1209:10:1209:44 | readBytes(...) : CompositeByteBuf | Test.java:1210:9:1210:11 | out | provenance |  |
 | Test.java:1215:25:1215:49 | (...)... : AbstractByteBuf | Test.java:1216:4:1216:5 | in : AbstractByteBuf | provenance |  |
 | Test.java:1215:42:1215:49 | source(...) : Object | Test.java:1215:25:1215:49 | (...)... : AbstractByteBuf | provenance |  |
-| Test.java:1216:4:1216:5 | in : AbstractByteBuf | Test.java:1216:17:1216:19 | out [post update] : byte[] | provenance | MaD:100 |
+| Test.java:1216:4:1216:5 | in : AbstractByteBuf | Test.java:1216:17:1216:19 | out [post update] : byte[] | provenance | MaD:49 |
 | Test.java:1216:17:1216:19 | out [post update] : byte[] | Test.java:1217:9:1217:11 | out | provenance |  |
 | Test.java:1222:17:1222:33 | (...)... : ByteBuf | Test.java:1223:4:1223:5 | in : ByteBuf | provenance |  |
 | Test.java:1222:26:1222:33 | source(...) : Object | Test.java:1222:17:1222:33 | (...)... : ByteBuf | provenance |  |
-| Test.java:1223:4:1223:5 | in : ByteBuf | Test.java:1223:17:1223:19 | out [post update] : byte[] | provenance | MaD:100 |
+| Test.java:1223:4:1223:5 | in : ByteBuf | Test.java:1223:17:1223:19 | out [post update] : byte[] | provenance | MaD:49 |
 | Test.java:1223:17:1223:19 | out [post update] : byte[] | Test.java:1224:9:1224:11 | out | provenance |  |
 | Test.java:1229:26:1229:51 | (...)... : CompositeByteBuf | Test.java:1230:4:1230:5 | in : CompositeByteBuf | provenance |  |
 | Test.java:1229:44:1229:51 | source(...) : Object | Test.java:1229:26:1229:51 | (...)... : CompositeByteBuf | provenance |  |
-| Test.java:1230:4:1230:5 | in : CompositeByteBuf | Test.java:1230:17:1230:19 | out [post update] : byte[] | provenance | MaD:100 |
+| Test.java:1230:4:1230:5 | in : CompositeByteBuf | Test.java:1230:17:1230:19 | out [post update] : byte[] | provenance | MaD:49 |
 | Test.java:1230:17:1230:19 | out [post update] : byte[] | Test.java:1231:9:1231:11 | out | provenance |  |
 | Test.java:1236:24:1236:47 | (...)... : SwappedByteBuf | Test.java:1237:4:1237:5 | in : SwappedByteBuf | provenance |  |
 | Test.java:1236:40:1236:47 | source(...) : Object | Test.java:1236:24:1236:47 | (...)... : SwappedByteBuf | provenance |  |
-| Test.java:1237:4:1237:5 | in : SwappedByteBuf | Test.java:1237:17:1237:19 | out [post update] : byte[] | provenance | MaD:100 |
+| Test.java:1237:4:1237:5 | in : SwappedByteBuf | Test.java:1237:17:1237:19 | out [post update] : byte[] | provenance | MaD:49 |
 | Test.java:1237:17:1237:19 | out [post update] : byte[] | Test.java:1238:9:1238:11 | out | provenance |  |
 | Test.java:1243:25:1243:49 | (...)... : AbstractByteBuf | Test.java:1244:10:1244:11 | in : AbstractByteBuf | provenance |  |
 | Test.java:1243:42:1243:49 | source(...) : Object | Test.java:1243:25:1243:49 | (...)... : AbstractByteBuf | provenance |  |
-| Test.java:1244:10:1244:11 | in : AbstractByteBuf | Test.java:1244:10:1244:35 | readBytes(...) : AbstractByteBuf | provenance | MaD:22 |
+| Test.java:1244:10:1244:11 | in : AbstractByteBuf | Test.java:1244:10:1244:35 | readBytes(...) : AbstractByteBuf | provenance | MaD:50 |
 | Test.java:1244:10:1244:35 | readBytes(...) : AbstractByteBuf | Test.java:1245:9:1245:11 | out | provenance |  |
 | Test.java:1250:17:1250:33 | (...)... : ByteBuf | Test.java:1251:10:1251:11 | in : ByteBuf | provenance |  |
 | Test.java:1250:26:1250:33 | source(...) : Object | Test.java:1250:17:1250:33 | (...)... : ByteBuf | provenance |  |
-| Test.java:1251:10:1251:11 | in : ByteBuf | Test.java:1251:10:1251:35 | readBytes(...) : ByteBuf | provenance | MaD:22 |
+| Test.java:1251:10:1251:11 | in : ByteBuf | Test.java:1251:10:1251:35 | readBytes(...) : ByteBuf | provenance | MaD:50 |
 | Test.java:1251:10:1251:35 | readBytes(...) : ByteBuf | Test.java:1252:9:1252:11 | out | provenance |  |
 | Test.java:1257:24:1257:47 | (...)... : SwappedByteBuf | Test.java:1258:10:1258:11 | in : SwappedByteBuf | provenance |  |
 | Test.java:1257:40:1257:47 | source(...) : Object | Test.java:1257:24:1257:47 | (...)... : SwappedByteBuf | provenance |  |
-| Test.java:1258:10:1258:11 | in : SwappedByteBuf | Test.java:1258:10:1258:35 | readBytes(...) : SwappedByteBuf | provenance | MaD:22 |
+| Test.java:1258:10:1258:11 | in : SwappedByteBuf | Test.java:1258:10:1258:35 | readBytes(...) : SwappedByteBuf | provenance | MaD:50 |
 | Test.java:1258:10:1258:35 | readBytes(...) : SwappedByteBuf | Test.java:1259:9:1259:11 | out | provenance |  |
 | Test.java:1264:26:1264:51 | (...)... : CompositeByteBuf | Test.java:1265:10:1265:11 | in : CompositeByteBuf | provenance |  |
 | Test.java:1264:44:1264:51 | source(...) : Object | Test.java:1264:26:1264:51 | (...)... : CompositeByteBuf | provenance |  |
-| Test.java:1265:10:1265:11 | in : CompositeByteBuf | Test.java:1265:10:1265:35 | readBytes(...) : CompositeByteBuf | provenance | MaD:22 |
+| Test.java:1265:10:1265:11 | in : CompositeByteBuf | Test.java:1265:10:1265:35 | readBytes(...) : CompositeByteBuf | provenance | MaD:50 |
 | Test.java:1265:10:1265:35 | readBytes(...) : CompositeByteBuf | Test.java:1266:9:1266:11 | out | provenance |  |
 | Test.java:1271:25:1271:49 | (...)... : AbstractByteBuf | Test.java:1272:4:1272:5 | in : AbstractByteBuf | provenance |  |
 | Test.java:1271:42:1271:49 | source(...) : Object | Test.java:1271:25:1271:49 | (...)... : AbstractByteBuf | provenance |  |
-| Test.java:1272:4:1272:5 | in : AbstractByteBuf | Test.java:1272:17:1272:19 | out [post update] : byte[] | provenance | MaD:101 |
+| Test.java:1272:4:1272:5 | in : AbstractByteBuf | Test.java:1272:17:1272:19 | out [post update] : byte[] | provenance | MaD:51 |
 | Test.java:1272:17:1272:19 | out [post update] : byte[] | Test.java:1273:9:1273:11 | out | provenance |  |
 | Test.java:1278:17:1278:33 | (...)... : ByteBuf | Test.java:1279:4:1279:5 | in : ByteBuf | provenance |  |
 | Test.java:1278:26:1278:33 | source(...) : Object | Test.java:1278:17:1278:33 | (...)... : ByteBuf | provenance |  |
-| Test.java:1279:4:1279:5 | in : ByteBuf | Test.java:1279:17:1279:19 | out [post update] : byte[] | provenance | MaD:101 |
+| Test.java:1279:4:1279:5 | in : ByteBuf | Test.java:1279:17:1279:19 | out [post update] : byte[] | provenance | MaD:51 |
 | Test.java:1279:17:1279:19 | out [post update] : byte[] | Test.java:1280:9:1280:11 | out | provenance |  |
 | Test.java:1285:26:1285:51 | (...)... : CompositeByteBuf | Test.java:1286:4:1286:5 | in : CompositeByteBuf | provenance |  |
 | Test.java:1285:44:1285:51 | source(...) : Object | Test.java:1285:26:1285:51 | (...)... : CompositeByteBuf | provenance |  |
-| Test.java:1286:4:1286:5 | in : CompositeByteBuf | Test.java:1286:17:1286:19 | out [post update] : byte[] | provenance | MaD:101 |
+| Test.java:1286:4:1286:5 | in : CompositeByteBuf | Test.java:1286:17:1286:19 | out [post update] : byte[] | provenance | MaD:51 |
 | Test.java:1286:17:1286:19 | out [post update] : byte[] | Test.java:1287:9:1287:11 | out | provenance |  |
 | Test.java:1292:24:1292:47 | (...)... : SwappedByteBuf | Test.java:1293:4:1293:5 | in : SwappedByteBuf | provenance |  |
 | Test.java:1292:40:1292:47 | source(...) : Object | Test.java:1292:24:1292:47 | (...)... : SwappedByteBuf | provenance |  |
-| Test.java:1293:4:1293:5 | in : SwappedByteBuf | Test.java:1293:17:1293:19 | out [post update] : byte[] | provenance | MaD:101 |
+| Test.java:1293:4:1293:5 | in : SwappedByteBuf | Test.java:1293:17:1293:19 | out [post update] : byte[] | provenance | MaD:51 |
 | Test.java:1293:17:1293:19 | out [post update] : byte[] | Test.java:1294:9:1294:11 | out | provenance |  |
 | Test.java:1299:25:1299:49 | (...)... : AbstractByteBuf | Test.java:1300:10:1300:11 | in : AbstractByteBuf | provenance |  |
 | Test.java:1299:42:1299:49 | source(...) : Object | Test.java:1299:25:1299:49 | (...)... : AbstractByteBuf | provenance |  |
-| Test.java:1300:10:1300:11 | in : AbstractByteBuf | Test.java:1300:10:1300:41 | readBytes(...) : AbstractByteBuf | provenance | MaD:23 |
+| Test.java:1300:10:1300:11 | in : AbstractByteBuf | Test.java:1300:10:1300:41 | readBytes(...) : AbstractByteBuf | provenance | MaD:52 |
 | Test.java:1300:10:1300:41 | readBytes(...) : AbstractByteBuf | Test.java:1301:9:1301:11 | out | provenance |  |
 | Test.java:1306:17:1306:33 | (...)... : ByteBuf | Test.java:1307:10:1307:11 | in : ByteBuf | provenance |  |
 | Test.java:1306:26:1306:33 | source(...) : Object | Test.java:1306:17:1306:33 | (...)... : ByteBuf | provenance |  |
-| Test.java:1307:10:1307:11 | in : ByteBuf | Test.java:1307:10:1307:41 | readBytes(...) : ByteBuf | provenance | MaD:23 |
+| Test.java:1307:10:1307:11 | in : ByteBuf | Test.java:1307:10:1307:41 | readBytes(...) : ByteBuf | provenance | MaD:52 |
 | Test.java:1307:10:1307:41 | readBytes(...) : ByteBuf | Test.java:1308:9:1308:11 | out | provenance |  |
 | Test.java:1313:24:1313:47 | (...)... : SwappedByteBuf | Test.java:1314:10:1314:11 | in : SwappedByteBuf | provenance |  |
 | Test.java:1313:40:1313:47 | source(...) : Object | Test.java:1313:24:1313:47 | (...)... : SwappedByteBuf | provenance |  |
-| Test.java:1314:10:1314:11 | in : SwappedByteBuf | Test.java:1314:10:1314:41 | readBytes(...) : SwappedByteBuf | provenance | MaD:23 |
+| Test.java:1314:10:1314:11 | in : SwappedByteBuf | Test.java:1314:10:1314:41 | readBytes(...) : SwappedByteBuf | provenance | MaD:52 |
 | Test.java:1314:10:1314:41 | readBytes(...) : SwappedByteBuf | Test.java:1315:9:1315:11 | out | provenance |  |
 | Test.java:1320:26:1320:51 | (...)... : CompositeByteBuf | Test.java:1321:10:1321:11 | in : CompositeByteBuf | provenance |  |
 | Test.java:1320:44:1320:51 | source(...) : Object | Test.java:1320:26:1320:51 | (...)... : CompositeByteBuf | provenance |  |
-| Test.java:1321:10:1321:11 | in : CompositeByteBuf | Test.java:1321:10:1321:41 | readBytes(...) : CompositeByteBuf | provenance | MaD:23 |
+| Test.java:1321:10:1321:11 | in : CompositeByteBuf | Test.java:1321:10:1321:41 | readBytes(...) : CompositeByteBuf | provenance | MaD:52 |
 | Test.java:1321:10:1321:41 | readBytes(...) : CompositeByteBuf | Test.java:1322:9:1322:11 | out | provenance |  |
 | Test.java:1327:25:1327:49 | (...)... : AbstractByteBuf | Test.java:1328:10:1328:11 | in : AbstractByteBuf | provenance |  |
 | Test.java:1327:42:1327:49 | source(...) : Object | Test.java:1327:25:1327:49 | (...)... : AbstractByteBuf | provenance |  |
-| Test.java:1328:10:1328:11 | in : AbstractByteBuf | Test.java:1328:10:1328:24 | readBytes(...) : ByteBuf | provenance | MaD:109 |
+| Test.java:1328:10:1328:11 | in : AbstractByteBuf | Test.java:1328:10:1328:24 | readBytes(...) : ByteBuf | provenance | MaD:53 |
 | Test.java:1328:10:1328:24 | readBytes(...) : ByteBuf | Test.java:1329:9:1329:11 | out | provenance |  |
 | Test.java:1334:17:1334:33 | (...)... : ByteBuf | Test.java:1335:10:1335:11 | in : ByteBuf | provenance |  |
 | Test.java:1334:26:1334:33 | source(...) : Object | Test.java:1334:17:1334:33 | (...)... : ByteBuf | provenance |  |
-| Test.java:1335:10:1335:11 | in : ByteBuf | Test.java:1335:10:1335:24 | readBytes(...) : ByteBuf | provenance | MaD:109 |
+| Test.java:1335:10:1335:11 | in : ByteBuf | Test.java:1335:10:1335:24 | readBytes(...) : ByteBuf | provenance | MaD:53 |
 | Test.java:1335:10:1335:24 | readBytes(...) : ByteBuf | Test.java:1336:9:1336:11 | out | provenance |  |
 | Test.java:1341:24:1341:47 | (...)... : SwappedByteBuf | Test.java:1342:10:1342:11 | in : SwappedByteBuf | provenance |  |
 | Test.java:1341:40:1341:47 | source(...) : Object | Test.java:1341:24:1341:47 | (...)... : SwappedByteBuf | provenance |  |
-| Test.java:1342:10:1342:11 | in : SwappedByteBuf | Test.java:1342:10:1342:24 | readBytes(...) : ByteBuf | provenance | MaD:109 |
+| Test.java:1342:10:1342:11 | in : SwappedByteBuf | Test.java:1342:10:1342:24 | readBytes(...) : ByteBuf | provenance | MaD:53 |
 | Test.java:1342:10:1342:24 | readBytes(...) : ByteBuf | Test.java:1343:9:1343:11 | out | provenance |  |
 | Test.java:1348:25:1348:49 | (...)... : AbstractByteBuf | Test.java:1349:10:1349:11 | in : AbstractByteBuf | provenance |  |
 | Test.java:1348:42:1348:49 | source(...) : Object | Test.java:1348:25:1348:49 | (...)... : AbstractByteBuf | provenance |  |
-| Test.java:1349:10:1349:11 | in : AbstractByteBuf | Test.java:1349:10:1349:22 | readChar(...) : Number | provenance | MaD:110 |
+| Test.java:1349:10:1349:11 | in : AbstractByteBuf | Test.java:1349:10:1349:22 | readChar(...) : Number | provenance | MaD:54 |
 | Test.java:1349:10:1349:22 | readChar(...) : Number | Test.java:1350:9:1350:11 | out | provenance |  |
 | Test.java:1355:17:1355:33 | (...)... : ByteBuf | Test.java:1356:10:1356:11 | in : ByteBuf | provenance |  |
 | Test.java:1355:26:1355:33 | source(...) : Object | Test.java:1355:17:1355:33 | (...)... : ByteBuf | provenance |  |
-| Test.java:1356:10:1356:11 | in : ByteBuf | Test.java:1356:10:1356:22 | readChar(...) : Number | provenance | MaD:110 |
+| Test.java:1356:10:1356:11 | in : ByteBuf | Test.java:1356:10:1356:22 | readChar(...) : Number | provenance | MaD:54 |
 | Test.java:1356:10:1356:22 | readChar(...) : Number | Test.java:1357:9:1357:11 | out | provenance |  |
 | Test.java:1362:24:1362:47 | (...)... : SwappedByteBuf | Test.java:1363:10:1363:11 | in : SwappedByteBuf | provenance |  |
 | Test.java:1362:40:1362:47 | source(...) : Object | Test.java:1362:24:1362:47 | (...)... : SwappedByteBuf | provenance |  |
-| Test.java:1363:10:1363:11 | in : SwappedByteBuf | Test.java:1363:10:1363:22 | readChar(...) : Number | provenance | MaD:110 |
+| Test.java:1363:10:1363:11 | in : SwappedByteBuf | Test.java:1363:10:1363:22 | readChar(...) : Number | provenance | MaD:54 |
 | Test.java:1363:10:1363:22 | readChar(...) : Number | Test.java:1364:9:1364:11 | out | provenance |  |
 | Test.java:1369:25:1369:49 | (...)... : AbstractByteBuf | Test.java:1370:10:1370:11 | in : AbstractByteBuf | provenance |  |
 | Test.java:1369:42:1369:49 | source(...) : Object | Test.java:1369:25:1369:49 | (...)... : AbstractByteBuf | provenance |  |
-| Test.java:1370:10:1370:11 | in : AbstractByteBuf | Test.java:1370:10:1370:37 | readCharSequence(...) : CharSequence | provenance | MaD:111 |
+| Test.java:1370:10:1370:11 | in : AbstractByteBuf | Test.java:1370:10:1370:37 | readCharSequence(...) : CharSequence | provenance | MaD:55 |
 | Test.java:1370:10:1370:37 | readCharSequence(...) : CharSequence | Test.java:1371:9:1371:11 | out | provenance |  |
 | Test.java:1376:17:1376:33 | (...)... : ByteBuf | Test.java:1377:10:1377:11 | in : ByteBuf | provenance |  |
 | Test.java:1376:26:1376:33 | source(...) : Object | Test.java:1376:17:1376:33 | (...)... : ByteBuf | provenance |  |
-| Test.java:1377:10:1377:11 | in : ByteBuf | Test.java:1377:10:1377:37 | readCharSequence(...) : CharSequence | provenance | MaD:111 |
+| Test.java:1377:10:1377:11 | in : ByteBuf | Test.java:1377:10:1377:37 | readCharSequence(...) : CharSequence | provenance | MaD:55 |
 | Test.java:1377:10:1377:37 | readCharSequence(...) : CharSequence | Test.java:1378:9:1378:11 | out | provenance |  |
 | Test.java:1383:24:1383:47 | (...)... : SwappedByteBuf | Test.java:1384:10:1384:11 | in : SwappedByteBuf | provenance |  |
 | Test.java:1383:40:1383:47 | source(...) : Object | Test.java:1383:24:1383:47 | (...)... : SwappedByteBuf | provenance |  |
-| Test.java:1384:10:1384:11 | in : SwappedByteBuf | Test.java:1384:10:1384:37 | readCharSequence(...) : CharSequence | provenance | MaD:111 |
+| Test.java:1384:10:1384:11 | in : SwappedByteBuf | Test.java:1384:10:1384:37 | readCharSequence(...) : CharSequence | provenance | MaD:55 |
 | Test.java:1384:10:1384:37 | readCharSequence(...) : CharSequence | Test.java:1385:9:1385:11 | out | provenance |  |
 | Test.java:1390:25:1390:49 | (...)... : AbstractByteBuf | Test.java:1391:10:1391:11 | in : AbstractByteBuf | provenance |  |
 | Test.java:1390:42:1390:49 | source(...) : Object | Test.java:1390:25:1390:49 | (...)... : AbstractByteBuf | provenance |  |
-| Test.java:1391:10:1391:11 | in : AbstractByteBuf | Test.java:1391:10:1391:32 | readRetainedSlice(...) : ByteBuf | provenance | MaD:113 |
+| Test.java:1391:10:1391:11 | in : AbstractByteBuf | Test.java:1391:10:1391:32 | readRetainedSlice(...) : ByteBuf | provenance | MaD:56 |
 | Test.java:1391:10:1391:32 | readRetainedSlice(...) : ByteBuf | Test.java:1392:9:1392:11 | out | provenance |  |
 | Test.java:1397:17:1397:33 | (...)... : ByteBuf | Test.java:1398:10:1398:11 | in : ByteBuf | provenance |  |
 | Test.java:1397:26:1397:33 | source(...) : Object | Test.java:1397:17:1397:33 | (...)... : ByteBuf | provenance |  |
-| Test.java:1398:10:1398:11 | in : ByteBuf | Test.java:1398:10:1398:32 | readRetainedSlice(...) : ByteBuf | provenance | MaD:113 |
+| Test.java:1398:10:1398:11 | in : ByteBuf | Test.java:1398:10:1398:32 | readRetainedSlice(...) : ByteBuf | provenance | MaD:56 |
 | Test.java:1398:10:1398:32 | readRetainedSlice(...) : ByteBuf | Test.java:1399:9:1399:11 | out | provenance |  |
 | Test.java:1404:24:1404:47 | (...)... : SwappedByteBuf | Test.java:1405:10:1405:11 | in : SwappedByteBuf | provenance |  |
 | Test.java:1404:40:1404:47 | source(...) : Object | Test.java:1404:24:1404:47 | (...)... : SwappedByteBuf | provenance |  |
-| Test.java:1405:10:1405:11 | in : SwappedByteBuf | Test.java:1405:10:1405:32 | readRetainedSlice(...) : ByteBuf | provenance | MaD:113 |
+| Test.java:1405:10:1405:11 | in : SwappedByteBuf | Test.java:1405:10:1405:32 | readRetainedSlice(...) : ByteBuf | provenance | MaD:56 |
 | Test.java:1405:10:1405:32 | readRetainedSlice(...) : ByteBuf | Test.java:1406:9:1406:11 | out | provenance |  |
 | Test.java:1411:25:1411:49 | (...)... : AbstractByteBuf | Test.java:1412:10:1412:11 | in : AbstractByteBuf | provenance |  |
 | Test.java:1411:42:1411:49 | source(...) : Object | Test.java:1411:25:1411:49 | (...)... : AbstractByteBuf | provenance |  |
-| Test.java:1412:10:1412:11 | in : AbstractByteBuf | Test.java:1412:10:1412:24 | readSlice(...) : ByteBuf | provenance | MaD:112 |
+| Test.java:1412:10:1412:11 | in : AbstractByteBuf | Test.java:1412:10:1412:24 | readSlice(...) : ByteBuf | provenance | MaD:57 |
 | Test.java:1412:10:1412:24 | readSlice(...) : ByteBuf | Test.java:1413:9:1413:11 | out | provenance |  |
 | Test.java:1418:17:1418:33 | (...)... : ByteBuf | Test.java:1419:10:1419:11 | in : ByteBuf | provenance |  |
 | Test.java:1418:26:1418:33 | source(...) : Object | Test.java:1418:17:1418:33 | (...)... : ByteBuf | provenance |  |
-| Test.java:1419:10:1419:11 | in : ByteBuf | Test.java:1419:10:1419:24 | readSlice(...) : ByteBuf | provenance | MaD:112 |
+| Test.java:1419:10:1419:11 | in : ByteBuf | Test.java:1419:10:1419:24 | readSlice(...) : ByteBuf | provenance | MaD:57 |
 | Test.java:1419:10:1419:24 | readSlice(...) : ByteBuf | Test.java:1420:9:1420:11 | out | provenance |  |
 | Test.java:1425:24:1425:47 | (...)... : SwappedByteBuf | Test.java:1426:10:1426:11 | in : SwappedByteBuf | provenance |  |
 | Test.java:1425:40:1425:47 | source(...) : Object | Test.java:1425:24:1425:47 | (...)... : SwappedByteBuf | provenance |  |
-| Test.java:1426:10:1426:11 | in : SwappedByteBuf | Test.java:1426:10:1426:24 | readSlice(...) : ByteBuf | provenance | MaD:112 |
+| Test.java:1426:10:1426:11 | in : SwappedByteBuf | Test.java:1426:10:1426:24 | readSlice(...) : ByteBuf | provenance | MaD:57 |
 | Test.java:1426:10:1426:24 | readSlice(...) : ByteBuf | Test.java:1427:9:1427:11 | out | provenance |  |
 | Test.java:1432:25:1432:49 | (...)... : AbstractByteBuf | Test.java:1433:10:1433:11 | in : AbstractByteBuf | provenance |  |
 | Test.java:1432:42:1432:49 | source(...) : Object | Test.java:1432:25:1432:49 | (...)... : AbstractByteBuf | provenance |  |
-| Test.java:1433:10:1433:11 | in : AbstractByteBuf | Test.java:1433:10:1433:26 | readerIndex(...) : AbstractByteBuf | provenance | MaD:29 |
+| Test.java:1433:10:1433:11 | in : AbstractByteBuf | Test.java:1433:10:1433:26 | readerIndex(...) : AbstractByteBuf | provenance | MaD:58 |
 | Test.java:1433:10:1433:26 | readerIndex(...) : AbstractByteBuf | Test.java:1434:9:1434:11 | out | provenance |  |
 | Test.java:1439:17:1439:33 | (...)... : ByteBuf | Test.java:1440:10:1440:11 | in : ByteBuf | provenance |  |
 | Test.java:1439:26:1439:33 | source(...) : Object | Test.java:1439:17:1439:33 | (...)... : ByteBuf | provenance |  |
-| Test.java:1440:10:1440:11 | in : ByteBuf | Test.java:1440:10:1440:26 | readerIndex(...) : ByteBuf | provenance | MaD:29 |
+| Test.java:1440:10:1440:11 | in : ByteBuf | Test.java:1440:10:1440:26 | readerIndex(...) : ByteBuf | provenance | MaD:58 |
 | Test.java:1440:10:1440:26 | readerIndex(...) : ByteBuf | Test.java:1441:9:1441:11 | out | provenance |  |
 | Test.java:1446:24:1446:47 | (...)... : SwappedByteBuf | Test.java:1447:10:1447:11 | in : SwappedByteBuf | provenance |  |
 | Test.java:1446:40:1446:47 | source(...) : Object | Test.java:1446:24:1446:47 | (...)... : SwappedByteBuf | provenance |  |
-| Test.java:1447:10:1447:11 | in : SwappedByteBuf | Test.java:1447:10:1447:26 | readerIndex(...) : SwappedByteBuf | provenance | MaD:29 |
+| Test.java:1447:10:1447:11 | in : SwappedByteBuf | Test.java:1447:10:1447:26 | readerIndex(...) : SwappedByteBuf | provenance | MaD:58 |
 | Test.java:1447:10:1447:26 | readerIndex(...) : SwappedByteBuf | Test.java:1448:9:1448:11 | out | provenance |  |
 | Test.java:1453:26:1453:51 | (...)... : CompositeByteBuf | Test.java:1454:10:1454:11 | in : CompositeByteBuf | provenance |  |
 | Test.java:1453:44:1453:51 | source(...) : Object | Test.java:1453:26:1453:51 | (...)... : CompositeByteBuf | provenance |  |
-| Test.java:1454:10:1454:11 | in : CompositeByteBuf | Test.java:1454:10:1454:26 | readerIndex(...) : CompositeByteBuf | provenance | MaD:29 |
+| Test.java:1454:10:1454:11 | in : CompositeByteBuf | Test.java:1454:10:1454:26 | readerIndex(...) : CompositeByteBuf | provenance | MaD:58 |
 | Test.java:1454:10:1454:26 | readerIndex(...) : CompositeByteBuf | Test.java:1455:9:1455:11 | out | provenance |  |
 | Test.java:1460:25:1460:49 | (...)... : AbstractByteBuf | Test.java:1461:10:1461:11 | in : AbstractByteBuf | provenance |  |
 | Test.java:1460:42:1460:49 | source(...) : Object | Test.java:1460:25:1460:49 | (...)... : AbstractByteBuf | provenance |  |
-| Test.java:1461:10:1461:11 | in : AbstractByteBuf | Test.java:1461:10:1461:30 | resetReaderIndex(...) : AbstractByteBuf | provenance | MaD:30 |
+| Test.java:1461:10:1461:11 | in : AbstractByteBuf | Test.java:1461:10:1461:30 | resetReaderIndex(...) : AbstractByteBuf | provenance | MaD:59 |
 | Test.java:1461:10:1461:30 | resetReaderIndex(...) : AbstractByteBuf | Test.java:1462:9:1462:11 | out | provenance |  |
 | Test.java:1467:17:1467:33 | (...)... : ByteBuf | Test.java:1468:10:1468:11 | in : ByteBuf | provenance |  |
 | Test.java:1467:26:1467:33 | source(...) : Object | Test.java:1467:17:1467:33 | (...)... : ByteBuf | provenance |  |
-| Test.java:1468:10:1468:11 | in : ByteBuf | Test.java:1468:10:1468:30 | resetReaderIndex(...) : ByteBuf | provenance | MaD:30 |
+| Test.java:1468:10:1468:11 | in : ByteBuf | Test.java:1468:10:1468:30 | resetReaderIndex(...) : ByteBuf | provenance | MaD:59 |
 | Test.java:1468:10:1468:30 | resetReaderIndex(...) : ByteBuf | Test.java:1469:9:1469:11 | out | provenance |  |
 | Test.java:1474:24:1474:47 | (...)... : SwappedByteBuf | Test.java:1475:10:1475:11 | in : SwappedByteBuf | provenance |  |
 | Test.java:1474:40:1474:47 | source(...) : Object | Test.java:1474:24:1474:47 | (...)... : SwappedByteBuf | provenance |  |
-| Test.java:1475:10:1475:11 | in : SwappedByteBuf | Test.java:1475:10:1475:30 | resetReaderIndex(...) : SwappedByteBuf | provenance | MaD:30 |
+| Test.java:1475:10:1475:11 | in : SwappedByteBuf | Test.java:1475:10:1475:30 | resetReaderIndex(...) : SwappedByteBuf | provenance | MaD:59 |
 | Test.java:1475:10:1475:30 | resetReaderIndex(...) : SwappedByteBuf | Test.java:1476:9:1476:11 | out | provenance |  |
 | Test.java:1481:26:1481:51 | (...)... : CompositeByteBuf | Test.java:1482:10:1482:11 | in : CompositeByteBuf | provenance |  |
 | Test.java:1481:44:1481:51 | source(...) : Object | Test.java:1481:26:1481:51 | (...)... : CompositeByteBuf | provenance |  |
-| Test.java:1482:10:1482:11 | in : CompositeByteBuf | Test.java:1482:10:1482:30 | resetReaderIndex(...) : CompositeByteBuf | provenance | MaD:30 |
+| Test.java:1482:10:1482:11 | in : CompositeByteBuf | Test.java:1482:10:1482:30 | resetReaderIndex(...) : CompositeByteBuf | provenance | MaD:59 |
 | Test.java:1482:10:1482:30 | resetReaderIndex(...) : CompositeByteBuf | Test.java:1483:9:1483:11 | out | provenance |  |
 | Test.java:1488:25:1488:49 | (...)... : AbstractByteBuf | Test.java:1489:10:1489:11 | in : AbstractByteBuf | provenance |  |
 | Test.java:1488:42:1488:49 | source(...) : Object | Test.java:1488:25:1488:49 | (...)... : AbstractByteBuf | provenance |  |
-| Test.java:1489:10:1489:11 | in : AbstractByteBuf | Test.java:1489:10:1489:30 | resetWriterIndex(...) : AbstractByteBuf | provenance | MaD:31 |
+| Test.java:1489:10:1489:11 | in : AbstractByteBuf | Test.java:1489:10:1489:30 | resetWriterIndex(...) : AbstractByteBuf | provenance | MaD:60 |
 | Test.java:1489:10:1489:30 | resetWriterIndex(...) : AbstractByteBuf | Test.java:1490:9:1490:11 | out | provenance |  |
 | Test.java:1495:17:1495:33 | (...)... : ByteBuf | Test.java:1496:10:1496:11 | in : ByteBuf | provenance |  |
 | Test.java:1495:26:1495:33 | source(...) : Object | Test.java:1495:17:1495:33 | (...)... : ByteBuf | provenance |  |
-| Test.java:1496:10:1496:11 | in : ByteBuf | Test.java:1496:10:1496:30 | resetWriterIndex(...) : ByteBuf | provenance | MaD:31 |
+| Test.java:1496:10:1496:11 | in : ByteBuf | Test.java:1496:10:1496:30 | resetWriterIndex(...) : ByteBuf | provenance | MaD:60 |
 | Test.java:1496:10:1496:30 | resetWriterIndex(...) : ByteBuf | Test.java:1497:9:1497:11 | out | provenance |  |
 | Test.java:1502:24:1502:47 | (...)... : SwappedByteBuf | Test.java:1503:10:1503:11 | in : SwappedByteBuf | provenance |  |
 | Test.java:1502:40:1502:47 | source(...) : Object | Test.java:1502:24:1502:47 | (...)... : SwappedByteBuf | provenance |  |
-| Test.java:1503:10:1503:11 | in : SwappedByteBuf | Test.java:1503:10:1503:30 | resetWriterIndex(...) : SwappedByteBuf | provenance | MaD:31 |
+| Test.java:1503:10:1503:11 | in : SwappedByteBuf | Test.java:1503:10:1503:30 | resetWriterIndex(...) : SwappedByteBuf | provenance | MaD:60 |
 | Test.java:1503:10:1503:30 | resetWriterIndex(...) : SwappedByteBuf | Test.java:1504:9:1504:11 | out | provenance |  |
 | Test.java:1509:26:1509:51 | (...)... : CompositeByteBuf | Test.java:1510:10:1510:11 | in : CompositeByteBuf | provenance |  |
 | Test.java:1509:44:1509:51 | source(...) : Object | Test.java:1509:26:1509:51 | (...)... : CompositeByteBuf | provenance |  |
-| Test.java:1510:10:1510:11 | in : CompositeByteBuf | Test.java:1510:10:1510:30 | resetWriterIndex(...) : CompositeByteBuf | provenance | MaD:31 |
+| Test.java:1510:10:1510:11 | in : CompositeByteBuf | Test.java:1510:10:1510:30 | resetWriterIndex(...) : CompositeByteBuf | provenance | MaD:60 |
 | Test.java:1510:10:1510:30 | resetWriterIndex(...) : CompositeByteBuf | Test.java:1511:9:1511:11 | out | provenance |  |
 | Test.java:1516:25:1516:49 | (...)... : AbstractByteBuf | Test.java:1517:10:1517:11 | in : AbstractByteBuf | provenance |  |
 | Test.java:1516:42:1516:49 | source(...) : Object | Test.java:1516:25:1516:49 | (...)... : AbstractByteBuf | provenance |  |
-| Test.java:1517:10:1517:11 | in : AbstractByteBuf | Test.java:1517:10:1517:31 | retainedDuplicate(...) : ByteBuf | provenance | MaD:32 |
+| Test.java:1517:10:1517:11 | in : AbstractByteBuf | Test.java:1517:10:1517:31 | retainedDuplicate(...) : ByteBuf | provenance | MaD:61 |
 | Test.java:1517:10:1517:31 | retainedDuplicate(...) : ByteBuf | Test.java:1518:9:1518:11 | out | provenance |  |
 | Test.java:1523:17:1523:33 | (...)... : ByteBuf | Test.java:1524:10:1524:11 | in : ByteBuf | provenance |  |
 | Test.java:1523:26:1523:33 | source(...) : Object | Test.java:1523:17:1523:33 | (...)... : ByteBuf | provenance |  |
-| Test.java:1524:10:1524:11 | in : ByteBuf | Test.java:1524:10:1524:31 | retainedDuplicate(...) : ByteBuf | provenance | MaD:32 |
+| Test.java:1524:10:1524:11 | in : ByteBuf | Test.java:1524:10:1524:31 | retainedDuplicate(...) : ByteBuf | provenance | MaD:61 |
 | Test.java:1524:10:1524:31 | retainedDuplicate(...) : ByteBuf | Test.java:1525:9:1525:11 | out | provenance |  |
 | Test.java:1530:24:1530:47 | (...)... : SwappedByteBuf | Test.java:1531:10:1531:11 | in : SwappedByteBuf | provenance |  |
 | Test.java:1530:40:1530:47 | source(...) : Object | Test.java:1530:24:1530:47 | (...)... : SwappedByteBuf | provenance |  |
-| Test.java:1531:10:1531:11 | in : SwappedByteBuf | Test.java:1531:10:1531:31 | retainedDuplicate(...) : ByteBuf | provenance | MaD:32 |
+| Test.java:1531:10:1531:11 | in : SwappedByteBuf | Test.java:1531:10:1531:31 | retainedDuplicate(...) : ByteBuf | provenance | MaD:61 |
 | Test.java:1531:10:1531:31 | retainedDuplicate(...) : ByteBuf | Test.java:1532:9:1532:11 | out | provenance |  |
 | Test.java:1537:25:1537:49 | (...)... : AbstractByteBuf | Test.java:1538:10:1538:11 | in : AbstractByteBuf | provenance |  |
 | Test.java:1537:42:1537:49 | source(...) : Object | Test.java:1537:25:1537:49 | (...)... : AbstractByteBuf | provenance |  |
-| Test.java:1538:10:1538:11 | in : AbstractByteBuf | Test.java:1538:10:1538:27 | retainedSlice(...) : ByteBuf | provenance | MaD:33 |
+| Test.java:1538:10:1538:11 | in : AbstractByteBuf | Test.java:1538:10:1538:27 | retainedSlice(...) : ByteBuf | provenance | MaD:62 |
 | Test.java:1538:10:1538:27 | retainedSlice(...) : ByteBuf | Test.java:1539:9:1539:11 | out | provenance |  |
 | Test.java:1544:25:1544:49 | (...)... : AbstractByteBuf | Test.java:1545:10:1545:11 | in : AbstractByteBuf | provenance |  |
 | Test.java:1544:42:1544:49 | source(...) : Object | Test.java:1544:25:1544:49 | (...)... : AbstractByteBuf | provenance |  |
-| Test.java:1545:10:1545:11 | in : AbstractByteBuf | Test.java:1545:10:1545:31 | retainedSlice(...) : ByteBuf | provenance | MaD:33 |
+| Test.java:1545:10:1545:11 | in : AbstractByteBuf | Test.java:1545:10:1545:31 | retainedSlice(...) : ByteBuf | provenance | MaD:62 |
 | Test.java:1545:10:1545:31 | retainedSlice(...) : ByteBuf | Test.java:1546:9:1546:11 | out | provenance |  |
 | Test.java:1551:17:1551:33 | (...)... : ByteBuf | Test.java:1552:10:1552:11 | in : ByteBuf | provenance |  |
 | Test.java:1551:26:1551:33 | source(...) : Object | Test.java:1551:17:1551:33 | (...)... : ByteBuf | provenance |  |
-| Test.java:1552:10:1552:11 | in : ByteBuf | Test.java:1552:10:1552:27 | retainedSlice(...) : ByteBuf | provenance | MaD:33 |
+| Test.java:1552:10:1552:11 | in : ByteBuf | Test.java:1552:10:1552:27 | retainedSlice(...) : ByteBuf | provenance | MaD:62 |
 | Test.java:1552:10:1552:27 | retainedSlice(...) : ByteBuf | Test.java:1553:9:1553:11 | out | provenance |  |
 | Test.java:1558:17:1558:33 | (...)... : ByteBuf | Test.java:1559:10:1559:11 | in : ByteBuf | provenance |  |
 | Test.java:1558:26:1558:33 | source(...) : Object | Test.java:1558:17:1558:33 | (...)... : ByteBuf | provenance |  |
-| Test.java:1559:10:1559:11 | in : ByteBuf | Test.java:1559:10:1559:31 | retainedSlice(...) : ByteBuf | provenance | MaD:33 |
+| Test.java:1559:10:1559:11 | in : ByteBuf | Test.java:1559:10:1559:31 | retainedSlice(...) : ByteBuf | provenance | MaD:62 |
 | Test.java:1559:10:1559:31 | retainedSlice(...) : ByteBuf | Test.java:1560:9:1560:11 | out | provenance |  |
 | Test.java:1565:24:1565:47 | (...)... : SwappedByteBuf | Test.java:1566:10:1566:11 | in : SwappedByteBuf | provenance |  |
 | Test.java:1565:40:1565:47 | source(...) : Object | Test.java:1565:24:1565:47 | (...)... : SwappedByteBuf | provenance |  |
-| Test.java:1566:10:1566:11 | in : SwappedByteBuf | Test.java:1566:10:1566:27 | retainedSlice(...) : ByteBuf | provenance | MaD:33 |
+| Test.java:1566:10:1566:11 | in : SwappedByteBuf | Test.java:1566:10:1566:27 | retainedSlice(...) : ByteBuf | provenance | MaD:62 |
 | Test.java:1566:10:1566:27 | retainedSlice(...) : ByteBuf | Test.java:1567:9:1567:11 | out | provenance |  |
 | Test.java:1572:24:1572:47 | (...)... : SwappedByteBuf | Test.java:1573:10:1573:11 | in : SwappedByteBuf | provenance |  |
 | Test.java:1572:40:1572:47 | source(...) : Object | Test.java:1572:24:1572:47 | (...)... : SwappedByteBuf | provenance |  |
-| Test.java:1573:10:1573:11 | in : SwappedByteBuf | Test.java:1573:10:1573:31 | retainedSlice(...) : ByteBuf | provenance | MaD:33 |
+| Test.java:1573:10:1573:11 | in : SwappedByteBuf | Test.java:1573:10:1573:31 | retainedSlice(...) : ByteBuf | provenance | MaD:62 |
 | Test.java:1573:10:1573:31 | retainedSlice(...) : ByteBuf | Test.java:1574:9:1574:11 | out | provenance |  |
 | Test.java:1579:25:1579:49 | (...)... : AbstractByteBuf | Test.java:1580:10:1580:11 | in : AbstractByteBuf | provenance |  |
 | Test.java:1579:42:1579:49 | source(...) : Object | Test.java:1579:25:1579:49 | (...)... : AbstractByteBuf | provenance |  |
-| Test.java:1580:10:1580:11 | in : AbstractByteBuf | Test.java:1580:10:1580:32 | setBoolean(...) : AbstractByteBuf | provenance | MaD:34 |
+| Test.java:1580:10:1580:11 | in : AbstractByteBuf | Test.java:1580:10:1580:32 | setBoolean(...) : AbstractByteBuf | provenance | MaD:63 |
 | Test.java:1580:10:1580:32 | setBoolean(...) : AbstractByteBuf | Test.java:1581:9:1581:11 | out | provenance |  |
 | Test.java:1586:17:1586:33 | (...)... : ByteBuf | Test.java:1587:10:1587:11 | in : ByteBuf | provenance |  |
 | Test.java:1586:26:1586:33 | source(...) : Object | Test.java:1586:17:1586:33 | (...)... : ByteBuf | provenance |  |
-| Test.java:1587:10:1587:11 | in : ByteBuf | Test.java:1587:10:1587:32 | setBoolean(...) : ByteBuf | provenance | MaD:34 |
+| Test.java:1587:10:1587:11 | in : ByteBuf | Test.java:1587:10:1587:32 | setBoolean(...) : ByteBuf | provenance | MaD:63 |
 | Test.java:1587:10:1587:32 | setBoolean(...) : ByteBuf | Test.java:1588:9:1588:11 | out | provenance |  |
 | Test.java:1593:24:1593:47 | (...)... : SwappedByteBuf | Test.java:1594:10:1594:11 | in : SwappedByteBuf | provenance |  |
 | Test.java:1593:40:1593:47 | source(...) : Object | Test.java:1593:24:1593:47 | (...)... : SwappedByteBuf | provenance |  |
-| Test.java:1594:10:1594:11 | in : SwappedByteBuf | Test.java:1594:10:1594:32 | setBoolean(...) : SwappedByteBuf | provenance | MaD:34 |
+| Test.java:1594:10:1594:11 | in : SwappedByteBuf | Test.java:1594:10:1594:32 | setBoolean(...) : SwappedByteBuf | provenance | MaD:63 |
 | Test.java:1594:10:1594:32 | setBoolean(...) : SwappedByteBuf | Test.java:1595:9:1595:11 | out | provenance |  |
 | Test.java:1600:26:1600:51 | (...)... : CompositeByteBuf | Test.java:1601:10:1601:11 | in : CompositeByteBuf | provenance |  |
 | Test.java:1600:44:1600:51 | source(...) : Object | Test.java:1600:26:1600:51 | (...)... : CompositeByteBuf | provenance |  |
-| Test.java:1601:10:1601:11 | in : CompositeByteBuf | Test.java:1601:10:1601:32 | setBoolean(...) : CompositeByteBuf | provenance | MaD:34 |
+| Test.java:1601:10:1601:11 | in : CompositeByteBuf | Test.java:1601:10:1601:32 | setBoolean(...) : CompositeByteBuf | provenance | MaD:63 |
 | Test.java:1601:10:1601:32 | setBoolean(...) : CompositeByteBuf | Test.java:1602:9:1602:11 | out | provenance |  |
 | Test.java:1607:25:1607:49 | (...)... : AbstractByteBuf | Test.java:1608:10:1608:11 | in : AbstractByteBuf | provenance |  |
 | Test.java:1607:42:1607:49 | source(...) : Object | Test.java:1607:25:1607:49 | (...)... : AbstractByteBuf | provenance |  |
-| Test.java:1608:10:1608:11 | in : AbstractByteBuf | Test.java:1608:10:1608:25 | setByte(...) : AbstractByteBuf | provenance | MaD:35 |
+| Test.java:1608:10:1608:11 | in : AbstractByteBuf | Test.java:1608:10:1608:25 | setByte(...) : AbstractByteBuf | provenance | MaD:64 |
 | Test.java:1608:10:1608:25 | setByte(...) : AbstractByteBuf | Test.java:1609:9:1609:11 | out | provenance |  |
 | Test.java:1614:17:1614:33 | (...)... : ByteBuf | Test.java:1615:10:1615:11 | in : ByteBuf | provenance |  |
 | Test.java:1614:26:1614:33 | source(...) : Object | Test.java:1614:17:1614:33 | (...)... : ByteBuf | provenance |  |
-| Test.java:1615:10:1615:11 | in : ByteBuf | Test.java:1615:10:1615:25 | setByte(...) : ByteBuf | provenance | MaD:35 |
+| Test.java:1615:10:1615:11 | in : ByteBuf | Test.java:1615:10:1615:25 | setByte(...) : ByteBuf | provenance | MaD:64 |
 | Test.java:1615:10:1615:25 | setByte(...) : ByteBuf | Test.java:1616:9:1616:11 | out | provenance |  |
 | Test.java:1621:24:1621:47 | (...)... : SwappedByteBuf | Test.java:1622:10:1622:11 | in : SwappedByteBuf | provenance |  |
 | Test.java:1621:40:1621:47 | source(...) : Object | Test.java:1621:24:1621:47 | (...)... : SwappedByteBuf | provenance |  |
-| Test.java:1622:10:1622:11 | in : SwappedByteBuf | Test.java:1622:10:1622:25 | setByte(...) : SwappedByteBuf | provenance | MaD:35 |
+| Test.java:1622:10:1622:11 | in : SwappedByteBuf | Test.java:1622:10:1622:25 | setByte(...) : SwappedByteBuf | provenance | MaD:64 |
 | Test.java:1622:10:1622:25 | setByte(...) : SwappedByteBuf | Test.java:1623:9:1623:11 | out | provenance |  |
 | Test.java:1628:26:1628:51 | (...)... : CompositeByteBuf | Test.java:1629:10:1629:11 | in : CompositeByteBuf | provenance |  |
 | Test.java:1628:44:1628:51 | source(...) : Object | Test.java:1628:26:1628:51 | (...)... : CompositeByteBuf | provenance |  |
-| Test.java:1629:10:1629:11 | in : CompositeByteBuf | Test.java:1629:10:1629:25 | setByte(...) : CompositeByteBuf | provenance | MaD:35 |
+| Test.java:1629:10:1629:11 | in : CompositeByteBuf | Test.java:1629:10:1629:25 | setByte(...) : CompositeByteBuf | provenance | MaD:64 |
 | Test.java:1629:10:1629:25 | setByte(...) : CompositeByteBuf | Test.java:1630:9:1630:11 | out | provenance |  |
 | Test.java:1635:25:1635:49 | (...)... : AbstractByteBuf | Test.java:1636:10:1636:11 | in : AbstractByteBuf | provenance |  |
 | Test.java:1635:42:1635:49 | source(...) : Object | Test.java:1635:25:1635:49 | (...)... : AbstractByteBuf | provenance |  |
-| Test.java:1636:10:1636:11 | in : AbstractByteBuf | Test.java:1636:10:1636:38 | setBytes(...) : AbstractByteBuf | provenance | MaD:38 |
+| Test.java:1636:10:1636:11 | in : AbstractByteBuf | Test.java:1636:10:1636:38 | setBytes(...) : AbstractByteBuf | provenance | MaD:66 |
 | Test.java:1636:10:1636:38 | setBytes(...) : AbstractByteBuf | Test.java:1637:9:1637:11 | out | provenance |  |
 | Test.java:1642:17:1642:33 | (...)... : ByteBuf | Test.java:1643:10:1643:11 | in : ByteBuf | provenance |  |
 | Test.java:1642:26:1642:33 | source(...) : Object | Test.java:1642:17:1642:33 | (...)... : ByteBuf | provenance |  |
-| Test.java:1643:10:1643:11 | in : ByteBuf | Test.java:1643:10:1643:38 | setBytes(...) : ByteBuf | provenance | MaD:38 |
+| Test.java:1643:10:1643:11 | in : ByteBuf | Test.java:1643:10:1643:38 | setBytes(...) : ByteBuf | provenance | MaD:66 |
 | Test.java:1643:10:1643:38 | setBytes(...) : ByteBuf | Test.java:1644:9:1644:11 | out | provenance |  |
 | Test.java:1649:24:1649:47 | (...)... : SwappedByteBuf | Test.java:1650:10:1650:11 | in : SwappedByteBuf | provenance |  |
 | Test.java:1649:40:1649:47 | source(...) : Object | Test.java:1649:24:1649:47 | (...)... : SwappedByteBuf | provenance |  |
-| Test.java:1650:10:1650:11 | in : SwappedByteBuf | Test.java:1650:10:1650:38 | setBytes(...) : SwappedByteBuf | provenance | MaD:38 |
+| Test.java:1650:10:1650:11 | in : SwappedByteBuf | Test.java:1650:10:1650:38 | setBytes(...) : SwappedByteBuf | provenance | MaD:66 |
 | Test.java:1650:10:1650:38 | setBytes(...) : SwappedByteBuf | Test.java:1651:9:1651:11 | out | provenance |  |
 | Test.java:1656:26:1656:51 | (...)... : CompositeByteBuf | Test.java:1657:10:1657:11 | in : CompositeByteBuf | provenance |  |
 | Test.java:1656:44:1656:51 | source(...) : Object | Test.java:1656:26:1656:51 | (...)... : CompositeByteBuf | provenance |  |
-| Test.java:1657:10:1657:11 | in : CompositeByteBuf | Test.java:1657:10:1657:38 | setBytes(...) : CompositeByteBuf | provenance | MaD:38 |
+| Test.java:1657:10:1657:11 | in : CompositeByteBuf | Test.java:1657:10:1657:38 | setBytes(...) : CompositeByteBuf | provenance | MaD:66 |
 | Test.java:1657:10:1657:38 | setBytes(...) : CompositeByteBuf | Test.java:1658:9:1658:11 | out | provenance |  |
 | Test.java:1663:17:1663:33 | (...)... : ByteBuf | Test.java:1664:20:1664:21 | in : ByteBuf | provenance |  |
 | Test.java:1663:26:1663:33 | source(...) : Object | Test.java:1663:17:1663:33 | (...)... : ByteBuf | provenance |  |
 | Test.java:1664:4:1664:6 | out [post update] : AbstractByteBuf | Test.java:1665:9:1665:11 | out | provenance |  |
-| Test.java:1664:20:1664:21 | in : ByteBuf | Test.java:1664:4:1664:6 | out [post update] : AbstractByteBuf | provenance | MaD:116 |
+| Test.java:1664:20:1664:21 | in : ByteBuf | Test.java:1664:4:1664:6 | out [post update] : AbstractByteBuf | provenance | MaD:65 |
 | Test.java:1670:17:1670:33 | (...)... : ByteBuf | Test.java:1671:20:1671:21 | in : ByteBuf | provenance |  |
 | Test.java:1670:26:1670:33 | source(...) : Object | Test.java:1670:17:1670:33 | (...)... : ByteBuf | provenance |  |
 | Test.java:1671:4:1671:6 | out [post update] : ByteBuf | Test.java:1672:9:1672:11 | out | provenance |  |
-| Test.java:1671:20:1671:21 | in : ByteBuf | Test.java:1671:4:1671:6 | out [post update] : ByteBuf | provenance | MaD:116 |
+| Test.java:1671:20:1671:21 | in : ByteBuf | Test.java:1671:4:1671:6 | out [post update] : ByteBuf | provenance | MaD:65 |
 | Test.java:1677:17:1677:33 | (...)... : ByteBuf | Test.java:1678:20:1678:21 | in : ByteBuf | provenance |  |
 | Test.java:1677:26:1677:33 | source(...) : Object | Test.java:1677:17:1677:33 | (...)... : ByteBuf | provenance |  |
 | Test.java:1678:4:1678:6 | out [post update] : CompositeByteBuf | Test.java:1679:9:1679:11 | out | provenance |  |
-| Test.java:1678:20:1678:21 | in : ByteBuf | Test.java:1678:4:1678:6 | out [post update] : CompositeByteBuf | provenance | MaD:116 |
+| Test.java:1678:20:1678:21 | in : ByteBuf | Test.java:1678:4:1678:6 | out [post update] : CompositeByteBuf | provenance | MaD:65 |
 | Test.java:1684:17:1684:33 | (...)... : ByteBuf | Test.java:1685:20:1685:21 | in : ByteBuf | provenance |  |
 | Test.java:1684:26:1684:33 | source(...) : Object | Test.java:1684:17:1684:33 | (...)... : ByteBuf | provenance |  |
 | Test.java:1685:4:1685:6 | out [post update] : SwappedByteBuf | Test.java:1686:9:1686:11 | out | provenance |  |
-| Test.java:1685:20:1685:21 | in : ByteBuf | Test.java:1685:4:1685:6 | out [post update] : SwappedByteBuf | provenance | MaD:116 |
+| Test.java:1685:20:1685:21 | in : ByteBuf | Test.java:1685:4:1685:6 | out [post update] : SwappedByteBuf | provenance | MaD:65 |
 | Test.java:1691:25:1691:49 | (...)... : AbstractByteBuf | Test.java:1692:10:1692:11 | in : AbstractByteBuf | provenance |  |
 | Test.java:1691:42:1691:49 | source(...) : Object | Test.java:1691:25:1691:49 | (...)... : AbstractByteBuf | provenance |  |
-| Test.java:1692:10:1692:11 | in : AbstractByteBuf | Test.java:1692:10:1692:41 | setBytes(...) : AbstractByteBuf | provenance | MaD:40 |
+| Test.java:1692:10:1692:11 | in : AbstractByteBuf | Test.java:1692:10:1692:41 | setBytes(...) : AbstractByteBuf | provenance | MaD:68 |
 | Test.java:1692:10:1692:41 | setBytes(...) : AbstractByteBuf | Test.java:1693:9:1693:11 | out | provenance |  |
 | Test.java:1698:17:1698:33 | (...)... : ByteBuf | Test.java:1699:10:1699:11 | in : ByteBuf | provenance |  |
 | Test.java:1698:26:1698:33 | source(...) : Object | Test.java:1698:17:1698:33 | (...)... : ByteBuf | provenance |  |
-| Test.java:1699:10:1699:11 | in : ByteBuf | Test.java:1699:10:1699:41 | setBytes(...) : ByteBuf | provenance | MaD:40 |
+| Test.java:1699:10:1699:11 | in : ByteBuf | Test.java:1699:10:1699:41 | setBytes(...) : ByteBuf | provenance | MaD:68 |
 | Test.java:1699:10:1699:41 | setBytes(...) : ByteBuf | Test.java:1700:9:1700:11 | out | provenance |  |
 | Test.java:1705:24:1705:47 | (...)... : SwappedByteBuf | Test.java:1706:10:1706:11 | in : SwappedByteBuf | provenance |  |
 | Test.java:1705:40:1705:47 | source(...) : Object | Test.java:1705:24:1705:47 | (...)... : SwappedByteBuf | provenance |  |
-| Test.java:1706:10:1706:11 | in : SwappedByteBuf | Test.java:1706:10:1706:41 | setBytes(...) : SwappedByteBuf | provenance | MaD:40 |
+| Test.java:1706:10:1706:11 | in : SwappedByteBuf | Test.java:1706:10:1706:41 | setBytes(...) : SwappedByteBuf | provenance | MaD:68 |
 | Test.java:1706:10:1706:41 | setBytes(...) : SwappedByteBuf | Test.java:1707:9:1707:11 | out | provenance |  |
 | Test.java:1712:26:1712:51 | (...)... : CompositeByteBuf | Test.java:1713:10:1713:11 | in : CompositeByteBuf | provenance |  |
 | Test.java:1712:44:1712:51 | source(...) : Object | Test.java:1712:26:1712:51 | (...)... : CompositeByteBuf | provenance |  |
-| Test.java:1713:10:1713:11 | in : CompositeByteBuf | Test.java:1713:10:1713:41 | setBytes(...) : CompositeByteBuf | provenance | MaD:40 |
+| Test.java:1713:10:1713:11 | in : CompositeByteBuf | Test.java:1713:10:1713:41 | setBytes(...) : CompositeByteBuf | provenance | MaD:68 |
 | Test.java:1713:10:1713:41 | setBytes(...) : CompositeByteBuf | Test.java:1714:9:1714:11 | out | provenance |  |
 | Test.java:1719:17:1719:33 | (...)... : ByteBuf | Test.java:1720:20:1720:21 | in : ByteBuf | provenance |  |
 | Test.java:1719:26:1719:33 | source(...) : Object | Test.java:1719:17:1719:33 | (...)... : ByteBuf | provenance |  |
 | Test.java:1720:4:1720:6 | out [post update] : AbstractByteBuf | Test.java:1721:9:1721:11 | out | provenance |  |
-| Test.java:1720:20:1720:21 | in : ByteBuf | Test.java:1720:4:1720:6 | out [post update] : AbstractByteBuf | provenance | MaD:118 |
+| Test.java:1720:20:1720:21 | in : ByteBuf | Test.java:1720:4:1720:6 | out [post update] : AbstractByteBuf | provenance | MaD:67 |
 | Test.java:1726:17:1726:33 | (...)... : ByteBuf | Test.java:1727:20:1727:21 | in : ByteBuf | provenance |  |
 | Test.java:1726:26:1726:33 | source(...) : Object | Test.java:1726:17:1726:33 | (...)... : ByteBuf | provenance |  |
 | Test.java:1727:4:1727:6 | out [post update] : ByteBuf | Test.java:1728:9:1728:11 | out | provenance |  |
-| Test.java:1727:20:1727:21 | in : ByteBuf | Test.java:1727:4:1727:6 | out [post update] : ByteBuf | provenance | MaD:118 |
+| Test.java:1727:20:1727:21 | in : ByteBuf | Test.java:1727:4:1727:6 | out [post update] : ByteBuf | provenance | MaD:67 |
 | Test.java:1733:17:1733:33 | (...)... : ByteBuf | Test.java:1734:20:1734:21 | in : ByteBuf | provenance |  |
 | Test.java:1733:26:1733:33 | source(...) : Object | Test.java:1733:17:1733:33 | (...)... : ByteBuf | provenance |  |
 | Test.java:1734:4:1734:6 | out [post update] : CompositeByteBuf | Test.java:1735:9:1735:11 | out | provenance |  |
-| Test.java:1734:20:1734:21 | in : ByteBuf | Test.java:1734:4:1734:6 | out [post update] : CompositeByteBuf | provenance | MaD:118 |
+| Test.java:1734:20:1734:21 | in : ByteBuf | Test.java:1734:4:1734:6 | out [post update] : CompositeByteBuf | provenance | MaD:67 |
 | Test.java:1740:17:1740:33 | (...)... : ByteBuf | Test.java:1741:20:1741:21 | in : ByteBuf | provenance |  |
 | Test.java:1740:26:1740:33 | source(...) : Object | Test.java:1740:17:1740:33 | (...)... : ByteBuf | provenance |  |
 | Test.java:1741:4:1741:6 | out [post update] : SwappedByteBuf | Test.java:1742:9:1742:11 | out | provenance |  |
-| Test.java:1741:20:1741:21 | in : ByteBuf | Test.java:1741:4:1741:6 | out [post update] : SwappedByteBuf | provenance | MaD:118 |
+| Test.java:1741:20:1741:21 | in : ByteBuf | Test.java:1741:4:1741:6 | out [post update] : SwappedByteBuf | provenance | MaD:67 |
 | Test.java:1747:17:1747:33 | (...)... : ByteBuf | Test.java:1748:10:1748:11 | in : ByteBuf | provenance |  |
 | Test.java:1747:26:1747:33 | source(...) : Object | Test.java:1747:17:1747:33 | (...)... : ByteBuf | provenance |  |
-| Test.java:1748:10:1748:11 | in : ByteBuf | Test.java:1748:10:1748:44 | setBytes(...) : ByteBuf | provenance | MaD:41 |
+| Test.java:1748:10:1748:11 | in : ByteBuf | Test.java:1748:10:1748:44 | setBytes(...) : ByteBuf | provenance | MaD:70 |
 | Test.java:1748:10:1748:44 | setBytes(...) : ByteBuf | Test.java:1749:9:1749:11 | out | provenance |  |
 | Test.java:1754:24:1754:47 | (...)... : SwappedByteBuf | Test.java:1755:10:1755:11 | in : SwappedByteBuf | provenance |  |
 | Test.java:1754:40:1754:47 | source(...) : Object | Test.java:1754:24:1754:47 | (...)... : SwappedByteBuf | provenance |  |
-| Test.java:1755:10:1755:11 | in : SwappedByteBuf | Test.java:1755:10:1755:44 | setBytes(...) : SwappedByteBuf | provenance | MaD:41 |
+| Test.java:1755:10:1755:11 | in : SwappedByteBuf | Test.java:1755:10:1755:44 | setBytes(...) : SwappedByteBuf | provenance | MaD:70 |
 | Test.java:1755:10:1755:44 | setBytes(...) : SwappedByteBuf | Test.java:1756:9:1756:11 | out | provenance |  |
 | Test.java:1761:26:1761:51 | (...)... : CompositeByteBuf | Test.java:1762:10:1762:11 | in : CompositeByteBuf | provenance |  |
 | Test.java:1761:44:1761:51 | source(...) : Object | Test.java:1761:26:1761:51 | (...)... : CompositeByteBuf | provenance |  |
-| Test.java:1762:10:1762:11 | in : CompositeByteBuf | Test.java:1762:10:1762:44 | setBytes(...) : CompositeByteBuf | provenance | MaD:41 |
+| Test.java:1762:10:1762:11 | in : CompositeByteBuf | Test.java:1762:10:1762:44 | setBytes(...) : CompositeByteBuf | provenance | MaD:70 |
 | Test.java:1762:10:1762:44 | setBytes(...) : CompositeByteBuf | Test.java:1763:9:1763:11 | out | provenance |  |
 | Test.java:1768:17:1768:33 | (...)... : ByteBuf | Test.java:1769:20:1769:21 | in : ByteBuf | provenance |  |
 | Test.java:1768:26:1768:33 | source(...) : Object | Test.java:1768:17:1768:33 | (...)... : ByteBuf | provenance |  |
 | Test.java:1769:4:1769:6 | out [post update] : ByteBuf | Test.java:1770:9:1770:11 | out | provenance |  |
-| Test.java:1769:20:1769:21 | in : ByteBuf | Test.java:1769:4:1769:6 | out [post update] : ByteBuf | provenance | MaD:119 |
+| Test.java:1769:20:1769:21 | in : ByteBuf | Test.java:1769:4:1769:6 | out [post update] : ByteBuf | provenance | MaD:69 |
 | Test.java:1775:17:1775:33 | (...)... : ByteBuf | Test.java:1776:20:1776:21 | in : ByteBuf | provenance |  |
 | Test.java:1775:26:1775:33 | source(...) : Object | Test.java:1775:17:1775:33 | (...)... : ByteBuf | provenance |  |
 | Test.java:1776:4:1776:6 | out [post update] : CompositeByteBuf | Test.java:1777:9:1777:11 | out | provenance |  |
-| Test.java:1776:20:1776:21 | in : ByteBuf | Test.java:1776:4:1776:6 | out [post update] : CompositeByteBuf | provenance | MaD:119 |
+| Test.java:1776:20:1776:21 | in : ByteBuf | Test.java:1776:4:1776:6 | out [post update] : CompositeByteBuf | provenance | MaD:69 |
 | Test.java:1782:17:1782:33 | (...)... : ByteBuf | Test.java:1783:20:1783:21 | in : ByteBuf | provenance |  |
 | Test.java:1782:26:1782:33 | source(...) : Object | Test.java:1782:17:1782:33 | (...)... : ByteBuf | provenance |  |
 | Test.java:1783:4:1783:6 | out [post update] : SwappedByteBuf | Test.java:1784:9:1784:11 | out | provenance |  |
-| Test.java:1783:20:1783:21 | in : ByteBuf | Test.java:1783:4:1783:6 | out [post update] : SwappedByteBuf | provenance | MaD:119 |
+| Test.java:1783:20:1783:21 | in : ByteBuf | Test.java:1783:4:1783:6 | out [post update] : SwappedByteBuf | provenance | MaD:69 |
 | Test.java:1789:17:1789:33 | (...)... : ByteBuf | Test.java:1790:10:1790:11 | in : ByteBuf | provenance |  |
 | Test.java:1789:26:1789:33 | source(...) : Object | Test.java:1789:17:1789:33 | (...)... : ByteBuf | provenance |  |
-| Test.java:1790:10:1790:11 | in : ByteBuf | Test.java:1790:10:1790:41 | setBytes(...) : ByteBuf | provenance | MaD:39 |
+| Test.java:1790:10:1790:11 | in : ByteBuf | Test.java:1790:10:1790:41 | setBytes(...) : ByteBuf | provenance | MaD:72 |
 | Test.java:1790:10:1790:41 | setBytes(...) : ByteBuf | Test.java:1791:9:1791:11 | out | provenance |  |
 | Test.java:1796:24:1796:47 | (...)... : SwappedByteBuf | Test.java:1797:10:1797:11 | in : SwappedByteBuf | provenance |  |
 | Test.java:1796:40:1796:47 | source(...) : Object | Test.java:1796:24:1796:47 | (...)... : SwappedByteBuf | provenance |  |
-| Test.java:1797:10:1797:11 | in : SwappedByteBuf | Test.java:1797:10:1797:41 | setBytes(...) : SwappedByteBuf | provenance | MaD:39 |
+| Test.java:1797:10:1797:11 | in : SwappedByteBuf | Test.java:1797:10:1797:41 | setBytes(...) : SwappedByteBuf | provenance | MaD:72 |
 | Test.java:1797:10:1797:41 | setBytes(...) : SwappedByteBuf | Test.java:1798:9:1798:11 | out | provenance |  |
 | Test.java:1803:26:1803:51 | (...)... : CompositeByteBuf | Test.java:1804:10:1804:11 | in : CompositeByteBuf | provenance |  |
 | Test.java:1803:44:1803:51 | source(...) : Object | Test.java:1803:26:1803:51 | (...)... : CompositeByteBuf | provenance |  |
-| Test.java:1804:10:1804:11 | in : CompositeByteBuf | Test.java:1804:10:1804:41 | setBytes(...) : CompositeByteBuf | provenance | MaD:39 |
+| Test.java:1804:10:1804:11 | in : CompositeByteBuf | Test.java:1804:10:1804:41 | setBytes(...) : CompositeByteBuf | provenance | MaD:72 |
 | Test.java:1804:10:1804:41 | setBytes(...) : CompositeByteBuf | Test.java:1805:9:1805:11 | out | provenance |  |
 | Test.java:1810:20:1810:39 | (...)... : ByteBuffer | Test.java:1811:20:1811:21 | in : ByteBuffer | provenance |  |
 | Test.java:1810:32:1810:39 | source(...) : Object | Test.java:1810:20:1810:39 | (...)... : ByteBuffer | provenance |  |
 | Test.java:1811:4:1811:6 | out [post update] : ByteBuf | Test.java:1812:9:1812:11 | out | provenance |  |
-| Test.java:1811:20:1811:21 | in : ByteBuffer | Test.java:1811:4:1811:6 | out [post update] : ByteBuf | provenance | MaD:117 |
+| Test.java:1811:20:1811:21 | in : ByteBuffer | Test.java:1811:4:1811:6 | out [post update] : ByteBuf | provenance | MaD:71 |
 | Test.java:1817:20:1817:39 | (...)... : ByteBuffer | Test.java:1818:20:1818:21 | in : ByteBuffer | provenance |  |
 | Test.java:1817:32:1817:39 | source(...) : Object | Test.java:1817:20:1817:39 | (...)... : ByteBuffer | provenance |  |
 | Test.java:1818:4:1818:6 | out [post update] : CompositeByteBuf | Test.java:1819:9:1819:11 | out | provenance |  |
-| Test.java:1818:20:1818:21 | in : ByteBuffer | Test.java:1818:4:1818:6 | out [post update] : CompositeByteBuf | provenance | MaD:117 |
+| Test.java:1818:20:1818:21 | in : ByteBuffer | Test.java:1818:4:1818:6 | out [post update] : CompositeByteBuf | provenance | MaD:71 |
 | Test.java:1824:20:1824:39 | (...)... : ByteBuffer | Test.java:1825:20:1825:21 | in : ByteBuffer | provenance |  |
 | Test.java:1824:32:1824:39 | source(...) : Object | Test.java:1824:20:1824:39 | (...)... : ByteBuffer | provenance |  |
 | Test.java:1825:4:1825:6 | out [post update] : SwappedByteBuf | Test.java:1826:9:1826:11 | out | provenance |  |
-| Test.java:1825:20:1825:21 | in : ByteBuffer | Test.java:1825:4:1825:6 | out [post update] : SwappedByteBuf | provenance | MaD:117 |
+| Test.java:1825:20:1825:21 | in : ByteBuffer | Test.java:1825:4:1825:6 | out [post update] : SwappedByteBuf | provenance | MaD:71 |
 | Test.java:1831:21:1831:41 | (...)... : FileChannel | Test.java:1832:20:1832:21 | in : FileChannel | provenance |  |
 | Test.java:1831:34:1831:41 | source(...) : Object | Test.java:1831:21:1831:41 | (...)... : FileChannel | provenance |  |
 | Test.java:1832:4:1832:6 | out [post update] : ByteBuf | Test.java:1833:9:1833:11 | out | provenance |  |
-| Test.java:1832:20:1832:21 | in : FileChannel | Test.java:1832:4:1832:6 | out [post update] : ByteBuf | provenance | MaD:120 |
+| Test.java:1832:20:1832:21 | in : FileChannel | Test.java:1832:4:1832:6 | out [post update] : ByteBuf | provenance | MaD:73 |
 | Test.java:1838:21:1838:41 | (...)... : FileChannel | Test.java:1839:20:1839:21 | in : FileChannel | provenance |  |
 | Test.java:1838:34:1838:41 | source(...) : Object | Test.java:1838:21:1838:41 | (...)... : FileChannel | provenance |  |
 | Test.java:1839:4:1839:6 | out [post update] : CompositeByteBuf | Test.java:1840:9:1840:11 | out | provenance |  |
-| Test.java:1839:20:1839:21 | in : FileChannel | Test.java:1839:4:1839:6 | out [post update] : CompositeByteBuf | provenance | MaD:120 |
+| Test.java:1839:20:1839:21 | in : FileChannel | Test.java:1839:4:1839:6 | out [post update] : CompositeByteBuf | provenance | MaD:73 |
 | Test.java:1845:21:1845:41 | (...)... : FileChannel | Test.java:1846:20:1846:21 | in : FileChannel | provenance |  |
 | Test.java:1845:34:1845:41 | source(...) : Object | Test.java:1845:21:1845:41 | (...)... : FileChannel | provenance |  |
 | Test.java:1846:4:1846:6 | out [post update] : SwappedByteBuf | Test.java:1847:9:1847:11 | out | provenance |  |
-| Test.java:1846:20:1846:21 | in : FileChannel | Test.java:1846:4:1846:6 | out [post update] : SwappedByteBuf | provenance | MaD:120 |
+| Test.java:1846:20:1846:21 | in : FileChannel | Test.java:1846:4:1846:6 | out [post update] : SwappedByteBuf | provenance | MaD:73 |
 | Test.java:1852:21:1852:41 | (...)... : InputStream | Test.java:1853:20:1853:21 | in : InputStream | provenance |  |
 | Test.java:1852:34:1852:41 | source(...) : Object | Test.java:1852:21:1852:41 | (...)... : InputStream | provenance |  |
 | Test.java:1853:4:1853:6 | out [post update] : ByteBuf | Test.java:1854:9:1854:11 | out | provenance |  |
-| Test.java:1853:20:1853:21 | in : InputStream | Test.java:1853:4:1853:6 | out [post update] : ByteBuf | provenance | MaD:122 |
+| Test.java:1853:20:1853:21 | in : InputStream | Test.java:1853:4:1853:6 | out [post update] : ByteBuf | provenance | MaD:74 |
 | Test.java:1859:21:1859:41 | (...)... : InputStream | Test.java:1860:20:1860:21 | in : InputStream | provenance |  |
 | Test.java:1859:34:1859:41 | source(...) : Object | Test.java:1859:21:1859:41 | (...)... : InputStream | provenance |  |
 | Test.java:1860:4:1860:6 | out [post update] : CompositeByteBuf | Test.java:1861:9:1861:11 | out | provenance |  |
-| Test.java:1860:20:1860:21 | in : InputStream | Test.java:1860:4:1860:6 | out [post update] : CompositeByteBuf | provenance | MaD:122 |
+| Test.java:1860:20:1860:21 | in : InputStream | Test.java:1860:4:1860:6 | out [post update] : CompositeByteBuf | provenance | MaD:74 |
 | Test.java:1866:21:1866:41 | (...)... : InputStream | Test.java:1867:20:1867:21 | in : InputStream | provenance |  |
 | Test.java:1866:34:1866:41 | source(...) : Object | Test.java:1866:21:1866:41 | (...)... : InputStream | provenance |  |
 | Test.java:1867:4:1867:6 | out [post update] : SwappedByteBuf | Test.java:1868:9:1868:11 | out | provenance |  |
-| Test.java:1867:20:1867:21 | in : InputStream | Test.java:1867:4:1867:6 | out [post update] : SwappedByteBuf | provenance | MaD:122 |
+| Test.java:1867:20:1867:21 | in : InputStream | Test.java:1867:4:1867:6 | out [post update] : SwappedByteBuf | provenance | MaD:74 |
 | Test.java:1873:31:1873:61 | (...)... : ScatteringByteChannel | Test.java:1874:20:1874:21 | in : ScatteringByteChannel | provenance |  |
 | Test.java:1873:54:1873:61 | source(...) : Object | Test.java:1873:31:1873:61 | (...)... : ScatteringByteChannel | provenance |  |
 | Test.java:1874:4:1874:6 | out [post update] : ByteBuf | Test.java:1875:9:1875:11 | out | provenance |  |
-| Test.java:1874:20:1874:21 | in : ScatteringByteChannel | Test.java:1874:4:1874:6 | out [post update] : ByteBuf | provenance | MaD:121 |
+| Test.java:1874:20:1874:21 | in : ScatteringByteChannel | Test.java:1874:4:1874:6 | out [post update] : ByteBuf | provenance | MaD:75 |
 | Test.java:1880:31:1880:61 | (...)... : ScatteringByteChannel | Test.java:1881:20:1881:21 | in : ScatteringByteChannel | provenance |  |
 | Test.java:1880:54:1880:61 | source(...) : Object | Test.java:1880:31:1880:61 | (...)... : ScatteringByteChannel | provenance |  |
 | Test.java:1881:4:1881:6 | out [post update] : CompositeByteBuf | Test.java:1882:9:1882:11 | out | provenance |  |
-| Test.java:1881:20:1881:21 | in : ScatteringByteChannel | Test.java:1881:4:1881:6 | out [post update] : CompositeByteBuf | provenance | MaD:121 |
+| Test.java:1881:20:1881:21 | in : ScatteringByteChannel | Test.java:1881:4:1881:6 | out [post update] : CompositeByteBuf | provenance | MaD:75 |
 | Test.java:1887:31:1887:61 | (...)... : ScatteringByteChannel | Test.java:1888:20:1888:21 | in : ScatteringByteChannel | provenance |  |
 | Test.java:1887:54:1887:61 | source(...) : Object | Test.java:1887:31:1887:61 | (...)... : ScatteringByteChannel | provenance |  |
 | Test.java:1888:4:1888:6 | out [post update] : SwappedByteBuf | Test.java:1889:9:1889:11 | out | provenance |  |
-| Test.java:1888:20:1888:21 | in : ScatteringByteChannel | Test.java:1888:4:1888:6 | out [post update] : SwappedByteBuf | provenance | MaD:121 |
+| Test.java:1888:20:1888:21 | in : ScatteringByteChannel | Test.java:1888:4:1888:6 | out [post update] : SwappedByteBuf | provenance | MaD:75 |
 | Test.java:1894:25:1894:49 | (...)... : AbstractByteBuf | Test.java:1895:10:1895:11 | in : AbstractByteBuf | provenance |  |
 | Test.java:1894:42:1894:49 | source(...) : Object | Test.java:1894:25:1894:49 | (...)... : AbstractByteBuf | provenance |  |
-| Test.java:1895:10:1895:11 | in : AbstractByteBuf | Test.java:1895:10:1895:37 | setBytes(...) : AbstractByteBuf | provenance | MaD:36 |
+| Test.java:1895:10:1895:11 | in : AbstractByteBuf | Test.java:1895:10:1895:37 | setBytes(...) : AbstractByteBuf | provenance | MaD:77 |
 | Test.java:1895:10:1895:37 | setBytes(...) : AbstractByteBuf | Test.java:1896:9:1896:11 | out | provenance |  |
 | Test.java:1901:17:1901:33 | (...)... : ByteBuf | Test.java:1902:10:1902:11 | in : ByteBuf | provenance |  |
 | Test.java:1901:26:1901:33 | source(...) : Object | Test.java:1901:17:1901:33 | (...)... : ByteBuf | provenance |  |
-| Test.java:1902:10:1902:11 | in : ByteBuf | Test.java:1902:10:1902:37 | setBytes(...) : ByteBuf | provenance | MaD:36 |
+| Test.java:1902:10:1902:11 | in : ByteBuf | Test.java:1902:10:1902:37 | setBytes(...) : ByteBuf | provenance | MaD:77 |
 | Test.java:1902:10:1902:37 | setBytes(...) : ByteBuf | Test.java:1903:9:1903:11 | out | provenance |  |
 | Test.java:1908:24:1908:47 | (...)... : SwappedByteBuf | Test.java:1909:10:1909:11 | in : SwappedByteBuf | provenance |  |
 | Test.java:1908:40:1908:47 | source(...) : Object | Test.java:1908:24:1908:47 | (...)... : SwappedByteBuf | provenance |  |
-| Test.java:1909:10:1909:11 | in : SwappedByteBuf | Test.java:1909:10:1909:37 | setBytes(...) : SwappedByteBuf | provenance | MaD:36 |
+| Test.java:1909:10:1909:11 | in : SwappedByteBuf | Test.java:1909:10:1909:37 | setBytes(...) : SwappedByteBuf | provenance | MaD:77 |
 | Test.java:1909:10:1909:37 | setBytes(...) : SwappedByteBuf | Test.java:1910:9:1910:11 | out | provenance |  |
 | Test.java:1915:26:1915:51 | (...)... : CompositeByteBuf | Test.java:1916:10:1916:11 | in : CompositeByteBuf | provenance |  |
 | Test.java:1915:44:1915:51 | source(...) : Object | Test.java:1915:26:1915:51 | (...)... : CompositeByteBuf | provenance |  |
-| Test.java:1916:10:1916:11 | in : CompositeByteBuf | Test.java:1916:10:1916:37 | setBytes(...) : CompositeByteBuf | provenance | MaD:36 |
+| Test.java:1916:10:1916:11 | in : CompositeByteBuf | Test.java:1916:10:1916:37 | setBytes(...) : CompositeByteBuf | provenance | MaD:77 |
 | Test.java:1916:10:1916:37 | setBytes(...) : CompositeByteBuf | Test.java:1917:9:1917:11 | out | provenance |  |
 | Test.java:1922:16:1922:31 | (...)... : byte[] | Test.java:1923:20:1923:21 | in : byte[] | provenance |  |
 | Test.java:1922:24:1922:31 | source(...) : Object | Test.java:1922:16:1922:31 | (...)... : byte[] | provenance |  |
 | Test.java:1923:4:1923:6 | out [post update] : AbstractByteBuf | Test.java:1924:9:1924:11 | out | provenance |  |
-| Test.java:1923:20:1923:21 | in : byte[] | Test.java:1923:4:1923:6 | out [post update] : AbstractByteBuf | provenance | MaD:114 |
+| Test.java:1923:20:1923:21 | in : byte[] | Test.java:1923:4:1923:6 | out [post update] : AbstractByteBuf | provenance | MaD:76 |
 | Test.java:1929:16:1929:31 | (...)... : byte[] | Test.java:1930:20:1930:21 | in : byte[] | provenance |  |
 | Test.java:1929:24:1929:31 | source(...) : Object | Test.java:1929:16:1929:31 | (...)... : byte[] | provenance |  |
 | Test.java:1930:4:1930:6 | out [post update] : ByteBuf | Test.java:1931:9:1931:11 | out | provenance |  |
-| Test.java:1930:20:1930:21 | in : byte[] | Test.java:1930:4:1930:6 | out [post update] : ByteBuf | provenance | MaD:114 |
+| Test.java:1930:20:1930:21 | in : byte[] | Test.java:1930:4:1930:6 | out [post update] : ByteBuf | provenance | MaD:76 |
 | Test.java:1936:16:1936:31 | (...)... : byte[] | Test.java:1937:20:1937:21 | in : byte[] | provenance |  |
 | Test.java:1936:24:1936:31 | source(...) : Object | Test.java:1936:16:1936:31 | (...)... : byte[] | provenance |  |
 | Test.java:1937:4:1937:6 | out [post update] : CompositeByteBuf | Test.java:1938:9:1938:11 | out | provenance |  |
-| Test.java:1937:20:1937:21 | in : byte[] | Test.java:1937:4:1937:6 | out [post update] : CompositeByteBuf | provenance | MaD:114 |
+| Test.java:1937:20:1937:21 | in : byte[] | Test.java:1937:4:1937:6 | out [post update] : CompositeByteBuf | provenance | MaD:76 |
 | Test.java:1943:16:1943:31 | (...)... : byte[] | Test.java:1944:20:1944:21 | in : byte[] | provenance |  |
 | Test.java:1943:24:1943:31 | source(...) : Object | Test.java:1943:16:1943:31 | (...)... : byte[] | provenance |  |
 | Test.java:1944:4:1944:6 | out [post update] : SwappedByteBuf | Test.java:1945:9:1945:11 | out | provenance |  |
-| Test.java:1944:20:1944:21 | in : byte[] | Test.java:1944:4:1944:6 | out [post update] : SwappedByteBuf | provenance | MaD:114 |
+| Test.java:1944:20:1944:21 | in : byte[] | Test.java:1944:4:1944:6 | out [post update] : SwappedByteBuf | provenance | MaD:76 |
 | Test.java:1950:17:1950:33 | (...)... : ByteBuf | Test.java:1951:10:1951:11 | in : ByteBuf | provenance |  |
 | Test.java:1950:26:1950:33 | source(...) : Object | Test.java:1950:17:1950:33 | (...)... : ByteBuf | provenance |  |
-| Test.java:1951:10:1951:11 | in : ByteBuf | Test.java:1951:10:1951:43 | setBytes(...) : ByteBuf | provenance | MaD:37 |
+| Test.java:1951:10:1951:11 | in : ByteBuf | Test.java:1951:10:1951:43 | setBytes(...) : ByteBuf | provenance | MaD:79 |
 | Test.java:1951:10:1951:43 | setBytes(...) : ByteBuf | Test.java:1952:9:1952:11 | out | provenance |  |
 | Test.java:1957:24:1957:47 | (...)... : SwappedByteBuf | Test.java:1958:10:1958:11 | in : SwappedByteBuf | provenance |  |
 | Test.java:1957:40:1957:47 | source(...) : Object | Test.java:1957:24:1957:47 | (...)... : SwappedByteBuf | provenance |  |
-| Test.java:1958:10:1958:11 | in : SwappedByteBuf | Test.java:1958:10:1958:43 | setBytes(...) : SwappedByteBuf | provenance | MaD:37 |
+| Test.java:1958:10:1958:11 | in : SwappedByteBuf | Test.java:1958:10:1958:43 | setBytes(...) : SwappedByteBuf | provenance | MaD:79 |
 | Test.java:1958:10:1958:43 | setBytes(...) : SwappedByteBuf | Test.java:1959:9:1959:11 | out | provenance |  |
 | Test.java:1964:26:1964:51 | (...)... : CompositeByteBuf | Test.java:1965:10:1965:11 | in : CompositeByteBuf | provenance |  |
 | Test.java:1964:44:1964:51 | source(...) : Object | Test.java:1964:26:1964:51 | (...)... : CompositeByteBuf | provenance |  |
-| Test.java:1965:10:1965:11 | in : CompositeByteBuf | Test.java:1965:10:1965:43 | setBytes(...) : CompositeByteBuf | provenance | MaD:37 |
+| Test.java:1965:10:1965:11 | in : CompositeByteBuf | Test.java:1965:10:1965:43 | setBytes(...) : CompositeByteBuf | provenance | MaD:79 |
 | Test.java:1965:10:1965:43 | setBytes(...) : CompositeByteBuf | Test.java:1966:9:1966:11 | out | provenance |  |
 | Test.java:1971:16:1971:31 | (...)... : byte[] | Test.java:1972:20:1972:21 | in : byte[] | provenance |  |
 | Test.java:1971:24:1971:31 | source(...) : Object | Test.java:1971:16:1971:31 | (...)... : byte[] | provenance |  |
 | Test.java:1972:4:1972:6 | out [post update] : ByteBuf | Test.java:1973:9:1973:11 | out | provenance |  |
-| Test.java:1972:20:1972:21 | in : byte[] | Test.java:1972:4:1972:6 | out [post update] : ByteBuf | provenance | MaD:115 |
+| Test.java:1972:20:1972:21 | in : byte[] | Test.java:1972:4:1972:6 | out [post update] : ByteBuf | provenance | MaD:78 |
 | Test.java:1978:16:1978:31 | (...)... : byte[] | Test.java:1979:20:1979:21 | in : byte[] | provenance |  |
 | Test.java:1978:24:1978:31 | source(...) : Object | Test.java:1978:16:1978:31 | (...)... : byte[] | provenance |  |
 | Test.java:1979:4:1979:6 | out [post update] : CompositeByteBuf | Test.java:1980:9:1980:11 | out | provenance |  |
-| Test.java:1979:20:1979:21 | in : byte[] | Test.java:1979:4:1979:6 | out [post update] : CompositeByteBuf | provenance | MaD:115 |
+| Test.java:1979:20:1979:21 | in : byte[] | Test.java:1979:4:1979:6 | out [post update] : CompositeByteBuf | provenance | MaD:78 |
 | Test.java:1985:16:1985:31 | (...)... : byte[] | Test.java:1986:20:1986:21 | in : byte[] | provenance |  |
 | Test.java:1985:24:1985:31 | source(...) : Object | Test.java:1985:16:1985:31 | (...)... : byte[] | provenance |  |
 | Test.java:1986:4:1986:6 | out [post update] : SwappedByteBuf | Test.java:1987:9:1987:11 | out | provenance |  |
-| Test.java:1986:20:1986:21 | in : byte[] | Test.java:1986:4:1986:6 | out [post update] : SwappedByteBuf | provenance | MaD:115 |
+| Test.java:1986:20:1986:21 | in : byte[] | Test.java:1986:4:1986:6 | out [post update] : SwappedByteBuf | provenance | MaD:78 |
 | Test.java:1992:25:1992:49 | (...)... : AbstractByteBuf | Test.java:1993:10:1993:11 | in : AbstractByteBuf | provenance |  |
 | Test.java:1992:42:1992:49 | source(...) : Object | Test.java:1992:25:1992:49 | (...)... : AbstractByteBuf | provenance |  |
-| Test.java:1993:10:1993:11 | in : AbstractByteBuf | Test.java:1993:10:1993:25 | setChar(...) : AbstractByteBuf | provenance | MaD:42 |
+| Test.java:1993:10:1993:11 | in : AbstractByteBuf | Test.java:1993:10:1993:25 | setChar(...) : AbstractByteBuf | provenance | MaD:81 |
 | Test.java:1993:10:1993:25 | setChar(...) : AbstractByteBuf | Test.java:1994:9:1994:11 | out | provenance |  |
 | Test.java:1999:17:1999:33 | (...)... : ByteBuf | Test.java:2000:10:2000:11 | in : ByteBuf | provenance |  |
 | Test.java:1999:26:1999:33 | source(...) : Object | Test.java:1999:17:1999:33 | (...)... : ByteBuf | provenance |  |
-| Test.java:2000:10:2000:11 | in : ByteBuf | Test.java:2000:10:2000:25 | setChar(...) : ByteBuf | provenance | MaD:42 |
+| Test.java:2000:10:2000:11 | in : ByteBuf | Test.java:2000:10:2000:25 | setChar(...) : ByteBuf | provenance | MaD:81 |
 | Test.java:2000:10:2000:25 | setChar(...) : ByteBuf | Test.java:2001:9:2001:11 | out | provenance |  |
 | Test.java:2006:24:2006:47 | (...)... : SwappedByteBuf | Test.java:2007:10:2007:11 | in : SwappedByteBuf | provenance |  |
 | Test.java:2006:40:2006:47 | source(...) : Object | Test.java:2006:24:2006:47 | (...)... : SwappedByteBuf | provenance |  |
-| Test.java:2007:10:2007:11 | in : SwappedByteBuf | Test.java:2007:10:2007:25 | setChar(...) : SwappedByteBuf | provenance | MaD:42 |
+| Test.java:2007:10:2007:11 | in : SwappedByteBuf | Test.java:2007:10:2007:25 | setChar(...) : SwappedByteBuf | provenance | MaD:81 |
 | Test.java:2007:10:2007:25 | setChar(...) : SwappedByteBuf | Test.java:2008:9:2008:11 | out | provenance |  |
 | Test.java:2013:26:2013:51 | (...)... : CompositeByteBuf | Test.java:2014:10:2014:11 | in : CompositeByteBuf | provenance |  |
 | Test.java:2013:44:2013:51 | source(...) : Object | Test.java:2013:26:2013:51 | (...)... : CompositeByteBuf | provenance |  |
-| Test.java:2014:10:2014:11 | in : CompositeByteBuf | Test.java:2014:10:2014:25 | setChar(...) : CompositeByteBuf | provenance | MaD:42 |
+| Test.java:2014:10:2014:11 | in : CompositeByteBuf | Test.java:2014:10:2014:25 | setChar(...) : CompositeByteBuf | provenance | MaD:81 |
 | Test.java:2014:10:2014:25 | setChar(...) : CompositeByteBuf | Test.java:2015:9:2015:11 | out | provenance |  |
 | Test.java:2020:13:2020:25 | (...)... : Number | Test.java:2021:19:2021:20 | in : Number | provenance |  |
 | Test.java:2020:18:2020:25 | source(...) : Object | Test.java:2020:13:2020:25 | (...)... : Number | provenance |  |
 | Test.java:2021:4:2021:6 | out [post update] : AbstractByteBuf | Test.java:2022:9:2022:11 | out | provenance |  |
-| Test.java:2021:19:2021:20 | in : Number | Test.java:2021:4:2021:6 | out [post update] : AbstractByteBuf | provenance | MaD:123 |
+| Test.java:2021:19:2021:20 | in : Number | Test.java:2021:4:2021:6 | out [post update] : AbstractByteBuf | provenance | MaD:80 |
 | Test.java:2027:13:2027:25 | (...)... : Number | Test.java:2028:19:2028:20 | in : Number | provenance |  |
 | Test.java:2027:18:2027:25 | source(...) : Object | Test.java:2027:13:2027:25 | (...)... : Number | provenance |  |
 | Test.java:2028:4:2028:6 | out [post update] : ByteBuf | Test.java:2029:9:2029:11 | out | provenance |  |
-| Test.java:2028:19:2028:20 | in : Number | Test.java:2028:4:2028:6 | out [post update] : ByteBuf | provenance | MaD:123 |
+| Test.java:2028:19:2028:20 | in : Number | Test.java:2028:4:2028:6 | out [post update] : ByteBuf | provenance | MaD:80 |
 | Test.java:2034:13:2034:25 | (...)... : Number | Test.java:2035:19:2035:20 | in : Number | provenance |  |
 | Test.java:2034:18:2034:25 | source(...) : Object | Test.java:2034:13:2034:25 | (...)... : Number | provenance |  |
 | Test.java:2035:4:2035:6 | out [post update] : CompositeByteBuf | Test.java:2036:9:2036:11 | out | provenance |  |
-| Test.java:2035:19:2035:20 | in : Number | Test.java:2035:4:2035:6 | out [post update] : CompositeByteBuf | provenance | MaD:123 |
+| Test.java:2035:19:2035:20 | in : Number | Test.java:2035:4:2035:6 | out [post update] : CompositeByteBuf | provenance | MaD:80 |
 | Test.java:2041:13:2041:25 | (...)... : Number | Test.java:2042:19:2042:20 | in : Number | provenance |  |
 | Test.java:2041:18:2041:25 | source(...) : Object | Test.java:2041:13:2041:25 | (...)... : Number | provenance |  |
 | Test.java:2042:4:2042:6 | out [post update] : SwappedByteBuf | Test.java:2043:9:2043:11 | out | provenance |  |
-| Test.java:2042:19:2042:20 | in : Number | Test.java:2042:4:2042:6 | out [post update] : SwappedByteBuf | provenance | MaD:123 |
+| Test.java:2042:19:2042:20 | in : Number | Test.java:2042:4:2042:6 | out [post update] : SwappedByteBuf | provenance | MaD:80 |
 | Test.java:2048:22:2048:43 | (...)... : CharSequence | Test.java:2049:27:2049:28 | in : CharSequence | provenance |  |
 | Test.java:2048:36:2048:43 | source(...) : Object | Test.java:2048:22:2048:43 | (...)... : CharSequence | provenance |  |
 | Test.java:2049:4:2049:6 | out [post update] : AbstractByteBuf | Test.java:2050:9:2050:11 | out | provenance |  |
-| Test.java:2049:27:2049:28 | in : CharSequence | Test.java:2049:4:2049:6 | out [post update] : AbstractByteBuf | provenance | MaD:124 |
+| Test.java:2049:27:2049:28 | in : CharSequence | Test.java:2049:4:2049:6 | out [post update] : AbstractByteBuf | provenance | MaD:82 |
 | Test.java:2055:22:2055:43 | (...)... : CharSequence | Test.java:2056:27:2056:28 | in : CharSequence | provenance |  |
 | Test.java:2055:36:2055:43 | source(...) : Object | Test.java:2055:22:2055:43 | (...)... : CharSequence | provenance |  |
 | Test.java:2056:4:2056:6 | out [post update] : ByteBuf | Test.java:2057:9:2057:11 | out | provenance |  |
-| Test.java:2056:27:2056:28 | in : CharSequence | Test.java:2056:4:2056:6 | out [post update] : ByteBuf | provenance | MaD:124 |
+| Test.java:2056:27:2056:28 | in : CharSequence | Test.java:2056:4:2056:6 | out [post update] : ByteBuf | provenance | MaD:82 |
 | Test.java:2062:22:2062:43 | (...)... : CharSequence | Test.java:2063:27:2063:28 | in : CharSequence | provenance |  |
 | Test.java:2062:36:2062:43 | source(...) : Object | Test.java:2062:22:2062:43 | (...)... : CharSequence | provenance |  |
 | Test.java:2063:4:2063:6 | out [post update] : SwappedByteBuf | Test.java:2064:9:2064:11 | out | provenance |  |
-| Test.java:2063:27:2063:28 | in : CharSequence | Test.java:2063:4:2063:6 | out [post update] : SwappedByteBuf | provenance | MaD:124 |
+| Test.java:2063:27:2063:28 | in : CharSequence | Test.java:2063:4:2063:6 | out [post update] : SwappedByteBuf | provenance | MaD:82 |
 | Test.java:2069:25:2069:49 | (...)... : AbstractByteBuf | Test.java:2070:10:2070:11 | in : AbstractByteBuf | provenance |  |
 | Test.java:2069:42:2069:49 | source(...) : Object | Test.java:2069:25:2069:49 | (...)... : AbstractByteBuf | provenance |  |
-| Test.java:2070:10:2070:11 | in : AbstractByteBuf | Test.java:2070:10:2070:29 | setDouble(...) : AbstractByteBuf | provenance | MaD:43 |
+| Test.java:2070:10:2070:11 | in : AbstractByteBuf | Test.java:2070:10:2070:29 | setDouble(...) : AbstractByteBuf | provenance | MaD:83 |
 | Test.java:2070:10:2070:29 | setDouble(...) : AbstractByteBuf | Test.java:2071:9:2071:11 | out | provenance |  |
 | Test.java:2076:17:2076:33 | (...)... : ByteBuf | Test.java:2077:10:2077:11 | in : ByteBuf | provenance |  |
 | Test.java:2076:26:2076:33 | source(...) : Object | Test.java:2076:17:2076:33 | (...)... : ByteBuf | provenance |  |
-| Test.java:2077:10:2077:11 | in : ByteBuf | Test.java:2077:10:2077:29 | setDouble(...) : ByteBuf | provenance | MaD:43 |
+| Test.java:2077:10:2077:11 | in : ByteBuf | Test.java:2077:10:2077:29 | setDouble(...) : ByteBuf | provenance | MaD:83 |
 | Test.java:2077:10:2077:29 | setDouble(...) : ByteBuf | Test.java:2078:9:2078:11 | out | provenance |  |
 | Test.java:2083:24:2083:47 | (...)... : SwappedByteBuf | Test.java:2084:10:2084:11 | in : SwappedByteBuf | provenance |  |
 | Test.java:2083:40:2083:47 | source(...) : Object | Test.java:2083:24:2083:47 | (...)... : SwappedByteBuf | provenance |  |
-| Test.java:2084:10:2084:11 | in : SwappedByteBuf | Test.java:2084:10:2084:29 | setDouble(...) : SwappedByteBuf | provenance | MaD:43 |
+| Test.java:2084:10:2084:11 | in : SwappedByteBuf | Test.java:2084:10:2084:29 | setDouble(...) : SwappedByteBuf | provenance | MaD:83 |
 | Test.java:2084:10:2084:29 | setDouble(...) : SwappedByteBuf | Test.java:2085:9:2085:11 | out | provenance |  |
 | Test.java:2090:26:2090:51 | (...)... : CompositeByteBuf | Test.java:2091:10:2091:11 | in : CompositeByteBuf | provenance |  |
 | Test.java:2090:44:2090:51 | source(...) : Object | Test.java:2090:26:2090:51 | (...)... : CompositeByteBuf | provenance |  |
-| Test.java:2091:10:2091:11 | in : CompositeByteBuf | Test.java:2091:10:2091:29 | setDouble(...) : CompositeByteBuf | provenance | MaD:43 |
+| Test.java:2091:10:2091:11 | in : CompositeByteBuf | Test.java:2091:10:2091:29 | setDouble(...) : CompositeByteBuf | provenance | MaD:83 |
 | Test.java:2091:10:2091:29 | setDouble(...) : CompositeByteBuf | Test.java:2092:9:2092:11 | out | provenance |  |
 | Test.java:2097:17:2097:33 | (...)... : ByteBuf | Test.java:2098:10:2098:11 | in : ByteBuf | provenance |  |
 | Test.java:2097:26:2097:33 | source(...) : Object | Test.java:2097:17:2097:33 | (...)... : ByteBuf | provenance |  |
-| Test.java:2098:10:2098:11 | in : ByteBuf | Test.java:2098:10:2098:31 | setDoubleLE(...) : ByteBuf | provenance | MaD:44 |
+| Test.java:2098:10:2098:11 | in : ByteBuf | Test.java:2098:10:2098:31 | setDoubleLE(...) : ByteBuf | provenance | MaD:84 |
 | Test.java:2098:10:2098:31 | setDoubleLE(...) : ByteBuf | Test.java:2099:9:2099:11 | out | provenance |  |
 | Test.java:2104:25:2104:49 | (...)... : AbstractByteBuf | Test.java:2105:10:2105:11 | in : AbstractByteBuf | provenance |  |
 | Test.java:2104:42:2104:49 | source(...) : Object | Test.java:2104:25:2104:49 | (...)... : AbstractByteBuf | provenance |  |
-| Test.java:2105:10:2105:11 | in : AbstractByteBuf | Test.java:2105:10:2105:29 | setFloat(...) : AbstractByteBuf | provenance | MaD:45 |
+| Test.java:2105:10:2105:11 | in : AbstractByteBuf | Test.java:2105:10:2105:29 | setFloat(...) : AbstractByteBuf | provenance | MaD:85 |
 | Test.java:2105:10:2105:29 | setFloat(...) : AbstractByteBuf | Test.java:2106:9:2106:11 | out | provenance |  |
 | Test.java:2111:17:2111:33 | (...)... : ByteBuf | Test.java:2112:10:2112:11 | in : ByteBuf | provenance |  |
 | Test.java:2111:26:2111:33 | source(...) : Object | Test.java:2111:17:2111:33 | (...)... : ByteBuf | provenance |  |
-| Test.java:2112:10:2112:11 | in : ByteBuf | Test.java:2112:10:2112:29 | setFloat(...) : ByteBuf | provenance | MaD:45 |
+| Test.java:2112:10:2112:11 | in : ByteBuf | Test.java:2112:10:2112:29 | setFloat(...) : ByteBuf | provenance | MaD:85 |
 | Test.java:2112:10:2112:29 | setFloat(...) : ByteBuf | Test.java:2113:9:2113:11 | out | provenance |  |
 | Test.java:2118:24:2118:47 | (...)... : SwappedByteBuf | Test.java:2119:10:2119:11 | in : SwappedByteBuf | provenance |  |
 | Test.java:2118:40:2118:47 | source(...) : Object | Test.java:2118:24:2118:47 | (...)... : SwappedByteBuf | provenance |  |
-| Test.java:2119:10:2119:11 | in : SwappedByteBuf | Test.java:2119:10:2119:29 | setFloat(...) : SwappedByteBuf | provenance | MaD:45 |
+| Test.java:2119:10:2119:11 | in : SwappedByteBuf | Test.java:2119:10:2119:29 | setFloat(...) : SwappedByteBuf | provenance | MaD:85 |
 | Test.java:2119:10:2119:29 | setFloat(...) : SwappedByteBuf | Test.java:2120:9:2120:11 | out | provenance |  |
 | Test.java:2125:26:2125:51 | (...)... : CompositeByteBuf | Test.java:2126:10:2126:11 | in : CompositeByteBuf | provenance |  |
 | Test.java:2125:44:2125:51 | source(...) : Object | Test.java:2125:26:2125:51 | (...)... : CompositeByteBuf | provenance |  |
-| Test.java:2126:10:2126:11 | in : CompositeByteBuf | Test.java:2126:10:2126:29 | setFloat(...) : CompositeByteBuf | provenance | MaD:45 |
+| Test.java:2126:10:2126:11 | in : CompositeByteBuf | Test.java:2126:10:2126:29 | setFloat(...) : CompositeByteBuf | provenance | MaD:85 |
 | Test.java:2126:10:2126:29 | setFloat(...) : CompositeByteBuf | Test.java:2127:9:2127:11 | out | provenance |  |
 | Test.java:2132:17:2132:33 | (...)... : ByteBuf | Test.java:2133:10:2133:11 | in : ByteBuf | provenance |  |
 | Test.java:2132:26:2132:33 | source(...) : Object | Test.java:2132:17:2132:33 | (...)... : ByteBuf | provenance |  |
-| Test.java:2133:10:2133:11 | in : ByteBuf | Test.java:2133:10:2133:31 | setFloatLE(...) : ByteBuf | provenance | MaD:46 |
+| Test.java:2133:10:2133:11 | in : ByteBuf | Test.java:2133:10:2133:31 | setFloatLE(...) : ByteBuf | provenance | MaD:86 |
 | Test.java:2133:10:2133:31 | setFloatLE(...) : ByteBuf | Test.java:2134:9:2134:11 | out | provenance |  |
 | Test.java:2139:25:2139:49 | (...)... : AbstractByteBuf | Test.java:2140:10:2140:11 | in : AbstractByteBuf | provenance |  |
 | Test.java:2139:42:2139:49 | source(...) : Object | Test.java:2139:25:2139:49 | (...)... : AbstractByteBuf | provenance |  |
-| Test.java:2140:10:2140:11 | in : AbstractByteBuf | Test.java:2140:10:2140:26 | setIndex(...) : AbstractByteBuf | provenance | MaD:47 |
+| Test.java:2140:10:2140:11 | in : AbstractByteBuf | Test.java:2140:10:2140:26 | setIndex(...) : AbstractByteBuf | provenance | MaD:87 |
 | Test.java:2140:10:2140:26 | setIndex(...) : AbstractByteBuf | Test.java:2141:9:2141:11 | out | provenance |  |
 | Test.java:2146:17:2146:33 | (...)... : ByteBuf | Test.java:2147:10:2147:11 | in : ByteBuf | provenance |  |
 | Test.java:2146:26:2146:33 | source(...) : Object | Test.java:2146:17:2146:33 | (...)... : ByteBuf | provenance |  |
-| Test.java:2147:10:2147:11 | in : ByteBuf | Test.java:2147:10:2147:26 | setIndex(...) : ByteBuf | provenance | MaD:47 |
+| Test.java:2147:10:2147:11 | in : ByteBuf | Test.java:2147:10:2147:26 | setIndex(...) : ByteBuf | provenance | MaD:87 |
 | Test.java:2147:10:2147:26 | setIndex(...) : ByteBuf | Test.java:2148:9:2148:11 | out | provenance |  |
 | Test.java:2153:24:2153:47 | (...)... : SwappedByteBuf | Test.java:2154:10:2154:11 | in : SwappedByteBuf | provenance |  |
 | Test.java:2153:40:2153:47 | source(...) : Object | Test.java:2153:24:2153:47 | (...)... : SwappedByteBuf | provenance |  |
-| Test.java:2154:10:2154:11 | in : SwappedByteBuf | Test.java:2154:10:2154:26 | setIndex(...) : SwappedByteBuf | provenance | MaD:47 |
+| Test.java:2154:10:2154:11 | in : SwappedByteBuf | Test.java:2154:10:2154:26 | setIndex(...) : SwappedByteBuf | provenance | MaD:87 |
 | Test.java:2154:10:2154:26 | setIndex(...) : SwappedByteBuf | Test.java:2155:9:2155:11 | out | provenance |  |
 | Test.java:2160:26:2160:51 | (...)... : CompositeByteBuf | Test.java:2161:10:2161:11 | in : CompositeByteBuf | provenance |  |
 | Test.java:2160:44:2160:51 | source(...) : Object | Test.java:2160:26:2160:51 | (...)... : CompositeByteBuf | provenance |  |
-| Test.java:2161:10:2161:11 | in : CompositeByteBuf | Test.java:2161:10:2161:26 | setIndex(...) : CompositeByteBuf | provenance | MaD:47 |
+| Test.java:2161:10:2161:11 | in : CompositeByteBuf | Test.java:2161:10:2161:26 | setIndex(...) : CompositeByteBuf | provenance | MaD:87 |
 | Test.java:2161:10:2161:26 | setIndex(...) : CompositeByteBuf | Test.java:2162:9:2162:11 | out | provenance |  |
 | Test.java:2167:25:2167:49 | (...)... : AbstractByteBuf | Test.java:2168:10:2168:11 | in : AbstractByteBuf | provenance |  |
 | Test.java:2167:42:2167:49 | source(...) : Object | Test.java:2167:25:2167:49 | (...)... : AbstractByteBuf | provenance |  |
-| Test.java:2168:10:2168:11 | in : AbstractByteBuf | Test.java:2168:10:2168:24 | setInt(...) : AbstractByteBuf | provenance | MaD:48 |
+| Test.java:2168:10:2168:11 | in : AbstractByteBuf | Test.java:2168:10:2168:24 | setInt(...) : AbstractByteBuf | provenance | MaD:88 |
 | Test.java:2168:10:2168:24 | setInt(...) : AbstractByteBuf | Test.java:2169:9:2169:11 | out | provenance |  |
 | Test.java:2174:17:2174:33 | (...)... : ByteBuf | Test.java:2175:10:2175:11 | in : ByteBuf | provenance |  |
 | Test.java:2174:26:2174:33 | source(...) : Object | Test.java:2174:17:2174:33 | (...)... : ByteBuf | provenance |  |
-| Test.java:2175:10:2175:11 | in : ByteBuf | Test.java:2175:10:2175:24 | setInt(...) : ByteBuf | provenance | MaD:48 |
+| Test.java:2175:10:2175:11 | in : ByteBuf | Test.java:2175:10:2175:24 | setInt(...) : ByteBuf | provenance | MaD:88 |
 | Test.java:2175:10:2175:24 | setInt(...) : ByteBuf | Test.java:2176:9:2176:11 | out | provenance |  |
 | Test.java:2181:24:2181:47 | (...)... : SwappedByteBuf | Test.java:2182:10:2182:11 | in : SwappedByteBuf | provenance |  |
 | Test.java:2181:40:2181:47 | source(...) : Object | Test.java:2181:24:2181:47 | (...)... : SwappedByteBuf | provenance |  |
-| Test.java:2182:10:2182:11 | in : SwappedByteBuf | Test.java:2182:10:2182:24 | setInt(...) : SwappedByteBuf | provenance | MaD:48 |
+| Test.java:2182:10:2182:11 | in : SwappedByteBuf | Test.java:2182:10:2182:24 | setInt(...) : SwappedByteBuf | provenance | MaD:88 |
 | Test.java:2182:10:2182:24 | setInt(...) : SwappedByteBuf | Test.java:2183:9:2183:11 | out | provenance |  |
 | Test.java:2188:26:2188:51 | (...)... : CompositeByteBuf | Test.java:2189:10:2189:11 | in : CompositeByteBuf | provenance |  |
 | Test.java:2188:44:2188:51 | source(...) : Object | Test.java:2188:26:2188:51 | (...)... : CompositeByteBuf | provenance |  |
-| Test.java:2189:10:2189:11 | in : CompositeByteBuf | Test.java:2189:10:2189:24 | setInt(...) : CompositeByteBuf | provenance | MaD:48 |
+| Test.java:2189:10:2189:11 | in : CompositeByteBuf | Test.java:2189:10:2189:24 | setInt(...) : CompositeByteBuf | provenance | MaD:88 |
 | Test.java:2189:10:2189:24 | setInt(...) : CompositeByteBuf | Test.java:2190:9:2190:11 | out | provenance |  |
 | Test.java:2195:25:2195:49 | (...)... : AbstractByteBuf | Test.java:2196:10:2196:11 | in : AbstractByteBuf | provenance |  |
 | Test.java:2195:42:2195:49 | source(...) : Object | Test.java:2195:25:2195:49 | (...)... : AbstractByteBuf | provenance |  |
-| Test.java:2196:10:2196:11 | in : AbstractByteBuf | Test.java:2196:10:2196:26 | setIntLE(...) : AbstractByteBuf | provenance | MaD:49 |
+| Test.java:2196:10:2196:11 | in : AbstractByteBuf | Test.java:2196:10:2196:26 | setIntLE(...) : AbstractByteBuf | provenance | MaD:89 |
 | Test.java:2196:10:2196:26 | setIntLE(...) : AbstractByteBuf | Test.java:2197:9:2197:11 | out | provenance |  |
 | Test.java:2202:17:2202:33 | (...)... : ByteBuf | Test.java:2203:10:2203:11 | in : ByteBuf | provenance |  |
 | Test.java:2202:26:2202:33 | source(...) : Object | Test.java:2202:17:2202:33 | (...)... : ByteBuf | provenance |  |
-| Test.java:2203:10:2203:11 | in : ByteBuf | Test.java:2203:10:2203:26 | setIntLE(...) : ByteBuf | provenance | MaD:49 |
+| Test.java:2203:10:2203:11 | in : ByteBuf | Test.java:2203:10:2203:26 | setIntLE(...) : ByteBuf | provenance | MaD:89 |
 | Test.java:2203:10:2203:26 | setIntLE(...) : ByteBuf | Test.java:2204:9:2204:11 | out | provenance |  |
 | Test.java:2209:24:2209:47 | (...)... : SwappedByteBuf | Test.java:2210:10:2210:11 | in : SwappedByteBuf | provenance |  |
 | Test.java:2209:40:2209:47 | source(...) : Object | Test.java:2209:24:2209:47 | (...)... : SwappedByteBuf | provenance |  |
-| Test.java:2210:10:2210:11 | in : SwappedByteBuf | Test.java:2210:10:2210:26 | setIntLE(...) : SwappedByteBuf | provenance | MaD:49 |
+| Test.java:2210:10:2210:11 | in : SwappedByteBuf | Test.java:2210:10:2210:26 | setIntLE(...) : SwappedByteBuf | provenance | MaD:89 |
 | Test.java:2210:10:2210:26 | setIntLE(...) : SwappedByteBuf | Test.java:2211:9:2211:11 | out | provenance |  |
 | Test.java:2216:25:2216:49 | (...)... : AbstractByteBuf | Test.java:2217:10:2217:11 | in : AbstractByteBuf | provenance |  |
 | Test.java:2216:42:2216:49 | source(...) : Object | Test.java:2216:25:2216:49 | (...)... : AbstractByteBuf | provenance |  |
-| Test.java:2217:10:2217:11 | in : AbstractByteBuf | Test.java:2217:10:2217:26 | setLong(...) : AbstractByteBuf | provenance | MaD:50 |
+| Test.java:2217:10:2217:11 | in : AbstractByteBuf | Test.java:2217:10:2217:26 | setLong(...) : AbstractByteBuf | provenance | MaD:90 |
 | Test.java:2217:10:2217:26 | setLong(...) : AbstractByteBuf | Test.java:2218:9:2218:11 | out | provenance |  |
 | Test.java:2223:17:2223:33 | (...)... : ByteBuf | Test.java:2224:10:2224:11 | in : ByteBuf | provenance |  |
 | Test.java:2223:26:2223:33 | source(...) : Object | Test.java:2223:17:2223:33 | (...)... : ByteBuf | provenance |  |
-| Test.java:2224:10:2224:11 | in : ByteBuf | Test.java:2224:10:2224:26 | setLong(...) : ByteBuf | provenance | MaD:50 |
+| Test.java:2224:10:2224:11 | in : ByteBuf | Test.java:2224:10:2224:26 | setLong(...) : ByteBuf | provenance | MaD:90 |
 | Test.java:2224:10:2224:26 | setLong(...) : ByteBuf | Test.java:2225:9:2225:11 | out | provenance |  |
 | Test.java:2230:24:2230:47 | (...)... : SwappedByteBuf | Test.java:2231:10:2231:11 | in : SwappedByteBuf | provenance |  |
 | Test.java:2230:40:2230:47 | source(...) : Object | Test.java:2230:24:2230:47 | (...)... : SwappedByteBuf | provenance |  |
-| Test.java:2231:10:2231:11 | in : SwappedByteBuf | Test.java:2231:10:2231:26 | setLong(...) : SwappedByteBuf | provenance | MaD:50 |
+| Test.java:2231:10:2231:11 | in : SwappedByteBuf | Test.java:2231:10:2231:26 | setLong(...) : SwappedByteBuf | provenance | MaD:90 |
 | Test.java:2231:10:2231:26 | setLong(...) : SwappedByteBuf | Test.java:2232:9:2232:11 | out | provenance |  |
 | Test.java:2237:26:2237:51 | (...)... : CompositeByteBuf | Test.java:2238:10:2238:11 | in : CompositeByteBuf | provenance |  |
 | Test.java:2237:44:2237:51 | source(...) : Object | Test.java:2237:26:2237:51 | (...)... : CompositeByteBuf | provenance |  |
-| Test.java:2238:10:2238:11 | in : CompositeByteBuf | Test.java:2238:10:2238:26 | setLong(...) : CompositeByteBuf | provenance | MaD:50 |
+| Test.java:2238:10:2238:11 | in : CompositeByteBuf | Test.java:2238:10:2238:26 | setLong(...) : CompositeByteBuf | provenance | MaD:90 |
 | Test.java:2238:10:2238:26 | setLong(...) : CompositeByteBuf | Test.java:2239:9:2239:11 | out | provenance |  |
 | Test.java:2244:25:2244:49 | (...)... : AbstractByteBuf | Test.java:2245:10:2245:11 | in : AbstractByteBuf | provenance |  |
 | Test.java:2244:42:2244:49 | source(...) : Object | Test.java:2244:25:2244:49 | (...)... : AbstractByteBuf | provenance |  |
-| Test.java:2245:10:2245:11 | in : AbstractByteBuf | Test.java:2245:10:2245:28 | setLongLE(...) : AbstractByteBuf | provenance | MaD:51 |
+| Test.java:2245:10:2245:11 | in : AbstractByteBuf | Test.java:2245:10:2245:28 | setLongLE(...) : AbstractByteBuf | provenance | MaD:91 |
 | Test.java:2245:10:2245:28 | setLongLE(...) : AbstractByteBuf | Test.java:2246:9:2246:11 | out | provenance |  |
 | Test.java:2251:17:2251:33 | (...)... : ByteBuf | Test.java:2252:10:2252:11 | in : ByteBuf | provenance |  |
 | Test.java:2251:26:2251:33 | source(...) : Object | Test.java:2251:17:2251:33 | (...)... : ByteBuf | provenance |  |
-| Test.java:2252:10:2252:11 | in : ByteBuf | Test.java:2252:10:2252:28 | setLongLE(...) : ByteBuf | provenance | MaD:51 |
+| Test.java:2252:10:2252:11 | in : ByteBuf | Test.java:2252:10:2252:28 | setLongLE(...) : ByteBuf | provenance | MaD:91 |
 | Test.java:2252:10:2252:28 | setLongLE(...) : ByteBuf | Test.java:2253:9:2253:11 | out | provenance |  |
 | Test.java:2258:24:2258:47 | (...)... : SwappedByteBuf | Test.java:2259:10:2259:11 | in : SwappedByteBuf | provenance |  |
 | Test.java:2258:40:2258:47 | source(...) : Object | Test.java:2258:24:2258:47 | (...)... : SwappedByteBuf | provenance |  |
-| Test.java:2259:10:2259:11 | in : SwappedByteBuf | Test.java:2259:10:2259:28 | setLongLE(...) : SwappedByteBuf | provenance | MaD:51 |
+| Test.java:2259:10:2259:11 | in : SwappedByteBuf | Test.java:2259:10:2259:28 | setLongLE(...) : SwappedByteBuf | provenance | MaD:91 |
 | Test.java:2259:10:2259:28 | setLongLE(...) : SwappedByteBuf | Test.java:2260:9:2260:11 | out | provenance |  |
 | Test.java:2265:25:2265:49 | (...)... : AbstractByteBuf | Test.java:2266:10:2266:11 | in : AbstractByteBuf | provenance |  |
 | Test.java:2265:42:2265:49 | source(...) : Object | Test.java:2265:25:2265:49 | (...)... : AbstractByteBuf | provenance |  |
-| Test.java:2266:10:2266:11 | in : AbstractByteBuf | Test.java:2266:10:2266:27 | setMedium(...) : AbstractByteBuf | provenance | MaD:52 |
+| Test.java:2266:10:2266:11 | in : AbstractByteBuf | Test.java:2266:10:2266:27 | setMedium(...) : AbstractByteBuf | provenance | MaD:92 |
 | Test.java:2266:10:2266:27 | setMedium(...) : AbstractByteBuf | Test.java:2267:9:2267:11 | out | provenance |  |
 | Test.java:2272:17:2272:33 | (...)... : ByteBuf | Test.java:2273:10:2273:11 | in : ByteBuf | provenance |  |
 | Test.java:2272:26:2272:33 | source(...) : Object | Test.java:2272:17:2272:33 | (...)... : ByteBuf | provenance |  |
-| Test.java:2273:10:2273:11 | in : ByteBuf | Test.java:2273:10:2273:27 | setMedium(...) : ByteBuf | provenance | MaD:52 |
+| Test.java:2273:10:2273:11 | in : ByteBuf | Test.java:2273:10:2273:27 | setMedium(...) : ByteBuf | provenance | MaD:92 |
 | Test.java:2273:10:2273:27 | setMedium(...) : ByteBuf | Test.java:2274:9:2274:11 | out | provenance |  |
 | Test.java:2279:24:2279:47 | (...)... : SwappedByteBuf | Test.java:2280:10:2280:11 | in : SwappedByteBuf | provenance |  |
 | Test.java:2279:40:2279:47 | source(...) : Object | Test.java:2279:24:2279:47 | (...)... : SwappedByteBuf | provenance |  |
-| Test.java:2280:10:2280:11 | in : SwappedByteBuf | Test.java:2280:10:2280:27 | setMedium(...) : SwappedByteBuf | provenance | MaD:52 |
+| Test.java:2280:10:2280:11 | in : SwappedByteBuf | Test.java:2280:10:2280:27 | setMedium(...) : SwappedByteBuf | provenance | MaD:92 |
 | Test.java:2280:10:2280:27 | setMedium(...) : SwappedByteBuf | Test.java:2281:9:2281:11 | out | provenance |  |
 | Test.java:2286:26:2286:51 | (...)... : CompositeByteBuf | Test.java:2287:10:2287:11 | in : CompositeByteBuf | provenance |  |
 | Test.java:2286:44:2286:51 | source(...) : Object | Test.java:2286:26:2286:51 | (...)... : CompositeByteBuf | provenance |  |
-| Test.java:2287:10:2287:11 | in : CompositeByteBuf | Test.java:2287:10:2287:27 | setMedium(...) : CompositeByteBuf | provenance | MaD:52 |
+| Test.java:2287:10:2287:11 | in : CompositeByteBuf | Test.java:2287:10:2287:27 | setMedium(...) : CompositeByteBuf | provenance | MaD:92 |
 | Test.java:2287:10:2287:27 | setMedium(...) : CompositeByteBuf | Test.java:2288:9:2288:11 | out | provenance |  |
 | Test.java:2293:25:2293:49 | (...)... : AbstractByteBuf | Test.java:2294:10:2294:11 | in : AbstractByteBuf | provenance |  |
 | Test.java:2293:42:2293:49 | source(...) : Object | Test.java:2293:25:2293:49 | (...)... : AbstractByteBuf | provenance |  |
-| Test.java:2294:10:2294:11 | in : AbstractByteBuf | Test.java:2294:10:2294:29 | setMediumLE(...) : AbstractByteBuf | provenance | MaD:53 |
+| Test.java:2294:10:2294:11 | in : AbstractByteBuf | Test.java:2294:10:2294:29 | setMediumLE(...) : AbstractByteBuf | provenance | MaD:93 |
 | Test.java:2294:10:2294:29 | setMediumLE(...) : AbstractByteBuf | Test.java:2295:9:2295:11 | out | provenance |  |
 | Test.java:2300:17:2300:33 | (...)... : ByteBuf | Test.java:2301:10:2301:11 | in : ByteBuf | provenance |  |
 | Test.java:2300:26:2300:33 | source(...) : Object | Test.java:2300:17:2300:33 | (...)... : ByteBuf | provenance |  |
-| Test.java:2301:10:2301:11 | in : ByteBuf | Test.java:2301:10:2301:29 | setMediumLE(...) : ByteBuf | provenance | MaD:53 |
+| Test.java:2301:10:2301:11 | in : ByteBuf | Test.java:2301:10:2301:29 | setMediumLE(...) : ByteBuf | provenance | MaD:93 |
 | Test.java:2301:10:2301:29 | setMediumLE(...) : ByteBuf | Test.java:2302:9:2302:11 | out | provenance |  |
 | Test.java:2307:24:2307:47 | (...)... : SwappedByteBuf | Test.java:2308:10:2308:11 | in : SwappedByteBuf | provenance |  |
 | Test.java:2307:40:2307:47 | source(...) : Object | Test.java:2307:24:2307:47 | (...)... : SwappedByteBuf | provenance |  |
-| Test.java:2308:10:2308:11 | in : SwappedByteBuf | Test.java:2308:10:2308:29 | setMediumLE(...) : SwappedByteBuf | provenance | MaD:53 |
+| Test.java:2308:10:2308:11 | in : SwappedByteBuf | Test.java:2308:10:2308:29 | setMediumLE(...) : SwappedByteBuf | provenance | MaD:93 |
 | Test.java:2308:10:2308:29 | setMediumLE(...) : SwappedByteBuf | Test.java:2309:9:2309:11 | out | provenance |  |
 | Test.java:2314:25:2314:49 | (...)... : AbstractByteBuf | Test.java:2315:10:2315:11 | in : AbstractByteBuf | provenance |  |
 | Test.java:2314:42:2314:49 | source(...) : Object | Test.java:2314:25:2314:49 | (...)... : AbstractByteBuf | provenance |  |
-| Test.java:2315:10:2315:11 | in : AbstractByteBuf | Test.java:2315:10:2315:26 | setShort(...) : AbstractByteBuf | provenance | MaD:54 |
+| Test.java:2315:10:2315:11 | in : AbstractByteBuf | Test.java:2315:10:2315:26 | setShort(...) : AbstractByteBuf | provenance | MaD:94 |
 | Test.java:2315:10:2315:26 | setShort(...) : AbstractByteBuf | Test.java:2316:9:2316:11 | out | provenance |  |
 | Test.java:2321:17:2321:33 | (...)... : ByteBuf | Test.java:2322:10:2322:11 | in : ByteBuf | provenance |  |
 | Test.java:2321:26:2321:33 | source(...) : Object | Test.java:2321:17:2321:33 | (...)... : ByteBuf | provenance |  |
-| Test.java:2322:10:2322:11 | in : ByteBuf | Test.java:2322:10:2322:26 | setShort(...) : ByteBuf | provenance | MaD:54 |
+| Test.java:2322:10:2322:11 | in : ByteBuf | Test.java:2322:10:2322:26 | setShort(...) : ByteBuf | provenance | MaD:94 |
 | Test.java:2322:10:2322:26 | setShort(...) : ByteBuf | Test.java:2323:9:2323:11 | out | provenance |  |
 | Test.java:2328:24:2328:47 | (...)... : SwappedByteBuf | Test.java:2329:10:2329:11 | in : SwappedByteBuf | provenance |  |
 | Test.java:2328:40:2328:47 | source(...) : Object | Test.java:2328:24:2328:47 | (...)... : SwappedByteBuf | provenance |  |
-| Test.java:2329:10:2329:11 | in : SwappedByteBuf | Test.java:2329:10:2329:26 | setShort(...) : SwappedByteBuf | provenance | MaD:54 |
+| Test.java:2329:10:2329:11 | in : SwappedByteBuf | Test.java:2329:10:2329:26 | setShort(...) : SwappedByteBuf | provenance | MaD:94 |
 | Test.java:2329:10:2329:26 | setShort(...) : SwappedByteBuf | Test.java:2330:9:2330:11 | out | provenance |  |
 | Test.java:2335:26:2335:51 | (...)... : CompositeByteBuf | Test.java:2336:10:2336:11 | in : CompositeByteBuf | provenance |  |
 | Test.java:2335:44:2335:51 | source(...) : Object | Test.java:2335:26:2335:51 | (...)... : CompositeByteBuf | provenance |  |
-| Test.java:2336:10:2336:11 | in : CompositeByteBuf | Test.java:2336:10:2336:26 | setShort(...) : CompositeByteBuf | provenance | MaD:54 |
+| Test.java:2336:10:2336:11 | in : CompositeByteBuf | Test.java:2336:10:2336:26 | setShort(...) : CompositeByteBuf | provenance | MaD:94 |
 | Test.java:2336:10:2336:26 | setShort(...) : CompositeByteBuf | Test.java:2337:9:2337:11 | out | provenance |  |
 | Test.java:2342:25:2342:49 | (...)... : AbstractByteBuf | Test.java:2343:10:2343:11 | in : AbstractByteBuf | provenance |  |
 | Test.java:2342:42:2342:49 | source(...) : Object | Test.java:2342:25:2342:49 | (...)... : AbstractByteBuf | provenance |  |
-| Test.java:2343:10:2343:11 | in : AbstractByteBuf | Test.java:2343:10:2343:28 | setShortLE(...) : AbstractByteBuf | provenance | MaD:55 |
+| Test.java:2343:10:2343:11 | in : AbstractByteBuf | Test.java:2343:10:2343:28 | setShortLE(...) : AbstractByteBuf | provenance | MaD:95 |
 | Test.java:2343:10:2343:28 | setShortLE(...) : AbstractByteBuf | Test.java:2344:9:2344:11 | out | provenance |  |
 | Test.java:2349:17:2349:33 | (...)... : ByteBuf | Test.java:2350:10:2350:11 | in : ByteBuf | provenance |  |
 | Test.java:2349:26:2349:33 | source(...) : Object | Test.java:2349:17:2349:33 | (...)... : ByteBuf | provenance |  |
-| Test.java:2350:10:2350:11 | in : ByteBuf | Test.java:2350:10:2350:28 | setShortLE(...) : ByteBuf | provenance | MaD:55 |
+| Test.java:2350:10:2350:11 | in : ByteBuf | Test.java:2350:10:2350:28 | setShortLE(...) : ByteBuf | provenance | MaD:95 |
 | Test.java:2350:10:2350:28 | setShortLE(...) : ByteBuf | Test.java:2351:9:2351:11 | out | provenance |  |
 | Test.java:2356:24:2356:47 | (...)... : SwappedByteBuf | Test.java:2357:10:2357:11 | in : SwappedByteBuf | provenance |  |
 | Test.java:2356:40:2356:47 | source(...) : Object | Test.java:2356:24:2356:47 | (...)... : SwappedByteBuf | provenance |  |
-| Test.java:2357:10:2357:11 | in : SwappedByteBuf | Test.java:2357:10:2357:28 | setShortLE(...) : SwappedByteBuf | provenance | MaD:55 |
+| Test.java:2357:10:2357:11 | in : SwappedByteBuf | Test.java:2357:10:2357:28 | setShortLE(...) : SwappedByteBuf | provenance | MaD:95 |
 | Test.java:2357:10:2357:28 | setShortLE(...) : SwappedByteBuf | Test.java:2358:9:2358:11 | out | provenance |  |
 | Test.java:2363:25:2363:49 | (...)... : AbstractByteBuf | Test.java:2364:10:2364:11 | in : AbstractByteBuf | provenance |  |
 | Test.java:2363:42:2363:49 | source(...) : Object | Test.java:2363:25:2363:49 | (...)... : AbstractByteBuf | provenance |  |
-| Test.java:2364:10:2364:11 | in : AbstractByteBuf | Test.java:2364:10:2364:25 | setZero(...) : AbstractByteBuf | provenance | MaD:56 |
+| Test.java:2364:10:2364:11 | in : AbstractByteBuf | Test.java:2364:10:2364:25 | setZero(...) : AbstractByteBuf | provenance | MaD:96 |
 | Test.java:2364:10:2364:25 | setZero(...) : AbstractByteBuf | Test.java:2365:9:2365:11 | out | provenance |  |
 | Test.java:2370:17:2370:33 | (...)... : ByteBuf | Test.java:2371:10:2371:11 | in : ByteBuf | provenance |  |
 | Test.java:2370:26:2370:33 | source(...) : Object | Test.java:2370:17:2370:33 | (...)... : ByteBuf | provenance |  |
-| Test.java:2371:10:2371:11 | in : ByteBuf | Test.java:2371:10:2371:25 | setZero(...) : ByteBuf | provenance | MaD:56 |
+| Test.java:2371:10:2371:11 | in : ByteBuf | Test.java:2371:10:2371:25 | setZero(...) : ByteBuf | provenance | MaD:96 |
 | Test.java:2371:10:2371:25 | setZero(...) : ByteBuf | Test.java:2372:9:2372:11 | out | provenance |  |
 | Test.java:2377:24:2377:47 | (...)... : SwappedByteBuf | Test.java:2378:10:2378:11 | in : SwappedByteBuf | provenance |  |
 | Test.java:2377:40:2377:47 | source(...) : Object | Test.java:2377:24:2377:47 | (...)... : SwappedByteBuf | provenance |  |
-| Test.java:2378:10:2378:11 | in : SwappedByteBuf | Test.java:2378:10:2378:25 | setZero(...) : SwappedByteBuf | provenance | MaD:56 |
+| Test.java:2378:10:2378:11 | in : SwappedByteBuf | Test.java:2378:10:2378:25 | setZero(...) : SwappedByteBuf | provenance | MaD:96 |
 | Test.java:2378:10:2378:25 | setZero(...) : SwappedByteBuf | Test.java:2379:9:2379:11 | out | provenance |  |
 | Test.java:2384:26:2384:51 | (...)... : CompositeByteBuf | Test.java:2385:10:2385:11 | in : CompositeByteBuf | provenance |  |
 | Test.java:2384:44:2384:51 | source(...) : Object | Test.java:2384:26:2384:51 | (...)... : CompositeByteBuf | provenance |  |
-| Test.java:2385:10:2385:11 | in : CompositeByteBuf | Test.java:2385:10:2385:25 | setZero(...) : CompositeByteBuf | provenance | MaD:56 |
+| Test.java:2385:10:2385:11 | in : CompositeByteBuf | Test.java:2385:10:2385:25 | setZero(...) : CompositeByteBuf | provenance | MaD:96 |
 | Test.java:2385:10:2385:25 | setZero(...) : CompositeByteBuf | Test.java:2386:9:2386:11 | out | provenance |  |
 | Test.java:2391:25:2391:49 | (...)... : AbstractByteBuf | Test.java:2392:10:2392:11 | in : AbstractByteBuf | provenance |  |
 | Test.java:2391:42:2391:49 | source(...) : Object | Test.java:2391:25:2391:49 | (...)... : AbstractByteBuf | provenance |  |
-| Test.java:2392:10:2392:11 | in : AbstractByteBuf | Test.java:2392:10:2392:24 | skipBytes(...) : AbstractByteBuf | provenance | MaD:57 |
+| Test.java:2392:10:2392:11 | in : AbstractByteBuf | Test.java:2392:10:2392:24 | skipBytes(...) : AbstractByteBuf | provenance | MaD:97 |
 | Test.java:2392:10:2392:24 | skipBytes(...) : AbstractByteBuf | Test.java:2393:9:2393:11 | out | provenance |  |
 | Test.java:2398:17:2398:33 | (...)... : ByteBuf | Test.java:2399:10:2399:11 | in : ByteBuf | provenance |  |
 | Test.java:2398:26:2398:33 | source(...) : Object | Test.java:2398:17:2398:33 | (...)... : ByteBuf | provenance |  |
-| Test.java:2399:10:2399:11 | in : ByteBuf | Test.java:2399:10:2399:24 | skipBytes(...) : ByteBuf | provenance | MaD:57 |
+| Test.java:2399:10:2399:11 | in : ByteBuf | Test.java:2399:10:2399:24 | skipBytes(...) : ByteBuf | provenance | MaD:97 |
 | Test.java:2399:10:2399:24 | skipBytes(...) : ByteBuf | Test.java:2400:9:2400:11 | out | provenance |  |
 | Test.java:2405:24:2405:47 | (...)... : SwappedByteBuf | Test.java:2406:10:2406:11 | in : SwappedByteBuf | provenance |  |
 | Test.java:2405:40:2405:47 | source(...) : Object | Test.java:2405:24:2405:47 | (...)... : SwappedByteBuf | provenance |  |
-| Test.java:2406:10:2406:11 | in : SwappedByteBuf | Test.java:2406:10:2406:24 | skipBytes(...) : SwappedByteBuf | provenance | MaD:57 |
+| Test.java:2406:10:2406:11 | in : SwappedByteBuf | Test.java:2406:10:2406:24 | skipBytes(...) : SwappedByteBuf | provenance | MaD:97 |
 | Test.java:2406:10:2406:24 | skipBytes(...) : SwappedByteBuf | Test.java:2407:9:2407:11 | out | provenance |  |
 | Test.java:2412:26:2412:51 | (...)... : CompositeByteBuf | Test.java:2413:10:2413:11 | in : CompositeByteBuf | provenance |  |
 | Test.java:2412:44:2412:51 | source(...) : Object | Test.java:2412:26:2412:51 | (...)... : CompositeByteBuf | provenance |  |
-| Test.java:2413:10:2413:11 | in : CompositeByteBuf | Test.java:2413:10:2413:24 | skipBytes(...) : CompositeByteBuf | provenance | MaD:57 |
+| Test.java:2413:10:2413:11 | in : CompositeByteBuf | Test.java:2413:10:2413:24 | skipBytes(...) : CompositeByteBuf | provenance | MaD:97 |
 | Test.java:2413:10:2413:24 | skipBytes(...) : CompositeByteBuf | Test.java:2414:9:2414:11 | out | provenance |  |
 | Test.java:2419:25:2419:49 | (...)... : AbstractByteBuf | Test.java:2420:10:2420:11 | in : AbstractByteBuf | provenance |  |
 | Test.java:2419:42:2419:49 | source(...) : Object | Test.java:2419:25:2419:49 | (...)... : AbstractByteBuf | provenance |  |
-| Test.java:2420:10:2420:11 | in : AbstractByteBuf | Test.java:2420:10:2420:19 | slice(...) : ByteBuf | provenance | MaD:58 |
+| Test.java:2420:10:2420:11 | in : AbstractByteBuf | Test.java:2420:10:2420:19 | slice(...) : ByteBuf | provenance | MaD:98 |
 | Test.java:2420:10:2420:19 | slice(...) : ByteBuf | Test.java:2421:9:2421:11 | out | provenance |  |
 | Test.java:2426:25:2426:49 | (...)... : AbstractByteBuf | Test.java:2427:10:2427:11 | in : AbstractByteBuf | provenance |  |
 | Test.java:2426:42:2426:49 | source(...) : Object | Test.java:2426:25:2426:49 | (...)... : AbstractByteBuf | provenance |  |
-| Test.java:2427:10:2427:11 | in : AbstractByteBuf | Test.java:2427:10:2427:23 | slice(...) : ByteBuf | provenance | MaD:58 |
+| Test.java:2427:10:2427:11 | in : AbstractByteBuf | Test.java:2427:10:2427:23 | slice(...) : ByteBuf | provenance | MaD:98 |
 | Test.java:2427:10:2427:23 | slice(...) : ByteBuf | Test.java:2428:9:2428:11 | out | provenance |  |
 | Test.java:2433:17:2433:33 | (...)... : ByteBuf | Test.java:2434:10:2434:11 | in : ByteBuf | provenance |  |
 | Test.java:2433:26:2433:33 | source(...) : Object | Test.java:2433:17:2433:33 | (...)... : ByteBuf | provenance |  |
-| Test.java:2434:10:2434:11 | in : ByteBuf | Test.java:2434:10:2434:19 | slice(...) : ByteBuf | provenance | MaD:58 |
+| Test.java:2434:10:2434:11 | in : ByteBuf | Test.java:2434:10:2434:19 | slice(...) : ByteBuf | provenance | MaD:98 |
 | Test.java:2434:10:2434:19 | slice(...) : ByteBuf | Test.java:2435:9:2435:11 | out | provenance |  |
 | Test.java:2440:17:2440:33 | (...)... : ByteBuf | Test.java:2441:10:2441:11 | in : ByteBuf | provenance |  |
 | Test.java:2440:26:2440:33 | source(...) : Object | Test.java:2440:17:2440:33 | (...)... : ByteBuf | provenance |  |
-| Test.java:2441:10:2441:11 | in : ByteBuf | Test.java:2441:10:2441:23 | slice(...) : ByteBuf | provenance | MaD:58 |
+| Test.java:2441:10:2441:11 | in : ByteBuf | Test.java:2441:10:2441:23 | slice(...) : ByteBuf | provenance | MaD:98 |
 | Test.java:2441:10:2441:23 | slice(...) : ByteBuf | Test.java:2442:9:2442:11 | out | provenance |  |
 | Test.java:2447:24:2447:47 | (...)... : SwappedByteBuf | Test.java:2448:10:2448:11 | in : SwappedByteBuf | provenance |  |
 | Test.java:2447:40:2447:47 | source(...) : Object | Test.java:2447:24:2447:47 | (...)... : SwappedByteBuf | provenance |  |
-| Test.java:2448:10:2448:11 | in : SwappedByteBuf | Test.java:2448:10:2448:19 | slice(...) : ByteBuf | provenance | MaD:58 |
+| Test.java:2448:10:2448:11 | in : SwappedByteBuf | Test.java:2448:10:2448:19 | slice(...) : ByteBuf | provenance | MaD:98 |
 | Test.java:2448:10:2448:19 | slice(...) : ByteBuf | Test.java:2449:9:2449:11 | out | provenance |  |
 | Test.java:2454:24:2454:47 | (...)... : SwappedByteBuf | Test.java:2455:10:2455:11 | in : SwappedByteBuf | provenance |  |
 | Test.java:2454:40:2454:47 | source(...) : Object | Test.java:2454:24:2454:47 | (...)... : SwappedByteBuf | provenance |  |
-| Test.java:2455:10:2455:11 | in : SwappedByteBuf | Test.java:2455:10:2455:23 | slice(...) : ByteBuf | provenance | MaD:58 |
+| Test.java:2455:10:2455:11 | in : SwappedByteBuf | Test.java:2455:10:2455:23 | slice(...) : ByteBuf | provenance | MaD:98 |
 | Test.java:2455:10:2455:23 | slice(...) : ByteBuf | Test.java:2456:9:2456:11 | out | provenance |  |
 | Test.java:2461:25:2461:49 | (...)... : AbstractByteBuf | Test.java:2462:10:2462:11 | in : AbstractByteBuf | provenance |  |
 | Test.java:2461:42:2461:49 | source(...) : Object | Test.java:2461:25:2461:49 | (...)... : AbstractByteBuf | provenance |  |
-| Test.java:2462:10:2462:11 | in : AbstractByteBuf | Test.java:2462:10:2462:22 | toString(...) : String | provenance | MaD:59 |
+| Test.java:2462:10:2462:11 | in : AbstractByteBuf | Test.java:2462:10:2462:22 | toString(...) : String | provenance | MaD:99 |
 | Test.java:2462:10:2462:22 | toString(...) : String | Test.java:2463:9:2463:11 | out | provenance |  |
 | Test.java:2468:25:2468:49 | (...)... : AbstractByteBuf | Test.java:2469:10:2469:11 | in : AbstractByteBuf | provenance |  |
 | Test.java:2468:42:2468:49 | source(...) : Object | Test.java:2468:25:2468:49 | (...)... : AbstractByteBuf | provenance |  |
-| Test.java:2469:10:2469:11 | in : AbstractByteBuf | Test.java:2469:10:2469:32 | toString(...) : String | provenance | MaD:59 |
+| Test.java:2469:10:2469:11 | in : AbstractByteBuf | Test.java:2469:10:2469:32 | toString(...) : String | provenance | MaD:99 |
 | Test.java:2469:10:2469:32 | toString(...) : String | Test.java:2470:9:2470:11 | out | provenance |  |
 | Test.java:2475:25:2475:49 | (...)... : AbstractByteBuf | Test.java:2476:10:2476:11 | in : AbstractByteBuf | provenance |  |
 | Test.java:2475:42:2475:49 | source(...) : Object | Test.java:2475:25:2475:49 | (...)... : AbstractByteBuf | provenance |  |
-| Test.java:2476:10:2476:11 | in : AbstractByteBuf | Test.java:2476:10:2476:26 | toString(...) : String | provenance | MaD:59 |
+| Test.java:2476:10:2476:11 | in : AbstractByteBuf | Test.java:2476:10:2476:26 | toString(...) : String | provenance | MaD:99 |
 | Test.java:2476:10:2476:26 | toString(...) : String | Test.java:2477:9:2477:11 | out | provenance |  |
 | Test.java:2482:17:2482:33 | (...)... : ByteBuf | Test.java:2483:10:2483:11 | in : ByteBuf | provenance |  |
 | Test.java:2482:26:2482:33 | source(...) : Object | Test.java:2482:17:2482:33 | (...)... : ByteBuf | provenance |  |
-| Test.java:2483:10:2483:11 | in : ByteBuf | Test.java:2483:10:2483:22 | toString(...) : String | provenance | MaD:59 |
+| Test.java:2483:10:2483:11 | in : ByteBuf | Test.java:2483:10:2483:22 | toString(...) : String | provenance | MaD:99 |
 | Test.java:2483:10:2483:22 | toString(...) : String | Test.java:2484:9:2484:11 | out | provenance |  |
 | Test.java:2489:17:2489:33 | (...)... : ByteBuf | Test.java:2490:10:2490:11 | in : ByteBuf | provenance |  |
 | Test.java:2489:26:2489:33 | source(...) : Object | Test.java:2489:17:2489:33 | (...)... : ByteBuf | provenance |  |
-| Test.java:2490:10:2490:11 | in : ByteBuf | Test.java:2490:10:2490:32 | toString(...) : String | provenance | MaD:59 |
+| Test.java:2490:10:2490:11 | in : ByteBuf | Test.java:2490:10:2490:32 | toString(...) : String | provenance | MaD:99 |
 | Test.java:2490:10:2490:32 | toString(...) : String | Test.java:2491:9:2491:11 | out | provenance |  |
 | Test.java:2496:17:2496:33 | (...)... : ByteBuf | Test.java:2497:10:2497:11 | in : ByteBuf | provenance |  |
 | Test.java:2496:26:2496:33 | source(...) : Object | Test.java:2496:17:2496:33 | (...)... : ByteBuf | provenance |  |
-| Test.java:2497:10:2497:11 | in : ByteBuf | Test.java:2497:10:2497:26 | toString(...) : String | provenance | MaD:59 |
+| Test.java:2497:10:2497:11 | in : ByteBuf | Test.java:2497:10:2497:26 | toString(...) : String | provenance | MaD:99 |
 | Test.java:2497:10:2497:26 | toString(...) : String | Test.java:2498:9:2498:11 | out | provenance |  |
 | Test.java:2503:26:2503:51 | (...)... : CompositeByteBuf | Test.java:2504:10:2504:11 | in : CompositeByteBuf | provenance |  |
 | Test.java:2503:44:2503:51 | source(...) : Object | Test.java:2503:26:2503:51 | (...)... : CompositeByteBuf | provenance |  |
-| Test.java:2504:10:2504:11 | in : CompositeByteBuf | Test.java:2504:10:2504:22 | toString(...) : String | provenance | MaD:59 |
+| Test.java:2504:10:2504:11 | in : CompositeByteBuf | Test.java:2504:10:2504:22 | toString(...) : String | provenance | MaD:99 |
 | Test.java:2504:10:2504:22 | toString(...) : String | Test.java:2505:9:2505:11 | out | provenance |  |
 | Test.java:2510:24:2510:47 | (...)... : SwappedByteBuf | Test.java:2511:10:2511:11 | in : SwappedByteBuf | provenance |  |
 | Test.java:2510:40:2510:47 | source(...) : Object | Test.java:2510:24:2510:47 | (...)... : SwappedByteBuf | provenance |  |
-| Test.java:2511:10:2511:11 | in : SwappedByteBuf | Test.java:2511:10:2511:22 | toString(...) : String | provenance | MaD:59 |
+| Test.java:2511:10:2511:11 | in : SwappedByteBuf | Test.java:2511:10:2511:22 | toString(...) : String | provenance | MaD:99 |
 | Test.java:2511:10:2511:22 | toString(...) : String | Test.java:2512:9:2512:11 | out | provenance |  |
 | Test.java:2517:24:2517:47 | (...)... : SwappedByteBuf | Test.java:2518:10:2518:11 | in : SwappedByteBuf | provenance |  |
 | Test.java:2517:40:2517:47 | source(...) : Object | Test.java:2517:24:2517:47 | (...)... : SwappedByteBuf | provenance |  |
-| Test.java:2518:10:2518:11 | in : SwappedByteBuf | Test.java:2518:10:2518:32 | toString(...) : String | provenance | MaD:59 |
+| Test.java:2518:10:2518:11 | in : SwappedByteBuf | Test.java:2518:10:2518:32 | toString(...) : String | provenance | MaD:99 |
 | Test.java:2518:10:2518:32 | toString(...) : String | Test.java:2519:9:2519:11 | out | provenance |  |
 | Test.java:2524:24:2524:47 | (...)... : SwappedByteBuf | Test.java:2525:10:2525:11 | in : SwappedByteBuf | provenance |  |
 | Test.java:2524:40:2524:47 | source(...) : Object | Test.java:2524:24:2524:47 | (...)... : SwappedByteBuf | provenance |  |
-| Test.java:2525:10:2525:11 | in : SwappedByteBuf | Test.java:2525:10:2525:26 | toString(...) : String | provenance | MaD:59 |
+| Test.java:2525:10:2525:11 | in : SwappedByteBuf | Test.java:2525:10:2525:26 | toString(...) : String | provenance | MaD:99 |
 | Test.java:2525:10:2525:26 | toString(...) : String | Test.java:2526:9:2526:11 | out | provenance |  |
 | Test.java:2531:17:2531:33 | (...)... : ByteBuf | Test.java:2532:10:2532:11 | in : ByteBuf | provenance |  |
 | Test.java:2531:26:2531:33 | source(...) : Object | Test.java:2531:17:2531:33 | (...)... : ByteBuf | provenance |  |
-| Test.java:2532:10:2532:11 | in : ByteBuf | Test.java:2532:10:2532:20 | unwrap(...) : ByteBuf | provenance | MaD:60 |
+| Test.java:2532:10:2532:11 | in : ByteBuf | Test.java:2532:10:2532:20 | unwrap(...) : ByteBuf | provenance | MaD:100 |
 | Test.java:2532:10:2532:20 | unwrap(...) : ByteBuf | Test.java:2533:9:2533:11 | out | provenance |  |
 | Test.java:2538:26:2538:51 | (...)... : CompositeByteBuf | Test.java:2539:10:2539:11 | in : CompositeByteBuf | provenance |  |
 | Test.java:2538:44:2538:51 | source(...) : Object | Test.java:2538:26:2538:51 | (...)... : CompositeByteBuf | provenance |  |
-| Test.java:2539:10:2539:11 | in : CompositeByteBuf | Test.java:2539:10:2539:20 | unwrap(...) : ByteBuf | provenance | MaD:60 |
+| Test.java:2539:10:2539:11 | in : CompositeByteBuf | Test.java:2539:10:2539:20 | unwrap(...) : ByteBuf | provenance | MaD:100 |
 | Test.java:2539:10:2539:20 | unwrap(...) : ByteBuf | Test.java:2540:9:2540:11 | out | provenance |  |
 | Test.java:2545:24:2545:47 | (...)... : SwappedByteBuf | Test.java:2546:10:2546:11 | in : SwappedByteBuf | provenance |  |
 | Test.java:2545:40:2545:47 | source(...) : Object | Test.java:2545:24:2545:47 | (...)... : SwappedByteBuf | provenance |  |
-| Test.java:2546:10:2546:11 | in : SwappedByteBuf | Test.java:2546:10:2546:20 | unwrap(...) : ByteBuf | provenance | MaD:60 |
+| Test.java:2546:10:2546:11 | in : SwappedByteBuf | Test.java:2546:10:2546:20 | unwrap(...) : ByteBuf | provenance | MaD:100 |
 | Test.java:2546:10:2546:20 | unwrap(...) : ByteBuf | Test.java:2547:9:2547:11 | out | provenance |  |
 | Test.java:2552:25:2552:49 | (...)... : AbstractByteBuf | Test.java:2553:10:2553:11 | in : AbstractByteBuf | provenance |  |
 | Test.java:2552:42:2552:49 | source(...) : Object | Test.java:2552:25:2552:49 | (...)... : AbstractByteBuf | provenance |  |
-| Test.java:2553:10:2553:11 | in : AbstractByteBuf | Test.java:2553:10:2553:31 | writeBoolean(...) : AbstractByteBuf | provenance | MaD:61 |
+| Test.java:2553:10:2553:11 | in : AbstractByteBuf | Test.java:2553:10:2553:31 | writeBoolean(...) : AbstractByteBuf | provenance | MaD:101 |
 | Test.java:2553:10:2553:31 | writeBoolean(...) : AbstractByteBuf | Test.java:2554:9:2554:11 | out | provenance |  |
 | Test.java:2559:17:2559:33 | (...)... : ByteBuf | Test.java:2560:10:2560:11 | in : ByteBuf | provenance |  |
 | Test.java:2559:26:2559:33 | source(...) : Object | Test.java:2559:17:2559:33 | (...)... : ByteBuf | provenance |  |
-| Test.java:2560:10:2560:11 | in : ByteBuf | Test.java:2560:10:2560:31 | writeBoolean(...) : ByteBuf | provenance | MaD:61 |
+| Test.java:2560:10:2560:11 | in : ByteBuf | Test.java:2560:10:2560:31 | writeBoolean(...) : ByteBuf | provenance | MaD:101 |
 | Test.java:2560:10:2560:31 | writeBoolean(...) : ByteBuf | Test.java:2561:9:2561:11 | out | provenance |  |
 | Test.java:2566:24:2566:47 | (...)... : SwappedByteBuf | Test.java:2567:10:2567:11 | in : SwappedByteBuf | provenance |  |
 | Test.java:2566:40:2566:47 | source(...) : Object | Test.java:2566:24:2566:47 | (...)... : SwappedByteBuf | provenance |  |
-| Test.java:2567:10:2567:11 | in : SwappedByteBuf | Test.java:2567:10:2567:31 | writeBoolean(...) : SwappedByteBuf | provenance | MaD:61 |
+| Test.java:2567:10:2567:11 | in : SwappedByteBuf | Test.java:2567:10:2567:31 | writeBoolean(...) : SwappedByteBuf | provenance | MaD:101 |
 | Test.java:2567:10:2567:31 | writeBoolean(...) : SwappedByteBuf | Test.java:2568:9:2568:11 | out | provenance |  |
 | Test.java:2573:26:2573:51 | (...)... : CompositeByteBuf | Test.java:2574:10:2574:11 | in : CompositeByteBuf | provenance |  |
 | Test.java:2573:44:2573:51 | source(...) : Object | Test.java:2573:26:2573:51 | (...)... : CompositeByteBuf | provenance |  |
-| Test.java:2574:10:2574:11 | in : CompositeByteBuf | Test.java:2574:10:2574:31 | writeBoolean(...) : CompositeByteBuf | provenance | MaD:61 |
+| Test.java:2574:10:2574:11 | in : CompositeByteBuf | Test.java:2574:10:2574:31 | writeBoolean(...) : CompositeByteBuf | provenance | MaD:101 |
 | Test.java:2574:10:2574:31 | writeBoolean(...) : CompositeByteBuf | Test.java:2575:9:2575:11 | out | provenance |  |
 | Test.java:2580:25:2580:49 | (...)... : AbstractByteBuf | Test.java:2581:10:2581:11 | in : AbstractByteBuf | provenance |  |
 | Test.java:2580:42:2580:49 | source(...) : Object | Test.java:2580:25:2580:49 | (...)... : AbstractByteBuf | provenance |  |
-| Test.java:2581:10:2581:11 | in : AbstractByteBuf | Test.java:2581:10:2581:24 | writeByte(...) : AbstractByteBuf | provenance | MaD:62 |
+| Test.java:2581:10:2581:11 | in : AbstractByteBuf | Test.java:2581:10:2581:24 | writeByte(...) : AbstractByteBuf | provenance | MaD:103 |
 | Test.java:2581:10:2581:24 | writeByte(...) : AbstractByteBuf | Test.java:2582:9:2582:11 | out | provenance |  |
 | Test.java:2587:17:2587:33 | (...)... : ByteBuf | Test.java:2588:10:2588:11 | in : ByteBuf | provenance |  |
 | Test.java:2587:26:2587:33 | source(...) : Object | Test.java:2587:17:2587:33 | (...)... : ByteBuf | provenance |  |
-| Test.java:2588:10:2588:11 | in : ByteBuf | Test.java:2588:10:2588:24 | writeByte(...) : ByteBuf | provenance | MaD:62 |
+| Test.java:2588:10:2588:11 | in : ByteBuf | Test.java:2588:10:2588:24 | writeByte(...) : ByteBuf | provenance | MaD:103 |
 | Test.java:2588:10:2588:24 | writeByte(...) : ByteBuf | Test.java:2589:9:2589:11 | out | provenance |  |
 | Test.java:2594:24:2594:47 | (...)... : SwappedByteBuf | Test.java:2595:10:2595:11 | in : SwappedByteBuf | provenance |  |
 | Test.java:2594:40:2594:47 | source(...) : Object | Test.java:2594:24:2594:47 | (...)... : SwappedByteBuf | provenance |  |
-| Test.java:2595:10:2595:11 | in : SwappedByteBuf | Test.java:2595:10:2595:24 | writeByte(...) : SwappedByteBuf | provenance | MaD:62 |
+| Test.java:2595:10:2595:11 | in : SwappedByteBuf | Test.java:2595:10:2595:24 | writeByte(...) : SwappedByteBuf | provenance | MaD:103 |
 | Test.java:2595:10:2595:24 | writeByte(...) : SwappedByteBuf | Test.java:2596:9:2596:11 | out | provenance |  |
 | Test.java:2601:26:2601:51 | (...)... : CompositeByteBuf | Test.java:2602:10:2602:11 | in : CompositeByteBuf | provenance |  |
 | Test.java:2601:44:2601:51 | source(...) : Object | Test.java:2601:26:2601:51 | (...)... : CompositeByteBuf | provenance |  |
-| Test.java:2602:10:2602:11 | in : CompositeByteBuf | Test.java:2602:10:2602:24 | writeByte(...) : CompositeByteBuf | provenance | MaD:62 |
+| Test.java:2602:10:2602:11 | in : CompositeByteBuf | Test.java:2602:10:2602:24 | writeByte(...) : CompositeByteBuf | provenance | MaD:103 |
 | Test.java:2602:10:2602:24 | writeByte(...) : CompositeByteBuf | Test.java:2603:9:2603:11 | out | provenance |  |
 | Test.java:2608:13:2608:25 | (...)... : Number | Test.java:2609:18:2609:19 | in : Number | provenance |  |
 | Test.java:2608:18:2608:25 | source(...) : Object | Test.java:2608:13:2608:25 | (...)... : Number | provenance |  |
 | Test.java:2609:4:2609:6 | out [post update] : AbstractByteBuf | Test.java:2610:9:2610:11 | out | provenance |  |
-| Test.java:2609:18:2609:19 | in : Number | Test.java:2609:4:2609:6 | out [post update] : AbstractByteBuf | provenance | MaD:125 |
+| Test.java:2609:18:2609:19 | in : Number | Test.java:2609:4:2609:6 | out [post update] : AbstractByteBuf | provenance | MaD:102 |
 | Test.java:2615:13:2615:25 | (...)... : Number | Test.java:2616:18:2616:19 | in : Number | provenance |  |
 | Test.java:2615:18:2615:25 | source(...) : Object | Test.java:2615:13:2615:25 | (...)... : Number | provenance |  |
 | Test.java:2616:4:2616:6 | out [post update] : ByteBuf | Test.java:2617:9:2617:11 | out | provenance |  |
-| Test.java:2616:18:2616:19 | in : Number | Test.java:2616:4:2616:6 | out [post update] : ByteBuf | provenance | MaD:125 |
+| Test.java:2616:18:2616:19 | in : Number | Test.java:2616:4:2616:6 | out [post update] : ByteBuf | provenance | MaD:102 |
 | Test.java:2622:13:2622:25 | (...)... : Number | Test.java:2623:18:2623:19 | in : Number | provenance |  |
 | Test.java:2622:18:2622:25 | source(...) : Object | Test.java:2622:13:2622:25 | (...)... : Number | provenance |  |
 | Test.java:2623:4:2623:6 | out [post update] : CompositeByteBuf | Test.java:2624:9:2624:11 | out | provenance |  |
-| Test.java:2623:18:2623:19 | in : Number | Test.java:2623:4:2623:6 | out [post update] : CompositeByteBuf | provenance | MaD:125 |
+| Test.java:2623:18:2623:19 | in : Number | Test.java:2623:4:2623:6 | out [post update] : CompositeByteBuf | provenance | MaD:102 |
 | Test.java:2629:13:2629:25 | (...)... : Number | Test.java:2630:18:2630:19 | in : Number | provenance |  |
 | Test.java:2629:18:2629:25 | source(...) : Object | Test.java:2629:13:2629:25 | (...)... : Number | provenance |  |
 | Test.java:2630:4:2630:6 | out [post update] : SwappedByteBuf | Test.java:2631:9:2631:11 | out | provenance |  |
-| Test.java:2630:18:2630:19 | in : Number | Test.java:2630:4:2630:6 | out [post update] : SwappedByteBuf | provenance | MaD:125 |
+| Test.java:2630:18:2630:19 | in : Number | Test.java:2630:4:2630:6 | out [post update] : SwappedByteBuf | provenance | MaD:102 |
 | Test.java:2636:25:2636:49 | (...)... : AbstractByteBuf | Test.java:2637:10:2637:11 | in : AbstractByteBuf | provenance |  |
 | Test.java:2636:42:2636:49 | source(...) : Object | Test.java:2636:25:2636:49 | (...)... : AbstractByteBuf | provenance |  |
-| Test.java:2637:10:2637:11 | in : AbstractByteBuf | Test.java:2637:10:2637:37 | writeBytes(...) : AbstractByteBuf | provenance | MaD:65 |
+| Test.java:2637:10:2637:11 | in : AbstractByteBuf | Test.java:2637:10:2637:37 | writeBytes(...) : AbstractByteBuf | provenance | MaD:105 |
 | Test.java:2637:10:2637:37 | writeBytes(...) : AbstractByteBuf | Test.java:2638:9:2638:11 | out | provenance |  |
 | Test.java:2643:17:2643:33 | (...)... : ByteBuf | Test.java:2644:10:2644:11 | in : ByteBuf | provenance |  |
 | Test.java:2643:26:2643:33 | source(...) : Object | Test.java:2643:17:2643:33 | (...)... : ByteBuf | provenance |  |
-| Test.java:2644:10:2644:11 | in : ByteBuf | Test.java:2644:10:2644:37 | writeBytes(...) : ByteBuf | provenance | MaD:65 |
+| Test.java:2644:10:2644:11 | in : ByteBuf | Test.java:2644:10:2644:37 | writeBytes(...) : ByteBuf | provenance | MaD:105 |
 | Test.java:2644:10:2644:37 | writeBytes(...) : ByteBuf | Test.java:2645:9:2645:11 | out | provenance |  |
 | Test.java:2650:24:2650:47 | (...)... : SwappedByteBuf | Test.java:2651:10:2651:11 | in : SwappedByteBuf | provenance |  |
 | Test.java:2650:40:2650:47 | source(...) : Object | Test.java:2650:24:2650:47 | (...)... : SwappedByteBuf | provenance |  |
-| Test.java:2651:10:2651:11 | in : SwappedByteBuf | Test.java:2651:10:2651:37 | writeBytes(...) : SwappedByteBuf | provenance | MaD:65 |
+| Test.java:2651:10:2651:11 | in : SwappedByteBuf | Test.java:2651:10:2651:37 | writeBytes(...) : SwappedByteBuf | provenance | MaD:105 |
 | Test.java:2651:10:2651:37 | writeBytes(...) : SwappedByteBuf | Test.java:2652:9:2652:11 | out | provenance |  |
 | Test.java:2657:26:2657:51 | (...)... : CompositeByteBuf | Test.java:2658:10:2658:11 | in : CompositeByteBuf | provenance |  |
 | Test.java:2657:44:2657:51 | source(...) : Object | Test.java:2657:26:2657:51 | (...)... : CompositeByteBuf | provenance |  |
-| Test.java:2658:10:2658:11 | in : CompositeByteBuf | Test.java:2658:10:2658:37 | writeBytes(...) : CompositeByteBuf | provenance | MaD:65 |
+| Test.java:2658:10:2658:11 | in : CompositeByteBuf | Test.java:2658:10:2658:37 | writeBytes(...) : CompositeByteBuf | provenance | MaD:105 |
 | Test.java:2658:10:2658:37 | writeBytes(...) : CompositeByteBuf | Test.java:2659:9:2659:11 | out | provenance |  |
 | Test.java:2664:17:2664:33 | (...)... : ByteBuf | Test.java:2665:19:2665:20 | in : ByteBuf | provenance |  |
 | Test.java:2664:26:2664:33 | source(...) : Object | Test.java:2664:17:2664:33 | (...)... : ByteBuf | provenance |  |
 | Test.java:2665:4:2665:6 | out [post update] : AbstractByteBuf | Test.java:2666:9:2666:11 | out | provenance |  |
-| Test.java:2665:19:2665:20 | in : ByteBuf | Test.java:2665:4:2665:6 | out [post update] : AbstractByteBuf | provenance | MaD:128 |
+| Test.java:2665:19:2665:20 | in : ByteBuf | Test.java:2665:4:2665:6 | out [post update] : AbstractByteBuf | provenance | MaD:104 |
 | Test.java:2671:17:2671:33 | (...)... : ByteBuf | Test.java:2672:19:2672:20 | in : ByteBuf | provenance |  |
 | Test.java:2671:26:2671:33 | source(...) : Object | Test.java:2671:17:2671:33 | (...)... : ByteBuf | provenance |  |
 | Test.java:2672:4:2672:6 | out [post update] : ByteBuf | Test.java:2673:9:2673:11 | out | provenance |  |
-| Test.java:2672:19:2672:20 | in : ByteBuf | Test.java:2672:4:2672:6 | out [post update] : ByteBuf | provenance | MaD:128 |
+| Test.java:2672:19:2672:20 | in : ByteBuf | Test.java:2672:4:2672:6 | out [post update] : ByteBuf | provenance | MaD:104 |
 | Test.java:2678:17:2678:33 | (...)... : ByteBuf | Test.java:2679:19:2679:20 | in : ByteBuf | provenance |  |
 | Test.java:2678:26:2678:33 | source(...) : Object | Test.java:2678:17:2678:33 | (...)... : ByteBuf | provenance |  |
 | Test.java:2679:4:2679:6 | out [post update] : CompositeByteBuf | Test.java:2680:9:2680:11 | out | provenance |  |
-| Test.java:2679:19:2679:20 | in : ByteBuf | Test.java:2679:4:2679:6 | out [post update] : CompositeByteBuf | provenance | MaD:128 |
+| Test.java:2679:19:2679:20 | in : ByteBuf | Test.java:2679:4:2679:6 | out [post update] : CompositeByteBuf | provenance | MaD:104 |
 | Test.java:2685:17:2685:33 | (...)... : ByteBuf | Test.java:2686:19:2686:20 | in : ByteBuf | provenance |  |
 | Test.java:2685:26:2685:33 | source(...) : Object | Test.java:2685:17:2685:33 | (...)... : ByteBuf | provenance |  |
 | Test.java:2686:4:2686:6 | out [post update] : SwappedByteBuf | Test.java:2687:9:2687:11 | out | provenance |  |
-| Test.java:2686:19:2686:20 | in : ByteBuf | Test.java:2686:4:2686:6 | out [post update] : SwappedByteBuf | provenance | MaD:128 |
+| Test.java:2686:19:2686:20 | in : ByteBuf | Test.java:2686:4:2686:6 | out [post update] : SwappedByteBuf | provenance | MaD:104 |
 | Test.java:2692:25:2692:49 | (...)... : AbstractByteBuf | Test.java:2693:10:2693:11 | in : AbstractByteBuf | provenance |  |
 | Test.java:2692:42:2692:49 | source(...) : Object | Test.java:2692:25:2692:49 | (...)... : AbstractByteBuf | provenance |  |
-| Test.java:2693:10:2693:11 | in : AbstractByteBuf | Test.java:2693:10:2693:40 | writeBytes(...) : AbstractByteBuf | provenance | MaD:67 |
+| Test.java:2693:10:2693:11 | in : AbstractByteBuf | Test.java:2693:10:2693:40 | writeBytes(...) : AbstractByteBuf | provenance | MaD:107 |
 | Test.java:2693:10:2693:40 | writeBytes(...) : AbstractByteBuf | Test.java:2694:9:2694:11 | out | provenance |  |
 | Test.java:2699:17:2699:33 | (...)... : ByteBuf | Test.java:2700:10:2700:11 | in : ByteBuf | provenance |  |
 | Test.java:2699:26:2699:33 | source(...) : Object | Test.java:2699:17:2699:33 | (...)... : ByteBuf | provenance |  |
-| Test.java:2700:10:2700:11 | in : ByteBuf | Test.java:2700:10:2700:40 | writeBytes(...) : ByteBuf | provenance | MaD:67 |
+| Test.java:2700:10:2700:11 | in : ByteBuf | Test.java:2700:10:2700:40 | writeBytes(...) : ByteBuf | provenance | MaD:107 |
 | Test.java:2700:10:2700:40 | writeBytes(...) : ByteBuf | Test.java:2701:9:2701:11 | out | provenance |  |
 | Test.java:2706:24:2706:47 | (...)... : SwappedByteBuf | Test.java:2707:10:2707:11 | in : SwappedByteBuf | provenance |  |
 | Test.java:2706:40:2706:47 | source(...) : Object | Test.java:2706:24:2706:47 | (...)... : SwappedByteBuf | provenance |  |
-| Test.java:2707:10:2707:11 | in : SwappedByteBuf | Test.java:2707:10:2707:40 | writeBytes(...) : SwappedByteBuf | provenance | MaD:67 |
+| Test.java:2707:10:2707:11 | in : SwappedByteBuf | Test.java:2707:10:2707:40 | writeBytes(...) : SwappedByteBuf | provenance | MaD:107 |
 | Test.java:2707:10:2707:40 | writeBytes(...) : SwappedByteBuf | Test.java:2708:9:2708:11 | out | provenance |  |
 | Test.java:2713:26:2713:51 | (...)... : CompositeByteBuf | Test.java:2714:10:2714:11 | in : CompositeByteBuf | provenance |  |
 | Test.java:2713:44:2713:51 | source(...) : Object | Test.java:2713:26:2713:51 | (...)... : CompositeByteBuf | provenance |  |
-| Test.java:2714:10:2714:11 | in : CompositeByteBuf | Test.java:2714:10:2714:40 | writeBytes(...) : CompositeByteBuf | provenance | MaD:67 |
+| Test.java:2714:10:2714:11 | in : CompositeByteBuf | Test.java:2714:10:2714:40 | writeBytes(...) : CompositeByteBuf | provenance | MaD:107 |
 | Test.java:2714:10:2714:40 | writeBytes(...) : CompositeByteBuf | Test.java:2715:9:2715:11 | out | provenance |  |
 | Test.java:2720:17:2720:33 | (...)... : ByteBuf | Test.java:2721:19:2721:20 | in : ByteBuf | provenance |  |
 | Test.java:2720:26:2720:33 | source(...) : Object | Test.java:2720:17:2720:33 | (...)... : ByteBuf | provenance |  |
 | Test.java:2721:4:2721:6 | out [post update] : AbstractByteBuf | Test.java:2722:9:2722:11 | out | provenance |  |
-| Test.java:2721:19:2721:20 | in : ByteBuf | Test.java:2721:4:2721:6 | out [post update] : AbstractByteBuf | provenance | MaD:130 |
+| Test.java:2721:19:2721:20 | in : ByteBuf | Test.java:2721:4:2721:6 | out [post update] : AbstractByteBuf | provenance | MaD:106 |
 | Test.java:2727:17:2727:33 | (...)... : ByteBuf | Test.java:2728:19:2728:20 | in : ByteBuf | provenance |  |
 | Test.java:2727:26:2727:33 | source(...) : Object | Test.java:2727:17:2727:33 | (...)... : ByteBuf | provenance |  |
 | Test.java:2728:4:2728:6 | out [post update] : ByteBuf | Test.java:2729:9:2729:11 | out | provenance |  |
-| Test.java:2728:19:2728:20 | in : ByteBuf | Test.java:2728:4:2728:6 | out [post update] : ByteBuf | provenance | MaD:130 |
+| Test.java:2728:19:2728:20 | in : ByteBuf | Test.java:2728:4:2728:6 | out [post update] : ByteBuf | provenance | MaD:106 |
 | Test.java:2734:17:2734:33 | (...)... : ByteBuf | Test.java:2735:19:2735:20 | in : ByteBuf | provenance |  |
 | Test.java:2734:26:2734:33 | source(...) : Object | Test.java:2734:17:2734:33 | (...)... : ByteBuf | provenance |  |
 | Test.java:2735:4:2735:6 | out [post update] : CompositeByteBuf | Test.java:2736:9:2736:11 | out | provenance |  |
-| Test.java:2735:19:2735:20 | in : ByteBuf | Test.java:2735:4:2735:6 | out [post update] : CompositeByteBuf | provenance | MaD:130 |
+| Test.java:2735:19:2735:20 | in : ByteBuf | Test.java:2735:4:2735:6 | out [post update] : CompositeByteBuf | provenance | MaD:106 |
 | Test.java:2741:17:2741:33 | (...)... : ByteBuf | Test.java:2742:19:2742:20 | in : ByteBuf | provenance |  |
 | Test.java:2741:26:2741:33 | source(...) : Object | Test.java:2741:17:2741:33 | (...)... : ByteBuf | provenance |  |
 | Test.java:2742:4:2742:6 | out [post update] : SwappedByteBuf | Test.java:2743:9:2743:11 | out | provenance |  |
-| Test.java:2742:19:2742:20 | in : ByteBuf | Test.java:2742:4:2742:6 | out [post update] : SwappedByteBuf | provenance | MaD:130 |
+| Test.java:2742:19:2742:20 | in : ByteBuf | Test.java:2742:4:2742:6 | out [post update] : SwappedByteBuf | provenance | MaD:106 |
 | Test.java:2748:25:2748:49 | (...)... : AbstractByteBuf | Test.java:2749:10:2749:11 | in : AbstractByteBuf | provenance |  |
 | Test.java:2748:42:2748:49 | source(...) : Object | Test.java:2748:25:2748:49 | (...)... : AbstractByteBuf | provenance |  |
-| Test.java:2749:10:2749:11 | in : AbstractByteBuf | Test.java:2749:10:2749:43 | writeBytes(...) : AbstractByteBuf | provenance | MaD:68 |
+| Test.java:2749:10:2749:11 | in : AbstractByteBuf | Test.java:2749:10:2749:43 | writeBytes(...) : AbstractByteBuf | provenance | MaD:109 |
 | Test.java:2749:10:2749:43 | writeBytes(...) : AbstractByteBuf | Test.java:2750:9:2750:11 | out | provenance |  |
 | Test.java:2755:17:2755:33 | (...)... : ByteBuf | Test.java:2756:10:2756:11 | in : ByteBuf | provenance |  |
 | Test.java:2755:26:2755:33 | source(...) : Object | Test.java:2755:17:2755:33 | (...)... : ByteBuf | provenance |  |
-| Test.java:2756:10:2756:11 | in : ByteBuf | Test.java:2756:10:2756:43 | writeBytes(...) : ByteBuf | provenance | MaD:68 |
+| Test.java:2756:10:2756:11 | in : ByteBuf | Test.java:2756:10:2756:43 | writeBytes(...) : ByteBuf | provenance | MaD:109 |
 | Test.java:2756:10:2756:43 | writeBytes(...) : ByteBuf | Test.java:2757:9:2757:11 | out | provenance |  |
 | Test.java:2762:24:2762:47 | (...)... : SwappedByteBuf | Test.java:2763:10:2763:11 | in : SwappedByteBuf | provenance |  |
 | Test.java:2762:40:2762:47 | source(...) : Object | Test.java:2762:24:2762:47 | (...)... : SwappedByteBuf | provenance |  |
-| Test.java:2763:10:2763:11 | in : SwappedByteBuf | Test.java:2763:10:2763:43 | writeBytes(...) : SwappedByteBuf | provenance | MaD:68 |
+| Test.java:2763:10:2763:11 | in : SwappedByteBuf | Test.java:2763:10:2763:43 | writeBytes(...) : SwappedByteBuf | provenance | MaD:109 |
 | Test.java:2763:10:2763:43 | writeBytes(...) : SwappedByteBuf | Test.java:2764:9:2764:11 | out | provenance |  |
 | Test.java:2769:26:2769:51 | (...)... : CompositeByteBuf | Test.java:2770:10:2770:11 | in : CompositeByteBuf | provenance |  |
 | Test.java:2769:44:2769:51 | source(...) : Object | Test.java:2769:26:2769:51 | (...)... : CompositeByteBuf | provenance |  |
-| Test.java:2770:10:2770:11 | in : CompositeByteBuf | Test.java:2770:10:2770:43 | writeBytes(...) : CompositeByteBuf | provenance | MaD:68 |
+| Test.java:2770:10:2770:11 | in : CompositeByteBuf | Test.java:2770:10:2770:43 | writeBytes(...) : CompositeByteBuf | provenance | MaD:109 |
 | Test.java:2770:10:2770:43 | writeBytes(...) : CompositeByteBuf | Test.java:2771:9:2771:11 | out | provenance |  |
 | Test.java:2776:17:2776:33 | (...)... : ByteBuf | Test.java:2777:19:2777:20 | in : ByteBuf | provenance |  |
 | Test.java:2776:26:2776:33 | source(...) : Object | Test.java:2776:17:2776:33 | (...)... : ByteBuf | provenance |  |
 | Test.java:2777:4:2777:6 | out [post update] : AbstractByteBuf | Test.java:2778:9:2778:11 | out | provenance |  |
-| Test.java:2777:19:2777:20 | in : ByteBuf | Test.java:2777:4:2777:6 | out [post update] : AbstractByteBuf | provenance | MaD:131 |
+| Test.java:2777:19:2777:20 | in : ByteBuf | Test.java:2777:4:2777:6 | out [post update] : AbstractByteBuf | provenance | MaD:108 |
 | Test.java:2783:17:2783:33 | (...)... : ByteBuf | Test.java:2784:19:2784:20 | in : ByteBuf | provenance |  |
 | Test.java:2783:26:2783:33 | source(...) : Object | Test.java:2783:17:2783:33 | (...)... : ByteBuf | provenance |  |
 | Test.java:2784:4:2784:6 | out [post update] : ByteBuf | Test.java:2785:9:2785:11 | out | provenance |  |
-| Test.java:2784:19:2784:20 | in : ByteBuf | Test.java:2784:4:2784:6 | out [post update] : ByteBuf | provenance | MaD:131 |
+| Test.java:2784:19:2784:20 | in : ByteBuf | Test.java:2784:4:2784:6 | out [post update] : ByteBuf | provenance | MaD:108 |
 | Test.java:2790:17:2790:33 | (...)... : ByteBuf | Test.java:2791:19:2791:20 | in : ByteBuf | provenance |  |
 | Test.java:2790:26:2790:33 | source(...) : Object | Test.java:2790:17:2790:33 | (...)... : ByteBuf | provenance |  |
 | Test.java:2791:4:2791:6 | out [post update] : CompositeByteBuf | Test.java:2792:9:2792:11 | out | provenance |  |
-| Test.java:2791:19:2791:20 | in : ByteBuf | Test.java:2791:4:2791:6 | out [post update] : CompositeByteBuf | provenance | MaD:131 |
+| Test.java:2791:19:2791:20 | in : ByteBuf | Test.java:2791:4:2791:6 | out [post update] : CompositeByteBuf | provenance | MaD:108 |
 | Test.java:2797:17:2797:33 | (...)... : ByteBuf | Test.java:2798:19:2798:20 | in : ByteBuf | provenance |  |
 | Test.java:2797:26:2797:33 | source(...) : Object | Test.java:2797:17:2797:33 | (...)... : ByteBuf | provenance |  |
 | Test.java:2798:4:2798:6 | out [post update] : SwappedByteBuf | Test.java:2799:9:2799:11 | out | provenance |  |
-| Test.java:2798:19:2798:20 | in : ByteBuf | Test.java:2798:4:2798:6 | out [post update] : SwappedByteBuf | provenance | MaD:131 |
+| Test.java:2798:19:2798:20 | in : ByteBuf | Test.java:2798:4:2798:6 | out [post update] : SwappedByteBuf | provenance | MaD:108 |
 | Test.java:2804:25:2804:49 | (...)... : AbstractByteBuf | Test.java:2805:10:2805:11 | in : AbstractByteBuf | provenance |  |
 | Test.java:2804:42:2804:49 | source(...) : Object | Test.java:2804:25:2804:49 | (...)... : AbstractByteBuf | provenance |  |
-| Test.java:2805:10:2805:11 | in : AbstractByteBuf | Test.java:2805:10:2805:40 | writeBytes(...) : AbstractByteBuf | provenance | MaD:66 |
+| Test.java:2805:10:2805:11 | in : AbstractByteBuf | Test.java:2805:10:2805:40 | writeBytes(...) : AbstractByteBuf | provenance | MaD:111 |
 | Test.java:2805:10:2805:40 | writeBytes(...) : AbstractByteBuf | Test.java:2806:9:2806:11 | out | provenance |  |
 | Test.java:2811:17:2811:33 | (...)... : ByteBuf | Test.java:2812:10:2812:11 | in : ByteBuf | provenance |  |
 | Test.java:2811:26:2811:33 | source(...) : Object | Test.java:2811:17:2811:33 | (...)... : ByteBuf | provenance |  |
-| Test.java:2812:10:2812:11 | in : ByteBuf | Test.java:2812:10:2812:40 | writeBytes(...) : ByteBuf | provenance | MaD:66 |
+| Test.java:2812:10:2812:11 | in : ByteBuf | Test.java:2812:10:2812:40 | writeBytes(...) : ByteBuf | provenance | MaD:111 |
 | Test.java:2812:10:2812:40 | writeBytes(...) : ByteBuf | Test.java:2813:9:2813:11 | out | provenance |  |
 | Test.java:2818:24:2818:47 | (...)... : SwappedByteBuf | Test.java:2819:10:2819:11 | in : SwappedByteBuf | provenance |  |
 | Test.java:2818:40:2818:47 | source(...) : Object | Test.java:2818:24:2818:47 | (...)... : SwappedByteBuf | provenance |  |
-| Test.java:2819:10:2819:11 | in : SwappedByteBuf | Test.java:2819:10:2819:40 | writeBytes(...) : SwappedByteBuf | provenance | MaD:66 |
+| Test.java:2819:10:2819:11 | in : SwappedByteBuf | Test.java:2819:10:2819:40 | writeBytes(...) : SwappedByteBuf | provenance | MaD:111 |
 | Test.java:2819:10:2819:40 | writeBytes(...) : SwappedByteBuf | Test.java:2820:9:2820:11 | out | provenance |  |
 | Test.java:2825:26:2825:51 | (...)... : CompositeByteBuf | Test.java:2826:10:2826:11 | in : CompositeByteBuf | provenance |  |
 | Test.java:2825:44:2825:51 | source(...) : Object | Test.java:2825:26:2825:51 | (...)... : CompositeByteBuf | provenance |  |
-| Test.java:2826:10:2826:11 | in : CompositeByteBuf | Test.java:2826:10:2826:40 | writeBytes(...) : CompositeByteBuf | provenance | MaD:66 |
+| Test.java:2826:10:2826:11 | in : CompositeByteBuf | Test.java:2826:10:2826:40 | writeBytes(...) : CompositeByteBuf | provenance | MaD:111 |
 | Test.java:2826:10:2826:40 | writeBytes(...) : CompositeByteBuf | Test.java:2827:9:2827:11 | out | provenance |  |
 | Test.java:2832:20:2832:39 | (...)... : ByteBuffer | Test.java:2833:19:2833:20 | in : ByteBuffer | provenance |  |
 | Test.java:2832:32:2832:39 | source(...) : Object | Test.java:2832:20:2832:39 | (...)... : ByteBuffer | provenance |  |
 | Test.java:2833:4:2833:6 | out [post update] : AbstractByteBuf | Test.java:2834:9:2834:11 | out | provenance |  |
-| Test.java:2833:19:2833:20 | in : ByteBuffer | Test.java:2833:4:2833:6 | out [post update] : AbstractByteBuf | provenance | MaD:129 |
+| Test.java:2833:19:2833:20 | in : ByteBuffer | Test.java:2833:4:2833:6 | out [post update] : AbstractByteBuf | provenance | MaD:110 |
 | Test.java:2839:20:2839:39 | (...)... : ByteBuffer | Test.java:2840:19:2840:20 | in : ByteBuffer | provenance |  |
 | Test.java:2839:32:2839:39 | source(...) : Object | Test.java:2839:20:2839:39 | (...)... : ByteBuffer | provenance |  |
 | Test.java:2840:4:2840:6 | out [post update] : ByteBuf | Test.java:2841:9:2841:11 | out | provenance |  |
-| Test.java:2840:19:2840:20 | in : ByteBuffer | Test.java:2840:4:2840:6 | out [post update] : ByteBuf | provenance | MaD:129 |
+| Test.java:2840:19:2840:20 | in : ByteBuffer | Test.java:2840:4:2840:6 | out [post update] : ByteBuf | provenance | MaD:110 |
 | Test.java:2846:20:2846:39 | (...)... : ByteBuffer | Test.java:2847:19:2847:20 | in : ByteBuffer | provenance |  |
 | Test.java:2846:32:2846:39 | source(...) : Object | Test.java:2846:20:2846:39 | (...)... : ByteBuffer | provenance |  |
 | Test.java:2847:4:2847:6 | out [post update] : CompositeByteBuf | Test.java:2848:9:2848:11 | out | provenance |  |
-| Test.java:2847:19:2847:20 | in : ByteBuffer | Test.java:2847:4:2847:6 | out [post update] : CompositeByteBuf | provenance | MaD:129 |
+| Test.java:2847:19:2847:20 | in : ByteBuffer | Test.java:2847:4:2847:6 | out [post update] : CompositeByteBuf | provenance | MaD:110 |
 | Test.java:2853:20:2853:39 | (...)... : ByteBuffer | Test.java:2854:19:2854:20 | in : ByteBuffer | provenance |  |
 | Test.java:2853:32:2853:39 | source(...) : Object | Test.java:2853:20:2853:39 | (...)... : ByteBuffer | provenance |  |
 | Test.java:2854:4:2854:6 | out [post update] : SwappedByteBuf | Test.java:2855:9:2855:11 | out | provenance |  |
-| Test.java:2854:19:2854:20 | in : ByteBuffer | Test.java:2854:4:2854:6 | out [post update] : SwappedByteBuf | provenance | MaD:129 |
+| Test.java:2854:19:2854:20 | in : ByteBuffer | Test.java:2854:4:2854:6 | out [post update] : SwappedByteBuf | provenance | MaD:110 |
 | Test.java:2860:21:2860:41 | (...)... : FileChannel | Test.java:2861:19:2861:20 | in : FileChannel | provenance |  |
 | Test.java:2860:34:2860:41 | source(...) : Object | Test.java:2860:21:2860:41 | (...)... : FileChannel | provenance |  |
 | Test.java:2861:4:2861:6 | out [post update] : AbstractByteBuf | Test.java:2862:9:2862:11 | out | provenance |  |
-| Test.java:2861:19:2861:20 | in : FileChannel | Test.java:2861:4:2861:6 | out [post update] : AbstractByteBuf | provenance | MaD:132 |
+| Test.java:2861:19:2861:20 | in : FileChannel | Test.java:2861:4:2861:6 | out [post update] : AbstractByteBuf | provenance | MaD:112 |
 | Test.java:2867:21:2867:41 | (...)... : FileChannel | Test.java:2868:19:2868:20 | in : FileChannel | provenance |  |
 | Test.java:2867:34:2867:41 | source(...) : Object | Test.java:2867:21:2867:41 | (...)... : FileChannel | provenance |  |
 | Test.java:2868:4:2868:6 | out [post update] : ByteBuf | Test.java:2869:9:2869:11 | out | provenance |  |
-| Test.java:2868:19:2868:20 | in : FileChannel | Test.java:2868:4:2868:6 | out [post update] : ByteBuf | provenance | MaD:132 |
+| Test.java:2868:19:2868:20 | in : FileChannel | Test.java:2868:4:2868:6 | out [post update] : ByteBuf | provenance | MaD:112 |
 | Test.java:2874:21:2874:41 | (...)... : FileChannel | Test.java:2875:19:2875:20 | in : FileChannel | provenance |  |
 | Test.java:2874:34:2874:41 | source(...) : Object | Test.java:2874:21:2874:41 | (...)... : FileChannel | provenance |  |
 | Test.java:2875:4:2875:6 | out [post update] : SwappedByteBuf | Test.java:2876:9:2876:11 | out | provenance |  |
-| Test.java:2875:19:2875:20 | in : FileChannel | Test.java:2875:4:2875:6 | out [post update] : SwappedByteBuf | provenance | MaD:132 |
+| Test.java:2875:19:2875:20 | in : FileChannel | Test.java:2875:4:2875:6 | out [post update] : SwappedByteBuf | provenance | MaD:112 |
 | Test.java:2881:21:2881:41 | (...)... : InputStream | Test.java:2882:19:2882:20 | in : InputStream | provenance |  |
 | Test.java:2881:34:2881:41 | source(...) : Object | Test.java:2881:21:2881:41 | (...)... : InputStream | provenance |  |
 | Test.java:2882:4:2882:6 | out [post update] : AbstractByteBuf | Test.java:2883:9:2883:11 | out | provenance |  |
-| Test.java:2882:19:2882:20 | in : InputStream | Test.java:2882:4:2882:6 | out [post update] : AbstractByteBuf | provenance | MaD:134 |
+| Test.java:2882:19:2882:20 | in : InputStream | Test.java:2882:4:2882:6 | out [post update] : AbstractByteBuf | provenance | MaD:113 |
 | Test.java:2888:21:2888:41 | (...)... : InputStream | Test.java:2889:19:2889:20 | in : InputStream | provenance |  |
 | Test.java:2888:34:2888:41 | source(...) : Object | Test.java:2888:21:2888:41 | (...)... : InputStream | provenance |  |
 | Test.java:2889:4:2889:6 | out [post update] : ByteBuf | Test.java:2890:9:2890:11 | out | provenance |  |
-| Test.java:2889:19:2889:20 | in : InputStream | Test.java:2889:4:2889:6 | out [post update] : ByteBuf | provenance | MaD:134 |
+| Test.java:2889:19:2889:20 | in : InputStream | Test.java:2889:4:2889:6 | out [post update] : ByteBuf | provenance | MaD:113 |
 | Test.java:2895:21:2895:41 | (...)... : InputStream | Test.java:2896:19:2896:20 | in : InputStream | provenance |  |
 | Test.java:2895:34:2895:41 | source(...) : Object | Test.java:2895:21:2895:41 | (...)... : InputStream | provenance |  |
 | Test.java:2896:4:2896:6 | out [post update] : SwappedByteBuf | Test.java:2897:9:2897:11 | out | provenance |  |
-| Test.java:2896:19:2896:20 | in : InputStream | Test.java:2896:4:2896:6 | out [post update] : SwappedByteBuf | provenance | MaD:134 |
+| Test.java:2896:19:2896:20 | in : InputStream | Test.java:2896:4:2896:6 | out [post update] : SwappedByteBuf | provenance | MaD:113 |
 | Test.java:2902:31:2902:61 | (...)... : ScatteringByteChannel | Test.java:2903:19:2903:20 | in : ScatteringByteChannel | provenance |  |
 | Test.java:2902:54:2902:61 | source(...) : Object | Test.java:2902:31:2902:61 | (...)... : ScatteringByteChannel | provenance |  |
 | Test.java:2903:4:2903:6 | out [post update] : AbstractByteBuf | Test.java:2904:9:2904:11 | out | provenance |  |
-| Test.java:2903:19:2903:20 | in : ScatteringByteChannel | Test.java:2903:4:2903:6 | out [post update] : AbstractByteBuf | provenance | MaD:133 |
+| Test.java:2903:19:2903:20 | in : ScatteringByteChannel | Test.java:2903:4:2903:6 | out [post update] : AbstractByteBuf | provenance | MaD:114 |
 | Test.java:2909:31:2909:61 | (...)... : ScatteringByteChannel | Test.java:2910:19:2910:20 | in : ScatteringByteChannel | provenance |  |
 | Test.java:2909:54:2909:61 | source(...) : Object | Test.java:2909:31:2909:61 | (...)... : ScatteringByteChannel | provenance |  |
 | Test.java:2910:4:2910:6 | out [post update] : ByteBuf | Test.java:2911:9:2911:11 | out | provenance |  |
-| Test.java:2910:19:2910:20 | in : ScatteringByteChannel | Test.java:2910:4:2910:6 | out [post update] : ByteBuf | provenance | MaD:133 |
+| Test.java:2910:19:2910:20 | in : ScatteringByteChannel | Test.java:2910:4:2910:6 | out [post update] : ByteBuf | provenance | MaD:114 |
 | Test.java:2916:31:2916:61 | (...)... : ScatteringByteChannel | Test.java:2917:19:2917:20 | in : ScatteringByteChannel | provenance |  |
 | Test.java:2916:54:2916:61 | source(...) : Object | Test.java:2916:31:2916:61 | (...)... : ScatteringByteChannel | provenance |  |
 | Test.java:2917:4:2917:6 | out [post update] : SwappedByteBuf | Test.java:2918:9:2918:11 | out | provenance |  |
-| Test.java:2917:19:2917:20 | in : ScatteringByteChannel | Test.java:2917:4:2917:6 | out [post update] : SwappedByteBuf | provenance | MaD:133 |
+| Test.java:2917:19:2917:20 | in : ScatteringByteChannel | Test.java:2917:4:2917:6 | out [post update] : SwappedByteBuf | provenance | MaD:114 |
 | Test.java:2923:25:2923:49 | (...)... : AbstractByteBuf | Test.java:2924:10:2924:11 | in : AbstractByteBuf | provenance |  |
 | Test.java:2923:42:2923:49 | source(...) : Object | Test.java:2923:25:2923:49 | (...)... : AbstractByteBuf | provenance |  |
-| Test.java:2924:10:2924:11 | in : AbstractByteBuf | Test.java:2924:10:2924:36 | writeBytes(...) : AbstractByteBuf | provenance | MaD:63 |
+| Test.java:2924:10:2924:11 | in : AbstractByteBuf | Test.java:2924:10:2924:36 | writeBytes(...) : AbstractByteBuf | provenance | MaD:116 |
 | Test.java:2924:10:2924:36 | writeBytes(...) : AbstractByteBuf | Test.java:2925:9:2925:11 | out | provenance |  |
 | Test.java:2930:17:2930:33 | (...)... : ByteBuf | Test.java:2931:10:2931:11 | in : ByteBuf | provenance |  |
 | Test.java:2930:26:2930:33 | source(...) : Object | Test.java:2930:17:2930:33 | (...)... : ByteBuf | provenance |  |
-| Test.java:2931:10:2931:11 | in : ByteBuf | Test.java:2931:10:2931:36 | writeBytes(...) : ByteBuf | provenance | MaD:63 |
+| Test.java:2931:10:2931:11 | in : ByteBuf | Test.java:2931:10:2931:36 | writeBytes(...) : ByteBuf | provenance | MaD:116 |
 | Test.java:2931:10:2931:36 | writeBytes(...) : ByteBuf | Test.java:2932:9:2932:11 | out | provenance |  |
 | Test.java:2937:24:2937:47 | (...)... : SwappedByteBuf | Test.java:2938:10:2938:11 | in : SwappedByteBuf | provenance |  |
 | Test.java:2937:40:2937:47 | source(...) : Object | Test.java:2937:24:2937:47 | (...)... : SwappedByteBuf | provenance |  |
-| Test.java:2938:10:2938:11 | in : SwappedByteBuf | Test.java:2938:10:2938:36 | writeBytes(...) : SwappedByteBuf | provenance | MaD:63 |
+| Test.java:2938:10:2938:11 | in : SwappedByteBuf | Test.java:2938:10:2938:36 | writeBytes(...) : SwappedByteBuf | provenance | MaD:116 |
 | Test.java:2938:10:2938:36 | writeBytes(...) : SwappedByteBuf | Test.java:2939:9:2939:11 | out | provenance |  |
 | Test.java:2944:26:2944:51 | (...)... : CompositeByteBuf | Test.java:2945:10:2945:11 | in : CompositeByteBuf | provenance |  |
 | Test.java:2944:44:2944:51 | source(...) : Object | Test.java:2944:26:2944:51 | (...)... : CompositeByteBuf | provenance |  |
-| Test.java:2945:10:2945:11 | in : CompositeByteBuf | Test.java:2945:10:2945:36 | writeBytes(...) : CompositeByteBuf | provenance | MaD:63 |
+| Test.java:2945:10:2945:11 | in : CompositeByteBuf | Test.java:2945:10:2945:36 | writeBytes(...) : CompositeByteBuf | provenance | MaD:116 |
 | Test.java:2945:10:2945:36 | writeBytes(...) : CompositeByteBuf | Test.java:2946:9:2946:11 | out | provenance |  |
 | Test.java:2951:16:2951:31 | (...)... : byte[] | Test.java:2952:19:2952:20 | in : byte[] | provenance |  |
 | Test.java:2951:24:2951:31 | source(...) : Object | Test.java:2951:16:2951:31 | (...)... : byte[] | provenance |  |
 | Test.java:2952:4:2952:6 | out [post update] : AbstractByteBuf | Test.java:2953:9:2953:11 | out | provenance |  |
-| Test.java:2952:19:2952:20 | in : byte[] | Test.java:2952:4:2952:6 | out [post update] : AbstractByteBuf | provenance | MaD:126 |
+| Test.java:2952:19:2952:20 | in : byte[] | Test.java:2952:4:2952:6 | out [post update] : AbstractByteBuf | provenance | MaD:115 |
 | Test.java:2958:16:2958:31 | (...)... : byte[] | Test.java:2959:19:2959:20 | in : byte[] | provenance |  |
 | Test.java:2958:24:2958:31 | source(...) : Object | Test.java:2958:16:2958:31 | (...)... : byte[] | provenance |  |
 | Test.java:2959:4:2959:6 | out [post update] : ByteBuf | Test.java:2960:9:2960:11 | out | provenance |  |
-| Test.java:2959:19:2959:20 | in : byte[] | Test.java:2959:4:2959:6 | out [post update] : ByteBuf | provenance | MaD:126 |
+| Test.java:2959:19:2959:20 | in : byte[] | Test.java:2959:4:2959:6 | out [post update] : ByteBuf | provenance | MaD:115 |
 | Test.java:2965:16:2965:31 | (...)... : byte[] | Test.java:2966:19:2966:20 | in : byte[] | provenance |  |
 | Test.java:2965:24:2965:31 | source(...) : Object | Test.java:2965:16:2965:31 | (...)... : byte[] | provenance |  |
 | Test.java:2966:4:2966:6 | out [post update] : CompositeByteBuf | Test.java:2967:9:2967:11 | out | provenance |  |
-| Test.java:2966:19:2966:20 | in : byte[] | Test.java:2966:4:2966:6 | out [post update] : CompositeByteBuf | provenance | MaD:126 |
+| Test.java:2966:19:2966:20 | in : byte[] | Test.java:2966:4:2966:6 | out [post update] : CompositeByteBuf | provenance | MaD:115 |
 | Test.java:2972:16:2972:31 | (...)... : byte[] | Test.java:2973:19:2973:20 | in : byte[] | provenance |  |
 | Test.java:2972:24:2972:31 | source(...) : Object | Test.java:2972:16:2972:31 | (...)... : byte[] | provenance |  |
 | Test.java:2973:4:2973:6 | out [post update] : SwappedByteBuf | Test.java:2974:9:2974:11 | out | provenance |  |
-| Test.java:2973:19:2973:20 | in : byte[] | Test.java:2973:4:2973:6 | out [post update] : SwappedByteBuf | provenance | MaD:126 |
+| Test.java:2973:19:2973:20 | in : byte[] | Test.java:2973:4:2973:6 | out [post update] : SwappedByteBuf | provenance | MaD:115 |
 | Test.java:2979:25:2979:49 | (...)... : AbstractByteBuf | Test.java:2980:10:2980:11 | in : AbstractByteBuf | provenance |  |
 | Test.java:2979:42:2979:49 | source(...) : Object | Test.java:2979:25:2979:49 | (...)... : AbstractByteBuf | provenance |  |
-| Test.java:2980:10:2980:11 | in : AbstractByteBuf | Test.java:2980:10:2980:42 | writeBytes(...) : AbstractByteBuf | provenance | MaD:64 |
+| Test.java:2980:10:2980:11 | in : AbstractByteBuf | Test.java:2980:10:2980:42 | writeBytes(...) : AbstractByteBuf | provenance | MaD:118 |
 | Test.java:2980:10:2980:42 | writeBytes(...) : AbstractByteBuf | Test.java:2981:9:2981:11 | out | provenance |  |
 | Test.java:2986:17:2986:33 | (...)... : ByteBuf | Test.java:2987:10:2987:11 | in : ByteBuf | provenance |  |
 | Test.java:2986:26:2986:33 | source(...) : Object | Test.java:2986:17:2986:33 | (...)... : ByteBuf | provenance |  |
-| Test.java:2987:10:2987:11 | in : ByteBuf | Test.java:2987:10:2987:42 | writeBytes(...) : ByteBuf | provenance | MaD:64 |
+| Test.java:2987:10:2987:11 | in : ByteBuf | Test.java:2987:10:2987:42 | writeBytes(...) : ByteBuf | provenance | MaD:118 |
 | Test.java:2987:10:2987:42 | writeBytes(...) : ByteBuf | Test.java:2988:9:2988:11 | out | provenance |  |
 | Test.java:2993:24:2993:47 | (...)... : SwappedByteBuf | Test.java:2994:10:2994:11 | in : SwappedByteBuf | provenance |  |
 | Test.java:2993:40:2993:47 | source(...) : Object | Test.java:2993:24:2993:47 | (...)... : SwappedByteBuf | provenance |  |
-| Test.java:2994:10:2994:11 | in : SwappedByteBuf | Test.java:2994:10:2994:42 | writeBytes(...) : SwappedByteBuf | provenance | MaD:64 |
+| Test.java:2994:10:2994:11 | in : SwappedByteBuf | Test.java:2994:10:2994:42 | writeBytes(...) : SwappedByteBuf | provenance | MaD:118 |
 | Test.java:2994:10:2994:42 | writeBytes(...) : SwappedByteBuf | Test.java:2995:9:2995:11 | out | provenance |  |
 | Test.java:3000:26:3000:51 | (...)... : CompositeByteBuf | Test.java:3001:10:3001:11 | in : CompositeByteBuf | provenance |  |
 | Test.java:3000:44:3000:51 | source(...) : Object | Test.java:3000:26:3000:51 | (...)... : CompositeByteBuf | provenance |  |
-| Test.java:3001:10:3001:11 | in : CompositeByteBuf | Test.java:3001:10:3001:42 | writeBytes(...) : CompositeByteBuf | provenance | MaD:64 |
+| Test.java:3001:10:3001:11 | in : CompositeByteBuf | Test.java:3001:10:3001:42 | writeBytes(...) : CompositeByteBuf | provenance | MaD:118 |
 | Test.java:3001:10:3001:42 | writeBytes(...) : CompositeByteBuf | Test.java:3002:9:3002:11 | out | provenance |  |
 | Test.java:3007:16:3007:31 | (...)... : byte[] | Test.java:3008:19:3008:20 | in : byte[] | provenance |  |
 | Test.java:3007:24:3007:31 | source(...) : Object | Test.java:3007:16:3007:31 | (...)... : byte[] | provenance |  |
 | Test.java:3008:4:3008:6 | out [post update] : AbstractByteBuf | Test.java:3009:9:3009:11 | out | provenance |  |
-| Test.java:3008:19:3008:20 | in : byte[] | Test.java:3008:4:3008:6 | out [post update] : AbstractByteBuf | provenance | MaD:127 |
+| Test.java:3008:19:3008:20 | in : byte[] | Test.java:3008:4:3008:6 | out [post update] : AbstractByteBuf | provenance | MaD:117 |
 | Test.java:3014:16:3014:31 | (...)... : byte[] | Test.java:3015:19:3015:20 | in : byte[] | provenance |  |
 | Test.java:3014:24:3014:31 | source(...) : Object | Test.java:3014:16:3014:31 | (...)... : byte[] | provenance |  |
 | Test.java:3015:4:3015:6 | out [post update] : ByteBuf | Test.java:3016:9:3016:11 | out | provenance |  |
-| Test.java:3015:19:3015:20 | in : byte[] | Test.java:3015:4:3015:6 | out [post update] : ByteBuf | provenance | MaD:127 |
+| Test.java:3015:19:3015:20 | in : byte[] | Test.java:3015:4:3015:6 | out [post update] : ByteBuf | provenance | MaD:117 |
 | Test.java:3021:16:3021:31 | (...)... : byte[] | Test.java:3022:19:3022:20 | in : byte[] | provenance |  |
 | Test.java:3021:24:3021:31 | source(...) : Object | Test.java:3021:16:3021:31 | (...)... : byte[] | provenance |  |
 | Test.java:3022:4:3022:6 | out [post update] : CompositeByteBuf | Test.java:3023:9:3023:11 | out | provenance |  |
-| Test.java:3022:19:3022:20 | in : byte[] | Test.java:3022:4:3022:6 | out [post update] : CompositeByteBuf | provenance | MaD:127 |
+| Test.java:3022:19:3022:20 | in : byte[] | Test.java:3022:4:3022:6 | out [post update] : CompositeByteBuf | provenance | MaD:117 |
 | Test.java:3028:16:3028:31 | (...)... : byte[] | Test.java:3029:19:3029:20 | in : byte[] | provenance |  |
 | Test.java:3028:24:3028:31 | source(...) : Object | Test.java:3028:16:3028:31 | (...)... : byte[] | provenance |  |
 | Test.java:3029:4:3029:6 | out [post update] : SwappedByteBuf | Test.java:3030:9:3030:11 | out | provenance |  |
-| Test.java:3029:19:3029:20 | in : byte[] | Test.java:3029:4:3029:6 | out [post update] : SwappedByteBuf | provenance | MaD:127 |
+| Test.java:3029:19:3029:20 | in : byte[] | Test.java:3029:4:3029:6 | out [post update] : SwappedByteBuf | provenance | MaD:117 |
 | Test.java:3035:25:3035:49 | (...)... : AbstractByteBuf | Test.java:3036:10:3036:11 | in : AbstractByteBuf | provenance |  |
 | Test.java:3035:42:3035:49 | source(...) : Object | Test.java:3035:25:3035:49 | (...)... : AbstractByteBuf | provenance |  |
-| Test.java:3036:10:3036:11 | in : AbstractByteBuf | Test.java:3036:10:3036:24 | writeChar(...) : AbstractByteBuf | provenance | MaD:69 |
+| Test.java:3036:10:3036:11 | in : AbstractByteBuf | Test.java:3036:10:3036:24 | writeChar(...) : AbstractByteBuf | provenance | MaD:120 |
 | Test.java:3036:10:3036:24 | writeChar(...) : AbstractByteBuf | Test.java:3037:9:3037:11 | out | provenance |  |
 | Test.java:3042:17:3042:33 | (...)... : ByteBuf | Test.java:3043:10:3043:11 | in : ByteBuf | provenance |  |
 | Test.java:3042:26:3042:33 | source(...) : Object | Test.java:3042:17:3042:33 | (...)... : ByteBuf | provenance |  |
-| Test.java:3043:10:3043:11 | in : ByteBuf | Test.java:3043:10:3043:24 | writeChar(...) : ByteBuf | provenance | MaD:69 |
+| Test.java:3043:10:3043:11 | in : ByteBuf | Test.java:3043:10:3043:24 | writeChar(...) : ByteBuf | provenance | MaD:120 |
 | Test.java:3043:10:3043:24 | writeChar(...) : ByteBuf | Test.java:3044:9:3044:11 | out | provenance |  |
 | Test.java:3049:24:3049:47 | (...)... : SwappedByteBuf | Test.java:3050:10:3050:11 | in : SwappedByteBuf | provenance |  |
 | Test.java:3049:40:3049:47 | source(...) : Object | Test.java:3049:24:3049:47 | (...)... : SwappedByteBuf | provenance |  |
-| Test.java:3050:10:3050:11 | in : SwappedByteBuf | Test.java:3050:10:3050:24 | writeChar(...) : SwappedByteBuf | provenance | MaD:69 |
+| Test.java:3050:10:3050:11 | in : SwappedByteBuf | Test.java:3050:10:3050:24 | writeChar(...) : SwappedByteBuf | provenance | MaD:120 |
 | Test.java:3050:10:3050:24 | writeChar(...) : SwappedByteBuf | Test.java:3051:9:3051:11 | out | provenance |  |
 | Test.java:3056:26:3056:51 | (...)... : CompositeByteBuf | Test.java:3057:10:3057:11 | in : CompositeByteBuf | provenance |  |
 | Test.java:3056:44:3056:51 | source(...) : Object | Test.java:3056:26:3056:51 | (...)... : CompositeByteBuf | provenance |  |
-| Test.java:3057:10:3057:11 | in : CompositeByteBuf | Test.java:3057:10:3057:24 | writeChar(...) : CompositeByteBuf | provenance | MaD:69 |
+| Test.java:3057:10:3057:11 | in : CompositeByteBuf | Test.java:3057:10:3057:24 | writeChar(...) : CompositeByteBuf | provenance | MaD:120 |
 | Test.java:3057:10:3057:24 | writeChar(...) : CompositeByteBuf | Test.java:3058:9:3058:11 | out | provenance |  |
 | Test.java:3063:13:3063:25 | (...)... : Number | Test.java:3064:18:3064:19 | in : Number | provenance |  |
 | Test.java:3063:18:3063:25 | source(...) : Object | Test.java:3063:13:3063:25 | (...)... : Number | provenance |  |
 | Test.java:3064:4:3064:6 | out [post update] : AbstractByteBuf | Test.java:3065:9:3065:11 | out | provenance |  |
-| Test.java:3064:18:3064:19 | in : Number | Test.java:3064:4:3064:6 | out [post update] : AbstractByteBuf | provenance | MaD:135 |
+| Test.java:3064:18:3064:19 | in : Number | Test.java:3064:4:3064:6 | out [post update] : AbstractByteBuf | provenance | MaD:119 |
 | Test.java:3070:13:3070:25 | (...)... : Number | Test.java:3071:18:3071:19 | in : Number | provenance |  |
 | Test.java:3070:18:3070:25 | source(...) : Object | Test.java:3070:13:3070:25 | (...)... : Number | provenance |  |
 | Test.java:3071:4:3071:6 | out [post update] : ByteBuf | Test.java:3072:9:3072:11 | out | provenance |  |
-| Test.java:3071:18:3071:19 | in : Number | Test.java:3071:4:3071:6 | out [post update] : ByteBuf | provenance | MaD:135 |
+| Test.java:3071:18:3071:19 | in : Number | Test.java:3071:4:3071:6 | out [post update] : ByteBuf | provenance | MaD:119 |
 | Test.java:3077:13:3077:25 | (...)... : Number | Test.java:3078:18:3078:19 | in : Number | provenance |  |
 | Test.java:3077:18:3077:25 | source(...) : Object | Test.java:3077:13:3077:25 | (...)... : Number | provenance |  |
 | Test.java:3078:4:3078:6 | out [post update] : CompositeByteBuf | Test.java:3079:9:3079:11 | out | provenance |  |
-| Test.java:3078:18:3078:19 | in : Number | Test.java:3078:4:3078:6 | out [post update] : CompositeByteBuf | provenance | MaD:135 |
+| Test.java:3078:18:3078:19 | in : Number | Test.java:3078:4:3078:6 | out [post update] : CompositeByteBuf | provenance | MaD:119 |
 | Test.java:3084:13:3084:25 | (...)... : Number | Test.java:3085:18:3085:19 | in : Number | provenance |  |
 | Test.java:3084:18:3084:25 | source(...) : Object | Test.java:3084:13:3084:25 | (...)... : Number | provenance |  |
 | Test.java:3085:4:3085:6 | out [post update] : SwappedByteBuf | Test.java:3086:9:3086:11 | out | provenance |  |
-| Test.java:3085:18:3085:19 | in : Number | Test.java:3085:4:3085:6 | out [post update] : SwappedByteBuf | provenance | MaD:135 |
+| Test.java:3085:18:3085:19 | in : Number | Test.java:3085:4:3085:6 | out [post update] : SwappedByteBuf | provenance | MaD:119 |
 | Test.java:3091:22:3091:43 | (...)... : CharSequence | Test.java:3092:26:3092:27 | in : CharSequence | provenance |  |
 | Test.java:3091:36:3091:43 | source(...) : Object | Test.java:3091:22:3091:43 | (...)... : CharSequence | provenance |  |
 | Test.java:3092:4:3092:6 | out [post update] : AbstractByteBuf | Test.java:3093:9:3093:11 | out | provenance |  |
-| Test.java:3092:26:3092:27 | in : CharSequence | Test.java:3092:4:3092:6 | out [post update] : AbstractByteBuf | provenance | MaD:136 |
+| Test.java:3092:26:3092:27 | in : CharSequence | Test.java:3092:4:3092:6 | out [post update] : AbstractByteBuf | provenance | MaD:121 |
 | Test.java:3098:22:3098:43 | (...)... : CharSequence | Test.java:3099:26:3099:27 | in : CharSequence | provenance |  |
 | Test.java:3098:36:3098:43 | source(...) : Object | Test.java:3098:22:3098:43 | (...)... : CharSequence | provenance |  |
 | Test.java:3099:4:3099:6 | out [post update] : ByteBuf | Test.java:3100:9:3100:11 | out | provenance |  |
-| Test.java:3099:26:3099:27 | in : CharSequence | Test.java:3099:4:3099:6 | out [post update] : ByteBuf | provenance | MaD:136 |
+| Test.java:3099:26:3099:27 | in : CharSequence | Test.java:3099:4:3099:6 | out [post update] : ByteBuf | provenance | MaD:121 |
 | Test.java:3105:22:3105:43 | (...)... : CharSequence | Test.java:3106:26:3106:27 | in : CharSequence | provenance |  |
 | Test.java:3105:36:3105:43 | source(...) : Object | Test.java:3105:22:3105:43 | (...)... : CharSequence | provenance |  |
 | Test.java:3106:4:3106:6 | out [post update] : SwappedByteBuf | Test.java:3107:9:3107:11 | out | provenance |  |
-| Test.java:3106:26:3106:27 | in : CharSequence | Test.java:3106:4:3106:6 | out [post update] : SwappedByteBuf | provenance | MaD:136 |
+| Test.java:3106:26:3106:27 | in : CharSequence | Test.java:3106:4:3106:6 | out [post update] : SwappedByteBuf | provenance | MaD:121 |
 | Test.java:3112:25:3112:49 | (...)... : AbstractByteBuf | Test.java:3113:10:3113:11 | in : AbstractByteBuf | provenance |  |
 | Test.java:3112:42:3112:49 | source(...) : Object | Test.java:3112:25:3112:49 | (...)... : AbstractByteBuf | provenance |  |
-| Test.java:3113:10:3113:11 | in : AbstractByteBuf | Test.java:3113:10:3113:28 | writeDouble(...) : AbstractByteBuf | provenance | MaD:70 |
+| Test.java:3113:10:3113:11 | in : AbstractByteBuf | Test.java:3113:10:3113:28 | writeDouble(...) : AbstractByteBuf | provenance | MaD:122 |
 | Test.java:3113:10:3113:28 | writeDouble(...) : AbstractByteBuf | Test.java:3114:9:3114:11 | out | provenance |  |
 | Test.java:3119:17:3119:33 | (...)... : ByteBuf | Test.java:3120:10:3120:11 | in : ByteBuf | provenance |  |
 | Test.java:3119:26:3119:33 | source(...) : Object | Test.java:3119:17:3119:33 | (...)... : ByteBuf | provenance |  |
-| Test.java:3120:10:3120:11 | in : ByteBuf | Test.java:3120:10:3120:28 | writeDouble(...) : ByteBuf | provenance | MaD:70 |
+| Test.java:3120:10:3120:11 | in : ByteBuf | Test.java:3120:10:3120:28 | writeDouble(...) : ByteBuf | provenance | MaD:122 |
 | Test.java:3120:10:3120:28 | writeDouble(...) : ByteBuf | Test.java:3121:9:3121:11 | out | provenance |  |
 | Test.java:3126:24:3126:47 | (...)... : SwappedByteBuf | Test.java:3127:10:3127:11 | in : SwappedByteBuf | provenance |  |
 | Test.java:3126:40:3126:47 | source(...) : Object | Test.java:3126:24:3126:47 | (...)... : SwappedByteBuf | provenance |  |
-| Test.java:3127:10:3127:11 | in : SwappedByteBuf | Test.java:3127:10:3127:28 | writeDouble(...) : SwappedByteBuf | provenance | MaD:70 |
+| Test.java:3127:10:3127:11 | in : SwappedByteBuf | Test.java:3127:10:3127:28 | writeDouble(...) : SwappedByteBuf | provenance | MaD:122 |
 | Test.java:3127:10:3127:28 | writeDouble(...) : SwappedByteBuf | Test.java:3128:9:3128:11 | out | provenance |  |
 | Test.java:3133:26:3133:51 | (...)... : CompositeByteBuf | Test.java:3134:10:3134:11 | in : CompositeByteBuf | provenance |  |
 | Test.java:3133:44:3133:51 | source(...) : Object | Test.java:3133:26:3133:51 | (...)... : CompositeByteBuf | provenance |  |
-| Test.java:3134:10:3134:11 | in : CompositeByteBuf | Test.java:3134:10:3134:28 | writeDouble(...) : CompositeByteBuf | provenance | MaD:70 |
+| Test.java:3134:10:3134:11 | in : CompositeByteBuf | Test.java:3134:10:3134:28 | writeDouble(...) : CompositeByteBuf | provenance | MaD:122 |
 | Test.java:3134:10:3134:28 | writeDouble(...) : CompositeByteBuf | Test.java:3135:9:3135:11 | out | provenance |  |
 | Test.java:3140:17:3140:33 | (...)... : ByteBuf | Test.java:3141:10:3141:11 | in : ByteBuf | provenance |  |
 | Test.java:3140:26:3140:33 | source(...) : Object | Test.java:3140:17:3140:33 | (...)... : ByteBuf | provenance |  |
-| Test.java:3141:10:3141:11 | in : ByteBuf | Test.java:3141:10:3141:30 | writeDoubleLE(...) : ByteBuf | provenance | MaD:71 |
+| Test.java:3141:10:3141:11 | in : ByteBuf | Test.java:3141:10:3141:30 | writeDoubleLE(...) : ByteBuf | provenance | MaD:123 |
 | Test.java:3141:10:3141:30 | writeDoubleLE(...) : ByteBuf | Test.java:3142:9:3142:11 | out | provenance |  |
 | Test.java:3147:25:3147:49 | (...)... : AbstractByteBuf | Test.java:3148:10:3148:11 | in : AbstractByteBuf | provenance |  |
 | Test.java:3147:42:3147:49 | source(...) : Object | Test.java:3147:25:3147:49 | (...)... : AbstractByteBuf | provenance |  |
-| Test.java:3148:10:3148:11 | in : AbstractByteBuf | Test.java:3148:10:3148:28 | writeFloat(...) : AbstractByteBuf | provenance | MaD:72 |
+| Test.java:3148:10:3148:11 | in : AbstractByteBuf | Test.java:3148:10:3148:28 | writeFloat(...) : AbstractByteBuf | provenance | MaD:124 |
 | Test.java:3148:10:3148:28 | writeFloat(...) : AbstractByteBuf | Test.java:3149:9:3149:11 | out | provenance |  |
 | Test.java:3154:17:3154:33 | (...)... : ByteBuf | Test.java:3155:10:3155:11 | in : ByteBuf | provenance |  |
 | Test.java:3154:26:3154:33 | source(...) : Object | Test.java:3154:17:3154:33 | (...)... : ByteBuf | provenance |  |
-| Test.java:3155:10:3155:11 | in : ByteBuf | Test.java:3155:10:3155:28 | writeFloat(...) : ByteBuf | provenance | MaD:72 |
+| Test.java:3155:10:3155:11 | in : ByteBuf | Test.java:3155:10:3155:28 | writeFloat(...) : ByteBuf | provenance | MaD:124 |
 | Test.java:3155:10:3155:28 | writeFloat(...) : ByteBuf | Test.java:3156:9:3156:11 | out | provenance |  |
 | Test.java:3161:24:3161:47 | (...)... : SwappedByteBuf | Test.java:3162:10:3162:11 | in : SwappedByteBuf | provenance |  |
 | Test.java:3161:40:3161:47 | source(...) : Object | Test.java:3161:24:3161:47 | (...)... : SwappedByteBuf | provenance |  |
-| Test.java:3162:10:3162:11 | in : SwappedByteBuf | Test.java:3162:10:3162:28 | writeFloat(...) : SwappedByteBuf | provenance | MaD:72 |
+| Test.java:3162:10:3162:11 | in : SwappedByteBuf | Test.java:3162:10:3162:28 | writeFloat(...) : SwappedByteBuf | provenance | MaD:124 |
 | Test.java:3162:10:3162:28 | writeFloat(...) : SwappedByteBuf | Test.java:3163:9:3163:11 | out | provenance |  |
 | Test.java:3168:26:3168:51 | (...)... : CompositeByteBuf | Test.java:3169:10:3169:11 | in : CompositeByteBuf | provenance |  |
 | Test.java:3168:44:3168:51 | source(...) : Object | Test.java:3168:26:3168:51 | (...)... : CompositeByteBuf | provenance |  |
-| Test.java:3169:10:3169:11 | in : CompositeByteBuf | Test.java:3169:10:3169:28 | writeFloat(...) : CompositeByteBuf | provenance | MaD:72 |
+| Test.java:3169:10:3169:11 | in : CompositeByteBuf | Test.java:3169:10:3169:28 | writeFloat(...) : CompositeByteBuf | provenance | MaD:124 |
 | Test.java:3169:10:3169:28 | writeFloat(...) : CompositeByteBuf | Test.java:3170:9:3170:11 | out | provenance |  |
 | Test.java:3175:17:3175:33 | (...)... : ByteBuf | Test.java:3176:10:3176:11 | in : ByteBuf | provenance |  |
 | Test.java:3175:26:3175:33 | source(...) : Object | Test.java:3175:17:3175:33 | (...)... : ByteBuf | provenance |  |
-| Test.java:3176:10:3176:11 | in : ByteBuf | Test.java:3176:10:3176:30 | writeFloatLE(...) : ByteBuf | provenance | MaD:73 |
+| Test.java:3176:10:3176:11 | in : ByteBuf | Test.java:3176:10:3176:30 | writeFloatLE(...) : ByteBuf | provenance | MaD:125 |
 | Test.java:3176:10:3176:30 | writeFloatLE(...) : ByteBuf | Test.java:3177:9:3177:11 | out | provenance |  |
 | Test.java:3182:25:3182:49 | (...)... : AbstractByteBuf | Test.java:3183:10:3183:11 | in : AbstractByteBuf | provenance |  |
 | Test.java:3182:42:3182:49 | source(...) : Object | Test.java:3182:25:3182:49 | (...)... : AbstractByteBuf | provenance |  |
-| Test.java:3183:10:3183:11 | in : AbstractByteBuf | Test.java:3183:10:3183:23 | writeInt(...) : AbstractByteBuf | provenance | MaD:74 |
+| Test.java:3183:10:3183:11 | in : AbstractByteBuf | Test.java:3183:10:3183:23 | writeInt(...) : AbstractByteBuf | provenance | MaD:126 |
 | Test.java:3183:10:3183:23 | writeInt(...) : AbstractByteBuf | Test.java:3184:9:3184:11 | out | provenance |  |
 | Test.java:3189:17:3189:33 | (...)... : ByteBuf | Test.java:3190:10:3190:11 | in : ByteBuf | provenance |  |
 | Test.java:3189:26:3189:33 | source(...) : Object | Test.java:3189:17:3189:33 | (...)... : ByteBuf | provenance |  |
-| Test.java:3190:10:3190:11 | in : ByteBuf | Test.java:3190:10:3190:23 | writeInt(...) : ByteBuf | provenance | MaD:74 |
+| Test.java:3190:10:3190:11 | in : ByteBuf | Test.java:3190:10:3190:23 | writeInt(...) : ByteBuf | provenance | MaD:126 |
 | Test.java:3190:10:3190:23 | writeInt(...) : ByteBuf | Test.java:3191:9:3191:11 | out | provenance |  |
 | Test.java:3196:24:3196:47 | (...)... : SwappedByteBuf | Test.java:3197:10:3197:11 | in : SwappedByteBuf | provenance |  |
 | Test.java:3196:40:3196:47 | source(...) : Object | Test.java:3196:24:3196:47 | (...)... : SwappedByteBuf | provenance |  |
-| Test.java:3197:10:3197:11 | in : SwappedByteBuf | Test.java:3197:10:3197:23 | writeInt(...) : SwappedByteBuf | provenance | MaD:74 |
+| Test.java:3197:10:3197:11 | in : SwappedByteBuf | Test.java:3197:10:3197:23 | writeInt(...) : SwappedByteBuf | provenance | MaD:126 |
 | Test.java:3197:10:3197:23 | writeInt(...) : SwappedByteBuf | Test.java:3198:9:3198:11 | out | provenance |  |
 | Test.java:3203:26:3203:51 | (...)... : CompositeByteBuf | Test.java:3204:10:3204:11 | in : CompositeByteBuf | provenance |  |
 | Test.java:3203:44:3203:51 | source(...) : Object | Test.java:3203:26:3203:51 | (...)... : CompositeByteBuf | provenance |  |
-| Test.java:3204:10:3204:11 | in : CompositeByteBuf | Test.java:3204:10:3204:23 | writeInt(...) : CompositeByteBuf | provenance | MaD:74 |
+| Test.java:3204:10:3204:11 | in : CompositeByteBuf | Test.java:3204:10:3204:23 | writeInt(...) : CompositeByteBuf | provenance | MaD:126 |
 | Test.java:3204:10:3204:23 | writeInt(...) : CompositeByteBuf | Test.java:3205:9:3205:11 | out | provenance |  |
 | Test.java:3210:25:3210:49 | (...)... : AbstractByteBuf | Test.java:3211:10:3211:11 | in : AbstractByteBuf | provenance |  |
 | Test.java:3210:42:3210:49 | source(...) : Object | Test.java:3210:25:3210:49 | (...)... : AbstractByteBuf | provenance |  |
-| Test.java:3211:10:3211:11 | in : AbstractByteBuf | Test.java:3211:10:3211:25 | writeIntLE(...) : AbstractByteBuf | provenance | MaD:75 |
+| Test.java:3211:10:3211:11 | in : AbstractByteBuf | Test.java:3211:10:3211:25 | writeIntLE(...) : AbstractByteBuf | provenance | MaD:127 |
 | Test.java:3211:10:3211:25 | writeIntLE(...) : AbstractByteBuf | Test.java:3212:9:3212:11 | out | provenance |  |
 | Test.java:3217:17:3217:33 | (...)... : ByteBuf | Test.java:3218:10:3218:11 | in : ByteBuf | provenance |  |
 | Test.java:3217:26:3217:33 | source(...) : Object | Test.java:3217:17:3217:33 | (...)... : ByteBuf | provenance |  |
-| Test.java:3218:10:3218:11 | in : ByteBuf | Test.java:3218:10:3218:25 | writeIntLE(...) : ByteBuf | provenance | MaD:75 |
+| Test.java:3218:10:3218:11 | in : ByteBuf | Test.java:3218:10:3218:25 | writeIntLE(...) : ByteBuf | provenance | MaD:127 |
 | Test.java:3218:10:3218:25 | writeIntLE(...) : ByteBuf | Test.java:3219:9:3219:11 | out | provenance |  |
 | Test.java:3224:24:3224:47 | (...)... : SwappedByteBuf | Test.java:3225:10:3225:11 | in : SwappedByteBuf | provenance |  |
 | Test.java:3224:40:3224:47 | source(...) : Object | Test.java:3224:24:3224:47 | (...)... : SwappedByteBuf | provenance |  |
-| Test.java:3225:10:3225:11 | in : SwappedByteBuf | Test.java:3225:10:3225:25 | writeIntLE(...) : SwappedByteBuf | provenance | MaD:75 |
+| Test.java:3225:10:3225:11 | in : SwappedByteBuf | Test.java:3225:10:3225:25 | writeIntLE(...) : SwappedByteBuf | provenance | MaD:127 |
 | Test.java:3225:10:3225:25 | writeIntLE(...) : SwappedByteBuf | Test.java:3226:9:3226:11 | out | provenance |  |
 | Test.java:3231:25:3231:49 | (...)... : AbstractByteBuf | Test.java:3232:10:3232:11 | in : AbstractByteBuf | provenance |  |
 | Test.java:3231:42:3231:49 | source(...) : Object | Test.java:3231:25:3231:49 | (...)... : AbstractByteBuf | provenance |  |
-| Test.java:3232:10:3232:11 | in : AbstractByteBuf | Test.java:3232:10:3232:25 | writeLong(...) : AbstractByteBuf | provenance | MaD:76 |
+| Test.java:3232:10:3232:11 | in : AbstractByteBuf | Test.java:3232:10:3232:25 | writeLong(...) : AbstractByteBuf | provenance | MaD:128 |
 | Test.java:3232:10:3232:25 | writeLong(...) : AbstractByteBuf | Test.java:3233:9:3233:11 | out | provenance |  |
 | Test.java:3238:17:3238:33 | (...)... : ByteBuf | Test.java:3239:10:3239:11 | in : ByteBuf | provenance |  |
 | Test.java:3238:26:3238:33 | source(...) : Object | Test.java:3238:17:3238:33 | (...)... : ByteBuf | provenance |  |
-| Test.java:3239:10:3239:11 | in : ByteBuf | Test.java:3239:10:3239:25 | writeLong(...) : ByteBuf | provenance | MaD:76 |
+| Test.java:3239:10:3239:11 | in : ByteBuf | Test.java:3239:10:3239:25 | writeLong(...) : ByteBuf | provenance | MaD:128 |
 | Test.java:3239:10:3239:25 | writeLong(...) : ByteBuf | Test.java:3240:9:3240:11 | out | provenance |  |
 | Test.java:3245:24:3245:47 | (...)... : SwappedByteBuf | Test.java:3246:10:3246:11 | in : SwappedByteBuf | provenance |  |
 | Test.java:3245:40:3245:47 | source(...) : Object | Test.java:3245:24:3245:47 | (...)... : SwappedByteBuf | provenance |  |
-| Test.java:3246:10:3246:11 | in : SwappedByteBuf | Test.java:3246:10:3246:25 | writeLong(...) : SwappedByteBuf | provenance | MaD:76 |
+| Test.java:3246:10:3246:11 | in : SwappedByteBuf | Test.java:3246:10:3246:25 | writeLong(...) : SwappedByteBuf | provenance | MaD:128 |
 | Test.java:3246:10:3246:25 | writeLong(...) : SwappedByteBuf | Test.java:3247:9:3247:11 | out | provenance |  |
 | Test.java:3252:26:3252:51 | (...)... : CompositeByteBuf | Test.java:3253:10:3253:11 | in : CompositeByteBuf | provenance |  |
 | Test.java:3252:44:3252:51 | source(...) : Object | Test.java:3252:26:3252:51 | (...)... : CompositeByteBuf | provenance |  |
-| Test.java:3253:10:3253:11 | in : CompositeByteBuf | Test.java:3253:10:3253:25 | writeLong(...) : CompositeByteBuf | provenance | MaD:76 |
+| Test.java:3253:10:3253:11 | in : CompositeByteBuf | Test.java:3253:10:3253:25 | writeLong(...) : CompositeByteBuf | provenance | MaD:128 |
 | Test.java:3253:10:3253:25 | writeLong(...) : CompositeByteBuf | Test.java:3254:9:3254:11 | out | provenance |  |
 | Test.java:3259:25:3259:49 | (...)... : AbstractByteBuf | Test.java:3260:10:3260:11 | in : AbstractByteBuf | provenance |  |
 | Test.java:3259:42:3259:49 | source(...) : Object | Test.java:3259:25:3259:49 | (...)... : AbstractByteBuf | provenance |  |
-| Test.java:3260:10:3260:11 | in : AbstractByteBuf | Test.java:3260:10:3260:27 | writeLongLE(...) : AbstractByteBuf | provenance | MaD:77 |
+| Test.java:3260:10:3260:11 | in : AbstractByteBuf | Test.java:3260:10:3260:27 | writeLongLE(...) : AbstractByteBuf | provenance | MaD:129 |
 | Test.java:3260:10:3260:27 | writeLongLE(...) : AbstractByteBuf | Test.java:3261:9:3261:11 | out | provenance |  |
 | Test.java:3266:17:3266:33 | (...)... : ByteBuf | Test.java:3267:10:3267:11 | in : ByteBuf | provenance |  |
 | Test.java:3266:26:3266:33 | source(...) : Object | Test.java:3266:17:3266:33 | (...)... : ByteBuf | provenance |  |
-| Test.java:3267:10:3267:11 | in : ByteBuf | Test.java:3267:10:3267:27 | writeLongLE(...) : ByteBuf | provenance | MaD:77 |
+| Test.java:3267:10:3267:11 | in : ByteBuf | Test.java:3267:10:3267:27 | writeLongLE(...) : ByteBuf | provenance | MaD:129 |
 | Test.java:3267:10:3267:27 | writeLongLE(...) : ByteBuf | Test.java:3268:9:3268:11 | out | provenance |  |
 | Test.java:3273:24:3273:47 | (...)... : SwappedByteBuf | Test.java:3274:10:3274:11 | in : SwappedByteBuf | provenance |  |
 | Test.java:3273:40:3273:47 | source(...) : Object | Test.java:3273:24:3273:47 | (...)... : SwappedByteBuf | provenance |  |
-| Test.java:3274:10:3274:11 | in : SwappedByteBuf | Test.java:3274:10:3274:27 | writeLongLE(...) : SwappedByteBuf | provenance | MaD:77 |
+| Test.java:3274:10:3274:11 | in : SwappedByteBuf | Test.java:3274:10:3274:27 | writeLongLE(...) : SwappedByteBuf | provenance | MaD:129 |
 | Test.java:3274:10:3274:27 | writeLongLE(...) : SwappedByteBuf | Test.java:3275:9:3275:11 | out | provenance |  |
 | Test.java:3280:25:3280:49 | (...)... : AbstractByteBuf | Test.java:3281:10:3281:11 | in : AbstractByteBuf | provenance |  |
 | Test.java:3280:42:3280:49 | source(...) : Object | Test.java:3280:25:3280:49 | (...)... : AbstractByteBuf | provenance |  |
-| Test.java:3281:10:3281:11 | in : AbstractByteBuf | Test.java:3281:10:3281:26 | writeMedium(...) : AbstractByteBuf | provenance | MaD:78 |
+| Test.java:3281:10:3281:11 | in : AbstractByteBuf | Test.java:3281:10:3281:26 | writeMedium(...) : AbstractByteBuf | provenance | MaD:130 |
 | Test.java:3281:10:3281:26 | writeMedium(...) : AbstractByteBuf | Test.java:3282:9:3282:11 | out | provenance |  |
 | Test.java:3287:17:3287:33 | (...)... : ByteBuf | Test.java:3288:10:3288:11 | in : ByteBuf | provenance |  |
 | Test.java:3287:26:3287:33 | source(...) : Object | Test.java:3287:17:3287:33 | (...)... : ByteBuf | provenance |  |
-| Test.java:3288:10:3288:11 | in : ByteBuf | Test.java:3288:10:3288:26 | writeMedium(...) : ByteBuf | provenance | MaD:78 |
+| Test.java:3288:10:3288:11 | in : ByteBuf | Test.java:3288:10:3288:26 | writeMedium(...) : ByteBuf | provenance | MaD:130 |
 | Test.java:3288:10:3288:26 | writeMedium(...) : ByteBuf | Test.java:3289:9:3289:11 | out | provenance |  |
 | Test.java:3294:24:3294:47 | (...)... : SwappedByteBuf | Test.java:3295:10:3295:11 | in : SwappedByteBuf | provenance |  |
 | Test.java:3294:40:3294:47 | source(...) : Object | Test.java:3294:24:3294:47 | (...)... : SwappedByteBuf | provenance |  |
-| Test.java:3295:10:3295:11 | in : SwappedByteBuf | Test.java:3295:10:3295:26 | writeMedium(...) : SwappedByteBuf | provenance | MaD:78 |
+| Test.java:3295:10:3295:11 | in : SwappedByteBuf | Test.java:3295:10:3295:26 | writeMedium(...) : SwappedByteBuf | provenance | MaD:130 |
 | Test.java:3295:10:3295:26 | writeMedium(...) : SwappedByteBuf | Test.java:3296:9:3296:11 | out | provenance |  |
 | Test.java:3301:26:3301:51 | (...)... : CompositeByteBuf | Test.java:3302:10:3302:11 | in : CompositeByteBuf | provenance |  |
 | Test.java:3301:44:3301:51 | source(...) : Object | Test.java:3301:26:3301:51 | (...)... : CompositeByteBuf | provenance |  |
-| Test.java:3302:10:3302:11 | in : CompositeByteBuf | Test.java:3302:10:3302:26 | writeMedium(...) : CompositeByteBuf | provenance | MaD:78 |
+| Test.java:3302:10:3302:11 | in : CompositeByteBuf | Test.java:3302:10:3302:26 | writeMedium(...) : CompositeByteBuf | provenance | MaD:130 |
 | Test.java:3302:10:3302:26 | writeMedium(...) : CompositeByteBuf | Test.java:3303:9:3303:11 | out | provenance |  |
 | Test.java:3308:25:3308:49 | (...)... : AbstractByteBuf | Test.java:3309:10:3309:11 | in : AbstractByteBuf | provenance |  |
 | Test.java:3308:42:3308:49 | source(...) : Object | Test.java:3308:25:3308:49 | (...)... : AbstractByteBuf | provenance |  |
-| Test.java:3309:10:3309:11 | in : AbstractByteBuf | Test.java:3309:10:3309:28 | writeMediumLE(...) : AbstractByteBuf | provenance | MaD:79 |
+| Test.java:3309:10:3309:11 | in : AbstractByteBuf | Test.java:3309:10:3309:28 | writeMediumLE(...) : AbstractByteBuf | provenance | MaD:131 |
 | Test.java:3309:10:3309:28 | writeMediumLE(...) : AbstractByteBuf | Test.java:3310:9:3310:11 | out | provenance |  |
 | Test.java:3315:17:3315:33 | (...)... : ByteBuf | Test.java:3316:10:3316:11 | in : ByteBuf | provenance |  |
 | Test.java:3315:26:3315:33 | source(...) : Object | Test.java:3315:17:3315:33 | (...)... : ByteBuf | provenance |  |
-| Test.java:3316:10:3316:11 | in : ByteBuf | Test.java:3316:10:3316:28 | writeMediumLE(...) : ByteBuf | provenance | MaD:79 |
+| Test.java:3316:10:3316:11 | in : ByteBuf | Test.java:3316:10:3316:28 | writeMediumLE(...) : ByteBuf | provenance | MaD:131 |
 | Test.java:3316:10:3316:28 | writeMediumLE(...) : ByteBuf | Test.java:3317:9:3317:11 | out | provenance |  |
 | Test.java:3322:24:3322:47 | (...)... : SwappedByteBuf | Test.java:3323:10:3323:11 | in : SwappedByteBuf | provenance |  |
 | Test.java:3322:40:3322:47 | source(...) : Object | Test.java:3322:24:3322:47 | (...)... : SwappedByteBuf | provenance |  |
-| Test.java:3323:10:3323:11 | in : SwappedByteBuf | Test.java:3323:10:3323:28 | writeMediumLE(...) : SwappedByteBuf | provenance | MaD:79 |
+| Test.java:3323:10:3323:11 | in : SwappedByteBuf | Test.java:3323:10:3323:28 | writeMediumLE(...) : SwappedByteBuf | provenance | MaD:131 |
 | Test.java:3323:10:3323:28 | writeMediumLE(...) : SwappedByteBuf | Test.java:3324:9:3324:11 | out | provenance |  |
 | Test.java:3329:25:3329:49 | (...)... : AbstractByteBuf | Test.java:3330:10:3330:11 | in : AbstractByteBuf | provenance |  |
 | Test.java:3329:42:3329:49 | source(...) : Object | Test.java:3329:25:3329:49 | (...)... : AbstractByteBuf | provenance |  |
-| Test.java:3330:10:3330:11 | in : AbstractByteBuf | Test.java:3330:10:3330:25 | writeShort(...) : AbstractByteBuf | provenance | MaD:80 |
+| Test.java:3330:10:3330:11 | in : AbstractByteBuf | Test.java:3330:10:3330:25 | writeShort(...) : AbstractByteBuf | provenance | MaD:132 |
 | Test.java:3330:10:3330:25 | writeShort(...) : AbstractByteBuf | Test.java:3331:9:3331:11 | out | provenance |  |
 | Test.java:3336:17:3336:33 | (...)... : ByteBuf | Test.java:3337:10:3337:11 | in : ByteBuf | provenance |  |
 | Test.java:3336:26:3336:33 | source(...) : Object | Test.java:3336:17:3336:33 | (...)... : ByteBuf | provenance |  |
-| Test.java:3337:10:3337:11 | in : ByteBuf | Test.java:3337:10:3337:25 | writeShort(...) : ByteBuf | provenance | MaD:80 |
+| Test.java:3337:10:3337:11 | in : ByteBuf | Test.java:3337:10:3337:25 | writeShort(...) : ByteBuf | provenance | MaD:132 |
 | Test.java:3337:10:3337:25 | writeShort(...) : ByteBuf | Test.java:3338:9:3338:11 | out | provenance |  |
 | Test.java:3343:24:3343:47 | (...)... : SwappedByteBuf | Test.java:3344:10:3344:11 | in : SwappedByteBuf | provenance |  |
 | Test.java:3343:40:3343:47 | source(...) : Object | Test.java:3343:24:3343:47 | (...)... : SwappedByteBuf | provenance |  |
-| Test.java:3344:10:3344:11 | in : SwappedByteBuf | Test.java:3344:10:3344:25 | writeShort(...) : SwappedByteBuf | provenance | MaD:80 |
+| Test.java:3344:10:3344:11 | in : SwappedByteBuf | Test.java:3344:10:3344:25 | writeShort(...) : SwappedByteBuf | provenance | MaD:132 |
 | Test.java:3344:10:3344:25 | writeShort(...) : SwappedByteBuf | Test.java:3345:9:3345:11 | out | provenance |  |
 | Test.java:3350:26:3350:51 | (...)... : CompositeByteBuf | Test.java:3351:10:3351:11 | in : CompositeByteBuf | provenance |  |
 | Test.java:3350:44:3350:51 | source(...) : Object | Test.java:3350:26:3350:51 | (...)... : CompositeByteBuf | provenance |  |
-| Test.java:3351:10:3351:11 | in : CompositeByteBuf | Test.java:3351:10:3351:25 | writeShort(...) : CompositeByteBuf | provenance | MaD:80 |
+| Test.java:3351:10:3351:11 | in : CompositeByteBuf | Test.java:3351:10:3351:25 | writeShort(...) : CompositeByteBuf | provenance | MaD:132 |
 | Test.java:3351:10:3351:25 | writeShort(...) : CompositeByteBuf | Test.java:3352:9:3352:11 | out | provenance |  |
 | Test.java:3357:25:3357:49 | (...)... : AbstractByteBuf | Test.java:3358:10:3358:11 | in : AbstractByteBuf | provenance |  |
 | Test.java:3357:42:3357:49 | source(...) : Object | Test.java:3357:25:3357:49 | (...)... : AbstractByteBuf | provenance |  |
-| Test.java:3358:10:3358:11 | in : AbstractByteBuf | Test.java:3358:10:3358:27 | writeShortLE(...) : AbstractByteBuf | provenance | MaD:81 |
+| Test.java:3358:10:3358:11 | in : AbstractByteBuf | Test.java:3358:10:3358:27 | writeShortLE(...) : AbstractByteBuf | provenance | MaD:133 |
 | Test.java:3358:10:3358:27 | writeShortLE(...) : AbstractByteBuf | Test.java:3359:9:3359:11 | out | provenance |  |
 | Test.java:3364:17:3364:33 | (...)... : ByteBuf | Test.java:3365:10:3365:11 | in : ByteBuf | provenance |  |
 | Test.java:3364:26:3364:33 | source(...) : Object | Test.java:3364:17:3364:33 | (...)... : ByteBuf | provenance |  |
-| Test.java:3365:10:3365:11 | in : ByteBuf | Test.java:3365:10:3365:27 | writeShortLE(...) : ByteBuf | provenance | MaD:81 |
+| Test.java:3365:10:3365:11 | in : ByteBuf | Test.java:3365:10:3365:27 | writeShortLE(...) : ByteBuf | provenance | MaD:133 |
 | Test.java:3365:10:3365:27 | writeShortLE(...) : ByteBuf | Test.java:3366:9:3366:11 | out | provenance |  |
 | Test.java:3371:24:3371:47 | (...)... : SwappedByteBuf | Test.java:3372:10:3372:11 | in : SwappedByteBuf | provenance |  |
 | Test.java:3371:40:3371:47 | source(...) : Object | Test.java:3371:24:3371:47 | (...)... : SwappedByteBuf | provenance |  |
-| Test.java:3372:10:3372:11 | in : SwappedByteBuf | Test.java:3372:10:3372:27 | writeShortLE(...) : SwappedByteBuf | provenance | MaD:81 |
+| Test.java:3372:10:3372:11 | in : SwappedByteBuf | Test.java:3372:10:3372:27 | writeShortLE(...) : SwappedByteBuf | provenance | MaD:133 |
 | Test.java:3372:10:3372:27 | writeShortLE(...) : SwappedByteBuf | Test.java:3373:9:3373:11 | out | provenance |  |
 | Test.java:3378:25:3378:49 | (...)... : AbstractByteBuf | Test.java:3379:10:3379:11 | in : AbstractByteBuf | provenance |  |
 | Test.java:3378:42:3378:49 | source(...) : Object | Test.java:3378:25:3378:49 | (...)... : AbstractByteBuf | provenance |  |
-| Test.java:3379:10:3379:11 | in : AbstractByteBuf | Test.java:3379:10:3379:24 | writeZero(...) : AbstractByteBuf | provenance | MaD:82 |
+| Test.java:3379:10:3379:11 | in : AbstractByteBuf | Test.java:3379:10:3379:24 | writeZero(...) : AbstractByteBuf | provenance | MaD:134 |
 | Test.java:3379:10:3379:24 | writeZero(...) : AbstractByteBuf | Test.java:3380:9:3380:11 | out | provenance |  |
 | Test.java:3385:17:3385:33 | (...)... : ByteBuf | Test.java:3386:10:3386:11 | in : ByteBuf | provenance |  |
 | Test.java:3385:26:3385:33 | source(...) : Object | Test.java:3385:17:3385:33 | (...)... : ByteBuf | provenance |  |
-| Test.java:3386:10:3386:11 | in : ByteBuf | Test.java:3386:10:3386:24 | writeZero(...) : ByteBuf | provenance | MaD:82 |
+| Test.java:3386:10:3386:11 | in : ByteBuf | Test.java:3386:10:3386:24 | writeZero(...) : ByteBuf | provenance | MaD:134 |
 | Test.java:3386:10:3386:24 | writeZero(...) : ByteBuf | Test.java:3387:9:3387:11 | out | provenance |  |
 | Test.java:3392:24:3392:47 | (...)... : SwappedByteBuf | Test.java:3393:10:3393:11 | in : SwappedByteBuf | provenance |  |
 | Test.java:3392:40:3392:47 | source(...) : Object | Test.java:3392:24:3392:47 | (...)... : SwappedByteBuf | provenance |  |
-| Test.java:3393:10:3393:11 | in : SwappedByteBuf | Test.java:3393:10:3393:24 | writeZero(...) : SwappedByteBuf | provenance | MaD:82 |
+| Test.java:3393:10:3393:11 | in : SwappedByteBuf | Test.java:3393:10:3393:24 | writeZero(...) : SwappedByteBuf | provenance | MaD:134 |
 | Test.java:3393:10:3393:24 | writeZero(...) : SwappedByteBuf | Test.java:3394:9:3394:11 | out | provenance |  |
 | Test.java:3399:26:3399:51 | (...)... : CompositeByteBuf | Test.java:3400:10:3400:11 | in : CompositeByteBuf | provenance |  |
 | Test.java:3399:44:3399:51 | source(...) : Object | Test.java:3399:26:3399:51 | (...)... : CompositeByteBuf | provenance |  |
-| Test.java:3400:10:3400:11 | in : CompositeByteBuf | Test.java:3400:10:3400:24 | writeZero(...) : CompositeByteBuf | provenance | MaD:82 |
+| Test.java:3400:10:3400:11 | in : CompositeByteBuf | Test.java:3400:10:3400:24 | writeZero(...) : CompositeByteBuf | provenance | MaD:134 |
 | Test.java:3400:10:3400:24 | writeZero(...) : CompositeByteBuf | Test.java:3401:9:3401:11 | out | provenance |  |
 | Test.java:3406:25:3406:49 | (...)... : AbstractByteBuf | Test.java:3407:10:3407:11 | in : AbstractByteBuf | provenance |  |
 | Test.java:3406:42:3406:49 | source(...) : Object | Test.java:3406:25:3406:49 | (...)... : AbstractByteBuf | provenance |  |
-| Test.java:3407:10:3407:11 | in : AbstractByteBuf | Test.java:3407:10:3407:26 | writerIndex(...) : AbstractByteBuf | provenance | MaD:83 |
+| Test.java:3407:10:3407:11 | in : AbstractByteBuf | Test.java:3407:10:3407:26 | writerIndex(...) : AbstractByteBuf | provenance | MaD:135 |
 | Test.java:3407:10:3407:26 | writerIndex(...) : AbstractByteBuf | Test.java:3408:9:3408:11 | out | provenance |  |
 | Test.java:3413:17:3413:33 | (...)... : ByteBuf | Test.java:3414:10:3414:11 | in : ByteBuf | provenance |  |
 | Test.java:3413:26:3413:33 | source(...) : Object | Test.java:3413:17:3413:33 | (...)... : ByteBuf | provenance |  |
-| Test.java:3414:10:3414:11 | in : ByteBuf | Test.java:3414:10:3414:26 | writerIndex(...) : ByteBuf | provenance | MaD:83 |
+| Test.java:3414:10:3414:11 | in : ByteBuf | Test.java:3414:10:3414:26 | writerIndex(...) : ByteBuf | provenance | MaD:135 |
 | Test.java:3414:10:3414:26 | writerIndex(...) : ByteBuf | Test.java:3415:9:3415:11 | out | provenance |  |
 | Test.java:3420:24:3420:47 | (...)... : SwappedByteBuf | Test.java:3421:10:3421:11 | in : SwappedByteBuf | provenance |  |
 | Test.java:3420:40:3420:47 | source(...) : Object | Test.java:3420:24:3420:47 | (...)... : SwappedByteBuf | provenance |  |
-| Test.java:3421:10:3421:11 | in : SwappedByteBuf | Test.java:3421:10:3421:26 | writerIndex(...) : SwappedByteBuf | provenance | MaD:83 |
+| Test.java:3421:10:3421:11 | in : SwappedByteBuf | Test.java:3421:10:3421:26 | writerIndex(...) : SwappedByteBuf | provenance | MaD:135 |
 | Test.java:3421:10:3421:26 | writerIndex(...) : SwappedByteBuf | Test.java:3422:9:3422:11 | out | provenance |  |
 | Test.java:3427:26:3427:51 | (...)... : CompositeByteBuf | Test.java:3428:10:3428:11 | in : CompositeByteBuf | provenance |  |
 | Test.java:3427:44:3427:51 | source(...) : Object | Test.java:3427:26:3427:51 | (...)... : CompositeByteBuf | provenance |  |
-| Test.java:3428:10:3428:11 | in : CompositeByteBuf | Test.java:3428:10:3428:26 | writerIndex(...) : CompositeByteBuf | provenance | MaD:83 |
+| Test.java:3428:10:3428:11 | in : CompositeByteBuf | Test.java:3428:10:3428:26 | writerIndex(...) : CompositeByteBuf | provenance | MaD:135 |
 | Test.java:3428:10:3428:26 | writerIndex(...) : CompositeByteBuf | Test.java:3429:9:3429:11 | out | provenance |  |
 | Test.java:3434:17:3434:33 | (...)... : ByteBuf | Test.java:3435:10:3435:11 | in : ByteBuf | provenance |  |
 | Test.java:3434:26:3434:33 | source(...) : Object | Test.java:3434:17:3434:33 | (...)... : ByteBuf | provenance |  |
-| Test.java:3435:10:3435:11 | in : ByteBuf | Test.java:3435:10:3435:23 | asByteBuf(...) : ByteBuf | provenance | MaD:1 |
+| Test.java:3435:10:3435:11 | in : ByteBuf | Test.java:3435:10:3435:23 | asByteBuf(...) : ByteBuf | provenance | MaD:136 |
 | Test.java:3435:10:3435:23 | asByteBuf(...) : ByteBuf | Test.java:3436:9:3436:11 | out | provenance |  |
 | Test.java:3441:28:3441:55 | (...)... : ByteBufConvertible | Test.java:3442:10:3442:11 | in : ByteBufConvertible | provenance |  |
 | Test.java:3441:48:3441:55 | source(...) : Object | Test.java:3441:28:3441:55 | (...)... : ByteBufConvertible | provenance |  |
-| Test.java:3442:10:3442:11 | in : ByteBufConvertible | Test.java:3442:10:3442:23 | asByteBuf(...) : ByteBuf | provenance | MaD:1 |
+| Test.java:3442:10:3442:11 | in : ByteBufConvertible | Test.java:3442:10:3442:23 | asByteBuf(...) : ByteBuf | provenance | MaD:136 |
 | Test.java:3442:10:3442:23 | asByteBuf(...) : ByteBuf | Test.java:3443:9:3443:11 | out | provenance |  |
 | Test.java:3448:23:3448:45 | (...)... : ByteBufHolder | Test.java:3449:10:3449:11 | in : ByteBufHolder | provenance |  |
 | Test.java:3448:38:3448:45 | source(...) : Object | Test.java:3448:23:3448:45 | (...)... : ByteBufHolder | provenance |  |
-| Test.java:3449:10:3449:11 | in : ByteBufHolder | Test.java:3449:10:3449:21 | content(...) : ByteBuf | provenance | MaD:85 |
+| Test.java:3449:10:3449:11 | in : ByteBufHolder | Test.java:3449:10:3449:21 | content(...) : ByteBuf | provenance | MaD:137 |
 | Test.java:3449:10:3449:21 | content(...) : ByteBuf | Test.java:3450:9:3450:11 | out | provenance |  |
 | Test.java:3455:30:3455:59 | (...)... : DefaultByteBufHolder | Test.java:3456:10:3456:11 | in : DefaultByteBufHolder | provenance |  |
 | Test.java:3455:52:3455:59 | source(...) : Object | Test.java:3455:30:3455:59 | (...)... : DefaultByteBufHolder | provenance |  |
-| Test.java:3456:10:3456:11 | in : DefaultByteBufHolder | Test.java:3456:10:3456:21 | content(...) : ByteBuf | provenance | MaD:85 |
+| Test.java:3456:10:3456:11 | in : DefaultByteBufHolder | Test.java:3456:10:3456:21 | content(...) : ByteBuf | provenance | MaD:137 |
 | Test.java:3456:10:3456:21 | content(...) : ByteBuf | Test.java:3457:9:3457:11 | out | provenance |  |
 | Test.java:3462:19:3462:37 | (...)... : Attribute | Test.java:3463:10:3463:11 | in : Attribute | provenance |  |
 | Test.java:3462:30:3462:37 | source(...) : Object | Test.java:3462:19:3462:37 | (...)... : Attribute | provenance |  |
-| Test.java:3463:10:3463:11 | in : Attribute | Test.java:3463:10:3463:18 | copy(...) : Attribute | provenance | MaD:84 |
+| Test.java:3463:10:3463:11 | in : Attribute | Test.java:3463:10:3463:18 | copy(...) : Attribute | provenance | MaD:138 |
 | Test.java:3463:10:3463:18 | copy(...) : Attribute | Test.java:3464:9:3464:11 | out | provenance |  |
 | Test.java:3469:30:3469:59 | (...)... : BinaryWebSocketFrame | Test.java:3470:10:3470:11 | in : BinaryWebSocketFrame | provenance |  |
 | Test.java:3469:52:3469:59 | source(...) : Object | Test.java:3469:30:3469:59 | (...)... : BinaryWebSocketFrame | provenance |  |
-| Test.java:3470:10:3470:11 | in : BinaryWebSocketFrame | Test.java:3470:10:3470:18 | copy(...) : BinaryWebSocketFrame | provenance | MaD:84 |
+| Test.java:3470:10:3470:11 | in : BinaryWebSocketFrame | Test.java:3470:10:3470:18 | copy(...) : BinaryWebSocketFrame | provenance | MaD:138 |
 | Test.java:3470:10:3470:18 | copy(...) : BinaryWebSocketFrame | Test.java:3471:9:3471:11 | out | provenance |  |
 | Test.java:3476:23:3476:45 | (...)... : ByteBufHolder | Test.java:3477:10:3477:11 | in : ByteBufHolder | provenance |  |
 | Test.java:3476:38:3476:45 | source(...) : Object | Test.java:3476:23:3476:45 | (...)... : ByteBufHolder | provenance |  |
-| Test.java:3477:10:3477:11 | in : ByteBufHolder | Test.java:3477:10:3477:18 | copy(...) : ByteBufHolder | provenance | MaD:84 |
+| Test.java:3477:10:3477:11 | in : ByteBufHolder | Test.java:3477:10:3477:18 | copy(...) : ByteBufHolder | provenance | MaD:138 |
 | Test.java:3477:10:3477:18 | copy(...) : ByteBufHolder | Test.java:3478:9:3478:11 | out | provenance |  |
 | Test.java:3483:30:3483:59 | (...)... : DefaultByteBufHolder | Test.java:3484:10:3484:11 | in : DefaultByteBufHolder | provenance |  |
 | Test.java:3483:52:3483:59 | source(...) : Object | Test.java:3483:30:3483:59 | (...)... : DefaultByteBufHolder | provenance |  |
-| Test.java:3484:10:3484:11 | in : DefaultByteBufHolder | Test.java:3484:10:3484:18 | copy(...) : ByteBufHolder | provenance | MaD:84 |
+| Test.java:3484:10:3484:11 | in : DefaultByteBufHolder | Test.java:3484:10:3484:18 | copy(...) : ByteBufHolder | provenance | MaD:138 |
 | Test.java:3484:10:3484:18 | copy(...) : ByteBufHolder | Test.java:3485:9:3485:11 | out | provenance |  |
 | Test.java:3490:29:3490:57 | (...)... : CloseWebSocketFrame | Test.java:3491:10:3491:11 | in : CloseWebSocketFrame | provenance |  |
 | Test.java:3490:50:3490:57 | source(...) : Object | Test.java:3490:29:3490:57 | (...)... : CloseWebSocketFrame | provenance |  |
-| Test.java:3491:10:3491:11 | in : CloseWebSocketFrame | Test.java:3491:10:3491:18 | copy(...) : CloseWebSocketFrame | provenance | MaD:84 |
+| Test.java:3491:10:3491:11 | in : CloseWebSocketFrame | Test.java:3491:10:3491:18 | copy(...) : CloseWebSocketFrame | provenance | MaD:138 |
 | Test.java:3491:10:3491:18 | copy(...) : CloseWebSocketFrame | Test.java:3492:9:3492:11 | out | provenance |  |
 | Test.java:3497:36:3497:71 | (...)... : ContinuationWebSocketFrame | Test.java:3498:10:3498:11 | in : ContinuationWebSocketFrame | provenance |  |
 | Test.java:3497:64:3497:71 | source(...) : Object | Test.java:3497:36:3497:71 | (...)... : ContinuationWebSocketFrame | provenance |  |
-| Test.java:3498:10:3498:11 | in : ContinuationWebSocketFrame | Test.java:3498:10:3498:18 | copy(...) : ContinuationWebSocketFrame | provenance | MaD:84 |
+| Test.java:3498:10:3498:11 | in : ContinuationWebSocketFrame | Test.java:3498:10:3498:18 | copy(...) : ContinuationWebSocketFrame | provenance | MaD:138 |
 | Test.java:3498:10:3498:18 | copy(...) : ContinuationWebSocketFrame | Test.java:3499:9:3499:11 | out | provenance |  |
 | Test.java:3504:20:3504:39 | (...)... : FileUpload | Test.java:3505:10:3505:11 | in : FileUpload | provenance |  |
 | Test.java:3504:32:3504:39 | source(...) : Object | Test.java:3504:20:3504:39 | (...)... : FileUpload | provenance |  |
-| Test.java:3505:10:3505:11 | in : FileUpload | Test.java:3505:10:3505:18 | copy(...) : FileUpload | provenance | MaD:84 |
+| Test.java:3505:10:3505:11 | in : FileUpload | Test.java:3505:10:3505:18 | copy(...) : FileUpload | provenance | MaD:138 |
 | Test.java:3505:10:3505:18 | copy(...) : FileUpload | Test.java:3506:9:3506:11 | out | provenance |  |
 | Test.java:3511:25:3511:49 | (...)... : FullHttpMessage | Test.java:3512:10:3512:11 | in : FullHttpMessage | provenance |  |
 | Test.java:3511:42:3511:49 | source(...) : Object | Test.java:3511:25:3511:49 | (...)... : FullHttpMessage | provenance |  |
-| Test.java:3512:10:3512:11 | in : FullHttpMessage | Test.java:3512:10:3512:18 | copy(...) : FullHttpMessage | provenance | MaD:84 |
+| Test.java:3512:10:3512:11 | in : FullHttpMessage | Test.java:3512:10:3512:18 | copy(...) : FullHttpMessage | provenance | MaD:138 |
 | Test.java:3512:10:3512:18 | copy(...) : FullHttpMessage | Test.java:3513:9:3513:11 | out | provenance |  |
 | Test.java:3518:25:3518:49 | (...)... : FullHttpRequest | Test.java:3519:10:3519:11 | in : FullHttpRequest | provenance |  |
 | Test.java:3518:42:3518:49 | source(...) : Object | Test.java:3518:25:3518:49 | (...)... : FullHttpRequest | provenance |  |
-| Test.java:3519:10:3519:11 | in : FullHttpRequest | Test.java:3519:10:3519:18 | copy(...) : FullHttpRequest | provenance | MaD:84 |
+| Test.java:3519:10:3519:11 | in : FullHttpRequest | Test.java:3519:10:3519:18 | copy(...) : FullHttpRequest | provenance | MaD:138 |
 | Test.java:3519:10:3519:18 | copy(...) : FullHttpRequest | Test.java:3520:9:3520:11 | out | provenance |  |
 | Test.java:3525:26:3525:51 | (...)... : FullHttpResponse | Test.java:3526:10:3526:11 | in : FullHttpResponse | provenance |  |
 | Test.java:3525:44:3525:51 | source(...) : Object | Test.java:3525:26:3525:51 | (...)... : FullHttpResponse | provenance |  |
-| Test.java:3526:10:3526:11 | in : FullHttpResponse | Test.java:3526:10:3526:18 | copy(...) : FullHttpResponse | provenance | MaD:84 |
+| Test.java:3526:10:3526:11 | in : FullHttpResponse | Test.java:3526:10:3526:18 | copy(...) : FullHttpResponse | provenance | MaD:138 |
 | Test.java:3526:10:3526:18 | copy(...) : FullHttpResponse | Test.java:3527:9:3527:11 | out | provenance |  |
 | Test.java:3532:21:3532:41 | (...)... : HttpContent | Test.java:3533:10:3533:11 | in : HttpContent | provenance |  |
 | Test.java:3532:34:3532:41 | source(...) : Object | Test.java:3532:21:3532:41 | (...)... : HttpContent | provenance |  |
-| Test.java:3533:10:3533:11 | in : HttpContent | Test.java:3533:10:3533:18 | copy(...) : HttpContent | provenance | MaD:84 |
+| Test.java:3533:10:3533:11 | in : HttpContent | Test.java:3533:10:3533:18 | copy(...) : HttpContent | provenance | MaD:138 |
 | Test.java:3533:10:3533:18 | copy(...) : HttpContent | Test.java:3534:9:3534:11 | out | provenance |  |
 | Test.java:3539:18:3539:35 | (...)... : HttpData | Test.java:3540:10:3540:11 | in : HttpData | provenance |  |
 | Test.java:3539:28:3539:35 | source(...) : Object | Test.java:3539:18:3539:35 | (...)... : HttpData | provenance |  |
-| Test.java:3540:10:3540:11 | in : HttpData | Test.java:3540:10:3540:18 | copy(...) : HttpData | provenance | MaD:84 |
+| Test.java:3540:10:3540:11 | in : HttpData | Test.java:3540:10:3540:18 | copy(...) : HttpData | provenance | MaD:138 |
 | Test.java:3540:10:3540:18 | copy(...) : HttpData | Test.java:3541:9:3541:11 | out | provenance |  |
 | Test.java:3546:25:3546:49 | (...)... : LastHttpContent | Test.java:3547:10:3547:11 | in : LastHttpContent | provenance |  |
 | Test.java:3546:42:3546:49 | source(...) : Object | Test.java:3546:25:3546:49 | (...)... : LastHttpContent | provenance |  |
-| Test.java:3547:10:3547:11 | in : LastHttpContent | Test.java:3547:10:3547:18 | copy(...) : LastHttpContent | provenance | MaD:84 |
+| Test.java:3547:10:3547:11 | in : LastHttpContent | Test.java:3547:10:3547:18 | copy(...) : LastHttpContent | provenance | MaD:138 |
 | Test.java:3547:10:3547:18 | copy(...) : LastHttpContent | Test.java:3548:9:3548:11 | out | provenance |  |
 | Test.java:3553:28:3553:55 | (...)... : PingWebSocketFrame | Test.java:3554:10:3554:11 | in : PingWebSocketFrame | provenance |  |
 | Test.java:3553:48:3553:55 | source(...) : Object | Test.java:3553:28:3553:55 | (...)... : PingWebSocketFrame | provenance |  |
-| Test.java:3554:10:3554:11 | in : PingWebSocketFrame | Test.java:3554:10:3554:18 | copy(...) : PingWebSocketFrame | provenance | MaD:84 |
+| Test.java:3554:10:3554:11 | in : PingWebSocketFrame | Test.java:3554:10:3554:18 | copy(...) : PingWebSocketFrame | provenance | MaD:138 |
 | Test.java:3554:10:3554:18 | copy(...) : PingWebSocketFrame | Test.java:3555:9:3555:11 | out | provenance |  |
 | Test.java:3560:28:3560:55 | (...)... : PongWebSocketFrame | Test.java:3561:10:3561:11 | in : PongWebSocketFrame | provenance |  |
 | Test.java:3560:48:3560:55 | source(...) : Object | Test.java:3560:28:3560:55 | (...)... : PongWebSocketFrame | provenance |  |
-| Test.java:3561:10:3561:11 | in : PongWebSocketFrame | Test.java:3561:10:3561:18 | copy(...) : PongWebSocketFrame | provenance | MaD:84 |
+| Test.java:3561:10:3561:11 | in : PongWebSocketFrame | Test.java:3561:10:3561:18 | copy(...) : PongWebSocketFrame | provenance | MaD:138 |
 | Test.java:3561:10:3561:18 | copy(...) : PongWebSocketFrame | Test.java:3562:9:3562:11 | out | provenance |  |
 | Test.java:3567:28:3567:55 | (...)... : TextWebSocketFrame | Test.java:3568:10:3568:11 | in : TextWebSocketFrame | provenance |  |
 | Test.java:3567:48:3567:55 | source(...) : Object | Test.java:3567:28:3567:55 | (...)... : TextWebSocketFrame | provenance |  |
-| Test.java:3568:10:3568:11 | in : TextWebSocketFrame | Test.java:3568:10:3568:18 | copy(...) : TextWebSocketFrame | provenance | MaD:84 |
+| Test.java:3568:10:3568:11 | in : TextWebSocketFrame | Test.java:3568:10:3568:18 | copy(...) : TextWebSocketFrame | provenance | MaD:138 |
 | Test.java:3568:10:3568:18 | copy(...) : TextWebSocketFrame | Test.java:3569:9:3569:11 | out | provenance |  |
 | Test.java:3574:24:3574:47 | (...)... : WebSocketFrame | Test.java:3575:10:3575:11 | in : WebSocketFrame | provenance |  |
 | Test.java:3574:40:3574:47 | source(...) : Object | Test.java:3574:24:3574:47 | (...)... : WebSocketFrame | provenance |  |
-| Test.java:3575:10:3575:11 | in : WebSocketFrame | Test.java:3575:10:3575:18 | copy(...) : WebSocketFrame | provenance | MaD:84 |
+| Test.java:3575:10:3575:11 | in : WebSocketFrame | Test.java:3575:10:3575:18 | copy(...) : WebSocketFrame | provenance | MaD:138 |
 | Test.java:3575:10:3575:18 | copy(...) : WebSocketFrame | Test.java:3576:9:3576:11 | out | provenance |  |
 | Test.java:3581:19:3581:37 | (...)... : Attribute | Test.java:3582:10:3582:11 | in : Attribute | provenance |  |
 | Test.java:3581:30:3581:37 | source(...) : Object | Test.java:3581:19:3581:37 | (...)... : Attribute | provenance |  |
-| Test.java:3582:10:3582:11 | in : Attribute | Test.java:3582:10:3582:23 | duplicate(...) : Attribute | provenance | MaD:86 |
+| Test.java:3582:10:3582:11 | in : Attribute | Test.java:3582:10:3582:23 | duplicate(...) : Attribute | provenance | MaD:139 |
 | Test.java:3582:10:3582:23 | duplicate(...) : Attribute | Test.java:3583:9:3583:11 | out | provenance |  |
 | Test.java:3588:30:3588:59 | (...)... : BinaryWebSocketFrame | Test.java:3589:10:3589:11 | in : BinaryWebSocketFrame | provenance |  |
 | Test.java:3588:52:3588:59 | source(...) : Object | Test.java:3588:30:3588:59 | (...)... : BinaryWebSocketFrame | provenance |  |
-| Test.java:3589:10:3589:11 | in : BinaryWebSocketFrame | Test.java:3589:10:3589:23 | duplicate(...) : BinaryWebSocketFrame | provenance | MaD:86 |
+| Test.java:3589:10:3589:11 | in : BinaryWebSocketFrame | Test.java:3589:10:3589:23 | duplicate(...) : BinaryWebSocketFrame | provenance | MaD:139 |
 | Test.java:3589:10:3589:23 | duplicate(...) : BinaryWebSocketFrame | Test.java:3590:9:3590:11 | out | provenance |  |
 | Test.java:3595:23:3595:45 | (...)... : ByteBufHolder | Test.java:3596:10:3596:11 | in : ByteBufHolder | provenance |  |
 | Test.java:3595:38:3595:45 | source(...) : Object | Test.java:3595:23:3595:45 | (...)... : ByteBufHolder | provenance |  |
-| Test.java:3596:10:3596:11 | in : ByteBufHolder | Test.java:3596:10:3596:23 | duplicate(...) : ByteBufHolder | provenance | MaD:86 |
+| Test.java:3596:10:3596:11 | in : ByteBufHolder | Test.java:3596:10:3596:23 | duplicate(...) : ByteBufHolder | provenance | MaD:139 |
 | Test.java:3596:10:3596:23 | duplicate(...) : ByteBufHolder | Test.java:3597:9:3597:11 | out | provenance |  |
 | Test.java:3602:30:3602:59 | (...)... : DefaultByteBufHolder | Test.java:3603:10:3603:11 | in : DefaultByteBufHolder | provenance |  |
 | Test.java:3602:52:3602:59 | source(...) : Object | Test.java:3602:30:3602:59 | (...)... : DefaultByteBufHolder | provenance |  |
-| Test.java:3603:10:3603:11 | in : DefaultByteBufHolder | Test.java:3603:10:3603:23 | duplicate(...) : ByteBufHolder | provenance | MaD:86 |
+| Test.java:3603:10:3603:11 | in : DefaultByteBufHolder | Test.java:3603:10:3603:23 | duplicate(...) : ByteBufHolder | provenance | MaD:139 |
 | Test.java:3603:10:3603:23 | duplicate(...) : ByteBufHolder | Test.java:3604:9:3604:11 | out | provenance |  |
 | Test.java:3609:29:3609:57 | (...)... : CloseWebSocketFrame | Test.java:3610:10:3610:11 | in : CloseWebSocketFrame | provenance |  |
 | Test.java:3609:50:3609:57 | source(...) : Object | Test.java:3609:29:3609:57 | (...)... : CloseWebSocketFrame | provenance |  |
-| Test.java:3610:10:3610:11 | in : CloseWebSocketFrame | Test.java:3610:10:3610:23 | duplicate(...) : CloseWebSocketFrame | provenance | MaD:86 |
+| Test.java:3610:10:3610:11 | in : CloseWebSocketFrame | Test.java:3610:10:3610:23 | duplicate(...) : CloseWebSocketFrame | provenance | MaD:139 |
 | Test.java:3610:10:3610:23 | duplicate(...) : CloseWebSocketFrame | Test.java:3611:9:3611:11 | out | provenance |  |
 | Test.java:3616:36:3616:71 | (...)... : ContinuationWebSocketFrame | Test.java:3617:10:3617:11 | in : ContinuationWebSocketFrame | provenance |  |
 | Test.java:3616:64:3616:71 | source(...) : Object | Test.java:3616:36:3616:71 | (...)... : ContinuationWebSocketFrame | provenance |  |
-| Test.java:3617:10:3617:11 | in : ContinuationWebSocketFrame | Test.java:3617:10:3617:23 | duplicate(...) : ContinuationWebSocketFrame | provenance | MaD:86 |
+| Test.java:3617:10:3617:11 | in : ContinuationWebSocketFrame | Test.java:3617:10:3617:23 | duplicate(...) : ContinuationWebSocketFrame | provenance | MaD:139 |
 | Test.java:3617:10:3617:23 | duplicate(...) : ContinuationWebSocketFrame | Test.java:3618:9:3618:11 | out | provenance |  |
 | Test.java:3623:20:3623:39 | (...)... : FileUpload | Test.java:3624:10:3624:11 | in : FileUpload | provenance |  |
 | Test.java:3623:32:3623:39 | source(...) : Object | Test.java:3623:20:3623:39 | (...)... : FileUpload | provenance |  |
-| Test.java:3624:10:3624:11 | in : FileUpload | Test.java:3624:10:3624:23 | duplicate(...) : FileUpload | provenance | MaD:86 |
+| Test.java:3624:10:3624:11 | in : FileUpload | Test.java:3624:10:3624:23 | duplicate(...) : FileUpload | provenance | MaD:139 |
 | Test.java:3624:10:3624:23 | duplicate(...) : FileUpload | Test.java:3625:9:3625:11 | out | provenance |  |
 | Test.java:3630:25:3630:49 | (...)... : FullHttpMessage | Test.java:3631:10:3631:11 | in : FullHttpMessage | provenance |  |
 | Test.java:3630:42:3630:49 | source(...) : Object | Test.java:3630:25:3630:49 | (...)... : FullHttpMessage | provenance |  |
-| Test.java:3631:10:3631:11 | in : FullHttpMessage | Test.java:3631:10:3631:23 | duplicate(...) : FullHttpMessage | provenance | MaD:86 |
+| Test.java:3631:10:3631:11 | in : FullHttpMessage | Test.java:3631:10:3631:23 | duplicate(...) : FullHttpMessage | provenance | MaD:139 |
 | Test.java:3631:10:3631:23 | duplicate(...) : FullHttpMessage | Test.java:3632:9:3632:11 | out | provenance |  |
 | Test.java:3637:25:3637:49 | (...)... : FullHttpRequest | Test.java:3638:10:3638:11 | in : FullHttpRequest | provenance |  |
 | Test.java:3637:42:3637:49 | source(...) : Object | Test.java:3637:25:3637:49 | (...)... : FullHttpRequest | provenance |  |
-| Test.java:3638:10:3638:11 | in : FullHttpRequest | Test.java:3638:10:3638:23 | duplicate(...) : FullHttpRequest | provenance | MaD:86 |
+| Test.java:3638:10:3638:11 | in : FullHttpRequest | Test.java:3638:10:3638:23 | duplicate(...) : FullHttpRequest | provenance | MaD:139 |
 | Test.java:3638:10:3638:23 | duplicate(...) : FullHttpRequest | Test.java:3639:9:3639:11 | out | provenance |  |
 | Test.java:3644:26:3644:51 | (...)... : FullHttpResponse | Test.java:3645:10:3645:11 | in : FullHttpResponse | provenance |  |
 | Test.java:3644:44:3644:51 | source(...) : Object | Test.java:3644:26:3644:51 | (...)... : FullHttpResponse | provenance |  |
-| Test.java:3645:10:3645:11 | in : FullHttpResponse | Test.java:3645:10:3645:23 | duplicate(...) : FullHttpResponse | provenance | MaD:86 |
+| Test.java:3645:10:3645:11 | in : FullHttpResponse | Test.java:3645:10:3645:23 | duplicate(...) : FullHttpResponse | provenance | MaD:139 |
 | Test.java:3645:10:3645:23 | duplicate(...) : FullHttpResponse | Test.java:3646:9:3646:11 | out | provenance |  |
 | Test.java:3651:21:3651:41 | (...)... : HttpContent | Test.java:3652:10:3652:11 | in : HttpContent | provenance |  |
 | Test.java:3651:34:3651:41 | source(...) : Object | Test.java:3651:21:3651:41 | (...)... : HttpContent | provenance |  |
-| Test.java:3652:10:3652:11 | in : HttpContent | Test.java:3652:10:3652:23 | duplicate(...) : HttpContent | provenance | MaD:86 |
+| Test.java:3652:10:3652:11 | in : HttpContent | Test.java:3652:10:3652:23 | duplicate(...) : HttpContent | provenance | MaD:139 |
 | Test.java:3652:10:3652:23 | duplicate(...) : HttpContent | Test.java:3653:9:3653:11 | out | provenance |  |
 | Test.java:3658:18:3658:35 | (...)... : HttpData | Test.java:3659:10:3659:11 | in : HttpData | provenance |  |
 | Test.java:3658:28:3658:35 | source(...) : Object | Test.java:3658:18:3658:35 | (...)... : HttpData | provenance |  |
-| Test.java:3659:10:3659:11 | in : HttpData | Test.java:3659:10:3659:23 | duplicate(...) : HttpData | provenance | MaD:86 |
+| Test.java:3659:10:3659:11 | in : HttpData | Test.java:3659:10:3659:23 | duplicate(...) : HttpData | provenance | MaD:139 |
 | Test.java:3659:10:3659:23 | duplicate(...) : HttpData | Test.java:3660:9:3660:11 | out | provenance |  |
 | Test.java:3665:25:3665:49 | (...)... : LastHttpContent | Test.java:3666:10:3666:11 | in : LastHttpContent | provenance |  |
 | Test.java:3665:42:3665:49 | source(...) : Object | Test.java:3665:25:3665:49 | (...)... : LastHttpContent | provenance |  |
-| Test.java:3666:10:3666:11 | in : LastHttpContent | Test.java:3666:10:3666:23 | duplicate(...) : LastHttpContent | provenance | MaD:86 |
+| Test.java:3666:10:3666:11 | in : LastHttpContent | Test.java:3666:10:3666:23 | duplicate(...) : LastHttpContent | provenance | MaD:139 |
 | Test.java:3666:10:3666:23 | duplicate(...) : LastHttpContent | Test.java:3667:9:3667:11 | out | provenance |  |
 | Test.java:3672:28:3672:55 | (...)... : PingWebSocketFrame | Test.java:3673:10:3673:11 | in : PingWebSocketFrame | provenance |  |
 | Test.java:3672:48:3672:55 | source(...) : Object | Test.java:3672:28:3672:55 | (...)... : PingWebSocketFrame | provenance |  |
-| Test.java:3673:10:3673:11 | in : PingWebSocketFrame | Test.java:3673:10:3673:23 | duplicate(...) : PingWebSocketFrame | provenance | MaD:86 |
+| Test.java:3673:10:3673:11 | in : PingWebSocketFrame | Test.java:3673:10:3673:23 | duplicate(...) : PingWebSocketFrame | provenance | MaD:139 |
 | Test.java:3673:10:3673:23 | duplicate(...) : PingWebSocketFrame | Test.java:3674:9:3674:11 | out | provenance |  |
 | Test.java:3679:28:3679:55 | (...)... : PongWebSocketFrame | Test.java:3680:10:3680:11 | in : PongWebSocketFrame | provenance |  |
 | Test.java:3679:48:3679:55 | source(...) : Object | Test.java:3679:28:3679:55 | (...)... : PongWebSocketFrame | provenance |  |
-| Test.java:3680:10:3680:11 | in : PongWebSocketFrame | Test.java:3680:10:3680:23 | duplicate(...) : PongWebSocketFrame | provenance | MaD:86 |
+| Test.java:3680:10:3680:11 | in : PongWebSocketFrame | Test.java:3680:10:3680:23 | duplicate(...) : PongWebSocketFrame | provenance | MaD:139 |
 | Test.java:3680:10:3680:23 | duplicate(...) : PongWebSocketFrame | Test.java:3681:9:3681:11 | out | provenance |  |
 | Test.java:3686:28:3686:55 | (...)... : TextWebSocketFrame | Test.java:3687:10:3687:11 | in : TextWebSocketFrame | provenance |  |
 | Test.java:3686:48:3686:55 | source(...) : Object | Test.java:3686:28:3686:55 | (...)... : TextWebSocketFrame | provenance |  |
-| Test.java:3687:10:3687:11 | in : TextWebSocketFrame | Test.java:3687:10:3687:23 | duplicate(...) : TextWebSocketFrame | provenance | MaD:86 |
+| Test.java:3687:10:3687:11 | in : TextWebSocketFrame | Test.java:3687:10:3687:23 | duplicate(...) : TextWebSocketFrame | provenance | MaD:139 |
 | Test.java:3687:10:3687:23 | duplicate(...) : TextWebSocketFrame | Test.java:3688:9:3688:11 | out | provenance |  |
 | Test.java:3693:24:3693:47 | (...)... : WebSocketFrame | Test.java:3694:10:3694:11 | in : WebSocketFrame | provenance |  |
 | Test.java:3693:40:3693:47 | source(...) : Object | Test.java:3693:24:3693:47 | (...)... : WebSocketFrame | provenance |  |
-| Test.java:3694:10:3694:11 | in : WebSocketFrame | Test.java:3694:10:3694:23 | duplicate(...) : WebSocketFrame | provenance | MaD:86 |
+| Test.java:3694:10:3694:11 | in : WebSocketFrame | Test.java:3694:10:3694:23 | duplicate(...) : WebSocketFrame | provenance | MaD:139 |
 | Test.java:3694:10:3694:23 | duplicate(...) : WebSocketFrame | Test.java:3695:9:3695:11 | out | provenance |  |
 | Test.java:3700:17:3700:33 | (...)... : ByteBuf | Test.java:3702:27:3702:28 | in : ByteBuf | provenance |  |
 | Test.java:3700:26:3700:33 | source(...) : Object | Test.java:3700:17:3700:33 | (...)... : ByteBuf | provenance |  |
 | Test.java:3702:10:3702:29 | replace(...) : Attribute | Test.java:3703:9:3703:11 | out | provenance |  |
-| Test.java:3702:27:3702:28 | in : ByteBuf | Test.java:3702:10:3702:29 | replace(...) : Attribute | provenance | MaD:88 |
+| Test.java:3702:27:3702:28 | in : ByteBuf | Test.java:3702:10:3702:29 | replace(...) : Attribute | provenance | MaD:140 |
 | Test.java:3708:17:3708:33 | (...)... : ByteBuf | Test.java:3710:27:3710:28 | in : ByteBuf | provenance |  |
 | Test.java:3708:26:3708:33 | source(...) : Object | Test.java:3708:17:3708:33 | (...)... : ByteBuf | provenance |  |
 | Test.java:3710:10:3710:29 | replace(...) : BinaryWebSocketFrame | Test.java:3711:9:3711:11 | out | provenance |  |
-| Test.java:3710:27:3710:28 | in : ByteBuf | Test.java:3710:10:3710:29 | replace(...) : BinaryWebSocketFrame | provenance | MaD:88 |
+| Test.java:3710:27:3710:28 | in : ByteBuf | Test.java:3710:10:3710:29 | replace(...) : BinaryWebSocketFrame | provenance | MaD:140 |
 | Test.java:3716:17:3716:33 | (...)... : ByteBuf | Test.java:3718:27:3718:28 | in : ByteBuf | provenance |  |
 | Test.java:3716:26:3716:33 | source(...) : Object | Test.java:3716:17:3716:33 | (...)... : ByteBuf | provenance |  |
 | Test.java:3718:10:3718:29 | replace(...) : ByteBufHolder | Test.java:3719:9:3719:11 | out | provenance |  |
-| Test.java:3718:27:3718:28 | in : ByteBuf | Test.java:3718:10:3718:29 | replace(...) : ByteBufHolder | provenance | MaD:88 |
+| Test.java:3718:27:3718:28 | in : ByteBuf | Test.java:3718:10:3718:29 | replace(...) : ByteBufHolder | provenance | MaD:140 |
 | Test.java:3724:17:3724:33 | (...)... : ByteBuf | Test.java:3726:27:3726:28 | in : ByteBuf | provenance |  |
 | Test.java:3724:26:3724:33 | source(...) : Object | Test.java:3724:17:3724:33 | (...)... : ByteBuf | provenance |  |
 | Test.java:3726:10:3726:29 | replace(...) : ByteBufHolder | Test.java:3727:9:3727:11 | out | provenance |  |
-| Test.java:3726:27:3726:28 | in : ByteBuf | Test.java:3726:10:3726:29 | replace(...) : ByteBufHolder | provenance | MaD:88 |
+| Test.java:3726:27:3726:28 | in : ByteBuf | Test.java:3726:10:3726:29 | replace(...) : ByteBufHolder | provenance | MaD:140 |
 | Test.java:3732:17:3732:33 | (...)... : ByteBuf | Test.java:3734:27:3734:28 | in : ByteBuf | provenance |  |
 | Test.java:3732:26:3732:33 | source(...) : Object | Test.java:3732:17:3732:33 | (...)... : ByteBuf | provenance |  |
 | Test.java:3734:10:3734:29 | replace(...) : CloseWebSocketFrame | Test.java:3735:9:3735:11 | out | provenance |  |
-| Test.java:3734:27:3734:28 | in : ByteBuf | Test.java:3734:10:3734:29 | replace(...) : CloseWebSocketFrame | provenance | MaD:88 |
+| Test.java:3734:27:3734:28 | in : ByteBuf | Test.java:3734:10:3734:29 | replace(...) : CloseWebSocketFrame | provenance | MaD:140 |
 | Test.java:3740:17:3740:33 | (...)... : ByteBuf | Test.java:3742:27:3742:28 | in : ByteBuf | provenance |  |
 | Test.java:3740:26:3740:33 | source(...) : Object | Test.java:3740:17:3740:33 | (...)... : ByteBuf | provenance |  |
 | Test.java:3742:10:3742:29 | replace(...) : ContinuationWebSocketFrame | Test.java:3743:9:3743:11 | out | provenance |  |
-| Test.java:3742:27:3742:28 | in : ByteBuf | Test.java:3742:10:3742:29 | replace(...) : ContinuationWebSocketFrame | provenance | MaD:88 |
+| Test.java:3742:27:3742:28 | in : ByteBuf | Test.java:3742:10:3742:29 | replace(...) : ContinuationWebSocketFrame | provenance | MaD:140 |
 | Test.java:3748:17:3748:33 | (...)... : ByteBuf | Test.java:3750:27:3750:28 | in : ByteBuf | provenance |  |
 | Test.java:3748:26:3748:33 | source(...) : Object | Test.java:3748:17:3748:33 | (...)... : ByteBuf | provenance |  |
 | Test.java:3750:10:3750:29 | replace(...) : FileUpload | Test.java:3751:9:3751:11 | out | provenance |  |
-| Test.java:3750:27:3750:28 | in : ByteBuf | Test.java:3750:10:3750:29 | replace(...) : FileUpload | provenance | MaD:88 |
+| Test.java:3750:27:3750:28 | in : ByteBuf | Test.java:3750:10:3750:29 | replace(...) : FileUpload | provenance | MaD:140 |
 | Test.java:3756:17:3756:33 | (...)... : ByteBuf | Test.java:3758:27:3758:28 | in : ByteBuf | provenance |  |
 | Test.java:3756:26:3756:33 | source(...) : Object | Test.java:3756:17:3756:33 | (...)... : ByteBuf | provenance |  |
 | Test.java:3758:10:3758:29 | replace(...) : FullHttpMessage | Test.java:3759:9:3759:11 | out | provenance |  |
-| Test.java:3758:27:3758:28 | in : ByteBuf | Test.java:3758:10:3758:29 | replace(...) : FullHttpMessage | provenance | MaD:88 |
+| Test.java:3758:27:3758:28 | in : ByteBuf | Test.java:3758:10:3758:29 | replace(...) : FullHttpMessage | provenance | MaD:140 |
 | Test.java:3764:17:3764:33 | (...)... : ByteBuf | Test.java:3766:27:3766:28 | in : ByteBuf | provenance |  |
 | Test.java:3764:26:3764:33 | source(...) : Object | Test.java:3764:17:3764:33 | (...)... : ByteBuf | provenance |  |
 | Test.java:3766:10:3766:29 | replace(...) : FullHttpRequest | Test.java:3767:9:3767:11 | out | provenance |  |
-| Test.java:3766:27:3766:28 | in : ByteBuf | Test.java:3766:10:3766:29 | replace(...) : FullHttpRequest | provenance | MaD:88 |
+| Test.java:3766:27:3766:28 | in : ByteBuf | Test.java:3766:10:3766:29 | replace(...) : FullHttpRequest | provenance | MaD:140 |
 | Test.java:3772:17:3772:33 | (...)... : ByteBuf | Test.java:3774:27:3774:28 | in : ByteBuf | provenance |  |
 | Test.java:3772:26:3772:33 | source(...) : Object | Test.java:3772:17:3772:33 | (...)... : ByteBuf | provenance |  |
 | Test.java:3774:10:3774:29 | replace(...) : FullHttpResponse | Test.java:3775:9:3775:11 | out | provenance |  |
-| Test.java:3774:27:3774:28 | in : ByteBuf | Test.java:3774:10:3774:29 | replace(...) : FullHttpResponse | provenance | MaD:88 |
+| Test.java:3774:27:3774:28 | in : ByteBuf | Test.java:3774:10:3774:29 | replace(...) : FullHttpResponse | provenance | MaD:140 |
 | Test.java:3780:17:3780:33 | (...)... : ByteBuf | Test.java:3782:27:3782:28 | in : ByteBuf | provenance |  |
 | Test.java:3780:26:3780:33 | source(...) : Object | Test.java:3780:17:3780:33 | (...)... : ByteBuf | provenance |  |
 | Test.java:3782:10:3782:29 | replace(...) : HttpContent | Test.java:3783:9:3783:11 | out | provenance |  |
-| Test.java:3782:27:3782:28 | in : ByteBuf | Test.java:3782:10:3782:29 | replace(...) : HttpContent | provenance | MaD:88 |
+| Test.java:3782:27:3782:28 | in : ByteBuf | Test.java:3782:10:3782:29 | replace(...) : HttpContent | provenance | MaD:140 |
 | Test.java:3788:17:3788:33 | (...)... : ByteBuf | Test.java:3790:27:3790:28 | in : ByteBuf | provenance |  |
 | Test.java:3788:26:3788:33 | source(...) : Object | Test.java:3788:17:3788:33 | (...)... : ByteBuf | provenance |  |
 | Test.java:3790:10:3790:29 | replace(...) : HttpData | Test.java:3791:9:3791:11 | out | provenance |  |
-| Test.java:3790:27:3790:28 | in : ByteBuf | Test.java:3790:10:3790:29 | replace(...) : HttpData | provenance | MaD:88 |
+| Test.java:3790:27:3790:28 | in : ByteBuf | Test.java:3790:10:3790:29 | replace(...) : HttpData | provenance | MaD:140 |
 | Test.java:3796:17:3796:33 | (...)... : ByteBuf | Test.java:3798:27:3798:28 | in : ByteBuf | provenance |  |
 | Test.java:3796:26:3796:33 | source(...) : Object | Test.java:3796:17:3796:33 | (...)... : ByteBuf | provenance |  |
 | Test.java:3798:10:3798:29 | replace(...) : LastHttpContent | Test.java:3799:9:3799:11 | out | provenance |  |
-| Test.java:3798:27:3798:28 | in : ByteBuf | Test.java:3798:10:3798:29 | replace(...) : LastHttpContent | provenance | MaD:88 |
+| Test.java:3798:27:3798:28 | in : ByteBuf | Test.java:3798:10:3798:29 | replace(...) : LastHttpContent | provenance | MaD:140 |
 | Test.java:3804:17:3804:33 | (...)... : ByteBuf | Test.java:3806:27:3806:28 | in : ByteBuf | provenance |  |
 | Test.java:3804:26:3804:33 | source(...) : Object | Test.java:3804:17:3804:33 | (...)... : ByteBuf | provenance |  |
 | Test.java:3806:10:3806:29 | replace(...) : PingWebSocketFrame | Test.java:3807:9:3807:11 | out | provenance |  |
-| Test.java:3806:27:3806:28 | in : ByteBuf | Test.java:3806:10:3806:29 | replace(...) : PingWebSocketFrame | provenance | MaD:88 |
+| Test.java:3806:27:3806:28 | in : ByteBuf | Test.java:3806:10:3806:29 | replace(...) : PingWebSocketFrame | provenance | MaD:140 |
 | Test.java:3812:17:3812:33 | (...)... : ByteBuf | Test.java:3814:27:3814:28 | in : ByteBuf | provenance |  |
 | Test.java:3812:26:3812:33 | source(...) : Object | Test.java:3812:17:3812:33 | (...)... : ByteBuf | provenance |  |
 | Test.java:3814:10:3814:29 | replace(...) : PongWebSocketFrame | Test.java:3815:9:3815:11 | out | provenance |  |
-| Test.java:3814:27:3814:28 | in : ByteBuf | Test.java:3814:10:3814:29 | replace(...) : PongWebSocketFrame | provenance | MaD:88 |
+| Test.java:3814:27:3814:28 | in : ByteBuf | Test.java:3814:10:3814:29 | replace(...) : PongWebSocketFrame | provenance | MaD:140 |
 | Test.java:3820:17:3820:33 | (...)... : ByteBuf | Test.java:3822:27:3822:28 | in : ByteBuf | provenance |  |
 | Test.java:3820:26:3820:33 | source(...) : Object | Test.java:3820:17:3820:33 | (...)... : ByteBuf | provenance |  |
 | Test.java:3822:10:3822:29 | replace(...) : TextWebSocketFrame | Test.java:3823:9:3823:11 | out | provenance |  |
-| Test.java:3822:27:3822:28 | in : ByteBuf | Test.java:3822:10:3822:29 | replace(...) : TextWebSocketFrame | provenance | MaD:88 |
+| Test.java:3822:27:3822:28 | in : ByteBuf | Test.java:3822:10:3822:29 | replace(...) : TextWebSocketFrame | provenance | MaD:140 |
 | Test.java:3828:17:3828:33 | (...)... : ByteBuf | Test.java:3830:27:3830:28 | in : ByteBuf | provenance |  |
 | Test.java:3828:26:3828:33 | source(...) : Object | Test.java:3828:17:3828:33 | (...)... : ByteBuf | provenance |  |
 | Test.java:3830:10:3830:29 | replace(...) : WebSocketFrame | Test.java:3831:9:3831:11 | out | provenance |  |
-| Test.java:3830:27:3830:28 | in : ByteBuf | Test.java:3830:10:3830:29 | replace(...) : WebSocketFrame | provenance | MaD:88 |
+| Test.java:3830:27:3830:28 | in : ByteBuf | Test.java:3830:10:3830:29 | replace(...) : WebSocketFrame | provenance | MaD:140 |
 | Test.java:3836:19:3836:37 | (...)... : Attribute | Test.java:3837:10:3837:11 | in : Attribute | provenance |  |
 | Test.java:3836:30:3836:37 | source(...) : Object | Test.java:3836:19:3836:37 | (...)... : Attribute | provenance |  |
-| Test.java:3837:10:3837:11 | in : Attribute | Test.java:3837:10:3837:31 | retainedDuplicate(...) : Attribute | provenance | MaD:87 |
+| Test.java:3837:10:3837:11 | in : Attribute | Test.java:3837:10:3837:31 | retainedDuplicate(...) : Attribute | provenance | MaD:141 |
 | Test.java:3837:10:3837:31 | retainedDuplicate(...) : Attribute | Test.java:3838:9:3838:11 | out | provenance |  |
 | Test.java:3843:30:3843:59 | (...)... : BinaryWebSocketFrame | Test.java:3844:10:3844:11 | in : BinaryWebSocketFrame | provenance |  |
 | Test.java:3843:52:3843:59 | source(...) : Object | Test.java:3843:30:3843:59 | (...)... : BinaryWebSocketFrame | provenance |  |
-| Test.java:3844:10:3844:11 | in : BinaryWebSocketFrame | Test.java:3844:10:3844:31 | retainedDuplicate(...) : BinaryWebSocketFrame | provenance | MaD:87 |
+| Test.java:3844:10:3844:11 | in : BinaryWebSocketFrame | Test.java:3844:10:3844:31 | retainedDuplicate(...) : BinaryWebSocketFrame | provenance | MaD:141 |
 | Test.java:3844:10:3844:31 | retainedDuplicate(...) : BinaryWebSocketFrame | Test.java:3845:9:3845:11 | out | provenance |  |
 | Test.java:3850:23:3850:45 | (...)... : ByteBufHolder | Test.java:3851:10:3851:11 | in : ByteBufHolder | provenance |  |
 | Test.java:3850:38:3850:45 | source(...) : Object | Test.java:3850:23:3850:45 | (...)... : ByteBufHolder | provenance |  |
-| Test.java:3851:10:3851:11 | in : ByteBufHolder | Test.java:3851:10:3851:31 | retainedDuplicate(...) : ByteBufHolder | provenance | MaD:87 |
+| Test.java:3851:10:3851:11 | in : ByteBufHolder | Test.java:3851:10:3851:31 | retainedDuplicate(...) : ByteBufHolder | provenance | MaD:141 |
 | Test.java:3851:10:3851:31 | retainedDuplicate(...) : ByteBufHolder | Test.java:3852:9:3852:11 | out | provenance |  |
 | Test.java:3857:30:3857:59 | (...)... : DefaultByteBufHolder | Test.java:3858:10:3858:11 | in : DefaultByteBufHolder | provenance |  |
 | Test.java:3857:52:3857:59 | source(...) : Object | Test.java:3857:30:3857:59 | (...)... : DefaultByteBufHolder | provenance |  |
-| Test.java:3858:10:3858:11 | in : DefaultByteBufHolder | Test.java:3858:10:3858:31 | retainedDuplicate(...) : ByteBufHolder | provenance | MaD:87 |
+| Test.java:3858:10:3858:11 | in : DefaultByteBufHolder | Test.java:3858:10:3858:31 | retainedDuplicate(...) : ByteBufHolder | provenance | MaD:141 |
 | Test.java:3858:10:3858:31 | retainedDuplicate(...) : ByteBufHolder | Test.java:3859:9:3859:11 | out | provenance |  |
 | Test.java:3864:29:3864:57 | (...)... : CloseWebSocketFrame | Test.java:3865:10:3865:11 | in : CloseWebSocketFrame | provenance |  |
 | Test.java:3864:50:3864:57 | source(...) : Object | Test.java:3864:29:3864:57 | (...)... : CloseWebSocketFrame | provenance |  |
-| Test.java:3865:10:3865:11 | in : CloseWebSocketFrame | Test.java:3865:10:3865:31 | retainedDuplicate(...) : CloseWebSocketFrame | provenance | MaD:87 |
+| Test.java:3865:10:3865:11 | in : CloseWebSocketFrame | Test.java:3865:10:3865:31 | retainedDuplicate(...) : CloseWebSocketFrame | provenance | MaD:141 |
 | Test.java:3865:10:3865:31 | retainedDuplicate(...) : CloseWebSocketFrame | Test.java:3866:9:3866:11 | out | provenance |  |
 | Test.java:3871:36:3871:71 | (...)... : ContinuationWebSocketFrame | Test.java:3872:10:3872:11 | in : ContinuationWebSocketFrame | provenance |  |
 | Test.java:3871:64:3871:71 | source(...) : Object | Test.java:3871:36:3871:71 | (...)... : ContinuationWebSocketFrame | provenance |  |
-| Test.java:3872:10:3872:11 | in : ContinuationWebSocketFrame | Test.java:3872:10:3872:31 | retainedDuplicate(...) : ContinuationWebSocketFrame | provenance | MaD:87 |
+| Test.java:3872:10:3872:11 | in : ContinuationWebSocketFrame | Test.java:3872:10:3872:31 | retainedDuplicate(...) : ContinuationWebSocketFrame | provenance | MaD:141 |
 | Test.java:3872:10:3872:31 | retainedDuplicate(...) : ContinuationWebSocketFrame | Test.java:3873:9:3873:11 | out | provenance |  |
 | Test.java:3878:20:3878:39 | (...)... : FileUpload | Test.java:3879:10:3879:11 | in : FileUpload | provenance |  |
 | Test.java:3878:32:3878:39 | source(...) : Object | Test.java:3878:20:3878:39 | (...)... : FileUpload | provenance |  |
-| Test.java:3879:10:3879:11 | in : FileUpload | Test.java:3879:10:3879:31 | retainedDuplicate(...) : FileUpload | provenance | MaD:87 |
+| Test.java:3879:10:3879:11 | in : FileUpload | Test.java:3879:10:3879:31 | retainedDuplicate(...) : FileUpload | provenance | MaD:141 |
 | Test.java:3879:10:3879:31 | retainedDuplicate(...) : FileUpload | Test.java:3880:9:3880:11 | out | provenance |  |
 | Test.java:3885:25:3885:49 | (...)... : FullHttpMessage | Test.java:3886:10:3886:11 | in : FullHttpMessage | provenance |  |
 | Test.java:3885:42:3885:49 | source(...) : Object | Test.java:3885:25:3885:49 | (...)... : FullHttpMessage | provenance |  |
-| Test.java:3886:10:3886:11 | in : FullHttpMessage | Test.java:3886:10:3886:31 | retainedDuplicate(...) : FullHttpMessage | provenance | MaD:87 |
+| Test.java:3886:10:3886:11 | in : FullHttpMessage | Test.java:3886:10:3886:31 | retainedDuplicate(...) : FullHttpMessage | provenance | MaD:141 |
 | Test.java:3886:10:3886:31 | retainedDuplicate(...) : FullHttpMessage | Test.java:3887:9:3887:11 | out | provenance |  |
 | Test.java:3892:25:3892:49 | (...)... : FullHttpRequest | Test.java:3893:10:3893:11 | in : FullHttpRequest | provenance |  |
 | Test.java:3892:42:3892:49 | source(...) : Object | Test.java:3892:25:3892:49 | (...)... : FullHttpRequest | provenance |  |
-| Test.java:3893:10:3893:11 | in : FullHttpRequest | Test.java:3893:10:3893:31 | retainedDuplicate(...) : FullHttpRequest | provenance | MaD:87 |
+| Test.java:3893:10:3893:11 | in : FullHttpRequest | Test.java:3893:10:3893:31 | retainedDuplicate(...) : FullHttpRequest | provenance | MaD:141 |
 | Test.java:3893:10:3893:31 | retainedDuplicate(...) : FullHttpRequest | Test.java:3894:9:3894:11 | out | provenance |  |
 | Test.java:3899:26:3899:51 | (...)... : FullHttpResponse | Test.java:3900:10:3900:11 | in : FullHttpResponse | provenance |  |
 | Test.java:3899:44:3899:51 | source(...) : Object | Test.java:3899:26:3899:51 | (...)... : FullHttpResponse | provenance |  |
-| Test.java:3900:10:3900:11 | in : FullHttpResponse | Test.java:3900:10:3900:31 | retainedDuplicate(...) : FullHttpResponse | provenance | MaD:87 |
+| Test.java:3900:10:3900:11 | in : FullHttpResponse | Test.java:3900:10:3900:31 | retainedDuplicate(...) : FullHttpResponse | provenance | MaD:141 |
 | Test.java:3900:10:3900:31 | retainedDuplicate(...) : FullHttpResponse | Test.java:3901:9:3901:11 | out | provenance |  |
 | Test.java:3906:21:3906:41 | (...)... : HttpContent | Test.java:3907:10:3907:11 | in : HttpContent | provenance |  |
 | Test.java:3906:34:3906:41 | source(...) : Object | Test.java:3906:21:3906:41 | (...)... : HttpContent | provenance |  |
-| Test.java:3907:10:3907:11 | in : HttpContent | Test.java:3907:10:3907:31 | retainedDuplicate(...) : HttpContent | provenance | MaD:87 |
+| Test.java:3907:10:3907:11 | in : HttpContent | Test.java:3907:10:3907:31 | retainedDuplicate(...) : HttpContent | provenance | MaD:141 |
 | Test.java:3907:10:3907:31 | retainedDuplicate(...) : HttpContent | Test.java:3908:9:3908:11 | out | provenance |  |
 | Test.java:3913:18:3913:35 | (...)... : HttpData | Test.java:3914:10:3914:11 | in : HttpData | provenance |  |
 | Test.java:3913:28:3913:35 | source(...) : Object | Test.java:3913:18:3913:35 | (...)... : HttpData | provenance |  |
-| Test.java:3914:10:3914:11 | in : HttpData | Test.java:3914:10:3914:31 | retainedDuplicate(...) : HttpData | provenance | MaD:87 |
+| Test.java:3914:10:3914:11 | in : HttpData | Test.java:3914:10:3914:31 | retainedDuplicate(...) : HttpData | provenance | MaD:141 |
 | Test.java:3914:10:3914:31 | retainedDuplicate(...) : HttpData | Test.java:3915:9:3915:11 | out | provenance |  |
 | Test.java:3920:25:3920:49 | (...)... : LastHttpContent | Test.java:3921:10:3921:11 | in : LastHttpContent | provenance |  |
 | Test.java:3920:42:3920:49 | source(...) : Object | Test.java:3920:25:3920:49 | (...)... : LastHttpContent | provenance |  |
-| Test.java:3921:10:3921:11 | in : LastHttpContent | Test.java:3921:10:3921:31 | retainedDuplicate(...) : LastHttpContent | provenance | MaD:87 |
+| Test.java:3921:10:3921:11 | in : LastHttpContent | Test.java:3921:10:3921:31 | retainedDuplicate(...) : LastHttpContent | provenance | MaD:141 |
 | Test.java:3921:10:3921:31 | retainedDuplicate(...) : LastHttpContent | Test.java:3922:9:3922:11 | out | provenance |  |
 | Test.java:3927:28:3927:55 | (...)... : PingWebSocketFrame | Test.java:3928:10:3928:11 | in : PingWebSocketFrame | provenance |  |
 | Test.java:3927:48:3927:55 | source(...) : Object | Test.java:3927:28:3927:55 | (...)... : PingWebSocketFrame | provenance |  |
-| Test.java:3928:10:3928:11 | in : PingWebSocketFrame | Test.java:3928:10:3928:31 | retainedDuplicate(...) : PingWebSocketFrame | provenance | MaD:87 |
+| Test.java:3928:10:3928:11 | in : PingWebSocketFrame | Test.java:3928:10:3928:31 | retainedDuplicate(...) : PingWebSocketFrame | provenance | MaD:141 |
 | Test.java:3928:10:3928:31 | retainedDuplicate(...) : PingWebSocketFrame | Test.java:3929:9:3929:11 | out | provenance |  |
 | Test.java:3934:28:3934:55 | (...)... : PongWebSocketFrame | Test.java:3935:10:3935:11 | in : PongWebSocketFrame | provenance |  |
 | Test.java:3934:48:3934:55 | source(...) : Object | Test.java:3934:28:3934:55 | (...)... : PongWebSocketFrame | provenance |  |
-| Test.java:3935:10:3935:11 | in : PongWebSocketFrame | Test.java:3935:10:3935:31 | retainedDuplicate(...) : PongWebSocketFrame | provenance | MaD:87 |
+| Test.java:3935:10:3935:11 | in : PongWebSocketFrame | Test.java:3935:10:3935:31 | retainedDuplicate(...) : PongWebSocketFrame | provenance | MaD:141 |
 | Test.java:3935:10:3935:31 | retainedDuplicate(...) : PongWebSocketFrame | Test.java:3936:9:3936:11 | out | provenance |  |
 | Test.java:3941:28:3941:55 | (...)... : TextWebSocketFrame | Test.java:3942:10:3942:11 | in : TextWebSocketFrame | provenance |  |
 | Test.java:3941:48:3941:55 | source(...) : Object | Test.java:3941:28:3941:55 | (...)... : TextWebSocketFrame | provenance |  |
-| Test.java:3942:10:3942:11 | in : TextWebSocketFrame | Test.java:3942:10:3942:31 | retainedDuplicate(...) : TextWebSocketFrame | provenance | MaD:87 |
+| Test.java:3942:10:3942:11 | in : TextWebSocketFrame | Test.java:3942:10:3942:31 | retainedDuplicate(...) : TextWebSocketFrame | provenance | MaD:141 |
 | Test.java:3942:10:3942:31 | retainedDuplicate(...) : TextWebSocketFrame | Test.java:3943:9:3943:11 | out | provenance |  |
 | Test.java:3948:24:3948:47 | (...)... : WebSocketFrame | Test.java:3949:10:3949:11 | in : WebSocketFrame | provenance |  |
 | Test.java:3948:40:3948:47 | source(...) : Object | Test.java:3948:24:3948:47 | (...)... : WebSocketFrame | provenance |  |
-| Test.java:3949:10:3949:11 | in : WebSocketFrame | Test.java:3949:10:3949:31 | retainedDuplicate(...) : WebSocketFrame | provenance | MaD:87 |
+| Test.java:3949:10:3949:11 | in : WebSocketFrame | Test.java:3949:10:3949:31 | retainedDuplicate(...) : WebSocketFrame | provenance | MaD:141 |
 | Test.java:3949:10:3949:31 | retainedDuplicate(...) : WebSocketFrame | Test.java:3950:9:3950:11 | out | provenance |  |
 | Test.java:3955:17:3955:33 | (...)... : ByteBuf | Test.java:3956:33:3956:34 | in : ByteBuf | provenance |  |
 | Test.java:3955:26:3955:33 | source(...) : Object | Test.java:3955:17:3955:33 | (...)... : ByteBuf | provenance |  |
 | Test.java:3956:10:3956:35 | new ByteBufInputStream(...) : ByteBufInputStream | Test.java:3957:9:3957:11 | out | provenance |  |
-| Test.java:3956:33:3956:34 | in : ByteBuf | Test.java:3956:10:3956:35 | new ByteBufInputStream(...) : ByteBufInputStream | provenance | MaD:205 |
+| Test.java:3956:33:3956:34 | in : ByteBuf | Test.java:3956:10:3956:35 | new ByteBufInputStream(...) : ByteBufInputStream | provenance | MaD:142 |
 | Test.java:3962:17:3962:33 | (...)... : ByteBuf | Test.java:3963:33:3963:34 | in : ByteBuf | provenance |  |
 | Test.java:3962:26:3962:33 | source(...) : Object | Test.java:3962:17:3962:33 | (...)... : ByteBuf | provenance |  |
 | Test.java:3963:10:3963:38 | new ByteBufInputStream(...) : ByteBufInputStream | Test.java:3964:9:3964:11 | out | provenance |  |
-| Test.java:3963:33:3963:34 | in : ByteBuf | Test.java:3963:10:3963:38 | new ByteBufInputStream(...) : ByteBufInputStream | provenance | MaD:205 |
+| Test.java:3963:33:3963:34 | in : ByteBuf | Test.java:3963:10:3963:38 | new ByteBufInputStream(...) : ByteBufInputStream | provenance | MaD:142 |
 | Test.java:3969:17:3969:33 | (...)... : ByteBuf | Test.java:3970:33:3970:34 | in : ByteBuf | provenance |  |
 | Test.java:3969:26:3969:33 | source(...) : Object | Test.java:3969:17:3969:33 | (...)... : ByteBuf | provenance |  |
 | Test.java:3970:10:3970:45 | new ByteBufInputStream(...) : ByteBufInputStream | Test.java:3971:9:3971:11 | out | provenance |  |
-| Test.java:3970:33:3970:34 | in : ByteBuf | Test.java:3970:10:3970:45 | new ByteBufInputStream(...) : ByteBufInputStream | provenance | MaD:205 |
+| Test.java:3970:33:3970:34 | in : ByteBuf | Test.java:3970:10:3970:45 | new ByteBufInputStream(...) : ByteBufInputStream | provenance | MaD:142 |
 | Test.java:3976:17:3976:33 | (...)... : ByteBuf | Test.java:3977:33:3977:34 | in : ByteBuf | provenance |  |
 | Test.java:3976:26:3976:33 | source(...) : Object | Test.java:3976:17:3976:33 | (...)... : ByteBuf | provenance |  |
 | Test.java:3977:10:3977:42 | new ByteBufInputStream(...) : ByteBufInputStream | Test.java:3978:9:3978:11 | out | provenance |  |
-| Test.java:3977:33:3977:34 | in : ByteBuf | Test.java:3977:10:3977:42 | new ByteBufInputStream(...) : ByteBufInputStream | provenance | MaD:205 |
+| Test.java:3977:33:3977:34 | in : ByteBuf | Test.java:3977:10:3977:42 | new ByteBufInputStream(...) : ByteBufInputStream | provenance | MaD:142 |
 | Test.java:3983:17:3983:33 | (...)... : ByteBuf | Test.java:3984:34:3984:35 | in : ByteBuf | provenance |  |
 | Test.java:3983:26:3983:33 | source(...) : Object | Test.java:3983:17:3983:33 | (...)... : ByteBuf | provenance |  |
 | Test.java:3984:10:3984:36 | new ByteBufOutputStream(...) : ByteBufOutputStream | Test.java:3985:9:3985:11 | out | provenance |  |
-| Test.java:3984:34:3984:35 | in : ByteBuf | Test.java:3984:10:3984:36 | new ByteBufOutputStream(...) : ByteBufOutputStream | provenance | MaD:206 |
+| Test.java:3984:34:3984:35 | in : ByteBuf | Test.java:3984:10:3984:36 | new ByteBufOutputStream(...) : ByteBufOutputStream | provenance | MaD:143 |
 | Test.java:3990:29:3990:57 | (...)... : ByteBufOutputStream | Test.java:3991:10:3991:11 | in : ByteBufOutputStream | provenance |  |
 | Test.java:3990:50:3990:57 | source(...) : Object | Test.java:3990:29:3990:57 | (...)... : ByteBufOutputStream | provenance |  |
-| Test.java:3991:10:3991:11 | in : ByteBufOutputStream | Test.java:3991:10:3991:20 | buffer(...) : ByteBuf | provenance | MaD:207 |
+| Test.java:3991:10:3991:11 | in : ByteBufOutputStream | Test.java:3991:10:3991:20 | buffer(...) : ByteBuf | provenance | MaD:144 |
 | Test.java:3991:10:3991:20 | buffer(...) : ByteBuf | Test.java:3992:9:3992:11 | out | provenance |  |
 | Test.java:3997:21:3997:41 | (...)... : AsciiString | Test.java:3998:21:3998:22 | in : AsciiString | provenance |  |
 | Test.java:3997:34:3997:41 | source(...) : Object | Test.java:3997:21:3997:41 | (...)... : AsciiString | provenance |  |
-| Test.java:3998:21:3998:22 | in : AsciiString | Test.java:3998:25:3998:27 | out [post update] : ByteBuf | provenance | MaD:183 |
+| Test.java:3998:21:3998:22 | in : AsciiString | Test.java:3998:25:3998:27 | out [post update] : ByteBuf | provenance | MaD:145 |
 | Test.java:3998:25:3998:27 | out [post update] : ByteBuf | Test.java:3999:9:3999:11 | out | provenance |  |
 | Test.java:4004:21:4004:41 | (...)... : AsciiString | Test.java:4005:21:4005:22 | in : AsciiString | provenance |  |
 | Test.java:4004:34:4004:41 | source(...) : Object | Test.java:4004:21:4004:41 | (...)... : AsciiString | provenance |  |
-| Test.java:4005:21:4005:22 | in : AsciiString | Test.java:4005:28:4005:30 | out [post update] : ByteBuf | provenance | MaD:184 |
+| Test.java:4005:21:4005:22 | in : AsciiString | Test.java:4005:28:4005:30 | out [post update] : ByteBuf | provenance | MaD:146 |
 | Test.java:4005:28:4005:30 | out [post update] : ByteBuf | Test.java:4006:9:4006:11 | out | provenance |  |
 | Test.java:4011:21:4011:41 | (...)... : AsciiString | Test.java:4012:21:4012:22 | in : AsciiString | provenance |  |
 | Test.java:4011:34:4011:41 | source(...) : Object | Test.java:4011:21:4011:41 | (...)... : AsciiString | provenance |  |
-| Test.java:4012:21:4012:22 | in : AsciiString | Test.java:4012:28:4012:30 | out [post update] : ByteBuf | provenance | MaD:185 |
+| Test.java:4012:21:4012:22 | in : AsciiString | Test.java:4012:28:4012:30 | out [post update] : ByteBuf | provenance | MaD:147 |
 | Test.java:4012:28:4012:30 | out [post update] : ByteBuf | Test.java:4013:9:4013:11 | out | provenance |  |
 | Test.java:4018:22:4018:43 | (...)... : CharSequence | Test.java:4019:36:4019:37 | in : CharSequence | provenance |  |
 | Test.java:4018:36:4018:43 | source(...) : Object | Test.java:4018:22:4018:43 | (...)... : CharSequence | provenance |  |
 | Test.java:4019:10:4019:38 | decodeHexDump(...) : byte[] | Test.java:4020:9:4020:11 | out | provenance |  |
-| Test.java:4019:36:4019:37 | in : CharSequence | Test.java:4019:10:4019:38 | decodeHexDump(...) : byte[] | provenance | MaD:186 |
+| Test.java:4019:36:4019:37 | in : CharSequence | Test.java:4019:10:4019:38 | decodeHexDump(...) : byte[] | provenance | MaD:148 |
 | Test.java:4025:22:4025:43 | (...)... : CharSequence | Test.java:4026:36:4026:37 | in : CharSequence | provenance |  |
 | Test.java:4025:36:4025:43 | source(...) : Object | Test.java:4025:22:4025:43 | (...)... : CharSequence | provenance |  |
 | Test.java:4026:10:4026:44 | decodeHexDump(...) : byte[] | Test.java:4027:9:4027:11 | out | provenance |  |
-| Test.java:4026:36:4026:37 | in : CharSequence | Test.java:4026:10:4026:44 | decodeHexDump(...) : byte[] | provenance | MaD:187 |
+| Test.java:4026:36:4026:37 | in : CharSequence | Test.java:4026:10:4026:44 | decodeHexDump(...) : byte[] | provenance | MaD:149 |
 | Test.java:4032:20:4032:39 | (...)... : CharBuffer | Test.java:4033:41:4033:42 | in : CharBuffer | provenance |  |
 | Test.java:4032:32:4032:39 | source(...) : Object | Test.java:4032:20:4032:39 | (...)... : CharBuffer | provenance |  |
 | Test.java:4033:10:4033:49 | encodeString(...) : ByteBuf | Test.java:4034:9:4034:11 | out | provenance |  |
-| Test.java:4033:41:4033:42 | in : CharBuffer | Test.java:4033:10:4033:49 | encodeString(...) : ByteBuf | provenance | MaD:188 |
+| Test.java:4033:41:4033:42 | in : CharBuffer | Test.java:4033:10:4033:49 | encodeString(...) : ByteBuf | provenance | MaD:150 |
 | Test.java:4039:20:4039:39 | (...)... : CharBuffer | Test.java:4040:41:4040:42 | in : CharBuffer | provenance |  |
 | Test.java:4039:32:4039:39 | source(...) : Object | Test.java:4039:20:4039:39 | (...)... : CharBuffer | provenance |  |
 | Test.java:4040:10:4040:52 | encodeString(...) : ByteBuf | Test.java:4041:9:4041:11 | out | provenance |  |
-| Test.java:4040:41:4040:42 | in : CharBuffer | Test.java:4040:10:4040:52 | encodeString(...) : ByteBuf | provenance | MaD:189 |
+| Test.java:4040:41:4040:42 | in : CharBuffer | Test.java:4040:10:4040:52 | encodeString(...) : ByteBuf | provenance | MaD:151 |
 | Test.java:4046:17:4046:33 | (...)... : ByteBuf | Test.java:4047:39:4047:40 | in : ByteBuf | provenance |  |
 | Test.java:4046:26:4046:33 | source(...) : Object | Test.java:4046:17:4046:33 | (...)... : ByteBuf | provenance |  |
 | Test.java:4047:10:4047:41 | ensureAccessible(...) : ByteBuf | Test.java:4048:9:4048:11 | out | provenance |  |
-| Test.java:4047:39:4047:40 | in : ByteBuf | Test.java:4047:10:4047:41 | ensureAccessible(...) : ByteBuf | provenance | MaD:190 |
+| Test.java:4047:39:4047:40 | in : ByteBuf | Test.java:4047:10:4047:41 | ensureAccessible(...) : ByteBuf | provenance | MaD:152 |
 | Test.java:4053:17:4053:33 | (...)... : ByteBuf | Test.java:4054:31:4054:32 | in : ByteBuf | provenance |  |
 | Test.java:4053:26:4053:33 | source(...) : Object | Test.java:4053:17:4053:33 | (...)... : ByteBuf | provenance |  |
 | Test.java:4054:10:4054:33 | getBytes(...) : byte[] | Test.java:4055:9:4055:11 | out | provenance |  |
-| Test.java:4054:31:4054:32 | in : ByteBuf | Test.java:4054:10:4054:33 | getBytes(...) : byte[] | provenance | MaD:191 |
+| Test.java:4054:31:4054:32 | in : ByteBuf | Test.java:4054:10:4054:33 | getBytes(...) : byte[] | provenance | MaD:153 |
 | Test.java:4060:17:4060:33 | (...)... : ByteBuf | Test.java:4061:31:4061:32 | in : ByteBuf | provenance |  |
 | Test.java:4060:26:4060:33 | source(...) : Object | Test.java:4060:17:4060:33 | (...)... : ByteBuf | provenance |  |
 | Test.java:4061:10:4061:39 | getBytes(...) : byte[] | Test.java:4062:9:4062:11 | out | provenance |  |
-| Test.java:4061:31:4061:32 | in : ByteBuf | Test.java:4061:10:4061:39 | getBytes(...) : byte[] | provenance | MaD:192 |
+| Test.java:4061:31:4061:32 | in : ByteBuf | Test.java:4061:10:4061:39 | getBytes(...) : byte[] | provenance | MaD:154 |
 | Test.java:4067:17:4067:33 | (...)... : ByteBuf | Test.java:4068:31:4068:32 | in : ByteBuf | provenance |  |
 | Test.java:4067:26:4067:33 | source(...) : Object | Test.java:4067:17:4067:33 | (...)... : ByteBuf | provenance |  |
 | Test.java:4068:10:4068:46 | getBytes(...) : byte[] | Test.java:4069:9:4069:11 | out | provenance |  |
-| Test.java:4068:31:4068:32 | in : ByteBuf | Test.java:4068:10:4068:46 | getBytes(...) : byte[] | provenance | MaD:193 |
+| Test.java:4068:31:4068:32 | in : ByteBuf | Test.java:4068:10:4068:46 | getBytes(...) : byte[] | provenance | MaD:155 |
 | Test.java:4074:17:4074:33 | (...)... : ByteBuf | Test.java:4075:38:4075:39 | in : ByteBuf | provenance |  |
 | Test.java:4074:26:4074:33 | source(...) : Object | Test.java:4074:17:4074:33 | (...)... : ByteBuf | provenance |  |
 | Test.java:4075:10:4075:43 | readBytes(...) : ByteBuf | Test.java:4076:9:4076:11 | out | provenance |  |
-| Test.java:4075:38:4075:39 | in : ByteBuf | Test.java:4075:10:4075:43 | readBytes(...) : ByteBuf | provenance | MaD:194 |
+| Test.java:4075:38:4075:39 | in : ByteBuf | Test.java:4075:10:4075:43 | readBytes(...) : ByteBuf | provenance | MaD:156 |
 | Test.java:4081:22:4081:43 | (...)... : CharSequence | Test.java:4082:41:4082:42 | in : CharSequence | provenance |  |
 | Test.java:4081:36:4081:43 | source(...) : Object | Test.java:4081:22:4081:43 | (...)... : CharSequence | provenance |  |
 | Test.java:4082:36:4082:38 | out [post update] : ByteBuf | Test.java:4083:9:4083:11 | out | provenance |  |
-| Test.java:4082:41:4082:42 | in : CharSequence | Test.java:4082:36:4082:38 | out [post update] : ByteBuf | provenance | MaD:195 |
+| Test.java:4082:41:4082:42 | in : CharSequence | Test.java:4082:36:4082:38 | out [post update] : ByteBuf | provenance | MaD:157 |
 | Test.java:4088:22:4088:43 | (...)... : CharSequence | Test.java:4089:41:4089:42 | in : CharSequence | provenance |  |
 | Test.java:4088:36:4088:43 | source(...) : Object | Test.java:4088:22:4088:43 | (...)... : CharSequence | provenance |  |
 | Test.java:4089:36:4089:38 | out [post update] : ByteBuf | Test.java:4090:9:4090:11 | out | provenance |  |
-| Test.java:4089:41:4089:42 | in : CharSequence | Test.java:4089:36:4089:38 | out [post update] : ByteBuf | provenance | MaD:196 |
+| Test.java:4089:41:4089:42 | in : CharSequence | Test.java:4089:36:4089:38 | out [post update] : ByteBuf | provenance | MaD:158 |
 | Test.java:4095:17:4095:33 | (...)... : ByteBuf | Test.java:4096:33:4096:34 | in : ByteBuf | provenance |  |
 | Test.java:4095:26:4095:33 | source(...) : Object | Test.java:4095:17:4095:33 | (...)... : ByteBuf | provenance |  |
 | Test.java:4096:10:4096:41 | setShortBE(...) : ByteBuf | Test.java:4097:9:4097:11 | out | provenance |  |
-| Test.java:4096:33:4096:34 | in : ByteBuf | Test.java:4096:10:4096:41 | setShortBE(...) : ByteBuf | provenance | MaD:197 |
+| Test.java:4096:33:4096:34 | in : ByteBuf | Test.java:4096:10:4096:41 | setShortBE(...) : ByteBuf | provenance | MaD:159 |
 | Test.java:4102:22:4102:43 | (...)... : CharSequence | Test.java:4103:32:4103:33 | in : CharSequence | provenance |  |
 | Test.java:4102:36:4102:43 | source(...) : Object | Test.java:4102:22:4102:43 | (...)... : CharSequence | provenance |  |
 | Test.java:4103:27:4103:29 | out [post update] : ByteBuf | Test.java:4104:9:4104:11 | out | provenance |  |
-| Test.java:4103:32:4103:33 | in : CharSequence | Test.java:4103:27:4103:29 | out [post update] : ByteBuf | provenance | MaD:198 |
+| Test.java:4103:32:4103:33 | in : CharSequence | Test.java:4103:27:4103:29 | out [post update] : ByteBuf | provenance | MaD:160 |
 | Test.java:4109:22:4109:43 | (...)... : CharSequence | Test.java:4110:57:4110:58 | in : CharSequence | provenance |  |
 | Test.java:4109:36:4109:43 | source(...) : Object | Test.java:4109:22:4109:43 | (...)... : CharSequence | provenance |  |
 | Test.java:4110:10:4110:59 | writeAscii(...) : ByteBuf | Test.java:4111:9:4111:11 | out | provenance |  |
-| Test.java:4110:57:4110:58 | in : CharSequence | Test.java:4110:10:4110:59 | writeAscii(...) : ByteBuf | provenance | MaD:199 |
+| Test.java:4110:57:4110:58 | in : CharSequence | Test.java:4110:10:4110:59 | writeAscii(...) : ByteBuf | provenance | MaD:161 |
 | Test.java:4116:17:4116:33 | (...)... : ByteBuf | Test.java:4117:36:4117:37 | in : ByteBuf | provenance |  |
 | Test.java:4116:26:4116:33 | source(...) : Object | Test.java:4116:17:4116:33 | (...)... : ByteBuf | provenance |  |
 | Test.java:4117:10:4117:41 | writeMediumBE(...) : ByteBuf | Test.java:4118:9:4118:11 | out | provenance |  |
-| Test.java:4117:36:4117:37 | in : ByteBuf | Test.java:4117:10:4117:41 | writeMediumBE(...) : ByteBuf | provenance | MaD:201 |
+| Test.java:4117:36:4117:37 | in : ByteBuf | Test.java:4117:10:4117:41 | writeMediumBE(...) : ByteBuf | provenance | MaD:162 |
 | Test.java:4123:17:4123:33 | (...)... : ByteBuf | Test.java:4124:35:4124:36 | in : ByteBuf | provenance |  |
 | Test.java:4123:26:4123:33 | source(...) : Object | Test.java:4123:17:4123:33 | (...)... : ByteBuf | provenance |  |
 | Test.java:4124:10:4124:40 | writeShortBE(...) : ByteBuf | Test.java:4125:9:4125:11 | out | provenance |  |
-| Test.java:4124:35:4124:36 | in : ByteBuf | Test.java:4124:10:4124:40 | writeShortBE(...) : ByteBuf | provenance | MaD:200 |
+| Test.java:4124:35:4124:36 | in : ByteBuf | Test.java:4124:10:4124:40 | writeShortBE(...) : ByteBuf | provenance | MaD:163 |
 | Test.java:4130:22:4130:43 | (...)... : CharSequence | Test.java:4131:31:4131:32 | in : CharSequence | provenance |  |
 | Test.java:4130:36:4130:43 | source(...) : Object | Test.java:4130:22:4130:43 | (...)... : CharSequence | provenance |  |
 | Test.java:4131:26:4131:28 | out [post update] : ByteBuf | Test.java:4132:9:4132:11 | out | provenance |  |
-| Test.java:4131:31:4131:32 | in : CharSequence | Test.java:4131:26:4131:28 | out [post update] : ByteBuf | provenance | MaD:202 |
+| Test.java:4131:31:4131:32 | in : CharSequence | Test.java:4131:26:4131:28 | out [post update] : ByteBuf | provenance | MaD:164 |
 | Test.java:4137:22:4137:43 | (...)... : CharSequence | Test.java:4138:31:4138:32 | in : CharSequence | provenance |  |
 | Test.java:4137:36:4137:43 | source(...) : Object | Test.java:4137:22:4137:43 | (...)... : CharSequence | provenance |  |
 | Test.java:4138:26:4138:28 | out [post update] : ByteBuf | Test.java:4139:9:4139:11 | out | provenance |  |
-| Test.java:4138:31:4138:32 | in : CharSequence | Test.java:4138:26:4138:28 | out [post update] : ByteBuf | provenance | MaD:203 |
+| Test.java:4138:31:4138:32 | in : CharSequence | Test.java:4138:26:4138:28 | out [post update] : ByteBuf | provenance | MaD:165 |
 | Test.java:4144:22:4144:43 | (...)... : CharSequence | Test.java:4145:56:4145:57 | in : CharSequence | provenance |  |
 | Test.java:4144:36:4144:43 | source(...) : Object | Test.java:4144:22:4144:43 | (...)... : CharSequence | provenance |  |
 | Test.java:4145:10:4145:58 | writeUtf8(...) : ByteBuf | Test.java:4146:9:4146:11 | out | provenance |  |
-| Test.java:4145:56:4145:57 | in : CharSequence | Test.java:4145:10:4145:58 | writeUtf8(...) : ByteBuf | provenance | MaD:204 |
+| Test.java:4145:56:4145:57 | in : CharSequence | Test.java:4145:10:4145:58 | writeUtf8(...) : ByteBuf | provenance | MaD:166 |
 | Test.java:4151:19:4151:61 | (...)... : ByteBuf[] [[]] : ByteBuf | Test.java:4152:65:4152:66 | in : ByteBuf[] [[]] : ByteBuf | provenance |  |
 | Test.java:4151:30:4151:61 | {...} : ByteBuf[] [[]] : ByteBuf | Test.java:4151:19:4151:61 | (...)... : ByteBuf[] [[]] : ByteBuf | provenance |  |
 | Test.java:4151:44:4151:60 | (...)... : ByteBuf | Test.java:4151:30:4151:61 | {...} : ByteBuf[] [[]] : ByteBuf | provenance |  |
 | Test.java:4151:53:4151:60 | source(...) : Object | Test.java:4151:44:4151:60 | (...)... : ByteBuf | provenance |  |
 | Test.java:4152:10:4152:67 | new CompositeByteBuf(...) : CompositeByteBuf | Test.java:4153:9:4153:11 | out | provenance |  |
-| Test.java:4152:65:4152:66 | in : ByteBuf[] [[]] : ByteBuf | Test.java:4152:10:4152:67 | new CompositeByteBuf(...) : CompositeByteBuf | provenance | MaD:137 |
+| Test.java:4152:65:4152:66 | in : ByteBuf[] [[]] : ByteBuf | Test.java:4152:10:4152:67 | new CompositeByteBuf(...) : CompositeByteBuf | provenance | MaD:167 |
 | Test.java:4158:18:4158:44 | (...)... : List [<element>] : Object | Test.java:4159:65:4159:66 | in : List [<element>] : Object | provenance |  |
 | Test.java:4158:28:4158:44 | of(...) : List [<element>] : Object | Test.java:4158:18:4158:44 | (...)... : List [<element>] : Object | provenance |  |
-| Test.java:4158:36:4158:43 | source(...) : Object | Test.java:4158:28:4158:44 | of(...) : List [<element>] : Object | provenance | MaD:494 |
+| Test.java:4158:36:4158:43 | source(...) : Object | Test.java:4158:28:4158:44 | of(...) : List [<element>] : Object | provenance | MaD:497 |
 | Test.java:4159:10:4159:67 | new CompositeByteBuf(...) : CompositeByteBuf | Test.java:4160:9:4160:11 | out | provenance |  |
-| Test.java:4159:65:4159:66 | in : List [<element>] : Object | Test.java:4159:10:4159:67 | new CompositeByteBuf(...) : CompositeByteBuf | provenance | MaD:138 |
+| Test.java:4159:65:4159:66 | in : List [<element>] : Object | Test.java:4159:10:4159:67 | new CompositeByteBuf(...) : CompositeByteBuf | provenance | MaD:168 |
 | Test.java:4165:17:4165:33 | (...)... : ByteBuf | Test.java:4166:21:4166:22 | in : ByteBuf | provenance |  |
 | Test.java:4165:26:4165:33 | source(...) : Object | Test.java:4165:17:4165:33 | (...)... : ByteBuf | provenance |  |
 | Test.java:4166:4:4166:6 | out [post update] : CompositeByteBuf | Test.java:4167:9:4167:11 | out | provenance |  |
-| Test.java:4166:21:4166:22 | in : ByteBuf | Test.java:4166:4:4166:6 | out [post update] : CompositeByteBuf | provenance | MaD:139 |
+| Test.java:4166:21:4166:22 | in : ByteBuf | Test.java:4166:4:4166:6 | out [post update] : CompositeByteBuf | provenance | MaD:169 |
 | Test.java:4172:17:4172:33 | (...)... : ByteBuf | Test.java:4173:28:4173:29 | in : ByteBuf | provenance |  |
 | Test.java:4172:26:4172:33 | source(...) : Object | Test.java:4172:17:4172:33 | (...)... : ByteBuf | provenance |  |
 | Test.java:4173:4:4173:6 | out [post update] : CompositeByteBuf | Test.java:4174:9:4174:11 | out | provenance |  |
-| Test.java:4173:28:4173:29 | in : ByteBuf | Test.java:4173:4:4173:6 | out [post update] : CompositeByteBuf | provenance | MaD:141 |
+| Test.java:4173:28:4173:29 | in : ByteBuf | Test.java:4173:4:4173:6 | out [post update] : CompositeByteBuf | provenance | MaD:170 |
 | Test.java:4179:17:4179:33 | (...)... : ByteBuf | Test.java:4180:31:4180:32 | in : ByteBuf | provenance |  |
 | Test.java:4179:26:4179:33 | source(...) : Object | Test.java:4179:17:4179:33 | (...)... : ByteBuf | provenance |  |
 | Test.java:4180:4:4180:6 | out [post update] : CompositeByteBuf | Test.java:4181:9:4181:11 | out | provenance |  |
-| Test.java:4180:31:4180:32 | in : ByteBuf | Test.java:4180:4:4180:6 | out [post update] : CompositeByteBuf | provenance | MaD:142 |
+| Test.java:4180:31:4180:32 | in : ByteBuf | Test.java:4180:4:4180:6 | out [post update] : CompositeByteBuf | provenance | MaD:171 |
 | Test.java:4186:17:4186:33 | (...)... : ByteBuf | Test.java:4187:24:4187:25 | in : ByteBuf | provenance |  |
 | Test.java:4186:26:4186:33 | source(...) : Object | Test.java:4186:17:4186:33 | (...)... : ByteBuf | provenance |  |
 | Test.java:4187:4:4187:6 | out [post update] : CompositeByteBuf | Test.java:4188:9:4188:11 | out | provenance |  |
-| Test.java:4187:24:4187:25 | in : ByteBuf | Test.java:4187:4:4187:6 | out [post update] : CompositeByteBuf | provenance | MaD:140 |
+| Test.java:4187:24:4187:25 | in : ByteBuf | Test.java:4187:4:4187:6 | out [post update] : CompositeByteBuf | provenance | MaD:172 |
 | Test.java:4193:26:4193:51 | (...)... : CompositeByteBuf | Test.java:4194:10:4194:11 | in : CompositeByteBuf | provenance |  |
 | Test.java:4193:44:4193:51 | source(...) : Object | Test.java:4193:26:4193:51 | (...)... : CompositeByteBuf | provenance |  |
-| Test.java:4194:10:4194:11 | in : CompositeByteBuf | Test.java:4194:10:4194:42 | addComponent(...) : CompositeByteBuf | provenance | MaD:150 |
+| Test.java:4194:10:4194:11 | in : CompositeByteBuf | Test.java:4194:10:4194:42 | addComponent(...) : CompositeByteBuf | provenance | MaD:173 |
 | Test.java:4194:10:4194:42 | addComponent(...) : CompositeByteBuf | Test.java:4195:9:4195:11 | out | provenance |  |
 | Test.java:4200:26:4200:51 | (...)... : CompositeByteBuf | Test.java:4201:10:4201:11 | in : CompositeByteBuf | provenance |  |
 | Test.java:4200:44:4200:51 | source(...) : Object | Test.java:4200:26:4200:51 | (...)... : CompositeByteBuf | provenance |  |
-| Test.java:4201:10:4201:11 | in : CompositeByteBuf | Test.java:4201:10:4201:46 | addComponent(...) : CompositeByteBuf | provenance | MaD:150 |
+| Test.java:4201:10:4201:11 | in : CompositeByteBuf | Test.java:4201:10:4201:46 | addComponent(...) : CompositeByteBuf | provenance | MaD:173 |
 | Test.java:4201:10:4201:46 | addComponent(...) : CompositeByteBuf | Test.java:4202:9:4202:11 | out | provenance |  |
 | Test.java:4207:26:4207:51 | (...)... : CompositeByteBuf | Test.java:4208:10:4208:11 | in : CompositeByteBuf | provenance |  |
 | Test.java:4207:44:4207:51 | source(...) : Object | Test.java:4207:26:4207:51 | (...)... : CompositeByteBuf | provenance |  |
-| Test.java:4208:10:4208:11 | in : CompositeByteBuf | Test.java:4208:10:4208:40 | addComponent(...) : CompositeByteBuf | provenance | MaD:150 |
+| Test.java:4208:10:4208:11 | in : CompositeByteBuf | Test.java:4208:10:4208:40 | addComponent(...) : CompositeByteBuf | provenance | MaD:173 |
 | Test.java:4208:10:4208:40 | addComponent(...) : CompositeByteBuf | Test.java:4209:9:4209:11 | out | provenance |  |
 | Test.java:4214:26:4214:51 | (...)... : CompositeByteBuf | Test.java:4215:10:4215:11 | in : CompositeByteBuf | provenance |  |
 | Test.java:4214:44:4214:51 | source(...) : Object | Test.java:4214:26:4214:51 | (...)... : CompositeByteBuf | provenance |  |
-| Test.java:4215:10:4215:11 | in : CompositeByteBuf | Test.java:4215:10:4215:30 | addComponent(...) : CompositeByteBuf | provenance | MaD:150 |
+| Test.java:4215:10:4215:11 | in : CompositeByteBuf | Test.java:4215:10:4215:30 | addComponent(...) : CompositeByteBuf | provenance | MaD:173 |
 | Test.java:4215:10:4215:30 | addComponent(...) : CompositeByteBuf | Test.java:4216:9:4216:11 | out | provenance |  |
 | Test.java:4221:19:4221:61 | (...)... : ByteBuf[] [[]] : ByteBuf | Test.java:4222:22:4222:23 | in : ByteBuf[] [[]] : ByteBuf | provenance |  |
 | Test.java:4221:30:4221:61 | {...} : ByteBuf[] [[]] : ByteBuf | Test.java:4221:19:4221:61 | (...)... : ByteBuf[] [[]] : ByteBuf | provenance |  |
 | Test.java:4221:44:4221:60 | (...)... : ByteBuf | Test.java:4221:30:4221:61 | {...} : ByteBuf[] [[]] : ByteBuf | provenance |  |
 | Test.java:4221:53:4221:60 | source(...) : Object | Test.java:4221:44:4221:60 | (...)... : ByteBuf | provenance |  |
 | Test.java:4222:4:4222:6 | out [post update] : CompositeByteBuf | Test.java:4223:9:4223:11 | out | provenance |  |
-| Test.java:4222:22:4222:23 | in : ByteBuf[] [[]] : ByteBuf | Test.java:4222:4:4222:6 | out [post update] : CompositeByteBuf | provenance | MaD:143 |
+| Test.java:4222:22:4222:23 | in : ByteBuf[] [[]] : ByteBuf | Test.java:4222:4:4222:6 | out [post update] : CompositeByteBuf | provenance | MaD:174 |
 | Test.java:4228:18:4228:44 | (...)... : List [<element>] : Object | Test.java:4229:22:4229:23 | in : List [<element>] : Object | provenance |  |
 | Test.java:4228:28:4228:44 | of(...) : List [<element>] : Object | Test.java:4228:18:4228:44 | (...)... : List [<element>] : Object | provenance |  |
-| Test.java:4228:36:4228:43 | source(...) : Object | Test.java:4228:28:4228:44 | of(...) : List [<element>] : Object | provenance | MaD:494 |
+| Test.java:4228:36:4228:43 | source(...) : Object | Test.java:4228:28:4228:44 | of(...) : List [<element>] : Object | provenance | MaD:497 |
 | Test.java:4229:4:4229:6 | out [post update] : CompositeByteBuf | Test.java:4230:9:4230:11 | out | provenance |  |
-| Test.java:4229:22:4229:23 | in : List [<element>] : Object | Test.java:4229:4:4229:6 | out [post update] : CompositeByteBuf | provenance | MaD:146 |
+| Test.java:4229:22:4229:23 | in : List [<element>] : Object | Test.java:4229:4:4229:6 | out [post update] : CompositeByteBuf | provenance | MaD:175 |
 | Test.java:4235:19:4235:61 | (...)... : ByteBuf[] [[]] : ByteBuf | Test.java:4236:29:4236:30 | in : ByteBuf[] [[]] : ByteBuf | provenance |  |
 | Test.java:4235:30:4235:61 | {...} : ByteBuf[] [[]] : ByteBuf | Test.java:4235:19:4235:61 | (...)... : ByteBuf[] [[]] : ByteBuf | provenance |  |
 | Test.java:4235:44:4235:60 | (...)... : ByteBuf | Test.java:4235:30:4235:61 | {...} : ByteBuf[] [[]] : ByteBuf | provenance |  |
 | Test.java:4235:53:4235:60 | source(...) : Object | Test.java:4235:44:4235:60 | (...)... : ByteBuf | provenance |  |
 | Test.java:4236:4:4236:6 | out [post update] : CompositeByteBuf | Test.java:4237:9:4237:11 | out | provenance |  |
-| Test.java:4236:29:4236:30 | in : ByteBuf[] [[]] : ByteBuf | Test.java:4236:4:4236:6 | out [post update] : CompositeByteBuf | provenance | MaD:145 |
+| Test.java:4236:29:4236:30 | in : ByteBuf[] [[]] : ByteBuf | Test.java:4236:4:4236:6 | out [post update] : CompositeByteBuf | provenance | MaD:176 |
 | Test.java:4242:18:4242:44 | (...)... : List [<element>] : Object | Test.java:4243:29:4243:30 | in : List [<element>] : Object | provenance |  |
 | Test.java:4242:28:4242:44 | of(...) : List [<element>] : Object | Test.java:4242:18:4242:44 | (...)... : List [<element>] : Object | provenance |  |
-| Test.java:4242:36:4242:43 | source(...) : Object | Test.java:4242:28:4242:44 | of(...) : List [<element>] : Object | provenance | MaD:494 |
+| Test.java:4242:36:4242:43 | source(...) : Object | Test.java:4242:28:4242:44 | of(...) : List [<element>] : Object | provenance | MaD:497 |
 | Test.java:4243:4:4243:6 | out [post update] : CompositeByteBuf | Test.java:4244:9:4244:11 | out | provenance |  |
-| Test.java:4243:29:4243:30 | in : List [<element>] : Object | Test.java:4243:4:4243:6 | out [post update] : CompositeByteBuf | provenance | MaD:148 |
+| Test.java:4243:29:4243:30 | in : List [<element>] : Object | Test.java:4243:4:4243:6 | out [post update] : CompositeByteBuf | provenance | MaD:177 |
 | Test.java:4249:19:4249:61 | (...)... : ByteBuf[] [[]] : ByteBuf | Test.java:4250:25:4250:26 | in : ByteBuf[] [[]] : ByteBuf | provenance |  |
 | Test.java:4249:30:4249:61 | {...} : ByteBuf[] [[]] : ByteBuf | Test.java:4249:19:4249:61 | (...)... : ByteBuf[] [[]] : ByteBuf | provenance |  |
 | Test.java:4249:44:4249:60 | (...)... : ByteBuf | Test.java:4249:30:4249:61 | {...} : ByteBuf[] [[]] : ByteBuf | provenance |  |
 | Test.java:4249:53:4249:60 | source(...) : Object | Test.java:4249:44:4249:60 | (...)... : ByteBuf | provenance |  |
 | Test.java:4250:4:4250:6 | out [post update] : CompositeByteBuf | Test.java:4251:9:4251:11 | out | provenance |  |
-| Test.java:4250:25:4250:26 | in : ByteBuf[] [[]] : ByteBuf | Test.java:4250:4:4250:6 | out [post update] : CompositeByteBuf | provenance | MaD:144 |
+| Test.java:4250:25:4250:26 | in : ByteBuf[] [[]] : ByteBuf | Test.java:4250:4:4250:6 | out [post update] : CompositeByteBuf | provenance | MaD:178 |
 | Test.java:4256:18:4256:44 | (...)... : List [<element>] : Object | Test.java:4257:25:4257:26 | in : List [<element>] : Object | provenance |  |
 | Test.java:4256:28:4256:44 | of(...) : List [<element>] : Object | Test.java:4256:18:4256:44 | (...)... : List [<element>] : Object | provenance |  |
-| Test.java:4256:36:4256:43 | source(...) : Object | Test.java:4256:28:4256:44 | of(...) : List [<element>] : Object | provenance | MaD:494 |
+| Test.java:4256:36:4256:43 | source(...) : Object | Test.java:4256:28:4256:44 | of(...) : List [<element>] : Object | provenance | MaD:497 |
 | Test.java:4257:4:4257:6 | out [post update] : CompositeByteBuf | Test.java:4258:9:4258:11 | out | provenance |  |
-| Test.java:4257:25:4257:26 | in : List [<element>] : Object | Test.java:4257:4:4257:6 | out [post update] : CompositeByteBuf | provenance | MaD:147 |
+| Test.java:4257:25:4257:26 | in : List [<element>] : Object | Test.java:4257:4:4257:6 | out [post update] : CompositeByteBuf | provenance | MaD:179 |
 | Test.java:4263:26:4263:51 | (...)... : CompositeByteBuf | Test.java:4264:10:4264:11 | in : CompositeByteBuf | provenance |  |
 | Test.java:4263:44:4263:51 | source(...) : Object | Test.java:4263:26:4263:51 | (...)... : CompositeByteBuf | provenance |  |
-| Test.java:4264:10:4264:11 | in : CompositeByteBuf | Test.java:4264:10:4264:42 | addComponents(...) : CompositeByteBuf | provenance | MaD:151 |
+| Test.java:4264:10:4264:11 | in : CompositeByteBuf | Test.java:4264:10:4264:42 | addComponents(...) : CompositeByteBuf | provenance | MaD:180 |
 | Test.java:4264:10:4264:42 | addComponents(...) : CompositeByteBuf | Test.java:4265:9:4265:11 | out | provenance |  |
 | Test.java:4270:26:4270:51 | (...)... : CompositeByteBuf | Test.java:4271:10:4271:11 | in : CompositeByteBuf | provenance |  |
 | Test.java:4270:44:4270:51 | source(...) : Object | Test.java:4270:26:4270:51 | (...)... : CompositeByteBuf | provenance |  |
-| Test.java:4271:10:4271:11 | in : CompositeByteBuf | Test.java:4271:10:4271:41 | addComponents(...) : CompositeByteBuf | provenance | MaD:151 |
+| Test.java:4271:10:4271:11 | in : CompositeByteBuf | Test.java:4271:10:4271:41 | addComponents(...) : CompositeByteBuf | provenance | MaD:180 |
 | Test.java:4271:10:4271:41 | addComponents(...) : CompositeByteBuf | Test.java:4272:9:4272:11 | out | provenance |  |
 | Test.java:4277:26:4277:51 | (...)... : CompositeByteBuf | Test.java:4278:10:4278:11 | in : CompositeByteBuf | provenance |  |
 | Test.java:4277:44:4277:51 | source(...) : Object | Test.java:4277:26:4277:51 | (...)... : CompositeByteBuf | provenance |  |
-| Test.java:4278:10:4278:11 | in : CompositeByteBuf | Test.java:4278:10:4278:45 | addComponents(...) : CompositeByteBuf | provenance | MaD:151 |
+| Test.java:4278:10:4278:11 | in : CompositeByteBuf | Test.java:4278:10:4278:45 | addComponents(...) : CompositeByteBuf | provenance | MaD:180 |
 | Test.java:4278:10:4278:45 | addComponents(...) : CompositeByteBuf | Test.java:4279:9:4279:11 | out | provenance |  |
 | Test.java:4284:26:4284:51 | (...)... : CompositeByteBuf | Test.java:4285:10:4285:11 | in : CompositeByteBuf | provenance |  |
 | Test.java:4284:44:4284:51 | source(...) : Object | Test.java:4284:26:4284:51 | (...)... : CompositeByteBuf | provenance |  |
-| Test.java:4285:10:4285:11 | in : CompositeByteBuf | Test.java:4285:10:4285:44 | addComponents(...) : CompositeByteBuf | provenance | MaD:151 |
+| Test.java:4285:10:4285:11 | in : CompositeByteBuf | Test.java:4285:10:4285:44 | addComponents(...) : CompositeByteBuf | provenance | MaD:180 |
 | Test.java:4285:10:4285:44 | addComponents(...) : CompositeByteBuf | Test.java:4286:9:4286:11 | out | provenance |  |
 | Test.java:4291:26:4291:51 | (...)... : CompositeByteBuf | Test.java:4292:10:4292:11 | in : CompositeByteBuf | provenance |  |
 | Test.java:4291:44:4291:51 | source(...) : Object | Test.java:4291:26:4291:51 | (...)... : CompositeByteBuf | provenance |  |
-| Test.java:4292:10:4292:11 | in : CompositeByteBuf | Test.java:4292:10:4292:49 | addComponents(...) : CompositeByteBuf | provenance | MaD:151 |
+| Test.java:4292:10:4292:11 | in : CompositeByteBuf | Test.java:4292:10:4292:49 | addComponents(...) : CompositeByteBuf | provenance | MaD:180 |
 | Test.java:4292:10:4292:49 | addComponents(...) : CompositeByteBuf | Test.java:4293:9:4293:11 | out | provenance |  |
 | Test.java:4298:26:4298:51 | (...)... : CompositeByteBuf | Test.java:4299:10:4299:11 | in : CompositeByteBuf | provenance |  |
 | Test.java:4298:44:4298:51 | source(...) : Object | Test.java:4298:26:4298:51 | (...)... : CompositeByteBuf | provenance |  |
-| Test.java:4299:10:4299:11 | in : CompositeByteBuf | Test.java:4299:10:4299:48 | addComponents(...) : CompositeByteBuf | provenance | MaD:151 |
+| Test.java:4299:10:4299:11 | in : CompositeByteBuf | Test.java:4299:10:4299:48 | addComponents(...) : CompositeByteBuf | provenance | MaD:180 |
 | Test.java:4299:10:4299:48 | addComponents(...) : CompositeByteBuf | Test.java:4300:9:4300:11 | out | provenance |  |
 | Test.java:4305:17:4305:33 | (...)... : ByteBuf | Test.java:4306:38:4306:39 | in : ByteBuf | provenance |  |
 | Test.java:4305:26:4305:33 | source(...) : Object | Test.java:4305:17:4305:33 | (...)... : ByteBuf | provenance |  |
 | Test.java:4306:4:4306:6 | out [post update] : CompositeByteBuf | Test.java:4307:9:4307:11 | out | provenance |  |
-| Test.java:4306:38:4306:39 | in : ByteBuf | Test.java:4306:4:4306:6 | out [post update] : CompositeByteBuf | provenance | MaD:149 |
+| Test.java:4306:38:4306:39 | in : ByteBuf | Test.java:4306:4:4306:6 | out [post update] : CompositeByteBuf | provenance | MaD:181 |
 | Test.java:4312:26:4312:51 | (...)... : CompositeByteBuf | Test.java:4313:10:4313:11 | in : CompositeByteBuf | provenance |  |
 | Test.java:4312:44:4312:51 | source(...) : Object | Test.java:4312:26:4312:51 | (...)... : CompositeByteBuf | provenance |  |
-| Test.java:4313:10:4313:11 | in : CompositeByteBuf | Test.java:4313:10:4313:47 | addFlattenedComponents(...) : CompositeByteBuf | provenance | MaD:152 |
+| Test.java:4313:10:4313:11 | in : CompositeByteBuf | Test.java:4313:10:4313:47 | addFlattenedComponents(...) : CompositeByteBuf | provenance | MaD:182 |
 | Test.java:4313:10:4313:47 | addFlattenedComponents(...) : CompositeByteBuf | Test.java:4314:9:4314:11 | out | provenance |  |
 | Test.java:4319:26:4319:51 | (...)... : CompositeByteBuf | Test.java:4320:10:4320:11 | in : CompositeByteBuf | provenance |  |
 | Test.java:4319:44:4319:51 | source(...) : Object | Test.java:4319:26:4319:51 | (...)... : CompositeByteBuf | provenance |  |
-| Test.java:4320:10:4320:11 | in : CompositeByteBuf | Test.java:4320:10:4320:24 | component(...) : ByteBuf | provenance | MaD:153 |
+| Test.java:4320:10:4320:11 | in : CompositeByteBuf | Test.java:4320:10:4320:24 | component(...) : ByteBuf | provenance | MaD:183 |
 | Test.java:4320:10:4320:24 | component(...) : ByteBuf | Test.java:4321:9:4321:11 | out | provenance |  |
 | Test.java:4326:26:4326:51 | (...)... : CompositeByteBuf | Test.java:4327:10:4327:11 | in : CompositeByteBuf | provenance |  |
 | Test.java:4326:44:4326:51 | source(...) : Object | Test.java:4326:26:4326:51 | (...)... : CompositeByteBuf | provenance |  |
-| Test.java:4327:10:4327:11 | in : CompositeByteBuf | Test.java:4327:10:4327:32 | componentAtOffset(...) : ByteBuf | provenance | MaD:154 |
+| Test.java:4327:10:4327:11 | in : CompositeByteBuf | Test.java:4327:10:4327:32 | componentAtOffset(...) : ByteBuf | provenance | MaD:184 |
 | Test.java:4327:10:4327:32 | componentAtOffset(...) : ByteBuf | Test.java:4328:9:4328:11 | out | provenance |  |
 | Test.java:4333:26:4333:51 | (...)... : CompositeByteBuf | Test.java:4334:10:4334:11 | in : CompositeByteBuf | provenance |  |
 | Test.java:4333:44:4333:51 | source(...) : Object | Test.java:4333:26:4333:51 | (...)... : CompositeByteBuf | provenance |  |
-| Test.java:4334:10:4334:11 | in : CompositeByteBuf | Test.java:4334:10:4334:25 | consolidate(...) : CompositeByteBuf | provenance | MaD:155 |
+| Test.java:4334:10:4334:11 | in : CompositeByteBuf | Test.java:4334:10:4334:25 | consolidate(...) : CompositeByteBuf | provenance | MaD:185 |
 | Test.java:4334:10:4334:25 | consolidate(...) : CompositeByteBuf | Test.java:4335:9:4335:11 | out | provenance |  |
 | Test.java:4340:26:4340:51 | (...)... : CompositeByteBuf | Test.java:4341:10:4341:11 | in : CompositeByteBuf | provenance |  |
 | Test.java:4340:44:4340:51 | source(...) : Object | Test.java:4340:26:4340:51 | (...)... : CompositeByteBuf | provenance |  |
-| Test.java:4341:10:4341:11 | in : CompositeByteBuf | Test.java:4341:10:4341:29 | consolidate(...) : CompositeByteBuf | provenance | MaD:156 |
+| Test.java:4341:10:4341:11 | in : CompositeByteBuf | Test.java:4341:10:4341:29 | consolidate(...) : CompositeByteBuf | provenance | MaD:186 |
 | Test.java:4341:10:4341:29 | consolidate(...) : CompositeByteBuf | Test.java:4342:9:4342:11 | out | provenance |  |
 | Test.java:4347:26:4347:51 | (...)... : CompositeByteBuf | Test.java:4348:10:4348:11 | in : CompositeByteBuf | provenance |  |
 | Test.java:4347:44:4347:51 | source(...) : Object | Test.java:4347:26:4347:51 | (...)... : CompositeByteBuf | provenance |  |
-| Test.java:4348:10:4348:11 | in : CompositeByteBuf | Test.java:4348:10:4348:27 | decompose(...) : List [<element>] : Object | provenance | MaD:157 |
+| Test.java:4348:10:4348:11 | in : CompositeByteBuf | Test.java:4348:10:4348:27 | decompose(...) : List [<element>] : Object | provenance | MaD:187 |
 | Test.java:4348:10:4348:27 | decompose(...) : List [<element>] : Object | Test.java:4349:20:4349:22 | out : List [<element>] : Object | provenance |  |
 | Test.java:4349:20:4349:22 | out : List [<element>] : Object | Test.java:79:19:79:32 | it : List [<element>] : Object | provenance |  |
-| Test.java:4349:20:4349:22 | out : List [<element>] : Object | Test.java:4349:9:4349:23 | getElement(...) | provenance | MaD:492 |
+| Test.java:4349:20:4349:22 | out : List [<element>] : Object | Test.java:4349:9:4349:23 | getElement(...) | provenance | MaD:495 |
 | Test.java:4354:17:4354:33 | (...)... : ByteBuf | Test.java:4355:32:4355:33 | in : ByteBuf | provenance |  |
 | Test.java:4354:26:4354:33 | source(...) : Object | Test.java:4354:17:4354:33 | (...)... : ByteBuf | provenance |  |
 | Test.java:4355:10:4355:34 | copiedBuffer(...) : ByteBuf | Test.java:4356:9:4356:11 | out | provenance |  |
-| Test.java:4355:32:4355:33 | in : ByteBuf | Test.java:4355:10:4355:34 | copiedBuffer(...) : ByteBuf | provenance | MaD:161 |
+| Test.java:4355:32:4355:33 | in : ByteBuf | Test.java:4355:10:4355:34 | copiedBuffer(...) : ByteBuf | provenance | MaD:188 |
 | Test.java:4361:19:4361:61 | (...)... : ByteBuf[] [[]] : ByteBuf | Test.java:4362:32:4362:33 | in : ByteBuf[] [[]] : ByteBuf | provenance |  |
 | Test.java:4361:30:4361:61 | {...} : ByteBuf[] [[]] : ByteBuf | Test.java:4361:19:4361:61 | (...)... : ByteBuf[] [[]] : ByteBuf | provenance |  |
 | Test.java:4361:44:4361:60 | (...)... : ByteBuf | Test.java:4361:30:4361:61 | {...} : ByteBuf[] [[]] : ByteBuf | provenance |  |
 | Test.java:4361:53:4361:60 | source(...) : Object | Test.java:4361:44:4361:60 | (...)... : ByteBuf | provenance |  |
 | Test.java:4362:10:4362:34 | copiedBuffer(...) : ByteBuf | Test.java:4363:9:4363:11 | out | provenance |  |
-| Test.java:4362:32:4362:33 | in : ByteBuf[] [[]] : ByteBuf | Test.java:4362:10:4362:34 | copiedBuffer(...) : ByteBuf | provenance | MaD:162 |
+| Test.java:4362:32:4362:33 | in : ByteBuf[] [[]] : ByteBuf | Test.java:4362:10:4362:34 | copiedBuffer(...) : ByteBuf | provenance | MaD:189 |
 | Test.java:4368:20:4368:39 | (...)... : ByteBuffer | Test.java:4369:32:4369:33 | in : ByteBuffer | provenance |  |
 | Test.java:4368:32:4368:39 | source(...) : Object | Test.java:4368:20:4368:39 | (...)... : ByteBuffer | provenance |  |
 | Test.java:4369:10:4369:34 | copiedBuffer(...) : ByteBuf | Test.java:4370:9:4370:11 | out | provenance |  |
-| Test.java:4369:32:4369:33 | in : ByteBuffer | Test.java:4369:10:4369:34 | copiedBuffer(...) : ByteBuf | provenance | MaD:163 |
+| Test.java:4369:32:4369:33 | in : ByteBuffer | Test.java:4369:10:4369:34 | copiedBuffer(...) : ByteBuf | provenance | MaD:190 |
 | Test.java:4375:22:4375:73 | (...)... : ByteBuffer[] [[]] : ByteBuffer | Test.java:4376:32:4376:33 | in : ByteBuffer[] [[]] : ByteBuffer | provenance |  |
 | Test.java:4375:36:4375:73 | {...} : ByteBuffer[] [[]] : ByteBuffer | Test.java:4375:22:4375:73 | (...)... : ByteBuffer[] [[]] : ByteBuffer | provenance |  |
 | Test.java:4375:53:4375:72 | (...)... : ByteBuffer | Test.java:4375:36:4375:73 | {...} : ByteBuffer[] [[]] : ByteBuffer | provenance |  |
 | Test.java:4375:65:4375:72 | source(...) : Object | Test.java:4375:53:4375:72 | (...)... : ByteBuffer | provenance |  |
 | Test.java:4376:10:4376:34 | copiedBuffer(...) : ByteBuf | Test.java:4377:9:4377:11 | out | provenance |  |
-| Test.java:4376:32:4376:33 | in : ByteBuffer[] [[]] : ByteBuffer | Test.java:4376:10:4376:34 | copiedBuffer(...) : ByteBuf | provenance | MaD:164 |
+| Test.java:4376:32:4376:33 | in : ByteBuffer[] [[]] : ByteBuffer | Test.java:4376:10:4376:34 | copiedBuffer(...) : ByteBuf | provenance | MaD:191 |
 | Test.java:4382:22:4382:43 | (...)... : CharSequence | Test.java:4383:32:4383:33 | in : CharSequence | provenance |  |
 | Test.java:4382:36:4382:43 | source(...) : Object | Test.java:4382:22:4382:43 | (...)... : CharSequence | provenance |  |
 | Test.java:4383:10:4383:49 | copiedBuffer(...) : ByteBuf | Test.java:4384:9:4384:11 | out | provenance |  |
-| Test.java:4383:32:4383:33 | in : CharSequence | Test.java:4383:10:4383:49 | copiedBuffer(...) : ByteBuf | provenance | MaD:167 |
+| Test.java:4383:32:4383:33 | in : CharSequence | Test.java:4383:10:4383:49 | copiedBuffer(...) : ByteBuf | provenance | MaD:192 |
 | Test.java:4389:22:4389:43 | (...)... : CharSequence | Test.java:4390:32:4390:33 | in : CharSequence | provenance |  |
 | Test.java:4389:36:4389:43 | source(...) : Object | Test.java:4389:22:4389:43 | (...)... : CharSequence | provenance |  |
 | Test.java:4390:10:4390:55 | copiedBuffer(...) : ByteBuf | Test.java:4391:9:4391:11 | out | provenance |  |
-| Test.java:4390:32:4390:33 | in : CharSequence | Test.java:4390:10:4390:55 | copiedBuffer(...) : ByteBuf | provenance | MaD:168 |
+| Test.java:4390:32:4390:33 | in : CharSequence | Test.java:4390:10:4390:55 | copiedBuffer(...) : ByteBuf | provenance | MaD:193 |
 | Test.java:4396:16:4396:31 | (...)... : byte[] | Test.java:4397:32:4397:33 | in : byte[] | provenance |  |
 | Test.java:4396:24:4396:31 | source(...) : Object | Test.java:4396:16:4396:31 | (...)... : byte[] | provenance |  |
 | Test.java:4397:10:4397:34 | copiedBuffer(...) : ByteBuf | Test.java:4398:9:4398:11 | out | provenance |  |
-| Test.java:4397:32:4397:33 | in : byte[] | Test.java:4397:10:4397:34 | copiedBuffer(...) : ByteBuf | provenance | MaD:158 |
+| Test.java:4397:32:4397:33 | in : byte[] | Test.java:4397:10:4397:34 | copiedBuffer(...) : ByteBuf | provenance | MaD:194 |
 | Test.java:4403:16:4403:31 | (...)... : byte[] | Test.java:4404:32:4404:33 | in : byte[] | provenance |  |
 | Test.java:4403:24:4403:31 | source(...) : Object | Test.java:4403:16:4403:31 | (...)... : byte[] | provenance |  |
 | Test.java:4404:10:4404:40 | copiedBuffer(...) : ByteBuf | Test.java:4405:9:4405:11 | out | provenance |  |
-| Test.java:4404:32:4404:33 | in : byte[] | Test.java:4404:10:4404:40 | copiedBuffer(...) : ByteBuf | provenance | MaD:160 |
+| Test.java:4404:32:4404:33 | in : byte[] | Test.java:4404:10:4404:40 | copiedBuffer(...) : ByteBuf | provenance | MaD:195 |
 | Test.java:4410:18:4410:57 | (...)... : byte[][] [[]] : byte[] | Test.java:4411:32:4411:33 | in : byte[][] [[]] : byte[] | provenance |  |
 | Test.java:4410:28:4410:57 | {...} : byte[][] [[]] : byte[] | Test.java:4410:18:4410:57 | (...)... : byte[][] [[]] : byte[] | provenance |  |
 | Test.java:4410:41:4410:56 | (...)... : byte[] | Test.java:4410:28:4410:57 | {...} : byte[][] [[]] : byte[] | provenance |  |
 | Test.java:4410:49:4410:56 | source(...) : Object | Test.java:4410:41:4410:56 | (...)... : byte[] | provenance |  |
 | Test.java:4411:10:4411:34 | copiedBuffer(...) : ByteBuf | Test.java:4412:9:4412:11 | out | provenance |  |
-| Test.java:4411:32:4411:33 | in : byte[][] [[]] : byte[] | Test.java:4411:10:4411:34 | copiedBuffer(...) : ByteBuf | provenance | MaD:159 |
+| Test.java:4411:32:4411:33 | in : byte[][] [[]] : byte[] | Test.java:4411:10:4411:34 | copiedBuffer(...) : ByteBuf | provenance | MaD:196 |
 | Test.java:4417:16:4417:31 | (...)... : char[] | Test.java:4418:32:4418:33 | in : char[] | provenance |  |
 | Test.java:4417:24:4417:31 | source(...) : Object | Test.java:4417:16:4417:31 | (...)... : char[] | provenance |  |
 | Test.java:4418:10:4418:49 | copiedBuffer(...) : ByteBuf | Test.java:4419:9:4419:11 | out | provenance |  |
-| Test.java:4418:32:4418:33 | in : char[] | Test.java:4418:10:4418:49 | copiedBuffer(...) : ByteBuf | provenance | MaD:165 |
+| Test.java:4418:32:4418:33 | in : char[] | Test.java:4418:10:4418:49 | copiedBuffer(...) : ByteBuf | provenance | MaD:197 |
 | Test.java:4424:16:4424:31 | (...)... : char[] | Test.java:4425:32:4425:33 | in : char[] | provenance |  |
 | Test.java:4424:24:4424:31 | source(...) : Object | Test.java:4424:16:4424:31 | (...)... : char[] | provenance |  |
 | Test.java:4425:10:4425:55 | copiedBuffer(...) : ByteBuf | Test.java:4426:9:4426:11 | out | provenance |  |
-| Test.java:4425:32:4425:33 | in : char[] | Test.java:4425:10:4425:55 | copiedBuffer(...) : ByteBuf | provenance | MaD:166 |
+| Test.java:4425:32:4425:33 | in : char[] | Test.java:4425:10:4425:55 | copiedBuffer(...) : ByteBuf | provenance | MaD:198 |
 | Test.java:4431:17:4431:33 | (...)... : ByteBuf | Test.java:4432:38:4432:39 | in : ByteBuf | provenance |  |
 | Test.java:4431:26:4431:33 | source(...) : Object | Test.java:4431:17:4431:33 | (...)... : ByteBuf | provenance |  |
 | Test.java:4432:10:4432:40 | unmodifiableBuffer(...) : ByteBuf | Test.java:4433:9:4433:11 | out | provenance |  |
-| Test.java:4432:38:4432:39 | in : ByteBuf | Test.java:4432:10:4432:40 | unmodifiableBuffer(...) : ByteBuf | provenance | MaD:169 |
+| Test.java:4432:38:4432:39 | in : ByteBuf | Test.java:4432:10:4432:40 | unmodifiableBuffer(...) : ByteBuf | provenance | MaD:199 |
 | Test.java:4438:19:4438:61 | (...)... : ByteBuf[] [[]] : ByteBuf | Test.java:4439:38:4439:39 | in : ByteBuf[] [[]] : ByteBuf | provenance |  |
 | Test.java:4438:30:4438:61 | {...} : ByteBuf[] [[]] : ByteBuf | Test.java:4438:19:4438:61 | (...)... : ByteBuf[] [[]] : ByteBuf | provenance |  |
 | Test.java:4438:44:4438:60 | (...)... : ByteBuf | Test.java:4438:30:4438:61 | {...} : ByteBuf[] [[]] : ByteBuf | provenance |  |
 | Test.java:4438:53:4438:60 | source(...) : Object | Test.java:4438:44:4438:60 | (...)... : ByteBuf | provenance |  |
 | Test.java:4439:10:4439:40 | unmodifiableBuffer(...) : ByteBuf | Test.java:4440:9:4440:11 | out | provenance |  |
-| Test.java:4439:38:4439:39 | in : ByteBuf[] [[]] : ByteBuf | Test.java:4439:10:4439:40 | unmodifiableBuffer(...) : ByteBuf | provenance | MaD:170 |
+| Test.java:4439:38:4439:39 | in : ByteBuf[] [[]] : ByteBuf | Test.java:4439:10:4439:40 | unmodifiableBuffer(...) : ByteBuf | provenance | MaD:200 |
 | Test.java:4445:17:4445:33 | (...)... : ByteBuf | Test.java:4446:38:4446:39 | in : ByteBuf | provenance |  |
 | Test.java:4445:26:4445:33 | source(...) : Object | Test.java:4445:17:4445:33 | (...)... : ByteBuf | provenance |  |
 | Test.java:4446:10:4446:40 | unreleasableBuffer(...) : ByteBuf | Test.java:4447:9:4447:11 | out | provenance |  |
-| Test.java:4446:38:4446:39 | in : ByteBuf | Test.java:4446:10:4446:40 | unreleasableBuffer(...) : ByteBuf | provenance | MaD:171 |
+| Test.java:4446:38:4446:39 | in : ByteBuf | Test.java:4446:10:4446:40 | unreleasableBuffer(...) : ByteBuf | provenance | MaD:201 |
 | Test.java:4452:17:4452:33 | (...)... : ByteBuf | Test.java:4453:33:4453:34 | in : ByteBuf | provenance |  |
 | Test.java:4452:26:4452:33 | source(...) : Object | Test.java:4452:17:4452:33 | (...)... : ByteBuf | provenance |  |
 | Test.java:4453:10:4453:35 | wrappedBuffer(...) : ByteBuf | Test.java:4454:9:4454:11 | out | provenance |  |
-| Test.java:4453:33:4453:34 | in : ByteBuf | Test.java:4453:10:4453:35 | wrappedBuffer(...) : ByteBuf | provenance | MaD:175 |
+| Test.java:4453:33:4453:34 | in : ByteBuf | Test.java:4453:10:4453:35 | wrappedBuffer(...) : ByteBuf | provenance | MaD:202 |
 | Test.java:4459:19:4459:61 | (...)... : ByteBuf[] [[]] : ByteBuf | Test.java:4460:33:4460:34 | in : ByteBuf[] [[]] : ByteBuf | provenance |  |
 | Test.java:4459:30:4459:61 | {...} : ByteBuf[] [[]] : ByteBuf | Test.java:4459:19:4459:61 | (...)... : ByteBuf[] [[]] : ByteBuf | provenance |  |
 | Test.java:4459:44:4459:60 | (...)... : ByteBuf | Test.java:4459:30:4459:61 | {...} : ByteBuf[] [[]] : ByteBuf | provenance |  |
 | Test.java:4459:53:4459:60 | source(...) : Object | Test.java:4459:44:4459:60 | (...)... : ByteBuf | provenance |  |
 | Test.java:4460:10:4460:35 | wrappedBuffer(...) : ByteBuf | Test.java:4461:9:4461:11 | out | provenance |  |
-| Test.java:4460:33:4460:34 | in : ByteBuf[] [[]] : ByteBuf | Test.java:4460:10:4460:35 | wrappedBuffer(...) : ByteBuf | provenance | MaD:176 |
+| Test.java:4460:33:4460:34 | in : ByteBuf[] [[]] : ByteBuf | Test.java:4460:10:4460:35 | wrappedBuffer(...) : ByteBuf | provenance | MaD:203 |
 | Test.java:4466:20:4466:39 | (...)... : ByteBuffer | Test.java:4467:33:4467:34 | in : ByteBuffer | provenance |  |
 | Test.java:4466:32:4466:39 | source(...) : Object | Test.java:4466:20:4466:39 | (...)... : ByteBuffer | provenance |  |
 | Test.java:4467:10:4467:35 | wrappedBuffer(...) : ByteBuf | Test.java:4468:9:4468:11 | out | provenance |  |
-| Test.java:4467:33:4467:34 | in : ByteBuffer | Test.java:4467:10:4467:35 | wrappedBuffer(...) : ByteBuf | provenance | MaD:177 |
+| Test.java:4467:33:4467:34 | in : ByteBuffer | Test.java:4467:10:4467:35 | wrappedBuffer(...) : ByteBuf | provenance | MaD:204 |
 | Test.java:4473:22:4473:73 | (...)... : ByteBuffer[] [[]] : ByteBuffer | Test.java:4474:33:4474:34 | in : ByteBuffer[] [[]] : ByteBuffer | provenance |  |
 | Test.java:4473:36:4473:73 | {...} : ByteBuffer[] [[]] : ByteBuffer | Test.java:4473:22:4473:73 | (...)... : ByteBuffer[] [[]] : ByteBuffer | provenance |  |
 | Test.java:4473:53:4473:72 | (...)... : ByteBuffer | Test.java:4473:36:4473:73 | {...} : ByteBuffer[] [[]] : ByteBuffer | provenance |  |
 | Test.java:4473:65:4473:72 | source(...) : Object | Test.java:4473:53:4473:72 | (...)... : ByteBuffer | provenance |  |
 | Test.java:4474:10:4474:35 | wrappedBuffer(...) : ByteBuf | Test.java:4475:9:4475:11 | out | provenance |  |
-| Test.java:4474:33:4474:34 | in : ByteBuffer[] [[]] : ByteBuffer | Test.java:4474:10:4474:35 | wrappedBuffer(...) : ByteBuf | provenance | MaD:178 |
+| Test.java:4474:33:4474:34 | in : ByteBuffer[] [[]] : ByteBuffer | Test.java:4474:10:4474:35 | wrappedBuffer(...) : ByteBuf | provenance | MaD:205 |
 | Test.java:4480:16:4480:31 | (...)... : byte[] | Test.java:4481:33:4481:34 | in : byte[] | provenance |  |
 | Test.java:4480:24:4480:31 | source(...) : Object | Test.java:4480:16:4480:31 | (...)... : byte[] | provenance |  |
 | Test.java:4481:10:4481:35 | wrappedBuffer(...) : ByteBuf | Test.java:4482:9:4482:11 | out | provenance |  |
-| Test.java:4481:33:4481:34 | in : byte[] | Test.java:4481:10:4481:35 | wrappedBuffer(...) : ByteBuf | provenance | MaD:172 |
+| Test.java:4481:33:4481:34 | in : byte[] | Test.java:4481:10:4481:35 | wrappedBuffer(...) : ByteBuf | provenance | MaD:206 |
 | Test.java:4487:16:4487:31 | (...)... : byte[] | Test.java:4488:33:4488:34 | in : byte[] | provenance |  |
 | Test.java:4487:24:4487:31 | source(...) : Object | Test.java:4487:16:4487:31 | (...)... : byte[] | provenance |  |
 | Test.java:4488:10:4488:41 | wrappedBuffer(...) : ByteBuf | Test.java:4489:9:4489:11 | out | provenance |  |
-| Test.java:4488:33:4488:34 | in : byte[] | Test.java:4488:10:4488:41 | wrappedBuffer(...) : ByteBuf | provenance | MaD:174 |
+| Test.java:4488:33:4488:34 | in : byte[] | Test.java:4488:10:4488:41 | wrappedBuffer(...) : ByteBuf | provenance | MaD:207 |
 | Test.java:4494:18:4494:57 | (...)... : byte[][] [[]] : byte[] | Test.java:4495:33:4495:34 | in : byte[][] [[]] : byte[] | provenance |  |
 | Test.java:4494:28:4494:57 | {...} : byte[][] [[]] : byte[] | Test.java:4494:18:4494:57 | (...)... : byte[][] [[]] : byte[] | provenance |  |
 | Test.java:4494:41:4494:56 | (...)... : byte[] | Test.java:4494:28:4494:57 | {...} : byte[][] [[]] : byte[] | provenance |  |
 | Test.java:4494:49:4494:56 | source(...) : Object | Test.java:4494:41:4494:56 | (...)... : byte[] | provenance |  |
 | Test.java:4495:10:4495:35 | wrappedBuffer(...) : ByteBuf | Test.java:4496:9:4496:11 | out | provenance |  |
-| Test.java:4495:33:4495:34 | in : byte[][] [[]] : byte[] | Test.java:4495:10:4495:35 | wrappedBuffer(...) : ByteBuf | provenance | MaD:173 |
+| Test.java:4495:33:4495:34 | in : byte[][] [[]] : byte[] | Test.java:4495:10:4495:35 | wrappedBuffer(...) : ByteBuf | provenance | MaD:208 |
 | Test.java:4501:19:4501:61 | (...)... : ByteBuf[] [[]] : ByteBuf | Test.java:4502:36:4502:37 | in : ByteBuf[] [[]] : ByteBuf | provenance |  |
 | Test.java:4501:30:4501:61 | {...} : ByteBuf[] [[]] : ByteBuf | Test.java:4501:19:4501:61 | (...)... : ByteBuf[] [[]] : ByteBuf | provenance |  |
 | Test.java:4501:44:4501:60 | (...)... : ByteBuf | Test.java:4501:30:4501:61 | {...} : ByteBuf[] [[]] : ByteBuf | provenance |  |
 | Test.java:4501:53:4501:60 | source(...) : Object | Test.java:4501:44:4501:60 | (...)... : ByteBuf | provenance |  |
 | Test.java:4502:10:4502:38 | wrappedBuffer(...) : ByteBuf | Test.java:4503:9:4503:11 | out | provenance |  |
-| Test.java:4502:36:4502:37 | in : ByteBuf[] [[]] : ByteBuf | Test.java:4502:10:4502:38 | wrappedBuffer(...) : ByteBuf | provenance | MaD:180 |
+| Test.java:4502:36:4502:37 | in : ByteBuf[] [[]] : ByteBuf | Test.java:4502:10:4502:38 | wrappedBuffer(...) : ByteBuf | provenance | MaD:209 |
 | Test.java:4508:22:4508:73 | (...)... : ByteBuffer[] [[]] : ByteBuffer | Test.java:4509:36:4509:37 | in : ByteBuffer[] [[]] : ByteBuffer | provenance |  |
 | Test.java:4508:36:4508:73 | {...} : ByteBuffer[] [[]] : ByteBuffer | Test.java:4508:22:4508:73 | (...)... : ByteBuffer[] [[]] : ByteBuffer | provenance |  |
 | Test.java:4508:53:4508:72 | (...)... : ByteBuffer | Test.java:4508:36:4508:73 | {...} : ByteBuffer[] [[]] : ByteBuffer | provenance |  |
 | Test.java:4508:65:4508:72 | source(...) : Object | Test.java:4508:53:4508:72 | (...)... : ByteBuffer | provenance |  |
 | Test.java:4509:10:4509:38 | wrappedBuffer(...) : ByteBuf | Test.java:4510:9:4510:11 | out | provenance |  |
-| Test.java:4509:36:4509:37 | in : ByteBuffer[] [[]] : ByteBuffer | Test.java:4509:10:4509:38 | wrappedBuffer(...) : ByteBuf | provenance | MaD:181 |
+| Test.java:4509:36:4509:37 | in : ByteBuffer[] [[]] : ByteBuffer | Test.java:4509:10:4509:38 | wrappedBuffer(...) : ByteBuf | provenance | MaD:210 |
 | Test.java:4515:18:4515:57 | (...)... : byte[][] [[]] : byte[] | Test.java:4516:36:4516:37 | in : byte[][] [[]] : byte[] | provenance |  |
 | Test.java:4515:28:4515:57 | {...} : byte[][] [[]] : byte[] | Test.java:4515:18:4515:57 | (...)... : byte[][] [[]] : byte[] | provenance |  |
 | Test.java:4515:41:4515:56 | (...)... : byte[] | Test.java:4515:28:4515:57 | {...} : byte[][] [[]] : byte[] | provenance |  |
 | Test.java:4515:49:4515:56 | source(...) : Object | Test.java:4515:41:4515:56 | (...)... : byte[] | provenance |  |
 | Test.java:4516:10:4516:38 | wrappedBuffer(...) : ByteBuf | Test.java:4517:9:4517:11 | out | provenance |  |
-| Test.java:4516:36:4516:37 | in : byte[][] [[]] : byte[] | Test.java:4516:10:4516:38 | wrappedBuffer(...) : ByteBuf | provenance | MaD:179 |
+| Test.java:4516:36:4516:37 | in : byte[][] [[]] : byte[] | Test.java:4516:10:4516:38 | wrappedBuffer(...) : ByteBuf | provenance | MaD:211 |
 | Test.java:4522:19:4522:61 | (...)... : ByteBuf[] [[]] : ByteBuf | Test.java:4523:45:4523:46 | in : ByteBuf[] [[]] : ByteBuf | provenance |  |
 | Test.java:4522:30:4522:61 | {...} : ByteBuf[] [[]] : ByteBuf | Test.java:4522:19:4522:61 | (...)... : ByteBuf[] [[]] : ByteBuf | provenance |  |
 | Test.java:4522:44:4522:60 | (...)... : ByteBuf | Test.java:4522:30:4522:61 | {...} : ByteBuf[] [[]] : ByteBuf | provenance |  |
 | Test.java:4522:53:4522:60 | source(...) : Object | Test.java:4522:44:4522:60 | (...)... : ByteBuf | provenance |  |
 | Test.java:4523:10:4523:47 | wrappedUnmodifiableBuffer(...) : ByteBuf | Test.java:4524:9:4524:11 | out | provenance |  |
-| Test.java:4523:45:4523:46 | in : ByteBuf[] [[]] : ByteBuf | Test.java:4523:10:4523:47 | wrappedUnmodifiableBuffer(...) : ByteBuf | provenance | MaD:182 |
+| Test.java:4523:45:4523:46 | in : ByteBuf[] [[]] : ByteBuf | Test.java:4523:10:4523:47 | wrappedUnmodifiableBuffer(...) : ByteBuf | provenance | MaD:212 |
 | Test.java:4529:17:4529:33 | (...)... : ByteBuf | Test.java:4530:24:4530:25 | in : ByteBuf | provenance |  |
 | Test.java:4529:26:4529:33 | source(...) : Object | Test.java:4529:17:4529:33 | (...)... : ByteBuf | provenance |  |
 | Test.java:4530:10:4530:26 | decode(...) : ByteBuf | Test.java:4531:9:4531:11 | out | provenance |  |
-| Test.java:4530:24:4530:25 | in : ByteBuf | Test.java:4530:10:4530:26 | decode(...) : ByteBuf | provenance | MaD:208 |
+| Test.java:4530:24:4530:25 | in : ByteBuf | Test.java:4530:10:4530:26 | decode(...) : ByteBuf | provenance | MaD:213 |
 | Test.java:4536:17:4536:33 | (...)... : ByteBuf | Test.java:4537:24:4537:25 | in : ByteBuf | provenance |  |
 | Test.java:4536:26:4536:33 | source(...) : Object | Test.java:4536:17:4536:33 | (...)... : ByteBuf | provenance |  |
 | Test.java:4537:10:4537:32 | decode(...) : ByteBuf | Test.java:4538:9:4538:11 | out | provenance |  |
-| Test.java:4537:24:4537:25 | in : ByteBuf | Test.java:4537:10:4537:32 | decode(...) : ByteBuf | provenance | MaD:208 |
+| Test.java:4537:24:4537:25 | in : ByteBuf | Test.java:4537:10:4537:32 | decode(...) : ByteBuf | provenance | MaD:213 |
 | Test.java:4543:17:4543:33 | (...)... : ByteBuf | Test.java:4544:24:4544:25 | in : ByteBuf | provenance |  |
 | Test.java:4543:26:4543:33 | source(...) : Object | Test.java:4543:17:4543:33 | (...)... : ByteBuf | provenance |  |
 | Test.java:4544:10:4544:38 | decode(...) : ByteBuf | Test.java:4545:9:4545:11 | out | provenance |  |
-| Test.java:4544:24:4544:25 | in : ByteBuf | Test.java:4544:10:4544:38 | decode(...) : ByteBuf | provenance | MaD:208 |
+| Test.java:4544:24:4544:25 | in : ByteBuf | Test.java:4544:10:4544:38 | decode(...) : ByteBuf | provenance | MaD:213 |
 | Test.java:4550:17:4550:33 | (...)... : ByteBuf | Test.java:4551:24:4551:25 | in : ByteBuf | provenance |  |
 | Test.java:4550:26:4550:33 | source(...) : Object | Test.java:4550:17:4550:33 | (...)... : ByteBuf | provenance |  |
 | Test.java:4551:10:4551:44 | decode(...) : ByteBuf | Test.java:4552:9:4552:11 | out | provenance |  |
-| Test.java:4551:24:4551:25 | in : ByteBuf | Test.java:4551:10:4551:44 | decode(...) : ByteBuf | provenance | MaD:208 |
+| Test.java:4551:24:4551:25 | in : ByteBuf | Test.java:4551:10:4551:44 | decode(...) : ByteBuf | provenance | MaD:213 |
 | Test.java:4557:17:4557:33 | (...)... : ByteBuf | Test.java:4558:24:4558:25 | in : ByteBuf | provenance |  |
 | Test.java:4557:26:4557:33 | source(...) : Object | Test.java:4557:17:4557:33 | (...)... : ByteBuf | provenance |  |
 | Test.java:4558:10:4558:32 | decode(...) : ByteBuf | Test.java:4559:9:4559:11 | out | provenance |  |
-| Test.java:4558:24:4558:25 | in : ByteBuf | Test.java:4558:10:4558:32 | decode(...) : ByteBuf | provenance | MaD:208 |
+| Test.java:4558:24:4558:25 | in : ByteBuf | Test.java:4558:10:4558:32 | decode(...) : ByteBuf | provenance | MaD:213 |
 | Test.java:4564:17:4564:33 | (...)... : ByteBuf | Test.java:4565:24:4565:25 | in : ByteBuf | provenance |  |
 | Test.java:4564:26:4564:33 | source(...) : Object | Test.java:4564:17:4564:33 | (...)... : ByteBuf | provenance |  |
 | Test.java:4565:10:4565:26 | encode(...) : ByteBuf | Test.java:4566:9:4566:11 | out | provenance |  |
-| Test.java:4565:24:4565:25 | in : ByteBuf | Test.java:4565:10:4565:26 | encode(...) : ByteBuf | provenance | MaD:209 |
+| Test.java:4565:24:4565:25 | in : ByteBuf | Test.java:4565:10:4565:26 | encode(...) : ByteBuf | provenance | MaD:214 |
 | Test.java:4571:17:4571:33 | (...)... : ByteBuf | Test.java:4572:24:4572:25 | in : ByteBuf | provenance |  |
 | Test.java:4571:26:4571:33 | source(...) : Object | Test.java:4571:17:4571:33 | (...)... : ByteBuf | provenance |  |
 | Test.java:4572:10:4572:47 | encode(...) : ByteBuf | Test.java:4573:9:4573:11 | out | provenance |  |
-| Test.java:4572:24:4572:25 | in : ByteBuf | Test.java:4572:10:4572:47 | encode(...) : ByteBuf | provenance | MaD:209 |
+| Test.java:4572:24:4572:25 | in : ByteBuf | Test.java:4572:10:4572:47 | encode(...) : ByteBuf | provenance | MaD:214 |
 | Test.java:4578:17:4578:33 | (...)... : ByteBuf | Test.java:4579:24:4579:25 | in : ByteBuf | provenance |  |
 | Test.java:4578:26:4578:33 | source(...) : Object | Test.java:4578:17:4578:33 | (...)... : ByteBuf | provenance |  |
 | Test.java:4579:10:4579:32 | encode(...) : ByteBuf | Test.java:4580:9:4580:11 | out | provenance |  |
-| Test.java:4579:24:4579:25 | in : ByteBuf | Test.java:4579:10:4579:32 | encode(...) : ByteBuf | provenance | MaD:209 |
+| Test.java:4579:24:4579:25 | in : ByteBuf | Test.java:4579:10:4579:32 | encode(...) : ByteBuf | provenance | MaD:214 |
 | Test.java:4585:17:4585:33 | (...)... : ByteBuf | Test.java:4586:24:4586:25 | in : ByteBuf | provenance |  |
 | Test.java:4585:26:4585:33 | source(...) : Object | Test.java:4585:17:4585:33 | (...)... : ByteBuf | provenance |  |
 | Test.java:4586:10:4586:53 | encode(...) : ByteBuf | Test.java:4587:9:4587:11 | out | provenance |  |
-| Test.java:4586:24:4586:25 | in : ByteBuf | Test.java:4586:10:4586:53 | encode(...) : ByteBuf | provenance | MaD:209 |
+| Test.java:4586:24:4586:25 | in : ByteBuf | Test.java:4586:10:4586:53 | encode(...) : ByteBuf | provenance | MaD:214 |
 | Test.java:4592:17:4592:33 | (...)... : ByteBuf | Test.java:4593:24:4593:25 | in : ByteBuf | provenance |  |
 | Test.java:4592:26:4592:33 | source(...) : Object | Test.java:4592:17:4592:33 | (...)... : ByteBuf | provenance |  |
 | Test.java:4593:10:4593:39 | encode(...) : ByteBuf | Test.java:4594:9:4594:11 | out | provenance |  |
-| Test.java:4593:24:4593:25 | in : ByteBuf | Test.java:4593:10:4593:39 | encode(...) : ByteBuf | provenance | MaD:209 |
+| Test.java:4593:24:4593:25 | in : ByteBuf | Test.java:4593:10:4593:39 | encode(...) : ByteBuf | provenance | MaD:214 |
 | Test.java:4599:17:4599:33 | (...)... : ByteBuf | Test.java:4600:24:4600:25 | in : ByteBuf | provenance |  |
 | Test.java:4599:26:4599:33 | source(...) : Object | Test.java:4599:17:4599:33 | (...)... : ByteBuf | provenance |  |
 | Test.java:4600:10:4600:45 | encode(...) : ByteBuf | Test.java:4601:9:4601:11 | out | provenance |  |
-| Test.java:4600:24:4600:25 | in : ByteBuf | Test.java:4600:10:4600:45 | encode(...) : ByteBuf | provenance | MaD:209 |
+| Test.java:4600:24:4600:25 | in : ByteBuf | Test.java:4600:10:4600:45 | encode(...) : ByteBuf | provenance | MaD:214 |
 | Test.java:4606:17:4606:33 | (...)... : ByteBuf | Test.java:4607:24:4607:25 | in : ByteBuf | provenance |  |
 | Test.java:4606:26:4606:33 | source(...) : Object | Test.java:4606:17:4606:33 | (...)... : ByteBuf | provenance |  |
 | Test.java:4607:10:4607:51 | encode(...) : ByteBuf | Test.java:4608:9:4608:11 | out | provenance |  |
-| Test.java:4607:24:4607:25 | in : ByteBuf | Test.java:4607:10:4607:51 | encode(...) : ByteBuf | provenance | MaD:209 |
+| Test.java:4607:24:4607:25 | in : ByteBuf | Test.java:4607:10:4607:51 | encode(...) : ByteBuf | provenance | MaD:214 |
 | Test.java:4613:17:4613:33 | (...)... : ByteBuf | Test.java:4614:24:4614:25 | in : ByteBuf | provenance |  |
 | Test.java:4613:26:4613:33 | source(...) : Object | Test.java:4613:17:4613:33 | (...)... : ByteBuf | provenance |  |
 | Test.java:4614:10:4614:33 | encode(...) : ByteBuf | Test.java:4615:9:4615:11 | out | provenance |  |
-| Test.java:4614:24:4614:25 | in : ByteBuf | Test.java:4614:10:4614:33 | encode(...) : ByteBuf | provenance | MaD:209 |
+| Test.java:4614:24:4614:25 | in : ByteBuf | Test.java:4614:10:4614:33 | encode(...) : ByteBuf | provenance | MaD:214 |
 | Test.java:4620:17:4620:33 | (...)... : ByteBuf | Test.java:4621:24:4621:25 | in : ByteBuf | provenance |  |
 | Test.java:4620:26:4620:33 | source(...) : Object | Test.java:4620:17:4620:33 | (...)... : ByteBuf | provenance |  |
 | Test.java:4621:10:4621:54 | encode(...) : ByteBuf | Test.java:4622:9:4622:11 | out | provenance |  |
-| Test.java:4621:24:4621:25 | in : ByteBuf | Test.java:4621:10:4621:54 | encode(...) : ByteBuf | provenance | MaD:209 |
+| Test.java:4621:24:4621:25 | in : ByteBuf | Test.java:4621:10:4621:54 | encode(...) : ByteBuf | provenance | MaD:214 |
 | Test.java:4627:16:4627:31 | (...)... : Cookie | Test.java:4628:10:4628:11 | in : Cookie | provenance |  |
 | Test.java:4627:24:4627:31 | source(...) : Object | Test.java:4627:16:4627:31 | (...)... : Cookie | provenance |  |
-| Test.java:4628:10:4628:11 | in : Cookie | Test.java:4628:10:4628:20 | domain(...) : String | provenance | MaD:210 |
+| Test.java:4628:10:4628:11 | in : Cookie | Test.java:4628:10:4628:20 | domain(...) : String | provenance | MaD:215 |
 | Test.java:4628:10:4628:20 | domain(...) : String | Test.java:4629:9:4629:11 | out | provenance |  |
 | Test.java:4634:23:4634:45 | (...)... : DefaultCookie | Test.java:4635:10:4635:11 | in : DefaultCookie | provenance |  |
 | Test.java:4634:38:4634:45 | source(...) : Object | Test.java:4634:23:4634:45 | (...)... : DefaultCookie | provenance |  |
-| Test.java:4635:10:4635:11 | in : DefaultCookie | Test.java:4635:10:4635:20 | domain(...) : String | provenance | MaD:210 |
+| Test.java:4635:10:4635:11 | in : DefaultCookie | Test.java:4635:10:4635:20 | domain(...) : String | provenance | MaD:215 |
 | Test.java:4635:10:4635:20 | domain(...) : String | Test.java:4636:9:4636:11 | out | provenance |  |
 | Test.java:4641:16:4641:31 | (...)... : Cookie | Test.java:4642:10:4642:11 | in : Cookie | provenance |  |
 | Test.java:4641:24:4641:31 | source(...) : Object | Test.java:4641:16:4641:31 | (...)... : Cookie | provenance |  |
-| Test.java:4642:10:4642:11 | in : Cookie | Test.java:4642:10:4642:18 | name(...) : String | provenance | MaD:211 |
+| Test.java:4642:10:4642:11 | in : Cookie | Test.java:4642:10:4642:18 | name(...) : String | provenance | MaD:216 |
 | Test.java:4642:10:4642:18 | name(...) : String | Test.java:4643:9:4643:11 | out | provenance |  |
 | Test.java:4648:23:4648:45 | (...)... : DefaultCookie | Test.java:4649:10:4649:11 | in : DefaultCookie | provenance |  |
 | Test.java:4648:38:4648:45 | source(...) : Object | Test.java:4648:23:4648:45 | (...)... : DefaultCookie | provenance |  |
-| Test.java:4649:10:4649:11 | in : DefaultCookie | Test.java:4649:10:4649:18 | name(...) : String | provenance | MaD:211 |
+| Test.java:4649:10:4649:11 | in : DefaultCookie | Test.java:4649:10:4649:18 | name(...) : String | provenance | MaD:216 |
 | Test.java:4649:10:4649:18 | name(...) : String | Test.java:4650:9:4650:11 | out | provenance |  |
 | Test.java:4655:16:4655:31 | (...)... : Cookie | Test.java:4656:10:4656:11 | in : Cookie | provenance |  |
 | Test.java:4655:24:4655:31 | source(...) : Object | Test.java:4655:16:4655:31 | (...)... : Cookie | provenance |  |
-| Test.java:4656:10:4656:11 | in : Cookie | Test.java:4656:10:4656:18 | path(...) : String | provenance | MaD:212 |
+| Test.java:4656:10:4656:11 | in : Cookie | Test.java:4656:10:4656:18 | path(...) : String | provenance | MaD:217 |
 | Test.java:4656:10:4656:18 | path(...) : String | Test.java:4657:9:4657:11 | out | provenance |  |
 | Test.java:4662:23:4662:45 | (...)... : DefaultCookie | Test.java:4663:10:4663:11 | in : DefaultCookie | provenance |  |
 | Test.java:4662:38:4662:45 | source(...) : Object | Test.java:4662:23:4662:45 | (...)... : DefaultCookie | provenance |  |
-| Test.java:4663:10:4663:11 | in : DefaultCookie | Test.java:4663:10:4663:18 | path(...) : String | provenance | MaD:212 |
+| Test.java:4663:10:4663:11 | in : DefaultCookie | Test.java:4663:10:4663:18 | path(...) : String | provenance | MaD:217 |
 | Test.java:4663:10:4663:18 | path(...) : String | Test.java:4664:9:4664:11 | out | provenance |  |
 | Test.java:4669:16:4669:31 | (...)... : String | Test.java:4670:18:4670:19 | in : String | provenance |  |
 | Test.java:4669:24:4669:31 | source(...) : Object | Test.java:4669:16:4669:31 | (...)... : String | provenance |  |
 | Test.java:4670:4:4670:6 | out [post update] : Cookie | Test.java:4671:9:4671:11 | out | provenance |  |
-| Test.java:4670:18:4670:19 | in : String | Test.java:4670:4:4670:6 | out [post update] : Cookie | provenance | MaD:214 |
+| Test.java:4670:18:4670:19 | in : String | Test.java:4670:4:4670:6 | out [post update] : Cookie | provenance | MaD:218 |
 | Test.java:4676:16:4676:31 | (...)... : String | Test.java:4677:18:4677:19 | in : String | provenance |  |
 | Test.java:4676:24:4676:31 | source(...) : Object | Test.java:4676:16:4676:31 | (...)... : String | provenance |  |
 | Test.java:4677:4:4677:6 | out [post update] : DefaultCookie | Test.java:4678:9:4678:11 | out | provenance |  |
-| Test.java:4677:18:4677:19 | in : String | Test.java:4677:4:4677:6 | out [post update] : DefaultCookie | provenance | MaD:214 |
+| Test.java:4677:18:4677:19 | in : String | Test.java:4677:4:4677:6 | out [post update] : DefaultCookie | provenance | MaD:218 |
 | Test.java:4683:16:4683:31 | (...)... : String | Test.java:4684:16:4684:17 | in : String | provenance |  |
 | Test.java:4683:24:4683:31 | source(...) : Object | Test.java:4683:16:4683:31 | (...)... : String | provenance |  |
 | Test.java:4684:4:4684:6 | out [post update] : Cookie | Test.java:4685:9:4685:11 | out | provenance |  |
-| Test.java:4684:16:4684:17 | in : String | Test.java:4684:4:4684:6 | out [post update] : Cookie | provenance | MaD:215 |
+| Test.java:4684:16:4684:17 | in : String | Test.java:4684:4:4684:6 | out [post update] : Cookie | provenance | MaD:219 |
 | Test.java:4690:16:4690:31 | (...)... : String | Test.java:4691:16:4691:17 | in : String | provenance |  |
 | Test.java:4690:24:4690:31 | source(...) : Object | Test.java:4690:16:4690:31 | (...)... : String | provenance |  |
 | Test.java:4691:4:4691:6 | out [post update] : DefaultCookie | Test.java:4692:9:4692:11 | out | provenance |  |
-| Test.java:4691:16:4691:17 | in : String | Test.java:4691:4:4691:6 | out [post update] : DefaultCookie | provenance | MaD:215 |
+| Test.java:4691:16:4691:17 | in : String | Test.java:4691:4:4691:6 | out [post update] : DefaultCookie | provenance | MaD:219 |
 | Test.java:4697:16:4697:31 | (...)... : String | Test.java:4698:17:4698:18 | in : String | provenance |  |
 | Test.java:4697:24:4697:31 | source(...) : Object | Test.java:4697:16:4697:31 | (...)... : String | provenance |  |
 | Test.java:4698:4:4698:6 | out [post update] : Cookie | Test.java:4699:9:4699:11 | out | provenance |  |
-| Test.java:4698:17:4698:18 | in : String | Test.java:4698:4:4698:6 | out [post update] : Cookie | provenance | MaD:216 |
+| Test.java:4698:17:4698:18 | in : String | Test.java:4698:4:4698:6 | out [post update] : Cookie | provenance | MaD:220 |
 | Test.java:4704:16:4704:31 | (...)... : String | Test.java:4705:17:4705:18 | in : String | provenance |  |
 | Test.java:4704:24:4704:31 | source(...) : Object | Test.java:4704:16:4704:31 | (...)... : String | provenance |  |
 | Test.java:4705:4:4705:6 | out [post update] : DefaultCookie | Test.java:4706:9:4706:11 | out | provenance |  |
-| Test.java:4705:17:4705:18 | in : String | Test.java:4705:4:4705:6 | out [post update] : DefaultCookie | provenance | MaD:216 |
+| Test.java:4705:17:4705:18 | in : String | Test.java:4705:4:4705:6 | out [post update] : DefaultCookie | provenance | MaD:220 |
 | Test.java:4711:16:4711:31 | (...)... : Cookie | Test.java:4712:10:4712:11 | in : Cookie | provenance |  |
 | Test.java:4711:24:4711:31 | source(...) : Object | Test.java:4711:16:4711:31 | (...)... : Cookie | provenance |  |
-| Test.java:4712:10:4712:11 | in : Cookie | Test.java:4712:10:4712:19 | value(...) : String | provenance | MaD:213 |
+| Test.java:4712:10:4712:11 | in : Cookie | Test.java:4712:10:4712:19 | value(...) : String | provenance | MaD:221 |
 | Test.java:4712:10:4712:19 | value(...) : String | Test.java:4713:9:4713:11 | out | provenance |  |
 | Test.java:4718:23:4718:45 | (...)... : DefaultCookie | Test.java:4719:10:4719:11 | in : DefaultCookie | provenance |  |
 | Test.java:4718:38:4718:45 | source(...) : Object | Test.java:4718:23:4718:45 | (...)... : DefaultCookie | provenance |  |
-| Test.java:4719:10:4719:11 | in : DefaultCookie | Test.java:4719:10:4719:19 | value(...) : String | provenance | MaD:213 |
+| Test.java:4719:10:4719:11 | in : DefaultCookie | Test.java:4719:10:4719:19 | value(...) : String | provenance | MaD:221 |
 | Test.java:4719:10:4719:19 | value(...) : String | Test.java:4720:9:4720:11 | out | provenance |  |
 | Test.java:4725:16:4725:31 | (...)... : String | Test.java:4727:26:4727:27 | in : String | provenance |  |
 | Test.java:4725:24:4725:31 | source(...) : Object | Test.java:4725:16:4725:31 | (...)... : String | provenance |  |
 | Test.java:4727:10:4727:28 | decode(...) : Set [<element>] : Object | Test.java:4728:20:4728:22 | out : Set [<element>] : Object | provenance |  |
-| Test.java:4727:26:4727:27 | in : String | Test.java:4727:10:4727:28 | decode(...) : Set [<element>] : Object | provenance | MaD:217 |
+| Test.java:4727:26:4727:27 | in : String | Test.java:4727:10:4727:28 | decode(...) : Set [<element>] : Object | provenance | MaD:222 |
 | Test.java:4728:20:4728:22 | out : Set [<element>] : Object | Test.java:79:19:79:32 | it : Set [<element>] : Object | provenance |  |
-| Test.java:4728:20:4728:22 | out : Set [<element>] : Object | Test.java:4728:9:4728:23 | getElement(...) | provenance | MaD:492 |
+| Test.java:4728:20:4728:22 | out : Set [<element>] : Object | Test.java:4728:9:4728:23 | getElement(...) | provenance | MaD:495 |
 | Test.java:4733:16:4733:31 | (...)... : String | Test.java:4735:29:4735:30 | in : String | provenance |  |
 | Test.java:4733:24:4733:31 | source(...) : Object | Test.java:4733:16:4733:31 | (...)... : String | provenance |  |
 | Test.java:4735:10:4735:31 | decodeAll(...) : List [<element>] : Object | Test.java:4736:20:4736:22 | out : List [<element>] : Object | provenance |  |
-| Test.java:4735:29:4735:30 | in : String | Test.java:4735:10:4735:31 | decodeAll(...) : List [<element>] : Object | provenance | MaD:218 |
+| Test.java:4735:29:4735:30 | in : String | Test.java:4735:10:4735:31 | decodeAll(...) : List [<element>] : Object | provenance | MaD:223 |
 | Test.java:4736:20:4736:22 | out : List [<element>] : Object | Test.java:79:19:79:32 | it : List [<element>] : Object | provenance |  |
-| Test.java:4736:20:4736:22 | out : List [<element>] : Object | Test.java:4736:9:4736:23 | getElement(...) | provenance | MaD:492 |
+| Test.java:4736:20:4736:22 | out : List [<element>] : Object | Test.java:4736:9:4736:23 | getElement(...) | provenance | MaD:495 |
 | Test.java:4741:20:4741:48 | (...)... : List [<element>] : Object | Test.java:4743:26:4743:27 | in : List [<element>] : Object | provenance |  |
 | Test.java:4741:32:4741:48 | of(...) : List [<element>] : Object | Test.java:4741:20:4741:48 | (...)... : List [<element>] : Object | provenance |  |
-| Test.java:4741:40:4741:47 | source(...) : Object | Test.java:4741:32:4741:48 | of(...) : List [<element>] : Object | provenance | MaD:494 |
+| Test.java:4741:40:4741:47 | source(...) : Object | Test.java:4741:32:4741:48 | of(...) : List [<element>] : Object | provenance | MaD:497 |
 | Test.java:4743:10:4743:28 | encode(...) : List [<element>] : Object | Test.java:4744:20:4744:22 | out : List [<element>] : Object | provenance |  |
-| Test.java:4743:26:4743:27 | in : List [<element>] : Object | Test.java:4743:10:4743:28 | encode(...) : List [<element>] : Object | provenance | MaD:221 |
+| Test.java:4743:26:4743:27 | in : List [<element>] : Object | Test.java:4743:10:4743:28 | encode(...) : List [<element>] : Object | provenance | MaD:224 |
 | Test.java:4744:20:4744:22 | out : List [<element>] : Object | Test.java:79:19:79:32 | it : List [<element>] : Object | provenance |  |
-| Test.java:4744:20:4744:22 | out : List [<element>] : Object | Test.java:4744:9:4744:23 | getElement(...) | provenance | MaD:492 |
+| Test.java:4744:20:4744:22 | out : List [<element>] : Object | Test.java:4744:9:4744:23 | getElement(...) | provenance | MaD:495 |
 | Test.java:4749:16:4749:31 | (...)... : Cookie | Test.java:4751:26:4751:27 | in : Cookie | provenance |  |
 | Test.java:4749:24:4749:31 | source(...) : Object | Test.java:4749:16:4749:31 | (...)... : Cookie | provenance |  |
 | Test.java:4751:10:4751:28 | encode(...) : String | Test.java:4752:9:4752:11 | out | provenance |  |
-| Test.java:4751:26:4751:27 | in : Cookie | Test.java:4751:10:4751:28 | encode(...) : String | provenance | MaD:219 |
+| Test.java:4751:26:4751:27 | in : Cookie | Test.java:4751:10:4751:28 | encode(...) : String | provenance | MaD:225 |
 | Test.java:4757:18:4757:57 | (...)... : Cookie[] [[]] : Cookie | Test.java:4759:26:4759:27 | in : Cookie[] [[]] : Cookie | provenance |  |
 | Test.java:4757:28:4757:57 | {...} : Cookie[] [[]] : Cookie | Test.java:4757:18:4757:57 | (...)... : Cookie[] [[]] : Cookie | provenance |  |
 | Test.java:4757:41:4757:56 | (...)... : Cookie | Test.java:4757:28:4757:57 | {...} : Cookie[] [[]] : Cookie | provenance |  |
 | Test.java:4757:49:4757:56 | source(...) : Object | Test.java:4757:41:4757:56 | (...)... : Cookie | provenance |  |
 | Test.java:4759:10:4759:28 | encode(...) : List [<element>] : Object | Test.java:4760:20:4760:22 | out : List [<element>] : Object | provenance |  |
-| Test.java:4759:26:4759:27 | in : Cookie[] [[]] : Cookie | Test.java:4759:10:4759:28 | encode(...) : List [<element>] : Object | provenance | MaD:220 |
+| Test.java:4759:26:4759:27 | in : Cookie[] [[]] : Cookie | Test.java:4759:10:4759:28 | encode(...) : List [<element>] : Object | provenance | MaD:226 |
 | Test.java:4760:20:4760:22 | out : List [<element>] : Object | Test.java:79:19:79:32 | it : List [<element>] : Object | provenance |  |
-| Test.java:4760:20:4760:22 | out : List [<element>] : Object | Test.java:4760:9:4760:23 | getElement(...) | provenance | MaD:492 |
+| Test.java:4760:20:4760:22 | out : List [<element>] : Object | Test.java:4760:9:4760:23 | getElement(...) | provenance | MaD:495 |
 | Test.java:4765:18:4765:44 | (...)... : List [<element>] : Object | Test.java:4767:26:4767:27 | in : List [<element>] : Object | provenance |  |
 | Test.java:4765:28:4765:44 | of(...) : List [<element>] : Object | Test.java:4765:18:4765:44 | (...)... : List [<element>] : Object | provenance |  |
-| Test.java:4765:36:4765:43 | source(...) : Object | Test.java:4765:28:4765:44 | of(...) : List [<element>] : Object | provenance | MaD:494 |
+| Test.java:4765:36:4765:43 | source(...) : Object | Test.java:4765:28:4765:44 | of(...) : List [<element>] : Object | provenance | MaD:497 |
 | Test.java:4767:10:4767:28 | encode(...) : List [<element>] : Object | Test.java:4768:20:4768:22 | out : List [<element>] : Object | provenance |  |
-| Test.java:4767:26:4767:27 | in : List [<element>] : Object | Test.java:4767:10:4767:28 | encode(...) : List [<element>] : Object | provenance | MaD:222 |
+| Test.java:4767:26:4767:27 | in : List [<element>] : Object | Test.java:4767:10:4767:28 | encode(...) : List [<element>] : Object | provenance | MaD:227 |
 | Test.java:4768:20:4768:22 | out : List [<element>] : Object | Test.java:79:19:79:32 | it : List [<element>] : Object | provenance |  |
-| Test.java:4768:20:4768:22 | out : List [<element>] : Object | Test.java:4768:9:4768:23 | getElement(...) | provenance | MaD:492 |
+| Test.java:4768:20:4768:22 | out : List [<element>] : Object | Test.java:4768:9:4768:23 | getElement(...) | provenance | MaD:495 |
 | Test.java:4773:16:4773:31 | (...)... : String | Test.java:4775:32:4775:33 | in : String | provenance |  |
 | Test.java:4773:24:4773:31 | source(...) : Object | Test.java:4773:16:4773:31 | (...)... : String | provenance |  |
 | Test.java:4775:10:4775:34 | encode(...) : String | Test.java:4776:9:4776:11 | out | provenance |  |
-| Test.java:4775:32:4775:33 | in : String | Test.java:4775:10:4775:34 | encode(...) : String | provenance | MaD:223 |
+| Test.java:4775:32:4775:33 | in : String | Test.java:4775:10:4775:34 | encode(...) : String | provenance | MaD:228 |
 | Test.java:4781:19:4781:37 | (...)... : Attribute | Test.java:4782:10:4782:11 | in : Attribute | provenance |  |
 | Test.java:4781:30:4781:37 | source(...) : Object | Test.java:4781:19:4781:37 | (...)... : Attribute | provenance |  |
-| Test.java:4782:10:4782:11 | in : Attribute | Test.java:4782:10:4782:22 | getValue(...) : String | provenance | MaD:316 |
+| Test.java:4782:10:4782:11 | in : Attribute | Test.java:4782:10:4782:22 | getValue(...) : String | provenance | MaD:229 |
 | Test.java:4782:10:4782:22 | getValue(...) : String | Test.java:4783:9:4783:11 | out | provenance |  |
 | Test.java:4788:16:4788:31 | (...)... : String | Test.java:4789:17:4789:18 | in : String | provenance |  |
 | Test.java:4788:24:4788:31 | source(...) : Object | Test.java:4788:16:4788:31 | (...)... : String | provenance |  |
 | Test.java:4789:4:4789:6 | out [post update] : Attribute | Test.java:4790:9:4790:11 | out | provenance |  |
-| Test.java:4789:17:4789:18 | in : String | Test.java:4789:4:4789:6 | out [post update] : Attribute | provenance | MaD:317 |
+| Test.java:4789:17:4789:18 | in : String | Test.java:4789:4:4789:6 | out [post update] : Attribute | provenance | MaD:230 |
 | Test.java:4795:20:4795:39 | (...)... : FileUpload | Test.java:4796:10:4796:11 | in : FileUpload | provenance |  |
 | Test.java:4795:32:4795:39 | source(...) : Object | Test.java:4795:20:4795:39 | (...)... : FileUpload | provenance |  |
-| Test.java:4796:10:4796:11 | in : FileUpload | Test.java:4796:10:4796:40 | getContentTransferEncoding(...) : String | provenance | MaD:318 |
+| Test.java:4796:10:4796:11 | in : FileUpload | Test.java:4796:10:4796:40 | getContentTransferEncoding(...) : String | provenance | MaD:231 |
 | Test.java:4796:10:4796:40 | getContentTransferEncoding(...) : String | Test.java:4797:9:4797:11 | out | provenance |  |
 | Test.java:4802:20:4802:39 | (...)... : FileUpload | Test.java:4803:10:4803:11 | in : FileUpload | provenance |  |
 | Test.java:4802:32:4802:39 | source(...) : Object | Test.java:4802:20:4802:39 | (...)... : FileUpload | provenance |  |
-| Test.java:4803:10:4803:11 | in : FileUpload | Test.java:4803:10:4803:28 | getContentType(...) : String | provenance | MaD:319 |
+| Test.java:4803:10:4803:11 | in : FileUpload | Test.java:4803:10:4803:28 | getContentType(...) : String | provenance | MaD:232 |
 | Test.java:4803:10:4803:28 | getContentType(...) : String | Test.java:4804:9:4804:11 | out | provenance |  |
 | Test.java:4809:20:4809:39 | (...)... : FileUpload | Test.java:4810:10:4810:11 | in : FileUpload | provenance |  |
 | Test.java:4809:32:4809:39 | source(...) : Object | Test.java:4809:20:4809:39 | (...)... : FileUpload | provenance |  |
-| Test.java:4810:10:4810:11 | in : FileUpload | Test.java:4810:10:4810:25 | getFilename(...) : String | provenance | MaD:320 |
+| Test.java:4810:10:4810:11 | in : FileUpload | Test.java:4810:10:4810:25 | getFilename(...) : String | provenance | MaD:233 |
 | Test.java:4810:10:4810:25 | getFilename(...) : String | Test.java:4811:9:4811:11 | out | provenance |  |
 | Test.java:4816:16:4816:31 | (...)... : String | Test.java:4817:35:4817:36 | in : String | provenance |  |
 | Test.java:4816:24:4816:31 | source(...) : Object | Test.java:4816:16:4816:31 | (...)... : String | provenance |  |
 | Test.java:4817:4:4817:6 | out [post update] : FileUpload | Test.java:4818:9:4818:11 | out | provenance |  |
-| Test.java:4817:35:4817:36 | in : String | Test.java:4817:4:4817:6 | out [post update] : FileUpload | provenance | MaD:321 |
+| Test.java:4817:35:4817:36 | in : String | Test.java:4817:4:4817:6 | out [post update] : FileUpload | provenance | MaD:234 |
 | Test.java:4823:16:4823:31 | (...)... : String | Test.java:4824:23:4824:24 | in : String | provenance |  |
 | Test.java:4823:24:4823:31 | source(...) : Object | Test.java:4823:16:4823:31 | (...)... : String | provenance |  |
 | Test.java:4824:4:4824:6 | out [post update] : FileUpload | Test.java:4825:9:4825:11 | out | provenance |  |
-| Test.java:4824:23:4824:24 | in : String | Test.java:4824:4:4824:6 | out [post update] : FileUpload | provenance | MaD:322 |
+| Test.java:4824:23:4824:24 | in : String | Test.java:4824:4:4824:6 | out [post update] : FileUpload | provenance | MaD:235 |
 | Test.java:4830:16:4830:31 | (...)... : String | Test.java:4831:20:4831:21 | in : String | provenance |  |
 | Test.java:4830:24:4830:31 | source(...) : Object | Test.java:4830:16:4830:31 | (...)... : String | provenance |  |
 | Test.java:4831:4:4831:6 | out [post update] : FileUpload | Test.java:4832:9:4832:11 | out | provenance |  |
-| Test.java:4831:20:4831:21 | in : String | Test.java:4831:4:4831:6 | out [post update] : FileUpload | provenance | MaD:323 |
+| Test.java:4831:20:4831:21 | in : String | Test.java:4831:4:4831:6 | out [post update] : FileUpload | provenance | MaD:236 |
 | Test.java:4837:17:4837:33 | (...)... : ByteBuf | Test.java:4838:19:4838:20 | in : ByteBuf | provenance |  |
 | Test.java:4837:26:4837:33 | source(...) : Object | Test.java:4837:17:4837:33 | (...)... : ByteBuf | provenance |  |
 | Test.java:4838:4:4838:6 | out [post update] : HttpData | Test.java:4839:9:4839:11 | out | provenance |  |
-| Test.java:4838:19:4838:20 | in : ByteBuf | Test.java:4838:4:4838:6 | out [post update] : HttpData | provenance | MaD:310 |
+| Test.java:4838:19:4838:20 | in : ByteBuf | Test.java:4838:4:4838:6 | out [post update] : HttpData | provenance | MaD:237 |
 | Test.java:4844:18:4844:35 | (...)... : HttpData | Test.java:4845:10:4845:11 | in : HttpData | provenance |  |
 | Test.java:4844:28:4844:35 | source(...) : Object | Test.java:4844:18:4844:35 | (...)... : HttpData | provenance |  |
-| Test.java:4845:10:4845:11 | in : HttpData | Test.java:4845:10:4845:17 | get(...) : byte[] | provenance | MaD:311 |
+| Test.java:4845:10:4845:11 | in : HttpData | Test.java:4845:10:4845:17 | get(...) : byte[] | provenance | MaD:238 |
 | Test.java:4845:10:4845:17 | get(...) : byte[] | Test.java:4846:9:4846:11 | out | provenance |  |
 | Test.java:4851:18:4851:35 | (...)... : HttpData | Test.java:4852:10:4852:11 | in : HttpData | provenance |  |
 | Test.java:4851:28:4851:35 | source(...) : Object | Test.java:4851:18:4851:35 | (...)... : HttpData | provenance |  |
-| Test.java:4852:10:4852:11 | in : HttpData | Test.java:4852:10:4852:24 | getByteBuf(...) : ByteBuf | provenance | MaD:312 |
+| Test.java:4852:10:4852:11 | in : HttpData | Test.java:4852:10:4852:24 | getByteBuf(...) : ByteBuf | provenance | MaD:239 |
 | Test.java:4852:10:4852:24 | getByteBuf(...) : ByteBuf | Test.java:4853:9:4853:11 | out | provenance |  |
 | Test.java:4858:18:4858:35 | (...)... : HttpData | Test.java:4859:10:4859:11 | in : HttpData | provenance |  |
 | Test.java:4858:28:4858:35 | source(...) : Object | Test.java:4858:18:4858:35 | (...)... : HttpData | provenance |  |
-| Test.java:4859:10:4859:11 | in : HttpData | Test.java:4859:10:4859:23 | getChunk(...) : ByteBuf | provenance | MaD:313 |
+| Test.java:4859:10:4859:11 | in : HttpData | Test.java:4859:10:4859:23 | getChunk(...) : ByteBuf | provenance | MaD:240 |
 | Test.java:4859:10:4859:23 | getChunk(...) : ByteBuf | Test.java:4860:9:4860:11 | out | provenance |  |
 | Test.java:4865:18:4865:35 | (...)... : HttpData | Test.java:4866:10:4866:11 | in : HttpData | provenance |  |
 | Test.java:4865:28:4865:35 | source(...) : Object | Test.java:4865:18:4865:35 | (...)... : HttpData | provenance |  |
-| Test.java:4866:10:4866:11 | in : HttpData | Test.java:4866:10:4866:23 | getString(...) : String | provenance | MaD:314 |
+| Test.java:4866:10:4866:11 | in : HttpData | Test.java:4866:10:4866:23 | getString(...) : String | provenance | MaD:241 |
 | Test.java:4866:10:4866:23 | getString(...) : String | Test.java:4867:9:4867:11 | out | provenance |  |
 | Test.java:4872:18:4872:35 | (...)... : HttpData | Test.java:4873:10:4873:11 | in : HttpData | provenance |  |
 | Test.java:4872:28:4872:35 | source(...) : Object | Test.java:4872:18:4872:35 | (...)... : HttpData | provenance |  |
-| Test.java:4873:10:4873:11 | in : HttpData | Test.java:4873:10:4873:27 | getString(...) : String | provenance | MaD:315 |
+| Test.java:4873:10:4873:11 | in : HttpData | Test.java:4873:10:4873:27 | getString(...) : String | provenance | MaD:242 |
 | Test.java:4873:10:4873:27 | getString(...) : String | Test.java:4874:9:4874:11 | out | provenance |  |
 | Test.java:4879:17:4879:33 | (...)... : ByteBuf | Test.java:4880:19:4880:20 | in : ByteBuf | provenance |  |
 | Test.java:4879:26:4879:33 | source(...) : Object | Test.java:4879:17:4879:33 | (...)... : ByteBuf | provenance |  |
 | Test.java:4880:4:4880:6 | out [post update] : HttpData | Test.java:4881:9:4881:11 | out | provenance |  |
-| Test.java:4880:19:4880:20 | in : ByteBuf | Test.java:4880:4:4880:6 | out [post update] : HttpData | provenance | MaD:324 |
+| Test.java:4880:19:4880:20 | in : ByteBuf | Test.java:4880:4:4880:6 | out [post update] : HttpData | provenance | MaD:243 |
 | Test.java:4886:21:4886:41 | (...)... : InputStream | Test.java:4887:19:4887:20 | in : InputStream | provenance |  |
 | Test.java:4886:34:4886:41 | source(...) : Object | Test.java:4886:21:4886:41 | (...)... : InputStream | provenance |  |
 | Test.java:4887:4:4887:6 | out [post update] : HttpData | Test.java:4888:9:4888:11 | out | provenance |  |
-| Test.java:4887:19:4887:20 | in : InputStream | Test.java:4887:4:4887:6 | out [post update] : HttpData | provenance | MaD:325 |
+| Test.java:4887:19:4887:20 | in : InputStream | Test.java:4887:4:4887:6 | out [post update] : HttpData | provenance | MaD:244 |
 | Test.java:4893:21:4893:41 | (...)... : HttpRequest | Test.java:4894:52:4894:53 | in : HttpRequest | provenance |  |
 | Test.java:4893:34:4893:41 | source(...) : Object | Test.java:4893:21:4893:41 | (...)... : HttpRequest | provenance |  |
 | Test.java:4894:10:4894:54 | new HttpPostMultipartRequestDecoder(...) : HttpPostMultipartRequestDecoder | Test.java:4895:9:4895:11 | out | provenance |  |
-| Test.java:4894:52:4894:53 | in : HttpRequest | Test.java:4894:10:4894:54 | new HttpPostMultipartRequestDecoder(...) : HttpPostMultipartRequestDecoder | provenance | MaD:307 |
+| Test.java:4894:52:4894:53 | in : HttpRequest | Test.java:4894:10:4894:54 | new HttpPostMultipartRequestDecoder(...) : HttpPostMultipartRequestDecoder | provenance | MaD:245 |
 | Test.java:4900:21:4900:41 | (...)... : HttpRequest | Test.java:4901:52:4901:53 | in : HttpRequest | provenance |  |
 | Test.java:4900:34:4900:41 | source(...) : Object | Test.java:4900:21:4900:41 | (...)... : HttpRequest | provenance |  |
 | Test.java:4901:10:4901:60 | new HttpPostMultipartRequestDecoder(...) : HttpPostMultipartRequestDecoder | Test.java:4902:9:4902:11 | out | provenance |  |
-| Test.java:4901:52:4901:53 | in : HttpRequest | Test.java:4901:10:4901:60 | new HttpPostMultipartRequestDecoder(...) : HttpPostMultipartRequestDecoder | provenance | MaD:308 |
+| Test.java:4901:52:4901:53 | in : HttpRequest | Test.java:4901:10:4901:60 | new HttpPostMultipartRequestDecoder(...) : HttpPostMultipartRequestDecoder | provenance | MaD:246 |
 | Test.java:4907:21:4907:41 | (...)... : HttpRequest | Test.java:4908:46:4908:47 | in : HttpRequest | provenance |  |
 | Test.java:4907:34:4907:41 | source(...) : Object | Test.java:4907:21:4907:41 | (...)... : HttpRequest | provenance |  |
 | Test.java:4908:10:4908:48 | new HttpPostMultipartRequestDecoder(...) : HttpPostMultipartRequestDecoder | Test.java:4909:9:4909:11 | out | provenance |  |
-| Test.java:4908:46:4908:47 | in : HttpRequest | Test.java:4908:10:4908:48 | new HttpPostMultipartRequestDecoder(...) : HttpPostMultipartRequestDecoder | provenance | MaD:306 |
+| Test.java:4908:46:4908:47 | in : HttpRequest | Test.java:4908:10:4908:48 | new HttpPostMultipartRequestDecoder(...) : HttpPostMultipartRequestDecoder | provenance | MaD:247 |
 | Test.java:4914:21:4914:41 | (...)... : HttpRequest | Test.java:4915:43:4915:44 | in : HttpRequest | provenance |  |
 | Test.java:4914:34:4914:41 | source(...) : Object | Test.java:4914:21:4914:41 | (...)... : HttpRequest | provenance |  |
 | Test.java:4915:10:4915:45 | new HttpPostRequestDecoder(...) : HttpPostRequestDecoder | Test.java:4916:9:4916:11 | out | provenance |  |
-| Test.java:4915:43:4915:44 | in : HttpRequest | Test.java:4915:10:4915:45 | new HttpPostRequestDecoder(...) : HttpPostRequestDecoder | provenance | MaD:301 |
+| Test.java:4915:43:4915:44 | in : HttpRequest | Test.java:4915:10:4915:45 | new HttpPostRequestDecoder(...) : HttpPostRequestDecoder | provenance | MaD:248 |
 | Test.java:4921:21:4921:41 | (...)... : HttpRequest | Test.java:4922:43:4922:44 | in : HttpRequest | provenance |  |
 | Test.java:4921:34:4921:41 | source(...) : Object | Test.java:4921:21:4921:41 | (...)... : HttpRequest | provenance |  |
 | Test.java:4922:10:4922:51 | new HttpPostRequestDecoder(...) : HttpPostRequestDecoder | Test.java:4923:9:4923:11 | out | provenance |  |
-| Test.java:4922:43:4922:44 | in : HttpRequest | Test.java:4922:10:4922:51 | new HttpPostRequestDecoder(...) : HttpPostRequestDecoder | provenance | MaD:302 |
+| Test.java:4922:43:4922:44 | in : HttpRequest | Test.java:4922:10:4922:51 | new HttpPostRequestDecoder(...) : HttpPostRequestDecoder | provenance | MaD:249 |
 | Test.java:4928:21:4928:41 | (...)... : HttpRequest | Test.java:4929:37:4929:38 | in : HttpRequest | provenance |  |
 | Test.java:4928:34:4928:41 | source(...) : Object | Test.java:4928:21:4928:41 | (...)... : HttpRequest | provenance |  |
 | Test.java:4929:10:4929:39 | new HttpPostRequestDecoder(...) : HttpPostRequestDecoder | Test.java:4930:9:4930:11 | out | provenance |  |
-| Test.java:4929:37:4929:38 | in : HttpRequest | Test.java:4929:10:4929:39 | new HttpPostRequestDecoder(...) : HttpPostRequestDecoder | provenance | MaD:300 |
+| Test.java:4929:37:4929:38 | in : HttpRequest | Test.java:4929:10:4929:39 | new HttpPostRequestDecoder(...) : HttpPostRequestDecoder | provenance | MaD:250 |
 | Test.java:4935:21:4935:41 | (...)... : HttpRequest | Test.java:4936:51:4936:52 | in : HttpRequest | provenance |  |
 | Test.java:4935:34:4935:41 | source(...) : Object | Test.java:4935:21:4935:41 | (...)... : HttpRequest | provenance |  |
 | Test.java:4936:10:4936:53 | new HttpPostStandardRequestDecoder(...) : HttpPostStandardRequestDecoder | Test.java:4937:9:4937:11 | out | provenance |  |
-| Test.java:4936:51:4936:52 | in : HttpRequest | Test.java:4936:10:4936:53 | new HttpPostStandardRequestDecoder(...) : HttpPostStandardRequestDecoder | provenance | MaD:304 |
+| Test.java:4936:51:4936:52 | in : HttpRequest | Test.java:4936:10:4936:53 | new HttpPostStandardRequestDecoder(...) : HttpPostStandardRequestDecoder | provenance | MaD:251 |
 | Test.java:4942:21:4942:41 | (...)... : HttpRequest | Test.java:4943:51:4943:52 | in : HttpRequest | provenance |  |
 | Test.java:4942:34:4942:41 | source(...) : Object | Test.java:4942:21:4942:41 | (...)... : HttpRequest | provenance |  |
 | Test.java:4943:10:4943:59 | new HttpPostStandardRequestDecoder(...) : HttpPostStandardRequestDecoder | Test.java:4944:9:4944:11 | out | provenance |  |
-| Test.java:4943:51:4943:52 | in : HttpRequest | Test.java:4943:10:4943:59 | new HttpPostStandardRequestDecoder(...) : HttpPostStandardRequestDecoder | provenance | MaD:305 |
+| Test.java:4943:51:4943:52 | in : HttpRequest | Test.java:4943:10:4943:59 | new HttpPostStandardRequestDecoder(...) : HttpPostStandardRequestDecoder | provenance | MaD:252 |
 | Test.java:4949:21:4949:41 | (...)... : HttpRequest | Test.java:4950:45:4950:46 | in : HttpRequest | provenance |  |
 | Test.java:4949:34:4949:41 | source(...) : Object | Test.java:4949:21:4949:41 | (...)... : HttpRequest | provenance |  |
 | Test.java:4950:10:4950:47 | new HttpPostStandardRequestDecoder(...) : HttpPostStandardRequestDecoder | Test.java:4951:9:4951:11 | out | provenance |  |
-| Test.java:4950:45:4950:46 | in : HttpRequest | Test.java:4950:10:4950:47 | new HttpPostStandardRequestDecoder(...) : HttpPostStandardRequestDecoder | provenance | MaD:303 |
+| Test.java:4950:45:4950:46 | in : HttpRequest | Test.java:4950:10:4950:47 | new HttpPostStandardRequestDecoder(...) : HttpPostStandardRequestDecoder | provenance | MaD:253 |
 | Test.java:4956:27:4956:53 | (...)... : InterfaceHttpData | Test.java:4957:10:4957:11 | in : InterfaceHttpData | provenance |  |
 | Test.java:4956:46:4956:53 | source(...) : Object | Test.java:4956:27:4956:53 | (...)... : InterfaceHttpData | provenance |  |
-| Test.java:4957:10:4957:11 | in : InterfaceHttpData | Test.java:4957:10:4957:21 | getName(...) : String | provenance | MaD:309 |
+| Test.java:4957:10:4957:11 | in : InterfaceHttpData | Test.java:4957:10:4957:21 | getName(...) : String | provenance | MaD:254 |
 | Test.java:4957:10:4957:21 | getName(...) : String | Test.java:4958:9:4958:11 | out | provenance |  |
 | Test.java:4963:41:4963:81 | (...)... : HttpPostMultipartRequestDecoder | Test.java:4964:10:4964:11 | in : HttpPostMultipartRequestDecoder | provenance |  |
 | Test.java:4963:74:4963:81 | source(...) : Object | Test.java:4963:41:4963:81 | (...)... : HttpPostMultipartRequestDecoder | provenance |  |
-| Test.java:4964:10:4964:11 | in : HttpPostMultipartRequestDecoder | Test.java:4964:10:4964:36 | currentPartialHttpData(...) : InterfaceHttpData | provenance | MaD:293 |
+| Test.java:4964:10:4964:11 | in : HttpPostMultipartRequestDecoder | Test.java:4964:10:4964:36 | currentPartialHttpData(...) : InterfaceHttpData | provenance | MaD:255 |
 | Test.java:4964:10:4964:36 | currentPartialHttpData(...) : InterfaceHttpData | Test.java:4965:9:4965:11 | out | provenance |  |
 | Test.java:4970:32:4970:63 | (...)... : HttpPostRequestDecoder | Test.java:4971:10:4971:11 | in : HttpPostRequestDecoder | provenance |  |
 | Test.java:4970:56:4970:63 | source(...) : Object | Test.java:4970:32:4970:63 | (...)... : HttpPostRequestDecoder | provenance |  |
-| Test.java:4971:10:4971:11 | in : HttpPostRequestDecoder | Test.java:4971:10:4971:36 | currentPartialHttpData(...) : InterfaceHttpData | provenance | MaD:293 |
+| Test.java:4971:10:4971:11 | in : HttpPostRequestDecoder | Test.java:4971:10:4971:36 | currentPartialHttpData(...) : InterfaceHttpData | provenance | MaD:255 |
 | Test.java:4971:10:4971:36 | currentPartialHttpData(...) : InterfaceHttpData | Test.java:4972:9:4972:11 | out | provenance |  |
 | Test.java:4977:40:4977:79 | (...)... : HttpPostStandardRequestDecoder | Test.java:4978:10:4978:11 | in : HttpPostStandardRequestDecoder | provenance |  |
 | Test.java:4977:72:4977:79 | source(...) : Object | Test.java:4977:40:4977:79 | (...)... : HttpPostStandardRequestDecoder | provenance |  |
-| Test.java:4978:10:4978:11 | in : HttpPostStandardRequestDecoder | Test.java:4978:10:4978:36 | currentPartialHttpData(...) : InterfaceHttpData | provenance | MaD:293 |
+| Test.java:4978:10:4978:11 | in : HttpPostStandardRequestDecoder | Test.java:4978:10:4978:36 | currentPartialHttpData(...) : InterfaceHttpData | provenance | MaD:255 |
 | Test.java:4978:10:4978:36 | currentPartialHttpData(...) : InterfaceHttpData | Test.java:4979:9:4979:11 | out | provenance |  |
 | Test.java:4984:41:4984:81 | (...)... : InterfaceHttpPostRequestDecoder | Test.java:4985:10:4985:11 | in : InterfaceHttpPostRequestDecoder | provenance |  |
 | Test.java:4984:74:4984:81 | source(...) : Object | Test.java:4984:41:4984:81 | (...)... : InterfaceHttpPostRequestDecoder | provenance |  |
-| Test.java:4985:10:4985:11 | in : InterfaceHttpPostRequestDecoder | Test.java:4985:10:4985:36 | currentPartialHttpData(...) : InterfaceHttpData | provenance | MaD:293 |
+| Test.java:4985:10:4985:11 | in : InterfaceHttpPostRequestDecoder | Test.java:4985:10:4985:36 | currentPartialHttpData(...) : InterfaceHttpData | provenance | MaD:255 |
 | Test.java:4985:10:4985:36 | currentPartialHttpData(...) : InterfaceHttpData | Test.java:4986:9:4986:11 | out | provenance |  |
 | Test.java:4991:41:4991:81 | (...)... : HttpPostMultipartRequestDecoder | Test.java:4992:10:4992:11 | in : HttpPostMultipartRequestDecoder | provenance |  |
 | Test.java:4991:74:4991:81 | source(...) : Object | Test.java:4991:41:4991:81 | (...)... : HttpPostMultipartRequestDecoder | provenance |  |
-| Test.java:4992:10:4992:11 | in : HttpPostMultipartRequestDecoder | Test.java:4992:10:4992:33 | getBodyHttpData(...) : InterfaceHttpData | provenance | MaD:294 |
+| Test.java:4992:10:4992:11 | in : HttpPostMultipartRequestDecoder | Test.java:4992:10:4992:33 | getBodyHttpData(...) : InterfaceHttpData | provenance | MaD:256 |
 | Test.java:4992:10:4992:33 | getBodyHttpData(...) : InterfaceHttpData | Test.java:4993:9:4993:11 | out | provenance |  |
 | Test.java:4998:32:4998:63 | (...)... : HttpPostRequestDecoder | Test.java:4999:10:4999:11 | in : HttpPostRequestDecoder | provenance |  |
 | Test.java:4998:56:4998:63 | source(...) : Object | Test.java:4998:32:4998:63 | (...)... : HttpPostRequestDecoder | provenance |  |
-| Test.java:4999:10:4999:11 | in : HttpPostRequestDecoder | Test.java:4999:10:4999:33 | getBodyHttpData(...) : InterfaceHttpData | provenance | MaD:294 |
+| Test.java:4999:10:4999:11 | in : HttpPostRequestDecoder | Test.java:4999:10:4999:33 | getBodyHttpData(...) : InterfaceHttpData | provenance | MaD:256 |
 | Test.java:4999:10:4999:33 | getBodyHttpData(...) : InterfaceHttpData | Test.java:5000:9:5000:11 | out | provenance |  |
 | Test.java:5005:40:5005:79 | (...)... : HttpPostStandardRequestDecoder | Test.java:5006:10:5006:11 | in : HttpPostStandardRequestDecoder | provenance |  |
 | Test.java:5005:72:5005:79 | source(...) : Object | Test.java:5005:40:5005:79 | (...)... : HttpPostStandardRequestDecoder | provenance |  |
-| Test.java:5006:10:5006:11 | in : HttpPostStandardRequestDecoder | Test.java:5006:10:5006:33 | getBodyHttpData(...) : InterfaceHttpData | provenance | MaD:294 |
+| Test.java:5006:10:5006:11 | in : HttpPostStandardRequestDecoder | Test.java:5006:10:5006:33 | getBodyHttpData(...) : InterfaceHttpData | provenance | MaD:256 |
 | Test.java:5006:10:5006:33 | getBodyHttpData(...) : InterfaceHttpData | Test.java:5007:9:5007:11 | out | provenance |  |
 | Test.java:5012:41:5012:81 | (...)... : InterfaceHttpPostRequestDecoder | Test.java:5013:10:5013:11 | in : InterfaceHttpPostRequestDecoder | provenance |  |
 | Test.java:5012:74:5012:81 | source(...) : Object | Test.java:5012:41:5012:81 | (...)... : InterfaceHttpPostRequestDecoder | provenance |  |
-| Test.java:5013:10:5013:11 | in : InterfaceHttpPostRequestDecoder | Test.java:5013:10:5013:33 | getBodyHttpData(...) : InterfaceHttpData | provenance | MaD:294 |
+| Test.java:5013:10:5013:11 | in : InterfaceHttpPostRequestDecoder | Test.java:5013:10:5013:33 | getBodyHttpData(...) : InterfaceHttpData | provenance | MaD:256 |
 | Test.java:5013:10:5013:33 | getBodyHttpData(...) : InterfaceHttpData | Test.java:5014:9:5014:11 | out | provenance |  |
 | Test.java:5019:41:5019:81 | (...)... : HttpPostMultipartRequestDecoder | Test.java:5020:10:5020:11 | in : HttpPostMultipartRequestDecoder | provenance |  |
 | Test.java:5019:74:5019:81 | source(...) : Object | Test.java:5019:41:5019:81 | (...)... : HttpPostMultipartRequestDecoder | provenance |  |
-| Test.java:5020:10:5020:11 | in : HttpPostMultipartRequestDecoder | Test.java:5020:10:5020:30 | getBodyHttpDatas(...) : List | provenance | MaD:295 |
+| Test.java:5020:10:5020:11 | in : HttpPostMultipartRequestDecoder | Test.java:5020:10:5020:30 | getBodyHttpDatas(...) : List | provenance | MaD:257 |
 | Test.java:5020:10:5020:30 | getBodyHttpDatas(...) : List | Test.java:5021:9:5021:11 | out | provenance |  |
 | Test.java:5026:32:5026:63 | (...)... : HttpPostRequestDecoder | Test.java:5027:10:5027:11 | in : HttpPostRequestDecoder | provenance |  |
 | Test.java:5026:56:5026:63 | source(...) : Object | Test.java:5026:32:5026:63 | (...)... : HttpPostRequestDecoder | provenance |  |
-| Test.java:5027:10:5027:11 | in : HttpPostRequestDecoder | Test.java:5027:10:5027:30 | getBodyHttpDatas(...) : List | provenance | MaD:295 |
+| Test.java:5027:10:5027:11 | in : HttpPostRequestDecoder | Test.java:5027:10:5027:30 | getBodyHttpDatas(...) : List | provenance | MaD:257 |
 | Test.java:5027:10:5027:30 | getBodyHttpDatas(...) : List | Test.java:5028:9:5028:11 | out | provenance |  |
 | Test.java:5033:40:5033:79 | (...)... : HttpPostStandardRequestDecoder | Test.java:5034:10:5034:11 | in : HttpPostStandardRequestDecoder | provenance |  |
 | Test.java:5033:72:5033:79 | source(...) : Object | Test.java:5033:40:5033:79 | (...)... : HttpPostStandardRequestDecoder | provenance |  |
-| Test.java:5034:10:5034:11 | in : HttpPostStandardRequestDecoder | Test.java:5034:10:5034:30 | getBodyHttpDatas(...) : List | provenance | MaD:295 |
+| Test.java:5034:10:5034:11 | in : HttpPostStandardRequestDecoder | Test.java:5034:10:5034:30 | getBodyHttpDatas(...) : List | provenance | MaD:257 |
 | Test.java:5034:10:5034:30 | getBodyHttpDatas(...) : List | Test.java:5035:9:5035:11 | out | provenance |  |
 | Test.java:5040:41:5040:81 | (...)... : InterfaceHttpPostRequestDecoder | Test.java:5041:10:5041:11 | in : InterfaceHttpPostRequestDecoder | provenance |  |
 | Test.java:5040:74:5040:81 | source(...) : Object | Test.java:5040:41:5040:81 | (...)... : InterfaceHttpPostRequestDecoder | provenance |  |
-| Test.java:5041:10:5041:11 | in : InterfaceHttpPostRequestDecoder | Test.java:5041:10:5041:30 | getBodyHttpDatas(...) : List | provenance | MaD:295 |
+| Test.java:5041:10:5041:11 | in : InterfaceHttpPostRequestDecoder | Test.java:5041:10:5041:30 | getBodyHttpDatas(...) : List | provenance | MaD:257 |
 | Test.java:5041:10:5041:30 | getBodyHttpDatas(...) : List | Test.java:5042:9:5042:11 | out | provenance |  |
 | Test.java:5047:41:5047:81 | (...)... : HttpPostMultipartRequestDecoder | Test.java:5048:10:5048:11 | in : HttpPostMultipartRequestDecoder | provenance |  |
 | Test.java:5047:74:5047:81 | source(...) : Object | Test.java:5047:41:5047:81 | (...)... : HttpPostMultipartRequestDecoder | provenance |  |
-| Test.java:5048:10:5048:11 | in : HttpPostMultipartRequestDecoder | Test.java:5048:10:5048:34 | getBodyHttpDatas(...) : List | provenance | MaD:296 |
+| Test.java:5048:10:5048:11 | in : HttpPostMultipartRequestDecoder | Test.java:5048:10:5048:34 | getBodyHttpDatas(...) : List | provenance | MaD:258 |
 | Test.java:5048:10:5048:34 | getBodyHttpDatas(...) : List | Test.java:5049:9:5049:11 | out | provenance |  |
 | Test.java:5054:32:5054:63 | (...)... : HttpPostRequestDecoder | Test.java:5055:10:5055:11 | in : HttpPostRequestDecoder | provenance |  |
 | Test.java:5054:56:5054:63 | source(...) : Object | Test.java:5054:32:5054:63 | (...)... : HttpPostRequestDecoder | provenance |  |
-| Test.java:5055:10:5055:11 | in : HttpPostRequestDecoder | Test.java:5055:10:5055:34 | getBodyHttpDatas(...) : List | provenance | MaD:296 |
+| Test.java:5055:10:5055:11 | in : HttpPostRequestDecoder | Test.java:5055:10:5055:34 | getBodyHttpDatas(...) : List | provenance | MaD:258 |
 | Test.java:5055:10:5055:34 | getBodyHttpDatas(...) : List | Test.java:5056:9:5056:11 | out | provenance |  |
 | Test.java:5061:40:5061:79 | (...)... : HttpPostStandardRequestDecoder | Test.java:5062:10:5062:11 | in : HttpPostStandardRequestDecoder | provenance |  |
 | Test.java:5061:72:5061:79 | source(...) : Object | Test.java:5061:40:5061:79 | (...)... : HttpPostStandardRequestDecoder | provenance |  |
-| Test.java:5062:10:5062:11 | in : HttpPostStandardRequestDecoder | Test.java:5062:10:5062:34 | getBodyHttpDatas(...) : List | provenance | MaD:296 |
+| Test.java:5062:10:5062:11 | in : HttpPostStandardRequestDecoder | Test.java:5062:10:5062:34 | getBodyHttpDatas(...) : List | provenance | MaD:258 |
 | Test.java:5062:10:5062:34 | getBodyHttpDatas(...) : List | Test.java:5063:9:5063:11 | out | provenance |  |
 | Test.java:5068:41:5068:81 | (...)... : InterfaceHttpPostRequestDecoder | Test.java:5069:10:5069:11 | in : InterfaceHttpPostRequestDecoder | provenance |  |
 | Test.java:5068:74:5068:81 | source(...) : Object | Test.java:5068:41:5068:81 | (...)... : InterfaceHttpPostRequestDecoder | provenance |  |
-| Test.java:5069:10:5069:11 | in : InterfaceHttpPostRequestDecoder | Test.java:5069:10:5069:34 | getBodyHttpDatas(...) : List | provenance | MaD:296 |
+| Test.java:5069:10:5069:11 | in : InterfaceHttpPostRequestDecoder | Test.java:5069:10:5069:34 | getBodyHttpDatas(...) : List | provenance | MaD:258 |
 | Test.java:5069:10:5069:34 | getBodyHttpDatas(...) : List | Test.java:5070:9:5070:11 | out | provenance |  |
 | Test.java:5075:41:5075:81 | (...)... : HttpPostMultipartRequestDecoder | Test.java:5076:10:5076:11 | in : HttpPostMultipartRequestDecoder | provenance |  |
 | Test.java:5075:74:5075:81 | source(...) : Object | Test.java:5075:41:5075:81 | (...)... : HttpPostMultipartRequestDecoder | provenance |  |
-| Test.java:5076:10:5076:11 | in : HttpPostMultipartRequestDecoder | Test.java:5076:10:5076:18 | next(...) : InterfaceHttpData | provenance | MaD:297 |
+| Test.java:5076:10:5076:11 | in : HttpPostMultipartRequestDecoder | Test.java:5076:10:5076:18 | next(...) : InterfaceHttpData | provenance | MaD:259 |
 | Test.java:5076:10:5076:18 | next(...) : InterfaceHttpData | Test.java:5077:9:5077:11 | out | provenance |  |
 | Test.java:5082:32:5082:63 | (...)... : HttpPostRequestDecoder | Test.java:5083:10:5083:11 | in : HttpPostRequestDecoder | provenance |  |
 | Test.java:5082:56:5082:63 | source(...) : Object | Test.java:5082:32:5082:63 | (...)... : HttpPostRequestDecoder | provenance |  |
-| Test.java:5083:10:5083:11 | in : HttpPostRequestDecoder | Test.java:5083:10:5083:18 | next(...) : InterfaceHttpData | provenance | MaD:297 |
+| Test.java:5083:10:5083:11 | in : HttpPostRequestDecoder | Test.java:5083:10:5083:18 | next(...) : InterfaceHttpData | provenance | MaD:259 |
 | Test.java:5083:10:5083:18 | next(...) : InterfaceHttpData | Test.java:5084:9:5084:11 | out | provenance |  |
 | Test.java:5089:40:5089:79 | (...)... : HttpPostStandardRequestDecoder | Test.java:5090:10:5090:11 | in : HttpPostStandardRequestDecoder | provenance |  |
 | Test.java:5089:72:5089:79 | source(...) : Object | Test.java:5089:40:5089:79 | (...)... : HttpPostStandardRequestDecoder | provenance |  |
-| Test.java:5090:10:5090:11 | in : HttpPostStandardRequestDecoder | Test.java:5090:10:5090:18 | next(...) : InterfaceHttpData | provenance | MaD:297 |
+| Test.java:5090:10:5090:11 | in : HttpPostStandardRequestDecoder | Test.java:5090:10:5090:18 | next(...) : InterfaceHttpData | provenance | MaD:259 |
 | Test.java:5090:10:5090:18 | next(...) : InterfaceHttpData | Test.java:5091:9:5091:11 | out | provenance |  |
 | Test.java:5096:41:5096:81 | (...)... : InterfaceHttpPostRequestDecoder | Test.java:5097:10:5097:11 | in : InterfaceHttpPostRequestDecoder | provenance |  |
 | Test.java:5096:74:5096:81 | source(...) : Object | Test.java:5096:41:5096:81 | (...)... : InterfaceHttpPostRequestDecoder | provenance |  |
-| Test.java:5097:10:5097:11 | in : InterfaceHttpPostRequestDecoder | Test.java:5097:10:5097:18 | next(...) : InterfaceHttpData | provenance | MaD:297 |
+| Test.java:5097:10:5097:11 | in : InterfaceHttpPostRequestDecoder | Test.java:5097:10:5097:18 | next(...) : InterfaceHttpData | provenance | MaD:259 |
 | Test.java:5097:10:5097:18 | next(...) : InterfaceHttpData | Test.java:5098:9:5098:11 | out | provenance |  |
 | Test.java:5103:41:5103:81 | (...)... : HttpPostMultipartRequestDecoder | Test.java:5104:10:5104:11 | in : HttpPostMultipartRequestDecoder | provenance |  |
 | Test.java:5103:74:5103:81 | source(...) : Object | Test.java:5103:41:5103:81 | (...)... : HttpPostMultipartRequestDecoder | provenance |  |
-| Test.java:5104:10:5104:11 | in : HttpPostMultipartRequestDecoder | Test.java:5104:10:5104:23 | offer(...) : HttpPostMultipartRequestDecoder | provenance | MaD:299 |
+| Test.java:5104:10:5104:11 | in : HttpPostMultipartRequestDecoder | Test.java:5104:10:5104:23 | offer(...) : HttpPostMultipartRequestDecoder | provenance | MaD:261 |
 | Test.java:5104:10:5104:23 | offer(...) : HttpPostMultipartRequestDecoder | Test.java:5105:9:5105:11 | out | provenance |  |
 | Test.java:5110:40:5110:79 | (...)... : HttpPostStandardRequestDecoder | Test.java:5111:10:5111:11 | in : HttpPostStandardRequestDecoder | provenance |  |
 | Test.java:5110:72:5110:79 | source(...) : Object | Test.java:5110:40:5110:79 | (...)... : HttpPostStandardRequestDecoder | provenance |  |
-| Test.java:5111:10:5111:11 | in : HttpPostStandardRequestDecoder | Test.java:5111:10:5111:23 | offer(...) : HttpPostStandardRequestDecoder | provenance | MaD:299 |
+| Test.java:5111:10:5111:11 | in : HttpPostStandardRequestDecoder | Test.java:5111:10:5111:23 | offer(...) : HttpPostStandardRequestDecoder | provenance | MaD:261 |
 | Test.java:5111:10:5111:23 | offer(...) : HttpPostStandardRequestDecoder | Test.java:5112:9:5112:11 | out | provenance |  |
 | Test.java:5117:32:5117:63 | (...)... : HttpPostRequestDecoder | Test.java:5118:10:5118:11 | in : HttpPostRequestDecoder | provenance |  |
 | Test.java:5117:56:5117:63 | source(...) : Object | Test.java:5117:32:5117:63 | (...)... : HttpPostRequestDecoder | provenance |  |
-| Test.java:5118:10:5118:11 | in : HttpPostRequestDecoder | Test.java:5118:10:5118:23 | offer(...) : HttpPostRequestDecoder | provenance | MaD:299 |
+| Test.java:5118:10:5118:11 | in : HttpPostRequestDecoder | Test.java:5118:10:5118:23 | offer(...) : HttpPostRequestDecoder | provenance | MaD:261 |
 | Test.java:5118:10:5118:23 | offer(...) : HttpPostRequestDecoder | Test.java:5119:9:5119:11 | out | provenance |  |
 | Test.java:5124:41:5124:81 | (...)... : InterfaceHttpPostRequestDecoder | Test.java:5125:10:5125:11 | in : InterfaceHttpPostRequestDecoder | provenance |  |
 | Test.java:5124:74:5124:81 | source(...) : Object | Test.java:5124:41:5124:81 | (...)... : InterfaceHttpPostRequestDecoder | provenance |  |
-| Test.java:5125:10:5125:11 | in : InterfaceHttpPostRequestDecoder | Test.java:5125:10:5125:23 | offer(...) : InterfaceHttpPostRequestDecoder | provenance | MaD:299 |
+| Test.java:5125:10:5125:11 | in : InterfaceHttpPostRequestDecoder | Test.java:5125:10:5125:23 | offer(...) : InterfaceHttpPostRequestDecoder | provenance | MaD:261 |
 | Test.java:5125:10:5125:23 | offer(...) : InterfaceHttpPostRequestDecoder | Test.java:5126:9:5126:11 | out | provenance |  |
 | Test.java:5131:21:5131:41 | (...)... : HttpContent | Test.java:5132:14:5132:15 | in : HttpContent | provenance |  |
 | Test.java:5131:34:5131:41 | source(...) : Object | Test.java:5131:21:5131:41 | (...)... : HttpContent | provenance |  |
 | Test.java:5132:4:5132:6 | out [post update] : HttpPostMultipartRequestDecoder | Test.java:5133:9:5133:11 | out | provenance |  |
-| Test.java:5132:14:5132:15 | in : HttpContent | Test.java:5132:4:5132:6 | out [post update] : HttpPostMultipartRequestDecoder | provenance | MaD:298 |
+| Test.java:5132:14:5132:15 | in : HttpContent | Test.java:5132:4:5132:6 | out [post update] : HttpPostMultipartRequestDecoder | provenance | MaD:260 |
 | Test.java:5138:21:5138:41 | (...)... : HttpContent | Test.java:5139:14:5139:15 | in : HttpContent | provenance |  |
 | Test.java:5138:34:5138:41 | source(...) : Object | Test.java:5138:21:5138:41 | (...)... : HttpContent | provenance |  |
 | Test.java:5139:4:5139:6 | out [post update] : HttpPostRequestDecoder | Test.java:5140:9:5140:11 | out | provenance |  |
-| Test.java:5139:14:5139:15 | in : HttpContent | Test.java:5139:4:5139:6 | out [post update] : HttpPostRequestDecoder | provenance | MaD:298 |
+| Test.java:5139:14:5139:15 | in : HttpContent | Test.java:5139:4:5139:6 | out [post update] : HttpPostRequestDecoder | provenance | MaD:260 |
 | Test.java:5145:21:5145:41 | (...)... : HttpContent | Test.java:5146:14:5146:15 | in : HttpContent | provenance |  |
 | Test.java:5145:34:5145:41 | source(...) : Object | Test.java:5145:21:5145:41 | (...)... : HttpContent | provenance |  |
 | Test.java:5146:4:5146:6 | out [post update] : HttpPostStandardRequestDecoder | Test.java:5147:9:5147:11 | out | provenance |  |
-| Test.java:5146:14:5146:15 | in : HttpContent | Test.java:5146:4:5146:6 | out [post update] : HttpPostStandardRequestDecoder | provenance | MaD:298 |
+| Test.java:5146:14:5146:15 | in : HttpContent | Test.java:5146:4:5146:6 | out [post update] : HttpPostStandardRequestDecoder | provenance | MaD:260 |
 | Test.java:5152:21:5152:41 | (...)... : HttpContent | Test.java:5153:14:5153:15 | in : HttpContent | provenance |  |
 | Test.java:5152:34:5152:41 | source(...) : Object | Test.java:5152:21:5152:41 | (...)... : HttpContent | provenance |  |
 | Test.java:5153:4:5153:6 | out [post update] : InterfaceHttpPostRequestDecoder | Test.java:5154:9:5154:11 | out | provenance |  |
-| Test.java:5153:14:5153:15 | in : HttpContent | Test.java:5153:4:5153:6 | out [post update] : InterfaceHttpPostRequestDecoder | provenance | MaD:298 |
+| Test.java:5153:14:5153:15 | in : HttpContent | Test.java:5153:4:5153:6 | out [post update] : InterfaceHttpPostRequestDecoder | provenance | MaD:260 |
 | Test.java:5159:17:5159:33 | (...)... : ByteBuf | Test.java:5160:35:5160:36 | in : ByteBuf | provenance |  |
 | Test.java:5159:26:5159:33 | source(...) : Object | Test.java:5159:17:5159:33 | (...)... : ByteBuf | provenance |  |
 | Test.java:5160:10:5160:37 | new BinaryWebSocketFrame(...) : BinaryWebSocketFrame | Test.java:5161:9:5161:11 | out | provenance |  |
-| Test.java:5160:35:5160:36 | in : ByteBuf | Test.java:5160:10:5160:37 | new BinaryWebSocketFrame(...) : BinaryWebSocketFrame | provenance | MaD:332 |
+| Test.java:5160:35:5160:36 | in : ByteBuf | Test.java:5160:10:5160:37 | new BinaryWebSocketFrame(...) : BinaryWebSocketFrame | provenance | MaD:262 |
 | Test.java:5166:17:5166:33 | (...)... : ByteBuf | Test.java:5167:45:5167:46 | in : ByteBuf | provenance |  |
 | Test.java:5166:26:5166:33 | source(...) : Object | Test.java:5166:17:5166:33 | (...)... : ByteBuf | provenance |  |
 | Test.java:5167:10:5167:47 | new BinaryWebSocketFrame(...) : BinaryWebSocketFrame | Test.java:5168:9:5168:11 | out | provenance |  |
-| Test.java:5167:45:5167:46 | in : ByteBuf | Test.java:5167:10:5167:47 | new BinaryWebSocketFrame(...) : BinaryWebSocketFrame | provenance | MaD:331 |
+| Test.java:5167:45:5167:46 | in : ByteBuf | Test.java:5167:10:5167:47 | new BinaryWebSocketFrame(...) : BinaryWebSocketFrame | provenance | MaD:263 |
 | Test.java:5173:16:5173:31 | (...)... : String | Test.java:5174:62:5174:63 | in : String | provenance |  |
 | Test.java:5173:24:5173:31 | source(...) : Object | Test.java:5173:16:5173:31 | (...)... : String | provenance |  |
 | Test.java:5174:10:5174:64 | new CloseWebSocketFrame(...) : CloseWebSocketFrame | Test.java:5175:9:5175:11 | out | provenance |  |
-| Test.java:5174:62:5174:63 | in : String | Test.java:5174:10:5174:64 | new CloseWebSocketFrame(...) : CloseWebSocketFrame | provenance | MaD:329 |
+| Test.java:5174:62:5174:63 | in : String | Test.java:5174:10:5174:64 | new CloseWebSocketFrame(...) : CloseWebSocketFrame | provenance | MaD:264 |
 | Test.java:5180:17:5180:33 | (...)... : ByteBuf | Test.java:5181:44:5181:45 | in : ByteBuf | provenance |  |
 | Test.java:5180:26:5180:33 | source(...) : Object | Test.java:5180:17:5180:33 | (...)... : ByteBuf | provenance |  |
 | Test.java:5181:10:5181:46 | new CloseWebSocketFrame(...) : CloseWebSocketFrame | Test.java:5182:9:5182:11 | out | provenance |  |
-| Test.java:5181:44:5181:45 | in : ByteBuf | Test.java:5181:10:5181:46 | new CloseWebSocketFrame(...) : CloseWebSocketFrame | provenance | MaD:326 |
+| Test.java:5181:44:5181:45 | in : ByteBuf | Test.java:5181:10:5181:46 | new CloseWebSocketFrame(...) : CloseWebSocketFrame | provenance | MaD:265 |
 | Test.java:5187:16:5187:31 | (...)... : String | Test.java:5188:47:5188:48 | in : String | provenance |  |
 | Test.java:5187:24:5187:31 | source(...) : Object | Test.java:5187:16:5187:31 | (...)... : String | provenance |  |
 | Test.java:5188:10:5188:49 | new CloseWebSocketFrame(...) : CloseWebSocketFrame | Test.java:5189:9:5189:11 | out | provenance |  |
-| Test.java:5188:47:5188:48 | in : String | Test.java:5188:10:5188:49 | new CloseWebSocketFrame(...) : CloseWebSocketFrame | provenance | MaD:327 |
+| Test.java:5188:47:5188:48 | in : String | Test.java:5188:10:5188:49 | new CloseWebSocketFrame(...) : CloseWebSocketFrame | provenance | MaD:266 |
 | Test.java:5194:16:5194:31 | (...)... : String | Test.java:5195:37:5195:38 | in : String | provenance |  |
 | Test.java:5194:24:5194:31 | source(...) : Object | Test.java:5194:16:5194:31 | (...)... : String | provenance |  |
 | Test.java:5195:10:5195:39 | new CloseWebSocketFrame(...) : CloseWebSocketFrame | Test.java:5196:9:5196:11 | out | provenance |  |
-| Test.java:5195:37:5195:38 | in : String | Test.java:5195:10:5195:39 | new CloseWebSocketFrame(...) : CloseWebSocketFrame | provenance | MaD:328 |
+| Test.java:5195:37:5195:38 | in : String | Test.java:5195:10:5195:39 | new CloseWebSocketFrame(...) : CloseWebSocketFrame | provenance | MaD:267 |
 | Test.java:5201:29:5201:57 | (...)... : CloseWebSocketFrame | Test.java:5202:10:5202:11 | in : CloseWebSocketFrame | provenance |  |
 | Test.java:5201:50:5201:57 | source(...) : Object | Test.java:5201:29:5201:57 | (...)... : CloseWebSocketFrame | provenance |  |
-| Test.java:5202:10:5202:11 | in : CloseWebSocketFrame | Test.java:5202:10:5202:24 | reasonText(...) : String | provenance | MaD:330 |
+| Test.java:5202:10:5202:11 | in : CloseWebSocketFrame | Test.java:5202:10:5202:24 | reasonText(...) : String | provenance | MaD:268 |
 | Test.java:5202:10:5202:24 | reasonText(...) : String | Test.java:5203:9:5203:11 | out | provenance |  |
 | Test.java:5208:17:5208:33 | (...)... : ByteBuf | Test.java:5209:41:5209:42 | in : ByteBuf | provenance |  |
 | Test.java:5208:26:5208:33 | source(...) : Object | Test.java:5208:17:5208:33 | (...)... : ByteBuf | provenance |  |
 | Test.java:5209:10:5209:43 | new ContinuationWebSocketFrame(...) : ContinuationWebSocketFrame | Test.java:5210:9:5210:11 | out | provenance |  |
-| Test.java:5209:41:5209:42 | in : ByteBuf | Test.java:5209:10:5209:43 | new ContinuationWebSocketFrame(...) : ContinuationWebSocketFrame | provenance | MaD:335 |
+| Test.java:5209:41:5209:42 | in : ByteBuf | Test.java:5209:10:5209:43 | new ContinuationWebSocketFrame(...) : ContinuationWebSocketFrame | provenance | MaD:269 |
 | Test.java:5215:17:5215:33 | (...)... : ByteBuf | Test.java:5216:51:5216:52 | in : ByteBuf | provenance |  |
 | Test.java:5215:26:5215:33 | source(...) : Object | Test.java:5215:17:5215:33 | (...)... : ByteBuf | provenance |  |
 | Test.java:5216:10:5216:53 | new ContinuationWebSocketFrame(...) : ContinuationWebSocketFrame | Test.java:5217:9:5217:11 | out | provenance |  |
-| Test.java:5216:51:5216:52 | in : ByteBuf | Test.java:5216:10:5216:53 | new ContinuationWebSocketFrame(...) : ContinuationWebSocketFrame | provenance | MaD:333 |
+| Test.java:5216:51:5216:52 | in : ByteBuf | Test.java:5216:10:5216:53 | new ContinuationWebSocketFrame(...) : ContinuationWebSocketFrame | provenance | MaD:270 |
 | Test.java:5222:16:5222:31 | (...)... : String | Test.java:5223:51:5223:52 | in : String | provenance |  |
 | Test.java:5222:24:5222:31 | source(...) : Object | Test.java:5222:16:5222:31 | (...)... : String | provenance |  |
 | Test.java:5223:10:5223:53 | new ContinuationWebSocketFrame(...) : ContinuationWebSocketFrame | Test.java:5224:9:5224:11 | out | provenance |  |
-| Test.java:5223:51:5223:52 | in : String | Test.java:5223:10:5223:53 | new ContinuationWebSocketFrame(...) : ContinuationWebSocketFrame | provenance | MaD:334 |
+| Test.java:5223:51:5223:52 | in : String | Test.java:5223:10:5223:53 | new ContinuationWebSocketFrame(...) : ContinuationWebSocketFrame | provenance | MaD:271 |
 | Test.java:5229:36:5229:71 | (...)... : ContinuationWebSocketFrame | Test.java:5230:10:5230:11 | in : ContinuationWebSocketFrame | provenance |  |
 | Test.java:5229:64:5229:71 | source(...) : Object | Test.java:5229:36:5229:71 | (...)... : ContinuationWebSocketFrame | provenance |  |
-| Test.java:5230:10:5230:11 | in : ContinuationWebSocketFrame | Test.java:5230:10:5230:18 | text(...) : String | provenance | MaD:336 |
+| Test.java:5230:10:5230:11 | in : ContinuationWebSocketFrame | Test.java:5230:10:5230:18 | text(...) : String | provenance | MaD:272 |
 | Test.java:5230:10:5230:18 | text(...) : String | Test.java:5231:9:5231:11 | out | provenance |  |
 | Test.java:5236:17:5236:33 | (...)... : ByteBuf | Test.java:5237:33:5237:34 | in : ByteBuf | provenance |  |
 | Test.java:5236:26:5236:33 | source(...) : Object | Test.java:5236:17:5236:33 | (...)... : ByteBuf | provenance |  |
 | Test.java:5237:10:5237:35 | new PingWebSocketFrame(...) : PingWebSocketFrame | Test.java:5238:9:5238:11 | out | provenance |  |
-| Test.java:5237:33:5237:34 | in : ByteBuf | Test.java:5237:10:5237:35 | new PingWebSocketFrame(...) : PingWebSocketFrame | provenance | MaD:338 |
+| Test.java:5237:33:5237:34 | in : ByteBuf | Test.java:5237:10:5237:35 | new PingWebSocketFrame(...) : PingWebSocketFrame | provenance | MaD:273 |
 | Test.java:5243:17:5243:33 | (...)... : ByteBuf | Test.java:5244:43:5244:44 | in : ByteBuf | provenance |  |
 | Test.java:5243:26:5243:33 | source(...) : Object | Test.java:5243:17:5243:33 | (...)... : ByteBuf | provenance |  |
 | Test.java:5244:10:5244:45 | new PingWebSocketFrame(...) : PingWebSocketFrame | Test.java:5245:9:5245:11 | out | provenance |  |
-| Test.java:5244:43:5244:44 | in : ByteBuf | Test.java:5244:10:5244:45 | new PingWebSocketFrame(...) : PingWebSocketFrame | provenance | MaD:337 |
+| Test.java:5244:43:5244:44 | in : ByteBuf | Test.java:5244:10:5244:45 | new PingWebSocketFrame(...) : PingWebSocketFrame | provenance | MaD:274 |
 | Test.java:5250:17:5250:33 | (...)... : ByteBuf | Test.java:5251:33:5251:34 | in : ByteBuf | provenance |  |
 | Test.java:5250:26:5250:33 | source(...) : Object | Test.java:5250:17:5250:33 | (...)... : ByteBuf | provenance |  |
 | Test.java:5251:10:5251:35 | new PongWebSocketFrame(...) : PongWebSocketFrame | Test.java:5252:9:5252:11 | out | provenance |  |
-| Test.java:5251:33:5251:34 | in : ByteBuf | Test.java:5251:10:5251:35 | new PongWebSocketFrame(...) : PongWebSocketFrame | provenance | MaD:340 |
+| Test.java:5251:33:5251:34 | in : ByteBuf | Test.java:5251:10:5251:35 | new PongWebSocketFrame(...) : PongWebSocketFrame | provenance | MaD:275 |
 | Test.java:5257:17:5257:33 | (...)... : ByteBuf | Test.java:5258:43:5258:44 | in : ByteBuf | provenance |  |
 | Test.java:5257:26:5257:33 | source(...) : Object | Test.java:5257:17:5257:33 | (...)... : ByteBuf | provenance |  |
 | Test.java:5258:10:5258:45 | new PongWebSocketFrame(...) : PongWebSocketFrame | Test.java:5259:9:5259:11 | out | provenance |  |
-| Test.java:5258:43:5258:44 | in : ByteBuf | Test.java:5258:10:5258:45 | new PongWebSocketFrame(...) : PongWebSocketFrame | provenance | MaD:339 |
+| Test.java:5258:43:5258:44 | in : ByteBuf | Test.java:5258:10:5258:45 | new PongWebSocketFrame(...) : PongWebSocketFrame | provenance | MaD:276 |
 | Test.java:5264:17:5264:33 | (...)... : ByteBuf | Test.java:5265:33:5265:34 | in : ByteBuf | provenance |  |
 | Test.java:5264:26:5264:33 | source(...) : Object | Test.java:5264:17:5264:33 | (...)... : ByteBuf | provenance |  |
 | Test.java:5265:10:5265:35 | new TextWebSocketFrame(...) : TextWebSocketFrame | Test.java:5266:9:5266:11 | out | provenance |  |
-| Test.java:5265:33:5265:34 | in : ByteBuf | Test.java:5265:10:5265:35 | new TextWebSocketFrame(...) : TextWebSocketFrame | provenance | MaD:344 |
+| Test.java:5265:33:5265:34 | in : ByteBuf | Test.java:5265:10:5265:35 | new TextWebSocketFrame(...) : TextWebSocketFrame | provenance | MaD:277 |
 | Test.java:5271:16:5271:31 | (...)... : String | Test.java:5272:33:5272:34 | in : String | provenance |  |
 | Test.java:5271:24:5271:31 | source(...) : Object | Test.java:5271:16:5271:31 | (...)... : String | provenance |  |
 | Test.java:5272:10:5272:35 | new TextWebSocketFrame(...) : TextWebSocketFrame | Test.java:5273:9:5273:11 | out | provenance |  |
-| Test.java:5272:33:5272:34 | in : String | Test.java:5272:10:5272:35 | new TextWebSocketFrame(...) : TextWebSocketFrame | provenance | MaD:343 |
+| Test.java:5272:33:5272:34 | in : String | Test.java:5272:10:5272:35 | new TextWebSocketFrame(...) : TextWebSocketFrame | provenance | MaD:278 |
 | Test.java:5278:17:5278:33 | (...)... : ByteBuf | Test.java:5279:43:5279:44 | in : ByteBuf | provenance |  |
 | Test.java:5278:26:5278:33 | source(...) : Object | Test.java:5278:17:5278:33 | (...)... : ByteBuf | provenance |  |
 | Test.java:5279:10:5279:45 | new TextWebSocketFrame(...) : TextWebSocketFrame | Test.java:5280:9:5280:11 | out | provenance |  |
-| Test.java:5279:43:5279:44 | in : ByteBuf | Test.java:5279:10:5279:45 | new TextWebSocketFrame(...) : TextWebSocketFrame | provenance | MaD:341 |
+| Test.java:5279:43:5279:44 | in : ByteBuf | Test.java:5279:10:5279:45 | new TextWebSocketFrame(...) : TextWebSocketFrame | provenance | MaD:279 |
 | Test.java:5285:16:5285:31 | (...)... : String | Test.java:5286:43:5286:44 | in : String | provenance |  |
 | Test.java:5285:24:5285:31 | source(...) : Object | Test.java:5285:16:5285:31 | (...)... : String | provenance |  |
 | Test.java:5286:10:5286:45 | new TextWebSocketFrame(...) : TextWebSocketFrame | Test.java:5287:9:5287:11 | out | provenance |  |
-| Test.java:5286:43:5286:44 | in : String | Test.java:5286:10:5286:45 | new TextWebSocketFrame(...) : TextWebSocketFrame | provenance | MaD:342 |
+| Test.java:5286:43:5286:44 | in : String | Test.java:5286:10:5286:45 | new TextWebSocketFrame(...) : TextWebSocketFrame | provenance | MaD:280 |
 | Test.java:5292:28:5292:55 | (...)... : TextWebSocketFrame | Test.java:5293:10:5293:11 | in : TextWebSocketFrame | provenance |  |
 | Test.java:5292:48:5292:55 | source(...) : Object | Test.java:5292:28:5292:55 | (...)... : TextWebSocketFrame | provenance |  |
-| Test.java:5293:10:5293:11 | in : TextWebSocketFrame | Test.java:5293:10:5293:18 | text(...) : String | provenance | MaD:345 |
+| Test.java:5293:10:5293:11 | in : TextWebSocketFrame | Test.java:5293:10:5293:18 | text(...) : String | provenance | MaD:281 |
 | Test.java:5293:10:5293:18 | text(...) : String | Test.java:5294:9:5294:11 | out | provenance |  |
 | Test.java:5299:22:5299:90 | (...)... : Http2Headers [<element>, <map.value>] : Object | Test.java:5300:10:5300:11 | in : Http2Headers [<element>, <map.value>] : Object | provenance |  |
 | Test.java:5299:36:5299:90 | newWithElementDefault(...) : Object [<element>, <map.value>] : Object | Test.java:5299:22:5299:90 | (...)... : Http2Headers [<element>, <map.value>] : Object | provenance |  |
-| Test.java:5299:58:5299:89 | newWithMapValueDefault(...) : Object [<map.value>] : Object | Test.java:5299:36:5299:90 | newWithElementDefault(...) : Object [<element>, <map.value>] : Object | provenance | MaD:497 |
-| Test.java:5299:81:5299:88 | source(...) : Object | Test.java:5299:58:5299:89 | newWithMapValueDefault(...) : Object [<map.value>] : Object | provenance | MaD:495 |
-| Test.java:5300:10:5300:11 | in : Http2Headers [<element>, <map.value>] : Object | Test.java:5300:10:5300:23 | authority(...) : CharSequence | provenance | MaD:346 |
+| Test.java:5299:58:5299:89 | newWithMapValueDefault(...) : Object [<map.value>] : Object | Test.java:5299:36:5299:90 | newWithElementDefault(...) : Object [<element>, <map.value>] : Object | provenance | MaD:3 |
+| Test.java:5299:81:5299:88 | source(...) : Object | Test.java:5299:58:5299:89 | newWithMapValueDefault(...) : Object [<map.value>] : Object | provenance | MaD:5 |
+| Test.java:5300:10:5300:11 | in : Http2Headers [<element>, <map.value>] : Object | Test.java:5300:10:5300:23 | authority(...) : CharSequence | provenance | MaD:282 |
 | Test.java:5300:10:5300:23 | authority(...) : CharSequence | Test.java:5301:9:5301:11 | out | provenance |  |
 | Test.java:5306:22:5306:43 | (...)... : Http2Headers | Test.java:5307:10:5307:11 | in : Http2Headers | provenance |  |
 | Test.java:5306:36:5306:43 | source(...) : Object | Test.java:5306:22:5306:43 | (...)... : Http2Headers | provenance |  |
-| Test.java:5307:10:5307:11 | in : Http2Headers | Test.java:5307:10:5307:27 | authority(...) : Http2Headers | provenance | MaD:348 |
+| Test.java:5307:10:5307:11 | in : Http2Headers | Test.java:5307:10:5307:27 | authority(...) : Http2Headers | provenance | MaD:284 |
 | Test.java:5307:10:5307:27 | authority(...) : Http2Headers | Test.java:5308:9:5308:11 | out | provenance |  |
 | Test.java:5313:22:5313:43 | (...)... : CharSequence | Test.java:5314:18:5314:19 | in : CharSequence | provenance |  |
 | Test.java:5313:36:5313:43 | source(...) : Object | Test.java:5313:22:5313:43 | (...)... : CharSequence | provenance |  |
 | Test.java:5314:4:5314:6 | out [post update] : Http2Headers [<element>, <map.value>] : CharSequence | Test.java:5315:39:5315:41 | out : Http2Headers [<element>, <map.value>] : CharSequence | provenance |  |
-| Test.java:5314:18:5314:19 | in : CharSequence | Test.java:5314:4:5314:6 | out [post update] : Http2Headers [<element>, <map.value>] : CharSequence | provenance | MaD:347 |
-| Test.java:5315:28:5315:42 | getElement(...) : Entry [<map.value>] : CharSequence | Test.java:5315:9:5315:43 | getMapValueDefault(...) | provenance | MaD:498 |
+| Test.java:5314:18:5314:19 | in : CharSequence | Test.java:5314:4:5314:6 | out [post update] : Http2Headers [<element>, <map.value>] : CharSequence | provenance | MaD:283 |
+| Test.java:5315:28:5315:42 | getElement(...) : Entry [<map.value>] : CharSequence | Test.java:5315:9:5315:43 | getMapValueDefault(...) | provenance | MaD:2 |
 | Test.java:5315:39:5315:41 | out : Http2Headers [<element>, <map.value>] : CharSequence | Test.java:79:19:79:32 | it : Http2Headers [<element>, <map.value>] : CharSequence | provenance |  |
-| Test.java:5315:39:5315:41 | out : Http2Headers [<element>, <map.value>] : CharSequence | Test.java:5315:28:5315:42 | getElement(...) : Entry [<map.value>] : CharSequence | provenance | MaD:492 |
+| Test.java:5315:39:5315:41 | out : Http2Headers [<element>, <map.value>] : CharSequence | Test.java:5315:28:5315:42 | getElement(...) : Entry [<map.value>] : CharSequence | provenance | MaD:495 |
 | Test.java:5320:22:5320:90 | (...)... : Http2Headers [<element>, <map.value>] : Object | Test.java:5321:10:5321:11 | in : Http2Headers [<element>, <map.value>] : Object | provenance |  |
 | Test.java:5320:36:5320:90 | newWithElementDefault(...) : Object [<element>, <map.value>] : Object | Test.java:5320:22:5320:90 | (...)... : Http2Headers [<element>, <map.value>] : Object | provenance |  |
-| Test.java:5320:58:5320:89 | newWithMapValueDefault(...) : Object [<map.value>] : Object | Test.java:5320:36:5320:90 | newWithElementDefault(...) : Object [<element>, <map.value>] : Object | provenance | MaD:497 |
-| Test.java:5320:81:5320:88 | source(...) : Object | Test.java:5320:58:5320:89 | newWithMapValueDefault(...) : Object [<map.value>] : Object | provenance | MaD:495 |
-| Test.java:5321:10:5321:11 | in : Http2Headers [<element>, <map.value>] : Object | Test.java:5321:10:5321:20 | method(...) : CharSequence | provenance | MaD:349 |
+| Test.java:5320:58:5320:89 | newWithMapValueDefault(...) : Object [<map.value>] : Object | Test.java:5320:36:5320:90 | newWithElementDefault(...) : Object [<element>, <map.value>] : Object | provenance | MaD:3 |
+| Test.java:5320:81:5320:88 | source(...) : Object | Test.java:5320:58:5320:89 | newWithMapValueDefault(...) : Object [<map.value>] : Object | provenance | MaD:5 |
+| Test.java:5321:10:5321:11 | in : Http2Headers [<element>, <map.value>] : Object | Test.java:5321:10:5321:20 | method(...) : CharSequence | provenance | MaD:285 |
 | Test.java:5321:10:5321:20 | method(...) : CharSequence | Test.java:5322:9:5322:11 | out | provenance |  |
 | Test.java:5327:22:5327:43 | (...)... : Http2Headers | Test.java:5328:10:5328:11 | in : Http2Headers | provenance |  |
 | Test.java:5327:36:5327:43 | source(...) : Object | Test.java:5327:22:5327:43 | (...)... : Http2Headers | provenance |  |
-| Test.java:5328:10:5328:11 | in : Http2Headers | Test.java:5328:10:5328:24 | method(...) : Http2Headers | provenance | MaD:351 |
+| Test.java:5328:10:5328:11 | in : Http2Headers | Test.java:5328:10:5328:24 | method(...) : Http2Headers | provenance | MaD:287 |
 | Test.java:5328:10:5328:24 | method(...) : Http2Headers | Test.java:5329:9:5329:11 | out | provenance |  |
 | Test.java:5334:22:5334:43 | (...)... : CharSequence | Test.java:5335:15:5335:16 | in : CharSequence | provenance |  |
 | Test.java:5334:36:5334:43 | source(...) : Object | Test.java:5334:22:5334:43 | (...)... : CharSequence | provenance |  |
 | Test.java:5335:4:5335:6 | out [post update] : Http2Headers [<element>, <map.value>] : CharSequence | Test.java:5336:39:5336:41 | out : Http2Headers [<element>, <map.value>] : CharSequence | provenance |  |
-| Test.java:5335:15:5335:16 | in : CharSequence | Test.java:5335:4:5335:6 | out [post update] : Http2Headers [<element>, <map.value>] : CharSequence | provenance | MaD:350 |
-| Test.java:5336:28:5336:42 | getElement(...) : Entry [<map.value>] : CharSequence | Test.java:5336:9:5336:43 | getMapValueDefault(...) | provenance | MaD:498 |
+| Test.java:5335:15:5335:16 | in : CharSequence | Test.java:5335:4:5335:6 | out [post update] : Http2Headers [<element>, <map.value>] : CharSequence | provenance | MaD:286 |
+| Test.java:5336:28:5336:42 | getElement(...) : Entry [<map.value>] : CharSequence | Test.java:5336:9:5336:43 | getMapValueDefault(...) | provenance | MaD:2 |
 | Test.java:5336:39:5336:41 | out : Http2Headers [<element>, <map.value>] : CharSequence | Test.java:79:19:79:32 | it : Http2Headers [<element>, <map.value>] : CharSequence | provenance |  |
-| Test.java:5336:39:5336:41 | out : Http2Headers [<element>, <map.value>] : CharSequence | Test.java:5336:28:5336:42 | getElement(...) : Entry [<map.value>] : CharSequence | provenance | MaD:492 |
+| Test.java:5336:39:5336:41 | out : Http2Headers [<element>, <map.value>] : CharSequence | Test.java:5336:28:5336:42 | getElement(...) : Entry [<map.value>] : CharSequence | provenance | MaD:495 |
 | Test.java:5341:22:5341:90 | (...)... : Http2Headers [<element>, <map.value>] : Object | Test.java:5342:10:5342:11 | in : Http2Headers [<element>, <map.value>] : Object | provenance |  |
 | Test.java:5341:36:5341:90 | newWithElementDefault(...) : Object [<element>, <map.value>] : Object | Test.java:5341:22:5341:90 | (...)... : Http2Headers [<element>, <map.value>] : Object | provenance |  |
-| Test.java:5341:58:5341:89 | newWithMapValueDefault(...) : Object [<map.value>] : Object | Test.java:5341:36:5341:90 | newWithElementDefault(...) : Object [<element>, <map.value>] : Object | provenance | MaD:497 |
-| Test.java:5341:81:5341:88 | source(...) : Object | Test.java:5341:58:5341:89 | newWithMapValueDefault(...) : Object [<map.value>] : Object | provenance | MaD:495 |
-| Test.java:5342:10:5342:11 | in : Http2Headers [<element>, <map.value>] : Object | Test.java:5342:10:5342:18 | path(...) : CharSequence | provenance | MaD:352 |
+| Test.java:5341:58:5341:89 | newWithMapValueDefault(...) : Object [<map.value>] : Object | Test.java:5341:36:5341:90 | newWithElementDefault(...) : Object [<element>, <map.value>] : Object | provenance | MaD:3 |
+| Test.java:5341:81:5341:88 | source(...) : Object | Test.java:5341:58:5341:89 | newWithMapValueDefault(...) : Object [<map.value>] : Object | provenance | MaD:5 |
+| Test.java:5342:10:5342:11 | in : Http2Headers [<element>, <map.value>] : Object | Test.java:5342:10:5342:18 | path(...) : CharSequence | provenance | MaD:288 |
 | Test.java:5342:10:5342:18 | path(...) : CharSequence | Test.java:5343:9:5343:11 | out | provenance |  |
 | Test.java:5348:22:5348:43 | (...)... : Http2Headers | Test.java:5349:10:5349:11 | in : Http2Headers | provenance |  |
 | Test.java:5348:36:5348:43 | source(...) : Object | Test.java:5348:22:5348:43 | (...)... : Http2Headers | provenance |  |
-| Test.java:5349:10:5349:11 | in : Http2Headers | Test.java:5349:10:5349:22 | path(...) : Http2Headers | provenance | MaD:354 |
+| Test.java:5349:10:5349:11 | in : Http2Headers | Test.java:5349:10:5349:22 | path(...) : Http2Headers | provenance | MaD:290 |
 | Test.java:5349:10:5349:22 | path(...) : Http2Headers | Test.java:5350:9:5350:11 | out | provenance |  |
 | Test.java:5355:22:5355:43 | (...)... : CharSequence | Test.java:5356:13:5356:14 | in : CharSequence | provenance |  |
 | Test.java:5355:36:5355:43 | source(...) : Object | Test.java:5355:22:5355:43 | (...)... : CharSequence | provenance |  |
 | Test.java:5356:4:5356:6 | out [post update] : Http2Headers [<element>, <map.value>] : CharSequence | Test.java:5357:39:5357:41 | out : Http2Headers [<element>, <map.value>] : CharSequence | provenance |  |
-| Test.java:5356:13:5356:14 | in : CharSequence | Test.java:5356:4:5356:6 | out [post update] : Http2Headers [<element>, <map.value>] : CharSequence | provenance | MaD:353 |
-| Test.java:5357:28:5357:42 | getElement(...) : Entry [<map.value>] : CharSequence | Test.java:5357:9:5357:43 | getMapValueDefault(...) | provenance | MaD:498 |
+| Test.java:5356:13:5356:14 | in : CharSequence | Test.java:5356:4:5356:6 | out [post update] : Http2Headers [<element>, <map.value>] : CharSequence | provenance | MaD:289 |
+| Test.java:5357:28:5357:42 | getElement(...) : Entry [<map.value>] : CharSequence | Test.java:5357:9:5357:43 | getMapValueDefault(...) | provenance | MaD:2 |
 | Test.java:5357:39:5357:41 | out : Http2Headers [<element>, <map.value>] : CharSequence | Test.java:79:19:79:32 | it : Http2Headers [<element>, <map.value>] : CharSequence | provenance |  |
-| Test.java:5357:39:5357:41 | out : Http2Headers [<element>, <map.value>] : CharSequence | Test.java:5357:28:5357:42 | getElement(...) : Entry [<map.value>] : CharSequence | provenance | MaD:492 |
+| Test.java:5357:39:5357:41 | out : Http2Headers [<element>, <map.value>] : CharSequence | Test.java:5357:28:5357:42 | getElement(...) : Entry [<map.value>] : CharSequence | provenance | MaD:495 |
 | Test.java:5362:22:5362:90 | (...)... : Http2Headers [<element>, <map.value>] : Object | Test.java:5363:10:5363:11 | in : Http2Headers [<element>, <map.value>] : Object | provenance |  |
 | Test.java:5362:36:5362:90 | newWithElementDefault(...) : Object [<element>, <map.value>] : Object | Test.java:5362:22:5362:90 | (...)... : Http2Headers [<element>, <map.value>] : Object | provenance |  |
-| Test.java:5362:58:5362:89 | newWithMapValueDefault(...) : Object [<map.value>] : Object | Test.java:5362:36:5362:90 | newWithElementDefault(...) : Object [<element>, <map.value>] : Object | provenance | MaD:497 |
-| Test.java:5362:81:5362:88 | source(...) : Object | Test.java:5362:58:5362:89 | newWithMapValueDefault(...) : Object [<map.value>] : Object | provenance | MaD:495 |
-| Test.java:5363:10:5363:11 | in : Http2Headers [<element>, <map.value>] : Object | Test.java:5363:10:5363:20 | scheme(...) : CharSequence | provenance | MaD:355 |
+| Test.java:5362:58:5362:89 | newWithMapValueDefault(...) : Object [<map.value>] : Object | Test.java:5362:36:5362:90 | newWithElementDefault(...) : Object [<element>, <map.value>] : Object | provenance | MaD:3 |
+| Test.java:5362:81:5362:88 | source(...) : Object | Test.java:5362:58:5362:89 | newWithMapValueDefault(...) : Object [<map.value>] : Object | provenance | MaD:5 |
+| Test.java:5363:10:5363:11 | in : Http2Headers [<element>, <map.value>] : Object | Test.java:5363:10:5363:20 | scheme(...) : CharSequence | provenance | MaD:291 |
 | Test.java:5363:10:5363:20 | scheme(...) : CharSequence | Test.java:5364:9:5364:11 | out | provenance |  |
 | Test.java:5369:22:5369:43 | (...)... : Http2Headers | Test.java:5370:10:5370:11 | in : Http2Headers | provenance |  |
 | Test.java:5369:36:5369:43 | source(...) : Object | Test.java:5369:22:5369:43 | (...)... : Http2Headers | provenance |  |
-| Test.java:5370:10:5370:11 | in : Http2Headers | Test.java:5370:10:5370:24 | scheme(...) : Http2Headers | provenance | MaD:357 |
+| Test.java:5370:10:5370:11 | in : Http2Headers | Test.java:5370:10:5370:24 | scheme(...) : Http2Headers | provenance | MaD:293 |
 | Test.java:5370:10:5370:24 | scheme(...) : Http2Headers | Test.java:5371:9:5371:11 | out | provenance |  |
 | Test.java:5376:22:5376:43 | (...)... : CharSequence | Test.java:5377:15:5377:16 | in : CharSequence | provenance |  |
 | Test.java:5376:36:5376:43 | source(...) : Object | Test.java:5376:22:5376:43 | (...)... : CharSequence | provenance |  |
 | Test.java:5377:4:5377:6 | out [post update] : Http2Headers [<element>, <map.value>] : CharSequence | Test.java:5378:39:5378:41 | out : Http2Headers [<element>, <map.value>] : CharSequence | provenance |  |
-| Test.java:5377:15:5377:16 | in : CharSequence | Test.java:5377:4:5377:6 | out [post update] : Http2Headers [<element>, <map.value>] : CharSequence | provenance | MaD:356 |
-| Test.java:5378:28:5378:42 | getElement(...) : Entry [<map.value>] : CharSequence | Test.java:5378:9:5378:43 | getMapValueDefault(...) | provenance | MaD:498 |
+| Test.java:5377:15:5377:16 | in : CharSequence | Test.java:5377:4:5377:6 | out [post update] : Http2Headers [<element>, <map.value>] : CharSequence | provenance | MaD:292 |
+| Test.java:5378:28:5378:42 | getElement(...) : Entry [<map.value>] : CharSequence | Test.java:5378:9:5378:43 | getMapValueDefault(...) | provenance | MaD:2 |
 | Test.java:5378:39:5378:41 | out : Http2Headers [<element>, <map.value>] : CharSequence | Test.java:79:19:79:32 | it : Http2Headers [<element>, <map.value>] : CharSequence | provenance |  |
-| Test.java:5378:39:5378:41 | out : Http2Headers [<element>, <map.value>] : CharSequence | Test.java:5378:28:5378:42 | getElement(...) : Entry [<map.value>] : CharSequence | provenance | MaD:492 |
+| Test.java:5378:39:5378:41 | out : Http2Headers [<element>, <map.value>] : CharSequence | Test.java:5378:28:5378:42 | getElement(...) : Entry [<map.value>] : CharSequence | provenance | MaD:495 |
 | Test.java:5383:22:5383:90 | (...)... : Http2Headers [<element>, <map.value>] : Object | Test.java:5384:10:5384:11 | in : Http2Headers [<element>, <map.value>] : Object | provenance |  |
 | Test.java:5383:36:5383:90 | newWithElementDefault(...) : Object [<element>, <map.value>] : Object | Test.java:5383:22:5383:90 | (...)... : Http2Headers [<element>, <map.value>] : Object | provenance |  |
-| Test.java:5383:58:5383:89 | newWithMapValueDefault(...) : Object [<map.value>] : Object | Test.java:5383:36:5383:90 | newWithElementDefault(...) : Object [<element>, <map.value>] : Object | provenance | MaD:497 |
-| Test.java:5383:81:5383:88 | source(...) : Object | Test.java:5383:58:5383:89 | newWithMapValueDefault(...) : Object [<map.value>] : Object | provenance | MaD:495 |
-| Test.java:5384:10:5384:11 | in : Http2Headers [<element>, <map.value>] : Object | Test.java:5384:10:5384:20 | status(...) : CharSequence | provenance | MaD:358 |
+| Test.java:5383:58:5383:89 | newWithMapValueDefault(...) : Object [<map.value>] : Object | Test.java:5383:36:5383:90 | newWithElementDefault(...) : Object [<element>, <map.value>] : Object | provenance | MaD:3 |
+| Test.java:5383:81:5383:88 | source(...) : Object | Test.java:5383:58:5383:89 | newWithMapValueDefault(...) : Object [<map.value>] : Object | provenance | MaD:5 |
+| Test.java:5384:10:5384:11 | in : Http2Headers [<element>, <map.value>] : Object | Test.java:5384:10:5384:20 | status(...) : CharSequence | provenance | MaD:294 |
 | Test.java:5384:10:5384:20 | status(...) : CharSequence | Test.java:5385:9:5385:11 | out | provenance |  |
 | Test.java:5390:22:5390:43 | (...)... : Http2Headers | Test.java:5391:10:5391:11 | in : Http2Headers | provenance |  |
 | Test.java:5390:36:5390:43 | source(...) : Object | Test.java:5390:22:5390:43 | (...)... : Http2Headers | provenance |  |
-| Test.java:5391:10:5391:11 | in : Http2Headers | Test.java:5391:10:5391:24 | status(...) : Http2Headers | provenance | MaD:360 |
+| Test.java:5391:10:5391:11 | in : Http2Headers | Test.java:5391:10:5391:24 | status(...) : Http2Headers | provenance | MaD:296 |
 | Test.java:5391:10:5391:24 | status(...) : Http2Headers | Test.java:5392:9:5392:11 | out | provenance |  |
 | Test.java:5397:22:5397:43 | (...)... : CharSequence | Test.java:5398:15:5398:16 | in : CharSequence | provenance |  |
 | Test.java:5397:36:5397:43 | source(...) : Object | Test.java:5397:22:5397:43 | (...)... : CharSequence | provenance |  |
 | Test.java:5398:4:5398:6 | out [post update] : Http2Headers [<element>, <map.value>] : CharSequence | Test.java:5399:39:5399:41 | out : Http2Headers [<element>, <map.value>] : CharSequence | provenance |  |
-| Test.java:5398:15:5398:16 | in : CharSequence | Test.java:5398:4:5398:6 | out [post update] : Http2Headers [<element>, <map.value>] : CharSequence | provenance | MaD:359 |
-| Test.java:5399:28:5399:42 | getElement(...) : Entry [<map.value>] : CharSequence | Test.java:5399:9:5399:43 | getMapValueDefault(...) | provenance | MaD:498 |
+| Test.java:5398:15:5398:16 | in : CharSequence | Test.java:5398:4:5398:6 | out [post update] : Http2Headers [<element>, <map.value>] : CharSequence | provenance | MaD:295 |
+| Test.java:5399:28:5399:42 | getElement(...) : Entry [<map.value>] : CharSequence | Test.java:5399:9:5399:43 | getMapValueDefault(...) | provenance | MaD:2 |
 | Test.java:5399:39:5399:41 | out : Http2Headers [<element>, <map.value>] : CharSequence | Test.java:79:19:79:32 | it : Http2Headers [<element>, <map.value>] : CharSequence | provenance |  |
-| Test.java:5399:39:5399:41 | out : Http2Headers [<element>, <map.value>] : CharSequence | Test.java:5399:28:5399:42 | getElement(...) : Entry [<map.value>] : CharSequence | provenance | MaD:492 |
+| Test.java:5399:39:5399:41 | out : Http2Headers [<element>, <map.value>] : CharSequence | Test.java:5399:28:5399:42 | getElement(...) : Entry [<map.value>] : CharSequence | provenance | MaD:495 |
 | Test.java:5404:22:5404:90 | (...)... : Http2Headers [<element>, <map.value>] : Object | Test.java:5405:10:5405:11 | in : Http2Headers [<element>, <map.value>] : Object | provenance |  |
 | Test.java:5404:36:5404:90 | newWithElementDefault(...) : Object [<element>, <map.value>] : Object | Test.java:5404:22:5404:90 | (...)... : Http2Headers [<element>, <map.value>] : Object | provenance |  |
-| Test.java:5404:58:5404:89 | newWithMapValueDefault(...) : Object [<map.value>] : Object | Test.java:5404:36:5404:90 | newWithElementDefault(...) : Object [<element>, <map.value>] : Object | provenance | MaD:497 |
-| Test.java:5404:81:5404:88 | source(...) : Object | Test.java:5404:58:5404:89 | newWithMapValueDefault(...) : Object [<map.value>] : Object | provenance | MaD:495 |
-| Test.java:5405:10:5405:11 | in : Http2Headers [<element>, <map.value>] : Object | Test.java:5405:10:5405:31 | valueIterator(...) : Iterator [<element>] : Object | provenance | MaD:361 |
+| Test.java:5404:58:5404:89 | newWithMapValueDefault(...) : Object [<map.value>] : Object | Test.java:5404:36:5404:90 | newWithElementDefault(...) : Object [<element>, <map.value>] : Object | provenance | MaD:3 |
+| Test.java:5404:81:5404:88 | source(...) : Object | Test.java:5404:58:5404:89 | newWithMapValueDefault(...) : Object [<map.value>] : Object | provenance | MaD:5 |
+| Test.java:5405:10:5405:11 | in : Http2Headers [<element>, <map.value>] : Object | Test.java:5405:10:5405:31 | valueIterator(...) : Iterator [<element>] : Object | provenance | MaD:297 |
 | Test.java:5405:10:5405:31 | valueIterator(...) : Iterator [<element>] : Object | Test.java:5406:20:5406:22 | out : Iterator [<element>] : Object | provenance |  |
 | Test.java:5406:20:5406:22 | out : Iterator [<element>] : Object | Test.java:80:19:80:32 | it : Iterator [<element>] : Object | provenance |  |
-| Test.java:5406:20:5406:22 | out : Iterator [<element>] : Object | Test.java:5406:9:5406:23 | getElement(...) | provenance | MaD:493 |
+| Test.java:5406:20:5406:22 | out : Iterator [<element>] : Object | Test.java:5406:9:5406:23 | getElement(...) | provenance | MaD:496 |
 | Test.java:5411:27:5411:53 | (...)... : Http2HeadersFrame | Test.java:5412:10:5412:11 | in : Http2HeadersFrame | provenance |  |
 | Test.java:5411:46:5411:53 | source(...) : Object | Test.java:5411:27:5411:53 | (...)... : Http2HeadersFrame | provenance |  |
-| Test.java:5412:10:5412:11 | in : Http2HeadersFrame | Test.java:5412:10:5412:21 | headers(...) : Http2Headers | provenance | MaD:362 |
+| Test.java:5412:10:5412:11 | in : Http2HeadersFrame | Test.java:5412:10:5412:21 | headers(...) : Http2Headers | provenance | MaD:298 |
 | Test.java:5412:10:5412:21 | headers(...) : Http2Headers | Test.java:5413:9:5413:11 | out | provenance |  |
 | Test.java:5418:31:5418:61 | (...)... : Http2PushPromiseFrame | Test.java:5419:10:5419:11 | in : Http2PushPromiseFrame | provenance |  |
 | Test.java:5418:54:5418:61 | source(...) : Object | Test.java:5418:31:5418:61 | (...)... : Http2PushPromiseFrame | provenance |  |
-| Test.java:5419:10:5419:11 | in : Http2PushPromiseFrame | Test.java:5419:10:5419:26 | http2Headers(...) : Http2Headers | provenance | MaD:363 |
+| Test.java:5419:10:5419:11 | in : Http2PushPromiseFrame | Test.java:5419:10:5419:26 | http2Headers(...) : Http2Headers | provenance | MaD:299 |
 | Test.java:5419:10:5419:26 | http2Headers(...) : Http2Headers | Test.java:5420:9:5420:11 | out | provenance |  |
 | Test.java:5425:22:5425:88 | (...)... : Http2Headers [<element>, <map.key>] : Object | Test.java:5426:48:5426:49 | in : Http2Headers [<element>, <map.key>] : Object | provenance |  |
 | Test.java:5425:36:5425:88 | newWithElementDefault(...) : Object [<element>, <map.key>] : Object | Test.java:5425:22:5425:88 | (...)... : Http2Headers [<element>, <map.key>] : Object | provenance |  |
-| Test.java:5425:58:5425:87 | newWithMapKeyDefault(...) : Object [<map.key>] : Object | Test.java:5425:36:5425:88 | newWithElementDefault(...) : Object [<element>, <map.key>] : Object | provenance | MaD:497 |
-| Test.java:5425:79:5425:86 | source(...) : Object | Test.java:5425:58:5425:87 | newWithMapKeyDefault(...) : Object [<map.key>] : Object | provenance | MaD:496 |
-| Test.java:5426:48:5426:49 | in : Http2Headers [<element>, <map.key>] : Object | Test.java:5426:52:5426:54 | out [post update] : FullHttpMessage | provenance | MaD:364 |
+| Test.java:5425:58:5425:87 | newWithMapKeyDefault(...) : Object [<map.key>] : Object | Test.java:5425:36:5425:88 | newWithElementDefault(...) : Object [<element>, <map.key>] : Object | provenance | MaD:3 |
+| Test.java:5425:79:5425:86 | source(...) : Object | Test.java:5425:58:5425:87 | newWithMapKeyDefault(...) : Object [<map.key>] : Object | provenance | MaD:4 |
+| Test.java:5426:48:5426:49 | in : Http2Headers [<element>, <map.key>] : Object | Test.java:5426:52:5426:54 | out [post update] : FullHttpMessage | provenance | MaD:300 |
 | Test.java:5426:52:5426:54 | out [post update] : FullHttpMessage | Test.java:5427:9:5427:11 | out | provenance |  |
 | Test.java:5432:22:5432:90 | (...)... : Http2Headers [<element>, <map.value>] : Object | Test.java:5433:48:5433:49 | in : Http2Headers [<element>, <map.value>] : Object | provenance |  |
 | Test.java:5432:36:5432:90 | newWithElementDefault(...) : Object [<element>, <map.value>] : Object | Test.java:5432:22:5432:90 | (...)... : Http2Headers [<element>, <map.value>] : Object | provenance |  |
-| Test.java:5432:58:5432:89 | newWithMapValueDefault(...) : Object [<map.value>] : Object | Test.java:5432:36:5432:90 | newWithElementDefault(...) : Object [<element>, <map.value>] : Object | provenance | MaD:497 |
-| Test.java:5432:81:5432:88 | source(...) : Object | Test.java:5432:58:5432:89 | newWithMapValueDefault(...) : Object [<map.value>] : Object | provenance | MaD:495 |
-| Test.java:5433:48:5433:49 | in : Http2Headers [<element>, <map.value>] : Object | Test.java:5433:52:5433:54 | out [post update] : FullHttpMessage | provenance | MaD:365 |
+| Test.java:5432:58:5432:89 | newWithMapValueDefault(...) : Object [<map.value>] : Object | Test.java:5432:36:5432:90 | newWithElementDefault(...) : Object [<element>, <map.value>] : Object | provenance | MaD:3 |
+| Test.java:5432:81:5432:88 | source(...) : Object | Test.java:5432:58:5432:89 | newWithMapValueDefault(...) : Object [<map.value>] : Object | provenance | MaD:5 |
+| Test.java:5433:48:5433:49 | in : Http2Headers [<element>, <map.value>] : Object | Test.java:5433:52:5433:54 | out [post update] : FullHttpMessage | provenance | MaD:301 |
 | Test.java:5433:52:5433:54 | out [post update] : FullHttpMessage | Test.java:5434:9:5434:11 | out | provenance |  |
 | Test.java:5439:22:5439:88 | (...)... : Http2Headers [<element>, <map.key>] : Object | Test.java:5440:48:5440:49 | in : Http2Headers [<element>, <map.key>] : Object | provenance |  |
 | Test.java:5439:36:5439:88 | newWithElementDefault(...) : Object [<element>, <map.key>] : Object | Test.java:5439:22:5439:88 | (...)... : Http2Headers [<element>, <map.key>] : Object | provenance |  |
-| Test.java:5439:58:5439:87 | newWithMapKeyDefault(...) : Object [<map.key>] : Object | Test.java:5439:36:5439:88 | newWithElementDefault(...) : Object [<element>, <map.key>] : Object | provenance | MaD:497 |
-| Test.java:5439:79:5439:86 | source(...) : Object | Test.java:5439:58:5439:87 | newWithMapKeyDefault(...) : Object [<map.key>] : Object | provenance | MaD:496 |
-| Test.java:5440:48:5440:49 | in : Http2Headers [<element>, <map.key>] : Object | Test.java:5440:52:5440:54 | out [post update] : HttpHeaders [<element>, <map.key>] : Object | provenance | MaD:366 |
+| Test.java:5439:58:5439:87 | newWithMapKeyDefault(...) : Object [<map.key>] : Object | Test.java:5439:36:5439:88 | newWithElementDefault(...) : Object [<element>, <map.key>] : Object | provenance | MaD:3 |
+| Test.java:5439:79:5439:86 | source(...) : Object | Test.java:5439:58:5439:87 | newWithMapKeyDefault(...) : Object [<map.key>] : Object | provenance | MaD:4 |
+| Test.java:5440:48:5440:49 | in : Http2Headers [<element>, <map.key>] : Object | Test.java:5440:52:5440:54 | out [post update] : HttpHeaders [<element>, <map.key>] : Object | provenance | MaD:302 |
 | Test.java:5440:52:5440:54 | out [post update] : HttpHeaders [<element>, <map.key>] : Object | Test.java:5441:37:5441:39 | out : HttpHeaders [<element>, <map.key>] : Object | provenance |  |
-| Test.java:5441:26:5441:40 | getElement(...) : Entry [<map.key>] : Object | Test.java:5441:9:5441:41 | getMapKeyDefault(...) | provenance | MaD:499 |
+| Test.java:5441:26:5441:40 | getElement(...) : Entry [<map.key>] : Object | Test.java:5441:9:5441:41 | getMapKeyDefault(...) | provenance | MaD:1 |
 | Test.java:5441:37:5441:39 | out : HttpHeaders [<element>, <map.key>] : Object | Test.java:79:19:79:32 | it : HttpHeaders [<element>, <map.key>] : Object | provenance |  |
-| Test.java:5441:37:5441:39 | out : HttpHeaders [<element>, <map.key>] : Object | Test.java:5441:26:5441:40 | getElement(...) : Entry [<map.key>] : Object | provenance | MaD:492 |
+| Test.java:5441:37:5441:39 | out : HttpHeaders [<element>, <map.key>] : Object | Test.java:5441:26:5441:40 | getElement(...) : Entry [<map.key>] : Object | provenance | MaD:495 |
 | Test.java:5446:22:5446:90 | (...)... : Http2Headers [<element>, <map.value>] : Object | Test.java:5447:48:5447:49 | in : Http2Headers [<element>, <map.value>] : Object | provenance |  |
 | Test.java:5446:36:5446:90 | newWithElementDefault(...) : Object [<element>, <map.value>] : Object | Test.java:5446:22:5446:90 | (...)... : Http2Headers [<element>, <map.value>] : Object | provenance |  |
-| Test.java:5446:58:5446:89 | newWithMapValueDefault(...) : Object [<map.value>] : Object | Test.java:5446:36:5446:90 | newWithElementDefault(...) : Object [<element>, <map.value>] : Object | provenance | MaD:497 |
-| Test.java:5446:81:5446:88 | source(...) : Object | Test.java:5446:58:5446:89 | newWithMapValueDefault(...) : Object [<map.value>] : Object | provenance | MaD:495 |
-| Test.java:5447:48:5447:49 | in : Http2Headers [<element>, <map.value>] : Object | Test.java:5447:52:5447:54 | out [post update] : HttpHeaders [<element>, <map.value>] : Object | provenance | MaD:367 |
+| Test.java:5446:58:5446:89 | newWithMapValueDefault(...) : Object [<map.value>] : Object | Test.java:5446:36:5446:90 | newWithElementDefault(...) : Object [<element>, <map.value>] : Object | provenance | MaD:3 |
+| Test.java:5446:81:5446:88 | source(...) : Object | Test.java:5446:58:5446:89 | newWithMapValueDefault(...) : Object [<map.value>] : Object | provenance | MaD:5 |
+| Test.java:5447:48:5447:49 | in : Http2Headers [<element>, <map.value>] : Object | Test.java:5447:52:5447:54 | out [post update] : HttpHeaders [<element>, <map.value>] : Object | provenance | MaD:303 |
 | Test.java:5447:52:5447:54 | out [post update] : HttpHeaders [<element>, <map.value>] : Object | Test.java:5448:39:5448:41 | out : HttpHeaders [<element>, <map.value>] : Object | provenance |  |
-| Test.java:5448:28:5448:42 | getElement(...) : Entry [<map.value>] : Object | Test.java:5448:9:5448:43 | getMapValueDefault(...) | provenance | MaD:498 |
+| Test.java:5448:28:5448:42 | getElement(...) : Entry [<map.value>] : Object | Test.java:5448:9:5448:43 | getMapValueDefault(...) | provenance | MaD:2 |
 | Test.java:5448:39:5448:41 | out : HttpHeaders [<element>, <map.value>] : Object | Test.java:79:19:79:32 | it : HttpHeaders [<element>, <map.value>] : Object | provenance |  |
-| Test.java:5448:39:5448:41 | out : HttpHeaders [<element>, <map.value>] : Object | Test.java:5448:28:5448:42 | getElement(...) : Entry [<map.value>] : Object | provenance | MaD:492 |
+| Test.java:5448:39:5448:41 | out : HttpHeaders [<element>, <map.value>] : Object | Test.java:5448:28:5448:42 | getElement(...) : Entry [<map.value>] : Object | provenance | MaD:495 |
 | Test.java:5453:17:5453:33 | (...)... : ByteBuf | Test.java:5454:70:5454:71 | in : ByteBuf | provenance |  |
 | Test.java:5453:26:5453:33 | source(...) : Object | Test.java:5453:17:5453:33 | (...)... : ByteBuf | provenance |  |
 | Test.java:5454:10:5454:79 | toFullHttpRequest(...) : FullHttpRequest | Test.java:5455:9:5455:11 | out | provenance |  |
-| Test.java:5454:70:5454:71 | in : ByteBuf | Test.java:5454:10:5454:79 | toFullHttpRequest(...) : FullHttpRequest | provenance | MaD:370 |
+| Test.java:5454:70:5454:71 | in : ByteBuf | Test.java:5454:10:5454:79 | toFullHttpRequest(...) : FullHttpRequest | provenance | MaD:304 |
 | Test.java:5460:22:5460:88 | (...)... : Http2Headers [<element>, <map.key>] : Object | Test.java:5461:50:5461:51 | in : Http2Headers [<element>, <map.key>] : Object | provenance |  |
 | Test.java:5460:36:5460:88 | newWithElementDefault(...) : Object [<element>, <map.key>] : Object | Test.java:5460:22:5460:88 | (...)... : Http2Headers [<element>, <map.key>] : Object | provenance |  |
-| Test.java:5460:58:5460:87 | newWithMapKeyDefault(...) : Object [<map.key>] : Object | Test.java:5460:36:5460:88 | newWithElementDefault(...) : Object [<element>, <map.key>] : Object | provenance | MaD:497 |
-| Test.java:5460:79:5460:86 | source(...) : Object | Test.java:5460:58:5460:87 | newWithMapKeyDefault(...) : Object [<map.key>] : Object | provenance | MaD:496 |
+| Test.java:5460:58:5460:87 | newWithMapKeyDefault(...) : Object [<map.key>] : Object | Test.java:5460:36:5460:88 | newWithElementDefault(...) : Object [<element>, <map.key>] : Object | provenance | MaD:3 |
+| Test.java:5460:79:5460:86 | source(...) : Object | Test.java:5460:58:5460:87 | newWithMapKeyDefault(...) : Object [<map.key>] : Object | provenance | MaD:4 |
 | Test.java:5461:10:5461:74 | toFullHttpRequest(...) : FullHttpRequest | Test.java:5462:9:5462:11 | out | provenance |  |
-| Test.java:5461:50:5461:51 | in : Http2Headers [<element>, <map.key>] : Object | Test.java:5461:10:5461:74 | toFullHttpRequest(...) : FullHttpRequest | provenance | MaD:368 |
+| Test.java:5461:50:5461:51 | in : Http2Headers [<element>, <map.key>] : Object | Test.java:5461:10:5461:74 | toFullHttpRequest(...) : FullHttpRequest | provenance | MaD:305 |
 | Test.java:5467:22:5467:88 | (...)... : Http2Headers [<element>, <map.key>] : Object | Test.java:5468:50:5468:51 | in : Http2Headers [<element>, <map.key>] : Object | provenance |  |
 | Test.java:5467:36:5467:88 | newWithElementDefault(...) : Object [<element>, <map.key>] : Object | Test.java:5467:22:5467:88 | (...)... : Http2Headers [<element>, <map.key>] : Object | provenance |  |
-| Test.java:5467:58:5467:87 | newWithMapKeyDefault(...) : Object [<map.key>] : Object | Test.java:5467:36:5467:88 | newWithElementDefault(...) : Object [<element>, <map.key>] : Object | provenance | MaD:497 |
-| Test.java:5467:79:5467:86 | source(...) : Object | Test.java:5467:58:5467:87 | newWithMapKeyDefault(...) : Object [<map.key>] : Object | provenance | MaD:496 |
+| Test.java:5467:58:5467:87 | newWithMapKeyDefault(...) : Object [<map.key>] : Object | Test.java:5467:36:5467:88 | newWithElementDefault(...) : Object [<element>, <map.key>] : Object | provenance | MaD:3 |
+| Test.java:5467:79:5467:86 | source(...) : Object | Test.java:5467:58:5467:87 | newWithMapKeyDefault(...) : Object [<map.key>] : Object | provenance | MaD:4 |
 | Test.java:5468:10:5468:83 | toFullHttpRequest(...) : FullHttpRequest | Test.java:5469:9:5469:11 | out | provenance |  |
-| Test.java:5468:50:5468:51 | in : Http2Headers [<element>, <map.key>] : Object | Test.java:5468:10:5468:83 | toFullHttpRequest(...) : FullHttpRequest | provenance | MaD:368 |
+| Test.java:5468:50:5468:51 | in : Http2Headers [<element>, <map.key>] : Object | Test.java:5468:10:5468:83 | toFullHttpRequest(...) : FullHttpRequest | provenance | MaD:305 |
 | Test.java:5474:22:5474:90 | (...)... : Http2Headers [<element>, <map.value>] : Object | Test.java:5475:50:5475:51 | in : Http2Headers [<element>, <map.value>] : Object | provenance |  |
 | Test.java:5474:36:5474:90 | newWithElementDefault(...) : Object [<element>, <map.value>] : Object | Test.java:5474:22:5474:90 | (...)... : Http2Headers [<element>, <map.value>] : Object | provenance |  |
-| Test.java:5474:58:5474:89 | newWithMapValueDefault(...) : Object [<map.value>] : Object | Test.java:5474:36:5474:90 | newWithElementDefault(...) : Object [<element>, <map.value>] : Object | provenance | MaD:497 |
-| Test.java:5474:81:5474:88 | source(...) : Object | Test.java:5474:58:5474:89 | newWithMapValueDefault(...) : Object [<map.value>] : Object | provenance | MaD:495 |
+| Test.java:5474:58:5474:89 | newWithMapValueDefault(...) : Object [<map.value>] : Object | Test.java:5474:36:5474:90 | newWithElementDefault(...) : Object [<element>, <map.value>] : Object | provenance | MaD:3 |
+| Test.java:5474:81:5474:88 | source(...) : Object | Test.java:5474:58:5474:89 | newWithMapValueDefault(...) : Object [<map.value>] : Object | provenance | MaD:5 |
 | Test.java:5475:10:5475:74 | toFullHttpRequest(...) : FullHttpRequest | Test.java:5476:9:5476:11 | out | provenance |  |
-| Test.java:5475:50:5475:51 | in : Http2Headers [<element>, <map.value>] : Object | Test.java:5475:10:5475:74 | toFullHttpRequest(...) : FullHttpRequest | provenance | MaD:369 |
+| Test.java:5475:50:5475:51 | in : Http2Headers [<element>, <map.value>] : Object | Test.java:5475:10:5475:74 | toFullHttpRequest(...) : FullHttpRequest | provenance | MaD:306 |
 | Test.java:5481:22:5481:90 | (...)... : Http2Headers [<element>, <map.value>] : Object | Test.java:5482:50:5482:51 | in : Http2Headers [<element>, <map.value>] : Object | provenance |  |
 | Test.java:5481:36:5481:90 | newWithElementDefault(...) : Object [<element>, <map.value>] : Object | Test.java:5481:22:5481:90 | (...)... : Http2Headers [<element>, <map.value>] : Object | provenance |  |
-| Test.java:5481:58:5481:89 | newWithMapValueDefault(...) : Object [<map.value>] : Object | Test.java:5481:36:5481:90 | newWithElementDefault(...) : Object [<element>, <map.value>] : Object | provenance | MaD:497 |
-| Test.java:5481:81:5481:88 | source(...) : Object | Test.java:5481:58:5481:89 | newWithMapValueDefault(...) : Object [<map.value>] : Object | provenance | MaD:495 |
+| Test.java:5481:58:5481:89 | newWithMapValueDefault(...) : Object [<map.value>] : Object | Test.java:5481:36:5481:90 | newWithElementDefault(...) : Object [<element>, <map.value>] : Object | provenance | MaD:3 |
+| Test.java:5481:81:5481:88 | source(...) : Object | Test.java:5481:58:5481:89 | newWithMapValueDefault(...) : Object [<map.value>] : Object | provenance | MaD:5 |
 | Test.java:5482:10:5482:83 | toFullHttpRequest(...) : FullHttpRequest | Test.java:5483:9:5483:11 | out | provenance |  |
-| Test.java:5482:50:5482:51 | in : Http2Headers [<element>, <map.value>] : Object | Test.java:5482:10:5482:83 | toFullHttpRequest(...) : FullHttpRequest | provenance | MaD:369 |
+| Test.java:5482:50:5482:51 | in : Http2Headers [<element>, <map.value>] : Object | Test.java:5482:10:5482:83 | toFullHttpRequest(...) : FullHttpRequest | provenance | MaD:306 |
 | Test.java:5488:17:5488:33 | (...)... : ByteBuf | Test.java:5489:71:5489:72 | in : ByteBuf | provenance |  |
 | Test.java:5488:26:5488:33 | source(...) : Object | Test.java:5488:17:5488:33 | (...)... : ByteBuf | provenance |  |
 | Test.java:5489:10:5489:80 | toFullHttpResponse(...) : FullHttpResponse | Test.java:5490:9:5490:11 | out | provenance |  |
-| Test.java:5489:71:5489:72 | in : ByteBuf | Test.java:5489:10:5489:80 | toFullHttpResponse(...) : FullHttpResponse | provenance | MaD:373 |
+| Test.java:5489:71:5489:72 | in : ByteBuf | Test.java:5489:10:5489:80 | toFullHttpResponse(...) : FullHttpResponse | provenance | MaD:307 |
 | Test.java:5495:22:5495:88 | (...)... : Http2Headers [<element>, <map.key>] : Object | Test.java:5496:51:5496:52 | in : Http2Headers [<element>, <map.key>] : Object | provenance |  |
 | Test.java:5495:36:5495:88 | newWithElementDefault(...) : Object [<element>, <map.key>] : Object | Test.java:5495:22:5495:88 | (...)... : Http2Headers [<element>, <map.key>] : Object | provenance |  |
-| Test.java:5495:58:5495:87 | newWithMapKeyDefault(...) : Object [<map.key>] : Object | Test.java:5495:36:5495:88 | newWithElementDefault(...) : Object [<element>, <map.key>] : Object | provenance | MaD:497 |
-| Test.java:5495:79:5495:86 | source(...) : Object | Test.java:5495:58:5495:87 | newWithMapKeyDefault(...) : Object [<map.key>] : Object | provenance | MaD:496 |
+| Test.java:5495:58:5495:87 | newWithMapKeyDefault(...) : Object [<map.key>] : Object | Test.java:5495:36:5495:88 | newWithElementDefault(...) : Object [<element>, <map.key>] : Object | provenance | MaD:3 |
+| Test.java:5495:79:5495:86 | source(...) : Object | Test.java:5495:58:5495:87 | newWithMapKeyDefault(...) : Object [<map.key>] : Object | provenance | MaD:4 |
 | Test.java:5496:10:5496:75 | toFullHttpResponse(...) : FullHttpResponse | Test.java:5497:9:5497:11 | out | provenance |  |
-| Test.java:5496:51:5496:52 | in : Http2Headers [<element>, <map.key>] : Object | Test.java:5496:10:5496:75 | toFullHttpResponse(...) : FullHttpResponse | provenance | MaD:371 |
+| Test.java:5496:51:5496:52 | in : Http2Headers [<element>, <map.key>] : Object | Test.java:5496:10:5496:75 | toFullHttpResponse(...) : FullHttpResponse | provenance | MaD:308 |
 | Test.java:5502:22:5502:88 | (...)... : Http2Headers [<element>, <map.key>] : Object | Test.java:5503:51:5503:52 | in : Http2Headers [<element>, <map.key>] : Object | provenance |  |
 | Test.java:5502:36:5502:88 | newWithElementDefault(...) : Object [<element>, <map.key>] : Object | Test.java:5502:22:5502:88 | (...)... : Http2Headers [<element>, <map.key>] : Object | provenance |  |
-| Test.java:5502:58:5502:87 | newWithMapKeyDefault(...) : Object [<map.key>] : Object | Test.java:5502:36:5502:88 | newWithElementDefault(...) : Object [<element>, <map.key>] : Object | provenance | MaD:497 |
-| Test.java:5502:79:5502:86 | source(...) : Object | Test.java:5502:58:5502:87 | newWithMapKeyDefault(...) : Object [<map.key>] : Object | provenance | MaD:496 |
+| Test.java:5502:58:5502:87 | newWithMapKeyDefault(...) : Object [<map.key>] : Object | Test.java:5502:36:5502:88 | newWithElementDefault(...) : Object [<element>, <map.key>] : Object | provenance | MaD:3 |
+| Test.java:5502:79:5502:86 | source(...) : Object | Test.java:5502:58:5502:87 | newWithMapKeyDefault(...) : Object [<map.key>] : Object | provenance | MaD:4 |
 | Test.java:5503:10:5503:84 | toFullHttpResponse(...) : FullHttpResponse | Test.java:5504:9:5504:11 | out | provenance |  |
-| Test.java:5503:51:5503:52 | in : Http2Headers [<element>, <map.key>] : Object | Test.java:5503:10:5503:84 | toFullHttpResponse(...) : FullHttpResponse | provenance | MaD:371 |
+| Test.java:5503:51:5503:52 | in : Http2Headers [<element>, <map.key>] : Object | Test.java:5503:10:5503:84 | toFullHttpResponse(...) : FullHttpResponse | provenance | MaD:308 |
 | Test.java:5509:22:5509:90 | (...)... : Http2Headers [<element>, <map.value>] : Object | Test.java:5510:51:5510:52 | in : Http2Headers [<element>, <map.value>] : Object | provenance |  |
 | Test.java:5509:36:5509:90 | newWithElementDefault(...) : Object [<element>, <map.value>] : Object | Test.java:5509:22:5509:90 | (...)... : Http2Headers [<element>, <map.value>] : Object | provenance |  |
-| Test.java:5509:58:5509:89 | newWithMapValueDefault(...) : Object [<map.value>] : Object | Test.java:5509:36:5509:90 | newWithElementDefault(...) : Object [<element>, <map.value>] : Object | provenance | MaD:497 |
-| Test.java:5509:81:5509:88 | source(...) : Object | Test.java:5509:58:5509:89 | newWithMapValueDefault(...) : Object [<map.value>] : Object | provenance | MaD:495 |
+| Test.java:5509:58:5509:89 | newWithMapValueDefault(...) : Object [<map.value>] : Object | Test.java:5509:36:5509:90 | newWithElementDefault(...) : Object [<element>, <map.value>] : Object | provenance | MaD:3 |
+| Test.java:5509:81:5509:88 | source(...) : Object | Test.java:5509:58:5509:89 | newWithMapValueDefault(...) : Object [<map.value>] : Object | provenance | MaD:5 |
 | Test.java:5510:10:5510:75 | toFullHttpResponse(...) : FullHttpResponse | Test.java:5511:9:5511:11 | out | provenance |  |
-| Test.java:5510:51:5510:52 | in : Http2Headers [<element>, <map.value>] : Object | Test.java:5510:10:5510:75 | toFullHttpResponse(...) : FullHttpResponse | provenance | MaD:372 |
+| Test.java:5510:51:5510:52 | in : Http2Headers [<element>, <map.value>] : Object | Test.java:5510:10:5510:75 | toFullHttpResponse(...) : FullHttpResponse | provenance | MaD:309 |
 | Test.java:5516:22:5516:90 | (...)... : Http2Headers [<element>, <map.value>] : Object | Test.java:5517:51:5517:52 | in : Http2Headers [<element>, <map.value>] : Object | provenance |  |
 | Test.java:5516:36:5516:90 | newWithElementDefault(...) : Object [<element>, <map.value>] : Object | Test.java:5516:22:5516:90 | (...)... : Http2Headers [<element>, <map.value>] : Object | provenance |  |
-| Test.java:5516:58:5516:89 | newWithMapValueDefault(...) : Object [<map.value>] : Object | Test.java:5516:36:5516:90 | newWithElementDefault(...) : Object [<element>, <map.value>] : Object | provenance | MaD:497 |
-| Test.java:5516:81:5516:88 | source(...) : Object | Test.java:5516:58:5516:89 | newWithMapValueDefault(...) : Object [<map.value>] : Object | provenance | MaD:495 |
+| Test.java:5516:58:5516:89 | newWithMapValueDefault(...) : Object [<map.value>] : Object | Test.java:5516:36:5516:90 | newWithElementDefault(...) : Object [<element>, <map.value>] : Object | provenance | MaD:3 |
+| Test.java:5516:81:5516:88 | source(...) : Object | Test.java:5516:58:5516:89 | newWithMapValueDefault(...) : Object [<map.value>] : Object | provenance | MaD:5 |
 | Test.java:5517:10:5517:84 | toFullHttpResponse(...) : FullHttpResponse | Test.java:5518:9:5518:11 | out | provenance |  |
-| Test.java:5517:51:5517:52 | in : Http2Headers [<element>, <map.value>] : Object | Test.java:5517:10:5517:84 | toFullHttpResponse(...) : FullHttpResponse | provenance | MaD:372 |
+| Test.java:5517:51:5517:52 | in : Http2Headers [<element>, <map.value>] : Object | Test.java:5517:10:5517:84 | toFullHttpResponse(...) : FullHttpResponse | provenance | MaD:309 |
 | Test.java:5523:21:5523:86 | (...)... : HttpHeaders [<element>, <map.key>] : Object | Test.java:5524:38:5524:39 | in : HttpHeaders [<element>, <map.key>] : Object | provenance |  |
 | Test.java:5523:34:5523:86 | newWithElementDefault(...) : Object [<element>, <map.key>] : Object | Test.java:5523:21:5523:86 | (...)... : HttpHeaders [<element>, <map.key>] : Object | provenance |  |
-| Test.java:5523:56:5523:85 | newWithMapKeyDefault(...) : Object [<map.key>] : Object | Test.java:5523:34:5523:86 | newWithElementDefault(...) : Object [<element>, <map.key>] : Object | provenance | MaD:497 |
-| Test.java:5523:77:5523:84 | source(...) : Object | Test.java:5523:56:5523:85 | newWithMapKeyDefault(...) : Object [<map.key>] : Object | provenance | MaD:496 |
-| Test.java:5524:38:5524:39 | in : HttpHeaders [<element>, <map.key>] : Object | Test.java:5524:42:5524:44 | out [post update] : Http2Headers [<element>, <map.key>] : Object | provenance | MaD:376 |
+| Test.java:5523:56:5523:85 | newWithMapKeyDefault(...) : Object [<map.key>] : Object | Test.java:5523:34:5523:86 | newWithElementDefault(...) : Object [<element>, <map.key>] : Object | provenance | MaD:3 |
+| Test.java:5523:77:5523:84 | source(...) : Object | Test.java:5523:56:5523:85 | newWithMapKeyDefault(...) : Object [<map.key>] : Object | provenance | MaD:4 |
+| Test.java:5524:38:5524:39 | in : HttpHeaders [<element>, <map.key>] : Object | Test.java:5524:42:5524:44 | out [post update] : Http2Headers [<element>, <map.key>] : Object | provenance | MaD:310 |
 | Test.java:5524:42:5524:44 | out [post update] : Http2Headers [<element>, <map.key>] : Object | Test.java:5525:37:5525:39 | out : Http2Headers [<element>, <map.key>] : Object | provenance |  |
-| Test.java:5525:26:5525:40 | getElement(...) : Entry [<map.key>] : Object | Test.java:5525:9:5525:41 | getMapKeyDefault(...) | provenance | MaD:499 |
+| Test.java:5525:26:5525:40 | getElement(...) : Entry [<map.key>] : Object | Test.java:5525:9:5525:41 | getMapKeyDefault(...) | provenance | MaD:1 |
 | Test.java:5525:37:5525:39 | out : Http2Headers [<element>, <map.key>] : Object | Test.java:79:19:79:32 | it : Http2Headers [<element>, <map.key>] : Object | provenance |  |
-| Test.java:5525:37:5525:39 | out : Http2Headers [<element>, <map.key>] : Object | Test.java:5525:26:5525:40 | getElement(...) : Entry [<map.key>] : Object | provenance | MaD:492 |
+| Test.java:5525:37:5525:39 | out : Http2Headers [<element>, <map.key>] : Object | Test.java:5525:26:5525:40 | getElement(...) : Entry [<map.key>] : Object | provenance | MaD:495 |
 | Test.java:5530:21:5530:88 | (...)... : HttpHeaders [<element>, <map.value>] : Object | Test.java:5531:38:5531:39 | in : HttpHeaders [<element>, <map.value>] : Object | provenance |  |
 | Test.java:5530:34:5530:88 | newWithElementDefault(...) : Object [<element>, <map.value>] : Object | Test.java:5530:21:5530:88 | (...)... : HttpHeaders [<element>, <map.value>] : Object | provenance |  |
-| Test.java:5530:56:5530:87 | newWithMapValueDefault(...) : Object [<map.value>] : Object | Test.java:5530:34:5530:88 | newWithElementDefault(...) : Object [<element>, <map.value>] : Object | provenance | MaD:497 |
-| Test.java:5530:79:5530:86 | source(...) : Object | Test.java:5530:56:5530:87 | newWithMapValueDefault(...) : Object [<map.value>] : Object | provenance | MaD:495 |
-| Test.java:5531:38:5531:39 | in : HttpHeaders [<element>, <map.value>] : Object | Test.java:5531:42:5531:44 | out [post update] : Http2Headers [<element>, <map.value>] : Object | provenance | MaD:377 |
+| Test.java:5530:56:5530:87 | newWithMapValueDefault(...) : Object [<map.value>] : Object | Test.java:5530:34:5530:88 | newWithElementDefault(...) : Object [<element>, <map.value>] : Object | provenance | MaD:3 |
+| Test.java:5530:79:5530:86 | source(...) : Object | Test.java:5530:56:5530:87 | newWithMapValueDefault(...) : Object [<map.value>] : Object | provenance | MaD:5 |
+| Test.java:5531:38:5531:39 | in : HttpHeaders [<element>, <map.value>] : Object | Test.java:5531:42:5531:44 | out [post update] : Http2Headers [<element>, <map.value>] : Object | provenance | MaD:311 |
 | Test.java:5531:42:5531:44 | out [post update] : Http2Headers [<element>, <map.value>] : Object | Test.java:5532:39:5532:41 | out : Http2Headers [<element>, <map.value>] : Object | provenance |  |
-| Test.java:5532:28:5532:42 | getElement(...) : Entry [<map.value>] : Object | Test.java:5532:9:5532:43 | getMapValueDefault(...) | provenance | MaD:498 |
+| Test.java:5532:28:5532:42 | getElement(...) : Entry [<map.value>] : Object | Test.java:5532:9:5532:43 | getMapValueDefault(...) | provenance | MaD:2 |
 | Test.java:5532:39:5532:41 | out : Http2Headers [<element>, <map.value>] : Object | Test.java:79:19:79:32 | it : Http2Headers [<element>, <map.value>] : Object | provenance |  |
-| Test.java:5532:39:5532:41 | out : Http2Headers [<element>, <map.value>] : Object | Test.java:5532:28:5532:42 | getElement(...) : Entry [<map.value>] : Object | provenance | MaD:492 |
+| Test.java:5532:39:5532:41 | out : Http2Headers [<element>, <map.value>] : Object | Test.java:5532:28:5532:42 | getElement(...) : Entry [<map.value>] : Object | provenance | MaD:495 |
 | Test.java:5537:21:5537:86 | (...)... : HttpHeaders [<element>, <map.key>] : Object | Test.java:5538:44:5538:45 | in : HttpHeaders [<element>, <map.key>] : Object | provenance |  |
 | Test.java:5537:34:5537:86 | newWithElementDefault(...) : Object [<element>, <map.key>] : Object | Test.java:5537:21:5537:86 | (...)... : HttpHeaders [<element>, <map.key>] : Object | provenance |  |
-| Test.java:5537:56:5537:85 | newWithMapKeyDefault(...) : Object [<map.key>] : Object | Test.java:5537:34:5537:86 | newWithElementDefault(...) : Object [<element>, <map.key>] : Object | provenance | MaD:497 |
-| Test.java:5537:77:5537:84 | source(...) : Object | Test.java:5537:56:5537:85 | newWithMapKeyDefault(...) : Object [<map.key>] : Object | provenance | MaD:496 |
+| Test.java:5537:56:5537:85 | newWithMapKeyDefault(...) : Object [<map.key>] : Object | Test.java:5537:34:5537:86 | newWithElementDefault(...) : Object [<element>, <map.key>] : Object | provenance | MaD:3 |
+| Test.java:5537:77:5537:84 | source(...) : Object | Test.java:5537:56:5537:85 | newWithMapKeyDefault(...) : Object [<map.key>] : Object | provenance | MaD:4 |
 | Test.java:5538:10:5538:53 | toHttp2Headers(...) : Http2Headers [<element>, <map.key>] : Object | Test.java:5539:37:5539:39 | out : Http2Headers [<element>, <map.key>] : Object | provenance |  |
-| Test.java:5538:44:5538:45 | in : HttpHeaders [<element>, <map.key>] : Object | Test.java:5538:10:5538:53 | toHttp2Headers(...) : Http2Headers [<element>, <map.key>] : Object | provenance | MaD:374 |
-| Test.java:5539:26:5539:40 | getElement(...) : Entry [<map.key>] : Object | Test.java:5539:9:5539:41 | getMapKeyDefault(...) | provenance | MaD:499 |
+| Test.java:5538:44:5538:45 | in : HttpHeaders [<element>, <map.key>] : Object | Test.java:5538:10:5538:53 | toHttp2Headers(...) : Http2Headers [<element>, <map.key>] : Object | provenance | MaD:312 |
+| Test.java:5539:26:5539:40 | getElement(...) : Entry [<map.key>] : Object | Test.java:5539:9:5539:41 | getMapKeyDefault(...) | provenance | MaD:1 |
 | Test.java:5539:37:5539:39 | out : Http2Headers [<element>, <map.key>] : Object | Test.java:79:19:79:32 | it : Http2Headers [<element>, <map.key>] : Object | provenance |  |
-| Test.java:5539:37:5539:39 | out : Http2Headers [<element>, <map.key>] : Object | Test.java:5539:26:5539:40 | getElement(...) : Entry [<map.key>] : Object | provenance | MaD:492 |
+| Test.java:5539:37:5539:39 | out : Http2Headers [<element>, <map.key>] : Object | Test.java:5539:26:5539:40 | getElement(...) : Entry [<map.key>] : Object | provenance | MaD:495 |
 | Test.java:5544:21:5544:88 | (...)... : HttpHeaders [<element>, <map.value>] : Object | Test.java:5545:44:5545:45 | in : HttpHeaders [<element>, <map.value>] : Object | provenance |  |
 | Test.java:5544:34:5544:88 | newWithElementDefault(...) : Object [<element>, <map.value>] : Object | Test.java:5544:21:5544:88 | (...)... : HttpHeaders [<element>, <map.value>] : Object | provenance |  |
-| Test.java:5544:56:5544:87 | newWithMapValueDefault(...) : Object [<map.value>] : Object | Test.java:5544:34:5544:88 | newWithElementDefault(...) : Object [<element>, <map.value>] : Object | provenance | MaD:497 |
-| Test.java:5544:79:5544:86 | source(...) : Object | Test.java:5544:56:5544:87 | newWithMapValueDefault(...) : Object [<map.value>] : Object | provenance | MaD:495 |
+| Test.java:5544:56:5544:87 | newWithMapValueDefault(...) : Object [<map.value>] : Object | Test.java:5544:34:5544:88 | newWithElementDefault(...) : Object [<element>, <map.value>] : Object | provenance | MaD:3 |
+| Test.java:5544:79:5544:86 | source(...) : Object | Test.java:5544:56:5544:87 | newWithMapValueDefault(...) : Object [<map.value>] : Object | provenance | MaD:5 |
 | Test.java:5545:10:5545:53 | toHttp2Headers(...) : Http2Headers [<element>, <map.value>] : Object | Test.java:5546:39:5546:41 | out : Http2Headers [<element>, <map.value>] : Object | provenance |  |
-| Test.java:5545:44:5545:45 | in : HttpHeaders [<element>, <map.value>] : Object | Test.java:5545:10:5545:53 | toHttp2Headers(...) : Http2Headers [<element>, <map.value>] : Object | provenance | MaD:375 |
-| Test.java:5546:28:5546:42 | getElement(...) : Entry [<map.value>] : Object | Test.java:5546:9:5546:43 | getMapValueDefault(...) | provenance | MaD:498 |
+| Test.java:5545:44:5545:45 | in : HttpHeaders [<element>, <map.value>] : Object | Test.java:5545:10:5545:53 | toHttp2Headers(...) : Http2Headers [<element>, <map.value>] : Object | provenance | MaD:313 |
+| Test.java:5546:28:5546:42 | getElement(...) : Entry [<map.value>] : Object | Test.java:5546:9:5546:43 | getMapValueDefault(...) | provenance | MaD:2 |
 | Test.java:5546:39:5546:41 | out : Http2Headers [<element>, <map.value>] : Object | Test.java:79:19:79:32 | it : Http2Headers [<element>, <map.value>] : Object | provenance |  |
-| Test.java:5546:39:5546:41 | out : Http2Headers [<element>, <map.value>] : Object | Test.java:5546:28:5546:42 | getElement(...) : Entry [<map.value>] : Object | provenance | MaD:492 |
+| Test.java:5546:39:5546:41 | out : Http2Headers [<element>, <map.value>] : Object | Test.java:5546:28:5546:42 | getElement(...) : Entry [<map.value>] : Object | provenance | MaD:495 |
 | Test.java:5551:22:5551:88 | (...)... : Http2Headers [<element>, <map.key>] : Object | Test.java:5552:46:5552:47 | in : Http2Headers [<element>, <map.key>] : Object | provenance |  |
 | Test.java:5551:36:5551:88 | newWithElementDefault(...) : Object [<element>, <map.key>] : Object | Test.java:5551:22:5551:88 | (...)... : Http2Headers [<element>, <map.key>] : Object | provenance |  |
-| Test.java:5551:58:5551:87 | newWithMapKeyDefault(...) : Object [<map.key>] : Object | Test.java:5551:36:5551:88 | newWithElementDefault(...) : Object [<element>, <map.key>] : Object | provenance | MaD:497 |
-| Test.java:5551:79:5551:86 | source(...) : Object | Test.java:5551:58:5551:87 | newWithMapKeyDefault(...) : Object [<map.key>] : Object | provenance | MaD:496 |
+| Test.java:5551:58:5551:87 | newWithMapKeyDefault(...) : Object [<map.key>] : Object | Test.java:5551:36:5551:88 | newWithElementDefault(...) : Object [<element>, <map.key>] : Object | provenance | MaD:3 |
+| Test.java:5551:79:5551:86 | source(...) : Object | Test.java:5551:58:5551:87 | newWithMapKeyDefault(...) : Object [<map.key>] : Object | provenance | MaD:4 |
 | Test.java:5552:10:5552:55 | toHttpRequest(...) : HttpRequest | Test.java:5553:9:5553:11 | out | provenance |  |
-| Test.java:5552:46:5552:47 | in : Http2Headers [<element>, <map.key>] : Object | Test.java:5552:10:5552:55 | toHttpRequest(...) : HttpRequest | provenance | MaD:378 |
+| Test.java:5552:46:5552:47 | in : Http2Headers [<element>, <map.key>] : Object | Test.java:5552:10:5552:55 | toHttpRequest(...) : HttpRequest | provenance | MaD:314 |
 | Test.java:5558:22:5558:90 | (...)... : Http2Headers [<element>, <map.value>] : Object | Test.java:5559:46:5559:47 | in : Http2Headers [<element>, <map.value>] : Object | provenance |  |
 | Test.java:5558:36:5558:90 | newWithElementDefault(...) : Object [<element>, <map.value>] : Object | Test.java:5558:22:5558:90 | (...)... : Http2Headers [<element>, <map.value>] : Object | provenance |  |
-| Test.java:5558:58:5558:89 | newWithMapValueDefault(...) : Object [<map.value>] : Object | Test.java:5558:36:5558:90 | newWithElementDefault(...) : Object [<element>, <map.value>] : Object | provenance | MaD:497 |
-| Test.java:5558:81:5558:88 | source(...) : Object | Test.java:5558:58:5558:89 | newWithMapValueDefault(...) : Object [<map.value>] : Object | provenance | MaD:495 |
+| Test.java:5558:58:5558:89 | newWithMapValueDefault(...) : Object [<map.value>] : Object | Test.java:5558:36:5558:90 | newWithElementDefault(...) : Object [<element>, <map.value>] : Object | provenance | MaD:3 |
+| Test.java:5558:81:5558:88 | source(...) : Object | Test.java:5558:58:5558:89 | newWithMapValueDefault(...) : Object [<map.value>] : Object | provenance | MaD:5 |
 | Test.java:5559:10:5559:55 | toHttpRequest(...) : HttpRequest | Test.java:5560:9:5560:11 | out | provenance |  |
-| Test.java:5559:46:5559:47 | in : Http2Headers [<element>, <map.value>] : Object | Test.java:5559:10:5559:55 | toHttpRequest(...) : HttpRequest | provenance | MaD:379 |
+| Test.java:5559:46:5559:47 | in : Http2Headers [<element>, <map.value>] : Object | Test.java:5559:10:5559:55 | toHttpRequest(...) : HttpRequest | provenance | MaD:315 |
 | Test.java:5565:22:5565:88 | (...)... : Http2Headers [<element>, <map.key>] : Object | Test.java:5566:47:5566:48 | in : Http2Headers [<element>, <map.key>] : Object | provenance |  |
 | Test.java:5565:36:5565:88 | newWithElementDefault(...) : Object [<element>, <map.key>] : Object | Test.java:5565:22:5565:88 | (...)... : Http2Headers [<element>, <map.key>] : Object | provenance |  |
-| Test.java:5565:58:5565:87 | newWithMapKeyDefault(...) : Object [<map.key>] : Object | Test.java:5565:36:5565:88 | newWithElementDefault(...) : Object [<element>, <map.key>] : Object | provenance | MaD:497 |
-| Test.java:5565:79:5565:86 | source(...) : Object | Test.java:5565:58:5565:87 | newWithMapKeyDefault(...) : Object [<map.key>] : Object | provenance | MaD:496 |
+| Test.java:5565:58:5565:87 | newWithMapKeyDefault(...) : Object [<map.key>] : Object | Test.java:5565:36:5565:88 | newWithElementDefault(...) : Object [<element>, <map.key>] : Object | provenance | MaD:3 |
+| Test.java:5565:79:5565:86 | source(...) : Object | Test.java:5565:58:5565:87 | newWithMapKeyDefault(...) : Object [<map.key>] : Object | provenance | MaD:4 |
 | Test.java:5566:10:5566:56 | toHttpResponse(...) : HttpResponse | Test.java:5567:9:5567:11 | out | provenance |  |
-| Test.java:5566:47:5566:48 | in : Http2Headers [<element>, <map.key>] : Object | Test.java:5566:10:5566:56 | toHttpResponse(...) : HttpResponse | provenance | MaD:380 |
+| Test.java:5566:47:5566:48 | in : Http2Headers [<element>, <map.key>] : Object | Test.java:5566:10:5566:56 | toHttpResponse(...) : HttpResponse | provenance | MaD:316 |
 | Test.java:5572:22:5572:90 | (...)... : Http2Headers [<element>, <map.value>] : Object | Test.java:5573:47:5573:48 | in : Http2Headers [<element>, <map.value>] : Object | provenance |  |
 | Test.java:5572:36:5572:90 | newWithElementDefault(...) : Object [<element>, <map.value>] : Object | Test.java:5572:22:5572:90 | (...)... : Http2Headers [<element>, <map.value>] : Object | provenance |  |
-| Test.java:5572:58:5572:89 | newWithMapValueDefault(...) : Object [<map.value>] : Object | Test.java:5572:36:5572:90 | newWithElementDefault(...) : Object [<element>, <map.value>] : Object | provenance | MaD:497 |
-| Test.java:5572:81:5572:88 | source(...) : Object | Test.java:5572:58:5572:89 | newWithMapValueDefault(...) : Object [<map.value>] : Object | provenance | MaD:495 |
+| Test.java:5572:58:5572:89 | newWithMapValueDefault(...) : Object [<map.value>] : Object | Test.java:5572:36:5572:90 | newWithElementDefault(...) : Object [<element>, <map.value>] : Object | provenance | MaD:3 |
+| Test.java:5572:81:5572:88 | source(...) : Object | Test.java:5572:58:5572:89 | newWithMapValueDefault(...) : Object [<map.value>] : Object | provenance | MaD:5 |
 | Test.java:5573:10:5573:56 | toHttpResponse(...) : HttpResponse | Test.java:5574:9:5574:11 | out | provenance |  |
-| Test.java:5573:47:5573:48 | in : Http2Headers [<element>, <map.value>] : Object | Test.java:5573:10:5573:56 | toHttpResponse(...) : HttpResponse | provenance | MaD:381 |
+| Test.java:5573:47:5573:48 | in : Http2Headers [<element>, <map.value>] : Object | Test.java:5573:10:5573:56 | toHttpResponse(...) : HttpResponse | provenance | MaD:317 |
 | Test.java:5579:22:5579:43 | (...)... : CharSequence | Test.java:5580:12:5580:13 | in : CharSequence | provenance |  |
 | Test.java:5579:36:5579:43 | source(...) : Object | Test.java:5579:22:5579:43 | (...)... : CharSequence | provenance |  |
 | Test.java:5580:4:5580:6 | out [post update] : HttpHeaders [<element>, <map.key>] : Object | Test.java:5581:37:5581:39 | out : HttpHeaders [<element>, <map.key>] : Object | provenance |  |
-| Test.java:5580:12:5580:13 | in : CharSequence | Test.java:5580:4:5580:6 | out [post update] : HttpHeaders [<element>, <map.key>] : Object | provenance | MaD:225 |
-| Test.java:5581:26:5581:40 | getElement(...) : Entry [<map.key>] : Object | Test.java:5581:9:5581:41 | getMapKeyDefault(...) | provenance | MaD:499 |
+| Test.java:5580:12:5580:13 | in : CharSequence | Test.java:5580:4:5580:6 | out [post update] : HttpHeaders [<element>, <map.key>] : Object | provenance | MaD:318 |
+| Test.java:5581:26:5581:40 | getElement(...) : Entry [<map.key>] : Object | Test.java:5581:9:5581:41 | getMapKeyDefault(...) | provenance | MaD:1 |
 | Test.java:5581:37:5581:39 | out : HttpHeaders [<element>, <map.key>] : Object | Test.java:79:19:79:32 | it : HttpHeaders [<element>, <map.key>] : Object | provenance |  |
-| Test.java:5581:37:5581:39 | out : HttpHeaders [<element>, <map.key>] : Object | Test.java:5581:26:5581:40 | getElement(...) : Entry [<map.key>] : Object | provenance | MaD:492 |
+| Test.java:5581:37:5581:39 | out : HttpHeaders [<element>, <map.key>] : Object | Test.java:5581:26:5581:40 | getElement(...) : Entry [<map.key>] : Object | provenance | MaD:495 |
 | Test.java:5586:18:5586:44 | (...)... : List [<element>] : Object | Test.java:5587:32:5587:33 | in : List [<element>] : Object | provenance |  |
 | Test.java:5586:28:5586:44 | of(...) : List [<element>] : Object | Test.java:5586:18:5586:44 | (...)... : List [<element>] : Object | provenance |  |
-| Test.java:5586:36:5586:43 | source(...) : Object | Test.java:5586:28:5586:44 | of(...) : List [<element>] : Object | provenance | MaD:494 |
+| Test.java:5586:36:5586:43 | source(...) : Object | Test.java:5586:28:5586:44 | of(...) : List [<element>] : Object | provenance | MaD:497 |
 | Test.java:5587:4:5587:6 | out [post update] : HttpHeaders [<element>, <map.value>] : Object | Test.java:5588:39:5588:41 | out : HttpHeaders [<element>, <map.value>] : Object | provenance |  |
-| Test.java:5587:32:5587:33 | in : List [<element>] : Object | Test.java:5587:4:5587:6 | out [post update] : HttpHeaders [<element>, <map.value>] : Object | provenance | MaD:226 |
-| Test.java:5588:28:5588:42 | getElement(...) : Entry [<map.value>] : Object | Test.java:5588:9:5588:43 | getMapValueDefault(...) | provenance | MaD:498 |
+| Test.java:5587:32:5587:33 | in : List [<element>] : Object | Test.java:5587:4:5587:6 | out [post update] : HttpHeaders [<element>, <map.value>] : Object | provenance | MaD:319 |
+| Test.java:5588:28:5588:42 | getElement(...) : Entry [<map.value>] : Object | Test.java:5588:9:5588:43 | getMapValueDefault(...) | provenance | MaD:2 |
 | Test.java:5588:39:5588:41 | out : HttpHeaders [<element>, <map.value>] : Object | Test.java:79:19:79:32 | it : HttpHeaders [<element>, <map.value>] : Object | provenance |  |
-| Test.java:5588:39:5588:41 | out : HttpHeaders [<element>, <map.value>] : Object | Test.java:5588:28:5588:42 | getElement(...) : Entry [<map.value>] : Object | provenance | MaD:492 |
+| Test.java:5588:39:5588:41 | out : HttpHeaders [<element>, <map.value>] : Object | Test.java:5588:28:5588:42 | getElement(...) : Entry [<map.value>] : Object | provenance | MaD:495 |
 | Test.java:5593:22:5593:43 | (...)... : CharSequence | Test.java:5594:12:5594:13 | in : CharSequence | provenance |  |
 | Test.java:5593:36:5593:43 | source(...) : Object | Test.java:5593:22:5593:43 | (...)... : CharSequence | provenance |  |
 | Test.java:5594:4:5594:6 | out [post update] : HttpHeaders [<element>, <map.key>] : Object | Test.java:5595:37:5595:39 | out : HttpHeaders [<element>, <map.key>] : Object | provenance |  |
-| Test.java:5594:12:5594:13 | in : CharSequence | Test.java:5594:4:5594:6 | out [post update] : HttpHeaders [<element>, <map.key>] : Object | provenance | MaD:227 |
-| Test.java:5595:26:5595:40 | getElement(...) : Entry [<map.key>] : Object | Test.java:5595:9:5595:41 | getMapKeyDefault(...) | provenance | MaD:499 |
+| Test.java:5594:12:5594:13 | in : CharSequence | Test.java:5594:4:5594:6 | out [post update] : HttpHeaders [<element>, <map.key>] : Object | provenance | MaD:320 |
+| Test.java:5595:26:5595:40 | getElement(...) : Entry [<map.key>] : Object | Test.java:5595:9:5595:41 | getMapKeyDefault(...) | provenance | MaD:1 |
 | Test.java:5595:37:5595:39 | out : HttpHeaders [<element>, <map.key>] : Object | Test.java:79:19:79:32 | it : HttpHeaders [<element>, <map.key>] : Object | provenance |  |
-| Test.java:5595:37:5595:39 | out : HttpHeaders [<element>, <map.key>] : Object | Test.java:5595:26:5595:40 | getElement(...) : Entry [<map.key>] : Object | provenance | MaD:492 |
+| Test.java:5595:37:5595:39 | out : HttpHeaders [<element>, <map.key>] : Object | Test.java:5595:26:5595:40 | getElement(...) : Entry [<map.key>] : Object | provenance | MaD:495 |
 | Test.java:5600:16:5600:31 | (...)... : Object | Test.java:5601:32:5601:33 | in : Object | provenance |  |
 | Test.java:5600:24:5600:31 | source(...) : Object | Test.java:5600:16:5600:31 | (...)... : Object | provenance |  |
 | Test.java:5601:4:5601:6 | out [post update] : HttpHeaders [<element>, <map.value>] : Object | Test.java:5602:39:5602:41 | out : HttpHeaders [<element>, <map.value>] : Object | provenance |  |
-| Test.java:5601:32:5601:33 | in : Object | Test.java:5601:4:5601:6 | out [post update] : HttpHeaders [<element>, <map.value>] : Object | provenance | MaD:228 |
-| Test.java:5602:28:5602:42 | getElement(...) : Entry [<map.value>] : Object | Test.java:5602:9:5602:43 | getMapValueDefault(...) | provenance | MaD:498 |
+| Test.java:5601:32:5601:33 | in : Object | Test.java:5601:4:5601:6 | out [post update] : HttpHeaders [<element>, <map.value>] : Object | provenance | MaD:321 |
+| Test.java:5602:28:5602:42 | getElement(...) : Entry [<map.value>] : Object | Test.java:5602:9:5602:43 | getMapValueDefault(...) | provenance | MaD:2 |
 | Test.java:5602:39:5602:41 | out : HttpHeaders [<element>, <map.value>] : Object | Test.java:79:19:79:32 | it : HttpHeaders [<element>, <map.value>] : Object | provenance |  |
-| Test.java:5602:39:5602:41 | out : HttpHeaders [<element>, <map.value>] : Object | Test.java:5602:28:5602:42 | getElement(...) : Entry [<map.value>] : Object | provenance | MaD:492 |
+| Test.java:5602:39:5602:41 | out : HttpHeaders [<element>, <map.value>] : Object | Test.java:5602:28:5602:42 | getElement(...) : Entry [<map.value>] : Object | provenance | MaD:495 |
 | Test.java:5607:21:5607:86 | (...)... : HttpHeaders [<element>, <map.key>] : Object | Test.java:5608:12:5608:13 | in : HttpHeaders [<element>, <map.key>] : Object | provenance |  |
 | Test.java:5607:34:5607:86 | newWithElementDefault(...) : Object [<element>, <map.key>] : Object | Test.java:5607:21:5607:86 | (...)... : HttpHeaders [<element>, <map.key>] : Object | provenance |  |
-| Test.java:5607:56:5607:85 | newWithMapKeyDefault(...) : Object [<map.key>] : Object | Test.java:5607:34:5607:86 | newWithElementDefault(...) : Object [<element>, <map.key>] : Object | provenance | MaD:497 |
-| Test.java:5607:77:5607:84 | source(...) : Object | Test.java:5607:56:5607:85 | newWithMapKeyDefault(...) : Object [<map.key>] : Object | provenance | MaD:496 |
+| Test.java:5607:56:5607:85 | newWithMapKeyDefault(...) : Object [<map.key>] : Object | Test.java:5607:34:5607:86 | newWithElementDefault(...) : Object [<element>, <map.key>] : Object | provenance | MaD:3 |
+| Test.java:5607:77:5607:84 | source(...) : Object | Test.java:5607:56:5607:85 | newWithMapKeyDefault(...) : Object [<map.key>] : Object | provenance | MaD:4 |
 | Test.java:5608:4:5608:6 | out [post update] : HttpHeaders [<element>, <map.key>] : Object | Test.java:5609:37:5609:39 | out : HttpHeaders [<element>, <map.key>] : Object | provenance |  |
-| Test.java:5608:12:5608:13 | in : HttpHeaders [<element>, <map.key>] : Object | Test.java:5608:4:5608:6 | out [post update] : HttpHeaders [<element>, <map.key>] : Object | provenance | MaD:233 |
-| Test.java:5609:26:5609:40 | getElement(...) : Entry [<map.key>] : Object | Test.java:5609:9:5609:41 | getMapKeyDefault(...) | provenance | MaD:499 |
+| Test.java:5608:12:5608:13 | in : HttpHeaders [<element>, <map.key>] : Object | Test.java:5608:4:5608:6 | out [post update] : HttpHeaders [<element>, <map.key>] : Object | provenance | MaD:322 |
+| Test.java:5609:26:5609:40 | getElement(...) : Entry [<map.key>] : Object | Test.java:5609:9:5609:41 | getMapKeyDefault(...) | provenance | MaD:1 |
 | Test.java:5609:37:5609:39 | out : HttpHeaders [<element>, <map.key>] : Object | Test.java:79:19:79:32 | it : HttpHeaders [<element>, <map.key>] : Object | provenance |  |
-| Test.java:5609:37:5609:39 | out : HttpHeaders [<element>, <map.key>] : Object | Test.java:5609:26:5609:40 | getElement(...) : Entry [<map.key>] : Object | provenance | MaD:492 |
+| Test.java:5609:37:5609:39 | out : HttpHeaders [<element>, <map.key>] : Object | Test.java:5609:26:5609:40 | getElement(...) : Entry [<map.key>] : Object | provenance | MaD:495 |
 | Test.java:5614:21:5614:88 | (...)... : HttpHeaders [<element>, <map.value>] : Object | Test.java:5615:12:5615:13 | in : HttpHeaders [<element>, <map.value>] : Object | provenance |  |
 | Test.java:5614:34:5614:88 | newWithElementDefault(...) : Object [<element>, <map.value>] : Object | Test.java:5614:21:5614:88 | (...)... : HttpHeaders [<element>, <map.value>] : Object | provenance |  |
-| Test.java:5614:56:5614:87 | newWithMapValueDefault(...) : Object [<map.value>] : Object | Test.java:5614:34:5614:88 | newWithElementDefault(...) : Object [<element>, <map.value>] : Object | provenance | MaD:497 |
-| Test.java:5614:79:5614:86 | source(...) : Object | Test.java:5614:56:5614:87 | newWithMapValueDefault(...) : Object [<map.value>] : Object | provenance | MaD:495 |
+| Test.java:5614:56:5614:87 | newWithMapValueDefault(...) : Object [<map.value>] : Object | Test.java:5614:34:5614:88 | newWithElementDefault(...) : Object [<element>, <map.value>] : Object | provenance | MaD:3 |
+| Test.java:5614:79:5614:86 | source(...) : Object | Test.java:5614:56:5614:87 | newWithMapValueDefault(...) : Object [<map.value>] : Object | provenance | MaD:5 |
 | Test.java:5615:4:5615:6 | out [post update] : HttpHeaders [<element>, <map.value>] : Object | Test.java:5616:39:5616:41 | out : HttpHeaders [<element>, <map.value>] : Object | provenance |  |
-| Test.java:5615:12:5615:13 | in : HttpHeaders [<element>, <map.value>] : Object | Test.java:5615:4:5615:6 | out [post update] : HttpHeaders [<element>, <map.value>] : Object | provenance | MaD:234 |
-| Test.java:5616:28:5616:42 | getElement(...) : Entry [<map.value>] : Object | Test.java:5616:9:5616:43 | getMapValueDefault(...) | provenance | MaD:498 |
+| Test.java:5615:12:5615:13 | in : HttpHeaders [<element>, <map.value>] : Object | Test.java:5615:4:5615:6 | out [post update] : HttpHeaders [<element>, <map.value>] : Object | provenance | MaD:323 |
+| Test.java:5616:28:5616:42 | getElement(...) : Entry [<map.value>] : Object | Test.java:5616:9:5616:43 | getMapValueDefault(...) | provenance | MaD:2 |
 | Test.java:5616:39:5616:41 | out : HttpHeaders [<element>, <map.value>] : Object | Test.java:79:19:79:32 | it : HttpHeaders [<element>, <map.value>] : Object | provenance |  |
-| Test.java:5616:39:5616:41 | out : HttpHeaders [<element>, <map.value>] : Object | Test.java:5616:28:5616:42 | getElement(...) : Entry [<map.value>] : Object | provenance | MaD:492 |
+| Test.java:5616:39:5616:41 | out : HttpHeaders [<element>, <map.value>] : Object | Test.java:5616:28:5616:42 | getElement(...) : Entry [<map.value>] : Object | provenance | MaD:495 |
 | Test.java:5621:16:5621:31 | (...)... : String | Test.java:5622:12:5622:13 | in : String | provenance |  |
 | Test.java:5621:24:5621:31 | source(...) : Object | Test.java:5621:16:5621:31 | (...)... : String | provenance |  |
 | Test.java:5622:4:5622:6 | out [post update] : HttpHeaders [<element>, <map.key>] : String | Test.java:5623:37:5623:39 | out : HttpHeaders [<element>, <map.key>] : String | provenance |  |
-| Test.java:5622:12:5622:13 | in : String | Test.java:5622:4:5622:6 | out [post update] : HttpHeaders [<element>, <map.key>] : String | provenance | MaD:229 |
-| Test.java:5623:26:5623:40 | getElement(...) : Entry [<map.key>] : String | Test.java:5623:9:5623:41 | getMapKeyDefault(...) | provenance | MaD:499 |
+| Test.java:5622:12:5622:13 | in : String | Test.java:5622:4:5622:6 | out [post update] : HttpHeaders [<element>, <map.key>] : String | provenance | MaD:324 |
+| Test.java:5623:26:5623:40 | getElement(...) : Entry [<map.key>] : String | Test.java:5623:9:5623:41 | getMapKeyDefault(...) | provenance | MaD:1 |
 | Test.java:5623:37:5623:39 | out : HttpHeaders [<element>, <map.key>] : String | Test.java:79:19:79:32 | it : HttpHeaders [<element>, <map.key>] : String | provenance |  |
-| Test.java:5623:37:5623:39 | out : HttpHeaders [<element>, <map.key>] : String | Test.java:5623:26:5623:40 | getElement(...) : Entry [<map.key>] : String | provenance | MaD:492 |
+| Test.java:5623:37:5623:39 | out : HttpHeaders [<element>, <map.key>] : String | Test.java:5623:26:5623:40 | getElement(...) : Entry [<map.key>] : String | provenance | MaD:495 |
 | Test.java:5628:18:5628:44 | (...)... : List [<element>] : Object | Test.java:5629:26:5629:27 | in : List [<element>] : Object | provenance |  |
 | Test.java:5628:28:5628:44 | of(...) : List [<element>] : Object | Test.java:5628:18:5628:44 | (...)... : List [<element>] : Object | provenance |  |
-| Test.java:5628:36:5628:43 | source(...) : Object | Test.java:5628:28:5628:44 | of(...) : List [<element>] : Object | provenance | MaD:494 |
+| Test.java:5628:36:5628:43 | source(...) : Object | Test.java:5628:28:5628:44 | of(...) : List [<element>] : Object | provenance | MaD:497 |
 | Test.java:5629:4:5629:6 | out [post update] : HttpHeaders [<element>, <map.value>] : Object | Test.java:5630:39:5630:41 | out : HttpHeaders [<element>, <map.value>] : Object | provenance |  |
-| Test.java:5629:26:5629:27 | in : List [<element>] : Object | Test.java:5629:4:5629:6 | out [post update] : HttpHeaders [<element>, <map.value>] : Object | provenance | MaD:230 |
-| Test.java:5630:28:5630:42 | getElement(...) : Entry [<map.value>] : Object | Test.java:5630:9:5630:43 | getMapValueDefault(...) | provenance | MaD:498 |
+| Test.java:5629:26:5629:27 | in : List [<element>] : Object | Test.java:5629:4:5629:6 | out [post update] : HttpHeaders [<element>, <map.value>] : Object | provenance | MaD:325 |
+| Test.java:5630:28:5630:42 | getElement(...) : Entry [<map.value>] : Object | Test.java:5630:9:5630:43 | getMapValueDefault(...) | provenance | MaD:2 |
 | Test.java:5630:39:5630:41 | out : HttpHeaders [<element>, <map.value>] : Object | Test.java:79:19:79:32 | it : HttpHeaders [<element>, <map.value>] : Object | provenance |  |
-| Test.java:5630:39:5630:41 | out : HttpHeaders [<element>, <map.value>] : Object | Test.java:5630:28:5630:42 | getElement(...) : Entry [<map.value>] : Object | provenance | MaD:492 |
+| Test.java:5630:39:5630:41 | out : HttpHeaders [<element>, <map.value>] : Object | Test.java:5630:28:5630:42 | getElement(...) : Entry [<map.value>] : Object | provenance | MaD:495 |
 | Test.java:5635:16:5635:31 | (...)... : String | Test.java:5636:12:5636:13 | in : String | provenance |  |
 | Test.java:5635:24:5635:31 | source(...) : Object | Test.java:5635:16:5635:31 | (...)... : String | provenance |  |
 | Test.java:5636:4:5636:6 | out [post update] : HttpHeaders [<element>, <map.key>] : String | Test.java:5637:37:5637:39 | out : HttpHeaders [<element>, <map.key>] : String | provenance |  |
-| Test.java:5636:12:5636:13 | in : String | Test.java:5636:4:5636:6 | out [post update] : HttpHeaders [<element>, <map.key>] : String | provenance | MaD:231 |
-| Test.java:5637:26:5637:40 | getElement(...) : Entry [<map.key>] : String | Test.java:5637:9:5637:41 | getMapKeyDefault(...) | provenance | MaD:499 |
+| Test.java:5636:12:5636:13 | in : String | Test.java:5636:4:5636:6 | out [post update] : HttpHeaders [<element>, <map.key>] : String | provenance | MaD:326 |
+| Test.java:5637:26:5637:40 | getElement(...) : Entry [<map.key>] : String | Test.java:5637:9:5637:41 | getMapKeyDefault(...) | provenance | MaD:1 |
 | Test.java:5637:37:5637:39 | out : HttpHeaders [<element>, <map.key>] : String | Test.java:79:19:79:32 | it : HttpHeaders [<element>, <map.key>] : String | provenance |  |
-| Test.java:5637:37:5637:39 | out : HttpHeaders [<element>, <map.key>] : String | Test.java:5637:26:5637:40 | getElement(...) : Entry [<map.key>] : String | provenance | MaD:492 |
+| Test.java:5637:37:5637:39 | out : HttpHeaders [<element>, <map.key>] : String | Test.java:5637:26:5637:40 | getElement(...) : Entry [<map.key>] : String | provenance | MaD:495 |
 | Test.java:5642:16:5642:31 | (...)... : Object | Test.java:5643:26:5643:27 | in : Object | provenance |  |
 | Test.java:5642:24:5642:31 | source(...) : Object | Test.java:5642:16:5642:31 | (...)... : Object | provenance |  |
 | Test.java:5643:4:5643:6 | out [post update] : HttpHeaders [<element>, <map.value>] : Object | Test.java:5644:39:5644:41 | out : HttpHeaders [<element>, <map.value>] : Object | provenance |  |
-| Test.java:5643:26:5643:27 | in : Object | Test.java:5643:4:5643:6 | out [post update] : HttpHeaders [<element>, <map.value>] : Object | provenance | MaD:232 |
-| Test.java:5644:28:5644:42 | getElement(...) : Entry [<map.value>] : Object | Test.java:5644:9:5644:43 | getMapValueDefault(...) | provenance | MaD:498 |
+| Test.java:5643:26:5643:27 | in : Object | Test.java:5643:4:5643:6 | out [post update] : HttpHeaders [<element>, <map.value>] : Object | provenance | MaD:327 |
+| Test.java:5644:28:5644:42 | getElement(...) : Entry [<map.value>] : Object | Test.java:5644:9:5644:43 | getMapValueDefault(...) | provenance | MaD:2 |
 | Test.java:5644:39:5644:41 | out : HttpHeaders [<element>, <map.value>] : Object | Test.java:79:19:79:32 | it : HttpHeaders [<element>, <map.value>] : Object | provenance |  |
-| Test.java:5644:39:5644:41 | out : HttpHeaders [<element>, <map.value>] : Object | Test.java:5644:28:5644:42 | getElement(...) : Entry [<map.value>] : Object | provenance | MaD:492 |
+| Test.java:5644:39:5644:41 | out : HttpHeaders [<element>, <map.value>] : Object | Test.java:5644:28:5644:42 | getElement(...) : Entry [<map.value>] : Object | provenance | MaD:495 |
 | Test.java:5649:21:5649:41 | (...)... : HttpHeaders | Test.java:5650:10:5650:11 | in : HttpHeaders | provenance |  |
 | Test.java:5649:34:5649:41 | source(...) : Object | Test.java:5649:21:5649:41 | (...)... : HttpHeaders | provenance |  |
-| Test.java:5650:10:5650:11 | in : HttpHeaders | Test.java:5650:10:5650:51 | add(...) : HttpHeaders | provenance | MaD:224 |
+| Test.java:5650:10:5650:11 | in : HttpHeaders | Test.java:5650:10:5650:51 | add(...) : HttpHeaders | provenance | MaD:328 |
 | Test.java:5650:10:5650:51 | add(...) : HttpHeaders | Test.java:5651:9:5651:11 | out | provenance |  |
 | Test.java:5656:21:5656:41 | (...)... : HttpHeaders | Test.java:5657:10:5657:11 | in : HttpHeaders | provenance |  |
 | Test.java:5656:34:5656:41 | source(...) : Object | Test.java:5656:21:5656:41 | (...)... : HttpHeaders | provenance |  |
-| Test.java:5657:10:5657:11 | in : HttpHeaders | Test.java:5657:10:5657:49 | add(...) : HttpHeaders | provenance | MaD:224 |
+| Test.java:5657:10:5657:11 | in : HttpHeaders | Test.java:5657:10:5657:49 | add(...) : HttpHeaders | provenance | MaD:328 |
 | Test.java:5657:10:5657:49 | add(...) : HttpHeaders | Test.java:5658:9:5658:11 | out | provenance |  |
 | Test.java:5663:21:5663:41 | (...)... : HttpHeaders | Test.java:5664:10:5664:11 | in : HttpHeaders | provenance |  |
 | Test.java:5663:34:5663:41 | source(...) : Object | Test.java:5663:21:5663:41 | (...)... : HttpHeaders | provenance |  |
-| Test.java:5664:10:5664:11 | in : HttpHeaders | Test.java:5664:10:5664:45 | add(...) : HttpHeaders | provenance | MaD:224 |
+| Test.java:5664:10:5664:11 | in : HttpHeaders | Test.java:5664:10:5664:45 | add(...) : HttpHeaders | provenance | MaD:328 |
 | Test.java:5664:10:5664:45 | add(...) : HttpHeaders | Test.java:5665:9:5665:11 | out | provenance |  |
 | Test.java:5670:21:5670:41 | (...)... : HttpHeaders | Test.java:5671:10:5671:11 | in : HttpHeaders | provenance |  |
 | Test.java:5670:34:5670:41 | source(...) : Object | Test.java:5670:21:5670:41 | (...)... : HttpHeaders | provenance |  |
-| Test.java:5671:10:5671:11 | in : HttpHeaders | Test.java:5671:10:5671:43 | add(...) : HttpHeaders | provenance | MaD:224 |
+| Test.java:5671:10:5671:11 | in : HttpHeaders | Test.java:5671:10:5671:43 | add(...) : HttpHeaders | provenance | MaD:328 |
 | Test.java:5671:10:5671:43 | add(...) : HttpHeaders | Test.java:5672:9:5672:11 | out | provenance |  |
 | Test.java:5677:21:5677:41 | (...)... : HttpHeaders | Test.java:5678:10:5678:11 | in : HttpHeaders | provenance |  |
 | Test.java:5677:34:5677:41 | source(...) : Object | Test.java:5677:21:5677:41 | (...)... : HttpHeaders | provenance |  |
-| Test.java:5678:10:5678:11 | in : HttpHeaders | Test.java:5678:10:5678:21 | add(...) : HttpHeaders | provenance | MaD:224 |
+| Test.java:5678:10:5678:11 | in : HttpHeaders | Test.java:5678:10:5678:21 | add(...) : HttpHeaders | provenance | MaD:328 |
 | Test.java:5678:10:5678:21 | add(...) : HttpHeaders | Test.java:5679:9:5679:11 | out | provenance |  |
 | Test.java:5684:21:5684:41 | (...)... : HttpHeaders | Test.java:5685:10:5685:11 | in : HttpHeaders | provenance |  |
 | Test.java:5684:34:5684:41 | source(...) : Object | Test.java:5684:21:5684:41 | (...)... : HttpHeaders | provenance |  |
-| Test.java:5685:10:5685:11 | in : HttpHeaders | Test.java:5685:10:5685:27 | addInt(...) : HttpHeaders | provenance | MaD:235 |
+| Test.java:5685:10:5685:11 | in : HttpHeaders | Test.java:5685:10:5685:27 | addInt(...) : HttpHeaders | provenance | MaD:330 |
 | Test.java:5685:10:5685:27 | addInt(...) : HttpHeaders | Test.java:5686:9:5686:11 | out | provenance |  |
 | Test.java:5691:22:5691:43 | (...)... : CharSequence | Test.java:5692:15:5692:16 | in : CharSequence | provenance |  |
 | Test.java:5691:36:5691:43 | source(...) : Object | Test.java:5691:22:5691:43 | (...)... : CharSequence | provenance |  |
 | Test.java:5692:4:5692:6 | out [post update] : HttpHeaders [<element>, <map.key>] : CharSequence | Test.java:5693:37:5693:39 | out : HttpHeaders [<element>, <map.key>] : CharSequence | provenance |  |
-| Test.java:5692:15:5692:16 | in : CharSequence | Test.java:5692:4:5692:6 | out [post update] : HttpHeaders [<element>, <map.key>] : CharSequence | provenance | MaD:236 |
-| Test.java:5693:26:5693:40 | getElement(...) : Entry [<map.key>] : CharSequence | Test.java:5693:9:5693:41 | getMapKeyDefault(...) | provenance | MaD:499 |
+| Test.java:5692:15:5692:16 | in : CharSequence | Test.java:5692:4:5692:6 | out [post update] : HttpHeaders [<element>, <map.key>] : CharSequence | provenance | MaD:329 |
+| Test.java:5693:26:5693:40 | getElement(...) : Entry [<map.key>] : CharSequence | Test.java:5693:9:5693:41 | getMapKeyDefault(...) | provenance | MaD:1 |
 | Test.java:5693:37:5693:39 | out : HttpHeaders [<element>, <map.key>] : CharSequence | Test.java:79:19:79:32 | it : HttpHeaders [<element>, <map.key>] : CharSequence | provenance |  |
-| Test.java:5693:37:5693:39 | out : HttpHeaders [<element>, <map.key>] : CharSequence | Test.java:5693:26:5693:40 | getElement(...) : Entry [<map.key>] : CharSequence | provenance | MaD:492 |
+| Test.java:5693:37:5693:39 | out : HttpHeaders [<element>, <map.key>] : CharSequence | Test.java:5693:26:5693:40 | getElement(...) : Entry [<map.key>] : CharSequence | provenance | MaD:495 |
 | Test.java:5698:21:5698:41 | (...)... : HttpHeaders | Test.java:5699:10:5699:11 | in : HttpHeaders | provenance |  |
 | Test.java:5698:34:5698:41 | source(...) : Object | Test.java:5698:21:5698:41 | (...)... : HttpHeaders | provenance |  |
-| Test.java:5699:10:5699:11 | in : HttpHeaders | Test.java:5699:10:5699:36 | addShort(...) : HttpHeaders | provenance | MaD:237 |
+| Test.java:5699:10:5699:11 | in : HttpHeaders | Test.java:5699:10:5699:36 | addShort(...) : HttpHeaders | provenance | MaD:332 |
 | Test.java:5699:10:5699:36 | addShort(...) : HttpHeaders | Test.java:5700:9:5700:11 | out | provenance |  |
 | Test.java:5705:22:5705:43 | (...)... : CharSequence | Test.java:5706:17:5706:18 | in : CharSequence | provenance |  |
 | Test.java:5705:36:5705:43 | source(...) : Object | Test.java:5705:22:5705:43 | (...)... : CharSequence | provenance |  |
 | Test.java:5706:4:5706:6 | out [post update] : HttpHeaders [<element>, <map.key>] : CharSequence | Test.java:5707:37:5707:39 | out : HttpHeaders [<element>, <map.key>] : CharSequence | provenance |  |
-| Test.java:5706:17:5706:18 | in : CharSequence | Test.java:5706:4:5706:6 | out [post update] : HttpHeaders [<element>, <map.key>] : CharSequence | provenance | MaD:238 |
-| Test.java:5707:26:5707:40 | getElement(...) : Entry [<map.key>] : CharSequence | Test.java:5707:9:5707:41 | getMapKeyDefault(...) | provenance | MaD:499 |
+| Test.java:5706:17:5706:18 | in : CharSequence | Test.java:5706:4:5706:6 | out [post update] : HttpHeaders [<element>, <map.key>] : CharSequence | provenance | MaD:331 |
+| Test.java:5707:26:5707:40 | getElement(...) : Entry [<map.key>] : CharSequence | Test.java:5707:9:5707:41 | getMapKeyDefault(...) | provenance | MaD:1 |
 | Test.java:5707:37:5707:39 | out : HttpHeaders [<element>, <map.key>] : CharSequence | Test.java:79:19:79:32 | it : HttpHeaders [<element>, <map.key>] : CharSequence | provenance |  |
-| Test.java:5707:37:5707:39 | out : HttpHeaders [<element>, <map.key>] : CharSequence | Test.java:5707:26:5707:40 | getElement(...) : Entry [<map.key>] : CharSequence | provenance | MaD:492 |
+| Test.java:5707:37:5707:39 | out : HttpHeaders [<element>, <map.key>] : CharSequence | Test.java:5707:26:5707:40 | getElement(...) : Entry [<map.key>] : CharSequence | provenance | MaD:495 |
 | Test.java:5712:21:5712:86 | (...)... : HttpHeaders [<element>, <map.key>] : Object | Test.java:5713:10:5713:11 | in : HttpHeaders [<element>, <map.key>] : Object | provenance |  |
 | Test.java:5712:34:5712:86 | newWithElementDefault(...) : Object [<element>, <map.key>] : Object | Test.java:5712:21:5712:86 | (...)... : HttpHeaders [<element>, <map.key>] : Object | provenance |  |
-| Test.java:5712:56:5712:85 | newWithMapKeyDefault(...) : Object [<map.key>] : Object | Test.java:5712:34:5712:86 | newWithElementDefault(...) : Object [<element>, <map.key>] : Object | provenance | MaD:497 |
-| Test.java:5712:77:5712:84 | source(...) : Object | Test.java:5712:56:5712:85 | newWithMapKeyDefault(...) : Object [<map.key>] : Object | provenance | MaD:496 |
-| Test.java:5713:10:5713:11 | in : HttpHeaders [<element>, <map.key>] : Object | Test.java:5713:10:5713:18 | copy(...) : HttpHeaders [<element>, <map.key>] : Object | provenance | MaD:239 |
+| Test.java:5712:56:5712:85 | newWithMapKeyDefault(...) : Object [<map.key>] : Object | Test.java:5712:34:5712:86 | newWithElementDefault(...) : Object [<element>, <map.key>] : Object | provenance | MaD:3 |
+| Test.java:5712:77:5712:84 | source(...) : Object | Test.java:5712:56:5712:85 | newWithMapKeyDefault(...) : Object [<map.key>] : Object | provenance | MaD:4 |
+| Test.java:5713:10:5713:11 | in : HttpHeaders [<element>, <map.key>] : Object | Test.java:5713:10:5713:18 | copy(...) : HttpHeaders [<element>, <map.key>] : Object | provenance | MaD:333 |
 | Test.java:5713:10:5713:18 | copy(...) : HttpHeaders [<element>, <map.key>] : Object | Test.java:5714:37:5714:39 | out : HttpHeaders [<element>, <map.key>] : Object | provenance |  |
-| Test.java:5714:26:5714:40 | getElement(...) : Entry [<map.key>] : Object | Test.java:5714:9:5714:41 | getMapKeyDefault(...) | provenance | MaD:499 |
+| Test.java:5714:26:5714:40 | getElement(...) : Entry [<map.key>] : Object | Test.java:5714:9:5714:41 | getMapKeyDefault(...) | provenance | MaD:1 |
 | Test.java:5714:37:5714:39 | out : HttpHeaders [<element>, <map.key>] : Object | Test.java:79:19:79:32 | it : HttpHeaders [<element>, <map.key>] : Object | provenance |  |
-| Test.java:5714:37:5714:39 | out : HttpHeaders [<element>, <map.key>] : Object | Test.java:5714:26:5714:40 | getElement(...) : Entry [<map.key>] : Object | provenance | MaD:492 |
+| Test.java:5714:37:5714:39 | out : HttpHeaders [<element>, <map.key>] : Object | Test.java:5714:26:5714:40 | getElement(...) : Entry [<map.key>] : Object | provenance | MaD:495 |
 | Test.java:5719:21:5719:88 | (...)... : HttpHeaders [<element>, <map.value>] : Object | Test.java:5720:10:5720:11 | in : HttpHeaders [<element>, <map.value>] : Object | provenance |  |
 | Test.java:5719:34:5719:88 | newWithElementDefault(...) : Object [<element>, <map.value>] : Object | Test.java:5719:21:5719:88 | (...)... : HttpHeaders [<element>, <map.value>] : Object | provenance |  |
-| Test.java:5719:56:5719:87 | newWithMapValueDefault(...) : Object [<map.value>] : Object | Test.java:5719:34:5719:88 | newWithElementDefault(...) : Object [<element>, <map.value>] : Object | provenance | MaD:497 |
-| Test.java:5719:79:5719:86 | source(...) : Object | Test.java:5719:56:5719:87 | newWithMapValueDefault(...) : Object [<map.value>] : Object | provenance | MaD:495 |
-| Test.java:5720:10:5720:11 | in : HttpHeaders [<element>, <map.value>] : Object | Test.java:5720:10:5720:18 | copy(...) : HttpHeaders [<element>, <map.value>] : Object | provenance | MaD:240 |
+| Test.java:5719:56:5719:87 | newWithMapValueDefault(...) : Object [<map.value>] : Object | Test.java:5719:34:5719:88 | newWithElementDefault(...) : Object [<element>, <map.value>] : Object | provenance | MaD:3 |
+| Test.java:5719:79:5719:86 | source(...) : Object | Test.java:5719:56:5719:87 | newWithMapValueDefault(...) : Object [<map.value>] : Object | provenance | MaD:5 |
+| Test.java:5720:10:5720:11 | in : HttpHeaders [<element>, <map.value>] : Object | Test.java:5720:10:5720:18 | copy(...) : HttpHeaders [<element>, <map.value>] : Object | provenance | MaD:334 |
 | Test.java:5720:10:5720:18 | copy(...) : HttpHeaders [<element>, <map.value>] : Object | Test.java:5721:39:5721:41 | out : HttpHeaders [<element>, <map.value>] : Object | provenance |  |
-| Test.java:5721:28:5721:42 | getElement(...) : Entry [<map.value>] : Object | Test.java:5721:9:5721:43 | getMapValueDefault(...) | provenance | MaD:498 |
+| Test.java:5721:28:5721:42 | getElement(...) : Entry [<map.value>] : Object | Test.java:5721:9:5721:43 | getMapValueDefault(...) | provenance | MaD:2 |
 | Test.java:5721:39:5721:41 | out : HttpHeaders [<element>, <map.value>] : Object | Test.java:79:19:79:32 | it : HttpHeaders [<element>, <map.value>] : Object | provenance |  |
-| Test.java:5721:39:5721:41 | out : HttpHeaders [<element>, <map.value>] : Object | Test.java:5721:28:5721:42 | getElement(...) : Entry [<map.value>] : Object | provenance | MaD:492 |
+| Test.java:5721:39:5721:41 | out : HttpHeaders [<element>, <map.value>] : Object | Test.java:5721:28:5721:42 | getElement(...) : Entry [<map.value>] : Object | provenance | MaD:495 |
 | Test.java:5726:21:5726:86 | (...)... : HttpHeaders [<element>, <map.key>] : Object | Test.java:5727:10:5727:11 | in : HttpHeaders [<element>, <map.key>] : Object | provenance |  |
 | Test.java:5726:34:5726:86 | newWithElementDefault(...) : Object [<element>, <map.key>] : Object | Test.java:5726:21:5726:86 | (...)... : HttpHeaders [<element>, <map.key>] : Object | provenance |  |
-| Test.java:5726:56:5726:85 | newWithMapKeyDefault(...) : Object [<map.key>] : Object | Test.java:5726:34:5726:86 | newWithElementDefault(...) : Object [<element>, <map.key>] : Object | provenance | MaD:497 |
-| Test.java:5726:77:5726:84 | source(...) : Object | Test.java:5726:56:5726:85 | newWithMapKeyDefault(...) : Object [<map.key>] : Object | provenance | MaD:496 |
-| Test.java:5727:10:5727:11 | in : HttpHeaders [<element>, <map.key>] : Object | Test.java:5727:10:5727:21 | entries(...) : List [<element>, <map.key>] : Object | provenance | MaD:241 |
+| Test.java:5726:56:5726:85 | newWithMapKeyDefault(...) : Object [<map.key>] : Object | Test.java:5726:34:5726:86 | newWithElementDefault(...) : Object [<element>, <map.key>] : Object | provenance | MaD:3 |
+| Test.java:5726:77:5726:84 | source(...) : Object | Test.java:5726:56:5726:85 | newWithMapKeyDefault(...) : Object [<map.key>] : Object | provenance | MaD:4 |
+| Test.java:5727:10:5727:11 | in : HttpHeaders [<element>, <map.key>] : Object | Test.java:5727:10:5727:21 | entries(...) : List [<element>, <map.key>] : Object | provenance | MaD:335 |
 | Test.java:5727:10:5727:21 | entries(...) : List [<element>, <map.key>] : Object | Test.java:5728:37:5728:39 | out : List [<element>, <map.key>] : Object | provenance |  |
-| Test.java:5728:26:5728:40 | getElement(...) : Object [<map.key>] : Object | Test.java:5728:9:5728:41 | getMapKeyDefault(...) | provenance | MaD:499 |
+| Test.java:5728:26:5728:40 | getElement(...) : Object [<map.key>] : Object | Test.java:5728:9:5728:41 | getMapKeyDefault(...) | provenance | MaD:1 |
 | Test.java:5728:37:5728:39 | out : List [<element>, <map.key>] : Object | Test.java:79:19:79:32 | it : List [<element>, <map.key>] : Object | provenance |  |
-| Test.java:5728:37:5728:39 | out : List [<element>, <map.key>] : Object | Test.java:5728:26:5728:40 | getElement(...) : Object [<map.key>] : Object | provenance | MaD:492 |
+| Test.java:5728:37:5728:39 | out : List [<element>, <map.key>] : Object | Test.java:5728:26:5728:40 | getElement(...) : Object [<map.key>] : Object | provenance | MaD:495 |
 | Test.java:5733:21:5733:88 | (...)... : HttpHeaders [<element>, <map.value>] : Object | Test.java:5734:10:5734:11 | in : HttpHeaders [<element>, <map.value>] : Object | provenance |  |
 | Test.java:5733:34:5733:88 | newWithElementDefault(...) : Object [<element>, <map.value>] : Object | Test.java:5733:21:5733:88 | (...)... : HttpHeaders [<element>, <map.value>] : Object | provenance |  |
-| Test.java:5733:56:5733:87 | newWithMapValueDefault(...) : Object [<map.value>] : Object | Test.java:5733:34:5733:88 | newWithElementDefault(...) : Object [<element>, <map.value>] : Object | provenance | MaD:497 |
-| Test.java:5733:79:5733:86 | source(...) : Object | Test.java:5733:56:5733:87 | newWithMapValueDefault(...) : Object [<map.value>] : Object | provenance | MaD:495 |
-| Test.java:5734:10:5734:11 | in : HttpHeaders [<element>, <map.value>] : Object | Test.java:5734:10:5734:21 | entries(...) : List [<element>, <map.value>] : Object | provenance | MaD:242 |
+| Test.java:5733:56:5733:87 | newWithMapValueDefault(...) : Object [<map.value>] : Object | Test.java:5733:34:5733:88 | newWithElementDefault(...) : Object [<element>, <map.value>] : Object | provenance | MaD:3 |
+| Test.java:5733:79:5733:86 | source(...) : Object | Test.java:5733:56:5733:87 | newWithMapValueDefault(...) : Object [<map.value>] : Object | provenance | MaD:5 |
+| Test.java:5734:10:5734:11 | in : HttpHeaders [<element>, <map.value>] : Object | Test.java:5734:10:5734:21 | entries(...) : List [<element>, <map.value>] : Object | provenance | MaD:336 |
 | Test.java:5734:10:5734:21 | entries(...) : List [<element>, <map.value>] : Object | Test.java:5735:39:5735:41 | out : List [<element>, <map.value>] : Object | provenance |  |
-| Test.java:5735:28:5735:42 | getElement(...) : Object [<map.value>] : Object | Test.java:5735:9:5735:43 | getMapValueDefault(...) | provenance | MaD:498 |
+| Test.java:5735:28:5735:42 | getElement(...) : Object [<map.value>] : Object | Test.java:5735:9:5735:43 | getMapValueDefault(...) | provenance | MaD:2 |
 | Test.java:5735:39:5735:41 | out : List [<element>, <map.value>] : Object | Test.java:79:19:79:32 | it : List [<element>, <map.value>] : Object | provenance |  |
-| Test.java:5735:39:5735:41 | out : List [<element>, <map.value>] : Object | Test.java:5735:28:5735:42 | getElement(...) : Object [<map.value>] : Object | provenance | MaD:492 |
+| Test.java:5735:39:5735:41 | out : List [<element>, <map.value>] : Object | Test.java:5735:28:5735:42 | getElement(...) : Object [<map.value>] : Object | provenance | MaD:495 |
 | Test.java:5740:21:5740:88 | (...)... : HttpHeaders [<element>, <map.value>] : Object | Test.java:5741:10:5741:11 | in : HttpHeaders [<element>, <map.value>] : Object | provenance |  |
 | Test.java:5740:34:5740:88 | newWithElementDefault(...) : Object [<element>, <map.value>] : Object | Test.java:5740:21:5740:88 | (...)... : HttpHeaders [<element>, <map.value>] : Object | provenance |  |
-| Test.java:5740:56:5740:87 | newWithMapValueDefault(...) : Object [<map.value>] : Object | Test.java:5740:34:5740:88 | newWithElementDefault(...) : Object [<element>, <map.value>] : Object | provenance | MaD:497 |
-| Test.java:5740:79:5740:86 | source(...) : Object | Test.java:5740:56:5740:87 | newWithMapValueDefault(...) : Object [<map.value>] : Object | provenance | MaD:495 |
-| Test.java:5741:10:5741:11 | in : HttpHeaders [<element>, <map.value>] : Object | Test.java:5741:10:5741:35 | get(...) : String | provenance | MaD:243 |
+| Test.java:5740:56:5740:87 | newWithMapValueDefault(...) : Object [<map.value>] : Object | Test.java:5740:34:5740:88 | newWithElementDefault(...) : Object [<element>, <map.value>] : Object | provenance | MaD:3 |
+| Test.java:5740:79:5740:86 | source(...) : Object | Test.java:5740:56:5740:87 | newWithMapValueDefault(...) : Object [<map.value>] : Object | provenance | MaD:5 |
+| Test.java:5741:10:5741:11 | in : HttpHeaders [<element>, <map.value>] : Object | Test.java:5741:10:5741:35 | get(...) : String | provenance | MaD:338 |
 | Test.java:5741:10:5741:35 | get(...) : String | Test.java:5742:9:5742:11 | out | provenance |  |
 | Test.java:5747:21:5747:88 | (...)... : HttpHeaders [<element>, <map.value>] : Object | Test.java:5748:10:5748:11 | in : HttpHeaders [<element>, <map.value>] : Object | provenance |  |
 | Test.java:5747:34:5747:88 | newWithElementDefault(...) : Object [<element>, <map.value>] : Object | Test.java:5747:21:5747:88 | (...)... : HttpHeaders [<element>, <map.value>] : Object | provenance |  |
-| Test.java:5747:56:5747:87 | newWithMapValueDefault(...) : Object [<map.value>] : Object | Test.java:5747:34:5747:88 | newWithElementDefault(...) : Object [<element>, <map.value>] : Object | provenance | MaD:497 |
-| Test.java:5747:79:5747:86 | source(...) : Object | Test.java:5747:56:5747:87 | newWithMapValueDefault(...) : Object [<map.value>] : Object | provenance | MaD:495 |
-| Test.java:5748:10:5748:11 | in : HttpHeaders [<element>, <map.value>] : Object | Test.java:5748:10:5748:29 | get(...) : String | provenance | MaD:243 |
+| Test.java:5747:56:5747:87 | newWithMapValueDefault(...) : Object [<map.value>] : Object | Test.java:5747:34:5747:88 | newWithElementDefault(...) : Object [<element>, <map.value>] : Object | provenance | MaD:3 |
+| Test.java:5747:79:5747:86 | source(...) : Object | Test.java:5747:56:5747:87 | newWithMapValueDefault(...) : Object [<map.value>] : Object | provenance | MaD:5 |
+| Test.java:5748:10:5748:11 | in : HttpHeaders [<element>, <map.value>] : Object | Test.java:5748:10:5748:29 | get(...) : String | provenance | MaD:338 |
 | Test.java:5748:10:5748:29 | get(...) : String | Test.java:5749:9:5749:11 | out | provenance |  |
 | Test.java:5754:21:5754:88 | (...)... : HttpHeaders [<element>, <map.value>] : Object | Test.java:5755:10:5755:11 | in : HttpHeaders [<element>, <map.value>] : Object | provenance |  |
 | Test.java:5754:34:5754:88 | newWithElementDefault(...) : Object [<element>, <map.value>] : Object | Test.java:5754:21:5754:88 | (...)... : HttpHeaders [<element>, <map.value>] : Object | provenance |  |
-| Test.java:5754:56:5754:87 | newWithMapValueDefault(...) : Object [<map.value>] : Object | Test.java:5754:34:5754:88 | newWithElementDefault(...) : Object [<element>, <map.value>] : Object | provenance | MaD:497 |
-| Test.java:5754:79:5754:86 | source(...) : Object | Test.java:5754:56:5754:87 | newWithMapValueDefault(...) : Object [<map.value>] : Object | provenance | MaD:495 |
-| Test.java:5755:10:5755:11 | in : HttpHeaders [<element>, <map.value>] : Object | Test.java:5755:10:5755:27 | get(...) : String | provenance | MaD:243 |
+| Test.java:5754:56:5754:87 | newWithMapValueDefault(...) : Object [<map.value>] : Object | Test.java:5754:34:5754:88 | newWithElementDefault(...) : Object [<element>, <map.value>] : Object | provenance | MaD:3 |
+| Test.java:5754:79:5754:86 | source(...) : Object | Test.java:5754:56:5754:87 | newWithMapValueDefault(...) : Object [<map.value>] : Object | provenance | MaD:5 |
+| Test.java:5755:10:5755:11 | in : HttpHeaders [<element>, <map.value>] : Object | Test.java:5755:10:5755:27 | get(...) : String | provenance | MaD:338 |
 | Test.java:5755:10:5755:27 | get(...) : String | Test.java:5756:9:5756:11 | out | provenance |  |
 | Test.java:5761:16:5761:31 | (...)... : String | Test.java:5763:29:5763:30 | in : String | provenance |  |
 | Test.java:5761:24:5761:31 | source(...) : Object | Test.java:5761:16:5761:31 | (...)... : String | provenance |  |
 | Test.java:5763:10:5763:31 | get(...) : String | Test.java:5764:9:5764:11 | out | provenance |  |
-| Test.java:5763:29:5763:30 | in : String | Test.java:5763:10:5763:31 | get(...) : String | provenance | MaD:244 |
+| Test.java:5763:29:5763:30 | in : String | Test.java:5763:10:5763:31 | get(...) : String | provenance | MaD:337 |
 | Test.java:5769:21:5769:88 | (...)... : HttpHeaders [<element>, <map.value>] : Object | Test.java:5770:10:5770:11 | in : HttpHeaders [<element>, <map.value>] : Object | provenance |  |
 | Test.java:5769:34:5769:88 | newWithElementDefault(...) : Object [<element>, <map.value>] : Object | Test.java:5769:21:5769:88 | (...)... : HttpHeaders [<element>, <map.value>] : Object | provenance |  |
-| Test.java:5769:56:5769:87 | newWithMapValueDefault(...) : Object [<map.value>] : Object | Test.java:5769:34:5769:88 | newWithElementDefault(...) : Object [<element>, <map.value>] : Object | provenance | MaD:497 |
-| Test.java:5769:79:5769:86 | source(...) : Object | Test.java:5769:56:5769:87 | newWithMapValueDefault(...) : Object [<map.value>] : Object | provenance | MaD:495 |
-| Test.java:5770:10:5770:11 | in : HttpHeaders [<element>, <map.value>] : Object | Test.java:5770:10:5770:38 | getAll(...) : List [<element>] : Object | provenance | MaD:245 |
+| Test.java:5769:56:5769:87 | newWithMapValueDefault(...) : Object [<map.value>] : Object | Test.java:5769:34:5769:88 | newWithElementDefault(...) : Object [<element>, <map.value>] : Object | provenance | MaD:3 |
+| Test.java:5769:79:5769:86 | source(...) : Object | Test.java:5769:56:5769:87 | newWithMapValueDefault(...) : Object [<map.value>] : Object | provenance | MaD:5 |
+| Test.java:5770:10:5770:11 | in : HttpHeaders [<element>, <map.value>] : Object | Test.java:5770:10:5770:38 | getAll(...) : List [<element>] : Object | provenance | MaD:339 |
 | Test.java:5770:10:5770:38 | getAll(...) : List [<element>] : Object | Test.java:5771:20:5771:22 | out : List [<element>] : Object | provenance |  |
 | Test.java:5771:20:5771:22 | out : List [<element>] : Object | Test.java:79:19:79:32 | it : List [<element>] : Object | provenance |  |
-| Test.java:5771:20:5771:22 | out : List [<element>] : Object | Test.java:5771:9:5771:23 | getElement(...) | provenance | MaD:492 |
+| Test.java:5771:20:5771:22 | out : List [<element>] : Object | Test.java:5771:9:5771:23 | getElement(...) | provenance | MaD:495 |
 | Test.java:5776:21:5776:88 | (...)... : HttpHeaders [<element>, <map.value>] : Object | Test.java:5777:10:5777:11 | in : HttpHeaders [<element>, <map.value>] : Object | provenance |  |
 | Test.java:5776:34:5776:88 | newWithElementDefault(...) : Object [<element>, <map.value>] : Object | Test.java:5776:21:5776:88 | (...)... : HttpHeaders [<element>, <map.value>] : Object | provenance |  |
-| Test.java:5776:56:5776:87 | newWithMapValueDefault(...) : Object [<map.value>] : Object | Test.java:5776:34:5776:88 | newWithElementDefault(...) : Object [<element>, <map.value>] : Object | provenance | MaD:497 |
-| Test.java:5776:79:5776:86 | source(...) : Object | Test.java:5776:56:5776:87 | newWithMapValueDefault(...) : Object [<map.value>] : Object | provenance | MaD:495 |
-| Test.java:5777:10:5777:11 | in : HttpHeaders [<element>, <map.value>] : Object | Test.java:5777:10:5777:32 | getAll(...) : List [<element>] : Object | provenance | MaD:245 |
+| Test.java:5776:56:5776:87 | newWithMapValueDefault(...) : Object [<map.value>] : Object | Test.java:5776:34:5776:88 | newWithElementDefault(...) : Object [<element>, <map.value>] : Object | provenance | MaD:3 |
+| Test.java:5776:79:5776:86 | source(...) : Object | Test.java:5776:56:5776:87 | newWithMapValueDefault(...) : Object [<map.value>] : Object | provenance | MaD:5 |
+| Test.java:5777:10:5777:11 | in : HttpHeaders [<element>, <map.value>] : Object | Test.java:5777:10:5777:32 | getAll(...) : List [<element>] : Object | provenance | MaD:339 |
 | Test.java:5777:10:5777:32 | getAll(...) : List [<element>] : Object | Test.java:5778:20:5778:22 | out : List [<element>] : Object | provenance |  |
 | Test.java:5778:20:5778:22 | out : List [<element>] : Object | Test.java:79:19:79:32 | it : List [<element>] : Object | provenance |  |
-| Test.java:5778:20:5778:22 | out : List [<element>] : Object | Test.java:5778:9:5778:23 | getElement(...) | provenance | MaD:492 |
+| Test.java:5778:20:5778:22 | out : List [<element>] : Object | Test.java:5778:9:5778:23 | getElement(...) | provenance | MaD:495 |
 | Test.java:5783:21:5783:88 | (...)... : HttpHeaders [<element>, <map.value>] : Object | Test.java:5784:10:5784:11 | in : HttpHeaders [<element>, <map.value>] : Object | provenance |  |
 | Test.java:5783:34:5783:88 | newWithElementDefault(...) : Object [<element>, <map.value>] : Object | Test.java:5783:21:5783:88 | (...)... : HttpHeaders [<element>, <map.value>] : Object | provenance |  |
-| Test.java:5783:56:5783:87 | newWithMapValueDefault(...) : Object [<map.value>] : Object | Test.java:5783:34:5783:88 | newWithElementDefault(...) : Object [<element>, <map.value>] : Object | provenance | MaD:497 |
-| Test.java:5783:79:5783:86 | source(...) : Object | Test.java:5783:56:5783:87 | newWithMapValueDefault(...) : Object [<map.value>] : Object | provenance | MaD:495 |
-| Test.java:5784:10:5784:11 | in : HttpHeaders [<element>, <map.value>] : Object | Test.java:5784:10:5784:32 | getAllAsString(...) : List [<element>] : Object | provenance | MaD:246 |
+| Test.java:5783:56:5783:87 | newWithMapValueDefault(...) : Object [<map.value>] : Object | Test.java:5783:34:5783:88 | newWithElementDefault(...) : Object [<element>, <map.value>] : Object | provenance | MaD:3 |
+| Test.java:5783:79:5783:86 | source(...) : Object | Test.java:5783:56:5783:87 | newWithMapValueDefault(...) : Object [<map.value>] : Object | provenance | MaD:5 |
+| Test.java:5784:10:5784:11 | in : HttpHeaders [<element>, <map.value>] : Object | Test.java:5784:10:5784:32 | getAllAsString(...) : List [<element>] : Object | provenance | MaD:340 |
 | Test.java:5784:10:5784:32 | getAllAsString(...) : List [<element>] : Object | Test.java:5785:20:5785:22 | out : List [<element>] : Object | provenance |  |
 | Test.java:5785:20:5785:22 | out : List [<element>] : Object | Test.java:79:19:79:32 | it : List [<element>] : Object | provenance |  |
-| Test.java:5785:20:5785:22 | out : List [<element>] : Object | Test.java:5785:9:5785:23 | getElement(...) | provenance | MaD:492 |
+| Test.java:5785:20:5785:22 | out : List [<element>] : Object | Test.java:5785:9:5785:23 | getElement(...) | provenance | MaD:495 |
 | Test.java:5790:21:5790:88 | (...)... : HttpHeaders [<element>, <map.value>] : Object | Test.java:5791:10:5791:11 | in : HttpHeaders [<element>, <map.value>] : Object | provenance |  |
 | Test.java:5790:34:5790:88 | newWithElementDefault(...) : Object [<element>, <map.value>] : Object | Test.java:5790:21:5790:88 | (...)... : HttpHeaders [<element>, <map.value>] : Object | provenance |  |
-| Test.java:5790:56:5790:87 | newWithMapValueDefault(...) : Object [<map.value>] : Object | Test.java:5790:34:5790:88 | newWithElementDefault(...) : Object [<element>, <map.value>] : Object | provenance | MaD:497 |
-| Test.java:5790:79:5790:86 | source(...) : Object | Test.java:5790:56:5790:87 | newWithMapValueDefault(...) : Object [<map.value>] : Object | provenance | MaD:495 |
-| Test.java:5791:10:5791:11 | in : HttpHeaders [<element>, <map.value>] : Object | Test.java:5791:10:5791:29 | getAsString(...) : String | provenance | MaD:247 |
+| Test.java:5790:56:5790:87 | newWithMapValueDefault(...) : Object [<map.value>] : Object | Test.java:5790:34:5790:88 | newWithElementDefault(...) : Object [<element>, <map.value>] : Object | provenance | MaD:3 |
+| Test.java:5790:79:5790:86 | source(...) : Object | Test.java:5790:56:5790:87 | newWithMapValueDefault(...) : Object [<map.value>] : Object | provenance | MaD:5 |
+| Test.java:5791:10:5791:11 | in : HttpHeaders [<element>, <map.value>] : Object | Test.java:5791:10:5791:29 | getAsString(...) : String | provenance | MaD:341 |
 | Test.java:5791:10:5791:29 | getAsString(...) : String | Test.java:5792:9:5792:11 | out | provenance |  |
 | Test.java:5797:21:5797:41 | (...)... : HttpMessage | Test.java:5798:32:5798:33 | in : HttpMessage | provenance |  |
 | Test.java:5797:34:5797:41 | source(...) : Object | Test.java:5797:21:5797:41 | (...)... : HttpMessage | provenance |  |
 | Test.java:5798:10:5798:54 | getHeader(...) : String | Test.java:5799:9:5799:11 | out | provenance |  |
-| Test.java:5798:32:5798:33 | in : HttpMessage | Test.java:5798:10:5798:54 | getHeader(...) : String | provenance | MaD:248 |
+| Test.java:5798:32:5798:33 | in : HttpMessage | Test.java:5798:10:5798:54 | getHeader(...) : String | provenance | MaD:342 |
 | Test.java:5804:21:5804:41 | (...)... : HttpMessage | Test.java:5805:32:5805:33 | in : HttpMessage | provenance |  |
 | Test.java:5804:34:5804:41 | source(...) : Object | Test.java:5804:21:5804:41 | (...)... : HttpMessage | provenance |  |
 | Test.java:5805:10:5805:68 | getHeader(...) : String | Test.java:5806:9:5806:11 | out | provenance |  |
-| Test.java:5805:32:5805:33 | in : HttpMessage | Test.java:5805:10:5805:68 | getHeader(...) : String | provenance | MaD:248 |
+| Test.java:5805:32:5805:33 | in : HttpMessage | Test.java:5805:10:5805:68 | getHeader(...) : String | provenance | MaD:342 |
 | Test.java:5811:21:5811:41 | (...)... : HttpMessage | Test.java:5812:32:5812:33 | in : HttpMessage | provenance |  |
 | Test.java:5811:34:5811:41 | source(...) : Object | Test.java:5811:21:5811:41 | (...)... : HttpMessage | provenance |  |
 | Test.java:5812:10:5812:48 | getHeader(...) : String | Test.java:5813:9:5813:11 | out | provenance |  |
-| Test.java:5812:32:5812:33 | in : HttpMessage | Test.java:5812:10:5812:48 | getHeader(...) : String | provenance | MaD:248 |
+| Test.java:5812:32:5812:33 | in : HttpMessage | Test.java:5812:10:5812:48 | getHeader(...) : String | provenance | MaD:342 |
 | Test.java:5818:21:5818:41 | (...)... : HttpMessage | Test.java:5819:32:5819:33 | in : HttpMessage | provenance |  |
 | Test.java:5818:34:5818:41 | source(...) : Object | Test.java:5818:21:5818:41 | (...)... : HttpMessage | provenance |  |
 | Test.java:5819:10:5819:62 | getHeader(...) : String | Test.java:5820:9:5820:11 | out | provenance |  |
-| Test.java:5819:32:5819:33 | in : HttpMessage | Test.java:5819:10:5819:62 | getHeader(...) : String | provenance | MaD:248 |
+| Test.java:5819:32:5819:33 | in : HttpMessage | Test.java:5819:10:5819:62 | getHeader(...) : String | provenance | MaD:342 |
 | Test.java:5825:16:5825:31 | (...)... : String | Test.java:5826:71:5826:72 | in : String | provenance |  |
 | Test.java:5825:24:5825:31 | source(...) : Object | Test.java:5825:16:5825:31 | (...)... : String | provenance |  |
 | Test.java:5826:10:5826:73 | getHeader(...) : String | Test.java:5827:9:5827:11 | out | provenance |  |
-| Test.java:5826:71:5826:72 | in : String | Test.java:5826:10:5826:73 | getHeader(...) : String | provenance | MaD:249 |
+| Test.java:5826:71:5826:72 | in : String | Test.java:5826:10:5826:73 | getHeader(...) : String | provenance | MaD:343 |
 | Test.java:5832:16:5832:31 | (...)... : String | Test.java:5833:65:5833:66 | in : String | provenance |  |
 | Test.java:5832:24:5832:31 | source(...) : Object | Test.java:5832:16:5832:31 | (...)... : String | provenance |  |
 | Test.java:5833:10:5833:67 | getHeader(...) : String | Test.java:5834:9:5834:11 | out | provenance |  |
-| Test.java:5833:65:5833:66 | in : String | Test.java:5833:10:5833:67 | getHeader(...) : String | provenance | MaD:249 |
+| Test.java:5833:65:5833:66 | in : String | Test.java:5833:10:5833:67 | getHeader(...) : String | provenance | MaD:343 |
 | Test.java:5839:21:5839:41 | (...)... : HttpMessage | Test.java:5840:30:5840:31 | in : HttpMessage | provenance |  |
 | Test.java:5839:34:5839:41 | source(...) : Object | Test.java:5839:21:5839:41 | (...)... : HttpMessage | provenance |  |
 | Test.java:5840:10:5840:32 | getHost(...) : String | Test.java:5841:9:5841:11 | out | provenance |  |
-| Test.java:5840:30:5840:31 | in : HttpMessage | Test.java:5840:10:5840:32 | getHost(...) : String | provenance | MaD:250 |
+| Test.java:5840:30:5840:31 | in : HttpMessage | Test.java:5840:10:5840:32 | getHost(...) : String | provenance | MaD:344 |
 | Test.java:5846:21:5846:41 | (...)... : HttpMessage | Test.java:5847:30:5847:31 | in : HttpMessage | provenance |  |
 | Test.java:5846:34:5846:41 | source(...) : Object | Test.java:5846:21:5846:41 | (...)... : HttpMessage | provenance |  |
 | Test.java:5847:10:5847:38 | getHost(...) : String | Test.java:5848:9:5848:11 | out | provenance |  |
-| Test.java:5847:30:5847:31 | in : HttpMessage | Test.java:5847:10:5847:38 | getHost(...) : String | provenance | MaD:250 |
+| Test.java:5847:30:5847:31 | in : HttpMessage | Test.java:5847:10:5847:38 | getHost(...) : String | provenance | MaD:344 |
 | Test.java:5853:16:5853:31 | (...)... : String | Test.java:5854:36:5854:37 | in : String | provenance |  |
 | Test.java:5853:24:5853:31 | source(...) : Object | Test.java:5853:16:5853:31 | (...)... : String | provenance |  |
 | Test.java:5854:10:5854:38 | getHost(...) : String | Test.java:5855:9:5855:11 | out | provenance |  |
-| Test.java:5854:36:5854:37 | in : String | Test.java:5854:10:5854:38 | getHost(...) : String | provenance | MaD:251 |
+| Test.java:5854:36:5854:37 | in : String | Test.java:5854:10:5854:38 | getHost(...) : String | provenance | MaD:345 |
 | Test.java:5860:21:5860:86 | (...)... : HttpHeaders [<element>, <map.key>] : Object | Test.java:5861:10:5861:11 | in : HttpHeaders [<element>, <map.key>] : Object | provenance |  |
 | Test.java:5860:34:5860:86 | newWithElementDefault(...) : Object [<element>, <map.key>] : Object | Test.java:5860:21:5860:86 | (...)... : HttpHeaders [<element>, <map.key>] : Object | provenance |  |
-| Test.java:5860:56:5860:85 | newWithMapKeyDefault(...) : Object [<map.key>] : Object | Test.java:5860:34:5860:86 | newWithElementDefault(...) : Object [<element>, <map.key>] : Object | provenance | MaD:497 |
-| Test.java:5860:77:5860:84 | source(...) : Object | Test.java:5860:56:5860:85 | newWithMapKeyDefault(...) : Object [<map.key>] : Object | provenance | MaD:496 |
-| Test.java:5861:10:5861:11 | in : HttpHeaders [<element>, <map.key>] : Object | Test.java:5861:10:5861:30 | iteratorAsString(...) : Iterator [<element>, <map.key>] : Object | provenance | MaD:252 |
+| Test.java:5860:56:5860:85 | newWithMapKeyDefault(...) : Object [<map.key>] : Object | Test.java:5860:34:5860:86 | newWithElementDefault(...) : Object [<element>, <map.key>] : Object | provenance | MaD:3 |
+| Test.java:5860:77:5860:84 | source(...) : Object | Test.java:5860:56:5860:85 | newWithMapKeyDefault(...) : Object [<map.key>] : Object | provenance | MaD:4 |
+| Test.java:5861:10:5861:11 | in : HttpHeaders [<element>, <map.key>] : Object | Test.java:5861:10:5861:30 | iteratorAsString(...) : Iterator [<element>, <map.key>] : Object | provenance | MaD:346 |
 | Test.java:5861:10:5861:30 | iteratorAsString(...) : Iterator [<element>, <map.key>] : Object | Test.java:5862:37:5862:39 | out : Iterator [<element>, <map.key>] : Object | provenance |  |
-| Test.java:5862:26:5862:40 | getElement(...) : Object [<map.key>] : Object | Test.java:5862:9:5862:41 | getMapKeyDefault(...) | provenance | MaD:499 |
+| Test.java:5862:26:5862:40 | getElement(...) : Object [<map.key>] : Object | Test.java:5862:9:5862:41 | getMapKeyDefault(...) | provenance | MaD:1 |
 | Test.java:5862:37:5862:39 | out : Iterator [<element>, <map.key>] : Object | Test.java:80:19:80:32 | it : Iterator [<element>, <map.key>] : Object | provenance |  |
-| Test.java:5862:37:5862:39 | out : Iterator [<element>, <map.key>] : Object | Test.java:5862:26:5862:40 | getElement(...) : Object [<map.key>] : Object | provenance | MaD:493 |
+| Test.java:5862:37:5862:39 | out : Iterator [<element>, <map.key>] : Object | Test.java:5862:26:5862:40 | getElement(...) : Object [<map.key>] : Object | provenance | MaD:496 |
 | Test.java:5867:21:5867:88 | (...)... : HttpHeaders [<element>, <map.value>] : Object | Test.java:5868:10:5868:11 | in : HttpHeaders [<element>, <map.value>] : Object | provenance |  |
 | Test.java:5867:34:5867:88 | newWithElementDefault(...) : Object [<element>, <map.value>] : Object | Test.java:5867:21:5867:88 | (...)... : HttpHeaders [<element>, <map.value>] : Object | provenance |  |
-| Test.java:5867:56:5867:87 | newWithMapValueDefault(...) : Object [<map.value>] : Object | Test.java:5867:34:5867:88 | newWithElementDefault(...) : Object [<element>, <map.value>] : Object | provenance | MaD:497 |
-| Test.java:5867:79:5867:86 | source(...) : Object | Test.java:5867:56:5867:87 | newWithMapValueDefault(...) : Object [<map.value>] : Object | provenance | MaD:495 |
-| Test.java:5868:10:5868:11 | in : HttpHeaders [<element>, <map.value>] : Object | Test.java:5868:10:5868:30 | iteratorAsString(...) : Iterator [<element>, <map.value>] : Object | provenance | MaD:253 |
+| Test.java:5867:56:5867:87 | newWithMapValueDefault(...) : Object [<map.value>] : Object | Test.java:5867:34:5867:88 | newWithElementDefault(...) : Object [<element>, <map.value>] : Object | provenance | MaD:3 |
+| Test.java:5867:79:5867:86 | source(...) : Object | Test.java:5867:56:5867:87 | newWithMapValueDefault(...) : Object [<map.value>] : Object | provenance | MaD:5 |
+| Test.java:5868:10:5868:11 | in : HttpHeaders [<element>, <map.value>] : Object | Test.java:5868:10:5868:30 | iteratorAsString(...) : Iterator [<element>, <map.value>] : Object | provenance | MaD:347 |
 | Test.java:5868:10:5868:30 | iteratorAsString(...) : Iterator [<element>, <map.value>] : Object | Test.java:5869:39:5869:41 | out : Iterator [<element>, <map.value>] : Object | provenance |  |
-| Test.java:5869:28:5869:42 | getElement(...) : Object [<map.value>] : Object | Test.java:5869:9:5869:43 | getMapValueDefault(...) | provenance | MaD:498 |
+| Test.java:5869:28:5869:42 | getElement(...) : Object [<map.value>] : Object | Test.java:5869:9:5869:43 | getMapValueDefault(...) | provenance | MaD:2 |
 | Test.java:5869:39:5869:41 | out : Iterator [<element>, <map.value>] : Object | Test.java:80:19:80:32 | it : Iterator [<element>, <map.value>] : Object | provenance |  |
-| Test.java:5869:39:5869:41 | out : Iterator [<element>, <map.value>] : Object | Test.java:5869:28:5869:42 | getElement(...) : Object [<map.value>] : Object | provenance | MaD:493 |
+| Test.java:5869:39:5869:41 | out : Iterator [<element>, <map.value>] : Object | Test.java:5869:28:5869:42 | getElement(...) : Object [<map.value>] : Object | provenance | MaD:496 |
 | Test.java:5874:21:5874:86 | (...)... : HttpHeaders [<element>, <map.key>] : Object | Test.java:5875:10:5875:11 | in : HttpHeaders [<element>, <map.key>] : Object | provenance |  |
 | Test.java:5874:34:5874:86 | newWithElementDefault(...) : Object [<element>, <map.key>] : Object | Test.java:5874:21:5874:86 | (...)... : HttpHeaders [<element>, <map.key>] : Object | provenance |  |
-| Test.java:5874:56:5874:85 | newWithMapKeyDefault(...) : Object [<map.key>] : Object | Test.java:5874:34:5874:86 | newWithElementDefault(...) : Object [<element>, <map.key>] : Object | provenance | MaD:497 |
-| Test.java:5874:77:5874:84 | source(...) : Object | Test.java:5874:56:5874:85 | newWithMapKeyDefault(...) : Object [<map.key>] : Object | provenance | MaD:496 |
-| Test.java:5875:10:5875:11 | in : HttpHeaders [<element>, <map.key>] : Object | Test.java:5875:10:5875:34 | iteratorCharSequence(...) : Iterator [<element>, <map.key>] : Object | provenance | MaD:254 |
+| Test.java:5874:56:5874:85 | newWithMapKeyDefault(...) : Object [<map.key>] : Object | Test.java:5874:34:5874:86 | newWithElementDefault(...) : Object [<element>, <map.key>] : Object | provenance | MaD:3 |
+| Test.java:5874:77:5874:84 | source(...) : Object | Test.java:5874:56:5874:85 | newWithMapKeyDefault(...) : Object [<map.key>] : Object | provenance | MaD:4 |
+| Test.java:5875:10:5875:11 | in : HttpHeaders [<element>, <map.key>] : Object | Test.java:5875:10:5875:34 | iteratorCharSequence(...) : Iterator [<element>, <map.key>] : Object | provenance | MaD:348 |
 | Test.java:5875:10:5875:34 | iteratorCharSequence(...) : Iterator [<element>, <map.key>] : Object | Test.java:5876:37:5876:39 | out : Iterator [<element>, <map.key>] : Object | provenance |  |
-| Test.java:5876:26:5876:40 | getElement(...) : Object [<map.key>] : Object | Test.java:5876:9:5876:41 | getMapKeyDefault(...) | provenance | MaD:499 |
+| Test.java:5876:26:5876:40 | getElement(...) : Object [<map.key>] : Object | Test.java:5876:9:5876:41 | getMapKeyDefault(...) | provenance | MaD:1 |
 | Test.java:5876:37:5876:39 | out : Iterator [<element>, <map.key>] : Object | Test.java:80:19:80:32 | it : Iterator [<element>, <map.key>] : Object | provenance |  |
-| Test.java:5876:37:5876:39 | out : Iterator [<element>, <map.key>] : Object | Test.java:5876:26:5876:40 | getElement(...) : Object [<map.key>] : Object | provenance | MaD:493 |
+| Test.java:5876:37:5876:39 | out : Iterator [<element>, <map.key>] : Object | Test.java:5876:26:5876:40 | getElement(...) : Object [<map.key>] : Object | provenance | MaD:496 |
 | Test.java:5881:21:5881:88 | (...)... : HttpHeaders [<element>, <map.value>] : Object | Test.java:5882:10:5882:11 | in : HttpHeaders [<element>, <map.value>] : Object | provenance |  |
 | Test.java:5881:34:5881:88 | newWithElementDefault(...) : Object [<element>, <map.value>] : Object | Test.java:5881:21:5881:88 | (...)... : HttpHeaders [<element>, <map.value>] : Object | provenance |  |
-| Test.java:5881:56:5881:87 | newWithMapValueDefault(...) : Object [<map.value>] : Object | Test.java:5881:34:5881:88 | newWithElementDefault(...) : Object [<element>, <map.value>] : Object | provenance | MaD:497 |
-| Test.java:5881:79:5881:86 | source(...) : Object | Test.java:5881:56:5881:87 | newWithMapValueDefault(...) : Object [<map.value>] : Object | provenance | MaD:495 |
-| Test.java:5882:10:5882:11 | in : HttpHeaders [<element>, <map.value>] : Object | Test.java:5882:10:5882:34 | iteratorCharSequence(...) : Iterator [<element>, <map.value>] : Object | provenance | MaD:255 |
+| Test.java:5881:56:5881:87 | newWithMapValueDefault(...) : Object [<map.value>] : Object | Test.java:5881:34:5881:88 | newWithElementDefault(...) : Object [<element>, <map.value>] : Object | provenance | MaD:3 |
+| Test.java:5881:79:5881:86 | source(...) : Object | Test.java:5881:56:5881:87 | newWithMapValueDefault(...) : Object [<map.value>] : Object | provenance | MaD:5 |
+| Test.java:5882:10:5882:11 | in : HttpHeaders [<element>, <map.value>] : Object | Test.java:5882:10:5882:34 | iteratorCharSequence(...) : Iterator [<element>, <map.value>] : Object | provenance | MaD:349 |
 | Test.java:5882:10:5882:34 | iteratorCharSequence(...) : Iterator [<element>, <map.value>] : Object | Test.java:5883:39:5883:41 | out : Iterator [<element>, <map.value>] : Object | provenance |  |
-| Test.java:5883:28:5883:42 | getElement(...) : Object [<map.value>] : Object | Test.java:5883:9:5883:43 | getMapValueDefault(...) | provenance | MaD:498 |
+| Test.java:5883:28:5883:42 | getElement(...) : Object [<map.value>] : Object | Test.java:5883:9:5883:43 | getMapValueDefault(...) | provenance | MaD:2 |
 | Test.java:5883:39:5883:41 | out : Iterator [<element>, <map.value>] : Object | Test.java:80:19:80:32 | it : Iterator [<element>, <map.value>] : Object | provenance |  |
-| Test.java:5883:39:5883:41 | out : Iterator [<element>, <map.value>] : Object | Test.java:5883:28:5883:42 | getElement(...) : Object [<map.value>] : Object | provenance | MaD:493 |
+| Test.java:5883:39:5883:41 | out : Iterator [<element>, <map.value>] : Object | Test.java:5883:28:5883:42 | getElement(...) : Object [<map.value>] : Object | provenance | MaD:496 |
 | Test.java:5888:21:5888:86 | (...)... : HttpHeaders [<element>, <map.key>] : Object | Test.java:5889:10:5889:11 | in : HttpHeaders [<element>, <map.key>] : Object | provenance |  |
 | Test.java:5888:34:5888:86 | newWithElementDefault(...) : Object [<element>, <map.key>] : Object | Test.java:5888:21:5888:86 | (...)... : HttpHeaders [<element>, <map.key>] : Object | provenance |  |
-| Test.java:5888:56:5888:85 | newWithMapKeyDefault(...) : Object [<map.key>] : Object | Test.java:5888:34:5888:86 | newWithElementDefault(...) : Object [<element>, <map.key>] : Object | provenance | MaD:497 |
-| Test.java:5888:77:5888:84 | source(...) : Object | Test.java:5888:56:5888:85 | newWithMapKeyDefault(...) : Object [<map.key>] : Object | provenance | MaD:496 |
-| Test.java:5889:10:5889:11 | in : HttpHeaders [<element>, <map.key>] : Object | Test.java:5889:10:5889:19 | names(...) : Set [<element>] : Object | provenance | MaD:256 |
+| Test.java:5888:56:5888:85 | newWithMapKeyDefault(...) : Object [<map.key>] : Object | Test.java:5888:34:5888:86 | newWithElementDefault(...) : Object [<element>, <map.key>] : Object | provenance | MaD:3 |
+| Test.java:5888:77:5888:84 | source(...) : Object | Test.java:5888:56:5888:85 | newWithMapKeyDefault(...) : Object [<map.key>] : Object | provenance | MaD:4 |
+| Test.java:5889:10:5889:11 | in : HttpHeaders [<element>, <map.key>] : Object | Test.java:5889:10:5889:19 | names(...) : Set [<element>] : Object | provenance | MaD:350 |
 | Test.java:5889:10:5889:19 | names(...) : Set [<element>] : Object | Test.java:5890:20:5890:22 | out : Set [<element>] : Object | provenance |  |
 | Test.java:5890:20:5890:22 | out : Set [<element>] : Object | Test.java:79:19:79:32 | it : Set [<element>] : Object | provenance |  |
-| Test.java:5890:20:5890:22 | out : Set [<element>] : Object | Test.java:5890:9:5890:23 | getElement(...) | provenance | MaD:492 |
+| Test.java:5890:20:5890:22 | out : Set [<element>] : Object | Test.java:5890:9:5890:23 | getElement(...) | provenance | MaD:495 |
 | Test.java:5895:16:5895:31 | (...)... : String | Test.java:5896:32:5896:33 | in : String | provenance |  |
 | Test.java:5895:24:5895:31 | source(...) : Object | Test.java:5895:16:5895:31 | (...)... : String | provenance |  |
 | Test.java:5896:10:5896:34 | newEntity(...) : CharSequence | Test.java:5897:9:5897:11 | out | provenance |  |
-| Test.java:5896:32:5896:33 | in : String | Test.java:5896:10:5896:34 | newEntity(...) : CharSequence | provenance | MaD:257 |
+| Test.java:5896:32:5896:33 | in : String | Test.java:5896:10:5896:34 | newEntity(...) : CharSequence | provenance | MaD:351 |
 | Test.java:5902:21:5902:41 | (...)... : HttpHeaders | Test.java:5903:10:5903:11 | in : HttpHeaders | provenance |  |
 | Test.java:5902:34:5902:41 | source(...) : Object | Test.java:5902:21:5902:41 | (...)... : HttpHeaders | provenance |  |
-| Test.java:5903:10:5903:11 | in : HttpHeaders | Test.java:5903:10:5903:38 | remove(...) : HttpHeaders | provenance | MaD:258 |
+| Test.java:5903:10:5903:11 | in : HttpHeaders | Test.java:5903:10:5903:38 | remove(...) : HttpHeaders | provenance | MaD:352 |
 | Test.java:5903:10:5903:38 | remove(...) : HttpHeaders | Test.java:5904:9:5904:11 | out | provenance |  |
 | Test.java:5909:21:5909:41 | (...)... : HttpHeaders | Test.java:5910:10:5910:11 | in : HttpHeaders | provenance |  |
 | Test.java:5909:34:5909:41 | source(...) : Object | Test.java:5909:21:5909:41 | (...)... : HttpHeaders | provenance |  |
-| Test.java:5910:10:5910:11 | in : HttpHeaders | Test.java:5910:10:5910:32 | remove(...) : HttpHeaders | provenance | MaD:258 |
+| Test.java:5910:10:5910:11 | in : HttpHeaders | Test.java:5910:10:5910:32 | remove(...) : HttpHeaders | provenance | MaD:352 |
 | Test.java:5910:10:5910:32 | remove(...) : HttpHeaders | Test.java:5911:9:5911:11 | out | provenance |  |
 | Test.java:5916:22:5916:43 | (...)... : CharSequence | Test.java:5917:12:5917:13 | in : CharSequence | provenance |  |
 | Test.java:5916:36:5916:43 | source(...) : Object | Test.java:5916:22:5916:43 | (...)... : CharSequence | provenance |  |
 | Test.java:5917:4:5917:6 | out [post update] : HttpHeaders [<element>, <map.key>] : Object | Test.java:5918:37:5918:39 | out : HttpHeaders [<element>, <map.key>] : Object | provenance |  |
-| Test.java:5917:12:5917:13 | in : CharSequence | Test.java:5917:4:5917:6 | out [post update] : HttpHeaders [<element>, <map.key>] : Object | provenance | MaD:260 |
-| Test.java:5918:26:5918:40 | getElement(...) : Entry [<map.key>] : Object | Test.java:5918:9:5918:41 | getMapKeyDefault(...) | provenance | MaD:499 |
+| Test.java:5917:12:5917:13 | in : CharSequence | Test.java:5917:4:5917:6 | out [post update] : HttpHeaders [<element>, <map.key>] : Object | provenance | MaD:353 |
+| Test.java:5918:26:5918:40 | getElement(...) : Entry [<map.key>] : Object | Test.java:5918:9:5918:41 | getMapKeyDefault(...) | provenance | MaD:1 |
 | Test.java:5918:37:5918:39 | out : HttpHeaders [<element>, <map.key>] : Object | Test.java:79:19:79:32 | it : HttpHeaders [<element>, <map.key>] : Object | provenance |  |
-| Test.java:5918:37:5918:39 | out : HttpHeaders [<element>, <map.key>] : Object | Test.java:5918:26:5918:40 | getElement(...) : Entry [<map.key>] : Object | provenance | MaD:492 |
+| Test.java:5918:37:5918:39 | out : HttpHeaders [<element>, <map.key>] : Object | Test.java:5918:26:5918:40 | getElement(...) : Entry [<map.key>] : Object | provenance | MaD:495 |
 | Test.java:5923:18:5923:44 | (...)... : List [<element>] : Object | Test.java:5924:32:5924:33 | in : List [<element>] : Object | provenance |  |
 | Test.java:5923:28:5923:44 | of(...) : List [<element>] : Object | Test.java:5923:18:5923:44 | (...)... : List [<element>] : Object | provenance |  |
-| Test.java:5923:36:5923:43 | source(...) : Object | Test.java:5923:28:5923:44 | of(...) : List [<element>] : Object | provenance | MaD:494 |
+| Test.java:5923:36:5923:43 | source(...) : Object | Test.java:5923:28:5923:44 | of(...) : List [<element>] : Object | provenance | MaD:497 |
 | Test.java:5924:4:5924:6 | out [post update] : HttpHeaders [<element>, <map.value>] : Object | Test.java:5925:39:5925:41 | out : HttpHeaders [<element>, <map.value>] : Object | provenance |  |
-| Test.java:5924:32:5924:33 | in : List [<element>] : Object | Test.java:5924:4:5924:6 | out [post update] : HttpHeaders [<element>, <map.value>] : Object | provenance | MaD:261 |
-| Test.java:5925:28:5925:42 | getElement(...) : Entry [<map.value>] : Object | Test.java:5925:9:5925:43 | getMapValueDefault(...) | provenance | MaD:498 |
+| Test.java:5924:32:5924:33 | in : List [<element>] : Object | Test.java:5924:4:5924:6 | out [post update] : HttpHeaders [<element>, <map.value>] : Object | provenance | MaD:354 |
+| Test.java:5925:28:5925:42 | getElement(...) : Entry [<map.value>] : Object | Test.java:5925:9:5925:43 | getMapValueDefault(...) | provenance | MaD:2 |
 | Test.java:5925:39:5925:41 | out : HttpHeaders [<element>, <map.value>] : Object | Test.java:79:19:79:32 | it : HttpHeaders [<element>, <map.value>] : Object | provenance |  |
-| Test.java:5925:39:5925:41 | out : HttpHeaders [<element>, <map.value>] : Object | Test.java:5925:28:5925:42 | getElement(...) : Entry [<map.value>] : Object | provenance | MaD:492 |
+| Test.java:5925:39:5925:41 | out : HttpHeaders [<element>, <map.value>] : Object | Test.java:5925:28:5925:42 | getElement(...) : Entry [<map.value>] : Object | provenance | MaD:495 |
 | Test.java:5930:22:5930:43 | (...)... : CharSequence | Test.java:5931:12:5931:13 | in : CharSequence | provenance |  |
 | Test.java:5930:36:5930:43 | source(...) : Object | Test.java:5930:22:5930:43 | (...)... : CharSequence | provenance |  |
 | Test.java:5931:4:5931:6 | out [post update] : HttpHeaders [<element>, <map.key>] : Object | Test.java:5932:37:5932:39 | out : HttpHeaders [<element>, <map.key>] : Object | provenance |  |
-| Test.java:5931:12:5931:13 | in : CharSequence | Test.java:5931:4:5931:6 | out [post update] : HttpHeaders [<element>, <map.key>] : Object | provenance | MaD:262 |
-| Test.java:5932:26:5932:40 | getElement(...) : Entry [<map.key>] : Object | Test.java:5932:9:5932:41 | getMapKeyDefault(...) | provenance | MaD:499 |
+| Test.java:5931:12:5931:13 | in : CharSequence | Test.java:5931:4:5931:6 | out [post update] : HttpHeaders [<element>, <map.key>] : Object | provenance | MaD:355 |
+| Test.java:5932:26:5932:40 | getElement(...) : Entry [<map.key>] : Object | Test.java:5932:9:5932:41 | getMapKeyDefault(...) | provenance | MaD:1 |
 | Test.java:5932:37:5932:39 | out : HttpHeaders [<element>, <map.key>] : Object | Test.java:79:19:79:32 | it : HttpHeaders [<element>, <map.key>] : Object | provenance |  |
-| Test.java:5932:37:5932:39 | out : HttpHeaders [<element>, <map.key>] : Object | Test.java:5932:26:5932:40 | getElement(...) : Entry [<map.key>] : Object | provenance | MaD:492 |
+| Test.java:5932:37:5932:39 | out : HttpHeaders [<element>, <map.key>] : Object | Test.java:5932:26:5932:40 | getElement(...) : Entry [<map.key>] : Object | provenance | MaD:495 |
 | Test.java:5937:16:5937:31 | (...)... : Object | Test.java:5938:32:5938:33 | in : Object | provenance |  |
 | Test.java:5937:24:5937:31 | source(...) : Object | Test.java:5937:16:5937:31 | (...)... : Object | provenance |  |
 | Test.java:5938:4:5938:6 | out [post update] : HttpHeaders [<element>, <map.value>] : Object | Test.java:5939:39:5939:41 | out : HttpHeaders [<element>, <map.value>] : Object | provenance |  |
-| Test.java:5938:32:5938:33 | in : Object | Test.java:5938:4:5938:6 | out [post update] : HttpHeaders [<element>, <map.value>] : Object | provenance | MaD:263 |
-| Test.java:5939:28:5939:42 | getElement(...) : Entry [<map.value>] : Object | Test.java:5939:9:5939:43 | getMapValueDefault(...) | provenance | MaD:498 |
+| Test.java:5938:32:5938:33 | in : Object | Test.java:5938:4:5938:6 | out [post update] : HttpHeaders [<element>, <map.value>] : Object | provenance | MaD:356 |
+| Test.java:5939:28:5939:42 | getElement(...) : Entry [<map.value>] : Object | Test.java:5939:9:5939:43 | getMapValueDefault(...) | provenance | MaD:2 |
 | Test.java:5939:39:5939:41 | out : HttpHeaders [<element>, <map.value>] : Object | Test.java:79:19:79:32 | it : HttpHeaders [<element>, <map.value>] : Object | provenance |  |
-| Test.java:5939:39:5939:41 | out : HttpHeaders [<element>, <map.value>] : Object | Test.java:5939:28:5939:42 | getElement(...) : Entry [<map.value>] : Object | provenance | MaD:492 |
+| Test.java:5939:39:5939:41 | out : HttpHeaders [<element>, <map.value>] : Object | Test.java:5939:28:5939:42 | getElement(...) : Entry [<map.value>] : Object | provenance | MaD:495 |
 | Test.java:5944:21:5944:86 | (...)... : HttpHeaders [<element>, <map.key>] : Object | Test.java:5945:12:5945:13 | in : HttpHeaders [<element>, <map.key>] : Object | provenance |  |
 | Test.java:5944:34:5944:86 | newWithElementDefault(...) : Object [<element>, <map.key>] : Object | Test.java:5944:21:5944:86 | (...)... : HttpHeaders [<element>, <map.key>] : Object | provenance |  |
-| Test.java:5944:56:5944:85 | newWithMapKeyDefault(...) : Object [<map.key>] : Object | Test.java:5944:34:5944:86 | newWithElementDefault(...) : Object [<element>, <map.key>] : Object | provenance | MaD:497 |
-| Test.java:5944:77:5944:84 | source(...) : Object | Test.java:5944:56:5944:85 | newWithMapKeyDefault(...) : Object [<map.key>] : Object | provenance | MaD:496 |
+| Test.java:5944:56:5944:85 | newWithMapKeyDefault(...) : Object [<map.key>] : Object | Test.java:5944:34:5944:86 | newWithElementDefault(...) : Object [<element>, <map.key>] : Object | provenance | MaD:3 |
+| Test.java:5944:77:5944:84 | source(...) : Object | Test.java:5944:56:5944:85 | newWithMapKeyDefault(...) : Object [<map.key>] : Object | provenance | MaD:4 |
 | Test.java:5945:4:5945:6 | out [post update] : HttpHeaders [<element>, <map.key>] : Object | Test.java:5946:37:5946:39 | out : HttpHeaders [<element>, <map.key>] : Object | provenance |  |
-| Test.java:5945:12:5945:13 | in : HttpHeaders [<element>, <map.key>] : Object | Test.java:5945:4:5945:6 | out [post update] : HttpHeaders [<element>, <map.key>] : Object | provenance | MaD:268 |
-| Test.java:5946:26:5946:40 | getElement(...) : Entry [<map.key>] : Object | Test.java:5946:9:5946:41 | getMapKeyDefault(...) | provenance | MaD:499 |
+| Test.java:5945:12:5945:13 | in : HttpHeaders [<element>, <map.key>] : Object | Test.java:5945:4:5945:6 | out [post update] : HttpHeaders [<element>, <map.key>] : Object | provenance | MaD:357 |
+| Test.java:5946:26:5946:40 | getElement(...) : Entry [<map.key>] : Object | Test.java:5946:9:5946:41 | getMapKeyDefault(...) | provenance | MaD:1 |
 | Test.java:5946:37:5946:39 | out : HttpHeaders [<element>, <map.key>] : Object | Test.java:79:19:79:32 | it : HttpHeaders [<element>, <map.key>] : Object | provenance |  |
-| Test.java:5946:37:5946:39 | out : HttpHeaders [<element>, <map.key>] : Object | Test.java:5946:26:5946:40 | getElement(...) : Entry [<map.key>] : Object | provenance | MaD:492 |
+| Test.java:5946:37:5946:39 | out : HttpHeaders [<element>, <map.key>] : Object | Test.java:5946:26:5946:40 | getElement(...) : Entry [<map.key>] : Object | provenance | MaD:495 |
 | Test.java:5951:21:5951:88 | (...)... : HttpHeaders [<element>, <map.value>] : Object | Test.java:5952:12:5952:13 | in : HttpHeaders [<element>, <map.value>] : Object | provenance |  |
 | Test.java:5951:34:5951:88 | newWithElementDefault(...) : Object [<element>, <map.value>] : Object | Test.java:5951:21:5951:88 | (...)... : HttpHeaders [<element>, <map.value>] : Object | provenance |  |
-| Test.java:5951:56:5951:87 | newWithMapValueDefault(...) : Object [<map.value>] : Object | Test.java:5951:34:5951:88 | newWithElementDefault(...) : Object [<element>, <map.value>] : Object | provenance | MaD:497 |
-| Test.java:5951:79:5951:86 | source(...) : Object | Test.java:5951:56:5951:87 | newWithMapValueDefault(...) : Object [<map.value>] : Object | provenance | MaD:495 |
+| Test.java:5951:56:5951:87 | newWithMapValueDefault(...) : Object [<map.value>] : Object | Test.java:5951:34:5951:88 | newWithElementDefault(...) : Object [<element>, <map.value>] : Object | provenance | MaD:3 |
+| Test.java:5951:79:5951:86 | source(...) : Object | Test.java:5951:56:5951:87 | newWithMapValueDefault(...) : Object [<map.value>] : Object | provenance | MaD:5 |
 | Test.java:5952:4:5952:6 | out [post update] : HttpHeaders [<element>, <map.value>] : Object | Test.java:5953:39:5953:41 | out : HttpHeaders [<element>, <map.value>] : Object | provenance |  |
-| Test.java:5952:12:5952:13 | in : HttpHeaders [<element>, <map.value>] : Object | Test.java:5952:4:5952:6 | out [post update] : HttpHeaders [<element>, <map.value>] : Object | provenance | MaD:269 |
-| Test.java:5953:28:5953:42 | getElement(...) : Entry [<map.value>] : Object | Test.java:5953:9:5953:43 | getMapValueDefault(...) | provenance | MaD:498 |
+| Test.java:5952:12:5952:13 | in : HttpHeaders [<element>, <map.value>] : Object | Test.java:5952:4:5952:6 | out [post update] : HttpHeaders [<element>, <map.value>] : Object | provenance | MaD:358 |
+| Test.java:5953:28:5953:42 | getElement(...) : Entry [<map.value>] : Object | Test.java:5953:9:5953:43 | getMapValueDefault(...) | provenance | MaD:2 |
 | Test.java:5953:39:5953:41 | out : HttpHeaders [<element>, <map.value>] : Object | Test.java:79:19:79:32 | it : HttpHeaders [<element>, <map.value>] : Object | provenance |  |
-| Test.java:5953:39:5953:41 | out : HttpHeaders [<element>, <map.value>] : Object | Test.java:5953:28:5953:42 | getElement(...) : Entry [<map.value>] : Object | provenance | MaD:492 |
+| Test.java:5953:39:5953:41 | out : HttpHeaders [<element>, <map.value>] : Object | Test.java:5953:28:5953:42 | getElement(...) : Entry [<map.value>] : Object | provenance | MaD:495 |
 | Test.java:5958:16:5958:31 | (...)... : String | Test.java:5959:12:5959:13 | in : String | provenance |  |
 | Test.java:5958:24:5958:31 | source(...) : Object | Test.java:5958:16:5958:31 | (...)... : String | provenance |  |
 | Test.java:5959:4:5959:6 | out [post update] : HttpHeaders [<element>, <map.key>] : String | Test.java:5960:37:5960:39 | out : HttpHeaders [<element>, <map.key>] : String | provenance |  |
-| Test.java:5959:12:5959:13 | in : String | Test.java:5959:4:5959:6 | out [post update] : HttpHeaders [<element>, <map.key>] : String | provenance | MaD:264 |
-| Test.java:5960:26:5960:40 | getElement(...) : Entry [<map.key>] : String | Test.java:5960:9:5960:41 | getMapKeyDefault(...) | provenance | MaD:499 |
+| Test.java:5959:12:5959:13 | in : String | Test.java:5959:4:5959:6 | out [post update] : HttpHeaders [<element>, <map.key>] : String | provenance | MaD:359 |
+| Test.java:5960:26:5960:40 | getElement(...) : Entry [<map.key>] : String | Test.java:5960:9:5960:41 | getMapKeyDefault(...) | provenance | MaD:1 |
 | Test.java:5960:37:5960:39 | out : HttpHeaders [<element>, <map.key>] : String | Test.java:79:19:79:32 | it : HttpHeaders [<element>, <map.key>] : String | provenance |  |
-| Test.java:5960:37:5960:39 | out : HttpHeaders [<element>, <map.key>] : String | Test.java:5960:26:5960:40 | getElement(...) : Entry [<map.key>] : String | provenance | MaD:492 |
+| Test.java:5960:37:5960:39 | out : HttpHeaders [<element>, <map.key>] : String | Test.java:5960:26:5960:40 | getElement(...) : Entry [<map.key>] : String | provenance | MaD:495 |
 | Test.java:5965:18:5965:44 | (...)... : List [<element>] : Object | Test.java:5966:26:5966:27 | in : List [<element>] : Object | provenance |  |
 | Test.java:5965:28:5965:44 | of(...) : List [<element>] : Object | Test.java:5965:18:5965:44 | (...)... : List [<element>] : Object | provenance |  |
-| Test.java:5965:36:5965:43 | source(...) : Object | Test.java:5965:28:5965:44 | of(...) : List [<element>] : Object | provenance | MaD:494 |
+| Test.java:5965:36:5965:43 | source(...) : Object | Test.java:5965:28:5965:44 | of(...) : List [<element>] : Object | provenance | MaD:497 |
 | Test.java:5966:4:5966:6 | out [post update] : HttpHeaders [<element>, <map.value>] : Object | Test.java:5967:39:5967:41 | out : HttpHeaders [<element>, <map.value>] : Object | provenance |  |
-| Test.java:5966:26:5966:27 | in : List [<element>] : Object | Test.java:5966:4:5966:6 | out [post update] : HttpHeaders [<element>, <map.value>] : Object | provenance | MaD:265 |
-| Test.java:5967:28:5967:42 | getElement(...) : Entry [<map.value>] : Object | Test.java:5967:9:5967:43 | getMapValueDefault(...) | provenance | MaD:498 |
+| Test.java:5966:26:5966:27 | in : List [<element>] : Object | Test.java:5966:4:5966:6 | out [post update] : HttpHeaders [<element>, <map.value>] : Object | provenance | MaD:360 |
+| Test.java:5967:28:5967:42 | getElement(...) : Entry [<map.value>] : Object | Test.java:5967:9:5967:43 | getMapValueDefault(...) | provenance | MaD:2 |
 | Test.java:5967:39:5967:41 | out : HttpHeaders [<element>, <map.value>] : Object | Test.java:79:19:79:32 | it : HttpHeaders [<element>, <map.value>] : Object | provenance |  |
-| Test.java:5967:39:5967:41 | out : HttpHeaders [<element>, <map.value>] : Object | Test.java:5967:28:5967:42 | getElement(...) : Entry [<map.value>] : Object | provenance | MaD:492 |
+| Test.java:5967:39:5967:41 | out : HttpHeaders [<element>, <map.value>] : Object | Test.java:5967:28:5967:42 | getElement(...) : Entry [<map.value>] : Object | provenance | MaD:495 |
 | Test.java:5972:16:5972:31 | (...)... : String | Test.java:5973:12:5973:13 | in : String | provenance |  |
 | Test.java:5972:24:5972:31 | source(...) : Object | Test.java:5972:16:5972:31 | (...)... : String | provenance |  |
 | Test.java:5973:4:5973:6 | out [post update] : HttpHeaders [<element>, <map.key>] : String | Test.java:5974:37:5974:39 | out : HttpHeaders [<element>, <map.key>] : String | provenance |  |
-| Test.java:5973:12:5973:13 | in : String | Test.java:5973:4:5973:6 | out [post update] : HttpHeaders [<element>, <map.key>] : String | provenance | MaD:266 |
-| Test.java:5974:26:5974:40 | getElement(...) : Entry [<map.key>] : String | Test.java:5974:9:5974:41 | getMapKeyDefault(...) | provenance | MaD:499 |
+| Test.java:5973:12:5973:13 | in : String | Test.java:5973:4:5973:6 | out [post update] : HttpHeaders [<element>, <map.key>] : String | provenance | MaD:361 |
+| Test.java:5974:26:5974:40 | getElement(...) : Entry [<map.key>] : String | Test.java:5974:9:5974:41 | getMapKeyDefault(...) | provenance | MaD:1 |
 | Test.java:5974:37:5974:39 | out : HttpHeaders [<element>, <map.key>] : String | Test.java:79:19:79:32 | it : HttpHeaders [<element>, <map.key>] : String | provenance |  |
-| Test.java:5974:37:5974:39 | out : HttpHeaders [<element>, <map.key>] : String | Test.java:5974:26:5974:40 | getElement(...) : Entry [<map.key>] : String | provenance | MaD:492 |
+| Test.java:5974:37:5974:39 | out : HttpHeaders [<element>, <map.key>] : String | Test.java:5974:26:5974:40 | getElement(...) : Entry [<map.key>] : String | provenance | MaD:495 |
 | Test.java:5979:16:5979:31 | (...)... : Object | Test.java:5980:26:5980:27 | in : Object | provenance |  |
 | Test.java:5979:24:5979:31 | source(...) : Object | Test.java:5979:16:5979:31 | (...)... : Object | provenance |  |
 | Test.java:5980:4:5980:6 | out [post update] : HttpHeaders [<element>, <map.value>] : Object | Test.java:5981:39:5981:41 | out : HttpHeaders [<element>, <map.value>] : Object | provenance |  |
-| Test.java:5980:26:5980:27 | in : Object | Test.java:5980:4:5980:6 | out [post update] : HttpHeaders [<element>, <map.value>] : Object | provenance | MaD:267 |
-| Test.java:5981:28:5981:42 | getElement(...) : Entry [<map.value>] : Object | Test.java:5981:9:5981:43 | getMapValueDefault(...) | provenance | MaD:498 |
+| Test.java:5980:26:5980:27 | in : Object | Test.java:5980:4:5980:6 | out [post update] : HttpHeaders [<element>, <map.value>] : Object | provenance | MaD:362 |
+| Test.java:5981:28:5981:42 | getElement(...) : Entry [<map.value>] : Object | Test.java:5981:9:5981:43 | getMapValueDefault(...) | provenance | MaD:2 |
 | Test.java:5981:39:5981:41 | out : HttpHeaders [<element>, <map.value>] : Object | Test.java:79:19:79:32 | it : HttpHeaders [<element>, <map.value>] : Object | provenance |  |
-| Test.java:5981:39:5981:41 | out : HttpHeaders [<element>, <map.value>] : Object | Test.java:5981:28:5981:42 | getElement(...) : Entry [<map.value>] : Object | provenance | MaD:492 |
+| Test.java:5981:39:5981:41 | out : HttpHeaders [<element>, <map.value>] : Object | Test.java:5981:28:5981:42 | getElement(...) : Entry [<map.value>] : Object | provenance | MaD:495 |
 | Test.java:5986:21:5986:41 | (...)... : HttpHeaders | Test.java:5987:10:5987:11 | in : HttpHeaders | provenance |  |
 | Test.java:5986:34:5986:41 | source(...) : Object | Test.java:5986:21:5986:41 | (...)... : HttpHeaders | provenance |  |
-| Test.java:5987:10:5987:11 | in : HttpHeaders | Test.java:5987:10:5987:51 | set(...) : HttpHeaders | provenance | MaD:259 |
+| Test.java:5987:10:5987:11 | in : HttpHeaders | Test.java:5987:10:5987:51 | set(...) : HttpHeaders | provenance | MaD:363 |
 | Test.java:5987:10:5987:51 | set(...) : HttpHeaders | Test.java:5988:9:5988:11 | out | provenance |  |
 | Test.java:5993:21:5993:41 | (...)... : HttpHeaders | Test.java:5994:10:5994:11 | in : HttpHeaders | provenance |  |
 | Test.java:5993:34:5993:41 | source(...) : Object | Test.java:5993:21:5993:41 | (...)... : HttpHeaders | provenance |  |
-| Test.java:5994:10:5994:11 | in : HttpHeaders | Test.java:5994:10:5994:49 | set(...) : HttpHeaders | provenance | MaD:259 |
+| Test.java:5994:10:5994:11 | in : HttpHeaders | Test.java:5994:10:5994:49 | set(...) : HttpHeaders | provenance | MaD:363 |
 | Test.java:5994:10:5994:49 | set(...) : HttpHeaders | Test.java:5995:9:5995:11 | out | provenance |  |
 | Test.java:6000:21:6000:41 | (...)... : HttpHeaders | Test.java:6001:10:6001:11 | in : HttpHeaders | provenance |  |
 | Test.java:6000:34:6000:41 | source(...) : Object | Test.java:6000:21:6000:41 | (...)... : HttpHeaders | provenance |  |
-| Test.java:6001:10:6001:11 | in : HttpHeaders | Test.java:6001:10:6001:45 | set(...) : HttpHeaders | provenance | MaD:259 |
+| Test.java:6001:10:6001:11 | in : HttpHeaders | Test.java:6001:10:6001:45 | set(...) : HttpHeaders | provenance | MaD:363 |
 | Test.java:6001:10:6001:45 | set(...) : HttpHeaders | Test.java:6002:9:6002:11 | out | provenance |  |
 | Test.java:6007:21:6007:41 | (...)... : HttpHeaders | Test.java:6008:10:6008:11 | in : HttpHeaders | provenance |  |
 | Test.java:6007:34:6007:41 | source(...) : Object | Test.java:6007:21:6007:41 | (...)... : HttpHeaders | provenance |  |
-| Test.java:6008:10:6008:11 | in : HttpHeaders | Test.java:6008:10:6008:43 | set(...) : HttpHeaders | provenance | MaD:259 |
+| Test.java:6008:10:6008:11 | in : HttpHeaders | Test.java:6008:10:6008:43 | set(...) : HttpHeaders | provenance | MaD:363 |
 | Test.java:6008:10:6008:43 | set(...) : HttpHeaders | Test.java:6009:9:6009:11 | out | provenance |  |
 | Test.java:6014:21:6014:41 | (...)... : HttpHeaders | Test.java:6015:10:6015:11 | in : HttpHeaders | provenance |  |
 | Test.java:6014:34:6014:41 | source(...) : Object | Test.java:6014:21:6014:41 | (...)... : HttpHeaders | provenance |  |
-| Test.java:6015:10:6015:11 | in : HttpHeaders | Test.java:6015:10:6015:21 | set(...) : HttpHeaders | provenance | MaD:259 |
+| Test.java:6015:10:6015:11 | in : HttpHeaders | Test.java:6015:10:6015:21 | set(...) : HttpHeaders | provenance | MaD:363 |
 | Test.java:6015:10:6015:21 | set(...) : HttpHeaders | Test.java:6016:9:6016:11 | out | provenance |  |
 | Test.java:6021:21:6021:41 | (...)... : HttpHeaders | Test.java:6022:10:6022:11 | in : HttpHeaders | provenance |  |
 | Test.java:6021:34:6021:41 | source(...) : Object | Test.java:6021:21:6021:41 | (...)... : HttpHeaders | provenance |  |
-| Test.java:6022:10:6022:11 | in : HttpHeaders | Test.java:6022:10:6022:24 | setAll(...) : HttpHeaders | provenance | MaD:270 |
+| Test.java:6022:10:6022:11 | in : HttpHeaders | Test.java:6022:10:6022:24 | setAll(...) : HttpHeaders | provenance | MaD:366 |
 | Test.java:6022:10:6022:24 | setAll(...) : HttpHeaders | Test.java:6023:9:6023:11 | out | provenance |  |
 | Test.java:6028:21:6028:86 | (...)... : HttpHeaders [<element>, <map.key>] : Object | Test.java:6029:15:6029:16 | in : HttpHeaders [<element>, <map.key>] : Object | provenance |  |
 | Test.java:6028:34:6028:86 | newWithElementDefault(...) : Object [<element>, <map.key>] : Object | Test.java:6028:21:6028:86 | (...)... : HttpHeaders [<element>, <map.key>] : Object | provenance |  |
-| Test.java:6028:56:6028:85 | newWithMapKeyDefault(...) : Object [<map.key>] : Object | Test.java:6028:34:6028:86 | newWithElementDefault(...) : Object [<element>, <map.key>] : Object | provenance | MaD:497 |
-| Test.java:6028:77:6028:84 | source(...) : Object | Test.java:6028:56:6028:85 | newWithMapKeyDefault(...) : Object [<map.key>] : Object | provenance | MaD:496 |
+| Test.java:6028:56:6028:85 | newWithMapKeyDefault(...) : Object [<map.key>] : Object | Test.java:6028:34:6028:86 | newWithElementDefault(...) : Object [<element>, <map.key>] : Object | provenance | MaD:3 |
+| Test.java:6028:77:6028:84 | source(...) : Object | Test.java:6028:56:6028:85 | newWithMapKeyDefault(...) : Object [<map.key>] : Object | provenance | MaD:4 |
 | Test.java:6029:4:6029:6 | out [post update] : HttpHeaders [<element>, <map.key>] : Object | Test.java:6030:37:6030:39 | out : HttpHeaders [<element>, <map.key>] : Object | provenance |  |
-| Test.java:6029:15:6029:16 | in : HttpHeaders [<element>, <map.key>] : Object | Test.java:6029:4:6029:6 | out [post update] : HttpHeaders [<element>, <map.key>] : Object | provenance | MaD:271 |
-| Test.java:6030:26:6030:40 | getElement(...) : Entry [<map.key>] : Object | Test.java:6030:9:6030:41 | getMapKeyDefault(...) | provenance | MaD:499 |
+| Test.java:6029:15:6029:16 | in : HttpHeaders [<element>, <map.key>] : Object | Test.java:6029:4:6029:6 | out [post update] : HttpHeaders [<element>, <map.key>] : Object | provenance | MaD:364 |
+| Test.java:6030:26:6030:40 | getElement(...) : Entry [<map.key>] : Object | Test.java:6030:9:6030:41 | getMapKeyDefault(...) | provenance | MaD:1 |
 | Test.java:6030:37:6030:39 | out : HttpHeaders [<element>, <map.key>] : Object | Test.java:79:19:79:32 | it : HttpHeaders [<element>, <map.key>] : Object | provenance |  |
-| Test.java:6030:37:6030:39 | out : HttpHeaders [<element>, <map.key>] : Object | Test.java:6030:26:6030:40 | getElement(...) : Entry [<map.key>] : Object | provenance | MaD:492 |
+| Test.java:6030:37:6030:39 | out : HttpHeaders [<element>, <map.key>] : Object | Test.java:6030:26:6030:40 | getElement(...) : Entry [<map.key>] : Object | provenance | MaD:495 |
 | Test.java:6035:21:6035:88 | (...)... : HttpHeaders [<element>, <map.value>] : Object | Test.java:6036:15:6036:16 | in : HttpHeaders [<element>, <map.value>] : Object | provenance |  |
 | Test.java:6035:34:6035:88 | newWithElementDefault(...) : Object [<element>, <map.value>] : Object | Test.java:6035:21:6035:88 | (...)... : HttpHeaders [<element>, <map.value>] : Object | provenance |  |
-| Test.java:6035:56:6035:87 | newWithMapValueDefault(...) : Object [<map.value>] : Object | Test.java:6035:34:6035:88 | newWithElementDefault(...) : Object [<element>, <map.value>] : Object | provenance | MaD:497 |
-| Test.java:6035:79:6035:86 | source(...) : Object | Test.java:6035:56:6035:87 | newWithMapValueDefault(...) : Object [<map.value>] : Object | provenance | MaD:495 |
+| Test.java:6035:56:6035:87 | newWithMapValueDefault(...) : Object [<map.value>] : Object | Test.java:6035:34:6035:88 | newWithElementDefault(...) : Object [<element>, <map.value>] : Object | provenance | MaD:3 |
+| Test.java:6035:79:6035:86 | source(...) : Object | Test.java:6035:56:6035:87 | newWithMapValueDefault(...) : Object [<map.value>] : Object | provenance | MaD:5 |
 | Test.java:6036:4:6036:6 | out [post update] : HttpHeaders [<element>, <map.value>] : Object | Test.java:6037:39:6037:41 | out : HttpHeaders [<element>, <map.value>] : Object | provenance |  |
-| Test.java:6036:15:6036:16 | in : HttpHeaders [<element>, <map.value>] : Object | Test.java:6036:4:6036:6 | out [post update] : HttpHeaders [<element>, <map.value>] : Object | provenance | MaD:272 |
-| Test.java:6037:28:6037:42 | getElement(...) : Entry [<map.value>] : Object | Test.java:6037:9:6037:43 | getMapValueDefault(...) | provenance | MaD:498 |
+| Test.java:6036:15:6036:16 | in : HttpHeaders [<element>, <map.value>] : Object | Test.java:6036:4:6036:6 | out [post update] : HttpHeaders [<element>, <map.value>] : Object | provenance | MaD:365 |
+| Test.java:6037:28:6037:42 | getElement(...) : Entry [<map.value>] : Object | Test.java:6037:9:6037:43 | getMapValueDefault(...) | provenance | MaD:2 |
 | Test.java:6037:39:6037:41 | out : HttpHeaders [<element>, <map.value>] : Object | Test.java:79:19:79:32 | it : HttpHeaders [<element>, <map.value>] : Object | provenance |  |
-| Test.java:6037:39:6037:41 | out : HttpHeaders [<element>, <map.value>] : Object | Test.java:6037:28:6037:42 | getElement(...) : Entry [<map.value>] : Object | provenance | MaD:492 |
+| Test.java:6037:39:6037:41 | out : HttpHeaders [<element>, <map.value>] : Object | Test.java:6037:28:6037:42 | getElement(...) : Entry [<map.value>] : Object | provenance | MaD:495 |
 | Test.java:6042:21:6042:41 | (...)... : HttpHeaders | Test.java:6043:10:6043:11 | in : HttpHeaders | provenance |  |
 | Test.java:6042:34:6042:41 | source(...) : Object | Test.java:6042:21:6042:41 | (...)... : HttpHeaders | provenance |  |
-| Test.java:6043:10:6043:11 | in : HttpHeaders | Test.java:6043:10:6043:27 | setInt(...) : HttpHeaders | provenance | MaD:273 |
+| Test.java:6043:10:6043:11 | in : HttpHeaders | Test.java:6043:10:6043:27 | setInt(...) : HttpHeaders | provenance | MaD:368 |
 | Test.java:6043:10:6043:27 | setInt(...) : HttpHeaders | Test.java:6044:9:6044:11 | out | provenance |  |
 | Test.java:6049:22:6049:43 | (...)... : CharSequence | Test.java:6050:15:6050:16 | in : CharSequence | provenance |  |
 | Test.java:6049:36:6049:43 | source(...) : Object | Test.java:6049:22:6049:43 | (...)... : CharSequence | provenance |  |
 | Test.java:6050:4:6050:6 | out [post update] : HttpHeaders [<element>, <map.key>] : CharSequence | Test.java:6051:37:6051:39 | out : HttpHeaders [<element>, <map.key>] : CharSequence | provenance |  |
-| Test.java:6050:15:6050:16 | in : CharSequence | Test.java:6050:4:6050:6 | out [post update] : HttpHeaders [<element>, <map.key>] : CharSequence | provenance | MaD:274 |
-| Test.java:6051:26:6051:40 | getElement(...) : Entry [<map.key>] : CharSequence | Test.java:6051:9:6051:41 | getMapKeyDefault(...) | provenance | MaD:499 |
+| Test.java:6050:15:6050:16 | in : CharSequence | Test.java:6050:4:6050:6 | out [post update] : HttpHeaders [<element>, <map.key>] : CharSequence | provenance | MaD:367 |
+| Test.java:6051:26:6051:40 | getElement(...) : Entry [<map.key>] : CharSequence | Test.java:6051:9:6051:41 | getMapKeyDefault(...) | provenance | MaD:1 |
 | Test.java:6051:37:6051:39 | out : HttpHeaders [<element>, <map.key>] : CharSequence | Test.java:79:19:79:32 | it : HttpHeaders [<element>, <map.key>] : CharSequence | provenance |  |
-| Test.java:6051:37:6051:39 | out : HttpHeaders [<element>, <map.key>] : CharSequence | Test.java:6051:26:6051:40 | getElement(...) : Entry [<map.key>] : CharSequence | provenance | MaD:492 |
+| Test.java:6051:37:6051:39 | out : HttpHeaders [<element>, <map.key>] : CharSequence | Test.java:6051:26:6051:40 | getElement(...) : Entry [<map.key>] : CharSequence | provenance | MaD:495 |
 | Test.java:6056:21:6056:41 | (...)... : HttpHeaders | Test.java:6057:10:6057:11 | in : HttpHeaders | provenance |  |
 | Test.java:6056:34:6056:41 | source(...) : Object | Test.java:6056:21:6056:41 | (...)... : HttpHeaders | provenance |  |
-| Test.java:6057:10:6057:11 | in : HttpHeaders | Test.java:6057:10:6057:36 | setShort(...) : HttpHeaders | provenance | MaD:275 |
+| Test.java:6057:10:6057:11 | in : HttpHeaders | Test.java:6057:10:6057:36 | setShort(...) : HttpHeaders | provenance | MaD:370 |
 | Test.java:6057:10:6057:36 | setShort(...) : HttpHeaders | Test.java:6058:9:6058:11 | out | provenance |  |
 | Test.java:6063:22:6063:43 | (...)... : CharSequence | Test.java:6064:17:6064:18 | in : CharSequence | provenance |  |
 | Test.java:6063:36:6063:43 | source(...) : Object | Test.java:6063:22:6063:43 | (...)... : CharSequence | provenance |  |
 | Test.java:6064:4:6064:6 | out [post update] : HttpHeaders [<element>, <map.key>] : CharSequence | Test.java:6065:37:6065:39 | out : HttpHeaders [<element>, <map.key>] : CharSequence | provenance |  |
-| Test.java:6064:17:6064:18 | in : CharSequence | Test.java:6064:4:6064:6 | out [post update] : HttpHeaders [<element>, <map.key>] : CharSequence | provenance | MaD:276 |
-| Test.java:6065:26:6065:40 | getElement(...) : Entry [<map.key>] : CharSequence | Test.java:6065:9:6065:41 | getMapKeyDefault(...) | provenance | MaD:499 |
+| Test.java:6064:17:6064:18 | in : CharSequence | Test.java:6064:4:6064:6 | out [post update] : HttpHeaders [<element>, <map.key>] : CharSequence | provenance | MaD:369 |
+| Test.java:6065:26:6065:40 | getElement(...) : Entry [<map.key>] : CharSequence | Test.java:6065:9:6065:41 | getMapKeyDefault(...) | provenance | MaD:1 |
 | Test.java:6065:37:6065:39 | out : HttpHeaders [<element>, <map.key>] : CharSequence | Test.java:79:19:79:32 | it : HttpHeaders [<element>, <map.key>] : CharSequence | provenance |  |
-| Test.java:6065:37:6065:39 | out : HttpHeaders [<element>, <map.key>] : CharSequence | Test.java:6065:26:6065:40 | getElement(...) : Entry [<map.key>] : CharSequence | provenance | MaD:492 |
+| Test.java:6065:37:6065:39 | out : HttpHeaders [<element>, <map.key>] : CharSequence | Test.java:6065:26:6065:40 | getElement(...) : Entry [<map.key>] : CharSequence | provenance | MaD:495 |
 | Test.java:6070:21:6070:86 | (...)... : HttpHeaders [<element>, <map.key>] : Object | Test.java:6071:10:6071:11 | in : HttpHeaders [<element>, <map.key>] : Object | provenance |  |
 | Test.java:6070:34:6070:86 | newWithElementDefault(...) : Object [<element>, <map.key>] : Object | Test.java:6070:21:6070:86 | (...)... : HttpHeaders [<element>, <map.key>] : Object | provenance |  |
-| Test.java:6070:56:6070:85 | newWithMapKeyDefault(...) : Object [<map.key>] : Object | Test.java:6070:34:6070:86 | newWithElementDefault(...) : Object [<element>, <map.key>] : Object | provenance | MaD:497 |
-| Test.java:6070:77:6070:84 | source(...) : Object | Test.java:6070:56:6070:85 | newWithMapKeyDefault(...) : Object [<map.key>] : Object | provenance | MaD:496 |
-| Test.java:6071:10:6071:11 | in : HttpHeaders [<element>, <map.key>] : Object | Test.java:6071:10:6071:22 | toString(...) : String | provenance | MaD:279 |
+| Test.java:6070:56:6070:85 | newWithMapKeyDefault(...) : Object [<map.key>] : Object | Test.java:6070:34:6070:86 | newWithElementDefault(...) : Object [<element>, <map.key>] : Object | provenance | MaD:3 |
+| Test.java:6070:77:6070:84 | source(...) : Object | Test.java:6070:56:6070:85 | newWithMapKeyDefault(...) : Object [<map.key>] : Object | provenance | MaD:4 |
+| Test.java:6071:10:6071:11 | in : HttpHeaders [<element>, <map.key>] : Object | Test.java:6071:10:6071:22 | toString(...) : String | provenance | MaD:371 |
 | Test.java:6071:10:6071:22 | toString(...) : String | Test.java:6072:9:6072:11 | out | provenance |  |
 | Test.java:6077:21:6077:88 | (...)... : HttpHeaders [<element>, <map.value>] : Object | Test.java:6078:10:6078:11 | in : HttpHeaders [<element>, <map.value>] : Object | provenance |  |
 | Test.java:6077:34:6077:88 | newWithElementDefault(...) : Object [<element>, <map.value>] : Object | Test.java:6077:21:6077:88 | (...)... : HttpHeaders [<element>, <map.value>] : Object | provenance |  |
-| Test.java:6077:56:6077:87 | newWithMapValueDefault(...) : Object [<map.value>] : Object | Test.java:6077:34:6077:88 | newWithElementDefault(...) : Object [<element>, <map.value>] : Object | provenance | MaD:497 |
-| Test.java:6077:79:6077:86 | source(...) : Object | Test.java:6077:56:6077:87 | newWithMapValueDefault(...) : Object [<map.value>] : Object | provenance | MaD:495 |
-| Test.java:6078:10:6078:11 | in : HttpHeaders [<element>, <map.value>] : Object | Test.java:6078:10:6078:22 | toString(...) : String | provenance | MaD:280 |
+| Test.java:6077:56:6077:87 | newWithMapValueDefault(...) : Object [<map.value>] : Object | Test.java:6077:34:6077:88 | newWithElementDefault(...) : Object [<element>, <map.value>] : Object | provenance | MaD:3 |
+| Test.java:6077:79:6077:86 | source(...) : Object | Test.java:6077:56:6077:87 | newWithMapValueDefault(...) : Object [<map.value>] : Object | provenance | MaD:5 |
+| Test.java:6078:10:6078:11 | in : HttpHeaders [<element>, <map.value>] : Object | Test.java:6078:10:6078:22 | toString(...) : String | provenance | MaD:372 |
 | Test.java:6078:10:6078:22 | toString(...) : String | Test.java:6079:9:6079:11 | out | provenance |  |
 | Test.java:6084:21:6084:88 | (...)... : HttpHeaders [<element>, <map.value>] : Object | Test.java:6085:10:6085:11 | in : HttpHeaders [<element>, <map.value>] : Object | provenance |  |
 | Test.java:6084:34:6084:88 | newWithElementDefault(...) : Object [<element>, <map.value>] : Object | Test.java:6084:21:6084:88 | (...)... : HttpHeaders [<element>, <map.value>] : Object | provenance |  |
-| Test.java:6084:56:6084:87 | newWithMapValueDefault(...) : Object [<map.value>] : Object | Test.java:6084:34:6084:88 | newWithElementDefault(...) : Object [<element>, <map.value>] : Object | provenance | MaD:497 |
-| Test.java:6084:79:6084:86 | source(...) : Object | Test.java:6084:56:6084:87 | newWithMapValueDefault(...) : Object [<map.value>] : Object | provenance | MaD:495 |
-| Test.java:6085:10:6085:11 | in : HttpHeaders [<element>, <map.value>] : Object | Test.java:6085:10:6085:43 | valueCharSequenceIterator(...) : Iterator [<element>] : Object | provenance | MaD:278 |
+| Test.java:6084:56:6084:87 | newWithMapValueDefault(...) : Object [<map.value>] : Object | Test.java:6084:34:6084:88 | newWithElementDefault(...) : Object [<element>, <map.value>] : Object | provenance | MaD:3 |
+| Test.java:6084:79:6084:86 | source(...) : Object | Test.java:6084:56:6084:87 | newWithMapValueDefault(...) : Object [<map.value>] : Object | provenance | MaD:5 |
+| Test.java:6085:10:6085:11 | in : HttpHeaders [<element>, <map.value>] : Object | Test.java:6085:10:6085:43 | valueCharSequenceIterator(...) : Iterator [<element>] : Object | provenance | MaD:373 |
 | Test.java:6085:10:6085:43 | valueCharSequenceIterator(...) : Iterator [<element>] : Object | Test.java:6086:20:6086:22 | out : Iterator [<element>] : Object | provenance |  |
 | Test.java:6086:20:6086:22 | out : Iterator [<element>] : Object | Test.java:80:19:80:32 | it : Iterator [<element>] : Object | provenance |  |
-| Test.java:6086:20:6086:22 | out : Iterator [<element>] : Object | Test.java:6086:9:6086:23 | getElement(...) | provenance | MaD:493 |
+| Test.java:6086:20:6086:22 | out : Iterator [<element>] : Object | Test.java:6086:9:6086:23 | getElement(...) | provenance | MaD:496 |
 | Test.java:6091:21:6091:88 | (...)... : HttpHeaders [<element>, <map.value>] : Object | Test.java:6092:10:6092:11 | in : HttpHeaders [<element>, <map.value>] : Object | provenance |  |
 | Test.java:6091:34:6091:88 | newWithElementDefault(...) : Object [<element>, <map.value>] : Object | Test.java:6091:21:6091:88 | (...)... : HttpHeaders [<element>, <map.value>] : Object | provenance |  |
-| Test.java:6091:56:6091:87 | newWithMapValueDefault(...) : Object [<map.value>] : Object | Test.java:6091:34:6091:88 | newWithElementDefault(...) : Object [<element>, <map.value>] : Object | provenance | MaD:497 |
-| Test.java:6091:79:6091:86 | source(...) : Object | Test.java:6091:56:6091:87 | newWithMapValueDefault(...) : Object [<map.value>] : Object | provenance | MaD:495 |
-| Test.java:6092:10:6092:11 | in : HttpHeaders [<element>, <map.value>] : Object | Test.java:6092:10:6092:37 | valueStringIterator(...) : Iterator [<element>] : Object | provenance | MaD:277 |
+| Test.java:6091:56:6091:87 | newWithMapValueDefault(...) : Object [<map.value>] : Object | Test.java:6091:34:6091:88 | newWithElementDefault(...) : Object [<element>, <map.value>] : Object | provenance | MaD:3 |
+| Test.java:6091:79:6091:86 | source(...) : Object | Test.java:6091:56:6091:87 | newWithMapValueDefault(...) : Object [<map.value>] : Object | provenance | MaD:5 |
+| Test.java:6092:10:6092:11 | in : HttpHeaders [<element>, <map.value>] : Object | Test.java:6092:10:6092:37 | valueStringIterator(...) : Iterator [<element>] : Object | provenance | MaD:374 |
 | Test.java:6092:10:6092:37 | valueStringIterator(...) : Iterator [<element>] : Object | Test.java:6093:20:6093:22 | out : Iterator [<element>] : Object | provenance |  |
 | Test.java:6093:20:6093:22 | out : Iterator [<element>] : Object | Test.java:80:19:80:32 | it : Iterator [<element>] : Object | provenance |  |
-| Test.java:6093:20:6093:22 | out : Iterator [<element>] : Object | Test.java:6093:9:6093:23 | getElement(...) | provenance | MaD:493 |
+| Test.java:6093:20:6093:22 | out : Iterator [<element>] : Object | Test.java:6093:9:6093:23 | getElement(...) | provenance | MaD:496 |
 | Test.java:6098:21:6098:41 | (...)... : HttpMessage | Test.java:6099:10:6099:11 | in : HttpMessage | provenance |  |
 | Test.java:6098:34:6098:41 | source(...) : Object | Test.java:6098:21:6098:41 | (...)... : HttpMessage | provenance |  |
-| Test.java:6099:10:6099:11 | in : HttpMessage | Test.java:6099:10:6099:21 | headers(...) : HttpHeaders | provenance | MaD:281 |
+| Test.java:6099:10:6099:11 | in : HttpMessage | Test.java:6099:10:6099:21 | headers(...) : HttpHeaders | provenance | MaD:375 |
 | Test.java:6099:10:6099:21 | headers(...) : HttpHeaders | Test.java:6100:9:6100:11 | out | provenance |  |
 | Test.java:6105:21:6105:41 | (...)... : HttpRequest | Test.java:6106:10:6106:11 | in : HttpRequest | provenance |  |
 | Test.java:6105:34:6105:41 | source(...) : Object | Test.java:6105:21:6105:41 | (...)... : HttpRequest | provenance |  |
-| Test.java:6106:10:6106:11 | in : HttpRequest | Test.java:6106:10:6106:20 | getUri(...) : String | provenance | MaD:283 |
+| Test.java:6106:10:6106:11 | in : HttpRequest | Test.java:6106:10:6106:20 | getUri(...) : String | provenance | MaD:376 |
 | Test.java:6106:10:6106:20 | getUri(...) : String | Test.java:6107:9:6107:11 | out | provenance |  |
 | Test.java:6112:21:6112:41 | (...)... : HttpRequest | Test.java:6113:10:6113:11 | in : HttpRequest | provenance |  |
 | Test.java:6112:34:6112:41 | source(...) : Object | Test.java:6112:21:6112:41 | (...)... : HttpRequest | provenance |  |
-| Test.java:6113:10:6113:11 | in : HttpRequest | Test.java:6113:10:6113:17 | uri(...) : String | provenance | MaD:284 |
+| Test.java:6113:10:6113:11 | in : HttpRequest | Test.java:6113:10:6113:17 | uri(...) : String | provenance | MaD:377 |
 | Test.java:6113:10:6113:17 | uri(...) : String | Test.java:6114:9:6114:11 | out | provenance |  |
 | Test.java:6119:25:6119:49 | (...)... : LastHttpContent | Test.java:6120:10:6120:11 | in : LastHttpContent | provenance |  |
 | Test.java:6119:42:6119:49 | source(...) : Object | Test.java:6119:25:6119:49 | (...)... : LastHttpContent | provenance |  |
-| Test.java:6120:10:6120:11 | in : LastHttpContent | Test.java:6120:10:6120:29 | trailingHeaders(...) : HttpHeaders | provenance | MaD:282 |
+| Test.java:6120:10:6120:11 | in : LastHttpContent | Test.java:6120:10:6120:29 | trailingHeaders(...) : HttpHeaders | provenance | MaD:378 |
 | Test.java:6120:10:6120:29 | trailingHeaders(...) : HttpHeaders | Test.java:6121:9:6121:11 | out | provenance |  |
 | Test.java:6126:16:6126:31 | (...)... : String | Test.java:6127:33:6127:34 | in : String | provenance |  |
 | Test.java:6126:24:6126:31 | source(...) : Object | Test.java:6126:16:6126:31 | (...)... : String | provenance |  |
 | Test.java:6127:10:6127:35 | new QueryStringDecoder(...) : QueryStringDecoder | Test.java:6128:9:6128:11 | out | provenance |  |
-| Test.java:6127:33:6127:34 | in : String | Test.java:6127:10:6127:35 | new QueryStringDecoder(...) : QueryStringDecoder | provenance | MaD:285 |
+| Test.java:6127:33:6127:34 | in : String | Test.java:6127:10:6127:35 | new QueryStringDecoder(...) : QueryStringDecoder | provenance | MaD:379 |
 | Test.java:6133:16:6133:31 | (...)... : String | Test.java:6134:33:6134:34 | in : String | provenance |  |
 | Test.java:6133:24:6133:31 | source(...) : Object | Test.java:6133:16:6133:31 | (...)... : String | provenance |  |
 | Test.java:6134:10:6134:50 | new QueryStringDecoder(...) : QueryStringDecoder | Test.java:6135:9:6135:11 | out | provenance |  |
-| Test.java:6134:33:6134:34 | in : String | Test.java:6134:10:6134:50 | new QueryStringDecoder(...) : QueryStringDecoder | provenance | MaD:285 |
+| Test.java:6134:33:6134:34 | in : String | Test.java:6134:10:6134:50 | new QueryStringDecoder(...) : QueryStringDecoder | provenance | MaD:379 |
 | Test.java:6140:16:6140:31 | (...)... : String | Test.java:6141:33:6141:34 | in : String | provenance |  |
 | Test.java:6140:24:6140:31 | source(...) : Object | Test.java:6140:16:6140:31 | (...)... : String | provenance |  |
 | Test.java:6141:10:6141:57 | new QueryStringDecoder(...) : QueryStringDecoder | Test.java:6142:9:6142:11 | out | provenance |  |
-| Test.java:6141:33:6141:34 | in : String | Test.java:6141:10:6141:57 | new QueryStringDecoder(...) : QueryStringDecoder | provenance | MaD:285 |
+| Test.java:6141:33:6141:34 | in : String | Test.java:6141:10:6141:57 | new QueryStringDecoder(...) : QueryStringDecoder | provenance | MaD:379 |
 | Test.java:6147:16:6147:31 | (...)... : String | Test.java:6148:33:6148:34 | in : String | provenance |  |
 | Test.java:6147:24:6147:31 | source(...) : Object | Test.java:6147:16:6147:31 | (...)... : String | provenance |  |
 | Test.java:6148:10:6148:60 | new QueryStringDecoder(...) : QueryStringDecoder | Test.java:6149:9:6149:11 | out | provenance |  |
-| Test.java:6148:33:6148:34 | in : String | Test.java:6148:10:6148:60 | new QueryStringDecoder(...) : QueryStringDecoder | provenance | MaD:285 |
+| Test.java:6148:33:6148:34 | in : String | Test.java:6148:10:6148:60 | new QueryStringDecoder(...) : QueryStringDecoder | provenance | MaD:379 |
 | Test.java:6154:16:6154:31 | (...)... : String | Test.java:6155:33:6155:34 | in : String | provenance |  |
 | Test.java:6154:24:6154:31 | source(...) : Object | Test.java:6154:16:6154:31 | (...)... : String | provenance |  |
 | Test.java:6155:10:6155:42 | new QueryStringDecoder(...) : QueryStringDecoder | Test.java:6156:9:6156:11 | out | provenance |  |
-| Test.java:6155:33:6155:34 | in : String | Test.java:6155:10:6155:42 | new QueryStringDecoder(...) : QueryStringDecoder | provenance | MaD:285 |
+| Test.java:6155:33:6155:34 | in : String | Test.java:6155:10:6155:42 | new QueryStringDecoder(...) : QueryStringDecoder | provenance | MaD:379 |
 | Test.java:6161:16:6161:31 | (...)... : String | Test.java:6162:33:6162:34 | in : String | provenance |  |
 | Test.java:6161:24:6161:31 | source(...) : Object | Test.java:6161:16:6161:31 | (...)... : String | provenance |  |
 | Test.java:6162:10:6162:58 | new QueryStringDecoder(...) : QueryStringDecoder | Test.java:6163:9:6163:11 | out | provenance |  |
-| Test.java:6162:33:6162:34 | in : String | Test.java:6162:10:6162:58 | new QueryStringDecoder(...) : QueryStringDecoder | provenance | MaD:285 |
+| Test.java:6162:33:6162:34 | in : String | Test.java:6162:10:6162:58 | new QueryStringDecoder(...) : QueryStringDecoder | provenance | MaD:379 |
 | Test.java:6168:13:6168:25 | (...)... : URI | Test.java:6169:33:6169:34 | in : URI | provenance |  |
 | Test.java:6168:18:6168:25 | source(...) : Object | Test.java:6168:13:6168:25 | (...)... : URI | provenance |  |
 | Test.java:6169:10:6169:35 | new QueryStringDecoder(...) : QueryStringDecoder | Test.java:6170:9:6170:11 | out | provenance |  |
-| Test.java:6169:33:6169:34 | in : URI | Test.java:6169:10:6169:35 | new QueryStringDecoder(...) : QueryStringDecoder | provenance | MaD:285 |
+| Test.java:6169:33:6169:34 | in : URI | Test.java:6169:10:6169:35 | new QueryStringDecoder(...) : QueryStringDecoder | provenance | MaD:379 |
 | Test.java:6175:13:6175:25 | (...)... : URI | Test.java:6176:33:6176:34 | in : URI | provenance |  |
 | Test.java:6175:18:6175:25 | source(...) : Object | Test.java:6175:13:6175:25 | (...)... : URI | provenance |  |
 | Test.java:6176:10:6176:50 | new QueryStringDecoder(...) : QueryStringDecoder | Test.java:6177:9:6177:11 | out | provenance |  |
-| Test.java:6176:33:6176:34 | in : URI | Test.java:6176:10:6176:50 | new QueryStringDecoder(...) : QueryStringDecoder | provenance | MaD:285 |
+| Test.java:6176:33:6176:34 | in : URI | Test.java:6176:10:6176:50 | new QueryStringDecoder(...) : QueryStringDecoder | provenance | MaD:379 |
 | Test.java:6182:13:6182:25 | (...)... : URI | Test.java:6183:33:6183:34 | in : URI | provenance |  |
 | Test.java:6182:18:6182:25 | source(...) : Object | Test.java:6182:13:6182:25 | (...)... : URI | provenance |  |
 | Test.java:6183:10:6183:53 | new QueryStringDecoder(...) : QueryStringDecoder | Test.java:6184:9:6184:11 | out | provenance |  |
-| Test.java:6183:33:6183:34 | in : URI | Test.java:6183:10:6183:53 | new QueryStringDecoder(...) : QueryStringDecoder | provenance | MaD:285 |
+| Test.java:6183:33:6183:34 | in : URI | Test.java:6183:10:6183:53 | new QueryStringDecoder(...) : QueryStringDecoder | provenance | MaD:379 |
 | Test.java:6189:13:6189:25 | (...)... : URI | Test.java:6190:33:6190:34 | in : URI | provenance |  |
 | Test.java:6189:18:6189:25 | source(...) : Object | Test.java:6189:13:6189:25 | (...)... : URI | provenance |  |
 | Test.java:6190:10:6190:60 | new QueryStringDecoder(...) : QueryStringDecoder | Test.java:6191:9:6191:11 | out | provenance |  |
-| Test.java:6190:33:6190:34 | in : URI | Test.java:6190:10:6190:60 | new QueryStringDecoder(...) : QueryStringDecoder | provenance | MaD:285 |
+| Test.java:6190:33:6190:34 | in : URI | Test.java:6190:10:6190:60 | new QueryStringDecoder(...) : QueryStringDecoder | provenance | MaD:379 |
 | Test.java:6196:16:6196:31 | (...)... : String | Test.java:6197:45:6197:46 | in : String | provenance |  |
 | Test.java:6196:24:6196:31 | source(...) : Object | Test.java:6196:16:6196:31 | (...)... : String | provenance |  |
 | Test.java:6197:10:6197:47 | decodeComponent(...) : String | Test.java:6198:9:6198:11 | out | provenance |  |
-| Test.java:6197:45:6197:46 | in : String | Test.java:6197:10:6197:47 | decodeComponent(...) : String | provenance | MaD:286 |
+| Test.java:6197:45:6197:46 | in : String | Test.java:6197:10:6197:47 | decodeComponent(...) : String | provenance | MaD:380 |
 | Test.java:6203:16:6203:31 | (...)... : String | Test.java:6204:45:6204:46 | in : String | provenance |  |
 | Test.java:6203:24:6203:31 | source(...) : Object | Test.java:6203:16:6203:31 | (...)... : String | provenance |  |
 | Test.java:6204:10:6204:53 | decodeComponent(...) : String | Test.java:6205:9:6205:11 | out | provenance |  |
-| Test.java:6204:45:6204:46 | in : String | Test.java:6204:10:6204:53 | decodeComponent(...) : String | provenance | MaD:286 |
+| Test.java:6204:45:6204:46 | in : String | Test.java:6204:10:6204:53 | decodeComponent(...) : String | provenance | MaD:380 |
 | Test.java:6210:28:6210:55 | (...)... : QueryStringDecoder | Test.java:6211:10:6211:11 | in : QueryStringDecoder | provenance |  |
 | Test.java:6210:48:6210:55 | source(...) : Object | Test.java:6210:28:6210:55 | (...)... : QueryStringDecoder | provenance |  |
-| Test.java:6211:10:6211:11 | in : QueryStringDecoder | Test.java:6211:10:6211:24 | parameters(...) : Map | provenance | MaD:287 |
+| Test.java:6211:10:6211:11 | in : QueryStringDecoder | Test.java:6211:10:6211:24 | parameters(...) : Map | provenance | MaD:381 |
 | Test.java:6211:10:6211:24 | parameters(...) : Map | Test.java:6212:9:6212:11 | out | provenance |  |
 | Test.java:6217:28:6217:55 | (...)... : QueryStringDecoder | Test.java:6218:10:6218:11 | in : QueryStringDecoder | provenance |  |
 | Test.java:6217:48:6217:55 | source(...) : Object | Test.java:6217:28:6217:55 | (...)... : QueryStringDecoder | provenance |  |
-| Test.java:6218:10:6218:11 | in : QueryStringDecoder | Test.java:6218:10:6218:18 | path(...) : String | provenance | MaD:288 |
+| Test.java:6218:10:6218:11 | in : QueryStringDecoder | Test.java:6218:10:6218:18 | path(...) : String | provenance | MaD:382 |
 | Test.java:6218:10:6218:18 | path(...) : String | Test.java:6219:9:6219:11 | out | provenance |  |
 | Test.java:6224:28:6224:55 | (...)... : QueryStringDecoder | Test.java:6225:10:6225:11 | in : QueryStringDecoder | provenance |  |
 | Test.java:6224:48:6224:55 | source(...) : Object | Test.java:6224:28:6224:55 | (...)... : QueryStringDecoder | provenance |  |
-| Test.java:6225:10:6225:11 | in : QueryStringDecoder | Test.java:6225:10:6225:21 | rawPath(...) : String | provenance | MaD:289 |
+| Test.java:6225:10:6225:11 | in : QueryStringDecoder | Test.java:6225:10:6225:21 | rawPath(...) : String | provenance | MaD:383 |
 | Test.java:6225:10:6225:21 | rawPath(...) : String | Test.java:6226:9:6226:11 | out | provenance |  |
 | Test.java:6231:28:6231:55 | (...)... : QueryStringDecoder | Test.java:6232:10:6232:11 | in : QueryStringDecoder | provenance |  |
 | Test.java:6231:48:6231:55 | source(...) : Object | Test.java:6231:28:6231:55 | (...)... : QueryStringDecoder | provenance |  |
-| Test.java:6232:10:6232:11 | in : QueryStringDecoder | Test.java:6232:10:6232:22 | rawQuery(...) : String | provenance | MaD:290 |
+| Test.java:6232:10:6232:11 | in : QueryStringDecoder | Test.java:6232:10:6232:22 | rawQuery(...) : String | provenance | MaD:384 |
 | Test.java:6232:10:6232:22 | rawQuery(...) : String | Test.java:6233:9:6233:11 | out | provenance |  |
 | Test.java:6238:28:6238:55 | (...)... : QueryStringDecoder | Test.java:6239:10:6239:11 | in : QueryStringDecoder | provenance |  |
 | Test.java:6238:48:6238:55 | source(...) : Object | Test.java:6238:28:6238:55 | (...)... : QueryStringDecoder | provenance |  |
-| Test.java:6239:10:6239:11 | in : QueryStringDecoder | Test.java:6239:10:6239:22 | toString(...) : String | provenance | MaD:291 |
+| Test.java:6239:10:6239:11 | in : QueryStringDecoder | Test.java:6239:10:6239:22 | toString(...) : String | provenance | MaD:385 |
 | Test.java:6239:10:6239:22 | toString(...) : String | Test.java:6240:9:6240:11 | out | provenance |  |
 | Test.java:6245:28:6245:55 | (...)... : QueryStringDecoder | Test.java:6246:10:6246:11 | in : QueryStringDecoder | provenance |  |
 | Test.java:6245:48:6245:55 | source(...) : Object | Test.java:6245:28:6245:55 | (...)... : QueryStringDecoder | provenance |  |
-| Test.java:6246:10:6246:11 | in : QueryStringDecoder | Test.java:6246:10:6246:17 | uri(...) : String | provenance | MaD:292 |
+| Test.java:6246:10:6246:11 | in : QueryStringDecoder | Test.java:6246:10:6246:17 | uri(...) : String | provenance | MaD:386 |
 | Test.java:6246:10:6246:17 | uri(...) : String | Test.java:6247:9:6247:11 | out | provenance |  |
 | Test.java:6252:17:6252:33 | (...)... : ByteBuf | Test.java:6254:34:6254:35 | in : ByteBuf | provenance |  |
 | Test.java:6252:26:6252:33 | source(...) : Object | Test.java:6252:17:6252:33 | (...)... : ByteBuf | provenance |  |
 | Test.java:6254:10:6254:42 | cumulate(...) : ByteBuf | Test.java:6255:9:6255:11 | out | provenance |  |
-| Test.java:6254:34:6254:35 | in : ByteBuf | Test.java:6254:10:6254:42 | cumulate(...) : ByteBuf | provenance | MaD:382 |
+| Test.java:6254:34:6254:35 | in : ByteBuf | Test.java:6254:10:6254:42 | cumulate(...) : ByteBuf | provenance | MaD:387 |
 | Test.java:6260:17:6260:33 | (...)... : ByteBuf | Test.java:6262:40:6262:41 | in : ByteBuf | provenance |  |
 | Test.java:6260:26:6260:33 | source(...) : Object | Test.java:6260:17:6260:33 | (...)... : ByteBuf | provenance |  |
 | Test.java:6262:10:6262:42 | cumulate(...) : ByteBuf | Test.java:6263:9:6263:11 | out | provenance |  |
-| Test.java:6262:40:6262:41 | in : ByteBuf | Test.java:6262:10:6262:42 | cumulate(...) : ByteBuf | provenance | MaD:382 |
+| Test.java:6262:40:6262:41 | in : ByteBuf | Test.java:6262:10:6262:42 | cumulate(...) : ByteBuf | provenance | MaD:387 |
 | Test.java:6268:17:6268:78 | (...)... : Headers [<element>, <map.key>] : Object | Test.java:6269:12:6269:13 | in : Headers [<element>, <map.key>] : Object | provenance |  |
 | Test.java:6268:26:6268:78 | newWithElementDefault(...) : Object [<element>, <map.key>] : Object | Test.java:6268:17:6268:78 | (...)... : Headers [<element>, <map.key>] : Object | provenance |  |
-| Test.java:6268:48:6268:77 | newWithMapKeyDefault(...) : Object [<map.key>] : Object | Test.java:6268:26:6268:78 | newWithElementDefault(...) : Object [<element>, <map.key>] : Object | provenance | MaD:497 |
-| Test.java:6268:69:6268:76 | source(...) : Object | Test.java:6268:48:6268:77 | newWithMapKeyDefault(...) : Object [<map.key>] : Object | provenance | MaD:496 |
+| Test.java:6268:48:6268:77 | newWithMapKeyDefault(...) : Object [<map.key>] : Object | Test.java:6268:26:6268:78 | newWithElementDefault(...) : Object [<element>, <map.key>] : Object | provenance | MaD:3 |
+| Test.java:6268:69:6268:76 | source(...) : Object | Test.java:6268:48:6268:77 | newWithMapKeyDefault(...) : Object [<map.key>] : Object | provenance | MaD:4 |
 | Test.java:6269:4:6269:6 | out [post update] : Headers [<element>, <map.key>] : Object | Test.java:6270:37:6270:39 | out : Headers [<element>, <map.key>] : Object | provenance |  |
-| Test.java:6269:12:6269:13 | in : Headers [<element>, <map.key>] : Object | Test.java:6269:4:6269:6 | out [post update] : Headers [<element>, <map.key>] : Object | provenance | MaD:400 |
-| Test.java:6270:26:6270:40 | getElement(...) : Object [<map.key>] : Object | Test.java:6270:9:6270:41 | getMapKeyDefault(...) | provenance | MaD:499 |
+| Test.java:6269:12:6269:13 | in : Headers [<element>, <map.key>] : Object | Test.java:6269:4:6269:6 | out [post update] : Headers [<element>, <map.key>] : Object | provenance | MaD:388 |
+| Test.java:6270:26:6270:40 | getElement(...) : Object [<map.key>] : Object | Test.java:6270:9:6270:41 | getMapKeyDefault(...) | provenance | MaD:1 |
 | Test.java:6270:37:6270:39 | out : Headers [<element>, <map.key>] : Object | Test.java:79:19:79:32 | it : Headers [<element>, <map.key>] : Object | provenance |  |
-| Test.java:6270:37:6270:39 | out : Headers [<element>, <map.key>] : Object | Test.java:6270:26:6270:40 | getElement(...) : Object [<map.key>] : Object | provenance | MaD:492 |
+| Test.java:6270:37:6270:39 | out : Headers [<element>, <map.key>] : Object | Test.java:6270:26:6270:40 | getElement(...) : Object [<map.key>] : Object | provenance | MaD:495 |
 | Test.java:6275:17:6275:80 | (...)... : Headers [<element>, <map.value>] : Object | Test.java:6276:12:6276:13 | in : Headers [<element>, <map.value>] : Object | provenance |  |
 | Test.java:6275:26:6275:80 | newWithElementDefault(...) : Object [<element>, <map.value>] : Object | Test.java:6275:17:6275:80 | (...)... : Headers [<element>, <map.value>] : Object | provenance |  |
-| Test.java:6275:48:6275:79 | newWithMapValueDefault(...) : Object [<map.value>] : Object | Test.java:6275:26:6275:80 | newWithElementDefault(...) : Object [<element>, <map.value>] : Object | provenance | MaD:497 |
-| Test.java:6275:71:6275:78 | source(...) : Object | Test.java:6275:48:6275:79 | newWithMapValueDefault(...) : Object [<map.value>] : Object | provenance | MaD:495 |
+| Test.java:6275:48:6275:79 | newWithMapValueDefault(...) : Object [<map.value>] : Object | Test.java:6275:26:6275:80 | newWithElementDefault(...) : Object [<element>, <map.value>] : Object | provenance | MaD:3 |
+| Test.java:6275:71:6275:78 | source(...) : Object | Test.java:6275:48:6275:79 | newWithMapValueDefault(...) : Object [<map.value>] : Object | provenance | MaD:5 |
 | Test.java:6276:4:6276:6 | out [post update] : Headers [<element>, <map.value>] : Object | Test.java:6277:39:6277:41 | out : Headers [<element>, <map.value>] : Object | provenance |  |
-| Test.java:6276:12:6276:13 | in : Headers [<element>, <map.value>] : Object | Test.java:6276:4:6276:6 | out [post update] : Headers [<element>, <map.value>] : Object | provenance | MaD:401 |
-| Test.java:6277:28:6277:42 | getElement(...) : Object [<map.value>] : Object | Test.java:6277:9:6277:43 | getMapValueDefault(...) | provenance | MaD:498 |
+| Test.java:6276:12:6276:13 | in : Headers [<element>, <map.value>] : Object | Test.java:6276:4:6276:6 | out [post update] : Headers [<element>, <map.value>] : Object | provenance | MaD:389 |
+| Test.java:6277:28:6277:42 | getElement(...) : Object [<map.value>] : Object | Test.java:6277:9:6277:43 | getMapValueDefault(...) | provenance | MaD:2 |
 | Test.java:6277:39:6277:41 | out : Headers [<element>, <map.value>] : Object | Test.java:79:19:79:32 | it : Headers [<element>, <map.value>] : Object | provenance |  |
-| Test.java:6277:39:6277:41 | out : Headers [<element>, <map.value>] : Object | Test.java:6277:28:6277:42 | getElement(...) : Object [<map.value>] : Object | provenance | MaD:492 |
+| Test.java:6277:39:6277:41 | out : Headers [<element>, <map.value>] : Object | Test.java:6277:28:6277:42 | getElement(...) : Object [<map.value>] : Object | provenance | MaD:495 |
 | Test.java:6282:16:6282:31 | (...)... : Object | Test.java:6283:12:6283:13 | in : Object | provenance |  |
 | Test.java:6282:24:6282:31 | source(...) : Object | Test.java:6282:16:6282:31 | (...)... : Object | provenance |  |
 | Test.java:6283:4:6283:6 | out [post update] : Headers [<element>, <map.key>] : Object | Test.java:6284:37:6284:39 | out : Headers [<element>, <map.key>] : Object | provenance |  |
-| Test.java:6283:12:6283:13 | in : Object | Test.java:6283:4:6283:6 | out [post update] : Headers [<element>, <map.key>] : Object | provenance | MaD:402 |
-| Test.java:6284:26:6284:40 | getElement(...) : Object [<map.key>] : Object | Test.java:6284:9:6284:41 | getMapKeyDefault(...) | provenance | MaD:499 |
+| Test.java:6283:12:6283:13 | in : Object | Test.java:6283:4:6283:6 | out [post update] : Headers [<element>, <map.key>] : Object | provenance | MaD:390 |
+| Test.java:6284:26:6284:40 | getElement(...) : Object [<map.key>] : Object | Test.java:6284:9:6284:41 | getMapKeyDefault(...) | provenance | MaD:1 |
 | Test.java:6284:37:6284:39 | out : Headers [<element>, <map.key>] : Object | Test.java:79:19:79:32 | it : Headers [<element>, <map.key>] : Object | provenance |  |
-| Test.java:6284:37:6284:39 | out : Headers [<element>, <map.key>] : Object | Test.java:6284:26:6284:40 | getElement(...) : Object [<map.key>] : Object | provenance | MaD:492 |
+| Test.java:6284:37:6284:39 | out : Headers [<element>, <map.key>] : Object | Test.java:6284:26:6284:40 | getElement(...) : Object [<map.key>] : Object | provenance | MaD:495 |
 | Test.java:6289:18:6289:44 | (...)... : List [<element>] : Object | Test.java:6290:26:6290:27 | in : List [<element>] : Object | provenance |  |
 | Test.java:6289:28:6289:44 | of(...) : List [<element>] : Object | Test.java:6289:18:6289:44 | (...)... : List [<element>] : Object | provenance |  |
-| Test.java:6289:36:6289:43 | source(...) : Object | Test.java:6289:28:6289:44 | of(...) : List [<element>] : Object | provenance | MaD:494 |
+| Test.java:6289:36:6289:43 | source(...) : Object | Test.java:6289:28:6289:44 | of(...) : List [<element>] : Object | provenance | MaD:497 |
 | Test.java:6290:4:6290:6 | out [post update] : Headers [<element>, <map.value>] : Object | Test.java:6291:39:6291:41 | out : Headers [<element>, <map.value>] : Object | provenance |  |
-| Test.java:6290:26:6290:27 | in : List [<element>] : Object | Test.java:6290:4:6290:6 | out [post update] : Headers [<element>, <map.value>] : Object | provenance | MaD:403 |
-| Test.java:6291:28:6291:42 | getElement(...) : Object [<map.value>] : Object | Test.java:6291:9:6291:43 | getMapValueDefault(...) | provenance | MaD:498 |
+| Test.java:6290:26:6290:27 | in : List [<element>] : Object | Test.java:6290:4:6290:6 | out [post update] : Headers [<element>, <map.value>] : Object | provenance | MaD:391 |
+| Test.java:6291:28:6291:42 | getElement(...) : Object [<map.value>] : Object | Test.java:6291:9:6291:43 | getMapValueDefault(...) | provenance | MaD:2 |
 | Test.java:6291:39:6291:41 | out : Headers [<element>, <map.value>] : Object | Test.java:79:19:79:32 | it : Headers [<element>, <map.value>] : Object | provenance |  |
-| Test.java:6291:39:6291:41 | out : Headers [<element>, <map.value>] : Object | Test.java:6291:28:6291:42 | getElement(...) : Object [<map.value>] : Object | provenance | MaD:492 |
+| Test.java:6291:39:6291:41 | out : Headers [<element>, <map.value>] : Object | Test.java:6291:28:6291:42 | getElement(...) : Object [<map.value>] : Object | provenance | MaD:495 |
 | Test.java:6296:16:6296:31 | (...)... : Object | Test.java:6297:12:6297:13 | in : Object | provenance |  |
 | Test.java:6296:24:6296:31 | source(...) : Object | Test.java:6296:16:6296:31 | (...)... : Object | provenance |  |
 | Test.java:6297:4:6297:6 | out [post update] : Headers [<element>, <map.key>] : Object | Test.java:6298:37:6298:39 | out : Headers [<element>, <map.key>] : Object | provenance |  |
-| Test.java:6297:12:6297:13 | in : Object | Test.java:6297:4:6297:6 | out [post update] : Headers [<element>, <map.key>] : Object | provenance | MaD:406 |
-| Test.java:6298:26:6298:40 | getElement(...) : Object [<map.key>] : Object | Test.java:6298:9:6298:41 | getMapKeyDefault(...) | provenance | MaD:499 |
+| Test.java:6297:12:6297:13 | in : Object | Test.java:6297:4:6297:6 | out [post update] : Headers [<element>, <map.key>] : Object | provenance | MaD:392 |
+| Test.java:6298:26:6298:40 | getElement(...) : Object [<map.key>] : Object | Test.java:6298:9:6298:41 | getMapKeyDefault(...) | provenance | MaD:1 |
 | Test.java:6298:37:6298:39 | out : Headers [<element>, <map.key>] : Object | Test.java:79:19:79:32 | it : Headers [<element>, <map.key>] : Object | provenance |  |
-| Test.java:6298:37:6298:39 | out : Headers [<element>, <map.key>] : Object | Test.java:6298:26:6298:40 | getElement(...) : Object [<map.key>] : Object | provenance | MaD:492 |
+| Test.java:6298:37:6298:39 | out : Headers [<element>, <map.key>] : Object | Test.java:6298:26:6298:40 | getElement(...) : Object [<map.key>] : Object | provenance | MaD:495 |
 | Test.java:6303:16:6303:31 | (...)... : Object | Test.java:6304:26:6304:27 | in : Object | provenance |  |
 | Test.java:6303:24:6303:31 | source(...) : Object | Test.java:6303:16:6303:31 | (...)... : Object | provenance |  |
 | Test.java:6304:4:6304:6 | out [post update] : Headers [<element>, <map.value>] : Object | Test.java:6305:39:6305:41 | out : Headers [<element>, <map.value>] : Object | provenance |  |
-| Test.java:6304:26:6304:27 | in : Object | Test.java:6304:4:6304:6 | out [post update] : Headers [<element>, <map.value>] : Object | provenance | MaD:407 |
-| Test.java:6305:28:6305:42 | getElement(...) : Object [<map.value>] : Object | Test.java:6305:9:6305:43 | getMapValueDefault(...) | provenance | MaD:498 |
+| Test.java:6304:26:6304:27 | in : Object | Test.java:6304:4:6304:6 | out [post update] : Headers [<element>, <map.value>] : Object | provenance | MaD:393 |
+| Test.java:6305:28:6305:42 | getElement(...) : Object [<map.value>] : Object | Test.java:6305:9:6305:43 | getMapValueDefault(...) | provenance | MaD:2 |
 | Test.java:6305:39:6305:41 | out : Headers [<element>, <map.value>] : Object | Test.java:79:19:79:32 | it : Headers [<element>, <map.value>] : Object | provenance |  |
-| Test.java:6305:39:6305:41 | out : Headers [<element>, <map.value>] : Object | Test.java:6305:28:6305:42 | getElement(...) : Object [<map.value>] : Object | provenance | MaD:492 |
+| Test.java:6305:39:6305:41 | out : Headers [<element>, <map.value>] : Object | Test.java:6305:28:6305:42 | getElement(...) : Object [<map.value>] : Object | provenance | MaD:495 |
 | Test.java:6310:16:6310:31 | (...)... : Object | Test.java:6311:12:6311:13 | in : Object | provenance |  |
 | Test.java:6310:24:6310:31 | source(...) : Object | Test.java:6310:16:6310:31 | (...)... : Object | provenance |  |
 | Test.java:6311:4:6311:6 | out [post update] : Headers [<element>, <map.key>] : Object | Test.java:6312:37:6312:39 | out : Headers [<element>, <map.key>] : Object | provenance |  |
-| Test.java:6311:12:6311:13 | in : Object | Test.java:6311:4:6311:6 | out [post update] : Headers [<element>, <map.key>] : Object | provenance | MaD:404 |
-| Test.java:6312:26:6312:40 | getElement(...) : Object [<map.key>] : Object | Test.java:6312:9:6312:41 | getMapKeyDefault(...) | provenance | MaD:499 |
+| Test.java:6311:12:6311:13 | in : Object | Test.java:6311:4:6311:6 | out [post update] : Headers [<element>, <map.key>] : Object | provenance | MaD:394 |
+| Test.java:6312:26:6312:40 | getElement(...) : Object [<map.key>] : Object | Test.java:6312:9:6312:41 | getMapKeyDefault(...) | provenance | MaD:1 |
 | Test.java:6312:37:6312:39 | out : Headers [<element>, <map.key>] : Object | Test.java:79:19:79:32 | it : Headers [<element>, <map.key>] : Object | provenance |  |
-| Test.java:6312:37:6312:39 | out : Headers [<element>, <map.key>] : Object | Test.java:6312:26:6312:40 | getElement(...) : Object [<map.key>] : Object | provenance | MaD:492 |
+| Test.java:6312:37:6312:39 | out : Headers [<element>, <map.key>] : Object | Test.java:6312:26:6312:40 | getElement(...) : Object [<map.key>] : Object | provenance | MaD:495 |
 | Test.java:6317:18:6317:49 | (...)... : Object[] [[]] : Object | Test.java:6318:26:6318:27 | in : Object[] [[]] : Object | provenance |  |
 | Test.java:6317:28:6317:49 | {...} : Object[] [[]] : Object | Test.java:6317:18:6317:49 | (...)... : Object[] [[]] : Object | provenance |  |
 | Test.java:6317:41:6317:48 | source(...) : Object | Test.java:6317:28:6317:49 | {...} : Object[] [[]] : Object | provenance |  |
 | Test.java:6318:4:6318:6 | out [post update] : Headers [<element>, <map.value>] : Object | Test.java:6319:39:6319:41 | out : Headers [<element>, <map.value>] : Object | provenance |  |
-| Test.java:6318:26:6318:27 | in : Object[] [[]] : Object | Test.java:6318:4:6318:6 | out [post update] : Headers [<element>, <map.value>] : Object | provenance | MaD:405 |
-| Test.java:6319:28:6319:42 | getElement(...) : Object [<map.value>] : Object | Test.java:6319:9:6319:43 | getMapValueDefault(...) | provenance | MaD:498 |
+| Test.java:6318:26:6318:27 | in : Object[] [[]] : Object | Test.java:6318:4:6318:6 | out [post update] : Headers [<element>, <map.value>] : Object | provenance | MaD:395 |
+| Test.java:6319:28:6319:42 | getElement(...) : Object [<map.value>] : Object | Test.java:6319:9:6319:43 | getMapValueDefault(...) | provenance | MaD:2 |
 | Test.java:6319:39:6319:41 | out : Headers [<element>, <map.value>] : Object | Test.java:79:19:79:32 | it : Headers [<element>, <map.value>] : Object | provenance |  |
-| Test.java:6319:39:6319:41 | out : Headers [<element>, <map.value>] : Object | Test.java:6319:28:6319:42 | getElement(...) : Object [<map.value>] : Object | provenance | MaD:492 |
+| Test.java:6319:39:6319:41 | out : Headers [<element>, <map.value>] : Object | Test.java:6319:28:6319:42 | getElement(...) : Object [<map.value>] : Object | provenance | MaD:495 |
 | Test.java:6324:17:6324:33 | (...)... : Headers | Test.java:6325:10:6325:11 | in : Headers | provenance |  |
 | Test.java:6324:26:6324:33 | source(...) : Object | Test.java:6324:17:6324:33 | (...)... : Headers | provenance |  |
-| Test.java:6325:10:6325:11 | in : Headers | Test.java:6325:10:6325:45 | add(...) : Headers | provenance | MaD:399 |
+| Test.java:6325:10:6325:11 | in : Headers | Test.java:6325:10:6325:45 | add(...) : Headers | provenance | MaD:396 |
 | Test.java:6325:10:6325:45 | add(...) : Headers | Test.java:6326:9:6326:11 | out | provenance |  |
 | Test.java:6331:17:6331:33 | (...)... : Headers | Test.java:6332:10:6332:11 | in : Headers | provenance |  |
 | Test.java:6331:26:6331:33 | source(...) : Object | Test.java:6331:17:6331:33 | (...)... : Headers | provenance |  |
-| Test.java:6332:10:6332:11 | in : Headers | Test.java:6332:10:6332:43 | add(...) : Headers | provenance | MaD:399 |
+| Test.java:6332:10:6332:11 | in : Headers | Test.java:6332:10:6332:43 | add(...) : Headers | provenance | MaD:396 |
 | Test.java:6332:10:6332:43 | add(...) : Headers | Test.java:6333:9:6333:11 | out | provenance |  |
 | Test.java:6338:17:6338:33 | (...)... : Headers | Test.java:6339:10:6339:11 | in : Headers | provenance |  |
 | Test.java:6338:26:6338:33 | source(...) : Object | Test.java:6338:17:6338:33 | (...)... : Headers | provenance |  |
-| Test.java:6339:10:6339:11 | in : Headers | Test.java:6339:10:6339:45 | add(...) : Headers | provenance | MaD:399 |
+| Test.java:6339:10:6339:11 | in : Headers | Test.java:6339:10:6339:45 | add(...) : Headers | provenance | MaD:396 |
 | Test.java:6339:10:6339:45 | add(...) : Headers | Test.java:6340:9:6340:11 | out | provenance |  |
 | Test.java:6345:17:6345:33 | (...)... : Headers | Test.java:6346:10:6346:11 | in : Headers | provenance |  |
 | Test.java:6345:26:6345:33 | source(...) : Object | Test.java:6345:17:6345:33 | (...)... : Headers | provenance |  |
-| Test.java:6346:10:6346:11 | in : Headers | Test.java:6346:10:6346:21 | add(...) : Headers | provenance | MaD:399 |
+| Test.java:6346:10:6346:11 | in : Headers | Test.java:6346:10:6346:21 | add(...) : Headers | provenance | MaD:396 |
 | Test.java:6346:10:6346:21 | add(...) : Headers | Test.java:6347:9:6347:11 | out | provenance |  |
 | Test.java:6352:17:6352:33 | (...)... : Headers | Test.java:6353:10:6353:11 | in : Headers | provenance |  |
 | Test.java:6352:26:6352:33 | source(...) : Object | Test.java:6352:17:6352:33 | (...)... : Headers | provenance |  |
-| Test.java:6353:10:6353:11 | in : Headers | Test.java:6353:10:6353:35 | addBoolean(...) : Headers | provenance | MaD:414 |
+| Test.java:6353:10:6353:11 | in : Headers | Test.java:6353:10:6353:35 | addBoolean(...) : Headers | provenance | MaD:398 |
 | Test.java:6353:10:6353:35 | addBoolean(...) : Headers | Test.java:6354:9:6354:11 | out | provenance |  |
 | Test.java:6359:16:6359:31 | (...)... : Object | Test.java:6360:19:6360:20 | in : Object | provenance |  |
 | Test.java:6359:24:6359:31 | source(...) : Object | Test.java:6359:16:6359:31 | (...)... : Object | provenance |  |
 | Test.java:6360:4:6360:6 | out [post update] : Headers [<element>, <map.key>] : Object | Test.java:6361:37:6361:39 | out : Headers [<element>, <map.key>] : Object | provenance |  |
-| Test.java:6360:19:6360:20 | in : Object | Test.java:6360:4:6360:6 | out [post update] : Headers [<element>, <map.key>] : Object | provenance | MaD:415 |
-| Test.java:6361:26:6361:40 | getElement(...) : Object [<map.key>] : Object | Test.java:6361:9:6361:41 | getMapKeyDefault(...) | provenance | MaD:499 |
+| Test.java:6360:19:6360:20 | in : Object | Test.java:6360:4:6360:6 | out [post update] : Headers [<element>, <map.key>] : Object | provenance | MaD:397 |
+| Test.java:6361:26:6361:40 | getElement(...) : Object [<map.key>] : Object | Test.java:6361:9:6361:41 | getMapKeyDefault(...) | provenance | MaD:1 |
 | Test.java:6361:37:6361:39 | out : Headers [<element>, <map.key>] : Object | Test.java:79:19:79:32 | it : Headers [<element>, <map.key>] : Object | provenance |  |
-| Test.java:6361:37:6361:39 | out : Headers [<element>, <map.key>] : Object | Test.java:6361:26:6361:40 | getElement(...) : Object [<map.key>] : Object | provenance | MaD:492 |
+| Test.java:6361:37:6361:39 | out : Headers [<element>, <map.key>] : Object | Test.java:6361:26:6361:40 | getElement(...) : Object [<map.key>] : Object | provenance | MaD:495 |
 | Test.java:6366:17:6366:33 | (...)... : Headers | Test.java:6367:10:6367:11 | in : Headers | provenance |  |
 | Test.java:6366:26:6366:33 | source(...) : Object | Test.java:6366:17:6366:33 | (...)... : Headers | provenance |  |
-| Test.java:6367:10:6367:11 | in : Headers | Test.java:6367:10:6367:34 | addByte(...) : Headers | provenance | MaD:416 |
+| Test.java:6367:10:6367:11 | in : Headers | Test.java:6367:10:6367:34 | addByte(...) : Headers | provenance | MaD:400 |
 | Test.java:6367:10:6367:34 | addByte(...) : Headers | Test.java:6368:9:6368:11 | out | provenance |  |
 | Test.java:6373:16:6373:31 | (...)... : Object | Test.java:6374:16:6374:17 | in : Object | provenance |  |
 | Test.java:6373:24:6373:31 | source(...) : Object | Test.java:6373:16:6373:31 | (...)... : Object | provenance |  |
 | Test.java:6374:4:6374:6 | out [post update] : Headers [<element>, <map.key>] : Object | Test.java:6375:37:6375:39 | out : Headers [<element>, <map.key>] : Object | provenance |  |
-| Test.java:6374:16:6374:17 | in : Object | Test.java:6374:4:6374:6 | out [post update] : Headers [<element>, <map.key>] : Object | provenance | MaD:417 |
-| Test.java:6375:26:6375:40 | getElement(...) : Object [<map.key>] : Object | Test.java:6375:9:6375:41 | getMapKeyDefault(...) | provenance | MaD:499 |
+| Test.java:6374:16:6374:17 | in : Object | Test.java:6374:4:6374:6 | out [post update] : Headers [<element>, <map.key>] : Object | provenance | MaD:399 |
+| Test.java:6375:26:6375:40 | getElement(...) : Object [<map.key>] : Object | Test.java:6375:9:6375:41 | getMapKeyDefault(...) | provenance | MaD:1 |
 | Test.java:6375:37:6375:39 | out : Headers [<element>, <map.key>] : Object | Test.java:79:19:79:32 | it : Headers [<element>, <map.key>] : Object | provenance |  |
-| Test.java:6375:37:6375:39 | out : Headers [<element>, <map.key>] : Object | Test.java:6375:26:6375:40 | getElement(...) : Object [<map.key>] : Object | provenance | MaD:492 |
+| Test.java:6375:37:6375:39 | out : Headers [<element>, <map.key>] : Object | Test.java:6375:26:6375:40 | getElement(...) : Object [<map.key>] : Object | provenance | MaD:495 |
 | Test.java:6380:17:6380:33 | (...)... : Headers | Test.java:6381:10:6381:11 | in : Headers | provenance |  |
 | Test.java:6380:26:6380:33 | source(...) : Object | Test.java:6380:17:6380:33 | (...)... : Headers | provenance |  |
-| Test.java:6381:10:6381:11 | in : Headers | Test.java:6381:10:6381:31 | addChar(...) : Headers | provenance | MaD:418 |
+| Test.java:6381:10:6381:11 | in : Headers | Test.java:6381:10:6381:31 | addChar(...) : Headers | provenance | MaD:402 |
 | Test.java:6381:10:6381:31 | addChar(...) : Headers | Test.java:6382:9:6382:11 | out | provenance |  |
 | Test.java:6387:16:6387:31 | (...)... : Object | Test.java:6388:16:6388:17 | in : Object | provenance |  |
 | Test.java:6387:24:6387:31 | source(...) : Object | Test.java:6387:16:6387:31 | (...)... : Object | provenance |  |
 | Test.java:6388:4:6388:6 | out [post update] : Headers [<element>, <map.key>] : Object | Test.java:6389:37:6389:39 | out : Headers [<element>, <map.key>] : Object | provenance |  |
-| Test.java:6388:16:6388:17 | in : Object | Test.java:6388:4:6388:6 | out [post update] : Headers [<element>, <map.key>] : Object | provenance | MaD:419 |
-| Test.java:6389:26:6389:40 | getElement(...) : Object [<map.key>] : Object | Test.java:6389:9:6389:41 | getMapKeyDefault(...) | provenance | MaD:499 |
+| Test.java:6388:16:6388:17 | in : Object | Test.java:6388:4:6388:6 | out [post update] : Headers [<element>, <map.key>] : Object | provenance | MaD:401 |
+| Test.java:6389:26:6389:40 | getElement(...) : Object [<map.key>] : Object | Test.java:6389:9:6389:41 | getMapKeyDefault(...) | provenance | MaD:1 |
 | Test.java:6389:37:6389:39 | out : Headers [<element>, <map.key>] : Object | Test.java:79:19:79:32 | it : Headers [<element>, <map.key>] : Object | provenance |  |
-| Test.java:6389:37:6389:39 | out : Headers [<element>, <map.key>] : Object | Test.java:6389:26:6389:40 | getElement(...) : Object [<map.key>] : Object | provenance | MaD:492 |
+| Test.java:6389:37:6389:39 | out : Headers [<element>, <map.key>] : Object | Test.java:6389:26:6389:40 | getElement(...) : Object [<map.key>] : Object | provenance | MaD:495 |
 | Test.java:6394:17:6394:33 | (...)... : Headers | Test.java:6395:10:6395:11 | in : Headers | provenance |  |
 | Test.java:6394:26:6394:33 | source(...) : Object | Test.java:6394:17:6394:33 | (...)... : Headers | provenance |  |
-| Test.java:6395:10:6395:11 | in : Headers | Test.java:6395:10:6395:32 | addDouble(...) : Headers | provenance | MaD:420 |
+| Test.java:6395:10:6395:11 | in : Headers | Test.java:6395:10:6395:32 | addDouble(...) : Headers | provenance | MaD:404 |
 | Test.java:6395:10:6395:32 | addDouble(...) : Headers | Test.java:6396:9:6396:11 | out | provenance |  |
 | Test.java:6401:16:6401:31 | (...)... : Object | Test.java:6402:18:6402:19 | in : Object | provenance |  |
 | Test.java:6401:24:6401:31 | source(...) : Object | Test.java:6401:16:6401:31 | (...)... : Object | provenance |  |
 | Test.java:6402:4:6402:6 | out [post update] : Headers [<element>, <map.key>] : Object | Test.java:6403:37:6403:39 | out : Headers [<element>, <map.key>] : Object | provenance |  |
-| Test.java:6402:18:6402:19 | in : Object | Test.java:6402:4:6402:6 | out [post update] : Headers [<element>, <map.key>] : Object | provenance | MaD:421 |
-| Test.java:6403:26:6403:40 | getElement(...) : Object [<map.key>] : Object | Test.java:6403:9:6403:41 | getMapKeyDefault(...) | provenance | MaD:499 |
+| Test.java:6402:18:6402:19 | in : Object | Test.java:6402:4:6402:6 | out [post update] : Headers [<element>, <map.key>] : Object | provenance | MaD:403 |
+| Test.java:6403:26:6403:40 | getElement(...) : Object [<map.key>] : Object | Test.java:6403:9:6403:41 | getMapKeyDefault(...) | provenance | MaD:1 |
 | Test.java:6403:37:6403:39 | out : Headers [<element>, <map.key>] : Object | Test.java:79:19:79:32 | it : Headers [<element>, <map.key>] : Object | provenance |  |
-| Test.java:6403:37:6403:39 | out : Headers [<element>, <map.key>] : Object | Test.java:6403:26:6403:40 | getElement(...) : Object [<map.key>] : Object | provenance | MaD:492 |
+| Test.java:6403:37:6403:39 | out : Headers [<element>, <map.key>] : Object | Test.java:6403:26:6403:40 | getElement(...) : Object [<map.key>] : Object | provenance | MaD:495 |
 | Test.java:6408:17:6408:33 | (...)... : Headers | Test.java:6409:10:6409:11 | in : Headers | provenance |  |
 | Test.java:6408:26:6408:33 | source(...) : Object | Test.java:6408:17:6408:33 | (...)... : Headers | provenance |  |
-| Test.java:6409:10:6409:11 | in : Headers | Test.java:6409:10:6409:32 | addFloat(...) : Headers | provenance | MaD:422 |
+| Test.java:6409:10:6409:11 | in : Headers | Test.java:6409:10:6409:32 | addFloat(...) : Headers | provenance | MaD:406 |
 | Test.java:6409:10:6409:32 | addFloat(...) : Headers | Test.java:6410:9:6410:11 | out | provenance |  |
 | Test.java:6415:16:6415:31 | (...)... : Object | Test.java:6416:17:6416:18 | in : Object | provenance |  |
 | Test.java:6415:24:6415:31 | source(...) : Object | Test.java:6415:16:6415:31 | (...)... : Object | provenance |  |
 | Test.java:6416:4:6416:6 | out [post update] : Headers [<element>, <map.key>] : Object | Test.java:6417:37:6417:39 | out : Headers [<element>, <map.key>] : Object | provenance |  |
-| Test.java:6416:17:6416:18 | in : Object | Test.java:6416:4:6416:6 | out [post update] : Headers [<element>, <map.key>] : Object | provenance | MaD:423 |
-| Test.java:6417:26:6417:40 | getElement(...) : Object [<map.key>] : Object | Test.java:6417:9:6417:41 | getMapKeyDefault(...) | provenance | MaD:499 |
+| Test.java:6416:17:6416:18 | in : Object | Test.java:6416:4:6416:6 | out [post update] : Headers [<element>, <map.key>] : Object | provenance | MaD:405 |
+| Test.java:6417:26:6417:40 | getElement(...) : Object [<map.key>] : Object | Test.java:6417:9:6417:41 | getMapKeyDefault(...) | provenance | MaD:1 |
 | Test.java:6417:37:6417:39 | out : Headers [<element>, <map.key>] : Object | Test.java:79:19:79:32 | it : Headers [<element>, <map.key>] : Object | provenance |  |
-| Test.java:6417:37:6417:39 | out : Headers [<element>, <map.key>] : Object | Test.java:6417:26:6417:40 | getElement(...) : Object [<map.key>] : Object | provenance | MaD:492 |
+| Test.java:6417:37:6417:39 | out : Headers [<element>, <map.key>] : Object | Test.java:6417:26:6417:40 | getElement(...) : Object [<map.key>] : Object | provenance | MaD:495 |
 | Test.java:6422:17:6422:33 | (...)... : Headers | Test.java:6423:10:6423:11 | in : Headers | provenance |  |
 | Test.java:6422:26:6422:33 | source(...) : Object | Test.java:6422:17:6422:33 | (...)... : Headers | provenance |  |
-| Test.java:6423:10:6423:11 | in : Headers | Test.java:6423:10:6423:27 | addInt(...) : Headers | provenance | MaD:424 |
+| Test.java:6423:10:6423:11 | in : Headers | Test.java:6423:10:6423:27 | addInt(...) : Headers | provenance | MaD:408 |
 | Test.java:6423:10:6423:27 | addInt(...) : Headers | Test.java:6424:9:6424:11 | out | provenance |  |
 | Test.java:6429:16:6429:31 | (...)... : Object | Test.java:6430:15:6430:16 | in : Object | provenance |  |
 | Test.java:6429:24:6429:31 | source(...) : Object | Test.java:6429:16:6429:31 | (...)... : Object | provenance |  |
 | Test.java:6430:4:6430:6 | out [post update] : Headers [<element>, <map.key>] : Object | Test.java:6431:37:6431:39 | out : Headers [<element>, <map.key>] : Object | provenance |  |
-| Test.java:6430:15:6430:16 | in : Object | Test.java:6430:4:6430:6 | out [post update] : Headers [<element>, <map.key>] : Object | provenance | MaD:425 |
-| Test.java:6431:26:6431:40 | getElement(...) : Object [<map.key>] : Object | Test.java:6431:9:6431:41 | getMapKeyDefault(...) | provenance | MaD:499 |
+| Test.java:6430:15:6430:16 | in : Object | Test.java:6430:4:6430:6 | out [post update] : Headers [<element>, <map.key>] : Object | provenance | MaD:407 |
+| Test.java:6431:26:6431:40 | getElement(...) : Object [<map.key>] : Object | Test.java:6431:9:6431:41 | getMapKeyDefault(...) | provenance | MaD:1 |
 | Test.java:6431:37:6431:39 | out : Headers [<element>, <map.key>] : Object | Test.java:79:19:79:32 | it : Headers [<element>, <map.key>] : Object | provenance |  |
-| Test.java:6431:37:6431:39 | out : Headers [<element>, <map.key>] : Object | Test.java:6431:26:6431:40 | getElement(...) : Object [<map.key>] : Object | provenance | MaD:492 |
+| Test.java:6431:37:6431:39 | out : Headers [<element>, <map.key>] : Object | Test.java:6431:26:6431:40 | getElement(...) : Object [<map.key>] : Object | provenance | MaD:495 |
 | Test.java:6436:17:6436:33 | (...)... : Headers | Test.java:6437:10:6437:11 | in : Headers | provenance |  |
 | Test.java:6436:26:6436:33 | source(...) : Object | Test.java:6436:17:6436:33 | (...)... : Headers | provenance |  |
-| Test.java:6437:10:6437:11 | in : Headers | Test.java:6437:10:6437:29 | addLong(...) : Headers | provenance | MaD:426 |
+| Test.java:6437:10:6437:11 | in : Headers | Test.java:6437:10:6437:29 | addLong(...) : Headers | provenance | MaD:410 |
 | Test.java:6437:10:6437:29 | addLong(...) : Headers | Test.java:6438:9:6438:11 | out | provenance |  |
 | Test.java:6443:16:6443:31 | (...)... : Object | Test.java:6444:16:6444:17 | in : Object | provenance |  |
 | Test.java:6443:24:6443:31 | source(...) : Object | Test.java:6443:16:6443:31 | (...)... : Object | provenance |  |
 | Test.java:6444:4:6444:6 | out [post update] : Headers [<element>, <map.key>] : Object | Test.java:6445:37:6445:39 | out : Headers [<element>, <map.key>] : Object | provenance |  |
-| Test.java:6444:16:6444:17 | in : Object | Test.java:6444:4:6444:6 | out [post update] : Headers [<element>, <map.key>] : Object | provenance | MaD:427 |
-| Test.java:6445:26:6445:40 | getElement(...) : Object [<map.key>] : Object | Test.java:6445:9:6445:41 | getMapKeyDefault(...) | provenance | MaD:499 |
+| Test.java:6444:16:6444:17 | in : Object | Test.java:6444:4:6444:6 | out [post update] : Headers [<element>, <map.key>] : Object | provenance | MaD:409 |
+| Test.java:6445:26:6445:40 | getElement(...) : Object [<map.key>] : Object | Test.java:6445:9:6445:41 | getMapKeyDefault(...) | provenance | MaD:1 |
 | Test.java:6445:37:6445:39 | out : Headers [<element>, <map.key>] : Object | Test.java:79:19:79:32 | it : Headers [<element>, <map.key>] : Object | provenance |  |
-| Test.java:6445:37:6445:39 | out : Headers [<element>, <map.key>] : Object | Test.java:6445:26:6445:40 | getElement(...) : Object [<map.key>] : Object | provenance | MaD:492 |
+| Test.java:6445:37:6445:39 | out : Headers [<element>, <map.key>] : Object | Test.java:6445:26:6445:40 | getElement(...) : Object [<map.key>] : Object | provenance | MaD:495 |
 | Test.java:6450:16:6450:31 | (...)... : Object | Test.java:6451:18:6451:19 | in : Object | provenance |  |
 | Test.java:6450:24:6450:31 | source(...) : Object | Test.java:6450:16:6450:31 | (...)... : Object | provenance |  |
 | Test.java:6451:4:6451:6 | out [post update] : Headers [<element>, <map.key>] : Object | Test.java:6452:37:6452:39 | out : Headers [<element>, <map.key>] : Object | provenance |  |
-| Test.java:6451:18:6451:19 | in : Object | Test.java:6451:4:6451:6 | out [post update] : Headers [<element>, <map.key>] : Object | provenance | MaD:408 |
-| Test.java:6452:26:6452:40 | getElement(...) : Object [<map.key>] : Object | Test.java:6452:9:6452:41 | getMapKeyDefault(...) | provenance | MaD:499 |
+| Test.java:6451:18:6451:19 | in : Object | Test.java:6451:4:6451:6 | out [post update] : Headers [<element>, <map.key>] : Object | provenance | MaD:411 |
+| Test.java:6452:26:6452:40 | getElement(...) : Object [<map.key>] : Object | Test.java:6452:9:6452:41 | getMapKeyDefault(...) | provenance | MaD:1 |
 | Test.java:6452:37:6452:39 | out : Headers [<element>, <map.key>] : Object | Test.java:79:19:79:32 | it : Headers [<element>, <map.key>] : Object | provenance |  |
-| Test.java:6452:37:6452:39 | out : Headers [<element>, <map.key>] : Object | Test.java:6452:26:6452:40 | getElement(...) : Object [<map.key>] : Object | provenance | MaD:492 |
+| Test.java:6452:37:6452:39 | out : Headers [<element>, <map.key>] : Object | Test.java:6452:26:6452:40 | getElement(...) : Object [<map.key>] : Object | provenance | MaD:495 |
 | Test.java:6457:18:6457:44 | (...)... : List [<element>] : Object | Test.java:6458:32:6458:33 | in : List [<element>] : Object | provenance |  |
 | Test.java:6457:28:6457:44 | of(...) : List [<element>] : Object | Test.java:6457:18:6457:44 | (...)... : List [<element>] : Object | provenance |  |
-| Test.java:6457:36:6457:43 | source(...) : Object | Test.java:6457:28:6457:44 | of(...) : List [<element>] : Object | provenance | MaD:494 |
+| Test.java:6457:36:6457:43 | source(...) : Object | Test.java:6457:28:6457:44 | of(...) : List [<element>] : Object | provenance | MaD:497 |
 | Test.java:6458:4:6458:6 | out [post update] : Headers [<element>, <map.value>] : Object | Test.java:6459:39:6459:41 | out : Headers [<element>, <map.value>] : Object | provenance |  |
-| Test.java:6458:32:6458:33 | in : List [<element>] : Object | Test.java:6458:4:6458:6 | out [post update] : Headers [<element>, <map.value>] : Object | provenance | MaD:409 |
-| Test.java:6459:28:6459:42 | getElement(...) : Object [<map.value>] : Object | Test.java:6459:9:6459:43 | getMapValueDefault(...) | provenance | MaD:498 |
+| Test.java:6458:32:6458:33 | in : List [<element>] : Object | Test.java:6458:4:6458:6 | out [post update] : Headers [<element>, <map.value>] : Object | provenance | MaD:412 |
+| Test.java:6459:28:6459:42 | getElement(...) : Object [<map.value>] : Object | Test.java:6459:9:6459:43 | getMapValueDefault(...) | provenance | MaD:2 |
 | Test.java:6459:39:6459:41 | out : Headers [<element>, <map.value>] : Object | Test.java:79:19:79:32 | it : Headers [<element>, <map.value>] : Object | provenance |  |
-| Test.java:6459:39:6459:41 | out : Headers [<element>, <map.value>] : Object | Test.java:6459:28:6459:42 | getElement(...) : Object [<map.value>] : Object | provenance | MaD:492 |
+| Test.java:6459:39:6459:41 | out : Headers [<element>, <map.value>] : Object | Test.java:6459:28:6459:42 | getElement(...) : Object [<map.value>] : Object | provenance | MaD:495 |
 | Test.java:6464:16:6464:31 | (...)... : Object | Test.java:6465:18:6465:19 | in : Object | provenance |  |
 | Test.java:6464:24:6464:31 | source(...) : Object | Test.java:6464:16:6464:31 | (...)... : Object | provenance |  |
 | Test.java:6465:4:6465:6 | out [post update] : Headers [<element>, <map.key>] : Object | Test.java:6466:37:6466:39 | out : Headers [<element>, <map.key>] : Object | provenance |  |
-| Test.java:6465:18:6465:19 | in : Object | Test.java:6465:4:6465:6 | out [post update] : Headers [<element>, <map.key>] : Object | provenance | MaD:412 |
-| Test.java:6466:26:6466:40 | getElement(...) : Object [<map.key>] : Object | Test.java:6466:9:6466:41 | getMapKeyDefault(...) | provenance | MaD:499 |
+| Test.java:6465:18:6465:19 | in : Object | Test.java:6465:4:6465:6 | out [post update] : Headers [<element>, <map.key>] : Object | provenance | MaD:413 |
+| Test.java:6466:26:6466:40 | getElement(...) : Object [<map.key>] : Object | Test.java:6466:9:6466:41 | getMapKeyDefault(...) | provenance | MaD:1 |
 | Test.java:6466:37:6466:39 | out : Headers [<element>, <map.key>] : Object | Test.java:79:19:79:32 | it : Headers [<element>, <map.key>] : Object | provenance |  |
-| Test.java:6466:37:6466:39 | out : Headers [<element>, <map.key>] : Object | Test.java:6466:26:6466:40 | getElement(...) : Object [<map.key>] : Object | provenance | MaD:492 |
+| Test.java:6466:37:6466:39 | out : Headers [<element>, <map.key>] : Object | Test.java:6466:26:6466:40 | getElement(...) : Object [<map.key>] : Object | provenance | MaD:495 |
 | Test.java:6471:16:6471:31 | (...)... : Object | Test.java:6472:32:6472:33 | in : Object | provenance |  |
 | Test.java:6471:24:6471:31 | source(...) : Object | Test.java:6471:16:6471:31 | (...)... : Object | provenance |  |
 | Test.java:6472:4:6472:6 | out [post update] : Headers [<element>, <map.value>] : Object | Test.java:6473:39:6473:41 | out : Headers [<element>, <map.value>] : Object | provenance |  |
-| Test.java:6472:32:6472:33 | in : Object | Test.java:6472:4:6472:6 | out [post update] : Headers [<element>, <map.value>] : Object | provenance | MaD:413 |
-| Test.java:6473:28:6473:42 | getElement(...) : Object [<map.value>] : Object | Test.java:6473:9:6473:43 | getMapValueDefault(...) | provenance | MaD:498 |
+| Test.java:6472:32:6472:33 | in : Object | Test.java:6472:4:6472:6 | out [post update] : Headers [<element>, <map.value>] : Object | provenance | MaD:414 |
+| Test.java:6473:28:6473:42 | getElement(...) : Object [<map.value>] : Object | Test.java:6473:9:6473:43 | getMapValueDefault(...) | provenance | MaD:2 |
 | Test.java:6473:39:6473:41 | out : Headers [<element>, <map.value>] : Object | Test.java:79:19:79:32 | it : Headers [<element>, <map.value>] : Object | provenance |  |
-| Test.java:6473:39:6473:41 | out : Headers [<element>, <map.value>] : Object | Test.java:6473:28:6473:42 | getElement(...) : Object [<map.value>] : Object | provenance | MaD:492 |
+| Test.java:6473:39:6473:41 | out : Headers [<element>, <map.value>] : Object | Test.java:6473:28:6473:42 | getElement(...) : Object [<map.value>] : Object | provenance | MaD:495 |
 | Test.java:6478:16:6478:31 | (...)... : Object | Test.java:6479:18:6479:19 | in : Object | provenance |  |
 | Test.java:6478:24:6478:31 | source(...) : Object | Test.java:6478:16:6478:31 | (...)... : Object | provenance |  |
 | Test.java:6479:4:6479:6 | out [post update] : Headers [<element>, <map.key>] : Object | Test.java:6480:37:6480:39 | out : Headers [<element>, <map.key>] : Object | provenance |  |
-| Test.java:6479:18:6479:19 | in : Object | Test.java:6479:4:6479:6 | out [post update] : Headers [<element>, <map.key>] : Object | provenance | MaD:410 |
-| Test.java:6480:26:6480:40 | getElement(...) : Object [<map.key>] : Object | Test.java:6480:9:6480:41 | getMapKeyDefault(...) | provenance | MaD:499 |
+| Test.java:6479:18:6479:19 | in : Object | Test.java:6479:4:6479:6 | out [post update] : Headers [<element>, <map.key>] : Object | provenance | MaD:415 |
+| Test.java:6480:26:6480:40 | getElement(...) : Object [<map.key>] : Object | Test.java:6480:9:6480:41 | getMapKeyDefault(...) | provenance | MaD:1 |
 | Test.java:6480:37:6480:39 | out : Headers [<element>, <map.key>] : Object | Test.java:79:19:79:32 | it : Headers [<element>, <map.key>] : Object | provenance |  |
-| Test.java:6480:37:6480:39 | out : Headers [<element>, <map.key>] : Object | Test.java:6480:26:6480:40 | getElement(...) : Object [<map.key>] : Object | provenance | MaD:492 |
+| Test.java:6480:37:6480:39 | out : Headers [<element>, <map.key>] : Object | Test.java:6480:26:6480:40 | getElement(...) : Object [<map.key>] : Object | provenance | MaD:495 |
 | Test.java:6485:18:6485:49 | (...)... : Object[] [[]] : Object | Test.java:6486:32:6486:33 | in : Object[] [[]] : Object | provenance |  |
 | Test.java:6485:28:6485:49 | {...} : Object[] [[]] : Object | Test.java:6485:18:6485:49 | (...)... : Object[] [[]] : Object | provenance |  |
 | Test.java:6485:41:6485:48 | source(...) : Object | Test.java:6485:28:6485:49 | {...} : Object[] [[]] : Object | provenance |  |
 | Test.java:6486:4:6486:6 | out [post update] : Headers [<element>, <map.value>] : Object | Test.java:6487:39:6487:41 | out : Headers [<element>, <map.value>] : Object | provenance |  |
-| Test.java:6486:32:6486:33 | in : Object[] [[]] : Object | Test.java:6486:4:6486:6 | out [post update] : Headers [<element>, <map.value>] : Object | provenance | MaD:411 |
-| Test.java:6487:28:6487:42 | getElement(...) : Object [<map.value>] : Object | Test.java:6487:9:6487:43 | getMapValueDefault(...) | provenance | MaD:498 |
+| Test.java:6486:32:6486:33 | in : Object[] [[]] : Object | Test.java:6486:4:6486:6 | out [post update] : Headers [<element>, <map.value>] : Object | provenance | MaD:416 |
+| Test.java:6487:28:6487:42 | getElement(...) : Object [<map.value>] : Object | Test.java:6487:9:6487:43 | getMapValueDefault(...) | provenance | MaD:2 |
 | Test.java:6487:39:6487:41 | out : Headers [<element>, <map.value>] : Object | Test.java:79:19:79:32 | it : Headers [<element>, <map.value>] : Object | provenance |  |
-| Test.java:6487:39:6487:41 | out : Headers [<element>, <map.value>] : Object | Test.java:6487:28:6487:42 | getElement(...) : Object [<map.value>] : Object | provenance | MaD:492 |
+| Test.java:6487:39:6487:41 | out : Headers [<element>, <map.value>] : Object | Test.java:6487:28:6487:42 | getElement(...) : Object [<map.value>] : Object | provenance | MaD:495 |
 | Test.java:6492:17:6492:33 | (...)... : Headers | Test.java:6493:10:6493:11 | in : Headers | provenance |  |
 | Test.java:6492:26:6492:33 | source(...) : Object | Test.java:6492:17:6492:33 | (...)... : Headers | provenance |  |
-| Test.java:6493:10:6493:11 | in : Headers | Test.java:6493:10:6493:36 | addShort(...) : Headers | provenance | MaD:428 |
+| Test.java:6493:10:6493:11 | in : Headers | Test.java:6493:10:6493:36 | addShort(...) : Headers | provenance | MaD:418 |
 | Test.java:6493:10:6493:36 | addShort(...) : Headers | Test.java:6494:9:6494:11 | out | provenance |  |
 | Test.java:6499:16:6499:31 | (...)... : Object | Test.java:6500:17:6500:18 | in : Object | provenance |  |
 | Test.java:6499:24:6499:31 | source(...) : Object | Test.java:6499:16:6499:31 | (...)... : Object | provenance |  |
 | Test.java:6500:4:6500:6 | out [post update] : Headers [<element>, <map.key>] : Object | Test.java:6501:37:6501:39 | out : Headers [<element>, <map.key>] : Object | provenance |  |
-| Test.java:6500:17:6500:18 | in : Object | Test.java:6500:4:6500:6 | out [post update] : Headers [<element>, <map.key>] : Object | provenance | MaD:429 |
-| Test.java:6501:26:6501:40 | getElement(...) : Object [<map.key>] : Object | Test.java:6501:9:6501:41 | getMapKeyDefault(...) | provenance | MaD:499 |
+| Test.java:6500:17:6500:18 | in : Object | Test.java:6500:4:6500:6 | out [post update] : Headers [<element>, <map.key>] : Object | provenance | MaD:417 |
+| Test.java:6501:26:6501:40 | getElement(...) : Object [<map.key>] : Object | Test.java:6501:9:6501:41 | getMapKeyDefault(...) | provenance | MaD:1 |
 | Test.java:6501:37:6501:39 | out : Headers [<element>, <map.key>] : Object | Test.java:79:19:79:32 | it : Headers [<element>, <map.key>] : Object | provenance |  |
-| Test.java:6501:37:6501:39 | out : Headers [<element>, <map.key>] : Object | Test.java:6501:26:6501:40 | getElement(...) : Object [<map.key>] : Object | provenance | MaD:492 |
+| Test.java:6501:37:6501:39 | out : Headers [<element>, <map.key>] : Object | Test.java:6501:26:6501:40 | getElement(...) : Object [<map.key>] : Object | provenance | MaD:495 |
 | Test.java:6506:17:6506:33 | (...)... : Headers | Test.java:6507:10:6507:11 | in : Headers | provenance |  |
 | Test.java:6506:26:6506:33 | source(...) : Object | Test.java:6506:17:6506:33 | (...)... : Headers | provenance |  |
-| Test.java:6507:10:6507:11 | in : Headers | Test.java:6507:10:6507:35 | addTimeMillis(...) : Headers | provenance | MaD:430 |
+| Test.java:6507:10:6507:11 | in : Headers | Test.java:6507:10:6507:35 | addTimeMillis(...) : Headers | provenance | MaD:420 |
 | Test.java:6507:10:6507:35 | addTimeMillis(...) : Headers | Test.java:6508:9:6508:11 | out | provenance |  |
 | Test.java:6513:16:6513:31 | (...)... : Object | Test.java:6514:22:6514:23 | in : Object | provenance |  |
 | Test.java:6513:24:6513:31 | source(...) : Object | Test.java:6513:16:6513:31 | (...)... : Object | provenance |  |
 | Test.java:6514:4:6514:6 | out [post update] : Headers [<element>, <map.key>] : Object | Test.java:6515:37:6515:39 | out : Headers [<element>, <map.key>] : Object | provenance |  |
-| Test.java:6514:22:6514:23 | in : Object | Test.java:6514:4:6514:6 | out [post update] : Headers [<element>, <map.key>] : Object | provenance | MaD:431 |
-| Test.java:6515:26:6515:40 | getElement(...) : Object [<map.key>] : Object | Test.java:6515:9:6515:41 | getMapKeyDefault(...) | provenance | MaD:499 |
+| Test.java:6514:22:6514:23 | in : Object | Test.java:6514:4:6514:6 | out [post update] : Headers [<element>, <map.key>] : Object | provenance | MaD:419 |
+| Test.java:6515:26:6515:40 | getElement(...) : Object [<map.key>] : Object | Test.java:6515:9:6515:41 | getMapKeyDefault(...) | provenance | MaD:1 |
 | Test.java:6515:37:6515:39 | out : Headers [<element>, <map.key>] : Object | Test.java:79:19:79:32 | it : Headers [<element>, <map.key>] : Object | provenance |  |
-| Test.java:6515:37:6515:39 | out : Headers [<element>, <map.key>] : Object | Test.java:6515:26:6515:40 | getElement(...) : Object [<map.key>] : Object | provenance | MaD:492 |
+| Test.java:6515:37:6515:39 | out : Headers [<element>, <map.key>] : Object | Test.java:6515:26:6515:40 | getElement(...) : Object [<map.key>] : Object | provenance | MaD:495 |
 | Test.java:6520:17:6520:80 | (...)... : Headers [<element>, <map.value>] : Object | Test.java:6521:10:6521:11 | in : Headers [<element>, <map.value>] : Object | provenance |  |
 | Test.java:6520:26:6520:80 | newWithElementDefault(...) : Object [<element>, <map.value>] : Object | Test.java:6520:17:6520:80 | (...)... : Headers [<element>, <map.value>] : Object | provenance |  |
-| Test.java:6520:48:6520:79 | newWithMapValueDefault(...) : Object [<map.value>] : Object | Test.java:6520:26:6520:80 | newWithElementDefault(...) : Object [<element>, <map.value>] : Object | provenance | MaD:497 |
-| Test.java:6520:71:6520:78 | source(...) : Object | Test.java:6520:48:6520:79 | newWithMapValueDefault(...) : Object [<map.value>] : Object | provenance | MaD:495 |
-| Test.java:6521:10:6521:11 | in : Headers [<element>, <map.value>] : Object | Test.java:6521:10:6521:21 | get(...) : Object | provenance | MaD:390 |
+| Test.java:6520:48:6520:79 | newWithMapValueDefault(...) : Object [<map.value>] : Object | Test.java:6520:26:6520:80 | newWithElementDefault(...) : Object [<element>, <map.value>] : Object | provenance | MaD:3 |
+| Test.java:6520:71:6520:78 | source(...) : Object | Test.java:6520:48:6520:79 | newWithMapValueDefault(...) : Object [<map.value>] : Object | provenance | MaD:5 |
+| Test.java:6521:10:6521:11 | in : Headers [<element>, <map.value>] : Object | Test.java:6521:10:6521:21 | get(...) : Object | provenance | MaD:421 |
 | Test.java:6521:10:6521:21 | get(...) : Object | Test.java:6522:9:6522:11 | out | provenance |  |
 | Test.java:6527:17:6527:80 | (...)... : Headers [<element>, <map.value>] : Object | Test.java:6528:10:6528:11 | in : Headers [<element>, <map.value>] : Object | provenance |  |
 | Test.java:6527:26:6527:80 | newWithElementDefault(...) : Object [<element>, <map.value>] : Object | Test.java:6527:17:6527:80 | (...)... : Headers [<element>, <map.value>] : Object | provenance |  |
-| Test.java:6527:48:6527:79 | newWithMapValueDefault(...) : Object [<map.value>] : Object | Test.java:6527:26:6527:80 | newWithElementDefault(...) : Object [<element>, <map.value>] : Object | provenance | MaD:497 |
-| Test.java:6527:71:6527:78 | source(...) : Object | Test.java:6527:48:6527:79 | newWithMapValueDefault(...) : Object [<map.value>] : Object | provenance | MaD:495 |
-| Test.java:6528:10:6528:11 | in : Headers [<element>, <map.value>] : Object | Test.java:6528:10:6528:27 | get(...) : Object | provenance | MaD:391 |
+| Test.java:6527:48:6527:79 | newWithMapValueDefault(...) : Object [<map.value>] : Object | Test.java:6527:26:6527:80 | newWithElementDefault(...) : Object [<element>, <map.value>] : Object | provenance | MaD:3 |
+| Test.java:6527:71:6527:78 | source(...) : Object | Test.java:6527:48:6527:79 | newWithMapValueDefault(...) : Object [<map.value>] : Object | provenance | MaD:5 |
+| Test.java:6528:10:6528:11 | in : Headers [<element>, <map.value>] : Object | Test.java:6528:10:6528:27 | get(...) : Object | provenance | MaD:423 |
 | Test.java:6528:10:6528:27 | get(...) : Object | Test.java:6529:9:6529:11 | out | provenance |  |
 | Test.java:6534:16:6534:31 | (...)... : Object | Test.java:6536:29:6536:30 | in : Object | provenance |  |
 | Test.java:6534:24:6534:31 | source(...) : Object | Test.java:6534:16:6534:31 | (...)... : Object | provenance |  |
 | Test.java:6536:10:6536:31 | get(...) : Object | Test.java:6537:9:6537:11 | out | provenance |  |
-| Test.java:6536:29:6536:30 | in : Object | Test.java:6536:10:6536:31 | get(...) : Object | provenance | MaD:392 |
+| Test.java:6536:29:6536:30 | in : Object | Test.java:6536:10:6536:31 | get(...) : Object | provenance | MaD:422 |
 | Test.java:6542:17:6542:80 | (...)... : Headers [<element>, <map.value>] : Object | Test.java:6543:10:6543:11 | in : Headers [<element>, <map.value>] : Object | provenance |  |
 | Test.java:6542:26:6542:80 | newWithElementDefault(...) : Object [<element>, <map.value>] : Object | Test.java:6542:17:6542:80 | (...)... : Headers [<element>, <map.value>] : Object | provenance |  |
-| Test.java:6542:48:6542:79 | newWithMapValueDefault(...) : Object [<map.value>] : Object | Test.java:6542:26:6542:80 | newWithElementDefault(...) : Object [<element>, <map.value>] : Object | provenance | MaD:497 |
-| Test.java:6542:71:6542:78 | source(...) : Object | Test.java:6542:48:6542:79 | newWithMapValueDefault(...) : Object [<map.value>] : Object | provenance | MaD:495 |
-| Test.java:6543:10:6543:11 | in : Headers [<element>, <map.value>] : Object | Test.java:6543:10:6543:24 | getAll(...) : List [<element>] : Object | provenance | MaD:393 |
+| Test.java:6542:48:6542:79 | newWithMapValueDefault(...) : Object [<map.value>] : Object | Test.java:6542:26:6542:80 | newWithElementDefault(...) : Object [<element>, <map.value>] : Object | provenance | MaD:3 |
+| Test.java:6542:71:6542:78 | source(...) : Object | Test.java:6542:48:6542:79 | newWithMapValueDefault(...) : Object [<map.value>] : Object | provenance | MaD:5 |
+| Test.java:6543:10:6543:11 | in : Headers [<element>, <map.value>] : Object | Test.java:6543:10:6543:24 | getAll(...) : List [<element>] : Object | provenance | MaD:424 |
 | Test.java:6543:10:6543:24 | getAll(...) : List [<element>] : Object | Test.java:6544:20:6544:22 | out : List [<element>] : Object | provenance |  |
 | Test.java:6544:20:6544:22 | out : List [<element>] : Object | Test.java:79:19:79:32 | it : List [<element>] : Object | provenance |  |
-| Test.java:6544:20:6544:22 | out : List [<element>] : Object | Test.java:6544:9:6544:23 | getElement(...) | provenance | MaD:492 |
+| Test.java:6544:20:6544:22 | out : List [<element>] : Object | Test.java:6544:9:6544:23 | getElement(...) | provenance | MaD:495 |
 | Test.java:6549:17:6549:80 | (...)... : Headers [<element>, <map.value>] : Object | Test.java:6550:10:6550:11 | in : Headers [<element>, <map.value>] : Object | provenance |  |
 | Test.java:6549:26:6549:80 | newWithElementDefault(...) : Object [<element>, <map.value>] : Object | Test.java:6549:17:6549:80 | (...)... : Headers [<element>, <map.value>] : Object | provenance |  |
-| Test.java:6549:48:6549:79 | newWithMapValueDefault(...) : Object [<map.value>] : Object | Test.java:6549:26:6549:80 | newWithElementDefault(...) : Object [<element>, <map.value>] : Object | provenance | MaD:497 |
-| Test.java:6549:71:6549:78 | source(...) : Object | Test.java:6549:48:6549:79 | newWithMapValueDefault(...) : Object [<map.value>] : Object | provenance | MaD:495 |
-| Test.java:6550:10:6550:11 | in : Headers [<element>, <map.value>] : Object | Test.java:6550:10:6550:33 | getAllAndRemove(...) : List [<element>] : Object | provenance | MaD:394 |
+| Test.java:6549:48:6549:79 | newWithMapValueDefault(...) : Object [<map.value>] : Object | Test.java:6549:26:6549:80 | newWithElementDefault(...) : Object [<element>, <map.value>] : Object | provenance | MaD:3 |
+| Test.java:6549:71:6549:78 | source(...) : Object | Test.java:6549:48:6549:79 | newWithMapValueDefault(...) : Object [<map.value>] : Object | provenance | MaD:5 |
+| Test.java:6550:10:6550:11 | in : Headers [<element>, <map.value>] : Object | Test.java:6550:10:6550:33 | getAllAndRemove(...) : List [<element>] : Object | provenance | MaD:425 |
 | Test.java:6550:10:6550:33 | getAllAndRemove(...) : List [<element>] : Object | Test.java:6551:20:6551:22 | out : List [<element>] : Object | provenance |  |
 | Test.java:6551:20:6551:22 | out : List [<element>] : Object | Test.java:79:19:79:32 | it : List [<element>] : Object | provenance |  |
-| Test.java:6551:20:6551:22 | out : List [<element>] : Object | Test.java:6551:9:6551:23 | getElement(...) | provenance | MaD:492 |
+| Test.java:6551:20:6551:22 | out : List [<element>] : Object | Test.java:6551:9:6551:23 | getElement(...) | provenance | MaD:495 |
 | Test.java:6556:17:6556:80 | (...)... : Headers [<element>, <map.value>] : Object | Test.java:6557:10:6557:11 | in : Headers [<element>, <map.value>] : Object | provenance |  |
 | Test.java:6556:26:6556:80 | newWithElementDefault(...) : Object [<element>, <map.value>] : Object | Test.java:6556:17:6556:80 | (...)... : Headers [<element>, <map.value>] : Object | provenance |  |
-| Test.java:6556:48:6556:79 | newWithMapValueDefault(...) : Object [<map.value>] : Object | Test.java:6556:26:6556:80 | newWithElementDefault(...) : Object [<element>, <map.value>] : Object | provenance | MaD:497 |
-| Test.java:6556:71:6556:78 | source(...) : Object | Test.java:6556:48:6556:79 | newWithMapValueDefault(...) : Object [<map.value>] : Object | provenance | MaD:495 |
-| Test.java:6557:10:6557:11 | in : Headers [<element>, <map.value>] : Object | Test.java:6557:10:6557:30 | getAndRemove(...) : Object | provenance | MaD:395 |
-| Test.java:6557:10:6557:11 | in : Headers [<element>, <map.value>] : Object | Test.java:6557:10:6557:30 | getAndRemove(...) : Object | provenance | MaD:396 |
+| Test.java:6556:48:6556:79 | newWithMapValueDefault(...) : Object [<map.value>] : Object | Test.java:6556:26:6556:80 | newWithElementDefault(...) : Object [<element>, <map.value>] : Object | provenance | MaD:3 |
+| Test.java:6556:71:6556:78 | source(...) : Object | Test.java:6556:48:6556:79 | newWithMapValueDefault(...) : Object [<map.value>] : Object | provenance | MaD:5 |
+| Test.java:6557:10:6557:11 | in : Headers [<element>, <map.value>] : Object | Test.java:6557:10:6557:30 | getAndRemove(...) : Object | provenance | MaD:426 |
 | Test.java:6557:10:6557:30 | getAndRemove(...) : Object | Test.java:6558:9:6558:11 | out | provenance |  |
 | Test.java:6563:16:6563:31 | (...)... : Object | Test.java:6565:38:6565:39 | in : Object | provenance |  |
 | Test.java:6563:24:6563:31 | source(...) : Object | Test.java:6563:16:6563:31 | (...)... : Object | provenance |  |
 | Test.java:6565:10:6565:40 | getAndRemove(...) : Object | Test.java:6566:9:6566:11 | out | provenance |  |
-| Test.java:6565:38:6565:39 | in : Object | Test.java:6565:10:6565:40 | getAndRemove(...) : Object | provenance | MaD:397 |
+| Test.java:6565:38:6565:39 | in : Object | Test.java:6565:10:6565:40 | getAndRemove(...) : Object | provenance | MaD:427 |
 | Test.java:6571:17:6571:78 | (...)... : Headers [<element>, <map.key>] : Object | Test.java:6572:10:6572:11 | in : Headers [<element>, <map.key>] : Object | provenance |  |
 | Test.java:6571:26:6571:78 | newWithElementDefault(...) : Object [<element>, <map.key>] : Object | Test.java:6571:17:6571:78 | (...)... : Headers [<element>, <map.key>] : Object | provenance |  |
-| Test.java:6571:48:6571:77 | newWithMapKeyDefault(...) : Object [<map.key>] : Object | Test.java:6571:26:6571:78 | newWithElementDefault(...) : Object [<element>, <map.key>] : Object | provenance | MaD:497 |
-| Test.java:6571:69:6571:76 | source(...) : Object | Test.java:6571:48:6571:77 | newWithMapKeyDefault(...) : Object [<map.key>] : Object | provenance | MaD:496 |
-| Test.java:6572:10:6572:11 | in : Headers [<element>, <map.key>] : Object | Test.java:6572:10:6572:19 | names(...) : Set [<element>] : Object | provenance | MaD:398 |
+| Test.java:6571:48:6571:77 | newWithMapKeyDefault(...) : Object [<map.key>] : Object | Test.java:6571:26:6571:78 | newWithElementDefault(...) : Object [<element>, <map.key>] : Object | provenance | MaD:3 |
+| Test.java:6571:69:6571:76 | source(...) : Object | Test.java:6571:48:6571:77 | newWithMapKeyDefault(...) : Object [<map.key>] : Object | provenance | MaD:4 |
+| Test.java:6572:10:6572:11 | in : Headers [<element>, <map.key>] : Object | Test.java:6572:10:6572:19 | names(...) : Set [<element>] : Object | provenance | MaD:428 |
 | Test.java:6572:10:6572:19 | names(...) : Set [<element>] : Object | Test.java:6573:20:6573:22 | out : Set [<element>] : Object | provenance |  |
 | Test.java:6573:20:6573:22 | out : Set [<element>] : Object | Test.java:79:19:79:32 | it : Set [<element>] : Object | provenance |  |
-| Test.java:6573:20:6573:22 | out : Set [<element>] : Object | Test.java:6573:9:6573:23 | getElement(...) | provenance | MaD:492 |
+| Test.java:6573:20:6573:22 | out : Set [<element>] : Object | Test.java:6573:9:6573:23 | getElement(...) | provenance | MaD:495 |
 | Test.java:6578:17:6578:78 | (...)... : Headers [<element>, <map.key>] : Object | Test.java:6579:12:6579:13 | in : Headers [<element>, <map.key>] : Object | provenance |  |
 | Test.java:6578:26:6578:78 | newWithElementDefault(...) : Object [<element>, <map.key>] : Object | Test.java:6578:17:6578:78 | (...)... : Headers [<element>, <map.key>] : Object | provenance |  |
-| Test.java:6578:48:6578:77 | newWithMapKeyDefault(...) : Object [<map.key>] : Object | Test.java:6578:26:6578:78 | newWithElementDefault(...) : Object [<element>, <map.key>] : Object | provenance | MaD:497 |
-| Test.java:6578:69:6578:76 | source(...) : Object | Test.java:6578:48:6578:77 | newWithMapKeyDefault(...) : Object [<map.key>] : Object | provenance | MaD:496 |
+| Test.java:6578:48:6578:77 | newWithMapKeyDefault(...) : Object [<map.key>] : Object | Test.java:6578:26:6578:78 | newWithElementDefault(...) : Object [<element>, <map.key>] : Object | provenance | MaD:3 |
+| Test.java:6578:69:6578:76 | source(...) : Object | Test.java:6578:48:6578:77 | newWithMapKeyDefault(...) : Object [<map.key>] : Object | provenance | MaD:4 |
 | Test.java:6579:4:6579:6 | out [post update] : Headers [<element>, <map.key>] : Object | Test.java:6580:37:6580:39 | out : Headers [<element>, <map.key>] : Object | provenance |  |
-| Test.java:6579:12:6579:13 | in : Headers [<element>, <map.key>] : Object | Test.java:6579:4:6579:6 | out [post update] : Headers [<element>, <map.key>] : Object | provenance | MaD:433 |
-| Test.java:6580:26:6580:40 | getElement(...) : Object [<map.key>] : Object | Test.java:6580:9:6580:41 | getMapKeyDefault(...) | provenance | MaD:499 |
+| Test.java:6579:12:6579:13 | in : Headers [<element>, <map.key>] : Object | Test.java:6579:4:6579:6 | out [post update] : Headers [<element>, <map.key>] : Object | provenance | MaD:429 |
+| Test.java:6580:26:6580:40 | getElement(...) : Object [<map.key>] : Object | Test.java:6580:9:6580:41 | getMapKeyDefault(...) | provenance | MaD:1 |
 | Test.java:6580:37:6580:39 | out : Headers [<element>, <map.key>] : Object | Test.java:79:19:79:32 | it : Headers [<element>, <map.key>] : Object | provenance |  |
-| Test.java:6580:37:6580:39 | out : Headers [<element>, <map.key>] : Object | Test.java:6580:26:6580:40 | getElement(...) : Object [<map.key>] : Object | provenance | MaD:492 |
+| Test.java:6580:37:6580:39 | out : Headers [<element>, <map.key>] : Object | Test.java:6580:26:6580:40 | getElement(...) : Object [<map.key>] : Object | provenance | MaD:495 |
 | Test.java:6585:17:6585:80 | (...)... : Headers [<element>, <map.value>] : Object | Test.java:6586:12:6586:13 | in : Headers [<element>, <map.value>] : Object | provenance |  |
 | Test.java:6585:26:6585:80 | newWithElementDefault(...) : Object [<element>, <map.value>] : Object | Test.java:6585:17:6585:80 | (...)... : Headers [<element>, <map.value>] : Object | provenance |  |
-| Test.java:6585:48:6585:79 | newWithMapValueDefault(...) : Object [<map.value>] : Object | Test.java:6585:26:6585:80 | newWithElementDefault(...) : Object [<element>, <map.value>] : Object | provenance | MaD:497 |
-| Test.java:6585:71:6585:78 | source(...) : Object | Test.java:6585:48:6585:79 | newWithMapValueDefault(...) : Object [<map.value>] : Object | provenance | MaD:495 |
+| Test.java:6585:48:6585:79 | newWithMapValueDefault(...) : Object [<map.value>] : Object | Test.java:6585:26:6585:80 | newWithElementDefault(...) : Object [<element>, <map.value>] : Object | provenance | MaD:3 |
+| Test.java:6585:71:6585:78 | source(...) : Object | Test.java:6585:48:6585:79 | newWithMapValueDefault(...) : Object [<map.value>] : Object | provenance | MaD:5 |
 | Test.java:6586:4:6586:6 | out [post update] : Headers [<element>, <map.value>] : Object | Test.java:6587:39:6587:41 | out : Headers [<element>, <map.value>] : Object | provenance |  |
-| Test.java:6586:12:6586:13 | in : Headers [<element>, <map.value>] : Object | Test.java:6586:4:6586:6 | out [post update] : Headers [<element>, <map.value>] : Object | provenance | MaD:434 |
-| Test.java:6587:28:6587:42 | getElement(...) : Object [<map.value>] : Object | Test.java:6587:9:6587:43 | getMapValueDefault(...) | provenance | MaD:498 |
+| Test.java:6586:12:6586:13 | in : Headers [<element>, <map.value>] : Object | Test.java:6586:4:6586:6 | out [post update] : Headers [<element>, <map.value>] : Object | provenance | MaD:430 |
+| Test.java:6587:28:6587:42 | getElement(...) : Object [<map.value>] : Object | Test.java:6587:9:6587:43 | getMapValueDefault(...) | provenance | MaD:2 |
 | Test.java:6587:39:6587:41 | out : Headers [<element>, <map.value>] : Object | Test.java:79:19:79:32 | it : Headers [<element>, <map.value>] : Object | provenance |  |
-| Test.java:6587:39:6587:41 | out : Headers [<element>, <map.value>] : Object | Test.java:6587:28:6587:42 | getElement(...) : Object [<map.value>] : Object | provenance | MaD:492 |
+| Test.java:6587:39:6587:41 | out : Headers [<element>, <map.value>] : Object | Test.java:6587:28:6587:42 | getElement(...) : Object [<map.value>] : Object | provenance | MaD:495 |
 | Test.java:6592:16:6592:31 | (...)... : Object | Test.java:6593:12:6593:13 | in : Object | provenance |  |
 | Test.java:6592:24:6592:31 | source(...) : Object | Test.java:6592:16:6592:31 | (...)... : Object | provenance |  |
 | Test.java:6593:4:6593:6 | out [post update] : Headers [<element>, <map.key>] : Object | Test.java:6594:37:6594:39 | out : Headers [<element>, <map.key>] : Object | provenance |  |
-| Test.java:6593:12:6593:13 | in : Object | Test.java:6593:4:6593:6 | out [post update] : Headers [<element>, <map.key>] : Object | provenance | MaD:435 |
-| Test.java:6594:26:6594:40 | getElement(...) : Object [<map.key>] : Object | Test.java:6594:9:6594:41 | getMapKeyDefault(...) | provenance | MaD:499 |
+| Test.java:6593:12:6593:13 | in : Object | Test.java:6593:4:6593:6 | out [post update] : Headers [<element>, <map.key>] : Object | provenance | MaD:431 |
+| Test.java:6594:26:6594:40 | getElement(...) : Object [<map.key>] : Object | Test.java:6594:9:6594:41 | getMapKeyDefault(...) | provenance | MaD:1 |
 | Test.java:6594:37:6594:39 | out : Headers [<element>, <map.key>] : Object | Test.java:79:19:79:32 | it : Headers [<element>, <map.key>] : Object | provenance |  |
-| Test.java:6594:37:6594:39 | out : Headers [<element>, <map.key>] : Object | Test.java:6594:26:6594:40 | getElement(...) : Object [<map.key>] : Object | provenance | MaD:492 |
+| Test.java:6594:37:6594:39 | out : Headers [<element>, <map.key>] : Object | Test.java:6594:26:6594:40 | getElement(...) : Object [<map.key>] : Object | provenance | MaD:495 |
 | Test.java:6599:18:6599:44 | (...)... : List [<element>] : Object | Test.java:6600:26:6600:27 | in : List [<element>] : Object | provenance |  |
 | Test.java:6599:28:6599:44 | of(...) : List [<element>] : Object | Test.java:6599:18:6599:44 | (...)... : List [<element>] : Object | provenance |  |
-| Test.java:6599:36:6599:43 | source(...) : Object | Test.java:6599:28:6599:44 | of(...) : List [<element>] : Object | provenance | MaD:494 |
+| Test.java:6599:36:6599:43 | source(...) : Object | Test.java:6599:28:6599:44 | of(...) : List [<element>] : Object | provenance | MaD:497 |
 | Test.java:6600:4:6600:6 | out [post update] : Headers [<element>, <map.value>] : Object | Test.java:6601:39:6601:41 | out : Headers [<element>, <map.value>] : Object | provenance |  |
-| Test.java:6600:26:6600:27 | in : List [<element>] : Object | Test.java:6600:4:6600:6 | out [post update] : Headers [<element>, <map.value>] : Object | provenance | MaD:436 |
-| Test.java:6601:28:6601:42 | getElement(...) : Object [<map.value>] : Object | Test.java:6601:9:6601:43 | getMapValueDefault(...) | provenance | MaD:498 |
+| Test.java:6600:26:6600:27 | in : List [<element>] : Object | Test.java:6600:4:6600:6 | out [post update] : Headers [<element>, <map.value>] : Object | provenance | MaD:432 |
+| Test.java:6601:28:6601:42 | getElement(...) : Object [<map.value>] : Object | Test.java:6601:9:6601:43 | getMapValueDefault(...) | provenance | MaD:2 |
 | Test.java:6601:39:6601:41 | out : Headers [<element>, <map.value>] : Object | Test.java:79:19:79:32 | it : Headers [<element>, <map.value>] : Object | provenance |  |
-| Test.java:6601:39:6601:41 | out : Headers [<element>, <map.value>] : Object | Test.java:6601:28:6601:42 | getElement(...) : Object [<map.value>] : Object | provenance | MaD:492 |
+| Test.java:6601:39:6601:41 | out : Headers [<element>, <map.value>] : Object | Test.java:6601:28:6601:42 | getElement(...) : Object [<map.value>] : Object | provenance | MaD:495 |
 | Test.java:6606:16:6606:31 | (...)... : Object | Test.java:6607:12:6607:13 | in : Object | provenance |  |
 | Test.java:6606:24:6606:31 | source(...) : Object | Test.java:6606:16:6606:31 | (...)... : Object | provenance |  |
 | Test.java:6607:4:6607:6 | out [post update] : Headers [<element>, <map.key>] : Object | Test.java:6608:37:6608:39 | out : Headers [<element>, <map.key>] : Object | provenance |  |
-| Test.java:6607:12:6607:13 | in : Object | Test.java:6607:4:6607:6 | out [post update] : Headers [<element>, <map.key>] : Object | provenance | MaD:439 |
-| Test.java:6608:26:6608:40 | getElement(...) : Object [<map.key>] : Object | Test.java:6608:9:6608:41 | getMapKeyDefault(...) | provenance | MaD:499 |
+| Test.java:6607:12:6607:13 | in : Object | Test.java:6607:4:6607:6 | out [post update] : Headers [<element>, <map.key>] : Object | provenance | MaD:433 |
+| Test.java:6608:26:6608:40 | getElement(...) : Object [<map.key>] : Object | Test.java:6608:9:6608:41 | getMapKeyDefault(...) | provenance | MaD:1 |
 | Test.java:6608:37:6608:39 | out : Headers [<element>, <map.key>] : Object | Test.java:79:19:79:32 | it : Headers [<element>, <map.key>] : Object | provenance |  |
-| Test.java:6608:37:6608:39 | out : Headers [<element>, <map.key>] : Object | Test.java:6608:26:6608:40 | getElement(...) : Object [<map.key>] : Object | provenance | MaD:492 |
+| Test.java:6608:37:6608:39 | out : Headers [<element>, <map.key>] : Object | Test.java:6608:26:6608:40 | getElement(...) : Object [<map.key>] : Object | provenance | MaD:495 |
 | Test.java:6613:16:6613:31 | (...)... : Object | Test.java:6614:26:6614:27 | in : Object | provenance |  |
 | Test.java:6613:24:6613:31 | source(...) : Object | Test.java:6613:16:6613:31 | (...)... : Object | provenance |  |
 | Test.java:6614:4:6614:6 | out [post update] : Headers [<element>, <map.value>] : Object | Test.java:6615:39:6615:41 | out : Headers [<element>, <map.value>] : Object | provenance |  |
-| Test.java:6614:26:6614:27 | in : Object | Test.java:6614:4:6614:6 | out [post update] : Headers [<element>, <map.value>] : Object | provenance | MaD:440 |
-| Test.java:6615:28:6615:42 | getElement(...) : Object [<map.value>] : Object | Test.java:6615:9:6615:43 | getMapValueDefault(...) | provenance | MaD:498 |
+| Test.java:6614:26:6614:27 | in : Object | Test.java:6614:4:6614:6 | out [post update] : Headers [<element>, <map.value>] : Object | provenance | MaD:434 |
+| Test.java:6615:28:6615:42 | getElement(...) : Object [<map.value>] : Object | Test.java:6615:9:6615:43 | getMapValueDefault(...) | provenance | MaD:2 |
 | Test.java:6615:39:6615:41 | out : Headers [<element>, <map.value>] : Object | Test.java:79:19:79:32 | it : Headers [<element>, <map.value>] : Object | provenance |  |
-| Test.java:6615:39:6615:41 | out : Headers [<element>, <map.value>] : Object | Test.java:6615:28:6615:42 | getElement(...) : Object [<map.value>] : Object | provenance | MaD:492 |
+| Test.java:6615:39:6615:41 | out : Headers [<element>, <map.value>] : Object | Test.java:6615:28:6615:42 | getElement(...) : Object [<map.value>] : Object | provenance | MaD:495 |
 | Test.java:6620:16:6620:31 | (...)... : Object | Test.java:6621:12:6621:13 | in : Object | provenance |  |
 | Test.java:6620:24:6620:31 | source(...) : Object | Test.java:6620:16:6620:31 | (...)... : Object | provenance |  |
 | Test.java:6621:4:6621:6 | out [post update] : Headers [<element>, <map.key>] : Object | Test.java:6622:37:6622:39 | out : Headers [<element>, <map.key>] : Object | provenance |  |
-| Test.java:6621:12:6621:13 | in : Object | Test.java:6621:4:6621:6 | out [post update] : Headers [<element>, <map.key>] : Object | provenance | MaD:437 |
-| Test.java:6622:26:6622:40 | getElement(...) : Object [<map.key>] : Object | Test.java:6622:9:6622:41 | getMapKeyDefault(...) | provenance | MaD:499 |
+| Test.java:6621:12:6621:13 | in : Object | Test.java:6621:4:6621:6 | out [post update] : Headers [<element>, <map.key>] : Object | provenance | MaD:435 |
+| Test.java:6622:26:6622:40 | getElement(...) : Object [<map.key>] : Object | Test.java:6622:9:6622:41 | getMapKeyDefault(...) | provenance | MaD:1 |
 | Test.java:6622:37:6622:39 | out : Headers [<element>, <map.key>] : Object | Test.java:79:19:79:32 | it : Headers [<element>, <map.key>] : Object | provenance |  |
-| Test.java:6622:37:6622:39 | out : Headers [<element>, <map.key>] : Object | Test.java:6622:26:6622:40 | getElement(...) : Object [<map.key>] : Object | provenance | MaD:492 |
+| Test.java:6622:37:6622:39 | out : Headers [<element>, <map.key>] : Object | Test.java:6622:26:6622:40 | getElement(...) : Object [<map.key>] : Object | provenance | MaD:495 |
 | Test.java:6627:18:6627:49 | (...)... : Object[] [[]] : Object | Test.java:6628:26:6628:27 | in : Object[] [[]] : Object | provenance |  |
 | Test.java:6627:28:6627:49 | {...} : Object[] [[]] : Object | Test.java:6627:18:6627:49 | (...)... : Object[] [[]] : Object | provenance |  |
 | Test.java:6627:41:6627:48 | source(...) : Object | Test.java:6627:28:6627:49 | {...} : Object[] [[]] : Object | provenance |  |
 | Test.java:6628:4:6628:6 | out [post update] : Headers [<element>, <map.value>] : Object | Test.java:6629:39:6629:41 | out : Headers [<element>, <map.value>] : Object | provenance |  |
-| Test.java:6628:26:6628:27 | in : Object[] [[]] : Object | Test.java:6628:4:6628:6 | out [post update] : Headers [<element>, <map.value>] : Object | provenance | MaD:438 |
-| Test.java:6629:28:6629:42 | getElement(...) : Object [<map.value>] : Object | Test.java:6629:9:6629:43 | getMapValueDefault(...) | provenance | MaD:498 |
+| Test.java:6628:26:6628:27 | in : Object[] [[]] : Object | Test.java:6628:4:6628:6 | out [post update] : Headers [<element>, <map.value>] : Object | provenance | MaD:436 |
+| Test.java:6629:28:6629:42 | getElement(...) : Object [<map.value>] : Object | Test.java:6629:9:6629:43 | getMapValueDefault(...) | provenance | MaD:2 |
 | Test.java:6629:39:6629:41 | out : Headers [<element>, <map.value>] : Object | Test.java:79:19:79:32 | it : Headers [<element>, <map.value>] : Object | provenance |  |
-| Test.java:6629:39:6629:41 | out : Headers [<element>, <map.value>] : Object | Test.java:6629:28:6629:42 | getElement(...) : Object [<map.value>] : Object | provenance | MaD:492 |
+| Test.java:6629:39:6629:41 | out : Headers [<element>, <map.value>] : Object | Test.java:6629:28:6629:42 | getElement(...) : Object [<map.value>] : Object | provenance | MaD:495 |
 | Test.java:6634:17:6634:33 | (...)... : Headers | Test.java:6635:10:6635:11 | in : Headers | provenance |  |
 | Test.java:6634:26:6634:33 | source(...) : Object | Test.java:6634:17:6634:33 | (...)... : Headers | provenance |  |
-| Test.java:6635:10:6635:11 | in : Headers | Test.java:6635:10:6635:45 | set(...) : Headers | provenance | MaD:432 |
+| Test.java:6635:10:6635:11 | in : Headers | Test.java:6635:10:6635:45 | set(...) : Headers | provenance | MaD:437 |
 | Test.java:6635:10:6635:45 | set(...) : Headers | Test.java:6636:9:6636:11 | out | provenance |  |
 | Test.java:6641:17:6641:33 | (...)... : Headers | Test.java:6642:10:6642:11 | in : Headers | provenance |  |
 | Test.java:6641:26:6641:33 | source(...) : Object | Test.java:6641:17:6641:33 | (...)... : Headers | provenance |  |
-| Test.java:6642:10:6642:11 | in : Headers | Test.java:6642:10:6642:43 | set(...) : Headers | provenance | MaD:432 |
+| Test.java:6642:10:6642:11 | in : Headers | Test.java:6642:10:6642:43 | set(...) : Headers | provenance | MaD:437 |
 | Test.java:6642:10:6642:43 | set(...) : Headers | Test.java:6643:9:6643:11 | out | provenance |  |
 | Test.java:6648:17:6648:33 | (...)... : Headers | Test.java:6649:10:6649:11 | in : Headers | provenance |  |
 | Test.java:6648:26:6648:33 | source(...) : Object | Test.java:6648:17:6648:33 | (...)... : Headers | provenance |  |
-| Test.java:6649:10:6649:11 | in : Headers | Test.java:6649:10:6649:45 | set(...) : Headers | provenance | MaD:432 |
+| Test.java:6649:10:6649:11 | in : Headers | Test.java:6649:10:6649:45 | set(...) : Headers | provenance | MaD:437 |
 | Test.java:6649:10:6649:45 | set(...) : Headers | Test.java:6650:9:6650:11 | out | provenance |  |
 | Test.java:6655:17:6655:33 | (...)... : Headers | Test.java:6656:10:6656:11 | in : Headers | provenance |  |
 | Test.java:6655:26:6655:33 | source(...) : Object | Test.java:6655:17:6655:33 | (...)... : Headers | provenance |  |
-| Test.java:6656:10:6656:11 | in : Headers | Test.java:6656:10:6656:21 | set(...) : Headers | provenance | MaD:432 |
+| Test.java:6656:10:6656:11 | in : Headers | Test.java:6656:10:6656:21 | set(...) : Headers | provenance | MaD:437 |
 | Test.java:6656:10:6656:21 | set(...) : Headers | Test.java:6657:9:6657:11 | out | provenance |  |
 | Test.java:6662:17:6662:78 | (...)... : Headers [<element>, <map.key>] : Object | Test.java:6663:15:6663:16 | in : Headers [<element>, <map.key>] : Object | provenance |  |
 | Test.java:6662:26:6662:78 | newWithElementDefault(...) : Object [<element>, <map.key>] : Object | Test.java:6662:17:6662:78 | (...)... : Headers [<element>, <map.key>] : Object | provenance |  |
-| Test.java:6662:48:6662:77 | newWithMapKeyDefault(...) : Object [<map.key>] : Object | Test.java:6662:26:6662:78 | newWithElementDefault(...) : Object [<element>, <map.key>] : Object | provenance | MaD:497 |
-| Test.java:6662:69:6662:76 | source(...) : Object | Test.java:6662:48:6662:77 | newWithMapKeyDefault(...) : Object [<map.key>] : Object | provenance | MaD:496 |
+| Test.java:6662:48:6662:77 | newWithMapKeyDefault(...) : Object [<map.key>] : Object | Test.java:6662:26:6662:78 | newWithElementDefault(...) : Object [<element>, <map.key>] : Object | provenance | MaD:3 |
+| Test.java:6662:69:6662:76 | source(...) : Object | Test.java:6662:48:6662:77 | newWithMapKeyDefault(...) : Object [<map.key>] : Object | provenance | MaD:4 |
 | Test.java:6663:4:6663:6 | out [post update] : Headers [<element>, <map.key>] : Object | Test.java:6664:37:6664:39 | out : Headers [<element>, <map.key>] : Object | provenance |  |
-| Test.java:6663:15:6663:16 | in : Headers [<element>, <map.key>] : Object | Test.java:6663:4:6663:6 | out [post update] : Headers [<element>, <map.key>] : Object | provenance | MaD:441 |
-| Test.java:6664:26:6664:40 | getElement(...) : Object [<map.key>] : Object | Test.java:6664:9:6664:41 | getMapKeyDefault(...) | provenance | MaD:499 |
+| Test.java:6663:15:6663:16 | in : Headers [<element>, <map.key>] : Object | Test.java:6663:4:6663:6 | out [post update] : Headers [<element>, <map.key>] : Object | provenance | MaD:438 |
+| Test.java:6664:26:6664:40 | getElement(...) : Object [<map.key>] : Object | Test.java:6664:9:6664:41 | getMapKeyDefault(...) | provenance | MaD:1 |
 | Test.java:6664:37:6664:39 | out : Headers [<element>, <map.key>] : Object | Test.java:79:19:79:32 | it : Headers [<element>, <map.key>] : Object | provenance |  |
-| Test.java:6664:37:6664:39 | out : Headers [<element>, <map.key>] : Object | Test.java:6664:26:6664:40 | getElement(...) : Object [<map.key>] : Object | provenance | MaD:492 |
+| Test.java:6664:37:6664:39 | out : Headers [<element>, <map.key>] : Object | Test.java:6664:26:6664:40 | getElement(...) : Object [<map.key>] : Object | provenance | MaD:495 |
 | Test.java:6669:17:6669:80 | (...)... : Headers [<element>, <map.value>] : Object | Test.java:6670:15:6670:16 | in : Headers [<element>, <map.value>] : Object | provenance |  |
 | Test.java:6669:26:6669:80 | newWithElementDefault(...) : Object [<element>, <map.value>] : Object | Test.java:6669:17:6669:80 | (...)... : Headers [<element>, <map.value>] : Object | provenance |  |
-| Test.java:6669:48:6669:79 | newWithMapValueDefault(...) : Object [<map.value>] : Object | Test.java:6669:26:6669:80 | newWithElementDefault(...) : Object [<element>, <map.value>] : Object | provenance | MaD:497 |
-| Test.java:6669:71:6669:78 | source(...) : Object | Test.java:6669:48:6669:79 | newWithMapValueDefault(...) : Object [<map.value>] : Object | provenance | MaD:495 |
+| Test.java:6669:48:6669:79 | newWithMapValueDefault(...) : Object [<map.value>] : Object | Test.java:6669:26:6669:80 | newWithElementDefault(...) : Object [<element>, <map.value>] : Object | provenance | MaD:3 |
+| Test.java:6669:71:6669:78 | source(...) : Object | Test.java:6669:48:6669:79 | newWithMapValueDefault(...) : Object [<map.value>] : Object | provenance | MaD:5 |
 | Test.java:6670:4:6670:6 | out [post update] : Headers [<element>, <map.value>] : Object | Test.java:6671:39:6671:41 | out : Headers [<element>, <map.value>] : Object | provenance |  |
-| Test.java:6670:15:6670:16 | in : Headers [<element>, <map.value>] : Object | Test.java:6670:4:6670:6 | out [post update] : Headers [<element>, <map.value>] : Object | provenance | MaD:442 |
-| Test.java:6671:28:6671:42 | getElement(...) : Object [<map.value>] : Object | Test.java:6671:9:6671:43 | getMapValueDefault(...) | provenance | MaD:498 |
+| Test.java:6670:15:6670:16 | in : Headers [<element>, <map.value>] : Object | Test.java:6670:4:6670:6 | out [post update] : Headers [<element>, <map.value>] : Object | provenance | MaD:439 |
+| Test.java:6671:28:6671:42 | getElement(...) : Object [<map.value>] : Object | Test.java:6671:9:6671:43 | getMapValueDefault(...) | provenance | MaD:2 |
 | Test.java:6671:39:6671:41 | out : Headers [<element>, <map.value>] : Object | Test.java:79:19:79:32 | it : Headers [<element>, <map.value>] : Object | provenance |  |
-| Test.java:6671:39:6671:41 | out : Headers [<element>, <map.value>] : Object | Test.java:6671:28:6671:42 | getElement(...) : Object [<map.value>] : Object | provenance | MaD:492 |
+| Test.java:6671:39:6671:41 | out : Headers [<element>, <map.value>] : Object | Test.java:6671:28:6671:42 | getElement(...) : Object [<map.value>] : Object | provenance | MaD:495 |
 | Test.java:6676:17:6676:33 | (...)... : Headers | Test.java:6677:10:6677:11 | in : Headers | provenance |  |
 | Test.java:6676:26:6676:33 | source(...) : Object | Test.java:6676:17:6676:33 | (...)... : Headers | provenance |  |
-| Test.java:6677:10:6677:11 | in : Headers | Test.java:6677:10:6677:35 | setBoolean(...) : Headers | provenance | MaD:449 |
+| Test.java:6677:10:6677:11 | in : Headers | Test.java:6677:10:6677:35 | setBoolean(...) : Headers | provenance | MaD:441 |
 | Test.java:6677:10:6677:35 | setBoolean(...) : Headers | Test.java:6678:9:6678:11 | out | provenance |  |
 | Test.java:6683:16:6683:31 | (...)... : Object | Test.java:6684:19:6684:20 | in : Object | provenance |  |
 | Test.java:6683:24:6683:31 | source(...) : Object | Test.java:6683:16:6683:31 | (...)... : Object | provenance |  |
 | Test.java:6684:4:6684:6 | out [post update] : Headers [<element>, <map.key>] : Object | Test.java:6685:37:6685:39 | out : Headers [<element>, <map.key>] : Object | provenance |  |
-| Test.java:6684:19:6684:20 | in : Object | Test.java:6684:4:6684:6 | out [post update] : Headers [<element>, <map.key>] : Object | provenance | MaD:450 |
-| Test.java:6685:26:6685:40 | getElement(...) : Object [<map.key>] : Object | Test.java:6685:9:6685:41 | getMapKeyDefault(...) | provenance | MaD:499 |
+| Test.java:6684:19:6684:20 | in : Object | Test.java:6684:4:6684:6 | out [post update] : Headers [<element>, <map.key>] : Object | provenance | MaD:440 |
+| Test.java:6685:26:6685:40 | getElement(...) : Object [<map.key>] : Object | Test.java:6685:9:6685:41 | getMapKeyDefault(...) | provenance | MaD:1 |
 | Test.java:6685:37:6685:39 | out : Headers [<element>, <map.key>] : Object | Test.java:79:19:79:32 | it : Headers [<element>, <map.key>] : Object | provenance |  |
-| Test.java:6685:37:6685:39 | out : Headers [<element>, <map.key>] : Object | Test.java:6685:26:6685:40 | getElement(...) : Object [<map.key>] : Object | provenance | MaD:492 |
+| Test.java:6685:37:6685:39 | out : Headers [<element>, <map.key>] : Object | Test.java:6685:26:6685:40 | getElement(...) : Object [<map.key>] : Object | provenance | MaD:495 |
 | Test.java:6690:17:6690:33 | (...)... : Headers | Test.java:6691:10:6691:11 | in : Headers | provenance |  |
 | Test.java:6690:26:6690:33 | source(...) : Object | Test.java:6690:17:6690:33 | (...)... : Headers | provenance |  |
-| Test.java:6691:10:6691:11 | in : Headers | Test.java:6691:10:6691:34 | setByte(...) : Headers | provenance | MaD:451 |
+| Test.java:6691:10:6691:11 | in : Headers | Test.java:6691:10:6691:34 | setByte(...) : Headers | provenance | MaD:443 |
 | Test.java:6691:10:6691:34 | setByte(...) : Headers | Test.java:6692:9:6692:11 | out | provenance |  |
 | Test.java:6697:16:6697:31 | (...)... : Object | Test.java:6698:16:6698:17 | in : Object | provenance |  |
 | Test.java:6697:24:6697:31 | source(...) : Object | Test.java:6697:16:6697:31 | (...)... : Object | provenance |  |
 | Test.java:6698:4:6698:6 | out [post update] : Headers [<element>, <map.key>] : Object | Test.java:6699:37:6699:39 | out : Headers [<element>, <map.key>] : Object | provenance |  |
-| Test.java:6698:16:6698:17 | in : Object | Test.java:6698:4:6698:6 | out [post update] : Headers [<element>, <map.key>] : Object | provenance | MaD:452 |
-| Test.java:6699:26:6699:40 | getElement(...) : Object [<map.key>] : Object | Test.java:6699:9:6699:41 | getMapKeyDefault(...) | provenance | MaD:499 |
+| Test.java:6698:16:6698:17 | in : Object | Test.java:6698:4:6698:6 | out [post update] : Headers [<element>, <map.key>] : Object | provenance | MaD:442 |
+| Test.java:6699:26:6699:40 | getElement(...) : Object [<map.key>] : Object | Test.java:6699:9:6699:41 | getMapKeyDefault(...) | provenance | MaD:1 |
 | Test.java:6699:37:6699:39 | out : Headers [<element>, <map.key>] : Object | Test.java:79:19:79:32 | it : Headers [<element>, <map.key>] : Object | provenance |  |
-| Test.java:6699:37:6699:39 | out : Headers [<element>, <map.key>] : Object | Test.java:6699:26:6699:40 | getElement(...) : Object [<map.key>] : Object | provenance | MaD:492 |
+| Test.java:6699:37:6699:39 | out : Headers [<element>, <map.key>] : Object | Test.java:6699:26:6699:40 | getElement(...) : Object [<map.key>] : Object | provenance | MaD:495 |
 | Test.java:6704:17:6704:33 | (...)... : Headers | Test.java:6705:10:6705:11 | in : Headers | provenance |  |
 | Test.java:6704:26:6704:33 | source(...) : Object | Test.java:6704:17:6704:33 | (...)... : Headers | provenance |  |
-| Test.java:6705:10:6705:11 | in : Headers | Test.java:6705:10:6705:31 | setChar(...) : Headers | provenance | MaD:453 |
+| Test.java:6705:10:6705:11 | in : Headers | Test.java:6705:10:6705:31 | setChar(...) : Headers | provenance | MaD:445 |
 | Test.java:6705:10:6705:31 | setChar(...) : Headers | Test.java:6706:9:6706:11 | out | provenance |  |
 | Test.java:6711:16:6711:31 | (...)... : Object | Test.java:6712:16:6712:17 | in : Object | provenance |  |
 | Test.java:6711:24:6711:31 | source(...) : Object | Test.java:6711:16:6711:31 | (...)... : Object | provenance |  |
 | Test.java:6712:4:6712:6 | out [post update] : Headers [<element>, <map.key>] : Object | Test.java:6713:37:6713:39 | out : Headers [<element>, <map.key>] : Object | provenance |  |
-| Test.java:6712:16:6712:17 | in : Object | Test.java:6712:4:6712:6 | out [post update] : Headers [<element>, <map.key>] : Object | provenance | MaD:454 |
-| Test.java:6713:26:6713:40 | getElement(...) : Object [<map.key>] : Object | Test.java:6713:9:6713:41 | getMapKeyDefault(...) | provenance | MaD:499 |
+| Test.java:6712:16:6712:17 | in : Object | Test.java:6712:4:6712:6 | out [post update] : Headers [<element>, <map.key>] : Object | provenance | MaD:444 |
+| Test.java:6713:26:6713:40 | getElement(...) : Object [<map.key>] : Object | Test.java:6713:9:6713:41 | getMapKeyDefault(...) | provenance | MaD:1 |
 | Test.java:6713:37:6713:39 | out : Headers [<element>, <map.key>] : Object | Test.java:79:19:79:32 | it : Headers [<element>, <map.key>] : Object | provenance |  |
-| Test.java:6713:37:6713:39 | out : Headers [<element>, <map.key>] : Object | Test.java:6713:26:6713:40 | getElement(...) : Object [<map.key>] : Object | provenance | MaD:492 |
+| Test.java:6713:37:6713:39 | out : Headers [<element>, <map.key>] : Object | Test.java:6713:26:6713:40 | getElement(...) : Object [<map.key>] : Object | provenance | MaD:495 |
 | Test.java:6718:17:6718:33 | (...)... : Headers | Test.java:6719:10:6719:11 | in : Headers | provenance |  |
 | Test.java:6718:26:6718:33 | source(...) : Object | Test.java:6718:17:6718:33 | (...)... : Headers | provenance |  |
-| Test.java:6719:10:6719:11 | in : Headers | Test.java:6719:10:6719:32 | setDouble(...) : Headers | provenance | MaD:455 |
+| Test.java:6719:10:6719:11 | in : Headers | Test.java:6719:10:6719:32 | setDouble(...) : Headers | provenance | MaD:447 |
 | Test.java:6719:10:6719:32 | setDouble(...) : Headers | Test.java:6720:9:6720:11 | out | provenance |  |
 | Test.java:6725:16:6725:31 | (...)... : Object | Test.java:6726:18:6726:19 | in : Object | provenance |  |
 | Test.java:6725:24:6725:31 | source(...) : Object | Test.java:6725:16:6725:31 | (...)... : Object | provenance |  |
 | Test.java:6726:4:6726:6 | out [post update] : Headers [<element>, <map.key>] : Object | Test.java:6727:37:6727:39 | out : Headers [<element>, <map.key>] : Object | provenance |  |
-| Test.java:6726:18:6726:19 | in : Object | Test.java:6726:4:6726:6 | out [post update] : Headers [<element>, <map.key>] : Object | provenance | MaD:456 |
-| Test.java:6727:26:6727:40 | getElement(...) : Object [<map.key>] : Object | Test.java:6727:9:6727:41 | getMapKeyDefault(...) | provenance | MaD:499 |
+| Test.java:6726:18:6726:19 | in : Object | Test.java:6726:4:6726:6 | out [post update] : Headers [<element>, <map.key>] : Object | provenance | MaD:446 |
+| Test.java:6727:26:6727:40 | getElement(...) : Object [<map.key>] : Object | Test.java:6727:9:6727:41 | getMapKeyDefault(...) | provenance | MaD:1 |
 | Test.java:6727:37:6727:39 | out : Headers [<element>, <map.key>] : Object | Test.java:79:19:79:32 | it : Headers [<element>, <map.key>] : Object | provenance |  |
-| Test.java:6727:37:6727:39 | out : Headers [<element>, <map.key>] : Object | Test.java:6727:26:6727:40 | getElement(...) : Object [<map.key>] : Object | provenance | MaD:492 |
+| Test.java:6727:37:6727:39 | out : Headers [<element>, <map.key>] : Object | Test.java:6727:26:6727:40 | getElement(...) : Object [<map.key>] : Object | provenance | MaD:495 |
 | Test.java:6732:17:6732:33 | (...)... : Headers | Test.java:6733:10:6733:11 | in : Headers | provenance |  |
 | Test.java:6732:26:6732:33 | source(...) : Object | Test.java:6732:17:6732:33 | (...)... : Headers | provenance |  |
-| Test.java:6733:10:6733:11 | in : Headers | Test.java:6733:10:6733:32 | setFloat(...) : Headers | provenance | MaD:457 |
+| Test.java:6733:10:6733:11 | in : Headers | Test.java:6733:10:6733:32 | setFloat(...) : Headers | provenance | MaD:449 |
 | Test.java:6733:10:6733:32 | setFloat(...) : Headers | Test.java:6734:9:6734:11 | out | provenance |  |
 | Test.java:6739:16:6739:31 | (...)... : Object | Test.java:6740:17:6740:18 | in : Object | provenance |  |
 | Test.java:6739:24:6739:31 | source(...) : Object | Test.java:6739:16:6739:31 | (...)... : Object | provenance |  |
 | Test.java:6740:4:6740:6 | out [post update] : Headers [<element>, <map.key>] : Object | Test.java:6741:37:6741:39 | out : Headers [<element>, <map.key>] : Object | provenance |  |
-| Test.java:6740:17:6740:18 | in : Object | Test.java:6740:4:6740:6 | out [post update] : Headers [<element>, <map.key>] : Object | provenance | MaD:458 |
-| Test.java:6741:26:6741:40 | getElement(...) : Object [<map.key>] : Object | Test.java:6741:9:6741:41 | getMapKeyDefault(...) | provenance | MaD:499 |
+| Test.java:6740:17:6740:18 | in : Object | Test.java:6740:4:6740:6 | out [post update] : Headers [<element>, <map.key>] : Object | provenance | MaD:448 |
+| Test.java:6741:26:6741:40 | getElement(...) : Object [<map.key>] : Object | Test.java:6741:9:6741:41 | getMapKeyDefault(...) | provenance | MaD:1 |
 | Test.java:6741:37:6741:39 | out : Headers [<element>, <map.key>] : Object | Test.java:79:19:79:32 | it : Headers [<element>, <map.key>] : Object | provenance |  |
-| Test.java:6741:37:6741:39 | out : Headers [<element>, <map.key>] : Object | Test.java:6741:26:6741:40 | getElement(...) : Object [<map.key>] : Object | provenance | MaD:492 |
+| Test.java:6741:37:6741:39 | out : Headers [<element>, <map.key>] : Object | Test.java:6741:26:6741:40 | getElement(...) : Object [<map.key>] : Object | provenance | MaD:495 |
 | Test.java:6746:17:6746:33 | (...)... : Headers | Test.java:6747:10:6747:11 | in : Headers | provenance |  |
 | Test.java:6746:26:6746:33 | source(...) : Object | Test.java:6746:17:6746:33 | (...)... : Headers | provenance |  |
-| Test.java:6747:10:6747:11 | in : Headers | Test.java:6747:10:6747:27 | setInt(...) : Headers | provenance | MaD:459 |
+| Test.java:6747:10:6747:11 | in : Headers | Test.java:6747:10:6747:27 | setInt(...) : Headers | provenance | MaD:451 |
 | Test.java:6747:10:6747:27 | setInt(...) : Headers | Test.java:6748:9:6748:11 | out | provenance |  |
 | Test.java:6753:16:6753:31 | (...)... : Object | Test.java:6754:15:6754:16 | in : Object | provenance |  |
 | Test.java:6753:24:6753:31 | source(...) : Object | Test.java:6753:16:6753:31 | (...)... : Object | provenance |  |
 | Test.java:6754:4:6754:6 | out [post update] : Headers [<element>, <map.key>] : Object | Test.java:6755:37:6755:39 | out : Headers [<element>, <map.key>] : Object | provenance |  |
-| Test.java:6754:15:6754:16 | in : Object | Test.java:6754:4:6754:6 | out [post update] : Headers [<element>, <map.key>] : Object | provenance | MaD:460 |
-| Test.java:6755:26:6755:40 | getElement(...) : Object [<map.key>] : Object | Test.java:6755:9:6755:41 | getMapKeyDefault(...) | provenance | MaD:499 |
+| Test.java:6754:15:6754:16 | in : Object | Test.java:6754:4:6754:6 | out [post update] : Headers [<element>, <map.key>] : Object | provenance | MaD:450 |
+| Test.java:6755:26:6755:40 | getElement(...) : Object [<map.key>] : Object | Test.java:6755:9:6755:41 | getMapKeyDefault(...) | provenance | MaD:1 |
 | Test.java:6755:37:6755:39 | out : Headers [<element>, <map.key>] : Object | Test.java:79:19:79:32 | it : Headers [<element>, <map.key>] : Object | provenance |  |
-| Test.java:6755:37:6755:39 | out : Headers [<element>, <map.key>] : Object | Test.java:6755:26:6755:40 | getElement(...) : Object [<map.key>] : Object | provenance | MaD:492 |
+| Test.java:6755:37:6755:39 | out : Headers [<element>, <map.key>] : Object | Test.java:6755:26:6755:40 | getElement(...) : Object [<map.key>] : Object | provenance | MaD:495 |
 | Test.java:6760:17:6760:33 | (...)... : Headers | Test.java:6761:10:6761:11 | in : Headers | provenance |  |
 | Test.java:6760:26:6760:33 | source(...) : Object | Test.java:6760:17:6760:33 | (...)... : Headers | provenance |  |
-| Test.java:6761:10:6761:11 | in : Headers | Test.java:6761:10:6761:29 | setLong(...) : Headers | provenance | MaD:461 |
+| Test.java:6761:10:6761:11 | in : Headers | Test.java:6761:10:6761:29 | setLong(...) : Headers | provenance | MaD:453 |
 | Test.java:6761:10:6761:29 | setLong(...) : Headers | Test.java:6762:9:6762:11 | out | provenance |  |
 | Test.java:6767:16:6767:31 | (...)... : Object | Test.java:6768:16:6768:17 | in : Object | provenance |  |
 | Test.java:6767:24:6767:31 | source(...) : Object | Test.java:6767:16:6767:31 | (...)... : Object | provenance |  |
 | Test.java:6768:4:6768:6 | out [post update] : Headers [<element>, <map.key>] : Object | Test.java:6769:37:6769:39 | out : Headers [<element>, <map.key>] : Object | provenance |  |
-| Test.java:6768:16:6768:17 | in : Object | Test.java:6768:4:6768:6 | out [post update] : Headers [<element>, <map.key>] : Object | provenance | MaD:462 |
-| Test.java:6769:26:6769:40 | getElement(...) : Object [<map.key>] : Object | Test.java:6769:9:6769:41 | getMapKeyDefault(...) | provenance | MaD:499 |
+| Test.java:6768:16:6768:17 | in : Object | Test.java:6768:4:6768:6 | out [post update] : Headers [<element>, <map.key>] : Object | provenance | MaD:452 |
+| Test.java:6769:26:6769:40 | getElement(...) : Object [<map.key>] : Object | Test.java:6769:9:6769:41 | getMapKeyDefault(...) | provenance | MaD:1 |
 | Test.java:6769:37:6769:39 | out : Headers [<element>, <map.key>] : Object | Test.java:79:19:79:32 | it : Headers [<element>, <map.key>] : Object | provenance |  |
-| Test.java:6769:37:6769:39 | out : Headers [<element>, <map.key>] : Object | Test.java:6769:26:6769:40 | getElement(...) : Object [<map.key>] : Object | provenance | MaD:492 |
+| Test.java:6769:37:6769:39 | out : Headers [<element>, <map.key>] : Object | Test.java:6769:26:6769:40 | getElement(...) : Object [<map.key>] : Object | provenance | MaD:495 |
 | Test.java:6774:16:6774:31 | (...)... : Object | Test.java:6775:18:6775:19 | in : Object | provenance |  |
 | Test.java:6774:24:6774:31 | source(...) : Object | Test.java:6774:16:6774:31 | (...)... : Object | provenance |  |
 | Test.java:6775:4:6775:6 | out [post update] : Headers [<element>, <map.key>] : Object | Test.java:6776:37:6776:39 | out : Headers [<element>, <map.key>] : Object | provenance |  |
-| Test.java:6775:18:6775:19 | in : Object | Test.java:6775:4:6775:6 | out [post update] : Headers [<element>, <map.key>] : Object | provenance | MaD:443 |
-| Test.java:6776:26:6776:40 | getElement(...) : Object [<map.key>] : Object | Test.java:6776:9:6776:41 | getMapKeyDefault(...) | provenance | MaD:499 |
+| Test.java:6775:18:6775:19 | in : Object | Test.java:6775:4:6775:6 | out [post update] : Headers [<element>, <map.key>] : Object | provenance | MaD:454 |
+| Test.java:6776:26:6776:40 | getElement(...) : Object [<map.key>] : Object | Test.java:6776:9:6776:41 | getMapKeyDefault(...) | provenance | MaD:1 |
 | Test.java:6776:37:6776:39 | out : Headers [<element>, <map.key>] : Object | Test.java:79:19:79:32 | it : Headers [<element>, <map.key>] : Object | provenance |  |
-| Test.java:6776:37:6776:39 | out : Headers [<element>, <map.key>] : Object | Test.java:6776:26:6776:40 | getElement(...) : Object [<map.key>] : Object | provenance | MaD:492 |
+| Test.java:6776:37:6776:39 | out : Headers [<element>, <map.key>] : Object | Test.java:6776:26:6776:40 | getElement(...) : Object [<map.key>] : Object | provenance | MaD:495 |
 | Test.java:6781:18:6781:44 | (...)... : List [<element>] : Object | Test.java:6782:32:6782:33 | in : List [<element>] : Object | provenance |  |
 | Test.java:6781:28:6781:44 | of(...) : List [<element>] : Object | Test.java:6781:18:6781:44 | (...)... : List [<element>] : Object | provenance |  |
-| Test.java:6781:36:6781:43 | source(...) : Object | Test.java:6781:28:6781:44 | of(...) : List [<element>] : Object | provenance | MaD:494 |
+| Test.java:6781:36:6781:43 | source(...) : Object | Test.java:6781:28:6781:44 | of(...) : List [<element>] : Object | provenance | MaD:497 |
 | Test.java:6782:4:6782:6 | out [post update] : Headers [<element>, <map.value>] : Object | Test.java:6783:39:6783:41 | out : Headers [<element>, <map.value>] : Object | provenance |  |
-| Test.java:6782:32:6782:33 | in : List [<element>] : Object | Test.java:6782:4:6782:6 | out [post update] : Headers [<element>, <map.value>] : Object | provenance | MaD:444 |
-| Test.java:6783:28:6783:42 | getElement(...) : Object [<map.value>] : Object | Test.java:6783:9:6783:43 | getMapValueDefault(...) | provenance | MaD:498 |
+| Test.java:6782:32:6782:33 | in : List [<element>] : Object | Test.java:6782:4:6782:6 | out [post update] : Headers [<element>, <map.value>] : Object | provenance | MaD:455 |
+| Test.java:6783:28:6783:42 | getElement(...) : Object [<map.value>] : Object | Test.java:6783:9:6783:43 | getMapValueDefault(...) | provenance | MaD:2 |
 | Test.java:6783:39:6783:41 | out : Headers [<element>, <map.value>] : Object | Test.java:79:19:79:32 | it : Headers [<element>, <map.value>] : Object | provenance |  |
-| Test.java:6783:39:6783:41 | out : Headers [<element>, <map.value>] : Object | Test.java:6783:28:6783:42 | getElement(...) : Object [<map.value>] : Object | provenance | MaD:492 |
+| Test.java:6783:39:6783:41 | out : Headers [<element>, <map.value>] : Object | Test.java:6783:28:6783:42 | getElement(...) : Object [<map.value>] : Object | provenance | MaD:495 |
 | Test.java:6788:16:6788:31 | (...)... : Object | Test.java:6789:18:6789:19 | in : Object | provenance |  |
 | Test.java:6788:24:6788:31 | source(...) : Object | Test.java:6788:16:6788:31 | (...)... : Object | provenance |  |
 | Test.java:6789:4:6789:6 | out [post update] : Headers [<element>, <map.key>] : Object | Test.java:6790:37:6790:39 | out : Headers [<element>, <map.key>] : Object | provenance |  |
-| Test.java:6789:18:6789:19 | in : Object | Test.java:6789:4:6789:6 | out [post update] : Headers [<element>, <map.key>] : Object | provenance | MaD:447 |
-| Test.java:6790:26:6790:40 | getElement(...) : Object [<map.key>] : Object | Test.java:6790:9:6790:41 | getMapKeyDefault(...) | provenance | MaD:499 |
+| Test.java:6789:18:6789:19 | in : Object | Test.java:6789:4:6789:6 | out [post update] : Headers [<element>, <map.key>] : Object | provenance | MaD:456 |
+| Test.java:6790:26:6790:40 | getElement(...) : Object [<map.key>] : Object | Test.java:6790:9:6790:41 | getMapKeyDefault(...) | provenance | MaD:1 |
 | Test.java:6790:37:6790:39 | out : Headers [<element>, <map.key>] : Object | Test.java:79:19:79:32 | it : Headers [<element>, <map.key>] : Object | provenance |  |
-| Test.java:6790:37:6790:39 | out : Headers [<element>, <map.key>] : Object | Test.java:6790:26:6790:40 | getElement(...) : Object [<map.key>] : Object | provenance | MaD:492 |
+| Test.java:6790:37:6790:39 | out : Headers [<element>, <map.key>] : Object | Test.java:6790:26:6790:40 | getElement(...) : Object [<map.key>] : Object | provenance | MaD:495 |
 | Test.java:6795:16:6795:31 | (...)... : Object | Test.java:6796:32:6796:33 | in : Object | provenance |  |
 | Test.java:6795:24:6795:31 | source(...) : Object | Test.java:6795:16:6795:31 | (...)... : Object | provenance |  |
 | Test.java:6796:4:6796:6 | out [post update] : Headers [<element>, <map.value>] : Object | Test.java:6797:39:6797:41 | out : Headers [<element>, <map.value>] : Object | provenance |  |
-| Test.java:6796:32:6796:33 | in : Object | Test.java:6796:4:6796:6 | out [post update] : Headers [<element>, <map.value>] : Object | provenance | MaD:448 |
-| Test.java:6797:28:6797:42 | getElement(...) : Object [<map.value>] : Object | Test.java:6797:9:6797:43 | getMapValueDefault(...) | provenance | MaD:498 |
+| Test.java:6796:32:6796:33 | in : Object | Test.java:6796:4:6796:6 | out [post update] : Headers [<element>, <map.value>] : Object | provenance | MaD:457 |
+| Test.java:6797:28:6797:42 | getElement(...) : Object [<map.value>] : Object | Test.java:6797:9:6797:43 | getMapValueDefault(...) | provenance | MaD:2 |
 | Test.java:6797:39:6797:41 | out : Headers [<element>, <map.value>] : Object | Test.java:79:19:79:32 | it : Headers [<element>, <map.value>] : Object | provenance |  |
-| Test.java:6797:39:6797:41 | out : Headers [<element>, <map.value>] : Object | Test.java:6797:28:6797:42 | getElement(...) : Object [<map.value>] : Object | provenance | MaD:492 |
+| Test.java:6797:39:6797:41 | out : Headers [<element>, <map.value>] : Object | Test.java:6797:28:6797:42 | getElement(...) : Object [<map.value>] : Object | provenance | MaD:495 |
 | Test.java:6802:16:6802:31 | (...)... : Object | Test.java:6803:18:6803:19 | in : Object | provenance |  |
 | Test.java:6802:24:6802:31 | source(...) : Object | Test.java:6802:16:6802:31 | (...)... : Object | provenance |  |
 | Test.java:6803:4:6803:6 | out [post update] : Headers [<element>, <map.key>] : Object | Test.java:6804:37:6804:39 | out : Headers [<element>, <map.key>] : Object | provenance |  |
-| Test.java:6803:18:6803:19 | in : Object | Test.java:6803:4:6803:6 | out [post update] : Headers [<element>, <map.key>] : Object | provenance | MaD:445 |
-| Test.java:6804:26:6804:40 | getElement(...) : Object [<map.key>] : Object | Test.java:6804:9:6804:41 | getMapKeyDefault(...) | provenance | MaD:499 |
+| Test.java:6803:18:6803:19 | in : Object | Test.java:6803:4:6803:6 | out [post update] : Headers [<element>, <map.key>] : Object | provenance | MaD:458 |
+| Test.java:6804:26:6804:40 | getElement(...) : Object [<map.key>] : Object | Test.java:6804:9:6804:41 | getMapKeyDefault(...) | provenance | MaD:1 |
 | Test.java:6804:37:6804:39 | out : Headers [<element>, <map.key>] : Object | Test.java:79:19:79:32 | it : Headers [<element>, <map.key>] : Object | provenance |  |
-| Test.java:6804:37:6804:39 | out : Headers [<element>, <map.key>] : Object | Test.java:6804:26:6804:40 | getElement(...) : Object [<map.key>] : Object | provenance | MaD:492 |
+| Test.java:6804:37:6804:39 | out : Headers [<element>, <map.key>] : Object | Test.java:6804:26:6804:40 | getElement(...) : Object [<map.key>] : Object | provenance | MaD:495 |
 | Test.java:6809:18:6809:49 | (...)... : Object[] [[]] : Object | Test.java:6810:32:6810:33 | in : Object[] [[]] : Object | provenance |  |
 | Test.java:6809:28:6809:49 | {...} : Object[] [[]] : Object | Test.java:6809:18:6809:49 | (...)... : Object[] [[]] : Object | provenance |  |
 | Test.java:6809:41:6809:48 | source(...) : Object | Test.java:6809:28:6809:49 | {...} : Object[] [[]] : Object | provenance |  |
 | Test.java:6810:4:6810:6 | out [post update] : Headers [<element>, <map.value>] : Object | Test.java:6811:39:6811:41 | out : Headers [<element>, <map.value>] : Object | provenance |  |
-| Test.java:6810:32:6810:33 | in : Object[] [[]] : Object | Test.java:6810:4:6810:6 | out [post update] : Headers [<element>, <map.value>] : Object | provenance | MaD:446 |
-| Test.java:6811:28:6811:42 | getElement(...) : Object [<map.value>] : Object | Test.java:6811:9:6811:43 | getMapValueDefault(...) | provenance | MaD:498 |
+| Test.java:6810:32:6810:33 | in : Object[] [[]] : Object | Test.java:6810:4:6810:6 | out [post update] : Headers [<element>, <map.value>] : Object | provenance | MaD:459 |
+| Test.java:6811:28:6811:42 | getElement(...) : Object [<map.value>] : Object | Test.java:6811:9:6811:43 | getMapValueDefault(...) | provenance | MaD:2 |
 | Test.java:6811:39:6811:41 | out : Headers [<element>, <map.value>] : Object | Test.java:79:19:79:32 | it : Headers [<element>, <map.value>] : Object | provenance |  |
-| Test.java:6811:39:6811:41 | out : Headers [<element>, <map.value>] : Object | Test.java:6811:28:6811:42 | getElement(...) : Object [<map.value>] : Object | provenance | MaD:492 |
+| Test.java:6811:39:6811:41 | out : Headers [<element>, <map.value>] : Object | Test.java:6811:28:6811:42 | getElement(...) : Object [<map.value>] : Object | provenance | MaD:495 |
 | Test.java:6816:17:6816:33 | (...)... : Headers | Test.java:6817:10:6817:11 | in : Headers | provenance |  |
 | Test.java:6816:26:6816:33 | source(...) : Object | Test.java:6816:17:6816:33 | (...)... : Headers | provenance |  |
-| Test.java:6817:10:6817:11 | in : Headers | Test.java:6817:10:6817:36 | setShort(...) : Headers | provenance | MaD:463 |
+| Test.java:6817:10:6817:11 | in : Headers | Test.java:6817:10:6817:36 | setShort(...) : Headers | provenance | MaD:461 |
 | Test.java:6817:10:6817:36 | setShort(...) : Headers | Test.java:6818:9:6818:11 | out | provenance |  |
 | Test.java:6823:16:6823:31 | (...)... : Object | Test.java:6824:17:6824:18 | in : Object | provenance |  |
 | Test.java:6823:24:6823:31 | source(...) : Object | Test.java:6823:16:6823:31 | (...)... : Object | provenance |  |
 | Test.java:6824:4:6824:6 | out [post update] : Headers [<element>, <map.key>] : Object | Test.java:6825:37:6825:39 | out : Headers [<element>, <map.key>] : Object | provenance |  |
-| Test.java:6824:17:6824:18 | in : Object | Test.java:6824:4:6824:6 | out [post update] : Headers [<element>, <map.key>] : Object | provenance | MaD:464 |
-| Test.java:6825:26:6825:40 | getElement(...) : Object [<map.key>] : Object | Test.java:6825:9:6825:41 | getMapKeyDefault(...) | provenance | MaD:499 |
+| Test.java:6824:17:6824:18 | in : Object | Test.java:6824:4:6824:6 | out [post update] : Headers [<element>, <map.key>] : Object | provenance | MaD:460 |
+| Test.java:6825:26:6825:40 | getElement(...) : Object [<map.key>] : Object | Test.java:6825:9:6825:41 | getMapKeyDefault(...) | provenance | MaD:1 |
 | Test.java:6825:37:6825:39 | out : Headers [<element>, <map.key>] : Object | Test.java:79:19:79:32 | it : Headers [<element>, <map.key>] : Object | provenance |  |
-| Test.java:6825:37:6825:39 | out : Headers [<element>, <map.key>] : Object | Test.java:6825:26:6825:40 | getElement(...) : Object [<map.key>] : Object | provenance | MaD:492 |
+| Test.java:6825:37:6825:39 | out : Headers [<element>, <map.key>] : Object | Test.java:6825:26:6825:40 | getElement(...) : Object [<map.key>] : Object | provenance | MaD:495 |
 | Test.java:6830:17:6830:33 | (...)... : Headers | Test.java:6831:10:6831:11 | in : Headers | provenance |  |
 | Test.java:6830:26:6830:33 | source(...) : Object | Test.java:6830:17:6830:33 | (...)... : Headers | provenance |  |
-| Test.java:6831:10:6831:11 | in : Headers | Test.java:6831:10:6831:35 | setTimeMillis(...) : Headers | provenance | MaD:465 |
+| Test.java:6831:10:6831:11 | in : Headers | Test.java:6831:10:6831:35 | setTimeMillis(...) : Headers | provenance | MaD:463 |
 | Test.java:6831:10:6831:35 | setTimeMillis(...) : Headers | Test.java:6832:9:6832:11 | out | provenance |  |
 | Test.java:6837:16:6837:31 | (...)... : Object | Test.java:6838:22:6838:23 | in : Object | provenance |  |
 | Test.java:6837:24:6837:31 | source(...) : Object | Test.java:6837:16:6837:31 | (...)... : Object | provenance |  |
 | Test.java:6838:4:6838:6 | out [post update] : Headers [<element>, <map.key>] : Object | Test.java:6839:37:6839:39 | out : Headers [<element>, <map.key>] : Object | provenance |  |
-| Test.java:6838:22:6838:23 | in : Object | Test.java:6838:4:6838:6 | out [post update] : Headers [<element>, <map.key>] : Object | provenance | MaD:466 |
-| Test.java:6839:26:6839:40 | getElement(...) : Object [<map.key>] : Object | Test.java:6839:9:6839:41 | getMapKeyDefault(...) | provenance | MaD:499 |
+| Test.java:6838:22:6838:23 | in : Object | Test.java:6838:4:6838:6 | out [post update] : Headers [<element>, <map.key>] : Object | provenance | MaD:462 |
+| Test.java:6839:26:6839:40 | getElement(...) : Object [<map.key>] : Object | Test.java:6839:9:6839:41 | getMapKeyDefault(...) | provenance | MaD:1 |
 | Test.java:6839:37:6839:39 | out : Headers [<element>, <map.key>] : Object | Test.java:79:19:79:32 | it : Headers [<element>, <map.key>] : Object | provenance |  |
-| Test.java:6839:37:6839:39 | out : Headers [<element>, <map.key>] : Object | Test.java:6839:26:6839:40 | getElement(...) : Object [<map.key>] : Object | provenance | MaD:492 |
+| Test.java:6839:37:6839:39 | out : Headers [<element>, <map.key>] : Object | Test.java:6839:26:6839:40 | getElement(...) : Object [<map.key>] : Object | provenance | MaD:495 |
 | Test.java:6844:17:6844:80 | (...)... : Headers [<element>, <map.value>] : Object | Test.java:6845:38:6845:39 | in : Headers [<element>, <map.value>] : Object | provenance |  |
 | Test.java:6844:26:6844:80 | newWithElementDefault(...) : Object [<element>, <map.value>] : Object | Test.java:6844:17:6844:80 | (...)... : Headers [<element>, <map.value>] : Object | provenance |  |
-| Test.java:6844:48:6844:79 | newWithMapValueDefault(...) : Object [<map.value>] : Object | Test.java:6844:26:6844:80 | newWithElementDefault(...) : Object [<element>, <map.value>] : Object | provenance | MaD:497 |
-| Test.java:6844:71:6844:78 | source(...) : Object | Test.java:6844:48:6844:79 | newWithMapValueDefault(...) : Object [<map.value>] : Object | provenance | MaD:495 |
+| Test.java:6844:48:6844:79 | newWithMapValueDefault(...) : Object [<map.value>] : Object | Test.java:6844:26:6844:80 | newWithElementDefault(...) : Object [<element>, <map.value>] : Object | provenance | MaD:3 |
+| Test.java:6844:71:6844:78 | source(...) : Object | Test.java:6844:48:6844:79 | newWithMapValueDefault(...) : Object [<map.value>] : Object | provenance | MaD:5 |
 | Test.java:6845:10:6845:46 | getAllAsString(...) : List | Test.java:6846:9:6846:11 | out | provenance |  |
-| Test.java:6845:38:6845:39 | in : Headers [<element>, <map.value>] : Object | Test.java:6845:10:6845:46 | getAllAsString(...) : List | provenance | MaD:384 |
+| Test.java:6845:38:6845:39 | in : Headers [<element>, <map.value>] : Object | Test.java:6845:10:6845:46 | getAllAsString(...) : List | provenance | MaD:464 |
 | Test.java:6851:17:6851:80 | (...)... : Headers [<element>, <map.value>] : Object | Test.java:6852:35:6852:36 | in : Headers [<element>, <map.value>] : Object | provenance |  |
 | Test.java:6851:26:6851:80 | newWithElementDefault(...) : Object [<element>, <map.value>] : Object | Test.java:6851:17:6851:80 | (...)... : Headers [<element>, <map.value>] : Object | provenance |  |
-| Test.java:6851:48:6851:79 | newWithMapValueDefault(...) : Object [<map.value>] : Object | Test.java:6851:26:6851:80 | newWithElementDefault(...) : Object [<element>, <map.value>] : Object | provenance | MaD:497 |
-| Test.java:6851:71:6851:78 | source(...) : Object | Test.java:6851:48:6851:79 | newWithMapValueDefault(...) : Object [<map.value>] : Object | provenance | MaD:495 |
+| Test.java:6851:48:6851:79 | newWithMapValueDefault(...) : Object [<map.value>] : Object | Test.java:6851:26:6851:80 | newWithElementDefault(...) : Object [<element>, <map.value>] : Object | provenance | MaD:3 |
+| Test.java:6851:71:6851:78 | source(...) : Object | Test.java:6851:48:6851:79 | newWithMapValueDefault(...) : Object [<map.value>] : Object | provenance | MaD:5 |
 | Test.java:6852:10:6852:43 | getAsString(...) : String | Test.java:6853:9:6853:11 | out | provenance |  |
-| Test.java:6852:35:6852:36 | in : Headers [<element>, <map.value>] : Object | Test.java:6852:10:6852:43 | getAsString(...) : String | provenance | MaD:383 |
+| Test.java:6852:35:6852:36 | in : Headers [<element>, <map.value>] : Object | Test.java:6852:10:6852:43 | getAsString(...) : String | provenance | MaD:465 |
 | Test.java:6858:18:6858:66 | (...)... : List [<element>, <map.key>] : Object | Test.java:6859:40:6859:41 | in : List [<element>, <map.key>] : Object | provenance |  |
 | Test.java:6858:28:6858:66 | of(...) : List [<element>, <map.key>] : Object | Test.java:6858:18:6858:66 | (...)... : List [<element>, <map.key>] : Object | provenance |  |
-| Test.java:6858:36:6858:65 | newWithMapKeyDefault(...) : Object [<map.key>] : Object | Test.java:6858:28:6858:66 | of(...) : List [<element>, <map.key>] : Object | provenance | MaD:494 |
-| Test.java:6858:57:6858:64 | source(...) : Object | Test.java:6858:36:6858:65 | newWithMapKeyDefault(...) : Object [<map.key>] : Object | provenance | MaD:496 |
+| Test.java:6858:36:6858:65 | newWithMapKeyDefault(...) : Object [<map.key>] : Object | Test.java:6858:28:6858:66 | of(...) : List [<element>, <map.key>] : Object | provenance | MaD:497 |
+| Test.java:6858:57:6858:64 | source(...) : Object | Test.java:6858:36:6858:65 | newWithMapKeyDefault(...) : Object [<map.key>] : Object | provenance | MaD:4 |
 | Test.java:6859:10:6859:42 | iteratorAsString(...) : Iterator | Test.java:6860:9:6860:11 | out | provenance |  |
-| Test.java:6859:40:6859:41 | in : List [<element>, <map.key>] : Object | Test.java:6859:10:6859:42 | iteratorAsString(...) : Iterator | provenance | MaD:386 |
+| Test.java:6859:40:6859:41 | in : List [<element>, <map.key>] : Object | Test.java:6859:10:6859:42 | iteratorAsString(...) : Iterator | provenance | MaD:466 |
 | Test.java:6865:18:6865:68 | (...)... : List [<element>, <map.value>] : Object | Test.java:6866:40:6866:41 | in : List [<element>, <map.value>] : Object | provenance |  |
 | Test.java:6865:28:6865:68 | of(...) : List [<element>, <map.value>] : Object | Test.java:6865:18:6865:68 | (...)... : List [<element>, <map.value>] : Object | provenance |  |
-| Test.java:6865:36:6865:67 | newWithMapValueDefault(...) : Object [<map.value>] : Object | Test.java:6865:28:6865:68 | of(...) : List [<element>, <map.value>] : Object | provenance | MaD:494 |
-| Test.java:6865:59:6865:66 | source(...) : Object | Test.java:6865:36:6865:67 | newWithMapValueDefault(...) : Object [<map.value>] : Object | provenance | MaD:495 |
+| Test.java:6865:36:6865:67 | newWithMapValueDefault(...) : Object [<map.value>] : Object | Test.java:6865:28:6865:68 | of(...) : List [<element>, <map.value>] : Object | provenance | MaD:497 |
+| Test.java:6865:59:6865:66 | source(...) : Object | Test.java:6865:36:6865:67 | newWithMapValueDefault(...) : Object [<map.value>] : Object | provenance | MaD:5 |
 | Test.java:6866:10:6866:42 | iteratorAsString(...) : Iterator | Test.java:6867:9:6867:11 | out | provenance |  |
-| Test.java:6866:40:6866:41 | in : List [<element>, <map.value>] : Object | Test.java:6866:10:6866:42 | iteratorAsString(...) : Iterator | provenance | MaD:387 |
+| Test.java:6866:40:6866:41 | in : List [<element>, <map.value>] : Object | Test.java:6866:10:6866:42 | iteratorAsString(...) : Iterator | provenance | MaD:467 |
 | Test.java:6872:17:6872:78 | (...)... : Headers [<element>, <map.key>] : Object | Test.java:6873:37:6873:38 | in : Headers [<element>, <map.key>] : Object | provenance |  |
 | Test.java:6872:26:6872:78 | newWithElementDefault(...) : Object [<element>, <map.key>] : Object | Test.java:6872:17:6872:78 | (...)... : Headers [<element>, <map.key>] : Object | provenance |  |
-| Test.java:6872:48:6872:77 | newWithMapKeyDefault(...) : Object [<map.key>] : Object | Test.java:6872:26:6872:78 | newWithElementDefault(...) : Object [<element>, <map.key>] : Object | provenance | MaD:497 |
-| Test.java:6872:69:6872:76 | source(...) : Object | Test.java:6872:48:6872:77 | newWithMapKeyDefault(...) : Object [<map.key>] : Object | provenance | MaD:496 |
+| Test.java:6872:48:6872:77 | newWithMapKeyDefault(...) : Object [<map.key>] : Object | Test.java:6872:26:6872:78 | newWithElementDefault(...) : Object [<element>, <map.key>] : Object | provenance | MaD:3 |
+| Test.java:6872:69:6872:76 | source(...) : Object | Test.java:6872:48:6872:77 | newWithMapKeyDefault(...) : Object [<map.key>] : Object | provenance | MaD:4 |
 | Test.java:6873:10:6873:39 | namesAsString(...) : Set [<element>] : Object | Test.java:6874:20:6874:22 | out : Set [<element>] : Object | provenance |  |
-| Test.java:6873:37:6873:38 | in : Headers [<element>, <map.key>] : Object | Test.java:6873:10:6873:39 | namesAsString(...) : Set [<element>] : Object | provenance | MaD:385 |
+| Test.java:6873:37:6873:38 | in : Headers [<element>, <map.key>] : Object | Test.java:6873:10:6873:39 | namesAsString(...) : Set [<element>] : Object | provenance | MaD:468 |
 | Test.java:6874:20:6874:22 | out : Set [<element>] : Object | Test.java:79:19:79:32 | it : Set [<element>] : Object | provenance |  |
-| Test.java:6874:20:6874:22 | out : Set [<element>] : Object | Test.java:6874:9:6874:23 | getElement(...) | provenance | MaD:492 |
+| Test.java:6874:20:6874:22 | out : Set [<element>] : Object | Test.java:6874:9:6874:23 | getElement(...) | provenance | MaD:495 |
 | Test.java:6879:18:6879:77 | (...)... : Iterator [<element>, <map.key>] : Object | Test.java:6880:38:6880:39 | in : Iterator [<element>, <map.key>] : Object | provenance |  |
-| Test.java:6879:28:6879:66 | of(...) : List [<element>, <map.key>] : Object | Test.java:6879:28:6879:77 | iterator(...) : Iterator [<element>, <map.key>] : Object | provenance | MaD:492 |
+| Test.java:6879:28:6879:66 | of(...) : List [<element>, <map.key>] : Object | Test.java:6879:28:6879:77 | iterator(...) : Iterator [<element>, <map.key>] : Object | provenance | MaD:495 |
 | Test.java:6879:28:6879:77 | iterator(...) : Iterator [<element>, <map.key>] : Object | Test.java:6879:18:6879:77 | (...)... : Iterator [<element>, <map.key>] : Object | provenance |  |
-| Test.java:6879:36:6879:65 | newWithMapKeyDefault(...) : Object [<map.key>] : Object | Test.java:6879:28:6879:66 | of(...) : List [<element>, <map.key>] : Object | provenance | MaD:494 |
-| Test.java:6879:57:6879:64 | source(...) : Object | Test.java:6879:36:6879:65 | newWithMapKeyDefault(...) : Object [<map.key>] : Object | provenance | MaD:496 |
+| Test.java:6879:36:6879:65 | newWithMapKeyDefault(...) : Object [<map.key>] : Object | Test.java:6879:28:6879:66 | of(...) : List [<element>, <map.key>] : Object | provenance | MaD:497 |
+| Test.java:6879:57:6879:64 | source(...) : Object | Test.java:6879:36:6879:65 | newWithMapKeyDefault(...) : Object [<map.key>] : Object | provenance | MaD:4 |
 | Test.java:6880:10:6880:43 | toString(...) : String | Test.java:6881:9:6881:11 | out | provenance |  |
-| Test.java:6880:38:6880:39 | in : Iterator [<element>, <map.key>] : Object | Test.java:6880:10:6880:43 | toString(...) : String | provenance | MaD:388 |
+| Test.java:6880:38:6880:39 | in : Iterator [<element>, <map.key>] : Object | Test.java:6880:10:6880:43 | toString(...) : String | provenance | MaD:469 |
 | Test.java:6886:18:6886:79 | (...)... : Iterator [<element>, <map.value>] : Object | Test.java:6887:38:6887:39 | in : Iterator [<element>, <map.value>] : Object | provenance |  |
-| Test.java:6886:28:6886:68 | of(...) : List [<element>, <map.value>] : Object | Test.java:6886:28:6886:79 | iterator(...) : Iterator [<element>, <map.value>] : Object | provenance | MaD:492 |
+| Test.java:6886:28:6886:68 | of(...) : List [<element>, <map.value>] : Object | Test.java:6886:28:6886:79 | iterator(...) : Iterator [<element>, <map.value>] : Object | provenance | MaD:495 |
 | Test.java:6886:28:6886:79 | iterator(...) : Iterator [<element>, <map.value>] : Object | Test.java:6886:18:6886:79 | (...)... : Iterator [<element>, <map.value>] : Object | provenance |  |
-| Test.java:6886:36:6886:67 | newWithMapValueDefault(...) : Object [<map.value>] : Object | Test.java:6886:28:6886:68 | of(...) : List [<element>, <map.value>] : Object | provenance | MaD:494 |
-| Test.java:6886:59:6886:66 | source(...) : Object | Test.java:6886:36:6886:67 | newWithMapValueDefault(...) : Object [<map.value>] : Object | provenance | MaD:495 |
+| Test.java:6886:36:6886:67 | newWithMapValueDefault(...) : Object [<map.value>] : Object | Test.java:6886:28:6886:68 | of(...) : List [<element>, <map.value>] : Object | provenance | MaD:497 |
+| Test.java:6886:59:6886:66 | source(...) : Object | Test.java:6886:36:6886:67 | newWithMapValueDefault(...) : Object [<map.value>] : Object | provenance | MaD:5 |
 | Test.java:6887:10:6887:43 | toString(...) : String | Test.java:6888:9:6888:11 | out | provenance |  |
-| Test.java:6887:38:6887:39 | in : Iterator [<element>, <map.value>] : Object | Test.java:6887:10:6887:43 | toString(...) : String | provenance | MaD:389 |
+| Test.java:6887:38:6887:39 | in : Iterator [<element>, <map.value>] : Object | Test.java:6887:10:6887:43 | toString(...) : String | provenance | MaD:470 |
 | Test.java:6893:20:6893:39 | (...)... : ByteBuffer | Test.java:6894:26:6894:27 | in : ByteBuffer | provenance |  |
 | Test.java:6893:32:6893:39 | source(...) : Object | Test.java:6893:20:6893:39 | (...)... : ByteBuffer | provenance |  |
 | Test.java:6894:10:6894:28 | new AsciiString(...) : AsciiString | Test.java:6895:9:6895:11 | out | provenance |  |
-| Test.java:6894:26:6894:27 | in : ByteBuffer | Test.java:6894:10:6894:28 | new AsciiString(...) : AsciiString | provenance | MaD:470 |
+| Test.java:6894:26:6894:27 | in : ByteBuffer | Test.java:6894:10:6894:28 | new AsciiString(...) : AsciiString | provenance | MaD:472 |
 | Test.java:6900:20:6900:39 | (...)... : ByteBuffer | Test.java:6901:26:6901:27 | in : ByteBuffer | provenance |  |
 | Test.java:6900:32:6900:39 | source(...) : Object | Test.java:6900:20:6900:39 | (...)... : ByteBuffer | provenance |  |
 | Test.java:6901:10:6901:41 | new AsciiString(...) : AsciiString | Test.java:6902:9:6902:11 | out | provenance |  |
-| Test.java:6901:26:6901:27 | in : ByteBuffer | Test.java:6901:10:6901:41 | new AsciiString(...) : AsciiString | provenance | MaD:470 |
+| Test.java:6901:26:6901:27 | in : ByteBuffer | Test.java:6901:10:6901:41 | new AsciiString(...) : AsciiString | provenance | MaD:472 |
 | Test.java:6907:20:6907:39 | (...)... : ByteBuffer | Test.java:6908:26:6908:27 | in : ByteBuffer | provenance |  |
 | Test.java:6907:32:6907:39 | source(...) : Object | Test.java:6907:20:6907:39 | (...)... : ByteBuffer | provenance |  |
 | Test.java:6908:10:6908:35 | new AsciiString(...) : AsciiString | Test.java:6909:9:6909:11 | out | provenance |  |
-| Test.java:6908:26:6908:27 | in : ByteBuffer | Test.java:6908:10:6908:35 | new AsciiString(...) : AsciiString | provenance | MaD:470 |
+| Test.java:6908:26:6908:27 | in : ByteBuffer | Test.java:6908:10:6908:35 | new AsciiString(...) : AsciiString | provenance | MaD:472 |
 | Test.java:6914:22:6914:43 | (...)... : CharSequence | Test.java:6915:26:6915:27 | in : CharSequence | provenance |  |
 | Test.java:6914:36:6914:43 | source(...) : Object | Test.java:6914:22:6914:43 | (...)... : CharSequence | provenance |  |
 | Test.java:6915:10:6915:28 | new AsciiString(...) : AsciiString | Test.java:6916:9:6916:11 | out | provenance |  |
-| Test.java:6915:26:6915:27 | in : CharSequence | Test.java:6915:10:6915:28 | new AsciiString(...) : AsciiString | provenance | MaD:470 |
+| Test.java:6915:26:6915:27 | in : CharSequence | Test.java:6915:10:6915:28 | new AsciiString(...) : AsciiString | provenance | MaD:472 |
 | Test.java:6921:22:6921:43 | (...)... : CharSequence | Test.java:6922:26:6922:27 | in : CharSequence | provenance |  |
 | Test.java:6921:36:6921:43 | source(...) : Object | Test.java:6921:22:6921:43 | (...)... : CharSequence | provenance |  |
 | Test.java:6922:10:6922:43 | new AsciiString(...) : AsciiString | Test.java:6923:9:6923:11 | out | provenance |  |
-| Test.java:6922:26:6922:27 | in : CharSequence | Test.java:6922:10:6922:43 | new AsciiString(...) : AsciiString | provenance | MaD:470 |
+| Test.java:6922:26:6922:27 | in : CharSequence | Test.java:6922:10:6922:43 | new AsciiString(...) : AsciiString | provenance | MaD:472 |
 | Test.java:6928:22:6928:43 | (...)... : CharSequence | Test.java:6929:26:6929:27 | in : CharSequence | provenance |  |
 | Test.java:6928:36:6928:43 | source(...) : Object | Test.java:6928:22:6928:43 | (...)... : CharSequence | provenance |  |
 | Test.java:6929:10:6929:49 | new AsciiString(...) : AsciiString | Test.java:6930:9:6930:11 | out | provenance |  |
-| Test.java:6929:26:6929:27 | in : CharSequence | Test.java:6929:10:6929:49 | new AsciiString(...) : AsciiString | provenance | MaD:470 |
+| Test.java:6929:26:6929:27 | in : CharSequence | Test.java:6929:10:6929:49 | new AsciiString(...) : AsciiString | provenance | MaD:472 |
 | Test.java:6935:22:6935:43 | (...)... : CharSequence | Test.java:6936:26:6936:27 | in : CharSequence | provenance |  |
 | Test.java:6935:36:6935:43 | source(...) : Object | Test.java:6935:22:6935:43 | (...)... : CharSequence | provenance |  |
 | Test.java:6936:10:6936:34 | new AsciiString(...) : AsciiString | Test.java:6937:9:6937:11 | out | provenance |  |
-| Test.java:6936:26:6936:27 | in : CharSequence | Test.java:6936:10:6936:34 | new AsciiString(...) : AsciiString | provenance | MaD:470 |
+| Test.java:6936:26:6936:27 | in : CharSequence | Test.java:6936:10:6936:34 | new AsciiString(...) : AsciiString | provenance | MaD:472 |
 | Test.java:6942:16:6942:31 | (...)... : byte[] | Test.java:6943:26:6943:27 | in : byte[] | provenance |  |
 | Test.java:6942:24:6942:31 | source(...) : Object | Test.java:6942:16:6942:31 | (...)... : byte[] | provenance |  |
 | Test.java:6943:10:6943:28 | new AsciiString(...) : AsciiString | Test.java:6944:9:6944:11 | out | provenance |  |
-| Test.java:6943:26:6943:27 | in : byte[] | Test.java:6943:10:6943:28 | new AsciiString(...) : AsciiString | provenance | MaD:470 |
+| Test.java:6943:26:6943:27 | in : byte[] | Test.java:6943:10:6943:28 | new AsciiString(...) : AsciiString | provenance | MaD:472 |
 | Test.java:6949:16:6949:31 | (...)... : byte[] | Test.java:6950:26:6950:27 | in : byte[] | provenance |  |
 | Test.java:6949:24:6949:31 | source(...) : Object | Test.java:6949:16:6949:31 | (...)... : byte[] | provenance |  |
 | Test.java:6950:10:6950:41 | new AsciiString(...) : AsciiString | Test.java:6951:9:6951:11 | out | provenance |  |
-| Test.java:6950:26:6950:27 | in : byte[] | Test.java:6950:10:6950:41 | new AsciiString(...) : AsciiString | provenance | MaD:470 |
+| Test.java:6950:26:6950:27 | in : byte[] | Test.java:6950:10:6950:41 | new AsciiString(...) : AsciiString | provenance | MaD:472 |
 | Test.java:6956:16:6956:31 | (...)... : byte[] | Test.java:6957:26:6957:27 | in : byte[] | provenance |  |
 | Test.java:6956:24:6956:31 | source(...) : Object | Test.java:6956:16:6956:31 | (...)... : byte[] | provenance |  |
 | Test.java:6957:10:6957:35 | new AsciiString(...) : AsciiString | Test.java:6958:9:6958:11 | out | provenance |  |
-| Test.java:6957:26:6957:27 | in : byte[] | Test.java:6957:10:6957:35 | new AsciiString(...) : AsciiString | provenance | MaD:470 |
+| Test.java:6957:26:6957:27 | in : byte[] | Test.java:6957:10:6957:35 | new AsciiString(...) : AsciiString | provenance | MaD:472 |
 | Test.java:6963:16:6963:31 | (...)... : char[] | Test.java:6964:26:6964:27 | in : char[] | provenance |  |
 | Test.java:6963:24:6963:31 | source(...) : Object | Test.java:6963:16:6963:31 | (...)... : char[] | provenance |  |
 | Test.java:6964:10:6964:28 | new AsciiString(...) : AsciiString | Test.java:6965:9:6965:11 | out | provenance |  |
-| Test.java:6964:26:6964:27 | in : char[] | Test.java:6964:10:6964:28 | new AsciiString(...) : AsciiString | provenance | MaD:470 |
+| Test.java:6964:26:6964:27 | in : char[] | Test.java:6964:10:6964:28 | new AsciiString(...) : AsciiString | provenance | MaD:472 |
 | Test.java:6970:16:6970:31 | (...)... : char[] | Test.java:6971:26:6971:27 | in : char[] | provenance |  |
 | Test.java:6970:24:6970:31 | source(...) : Object | Test.java:6970:16:6970:31 | (...)... : char[] | provenance |  |
 | Test.java:6971:10:6971:43 | new AsciiString(...) : AsciiString | Test.java:6972:9:6972:11 | out | provenance |  |
-| Test.java:6971:26:6971:27 | in : char[] | Test.java:6971:10:6971:43 | new AsciiString(...) : AsciiString | provenance | MaD:470 |
+| Test.java:6971:26:6971:27 | in : char[] | Test.java:6971:10:6971:43 | new AsciiString(...) : AsciiString | provenance | MaD:472 |
 | Test.java:6977:16:6977:31 | (...)... : char[] | Test.java:6978:26:6978:27 | in : char[] | provenance |  |
 | Test.java:6977:24:6977:31 | source(...) : Object | Test.java:6977:16:6977:31 | (...)... : char[] | provenance |  |
 | Test.java:6978:10:6978:49 | new AsciiString(...) : AsciiString | Test.java:6979:9:6979:11 | out | provenance |  |
-| Test.java:6978:26:6978:27 | in : char[] | Test.java:6978:10:6978:49 | new AsciiString(...) : AsciiString | provenance | MaD:470 |
+| Test.java:6978:26:6978:27 | in : char[] | Test.java:6978:10:6978:49 | new AsciiString(...) : AsciiString | provenance | MaD:472 |
 | Test.java:6984:16:6984:31 | (...)... : char[] | Test.java:6985:26:6985:27 | in : char[] | provenance |  |
 | Test.java:6984:24:6984:31 | source(...) : Object | Test.java:6984:16:6984:31 | (...)... : char[] | provenance |  |
 | Test.java:6985:10:6985:34 | new AsciiString(...) : AsciiString | Test.java:6986:9:6986:11 | out | provenance |  |
-| Test.java:6985:26:6985:27 | in : char[] | Test.java:6985:10:6985:34 | new AsciiString(...) : AsciiString | provenance | MaD:470 |
+| Test.java:6985:26:6985:27 | in : char[] | Test.java:6985:10:6985:34 | new AsciiString(...) : AsciiString | provenance | MaD:472 |
 | Test.java:6991:21:6991:41 | (...)... : AsciiString | Test.java:6992:10:6992:11 | in : AsciiString | provenance |  |
 | Test.java:6991:34:6991:41 | source(...) : Object | Test.java:6991:21:6991:41 | (...)... : AsciiString | provenance |  |
-| Test.java:6992:10:6992:11 | in : AsciiString | Test.java:6992:10:6992:19 | array(...) : byte[] | provenance | MaD:471 |
+| Test.java:6992:10:6992:11 | in : AsciiString | Test.java:6992:10:6992:19 | array(...) : byte[] | provenance | MaD:473 |
 | Test.java:6992:10:6992:19 | array(...) : byte[] | Test.java:6993:9:6993:11 | out | provenance |  |
 | Test.java:6998:16:6998:31 | (...)... : String | Test.java:6999:29:6999:30 | in : String | provenance |  |
 | Test.java:6998:24:6998:31 | source(...) : Object | Test.java:6998:16:6998:31 | (...)... : String | provenance |  |
 | Test.java:6999:10:6999:31 | cached(...) : AsciiString | Test.java:7000:9:7000:11 | out | provenance |  |
-| Test.java:6999:29:6999:30 | in : String | Test.java:6999:10:6999:31 | cached(...) : AsciiString | provenance | MaD:472 |
+| Test.java:6999:29:6999:30 | in : String | Test.java:6999:10:6999:31 | cached(...) : AsciiString | provenance | MaD:474 |
 | Test.java:7005:21:7005:41 | (...)... : AsciiString | Test.java:7006:10:7006:11 | in : AsciiString | provenance |  |
 | Test.java:7005:34:7005:41 | source(...) : Object | Test.java:7005:21:7005:41 | (...)... : AsciiString | provenance |  |
-| Test.java:7006:10:7006:11 | in : AsciiString | Test.java:7006:10:7006:24 | concat(...) : AsciiString | provenance | MaD:473 |
+| Test.java:7006:10:7006:11 | in : AsciiString | Test.java:7006:10:7006:24 | concat(...) : AsciiString | provenance | MaD:476 |
 | Test.java:7006:10:7006:24 | concat(...) : AsciiString | Test.java:7007:9:7007:11 | out | provenance |  |
 | Test.java:7012:22:7012:43 | (...)... : CharSequence | Test.java:7014:26:7014:27 | in : CharSequence | provenance |  |
 | Test.java:7012:36:7012:43 | source(...) : Object | Test.java:7012:22:7012:43 | (...)... : CharSequence | provenance |  |
 | Test.java:7014:10:7014:28 | concat(...) : AsciiString | Test.java:7015:9:7015:11 | out | provenance |  |
-| Test.java:7014:26:7014:27 | in : CharSequence | Test.java:7014:10:7014:28 | concat(...) : AsciiString | provenance | MaD:474 |
+| Test.java:7014:26:7014:27 | in : CharSequence | Test.java:7014:10:7014:28 | concat(...) : AsciiString | provenance | MaD:475 |
 | Test.java:7020:21:7020:41 | (...)... : AsciiString | Test.java:7021:4:7021:5 | in : AsciiString | provenance |  |
 | Test.java:7020:34:7020:41 | source(...) : Object | Test.java:7020:21:7020:41 | (...)... : AsciiString | provenance |  |
-| Test.java:7021:4:7021:5 | in : AsciiString | Test.java:7021:15:7021:17 | out [post update] : byte[] | provenance | MaD:475 |
+| Test.java:7021:4:7021:5 | in : AsciiString | Test.java:7021:15:7021:17 | out [post update] : byte[] | provenance | MaD:477 |
 | Test.java:7021:15:7021:17 | out [post update] : byte[] | Test.java:7022:9:7022:11 | out | provenance |  |
 | Test.java:7027:21:7027:41 | (...)... : AsciiString | Test.java:7028:4:7028:5 | in : AsciiString | provenance |  |
 | Test.java:7027:34:7027:41 | source(...) : Object | Test.java:7027:21:7027:41 | (...)... : AsciiString | provenance |  |
-| Test.java:7028:4:7028:5 | in : AsciiString | Test.java:7028:15:7028:17 | out [post update] : char[] | provenance | MaD:476 |
+| Test.java:7028:4:7028:5 | in : AsciiString | Test.java:7028:15:7028:17 | out [post update] : char[] | provenance | MaD:478 |
 | Test.java:7028:15:7028:17 | out [post update] : char[] | Test.java:7029:9:7029:11 | out | provenance |  |
 | Test.java:7034:22:7034:43 | (...)... : CharSequence | Test.java:7035:25:7035:26 | in : CharSequence | provenance |  |
 | Test.java:7034:36:7034:43 | source(...) : Object | Test.java:7034:22:7034:43 | (...)... : CharSequence | provenance |  |
 | Test.java:7035:10:7035:27 | of(...) : AsciiString | Test.java:7036:9:7036:11 | out | provenance |  |
-| Test.java:7035:25:7035:26 | in : CharSequence | Test.java:7035:10:7035:27 | of(...) : AsciiString | provenance | MaD:477 |
+| Test.java:7035:25:7035:26 | in : CharSequence | Test.java:7035:10:7035:27 | of(...) : AsciiString | provenance | MaD:479 |
 | Test.java:7041:21:7041:41 | (...)... : AsciiString | Test.java:7042:10:7042:11 | in : AsciiString | provenance |  |
 | Test.java:7041:34:7041:41 | source(...) : Object | Test.java:7041:21:7041:41 | (...)... : AsciiString | provenance |  |
-| Test.java:7042:10:7042:11 | in : AsciiString | Test.java:7042:10:7042:31 | replace(...) : AsciiString | provenance | MaD:478 |
+| Test.java:7042:10:7042:11 | in : AsciiString | Test.java:7042:10:7042:31 | replace(...) : AsciiString | provenance | MaD:480 |
 | Test.java:7042:10:7042:31 | replace(...) : AsciiString | Test.java:7043:9:7043:11 | out | provenance |  |
 | Test.java:7048:21:7048:41 | (...)... : AsciiString | Test.java:7049:10:7049:11 | in : AsciiString | provenance |  |
 | Test.java:7048:34:7048:41 | source(...) : Object | Test.java:7048:21:7048:41 | (...)... : AsciiString | provenance |  |
-| Test.java:7049:10:7049:11 | in : AsciiString | Test.java:7049:10:7049:26 | split(...) : AsciiString[] | provenance | MaD:480 |
+| Test.java:7049:10:7049:11 | in : AsciiString | Test.java:7049:10:7049:26 | split(...) : AsciiString[] | provenance | MaD:481 |
 | Test.java:7049:10:7049:26 | split(...) : AsciiString[] | Test.java:7050:9:7050:11 | out | provenance |  |
 | Test.java:7055:21:7055:41 | (...)... : AsciiString | Test.java:7056:10:7056:11 | in : AsciiString | provenance |  |
 | Test.java:7055:34:7055:41 | source(...) : Object | Test.java:7055:21:7055:41 | (...)... : AsciiString | provenance |  |
-| Test.java:7056:10:7056:11 | in : AsciiString | Test.java:7056:10:7056:23 | split(...) : AsciiString[] | provenance | MaD:479 |
-| Test.java:7056:10:7056:11 | in : AsciiString | Test.java:7056:10:7056:23 | split(...) : AsciiString[] | provenance | MaD:481 |
+| Test.java:7056:10:7056:11 | in : AsciiString | Test.java:7056:10:7056:23 | split(...) : AsciiString[] | provenance | MaD:482 |
 | Test.java:7056:10:7056:23 | split(...) : AsciiString[] | Test.java:7057:9:7057:11 | out | provenance |  |
 | Test.java:7062:21:7062:41 | (...)... : AsciiString | Test.java:7063:10:7063:11 | in : AsciiString | provenance |  |
 | Test.java:7062:34:7062:41 | source(...) : Object | Test.java:7062:21:7062:41 | (...)... : AsciiString | provenance |  |
-| Test.java:7063:10:7063:11 | in : AsciiString | Test.java:7063:10:7063:26 | subSequence(...) : AsciiString | provenance | MaD:482 |
+| Test.java:7063:10:7063:11 | in : AsciiString | Test.java:7063:10:7063:26 | subSequence(...) : AsciiString | provenance | MaD:483 |
 | Test.java:7063:10:7063:26 | subSequence(...) : AsciiString | Test.java:7064:9:7064:11 | out | provenance |  |
 | Test.java:7069:21:7069:41 | (...)... : AsciiString | Test.java:7070:10:7070:11 | in : AsciiString | provenance |  |
 | Test.java:7069:34:7069:41 | source(...) : Object | Test.java:7069:21:7069:41 | (...)... : AsciiString | provenance |  |
-| Test.java:7070:10:7070:11 | in : AsciiString | Test.java:7070:10:7070:29 | subSequence(...) : AsciiString | provenance | MaD:482 |
-| Test.java:7070:10:7070:11 | in : AsciiString | Test.java:7070:10:7070:29 | subSequence(...) : AsciiString | provenance | MaD:490 |
+| Test.java:7070:10:7070:11 | in : AsciiString | Test.java:7070:10:7070:29 | subSequence(...) : AsciiString | provenance | MaD:483 |
+| Test.java:7070:10:7070:11 | in : AsciiString | Test.java:7070:10:7070:29 | subSequence(...) : AsciiString | provenance | MaD:493 |
 | Test.java:7070:10:7070:29 | subSequence(...) : AsciiString | Test.java:7071:9:7071:11 | out | provenance |  |
 | Test.java:7076:21:7076:41 | (...)... : AsciiString | Test.java:7077:10:7077:11 | in : AsciiString | provenance |  |
 | Test.java:7076:34:7076:41 | source(...) : Object | Test.java:7076:21:7076:41 | (...)... : AsciiString | provenance |  |
-| Test.java:7077:10:7077:11 | in : AsciiString | Test.java:7077:10:7077:36 | subSequence(...) : AsciiString | provenance | MaD:482 |
+| Test.java:7077:10:7077:11 | in : AsciiString | Test.java:7077:10:7077:36 | subSequence(...) : AsciiString | provenance | MaD:483 |
 | Test.java:7077:10:7077:36 | subSequence(...) : AsciiString | Test.java:7078:9:7078:11 | out | provenance |  |
 | Test.java:7083:21:7083:41 | (...)... : AsciiString | Test.java:7084:10:7084:11 | in : AsciiString | provenance |  |
 | Test.java:7083:34:7083:41 | source(...) : Object | Test.java:7083:21:7083:41 | (...)... : AsciiString | provenance |  |
-| Test.java:7084:10:7084:11 | in : AsciiString | Test.java:7084:10:7084:25 | toByteArray(...) : byte[] | provenance | MaD:483 |
+| Test.java:7084:10:7084:11 | in : AsciiString | Test.java:7084:10:7084:25 | toByteArray(...) : byte[] | provenance | MaD:484 |
 | Test.java:7084:10:7084:25 | toByteArray(...) : byte[] | Test.java:7085:9:7085:11 | out | provenance |  |
 | Test.java:7090:21:7090:41 | (...)... : AsciiString | Test.java:7091:10:7091:11 | in : AsciiString | provenance |  |
 | Test.java:7090:34:7090:41 | source(...) : Object | Test.java:7090:21:7090:41 | (...)... : AsciiString | provenance |  |
-| Test.java:7091:10:7091:11 | in : AsciiString | Test.java:7091:10:7091:29 | toByteArray(...) : byte[] | provenance | MaD:483 |
+| Test.java:7091:10:7091:11 | in : AsciiString | Test.java:7091:10:7091:29 | toByteArray(...) : byte[] | provenance | MaD:484 |
 | Test.java:7091:10:7091:29 | toByteArray(...) : byte[] | Test.java:7092:9:7092:11 | out | provenance |  |
 | Test.java:7097:21:7097:41 | (...)... : AsciiString | Test.java:7098:10:7098:11 | in : AsciiString | provenance |  |
 | Test.java:7097:34:7097:41 | source(...) : Object | Test.java:7097:21:7097:41 | (...)... : AsciiString | provenance |  |
-| Test.java:7098:10:7098:11 | in : AsciiString | Test.java:7098:10:7098:25 | toCharArray(...) : char[] | provenance | MaD:484 |
+| Test.java:7098:10:7098:11 | in : AsciiString | Test.java:7098:10:7098:25 | toCharArray(...) : char[] | provenance | MaD:485 |
 | Test.java:7098:10:7098:25 | toCharArray(...) : char[] | Test.java:7099:9:7099:11 | out | provenance |  |
 | Test.java:7104:21:7104:41 | (...)... : AsciiString | Test.java:7105:10:7105:11 | in : AsciiString | provenance |  |
 | Test.java:7104:34:7104:41 | source(...) : Object | Test.java:7104:21:7104:41 | (...)... : AsciiString | provenance |  |
-| Test.java:7105:10:7105:11 | in : AsciiString | Test.java:7105:10:7105:29 | toCharArray(...) : char[] | provenance | MaD:484 |
+| Test.java:7105:10:7105:11 | in : AsciiString | Test.java:7105:10:7105:29 | toCharArray(...) : char[] | provenance | MaD:485 |
 | Test.java:7105:10:7105:29 | toCharArray(...) : char[] | Test.java:7106:9:7106:11 | out | provenance |  |
 | Test.java:7111:21:7111:41 | (...)... : AsciiString | Test.java:7112:10:7112:11 | in : AsciiString | provenance |  |
 | Test.java:7111:34:7111:41 | source(...) : Object | Test.java:7111:21:7111:41 | (...)... : AsciiString | provenance |  |
@@ -5052,445 +5048,445 @@ edges
 | Test.java:7112:10:7112:25 | toLowerCase(...) : AsciiString | Test.java:7113:9:7113:11 | out | provenance |  |
 | Test.java:7118:21:7118:41 | (...)... : AsciiString | Test.java:7119:10:7119:11 | in : AsciiString | provenance |  |
 | Test.java:7118:34:7118:41 | source(...) : Object | Test.java:7118:21:7118:41 | (...)... : AsciiString | provenance |  |
-| Test.java:7119:10:7119:11 | in : AsciiString | Test.java:7119:10:7119:22 | toString(...) : String | provenance | MaD:485 |
-| Test.java:7119:10:7119:11 | in : AsciiString | Test.java:7119:10:7119:22 | toString(...) : String | provenance | MaD:491 |
+| Test.java:7119:10:7119:11 | in : AsciiString | Test.java:7119:10:7119:22 | toString(...) : String | provenance | MaD:487 |
+| Test.java:7119:10:7119:11 | in : AsciiString | Test.java:7119:10:7119:22 | toString(...) : String | provenance | MaD:494 |
 | Test.java:7119:10:7119:22 | toString(...) : String | Test.java:7120:9:7120:11 | out | provenance |  |
 | Test.java:7125:21:7125:41 | (...)... : AsciiString | Test.java:7126:10:7126:11 | in : AsciiString | provenance |  |
 | Test.java:7125:34:7125:41 | source(...) : Object | Test.java:7125:21:7125:41 | (...)... : AsciiString | provenance |  |
-| Test.java:7126:10:7126:11 | in : AsciiString | Test.java:7126:10:7126:23 | toString(...) : String | provenance | MaD:485 |
+| Test.java:7126:10:7126:11 | in : AsciiString | Test.java:7126:10:7126:23 | toString(...) : String | provenance | MaD:487 |
 | Test.java:7126:10:7126:23 | toString(...) : String | Test.java:7127:9:7127:11 | out | provenance |  |
 | Test.java:7132:21:7132:41 | (...)... : AsciiString | Test.java:7133:10:7133:11 | in : AsciiString | provenance |  |
 | Test.java:7132:34:7132:41 | source(...) : Object | Test.java:7132:21:7132:41 | (...)... : AsciiString | provenance |  |
-| Test.java:7133:10:7133:11 | in : AsciiString | Test.java:7133:10:7133:26 | toString(...) : String | provenance | MaD:485 |
+| Test.java:7133:10:7133:11 | in : AsciiString | Test.java:7133:10:7133:26 | toString(...) : String | provenance | MaD:487 |
 | Test.java:7133:10:7133:26 | toString(...) : String | Test.java:7134:9:7134:11 | out | provenance |  |
 | Test.java:7139:21:7139:41 | (...)... : AsciiString | Test.java:7140:10:7140:11 | in : AsciiString | provenance |  |
 | Test.java:7139:34:7139:41 | source(...) : Object | Test.java:7139:21:7139:41 | (...)... : AsciiString | provenance |  |
-| Test.java:7140:10:7140:11 | in : AsciiString | Test.java:7140:10:7140:25 | toUpperCase(...) : AsciiString | provenance | MaD:487 |
+| Test.java:7140:10:7140:11 | in : AsciiString | Test.java:7140:10:7140:25 | toUpperCase(...) : AsciiString | provenance | MaD:488 |
 | Test.java:7140:10:7140:25 | toUpperCase(...) : AsciiString | Test.java:7141:9:7141:11 | out | provenance |  |
 | Test.java:7146:21:7146:41 | (...)... : AsciiString | Test.java:7147:10:7147:11 | in : AsciiString | provenance |  |
 | Test.java:7146:34:7146:41 | source(...) : Object | Test.java:7146:21:7146:41 | (...)... : AsciiString | provenance |  |
-| Test.java:7147:10:7147:11 | in : AsciiString | Test.java:7147:10:7147:18 | trim(...) : AsciiString | provenance | MaD:488 |
+| Test.java:7147:10:7147:11 | in : AsciiString | Test.java:7147:10:7147:18 | trim(...) : AsciiString | provenance | MaD:489 |
 | Test.java:7147:10:7147:18 | trim(...) : AsciiString | Test.java:7148:9:7148:11 | out | provenance |  |
 | Test.java:7153:22:7153:43 | (...)... : CharSequence | Test.java:7154:27:7154:28 | in : CharSequence | provenance |  |
 | Test.java:7153:36:7153:43 | source(...) : Object | Test.java:7153:22:7153:43 | (...)... : CharSequence | provenance |  |
 | Test.java:7154:10:7154:29 | trim(...) : CharSequence | Test.java:7155:9:7155:11 | out | provenance |  |
-| Test.java:7154:27:7154:28 | in : CharSequence | Test.java:7154:10:7154:29 | trim(...) : CharSequence | provenance | MaD:489 |
+| Test.java:7154:27:7154:28 | in : CharSequence | Test.java:7154:10:7154:29 | trim(...) : CharSequence | provenance | MaD:490 |
 | Test.java:7160:19:7160:37 | (...)... : Attribute | Test.java:7161:10:7161:11 | in : Attribute | provenance |  |
 | Test.java:7160:30:7160:37 | source(...) : Object | Test.java:7160:19:7160:37 | (...)... : Attribute | provenance |  |
-| Test.java:7161:10:7161:11 | in : Attribute | Test.java:7161:10:7161:20 | retain(...) : Attribute | provenance | MaD:468 |
+| Test.java:7161:10:7161:11 | in : Attribute | Test.java:7161:10:7161:20 | retain(...) : Attribute | provenance | MaD:491 |
 | Test.java:7161:10:7161:20 | retain(...) : Attribute | Test.java:7162:9:7162:11 | out | provenance |  |
 | Test.java:7167:19:7167:37 | (...)... : Attribute | Test.java:7168:10:7168:11 | in : Attribute | provenance |  |
 | Test.java:7167:30:7167:37 | source(...) : Object | Test.java:7167:19:7167:37 | (...)... : Attribute | provenance |  |
-| Test.java:7168:10:7168:11 | in : Attribute | Test.java:7168:10:7168:21 | retain(...) : Attribute | provenance | MaD:468 |
+| Test.java:7168:10:7168:11 | in : Attribute | Test.java:7168:10:7168:21 | retain(...) : Attribute | provenance | MaD:491 |
 | Test.java:7168:10:7168:21 | retain(...) : Attribute | Test.java:7169:9:7169:11 | out | provenance |  |
 | Test.java:7174:30:7174:59 | (...)... : BinaryWebSocketFrame | Test.java:7175:10:7175:11 | in : BinaryWebSocketFrame | provenance |  |
 | Test.java:7174:52:7174:59 | source(...) : Object | Test.java:7174:30:7174:59 | (...)... : BinaryWebSocketFrame | provenance |  |
-| Test.java:7175:10:7175:11 | in : BinaryWebSocketFrame | Test.java:7175:10:7175:20 | retain(...) : BinaryWebSocketFrame | provenance | MaD:468 |
+| Test.java:7175:10:7175:11 | in : BinaryWebSocketFrame | Test.java:7175:10:7175:20 | retain(...) : BinaryWebSocketFrame | provenance | MaD:491 |
 | Test.java:7175:10:7175:20 | retain(...) : BinaryWebSocketFrame | Test.java:7176:9:7176:11 | out | provenance |  |
 | Test.java:7181:30:7181:59 | (...)... : BinaryWebSocketFrame | Test.java:7182:10:7182:11 | in : BinaryWebSocketFrame | provenance |  |
 | Test.java:7181:52:7181:59 | source(...) : Object | Test.java:7181:30:7181:59 | (...)... : BinaryWebSocketFrame | provenance |  |
-| Test.java:7182:10:7182:11 | in : BinaryWebSocketFrame | Test.java:7182:10:7182:21 | retain(...) : BinaryWebSocketFrame | provenance | MaD:468 |
+| Test.java:7182:10:7182:11 | in : BinaryWebSocketFrame | Test.java:7182:10:7182:21 | retain(...) : BinaryWebSocketFrame | provenance | MaD:491 |
 | Test.java:7182:10:7182:21 | retain(...) : BinaryWebSocketFrame | Test.java:7183:9:7183:11 | out | provenance |  |
 | Test.java:7188:41:7188:81 | (...)... : AbstractReferenceCountedByteBuf | Test.java:7189:10:7189:11 | in : AbstractReferenceCountedByteBuf | provenance |  |
 | Test.java:7188:74:7188:81 | source(...) : Object | Test.java:7188:41:7188:81 | (...)... : AbstractReferenceCountedByteBuf | provenance |  |
-| Test.java:7189:10:7189:11 | in : AbstractReferenceCountedByteBuf | Test.java:7189:10:7189:20 | retain(...) : AbstractReferenceCountedByteBuf | provenance | MaD:468 |
+| Test.java:7189:10:7189:11 | in : AbstractReferenceCountedByteBuf | Test.java:7189:10:7189:20 | retain(...) : AbstractReferenceCountedByteBuf | provenance | MaD:491 |
 | Test.java:7189:10:7189:20 | retain(...) : AbstractReferenceCountedByteBuf | Test.java:7190:9:7190:11 | out | provenance |  |
 | Test.java:7195:41:7195:81 | (...)... : AbstractReferenceCountedByteBuf | Test.java:7196:10:7196:11 | in : AbstractReferenceCountedByteBuf | provenance |  |
 | Test.java:7195:74:7195:81 | source(...) : Object | Test.java:7195:41:7195:81 | (...)... : AbstractReferenceCountedByteBuf | provenance |  |
-| Test.java:7196:10:7196:11 | in : AbstractReferenceCountedByteBuf | Test.java:7196:10:7196:21 | retain(...) : AbstractReferenceCountedByteBuf | provenance | MaD:468 |
+| Test.java:7196:10:7196:11 | in : AbstractReferenceCountedByteBuf | Test.java:7196:10:7196:21 | retain(...) : AbstractReferenceCountedByteBuf | provenance | MaD:491 |
 | Test.java:7196:10:7196:21 | retain(...) : AbstractReferenceCountedByteBuf | Test.java:7197:9:7197:11 | out | provenance |  |
 | Test.java:7202:17:7202:33 | (...)... : ByteBuf | Test.java:7203:10:7203:11 | in : ByteBuf | provenance |  |
 | Test.java:7202:26:7202:33 | source(...) : Object | Test.java:7202:17:7202:33 | (...)... : ByteBuf | provenance |  |
-| Test.java:7203:10:7203:11 | in : ByteBuf | Test.java:7203:10:7203:20 | retain(...) : ByteBuf | provenance | MaD:468 |
+| Test.java:7203:10:7203:11 | in : ByteBuf | Test.java:7203:10:7203:20 | retain(...) : ByteBuf | provenance | MaD:491 |
 | Test.java:7203:10:7203:20 | retain(...) : ByteBuf | Test.java:7204:9:7204:11 | out | provenance |  |
 | Test.java:7209:17:7209:33 | (...)... : ByteBuf | Test.java:7210:10:7210:11 | in : ByteBuf | provenance |  |
 | Test.java:7209:26:7209:33 | source(...) : Object | Test.java:7209:17:7209:33 | (...)... : ByteBuf | provenance |  |
-| Test.java:7210:10:7210:11 | in : ByteBuf | Test.java:7210:10:7210:21 | retain(...) : ByteBuf | provenance | MaD:468 |
+| Test.java:7210:10:7210:11 | in : ByteBuf | Test.java:7210:10:7210:21 | retain(...) : ByteBuf | provenance | MaD:491 |
 | Test.java:7210:10:7210:21 | retain(...) : ByteBuf | Test.java:7211:9:7211:11 | out | provenance |  |
 | Test.java:7216:24:7216:47 | (...)... : SwappedByteBuf | Test.java:7217:10:7217:11 | in : SwappedByteBuf | provenance |  |
 | Test.java:7216:40:7216:47 | source(...) : Object | Test.java:7216:24:7216:47 | (...)... : SwappedByteBuf | provenance |  |
-| Test.java:7217:10:7217:11 | in : SwappedByteBuf | Test.java:7217:10:7217:20 | retain(...) : SwappedByteBuf | provenance | MaD:468 |
+| Test.java:7217:10:7217:11 | in : SwappedByteBuf | Test.java:7217:10:7217:20 | retain(...) : SwappedByteBuf | provenance | MaD:491 |
 | Test.java:7217:10:7217:20 | retain(...) : SwappedByteBuf | Test.java:7218:9:7218:11 | out | provenance |  |
 | Test.java:7223:24:7223:47 | (...)... : SwappedByteBuf | Test.java:7224:10:7224:11 | in : SwappedByteBuf | provenance |  |
 | Test.java:7223:40:7223:47 | source(...) : Object | Test.java:7223:24:7223:47 | (...)... : SwappedByteBuf | provenance |  |
-| Test.java:7224:10:7224:11 | in : SwappedByteBuf | Test.java:7224:10:7224:21 | retain(...) : SwappedByteBuf | provenance | MaD:468 |
+| Test.java:7224:10:7224:11 | in : SwappedByteBuf | Test.java:7224:10:7224:21 | retain(...) : SwappedByteBuf | provenance | MaD:491 |
 | Test.java:7224:10:7224:21 | retain(...) : SwappedByteBuf | Test.java:7225:9:7225:11 | out | provenance |  |
 | Test.java:7230:23:7230:45 | (...)... : ByteBufHolder | Test.java:7231:10:7231:11 | in : ByteBufHolder | provenance |  |
 | Test.java:7230:38:7230:45 | source(...) : Object | Test.java:7230:23:7230:45 | (...)... : ByteBufHolder | provenance |  |
-| Test.java:7231:10:7231:11 | in : ByteBufHolder | Test.java:7231:10:7231:20 | retain(...) : ByteBufHolder | provenance | MaD:468 |
+| Test.java:7231:10:7231:11 | in : ByteBufHolder | Test.java:7231:10:7231:20 | retain(...) : ByteBufHolder | provenance | MaD:491 |
 | Test.java:7231:10:7231:20 | retain(...) : ByteBufHolder | Test.java:7232:9:7232:11 | out | provenance |  |
 | Test.java:7237:23:7237:45 | (...)... : ByteBufHolder | Test.java:7238:10:7238:11 | in : ByteBufHolder | provenance |  |
 | Test.java:7237:38:7237:45 | source(...) : Object | Test.java:7237:23:7237:45 | (...)... : ByteBufHolder | provenance |  |
-| Test.java:7238:10:7238:11 | in : ByteBufHolder | Test.java:7238:10:7238:21 | retain(...) : ByteBufHolder | provenance | MaD:468 |
+| Test.java:7238:10:7238:11 | in : ByteBufHolder | Test.java:7238:10:7238:21 | retain(...) : ByteBufHolder | provenance | MaD:491 |
 | Test.java:7238:10:7238:21 | retain(...) : ByteBufHolder | Test.java:7239:9:7239:11 | out | provenance |  |
 | Test.java:7244:30:7244:59 | (...)... : DefaultByteBufHolder | Test.java:7245:10:7245:11 | in : DefaultByteBufHolder | provenance |  |
 | Test.java:7244:52:7244:59 | source(...) : Object | Test.java:7244:30:7244:59 | (...)... : DefaultByteBufHolder | provenance |  |
-| Test.java:7245:10:7245:11 | in : DefaultByteBufHolder | Test.java:7245:10:7245:20 | retain(...) : DefaultByteBufHolder | provenance | MaD:468 |
+| Test.java:7245:10:7245:11 | in : DefaultByteBufHolder | Test.java:7245:10:7245:20 | retain(...) : DefaultByteBufHolder | provenance | MaD:491 |
 | Test.java:7245:10:7245:20 | retain(...) : DefaultByteBufHolder | Test.java:7246:9:7246:11 | out | provenance |  |
 | Test.java:7251:30:7251:59 | (...)... : DefaultByteBufHolder | Test.java:7252:10:7252:11 | in : DefaultByteBufHolder | provenance |  |
 | Test.java:7251:52:7251:59 | source(...) : Object | Test.java:7251:30:7251:59 | (...)... : DefaultByteBufHolder | provenance |  |
-| Test.java:7252:10:7252:11 | in : DefaultByteBufHolder | Test.java:7252:10:7252:21 | retain(...) : DefaultByteBufHolder | provenance | MaD:468 |
+| Test.java:7252:10:7252:11 | in : DefaultByteBufHolder | Test.java:7252:10:7252:21 | retain(...) : DefaultByteBufHolder | provenance | MaD:491 |
 | Test.java:7252:10:7252:21 | retain(...) : DefaultByteBufHolder | Test.java:7253:9:7253:11 | out | provenance |  |
 | Test.java:7258:29:7258:57 | (...)... : CloseWebSocketFrame | Test.java:7259:10:7259:11 | in : CloseWebSocketFrame | provenance |  |
 | Test.java:7258:50:7258:57 | source(...) : Object | Test.java:7258:29:7258:57 | (...)... : CloseWebSocketFrame | provenance |  |
-| Test.java:7259:10:7259:11 | in : CloseWebSocketFrame | Test.java:7259:10:7259:20 | retain(...) : CloseWebSocketFrame | provenance | MaD:468 |
+| Test.java:7259:10:7259:11 | in : CloseWebSocketFrame | Test.java:7259:10:7259:20 | retain(...) : CloseWebSocketFrame | provenance | MaD:491 |
 | Test.java:7259:10:7259:20 | retain(...) : CloseWebSocketFrame | Test.java:7260:9:7260:11 | out | provenance |  |
 | Test.java:7265:29:7265:57 | (...)... : CloseWebSocketFrame | Test.java:7266:10:7266:11 | in : CloseWebSocketFrame | provenance |  |
 | Test.java:7265:50:7265:57 | source(...) : Object | Test.java:7265:29:7265:57 | (...)... : CloseWebSocketFrame | provenance |  |
-| Test.java:7266:10:7266:11 | in : CloseWebSocketFrame | Test.java:7266:10:7266:21 | retain(...) : CloseWebSocketFrame | provenance | MaD:468 |
+| Test.java:7266:10:7266:11 | in : CloseWebSocketFrame | Test.java:7266:10:7266:21 | retain(...) : CloseWebSocketFrame | provenance | MaD:491 |
 | Test.java:7266:10:7266:21 | retain(...) : CloseWebSocketFrame | Test.java:7267:9:7267:11 | out | provenance |  |
 | Test.java:7272:26:7272:51 | (...)... : CompositeByteBuf | Test.java:7273:10:7273:11 | in : CompositeByteBuf | provenance |  |
 | Test.java:7272:44:7272:51 | source(...) : Object | Test.java:7272:26:7272:51 | (...)... : CompositeByteBuf | provenance |  |
-| Test.java:7273:10:7273:11 | in : CompositeByteBuf | Test.java:7273:10:7273:20 | retain(...) : CompositeByteBuf | provenance | MaD:468 |
+| Test.java:7273:10:7273:11 | in : CompositeByteBuf | Test.java:7273:10:7273:20 | retain(...) : CompositeByteBuf | provenance | MaD:491 |
 | Test.java:7273:10:7273:20 | retain(...) : CompositeByteBuf | Test.java:7274:9:7274:11 | out | provenance |  |
 | Test.java:7279:26:7279:51 | (...)... : CompositeByteBuf | Test.java:7280:10:7280:11 | in : CompositeByteBuf | provenance |  |
 | Test.java:7279:44:7279:51 | source(...) : Object | Test.java:7279:26:7279:51 | (...)... : CompositeByteBuf | provenance |  |
-| Test.java:7280:10:7280:11 | in : CompositeByteBuf | Test.java:7280:10:7280:21 | retain(...) : CompositeByteBuf | provenance | MaD:468 |
+| Test.java:7280:10:7280:11 | in : CompositeByteBuf | Test.java:7280:10:7280:21 | retain(...) : CompositeByteBuf | provenance | MaD:491 |
 | Test.java:7280:10:7280:21 | retain(...) : CompositeByteBuf | Test.java:7281:9:7281:11 | out | provenance |  |
 | Test.java:7286:36:7286:71 | (...)... : ContinuationWebSocketFrame | Test.java:7287:10:7287:11 | in : ContinuationWebSocketFrame | provenance |  |
 | Test.java:7286:64:7286:71 | source(...) : Object | Test.java:7286:36:7286:71 | (...)... : ContinuationWebSocketFrame | provenance |  |
-| Test.java:7287:10:7287:11 | in : ContinuationWebSocketFrame | Test.java:7287:10:7287:20 | retain(...) : ContinuationWebSocketFrame | provenance | MaD:468 |
+| Test.java:7287:10:7287:11 | in : ContinuationWebSocketFrame | Test.java:7287:10:7287:20 | retain(...) : ContinuationWebSocketFrame | provenance | MaD:491 |
 | Test.java:7287:10:7287:20 | retain(...) : ContinuationWebSocketFrame | Test.java:7288:9:7288:11 | out | provenance |  |
 | Test.java:7293:36:7293:71 | (...)... : ContinuationWebSocketFrame | Test.java:7294:10:7294:11 | in : ContinuationWebSocketFrame | provenance |  |
 | Test.java:7293:64:7293:71 | source(...) : Object | Test.java:7293:36:7293:71 | (...)... : ContinuationWebSocketFrame | provenance |  |
-| Test.java:7294:10:7294:11 | in : ContinuationWebSocketFrame | Test.java:7294:10:7294:21 | retain(...) : ContinuationWebSocketFrame | provenance | MaD:468 |
+| Test.java:7294:10:7294:11 | in : ContinuationWebSocketFrame | Test.java:7294:10:7294:21 | retain(...) : ContinuationWebSocketFrame | provenance | MaD:491 |
 | Test.java:7294:10:7294:21 | retain(...) : ContinuationWebSocketFrame | Test.java:7295:9:7295:11 | out | provenance |  |
 | Test.java:7300:27:7300:53 | (...)... : DefaultFileRegion | Test.java:7301:10:7301:11 | in : DefaultFileRegion | provenance |  |
 | Test.java:7300:46:7300:53 | source(...) : Object | Test.java:7300:27:7300:53 | (...)... : DefaultFileRegion | provenance |  |
-| Test.java:7301:10:7301:11 | in : DefaultFileRegion | Test.java:7301:10:7301:20 | retain(...) : DefaultFileRegion | provenance | MaD:468 |
+| Test.java:7301:10:7301:11 | in : DefaultFileRegion | Test.java:7301:10:7301:20 | retain(...) : DefaultFileRegion | provenance | MaD:491 |
 | Test.java:7301:10:7301:20 | retain(...) : DefaultFileRegion | Test.java:7302:9:7302:11 | out | provenance |  |
 | Test.java:7307:27:7307:53 | (...)... : DefaultFileRegion | Test.java:7308:10:7308:11 | in : DefaultFileRegion | provenance |  |
 | Test.java:7307:46:7307:53 | source(...) : Object | Test.java:7307:27:7307:53 | (...)... : DefaultFileRegion | provenance |  |
-| Test.java:7308:10:7308:11 | in : DefaultFileRegion | Test.java:7308:10:7308:21 | retain(...) : DefaultFileRegion | provenance | MaD:468 |
+| Test.java:7308:10:7308:11 | in : DefaultFileRegion | Test.java:7308:10:7308:21 | retain(...) : DefaultFileRegion | provenance | MaD:491 |
 | Test.java:7308:10:7308:21 | retain(...) : DefaultFileRegion | Test.java:7309:9:7309:11 | out | provenance |  |
 | Test.java:7314:20:7314:39 | (...)... : FileRegion | Test.java:7315:10:7315:11 | in : FileRegion | provenance |  |
 | Test.java:7314:32:7314:39 | source(...) : Object | Test.java:7314:20:7314:39 | (...)... : FileRegion | provenance |  |
-| Test.java:7315:10:7315:11 | in : FileRegion | Test.java:7315:10:7315:20 | retain(...) : FileRegion | provenance | MaD:468 |
+| Test.java:7315:10:7315:11 | in : FileRegion | Test.java:7315:10:7315:20 | retain(...) : FileRegion | provenance | MaD:491 |
 | Test.java:7315:10:7315:20 | retain(...) : FileRegion | Test.java:7316:9:7316:11 | out | provenance |  |
 | Test.java:7321:20:7321:39 | (...)... : FileRegion | Test.java:7322:10:7322:11 | in : FileRegion | provenance |  |
 | Test.java:7321:32:7321:39 | source(...) : Object | Test.java:7321:20:7321:39 | (...)... : FileRegion | provenance |  |
-| Test.java:7322:10:7322:11 | in : FileRegion | Test.java:7322:10:7322:21 | retain(...) : FileRegion | provenance | MaD:468 |
+| Test.java:7322:10:7322:11 | in : FileRegion | Test.java:7322:10:7322:21 | retain(...) : FileRegion | provenance | MaD:491 |
 | Test.java:7322:10:7322:21 | retain(...) : FileRegion | Test.java:7323:9:7323:11 | out | provenance |  |
 | Test.java:7328:20:7328:39 | (...)... : FileUpload | Test.java:7329:10:7329:11 | in : FileUpload | provenance |  |
 | Test.java:7328:32:7328:39 | source(...) : Object | Test.java:7328:20:7328:39 | (...)... : FileUpload | provenance |  |
-| Test.java:7329:10:7329:11 | in : FileUpload | Test.java:7329:10:7329:20 | retain(...) : FileUpload | provenance | MaD:468 |
+| Test.java:7329:10:7329:11 | in : FileUpload | Test.java:7329:10:7329:20 | retain(...) : FileUpload | provenance | MaD:491 |
 | Test.java:7329:10:7329:20 | retain(...) : FileUpload | Test.java:7330:9:7330:11 | out | provenance |  |
 | Test.java:7335:20:7335:39 | (...)... : FileUpload | Test.java:7336:10:7336:11 | in : FileUpload | provenance |  |
 | Test.java:7335:32:7335:39 | source(...) : Object | Test.java:7335:20:7335:39 | (...)... : FileUpload | provenance |  |
-| Test.java:7336:10:7336:11 | in : FileUpload | Test.java:7336:10:7336:21 | retain(...) : FileUpload | provenance | MaD:468 |
+| Test.java:7336:10:7336:11 | in : FileUpload | Test.java:7336:10:7336:21 | retain(...) : FileUpload | provenance | MaD:491 |
 | Test.java:7336:10:7336:21 | retain(...) : FileUpload | Test.java:7337:9:7337:11 | out | provenance |  |
 | Test.java:7342:25:7342:49 | (...)... : FullHttpMessage | Test.java:7343:10:7343:11 | in : FullHttpMessage | provenance |  |
 | Test.java:7342:42:7342:49 | source(...) : Object | Test.java:7342:25:7342:49 | (...)... : FullHttpMessage | provenance |  |
-| Test.java:7343:10:7343:11 | in : FullHttpMessage | Test.java:7343:10:7343:20 | retain(...) : FullHttpMessage | provenance | MaD:468 |
+| Test.java:7343:10:7343:11 | in : FullHttpMessage | Test.java:7343:10:7343:20 | retain(...) : FullHttpMessage | provenance | MaD:491 |
 | Test.java:7343:10:7343:20 | retain(...) : FullHttpMessage | Test.java:7344:9:7344:11 | out | provenance |  |
 | Test.java:7349:25:7349:49 | (...)... : FullHttpMessage | Test.java:7350:10:7350:11 | in : FullHttpMessage | provenance |  |
 | Test.java:7349:42:7349:49 | source(...) : Object | Test.java:7349:25:7349:49 | (...)... : FullHttpMessage | provenance |  |
-| Test.java:7350:10:7350:11 | in : FullHttpMessage | Test.java:7350:10:7350:21 | retain(...) : FullHttpMessage | provenance | MaD:468 |
+| Test.java:7350:10:7350:11 | in : FullHttpMessage | Test.java:7350:10:7350:21 | retain(...) : FullHttpMessage | provenance | MaD:491 |
 | Test.java:7350:10:7350:21 | retain(...) : FullHttpMessage | Test.java:7351:9:7351:11 | out | provenance |  |
 | Test.java:7356:25:7356:49 | (...)... : FullHttpRequest | Test.java:7357:10:7357:11 | in : FullHttpRequest | provenance |  |
 | Test.java:7356:42:7356:49 | source(...) : Object | Test.java:7356:25:7356:49 | (...)... : FullHttpRequest | provenance |  |
-| Test.java:7357:10:7357:11 | in : FullHttpRequest | Test.java:7357:10:7357:20 | retain(...) : FullHttpRequest | provenance | MaD:468 |
+| Test.java:7357:10:7357:11 | in : FullHttpRequest | Test.java:7357:10:7357:20 | retain(...) : FullHttpRequest | provenance | MaD:491 |
 | Test.java:7357:10:7357:20 | retain(...) : FullHttpRequest | Test.java:7358:9:7358:11 | out | provenance |  |
 | Test.java:7363:25:7363:49 | (...)... : FullHttpRequest | Test.java:7364:10:7364:11 | in : FullHttpRequest | provenance |  |
 | Test.java:7363:42:7363:49 | source(...) : Object | Test.java:7363:25:7363:49 | (...)... : FullHttpRequest | provenance |  |
-| Test.java:7364:10:7364:11 | in : FullHttpRequest | Test.java:7364:10:7364:21 | retain(...) : FullHttpRequest | provenance | MaD:468 |
+| Test.java:7364:10:7364:11 | in : FullHttpRequest | Test.java:7364:10:7364:21 | retain(...) : FullHttpRequest | provenance | MaD:491 |
 | Test.java:7364:10:7364:21 | retain(...) : FullHttpRequest | Test.java:7365:9:7365:11 | out | provenance |  |
 | Test.java:7370:26:7370:51 | (...)... : FullHttpResponse | Test.java:7371:10:7371:11 | in : FullHttpResponse | provenance |  |
 | Test.java:7370:44:7370:51 | source(...) : Object | Test.java:7370:26:7370:51 | (...)... : FullHttpResponse | provenance |  |
-| Test.java:7371:10:7371:11 | in : FullHttpResponse | Test.java:7371:10:7371:20 | retain(...) : FullHttpResponse | provenance | MaD:468 |
+| Test.java:7371:10:7371:11 | in : FullHttpResponse | Test.java:7371:10:7371:20 | retain(...) : FullHttpResponse | provenance | MaD:491 |
 | Test.java:7371:10:7371:20 | retain(...) : FullHttpResponse | Test.java:7372:9:7372:11 | out | provenance |  |
 | Test.java:7377:26:7377:51 | (...)... : FullHttpResponse | Test.java:7378:10:7378:11 | in : FullHttpResponse | provenance |  |
 | Test.java:7377:44:7377:51 | source(...) : Object | Test.java:7377:26:7377:51 | (...)... : FullHttpResponse | provenance |  |
-| Test.java:7378:10:7378:11 | in : FullHttpResponse | Test.java:7378:10:7378:21 | retain(...) : FullHttpResponse | provenance | MaD:468 |
+| Test.java:7378:10:7378:11 | in : FullHttpResponse | Test.java:7378:10:7378:21 | retain(...) : FullHttpResponse | provenance | MaD:491 |
 | Test.java:7378:10:7378:21 | retain(...) : FullHttpResponse | Test.java:7379:9:7379:11 | out | provenance |  |
 | Test.java:7384:21:7384:41 | (...)... : HttpContent | Test.java:7385:10:7385:11 | in : HttpContent | provenance |  |
 | Test.java:7384:34:7384:41 | source(...) : Object | Test.java:7384:21:7384:41 | (...)... : HttpContent | provenance |  |
-| Test.java:7385:10:7385:11 | in : HttpContent | Test.java:7385:10:7385:20 | retain(...) : HttpContent | provenance | MaD:468 |
+| Test.java:7385:10:7385:11 | in : HttpContent | Test.java:7385:10:7385:20 | retain(...) : HttpContent | provenance | MaD:491 |
 | Test.java:7385:10:7385:20 | retain(...) : HttpContent | Test.java:7386:9:7386:11 | out | provenance |  |
 | Test.java:7391:21:7391:41 | (...)... : HttpContent | Test.java:7392:10:7392:11 | in : HttpContent | provenance |  |
 | Test.java:7391:34:7391:41 | source(...) : Object | Test.java:7391:21:7391:41 | (...)... : HttpContent | provenance |  |
-| Test.java:7392:10:7392:11 | in : HttpContent | Test.java:7392:10:7392:21 | retain(...) : HttpContent | provenance | MaD:468 |
+| Test.java:7392:10:7392:11 | in : HttpContent | Test.java:7392:10:7392:21 | retain(...) : HttpContent | provenance | MaD:491 |
 | Test.java:7392:10:7392:21 | retain(...) : HttpContent | Test.java:7393:9:7393:11 | out | provenance |  |
 | Test.java:7398:18:7398:35 | (...)... : HttpData | Test.java:7399:10:7399:11 | in : HttpData | provenance |  |
 | Test.java:7398:28:7398:35 | source(...) : Object | Test.java:7398:18:7398:35 | (...)... : HttpData | provenance |  |
-| Test.java:7399:10:7399:11 | in : HttpData | Test.java:7399:10:7399:20 | retain(...) : HttpData | provenance | MaD:468 |
+| Test.java:7399:10:7399:11 | in : HttpData | Test.java:7399:10:7399:20 | retain(...) : HttpData | provenance | MaD:491 |
 | Test.java:7399:10:7399:20 | retain(...) : HttpData | Test.java:7400:9:7400:11 | out | provenance |  |
 | Test.java:7405:18:7405:35 | (...)... : HttpData | Test.java:7406:10:7406:11 | in : HttpData | provenance |  |
 | Test.java:7405:28:7405:35 | source(...) : Object | Test.java:7405:18:7405:35 | (...)... : HttpData | provenance |  |
-| Test.java:7406:10:7406:11 | in : HttpData | Test.java:7406:10:7406:21 | retain(...) : HttpData | provenance | MaD:468 |
+| Test.java:7406:10:7406:11 | in : HttpData | Test.java:7406:10:7406:21 | retain(...) : HttpData | provenance | MaD:491 |
 | Test.java:7406:10:7406:21 | retain(...) : HttpData | Test.java:7407:9:7407:11 | out | provenance |  |
 | Test.java:7412:27:7412:53 | (...)... : InterfaceHttpData | Test.java:7413:10:7413:11 | in : InterfaceHttpData | provenance |  |
 | Test.java:7412:46:7412:53 | source(...) : Object | Test.java:7412:27:7412:53 | (...)... : InterfaceHttpData | provenance |  |
-| Test.java:7413:10:7413:11 | in : InterfaceHttpData | Test.java:7413:10:7413:20 | retain(...) : InterfaceHttpData | provenance | MaD:468 |
+| Test.java:7413:10:7413:11 | in : InterfaceHttpData | Test.java:7413:10:7413:20 | retain(...) : InterfaceHttpData | provenance | MaD:491 |
 | Test.java:7413:10:7413:20 | retain(...) : InterfaceHttpData | Test.java:7414:9:7414:11 | out | provenance |  |
 | Test.java:7419:27:7419:53 | (...)... : InterfaceHttpData | Test.java:7420:10:7420:11 | in : InterfaceHttpData | provenance |  |
 | Test.java:7419:46:7419:53 | source(...) : Object | Test.java:7419:27:7419:53 | (...)... : InterfaceHttpData | provenance |  |
-| Test.java:7420:10:7420:11 | in : InterfaceHttpData | Test.java:7420:10:7420:21 | retain(...) : InterfaceHttpData | provenance | MaD:468 |
+| Test.java:7420:10:7420:11 | in : InterfaceHttpData | Test.java:7420:10:7420:21 | retain(...) : InterfaceHttpData | provenance | MaD:491 |
 | Test.java:7420:10:7420:21 | retain(...) : InterfaceHttpData | Test.java:7421:9:7421:11 | out | provenance |  |
 | Test.java:7426:25:7426:49 | (...)... : LastHttpContent | Test.java:7427:10:7427:11 | in : LastHttpContent | provenance |  |
 | Test.java:7426:42:7426:49 | source(...) : Object | Test.java:7426:25:7426:49 | (...)... : LastHttpContent | provenance |  |
-| Test.java:7427:10:7427:11 | in : LastHttpContent | Test.java:7427:10:7427:20 | retain(...) : LastHttpContent | provenance | MaD:468 |
+| Test.java:7427:10:7427:11 | in : LastHttpContent | Test.java:7427:10:7427:20 | retain(...) : LastHttpContent | provenance | MaD:491 |
 | Test.java:7427:10:7427:20 | retain(...) : LastHttpContent | Test.java:7428:9:7428:11 | out | provenance |  |
 | Test.java:7433:25:7433:49 | (...)... : LastHttpContent | Test.java:7434:10:7434:11 | in : LastHttpContent | provenance |  |
 | Test.java:7433:42:7433:49 | source(...) : Object | Test.java:7433:25:7433:49 | (...)... : LastHttpContent | provenance |  |
-| Test.java:7434:10:7434:11 | in : LastHttpContent | Test.java:7434:10:7434:21 | retain(...) : LastHttpContent | provenance | MaD:468 |
+| Test.java:7434:10:7434:11 | in : LastHttpContent | Test.java:7434:10:7434:21 | retain(...) : LastHttpContent | provenance | MaD:491 |
 | Test.java:7434:10:7434:21 | retain(...) : LastHttpContent | Test.java:7435:9:7435:11 | out | provenance |  |
 | Test.java:7440:28:7440:55 | (...)... : PingWebSocketFrame | Test.java:7441:10:7441:11 | in : PingWebSocketFrame | provenance |  |
 | Test.java:7440:48:7440:55 | source(...) : Object | Test.java:7440:28:7440:55 | (...)... : PingWebSocketFrame | provenance |  |
-| Test.java:7441:10:7441:11 | in : PingWebSocketFrame | Test.java:7441:10:7441:20 | retain(...) : PingWebSocketFrame | provenance | MaD:468 |
+| Test.java:7441:10:7441:11 | in : PingWebSocketFrame | Test.java:7441:10:7441:20 | retain(...) : PingWebSocketFrame | provenance | MaD:491 |
 | Test.java:7441:10:7441:20 | retain(...) : PingWebSocketFrame | Test.java:7442:9:7442:11 | out | provenance |  |
 | Test.java:7447:28:7447:55 | (...)... : PingWebSocketFrame | Test.java:7448:10:7448:11 | in : PingWebSocketFrame | provenance |  |
 | Test.java:7447:48:7447:55 | source(...) : Object | Test.java:7447:28:7447:55 | (...)... : PingWebSocketFrame | provenance |  |
-| Test.java:7448:10:7448:11 | in : PingWebSocketFrame | Test.java:7448:10:7448:21 | retain(...) : PingWebSocketFrame | provenance | MaD:468 |
+| Test.java:7448:10:7448:11 | in : PingWebSocketFrame | Test.java:7448:10:7448:21 | retain(...) : PingWebSocketFrame | provenance | MaD:491 |
 | Test.java:7448:10:7448:21 | retain(...) : PingWebSocketFrame | Test.java:7449:9:7449:11 | out | provenance |  |
 | Test.java:7454:28:7454:55 | (...)... : PongWebSocketFrame | Test.java:7455:10:7455:11 | in : PongWebSocketFrame | provenance |  |
 | Test.java:7454:48:7454:55 | source(...) : Object | Test.java:7454:28:7454:55 | (...)... : PongWebSocketFrame | provenance |  |
-| Test.java:7455:10:7455:11 | in : PongWebSocketFrame | Test.java:7455:10:7455:20 | retain(...) : PongWebSocketFrame | provenance | MaD:468 |
+| Test.java:7455:10:7455:11 | in : PongWebSocketFrame | Test.java:7455:10:7455:20 | retain(...) : PongWebSocketFrame | provenance | MaD:491 |
 | Test.java:7455:10:7455:20 | retain(...) : PongWebSocketFrame | Test.java:7456:9:7456:11 | out | provenance |  |
 | Test.java:7461:28:7461:55 | (...)... : PongWebSocketFrame | Test.java:7462:10:7462:11 | in : PongWebSocketFrame | provenance |  |
 | Test.java:7461:48:7461:55 | source(...) : Object | Test.java:7461:28:7461:55 | (...)... : PongWebSocketFrame | provenance |  |
-| Test.java:7462:10:7462:11 | in : PongWebSocketFrame | Test.java:7462:10:7462:21 | retain(...) : PongWebSocketFrame | provenance | MaD:468 |
+| Test.java:7462:10:7462:11 | in : PongWebSocketFrame | Test.java:7462:10:7462:21 | retain(...) : PongWebSocketFrame | provenance | MaD:491 |
 | Test.java:7462:10:7462:21 | retain(...) : PongWebSocketFrame | Test.java:7463:9:7463:11 | out | provenance |  |
 | Test.java:7468:34:7468:67 | (...)... : AbstractReferenceCounted | Test.java:7469:10:7469:11 | in : AbstractReferenceCounted | provenance |  |
 | Test.java:7468:60:7468:67 | source(...) : Object | Test.java:7468:34:7468:67 | (...)... : AbstractReferenceCounted | provenance |  |
-| Test.java:7469:10:7469:11 | in : AbstractReferenceCounted | Test.java:7469:10:7469:20 | retain(...) : AbstractReferenceCounted | provenance | MaD:468 |
+| Test.java:7469:10:7469:11 | in : AbstractReferenceCounted | Test.java:7469:10:7469:20 | retain(...) : AbstractReferenceCounted | provenance | MaD:491 |
 | Test.java:7469:10:7469:20 | retain(...) : AbstractReferenceCounted | Test.java:7470:9:7470:11 | out | provenance |  |
 | Test.java:7475:34:7475:67 | (...)... : AbstractReferenceCounted | Test.java:7476:10:7476:11 | in : AbstractReferenceCounted | provenance |  |
 | Test.java:7475:60:7475:67 | source(...) : Object | Test.java:7475:34:7475:67 | (...)... : AbstractReferenceCounted | provenance |  |
-| Test.java:7476:10:7476:11 | in : AbstractReferenceCounted | Test.java:7476:10:7476:21 | retain(...) : AbstractReferenceCounted | provenance | MaD:468 |
+| Test.java:7476:10:7476:11 | in : AbstractReferenceCounted | Test.java:7476:10:7476:21 | retain(...) : AbstractReferenceCounted | provenance | MaD:491 |
 | Test.java:7476:10:7476:21 | retain(...) : AbstractReferenceCounted | Test.java:7477:9:7477:11 | out | provenance |  |
 | Test.java:7482:26:7482:51 | (...)... : ReferenceCounted | Test.java:7483:10:7483:11 | in : ReferenceCounted | provenance |  |
 | Test.java:7482:44:7482:51 | source(...) : Object | Test.java:7482:26:7482:51 | (...)... : ReferenceCounted | provenance |  |
-| Test.java:7483:10:7483:11 | in : ReferenceCounted | Test.java:7483:10:7483:20 | retain(...) : ReferenceCounted | provenance | MaD:468 |
+| Test.java:7483:10:7483:11 | in : ReferenceCounted | Test.java:7483:10:7483:20 | retain(...) : ReferenceCounted | provenance | MaD:491 |
 | Test.java:7483:10:7483:20 | retain(...) : ReferenceCounted | Test.java:7484:9:7484:11 | out | provenance |  |
 | Test.java:7489:26:7489:51 | (...)... : ReferenceCounted | Test.java:7490:10:7490:11 | in : ReferenceCounted | provenance |  |
 | Test.java:7489:44:7489:51 | source(...) : Object | Test.java:7489:26:7489:51 | (...)... : ReferenceCounted | provenance |  |
-| Test.java:7490:10:7490:11 | in : ReferenceCounted | Test.java:7490:10:7490:21 | retain(...) : ReferenceCounted | provenance | MaD:468 |
+| Test.java:7490:10:7490:11 | in : ReferenceCounted | Test.java:7490:10:7490:21 | retain(...) : ReferenceCounted | provenance | MaD:491 |
 | Test.java:7490:10:7490:21 | retain(...) : ReferenceCounted | Test.java:7491:9:7491:11 | out | provenance |  |
 | Test.java:7496:28:7496:55 | (...)... : TextWebSocketFrame | Test.java:7497:10:7497:11 | in : TextWebSocketFrame | provenance |  |
 | Test.java:7496:48:7496:55 | source(...) : Object | Test.java:7496:28:7496:55 | (...)... : TextWebSocketFrame | provenance |  |
-| Test.java:7497:10:7497:11 | in : TextWebSocketFrame | Test.java:7497:10:7497:20 | retain(...) : TextWebSocketFrame | provenance | MaD:468 |
+| Test.java:7497:10:7497:11 | in : TextWebSocketFrame | Test.java:7497:10:7497:20 | retain(...) : TextWebSocketFrame | provenance | MaD:491 |
 | Test.java:7497:10:7497:20 | retain(...) : TextWebSocketFrame | Test.java:7498:9:7498:11 | out | provenance |  |
 | Test.java:7503:28:7503:55 | (...)... : TextWebSocketFrame | Test.java:7504:10:7504:11 | in : TextWebSocketFrame | provenance |  |
 | Test.java:7503:48:7503:55 | source(...) : Object | Test.java:7503:28:7503:55 | (...)... : TextWebSocketFrame | provenance |  |
-| Test.java:7504:10:7504:11 | in : TextWebSocketFrame | Test.java:7504:10:7504:21 | retain(...) : TextWebSocketFrame | provenance | MaD:468 |
+| Test.java:7504:10:7504:11 | in : TextWebSocketFrame | Test.java:7504:10:7504:21 | retain(...) : TextWebSocketFrame | provenance | MaD:491 |
 | Test.java:7504:10:7504:21 | retain(...) : TextWebSocketFrame | Test.java:7505:9:7505:11 | out | provenance |  |
 | Test.java:7510:24:7510:47 | (...)... : WebSocketFrame | Test.java:7511:10:7511:11 | in : WebSocketFrame | provenance |  |
 | Test.java:7510:40:7510:47 | source(...) : Object | Test.java:7510:24:7510:47 | (...)... : WebSocketFrame | provenance |  |
-| Test.java:7511:10:7511:11 | in : WebSocketFrame | Test.java:7511:10:7511:20 | retain(...) : WebSocketFrame | provenance | MaD:468 |
+| Test.java:7511:10:7511:11 | in : WebSocketFrame | Test.java:7511:10:7511:20 | retain(...) : WebSocketFrame | provenance | MaD:491 |
 | Test.java:7511:10:7511:20 | retain(...) : WebSocketFrame | Test.java:7512:9:7512:11 | out | provenance |  |
 | Test.java:7517:24:7517:47 | (...)... : WebSocketFrame | Test.java:7518:10:7518:11 | in : WebSocketFrame | provenance |  |
 | Test.java:7517:40:7517:47 | source(...) : Object | Test.java:7517:24:7517:47 | (...)... : WebSocketFrame | provenance |  |
-| Test.java:7518:10:7518:11 | in : WebSocketFrame | Test.java:7518:10:7518:21 | retain(...) : WebSocketFrame | provenance | MaD:468 |
+| Test.java:7518:10:7518:11 | in : WebSocketFrame | Test.java:7518:10:7518:21 | retain(...) : WebSocketFrame | provenance | MaD:491 |
 | Test.java:7518:10:7518:21 | retain(...) : WebSocketFrame | Test.java:7519:9:7519:11 | out | provenance |  |
 | Test.java:7524:19:7524:37 | (...)... : Attribute | Test.java:7525:10:7525:11 | in : Attribute | provenance |  |
 | Test.java:7524:30:7524:37 | source(...) : Object | Test.java:7524:19:7524:37 | (...)... : Attribute | provenance |  |
-| Test.java:7525:10:7525:11 | in : Attribute | Test.java:7525:10:7525:19 | touch(...) : Attribute | provenance | MaD:469 |
+| Test.java:7525:10:7525:11 | in : Attribute | Test.java:7525:10:7525:19 | touch(...) : Attribute | provenance | MaD:492 |
 | Test.java:7525:10:7525:19 | touch(...) : Attribute | Test.java:7526:9:7526:11 | out | provenance |  |
 | Test.java:7531:19:7531:37 | (...)... : Attribute | Test.java:7532:10:7532:11 | in : Attribute | provenance |  |
 | Test.java:7531:30:7531:37 | source(...) : Object | Test.java:7531:19:7531:37 | (...)... : Attribute | provenance |  |
-| Test.java:7532:10:7532:11 | in : Attribute | Test.java:7532:10:7532:23 | touch(...) : Attribute | provenance | MaD:469 |
+| Test.java:7532:10:7532:11 | in : Attribute | Test.java:7532:10:7532:23 | touch(...) : Attribute | provenance | MaD:492 |
 | Test.java:7532:10:7532:23 | touch(...) : Attribute | Test.java:7533:9:7533:11 | out | provenance |  |
 | Test.java:7538:30:7538:59 | (...)... : BinaryWebSocketFrame | Test.java:7539:10:7539:11 | in : BinaryWebSocketFrame | provenance |  |
 | Test.java:7538:52:7538:59 | source(...) : Object | Test.java:7538:30:7538:59 | (...)... : BinaryWebSocketFrame | provenance |  |
-| Test.java:7539:10:7539:11 | in : BinaryWebSocketFrame | Test.java:7539:10:7539:19 | touch(...) : BinaryWebSocketFrame | provenance | MaD:469 |
+| Test.java:7539:10:7539:11 | in : BinaryWebSocketFrame | Test.java:7539:10:7539:19 | touch(...) : BinaryWebSocketFrame | provenance | MaD:492 |
 | Test.java:7539:10:7539:19 | touch(...) : BinaryWebSocketFrame | Test.java:7540:9:7540:11 | out | provenance |  |
 | Test.java:7545:30:7545:59 | (...)... : BinaryWebSocketFrame | Test.java:7546:10:7546:11 | in : BinaryWebSocketFrame | provenance |  |
 | Test.java:7545:52:7545:59 | source(...) : Object | Test.java:7545:30:7545:59 | (...)... : BinaryWebSocketFrame | provenance |  |
-| Test.java:7546:10:7546:11 | in : BinaryWebSocketFrame | Test.java:7546:10:7546:23 | touch(...) : BinaryWebSocketFrame | provenance | MaD:469 |
+| Test.java:7546:10:7546:11 | in : BinaryWebSocketFrame | Test.java:7546:10:7546:23 | touch(...) : BinaryWebSocketFrame | provenance | MaD:492 |
 | Test.java:7546:10:7546:23 | touch(...) : BinaryWebSocketFrame | Test.java:7547:9:7547:11 | out | provenance |  |
 | Test.java:7552:41:7552:81 | (...)... : AbstractReferenceCountedByteBuf | Test.java:7553:10:7553:11 | in : AbstractReferenceCountedByteBuf | provenance |  |
 | Test.java:7552:74:7552:81 | source(...) : Object | Test.java:7552:41:7552:81 | (...)... : AbstractReferenceCountedByteBuf | provenance |  |
-| Test.java:7553:10:7553:11 | in : AbstractReferenceCountedByteBuf | Test.java:7553:10:7553:19 | touch(...) : AbstractReferenceCountedByteBuf | provenance | MaD:469 |
+| Test.java:7553:10:7553:11 | in : AbstractReferenceCountedByteBuf | Test.java:7553:10:7553:19 | touch(...) : AbstractReferenceCountedByteBuf | provenance | MaD:492 |
 | Test.java:7553:10:7553:19 | touch(...) : AbstractReferenceCountedByteBuf | Test.java:7554:9:7554:11 | out | provenance |  |
 | Test.java:7559:41:7559:81 | (...)... : AbstractReferenceCountedByteBuf | Test.java:7560:10:7560:11 | in : AbstractReferenceCountedByteBuf | provenance |  |
 | Test.java:7559:74:7559:81 | source(...) : Object | Test.java:7559:41:7559:81 | (...)... : AbstractReferenceCountedByteBuf | provenance |  |
-| Test.java:7560:10:7560:11 | in : AbstractReferenceCountedByteBuf | Test.java:7560:10:7560:23 | touch(...) : AbstractReferenceCountedByteBuf | provenance | MaD:469 |
+| Test.java:7560:10:7560:11 | in : AbstractReferenceCountedByteBuf | Test.java:7560:10:7560:23 | touch(...) : AbstractReferenceCountedByteBuf | provenance | MaD:492 |
 | Test.java:7560:10:7560:23 | touch(...) : AbstractReferenceCountedByteBuf | Test.java:7561:9:7561:11 | out | provenance |  |
 | Test.java:7566:17:7566:33 | (...)... : ByteBuf | Test.java:7567:10:7567:11 | in : ByteBuf | provenance |  |
 | Test.java:7566:26:7566:33 | source(...) : Object | Test.java:7566:17:7566:33 | (...)... : ByteBuf | provenance |  |
-| Test.java:7567:10:7567:11 | in : ByteBuf | Test.java:7567:10:7567:19 | touch(...) : ByteBuf | provenance | MaD:469 |
+| Test.java:7567:10:7567:11 | in : ByteBuf | Test.java:7567:10:7567:19 | touch(...) : ByteBuf | provenance | MaD:492 |
 | Test.java:7567:10:7567:19 | touch(...) : ByteBuf | Test.java:7568:9:7568:11 | out | provenance |  |
 | Test.java:7573:17:7573:33 | (...)... : ByteBuf | Test.java:7574:10:7574:11 | in : ByteBuf | provenance |  |
 | Test.java:7573:26:7573:33 | source(...) : Object | Test.java:7573:17:7573:33 | (...)... : ByteBuf | provenance |  |
-| Test.java:7574:10:7574:11 | in : ByteBuf | Test.java:7574:10:7574:23 | touch(...) : ByteBuf | provenance | MaD:469 |
+| Test.java:7574:10:7574:11 | in : ByteBuf | Test.java:7574:10:7574:23 | touch(...) : ByteBuf | provenance | MaD:492 |
 | Test.java:7574:10:7574:23 | touch(...) : ByteBuf | Test.java:7575:9:7575:11 | out | provenance |  |
 | Test.java:7580:24:7580:47 | (...)... : SwappedByteBuf | Test.java:7581:10:7581:11 | in : SwappedByteBuf | provenance |  |
 | Test.java:7580:40:7580:47 | source(...) : Object | Test.java:7580:24:7580:47 | (...)... : SwappedByteBuf | provenance |  |
-| Test.java:7581:10:7581:11 | in : SwappedByteBuf | Test.java:7581:10:7581:19 | touch(...) : SwappedByteBuf | provenance | MaD:469 |
+| Test.java:7581:10:7581:11 | in : SwappedByteBuf | Test.java:7581:10:7581:19 | touch(...) : SwappedByteBuf | provenance | MaD:492 |
 | Test.java:7581:10:7581:19 | touch(...) : SwappedByteBuf | Test.java:7582:9:7582:11 | out | provenance |  |
 | Test.java:7587:24:7587:47 | (...)... : SwappedByteBuf | Test.java:7588:10:7588:11 | in : SwappedByteBuf | provenance |  |
 | Test.java:7587:40:7587:47 | source(...) : Object | Test.java:7587:24:7587:47 | (...)... : SwappedByteBuf | provenance |  |
-| Test.java:7588:10:7588:11 | in : SwappedByteBuf | Test.java:7588:10:7588:23 | touch(...) : SwappedByteBuf | provenance | MaD:469 |
+| Test.java:7588:10:7588:11 | in : SwappedByteBuf | Test.java:7588:10:7588:23 | touch(...) : SwappedByteBuf | provenance | MaD:492 |
 | Test.java:7588:10:7588:23 | touch(...) : SwappedByteBuf | Test.java:7589:9:7589:11 | out | provenance |  |
 | Test.java:7594:23:7594:45 | (...)... : ByteBufHolder | Test.java:7595:10:7595:11 | in : ByteBufHolder | provenance |  |
 | Test.java:7594:38:7594:45 | source(...) : Object | Test.java:7594:23:7594:45 | (...)... : ByteBufHolder | provenance |  |
-| Test.java:7595:10:7595:11 | in : ByteBufHolder | Test.java:7595:10:7595:19 | touch(...) : ByteBufHolder | provenance | MaD:469 |
+| Test.java:7595:10:7595:11 | in : ByteBufHolder | Test.java:7595:10:7595:19 | touch(...) : ByteBufHolder | provenance | MaD:492 |
 | Test.java:7595:10:7595:19 | touch(...) : ByteBufHolder | Test.java:7596:9:7596:11 | out | provenance |  |
 | Test.java:7601:23:7601:45 | (...)... : ByteBufHolder | Test.java:7602:10:7602:11 | in : ByteBufHolder | provenance |  |
 | Test.java:7601:38:7601:45 | source(...) : Object | Test.java:7601:23:7601:45 | (...)... : ByteBufHolder | provenance |  |
-| Test.java:7602:10:7602:11 | in : ByteBufHolder | Test.java:7602:10:7602:23 | touch(...) : ByteBufHolder | provenance | MaD:469 |
+| Test.java:7602:10:7602:11 | in : ByteBufHolder | Test.java:7602:10:7602:23 | touch(...) : ByteBufHolder | provenance | MaD:492 |
 | Test.java:7602:10:7602:23 | touch(...) : ByteBufHolder | Test.java:7603:9:7603:11 | out | provenance |  |
 | Test.java:7608:30:7608:59 | (...)... : DefaultByteBufHolder | Test.java:7609:10:7609:11 | in : DefaultByteBufHolder | provenance |  |
 | Test.java:7608:52:7608:59 | source(...) : Object | Test.java:7608:30:7608:59 | (...)... : DefaultByteBufHolder | provenance |  |
-| Test.java:7609:10:7609:11 | in : DefaultByteBufHolder | Test.java:7609:10:7609:19 | touch(...) : DefaultByteBufHolder | provenance | MaD:469 |
+| Test.java:7609:10:7609:11 | in : DefaultByteBufHolder | Test.java:7609:10:7609:19 | touch(...) : DefaultByteBufHolder | provenance | MaD:492 |
 | Test.java:7609:10:7609:19 | touch(...) : DefaultByteBufHolder | Test.java:7610:9:7610:11 | out | provenance |  |
 | Test.java:7615:30:7615:59 | (...)... : DefaultByteBufHolder | Test.java:7616:10:7616:11 | in : DefaultByteBufHolder | provenance |  |
 | Test.java:7615:52:7615:59 | source(...) : Object | Test.java:7615:30:7615:59 | (...)... : DefaultByteBufHolder | provenance |  |
-| Test.java:7616:10:7616:11 | in : DefaultByteBufHolder | Test.java:7616:10:7616:23 | touch(...) : DefaultByteBufHolder | provenance | MaD:469 |
+| Test.java:7616:10:7616:11 | in : DefaultByteBufHolder | Test.java:7616:10:7616:23 | touch(...) : DefaultByteBufHolder | provenance | MaD:492 |
 | Test.java:7616:10:7616:23 | touch(...) : DefaultByteBufHolder | Test.java:7617:9:7617:11 | out | provenance |  |
 | Test.java:7622:29:7622:57 | (...)... : CloseWebSocketFrame | Test.java:7623:10:7623:11 | in : CloseWebSocketFrame | provenance |  |
 | Test.java:7622:50:7622:57 | source(...) : Object | Test.java:7622:29:7622:57 | (...)... : CloseWebSocketFrame | provenance |  |
-| Test.java:7623:10:7623:11 | in : CloseWebSocketFrame | Test.java:7623:10:7623:19 | touch(...) : CloseWebSocketFrame | provenance | MaD:469 |
+| Test.java:7623:10:7623:11 | in : CloseWebSocketFrame | Test.java:7623:10:7623:19 | touch(...) : CloseWebSocketFrame | provenance | MaD:492 |
 | Test.java:7623:10:7623:19 | touch(...) : CloseWebSocketFrame | Test.java:7624:9:7624:11 | out | provenance |  |
 | Test.java:7629:29:7629:57 | (...)... : CloseWebSocketFrame | Test.java:7630:10:7630:11 | in : CloseWebSocketFrame | provenance |  |
 | Test.java:7629:50:7629:57 | source(...) : Object | Test.java:7629:29:7629:57 | (...)... : CloseWebSocketFrame | provenance |  |
-| Test.java:7630:10:7630:11 | in : CloseWebSocketFrame | Test.java:7630:10:7630:23 | touch(...) : CloseWebSocketFrame | provenance | MaD:469 |
+| Test.java:7630:10:7630:11 | in : CloseWebSocketFrame | Test.java:7630:10:7630:23 | touch(...) : CloseWebSocketFrame | provenance | MaD:492 |
 | Test.java:7630:10:7630:23 | touch(...) : CloseWebSocketFrame | Test.java:7631:9:7631:11 | out | provenance |  |
 | Test.java:7636:26:7636:51 | (...)... : CompositeByteBuf | Test.java:7637:10:7637:11 | in : CompositeByteBuf | provenance |  |
 | Test.java:7636:44:7636:51 | source(...) : Object | Test.java:7636:26:7636:51 | (...)... : CompositeByteBuf | provenance |  |
-| Test.java:7637:10:7637:11 | in : CompositeByteBuf | Test.java:7637:10:7637:19 | touch(...) : CompositeByteBuf | provenance | MaD:469 |
+| Test.java:7637:10:7637:11 | in : CompositeByteBuf | Test.java:7637:10:7637:19 | touch(...) : CompositeByteBuf | provenance | MaD:492 |
 | Test.java:7637:10:7637:19 | touch(...) : CompositeByteBuf | Test.java:7638:9:7638:11 | out | provenance |  |
 | Test.java:7643:26:7643:51 | (...)... : CompositeByteBuf | Test.java:7644:10:7644:11 | in : CompositeByteBuf | provenance |  |
 | Test.java:7643:44:7643:51 | source(...) : Object | Test.java:7643:26:7643:51 | (...)... : CompositeByteBuf | provenance |  |
-| Test.java:7644:10:7644:11 | in : CompositeByteBuf | Test.java:7644:10:7644:23 | touch(...) : CompositeByteBuf | provenance | MaD:469 |
+| Test.java:7644:10:7644:11 | in : CompositeByteBuf | Test.java:7644:10:7644:23 | touch(...) : CompositeByteBuf | provenance | MaD:492 |
 | Test.java:7644:10:7644:23 | touch(...) : CompositeByteBuf | Test.java:7645:9:7645:11 | out | provenance |  |
 | Test.java:7650:36:7650:71 | (...)... : ContinuationWebSocketFrame | Test.java:7651:10:7651:11 | in : ContinuationWebSocketFrame | provenance |  |
 | Test.java:7650:64:7650:71 | source(...) : Object | Test.java:7650:36:7650:71 | (...)... : ContinuationWebSocketFrame | provenance |  |
-| Test.java:7651:10:7651:11 | in : ContinuationWebSocketFrame | Test.java:7651:10:7651:19 | touch(...) : ContinuationWebSocketFrame | provenance | MaD:469 |
+| Test.java:7651:10:7651:11 | in : ContinuationWebSocketFrame | Test.java:7651:10:7651:19 | touch(...) : ContinuationWebSocketFrame | provenance | MaD:492 |
 | Test.java:7651:10:7651:19 | touch(...) : ContinuationWebSocketFrame | Test.java:7652:9:7652:11 | out | provenance |  |
 | Test.java:7657:36:7657:71 | (...)... : ContinuationWebSocketFrame | Test.java:7658:10:7658:11 | in : ContinuationWebSocketFrame | provenance |  |
 | Test.java:7657:64:7657:71 | source(...) : Object | Test.java:7657:36:7657:71 | (...)... : ContinuationWebSocketFrame | provenance |  |
-| Test.java:7658:10:7658:11 | in : ContinuationWebSocketFrame | Test.java:7658:10:7658:23 | touch(...) : ContinuationWebSocketFrame | provenance | MaD:469 |
+| Test.java:7658:10:7658:11 | in : ContinuationWebSocketFrame | Test.java:7658:10:7658:23 | touch(...) : ContinuationWebSocketFrame | provenance | MaD:492 |
 | Test.java:7658:10:7658:23 | touch(...) : ContinuationWebSocketFrame | Test.java:7659:9:7659:11 | out | provenance |  |
 | Test.java:7664:27:7664:53 | (...)... : DefaultFileRegion | Test.java:7665:10:7665:11 | in : DefaultFileRegion | provenance |  |
 | Test.java:7664:46:7664:53 | source(...) : Object | Test.java:7664:27:7664:53 | (...)... : DefaultFileRegion | provenance |  |
-| Test.java:7665:10:7665:11 | in : DefaultFileRegion | Test.java:7665:10:7665:19 | touch(...) : DefaultFileRegion | provenance | MaD:469 |
+| Test.java:7665:10:7665:11 | in : DefaultFileRegion | Test.java:7665:10:7665:19 | touch(...) : DefaultFileRegion | provenance | MaD:492 |
 | Test.java:7665:10:7665:19 | touch(...) : DefaultFileRegion | Test.java:7666:9:7666:11 | out | provenance |  |
 | Test.java:7671:27:7671:53 | (...)... : DefaultFileRegion | Test.java:7672:10:7672:11 | in : DefaultFileRegion | provenance |  |
 | Test.java:7671:46:7671:53 | source(...) : Object | Test.java:7671:27:7671:53 | (...)... : DefaultFileRegion | provenance |  |
-| Test.java:7672:10:7672:11 | in : DefaultFileRegion | Test.java:7672:10:7672:23 | touch(...) : DefaultFileRegion | provenance | MaD:469 |
+| Test.java:7672:10:7672:11 | in : DefaultFileRegion | Test.java:7672:10:7672:23 | touch(...) : DefaultFileRegion | provenance | MaD:492 |
 | Test.java:7672:10:7672:23 | touch(...) : DefaultFileRegion | Test.java:7673:9:7673:11 | out | provenance |  |
 | Test.java:7678:20:7678:39 | (...)... : FileRegion | Test.java:7679:10:7679:11 | in : FileRegion | provenance |  |
 | Test.java:7678:32:7678:39 | source(...) : Object | Test.java:7678:20:7678:39 | (...)... : FileRegion | provenance |  |
-| Test.java:7679:10:7679:11 | in : FileRegion | Test.java:7679:10:7679:19 | touch(...) : FileRegion | provenance | MaD:469 |
+| Test.java:7679:10:7679:11 | in : FileRegion | Test.java:7679:10:7679:19 | touch(...) : FileRegion | provenance | MaD:492 |
 | Test.java:7679:10:7679:19 | touch(...) : FileRegion | Test.java:7680:9:7680:11 | out | provenance |  |
 | Test.java:7685:20:7685:39 | (...)... : FileRegion | Test.java:7686:10:7686:11 | in : FileRegion | provenance |  |
 | Test.java:7685:32:7685:39 | source(...) : Object | Test.java:7685:20:7685:39 | (...)... : FileRegion | provenance |  |
-| Test.java:7686:10:7686:11 | in : FileRegion | Test.java:7686:10:7686:23 | touch(...) : FileRegion | provenance | MaD:469 |
+| Test.java:7686:10:7686:11 | in : FileRegion | Test.java:7686:10:7686:23 | touch(...) : FileRegion | provenance | MaD:492 |
 | Test.java:7686:10:7686:23 | touch(...) : FileRegion | Test.java:7687:9:7687:11 | out | provenance |  |
 | Test.java:7692:20:7692:39 | (...)... : FileUpload | Test.java:7693:10:7693:11 | in : FileUpload | provenance |  |
 | Test.java:7692:32:7692:39 | source(...) : Object | Test.java:7692:20:7692:39 | (...)... : FileUpload | provenance |  |
-| Test.java:7693:10:7693:11 | in : FileUpload | Test.java:7693:10:7693:19 | touch(...) : FileUpload | provenance | MaD:469 |
+| Test.java:7693:10:7693:11 | in : FileUpload | Test.java:7693:10:7693:19 | touch(...) : FileUpload | provenance | MaD:492 |
 | Test.java:7693:10:7693:19 | touch(...) : FileUpload | Test.java:7694:9:7694:11 | out | provenance |  |
 | Test.java:7699:20:7699:39 | (...)... : FileUpload | Test.java:7700:10:7700:11 | in : FileUpload | provenance |  |
 | Test.java:7699:32:7699:39 | source(...) : Object | Test.java:7699:20:7699:39 | (...)... : FileUpload | provenance |  |
-| Test.java:7700:10:7700:11 | in : FileUpload | Test.java:7700:10:7700:23 | touch(...) : FileUpload | provenance | MaD:469 |
+| Test.java:7700:10:7700:11 | in : FileUpload | Test.java:7700:10:7700:23 | touch(...) : FileUpload | provenance | MaD:492 |
 | Test.java:7700:10:7700:23 | touch(...) : FileUpload | Test.java:7701:9:7701:11 | out | provenance |  |
 | Test.java:7706:25:7706:49 | (...)... : FullHttpMessage | Test.java:7707:10:7707:11 | in : FullHttpMessage | provenance |  |
 | Test.java:7706:42:7706:49 | source(...) : Object | Test.java:7706:25:7706:49 | (...)... : FullHttpMessage | provenance |  |
-| Test.java:7707:10:7707:11 | in : FullHttpMessage | Test.java:7707:10:7707:19 | touch(...) : FullHttpMessage | provenance | MaD:469 |
+| Test.java:7707:10:7707:11 | in : FullHttpMessage | Test.java:7707:10:7707:19 | touch(...) : FullHttpMessage | provenance | MaD:492 |
 | Test.java:7707:10:7707:19 | touch(...) : FullHttpMessage | Test.java:7708:9:7708:11 | out | provenance |  |
 | Test.java:7713:25:7713:49 | (...)... : FullHttpMessage | Test.java:7714:10:7714:11 | in : FullHttpMessage | provenance |  |
 | Test.java:7713:42:7713:49 | source(...) : Object | Test.java:7713:25:7713:49 | (...)... : FullHttpMessage | provenance |  |
-| Test.java:7714:10:7714:11 | in : FullHttpMessage | Test.java:7714:10:7714:23 | touch(...) : FullHttpMessage | provenance | MaD:469 |
+| Test.java:7714:10:7714:11 | in : FullHttpMessage | Test.java:7714:10:7714:23 | touch(...) : FullHttpMessage | provenance | MaD:492 |
 | Test.java:7714:10:7714:23 | touch(...) : FullHttpMessage | Test.java:7715:9:7715:11 | out | provenance |  |
 | Test.java:7720:25:7720:49 | (...)... : FullHttpRequest | Test.java:7721:10:7721:11 | in : FullHttpRequest | provenance |  |
 | Test.java:7720:42:7720:49 | source(...) : Object | Test.java:7720:25:7720:49 | (...)... : FullHttpRequest | provenance |  |
-| Test.java:7721:10:7721:11 | in : FullHttpRequest | Test.java:7721:10:7721:19 | touch(...) : FullHttpRequest | provenance | MaD:469 |
+| Test.java:7721:10:7721:11 | in : FullHttpRequest | Test.java:7721:10:7721:19 | touch(...) : FullHttpRequest | provenance | MaD:492 |
 | Test.java:7721:10:7721:19 | touch(...) : FullHttpRequest | Test.java:7722:9:7722:11 | out | provenance |  |
 | Test.java:7727:25:7727:49 | (...)... : FullHttpRequest | Test.java:7728:10:7728:11 | in : FullHttpRequest | provenance |  |
 | Test.java:7727:42:7727:49 | source(...) : Object | Test.java:7727:25:7727:49 | (...)... : FullHttpRequest | provenance |  |
-| Test.java:7728:10:7728:11 | in : FullHttpRequest | Test.java:7728:10:7728:23 | touch(...) : FullHttpRequest | provenance | MaD:469 |
+| Test.java:7728:10:7728:11 | in : FullHttpRequest | Test.java:7728:10:7728:23 | touch(...) : FullHttpRequest | provenance | MaD:492 |
 | Test.java:7728:10:7728:23 | touch(...) : FullHttpRequest | Test.java:7729:9:7729:11 | out | provenance |  |
 | Test.java:7734:26:7734:51 | (...)... : FullHttpResponse | Test.java:7735:10:7735:11 | in : FullHttpResponse | provenance |  |
 | Test.java:7734:44:7734:51 | source(...) : Object | Test.java:7734:26:7734:51 | (...)... : FullHttpResponse | provenance |  |
-| Test.java:7735:10:7735:11 | in : FullHttpResponse | Test.java:7735:10:7735:19 | touch(...) : FullHttpResponse | provenance | MaD:469 |
+| Test.java:7735:10:7735:11 | in : FullHttpResponse | Test.java:7735:10:7735:19 | touch(...) : FullHttpResponse | provenance | MaD:492 |
 | Test.java:7735:10:7735:19 | touch(...) : FullHttpResponse | Test.java:7736:9:7736:11 | out | provenance |  |
 | Test.java:7741:26:7741:51 | (...)... : FullHttpResponse | Test.java:7742:10:7742:11 | in : FullHttpResponse | provenance |  |
 | Test.java:7741:44:7741:51 | source(...) : Object | Test.java:7741:26:7741:51 | (...)... : FullHttpResponse | provenance |  |
-| Test.java:7742:10:7742:11 | in : FullHttpResponse | Test.java:7742:10:7742:23 | touch(...) : FullHttpResponse | provenance | MaD:469 |
+| Test.java:7742:10:7742:11 | in : FullHttpResponse | Test.java:7742:10:7742:23 | touch(...) : FullHttpResponse | provenance | MaD:492 |
 | Test.java:7742:10:7742:23 | touch(...) : FullHttpResponse | Test.java:7743:9:7743:11 | out | provenance |  |
 | Test.java:7748:21:7748:41 | (...)... : HttpContent | Test.java:7749:10:7749:11 | in : HttpContent | provenance |  |
 | Test.java:7748:34:7748:41 | source(...) : Object | Test.java:7748:21:7748:41 | (...)... : HttpContent | provenance |  |
-| Test.java:7749:10:7749:11 | in : HttpContent | Test.java:7749:10:7749:19 | touch(...) : HttpContent | provenance | MaD:469 |
+| Test.java:7749:10:7749:11 | in : HttpContent | Test.java:7749:10:7749:19 | touch(...) : HttpContent | provenance | MaD:492 |
 | Test.java:7749:10:7749:19 | touch(...) : HttpContent | Test.java:7750:9:7750:11 | out | provenance |  |
 | Test.java:7755:21:7755:41 | (...)... : HttpContent | Test.java:7756:10:7756:11 | in : HttpContent | provenance |  |
 | Test.java:7755:34:7755:41 | source(...) : Object | Test.java:7755:21:7755:41 | (...)... : HttpContent | provenance |  |
-| Test.java:7756:10:7756:11 | in : HttpContent | Test.java:7756:10:7756:23 | touch(...) : HttpContent | provenance | MaD:469 |
+| Test.java:7756:10:7756:11 | in : HttpContent | Test.java:7756:10:7756:23 | touch(...) : HttpContent | provenance | MaD:492 |
 | Test.java:7756:10:7756:23 | touch(...) : HttpContent | Test.java:7757:9:7757:11 | out | provenance |  |
 | Test.java:7762:18:7762:35 | (...)... : HttpData | Test.java:7763:10:7763:11 | in : HttpData | provenance |  |
 | Test.java:7762:28:7762:35 | source(...) : Object | Test.java:7762:18:7762:35 | (...)... : HttpData | provenance |  |
-| Test.java:7763:10:7763:11 | in : HttpData | Test.java:7763:10:7763:19 | touch(...) : HttpData | provenance | MaD:469 |
+| Test.java:7763:10:7763:11 | in : HttpData | Test.java:7763:10:7763:19 | touch(...) : HttpData | provenance | MaD:492 |
 | Test.java:7763:10:7763:19 | touch(...) : HttpData | Test.java:7764:9:7764:11 | out | provenance |  |
 | Test.java:7769:18:7769:35 | (...)... : HttpData | Test.java:7770:10:7770:11 | in : HttpData | provenance |  |
 | Test.java:7769:28:7769:35 | source(...) : Object | Test.java:7769:18:7769:35 | (...)... : HttpData | provenance |  |
-| Test.java:7770:10:7770:11 | in : HttpData | Test.java:7770:10:7770:23 | touch(...) : HttpData | provenance | MaD:469 |
+| Test.java:7770:10:7770:11 | in : HttpData | Test.java:7770:10:7770:23 | touch(...) : HttpData | provenance | MaD:492 |
 | Test.java:7770:10:7770:23 | touch(...) : HttpData | Test.java:7771:9:7771:11 | out | provenance |  |
 | Test.java:7776:27:7776:53 | (...)... : InterfaceHttpData | Test.java:7777:10:7777:11 | in : InterfaceHttpData | provenance |  |
 | Test.java:7776:46:7776:53 | source(...) : Object | Test.java:7776:27:7776:53 | (...)... : InterfaceHttpData | provenance |  |
-| Test.java:7777:10:7777:11 | in : InterfaceHttpData | Test.java:7777:10:7777:19 | touch(...) : InterfaceHttpData | provenance | MaD:469 |
+| Test.java:7777:10:7777:11 | in : InterfaceHttpData | Test.java:7777:10:7777:19 | touch(...) : InterfaceHttpData | provenance | MaD:492 |
 | Test.java:7777:10:7777:19 | touch(...) : InterfaceHttpData | Test.java:7778:9:7778:11 | out | provenance |  |
 | Test.java:7783:27:7783:53 | (...)... : InterfaceHttpData | Test.java:7784:10:7784:11 | in : InterfaceHttpData | provenance |  |
 | Test.java:7783:46:7783:53 | source(...) : Object | Test.java:7783:27:7783:53 | (...)... : InterfaceHttpData | provenance |  |
-| Test.java:7784:10:7784:11 | in : InterfaceHttpData | Test.java:7784:10:7784:23 | touch(...) : InterfaceHttpData | provenance | MaD:469 |
+| Test.java:7784:10:7784:11 | in : InterfaceHttpData | Test.java:7784:10:7784:23 | touch(...) : InterfaceHttpData | provenance | MaD:492 |
 | Test.java:7784:10:7784:23 | touch(...) : InterfaceHttpData | Test.java:7785:9:7785:11 | out | provenance |  |
 | Test.java:7790:25:7790:49 | (...)... : LastHttpContent | Test.java:7791:10:7791:11 | in : LastHttpContent | provenance |  |
 | Test.java:7790:42:7790:49 | source(...) : Object | Test.java:7790:25:7790:49 | (...)... : LastHttpContent | provenance |  |
-| Test.java:7791:10:7791:11 | in : LastHttpContent | Test.java:7791:10:7791:19 | touch(...) : LastHttpContent | provenance | MaD:469 |
+| Test.java:7791:10:7791:11 | in : LastHttpContent | Test.java:7791:10:7791:19 | touch(...) : LastHttpContent | provenance | MaD:492 |
 | Test.java:7791:10:7791:19 | touch(...) : LastHttpContent | Test.java:7792:9:7792:11 | out | provenance |  |
 | Test.java:7797:25:7797:49 | (...)... : LastHttpContent | Test.java:7798:10:7798:11 | in : LastHttpContent | provenance |  |
 | Test.java:7797:42:7797:49 | source(...) : Object | Test.java:7797:25:7797:49 | (...)... : LastHttpContent | provenance |  |
-| Test.java:7798:10:7798:11 | in : LastHttpContent | Test.java:7798:10:7798:23 | touch(...) : LastHttpContent | provenance | MaD:469 |
+| Test.java:7798:10:7798:11 | in : LastHttpContent | Test.java:7798:10:7798:23 | touch(...) : LastHttpContent | provenance | MaD:492 |
 | Test.java:7798:10:7798:23 | touch(...) : LastHttpContent | Test.java:7799:9:7799:11 | out | provenance |  |
 | Test.java:7804:28:7804:55 | (...)... : PingWebSocketFrame | Test.java:7805:10:7805:11 | in : PingWebSocketFrame | provenance |  |
 | Test.java:7804:48:7804:55 | source(...) : Object | Test.java:7804:28:7804:55 | (...)... : PingWebSocketFrame | provenance |  |
-| Test.java:7805:10:7805:11 | in : PingWebSocketFrame | Test.java:7805:10:7805:19 | touch(...) : PingWebSocketFrame | provenance | MaD:469 |
+| Test.java:7805:10:7805:11 | in : PingWebSocketFrame | Test.java:7805:10:7805:19 | touch(...) : PingWebSocketFrame | provenance | MaD:492 |
 | Test.java:7805:10:7805:19 | touch(...) : PingWebSocketFrame | Test.java:7806:9:7806:11 | out | provenance |  |
 | Test.java:7811:28:7811:55 | (...)... : PingWebSocketFrame | Test.java:7812:10:7812:11 | in : PingWebSocketFrame | provenance |  |
 | Test.java:7811:48:7811:55 | source(...) : Object | Test.java:7811:28:7811:55 | (...)... : PingWebSocketFrame | provenance |  |
-| Test.java:7812:10:7812:11 | in : PingWebSocketFrame | Test.java:7812:10:7812:23 | touch(...) : PingWebSocketFrame | provenance | MaD:469 |
+| Test.java:7812:10:7812:11 | in : PingWebSocketFrame | Test.java:7812:10:7812:23 | touch(...) : PingWebSocketFrame | provenance | MaD:492 |
 | Test.java:7812:10:7812:23 | touch(...) : PingWebSocketFrame | Test.java:7813:9:7813:11 | out | provenance |  |
 | Test.java:7818:28:7818:55 | (...)... : PongWebSocketFrame | Test.java:7819:10:7819:11 | in : PongWebSocketFrame | provenance |  |
 | Test.java:7818:48:7818:55 | source(...) : Object | Test.java:7818:28:7818:55 | (...)... : PongWebSocketFrame | provenance |  |
-| Test.java:7819:10:7819:11 | in : PongWebSocketFrame | Test.java:7819:10:7819:19 | touch(...) : PongWebSocketFrame | provenance | MaD:469 |
+| Test.java:7819:10:7819:11 | in : PongWebSocketFrame | Test.java:7819:10:7819:19 | touch(...) : PongWebSocketFrame | provenance | MaD:492 |
 | Test.java:7819:10:7819:19 | touch(...) : PongWebSocketFrame | Test.java:7820:9:7820:11 | out | provenance |  |
 | Test.java:7825:28:7825:55 | (...)... : PongWebSocketFrame | Test.java:7826:10:7826:11 | in : PongWebSocketFrame | provenance |  |
 | Test.java:7825:48:7825:55 | source(...) : Object | Test.java:7825:28:7825:55 | (...)... : PongWebSocketFrame | provenance |  |
-| Test.java:7826:10:7826:11 | in : PongWebSocketFrame | Test.java:7826:10:7826:23 | touch(...) : PongWebSocketFrame | provenance | MaD:469 |
+| Test.java:7826:10:7826:11 | in : PongWebSocketFrame | Test.java:7826:10:7826:23 | touch(...) : PongWebSocketFrame | provenance | MaD:492 |
 | Test.java:7826:10:7826:23 | touch(...) : PongWebSocketFrame | Test.java:7827:9:7827:11 | out | provenance |  |
 | Test.java:7832:34:7832:67 | (...)... : AbstractReferenceCounted | Test.java:7833:10:7833:11 | in : AbstractReferenceCounted | provenance |  |
 | Test.java:7832:60:7832:67 | source(...) : Object | Test.java:7832:34:7832:67 | (...)... : AbstractReferenceCounted | provenance |  |
-| Test.java:7833:10:7833:11 | in : AbstractReferenceCounted | Test.java:7833:10:7833:19 | touch(...) : AbstractReferenceCounted | provenance | MaD:469 |
+| Test.java:7833:10:7833:11 | in : AbstractReferenceCounted | Test.java:7833:10:7833:19 | touch(...) : AbstractReferenceCounted | provenance | MaD:492 |
 | Test.java:7833:10:7833:19 | touch(...) : AbstractReferenceCounted | Test.java:7834:9:7834:11 | out | provenance |  |
 | Test.java:7839:26:7839:51 | (...)... : ReferenceCounted | Test.java:7840:10:7840:11 | in : ReferenceCounted | provenance |  |
 | Test.java:7839:44:7839:51 | source(...) : Object | Test.java:7839:26:7839:51 | (...)... : ReferenceCounted | provenance |  |
-| Test.java:7840:10:7840:11 | in : ReferenceCounted | Test.java:7840:10:7840:19 | touch(...) : ReferenceCounted | provenance | MaD:469 |
+| Test.java:7840:10:7840:11 | in : ReferenceCounted | Test.java:7840:10:7840:19 | touch(...) : ReferenceCounted | provenance | MaD:492 |
 | Test.java:7840:10:7840:19 | touch(...) : ReferenceCounted | Test.java:7841:9:7841:11 | out | provenance |  |
 | Test.java:7846:26:7846:51 | (...)... : ReferenceCounted | Test.java:7847:10:7847:11 | in : ReferenceCounted | provenance |  |
 | Test.java:7846:44:7846:51 | source(...) : Object | Test.java:7846:26:7846:51 | (...)... : ReferenceCounted | provenance |  |
-| Test.java:7847:10:7847:11 | in : ReferenceCounted | Test.java:7847:10:7847:23 | touch(...) : ReferenceCounted | provenance | MaD:469 |
+| Test.java:7847:10:7847:11 | in : ReferenceCounted | Test.java:7847:10:7847:23 | touch(...) : ReferenceCounted | provenance | MaD:492 |
 | Test.java:7847:10:7847:23 | touch(...) : ReferenceCounted | Test.java:7848:9:7848:11 | out | provenance |  |
 | Test.java:7853:28:7853:55 | (...)... : TextWebSocketFrame | Test.java:7854:10:7854:11 | in : TextWebSocketFrame | provenance |  |
 | Test.java:7853:48:7853:55 | source(...) : Object | Test.java:7853:28:7853:55 | (...)... : TextWebSocketFrame | provenance |  |
-| Test.java:7854:10:7854:11 | in : TextWebSocketFrame | Test.java:7854:10:7854:19 | touch(...) : TextWebSocketFrame | provenance | MaD:469 |
+| Test.java:7854:10:7854:11 | in : TextWebSocketFrame | Test.java:7854:10:7854:19 | touch(...) : TextWebSocketFrame | provenance | MaD:492 |
 | Test.java:7854:10:7854:19 | touch(...) : TextWebSocketFrame | Test.java:7855:9:7855:11 | out | provenance |  |
 | Test.java:7860:28:7860:55 | (...)... : TextWebSocketFrame | Test.java:7861:10:7861:11 | in : TextWebSocketFrame | provenance |  |
 | Test.java:7860:48:7860:55 | source(...) : Object | Test.java:7860:28:7860:55 | (...)... : TextWebSocketFrame | provenance |  |
-| Test.java:7861:10:7861:11 | in : TextWebSocketFrame | Test.java:7861:10:7861:23 | touch(...) : TextWebSocketFrame | provenance | MaD:469 |
+| Test.java:7861:10:7861:11 | in : TextWebSocketFrame | Test.java:7861:10:7861:23 | touch(...) : TextWebSocketFrame | provenance | MaD:492 |
 | Test.java:7861:10:7861:23 | touch(...) : TextWebSocketFrame | Test.java:7862:9:7862:11 | out | provenance |  |
 | Test.java:7867:24:7867:47 | (...)... : WebSocketFrame | Test.java:7868:10:7868:11 | in : WebSocketFrame | provenance |  |
 | Test.java:7867:40:7867:47 | source(...) : Object | Test.java:7867:24:7867:47 | (...)... : WebSocketFrame | provenance |  |
-| Test.java:7868:10:7868:11 | in : WebSocketFrame | Test.java:7868:10:7868:19 | touch(...) : WebSocketFrame | provenance | MaD:469 |
+| Test.java:7868:10:7868:11 | in : WebSocketFrame | Test.java:7868:10:7868:19 | touch(...) : WebSocketFrame | provenance | MaD:492 |
 | Test.java:7868:10:7868:19 | touch(...) : WebSocketFrame | Test.java:7869:9:7869:11 | out | provenance |  |
 | Test.java:7874:24:7874:47 | (...)... : WebSocketFrame | Test.java:7875:10:7875:11 | in : WebSocketFrame | provenance |  |
 | Test.java:7874:40:7874:47 | source(...) : Object | Test.java:7874:24:7874:47 | (...)... : WebSocketFrame | provenance |  |
-| Test.java:7875:10:7875:11 | in : WebSocketFrame | Test.java:7875:10:7875:23 | touch(...) : WebSocketFrame | provenance | MaD:469 |
+| Test.java:7875:10:7875:11 | in : WebSocketFrame | Test.java:7875:10:7875:23 | touch(...) : WebSocketFrame | provenance | MaD:492 |
 | Test.java:7875:10:7875:23 | touch(...) : WebSocketFrame | Test.java:7876:9:7876:11 | out | provenance |  |
 | TestA.java:20:16:20:32 | (...)... : String | TestA.java:22:27:22:28 | in : String | provenance |  |
 | TestA.java:20:25:20:32 | source(...) : Object | TestA.java:20:16:20:32 | (...)... : String | provenance |  |
 | TestA.java:22:10:22:29 | resolve(...) : Future | TestA.java:23:9:23:11 | out | provenance |  |
-| TestA.java:22:27:22:28 | in : String | TestA.java:22:10:22:29 | resolve(...) : Future | provenance | MaD:467 |
+| TestA.java:22:27:22:28 | in : String | TestA.java:22:10:22:29 | resolve(...) : Future | provenance | MaD:471 |
 nodes
 | Test.java:79:19:79:32 | it : Headers [<element>, <map.key>] : Object | semmle.label | it : Headers [<element>, <map.key>] : Object |
 | Test.java:79:19:79:32 | it : Headers [<element>, <map.value>] : Object | semmle.label | it : Headers [<element>, <map.value>] : Object |
diff --git a/java/ql/test/library-tests/frameworks/netty/manual/test.ql b/java/ql/test/library-tests/frameworks/netty/manual/test.ql
index 70da9eb5f0f..a4142390e85 100644
--- a/java/ql/test/library-tests/frameworks/netty/manual/test.ql
+++ b/java/ql/test/library-tests/frameworks/netty/manual/test.ql
@@ -7,7 +7,7 @@ module Config implements DataFlow::ConfigSig {
   predicate isSource(DataFlow::Node node) {
     DefaultFlowConfig::isSource(node)
     or
-    node instanceof ThreatModelFlowSource
+    node instanceof ActiveThreatModelSource
   }
 
   predicate isSink = DefaultFlowConfig::isSink/1;
diff --git a/java/ql/test/library-tests/frameworks/play/test.expected b/java/ql/test/library-tests/frameworks/play/test.expected
index eefa5a59f97..25f0c2b4880 100644
--- a/java/ql/test/library-tests/frameworks/play/test.expected
+++ b/java/ql/test/library-tests/frameworks/play/test.expected
@@ -1,63 +1,63 @@
 models
-| 1 | Summary: play.mvc; Http$RequestBody; true; as; ; ; Argument[this]; ReturnValue; taint; manual |
-| 2 | Summary: play.mvc; Http$RequestBody; true; asBytes; ; ; Argument[this]; ReturnValue; taint; manual |
-| 3 | Summary: play.mvc; Http$RequestBody; true; asFormUrlEncoded; ; ; Argument[this]; ReturnValue; taint; manual |
-| 4 | Summary: play.mvc; Http$RequestBody; true; asJson; ; ; Argument[this]; ReturnValue; taint; manual |
-| 5 | Summary: play.mvc; Http$RequestBody; true; asMultipartFormData; ; ; Argument[this]; ReturnValue; taint; manual |
-| 6 | Summary: play.mvc; Http$RequestBody; true; asRaw; ; ; Argument[this]; ReturnValue; taint; manual |
-| 7 | Summary: play.mvc; Http$RequestBody; true; asText; ; ; Argument[this]; ReturnValue; taint; manual |
-| 8 | Summary: play.mvc; Http$RequestBody; true; asXml; ; ; Argument[this]; ReturnValue; taint; manual |
-| 9 | Summary: play.mvc; Http$RequestBody; true; parseJson; ; ; Argument[this]; ReturnValue; taint; manual |
+| 1 | Summary: play.mvc; Http$Cookie; true; name; ; ; Argument[this]; ReturnValue; taint; manual |
+| 2 | Summary: play.mvc; Http$Cookie; true; value; ; ; Argument[this]; ReturnValue; taint; manual |
+| 3 | Summary: play.mvc; Http$Cookies; true; get; ; ; Argument[this]; ReturnValue; taint; manual |
+| 4 | Summary: play.mvc; Http$Cookies; true; getCookie; ; ; Argument[this]; ReturnValue; taint; manual |
+| 5 | Summary: play.mvc; Http$MultipartFormData$FilePart; true; getContentType; ; ; Argument[this]; ReturnValue; taint; manual |
+| 6 | Summary: play.mvc; Http$MultipartFormData$FilePart; true; getDispositionType; ; ; Argument[this]; ReturnValue; taint; manual |
+| 7 | Summary: play.mvc; Http$MultipartFormData$FilePart; true; getFilename; ; ; Argument[this]; ReturnValue; taint; manual |
+| 8 | Summary: play.mvc; Http$MultipartFormData$FilePart; true; getKey; ; ; Argument[this]; ReturnValue; taint; manual |
+| 9 | Summary: play.mvc; Http$MultipartFormData$FilePart; true; getRef; ; ; Argument[this]; ReturnValue; taint; manual |
 | 10 | Summary: play.mvc; Http$MultipartFormData; true; asFormUrlEncoded; ; ; Argument[this]; ReturnValue; taint; manual |
 | 11 | Summary: play.mvc; Http$MultipartFormData; true; getFile; ; ; Argument[this]; ReturnValue; taint; manual |
 | 12 | Summary: play.mvc; Http$MultipartFormData; true; getFiles; ; ; Argument[this]; ReturnValue; taint; manual |
-| 13 | Summary: play.mvc; Http$MultipartFormData$FilePart; true; getContentType; ; ; Argument[this]; ReturnValue; taint; manual |
-| 14 | Summary: play.mvc; Http$MultipartFormData$FilePart; true; getDispositionType; ; ; Argument[this]; ReturnValue; taint; manual |
-| 15 | Summary: play.mvc; Http$MultipartFormData$FilePart; true; getFilename; ; ; Argument[this]; ReturnValue; taint; manual |
-| 16 | Summary: play.mvc; Http$MultipartFormData$FilePart; true; getKey; ; ; Argument[this]; ReturnValue; taint; manual |
-| 17 | Summary: play.mvc; Http$MultipartFormData$FilePart; true; getRef; ; ; Argument[this]; ReturnValue; taint; manual |
-| 18 | Summary: play.mvc; Http$RawBuffer; true; asBytes; ; ; Argument[this]; ReturnValue; taint; manual |
-| 19 | Summary: play.mvc; Http$RawBuffer; true; asFile; ; ; Argument[this]; ReturnValue; taint; manual |
-| 20 | Summary: play.mvc; Http$Cookie; true; name; ; ; Argument[this]; ReturnValue; taint; manual |
-| 21 | Summary: play.mvc; Http$Cookie; true; value; ; ; Argument[this]; ReturnValue; taint; manual |
-| 22 | Summary: play.mvc; Http$Cookies; true; get; ; ; Argument[this]; ReturnValue; taint; manual |
-| 23 | Summary: play.mvc; Http$Cookies; true; getCookie; ; ; Argument[this]; ReturnValue; taint; manual |
+| 13 | Summary: play.mvc; Http$RawBuffer; true; asBytes; ; ; Argument[this]; ReturnValue; taint; manual |
+| 14 | Summary: play.mvc; Http$RawBuffer; true; asFile; ; ; Argument[this]; ReturnValue; taint; manual |
+| 15 | Summary: play.mvc; Http$RequestBody; true; as; ; ; Argument[this]; ReturnValue; taint; manual |
+| 16 | Summary: play.mvc; Http$RequestBody; true; asBytes; ; ; Argument[this]; ReturnValue; taint; manual |
+| 17 | Summary: play.mvc; Http$RequestBody; true; asFormUrlEncoded; ; ; Argument[this]; ReturnValue; taint; manual |
+| 18 | Summary: play.mvc; Http$RequestBody; true; asJson; ; ; Argument[this]; ReturnValue; taint; manual |
+| 19 | Summary: play.mvc; Http$RequestBody; true; asMultipartFormData; ; ; Argument[this]; ReturnValue; taint; manual |
+| 20 | Summary: play.mvc; Http$RequestBody; true; asRaw; ; ; Argument[this]; ReturnValue; taint; manual |
+| 21 | Summary: play.mvc; Http$RequestBody; true; asText; ; ; Argument[this]; ReturnValue; taint; manual |
+| 22 | Summary: play.mvc; Http$RequestBody; true; asXml; ; ; Argument[this]; ReturnValue; taint; manual |
+| 23 | Summary: play.mvc; Http$RequestBody; true; parseJson; ; ; Argument[this]; ReturnValue; taint; manual |
 edges
 | mad/Test.java:26:21:26:42 | (...)... : Cookie | mad/Test.java:27:10:27:11 | in : Cookie | provenance |  |
 | mad/Test.java:26:35:26:42 | source(...) : Object | mad/Test.java:26:21:26:42 | (...)... : Cookie | provenance |  |
-| mad/Test.java:27:10:27:11 | in : Cookie | mad/Test.java:27:10:27:18 | name(...) : String | provenance | MaD:20 |
+| mad/Test.java:27:10:27:11 | in : Cookie | mad/Test.java:27:10:27:18 | name(...) : String | provenance | MaD:1 |
 | mad/Test.java:27:10:27:18 | name(...) : String | mad/Test.java:28:9:28:11 | out | provenance |  |
 | mad/Test.java:33:21:33:42 | (...)... : Cookie | mad/Test.java:34:10:34:11 | in : Cookie | provenance |  |
 | mad/Test.java:33:35:33:42 | source(...) : Object | mad/Test.java:33:21:33:42 | (...)... : Cookie | provenance |  |
-| mad/Test.java:34:10:34:11 | in : Cookie | mad/Test.java:34:10:34:19 | value(...) : String | provenance | MaD:21 |
+| mad/Test.java:34:10:34:11 | in : Cookie | mad/Test.java:34:10:34:19 | value(...) : String | provenance | MaD:2 |
 | mad/Test.java:34:10:34:19 | value(...) : String | mad/Test.java:35:9:35:11 | out | provenance |  |
 | mad/Test.java:40:22:40:44 | (...)... : Cookies | mad/Test.java:41:10:41:11 | in : Cookies | provenance |  |
 | mad/Test.java:40:37:40:44 | source(...) : Object | mad/Test.java:40:22:40:44 | (...)... : Cookies | provenance |  |
-| mad/Test.java:41:10:41:11 | in : Cookies | mad/Test.java:41:10:41:21 | get(...) : Cookie | provenance | MaD:22 |
+| mad/Test.java:41:10:41:11 | in : Cookies | mad/Test.java:41:10:41:21 | get(...) : Cookie | provenance | MaD:3 |
 | mad/Test.java:41:10:41:21 | get(...) : Cookie | mad/Test.java:42:9:42:11 | out | provenance |  |
 | mad/Test.java:47:22:47:44 | (...)... : Cookies | mad/Test.java:48:10:48:11 | in : Cookies | provenance |  |
 | mad/Test.java:47:37:47:44 | source(...) : Object | mad/Test.java:47:22:47:44 | (...)... : Cookies | provenance |  |
-| mad/Test.java:48:10:48:11 | in : Cookies | mad/Test.java:48:10:48:27 | getCookie(...) : Optional | provenance | MaD:23 |
+| mad/Test.java:48:10:48:11 | in : Cookies | mad/Test.java:48:10:48:27 | getCookie(...) : Optional | provenance | MaD:4 |
 | mad/Test.java:48:10:48:27 | getCookie(...) : Optional | mad/Test.java:49:9:49:11 | out | provenance |  |
 | mad/Test.java:54:41:54:82 | (...)... : FilePart | mad/Test.java:55:10:55:11 | in : FilePart | provenance |  |
 | mad/Test.java:54:75:54:82 | source(...) : Object | mad/Test.java:54:41:54:82 | (...)... : FilePart | provenance |  |
-| mad/Test.java:55:10:55:11 | in : FilePart | mad/Test.java:55:10:55:28 | getContentType(...) : String | provenance | MaD:13 |
+| mad/Test.java:55:10:55:11 | in : FilePart | mad/Test.java:55:10:55:28 | getContentType(...) : String | provenance | MaD:5 |
 | mad/Test.java:55:10:55:28 | getContentType(...) : String | mad/Test.java:56:9:56:11 | out | provenance |  |
 | mad/Test.java:61:41:61:82 | (...)... : FilePart | mad/Test.java:62:10:62:11 | in : FilePart | provenance |  |
 | mad/Test.java:61:75:61:82 | source(...) : Object | mad/Test.java:61:41:61:82 | (...)... : FilePart | provenance |  |
-| mad/Test.java:62:10:62:11 | in : FilePart | mad/Test.java:62:10:62:32 | getDispositionType(...) : String | provenance | MaD:14 |
+| mad/Test.java:62:10:62:11 | in : FilePart | mad/Test.java:62:10:62:32 | getDispositionType(...) : String | provenance | MaD:6 |
 | mad/Test.java:62:10:62:32 | getDispositionType(...) : String | mad/Test.java:63:9:63:11 | out | provenance |  |
 | mad/Test.java:68:41:68:82 | (...)... : FilePart | mad/Test.java:69:10:69:11 | in : FilePart | provenance |  |
 | mad/Test.java:68:75:68:82 | source(...) : Object | mad/Test.java:68:41:68:82 | (...)... : FilePart | provenance |  |
-| mad/Test.java:69:10:69:11 | in : FilePart | mad/Test.java:69:10:69:25 | getFilename(...) : String | provenance | MaD:15 |
+| mad/Test.java:69:10:69:11 | in : FilePart | mad/Test.java:69:10:69:25 | getFilename(...) : String | provenance | MaD:7 |
 | mad/Test.java:69:10:69:25 | getFilename(...) : String | mad/Test.java:70:9:70:11 | out | provenance |  |
 | mad/Test.java:75:41:75:82 | (...)... : FilePart | mad/Test.java:76:10:76:11 | in : FilePart | provenance |  |
 | mad/Test.java:75:75:75:82 | source(...) : Object | mad/Test.java:75:41:75:82 | (...)... : FilePart | provenance |  |
-| mad/Test.java:76:10:76:11 | in : FilePart | mad/Test.java:76:10:76:20 | getKey(...) : String | provenance | MaD:16 |
+| mad/Test.java:76:10:76:11 | in : FilePart | mad/Test.java:76:10:76:20 | getKey(...) : String | provenance | MaD:8 |
 | mad/Test.java:76:10:76:20 | getKey(...) : String | mad/Test.java:77:9:77:11 | out | provenance |  |
 | mad/Test.java:82:41:82:82 | (...)... : FilePart | mad/Test.java:83:10:83:11 | in : FilePart | provenance |  |
 | mad/Test.java:82:75:82:82 | source(...) : Object | mad/Test.java:82:41:82:82 | (...)... : FilePart | provenance |  |
-| mad/Test.java:83:10:83:11 | in : FilePart | mad/Test.java:83:10:83:20 | getRef(...) : Object | provenance | MaD:17 |
+| mad/Test.java:83:10:83:11 | in : FilePart | mad/Test.java:83:10:83:20 | getRef(...) : Object | provenance | MaD:9 |
 | mad/Test.java:83:10:83:20 | getRef(...) : Object | mad/Test.java:84:9:84:11 | out | provenance |  |
 | mad/Test.java:89:32:89:64 | (...)... : MultipartFormData | mad/Test.java:90:10:90:11 | in : MultipartFormData | provenance |  |
 | mad/Test.java:89:57:89:64 | source(...) : Object | mad/Test.java:89:32:89:64 | (...)... : MultipartFormData | provenance |  |
@@ -73,51 +73,51 @@ edges
 | mad/Test.java:104:10:104:22 | getFiles(...) : List | mad/Test.java:105:9:105:11 | out | provenance |  |
 | mad/Test.java:110:24:110:48 | (...)... : RawBuffer | mad/Test.java:111:10:111:11 | in : RawBuffer | provenance |  |
 | mad/Test.java:110:41:110:48 | source(...) : Object | mad/Test.java:110:24:110:48 | (...)... : RawBuffer | provenance |  |
-| mad/Test.java:111:10:111:11 | in : RawBuffer | mad/Test.java:111:10:111:21 | asBytes(...) : ByteString | provenance | MaD:18 |
+| mad/Test.java:111:10:111:11 | in : RawBuffer | mad/Test.java:111:10:111:21 | asBytes(...) : ByteString | provenance | MaD:13 |
 | mad/Test.java:111:10:111:21 | asBytes(...) : ByteString | mad/Test.java:112:9:112:11 | out | provenance |  |
 | mad/Test.java:117:24:117:48 | (...)... : RawBuffer | mad/Test.java:118:10:118:11 | in : RawBuffer | provenance |  |
 | mad/Test.java:117:41:117:48 | source(...) : Object | mad/Test.java:117:24:117:48 | (...)... : RawBuffer | provenance |  |
-| mad/Test.java:118:10:118:11 | in : RawBuffer | mad/Test.java:118:10:118:22 | asBytes(...) : ByteString | provenance | MaD:18 |
+| mad/Test.java:118:10:118:11 | in : RawBuffer | mad/Test.java:118:10:118:22 | asBytes(...) : ByteString | provenance | MaD:13 |
 | mad/Test.java:118:10:118:22 | asBytes(...) : ByteString | mad/Test.java:119:9:119:11 | out | provenance |  |
 | mad/Test.java:124:24:124:48 | (...)... : RawBuffer | mad/Test.java:125:10:125:11 | in : RawBuffer | provenance |  |
 | mad/Test.java:124:41:124:48 | source(...) : Object | mad/Test.java:124:24:124:48 | (...)... : RawBuffer | provenance |  |
-| mad/Test.java:125:10:125:11 | in : RawBuffer | mad/Test.java:125:10:125:20 | asFile(...) : File | provenance | MaD:19 |
+| mad/Test.java:125:10:125:11 | in : RawBuffer | mad/Test.java:125:10:125:20 | asFile(...) : File | provenance | MaD:14 |
 | mad/Test.java:125:10:125:20 | asFile(...) : File | mad/Test.java:126:9:126:11 | out | provenance |  |
 | mad/Test.java:131:26:131:52 | (...)... : RequestBody | mad/Test.java:132:10:132:11 | in : RequestBody | provenance |  |
 | mad/Test.java:131:45:131:52 | source(...) : Object | mad/Test.java:131:26:131:52 | (...)... : RequestBody | provenance |  |
-| mad/Test.java:132:10:132:11 | in : RequestBody | mad/Test.java:132:10:132:20 | as(...) : Object | provenance | MaD:1 |
+| mad/Test.java:132:10:132:11 | in : RequestBody | mad/Test.java:132:10:132:20 | as(...) : Object | provenance | MaD:15 |
 | mad/Test.java:132:10:132:20 | as(...) : Object | mad/Test.java:133:9:133:11 | out | provenance |  |
 | mad/Test.java:138:26:138:52 | (...)... : RequestBody | mad/Test.java:139:10:139:11 | in : RequestBody | provenance |  |
 | mad/Test.java:138:45:138:52 | source(...) : Object | mad/Test.java:138:26:138:52 | (...)... : RequestBody | provenance |  |
-| mad/Test.java:139:10:139:11 | in : RequestBody | mad/Test.java:139:10:139:21 | asBytes(...) : ByteString | provenance | MaD:2 |
+| mad/Test.java:139:10:139:11 | in : RequestBody | mad/Test.java:139:10:139:21 | asBytes(...) : ByteString | provenance | MaD:16 |
 | mad/Test.java:139:10:139:21 | asBytes(...) : ByteString | mad/Test.java:140:9:140:11 | out | provenance |  |
 | mad/Test.java:145:26:145:52 | (...)... : RequestBody | mad/Test.java:146:10:146:11 | in : RequestBody | provenance |  |
 | mad/Test.java:145:45:145:52 | source(...) : Object | mad/Test.java:145:26:145:52 | (...)... : RequestBody | provenance |  |
-| mad/Test.java:146:10:146:11 | in : RequestBody | mad/Test.java:146:10:146:30 | asFormUrlEncoded(...) : Map | provenance | MaD:3 |
+| mad/Test.java:146:10:146:11 | in : RequestBody | mad/Test.java:146:10:146:30 | asFormUrlEncoded(...) : Map | provenance | MaD:17 |
 | mad/Test.java:146:10:146:30 | asFormUrlEncoded(...) : Map | mad/Test.java:147:9:147:11 | out | provenance |  |
 | mad/Test.java:152:26:152:52 | (...)... : RequestBody | mad/Test.java:153:10:153:11 | in : RequestBody | provenance |  |
 | mad/Test.java:152:45:152:52 | source(...) : Object | mad/Test.java:152:26:152:52 | (...)... : RequestBody | provenance |  |
-| mad/Test.java:153:10:153:11 | in : RequestBody | mad/Test.java:153:10:153:20 | asJson(...) : JsonNode | provenance | MaD:4 |
+| mad/Test.java:153:10:153:11 | in : RequestBody | mad/Test.java:153:10:153:20 | asJson(...) : JsonNode | provenance | MaD:18 |
 | mad/Test.java:153:10:153:20 | asJson(...) : JsonNode | mad/Test.java:154:9:154:11 | out | provenance |  |
 | mad/Test.java:159:26:159:52 | (...)... : RequestBody | mad/Test.java:160:10:160:11 | in : RequestBody | provenance |  |
 | mad/Test.java:159:45:159:52 | source(...) : Object | mad/Test.java:159:26:159:52 | (...)... : RequestBody | provenance |  |
-| mad/Test.java:160:10:160:11 | in : RequestBody | mad/Test.java:160:10:160:33 | asMultipartFormData(...) : MultipartFormData | provenance | MaD:5 |
+| mad/Test.java:160:10:160:11 | in : RequestBody | mad/Test.java:160:10:160:33 | asMultipartFormData(...) : MultipartFormData | provenance | MaD:19 |
 | mad/Test.java:160:10:160:33 | asMultipartFormData(...) : MultipartFormData | mad/Test.java:161:9:161:11 | out | provenance |  |
 | mad/Test.java:166:26:166:52 | (...)... : RequestBody | mad/Test.java:167:10:167:11 | in : RequestBody | provenance |  |
 | mad/Test.java:166:45:166:52 | source(...) : Object | mad/Test.java:166:26:166:52 | (...)... : RequestBody | provenance |  |
-| mad/Test.java:167:10:167:11 | in : RequestBody | mad/Test.java:167:10:167:19 | asRaw(...) : RawBuffer | provenance | MaD:6 |
+| mad/Test.java:167:10:167:11 | in : RequestBody | mad/Test.java:167:10:167:19 | asRaw(...) : RawBuffer | provenance | MaD:20 |
 | mad/Test.java:167:10:167:19 | asRaw(...) : RawBuffer | mad/Test.java:168:9:168:11 | out | provenance |  |
 | mad/Test.java:173:26:173:52 | (...)... : RequestBody | mad/Test.java:174:10:174:11 | in : RequestBody | provenance |  |
 | mad/Test.java:173:45:173:52 | source(...) : Object | mad/Test.java:173:26:173:52 | (...)... : RequestBody | provenance |  |
-| mad/Test.java:174:10:174:11 | in : RequestBody | mad/Test.java:174:10:174:20 | asText(...) : String | provenance | MaD:7 |
+| mad/Test.java:174:10:174:11 | in : RequestBody | mad/Test.java:174:10:174:20 | asText(...) : String | provenance | MaD:21 |
 | mad/Test.java:174:10:174:20 | asText(...) : String | mad/Test.java:175:9:175:11 | out | provenance |  |
 | mad/Test.java:180:26:180:52 | (...)... : RequestBody | mad/Test.java:181:10:181:11 | in : RequestBody | provenance |  |
 | mad/Test.java:180:45:180:52 | source(...) : Object | mad/Test.java:180:26:180:52 | (...)... : RequestBody | provenance |  |
-| mad/Test.java:181:10:181:11 | in : RequestBody | mad/Test.java:181:10:181:19 | asXml(...) : Document | provenance | MaD:8 |
+| mad/Test.java:181:10:181:11 | in : RequestBody | mad/Test.java:181:10:181:19 | asXml(...) : Document | provenance | MaD:22 |
 | mad/Test.java:181:10:181:19 | asXml(...) : Document | mad/Test.java:182:9:182:11 | out | provenance |  |
 | mad/Test.java:187:26:187:52 | (...)... : RequestBody | mad/Test.java:188:10:188:11 | in : RequestBody | provenance |  |
 | mad/Test.java:187:45:187:52 | source(...) : Object | mad/Test.java:187:26:187:52 | (...)... : RequestBody | provenance |  |
-| mad/Test.java:188:10:188:11 | in : RequestBody | mad/Test.java:188:10:188:27 | parseJson(...) : Optional | provenance | MaD:9 |
+| mad/Test.java:188:10:188:11 | in : RequestBody | mad/Test.java:188:10:188:27 | parseJson(...) : Optional | provenance | MaD:23 |
 | mad/Test.java:188:10:188:27 | parseJson(...) : Optional | mad/Test.java:189:9:189:11 | out | provenance |  |
 nodes
 | mad/Test.java:26:21:26:42 | (...)... : Cookie | semmle.label | (...)... : Cookie |
diff --git a/java/ql/test/library-tests/frameworks/rabbitmq/FlowTest.ql b/java/ql/test/library-tests/frameworks/rabbitmq/FlowTest.ql
index 2f3cf27cf7a..0fdb2109438 100644
--- a/java/ql/test/library-tests/frameworks/rabbitmq/FlowTest.ql
+++ b/java/ql/test/library-tests/frameworks/rabbitmq/FlowTest.ql
@@ -4,7 +4,7 @@ import semmle.code.java.dataflow.FlowSources
 import TestUtilities.InlineFlowTest
 
 module Config implements DataFlow::ConfigSig {
-  predicate isSource(DataFlow::Node node) { node instanceof ThreatModelFlowSource }
+  predicate isSource(DataFlow::Node node) { node instanceof ActiveThreatModelSource }
 
   predicate isSink(DataFlow::Node node) {
     exists(MethodCall ma | ma.getMethod().hasName("sink") | node.asExpr() = ma.getAnArgument())
diff --git a/java/ql/test/library-tests/frameworks/ratpack/flow.ql b/java/ql/test/library-tests/frameworks/ratpack/flow.ql
index ed8d3d23937..2d5b5b2e471 100644
--- a/java/ql/test/library-tests/frameworks/ratpack/flow.ql
+++ b/java/ql/test/library-tests/frameworks/ratpack/flow.ql
@@ -7,7 +7,7 @@ module Config implements DataFlow::ConfigSig {
   predicate isSource(DataFlow::Node n) {
     n.asExpr().(MethodCall).getMethod().hasName("taint")
     or
-    n instanceof ThreatModelFlowSource
+    n instanceof ActiveThreatModelSource
   }
 
   predicate isSink(DataFlow::Node n) {
diff --git a/java/ql/test/library-tests/frameworks/spring/beans/test.expected b/java/ql/test/library-tests/frameworks/spring/beans/test.expected
index f2ed45d01da..649557b44c8 100644
--- a/java/ql/test/library-tests/frameworks/spring/beans/test.expected
+++ b/java/ql/test/library-tests/frameworks/spring/beans/test.expected
@@ -8,18 +8,18 @@ models
 | 7 | Summary: org.springframework.beans; MutablePropertyValues; true; MutablePropertyValues; (Map); ; Argument[0].MapKey; Argument[this].Element.MapKey; value; manual |
 | 8 | Summary: org.springframework.beans; MutablePropertyValues; true; MutablePropertyValues; (Map); ; Argument[0].MapValue; Argument[this].Element.MapValue; value; manual |
 | 9 | Summary: org.springframework.beans; MutablePropertyValues; true; MutablePropertyValues; (PropertyValues); ; Argument[0].Element; Argument[this].Element; value; manual |
-| 10 | Summary: org.springframework.beans; MutablePropertyValues; true; add; (String,Object); ; Argument[this]; ReturnValue; value; manual |
-| 11 | Summary: org.springframework.beans; MutablePropertyValues; true; add; (String,Object); ; Argument[0]; Argument[this].Element.MapKey; value; manual |
-| 12 | Summary: org.springframework.beans; MutablePropertyValues; true; add; (String,Object); ; Argument[1]; Argument[this].Element.MapValue; value; manual |
-| 13 | Summary: org.springframework.beans; MutablePropertyValues; true; addPropertyValue; (PropertyValue); ; Argument[this]; ReturnValue; value; manual |
-| 14 | Summary: org.springframework.beans; MutablePropertyValues; true; addPropertyValue; (PropertyValue); ; Argument[0]; Argument[this].Element; value; manual |
+| 10 | Summary: org.springframework.beans; MutablePropertyValues; true; add; (String,Object); ; Argument[0]; Argument[this].Element.MapKey; value; manual |
+| 11 | Summary: org.springframework.beans; MutablePropertyValues; true; add; (String,Object); ; Argument[1]; Argument[this].Element.MapValue; value; manual |
+| 12 | Summary: org.springframework.beans; MutablePropertyValues; true; add; (String,Object); ; Argument[this]; ReturnValue; value; manual |
+| 13 | Summary: org.springframework.beans; MutablePropertyValues; true; addPropertyValue; (PropertyValue); ; Argument[0]; Argument[this].Element; value; manual |
+| 14 | Summary: org.springframework.beans; MutablePropertyValues; true; addPropertyValue; (PropertyValue); ; Argument[this]; ReturnValue; value; manual |
 | 15 | Summary: org.springframework.beans; MutablePropertyValues; true; addPropertyValue; (String,Object); ; Argument[0]; Argument[this].Element.MapKey; value; manual |
 | 16 | Summary: org.springframework.beans; MutablePropertyValues; true; addPropertyValue; (String,Object); ; Argument[1]; Argument[this].Element.MapValue; value; manual |
-| 17 | Summary: org.springframework.beans; MutablePropertyValues; true; addPropertyValues; (Map); ; Argument[this]; ReturnValue; value; manual |
-| 18 | Summary: org.springframework.beans; MutablePropertyValues; true; addPropertyValues; (Map); ; Argument[0].MapKey; Argument[this].Element.MapKey; value; manual |
-| 19 | Summary: org.springframework.beans; MutablePropertyValues; true; addPropertyValues; (Map); ; Argument[0].MapValue; Argument[this].Element.MapValue; value; manual |
-| 20 | Summary: org.springframework.beans; MutablePropertyValues; true; addPropertyValues; (PropertyValues); ; Argument[this]; ReturnValue; value; manual |
-| 21 | Summary: org.springframework.beans; MutablePropertyValues; true; addPropertyValues; (PropertyValues); ; Argument[0].Element; Argument[this].Element; value; manual |
+| 17 | Summary: org.springframework.beans; MutablePropertyValues; true; addPropertyValues; (Map); ; Argument[0].MapKey; Argument[this].Element.MapKey; value; manual |
+| 18 | Summary: org.springframework.beans; MutablePropertyValues; true; addPropertyValues; (Map); ; Argument[0].MapValue; Argument[this].Element.MapValue; value; manual |
+| 19 | Summary: org.springframework.beans; MutablePropertyValues; true; addPropertyValues; (Map); ; Argument[this]; ReturnValue; value; manual |
+| 20 | Summary: org.springframework.beans; MutablePropertyValues; true; addPropertyValues; (PropertyValues); ; Argument[0].Element; Argument[this].Element; value; manual |
+| 21 | Summary: org.springframework.beans; MutablePropertyValues; true; addPropertyValues; (PropertyValues); ; Argument[this]; ReturnValue; value; manual |
 | 22 | Summary: org.springframework.beans; MutablePropertyValues; true; get; ; ; Argument[this].Element.MapValue; ReturnValue; value; manual |
 | 23 | Summary: org.springframework.beans; MutablePropertyValues; true; getPropertyValue; ; ; Argument[this].Element; ReturnValue; value; manual |
 | 24 | Summary: org.springframework.beans; MutablePropertyValues; true; getPropertyValueList; ; ; Argument[this].Element; ReturnValue.Element; value; manual |
@@ -103,12 +103,12 @@ edges
 | Test.java:78:27:78:29 | out : MutablePropertyValues [<element>] : PropertyValue | Test.java:78:9:78:30 | getElementDefault(...) | provenance | MaD:34 |
 | Test.java:83:31:83:62 | (...)... : MutablePropertyValues | Test.java:84:10:84:11 | in : MutablePropertyValues | provenance |  |
 | Test.java:83:55:83:62 | source(...) : Object | Test.java:83:31:83:62 | (...)... : MutablePropertyValues | provenance |  |
-| Test.java:84:10:84:11 | in : MutablePropertyValues | Test.java:84:10:84:27 | add(...) : MutablePropertyValues | provenance | MaD:10 |
+| Test.java:84:10:84:11 | in : MutablePropertyValues | Test.java:84:10:84:27 | add(...) : MutablePropertyValues | provenance | MaD:12 |
 | Test.java:84:10:84:27 | add(...) : MutablePropertyValues | Test.java:85:9:85:11 | out | provenance |  |
 | Test.java:90:16:90:32 | (...)... : String | Test.java:91:12:91:13 | in : String | provenance |  |
 | Test.java:90:25:90:32 | source(...) : Object | Test.java:90:16:90:32 | (...)... : String | provenance |  |
 | Test.java:91:4:91:6 | out [post update] : MutablePropertyValues [<element>, <map.key>] : String | Test.java:92:44:92:46 | out : MutablePropertyValues [<element>, <map.key>] : String | provenance |  |
-| Test.java:91:12:91:13 | in : String | Test.java:91:4:91:6 | out [post update] : MutablePropertyValues [<element>, <map.key>] : String | provenance | MaD:11 |
+| Test.java:91:12:91:13 | in : String | Test.java:91:4:91:6 | out [post update] : MutablePropertyValues [<element>, <map.key>] : String | provenance | MaD:10 |
 | Test.java:92:26:92:47 | getElementDefault(...) : PropertyValue [<map.key>] : String | Test.java:24:26:24:48 | container : PropertyValue [<map.key>] : String | provenance |  |
 | Test.java:92:26:92:47 | getElementDefault(...) : PropertyValue [<map.key>] : String | Test.java:92:9:92:48 | getMapKeyDefault(...) | provenance | MaD:32 |
 | Test.java:92:44:92:46 | out : MutablePropertyValues [<element>, <map.key>] : String | Test.java:20:34:20:64 | container : MutablePropertyValues [<element>, <map.key>] : String | provenance |  |
@@ -117,7 +117,7 @@ edges
 | Test.java:97:16:97:32 | (...)... : Object | Test.java:98:18:98:19 | in : Object | provenance |  |
 | Test.java:97:25:97:32 | source(...) : Object | Test.java:97:16:97:32 | (...)... : Object | provenance |  |
 | Test.java:98:4:98:6 | out [post update] : MutablePropertyValues [<element>, <map.value>] : Object | Test.java:99:46:99:48 | out : MutablePropertyValues [<element>, <map.value>] : Object | provenance |  |
-| Test.java:98:18:98:19 | in : Object | Test.java:98:4:98:6 | out [post update] : MutablePropertyValues [<element>, <map.value>] : Object | provenance | MaD:12 |
+| Test.java:98:18:98:19 | in : Object | Test.java:98:4:98:6 | out [post update] : MutablePropertyValues [<element>, <map.value>] : Object | provenance | MaD:11 |
 | Test.java:99:28:99:49 | getElementDefault(...) : PropertyValue [<map.value>] : Object | Test.java:28:28:28:50 | container : PropertyValue [<map.value>] : Object | provenance |  |
 | Test.java:99:28:99:49 | getElementDefault(...) : PropertyValue [<map.value>] : Object | Test.java:99:9:99:50 | getMapValueDefault(...) | provenance | MaD:33 |
 | Test.java:99:46:99:48 | out : MutablePropertyValues [<element>, <map.value>] : Object | Test.java:20:34:20:64 | container : MutablePropertyValues [<element>, <map.value>] : Object | provenance |  |
@@ -125,12 +125,12 @@ edges
 | Test.java:99:46:99:48 | out : MutablePropertyValues [<element>, <map.value>] : Object | Test.java:99:28:99:49 | getElementDefault(...) : PropertyValue [<map.value>] : Object | provenance | MaD:34 |
 | Test.java:104:31:104:62 | (...)... : MutablePropertyValues | Test.java:105:10:105:11 | in : MutablePropertyValues | provenance |  |
 | Test.java:104:55:104:62 | source(...) : Object | Test.java:104:31:104:62 | (...)... : MutablePropertyValues | provenance |  |
-| Test.java:105:10:105:11 | in : MutablePropertyValues | Test.java:105:10:105:34 | addPropertyValue(...) : MutablePropertyValues | provenance | MaD:13 |
+| Test.java:105:10:105:11 | in : MutablePropertyValues | Test.java:105:10:105:34 | addPropertyValue(...) : MutablePropertyValues | provenance | MaD:14 |
 | Test.java:105:10:105:34 | addPropertyValue(...) : MutablePropertyValues | Test.java:106:9:106:11 | out | provenance |  |
 | Test.java:111:23:111:46 | (...)... : PropertyValue | Test.java:112:25:112:26 | in : PropertyValue | provenance |  |
 | Test.java:111:39:111:46 | source(...) : Object | Test.java:111:23:111:46 | (...)... : PropertyValue | provenance |  |
 | Test.java:112:4:112:6 | out [post update] : MutablePropertyValues [<element>] : PropertyValue | Test.java:113:27:113:29 | out : MutablePropertyValues [<element>] : PropertyValue | provenance |  |
-| Test.java:112:25:112:26 | in : PropertyValue | Test.java:112:4:112:6 | out [post update] : MutablePropertyValues [<element>] : PropertyValue | provenance | MaD:14 |
+| Test.java:112:25:112:26 | in : PropertyValue | Test.java:112:4:112:6 | out [post update] : MutablePropertyValues [<element>] : PropertyValue | provenance | MaD:13 |
 | Test.java:113:27:113:29 | out : MutablePropertyValues [<element>] : PropertyValue | Test.java:20:34:20:64 | container : MutablePropertyValues [<element>] : PropertyValue | provenance |  |
 | Test.java:113:27:113:29 | out : MutablePropertyValues [<element>] : PropertyValue | Test.java:113:9:113:30 | getElementDefault(...) | provenance | MaD:23 |
 | Test.java:113:27:113:29 | out : MutablePropertyValues [<element>] : PropertyValue | Test.java:113:9:113:30 | getElementDefault(...) | provenance | MaD:34 |
@@ -154,12 +154,12 @@ edges
 | Test.java:127:46:127:48 | out : MutablePropertyValues [<element>, <map.value>] : Object | Test.java:127:28:127:49 | getElementDefault(...) : PropertyValue [<map.value>] : Object | provenance | MaD:34 |
 | Test.java:132:31:132:62 | (...)... : MutablePropertyValues | Test.java:133:10:133:11 | in : MutablePropertyValues | provenance |  |
 | Test.java:132:55:132:62 | source(...) : Object | Test.java:132:31:132:62 | (...)... : MutablePropertyValues | provenance |  |
-| Test.java:133:10:133:11 | in : MutablePropertyValues | Test.java:133:10:133:41 | addPropertyValues(...) : MutablePropertyValues | provenance | MaD:17 |
+| Test.java:133:10:133:11 | in : MutablePropertyValues | Test.java:133:10:133:41 | addPropertyValues(...) : MutablePropertyValues | provenance | MaD:19 |
 | Test.java:133:10:133:41 | addPropertyValues(...) : MutablePropertyValues | Test.java:134:9:134:11 | out | provenance |  |
 | Test.java:139:13:139:34 | of(...) : Map [<map.key>] : Object | Test.java:140:26:140:27 | in : Map [<map.key>] : Object | provenance |  |
 | Test.java:139:20:139:27 | source(...) : Object | Test.java:139:13:139:34 | of(...) : Map [<map.key>] : Object | provenance | MaD:4 |
 | Test.java:140:4:140:6 | out [post update] : MutablePropertyValues [<element>, <map.key>] : Object | Test.java:141:44:141:46 | out : MutablePropertyValues [<element>, <map.key>] : Object | provenance |  |
-| Test.java:140:26:140:27 | in : Map [<map.key>] : Object | Test.java:140:4:140:6 | out [post update] : MutablePropertyValues [<element>, <map.key>] : Object | provenance | MaD:18 |
+| Test.java:140:26:140:27 | in : Map [<map.key>] : Object | Test.java:140:4:140:6 | out [post update] : MutablePropertyValues [<element>, <map.key>] : Object | provenance | MaD:17 |
 | Test.java:141:26:141:47 | getElementDefault(...) : PropertyValue [<map.key>] : Object | Test.java:24:26:24:48 | container : PropertyValue [<map.key>] : Object | provenance |  |
 | Test.java:141:26:141:47 | getElementDefault(...) : PropertyValue [<map.key>] : Object | Test.java:141:9:141:48 | getMapKeyDefault(...) | provenance | MaD:32 |
 | Test.java:141:44:141:46 | out : MutablePropertyValues [<element>, <map.key>] : Object | Test.java:20:34:20:64 | container : MutablePropertyValues [<element>, <map.key>] : Object | provenance |  |
@@ -168,7 +168,7 @@ edges
 | Test.java:146:13:146:34 | of(...) : Map [<map.value>] : Object | Test.java:147:26:147:27 | in : Map [<map.value>] : Object | provenance |  |
 | Test.java:146:26:146:33 | source(...) : Object | Test.java:146:13:146:34 | of(...) : Map [<map.value>] : Object | provenance | MaD:5 |
 | Test.java:147:4:147:6 | out [post update] : MutablePropertyValues [<element>, <map.value>] : Object | Test.java:148:46:148:48 | out : MutablePropertyValues [<element>, <map.value>] : Object | provenance |  |
-| Test.java:147:26:147:27 | in : Map [<map.value>] : Object | Test.java:147:4:147:6 | out [post update] : MutablePropertyValues [<element>, <map.value>] : Object | provenance | MaD:19 |
+| Test.java:147:26:147:27 | in : Map [<map.value>] : Object | Test.java:147:4:147:6 | out [post update] : MutablePropertyValues [<element>, <map.value>] : Object | provenance | MaD:18 |
 | Test.java:148:28:148:49 | getElementDefault(...) : PropertyValue [<map.value>] : Object | Test.java:28:28:28:50 | container : PropertyValue [<map.value>] : Object | provenance |  |
 | Test.java:148:28:148:49 | getElementDefault(...) : PropertyValue [<map.value>] : Object | Test.java:148:9:148:50 | getMapValueDefault(...) | provenance | MaD:33 |
 | Test.java:148:46:148:48 | out : MutablePropertyValues [<element>, <map.value>] : Object | Test.java:20:34:20:64 | container : MutablePropertyValues [<element>, <map.value>] : Object | provenance |  |
@@ -176,14 +176,14 @@ edges
 | Test.java:148:46:148:48 | out : MutablePropertyValues [<element>, <map.value>] : Object | Test.java:148:28:148:49 | getElementDefault(...) : PropertyValue [<map.value>] : Object | provenance | MaD:34 |
 | Test.java:153:31:153:62 | (...)... : MutablePropertyValues | Test.java:154:10:154:11 | in : MutablePropertyValues | provenance |  |
 | Test.java:153:55:153:62 | source(...) : Object | Test.java:153:31:153:62 | (...)... : MutablePropertyValues | provenance |  |
-| Test.java:154:10:154:11 | in : MutablePropertyValues | Test.java:154:10:154:52 | addPropertyValues(...) : MutablePropertyValues | provenance | MaD:20 |
+| Test.java:154:10:154:11 | in : MutablePropertyValues | Test.java:154:10:154:52 | addPropertyValues(...) : MutablePropertyValues | provenance | MaD:21 |
 | Test.java:154:10:154:52 | addPropertyValues(...) : MutablePropertyValues | Test.java:155:9:155:11 | out | provenance |  |
 | Test.java:160:24:160:84 | newMutablePropertyValuesWithElement(...) : MutablePropertyValues [<element>] : PropertyValue | Test.java:161:26:161:27 | in : MutablePropertyValues [<element>] : PropertyValue | provenance |  |
 | Test.java:160:60:160:83 | (...)... : PropertyValue | Test.java:32:60:32:80 | element : PropertyValue | provenance |  |
 | Test.java:160:60:160:83 | (...)... : PropertyValue | Test.java:160:24:160:84 | newMutablePropertyValuesWithElement(...) : MutablePropertyValues [<element>] : PropertyValue | provenance | MaD:3 |
 | Test.java:160:76:160:83 | source(...) : Object | Test.java:160:60:160:83 | (...)... : PropertyValue | provenance |  |
 | Test.java:161:4:161:6 | out [post update] : MutablePropertyValues [<element>] : PropertyValue | Test.java:162:27:162:29 | out : MutablePropertyValues [<element>] : PropertyValue | provenance |  |
-| Test.java:161:26:161:27 | in : MutablePropertyValues [<element>] : PropertyValue | Test.java:161:4:161:6 | out [post update] : MutablePropertyValues [<element>] : PropertyValue | provenance | MaD:21 |
+| Test.java:161:26:161:27 | in : MutablePropertyValues [<element>] : PropertyValue | Test.java:161:4:161:6 | out [post update] : MutablePropertyValues [<element>] : PropertyValue | provenance | MaD:20 |
 | Test.java:162:27:162:29 | out : MutablePropertyValues [<element>] : PropertyValue | Test.java:20:34:20:64 | container : MutablePropertyValues [<element>] : PropertyValue | provenance |  |
 | Test.java:162:27:162:29 | out : MutablePropertyValues [<element>] : PropertyValue | Test.java:162:9:162:30 | getElementDefault(...) | provenance | MaD:23 |
 | Test.java:162:27:162:29 | out : MutablePropertyValues [<element>] : PropertyValue | Test.java:162:9:162:30 | getElementDefault(...) | provenance | MaD:34 |
diff --git a/java/ql/test/library-tests/frameworks/spring/cache/test.expected b/java/ql/test/library-tests/frameworks/spring/cache/test.expected
index 5183f66ad64..b2624ed1822 100644
--- a/java/ql/test/library-tests/frameworks/spring/cache/test.expected
+++ b/java/ql/test/library-tests/frameworks/spring/cache/test.expected
@@ -4,19 +4,19 @@ models
 | 3 | Summary: java.util; Map; true; get; ; ; Argument[this].MapValue; ReturnValue; value; manual |
 | 4 | Summary: java.util; Map; true; keySet; (); ; Argument[this].MapKey; ReturnValue.Element; value; manual |
 | 5 | Summary: java.util; Map; true; put; (Object,Object); ; Argument[1]; Argument[this].MapValue; value; manual |
-| 6 | Summary: org.springframework.cache; Cache; true; get; (Object); ; Argument[this].MapValue; ReturnValue.MapValue; value; manual |
-| 7 | Summary: org.springframework.cache; Cache; true; get; (Object,Callable); ; Argument[this].MapValue; ReturnValue; value; manual |
-| 8 | Summary: org.springframework.cache; Cache; true; get; (Object,Class); ; Argument[this].MapValue; ReturnValue; value; manual |
-| 9 | Summary: org.springframework.cache; Cache; true; getNativeCache; ; ; Argument[this].MapKey; ReturnValue.MapKey; value; manual |
-| 10 | Summary: org.springframework.cache; Cache; true; getNativeCache; ; ; Argument[this].MapValue; ReturnValue.MapValue; value; manual |
-| 11 | Summary: org.springframework.cache; Cache; true; put; ; ; Argument[0]; Argument[this].MapKey; value; manual |
-| 12 | Summary: org.springframework.cache; Cache; true; put; ; ; Argument[1]; Argument[this].MapValue; value; manual |
-| 13 | Summary: org.springframework.cache; Cache; true; putIfAbsent; ; ; Argument[this].MapValue; ReturnValue.MapValue; value; manual |
-| 14 | Summary: org.springframework.cache; Cache; true; putIfAbsent; ; ; Argument[0]; Argument[this].MapKey; value; manual |
-| 15 | Summary: org.springframework.cache; Cache; true; putIfAbsent; ; ; Argument[1]; Argument[this].MapValue; value; manual |
-| 16 | Summary: org.springframework.cache; Cache$ValueRetrievalException; false; ValueRetrievalException; ; ; Argument[0]; Argument[this].MapKey; value; manual |
-| 17 | Summary: org.springframework.cache; Cache$ValueRetrievalException; false; getKey; ; ; Argument[this].MapKey; ReturnValue; value; manual |
-| 18 | Summary: org.springframework.cache; Cache$ValueWrapper; true; get; ; ; Argument[this].MapValue; ReturnValue; value; manual |
+| 6 | Summary: org.springframework.cache; Cache$ValueRetrievalException; false; ValueRetrievalException; ; ; Argument[0]; Argument[this].MapKey; value; manual |
+| 7 | Summary: org.springframework.cache; Cache$ValueRetrievalException; false; getKey; ; ; Argument[this].MapKey; ReturnValue; value; manual |
+| 8 | Summary: org.springframework.cache; Cache$ValueWrapper; true; get; ; ; Argument[this].MapValue; ReturnValue; value; manual |
+| 9 | Summary: org.springframework.cache; Cache; true; get; (Object); ; Argument[this].MapValue; ReturnValue.MapValue; value; manual |
+| 10 | Summary: org.springframework.cache; Cache; true; get; (Object,Callable); ; Argument[this].MapValue; ReturnValue; value; manual |
+| 11 | Summary: org.springframework.cache; Cache; true; get; (Object,Class); ; Argument[this].MapValue; ReturnValue; value; manual |
+| 12 | Summary: org.springframework.cache; Cache; true; getNativeCache; ; ; Argument[this].MapKey; ReturnValue.MapKey; value; manual |
+| 13 | Summary: org.springframework.cache; Cache; true; getNativeCache; ; ; Argument[this].MapValue; ReturnValue.MapValue; value; manual |
+| 14 | Summary: org.springframework.cache; Cache; true; put; ; ; Argument[0]; Argument[this].MapKey; value; manual |
+| 15 | Summary: org.springframework.cache; Cache; true; put; ; ; Argument[1]; Argument[this].MapValue; value; manual |
+| 16 | Summary: org.springframework.cache; Cache; true; putIfAbsent; ; ; Argument[0]; Argument[this].MapKey; value; manual |
+| 17 | Summary: org.springframework.cache; Cache; true; putIfAbsent; ; ; Argument[1]; Argument[this].MapValue; value; manual |
+| 18 | Summary: org.springframework.cache; Cache; true; putIfAbsent; ; ; Argument[this].MapValue; ReturnValue.MapValue; value; manual |
 edges
 | Test.java:13:16:13:29 | element : Object | Test.java:15:19:15:25 | element : Object | provenance |  |
 | Test.java:15:4:15:7 | this [post update] : ValueWrapper [<map.value>] : Object | Test.java:13:3:13:14 | parameter this [Return] : ValueWrapper [<map.value>] : Object | provenance |  |
@@ -29,98 +29,98 @@ edges
 | Test.java:22:26:22:37 | value : Object | Test.java:23:18:23:22 | value : Object | provenance |  |
 | Test.java:23:4:23:7 | this [post update] : DummyCache [<map.key>] : Object | Test.java:22:3:22:12 | parameter this [Return] : DummyCache [<map.key>] : Object | provenance |  |
 | Test.java:23:4:23:7 | this [post update] : DummyCache [<map.value>] : Object | Test.java:22:3:22:12 | parameter this [Return] : DummyCache [<map.value>] : Object | provenance |  |
-| Test.java:23:13:23:15 | key : Object | Test.java:23:4:23:7 | this [post update] : DummyCache [<map.key>] : Object | provenance | MaD:11 |
-| Test.java:23:18:23:22 | value : Object | Test.java:23:4:23:7 | this [post update] : DummyCache [<map.value>] : Object | provenance | MaD:12 |
+| Test.java:23:13:23:15 | key : Object | Test.java:23:4:23:7 | this [post update] : DummyCache [<map.key>] : Object | provenance | MaD:14 |
+| Test.java:23:18:23:22 | value : Object | Test.java:23:4:23:7 | this [post update] : DummyCache [<map.value>] : Object | provenance | MaD:15 |
 | Test.java:39:19:39:57 | container : ValueRetrievalException [<map.key>] : Object | Test.java:39:69:39:77 | container : ValueRetrievalException [<map.key>] : Object | provenance |  |
-| Test.java:39:69:39:77 | container : ValueRetrievalException [<map.key>] : Object | Test.java:39:69:39:86 | getKey(...) : Object | provenance | MaD:17 |
+| Test.java:39:69:39:77 | container : ValueRetrievalException [<map.key>] : Object | Test.java:39:69:39:86 | getKey(...) : Object | provenance | MaD:7 |
 | Test.java:40:19:40:33 | container : Cache [<map.key>] : Object | Test.java:40:51:40:59 | container : Cache [<map.key>] : Object | provenance |  |
 | Test.java:40:45:40:86 | keySet(...) : Set [<element>] : Object | Test.java:40:45:40:97 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:1 |
 | Test.java:40:45:40:97 | iterator(...) : Iterator [<element>] : Object | Test.java:40:45:40:104 | next(...) : Object | provenance | MaD:2 |
 | Test.java:40:46:40:76 | (...)... : Map [<map.key>] : Object | Test.java:40:45:40:86 | keySet(...) : Set [<element>] : Object | provenance | MaD:4 |
-| Test.java:40:51:40:59 | container : Cache [<map.key>] : Object | Test.java:40:51:40:76 | getNativeCache(...) : Object [<map.key>] : Object | provenance | MaD:9 |
+| Test.java:40:51:40:59 | container : Cache [<map.key>] : Object | Test.java:40:51:40:76 | getNativeCache(...) : Object [<map.key>] : Object | provenance | MaD:12 |
 | Test.java:40:51:40:76 | getNativeCache(...) : Object [<map.key>] : Object | Test.java:40:46:40:76 | (...)... : Map [<map.key>] : Object | provenance |  |
 | Test.java:41:21:41:35 | container : Cache [<map.value>] : Object | Test.java:41:47:41:55 | container : Cache [<map.value>] : Object | provenance |  |
-| Test.java:41:47:41:55 | container : Cache [<map.value>] : Object | Test.java:41:47:41:78 | get(...) : Object | provenance | MaD:8 |
+| Test.java:41:47:41:55 | container : Cache [<map.value>] : Object | Test.java:41:47:41:78 | get(...) : Object | provenance | MaD:11 |
 | Test.java:42:21:42:48 | container : ValueWrapper [<map.value>] : Object | Test.java:42:60:42:68 | container : ValueWrapper [<map.value>] : Object | provenance |  |
 | Test.java:42:60:42:68 | container : ValueWrapper [<map.value>] : Object | Test.java:18:17:18:19 | parameter this : ValueWrapper [<map.value>] : Object | provenance |  |
 | Test.java:42:60:42:68 | container : ValueWrapper [<map.value>] : Object | Test.java:42:60:42:74 | get(...) : Object | provenance | MaD:3 |
-| Test.java:42:60:42:68 | container : ValueWrapper [<map.value>] : Object | Test.java:42:60:42:74 | get(...) : Object | provenance | MaD:18 |
+| Test.java:42:60:42:68 | container : ValueWrapper [<map.value>] : Object | Test.java:42:60:42:74 | get(...) : Object | provenance | MaD:8 |
 | Test.java:51:16:51:23 | source(...) : Object | Test.java:52:44:52:45 | in : Object | provenance |  |
 | Test.java:52:10:52:58 | new ValueRetrievalException(...) : ValueRetrievalException [<map.key>] : Object | Test.java:53:19:53:21 | out : ValueRetrievalException [<map.key>] : Object | provenance |  |
-| Test.java:52:44:52:45 | in : Object | Test.java:52:10:52:58 | new ValueRetrievalException(...) : ValueRetrievalException [<map.key>] : Object | provenance | MaD:16 |
+| Test.java:52:44:52:45 | in : Object | Test.java:52:10:52:58 | new ValueRetrievalException(...) : ValueRetrievalException [<map.key>] : Object | provenance | MaD:6 |
 | Test.java:53:19:53:21 | out : ValueRetrievalException [<map.key>] : Object | Test.java:39:19:39:57 | container : ValueRetrievalException [<map.key>] : Object | provenance |  |
-| Test.java:53:19:53:21 | out : ValueRetrievalException [<map.key>] : Object | Test.java:53:9:53:22 | getMapKey(...) | provenance | MaD:17 |
+| Test.java:53:19:53:21 | out : ValueRetrievalException [<map.key>] : Object | Test.java:53:9:53:22 | getMapKey(...) | provenance | MaD:7 |
 | Test.java:58:39:58:93 | new ValueRetrievalException(...) : ValueRetrievalException [<map.key>] : Object | Test.java:59:10:59:11 | in : ValueRetrievalException [<map.key>] : Object | provenance |  |
-| Test.java:58:73:58:80 | source(...) : Object | Test.java:58:39:58:93 | new ValueRetrievalException(...) : ValueRetrievalException [<map.key>] : Object | provenance | MaD:16 |
-| Test.java:59:10:59:11 | in : ValueRetrievalException [<map.key>] : Object | Test.java:59:10:59:20 | getKey(...) : Object | provenance | MaD:17 |
+| Test.java:58:73:58:80 | source(...) : Object | Test.java:58:39:58:93 | new ValueRetrievalException(...) : ValueRetrievalException [<map.key>] : Object | provenance | MaD:6 |
+| Test.java:59:10:59:11 | in : ValueRetrievalException [<map.key>] : Object | Test.java:59:10:59:20 | getKey(...) : Object | provenance | MaD:7 |
 | Test.java:59:10:59:20 | getKey(...) : Object | Test.java:60:9:60:11 | out | provenance |  |
 | Test.java:65:28:65:53 | new ValueWrapper(...) : ValueWrapper [<map.value>] : Object | Test.java:66:10:66:11 | in : ValueWrapper [<map.value>] : Object | provenance |  |
 | Test.java:65:45:65:52 | source(...) : Object | Test.java:13:16:13:29 | element : Object | provenance |  |
 | Test.java:65:45:65:52 | source(...) : Object | Test.java:65:28:65:53 | new ValueWrapper(...) : ValueWrapper [<map.value>] : Object | provenance | MaD:5 |
 | Test.java:66:10:66:11 | in : ValueWrapper [<map.value>] : Object | Test.java:18:17:18:19 | parameter this : ValueWrapper [<map.value>] : Object | provenance |  |
 | Test.java:66:10:66:11 | in : ValueWrapper [<map.value>] : Object | Test.java:66:10:66:17 | get(...) : Object | provenance | MaD:3 |
-| Test.java:66:10:66:11 | in : ValueWrapper [<map.value>] : Object | Test.java:66:10:66:17 | get(...) : Object | provenance | MaD:18 |
+| Test.java:66:10:66:11 | in : ValueWrapper [<map.value>] : Object | Test.java:66:10:66:17 | get(...) : Object | provenance | MaD:8 |
 | Test.java:66:10:66:17 | get(...) : Object | Test.java:67:9:67:11 | out | provenance |  |
 | Test.java:72:15:72:44 | new DummyCache(...) : DummyCache [<map.value>] : Object | Test.java:73:10:73:11 | in : DummyCache [<map.value>] : Object | provenance |  |
 | Test.java:72:36:72:43 | source(...) : Object | Test.java:22:26:22:37 | value : Object | provenance |  |
-| Test.java:72:36:72:43 | source(...) : Object | Test.java:72:15:72:44 | new DummyCache(...) : DummyCache [<map.value>] : Object | provenance | MaD:12 |
-| Test.java:73:10:73:11 | in : DummyCache [<map.value>] : Object | Test.java:73:10:73:21 | get(...) : ValueWrapper [<map.value>] : Object | provenance | MaD:6 |
+| Test.java:72:36:72:43 | source(...) : Object | Test.java:72:15:72:44 | new DummyCache(...) : DummyCache [<map.value>] : Object | provenance | MaD:15 |
+| Test.java:73:10:73:11 | in : DummyCache [<map.value>] : Object | Test.java:73:10:73:21 | get(...) : ValueWrapper [<map.value>] : Object | provenance | MaD:9 |
 | Test.java:73:10:73:21 | get(...) : ValueWrapper [<map.value>] : Object | Test.java:74:21:74:23 | out : ValueWrapper [<map.value>] : Object | provenance |  |
 | Test.java:74:21:74:23 | out : ValueWrapper [<map.value>] : Object | Test.java:42:21:42:48 | container : ValueWrapper [<map.value>] : Object | provenance |  |
 | Test.java:74:21:74:23 | out : ValueWrapper [<map.value>] : Object | Test.java:74:9:74:24 | getMapValue(...) | provenance | MaD:3 |
-| Test.java:74:21:74:23 | out : ValueWrapper [<map.value>] : Object | Test.java:74:9:74:24 | getMapValue(...) | provenance | MaD:18 |
+| Test.java:74:21:74:23 | out : ValueWrapper [<map.value>] : Object | Test.java:74:9:74:24 | getMapValue(...) | provenance | MaD:8 |
 | Test.java:79:15:79:44 | new DummyCache(...) : DummyCache [<map.value>] : Object | Test.java:80:10:80:11 | in : DummyCache [<map.value>] : Object | provenance |  |
 | Test.java:79:36:79:43 | source(...) : Object | Test.java:22:26:22:37 | value : Object | provenance |  |
-| Test.java:79:36:79:43 | source(...) : Object | Test.java:79:15:79:44 | new DummyCache(...) : DummyCache [<map.value>] : Object | provenance | MaD:12 |
-| Test.java:80:10:80:11 | in : DummyCache [<map.value>] : Object | Test.java:80:10:80:37 | get(...) : Object | provenance | MaD:7 |
+| Test.java:79:36:79:43 | source(...) : Object | Test.java:79:15:79:44 | new DummyCache(...) : DummyCache [<map.value>] : Object | provenance | MaD:15 |
+| Test.java:80:10:80:11 | in : DummyCache [<map.value>] : Object | Test.java:80:10:80:37 | get(...) : Object | provenance | MaD:10 |
 | Test.java:80:10:80:37 | get(...) : Object | Test.java:81:9:81:11 | out | provenance |  |
 | Test.java:86:15:86:44 | new DummyCache(...) : DummyCache [<map.value>] : Object | Test.java:87:10:87:11 | in : DummyCache [<map.value>] : Object | provenance |  |
 | Test.java:86:36:86:43 | source(...) : Object | Test.java:22:26:22:37 | value : Object | provenance |  |
-| Test.java:86:36:86:43 | source(...) : Object | Test.java:86:15:86:44 | new DummyCache(...) : DummyCache [<map.value>] : Object | provenance | MaD:12 |
-| Test.java:87:10:87:11 | in : DummyCache [<map.value>] : Object | Test.java:87:10:87:34 | get(...) : Object | provenance | MaD:8 |
+| Test.java:86:36:86:43 | source(...) : Object | Test.java:86:15:86:44 | new DummyCache(...) : DummyCache [<map.value>] : Object | provenance | MaD:15 |
+| Test.java:87:10:87:11 | in : DummyCache [<map.value>] : Object | Test.java:87:10:87:34 | get(...) : Object | provenance | MaD:11 |
 | Test.java:87:10:87:34 | get(...) : Object | Test.java:88:9:88:11 | out | provenance |  |
 | Test.java:93:15:93:44 | new DummyCache(...) : DummyCache [<map.key>] : Object | Test.java:94:10:94:11 | in : DummyCache [<map.key>] : Object | provenance |  |
 | Test.java:93:30:93:37 | source(...) : Object | Test.java:22:14:22:23 | key : Object | provenance |  |
-| Test.java:93:30:93:37 | source(...) : Object | Test.java:93:15:93:44 | new DummyCache(...) : DummyCache [<map.key>] : Object | provenance | MaD:11 |
-| Test.java:94:10:94:11 | in : DummyCache [<map.key>] : Object | Test.java:94:10:94:28 | getNativeCache(...) : Object [<map.key>] : Object | provenance | MaD:9 |
+| Test.java:93:30:93:37 | source(...) : Object | Test.java:93:15:93:44 | new DummyCache(...) : DummyCache [<map.key>] : Object | provenance | MaD:14 |
+| Test.java:94:10:94:11 | in : DummyCache [<map.key>] : Object | Test.java:94:10:94:28 | getNativeCache(...) : Object [<map.key>] : Object | provenance | MaD:12 |
 | Test.java:94:10:94:28 | getNativeCache(...) : Object [<map.key>] : Object | Test.java:95:19:95:28 | (...)... : Cache [<map.key>] : Object | provenance |  |
 | Test.java:95:19:95:28 | (...)... : Cache [<map.key>] : Object | Test.java:40:19:40:33 | container : Cache [<map.key>] : Object | provenance |  |
-| Test.java:95:19:95:28 | (...)... : Cache [<map.key>] : Object | Test.java:95:9:95:29 | getMapKey(...) | provenance | MaD:9 |
+| Test.java:95:19:95:28 | (...)... : Cache [<map.key>] : Object | Test.java:95:9:95:29 | getMapKey(...) | provenance | MaD:12 |
 | Test.java:100:15:100:44 | new DummyCache(...) : DummyCache [<map.value>] : Object | Test.java:101:10:101:11 | in : DummyCache [<map.value>] : Object | provenance |  |
 | Test.java:100:36:100:43 | source(...) : Object | Test.java:22:26:22:37 | value : Object | provenance |  |
-| Test.java:100:36:100:43 | source(...) : Object | Test.java:100:15:100:44 | new DummyCache(...) : DummyCache [<map.value>] : Object | provenance | MaD:12 |
-| Test.java:101:10:101:11 | in : DummyCache [<map.value>] : Object | Test.java:101:10:101:28 | getNativeCache(...) : Object [<map.value>] : Object | provenance | MaD:10 |
+| Test.java:100:36:100:43 | source(...) : Object | Test.java:100:15:100:44 | new DummyCache(...) : DummyCache [<map.value>] : Object | provenance | MaD:15 |
+| Test.java:101:10:101:11 | in : DummyCache [<map.value>] : Object | Test.java:101:10:101:28 | getNativeCache(...) : Object [<map.value>] : Object | provenance | MaD:13 |
 | Test.java:101:10:101:28 | getNativeCache(...) : Object [<map.value>] : Object | Test.java:102:21:102:30 | (...)... : Cache [<map.value>] : Object | provenance |  |
 | Test.java:102:21:102:30 | (...)... : Cache [<map.value>] : Object | Test.java:41:21:41:35 | container : Cache [<map.value>] : Object | provenance |  |
-| Test.java:102:21:102:30 | (...)... : Cache [<map.value>] : Object | Test.java:102:9:102:31 | getMapValue(...) | provenance | MaD:8 |
+| Test.java:102:21:102:30 | (...)... : Cache [<map.value>] : Object | Test.java:102:9:102:31 | getMapValue(...) | provenance | MaD:11 |
 | Test.java:107:16:107:23 | source(...) : Object | Test.java:108:12:108:13 | in : Object | provenance |  |
 | Test.java:108:4:108:6 | out [post update] : Cache [<map.key>] : Object | Test.java:109:19:109:21 | out : Cache [<map.key>] : Object | provenance |  |
-| Test.java:108:12:108:13 | in : Object | Test.java:108:4:108:6 | out [post update] : Cache [<map.key>] : Object | provenance | MaD:11 |
+| Test.java:108:12:108:13 | in : Object | Test.java:108:4:108:6 | out [post update] : Cache [<map.key>] : Object | provenance | MaD:14 |
 | Test.java:109:19:109:21 | out : Cache [<map.key>] : Object | Test.java:40:19:40:33 | container : Cache [<map.key>] : Object | provenance |  |
-| Test.java:109:19:109:21 | out : Cache [<map.key>] : Object | Test.java:109:9:109:22 | getMapKey(...) | provenance | MaD:9 |
+| Test.java:109:19:109:21 | out : Cache [<map.key>] : Object | Test.java:109:9:109:22 | getMapKey(...) | provenance | MaD:12 |
 | Test.java:114:16:114:23 | source(...) : Object | Test.java:115:18:115:19 | in : Object | provenance |  |
 | Test.java:115:4:115:6 | out [post update] : Cache [<map.value>] : Object | Test.java:116:21:116:23 | out : Cache [<map.value>] : Object | provenance |  |
-| Test.java:115:18:115:19 | in : Object | Test.java:115:4:115:6 | out [post update] : Cache [<map.value>] : Object | provenance | MaD:12 |
+| Test.java:115:18:115:19 | in : Object | Test.java:115:4:115:6 | out [post update] : Cache [<map.value>] : Object | provenance | MaD:15 |
 | Test.java:116:21:116:23 | out : Cache [<map.value>] : Object | Test.java:41:21:41:35 | container : Cache [<map.value>] : Object | provenance |  |
-| Test.java:116:21:116:23 | out : Cache [<map.value>] : Object | Test.java:116:9:116:24 | getMapValue(...) | provenance | MaD:8 |
+| Test.java:116:21:116:23 | out : Cache [<map.value>] : Object | Test.java:116:9:116:24 | getMapValue(...) | provenance | MaD:11 |
 | Test.java:121:16:121:23 | source(...) : Object | Test.java:122:20:122:21 | in : Object | provenance |  |
 | Test.java:122:4:122:6 | out [post update] : Cache [<map.key>] : Object | Test.java:123:19:123:21 | out : Cache [<map.key>] : Object | provenance |  |
-| Test.java:122:20:122:21 | in : Object | Test.java:122:4:122:6 | out [post update] : Cache [<map.key>] : Object | provenance | MaD:14 |
+| Test.java:122:20:122:21 | in : Object | Test.java:122:4:122:6 | out [post update] : Cache [<map.key>] : Object | provenance | MaD:16 |
 | Test.java:123:19:123:21 | out : Cache [<map.key>] : Object | Test.java:40:19:40:33 | container : Cache [<map.key>] : Object | provenance |  |
-| Test.java:123:19:123:21 | out : Cache [<map.key>] : Object | Test.java:123:9:123:22 | getMapKey(...) | provenance | MaD:9 |
+| Test.java:123:19:123:21 | out : Cache [<map.key>] : Object | Test.java:123:9:123:22 | getMapKey(...) | provenance | MaD:12 |
 | Test.java:128:16:128:23 | source(...) : Object | Test.java:129:26:129:27 | in : Object | provenance |  |
 | Test.java:129:4:129:6 | out [post update] : Cache [<map.value>] : Object | Test.java:130:21:130:23 | out : Cache [<map.value>] : Object | provenance |  |
-| Test.java:129:26:129:27 | in : Object | Test.java:129:4:129:6 | out [post update] : Cache [<map.value>] : Object | provenance | MaD:15 |
+| Test.java:129:26:129:27 | in : Object | Test.java:129:4:129:6 | out [post update] : Cache [<map.value>] : Object | provenance | MaD:17 |
 | Test.java:130:21:130:23 | out : Cache [<map.value>] : Object | Test.java:41:21:41:35 | container : Cache [<map.value>] : Object | provenance |  |
-| Test.java:130:21:130:23 | out : Cache [<map.value>] : Object | Test.java:130:9:130:24 | getMapValue(...) | provenance | MaD:8 |
+| Test.java:130:21:130:23 | out : Cache [<map.value>] : Object | Test.java:130:9:130:24 | getMapValue(...) | provenance | MaD:11 |
 | Test.java:135:15:135:44 | new DummyCache(...) : DummyCache [<map.value>] : Object | Test.java:136:10:136:11 | in : DummyCache [<map.value>] : Object | provenance |  |
 | Test.java:135:36:135:43 | source(...) : Object | Test.java:22:26:22:37 | value : Object | provenance |  |
-| Test.java:135:36:135:43 | source(...) : Object | Test.java:135:15:135:44 | new DummyCache(...) : DummyCache [<map.value>] : Object | provenance | MaD:12 |
-| Test.java:136:10:136:11 | in : DummyCache [<map.value>] : Object | Test.java:136:10:136:35 | putIfAbsent(...) : ValueWrapper [<map.value>] : Object | provenance | MaD:13 |
+| Test.java:135:36:135:43 | source(...) : Object | Test.java:135:15:135:44 | new DummyCache(...) : DummyCache [<map.value>] : Object | provenance | MaD:15 |
+| Test.java:136:10:136:11 | in : DummyCache [<map.value>] : Object | Test.java:136:10:136:35 | putIfAbsent(...) : ValueWrapper [<map.value>] : Object | provenance | MaD:18 |
 | Test.java:136:10:136:35 | putIfAbsent(...) : ValueWrapper [<map.value>] : Object | Test.java:137:21:137:23 | out : ValueWrapper [<map.value>] : Object | provenance |  |
 | Test.java:137:21:137:23 | out : ValueWrapper [<map.value>] : Object | Test.java:42:21:42:48 | container : ValueWrapper [<map.value>] : Object | provenance |  |
 | Test.java:137:21:137:23 | out : ValueWrapper [<map.value>] : Object | Test.java:137:9:137:24 | getMapValue(...) | provenance | MaD:3 |
-| Test.java:137:21:137:23 | out : ValueWrapper [<map.value>] : Object | Test.java:137:9:137:24 | getMapValue(...) | provenance | MaD:18 |
+| Test.java:137:21:137:23 | out : ValueWrapper [<map.value>] : Object | Test.java:137:9:137:24 | getMapValue(...) | provenance | MaD:8 |
 nodes
 | Test.java:13:3:13:14 | parameter this [Return] : ValueWrapper [<map.value>] : Object | semmle.label | parameter this [Return] : ValueWrapper [<map.value>] : Object |
 | Test.java:13:16:13:29 | element : Object | semmle.label | element : Object |
diff --git a/java/ql/test/library-tests/frameworks/spring/controller/test.ql b/java/ql/test/library-tests/frameworks/spring/controller/test.ql
index d8f6b13e870..e85137dcd57 100644
--- a/java/ql/test/library-tests/frameworks/spring/controller/test.ql
+++ b/java/ql/test/library-tests/frameworks/spring/controller/test.ql
@@ -3,7 +3,7 @@ import semmle.code.java.dataflow.FlowSources
 import TestUtilities.InlineFlowTest
 
 module ValueFlowConfig implements DataFlow::ConfigSig {
-  predicate isSource(DataFlow::Node source) { source instanceof ThreatModelFlowSource }
+  predicate isSource(DataFlow::Node source) { source instanceof ActiveThreatModelSource }
 
   predicate isSink(DataFlow::Node sink) {
     sink.asExpr().(Argument).getCall().getCallee().hasName("sink")
diff --git a/java/ql/test/library-tests/frameworks/spring/http/flow.expected b/java/ql/test/library-tests/frameworks/spring/http/flow.expected
index cdbb49eea8a..a9fe6c39bb4 100644
--- a/java/ql/test/library-tests/frameworks/spring/http/flow.expected
+++ b/java/ql/test/library-tests/frameworks/spring/http/flow.expected
@@ -1,6 +1,6 @@
 models
-| 1 | Summary: java.util; List; true; get; (int); ; Argument[this].Element; ReturnValue; value; manual |
-| 2 | Summary: java.util; List; false; of; (Object[]); ; Argument[0].ArrayElement; ReturnValue.Element; value; manual |
+| 1 | Summary: java.util; List; false; of; (Object[]); ; Argument[0].ArrayElement; ReturnValue.Element; value; manual |
+| 2 | Summary: java.util; List; true; get; (int); ; Argument[this].Element; ReturnValue; value; manual |
 | 3 | Summary: java.util; Map; true; get; ; ; Argument[this].MapValue; ReturnValue; value; manual |
 | 4 | Summary: java.util; Optional; false; of; ; ; Argument[0]; ReturnValue.Element; value; manual |
 | 5 | Summary: org.springframework.http; HttpEntity; true; HttpEntity; (MultiValueMap); ; Argument[0].MapKey; Argument[this]; taint; manual |
@@ -40,33 +40,33 @@ models
 | 39 | Summary: org.springframework.http; HttpHeaders; true; getValuesAsList; (String); ; Argument[this]; ReturnValue.Element; taint; manual |
 | 40 | Summary: org.springframework.http; HttpHeaders; true; getVary; (); ; Argument[this]; ReturnValue.Element; taint; manual |
 | 41 | Summary: org.springframework.http; RequestEntity; true; getUrl; (); ; Argument[this]; ReturnValue; taint; manual |
-| 42 | Summary: org.springframework.http; ResponseEntity; true; ResponseEntity; (MultiValueMap,HttpStatus); ; Argument[0].MapKey; Argument[this]; taint; manual |
-| 43 | Summary: org.springframework.http; ResponseEntity; true; ResponseEntity; (MultiValueMap,HttpStatus); ; Argument[0].MapValue.Element; Argument[this]; taint; manual |
-| 44 | Summary: org.springframework.http; ResponseEntity; true; ResponseEntity; (Object,HttpStatus); ; Argument[0]; Argument[this]; taint; manual |
-| 45 | Summary: org.springframework.http; ResponseEntity; true; ResponseEntity; (Object,MultiValueMap,HttpStatus); ; Argument[0]; Argument[this]; taint; manual |
-| 46 | Summary: org.springframework.http; ResponseEntity; true; ResponseEntity; (Object,MultiValueMap,HttpStatus); ; Argument[1].MapKey; Argument[this]; taint; manual |
-| 47 | Summary: org.springframework.http; ResponseEntity; true; ResponseEntity; (Object,MultiValueMap,HttpStatus); ; Argument[1].MapValue.Element; Argument[this]; taint; manual |
-| 48 | Summary: org.springframework.http; ResponseEntity; true; ResponseEntity; (Object,MultiValueMap,int); ; Argument[0]; Argument[this]; taint; manual |
-| 49 | Summary: org.springframework.http; ResponseEntity; true; ResponseEntity; (Object,MultiValueMap,int); ; Argument[1].MapKey; Argument[this]; taint; manual |
-| 50 | Summary: org.springframework.http; ResponseEntity; true; ResponseEntity; (Object,MultiValueMap,int); ; Argument[1].MapValue.Element; Argument[this]; taint; manual |
-| 51 | Summary: org.springframework.http; ResponseEntity; true; created; (URI); ; Argument[0]; ReturnValue; taint; manual |
-| 52 | Summary: org.springframework.http; ResponseEntity; true; of; (Optional); ; Argument[0].Element; ReturnValue; taint; manual |
-| 53 | Summary: org.springframework.http; ResponseEntity; true; ok; (Object); ; Argument[0]; ReturnValue; taint; manual |
-| 54 | Summary: org.springframework.http; ResponseEntity$BodyBuilder; true; body; (Object); ; Argument[this]; ReturnValue; taint; manual |
-| 55 | Summary: org.springframework.http; ResponseEntity$BodyBuilder; true; body; (Object); ; Argument[0]; ReturnValue; taint; manual |
-| 56 | Summary: org.springframework.http; ResponseEntity$BodyBuilder; true; contentType; (MediaType); ; Argument[this]; ReturnValue; value; manual |
-| 57 | Summary: org.springframework.http; ResponseEntity$HeadersBuilder; true; allow; (HttpMethod[]); ; Argument[this]; ReturnValue; value; manual |
-| 58 | Summary: org.springframework.http; ResponseEntity$HeadersBuilder; true; build; (); ; Argument[this]; ReturnValue; taint; manual |
-| 59 | Summary: org.springframework.http; ResponseEntity$HeadersBuilder; true; eTag; (String); ; Argument[this]; ReturnValue; value; manual |
-| 60 | Summary: org.springframework.http; ResponseEntity$HeadersBuilder; true; eTag; (String); ; Argument[0]; Argument[this]; taint; manual |
-| 61 | Summary: org.springframework.http; ResponseEntity$HeadersBuilder; true; header; (String,String[]); ; Argument[this]; ReturnValue; value; manual |
-| 62 | Summary: org.springframework.http; ResponseEntity$HeadersBuilder; true; header; (String,String[]); ; Argument[0]; Argument[this]; taint; manual |
-| 63 | Summary: org.springframework.http; ResponseEntity$HeadersBuilder; true; header; (String,String[]); ; Argument[1].ArrayElement; Argument[this]; taint; manual |
-| 64 | Summary: org.springframework.http; ResponseEntity$HeadersBuilder; true; headers; (HttpHeaders); ; Argument[this]; ReturnValue; value; manual |
-| 65 | Summary: org.springframework.http; ResponseEntity$HeadersBuilder; true; headers; (HttpHeaders); ; Argument[0]; Argument[this]; taint; manual |
-| 66 | Summary: org.springframework.http; ResponseEntity$HeadersBuilder; true; lastModified; ; ; Argument[this]; ReturnValue; value; manual |
-| 67 | Summary: org.springframework.http; ResponseEntity$HeadersBuilder; true; location; (URI); ; Argument[this]; ReturnValue; value; manual |
-| 68 | Summary: org.springframework.http; ResponseEntity$HeadersBuilder; true; location; (URI); ; Argument[0]; Argument[this]; taint; manual |
+| 42 | Summary: org.springframework.http; ResponseEntity$BodyBuilder; true; body; (Object); ; Argument[0]; ReturnValue; taint; manual |
+| 43 | Summary: org.springframework.http; ResponseEntity$BodyBuilder; true; body; (Object); ; Argument[this]; ReturnValue; taint; manual |
+| 44 | Summary: org.springframework.http; ResponseEntity$BodyBuilder; true; contentType; (MediaType); ; Argument[this]; ReturnValue; value; manual |
+| 45 | Summary: org.springframework.http; ResponseEntity$HeadersBuilder; true; allow; (HttpMethod[]); ; Argument[this]; ReturnValue; value; manual |
+| 46 | Summary: org.springframework.http; ResponseEntity$HeadersBuilder; true; build; (); ; Argument[this]; ReturnValue; taint; manual |
+| 47 | Summary: org.springframework.http; ResponseEntity$HeadersBuilder; true; eTag; (String); ; Argument[0]; Argument[this]; taint; manual |
+| 48 | Summary: org.springframework.http; ResponseEntity$HeadersBuilder; true; eTag; (String); ; Argument[this]; ReturnValue; value; manual |
+| 49 | Summary: org.springframework.http; ResponseEntity$HeadersBuilder; true; header; (String,String[]); ; Argument[0]; Argument[this]; taint; manual |
+| 50 | Summary: org.springframework.http; ResponseEntity$HeadersBuilder; true; header; (String,String[]); ; Argument[1].ArrayElement; Argument[this]; taint; manual |
+| 51 | Summary: org.springframework.http; ResponseEntity$HeadersBuilder; true; header; (String,String[]); ; Argument[this]; ReturnValue; value; manual |
+| 52 | Summary: org.springframework.http; ResponseEntity$HeadersBuilder; true; headers; (HttpHeaders); ; Argument[0]; Argument[this]; taint; manual |
+| 53 | Summary: org.springframework.http; ResponseEntity$HeadersBuilder; true; headers; (HttpHeaders); ; Argument[this]; ReturnValue; value; manual |
+| 54 | Summary: org.springframework.http; ResponseEntity$HeadersBuilder; true; lastModified; ; ; Argument[this]; ReturnValue; value; manual |
+| 55 | Summary: org.springframework.http; ResponseEntity$HeadersBuilder; true; location; (URI); ; Argument[0]; Argument[this]; taint; manual |
+| 56 | Summary: org.springframework.http; ResponseEntity$HeadersBuilder; true; location; (URI); ; Argument[this]; ReturnValue; value; manual |
+| 57 | Summary: org.springframework.http; ResponseEntity; true; ResponseEntity; (MultiValueMap,HttpStatus); ; Argument[0].MapKey; Argument[this]; taint; manual |
+| 58 | Summary: org.springframework.http; ResponseEntity; true; ResponseEntity; (MultiValueMap,HttpStatus); ; Argument[0].MapValue.Element; Argument[this]; taint; manual |
+| 59 | Summary: org.springframework.http; ResponseEntity; true; ResponseEntity; (Object,HttpStatus); ; Argument[0]; Argument[this]; taint; manual |
+| 60 | Summary: org.springframework.http; ResponseEntity; true; ResponseEntity; (Object,MultiValueMap,HttpStatus); ; Argument[0]; Argument[this]; taint; manual |
+| 61 | Summary: org.springframework.http; ResponseEntity; true; ResponseEntity; (Object,MultiValueMap,HttpStatus); ; Argument[1].MapKey; Argument[this]; taint; manual |
+| 62 | Summary: org.springframework.http; ResponseEntity; true; ResponseEntity; (Object,MultiValueMap,HttpStatus); ; Argument[1].MapValue.Element; Argument[this]; taint; manual |
+| 63 | Summary: org.springframework.http; ResponseEntity; true; ResponseEntity; (Object,MultiValueMap,int); ; Argument[0]; Argument[this]; taint; manual |
+| 64 | Summary: org.springframework.http; ResponseEntity; true; ResponseEntity; (Object,MultiValueMap,int); ; Argument[1].MapKey; Argument[this]; taint; manual |
+| 65 | Summary: org.springframework.http; ResponseEntity; true; ResponseEntity; (Object,MultiValueMap,int); ; Argument[1].MapValue.Element; Argument[this]; taint; manual |
+| 66 | Summary: org.springframework.http; ResponseEntity; true; created; (URI); ; Argument[0]; ReturnValue; taint; manual |
+| 67 | Summary: org.springframework.http; ResponseEntity; true; of; (Optional); ; Argument[0].Element; ReturnValue; taint; manual |
+| 68 | Summary: org.springframework.http; ResponseEntity; true; ok; (Object); ; Argument[0]; ReturnValue; taint; manual |
 | 69 | Summary: org.springframework.util; MultiValueMap; true; add; ; ; Argument[0]; Argument[this].MapKey; value; manual |
 | 70 | Summary: org.springframework.util; MultiValueMap; true; add; ; ; Argument[1]; Argument[this].MapValue.Element; value; manual |
 | 71 | Summary: org.springframework.util; MultiValueMap; true; addAll; (java.lang.Object,java.util.List); ; Argument[1].Element; Argument[this].MapValue.Element; value; manual |
@@ -99,49 +99,49 @@ edges
 | TestHttp.java:39:20:39:26 | taint(...) : String | TestHttp.java:45:48:45:48 | x : String | provenance |  |
 | TestHttp.java:39:20:39:26 | taint(...) : String | TestHttp.java:46:63:46:63 | x : String | provenance |  |
 | TestHttp.java:39:20:39:26 | taint(...) : String | TestHttp.java:50:46:50:46 | x : String | provenance |  |
-| TestHttp.java:40:32:40:32 | x : String | TestHttp.java:40:14:40:33 | ok(...) | provenance | MaD:53 |
-| TestHttp.java:41:32:41:45 | of(...) : Optional [<element>] : String | TestHttp.java:41:14:41:46 | of(...) | provenance | MaD:52 |
+| TestHttp.java:40:32:40:32 | x : String | TestHttp.java:40:14:40:33 | ok(...) | provenance | MaD:68 |
+| TestHttp.java:41:32:41:45 | of(...) : Optional [<element>] : String | TestHttp.java:41:14:41:46 | of(...) | provenance | MaD:67 |
 | TestHttp.java:41:44:41:44 | x : String | TestHttp.java:41:32:41:45 | of(...) : Optional [<element>] : String | provenance | MaD:4 |
-| TestHttp.java:43:66:43:66 | x : String | TestHttp.java:43:14:43:67 | body(...) | provenance | MaD:55 |
-| TestHttp.java:44:14:44:44 | created(...) : BodyBuilder | TestHttp.java:44:14:44:62 | contentType(...) : BodyBuilder | provenance | MaD:56 |
-| TestHttp.java:44:14:44:62 | contentType(...) : BodyBuilder | TestHttp.java:44:14:44:72 | body(...) | provenance | MaD:54 |
-| TestHttp.java:44:37:44:43 | taint(...) : URI | TestHttp.java:44:14:44:44 | created(...) : BodyBuilder | provenance | MaD:51 |
-| TestHttp.java:45:14:45:64 | header(...) : BodyBuilder | TestHttp.java:45:14:45:72 | build(...) | provenance | MaD:58 |
-| TestHttp.java:45:48:45:48 | x : String | TestHttp.java:45:14:45:64 | header(...) : BodyBuilder | provenance | MaD:62+MaD:61 |
-| TestHttp.java:46:14:46:64 | header(...) : BodyBuilder | TestHttp.java:46:14:46:72 | build(...) | provenance | MaD:58 |
-| TestHttp.java:46:14:46:64 | new ..[] { .. } : String[] [[]] : String | TestHttp.java:46:14:46:64 | header(...) : BodyBuilder | provenance | MaD:63+MaD:61 |
+| TestHttp.java:43:66:43:66 | x : String | TestHttp.java:43:14:43:67 | body(...) | provenance | MaD:42 |
+| TestHttp.java:44:14:44:44 | created(...) : BodyBuilder | TestHttp.java:44:14:44:62 | contentType(...) : BodyBuilder | provenance | MaD:44 |
+| TestHttp.java:44:14:44:62 | contentType(...) : BodyBuilder | TestHttp.java:44:14:44:72 | body(...) | provenance | MaD:43 |
+| TestHttp.java:44:37:44:43 | taint(...) : URI | TestHttp.java:44:14:44:44 | created(...) : BodyBuilder | provenance | MaD:66 |
+| TestHttp.java:45:14:45:64 | header(...) : BodyBuilder | TestHttp.java:45:14:45:72 | build(...) | provenance | MaD:46 |
+| TestHttp.java:45:48:45:48 | x : String | TestHttp.java:45:14:45:64 | header(...) : BodyBuilder | provenance | MaD:49+MaD:51 |
+| TestHttp.java:46:14:46:64 | header(...) : BodyBuilder | TestHttp.java:46:14:46:72 | build(...) | provenance | MaD:46 |
+| TestHttp.java:46:14:46:64 | new ..[] { .. } : String[] [[]] : String | TestHttp.java:46:14:46:64 | header(...) : BodyBuilder | provenance | MaD:50+MaD:51 |
 | TestHttp.java:46:63:46:63 | x : String | TestHttp.java:46:14:46:64 | new ..[] { .. } : String[] [[]] : String | provenance |  |
 | TestHttp.java:48:9:48:9 | h [post update] : HttpHeaders | TestHttp.java:49:49:49:49 | h : HttpHeaders | provenance |  |
 | TestHttp.java:48:20:48:26 | taint(...) : String | TestHttp.java:48:9:48:9 | h [post update] : HttpHeaders | provenance | MaD:14 |
-| TestHttp.java:49:14:49:50 | headers(...) : BodyBuilder | TestHttp.java:49:14:49:58 | allow(...) : BodyBuilder | provenance | MaD:57 |
-| TestHttp.java:49:14:49:58 | allow(...) : BodyBuilder | TestHttp.java:49:14:49:66 | build(...) | provenance | MaD:58 |
-| TestHttp.java:49:49:49:49 | h : HttpHeaders | TestHttp.java:49:14:49:50 | headers(...) : BodyBuilder | provenance | MaD:65+MaD:64 |
-| TestHttp.java:50:14:50:47 | eTag(...) : BodyBuilder | TestHttp.java:50:14:50:55 | allow(...) : BodyBuilder | provenance | MaD:57 |
-| TestHttp.java:50:14:50:55 | allow(...) : BodyBuilder | TestHttp.java:50:14:50:63 | build(...) | provenance | MaD:58 |
-| TestHttp.java:50:46:50:46 | x : String | TestHttp.java:50:14:50:47 | eTag(...) : BodyBuilder | provenance | MaD:60+MaD:59 |
-| TestHttp.java:51:14:51:57 | location(...) : BodyBuilder | TestHttp.java:51:14:51:80 | lastModified(...) : BodyBuilder | provenance | MaD:66 |
-| TestHttp.java:51:14:51:80 | lastModified(...) : BodyBuilder | TestHttp.java:51:14:51:88 | build(...) | provenance | MaD:58 |
-| TestHttp.java:51:50:51:56 | taint(...) : URI | TestHttp.java:51:14:51:57 | location(...) : BodyBuilder | provenance | MaD:68+MaD:67 |
+| TestHttp.java:49:14:49:50 | headers(...) : BodyBuilder | TestHttp.java:49:14:49:58 | allow(...) : BodyBuilder | provenance | MaD:45 |
+| TestHttp.java:49:14:49:58 | allow(...) : BodyBuilder | TestHttp.java:49:14:49:66 | build(...) | provenance | MaD:46 |
+| TestHttp.java:49:49:49:49 | h : HttpHeaders | TestHttp.java:49:14:49:50 | headers(...) : BodyBuilder | provenance | MaD:52+MaD:53 |
+| TestHttp.java:50:14:50:47 | eTag(...) : BodyBuilder | TestHttp.java:50:14:50:55 | allow(...) : BodyBuilder | provenance | MaD:45 |
+| TestHttp.java:50:14:50:55 | allow(...) : BodyBuilder | TestHttp.java:50:14:50:63 | build(...) | provenance | MaD:46 |
+| TestHttp.java:50:46:50:46 | x : String | TestHttp.java:50:14:50:47 | eTag(...) : BodyBuilder | provenance | MaD:47+MaD:48 |
+| TestHttp.java:51:14:51:57 | location(...) : BodyBuilder | TestHttp.java:51:14:51:80 | lastModified(...) : BodyBuilder | provenance | MaD:54 |
+| TestHttp.java:51:14:51:80 | lastModified(...) : BodyBuilder | TestHttp.java:51:14:51:88 | build(...) | provenance | MaD:46 |
+| TestHttp.java:51:50:51:56 | taint(...) : URI | TestHttp.java:51:14:51:57 | location(...) : BodyBuilder | provenance | MaD:55+MaD:56 |
 | TestHttp.java:56:20:56:26 | taint(...) : String | TestHttp.java:59:33:59:33 | x : String | provenance |  |
 | TestHttp.java:56:20:56:26 | taint(...) : String | TestHttp.java:60:33:60:33 | x : String | provenance |  |
 | TestHttp.java:56:20:56:26 | taint(...) : String | TestHttp.java:61:33:61:33 | x : String | provenance |  |
-| TestHttp.java:59:33:59:33 | x : String | TestHttp.java:59:14:59:55 | new ResponseEntity<>(...) | provenance | MaD:44 |
-| TestHttp.java:60:33:60:33 | x : String | TestHttp.java:60:14:60:59 | new ResponseEntity<>(...) | provenance | MaD:45 |
-| TestHttp.java:61:33:61:33 | x : String | TestHttp.java:61:14:61:43 | new ResponseEntity<>(...) | provenance | MaD:48 |
+| TestHttp.java:59:33:59:33 | x : String | TestHttp.java:59:14:59:55 | new ResponseEntity<>(...) | provenance | MaD:59 |
+| TestHttp.java:60:33:60:33 | x : String | TestHttp.java:60:14:60:59 | new ResponseEntity<>(...) | provenance | MaD:60 |
+| TestHttp.java:61:33:61:33 | x : String | TestHttp.java:61:14:61:43 | new ResponseEntity<>(...) | provenance | MaD:63 |
 | TestHttp.java:63:9:63:10 | m1 [post update] : LinkedMultiValueMap [<map.value>, <element>] : String | TestHttp.java:64:38:64:39 | m1 : LinkedMultiValueMap [<map.value>, <element>] : String | provenance |  |
 | TestHttp.java:63:9:63:10 | m1 [post update] : LinkedMultiValueMap [<map.value>, <element>] : String | TestHttp.java:65:41:65:42 | m1 : LinkedMultiValueMap [<map.value>, <element>] : String | provenance |  |
 | TestHttp.java:63:9:63:10 | m1 [post update] : LinkedMultiValueMap [<map.value>, <element>] : String | TestHttp.java:66:38:66:39 | m1 : LinkedMultiValueMap [<map.value>, <element>] : String | provenance |  |
 | TestHttp.java:63:21:63:27 | taint(...) : String | TestHttp.java:63:9:63:10 | m1 [post update] : LinkedMultiValueMap [<map.value>, <element>] : String | provenance | MaD:70 |
-| TestHttp.java:64:38:64:39 | m1 : LinkedMultiValueMap [<map.value>, <element>] : String | TestHttp.java:64:14:64:61 | new ResponseEntity<>(...) | provenance | MaD:47 |
-| TestHttp.java:65:41:65:42 | m1 : LinkedMultiValueMap [<map.value>, <element>] : String | TestHttp.java:65:14:65:64 | new ResponseEntity<String>(...) | provenance | MaD:43 |
-| TestHttp.java:66:38:66:39 | m1 : LinkedMultiValueMap [<map.value>, <element>] : String | TestHttp.java:66:14:66:45 | new ResponseEntity<>(...) | provenance | MaD:50 |
+| TestHttp.java:64:38:64:39 | m1 : LinkedMultiValueMap [<map.value>, <element>] : String | TestHttp.java:64:14:64:61 | new ResponseEntity<>(...) | provenance | MaD:62 |
+| TestHttp.java:65:41:65:42 | m1 : LinkedMultiValueMap [<map.value>, <element>] : String | TestHttp.java:65:14:65:64 | new ResponseEntity<String>(...) | provenance | MaD:58 |
+| TestHttp.java:66:38:66:39 | m1 : LinkedMultiValueMap [<map.value>, <element>] : String | TestHttp.java:66:14:66:45 | new ResponseEntity<>(...) | provenance | MaD:65 |
 | TestHttp.java:69:9:69:10 | m2 [post update] : LinkedMultiValueMap [<map.key>] : String | TestHttp.java:70:38:70:39 | m2 : LinkedMultiValueMap [<map.key>] : String | provenance |  |
 | TestHttp.java:69:9:69:10 | m2 [post update] : LinkedMultiValueMap [<map.key>] : String | TestHttp.java:71:41:71:42 | m2 : LinkedMultiValueMap [<map.key>] : String | provenance |  |
 | TestHttp.java:69:9:69:10 | m2 [post update] : LinkedMultiValueMap [<map.key>] : String | TestHttp.java:72:38:72:39 | m2 : LinkedMultiValueMap [<map.key>] : String | provenance |  |
 | TestHttp.java:69:16:69:22 | taint(...) : String | TestHttp.java:69:9:69:10 | m2 [post update] : LinkedMultiValueMap [<map.key>] : String | provenance | MaD:69 |
-| TestHttp.java:70:38:70:39 | m2 : LinkedMultiValueMap [<map.key>] : String | TestHttp.java:70:14:70:61 | new ResponseEntity<>(...) | provenance | MaD:46 |
-| TestHttp.java:71:41:71:42 | m2 : LinkedMultiValueMap [<map.key>] : String | TestHttp.java:71:14:71:64 | new ResponseEntity<String>(...) | provenance | MaD:42 |
-| TestHttp.java:72:38:72:39 | m2 : LinkedMultiValueMap [<map.key>] : String | TestHttp.java:72:14:72:45 | new ResponseEntity<>(...) | provenance | MaD:49 |
+| TestHttp.java:70:38:70:39 | m2 : LinkedMultiValueMap [<map.key>] : String | TestHttp.java:70:14:70:61 | new ResponseEntity<>(...) | provenance | MaD:61 |
+| TestHttp.java:71:41:71:42 | m2 : LinkedMultiValueMap [<map.key>] : String | TestHttp.java:71:14:71:64 | new ResponseEntity<String>(...) | provenance | MaD:57 |
+| TestHttp.java:72:38:72:39 | m2 : LinkedMultiValueMap [<map.key>] : String | TestHttp.java:72:14:72:45 | new ResponseEntity<>(...) | provenance | MaD:64 |
 | TestHttp.java:74:38:74:44 | taint(...) : ResponseEntity | TestHttp.java:75:14:75:16 | ent : ResponseEntity | provenance |  |
 | TestHttp.java:74:38:74:44 | taint(...) : ResponseEntity | TestHttp.java:76:14:76:16 | ent : ResponseEntity | provenance |  |
 | TestHttp.java:75:14:75:16 | ent : ResponseEntity | TestHttp.java:75:14:75:26 | getBody(...) | provenance | MaD:10 |
@@ -174,7 +174,7 @@ edges
 | TestHttp.java:109:9:109:10 | h6 [post update] : HttpHeaders [<map.value>, <element>] : Object | TestHttp.java:110:14:110:15 | h6 | provenance |  |
 | TestHttp.java:109:24:109:39 | of(...) : List [<element>] : Object | TestHttp.java:109:9:109:10 | h6 [post update] : HttpHeaders | provenance | MaD:18 |
 | TestHttp.java:109:24:109:39 | of(...) : List [<element>] : Object | TestHttp.java:109:9:109:10 | h6 [post update] : HttpHeaders [<map.value>, <element>] : Object | provenance | MaD:71 |
-| TestHttp.java:109:32:109:38 | taint(...) : String[] | TestHttp.java:109:24:109:39 | of(...) : List [<element>] : Object | provenance | MaD:2 |
+| TestHttp.java:109:32:109:38 | taint(...) : String[] | TestHttp.java:109:24:109:39 | of(...) : List [<element>] : Object | provenance | MaD:1 |
 | TestHttp.java:112:40:112:41 | m1 : LinkedMultiValueMap [<map.value>, <element>] : String | TestHttp.java:112:14:112:42 | formatHeaders(...) | provenance | MaD:21 |
 | TestHttp.java:113:40:113:41 | m2 : LinkedMultiValueMap [<map.key>] : String | TestHttp.java:113:14:113:42 | formatHeaders(...) | provenance | MaD:20 |
 | TestHttp.java:115:42:115:48 | taint(...) : String | TestHttp.java:115:14:115:60 | encodeBasicAuth(...) | provenance | MaD:19 |
@@ -200,36 +200,36 @@ edges
 | TestHttp.java:120:25:120:31 | taint(...) : HttpHeaders | TestHttp.java:160:14:160:14 | h : HttpHeaders | provenance |  |
 | TestHttp.java:122:14:122:14 | h : HttpHeaders | TestHttp.java:122:14:122:24 | get(...) : List | provenance | MaD:3 |
 | TestHttp.java:122:14:122:14 | h : HttpHeaders | TestHttp.java:122:14:122:24 | get(...) : List [<element>] : Object | provenance | MaD:22 |
-| TestHttp.java:122:14:122:24 | get(...) : List | TestHttp.java:122:14:122:31 | get(...) | provenance | MaD:1 |
-| TestHttp.java:122:14:122:24 | get(...) : List [<element>] : Object | TestHttp.java:122:14:122:31 | get(...) | provenance | MaD:1 |
+| TestHttp.java:122:14:122:24 | get(...) : List | TestHttp.java:122:14:122:31 | get(...) | provenance | MaD:2 |
+| TestHttp.java:122:14:122:24 | get(...) : List [<element>] : Object | TestHttp.java:122:14:122:31 | get(...) | provenance | MaD:2 |
 | TestHttp.java:128:14:128:14 | h : HttpHeaders | TestHttp.java:128:14:128:45 | getAccessControlAllowHeaders(...) : List [<element>] : Object | provenance | MaD:23 |
-| TestHttp.java:128:14:128:45 | getAccessControlAllowHeaders(...) : List [<element>] : Object | TestHttp.java:128:14:128:52 | get(...) | provenance | MaD:1 |
+| TestHttp.java:128:14:128:45 | getAccessControlAllowHeaders(...) : List [<element>] : Object | TestHttp.java:128:14:128:52 | get(...) | provenance | MaD:2 |
 | TestHttp.java:130:14:130:14 | h : HttpHeaders | TestHttp.java:130:14:130:44 | getAccessControlAllowOrigin(...) | provenance | MaD:24 |
 | TestHttp.java:131:14:131:14 | h : HttpHeaders | TestHttp.java:131:14:131:46 | getAccessControlExposeHeaders(...) : List [<element>] : Object | provenance | MaD:25 |
-| TestHttp.java:131:14:131:46 | getAccessControlExposeHeaders(...) : List [<element>] : Object | TestHttp.java:131:14:131:53 | get(...) | provenance | MaD:1 |
+| TestHttp.java:131:14:131:46 | getAccessControlExposeHeaders(...) : List [<element>] : Object | TestHttp.java:131:14:131:53 | get(...) | provenance | MaD:2 |
 | TestHttp.java:133:14:133:14 | h : HttpHeaders | TestHttp.java:133:14:133:47 | getAccessControlRequestHeaders(...) : List [<element>] : Object | provenance | MaD:26 |
-| TestHttp.java:133:14:133:47 | getAccessControlRequestHeaders(...) : List [<element>] : Object | TestHttp.java:133:14:133:54 | get(...) | provenance | MaD:1 |
+| TestHttp.java:133:14:133:47 | getAccessControlRequestHeaders(...) : List [<element>] : Object | TestHttp.java:133:14:133:54 | get(...) | provenance | MaD:2 |
 | TestHttp.java:136:14:136:14 | h : HttpHeaders | TestHttp.java:136:14:136:32 | getCacheControl(...) | provenance | MaD:27 |
 | TestHttp.java:137:14:137:14 | h : HttpHeaders | TestHttp.java:137:14:137:30 | getConnection(...) : List [<element>] : Object | provenance | MaD:28 |
-| TestHttp.java:137:14:137:30 | getConnection(...) : List [<element>] : Object | TestHttp.java:137:14:137:37 | get(...) | provenance | MaD:1 |
+| TestHttp.java:137:14:137:30 | getConnection(...) : List [<element>] : Object | TestHttp.java:137:14:137:37 | get(...) | provenance | MaD:2 |
 | TestHttp.java:143:14:143:14 | h : HttpHeaders | TestHttp.java:143:14:143:24 | getETag(...) | provenance | MaD:29 |
 | TestHttp.java:145:14:145:14 | h : HttpHeaders | TestHttp.java:145:14:145:28 | getFirst(...) | provenance | MaD:30 |
 | TestHttp.java:145:14:145:14 | h : HttpHeaders | TestHttp.java:145:14:145:28 | getFirst(...) | provenance | MaD:73 |
 | TestHttp.java:148:14:148:14 | h : HttpHeaders | TestHttp.java:148:14:148:24 | getHost(...) | provenance | MaD:31 |
 | TestHttp.java:149:14:149:14 | h : HttpHeaders | TestHttp.java:149:14:149:27 | getIfMatch(...) : List [<element>] : Object | provenance | MaD:32 |
-| TestHttp.java:149:14:149:27 | getIfMatch(...) : List [<element>] : Object | TestHttp.java:149:14:149:34 | get(...) | provenance | MaD:1 |
+| TestHttp.java:149:14:149:27 | getIfMatch(...) : List [<element>] : Object | TestHttp.java:149:14:149:34 | get(...) | provenance | MaD:2 |
 | TestHttp.java:151:14:151:14 | h : HttpHeaders | TestHttp.java:151:14:151:31 | getIfNoneMatch(...) : List [<element>] : Object | provenance | MaD:33 |
-| TestHttp.java:151:14:151:31 | getIfNoneMatch(...) : List [<element>] : Object | TestHttp.java:151:14:151:38 | get(...) | provenance | MaD:1 |
+| TestHttp.java:151:14:151:31 | getIfNoneMatch(...) : List [<element>] : Object | TestHttp.java:151:14:151:38 | get(...) | provenance | MaD:2 |
 | TestHttp.java:154:14:154:14 | h : HttpHeaders | TestHttp.java:154:14:154:28 | getLocation(...) | provenance | MaD:34 |
 | TestHttp.java:155:14:155:14 | h : HttpHeaders | TestHttp.java:155:14:155:30 | getOrEmpty(...) : List [<element>] : Object | provenance | MaD:35 |
-| TestHttp.java:155:14:155:30 | getOrEmpty(...) : List [<element>] : Object | TestHttp.java:155:14:155:37 | get(...) | provenance | MaD:1 |
+| TestHttp.java:155:14:155:30 | getOrEmpty(...) : List [<element>] : Object | TestHttp.java:155:14:155:37 | get(...) | provenance | MaD:2 |
 | TestHttp.java:156:14:156:14 | h : HttpHeaders | TestHttp.java:156:14:156:26 | getOrigin(...) | provenance | MaD:36 |
 | TestHttp.java:157:14:157:14 | h : HttpHeaders | TestHttp.java:157:14:157:26 | getPragma(...) | provenance | MaD:37 |
 | TestHttp.java:158:14:158:14 | h : HttpHeaders | TestHttp.java:158:14:158:27 | getUpgrade(...) | provenance | MaD:38 |
 | TestHttp.java:159:14:159:14 | h : HttpHeaders | TestHttp.java:159:14:159:35 | getValuesAsList(...) : List [<element>] : Object | provenance | MaD:39 |
-| TestHttp.java:159:14:159:35 | getValuesAsList(...) : List [<element>] : Object | TestHttp.java:159:14:159:42 | get(...) | provenance | MaD:1 |
+| TestHttp.java:159:14:159:35 | getValuesAsList(...) : List [<element>] : Object | TestHttp.java:159:14:159:42 | get(...) | provenance | MaD:2 |
 | TestHttp.java:160:14:160:14 | h : HttpHeaders | TestHttp.java:160:14:160:24 | getVary(...) : List [<element>] : Object | provenance | MaD:40 |
-| TestHttp.java:160:14:160:24 | getVary(...) : List [<element>] : Object | TestHttp.java:160:14:160:31 | get(...) | provenance | MaD:1 |
+| TestHttp.java:160:14:160:24 | getVary(...) : List [<element>] : Object | TestHttp.java:160:14:160:31 | get(...) | provenance | MaD:2 |
 nodes
 | TestHttp.java:16:20:16:26 | taint(...) : String | semmle.label | taint(...) : String |
 | TestHttp.java:17:14:17:30 | new HttpEntity<>(...) | semmle.label | new HttpEntity<>(...) |
diff --git a/java/ql/test/library-tests/frameworks/spring/ui/test.expected b/java/ql/test/library-tests/frameworks/spring/ui/test.expected
index 84550537cfe..464372983a3 100644
--- a/java/ql/test/library-tests/frameworks/spring/ui/test.expected
+++ b/java/ql/test/library-tests/frameworks/spring/ui/test.expected
@@ -2,58 +2,58 @@ models
 | 1 | Summary: java.lang; Iterable; true; iterator; (); ; Argument[this].Element; ReturnValue.Element; value; manual |
 | 2 | Summary: java.util; Iterator; true; next; ; ; Argument[this].Element; ReturnValue; value; manual |
 | 3 | Summary: java.util; List; false; of; (Object); ; Argument[0]; ReturnValue.Element; value; manual |
-| 4 | Summary: java.util; Map; true; get; ; ; Argument[this].MapValue; ReturnValue; value; manual |
-| 5 | Summary: java.util; Map; true; keySet; (); ; Argument[this].MapKey; ReturnValue.Element; value; manual |
-| 6 | Summary: java.util; Map; false; of; ; ; Argument[0]; ReturnValue.MapKey; value; manual |
-| 7 | Summary: java.util; Map; false; of; ; ; Argument[1]; ReturnValue.MapValue; value; manual |
+| 4 | Summary: java.util; Map; false; of; ; ; Argument[0]; ReturnValue.MapKey; value; manual |
+| 5 | Summary: java.util; Map; false; of; ; ; Argument[1]; ReturnValue.MapValue; value; manual |
+| 6 | Summary: java.util; Map; true; get; ; ; Argument[this].MapValue; ReturnValue; value; manual |
+| 7 | Summary: java.util; Map; true; keySet; (); ; Argument[this].MapKey; ReturnValue.Element; value; manual |
 | 8 | Summary: org.springframework.ui; ConcurrentModel; false; ConcurrentModel; (Object); ; Argument[0]; Argument[this].MapValue; value; manual |
 | 9 | Summary: org.springframework.ui; ConcurrentModel; false; ConcurrentModel; (String,Object); ; Argument[0]; Argument[this].MapKey; value; manual |
 | 10 | Summary: org.springframework.ui; ConcurrentModel; false; ConcurrentModel; (String,Object); ; Argument[1]; Argument[this].MapValue; value; manual |
-| 11 | Summary: org.springframework.ui; Model; true; addAllAttributes; ; ; Argument[this]; ReturnValue; value; manual |
-| 12 | Summary: org.springframework.ui; Model; true; addAllAttributes; (Collection); ; Argument[0].Element; Argument[this].MapValue; value; manual |
-| 13 | Summary: org.springframework.ui; Model; true; addAllAttributes; (Map); ; Argument[0].MapKey; Argument[this].MapKey; value; manual |
-| 14 | Summary: org.springframework.ui; Model; true; addAllAttributes; (Map); ; Argument[0].MapValue; Argument[this].MapValue; value; manual |
-| 15 | Summary: org.springframework.ui; Model; true; addAttribute; ; ; Argument[this]; ReturnValue; value; manual |
-| 16 | Summary: org.springframework.ui; Model; true; addAttribute; (Object); ; Argument[0]; Argument[this].MapValue; value; manual |
-| 17 | Summary: org.springframework.ui; Model; true; addAttribute; (String,Object); ; Argument[0]; Argument[this].MapKey; value; manual |
-| 18 | Summary: org.springframework.ui; Model; true; addAttribute; (String,Object); ; Argument[1]; Argument[this].MapValue; value; manual |
+| 11 | Summary: org.springframework.ui; Model; true; addAllAttributes; (Collection); ; Argument[0].Element; Argument[this].MapValue; value; manual |
+| 12 | Summary: org.springframework.ui; Model; true; addAllAttributes; (Map); ; Argument[0].MapKey; Argument[this].MapKey; value; manual |
+| 13 | Summary: org.springframework.ui; Model; true; addAllAttributes; (Map); ; Argument[0].MapValue; Argument[this].MapValue; value; manual |
+| 14 | Summary: org.springframework.ui; Model; true; addAllAttributes; ; ; Argument[this]; ReturnValue; value; manual |
+| 15 | Summary: org.springframework.ui; Model; true; addAttribute; (Object); ; Argument[0]; Argument[this].MapValue; value; manual |
+| 16 | Summary: org.springframework.ui; Model; true; addAttribute; (String,Object); ; Argument[0]; Argument[this].MapKey; value; manual |
+| 17 | Summary: org.springframework.ui; Model; true; addAttribute; (String,Object); ; Argument[1]; Argument[this].MapValue; value; manual |
+| 18 | Summary: org.springframework.ui; Model; true; addAttribute; ; ; Argument[this]; ReturnValue; value; manual |
 | 19 | Summary: org.springframework.ui; Model; true; asMap; ; ; Argument[this].MapKey; ReturnValue.MapKey; value; manual |
 | 20 | Summary: org.springframework.ui; Model; true; asMap; ; ; Argument[this].MapValue; ReturnValue.MapValue; value; manual |
 | 21 | Summary: org.springframework.ui; Model; true; getAttribute; ; ; Argument[this].MapValue; ReturnValue; value; manual |
-| 22 | Summary: org.springframework.ui; Model; true; mergeAttributes; ; ; Argument[this]; ReturnValue; value; manual |
-| 23 | Summary: org.springframework.ui; Model; true; mergeAttributes; ; ; Argument[0].MapKey; Argument[this].MapKey; value; manual |
-| 24 | Summary: org.springframework.ui; Model; true; mergeAttributes; ; ; Argument[0].MapValue; Argument[this].MapValue; value; manual |
+| 22 | Summary: org.springframework.ui; Model; true; mergeAttributes; ; ; Argument[0].MapKey; Argument[this].MapKey; value; manual |
+| 23 | Summary: org.springframework.ui; Model; true; mergeAttributes; ; ; Argument[0].MapValue; Argument[this].MapValue; value; manual |
+| 24 | Summary: org.springframework.ui; Model; true; mergeAttributes; ; ; Argument[this]; ReturnValue; value; manual |
 | 25 | Summary: org.springframework.ui; ModelMap; false; ModelMap; (Object); ; Argument[0]; Argument[this].MapValue; value; manual |
 | 26 | Summary: org.springframework.ui; ModelMap; false; ModelMap; (String,Object); ; Argument[0]; Argument[this].MapKey; value; manual |
 | 27 | Summary: org.springframework.ui; ModelMap; false; ModelMap; (String,Object); ; Argument[1]; Argument[this].MapValue; value; manual |
-| 28 | Summary: org.springframework.ui; ModelMap; false; addAllAttributes; ; ; Argument[this]; ReturnValue; value; manual |
-| 29 | Summary: org.springframework.ui; ModelMap; false; addAllAttributes; (Collection); ; Argument[0].Element; Argument[this].MapValue; value; manual |
-| 30 | Summary: org.springframework.ui; ModelMap; false; addAllAttributes; (Map); ; Argument[0].MapKey; Argument[this].MapKey; value; manual |
-| 31 | Summary: org.springframework.ui; ModelMap; false; addAllAttributes; (Map); ; Argument[0].MapValue; Argument[this].MapValue; value; manual |
-| 32 | Summary: org.springframework.ui; ModelMap; false; addAttribute; ; ; Argument[this]; ReturnValue; value; manual |
-| 33 | Summary: org.springframework.ui; ModelMap; false; addAttribute; (Object); ; Argument[0]; Argument[this].MapValue; value; manual |
-| 34 | Summary: org.springframework.ui; ModelMap; false; addAttribute; (String,Object); ; Argument[0]; Argument[this].MapKey; value; manual |
-| 35 | Summary: org.springframework.ui; ModelMap; false; addAttribute; (String,Object); ; Argument[1]; Argument[this].MapValue; value; manual |
+| 28 | Summary: org.springframework.ui; ModelMap; false; addAllAttributes; (Collection); ; Argument[0].Element; Argument[this].MapValue; value; manual |
+| 29 | Summary: org.springframework.ui; ModelMap; false; addAllAttributes; (Map); ; Argument[0].MapKey; Argument[this].MapKey; value; manual |
+| 30 | Summary: org.springframework.ui; ModelMap; false; addAllAttributes; (Map); ; Argument[0].MapValue; Argument[this].MapValue; value; manual |
+| 31 | Summary: org.springframework.ui; ModelMap; false; addAllAttributes; ; ; Argument[this]; ReturnValue; value; manual |
+| 32 | Summary: org.springframework.ui; ModelMap; false; addAttribute; (Object); ; Argument[0]; Argument[this].MapValue; value; manual |
+| 33 | Summary: org.springframework.ui; ModelMap; false; addAttribute; (String,Object); ; Argument[0]; Argument[this].MapKey; value; manual |
+| 34 | Summary: org.springframework.ui; ModelMap; false; addAttribute; (String,Object); ; Argument[1]; Argument[this].MapValue; value; manual |
+| 35 | Summary: org.springframework.ui; ModelMap; false; addAttribute; ; ; Argument[this]; ReturnValue; value; manual |
 | 36 | Summary: org.springframework.ui; ModelMap; false; getAttribute; ; ; Argument[this].MapValue; ReturnValue; value; manual |
-| 37 | Summary: org.springframework.ui; ModelMap; false; mergeAttributes; ; ; Argument[this]; ReturnValue; value; manual |
-| 38 | Summary: org.springframework.ui; ModelMap; false; mergeAttributes; ; ; Argument[0].MapKey; Argument[this].MapKey; value; manual |
-| 39 | Summary: org.springframework.ui; ModelMap; false; mergeAttributes; ; ; Argument[0].MapValue; Argument[this].MapValue; value; manual |
+| 37 | Summary: org.springframework.ui; ModelMap; false; mergeAttributes; ; ; Argument[0].MapKey; Argument[this].MapKey; value; manual |
+| 38 | Summary: org.springframework.ui; ModelMap; false; mergeAttributes; ; ; Argument[0].MapValue; Argument[this].MapValue; value; manual |
+| 39 | Summary: org.springframework.ui; ModelMap; false; mergeAttributes; ; ; Argument[this]; ReturnValue; value; manual |
 edges
 | Test.java:13:18:13:35 | container : Map [<map.key>] : String | Test.java:13:47:13:55 | container : Map [<map.key>] : String | provenance |  |
-| Test.java:13:47:13:55 | container : Map [<map.key>] : String | Test.java:13:47:13:64 | keySet(...) : Set [<element>] : String | provenance | MaD:5 |
+| Test.java:13:47:13:55 | container : Map [<map.key>] : String | Test.java:13:47:13:64 | keySet(...) : Set [<element>] : String | provenance | MaD:7 |
 | Test.java:13:47:13:64 | keySet(...) : Set [<element>] : String | Test.java:13:47:13:75 | iterator(...) : Iterator [<element>] : String | provenance | MaD:1 |
 | Test.java:13:47:13:75 | iterator(...) : Iterator [<element>] : String | Test.java:13:47:13:82 | next(...) : String | provenance | MaD:2 |
 | Test.java:14:20:14:37 | container : Map [<map.value>] : Object | Test.java:14:49:14:57 | container : Map [<map.value>] : Object | provenance |  |
-| Test.java:14:49:14:57 | container : Map [<map.value>] : Object | Test.java:14:49:14:67 | get(...) : Object | provenance | MaD:4 |
+| Test.java:14:49:14:57 | container : Map [<map.value>] : Object | Test.java:14:49:14:67 | get(...) : Object | provenance | MaD:6 |
 | Test.java:15:19:15:33 | container : ConcurrentModel [<map.key>] : String | Test.java:15:45:15:53 | container : ConcurrentModel [<map.key>] : String | provenance |  |
 | Test.java:15:19:15:33 | container : Model [<map.key>] : Object | Test.java:15:45:15:53 | container : Model [<map.key>] : Object | provenance |  |
 | Test.java:15:19:15:33 | container : Model [<map.key>] : String | Test.java:15:45:15:53 | container : Model [<map.key>] : String | provenance |  |
 | Test.java:15:45:15:53 | container : ConcurrentModel [<map.key>] : String | Test.java:15:45:15:61 | asMap(...) : Map [<map.key>] : String | provenance | MaD:19 |
 | Test.java:15:45:15:53 | container : Model [<map.key>] : Object | Test.java:15:45:15:61 | asMap(...) : Map [<map.key>] : Object | provenance | MaD:19 |
 | Test.java:15:45:15:53 | container : Model [<map.key>] : String | Test.java:15:45:15:61 | asMap(...) : Map [<map.key>] : String | provenance | MaD:19 |
-| Test.java:15:45:15:61 | asMap(...) : Map [<map.key>] : Object | Test.java:15:45:15:70 | keySet(...) : Set [<element>] : Object | provenance | MaD:5 |
-| Test.java:15:45:15:61 | asMap(...) : Map [<map.key>] : String | Test.java:15:45:15:70 | keySet(...) : Set [<element>] : String | provenance | MaD:5 |
-| Test.java:15:45:15:61 | asMap(...) : Map [<map.key>] : String | Test.java:15:45:15:70 | keySet(...) : Set [<element>] : String | provenance | MaD:5 |
+| Test.java:15:45:15:61 | asMap(...) : Map [<map.key>] : Object | Test.java:15:45:15:70 | keySet(...) : Set [<element>] : Object | provenance | MaD:7 |
+| Test.java:15:45:15:61 | asMap(...) : Map [<map.key>] : String | Test.java:15:45:15:70 | keySet(...) : Set [<element>] : String | provenance | MaD:7 |
+| Test.java:15:45:15:61 | asMap(...) : Map [<map.key>] : String | Test.java:15:45:15:70 | keySet(...) : Set [<element>] : String | provenance | MaD:7 |
 | Test.java:15:45:15:70 | keySet(...) : Set [<element>] : Object | Test.java:15:45:15:81 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:1 |
 | Test.java:15:45:15:70 | keySet(...) : Set [<element>] : String | Test.java:15:45:15:81 | iterator(...) : Iterator [<element>] : String | provenance | MaD:1 |
 | Test.java:15:45:15:70 | keySet(...) : Set [<element>] : String | Test.java:15:45:15:81 | iterator(...) : Iterator [<element>] : String | provenance | MaD:1 |
@@ -66,8 +66,8 @@ edges
 | Test.java:16:47:16:55 | container : Model [<map.value>] : Object | Test.java:16:47:16:74 | getAttribute(...) : Object | provenance | MaD:21 |
 | Test.java:17:19:17:43 | container : ConcurrentModel [<map.key>] : Object | Test.java:17:55:17:63 | container : ConcurrentModel [<map.key>] : Object | provenance |  |
 | Test.java:17:19:17:43 | container : ConcurrentModel [<map.key>] : String | Test.java:17:55:17:63 | container : ConcurrentModel [<map.key>] : String | provenance |  |
-| Test.java:17:55:17:63 | container : ConcurrentModel [<map.key>] : Object | Test.java:17:55:17:72 | keySet(...) : KeySetView [<element>] : Object | provenance | MaD:5 |
-| Test.java:17:55:17:63 | container : ConcurrentModel [<map.key>] : String | Test.java:17:55:17:72 | keySet(...) : KeySetView [<element>] : String | provenance | MaD:5 |
+| Test.java:17:55:17:63 | container : ConcurrentModel [<map.key>] : Object | Test.java:17:55:17:72 | keySet(...) : KeySetView [<element>] : Object | provenance | MaD:7 |
+| Test.java:17:55:17:63 | container : ConcurrentModel [<map.key>] : String | Test.java:17:55:17:72 | keySet(...) : KeySetView [<element>] : String | provenance | MaD:7 |
 | Test.java:17:55:17:72 | keySet(...) : KeySetView [<element>] : Object | Test.java:17:55:17:83 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:1 |
 | Test.java:17:55:17:72 | keySet(...) : KeySetView [<element>] : String | Test.java:17:55:17:83 | iterator(...) : Iterator [<element>] : String | provenance | MaD:1 |
 | Test.java:17:55:17:83 | iterator(...) : Iterator [<element>] : Object | Test.java:17:55:17:90 | next(...) : String | provenance | MaD:2 |
@@ -76,8 +76,8 @@ edges
 | Test.java:18:57:18:65 | container : ConcurrentModel [<map.value>] : Object | Test.java:18:57:18:84 | getAttribute(...) : Object | provenance | MaD:21 |
 | Test.java:19:19:19:36 | container : ModelMap [<map.key>] : Object | Test.java:19:48:19:56 | container : ModelMap [<map.key>] : Object | provenance |  |
 | Test.java:19:19:19:36 | container : ModelMap [<map.key>] : String | Test.java:19:48:19:56 | container : ModelMap [<map.key>] : String | provenance |  |
-| Test.java:19:48:19:56 | container : ModelMap [<map.key>] : Object | Test.java:19:48:19:65 | keySet(...) : Set [<element>] : Object | provenance | MaD:5 |
-| Test.java:19:48:19:56 | container : ModelMap [<map.key>] : String | Test.java:19:48:19:65 | keySet(...) : Set [<element>] : String | provenance | MaD:5 |
+| Test.java:19:48:19:56 | container : ModelMap [<map.key>] : Object | Test.java:19:48:19:65 | keySet(...) : Set [<element>] : Object | provenance | MaD:7 |
+| Test.java:19:48:19:56 | container : ModelMap [<map.key>] : String | Test.java:19:48:19:65 | keySet(...) : Set [<element>] : String | provenance | MaD:7 |
 | Test.java:19:48:19:65 | keySet(...) : Set [<element>] : Object | Test.java:19:48:19:76 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:1 |
 | Test.java:19:48:19:65 | keySet(...) : Set [<element>] : String | Test.java:19:48:19:76 | iterator(...) : Iterator [<element>] : String | provenance | MaD:1 |
 | Test.java:19:48:19:76 | iterator(...) : Iterator [<element>] : Object | Test.java:19:48:19:83 | next(...) : String | provenance | MaD:2 |
@@ -94,7 +94,7 @@ edges
 | Test.java:37:10:37:38 | new ConcurrentModel(...) : ConcurrentModel [<map.key>] : String | Test.java:38:19:38:21 | out : ConcurrentModel [<map.key>] : String | provenance |  |
 | Test.java:37:30:37:31 | in : String | Test.java:37:10:37:38 | new ConcurrentModel(...) : ConcurrentModel [<map.key>] : String | provenance | MaD:9 |
 | Test.java:38:19:38:21 | out : ConcurrentModel [<map.key>] : String | Test.java:17:19:17:43 | container : ConcurrentModel [<map.key>] : String | provenance |  |
-| Test.java:38:19:38:21 | out : ConcurrentModel [<map.key>] : String | Test.java:38:9:38:22 | getMapKey(...) | provenance | MaD:5 |
+| Test.java:38:19:38:21 | out : ConcurrentModel [<map.key>] : String | Test.java:38:9:38:22 | getMapKey(...) | provenance | MaD:7 |
 | Test.java:43:16:43:23 | source(...) : Object | Test.java:44:36:44:37 | in : Object | provenance |  |
 | Test.java:44:10:44:38 | new ConcurrentModel(...) : ConcurrentModel [<map.value>] : Object | Test.java:45:21:45:23 | out : ConcurrentModel [<map.value>] : Object | provenance |  |
 | Test.java:44:36:44:37 | in : Object | Test.java:44:10:44:38 | new ConcurrentModel(...) : ConcurrentModel [<map.value>] : Object | provenance | MaD:10 |
@@ -103,170 +103,170 @@ edges
 | Test.java:50:20:50:36 | of(...) : List [<element>] : Object | Test.java:51:25:51:26 | in : List [<element>] : Object | provenance |  |
 | Test.java:50:28:50:35 | source(...) : Object | Test.java:50:20:50:36 | of(...) : List [<element>] : Object | provenance | MaD:3 |
 | Test.java:51:4:51:6 | out [post update] : Model [<map.value>] : Object | Test.java:52:21:52:23 | out : Model [<map.value>] : Object | provenance |  |
-| Test.java:51:25:51:26 | in : List [<element>] : Object | Test.java:51:4:51:6 | out [post update] : Model [<map.value>] : Object | provenance | MaD:12 |
+| Test.java:51:25:51:26 | in : List [<element>] : Object | Test.java:51:4:51:6 | out [post update] : Model [<map.value>] : Object | provenance | MaD:11 |
 | Test.java:52:21:52:23 | out : Model [<map.value>] : Object | Test.java:16:21:16:35 | container : Model [<map.value>] : Object | provenance |  |
 | Test.java:52:21:52:23 | out : Model [<map.value>] : Object | Test.java:52:9:52:24 | getMapValue(...) | provenance | MaD:21 |
 | Test.java:57:20:57:36 | of(...) : List [<element>] : Object | Test.java:58:25:58:26 | in : List [<element>] : Object | provenance |  |
 | Test.java:57:28:57:35 | source(...) : Object | Test.java:57:20:57:36 | of(...) : List [<element>] : Object | provenance | MaD:3 |
 | Test.java:58:4:58:6 | out [post update] : ConcurrentModel [<map.value>] : Object | Test.java:59:21:59:23 | out : ConcurrentModel [<map.value>] : Object | provenance |  |
-| Test.java:58:25:58:26 | in : List [<element>] : Object | Test.java:58:4:58:6 | out [post update] : ConcurrentModel [<map.value>] : Object | provenance | MaD:12 |
+| Test.java:58:25:58:26 | in : List [<element>] : Object | Test.java:58:4:58:6 | out [post update] : ConcurrentModel [<map.value>] : Object | provenance | MaD:11 |
 | Test.java:59:21:59:23 | out : ConcurrentModel [<map.value>] : Object | Test.java:18:21:18:45 | container : ConcurrentModel [<map.value>] : Object | provenance |  |
 | Test.java:59:21:59:23 | out : ConcurrentModel [<map.value>] : Object | Test.java:59:9:59:24 | getMapValue(...) | provenance | MaD:21 |
 | Test.java:64:20:64:36 | of(...) : List [<element>] : Object | Test.java:66:36:66:37 | in : List [<element>] : Object | provenance |  |
 | Test.java:64:28:64:35 | source(...) : Object | Test.java:64:20:64:36 | of(...) : List [<element>] : Object | provenance | MaD:3 |
 | Test.java:66:10:66:38 | addAllAttributes(...) : Model [<map.value>] : Object | Test.java:67:21:67:23 | out : Model [<map.value>] : Object | provenance |  |
-| Test.java:66:36:66:37 | in : List [<element>] : Object | Test.java:66:10:66:38 | addAllAttributes(...) : Model [<map.value>] : Object | provenance | MaD:12+MaD:11 |
+| Test.java:66:36:66:37 | in : List [<element>] : Object | Test.java:66:10:66:38 | addAllAttributes(...) : Model [<map.value>] : Object | provenance | MaD:11+MaD:14 |
 | Test.java:67:21:67:23 | out : Model [<map.value>] : Object | Test.java:16:21:16:35 | container : Model [<map.value>] : Object | provenance |  |
 | Test.java:67:21:67:23 | out : Model [<map.value>] : Object | Test.java:67:9:67:24 | getMapValue(...) | provenance | MaD:21 |
 | Test.java:72:20:72:36 | of(...) : List [<element>] : Object | Test.java:74:36:74:37 | in : List [<element>] : Object | provenance |  |
 | Test.java:72:28:72:35 | source(...) : Object | Test.java:72:20:72:36 | of(...) : List [<element>] : Object | provenance | MaD:3 |
 | Test.java:74:10:74:38 | addAllAttributes(...) : ConcurrentModel [<map.value>] : Object | Test.java:75:21:75:23 | out : ConcurrentModel [<map.value>] : Object | provenance |  |
-| Test.java:74:36:74:37 | in : List [<element>] : Object | Test.java:74:10:74:38 | addAllAttributes(...) : ConcurrentModel [<map.value>] : Object | provenance | MaD:12+MaD:11 |
+| Test.java:74:36:74:37 | in : List [<element>] : Object | Test.java:74:10:74:38 | addAllAttributes(...) : ConcurrentModel [<map.value>] : Object | provenance | MaD:11+MaD:14 |
 | Test.java:75:21:75:23 | out : ConcurrentModel [<map.value>] : Object | Test.java:18:21:18:45 | container : ConcurrentModel [<map.value>] : Object | provenance |  |
 | Test.java:75:21:75:23 | out : ConcurrentModel [<map.value>] : Object | Test.java:75:9:75:24 | getMapValue(...) | provenance | MaD:21 |
 | Test.java:80:13:80:34 | of(...) : Map [<map.key>] : Object | Test.java:81:25:81:26 | in : Map [<map.key>] : Object | provenance |  |
-| Test.java:80:20:80:27 | source(...) : Object | Test.java:80:13:80:34 | of(...) : Map [<map.key>] : Object | provenance | MaD:6 |
+| Test.java:80:20:80:27 | source(...) : Object | Test.java:80:13:80:34 | of(...) : Map [<map.key>] : Object | provenance | MaD:4 |
 | Test.java:81:4:81:6 | out [post update] : Model [<map.key>] : Object | Test.java:82:19:82:21 | out : Model [<map.key>] : Object | provenance |  |
-| Test.java:81:25:81:26 | in : Map [<map.key>] : Object | Test.java:81:4:81:6 | out [post update] : Model [<map.key>] : Object | provenance | MaD:13 |
+| Test.java:81:25:81:26 | in : Map [<map.key>] : Object | Test.java:81:4:81:6 | out [post update] : Model [<map.key>] : Object | provenance | MaD:12 |
 | Test.java:82:19:82:21 | out : Model [<map.key>] : Object | Test.java:15:19:15:33 | container : Model [<map.key>] : Object | provenance |  |
 | Test.java:82:19:82:21 | out : Model [<map.key>] : Object | Test.java:82:9:82:22 | getMapKey(...) | provenance | MaD:19 |
 | Test.java:87:13:87:34 | of(...) : Map [<map.key>] : Object | Test.java:88:25:88:26 | in : Map [<map.key>] : Object | provenance |  |
-| Test.java:87:20:87:27 | source(...) : Object | Test.java:87:13:87:34 | of(...) : Map [<map.key>] : Object | provenance | MaD:6 |
+| Test.java:87:20:87:27 | source(...) : Object | Test.java:87:13:87:34 | of(...) : Map [<map.key>] : Object | provenance | MaD:4 |
 | Test.java:88:4:88:6 | out [post update] : ConcurrentModel [<map.key>] : Object | Test.java:89:19:89:21 | out : ConcurrentModel [<map.key>] : Object | provenance |  |
-| Test.java:88:25:88:26 | in : Map [<map.key>] : Object | Test.java:88:4:88:6 | out [post update] : ConcurrentModel [<map.key>] : Object | provenance | MaD:13 |
+| Test.java:88:25:88:26 | in : Map [<map.key>] : Object | Test.java:88:4:88:6 | out [post update] : ConcurrentModel [<map.key>] : Object | provenance | MaD:12 |
 | Test.java:89:19:89:21 | out : ConcurrentModel [<map.key>] : Object | Test.java:17:19:17:43 | container : ConcurrentModel [<map.key>] : Object | provenance |  |
-| Test.java:89:19:89:21 | out : ConcurrentModel [<map.key>] : Object | Test.java:89:9:89:22 | getMapKey(...) | provenance | MaD:5 |
+| Test.java:89:19:89:21 | out : ConcurrentModel [<map.key>] : Object | Test.java:89:9:89:22 | getMapKey(...) | provenance | MaD:7 |
 | Test.java:94:13:94:34 | of(...) : Map [<map.key>] : Object | Test.java:96:36:96:37 | in : Map [<map.key>] : Object | provenance |  |
-| Test.java:94:20:94:27 | source(...) : Object | Test.java:94:13:94:34 | of(...) : Map [<map.key>] : Object | provenance | MaD:6 |
+| Test.java:94:20:94:27 | source(...) : Object | Test.java:94:13:94:34 | of(...) : Map [<map.key>] : Object | provenance | MaD:4 |
 | Test.java:96:10:96:38 | addAllAttributes(...) : Model [<map.key>] : Object | Test.java:97:19:97:21 | out : Model [<map.key>] : Object | provenance |  |
-| Test.java:96:36:96:37 | in : Map [<map.key>] : Object | Test.java:96:10:96:38 | addAllAttributes(...) : Model [<map.key>] : Object | provenance | MaD:13+MaD:11 |
+| Test.java:96:36:96:37 | in : Map [<map.key>] : Object | Test.java:96:10:96:38 | addAllAttributes(...) : Model [<map.key>] : Object | provenance | MaD:12+MaD:14 |
 | Test.java:97:19:97:21 | out : Model [<map.key>] : Object | Test.java:15:19:15:33 | container : Model [<map.key>] : Object | provenance |  |
 | Test.java:97:19:97:21 | out : Model [<map.key>] : Object | Test.java:97:9:97:22 | getMapKey(...) | provenance | MaD:19 |
 | Test.java:102:13:102:34 | of(...) : Map [<map.key>] : Object | Test.java:104:36:104:37 | in : Map [<map.key>] : Object | provenance |  |
-| Test.java:102:20:102:27 | source(...) : Object | Test.java:102:13:102:34 | of(...) : Map [<map.key>] : Object | provenance | MaD:6 |
+| Test.java:102:20:102:27 | source(...) : Object | Test.java:102:13:102:34 | of(...) : Map [<map.key>] : Object | provenance | MaD:4 |
 | Test.java:104:10:104:38 | addAllAttributes(...) : ConcurrentModel [<map.key>] : Object | Test.java:105:19:105:21 | out : ConcurrentModel [<map.key>] : Object | provenance |  |
-| Test.java:104:36:104:37 | in : Map [<map.key>] : Object | Test.java:104:10:104:38 | addAllAttributes(...) : ConcurrentModel [<map.key>] : Object | provenance | MaD:13+MaD:11 |
+| Test.java:104:36:104:37 | in : Map [<map.key>] : Object | Test.java:104:10:104:38 | addAllAttributes(...) : ConcurrentModel [<map.key>] : Object | provenance | MaD:12+MaD:14 |
 | Test.java:105:19:105:21 | out : ConcurrentModel [<map.key>] : Object | Test.java:17:19:17:43 | container : ConcurrentModel [<map.key>] : Object | provenance |  |
-| Test.java:105:19:105:21 | out : ConcurrentModel [<map.key>] : Object | Test.java:105:9:105:22 | getMapKey(...) | provenance | MaD:5 |
+| Test.java:105:19:105:21 | out : ConcurrentModel [<map.key>] : Object | Test.java:105:9:105:22 | getMapKey(...) | provenance | MaD:7 |
 | Test.java:110:13:110:34 | of(...) : Map [<map.value>] : Object | Test.java:111:25:111:26 | in : Map [<map.value>] : Object | provenance |  |
-| Test.java:110:26:110:33 | source(...) : Object | Test.java:110:13:110:34 | of(...) : Map [<map.value>] : Object | provenance | MaD:7 |
+| Test.java:110:26:110:33 | source(...) : Object | Test.java:110:13:110:34 | of(...) : Map [<map.value>] : Object | provenance | MaD:5 |
 | Test.java:111:4:111:6 | out [post update] : Model [<map.value>] : Object | Test.java:112:21:112:23 | out : Model [<map.value>] : Object | provenance |  |
-| Test.java:111:25:111:26 | in : Map [<map.value>] : Object | Test.java:111:4:111:6 | out [post update] : Model [<map.value>] : Object | provenance | MaD:14 |
+| Test.java:111:25:111:26 | in : Map [<map.value>] : Object | Test.java:111:4:111:6 | out [post update] : Model [<map.value>] : Object | provenance | MaD:13 |
 | Test.java:112:21:112:23 | out : Model [<map.value>] : Object | Test.java:16:21:16:35 | container : Model [<map.value>] : Object | provenance |  |
 | Test.java:112:21:112:23 | out : Model [<map.value>] : Object | Test.java:112:9:112:24 | getMapValue(...) | provenance | MaD:21 |
 | Test.java:117:13:117:34 | of(...) : Map [<map.value>] : Object | Test.java:118:25:118:26 | in : Map [<map.value>] : Object | provenance |  |
-| Test.java:117:26:117:33 | source(...) : Object | Test.java:117:13:117:34 | of(...) : Map [<map.value>] : Object | provenance | MaD:7 |
+| Test.java:117:26:117:33 | source(...) : Object | Test.java:117:13:117:34 | of(...) : Map [<map.value>] : Object | provenance | MaD:5 |
 | Test.java:118:4:118:6 | out [post update] : ConcurrentModel [<map.value>] : Object | Test.java:119:21:119:23 | out : ConcurrentModel [<map.value>] : Object | provenance |  |
-| Test.java:118:25:118:26 | in : Map [<map.value>] : Object | Test.java:118:4:118:6 | out [post update] : ConcurrentModel [<map.value>] : Object | provenance | MaD:14 |
+| Test.java:118:25:118:26 | in : Map [<map.value>] : Object | Test.java:118:4:118:6 | out [post update] : ConcurrentModel [<map.value>] : Object | provenance | MaD:13 |
 | Test.java:119:21:119:23 | out : ConcurrentModel [<map.value>] : Object | Test.java:18:21:18:45 | container : ConcurrentModel [<map.value>] : Object | provenance |  |
 | Test.java:119:21:119:23 | out : ConcurrentModel [<map.value>] : Object | Test.java:119:9:119:24 | getMapValue(...) | provenance | MaD:21 |
 | Test.java:124:13:124:34 | of(...) : Map [<map.value>] : Object | Test.java:126:36:126:37 | in : Map [<map.value>] : Object | provenance |  |
-| Test.java:124:26:124:33 | source(...) : Object | Test.java:124:13:124:34 | of(...) : Map [<map.value>] : Object | provenance | MaD:7 |
+| Test.java:124:26:124:33 | source(...) : Object | Test.java:124:13:124:34 | of(...) : Map [<map.value>] : Object | provenance | MaD:5 |
 | Test.java:126:10:126:38 | addAllAttributes(...) : Model [<map.value>] : Object | Test.java:127:21:127:23 | out : Model [<map.value>] : Object | provenance |  |
-| Test.java:126:36:126:37 | in : Map [<map.value>] : Object | Test.java:126:10:126:38 | addAllAttributes(...) : Model [<map.value>] : Object | provenance | MaD:14+MaD:11 |
+| Test.java:126:36:126:37 | in : Map [<map.value>] : Object | Test.java:126:10:126:38 | addAllAttributes(...) : Model [<map.value>] : Object | provenance | MaD:13+MaD:14 |
 | Test.java:127:21:127:23 | out : Model [<map.value>] : Object | Test.java:16:21:16:35 | container : Model [<map.value>] : Object | provenance |  |
 | Test.java:127:21:127:23 | out : Model [<map.value>] : Object | Test.java:127:9:127:24 | getMapValue(...) | provenance | MaD:21 |
 | Test.java:132:13:132:34 | of(...) : Map [<map.value>] : Object | Test.java:134:36:134:37 | in : Map [<map.value>] : Object | provenance |  |
-| Test.java:132:26:132:33 | source(...) : Object | Test.java:132:13:132:34 | of(...) : Map [<map.value>] : Object | provenance | MaD:7 |
+| Test.java:132:26:132:33 | source(...) : Object | Test.java:132:13:132:34 | of(...) : Map [<map.value>] : Object | provenance | MaD:5 |
 | Test.java:134:10:134:38 | addAllAttributes(...) : ConcurrentModel [<map.value>] : Object | Test.java:135:21:135:23 | out : ConcurrentModel [<map.value>] : Object | provenance |  |
-| Test.java:134:36:134:37 | in : Map [<map.value>] : Object | Test.java:134:10:134:38 | addAllAttributes(...) : ConcurrentModel [<map.value>] : Object | provenance | MaD:14+MaD:11 |
+| Test.java:134:36:134:37 | in : Map [<map.value>] : Object | Test.java:134:10:134:38 | addAllAttributes(...) : ConcurrentModel [<map.value>] : Object | provenance | MaD:13+MaD:14 |
 | Test.java:135:21:135:23 | out : ConcurrentModel [<map.value>] : Object | Test.java:18:21:18:45 | container : ConcurrentModel [<map.value>] : Object | provenance |  |
 | Test.java:135:21:135:23 | out : ConcurrentModel [<map.value>] : Object | Test.java:135:9:135:24 | getMapValue(...) | provenance | MaD:21 |
 | Test.java:140:15:140:29 | (...)... : Model | Test.java:141:10:141:11 | in : Model | provenance |  |
 | Test.java:140:22:140:29 | source(...) : Object | Test.java:140:15:140:29 | (...)... : Model | provenance |  |
-| Test.java:141:10:141:11 | in : Model | Test.java:141:10:141:39 | addAllAttributes(...) : Model | provenance | MaD:11 |
+| Test.java:141:10:141:11 | in : Model | Test.java:141:10:141:39 | addAllAttributes(...) : Model | provenance | MaD:14 |
 | Test.java:141:10:141:39 | addAllAttributes(...) : Model | Test.java:142:9:142:11 | out | provenance |  |
 | Test.java:147:15:147:29 | (...)... : Model | Test.java:148:10:148:11 | in : Model | provenance |  |
 | Test.java:147:22:147:29 | source(...) : Object | Test.java:147:15:147:29 | (...)... : Model | provenance |  |
-| Test.java:148:10:148:11 | in : Model | Test.java:148:10:148:46 | addAllAttributes(...) : Model | provenance | MaD:11 |
+| Test.java:148:10:148:11 | in : Model | Test.java:148:10:148:46 | addAllAttributes(...) : Model | provenance | MaD:14 |
 | Test.java:148:10:148:46 | addAllAttributes(...) : Model | Test.java:149:9:149:11 | out | provenance |  |
 | Test.java:154:25:154:49 | (...)... : ConcurrentModel | Test.java:155:10:155:11 | in : ConcurrentModel | provenance |  |
 | Test.java:154:42:154:49 | source(...) : Object | Test.java:154:25:154:49 | (...)... : ConcurrentModel | provenance |  |
-| Test.java:155:10:155:11 | in : ConcurrentModel | Test.java:155:10:155:39 | addAllAttributes(...) : ConcurrentModel | provenance | MaD:11 |
+| Test.java:155:10:155:11 | in : ConcurrentModel | Test.java:155:10:155:39 | addAllAttributes(...) : ConcurrentModel | provenance | MaD:14 |
 | Test.java:155:10:155:39 | addAllAttributes(...) : ConcurrentModel | Test.java:156:9:156:11 | out | provenance |  |
 | Test.java:161:25:161:49 | (...)... : ConcurrentModel | Test.java:162:10:162:11 | in : ConcurrentModel | provenance |  |
 | Test.java:161:42:161:49 | source(...) : Object | Test.java:161:25:161:49 | (...)... : ConcurrentModel | provenance |  |
-| Test.java:162:10:162:11 | in : ConcurrentModel | Test.java:162:10:162:46 | addAllAttributes(...) : ConcurrentModel | provenance | MaD:11 |
+| Test.java:162:10:162:11 | in : ConcurrentModel | Test.java:162:10:162:46 | addAllAttributes(...) : ConcurrentModel | provenance | MaD:14 |
 | Test.java:162:10:162:46 | addAllAttributes(...) : ConcurrentModel | Test.java:163:9:163:11 | out | provenance |  |
 | Test.java:168:16:168:23 | source(...) : Object | Test.java:169:21:169:22 | in : Object | provenance |  |
 | Test.java:169:4:169:6 | out [post update] : Model [<map.value>] : Object | Test.java:170:21:170:23 | out : Model [<map.value>] : Object | provenance |  |
-| Test.java:169:21:169:22 | in : Object | Test.java:169:4:169:6 | out [post update] : Model [<map.value>] : Object | provenance | MaD:16 |
+| Test.java:169:21:169:22 | in : Object | Test.java:169:4:169:6 | out [post update] : Model [<map.value>] : Object | provenance | MaD:15 |
 | Test.java:170:21:170:23 | out : Model [<map.value>] : Object | Test.java:16:21:16:35 | container : Model [<map.value>] : Object | provenance |  |
 | Test.java:170:21:170:23 | out : Model [<map.value>] : Object | Test.java:170:9:170:24 | getMapValue(...) | provenance | MaD:21 |
 | Test.java:175:16:175:23 | source(...) : Object | Test.java:176:21:176:22 | in : Object | provenance |  |
 | Test.java:176:4:176:6 | out [post update] : ConcurrentModel [<map.value>] : Object | Test.java:177:21:177:23 | out : ConcurrentModel [<map.value>] : Object | provenance |  |
-| Test.java:176:21:176:22 | in : Object | Test.java:176:4:176:6 | out [post update] : ConcurrentModel [<map.value>] : Object | provenance | MaD:16 |
+| Test.java:176:21:176:22 | in : Object | Test.java:176:4:176:6 | out [post update] : ConcurrentModel [<map.value>] : Object | provenance | MaD:15 |
 | Test.java:177:21:177:23 | out : ConcurrentModel [<map.value>] : Object | Test.java:18:21:18:45 | container : ConcurrentModel [<map.value>] : Object | provenance |  |
 | Test.java:177:21:177:23 | out : ConcurrentModel [<map.value>] : Object | Test.java:177:9:177:24 | getMapValue(...) | provenance | MaD:21 |
 | Test.java:182:16:182:23 | source(...) : Object | Test.java:184:32:184:33 | in : Object | provenance |  |
 | Test.java:184:10:184:34 | addAttribute(...) : Model [<map.value>] : Object | Test.java:185:21:185:23 | out : Model [<map.value>] : Object | provenance |  |
-| Test.java:184:32:184:33 | in : Object | Test.java:184:10:184:34 | addAttribute(...) : Model [<map.value>] : Object | provenance | MaD:16+MaD:15 |
+| Test.java:184:32:184:33 | in : Object | Test.java:184:10:184:34 | addAttribute(...) : Model [<map.value>] : Object | provenance | MaD:15+MaD:18 |
 | Test.java:185:21:185:23 | out : Model [<map.value>] : Object | Test.java:16:21:16:35 | container : Model [<map.value>] : Object | provenance |  |
 | Test.java:185:21:185:23 | out : Model [<map.value>] : Object | Test.java:185:9:185:24 | getMapValue(...) | provenance | MaD:21 |
 | Test.java:190:16:190:23 | source(...) : Object | Test.java:192:32:192:33 | in : Object | provenance |  |
 | Test.java:192:10:192:34 | addAttribute(...) : ConcurrentModel [<map.value>] : Object | Test.java:193:21:193:23 | out : ConcurrentModel [<map.value>] : Object | provenance |  |
-| Test.java:192:32:192:33 | in : Object | Test.java:192:10:192:34 | addAttribute(...) : ConcurrentModel [<map.value>] : Object | provenance | MaD:16+MaD:15 |
+| Test.java:192:32:192:33 | in : Object | Test.java:192:10:192:34 | addAttribute(...) : ConcurrentModel [<map.value>] : Object | provenance | MaD:15+MaD:18 |
 | Test.java:193:21:193:23 | out : ConcurrentModel [<map.value>] : Object | Test.java:18:21:18:45 | container : ConcurrentModel [<map.value>] : Object | provenance |  |
 | Test.java:193:21:193:23 | out : ConcurrentModel [<map.value>] : Object | Test.java:193:9:193:24 | getMapValue(...) | provenance | MaD:21 |
 | Test.java:198:16:198:31 | (...)... : String | Test.java:199:21:199:22 | in : String | provenance |  |
 | Test.java:198:24:198:31 | source(...) : Object | Test.java:198:16:198:31 | (...)... : String | provenance |  |
 | Test.java:199:4:199:6 | out [post update] : Model [<map.key>] : String | Test.java:200:19:200:21 | out : Model [<map.key>] : String | provenance |  |
-| Test.java:199:21:199:22 | in : String | Test.java:199:4:199:6 | out [post update] : Model [<map.key>] : String | provenance | MaD:17 |
+| Test.java:199:21:199:22 | in : String | Test.java:199:4:199:6 | out [post update] : Model [<map.key>] : String | provenance | MaD:16 |
 | Test.java:200:19:200:21 | out : Model [<map.key>] : String | Test.java:15:19:15:33 | container : Model [<map.key>] : String | provenance |  |
 | Test.java:200:19:200:21 | out : Model [<map.key>] : String | Test.java:200:9:200:22 | getMapKey(...) | provenance | MaD:19 |
 | Test.java:205:16:205:31 | (...)... : String | Test.java:206:21:206:22 | in : String | provenance |  |
 | Test.java:205:24:205:31 | source(...) : Object | Test.java:205:16:205:31 | (...)... : String | provenance |  |
 | Test.java:206:4:206:6 | out [post update] : ConcurrentModel [<map.key>] : String | Test.java:207:19:207:21 | out : ConcurrentModel [<map.key>] : String | provenance |  |
-| Test.java:206:21:206:22 | in : String | Test.java:206:4:206:6 | out [post update] : ConcurrentModel [<map.key>] : String | provenance | MaD:17 |
+| Test.java:206:21:206:22 | in : String | Test.java:206:4:206:6 | out [post update] : ConcurrentModel [<map.key>] : String | provenance | MaD:16 |
 | Test.java:207:19:207:21 | out : ConcurrentModel [<map.key>] : String | Test.java:17:19:17:43 | container : ConcurrentModel [<map.key>] : String | provenance |  |
-| Test.java:207:19:207:21 | out : ConcurrentModel [<map.key>] : String | Test.java:207:9:207:22 | getMapKey(...) | provenance | MaD:5 |
+| Test.java:207:19:207:21 | out : ConcurrentModel [<map.key>] : String | Test.java:207:9:207:22 | getMapKey(...) | provenance | MaD:7 |
 | Test.java:212:16:212:31 | (...)... : String | Test.java:214:32:214:33 | in : String | provenance |  |
 | Test.java:212:24:212:31 | source(...) : Object | Test.java:212:16:212:31 | (...)... : String | provenance |  |
 | Test.java:214:10:214:40 | addAttribute(...) : Model [<map.key>] : String | Test.java:215:19:215:21 | out : Model [<map.key>] : String | provenance |  |
-| Test.java:214:32:214:33 | in : String | Test.java:214:10:214:40 | addAttribute(...) : Model [<map.key>] : String | provenance | MaD:17+MaD:15 |
+| Test.java:214:32:214:33 | in : String | Test.java:214:10:214:40 | addAttribute(...) : Model [<map.key>] : String | provenance | MaD:16+MaD:18 |
 | Test.java:215:19:215:21 | out : Model [<map.key>] : String | Test.java:15:19:15:33 | container : Model [<map.key>] : String | provenance |  |
 | Test.java:215:19:215:21 | out : Model [<map.key>] : String | Test.java:215:9:215:22 | getMapKey(...) | provenance | MaD:19 |
 | Test.java:220:16:220:31 | (...)... : String | Test.java:222:32:222:33 | in : String | provenance |  |
 | Test.java:220:24:220:31 | source(...) : Object | Test.java:220:16:220:31 | (...)... : String | provenance |  |
 | Test.java:222:10:222:40 | addAttribute(...) : ConcurrentModel [<map.key>] : String | Test.java:223:19:223:21 | out : ConcurrentModel [<map.key>] : String | provenance |  |
-| Test.java:222:32:222:33 | in : String | Test.java:222:10:222:40 | addAttribute(...) : ConcurrentModel [<map.key>] : String | provenance | MaD:17+MaD:15 |
+| Test.java:222:32:222:33 | in : String | Test.java:222:10:222:40 | addAttribute(...) : ConcurrentModel [<map.key>] : String | provenance | MaD:16+MaD:18 |
 | Test.java:223:19:223:21 | out : ConcurrentModel [<map.key>] : String | Test.java:17:19:17:43 | container : ConcurrentModel [<map.key>] : String | provenance |  |
-| Test.java:223:19:223:21 | out : ConcurrentModel [<map.key>] : String | Test.java:223:9:223:22 | getMapKey(...) | provenance | MaD:5 |
+| Test.java:223:19:223:21 | out : ConcurrentModel [<map.key>] : String | Test.java:223:9:223:22 | getMapKey(...) | provenance | MaD:7 |
 | Test.java:228:16:228:23 | source(...) : Object | Test.java:229:27:229:28 | in : Object | provenance |  |
 | Test.java:229:4:229:6 | out [post update] : Model [<map.value>] : Object | Test.java:230:21:230:23 | out : Model [<map.value>] : Object | provenance |  |
-| Test.java:229:27:229:28 | in : Object | Test.java:229:4:229:6 | out [post update] : Model [<map.value>] : Object | provenance | MaD:18 |
+| Test.java:229:27:229:28 | in : Object | Test.java:229:4:229:6 | out [post update] : Model [<map.value>] : Object | provenance | MaD:17 |
 | Test.java:230:21:230:23 | out : Model [<map.value>] : Object | Test.java:16:21:16:35 | container : Model [<map.value>] : Object | provenance |  |
 | Test.java:230:21:230:23 | out : Model [<map.value>] : Object | Test.java:230:9:230:24 | getMapValue(...) | provenance | MaD:21 |
 | Test.java:235:16:235:23 | source(...) : Object | Test.java:236:27:236:28 | in : Object | provenance |  |
 | Test.java:236:4:236:6 | out [post update] : ConcurrentModel [<map.value>] : Object | Test.java:237:21:237:23 | out : ConcurrentModel [<map.value>] : Object | provenance |  |
-| Test.java:236:27:236:28 | in : Object | Test.java:236:4:236:6 | out [post update] : ConcurrentModel [<map.value>] : Object | provenance | MaD:18 |
+| Test.java:236:27:236:28 | in : Object | Test.java:236:4:236:6 | out [post update] : ConcurrentModel [<map.value>] : Object | provenance | MaD:17 |
 | Test.java:237:21:237:23 | out : ConcurrentModel [<map.value>] : Object | Test.java:18:21:18:45 | container : ConcurrentModel [<map.value>] : Object | provenance |  |
 | Test.java:237:21:237:23 | out : ConcurrentModel [<map.value>] : Object | Test.java:237:9:237:24 | getMapValue(...) | provenance | MaD:21 |
 | Test.java:242:16:242:23 | source(...) : Object | Test.java:244:38:244:39 | in : Object | provenance |  |
 | Test.java:244:10:244:40 | addAttribute(...) : Model [<map.value>] : Object | Test.java:245:21:245:23 | out : Model [<map.value>] : Object | provenance |  |
-| Test.java:244:38:244:39 | in : Object | Test.java:244:10:244:40 | addAttribute(...) : Model [<map.value>] : Object | provenance | MaD:18+MaD:15 |
+| Test.java:244:38:244:39 | in : Object | Test.java:244:10:244:40 | addAttribute(...) : Model [<map.value>] : Object | provenance | MaD:17+MaD:18 |
 | Test.java:245:21:245:23 | out : Model [<map.value>] : Object | Test.java:16:21:16:35 | container : Model [<map.value>] : Object | provenance |  |
 | Test.java:245:21:245:23 | out : Model [<map.value>] : Object | Test.java:245:9:245:24 | getMapValue(...) | provenance | MaD:21 |
 | Test.java:250:16:250:23 | source(...) : Object | Test.java:252:38:252:39 | in : Object | provenance |  |
 | Test.java:252:10:252:40 | addAttribute(...) : ConcurrentModel [<map.value>] : Object | Test.java:253:21:253:23 | out : ConcurrentModel [<map.value>] : Object | provenance |  |
-| Test.java:252:38:252:39 | in : Object | Test.java:252:10:252:40 | addAttribute(...) : ConcurrentModel [<map.value>] : Object | provenance | MaD:18+MaD:15 |
+| Test.java:252:38:252:39 | in : Object | Test.java:252:10:252:40 | addAttribute(...) : ConcurrentModel [<map.value>] : Object | provenance | MaD:17+MaD:18 |
 | Test.java:253:21:253:23 | out : ConcurrentModel [<map.value>] : Object | Test.java:18:21:18:45 | container : ConcurrentModel [<map.value>] : Object | provenance |  |
 | Test.java:253:21:253:23 | out : ConcurrentModel [<map.value>] : Object | Test.java:253:9:253:24 | getMapValue(...) | provenance | MaD:21 |
 | Test.java:258:15:258:29 | (...)... : Model | Test.java:259:10:259:11 | in : Model | provenance |  |
 | Test.java:258:22:258:29 | source(...) : Object | Test.java:258:15:258:29 | (...)... : Model | provenance |  |
-| Test.java:259:10:259:11 | in : Model | Test.java:259:10:259:36 | addAttribute(...) : Model | provenance | MaD:15 |
+| Test.java:259:10:259:11 | in : Model | Test.java:259:10:259:36 | addAttribute(...) : Model | provenance | MaD:18 |
 | Test.java:259:10:259:36 | addAttribute(...) : Model | Test.java:260:9:260:11 | out | provenance |  |
 | Test.java:265:15:265:29 | (...)... : Model | Test.java:266:10:266:11 | in : Model | provenance |  |
 | Test.java:265:22:265:29 | source(...) : Object | Test.java:265:15:265:29 | (...)... : Model | provenance |  |
-| Test.java:266:10:266:11 | in : Model | Test.java:266:10:266:30 | addAttribute(...) : Model | provenance | MaD:15 |
+| Test.java:266:10:266:11 | in : Model | Test.java:266:10:266:30 | addAttribute(...) : Model | provenance | MaD:18 |
 | Test.java:266:10:266:30 | addAttribute(...) : Model | Test.java:267:9:267:11 | out | provenance |  |
 | Test.java:272:25:272:49 | (...)... : ConcurrentModel | Test.java:273:10:273:11 | in : ConcurrentModel | provenance |  |
 | Test.java:272:42:272:49 | source(...) : Object | Test.java:272:25:272:49 | (...)... : ConcurrentModel | provenance |  |
-| Test.java:273:10:273:11 | in : ConcurrentModel | Test.java:273:10:273:36 | addAttribute(...) : ConcurrentModel | provenance | MaD:15 |
+| Test.java:273:10:273:11 | in : ConcurrentModel | Test.java:273:10:273:36 | addAttribute(...) : ConcurrentModel | provenance | MaD:18 |
 | Test.java:273:10:273:36 | addAttribute(...) : ConcurrentModel | Test.java:274:9:274:11 | out | provenance |  |
 | Test.java:279:25:279:49 | (...)... : ConcurrentModel | Test.java:280:10:280:11 | in : ConcurrentModel | provenance |  |
 | Test.java:279:42:279:49 | source(...) : Object | Test.java:279:25:279:49 | (...)... : ConcurrentModel | provenance |  |
-| Test.java:280:10:280:11 | in : ConcurrentModel | Test.java:280:10:280:30 | addAttribute(...) : ConcurrentModel | provenance | MaD:15 |
+| Test.java:280:10:280:11 | in : ConcurrentModel | Test.java:280:10:280:30 | addAttribute(...) : ConcurrentModel | provenance | MaD:18 |
 | Test.java:280:10:280:30 | addAttribute(...) : ConcurrentModel | Test.java:281:9:281:11 | out | provenance |  |
 | Test.java:286:15:286:57 | new ConcurrentModel(...) : ConcurrentModel [<map.key>] : String | Test.java:287:10:287:11 | in : ConcurrentModel [<map.key>] : String | provenance |  |
 | Test.java:286:35:286:50 | (...)... : String | Test.java:286:15:286:57 | new ConcurrentModel(...) : ConcurrentModel [<map.key>] : String | provenance | MaD:9 |
@@ -274,30 +274,30 @@ edges
 | Test.java:287:10:287:11 | in : ConcurrentModel [<map.key>] : String | Test.java:287:10:287:19 | asMap(...) : Map [<map.key>] : String | provenance | MaD:19 |
 | Test.java:287:10:287:19 | asMap(...) : Map [<map.key>] : String | Test.java:288:19:288:21 | out : Map [<map.key>] : String | provenance |  |
 | Test.java:288:19:288:21 | out : Map [<map.key>] : String | Test.java:13:18:13:35 | container : Map [<map.key>] : String | provenance |  |
-| Test.java:288:19:288:21 | out : Map [<map.key>] : String | Test.java:288:9:288:22 | getMapKey(...) | provenance | MaD:5 |
+| Test.java:288:19:288:21 | out : Map [<map.key>] : String | Test.java:288:9:288:22 | getMapKey(...) | provenance | MaD:7 |
 | Test.java:293:25:293:67 | new ConcurrentModel(...) : ConcurrentModel [<map.key>] : String | Test.java:294:10:294:11 | in : ConcurrentModel [<map.key>] : String | provenance |  |
 | Test.java:293:45:293:60 | (...)... : String | Test.java:293:25:293:67 | new ConcurrentModel(...) : ConcurrentModel [<map.key>] : String | provenance | MaD:9 |
 | Test.java:293:53:293:60 | source(...) : Object | Test.java:293:45:293:60 | (...)... : String | provenance |  |
 | Test.java:294:10:294:11 | in : ConcurrentModel [<map.key>] : String | Test.java:294:10:294:19 | asMap(...) : Map [<map.key>] : String | provenance | MaD:19 |
 | Test.java:294:10:294:19 | asMap(...) : Map [<map.key>] : String | Test.java:295:19:295:21 | out : Map [<map.key>] : String | provenance |  |
 | Test.java:295:19:295:21 | out : Map [<map.key>] : String | Test.java:13:18:13:35 | container : Map [<map.key>] : String | provenance |  |
-| Test.java:295:19:295:21 | out : Map [<map.key>] : String | Test.java:295:9:295:22 | getMapKey(...) | provenance | MaD:5 |
+| Test.java:295:19:295:21 | out : Map [<map.key>] : String | Test.java:295:9:295:22 | getMapKey(...) | provenance | MaD:7 |
 | Test.java:300:15:300:43 | (...)... : Map [<map.value>] : Object | Test.java:301:10:301:11 | in : Map [<map.value>] : Object | provenance |  |
 | Test.java:300:22:300:43 | of(...) : Map [<map.value>] : Object | Test.java:300:15:300:43 | (...)... : Map [<map.value>] : Object | provenance |  |
-| Test.java:300:35:300:42 | source(...) : Object | Test.java:300:22:300:43 | of(...) : Map [<map.value>] : Object | provenance | MaD:7 |
+| Test.java:300:35:300:42 | source(...) : Object | Test.java:300:22:300:43 | of(...) : Map [<map.value>] : Object | provenance | MaD:5 |
 | Test.java:301:10:301:11 | in : Map [<map.value>] : Object | Test.java:301:10:301:19 | asMap(...) : Map [<map.value>] : Object | provenance | MaD:20 |
 | Test.java:301:10:301:19 | asMap(...) : Map [<map.value>] : Object | Test.java:302:21:302:23 | out : Map [<map.value>] : Object | provenance |  |
 | Test.java:302:21:302:23 | out : Map [<map.value>] : Object | Test.java:14:20:14:37 | container : Map [<map.value>] : Object | provenance |  |
-| Test.java:302:21:302:23 | out : Map [<map.value>] : Object | Test.java:302:9:302:24 | getMapValue(...) | provenance | MaD:4 |
+| Test.java:302:21:302:23 | out : Map [<map.value>] : Object | Test.java:302:9:302:24 | getMapValue(...) | provenance | MaD:6 |
 | Test.java:307:25:307:59 | new ConcurrentModel(...) : ConcurrentModel [<map.value>] : Object | Test.java:308:10:308:11 | in : ConcurrentModel [<map.value>] : Object | provenance |  |
 | Test.java:307:51:307:58 | source(...) : Object | Test.java:307:25:307:59 | new ConcurrentModel(...) : ConcurrentModel [<map.value>] : Object | provenance | MaD:10 |
 | Test.java:308:10:308:11 | in : ConcurrentModel [<map.value>] : Object | Test.java:308:10:308:19 | asMap(...) : Map [<map.value>] : Object | provenance | MaD:20 |
 | Test.java:308:10:308:19 | asMap(...) : Map [<map.value>] : Object | Test.java:309:21:309:23 | out : Map [<map.value>] : Object | provenance |  |
 | Test.java:309:21:309:23 | out : Map [<map.value>] : Object | Test.java:14:20:14:37 | container : Map [<map.value>] : Object | provenance |  |
-| Test.java:309:21:309:23 | out : Map [<map.value>] : Object | Test.java:309:9:309:24 | getMapValue(...) | provenance | MaD:4 |
+| Test.java:309:21:309:23 | out : Map [<map.value>] : Object | Test.java:309:9:309:24 | getMapValue(...) | provenance | MaD:6 |
 | Test.java:314:15:314:43 | (...)... : Map [<map.value>] : Object | Test.java:315:10:315:11 | in : Map [<map.value>] : Object | provenance |  |
 | Test.java:314:22:314:43 | of(...) : Map [<map.value>] : Object | Test.java:314:15:314:43 | (...)... : Map [<map.value>] : Object | provenance |  |
-| Test.java:314:35:314:42 | source(...) : Object | Test.java:314:22:314:43 | of(...) : Map [<map.value>] : Object | provenance | MaD:7 |
+| Test.java:314:35:314:42 | source(...) : Object | Test.java:314:22:314:43 | of(...) : Map [<map.value>] : Object | provenance | MaD:5 |
 | Test.java:315:10:315:11 | in : Map [<map.value>] : Object | Test.java:315:10:315:30 | getAttribute(...) : Object | provenance | MaD:21 |
 | Test.java:315:10:315:30 | getAttribute(...) : Object | Test.java:316:9:316:11 | out | provenance |  |
 | Test.java:321:25:321:59 | new ConcurrentModel(...) : ConcurrentModel [<map.value>] : Object | Test.java:322:10:322:11 | in : ConcurrentModel [<map.value>] : Object | provenance |  |
@@ -306,61 +306,61 @@ edges
 | Test.java:322:10:322:30 | getAttribute(...) : Object | Test.java:323:9:323:11 | out | provenance |  |
 | Test.java:328:15:328:29 | (...)... : Model | Test.java:329:10:329:11 | in : Model | provenance |  |
 | Test.java:328:22:328:29 | source(...) : Object | Test.java:328:15:328:29 | (...)... : Model | provenance |  |
-| Test.java:329:10:329:11 | in : Model | Test.java:329:10:329:33 | mergeAttributes(...) : Model | provenance | MaD:22 |
+| Test.java:329:10:329:11 | in : Model | Test.java:329:10:329:33 | mergeAttributes(...) : Model | provenance | MaD:24 |
 | Test.java:329:10:329:33 | mergeAttributes(...) : Model | Test.java:330:9:330:11 | out | provenance |  |
 | Test.java:335:25:335:49 | (...)... : ConcurrentModel | Test.java:336:10:336:11 | in : ConcurrentModel | provenance |  |
 | Test.java:335:42:335:49 | source(...) : Object | Test.java:335:25:335:49 | (...)... : ConcurrentModel | provenance |  |
-| Test.java:336:10:336:11 | in : ConcurrentModel | Test.java:336:10:336:33 | mergeAttributes(...) : ConcurrentModel | provenance | MaD:22 |
+| Test.java:336:10:336:11 | in : ConcurrentModel | Test.java:336:10:336:33 | mergeAttributes(...) : ConcurrentModel | provenance | MaD:24 |
 | Test.java:336:10:336:33 | mergeAttributes(...) : ConcurrentModel | Test.java:337:9:337:11 | out | provenance |  |
 | Test.java:342:15:342:57 | new ConcurrentModel(...) : ConcurrentModel [<map.key>] : String | Test.java:343:10:343:11 | in : ConcurrentModel [<map.key>] : String | provenance |  |
 | Test.java:342:35:342:50 | (...)... : String | Test.java:342:15:342:57 | new ConcurrentModel(...) : ConcurrentModel [<map.key>] : String | provenance | MaD:9 |
 | Test.java:342:43:342:50 | source(...) : Object | Test.java:342:35:342:50 | (...)... : String | provenance |  |
-| Test.java:343:10:343:11 | in : ConcurrentModel [<map.key>] : String | Test.java:343:10:343:33 | mergeAttributes(...) : ConcurrentModel [<map.key>] : String | provenance | MaD:22 |
+| Test.java:343:10:343:11 | in : ConcurrentModel [<map.key>] : String | Test.java:343:10:343:33 | mergeAttributes(...) : ConcurrentModel [<map.key>] : String | provenance | MaD:24 |
 | Test.java:343:10:343:33 | mergeAttributes(...) : ConcurrentModel [<map.key>] : String | Test.java:344:19:344:21 | out : ConcurrentModel [<map.key>] : String | provenance |  |
 | Test.java:344:19:344:21 | out : ConcurrentModel [<map.key>] : String | Test.java:15:19:15:33 | container : ConcurrentModel [<map.key>] : String | provenance |  |
 | Test.java:344:19:344:21 | out : ConcurrentModel [<map.key>] : String | Test.java:344:9:344:22 | getMapKey(...) | provenance | MaD:19 |
 | Test.java:349:25:349:67 | new ConcurrentModel(...) : ConcurrentModel [<map.key>] : String | Test.java:350:10:350:11 | in : ConcurrentModel [<map.key>] : String | provenance |  |
 | Test.java:349:45:349:60 | (...)... : String | Test.java:349:25:349:67 | new ConcurrentModel(...) : ConcurrentModel [<map.key>] : String | provenance | MaD:9 |
 | Test.java:349:53:349:60 | source(...) : Object | Test.java:349:45:349:60 | (...)... : String | provenance |  |
-| Test.java:350:10:350:11 | in : ConcurrentModel [<map.key>] : String | Test.java:350:10:350:33 | mergeAttributes(...) : ConcurrentModel [<map.key>] : String | provenance | MaD:22 |
+| Test.java:350:10:350:11 | in : ConcurrentModel [<map.key>] : String | Test.java:350:10:350:33 | mergeAttributes(...) : ConcurrentModel [<map.key>] : String | provenance | MaD:24 |
 | Test.java:350:10:350:33 | mergeAttributes(...) : ConcurrentModel [<map.key>] : String | Test.java:351:19:351:21 | out : ConcurrentModel [<map.key>] : String | provenance |  |
 | Test.java:351:19:351:21 | out : ConcurrentModel [<map.key>] : String | Test.java:17:19:17:43 | container : ConcurrentModel [<map.key>] : String | provenance |  |
-| Test.java:351:19:351:21 | out : ConcurrentModel [<map.key>] : String | Test.java:351:9:351:22 | getMapKey(...) | provenance | MaD:5 |
+| Test.java:351:19:351:21 | out : ConcurrentModel [<map.key>] : String | Test.java:351:9:351:22 | getMapKey(...) | provenance | MaD:7 |
 | Test.java:356:13:356:34 | of(...) : Map [<map.key>] : Object | Test.java:357:24:357:25 | in : Map [<map.key>] : Object | provenance |  |
-| Test.java:356:20:356:27 | source(...) : Object | Test.java:356:13:356:34 | of(...) : Map [<map.key>] : Object | provenance | MaD:6 |
+| Test.java:356:20:356:27 | source(...) : Object | Test.java:356:13:356:34 | of(...) : Map [<map.key>] : Object | provenance | MaD:4 |
 | Test.java:357:4:357:6 | out [post update] : Model [<map.key>] : Object | Test.java:358:19:358:21 | out : Model [<map.key>] : Object | provenance |  |
-| Test.java:357:24:357:25 | in : Map [<map.key>] : Object | Test.java:357:4:357:6 | out [post update] : Model [<map.key>] : Object | provenance | MaD:23 |
+| Test.java:357:24:357:25 | in : Map [<map.key>] : Object | Test.java:357:4:357:6 | out [post update] : Model [<map.key>] : Object | provenance | MaD:22 |
 | Test.java:358:19:358:21 | out : Model [<map.key>] : Object | Test.java:15:19:15:33 | container : Model [<map.key>] : Object | provenance |  |
 | Test.java:358:19:358:21 | out : Model [<map.key>] : Object | Test.java:358:9:358:22 | getMapKey(...) | provenance | MaD:19 |
 | Test.java:363:13:363:34 | of(...) : Map [<map.key>] : Object | Test.java:364:24:364:25 | in : Map [<map.key>] : Object | provenance |  |
-| Test.java:363:20:363:27 | source(...) : Object | Test.java:363:13:363:34 | of(...) : Map [<map.key>] : Object | provenance | MaD:6 |
+| Test.java:363:20:363:27 | source(...) : Object | Test.java:363:13:363:34 | of(...) : Map [<map.key>] : Object | provenance | MaD:4 |
 | Test.java:364:4:364:6 | out [post update] : ConcurrentModel [<map.key>] : Object | Test.java:365:19:365:21 | out : ConcurrentModel [<map.key>] : Object | provenance |  |
-| Test.java:364:24:364:25 | in : Map [<map.key>] : Object | Test.java:364:4:364:6 | out [post update] : ConcurrentModel [<map.key>] : Object | provenance | MaD:23 |
+| Test.java:364:24:364:25 | in : Map [<map.key>] : Object | Test.java:364:4:364:6 | out [post update] : ConcurrentModel [<map.key>] : Object | provenance | MaD:22 |
 | Test.java:365:19:365:21 | out : ConcurrentModel [<map.key>] : Object | Test.java:17:19:17:43 | container : ConcurrentModel [<map.key>] : Object | provenance |  |
-| Test.java:365:19:365:21 | out : ConcurrentModel [<map.key>] : Object | Test.java:365:9:365:22 | getMapKey(...) | provenance | MaD:5 |
+| Test.java:365:19:365:21 | out : ConcurrentModel [<map.key>] : Object | Test.java:365:9:365:22 | getMapKey(...) | provenance | MaD:7 |
 | Test.java:370:15:370:43 | (...)... : Map [<map.value>] : Object | Test.java:371:10:371:11 | in : Map [<map.value>] : Object | provenance |  |
 | Test.java:370:22:370:43 | of(...) : Map [<map.value>] : Object | Test.java:370:15:370:43 | (...)... : Map [<map.value>] : Object | provenance |  |
-| Test.java:370:35:370:42 | source(...) : Object | Test.java:370:22:370:43 | of(...) : Map [<map.value>] : Object | provenance | MaD:7 |
-| Test.java:371:10:371:11 | in : Map [<map.value>] : Object | Test.java:371:10:371:33 | mergeAttributes(...) : Map [<map.value>] : Object | provenance | MaD:22 |
+| Test.java:370:35:370:42 | source(...) : Object | Test.java:370:22:370:43 | of(...) : Map [<map.value>] : Object | provenance | MaD:5 |
+| Test.java:371:10:371:11 | in : Map [<map.value>] : Object | Test.java:371:10:371:33 | mergeAttributes(...) : Map [<map.value>] : Object | provenance | MaD:24 |
 | Test.java:371:10:371:33 | mergeAttributes(...) : Map [<map.value>] : Object | Test.java:372:21:372:23 | out : Map [<map.value>] : Object | provenance |  |
 | Test.java:372:21:372:23 | out : Map [<map.value>] : Object | Test.java:16:21:16:35 | container : Map [<map.value>] : Object | provenance |  |
 | Test.java:372:21:372:23 | out : Map [<map.value>] : Object | Test.java:372:9:372:24 | getMapValue(...) | provenance | MaD:21 |
 | Test.java:377:25:377:59 | new ConcurrentModel(...) : ConcurrentModel [<map.value>] : Object | Test.java:378:10:378:11 | in : ConcurrentModel [<map.value>] : Object | provenance |  |
 | Test.java:377:51:377:58 | source(...) : Object | Test.java:377:25:377:59 | new ConcurrentModel(...) : ConcurrentModel [<map.value>] : Object | provenance | MaD:10 |
-| Test.java:378:10:378:11 | in : ConcurrentModel [<map.value>] : Object | Test.java:378:10:378:33 | mergeAttributes(...) : ConcurrentModel [<map.value>] : Object | provenance | MaD:22 |
+| Test.java:378:10:378:11 | in : ConcurrentModel [<map.value>] : Object | Test.java:378:10:378:33 | mergeAttributes(...) : ConcurrentModel [<map.value>] : Object | provenance | MaD:24 |
 | Test.java:378:10:378:33 | mergeAttributes(...) : ConcurrentModel [<map.value>] : Object | Test.java:379:21:379:23 | out : ConcurrentModel [<map.value>] : Object | provenance |  |
 | Test.java:379:21:379:23 | out : ConcurrentModel [<map.value>] : Object | Test.java:18:21:18:45 | container : ConcurrentModel [<map.value>] : Object | provenance |  |
 | Test.java:379:21:379:23 | out : ConcurrentModel [<map.value>] : Object | Test.java:379:9:379:24 | getMapValue(...) | provenance | MaD:21 |
 | Test.java:384:13:384:34 | of(...) : Map [<map.value>] : Object | Test.java:385:24:385:25 | in : Map [<map.value>] : Object | provenance |  |
-| Test.java:384:26:384:33 | source(...) : Object | Test.java:384:13:384:34 | of(...) : Map [<map.value>] : Object | provenance | MaD:7 |
+| Test.java:384:26:384:33 | source(...) : Object | Test.java:384:13:384:34 | of(...) : Map [<map.value>] : Object | provenance | MaD:5 |
 | Test.java:385:4:385:6 | out [post update] : Model [<map.value>] : Object | Test.java:386:21:386:23 | out : Model [<map.value>] : Object | provenance |  |
-| Test.java:385:24:385:25 | in : Map [<map.value>] : Object | Test.java:385:4:385:6 | out [post update] : Model [<map.value>] : Object | provenance | MaD:24 |
+| Test.java:385:24:385:25 | in : Map [<map.value>] : Object | Test.java:385:4:385:6 | out [post update] : Model [<map.value>] : Object | provenance | MaD:23 |
 | Test.java:386:21:386:23 | out : Model [<map.value>] : Object | Test.java:16:21:16:35 | container : Model [<map.value>] : Object | provenance |  |
 | Test.java:386:21:386:23 | out : Model [<map.value>] : Object | Test.java:386:9:386:24 | getMapValue(...) | provenance | MaD:21 |
 | Test.java:391:13:391:34 | of(...) : Map [<map.value>] : Object | Test.java:392:24:392:25 | in : Map [<map.value>] : Object | provenance |  |
-| Test.java:391:26:391:33 | source(...) : Object | Test.java:391:13:391:34 | of(...) : Map [<map.value>] : Object | provenance | MaD:7 |
+| Test.java:391:26:391:33 | source(...) : Object | Test.java:391:13:391:34 | of(...) : Map [<map.value>] : Object | provenance | MaD:5 |
 | Test.java:392:4:392:6 | out [post update] : ConcurrentModel [<map.value>] : Object | Test.java:393:21:393:23 | out : ConcurrentModel [<map.value>] : Object | provenance |  |
-| Test.java:392:24:392:25 | in : Map [<map.value>] : Object | Test.java:392:4:392:6 | out [post update] : ConcurrentModel [<map.value>] : Object | provenance | MaD:24 |
+| Test.java:392:24:392:25 | in : Map [<map.value>] : Object | Test.java:392:4:392:6 | out [post update] : ConcurrentModel [<map.value>] : Object | provenance | MaD:23 |
 | Test.java:393:21:393:23 | out : ConcurrentModel [<map.value>] : Object | Test.java:18:21:18:45 | container : ConcurrentModel [<map.value>] : Object | provenance |  |
 | Test.java:393:21:393:23 | out : ConcurrentModel [<map.value>] : Object | Test.java:393:9:393:24 | getMapValue(...) | provenance | MaD:21 |
 | Test.java:398:16:398:23 | source(...) : Object | Test.java:399:23:399:24 | in : Object | provenance |  |
@@ -373,7 +373,7 @@ edges
 | Test.java:406:10:406:31 | new ModelMap(...) : ModelMap [<map.key>] : String | Test.java:407:19:407:21 | out : ModelMap [<map.key>] : String | provenance |  |
 | Test.java:406:23:406:24 | in : String | Test.java:406:10:406:31 | new ModelMap(...) : ModelMap [<map.key>] : String | provenance | MaD:26 |
 | Test.java:407:19:407:21 | out : ModelMap [<map.key>] : String | Test.java:19:19:19:36 | container : ModelMap [<map.key>] : String | provenance |  |
-| Test.java:407:19:407:21 | out : ModelMap [<map.key>] : String | Test.java:407:9:407:22 | getMapKey(...) | provenance | MaD:5 |
+| Test.java:407:19:407:21 | out : ModelMap [<map.key>] : String | Test.java:407:9:407:22 | getMapKey(...) | provenance | MaD:7 |
 | Test.java:412:16:412:23 | source(...) : Object | Test.java:413:29:413:30 | in : Object | provenance |  |
 | Test.java:413:10:413:31 | new ModelMap(...) : ModelMap [<map.value>] : Object | Test.java:414:21:414:23 | out : ModelMap [<map.value>] : Object | provenance |  |
 | Test.java:413:29:413:30 | in : Object | Test.java:413:10:413:31 | new ModelMap(...) : ModelMap [<map.value>] : Object | provenance | MaD:27 |
@@ -382,86 +382,86 @@ edges
 | Test.java:419:20:419:36 | of(...) : List [<element>] : Object | Test.java:420:25:420:26 | in : List [<element>] : Object | provenance |  |
 | Test.java:419:28:419:35 | source(...) : Object | Test.java:419:20:419:36 | of(...) : List [<element>] : Object | provenance | MaD:3 |
 | Test.java:420:4:420:6 | out [post update] : ModelMap [<map.value>] : Object | Test.java:421:21:421:23 | out : ModelMap [<map.value>] : Object | provenance |  |
-| Test.java:420:25:420:26 | in : List [<element>] : Object | Test.java:420:4:420:6 | out [post update] : ModelMap [<map.value>] : Object | provenance | MaD:29 |
+| Test.java:420:25:420:26 | in : List [<element>] : Object | Test.java:420:4:420:6 | out [post update] : ModelMap [<map.value>] : Object | provenance | MaD:28 |
 | Test.java:421:21:421:23 | out : ModelMap [<map.value>] : Object | Test.java:20:21:20:38 | container : ModelMap [<map.value>] : Object | provenance |  |
 | Test.java:421:21:421:23 | out : ModelMap [<map.value>] : Object | Test.java:421:9:421:24 | getMapValue(...) | provenance | MaD:36 |
 | Test.java:426:20:426:36 | of(...) : List [<element>] : Object | Test.java:428:36:428:37 | in : List [<element>] : Object | provenance |  |
 | Test.java:426:28:426:35 | source(...) : Object | Test.java:426:20:426:36 | of(...) : List [<element>] : Object | provenance | MaD:3 |
 | Test.java:428:10:428:38 | addAllAttributes(...) : ModelMap [<map.value>] : Object | Test.java:429:21:429:23 | out : ModelMap [<map.value>] : Object | provenance |  |
-| Test.java:428:36:428:37 | in : List [<element>] : Object | Test.java:428:10:428:38 | addAllAttributes(...) : ModelMap [<map.value>] : Object | provenance | MaD:29+MaD:28 |
+| Test.java:428:36:428:37 | in : List [<element>] : Object | Test.java:428:10:428:38 | addAllAttributes(...) : ModelMap [<map.value>] : Object | provenance | MaD:28+MaD:31 |
 | Test.java:429:21:429:23 | out : ModelMap [<map.value>] : Object | Test.java:20:21:20:38 | container : ModelMap [<map.value>] : Object | provenance |  |
 | Test.java:429:21:429:23 | out : ModelMap [<map.value>] : Object | Test.java:429:9:429:24 | getMapValue(...) | provenance | MaD:36 |
 | Test.java:434:13:434:34 | of(...) : Map [<map.key>] : Object | Test.java:435:25:435:26 | in : Map [<map.key>] : Object | provenance |  |
-| Test.java:434:20:434:27 | source(...) : Object | Test.java:434:13:434:34 | of(...) : Map [<map.key>] : Object | provenance | MaD:6 |
+| Test.java:434:20:434:27 | source(...) : Object | Test.java:434:13:434:34 | of(...) : Map [<map.key>] : Object | provenance | MaD:4 |
 | Test.java:435:4:435:6 | out [post update] : ModelMap [<map.key>] : Object | Test.java:436:19:436:21 | out : ModelMap [<map.key>] : Object | provenance |  |
-| Test.java:435:25:435:26 | in : Map [<map.key>] : Object | Test.java:435:4:435:6 | out [post update] : ModelMap [<map.key>] : Object | provenance | MaD:30 |
+| Test.java:435:25:435:26 | in : Map [<map.key>] : Object | Test.java:435:4:435:6 | out [post update] : ModelMap [<map.key>] : Object | provenance | MaD:29 |
 | Test.java:436:19:436:21 | out : ModelMap [<map.key>] : Object | Test.java:19:19:19:36 | container : ModelMap [<map.key>] : Object | provenance |  |
-| Test.java:436:19:436:21 | out : ModelMap [<map.key>] : Object | Test.java:436:9:436:22 | getMapKey(...) | provenance | MaD:5 |
+| Test.java:436:19:436:21 | out : ModelMap [<map.key>] : Object | Test.java:436:9:436:22 | getMapKey(...) | provenance | MaD:7 |
 | Test.java:441:13:441:34 | of(...) : Map [<map.key>] : Object | Test.java:443:36:443:37 | in : Map [<map.key>] : Object | provenance |  |
-| Test.java:441:20:441:27 | source(...) : Object | Test.java:441:13:441:34 | of(...) : Map [<map.key>] : Object | provenance | MaD:6 |
+| Test.java:441:20:441:27 | source(...) : Object | Test.java:441:13:441:34 | of(...) : Map [<map.key>] : Object | provenance | MaD:4 |
 | Test.java:443:10:443:38 | addAllAttributes(...) : ModelMap [<map.key>] : Object | Test.java:444:19:444:21 | out : ModelMap [<map.key>] : Object | provenance |  |
-| Test.java:443:36:443:37 | in : Map [<map.key>] : Object | Test.java:443:10:443:38 | addAllAttributes(...) : ModelMap [<map.key>] : Object | provenance | MaD:30+MaD:28 |
+| Test.java:443:36:443:37 | in : Map [<map.key>] : Object | Test.java:443:10:443:38 | addAllAttributes(...) : ModelMap [<map.key>] : Object | provenance | MaD:29+MaD:31 |
 | Test.java:444:19:444:21 | out : ModelMap [<map.key>] : Object | Test.java:19:19:19:36 | container : ModelMap [<map.key>] : Object | provenance |  |
-| Test.java:444:19:444:21 | out : ModelMap [<map.key>] : Object | Test.java:444:9:444:22 | getMapKey(...) | provenance | MaD:5 |
+| Test.java:444:19:444:21 | out : ModelMap [<map.key>] : Object | Test.java:444:9:444:22 | getMapKey(...) | provenance | MaD:7 |
 | Test.java:449:13:449:34 | of(...) : Map [<map.value>] : Object | Test.java:450:25:450:26 | in : Map [<map.value>] : Object | provenance |  |
-| Test.java:449:26:449:33 | source(...) : Object | Test.java:449:13:449:34 | of(...) : Map [<map.value>] : Object | provenance | MaD:7 |
+| Test.java:449:26:449:33 | source(...) : Object | Test.java:449:13:449:34 | of(...) : Map [<map.value>] : Object | provenance | MaD:5 |
 | Test.java:450:4:450:6 | out [post update] : ModelMap [<map.value>] : Object | Test.java:451:21:451:23 | out : ModelMap [<map.value>] : Object | provenance |  |
-| Test.java:450:25:450:26 | in : Map [<map.value>] : Object | Test.java:450:4:450:6 | out [post update] : ModelMap [<map.value>] : Object | provenance | MaD:31 |
+| Test.java:450:25:450:26 | in : Map [<map.value>] : Object | Test.java:450:4:450:6 | out [post update] : ModelMap [<map.value>] : Object | provenance | MaD:30 |
 | Test.java:451:21:451:23 | out : ModelMap [<map.value>] : Object | Test.java:20:21:20:38 | container : ModelMap [<map.value>] : Object | provenance |  |
 | Test.java:451:21:451:23 | out : ModelMap [<map.value>] : Object | Test.java:451:9:451:24 | getMapValue(...) | provenance | MaD:36 |
 | Test.java:456:13:456:34 | of(...) : Map [<map.value>] : Object | Test.java:458:36:458:37 | in : Map [<map.value>] : Object | provenance |  |
-| Test.java:456:26:456:33 | source(...) : Object | Test.java:456:13:456:34 | of(...) : Map [<map.value>] : Object | provenance | MaD:7 |
+| Test.java:456:26:456:33 | source(...) : Object | Test.java:456:13:456:34 | of(...) : Map [<map.value>] : Object | provenance | MaD:5 |
 | Test.java:458:10:458:38 | addAllAttributes(...) : ModelMap [<map.value>] : Object | Test.java:459:21:459:23 | out : ModelMap [<map.value>] : Object | provenance |  |
-| Test.java:458:36:458:37 | in : Map [<map.value>] : Object | Test.java:458:10:458:38 | addAllAttributes(...) : ModelMap [<map.value>] : Object | provenance | MaD:31+MaD:28 |
+| Test.java:458:36:458:37 | in : Map [<map.value>] : Object | Test.java:458:10:458:38 | addAllAttributes(...) : ModelMap [<map.value>] : Object | provenance | MaD:30+MaD:31 |
 | Test.java:459:21:459:23 | out : ModelMap [<map.value>] : Object | Test.java:20:21:20:38 | container : ModelMap [<map.value>] : Object | provenance |  |
 | Test.java:459:21:459:23 | out : ModelMap [<map.value>] : Object | Test.java:459:9:459:24 | getMapValue(...) | provenance | MaD:36 |
 | Test.java:464:18:464:35 | (...)... : ModelMap | Test.java:465:10:465:11 | in : ModelMap | provenance |  |
 | Test.java:464:28:464:35 | source(...) : Object | Test.java:464:18:464:35 | (...)... : ModelMap | provenance |  |
-| Test.java:465:10:465:11 | in : ModelMap | Test.java:465:10:465:39 | addAllAttributes(...) : ModelMap | provenance | MaD:28 |
+| Test.java:465:10:465:11 | in : ModelMap | Test.java:465:10:465:39 | addAllAttributes(...) : ModelMap | provenance | MaD:31 |
 | Test.java:465:10:465:39 | addAllAttributes(...) : ModelMap | Test.java:466:9:466:11 | out | provenance |  |
 | Test.java:471:18:471:35 | (...)... : ModelMap | Test.java:472:10:472:11 | in : ModelMap | provenance |  |
 | Test.java:471:28:471:35 | source(...) : Object | Test.java:471:18:471:35 | (...)... : ModelMap | provenance |  |
-| Test.java:472:10:472:11 | in : ModelMap | Test.java:472:10:472:46 | addAllAttributes(...) : ModelMap | provenance | MaD:28 |
+| Test.java:472:10:472:11 | in : ModelMap | Test.java:472:10:472:46 | addAllAttributes(...) : ModelMap | provenance | MaD:31 |
 | Test.java:472:10:472:46 | addAllAttributes(...) : ModelMap | Test.java:473:9:473:11 | out | provenance |  |
 | Test.java:478:16:478:23 | source(...) : Object | Test.java:479:21:479:22 | in : Object | provenance |  |
 | Test.java:479:4:479:6 | out [post update] : ModelMap [<map.value>] : Object | Test.java:480:21:480:23 | out : ModelMap [<map.value>] : Object | provenance |  |
-| Test.java:479:21:479:22 | in : Object | Test.java:479:4:479:6 | out [post update] : ModelMap [<map.value>] : Object | provenance | MaD:33 |
+| Test.java:479:21:479:22 | in : Object | Test.java:479:4:479:6 | out [post update] : ModelMap [<map.value>] : Object | provenance | MaD:32 |
 | Test.java:480:21:480:23 | out : ModelMap [<map.value>] : Object | Test.java:20:21:20:38 | container : ModelMap [<map.value>] : Object | provenance |  |
 | Test.java:480:21:480:23 | out : ModelMap [<map.value>] : Object | Test.java:480:9:480:24 | getMapValue(...) | provenance | MaD:36 |
 | Test.java:485:16:485:23 | source(...) : Object | Test.java:487:32:487:33 | in : Object | provenance |  |
 | Test.java:487:10:487:34 | addAttribute(...) : ModelMap [<map.value>] : Object | Test.java:488:21:488:23 | out : ModelMap [<map.value>] : Object | provenance |  |
-| Test.java:487:32:487:33 | in : Object | Test.java:487:10:487:34 | addAttribute(...) : ModelMap [<map.value>] : Object | provenance | MaD:33+MaD:32 |
+| Test.java:487:32:487:33 | in : Object | Test.java:487:10:487:34 | addAttribute(...) : ModelMap [<map.value>] : Object | provenance | MaD:32+MaD:35 |
 | Test.java:488:21:488:23 | out : ModelMap [<map.value>] : Object | Test.java:20:21:20:38 | container : ModelMap [<map.value>] : Object | provenance |  |
 | Test.java:488:21:488:23 | out : ModelMap [<map.value>] : Object | Test.java:488:9:488:24 | getMapValue(...) | provenance | MaD:36 |
 | Test.java:493:16:493:31 | (...)... : String | Test.java:494:21:494:22 | in : String | provenance |  |
 | Test.java:493:24:493:31 | source(...) : Object | Test.java:493:16:493:31 | (...)... : String | provenance |  |
 | Test.java:494:4:494:6 | out [post update] : ModelMap [<map.key>] : String | Test.java:495:19:495:21 | out : ModelMap [<map.key>] : String | provenance |  |
-| Test.java:494:21:494:22 | in : String | Test.java:494:4:494:6 | out [post update] : ModelMap [<map.key>] : String | provenance | MaD:34 |
+| Test.java:494:21:494:22 | in : String | Test.java:494:4:494:6 | out [post update] : ModelMap [<map.key>] : String | provenance | MaD:33 |
 | Test.java:495:19:495:21 | out : ModelMap [<map.key>] : String | Test.java:19:19:19:36 | container : ModelMap [<map.key>] : String | provenance |  |
-| Test.java:495:19:495:21 | out : ModelMap [<map.key>] : String | Test.java:495:9:495:22 | getMapKey(...) | provenance | MaD:5 |
+| Test.java:495:19:495:21 | out : ModelMap [<map.key>] : String | Test.java:495:9:495:22 | getMapKey(...) | provenance | MaD:7 |
 | Test.java:500:16:500:31 | (...)... : String | Test.java:502:32:502:33 | in : String | provenance |  |
 | Test.java:500:24:500:31 | source(...) : Object | Test.java:500:16:500:31 | (...)... : String | provenance |  |
 | Test.java:502:10:502:40 | addAttribute(...) : ModelMap [<map.key>] : String | Test.java:503:19:503:21 | out : ModelMap [<map.key>] : String | provenance |  |
-| Test.java:502:32:502:33 | in : String | Test.java:502:10:502:40 | addAttribute(...) : ModelMap [<map.key>] : String | provenance | MaD:34+MaD:32 |
+| Test.java:502:32:502:33 | in : String | Test.java:502:10:502:40 | addAttribute(...) : ModelMap [<map.key>] : String | provenance | MaD:33+MaD:35 |
 | Test.java:503:19:503:21 | out : ModelMap [<map.key>] : String | Test.java:19:19:19:36 | container : ModelMap [<map.key>] : String | provenance |  |
-| Test.java:503:19:503:21 | out : ModelMap [<map.key>] : String | Test.java:503:9:503:22 | getMapKey(...) | provenance | MaD:5 |
+| Test.java:503:19:503:21 | out : ModelMap [<map.key>] : String | Test.java:503:9:503:22 | getMapKey(...) | provenance | MaD:7 |
 | Test.java:508:16:508:23 | source(...) : Object | Test.java:509:27:509:28 | in : Object | provenance |  |
 | Test.java:509:4:509:6 | out [post update] : ModelMap [<map.value>] : Object | Test.java:510:21:510:23 | out : ModelMap [<map.value>] : Object | provenance |  |
-| Test.java:509:27:509:28 | in : Object | Test.java:509:4:509:6 | out [post update] : ModelMap [<map.value>] : Object | provenance | MaD:35 |
+| Test.java:509:27:509:28 | in : Object | Test.java:509:4:509:6 | out [post update] : ModelMap [<map.value>] : Object | provenance | MaD:34 |
 | Test.java:510:21:510:23 | out : ModelMap [<map.value>] : Object | Test.java:20:21:20:38 | container : ModelMap [<map.value>] : Object | provenance |  |
 | Test.java:510:21:510:23 | out : ModelMap [<map.value>] : Object | Test.java:510:9:510:24 | getMapValue(...) | provenance | MaD:36 |
 | Test.java:515:16:515:23 | source(...) : Object | Test.java:517:38:517:39 | in : Object | provenance |  |
 | Test.java:517:10:517:40 | addAttribute(...) : ModelMap [<map.value>] : Object | Test.java:518:21:518:23 | out : ModelMap [<map.value>] : Object | provenance |  |
-| Test.java:517:38:517:39 | in : Object | Test.java:517:10:517:40 | addAttribute(...) : ModelMap [<map.value>] : Object | provenance | MaD:35+MaD:32 |
+| Test.java:517:38:517:39 | in : Object | Test.java:517:10:517:40 | addAttribute(...) : ModelMap [<map.value>] : Object | provenance | MaD:34+MaD:35 |
 | Test.java:518:21:518:23 | out : ModelMap [<map.value>] : Object | Test.java:20:21:20:38 | container : ModelMap [<map.value>] : Object | provenance |  |
 | Test.java:518:21:518:23 | out : ModelMap [<map.value>] : Object | Test.java:518:9:518:24 | getMapValue(...) | provenance | MaD:36 |
 | Test.java:523:18:523:35 | (...)... : ModelMap | Test.java:524:10:524:11 | in : ModelMap | provenance |  |
 | Test.java:523:28:523:35 | source(...) : Object | Test.java:523:18:523:35 | (...)... : ModelMap | provenance |  |
-| Test.java:524:10:524:11 | in : ModelMap | Test.java:524:10:524:36 | addAttribute(...) : ModelMap | provenance | MaD:32 |
+| Test.java:524:10:524:11 | in : ModelMap | Test.java:524:10:524:36 | addAttribute(...) : ModelMap | provenance | MaD:35 |
 | Test.java:524:10:524:36 | addAttribute(...) : ModelMap | Test.java:525:9:525:11 | out | provenance |  |
 | Test.java:530:18:530:35 | (...)... : ModelMap | Test.java:531:10:531:11 | in : ModelMap | provenance |  |
 | Test.java:530:28:530:35 | source(...) : Object | Test.java:530:18:530:35 | (...)... : ModelMap | provenance |  |
-| Test.java:531:10:531:11 | in : ModelMap | Test.java:531:10:531:30 | addAttribute(...) : ModelMap | provenance | MaD:32 |
+| Test.java:531:10:531:11 | in : ModelMap | Test.java:531:10:531:30 | addAttribute(...) : ModelMap | provenance | MaD:35 |
 | Test.java:531:10:531:30 | addAttribute(...) : ModelMap | Test.java:532:9:532:11 | out | provenance |  |
 | Test.java:537:18:537:45 | new ModelMap(...) : ModelMap [<map.value>] : Object | Test.java:538:10:538:11 | in : ModelMap [<map.value>] : Object | provenance |  |
 | Test.java:537:37:537:44 | source(...) : Object | Test.java:537:18:537:45 | new ModelMap(...) : ModelMap [<map.value>] : Object | provenance | MaD:27 |
@@ -469,31 +469,31 @@ edges
 | Test.java:538:10:538:30 | getAttribute(...) : Object | Test.java:539:9:539:11 | out | provenance |  |
 | Test.java:544:18:544:35 | (...)... : ModelMap | Test.java:545:10:545:11 | in : ModelMap | provenance |  |
 | Test.java:544:28:544:35 | source(...) : Object | Test.java:544:18:544:35 | (...)... : ModelMap | provenance |  |
-| Test.java:545:10:545:11 | in : ModelMap | Test.java:545:10:545:33 | mergeAttributes(...) : ModelMap | provenance | MaD:37 |
+| Test.java:545:10:545:11 | in : ModelMap | Test.java:545:10:545:33 | mergeAttributes(...) : ModelMap | provenance | MaD:39 |
 | Test.java:545:10:545:33 | mergeAttributes(...) : ModelMap | Test.java:546:9:546:11 | out | provenance |  |
 | Test.java:551:18:551:53 | new ModelMap(...) : ModelMap [<map.key>] : String | Test.java:552:10:552:11 | in : ModelMap [<map.key>] : String | provenance |  |
 | Test.java:551:31:551:46 | (...)... : String | Test.java:551:18:551:53 | new ModelMap(...) : ModelMap [<map.key>] : String | provenance | MaD:26 |
 | Test.java:551:39:551:46 | source(...) : Object | Test.java:551:31:551:46 | (...)... : String | provenance |  |
-| Test.java:552:10:552:11 | in : ModelMap [<map.key>] : String | Test.java:552:10:552:33 | mergeAttributes(...) : ModelMap [<map.key>] : String | provenance | MaD:37 |
+| Test.java:552:10:552:11 | in : ModelMap [<map.key>] : String | Test.java:552:10:552:33 | mergeAttributes(...) : ModelMap [<map.key>] : String | provenance | MaD:39 |
 | Test.java:552:10:552:33 | mergeAttributes(...) : ModelMap [<map.key>] : String | Test.java:553:19:553:21 | out : ModelMap [<map.key>] : String | provenance |  |
 | Test.java:553:19:553:21 | out : ModelMap [<map.key>] : String | Test.java:19:19:19:36 | container : ModelMap [<map.key>] : String | provenance |  |
-| Test.java:553:19:553:21 | out : ModelMap [<map.key>] : String | Test.java:553:9:553:22 | getMapKey(...) | provenance | MaD:5 |
+| Test.java:553:19:553:21 | out : ModelMap [<map.key>] : String | Test.java:553:9:553:22 | getMapKey(...) | provenance | MaD:7 |
 | Test.java:558:13:558:34 | of(...) : Map [<map.key>] : Object | Test.java:559:24:559:25 | in : Map [<map.key>] : Object | provenance |  |
-| Test.java:558:20:558:27 | source(...) : Object | Test.java:558:13:558:34 | of(...) : Map [<map.key>] : Object | provenance | MaD:6 |
+| Test.java:558:20:558:27 | source(...) : Object | Test.java:558:13:558:34 | of(...) : Map [<map.key>] : Object | provenance | MaD:4 |
 | Test.java:559:4:559:6 | out [post update] : ModelMap [<map.key>] : Object | Test.java:560:19:560:21 | out : ModelMap [<map.key>] : Object | provenance |  |
-| Test.java:559:24:559:25 | in : Map [<map.key>] : Object | Test.java:559:4:559:6 | out [post update] : ModelMap [<map.key>] : Object | provenance | MaD:38 |
+| Test.java:559:24:559:25 | in : Map [<map.key>] : Object | Test.java:559:4:559:6 | out [post update] : ModelMap [<map.key>] : Object | provenance | MaD:37 |
 | Test.java:560:19:560:21 | out : ModelMap [<map.key>] : Object | Test.java:19:19:19:36 | container : ModelMap [<map.key>] : Object | provenance |  |
-| Test.java:560:19:560:21 | out : ModelMap [<map.key>] : Object | Test.java:560:9:560:22 | getMapKey(...) | provenance | MaD:5 |
+| Test.java:560:19:560:21 | out : ModelMap [<map.key>] : Object | Test.java:560:9:560:22 | getMapKey(...) | provenance | MaD:7 |
 | Test.java:565:18:565:45 | new ModelMap(...) : ModelMap [<map.value>] : Object | Test.java:566:10:566:11 | in : ModelMap [<map.value>] : Object | provenance |  |
 | Test.java:565:37:565:44 | source(...) : Object | Test.java:565:18:565:45 | new ModelMap(...) : ModelMap [<map.value>] : Object | provenance | MaD:27 |
-| Test.java:566:10:566:11 | in : ModelMap [<map.value>] : Object | Test.java:566:10:566:33 | mergeAttributes(...) : ModelMap [<map.value>] : Object | provenance | MaD:37 |
+| Test.java:566:10:566:11 | in : ModelMap [<map.value>] : Object | Test.java:566:10:566:33 | mergeAttributes(...) : ModelMap [<map.value>] : Object | provenance | MaD:39 |
 | Test.java:566:10:566:33 | mergeAttributes(...) : ModelMap [<map.value>] : Object | Test.java:567:21:567:23 | out : ModelMap [<map.value>] : Object | provenance |  |
 | Test.java:567:21:567:23 | out : ModelMap [<map.value>] : Object | Test.java:20:21:20:38 | container : ModelMap [<map.value>] : Object | provenance |  |
 | Test.java:567:21:567:23 | out : ModelMap [<map.value>] : Object | Test.java:567:9:567:24 | getMapValue(...) | provenance | MaD:36 |
 | Test.java:572:13:572:34 | of(...) : Map [<map.value>] : Object | Test.java:573:24:573:25 | in : Map [<map.value>] : Object | provenance |  |
-| Test.java:572:26:572:33 | source(...) : Object | Test.java:572:13:572:34 | of(...) : Map [<map.value>] : Object | provenance | MaD:7 |
+| Test.java:572:26:572:33 | source(...) : Object | Test.java:572:13:572:34 | of(...) : Map [<map.value>] : Object | provenance | MaD:5 |
 | Test.java:573:4:573:6 | out [post update] : ModelMap [<map.value>] : Object | Test.java:574:21:574:23 | out : ModelMap [<map.value>] : Object | provenance |  |
-| Test.java:573:24:573:25 | in : Map [<map.value>] : Object | Test.java:573:4:573:6 | out [post update] : ModelMap [<map.value>] : Object | provenance | MaD:39 |
+| Test.java:573:24:573:25 | in : Map [<map.value>] : Object | Test.java:573:4:573:6 | out [post update] : ModelMap [<map.value>] : Object | provenance | MaD:38 |
 | Test.java:574:21:574:23 | out : ModelMap [<map.value>] : Object | Test.java:20:21:20:38 | container : ModelMap [<map.value>] : Object | provenance |  |
 | Test.java:574:21:574:23 | out : ModelMap [<map.value>] : Object | Test.java:574:9:574:24 | getMapValue(...) | provenance | MaD:36 |
 nodes
diff --git a/java/ql/test/library-tests/frameworks/spring/util/test.expected b/java/ql/test/library-tests/frameworks/spring/util/test.expected
index bb5944e8dee..4e5c0634adc 100644
--- a/java/ql/test/library-tests/frameworks/spring/util/test.expected
+++ b/java/ql/test/library-tests/frameworks/spring/util/test.expected
@@ -7,10 +7,10 @@ models
 | 6 | Summary: java.util; Dictionary; true; put; (Object,Object); ; Argument[1]; Argument[this].MapValue; value; manual |
 | 7 | Summary: java.util; Iterator; true; next; ; ; Argument[this].Element; ReturnValue; value; manual |
 | 8 | Summary: java.util; List; false; of; (Object); ; Argument[0]; ReturnValue.Element; value; manual |
-| 9 | Summary: java.util; Map; true; get; ; ; Argument[this].MapValue; ReturnValue; value; manual |
-| 10 | Summary: java.util; Map; true; keySet; (); ; Argument[this].MapKey; ReturnValue.Element; value; manual |
-| 11 | Summary: java.util; Map; false; of; ; ; Argument[0]; ReturnValue.MapKey; value; manual |
-| 12 | Summary: java.util; Map; false; of; ; ; Argument[1]; ReturnValue.MapValue; value; manual |
+| 9 | Summary: java.util; Map; false; of; ; ; Argument[0]; ReturnValue.MapKey; value; manual |
+| 10 | Summary: java.util; Map; false; of; ; ; Argument[1]; ReturnValue.MapValue; value; manual |
+| 11 | Summary: java.util; Map; true; get; ; ; Argument[this].MapValue; ReturnValue; value; manual |
+| 12 | Summary: java.util; Map; true; keySet; (); ; Argument[this].MapKey; ReturnValue.Element; value; manual |
 | 13 | Summary: java.util; Map; true; put; (Object,Object); ; Argument[0]; Argument[this].MapKey; value; manual |
 | 14 | Summary: java.util; Map; true; put; (Object,Object); ; Argument[1]; Argument[this].MapValue; value; manual |
 | 15 | Summary: java.util; Optional; false; of; ; ; Argument[0]; ReturnValue.Element; value; manual |
@@ -49,10 +49,10 @@ models
 | 48 | Summary: org.springframework.util; FastByteArrayOutputStream; false; toByteArray; ; ; Argument[this]; ReturnValue; taint; manual |
 | 49 | Summary: org.springframework.util; FastByteArrayOutputStream; false; write; ; ; Argument[0]; Argument[this]; taint; manual |
 | 50 | Summary: org.springframework.util; FastByteArrayOutputStream; false; writeTo; ; ; Argument[this]; Argument[0]; taint; manual |
-| 51 | Summary: org.springframework.util; FileCopyUtils; false; copy; (byte[],OutputStream); ; Argument[0]; Argument[1]; taint; manual |
-| 52 | Summary: org.springframework.util; FileCopyUtils; false; copy; (InputStream,OutputStream); ; Argument[0]; Argument[1]; taint; manual |
-| 53 | Summary: org.springframework.util; FileCopyUtils; false; copy; (Reader,Writer); ; Argument[0]; Argument[1]; taint; manual |
-| 54 | Summary: org.springframework.util; FileCopyUtils; false; copy; (String,Writer); ; Argument[0]; Argument[1]; taint; manual |
+| 51 | Summary: org.springframework.util; FileCopyUtils; false; copy; (InputStream,OutputStream); ; Argument[0]; Argument[1]; taint; manual |
+| 52 | Summary: org.springframework.util; FileCopyUtils; false; copy; (Reader,Writer); ; Argument[0]; Argument[1]; taint; manual |
+| 53 | Summary: org.springframework.util; FileCopyUtils; false; copy; (String,Writer); ; Argument[0]; Argument[1]; taint; manual |
+| 54 | Summary: org.springframework.util; FileCopyUtils; false; copy; (byte[],OutputStream); ; Argument[0]; Argument[1]; taint; manual |
 | 55 | Summary: org.springframework.util; FileCopyUtils; false; copyToByteArray; ; ; Argument[0]; ReturnValue; taint; manual |
 | 56 | Summary: org.springframework.util; FileCopyUtils; false; copyToString; ; ; Argument[0]; ReturnValue; taint; manual |
 | 57 | Summary: org.springframework.util; FileSystemUtils; false; copyRecursively; (java.io.File,java.io.File); ; Argument[0]; Argument[1]; taint; manual |
@@ -176,11 +176,11 @@ edges
 | Test.java:51:21:51:39 | container : MultiValueMap [<map.key>] : Object | Test.java:51:51:51:59 | container : MultiValueMap [<map.key>] : Object | provenance |  |
 | Test.java:51:21:51:39 | container : MultiValueMapAdapter [<map.key>] : Object | Test.java:51:51:51:59 | container : MultiValueMapAdapter [<map.key>] : Object | provenance |  |
 | Test.java:51:21:51:39 | container : Properties [<map.key>] : Object | Test.java:51:51:51:59 | container : Properties [<map.key>] : Object | provenance |  |
-| Test.java:51:51:51:59 | container : LinkedMultiValueMap [<map.key>] : Object | Test.java:51:51:51:68 | keySet(...) : Set [<element>] : Object | provenance | MaD:10 |
-| Test.java:51:51:51:59 | container : Map [<map.key>] : Object | Test.java:51:51:51:68 | keySet(...) : Set [<element>] : Object | provenance | MaD:10 |
-| Test.java:51:51:51:59 | container : MultiValueMap [<map.key>] : Object | Test.java:51:51:51:68 | keySet(...) : Set [<element>] : Object | provenance | MaD:10 |
-| Test.java:51:51:51:59 | container : MultiValueMapAdapter [<map.key>] : Object | Test.java:51:51:51:68 | keySet(...) : Set [<element>] : Object | provenance | MaD:10 |
-| Test.java:51:51:51:59 | container : Properties [<map.key>] : Object | Test.java:51:51:51:68 | keySet(...) : Set [<element>] : Object | provenance | MaD:10 |
+| Test.java:51:51:51:59 | container : LinkedMultiValueMap [<map.key>] : Object | Test.java:51:51:51:68 | keySet(...) : Set [<element>] : Object | provenance | MaD:12 |
+| Test.java:51:51:51:59 | container : Map [<map.key>] : Object | Test.java:51:51:51:68 | keySet(...) : Set [<element>] : Object | provenance | MaD:12 |
+| Test.java:51:51:51:59 | container : MultiValueMap [<map.key>] : Object | Test.java:51:51:51:68 | keySet(...) : Set [<element>] : Object | provenance | MaD:12 |
+| Test.java:51:51:51:59 | container : MultiValueMapAdapter [<map.key>] : Object | Test.java:51:51:51:68 | keySet(...) : Set [<element>] : Object | provenance | MaD:12 |
+| Test.java:51:51:51:59 | container : Properties [<map.key>] : Object | Test.java:51:51:51:68 | keySet(...) : Set [<element>] : Object | provenance | MaD:12 |
 | Test.java:51:51:51:68 | keySet(...) : Set [<element>] : Object | Test.java:51:51:51:79 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:3 |
 | Test.java:51:51:51:68 | keySet(...) : Set [<element>] : Object | Test.java:51:51:51:79 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:3 |
 | Test.java:51:51:51:68 | keySet(...) : Set [<element>] : Object | Test.java:51:51:51:79 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:3 |
@@ -197,12 +197,12 @@ edges
 | Test.java:52:23:52:41 | container : MultiValueMap [<map.value>] : Object | Test.java:52:53:52:61 | container : MultiValueMap [<map.value>] : Object | provenance |  |
 | Test.java:52:23:52:41 | container : MultiValueMapAdapter [<map.value>, <element>] : Object | Test.java:52:53:52:61 | container : MultiValueMapAdapter [<map.value>, <element>] : Object | provenance |  |
 | Test.java:52:23:52:41 | container : Properties [<map.value>] : Object | Test.java:52:53:52:61 | container : Properties [<map.value>] : Object | provenance |  |
-| Test.java:52:53:52:61 | container : LinkedMultiValueMap [<map.value>, <element>] : Object | Test.java:52:53:52:71 | get(...) : Object [<element>] : Object | provenance | MaD:9 |
-| Test.java:52:53:52:61 | container : Map [<map.value>] : Object | Test.java:52:53:52:71 | get(...) : Object | provenance | MaD:9 |
-| Test.java:52:53:52:61 | container : MultiValueMap [<map.value>, <element>] : Object | Test.java:52:53:52:71 | get(...) : Object [<element>] : Object | provenance | MaD:9 |
-| Test.java:52:53:52:61 | container : MultiValueMap [<map.value>] : Object | Test.java:52:53:52:71 | get(...) : Object | provenance | MaD:9 |
-| Test.java:52:53:52:61 | container : MultiValueMapAdapter [<map.value>, <element>] : Object | Test.java:52:53:52:71 | get(...) : Object [<element>] : Object | provenance | MaD:9 |
-| Test.java:52:53:52:61 | container : Properties [<map.value>] : Object | Test.java:52:53:52:71 | get(...) : Object | provenance | MaD:9 |
+| Test.java:52:53:52:61 | container : LinkedMultiValueMap [<map.value>, <element>] : Object | Test.java:52:53:52:71 | get(...) : Object [<element>] : Object | provenance | MaD:11 |
+| Test.java:52:53:52:61 | container : Map [<map.value>] : Object | Test.java:52:53:52:71 | get(...) : Object | provenance | MaD:11 |
+| Test.java:52:53:52:61 | container : MultiValueMap [<map.value>, <element>] : Object | Test.java:52:53:52:71 | get(...) : Object [<element>] : Object | provenance | MaD:11 |
+| Test.java:52:53:52:61 | container : MultiValueMap [<map.value>] : Object | Test.java:52:53:52:71 | get(...) : Object | provenance | MaD:11 |
+| Test.java:52:53:52:61 | container : MultiValueMapAdapter [<map.value>, <element>] : Object | Test.java:52:53:52:71 | get(...) : Object [<element>] : Object | provenance | MaD:11 |
+| Test.java:52:53:52:61 | container : Properties [<map.value>] : Object | Test.java:52:53:52:71 | get(...) : Object | provenance | MaD:11 |
 | Test.java:53:31:53:44 | element : Object | Test.java:53:70:53:76 | element : Object | provenance |  |
 | Test.java:53:56:53:77 | {...} : Object[] [[]] : Object | Test.java:53:56:53:77 | new Object[] : Object[] [[]] : Object | provenance |  |
 | Test.java:53:70:53:76 | element : Object | Test.java:53:56:53:77 | {...} : Object[] [[]] : Object | provenance |  |
@@ -218,7 +218,7 @@ edges
 | Test.java:66:25:66:32 | source(...) : Object | Test.java:66:17:66:32 | (...)... : String | provenance |  |
 | Test.java:67:33:67:34 | in : String | Test.java:67:43:67:45 | out [post update] : HashMap [<map.value>] : Object | provenance | MaD:18 |
 | Test.java:67:43:67:45 | out [post update] : HashMap [<map.value>] : Object | Test.java:68:10:68:12 | out : HashMap [<map.value>] : Object | provenance |  |
-| Test.java:68:10:68:12 | out : HashMap [<map.value>] : Object | Test.java:68:10:68:27 | get(...) | provenance | MaD:9 |
+| Test.java:68:10:68:12 | out : HashMap [<map.value>] : Object | Test.java:68:10:68:27 | get(...) | provenance | MaD:11 |
 | Test.java:73:17:73:32 | (...)... : String | Test.java:74:29:74:30 | in : String | provenance |  |
 | Test.java:73:25:73:32 | source(...) : Object | Test.java:73:17:73:32 | (...)... : String | provenance |  |
 | Test.java:74:11:74:31 | tokenizePath(...) : String[] [[]] : Object | Test.java:75:10:75:12 | out : String[] [[]] : Object | provenance |  |
@@ -246,7 +246,7 @@ edges
 | Test.java:119:10:119:55 | extractUriTemplateVariables(...) : Map [<map.value>] : Object | Test.java:120:21:120:23 | out : Map [<map.value>] : Object | provenance |  |
 | Test.java:119:53:119:54 | in : String | Test.java:119:10:119:55 | extractUriTemplateVariables(...) : Map [<map.value>] : Object | provenance | MaD:20 |
 | Test.java:120:21:120:23 | out : Map [<map.value>] : Object | Test.java:52:23:52:41 | container : Map [<map.value>] : Object | provenance |  |
-| Test.java:120:21:120:23 | out : Map [<map.value>] : Object | Test.java:120:9:120:24 | getMapValue(...) | provenance | MaD:9 |
+| Test.java:120:21:120:23 | out : Map [<map.value>] : Object | Test.java:120:9:120:24 | getMapValue(...) | provenance | MaD:11 |
 | Test.java:125:14:125:30 | of(...) : List [<element>] : Object | Test.java:126:33:126:34 | in : List [<element>] : Object | provenance |  |
 | Test.java:125:22:125:29 | source(...) : Object | Test.java:125:14:125:30 | of(...) : List [<element>] : Object | provenance | MaD:8 |
 | Test.java:126:10:126:48 | new AutoPopulatingList<>(...) : AutoPopulatingList [<element>] : Object | Test.java:127:20:127:22 | out : AutoPopulatingList [<element>] : Object | provenance |  |
@@ -340,7 +340,7 @@ edges
 | Test.java:259:43:259:44 | in : Properties [<map.key>] : Object | Test.java:259:47:259:49 | out [post update] : Map [<map.key>] : Object | provenance | MaD:39 |
 | Test.java:259:47:259:49 | out [post update] : Map [<map.key>] : Object | Test.java:260:19:260:21 | out : Map [<map.key>] : Object | provenance |  |
 | Test.java:260:19:260:21 | out : Map [<map.key>] : Object | Test.java:51:21:51:39 | container : Map [<map.key>] : Object | provenance |  |
-| Test.java:260:19:260:21 | out : Map [<map.key>] : Object | Test.java:260:9:260:22 | getMapKey(...) | provenance | MaD:10 |
+| Test.java:260:19:260:21 | out : Map [<map.key>] : Object | Test.java:260:9:260:22 | getMapKey(...) | provenance | MaD:12 |
 | Test.java:265:20:265:54 | newPropertiesWithMapValue(...) : Properties [<map.value>] : Object | Test.java:266:43:266:44 | in : Properties [<map.value>] : Object | provenance |  |
 | Test.java:265:46:265:53 | source(...) : Object | Test.java:55:39:55:52 | element : Object | provenance |  |
 | Test.java:265:46:265:53 | source(...) : Object | Test.java:265:20:265:54 | newPropertiesWithMapValue(...) : Properties [<map.value>] : Object | provenance | MaD:6 |
@@ -348,7 +348,7 @@ edges
 | Test.java:266:43:266:44 | in : Properties [<map.value>] : Object | Test.java:266:47:266:49 | out [post update] : Map [<map.value>] : Object | provenance | MaD:40 |
 | Test.java:266:47:266:49 | out [post update] : Map [<map.value>] : Object | Test.java:267:21:267:23 | out : Map [<map.value>] : Object | provenance |  |
 | Test.java:267:21:267:23 | out : Map [<map.value>] : Object | Test.java:52:23:52:41 | container : Map [<map.value>] : Object | provenance |  |
-| Test.java:267:21:267:23 | out : Map [<map.value>] : Object | Test.java:267:9:267:24 | getMapValue(...) | provenance | MaD:9 |
+| Test.java:267:21:267:23 | out : Map [<map.value>] : Object | Test.java:267:9:267:24 | getMapValue(...) | provenance | MaD:11 |
 | Test.java:272:21:272:62 | enumeration(...) : Enumeration [<element>] : Object | Test.java:273:37:273:38 | in : Enumeration [<element>] : Object | provenance |  |
 | Test.java:272:45:272:61 | of(...) : List [<element>] : Object | Test.java:272:21:272:62 | enumeration(...) : Enumeration [<element>] : Object | provenance | MaD:4 |
 | Test.java:272:53:272:60 | source(...) : Object | Test.java:272:45:272:61 | of(...) : List [<element>] : Object | provenance | MaD:8 |
@@ -357,33 +357,33 @@ edges
 | Test.java:274:20:274:22 | out : Iterator [<element>] : Object | Test.java:50:19:50:39 | container : Iterator [<element>] : Object | provenance |  |
 | Test.java:274:20:274:22 | out : Iterator [<element>] : Object | Test.java:274:9:274:23 | getElement(...) | provenance | MaD:7 |
 | Test.java:279:13:279:43 | of(...) : Map [<map.value>, <element>] : Object | Test.java:280:42:280:43 | in : Map [<map.value>, <element>] : Object | provenance |  |
-| Test.java:279:26:279:42 | of(...) : List [<element>] : Object | Test.java:279:13:279:43 | of(...) : Map [<map.value>, <element>] : Object | provenance | MaD:12 |
+| Test.java:279:26:279:42 | of(...) : List [<element>] : Object | Test.java:279:13:279:43 | of(...) : Map [<map.value>, <element>] : Object | provenance | MaD:10 |
 | Test.java:279:34:279:41 | source(...) : Object | Test.java:279:26:279:42 | of(...) : List [<element>] : Object | provenance | MaD:8 |
 | Test.java:280:10:280:44 | toMultiValueMap(...) : MultiValueMap [<map.value>, <element>] : Object | Test.java:281:32:281:34 | out : MultiValueMap [<map.value>, <element>] : Object | provenance |  |
 | Test.java:280:42:280:43 | in : Map [<map.value>, <element>] : Object | Test.java:280:10:280:44 | toMultiValueMap(...) : MultiValueMap [<map.value>, <element>] : Object | provenance | MaD:43 |
 | Test.java:281:20:281:35 | getMapValue(...) : List [<element>] : Object | Test.java:49:19:49:41 | container : List [<element>] : Object | provenance |  |
 | Test.java:281:20:281:35 | getMapValue(...) : List [<element>] : Object | Test.java:281:9:281:36 | getElement(...) | provenance | MaD:3 |
 | Test.java:281:32:281:34 | out : MultiValueMap [<map.value>, <element>] : Object | Test.java:52:23:52:41 | container : MultiValueMap [<map.value>, <element>] : Object | provenance |  |
-| Test.java:281:32:281:34 | out : MultiValueMap [<map.value>, <element>] : Object | Test.java:281:20:281:35 | getMapValue(...) : List [<element>] : Object | provenance | MaD:9 |
+| Test.java:281:32:281:34 | out : MultiValueMap [<map.value>, <element>] : Object | Test.java:281:20:281:35 | getMapValue(...) : List [<element>] : Object | provenance | MaD:11 |
 | Test.java:286:13:286:34 | of(...) : Map [<map.key>] : Object | Test.java:287:42:287:43 | in : Map [<map.key>] : Object | provenance |  |
-| Test.java:286:20:286:27 | source(...) : Object | Test.java:286:13:286:34 | of(...) : Map [<map.key>] : Object | provenance | MaD:11 |
+| Test.java:286:20:286:27 | source(...) : Object | Test.java:286:13:286:34 | of(...) : Map [<map.key>] : Object | provenance | MaD:9 |
 | Test.java:287:10:287:44 | toMultiValueMap(...) : MultiValueMap [<map.key>] : Object | Test.java:288:19:288:21 | out : MultiValueMap [<map.key>] : Object | provenance |  |
 | Test.java:287:42:287:43 | in : Map [<map.key>] : Object | Test.java:287:10:287:44 | toMultiValueMap(...) : MultiValueMap [<map.key>] : Object | provenance | MaD:42 |
 | Test.java:288:19:288:21 | out : MultiValueMap [<map.key>] : Object | Test.java:51:21:51:39 | container : MultiValueMap [<map.key>] : Object | provenance |  |
-| Test.java:288:19:288:21 | out : MultiValueMap [<map.key>] : Object | Test.java:288:9:288:22 | getMapKey(...) | provenance | MaD:10 |
+| Test.java:288:19:288:21 | out : MultiValueMap [<map.key>] : Object | Test.java:288:9:288:22 | getMapKey(...) | provenance | MaD:12 |
 | Test.java:293:23:293:69 | new LinkedMultiValueMap<>(...) : LinkedMultiValueMap [<map.key>] : Object | Test.java:294:52:294:53 | in : LinkedMultiValueMap [<map.key>] : Object | provenance |  |
 | Test.java:293:47:293:68 | of(...) : Map [<map.key>] : Object | Test.java:293:23:293:69 | new LinkedMultiValueMap<>(...) : LinkedMultiValueMap [<map.key>] : Object | provenance | MaD:58 |
-| Test.java:293:54:293:61 | source(...) : Object | Test.java:293:47:293:68 | of(...) : Map [<map.key>] : Object | provenance | MaD:11 |
+| Test.java:293:54:293:61 | source(...) : Object | Test.java:293:47:293:68 | of(...) : Map [<map.key>] : Object | provenance | MaD:9 |
 | Test.java:294:10:294:54 | unmodifiableMultiValueMap(...) : MultiValueMap [<map.key>] : Object | Test.java:295:19:295:21 | out : MultiValueMap [<map.key>] : Object | provenance |  |
 | Test.java:294:52:294:53 | in : LinkedMultiValueMap [<map.key>] : Object | Test.java:294:10:294:54 | unmodifiableMultiValueMap(...) : MultiValueMap [<map.key>] : Object | provenance | MaD:44 |
 | Test.java:295:19:295:21 | out : MultiValueMap [<map.key>] : Object | Test.java:51:21:51:39 | container : MultiValueMap [<map.key>] : Object | provenance |  |
-| Test.java:295:19:295:21 | out : MultiValueMap [<map.key>] : Object | Test.java:295:9:295:22 | getMapKey(...) | provenance | MaD:10 |
+| Test.java:295:19:295:21 | out : MultiValueMap [<map.key>] : Object | Test.java:295:9:295:22 | getMapKey(...) | provenance | MaD:12 |
 | Test.java:301:4:301:5 | in [post update] : LinkedMultiValueMap [<map.value>] : Object | Test.java:302:52:302:53 | in : LinkedMultiValueMap [<map.value>] : Object | provenance |  |
 | Test.java:301:17:301:24 | source(...) : Object | Test.java:301:4:301:5 | in [post update] : LinkedMultiValueMap [<map.value>] : Object | provenance | MaD:14 |
 | Test.java:302:10:302:54 | unmodifiableMultiValueMap(...) : MultiValueMap [<map.value>] : Object | Test.java:303:21:303:23 | out : MultiValueMap [<map.value>] : Object | provenance |  |
 | Test.java:302:52:302:53 | in : LinkedMultiValueMap [<map.value>] : Object | Test.java:302:10:302:54 | unmodifiableMultiValueMap(...) : MultiValueMap [<map.value>] : Object | provenance | MaD:45 |
 | Test.java:303:21:303:23 | out : MultiValueMap [<map.value>] : Object | Test.java:52:23:52:41 | container : MultiValueMap [<map.value>] : Object | provenance |  |
-| Test.java:303:21:303:23 | out : MultiValueMap [<map.value>] : Object | Test.java:303:9:303:24 | getMapValue(...) | provenance | MaD:9 |
+| Test.java:303:21:303:23 | out : MultiValueMap [<map.value>] : Object | Test.java:303:9:303:24 | getMapValue(...) | provenance | MaD:11 |
 | Test.java:308:18:308:34 | of(...) : List [<element>] : Object | Test.java:308:18:308:45 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:3 |
 | Test.java:308:18:308:45 | iterator(...) : Iterator [<element>] : Object | Test.java:309:12:309:13 | in : Iterator [<element>] : Object | provenance |  |
 | Test.java:308:26:308:33 | source(...) : Object | Test.java:308:18:308:34 | of(...) : List [<element>] : Object | provenance | MaD:8 |
@@ -421,19 +421,19 @@ edges
 | Test.java:352:15:352:17 | out [post update] : OutputStream | Test.java:353:9:353:11 | out | provenance |  |
 | Test.java:358:16:358:31 | (...)... : String | Test.java:359:23:359:24 | in : String | provenance |  |
 | Test.java:358:24:358:31 | source(...) : Object | Test.java:358:16:358:31 | (...)... : String | provenance |  |
-| Test.java:359:23:359:24 | in : String | Test.java:359:27:359:29 | out [post update] : Writer | provenance | MaD:54 |
+| Test.java:359:23:359:24 | in : String | Test.java:359:27:359:29 | out [post update] : Writer | provenance | MaD:53 |
 | Test.java:359:27:359:29 | out [post update] : Writer | Test.java:360:9:360:11 | out | provenance |  |
 | Test.java:365:16:365:31 | (...)... : Reader | Test.java:366:23:366:24 | in : Reader | provenance |  |
 | Test.java:365:24:365:31 | source(...) : Object | Test.java:365:16:365:31 | (...)... : Reader | provenance |  |
-| Test.java:366:23:366:24 | in : Reader | Test.java:366:27:366:29 | out [post update] : Writer | provenance | MaD:53 |
+| Test.java:366:23:366:24 | in : Reader | Test.java:366:27:366:29 | out [post update] : Writer | provenance | MaD:52 |
 | Test.java:366:27:366:29 | out [post update] : Writer | Test.java:367:9:367:11 | out | provenance |  |
 | Test.java:372:16:372:31 | (...)... : byte[] | Test.java:373:23:373:24 | in : byte[] | provenance |  |
 | Test.java:372:24:372:31 | source(...) : Object | Test.java:372:16:372:31 | (...)... : byte[] | provenance |  |
-| Test.java:373:23:373:24 | in : byte[] | Test.java:373:27:373:29 | out [post update] : OutputStream | provenance | MaD:51 |
+| Test.java:373:23:373:24 | in : byte[] | Test.java:373:27:373:29 | out [post update] : OutputStream | provenance | MaD:54 |
 | Test.java:373:27:373:29 | out [post update] : OutputStream | Test.java:374:9:374:11 | out | provenance |  |
 | Test.java:379:21:379:41 | (...)... : InputStream | Test.java:380:23:380:24 | in : InputStream | provenance |  |
 | Test.java:379:34:379:41 | source(...) : Object | Test.java:379:21:379:41 | (...)... : InputStream | provenance |  |
-| Test.java:380:23:380:24 | in : InputStream | Test.java:380:27:380:29 | out [post update] : OutputStream | provenance | MaD:52 |
+| Test.java:380:23:380:24 | in : InputStream | Test.java:380:27:380:29 | out [post update] : OutputStream | provenance | MaD:51 |
 | Test.java:380:27:380:29 | out [post update] : OutputStream | Test.java:381:9:381:11 | out | provenance |  |
 | Test.java:386:21:386:41 | (...)... : InputStream | Test.java:387:40:387:41 | in : InputStream | provenance |  |
 | Test.java:386:34:386:41 | source(...) : Object | Test.java:386:21:386:41 | (...)... : InputStream | provenance |  |
@@ -452,26 +452,26 @@ edges
 | Test.java:408:36:408:37 | in : File | Test.java:408:40:408:42 | out [post update] : File | provenance | MaD:57 |
 | Test.java:408:40:408:42 | out [post update] : File | Test.java:409:9:409:11 | out | provenance |  |
 | Test.java:414:13:414:43 | of(...) : Map [<map.value>, <element>] : Object | Test.java:415:34:415:35 | in : Map [<map.value>, <element>] : Object | provenance |  |
-| Test.java:414:26:414:42 | of(...) : List [<element>] : Object | Test.java:414:13:414:43 | of(...) : Map [<map.value>, <element>] : Object | provenance | MaD:12 |
+| Test.java:414:26:414:42 | of(...) : List [<element>] : Object | Test.java:414:13:414:43 | of(...) : Map [<map.value>, <element>] : Object | provenance | MaD:10 |
 | Test.java:414:34:414:41 | source(...) : Object | Test.java:414:26:414:42 | of(...) : List [<element>] : Object | provenance | MaD:8 |
 | Test.java:415:10:415:36 | new LinkedMultiValueMap<>(...) : LinkedMultiValueMap [<map.value>, <element>] : Object | Test.java:416:32:416:34 | out : LinkedMultiValueMap [<map.value>, <element>] : Object | provenance |  |
 | Test.java:415:34:415:35 | in : Map [<map.value>, <element>] : Object | Test.java:415:10:415:36 | new LinkedMultiValueMap<>(...) : LinkedMultiValueMap [<map.value>, <element>] : Object | provenance | MaD:59 |
 | Test.java:416:20:416:35 | getMapValue(...) : List [<element>] : Object | Test.java:49:19:49:41 | container : List [<element>] : Object | provenance |  |
 | Test.java:416:20:416:35 | getMapValue(...) : List [<element>] : Object | Test.java:416:9:416:36 | getElement(...) | provenance | MaD:3 |
 | Test.java:416:32:416:34 | out : LinkedMultiValueMap [<map.value>, <element>] : Object | Test.java:52:23:52:41 | container : LinkedMultiValueMap [<map.value>, <element>] : Object | provenance |  |
-| Test.java:416:32:416:34 | out : LinkedMultiValueMap [<map.value>, <element>] : Object | Test.java:416:20:416:35 | getMapValue(...) : List [<element>] : Object | provenance | MaD:9 |
+| Test.java:416:32:416:34 | out : LinkedMultiValueMap [<map.value>, <element>] : Object | Test.java:416:20:416:35 | getMapValue(...) : List [<element>] : Object | provenance | MaD:11 |
 | Test.java:421:13:421:34 | of(...) : Map [<map.key>] : Object | Test.java:422:34:422:35 | in : Map [<map.key>] : Object | provenance |  |
-| Test.java:421:20:421:27 | source(...) : Object | Test.java:421:13:421:34 | of(...) : Map [<map.key>] : Object | provenance | MaD:11 |
+| Test.java:421:20:421:27 | source(...) : Object | Test.java:421:13:421:34 | of(...) : Map [<map.key>] : Object | provenance | MaD:9 |
 | Test.java:422:10:422:36 | new LinkedMultiValueMap<>(...) : LinkedMultiValueMap [<map.key>] : Object | Test.java:423:19:423:21 | out : LinkedMultiValueMap [<map.key>] : Object | provenance |  |
 | Test.java:422:34:422:35 | in : Map [<map.key>] : Object | Test.java:422:10:422:36 | new LinkedMultiValueMap<>(...) : LinkedMultiValueMap [<map.key>] : Object | provenance | MaD:58 |
 | Test.java:423:19:423:21 | out : LinkedMultiValueMap [<map.key>] : Object | Test.java:51:21:51:39 | container : LinkedMultiValueMap [<map.key>] : Object | provenance |  |
-| Test.java:423:19:423:21 | out : LinkedMultiValueMap [<map.key>] : Object | Test.java:423:9:423:22 | getMapKey(...) | provenance | MaD:10 |
+| Test.java:423:19:423:21 | out : LinkedMultiValueMap [<map.key>] : Object | Test.java:423:9:423:22 | getMapKey(...) | provenance | MaD:12 |
 | Test.java:429:4:429:5 | in [post update] : LinkedMultiValueMap [<map.key>] : Object | Test.java:430:10:430:11 | in : LinkedMultiValueMap [<map.key>] : Object | provenance |  |
 | Test.java:429:11:429:18 | source(...) : Object | Test.java:429:4:429:5 | in [post update] : LinkedMultiValueMap [<map.key>] : Object | provenance | MaD:71 |
 | Test.java:430:10:430:11 | in : LinkedMultiValueMap [<map.key>] : Object | Test.java:430:10:430:22 | deepCopy(...) : LinkedMultiValueMap [<map.key>] : Object | provenance | MaD:60 |
 | Test.java:430:10:430:22 | deepCopy(...) : LinkedMultiValueMap [<map.key>] : Object | Test.java:431:19:431:21 | out : LinkedMultiValueMap [<map.key>] : Object | provenance |  |
 | Test.java:431:19:431:21 | out : LinkedMultiValueMap [<map.key>] : Object | Test.java:51:21:51:39 | container : LinkedMultiValueMap [<map.key>] : Object | provenance |  |
-| Test.java:431:19:431:21 | out : LinkedMultiValueMap [<map.key>] : Object | Test.java:431:9:431:22 | getMapKey(...) | provenance | MaD:10 |
+| Test.java:431:19:431:21 | out : LinkedMultiValueMap [<map.key>] : Object | Test.java:431:9:431:22 | getMapKey(...) | provenance | MaD:12 |
 | Test.java:437:4:437:5 | in [post update] : LinkedMultiValueMap [<map.value>, <element>] : Object | Test.java:438:10:438:11 | in : LinkedMultiValueMap [<map.value>, <element>] : Object | provenance |  |
 | Test.java:437:17:437:24 | source(...) : Object | Test.java:437:4:437:5 | in [post update] : LinkedMultiValueMap [<map.value>, <element>] : Object | provenance | MaD:72 |
 | Test.java:438:10:438:11 | in : LinkedMultiValueMap [<map.value>, <element>] : Object | Test.java:438:10:438:22 | deepCopy(...) : LinkedMultiValueMap [<map.value>, <element>] : Object | provenance | MaD:61 |
@@ -479,43 +479,43 @@ edges
 | Test.java:439:20:439:35 | getMapValue(...) : List [<element>] : Object | Test.java:49:19:49:41 | container : List [<element>] : Object | provenance |  |
 | Test.java:439:20:439:35 | getMapValue(...) : List [<element>] : Object | Test.java:439:9:439:36 | getElement(...) | provenance | MaD:3 |
 | Test.java:439:32:439:34 | out : LinkedMultiValueMap [<map.value>, <element>] : Object | Test.java:52:23:52:41 | container : LinkedMultiValueMap [<map.value>, <element>] : Object | provenance |  |
-| Test.java:439:32:439:34 | out : LinkedMultiValueMap [<map.value>, <element>] : Object | Test.java:439:20:439:35 | getMapValue(...) : List [<element>] : Object | provenance | MaD:9 |
+| Test.java:439:32:439:34 | out : LinkedMultiValueMap [<map.value>, <element>] : Object | Test.java:439:20:439:35 | getMapValue(...) : List [<element>] : Object | provenance | MaD:11 |
 | Test.java:444:16:444:23 | source(...) : Object | Test.java:445:12:445:13 | in : Object | provenance |  |
 | Test.java:445:4:445:6 | out [post update] : MultiValueMapAdapter [<map.key>] : Object | Test.java:446:19:446:21 | out : MultiValueMapAdapter [<map.key>] : Object | provenance |  |
 | Test.java:445:12:445:13 | in : Object | Test.java:445:4:445:6 | out [post update] : MultiValueMapAdapter [<map.key>] : Object | provenance | MaD:62 |
 | Test.java:446:19:446:21 | out : MultiValueMapAdapter [<map.key>] : Object | Test.java:51:21:51:39 | container : MultiValueMapAdapter [<map.key>] : Object | provenance |  |
-| Test.java:446:19:446:21 | out : MultiValueMapAdapter [<map.key>] : Object | Test.java:446:9:446:22 | getMapKey(...) | provenance | MaD:10 |
+| Test.java:446:19:446:21 | out : MultiValueMapAdapter [<map.key>] : Object | Test.java:446:9:446:22 | getMapKey(...) | provenance | MaD:12 |
 | Test.java:451:16:451:23 | source(...) : Object | Test.java:452:12:452:13 | in : Object | provenance |  |
 | Test.java:452:4:452:6 | out [post update] : MultiValueMap [<map.key>] : Object | Test.java:453:19:453:21 | out : MultiValueMap [<map.key>] : Object | provenance |  |
 | Test.java:452:12:452:13 | in : Object | Test.java:452:4:452:6 | out [post update] : MultiValueMap [<map.key>] : Object | provenance | MaD:62 |
 | Test.java:453:19:453:21 | out : MultiValueMap [<map.key>] : Object | Test.java:51:21:51:39 | container : MultiValueMap [<map.key>] : Object | provenance |  |
-| Test.java:453:19:453:21 | out : MultiValueMap [<map.key>] : Object | Test.java:453:9:453:22 | getMapKey(...) | provenance | MaD:10 |
+| Test.java:453:19:453:21 | out : MultiValueMap [<map.key>] : Object | Test.java:453:9:453:22 | getMapKey(...) | provenance | MaD:12 |
 | Test.java:458:16:458:23 | source(...) : Object | Test.java:459:12:459:13 | in : Object | provenance |  |
 | Test.java:459:4:459:6 | out [post update] : MultiValueMap [<map.key>] : Object | Test.java:460:19:460:21 | out : MultiValueMap [<map.key>] : Object | provenance |  |
 | Test.java:459:12:459:13 | in : Object | Test.java:459:4:459:6 | out [post update] : MultiValueMap [<map.key>] : Object | provenance | MaD:62 |
 | Test.java:460:19:460:21 | out : MultiValueMap [<map.key>] : Object | Test.java:51:21:51:39 | container : MultiValueMap [<map.key>] : Object | provenance |  |
-| Test.java:460:19:460:21 | out : MultiValueMap [<map.key>] : Object | Test.java:460:9:460:22 | getMapKey(...) | provenance | MaD:10 |
+| Test.java:460:19:460:21 | out : MultiValueMap [<map.key>] : Object | Test.java:460:9:460:22 | getMapKey(...) | provenance | MaD:12 |
 | Test.java:465:16:465:23 | source(...) : Object | Test.java:466:18:466:19 | in : Object | provenance |  |
 | Test.java:466:4:466:6 | out [post update] : MultiValueMapAdapter [<map.value>, <element>] : Object | Test.java:467:32:467:34 | out : MultiValueMapAdapter [<map.value>, <element>] : Object | provenance |  |
 | Test.java:466:18:466:19 | in : Object | Test.java:466:4:466:6 | out [post update] : MultiValueMapAdapter [<map.value>, <element>] : Object | provenance | MaD:63 |
 | Test.java:467:20:467:35 | getMapValue(...) : List [<element>] : Object | Test.java:49:19:49:41 | container : List [<element>] : Object | provenance |  |
 | Test.java:467:20:467:35 | getMapValue(...) : List [<element>] : Object | Test.java:467:9:467:36 | getElement(...) | provenance | MaD:3 |
 | Test.java:467:32:467:34 | out : MultiValueMapAdapter [<map.value>, <element>] : Object | Test.java:52:23:52:41 | container : MultiValueMapAdapter [<map.value>, <element>] : Object | provenance |  |
-| Test.java:467:32:467:34 | out : MultiValueMapAdapter [<map.value>, <element>] : Object | Test.java:467:20:467:35 | getMapValue(...) : List [<element>] : Object | provenance | MaD:9 |
+| Test.java:467:32:467:34 | out : MultiValueMapAdapter [<map.value>, <element>] : Object | Test.java:467:20:467:35 | getMapValue(...) : List [<element>] : Object | provenance | MaD:11 |
 | Test.java:472:16:472:23 | source(...) : Object | Test.java:473:18:473:19 | in : Object | provenance |  |
 | Test.java:473:4:473:6 | out [post update] : MultiValueMap [<map.value>, <element>] : Object | Test.java:474:32:474:34 | out : MultiValueMap [<map.value>, <element>] : Object | provenance |  |
 | Test.java:473:18:473:19 | in : Object | Test.java:473:4:473:6 | out [post update] : MultiValueMap [<map.value>, <element>] : Object | provenance | MaD:63 |
 | Test.java:474:20:474:35 | getMapValue(...) : List [<element>] : Object | Test.java:49:19:49:41 | container : List [<element>] : Object | provenance |  |
 | Test.java:474:20:474:35 | getMapValue(...) : List [<element>] : Object | Test.java:474:9:474:36 | getElement(...) | provenance | MaD:3 |
 | Test.java:474:32:474:34 | out : MultiValueMap [<map.value>, <element>] : Object | Test.java:52:23:52:41 | container : MultiValueMap [<map.value>, <element>] : Object | provenance |  |
-| Test.java:474:32:474:34 | out : MultiValueMap [<map.value>, <element>] : Object | Test.java:474:20:474:35 | getMapValue(...) : List [<element>] : Object | provenance | MaD:9 |
+| Test.java:474:32:474:34 | out : MultiValueMap [<map.value>, <element>] : Object | Test.java:474:20:474:35 | getMapValue(...) : List [<element>] : Object | provenance | MaD:11 |
 | Test.java:479:16:479:23 | source(...) : Object | Test.java:480:26:480:27 | in : Object | provenance |  |
 | Test.java:480:4:480:6 | out [post update] : MultiValueMap [<map.value>, <element>] : Object | Test.java:481:32:481:34 | out : MultiValueMap [<map.value>, <element>] : Object | provenance |  |
 | Test.java:480:26:480:27 | in : Object | Test.java:480:4:480:6 | out [post update] : MultiValueMap [<map.value>, <element>] : Object | provenance | MaD:63 |
 | Test.java:481:20:481:35 | getMapValue(...) : List [<element>] : Object | Test.java:49:19:49:41 | container : List [<element>] : Object | provenance |  |
 | Test.java:481:20:481:35 | getMapValue(...) : List [<element>] : Object | Test.java:481:9:481:36 | getElement(...) | provenance | MaD:3 |
 | Test.java:481:32:481:34 | out : MultiValueMap [<map.value>, <element>] : Object | Test.java:52:23:52:41 | container : MultiValueMap [<map.value>, <element>] : Object | provenance |  |
-| Test.java:481:32:481:34 | out : MultiValueMap [<map.value>, <element>] : Object | Test.java:481:20:481:35 | getMapValue(...) : List [<element>] : Object | provenance | MaD:9 |
+| Test.java:481:32:481:34 | out : MultiValueMap [<map.value>, <element>] : Object | Test.java:481:20:481:35 | getMapValue(...) : List [<element>] : Object | provenance | MaD:11 |
 | Test.java:486:14:486:30 | of(...) : List [<element>] : Object | Test.java:487:21:487:22 | in : List [<element>] : Object | provenance |  |
 | Test.java:486:22:486:29 | source(...) : Object | Test.java:486:14:486:30 | of(...) : List [<element>] : Object | provenance | MaD:8 |
 | Test.java:487:4:487:6 | out [post update] : MultiValueMapAdapter [<map.value>, <element>] : Object | Test.java:488:32:488:34 | out : MultiValueMapAdapter [<map.value>, <element>] : Object | provenance |  |
@@ -523,7 +523,7 @@ edges
 | Test.java:488:20:488:35 | getMapValue(...) : List [<element>] : Object | Test.java:49:19:49:41 | container : List [<element>] : Object | provenance |  |
 | Test.java:488:20:488:35 | getMapValue(...) : List [<element>] : Object | Test.java:488:9:488:36 | getElement(...) | provenance | MaD:3 |
 | Test.java:488:32:488:34 | out : MultiValueMapAdapter [<map.value>, <element>] : Object | Test.java:52:23:52:41 | container : MultiValueMapAdapter [<map.value>, <element>] : Object | provenance |  |
-| Test.java:488:32:488:34 | out : MultiValueMapAdapter [<map.value>, <element>] : Object | Test.java:488:20:488:35 | getMapValue(...) : List [<element>] : Object | provenance | MaD:9 |
+| Test.java:488:32:488:34 | out : MultiValueMapAdapter [<map.value>, <element>] : Object | Test.java:488:20:488:35 | getMapValue(...) : List [<element>] : Object | provenance | MaD:11 |
 | Test.java:493:14:493:30 | of(...) : List [<element>] : Object | Test.java:494:21:494:22 | in : List [<element>] : Object | provenance |  |
 | Test.java:493:22:493:29 | source(...) : Object | Test.java:493:14:493:30 | of(...) : List [<element>] : Object | provenance | MaD:8 |
 | Test.java:494:4:494:6 | out [post update] : MultiValueMap [<map.value>, <element>] : Object | Test.java:495:32:495:34 | out : MultiValueMap [<map.value>, <element>] : Object | provenance |  |
@@ -531,7 +531,7 @@ edges
 | Test.java:495:20:495:35 | getMapValue(...) : List [<element>] : Object | Test.java:49:19:49:41 | container : List [<element>] : Object | provenance |  |
 | Test.java:495:20:495:35 | getMapValue(...) : List [<element>] : Object | Test.java:495:9:495:36 | getElement(...) | provenance | MaD:3 |
 | Test.java:495:32:495:34 | out : MultiValueMap [<map.value>, <element>] : Object | Test.java:52:23:52:41 | container : MultiValueMap [<map.value>, <element>] : Object | provenance |  |
-| Test.java:495:32:495:34 | out : MultiValueMap [<map.value>, <element>] : Object | Test.java:495:20:495:35 | getMapValue(...) : List [<element>] : Object | provenance | MaD:9 |
+| Test.java:495:32:495:34 | out : MultiValueMap [<map.value>, <element>] : Object | Test.java:495:20:495:35 | getMapValue(...) : List [<element>] : Object | provenance | MaD:11 |
 | Test.java:500:14:500:30 | of(...) : List [<element>] : Object | Test.java:501:29:501:30 | in : List [<element>] : Object | provenance |  |
 | Test.java:500:22:500:29 | source(...) : Object | Test.java:500:14:500:30 | of(...) : List [<element>] : Object | provenance | MaD:8 |
 | Test.java:501:4:501:6 | out [post update] : MultiValueMap [<map.value>, <element>] : Object | Test.java:502:32:502:34 | out : MultiValueMap [<map.value>, <element>] : Object | provenance |  |
@@ -539,88 +539,88 @@ edges
 | Test.java:502:20:502:35 | getMapValue(...) : List [<element>] : Object | Test.java:49:19:49:41 | container : List [<element>] : Object | provenance |  |
 | Test.java:502:20:502:35 | getMapValue(...) : List [<element>] : Object | Test.java:502:9:502:36 | getElement(...) | provenance | MaD:3 |
 | Test.java:502:32:502:34 | out : MultiValueMap [<map.value>, <element>] : Object | Test.java:52:23:52:41 | container : MultiValueMap [<map.value>, <element>] : Object | provenance |  |
-| Test.java:502:32:502:34 | out : MultiValueMap [<map.value>, <element>] : Object | Test.java:502:20:502:35 | getMapValue(...) : List [<element>] : Object | provenance | MaD:9 |
+| Test.java:502:32:502:34 | out : MultiValueMap [<map.value>, <element>] : Object | Test.java:502:20:502:35 | getMapValue(...) : List [<element>] : Object | provenance | MaD:11 |
 | Test.java:507:23:507:68 | (...)... : MultiValueMap [<map.value>, <element>] : Object | Test.java:508:15:508:16 | in : MultiValueMap [<map.value>, <element>] : Object | provenance |  |
 | Test.java:507:38:507:68 | of(...) : Map [<map.value>, <element>] : Object | Test.java:507:23:507:68 | (...)... : MultiValueMap [<map.value>, <element>] : Object | provenance |  |
-| Test.java:507:51:507:67 | of(...) : List [<element>] : Object | Test.java:507:38:507:68 | of(...) : Map [<map.value>, <element>] : Object | provenance | MaD:12 |
+| Test.java:507:51:507:67 | of(...) : List [<element>] : Object | Test.java:507:38:507:68 | of(...) : Map [<map.value>, <element>] : Object | provenance | MaD:10 |
 | Test.java:507:59:507:66 | source(...) : Object | Test.java:507:51:507:67 | of(...) : List [<element>] : Object | provenance | MaD:8 |
 | Test.java:508:4:508:6 | out [post update] : MultiValueMapAdapter [<map.value>, <element>] : Object | Test.java:509:32:509:34 | out : MultiValueMapAdapter [<map.value>, <element>] : Object | provenance |  |
 | Test.java:508:15:508:16 | in : MultiValueMap [<map.value>, <element>] : Object | Test.java:508:4:508:6 | out [post update] : MultiValueMapAdapter [<map.value>, <element>] : Object | provenance | MaD:67 |
 | Test.java:509:20:509:35 | getMapValue(...) : List [<element>] : Object | Test.java:49:19:49:41 | container : List [<element>] : Object | provenance |  |
 | Test.java:509:20:509:35 | getMapValue(...) : List [<element>] : Object | Test.java:509:9:509:36 | getElement(...) | provenance | MaD:3 |
 | Test.java:509:32:509:34 | out : MultiValueMapAdapter [<map.value>, <element>] : Object | Test.java:52:23:52:41 | container : MultiValueMapAdapter [<map.value>, <element>] : Object | provenance |  |
-| Test.java:509:32:509:34 | out : MultiValueMapAdapter [<map.value>, <element>] : Object | Test.java:509:20:509:35 | getMapValue(...) : List [<element>] : Object | provenance | MaD:9 |
+| Test.java:509:32:509:34 | out : MultiValueMapAdapter [<map.value>, <element>] : Object | Test.java:509:20:509:35 | getMapValue(...) : List [<element>] : Object | provenance | MaD:11 |
 | Test.java:514:23:514:68 | (...)... : MultiValueMap [<map.value>, <element>] : Object | Test.java:515:15:515:16 | in : MultiValueMap [<map.value>, <element>] : Object | provenance |  |
 | Test.java:514:38:514:68 | of(...) : Map [<map.value>, <element>] : Object | Test.java:514:23:514:68 | (...)... : MultiValueMap [<map.value>, <element>] : Object | provenance |  |
-| Test.java:514:51:514:67 | of(...) : List [<element>] : Object | Test.java:514:38:514:68 | of(...) : Map [<map.value>, <element>] : Object | provenance | MaD:12 |
+| Test.java:514:51:514:67 | of(...) : List [<element>] : Object | Test.java:514:38:514:68 | of(...) : Map [<map.value>, <element>] : Object | provenance | MaD:10 |
 | Test.java:514:59:514:66 | source(...) : Object | Test.java:514:51:514:67 | of(...) : List [<element>] : Object | provenance | MaD:8 |
 | Test.java:515:4:515:6 | out [post update] : MultiValueMap [<map.value>, <element>] : Object | Test.java:516:32:516:34 | out : MultiValueMap [<map.value>, <element>] : Object | provenance |  |
 | Test.java:515:15:515:16 | in : MultiValueMap [<map.value>, <element>] : Object | Test.java:515:4:515:6 | out [post update] : MultiValueMap [<map.value>, <element>] : Object | provenance | MaD:67 |
 | Test.java:516:20:516:35 | getMapValue(...) : List [<element>] : Object | Test.java:49:19:49:41 | container : List [<element>] : Object | provenance |  |
 | Test.java:516:20:516:35 | getMapValue(...) : List [<element>] : Object | Test.java:516:9:516:36 | getElement(...) | provenance | MaD:3 |
 | Test.java:516:32:516:34 | out : MultiValueMap [<map.value>, <element>] : Object | Test.java:52:23:52:41 | container : MultiValueMap [<map.value>, <element>] : Object | provenance |  |
-| Test.java:516:32:516:34 | out : MultiValueMap [<map.value>, <element>] : Object | Test.java:516:20:516:35 | getMapValue(...) : List [<element>] : Object | provenance | MaD:9 |
+| Test.java:516:32:516:34 | out : MultiValueMap [<map.value>, <element>] : Object | Test.java:516:20:516:35 | getMapValue(...) : List [<element>] : Object | provenance | MaD:11 |
 | Test.java:521:16:521:23 | source(...) : Object | Test.java:522:15:522:16 | in : Object | provenance |  |
 | Test.java:522:4:522:6 | out [post update] : MultiValueMapAdapter [<map.key>] : Object | Test.java:523:19:523:21 | out : MultiValueMapAdapter [<map.key>] : Object | provenance |  |
 | Test.java:522:15:522:16 | in : Object | Test.java:522:4:522:6 | out [post update] : MultiValueMapAdapter [<map.key>] : Object | provenance | MaD:64 |
 | Test.java:523:19:523:21 | out : MultiValueMapAdapter [<map.key>] : Object | Test.java:51:21:51:39 | container : MultiValueMapAdapter [<map.key>] : Object | provenance |  |
-| Test.java:523:19:523:21 | out : MultiValueMapAdapter [<map.key>] : Object | Test.java:523:9:523:22 | getMapKey(...) | provenance | MaD:10 |
+| Test.java:523:19:523:21 | out : MultiValueMapAdapter [<map.key>] : Object | Test.java:523:9:523:22 | getMapKey(...) | provenance | MaD:12 |
 | Test.java:528:16:528:23 | source(...) : Object | Test.java:529:15:529:16 | in : Object | provenance |  |
 | Test.java:529:4:529:6 | out [post update] : MultiValueMap [<map.key>] : Object | Test.java:530:19:530:21 | out : MultiValueMap [<map.key>] : Object | provenance |  |
 | Test.java:529:15:529:16 | in : Object | Test.java:529:4:529:6 | out [post update] : MultiValueMap [<map.key>] : Object | provenance | MaD:64 |
 | Test.java:530:19:530:21 | out : MultiValueMap [<map.key>] : Object | Test.java:51:21:51:39 | container : MultiValueMap [<map.key>] : Object | provenance |  |
-| Test.java:530:19:530:21 | out : MultiValueMap [<map.key>] : Object | Test.java:530:9:530:22 | getMapKey(...) | provenance | MaD:10 |
+| Test.java:530:19:530:21 | out : MultiValueMap [<map.key>] : Object | Test.java:530:9:530:22 | getMapKey(...) | provenance | MaD:12 |
 | Test.java:536:4:536:6 | mvm [post update] : MultiValueMap [<map.key>] : Object | Test.java:537:15:537:17 | mvm : MultiValueMap [<map.key>] : Object | provenance |  |
 | Test.java:536:12:536:19 | source(...) : Object | Test.java:536:4:536:6 | mvm [post update] : MultiValueMap [<map.key>] : Object | provenance | MaD:71 |
 | Test.java:537:4:537:6 | out [post update] : MultiValueMapAdapter [<map.key>] : Object | Test.java:538:19:538:21 | out : MultiValueMapAdapter [<map.key>] : Object | provenance |  |
 | Test.java:537:15:537:17 | mvm : MultiValueMap [<map.key>] : Object | Test.java:537:4:537:6 | out [post update] : MultiValueMapAdapter [<map.key>] : Object | provenance | MaD:66 |
 | Test.java:538:19:538:21 | out : MultiValueMapAdapter [<map.key>] : Object | Test.java:51:21:51:39 | container : MultiValueMapAdapter [<map.key>] : Object | provenance |  |
-| Test.java:538:19:538:21 | out : MultiValueMapAdapter [<map.key>] : Object | Test.java:538:9:538:22 | getMapKey(...) | provenance | MaD:10 |
+| Test.java:538:19:538:21 | out : MultiValueMapAdapter [<map.key>] : Object | Test.java:538:9:538:22 | getMapKey(...) | provenance | MaD:12 |
 | Test.java:544:4:544:6 | mvm [post update] : MultiValueMap [<map.key>] : Object | Test.java:545:15:545:17 | mvm : MultiValueMap [<map.key>] : Object | provenance |  |
 | Test.java:544:12:544:19 | source(...) : Object | Test.java:544:4:544:6 | mvm [post update] : MultiValueMap [<map.key>] : Object | provenance | MaD:71 |
 | Test.java:545:4:545:6 | out [post update] : MultiValueMap [<map.key>] : Object | Test.java:546:19:546:21 | out : MultiValueMap [<map.key>] : Object | provenance |  |
 | Test.java:545:15:545:17 | mvm : MultiValueMap [<map.key>] : Object | Test.java:545:4:545:6 | out [post update] : MultiValueMap [<map.key>] : Object | provenance | MaD:66 |
 | Test.java:546:19:546:21 | out : MultiValueMap [<map.key>] : Object | Test.java:51:21:51:39 | container : MultiValueMap [<map.key>] : Object | provenance |  |
-| Test.java:546:19:546:21 | out : MultiValueMap [<map.key>] : Object | Test.java:546:9:546:22 | getMapKey(...) | provenance | MaD:10 |
+| Test.java:546:19:546:21 | out : MultiValueMap [<map.key>] : Object | Test.java:546:9:546:22 | getMapKey(...) | provenance | MaD:12 |
 | Test.java:551:16:551:23 | source(...) : Object | Test.java:552:20:552:21 | in : Object | provenance |  |
 | Test.java:552:4:552:6 | out [post update] : MultiValueMap [<map.key>] : Object | Test.java:553:19:553:21 | out : MultiValueMap [<map.key>] : Object | provenance |  |
 | Test.java:552:20:552:21 | in : Object | Test.java:552:4:552:6 | out [post update] : MultiValueMap [<map.key>] : Object | provenance | MaD:68 |
 | Test.java:553:19:553:21 | out : MultiValueMap [<map.key>] : Object | Test.java:51:21:51:39 | container : MultiValueMap [<map.key>] : Object | provenance |  |
-| Test.java:553:19:553:21 | out : MultiValueMap [<map.key>] : Object | Test.java:553:9:553:22 | getMapKey(...) | provenance | MaD:10 |
+| Test.java:553:19:553:21 | out : MultiValueMap [<map.key>] : Object | Test.java:553:9:553:22 | getMapKey(...) | provenance | MaD:12 |
 | Test.java:558:16:558:23 | source(...) : Object | Test.java:559:20:559:21 | in : Object | provenance |  |
 | Test.java:559:4:559:6 | out [post update] : MultiValueMap [<map.key>] : Object | Test.java:560:19:560:21 | out : MultiValueMap [<map.key>] : Object | provenance |  |
 | Test.java:559:20:559:21 | in : Object | Test.java:559:4:559:6 | out [post update] : MultiValueMap [<map.key>] : Object | provenance | MaD:68 |
 | Test.java:560:19:560:21 | out : MultiValueMap [<map.key>] : Object | Test.java:51:21:51:39 | container : MultiValueMap [<map.key>] : Object | provenance |  |
-| Test.java:560:19:560:21 | out : MultiValueMap [<map.key>] : Object | Test.java:560:9:560:22 | getMapKey(...) | provenance | MaD:10 |
+| Test.java:560:19:560:21 | out : MultiValueMap [<map.key>] : Object | Test.java:560:9:560:22 | getMapKey(...) | provenance | MaD:12 |
 | Test.java:565:16:565:23 | source(...) : Object | Test.java:566:26:566:27 | in : Object | provenance |  |
 | Test.java:566:4:566:6 | out [post update] : MultiValueMap [<map.value>, <element>] : Object | Test.java:567:32:567:34 | out : MultiValueMap [<map.value>, <element>] : Object | provenance |  |
 | Test.java:566:26:566:27 | in : Object | Test.java:566:4:566:6 | out [post update] : MultiValueMap [<map.value>, <element>] : Object | provenance | MaD:69 |
 | Test.java:567:20:567:35 | getMapValue(...) : List [<element>] : Object | Test.java:49:19:49:41 | container : List [<element>] : Object | provenance |  |
 | Test.java:567:20:567:35 | getMapValue(...) : List [<element>] : Object | Test.java:567:9:567:36 | getElement(...) | provenance | MaD:3 |
 | Test.java:567:32:567:34 | out : MultiValueMap [<map.value>, <element>] : Object | Test.java:52:23:52:41 | container : MultiValueMap [<map.value>, <element>] : Object | provenance |  |
-| Test.java:567:32:567:34 | out : MultiValueMap [<map.value>, <element>] : Object | Test.java:567:20:567:35 | getMapValue(...) : List [<element>] : Object | provenance | MaD:9 |
+| Test.java:567:32:567:34 | out : MultiValueMap [<map.value>, <element>] : Object | Test.java:567:20:567:35 | getMapValue(...) : List [<element>] : Object | provenance | MaD:11 |
 | Test.java:572:16:572:23 | source(...) : Object | Test.java:573:34:573:35 | in : Object | provenance |  |
 | Test.java:573:4:573:6 | out [post update] : MultiValueMap [<map.value>, <element>] : Object | Test.java:574:32:574:34 | out : MultiValueMap [<map.value>, <element>] : Object | provenance |  |
 | Test.java:573:34:573:35 | in : Object | Test.java:573:4:573:6 | out [post update] : MultiValueMap [<map.value>, <element>] : Object | provenance | MaD:69 |
 | Test.java:574:20:574:35 | getMapValue(...) : List [<element>] : Object | Test.java:49:19:49:41 | container : List [<element>] : Object | provenance |  |
 | Test.java:574:20:574:35 | getMapValue(...) : List [<element>] : Object | Test.java:574:9:574:36 | getElement(...) | provenance | MaD:3 |
 | Test.java:574:32:574:34 | out : MultiValueMap [<map.value>, <element>] : Object | Test.java:52:23:52:41 | container : MultiValueMap [<map.value>, <element>] : Object | provenance |  |
-| Test.java:574:32:574:34 | out : MultiValueMap [<map.value>, <element>] : Object | Test.java:574:20:574:35 | getMapValue(...) : List [<element>] : Object | provenance | MaD:9 |
+| Test.java:574:32:574:34 | out : MultiValueMap [<map.value>, <element>] : Object | Test.java:574:20:574:35 | getMapValue(...) : List [<element>] : Object | provenance | MaD:11 |
 | Test.java:579:30:579:86 | new MultiValueMapAdapter<>(...) : MultiValueMapAdapter [<map.value>, <element>] : Object | Test.java:580:10:580:11 | in : MultiValueMapAdapter [<map.value>, <element>] : Object | provenance |  |
 | Test.java:579:55:579:85 | of(...) : Map [<map.value>, <element>] : Object | Test.java:579:30:579:86 | new MultiValueMapAdapter<>(...) : MultiValueMapAdapter [<map.value>, <element>] : Object | provenance | MaD:78 |
-| Test.java:579:68:579:84 | of(...) : List [<element>] : Object | Test.java:579:55:579:85 | of(...) : Map [<map.value>, <element>] : Object | provenance | MaD:12 |
+| Test.java:579:68:579:84 | of(...) : List [<element>] : Object | Test.java:579:55:579:85 | of(...) : Map [<map.value>, <element>] : Object | provenance | MaD:10 |
 | Test.java:579:76:579:83 | source(...) : Object | Test.java:579:68:579:84 | of(...) : List [<element>] : Object | provenance | MaD:8 |
 | Test.java:580:10:580:11 | in : MultiValueMapAdapter [<map.value>, <element>] : Object | Test.java:580:10:580:26 | getFirst(...) : Object | provenance | MaD:70 |
 | Test.java:580:10:580:26 | getFirst(...) : Object | Test.java:581:9:581:11 | out | provenance |  |
 | Test.java:586:23:586:68 | (...)... : MultiValueMap [<map.value>, <element>] : Object | Test.java:587:10:587:11 | in : MultiValueMap [<map.value>, <element>] : Object | provenance |  |
 | Test.java:586:38:586:68 | of(...) : Map [<map.value>, <element>] : Object | Test.java:586:23:586:68 | (...)... : MultiValueMap [<map.value>, <element>] : Object | provenance |  |
-| Test.java:586:51:586:67 | of(...) : List [<element>] : Object | Test.java:586:38:586:68 | of(...) : Map [<map.value>, <element>] : Object | provenance | MaD:12 |
+| Test.java:586:51:586:67 | of(...) : List [<element>] : Object | Test.java:586:38:586:68 | of(...) : Map [<map.value>, <element>] : Object | provenance | MaD:10 |
 | Test.java:586:59:586:66 | source(...) : Object | Test.java:586:51:586:67 | of(...) : List [<element>] : Object | provenance | MaD:8 |
 | Test.java:587:10:587:11 | in : MultiValueMap [<map.value>, <element>] : Object | Test.java:587:10:587:26 | getFirst(...) : Object | provenance | MaD:70 |
 | Test.java:587:10:587:26 | getFirst(...) : Object | Test.java:588:9:588:11 | out | provenance |  |
 | Test.java:593:23:593:68 | (...)... : MultiValueMap [<map.value>, <element>] : Object | Test.java:594:10:594:11 | in : MultiValueMap [<map.value>, <element>] : Object | provenance |  |
 | Test.java:593:38:593:68 | of(...) : Map [<map.value>, <element>] : Object | Test.java:593:23:593:68 | (...)... : MultiValueMap [<map.value>, <element>] : Object | provenance |  |
-| Test.java:593:51:593:67 | of(...) : List [<element>] : Object | Test.java:593:38:593:68 | of(...) : Map [<map.value>, <element>] : Object | provenance | MaD:12 |
+| Test.java:593:51:593:67 | of(...) : List [<element>] : Object | Test.java:593:38:593:68 | of(...) : Map [<map.value>, <element>] : Object | provenance | MaD:10 |
 | Test.java:593:59:593:66 | source(...) : Object | Test.java:593:51:593:67 | of(...) : List [<element>] : Object | provenance | MaD:8 |
 | Test.java:594:10:594:11 | in : MultiValueMap [<map.value>, <element>] : Object | Test.java:594:10:594:34 | getFirst(...) : Object | provenance | MaD:70 |
 | Test.java:594:10:594:34 | getFirst(...) : Object | Test.java:595:9:595:11 | out | provenance |  |
@@ -628,106 +628,106 @@ edges
 | Test.java:601:4:601:6 | out [post update] : MultiValueMapAdapter [<map.key>] : Object | Test.java:602:19:602:21 | out : MultiValueMapAdapter [<map.key>] : Object | provenance |  |
 | Test.java:601:12:601:13 | in : Object | Test.java:601:4:601:6 | out [post update] : MultiValueMapAdapter [<map.key>] : Object | provenance | MaD:71 |
 | Test.java:602:19:602:21 | out : MultiValueMapAdapter [<map.key>] : Object | Test.java:51:21:51:39 | container : MultiValueMapAdapter [<map.key>] : Object | provenance |  |
-| Test.java:602:19:602:21 | out : MultiValueMapAdapter [<map.key>] : Object | Test.java:602:9:602:22 | getMapKey(...) | provenance | MaD:10 |
+| Test.java:602:19:602:21 | out : MultiValueMapAdapter [<map.key>] : Object | Test.java:602:9:602:22 | getMapKey(...) | provenance | MaD:12 |
 | Test.java:607:16:607:23 | source(...) : Object | Test.java:608:12:608:13 | in : Object | provenance |  |
 | Test.java:608:4:608:6 | out [post update] : MultiValueMap [<map.key>] : Object | Test.java:609:19:609:21 | out : MultiValueMap [<map.key>] : Object | provenance |  |
 | Test.java:608:12:608:13 | in : Object | Test.java:608:4:608:6 | out [post update] : MultiValueMap [<map.key>] : Object | provenance | MaD:71 |
 | Test.java:609:19:609:21 | out : MultiValueMap [<map.key>] : Object | Test.java:51:21:51:39 | container : MultiValueMap [<map.key>] : Object | provenance |  |
-| Test.java:609:19:609:21 | out : MultiValueMap [<map.key>] : Object | Test.java:609:9:609:22 | getMapKey(...) | provenance | MaD:10 |
+| Test.java:609:19:609:21 | out : MultiValueMap [<map.key>] : Object | Test.java:609:9:609:22 | getMapKey(...) | provenance | MaD:12 |
 | Test.java:614:16:614:23 | source(...) : Object | Test.java:615:18:615:19 | in : Object | provenance |  |
 | Test.java:615:4:615:6 | out [post update] : MultiValueMapAdapter [<map.value>, <element>] : Object | Test.java:616:32:616:34 | out : MultiValueMapAdapter [<map.value>, <element>] : Object | provenance |  |
 | Test.java:615:18:615:19 | in : Object | Test.java:615:4:615:6 | out [post update] : MultiValueMapAdapter [<map.value>, <element>] : Object | provenance | MaD:72 |
 | Test.java:616:20:616:35 | getMapValue(...) : List [<element>] : Object | Test.java:49:19:49:41 | container : List [<element>] : Object | provenance |  |
 | Test.java:616:20:616:35 | getMapValue(...) : List [<element>] : Object | Test.java:616:9:616:36 | getElement(...) | provenance | MaD:3 |
 | Test.java:616:32:616:34 | out : MultiValueMapAdapter [<map.value>, <element>] : Object | Test.java:52:23:52:41 | container : MultiValueMapAdapter [<map.value>, <element>] : Object | provenance |  |
-| Test.java:616:32:616:34 | out : MultiValueMapAdapter [<map.value>, <element>] : Object | Test.java:616:20:616:35 | getMapValue(...) : List [<element>] : Object | provenance | MaD:9 |
+| Test.java:616:32:616:34 | out : MultiValueMapAdapter [<map.value>, <element>] : Object | Test.java:616:20:616:35 | getMapValue(...) : List [<element>] : Object | provenance | MaD:11 |
 | Test.java:621:16:621:23 | source(...) : Object | Test.java:622:18:622:19 | in : Object | provenance |  |
 | Test.java:622:4:622:6 | out [post update] : MultiValueMap [<map.value>, <element>] : Object | Test.java:623:32:623:34 | out : MultiValueMap [<map.value>, <element>] : Object | provenance |  |
 | Test.java:622:18:622:19 | in : Object | Test.java:622:4:622:6 | out [post update] : MultiValueMap [<map.value>, <element>] : Object | provenance | MaD:72 |
 | Test.java:623:20:623:35 | getMapValue(...) : List [<element>] : Object | Test.java:49:19:49:41 | container : List [<element>] : Object | provenance |  |
 | Test.java:623:20:623:35 | getMapValue(...) : List [<element>] : Object | Test.java:623:9:623:36 | getElement(...) | provenance | MaD:3 |
 | Test.java:623:32:623:34 | out : MultiValueMap [<map.value>, <element>] : Object | Test.java:52:23:52:41 | container : MultiValueMap [<map.value>, <element>] : Object | provenance |  |
-| Test.java:623:32:623:34 | out : MultiValueMap [<map.value>, <element>] : Object | Test.java:623:20:623:35 | getMapValue(...) : List [<element>] : Object | provenance | MaD:9 |
+| Test.java:623:32:623:34 | out : MultiValueMap [<map.value>, <element>] : Object | Test.java:623:20:623:35 | getMapValue(...) : List [<element>] : Object | provenance | MaD:11 |
 | Test.java:628:16:628:23 | source(...) : Object | Test.java:629:26:629:27 | in : Object | provenance |  |
 | Test.java:629:4:629:6 | out [post update] : MultiValueMap [<map.value>, <element>] : Object | Test.java:630:32:630:34 | out : MultiValueMap [<map.value>, <element>] : Object | provenance |  |
 | Test.java:629:26:629:27 | in : Object | Test.java:629:4:629:6 | out [post update] : MultiValueMap [<map.value>, <element>] : Object | provenance | MaD:72 |
 | Test.java:630:20:630:35 | getMapValue(...) : List [<element>] : Object | Test.java:49:19:49:41 | container : List [<element>] : Object | provenance |  |
 | Test.java:630:20:630:35 | getMapValue(...) : List [<element>] : Object | Test.java:630:9:630:36 | getElement(...) | provenance | MaD:3 |
 | Test.java:630:32:630:34 | out : MultiValueMap [<map.value>, <element>] : Object | Test.java:52:23:52:41 | container : MultiValueMap [<map.value>, <element>] : Object | provenance |  |
-| Test.java:630:32:630:34 | out : MultiValueMap [<map.value>, <element>] : Object | Test.java:630:20:630:35 | getMapValue(...) : List [<element>] : Object | provenance | MaD:9 |
+| Test.java:630:32:630:34 | out : MultiValueMap [<map.value>, <element>] : Object | Test.java:630:20:630:35 | getMapValue(...) : List [<element>] : Object | provenance | MaD:11 |
 | Test.java:635:13:635:34 | of(...) : Map [<map.key>] : Object | Test.java:636:15:636:16 | in : Map [<map.key>] : Object | provenance |  |
-| Test.java:635:20:635:27 | source(...) : Object | Test.java:635:13:635:34 | of(...) : Map [<map.key>] : Object | provenance | MaD:11 |
+| Test.java:635:20:635:27 | source(...) : Object | Test.java:635:13:635:34 | of(...) : Map [<map.key>] : Object | provenance | MaD:9 |
 | Test.java:636:4:636:6 | out [post update] : MultiValueMapAdapter [<map.key>] : Object | Test.java:637:19:637:21 | out : MultiValueMapAdapter [<map.key>] : Object | provenance |  |
 | Test.java:636:15:636:16 | in : Map [<map.key>] : Object | Test.java:636:4:636:6 | out [post update] : MultiValueMapAdapter [<map.key>] : Object | provenance | MaD:73 |
 | Test.java:637:19:637:21 | out : MultiValueMapAdapter [<map.key>] : Object | Test.java:51:21:51:39 | container : MultiValueMapAdapter [<map.key>] : Object | provenance |  |
-| Test.java:637:19:637:21 | out : MultiValueMapAdapter [<map.key>] : Object | Test.java:637:9:637:22 | getMapKey(...) | provenance | MaD:10 |
+| Test.java:637:19:637:21 | out : MultiValueMapAdapter [<map.key>] : Object | Test.java:637:9:637:22 | getMapKey(...) | provenance | MaD:12 |
 | Test.java:642:13:642:34 | of(...) : Map [<map.key>] : Object | Test.java:643:15:643:16 | in : Map [<map.key>] : Object | provenance |  |
-| Test.java:642:20:642:27 | source(...) : Object | Test.java:642:13:642:34 | of(...) : Map [<map.key>] : Object | provenance | MaD:11 |
+| Test.java:642:20:642:27 | source(...) : Object | Test.java:642:13:642:34 | of(...) : Map [<map.key>] : Object | provenance | MaD:9 |
 | Test.java:643:4:643:6 | out [post update] : MultiValueMap [<map.key>] : Object | Test.java:644:19:644:21 | out : MultiValueMap [<map.key>] : Object | provenance |  |
 | Test.java:643:15:643:16 | in : Map [<map.key>] : Object | Test.java:643:4:643:6 | out [post update] : MultiValueMap [<map.key>] : Object | provenance | MaD:73 |
 | Test.java:644:19:644:21 | out : MultiValueMap [<map.key>] : Object | Test.java:51:21:51:39 | container : MultiValueMap [<map.key>] : Object | provenance |  |
-| Test.java:644:19:644:21 | out : MultiValueMap [<map.key>] : Object | Test.java:644:9:644:22 | getMapKey(...) | provenance | MaD:10 |
+| Test.java:644:19:644:21 | out : MultiValueMap [<map.key>] : Object | Test.java:644:9:644:22 | getMapKey(...) | provenance | MaD:12 |
 | Test.java:649:13:649:34 | of(...) : Map [<map.value>] : Object | Test.java:650:15:650:16 | in : Map [<map.value>] : Object | provenance |  |
-| Test.java:649:26:649:33 | source(...) : Object | Test.java:649:13:649:34 | of(...) : Map [<map.value>] : Object | provenance | MaD:12 |
+| Test.java:649:26:649:33 | source(...) : Object | Test.java:649:13:649:34 | of(...) : Map [<map.value>] : Object | provenance | MaD:10 |
 | Test.java:650:4:650:6 | out [post update] : MultiValueMapAdapter [<map.value>, <element>] : Object | Test.java:651:32:651:34 | out : MultiValueMapAdapter [<map.value>, <element>] : Object | provenance |  |
 | Test.java:650:15:650:16 | in : Map [<map.value>] : Object | Test.java:650:4:650:6 | out [post update] : MultiValueMapAdapter [<map.value>, <element>] : Object | provenance | MaD:74 |
 | Test.java:651:20:651:35 | getMapValue(...) : List [<element>] : Object | Test.java:49:19:49:41 | container : List [<element>] : Object | provenance |  |
 | Test.java:651:20:651:35 | getMapValue(...) : List [<element>] : Object | Test.java:651:9:651:36 | getElement(...) | provenance | MaD:3 |
 | Test.java:651:32:651:34 | out : MultiValueMapAdapter [<map.value>, <element>] : Object | Test.java:52:23:52:41 | container : MultiValueMapAdapter [<map.value>, <element>] : Object | provenance |  |
-| Test.java:651:32:651:34 | out : MultiValueMapAdapter [<map.value>, <element>] : Object | Test.java:651:20:651:35 | getMapValue(...) : List [<element>] : Object | provenance | MaD:9 |
+| Test.java:651:32:651:34 | out : MultiValueMapAdapter [<map.value>, <element>] : Object | Test.java:651:20:651:35 | getMapValue(...) : List [<element>] : Object | provenance | MaD:11 |
 | Test.java:656:13:656:34 | of(...) : Map [<map.value>] : Object | Test.java:657:15:657:16 | in : Map [<map.value>] : Object | provenance |  |
-| Test.java:656:26:656:33 | source(...) : Object | Test.java:656:13:656:34 | of(...) : Map [<map.value>] : Object | provenance | MaD:12 |
+| Test.java:656:26:656:33 | source(...) : Object | Test.java:656:13:656:34 | of(...) : Map [<map.value>] : Object | provenance | MaD:10 |
 | Test.java:657:4:657:6 | out [post update] : MultiValueMap [<map.value>, <element>] : Object | Test.java:658:32:658:34 | out : MultiValueMap [<map.value>, <element>] : Object | provenance |  |
 | Test.java:657:15:657:16 | in : Map [<map.value>] : Object | Test.java:657:4:657:6 | out [post update] : MultiValueMap [<map.value>, <element>] : Object | provenance | MaD:74 |
 | Test.java:658:20:658:35 | getMapValue(...) : List [<element>] : Object | Test.java:49:19:49:41 | container : List [<element>] : Object | provenance |  |
 | Test.java:658:20:658:35 | getMapValue(...) : List [<element>] : Object | Test.java:658:9:658:36 | getElement(...) | provenance | MaD:3 |
 | Test.java:658:32:658:34 | out : MultiValueMap [<map.value>, <element>] : Object | Test.java:52:23:52:41 | container : MultiValueMap [<map.value>, <element>] : Object | provenance |  |
-| Test.java:658:32:658:34 | out : MultiValueMap [<map.value>, <element>] : Object | Test.java:658:20:658:35 | getMapValue(...) : List [<element>] : Object | provenance | MaD:9 |
+| Test.java:658:32:658:34 | out : MultiValueMap [<map.value>, <element>] : Object | Test.java:658:20:658:35 | getMapValue(...) : List [<element>] : Object | provenance | MaD:11 |
 | Test.java:663:30:663:86 | new MultiValueMapAdapter<>(...) : MultiValueMapAdapter [<map.value>, <element>] : Object | Test.java:664:10:664:11 | in : MultiValueMapAdapter [<map.value>, <element>] : Object | provenance |  |
 | Test.java:663:55:663:85 | of(...) : Map [<map.value>, <element>] : Object | Test.java:663:30:663:86 | new MultiValueMapAdapter<>(...) : MultiValueMapAdapter [<map.value>, <element>] : Object | provenance | MaD:78 |
-| Test.java:663:68:663:84 | of(...) : List [<element>] : Object | Test.java:663:55:663:85 | of(...) : Map [<map.value>, <element>] : Object | provenance | MaD:12 |
+| Test.java:663:68:663:84 | of(...) : List [<element>] : Object | Test.java:663:55:663:85 | of(...) : Map [<map.value>, <element>] : Object | provenance | MaD:10 |
 | Test.java:663:76:663:83 | source(...) : Object | Test.java:663:68:663:84 | of(...) : List [<element>] : Object | provenance | MaD:8 |
 | Test.java:664:10:664:11 | in : MultiValueMapAdapter [<map.value>, <element>] : Object | Test.java:664:10:664:30 | toSingleValueMap(...) : Map [<map.value>] : Object | provenance | MaD:76 |
 | Test.java:664:10:664:30 | toSingleValueMap(...) : Map [<map.value>] : Object | Test.java:665:21:665:23 | out : Map [<map.value>] : Object | provenance |  |
 | Test.java:665:21:665:23 | out : Map [<map.value>] : Object | Test.java:52:23:52:41 | container : Map [<map.value>] : Object | provenance |  |
-| Test.java:665:21:665:23 | out : Map [<map.value>] : Object | Test.java:665:9:665:24 | getMapValue(...) | provenance | MaD:9 |
+| Test.java:665:21:665:23 | out : Map [<map.value>] : Object | Test.java:665:9:665:24 | getMapValue(...) | provenance | MaD:11 |
 | Test.java:670:23:670:68 | (...)... : MultiValueMap [<map.value>, <element>] : Object | Test.java:671:10:671:11 | in : MultiValueMap [<map.value>, <element>] : Object | provenance |  |
 | Test.java:670:38:670:68 | of(...) : Map [<map.value>, <element>] : Object | Test.java:670:23:670:68 | (...)... : MultiValueMap [<map.value>, <element>] : Object | provenance |  |
-| Test.java:670:51:670:67 | of(...) : List [<element>] : Object | Test.java:670:38:670:68 | of(...) : Map [<map.value>, <element>] : Object | provenance | MaD:12 |
+| Test.java:670:51:670:67 | of(...) : List [<element>] : Object | Test.java:670:38:670:68 | of(...) : Map [<map.value>, <element>] : Object | provenance | MaD:10 |
 | Test.java:670:59:670:66 | source(...) : Object | Test.java:670:51:670:67 | of(...) : List [<element>] : Object | provenance | MaD:8 |
 | Test.java:671:10:671:11 | in : MultiValueMap [<map.value>, <element>] : Object | Test.java:671:10:671:30 | toSingleValueMap(...) : Map [<map.value>] : Object | provenance | MaD:76 |
 | Test.java:671:10:671:30 | toSingleValueMap(...) : Map [<map.value>] : Object | Test.java:672:21:672:23 | out : Map [<map.value>] : Object | provenance |  |
 | Test.java:672:21:672:23 | out : Map [<map.value>] : Object | Test.java:52:23:52:41 | container : Map [<map.value>] : Object | provenance |  |
-| Test.java:672:21:672:23 | out : Map [<map.value>] : Object | Test.java:672:9:672:24 | getMapValue(...) | provenance | MaD:9 |
+| Test.java:672:21:672:23 | out : Map [<map.value>] : Object | Test.java:672:9:672:24 | getMapValue(...) | provenance | MaD:11 |
 | Test.java:677:30:677:77 | new MultiValueMapAdapter<>(...) : MultiValueMapAdapter [<map.key>] : Object | Test.java:678:10:678:11 | in : MultiValueMapAdapter [<map.key>] : Object | provenance |  |
 | Test.java:677:55:677:76 | of(...) : Map [<map.key>] : Object | Test.java:677:30:677:77 | new MultiValueMapAdapter<>(...) : MultiValueMapAdapter [<map.key>] : Object | provenance | MaD:77 |
-| Test.java:677:62:677:69 | source(...) : Object | Test.java:677:55:677:76 | of(...) : Map [<map.key>] : Object | provenance | MaD:11 |
+| Test.java:677:62:677:69 | source(...) : Object | Test.java:677:55:677:76 | of(...) : Map [<map.key>] : Object | provenance | MaD:9 |
 | Test.java:678:10:678:11 | in : MultiValueMapAdapter [<map.key>] : Object | Test.java:678:10:678:30 | toSingleValueMap(...) : Map [<map.key>] : Object | provenance | MaD:75 |
 | Test.java:678:10:678:30 | toSingleValueMap(...) : Map [<map.key>] : Object | Test.java:679:19:679:21 | out : Map [<map.key>] : Object | provenance |  |
 | Test.java:679:19:679:21 | out : Map [<map.key>] : Object | Test.java:51:21:51:39 | container : Map [<map.key>] : Object | provenance |  |
-| Test.java:679:19:679:21 | out : Map [<map.key>] : Object | Test.java:679:9:679:22 | getMapKey(...) | provenance | MaD:10 |
+| Test.java:679:19:679:21 | out : Map [<map.key>] : Object | Test.java:679:9:679:22 | getMapKey(...) | provenance | MaD:12 |
 | Test.java:684:23:684:70 | new MultiValueMapAdapter<>(...) : MultiValueMapAdapter [<map.key>] : Object | Test.java:685:10:685:11 | in : MultiValueMapAdapter [<map.key>] : Object | provenance |  |
 | Test.java:684:48:684:69 | of(...) : Map [<map.key>] : Object | Test.java:684:23:684:70 | new MultiValueMapAdapter<>(...) : MultiValueMapAdapter [<map.key>] : Object | provenance | MaD:77 |
-| Test.java:684:55:684:62 | source(...) : Object | Test.java:684:48:684:69 | of(...) : Map [<map.key>] : Object | provenance | MaD:11 |
+| Test.java:684:55:684:62 | source(...) : Object | Test.java:684:48:684:69 | of(...) : Map [<map.key>] : Object | provenance | MaD:9 |
 | Test.java:685:10:685:11 | in : MultiValueMapAdapter [<map.key>] : Object | Test.java:685:10:685:30 | toSingleValueMap(...) : Map [<map.key>] : Object | provenance | MaD:75 |
 | Test.java:685:10:685:30 | toSingleValueMap(...) : Map [<map.key>] : Object | Test.java:686:19:686:21 | out : Map [<map.key>] : Object | provenance |  |
 | Test.java:686:19:686:21 | out : Map [<map.key>] : Object | Test.java:51:21:51:39 | container : Map [<map.key>] : Object | provenance |  |
-| Test.java:686:19:686:21 | out : Map [<map.key>] : Object | Test.java:686:9:686:22 | getMapKey(...) | provenance | MaD:10 |
+| Test.java:686:19:686:21 | out : Map [<map.key>] : Object | Test.java:686:9:686:22 | getMapKey(...) | provenance | MaD:12 |
 | Test.java:691:13:691:43 | of(...) : Map [<map.value>, <element>] : Object | Test.java:692:35:692:36 | in : Map [<map.value>, <element>] : Object | provenance |  |
-| Test.java:691:26:691:42 | of(...) : List [<element>] : Object | Test.java:691:13:691:43 | of(...) : Map [<map.value>, <element>] : Object | provenance | MaD:12 |
+| Test.java:691:26:691:42 | of(...) : List [<element>] : Object | Test.java:691:13:691:43 | of(...) : Map [<map.value>, <element>] : Object | provenance | MaD:10 |
 | Test.java:691:34:691:41 | source(...) : Object | Test.java:691:26:691:42 | of(...) : List [<element>] : Object | provenance | MaD:8 |
 | Test.java:692:10:692:37 | new MultiValueMapAdapter<>(...) : MultiValueMapAdapter [<map.value>, <element>] : Object | Test.java:693:32:693:34 | out : MultiValueMapAdapter [<map.value>, <element>] : Object | provenance |  |
 | Test.java:692:35:692:36 | in : Map [<map.value>, <element>] : Object | Test.java:692:10:692:37 | new MultiValueMapAdapter<>(...) : MultiValueMapAdapter [<map.value>, <element>] : Object | provenance | MaD:78 |
 | Test.java:693:20:693:35 | getMapValue(...) : List [<element>] : Object | Test.java:49:19:49:41 | container : List [<element>] : Object | provenance |  |
 | Test.java:693:20:693:35 | getMapValue(...) : List [<element>] : Object | Test.java:693:9:693:36 | getElement(...) | provenance | MaD:3 |
 | Test.java:693:32:693:34 | out : MultiValueMapAdapter [<map.value>, <element>] : Object | Test.java:52:23:52:41 | container : MultiValueMapAdapter [<map.value>, <element>] : Object | provenance |  |
-| Test.java:693:32:693:34 | out : MultiValueMapAdapter [<map.value>, <element>] : Object | Test.java:693:20:693:35 | getMapValue(...) : List [<element>] : Object | provenance | MaD:9 |
+| Test.java:693:32:693:34 | out : MultiValueMapAdapter [<map.value>, <element>] : Object | Test.java:693:20:693:35 | getMapValue(...) : List [<element>] : Object | provenance | MaD:11 |
 | Test.java:698:13:698:34 | of(...) : Map [<map.key>] : Object | Test.java:699:35:699:36 | in : Map [<map.key>] : Object | provenance |  |
-| Test.java:698:20:698:27 | source(...) : Object | Test.java:698:13:698:34 | of(...) : Map [<map.key>] : Object | provenance | MaD:11 |
+| Test.java:698:20:698:27 | source(...) : Object | Test.java:698:13:698:34 | of(...) : Map [<map.key>] : Object | provenance | MaD:9 |
 | Test.java:699:10:699:37 | new MultiValueMapAdapter<>(...) : MultiValueMapAdapter [<map.key>] : Object | Test.java:700:19:700:21 | out : MultiValueMapAdapter [<map.key>] : Object | provenance |  |
 | Test.java:699:35:699:36 | in : Map [<map.key>] : Object | Test.java:699:10:699:37 | new MultiValueMapAdapter<>(...) : MultiValueMapAdapter [<map.key>] : Object | provenance | MaD:77 |
 | Test.java:700:19:700:21 | out : MultiValueMapAdapter [<map.key>] : Object | Test.java:51:21:51:39 | container : MultiValueMapAdapter [<map.key>] : Object | provenance |  |
-| Test.java:700:19:700:21 | out : MultiValueMapAdapter [<map.key>] : Object | Test.java:700:9:700:22 | getMapKey(...) | provenance | MaD:10 |
+| Test.java:700:19:700:21 | out : MultiValueMapAdapter [<map.key>] : Object | Test.java:700:9:700:22 | getMapKey(...) | provenance | MaD:12 |
 | Test.java:705:18:705:46 | newWithArrayElement(...) : Object[] [[]] : Object | Test.java:706:36:706:37 | in : Object[] [[]] : Object | provenance |  |
 | Test.java:705:38:705:45 | source(...) : Object | Test.java:53:31:53:44 | element : Object | provenance |  |
 | Test.java:705:38:705:45 | source(...) : Object | Test.java:705:18:705:46 | newWithArrayElement(...) : Object[] [[]] : Object | provenance |  |
@@ -860,13 +860,13 @@ edges
 | Test.java:939:10:939:43 | matchAndExtract(...) : Map [<map.key>] : Object | Test.java:940:19:940:21 | out : Map [<map.key>] : Object | provenance |  |
 | Test.java:939:35:939:36 | in : String | Test.java:939:10:939:43 | matchAndExtract(...) : Map [<map.key>] : Object | provenance | MaD:95 |
 | Test.java:940:19:940:21 | out : Map [<map.key>] : Object | Test.java:51:21:51:39 | container : Map [<map.key>] : Object | provenance |  |
-| Test.java:940:19:940:21 | out : Map [<map.key>] : Object | Test.java:940:9:940:22 | getMapKey(...) | provenance | MaD:10 |
+| Test.java:940:19:940:21 | out : Map [<map.key>] : Object | Test.java:940:9:940:22 | getMapKey(...) | provenance | MaD:12 |
 | Test.java:945:28:945:55 | (...)... : Route | Test.java:947:41:947:42 | in : Route | provenance |  |
 | Test.java:945:48:945:55 | source(...) : Object | Test.java:945:28:945:55 | (...)... : Route | provenance |  |
 | Test.java:947:10:947:43 | matchAndExtract(...) : Map [<map.value>] : Object | Test.java:948:21:948:23 | out : Map [<map.value>] : Object | provenance |  |
 | Test.java:947:41:947:42 | in : Route | Test.java:947:10:947:43 | matchAndExtract(...) : Map [<map.value>] : Object | provenance | MaD:96 |
 | Test.java:948:21:948:23 | out : Map [<map.value>] : Object | Test.java:52:23:52:41 | container : Map [<map.value>] : Object | provenance |  |
-| Test.java:948:21:948:23 | out : Map [<map.value>] : Object | Test.java:948:9:948:24 | getMapValue(...) | provenance | MaD:9 |
+| Test.java:948:21:948:23 | out : Map [<map.value>] : Object | Test.java:948:9:948:24 | getMapValue(...) | provenance | MaD:11 |
 | Test.java:953:16:953:31 | (...)... : String | Test.java:955:30:955:31 | in : String | provenance |  |
 | Test.java:953:24:953:31 | source(...) : Object | Test.java:953:16:953:31 | (...)... : String | provenance |  |
 | Test.java:955:10:955:32 | parseRoute(...) : Route | Test.java:956:9:956:11 | out | provenance |  |
@@ -1081,14 +1081,14 @@ edges
 | Test.java:1270:10:1270:69 | splitArrayElementsIntoProperties(...) : Properties [<map.key>] : Object | Test.java:1271:19:1271:21 | out : Properties [<map.key>] : Object | provenance |  |
 | Test.java:1270:55:1270:56 | in : String[] [[]] : String | Test.java:1270:10:1270:69 | splitArrayElementsIntoProperties(...) : Properties [<map.key>] : Object | provenance | MaD:133 |
 | Test.java:1271:19:1271:21 | out : Properties [<map.key>] : Object | Test.java:51:21:51:39 | container : Properties [<map.key>] : Object | provenance |  |
-| Test.java:1271:19:1271:21 | out : Properties [<map.key>] : Object | Test.java:1271:9:1271:22 | getMapKey(...) | provenance | MaD:10 |
+| Test.java:1271:19:1271:21 | out : Properties [<map.key>] : Object | Test.java:1271:9:1271:22 | getMapKey(...) | provenance | MaD:12 |
 | Test.java:1276:18:1276:37 | {...} : String[] [[]] : String | Test.java:1277:55:1277:56 | in : String[] [[]] : String | provenance |  |
 | Test.java:1276:20:1276:35 | (...)... : String | Test.java:1276:18:1276:37 | {...} : String[] [[]] : String | provenance |  |
 | Test.java:1276:28:1276:35 | source(...) : Object | Test.java:1276:20:1276:35 | (...)... : String | provenance |  |
 | Test.java:1277:10:1277:69 | splitArrayElementsIntoProperties(...) : Properties [<map.value>] : Object | Test.java:1278:21:1278:23 | out : Properties [<map.value>] : Object | provenance |  |
 | Test.java:1277:55:1277:56 | in : String[] [[]] : String | Test.java:1277:10:1277:69 | splitArrayElementsIntoProperties(...) : Properties [<map.value>] : Object | provenance | MaD:134 |
 | Test.java:1278:21:1278:23 | out : Properties [<map.value>] : Object | Test.java:52:23:52:41 | container : Properties [<map.value>] : Object | provenance |  |
-| Test.java:1278:21:1278:23 | out : Properties [<map.value>] : Object | Test.java:1278:9:1278:24 | getMapValue(...) | provenance | MaD:9 |
+| Test.java:1278:21:1278:23 | out : Properties [<map.value>] : Object | Test.java:1278:9:1278:24 | getMapValue(...) | provenance | MaD:11 |
 | Test.java:1283:18:1283:35 | (...)... : String[] | Test.java:1284:55:1284:56 | in : String[] | provenance |  |
 | Test.java:1283:28:1283:35 | source(...) : Object | Test.java:1283:18:1283:35 | (...)... : String[] | provenance |  |
 | Test.java:1284:10:1284:63 | splitArrayElementsIntoProperties(...) : Properties [<map.value>] : Object | Test.java:1285:9:1285:11 | out | provenance |  |
diff --git a/java/ql/test/library-tests/frameworks/spring/validation/test.expected b/java/ql/test/library-tests/frameworks/spring/validation/test.expected
index 954c26e2c15..fc203234483 100644
--- a/java/ql/test/library-tests/frameworks/spring/validation/test.expected
+++ b/java/ql/test/library-tests/frameworks/spring/validation/test.expected
@@ -7,10 +7,10 @@ models
 | 6 | Summary: org.springframework.validation; Errors; true; reject; ; ; Argument[0]; Argument[this]; taint; manual |
 | 7 | Summary: org.springframework.validation; Errors; true; reject; ; ; Argument[1].ArrayElement; Argument[this]; taint; manual |
 | 8 | Summary: org.springframework.validation; Errors; true; reject; ; ; Argument[2]; Argument[this]; taint; manual |
-| 9 | Summary: org.springframework.validation; Errors; true; rejectValue; ; ; Argument[1]; Argument[this]; taint; manual |
-| 10 | Summary: org.springframework.validation; Errors; true; rejectValue; ; ; Argument[3]; Argument[this]; taint; manual |
-| 11 | Summary: org.springframework.validation; Errors; true; rejectValue; (java.lang.String,java.lang.String,java.lang.Object[],java.lang.String); ; Argument[2].ArrayElement; Argument[this]; taint; manual |
-| 12 | Summary: org.springframework.validation; Errors; true; rejectValue; (java.lang.String,java.lang.String,java.lang.String); ; Argument[2]; Argument[this]; taint; manual |
+| 9 | Summary: org.springframework.validation; Errors; true; rejectValue; (java.lang.String,java.lang.String,java.lang.Object[],java.lang.String); ; Argument[2].ArrayElement; Argument[this]; taint; manual |
+| 10 | Summary: org.springframework.validation; Errors; true; rejectValue; (java.lang.String,java.lang.String,java.lang.String); ; Argument[2]; Argument[this]; taint; manual |
+| 11 | Summary: org.springframework.validation; Errors; true; rejectValue; ; ; Argument[1]; Argument[this]; taint; manual |
+| 12 | Summary: org.springframework.validation; Errors; true; rejectValue; ; ; Argument[3]; Argument[this]; taint; manual |
 edges
 | Test.java:6:32:6:47 | (...)... : Errors | Test.java:13:22:13:33 | sourceErrs(...) : Errors | provenance |  |
 | Test.java:6:32:6:47 | (...)... : Errors | Test.java:16:10:16:21 | sourceErrs(...) : Errors | provenance |  |
@@ -48,20 +48,20 @@ edges
 | Test.java:54:20:54:35 | (...)... : String | Test.java:54:5:54:7 | es7 [post update] : Errors | provenance | MaD:7 |
 | Test.java:54:28:54:35 | source(...) : Object | Test.java:54:20:54:35 | (...)... : String | provenance |  |
 | Test.java:58:5:58:7 | es8 [post update] : Errors | Test.java:59:10:59:12 | es8 | provenance |  |
-| Test.java:58:25:58:40 | (...)... : String | Test.java:58:5:58:7 | es8 [post update] : Errors | provenance | MaD:9 |
+| Test.java:58:25:58:40 | (...)... : String | Test.java:58:5:58:7 | es8 [post update] : Errors | provenance | MaD:11 |
 | Test.java:58:33:58:40 | source(...) : Object | Test.java:58:25:58:40 | (...)... : String | provenance |  |
 | Test.java:62:19:62:28 | {...} : Object[] [[]] : Object | Test.java:63:29:63:30 | in : Object[] [[]] : Object | provenance |  |
 | Test.java:62:20:62:27 | source(...) : Object | Test.java:62:19:62:28 | {...} : Object[] [[]] : Object | provenance |  |
 | Test.java:63:5:63:7 | es9 [post update] : Errors | Test.java:64:10:64:12 | es9 | provenance |  |
-| Test.java:63:29:63:30 | in : Object[] [[]] : Object | Test.java:63:5:63:7 | es9 [post update] : Errors | provenance | MaD:11 |
+| Test.java:63:29:63:30 | in : Object[] [[]] : Object | Test.java:63:5:63:7 | es9 [post update] : Errors | provenance | MaD:9 |
 | Test.java:67:5:67:8 | es10 [post update] : Errors | Test.java:68:10:68:13 | es10 | provenance |  |
-| Test.java:67:36:67:51 | (...)... : String | Test.java:67:5:67:8 | es10 [post update] : Errors | provenance | MaD:10 |
+| Test.java:67:36:67:51 | (...)... : String | Test.java:67:5:67:8 | es10 [post update] : Errors | provenance | MaD:12 |
 | Test.java:67:44:67:51 | source(...) : Object | Test.java:67:36:67:51 | (...)... : String | provenance |  |
 | Test.java:71:5:71:8 | es11 [post update] : Errors | Test.java:72:10:72:13 | es11 | provenance |  |
-| Test.java:71:26:71:41 | (...)... : String | Test.java:71:5:71:8 | es11 [post update] : Errors | provenance | MaD:9 |
+| Test.java:71:26:71:41 | (...)... : String | Test.java:71:5:71:8 | es11 [post update] : Errors | provenance | MaD:11 |
 | Test.java:71:34:71:41 | source(...) : Object | Test.java:71:26:71:41 | (...)... : String | provenance |  |
 | Test.java:75:5:75:8 | es12 [post update] : Errors | Test.java:76:10:76:13 | es12 | provenance |  |
-| Test.java:75:30:75:45 | (...)... : String | Test.java:75:5:75:8 | es12 [post update] : Errors | provenance | MaD:12 |
+| Test.java:75:30:75:45 | (...)... : String | Test.java:75:5:75:8 | es12 [post update] : Errors | provenance | MaD:10 |
 | Test.java:75:38:75:45 | source(...) : Object | Test.java:75:30:75:45 | (...)... : String | provenance |  |
 nodes
 | Test.java:6:32:6:47 | (...)... : Errors | semmle.label | (...)... : Errors |
diff --git a/java/ql/test/library-tests/frameworks/spring/webmultipart/test.expected b/java/ql/test/library-tests/frameworks/spring/webmultipart/test.expected
index d7389eef212..36d3bfd6345 100644
--- a/java/ql/test/library-tests/frameworks/spring/webmultipart/test.expected
+++ b/java/ql/test/library-tests/frameworks/spring/webmultipart/test.expected
@@ -2,8 +2,8 @@ models
 | 1 | Summary: java.lang; Iterable; true; iterator; (); ; Argument[this].Element; ReturnValue.Element; value; manual |
 | 2 | Summary: java.util; Iterator; true; next; ; ; Argument[this].Element; ReturnValue; value; manual |
 | 3 | Summary: java.util; Map; true; get; ; ; Argument[this].MapValue; ReturnValue; value; manual |
-| 4 | Summary: org.springframework.web.multipart; MultipartFile; true; getBytes; ; ; Argument[this]; ReturnValue; taint; manual |
-| 5 | Summary: org.springframework.web.multipart; MultipartFile; true; getInputStream; ; ; Argument[this]; ReturnValue; taint; manual |
+| 4 | Summary: org.springframework.core.io; InputStreamSource; true; getInputStream; ; ; Argument[this]; ReturnValue; taint; manual |
+| 5 | Summary: org.springframework.web.multipart; MultipartFile; true; getBytes; ; ; Argument[this]; ReturnValue; taint; manual |
 | 6 | Summary: org.springframework.web.multipart; MultipartFile; true; getName; ; ; Argument[this]; ReturnValue; taint; manual |
 | 7 | Summary: org.springframework.web.multipart; MultipartFile; true; getOriginalFilename; ; ; Argument[this]; ReturnValue; taint; manual |
 | 8 | Summary: org.springframework.web.multipart; MultipartFile; true; getResource; ; ; Argument[this]; ReturnValue; taint; manual |
@@ -27,11 +27,11 @@ edges
 | Test.java:22:45:22:53 | container : MultiValueMap [<map.value>] : Object | Test.java:22:45:22:63 | get(...) : Object | provenance | MaD:3 |
 | Test.java:31:23:31:45 | (...)... : MultipartFile | Test.java:32:10:32:11 | in : MultipartFile | provenance |  |
 | Test.java:31:38:31:45 | source(...) : Object | Test.java:31:23:31:45 | (...)... : MultipartFile | provenance |  |
-| Test.java:32:10:32:11 | in : MultipartFile | Test.java:32:10:32:22 | getBytes(...) : byte[] | provenance | MaD:4 |
+| Test.java:32:10:32:11 | in : MultipartFile | Test.java:32:10:32:22 | getBytes(...) : byte[] | provenance | MaD:5 |
 | Test.java:32:10:32:22 | getBytes(...) : byte[] | Test.java:33:9:33:11 | out | provenance |  |
 | Test.java:38:23:38:45 | (...)... : MultipartFile | Test.java:39:10:39:11 | in : MultipartFile | provenance |  |
 | Test.java:38:38:38:45 | source(...) : Object | Test.java:38:23:38:45 | (...)... : MultipartFile | provenance |  |
-| Test.java:39:10:39:11 | in : MultipartFile | Test.java:39:10:39:28 | getInputStream(...) : InputStream | provenance | MaD:5 |
+| Test.java:39:10:39:11 | in : MultipartFile | Test.java:39:10:39:28 | getInputStream(...) : InputStream | provenance | MaD:4 |
 | Test.java:39:10:39:28 | getInputStream(...) : InputStream | Test.java:40:9:40:11 | out | provenance |  |
 | Test.java:45:23:45:45 | (...)... : MultipartFile | Test.java:46:10:46:11 | in : MultipartFile | provenance |  |
 | Test.java:45:38:45:45 | source(...) : Object | Test.java:45:23:45:45 | (...)... : MultipartFile | provenance |  |
diff --git a/java/ql/test/library-tests/frameworks/spring/webutil/test.expected b/java/ql/test/library-tests/frameworks/spring/webutil/test.expected
index f5e407abec1..dd5e222d69c 100644
--- a/java/ql/test/library-tests/frameworks/spring/webutil/test.expected
+++ b/java/ql/test/library-tests/frameworks/spring/webutil/test.expected
@@ -3,10 +3,10 @@ models
 | 2 | Summary: java.util; HashMap; false; HashMap; (Map); ; Argument[0].MapValue; Argument[this].MapValue; value; manual |
 | 3 | Summary: java.util; Iterator; true; next; ; ; Argument[this].Element; ReturnValue; value; manual |
 | 4 | Summary: java.util; List; false; of; (Object); ; Argument[0]; ReturnValue.Element; value; manual |
-| 5 | Summary: java.util; Map; true; get; ; ; Argument[this].MapValue; ReturnValue; value; manual |
-| 6 | Summary: java.util; Map; true; keySet; (); ; Argument[this].MapKey; ReturnValue.Element; value; manual |
-| 7 | Summary: java.util; Map; false; of; ; ; Argument[0]; ReturnValue.MapKey; value; manual |
-| 8 | Summary: java.util; Map; false; of; ; ; Argument[1]; ReturnValue.MapValue; value; manual |
+| 5 | Summary: java.util; Map; false; of; ; ; Argument[0]; ReturnValue.MapKey; value; manual |
+| 6 | Summary: java.util; Map; false; of; ; ; Argument[1]; ReturnValue.MapValue; value; manual |
+| 7 | Summary: java.util; Map; true; get; ; ; Argument[this].MapValue; ReturnValue; value; manual |
+| 8 | Summary: java.util; Map; true; keySet; (); ; Argument[this].MapKey; ReturnValue.Element; value; manual |
 | 9 | Summary: java.util; Map; true; put; (Object,Object); ; Argument[1]; Argument[this].MapValue; value; manual |
 | 10 | Summary: java.util; Optional; false; of; ; ; Argument[0]; ReturnValue.Element; value; manual |
 | 11 | Summary: org.springframework.util; LinkedMultiValueMap; false; LinkedMultiValueMap; (java.util.Map); ; Argument[0].MapKey; Argument[this].MapKey; value; manual |
@@ -33,69 +33,69 @@ models
 | 32 | Summary: org.springframework.web.util; ServletRequestPathUtils; false; getParsedRequestPath; ; ; Argument[0]; ReturnValue; taint; manual |
 | 33 | Summary: org.springframework.web.util; ServletRequestPathUtils; false; parseAndCache; ; ; Argument[0]; ReturnValue; taint; manual |
 | 34 | Summary: org.springframework.web.util; ServletRequestPathUtils; false; setParsedRequestPath; ; ; Argument[0]; Argument[1]; taint; manual |
-| 35 | Summary: org.springframework.web.util; UriBuilder; true; build; ; ; Argument[this]; ReturnValue; taint; manual |
-| 36 | Summary: org.springframework.web.util; UriBuilder; true; build; (Map); ; Argument[0].MapValue; Argument[this]; taint; manual |
-| 37 | Summary: org.springframework.web.util; UriBuilder; true; build; (Map); ; Argument[0].MapValue; ReturnValue; taint; manual |
-| 38 | Summary: org.springframework.web.util; UriBuilder; true; build; (Object[]); ; Argument[0].ArrayElement; ReturnValue; taint; manual |
-| 39 | Summary: org.springframework.web.util; UriBuilder; true; fragment; ; ; Argument[this]; ReturnValue; value; manual |
-| 40 | Summary: org.springframework.web.util; UriBuilder; true; fragment; ; ; Argument[0]; Argument[this]; taint; manual |
-| 41 | Summary: org.springframework.web.util; UriBuilder; true; host; ; ; Argument[this]; ReturnValue; value; manual |
-| 42 | Summary: org.springframework.web.util; UriBuilder; true; host; ; ; Argument[0]; Argument[this]; taint; manual |
-| 43 | Summary: org.springframework.web.util; UriBuilder; true; path; ; ; Argument[this]; ReturnValue; value; manual |
-| 44 | Summary: org.springframework.web.util; UriBuilder; true; path; ; ; Argument[0]; Argument[this]; taint; manual |
-| 45 | Summary: org.springframework.web.util; UriBuilder; true; pathSegment; ; ; Argument[this]; ReturnValue; value; manual |
-| 46 | Summary: org.springframework.web.util; UriBuilder; true; pathSegment; ; ; Argument[0].ArrayElement; Argument[this]; taint; manual |
-| 47 | Summary: org.springframework.web.util; UriBuilder; true; port; ; ; Argument[this]; ReturnValue; value; manual |
-| 48 | Summary: org.springframework.web.util; UriBuilder; true; port; (java.lang.String); ; Argument[0]; Argument[this]; taint; manual |
-| 49 | Summary: org.springframework.web.util; UriBuilder; true; query; ; ; Argument[this]; ReturnValue; value; manual |
-| 50 | Summary: org.springframework.web.util; UriBuilder; true; query; ; ; Argument[0]; Argument[this]; taint; manual |
-| 51 | Summary: org.springframework.web.util; UriBuilder; true; queryParam; ; ; Argument[this]; ReturnValue; value; manual |
-| 52 | Summary: org.springframework.web.util; UriBuilder; true; queryParam; ; ; Argument[0]; Argument[this]; taint; manual |
-| 53 | Summary: org.springframework.web.util; UriBuilder; true; queryParam; (String,Collection); ; Argument[1].Element; Argument[this]; taint; manual |
-| 54 | Summary: org.springframework.web.util; UriBuilder; true; queryParam; (String,Object[]); ; Argument[1].ArrayElement; Argument[this]; taint; manual |
-| 55 | Summary: org.springframework.web.util; UriBuilder; true; queryParamIfPresent; ; ; Argument[this]; ReturnValue; value; manual |
-| 56 | Summary: org.springframework.web.util; UriBuilder; true; queryParamIfPresent; ; ; Argument[0]; Argument[this]; taint; manual |
-| 57 | Summary: org.springframework.web.util; UriBuilder; true; queryParamIfPresent; ; ; Argument[1].Element; Argument[this]; taint; manual |
-| 58 | Summary: org.springframework.web.util; UriBuilder; true; queryParams; ; ; Argument[this]; ReturnValue; value; manual |
-| 59 | Summary: org.springframework.web.util; UriBuilder; true; queryParams; ; ; Argument[0].MapKey; Argument[this]; taint; manual |
-| 60 | Summary: org.springframework.web.util; UriBuilder; true; queryParams; ; ; Argument[0].MapValue.Element; Argument[this]; taint; manual |
-| 61 | Summary: org.springframework.web.util; UriBuilder; true; replacePath; ; ; Argument[this]; ReturnValue; value; manual |
-| 62 | Summary: org.springframework.web.util; UriBuilder; true; replacePath; ; ; Argument[0]; Argument[this]; taint; manual |
-| 63 | Summary: org.springframework.web.util; UriBuilder; true; replaceQuery; ; ; Argument[this]; ReturnValue; value; manual |
-| 64 | Summary: org.springframework.web.util; UriBuilder; true; replaceQuery; ; ; Argument[0]; Argument[this]; taint; manual |
-| 65 | Summary: org.springframework.web.util; UriBuilder; true; replaceQueryParam; ; ; Argument[this]; ReturnValue; value; manual |
-| 66 | Summary: org.springframework.web.util; UriBuilder; true; replaceQueryParam; ; ; Argument[0]; Argument[this]; taint; manual |
-| 67 | Summary: org.springframework.web.util; UriBuilder; true; replaceQueryParam; (String,Collection); ; Argument[1].Element; Argument[this]; taint; manual |
-| 68 | Summary: org.springframework.web.util; UriBuilder; true; replaceQueryParam; (String,Object[]); ; Argument[1].ArrayElement; Argument[this]; taint; manual |
-| 69 | Summary: org.springframework.web.util; UriBuilder; true; replaceQueryParams; ; ; Argument[this]; ReturnValue; value; manual |
-| 70 | Summary: org.springframework.web.util; UriBuilder; true; replaceQueryParams; ; ; Argument[0].MapKey; Argument[this]; taint; manual |
-| 71 | Summary: org.springframework.web.util; UriBuilder; true; replaceQueryParams; ; ; Argument[0].MapValue.Element; Argument[this]; taint; manual |
-| 72 | Summary: org.springframework.web.util; UriBuilder; true; scheme; ; ; Argument[this]; ReturnValue; value; manual |
-| 73 | Summary: org.springframework.web.util; UriBuilder; true; scheme; ; ; Argument[0]; Argument[this]; taint; manual |
-| 74 | Summary: org.springframework.web.util; UriBuilder; true; userInfo; ; ; Argument[this]; ReturnValue; value; manual |
-| 75 | Summary: org.springframework.web.util; UriBuilder; true; userInfo; ; ; Argument[0]; Argument[this]; taint; manual |
+| 35 | Summary: org.springframework.web.util; UriBuilder; true; build; (Map); ; Argument[0].MapValue; Argument[this]; taint; manual |
+| 36 | Summary: org.springframework.web.util; UriBuilder; true; build; (Map); ; Argument[0].MapValue; ReturnValue; taint; manual |
+| 37 | Summary: org.springframework.web.util; UriBuilder; true; build; (Object[]); ; Argument[0].ArrayElement; ReturnValue; taint; manual |
+| 38 | Summary: org.springframework.web.util; UriBuilder; true; build; ; ; Argument[this]; ReturnValue; taint; manual |
+| 39 | Summary: org.springframework.web.util; UriBuilder; true; fragment; ; ; Argument[0]; Argument[this]; taint; manual |
+| 40 | Summary: org.springframework.web.util; UriBuilder; true; fragment; ; ; Argument[this]; ReturnValue; value; manual |
+| 41 | Summary: org.springframework.web.util; UriBuilder; true; host; ; ; Argument[0]; Argument[this]; taint; manual |
+| 42 | Summary: org.springframework.web.util; UriBuilder; true; host; ; ; Argument[this]; ReturnValue; value; manual |
+| 43 | Summary: org.springframework.web.util; UriBuilder; true; path; ; ; Argument[0]; Argument[this]; taint; manual |
+| 44 | Summary: org.springframework.web.util; UriBuilder; true; path; ; ; Argument[this]; ReturnValue; value; manual |
+| 45 | Summary: org.springframework.web.util; UriBuilder; true; pathSegment; ; ; Argument[0].ArrayElement; Argument[this]; taint; manual |
+| 46 | Summary: org.springframework.web.util; UriBuilder; true; pathSegment; ; ; Argument[this]; ReturnValue; value; manual |
+| 47 | Summary: org.springframework.web.util; UriBuilder; true; port; (java.lang.String); ; Argument[0]; Argument[this]; taint; manual |
+| 48 | Summary: org.springframework.web.util; UriBuilder; true; port; ; ; Argument[this]; ReturnValue; value; manual |
+| 49 | Summary: org.springframework.web.util; UriBuilder; true; query; ; ; Argument[0]; Argument[this]; taint; manual |
+| 50 | Summary: org.springframework.web.util; UriBuilder; true; query; ; ; Argument[this]; ReturnValue; value; manual |
+| 51 | Summary: org.springframework.web.util; UriBuilder; true; queryParam; (String,Collection); ; Argument[1].Element; Argument[this]; taint; manual |
+| 52 | Summary: org.springframework.web.util; UriBuilder; true; queryParam; (String,Object[]); ; Argument[1].ArrayElement; Argument[this]; taint; manual |
+| 53 | Summary: org.springframework.web.util; UriBuilder; true; queryParam; ; ; Argument[0]; Argument[this]; taint; manual |
+| 54 | Summary: org.springframework.web.util; UriBuilder; true; queryParam; ; ; Argument[this]; ReturnValue; value; manual |
+| 55 | Summary: org.springframework.web.util; UriBuilder; true; queryParamIfPresent; ; ; Argument[0]; Argument[this]; taint; manual |
+| 56 | Summary: org.springframework.web.util; UriBuilder; true; queryParamIfPresent; ; ; Argument[1].Element; Argument[this]; taint; manual |
+| 57 | Summary: org.springframework.web.util; UriBuilder; true; queryParamIfPresent; ; ; Argument[this]; ReturnValue; value; manual |
+| 58 | Summary: org.springframework.web.util; UriBuilder; true; queryParams; ; ; Argument[0].MapKey; Argument[this]; taint; manual |
+| 59 | Summary: org.springframework.web.util; UriBuilder; true; queryParams; ; ; Argument[0].MapValue.Element; Argument[this]; taint; manual |
+| 60 | Summary: org.springframework.web.util; UriBuilder; true; queryParams; ; ; Argument[this]; ReturnValue; value; manual |
+| 61 | Summary: org.springframework.web.util; UriBuilder; true; replacePath; ; ; Argument[0]; Argument[this]; taint; manual |
+| 62 | Summary: org.springframework.web.util; UriBuilder; true; replacePath; ; ; Argument[this]; ReturnValue; value; manual |
+| 63 | Summary: org.springframework.web.util; UriBuilder; true; replaceQuery; ; ; Argument[0]; Argument[this]; taint; manual |
+| 64 | Summary: org.springframework.web.util; UriBuilder; true; replaceQuery; ; ; Argument[this]; ReturnValue; value; manual |
+| 65 | Summary: org.springframework.web.util; UriBuilder; true; replaceQueryParam; (String,Collection); ; Argument[1].Element; Argument[this]; taint; manual |
+| 66 | Summary: org.springframework.web.util; UriBuilder; true; replaceQueryParam; (String,Object[]); ; Argument[1].ArrayElement; Argument[this]; taint; manual |
+| 67 | Summary: org.springframework.web.util; UriBuilder; true; replaceQueryParam; ; ; Argument[0]; Argument[this]; taint; manual |
+| 68 | Summary: org.springframework.web.util; UriBuilder; true; replaceQueryParam; ; ; Argument[this]; ReturnValue; value; manual |
+| 69 | Summary: org.springframework.web.util; UriBuilder; true; replaceQueryParams; ; ; Argument[0].MapKey; Argument[this]; taint; manual |
+| 70 | Summary: org.springframework.web.util; UriBuilder; true; replaceQueryParams; ; ; Argument[0].MapValue.Element; Argument[this]; taint; manual |
+| 71 | Summary: org.springframework.web.util; UriBuilder; true; replaceQueryParams; ; ; Argument[this]; ReturnValue; value; manual |
+| 72 | Summary: org.springframework.web.util; UriBuilder; true; scheme; ; ; Argument[0]; Argument[this]; taint; manual |
+| 73 | Summary: org.springframework.web.util; UriBuilder; true; scheme; ; ; Argument[this]; ReturnValue; value; manual |
+| 74 | Summary: org.springframework.web.util; UriBuilder; true; userInfo; ; ; Argument[0]; Argument[this]; taint; manual |
+| 75 | Summary: org.springframework.web.util; UriBuilder; true; userInfo; ; ; Argument[this]; ReturnValue; value; manual |
 | 76 | Summary: org.springframework.web.util; UriBuilderFactory; true; builder; ; ; Argument[this]; ReturnValue; taint; manual |
-| 77 | Summary: org.springframework.web.util; UriBuilderFactory; true; uriString; ; ; Argument[this]; ReturnValue; taint; manual |
-| 78 | Summary: org.springframework.web.util; UriBuilderFactory; true; uriString; ; ; Argument[0]; ReturnValue; taint; manual |
-| 79 | Summary: org.springframework.web.util; UriComponents; false; encode; ; ; Argument[this]; ReturnValue; taint; manual |
-| 80 | Summary: org.springframework.web.util; UriComponents; false; expand; (Map); ; Argument[0].MapValue; ReturnValue; taint; manual |
-| 81 | Summary: org.springframework.web.util; UriComponents; false; expand; (Object[]); ; Argument[0].ArrayElement; ReturnValue; taint; manual |
-| 82 | Summary: org.springframework.web.util; UriComponents; false; expand; (UriComponents$UriTemplateVariables); ; Argument[0].MapValue; ReturnValue; taint; manual |
-| 83 | Summary: org.springframework.web.util; UriComponents; false; getFragment; ; ; Argument[this]; ReturnValue; taint; manual |
-| 84 | Summary: org.springframework.web.util; UriComponents; false; getHost; ; ; Argument[this]; ReturnValue; taint; manual |
-| 85 | Summary: org.springframework.web.util; UriComponents; false; getPath; ; ; Argument[this]; ReturnValue; taint; manual |
-| 86 | Summary: org.springframework.web.util; UriComponents; false; getPathSegments; ; ; Argument[this]; ReturnValue; taint; manual |
-| 87 | Summary: org.springframework.web.util; UriComponents; false; getQuery; ; ; Argument[this]; ReturnValue; taint; manual |
-| 88 | Summary: org.springframework.web.util; UriComponents; false; getQueryParams; ; ; Argument[this]; ReturnValue.MapKey; taint; manual |
-| 89 | Summary: org.springframework.web.util; UriComponents; false; getQueryParams; ; ; Argument[this]; ReturnValue.MapValue.Element; taint; manual |
-| 90 | Summary: org.springframework.web.util; UriComponents; false; getScheme; ; ; Argument[this]; ReturnValue; taint; manual |
-| 91 | Summary: org.springframework.web.util; UriComponents; false; getSchemeSpecificPart; ; ; Argument[this]; ReturnValue; taint; manual |
-| 92 | Summary: org.springframework.web.util; UriComponents; false; getUserInfo; ; ; Argument[this]; ReturnValue; taint; manual |
-| 93 | Summary: org.springframework.web.util; UriComponents; false; normalize; ; ; Argument[this]; ReturnValue; taint; manual |
-| 94 | Summary: org.springframework.web.util; UriComponents; false; toString; ; ; Argument[this]; ReturnValue; taint; manual |
-| 95 | Summary: org.springframework.web.util; UriComponents; false; toUri; ; ; Argument[this]; ReturnValue; taint; manual |
-| 96 | Summary: org.springframework.web.util; UriComponents; false; toUriString; ; ; Argument[this]; ReturnValue; taint; manual |
-| 97 | Summary: org.springframework.web.util; UriComponents$UriTemplateVariables; true; getValue; ; ; Argument[this].MapValue; ReturnValue; value; manual |
+| 77 | Summary: org.springframework.web.util; UriBuilderFactory; true; uriString; ; ; Argument[0]; ReturnValue; taint; manual |
+| 78 | Summary: org.springframework.web.util; UriBuilderFactory; true; uriString; ; ; Argument[this]; ReturnValue; taint; manual |
+| 79 | Summary: org.springframework.web.util; UriComponents$UriTemplateVariables; true; getValue; ; ; Argument[this].MapValue; ReturnValue; value; manual |
+| 80 | Summary: org.springframework.web.util; UriComponents; false; encode; ; ; Argument[this]; ReturnValue; taint; manual |
+| 81 | Summary: org.springframework.web.util; UriComponents; false; expand; (Map); ; Argument[0].MapValue; ReturnValue; taint; manual |
+| 82 | Summary: org.springframework.web.util; UriComponents; false; expand; (Object[]); ; Argument[0].ArrayElement; ReturnValue; taint; manual |
+| 83 | Summary: org.springframework.web.util; UriComponents; false; expand; (UriComponents$UriTemplateVariables); ; Argument[0].MapValue; ReturnValue; taint; manual |
+| 84 | Summary: org.springframework.web.util; UriComponents; false; getFragment; ; ; Argument[this]; ReturnValue; taint; manual |
+| 85 | Summary: org.springframework.web.util; UriComponents; false; getHost; ; ; Argument[this]; ReturnValue; taint; manual |
+| 86 | Summary: org.springframework.web.util; UriComponents; false; getPath; ; ; Argument[this]; ReturnValue; taint; manual |
+| 87 | Summary: org.springframework.web.util; UriComponents; false; getPathSegments; ; ; Argument[this]; ReturnValue; taint; manual |
+| 88 | Summary: org.springframework.web.util; UriComponents; false; getQuery; ; ; Argument[this]; ReturnValue; taint; manual |
+| 89 | Summary: org.springframework.web.util; UriComponents; false; getQueryParams; ; ; Argument[this]; ReturnValue.MapKey; taint; manual |
+| 90 | Summary: org.springframework.web.util; UriComponents; false; getQueryParams; ; ; Argument[this]; ReturnValue.MapValue.Element; taint; manual |
+| 91 | Summary: org.springframework.web.util; UriComponents; false; getScheme; ; ; Argument[this]; ReturnValue; taint; manual |
+| 92 | Summary: org.springframework.web.util; UriComponents; false; getSchemeSpecificPart; ; ; Argument[this]; ReturnValue; taint; manual |
+| 93 | Summary: org.springframework.web.util; UriComponents; false; getUserInfo; ; ; Argument[this]; ReturnValue; taint; manual |
+| 94 | Summary: org.springframework.web.util; UriComponents; false; normalize; ; ; Argument[this]; ReturnValue; taint; manual |
+| 95 | Summary: org.springframework.web.util; UriComponents; false; toString; ; ; Argument[this]; ReturnValue; taint; manual |
+| 96 | Summary: org.springframework.web.util; UriComponents; false; toUri; ; ; Argument[this]; ReturnValue; taint; manual |
+| 97 | Summary: org.springframework.web.util; UriComponents; false; toUriString; ; ; Argument[this]; ReturnValue; taint; manual |
 | 98 | Summary: org.springframework.web.util; UriComponentsBuilder; false; build; ; ; Argument[this]; ReturnValue; taint; manual |
 | 99 | Summary: org.springframework.web.util; UriComponentsBuilder; false; buildAndExpand; (Map); ; Argument[0].MapValue; ReturnValue; taint; manual |
 | 100 | Summary: org.springframework.web.util; UriComponentsBuilder; false; buildAndExpand; (Object[]); ; Argument[0].ArrayElement; ReturnValue; taint; manual |
@@ -108,24 +108,24 @@ models
 | 107 | Summary: org.springframework.web.util; UriComponentsBuilder; false; fromUri; ; ; Argument[0]; ReturnValue; taint; manual |
 | 108 | Summary: org.springframework.web.util; UriComponentsBuilder; false; fromUriString; ; ; Argument[0]; ReturnValue; taint; manual |
 | 109 | Summary: org.springframework.web.util; UriComponentsBuilder; false; parseForwardedFor; ; ; Argument[0..1]; ReturnValue; taint; manual |
-| 110 | Summary: org.springframework.web.util; UriComponentsBuilder; false; schemeSpecificPart; ; ; Argument[this]; ReturnValue; value; manual |
-| 111 | Summary: org.springframework.web.util; UriComponentsBuilder; false; schemeSpecificPart; ; ; Argument[0]; Argument[this]; taint; manual |
+| 110 | Summary: org.springframework.web.util; UriComponentsBuilder; false; schemeSpecificPart; ; ; Argument[0]; Argument[this]; taint; manual |
+| 111 | Summary: org.springframework.web.util; UriComponentsBuilder; false; schemeSpecificPart; ; ; Argument[this]; ReturnValue; value; manual |
 | 112 | Summary: org.springframework.web.util; UriComponentsBuilder; false; toUriString; ; ; Argument[this]; ReturnValue; taint; manual |
-| 113 | Summary: org.springframework.web.util; UriComponentsBuilder; false; uri; ; ; Argument[this]; ReturnValue; value; manual |
-| 114 | Summary: org.springframework.web.util; UriComponentsBuilder; false; uri; ; ; Argument[0]; Argument[this]; taint; manual |
-| 115 | Summary: org.springframework.web.util; UriComponentsBuilder; false; uriComponents; ; ; Argument[this]; ReturnValue; value; manual |
-| 116 | Summary: org.springframework.web.util; UriComponentsBuilder; false; uriComponents; ; ; Argument[0]; Argument[this]; taint; manual |
-| 117 | Summary: org.springframework.web.util; UriComponentsBuilder; false; uriVariables; ; ; Argument[this]; ReturnValue; value; manual |
-| 118 | Summary: org.springframework.web.util; UriComponentsBuilder; false; uriVariables; ; ; Argument[0].MapValue; Argument[this]; taint; manual |
+| 113 | Summary: org.springframework.web.util; UriComponentsBuilder; false; uri; ; ; Argument[0]; Argument[this]; taint; manual |
+| 114 | Summary: org.springframework.web.util; UriComponentsBuilder; false; uri; ; ; Argument[this]; ReturnValue; value; manual |
+| 115 | Summary: org.springframework.web.util; UriComponentsBuilder; false; uriComponents; ; ; Argument[0]; Argument[this]; taint; manual |
+| 116 | Summary: org.springframework.web.util; UriComponentsBuilder; false; uriComponents; ; ; Argument[this]; ReturnValue; value; manual |
+| 117 | Summary: org.springframework.web.util; UriComponentsBuilder; false; uriVariables; ; ; Argument[0].MapValue; Argument[this]; taint; manual |
+| 118 | Summary: org.springframework.web.util; UriComponentsBuilder; false; uriVariables; ; ; Argument[this]; ReturnValue; value; manual |
 | 119 | Summary: org.springframework.web.util; UriTemplate; false; expand; (Map); ; Argument[0].MapValue; ReturnValue; taint; manual |
 | 120 | Summary: org.springframework.web.util; UriTemplate; false; expand; (Object[]); ; Argument[0].ArrayElement; ReturnValue; taint; manual |
 | 121 | Summary: org.springframework.web.util; UriTemplate; false; getVariableNames; ; ; Argument[this]; ReturnValue.Element; taint; manual |
 | 122 | Summary: org.springframework.web.util; UriTemplate; false; match; ; ; Argument[0]; ReturnValue.MapValue; taint; manual |
 | 123 | Summary: org.springframework.web.util; UriTemplate; false; toString; ; ; Argument[this]; ReturnValue; taint; manual |
-| 124 | Summary: org.springframework.web.util; UriTemplateHandler; true; expand; ; ; Argument[this]; ReturnValue; taint; manual |
-| 125 | Summary: org.springframework.web.util; UriTemplateHandler; true; expand; ; ; Argument[0]; ReturnValue; taint; manual |
-| 126 | Summary: org.springframework.web.util; UriTemplateHandler; true; expand; (String,Map); ; Argument[1].MapValue; ReturnValue; taint; manual |
-| 127 | Summary: org.springframework.web.util; UriTemplateHandler; true; expand; (String,Object[]); ; Argument[1].ArrayElement; ReturnValue; taint; manual |
+| 124 | Summary: org.springframework.web.util; UriTemplateHandler; true; expand; (String,Map); ; Argument[1].MapValue; ReturnValue; taint; manual |
+| 125 | Summary: org.springframework.web.util; UriTemplateHandler; true; expand; (String,Object[]); ; Argument[1].ArrayElement; ReturnValue; taint; manual |
+| 126 | Summary: org.springframework.web.util; UriTemplateHandler; true; expand; ; ; Argument[0]; ReturnValue; taint; manual |
+| 127 | Summary: org.springframework.web.util; UriTemplateHandler; true; expand; ; ; Argument[this]; ReturnValue; taint; manual |
 | 128 | Summary: org.springframework.web.util; UriUtils; false; decode; ; ; Argument[0]; ReturnValue; taint; manual |
 | 129 | Summary: org.springframework.web.util; UriUtils; false; encode; ; ; Argument[0]; ReturnValue; taint; manual |
 | 130 | Summary: org.springframework.web.util; UriUtils; false; encodeAuthority; ; ; Argument[0]; ReturnValue; taint; manual |
@@ -170,14 +170,14 @@ edges
 | Test.java:44:39:44:47 | this <constr(this)> [post update] : StubUriTemplateVariables [<map.value>] : Object | Test.java:44:5:44:28 | parameter this [Return] : StubUriTemplateVariables [<map.value>] : Object | provenance |  |
 | Test.java:44:45:44:45 | m : Map [<map.value>] : Object | Test.java:44:39:44:47 | this <constr(this)> [post update] : StubUriTemplateVariables [<map.value>] : Object | provenance | MaD:2 |
 | Test.java:46:19:46:26 | parameter this : StubUriTemplateVariables [<map.value>] : Object | Test.java:46:50:46:53 | this : StubUriTemplateVariables [<map.value>] : Object | provenance |  |
-| Test.java:46:50:46:53 | this : StubUriTemplateVariables [<map.value>] : Object | Test.java:46:50:46:63 | get(...) : Object | provenance | MaD:5 |
+| Test.java:46:50:46:53 | this : StubUriTemplateVariables [<map.value>] : Object | Test.java:46:50:46:63 | get(...) : Object | provenance | MaD:7 |
 | Test.java:49:20:49:39 | container : List [<element>] : Object | Test.java:49:51:49:59 | container : List [<element>] : Object | provenance |  |
 | Test.java:49:51:49:59 | container : List [<element>] : Object | Test.java:49:51:49:70 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:1 |
 | Test.java:49:51:49:70 | iterator(...) : Iterator [<element>] : Object | Test.java:49:51:49:77 | next(...) : Object | provenance | MaD:3 |
 | Test.java:50:18:50:27 | m : Map [<map.key>] : Object | Test.java:50:39:50:39 | m : Map [<map.key>] : Object | provenance |  |
 | Test.java:50:18:50:27 | m : MultiValueMap [<map.key>] : Object | Test.java:50:39:50:39 | m : MultiValueMap [<map.key>] : Object | provenance |  |
-| Test.java:50:39:50:39 | m : Map [<map.key>] : Object | Test.java:50:39:50:48 | keySet(...) : Set [<element>] : Object | provenance | MaD:6 |
-| Test.java:50:39:50:39 | m : MultiValueMap [<map.key>] : Object | Test.java:50:39:50:48 | keySet(...) : Set [<element>] : Object | provenance | MaD:6 |
+| Test.java:50:39:50:39 | m : Map [<map.key>] : Object | Test.java:50:39:50:48 | keySet(...) : Set [<element>] : Object | provenance | MaD:8 |
+| Test.java:50:39:50:39 | m : MultiValueMap [<map.key>] : Object | Test.java:50:39:50:48 | keySet(...) : Set [<element>] : Object | provenance | MaD:8 |
 | Test.java:50:39:50:48 | keySet(...) : Set [<element>] : Object | Test.java:50:39:50:59 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:1 |
 | Test.java:50:39:50:48 | keySet(...) : Set [<element>] : Object | Test.java:50:39:50:59 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:1 |
 | Test.java:50:39:50:59 | iterator(...) : Iterator [<element>] : Object | Test.java:50:39:50:66 | next(...) : Object | provenance | MaD:3 |
@@ -185,16 +185,16 @@ edges
 | Test.java:51:20:51:29 | m : Map [<map.value>] : Object | Test.java:51:41:51:41 | m : Map [<map.value>] : Object | provenance |  |
 | Test.java:51:20:51:29 | m : MultiValueMap [<map.value>, <element>] : Object | Test.java:51:41:51:41 | m : MultiValueMap [<map.value>, <element>] : Object | provenance |  |
 | Test.java:51:20:51:29 | m : MultiValueMap [<map.value>] : Object | Test.java:51:41:51:41 | m : MultiValueMap [<map.value>] : Object | provenance |  |
-| Test.java:51:41:51:41 | m : Map [<map.value>] : Object | Test.java:51:41:51:51 | get(...) : Object | provenance | MaD:5 |
-| Test.java:51:41:51:41 | m : MultiValueMap [<map.value>, <element>] : Object | Test.java:51:41:51:51 | get(...) : Object [<element>] : Object | provenance | MaD:5 |
-| Test.java:51:41:51:41 | m : MultiValueMap [<map.value>] : Object | Test.java:51:41:51:51 | get(...) : Object | provenance | MaD:5 |
+| Test.java:51:41:51:41 | m : Map [<map.value>] : Object | Test.java:51:41:51:51 | get(...) : Object | provenance | MaD:7 |
+| Test.java:51:41:51:41 | m : MultiValueMap [<map.value>, <element>] : Object | Test.java:51:41:51:51 | get(...) : Object [<element>] : Object | provenance | MaD:7 |
+| Test.java:51:41:51:41 | m : MultiValueMap [<map.value>] : Object | Test.java:51:41:51:51 | get(...) : Object | provenance | MaD:7 |
 | Test.java:52:20:52:33 | element : Object | Test.java:52:52:52:58 | element : Object | provenance |  |
-| Test.java:52:52:52:58 | element : Object | Test.java:52:45:52:65 | of(...) : Map [<map.key>] : Object | provenance | MaD:7 |
+| Test.java:52:52:52:58 | element : Object | Test.java:52:45:52:65 | of(...) : Map [<map.key>] : Object | provenance | MaD:5 |
 | Test.java:53:22:53:35 | element : Object | Test.java:53:60:53:66 | element : Object | provenance |  |
-| Test.java:53:60:53:66 | element : Object | Test.java:53:47:53:67 | of(...) : Map [<map.value>] : Object | provenance | MaD:8 |
+| Test.java:53:60:53:66 | element : Object | Test.java:53:47:53:67 | of(...) : Map [<map.value>] : Object | provenance | MaD:6 |
 | Test.java:54:40:54:53 | element : Object | Test.java:54:96:54:102 | element : Object | provenance |  |
 | Test.java:54:89:54:109 | of(...) : Map [<map.key>] : Object | Test.java:54:65:54:110 | new LinkedMultiValueMap<>(...) : LinkedMultiValueMap [<map.key>] : Object | provenance | MaD:11 |
-| Test.java:54:96:54:102 | element : Object | Test.java:54:89:54:109 | of(...) : Map [<map.key>] : Object | provenance | MaD:7 |
+| Test.java:54:96:54:102 | element : Object | Test.java:54:89:54:109 | of(...) : Map [<map.key>] : Object | provenance | MaD:5 |
 | Test.java:55:42:55:55 | element : Object | Test.java:55:117:55:123 | element : Object | provenance |  |
 | Test.java:55:105:55:105 | m [post update] : LinkedMultiValueMap [<map.value>] : Object | Test.java:55:134:55:134 | m : LinkedMultiValueMap [<map.value>] : Object | provenance |  |
 | Test.java:55:117:55:123 | element : Object | Test.java:55:105:55:105 | m [post update] : LinkedMultiValueMap [<map.value>] : Object | provenance | MaD:9 |
@@ -249,43 +249,43 @@ edges
 | Test.java:142:10:142:21 | builder(...) : UriBuilder | Test.java:143:9:143:11 | out | provenance |  |
 | Test.java:148:13:148:37 | newMapWithValue(...) : Map [<map.value>] : Object | Test.java:150:40:150:41 | in : Map [<map.value>] : Object | provenance |  |
 | Test.java:148:29:148:36 | source(...) : Object | Test.java:53:22:53:35 | element : Object | provenance |  |
-| Test.java:148:29:148:36 | source(...) : Object | Test.java:148:13:148:37 | newMapWithValue(...) : Map [<map.value>] : Object | provenance | MaD:8 |
+| Test.java:148:29:148:36 | source(...) : Object | Test.java:148:13:148:37 | newMapWithValue(...) : Map [<map.value>] : Object | provenance | MaD:6 |
 | Test.java:150:10:150:42 | expand(...) : URI | Test.java:151:9:151:11 | out | provenance |  |
-| Test.java:150:40:150:41 | in : Map [<map.value>] : Object | Test.java:150:10:150:42 | expand(...) : URI | provenance | MaD:126 |
+| Test.java:150:40:150:41 | in : Map [<map.value>] : Object | Test.java:150:10:150:42 | expand(...) : URI | provenance | MaD:124 |
 | Test.java:156:18:156:39 | {...} : Object[] [[]] : Object | Test.java:158:40:158:41 | in : Object[] [[]] : Object | provenance |  |
 | Test.java:156:31:156:38 | source(...) : Object | Test.java:156:18:156:39 | {...} : Object[] [[]] : Object | provenance |  |
 | Test.java:158:10:158:42 | expand(...) : URI | Test.java:159:9:159:11 | out | provenance |  |
-| Test.java:158:40:158:41 | in : Object[] [[]] : Object | Test.java:158:10:158:42 | expand(...) : URI | provenance | MaD:127 |
+| Test.java:158:40:158:41 | in : Object[] [[]] : Object | Test.java:158:10:158:42 | expand(...) : URI | provenance | MaD:125 |
 | Test.java:164:16:164:31 | (...)... : String | Test.java:166:26:166:27 | in : String | provenance |  |
 | Test.java:164:24:164:31 | source(...) : Object | Test.java:164:16:164:31 | (...)... : String | provenance |  |
 | Test.java:166:10:166:44 | expand(...) : URI | Test.java:167:9:167:11 | out | provenance |  |
-| Test.java:166:26:166:27 | in : String | Test.java:166:10:166:44 | expand(...) : URI | provenance | MaD:125 |
+| Test.java:166:26:166:27 | in : String | Test.java:166:10:166:44 | expand(...) : URI | provenance | MaD:126 |
 | Test.java:172:16:172:31 | (...)... : String | Test.java:174:26:174:27 | in : String | provenance |  |
 | Test.java:172:24:172:31 | source(...) : Object | Test.java:172:16:172:31 | (...)... : String | provenance |  |
 | Test.java:174:10:174:39 | expand(...) : URI | Test.java:175:9:175:11 | out | provenance |  |
-| Test.java:174:26:174:27 | in : String | Test.java:174:10:174:39 | expand(...) : URI | provenance | MaD:125 |
+| Test.java:174:26:174:27 | in : String | Test.java:174:10:174:39 | expand(...) : URI | provenance | MaD:126 |
 | Test.java:180:34:180:67 | (...)... : DefaultUriBuilderFactory | Test.java:181:10:181:11 | in : DefaultUriBuilderFactory | provenance |  |
 | Test.java:180:60:180:67 | source(...) : Object | Test.java:180:34:180:67 | (...)... : DefaultUriBuilderFactory | provenance |  |
-| Test.java:181:10:181:11 | in : DefaultUriBuilderFactory | Test.java:181:10:181:48 | expand(...) : URI | provenance | MaD:124 |
+| Test.java:181:10:181:11 | in : DefaultUriBuilderFactory | Test.java:181:10:181:48 | expand(...) : URI | provenance | MaD:127 |
 | Test.java:181:10:181:48 | expand(...) : URI | Test.java:182:9:182:11 | out | provenance |  |
 | Test.java:187:34:187:67 | (...)... : DefaultUriBuilderFactory | Test.java:188:10:188:11 | in : DefaultUriBuilderFactory | provenance |  |
 | Test.java:187:60:187:67 | source(...) : Object | Test.java:187:34:187:67 | (...)... : DefaultUriBuilderFactory | provenance |  |
-| Test.java:188:10:188:11 | in : DefaultUriBuilderFactory | Test.java:188:10:188:43 | expand(...) : URI | provenance | MaD:124 |
+| Test.java:188:10:188:11 | in : DefaultUriBuilderFactory | Test.java:188:10:188:43 | expand(...) : URI | provenance | MaD:127 |
 | Test.java:188:10:188:43 | expand(...) : URI | Test.java:189:9:189:11 | out | provenance |  |
 | Test.java:194:34:194:67 | (...)... : DefaultUriBuilderFactory | Test.java:195:10:195:11 | in : DefaultUriBuilderFactory | provenance |  |
 | Test.java:194:60:194:67 | source(...) : Object | Test.java:194:34:194:67 | (...)... : DefaultUriBuilderFactory | provenance |  |
 | Test.java:195:10:195:11 | in : DefaultUriBuilderFactory | Test.java:195:10:195:36 | getDefaultUriVariables(...) : Map [<map.value>] : Object | provenance | MaD:22 |
 | Test.java:195:10:195:36 | getDefaultUriVariables(...) : Map [<map.value>] : Object | Test.java:196:21:196:23 | out : Map [<map.value>] : Object | provenance |  |
 | Test.java:196:21:196:23 | out : Map [<map.value>] : Object | Test.java:51:20:51:29 | m : Map [<map.value>] : Object | provenance |  |
-| Test.java:196:21:196:23 | out : Map [<map.value>] : Object | Test.java:196:9:196:24 | getMapValue(...) | provenance | MaD:5 |
+| Test.java:196:21:196:23 | out : Map [<map.value>] : Object | Test.java:196:9:196:24 | getMapValue(...) | provenance | MaD:7 |
 | Test.java:201:13:201:34 | of(...) : Map [<map.value>] : Object | Test.java:202:31:202:32 | in : Map [<map.value>] : Object | provenance |  |
-| Test.java:201:26:201:33 | source(...) : Object | Test.java:201:13:201:34 | of(...) : Map [<map.value>] : Object | provenance | MaD:8 |
+| Test.java:201:26:201:33 | source(...) : Object | Test.java:201:13:201:34 | of(...) : Map [<map.value>] : Object | provenance | MaD:6 |
 | Test.java:202:4:202:6 | out [post update] : DefaultUriBuilderFactory | Test.java:203:9:203:11 | out | provenance |  |
 | Test.java:202:31:202:32 | in : Map [<map.value>] : Object | Test.java:202:4:202:6 | out [post update] : DefaultUriBuilderFactory | provenance | MaD:23 |
 | Test.java:208:34:208:67 | (...)... : DefaultUriBuilderFactory | Test.java:209:10:209:11 | in : DefaultUriBuilderFactory | provenance |  |
 | Test.java:208:60:208:67 | source(...) : Object | Test.java:208:34:208:67 | (...)... : DefaultUriBuilderFactory | provenance |  |
 | Test.java:209:10:209:11 | in : DefaultUriBuilderFactory | Test.java:209:10:209:27 | uriString(...) : UriBuilder | provenance | MaD:24 |
-| Test.java:209:10:209:11 | in : DefaultUriBuilderFactory | Test.java:209:10:209:27 | uriString(...) : UriBuilder | provenance | MaD:77 |
+| Test.java:209:10:209:11 | in : DefaultUriBuilderFactory | Test.java:209:10:209:27 | uriString(...) : UriBuilder | provenance | MaD:78 |
 | Test.java:209:10:209:27 | uriString(...) : UriBuilder | Test.java:210:9:210:11 | out | provenance |  |
 | Test.java:215:16:215:31 | (...)... : String | Test.java:216:33:216:34 | in : String | provenance |  |
 | Test.java:215:24:215:31 | source(...) : Object | Test.java:215:16:215:31 | (...)... : String | provenance |  |
@@ -329,550 +329,550 @@ edges
 | Test.java:279:53:279:55 | out [post update] : ServletRequest | Test.java:280:9:280:11 | out | provenance |  |
 | Test.java:285:13:285:37 | newMapWithValue(...) : Map [<map.value>] : Object | Test.java:286:14:286:15 | in : Map [<map.value>] : Object | provenance |  |
 | Test.java:285:29:285:36 | source(...) : Object | Test.java:53:22:53:35 | element : Object | provenance |  |
-| Test.java:285:29:285:36 | source(...) : Object | Test.java:285:13:285:37 | newMapWithValue(...) : Map [<map.value>] : Object | provenance | MaD:8 |
+| Test.java:285:29:285:36 | source(...) : Object | Test.java:285:13:285:37 | newMapWithValue(...) : Map [<map.value>] : Object | provenance | MaD:6 |
 | Test.java:286:4:286:6 | out [post update] : UriBuilder | Test.java:287:9:287:11 | out | provenance |  |
-| Test.java:286:14:286:15 | in : Map [<map.value>] : Object | Test.java:286:4:286:6 | out [post update] : UriBuilder | provenance | MaD:36 |
+| Test.java:286:14:286:15 | in : Map [<map.value>] : Object | Test.java:286:4:286:6 | out [post update] : UriBuilder | provenance | MaD:35 |
 | Test.java:292:13:292:37 | newMapWithValue(...) : Map [<map.value>] : Object | Test.java:294:25:294:26 | in : Map [<map.value>] : Object | provenance |  |
 | Test.java:292:29:292:36 | source(...) : Object | Test.java:53:22:53:35 | element : Object | provenance |  |
-| Test.java:292:29:292:36 | source(...) : Object | Test.java:292:13:292:37 | newMapWithValue(...) : Map [<map.value>] : Object | provenance | MaD:8 |
+| Test.java:292:29:292:36 | source(...) : Object | Test.java:292:13:292:37 | newMapWithValue(...) : Map [<map.value>] : Object | provenance | MaD:6 |
 | Test.java:294:10:294:27 | build(...) : URI | Test.java:295:9:295:11 | out | provenance |  |
-| Test.java:294:25:294:26 | in : Map [<map.value>] : Object | Test.java:294:10:294:27 | build(...) : URI | provenance | MaD:37 |
+| Test.java:294:25:294:26 | in : Map [<map.value>] : Object | Test.java:294:10:294:27 | build(...) : URI | provenance | MaD:36 |
 | Test.java:300:20:300:39 | (...)... : UriBuilder | Test.java:301:10:301:11 | in : UriBuilder | provenance |  |
 | Test.java:300:32:300:39 | source(...) : Object | Test.java:300:20:300:39 | (...)... : UriBuilder | provenance |  |
-| Test.java:301:10:301:11 | in : UriBuilder | Test.java:301:10:301:24 | build(...) : URI | provenance | MaD:35 |
+| Test.java:301:10:301:11 | in : UriBuilder | Test.java:301:10:301:24 | build(...) : URI | provenance | MaD:38 |
 | Test.java:301:10:301:24 | build(...) : URI | Test.java:302:9:302:11 | out | provenance |  |
 | Test.java:307:20:307:39 | (...)... : UriBuilder | Test.java:308:10:308:11 | in : UriBuilder | provenance |  |
 | Test.java:307:32:307:39 | source(...) : Object | Test.java:307:20:307:39 | (...)... : UriBuilder | provenance |  |
-| Test.java:308:10:308:11 | in : UriBuilder | Test.java:308:10:308:19 | build(...) : URI | provenance | MaD:35 |
+| Test.java:308:10:308:11 | in : UriBuilder | Test.java:308:10:308:19 | build(...) : URI | provenance | MaD:38 |
 | Test.java:308:10:308:19 | build(...) : URI | Test.java:309:9:309:11 | out | provenance |  |
 | Test.java:314:20:314:39 | (...)... : UriBuilder | Test.java:315:10:315:11 | in : UriBuilder | provenance |  |
 | Test.java:314:32:314:39 | source(...) : Object | Test.java:314:20:314:39 | (...)... : UriBuilder | provenance |  |
-| Test.java:315:10:315:11 | in : UriBuilder | Test.java:315:10:315:33 | build(...) : URI | provenance | MaD:35 |
+| Test.java:315:10:315:11 | in : UriBuilder | Test.java:315:10:315:33 | build(...) : URI | provenance | MaD:38 |
 | Test.java:315:10:315:33 | build(...) : URI | Test.java:316:9:316:11 | out | provenance |  |
 | Test.java:321:20:321:39 | (...)... : UriBuilder | Test.java:322:10:322:11 | in : UriBuilder | provenance |  |
 | Test.java:321:32:321:39 | source(...) : Object | Test.java:321:20:321:39 | (...)... : UriBuilder | provenance |  |
-| Test.java:322:10:322:11 | in : UriBuilder | Test.java:322:10:322:28 | build(...) : URI | provenance | MaD:35 |
+| Test.java:322:10:322:11 | in : UriBuilder | Test.java:322:10:322:28 | build(...) : URI | provenance | MaD:38 |
 | Test.java:322:10:322:28 | build(...) : URI | Test.java:323:9:323:11 | out | provenance |  |
 | Test.java:328:20:328:39 | (...)... : UriBuilder | Test.java:329:10:329:11 | in : UriBuilder | provenance |  |
 | Test.java:328:32:328:39 | source(...) : Object | Test.java:328:20:328:39 | (...)... : UriBuilder | provenance |  |
-| Test.java:329:10:329:11 | in : UriBuilder | Test.java:329:10:329:26 | fragment(...) : UriBuilder | provenance | MaD:39 |
+| Test.java:329:10:329:11 | in : UriBuilder | Test.java:329:10:329:26 | fragment(...) : UriBuilder | provenance | MaD:40 |
 | Test.java:329:10:329:26 | fragment(...) : UriBuilder | Test.java:330:9:330:11 | out | provenance |  |
 | Test.java:335:20:335:39 | (...)... : UriBuilder | Test.java:336:10:336:11 | in : UriBuilder | provenance |  |
 | Test.java:335:32:335:39 | source(...) : Object | Test.java:335:20:335:39 | (...)... : UriBuilder | provenance |  |
-| Test.java:336:10:336:11 | in : UriBuilder | Test.java:336:10:336:26 | fragment(...) : UriBuilder | provenance | MaD:39 |
+| Test.java:336:10:336:11 | in : UriBuilder | Test.java:336:10:336:26 | fragment(...) : UriBuilder | provenance | MaD:40 |
 | Test.java:336:10:336:26 | fragment(...) : UriBuilder | Test.java:337:9:337:11 | out | provenance |  |
 | Test.java:342:16:342:31 | (...)... : String | Test.java:343:17:343:18 | in : String | provenance |  |
 | Test.java:342:24:342:31 | source(...) : Object | Test.java:342:16:342:31 | (...)... : String | provenance |  |
 | Test.java:343:4:343:6 | out [post update] : UriBuilder | Test.java:344:9:344:11 | out | provenance |  |
-| Test.java:343:17:343:18 | in : String | Test.java:343:4:343:6 | out [post update] : UriBuilder | provenance | MaD:40 |
+| Test.java:343:17:343:18 | in : String | Test.java:343:4:343:6 | out [post update] : UriBuilder | provenance | MaD:39 |
 | Test.java:349:16:349:31 | (...)... : String | Test.java:350:17:350:18 | in : String | provenance |  |
 | Test.java:349:24:349:31 | source(...) : Object | Test.java:349:16:349:31 | (...)... : String | provenance |  |
 | Test.java:350:4:350:6 | out [post update] : UriBuilder | Test.java:351:9:351:11 | out | provenance |  |
-| Test.java:350:17:350:18 | in : String | Test.java:350:4:350:6 | out [post update] : UriBuilder | provenance | MaD:40 |
+| Test.java:350:17:350:18 | in : String | Test.java:350:4:350:6 | out [post update] : UriBuilder | provenance | MaD:39 |
 | Test.java:356:16:356:31 | (...)... : String | Test.java:358:28:358:29 | in : String | provenance |  |
 | Test.java:356:24:356:31 | source(...) : Object | Test.java:356:16:356:31 | (...)... : String | provenance |  |
 | Test.java:358:10:358:30 | fragment(...) : UriBuilder | Test.java:359:9:359:11 | out | provenance |  |
-| Test.java:358:28:358:29 | in : String | Test.java:358:10:358:30 | fragment(...) : UriBuilder | provenance | MaD:40+MaD:39 |
+| Test.java:358:28:358:29 | in : String | Test.java:358:10:358:30 | fragment(...) : UriBuilder | provenance | MaD:39+MaD:40 |
 | Test.java:364:16:364:31 | (...)... : String | Test.java:366:28:366:29 | in : String | provenance |  |
 | Test.java:364:24:364:31 | source(...) : Object | Test.java:364:16:364:31 | (...)... : String | provenance |  |
 | Test.java:366:10:366:30 | fragment(...) : UriBuilder | Test.java:367:9:367:11 | out | provenance |  |
-| Test.java:366:28:366:29 | in : String | Test.java:366:10:366:30 | fragment(...) : UriBuilder | provenance | MaD:40+MaD:39 |
+| Test.java:366:28:366:29 | in : String | Test.java:366:10:366:30 | fragment(...) : UriBuilder | provenance | MaD:39+MaD:40 |
 | Test.java:372:20:372:39 | (...)... : UriBuilder | Test.java:373:10:373:11 | in : UriBuilder | provenance |  |
 | Test.java:372:32:372:39 | source(...) : Object | Test.java:372:20:372:39 | (...)... : UriBuilder | provenance |  |
-| Test.java:373:10:373:11 | in : UriBuilder | Test.java:373:10:373:22 | host(...) : UriBuilder | provenance | MaD:41 |
+| Test.java:373:10:373:11 | in : UriBuilder | Test.java:373:10:373:22 | host(...) : UriBuilder | provenance | MaD:42 |
 | Test.java:373:10:373:22 | host(...) : UriBuilder | Test.java:374:9:374:11 | out | provenance |  |
 | Test.java:379:20:379:39 | (...)... : UriBuilder | Test.java:380:10:380:11 | in : UriBuilder | provenance |  |
 | Test.java:379:32:379:39 | source(...) : Object | Test.java:379:20:379:39 | (...)... : UriBuilder | provenance |  |
-| Test.java:380:10:380:11 | in : UriBuilder | Test.java:380:10:380:22 | host(...) : UriBuilder | provenance | MaD:41 |
+| Test.java:380:10:380:11 | in : UriBuilder | Test.java:380:10:380:22 | host(...) : UriBuilder | provenance | MaD:42 |
 | Test.java:380:10:380:22 | host(...) : UriBuilder | Test.java:381:9:381:11 | out | provenance |  |
 | Test.java:386:16:386:31 | (...)... : String | Test.java:388:24:388:25 | in : String | provenance |  |
 | Test.java:386:24:386:31 | source(...) : Object | Test.java:386:16:386:31 | (...)... : String | provenance |  |
 | Test.java:388:10:388:26 | host(...) : UriBuilder | Test.java:389:9:389:11 | out | provenance |  |
-| Test.java:388:24:388:25 | in : String | Test.java:388:10:388:26 | host(...) : UriBuilder | provenance | MaD:42+MaD:41 |
+| Test.java:388:24:388:25 | in : String | Test.java:388:10:388:26 | host(...) : UriBuilder | provenance | MaD:41+MaD:42 |
 | Test.java:394:16:394:31 | (...)... : String | Test.java:396:24:396:25 | in : String | provenance |  |
 | Test.java:394:24:394:31 | source(...) : Object | Test.java:394:16:394:31 | (...)... : String | provenance |  |
 | Test.java:396:10:396:26 | host(...) : UriBuilder | Test.java:397:9:397:11 | out | provenance |  |
-| Test.java:396:24:396:25 | in : String | Test.java:396:10:396:26 | host(...) : UriBuilder | provenance | MaD:42+MaD:41 |
+| Test.java:396:24:396:25 | in : String | Test.java:396:10:396:26 | host(...) : UriBuilder | provenance | MaD:41+MaD:42 |
 | Test.java:402:20:402:39 | (...)... : UriBuilder | Test.java:403:10:403:11 | in : UriBuilder | provenance |  |
 | Test.java:402:32:402:39 | source(...) : Object | Test.java:402:20:402:39 | (...)... : UriBuilder | provenance |  |
-| Test.java:403:10:403:11 | in : UriBuilder | Test.java:403:10:403:22 | path(...) : UriBuilder | provenance | MaD:43 |
+| Test.java:403:10:403:11 | in : UriBuilder | Test.java:403:10:403:22 | path(...) : UriBuilder | provenance | MaD:44 |
 | Test.java:403:10:403:22 | path(...) : UriBuilder | Test.java:404:9:404:11 | out | provenance |  |
 | Test.java:409:20:409:39 | (...)... : UriBuilder | Test.java:410:10:410:11 | in : UriBuilder | provenance |  |
 | Test.java:409:32:409:39 | source(...) : Object | Test.java:409:20:409:39 | (...)... : UriBuilder | provenance |  |
-| Test.java:410:10:410:11 | in : UriBuilder | Test.java:410:10:410:22 | path(...) : UriBuilder | provenance | MaD:43 |
+| Test.java:410:10:410:11 | in : UriBuilder | Test.java:410:10:410:22 | path(...) : UriBuilder | provenance | MaD:44 |
 | Test.java:410:10:410:22 | path(...) : UriBuilder | Test.java:411:9:411:11 | out | provenance |  |
 | Test.java:416:16:416:31 | (...)... : String | Test.java:417:13:417:14 | in : String | provenance |  |
 | Test.java:416:24:416:31 | source(...) : Object | Test.java:416:16:416:31 | (...)... : String | provenance |  |
 | Test.java:417:4:417:6 | out [post update] : UriBuilder | Test.java:418:9:418:11 | out | provenance |  |
-| Test.java:417:13:417:14 | in : String | Test.java:417:4:417:6 | out [post update] : UriBuilder | provenance | MaD:44 |
+| Test.java:417:13:417:14 | in : String | Test.java:417:4:417:6 | out [post update] : UriBuilder | provenance | MaD:43 |
 | Test.java:423:16:423:31 | (...)... : String | Test.java:424:13:424:14 | in : String | provenance |  |
 | Test.java:423:24:423:31 | source(...) : Object | Test.java:423:16:423:31 | (...)... : String | provenance |  |
 | Test.java:424:4:424:6 | out [post update] : UriBuilder | Test.java:425:9:425:11 | out | provenance |  |
-| Test.java:424:13:424:14 | in : String | Test.java:424:4:424:6 | out [post update] : UriBuilder | provenance | MaD:44 |
+| Test.java:424:13:424:14 | in : String | Test.java:424:4:424:6 | out [post update] : UriBuilder | provenance | MaD:43 |
 | Test.java:430:16:430:31 | (...)... : String | Test.java:432:24:432:25 | in : String | provenance |  |
 | Test.java:430:24:430:31 | source(...) : Object | Test.java:430:16:430:31 | (...)... : String | provenance |  |
 | Test.java:432:10:432:26 | path(...) : UriBuilder | Test.java:433:9:433:11 | out | provenance |  |
-| Test.java:432:24:432:25 | in : String | Test.java:432:10:432:26 | path(...) : UriBuilder | provenance | MaD:44+MaD:43 |
+| Test.java:432:24:432:25 | in : String | Test.java:432:10:432:26 | path(...) : UriBuilder | provenance | MaD:43+MaD:44 |
 | Test.java:438:16:438:31 | (...)... : String | Test.java:440:24:440:25 | in : String | provenance |  |
 | Test.java:438:24:438:31 | source(...) : Object | Test.java:438:16:438:31 | (...)... : String | provenance |  |
 | Test.java:440:10:440:26 | path(...) : UriBuilder | Test.java:441:9:441:11 | out | provenance |  |
-| Test.java:440:24:440:25 | in : String | Test.java:440:10:440:26 | path(...) : UriBuilder | provenance | MaD:44+MaD:43 |
+| Test.java:440:24:440:25 | in : String | Test.java:440:10:440:26 | path(...) : UriBuilder | provenance | MaD:43+MaD:44 |
 | Test.java:446:20:446:39 | (...)... : UriBuilder | Test.java:447:10:447:11 | in : UriBuilder | provenance |  |
 | Test.java:446:32:446:39 | source(...) : Object | Test.java:446:20:446:39 | (...)... : UriBuilder | provenance |  |
-| Test.java:447:10:447:11 | in : UriBuilder | Test.java:447:10:447:39 | pathSegment(...) : UriBuilder | provenance | MaD:45 |
+| Test.java:447:10:447:11 | in : UriBuilder | Test.java:447:10:447:39 | pathSegment(...) : UriBuilder | provenance | MaD:46 |
 | Test.java:447:10:447:39 | pathSegment(...) : UriBuilder | Test.java:448:9:448:11 | out | provenance |  |
 | Test.java:453:20:453:39 | (...)... : UriBuilder | Test.java:454:10:454:11 | in : UriBuilder | provenance |  |
 | Test.java:453:32:453:39 | source(...) : Object | Test.java:453:20:453:39 | (...)... : UriBuilder | provenance |  |
-| Test.java:454:10:454:11 | in : UriBuilder | Test.java:454:10:454:39 | pathSegment(...) : UriBuilder | provenance | MaD:45 |
+| Test.java:454:10:454:11 | in : UriBuilder | Test.java:454:10:454:39 | pathSegment(...) : UriBuilder | provenance | MaD:46 |
 | Test.java:454:10:454:39 | pathSegment(...) : UriBuilder | Test.java:455:9:455:11 | out | provenance |  |
 | Test.java:460:18:460:47 | {...} : String[] [[]] : String | Test.java:461:20:461:31 | (...)... : String[] [[]] : String | provenance |  |
 | Test.java:460:31:460:46 | (...)... : String | Test.java:460:18:460:47 | {...} : String[] [[]] : String | provenance |  |
 | Test.java:460:39:460:46 | source(...) : Object | Test.java:460:31:460:46 | (...)... : String | provenance |  |
 | Test.java:461:4:461:6 | out [post update] : UriBuilder | Test.java:462:9:462:11 | out | provenance |  |
-| Test.java:461:20:461:31 | (...)... : String[] [[]] : String | Test.java:461:4:461:6 | out [post update] : UriBuilder | provenance | MaD:46 |
+| Test.java:461:20:461:31 | (...)... : String[] [[]] : String | Test.java:461:4:461:6 | out [post update] : UriBuilder | provenance | MaD:45 |
 | Test.java:467:18:467:47 | {...} : String[] [[]] : String | Test.java:468:20:468:31 | (...)... : String[] [[]] : String | provenance |  |
 | Test.java:467:31:467:46 | (...)... : String | Test.java:467:18:467:47 | {...} : String[] [[]] : String | provenance |  |
 | Test.java:467:39:467:46 | source(...) : Object | Test.java:467:31:467:46 | (...)... : String | provenance |  |
 | Test.java:468:4:468:6 | out [post update] : UriBuilder | Test.java:469:9:469:11 | out | provenance |  |
-| Test.java:468:20:468:31 | (...)... : String[] [[]] : String | Test.java:468:4:468:6 | out [post update] : UriBuilder | provenance | MaD:46 |
+| Test.java:468:20:468:31 | (...)... : String[] [[]] : String | Test.java:468:4:468:6 | out [post update] : UriBuilder | provenance | MaD:45 |
 | Test.java:474:18:474:47 | {...} : String[] [[]] : String | Test.java:476:31:476:42 | (...)... : String[] [[]] : String | provenance |  |
 | Test.java:474:31:474:46 | (...)... : String | Test.java:474:18:474:47 | {...} : String[] [[]] : String | provenance |  |
 | Test.java:474:39:474:46 | source(...) : Object | Test.java:474:31:474:46 | (...)... : String | provenance |  |
 | Test.java:476:10:476:43 | pathSegment(...) : UriBuilder | Test.java:477:9:477:11 | out | provenance |  |
-| Test.java:476:31:476:42 | (...)... : String[] [[]] : String | Test.java:476:10:476:43 | pathSegment(...) : UriBuilder | provenance | MaD:46+MaD:45 |
+| Test.java:476:31:476:42 | (...)... : String[] [[]] : String | Test.java:476:10:476:43 | pathSegment(...) : UriBuilder | provenance | MaD:45+MaD:46 |
 | Test.java:482:18:482:47 | {...} : String[] [[]] : String | Test.java:484:31:484:42 | (...)... : String[] [[]] : String | provenance |  |
 | Test.java:482:31:482:46 | (...)... : String | Test.java:482:18:482:47 | {...} : String[] [[]] : String | provenance |  |
 | Test.java:482:39:482:46 | source(...) : Object | Test.java:482:31:482:46 | (...)... : String | provenance |  |
 | Test.java:484:10:484:43 | pathSegment(...) : UriBuilder | Test.java:485:9:485:11 | out | provenance |  |
-| Test.java:484:31:484:42 | (...)... : String[] [[]] : String | Test.java:484:10:484:43 | pathSegment(...) : UriBuilder | provenance | MaD:46+MaD:45 |
+| Test.java:484:31:484:42 | (...)... : String[] [[]] : String | Test.java:484:10:484:43 | pathSegment(...) : UriBuilder | provenance | MaD:45+MaD:46 |
 | Test.java:490:16:490:31 | (...)... : String | Test.java:491:13:491:14 | in : String | provenance |  |
 | Test.java:490:24:490:31 | source(...) : Object | Test.java:490:16:490:31 | (...)... : String | provenance |  |
 | Test.java:491:4:491:6 | out [post update] : UriBuilder | Test.java:492:9:492:11 | out | provenance |  |
-| Test.java:491:13:491:14 | in : String | Test.java:491:4:491:6 | out [post update] : UriBuilder | provenance | MaD:48 |
+| Test.java:491:13:491:14 | in : String | Test.java:491:4:491:6 | out [post update] : UriBuilder | provenance | MaD:47 |
 | Test.java:497:16:497:31 | (...)... : String | Test.java:498:13:498:14 | in : String | provenance |  |
 | Test.java:497:24:497:31 | source(...) : Object | Test.java:497:16:497:31 | (...)... : String | provenance |  |
 | Test.java:498:4:498:6 | out [post update] : UriBuilder | Test.java:499:9:499:11 | out | provenance |  |
-| Test.java:498:13:498:14 | in : String | Test.java:498:4:498:6 | out [post update] : UriBuilder | provenance | MaD:48 |
+| Test.java:498:13:498:14 | in : String | Test.java:498:4:498:6 | out [post update] : UriBuilder | provenance | MaD:47 |
 | Test.java:504:16:504:31 | (...)... : String | Test.java:506:24:506:25 | in : String | provenance |  |
 | Test.java:504:24:504:31 | source(...) : Object | Test.java:504:16:504:31 | (...)... : String | provenance |  |
 | Test.java:506:10:506:26 | port(...) : UriBuilder | Test.java:507:9:507:11 | out | provenance |  |
-| Test.java:506:24:506:25 | in : String | Test.java:506:10:506:26 | port(...) : UriBuilder | provenance | MaD:48+MaD:47 |
+| Test.java:506:24:506:25 | in : String | Test.java:506:10:506:26 | port(...) : UriBuilder | provenance | MaD:47+MaD:48 |
 | Test.java:512:16:512:31 | (...)... : String | Test.java:514:24:514:25 | in : String | provenance |  |
 | Test.java:512:24:512:31 | source(...) : Object | Test.java:512:16:512:31 | (...)... : String | provenance |  |
 | Test.java:514:10:514:26 | port(...) : UriBuilder | Test.java:515:9:515:11 | out | provenance |  |
-| Test.java:514:24:514:25 | in : String | Test.java:514:10:514:26 | port(...) : UriBuilder | provenance | MaD:48+MaD:47 |
+| Test.java:514:24:514:25 | in : String | Test.java:514:10:514:26 | port(...) : UriBuilder | provenance | MaD:47+MaD:48 |
 | Test.java:520:20:520:39 | (...)... : UriBuilder | Test.java:521:10:521:11 | in : UriBuilder | provenance |  |
 | Test.java:520:32:520:39 | source(...) : Object | Test.java:520:20:520:39 | (...)... : UriBuilder | provenance |  |
-| Test.java:521:10:521:11 | in : UriBuilder | Test.java:521:10:521:19 | port(...) : UriBuilder | provenance | MaD:47 |
+| Test.java:521:10:521:11 | in : UriBuilder | Test.java:521:10:521:19 | port(...) : UriBuilder | provenance | MaD:48 |
 | Test.java:521:10:521:19 | port(...) : UriBuilder | Test.java:522:9:522:11 | out | provenance |  |
 | Test.java:527:20:527:39 | (...)... : UriBuilder | Test.java:528:10:528:11 | in : UriBuilder | provenance |  |
 | Test.java:527:32:527:39 | source(...) : Object | Test.java:527:20:527:39 | (...)... : UriBuilder | provenance |  |
-| Test.java:528:10:528:11 | in : UriBuilder | Test.java:528:10:528:30 | port(...) : UriBuilder | provenance | MaD:47 |
+| Test.java:528:10:528:11 | in : UriBuilder | Test.java:528:10:528:30 | port(...) : UriBuilder | provenance | MaD:48 |
 | Test.java:528:10:528:30 | port(...) : UriBuilder | Test.java:529:9:529:11 | out | provenance |  |
 | Test.java:534:20:534:39 | (...)... : UriBuilder | Test.java:535:10:535:11 | in : UriBuilder | provenance |  |
 | Test.java:534:32:534:39 | source(...) : Object | Test.java:534:20:534:39 | (...)... : UriBuilder | provenance |  |
-| Test.java:535:10:535:11 | in : UriBuilder | Test.java:535:10:535:19 | port(...) : UriBuilder | provenance | MaD:47 |
+| Test.java:535:10:535:11 | in : UriBuilder | Test.java:535:10:535:19 | port(...) : UriBuilder | provenance | MaD:48 |
 | Test.java:535:10:535:19 | port(...) : UriBuilder | Test.java:536:9:536:11 | out | provenance |  |
 | Test.java:541:20:541:39 | (...)... : UriBuilder | Test.java:542:10:542:11 | in : UriBuilder | provenance |  |
 | Test.java:541:32:541:39 | source(...) : Object | Test.java:541:20:541:39 | (...)... : UriBuilder | provenance |  |
-| Test.java:542:10:542:11 | in : UriBuilder | Test.java:542:10:542:30 | port(...) : UriBuilder | provenance | MaD:47 |
+| Test.java:542:10:542:11 | in : UriBuilder | Test.java:542:10:542:30 | port(...) : UriBuilder | provenance | MaD:48 |
 | Test.java:542:10:542:30 | port(...) : UriBuilder | Test.java:543:9:543:11 | out | provenance |  |
 | Test.java:548:20:548:39 | (...)... : UriBuilder | Test.java:549:10:549:11 | in : UriBuilder | provenance |  |
 | Test.java:548:32:548:39 | source(...) : Object | Test.java:548:20:548:39 | (...)... : UriBuilder | provenance |  |
-| Test.java:549:10:549:11 | in : UriBuilder | Test.java:549:10:549:23 | query(...) : UriBuilder | provenance | MaD:49 |
+| Test.java:549:10:549:11 | in : UriBuilder | Test.java:549:10:549:23 | query(...) : UriBuilder | provenance | MaD:50 |
 | Test.java:549:10:549:23 | query(...) : UriBuilder | Test.java:550:9:550:11 | out | provenance |  |
 | Test.java:555:20:555:39 | (...)... : UriBuilder | Test.java:556:10:556:11 | in : UriBuilder | provenance |  |
 | Test.java:555:32:555:39 | source(...) : Object | Test.java:555:20:555:39 | (...)... : UriBuilder | provenance |  |
-| Test.java:556:10:556:11 | in : UriBuilder | Test.java:556:10:556:23 | query(...) : UriBuilder | provenance | MaD:49 |
+| Test.java:556:10:556:11 | in : UriBuilder | Test.java:556:10:556:23 | query(...) : UriBuilder | provenance | MaD:50 |
 | Test.java:556:10:556:23 | query(...) : UriBuilder | Test.java:557:9:557:11 | out | provenance |  |
 | Test.java:562:16:562:31 | (...)... : String | Test.java:563:14:563:15 | in : String | provenance |  |
 | Test.java:562:24:562:31 | source(...) : Object | Test.java:562:16:562:31 | (...)... : String | provenance |  |
 | Test.java:563:4:563:6 | out [post update] : UriBuilder | Test.java:564:9:564:11 | out | provenance |  |
-| Test.java:563:14:563:15 | in : String | Test.java:563:4:563:6 | out [post update] : UriBuilder | provenance | MaD:50 |
+| Test.java:563:14:563:15 | in : String | Test.java:563:4:563:6 | out [post update] : UriBuilder | provenance | MaD:49 |
 | Test.java:569:16:569:31 | (...)... : String | Test.java:570:14:570:15 | in : String | provenance |  |
 | Test.java:569:24:569:31 | source(...) : Object | Test.java:569:16:569:31 | (...)... : String | provenance |  |
 | Test.java:570:4:570:6 | out [post update] : UriBuilder | Test.java:571:9:571:11 | out | provenance |  |
-| Test.java:570:14:570:15 | in : String | Test.java:570:4:570:6 | out [post update] : UriBuilder | provenance | MaD:50 |
+| Test.java:570:14:570:15 | in : String | Test.java:570:4:570:6 | out [post update] : UriBuilder | provenance | MaD:49 |
 | Test.java:576:16:576:31 | (...)... : String | Test.java:578:25:578:26 | in : String | provenance |  |
 | Test.java:576:24:576:31 | source(...) : Object | Test.java:576:16:576:31 | (...)... : String | provenance |  |
 | Test.java:578:10:578:27 | query(...) : UriBuilder | Test.java:579:9:579:11 | out | provenance |  |
-| Test.java:578:25:578:26 | in : String | Test.java:578:10:578:27 | query(...) : UriBuilder | provenance | MaD:50+MaD:49 |
+| Test.java:578:25:578:26 | in : String | Test.java:578:10:578:27 | query(...) : UriBuilder | provenance | MaD:49+MaD:50 |
 | Test.java:584:16:584:31 | (...)... : String | Test.java:586:25:586:26 | in : String | provenance |  |
 | Test.java:584:24:584:31 | source(...) : Object | Test.java:584:16:584:31 | (...)... : String | provenance |  |
 | Test.java:586:10:586:27 | query(...) : UriBuilder | Test.java:587:9:587:11 | out | provenance |  |
-| Test.java:586:25:586:26 | in : String | Test.java:586:10:586:27 | query(...) : UriBuilder | provenance | MaD:50+MaD:49 |
+| Test.java:586:25:586:26 | in : String | Test.java:586:10:586:27 | query(...) : UriBuilder | provenance | MaD:49+MaD:50 |
 | Test.java:592:20:592:36 | of(...) : List [<element>] : Object | Test.java:593:33:593:34 | in : List [<element>] : Object | provenance |  |
 | Test.java:592:28:592:35 | source(...) : Object | Test.java:592:20:592:36 | of(...) : List [<element>] : Object | provenance | MaD:4 |
 | Test.java:593:4:593:6 | out [post update] : UriBuilder | Test.java:594:9:594:11 | out | provenance |  |
-| Test.java:593:33:593:34 | in : List [<element>] : Object | Test.java:593:4:593:6 | out [post update] : UriBuilder | provenance | MaD:53 |
+| Test.java:593:33:593:34 | in : List [<element>] : Object | Test.java:593:4:593:6 | out [post update] : UriBuilder | provenance | MaD:51 |
 | Test.java:599:20:599:36 | of(...) : List [<element>] : Object | Test.java:600:33:600:34 | in : List [<element>] : Object | provenance |  |
 | Test.java:599:28:599:35 | source(...) : Object | Test.java:599:20:599:36 | of(...) : List [<element>] : Object | provenance | MaD:4 |
 | Test.java:600:4:600:6 | out [post update] : UriBuilder | Test.java:601:9:601:11 | out | provenance |  |
-| Test.java:600:33:600:34 | in : List [<element>] : Object | Test.java:600:4:600:6 | out [post update] : UriBuilder | provenance | MaD:53 |
+| Test.java:600:33:600:34 | in : List [<element>] : Object | Test.java:600:4:600:6 | out [post update] : UriBuilder | provenance | MaD:51 |
 | Test.java:606:20:606:36 | of(...) : List [<element>] : Object | Test.java:608:44:608:45 | in : List [<element>] : Object | provenance |  |
 | Test.java:606:28:606:35 | source(...) : Object | Test.java:606:20:606:36 | of(...) : List [<element>] : Object | provenance | MaD:4 |
 | Test.java:608:10:608:46 | queryParam(...) : UriBuilder | Test.java:609:9:609:11 | out | provenance |  |
-| Test.java:608:44:608:45 | in : List [<element>] : Object | Test.java:608:10:608:46 | queryParam(...) : UriBuilder | provenance | MaD:53+MaD:51 |
+| Test.java:608:44:608:45 | in : List [<element>] : Object | Test.java:608:10:608:46 | queryParam(...) : UriBuilder | provenance | MaD:51+MaD:54 |
 | Test.java:614:20:614:36 | of(...) : List [<element>] : Object | Test.java:616:44:616:45 | in : List [<element>] : Object | provenance |  |
 | Test.java:614:28:614:35 | source(...) : Object | Test.java:614:20:614:36 | of(...) : List [<element>] : Object | provenance | MaD:4 |
 | Test.java:616:10:616:46 | queryParam(...) : UriBuilder | Test.java:617:9:617:11 | out | provenance |  |
-| Test.java:616:44:616:45 | in : List [<element>] : Object | Test.java:616:10:616:46 | queryParam(...) : UriBuilder | provenance | MaD:53+MaD:51 |
+| Test.java:616:44:616:45 | in : List [<element>] : Object | Test.java:616:10:616:46 | queryParam(...) : UriBuilder | provenance | MaD:51+MaD:54 |
 | Test.java:622:18:622:39 | {...} : Object[] [[]] : Object | Test.java:623:33:623:34 | in : Object[] [[]] : Object | provenance |  |
 | Test.java:622:31:622:38 | source(...) : Object | Test.java:622:18:622:39 | {...} : Object[] [[]] : Object | provenance |  |
 | Test.java:623:4:623:6 | out [post update] : UriBuilder | Test.java:624:9:624:11 | out | provenance |  |
-| Test.java:623:33:623:34 | in : Object[] [[]] : Object | Test.java:623:4:623:6 | out [post update] : UriBuilder | provenance | MaD:54 |
+| Test.java:623:33:623:34 | in : Object[] [[]] : Object | Test.java:623:4:623:6 | out [post update] : UriBuilder | provenance | MaD:52 |
 | Test.java:629:18:629:39 | {...} : Object[] [[]] : Object | Test.java:630:33:630:34 | in : Object[] [[]] : Object | provenance |  |
 | Test.java:629:31:629:38 | source(...) : Object | Test.java:629:18:629:39 | {...} : Object[] [[]] : Object | provenance |  |
 | Test.java:630:4:630:6 | out [post update] : UriBuilder | Test.java:631:9:631:11 | out | provenance |  |
-| Test.java:630:33:630:34 | in : Object[] [[]] : Object | Test.java:630:4:630:6 | out [post update] : UriBuilder | provenance | MaD:54 |
+| Test.java:630:33:630:34 | in : Object[] [[]] : Object | Test.java:630:4:630:6 | out [post update] : UriBuilder | provenance | MaD:52 |
 | Test.java:636:18:636:39 | {...} : Object[] [[]] : Object | Test.java:638:44:638:45 | in : Object[] [[]] : Object | provenance |  |
 | Test.java:636:31:636:38 | source(...) : Object | Test.java:636:18:636:39 | {...} : Object[] [[]] : Object | provenance |  |
 | Test.java:638:10:638:46 | queryParam(...) : UriBuilder | Test.java:639:9:639:11 | out | provenance |  |
-| Test.java:638:44:638:45 | in : Object[] [[]] : Object | Test.java:638:10:638:46 | queryParam(...) : UriBuilder | provenance | MaD:54+MaD:51 |
+| Test.java:638:44:638:45 | in : Object[] [[]] : Object | Test.java:638:10:638:46 | queryParam(...) : UriBuilder | provenance | MaD:52+MaD:54 |
 | Test.java:644:18:644:39 | {...} : Object[] [[]] : Object | Test.java:646:44:646:45 | in : Object[] [[]] : Object | provenance |  |
 | Test.java:644:31:644:38 | source(...) : Object | Test.java:644:18:644:39 | {...} : Object[] [[]] : Object | provenance |  |
 | Test.java:646:10:646:46 | queryParam(...) : UriBuilder | Test.java:647:9:647:11 | out | provenance |  |
-| Test.java:646:44:646:45 | in : Object[] [[]] : Object | Test.java:646:10:646:46 | queryParam(...) : UriBuilder | provenance | MaD:54+MaD:51 |
+| Test.java:646:44:646:45 | in : Object[] [[]] : Object | Test.java:646:10:646:46 | queryParam(...) : UriBuilder | provenance | MaD:52+MaD:54 |
 | Test.java:652:20:652:39 | (...)... : UriBuilder | Test.java:653:10:653:11 | in : UriBuilder | provenance |  |
 | Test.java:652:32:652:39 | source(...) : Object | Test.java:652:20:652:39 | (...)... : UriBuilder | provenance |  |
-| Test.java:653:10:653:11 | in : UriBuilder | Test.java:653:10:653:52 | queryParam(...) : UriBuilder | provenance | MaD:51 |
+| Test.java:653:10:653:11 | in : UriBuilder | Test.java:653:10:653:52 | queryParam(...) : UriBuilder | provenance | MaD:54 |
 | Test.java:653:10:653:52 | queryParam(...) : UriBuilder | Test.java:654:9:654:11 | out | provenance |  |
 | Test.java:659:20:659:39 | (...)... : UriBuilder | Test.java:660:10:660:11 | in : UriBuilder | provenance |  |
 | Test.java:659:32:659:39 | source(...) : Object | Test.java:659:20:659:39 | (...)... : UriBuilder | provenance |  |
-| Test.java:660:10:660:11 | in : UriBuilder | Test.java:660:10:660:54 | queryParam(...) : UriBuilder | provenance | MaD:51 |
+| Test.java:660:10:660:11 | in : UriBuilder | Test.java:660:10:660:54 | queryParam(...) : UriBuilder | provenance | MaD:54 |
 | Test.java:660:10:660:54 | queryParam(...) : UriBuilder | Test.java:661:9:661:11 | out | provenance |  |
 | Test.java:666:20:666:39 | (...)... : UriBuilder | Test.java:667:10:667:11 | in : UriBuilder | provenance |  |
 | Test.java:666:32:666:39 | source(...) : Object | Test.java:666:20:666:39 | (...)... : UriBuilder | provenance |  |
-| Test.java:667:10:667:11 | in : UriBuilder | Test.java:667:10:667:52 | queryParam(...) : UriBuilder | provenance | MaD:51 |
+| Test.java:667:10:667:11 | in : UriBuilder | Test.java:667:10:667:52 | queryParam(...) : UriBuilder | provenance | MaD:54 |
 | Test.java:667:10:667:52 | queryParam(...) : UriBuilder | Test.java:668:9:668:11 | out | provenance |  |
 | Test.java:673:20:673:39 | (...)... : UriBuilder | Test.java:674:10:674:11 | in : UriBuilder | provenance |  |
 | Test.java:673:32:673:39 | source(...) : Object | Test.java:673:20:673:39 | (...)... : UriBuilder | provenance |  |
-| Test.java:674:10:674:11 | in : UriBuilder | Test.java:674:10:674:54 | queryParam(...) : UriBuilder | provenance | MaD:51 |
+| Test.java:674:10:674:11 | in : UriBuilder | Test.java:674:10:674:54 | queryParam(...) : UriBuilder | provenance | MaD:54 |
 | Test.java:674:10:674:54 | queryParam(...) : UriBuilder | Test.java:675:9:675:11 | out | provenance |  |
 | Test.java:680:16:680:31 | (...)... : String | Test.java:681:19:681:20 | in : String | provenance |  |
 | Test.java:680:24:680:31 | source(...) : Object | Test.java:680:16:680:31 | (...)... : String | provenance |  |
 | Test.java:681:4:681:6 | out [post update] : UriBuilder | Test.java:682:9:682:11 | out | provenance |  |
-| Test.java:681:19:681:20 | in : String | Test.java:681:4:681:6 | out [post update] : UriBuilder | provenance | MaD:52 |
+| Test.java:681:19:681:20 | in : String | Test.java:681:4:681:6 | out [post update] : UriBuilder | provenance | MaD:53 |
 | Test.java:687:16:687:31 | (...)... : String | Test.java:688:19:688:20 | in : String | provenance |  |
 | Test.java:687:24:687:31 | source(...) : Object | Test.java:687:16:687:31 | (...)... : String | provenance |  |
 | Test.java:688:4:688:6 | out [post update] : UriBuilder | Test.java:689:9:689:11 | out | provenance |  |
-| Test.java:688:19:688:20 | in : String | Test.java:688:4:688:6 | out [post update] : UriBuilder | provenance | MaD:52 |
+| Test.java:688:19:688:20 | in : String | Test.java:688:4:688:6 | out [post update] : UriBuilder | provenance | MaD:53 |
 | Test.java:694:16:694:31 | (...)... : String | Test.java:695:19:695:20 | in : String | provenance |  |
 | Test.java:694:24:694:31 | source(...) : Object | Test.java:694:16:694:31 | (...)... : String | provenance |  |
 | Test.java:695:4:695:6 | out [post update] : UriBuilder | Test.java:696:9:696:11 | out | provenance |  |
-| Test.java:695:19:695:20 | in : String | Test.java:695:4:695:6 | out [post update] : UriBuilder | provenance | MaD:52 |
+| Test.java:695:19:695:20 | in : String | Test.java:695:4:695:6 | out [post update] : UriBuilder | provenance | MaD:53 |
 | Test.java:701:16:701:31 | (...)... : String | Test.java:702:19:702:20 | in : String | provenance |  |
 | Test.java:701:24:701:31 | source(...) : Object | Test.java:701:16:701:31 | (...)... : String | provenance |  |
 | Test.java:702:4:702:6 | out [post update] : UriBuilder | Test.java:703:9:703:11 | out | provenance |  |
-| Test.java:702:19:702:20 | in : String | Test.java:702:4:702:6 | out [post update] : UriBuilder | provenance | MaD:52 |
+| Test.java:702:19:702:20 | in : String | Test.java:702:4:702:6 | out [post update] : UriBuilder | provenance | MaD:53 |
 | Test.java:708:16:708:31 | (...)... : String | Test.java:710:30:710:31 | in : String | provenance |  |
 | Test.java:708:24:708:31 | source(...) : Object | Test.java:708:16:708:31 | (...)... : String | provenance |  |
 | Test.java:710:10:710:48 | queryParam(...) : UriBuilder | Test.java:711:9:711:11 | out | provenance |  |
-| Test.java:710:30:710:31 | in : String | Test.java:710:10:710:48 | queryParam(...) : UriBuilder | provenance | MaD:52+MaD:51 |
+| Test.java:710:30:710:31 | in : String | Test.java:710:10:710:48 | queryParam(...) : UriBuilder | provenance | MaD:53+MaD:54 |
 | Test.java:716:16:716:31 | (...)... : String | Test.java:718:30:718:31 | in : String | provenance |  |
 | Test.java:716:24:716:31 | source(...) : Object | Test.java:716:16:716:31 | (...)... : String | provenance |  |
 | Test.java:718:10:718:50 | queryParam(...) : UriBuilder | Test.java:719:9:719:11 | out | provenance |  |
-| Test.java:718:30:718:31 | in : String | Test.java:718:10:718:50 | queryParam(...) : UriBuilder | provenance | MaD:52+MaD:51 |
+| Test.java:718:30:718:31 | in : String | Test.java:718:10:718:50 | queryParam(...) : UriBuilder | provenance | MaD:53+MaD:54 |
 | Test.java:724:16:724:31 | (...)... : String | Test.java:726:30:726:31 | in : String | provenance |  |
 | Test.java:724:24:724:31 | source(...) : Object | Test.java:724:16:724:31 | (...)... : String | provenance |  |
 | Test.java:726:10:726:48 | queryParam(...) : UriBuilder | Test.java:727:9:727:11 | out | provenance |  |
-| Test.java:726:30:726:31 | in : String | Test.java:726:10:726:48 | queryParam(...) : UriBuilder | provenance | MaD:52+MaD:51 |
+| Test.java:726:30:726:31 | in : String | Test.java:726:10:726:48 | queryParam(...) : UriBuilder | provenance | MaD:53+MaD:54 |
 | Test.java:732:16:732:31 | (...)... : String | Test.java:734:30:734:31 | in : String | provenance |  |
 | Test.java:732:24:732:31 | source(...) : Object | Test.java:732:16:732:31 | (...)... : String | provenance |  |
 | Test.java:734:10:734:50 | queryParam(...) : UriBuilder | Test.java:735:9:735:11 | out | provenance |  |
-| Test.java:734:30:734:31 | in : String | Test.java:734:10:734:50 | queryParam(...) : UriBuilder | provenance | MaD:52+MaD:51 |
+| Test.java:734:30:734:31 | in : String | Test.java:734:10:734:50 | queryParam(...) : UriBuilder | provenance | MaD:53+MaD:54 |
 | Test.java:740:20:740:39 | (...)... : UriBuilder | Test.java:741:10:741:11 | in : UriBuilder | provenance |  |
 | Test.java:740:32:740:39 | source(...) : Object | Test.java:740:20:740:39 | (...)... : UriBuilder | provenance |  |
-| Test.java:741:10:741:11 | in : UriBuilder | Test.java:741:10:741:43 | queryParamIfPresent(...) : UriBuilder | provenance | MaD:55 |
+| Test.java:741:10:741:11 | in : UriBuilder | Test.java:741:10:741:43 | queryParamIfPresent(...) : UriBuilder | provenance | MaD:57 |
 | Test.java:741:10:741:43 | queryParamIfPresent(...) : UriBuilder | Test.java:742:9:742:11 | out | provenance |  |
 | Test.java:747:20:747:39 | (...)... : UriBuilder | Test.java:748:10:748:11 | in : UriBuilder | provenance |  |
 | Test.java:747:32:747:39 | source(...) : Object | Test.java:747:20:747:39 | (...)... : UriBuilder | provenance |  |
-| Test.java:748:10:748:11 | in : UriBuilder | Test.java:748:10:748:43 | queryParamIfPresent(...) : UriBuilder | provenance | MaD:55 |
+| Test.java:748:10:748:11 | in : UriBuilder | Test.java:748:10:748:43 | queryParamIfPresent(...) : UriBuilder | provenance | MaD:57 |
 | Test.java:748:10:748:43 | queryParamIfPresent(...) : UriBuilder | Test.java:749:9:749:11 | out | provenance |  |
 | Test.java:754:16:754:31 | (...)... : String | Test.java:755:28:755:29 | in : String | provenance |  |
 | Test.java:754:24:754:31 | source(...) : Object | Test.java:754:16:754:31 | (...)... : String | provenance |  |
 | Test.java:755:4:755:6 | out [post update] : UriBuilder | Test.java:756:9:756:11 | out | provenance |  |
-| Test.java:755:28:755:29 | in : String | Test.java:755:4:755:6 | out [post update] : UriBuilder | provenance | MaD:56 |
+| Test.java:755:28:755:29 | in : String | Test.java:755:4:755:6 | out [post update] : UriBuilder | provenance | MaD:55 |
 | Test.java:761:16:761:31 | (...)... : String | Test.java:762:28:762:29 | in : String | provenance |  |
 | Test.java:761:24:761:31 | source(...) : Object | Test.java:761:16:761:31 | (...)... : String | provenance |  |
 | Test.java:762:4:762:6 | out [post update] : UriBuilder | Test.java:763:9:763:11 | out | provenance |  |
-| Test.java:762:28:762:29 | in : String | Test.java:762:4:762:6 | out [post update] : UriBuilder | provenance | MaD:56 |
+| Test.java:762:28:762:29 | in : String | Test.java:762:4:762:6 | out [post update] : UriBuilder | provenance | MaD:55 |
 | Test.java:768:16:768:31 | (...)... : String | Test.java:770:39:770:40 | in : String | provenance |  |
 | Test.java:768:24:768:31 | source(...) : Object | Test.java:768:16:768:31 | (...)... : String | provenance |  |
 | Test.java:770:10:770:47 | queryParamIfPresent(...) : UriBuilder | Test.java:771:9:771:11 | out | provenance |  |
-| Test.java:770:39:770:40 | in : String | Test.java:770:10:770:47 | queryParamIfPresent(...) : UriBuilder | provenance | MaD:56+MaD:55 |
+| Test.java:770:39:770:40 | in : String | Test.java:770:10:770:47 | queryParamIfPresent(...) : UriBuilder | provenance | MaD:55+MaD:57 |
 | Test.java:776:16:776:31 | (...)... : String | Test.java:778:39:778:40 | in : String | provenance |  |
 | Test.java:776:24:776:31 | source(...) : Object | Test.java:776:16:776:31 | (...)... : String | provenance |  |
 | Test.java:778:10:778:47 | queryParamIfPresent(...) : UriBuilder | Test.java:779:9:779:11 | out | provenance |  |
-| Test.java:778:39:778:40 | in : String | Test.java:778:10:778:47 | queryParamIfPresent(...) : UriBuilder | provenance | MaD:56+MaD:55 |
+| Test.java:778:39:778:40 | in : String | Test.java:778:10:778:47 | queryParamIfPresent(...) : UriBuilder | provenance | MaD:55+MaD:57 |
 | Test.java:784:18:784:38 | of(...) : Optional [<element>] : Object | Test.java:785:34:785:35 | in : Optional [<element>] : Object | provenance |  |
 | Test.java:784:30:784:37 | source(...) : Object | Test.java:784:18:784:38 | of(...) : Optional [<element>] : Object | provenance | MaD:10 |
 | Test.java:785:4:785:6 | out [post update] : UriBuilder | Test.java:786:9:786:11 | out | provenance |  |
-| Test.java:785:34:785:35 | in : Optional [<element>] : Object | Test.java:785:4:785:6 | out [post update] : UriBuilder | provenance | MaD:57 |
+| Test.java:785:34:785:35 | in : Optional [<element>] : Object | Test.java:785:4:785:6 | out [post update] : UriBuilder | provenance | MaD:56 |
 | Test.java:791:18:791:38 | of(...) : Optional [<element>] : Object | Test.java:792:34:792:35 | in : Optional [<element>] : Object | provenance |  |
 | Test.java:791:30:791:37 | source(...) : Object | Test.java:791:18:791:38 | of(...) : Optional [<element>] : Object | provenance | MaD:10 |
 | Test.java:792:4:792:6 | out [post update] : UriBuilder | Test.java:793:9:793:11 | out | provenance |  |
-| Test.java:792:34:792:35 | in : Optional [<element>] : Object | Test.java:792:4:792:6 | out [post update] : UriBuilder | provenance | MaD:57 |
+| Test.java:792:34:792:35 | in : Optional [<element>] : Object | Test.java:792:4:792:6 | out [post update] : UriBuilder | provenance | MaD:56 |
 | Test.java:798:18:798:38 | of(...) : Optional [<element>] : Object | Test.java:800:45:800:46 | in : Optional [<element>] : Object | provenance |  |
 | Test.java:798:30:798:37 | source(...) : Object | Test.java:798:18:798:38 | of(...) : Optional [<element>] : Object | provenance | MaD:10 |
 | Test.java:800:10:800:47 | queryParamIfPresent(...) : UriBuilder | Test.java:801:9:801:11 | out | provenance |  |
-| Test.java:800:45:800:46 | in : Optional [<element>] : Object | Test.java:800:10:800:47 | queryParamIfPresent(...) : UriBuilder | provenance | MaD:57+MaD:55 |
+| Test.java:800:45:800:46 | in : Optional [<element>] : Object | Test.java:800:10:800:47 | queryParamIfPresent(...) : UriBuilder | provenance | MaD:56+MaD:57 |
 | Test.java:806:18:806:38 | of(...) : Optional [<element>] : Object | Test.java:808:45:808:46 | in : Optional [<element>] : Object | provenance |  |
 | Test.java:806:30:806:37 | source(...) : Object | Test.java:806:18:806:38 | of(...) : Optional [<element>] : Object | provenance | MaD:10 |
 | Test.java:808:10:808:47 | queryParamIfPresent(...) : UriBuilder | Test.java:809:9:809:11 | out | provenance |  |
-| Test.java:808:45:808:46 | in : Optional [<element>] : Object | Test.java:808:10:808:47 | queryParamIfPresent(...) : UriBuilder | provenance | MaD:57+MaD:55 |
+| Test.java:808:45:808:46 | in : Optional [<element>] : Object | Test.java:808:10:808:47 | queryParamIfPresent(...) : UriBuilder | provenance | MaD:56+MaD:57 |
 | Test.java:814:20:814:39 | (...)... : UriBuilder | Test.java:815:10:815:11 | in : UriBuilder | provenance |  |
 | Test.java:814:32:814:39 | source(...) : Object | Test.java:814:20:814:39 | (...)... : UriBuilder | provenance |  |
-| Test.java:815:10:815:11 | in : UriBuilder | Test.java:815:10:815:29 | queryParams(...) : UriBuilder | provenance | MaD:58 |
+| Test.java:815:10:815:11 | in : UriBuilder | Test.java:815:10:815:29 | queryParams(...) : UriBuilder | provenance | MaD:60 |
 | Test.java:815:10:815:29 | queryParams(...) : UriBuilder | Test.java:816:9:816:11 | out | provenance |  |
 | Test.java:821:20:821:39 | (...)... : UriBuilder | Test.java:822:10:822:11 | in : UriBuilder | provenance |  |
 | Test.java:821:32:821:39 | source(...) : Object | Test.java:821:20:821:39 | (...)... : UriBuilder | provenance |  |
-| Test.java:822:10:822:11 | in : UriBuilder | Test.java:822:10:822:29 | queryParams(...) : UriBuilder | provenance | MaD:58 |
+| Test.java:822:10:822:11 | in : UriBuilder | Test.java:822:10:822:29 | queryParams(...) : UriBuilder | provenance | MaD:60 |
 | Test.java:822:10:822:29 | queryParams(...) : UriBuilder | Test.java:823:9:823:11 | out | provenance |  |
 | Test.java:828:23:828:55 | newMultiValueMapWithKey(...) : LinkedMultiValueMap [<map.key>] : Object | Test.java:829:20:829:21 | in : LinkedMultiValueMap [<map.key>] : Object | provenance |  |
 | Test.java:828:47:828:54 | source(...) : Object | Test.java:54:40:54:53 | element : Object | provenance |  |
-| Test.java:828:47:828:54 | source(...) : Object | Test.java:828:23:828:55 | newMultiValueMapWithKey(...) : LinkedMultiValueMap [<map.key>] : Object | provenance | MaD:7 |
+| Test.java:828:47:828:54 | source(...) : Object | Test.java:828:23:828:55 | newMultiValueMapWithKey(...) : LinkedMultiValueMap [<map.key>] : Object | provenance | MaD:5 |
 | Test.java:829:4:829:6 | out [post update] : UriBuilder | Test.java:830:9:830:11 | out | provenance |  |
-| Test.java:829:20:829:21 | in : LinkedMultiValueMap [<map.key>] : Object | Test.java:829:4:829:6 | out [post update] : UriBuilder | provenance | MaD:59 |
+| Test.java:829:20:829:21 | in : LinkedMultiValueMap [<map.key>] : Object | Test.java:829:4:829:6 | out [post update] : UriBuilder | provenance | MaD:58 |
 | Test.java:835:23:835:55 | newMultiValueMapWithKey(...) : LinkedMultiValueMap [<map.key>] : Object | Test.java:836:20:836:21 | in : LinkedMultiValueMap [<map.key>] : Object | provenance |  |
 | Test.java:835:47:835:54 | source(...) : Object | Test.java:54:40:54:53 | element : Object | provenance |  |
-| Test.java:835:47:835:54 | source(...) : Object | Test.java:835:23:835:55 | newMultiValueMapWithKey(...) : LinkedMultiValueMap [<map.key>] : Object | provenance | MaD:7 |
+| Test.java:835:47:835:54 | source(...) : Object | Test.java:835:23:835:55 | newMultiValueMapWithKey(...) : LinkedMultiValueMap [<map.key>] : Object | provenance | MaD:5 |
 | Test.java:836:4:836:6 | out [post update] : UriBuilder | Test.java:837:9:837:11 | out | provenance |  |
-| Test.java:836:20:836:21 | in : LinkedMultiValueMap [<map.key>] : Object | Test.java:836:4:836:6 | out [post update] : UriBuilder | provenance | MaD:59 |
+| Test.java:836:20:836:21 | in : LinkedMultiValueMap [<map.key>] : Object | Test.java:836:4:836:6 | out [post update] : UriBuilder | provenance | MaD:58 |
 | Test.java:842:23:842:55 | newMultiValueMapWithKey(...) : LinkedMultiValueMap [<map.key>] : Object | Test.java:844:31:844:32 | in : LinkedMultiValueMap [<map.key>] : Object | provenance |  |
 | Test.java:842:47:842:54 | source(...) : Object | Test.java:54:40:54:53 | element : Object | provenance |  |
-| Test.java:842:47:842:54 | source(...) : Object | Test.java:842:23:842:55 | newMultiValueMapWithKey(...) : LinkedMultiValueMap [<map.key>] : Object | provenance | MaD:7 |
+| Test.java:842:47:842:54 | source(...) : Object | Test.java:842:23:842:55 | newMultiValueMapWithKey(...) : LinkedMultiValueMap [<map.key>] : Object | provenance | MaD:5 |
 | Test.java:844:10:844:33 | queryParams(...) : UriBuilder | Test.java:845:9:845:11 | out | provenance |  |
-| Test.java:844:31:844:32 | in : LinkedMultiValueMap [<map.key>] : Object | Test.java:844:10:844:33 | queryParams(...) : UriBuilder | provenance | MaD:59+MaD:58 |
+| Test.java:844:31:844:32 | in : LinkedMultiValueMap [<map.key>] : Object | Test.java:844:10:844:33 | queryParams(...) : UriBuilder | provenance | MaD:58+MaD:60 |
 | Test.java:850:23:850:55 | newMultiValueMapWithKey(...) : LinkedMultiValueMap [<map.key>] : Object | Test.java:852:31:852:32 | in : LinkedMultiValueMap [<map.key>] : Object | provenance |  |
 | Test.java:850:47:850:54 | source(...) : Object | Test.java:54:40:54:53 | element : Object | provenance |  |
-| Test.java:850:47:850:54 | source(...) : Object | Test.java:850:23:850:55 | newMultiValueMapWithKey(...) : LinkedMultiValueMap [<map.key>] : Object | provenance | MaD:7 |
+| Test.java:850:47:850:54 | source(...) : Object | Test.java:850:23:850:55 | newMultiValueMapWithKey(...) : LinkedMultiValueMap [<map.key>] : Object | provenance | MaD:5 |
 | Test.java:852:10:852:33 | queryParams(...) : UriBuilder | Test.java:853:9:853:11 | out | provenance |  |
-| Test.java:852:31:852:32 | in : LinkedMultiValueMap [<map.key>] : Object | Test.java:852:10:852:33 | queryParams(...) : UriBuilder | provenance | MaD:59+MaD:58 |
+| Test.java:852:31:852:32 | in : LinkedMultiValueMap [<map.key>] : Object | Test.java:852:10:852:33 | queryParams(...) : UriBuilder | provenance | MaD:58+MaD:60 |
 | Test.java:858:23:858:57 | newMultiValueMapWithValue(...) : LinkedMultiValueMap [<map.value>] : Object | Test.java:859:20:859:21 | in : LinkedMultiValueMap [<map.value>] : Object | provenance |  |
 | Test.java:858:49:858:56 | source(...) : Object | Test.java:55:42:55:55 | element : Object | provenance |  |
 | Test.java:858:49:858:56 | source(...) : Object | Test.java:858:23:858:57 | newMultiValueMapWithValue(...) : LinkedMultiValueMap [<map.value>] : Object | provenance | MaD:9 |
 | Test.java:859:4:859:6 | out [post update] : UriBuilder | Test.java:860:9:860:11 | out | provenance |  |
-| Test.java:859:20:859:21 | in : LinkedMultiValueMap [<map.value>] : Object | Test.java:859:4:859:6 | out [post update] : UriBuilder | provenance | MaD:60 |
+| Test.java:859:20:859:21 | in : LinkedMultiValueMap [<map.value>] : Object | Test.java:859:4:859:6 | out [post update] : UriBuilder | provenance | MaD:59 |
 | Test.java:865:23:865:57 | newMultiValueMapWithValue(...) : LinkedMultiValueMap [<map.value>] : Object | Test.java:866:20:866:21 | in : LinkedMultiValueMap [<map.value>] : Object | provenance |  |
 | Test.java:865:49:865:56 | source(...) : Object | Test.java:55:42:55:55 | element : Object | provenance |  |
 | Test.java:865:49:865:56 | source(...) : Object | Test.java:865:23:865:57 | newMultiValueMapWithValue(...) : LinkedMultiValueMap [<map.value>] : Object | provenance | MaD:9 |
 | Test.java:866:4:866:6 | out [post update] : UriBuilder | Test.java:867:9:867:11 | out | provenance |  |
-| Test.java:866:20:866:21 | in : LinkedMultiValueMap [<map.value>] : Object | Test.java:866:4:866:6 | out [post update] : UriBuilder | provenance | MaD:60 |
+| Test.java:866:20:866:21 | in : LinkedMultiValueMap [<map.value>] : Object | Test.java:866:4:866:6 | out [post update] : UriBuilder | provenance | MaD:59 |
 | Test.java:872:23:872:57 | newMultiValueMapWithValue(...) : LinkedMultiValueMap [<map.value>] : Object | Test.java:874:31:874:32 | in : LinkedMultiValueMap [<map.value>] : Object | provenance |  |
 | Test.java:872:49:872:56 | source(...) : Object | Test.java:55:42:55:55 | element : Object | provenance |  |
 | Test.java:872:49:872:56 | source(...) : Object | Test.java:872:23:872:57 | newMultiValueMapWithValue(...) : LinkedMultiValueMap [<map.value>] : Object | provenance | MaD:9 |
 | Test.java:874:10:874:33 | queryParams(...) : UriBuilder | Test.java:875:9:875:11 | out | provenance |  |
-| Test.java:874:31:874:32 | in : LinkedMultiValueMap [<map.value>] : Object | Test.java:874:10:874:33 | queryParams(...) : UriBuilder | provenance | MaD:60+MaD:58 |
+| Test.java:874:31:874:32 | in : LinkedMultiValueMap [<map.value>] : Object | Test.java:874:10:874:33 | queryParams(...) : UriBuilder | provenance | MaD:59+MaD:60 |
 | Test.java:880:23:880:57 | newMultiValueMapWithValue(...) : LinkedMultiValueMap [<map.value>] : Object | Test.java:882:31:882:32 | in : LinkedMultiValueMap [<map.value>] : Object | provenance |  |
 | Test.java:880:49:880:56 | source(...) : Object | Test.java:55:42:55:55 | element : Object | provenance |  |
 | Test.java:880:49:880:56 | source(...) : Object | Test.java:880:23:880:57 | newMultiValueMapWithValue(...) : LinkedMultiValueMap [<map.value>] : Object | provenance | MaD:9 |
 | Test.java:882:10:882:33 | queryParams(...) : UriBuilder | Test.java:883:9:883:11 | out | provenance |  |
-| Test.java:882:31:882:32 | in : LinkedMultiValueMap [<map.value>] : Object | Test.java:882:10:882:33 | queryParams(...) : UriBuilder | provenance | MaD:60+MaD:58 |
+| Test.java:882:31:882:32 | in : LinkedMultiValueMap [<map.value>] : Object | Test.java:882:10:882:33 | queryParams(...) : UriBuilder | provenance | MaD:59+MaD:60 |
 | Test.java:888:20:888:39 | (...)... : UriBuilder | Test.java:889:10:889:11 | in : UriBuilder | provenance |  |
 | Test.java:888:32:888:39 | source(...) : Object | Test.java:888:20:888:39 | (...)... : UriBuilder | provenance |  |
-| Test.java:889:10:889:11 | in : UriBuilder | Test.java:889:10:889:29 | replacePath(...) : UriBuilder | provenance | MaD:61 |
+| Test.java:889:10:889:11 | in : UriBuilder | Test.java:889:10:889:29 | replacePath(...) : UriBuilder | provenance | MaD:62 |
 | Test.java:889:10:889:29 | replacePath(...) : UriBuilder | Test.java:890:9:890:11 | out | provenance |  |
 | Test.java:895:20:895:39 | (...)... : UriBuilder | Test.java:896:10:896:11 | in : UriBuilder | provenance |  |
 | Test.java:895:32:895:39 | source(...) : Object | Test.java:895:20:895:39 | (...)... : UriBuilder | provenance |  |
-| Test.java:896:10:896:11 | in : UriBuilder | Test.java:896:10:896:29 | replacePath(...) : UriBuilder | provenance | MaD:61 |
+| Test.java:896:10:896:11 | in : UriBuilder | Test.java:896:10:896:29 | replacePath(...) : UriBuilder | provenance | MaD:62 |
 | Test.java:896:10:896:29 | replacePath(...) : UriBuilder | Test.java:897:9:897:11 | out | provenance |  |
 | Test.java:902:16:902:31 | (...)... : String | Test.java:903:20:903:21 | in : String | provenance |  |
 | Test.java:902:24:902:31 | source(...) : Object | Test.java:902:16:902:31 | (...)... : String | provenance |  |
 | Test.java:903:4:903:6 | out [post update] : UriBuilder | Test.java:904:9:904:11 | out | provenance |  |
-| Test.java:903:20:903:21 | in : String | Test.java:903:4:903:6 | out [post update] : UriBuilder | provenance | MaD:62 |
+| Test.java:903:20:903:21 | in : String | Test.java:903:4:903:6 | out [post update] : UriBuilder | provenance | MaD:61 |
 | Test.java:909:16:909:31 | (...)... : String | Test.java:910:20:910:21 | in : String | provenance |  |
 | Test.java:909:24:909:31 | source(...) : Object | Test.java:909:16:909:31 | (...)... : String | provenance |  |
 | Test.java:910:4:910:6 | out [post update] : UriBuilder | Test.java:911:9:911:11 | out | provenance |  |
-| Test.java:910:20:910:21 | in : String | Test.java:910:4:910:6 | out [post update] : UriBuilder | provenance | MaD:62 |
+| Test.java:910:20:910:21 | in : String | Test.java:910:4:910:6 | out [post update] : UriBuilder | provenance | MaD:61 |
 | Test.java:916:16:916:31 | (...)... : String | Test.java:918:31:918:32 | in : String | provenance |  |
 | Test.java:916:24:916:31 | source(...) : Object | Test.java:916:16:916:31 | (...)... : String | provenance |  |
 | Test.java:918:10:918:33 | replacePath(...) : UriBuilder | Test.java:919:9:919:11 | out | provenance |  |
-| Test.java:918:31:918:32 | in : String | Test.java:918:10:918:33 | replacePath(...) : UriBuilder | provenance | MaD:62+MaD:61 |
+| Test.java:918:31:918:32 | in : String | Test.java:918:10:918:33 | replacePath(...) : UriBuilder | provenance | MaD:61+MaD:62 |
 | Test.java:924:16:924:31 | (...)... : String | Test.java:926:31:926:32 | in : String | provenance |  |
 | Test.java:924:24:924:31 | source(...) : Object | Test.java:924:16:924:31 | (...)... : String | provenance |  |
 | Test.java:926:10:926:33 | replacePath(...) : UriBuilder | Test.java:927:9:927:11 | out | provenance |  |
-| Test.java:926:31:926:32 | in : String | Test.java:926:10:926:33 | replacePath(...) : UriBuilder | provenance | MaD:62+MaD:61 |
+| Test.java:926:31:926:32 | in : String | Test.java:926:10:926:33 | replacePath(...) : UriBuilder | provenance | MaD:61+MaD:62 |
 | Test.java:932:20:932:39 | (...)... : UriBuilder | Test.java:933:10:933:11 | in : UriBuilder | provenance |  |
 | Test.java:932:32:932:39 | source(...) : Object | Test.java:932:20:932:39 | (...)... : UriBuilder | provenance |  |
-| Test.java:933:10:933:11 | in : UriBuilder | Test.java:933:10:933:30 | replaceQuery(...) : UriBuilder | provenance | MaD:63 |
+| Test.java:933:10:933:11 | in : UriBuilder | Test.java:933:10:933:30 | replaceQuery(...) : UriBuilder | provenance | MaD:64 |
 | Test.java:933:10:933:30 | replaceQuery(...) : UriBuilder | Test.java:934:9:934:11 | out | provenance |  |
 | Test.java:939:20:939:39 | (...)... : UriBuilder | Test.java:940:10:940:11 | in : UriBuilder | provenance |  |
 | Test.java:939:32:939:39 | source(...) : Object | Test.java:939:20:939:39 | (...)... : UriBuilder | provenance |  |
-| Test.java:940:10:940:11 | in : UriBuilder | Test.java:940:10:940:30 | replaceQuery(...) : UriBuilder | provenance | MaD:63 |
+| Test.java:940:10:940:11 | in : UriBuilder | Test.java:940:10:940:30 | replaceQuery(...) : UriBuilder | provenance | MaD:64 |
 | Test.java:940:10:940:30 | replaceQuery(...) : UriBuilder | Test.java:941:9:941:11 | out | provenance |  |
 | Test.java:946:16:946:31 | (...)... : String | Test.java:947:21:947:22 | in : String | provenance |  |
 | Test.java:946:24:946:31 | source(...) : Object | Test.java:946:16:946:31 | (...)... : String | provenance |  |
 | Test.java:947:4:947:6 | out [post update] : UriBuilder | Test.java:948:9:948:11 | out | provenance |  |
-| Test.java:947:21:947:22 | in : String | Test.java:947:4:947:6 | out [post update] : UriBuilder | provenance | MaD:64 |
+| Test.java:947:21:947:22 | in : String | Test.java:947:4:947:6 | out [post update] : UriBuilder | provenance | MaD:63 |
 | Test.java:953:16:953:31 | (...)... : String | Test.java:954:21:954:22 | in : String | provenance |  |
 | Test.java:953:24:953:31 | source(...) : Object | Test.java:953:16:953:31 | (...)... : String | provenance |  |
 | Test.java:954:4:954:6 | out [post update] : UriBuilder | Test.java:955:9:955:11 | out | provenance |  |
-| Test.java:954:21:954:22 | in : String | Test.java:954:4:954:6 | out [post update] : UriBuilder | provenance | MaD:64 |
+| Test.java:954:21:954:22 | in : String | Test.java:954:4:954:6 | out [post update] : UriBuilder | provenance | MaD:63 |
 | Test.java:960:16:960:31 | (...)... : String | Test.java:962:32:962:33 | in : String | provenance |  |
 | Test.java:960:24:960:31 | source(...) : Object | Test.java:960:16:960:31 | (...)... : String | provenance |  |
 | Test.java:962:10:962:34 | replaceQuery(...) : UriBuilder | Test.java:963:9:963:11 | out | provenance |  |
-| Test.java:962:32:962:33 | in : String | Test.java:962:10:962:34 | replaceQuery(...) : UriBuilder | provenance | MaD:64+MaD:63 |
+| Test.java:962:32:962:33 | in : String | Test.java:962:10:962:34 | replaceQuery(...) : UriBuilder | provenance | MaD:63+MaD:64 |
 | Test.java:968:16:968:31 | (...)... : String | Test.java:970:32:970:33 | in : String | provenance |  |
 | Test.java:968:24:968:31 | source(...) : Object | Test.java:968:16:968:31 | (...)... : String | provenance |  |
 | Test.java:970:10:970:34 | replaceQuery(...) : UriBuilder | Test.java:971:9:971:11 | out | provenance |  |
-| Test.java:970:32:970:33 | in : String | Test.java:970:10:970:34 | replaceQuery(...) : UriBuilder | provenance | MaD:64+MaD:63 |
+| Test.java:970:32:970:33 | in : String | Test.java:970:10:970:34 | replaceQuery(...) : UriBuilder | provenance | MaD:63+MaD:64 |
 | Test.java:976:20:976:36 | of(...) : List [<element>] : Object | Test.java:977:40:977:41 | in : List [<element>] : Object | provenance |  |
 | Test.java:976:28:976:35 | source(...) : Object | Test.java:976:20:976:36 | of(...) : List [<element>] : Object | provenance | MaD:4 |
 | Test.java:977:4:977:6 | out [post update] : UriBuilder | Test.java:978:9:978:11 | out | provenance |  |
-| Test.java:977:40:977:41 | in : List [<element>] : Object | Test.java:977:4:977:6 | out [post update] : UriBuilder | provenance | MaD:67 |
+| Test.java:977:40:977:41 | in : List [<element>] : Object | Test.java:977:4:977:6 | out [post update] : UriBuilder | provenance | MaD:65 |
 | Test.java:983:20:983:36 | of(...) : List [<element>] : Object | Test.java:984:40:984:41 | in : List [<element>] : Object | provenance |  |
 | Test.java:983:28:983:35 | source(...) : Object | Test.java:983:20:983:36 | of(...) : List [<element>] : Object | provenance | MaD:4 |
 | Test.java:984:4:984:6 | out [post update] : UriBuilder | Test.java:985:9:985:11 | out | provenance |  |
-| Test.java:984:40:984:41 | in : List [<element>] : Object | Test.java:984:4:984:6 | out [post update] : UriBuilder | provenance | MaD:67 |
+| Test.java:984:40:984:41 | in : List [<element>] : Object | Test.java:984:4:984:6 | out [post update] : UriBuilder | provenance | MaD:65 |
 | Test.java:990:20:990:36 | of(...) : List [<element>] : Object | Test.java:992:51:992:52 | in : List [<element>] : Object | provenance |  |
 | Test.java:990:28:990:35 | source(...) : Object | Test.java:990:20:990:36 | of(...) : List [<element>] : Object | provenance | MaD:4 |
 | Test.java:992:10:992:53 | replaceQueryParam(...) : UriBuilder | Test.java:993:9:993:11 | out | provenance |  |
-| Test.java:992:51:992:52 | in : List [<element>] : Object | Test.java:992:10:992:53 | replaceQueryParam(...) : UriBuilder | provenance | MaD:67+MaD:65 |
+| Test.java:992:51:992:52 | in : List [<element>] : Object | Test.java:992:10:992:53 | replaceQueryParam(...) : UriBuilder | provenance | MaD:65+MaD:68 |
 | Test.java:998:20:998:36 | of(...) : List [<element>] : Object | Test.java:1000:51:1000:52 | in : List [<element>] : Object | provenance |  |
 | Test.java:998:28:998:35 | source(...) : Object | Test.java:998:20:998:36 | of(...) : List [<element>] : Object | provenance | MaD:4 |
 | Test.java:1000:10:1000:53 | replaceQueryParam(...) : UriBuilder | Test.java:1001:9:1001:11 | out | provenance |  |
-| Test.java:1000:51:1000:52 | in : List [<element>] : Object | Test.java:1000:10:1000:53 | replaceQueryParam(...) : UriBuilder | provenance | MaD:67+MaD:65 |
+| Test.java:1000:51:1000:52 | in : List [<element>] : Object | Test.java:1000:10:1000:53 | replaceQueryParam(...) : UriBuilder | provenance | MaD:65+MaD:68 |
 | Test.java:1006:18:1006:39 | {...} : Object[] [[]] : Object | Test.java:1007:40:1007:41 | in : Object[] [[]] : Object | provenance |  |
 | Test.java:1006:31:1006:38 | source(...) : Object | Test.java:1006:18:1006:39 | {...} : Object[] [[]] : Object | provenance |  |
 | Test.java:1007:4:1007:6 | out [post update] : UriBuilder | Test.java:1008:9:1008:11 | out | provenance |  |
-| Test.java:1007:40:1007:41 | in : Object[] [[]] : Object | Test.java:1007:4:1007:6 | out [post update] : UriBuilder | provenance | MaD:68 |
+| Test.java:1007:40:1007:41 | in : Object[] [[]] : Object | Test.java:1007:4:1007:6 | out [post update] : UriBuilder | provenance | MaD:66 |
 | Test.java:1013:18:1013:39 | {...} : Object[] [[]] : Object | Test.java:1014:40:1014:41 | in : Object[] [[]] : Object | provenance |  |
 | Test.java:1013:31:1013:38 | source(...) : Object | Test.java:1013:18:1013:39 | {...} : Object[] [[]] : Object | provenance |  |
 | Test.java:1014:4:1014:6 | out [post update] : UriBuilder | Test.java:1015:9:1015:11 | out | provenance |  |
-| Test.java:1014:40:1014:41 | in : Object[] [[]] : Object | Test.java:1014:4:1014:6 | out [post update] : UriBuilder | provenance | MaD:68 |
+| Test.java:1014:40:1014:41 | in : Object[] [[]] : Object | Test.java:1014:4:1014:6 | out [post update] : UriBuilder | provenance | MaD:66 |
 | Test.java:1020:18:1020:39 | {...} : Object[] [[]] : Object | Test.java:1022:51:1022:52 | in : Object[] [[]] : Object | provenance |  |
 | Test.java:1020:31:1020:38 | source(...) : Object | Test.java:1020:18:1020:39 | {...} : Object[] [[]] : Object | provenance |  |
 | Test.java:1022:10:1022:53 | replaceQueryParam(...) : UriBuilder | Test.java:1023:9:1023:11 | out | provenance |  |
-| Test.java:1022:51:1022:52 | in : Object[] [[]] : Object | Test.java:1022:10:1022:53 | replaceQueryParam(...) : UriBuilder | provenance | MaD:68+MaD:65 |
+| Test.java:1022:51:1022:52 | in : Object[] [[]] : Object | Test.java:1022:10:1022:53 | replaceQueryParam(...) : UriBuilder | provenance | MaD:66+MaD:68 |
 | Test.java:1028:18:1028:39 | {...} : Object[] [[]] : Object | Test.java:1030:51:1030:52 | in : Object[] [[]] : Object | provenance |  |
 | Test.java:1028:31:1028:38 | source(...) : Object | Test.java:1028:18:1028:39 | {...} : Object[] [[]] : Object | provenance |  |
 | Test.java:1030:10:1030:53 | replaceQueryParam(...) : UriBuilder | Test.java:1031:9:1031:11 | out | provenance |  |
-| Test.java:1030:51:1030:52 | in : Object[] [[]] : Object | Test.java:1030:10:1030:53 | replaceQueryParam(...) : UriBuilder | provenance | MaD:68+MaD:65 |
+| Test.java:1030:51:1030:52 | in : Object[] [[]] : Object | Test.java:1030:10:1030:53 | replaceQueryParam(...) : UriBuilder | provenance | MaD:66+MaD:68 |
 | Test.java:1036:20:1036:39 | (...)... : UriBuilder | Test.java:1037:10:1037:11 | in : UriBuilder | provenance |  |
 | Test.java:1036:32:1036:39 | source(...) : Object | Test.java:1036:20:1036:39 | (...)... : UriBuilder | provenance |  |
-| Test.java:1037:10:1037:11 | in : UriBuilder | Test.java:1037:10:1037:59 | replaceQueryParam(...) : UriBuilder | provenance | MaD:65 |
+| Test.java:1037:10:1037:11 | in : UriBuilder | Test.java:1037:10:1037:59 | replaceQueryParam(...) : UriBuilder | provenance | MaD:68 |
 | Test.java:1037:10:1037:59 | replaceQueryParam(...) : UriBuilder | Test.java:1038:9:1038:11 | out | provenance |  |
 | Test.java:1043:20:1043:39 | (...)... : UriBuilder | Test.java:1044:10:1044:11 | in : UriBuilder | provenance |  |
 | Test.java:1043:32:1043:39 | source(...) : Object | Test.java:1043:20:1043:39 | (...)... : UriBuilder | provenance |  |
-| Test.java:1044:10:1044:11 | in : UriBuilder | Test.java:1044:10:1044:61 | replaceQueryParam(...) : UriBuilder | provenance | MaD:65 |
+| Test.java:1044:10:1044:11 | in : UriBuilder | Test.java:1044:10:1044:61 | replaceQueryParam(...) : UriBuilder | provenance | MaD:68 |
 | Test.java:1044:10:1044:61 | replaceQueryParam(...) : UriBuilder | Test.java:1045:9:1045:11 | out | provenance |  |
 | Test.java:1050:20:1050:39 | (...)... : UriBuilder | Test.java:1051:10:1051:11 | in : UriBuilder | provenance |  |
 | Test.java:1050:32:1050:39 | source(...) : Object | Test.java:1050:20:1050:39 | (...)... : UriBuilder | provenance |  |
-| Test.java:1051:10:1051:11 | in : UriBuilder | Test.java:1051:10:1051:59 | replaceQueryParam(...) : UriBuilder | provenance | MaD:65 |
+| Test.java:1051:10:1051:11 | in : UriBuilder | Test.java:1051:10:1051:59 | replaceQueryParam(...) : UriBuilder | provenance | MaD:68 |
 | Test.java:1051:10:1051:59 | replaceQueryParam(...) : UriBuilder | Test.java:1052:9:1052:11 | out | provenance |  |
 | Test.java:1057:20:1057:39 | (...)... : UriBuilder | Test.java:1058:10:1058:11 | in : UriBuilder | provenance |  |
 | Test.java:1057:32:1057:39 | source(...) : Object | Test.java:1057:20:1057:39 | (...)... : UriBuilder | provenance |  |
-| Test.java:1058:10:1058:11 | in : UriBuilder | Test.java:1058:10:1058:61 | replaceQueryParam(...) : UriBuilder | provenance | MaD:65 |
+| Test.java:1058:10:1058:11 | in : UriBuilder | Test.java:1058:10:1058:61 | replaceQueryParam(...) : UriBuilder | provenance | MaD:68 |
 | Test.java:1058:10:1058:61 | replaceQueryParam(...) : UriBuilder | Test.java:1059:9:1059:11 | out | provenance |  |
 | Test.java:1064:16:1064:31 | (...)... : String | Test.java:1065:26:1065:27 | in : String | provenance |  |
 | Test.java:1064:24:1064:31 | source(...) : Object | Test.java:1064:16:1064:31 | (...)... : String | provenance |  |
 | Test.java:1065:4:1065:6 | out [post update] : UriBuilder | Test.java:1066:9:1066:11 | out | provenance |  |
-| Test.java:1065:26:1065:27 | in : String | Test.java:1065:4:1065:6 | out [post update] : UriBuilder | provenance | MaD:66 |
+| Test.java:1065:26:1065:27 | in : String | Test.java:1065:4:1065:6 | out [post update] : UriBuilder | provenance | MaD:67 |
 | Test.java:1071:16:1071:31 | (...)... : String | Test.java:1072:26:1072:27 | in : String | provenance |  |
 | Test.java:1071:24:1071:31 | source(...) : Object | Test.java:1071:16:1071:31 | (...)... : String | provenance |  |
 | Test.java:1072:4:1072:6 | out [post update] : UriBuilder | Test.java:1073:9:1073:11 | out | provenance |  |
-| Test.java:1072:26:1072:27 | in : String | Test.java:1072:4:1072:6 | out [post update] : UriBuilder | provenance | MaD:66 |
+| Test.java:1072:26:1072:27 | in : String | Test.java:1072:4:1072:6 | out [post update] : UriBuilder | provenance | MaD:67 |
 | Test.java:1078:16:1078:31 | (...)... : String | Test.java:1079:26:1079:27 | in : String | provenance |  |
 | Test.java:1078:24:1078:31 | source(...) : Object | Test.java:1078:16:1078:31 | (...)... : String | provenance |  |
 | Test.java:1079:4:1079:6 | out [post update] : UriBuilder | Test.java:1080:9:1080:11 | out | provenance |  |
-| Test.java:1079:26:1079:27 | in : String | Test.java:1079:4:1079:6 | out [post update] : UriBuilder | provenance | MaD:66 |
+| Test.java:1079:26:1079:27 | in : String | Test.java:1079:4:1079:6 | out [post update] : UriBuilder | provenance | MaD:67 |
 | Test.java:1085:16:1085:31 | (...)... : String | Test.java:1086:26:1086:27 | in : String | provenance |  |
 | Test.java:1085:24:1085:31 | source(...) : Object | Test.java:1085:16:1085:31 | (...)... : String | provenance |  |
 | Test.java:1086:4:1086:6 | out [post update] : UriBuilder | Test.java:1087:9:1087:11 | out | provenance |  |
-| Test.java:1086:26:1086:27 | in : String | Test.java:1086:4:1086:6 | out [post update] : UriBuilder | provenance | MaD:66 |
+| Test.java:1086:26:1086:27 | in : String | Test.java:1086:4:1086:6 | out [post update] : UriBuilder | provenance | MaD:67 |
 | Test.java:1092:16:1092:31 | (...)... : String | Test.java:1094:37:1094:38 | in : String | provenance |  |
 | Test.java:1092:24:1092:31 | source(...) : Object | Test.java:1092:16:1092:31 | (...)... : String | provenance |  |
 | Test.java:1094:10:1094:55 | replaceQueryParam(...) : UriBuilder | Test.java:1095:9:1095:11 | out | provenance |  |
-| Test.java:1094:37:1094:38 | in : String | Test.java:1094:10:1094:55 | replaceQueryParam(...) : UriBuilder | provenance | MaD:66+MaD:65 |
+| Test.java:1094:37:1094:38 | in : String | Test.java:1094:10:1094:55 | replaceQueryParam(...) : UriBuilder | provenance | MaD:67+MaD:68 |
 | Test.java:1100:16:1100:31 | (...)... : String | Test.java:1102:37:1102:38 | in : String | provenance |  |
 | Test.java:1100:24:1100:31 | source(...) : Object | Test.java:1100:16:1100:31 | (...)... : String | provenance |  |
 | Test.java:1102:10:1102:57 | replaceQueryParam(...) : UriBuilder | Test.java:1103:9:1103:11 | out | provenance |  |
-| Test.java:1102:37:1102:38 | in : String | Test.java:1102:10:1102:57 | replaceQueryParam(...) : UriBuilder | provenance | MaD:66+MaD:65 |
+| Test.java:1102:37:1102:38 | in : String | Test.java:1102:10:1102:57 | replaceQueryParam(...) : UriBuilder | provenance | MaD:67+MaD:68 |
 | Test.java:1108:16:1108:31 | (...)... : String | Test.java:1110:37:1110:38 | in : String | provenance |  |
 | Test.java:1108:24:1108:31 | source(...) : Object | Test.java:1108:16:1108:31 | (...)... : String | provenance |  |
 | Test.java:1110:10:1110:55 | replaceQueryParam(...) : UriBuilder | Test.java:1111:9:1111:11 | out | provenance |  |
-| Test.java:1110:37:1110:38 | in : String | Test.java:1110:10:1110:55 | replaceQueryParam(...) : UriBuilder | provenance | MaD:66+MaD:65 |
+| Test.java:1110:37:1110:38 | in : String | Test.java:1110:10:1110:55 | replaceQueryParam(...) : UriBuilder | provenance | MaD:67+MaD:68 |
 | Test.java:1116:16:1116:31 | (...)... : String | Test.java:1118:37:1118:38 | in : String | provenance |  |
 | Test.java:1116:24:1116:31 | source(...) : Object | Test.java:1116:16:1116:31 | (...)... : String | provenance |  |
 | Test.java:1118:10:1118:57 | replaceQueryParam(...) : UriBuilder | Test.java:1119:9:1119:11 | out | provenance |  |
-| Test.java:1118:37:1118:38 | in : String | Test.java:1118:10:1118:57 | replaceQueryParam(...) : UriBuilder | provenance | MaD:66+MaD:65 |
+| Test.java:1118:37:1118:38 | in : String | Test.java:1118:10:1118:57 | replaceQueryParam(...) : UriBuilder | provenance | MaD:67+MaD:68 |
 | Test.java:1124:20:1124:39 | (...)... : UriBuilder | Test.java:1125:10:1125:11 | in : UriBuilder | provenance |  |
 | Test.java:1124:32:1124:39 | source(...) : Object | Test.java:1124:20:1124:39 | (...)... : UriBuilder | provenance |  |
-| Test.java:1125:10:1125:11 | in : UriBuilder | Test.java:1125:10:1125:36 | replaceQueryParams(...) : UriBuilder | provenance | MaD:69 |
+| Test.java:1125:10:1125:11 | in : UriBuilder | Test.java:1125:10:1125:36 | replaceQueryParams(...) : UriBuilder | provenance | MaD:71 |
 | Test.java:1125:10:1125:36 | replaceQueryParams(...) : UriBuilder | Test.java:1126:9:1126:11 | out | provenance |  |
 | Test.java:1131:20:1131:39 | (...)... : UriBuilder | Test.java:1132:10:1132:11 | in : UriBuilder | provenance |  |
 | Test.java:1131:32:1131:39 | source(...) : Object | Test.java:1131:20:1131:39 | (...)... : UriBuilder | provenance |  |
-| Test.java:1132:10:1132:11 | in : UriBuilder | Test.java:1132:10:1132:36 | replaceQueryParams(...) : UriBuilder | provenance | MaD:69 |
+| Test.java:1132:10:1132:11 | in : UriBuilder | Test.java:1132:10:1132:36 | replaceQueryParams(...) : UriBuilder | provenance | MaD:71 |
 | Test.java:1132:10:1132:36 | replaceQueryParams(...) : UriBuilder | Test.java:1133:9:1133:11 | out | provenance |  |
 | Test.java:1138:23:1138:55 | newMultiValueMapWithKey(...) : LinkedMultiValueMap [<map.key>] : Object | Test.java:1140:38:1140:39 | in : LinkedMultiValueMap [<map.key>] : Object | provenance |  |
 | Test.java:1138:47:1138:54 | source(...) : Object | Test.java:54:40:54:53 | element : Object | provenance |  |
-| Test.java:1138:47:1138:54 | source(...) : Object | Test.java:1138:23:1138:55 | newMultiValueMapWithKey(...) : LinkedMultiValueMap [<map.key>] : Object | provenance | MaD:7 |
+| Test.java:1138:47:1138:54 | source(...) : Object | Test.java:1138:23:1138:55 | newMultiValueMapWithKey(...) : LinkedMultiValueMap [<map.key>] : Object | provenance | MaD:5 |
 | Test.java:1140:10:1140:40 | replaceQueryParams(...) : UriBuilder | Test.java:1141:9:1141:11 | out | provenance |  |
-| Test.java:1140:38:1140:39 | in : LinkedMultiValueMap [<map.key>] : Object | Test.java:1140:10:1140:40 | replaceQueryParams(...) : UriBuilder | provenance | MaD:70+MaD:69 |
+| Test.java:1140:38:1140:39 | in : LinkedMultiValueMap [<map.key>] : Object | Test.java:1140:10:1140:40 | replaceQueryParams(...) : UriBuilder | provenance | MaD:69+MaD:71 |
 | Test.java:1146:23:1146:55 | newMultiValueMapWithKey(...) : LinkedMultiValueMap [<map.key>] : Object | Test.java:1148:38:1148:39 | in : LinkedMultiValueMap [<map.key>] : Object | provenance |  |
 | Test.java:1146:47:1146:54 | source(...) : Object | Test.java:54:40:54:53 | element : Object | provenance |  |
-| Test.java:1146:47:1146:54 | source(...) : Object | Test.java:1146:23:1146:55 | newMultiValueMapWithKey(...) : LinkedMultiValueMap [<map.key>] : Object | provenance | MaD:7 |
+| Test.java:1146:47:1146:54 | source(...) : Object | Test.java:1146:23:1146:55 | newMultiValueMapWithKey(...) : LinkedMultiValueMap [<map.key>] : Object | provenance | MaD:5 |
 | Test.java:1148:10:1148:40 | replaceQueryParams(...) : UriBuilder | Test.java:1149:9:1149:11 | out | provenance |  |
-| Test.java:1148:38:1148:39 | in : LinkedMultiValueMap [<map.key>] : Object | Test.java:1148:10:1148:40 | replaceQueryParams(...) : UriBuilder | provenance | MaD:70+MaD:69 |
+| Test.java:1148:38:1148:39 | in : LinkedMultiValueMap [<map.key>] : Object | Test.java:1148:10:1148:40 | replaceQueryParams(...) : UriBuilder | provenance | MaD:69+MaD:71 |
 | Test.java:1154:23:1154:57 | newMultiValueMapWithValue(...) : LinkedMultiValueMap [<map.value>] : Object | Test.java:1156:38:1156:39 | in : LinkedMultiValueMap [<map.value>] : Object | provenance |  |
 | Test.java:1154:49:1154:56 | source(...) : Object | Test.java:55:42:55:55 | element : Object | provenance |  |
 | Test.java:1154:49:1154:56 | source(...) : Object | Test.java:1154:23:1154:57 | newMultiValueMapWithValue(...) : LinkedMultiValueMap [<map.value>] : Object | provenance | MaD:9 |
 | Test.java:1156:10:1156:40 | replaceQueryParams(...) : UriBuilder | Test.java:1157:9:1157:11 | out | provenance |  |
-| Test.java:1156:38:1156:39 | in : LinkedMultiValueMap [<map.value>] : Object | Test.java:1156:10:1156:40 | replaceQueryParams(...) : UriBuilder | provenance | MaD:71+MaD:69 |
+| Test.java:1156:38:1156:39 | in : LinkedMultiValueMap [<map.value>] : Object | Test.java:1156:10:1156:40 | replaceQueryParams(...) : UriBuilder | provenance | MaD:70+MaD:71 |
 | Test.java:1162:23:1162:57 | newMultiValueMapWithValue(...) : LinkedMultiValueMap [<map.value>] : Object | Test.java:1164:38:1164:39 | in : LinkedMultiValueMap [<map.value>] : Object | provenance |  |
 | Test.java:1162:49:1162:56 | source(...) : Object | Test.java:55:42:55:55 | element : Object | provenance |  |
 | Test.java:1162:49:1162:56 | source(...) : Object | Test.java:1162:23:1162:57 | newMultiValueMapWithValue(...) : LinkedMultiValueMap [<map.value>] : Object | provenance | MaD:9 |
 | Test.java:1164:10:1164:40 | replaceQueryParams(...) : UriBuilder | Test.java:1165:9:1165:11 | out | provenance |  |
-| Test.java:1164:38:1164:39 | in : LinkedMultiValueMap [<map.value>] : Object | Test.java:1164:10:1164:40 | replaceQueryParams(...) : UriBuilder | provenance | MaD:71+MaD:69 |
+| Test.java:1164:38:1164:39 | in : LinkedMultiValueMap [<map.value>] : Object | Test.java:1164:10:1164:40 | replaceQueryParams(...) : UriBuilder | provenance | MaD:70+MaD:71 |
 | Test.java:1170:20:1170:39 | (...)... : UriBuilder | Test.java:1171:10:1171:11 | in : UriBuilder | provenance |  |
 | Test.java:1170:32:1170:39 | source(...) : Object | Test.java:1170:20:1170:39 | (...)... : UriBuilder | provenance |  |
-| Test.java:1171:10:1171:11 | in : UriBuilder | Test.java:1171:10:1171:24 | scheme(...) : UriBuilder | provenance | MaD:72 |
+| Test.java:1171:10:1171:11 | in : UriBuilder | Test.java:1171:10:1171:24 | scheme(...) : UriBuilder | provenance | MaD:73 |
 | Test.java:1171:10:1171:24 | scheme(...) : UriBuilder | Test.java:1172:9:1172:11 | out | provenance |  |
 | Test.java:1177:20:1177:39 | (...)... : UriBuilder | Test.java:1178:10:1178:11 | in : UriBuilder | provenance |  |
 | Test.java:1177:32:1177:39 | source(...) : Object | Test.java:1177:20:1177:39 | (...)... : UriBuilder | provenance |  |
-| Test.java:1178:10:1178:11 | in : UriBuilder | Test.java:1178:10:1178:24 | scheme(...) : UriBuilder | provenance | MaD:72 |
+| Test.java:1178:10:1178:11 | in : UriBuilder | Test.java:1178:10:1178:24 | scheme(...) : UriBuilder | provenance | MaD:73 |
 | Test.java:1178:10:1178:24 | scheme(...) : UriBuilder | Test.java:1179:9:1179:11 | out | provenance |  |
 | Test.java:1184:16:1184:31 | (...)... : String | Test.java:1185:15:1185:16 | in : String | provenance |  |
 | Test.java:1184:24:1184:31 | source(...) : Object | Test.java:1184:16:1184:31 | (...)... : String | provenance |  |
 | Test.java:1185:4:1185:6 | out [post update] : UriBuilder | Test.java:1186:9:1186:11 | out | provenance |  |
-| Test.java:1185:15:1185:16 | in : String | Test.java:1185:4:1185:6 | out [post update] : UriBuilder | provenance | MaD:73 |
+| Test.java:1185:15:1185:16 | in : String | Test.java:1185:4:1185:6 | out [post update] : UriBuilder | provenance | MaD:72 |
 | Test.java:1191:16:1191:31 | (...)... : String | Test.java:1192:15:1192:16 | in : String | provenance |  |
 | Test.java:1191:24:1191:31 | source(...) : Object | Test.java:1191:16:1191:31 | (...)... : String | provenance |  |
 | Test.java:1192:4:1192:6 | out [post update] : UriBuilder | Test.java:1193:9:1193:11 | out | provenance |  |
-| Test.java:1192:15:1192:16 | in : String | Test.java:1192:4:1192:6 | out [post update] : UriBuilder | provenance | MaD:73 |
+| Test.java:1192:15:1192:16 | in : String | Test.java:1192:4:1192:6 | out [post update] : UriBuilder | provenance | MaD:72 |
 | Test.java:1198:16:1198:31 | (...)... : String | Test.java:1200:26:1200:27 | in : String | provenance |  |
 | Test.java:1198:24:1198:31 | source(...) : Object | Test.java:1198:16:1198:31 | (...)... : String | provenance |  |
 | Test.java:1200:10:1200:28 | scheme(...) : UriBuilder | Test.java:1201:9:1201:11 | out | provenance |  |
-| Test.java:1200:26:1200:27 | in : String | Test.java:1200:10:1200:28 | scheme(...) : UriBuilder | provenance | MaD:73+MaD:72 |
+| Test.java:1200:26:1200:27 | in : String | Test.java:1200:10:1200:28 | scheme(...) : UriBuilder | provenance | MaD:72+MaD:73 |
 | Test.java:1206:16:1206:31 | (...)... : String | Test.java:1208:26:1208:27 | in : String | provenance |  |
 | Test.java:1206:24:1206:31 | source(...) : Object | Test.java:1206:16:1206:31 | (...)... : String | provenance |  |
 | Test.java:1208:10:1208:28 | scheme(...) : UriBuilder | Test.java:1209:9:1209:11 | out | provenance |  |
-| Test.java:1208:26:1208:27 | in : String | Test.java:1208:10:1208:28 | scheme(...) : UriBuilder | provenance | MaD:73+MaD:72 |
+| Test.java:1208:26:1208:27 | in : String | Test.java:1208:10:1208:28 | scheme(...) : UriBuilder | provenance | MaD:72+MaD:73 |
 | Test.java:1214:20:1214:39 | (...)... : UriBuilder | Test.java:1215:10:1215:11 | in : UriBuilder | provenance |  |
 | Test.java:1214:32:1214:39 | source(...) : Object | Test.java:1214:20:1214:39 | (...)... : UriBuilder | provenance |  |
-| Test.java:1215:10:1215:11 | in : UriBuilder | Test.java:1215:10:1215:26 | userInfo(...) : UriBuilder | provenance | MaD:74 |
+| Test.java:1215:10:1215:11 | in : UriBuilder | Test.java:1215:10:1215:26 | userInfo(...) : UriBuilder | provenance | MaD:75 |
 | Test.java:1215:10:1215:26 | userInfo(...) : UriBuilder | Test.java:1216:9:1216:11 | out | provenance |  |
 | Test.java:1221:20:1221:39 | (...)... : UriBuilder | Test.java:1222:10:1222:11 | in : UriBuilder | provenance |  |
 | Test.java:1221:32:1221:39 | source(...) : Object | Test.java:1221:20:1221:39 | (...)... : UriBuilder | provenance |  |
-| Test.java:1222:10:1222:11 | in : UriBuilder | Test.java:1222:10:1222:26 | userInfo(...) : UriBuilder | provenance | MaD:74 |
+| Test.java:1222:10:1222:11 | in : UriBuilder | Test.java:1222:10:1222:26 | userInfo(...) : UriBuilder | provenance | MaD:75 |
 | Test.java:1222:10:1222:26 | userInfo(...) : UriBuilder | Test.java:1223:9:1223:11 | out | provenance |  |
 | Test.java:1228:16:1228:31 | (...)... : String | Test.java:1229:17:1229:18 | in : String | provenance |  |
 | Test.java:1228:24:1228:31 | source(...) : Object | Test.java:1228:16:1228:31 | (...)... : String | provenance |  |
 | Test.java:1229:4:1229:6 | out [post update] : UriBuilder | Test.java:1230:9:1230:11 | out | provenance |  |
-| Test.java:1229:17:1229:18 | in : String | Test.java:1229:4:1229:6 | out [post update] : UriBuilder | provenance | MaD:75 |
+| Test.java:1229:17:1229:18 | in : String | Test.java:1229:4:1229:6 | out [post update] : UriBuilder | provenance | MaD:74 |
 | Test.java:1235:16:1235:31 | (...)... : String | Test.java:1236:17:1236:18 | in : String | provenance |  |
 | Test.java:1235:24:1235:31 | source(...) : Object | Test.java:1235:16:1235:31 | (...)... : String | provenance |  |
 | Test.java:1236:4:1236:6 | out [post update] : UriBuilder | Test.java:1237:9:1237:11 | out | provenance |  |
-| Test.java:1236:17:1236:18 | in : String | Test.java:1236:4:1236:6 | out [post update] : UriBuilder | provenance | MaD:75 |
+| Test.java:1236:17:1236:18 | in : String | Test.java:1236:4:1236:6 | out [post update] : UriBuilder | provenance | MaD:74 |
 | Test.java:1242:16:1242:31 | (...)... : String | Test.java:1244:28:1244:29 | in : String | provenance |  |
 | Test.java:1242:24:1242:31 | source(...) : Object | Test.java:1242:16:1242:31 | (...)... : String | provenance |  |
 | Test.java:1244:10:1244:30 | userInfo(...) : UriBuilder | Test.java:1245:9:1245:11 | out | provenance |  |
-| Test.java:1244:28:1244:29 | in : String | Test.java:1244:10:1244:30 | userInfo(...) : UriBuilder | provenance | MaD:75+MaD:74 |
+| Test.java:1244:28:1244:29 | in : String | Test.java:1244:10:1244:30 | userInfo(...) : UriBuilder | provenance | MaD:74+MaD:75 |
 | Test.java:1250:16:1250:31 | (...)... : String | Test.java:1252:28:1252:29 | in : String | provenance |  |
 | Test.java:1250:24:1250:31 | source(...) : Object | Test.java:1250:16:1250:31 | (...)... : String | provenance |  |
 | Test.java:1252:10:1252:30 | userInfo(...) : UriBuilder | Test.java:1253:9:1253:11 | out | provenance |  |
-| Test.java:1252:28:1252:29 | in : String | Test.java:1252:10:1252:30 | userInfo(...) : UriBuilder | provenance | MaD:75+MaD:74 |
+| Test.java:1252:28:1252:29 | in : String | Test.java:1252:10:1252:30 | userInfo(...) : UriBuilder | provenance | MaD:74+MaD:75 |
 | Test.java:1258:27:1258:53 | (...)... : UriBuilderFactory | Test.java:1259:10:1259:11 | in : UriBuilderFactory | provenance |  |
 | Test.java:1258:46:1258:53 | source(...) : Object | Test.java:1258:27:1258:53 | (...)... : UriBuilderFactory | provenance |  |
 | Test.java:1259:10:1259:11 | in : UriBuilderFactory | Test.java:1259:10:1259:21 | builder(...) : UriBuilder | provenance | MaD:76 |
@@ -884,116 +884,116 @@ edges
 | Test.java:1266:10:1266:21 | builder(...) : UriBuilder | Test.java:1267:9:1267:11 | out | provenance |  |
 | Test.java:1272:27:1272:53 | (...)... : UriBuilderFactory | Test.java:1273:10:1273:11 | in : UriBuilderFactory | provenance |  |
 | Test.java:1272:46:1272:53 | source(...) : Object | Test.java:1272:27:1272:53 | (...)... : UriBuilderFactory | provenance |  |
-| Test.java:1273:10:1273:11 | in : UriBuilderFactory | Test.java:1273:10:1273:27 | uriString(...) : UriBuilder | provenance | MaD:77 |
+| Test.java:1273:10:1273:11 | in : UriBuilderFactory | Test.java:1273:10:1273:27 | uriString(...) : UriBuilder | provenance | MaD:78 |
 | Test.java:1273:10:1273:27 | uriString(...) : UriBuilder | Test.java:1274:9:1274:11 | out | provenance |  |
 | Test.java:1279:16:1279:31 | (...)... : String | Test.java:1281:29:1281:30 | in : String | provenance |  |
 | Test.java:1279:24:1279:31 | source(...) : Object | Test.java:1279:16:1279:31 | (...)... : String | provenance |  |
 | Test.java:1281:10:1281:31 | uriString(...) : UriBuilder | Test.java:1282:9:1282:11 | out | provenance |  |
-| Test.java:1281:29:1281:30 | in : String | Test.java:1281:10:1281:31 | uriString(...) : UriBuilder | provenance | MaD:78 |
+| Test.java:1281:29:1281:30 | in : String | Test.java:1281:10:1281:31 | uriString(...) : UriBuilder | provenance | MaD:77 |
 | Test.java:1287:16:1287:31 | (...)... : String | Test.java:1289:29:1289:30 | in : String | provenance |  |
 | Test.java:1287:24:1287:31 | source(...) : Object | Test.java:1287:16:1287:31 | (...)... : String | provenance |  |
 | Test.java:1289:10:1289:31 | uriString(...) : UriBuilder | Test.java:1290:9:1290:11 | out | provenance |  |
-| Test.java:1289:29:1289:30 | in : String | Test.java:1289:10:1289:31 | uriString(...) : UriBuilder | provenance | MaD:78 |
+| Test.java:1289:29:1289:30 | in : String | Test.java:1289:10:1289:31 | uriString(...) : UriBuilder | provenance | MaD:77 |
 | Test.java:1295:34:1295:67 | (...)... : DefaultUriBuilderFactory | Test.java:1296:10:1296:11 | in : DefaultUriBuilderFactory | provenance |  |
 | Test.java:1295:60:1295:67 | source(...) : Object | Test.java:1295:34:1295:67 | (...)... : DefaultUriBuilderFactory | provenance |  |
 | Test.java:1296:10:1296:11 | in : DefaultUriBuilderFactory | Test.java:1296:10:1296:27 | uriString(...) : UriBuilder | provenance | MaD:24 |
-| Test.java:1296:10:1296:11 | in : DefaultUriBuilderFactory | Test.java:1296:10:1296:27 | uriString(...) : UriBuilder | provenance | MaD:77 |
+| Test.java:1296:10:1296:11 | in : DefaultUriBuilderFactory | Test.java:1296:10:1296:27 | uriString(...) : UriBuilder | provenance | MaD:78 |
 | Test.java:1296:10:1296:27 | uriString(...) : UriBuilder | Test.java:1297:9:1297:11 | out | provenance |  |
 | Test.java:1302:44:1302:95 | new StubUriTemplateVariables(...) : StubUriTemplateVariables [<map.value>] : Object | Test.java:1303:10:1303:11 | in : StubUriTemplateVariables [<map.value>] : Object | provenance |  |
 | Test.java:1302:73:1302:94 | of(...) : Map [<map.value>] : Object | Test.java:44:30:44:34 | m : Map [<map.value>] : Object | provenance |  |
 | Test.java:1302:73:1302:94 | of(...) : Map [<map.value>] : Object | Test.java:1302:44:1302:95 | new StubUriTemplateVariables(...) : StubUriTemplateVariables [<map.value>] : Object | provenance | MaD:2 |
-| Test.java:1302:86:1302:93 | source(...) : Object | Test.java:1302:73:1302:94 | of(...) : Map [<map.value>] : Object | provenance | MaD:8 |
+| Test.java:1302:86:1302:93 | source(...) : Object | Test.java:1302:73:1302:94 | of(...) : Map [<map.value>] : Object | provenance | MaD:6 |
 | Test.java:1303:10:1303:11 | in : StubUriTemplateVariables [<map.value>] : Object | Test.java:46:19:46:26 | parameter this : StubUriTemplateVariables [<map.value>] : Object | provenance |  |
-| Test.java:1303:10:1303:11 | in : StubUriTemplateVariables [<map.value>] : Object | Test.java:1303:10:1303:26 | getValue(...) : Object | provenance | MaD:5 |
-| Test.java:1303:10:1303:11 | in : StubUriTemplateVariables [<map.value>] : Object | Test.java:1303:10:1303:26 | getValue(...) : Object | provenance | MaD:97 |
+| Test.java:1303:10:1303:11 | in : StubUriTemplateVariables [<map.value>] : Object | Test.java:1303:10:1303:26 | getValue(...) : Object | provenance | MaD:7 |
+| Test.java:1303:10:1303:11 | in : StubUriTemplateVariables [<map.value>] : Object | Test.java:1303:10:1303:26 | getValue(...) : Object | provenance | MaD:79 |
 | Test.java:1303:10:1303:26 | getValue(...) : Object | Test.java:1304:9:1304:11 | out | provenance |  |
 | Test.java:1323:23:1323:45 | (...)... : UriComponents | Test.java:1324:10:1324:11 | in : UriComponents | provenance |  |
 | Test.java:1323:38:1323:45 | source(...) : Object | Test.java:1323:23:1323:45 | (...)... : UriComponents | provenance |  |
-| Test.java:1324:10:1324:11 | in : UriComponents | Test.java:1324:10:1324:24 | encode(...) : UriComponents | provenance | MaD:79 |
+| Test.java:1324:10:1324:11 | in : UriComponents | Test.java:1324:10:1324:24 | encode(...) : UriComponents | provenance | MaD:80 |
 | Test.java:1324:10:1324:24 | encode(...) : UriComponents | Test.java:1325:9:1325:11 | out | provenance |  |
 | Test.java:1330:23:1330:45 | (...)... : UriComponents | Test.java:1331:10:1331:11 | in : UriComponents | provenance |  |
 | Test.java:1330:38:1330:45 | source(...) : Object | Test.java:1330:23:1330:45 | (...)... : UriComponents | provenance |  |
-| Test.java:1331:10:1331:11 | in : UriComponents | Test.java:1331:10:1331:20 | encode(...) : UriComponents | provenance | MaD:79 |
+| Test.java:1331:10:1331:11 | in : UriComponents | Test.java:1331:10:1331:20 | encode(...) : UriComponents | provenance | MaD:80 |
 | Test.java:1331:10:1331:20 | encode(...) : UriComponents | Test.java:1332:9:1332:11 | out | provenance |  |
 | Test.java:1337:13:1337:37 | newMapWithValue(...) : Map [<map.value>] : Object | Test.java:1339:26:1339:27 | in : Map [<map.value>] : Object | provenance |  |
 | Test.java:1337:29:1337:36 | source(...) : Object | Test.java:53:22:53:35 | element : Object | provenance |  |
-| Test.java:1337:29:1337:36 | source(...) : Object | Test.java:1337:13:1337:37 | newMapWithValue(...) : Map [<map.value>] : Object | provenance | MaD:8 |
+| Test.java:1337:29:1337:36 | source(...) : Object | Test.java:1337:13:1337:37 | newMapWithValue(...) : Map [<map.value>] : Object | provenance | MaD:6 |
 | Test.java:1339:10:1339:28 | expand(...) : UriComponents | Test.java:1340:9:1340:11 | out | provenance |  |
-| Test.java:1339:26:1339:27 | in : Map [<map.value>] : Object | Test.java:1339:10:1339:28 | expand(...) : UriComponents | provenance | MaD:80 |
+| Test.java:1339:26:1339:27 | in : Map [<map.value>] : Object | Test.java:1339:10:1339:28 | expand(...) : UriComponents | provenance | MaD:81 |
 | Test.java:1345:18:1345:39 | {...} : Object[] [[]] : Object | Test.java:1347:26:1347:27 | in : Object[] [[]] : Object | provenance |  |
 | Test.java:1345:31:1345:38 | source(...) : Object | Test.java:1345:18:1345:39 | {...} : Object[] [[]] : Object | provenance |  |
 | Test.java:1347:10:1347:28 | expand(...) : UriComponents | Test.java:1348:9:1348:11 | out | provenance |  |
-| Test.java:1347:26:1347:27 | in : Object[] [[]] : Object | Test.java:1347:10:1347:28 | expand(...) : UriComponents | provenance | MaD:81 |
+| Test.java:1347:26:1347:27 | in : Object[] [[]] : Object | Test.java:1347:10:1347:28 | expand(...) : UriComponents | provenance | MaD:82 |
 | Test.java:1353:44:1353:95 | new StubUriTemplateVariables(...) : StubUriTemplateVariables [<map.value>] : Object | Test.java:1355:26:1355:27 | in : StubUriTemplateVariables [<map.value>] : Object | provenance |  |
 | Test.java:1353:73:1353:94 | of(...) : Map [<map.value>] : Object | Test.java:44:30:44:34 | m : Map [<map.value>] : Object | provenance |  |
 | Test.java:1353:73:1353:94 | of(...) : Map [<map.value>] : Object | Test.java:1353:44:1353:95 | new StubUriTemplateVariables(...) : StubUriTemplateVariables [<map.value>] : Object | provenance | MaD:2 |
-| Test.java:1353:86:1353:93 | source(...) : Object | Test.java:1353:73:1353:94 | of(...) : Map [<map.value>] : Object | provenance | MaD:8 |
+| Test.java:1353:86:1353:93 | source(...) : Object | Test.java:1353:73:1353:94 | of(...) : Map [<map.value>] : Object | provenance | MaD:6 |
 | Test.java:1355:10:1355:28 | expand(...) : UriComponents | Test.java:1356:9:1356:11 | out | provenance |  |
-| Test.java:1355:26:1355:27 | in : StubUriTemplateVariables [<map.value>] : Object | Test.java:1355:10:1355:28 | expand(...) : UriComponents | provenance | MaD:82 |
+| Test.java:1355:26:1355:27 | in : StubUriTemplateVariables [<map.value>] : Object | Test.java:1355:10:1355:28 | expand(...) : UriComponents | provenance | MaD:83 |
 | Test.java:1361:23:1361:45 | (...)... : UriComponents | Test.java:1362:10:1362:11 | in : UriComponents | provenance |  |
 | Test.java:1361:38:1361:45 | source(...) : Object | Test.java:1361:23:1361:45 | (...)... : UriComponents | provenance |  |
-| Test.java:1362:10:1362:11 | in : UriComponents | Test.java:1362:10:1362:25 | getFragment(...) : String | provenance | MaD:83 |
+| Test.java:1362:10:1362:11 | in : UriComponents | Test.java:1362:10:1362:25 | getFragment(...) : String | provenance | MaD:84 |
 | Test.java:1362:10:1362:25 | getFragment(...) : String | Test.java:1363:9:1363:11 | out | provenance |  |
 | Test.java:1368:23:1368:45 | (...)... : UriComponents | Test.java:1369:10:1369:11 | in : UriComponents | provenance |  |
 | Test.java:1368:38:1368:45 | source(...) : Object | Test.java:1368:23:1368:45 | (...)... : UriComponents | provenance |  |
-| Test.java:1369:10:1369:11 | in : UriComponents | Test.java:1369:10:1369:21 | getHost(...) : String | provenance | MaD:84 |
+| Test.java:1369:10:1369:11 | in : UriComponents | Test.java:1369:10:1369:21 | getHost(...) : String | provenance | MaD:85 |
 | Test.java:1369:10:1369:21 | getHost(...) : String | Test.java:1370:9:1370:11 | out | provenance |  |
 | Test.java:1375:23:1375:45 | (...)... : UriComponents | Test.java:1376:10:1376:11 | in : UriComponents | provenance |  |
 | Test.java:1375:38:1375:45 | source(...) : Object | Test.java:1375:23:1375:45 | (...)... : UriComponents | provenance |  |
-| Test.java:1376:10:1376:11 | in : UriComponents | Test.java:1376:10:1376:21 | getPath(...) : String | provenance | MaD:85 |
+| Test.java:1376:10:1376:11 | in : UriComponents | Test.java:1376:10:1376:21 | getPath(...) : String | provenance | MaD:86 |
 | Test.java:1376:10:1376:21 | getPath(...) : String | Test.java:1377:9:1377:11 | out | provenance |  |
 | Test.java:1382:23:1382:45 | (...)... : UriComponents | Test.java:1383:10:1383:11 | in : UriComponents | provenance |  |
 | Test.java:1382:38:1382:45 | source(...) : Object | Test.java:1382:23:1382:45 | (...)... : UriComponents | provenance |  |
-| Test.java:1383:10:1383:11 | in : UriComponents | Test.java:1383:10:1383:29 | getPathSegments(...) : List | provenance | MaD:86 |
+| Test.java:1383:10:1383:11 | in : UriComponents | Test.java:1383:10:1383:29 | getPathSegments(...) : List | provenance | MaD:87 |
 | Test.java:1383:10:1383:29 | getPathSegments(...) : List | Test.java:1384:9:1384:11 | out | provenance |  |
 | Test.java:1389:23:1389:45 | (...)... : UriComponents | Test.java:1390:10:1390:11 | in : UriComponents | provenance |  |
 | Test.java:1389:38:1389:45 | source(...) : Object | Test.java:1389:23:1389:45 | (...)... : UriComponents | provenance |  |
-| Test.java:1390:10:1390:11 | in : UriComponents | Test.java:1390:10:1390:22 | getQuery(...) : String | provenance | MaD:87 |
+| Test.java:1390:10:1390:11 | in : UriComponents | Test.java:1390:10:1390:22 | getQuery(...) : String | provenance | MaD:88 |
 | Test.java:1390:10:1390:22 | getQuery(...) : String | Test.java:1391:9:1391:11 | out | provenance |  |
 | Test.java:1396:23:1396:45 | (...)... : UriComponents | Test.java:1397:10:1397:11 | in : UriComponents | provenance |  |
 | Test.java:1396:38:1396:45 | source(...) : Object | Test.java:1396:23:1396:45 | (...)... : UriComponents | provenance |  |
-| Test.java:1397:10:1397:11 | in : UriComponents | Test.java:1397:10:1397:28 | getQueryParams(...) : MultiValueMap [<map.value>, <element>] : Object | provenance | MaD:89 |
+| Test.java:1397:10:1397:11 | in : UriComponents | Test.java:1397:10:1397:28 | getQueryParams(...) : MultiValueMap [<map.value>, <element>] : Object | provenance | MaD:90 |
 | Test.java:1397:10:1397:28 | getQueryParams(...) : MultiValueMap [<map.value>, <element>] : Object | Test.java:1398:38:1398:40 | out : MultiValueMap [<map.value>, <element>] : Object | provenance |  |
 | Test.java:1398:20:1398:41 | (...)... : List [<element>] : Object | Test.java:49:20:49:39 | container : List [<element>] : Object | provenance |  |
 | Test.java:1398:20:1398:41 | (...)... : List [<element>] : Object | Test.java:1398:9:1398:42 | getElement(...) | provenance | MaD:1 |
 | Test.java:1398:26:1398:41 | getMapValue(...) : Object [<element>] : Object | Test.java:1398:20:1398:41 | (...)... : List [<element>] : Object | provenance |  |
 | Test.java:1398:38:1398:40 | out : MultiValueMap [<map.value>, <element>] : Object | Test.java:51:20:51:29 | m : MultiValueMap [<map.value>, <element>] : Object | provenance |  |
-| Test.java:1398:38:1398:40 | out : MultiValueMap [<map.value>, <element>] : Object | Test.java:1398:26:1398:41 | getMapValue(...) : Object [<element>] : Object | provenance | MaD:5 |
+| Test.java:1398:38:1398:40 | out : MultiValueMap [<map.value>, <element>] : Object | Test.java:1398:26:1398:41 | getMapValue(...) : Object [<element>] : Object | provenance | MaD:7 |
 | Test.java:1403:23:1403:45 | (...)... : UriComponents | Test.java:1404:10:1404:11 | in : UriComponents | provenance |  |
 | Test.java:1403:38:1403:45 | source(...) : Object | Test.java:1403:23:1403:45 | (...)... : UriComponents | provenance |  |
-| Test.java:1404:10:1404:11 | in : UriComponents | Test.java:1404:10:1404:28 | getQueryParams(...) : MultiValueMap [<map.key>] : Object | provenance | MaD:88 |
+| Test.java:1404:10:1404:11 | in : UriComponents | Test.java:1404:10:1404:28 | getQueryParams(...) : MultiValueMap [<map.key>] : Object | provenance | MaD:89 |
 | Test.java:1404:10:1404:28 | getQueryParams(...) : MultiValueMap [<map.key>] : Object | Test.java:1405:19:1405:21 | out : MultiValueMap [<map.key>] : Object | provenance |  |
 | Test.java:1405:19:1405:21 | out : MultiValueMap [<map.key>] : Object | Test.java:50:18:50:27 | m : MultiValueMap [<map.key>] : Object | provenance |  |
-| Test.java:1405:19:1405:21 | out : MultiValueMap [<map.key>] : Object | Test.java:1405:9:1405:22 | getMapKey(...) | provenance | MaD:6 |
+| Test.java:1405:19:1405:21 | out : MultiValueMap [<map.key>] : Object | Test.java:1405:9:1405:22 | getMapKey(...) | provenance | MaD:8 |
 | Test.java:1410:23:1410:45 | (...)... : UriComponents | Test.java:1411:10:1411:11 | in : UriComponents | provenance |  |
 | Test.java:1410:38:1410:45 | source(...) : Object | Test.java:1410:23:1410:45 | (...)... : UriComponents | provenance |  |
-| Test.java:1411:10:1411:11 | in : UriComponents | Test.java:1411:10:1411:23 | getScheme(...) : String | provenance | MaD:90 |
+| Test.java:1411:10:1411:11 | in : UriComponents | Test.java:1411:10:1411:23 | getScheme(...) : String | provenance | MaD:91 |
 | Test.java:1411:10:1411:23 | getScheme(...) : String | Test.java:1412:9:1412:11 | out | provenance |  |
 | Test.java:1417:23:1417:45 | (...)... : UriComponents | Test.java:1418:10:1418:11 | in : UriComponents | provenance |  |
 | Test.java:1417:38:1417:45 | source(...) : Object | Test.java:1417:23:1417:45 | (...)... : UriComponents | provenance |  |
-| Test.java:1418:10:1418:11 | in : UriComponents | Test.java:1418:10:1418:35 | getSchemeSpecificPart(...) : String | provenance | MaD:91 |
+| Test.java:1418:10:1418:11 | in : UriComponents | Test.java:1418:10:1418:35 | getSchemeSpecificPart(...) : String | provenance | MaD:92 |
 | Test.java:1418:10:1418:35 | getSchemeSpecificPart(...) : String | Test.java:1419:9:1419:11 | out | provenance |  |
 | Test.java:1424:23:1424:45 | (...)... : UriComponents | Test.java:1425:10:1425:11 | in : UriComponents | provenance |  |
 | Test.java:1424:38:1424:45 | source(...) : Object | Test.java:1424:23:1424:45 | (...)... : UriComponents | provenance |  |
-| Test.java:1425:10:1425:11 | in : UriComponents | Test.java:1425:10:1425:25 | getUserInfo(...) : String | provenance | MaD:92 |
+| Test.java:1425:10:1425:11 | in : UriComponents | Test.java:1425:10:1425:25 | getUserInfo(...) : String | provenance | MaD:93 |
 | Test.java:1425:10:1425:25 | getUserInfo(...) : String | Test.java:1426:9:1426:11 | out | provenance |  |
 | Test.java:1431:23:1431:45 | (...)... : UriComponents | Test.java:1432:10:1432:11 | in : UriComponents | provenance |  |
 | Test.java:1431:38:1431:45 | source(...) : Object | Test.java:1431:23:1431:45 | (...)... : UriComponents | provenance |  |
-| Test.java:1432:10:1432:11 | in : UriComponents | Test.java:1432:10:1432:19 | toUri(...) : URI | provenance | MaD:95 |
+| Test.java:1432:10:1432:11 | in : UriComponents | Test.java:1432:10:1432:19 | toUri(...) : URI | provenance | MaD:96 |
 | Test.java:1432:10:1432:19 | toUri(...) : URI | Test.java:1433:9:1433:11 | out | provenance |  |
 | Test.java:1438:23:1438:45 | (...)... : UriComponents | Test.java:1439:10:1439:11 | in : UriComponents | provenance |  |
 | Test.java:1438:38:1438:45 | source(...) : Object | Test.java:1438:23:1438:45 | (...)... : UriComponents | provenance |  |
-| Test.java:1439:10:1439:11 | in : UriComponents | Test.java:1439:10:1439:25 | toUriString(...) : String | provenance | MaD:96 |
+| Test.java:1439:10:1439:11 | in : UriComponents | Test.java:1439:10:1439:25 | toUriString(...) : String | provenance | MaD:97 |
 | Test.java:1439:10:1439:25 | toUriString(...) : String | Test.java:1440:9:1440:11 | out | provenance |  |
 | Test.java:1445:13:1445:37 | newMapWithValue(...) : Map [<map.value>] : Object | Test.java:1447:25:1447:26 | in : Map [<map.value>] : Object | provenance |  |
 | Test.java:1445:29:1445:36 | source(...) : Object | Test.java:53:22:53:35 | element : Object | provenance |  |
-| Test.java:1445:29:1445:36 | source(...) : Object | Test.java:1445:13:1445:37 | newMapWithValue(...) : Map [<map.value>] : Object | provenance | MaD:8 |
+| Test.java:1445:29:1445:36 | source(...) : Object | Test.java:1445:13:1445:37 | newMapWithValue(...) : Map [<map.value>] : Object | provenance | MaD:6 |
 | Test.java:1447:10:1447:27 | build(...) : URI | Test.java:1448:9:1448:11 | out | provenance |  |
-| Test.java:1447:25:1447:26 | in : Map [<map.value>] : Object | Test.java:1447:10:1447:27 | build(...) : URI | provenance | MaD:37 |
+| Test.java:1447:25:1447:26 | in : Map [<map.value>] : Object | Test.java:1447:10:1447:27 | build(...) : URI | provenance | MaD:36 |
 | Test.java:1453:18:1453:39 | {...} : Object[] [[]] : Object | Test.java:1455:25:1455:26 | in : Object[] [[]] : Object | provenance |  |
 | Test.java:1453:31:1453:38 | source(...) : Object | Test.java:1453:18:1453:39 | {...} : Object[] [[]] : Object | provenance |  |
 | Test.java:1455:10:1455:27 | build(...) : URI | Test.java:1456:9:1456:11 | out | provenance |  |
-| Test.java:1455:25:1455:26 | in : Object[] [[]] : Object | Test.java:1455:10:1455:27 | build(...) : URI | provenance | MaD:38 |
+| Test.java:1455:25:1455:26 | in : Object[] [[]] : Object | Test.java:1455:10:1455:27 | build(...) : URI | provenance | MaD:37 |
 | Test.java:1461:30:1461:59 | (...)... : UriComponentsBuilder | Test.java:1462:10:1462:11 | in : UriComponentsBuilder | provenance |  |
 | Test.java:1461:52:1461:59 | source(...) : Object | Test.java:1461:30:1461:59 | (...)... : UriComponentsBuilder | provenance |  |
 | Test.java:1462:10:1462:11 | in : UriComponentsBuilder | Test.java:1462:10:1462:24 | build(...) : UriComponents | provenance | MaD:98 |
@@ -1004,17 +1004,17 @@ edges
 | Test.java:1469:10:1469:19 | build(...) : UriComponents | Test.java:1470:9:1470:11 | out | provenance |  |
 | Test.java:1475:30:1475:59 | (...)... : UriComponentsBuilder | Test.java:1476:10:1476:11 | in : UriComponentsBuilder | provenance |  |
 | Test.java:1475:52:1475:59 | source(...) : Object | Test.java:1475:30:1475:59 | (...)... : UriComponentsBuilder | provenance |  |
-| Test.java:1476:10:1476:11 | in : UriComponentsBuilder | Test.java:1476:10:1476:33 | build(...) : URI | provenance | MaD:35 |
+| Test.java:1476:10:1476:11 | in : UriComponentsBuilder | Test.java:1476:10:1476:33 | build(...) : URI | provenance | MaD:38 |
 | Test.java:1476:10:1476:11 | in : UriComponentsBuilder | Test.java:1476:10:1476:33 | build(...) : URI | provenance | MaD:98 |
 | Test.java:1476:10:1476:33 | build(...) : URI | Test.java:1477:9:1477:11 | out | provenance |  |
 | Test.java:1482:30:1482:59 | (...)... : UriComponentsBuilder | Test.java:1483:10:1483:11 | in : UriComponentsBuilder | provenance |  |
 | Test.java:1482:52:1482:59 | source(...) : Object | Test.java:1482:30:1482:59 | (...)... : UriComponentsBuilder | provenance |  |
-| Test.java:1483:10:1483:11 | in : UriComponentsBuilder | Test.java:1483:10:1483:28 | build(...) : URI | provenance | MaD:35 |
+| Test.java:1483:10:1483:11 | in : UriComponentsBuilder | Test.java:1483:10:1483:28 | build(...) : URI | provenance | MaD:38 |
 | Test.java:1483:10:1483:11 | in : UriComponentsBuilder | Test.java:1483:10:1483:28 | build(...) : URI | provenance | MaD:98 |
 | Test.java:1483:10:1483:28 | build(...) : URI | Test.java:1484:9:1484:11 | out | provenance |  |
 | Test.java:1489:13:1489:37 | newMapWithValue(...) : Map [<map.value>] : Object | Test.java:1491:34:1491:35 | in : Map [<map.value>] : Object | provenance |  |
 | Test.java:1489:29:1489:36 | source(...) : Object | Test.java:53:22:53:35 | element : Object | provenance |  |
-| Test.java:1489:29:1489:36 | source(...) : Object | Test.java:1489:13:1489:37 | newMapWithValue(...) : Map [<map.value>] : Object | provenance | MaD:8 |
+| Test.java:1489:29:1489:36 | source(...) : Object | Test.java:1489:13:1489:37 | newMapWithValue(...) : Map [<map.value>] : Object | provenance | MaD:6 |
 | Test.java:1491:10:1491:36 | buildAndExpand(...) : UriComponents | Test.java:1492:9:1492:11 | out | provenance |  |
 | Test.java:1491:34:1491:35 | in : Map [<map.value>] : Object | Test.java:1491:10:1491:36 | buildAndExpand(...) : UriComponents | provenance | MaD:99 |
 | Test.java:1497:18:1497:39 | {...} : Object[] [[]] : Object | Test.java:1499:34:1499:35 | in : Object[] [[]] : Object | provenance |  |
@@ -1035,12 +1035,12 @@ edges
 | Test.java:1520:10:1520:20 | encode(...) : UriComponentsBuilder | Test.java:1521:9:1521:11 | out | provenance |  |
 | Test.java:1526:30:1526:59 | (...)... : UriComponentsBuilder | Test.java:1527:10:1527:11 | in : UriComponentsBuilder | provenance |  |
 | Test.java:1526:52:1526:59 | source(...) : Object | Test.java:1526:30:1526:59 | (...)... : UriComponentsBuilder | provenance |  |
-| Test.java:1527:10:1527:11 | in : UriComponentsBuilder | Test.java:1527:10:1527:26 | fragment(...) : UriComponentsBuilder | provenance | MaD:39 |
+| Test.java:1527:10:1527:11 | in : UriComponentsBuilder | Test.java:1527:10:1527:26 | fragment(...) : UriComponentsBuilder | provenance | MaD:40 |
 | Test.java:1527:10:1527:26 | fragment(...) : UriComponentsBuilder | Test.java:1528:9:1528:11 | out | provenance |  |
 | Test.java:1533:16:1533:31 | (...)... : String | Test.java:1535:28:1535:29 | in : String | provenance |  |
 | Test.java:1533:24:1533:31 | source(...) : Object | Test.java:1533:16:1533:31 | (...)... : String | provenance |  |
 | Test.java:1535:10:1535:30 | fragment(...) : UriComponentsBuilder | Test.java:1536:9:1536:11 | out | provenance |  |
-| Test.java:1535:28:1535:29 | in : String | Test.java:1535:10:1535:30 | fragment(...) : UriComponentsBuilder | provenance | MaD:40+MaD:39 |
+| Test.java:1535:28:1535:29 | in : String | Test.java:1535:10:1535:30 | fragment(...) : UriComponentsBuilder | provenance | MaD:39+MaD:40 |
 | Test.java:1541:21:1541:41 | (...)... : HttpRequest | Test.java:1542:47:1542:48 | in : HttpRequest | provenance |  |
 | Test.java:1541:34:1541:41 | source(...) : Object | Test.java:1541:21:1541:41 | (...)... : HttpRequest | provenance |  |
 | Test.java:1542:10:1542:49 | fromHttpRequest(...) : UriComponentsBuilder | Test.java:1543:9:1543:11 | out | provenance |  |
@@ -1067,12 +1067,12 @@ edges
 | Test.java:1577:45:1577:46 | in : String | Test.java:1577:10:1577:47 | fromUriString(...) : UriComponentsBuilder | provenance | MaD:108 |
 | Test.java:1583:30:1583:59 | (...)... : UriComponentsBuilder | Test.java:1584:10:1584:11 | in : UriComponentsBuilder | provenance |  |
 | Test.java:1583:52:1583:59 | source(...) : Object | Test.java:1583:30:1583:59 | (...)... : UriComponentsBuilder | provenance |  |
-| Test.java:1584:10:1584:11 | in : UriComponentsBuilder | Test.java:1584:10:1584:22 | host(...) : UriComponentsBuilder | provenance | MaD:41 |
+| Test.java:1584:10:1584:11 | in : UriComponentsBuilder | Test.java:1584:10:1584:22 | host(...) : UriComponentsBuilder | provenance | MaD:42 |
 | Test.java:1584:10:1584:22 | host(...) : UriComponentsBuilder | Test.java:1585:9:1585:11 | out | provenance |  |
 | Test.java:1590:16:1590:31 | (...)... : String | Test.java:1592:24:1592:25 | in : String | provenance |  |
 | Test.java:1590:24:1590:31 | source(...) : Object | Test.java:1590:16:1590:31 | (...)... : String | provenance |  |
 | Test.java:1592:10:1592:26 | host(...) : UriComponentsBuilder | Test.java:1593:9:1593:11 | out | provenance |  |
-| Test.java:1592:24:1592:25 | in : String | Test.java:1592:10:1592:26 | host(...) : UriComponentsBuilder | provenance | MaD:42+MaD:41 |
+| Test.java:1592:24:1592:25 | in : String | Test.java:1592:10:1592:26 | host(...) : UriComponentsBuilder | provenance | MaD:41+MaD:42 |
 | Test.java:1598:27:1598:53 | (...)... : InetSocketAddress | Test.java:1599:55:1599:56 | in : InetSocketAddress | provenance |  |
 | Test.java:1598:46:1598:53 | source(...) : Object | Test.java:1598:27:1598:53 | (...)... : InetSocketAddress | provenance |  |
 | Test.java:1599:10:1599:57 | parseForwardedFor(...) : InetSocketAddress | Test.java:1600:9:1600:11 | out | provenance |  |
@@ -1083,201 +1083,201 @@ edges
 | Test.java:1606:49:1606:50 | in : HttpRequest | Test.java:1606:10:1606:57 | parseForwardedFor(...) : InetSocketAddress | provenance | MaD:109 |
 | Test.java:1612:30:1612:59 | (...)... : UriComponentsBuilder | Test.java:1613:10:1613:11 | in : UriComponentsBuilder | provenance |  |
 | Test.java:1612:52:1612:59 | source(...) : Object | Test.java:1612:30:1612:59 | (...)... : UriComponentsBuilder | provenance |  |
-| Test.java:1613:10:1613:11 | in : UriComponentsBuilder | Test.java:1613:10:1613:22 | path(...) : UriComponentsBuilder | provenance | MaD:43 |
+| Test.java:1613:10:1613:11 | in : UriComponentsBuilder | Test.java:1613:10:1613:22 | path(...) : UriComponentsBuilder | provenance | MaD:44 |
 | Test.java:1613:10:1613:22 | path(...) : UriComponentsBuilder | Test.java:1614:9:1614:11 | out | provenance |  |
 | Test.java:1619:16:1619:31 | (...)... : String | Test.java:1621:24:1621:25 | in : String | provenance |  |
 | Test.java:1619:24:1619:31 | source(...) : Object | Test.java:1619:16:1619:31 | (...)... : String | provenance |  |
 | Test.java:1621:10:1621:26 | path(...) : UriComponentsBuilder | Test.java:1622:9:1622:11 | out | provenance |  |
-| Test.java:1621:24:1621:25 | in : String | Test.java:1621:10:1621:26 | path(...) : UriComponentsBuilder | provenance | MaD:44+MaD:43 |
+| Test.java:1621:24:1621:25 | in : String | Test.java:1621:10:1621:26 | path(...) : UriComponentsBuilder | provenance | MaD:43+MaD:44 |
 | Test.java:1627:30:1627:59 | (...)... : UriComponentsBuilder | Test.java:1628:10:1628:11 | in : UriComponentsBuilder | provenance |  |
 | Test.java:1627:52:1627:59 | source(...) : Object | Test.java:1627:30:1627:59 | (...)... : UriComponentsBuilder | provenance |  |
-| Test.java:1628:10:1628:11 | in : UriComponentsBuilder | Test.java:1628:10:1628:39 | pathSegment(...) : UriComponentsBuilder | provenance | MaD:45 |
+| Test.java:1628:10:1628:11 | in : UriComponentsBuilder | Test.java:1628:10:1628:39 | pathSegment(...) : UriComponentsBuilder | provenance | MaD:46 |
 | Test.java:1628:10:1628:39 | pathSegment(...) : UriComponentsBuilder | Test.java:1629:9:1629:11 | out | provenance |  |
 | Test.java:1634:18:1634:47 | {...} : String[] [[]] : String | Test.java:1636:31:1636:32 | in : String[] [[]] : String | provenance |  |
 | Test.java:1634:31:1634:46 | (...)... : String | Test.java:1634:18:1634:47 | {...} : String[] [[]] : String | provenance |  |
 | Test.java:1634:39:1634:46 | source(...) : Object | Test.java:1634:31:1634:46 | (...)... : String | provenance |  |
 | Test.java:1636:10:1636:33 | pathSegment(...) : UriComponentsBuilder | Test.java:1637:9:1637:11 | out | provenance |  |
-| Test.java:1636:31:1636:32 | in : String[] [[]] : String | Test.java:1636:10:1636:33 | pathSegment(...) : UriComponentsBuilder | provenance | MaD:46+MaD:45 |
+| Test.java:1636:31:1636:32 | in : String[] [[]] : String | Test.java:1636:10:1636:33 | pathSegment(...) : UriComponentsBuilder | provenance | MaD:45+MaD:46 |
 | Test.java:1642:16:1642:31 | (...)... : String | Test.java:1644:24:1644:25 | in : String | provenance |  |
 | Test.java:1642:24:1642:31 | source(...) : Object | Test.java:1642:16:1642:31 | (...)... : String | provenance |  |
 | Test.java:1644:10:1644:26 | port(...) : UriComponentsBuilder | Test.java:1645:9:1645:11 | out | provenance |  |
-| Test.java:1644:24:1644:25 | in : String | Test.java:1644:10:1644:26 | port(...) : UriComponentsBuilder | provenance | MaD:48+MaD:47 |
+| Test.java:1644:24:1644:25 | in : String | Test.java:1644:10:1644:26 | port(...) : UriComponentsBuilder | provenance | MaD:47+MaD:48 |
 | Test.java:1650:30:1650:59 | (...)... : UriComponentsBuilder | Test.java:1651:10:1651:11 | in : UriComponentsBuilder | provenance |  |
 | Test.java:1650:52:1650:59 | source(...) : Object | Test.java:1650:30:1650:59 | (...)... : UriComponentsBuilder | provenance |  |
-| Test.java:1651:10:1651:11 | in : UriComponentsBuilder | Test.java:1651:10:1651:19 | port(...) : UriComponentsBuilder | provenance | MaD:47 |
+| Test.java:1651:10:1651:11 | in : UriComponentsBuilder | Test.java:1651:10:1651:19 | port(...) : UriComponentsBuilder | provenance | MaD:48 |
 | Test.java:1651:10:1651:19 | port(...) : UriComponentsBuilder | Test.java:1652:9:1652:11 | out | provenance |  |
 | Test.java:1657:30:1657:59 | (...)... : UriComponentsBuilder | Test.java:1658:10:1658:11 | in : UriComponentsBuilder | provenance |  |
 | Test.java:1657:52:1657:59 | source(...) : Object | Test.java:1657:30:1657:59 | (...)... : UriComponentsBuilder | provenance |  |
-| Test.java:1658:10:1658:11 | in : UriComponentsBuilder | Test.java:1658:10:1658:30 | port(...) : UriComponentsBuilder | provenance | MaD:47 |
+| Test.java:1658:10:1658:11 | in : UriComponentsBuilder | Test.java:1658:10:1658:30 | port(...) : UriComponentsBuilder | provenance | MaD:48 |
 | Test.java:1658:10:1658:30 | port(...) : UriComponentsBuilder | Test.java:1659:9:1659:11 | out | provenance |  |
 | Test.java:1664:30:1664:59 | (...)... : UriComponentsBuilder | Test.java:1665:10:1665:11 | in : UriComponentsBuilder | provenance |  |
 | Test.java:1664:52:1664:59 | source(...) : Object | Test.java:1664:30:1664:59 | (...)... : UriComponentsBuilder | provenance |  |
-| Test.java:1665:10:1665:11 | in : UriComponentsBuilder | Test.java:1665:10:1665:23 | query(...) : UriComponentsBuilder | provenance | MaD:49 |
+| Test.java:1665:10:1665:11 | in : UriComponentsBuilder | Test.java:1665:10:1665:23 | query(...) : UriComponentsBuilder | provenance | MaD:50 |
 | Test.java:1665:10:1665:23 | query(...) : UriComponentsBuilder | Test.java:1666:9:1666:11 | out | provenance |  |
 | Test.java:1671:16:1671:31 | (...)... : String | Test.java:1673:25:1673:26 | in : String | provenance |  |
 | Test.java:1671:24:1671:31 | source(...) : Object | Test.java:1671:16:1671:31 | (...)... : String | provenance |  |
 | Test.java:1673:10:1673:27 | query(...) : UriComponentsBuilder | Test.java:1674:9:1674:11 | out | provenance |  |
-| Test.java:1673:25:1673:26 | in : String | Test.java:1673:10:1673:27 | query(...) : UriComponentsBuilder | provenance | MaD:50+MaD:49 |
+| Test.java:1673:25:1673:26 | in : String | Test.java:1673:10:1673:27 | query(...) : UriComponentsBuilder | provenance | MaD:49+MaD:50 |
 | Test.java:1679:20:1679:36 | of(...) : List [<element>] : Object | Test.java:1681:44:1681:45 | in : List [<element>] : Object | provenance |  |
 | Test.java:1679:28:1679:35 | source(...) : Object | Test.java:1679:20:1679:36 | of(...) : List [<element>] : Object | provenance | MaD:4 |
 | Test.java:1681:10:1681:46 | queryParam(...) : UriComponentsBuilder | Test.java:1682:9:1682:11 | out | provenance |  |
-| Test.java:1681:44:1681:45 | in : List [<element>] : Object | Test.java:1681:10:1681:46 | queryParam(...) : UriComponentsBuilder | provenance | MaD:53+MaD:51 |
+| Test.java:1681:44:1681:45 | in : List [<element>] : Object | Test.java:1681:10:1681:46 | queryParam(...) : UriComponentsBuilder | provenance | MaD:51+MaD:54 |
 | Test.java:1687:18:1687:39 | {...} : Object[] [[]] : Object | Test.java:1689:44:1689:45 | in : Object[] [[]] : Object | provenance |  |
 | Test.java:1687:31:1687:38 | source(...) : Object | Test.java:1687:18:1687:39 | {...} : Object[] [[]] : Object | provenance |  |
 | Test.java:1689:10:1689:46 | queryParam(...) : UriComponentsBuilder | Test.java:1690:9:1690:11 | out | provenance |  |
-| Test.java:1689:44:1689:45 | in : Object[] [[]] : Object | Test.java:1689:10:1689:46 | queryParam(...) : UriComponentsBuilder | provenance | MaD:54+MaD:51 |
+| Test.java:1689:44:1689:45 | in : Object[] [[]] : Object | Test.java:1689:10:1689:46 | queryParam(...) : UriComponentsBuilder | provenance | MaD:52+MaD:54 |
 | Test.java:1695:30:1695:59 | (...)... : UriComponentsBuilder | Test.java:1696:10:1696:11 | in : UriComponentsBuilder | provenance |  |
 | Test.java:1695:52:1695:59 | source(...) : Object | Test.java:1695:30:1695:59 | (...)... : UriComponentsBuilder | provenance |  |
-| Test.java:1696:10:1696:11 | in : UriComponentsBuilder | Test.java:1696:10:1696:52 | queryParam(...) : UriComponentsBuilder | provenance | MaD:51 |
+| Test.java:1696:10:1696:11 | in : UriComponentsBuilder | Test.java:1696:10:1696:52 | queryParam(...) : UriComponentsBuilder | provenance | MaD:54 |
 | Test.java:1696:10:1696:52 | queryParam(...) : UriComponentsBuilder | Test.java:1697:9:1697:11 | out | provenance |  |
 | Test.java:1702:30:1702:59 | (...)... : UriComponentsBuilder | Test.java:1703:10:1703:11 | in : UriComponentsBuilder | provenance |  |
 | Test.java:1702:52:1702:59 | source(...) : Object | Test.java:1702:30:1702:59 | (...)... : UriComponentsBuilder | provenance |  |
-| Test.java:1703:10:1703:11 | in : UriComponentsBuilder | Test.java:1703:10:1703:54 | queryParam(...) : UriComponentsBuilder | provenance | MaD:51 |
+| Test.java:1703:10:1703:11 | in : UriComponentsBuilder | Test.java:1703:10:1703:54 | queryParam(...) : UriComponentsBuilder | provenance | MaD:54 |
 | Test.java:1703:10:1703:54 | queryParam(...) : UriComponentsBuilder | Test.java:1704:9:1704:11 | out | provenance |  |
 | Test.java:1709:16:1709:31 | (...)... : String | Test.java:1711:30:1711:31 | in : String | provenance |  |
 | Test.java:1709:24:1709:31 | source(...) : Object | Test.java:1709:16:1709:31 | (...)... : String | provenance |  |
 | Test.java:1711:10:1711:48 | queryParam(...) : UriComponentsBuilder | Test.java:1712:9:1712:11 | out | provenance |  |
-| Test.java:1711:30:1711:31 | in : String | Test.java:1711:10:1711:48 | queryParam(...) : UriComponentsBuilder | provenance | MaD:52+MaD:51 |
+| Test.java:1711:30:1711:31 | in : String | Test.java:1711:10:1711:48 | queryParam(...) : UriComponentsBuilder | provenance | MaD:53+MaD:54 |
 | Test.java:1717:16:1717:31 | (...)... : String | Test.java:1719:30:1719:31 | in : String | provenance |  |
 | Test.java:1717:24:1717:31 | source(...) : Object | Test.java:1717:16:1717:31 | (...)... : String | provenance |  |
 | Test.java:1719:10:1719:50 | queryParam(...) : UriComponentsBuilder | Test.java:1720:9:1720:11 | out | provenance |  |
-| Test.java:1719:30:1719:31 | in : String | Test.java:1719:10:1719:50 | queryParam(...) : UriComponentsBuilder | provenance | MaD:52+MaD:51 |
+| Test.java:1719:30:1719:31 | in : String | Test.java:1719:10:1719:50 | queryParam(...) : UriComponentsBuilder | provenance | MaD:53+MaD:54 |
 | Test.java:1725:30:1725:59 | (...)... : UriComponentsBuilder | Test.java:1726:10:1726:11 | in : UriComponentsBuilder | provenance |  |
 | Test.java:1725:52:1725:59 | source(...) : Object | Test.java:1725:30:1725:59 | (...)... : UriComponentsBuilder | provenance |  |
-| Test.java:1726:10:1726:11 | in : UriComponentsBuilder | Test.java:1726:10:1726:43 | queryParamIfPresent(...) : UriComponentsBuilder | provenance | MaD:55 |
+| Test.java:1726:10:1726:11 | in : UriComponentsBuilder | Test.java:1726:10:1726:43 | queryParamIfPresent(...) : UriComponentsBuilder | provenance | MaD:57 |
 | Test.java:1726:10:1726:43 | queryParamIfPresent(...) : UriComponentsBuilder | Test.java:1727:9:1727:11 | out | provenance |  |
 | Test.java:1732:16:1732:31 | (...)... : String | Test.java:1734:39:1734:40 | in : String | provenance |  |
 | Test.java:1732:24:1732:31 | source(...) : Object | Test.java:1732:16:1732:31 | (...)... : String | provenance |  |
 | Test.java:1734:10:1734:47 | queryParamIfPresent(...) : UriComponentsBuilder | Test.java:1735:9:1735:11 | out | provenance |  |
-| Test.java:1734:39:1734:40 | in : String | Test.java:1734:10:1734:47 | queryParamIfPresent(...) : UriComponentsBuilder | provenance | MaD:56+MaD:55 |
+| Test.java:1734:39:1734:40 | in : String | Test.java:1734:10:1734:47 | queryParamIfPresent(...) : UriComponentsBuilder | provenance | MaD:55+MaD:57 |
 | Test.java:1740:18:1740:38 | of(...) : Optional [<element>] : Object | Test.java:1742:45:1742:46 | in : Optional [<element>] : Object | provenance |  |
 | Test.java:1740:30:1740:37 | source(...) : Object | Test.java:1740:18:1740:38 | of(...) : Optional [<element>] : Object | provenance | MaD:10 |
 | Test.java:1742:10:1742:47 | queryParamIfPresent(...) : UriComponentsBuilder | Test.java:1743:9:1743:11 | out | provenance |  |
-| Test.java:1742:45:1742:46 | in : Optional [<element>] : Object | Test.java:1742:10:1742:47 | queryParamIfPresent(...) : UriComponentsBuilder | provenance | MaD:57+MaD:55 |
+| Test.java:1742:45:1742:46 | in : Optional [<element>] : Object | Test.java:1742:10:1742:47 | queryParamIfPresent(...) : UriComponentsBuilder | provenance | MaD:56+MaD:57 |
 | Test.java:1748:30:1748:59 | (...)... : UriComponentsBuilder | Test.java:1749:10:1749:11 | in : UriComponentsBuilder | provenance |  |
 | Test.java:1748:52:1748:59 | source(...) : Object | Test.java:1748:30:1748:59 | (...)... : UriComponentsBuilder | provenance |  |
-| Test.java:1749:10:1749:11 | in : UriComponentsBuilder | Test.java:1749:10:1749:29 | queryParams(...) : UriComponentsBuilder | provenance | MaD:58 |
+| Test.java:1749:10:1749:11 | in : UriComponentsBuilder | Test.java:1749:10:1749:29 | queryParams(...) : UriComponentsBuilder | provenance | MaD:60 |
 | Test.java:1749:10:1749:29 | queryParams(...) : UriComponentsBuilder | Test.java:1750:9:1750:11 | out | provenance |  |
 | Test.java:1755:23:1755:55 | newMultiValueMapWithKey(...) : LinkedMultiValueMap [<map.key>] : Object | Test.java:1757:31:1757:32 | in : LinkedMultiValueMap [<map.key>] : Object | provenance |  |
 | Test.java:1755:47:1755:54 | source(...) : Object | Test.java:54:40:54:53 | element : Object | provenance |  |
-| Test.java:1755:47:1755:54 | source(...) : Object | Test.java:1755:23:1755:55 | newMultiValueMapWithKey(...) : LinkedMultiValueMap [<map.key>] : Object | provenance | MaD:7 |
+| Test.java:1755:47:1755:54 | source(...) : Object | Test.java:1755:23:1755:55 | newMultiValueMapWithKey(...) : LinkedMultiValueMap [<map.key>] : Object | provenance | MaD:5 |
 | Test.java:1757:10:1757:33 | queryParams(...) : UriComponentsBuilder | Test.java:1758:9:1758:11 | out | provenance |  |
-| Test.java:1757:31:1757:32 | in : LinkedMultiValueMap [<map.key>] : Object | Test.java:1757:10:1757:33 | queryParams(...) : UriComponentsBuilder | provenance | MaD:59+MaD:58 |
+| Test.java:1757:31:1757:32 | in : LinkedMultiValueMap [<map.key>] : Object | Test.java:1757:10:1757:33 | queryParams(...) : UriComponentsBuilder | provenance | MaD:58+MaD:60 |
 | Test.java:1763:23:1763:57 | newMultiValueMapWithValue(...) : LinkedMultiValueMap [<map.value>] : Object | Test.java:1765:31:1765:32 | in : LinkedMultiValueMap [<map.value>] : Object | provenance |  |
 | Test.java:1763:49:1763:56 | source(...) : Object | Test.java:55:42:55:55 | element : Object | provenance |  |
 | Test.java:1763:49:1763:56 | source(...) : Object | Test.java:1763:23:1763:57 | newMultiValueMapWithValue(...) : LinkedMultiValueMap [<map.value>] : Object | provenance | MaD:9 |
 | Test.java:1765:10:1765:33 | queryParams(...) : UriComponentsBuilder | Test.java:1766:9:1766:11 | out | provenance |  |
-| Test.java:1765:31:1765:32 | in : LinkedMultiValueMap [<map.value>] : Object | Test.java:1765:10:1765:33 | queryParams(...) : UriComponentsBuilder | provenance | MaD:60+MaD:58 |
+| Test.java:1765:31:1765:32 | in : LinkedMultiValueMap [<map.value>] : Object | Test.java:1765:10:1765:33 | queryParams(...) : UriComponentsBuilder | provenance | MaD:59+MaD:60 |
 | Test.java:1771:30:1771:59 | (...)... : UriComponentsBuilder | Test.java:1772:10:1772:11 | in : UriComponentsBuilder | provenance |  |
 | Test.java:1771:52:1771:59 | source(...) : Object | Test.java:1771:30:1771:59 | (...)... : UriComponentsBuilder | provenance |  |
-| Test.java:1772:10:1772:11 | in : UriComponentsBuilder | Test.java:1772:10:1772:29 | replacePath(...) : UriComponentsBuilder | provenance | MaD:61 |
+| Test.java:1772:10:1772:11 | in : UriComponentsBuilder | Test.java:1772:10:1772:29 | replacePath(...) : UriComponentsBuilder | provenance | MaD:62 |
 | Test.java:1772:10:1772:29 | replacePath(...) : UriComponentsBuilder | Test.java:1773:9:1773:11 | out | provenance |  |
 | Test.java:1778:16:1778:31 | (...)... : String | Test.java:1780:31:1780:32 | in : String | provenance |  |
 | Test.java:1778:24:1778:31 | source(...) : Object | Test.java:1778:16:1778:31 | (...)... : String | provenance |  |
 | Test.java:1780:10:1780:33 | replacePath(...) : UriComponentsBuilder | Test.java:1781:9:1781:11 | out | provenance |  |
-| Test.java:1780:31:1780:32 | in : String | Test.java:1780:10:1780:33 | replacePath(...) : UriComponentsBuilder | provenance | MaD:62+MaD:61 |
+| Test.java:1780:31:1780:32 | in : String | Test.java:1780:10:1780:33 | replacePath(...) : UriComponentsBuilder | provenance | MaD:61+MaD:62 |
 | Test.java:1786:30:1786:59 | (...)... : UriComponentsBuilder | Test.java:1787:10:1787:11 | in : UriComponentsBuilder | provenance |  |
 | Test.java:1786:52:1786:59 | source(...) : Object | Test.java:1786:30:1786:59 | (...)... : UriComponentsBuilder | provenance |  |
-| Test.java:1787:10:1787:11 | in : UriComponentsBuilder | Test.java:1787:10:1787:30 | replaceQuery(...) : UriComponentsBuilder | provenance | MaD:63 |
+| Test.java:1787:10:1787:11 | in : UriComponentsBuilder | Test.java:1787:10:1787:30 | replaceQuery(...) : UriComponentsBuilder | provenance | MaD:64 |
 | Test.java:1787:10:1787:30 | replaceQuery(...) : UriComponentsBuilder | Test.java:1788:9:1788:11 | out | provenance |  |
 | Test.java:1793:16:1793:31 | (...)... : String | Test.java:1795:32:1795:33 | in : String | provenance |  |
 | Test.java:1793:24:1793:31 | source(...) : Object | Test.java:1793:16:1793:31 | (...)... : String | provenance |  |
 | Test.java:1795:10:1795:34 | replaceQuery(...) : UriComponentsBuilder | Test.java:1796:9:1796:11 | out | provenance |  |
-| Test.java:1795:32:1795:33 | in : String | Test.java:1795:10:1795:34 | replaceQuery(...) : UriComponentsBuilder | provenance | MaD:64+MaD:63 |
+| Test.java:1795:32:1795:33 | in : String | Test.java:1795:10:1795:34 | replaceQuery(...) : UriComponentsBuilder | provenance | MaD:63+MaD:64 |
 | Test.java:1801:20:1801:36 | of(...) : List [<element>] : Object | Test.java:1803:51:1803:52 | in : List [<element>] : Object | provenance |  |
 | Test.java:1801:28:1801:35 | source(...) : Object | Test.java:1801:20:1801:36 | of(...) : List [<element>] : Object | provenance | MaD:4 |
 | Test.java:1803:10:1803:53 | replaceQueryParam(...) : UriComponentsBuilder | Test.java:1804:9:1804:11 | out | provenance |  |
-| Test.java:1803:51:1803:52 | in : List [<element>] : Object | Test.java:1803:10:1803:53 | replaceQueryParam(...) : UriComponentsBuilder | provenance | MaD:67+MaD:65 |
+| Test.java:1803:51:1803:52 | in : List [<element>] : Object | Test.java:1803:10:1803:53 | replaceQueryParam(...) : UriComponentsBuilder | provenance | MaD:65+MaD:68 |
 | Test.java:1809:18:1809:39 | {...} : Object[] [[]] : Object | Test.java:1811:51:1811:52 | in : Object[] [[]] : Object | provenance |  |
 | Test.java:1809:31:1809:38 | source(...) : Object | Test.java:1809:18:1809:39 | {...} : Object[] [[]] : Object | provenance |  |
 | Test.java:1811:10:1811:53 | replaceQueryParam(...) : UriComponentsBuilder | Test.java:1812:9:1812:11 | out | provenance |  |
-| Test.java:1811:51:1811:52 | in : Object[] [[]] : Object | Test.java:1811:10:1811:53 | replaceQueryParam(...) : UriComponentsBuilder | provenance | MaD:68+MaD:65 |
+| Test.java:1811:51:1811:52 | in : Object[] [[]] : Object | Test.java:1811:10:1811:53 | replaceQueryParam(...) : UriComponentsBuilder | provenance | MaD:66+MaD:68 |
 | Test.java:1817:30:1817:59 | (...)... : UriComponentsBuilder | Test.java:1818:10:1818:11 | in : UriComponentsBuilder | provenance |  |
 | Test.java:1817:52:1817:59 | source(...) : Object | Test.java:1817:30:1817:59 | (...)... : UriComponentsBuilder | provenance |  |
-| Test.java:1818:10:1818:11 | in : UriComponentsBuilder | Test.java:1818:10:1818:59 | replaceQueryParam(...) : UriComponentsBuilder | provenance | MaD:65 |
+| Test.java:1818:10:1818:11 | in : UriComponentsBuilder | Test.java:1818:10:1818:59 | replaceQueryParam(...) : UriComponentsBuilder | provenance | MaD:68 |
 | Test.java:1818:10:1818:59 | replaceQueryParam(...) : UriComponentsBuilder | Test.java:1819:9:1819:11 | out | provenance |  |
 | Test.java:1824:30:1824:59 | (...)... : UriComponentsBuilder | Test.java:1825:10:1825:11 | in : UriComponentsBuilder | provenance |  |
 | Test.java:1824:52:1824:59 | source(...) : Object | Test.java:1824:30:1824:59 | (...)... : UriComponentsBuilder | provenance |  |
-| Test.java:1825:10:1825:11 | in : UriComponentsBuilder | Test.java:1825:10:1825:61 | replaceQueryParam(...) : UriComponentsBuilder | provenance | MaD:65 |
+| Test.java:1825:10:1825:11 | in : UriComponentsBuilder | Test.java:1825:10:1825:61 | replaceQueryParam(...) : UriComponentsBuilder | provenance | MaD:68 |
 | Test.java:1825:10:1825:61 | replaceQueryParam(...) : UriComponentsBuilder | Test.java:1826:9:1826:11 | out | provenance |  |
 | Test.java:1831:16:1831:31 | (...)... : String | Test.java:1833:37:1833:38 | in : String | provenance |  |
 | Test.java:1831:24:1831:31 | source(...) : Object | Test.java:1831:16:1831:31 | (...)... : String | provenance |  |
 | Test.java:1833:10:1833:55 | replaceQueryParam(...) : UriComponentsBuilder | Test.java:1834:9:1834:11 | out | provenance |  |
-| Test.java:1833:37:1833:38 | in : String | Test.java:1833:10:1833:55 | replaceQueryParam(...) : UriComponentsBuilder | provenance | MaD:66+MaD:65 |
+| Test.java:1833:37:1833:38 | in : String | Test.java:1833:10:1833:55 | replaceQueryParam(...) : UriComponentsBuilder | provenance | MaD:67+MaD:68 |
 | Test.java:1839:16:1839:31 | (...)... : String | Test.java:1841:37:1841:38 | in : String | provenance |  |
 | Test.java:1839:24:1839:31 | source(...) : Object | Test.java:1839:16:1839:31 | (...)... : String | provenance |  |
 | Test.java:1841:10:1841:57 | replaceQueryParam(...) : UriComponentsBuilder | Test.java:1842:9:1842:11 | out | provenance |  |
-| Test.java:1841:37:1841:38 | in : String | Test.java:1841:10:1841:57 | replaceQueryParam(...) : UriComponentsBuilder | provenance | MaD:66+MaD:65 |
+| Test.java:1841:37:1841:38 | in : String | Test.java:1841:10:1841:57 | replaceQueryParam(...) : UriComponentsBuilder | provenance | MaD:67+MaD:68 |
 | Test.java:1847:30:1847:59 | (...)... : UriComponentsBuilder | Test.java:1848:10:1848:11 | in : UriComponentsBuilder | provenance |  |
 | Test.java:1847:52:1847:59 | source(...) : Object | Test.java:1847:30:1847:59 | (...)... : UriComponentsBuilder | provenance |  |
-| Test.java:1848:10:1848:11 | in : UriComponentsBuilder | Test.java:1848:10:1848:36 | replaceQueryParams(...) : UriComponentsBuilder | provenance | MaD:69 |
+| Test.java:1848:10:1848:11 | in : UriComponentsBuilder | Test.java:1848:10:1848:36 | replaceQueryParams(...) : UriComponentsBuilder | provenance | MaD:71 |
 | Test.java:1848:10:1848:36 | replaceQueryParams(...) : UriComponentsBuilder | Test.java:1849:9:1849:11 | out | provenance |  |
 | Test.java:1854:23:1854:55 | newMultiValueMapWithKey(...) : LinkedMultiValueMap [<map.key>] : Object | Test.java:1856:38:1856:39 | in : LinkedMultiValueMap [<map.key>] : Object | provenance |  |
 | Test.java:1854:47:1854:54 | source(...) : Object | Test.java:54:40:54:53 | element : Object | provenance |  |
-| Test.java:1854:47:1854:54 | source(...) : Object | Test.java:1854:23:1854:55 | newMultiValueMapWithKey(...) : LinkedMultiValueMap [<map.key>] : Object | provenance | MaD:7 |
+| Test.java:1854:47:1854:54 | source(...) : Object | Test.java:1854:23:1854:55 | newMultiValueMapWithKey(...) : LinkedMultiValueMap [<map.key>] : Object | provenance | MaD:5 |
 | Test.java:1856:10:1856:40 | replaceQueryParams(...) : UriComponentsBuilder | Test.java:1857:9:1857:11 | out | provenance |  |
-| Test.java:1856:38:1856:39 | in : LinkedMultiValueMap [<map.key>] : Object | Test.java:1856:10:1856:40 | replaceQueryParams(...) : UriComponentsBuilder | provenance | MaD:70+MaD:69 |
+| Test.java:1856:38:1856:39 | in : LinkedMultiValueMap [<map.key>] : Object | Test.java:1856:10:1856:40 | replaceQueryParams(...) : UriComponentsBuilder | provenance | MaD:69+MaD:71 |
 | Test.java:1862:23:1862:57 | newMultiValueMapWithValue(...) : LinkedMultiValueMap [<map.value>] : Object | Test.java:1864:38:1864:39 | in : LinkedMultiValueMap [<map.value>] : Object | provenance |  |
 | Test.java:1862:49:1862:56 | source(...) : Object | Test.java:55:42:55:55 | element : Object | provenance |  |
 | Test.java:1862:49:1862:56 | source(...) : Object | Test.java:1862:23:1862:57 | newMultiValueMapWithValue(...) : LinkedMultiValueMap [<map.value>] : Object | provenance | MaD:9 |
 | Test.java:1864:10:1864:40 | replaceQueryParams(...) : UriComponentsBuilder | Test.java:1865:9:1865:11 | out | provenance |  |
-| Test.java:1864:38:1864:39 | in : LinkedMultiValueMap [<map.value>] : Object | Test.java:1864:10:1864:40 | replaceQueryParams(...) : UriComponentsBuilder | provenance | MaD:71+MaD:69 |
+| Test.java:1864:38:1864:39 | in : LinkedMultiValueMap [<map.value>] : Object | Test.java:1864:10:1864:40 | replaceQueryParams(...) : UriComponentsBuilder | provenance | MaD:70+MaD:71 |
 | Test.java:1870:30:1870:59 | (...)... : UriComponentsBuilder | Test.java:1871:10:1871:11 | in : UriComponentsBuilder | provenance |  |
 | Test.java:1870:52:1870:59 | source(...) : Object | Test.java:1870:30:1870:59 | (...)... : UriComponentsBuilder | provenance |  |
-| Test.java:1871:10:1871:11 | in : UriComponentsBuilder | Test.java:1871:10:1871:24 | scheme(...) : UriComponentsBuilder | provenance | MaD:72 |
+| Test.java:1871:10:1871:11 | in : UriComponentsBuilder | Test.java:1871:10:1871:24 | scheme(...) : UriComponentsBuilder | provenance | MaD:73 |
 | Test.java:1871:10:1871:24 | scheme(...) : UriComponentsBuilder | Test.java:1872:9:1872:11 | out | provenance |  |
 | Test.java:1877:16:1877:31 | (...)... : String | Test.java:1879:26:1879:27 | in : String | provenance |  |
 | Test.java:1877:24:1877:31 | source(...) : Object | Test.java:1877:16:1877:31 | (...)... : String | provenance |  |
 | Test.java:1879:10:1879:28 | scheme(...) : UriComponentsBuilder | Test.java:1880:9:1880:11 | out | provenance |  |
-| Test.java:1879:26:1879:27 | in : String | Test.java:1879:10:1879:28 | scheme(...) : UriComponentsBuilder | provenance | MaD:73+MaD:72 |
+| Test.java:1879:26:1879:27 | in : String | Test.java:1879:10:1879:28 | scheme(...) : UriComponentsBuilder | provenance | MaD:72+MaD:73 |
 | Test.java:1885:30:1885:59 | (...)... : UriComponentsBuilder | Test.java:1886:10:1886:11 | in : UriComponentsBuilder | provenance |  |
 | Test.java:1885:52:1885:59 | source(...) : Object | Test.java:1885:30:1885:59 | (...)... : UriComponentsBuilder | provenance |  |
-| Test.java:1886:10:1886:11 | in : UriComponentsBuilder | Test.java:1886:10:1886:36 | schemeSpecificPart(...) : UriComponentsBuilder | provenance | MaD:110 |
+| Test.java:1886:10:1886:11 | in : UriComponentsBuilder | Test.java:1886:10:1886:36 | schemeSpecificPart(...) : UriComponentsBuilder | provenance | MaD:111 |
 | Test.java:1886:10:1886:36 | schemeSpecificPart(...) : UriComponentsBuilder | Test.java:1887:9:1887:11 | out | provenance |  |
 | Test.java:1892:16:1892:31 | (...)... : String | Test.java:1894:38:1894:39 | in : String | provenance |  |
 | Test.java:1892:24:1892:31 | source(...) : Object | Test.java:1892:16:1892:31 | (...)... : String | provenance |  |
 | Test.java:1894:10:1894:40 | schemeSpecificPart(...) : UriComponentsBuilder | Test.java:1895:9:1895:11 | out | provenance |  |
-| Test.java:1894:38:1894:39 | in : String | Test.java:1894:10:1894:40 | schemeSpecificPart(...) : UriComponentsBuilder | provenance | MaD:111+MaD:110 |
+| Test.java:1894:38:1894:39 | in : String | Test.java:1894:10:1894:40 | schemeSpecificPart(...) : UriComponentsBuilder | provenance | MaD:110+MaD:111 |
 | Test.java:1900:30:1900:59 | (...)... : UriComponentsBuilder | Test.java:1901:10:1901:11 | in : UriComponentsBuilder | provenance |  |
 | Test.java:1900:52:1900:59 | source(...) : Object | Test.java:1900:30:1900:59 | (...)... : UriComponentsBuilder | provenance |  |
 | Test.java:1901:10:1901:11 | in : UriComponentsBuilder | Test.java:1901:10:1901:25 | toUriString(...) : String | provenance | MaD:112 |
 | Test.java:1901:10:1901:25 | toUriString(...) : String | Test.java:1902:9:1902:11 | out | provenance |  |
 | Test.java:1907:30:1907:59 | (...)... : UriComponentsBuilder | Test.java:1908:10:1908:11 | in : UriComponentsBuilder | provenance |  |
 | Test.java:1907:52:1907:59 | source(...) : Object | Test.java:1907:30:1907:59 | (...)... : UriComponentsBuilder | provenance |  |
-| Test.java:1908:10:1908:11 | in : UriComponentsBuilder | Test.java:1908:10:1908:21 | uri(...) : UriComponentsBuilder | provenance | MaD:113 |
+| Test.java:1908:10:1908:11 | in : UriComponentsBuilder | Test.java:1908:10:1908:21 | uri(...) : UriComponentsBuilder | provenance | MaD:114 |
 | Test.java:1908:10:1908:21 | uri(...) : UriComponentsBuilder | Test.java:1909:9:1909:11 | out | provenance |  |
 | Test.java:1914:13:1914:25 | (...)... : URI | Test.java:1916:23:1916:24 | in : URI | provenance |  |
 | Test.java:1914:18:1914:25 | source(...) : Object | Test.java:1914:13:1914:25 | (...)... : URI | provenance |  |
 | Test.java:1916:10:1916:25 | uri(...) : UriComponentsBuilder | Test.java:1917:9:1917:11 | out | provenance |  |
-| Test.java:1916:23:1916:24 | in : URI | Test.java:1916:10:1916:25 | uri(...) : UriComponentsBuilder | provenance | MaD:114+MaD:113 |
+| Test.java:1916:23:1916:24 | in : URI | Test.java:1916:10:1916:25 | uri(...) : UriComponentsBuilder | provenance | MaD:113+MaD:114 |
 | Test.java:1922:30:1922:59 | (...)... : UriComponentsBuilder | Test.java:1923:10:1923:11 | in : UriComponentsBuilder | provenance |  |
 | Test.java:1922:52:1922:59 | source(...) : Object | Test.java:1922:30:1922:59 | (...)... : UriComponentsBuilder | provenance |  |
-| Test.java:1923:10:1923:11 | in : UriComponentsBuilder | Test.java:1923:10:1923:31 | uriComponents(...) : UriComponentsBuilder | provenance | MaD:115 |
+| Test.java:1923:10:1923:11 | in : UriComponentsBuilder | Test.java:1923:10:1923:31 | uriComponents(...) : UriComponentsBuilder | provenance | MaD:116 |
 | Test.java:1923:10:1923:31 | uriComponents(...) : UriComponentsBuilder | Test.java:1924:9:1924:11 | out | provenance |  |
 | Test.java:1929:23:1929:45 | (...)... : UriComponents | Test.java:1931:33:1931:34 | in : UriComponents | provenance |  |
 | Test.java:1929:38:1929:45 | source(...) : Object | Test.java:1929:23:1929:45 | (...)... : UriComponents | provenance |  |
 | Test.java:1931:10:1931:35 | uriComponents(...) : UriComponentsBuilder | Test.java:1932:9:1932:11 | out | provenance |  |
-| Test.java:1931:33:1931:34 | in : UriComponents | Test.java:1931:10:1931:35 | uriComponents(...) : UriComponentsBuilder | provenance | MaD:116+MaD:115 |
+| Test.java:1931:33:1931:34 | in : UriComponents | Test.java:1931:10:1931:35 | uriComponents(...) : UriComponentsBuilder | provenance | MaD:115+MaD:116 |
 | Test.java:1937:30:1937:59 | (...)... : UriComponentsBuilder | Test.java:1938:10:1938:11 | in : UriComponentsBuilder | provenance |  |
 | Test.java:1937:52:1937:59 | source(...) : Object | Test.java:1937:30:1937:59 | (...)... : UriComponentsBuilder | provenance |  |
-| Test.java:1938:10:1938:11 | in : UriComponentsBuilder | Test.java:1938:10:1938:30 | uriVariables(...) : UriComponentsBuilder | provenance | MaD:117 |
+| Test.java:1938:10:1938:11 | in : UriComponentsBuilder | Test.java:1938:10:1938:30 | uriVariables(...) : UriComponentsBuilder | provenance | MaD:118 |
 | Test.java:1938:10:1938:30 | uriVariables(...) : UriComponentsBuilder | Test.java:1939:9:1939:11 | out | provenance |  |
 | Test.java:1944:13:1944:37 | newMapWithValue(...) : Map [<map.value>] : Object | Test.java:1946:32:1946:33 | in : Map [<map.value>] : Object | provenance |  |
 | Test.java:1944:29:1944:36 | source(...) : Object | Test.java:53:22:53:35 | element : Object | provenance |  |
-| Test.java:1944:29:1944:36 | source(...) : Object | Test.java:1944:13:1944:37 | newMapWithValue(...) : Map [<map.value>] : Object | provenance | MaD:8 |
+| Test.java:1944:29:1944:36 | source(...) : Object | Test.java:1944:13:1944:37 | newMapWithValue(...) : Map [<map.value>] : Object | provenance | MaD:6 |
 | Test.java:1946:10:1946:34 | uriVariables(...) : UriComponentsBuilder | Test.java:1947:9:1947:11 | out | provenance |  |
-| Test.java:1946:32:1946:33 | in : Map [<map.value>] : Object | Test.java:1946:10:1946:34 | uriVariables(...) : UriComponentsBuilder | provenance | MaD:118+MaD:117 |
+| Test.java:1946:32:1946:33 | in : Map [<map.value>] : Object | Test.java:1946:10:1946:34 | uriVariables(...) : UriComponentsBuilder | provenance | MaD:117+MaD:118 |
 | Test.java:1952:30:1952:59 | (...)... : UriComponentsBuilder | Test.java:1953:10:1953:11 | in : UriComponentsBuilder | provenance |  |
 | Test.java:1952:52:1952:59 | source(...) : Object | Test.java:1952:30:1952:59 | (...)... : UriComponentsBuilder | provenance |  |
-| Test.java:1953:10:1953:11 | in : UriComponentsBuilder | Test.java:1953:10:1953:26 | userInfo(...) : UriComponentsBuilder | provenance | MaD:74 |
+| Test.java:1953:10:1953:11 | in : UriComponentsBuilder | Test.java:1953:10:1953:26 | userInfo(...) : UriComponentsBuilder | provenance | MaD:75 |
 | Test.java:1953:10:1953:26 | userInfo(...) : UriComponentsBuilder | Test.java:1954:9:1954:11 | out | provenance |  |
 | Test.java:1959:16:1959:31 | (...)... : String | Test.java:1961:28:1961:29 | in : String | provenance |  |
 | Test.java:1959:24:1959:31 | source(...) : Object | Test.java:1959:16:1959:31 | (...)... : String | provenance |  |
 | Test.java:1961:10:1961:30 | userInfo(...) : UriComponentsBuilder | Test.java:1962:9:1962:11 | out | provenance |  |
-| Test.java:1961:28:1961:29 | in : String | Test.java:1961:10:1961:30 | userInfo(...) : UriComponentsBuilder | provenance | MaD:75+MaD:74 |
+| Test.java:1961:28:1961:29 | in : String | Test.java:1961:10:1961:30 | userInfo(...) : UriComponentsBuilder | provenance | MaD:74+MaD:75 |
 | Test.java:1967:13:1967:37 | newMapWithValue(...) : Map [<map.value>] : Object | Test.java:1969:26:1969:27 | in : Map [<map.value>] : Object | provenance |  |
 | Test.java:1967:29:1967:36 | source(...) : Object | Test.java:53:22:53:35 | element : Object | provenance |  |
-| Test.java:1967:29:1967:36 | source(...) : Object | Test.java:1967:13:1967:37 | newMapWithValue(...) : Map [<map.value>] : Object | provenance | MaD:8 |
+| Test.java:1967:29:1967:36 | source(...) : Object | Test.java:1967:13:1967:37 | newMapWithValue(...) : Map [<map.value>] : Object | provenance | MaD:6 |
 | Test.java:1969:10:1969:28 | expand(...) : URI | Test.java:1970:9:1970:11 | out | provenance |  |
 | Test.java:1969:26:1969:27 | in : Map [<map.value>] : Object | Test.java:1969:10:1969:28 | expand(...) : URI | provenance | MaD:119 |
 | Test.java:1975:18:1975:39 | {...} : Object[] [[]] : Object | Test.java:1977:26:1977:27 | in : Object[] [[]] : Object | provenance |  |
@@ -1295,81 +1295,81 @@ edges
 | Test.java:1992:10:1992:27 | match(...) : Map [<map.value>] : Object | Test.java:1993:21:1993:23 | out : Map [<map.value>] : Object | provenance |  |
 | Test.java:1992:25:1992:26 | in : String | Test.java:1992:10:1992:27 | match(...) : Map [<map.value>] : Object | provenance | MaD:122 |
 | Test.java:1993:21:1993:23 | out : Map [<map.value>] : Object | Test.java:51:20:51:29 | m : Map [<map.value>] : Object | provenance |  |
-| Test.java:1993:21:1993:23 | out : Map [<map.value>] : Object | Test.java:1993:9:1993:24 | getMapValue(...) | provenance | MaD:5 |
+| Test.java:1993:21:1993:23 | out : Map [<map.value>] : Object | Test.java:1993:9:1993:24 | getMapValue(...) | provenance | MaD:7 |
 | Test.java:1998:13:1998:37 | newMapWithValue(...) : Map [<map.value>] : Object | Test.java:2000:40:2000:41 | in : Map [<map.value>] : Object | provenance |  |
 | Test.java:1998:29:1998:36 | source(...) : Object | Test.java:53:22:53:35 | element : Object | provenance |  |
-| Test.java:1998:29:1998:36 | source(...) : Object | Test.java:1998:13:1998:37 | newMapWithValue(...) : Map [<map.value>] : Object | provenance | MaD:8 |
+| Test.java:1998:29:1998:36 | source(...) : Object | Test.java:1998:13:1998:37 | newMapWithValue(...) : Map [<map.value>] : Object | provenance | MaD:6 |
 | Test.java:2000:10:2000:42 | expand(...) : URI | Test.java:2001:9:2001:11 | out | provenance |  |
-| Test.java:2000:40:2000:41 | in : Map [<map.value>] : Object | Test.java:2000:10:2000:42 | expand(...) : URI | provenance | MaD:126 |
+| Test.java:2000:40:2000:41 | in : Map [<map.value>] : Object | Test.java:2000:10:2000:42 | expand(...) : URI | provenance | MaD:124 |
 | Test.java:2006:13:2006:37 | newMapWithValue(...) : Map [<map.value>] : Object | Test.java:2008:40:2008:41 | in : Map [<map.value>] : Object | provenance |  |
 | Test.java:2006:29:2006:36 | source(...) : Object | Test.java:53:22:53:35 | element : Object | provenance |  |
-| Test.java:2006:29:2006:36 | source(...) : Object | Test.java:2006:13:2006:37 | newMapWithValue(...) : Map [<map.value>] : Object | provenance | MaD:8 |
+| Test.java:2006:29:2006:36 | source(...) : Object | Test.java:2006:13:2006:37 | newMapWithValue(...) : Map [<map.value>] : Object | provenance | MaD:6 |
 | Test.java:2008:10:2008:42 | expand(...) : URI | Test.java:2009:9:2009:11 | out | provenance |  |
-| Test.java:2008:40:2008:41 | in : Map [<map.value>] : Object | Test.java:2008:10:2008:42 | expand(...) : URI | provenance | MaD:126 |
+| Test.java:2008:40:2008:41 | in : Map [<map.value>] : Object | Test.java:2008:10:2008:42 | expand(...) : URI | provenance | MaD:124 |
 | Test.java:2014:13:2014:37 | newMapWithValue(...) : Map [<map.value>] : Object | Test.java:2016:40:2016:41 | in : Map [<map.value>] : Object | provenance |  |
 | Test.java:2014:29:2014:36 | source(...) : Object | Test.java:53:22:53:35 | element : Object | provenance |  |
-| Test.java:2014:29:2014:36 | source(...) : Object | Test.java:2014:13:2014:37 | newMapWithValue(...) : Map [<map.value>] : Object | provenance | MaD:8 |
+| Test.java:2014:29:2014:36 | source(...) : Object | Test.java:2014:13:2014:37 | newMapWithValue(...) : Map [<map.value>] : Object | provenance | MaD:6 |
 | Test.java:2016:10:2016:42 | expand(...) : URI | Test.java:2017:9:2017:11 | out | provenance |  |
-| Test.java:2016:40:2016:41 | in : Map [<map.value>] : Object | Test.java:2016:10:2016:42 | expand(...) : URI | provenance | MaD:126 |
+| Test.java:2016:40:2016:41 | in : Map [<map.value>] : Object | Test.java:2016:10:2016:42 | expand(...) : URI | provenance | MaD:124 |
 | Test.java:2022:18:2022:39 | {...} : Object[] [[]] : Object | Test.java:2024:40:2024:41 | in : Object[] [[]] : Object | provenance |  |
 | Test.java:2022:31:2022:38 | source(...) : Object | Test.java:2022:18:2022:39 | {...} : Object[] [[]] : Object | provenance |  |
 | Test.java:2024:10:2024:42 | expand(...) : URI | Test.java:2025:9:2025:11 | out | provenance |  |
-| Test.java:2024:40:2024:41 | in : Object[] [[]] : Object | Test.java:2024:10:2024:42 | expand(...) : URI | provenance | MaD:127 |
+| Test.java:2024:40:2024:41 | in : Object[] [[]] : Object | Test.java:2024:10:2024:42 | expand(...) : URI | provenance | MaD:125 |
 | Test.java:2030:18:2030:39 | {...} : Object[] [[]] : Object | Test.java:2032:40:2032:41 | in : Object[] [[]] : Object | provenance |  |
 | Test.java:2030:31:2030:38 | source(...) : Object | Test.java:2030:18:2030:39 | {...} : Object[] [[]] : Object | provenance |  |
 | Test.java:2032:10:2032:42 | expand(...) : URI | Test.java:2033:9:2033:11 | out | provenance |  |
-| Test.java:2032:40:2032:41 | in : Object[] [[]] : Object | Test.java:2032:10:2032:42 | expand(...) : URI | provenance | MaD:127 |
+| Test.java:2032:40:2032:41 | in : Object[] [[]] : Object | Test.java:2032:10:2032:42 | expand(...) : URI | provenance | MaD:125 |
 | Test.java:2038:18:2038:39 | {...} : Object[] [[]] : Object | Test.java:2040:40:2040:41 | in : Object[] [[]] : Object | provenance |  |
 | Test.java:2038:31:2038:38 | source(...) : Object | Test.java:2038:18:2038:39 | {...} : Object[] [[]] : Object | provenance |  |
 | Test.java:2040:10:2040:42 | expand(...) : URI | Test.java:2041:9:2041:11 | out | provenance |  |
-| Test.java:2040:40:2040:41 | in : Object[] [[]] : Object | Test.java:2040:10:2040:42 | expand(...) : URI | provenance | MaD:127 |
+| Test.java:2040:40:2040:41 | in : Object[] [[]] : Object | Test.java:2040:10:2040:42 | expand(...) : URI | provenance | MaD:125 |
 | Test.java:2046:28:2046:55 | (...)... : UriTemplateHandler | Test.java:2047:10:2047:11 | in : UriTemplateHandler | provenance |  |
 | Test.java:2046:48:2046:55 | source(...) : Object | Test.java:2046:28:2046:55 | (...)... : UriTemplateHandler | provenance |  |
-| Test.java:2047:10:2047:11 | in : UriTemplateHandler | Test.java:2047:10:2047:48 | expand(...) : URI | provenance | MaD:124 |
+| Test.java:2047:10:2047:11 | in : UriTemplateHandler | Test.java:2047:10:2047:48 | expand(...) : URI | provenance | MaD:127 |
 | Test.java:2047:10:2047:48 | expand(...) : URI | Test.java:2048:9:2048:11 | out | provenance |  |
 | Test.java:2053:28:2053:55 | (...)... : UriTemplateHandler | Test.java:2054:10:2054:11 | in : UriTemplateHandler | provenance |  |
 | Test.java:2053:48:2053:55 | source(...) : Object | Test.java:2053:28:2053:55 | (...)... : UriTemplateHandler | provenance |  |
-| Test.java:2054:10:2054:11 | in : UriTemplateHandler | Test.java:2054:10:2054:43 | expand(...) : URI | provenance | MaD:124 |
+| Test.java:2054:10:2054:11 | in : UriTemplateHandler | Test.java:2054:10:2054:43 | expand(...) : URI | provenance | MaD:127 |
 | Test.java:2054:10:2054:43 | expand(...) : URI | Test.java:2055:9:2055:11 | out | provenance |  |
 | Test.java:2060:16:2060:31 | (...)... : String | Test.java:2062:26:2062:27 | in : String | provenance |  |
 | Test.java:2060:24:2060:31 | source(...) : Object | Test.java:2060:16:2060:31 | (...)... : String | provenance |  |
 | Test.java:2062:10:2062:44 | expand(...) : URI | Test.java:2063:9:2063:11 | out | provenance |  |
-| Test.java:2062:26:2062:27 | in : String | Test.java:2062:10:2062:44 | expand(...) : URI | provenance | MaD:125 |
+| Test.java:2062:26:2062:27 | in : String | Test.java:2062:10:2062:44 | expand(...) : URI | provenance | MaD:126 |
 | Test.java:2068:16:2068:31 | (...)... : String | Test.java:2070:26:2070:27 | in : String | provenance |  |
 | Test.java:2068:24:2068:31 | source(...) : Object | Test.java:2068:16:2068:31 | (...)... : String | provenance |  |
 | Test.java:2070:10:2070:39 | expand(...) : URI | Test.java:2071:9:2071:11 | out | provenance |  |
-| Test.java:2070:26:2070:27 | in : String | Test.java:2070:10:2070:39 | expand(...) : URI | provenance | MaD:125 |
+| Test.java:2070:26:2070:27 | in : String | Test.java:2070:10:2070:39 | expand(...) : URI | provenance | MaD:126 |
 | Test.java:2076:16:2076:31 | (...)... : String | Test.java:2078:26:2078:27 | in : String | provenance |  |
 | Test.java:2076:24:2076:31 | source(...) : Object | Test.java:2076:16:2076:31 | (...)... : String | provenance |  |
 | Test.java:2078:10:2078:44 | expand(...) : URI | Test.java:2079:9:2079:11 | out | provenance |  |
-| Test.java:2078:26:2078:27 | in : String | Test.java:2078:10:2078:44 | expand(...) : URI | provenance | MaD:125 |
+| Test.java:2078:26:2078:27 | in : String | Test.java:2078:10:2078:44 | expand(...) : URI | provenance | MaD:126 |
 | Test.java:2084:16:2084:31 | (...)... : String | Test.java:2086:26:2086:27 | in : String | provenance |  |
 | Test.java:2084:24:2084:31 | source(...) : Object | Test.java:2084:16:2084:31 | (...)... : String | provenance |  |
 | Test.java:2086:10:2086:39 | expand(...) : URI | Test.java:2087:9:2087:11 | out | provenance |  |
-| Test.java:2086:26:2086:27 | in : String | Test.java:2086:10:2086:39 | expand(...) : URI | provenance | MaD:125 |
+| Test.java:2086:26:2086:27 | in : String | Test.java:2086:10:2086:39 | expand(...) : URI | provenance | MaD:126 |
 | Test.java:2092:16:2092:31 | (...)... : String | Test.java:2094:26:2094:27 | in : String | provenance |  |
 | Test.java:2092:24:2092:31 | source(...) : Object | Test.java:2092:16:2092:31 | (...)... : String | provenance |  |
 | Test.java:2094:10:2094:44 | expand(...) : URI | Test.java:2095:9:2095:11 | out | provenance |  |
-| Test.java:2094:26:2094:27 | in : String | Test.java:2094:10:2094:44 | expand(...) : URI | provenance | MaD:125 |
+| Test.java:2094:26:2094:27 | in : String | Test.java:2094:10:2094:44 | expand(...) : URI | provenance | MaD:126 |
 | Test.java:2100:16:2100:31 | (...)... : String | Test.java:2102:26:2102:27 | in : String | provenance |  |
 | Test.java:2100:24:2100:31 | source(...) : Object | Test.java:2100:16:2100:31 | (...)... : String | provenance |  |
 | Test.java:2102:10:2102:39 | expand(...) : URI | Test.java:2103:9:2103:11 | out | provenance |  |
-| Test.java:2102:26:2102:27 | in : String | Test.java:2102:10:2102:39 | expand(...) : URI | provenance | MaD:125 |
+| Test.java:2102:26:2102:27 | in : String | Test.java:2102:10:2102:39 | expand(...) : URI | provenance | MaD:126 |
 | Test.java:2108:34:2108:67 | (...)... : DefaultUriBuilderFactory | Test.java:2109:10:2109:11 | in : DefaultUriBuilderFactory | provenance |  |
 | Test.java:2108:60:2108:67 | source(...) : Object | Test.java:2108:34:2108:67 | (...)... : DefaultUriBuilderFactory | provenance |  |
-| Test.java:2109:10:2109:11 | in : DefaultUriBuilderFactory | Test.java:2109:10:2109:48 | expand(...) : URI | provenance | MaD:124 |
+| Test.java:2109:10:2109:11 | in : DefaultUriBuilderFactory | Test.java:2109:10:2109:48 | expand(...) : URI | provenance | MaD:127 |
 | Test.java:2109:10:2109:48 | expand(...) : URI | Test.java:2110:9:2110:11 | out | provenance |  |
 | Test.java:2115:34:2115:67 | (...)... : DefaultUriBuilderFactory | Test.java:2116:10:2116:11 | in : DefaultUriBuilderFactory | provenance |  |
 | Test.java:2115:60:2115:67 | source(...) : Object | Test.java:2115:34:2115:67 | (...)... : DefaultUriBuilderFactory | provenance |  |
-| Test.java:2116:10:2116:11 | in : DefaultUriBuilderFactory | Test.java:2116:10:2116:43 | expand(...) : URI | provenance | MaD:124 |
+| Test.java:2116:10:2116:11 | in : DefaultUriBuilderFactory | Test.java:2116:10:2116:43 | expand(...) : URI | provenance | MaD:127 |
 | Test.java:2116:10:2116:43 | expand(...) : URI | Test.java:2117:9:2117:11 | out | provenance |  |
 | Test.java:2122:36:2122:71 | (...)... : AbstractUriTemplateHandler | Test.java:2123:10:2123:11 | in : AbstractUriTemplateHandler | provenance |  |
 | Test.java:2122:64:2122:71 | source(...) : Object | Test.java:2122:36:2122:71 | (...)... : AbstractUriTemplateHandler | provenance |  |
-| Test.java:2123:10:2123:11 | in : AbstractUriTemplateHandler | Test.java:2123:10:2123:48 | expand(...) : URI | provenance | MaD:124 |
+| Test.java:2123:10:2123:11 | in : AbstractUriTemplateHandler | Test.java:2123:10:2123:48 | expand(...) : URI | provenance | MaD:127 |
 | Test.java:2123:10:2123:48 | expand(...) : URI | Test.java:2124:9:2124:11 | out | provenance |  |
 | Test.java:2129:36:2129:71 | (...)... : AbstractUriTemplateHandler | Test.java:2130:10:2130:11 | in : AbstractUriTemplateHandler | provenance |  |
 | Test.java:2129:64:2129:71 | source(...) : Object | Test.java:2129:36:2129:71 | (...)... : AbstractUriTemplateHandler | provenance |  |
-| Test.java:2130:10:2130:11 | in : AbstractUriTemplateHandler | Test.java:2130:10:2130:43 | expand(...) : URI | provenance | MaD:124 |
+| Test.java:2130:10:2130:11 | in : AbstractUriTemplateHandler | Test.java:2130:10:2130:43 | expand(...) : URI | provenance | MaD:127 |
 | Test.java:2130:10:2130:43 | expand(...) : URI | Test.java:2131:9:2131:11 | out | provenance |  |
 | Test.java:2136:16:2136:31 | (...)... : String | Test.java:2137:26:2137:27 | in : String | provenance |  |
 | Test.java:2136:24:2136:31 | source(...) : Object | Test.java:2136:16:2136:31 | (...)... : String | provenance |  |
@@ -1453,18 +1453,18 @@ edges
 | Test.java:2270:36:2270:37 | in : String | Test.java:2270:10:2270:53 | encodeQueryParam(...) : String | provenance | MaD:137 |
 | Test.java:2276:23:2276:55 | newMultiValueMapWithKey(...) : LinkedMultiValueMap [<map.key>] : Object | Test.java:2277:37:2277:38 | in : LinkedMultiValueMap [<map.key>] : Object | provenance |  |
 | Test.java:2276:47:2276:54 | source(...) : Object | Test.java:54:40:54:53 | element : Object | provenance |  |
-| Test.java:2276:47:2276:54 | source(...) : Object | Test.java:2276:23:2276:55 | newMultiValueMapWithKey(...) : LinkedMultiValueMap [<map.key>] : Object | provenance | MaD:7 |
+| Test.java:2276:47:2276:54 | source(...) : Object | Test.java:2276:23:2276:55 | newMultiValueMapWithKey(...) : LinkedMultiValueMap [<map.key>] : Object | provenance | MaD:5 |
 | Test.java:2277:10:2277:39 | encodeQueryParams(...) : MultiValueMap [<map.key>] : Object | Test.java:2278:19:2278:21 | out : MultiValueMap [<map.key>] : Object | provenance |  |
 | Test.java:2277:37:2277:38 | in : LinkedMultiValueMap [<map.key>] : Object | Test.java:2277:10:2277:39 | encodeQueryParams(...) : MultiValueMap [<map.key>] : Object | provenance | MaD:138 |
 | Test.java:2278:19:2278:21 | out : MultiValueMap [<map.key>] : Object | Test.java:50:18:50:27 | m : MultiValueMap [<map.key>] : Object | provenance |  |
-| Test.java:2278:19:2278:21 | out : MultiValueMap [<map.key>] : Object | Test.java:2278:9:2278:22 | getMapKey(...) | provenance | MaD:6 |
+| Test.java:2278:19:2278:21 | out : MultiValueMap [<map.key>] : Object | Test.java:2278:9:2278:22 | getMapKey(...) | provenance | MaD:8 |
 | Test.java:2283:23:2283:57 | newMultiValueMapWithValue(...) : LinkedMultiValueMap [<map.value>] : Object | Test.java:2284:37:2284:38 | in : LinkedMultiValueMap [<map.value>] : Object | provenance |  |
 | Test.java:2283:49:2283:56 | source(...) : Object | Test.java:55:42:55:55 | element : Object | provenance |  |
 | Test.java:2283:49:2283:56 | source(...) : Object | Test.java:2283:23:2283:57 | newMultiValueMapWithValue(...) : LinkedMultiValueMap [<map.value>] : Object | provenance | MaD:9 |
 | Test.java:2284:10:2284:39 | encodeQueryParams(...) : MultiValueMap [<map.value>] : Object | Test.java:2285:21:2285:23 | out : MultiValueMap [<map.value>] : Object | provenance |  |
 | Test.java:2284:37:2284:38 | in : LinkedMultiValueMap [<map.value>] : Object | Test.java:2284:10:2284:39 | encodeQueryParams(...) : MultiValueMap [<map.value>] : Object | provenance | MaD:139 |
 | Test.java:2285:21:2285:23 | out : MultiValueMap [<map.value>] : Object | Test.java:51:20:51:29 | m : MultiValueMap [<map.value>] : Object | provenance |  |
-| Test.java:2285:21:2285:23 | out : MultiValueMap [<map.value>] : Object | Test.java:2285:9:2285:24 | getMapValue(...) | provenance | MaD:5 |
+| Test.java:2285:21:2285:23 | out : MultiValueMap [<map.value>] : Object | Test.java:2285:9:2285:24 | getMapValue(...) | provenance | MaD:7 |
 | Test.java:2290:16:2290:31 | (...)... : String | Test.java:2291:32:2291:33 | in : String | provenance |  |
 | Test.java:2290:24:2290:31 | source(...) : Object | Test.java:2290:16:2290:31 | (...)... : String | provenance |  |
 | Test.java:2291:10:2291:48 | encodeScheme(...) : String | Test.java:2292:9:2292:11 | out | provenance |  |
@@ -1475,18 +1475,18 @@ edges
 | Test.java:2298:32:2298:33 | in : String | Test.java:2298:10:2298:49 | encodeScheme(...) : String | provenance | MaD:140 |
 | Test.java:2304:13:2304:35 | newMapWithKey(...) : Map [<map.key>] : Object | Test.java:2305:38:2305:39 | in : Map [<map.key>] : Object | provenance |  |
 | Test.java:2304:27:2304:34 | source(...) : Object | Test.java:52:20:52:33 | element : Object | provenance |  |
-| Test.java:2304:27:2304:34 | source(...) : Object | Test.java:2304:13:2304:35 | newMapWithKey(...) : Map [<map.key>] : Object | provenance | MaD:7 |
+| Test.java:2304:27:2304:34 | source(...) : Object | Test.java:2304:13:2304:35 | newMapWithKey(...) : Map [<map.key>] : Object | provenance | MaD:5 |
 | Test.java:2305:10:2305:40 | encodeUriVariables(...) : Map [<map.key>] : Object | Test.java:2306:19:2306:21 | out : Map [<map.key>] : Object | provenance |  |
 | Test.java:2305:38:2305:39 | in : Map [<map.key>] : Object | Test.java:2305:10:2305:40 | encodeUriVariables(...) : Map [<map.key>] : Object | provenance | MaD:141 |
 | Test.java:2306:19:2306:21 | out : Map [<map.key>] : Object | Test.java:50:18:50:27 | m : Map [<map.key>] : Object | provenance |  |
-| Test.java:2306:19:2306:21 | out : Map [<map.key>] : Object | Test.java:2306:9:2306:22 | getMapKey(...) | provenance | MaD:6 |
+| Test.java:2306:19:2306:21 | out : Map [<map.key>] : Object | Test.java:2306:9:2306:22 | getMapKey(...) | provenance | MaD:8 |
 | Test.java:2311:13:2311:37 | newMapWithValue(...) : Map [<map.value>] : Object | Test.java:2312:38:2312:39 | in : Map [<map.value>] : Object | provenance |  |
 | Test.java:2311:29:2311:36 | source(...) : Object | Test.java:53:22:53:35 | element : Object | provenance |  |
-| Test.java:2311:29:2311:36 | source(...) : Object | Test.java:2311:13:2311:37 | newMapWithValue(...) : Map [<map.value>] : Object | provenance | MaD:8 |
+| Test.java:2311:29:2311:36 | source(...) : Object | Test.java:2311:13:2311:37 | newMapWithValue(...) : Map [<map.value>] : Object | provenance | MaD:6 |
 | Test.java:2312:10:2312:40 | encodeUriVariables(...) : Map [<map.value>] : Object | Test.java:2313:21:2313:23 | out : Map [<map.value>] : Object | provenance |  |
 | Test.java:2312:38:2312:39 | in : Map [<map.value>] : Object | Test.java:2312:10:2312:40 | encodeUriVariables(...) : Map [<map.value>] : Object | provenance | MaD:142 |
 | Test.java:2313:21:2313:23 | out : Map [<map.value>] : Object | Test.java:51:20:51:29 | m : Map [<map.value>] : Object | provenance |  |
-| Test.java:2313:21:2313:23 | out : Map [<map.value>] : Object | Test.java:2313:9:2313:24 | getMapValue(...) | provenance | MaD:5 |
+| Test.java:2313:21:2313:23 | out : Map [<map.value>] : Object | Test.java:2313:9:2313:24 | getMapValue(...) | provenance | MaD:7 |
 | Test.java:2318:18:2318:39 | {...} : Object[] [[]] : Object | Test.java:2319:38:2319:39 | in : Object[] [[]] : Object | provenance |  |
 | Test.java:2318:31:2318:38 | source(...) : Object | Test.java:2318:18:2318:39 | {...} : Object[] [[]] : Object | provenance |  |
 | Test.java:2319:10:2319:40 | encodeUriVariables(...) : Object[] [[]] : Object | Test.java:2320:9:2320:11 | out : Object[] [[]] : Object | provenance |  |
@@ -1506,32 +1506,32 @@ edges
 | Test.java:2340:40:2340:41 | in : String | Test.java:2340:10:2340:42 | extractFileExtension(...) : String | provenance | MaD:145 |
 | Test.java:2346:23:2346:55 | newMultiValueMapWithKey(...) : LinkedMultiValueMap [<map.key>] : Object | Test.java:2348:47:2348:48 | in : LinkedMultiValueMap [<map.key>] : Object | provenance |  |
 | Test.java:2346:47:2346:54 | source(...) : Object | Test.java:54:40:54:53 | element : Object | provenance |  |
-| Test.java:2346:47:2346:54 | source(...) : Object | Test.java:2346:23:2346:55 | newMultiValueMapWithKey(...) : LinkedMultiValueMap [<map.key>] : Object | provenance | MaD:7 |
+| Test.java:2346:47:2346:54 | source(...) : Object | Test.java:2346:23:2346:55 | newMultiValueMapWithKey(...) : LinkedMultiValueMap [<map.key>] : Object | provenance | MaD:5 |
 | Test.java:2348:10:2348:49 | decodeMatrixVariables(...) : MultiValueMap [<map.key>] : Object | Test.java:2349:19:2349:21 | out : MultiValueMap [<map.key>] : Object | provenance |  |
 | Test.java:2348:47:2348:48 | in : LinkedMultiValueMap [<map.key>] : Object | Test.java:2348:10:2348:49 | decodeMatrixVariables(...) : MultiValueMap [<map.key>] : Object | provenance | MaD:146 |
 | Test.java:2349:19:2349:21 | out : MultiValueMap [<map.key>] : Object | Test.java:50:18:50:27 | m : MultiValueMap [<map.key>] : Object | provenance |  |
-| Test.java:2349:19:2349:21 | out : MultiValueMap [<map.key>] : Object | Test.java:2349:9:2349:22 | getMapKey(...) | provenance | MaD:6 |
+| Test.java:2349:19:2349:21 | out : MultiValueMap [<map.key>] : Object | Test.java:2349:9:2349:22 | getMapKey(...) | provenance | MaD:8 |
 | Test.java:2354:23:2354:57 | newMultiValueMapWithValue(...) : LinkedMultiValueMap [<map.value>] : Object | Test.java:2356:47:2356:48 | in : LinkedMultiValueMap [<map.value>] : Object | provenance |  |
 | Test.java:2354:49:2354:56 | source(...) : Object | Test.java:55:42:55:55 | element : Object | provenance |  |
 | Test.java:2354:49:2354:56 | source(...) : Object | Test.java:2354:23:2354:57 | newMultiValueMapWithValue(...) : LinkedMultiValueMap [<map.value>] : Object | provenance | MaD:9 |
 | Test.java:2356:10:2356:49 | decodeMatrixVariables(...) : MultiValueMap [<map.value>] : Object | Test.java:2357:21:2357:23 | out : MultiValueMap [<map.value>] : Object | provenance |  |
 | Test.java:2356:47:2356:48 | in : LinkedMultiValueMap [<map.value>] : Object | Test.java:2356:10:2356:49 | decodeMatrixVariables(...) : MultiValueMap [<map.value>] : Object | provenance | MaD:147 |
 | Test.java:2357:21:2357:23 | out : MultiValueMap [<map.value>] : Object | Test.java:51:20:51:29 | m : MultiValueMap [<map.value>] : Object | provenance |  |
-| Test.java:2357:21:2357:23 | out : MultiValueMap [<map.value>] : Object | Test.java:2357:9:2357:24 | getMapValue(...) | provenance | MaD:5 |
+| Test.java:2357:21:2357:23 | out : MultiValueMap [<map.value>] : Object | Test.java:2357:9:2357:24 | getMapValue(...) | provenance | MaD:7 |
 | Test.java:2362:13:2362:35 | newMapWithKey(...) : Map [<map.key>] : Object | Test.java:2364:45:2364:46 | in : Map [<map.key>] : Object | provenance |  |
 | Test.java:2362:27:2362:34 | source(...) : Object | Test.java:52:20:52:33 | element : Object | provenance |  |
-| Test.java:2362:27:2362:34 | source(...) : Object | Test.java:2362:13:2362:35 | newMapWithKey(...) : Map [<map.key>] : Object | provenance | MaD:7 |
+| Test.java:2362:27:2362:34 | source(...) : Object | Test.java:2362:13:2362:35 | newMapWithKey(...) : Map [<map.key>] : Object | provenance | MaD:5 |
 | Test.java:2364:10:2364:47 | decodePathVariables(...) : Map [<map.key>] : Object | Test.java:2365:19:2365:21 | out : Map [<map.key>] : Object | provenance |  |
 | Test.java:2364:45:2364:46 | in : Map [<map.key>] : Object | Test.java:2364:10:2364:47 | decodePathVariables(...) : Map [<map.key>] : Object | provenance | MaD:148 |
 | Test.java:2365:19:2365:21 | out : Map [<map.key>] : Object | Test.java:50:18:50:27 | m : Map [<map.key>] : Object | provenance |  |
-| Test.java:2365:19:2365:21 | out : Map [<map.key>] : Object | Test.java:2365:9:2365:22 | getMapKey(...) | provenance | MaD:6 |
+| Test.java:2365:19:2365:21 | out : Map [<map.key>] : Object | Test.java:2365:9:2365:22 | getMapKey(...) | provenance | MaD:8 |
 | Test.java:2370:13:2370:37 | newMapWithValue(...) : Map [<map.value>] : Object | Test.java:2372:45:2372:46 | in : Map [<map.value>] : Object | provenance |  |
 | Test.java:2370:29:2370:36 | source(...) : Object | Test.java:53:22:53:35 | element : Object | provenance |  |
-| Test.java:2370:29:2370:36 | source(...) : Object | Test.java:2370:13:2370:37 | newMapWithValue(...) : Map [<map.value>] : Object | provenance | MaD:8 |
+| Test.java:2370:29:2370:36 | source(...) : Object | Test.java:2370:13:2370:37 | newMapWithValue(...) : Map [<map.value>] : Object | provenance | MaD:6 |
 | Test.java:2372:10:2372:47 | decodePathVariables(...) : Map [<map.value>] : Object | Test.java:2373:21:2373:23 | out : Map [<map.value>] : Object | provenance |  |
 | Test.java:2372:45:2372:46 | in : Map [<map.value>] : Object | Test.java:2372:10:2372:47 | decodePathVariables(...) : Map [<map.value>] : Object | provenance | MaD:149 |
 | Test.java:2373:21:2373:23 | out : Map [<map.value>] : Object | Test.java:51:20:51:29 | m : Map [<map.value>] : Object | provenance |  |
-| Test.java:2373:21:2373:23 | out : Map [<map.value>] : Object | Test.java:2373:9:2373:24 | getMapValue(...) | provenance | MaD:5 |
+| Test.java:2373:21:2373:23 | out : Map [<map.value>] : Object | Test.java:2373:9:2373:24 | getMapValue(...) | provenance | MaD:7 |
 | Test.java:2378:16:2378:31 | (...)... : String | Test.java:2380:45:2380:46 | in : String | provenance |  |
 | Test.java:2378:24:2378:31 | source(...) : Object | Test.java:2378:16:2378:31 | (...)... : String | provenance |  |
 | Test.java:2380:10:2380:47 | decodeRequestString(...) : String | Test.java:2381:9:2381:11 | out | provenance |  |
@@ -1550,7 +1550,7 @@ edges
 | Test.java:2404:42:2404:43 | in : String | Test.java:2404:10:2404:44 | removeSemicolonContent(...) : String | provenance | MaD:153 |
 | Test.java:2410:13:2410:37 | newMapWithValue(...) : Map [<map.value>] : Object | Test.java:2411:38:2411:39 | in : Map [<map.value>] : Object | provenance |  |
 | Test.java:2410:29:2410:36 | source(...) : Object | Test.java:53:22:53:35 | element : Object | provenance |  |
-| Test.java:2410:29:2410:36 | source(...) : Object | Test.java:2410:13:2410:37 | newMapWithValue(...) : Map [<map.value>] : Object | provenance | MaD:8 |
+| Test.java:2410:29:2410:36 | source(...) : Object | Test.java:2410:13:2410:37 | newMapWithValue(...) : Map [<map.value>] : Object | provenance | MaD:6 |
 | Test.java:2411:10:2411:54 | findParameterValue(...) : String | Test.java:2412:9:2412:11 | out | provenance |  |
 | Test.java:2411:38:2411:39 | in : Map [<map.value>] : Object | Test.java:2411:10:2411:54 | findParameterValue(...) : String | provenance | MaD:154 |
 | Test.java:2417:24:2417:47 | (...)... : ServletRequest | Test.java:2418:38:2418:39 | in : ServletRequest | provenance |  |
@@ -1574,13 +1574,13 @@ edges
 | Test.java:2446:10:2446:53 | getParametersStartingWith(...) : Map [<map.key>] : Object | Test.java:2447:19:2447:21 | out : Map [<map.key>] : Object | provenance |  |
 | Test.java:2446:45:2446:46 | in : ServletRequest | Test.java:2446:10:2446:53 | getParametersStartingWith(...) : Map [<map.key>] : Object | provenance | MaD:159 |
 | Test.java:2447:19:2447:21 | out : Map [<map.key>] : Object | Test.java:50:18:50:27 | m : Map [<map.key>] : Object | provenance |  |
-| Test.java:2447:19:2447:21 | out : Map [<map.key>] : Object | Test.java:2447:9:2447:22 | getMapKey(...) | provenance | MaD:6 |
+| Test.java:2447:19:2447:21 | out : Map [<map.key>] : Object | Test.java:2447:9:2447:22 | getMapKey(...) | provenance | MaD:8 |
 | Test.java:2452:24:2452:47 | (...)... : ServletRequest | Test.java:2453:45:2453:46 | in : ServletRequest | provenance |  |
 | Test.java:2452:40:2452:47 | source(...) : Object | Test.java:2452:24:2452:47 | (...)... : ServletRequest | provenance |  |
 | Test.java:2453:10:2453:53 | getParametersStartingWith(...) : Map [<map.value>] : Object | Test.java:2454:21:2454:23 | out : Map [<map.value>] : Object | provenance |  |
 | Test.java:2453:45:2453:46 | in : ServletRequest | Test.java:2453:10:2453:53 | getParametersStartingWith(...) : Map [<map.value>] : Object | provenance | MaD:160 |
 | Test.java:2454:21:2454:23 | out : Map [<map.value>] : Object | Test.java:51:20:51:29 | m : Map [<map.value>] : Object | provenance |  |
-| Test.java:2454:21:2454:23 | out : Map [<map.value>] : Object | Test.java:2454:9:2454:24 | getMapValue(...) | provenance | MaD:5 |
+| Test.java:2454:21:2454:23 | out : Map [<map.value>] : Object | Test.java:2454:9:2454:24 | getMapValue(...) | provenance | MaD:7 |
 | Test.java:2459:16:2459:31 | (...)... : String | Test.java:2460:37:2460:38 | in : String | provenance |  |
 | Test.java:2459:24:2459:31 | source(...) : Object | Test.java:2459:16:2459:31 | (...)... : String | provenance |  |
 | Test.java:2460:10:2460:39 | getRealPath(...) : String | Test.java:2461:9:2461:11 | out | provenance |  |
@@ -1602,13 +1602,13 @@ edges
 | Test.java:2488:10:2488:42 | parseMatrixVariables(...) : MultiValueMap [<map.key>] : Object | Test.java:2489:19:2489:21 | out : MultiValueMap [<map.key>] : Object | provenance |  |
 | Test.java:2488:40:2488:41 | in : String | Test.java:2488:10:2488:42 | parseMatrixVariables(...) : MultiValueMap [<map.key>] : Object | provenance | MaD:164 |
 | Test.java:2489:19:2489:21 | out : MultiValueMap [<map.key>] : Object | Test.java:50:18:50:27 | m : MultiValueMap [<map.key>] : Object | provenance |  |
-| Test.java:2489:19:2489:21 | out : MultiValueMap [<map.key>] : Object | Test.java:2489:9:2489:22 | getMapKey(...) | provenance | MaD:6 |
+| Test.java:2489:19:2489:21 | out : MultiValueMap [<map.key>] : Object | Test.java:2489:9:2489:22 | getMapKey(...) | provenance | MaD:8 |
 | Test.java:2494:16:2494:31 | (...)... : String | Test.java:2495:40:2495:41 | in : String | provenance |  |
 | Test.java:2494:24:2494:31 | source(...) : Object | Test.java:2494:16:2494:31 | (...)... : String | provenance |  |
 | Test.java:2495:10:2495:42 | parseMatrixVariables(...) : MultiValueMap [<map.value>] : Object | Test.java:2496:21:2496:23 | out : MultiValueMap [<map.value>] : Object | provenance |  |
 | Test.java:2495:40:2495:41 | in : String | Test.java:2495:10:2495:42 | parseMatrixVariables(...) : MultiValueMap [<map.value>] : Object | provenance | MaD:165 |
 | Test.java:2496:21:2496:23 | out : MultiValueMap [<map.value>] : Object | Test.java:51:20:51:29 | m : MultiValueMap [<map.value>] : Object | provenance |  |
-| Test.java:2496:21:2496:23 | out : MultiValueMap [<map.value>] : Object | Test.java:2496:9:2496:24 | getMapValue(...) | provenance | MaD:5 |
+| Test.java:2496:21:2496:23 | out : MultiValueMap [<map.value>] : Object | Test.java:2496:9:2496:24 | getMapValue(...) | provenance | MaD:7 |
 | Test.java:2501:19:2501:34 | (...)... : String | Test.java:2502:34:2502:35 | in : String | provenance |  |
 | Test.java:2501:27:2501:34 | source(...) : Object | Test.java:2501:19:2501:34 | (...)... : String | provenance |  |
 | Test.java:2502:13:2502:42 | htmlEscape(...) : String | Test.java:2503:12:2503:14 | out | provenance |  |
@@ -1635,11 +1635,11 @@ edges
 | Test.java:2537:37:2537:38 | in : String | Test.java:2537:13:2537:39 | htmlEscapeHex(...) : String | provenance | MaD:27 |
 | Test.java:2543:23:2543:45 | (...)... : UriComponents | Test.java:2544:10:2544:11 | in : UriComponents | provenance |  |
 | Test.java:2543:38:2543:45 | source(...) : Object | Test.java:2543:23:2543:45 | (...)... : UriComponents | provenance |  |
-| Test.java:2544:10:2544:11 | in : UriComponents | Test.java:2544:10:2544:23 | normalize(...) : UriComponents | provenance | MaD:93 |
+| Test.java:2544:10:2544:11 | in : UriComponents | Test.java:2544:10:2544:23 | normalize(...) : UriComponents | provenance | MaD:94 |
 | Test.java:2544:10:2544:23 | normalize(...) : UriComponents | Test.java:2545:9:2545:11 | out | provenance |  |
 | Test.java:2550:23:2550:45 | (...)... : UriComponents | Test.java:2551:10:2551:11 | in : UriComponents | provenance |  |
 | Test.java:2550:38:2550:45 | source(...) : Object | Test.java:2550:23:2550:45 | (...)... : UriComponents | provenance |  |
-| Test.java:2551:10:2551:11 | in : UriComponents | Test.java:2551:10:2551:22 | toString(...) : String | provenance | MaD:94 |
+| Test.java:2551:10:2551:11 | in : UriComponents | Test.java:2551:10:2551:22 | toString(...) : String | provenance | MaD:95 |
 | Test.java:2551:10:2551:22 | toString(...) : String | Test.java:2552:9:2552:11 | out | provenance |  |
 | Test.java:2557:21:2557:41 | (...)... : UriTemplate | Test.java:2558:10:2558:11 | in : UriTemplate | provenance |  |
 | Test.java:2557:34:2557:41 | source(...) : Object | Test.java:2557:21:2557:41 | (...)... : UriTemplate | provenance |  |
diff --git a/java/ql/test/library-tests/frameworks/stream/test.expected b/java/ql/test/library-tests/frameworks/stream/test.expected
index 8fc629e7fd7..185ec01a6a7 100644
--- a/java/ql/test/library-tests/frameworks/stream/test.expected
+++ b/java/ql/test/library-tests/frameworks/stream/test.expected
@@ -1,348 +1,348 @@
 models
-| 1 | Summary: java.lang; Iterable; true; iterator; (); ; Argument[this].Element; ReturnValue.Element; value; manual |
-| 2 | Summary: java.util; Iterator; true; next; ; ; Argument[this].Element; ReturnValue; value; manual |
-| 3 | Summary: java.util; Optional; false; get; ; ; Argument[this].Element; ReturnValue; value; manual |
-| 4 | Summary: java.util.stream; BaseStream; true; iterator; (); ; Argument[this].Element; ReturnValue.Element; value; manual |
-| 5 | Summary: java.util.stream; BaseStream; true; onClose; (Runnable); ; Argument[this].Element; ReturnValue.Element; value; manual |
-| 6 | Summary: java.util.stream; BaseStream; true; parallel; (); ; Argument[this].Element; ReturnValue.Element; value; manual |
-| 7 | Summary: java.util.stream; BaseStream; true; sequential; (); ; Argument[this].Element; ReturnValue.Element; value; manual |
-| 8 | Summary: java.util.stream; BaseStream; true; spliterator; (); ; Argument[this].Element; ReturnValue.Element; value; manual |
-| 9 | Summary: java.util.stream; BaseStream; true; unordered; (); ; Argument[this].Element; ReturnValue.Element; value; manual |
-| 10 | Summary: java.util.stream; Stream; true; allMatch; (Predicate); ; Argument[this].Element; Argument[0].Parameter[0]; value; manual |
-| 11 | Summary: java.util.stream; Stream; true; anyMatch; (Predicate); ; Argument[this].Element; Argument[0].Parameter[0]; value; manual |
-| 12 | Summary: java.util.stream; Stream; true; collect; (Supplier,BiConsumer,BiConsumer); ; Argument[this].Element; Argument[1].Parameter[1]; value; manual |
-| 13 | Summary: java.util.stream; Stream; true; collect; (Supplier,BiConsumer,BiConsumer); ; Argument[0].ReturnValue; Argument[1].Parameter[0]; value; manual |
-| 14 | Summary: java.util.stream; Stream; true; collect; (Supplier,BiConsumer,BiConsumer); ; Argument[1].Parameter[0]; Argument[2].Parameter[0..1]; value; manual |
-| 15 | Summary: java.util.stream; Stream; true; collect; (Supplier,BiConsumer,BiConsumer); ; Argument[1].Parameter[0]; ReturnValue; value; manual |
-| 16 | Summary: java.util.stream; Stream; true; collect; (Supplier,BiConsumer,BiConsumer); ; Argument[2].Parameter[0..1]; Argument[1].Parameter[0]; value; manual |
-| 17 | Summary: java.util.stream; Stream; true; concat; (Stream,Stream); ; Argument[0..1].Element; ReturnValue.Element; value; manual |
-| 18 | Summary: java.util.stream; Stream; true; distinct; (); ; Argument[this].Element; ReturnValue.Element; value; manual |
-| 19 | Summary: java.util.stream; Stream; true; dropWhile; (Predicate); ; Argument[this].Element; Argument[0].Parameter[0]; value; manual |
-| 20 | Summary: java.util.stream; Stream; true; dropWhile; (Predicate); ; Argument[this].Element; ReturnValue.Element; value; manual |
-| 21 | Summary: java.util.stream; Stream; true; filter; (Predicate); ; Argument[this].Element; Argument[0].Parameter[0]; value; manual |
-| 22 | Summary: java.util.stream; Stream; true; filter; (Predicate); ; Argument[this].Element; ReturnValue.Element; value; manual |
-| 23 | Summary: java.util.stream; Stream; true; findAny; (); ; Argument[this].Element; ReturnValue.Element; value; manual |
-| 24 | Summary: java.util.stream; Stream; true; findFirst; (); ; Argument[this].Element; ReturnValue.Element; value; manual |
+| 1 | Summary: generatedtest; Test; false; getElementSpliterator; (Spliterator); ; Argument[0].Element; ReturnValue; value; manual |
+| 2 | Summary: java.lang; Iterable; true; iterator; (); ; Argument[this].Element; ReturnValue.Element; value; manual |
+| 3 | Summary: java.util.stream; BaseStream; true; iterator; (); ; Argument[this].Element; ReturnValue.Element; value; manual |
+| 4 | Summary: java.util.stream; BaseStream; true; onClose; (Runnable); ; Argument[this].Element; ReturnValue.Element; value; manual |
+| 5 | Summary: java.util.stream; BaseStream; true; parallel; (); ; Argument[this].Element; ReturnValue.Element; value; manual |
+| 6 | Summary: java.util.stream; BaseStream; true; sequential; (); ; Argument[this].Element; ReturnValue.Element; value; manual |
+| 7 | Summary: java.util.stream; BaseStream; true; spliterator; (); ; Argument[this].Element; ReturnValue.Element; value; manual |
+| 8 | Summary: java.util.stream; BaseStream; true; unordered; (); ; Argument[this].Element; ReturnValue.Element; value; manual |
+| 9 | Summary: java.util.stream; Stream; true; allMatch; (Predicate); ; Argument[this].Element; Argument[0].Parameter[0]; value; manual |
+| 10 | Summary: java.util.stream; Stream; true; anyMatch; (Predicate); ; Argument[this].Element; Argument[0].Parameter[0]; value; manual |
+| 11 | Summary: java.util.stream; Stream; true; collect; (Supplier,BiConsumer,BiConsumer); ; Argument[0].ReturnValue; Argument[1].Parameter[0]; value; manual |
+| 12 | Summary: java.util.stream; Stream; true; collect; (Supplier,BiConsumer,BiConsumer); ; Argument[1].Parameter[0]; Argument[2].Parameter[0..1]; value; manual |
+| 13 | Summary: java.util.stream; Stream; true; collect; (Supplier,BiConsumer,BiConsumer); ; Argument[1].Parameter[0]; ReturnValue; value; manual |
+| 14 | Summary: java.util.stream; Stream; true; collect; (Supplier,BiConsumer,BiConsumer); ; Argument[2].Parameter[0..1]; Argument[1].Parameter[0]; value; manual |
+| 15 | Summary: java.util.stream; Stream; true; collect; (Supplier,BiConsumer,BiConsumer); ; Argument[this].Element; Argument[1].Parameter[1]; value; manual |
+| 16 | Summary: java.util.stream; Stream; true; concat; (Stream,Stream); ; Argument[0..1].Element; ReturnValue.Element; value; manual |
+| 17 | Summary: java.util.stream; Stream; true; distinct; (); ; Argument[this].Element; ReturnValue.Element; value; manual |
+| 18 | Summary: java.util.stream; Stream; true; dropWhile; (Predicate); ; Argument[this].Element; Argument[0].Parameter[0]; value; manual |
+| 19 | Summary: java.util.stream; Stream; true; dropWhile; (Predicate); ; Argument[this].Element; ReturnValue.Element; value; manual |
+| 20 | Summary: java.util.stream; Stream; true; filter; (Predicate); ; Argument[this].Element; Argument[0].Parameter[0]; value; manual |
+| 21 | Summary: java.util.stream; Stream; true; filter; (Predicate); ; Argument[this].Element; ReturnValue.Element; value; manual |
+| 22 | Summary: java.util.stream; Stream; true; findAny; (); ; Argument[this].Element; ReturnValue.Element; value; manual |
+| 23 | Summary: java.util.stream; Stream; true; findFirst; (); ; Argument[this].Element; ReturnValue.Element; value; manual |
+| 24 | Summary: java.util.stream; Stream; true; flatMap; (Function); ; Argument[0].ReturnValue.Element; ReturnValue.Element; value; manual |
 | 25 | Summary: java.util.stream; Stream; true; flatMap; (Function); ; Argument[this].Element; Argument[0].Parameter[0]; value; manual |
-| 26 | Summary: java.util.stream; Stream; true; flatMap; (Function); ; Argument[0].ReturnValue.Element; ReturnValue.Element; value; manual |
-| 27 | Summary: java.util.stream; Stream; true; flatMapToDouble; (Function); ; Argument[this].Element; Argument[0].Parameter[0]; value; manual |
-| 28 | Summary: java.util.stream; Stream; true; flatMapToInt; (Function); ; Argument[this].Element; Argument[0].Parameter[0]; value; manual |
-| 29 | Summary: java.util.stream; Stream; true; flatMapToLong; (Function); ; Argument[this].Element; Argument[0].Parameter[0]; value; manual |
-| 30 | Summary: java.util.stream; Stream; true; forEach; (Consumer); ; Argument[this].Element; Argument[0].Parameter[0]; value; manual |
-| 31 | Summary: java.util.stream; Stream; true; forEachOrdered; (Consumer); ; Argument[this].Element; Argument[0].Parameter[0]; value; manual |
-| 32 | Summary: java.util.stream; Stream; true; generate; (Supplier); ; Argument[0].ReturnValue; ReturnValue.Element; value; manual |
-| 33 | Summary: java.util.stream; Stream; true; iterate; (Object,Predicate,UnaryOperator); ; Argument[0]; Argument[1..2].Parameter[0]; value; manual |
-| 34 | Summary: java.util.stream; Stream; true; iterate; (Object,Predicate,UnaryOperator); ; Argument[0]; ReturnValue.Element; value; manual |
-| 35 | Summary: java.util.stream; Stream; true; iterate; (Object,Predicate,UnaryOperator); ; Argument[2].ReturnValue; Argument[1..2].Parameter[0]; value; manual |
-| 36 | Summary: java.util.stream; Stream; true; iterate; (Object,Predicate,UnaryOperator); ; Argument[2].ReturnValue; ReturnValue.Element; value; manual |
-| 37 | Summary: java.util.stream; Stream; true; iterate; (Object,UnaryOperator); ; Argument[0]; Argument[1].Parameter[0]; value; manual |
-| 38 | Summary: java.util.stream; Stream; true; iterate; (Object,UnaryOperator); ; Argument[0]; ReturnValue.Element; value; manual |
-| 39 | Summary: java.util.stream; Stream; true; iterate; (Object,UnaryOperator); ; Argument[1].ReturnValue; Argument[1].Parameter[0]; value; manual |
-| 40 | Summary: java.util.stream; Stream; true; iterate; (Object,UnaryOperator); ; Argument[1].ReturnValue; ReturnValue.Element; value; manual |
-| 41 | Summary: java.util.stream; Stream; true; limit; (long); ; Argument[this].Element; ReturnValue.Element; value; manual |
+| 26 | Summary: java.util.stream; Stream; true; flatMapToDouble; (Function); ; Argument[this].Element; Argument[0].Parameter[0]; value; manual |
+| 27 | Summary: java.util.stream; Stream; true; flatMapToInt; (Function); ; Argument[this].Element; Argument[0].Parameter[0]; value; manual |
+| 28 | Summary: java.util.stream; Stream; true; flatMapToLong; (Function); ; Argument[this].Element; Argument[0].Parameter[0]; value; manual |
+| 29 | Summary: java.util.stream; Stream; true; forEach; (Consumer); ; Argument[this].Element; Argument[0].Parameter[0]; value; manual |
+| 30 | Summary: java.util.stream; Stream; true; forEachOrdered; (Consumer); ; Argument[this].Element; Argument[0].Parameter[0]; value; manual |
+| 31 | Summary: java.util.stream; Stream; true; generate; (Supplier); ; Argument[0].ReturnValue; ReturnValue.Element; value; manual |
+| 32 | Summary: java.util.stream; Stream; true; iterate; (Object,Predicate,UnaryOperator); ; Argument[0]; Argument[1..2].Parameter[0]; value; manual |
+| 33 | Summary: java.util.stream; Stream; true; iterate; (Object,Predicate,UnaryOperator); ; Argument[0]; ReturnValue.Element; value; manual |
+| 34 | Summary: java.util.stream; Stream; true; iterate; (Object,Predicate,UnaryOperator); ; Argument[2].ReturnValue; Argument[1..2].Parameter[0]; value; manual |
+| 35 | Summary: java.util.stream; Stream; true; iterate; (Object,Predicate,UnaryOperator); ; Argument[2].ReturnValue; ReturnValue.Element; value; manual |
+| 36 | Summary: java.util.stream; Stream; true; iterate; (Object,UnaryOperator); ; Argument[0]; Argument[1].Parameter[0]; value; manual |
+| 37 | Summary: java.util.stream; Stream; true; iterate; (Object,UnaryOperator); ; Argument[0]; ReturnValue.Element; value; manual |
+| 38 | Summary: java.util.stream; Stream; true; iterate; (Object,UnaryOperator); ; Argument[1].ReturnValue; Argument[1].Parameter[0]; value; manual |
+| 39 | Summary: java.util.stream; Stream; true; iterate; (Object,UnaryOperator); ; Argument[1].ReturnValue; ReturnValue.Element; value; manual |
+| 40 | Summary: java.util.stream; Stream; true; limit; (long); ; Argument[this].Element; ReturnValue.Element; value; manual |
+| 41 | Summary: java.util.stream; Stream; true; map; (Function); ; Argument[0].ReturnValue; ReturnValue.Element; value; manual |
 | 42 | Summary: java.util.stream; Stream; true; map; (Function); ; Argument[this].Element; Argument[0].Parameter[0]; value; manual |
-| 43 | Summary: java.util.stream; Stream; true; map; (Function); ; Argument[0].ReturnValue; ReturnValue.Element; value; manual |
-| 44 | Summary: java.util.stream; Stream; true; mapMulti; (BiConsumer); ; Argument[this].Element; Argument[0].Parameter[0]; value; manual |
-| 45 | Summary: java.util.stream; Stream; true; mapMultiToDouble; (BiConsumer); ; Argument[this].Element; Argument[0].Parameter[0]; value; manual |
-| 46 | Summary: java.util.stream; Stream; true; mapMultiToInt; (BiConsumer); ; Argument[this].Element; Argument[0].Parameter[0]; value; manual |
-| 47 | Summary: java.util.stream; Stream; true; mapMultiToLong; (BiConsumer); ; Argument[this].Element; Argument[0].Parameter[0]; value; manual |
-| 48 | Summary: java.util.stream; Stream; true; mapToDouble; (ToDoubleFunction); ; Argument[this].Element; Argument[0].Parameter[0]; value; manual |
-| 49 | Summary: java.util.stream; Stream; true; mapToInt; (ToIntFunction); ; Argument[this].Element; Argument[0].Parameter[0]; value; manual |
-| 50 | Summary: java.util.stream; Stream; true; mapToLong; (ToLongFunction); ; Argument[this].Element; Argument[0].Parameter[0]; value; manual |
-| 51 | Summary: java.util.stream; Stream; true; max; (Comparator); ; Argument[this].Element; Argument[0].Parameter[0..1]; value; manual |
-| 52 | Summary: java.util.stream; Stream; true; max; (Comparator); ; Argument[this].Element; ReturnValue.Element; value; manual |
-| 53 | Summary: java.util.stream; Stream; true; min; (Comparator); ; Argument[this].Element; Argument[0].Parameter[0..1]; value; manual |
-| 54 | Summary: java.util.stream; Stream; true; min; (Comparator); ; Argument[this].Element; ReturnValue.Element; value; manual |
-| 55 | Summary: java.util.stream; Stream; true; noneMatch; (Predicate); ; Argument[this].Element; Argument[0].Parameter[0]; value; manual |
-| 56 | Summary: java.util.stream; Stream; true; of; (Object); ; Argument[0]; ReturnValue.Element; value; manual |
-| 57 | Summary: java.util.stream; Stream; true; of; (Object[]); ; Argument[0].ArrayElement; ReturnValue.Element; value; manual |
-| 58 | Summary: java.util.stream; Stream; true; ofNullable; (Object); ; Argument[0]; ReturnValue.Element; value; manual |
-| 59 | Summary: java.util.stream; Stream; true; peek; (Consumer); ; Argument[this].Element; Argument[0].Parameter[0]; value; manual |
-| 60 | Summary: java.util.stream; Stream; true; peek; (Consumer); ; Argument[this].Element; ReturnValue.Element; value; manual |
-| 61 | Summary: java.util.stream; Stream; true; reduce; (BinaryOperator); ; Argument[this].Element; Argument[0].Parameter[0..1]; value; manual |
-| 62 | Summary: java.util.stream; Stream; true; reduce; (BinaryOperator); ; Argument[this].Element; ReturnValue.Element; value; manual |
-| 63 | Summary: java.util.stream; Stream; true; reduce; (BinaryOperator); ; Argument[0].ReturnValue; Argument[0].Parameter[0..1]; value; manual |
-| 64 | Summary: java.util.stream; Stream; true; reduce; (BinaryOperator); ; Argument[0].ReturnValue; ReturnValue.Element; value; manual |
-| 65 | Summary: java.util.stream; Stream; true; reduce; (Object,BiFunction,BinaryOperator); ; Argument[this].Element; Argument[1].Parameter[1]; value; manual |
-| 66 | Summary: java.util.stream; Stream; true; reduce; (Object,BiFunction,BinaryOperator); ; Argument[0]; Argument[1].Parameter[0]; value; manual |
-| 67 | Summary: java.util.stream; Stream; true; reduce; (Object,BiFunction,BinaryOperator); ; Argument[0]; Argument[2].Parameter[0..1]; value; manual |
-| 68 | Summary: java.util.stream; Stream; true; reduce; (Object,BiFunction,BinaryOperator); ; Argument[0]; ReturnValue; value; manual |
-| 69 | Summary: java.util.stream; Stream; true; reduce; (Object,BiFunction,BinaryOperator); ; Argument[1..2].ReturnValue; Argument[1].Parameter[0]; value; manual |
-| 70 | Summary: java.util.stream; Stream; true; reduce; (Object,BiFunction,BinaryOperator); ; Argument[1..2].ReturnValue; Argument[2].Parameter[0..1]; value; manual |
-| 71 | Summary: java.util.stream; Stream; true; reduce; (Object,BiFunction,BinaryOperator); ; Argument[1..2].ReturnValue; ReturnValue; value; manual |
-| 72 | Summary: java.util.stream; Stream; true; reduce; (Object,BinaryOperator); ; Argument[this].Element; Argument[1].Parameter[0..1]; value; manual |
-| 73 | Summary: java.util.stream; Stream; true; reduce; (Object,BinaryOperator); ; Argument[0]; Argument[1].Parameter[0..1]; value; manual |
-| 74 | Summary: java.util.stream; Stream; true; reduce; (Object,BinaryOperator); ; Argument[0]; ReturnValue; value; manual |
-| 75 | Summary: java.util.stream; Stream; true; reduce; (Object,BinaryOperator); ; Argument[1].ReturnValue; Argument[1].Parameter[0..1]; value; manual |
-| 76 | Summary: java.util.stream; Stream; true; reduce; (Object,BinaryOperator); ; Argument[1].ReturnValue; ReturnValue; value; manual |
-| 77 | Summary: java.util.stream; Stream; true; skip; (long); ; Argument[this].Element; ReturnValue.Element; value; manual |
+| 43 | Summary: java.util.stream; Stream; true; mapMulti; (BiConsumer); ; Argument[this].Element; Argument[0].Parameter[0]; value; manual |
+| 44 | Summary: java.util.stream; Stream; true; mapMultiToDouble; (BiConsumer); ; Argument[this].Element; Argument[0].Parameter[0]; value; manual |
+| 45 | Summary: java.util.stream; Stream; true; mapMultiToInt; (BiConsumer); ; Argument[this].Element; Argument[0].Parameter[0]; value; manual |
+| 46 | Summary: java.util.stream; Stream; true; mapMultiToLong; (BiConsumer); ; Argument[this].Element; Argument[0].Parameter[0]; value; manual |
+| 47 | Summary: java.util.stream; Stream; true; mapToDouble; (ToDoubleFunction); ; Argument[this].Element; Argument[0].Parameter[0]; value; manual |
+| 48 | Summary: java.util.stream; Stream; true; mapToInt; (ToIntFunction); ; Argument[this].Element; Argument[0].Parameter[0]; value; manual |
+| 49 | Summary: java.util.stream; Stream; true; mapToLong; (ToLongFunction); ; Argument[this].Element; Argument[0].Parameter[0]; value; manual |
+| 50 | Summary: java.util.stream; Stream; true; max; (Comparator); ; Argument[this].Element; Argument[0].Parameter[0..1]; value; manual |
+| 51 | Summary: java.util.stream; Stream; true; max; (Comparator); ; Argument[this].Element; ReturnValue.Element; value; manual |
+| 52 | Summary: java.util.stream; Stream; true; min; (Comparator); ; Argument[this].Element; Argument[0].Parameter[0..1]; value; manual |
+| 53 | Summary: java.util.stream; Stream; true; min; (Comparator); ; Argument[this].Element; ReturnValue.Element; value; manual |
+| 54 | Summary: java.util.stream; Stream; true; noneMatch; (Predicate); ; Argument[this].Element; Argument[0].Parameter[0]; value; manual |
+| 55 | Summary: java.util.stream; Stream; true; of; (Object); ; Argument[0]; ReturnValue.Element; value; manual |
+| 56 | Summary: java.util.stream; Stream; true; of; (Object[]); ; Argument[0].ArrayElement; ReturnValue.Element; value; manual |
+| 57 | Summary: java.util.stream; Stream; true; ofNullable; (Object); ; Argument[0]; ReturnValue.Element; value; manual |
+| 58 | Summary: java.util.stream; Stream; true; peek; (Consumer); ; Argument[this].Element; Argument[0].Parameter[0]; value; manual |
+| 59 | Summary: java.util.stream; Stream; true; peek; (Consumer); ; Argument[this].Element; ReturnValue.Element; value; manual |
+| 60 | Summary: java.util.stream; Stream; true; reduce; (BinaryOperator); ; Argument[0].ReturnValue; Argument[0].Parameter[0..1]; value; manual |
+| 61 | Summary: java.util.stream; Stream; true; reduce; (BinaryOperator); ; Argument[0].ReturnValue; ReturnValue.Element; value; manual |
+| 62 | Summary: java.util.stream; Stream; true; reduce; (BinaryOperator); ; Argument[this].Element; Argument[0].Parameter[0..1]; value; manual |
+| 63 | Summary: java.util.stream; Stream; true; reduce; (BinaryOperator); ; Argument[this].Element; ReturnValue.Element; value; manual |
+| 64 | Summary: java.util.stream; Stream; true; reduce; (Object,BiFunction,BinaryOperator); ; Argument[0]; Argument[1].Parameter[0]; value; manual |
+| 65 | Summary: java.util.stream; Stream; true; reduce; (Object,BiFunction,BinaryOperator); ; Argument[0]; Argument[2].Parameter[0..1]; value; manual |
+| 66 | Summary: java.util.stream; Stream; true; reduce; (Object,BiFunction,BinaryOperator); ; Argument[0]; ReturnValue; value; manual |
+| 67 | Summary: java.util.stream; Stream; true; reduce; (Object,BiFunction,BinaryOperator); ; Argument[1..2].ReturnValue; Argument[1].Parameter[0]; value; manual |
+| 68 | Summary: java.util.stream; Stream; true; reduce; (Object,BiFunction,BinaryOperator); ; Argument[1..2].ReturnValue; Argument[2].Parameter[0..1]; value; manual |
+| 69 | Summary: java.util.stream; Stream; true; reduce; (Object,BiFunction,BinaryOperator); ; Argument[1..2].ReturnValue; ReturnValue; value; manual |
+| 70 | Summary: java.util.stream; Stream; true; reduce; (Object,BiFunction,BinaryOperator); ; Argument[this].Element; Argument[1].Parameter[1]; value; manual |
+| 71 | Summary: java.util.stream; Stream; true; reduce; (Object,BinaryOperator); ; Argument[0]; Argument[1].Parameter[0..1]; value; manual |
+| 72 | Summary: java.util.stream; Stream; true; reduce; (Object,BinaryOperator); ; Argument[0]; ReturnValue; value; manual |
+| 73 | Summary: java.util.stream; Stream; true; reduce; (Object,BinaryOperator); ; Argument[1].ReturnValue; Argument[1].Parameter[0..1]; value; manual |
+| 74 | Summary: java.util.stream; Stream; true; reduce; (Object,BinaryOperator); ; Argument[1].ReturnValue; ReturnValue; value; manual |
+| 75 | Summary: java.util.stream; Stream; true; reduce; (Object,BinaryOperator); ; Argument[this].Element; Argument[1].Parameter[0..1]; value; manual |
+| 76 | Summary: java.util.stream; Stream; true; skip; (long); ; Argument[this].Element; ReturnValue.Element; value; manual |
+| 77 | Summary: java.util.stream; Stream; true; sorted; (Comparator); ; Argument[this].Element; Argument[0].Parameter[0..1]; value; manual |
 | 78 | Summary: java.util.stream; Stream; true; sorted; ; ; Argument[this].Element; ReturnValue.Element; value; manual |
-| 79 | Summary: java.util.stream; Stream; true; sorted; (Comparator); ; Argument[this].Element; Argument[0].Parameter[0..1]; value; manual |
-| 80 | Summary: java.util.stream; Stream; true; takeWhile; (Predicate); ; Argument[this].Element; Argument[0].Parameter[0]; value; manual |
-| 81 | Summary: java.util.stream; Stream; true; takeWhile; (Predicate); ; Argument[this].Element; ReturnValue.Element; value; manual |
-| 82 | Summary: java.util.stream; Stream; true; toArray; ; ; Argument[this].Element; ReturnValue.ArrayElement; value; manual |
-| 83 | Summary: java.util.stream; Stream; true; toList; (); ; Argument[this].Element; ReturnValue.Element; value; manual |
-| 84 | Summary: generatedtest; Test; false; getElementSpliterator; (Spliterator); ; Argument[0].Element; ReturnValue; value; manual |
+| 79 | Summary: java.util.stream; Stream; true; takeWhile; (Predicate); ; Argument[this].Element; Argument[0].Parameter[0]; value; manual |
+| 80 | Summary: java.util.stream; Stream; true; takeWhile; (Predicate); ; Argument[this].Element; ReturnValue.Element; value; manual |
+| 81 | Summary: java.util.stream; Stream; true; toArray; ; ; Argument[this].Element; ReturnValue.ArrayElement; value; manual |
+| 82 | Summary: java.util.stream; Stream; true; toList; (); ; Argument[this].Element; ReturnValue.Element; value; manual |
+| 83 | Summary: java.util; Iterator; true; next; ; ; Argument[this].Element; ReturnValue; value; manual |
+| 84 | Summary: java.util; Optional; false; get; ; ; Argument[this].Element; ReturnValue; value; manual |
 edges
 | Test.java:16:27:16:35 | array : Object[] [[]] : Object | Test.java:16:47:16:51 | array : Object[] [[]] : Object | provenance |  |
 | Test.java:16:47:16:51 | array : Object[] [[]] : Object | Test.java:16:47:16:54 | ...[...] : Object | provenance |  |
 | Test.java:17:22:17:38 | s : BaseStream [<element>] : Object | Test.java:17:50:17:50 | s : BaseStream [<element>] : Object | provenance |  |
 | Test.java:17:22:17:38 | s : Stream [<element>] : Object | Test.java:17:50:17:50 | s : Stream [<element>] : Object | provenance |  |
-| Test.java:17:50:17:50 | s : BaseStream [<element>] : Object | Test.java:17:50:17:61 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:4 |
-| Test.java:17:50:17:50 | s : Stream [<element>] : Object | Test.java:17:50:17:61 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:4 |
-| Test.java:17:50:17:61 | iterator(...) : Iterator [<element>] : Object | Test.java:17:50:17:68 | next(...) : Object | provenance | MaD:2 |
-| Test.java:17:50:17:61 | iterator(...) : Iterator [<element>] : Object | Test.java:17:50:17:68 | next(...) : Object | provenance | MaD:2 |
+| Test.java:17:50:17:50 | s : BaseStream [<element>] : Object | Test.java:17:50:17:61 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:3 |
+| Test.java:17:50:17:50 | s : Stream [<element>] : Object | Test.java:17:50:17:61 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:3 |
+| Test.java:17:50:17:61 | iterator(...) : Iterator [<element>] : Object | Test.java:17:50:17:68 | next(...) : Object | provenance | MaD:83 |
+| Test.java:17:50:17:61 | iterator(...) : Iterator [<element>] : Object | Test.java:17:50:17:68 | next(...) : Object | provenance | MaD:83 |
 | Test.java:18:22:18:35 | it : List [<element>] : Object | Test.java:18:47:18:48 | it : List [<element>] : Object | provenance |  |
-| Test.java:18:47:18:48 | it : List [<element>] : Object | Test.java:18:47:18:59 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:1 |
-| Test.java:18:47:18:59 | iterator(...) : Iterator [<element>] : Object | Test.java:18:47:18:66 | next(...) : Object | provenance | MaD:2 |
+| Test.java:18:47:18:48 | it : List [<element>] : Object | Test.java:18:47:18:59 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:2 |
+| Test.java:18:47:18:59 | iterator(...) : Iterator [<element>] : Object | Test.java:18:47:18:66 | next(...) : Object | provenance | MaD:83 |
 | Test.java:19:22:19:35 | it : Iterator [<element>] : Object | Test.java:19:47:19:48 | it : Iterator [<element>] : Object | provenance |  |
-| Test.java:19:47:19:48 | it : Iterator [<element>] : Object | Test.java:19:47:19:55 | next(...) : Object | provenance | MaD:2 |
+| Test.java:19:47:19:48 | it : Iterator [<element>] : Object | Test.java:19:47:19:55 | next(...) : Object | provenance | MaD:83 |
 | Test.java:20:22:20:34 | o : Optional [<element>] : Object | Test.java:20:46:20:46 | o : Optional [<element>] : Object | provenance |  |
-| Test.java:20:46:20:46 | o : Optional [<element>] : Object | Test.java:20:46:20:52 | get(...) : Object | provenance | MaD:3 |
+| Test.java:20:46:20:46 | o : Optional [<element>] : Object | Test.java:20:46:20:52 | get(...) : Object | provenance | MaD:84 |
 | Test.java:31:29:31:71 | (...)... : Stream [<element>] : Object | Test.java:32:19:32:20 | in : Stream [<element>] : Object | provenance |  |
 | Test.java:31:41:31:71 | of(...) : Stream [<element>] : Object | Test.java:31:29:31:71 | (...)... : Stream [<element>] : Object | provenance |  |
-| Test.java:31:51:31:70 | source(...) : Object | Test.java:31:41:31:71 | of(...) : Stream [<element>] : Object | provenance | MaD:56 |
-| Test.java:32:19:32:20 | in : Stream [<element>] : Object | Test.java:32:19:32:31 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:4 |
+| Test.java:31:51:31:70 | source(...) : Object | Test.java:31:41:31:71 | of(...) : Stream [<element>] : Object | provenance | MaD:55 |
+| Test.java:32:19:32:20 | in : Stream [<element>] : Object | Test.java:32:19:32:31 | iterator(...) : Iterator [<element>] : Object | provenance | MaD:3 |
 | Test.java:32:19:32:31 | iterator(...) : Iterator [<element>] : Object | Test.java:33:29:33:31 | out : Iterator [<element>] : Object | provenance |  |
 | Test.java:33:29:33:31 | out : Iterator [<element>] : Object | Test.java:19:22:19:35 | it : Iterator [<element>] : Object | provenance |  |
-| Test.java:33:29:33:31 | out : Iterator [<element>] : Object | Test.java:33:18:33:32 | getElement(...) | provenance | MaD:2 |
+| Test.java:33:29:33:31 | out : Iterator [<element>] : Object | Test.java:33:18:33:32 | getElement(...) | provenance | MaD:83 |
 | Test.java:38:29:38:70 | (...)... : Stream [<element>] : Object | Test.java:39:19:39:20 | in : Stream [<element>] : Object | provenance |  |
 | Test.java:38:41:38:70 | of(...) : Stream [<element>] : Object | Test.java:38:29:38:70 | (...)... : Stream [<element>] : Object | provenance |  |
-| Test.java:38:51:38:69 | source(...) : Object | Test.java:38:41:38:70 | of(...) : Stream [<element>] : Object | provenance | MaD:56 |
-| Test.java:39:19:39:20 | in : Stream [<element>] : Object | Test.java:39:19:39:34 | onClose(...) : BaseStream [<element>] : Object | provenance | MaD:5 |
+| Test.java:38:51:38:69 | source(...) : Object | Test.java:38:41:38:70 | of(...) : Stream [<element>] : Object | provenance | MaD:55 |
+| Test.java:39:19:39:20 | in : Stream [<element>] : Object | Test.java:39:19:39:34 | onClose(...) : BaseStream [<element>] : Object | provenance | MaD:4 |
 | Test.java:39:19:39:34 | onClose(...) : BaseStream [<element>] : Object | Test.java:40:29:40:31 | out : BaseStream [<element>] : Object | provenance |  |
 | Test.java:40:29:40:31 | out : BaseStream [<element>] : Object | Test.java:17:22:17:38 | s : BaseStream [<element>] : Object | provenance |  |
-| Test.java:40:29:40:31 | out : BaseStream [<element>] : Object | Test.java:40:18:40:32 | getElement(...) | provenance | MaD:4 |
+| Test.java:40:29:40:31 | out : BaseStream [<element>] : Object | Test.java:40:18:40:32 | getElement(...) | provenance | MaD:3 |
 | Test.java:45:29:45:71 | (...)... : Stream [<element>] : Object | Test.java:46:19:46:20 | in : Stream [<element>] : Object | provenance |  |
 | Test.java:45:41:45:71 | of(...) : Stream [<element>] : Object | Test.java:45:29:45:71 | (...)... : Stream [<element>] : Object | provenance |  |
-| Test.java:45:51:45:70 | source(...) : Object | Test.java:45:41:45:71 | of(...) : Stream [<element>] : Object | provenance | MaD:56 |
-| Test.java:46:19:46:20 | in : Stream [<element>] : Object | Test.java:46:19:46:31 | parallel(...) : BaseStream [<element>] : Object | provenance | MaD:6 |
+| Test.java:45:51:45:70 | source(...) : Object | Test.java:45:41:45:71 | of(...) : Stream [<element>] : Object | provenance | MaD:55 |
+| Test.java:46:19:46:20 | in : Stream [<element>] : Object | Test.java:46:19:46:31 | parallel(...) : BaseStream [<element>] : Object | provenance | MaD:5 |
 | Test.java:46:19:46:31 | parallel(...) : BaseStream [<element>] : Object | Test.java:47:29:47:31 | out : BaseStream [<element>] : Object | provenance |  |
 | Test.java:47:29:47:31 | out : BaseStream [<element>] : Object | Test.java:17:22:17:38 | s : BaseStream [<element>] : Object | provenance |  |
-| Test.java:47:29:47:31 | out : BaseStream [<element>] : Object | Test.java:47:18:47:32 | getElement(...) | provenance | MaD:4 |
+| Test.java:47:29:47:31 | out : BaseStream [<element>] : Object | Test.java:47:18:47:32 | getElement(...) | provenance | MaD:3 |
 | Test.java:52:29:52:73 | (...)... : Stream [<element>] : Object | Test.java:53:19:53:20 | in : Stream [<element>] : Object | provenance |  |
 | Test.java:52:41:52:73 | of(...) : Stream [<element>] : Object | Test.java:52:29:52:73 | (...)... : Stream [<element>] : Object | provenance |  |
-| Test.java:52:51:52:72 | source(...) : Object | Test.java:52:41:52:73 | of(...) : Stream [<element>] : Object | provenance | MaD:56 |
-| Test.java:53:19:53:20 | in : Stream [<element>] : Object | Test.java:53:19:53:33 | sequential(...) : BaseStream [<element>] : Object | provenance | MaD:7 |
+| Test.java:52:51:52:72 | source(...) : Object | Test.java:52:41:52:73 | of(...) : Stream [<element>] : Object | provenance | MaD:55 |
+| Test.java:53:19:53:20 | in : Stream [<element>] : Object | Test.java:53:19:53:33 | sequential(...) : BaseStream [<element>] : Object | provenance | MaD:6 |
 | Test.java:53:19:53:33 | sequential(...) : BaseStream [<element>] : Object | Test.java:54:29:54:31 | out : BaseStream [<element>] : Object | provenance |  |
 | Test.java:54:29:54:31 | out : BaseStream [<element>] : Object | Test.java:17:22:17:38 | s : BaseStream [<element>] : Object | provenance |  |
-| Test.java:54:29:54:31 | out : BaseStream [<element>] : Object | Test.java:54:18:54:32 | getElement(...) | provenance | MaD:4 |
+| Test.java:54:29:54:31 | out : BaseStream [<element>] : Object | Test.java:54:18:54:32 | getElement(...) | provenance | MaD:3 |
 | Test.java:59:29:59:74 | (...)... : Stream [<element>] : Object | Test.java:60:19:60:20 | in : Stream [<element>] : Object | provenance |  |
 | Test.java:59:41:59:74 | of(...) : Stream [<element>] : Object | Test.java:59:29:59:74 | (...)... : Stream [<element>] : Object | provenance |  |
-| Test.java:59:51:59:73 | source(...) : Object | Test.java:59:41:59:74 | of(...) : Stream [<element>] : Object | provenance | MaD:56 |
-| Test.java:60:19:60:20 | in : Stream [<element>] : Object | Test.java:60:19:60:34 | spliterator(...) : Spliterator [<element>] : Object | provenance | MaD:8 |
+| Test.java:59:51:59:73 | source(...) : Object | Test.java:59:41:59:74 | of(...) : Stream [<element>] : Object | provenance | MaD:55 |
+| Test.java:60:19:60:20 | in : Stream [<element>] : Object | Test.java:60:19:60:34 | spliterator(...) : Spliterator [<element>] : Object | provenance | MaD:7 |
 | Test.java:60:19:60:34 | spliterator(...) : Spliterator [<element>] : Object | Test.java:61:40:61:42 | out : Spliterator [<element>] : Object | provenance |  |
-| Test.java:61:40:61:42 | out : Spliterator [<element>] : Object | Test.java:61:18:61:43 | getElementSpliterator(...) | provenance | MaD:84 |
+| Test.java:61:40:61:42 | out : Spliterator [<element>] : Object | Test.java:61:18:61:43 | getElementSpliterator(...) | provenance | MaD:1 |
 | Test.java:66:29:66:72 | (...)... : Stream [<element>] : Object | Test.java:67:19:67:20 | in : Stream [<element>] : Object | provenance |  |
 | Test.java:66:41:66:72 | of(...) : Stream [<element>] : Object | Test.java:66:29:66:72 | (...)... : Stream [<element>] : Object | provenance |  |
-| Test.java:66:51:66:71 | source(...) : Object | Test.java:66:41:66:72 | of(...) : Stream [<element>] : Object | provenance | MaD:56 |
-| Test.java:67:19:67:20 | in : Stream [<element>] : Object | Test.java:67:19:67:32 | unordered(...) : BaseStream [<element>] : Object | provenance | MaD:9 |
+| Test.java:66:51:66:71 | source(...) : Object | Test.java:66:41:66:72 | of(...) : Stream [<element>] : Object | provenance | MaD:55 |
+| Test.java:67:19:67:20 | in : Stream [<element>] : Object | Test.java:67:19:67:32 | unordered(...) : BaseStream [<element>] : Object | provenance | MaD:8 |
 | Test.java:67:19:67:32 | unordered(...) : BaseStream [<element>] : Object | Test.java:68:29:68:31 | out : BaseStream [<element>] : Object | provenance |  |
 | Test.java:68:29:68:31 | out : BaseStream [<element>] : Object | Test.java:17:22:17:38 | s : BaseStream [<element>] : Object | provenance |  |
-| Test.java:68:29:68:31 | out : BaseStream [<element>] : Object | Test.java:68:18:68:32 | getElement(...) | provenance | MaD:4 |
+| Test.java:68:29:68:31 | out : BaseStream [<element>] : Object | Test.java:68:18:68:32 | getElement(...) | provenance | MaD:3 |
 | Test.java:73:25:73:61 | (...)... : Stream [<element>] : Object | Test.java:74:33:74:34 | in : Stream [<element>] : Object | provenance |  |
 | Test.java:73:33:73:61 | of(...) : Stream [<element>] : Object | Test.java:73:25:73:61 | (...)... : Stream [<element>] : Object | provenance |  |
-| Test.java:73:43:73:60 | source(...) : Object | Test.java:73:33:73:61 | of(...) : Stream [<element>] : Object | provenance | MaD:56 |
+| Test.java:73:43:73:60 | source(...) : Object | Test.java:73:33:73:61 | of(...) : Stream [<element>] : Object | provenance | MaD:55 |
 | Test.java:74:19:74:41 | concat(...) : Stream [<element>] : Object | Test.java:75:29:75:31 | out : Stream [<element>] : Object | provenance |  |
-| Test.java:74:33:74:34 | in : Stream [<element>] : Object | Test.java:74:19:74:41 | concat(...) : Stream [<element>] : Object | provenance | MaD:17 |
+| Test.java:74:33:74:34 | in : Stream [<element>] : Object | Test.java:74:19:74:41 | concat(...) : Stream [<element>] : Object | provenance | MaD:16 |
 | Test.java:75:29:75:31 | out : Stream [<element>] : Object | Test.java:17:22:17:38 | s : Stream [<element>] : Object | provenance |  |
-| Test.java:75:29:75:31 | out : Stream [<element>] : Object | Test.java:75:18:75:32 | getElement(...) | provenance | MaD:4 |
+| Test.java:75:29:75:31 | out : Stream [<element>] : Object | Test.java:75:18:75:32 | getElement(...) | provenance | MaD:3 |
 | Test.java:80:25:80:61 | (...)... : Stream [<element>] : Object | Test.java:81:39:81:40 | in : Stream [<element>] : Object | provenance |  |
 | Test.java:80:33:80:61 | of(...) : Stream [<element>] : Object | Test.java:80:25:80:61 | (...)... : Stream [<element>] : Object | provenance |  |
-| Test.java:80:43:80:60 | source(...) : Object | Test.java:80:33:80:61 | of(...) : Stream [<element>] : Object | provenance | MaD:56 |
+| Test.java:80:43:80:60 | source(...) : Object | Test.java:80:33:80:61 | of(...) : Stream [<element>] : Object | provenance | MaD:55 |
 | Test.java:81:19:81:41 | concat(...) : Stream [<element>] : Object | Test.java:82:29:82:31 | out : Stream [<element>] : Object | provenance |  |
-| Test.java:81:39:81:40 | in : Stream [<element>] : Object | Test.java:81:19:81:41 | concat(...) : Stream [<element>] : Object | provenance | MaD:17 |
+| Test.java:81:39:81:40 | in : Stream [<element>] : Object | Test.java:81:19:81:41 | concat(...) : Stream [<element>] : Object | provenance | MaD:16 |
 | Test.java:82:29:82:31 | out : Stream [<element>] : Object | Test.java:17:22:17:38 | s : Stream [<element>] : Object | provenance |  |
-| Test.java:82:29:82:31 | out : Stream [<element>] : Object | Test.java:82:18:82:32 | getElement(...) | provenance | MaD:4 |
+| Test.java:82:29:82:31 | out : Stream [<element>] : Object | Test.java:82:18:82:32 | getElement(...) | provenance | MaD:3 |
 | Test.java:87:25:87:63 | (...)... : Stream [<element>] : Object | Test.java:88:19:88:20 | in : Stream [<element>] : Object | provenance |  |
 | Test.java:87:33:87:63 | of(...) : Stream [<element>] : Object | Test.java:87:25:87:63 | (...)... : Stream [<element>] : Object | provenance |  |
-| Test.java:87:43:87:62 | source(...) : Object | Test.java:87:33:87:63 | of(...) : Stream [<element>] : Object | provenance | MaD:56 |
-| Test.java:88:19:88:20 | in : Stream [<element>] : Object | Test.java:88:19:88:31 | distinct(...) : Stream [<element>] : Object | provenance | MaD:18 |
+| Test.java:87:43:87:62 | source(...) : Object | Test.java:87:33:87:63 | of(...) : Stream [<element>] : Object | provenance | MaD:55 |
+| Test.java:88:19:88:20 | in : Stream [<element>] : Object | Test.java:88:19:88:31 | distinct(...) : Stream [<element>] : Object | provenance | MaD:17 |
 | Test.java:88:19:88:31 | distinct(...) : Stream [<element>] : Object | Test.java:89:29:89:31 | out : Stream [<element>] : Object | provenance |  |
 | Test.java:89:29:89:31 | out : Stream [<element>] : Object | Test.java:17:22:17:38 | s : Stream [<element>] : Object | provenance |  |
-| Test.java:89:29:89:31 | out : Stream [<element>] : Object | Test.java:89:18:89:32 | getElement(...) | provenance | MaD:4 |
+| Test.java:89:29:89:31 | out : Stream [<element>] : Object | Test.java:89:18:89:32 | getElement(...) | provenance | MaD:3 |
 | Test.java:94:25:94:64 | (...)... : Stream [<element>] : Object | Test.java:95:19:95:20 | in : Stream [<element>] : Object | provenance |  |
 | Test.java:94:33:94:64 | of(...) : Stream [<element>] : Object | Test.java:94:25:94:64 | (...)... : Stream [<element>] : Object | provenance |  |
-| Test.java:94:43:94:63 | source(...) : Object | Test.java:94:33:94:64 | of(...) : Stream [<element>] : Object | provenance | MaD:56 |
-| Test.java:95:19:95:20 | in : Stream [<element>] : Object | Test.java:95:19:95:36 | dropWhile(...) : Stream [<element>] : Object | provenance | MaD:20 |
+| Test.java:94:43:94:63 | source(...) : Object | Test.java:94:33:94:64 | of(...) : Stream [<element>] : Object | provenance | MaD:55 |
+| Test.java:95:19:95:20 | in : Stream [<element>] : Object | Test.java:95:19:95:36 | dropWhile(...) : Stream [<element>] : Object | provenance | MaD:19 |
 | Test.java:95:19:95:36 | dropWhile(...) : Stream [<element>] : Object | Test.java:96:29:96:31 | out : Stream [<element>] : Object | provenance |  |
 | Test.java:96:29:96:31 | out : Stream [<element>] : Object | Test.java:17:22:17:38 | s : Stream [<element>] : Object | provenance |  |
-| Test.java:96:29:96:31 | out : Stream [<element>] : Object | Test.java:96:18:96:32 | getElement(...) | provenance | MaD:4 |
+| Test.java:96:29:96:31 | out : Stream [<element>] : Object | Test.java:96:18:96:32 | getElement(...) | provenance | MaD:3 |
 | Test.java:101:25:101:61 | (...)... : Stream [<element>] : Object | Test.java:102:19:102:20 | in : Stream [<element>] : Object | provenance |  |
 | Test.java:101:33:101:61 | of(...) : Stream [<element>] : Object | Test.java:101:25:101:61 | (...)... : Stream [<element>] : Object | provenance |  |
-| Test.java:101:43:101:60 | source(...) : Object | Test.java:101:33:101:61 | of(...) : Stream [<element>] : Object | provenance | MaD:56 |
-| Test.java:102:19:102:20 | in : Stream [<element>] : Object | Test.java:102:19:102:33 | filter(...) : Stream [<element>] : Object | provenance | MaD:22 |
+| Test.java:101:43:101:60 | source(...) : Object | Test.java:101:33:101:61 | of(...) : Stream [<element>] : Object | provenance | MaD:55 |
+| Test.java:102:19:102:20 | in : Stream [<element>] : Object | Test.java:102:19:102:33 | filter(...) : Stream [<element>] : Object | provenance | MaD:21 |
 | Test.java:102:19:102:33 | filter(...) : Stream [<element>] : Object | Test.java:103:29:103:31 | out : Stream [<element>] : Object | provenance |  |
 | Test.java:103:29:103:31 | out : Stream [<element>] : Object | Test.java:17:22:17:38 | s : Stream [<element>] : Object | provenance |  |
-| Test.java:103:29:103:31 | out : Stream [<element>] : Object | Test.java:103:18:103:32 | getElement(...) | provenance | MaD:4 |
+| Test.java:103:29:103:31 | out : Stream [<element>] : Object | Test.java:103:18:103:32 | getElement(...) | provenance | MaD:3 |
 | Test.java:108:25:108:62 | (...)... : Stream [<element>] : Object | Test.java:109:19:109:20 | in : Stream [<element>] : Object | provenance |  |
 | Test.java:108:33:108:62 | of(...) : Stream [<element>] : Object | Test.java:108:25:108:62 | (...)... : Stream [<element>] : Object | provenance |  |
-| Test.java:108:43:108:61 | source(...) : Object | Test.java:108:33:108:62 | of(...) : Stream [<element>] : Object | provenance | MaD:56 |
-| Test.java:109:19:109:20 | in : Stream [<element>] : Object | Test.java:109:19:109:30 | findAny(...) : Optional [<element>] : Object | provenance | MaD:23 |
+| Test.java:108:43:108:61 | source(...) : Object | Test.java:108:33:108:62 | of(...) : Stream [<element>] : Object | provenance | MaD:55 |
+| Test.java:109:19:109:20 | in : Stream [<element>] : Object | Test.java:109:19:109:30 | findAny(...) : Optional [<element>] : Object | provenance | MaD:22 |
 | Test.java:109:19:109:30 | findAny(...) : Optional [<element>] : Object | Test.java:110:29:110:31 | out : Optional [<element>] : Object | provenance |  |
 | Test.java:110:29:110:31 | out : Optional [<element>] : Object | Test.java:20:22:20:34 | o : Optional [<element>] : Object | provenance |  |
-| Test.java:110:29:110:31 | out : Optional [<element>] : Object | Test.java:110:18:110:32 | getElement(...) | provenance | MaD:3 |
+| Test.java:110:29:110:31 | out : Optional [<element>] : Object | Test.java:110:18:110:32 | getElement(...) | provenance | MaD:84 |
 | Test.java:115:25:115:64 | (...)... : Stream [<element>] : Object | Test.java:116:19:116:20 | in : Stream [<element>] : Object | provenance |  |
 | Test.java:115:33:115:64 | of(...) : Stream [<element>] : Object | Test.java:115:25:115:64 | (...)... : Stream [<element>] : Object | provenance |  |
-| Test.java:115:43:115:63 | source(...) : Object | Test.java:115:33:115:64 | of(...) : Stream [<element>] : Object | provenance | MaD:56 |
-| Test.java:116:19:116:20 | in : Stream [<element>] : Object | Test.java:116:19:116:32 | findFirst(...) : Optional [<element>] : Object | provenance | MaD:24 |
+| Test.java:115:43:115:63 | source(...) : Object | Test.java:115:33:115:64 | of(...) : Stream [<element>] : Object | provenance | MaD:55 |
+| Test.java:116:19:116:20 | in : Stream [<element>] : Object | Test.java:116:19:116:32 | findFirst(...) : Optional [<element>] : Object | provenance | MaD:23 |
 | Test.java:116:19:116:32 | findFirst(...) : Optional [<element>] : Object | Test.java:117:29:117:31 | out : Optional [<element>] : Object | provenance |  |
 | Test.java:117:29:117:31 | out : Optional [<element>] : Object | Test.java:20:22:20:34 | o : Optional [<element>] : Object | provenance |  |
-| Test.java:117:29:117:31 | out : Optional [<element>] : Object | Test.java:117:18:117:32 | getElement(...) | provenance | MaD:3 |
+| Test.java:117:29:117:31 | out : Optional [<element>] : Object | Test.java:117:18:117:32 | getElement(...) | provenance | MaD:84 |
 | Test.java:122:25:122:60 | (...)... : Stream [<element>] : Object | Test.java:123:19:123:20 | in : Stream [<element>] : Object | provenance |  |
 | Test.java:122:33:122:60 | of(...) : Stream [<element>] : Object | Test.java:122:25:122:60 | (...)... : Stream [<element>] : Object | provenance |  |
-| Test.java:122:43:122:59 | source(...) : Object | Test.java:122:33:122:60 | of(...) : Stream [<element>] : Object | provenance | MaD:56 |
-| Test.java:123:19:123:20 | in : Stream [<element>] : Object | Test.java:123:19:123:30 | limit(...) : Stream [<element>] : Object | provenance | MaD:41 |
+| Test.java:122:43:122:59 | source(...) : Object | Test.java:122:33:122:60 | of(...) : Stream [<element>] : Object | provenance | MaD:55 |
+| Test.java:123:19:123:20 | in : Stream [<element>] : Object | Test.java:123:19:123:30 | limit(...) : Stream [<element>] : Object | provenance | MaD:40 |
 | Test.java:123:19:123:30 | limit(...) : Stream [<element>] : Object | Test.java:124:29:124:31 | out : Stream [<element>] : Object | provenance |  |
 | Test.java:124:29:124:31 | out : Stream [<element>] : Object | Test.java:17:22:17:38 | s : Stream [<element>] : Object | provenance |  |
-| Test.java:124:29:124:31 | out : Stream [<element>] : Object | Test.java:124:18:124:32 | getElement(...) | provenance | MaD:4 |
+| Test.java:124:29:124:31 | out : Stream [<element>] : Object | Test.java:124:18:124:32 | getElement(...) | provenance | MaD:3 |
 | Test.java:129:25:129:58 | (...)... : Stream [<element>] : Object | Test.java:130:19:130:20 | in : Stream [<element>] : Object | provenance |  |
 | Test.java:129:33:129:58 | of(...) : Stream [<element>] : Object | Test.java:129:25:129:58 | (...)... : Stream [<element>] : Object | provenance |  |
-| Test.java:129:43:129:57 | source(...) : Object | Test.java:129:33:129:58 | of(...) : Stream [<element>] : Object | provenance | MaD:56 |
-| Test.java:130:19:130:20 | in : Stream [<element>] : Object | Test.java:130:19:130:30 | max(...) : Optional [<element>] : Object | provenance | MaD:52 |
+| Test.java:129:43:129:57 | source(...) : Object | Test.java:129:33:129:58 | of(...) : Stream [<element>] : Object | provenance | MaD:55 |
+| Test.java:130:19:130:20 | in : Stream [<element>] : Object | Test.java:130:19:130:30 | max(...) : Optional [<element>] : Object | provenance | MaD:51 |
 | Test.java:130:19:130:30 | max(...) : Optional [<element>] : Object | Test.java:131:29:131:31 | out : Optional [<element>] : Object | provenance |  |
 | Test.java:131:29:131:31 | out : Optional [<element>] : Object | Test.java:20:22:20:34 | o : Optional [<element>] : Object | provenance |  |
-| Test.java:131:29:131:31 | out : Optional [<element>] : Object | Test.java:131:18:131:32 | getElement(...) | provenance | MaD:3 |
+| Test.java:131:29:131:31 | out : Optional [<element>] : Object | Test.java:131:18:131:32 | getElement(...) | provenance | MaD:84 |
 | Test.java:136:25:136:58 | (...)... : Stream [<element>] : Object | Test.java:137:19:137:20 | in : Stream [<element>] : Object | provenance |  |
 | Test.java:136:33:136:58 | of(...) : Stream [<element>] : Object | Test.java:136:25:136:58 | (...)... : Stream [<element>] : Object | provenance |  |
-| Test.java:136:43:136:57 | source(...) : Object | Test.java:136:33:136:58 | of(...) : Stream [<element>] : Object | provenance | MaD:56 |
-| Test.java:137:19:137:20 | in : Stream [<element>] : Object | Test.java:137:19:137:30 | min(...) : Optional [<element>] : Object | provenance | MaD:54 |
+| Test.java:136:43:136:57 | source(...) : Object | Test.java:136:33:136:58 | of(...) : Stream [<element>] : Object | provenance | MaD:55 |
+| Test.java:137:19:137:20 | in : Stream [<element>] : Object | Test.java:137:19:137:30 | min(...) : Optional [<element>] : Object | provenance | MaD:53 |
 | Test.java:137:19:137:30 | min(...) : Optional [<element>] : Object | Test.java:138:29:138:31 | out : Optional [<element>] : Object | provenance |  |
 | Test.java:138:29:138:31 | out : Optional [<element>] : Object | Test.java:20:22:20:34 | o : Optional [<element>] : Object | provenance |  |
-| Test.java:138:29:138:31 | out : Optional [<element>] : Object | Test.java:138:18:138:32 | getElement(...) | provenance | MaD:3 |
+| Test.java:138:29:138:31 | out : Optional [<element>] : Object | Test.java:138:18:138:32 | getElement(...) | provenance | MaD:84 |
 | Test.java:143:25:143:46 | (...)... : Object | Test.java:144:29:144:30 | in : Object | provenance |  |
 | Test.java:143:33:143:46 | source(...) : Object | Test.java:143:25:143:46 | (...)... : Object | provenance |  |
 | Test.java:144:19:144:31 | of(...) : Stream [<element>] : Object | Test.java:145:29:145:31 | out : Stream [<element>] : Object | provenance |  |
-| Test.java:144:29:144:30 | in : Object | Test.java:144:19:144:31 | of(...) : Stream [<element>] : Object | provenance | MaD:56 |
+| Test.java:144:29:144:30 | in : Object | Test.java:144:19:144:31 | of(...) : Stream [<element>] : Object | provenance | MaD:55 |
 | Test.java:145:29:145:31 | out : Stream [<element>] : Object | Test.java:17:22:17:38 | s : Stream [<element>] : Object | provenance |  |
-| Test.java:145:29:145:31 | out : Stream [<element>] : Object | Test.java:145:18:145:32 | getElement(...) | provenance | MaD:4 |
+| Test.java:145:29:145:31 | out : Stream [<element>] : Object | Test.java:145:18:145:32 | getElement(...) | provenance | MaD:3 |
 | Test.java:150:27:150:64 | (...)... : Object[] [[]] : Object | Test.java:151:29:151:30 | in : Object[] [[]] : Object | provenance |  |
 | Test.java:150:37:150:64 | {...} : Object[] [[]] : Object | Test.java:150:27:150:64 | (...)... : Object[] [[]] : Object | provenance |  |
 | Test.java:150:50:150:63 | source(...) : Object | Test.java:150:37:150:64 | {...} : Object[] [[]] : Object | provenance |  |
 | Test.java:151:19:151:31 | of(...) : Stream [<element>] : Object | Test.java:152:29:152:31 | out : Stream [<element>] : Object | provenance |  |
-| Test.java:151:29:151:30 | in : Object[] [[]] : Object | Test.java:151:19:151:31 | of(...) : Stream [<element>] : Object | provenance | MaD:57 |
+| Test.java:151:29:151:30 | in : Object[] [[]] : Object | Test.java:151:19:151:31 | of(...) : Stream [<element>] : Object | provenance | MaD:56 |
 | Test.java:152:29:152:31 | out : Stream [<element>] : Object | Test.java:17:22:17:38 | s : Stream [<element>] : Object | provenance |  |
-| Test.java:152:29:152:31 | out : Stream [<element>] : Object | Test.java:152:18:152:32 | getElement(...) | provenance | MaD:4 |
+| Test.java:152:29:152:31 | out : Stream [<element>] : Object | Test.java:152:18:152:32 | getElement(...) | provenance | MaD:3 |
 | Test.java:157:25:157:54 | (...)... : Object | Test.java:158:37:158:38 | in : Object | provenance |  |
 | Test.java:157:33:157:54 | source(...) : Object | Test.java:157:25:157:54 | (...)... : Object | provenance |  |
 | Test.java:158:19:158:39 | ofNullable(...) : Stream [<element>] : Object | Test.java:159:29:159:31 | out : Stream [<element>] : Object | provenance |  |
-| Test.java:158:37:158:38 | in : Object | Test.java:158:19:158:39 | ofNullable(...) : Stream [<element>] : Object | provenance | MaD:58 |
+| Test.java:158:37:158:38 | in : Object | Test.java:158:19:158:39 | ofNullable(...) : Stream [<element>] : Object | provenance | MaD:57 |
 | Test.java:159:29:159:31 | out : Stream [<element>] : Object | Test.java:17:22:17:38 | s : Stream [<element>] : Object | provenance |  |
-| Test.java:159:29:159:31 | out : Stream [<element>] : Object | Test.java:159:18:159:32 | getElement(...) | provenance | MaD:4 |
+| Test.java:159:29:159:31 | out : Stream [<element>] : Object | Test.java:159:18:159:32 | getElement(...) | provenance | MaD:3 |
 | Test.java:164:25:164:59 | (...)... : Stream [<element>] : Object | Test.java:165:19:165:20 | in : Stream [<element>] : Object | provenance |  |
 | Test.java:164:33:164:59 | of(...) : Stream [<element>] : Object | Test.java:164:25:164:59 | (...)... : Stream [<element>] : Object | provenance |  |
-| Test.java:164:43:164:58 | source(...) : Object | Test.java:164:33:164:59 | of(...) : Stream [<element>] : Object | provenance | MaD:56 |
-| Test.java:165:19:165:20 | in : Stream [<element>] : Object | Test.java:165:19:165:31 | peek(...) : Stream [<element>] : Object | provenance | MaD:60 |
+| Test.java:164:43:164:58 | source(...) : Object | Test.java:164:33:164:59 | of(...) : Stream [<element>] : Object | provenance | MaD:55 |
+| Test.java:165:19:165:20 | in : Stream [<element>] : Object | Test.java:165:19:165:31 | peek(...) : Stream [<element>] : Object | provenance | MaD:59 |
 | Test.java:165:19:165:31 | peek(...) : Stream [<element>] : Object | Test.java:166:29:166:31 | out : Stream [<element>] : Object | provenance |  |
 | Test.java:166:29:166:31 | out : Stream [<element>] : Object | Test.java:17:22:17:38 | s : Stream [<element>] : Object | provenance |  |
-| Test.java:166:29:166:31 | out : Stream [<element>] : Object | Test.java:166:18:166:32 | getElement(...) | provenance | MaD:4 |
+| Test.java:166:29:166:31 | out : Stream [<element>] : Object | Test.java:166:18:166:32 | getElement(...) | provenance | MaD:3 |
 | Test.java:171:25:171:59 | (...)... : Stream [<element>] : Object | Test.java:172:19:172:20 | in : Stream [<element>] : Object | provenance |  |
 | Test.java:171:33:171:59 | of(...) : Stream [<element>] : Object | Test.java:171:25:171:59 | (...)... : Stream [<element>] : Object | provenance |  |
-| Test.java:171:43:171:58 | source(...) : Object | Test.java:171:33:171:59 | of(...) : Stream [<element>] : Object | provenance | MaD:56 |
-| Test.java:172:19:172:20 | in : Stream [<element>] : Object | Test.java:172:19:172:29 | skip(...) : Stream [<element>] : Object | provenance | MaD:77 |
+| Test.java:171:43:171:58 | source(...) : Object | Test.java:171:33:171:59 | of(...) : Stream [<element>] : Object | provenance | MaD:55 |
+| Test.java:172:19:172:20 | in : Stream [<element>] : Object | Test.java:172:19:172:29 | skip(...) : Stream [<element>] : Object | provenance | MaD:76 |
 | Test.java:172:19:172:29 | skip(...) : Stream [<element>] : Object | Test.java:173:29:173:31 | out : Stream [<element>] : Object | provenance |  |
 | Test.java:173:29:173:31 | out : Stream [<element>] : Object | Test.java:17:22:17:38 | s : Stream [<element>] : Object | provenance |  |
-| Test.java:173:29:173:31 | out : Stream [<element>] : Object | Test.java:173:18:173:32 | getElement(...) | provenance | MaD:4 |
+| Test.java:173:29:173:31 | out : Stream [<element>] : Object | Test.java:173:18:173:32 | getElement(...) | provenance | MaD:3 |
 | Test.java:178:25:178:61 | (...)... : Stream [<element>] : Object | Test.java:179:19:179:20 | in : Stream [<element>] : Object | provenance |  |
 | Test.java:178:33:178:61 | of(...) : Stream [<element>] : Object | Test.java:178:25:178:61 | (...)... : Stream [<element>] : Object | provenance |  |
-| Test.java:178:43:178:60 | source(...) : Object | Test.java:178:33:178:61 | of(...) : Stream [<element>] : Object | provenance | MaD:56 |
+| Test.java:178:43:178:60 | source(...) : Object | Test.java:178:33:178:61 | of(...) : Stream [<element>] : Object | provenance | MaD:55 |
 | Test.java:179:19:179:20 | in : Stream [<element>] : Object | Test.java:179:19:179:29 | sorted(...) : Stream [<element>] : Object | provenance | MaD:78 |
 | Test.java:179:19:179:29 | sorted(...) : Stream [<element>] : Object | Test.java:180:29:180:31 | out : Stream [<element>] : Object | provenance |  |
 | Test.java:180:29:180:31 | out : Stream [<element>] : Object | Test.java:17:22:17:38 | s : Stream [<element>] : Object | provenance |  |
-| Test.java:180:29:180:31 | out : Stream [<element>] : Object | Test.java:180:18:180:32 | getElement(...) | provenance | MaD:4 |
+| Test.java:180:29:180:31 | out : Stream [<element>] : Object | Test.java:180:18:180:32 | getElement(...) | provenance | MaD:3 |
 | Test.java:185:25:185:61 | (...)... : Stream [<element>] : Object | Test.java:186:19:186:20 | in : Stream [<element>] : Object | provenance |  |
 | Test.java:185:33:185:61 | of(...) : Stream [<element>] : Object | Test.java:185:25:185:61 | (...)... : Stream [<element>] : Object | provenance |  |
-| Test.java:185:43:185:60 | source(...) : Object | Test.java:185:33:185:61 | of(...) : Stream [<element>] : Object | provenance | MaD:56 |
+| Test.java:185:43:185:60 | source(...) : Object | Test.java:185:33:185:61 | of(...) : Stream [<element>] : Object | provenance | MaD:55 |
 | Test.java:186:19:186:20 | in : Stream [<element>] : Object | Test.java:186:19:186:33 | sorted(...) : Stream [<element>] : Object | provenance | MaD:78 |
 | Test.java:186:19:186:33 | sorted(...) : Stream [<element>] : Object | Test.java:187:29:187:31 | out : Stream [<element>] : Object | provenance |  |
 | Test.java:187:29:187:31 | out : Stream [<element>] : Object | Test.java:17:22:17:38 | s : Stream [<element>] : Object | provenance |  |
-| Test.java:187:29:187:31 | out : Stream [<element>] : Object | Test.java:187:18:187:32 | getElement(...) | provenance | MaD:4 |
+| Test.java:187:29:187:31 | out : Stream [<element>] : Object | Test.java:187:18:187:32 | getElement(...) | provenance | MaD:3 |
 | Test.java:192:25:192:64 | (...)... : Stream [<element>] : Object | Test.java:193:19:193:20 | in : Stream [<element>] : Object | provenance |  |
 | Test.java:192:33:192:64 | of(...) : Stream [<element>] : Object | Test.java:192:25:192:64 | (...)... : Stream [<element>] : Object | provenance |  |
-| Test.java:192:43:192:63 | source(...) : Object | Test.java:192:33:192:64 | of(...) : Stream [<element>] : Object | provenance | MaD:56 |
-| Test.java:193:19:193:20 | in : Stream [<element>] : Object | Test.java:193:19:193:36 | takeWhile(...) : Stream [<element>] : Object | provenance | MaD:81 |
+| Test.java:192:43:192:63 | source(...) : Object | Test.java:192:33:192:64 | of(...) : Stream [<element>] : Object | provenance | MaD:55 |
+| Test.java:193:19:193:20 | in : Stream [<element>] : Object | Test.java:193:19:193:36 | takeWhile(...) : Stream [<element>] : Object | provenance | MaD:80 |
 | Test.java:193:19:193:36 | takeWhile(...) : Stream [<element>] : Object | Test.java:194:29:194:31 | out : Stream [<element>] : Object | provenance |  |
 | Test.java:194:29:194:31 | out : Stream [<element>] : Object | Test.java:17:22:17:38 | s : Stream [<element>] : Object | provenance |  |
-| Test.java:194:29:194:31 | out : Stream [<element>] : Object | Test.java:194:18:194:32 | getElement(...) | provenance | MaD:4 |
+| Test.java:194:29:194:31 | out : Stream [<element>] : Object | Test.java:194:18:194:32 | getElement(...) | provenance | MaD:3 |
 | Test.java:199:25:199:62 | (...)... : Stream [<element>] : Object | Test.java:200:19:200:20 | in : Stream [<element>] : Object | provenance |  |
 | Test.java:199:33:199:62 | of(...) : Stream [<element>] : Object | Test.java:199:25:199:62 | (...)... : Stream [<element>] : Object | provenance |  |
-| Test.java:199:43:199:61 | source(...) : Object | Test.java:199:33:199:62 | of(...) : Stream [<element>] : Object | provenance | MaD:56 |
-| Test.java:200:19:200:20 | in : Stream [<element>] : Object | Test.java:200:19:200:30 | toArray(...) : Object[] [[]] : Object | provenance | MaD:82 |
+| Test.java:199:43:199:61 | source(...) : Object | Test.java:199:33:199:62 | of(...) : Stream [<element>] : Object | provenance | MaD:55 |
+| Test.java:200:19:200:20 | in : Stream [<element>] : Object | Test.java:200:19:200:30 | toArray(...) : Object[] [[]] : Object | provenance | MaD:81 |
 | Test.java:200:19:200:30 | toArray(...) : Object[] [[]] : Object | Test.java:201:34:201:36 | out : Object[] [[]] : Object | provenance |  |
 | Test.java:201:34:201:36 | out : Object[] [[]] : Object | Test.java:16:27:16:35 | array : Object[] [[]] : Object | provenance |  |
 | Test.java:201:34:201:36 | out : Object[] [[]] : Object | Test.java:201:18:201:37 | getArrayElement(...) | provenance |  |
 | Test.java:206:25:206:62 | (...)... : Stream [<element>] : Object | Test.java:207:19:207:20 | in : Stream [<element>] : Object | provenance |  |
 | Test.java:206:33:206:62 | of(...) : Stream [<element>] : Object | Test.java:206:25:206:62 | (...)... : Stream [<element>] : Object | provenance |  |
-| Test.java:206:43:206:61 | source(...) : Object | Test.java:206:33:206:62 | of(...) : Stream [<element>] : Object | provenance | MaD:56 |
-| Test.java:207:19:207:20 | in : Stream [<element>] : Object | Test.java:207:19:207:34 | toArray(...) : Object[] [[]] : Object | provenance | MaD:82 |
+| Test.java:206:43:206:61 | source(...) : Object | Test.java:206:33:206:62 | of(...) : Stream [<element>] : Object | provenance | MaD:55 |
+| Test.java:207:19:207:20 | in : Stream [<element>] : Object | Test.java:207:19:207:34 | toArray(...) : Object[] [[]] : Object | provenance | MaD:81 |
 | Test.java:207:19:207:34 | toArray(...) : Object[] [[]] : Object | Test.java:208:34:208:36 | out : Object[] [[]] : Object | provenance |  |
 | Test.java:208:34:208:36 | out : Object[] [[]] : Object | Test.java:16:27:16:35 | array : Object[] [[]] : Object | provenance |  |
 | Test.java:208:34:208:36 | out : Object[] [[]] : Object | Test.java:208:18:208:37 | getArrayElement(...) | provenance |  |
 | Test.java:213:25:213:61 | (...)... : Stream [<element>] : Object | Test.java:214:19:214:20 | in : Stream [<element>] : Object | provenance |  |
 | Test.java:213:33:213:61 | of(...) : Stream [<element>] : Object | Test.java:213:25:213:61 | (...)... : Stream [<element>] : Object | provenance |  |
-| Test.java:213:43:213:60 | source(...) : Object | Test.java:213:33:213:61 | of(...) : Stream [<element>] : Object | provenance | MaD:56 |
-| Test.java:214:19:214:20 | in : Stream [<element>] : Object | Test.java:214:19:214:29 | toList(...) : List [<element>] : Object | provenance | MaD:83 |
+| Test.java:213:43:213:60 | source(...) : Object | Test.java:213:33:213:61 | of(...) : Stream [<element>] : Object | provenance | MaD:55 |
+| Test.java:214:19:214:20 | in : Stream [<element>] : Object | Test.java:214:19:214:29 | toList(...) : List [<element>] : Object | provenance | MaD:82 |
 | Test.java:214:19:214:29 | toList(...) : List [<element>] : Object | Test.java:215:29:215:31 | out : List [<element>] : Object | provenance |  |
 | Test.java:215:29:215:31 | out : List [<element>] : Object | Test.java:18:22:18:35 | it : List [<element>] : Object | provenance |  |
-| Test.java:215:29:215:31 | out : List [<element>] : Object | Test.java:215:18:215:32 | getElement(...) | provenance | MaD:1 |
+| Test.java:215:29:215:31 | out : List [<element>] : Object | Test.java:215:18:215:32 | getElement(...) | provenance | MaD:2 |
 | Test.java:221:33:221:61 | of(...) : Stream [<element>] : Object | Test.java:222:13:222:14 | in : Stream [<element>] : Object | provenance |  |
-| Test.java:221:43:221:60 | source(...) : Object | Test.java:221:33:221:61 | of(...) : Stream [<element>] : Object | provenance | MaD:56 |
-| Test.java:222:13:222:14 | in : Stream [<element>] : Object | Test.java:222:25:222:25 | x : Object | provenance | MaD:10 |
+| Test.java:221:43:221:60 | source(...) : Object | Test.java:221:33:221:61 | of(...) : Stream [<element>] : Object | provenance | MaD:55 |
+| Test.java:222:13:222:14 | in : Stream [<element>] : Object | Test.java:222:25:222:25 | x : Object | provenance | MaD:9 |
 | Test.java:222:25:222:25 | x : Object | Test.java:222:37:222:37 | x | provenance |  |
 | Test.java:226:33:226:61 | of(...) : Stream [<element>] : Object | Test.java:227:13:227:14 | in : Stream [<element>] : Object | provenance |  |
-| Test.java:226:43:226:60 | source(...) : Object | Test.java:226:33:226:61 | of(...) : Stream [<element>] : Object | provenance | MaD:56 |
-| Test.java:227:13:227:14 | in : Stream [<element>] : Object | Test.java:227:25:227:25 | x : Object | provenance | MaD:11 |
+| Test.java:226:43:226:60 | source(...) : Object | Test.java:226:33:226:61 | of(...) : Stream [<element>] : Object | provenance | MaD:55 |
+| Test.java:227:13:227:14 | in : Stream [<element>] : Object | Test.java:227:25:227:25 | x : Object | provenance | MaD:10 |
 | Test.java:227:25:227:25 | x : Object | Test.java:227:37:227:37 | x | provenance |  |
 | Test.java:231:33:231:60 | of(...) : Stream [<element>] : Object | Test.java:232:13:232:14 | in : Stream [<element>] : Object | provenance |  |
-| Test.java:231:43:231:59 | source(...) : Object | Test.java:231:33:231:60 | of(...) : Stream [<element>] : Object | provenance | MaD:56 |
-| Test.java:232:13:232:14 | in : Stream [<element>] : Object | Test.java:232:33:232:33 | x : Object | provenance | MaD:12 |
+| Test.java:231:43:231:59 | source(...) : Object | Test.java:231:33:231:60 | of(...) : Stream [<element>] : Object | provenance | MaD:55 |
+| Test.java:232:13:232:14 | in : Stream [<element>] : Object | Test.java:232:33:232:33 | x : Object | provenance | MaD:15 |
 | Test.java:232:33:232:33 | x : Object | Test.java:232:44:232:44 | x | provenance |  |
 | Test.java:238:18:238:18 | a : Object[] [[]] : Object | Test.java:238:32:238:32 | a : Object[] [[]] : Object | provenance |  |
 | Test.java:238:32:238:32 | a : Object[] [[]] : Object | Test.java:238:32:238:35 | ...[...] | provenance |  |
-| Test.java:239:18:239:19 | a1 [Return] : Object[] [[]] : Object | Test.java:238:18:238:18 | a : Object[] [[]] : Object | provenance | MaD:16 |
-| Test.java:239:18:239:19 | a1 [Return] : Object[] [[]] : Object | Test.java:238:18:238:18 | a : Object[] [[]] : Object | provenance | MaD:16+MaD:14 |
-| Test.java:239:18:239:19 | a1 [Return] : Object[] [[]] : Object | Test.java:250:18:250:18 | a : Object[] [[]] : Object | provenance | MaD:16 |
-| Test.java:239:18:239:19 | a1 [Return] : Object[] [[]] : Object | Test.java:250:18:250:18 | a : Object[] [[]] : Object | provenance | MaD:16+MaD:14 |
-| Test.java:239:18:239:19 | a1 [Return] : Object[] [[]] : Object | Test.java:254:18:254:19 | a1 : Object[] [[]] : Object | provenance | MaD:16+MaD:14 |
-| Test.java:239:18:239:19 | a1 [Return] : Object[] [[]] : Object | Test.java:254:22:254:23 | a2 : Object[] [[]] : Object | provenance | MaD:16+MaD:14 |
-| Test.java:239:18:239:19 | a1 [Return] : Object[] [[]] : Object | Test.java:265:18:265:19 | a1 : Object[] [[]] : Object | provenance | MaD:16+MaD:14 |
-| Test.java:239:18:239:19 | a1 [Return] : Object[] [[]] : Object | Test.java:265:22:265:23 | a2 : Object[] [[]] : Object | provenance | MaD:16+MaD:14 |
-| Test.java:239:22:239:23 | a2 [Return] : Object[] [[]] : Object | Test.java:238:18:238:18 | a : Object[] [[]] : Object | provenance | MaD:16 |
-| Test.java:239:22:239:23 | a2 [Return] : Object[] [[]] : Object | Test.java:238:18:238:18 | a : Object[] [[]] : Object | provenance | MaD:16+MaD:14 |
-| Test.java:239:22:239:23 | a2 [Return] : Object[] [[]] : Object | Test.java:250:18:250:18 | a : Object[] [[]] : Object | provenance | MaD:16 |
-| Test.java:239:22:239:23 | a2 [Return] : Object[] [[]] : Object | Test.java:250:18:250:18 | a : Object[] [[]] : Object | provenance | MaD:16+MaD:14 |
-| Test.java:239:22:239:23 | a2 [Return] : Object[] [[]] : Object | Test.java:254:18:254:19 | a1 : Object[] [[]] : Object | provenance | MaD:16+MaD:14 |
-| Test.java:239:22:239:23 | a2 [Return] : Object[] [[]] : Object | Test.java:254:22:254:23 | a2 : Object[] [[]] : Object | provenance | MaD:16+MaD:14 |
-| Test.java:239:22:239:23 | a2 [Return] : Object[] [[]] : Object | Test.java:265:18:265:19 | a1 : Object[] [[]] : Object | provenance | MaD:16+MaD:14 |
-| Test.java:239:22:239:23 | a2 [Return] : Object[] [[]] : Object | Test.java:265:22:265:23 | a2 : Object[] [[]] : Object | provenance | MaD:16+MaD:14 |
+| Test.java:239:18:239:19 | a1 [Return] : Object[] [[]] : Object | Test.java:238:18:238:18 | a : Object[] [[]] : Object | provenance | MaD:14 |
+| Test.java:239:18:239:19 | a1 [Return] : Object[] [[]] : Object | Test.java:238:18:238:18 | a : Object[] [[]] : Object | provenance | MaD:14+MaD:12 |
+| Test.java:239:18:239:19 | a1 [Return] : Object[] [[]] : Object | Test.java:250:18:250:18 | a : Object[] [[]] : Object | provenance | MaD:14 |
+| Test.java:239:18:239:19 | a1 [Return] : Object[] [[]] : Object | Test.java:250:18:250:18 | a : Object[] [[]] : Object | provenance | MaD:14+MaD:12 |
+| Test.java:239:18:239:19 | a1 [Return] : Object[] [[]] : Object | Test.java:254:18:254:19 | a1 : Object[] [[]] : Object | provenance | MaD:14+MaD:12 |
+| Test.java:239:18:239:19 | a1 [Return] : Object[] [[]] : Object | Test.java:254:22:254:23 | a2 : Object[] [[]] : Object | provenance | MaD:14+MaD:12 |
+| Test.java:239:18:239:19 | a1 [Return] : Object[] [[]] : Object | Test.java:265:18:265:19 | a1 : Object[] [[]] : Object | provenance | MaD:14+MaD:12 |
+| Test.java:239:18:239:19 | a1 [Return] : Object[] [[]] : Object | Test.java:265:22:265:23 | a2 : Object[] [[]] : Object | provenance | MaD:14+MaD:12 |
+| Test.java:239:22:239:23 | a2 [Return] : Object[] [[]] : Object | Test.java:238:18:238:18 | a : Object[] [[]] : Object | provenance | MaD:14 |
+| Test.java:239:22:239:23 | a2 [Return] : Object[] [[]] : Object | Test.java:238:18:238:18 | a : Object[] [[]] : Object | provenance | MaD:14+MaD:12 |
+| Test.java:239:22:239:23 | a2 [Return] : Object[] [[]] : Object | Test.java:250:18:250:18 | a : Object[] [[]] : Object | provenance | MaD:14 |
+| Test.java:239:22:239:23 | a2 [Return] : Object[] [[]] : Object | Test.java:250:18:250:18 | a : Object[] [[]] : Object | provenance | MaD:14+MaD:12 |
+| Test.java:239:22:239:23 | a2 [Return] : Object[] [[]] : Object | Test.java:254:18:254:19 | a1 : Object[] [[]] : Object | provenance | MaD:14+MaD:12 |
+| Test.java:239:22:239:23 | a2 [Return] : Object[] [[]] : Object | Test.java:254:22:254:23 | a2 : Object[] [[]] : Object | provenance | MaD:14+MaD:12 |
+| Test.java:239:22:239:23 | a2 [Return] : Object[] [[]] : Object | Test.java:265:18:265:19 | a1 : Object[] [[]] : Object | provenance | MaD:14+MaD:12 |
+| Test.java:239:22:239:23 | a2 [Return] : Object[] [[]] : Object | Test.java:265:22:265:23 | a2 : Object[] [[]] : Object | provenance | MaD:14+MaD:12 |
 | Test.java:240:21:240:22 | a1 [post update] : Object[] [[]] : Object | Test.java:239:18:239:19 | a1 [Return] : Object[] [[]] : Object | provenance |  |
 | Test.java:240:29:240:47 | source(...) : Object | Test.java:240:21:240:22 | a1 [post update] : Object[] [[]] : Object | provenance |  |
 | Test.java:241:21:241:22 | a2 [post update] : Object[] [[]] : Object | Test.java:239:22:239:23 | a2 [Return] : Object[] [[]] : Object | provenance |  |
 | Test.java:241:29:241:47 | source(...) : Object | Test.java:241:21:241:22 | a2 [post update] : Object[] [[]] : Object | provenance |  |
 | Test.java:248:28:257:18 | collect(...) : Object[] [[]] : Object | Test.java:258:18:258:20 | out : Object[] [[]] : Object | provenance |  |
-| Test.java:249:23:249:58 | new Object[] : Object[] [[]] : Object | Test.java:238:18:238:18 | a : Object[] [[]] : Object | provenance | MaD:13 |
-| Test.java:249:23:249:58 | new Object[] : Object[] [[]] : Object | Test.java:238:18:238:18 | a : Object[] [[]] : Object | provenance | MaD:13+MaD:14 |
-| Test.java:249:23:249:58 | new Object[] : Object[] [[]] : Object | Test.java:248:28:257:18 | collect(...) : Object[] [[]] : Object | provenance | MaD:13+MaD:14 |
-| Test.java:249:23:249:58 | new Object[] : Object[] [[]] : Object | Test.java:248:28:257:18 | collect(...) : Object[] [[]] : Object | provenance | MaD:13+MaD:15 |
-| Test.java:249:23:249:58 | new Object[] : Object[] [[]] : Object | Test.java:250:18:250:18 | a : Object[] [[]] : Object | provenance | MaD:13 |
-| Test.java:249:23:249:58 | new Object[] : Object[] [[]] : Object | Test.java:250:18:250:18 | a : Object[] [[]] : Object | provenance | MaD:13+MaD:14 |
-| Test.java:249:23:249:58 | new Object[] : Object[] [[]] : Object | Test.java:254:18:254:19 | a1 : Object[] [[]] : Object | provenance | MaD:13+MaD:14 |
-| Test.java:249:23:249:58 | new Object[] : Object[] [[]] : Object | Test.java:254:22:254:23 | a2 : Object[] [[]] : Object | provenance | MaD:13+MaD:14 |
-| Test.java:249:23:249:58 | new Object[] : Object[] [[]] : Object | Test.java:265:18:265:19 | a1 : Object[] [[]] : Object | provenance | MaD:13+MaD:14 |
-| Test.java:249:23:249:58 | new Object[] : Object[] [[]] : Object | Test.java:265:22:265:23 | a2 : Object[] [[]] : Object | provenance | MaD:13+MaD:14 |
+| Test.java:249:23:249:58 | new Object[] : Object[] [[]] : Object | Test.java:238:18:238:18 | a : Object[] [[]] : Object | provenance | MaD:11 |
+| Test.java:249:23:249:58 | new Object[] : Object[] [[]] : Object | Test.java:238:18:238:18 | a : Object[] [[]] : Object | provenance | MaD:11+MaD:12 |
+| Test.java:249:23:249:58 | new Object[] : Object[] [[]] : Object | Test.java:248:28:257:18 | collect(...) : Object[] [[]] : Object | provenance | MaD:11+MaD:12 |
+| Test.java:249:23:249:58 | new Object[] : Object[] [[]] : Object | Test.java:248:28:257:18 | collect(...) : Object[] [[]] : Object | provenance | MaD:11+MaD:13 |
+| Test.java:249:23:249:58 | new Object[] : Object[] [[]] : Object | Test.java:250:18:250:18 | a : Object[] [[]] : Object | provenance | MaD:11 |
+| Test.java:249:23:249:58 | new Object[] : Object[] [[]] : Object | Test.java:250:18:250:18 | a : Object[] [[]] : Object | provenance | MaD:11+MaD:12 |
+| Test.java:249:23:249:58 | new Object[] : Object[] [[]] : Object | Test.java:254:18:254:19 | a1 : Object[] [[]] : Object | provenance | MaD:11+MaD:12 |
+| Test.java:249:23:249:58 | new Object[] : Object[] [[]] : Object | Test.java:254:22:254:23 | a2 : Object[] [[]] : Object | provenance | MaD:11+MaD:12 |
+| Test.java:249:23:249:58 | new Object[] : Object[] [[]] : Object | Test.java:265:18:265:19 | a1 : Object[] [[]] : Object | provenance | MaD:11+MaD:12 |
+| Test.java:249:23:249:58 | new Object[] : Object[] [[]] : Object | Test.java:265:22:265:23 | a2 : Object[] [[]] : Object | provenance | MaD:11+MaD:12 |
 | Test.java:249:23:249:58 | {...} : Object[] [[]] : Object | Test.java:249:23:249:58 | new Object[] : Object[] [[]] : Object | provenance |  |
 | Test.java:249:38:249:56 | source(...) : Object | Test.java:249:23:249:58 | {...} : Object[] [[]] : Object | provenance |  |
 | Test.java:250:18:250:18 | a : Object[] [[]] : Object | Test.java:251:26:251:26 | a : Object[] [[]] : Object | provenance |  |
-| Test.java:250:18:250:18 | a [Return] : Object[] [[]] : Object | Test.java:238:18:238:18 | a : Object[] [[]] : Object | provenance | MaD:14 |
-| Test.java:250:18:250:18 | a [Return] : Object[] [[]] : Object | Test.java:238:18:238:18 | a : Object[] [[]] : Object | provenance | MaD:14+MaD:16 |
-| Test.java:250:18:250:18 | a [Return] : Object[] [[]] : Object | Test.java:248:28:257:18 | collect(...) : Object[] [[]] : Object | provenance | MaD:14 |
-| Test.java:250:18:250:18 | a [Return] : Object[] [[]] : Object | Test.java:248:28:257:18 | collect(...) : Object[] [[]] : Object | provenance | MaD:15 |
-| Test.java:250:18:250:18 | a [Return] : Object[] [[]] : Object | Test.java:250:18:250:18 | a : Object[] [[]] : Object | provenance | MaD:14 |
-| Test.java:250:18:250:18 | a [Return] : Object[] [[]] : Object | Test.java:250:18:250:18 | a : Object[] [[]] : Object | provenance | MaD:14+MaD:16 |
-| Test.java:250:18:250:18 | a [Return] : Object[] [[]] : Object | Test.java:254:18:254:19 | a1 : Object[] [[]] : Object | provenance | MaD:14 |
-| Test.java:250:18:250:18 | a [Return] : Object[] [[]] : Object | Test.java:254:22:254:23 | a2 : Object[] [[]] : Object | provenance | MaD:14 |
-| Test.java:250:18:250:18 | a [Return] : Object[] [[]] : Object | Test.java:265:18:265:19 | a1 : Object[] [[]] : Object | provenance | MaD:14 |
-| Test.java:250:18:250:18 | a [Return] : Object[] [[]] : Object | Test.java:265:22:265:23 | a2 : Object[] [[]] : Object | provenance | MaD:14 |
+| Test.java:250:18:250:18 | a [Return] : Object[] [[]] : Object | Test.java:238:18:238:18 | a : Object[] [[]] : Object | provenance | MaD:12 |
+| Test.java:250:18:250:18 | a [Return] : Object[] [[]] : Object | Test.java:238:18:238:18 | a : Object[] [[]] : Object | provenance | MaD:12+MaD:14 |
+| Test.java:250:18:250:18 | a [Return] : Object[] [[]] : Object | Test.java:248:28:257:18 | collect(...) : Object[] [[]] : Object | provenance | MaD:12 |
+| Test.java:250:18:250:18 | a [Return] : Object[] [[]] : Object | Test.java:248:28:257:18 | collect(...) : Object[] [[]] : Object | provenance | MaD:13 |
+| Test.java:250:18:250:18 | a [Return] : Object[] [[]] : Object | Test.java:250:18:250:18 | a : Object[] [[]] : Object | provenance | MaD:12 |
+| Test.java:250:18:250:18 | a [Return] : Object[] [[]] : Object | Test.java:250:18:250:18 | a : Object[] [[]] : Object | provenance | MaD:12+MaD:14 |
+| Test.java:250:18:250:18 | a [Return] : Object[] [[]] : Object | Test.java:254:18:254:19 | a1 : Object[] [[]] : Object | provenance | MaD:12 |
+| Test.java:250:18:250:18 | a [Return] : Object[] [[]] : Object | Test.java:254:22:254:23 | a2 : Object[] [[]] : Object | provenance | MaD:12 |
+| Test.java:250:18:250:18 | a [Return] : Object[] [[]] : Object | Test.java:265:18:265:19 | a1 : Object[] [[]] : Object | provenance | MaD:12 |
+| Test.java:250:18:250:18 | a [Return] : Object[] [[]] : Object | Test.java:265:22:265:23 | a2 : Object[] [[]] : Object | provenance | MaD:12 |
 | Test.java:251:26:251:26 | a : Object[] [[]] : Object | Test.java:251:26:251:29 | ...[...] | provenance |  |
 | Test.java:252:21:252:21 | a [post update] : Object[] [[]] : Object | Test.java:250:18:250:18 | a [Return] : Object[] [[]] : Object | provenance |  |
 | Test.java:252:28:252:46 | source(...) : Object | Test.java:252:21:252:21 | a [post update] : Object[] [[]] : Object | provenance |  |
@@ -352,11 +352,11 @@ edges
 | Test.java:256:26:256:27 | a2 : Object[] [[]] : Object | Test.java:256:26:256:30 | ...[...] | provenance |  |
 | Test.java:258:18:258:20 | out : Object[] [[]] : Object | Test.java:258:18:258:23 | ...[...] | provenance |  |
 | Test.java:261:33:261:62 | of(...) : Stream [<element>] : Object | Test.java:262:28:262:29 | in : Stream [<element>] : Object | provenance |  |
-| Test.java:261:43:261:61 | source(...) : Object | Test.java:261:33:261:62 | of(...) : Stream [<element>] : Object | provenance | MaD:56 |
-| Test.java:262:28:262:29 | in : Stream [<element>] : Object | Test.java:262:28:268:18 | collect(...) : Object[] [[]] : Object | provenance | MaD:12 |
-| Test.java:262:28:262:29 | in : Stream [<element>] : Object | Test.java:264:21:264:21 | x : Object | provenance | MaD:12 |
-| Test.java:262:28:262:29 | in : Stream [<element>] : Object | Test.java:265:18:265:19 | a1 : Object[] [[]] : Object | provenance | MaD:12 |
-| Test.java:262:28:262:29 | in : Stream [<element>] : Object | Test.java:265:22:265:23 | a2 : Object[] [[]] : Object | provenance | MaD:12 |
+| Test.java:261:43:261:61 | source(...) : Object | Test.java:261:33:261:62 | of(...) : Stream [<element>] : Object | provenance | MaD:55 |
+| Test.java:262:28:262:29 | in : Stream [<element>] : Object | Test.java:262:28:268:18 | collect(...) : Object[] [[]] : Object | provenance | MaD:15 |
+| Test.java:262:28:262:29 | in : Stream [<element>] : Object | Test.java:264:21:264:21 | x : Object | provenance | MaD:15 |
+| Test.java:262:28:262:29 | in : Stream [<element>] : Object | Test.java:265:18:265:19 | a1 : Object[] [[]] : Object | provenance | MaD:15 |
+| Test.java:262:28:262:29 | in : Stream [<element>] : Object | Test.java:265:22:265:23 | a2 : Object[] [[]] : Object | provenance | MaD:15 |
 | Test.java:262:28:268:18 | collect(...) : Object[] [[]] : Object | Test.java:269:18:269:20 | out : Object[] [[]] : Object | provenance |  |
 | Test.java:264:21:264:21 | x : Object | Test.java:264:36:264:36 | x : Object | provenance |  |
 | Test.java:264:29:264:29 | a [post update] : Object[] [[]] : Object | Test.java:264:18:264:18 | a [Return] : Object[] [[]] : Object | provenance |  |
@@ -371,183 +371,183 @@ edges
 | Test.java:267:29:267:33 | ...[...] : Object | Test.java:267:21:267:22 | a2 [post update] : Object[] [[]] : Object | provenance |  |
 | Test.java:269:18:269:20 | out : Object[] [[]] : Object | Test.java:269:18:269:23 | ...[...] | provenance |  |
 | Test.java:273:33:273:62 | of(...) : Stream [<element>] : Object | Test.java:274:13:274:14 | in : Stream [<element>] : Object | provenance |  |
-| Test.java:273:43:273:61 | source(...) : Object | Test.java:273:33:273:62 | of(...) : Stream [<element>] : Object | provenance | MaD:56 |
-| Test.java:274:13:274:14 | in : Stream [<element>] : Object | Test.java:274:26:274:26 | x : Object | provenance | MaD:19 |
+| Test.java:273:43:273:61 | source(...) : Object | Test.java:273:33:273:62 | of(...) : Stream [<element>] : Object | provenance | MaD:55 |
+| Test.java:274:13:274:14 | in : Stream [<element>] : Object | Test.java:274:26:274:26 | x : Object | provenance | MaD:18 |
 | Test.java:274:26:274:26 | x : Object | Test.java:274:38:274:38 | x | provenance |  |
 | Test.java:278:33:278:59 | of(...) : Stream [<element>] : Object | Test.java:279:13:279:14 | in : Stream [<element>] : Object | provenance |  |
-| Test.java:278:43:278:58 | source(...) : Object | Test.java:278:33:278:59 | of(...) : Stream [<element>] : Object | provenance | MaD:56 |
-| Test.java:279:13:279:14 | in : Stream [<element>] : Object | Test.java:279:23:279:23 | x : Object | provenance | MaD:21 |
+| Test.java:278:43:278:58 | source(...) : Object | Test.java:278:33:278:59 | of(...) : Stream [<element>] : Object | provenance | MaD:55 |
+| Test.java:279:13:279:14 | in : Stream [<element>] : Object | Test.java:279:23:279:23 | x : Object | provenance | MaD:20 |
 | Test.java:279:23:279:23 | x : Object | Test.java:279:35:279:35 | x | provenance |  |
 | Test.java:283:33:283:60 | of(...) : Stream [<element>] : Object | Test.java:284:13:284:14 | in : Stream [<element>] : Object | provenance |  |
-| Test.java:283:43:283:59 | source(...) : Object | Test.java:283:33:283:60 | of(...) : Stream [<element>] : Object | provenance | MaD:56 |
+| Test.java:283:43:283:59 | source(...) : Object | Test.java:283:33:283:60 | of(...) : Stream [<element>] : Object | provenance | MaD:55 |
 | Test.java:284:13:284:14 | in : Stream [<element>] : Object | Test.java:284:24:284:24 | x : Object | provenance | MaD:25 |
 | Test.java:284:24:284:24 | x : Object | Test.java:284:36:284:36 | x | provenance |  |
 | Test.java:288:34:288:101 | flatMap(...) : Stream [<element>] : Object | Test.java:289:29:289:31 | out : Stream [<element>] : Object | provenance |  |
-| Test.java:288:71:288:100 | of(...) : Stream [<element>] : Object | Test.java:288:34:288:101 | flatMap(...) : Stream [<element>] : Object | provenance | MaD:26 |
-| Test.java:288:81:288:99 | source(...) : Object | Test.java:288:71:288:100 | of(...) : Stream [<element>] : Object | provenance | MaD:56 |
+| Test.java:288:71:288:100 | of(...) : Stream [<element>] : Object | Test.java:288:34:288:101 | flatMap(...) : Stream [<element>] : Object | provenance | MaD:24 |
+| Test.java:288:81:288:99 | source(...) : Object | Test.java:288:71:288:100 | of(...) : Stream [<element>] : Object | provenance | MaD:55 |
 | Test.java:289:29:289:31 | out : Stream [<element>] : Object | Test.java:17:22:17:38 | s : Stream [<element>] : Object | provenance |  |
-| Test.java:289:29:289:31 | out : Stream [<element>] : Object | Test.java:289:18:289:32 | getElement(...) | provenance | MaD:4 |
+| Test.java:289:29:289:31 | out : Stream [<element>] : Object | Test.java:289:18:289:32 | getElement(...) | provenance | MaD:3 |
 | Test.java:293:33:293:68 | of(...) : Stream [<element>] : Object | Test.java:294:13:294:14 | in : Stream [<element>] : Object | provenance |  |
-| Test.java:293:43:293:67 | source(...) : Object | Test.java:293:33:293:68 | of(...) : Stream [<element>] : Object | provenance | MaD:56 |
-| Test.java:294:13:294:14 | in : Stream [<element>] : Object | Test.java:294:32:294:32 | x : Object | provenance | MaD:27 |
+| Test.java:293:43:293:67 | source(...) : Object | Test.java:293:33:293:68 | of(...) : Stream [<element>] : Object | provenance | MaD:55 |
+| Test.java:294:13:294:14 | in : Stream [<element>] : Object | Test.java:294:32:294:32 | x : Object | provenance | MaD:26 |
 | Test.java:294:32:294:32 | x : Object | Test.java:294:44:294:44 | x | provenance |  |
 | Test.java:298:33:298:65 | of(...) : Stream [<element>] : Object | Test.java:299:13:299:14 | in : Stream [<element>] : Object | provenance |  |
-| Test.java:298:43:298:64 | source(...) : Object | Test.java:298:33:298:65 | of(...) : Stream [<element>] : Object | provenance | MaD:56 |
-| Test.java:299:13:299:14 | in : Stream [<element>] : Object | Test.java:299:29:299:29 | x : Object | provenance | MaD:28 |
+| Test.java:298:43:298:64 | source(...) : Object | Test.java:298:33:298:65 | of(...) : Stream [<element>] : Object | provenance | MaD:55 |
+| Test.java:299:13:299:14 | in : Stream [<element>] : Object | Test.java:299:29:299:29 | x : Object | provenance | MaD:27 |
 | Test.java:299:29:299:29 | x : Object | Test.java:299:41:299:41 | x | provenance |  |
 | Test.java:303:33:303:66 | of(...) : Stream [<element>] : Object | Test.java:304:13:304:14 | in : Stream [<element>] : Object | provenance |  |
-| Test.java:303:43:303:65 | source(...) : Object | Test.java:303:33:303:66 | of(...) : Stream [<element>] : Object | provenance | MaD:56 |
-| Test.java:304:13:304:14 | in : Stream [<element>] : Object | Test.java:304:30:304:30 | x : Object | provenance | MaD:29 |
+| Test.java:303:43:303:65 | source(...) : Object | Test.java:303:33:303:66 | of(...) : Stream [<element>] : Object | provenance | MaD:55 |
+| Test.java:304:13:304:14 | in : Stream [<element>] : Object | Test.java:304:30:304:30 | x : Object | provenance | MaD:28 |
 | Test.java:304:30:304:30 | x : Object | Test.java:304:42:304:42 | x | provenance |  |
 | Test.java:308:33:308:60 | of(...) : Stream [<element>] : Object | Test.java:309:13:309:14 | in : Stream [<element>] : Object | provenance |  |
-| Test.java:308:43:308:59 | source(...) : Object | Test.java:308:33:308:60 | of(...) : Stream [<element>] : Object | provenance | MaD:56 |
-| Test.java:309:13:309:14 | in : Stream [<element>] : Object | Test.java:309:24:309:24 | x : Object | provenance | MaD:30 |
+| Test.java:308:43:308:59 | source(...) : Object | Test.java:308:33:308:60 | of(...) : Stream [<element>] : Object | provenance | MaD:55 |
+| Test.java:309:13:309:14 | in : Stream [<element>] : Object | Test.java:309:24:309:24 | x : Object | provenance | MaD:29 |
 | Test.java:309:24:309:24 | x : Object | Test.java:309:34:309:34 | x | provenance |  |
 | Test.java:313:33:313:67 | of(...) : Stream [<element>] : Object | Test.java:314:13:314:14 | in : Stream [<element>] : Object | provenance |  |
-| Test.java:313:43:313:66 | source(...) : Object | Test.java:313:33:313:67 | of(...) : Stream [<element>] : Object | provenance | MaD:56 |
-| Test.java:314:13:314:14 | in : Stream [<element>] : Object | Test.java:314:31:314:31 | x : Object | provenance | MaD:31 |
+| Test.java:313:43:313:66 | source(...) : Object | Test.java:313:33:313:67 | of(...) : Stream [<element>] : Object | provenance | MaD:55 |
+| Test.java:314:13:314:14 | in : Stream [<element>] : Object | Test.java:314:31:314:31 | x : Object | provenance | MaD:30 |
 | Test.java:314:31:314:31 | x : Object | Test.java:314:41:314:41 | x | provenance |  |
 | Test.java:318:34:318:74 | generate(...) : Stream [<element>] : Object | Test.java:319:29:319:31 | out : Stream [<element>] : Object | provenance |  |
-| Test.java:318:56:318:73 | source(...) : Object | Test.java:318:34:318:74 | generate(...) : Stream [<element>] : Object | provenance | MaD:32 |
+| Test.java:318:56:318:73 | source(...) : Object | Test.java:318:34:318:74 | generate(...) : Stream [<element>] : Object | provenance | MaD:31 |
 | Test.java:319:29:319:31 | out : Stream [<element>] : Object | Test.java:17:22:17:38 | s : Stream [<element>] : Object | provenance |  |
-| Test.java:319:29:319:31 | out : Stream [<element>] : Object | Test.java:319:18:319:32 | getElement(...) | provenance | MaD:4 |
+| Test.java:319:29:319:31 | out : Stream [<element>] : Object | Test.java:319:18:319:32 | getElement(...) | provenance | MaD:3 |
 | Test.java:327:25:327:51 | (...)... : Object | Test.java:328:34:328:35 | in : Object | provenance |  |
 | Test.java:327:33:327:51 | source(...) : Object | Test.java:327:25:327:51 | (...)... : Object | provenance |  |
 | Test.java:328:19:334:16 | iterate(...) : Stream [<element>] : Object | Test.java:335:29:335:31 | out : Stream [<element>] : Object | provenance |  |
-| Test.java:328:34:328:35 | in : Object | Test.java:328:19:334:16 | iterate(...) : Stream [<element>] : Object | provenance | MaD:34 |
-| Test.java:328:34:328:35 | in : Object | Test.java:328:38:328:38 | x : Object | provenance | MaD:33 |
-| Test.java:328:34:328:35 | in : Object | Test.java:331:18:331:18 | x : Object | provenance | MaD:33 |
+| Test.java:328:34:328:35 | in : Object | Test.java:328:19:334:16 | iterate(...) : Stream [<element>] : Object | provenance | MaD:33 |
+| Test.java:328:34:328:35 | in : Object | Test.java:328:38:328:38 | x : Object | provenance | MaD:32 |
+| Test.java:328:34:328:35 | in : Object | Test.java:331:18:331:18 | x : Object | provenance | MaD:32 |
 | Test.java:328:38:328:38 | x : Object | Test.java:329:24:329:24 | x | provenance |  |
 | Test.java:331:18:331:18 | x : Object | Test.java:332:24:332:24 | x | provenance |  |
-| Test.java:333:26:333:44 | source(...) : Object | Test.java:328:19:334:16 | iterate(...) : Stream [<element>] : Object | provenance | MaD:36 |
-| Test.java:333:26:333:44 | source(...) : Object | Test.java:328:38:328:38 | x : Object | provenance | MaD:35 |
-| Test.java:333:26:333:44 | source(...) : Object | Test.java:331:18:331:18 | x : Object | provenance | MaD:35 |
+| Test.java:333:26:333:44 | source(...) : Object | Test.java:328:19:334:16 | iterate(...) : Stream [<element>] : Object | provenance | MaD:35 |
+| Test.java:333:26:333:44 | source(...) : Object | Test.java:328:38:328:38 | x : Object | provenance | MaD:34 |
+| Test.java:333:26:333:44 | source(...) : Object | Test.java:331:18:331:18 | x : Object | provenance | MaD:34 |
 | Test.java:335:29:335:31 | out : Stream [<element>] : Object | Test.java:17:22:17:38 | s : Stream [<element>] : Object | provenance |  |
-| Test.java:335:29:335:31 | out : Stream [<element>] : Object | Test.java:335:18:335:32 | getElement(...) | provenance | MaD:4 |
+| Test.java:335:29:335:31 | out : Stream [<element>] : Object | Test.java:335:18:335:32 | getElement(...) | provenance | MaD:3 |
 | Test.java:343:25:343:51 | (...)... : Object | Test.java:344:34:344:35 | in : Object | provenance |  |
 | Test.java:343:33:343:51 | source(...) : Object | Test.java:343:25:343:51 | (...)... : Object | provenance |  |
 | Test.java:344:19:347:16 | iterate(...) : Stream [<element>] : Object | Test.java:348:29:348:31 | out : Stream [<element>] : Object | provenance |  |
-| Test.java:344:34:344:35 | in : Object | Test.java:344:19:347:16 | iterate(...) : Stream [<element>] : Object | provenance | MaD:38 |
-| Test.java:344:34:344:35 | in : Object | Test.java:344:38:344:38 | x : Object | provenance | MaD:37 |
+| Test.java:344:34:344:35 | in : Object | Test.java:344:19:347:16 | iterate(...) : Stream [<element>] : Object | provenance | MaD:37 |
+| Test.java:344:34:344:35 | in : Object | Test.java:344:38:344:38 | x : Object | provenance | MaD:36 |
 | Test.java:344:38:344:38 | x : Object | Test.java:345:24:345:24 | x | provenance |  |
-| Test.java:346:26:346:44 | source(...) : Object | Test.java:344:19:347:16 | iterate(...) : Stream [<element>] : Object | provenance | MaD:40 |
-| Test.java:346:26:346:44 | source(...) : Object | Test.java:344:38:344:38 | x : Object | provenance | MaD:39 |
+| Test.java:346:26:346:44 | source(...) : Object | Test.java:344:19:347:16 | iterate(...) : Stream [<element>] : Object | provenance | MaD:39 |
+| Test.java:346:26:346:44 | source(...) : Object | Test.java:344:38:344:38 | x : Object | provenance | MaD:38 |
 | Test.java:348:29:348:31 | out : Stream [<element>] : Object | Test.java:17:22:17:38 | s : Stream [<element>] : Object | provenance |  |
-| Test.java:348:29:348:31 | out : Stream [<element>] : Object | Test.java:348:18:348:32 | getElement(...) | provenance | MaD:4 |
+| Test.java:348:29:348:31 | out : Stream [<element>] : Object | Test.java:348:18:348:32 | getElement(...) | provenance | MaD:3 |
 | Test.java:353:33:353:58 | of(...) : Stream [<element>] : Object | Test.java:354:34:354:35 | in : Stream [<element>] : Object | provenance |  |
-| Test.java:353:43:353:57 | source(...) : Object | Test.java:353:33:353:58 | of(...) : Stream [<element>] : Object | provenance | MaD:56 |
+| Test.java:353:43:353:57 | source(...) : Object | Test.java:353:33:353:58 | of(...) : Stream [<element>] : Object | provenance | MaD:55 |
 | Test.java:354:34:354:35 | in : Stream [<element>] : Object | Test.java:354:41:354:41 | x : Object | provenance | MaD:42 |
 | Test.java:354:34:354:82 | map(...) : Stream [<element>] : Object | Test.java:355:29:355:31 | out : Stream [<element>] : Object | provenance |  |
 | Test.java:354:41:354:41 | x : Object | Test.java:354:53:354:53 | x | provenance |  |
-| Test.java:354:64:354:78 | source(...) : Object | Test.java:354:34:354:82 | map(...) : Stream [<element>] : Object | provenance | MaD:43 |
+| Test.java:354:64:354:78 | source(...) : Object | Test.java:354:34:354:82 | map(...) : Stream [<element>] : Object | provenance | MaD:41 |
 | Test.java:355:29:355:31 | out : Stream [<element>] : Object | Test.java:17:22:17:38 | s : Stream [<element>] : Object | provenance |  |
-| Test.java:355:29:355:31 | out : Stream [<element>] : Object | Test.java:355:18:355:32 | getElement(...) | provenance | MaD:4 |
+| Test.java:355:29:355:31 | out : Stream [<element>] : Object | Test.java:355:18:355:32 | getElement(...) | provenance | MaD:3 |
 | Test.java:359:33:359:61 | of(...) : Stream [<element>] : Object | Test.java:360:13:360:14 | in : Stream [<element>] : Object | provenance |  |
-| Test.java:359:43:359:60 | source(...) : Object | Test.java:359:33:359:61 | of(...) : Stream [<element>] : Object | provenance | MaD:56 |
-| Test.java:360:13:360:14 | in : Stream [<element>] : Object | Test.java:360:26:360:26 | x : Object | provenance | MaD:44 |
+| Test.java:359:43:359:60 | source(...) : Object | Test.java:359:33:359:61 | of(...) : Stream [<element>] : Object | provenance | MaD:55 |
+| Test.java:360:13:360:14 | in : Stream [<element>] : Object | Test.java:360:26:360:26 | x : Object | provenance | MaD:43 |
 | Test.java:360:26:360:26 | x : Object | Test.java:360:47:360:47 | x | provenance |  |
 | Test.java:364:33:364:69 | of(...) : Stream [<element>] : Object | Test.java:365:13:365:14 | in : Stream [<element>] : Object | provenance |  |
-| Test.java:364:43:364:68 | source(...) : Object | Test.java:364:33:364:69 | of(...) : Stream [<element>] : Object | provenance | MaD:56 |
-| Test.java:365:13:365:14 | in : Stream [<element>] : Object | Test.java:365:34:365:34 | x : Object | provenance | MaD:45 |
+| Test.java:364:43:364:68 | source(...) : Object | Test.java:364:33:364:69 | of(...) : Stream [<element>] : Object | provenance | MaD:55 |
+| Test.java:365:13:365:14 | in : Stream [<element>] : Object | Test.java:365:34:365:34 | x : Object | provenance | MaD:44 |
 | Test.java:365:34:365:34 | x : Object | Test.java:365:55:365:55 | x | provenance |  |
 | Test.java:369:33:369:66 | of(...) : Stream [<element>] : Object | Test.java:370:13:370:14 | in : Stream [<element>] : Object | provenance |  |
-| Test.java:369:43:369:65 | source(...) : Object | Test.java:369:33:369:66 | of(...) : Stream [<element>] : Object | provenance | MaD:56 |
-| Test.java:370:13:370:14 | in : Stream [<element>] : Object | Test.java:370:31:370:31 | x : Object | provenance | MaD:46 |
+| Test.java:369:43:369:65 | source(...) : Object | Test.java:369:33:369:66 | of(...) : Stream [<element>] : Object | provenance | MaD:55 |
+| Test.java:370:13:370:14 | in : Stream [<element>] : Object | Test.java:370:31:370:31 | x : Object | provenance | MaD:45 |
 | Test.java:370:31:370:31 | x : Object | Test.java:370:52:370:52 | x | provenance |  |
 | Test.java:374:33:374:67 | of(...) : Stream [<element>] : Object | Test.java:375:13:375:14 | in : Stream [<element>] : Object | provenance |  |
-| Test.java:374:43:374:66 | source(...) : Object | Test.java:374:33:374:67 | of(...) : Stream [<element>] : Object | provenance | MaD:56 |
-| Test.java:375:13:375:14 | in : Stream [<element>] : Object | Test.java:375:32:375:32 | x : Object | provenance | MaD:47 |
+| Test.java:374:43:374:66 | source(...) : Object | Test.java:374:33:374:67 | of(...) : Stream [<element>] : Object | provenance | MaD:55 |
+| Test.java:375:13:375:14 | in : Stream [<element>] : Object | Test.java:375:32:375:32 | x : Object | provenance | MaD:46 |
 | Test.java:375:32:375:32 | x : Object | Test.java:375:53:375:53 | x | provenance |  |
 | Test.java:379:33:379:64 | of(...) : Stream [<element>] : Object | Test.java:380:13:380:14 | in : Stream [<element>] : Object | provenance |  |
-| Test.java:379:43:379:63 | source(...) : Object | Test.java:379:33:379:64 | of(...) : Stream [<element>] : Object | provenance | MaD:56 |
-| Test.java:380:13:380:14 | in : Stream [<element>] : Object | Test.java:380:28:380:28 | x : Object | provenance | MaD:48 |
+| Test.java:379:43:379:63 | source(...) : Object | Test.java:379:33:379:64 | of(...) : Stream [<element>] : Object | provenance | MaD:55 |
+| Test.java:380:13:380:14 | in : Stream [<element>] : Object | Test.java:380:28:380:28 | x : Object | provenance | MaD:47 |
 | Test.java:380:28:380:28 | x : Object | Test.java:380:40:380:40 | x | provenance |  |
 | Test.java:384:33:384:61 | of(...) : Stream [<element>] : Object | Test.java:385:13:385:14 | in : Stream [<element>] : Object | provenance |  |
-| Test.java:384:43:384:60 | source(...) : Object | Test.java:384:33:384:61 | of(...) : Stream [<element>] : Object | provenance | MaD:56 |
-| Test.java:385:13:385:14 | in : Stream [<element>] : Object | Test.java:385:25:385:25 | x : Object | provenance | MaD:49 |
+| Test.java:384:43:384:60 | source(...) : Object | Test.java:384:33:384:61 | of(...) : Stream [<element>] : Object | provenance | MaD:55 |
+| Test.java:385:13:385:14 | in : Stream [<element>] : Object | Test.java:385:25:385:25 | x : Object | provenance | MaD:48 |
 | Test.java:385:25:385:25 | x : Object | Test.java:385:37:385:37 | x | provenance |  |
 | Test.java:389:33:389:62 | of(...) : Stream [<element>] : Object | Test.java:390:13:390:14 | in : Stream [<element>] : Object | provenance |  |
-| Test.java:389:43:389:61 | source(...) : Object | Test.java:389:33:389:62 | of(...) : Stream [<element>] : Object | provenance | MaD:56 |
-| Test.java:390:13:390:14 | in : Stream [<element>] : Object | Test.java:390:26:390:26 | x : Object | provenance | MaD:50 |
+| Test.java:389:43:389:61 | source(...) : Object | Test.java:389:33:389:62 | of(...) : Stream [<element>] : Object | provenance | MaD:55 |
+| Test.java:390:13:390:14 | in : Stream [<element>] : Object | Test.java:390:26:390:26 | x : Object | provenance | MaD:49 |
 | Test.java:390:26:390:26 | x : Object | Test.java:390:38:390:38 | x | provenance |  |
 | Test.java:394:33:394:56 | of(...) : Stream [<element>] : Object | Test.java:395:13:395:14 | in : Stream [<element>] : Object | provenance |  |
 | Test.java:394:33:394:56 | of(...) : Stream [<element>] : Object | Test.java:396:13:396:14 | in : Stream [<element>] : Object | provenance |  |
-| Test.java:394:43:394:55 | source(...) : Object | Test.java:394:33:394:56 | of(...) : Stream [<element>] : Object | provenance | MaD:56 |
-| Test.java:395:13:395:14 | in : Stream [<element>] : Object | Test.java:395:21:395:21 | x : Object | provenance | MaD:51 |
+| Test.java:394:43:394:55 | source(...) : Object | Test.java:394:33:394:56 | of(...) : Stream [<element>] : Object | provenance | MaD:55 |
+| Test.java:395:13:395:14 | in : Stream [<element>] : Object | Test.java:395:21:395:21 | x : Object | provenance | MaD:50 |
 | Test.java:395:21:395:21 | x : Object | Test.java:395:36:395:36 | x | provenance |  |
-| Test.java:396:13:396:14 | in : Stream [<element>] : Object | Test.java:396:23:396:23 | y : Object | provenance | MaD:51 |
+| Test.java:396:13:396:14 | in : Stream [<element>] : Object | Test.java:396:23:396:23 | y : Object | provenance | MaD:50 |
 | Test.java:396:23:396:23 | y : Object | Test.java:396:36:396:36 | y | provenance |  |
 | Test.java:400:33:400:56 | of(...) : Stream [<element>] : Object | Test.java:401:13:401:14 | in : Stream [<element>] : Object | provenance |  |
 | Test.java:400:33:400:56 | of(...) : Stream [<element>] : Object | Test.java:402:13:402:14 | in : Stream [<element>] : Object | provenance |  |
-| Test.java:400:43:400:55 | source(...) : Object | Test.java:400:33:400:56 | of(...) : Stream [<element>] : Object | provenance | MaD:56 |
-| Test.java:401:13:401:14 | in : Stream [<element>] : Object | Test.java:401:21:401:21 | x : Object | provenance | MaD:53 |
+| Test.java:400:43:400:55 | source(...) : Object | Test.java:400:33:400:56 | of(...) : Stream [<element>] : Object | provenance | MaD:55 |
+| Test.java:401:13:401:14 | in : Stream [<element>] : Object | Test.java:401:21:401:21 | x : Object | provenance | MaD:52 |
 | Test.java:401:21:401:21 | x : Object | Test.java:401:36:401:36 | x | provenance |  |
-| Test.java:402:13:402:14 | in : Stream [<element>] : Object | Test.java:402:23:402:23 | y : Object | provenance | MaD:53 |
+| Test.java:402:13:402:14 | in : Stream [<element>] : Object | Test.java:402:23:402:23 | y : Object | provenance | MaD:52 |
 | Test.java:402:23:402:23 | y : Object | Test.java:402:36:402:36 | y | provenance |  |
 | Test.java:406:33:406:62 | of(...) : Stream [<element>] : Object | Test.java:407:13:407:14 | in : Stream [<element>] : Object | provenance |  |
-| Test.java:406:43:406:61 | source(...) : Object | Test.java:406:33:406:62 | of(...) : Stream [<element>] : Object | provenance | MaD:56 |
-| Test.java:407:13:407:14 | in : Stream [<element>] : Object | Test.java:407:26:407:26 | x : Object | provenance | MaD:55 |
+| Test.java:406:43:406:61 | source(...) : Object | Test.java:406:33:406:62 | of(...) : Stream [<element>] : Object | provenance | MaD:55 |
+| Test.java:407:13:407:14 | in : Stream [<element>] : Object | Test.java:407:26:407:26 | x : Object | provenance | MaD:54 |
 | Test.java:407:26:407:26 | x : Object | Test.java:407:38:407:38 | x | provenance |  |
 | Test.java:411:33:411:57 | of(...) : Stream [<element>] : Object | Test.java:412:13:412:14 | in : Stream [<element>] : Object | provenance |  |
-| Test.java:411:43:411:56 | source(...) : Object | Test.java:411:33:411:57 | of(...) : Stream [<element>] : Object | provenance | MaD:56 |
-| Test.java:412:13:412:14 | in : Stream [<element>] : Object | Test.java:412:21:412:21 | x : Object | provenance | MaD:59 |
+| Test.java:411:43:411:56 | source(...) : Object | Test.java:411:33:411:57 | of(...) : Stream [<element>] : Object | provenance | MaD:55 |
+| Test.java:412:13:412:14 | in : Stream [<element>] : Object | Test.java:412:21:412:21 | x : Object | provenance | MaD:58 |
 | Test.java:412:21:412:21 | x : Object | Test.java:412:31:412:31 | x | provenance |  |
 | Test.java:419:33:419:61 | of(...) : Stream [<element>] : Object | Test.java:420:36:420:37 | in : Stream [<element>] : Object | provenance |  |
-| Test.java:419:43:419:60 | source(...) : Object | Test.java:419:33:419:61 | of(...) : Stream [<element>] : Object | provenance | MaD:56 |
-| Test.java:420:36:420:37 | in : Stream [<element>] : Object | Test.java:420:36:424:18 | reduce(...) : Optional [<element>] : Object | provenance | MaD:62 |
-| Test.java:420:36:420:37 | in : Stream [<element>] : Object | Test.java:420:47:420:47 | x : Object | provenance | MaD:61 |
-| Test.java:420:36:420:37 | in : Stream [<element>] : Object | Test.java:420:49:420:49 | y : Object | provenance | MaD:61 |
+| Test.java:419:43:419:60 | source(...) : Object | Test.java:419:33:419:61 | of(...) : Stream [<element>] : Object | provenance | MaD:55 |
+| Test.java:420:36:420:37 | in : Stream [<element>] : Object | Test.java:420:36:424:18 | reduce(...) : Optional [<element>] : Object | provenance | MaD:63 |
+| Test.java:420:36:420:37 | in : Stream [<element>] : Object | Test.java:420:47:420:47 | x : Object | provenance | MaD:62 |
+| Test.java:420:36:420:37 | in : Stream [<element>] : Object | Test.java:420:49:420:49 | y : Object | provenance | MaD:62 |
 | Test.java:420:36:424:18 | reduce(...) : Optional [<element>] : Object | Test.java:425:29:425:31 | out : Optional [<element>] : Object | provenance |  |
 | Test.java:420:47:420:47 | x : Object | Test.java:421:26:421:26 | x | provenance |  |
 | Test.java:420:49:420:49 | y : Object | Test.java:422:26:422:26 | y | provenance |  |
-| Test.java:423:28:423:45 | source(...) : Object | Test.java:420:36:424:18 | reduce(...) : Optional [<element>] : Object | provenance | MaD:64 |
-| Test.java:423:28:423:45 | source(...) : Object | Test.java:420:47:420:47 | x : Object | provenance | MaD:63 |
-| Test.java:423:28:423:45 | source(...) : Object | Test.java:420:49:420:49 | y : Object | provenance | MaD:63 |
+| Test.java:423:28:423:45 | source(...) : Object | Test.java:420:36:424:18 | reduce(...) : Optional [<element>] : Object | provenance | MaD:61 |
+| Test.java:423:28:423:45 | source(...) : Object | Test.java:420:47:420:47 | x : Object | provenance | MaD:60 |
+| Test.java:423:28:423:45 | source(...) : Object | Test.java:420:49:420:49 | y : Object | provenance | MaD:60 |
 | Test.java:425:29:425:31 | out : Optional [<element>] : Object | Test.java:20:22:20:34 | o : Optional [<element>] : Object | provenance |  |
-| Test.java:425:29:425:31 | out : Optional [<element>] : Object | Test.java:425:18:425:32 | getElement(...) | provenance | MaD:3 |
+| Test.java:425:29:425:31 | out : Optional [<element>] : Object | Test.java:425:18:425:32 | getElement(...) | provenance | MaD:84 |
 | Test.java:433:33:433:61 | of(...) : Stream [<element>] : Object | Test.java:434:26:434:27 | in : Stream [<element>] : Object | provenance |  |
-| Test.java:433:43:433:60 | source(...) : Object | Test.java:433:33:433:61 | of(...) : Stream [<element>] : Object | provenance | MaD:56 |
-| Test.java:434:26:434:27 | in : Stream [<element>] : Object | Test.java:434:57:434:57 | x : Object | provenance | MaD:72 |
-| Test.java:434:26:434:27 | in : Stream [<element>] : Object | Test.java:434:59:434:59 | y : Object | provenance | MaD:72 |
+| Test.java:433:43:433:60 | source(...) : Object | Test.java:433:33:433:61 | of(...) : Stream [<element>] : Object | provenance | MaD:55 |
+| Test.java:434:26:434:27 | in : Stream [<element>] : Object | Test.java:434:57:434:57 | x : Object | provenance | MaD:75 |
+| Test.java:434:26:434:27 | in : Stream [<element>] : Object | Test.java:434:59:434:59 | y : Object | provenance | MaD:75 |
 | Test.java:434:26:438:18 | reduce(...) : Object | Test.java:439:18:439:20 | out | provenance |  |
-| Test.java:434:36:434:53 | source(...) : Object | Test.java:434:26:438:18 | reduce(...) : Object | provenance | MaD:74 |
-| Test.java:434:36:434:53 | source(...) : Object | Test.java:434:57:434:57 | x : Object | provenance | MaD:73 |
-| Test.java:434:36:434:53 | source(...) : Object | Test.java:434:59:434:59 | y : Object | provenance | MaD:73 |
+| Test.java:434:36:434:53 | source(...) : Object | Test.java:434:26:438:18 | reduce(...) : Object | provenance | MaD:72 |
+| Test.java:434:36:434:53 | source(...) : Object | Test.java:434:57:434:57 | x : Object | provenance | MaD:71 |
+| Test.java:434:36:434:53 | source(...) : Object | Test.java:434:59:434:59 | y : Object | provenance | MaD:71 |
 | Test.java:434:57:434:57 | x : Object | Test.java:435:26:435:26 | x | provenance |  |
 | Test.java:434:59:434:59 | y : Object | Test.java:436:26:436:26 | y | provenance |  |
-| Test.java:437:28:437:45 | source(...) : Object | Test.java:434:26:438:18 | reduce(...) : Object | provenance | MaD:76 |
-| Test.java:437:28:437:45 | source(...) : Object | Test.java:434:57:434:57 | x : Object | provenance | MaD:75 |
-| Test.java:437:28:437:45 | source(...) : Object | Test.java:434:59:434:59 | y : Object | provenance | MaD:75 |
+| Test.java:437:28:437:45 | source(...) : Object | Test.java:434:26:438:18 | reduce(...) : Object | provenance | MaD:74 |
+| Test.java:437:28:437:45 | source(...) : Object | Test.java:434:57:434:57 | x : Object | provenance | MaD:73 |
+| Test.java:437:28:437:45 | source(...) : Object | Test.java:434:59:434:59 | y : Object | provenance | MaD:73 |
 | Test.java:449:33:449:61 | of(...) : Stream [<element>] : Object | Test.java:450:26:450:27 | in : Stream [<element>] : Object | provenance |  |
-| Test.java:449:43:449:60 | source(...) : Object | Test.java:449:33:449:61 | of(...) : Stream [<element>] : Object | provenance | MaD:56 |
-| Test.java:450:26:450:27 | in : Stream [<element>] : Object | Test.java:450:59:450:59 | y : Object | provenance | MaD:65 |
+| Test.java:449:43:449:60 | source(...) : Object | Test.java:449:33:449:61 | of(...) : Stream [<element>] : Object | provenance | MaD:55 |
+| Test.java:450:26:450:27 | in : Stream [<element>] : Object | Test.java:450:59:450:59 | y : Object | provenance | MaD:70 |
 | Test.java:450:26:458:18 | reduce(...) : Object | Test.java:459:18:459:20 | out | provenance |  |
-| Test.java:450:36:450:53 | source(...) : Object | Test.java:450:26:458:18 | reduce(...) : Object | provenance | MaD:68 |
-| Test.java:450:36:450:53 | source(...) : Object | Test.java:450:57:450:57 | x : Object | provenance | MaD:66 |
-| Test.java:450:36:450:53 | source(...) : Object | Test.java:454:21:454:21 | x : Object | provenance | MaD:67 |
-| Test.java:450:36:450:53 | source(...) : Object | Test.java:454:23:454:23 | y : Object | provenance | MaD:67 |
+| Test.java:450:36:450:53 | source(...) : Object | Test.java:450:26:458:18 | reduce(...) : Object | provenance | MaD:66 |
+| Test.java:450:36:450:53 | source(...) : Object | Test.java:450:57:450:57 | x : Object | provenance | MaD:64 |
+| Test.java:450:36:450:53 | source(...) : Object | Test.java:454:21:454:21 | x : Object | provenance | MaD:65 |
+| Test.java:450:36:450:53 | source(...) : Object | Test.java:454:23:454:23 | y : Object | provenance | MaD:65 |
 | Test.java:450:57:450:57 | x : Object | Test.java:451:26:451:26 | x | provenance |  |
 | Test.java:450:59:450:59 | y : Object | Test.java:452:26:452:26 | y | provenance |  |
-| Test.java:453:28:453:45 | source(...) : Object | Test.java:450:26:458:18 | reduce(...) : Object | provenance | MaD:71 |
-| Test.java:453:28:453:45 | source(...) : Object | Test.java:450:57:450:57 | x : Object | provenance | MaD:69 |
-| Test.java:453:28:453:45 | source(...) : Object | Test.java:454:21:454:21 | x : Object | provenance | MaD:70 |
-| Test.java:453:28:453:45 | source(...) : Object | Test.java:454:23:454:23 | y : Object | provenance | MaD:70 |
+| Test.java:453:28:453:45 | source(...) : Object | Test.java:450:26:458:18 | reduce(...) : Object | provenance | MaD:69 |
+| Test.java:453:28:453:45 | source(...) : Object | Test.java:450:57:450:57 | x : Object | provenance | MaD:67 |
+| Test.java:453:28:453:45 | source(...) : Object | Test.java:454:21:454:21 | x : Object | provenance | MaD:68 |
+| Test.java:453:28:453:45 | source(...) : Object | Test.java:454:23:454:23 | y : Object | provenance | MaD:68 |
 | Test.java:454:21:454:21 | x : Object | Test.java:455:26:455:26 | x | provenance |  |
 | Test.java:454:23:454:23 | y : Object | Test.java:456:26:456:26 | y | provenance |  |
-| Test.java:457:28:457:45 | source(...) : Object | Test.java:450:26:458:18 | reduce(...) : Object | provenance | MaD:71 |
-| Test.java:457:28:457:45 | source(...) : Object | Test.java:450:57:450:57 | x : Object | provenance | MaD:69 |
-| Test.java:457:28:457:45 | source(...) : Object | Test.java:454:21:454:21 | x : Object | provenance | MaD:70 |
-| Test.java:457:28:457:45 | source(...) : Object | Test.java:454:23:454:23 | y : Object | provenance | MaD:70 |
+| Test.java:457:28:457:45 | source(...) : Object | Test.java:450:26:458:18 | reduce(...) : Object | provenance | MaD:69 |
+| Test.java:457:28:457:45 | source(...) : Object | Test.java:450:57:450:57 | x : Object | provenance | MaD:67 |
+| Test.java:457:28:457:45 | source(...) : Object | Test.java:454:21:454:21 | x : Object | provenance | MaD:68 |
+| Test.java:457:28:457:45 | source(...) : Object | Test.java:454:23:454:23 | y : Object | provenance | MaD:68 |
 | Test.java:463:33:463:59 | of(...) : Stream [<element>] : Object | Test.java:464:13:464:14 | in : Stream [<element>] : Object | provenance |  |
 | Test.java:463:33:463:59 | of(...) : Stream [<element>] : Object | Test.java:465:13:465:14 | in : Stream [<element>] : Object | provenance |  |
-| Test.java:463:43:463:58 | source(...) : Object | Test.java:463:33:463:59 | of(...) : Stream [<element>] : Object | provenance | MaD:56 |
-| Test.java:464:13:464:14 | in : Stream [<element>] : Object | Test.java:464:24:464:24 | x : Object | provenance | MaD:79 |
+| Test.java:463:43:463:58 | source(...) : Object | Test.java:463:33:463:59 | of(...) : Stream [<element>] : Object | provenance | MaD:55 |
+| Test.java:464:13:464:14 | in : Stream [<element>] : Object | Test.java:464:24:464:24 | x : Object | provenance | MaD:77 |
 | Test.java:464:24:464:24 | x : Object | Test.java:464:39:464:39 | x | provenance |  |
-| Test.java:465:13:465:14 | in : Stream [<element>] : Object | Test.java:465:26:465:26 | y : Object | provenance | MaD:79 |
+| Test.java:465:13:465:14 | in : Stream [<element>] : Object | Test.java:465:26:465:26 | y : Object | provenance | MaD:77 |
 | Test.java:465:26:465:26 | y : Object | Test.java:465:39:465:39 | y | provenance |  |
 | Test.java:469:33:469:62 | of(...) : Stream [<element>] : Object | Test.java:470:13:470:14 | in : Stream [<element>] : Object | provenance |  |
-| Test.java:469:43:469:61 | source(...) : Object | Test.java:469:33:469:62 | of(...) : Stream [<element>] : Object | provenance | MaD:56 |
-| Test.java:470:13:470:14 | in : Stream [<element>] : Object | Test.java:470:26:470:26 | x : Object | provenance | MaD:80 |
+| Test.java:469:43:469:61 | source(...) : Object | Test.java:469:33:469:62 | of(...) : Stream [<element>] : Object | provenance | MaD:55 |
+| Test.java:470:13:470:14 | in : Stream [<element>] : Object | Test.java:470:26:470:26 | x : Object | provenance | MaD:79 |
 | Test.java:470:26:470:26 | x : Object | Test.java:470:38:470:38 | x | provenance |  |
 nodes
 | Test.java:16:27:16:35 | array : Object[] [[]] : Object | semmle.label | array : Object[] [[]] : Object |
diff --git a/java/ql/test/library-tests/logging/test.expected b/java/ql/test/library-tests/logging/test.expected
index 6aec73afeaf..54213ed51f2 100644
--- a/java/ql/test/library-tests/logging/test.expected
+++ b/java/ql/test/library-tests/logging/test.expected
@@ -11,8 +11,8 @@ models
 | 10 | Summary: org.apache.logging.log4j; Logger; true; traceExit; (Object); ; Argument[0]; ReturnValue; value; manual |
 | 11 | Summary: org.apache.logging.log4j; Logger; true; traceExit; (String,Object); ; Argument[1]; ReturnValue; value; manual |
 | 12 | Summary: org.slf4j.spi; LoggingEventBuilder; true; addArgument; ; ; Argument[this]; ReturnValue; value; manual |
-| 13 | Summary: org.slf4j.spi; LoggingEventBuilder; true; addKeyValue; ; ; Argument[this]; ReturnValue; value; manual |
-| 14 | Summary: org.slf4j.spi; LoggingEventBuilder; true; addKeyValue; ; ; Argument[1]; Argument[this]; taint; manual |
+| 13 | Summary: org.slf4j.spi; LoggingEventBuilder; true; addKeyValue; ; ; Argument[1]; Argument[this]; taint; manual |
+| 14 | Summary: org.slf4j.spi; LoggingEventBuilder; true; addKeyValue; ; ; Argument[this]; ReturnValue; value; manual |
 | 15 | Summary: org.slf4j.spi; LoggingEventBuilder; true; addMarker; ; ; Argument[this]; ReturnValue; value; manual |
 | 16 | Summary: org.slf4j.spi; LoggingEventBuilder; true; setCause; ; ; Argument[this]; ReturnValue; value; manual |
 edges
@@ -70,20 +70,20 @@ edges
 | Test.java:121:13:121:62 | addArgument(...) : LoggingEventBuilder | Test.java:122:12:122:14 | out | provenance |  |
 | Test.java:127:32:127:61 | (...)... : LoggingEventBuilder | Test.java:128:13:128:14 | in : LoggingEventBuilder | provenance |  |
 | Test.java:127:54:127:61 | source(...) : Object | Test.java:127:32:127:61 | (...)... : LoggingEventBuilder | provenance |  |
-| Test.java:128:13:128:14 | in : LoggingEventBuilder | Test.java:128:13:128:56 | addKeyValue(...) : LoggingEventBuilder | provenance | MaD:13 |
+| Test.java:128:13:128:14 | in : LoggingEventBuilder | Test.java:128:13:128:56 | addKeyValue(...) : LoggingEventBuilder | provenance | MaD:14 |
 | Test.java:128:13:128:56 | addKeyValue(...) : LoggingEventBuilder | Test.java:129:12:129:14 | out | provenance |  |
 | Test.java:134:32:134:61 | (...)... : LoggingEventBuilder | Test.java:135:13:135:14 | in : LoggingEventBuilder | provenance |  |
 | Test.java:134:54:134:61 | source(...) : Object | Test.java:134:32:134:61 | (...)... : LoggingEventBuilder | provenance |  |
-| Test.java:135:13:135:14 | in : LoggingEventBuilder | Test.java:135:13:135:77 | addKeyValue(...) : LoggingEventBuilder | provenance | MaD:13 |
+| Test.java:135:13:135:14 | in : LoggingEventBuilder | Test.java:135:13:135:77 | addKeyValue(...) : LoggingEventBuilder | provenance | MaD:14 |
 | Test.java:135:13:135:77 | addKeyValue(...) : LoggingEventBuilder | Test.java:136:12:136:14 | out | provenance |  |
 | Test.java:141:19:141:35 | (...)... : Object | Test.java:142:38:142:39 | in : Object | provenance |  |
 | Test.java:141:28:141:35 | source(...) : Object | Test.java:141:19:141:35 | (...)... : Object | provenance |  |
 | Test.java:142:7:142:9 | out [post update] : LoggingEventBuilder | Test.java:143:12:143:14 | out | provenance |  |
-| Test.java:142:38:142:39 | in : Object | Test.java:142:7:142:9 | out [post update] : LoggingEventBuilder | provenance | MaD:14 |
+| Test.java:142:38:142:39 | in : Object | Test.java:142:7:142:9 | out [post update] : LoggingEventBuilder | provenance | MaD:13 |
 | Test.java:148:40:148:77 | (...)... : Supplier | Test.java:149:38:149:39 | in : Supplier | provenance |  |
 | Test.java:148:70:148:77 | source(...) : Object | Test.java:148:40:148:77 | (...)... : Supplier | provenance |  |
 | Test.java:149:7:149:9 | out [post update] : LoggingEventBuilder | Test.java:150:12:150:14 | out | provenance |  |
-| Test.java:149:38:149:39 | in : Supplier | Test.java:149:7:149:9 | out [post update] : LoggingEventBuilder | provenance | MaD:14 |
+| Test.java:149:38:149:39 | in : Supplier | Test.java:149:7:149:9 | out [post update] : LoggingEventBuilder | provenance | MaD:13 |
 | Test.java:155:32:155:61 | (...)... : LoggingEventBuilder | Test.java:156:13:156:14 | in : LoggingEventBuilder | provenance |  |
 | Test.java:155:54:155:61 | source(...) : Object | Test.java:155:32:155:61 | (...)... : LoggingEventBuilder | provenance |  |
 | Test.java:156:13:156:14 | in : LoggingEventBuilder | Test.java:156:13:156:30 | addMarker(...) : LoggingEventBuilder | provenance | MaD:15 |
diff --git a/java/ql/test/library-tests/optional/test.expected b/java/ql/test/library-tests/optional/test.expected
index 80952fa6fc4..8a3a44f7d26 100644
--- a/java/ql/test/library-tests/optional/test.expected
+++ b/java/ql/test/library-tests/optional/test.expected
@@ -1,22 +1,22 @@
 models
-| 1 | Summary: java.util; Optional; false; filter; ; ; Argument[this].Element; Argument[0].Parameter[0]; value; manual |
-| 2 | Summary: java.util; Optional; false; filter; ; ; Argument[this].Element; ReturnValue.Element; value; manual |
-| 3 | Summary: java.util; Optional; false; flatMap; ; ; Argument[this].Element; Argument[0].Parameter[0]; value; manual |
-| 4 | Summary: java.util; Optional; false; get; ; ; Argument[this].Element; ReturnValue; value; manual |
-| 5 | Summary: java.util; Optional; false; ifPresent; ; ; Argument[this].Element; Argument[0].Parameter[0]; value; manual |
-| 6 | Summary: java.util; Optional; false; ifPresentOrElse; ; ; Argument[this].Element; Argument[0].Parameter[0]; value; manual |
-| 7 | Summary: java.util; Optional; false; map; ; ; Argument[this].Element; Argument[0].Parameter[0]; value; manual |
-| 8 | Summary: java.util; Optional; false; of; ; ; Argument[0]; ReturnValue.Element; value; manual |
-| 9 | Summary: java.util; Optional; false; ofNullable; ; ; Argument[0]; ReturnValue.Element; value; manual |
-| 10 | Summary: java.util; Optional; false; or; ; ; Argument[this].Element; ReturnValue.Element; value; manual |
+| 1 | Summary: generatedtest; Test; false; getStreamElement; ; ; Argument[0].Element; ReturnValue; value; manual |
+| 2 | Summary: java.util; Optional; false; filter; ; ; Argument[this].Element; Argument[0].Parameter[0]; value; manual |
+| 3 | Summary: java.util; Optional; false; filter; ; ; Argument[this].Element; ReturnValue.Element; value; manual |
+| 4 | Summary: java.util; Optional; false; flatMap; ; ; Argument[this].Element; Argument[0].Parameter[0]; value; manual |
+| 5 | Summary: java.util; Optional; false; get; ; ; Argument[this].Element; ReturnValue; value; manual |
+| 6 | Summary: java.util; Optional; false; ifPresent; ; ; Argument[this].Element; Argument[0].Parameter[0]; value; manual |
+| 7 | Summary: java.util; Optional; false; ifPresentOrElse; ; ; Argument[this].Element; Argument[0].Parameter[0]; value; manual |
+| 8 | Summary: java.util; Optional; false; map; ; ; Argument[this].Element; Argument[0].Parameter[0]; value; manual |
+| 9 | Summary: java.util; Optional; false; of; ; ; Argument[0]; ReturnValue.Element; value; manual |
+| 10 | Summary: java.util; Optional; false; ofNullable; ; ; Argument[0]; ReturnValue.Element; value; manual |
 | 11 | Summary: java.util; Optional; false; or; ; ; Argument[0].ReturnValue; ReturnValue; value; manual |
-| 12 | Summary: java.util; Optional; false; orElse; ; ; Argument[this].Element; ReturnValue; value; manual |
+| 12 | Summary: java.util; Optional; false; or; ; ; Argument[this].Element; ReturnValue.Element; value; manual |
 | 13 | Summary: java.util; Optional; false; orElse; ; ; Argument[0]; ReturnValue; value; manual |
-| 14 | Summary: java.util; Optional; false; orElseGet; ; ; Argument[this].Element; ReturnValue; value; manual |
+| 14 | Summary: java.util; Optional; false; orElse; ; ; Argument[this].Element; ReturnValue; value; manual |
 | 15 | Summary: java.util; Optional; false; orElseGet; ; ; Argument[0].ReturnValue; ReturnValue; value; manual |
-| 16 | Summary: java.util; Optional; false; orElseThrow; ; ; Argument[this].Element; ReturnValue; value; manual |
-| 17 | Summary: java.util; Optional; false; stream; ; ; Argument[this].Element; ReturnValue.Element; value; manual |
-| 18 | Summary: generatedtest; Test; false; getStreamElement; ; ; Argument[0].Element; ReturnValue; value; manual |
+| 16 | Summary: java.util; Optional; false; orElseGet; ; ; Argument[this].Element; ReturnValue; value; manual |
+| 17 | Summary: java.util; Optional; false; orElseThrow; ; ; Argument[this].Element; ReturnValue; value; manual |
+| 18 | Summary: java.util; Optional; false; stream; ; ; Argument[this].Element; ReturnValue.Element; value; manual |
 edges
 | FunctionalTest.java:12:30:12:50 | of(...) : Optional [<element>] : String | FunctionalTest.java:13:9:13:9 | o : Optional [<element>] : String | provenance |  |
 | FunctionalTest.java:12:30:12:50 | of(...) : Optional [<element>] : String | FunctionalTest.java:16:9:16:9 | o : Optional [<element>] : String | provenance |  |
@@ -26,32 +26,32 @@ edges
 | FunctionalTest.java:12:30:12:50 | of(...) : Optional [<element>] : String | FunctionalTest.java:39:9:39:9 | o : Optional [<element>] : String | provenance |  |
 | FunctionalTest.java:12:30:12:50 | of(...) : Optional [<element>] : String | FunctionalTest.java:48:15:48:21 | Optional<String> o : Optional [<element>] : String | provenance |  |
 | FunctionalTest.java:12:30:12:50 | of(...) : Optional [<element>] : String | FunctionalTest.java:52:9:52:9 | o : Optional [<element>] : String | provenance |  |
-| FunctionalTest.java:12:42:12:49 | source(...) : String | FunctionalTest.java:12:30:12:50 | of(...) : Optional [<element>] : String | provenance | MaD:8 |
-| FunctionalTest.java:13:9:13:9 | o : Optional [<element>] : String | FunctionalTest.java:13:21:13:21 | v : String | provenance | MaD:5 |
+| FunctionalTest.java:12:42:12:49 | source(...) : String | FunctionalTest.java:12:30:12:50 | of(...) : Optional [<element>] : String | provenance | MaD:9 |
+| FunctionalTest.java:13:9:13:9 | o : Optional [<element>] : String | FunctionalTest.java:13:21:13:21 | v : String | provenance | MaD:6 |
 | FunctionalTest.java:13:21:13:21 | v : String | FunctionalTest.java:14:18:14:18 | v | provenance |  |
-| FunctionalTest.java:16:9:16:9 | o : Optional [<element>] : String | FunctionalTest.java:16:27:16:27 | v : String | provenance | MaD:6 |
+| FunctionalTest.java:16:9:16:9 | o : Optional [<element>] : String | FunctionalTest.java:16:27:16:27 | v : String | provenance | MaD:7 |
 | FunctionalTest.java:16:27:16:27 | v : String | FunctionalTest.java:17:18:17:18 | v | provenance |  |
-| FunctionalTest.java:21:9:21:9 | o : Optional [<element>] : String | FunctionalTest.java:21:9:24:10 | map(...) : Optional [<element>] : String | provenance | MaD:7 |
-| FunctionalTest.java:21:9:21:9 | o : Optional [<element>] : String | FunctionalTest.java:21:15:21:15 | v : String | provenance | MaD:7 |
-| FunctionalTest.java:21:9:24:10 | map(...) : Optional [<element>] : String | FunctionalTest.java:24:22:24:22 | v : String | provenance | MaD:5 |
+| FunctionalTest.java:21:9:21:9 | o : Optional [<element>] : String | FunctionalTest.java:21:9:24:10 | map(...) : Optional [<element>] : String | provenance | MaD:8 |
+| FunctionalTest.java:21:9:21:9 | o : Optional [<element>] : String | FunctionalTest.java:21:15:21:15 | v : String | provenance | MaD:8 |
+| FunctionalTest.java:21:9:24:10 | map(...) : Optional [<element>] : String | FunctionalTest.java:24:22:24:22 | v : String | provenance | MaD:6 |
 | FunctionalTest.java:21:15:21:15 | v : String | FunctionalTest.java:22:18:22:18 | v | provenance |  |
 | FunctionalTest.java:21:15:21:15 | v : String | FunctionalTest.java:23:20:23:20 | v : String | provenance |  |
 | FunctionalTest.java:24:22:24:22 | v : String | FunctionalTest.java:25:18:25:18 | v | provenance |  |
-| FunctionalTest.java:27:9:27:9 | o : Optional [<element>] : String | FunctionalTest.java:27:9:30:10 | flatMap(...) : Optional [<element>] : String | provenance | MaD:3 |
-| FunctionalTest.java:27:9:27:9 | o : Optional [<element>] : String | FunctionalTest.java:27:19:27:19 | v : String | provenance | MaD:3 |
-| FunctionalTest.java:27:9:30:10 | flatMap(...) : Optional [<element>] : String | FunctionalTest.java:30:22:30:22 | v : String | provenance | MaD:5 |
+| FunctionalTest.java:27:9:27:9 | o : Optional [<element>] : String | FunctionalTest.java:27:9:30:10 | flatMap(...) : Optional [<element>] : String | provenance | MaD:4 |
+| FunctionalTest.java:27:9:27:9 | o : Optional [<element>] : String | FunctionalTest.java:27:19:27:19 | v : String | provenance | MaD:4 |
+| FunctionalTest.java:27:9:30:10 | flatMap(...) : Optional [<element>] : String | FunctionalTest.java:30:22:30:22 | v : String | provenance | MaD:6 |
 | FunctionalTest.java:27:19:27:19 | v : String | FunctionalTest.java:28:18:28:18 | v | provenance |  |
 | FunctionalTest.java:27:19:27:19 | v : String | FunctionalTest.java:29:32:29:32 | v : String | provenance |  |
-| FunctionalTest.java:29:32:29:32 | v : String | FunctionalTest.java:29:20:29:33 | of(...) : Optional [<element>] : String | provenance | MaD:8 |
+| FunctionalTest.java:29:32:29:32 | v : String | FunctionalTest.java:29:20:29:33 | of(...) : Optional [<element>] : String | provenance | MaD:9 |
 | FunctionalTest.java:30:22:30:22 | v : String | FunctionalTest.java:31:18:31:18 | v | provenance |  |
-| FunctionalTest.java:33:9:33:9 | o : Optional [<element>] : String | FunctionalTest.java:33:19:33:19 | v : String | provenance | MaD:3 |
+| FunctionalTest.java:33:9:33:9 | o : Optional [<element>] : String | FunctionalTest.java:33:19:33:19 | v : String | provenance | MaD:4 |
 | FunctionalTest.java:33:19:33:19 | v : String | FunctionalTest.java:34:18:34:18 | v | provenance |  |
-| FunctionalTest.java:39:9:39:9 | o : Optional [<element>] : String | FunctionalTest.java:39:9:42:10 | filter(...) : Optional [<element>] : String | provenance | MaD:2 |
-| FunctionalTest.java:39:9:39:9 | o : Optional [<element>] : String | FunctionalTest.java:39:18:39:18 | v : String | provenance | MaD:1 |
-| FunctionalTest.java:39:9:42:10 | filter(...) : Optional [<element>] : String | FunctionalTest.java:42:22:42:22 | v : String | provenance | MaD:5 |
+| FunctionalTest.java:39:9:39:9 | o : Optional [<element>] : String | FunctionalTest.java:39:9:42:10 | filter(...) : Optional [<element>] : String | provenance | MaD:3 |
+| FunctionalTest.java:39:9:39:9 | o : Optional [<element>] : String | FunctionalTest.java:39:18:39:18 | v : String | provenance | MaD:2 |
+| FunctionalTest.java:39:9:42:10 | filter(...) : Optional [<element>] : String | FunctionalTest.java:42:22:42:22 | v : String | provenance | MaD:6 |
 | FunctionalTest.java:39:18:39:18 | v : String | FunctionalTest.java:40:18:40:18 | v | provenance |  |
 | FunctionalTest.java:42:22:42:22 | v : String | FunctionalTest.java:43:18:43:18 | v | provenance |  |
-| FunctionalTest.java:45:9:48:22 | or(...) : Optional [<element>] : String | FunctionalTest.java:48:34:48:34 | v : String | provenance | MaD:5 |
+| FunctionalTest.java:45:9:48:22 | or(...) : Optional [<element>] : String | FunctionalTest.java:48:34:48:34 | v : String | provenance | MaD:6 |
 | FunctionalTest.java:48:15:48:21 | ...->... : new Supplier<Optional<? extends String>>(...) { ... } [Optional<String> o, <element>] : String | FunctionalTest.java:45:9:48:22 | or(...) : Optional [<element>] : String | provenance | MaD:11 |
 | FunctionalTest.java:48:15:48:21 | ...->... : new Supplier<Optional<? extends String>>(...) { ... } [Optional<String> o, <element>] : String | FunctionalTest.java:45:9:48:22 | or(...) : Optional [<element>] : String | provenance | heuristic-callback |
 | FunctionalTest.java:48:15:48:21 | ...->... : new Supplier<Optional<? extends String>>(...) { ... } [Optional<String> o, <element>] : String | FunctionalTest.java:48:15:48:21 | parameter this : new Supplier<Optional<? extends String>>(...) { ... } [Optional<String> o, <element>] : String | provenance | MaD:11 |
@@ -60,76 +60,76 @@ edges
 | FunctionalTest.java:48:15:48:21 | parameter this : new Supplier<Optional<? extends String>>(...) { ... } [Optional<String> o, <element>] : String | FunctionalTest.java:48:21:48:21 | this : new Supplier<Optional<? extends String>>(...) { ... } [Optional<String> o, <element>] : String | provenance |  |
 | FunctionalTest.java:48:21:48:21 | this : new Supplier<Optional<? extends String>>(...) { ... } [Optional<String> o, <element>] : String | FunctionalTest.java:48:21:48:21 | o : Optional [<element>] : String | provenance |  |
 | FunctionalTest.java:48:34:48:34 | v : String | FunctionalTest.java:49:18:49:18 | v | provenance |  |
-| FunctionalTest.java:52:9:52:9 | o : Optional [<element>] : String | FunctionalTest.java:52:9:52:24 | or(...) : Optional [<element>] : String | provenance | MaD:10 |
-| FunctionalTest.java:52:9:52:24 | or(...) : Optional [<element>] : String | FunctionalTest.java:52:36:52:36 | v : String | provenance | MaD:5 |
+| FunctionalTest.java:52:9:52:9 | o : Optional [<element>] : String | FunctionalTest.java:52:9:52:24 | or(...) : Optional [<element>] : String | provenance | MaD:12 |
+| FunctionalTest.java:52:9:52:24 | or(...) : Optional [<element>] : String | FunctionalTest.java:52:36:52:36 | v : String | provenance | MaD:6 |
 | FunctionalTest.java:52:36:52:36 | v : String | FunctionalTest.java:53:18:53:18 | v | provenance |  |
 | FunctionalTest.java:55:24:55:53 | orElseGet(...) : String | FunctionalTest.java:56:14:56:18 | value | provenance |  |
 | FunctionalTest.java:55:45:55:52 | source(...) : String | FunctionalTest.java:55:24:55:53 | orElseGet(...) : String | provenance | MaD:15 |
 | Test.java:9:20:9:45 | container : Optional [<element>] : Object | Test.java:9:57:9:65 | container : Optional [<element>] : Object | provenance |  |
-| Test.java:9:57:9:65 | container : Optional [<element>] : Object | Test.java:9:57:9:71 | get(...) : Object | provenance | MaD:4 |
+| Test.java:9:57:9:65 | container : Optional [<element>] : Object | Test.java:9:57:9:71 | get(...) : Object | provenance | MaD:5 |
 | Test.java:11:34:11:47 | element : Object | Test.java:11:71:11:77 | element : Object | provenance |  |
-| Test.java:11:71:11:77 | element : Object | Test.java:11:59:11:78 | of(...) : Optional [<element>] : Object | provenance | MaD:8 |
+| Test.java:11:71:11:77 | element : Object | Test.java:11:59:11:78 | of(...) : Optional [<element>] : Object | provenance | MaD:9 |
 | Test.java:20:26:20:49 | newWithElement(...) : Optional [<element>] : Object | Test.java:21:10:21:11 | in : Optional [<element>] : Object | provenance |  |
 | Test.java:20:41:20:48 | source(...) : Object | Test.java:11:34:11:47 | element : Object | provenance |  |
-| Test.java:20:41:20:48 | source(...) : Object | Test.java:20:26:20:49 | newWithElement(...) : Optional [<element>] : Object | provenance | MaD:8 |
-| Test.java:21:10:21:11 | in : Optional [<element>] : Object | Test.java:21:10:21:24 | filter(...) : Optional [<element>] : Object | provenance | MaD:2 |
+| Test.java:20:41:20:48 | source(...) : Object | Test.java:20:26:20:49 | newWithElement(...) : Optional [<element>] : Object | provenance | MaD:9 |
+| Test.java:21:10:21:11 | in : Optional [<element>] : Object | Test.java:21:10:21:24 | filter(...) : Optional [<element>] : Object | provenance | MaD:3 |
 | Test.java:21:10:21:24 | filter(...) : Optional [<element>] : Object | Test.java:22:20:22:22 | out : Optional [<element>] : Object | provenance |  |
 | Test.java:22:20:22:22 | out : Optional [<element>] : Object | Test.java:9:20:9:45 | container : Optional [<element>] : Object | provenance |  |
-| Test.java:22:20:22:22 | out : Optional [<element>] : Object | Test.java:22:9:22:23 | getElement(...) | provenance | MaD:4 |
+| Test.java:22:20:22:22 | out : Optional [<element>] : Object | Test.java:22:9:22:23 | getElement(...) | provenance | MaD:5 |
 | Test.java:27:26:27:49 | newWithElement(...) : Optional [<element>] : Object | Test.java:28:10:28:11 | in : Optional [<element>] : Object | provenance |  |
 | Test.java:27:41:27:48 | source(...) : Object | Test.java:11:34:11:47 | element : Object | provenance |  |
-| Test.java:27:41:27:48 | source(...) : Object | Test.java:27:26:27:49 | newWithElement(...) : Optional [<element>] : Object | provenance | MaD:8 |
-| Test.java:28:10:28:11 | in : Optional [<element>] : Object | Test.java:28:10:28:17 | get(...) : Object | provenance | MaD:4 |
+| Test.java:27:41:27:48 | source(...) : Object | Test.java:27:26:27:49 | newWithElement(...) : Optional [<element>] : Object | provenance | MaD:9 |
+| Test.java:28:10:28:11 | in : Optional [<element>] : Object | Test.java:28:10:28:17 | get(...) : Object | provenance | MaD:5 |
 | Test.java:28:10:28:17 | get(...) : Object | Test.java:29:9:29:11 | out | provenance |  |
 | Test.java:34:16:34:31 | (...)... : Object | Test.java:35:22:35:23 | in : Object | provenance |  |
 | Test.java:34:24:34:31 | source(...) : Object | Test.java:34:16:34:31 | (...)... : Object | provenance |  |
 | Test.java:35:10:35:24 | of(...) : Optional [<element>] : Object | Test.java:36:20:36:22 | out : Optional [<element>] : Object | provenance |  |
-| Test.java:35:22:35:23 | in : Object | Test.java:35:10:35:24 | of(...) : Optional [<element>] : Object | provenance | MaD:8 |
+| Test.java:35:22:35:23 | in : Object | Test.java:35:10:35:24 | of(...) : Optional [<element>] : Object | provenance | MaD:9 |
 | Test.java:36:20:36:22 | out : Optional [<element>] : Object | Test.java:9:20:9:45 | container : Optional [<element>] : Object | provenance |  |
-| Test.java:36:20:36:22 | out : Optional [<element>] : Object | Test.java:36:9:36:23 | getElement(...) | provenance | MaD:4 |
+| Test.java:36:20:36:22 | out : Optional [<element>] : Object | Test.java:36:9:36:23 | getElement(...) | provenance | MaD:5 |
 | Test.java:41:16:41:31 | (...)... : Object | Test.java:42:30:42:31 | in : Object | provenance |  |
 | Test.java:41:24:41:31 | source(...) : Object | Test.java:41:16:41:31 | (...)... : Object | provenance |  |
 | Test.java:42:10:42:32 | ofNullable(...) : Optional [<element>] : Object | Test.java:43:20:43:22 | out : Optional [<element>] : Object | provenance |  |
-| Test.java:42:30:42:31 | in : Object | Test.java:42:10:42:32 | ofNullable(...) : Optional [<element>] : Object | provenance | MaD:9 |
+| Test.java:42:30:42:31 | in : Object | Test.java:42:10:42:32 | ofNullable(...) : Optional [<element>] : Object | provenance | MaD:10 |
 | Test.java:43:20:43:22 | out : Optional [<element>] : Object | Test.java:9:20:9:45 | container : Optional [<element>] : Object | provenance |  |
-| Test.java:43:20:43:22 | out : Optional [<element>] : Object | Test.java:43:9:43:23 | getElement(...) | provenance | MaD:4 |
+| Test.java:43:20:43:22 | out : Optional [<element>] : Object | Test.java:43:9:43:23 | getElement(...) | provenance | MaD:5 |
 | Test.java:48:26:48:49 | newWithElement(...) : Optional [<element>] : Object | Test.java:49:10:49:11 | in : Optional [<element>] : Object | provenance |  |
 | Test.java:48:41:48:48 | source(...) : Object | Test.java:11:34:11:47 | element : Object | provenance |  |
-| Test.java:48:41:48:48 | source(...) : Object | Test.java:48:26:48:49 | newWithElement(...) : Optional [<element>] : Object | provenance | MaD:8 |
-| Test.java:49:10:49:11 | in : Optional [<element>] : Object | Test.java:49:10:49:20 | or(...) : Optional [<element>] : Object | provenance | MaD:10 |
+| Test.java:48:41:48:48 | source(...) : Object | Test.java:48:26:48:49 | newWithElement(...) : Optional [<element>] : Object | provenance | MaD:9 |
+| Test.java:49:10:49:11 | in : Optional [<element>] : Object | Test.java:49:10:49:20 | or(...) : Optional [<element>] : Object | provenance | MaD:12 |
 | Test.java:49:10:49:20 | or(...) : Optional [<element>] : Object | Test.java:50:20:50:22 | out : Optional [<element>] : Object | provenance |  |
 | Test.java:50:20:50:22 | out : Optional [<element>] : Object | Test.java:9:20:9:45 | container : Optional [<element>] : Object | provenance |  |
-| Test.java:50:20:50:22 | out : Optional [<element>] : Object | Test.java:50:9:50:23 | getElement(...) | provenance | MaD:4 |
+| Test.java:50:20:50:22 | out : Optional [<element>] : Object | Test.java:50:9:50:23 | getElement(...) | provenance | MaD:5 |
 | Test.java:55:16:55:31 | (...)... : Object | Test.java:57:26:57:27 | in : Object | provenance |  |
 | Test.java:55:24:55:31 | source(...) : Object | Test.java:55:16:55:31 | (...)... : Object | provenance |  |
 | Test.java:57:10:57:28 | orElse(...) : Object | Test.java:58:9:58:11 | out | provenance |  |
 | Test.java:57:26:57:27 | in : Object | Test.java:57:10:57:28 | orElse(...) : Object | provenance | MaD:13 |
 | Test.java:63:26:63:49 | newWithElement(...) : Optional [<element>] : Object | Test.java:64:10:64:11 | in : Optional [<element>] : Object | provenance |  |
 | Test.java:63:41:63:48 | source(...) : Object | Test.java:11:34:11:47 | element : Object | provenance |  |
-| Test.java:63:41:63:48 | source(...) : Object | Test.java:63:26:63:49 | newWithElement(...) : Optional [<element>] : Object | provenance | MaD:8 |
-| Test.java:64:10:64:11 | in : Optional [<element>] : Object | Test.java:64:10:64:24 | orElse(...) : Object | provenance | MaD:12 |
+| Test.java:63:41:63:48 | source(...) : Object | Test.java:63:26:63:49 | newWithElement(...) : Optional [<element>] : Object | provenance | MaD:9 |
+| Test.java:64:10:64:11 | in : Optional [<element>] : Object | Test.java:64:10:64:24 | orElse(...) : Object | provenance | MaD:14 |
 | Test.java:64:10:64:24 | orElse(...) : Object | Test.java:65:9:65:11 | out | provenance |  |
 | Test.java:70:26:70:49 | newWithElement(...) : Optional [<element>] : Object | Test.java:71:10:71:11 | in : Optional [<element>] : Object | provenance |  |
 | Test.java:70:41:70:48 | source(...) : Object | Test.java:11:34:11:47 | element : Object | provenance |  |
-| Test.java:70:41:70:48 | source(...) : Object | Test.java:70:26:70:49 | newWithElement(...) : Optional [<element>] : Object | provenance | MaD:8 |
-| Test.java:71:10:71:11 | in : Optional [<element>] : Object | Test.java:71:10:71:27 | orElseGet(...) : Object | provenance | MaD:14 |
+| Test.java:70:41:70:48 | source(...) : Object | Test.java:70:26:70:49 | newWithElement(...) : Optional [<element>] : Object | provenance | MaD:9 |
+| Test.java:71:10:71:11 | in : Optional [<element>] : Object | Test.java:71:10:71:27 | orElseGet(...) : Object | provenance | MaD:16 |
 | Test.java:71:10:71:27 | orElseGet(...) : Object | Test.java:72:9:72:11 | out | provenance |  |
 | Test.java:77:26:77:49 | newWithElement(...) : Optional [<element>] : Object | Test.java:78:10:78:11 | in : Optional [<element>] : Object | provenance |  |
 | Test.java:77:41:77:48 | source(...) : Object | Test.java:11:34:11:47 | element : Object | provenance |  |
-| Test.java:77:41:77:48 | source(...) : Object | Test.java:77:26:77:49 | newWithElement(...) : Optional [<element>] : Object | provenance | MaD:8 |
-| Test.java:78:10:78:11 | in : Optional [<element>] : Object | Test.java:78:10:78:29 | orElseThrow(...) : Object | provenance | MaD:16 |
+| Test.java:77:41:77:48 | source(...) : Object | Test.java:77:26:77:49 | newWithElement(...) : Optional [<element>] : Object | provenance | MaD:9 |
+| Test.java:78:10:78:11 | in : Optional [<element>] : Object | Test.java:78:10:78:29 | orElseThrow(...) : Object | provenance | MaD:17 |
 | Test.java:78:10:78:29 | orElseThrow(...) : Object | Test.java:79:9:79:11 | out | provenance |  |
 | Test.java:84:26:84:49 | newWithElement(...) : Optional [<element>] : Object | Test.java:85:10:85:11 | in : Optional [<element>] : Object | provenance |  |
 | Test.java:84:41:84:48 | source(...) : Object | Test.java:11:34:11:47 | element : Object | provenance |  |
-| Test.java:84:41:84:48 | source(...) : Object | Test.java:84:26:84:49 | newWithElement(...) : Optional [<element>] : Object | provenance | MaD:8 |
-| Test.java:85:10:85:11 | in : Optional [<element>] : Object | Test.java:85:10:85:25 | orElseThrow(...) : Object | provenance | MaD:16 |
+| Test.java:84:41:84:48 | source(...) : Object | Test.java:84:26:84:49 | newWithElement(...) : Optional [<element>] : Object | provenance | MaD:9 |
+| Test.java:85:10:85:11 | in : Optional [<element>] : Object | Test.java:85:10:85:25 | orElseThrow(...) : Object | provenance | MaD:17 |
 | Test.java:85:10:85:25 | orElseThrow(...) : Object | Test.java:86:9:86:11 | out | provenance |  |
 | Test.java:91:26:91:49 | newWithElement(...) : Optional [<element>] : Object | Test.java:92:10:92:11 | in : Optional [<element>] : Object | provenance |  |
 | Test.java:91:41:91:48 | source(...) : Object | Test.java:11:34:11:47 | element : Object | provenance |  |
-| Test.java:91:41:91:48 | source(...) : Object | Test.java:91:26:91:49 | newWithElement(...) : Optional [<element>] : Object | provenance | MaD:8 |
-| Test.java:92:10:92:11 | in : Optional [<element>] : Object | Test.java:92:10:92:20 | stream(...) : Stream [<element>] : Object | provenance | MaD:17 |
+| Test.java:91:41:91:48 | source(...) : Object | Test.java:91:26:91:49 | newWithElement(...) : Optional [<element>] : Object | provenance | MaD:9 |
+| Test.java:92:10:92:11 | in : Optional [<element>] : Object | Test.java:92:10:92:20 | stream(...) : Stream [<element>] : Object | provenance | MaD:18 |
 | Test.java:92:10:92:20 | stream(...) : Stream [<element>] : Object | Test.java:93:26:93:28 | out : Stream [<element>] : Object | provenance |  |
-| Test.java:93:26:93:28 | out : Stream [<element>] : Object | Test.java:93:9:93:29 | getStreamElement(...) | provenance | MaD:18 |
+| Test.java:93:26:93:28 | out : Stream [<element>] : Object | Test.java:93:9:93:29 | getStreamElement(...) | provenance | MaD:1 |
 nodes
 | FunctionalTest.java:12:30:12:50 | of(...) : Optional [<element>] : String | semmle.label | of(...) : Optional [<element>] : String |
 | FunctionalTest.java:12:42:12:49 | source(...) : String | semmle.label | source(...) : String |
diff --git a/java/ql/test/library-tests/paths/test.expected b/java/ql/test/library-tests/paths/test.expected
index bd5171c8b3a..51682966b6c 100644
--- a/java/ql/test/library-tests/paths/test.expected
+++ b/java/ql/test/library-tests/paths/test.expected
@@ -9,12 +9,12 @@ models
 | 8 | Summary: java.io; File; true; toString; ; ; Argument[this]; ReturnValue; taint; manual |
 | 9 | Summary: java.io; File; true; toURI; ; ; Argument[this]; ReturnValue; taint; manual |
 | 10 | Summary: java.nio.file; FileSystem; true; getPath; (String,String[]); ; Argument[0]; ReturnValue; taint; manual |
-| 11 | Summary: java.nio.file; Path; true; getParent; ; ; Argument[this]; ReturnValue; taint; manual |
-| 12 | Summary: java.nio.file; Path; true; normalize; ; ; Argument[this]; ReturnValue; taint; manual |
-| 13 | Summary: java.nio.file; Path; true; resolve; ; ; Argument[0]; ReturnValue; taint; manual |
-| 14 | Summary: java.nio.file; Path; true; resolve; ; ; Argument[this]; ReturnValue; taint; manual |
-| 15 | Summary: java.nio.file; Path; true; toAbsolutePath; ; ; Argument[this]; ReturnValue; taint; manual |
-| 16 | Summary: java.nio.file; Path; false; toFile; ; ; Argument[this]; ReturnValue; taint; manual |
+| 11 | Summary: java.nio.file; Path; false; toFile; ; ; Argument[this]; ReturnValue; taint; manual |
+| 12 | Summary: java.nio.file; Path; true; getParent; ; ; Argument[this]; ReturnValue; taint; manual |
+| 13 | Summary: java.nio.file; Path; true; normalize; ; ; Argument[this]; ReturnValue; taint; manual |
+| 14 | Summary: java.nio.file; Path; true; resolve; ; ; Argument[0]; ReturnValue; taint; manual |
+| 15 | Summary: java.nio.file; Path; true; resolve; ; ; Argument[this]; ReturnValue; taint; manual |
+| 16 | Summary: java.nio.file; Path; true; toAbsolutePath; ; ; Argument[this]; ReturnValue; taint; manual |
 | 17 | Summary: java.nio.file; Path; true; toString; ; ; Argument[this]; ReturnValue; taint; manual |
 | 18 | Summary: java.nio.file; Path; true; toUri; ; ; Argument[this]; ReturnValue; taint; manual |
 | 19 | Summary: java.nio.file; Paths; true; get; ; ; Argument[0]; ReturnValue; taint; manual |
@@ -78,35 +78,35 @@ edges
 | Test.java:113:27:113:28 | in : String | Test.java:113:10:113:45 | getPath(...) : Path | provenance | MaD:10 |
 | Test.java:119:14:119:27 | (...)... : Path | Test.java:120:10:120:11 | in : Path | provenance |  |
 | Test.java:119:20:119:27 | source(...) : Object | Test.java:119:14:119:27 | (...)... : Path | provenance |  |
-| Test.java:120:10:120:11 | in : Path | Test.java:120:10:120:20 | toFile(...) : File | provenance | MaD:16 |
+| Test.java:120:10:120:11 | in : Path | Test.java:120:10:120:20 | toFile(...) : File | provenance | MaD:11 |
 | Test.java:120:10:120:20 | toFile(...) : File | Test.java:121:9:121:11 | out | provenance |  |
 | Test.java:126:14:126:27 | (...)... : Path | Test.java:127:10:127:11 | in : Path | provenance |  |
 | Test.java:126:20:126:27 | source(...) : Object | Test.java:126:14:126:27 | (...)... : Path | provenance |  |
-| Test.java:127:10:127:11 | in : Path | Test.java:127:10:127:23 | getParent(...) : Path | provenance | MaD:11 |
+| Test.java:127:10:127:11 | in : Path | Test.java:127:10:127:23 | getParent(...) : Path | provenance | MaD:12 |
 | Test.java:127:10:127:23 | getParent(...) : Path | Test.java:128:9:128:11 | out | provenance |  |
 | Test.java:133:14:133:27 | (...)... : Path | Test.java:134:10:134:11 | in : Path | provenance |  |
 | Test.java:133:20:133:27 | source(...) : Object | Test.java:133:14:133:27 | (...)... : Path | provenance |  |
-| Test.java:134:10:134:11 | in : Path | Test.java:134:10:134:23 | normalize(...) : Path | provenance | MaD:12 |
+| Test.java:134:10:134:11 | in : Path | Test.java:134:10:134:23 | normalize(...) : Path | provenance | MaD:13 |
 | Test.java:134:10:134:23 | normalize(...) : Path | Test.java:135:9:135:11 | out | provenance |  |
 | Test.java:140:14:140:27 | (...)... : Path | Test.java:142:27:142:28 | in : Path | provenance |  |
 | Test.java:140:20:140:27 | source(...) : Object | Test.java:140:14:140:27 | (...)... : Path | provenance |  |
 | Test.java:142:10:142:29 | resolve(...) : Path | Test.java:143:9:143:11 | out | provenance |  |
-| Test.java:142:27:142:28 | in : Path | Test.java:142:10:142:29 | resolve(...) : Path | provenance | MaD:13 |
+| Test.java:142:27:142:28 | in : Path | Test.java:142:10:142:29 | resolve(...) : Path | provenance | MaD:14 |
 | Test.java:148:14:148:27 | (...)... : Path | Test.java:149:10:149:11 | in : Path | provenance |  |
 | Test.java:148:20:148:27 | source(...) : Object | Test.java:148:14:148:27 | (...)... : Path | provenance |  |
-| Test.java:149:10:149:11 | in : Path | Test.java:149:10:149:31 | resolve(...) : Path | provenance | MaD:14 |
+| Test.java:149:10:149:11 | in : Path | Test.java:149:10:149:31 | resolve(...) : Path | provenance | MaD:15 |
 | Test.java:149:10:149:31 | resolve(...) : Path | Test.java:150:9:150:11 | out | provenance |  |
 | Test.java:155:14:155:27 | (...)... : Path | Test.java:156:10:156:11 | in : Path | provenance |  |
 | Test.java:155:20:155:27 | source(...) : Object | Test.java:155:14:155:27 | (...)... : Path | provenance |  |
-| Test.java:156:10:156:11 | in : Path | Test.java:156:10:156:33 | resolve(...) : Path | provenance | MaD:14 |
+| Test.java:156:10:156:11 | in : Path | Test.java:156:10:156:33 | resolve(...) : Path | provenance | MaD:15 |
 | Test.java:156:10:156:33 | resolve(...) : Path | Test.java:157:9:157:11 | out | provenance |  |
 | Test.java:162:16:162:31 | (...)... : String | Test.java:164:27:164:28 | in : String | provenance |  |
 | Test.java:162:24:162:31 | source(...) : Object | Test.java:162:16:162:31 | (...)... : String | provenance |  |
 | Test.java:164:10:164:29 | resolve(...) : Path | Test.java:165:9:165:11 | out | provenance |  |
-| Test.java:164:27:164:28 | in : String | Test.java:164:10:164:29 | resolve(...) : Path | provenance | MaD:13 |
+| Test.java:164:27:164:28 | in : String | Test.java:164:10:164:29 | resolve(...) : Path | provenance | MaD:14 |
 | Test.java:170:14:170:27 | (...)... : Path | Test.java:171:10:171:11 | in : Path | provenance |  |
 | Test.java:170:20:170:27 | source(...) : Object | Test.java:170:14:170:27 | (...)... : Path | provenance |  |
-| Test.java:171:10:171:11 | in : Path | Test.java:171:10:171:28 | toAbsolutePath(...) : Path | provenance | MaD:15 |
+| Test.java:171:10:171:11 | in : Path | Test.java:171:10:171:28 | toAbsolutePath(...) : Path | provenance | MaD:16 |
 | Test.java:171:10:171:28 | toAbsolutePath(...) : Path | Test.java:172:9:172:11 | out | provenance |  |
 | Test.java:177:14:177:27 | (...)... : Path | Test.java:178:10:178:11 | in : Path | provenance |  |
 | Test.java:177:20:177:27 | source(...) : Object | Test.java:177:14:177:27 | (...)... : Path | provenance |  |
diff --git a/java/ql/test/library-tests/regex/test.expected b/java/ql/test/library-tests/regex/test.expected
index bfe03ba33c9..9bf1d4e1691 100644
--- a/java/ql/test/library-tests/regex/test.expected
+++ b/java/ql/test/library-tests/regex/test.expected
@@ -1,9 +1,9 @@
 models
 | 1 | Summary: java.util.regex; Matcher; false; group; ; ; Argument[this]; ReturnValue; taint; manual |
-| 2 | Summary: java.util.regex; Matcher; false; replaceAll; ; ; Argument[this]; ReturnValue; taint; manual |
-| 3 | Summary: java.util.regex; Matcher; false; replaceAll; ; ; Argument[0]; ReturnValue; taint; manual |
-| 4 | Summary: java.util.regex; Matcher; false; replaceFirst; ; ; Argument[this]; ReturnValue; taint; manual |
-| 5 | Summary: java.util.regex; Matcher; false; replaceFirst; ; ; Argument[0]; ReturnValue; taint; manual |
+| 2 | Summary: java.util.regex; Matcher; false; replaceAll; ; ; Argument[0]; ReturnValue; taint; manual |
+| 3 | Summary: java.util.regex; Matcher; false; replaceAll; ; ; Argument[this]; ReturnValue; taint; manual |
+| 4 | Summary: java.util.regex; Matcher; false; replaceFirst; ; ; Argument[0]; ReturnValue; taint; manual |
+| 5 | Summary: java.util.regex; Matcher; false; replaceFirst; ; ; Argument[this]; ReturnValue; taint; manual |
 | 6 | Summary: java.util.regex; Pattern; false; matcher; ; ; Argument[0]; ReturnValue; taint; manual |
 | 7 | Summary: java.util.regex; Pattern; false; quote; ; ; Argument[0]; ReturnValue; taint; manual |
 | 8 | Summary: java.util.regex; Pattern; false; split; ; ; Argument[0]; ReturnValue; taint; manual |
@@ -30,22 +30,22 @@ edges
 | Test.java:44:28:44:35 | source(...) : Object | Test.java:44:19:44:35 | (...)... : String | provenance |  |
 | Test.java:45:19:45:37 | matcher(...) : Matcher | Test.java:46:13:46:13 | m : Matcher | provenance |  |
 | Test.java:45:35:45:36 | in : String | Test.java:45:19:45:37 | matcher(...) : Matcher | provenance | MaD:6 |
-| Test.java:46:13:46:13 | m : Matcher | Test.java:46:13:46:31 | replaceAll(...) : String | provenance | MaD:2 |
+| Test.java:46:13:46:13 | m : Matcher | Test.java:46:13:46:31 | replaceAll(...) : String | provenance | MaD:3 |
 | Test.java:46:13:46:31 | replaceAll(...) : String | Test.java:47:12:47:14 | out | provenance |  |
 | Test.java:52:19:52:35 | (...)... : String | Test.java:54:26:54:27 | in : String | provenance |  |
 | Test.java:52:28:52:35 | source(...) : Object | Test.java:52:19:52:35 | (...)... : String | provenance |  |
 | Test.java:54:13:54:28 | replaceAll(...) : String | Test.java:55:12:55:14 | out | provenance |  |
-| Test.java:54:26:54:27 | in : String | Test.java:54:13:54:28 | replaceAll(...) : String | provenance | MaD:3 |
+| Test.java:54:26:54:27 | in : String | Test.java:54:13:54:28 | replaceAll(...) : String | provenance | MaD:2 |
 | Test.java:60:19:60:35 | (...)... : String | Test.java:61:35:61:36 | in : String | provenance |  |
 | Test.java:60:28:60:35 | source(...) : Object | Test.java:60:19:60:35 | (...)... : String | provenance |  |
 | Test.java:61:19:61:37 | matcher(...) : Matcher | Test.java:62:13:62:13 | m : Matcher | provenance |  |
 | Test.java:61:35:61:36 | in : String | Test.java:61:19:61:37 | matcher(...) : Matcher | provenance | MaD:6 |
-| Test.java:62:13:62:13 | m : Matcher | Test.java:62:13:62:33 | replaceFirst(...) : String | provenance | MaD:4 |
+| Test.java:62:13:62:13 | m : Matcher | Test.java:62:13:62:33 | replaceFirst(...) : String | provenance | MaD:5 |
 | Test.java:62:13:62:33 | replaceFirst(...) : String | Test.java:63:12:63:14 | out | provenance |  |
 | Test.java:68:19:68:35 | (...)... : String | Test.java:70:28:70:29 | in : String | provenance |  |
 | Test.java:68:28:68:35 | source(...) : Object | Test.java:68:19:68:35 | (...)... : String | provenance |  |
 | Test.java:70:13:70:30 | replaceFirst(...) : String | Test.java:71:12:71:14 | out | provenance |  |
-| Test.java:70:28:70:29 | in : String | Test.java:70:13:70:30 | replaceFirst(...) : String | provenance | MaD:5 |
+| Test.java:70:28:70:29 | in : String | Test.java:70:13:70:30 | replaceFirst(...) : String | provenance | MaD:4 |
 | Test.java:76:25:76:46 | (...)... : CharSequence | Test.java:77:29:77:30 | in : CharSequence | provenance |  |
 | Test.java:76:39:76:46 | source(...) : Object | Test.java:76:25:76:46 | (...)... : CharSequence | provenance |  |
 | Test.java:77:13:77:31 | matcher(...) : Matcher | Test.java:78:12:78:14 | out | provenance |  |
diff --git a/java/ql/test/library-tests/unreachableblocks/UnreachableBlocks.expected b/java/ql/test/library-tests/unreachableblocks/UnreachableBlocks.expected
index 35178b0a349..6bd76ea4b96 100644
--- a/java/ql/test/library-tests/unreachableblocks/UnreachableBlocks.expected
+++ b/java/ql/test/library-tests/unreachableblocks/UnreachableBlocks.expected
@@ -3,7 +3,6 @@
 | unreachableblocks/Unreachable.java:12:22:14:3 | { ... } |
 | unreachableblocks/Unreachable.java:17:3:17:9 | case ... |
 | unreachableblocks/Unreachable.java:19:3:19:9 | case ... |
-| unreachableblocks/Unreachable.java:22:3:22:9 | case ... |
 | unreachableblocks/Unreachable.java:24:3:24:9 | case ... |
 | unreachableblocks/Unreachable.java:26:3:26:10 | case ... |
 | unreachableblocks/Unreachable.java:27:3:27:10 | default |
diff --git a/java/ql/test/library-tests/xml/XMLTest.expected b/java/ql/test/library-tests/xml/XMLTest.expected
index 316503fd211..191aad0a6e2 100644
--- a/java/ql/test/library-tests/xml/XMLTest.expected
+++ b/java/ql/test/library-tests/xml/XMLTest.expected
@@ -1,4 +1,4 @@
-failures
 testFailures
-| test.xml:4:5:4:32 | attribute=value | Unexpected result: hasXmlResult= |
-| test.xml:5:29:5:52 |  $ hasXmlResult  | Missing result:hasXmlResult= |
+| test.xml:4:5:4:32 | attribute=value | Unexpected result: hasXmlResult |
+| test.xml:5:29:5:52 |  $ hasXmlResult  | Missing result: hasXmlResult |
+failures
diff --git a/java/ql/test/query-tests/Metrics/GeneratedVsManualCoverage/TopJdkApisTest/TopJdkApisTest.expected b/java/ql/test/query-tests/Metrics/GeneratedVsManualCoverage/TopJdkApisTest/TopJdkApisTest.expected
index d5176a7a4de..6f7f461973a 100644
--- a/java/ql/test/query-tests/Metrics/GeneratedVsManualCoverage/TopJdkApisTest/TopJdkApisTest.expected
+++ b/java/ql/test/query-tests/Metrics/GeneratedVsManualCoverage/TopJdkApisTest/TopJdkApisTest.expected
@@ -14,10 +14,10 @@
 | java.time.chrono | 0 | 0 | 0 | 1 | 1 | 0.0 | 0.0 | 0.0 | NaN | NaN | 1.0 |
 | java.time.format | 0 | 0 | 0 | 2 | 2 | 0.0 | 0.0 | 0.0 | NaN | NaN | 1.0 |
 | java.util | 0 | 0 | 86 | 64 | 150 | 0.5733333333333334 | 0.0 | 0.5733333333333334 | 0.0 | NaN | 0.4266666666666667 |
-| java.util.concurrent | 1 | 0 | 9 | 8 | 18 | 0.5555555555555556 | 0.05555555555555555 | 0.5 | 0.0 | 0.0 | 0.4444444444444444 |
+| java.util.concurrent | 0 | 0 | 9 | 9 | 18 | 0.5 | 0.0 | 0.5 | 0.0 | NaN | 0.5 |
 | java.util.concurrent.atomic | 0 | 0 | 2 | 11 | 13 | 0.15384615384615385 | 0.0 | 0.15384615384615385 | 0.0 | NaN | 0.8461538461538461 |
 | java.util.concurrent.locks | 0 | 0 | 0 | 2 | 2 | 0.0 | 0.0 | 0.0 | NaN | NaN | 1.0 |
 | java.util.function | 0 | 0 | 0 | 1 | 1 | 0.0 | 0.0 | 0.0 | NaN | NaN | 1.0 |
 | java.util.logging | 0 | 0 | 1 | 1 | 2 | 0.5 | 0.0 | 0.5 | 0.0 | NaN | 0.5 |
 | java.util.regex | 0 | 0 | 3 | 1 | 4 | 0.75 | 0.0 | 0.75 | 0.0 | NaN | 0.25 |
-| java.util.stream | 1 | 0 | 18 | 7 | 26 | 0.7307692307692307 | 0.038461538461538464 | 0.6923076923076923 | 0.0 | 0.0 | 0.2692307692307692 |
+| java.util.stream | 0 | 0 | 19 | 7 | 26 | 0.7307692307692307 | 0.0 | 0.7307692307692307 | 0.0 | NaN | 0.2692307692307692 |
diff --git a/java/ql/test/query-tests/security/CWE-022/semmle/tests/ZipSlip.expected b/java/ql/test/query-tests/security/CWE-022/semmle/tests/ZipSlip.expected
index 44675caf775..b4880e1d511 100644
--- a/java/ql/test/query-tests/security/CWE-022/semmle/tests/ZipSlip.expected
+++ b/java/ql/test/query-tests/security/CWE-022/semmle/tests/ZipSlip.expected
@@ -4,9 +4,9 @@
 | ZipTest.java:7:19:7:33 | getName(...) | ZipTest.java:7:19:7:33 | getName(...) : String | ZipTest.java:11:36:11:39 | file | Unsanitized archive entry, which may contain '..', is used in a $@. | ZipTest.java:11:36:11:39 | file | file system operation |
 edges
 | ZipTest.java:7:19:7:33 | getName(...) : String | ZipTest.java:8:31:8:34 | name : String | provenance |  |
-| ZipTest.java:8:17:8:35 | new File(...) : File | ZipTest.java:9:48:9:51 | file | provenance |  Sink:MaD:1 |
-| ZipTest.java:8:17:8:35 | new File(...) : File | ZipTest.java:10:49:10:52 | file | provenance |  Sink:MaD:3 |
-| ZipTest.java:8:17:8:35 | new File(...) : File | ZipTest.java:11:36:11:39 | file | provenance |  Sink:MaD:2 |
+| ZipTest.java:8:17:8:35 | new File(...) : File | ZipTest.java:9:48:9:51 | file | provenance | Sink:MaD:1 |
+| ZipTest.java:8:17:8:35 | new File(...) : File | ZipTest.java:10:49:10:52 | file | provenance | Sink:MaD:3 |
+| ZipTest.java:8:17:8:35 | new File(...) : File | ZipTest.java:11:36:11:39 | file | provenance | Sink:MaD:2 |
 | ZipTest.java:8:31:8:34 | name : String | ZipTest.java:8:17:8:35 | new File(...) : File | provenance | MaD:4 |
 models
 | 1 | Sink: java.io; FileOutputStream; false; FileOutputStream; ; ; Argument[0]; path-injection; manual |
diff --git a/java/ql/test/query-tests/security/CWE-078/ExecTainted.expected b/java/ql/test/query-tests/security/CWE-078/ExecTainted.expected
index 8cff41743e9..e65a61d7698 100644
--- a/java/ql/test/query-tests/security/CWE-078/ExecTainted.expected
+++ b/java/ql/test/query-tests/security/CWE-078/ExecTainted.expected
@@ -9,17 +9,15 @@ edges
 | Test.java:6:35:6:44 | arg : String | Test.java:10:61:10:73 | ... + ... : String | provenance |  |
 | Test.java:6:35:6:44 | arg : String | Test.java:16:13:16:25 | ... + ... : String | provenance |  |
 | Test.java:6:35:6:44 | arg : String | Test.java:22:15:22:27 | ... + ... : String | provenance |  |
-| Test.java:7:25:7:70 | new ..[] { .. } : String[] [[]] : String | Test.java:7:25:7:70 | new ..[] { .. } | provenance |  Sink:MaD:2 |
-| Test.java:7:44:7:69 | ... + ... : String | Test.java:7:25:7:70 | new ..[] { .. } : String[] [[]] : String | provenance |  |
-| Test.java:10:29:10:74 | {...} : String[] [[]] : String | Test.java:10:29:10:74 | new String[] | provenance |  Sink:MaD:2 |
+| Test.java:7:44:7:69 | ... + ... : String | Test.java:7:25:7:70 | new ..[] { .. } | provenance | Sink:MaD:2 |
+| Test.java:10:29:10:74 | {...} : String[] [[]] : String | Test.java:10:29:10:74 | new String[] | provenance | Sink:MaD:2 |
 | Test.java:10:61:10:73 | ... + ... : String | Test.java:10:29:10:74 | {...} : String[] [[]] : String | provenance |  |
-| Test.java:16:5:16:7 | cmd [post update] : ArrayList [<element>] : String | Test.java:18:29:18:31 | cmd | provenance |  Sink:MaD:1 |
+| Test.java:16:5:16:7 | cmd [post update] : ArrayList [<element>] : String | Test.java:18:29:18:31 | cmd | provenance | Sink:MaD:1 |
 | Test.java:16:13:16:25 | ... + ... : String | Test.java:16:5:16:7 | cmd [post update] : ArrayList [<element>] : String | provenance | MaD:3 |
-| Test.java:22:5:22:8 | cmd1 [post update] : String[] [[]] : String | Test.java:24:29:24:32 | cmd1 | provenance |  Sink:MaD:2 |
+| Test.java:22:5:22:8 | cmd1 [post update] : String[] [[]] : String | Test.java:24:29:24:32 | cmd1 | provenance | Sink:MaD:2 |
 | Test.java:22:15:22:27 | ... + ... : String | Test.java:22:5:22:8 | cmd1 [post update] : String[] [[]] : String | provenance |  |
 | Test.java:28:38:28:47 | arg : String | Test.java:29:44:29:64 | ... + ... : String | provenance |  |
-| Test.java:29:25:29:65 | new ..[] { .. } : String[] [[]] : String | Test.java:29:25:29:65 | new ..[] { .. } | provenance |  Sink:MaD:2 |
-| Test.java:29:44:29:64 | ... + ... : String | Test.java:29:25:29:65 | new ..[] { .. } : String[] [[]] : String | provenance |  |
+| Test.java:29:44:29:64 | ... + ... : String | Test.java:29:25:29:65 | new ..[] { .. } | provenance | Sink:MaD:2 |
 | Test.java:57:27:57:39 | args : String[] | Test.java:60:20:60:22 | arg : String | provenance |  |
 | Test.java:57:27:57:39 | args : String[] | Test.java:61:23:61:25 | arg : String | provenance |  |
 | Test.java:60:20:60:22 | arg : String | Test.java:6:35:6:44 | arg : String | provenance |  |
@@ -31,7 +29,6 @@ models
 nodes
 | Test.java:6:35:6:44 | arg : String | semmle.label | arg : String |
 | Test.java:7:25:7:70 | new ..[] { .. } | semmle.label | new ..[] { .. } |
-| Test.java:7:25:7:70 | new ..[] { .. } : String[] [[]] : String | semmle.label | new ..[] { .. } : String[] [[]] : String |
 | Test.java:7:44:7:69 | ... + ... : String | semmle.label | ... + ... : String |
 | Test.java:10:29:10:74 | new String[] | semmle.label | new String[] |
 | Test.java:10:29:10:74 | {...} : String[] [[]] : String | semmle.label | {...} : String[] [[]] : String |
@@ -44,7 +41,6 @@ nodes
 | Test.java:24:29:24:32 | cmd1 | semmle.label | cmd1 |
 | Test.java:28:38:28:47 | arg : String | semmle.label | arg : String |
 | Test.java:29:25:29:65 | new ..[] { .. } | semmle.label | new ..[] { .. } |
-| Test.java:29:25:29:65 | new ..[] { .. } : String[] [[]] : String | semmle.label | new ..[] { .. } : String[] [[]] : String |
 | Test.java:29:44:29:64 | ... + ... : String | semmle.label | ... + ... : String |
 | Test.java:57:27:57:39 | args : String[] | semmle.label | args : String[] |
 | Test.java:60:20:60:22 | arg : String | semmle.label | arg : String |
diff --git a/java/ql/test/query-tests/security/CWE-089/semmle/examples/SqlTainted.expected b/java/ql/test/query-tests/security/CWE-089/semmle/examples/SqlTainted.expected
index ef7d3be5be8..d54bbdaec05 100644
--- a/java/ql/test/query-tests/security/CWE-089/semmle/examples/SqlTainted.expected
+++ b/java/ql/test/query-tests/security/CWE-089/semmle/examples/SqlTainted.expected
@@ -13,18 +13,18 @@ edges
 | Mongo.java:10:29:10:41 | args : String[] | Mongo.java:17:56:17:66 | stringQuery : String | provenance |  |
 | Mongo.java:10:29:10:41 | args : String[] | Mongo.java:21:49:21:52 | json | provenance |  |
 | Mongo.java:17:56:17:66 | stringQuery : String | Mongo.java:17:45:17:67 | parse(...) | provenance | Config |
-| Test.java:29:30:29:42 | args : String[] | Test.java:36:47:36:52 | query1 | provenance |  Sink:MaD:6 |
-| Test.java:29:30:29:42 | args : String[] | Test.java:42:57:42:62 | query2 | provenance |  Sink:MaD:3 |
-| Test.java:29:30:29:42 | args : String[] | Test.java:50:62:50:67 | query3 | provenance |  Sink:MaD:4 |
+| Test.java:29:30:29:42 | args : String[] | Test.java:36:47:36:52 | query1 | provenance | Sink:MaD:4 |
+| Test.java:29:30:29:42 | args : String[] | Test.java:42:57:42:62 | query2 | provenance | Sink:MaD:1 |
+| Test.java:29:30:29:42 | args : String[] | Test.java:50:62:50:67 | query3 | provenance | Sink:MaD:2 |
 | Test.java:29:30:29:42 | args : String[] | Test.java:58:19:58:26 | category : String | provenance |  |
-| Test.java:29:30:29:42 | args : String[] | Test.java:70:40:70:44 | query | provenance |  Sink:MaD:7 |
-| Test.java:29:30:29:42 | args : String[] | Test.java:78:46:78:50 | query | provenance |  Sink:MaD:5 |
+| Test.java:29:30:29:42 | args : String[] | Test.java:70:40:70:44 | query | provenance | Sink:MaD:5 |
+| Test.java:29:30:29:42 | args : String[] | Test.java:78:46:78:50 | query | provenance | Sink:MaD:3 |
 | Test.java:58:4:58:10 | querySb [post update] : StringBuilder | Test.java:60:29:60:35 | querySb : StringBuilder | provenance |  |
-| Test.java:58:19:58:26 | category : String | Test.java:58:4:58:10 | querySb [post update] : StringBuilder | provenance | MaD:1 |
-| Test.java:60:29:60:35 | querySb : StringBuilder | Test.java:60:29:60:46 | toString(...) : String | provenance | MaD:2 |
-| Test.java:60:29:60:46 | toString(...) : String | Test.java:62:47:62:61 | querySbToString | provenance |  Sink:MaD:6 |
-| Test.java:183:33:183:45 | args : String[] | Test.java:209:47:209:68 | queryWithUserTableName | provenance |  Sink:MaD:6 |
-| Test.java:213:34:213:46 | args : String[] | Test.java:221:81:221:111 | ... + ... | provenance |  Sink:MaD:6 |
+| Test.java:58:19:58:26 | category : String | Test.java:58:4:58:10 | querySb [post update] : StringBuilder | provenance | MaD:6 |
+| Test.java:60:29:60:35 | querySb : StringBuilder | Test.java:60:29:60:46 | toString(...) : String | provenance | MaD:7 |
+| Test.java:60:29:60:46 | toString(...) : String | Test.java:62:47:62:61 | querySbToString | provenance | Sink:MaD:4 |
+| Test.java:183:33:183:45 | args : String[] | Test.java:209:47:209:68 | queryWithUserTableName | provenance | Sink:MaD:4 |
+| Test.java:213:34:213:46 | args : String[] | Test.java:221:81:221:111 | ... + ... | provenance | Sink:MaD:4 |
 | Test.java:227:26:227:38 | args : String[] | Test.java:228:11:228:14 | args : String[] | provenance |  |
 | Test.java:227:26:227:38 | args : String[] | Test.java:232:14:232:17 | args : String[] | provenance |  |
 | Test.java:227:26:227:38 | args : String[] | Test.java:233:15:233:18 | args : String[] | provenance |  |
@@ -32,13 +32,13 @@ edges
 | Test.java:232:14:232:17 | args : String[] | Test.java:183:33:183:45 | args : String[] | provenance |  |
 | Test.java:233:15:233:18 | args : String[] | Test.java:213:34:213:46 | args : String[] | provenance |  |
 models
-| 1 | Summary: java.lang; AbstractStringBuilder; true; append; ; ; Argument[0]; Argument[this]; taint; manual |
-| 2 | Summary: java.lang; CharSequence; true; toString; ; ; Argument[this]; ReturnValue; taint; manual |
-| 3 | Sink: java.sql; Connection; true; prepareCall; ; ; Argument[0]; sql-injection; manual |
-| 4 | Sink: java.sql; Connection; true; prepareStatement; ; ; Argument[0]; sql-injection; manual |
-| 5 | Sink: java.sql; Statement; true; executeLargeUpdate; ; ; Argument[0]; sql-injection; manual |
-| 6 | Sink: java.sql; Statement; true; executeQuery; ; ; Argument[0]; sql-injection; manual |
-| 7 | Sink: java.sql; Statement; true; executeUpdate; ; ; Argument[0]; sql-injection; manual |
+| 1 | Sink: java.sql; Connection; true; prepareCall; ; ; Argument[0]; sql-injection; manual |
+| 2 | Sink: java.sql; Connection; true; prepareStatement; ; ; Argument[0]; sql-injection; manual |
+| 3 | Sink: java.sql; Statement; true; executeLargeUpdate; ; ; Argument[0]; sql-injection; manual |
+| 4 | Sink: java.sql; Statement; true; executeQuery; ; ; Argument[0]; sql-injection; manual |
+| 5 | Sink: java.sql; Statement; true; executeUpdate; ; ; Argument[0]; sql-injection; manual |
+| 6 | Summary: java.lang; AbstractStringBuilder; true; append; ; ; Argument[0]; Argument[this]; taint; manual |
+| 7 | Summary: java.lang; CharSequence; true; toString; ; ; Argument[this]; ReturnValue; taint; manual |
 nodes
 | Mongo.java:10:29:10:41 | args : String[] | semmle.label | args : String[] |
 | Mongo.java:17:45:17:67 | parse(...) | semmle.label | parse(...) |
diff --git a/java/ql/test/query-tests/security/CWE-090/LdapInjection.expected b/java/ql/test/query-tests/security/CWE-090/LdapInjection.expected
index e3ab2f03070..d61bfd2cab8 100644
--- a/java/ql/test/query-tests/security/CWE-090/LdapInjection.expected
+++ b/java/ql/test/query-tests/security/CWE-090/LdapInjection.expected
@@ -59,70 +59,69 @@
 | LdapInjection.java:338:14:338:14 | s | LdapInjection.java:334:74:334:103 | aBadDNObj : String | LdapInjection.java:338:14:338:14 | s | This LDAP query depends on a $@. | LdapInjection.java:334:74:334:103 | aBadDNObj | user-provided value |
 | LdapInjection.java:346:14:346:24 | getBase(...) | LdapInjection.java:342:30:342:72 | aBadDNSearchRequestGet : String | LdapInjection.java:346:14:346:24 | getBase(...) | This LDAP query depends on a $@. | LdapInjection.java:342:30:342:72 | aBadDNSearchRequestGet | user-provided value |
 edges
-| LdapInjection.java:45:28:45:52 | jBad : String | LdapInjection.java:47:38:47:57 | ... + ... | provenance |  Sink:MaD:13 |
-| LdapInjection.java:45:55:45:81 | jBadDN : String | LdapInjection.java:47:16:47:35 | ... + ... | provenance |  Sink:MaD:13 |
-| LdapInjection.java:51:28:51:52 | jBad : String | LdapInjection.java:53:56:53:75 | ... + ... | provenance |  Sink:MaD:13 |
+| LdapInjection.java:45:28:45:52 | jBad : String | LdapInjection.java:47:38:47:57 | ... + ... | provenance | Sink:MaD:7 |
+| LdapInjection.java:45:55:45:81 | jBadDN : String | LdapInjection.java:47:16:47:35 | ... + ... | provenance | Sink:MaD:7 |
+| LdapInjection.java:51:28:51:52 | jBad : String | LdapInjection.java:53:56:53:75 | ... + ... | provenance | Sink:MaD:7 |
 | LdapInjection.java:51:55:51:85 | jBadDNName : String | LdapInjection.java:53:29:53:52 | ... + ... : String | provenance |  |
-| LdapInjection.java:53:29:53:52 | ... + ... : String | LdapInjection.java:53:16:53:53 | new LdapName(...) | provenance | Config Sink:MaD:13 |
-| LdapInjection.java:53:29:53:52 | ... + ... : String | LdapInjection.java:53:16:53:53 | new LdapName(...) | provenance | MaD:8 Sink:MaD:13 |
-| LdapInjection.java:57:28:57:52 | jBad : String | LdapInjection.java:59:63:59:82 | ... + ... | provenance |  Sink:MaD:13 |
-| LdapInjection.java:63:28:63:59 | jBadInitial : String | LdapInjection.java:65:29:65:55 | ... + ... | provenance |  Sink:MaD:13 |
-| LdapInjection.java:69:28:69:52 | jBad : String | LdapInjection.java:71:84:71:103 | ... + ... | provenance |  Sink:MaD:13 |
+| LdapInjection.java:53:29:53:52 | ... + ... : String | LdapInjection.java:53:16:53:53 | new LdapName(...) | provenance | Config Sink:MaD:7 |
+| LdapInjection.java:53:29:53:52 | ... + ... : String | LdapInjection.java:53:16:53:53 | new LdapName(...) | provenance | MaD:18 Sink:MaD:7 |
+| LdapInjection.java:57:28:57:52 | jBad : String | LdapInjection.java:59:63:59:82 | ... + ... | provenance | Sink:MaD:7 |
+| LdapInjection.java:63:28:63:59 | jBadInitial : String | LdapInjection.java:65:29:65:55 | ... + ... | provenance | Sink:MaD:7 |
+| LdapInjection.java:69:28:69:52 | jBad : String | LdapInjection.java:71:84:71:103 | ... + ... | provenance | Sink:MaD:7 |
 | LdapInjection.java:69:55:69:88 | jBadDNNameAdd : String | LdapInjection.java:71:53:71:79 | ... + ... : String | provenance |  |
-| LdapInjection.java:71:16:71:31 | new LdapName(...) : LdapName | LdapInjection.java:71:16:71:81 | addAll(...) | provenance | MaD:11 Sink:MaD:13 |
+| LdapInjection.java:71:16:71:31 | new LdapName(...) : LdapName | LdapInjection.java:71:16:71:81 | addAll(...) | provenance | MaD:19 Sink:MaD:7 |
 | LdapInjection.java:71:40:71:80 | new LdapName(...) : LdapName | LdapInjection.java:71:16:71:31 | new LdapName(...) : LdapName | provenance | Config |
-| LdapInjection.java:71:40:71:80 | new LdapName(...) : LdapName | LdapInjection.java:71:16:71:81 | addAll(...) | provenance | Config Sink:MaD:13 |
+| LdapInjection.java:71:40:71:80 | new LdapName(...) : LdapName | LdapInjection.java:71:16:71:81 | addAll(...) | provenance | Config Sink:MaD:7 |
 | LdapInjection.java:71:53:71:79 | ... + ... : String | LdapInjection.java:71:40:71:80 | new LdapName(...) : LdapName | provenance | Config |
-| LdapInjection.java:71:53:71:79 | ... + ... : String | LdapInjection.java:71:40:71:80 | new LdapName(...) : LdapName | provenance | MaD:8 |
-| LdapInjection.java:75:28:75:52 | jBad : String | LdapInjection.java:79:47:79:66 | ... + ... | provenance |  Sink:MaD:13 |
+| LdapInjection.java:71:53:71:79 | ... + ... : String | LdapInjection.java:71:40:71:80 | new LdapName(...) : LdapName | provenance | MaD:18 |
+| LdapInjection.java:75:28:75:52 | jBad : String | LdapInjection.java:79:47:79:66 | ... + ... | provenance | Sink:MaD:7 |
 | LdapInjection.java:75:55:75:89 | jBadDNNameAdd2 : String | LdapInjection.java:78:30:78:57 | ... + ... : String | provenance |  |
 | LdapInjection.java:78:5:78:8 | name : LdapName | LdapInjection.java:79:40:79:43 | name : LdapName | provenance |  |
-| LdapInjection.java:78:5:78:8 | name [post update] : LdapName | LdapInjection.java:79:40:79:43 | name : LdapName | provenance |  |
 | LdapInjection.java:78:17:78:58 | new LdapName(...) : LdapName | LdapInjection.java:78:17:78:68 | getRdns(...) : List | provenance | Config |
-| LdapInjection.java:78:17:78:58 | new LdapName(...) : LdapName | LdapInjection.java:78:17:78:68 | getRdns(...) : List | provenance | MaD:10 |
 | LdapInjection.java:78:17:78:68 | getRdns(...) : List | LdapInjection.java:78:5:78:8 | name : LdapName | provenance | Config |
-| LdapInjection.java:78:17:78:68 | getRdns(...) : List | LdapInjection.java:78:5:78:8 | name [post update] : LdapName | provenance | MaD:9 |
 | LdapInjection.java:78:30:78:57 | ... + ... : String | LdapInjection.java:78:17:78:58 | new LdapName(...) : LdapName | provenance | Config |
-| LdapInjection.java:78:30:78:57 | ... + ... : String | LdapInjection.java:78:17:78:58 | new LdapName(...) : LdapName | provenance | MaD:8 |
-| LdapInjection.java:79:16:79:31 | new LdapName(...) : LdapName | LdapInjection.java:79:16:79:44 | addAll(...) | provenance | MaD:11 Sink:MaD:13 |
+| LdapInjection.java:78:30:78:57 | ... + ... : String | LdapInjection.java:78:17:78:58 | new LdapName(...) : LdapName | provenance | MaD:18 |
+| LdapInjection.java:79:16:79:31 | new LdapName(...) : LdapName | LdapInjection.java:79:16:79:44 | addAll(...) | provenance | MaD:19 Sink:MaD:7 |
 | LdapInjection.java:79:40:79:43 | name : LdapName | LdapInjection.java:79:16:79:31 | new LdapName(...) : LdapName | provenance | Config |
-| LdapInjection.java:79:40:79:43 | name : LdapName | LdapInjection.java:79:16:79:44 | addAll(...) | provenance | Config Sink:MaD:13 |
-| LdapInjection.java:83:28:83:52 | jBad : String | LdapInjection.java:85:75:85:94 | ... + ... | provenance |  Sink:MaD:13 |
+| LdapInjection.java:79:40:79:43 | name : LdapName | LdapInjection.java:79:16:79:44 | addAll(...) | provenance | Config Sink:MaD:7 |
+| LdapInjection.java:83:28:83:52 | jBad : String | LdapInjection.java:85:75:85:94 | ... + ... | provenance | Sink:MaD:7 |
 | LdapInjection.java:83:55:83:93 | jBadDNNameToString : String | LdapInjection.java:85:29:85:60 | ... + ... : String | provenance |  |
-| LdapInjection.java:85:16:85:61 | new LdapName(...) : LdapName | LdapInjection.java:85:16:85:72 | toString(...) | provenance | Config Sink:MaD:13 |
+| LdapInjection.java:85:16:85:61 | new LdapName(...) : LdapName | LdapInjection.java:85:16:85:72 | toString(...) | provenance | Config Sink:MaD:7 |
 | LdapInjection.java:85:29:85:60 | ... + ... : String | LdapInjection.java:85:16:85:61 | new LdapName(...) : LdapName | provenance | Config |
-| LdapInjection.java:85:29:85:60 | ... + ... : String | LdapInjection.java:85:16:85:61 | new LdapName(...) : LdapName | provenance | MaD:8 |
-| LdapInjection.java:89:28:89:52 | jBad : String | LdapInjection.java:91:76:91:95 | ... + ... | provenance |  Sink:MaD:13 |
+| LdapInjection.java:85:29:85:60 | ... + ... : String | LdapInjection.java:85:16:85:61 | new LdapName(...) : LdapName | provenance | MaD:18 |
+| LdapInjection.java:89:28:89:52 | jBad : String | LdapInjection.java:91:76:91:95 | ... + ... | provenance | Sink:MaD:7 |
 | LdapInjection.java:89:55:89:90 | jBadDNNameClone : String | LdapInjection.java:91:36:91:64 | ... + ... : String | provenance |  |
-| LdapInjection.java:91:23:91:65 | new LdapName(...) : LdapName | LdapInjection.java:91:16:91:73 | (...)... | provenance | CloneStep Sink:MaD:13 |
+| LdapInjection.java:91:23:91:65 | new LdapName(...) : LdapName | LdapInjection.java:91:16:91:73 | (...)... | provenance | CloneStep Sink:MaD:7 |
 | LdapInjection.java:91:36:91:64 | ... + ... : String | LdapInjection.java:91:23:91:65 | new LdapName(...) : LdapName | provenance | Config |
-| LdapInjection.java:91:36:91:64 | ... + ... : String | LdapInjection.java:91:23:91:65 | new LdapName(...) : LdapName | provenance | MaD:8 |
+| LdapInjection.java:91:36:91:64 | ... + ... : String | LdapInjection.java:91:23:91:65 | new LdapName(...) : LdapName | provenance | MaD:18 |
 | LdapInjection.java:100:27:100:59 | jOkAttribute : String | LdapInjection.java:101:49:101:60 | jOkAttribute : String | provenance |  |
-| LdapInjection.java:101:49:101:60 | jOkAttribute : String | LdapInjection.java:101:29:101:75 | new BasicAttributes(...) | provenance | MaD:7 Sink:MaD:13 |
-| LdapInjection.java:106:31:106:55 | uBad : String | LdapInjection.java:108:67:108:86 | ... + ... | provenance |  Sink:MaD:5 |
-| LdapInjection.java:106:58:106:84 | uBadDN : String | LdapInjection.java:108:20:108:39 | ... + ... | provenance |  Sink:MaD:5 |
+| LdapInjection.java:100:27:100:59 | jOkAttribute : String | LdapInjection.java:101:63:101:74 | jOkAttribute : String | provenance |  |
+| LdapInjection.java:101:49:101:60 | jOkAttribute : String | LdapInjection.java:101:29:101:75 | new BasicAttributes(...) | provenance | MaD:17 Sink:MaD:7 |
+| LdapInjection.java:101:63:101:74 | jOkAttribute : String | LdapInjection.java:101:29:101:75 | new BasicAttributes(...) | provenance | MaD:17 Sink:MaD:7 |
+| LdapInjection.java:106:31:106:55 | uBad : String | LdapInjection.java:108:67:108:86 | ... + ... | provenance | Sink:MaD:5 |
+| LdapInjection.java:106:58:106:84 | uBadDN : String | LdapInjection.java:108:20:108:39 | ... + ... | provenance | Sink:MaD:5 |
 | LdapInjection.java:112:31:112:67 | uBadFilterCreate : String | LdapInjection.java:113:72:113:87 | uBadFilterCreate : String | provenance |  |
 | LdapInjection.java:113:72:113:87 | uBadFilterCreate : String | LdapInjection.java:113:58:113:88 | create(...) | provenance | Config Sink:MaD:4 |
 | LdapInjection.java:117:31:117:70 | uBadROSearchRequest : String | LdapInjection.java:120:9:120:43 | ... + ... : String | provenance |  |
 | LdapInjection.java:117:73:117:103 | uBadROSRDN : String | LdapInjection.java:119:55:119:78 | ... + ... : String | provenance |  |
-| LdapInjection.java:119:31:120:44 | new SearchRequest(...) : SearchRequest | LdapInjection.java:121:14:121:14 | s | provenance |  Sink:MaD:2 |
+| LdapInjection.java:119:31:120:44 | new SearchRequest(...) : SearchRequest | LdapInjection.java:121:14:121:14 | s | provenance | Sink:MaD:2 |
 | LdapInjection.java:119:55:119:78 | ... + ... : String | LdapInjection.java:119:31:120:44 | new SearchRequest(...) : SearchRequest | provenance | Config |
 | LdapInjection.java:120:9:120:43 | ... + ... : String | LdapInjection.java:119:31:120:44 | new SearchRequest(...) : SearchRequest | provenance | Config |
 | LdapInjection.java:125:31:125:68 | uBadSearchRequest : String | LdapInjection.java:128:9:128:41 | ... + ... : String | provenance |  |
 | LdapInjection.java:125:71:125:99 | uBadSRDN : String | LdapInjection.java:127:47:127:68 | ... + ... : String | provenance |  |
-| LdapInjection.java:127:23:128:42 | new SearchRequest(...) : SearchRequest | LdapInjection.java:129:14:129:14 | s | provenance |  Sink:MaD:3 |
+| LdapInjection.java:127:23:128:42 | new SearchRequest(...) : SearchRequest | LdapInjection.java:129:14:129:14 | s | provenance | Sink:MaD:3 |
 | LdapInjection.java:127:47:127:68 | ... + ... : String | LdapInjection.java:127:23:128:42 | new SearchRequest(...) : SearchRequest | provenance | Config |
 | LdapInjection.java:128:9:128:41 | ... + ... : String | LdapInjection.java:127:23:128:42 | new SearchRequest(...) : SearchRequest | provenance | Config |
-| LdapInjection.java:133:31:133:55 | uBad : String | LdapInjection.java:135:69:135:88 | ... + ... | provenance |  Sink:MaD:6 |
-| LdapInjection.java:133:58:133:87 | uBadDNSFR : String | LdapInjection.java:135:22:135:44 | ... + ... | provenance |  Sink:MaD:6 |
+| LdapInjection.java:133:31:133:55 | uBad : String | LdapInjection.java:135:69:135:88 | ... + ... | provenance | Sink:MaD:6 |
+| LdapInjection.java:133:58:133:87 | uBadDNSFR : String | LdapInjection.java:135:22:135:44 | ... + ... | provenance | Sink:MaD:6 |
 | LdapInjection.java:139:31:139:75 | uBadROSearchRequestAsync : String | LdapInjection.java:142:9:142:48 | ... + ... : String | provenance |  |
 | LdapInjection.java:139:78:139:113 | uBadROSRDNAsync : String | LdapInjection.java:141:55:141:83 | ... + ... : String | provenance |  |
-| LdapInjection.java:141:31:142:49 | new SearchRequest(...) : SearchRequest | LdapInjection.java:143:19:143:19 | s | provenance |  Sink:MaD:1 |
+| LdapInjection.java:141:31:142:49 | new SearchRequest(...) : SearchRequest | LdapInjection.java:143:19:143:19 | s | provenance | Sink:MaD:1 |
 | LdapInjection.java:141:55:141:83 | ... + ... : String | LdapInjection.java:141:31:142:49 | new SearchRequest(...) : SearchRequest | provenance | Config |
 | LdapInjection.java:142:9:142:48 | ... + ... : String | LdapInjection.java:141:31:142:49 | new SearchRequest(...) : SearchRequest | provenance | Config |
 | LdapInjection.java:147:31:147:73 | uBadSearchRequestAsync : String | LdapInjection.java:150:9:150:46 | ... + ... : String | provenance |  |
 | LdapInjection.java:147:76:147:109 | uBadSRDNAsync : String | LdapInjection.java:149:47:149:73 | ... + ... : String | provenance |  |
-| LdapInjection.java:149:23:150:47 | new SearchRequest(...) : SearchRequest | LdapInjection.java:151:19:151:19 | s | provenance |  Sink:MaD:1 |
+| LdapInjection.java:149:23:150:47 | new SearchRequest(...) : SearchRequest | LdapInjection.java:151:19:151:19 | s | provenance | Sink:MaD:1 |
 | LdapInjection.java:149:47:149:73 | ... + ... : String | LdapInjection.java:149:23:150:47 | new SearchRequest(...) : SearchRequest | provenance | Config |
 | LdapInjection.java:150:9:150:46 | ... + ... : String | LdapInjection.java:149:23:150:47 | new SearchRequest(...) : SearchRequest | provenance | Config |
 | LdapInjection.java:155:31:155:70 | uBadFilterCreateNOT : String | LdapInjection.java:156:95:156:113 | uBadFilterCreateNOT : String | provenance |  |
@@ -135,7 +134,7 @@ edges
 | LdapInjection.java:167:5:167:49 | create(...) : Filter | LdapInjection.java:167:70:167:70 | b : StringBuilder | provenance | Config |
 | LdapInjection.java:167:19:167:48 | uBadFilterCreateToStringBuffer : String | LdapInjection.java:167:5:167:49 | create(...) : Filter | provenance | Config |
 | LdapInjection.java:167:70:167:70 | b : StringBuilder | LdapInjection.java:168:58:168:58 | b : StringBuilder | provenance |  |
-| LdapInjection.java:168:58:168:58 | b : StringBuilder | LdapInjection.java:168:58:168:69 | toString(...) | provenance | MaD:12 Sink:MaD:5 |
+| LdapInjection.java:168:58:168:58 | b : StringBuilder | LdapInjection.java:168:58:168:69 | toString(...) | provenance | MaD:16 Sink:MaD:5 |
 | LdapInjection.java:172:32:172:78 | uBadSearchRequestDuplicate : String | LdapInjection.java:175:9:175:50 | ... + ... : String | provenance |  |
 | LdapInjection.java:174:23:175:51 | new SearchRequest(...) : SearchRequest | LdapInjection.java:176:14:176:14 | s : SearchRequest | provenance |  |
 | LdapInjection.java:175:9:175:50 | ... + ... : String | LdapInjection.java:174:23:175:51 | new SearchRequest(...) : SearchRequest | provenance | Config |
@@ -145,73 +144,73 @@ edges
 | LdapInjection.java:183:9:183:52 | ... + ... : String | LdapInjection.java:182:31:183:53 | new SearchRequest(...) : SearchRequest | provenance | Config |
 | LdapInjection.java:184:14:184:14 | s : SearchRequest | LdapInjection.java:184:14:184:26 | duplicate(...) | provenance | Config Sink:MaD:3 |
 | LdapInjection.java:188:32:188:74 | uBadSearchRequestSetDN : String | LdapInjection.java:191:17:191:38 | uBadSearchRequestSetDN : String | provenance |  |
-| LdapInjection.java:191:5:191:5 | s : SearchRequest | LdapInjection.java:192:14:192:14 | s | provenance |  Sink:MaD:3 |
+| LdapInjection.java:191:5:191:5 | s : SearchRequest | LdapInjection.java:192:14:192:14 | s | provenance | Sink:MaD:3 |
 | LdapInjection.java:191:17:191:38 | uBadSearchRequestSetDN : String | LdapInjection.java:191:5:191:5 | s : SearchRequest | provenance | Config |
 | LdapInjection.java:196:32:196:78 | uBadSearchRequestSetFilter : String | LdapInjection.java:199:17:199:42 | uBadSearchRequestSetFilter : String | provenance |  |
-| LdapInjection.java:199:5:199:5 | s : SearchRequest | LdapInjection.java:200:14:200:14 | s | provenance |  Sink:MaD:3 |
+| LdapInjection.java:199:5:199:5 | s : SearchRequest | LdapInjection.java:200:14:200:14 | s | provenance | Sink:MaD:3 |
 | LdapInjection.java:199:17:199:42 | uBadSearchRequestSetFilter : String | LdapInjection.java:199:5:199:5 | s : SearchRequest | provenance | Config |
-| LdapInjection.java:229:30:229:54 | sBad : String | LdapInjection.java:230:36:230:55 | ... + ... | provenance |  Sink:MaD:19 |
-| LdapInjection.java:229:57:229:83 | sBadDN : String | LdapInjection.java:230:14:230:33 | ... + ... | provenance |  Sink:MaD:19 |
-| LdapInjection.java:234:30:234:54 | sBad : String | LdapInjection.java:235:88:235:107 | ... + ... | provenance |  Sink:MaD:16 |
+| LdapInjection.java:229:30:229:54 | sBad : String | LdapInjection.java:230:36:230:55 | ... + ... | provenance | Sink:MaD:13 |
+| LdapInjection.java:229:57:229:83 | sBadDN : String | LdapInjection.java:230:14:230:33 | ... + ... | provenance | Sink:MaD:13 |
+| LdapInjection.java:234:30:234:54 | sBad : String | LdapInjection.java:235:88:235:107 | ... + ... | provenance | Sink:MaD:10 |
 | LdapInjection.java:234:57:234:92 | sBadDNLNBuilder : String | LdapInjection.java:235:48:235:76 | ... + ... : String | provenance |  |
-| LdapInjection.java:235:20:235:77 | newInstance(...) : LdapNameBuilder | LdapInjection.java:235:20:235:85 | build(...) | provenance | Config Sink:MaD:16 |
+| LdapInjection.java:235:20:235:77 | newInstance(...) : LdapNameBuilder | LdapInjection.java:235:20:235:85 | build(...) | provenance | Config Sink:MaD:10 |
 | LdapInjection.java:235:48:235:76 | ... + ... : String | LdapInjection.java:235:20:235:77 | newInstance(...) : LdapNameBuilder | provenance | Config |
-| LdapInjection.java:239:30:239:54 | sBad : String | LdapInjection.java:240:100:240:119 | ... + ... | provenance |  Sink:MaD:21 |
+| LdapInjection.java:239:30:239:54 | sBad : String | LdapInjection.java:240:100:240:119 | ... + ... | provenance | Sink:MaD:15 |
 | LdapInjection.java:239:57:239:95 | sBadDNLNBuilderAdd : String | LdapInjection.java:240:57:240:88 | ... + ... : String | provenance |  |
+| LdapInjection.java:240:23:240:89 | add(...) : LdapNameBuilder | LdapInjection.java:240:23:240:97 | build(...) | provenance | Config Sink:MaD:9 |
 | LdapInjection.java:240:23:240:89 | add(...) : LdapNameBuilder | LdapInjection.java:240:23:240:97 | build(...) | provenance | Config Sink:MaD:15 |
-| LdapInjection.java:240:23:240:89 | add(...) : LdapNameBuilder | LdapInjection.java:240:23:240:97 | build(...) | provenance | Config Sink:MaD:21 |
 | LdapInjection.java:240:57:240:88 | ... + ... : String | LdapInjection.java:240:23:240:89 | add(...) : LdapNameBuilder | provenance | Config |
 | LdapInjection.java:244:30:244:63 | sBadLdapQuery : String | LdapInjection.java:245:47:245:75 | ... + ... : String | provenance |  |
-| LdapInjection.java:245:47:245:75 | ... + ... : String | LdapInjection.java:245:15:245:76 | filter(...) | provenance | Config Sink:MaD:18 |
+| LdapInjection.java:245:47:245:75 | ... + ... : String | LdapInjection.java:245:15:245:76 | filter(...) | provenance | Config Sink:MaD:12 |
 | LdapInjection.java:249:30:249:60 | sBadFilter : String | LdapInjection.java:250:86:250:111 | ... + ... : String | provenance |  |
 | LdapInjection.java:249:63:249:98 | sBadDNLdapUtils : String | LdapInjection.java:250:34:250:62 | ... + ... : String | provenance |  |
-| LdapInjection.java:250:34:250:62 | ... + ... : String | LdapInjection.java:250:12:250:63 | newLdapName(...) | provenance | Config Sink:MaD:17 |
-| LdapInjection.java:250:86:250:111 | ... + ... : String | LdapInjection.java:250:66:250:112 | new HardcodedFilter(...) | provenance | Config Sink:MaD:17 |
+| LdapInjection.java:250:34:250:62 | ... + ... : String | LdapInjection.java:250:12:250:63 | newLdapName(...) | provenance | Config Sink:MaD:11 |
+| LdapInjection.java:250:86:250:111 | ... + ... : String | LdapInjection.java:250:66:250:112 | new HardcodedFilter(...) | provenance | Config Sink:MaD:11 |
 | LdapInjection.java:254:30:254:63 | sBadLdapQuery : String | LdapInjection.java:255:56:255:84 | ... + ... : String | provenance |  |
-| LdapInjection.java:255:56:255:84 | ... + ... : String | LdapInjection.java:255:24:255:85 | filter(...) | provenance | Config Sink:MaD:20 |
+| LdapInjection.java:255:56:255:84 | ... + ... : String | LdapInjection.java:255:24:255:85 | filter(...) | provenance | Config Sink:MaD:14 |
 | LdapInjection.java:259:30:259:64 | sBadLdapQuery2 : String | LdapInjection.java:260:51:260:80 | ... + ... : String | provenance |  |
-| LdapInjection.java:260:19:260:81 | filter(...) : LdapQuery | LdapInjection.java:261:24:261:24 | q | provenance |  Sink:MaD:20 |
+| LdapInjection.java:260:19:260:81 | filter(...) : LdapQuery | LdapInjection.java:261:24:261:24 | q | provenance | Sink:MaD:14 |
 | LdapInjection.java:260:51:260:80 | ... + ... : String | LdapInjection.java:260:19:260:81 | filter(...) : LdapQuery | provenance | Config |
 | LdapInjection.java:265:30:265:73 | sBadLdapQueryWithFilter : String | LdapInjection.java:266:76:266:114 | ... + ... : String | provenance |  |
-| LdapInjection.java:266:56:266:115 | new HardcodedFilter(...) : HardcodedFilter | LdapInjection.java:266:24:266:116 | filter(...) | provenance | Config Sink:MaD:20 |
+| LdapInjection.java:266:56:266:115 | new HardcodedFilter(...) : HardcodedFilter | LdapInjection.java:266:24:266:116 | filter(...) | provenance | Config Sink:MaD:14 |
 | LdapInjection.java:266:76:266:114 | ... + ... : String | LdapInjection.java:266:56:266:115 | new HardcodedFilter(...) : HardcodedFilter | provenance | Config |
 | LdapInjection.java:270:30:270:74 | sBadLdapQueryWithFilter2 : String | LdapInjection.java:271:68:271:107 | ... + ... : String | provenance |  |
 | LdapInjection.java:271:48:271:108 | new HardcodedFilter(...) : HardcodedFilter | LdapInjection.java:272:56:272:56 | f : HardcodedFilter | provenance |  |
 | LdapInjection.java:271:68:271:107 | ... + ... : String | LdapInjection.java:271:48:271:108 | new HardcodedFilter(...) : HardcodedFilter | provenance | Config |
-| LdapInjection.java:272:56:272:56 | f : HardcodedFilter | LdapInjection.java:272:24:272:57 | filter(...) | provenance | Config Sink:MaD:20 |
+| LdapInjection.java:272:56:272:56 | f : HardcodedFilter | LdapInjection.java:272:24:272:57 | filter(...) | provenance | Config Sink:MaD:14 |
 | LdapInjection.java:276:31:276:68 | sBadLdapQueryBase : String | LdapInjection.java:277:42:277:58 | sBadLdapQueryBase : String | provenance |  |
-| LdapInjection.java:277:12:277:59 | base(...) : LdapQueryBuilder | LdapInjection.java:277:12:277:66 | base(...) | provenance | Config Sink:MaD:17 |
+| LdapInjection.java:277:12:277:59 | base(...) : LdapQueryBuilder | LdapInjection.java:277:12:277:66 | base(...) | provenance | Config Sink:MaD:11 |
 | LdapInjection.java:277:42:277:58 | sBadLdapQueryBase : String | LdapInjection.java:277:12:277:59 | base(...) : LdapQueryBuilder | provenance | Config |
 | LdapInjection.java:281:31:281:71 | sBadLdapQueryComplex : String | LdapInjection.java:282:54:282:73 | sBadLdapQueryComplex : String | provenance |  |
 | LdapInjection.java:282:24:282:74 | base(...) : LdapQueryBuilder | LdapInjection.java:282:24:282:87 | where(...) : ConditionCriteria | provenance | Config |
-| LdapInjection.java:282:24:282:87 | where(...) : ConditionCriteria | LdapInjection.java:282:24:282:98 | is(...) | provenance | Config Sink:MaD:20 |
+| LdapInjection.java:282:24:282:87 | where(...) : ConditionCriteria | LdapInjection.java:282:24:282:98 | is(...) | provenance | Config Sink:MaD:14 |
 | LdapInjection.java:282:54:282:73 | sBadLdapQueryComplex : String | LdapInjection.java:282:24:282:74 | base(...) : LdapQueryBuilder | provenance | Config |
 | LdapInjection.java:286:31:286:69 | sBadFilterToString : String | LdapInjection.java:287:38:287:71 | ... + ... : String | provenance |  |
-| LdapInjection.java:287:18:287:72 | new HardcodedFilter(...) : HardcodedFilter | LdapInjection.java:287:18:287:83 | toString(...) | provenance | Config Sink:MaD:19 |
+| LdapInjection.java:287:18:287:72 | new HardcodedFilter(...) : HardcodedFilter | LdapInjection.java:287:18:287:83 | toString(...) | provenance | Config Sink:MaD:13 |
 | LdapInjection.java:287:38:287:71 | ... + ... : String | LdapInjection.java:287:18:287:72 | new HardcodedFilter(...) : HardcodedFilter | provenance | Config |
 | LdapInjection.java:291:31:291:67 | sBadFilterEncode : String | LdapInjection.java:293:25:293:56 | ... + ... : String | provenance |  |
 | LdapInjection.java:293:5:293:57 | new HardcodedFilter(...) : HardcodedFilter | LdapInjection.java:293:66:293:66 | s : StringBuffer | provenance | Config |
 | LdapInjection.java:293:25:293:56 | ... + ... : String | LdapInjection.java:293:5:293:57 | new HardcodedFilter(...) : HardcodedFilter | provenance | Config |
 | LdapInjection.java:293:66:293:66 | s : StringBuffer | LdapInjection.java:294:18:294:18 | s : StringBuffer | provenance |  |
-| LdapInjection.java:294:18:294:18 | s : StringBuffer | LdapInjection.java:294:18:294:29 | toString(...) | provenance | MaD:12 Sink:MaD:19 |
-| LdapInjection.java:314:30:314:54 | aBad : String | LdapInjection.java:316:36:316:55 | ... + ... | provenance |  Sink:MaD:14 |
-| LdapInjection.java:314:57:314:83 | aBadDN : String | LdapInjection.java:316:14:316:33 | ... + ... | provenance |  Sink:MaD:14 |
-| LdapInjection.java:320:30:320:54 | aBad : String | LdapInjection.java:322:65:322:84 | ... + ... | provenance |  Sink:MaD:14 |
+| LdapInjection.java:294:18:294:18 | s : StringBuffer | LdapInjection.java:294:18:294:29 | toString(...) | provenance | MaD:16 Sink:MaD:13 |
+| LdapInjection.java:314:30:314:54 | aBad : String | LdapInjection.java:316:36:316:55 | ... + ... | provenance | Sink:MaD:8 |
+| LdapInjection.java:314:57:314:83 | aBadDN : String | LdapInjection.java:316:14:316:33 | ... + ... | provenance | Sink:MaD:8 |
+| LdapInjection.java:320:30:320:54 | aBad : String | LdapInjection.java:322:65:322:84 | ... + ... | provenance | Sink:MaD:8 |
 | LdapInjection.java:320:57:320:94 | aBadDNObjToString : String | LdapInjection.java:322:21:322:51 | ... + ... : String | provenance |  |
-| LdapInjection.java:322:14:322:52 | new Dn(...) : Dn | LdapInjection.java:322:14:322:62 | getName(...) | provenance | Config Sink:MaD:14 |
+| LdapInjection.java:322:14:322:52 | new Dn(...) : Dn | LdapInjection.java:322:14:322:62 | getName(...) | provenance | Config Sink:MaD:8 |
 | LdapInjection.java:322:21:322:51 | ... + ... : String | LdapInjection.java:322:14:322:52 | new Dn(...) : Dn | provenance | Config |
 | LdapInjection.java:326:30:326:67 | aBadSearchRequest : String | LdapInjection.java:329:17:329:49 | ... + ... : String | provenance |  |
-| LdapInjection.java:329:5:329:5 | s : SearchRequestImpl | LdapInjection.java:330:14:330:14 | s | provenance |  Sink:MaD:14 |
+| LdapInjection.java:329:5:329:5 | s : SearchRequestImpl | LdapInjection.java:330:14:330:14 | s | provenance | Sink:MaD:8 |
 | LdapInjection.java:329:17:329:49 | ... + ... : String | LdapInjection.java:329:5:329:5 | s : SearchRequestImpl | provenance | Config |
 | LdapInjection.java:334:74:334:103 | aBadDNObj : String | LdapInjection.java:337:22:337:44 | ... + ... : String | provenance |  |
-| LdapInjection.java:337:5:337:5 | s : SearchRequestImpl | LdapInjection.java:338:14:338:14 | s | provenance |  Sink:MaD:14 |
+| LdapInjection.java:337:5:337:5 | s : SearchRequestImpl | LdapInjection.java:338:14:338:14 | s | provenance | Sink:MaD:8 |
 | LdapInjection.java:337:15:337:45 | new Dn(...) : Dn | LdapInjection.java:337:5:337:5 | s : SearchRequestImpl | provenance | Config |
 | LdapInjection.java:337:22:337:44 | ... + ... : String | LdapInjection.java:337:15:337:45 | new Dn(...) : Dn | provenance | Config |
 | LdapInjection.java:342:30:342:72 | aBadDNSearchRequestGet : String | LdapInjection.java:345:22:345:57 | ... + ... : String | provenance |  |
 | LdapInjection.java:345:5:345:5 | s : SearchRequestImpl | LdapInjection.java:346:14:346:14 | s : SearchRequestImpl | provenance |  |
 | LdapInjection.java:345:15:345:58 | new Dn(...) : Dn | LdapInjection.java:345:5:345:5 | s : SearchRequestImpl | provenance | Config |
 | LdapInjection.java:345:22:345:57 | ... + ... : String | LdapInjection.java:345:15:345:58 | new Dn(...) : Dn | provenance | Config |
-| LdapInjection.java:346:14:346:14 | s : SearchRequestImpl | LdapInjection.java:346:14:346:24 | getBase(...) | provenance | Config Sink:MaD:14 |
+| LdapInjection.java:346:14:346:14 | s : SearchRequestImpl | LdapInjection.java:346:14:346:24 | getBase(...) | provenance | Config Sink:MaD:8 |
 models
 | 1 | Sink: com.unboundid.ldap.sdk; LDAPConnection; false; asyncSearch; ; ; Argument[0]; ldap-injection; manual |
 | 2 | Sink: com.unboundid.ldap.sdk; LDAPConnection; false; search; (ReadOnlySearchRequest); ; Argument[0]; ldap-injection; manual |
@@ -219,21 +218,19 @@ models
 | 4 | Sink: com.unboundid.ldap.sdk; LDAPConnection; false; search; (SearchResultListener,String,SearchScope,DereferencePolicy,int,int,boolean,Filter,String[]); ; Argument[0..7]; ldap-injection; manual |
 | 5 | Sink: com.unboundid.ldap.sdk; LDAPConnection; false; search; (SearchResultListener,String,SearchScope,DereferencePolicy,int,int,boolean,String,String[]); ; Argument[0..7]; ldap-injection; manual |
 | 6 | Sink: com.unboundid.ldap.sdk; LDAPConnection; false; searchForEntry; (String,SearchScope,DereferencePolicy,int,boolean,String,String[]); ; Argument[0..5]; ldap-injection; manual |
-| 7 | Summary: javax.naming.directory; BasicAttributes; true; BasicAttributes; (String,Object); ; Argument[0]; Argument[this]; taint; df-generated |
-| 8 | Summary: javax.naming.ldap; LdapName; true; LdapName; (String); ; Argument[0]; Argument[this]; taint; df-generated |
-| 9 | Summary: javax.naming.ldap; LdapName; true; addAll; (List); ; Argument[0].Element; Argument[this]; taint; df-generated |
-| 10 | Summary: javax.naming.ldap; LdapName; true; getRdns; (); ; Argument[this]; ReturnValue; taint; df-generated |
-| 11 | Summary: javax.naming; Name; true; addAll; (Name); ; Argument[this]; ReturnValue; value; df-generated |
-| 12 | Summary: java.lang; CharSequence; true; toString; ; ; Argument[this]; ReturnValue; taint; manual |
-| 13 | Sink: javax.naming.directory; DirContext; true; search; ; ; Argument[0..1]; ldap-injection; manual |
-| 14 | Sink: org.apache.directory.ldap.client.api; LdapConnection; true; search; ; ; Argument[0..2]; ldap-injection; manual |
-| 15 | Sink: org.springframework.ldap.core; LdapOperations; true; searchForObject; (Name,String,ContextMapper); ; Argument[0]; jndi-injection; manual |
-| 16 | Sink: org.springframework.ldap.core; LdapTemplate; false; authenticate; (Name,String,String); ; Argument[0..1]; ldap-injection; manual |
-| 17 | Sink: org.springframework.ldap.core; LdapTemplate; false; find; ; ; Argument[0..1]; ldap-injection; manual |
-| 18 | Sink: org.springframework.ldap.core; LdapTemplate; false; findOne; ; ; Argument[0..1]; ldap-injection; manual |
-| 19 | Sink: org.springframework.ldap.core; LdapTemplate; false; search; ; ; Argument[0..1]; ldap-injection; manual |
-| 20 | Sink: org.springframework.ldap.core; LdapTemplate; false; searchForContext; ; ; Argument[0..1]; ldap-injection; manual |
-| 21 | Sink: org.springframework.ldap.core; LdapTemplate; false; searchForObject; ; ; Argument[0..1]; ldap-injection; manual |
+| 7 | Sink: javax.naming.directory; DirContext; true; search; ; ; Argument[0..1]; ldap-injection; manual |
+| 8 | Sink: org.apache.directory.ldap.client.api; LdapConnection; true; search; ; ; Argument[0..2]; ldap-injection; manual |
+| 9 | Sink: org.springframework.ldap.core; LdapOperations; true; searchForObject; (Name,String,ContextMapper); ; Argument[0]; jndi-injection; manual |
+| 10 | Sink: org.springframework.ldap.core; LdapTemplate; false; authenticate; (Name,String,String); ; Argument[0..1]; ldap-injection; manual |
+| 11 | Sink: org.springframework.ldap.core; LdapTemplate; false; find; ; ; Argument[0..1]; ldap-injection; manual |
+| 12 | Sink: org.springframework.ldap.core; LdapTemplate; false; findOne; ; ; Argument[0..1]; ldap-injection; manual |
+| 13 | Sink: org.springframework.ldap.core; LdapTemplate; false; search; ; ; Argument[0..1]; ldap-injection; manual |
+| 14 | Sink: org.springframework.ldap.core; LdapTemplate; false; searchForContext; ; ; Argument[0..1]; ldap-injection; manual |
+| 15 | Sink: org.springframework.ldap.core; LdapTemplate; false; searchForObject; ; ; Argument[0..1]; ldap-injection; manual |
+| 16 | Summary: java.lang; CharSequence; true; toString; ; ; Argument[this]; ReturnValue; taint; manual |
+| 17 | Summary: javax.naming.directory; BasicAttributes; true; BasicAttributes; (String,Object); ; Argument[0..1]; Argument[this]; taint; manual |
+| 18 | Summary: javax.naming.ldap; LdapName; true; LdapName; (String); ; Argument[0]; Argument[this]; taint; df-generated |
+| 19 | Summary: javax.naming; Name; true; addAll; (Name); ; Argument[this]; ReturnValue; value; dfc-generated |
 nodes
 | LdapInjection.java:45:28:45:52 | jBad : String | semmle.label | jBad : String |
 | LdapInjection.java:45:55:45:81 | jBadDN : String | semmle.label | jBadDN : String |
@@ -258,7 +255,6 @@ nodes
 | LdapInjection.java:75:28:75:52 | jBad : String | semmle.label | jBad : String |
 | LdapInjection.java:75:55:75:89 | jBadDNNameAdd2 : String | semmle.label | jBadDNNameAdd2 : String |
 | LdapInjection.java:78:5:78:8 | name : LdapName | semmle.label | name : LdapName |
-| LdapInjection.java:78:5:78:8 | name [post update] : LdapName | semmle.label | name [post update] : LdapName |
 | LdapInjection.java:78:17:78:58 | new LdapName(...) : LdapName | semmle.label | new LdapName(...) : LdapName |
 | LdapInjection.java:78:17:78:68 | getRdns(...) : List | semmle.label | getRdns(...) : List |
 | LdapInjection.java:78:30:78:57 | ... + ... : String | semmle.label | ... + ... : String |
@@ -281,6 +277,7 @@ nodes
 | LdapInjection.java:100:27:100:59 | jOkAttribute : String | semmle.label | jOkAttribute : String |
 | LdapInjection.java:101:29:101:75 | new BasicAttributes(...) | semmle.label | new BasicAttributes(...) |
 | LdapInjection.java:101:49:101:60 | jOkAttribute : String | semmle.label | jOkAttribute : String |
+| LdapInjection.java:101:63:101:74 | jOkAttribute : String | semmle.label | jOkAttribute : String |
 | LdapInjection.java:106:31:106:55 | uBad : String | semmle.label | uBad : String |
 | LdapInjection.java:106:58:106:84 | uBadDN : String | semmle.label | uBadDN : String |
 | LdapInjection.java:108:20:108:39 | ... + ... | semmle.label | ... + ... |
diff --git a/java/ql/test/query-tests/security/CWE-094/InsecureBeanValidation.expected b/java/ql/test/query-tests/security/CWE-094/InsecureBeanValidation.expected
index 54754232ff1..5ff6b0a7d3d 100644
--- a/java/ql/test/query-tests/security/CWE-094/InsecureBeanValidation.expected
+++ b/java/ql/test/query-tests/security/CWE-094/InsecureBeanValidation.expected
@@ -1,10 +1,10 @@
 #select
 | InsecureBeanValidation.java:11:64:11:68 | value | InsecureBeanValidation.java:7:28:7:40 | object : String | InsecureBeanValidation.java:11:64:11:68 | value | Custom constraint error message contains an unsanitized $@. | InsecureBeanValidation.java:7:28:7:40 | object : String | user-provided value |
 edges
-| InsecureBeanValidation.java:7:28:7:40 | object : String | InsecureBeanValidation.java:11:64:11:68 | value | provenance | Src:MaD:1  Sink:MaD:2 |
+| InsecureBeanValidation.java:7:28:7:40 | object : String | InsecureBeanValidation.java:11:64:11:68 | value | provenance | Src:MaD:2 Sink:MaD:1 |
 models
-| 1 | Source: javax.validation; ConstraintValidator; true; isValid; ; ; Parameter[0]; remote; manual |
-| 2 | Sink: javax.validation; ConstraintValidatorContext; true; buildConstraintViolationWithTemplate; ; ; Argument[0]; bean-validation; manual |
+| 1 | Sink: javax.validation; ConstraintValidatorContext; true; buildConstraintViolationWithTemplate; ; ; Argument[0]; bean-validation; manual |
+| 2 | Source: javax.validation; ConstraintValidator; true; isValid; ; ; Parameter[0]; remote; manual |
 nodes
 | InsecureBeanValidation.java:7:28:7:40 | object : String | semmle.label | object : String |
 | InsecureBeanValidation.java:11:64:11:68 | value | semmle.label | value |
diff --git a/java/ql/test/query-tests/security/CWE-113/semmle/tests/ResponseSplitting.expected b/java/ql/test/query-tests/security/CWE-113/semmle/tests/ResponseSplitting.expected
index f0546ef5938..ed597e70eb5 100644
--- a/java/ql/test/query-tests/security/CWE-113/semmle/tests/ResponseSplitting.expected
+++ b/java/ql/test/query-tests/security/CWE-113/semmle/tests/ResponseSplitting.expected
@@ -4,16 +4,16 @@
 | ResponseSplitting.java:29:38:29:72 | getParameter(...) | ResponseSplitting.java:29:38:29:72 | getParameter(...) | ResponseSplitting.java:29:38:29:72 | getParameter(...) | This header depends on a $@, which may cause a response-splitting vulnerability. | ResponseSplitting.java:29:38:29:72 | getParameter(...) | user-provided value |
 | ResponseSplitting.java:59:27:59:57 | replaceFirst(...) | ResponseSplitting.java:53:14:53:48 | getParameter(...) : String | ResponseSplitting.java:59:27:59:57 | replaceFirst(...) | This header depends on a $@, which may cause a response-splitting vulnerability. | ResponseSplitting.java:53:14:53:48 | getParameter(...) | user-provided value |
 edges
-| ResponseSplitting.java:22:20:22:67 | new Cookie(...) : Cookie | ResponseSplitting.java:23:23:23:28 | cookie | provenance |  Sink:MaD:2 |
-| ResponseSplitting.java:22:39:22:66 | getParameter(...) : String | ResponseSplitting.java:22:20:22:67 | new Cookie(...) : Cookie | provenance | Src:MaD:5 MaD:4 |
-| ResponseSplitting.java:53:14:53:48 | getParameter(...) : String | ResponseSplitting.java:59:27:59:27 | t : String | provenance | Src:MaD:5  |
-| ResponseSplitting.java:59:27:59:27 | t : String | ResponseSplitting.java:59:27:59:57 | replaceFirst(...) | provenance | MaD:1 Sink:MaD:3 |
+| ResponseSplitting.java:22:20:22:67 | new Cookie(...) : Cookie | ResponseSplitting.java:23:23:23:28 | cookie | provenance | Sink:MaD:1 |
+| ResponseSplitting.java:22:39:22:66 | getParameter(...) : String | ResponseSplitting.java:22:20:22:67 | new Cookie(...) : Cookie | provenance | Src:MaD:3 MaD:5 |
+| ResponseSplitting.java:53:14:53:48 | getParameter(...) : String | ResponseSplitting.java:59:27:59:27 | t : String | provenance | Src:MaD:3  |
+| ResponseSplitting.java:59:27:59:27 | t : String | ResponseSplitting.java:59:27:59:57 | replaceFirst(...) | provenance | MaD:4 Sink:MaD:2 |
 models
-| 1 | Summary: java.lang; String; false; replaceFirst; ; ; Argument[this]; ReturnValue; taint; manual |
-| 2 | Sink: javax.servlet.http; HttpServletResponse; false; addCookie; ; ; Argument[0]; response-splitting; manual |
-| 3 | Sink: javax.servlet.http; HttpServletResponse; false; setHeader; ; ; Argument[0..1]; response-splitting; manual |
-| 4 | Summary: javax.servlet.http; Cookie; false; Cookie; ; ; Argument[1]; Argument[this]; taint; manual |
-| 5 | Source: javax.servlet; ServletRequest; false; getParameter; (String); ; ReturnValue; remote; manual |
+| 1 | Sink: javax.servlet.http; HttpServletResponse; false; addCookie; ; ; Argument[0]; response-splitting; manual |
+| 2 | Sink: javax.servlet.http; HttpServletResponse; false; setHeader; ; ; Argument[0..1]; response-splitting; manual |
+| 3 | Source: javax.servlet; ServletRequest; false; getParameter; (String); ; ReturnValue; remote; manual |
+| 4 | Summary: java.lang; String; false; replaceFirst; ; ; Argument[this]; ReturnValue; taint; manual |
+| 5 | Summary: javax.servlet.http; Cookie; false; Cookie; ; ; Argument[1]; Argument[this]; taint; manual |
 nodes
 | ResponseSplitting.java:22:20:22:67 | new Cookie(...) : Cookie | semmle.label | new Cookie(...) : Cookie |
 | ResponseSplitting.java:22:39:22:66 | getParameter(...) : String | semmle.label | getParameter(...) : String |
diff --git a/java/ql/test/query-tests/security/CWE-134/semmle/tests/ExternallyControlledFormatString.expected b/java/ql/test/query-tests/security/CWE-134/semmle/tests/ExternallyControlledFormatString.expected
index f3decc7538c..f7b270e9275 100644
--- a/java/ql/test/query-tests/security/CWE-134/semmle/tests/ExternallyControlledFormatString.expected
+++ b/java/ql/test/query-tests/security/CWE-134/semmle/tests/ExternallyControlledFormatString.expected
@@ -7,13 +7,13 @@
 | Test.java:39:25:39:30 | format | Test.java:33:30:33:74 | getParameter(...) : String | Test.java:39:25:39:30 | format | Format string depends on a $@. | Test.java:33:30:33:74 | getParameter(...) | user-provided value |
 edges
 | Test.java:17:27:17:60 | getProperty(...) : String | Test.java:19:19:19:30 | userProperty | provenance | Src:MaD:3  |
-| Test.java:17:27:17:60 | getProperty(...) : String | Test.java:21:23:21:34 | userProperty | provenance | Src:MaD:3  Sink:MaD:1 |
-| Test.java:17:27:17:60 | getProperty(...) : String | Test.java:23:23:23:34 | userProperty | provenance | Src:MaD:3  Sink:MaD:2 |
+| Test.java:17:27:17:60 | getProperty(...) : String | Test.java:21:23:21:34 | userProperty | provenance | Src:MaD:3 Sink:MaD:1 |
+| Test.java:17:27:17:60 | getProperty(...) : String | Test.java:23:23:23:34 | userProperty | provenance | Src:MaD:3 Sink:MaD:2 |
 | Test.java:17:27:17:60 | getProperty(...) : String | Test.java:25:28:25:39 | userProperty | provenance | Src:MaD:3  |
 | Test.java:17:27:17:60 | getProperty(...) : String | Test.java:27:44:27:55 | userProperty | provenance | Src:MaD:3  |
 | Test.java:33:30:33:74 | getParameter(...) : String | Test.java:34:20:34:32 | userParameter : String | provenance | Src:MaD:4  |
 | Test.java:34:20:34:32 | userParameter : String | Test.java:37:31:37:43 | format : String | provenance |  |
-| Test.java:37:31:37:43 | format : String | Test.java:39:25:39:30 | format | provenance |  Sink:MaD:1 |
+| Test.java:37:31:37:43 | format : String | Test.java:39:25:39:30 | format | provenance | Sink:MaD:1 |
 models
 | 1 | Sink: java.io; PrintStream; true; format; (String,Object[]); ; Argument[0..1]; file-content-store; manual |
 | 2 | Sink: java.io; PrintStream; true; printf; (String,Object[]); ; Argument[0..1]; file-content-store; manual |
diff --git a/java/ql/test/query-tests/security/CWE-200/semmle/tests/TempDirLocalInformationDisclosure/TempDirLocalInformationDisclosure.expected b/java/ql/test/query-tests/security/CWE-200/semmle/tests/TempDirLocalInformationDisclosure/TempDirLocalInformationDisclosure.expected
index da076d543b0..e1d879728ef 100644
--- a/java/ql/test/query-tests/security/CWE-200/semmle/tests/TempDirLocalInformationDisclosure/TempDirLocalInformationDisclosure.expected
+++ b/java/ql/test/query-tests/security/CWE-200/semmle/tests/TempDirLocalInformationDisclosure/TempDirLocalInformationDisclosure.expected
@@ -23,75 +23,75 @@
 | Test.java:361:38:361:73 | getProperty(...) | Test.java:361:38:361:73 | getProperty(...) : String | Test.java:366:35:366:55 | toPath(...) | Local information disclosure vulnerability from $@ due to use of file or directory readable by other local users. | Test.java:361:38:361:73 | getProperty(...) | system temp directory |
 edges
 | Files.java:10:24:10:69 | new File(...) : File | Files.java:14:37:14:43 | baseDir : File | provenance |  |
-| Files.java:10:33:10:68 | getProperty(...) : String | Files.java:10:24:10:69 | new File(...) : File | provenance | Src:MaD:8 MaD:4 |
-| Files.java:14:28:14:64 | new File(...) : File | Files.java:15:17:15:23 | tempDir | provenance |  Sink:MaD:2 |
-| Files.java:14:37:14:43 | baseDir : File | Files.java:14:28:14:64 | new File(...) : File | provenance | MaD:4 |
-| Test.java:36:24:36:69 | new File(...) : File | Test.java:39:63:39:69 | tempDir | provenance |  Sink:MaD:1 |
-| Test.java:36:33:36:68 | getProperty(...) : String | Test.java:36:24:36:69 | new File(...) : File | provenance | Src:MaD:8 MaD:4 |
-| Test.java:50:29:50:94 | new File(...) : File | Test.java:53:63:53:74 | tempDirChild | provenance |  Sink:MaD:1 |
-| Test.java:50:38:50:83 | new File(...) : File | Test.java:50:29:50:94 | new File(...) : File | provenance | MaD:4 |
-| Test.java:50:47:50:82 | getProperty(...) : String | Test.java:50:38:50:83 | new File(...) : File | provenance | Src:MaD:8 MaD:4 |
-| Test.java:61:24:61:69 | new File(...) : File | Test.java:61:24:61:88 | getCanonicalFile(...) : File | provenance | MaD:6 |
-| Test.java:61:24:61:88 | getCanonicalFile(...) : File | Test.java:64:63:64:69 | tempDir | provenance |  Sink:MaD:1 |
-| Test.java:61:33:61:68 | getProperty(...) : String | Test.java:61:24:61:69 | new File(...) : File | provenance | Src:MaD:8 MaD:4 |
-| Test.java:75:24:75:69 | new File(...) : File | Test.java:75:24:75:87 | getAbsoluteFile(...) : File | provenance | MaD:5 |
-| Test.java:75:24:75:87 | getAbsoluteFile(...) : File | Test.java:78:63:78:69 | tempDir | provenance |  Sink:MaD:1 |
-| Test.java:75:33:75:68 | getProperty(...) : String | Test.java:75:24:75:69 | new File(...) : File | provenance | Src:MaD:8 MaD:4 |
-| Test.java:110:29:110:84 | new File(...) : File | Test.java:113:9:113:20 | tempDirChild | provenance |  Sink:MaD:2 |
-| Test.java:110:38:110:73 | getProperty(...) : String | Test.java:110:29:110:84 | new File(...) : File | provenance | Src:MaD:8 MaD:4 |
-| Test.java:134:29:134:84 | new File(...) : File | Test.java:137:9:137:20 | tempDirChild | provenance |  Sink:MaD:3 |
-| Test.java:134:38:134:73 | getProperty(...) : String | Test.java:134:29:134:84 | new File(...) : File | provenance | Src:MaD:8 MaD:4 |
+| Files.java:10:33:10:68 | getProperty(...) : String | Files.java:10:24:10:69 | new File(...) : File | provenance | Src:MaD:10 MaD:11 |
+| Files.java:14:28:14:64 | new File(...) : File | Files.java:15:17:15:23 | tempDir | provenance | Sink:MaD:2 |
+| Files.java:14:37:14:43 | baseDir : File | Files.java:14:28:14:64 | new File(...) : File | provenance | MaD:11 |
+| Test.java:36:24:36:69 | new File(...) : File | Test.java:39:63:39:69 | tempDir | provenance | Sink:MaD:1 |
+| Test.java:36:33:36:68 | getProperty(...) : String | Test.java:36:24:36:69 | new File(...) : File | provenance | Src:MaD:10 MaD:11 |
+| Test.java:50:29:50:94 | new File(...) : File | Test.java:53:63:53:74 | tempDirChild | provenance | Sink:MaD:1 |
+| Test.java:50:38:50:83 | new File(...) : File | Test.java:50:29:50:94 | new File(...) : File | provenance | MaD:11 |
+| Test.java:50:47:50:82 | getProperty(...) : String | Test.java:50:38:50:83 | new File(...) : File | provenance | Src:MaD:10 MaD:11 |
+| Test.java:61:24:61:69 | new File(...) : File | Test.java:61:24:61:88 | getCanonicalFile(...) : File | provenance | MaD:13 |
+| Test.java:61:24:61:88 | getCanonicalFile(...) : File | Test.java:64:63:64:69 | tempDir | provenance | Sink:MaD:1 |
+| Test.java:61:33:61:68 | getProperty(...) : String | Test.java:61:24:61:69 | new File(...) : File | provenance | Src:MaD:10 MaD:11 |
+| Test.java:75:24:75:69 | new File(...) : File | Test.java:75:24:75:87 | getAbsoluteFile(...) : File | provenance | MaD:12 |
+| Test.java:75:24:75:87 | getAbsoluteFile(...) : File | Test.java:78:63:78:69 | tempDir | provenance | Sink:MaD:1 |
+| Test.java:75:33:75:68 | getProperty(...) : String | Test.java:75:24:75:69 | new File(...) : File | provenance | Src:MaD:10 MaD:11 |
+| Test.java:110:29:110:84 | new File(...) : File | Test.java:113:9:113:20 | tempDirChild | provenance | Sink:MaD:2 |
+| Test.java:110:38:110:73 | getProperty(...) : String | Test.java:110:29:110:84 | new File(...) : File | provenance | Src:MaD:10 MaD:11 |
+| Test.java:134:29:134:84 | new File(...) : File | Test.java:137:9:137:20 | tempDirChild | provenance | Sink:MaD:3 |
+| Test.java:134:38:134:73 | getProperty(...) : String | Test.java:134:29:134:84 | new File(...) : File | provenance | Src:MaD:10 MaD:11 |
 | Test.java:158:29:158:88 | new File(...) : File | Test.java:159:21:159:32 | tempDirChild : File | provenance |  |
-| Test.java:158:38:158:73 | getProperty(...) : String | Test.java:158:29:158:88 | new File(...) : File | provenance | Src:MaD:8 MaD:4 |
-| Test.java:159:21:159:32 | tempDirChild : File | Test.java:159:21:159:41 | toPath(...) | provenance | MaD:7 Sink:MaD:14 |
+| Test.java:158:38:158:73 | getProperty(...) : String | Test.java:158:29:158:88 | new File(...) : File | provenance | Src:MaD:10 MaD:11 |
+| Test.java:159:21:159:32 | tempDirChild : File | Test.java:159:21:159:41 | toPath(...) | provenance | MaD:14 Sink:MaD:9 |
 | Test.java:187:29:187:88 | new File(...) : File | Test.java:188:21:188:32 | tempDirChild : File | provenance |  |
-| Test.java:187:38:187:73 | getProperty(...) : String | Test.java:187:29:187:88 | new File(...) : File | provenance | Src:MaD:8 MaD:4 |
-| Test.java:188:21:188:32 | tempDirChild : File | Test.java:188:21:188:41 | toPath(...) | provenance | MaD:7 Sink:MaD:14 |
-| Test.java:204:29:204:104 | new File(...) : File | Test.java:204:29:204:113 | toPath(...) : Path | provenance | MaD:7 |
-| Test.java:204:29:204:113 | toPath(...) : Path | Test.java:207:33:207:44 | tempDirChild | provenance |  Sink:MaD:12 |
-| Test.java:204:38:204:73 | getProperty(...) : String | Test.java:204:29:204:104 | new File(...) : File | provenance | Src:MaD:8 MaD:4 |
-| Test.java:216:29:216:102 | new File(...) : File | Test.java:216:29:216:111 | toPath(...) : Path | provenance | MaD:7 |
-| Test.java:216:29:216:111 | toPath(...) : Path | Test.java:219:31:219:42 | tempDirChild | provenance |  Sink:MaD:13 |
-| Test.java:216:38:216:73 | getProperty(...) : String | Test.java:216:29:216:102 | new File(...) : File | provenance | Src:MaD:8 MaD:4 |
+| Test.java:187:38:187:73 | getProperty(...) : String | Test.java:187:29:187:88 | new File(...) : File | provenance | Src:MaD:10 MaD:11 |
+| Test.java:188:21:188:32 | tempDirChild : File | Test.java:188:21:188:41 | toPath(...) | provenance | MaD:14 Sink:MaD:9 |
+| Test.java:204:29:204:104 | new File(...) : File | Test.java:204:29:204:113 | toPath(...) : Path | provenance | MaD:14 |
+| Test.java:204:29:204:113 | toPath(...) : Path | Test.java:207:33:207:44 | tempDirChild | provenance | Sink:MaD:7 |
+| Test.java:204:38:204:73 | getProperty(...) : String | Test.java:204:29:204:104 | new File(...) : File | provenance | Src:MaD:10 MaD:11 |
+| Test.java:216:29:216:102 | new File(...) : File | Test.java:216:29:216:111 | toPath(...) : Path | provenance | MaD:14 |
+| Test.java:216:29:216:111 | toPath(...) : Path | Test.java:219:31:219:42 | tempDirChild | provenance | Sink:MaD:8 |
+| Test.java:216:38:216:73 | getProperty(...) : String | Test.java:216:29:216:102 | new File(...) : File | provenance | Src:MaD:10 MaD:11 |
 | Test.java:228:29:228:100 | new File(...) : File | Test.java:231:26:231:37 | tempDirChild : File | provenance |  |
-| Test.java:228:38:228:73 | getProperty(...) : String | Test.java:228:29:228:100 | new File(...) : File | provenance | Src:MaD:8 MaD:4 |
-| Test.java:231:26:231:37 | tempDirChild : File | Test.java:231:26:231:46 | toPath(...) | provenance | MaD:7 Sink:MaD:11 |
+| Test.java:228:38:228:73 | getProperty(...) : String | Test.java:228:29:228:100 | new File(...) : File | provenance | Src:MaD:10 MaD:11 |
+| Test.java:231:26:231:37 | tempDirChild : File | Test.java:231:26:231:46 | toPath(...) | provenance | MaD:14 Sink:MaD:6 |
 | Test.java:249:29:249:101 | new File(...) : File | Test.java:252:31:252:42 | tempDirChild : File | provenance |  |
-| Test.java:249:38:249:73 | getProperty(...) : String | Test.java:249:29:249:101 | new File(...) : File | provenance | Src:MaD:8 MaD:4 |
-| Test.java:252:31:252:42 | tempDirChild : File | Test.java:252:31:252:51 | toPath(...) | provenance | MaD:7 Sink:MaD:10 |
+| Test.java:249:38:249:73 | getProperty(...) : String | Test.java:249:29:249:101 | new File(...) : File | provenance | Src:MaD:10 MaD:11 |
+| Test.java:252:31:252:42 | tempDirChild : File | Test.java:252:31:252:51 | toPath(...) | provenance | MaD:14 Sink:MaD:5 |
 | Test.java:260:29:260:109 | new File(...) : File | Test.java:263:33:263:44 | tempDirChild : File | provenance |  |
-| Test.java:260:38:260:73 | getProperty(...) : String | Test.java:260:29:260:109 | new File(...) : File | provenance | Src:MaD:8 MaD:4 |
-| Test.java:263:33:263:44 | tempDirChild : File | Test.java:263:33:263:53 | toPath(...) | provenance | MaD:7 Sink:MaD:9 |
+| Test.java:260:38:260:73 | getProperty(...) : String | Test.java:260:29:260:109 | new File(...) : File | provenance | Src:MaD:10 MaD:11 |
+| Test.java:263:33:263:44 | tempDirChild : File | Test.java:263:33:263:53 | toPath(...) | provenance | MaD:14 Sink:MaD:4 |
 | Test.java:294:29:294:101 | new File(...) : File | Test.java:298:35:298:46 | tempDirChild : File | provenance |  |
-| Test.java:294:38:294:73 | getProperty(...) : String | Test.java:294:29:294:101 | new File(...) : File | provenance | Src:MaD:8 MaD:4 |
-| Test.java:298:35:298:46 | tempDirChild : File | Test.java:298:35:298:55 | toPath(...) | provenance | MaD:7 Sink:MaD:10 |
+| Test.java:294:38:294:73 | getProperty(...) : String | Test.java:294:29:294:101 | new File(...) : File | provenance | Src:MaD:10 MaD:11 |
+| Test.java:298:35:298:46 | tempDirChild : File | Test.java:298:35:298:55 | toPath(...) | provenance | MaD:14 Sink:MaD:5 |
 | Test.java:313:29:313:101 | new File(...) : File | Test.java:316:35:316:46 | tempDirChild : File | provenance |  |
-| Test.java:313:38:313:73 | getProperty(...) : String | Test.java:313:29:313:101 | new File(...) : File | provenance | Src:MaD:8 MaD:4 |
-| Test.java:316:35:316:46 | tempDirChild : File | Test.java:316:35:316:55 | toPath(...) | provenance | MaD:7 Sink:MaD:10 |
+| Test.java:313:38:313:73 | getProperty(...) : String | Test.java:313:29:313:101 | new File(...) : File | provenance | Src:MaD:10 MaD:11 |
+| Test.java:316:35:316:46 | tempDirChild : File | Test.java:316:35:316:55 | toPath(...) | provenance | MaD:14 Sink:MaD:5 |
 | Test.java:322:29:322:101 | new File(...) : File | Test.java:326:35:326:46 | tempDirChild : File | provenance |  |
-| Test.java:322:38:322:73 | getProperty(...) : String | Test.java:322:29:322:101 | new File(...) : File | provenance | Src:MaD:8 MaD:4 |
-| Test.java:326:35:326:46 | tempDirChild : File | Test.java:326:35:326:55 | toPath(...) | provenance | MaD:7 Sink:MaD:10 |
+| Test.java:322:38:322:73 | getProperty(...) : String | Test.java:322:29:322:101 | new File(...) : File | provenance | Src:MaD:10 MaD:11 |
+| Test.java:326:35:326:46 | tempDirChild : File | Test.java:326:35:326:55 | toPath(...) | provenance | MaD:14 Sink:MaD:5 |
 | Test.java:350:29:350:101 | new File(...) : File | Test.java:355:35:355:46 | tempDirChild : File | provenance |  |
-| Test.java:350:38:350:73 | getProperty(...) : String | Test.java:350:29:350:101 | new File(...) : File | provenance | Src:MaD:8 MaD:4 |
-| Test.java:355:35:355:46 | tempDirChild : File | Test.java:355:35:355:55 | toPath(...) | provenance | MaD:7 Sink:MaD:10 |
+| Test.java:350:38:350:73 | getProperty(...) : String | Test.java:350:29:350:101 | new File(...) : File | provenance | Src:MaD:10 MaD:11 |
+| Test.java:355:35:355:46 | tempDirChild : File | Test.java:355:35:355:55 | toPath(...) | provenance | MaD:14 Sink:MaD:5 |
 | Test.java:361:29:361:101 | new File(...) : File | Test.java:366:35:366:46 | tempDirChild : File | provenance |  |
-| Test.java:361:38:361:73 | getProperty(...) : String | Test.java:361:29:361:101 | new File(...) : File | provenance | Src:MaD:8 MaD:4 |
-| Test.java:366:35:366:46 | tempDirChild : File | Test.java:366:35:366:55 | toPath(...) | provenance | MaD:7 Sink:MaD:10 |
+| Test.java:361:38:361:73 | getProperty(...) : String | Test.java:361:29:361:101 | new File(...) : File | provenance | Src:MaD:10 MaD:11 |
+| Test.java:366:35:366:46 | tempDirChild : File | Test.java:366:35:366:55 | toPath(...) | provenance | MaD:14 Sink:MaD:5 |
 models
 | 1 | Sink: java.io; File; true; createTempFile; (String,String,File); ; Argument[2]; path-injection; ai-manual |
 | 2 | Sink: java.io; File; true; mkdir; (); ; Argument[this]; path-injection; manual |
 | 3 | Sink: java.io; File; true; mkdirs; (); ; Argument[this]; path-injection; manual |
-| 4 | Summary: java.io; File; false; File; ; ; Argument[0]; Argument[this]; taint; manual |
-| 5 | Summary: java.io; File; true; getAbsoluteFile; ; ; Argument[this]; ReturnValue; taint; manual |
-| 6 | Summary: java.io; File; true; getCanonicalFile; ; ; Argument[this]; ReturnValue; taint; manual |
-| 7 | Summary: java.io; File; true; toPath; ; ; Argument[this]; ReturnValue; taint; manual |
-| 8 | Source: java.lang; System; false; getProperty; ; ; ReturnValue; environment; manual |
-| 9 | Sink: java.nio.file; Files; false; createDirectories; ; ; Argument[0]; path-injection; manual |
-| 10 | Sink: java.nio.file; Files; false; createDirectory; ; ; Argument[0]; path-injection; manual |
-| 11 | Sink: java.nio.file; Files; false; createFile; ; ; Argument[0]; path-injection; manual |
-| 12 | Sink: java.nio.file; Files; false; newBufferedWriter; ; ; Argument[0]; path-injection; manual |
-| 13 | Sink: java.nio.file; Files; false; newOutputStream; ; ; Argument[0]; path-injection; manual |
-| 14 | Sink: java.nio.file; Files; false; write; ; ; Argument[0]; path-injection; manual |
+| 4 | Sink: java.nio.file; Files; false; createDirectories; ; ; Argument[0]; path-injection; manual |
+| 5 | Sink: java.nio.file; Files; false; createDirectory; ; ; Argument[0]; path-injection; manual |
+| 6 | Sink: java.nio.file; Files; false; createFile; ; ; Argument[0]; path-injection; manual |
+| 7 | Sink: java.nio.file; Files; false; newBufferedWriter; ; ; Argument[0]; path-injection; manual |
+| 8 | Sink: java.nio.file; Files; false; newOutputStream; ; ; Argument[0]; path-injection; manual |
+| 9 | Sink: java.nio.file; Files; false; write; ; ; Argument[0]; path-injection; manual |
+| 10 | Source: java.lang; System; false; getProperty; ; ; ReturnValue; environment; manual |
+| 11 | Summary: java.io; File; false; File; ; ; Argument[0]; Argument[this]; taint; manual |
+| 12 | Summary: java.io; File; true; getAbsoluteFile; ; ; Argument[this]; ReturnValue; taint; manual |
+| 13 | Summary: java.io; File; true; getCanonicalFile; ; ; Argument[this]; ReturnValue; taint; manual |
+| 14 | Summary: java.io; File; true; toPath; ; ; Argument[this]; ReturnValue; taint; manual |
 nodes
 | Files.java:10:24:10:69 | new File(...) : File | semmle.label | new File(...) : File |
 | Files.java:10:33:10:68 | getProperty(...) : String | semmle.label | getProperty(...) : String |
diff --git a/java/ql/test/query-tests/security/CWE-297/UnsafeHostnameVerification.expected b/java/ql/test/query-tests/security/CWE-297/UnsafeHostnameVerification.expected
index 6037cb7837a..ed248caef2a 100644
--- a/java/ql/test/query-tests/security/CWE-297/UnsafeHostnameVerification.expected
+++ b/java/ql/test/query-tests/security/CWE-297/UnsafeHostnameVerification.expected
@@ -5,9 +5,9 @@
 | UnsafeHostnameVerification.java:81:55:81:62 | verifier | UnsafeHostnameVerification.java:66:37:80:9 | new (...) : new HostnameVerifier(...) { ... } | UnsafeHostnameVerification.java:81:55:81:62 | verifier | The $@ defined by $@ always accepts any certificate, even if the hostname does not match. | UnsafeHostnameVerification.java:66:37:80:9 | new (...) : new HostnameVerifier(...) { ... } | hostname verifier | UnsafeHostnameVerification.java:66:41:66:56 | new HostnameVerifier(...) { ... } | this type |
 | UnsafeHostnameVerification.java:94:55:94:62 | verifier | UnsafeHostnameVerification.java:88:37:93:9 | new (...) : new HostnameVerifier(...) { ... } | UnsafeHostnameVerification.java:94:55:94:62 | verifier | The $@ defined by $@ always accepts any certificate, even if the hostname does not match. | UnsafeHostnameVerification.java:88:37:93:9 | new (...) : new HostnameVerifier(...) { ... } | hostname verifier | UnsafeHostnameVerification.java:88:41:88:56 | new HostnameVerifier(...) { ... } | this type |
 edges
-| UnsafeHostnameVerification.java:66:37:80:9 | new (...) : new HostnameVerifier(...) { ... } | UnsafeHostnameVerification.java:81:55:81:62 | verifier | provenance |  Sink:MaD:1 |
-| UnsafeHostnameVerification.java:88:37:93:9 | new (...) : new HostnameVerifier(...) { ... } | UnsafeHostnameVerification.java:94:55:94:62 | verifier | provenance |  Sink:MaD:1 |
-| UnsafeHostnameVerification.java:97:42:97:68 | ALLOW_ALL_HOSTNAME_VERIFIER : new HostnameVerifier(...) { ... } | UnsafeHostnameVerification.java:34:59:34:85 | ALLOW_ALL_HOSTNAME_VERIFIER | provenance |  Sink:MaD:1 |
+| UnsafeHostnameVerification.java:66:37:80:9 | new (...) : new HostnameVerifier(...) { ... } | UnsafeHostnameVerification.java:81:55:81:62 | verifier | provenance | Sink:MaD:1 |
+| UnsafeHostnameVerification.java:88:37:93:9 | new (...) : new HostnameVerifier(...) { ... } | UnsafeHostnameVerification.java:94:55:94:62 | verifier | provenance | Sink:MaD:1 |
+| UnsafeHostnameVerification.java:97:42:97:68 | ALLOW_ALL_HOSTNAME_VERIFIER : new HostnameVerifier(...) { ... } | UnsafeHostnameVerification.java:34:59:34:85 | ALLOW_ALL_HOSTNAME_VERIFIER | provenance | Sink:MaD:1 |
 | UnsafeHostnameVerification.java:97:72:102:5 | new (...) : new HostnameVerifier(...) { ... } | UnsafeHostnameVerification.java:97:42:97:68 | ALLOW_ALL_HOSTNAME_VERIFIER : new HostnameVerifier(...) { ... } | provenance |  |
 models
 | 1 | Sink: javax.net.ssl; HttpsURLConnection; true; setDefaultHostnameVerifier; ; ; Argument[0]; hostname-verification; manual |
diff --git a/java/ql/test/query-tests/security/CWE-311/CWE-319/HttpsUrls.expected b/java/ql/test/query-tests/security/CWE-311/CWE-319/HttpsUrls.expected
index 5d1117393e6..467fa2f2fde 100644
--- a/java/ql/test/query-tests/security/CWE-311/CWE-319/HttpsUrls.expected
+++ b/java/ql/test/query-tests/security/CWE-311/CWE-319/HttpsUrls.expected
@@ -1,22 +1,27 @@
+#select
+| HttpsUrlsTest.java:28:50:28:50 | u | HttpsUrlsTest.java:23:23:23:31 | "http://" : String | HttpsUrlsTest.java:28:50:28:50 | u | URL may have been constructed with HTTP protocol, using $@. | HttpsUrlsTest.java:23:23:23:31 | "http://" | this HTTP URL |
+| HttpsUrlsTest.java:41:50:41:50 | u | HttpsUrlsTest.java:36:23:36:28 | "http" : String | HttpsUrlsTest.java:41:50:41:50 | u | URL may have been constructed with HTTP protocol, using $@. | HttpsUrlsTest.java:36:23:36:28 | "http" | this HTTP URL |
+| HttpsUrlsTest.java:55:50:55:50 | u | HttpsUrlsTest.java:49:23:49:31 | "http://" : String | HttpsUrlsTest.java:55:50:55:50 | u | URL may have been constructed with HTTP protocol, using $@. | HttpsUrlsTest.java:49:23:49:31 | "http://" | this HTTP URL |
+| HttpsUrlsTest.java:92:50:92:50 | u | HttpsUrlsTest.java:87:23:87:28 | "http" : String | HttpsUrlsTest.java:92:50:92:50 | u | URL may have been constructed with HTTP protocol, using $@. | HttpsUrlsTest.java:87:23:87:28 | "http" | this HTTP URL |
+edges
+| HttpsUrlsTest.java:23:23:23:31 | "http://" : String | HttpsUrlsTest.java:24:21:24:56 | ... + ... : String | provenance |  |
+| HttpsUrlsTest.java:24:13:24:57 | new URL(...) : URL | HttpsUrlsTest.java:28:50:28:50 | u | provenance | Sink:MaD:1 |
+| HttpsUrlsTest.java:24:21:24:56 | ... + ... : String | HttpsUrlsTest.java:24:13:24:57 | new URL(...) : URL | provenance | Config |
+| HttpsUrlsTest.java:24:21:24:56 | ... + ... : String | HttpsUrlsTest.java:24:13:24:57 | new URL(...) : URL | provenance | MaD:2 |
+| HttpsUrlsTest.java:36:23:36:28 | "http" : String | HttpsUrlsTest.java:37:21:37:28 | protocol : String | provenance |  |
+| HttpsUrlsTest.java:37:13:37:62 | new URL(...) : URL | HttpsUrlsTest.java:41:50:41:50 | u | provenance | Sink:MaD:1 |
+| HttpsUrlsTest.java:37:21:37:28 | protocol : String | HttpsUrlsTest.java:37:13:37:62 | new URL(...) : URL | provenance | Config |
+| HttpsUrlsTest.java:49:23:49:31 | "http://" : String | HttpsUrlsTest.java:51:64:51:98 | ... + ... : String | provenance |  |
+| HttpsUrlsTest.java:51:13:51:99 | new URL(...) : URL | HttpsUrlsTest.java:55:50:55:50 | u | provenance | Sink:MaD:1 |
+| HttpsUrlsTest.java:51:64:51:98 | ... + ... : String | HttpsUrlsTest.java:51:13:51:99 | new URL(...) : URL | provenance | Config |
+| HttpsUrlsTest.java:51:64:51:98 | ... + ... : String | HttpsUrlsTest.java:51:13:51:99 | new URL(...) : URL | provenance | MaD:3 |
+| HttpsUrlsTest.java:87:23:87:28 | "http" : String | HttpsUrlsTest.java:88:21:88:28 | protocol : String | provenance |  |
+| HttpsUrlsTest.java:88:13:88:52 | new URL(...) : URL | HttpsUrlsTest.java:92:50:92:50 | u | provenance | Sink:MaD:1 |
+| HttpsUrlsTest.java:88:21:88:28 | protocol : String | HttpsUrlsTest.java:88:13:88:52 | new URL(...) : URL | provenance | Config |
 models
 | 1 | Sink: java.net; URL; false; openConnection; ; ; Argument[this]; request-forgery; manual |
 | 2 | Summary: java.net; URL; false; URL; (String); ; Argument[0]; Argument[this]; taint; manual |
 | 3 | Summary: java.net; URL; false; URL; (URL,String); ; Argument[1]; Argument[this]; taint; ai-manual |
-edges
-| HttpsUrlsTest.java:23:23:23:31 | "http://" : String | HttpsUrlsTest.java:24:21:24:56 | ... + ... : String | provenance |  |
-| HttpsUrlsTest.java:24:13:24:57 | new URL(...) : URL | HttpsUrlsTest.java:28:50:28:50 | u | provenance |  Sink:MaD:1 |
-| HttpsUrlsTest.java:24:21:24:56 | ... + ... : String | HttpsUrlsTest.java:24:13:24:57 | new URL(...) : URL | provenance | Config |
-| HttpsUrlsTest.java:24:21:24:56 | ... + ... : String | HttpsUrlsTest.java:24:13:24:57 | new URL(...) : URL | provenance | MaD:2 |
-| HttpsUrlsTest.java:36:23:36:28 | "http" : String | HttpsUrlsTest.java:37:21:37:28 | protocol : String | provenance |  |
-| HttpsUrlsTest.java:37:13:37:62 | new URL(...) : URL | HttpsUrlsTest.java:41:50:41:50 | u | provenance |  Sink:MaD:1 |
-| HttpsUrlsTest.java:37:21:37:28 | protocol : String | HttpsUrlsTest.java:37:13:37:62 | new URL(...) : URL | provenance | Config |
-| HttpsUrlsTest.java:49:23:49:31 | "http://" : String | HttpsUrlsTest.java:51:64:51:98 | ... + ... : String | provenance |  |
-| HttpsUrlsTest.java:51:13:51:99 | new URL(...) : URL | HttpsUrlsTest.java:55:50:55:50 | u | provenance |  Sink:MaD:1 |
-| HttpsUrlsTest.java:51:64:51:98 | ... + ... : String | HttpsUrlsTest.java:51:13:51:99 | new URL(...) : URL | provenance | Config |
-| HttpsUrlsTest.java:51:64:51:98 | ... + ... : String | HttpsUrlsTest.java:51:13:51:99 | new URL(...) : URL | provenance | MaD:3 |
-| HttpsUrlsTest.java:87:23:87:28 | "http" : String | HttpsUrlsTest.java:88:21:88:28 | protocol : String | provenance |  |
-| HttpsUrlsTest.java:88:13:88:52 | new URL(...) : URL | HttpsUrlsTest.java:92:50:92:50 | u | provenance |  Sink:MaD:1 |
-| HttpsUrlsTest.java:88:21:88:28 | protocol : String | HttpsUrlsTest.java:88:13:88:52 | new URL(...) : URL | provenance | Config |
 nodes
 | HttpsUrlsTest.java:23:23:23:31 | "http://" : String | semmle.label | "http://" : String |
 | HttpsUrlsTest.java:24:13:24:57 | new URL(...) : URL | semmle.label | new URL(...) : URL |
@@ -35,8 +40,3 @@ nodes
 | HttpsUrlsTest.java:88:21:88:28 | protocol : String | semmle.label | protocol : String |
 | HttpsUrlsTest.java:92:50:92:50 | u | semmle.label | u |
 subpaths
-#select
-| HttpsUrlsTest.java:28:50:28:50 | u | HttpsUrlsTest.java:23:23:23:31 | "http://" : String | HttpsUrlsTest.java:28:50:28:50 | u | URL may have been constructed with HTTP protocol, using $@. | HttpsUrlsTest.java:23:23:23:31 | "http://" | this HTTP URL |
-| HttpsUrlsTest.java:41:50:41:50 | u | HttpsUrlsTest.java:36:23:36:28 | "http" : String | HttpsUrlsTest.java:41:50:41:50 | u | URL may have been constructed with HTTP protocol, using $@. | HttpsUrlsTest.java:36:23:36:28 | "http" | this HTTP URL |
-| HttpsUrlsTest.java:55:50:55:50 | u | HttpsUrlsTest.java:49:23:49:31 | "http://" : String | HttpsUrlsTest.java:55:50:55:50 | u | URL may have been constructed with HTTP protocol, using $@. | HttpsUrlsTest.java:49:23:49:31 | "http://" | this HTTP URL |
-| HttpsUrlsTest.java:92:50:92:50 | u | HttpsUrlsTest.java:87:23:87:28 | "http" : String | HttpsUrlsTest.java:92:50:92:50 | u | URL may have been constructed with HTTP protocol, using $@. | HttpsUrlsTest.java:87:23:87:28 | "http" | this HTTP URL |
diff --git a/java/ql/test/query-tests/security/CWE-601/semmle/tests/UrlRedirect.expected b/java/ql/test/query-tests/security/CWE-601/semmle/tests/UrlRedirect.expected
index 79ebb58fc9c..fdd602c616b 100644
--- a/java/ql/test/query-tests/security/CWE-601/semmle/tests/UrlRedirect.expected
+++ b/java/ql/test/query-tests/security/CWE-601/semmle/tests/UrlRedirect.expected
@@ -6,16 +6,16 @@
 | UrlRedirect.java:42:43:42:72 | getParameter(...) | UrlRedirect.java:42:43:42:72 | getParameter(...) | UrlRedirect.java:42:43:42:72 | getParameter(...) | Untrusted URL redirection depends on a $@. | UrlRedirect.java:42:43:42:72 | getParameter(...) | user-provided value |
 | mad/Test.java:14:22:14:38 | (...)... | mad/Test.java:9:16:9:41 | getParameter(...) : String | mad/Test.java:14:22:14:38 | (...)... | Untrusted URL redirection depends on a $@. | mad/Test.java:9:16:9:41 | getParameter(...) | user-provided value |
 edges
-| UrlRedirect.java:32:37:32:66 | getParameter(...) : String | UrlRedirect.java:32:25:32:67 | weakCleanup(...) | provenance | Src:MaD:2 MaD:1 |
+| UrlRedirect.java:32:37:32:66 | getParameter(...) : String | UrlRedirect.java:32:25:32:67 | weakCleanup(...) | provenance | Src:MaD:2 MaD:3 |
 | UrlRedirect.java:32:37:32:66 | getParameter(...) : String | UrlRedirect.java:45:28:45:39 | input : String | provenance | Src:MaD:2  |
 | UrlRedirect.java:45:28:45:39 | input : String | UrlRedirect.java:46:10:46:14 | input : String | provenance |  |
-| UrlRedirect.java:46:10:46:14 | input : String | UrlRedirect.java:46:10:46:40 | replaceAll(...) : String | provenance | MaD:1 |
+| UrlRedirect.java:46:10:46:14 | input : String | UrlRedirect.java:46:10:46:40 | replaceAll(...) : String | provenance | MaD:3 |
 | mad/Test.java:9:16:9:41 | getParameter(...) : String | mad/Test.java:14:31:14:38 | source(...) : String | provenance | Src:MaD:2  |
-| mad/Test.java:14:31:14:38 | source(...) : String | mad/Test.java:14:22:14:38 | (...)... | provenance |  Sink:MaD:3 |
+| mad/Test.java:14:31:14:38 | source(...) : String | mad/Test.java:14:22:14:38 | (...)... | provenance | Sink:MaD:1 |
 models
-| 1 | Summary: java.lang; String; false; replaceAll; ; ; Argument[this]; ReturnValue; taint; manual |
+| 1 | Sink: org.kohsuke.stapler; HttpResponses; true; redirectTo; (String); ; Argument[0]; url-redirection; ai-manual |
 | 2 | Source: javax.servlet; ServletRequest; false; getParameter; (String); ; ReturnValue; remote; manual |
-| 3 | Sink: org.kohsuke.stapler; HttpResponses; true; redirectTo; (String); ; Argument[0]; url-redirection; ai-manual |
+| 3 | Summary: java.lang; String; false; replaceAll; ; ; Argument[this]; ReturnValue; taint; manual |
 nodes
 | UrlRedirect2.java:27:25:27:54 | getParameter(...) | semmle.label | getParameter(...) |
 | UrlRedirect.java:23:25:23:54 | getParameter(...) | semmle.label | getParameter(...) |
diff --git a/java/ql/test/query-tests/security/CWE-918/SanitizationTests.java b/java/ql/test/query-tests/security/CWE-918/SanitizationTests.java
index 6a99c619ff3..33df1a58630 100644
--- a/java/ql/test/query-tests/security/CWE-918/SanitizationTests.java
+++ b/java/ql/test/query-tests/security/CWE-918/SanitizationTests.java
@@ -20,7 +20,7 @@ public class SanitizationTests extends HttpServlet {
             // BAD: a request parameter is incorporated without validation into a Http
             // request
             HttpRequest r = HttpRequest.newBuilder(uri).build(); // $ SSRF
-            client.send(r, null);
+            client.send(r, null); // $ SSRF
 
             // GOOD: sanitisation by concatenation with a prefix that prevents targeting an arbitrary host.
             // We test a few different ways of sanitisation: via string conctentation (perhaps nested),
@@ -74,51 +74,51 @@ public class SanitizationTests extends HttpServlet {
             // place to sanitise user input:
             String unsafeUri3 = request.getParameter("baduri3") + "https://example.com/";
             HttpRequest unsafer3 = HttpRequest.newBuilder(new URI(unsafeUri3)).build();  // $ SSRF
-            client.send(unsafer3, null);
+            client.send(unsafer3, null); // $ SSRF
 
             String unsafeUri4 = ("someprefix" + request.getParameter("baduri4")) + "https://example.com/";
             HttpRequest unsafer4 = HttpRequest.newBuilder(new URI(unsafeUri4)).build(); // $ SSRF
-            client.send(unsafer4, null);
+            client.send(unsafer4, null); // $ SSRF
 
             StringBuilder unsafeUri5 = new StringBuilder();
             unsafeUri5.append(request.getParameter("baduri5")).append("https://example.com/");
             HttpRequest unsafer5 = HttpRequest.newBuilder(new URI(unsafeUri5.toString())).build(); // $ SSRF
-            client.send(unsafer5, null);
+            client.send(unsafer5, null); // $ SSRF
 
             StringBuilder unafeUri5a = new StringBuilder(request.getParameter("uri5a"));
             unafeUri5a.append("https://example.com/");
             HttpRequest unsafer5a = HttpRequest.newBuilder(new URI(unafeUri5a.toString())).build(); // $ SSRF
-            client.send(unsafer5a, null);
+            client.send(unsafer5a, null); // $ SSRF
 
             StringBuilder unsafeUri5b = (new StringBuilder(request.getParameter("uri5b"))).append("dir/");
             unsafeUri5b.append("https://example.com/");
             HttpRequest unsafer5b = HttpRequest.newBuilder(new URI(unsafeUri5b.toString())).build(); // $ SSRF
-            client.send(unsafer5b, null);
+            client.send(unsafer5b, null); // $ SSRF
 
             StringBuilder unsafeUri5c = (new StringBuilder("https")).append(request.getParameter("uri5c"));
             unsafeUri5c.append("://example.com/dir/");
             HttpRequest unsafer5c = HttpRequest.newBuilder(new URI(unsafeUri5c.toString())).build(); // $ SSRF
-            client.send(unsafer5c, null);
+            client.send(unsafer5c, null); // $ SSRF
 
             String unsafeUri6 = String.format("%shttps://example.com/", request.getParameter("baduri6"));
             HttpRequest unsafer6 = HttpRequest.newBuilder(new URI(unsafeUri6)).build(); // $ SSRF
-            client.send(unsafer6, null);
+            client.send(unsafer6, null); // $ SSRF
 
             String unsafeUri7 = String.format("%s/%s", request.getParameter("baduri7"), "https://example.com");
             HttpRequest unsafer7 = HttpRequest.newBuilder(new URI(unsafeUri7)).build(); // $ SSRF
-            client.send(unsafer7, null);
+            client.send(unsafer7, null); // $ SSRF
 
             String unsafeUri8 = String.format("%s%s", request.getParameter("baduri8"), "https://example.com/");
             HttpRequest unsafer8 = HttpRequest.newBuilder(new URI(unsafeUri8)).build(); // $ SSRF
-            client.send(unsafer8, null);
+            client.send(unsafer8, null); // $ SSRF
 
             String unsafeUri9 = request.getParameter("baduri9") + "/" + String.format("http://%s", "myserver.com");
             HttpRequest unsafer9 = HttpRequest.newBuilder(new URI(unsafeUri9)).build(); // $ SSRF
-            client.send(unsafer9, null);
+            client.send(unsafer9, null); // $ SSRF
 
             String unsafeUri10 = String.format("%s://%s:%s%s", "http", "myserver.com", "80", request.getParameter("baduri10"));
             HttpRequest unsafer10 = HttpRequest.newBuilder(new URI(unsafeUri10)).build(); // $ SSRF
-            client.send(unsafer10, null);
+            client.send(unsafer10, null); // $ SSRF
         } catch (Exception e) {
             // TODO: handle exception
         }
diff --git a/java/ql/test/query-tests/security/CWE-940/AndroidIntentRedirectionTest.expected b/java/ql/test/query-tests/security/CWE-940/AndroidIntentRedirectionTest.expected
index 48de9172b36..5b0588c225b 100644
--- a/java/ql/test/query-tests/security/CWE-940/AndroidIntentRedirectionTest.expected
+++ b/java/ql/test/query-tests/security/CWE-940/AndroidIntentRedirectionTest.expected
@@ -1,2 +1,283 @@
-failures
-testFailures
+#select
+| AndroidIntentRedirectionTest.java:15:25:15:45 | new Intent[] | AndroidIntentRedirectionTest.java:12:34:12:44 | getIntent(...) : Intent | AndroidIntentRedirectionTest.java:15:25:15:45 | new Intent[] | Arbitrary Android activities or services can be started from a $@. | AndroidIntentRedirectionTest.java:12:34:12:44 | getIntent(...) | user-provided value |
+| AndroidIntentRedirectionTest.java:16:25:16:45 | new Intent[] | AndroidIntentRedirectionTest.java:12:34:12:44 | getIntent(...) : Intent | AndroidIntentRedirectionTest.java:16:25:16:45 | new Intent[] | Arbitrary Android activities or services can be started from a $@. | AndroidIntentRedirectionTest.java:12:34:12:44 | getIntent(...) | user-provided value |
+| AndroidIntentRedirectionTest.java:17:23:17:28 | intent | AndroidIntentRedirectionTest.java:12:34:12:44 | getIntent(...) : Intent | AndroidIntentRedirectionTest.java:17:23:17:28 | intent | Arbitrary Android activities or services can be started from a $@. | AndroidIntentRedirectionTest.java:12:34:12:44 | getIntent(...) | user-provided value |
+| AndroidIntentRedirectionTest.java:18:23:18:28 | intent | AndroidIntentRedirectionTest.java:12:34:12:44 | getIntent(...) : Intent | AndroidIntentRedirectionTest.java:18:23:18:28 | intent | Arbitrary Android activities or services can be started from a $@. | AndroidIntentRedirectionTest.java:12:34:12:44 | getIntent(...) | user-provided value |
+| AndroidIntentRedirectionTest.java:19:29:19:34 | intent | AndroidIntentRedirectionTest.java:12:34:12:44 | getIntent(...) : Intent | AndroidIntentRedirectionTest.java:19:29:19:34 | intent | Arbitrary Android activities or services can be started from a $@. | AndroidIntentRedirectionTest.java:12:34:12:44 | getIntent(...) | user-provided value |
+| AndroidIntentRedirectionTest.java:20:31:20:36 | intent | AndroidIntentRedirectionTest.java:12:34:12:44 | getIntent(...) : Intent | AndroidIntentRedirectionTest.java:20:31:20:36 | intent | Arbitrary Android activities or services can be started from a $@. | AndroidIntentRedirectionTest.java:12:34:12:44 | getIntent(...) | user-provided value |
+| AndroidIntentRedirectionTest.java:21:32:21:37 | intent | AndroidIntentRedirectionTest.java:12:34:12:44 | getIntent(...) : Intent | AndroidIntentRedirectionTest.java:21:32:21:37 | intent | Arbitrary Android activities or services can be started from a $@. | AndroidIntentRedirectionTest.java:12:34:12:44 | getIntent(...) | user-provided value |
+| AndroidIntentRedirectionTest.java:22:32:22:37 | intent | AndroidIntentRedirectionTest.java:12:34:12:44 | getIntent(...) : Intent | AndroidIntentRedirectionTest.java:22:32:22:37 | intent | Arbitrary Android activities or services can be started from a $@. | AndroidIntentRedirectionTest.java:12:34:12:44 | getIntent(...) | user-provided value |
+| AndroidIntentRedirectionTest.java:23:38:23:43 | intent | AndroidIntentRedirectionTest.java:12:34:12:44 | getIntent(...) : Intent | AndroidIntentRedirectionTest.java:23:38:23:43 | intent | Arbitrary Android activities or services can be started from a $@. | AndroidIntentRedirectionTest.java:12:34:12:44 | getIntent(...) | user-provided value |
+| AndroidIntentRedirectionTest.java:24:38:24:43 | intent | AndroidIntentRedirectionTest.java:12:34:12:44 | getIntent(...) : Intent | AndroidIntentRedirectionTest.java:24:38:24:43 | intent | Arbitrary Android activities or services can be started from a $@. | AndroidIntentRedirectionTest.java:12:34:12:44 | getIntent(...) | user-provided value |
+| AndroidIntentRedirectionTest.java:25:38:25:43 | intent | AndroidIntentRedirectionTest.java:12:34:12:44 | getIntent(...) : Intent | AndroidIntentRedirectionTest.java:25:38:25:43 | intent | Arbitrary Android activities or services can be started from a $@. | AndroidIntentRedirectionTest.java:12:34:12:44 | getIntent(...) | user-provided value |
+| AndroidIntentRedirectionTest.java:26:38:26:43 | intent | AndroidIntentRedirectionTest.java:12:34:12:44 | getIntent(...) : Intent | AndroidIntentRedirectionTest.java:26:38:26:43 | intent | Arbitrary Android activities or services can be started from a $@. | AndroidIntentRedirectionTest.java:12:34:12:44 | getIntent(...) | user-provided value |
+| AndroidIntentRedirectionTest.java:29:22:29:27 | intent | AndroidIntentRedirectionTest.java:12:34:12:44 | getIntent(...) : Intent | AndroidIntentRedirectionTest.java:29:22:29:27 | intent | Arbitrary Android activities or services can be started from a $@. | AndroidIntentRedirectionTest.java:12:34:12:44 | getIntent(...) | user-provided value |
+| AndroidIntentRedirectionTest.java:30:28:30:33 | intent | AndroidIntentRedirectionTest.java:12:34:12:44 | getIntent(...) : Intent | AndroidIntentRedirectionTest.java:30:28:30:33 | intent | Arbitrary Android activities or services can be started from a $@. | AndroidIntentRedirectionTest.java:12:34:12:44 | getIntent(...) | user-provided value |
+| AndroidIntentRedirectionTest.java:31:32:31:37 | intent | AndroidIntentRedirectionTest.java:12:34:12:44 | getIntent(...) : Intent | AndroidIntentRedirectionTest.java:31:32:31:37 | intent | Arbitrary Android activities or services can be started from a $@. | AndroidIntentRedirectionTest.java:12:34:12:44 | getIntent(...) | user-provided value |
+| AndroidIntentRedirectionTest.java:32:23:32:28 | intent | AndroidIntentRedirectionTest.java:12:34:12:44 | getIntent(...) : Intent | AndroidIntentRedirectionTest.java:32:23:32:28 | intent | Arbitrary Android activities or services can be started from a $@. | AndroidIntentRedirectionTest.java:12:34:12:44 | getIntent(...) | user-provided value |
+| AndroidIntentRedirectionTest.java:33:23:33:28 | intent | AndroidIntentRedirectionTest.java:12:34:12:44 | getIntent(...) : Intent | AndroidIntentRedirectionTest.java:33:23:33:28 | intent | Arbitrary Android activities or services can be started from a $@. | AndroidIntentRedirectionTest.java:12:34:12:44 | getIntent(...) | user-provided value |
+| AndroidIntentRedirectionTest.java:34:29:34:34 | intent | AndroidIntentRedirectionTest.java:12:34:12:44 | getIntent(...) : Intent | AndroidIntentRedirectionTest.java:34:29:34:34 | intent | Arbitrary Android activities or services can be started from a $@. | AndroidIntentRedirectionTest.java:12:34:12:44 | getIntent(...) | user-provided value |
+| AndroidIntentRedirectionTest.java:35:29:35:34 | intent | AndroidIntentRedirectionTest.java:12:34:12:44 | getIntent(...) : Intent | AndroidIntentRedirectionTest.java:35:29:35:34 | intent | Arbitrary Android activities or services can be started from a $@. | AndroidIntentRedirectionTest.java:12:34:12:44 | getIntent(...) | user-provided value |
+| AndroidIntentRedirectionTest.java:36:46:36:51 | intent | AndroidIntentRedirectionTest.java:12:34:12:44 | getIntent(...) : Intent | AndroidIntentRedirectionTest.java:36:46:36:51 | intent | Arbitrary Android activities or services can be started from a $@. | AndroidIntentRedirectionTest.java:12:34:12:44 | getIntent(...) | user-provided value |
+| AndroidIntentRedirectionTest.java:37:29:37:34 | intent | AndroidIntentRedirectionTest.java:12:34:12:44 | getIntent(...) : Intent | AndroidIntentRedirectionTest.java:37:29:37:34 | intent | Arbitrary Android activities or services can be started from a $@. | AndroidIntentRedirectionTest.java:12:34:12:44 | getIntent(...) | user-provided value |
+| AndroidIntentRedirectionTest.java:38:35:38:40 | intent | AndroidIntentRedirectionTest.java:12:34:12:44 | getIntent(...) : Intent | AndroidIntentRedirectionTest.java:38:35:38:40 | intent | Arbitrary Android activities or services can be started from a $@. | AndroidIntentRedirectionTest.java:12:34:12:44 | getIntent(...) | user-provided value |
+| AndroidIntentRedirectionTest.java:39:36:39:41 | intent | AndroidIntentRedirectionTest.java:12:34:12:44 | getIntent(...) : Intent | AndroidIntentRedirectionTest.java:39:36:39:41 | intent | Arbitrary Android activities or services can be started from a $@. | AndroidIntentRedirectionTest.java:12:34:12:44 | getIntent(...) | user-provided value |
+| AndroidIntentRedirectionTest.java:40:42:40:47 | intent | AndroidIntentRedirectionTest.java:12:34:12:44 | getIntent(...) : Intent | AndroidIntentRedirectionTest.java:40:42:40:47 | intent | Arbitrary Android activities or services can be started from a $@. | AndroidIntentRedirectionTest.java:12:34:12:44 | getIntent(...) | user-provided value |
+| AndroidIntentRedirectionTest.java:47:27:47:32 | intent | AndroidIntentRedirectionTest.java:12:34:12:44 | getIntent(...) : Intent | AndroidIntentRedirectionTest.java:47:27:47:32 | intent | Arbitrary Android activities or services can be started from a $@. | AndroidIntentRedirectionTest.java:12:34:12:44 | getIntent(...) | user-provided value |
+| AndroidIntentRedirectionTest.java:49:27:49:32 | intent | AndroidIntentRedirectionTest.java:12:34:12:44 | getIntent(...) : Intent | AndroidIntentRedirectionTest.java:49:27:49:32 | intent | Arbitrary Android activities or services can be started from a $@. | AndroidIntentRedirectionTest.java:12:34:12:44 | getIntent(...) | user-provided value |
+| AndroidIntentRedirectionTest.java:52:27:52:32 | intent | AndroidIntentRedirectionTest.java:12:34:12:44 | getIntent(...) : Intent | AndroidIntentRedirectionTest.java:52:27:52:32 | intent | Arbitrary Android activities or services can be started from a $@. | AndroidIntentRedirectionTest.java:12:34:12:44 | getIntent(...) | user-provided value |
+| AndroidIntentRedirectionTest.java:54:27:54:32 | intent | AndroidIntentRedirectionTest.java:12:34:12:44 | getIntent(...) : Intent | AndroidIntentRedirectionTest.java:54:27:54:32 | intent | Arbitrary Android activities or services can be started from a $@. | AndroidIntentRedirectionTest.java:12:34:12:44 | getIntent(...) | user-provided value |
+| AndroidIntentRedirectionTest.java:61:27:61:32 | intent | AndroidIntentRedirectionTest.java:12:34:12:44 | getIntent(...) : Intent | AndroidIntentRedirectionTest.java:61:27:61:32 | intent | Arbitrary Android activities or services can be started from a $@. | AndroidIntentRedirectionTest.java:12:34:12:44 | getIntent(...) | user-provided value |
+| AndroidIntentRedirectionTest.java:69:31:69:39 | fwdIntent | AndroidIntentRedirectionTest.java:67:30:67:40 | getIntent(...) : Intent | AndroidIntentRedirectionTest.java:69:31:69:39 | fwdIntent | Arbitrary Android activities or services can be started from a $@. | AndroidIntentRedirectionTest.java:67:30:67:40 | getIntent(...) | user-provided value |
+| AndroidIntentRedirectionTest.java:74:31:74:39 | fwdIntent | AndroidIntentRedirectionTest.java:12:34:12:44 | getIntent(...) : Intent | AndroidIntentRedirectionTest.java:74:31:74:39 | fwdIntent | Arbitrary Android activities or services can be started from a $@. | AndroidIntentRedirectionTest.java:12:34:12:44 | getIntent(...) | user-provided value |
+| AndroidIntentRedirectionTest.java:79:31:79:39 | fwdIntent | AndroidIntentRedirectionTest.java:12:34:12:44 | getIntent(...) : Intent | AndroidIntentRedirectionTest.java:79:31:79:39 | fwdIntent | Arbitrary Android activities or services can be started from a $@. | AndroidIntentRedirectionTest.java:12:34:12:44 | getIntent(...) | user-provided value |
+| AndroidIntentRedirectionTest.java:85:31:85:39 | fwdIntent | AndroidIntentRedirectionTest.java:12:34:12:44 | getIntent(...) : Intent | AndroidIntentRedirectionTest.java:85:31:85:39 | fwdIntent | Arbitrary Android activities or services can be started from a $@. | AndroidIntentRedirectionTest.java:12:34:12:44 | getIntent(...) | user-provided value |
+| AndroidIntentRedirectionTest.java:96:31:96:39 | fwdIntent | AndroidIntentRedirectionTest.java:12:34:12:44 | getIntent(...) : Intent | AndroidIntentRedirectionTest.java:96:31:96:39 | fwdIntent | Arbitrary Android activities or services can be started from a $@. | AndroidIntentRedirectionTest.java:12:34:12:44 | getIntent(...) | user-provided value |
+| AndroidIntentRedirectionTest.java:103:31:103:39 | fwdIntent | AndroidIntentRedirectionTest.java:12:34:12:44 | getIntent(...) : Intent | AndroidIntentRedirectionTest.java:103:31:103:39 | fwdIntent | Arbitrary Android activities or services can be started from a $@. | AndroidIntentRedirectionTest.java:12:34:12:44 | getIntent(...) | user-provided value |
+| AndroidIntentRedirectionTest.java:109:31:109:39 | fwdIntent | AndroidIntentRedirectionTest.java:12:34:12:44 | getIntent(...) : Intent | AndroidIntentRedirectionTest.java:109:31:109:39 | fwdIntent | Arbitrary Android activities or services can be started from a $@. | AndroidIntentRedirectionTest.java:12:34:12:44 | getIntent(...) | user-provided value |
+| AndroidIntentRedirectionTest.java:116:31:116:39 | fwdIntent | AndroidIntentRedirectionTest.java:12:34:12:44 | getIntent(...) : Intent | AndroidIntentRedirectionTest.java:116:31:116:39 | fwdIntent | Arbitrary Android activities or services can be started from a $@. | AndroidIntentRedirectionTest.java:12:34:12:44 | getIntent(...) | user-provided value |
+| AndroidIntentRedirectionTest.java:131:31:131:39 | fwdIntent | AndroidIntentRedirectionTest.java:12:34:12:44 | getIntent(...) : Intent | AndroidIntentRedirectionTest.java:131:31:131:39 | fwdIntent | Arbitrary Android activities or services can be started from a $@. | AndroidIntentRedirectionTest.java:12:34:12:44 | getIntent(...) | user-provided value |
+| AndroidIntentRedirectionTest.java:138:31:138:39 | fwdIntent | AndroidIntentRedirectionTest.java:12:34:12:44 | getIntent(...) : Intent | AndroidIntentRedirectionTest.java:138:31:138:39 | fwdIntent | Arbitrary Android activities or services can be started from a $@. | AndroidIntentRedirectionTest.java:12:34:12:44 | getIntent(...) | user-provided value |
+| AndroidIntentRedirectionTest.java:145:31:145:39 | fwdIntent | AndroidIntentRedirectionTest.java:12:34:12:44 | getIntent(...) : Intent | AndroidIntentRedirectionTest.java:145:31:145:39 | fwdIntent | Arbitrary Android activities or services can be started from a $@. | AndroidIntentRedirectionTest.java:12:34:12:44 | getIntent(...) | user-provided value |
+| AndroidIntentRedirectionTest.java:164:35:164:43 | fwdIntent | AndroidIntentRedirectionTest.java:161:41:161:51 | getIntent(...) : Intent | AndroidIntentRedirectionTest.java:164:35:164:43 | fwdIntent | Arbitrary Android activities or services can be started from a $@. | AndroidIntentRedirectionTest.java:161:41:161:51 | getIntent(...) | user-provided value |
+| AndroidIntentRedirectionTest.java:173:31:173:44 | originalIntent | AndroidIntentRedirectionTest.java:170:41:170:51 | getIntent(...) : Intent | AndroidIntentRedirectionTest.java:173:31:173:44 | originalIntent | Arbitrary Android activities or services can be started from a $@. | AndroidIntentRedirectionTest.java:170:41:170:51 | getIntent(...) | user-provided value |
+| AndroidIntentRedirectionTest.java:193:31:193:39 | fwdIntent | AndroidIntentRedirectionTest.java:192:52:192:62 | getIntent(...) : Intent | AndroidIntentRedirectionTest.java:193:31:193:39 | fwdIntent | Arbitrary Android activities or services can be started from a $@. | AndroidIntentRedirectionTest.java:192:52:192:62 | getIntent(...) | user-provided value |
+| AndroidIntentRedirectionTest.java:197:31:197:39 | fwdIntent | AndroidIntentRedirectionTest.java:196:53:196:63 | getIntent(...) : Intent | AndroidIntentRedirectionTest.java:197:31:197:39 | fwdIntent | Arbitrary Android activities or services can be started from a $@. | AndroidIntentRedirectionTest.java:196:53:196:63 | getIntent(...) | user-provided value |
+| AndroidIntentRedirectionTest.java:201:31:201:39 | fwdIntent | AndroidIntentRedirectionTest.java:200:56:200:66 | getIntent(...) : Intent | AndroidIntentRedirectionTest.java:201:31:201:39 | fwdIntent | Arbitrary Android activities or services can be started from a $@. | AndroidIntentRedirectionTest.java:200:56:200:66 | getIntent(...) | user-provided value |
+edges
+| AndroidIntentRedirectionTest.java:12:25:12:81 | (...)... : Intent | AndroidIntentRedirectionTest.java:15:39:15:44 | intent : Intent | provenance |  |
+| AndroidIntentRedirectionTest.java:12:25:12:81 | (...)... : Intent | AndroidIntentRedirectionTest.java:16:39:16:44 | intent : Intent | provenance |  |
+| AndroidIntentRedirectionTest.java:12:25:12:81 | (...)... : Intent | AndroidIntentRedirectionTest.java:17:23:17:28 | intent | provenance | Sink:MaD:227 |
+| AndroidIntentRedirectionTest.java:12:25:12:81 | (...)... : Intent | AndroidIntentRedirectionTest.java:18:23:18:28 | intent | provenance | Sink:MaD:227 |
+| AndroidIntentRedirectionTest.java:12:25:12:81 | (...)... : Intent | AndroidIntentRedirectionTest.java:19:29:19:34 | intent | provenance | Sink:MaD:228 |
+| AndroidIntentRedirectionTest.java:12:25:12:81 | (...)... : Intent | AndroidIntentRedirectionTest.java:20:31:20:36 | intent | provenance | Sink:MaD:3 |
+| AndroidIntentRedirectionTest.java:12:25:12:81 | (...)... : Intent | AndroidIntentRedirectionTest.java:21:32:21:37 | intent | provenance | Sink:MaD:4 |
+| AndroidIntentRedirectionTest.java:12:25:12:81 | (...)... : Intent | AndroidIntentRedirectionTest.java:22:32:22:37 | intent | provenance | Sink:MaD:5 |
+| AndroidIntentRedirectionTest.java:12:25:12:81 | (...)... : Intent | AndroidIntentRedirectionTest.java:23:38:23:43 | intent | provenance | Sink:MaD:6 |
+| AndroidIntentRedirectionTest.java:12:25:12:81 | (...)... : Intent | AndroidIntentRedirectionTest.java:24:38:24:43 | intent | provenance | Sink:MaD:7 |
+| AndroidIntentRedirectionTest.java:12:25:12:81 | (...)... : Intent | AndroidIntentRedirectionTest.java:25:38:25:43 | intent | provenance | Sink:MaD:7 |
+| AndroidIntentRedirectionTest.java:12:25:12:81 | (...)... : Intent | AndroidIntentRedirectionTest.java:26:38:26:43 | intent | provenance | Sink:MaD:7 |
+| AndroidIntentRedirectionTest.java:12:25:12:81 | (...)... : Intent | AndroidIntentRedirectionTest.java:29:22:29:27 | intent | provenance | Sink:MaD:233 |
+| AndroidIntentRedirectionTest.java:12:25:12:81 | (...)... : Intent | AndroidIntentRedirectionTest.java:30:28:30:33 | intent | provenance | Sink:MaD:234 |
+| AndroidIntentRedirectionTest.java:12:25:12:81 | (...)... : Intent | AndroidIntentRedirectionTest.java:31:32:31:37 | intent | provenance | Sink:MaD:232 |
+| AndroidIntentRedirectionTest.java:12:25:12:81 | (...)... : Intent | AndroidIntentRedirectionTest.java:32:23:32:28 | intent | provenance | Sink:MaD:219 |
+| AndroidIntentRedirectionTest.java:12:25:12:81 | (...)... : Intent | AndroidIntentRedirectionTest.java:33:23:33:28 | intent | provenance | Sink:MaD:219 |
+| AndroidIntentRedirectionTest.java:12:25:12:81 | (...)... : Intent | AndroidIntentRedirectionTest.java:34:29:34:34 | intent | provenance | Sink:MaD:220 |
+| AndroidIntentRedirectionTest.java:12:25:12:81 | (...)... : Intent | AndroidIntentRedirectionTest.java:35:29:35:34 | intent | provenance | Sink:MaD:220 |
+| AndroidIntentRedirectionTest.java:12:25:12:81 | (...)... : Intent | AndroidIntentRedirectionTest.java:36:46:36:51 | intent | provenance | Sink:MaD:221 |
+| AndroidIntentRedirectionTest.java:12:25:12:81 | (...)... : Intent | AndroidIntentRedirectionTest.java:37:29:37:34 | intent | provenance | Sink:MaD:222 |
+| AndroidIntentRedirectionTest.java:12:25:12:81 | (...)... : Intent | AndroidIntentRedirectionTest.java:38:35:38:40 | intent | provenance | Sink:MaD:223 |
+| AndroidIntentRedirectionTest.java:12:25:12:81 | (...)... : Intent | AndroidIntentRedirectionTest.java:39:36:39:41 | intent | provenance | Sink:MaD:224 |
+| AndroidIntentRedirectionTest.java:12:25:12:81 | (...)... : Intent | AndroidIntentRedirectionTest.java:40:42:40:47 | intent | provenance | Sink:MaD:225 |
+| AndroidIntentRedirectionTest.java:12:25:12:81 | (...)... : Intent | AndroidIntentRedirectionTest.java:47:27:47:32 | intent | provenance | Sink:MaD:227 |
+| AndroidIntentRedirectionTest.java:12:25:12:81 | (...)... : Intent | AndroidIntentRedirectionTest.java:49:27:49:32 | intent | provenance | Sink:MaD:227 |
+| AndroidIntentRedirectionTest.java:12:25:12:81 | (...)... : Intent | AndroidIntentRedirectionTest.java:52:27:52:32 | intent | provenance | Sink:MaD:227 |
+| AndroidIntentRedirectionTest.java:12:25:12:81 | (...)... : Intent | AndroidIntentRedirectionTest.java:54:27:54:32 | intent | provenance | Sink:MaD:227 |
+| AndroidIntentRedirectionTest.java:12:25:12:81 | (...)... : Intent | AndroidIntentRedirectionTest.java:61:27:61:32 | intent | provenance | Sink:MaD:227 |
+| AndroidIntentRedirectionTest.java:12:25:12:81 | (...)... : Intent | AndroidIntentRedirectionTest.java:73:56:73:61 | intent : Intent | provenance |  |
+| AndroidIntentRedirectionTest.java:12:25:12:81 | (...)... : Intent | AndroidIntentRedirectionTest.java:78:40:78:45 | intent : Intent | provenance |  |
+| AndroidIntentRedirectionTest.java:12:25:12:81 | (...)... : Intent | AndroidIntentRedirectionTest.java:83:40:83:45 | intent : Intent | provenance |  |
+| AndroidIntentRedirectionTest.java:12:25:12:81 | (...)... : Intent | AndroidIntentRedirectionTest.java:84:25:84:30 | intent : Intent | provenance |  |
+| AndroidIntentRedirectionTest.java:12:25:12:81 | (...)... : Intent | AndroidIntentRedirectionTest.java:95:38:95:43 | intent : Intent | provenance |  |
+| AndroidIntentRedirectionTest.java:12:25:12:81 | (...)... : Intent | AndroidIntentRedirectionTest.java:101:43:101:48 | intent : Intent | provenance |  |
+| AndroidIntentRedirectionTest.java:12:25:12:81 | (...)... : Intent | AndroidIntentRedirectionTest.java:107:65:107:70 | intent : Intent | provenance |  |
+| AndroidIntentRedirectionTest.java:12:25:12:81 | (...)... : Intent | AndroidIntentRedirectionTest.java:114:59:114:64 | intent : Intent | provenance |  |
+| AndroidIntentRedirectionTest.java:12:25:12:81 | (...)... : Intent | AndroidIntentRedirectionTest.java:129:58:129:63 | intent : Intent | provenance |  |
+| AndroidIntentRedirectionTest.java:12:25:12:81 | (...)... : Intent | AndroidIntentRedirectionTest.java:136:54:136:59 | intent : Intent | provenance |  |
+| AndroidIntentRedirectionTest.java:12:25:12:81 | (...)... : Intent | AndroidIntentRedirectionTest.java:143:25:143:30 | intent : Intent | provenance |  |
+| AndroidIntentRedirectionTest.java:12:34:12:44 | getIntent(...) : Intent | AndroidIntentRedirectionTest.java:12:34:12:81 | getParcelableExtra(...) : Parcelable | provenance | MaD:326 |
+| AndroidIntentRedirectionTest.java:12:34:12:81 | getParcelableExtra(...) : Parcelable | AndroidIntentRedirectionTest.java:12:25:12:81 | (...)... : Intent | provenance |  |
+| AndroidIntentRedirectionTest.java:15:25:15:45 | {...} : Intent[] [[]] : Intent | AndroidIntentRedirectionTest.java:15:25:15:45 | new Intent[] | provenance | Sink:MaD:226 |
+| AndroidIntentRedirectionTest.java:15:39:15:44 | intent : Intent | AndroidIntentRedirectionTest.java:15:25:15:45 | {...} : Intent[] [[]] : Intent | provenance |  |
+| AndroidIntentRedirectionTest.java:16:25:16:45 | {...} : Intent[] [[]] : Intent | AndroidIntentRedirectionTest.java:16:25:16:45 | new Intent[] | provenance | Sink:MaD:226 |
+| AndroidIntentRedirectionTest.java:16:39:16:44 | intent : Intent | AndroidIntentRedirectionTest.java:16:25:16:45 | {...} : Intent[] [[]] : Intent | provenance |  |
+| AndroidIntentRedirectionTest.java:67:30:67:40 | getIntent(...) : Intent | AndroidIntentRedirectionTest.java:67:30:67:77 | getParcelableExtra(...) : Parcelable | provenance | MaD:326 |
+| AndroidIntentRedirectionTest.java:67:30:67:77 | getParcelableExtra(...) : Parcelable | AndroidIntentRedirectionTest.java:68:36:68:47 | (...)... : Intent | provenance |  |
+| AndroidIntentRedirectionTest.java:68:36:68:47 | (...)... : Intent | AndroidIntentRedirectionTest.java:69:31:69:39 | fwdIntent | provenance | Sink:MaD:227 |
+| AndroidIntentRedirectionTest.java:73:17:73:25 | fwdIntent [post update] : Intent | AndroidIntentRedirectionTest.java:74:31:74:39 | fwdIntent | provenance | Sink:MaD:227 |
+| AndroidIntentRedirectionTest.java:73:56:73:61 | intent : Intent | AndroidIntentRedirectionTest.java:73:56:73:89 | getStringExtra(...) : String | provenance | MaD:330 |
+| AndroidIntentRedirectionTest.java:73:56:73:89 | getStringExtra(...) : String | AndroidIntentRedirectionTest.java:73:17:73:25 | fwdIntent [post update] : Intent | provenance | MaD:363 |
+| AndroidIntentRedirectionTest.java:78:17:78:25 | fwdIntent [post update] : Intent | AndroidIntentRedirectionTest.java:79:31:79:39 | fwdIntent | provenance | Sink:MaD:227 |
+| AndroidIntentRedirectionTest.java:78:40:78:45 | intent : Intent | AndroidIntentRedirectionTest.java:78:40:78:75 | getStringExtra(...) : String | provenance | MaD:330 |
+| AndroidIntentRedirectionTest.java:78:40:78:75 | getStringExtra(...) : String | AndroidIntentRedirectionTest.java:78:17:78:25 | fwdIntent [post update] : Intent | provenance | MaD:364 |
+| AndroidIntentRedirectionTest.java:83:17:83:25 | fwdIntent [post update] : Intent | AndroidIntentRedirectionTest.java:85:31:85:39 | fwdIntent | provenance | Sink:MaD:227 |
+| AndroidIntentRedirectionTest.java:83:40:83:45 | intent : Intent | AndroidIntentRedirectionTest.java:83:40:83:75 | getStringExtra(...) : String | provenance | MaD:330 |
+| AndroidIntentRedirectionTest.java:83:40:83:75 | getStringExtra(...) : String | AndroidIntentRedirectionTest.java:83:17:83:25 | fwdIntent [post update] : Intent | provenance | MaD:364 |
+| AndroidIntentRedirectionTest.java:84:25:84:30 | intent : Intent | AndroidIntentRedirectionTest.java:84:25:84:58 | getStringExtra(...) : String | provenance | MaD:330 |
+| AndroidIntentRedirectionTest.java:84:25:84:58 | getStringExtra(...) : String | AndroidIntentRedirectionTest.java:83:17:83:25 | fwdIntent [post update] : Intent | provenance | MaD:364 |
+| AndroidIntentRedirectionTest.java:95:17:95:25 | fwdIntent [post update] : Intent | AndroidIntentRedirectionTest.java:96:31:96:39 | fwdIntent | provenance | Sink:MaD:227 |
+| AndroidIntentRedirectionTest.java:95:38:95:43 | intent : Intent | AndroidIntentRedirectionTest.java:95:38:95:73 | getStringExtra(...) : String | provenance | MaD:330 |
+| AndroidIntentRedirectionTest.java:95:38:95:73 | getStringExtra(...) : String | AndroidIntentRedirectionTest.java:95:17:95:25 | fwdIntent [post update] : Intent | provenance | MaD:378 |
+| AndroidIntentRedirectionTest.java:101:25:101:85 | new ComponentName(...) : ComponentName | AndroidIntentRedirectionTest.java:102:40:102:48 | component : ComponentName | provenance |  |
+| AndroidIntentRedirectionTest.java:101:43:101:48 | intent : Intent | AndroidIntentRedirectionTest.java:101:43:101:78 | getStringExtra(...) : String | provenance | MaD:330 |
+| AndroidIntentRedirectionTest.java:101:43:101:78 | getStringExtra(...) : String | AndroidIntentRedirectionTest.java:101:25:101:85 | new ComponentName(...) : ComponentName | provenance | MaD:238 |
+| AndroidIntentRedirectionTest.java:102:17:102:25 | fwdIntent [post update] : Intent | AndroidIntentRedirectionTest.java:103:31:103:39 | fwdIntent | provenance | Sink:MaD:227 |
+| AndroidIntentRedirectionTest.java:102:40:102:48 | component : ComponentName | AndroidIntentRedirectionTest.java:102:17:102:25 | fwdIntent [post update] : Intent | provenance | MaD:366 |
+| AndroidIntentRedirectionTest.java:107:43:107:99 | new ComponentName(...) : ComponentName | AndroidIntentRedirectionTest.java:108:40:108:48 | component : ComponentName | provenance |  |
+| AndroidIntentRedirectionTest.java:107:65:107:70 | intent : Intent | AndroidIntentRedirectionTest.java:107:65:107:98 | getStringExtra(...) : String | provenance | MaD:330 |
+| AndroidIntentRedirectionTest.java:107:65:107:98 | getStringExtra(...) : String | AndroidIntentRedirectionTest.java:107:43:107:99 | new ComponentName(...) : ComponentName | provenance | MaD:238 |
+| AndroidIntentRedirectionTest.java:108:17:108:25 | fwdIntent [post update] : Intent | AndroidIntentRedirectionTest.java:109:31:109:39 | fwdIntent | provenance | Sink:MaD:227 |
+| AndroidIntentRedirectionTest.java:108:40:108:48 | component : ComponentName | AndroidIntentRedirectionTest.java:108:17:108:25 | fwdIntent [post update] : Intent | provenance | MaD:366 |
+| AndroidIntentRedirectionTest.java:114:25:114:93 | new ComponentName(...) : ComponentName | AndroidIntentRedirectionTest.java:115:40:115:48 | component : ComponentName | provenance |  |
+| AndroidIntentRedirectionTest.java:114:59:114:64 | intent : Intent | AndroidIntentRedirectionTest.java:114:59:114:92 | getStringExtra(...) : String | provenance | MaD:330 |
+| AndroidIntentRedirectionTest.java:114:59:114:92 | getStringExtra(...) : String | AndroidIntentRedirectionTest.java:114:25:114:93 | new ComponentName(...) : ComponentName | provenance | MaD:236 |
+| AndroidIntentRedirectionTest.java:115:17:115:25 | fwdIntent [post update] : Intent | AndroidIntentRedirectionTest.java:116:31:116:39 | fwdIntent | provenance | Sink:MaD:227 |
+| AndroidIntentRedirectionTest.java:115:40:115:48 | component : ComponentName | AndroidIntentRedirectionTest.java:115:17:115:25 | fwdIntent [post update] : Intent | provenance | MaD:366 |
+| AndroidIntentRedirectionTest.java:129:25:129:92 | createRelative(...) : ComponentName | AndroidIntentRedirectionTest.java:130:40:130:48 | component : ComponentName | provenance |  |
+| AndroidIntentRedirectionTest.java:129:58:129:63 | intent : Intent | AndroidIntentRedirectionTest.java:129:58:129:91 | getStringExtra(...) : String | provenance | MaD:330 |
+| AndroidIntentRedirectionTest.java:129:58:129:91 | getStringExtra(...) : String | AndroidIntentRedirectionTest.java:129:25:129:92 | createRelative(...) : ComponentName | provenance | MaD:240 |
+| AndroidIntentRedirectionTest.java:130:17:130:25 | fwdIntent [post update] : Intent | AndroidIntentRedirectionTest.java:131:31:131:39 | fwdIntent | provenance | Sink:MaD:227 |
+| AndroidIntentRedirectionTest.java:130:40:130:48 | component : ComponentName | AndroidIntentRedirectionTest.java:130:17:130:25 | fwdIntent [post update] : Intent | provenance | MaD:366 |
+| AndroidIntentRedirectionTest.java:136:25:136:94 | createRelative(...) : ComponentName | AndroidIntentRedirectionTest.java:137:40:137:48 | component : ComponentName | provenance |  |
+| AndroidIntentRedirectionTest.java:136:54:136:59 | intent : Intent | AndroidIntentRedirectionTest.java:136:54:136:89 | getStringExtra(...) : String | provenance | MaD:330 |
+| AndroidIntentRedirectionTest.java:136:54:136:89 | getStringExtra(...) : String | AndroidIntentRedirectionTest.java:136:25:136:94 | createRelative(...) : ComponentName | provenance | MaD:240 |
+| AndroidIntentRedirectionTest.java:137:17:137:25 | fwdIntent [post update] : Intent | AndroidIntentRedirectionTest.java:138:31:138:39 | fwdIntent | provenance | Sink:MaD:227 |
+| AndroidIntentRedirectionTest.java:137:40:137:48 | component : ComponentName | AndroidIntentRedirectionTest.java:137:17:137:25 | fwdIntent [post update] : Intent | provenance | MaD:366 |
+| AndroidIntentRedirectionTest.java:142:43:143:59 | createRelative(...) : ComponentName | AndroidIntentRedirectionTest.java:144:40:144:48 | component : ComponentName | provenance |  |
+| AndroidIntentRedirectionTest.java:143:25:143:30 | intent : Intent | AndroidIntentRedirectionTest.java:143:25:143:58 | getStringExtra(...) : String | provenance | MaD:330 |
+| AndroidIntentRedirectionTest.java:143:25:143:58 | getStringExtra(...) : String | AndroidIntentRedirectionTest.java:142:43:143:59 | createRelative(...) : ComponentName | provenance | MaD:239 |
+| AndroidIntentRedirectionTest.java:144:17:144:25 | fwdIntent [post update] : Intent | AndroidIntentRedirectionTest.java:145:31:145:39 | fwdIntent | provenance | Sink:MaD:227 |
+| AndroidIntentRedirectionTest.java:144:40:144:48 | component : ComponentName | AndroidIntentRedirectionTest.java:144:17:144:25 | fwdIntent [post update] : Intent | provenance | MaD:366 |
+| AndroidIntentRedirectionTest.java:161:41:161:51 | getIntent(...) : Intent | AndroidIntentRedirectionTest.java:162:45:162:58 | originalIntent : Intent | provenance |  |
+| AndroidIntentRedirectionTest.java:162:36:162:95 | (...)... : Intent | AndroidIntentRedirectionTest.java:164:35:164:43 | fwdIntent | provenance | Sink:MaD:227 |
+| AndroidIntentRedirectionTest.java:162:45:162:58 | originalIntent : Intent | AndroidIntentRedirectionTest.java:162:45:162:95 | getParcelableExtra(...) : Parcelable | provenance | MaD:326 |
+| AndroidIntentRedirectionTest.java:162:45:162:95 | getParcelableExtra(...) : Parcelable | AndroidIntentRedirectionTest.java:162:36:162:95 | (...)... : Intent | provenance |  |
+| AndroidIntentRedirectionTest.java:170:41:170:51 | getIntent(...) : Intent | AndroidIntentRedirectionTest.java:171:45:171:58 | originalIntent : Intent | provenance |  |
+| AndroidIntentRedirectionTest.java:170:41:170:51 | getIntent(...) : Intent | AndroidIntentRedirectionTest.java:172:25:172:38 | originalIntent : Intent | provenance |  |
+| AndroidIntentRedirectionTest.java:170:41:170:51 | getIntent(...) : Intent | AndroidIntentRedirectionTest.java:173:31:173:44 | originalIntent | provenance | Sink:MaD:227 |
+| AndroidIntentRedirectionTest.java:171:17:171:30 | originalIntent [post update] : Intent | AndroidIntentRedirectionTest.java:171:45:171:58 | originalIntent : Intent | provenance |  |
+| AndroidIntentRedirectionTest.java:171:17:171:30 | originalIntent [post update] : Intent | AndroidIntentRedirectionTest.java:172:25:172:38 | originalIntent : Intent | provenance |  |
+| AndroidIntentRedirectionTest.java:171:17:171:30 | originalIntent [post update] : Intent | AndroidIntentRedirectionTest.java:173:31:173:44 | originalIntent | provenance | Sink:MaD:227 |
+| AndroidIntentRedirectionTest.java:171:45:171:58 | originalIntent : Intent | AndroidIntentRedirectionTest.java:171:45:171:89 | getStringExtra(...) : String | provenance | MaD:330 |
+| AndroidIntentRedirectionTest.java:171:45:171:89 | getStringExtra(...) : String | AndroidIntentRedirectionTest.java:171:17:171:30 | originalIntent [post update] : Intent | provenance | MaD:364 |
+| AndroidIntentRedirectionTest.java:172:25:172:38 | originalIntent : Intent | AndroidIntentRedirectionTest.java:172:25:172:67 | getStringExtra(...) : String | provenance | MaD:330 |
+| AndroidIntentRedirectionTest.java:172:25:172:67 | getStringExtra(...) : String | AndroidIntentRedirectionTest.java:171:17:171:30 | originalIntent [post update] : Intent | provenance | MaD:364 |
+| AndroidIntentRedirectionTest.java:192:36:192:88 | parseUri(...) : Intent | AndroidIntentRedirectionTest.java:193:31:193:39 | fwdIntent | provenance | Sink:MaD:227 |
+| AndroidIntentRedirectionTest.java:192:52:192:62 | getIntent(...) : Intent | AndroidIntentRedirectionTest.java:192:52:192:84 | getStringExtra(...) : String | provenance | MaD:330 |
+| AndroidIntentRedirectionTest.java:192:52:192:84 | getStringExtra(...) : String | AndroidIntentRedirectionTest.java:192:36:192:88 | parseUri(...) : Intent | provenance | MaD:332 |
+| AndroidIntentRedirectionTest.java:196:36:196:86 | getIntent(...) : Intent | AndroidIntentRedirectionTest.java:197:31:197:39 | fwdIntent | provenance | Sink:MaD:227 |
+| AndroidIntentRedirectionTest.java:196:53:196:63 | getIntent(...) : Intent | AndroidIntentRedirectionTest.java:196:53:196:85 | getStringExtra(...) : String | provenance | MaD:330 |
+| AndroidIntentRedirectionTest.java:196:53:196:85 | getStringExtra(...) : String | AndroidIntentRedirectionTest.java:196:36:196:86 | getIntent(...) : Intent | provenance | MaD:321 |
+| AndroidIntentRedirectionTest.java:200:36:200:89 | getIntentOld(...) : Intent | AndroidIntentRedirectionTest.java:201:31:201:39 | fwdIntent | provenance | Sink:MaD:227 |
+| AndroidIntentRedirectionTest.java:200:56:200:66 | getIntent(...) : Intent | AndroidIntentRedirectionTest.java:200:56:200:88 | getStringExtra(...) : String | provenance | MaD:330 |
+| AndroidIntentRedirectionTest.java:200:56:200:88 | getStringExtra(...) : String | AndroidIntentRedirectionTest.java:200:36:200:89 | getIntentOld(...) : Intent | provenance | MaD:323 |
+nodes
+| AndroidIntentRedirectionTest.java:12:25:12:81 | (...)... : Intent | semmle.label | (...)... : Intent |
+| AndroidIntentRedirectionTest.java:12:34:12:44 | getIntent(...) : Intent | semmle.label | getIntent(...) : Intent |
+| AndroidIntentRedirectionTest.java:12:34:12:81 | getParcelableExtra(...) : Parcelable | semmle.label | getParcelableExtra(...) : Parcelable |
+| AndroidIntentRedirectionTest.java:15:25:15:45 | new Intent[] | semmle.label | new Intent[] |
+| AndroidIntentRedirectionTest.java:15:25:15:45 | {...} : Intent[] [[]] : Intent | semmle.label | {...} : Intent[] [[]] : Intent |
+| AndroidIntentRedirectionTest.java:15:39:15:44 | intent : Intent | semmle.label | intent : Intent |
+| AndroidIntentRedirectionTest.java:16:25:16:45 | new Intent[] | semmle.label | new Intent[] |
+| AndroidIntentRedirectionTest.java:16:25:16:45 | {...} : Intent[] [[]] : Intent | semmle.label | {...} : Intent[] [[]] : Intent |
+| AndroidIntentRedirectionTest.java:16:39:16:44 | intent : Intent | semmle.label | intent : Intent |
+| AndroidIntentRedirectionTest.java:17:23:17:28 | intent | semmle.label | intent |
+| AndroidIntentRedirectionTest.java:18:23:18:28 | intent | semmle.label | intent |
+| AndroidIntentRedirectionTest.java:19:29:19:34 | intent | semmle.label | intent |
+| AndroidIntentRedirectionTest.java:20:31:20:36 | intent | semmle.label | intent |
+| AndroidIntentRedirectionTest.java:21:32:21:37 | intent | semmle.label | intent |
+| AndroidIntentRedirectionTest.java:22:32:22:37 | intent | semmle.label | intent |
+| AndroidIntentRedirectionTest.java:23:38:23:43 | intent | semmle.label | intent |
+| AndroidIntentRedirectionTest.java:24:38:24:43 | intent | semmle.label | intent |
+| AndroidIntentRedirectionTest.java:25:38:25:43 | intent | semmle.label | intent |
+| AndroidIntentRedirectionTest.java:26:38:26:43 | intent | semmle.label | intent |
+| AndroidIntentRedirectionTest.java:29:22:29:27 | intent | semmle.label | intent |
+| AndroidIntentRedirectionTest.java:30:28:30:33 | intent | semmle.label | intent |
+| AndroidIntentRedirectionTest.java:31:32:31:37 | intent | semmle.label | intent |
+| AndroidIntentRedirectionTest.java:32:23:32:28 | intent | semmle.label | intent |
+| AndroidIntentRedirectionTest.java:33:23:33:28 | intent | semmle.label | intent |
+| AndroidIntentRedirectionTest.java:34:29:34:34 | intent | semmle.label | intent |
+| AndroidIntentRedirectionTest.java:35:29:35:34 | intent | semmle.label | intent |
+| AndroidIntentRedirectionTest.java:36:46:36:51 | intent | semmle.label | intent |
+| AndroidIntentRedirectionTest.java:37:29:37:34 | intent | semmle.label | intent |
+| AndroidIntentRedirectionTest.java:38:35:38:40 | intent | semmle.label | intent |
+| AndroidIntentRedirectionTest.java:39:36:39:41 | intent | semmle.label | intent |
+| AndroidIntentRedirectionTest.java:40:42:40:47 | intent | semmle.label | intent |
+| AndroidIntentRedirectionTest.java:47:27:47:32 | intent | semmle.label | intent |
+| AndroidIntentRedirectionTest.java:49:27:49:32 | intent | semmle.label | intent |
+| AndroidIntentRedirectionTest.java:52:27:52:32 | intent | semmle.label | intent |
+| AndroidIntentRedirectionTest.java:54:27:54:32 | intent | semmle.label | intent |
+| AndroidIntentRedirectionTest.java:61:27:61:32 | intent | semmle.label | intent |
+| AndroidIntentRedirectionTest.java:67:30:67:40 | getIntent(...) : Intent | semmle.label | getIntent(...) : Intent |
+| AndroidIntentRedirectionTest.java:67:30:67:77 | getParcelableExtra(...) : Parcelable | semmle.label | getParcelableExtra(...) : Parcelable |
+| AndroidIntentRedirectionTest.java:68:36:68:47 | (...)... : Intent | semmle.label | (...)... : Intent |
+| AndroidIntentRedirectionTest.java:69:31:69:39 | fwdIntent | semmle.label | fwdIntent |
+| AndroidIntentRedirectionTest.java:73:17:73:25 | fwdIntent [post update] : Intent | semmle.label | fwdIntent [post update] : Intent |
+| AndroidIntentRedirectionTest.java:73:56:73:61 | intent : Intent | semmle.label | intent : Intent |
+| AndroidIntentRedirectionTest.java:73:56:73:89 | getStringExtra(...) : String | semmle.label | getStringExtra(...) : String |
+| AndroidIntentRedirectionTest.java:74:31:74:39 | fwdIntent | semmle.label | fwdIntent |
+| AndroidIntentRedirectionTest.java:78:17:78:25 | fwdIntent [post update] : Intent | semmle.label | fwdIntent [post update] : Intent |
+| AndroidIntentRedirectionTest.java:78:40:78:45 | intent : Intent | semmle.label | intent : Intent |
+| AndroidIntentRedirectionTest.java:78:40:78:75 | getStringExtra(...) : String | semmle.label | getStringExtra(...) : String |
+| AndroidIntentRedirectionTest.java:79:31:79:39 | fwdIntent | semmle.label | fwdIntent |
+| AndroidIntentRedirectionTest.java:83:17:83:25 | fwdIntent [post update] : Intent | semmle.label | fwdIntent [post update] : Intent |
+| AndroidIntentRedirectionTest.java:83:40:83:45 | intent : Intent | semmle.label | intent : Intent |
+| AndroidIntentRedirectionTest.java:83:40:83:75 | getStringExtra(...) : String | semmle.label | getStringExtra(...) : String |
+| AndroidIntentRedirectionTest.java:84:25:84:30 | intent : Intent | semmle.label | intent : Intent |
+| AndroidIntentRedirectionTest.java:84:25:84:58 | getStringExtra(...) : String | semmle.label | getStringExtra(...) : String |
+| AndroidIntentRedirectionTest.java:85:31:85:39 | fwdIntent | semmle.label | fwdIntent |
+| AndroidIntentRedirectionTest.java:95:17:95:25 | fwdIntent [post update] : Intent | semmle.label | fwdIntent [post update] : Intent |
+| AndroidIntentRedirectionTest.java:95:38:95:43 | intent : Intent | semmle.label | intent : Intent |
+| AndroidIntentRedirectionTest.java:95:38:95:73 | getStringExtra(...) : String | semmle.label | getStringExtra(...) : String |
+| AndroidIntentRedirectionTest.java:96:31:96:39 | fwdIntent | semmle.label | fwdIntent |
+| AndroidIntentRedirectionTest.java:101:25:101:85 | new ComponentName(...) : ComponentName | semmle.label | new ComponentName(...) : ComponentName |
+| AndroidIntentRedirectionTest.java:101:43:101:48 | intent : Intent | semmle.label | intent : Intent |
+| AndroidIntentRedirectionTest.java:101:43:101:78 | getStringExtra(...) : String | semmle.label | getStringExtra(...) : String |
+| AndroidIntentRedirectionTest.java:102:17:102:25 | fwdIntent [post update] : Intent | semmle.label | fwdIntent [post update] : Intent |
+| AndroidIntentRedirectionTest.java:102:40:102:48 | component : ComponentName | semmle.label | component : ComponentName |
+| AndroidIntentRedirectionTest.java:103:31:103:39 | fwdIntent | semmle.label | fwdIntent |
+| AndroidIntentRedirectionTest.java:107:43:107:99 | new ComponentName(...) : ComponentName | semmle.label | new ComponentName(...) : ComponentName |
+| AndroidIntentRedirectionTest.java:107:65:107:70 | intent : Intent | semmle.label | intent : Intent |
+| AndroidIntentRedirectionTest.java:107:65:107:98 | getStringExtra(...) : String | semmle.label | getStringExtra(...) : String |
+| AndroidIntentRedirectionTest.java:108:17:108:25 | fwdIntent [post update] : Intent | semmle.label | fwdIntent [post update] : Intent |
+| AndroidIntentRedirectionTest.java:108:40:108:48 | component : ComponentName | semmle.label | component : ComponentName |
+| AndroidIntentRedirectionTest.java:109:31:109:39 | fwdIntent | semmle.label | fwdIntent |
+| AndroidIntentRedirectionTest.java:114:25:114:93 | new ComponentName(...) : ComponentName | semmle.label | new ComponentName(...) : ComponentName |
+| AndroidIntentRedirectionTest.java:114:59:114:64 | intent : Intent | semmle.label | intent : Intent |
+| AndroidIntentRedirectionTest.java:114:59:114:92 | getStringExtra(...) : String | semmle.label | getStringExtra(...) : String |
+| AndroidIntentRedirectionTest.java:115:17:115:25 | fwdIntent [post update] : Intent | semmle.label | fwdIntent [post update] : Intent |
+| AndroidIntentRedirectionTest.java:115:40:115:48 | component : ComponentName | semmle.label | component : ComponentName |
+| AndroidIntentRedirectionTest.java:116:31:116:39 | fwdIntent | semmle.label | fwdIntent |
+| AndroidIntentRedirectionTest.java:129:25:129:92 | createRelative(...) : ComponentName | semmle.label | createRelative(...) : ComponentName |
+| AndroidIntentRedirectionTest.java:129:58:129:63 | intent : Intent | semmle.label | intent : Intent |
+| AndroidIntentRedirectionTest.java:129:58:129:91 | getStringExtra(...) : String | semmle.label | getStringExtra(...) : String |
+| AndroidIntentRedirectionTest.java:130:17:130:25 | fwdIntent [post update] : Intent | semmle.label | fwdIntent [post update] : Intent |
+| AndroidIntentRedirectionTest.java:130:40:130:48 | component : ComponentName | semmle.label | component : ComponentName |
+| AndroidIntentRedirectionTest.java:131:31:131:39 | fwdIntent | semmle.label | fwdIntent |
+| AndroidIntentRedirectionTest.java:136:25:136:94 | createRelative(...) : ComponentName | semmle.label | createRelative(...) : ComponentName |
+| AndroidIntentRedirectionTest.java:136:54:136:59 | intent : Intent | semmle.label | intent : Intent |
+| AndroidIntentRedirectionTest.java:136:54:136:89 | getStringExtra(...) : String | semmle.label | getStringExtra(...) : String |
+| AndroidIntentRedirectionTest.java:137:17:137:25 | fwdIntent [post update] : Intent | semmle.label | fwdIntent [post update] : Intent |
+| AndroidIntentRedirectionTest.java:137:40:137:48 | component : ComponentName | semmle.label | component : ComponentName |
+| AndroidIntentRedirectionTest.java:138:31:138:39 | fwdIntent | semmle.label | fwdIntent |
+| AndroidIntentRedirectionTest.java:142:43:143:59 | createRelative(...) : ComponentName | semmle.label | createRelative(...) : ComponentName |
+| AndroidIntentRedirectionTest.java:143:25:143:30 | intent : Intent | semmle.label | intent : Intent |
+| AndroidIntentRedirectionTest.java:143:25:143:58 | getStringExtra(...) : String | semmle.label | getStringExtra(...) : String |
+| AndroidIntentRedirectionTest.java:144:17:144:25 | fwdIntent [post update] : Intent | semmle.label | fwdIntent [post update] : Intent |
+| AndroidIntentRedirectionTest.java:144:40:144:48 | component : ComponentName | semmle.label | component : ComponentName |
+| AndroidIntentRedirectionTest.java:145:31:145:39 | fwdIntent | semmle.label | fwdIntent |
+| AndroidIntentRedirectionTest.java:161:41:161:51 | getIntent(...) : Intent | semmle.label | getIntent(...) : Intent |
+| AndroidIntentRedirectionTest.java:162:36:162:95 | (...)... : Intent | semmle.label | (...)... : Intent |
+| AndroidIntentRedirectionTest.java:162:45:162:58 | originalIntent : Intent | semmle.label | originalIntent : Intent |
+| AndroidIntentRedirectionTest.java:162:45:162:95 | getParcelableExtra(...) : Parcelable | semmle.label | getParcelableExtra(...) : Parcelable |
+| AndroidIntentRedirectionTest.java:164:35:164:43 | fwdIntent | semmle.label | fwdIntent |
+| AndroidIntentRedirectionTest.java:170:41:170:51 | getIntent(...) : Intent | semmle.label | getIntent(...) : Intent |
+| AndroidIntentRedirectionTest.java:171:17:171:30 | originalIntent [post update] : Intent | semmle.label | originalIntent [post update] : Intent |
+| AndroidIntentRedirectionTest.java:171:45:171:58 | originalIntent : Intent | semmle.label | originalIntent : Intent |
+| AndroidIntentRedirectionTest.java:171:45:171:89 | getStringExtra(...) : String | semmle.label | getStringExtra(...) : String |
+| AndroidIntentRedirectionTest.java:172:25:172:38 | originalIntent : Intent | semmle.label | originalIntent : Intent |
+| AndroidIntentRedirectionTest.java:172:25:172:67 | getStringExtra(...) : String | semmle.label | getStringExtra(...) : String |
+| AndroidIntentRedirectionTest.java:173:31:173:44 | originalIntent | semmle.label | originalIntent |
+| AndroidIntentRedirectionTest.java:192:36:192:88 | parseUri(...) : Intent | semmle.label | parseUri(...) : Intent |
+| AndroidIntentRedirectionTest.java:192:52:192:62 | getIntent(...) : Intent | semmle.label | getIntent(...) : Intent |
+| AndroidIntentRedirectionTest.java:192:52:192:84 | getStringExtra(...) : String | semmle.label | getStringExtra(...) : String |
+| AndroidIntentRedirectionTest.java:193:31:193:39 | fwdIntent | semmle.label | fwdIntent |
+| AndroidIntentRedirectionTest.java:196:36:196:86 | getIntent(...) : Intent | semmle.label | getIntent(...) : Intent |
+| AndroidIntentRedirectionTest.java:196:53:196:63 | getIntent(...) : Intent | semmle.label | getIntent(...) : Intent |
+| AndroidIntentRedirectionTest.java:196:53:196:85 | getStringExtra(...) : String | semmle.label | getStringExtra(...) : String |
+| AndroidIntentRedirectionTest.java:197:31:197:39 | fwdIntent | semmle.label | fwdIntent |
+| AndroidIntentRedirectionTest.java:200:36:200:89 | getIntentOld(...) : Intent | semmle.label | getIntentOld(...) : Intent |
+| AndroidIntentRedirectionTest.java:200:56:200:66 | getIntent(...) : Intent | semmle.label | getIntent(...) : Intent |
+| AndroidIntentRedirectionTest.java:200:56:200:88 | getStringExtra(...) : String | semmle.label | getStringExtra(...) : String |
+| AndroidIntentRedirectionTest.java:201:31:201:39 | fwdIntent | semmle.label | fwdIntent |
+subpaths
diff --git a/java/ql/test/query-tests/security/CWE-940/AndroidIntentRedirectionTest.java b/java/ql/test/query-tests/security/CWE-940/AndroidIntentRedirectionTest.java
index 2ce945461b6..c9d40977c8a 100644
--- a/java/ql/test/query-tests/security/CWE-940/AndroidIntentRedirectionTest.java
+++ b/java/ql/test/query-tests/security/CWE-940/AndroidIntentRedirectionTest.java
@@ -9,80 +9,80 @@ import android.os.Bundle;
 public class AndroidIntentRedirectionTest extends Activity {
 
     public void onCreate(Bundle savedInstanceState) {
-        Intent intent = (Intent) getIntent().getParcelableExtra("forward_intent");
+        Intent intent = (Intent) getIntent().getParcelableExtra("forward_intent"); // $ Source=intent
 
         // @formatter:off
-        startActivities(new Intent[] {intent}); // $ hasAndroidIntentRedirection
-        startActivities(new Intent[] {intent}, null); // $ hasAndroidIntentRedirection
-        startActivity(intent); // $ hasAndroidIntentRedirection
-        startActivity(intent, null); // $ hasAndroidIntentRedirection
-        startActivityAsUser(intent, null); // $ hasAndroidIntentRedirection
-        startActivityAsCaller(intent, null, false, 0); // $ hasAndroidIntentRedirection
-        startActivityForResult(intent, 0); // $ hasAndroidIntentRedirection
-        startActivityForResult(intent, 0, null); // $ hasAndroidIntentRedirection
-        startActivityForResult(null, intent, 0, null); // $ hasAndroidIntentRedirection
-        startActivityForResultAsUser(intent, null, 0, null, null); // $ hasAndroidIntentRedirection
-        startActivityForResultAsUser(intent, 0, null, null); // $ hasAndroidIntentRedirection
-        startActivityForResultAsUser(intent, 0, null); // $ hasAndroidIntentRedirection
+        startActivities(new Intent[] {intent}); // $ Alert=intent
+        startActivities(new Intent[] {intent}, null); // $ Alert=intent
+        startActivity(intent); // $ Alert=intent
+        startActivity(intent, null); // $ Alert=intent
+        startActivityAsUser(intent, null); // $ Alert=intent
+        startActivityAsCaller(intent, null, false, 0); // $ Alert=intent
+        startActivityForResult(intent, 0); // $ Alert=intent
+        startActivityForResult(intent, 0, null); // $ Alert=intent
+        startActivityForResult(null, intent, 0, null); // $ Alert=intent
+        startActivityForResultAsUser(intent, null, 0, null, null); // $ Alert=intent
+        startActivityForResultAsUser(intent, 0, null, null); // $ Alert=intent
+        startActivityForResultAsUser(intent, 0, null); // $ Alert=intent
         bindService(intent, null, 0);
         bindServiceAsUser(intent, null, 0, null);
-        startService(intent); // $ hasAndroidIntentRedirection
-        startServiceAsUser(intent, null); // $ hasAndroidIntentRedirection
-        startForegroundService(intent); // $ hasAndroidIntentRedirection
-        sendBroadcast(intent); // $ hasAndroidIntentRedirection
-        sendBroadcast(intent, null); // $ hasAndroidIntentRedirection
-        sendBroadcastAsUser(intent, null); // $ hasAndroidIntentRedirection
-        sendBroadcastAsUser(intent, null, null); // $ hasAndroidIntentRedirection
-        sendBroadcastWithMultiplePermissions(intent, null); // $ hasAndroidIntentRedirection
-        sendStickyBroadcast(intent); // $ hasAndroidIntentRedirection
-        sendStickyBroadcastAsUser(intent, null); // $ hasAndroidIntentRedirection
-        sendStickyOrderedBroadcast(intent, null, null, 0, null, null); // $ hasAndroidIntentRedirection
-        sendStickyOrderedBroadcastAsUser(intent, null, null, null, 0, null, null); // $ hasAndroidIntentRedirection
+        startService(intent); // $ Alert=intent
+        startServiceAsUser(intent, null); // $ Alert=intent
+        startForegroundService(intent); // $ Alert=intent
+        sendBroadcast(intent); // $ Alert=intent
+        sendBroadcast(intent, null); // $ Alert=intent
+        sendBroadcastAsUser(intent, null); // $ Alert=intent
+        sendBroadcastAsUser(intent, null, null); // $ Alert=intent
+        sendBroadcastWithMultiplePermissions(intent, null); // $ Alert=intent
+        sendStickyBroadcast(intent); // $ Alert=intent
+        sendStickyBroadcastAsUser(intent, null); // $ Alert=intent
+        sendStickyOrderedBroadcast(intent, null, null, 0, null, null); // $ Alert=intent
+        sendStickyOrderedBroadcastAsUser(intent, null, null, null, 0, null, null); // $ Alert=intent
         // @formatter:on
 
         // Sanitizing only the package or the class still allows redirecting
         // to non-exported activities in the same package
         // or activities with the same name in other packages, respectively.
         if (intent.getComponent().getPackageName().equals("something")) {
-            startActivity(intent); // $ hasAndroidIntentRedirection
+            startActivity(intent); // $ Alert=intent
         } else {
-            startActivity(intent); // $ hasAndroidIntentRedirection
+            startActivity(intent); // $ Alert=intent
         }
         if (intent.getComponent().getClassName().equals("something")) {
-            startActivity(intent); // $ hasAndroidIntentRedirection
+            startActivity(intent); // $ Alert=intent
         } else {
-            startActivity(intent); // $ hasAndroidIntentRedirection
+            startActivity(intent); // $ Alert=intent
         }
 
         if (intent.getComponent().getPackageName().equals("something")
                 && intent.getComponent().getClassName().equals("something")) {
             startActivity(intent); // Safe
         } else {
-            startActivity(intent); // $ hasAndroidIntentRedirection
+            startActivity(intent); // $ Alert=intent
         }
 
         try {
             {
                 // Delayed cast
-                Object obj = getIntent().getParcelableExtra("forward_intent");
+                Object obj = getIntent().getParcelableExtra("forward_intent"); // $ Source=intent2
                 Intent fwdIntent = (Intent) obj;
-                startActivity(fwdIntent); // $ hasAndroidIntentRedirection
+                startActivity(fwdIntent); // $ Alert=intent2
             }
             {
                 Intent fwdIntent = new Intent();
                 fwdIntent.setClassName((Context) null, intent.getStringExtra("className"));
-                startActivity(fwdIntent); // $ hasAndroidIntentRedirection
+                startActivity(fwdIntent); // $ Alert=intent
             }
             {
                 Intent fwdIntent = new Intent();
                 fwdIntent.setClassName(intent.getStringExtra("packageName"), null);
-                startActivity(fwdIntent); // $ hasAndroidIntentRedirection
+                startActivity(fwdIntent); // $ Alert=intent
             }
             {
                 Intent fwdIntent = new Intent();
                 fwdIntent.setClassName(intent.getStringExtra("packageName"),
                         intent.getStringExtra("className"));
-                startActivity(fwdIntent); // $ hasAndroidIntentRedirection
+                startActivity(fwdIntent); // $ Alert=intent
             }
             {
                 Intent fwdIntent = new Intent();
@@ -93,27 +93,27 @@ public class AndroidIntentRedirectionTest extends Activity {
             {
                 Intent fwdIntent = new Intent();
                 fwdIntent.setPackage(intent.getStringExtra("packageName"));
-                startActivity(fwdIntent); // $ hasAndroidIntentRedirection
+                startActivity(fwdIntent); // $ Alert=intent
             }
             {
                 Intent fwdIntent = new Intent();
                 ComponentName component =
                         new ComponentName(intent.getStringExtra("packageName"), null);
                 fwdIntent.setComponent(component);
-                startActivity(fwdIntent); // $ hasAndroidIntentRedirection
+                startActivity(fwdIntent); // $ Alert=intent
             }
             {
                 Intent fwdIntent = new Intent();
                 ComponentName component = new ComponentName("", intent.getStringExtra("className"));
                 fwdIntent.setComponent(component);
-                startActivity(fwdIntent); // $ hasAndroidIntentRedirection
+                startActivity(fwdIntent); // $ Alert=intent
             }
             {
                 Intent fwdIntent = new Intent();
                 ComponentName component =
                         new ComponentName((Context) null, intent.getStringExtra("className"));
                 fwdIntent.setComponent(component);
-                startActivity(fwdIntent); // $ hasAndroidIntentRedirection
+                startActivity(fwdIntent); // $ Alert=intent
             }
             {
                 Intent fwdIntent = new Intent();
@@ -128,21 +128,21 @@ public class AndroidIntentRedirectionTest extends Activity {
                 ComponentName component =
                         ComponentName.createRelative("", intent.getStringExtra("className"));
                 fwdIntent.setComponent(component);
-                startActivity(fwdIntent); // $ hasAndroidIntentRedirection
+                startActivity(fwdIntent); // $ Alert=intent
             }
             {
                 Intent fwdIntent = new Intent();
                 ComponentName component =
                         ComponentName.createRelative(intent.getStringExtra("packageName"), "");
                 fwdIntent.setComponent(component);
-                startActivity(fwdIntent); // $ hasAndroidIntentRedirection
+                startActivity(fwdIntent); // $ Alert=intent
             }
             {
                 Intent fwdIntent = new Intent();
                 ComponentName component = ComponentName.createRelative((Context) null,
                         intent.getStringExtra("className"));
                 fwdIntent.setComponent(component);
-                startActivity(fwdIntent); // $ hasAndroidIntentRedirection
+                startActivity(fwdIntent); // $ Alert=intent
             }
             {
                 Intent originalIntent = getIntent();
@@ -158,19 +158,19 @@ public class AndroidIntentRedirectionTest extends Activity {
                 startActivity(anotherIntent); // Safe - copy constructor from original Intent
             }
             {
-                Intent originalIntent = getIntent();
+                Intent originalIntent = getIntent(); // $ Source=intent3
                 Intent fwdIntent = (Intent) originalIntent.getParcelableExtra("forward_intent");
                 if (originalIntent.getBooleanExtra("use_fwd_intent", false)) {
-                    startActivity(fwdIntent); // $ hasAndroidIntentRedirection
+                    startActivity(fwdIntent); // $ Alert=intent3
                 } else {
                     startActivity(originalIntent); // Safe - not an Intent obtained from the Extras
                 }
             }
             {
-                Intent originalIntent = getIntent();
+                Intent originalIntent = getIntent(); // $ Source=intent4
                 originalIntent.setClassName(originalIntent.getStringExtra("package_name"),
                         originalIntent.getStringExtra("class_name"));
-                startActivity(originalIntent); // $ hasAndroidIntentRedirection
+                startActivity(originalIntent); // $ Alert=intent4
             }
             {
                 Intent originalIntent = getIntent();
@@ -189,16 +189,16 @@ public class AndroidIntentRedirectionTest extends Activity {
                 startActivity(fwdIntent); // $ MISSING: $hasAndroidIntentRedirection
             }
             {
-                Intent fwdIntent = Intent.parseUri(getIntent().getStringExtra("uri"), 0);
-                startActivity(fwdIntent); // $ hasAndroidIntentRedirection
+                Intent fwdIntent = Intent.parseUri(getIntent().getStringExtra("uri"), 0); // $ Source=intent5
+                startActivity(fwdIntent); // $ Alert=intent5
             }
             {
-                Intent fwdIntent = Intent.getIntent(getIntent().getStringExtra("uri"));
-                startActivity(fwdIntent); // $ hasAndroidIntentRedirection
+                Intent fwdIntent = Intent.getIntent(getIntent().getStringExtra("uri")); // $ Source=intent6
+                startActivity(fwdIntent); // $ Alert=intent6
             }
             {
-                Intent fwdIntent = Intent.getIntentOld(getIntent().getStringExtra("uri"));
-                startActivity(fwdIntent); // $ hasAndroidIntentRedirection
+                Intent fwdIntent = Intent.getIntentOld(getIntent().getStringExtra("uri")); // $ Source=intent7
+                startActivity(fwdIntent); // $ Alert=intent7
             }
         } catch (Exception e) {
         }
diff --git a/java/ql/test/query-tests/security/CWE-940/AndroidIntentRedirectionTest.ql b/java/ql/test/query-tests/security/CWE-940/AndroidIntentRedirectionTest.ql
deleted file mode 100644
index 6c4d121a2bc..00000000000
--- a/java/ql/test/query-tests/security/CWE-940/AndroidIntentRedirectionTest.ql
+++ /dev/null
@@ -1,18 +0,0 @@
-import java
-import semmle.code.java.security.AndroidIntentRedirectionQuery
-import TestUtilities.InlineExpectationsTest
-
-module HasAndroidIntentRedirectionTest implements TestSig {
-  string getARelevantTag() { result = "hasAndroidIntentRedirection" }
-
-  predicate hasActualResult(Location location, string element, string tag, string value) {
-    tag = "hasAndroidIntentRedirection" and
-    exists(DataFlow::Node sink | IntentRedirectionFlow::flowTo(sink) |
-      sink.getLocation() = location and
-      element = sink.toString() and
-      value = ""
-    )
-  }
-}
-
-import MakeTest<HasAndroidIntentRedirectionTest>
diff --git a/java/ql/test/query-tests/security/CWE-940/AndroidIntentRedirectionTest.qlref b/java/ql/test/query-tests/security/CWE-940/AndroidIntentRedirectionTest.qlref
new file mode 100644
index 00000000000..e6061ac902a
--- /dev/null
+++ b/java/ql/test/query-tests/security/CWE-940/AndroidIntentRedirectionTest.qlref
@@ -0,0 +1,2 @@
+query: Security/CWE/CWE-940/AndroidIntentRedirection.ql
+postprocess: TestUtilities/InlineExpectationsTestQuery.ql
\ No newline at end of file
diff --git a/java/ql/test/utils/modeleditor/ApplicationModeEndpoints.expected b/java/ql/test/utils/modeleditor/ApplicationModeEndpoints.expected
index d6ee3584afd..bbb1097b06f 100644
--- a/java/ql/test/utils/modeleditor/ApplicationModeEndpoints.expected
+++ b/java/ql/test/utils/modeleditor/ApplicationModeEndpoints.expected
@@ -1,23 +1,23 @@
+| com/github/codeql/test/NonPublicClass.java:5:5:5:28 | println(...) | java.io | PrintStream | println | (String) | true | rt.jar |  | neutral | source |
 | com/github/codeql/test/NonPublicClass.java:5:5:5:28 | println(...) | java.io | PrintStream | println | (String) | true | rt.jar |  | sink | source |
-| com/github/codeql/test/NonPublicClass.java:5:5:5:28 | println(...) | java.io | PrintStream | println | (String) | true | rt.jar |  | summary | source |
+| com/github/codeql/test/PublicClass.java:8:5:8:27 | println(...) | java.io | PrintStream | println | (String) | true | rt.jar |  | neutral | source |
 | com/github/codeql/test/PublicClass.java:8:5:8:27 | println(...) | java.io | PrintStream | println | (String) | true | rt.jar |  | sink | source |
-| com/github/codeql/test/PublicClass.java:8:5:8:27 | println(...) | java.io | PrintStream | println | (String) | true | rt.jar |  | summary | source |
+| com/github/codeql/test/PublicClass.java:12:5:12:27 | println(...) | java.io | PrintStream | println | (String) | true | rt.jar |  | neutral | source |
 | com/github/codeql/test/PublicClass.java:12:5:12:27 | println(...) | java.io | PrintStream | println | (String) | true | rt.jar |  | sink | source |
-| com/github/codeql/test/PublicClass.java:12:5:12:27 | println(...) | java.io | PrintStream | println | (String) | true | rt.jar |  | summary | source |
+| com/github/codeql/test/PublicClass.java:16:5:16:45 | println(...) | java.io | PrintStream | println | (Object) | true | rt.jar |  | neutral | source |
 | com/github/codeql/test/PublicClass.java:16:5:16:45 | println(...) | java.io | PrintStream | println | (Object) | true | rt.jar |  | sink | source |
-| com/github/codeql/test/PublicClass.java:16:5:16:45 | println(...) | java.io | PrintStream | println | (Object) | true | rt.jar |  | summary | source |
 | com/github/codeql/test/PublicClass.java:16:24:16:44 | get(...) | java.nio.file | Paths | get | (String,String[]) | true | rt.jar |  | summary | source |
+| com/github/codeql/test/PublicClass.java:20:5:20:68 | println(...) | java.io | PrintStream | println | (Object) | true | rt.jar |  | neutral | source |
 | com/github/codeql/test/PublicClass.java:20:5:20:68 | println(...) | java.io | PrintStream | println | (Object) | true | rt.jar |  | sink | source |
-| com/github/codeql/test/PublicClass.java:20:5:20:68 | println(...) | java.io | PrintStream | println | (Object) | true | rt.jar |  | summary | source |
 | com/github/codeql/test/PublicClass.java:20:24:20:47 | getDefault(...) | java.nio.file | FileSystems | getDefault | () | true | rt.jar |  | neutral | source |
 | com/github/codeql/test/PublicClass.java:20:24:20:67 | getPath(...) | java.nio.file | FileSystem | getPath | (String,String[]) | true | rt.jar |  | summary | source |
+| com/github/codeql/test/PublicClass.java:24:5:24:27 | println(...) | java.io | PrintStream | println | (String) | true | rt.jar |  | neutral | source |
 | com/github/codeql/test/PublicClass.java:24:5:24:27 | println(...) | java.io | PrintStream | println | (String) | true | rt.jar |  | sink | source |
-| com/github/codeql/test/PublicClass.java:24:5:24:27 | println(...) | java.io | PrintStream | println | (String) | true | rt.jar |  | summary | source |
+| com/github/codeql/test/PublicGenericClass.java:7:5:7:27 | println(...) | java.io | PrintStream | println | (Object) | true | rt.jar |  | neutral | source |
 | com/github/codeql/test/PublicGenericClass.java:7:5:7:27 | println(...) | java.io | PrintStream | println | (Object) | true | rt.jar |  | sink | source |
-| com/github/codeql/test/PublicGenericClass.java:7:5:7:27 | println(...) | java.io | PrintStream | println | (Object) | true | rt.jar |  | summary | source |
+| com/github/codeql/test/PublicGenericClass.java:11:5:11:27 | println(...) | java.io | PrintStream | println | (Object) | true | rt.jar |  | neutral | source |
 | com/github/codeql/test/PublicGenericClass.java:11:5:11:27 | println(...) | java.io | PrintStream | println | (Object) | true | rt.jar |  | sink | source |
-| com/github/codeql/test/PublicGenericClass.java:11:5:11:27 | println(...) | java.io | PrintStream | println | (Object) | true | rt.jar |  | summary | source |
+| com/github/codeql/test/PublicGenericInterface.java:8:7:8:29 | println(...) | java.io | PrintStream | println | (String) | true | rt.jar |  | neutral | source |
 | com/github/codeql/test/PublicGenericInterface.java:8:7:8:29 | println(...) | java.io | PrintStream | println | (String) | true | rt.jar |  | sink | source |
-| com/github/codeql/test/PublicGenericInterface.java:8:7:8:29 | println(...) | java.io | PrintStream | println | (String) | true | rt.jar |  | summary | source |
+| com/github/codeql/test/PublicInterface.java:7:7:7:29 | println(...) | java.io | PrintStream | println | (String) | true | rt.jar |  | neutral | source |
 | com/github/codeql/test/PublicInterface.java:7:7:7:29 | println(...) | java.io | PrintStream | println | (String) | true | rt.jar |  | sink | source |
-| com/github/codeql/test/PublicInterface.java:7:7:7:29 | println(...) | java.io | PrintStream | println | (String) | true | rt.jar |  | summary | source |
diff --git a/java/ql/test/utils/modelgenerator/dataflow/CaptureContentSummaryModels.ql b/java/ql/test/utils/modelgenerator/dataflow/CaptureContentSummaryModels.ql
index 3d2a2e07ac6..d1ff7a20edd 100644
--- a/java/ql/test/utils/modelgenerator/dataflow/CaptureContentSummaryModels.ql
+++ b/java/ql/test/utils/modelgenerator/dataflow/CaptureContentSummaryModels.ql
@@ -3,7 +3,7 @@ import utils.modelgenerator.internal.CaptureModels
 import TestUtilities.InlineMadTest
 
 module InlineMadTestConfig implements InlineMadTestConfigSig {
-  string getCapturedModel(Callable c) { result = captureContentFlow(c) }
+  string getCapturedModel(Callable c) { result = ContentSensitive::captureFlow(c, _) }
 
   string getKind() { result = "contentbased-summary" }
 }
diff --git a/java/ql/test/utils/modelgenerator/dataflow/CaptureNeutralModels.ql b/java/ql/test/utils/modelgenerator/dataflow/CaptureNeutralModels.ql
index e68730cc0ed..cdc2dfcaa45 100644
--- a/java/ql/test/utils/modelgenerator/dataflow/CaptureNeutralModels.ql
+++ b/java/ql/test/utils/modelgenerator/dataflow/CaptureNeutralModels.ql
@@ -1,5 +1,5 @@
 import java
-import utils.modelgenerator.internal.CaptureSummaryFlowQuery
+import utils.modelgenerator.internal.CaptureModels
 import TestUtilities.InlineMadTest
 
 module InlineMadTestConfig implements InlineMadTestConfigSig {
diff --git a/java/ql/test/utils/modelgenerator/dataflow/CaptureSummaryModels.ql b/java/ql/test/utils/modelgenerator/dataflow/CaptureSummaryModels.ql
index 415ebab1343..c9e5050fc1f 100644
--- a/java/ql/test/utils/modelgenerator/dataflow/CaptureSummaryModels.ql
+++ b/java/ql/test/utils/modelgenerator/dataflow/CaptureSummaryModels.ql
@@ -1,5 +1,5 @@
 import java
-import utils.modelgenerator.internal.CaptureSummaryFlowQuery
+import utils.modelgenerator.internal.CaptureModels
 import TestUtilities.InlineMadTest
 
 module InlineMadTestConfig implements InlineMadTestConfigSig {
diff --git a/java/ql/test/utils/modelgenerator/dataflow/p/Factory.java b/java/ql/test/utils/modelgenerator/dataflow/p/Factory.java
index 23381486e5f..d168bff3675 100644
--- a/java/ql/test/utils/modelgenerator/dataflow/p/Factory.java
+++ b/java/ql/test/utils/modelgenerator/dataflow/p/Factory.java
@@ -7,13 +7,13 @@ public final class Factory {
   private int intValue;
 
   // summary=p;Factory;false;create;(String,int);;Argument[0];ReturnValue;taint;df-generated
-  // contentbased-summary=p;Factory;false;create;(String,int);;Argument[0];ReturnValue.Field[p.Factory.value];value;df-generated
+  // contentbased-summary=p;Factory;false;create;(String,int);;Argument[0];ReturnValue.Field[p.Factory.value];value;dfc-generated
   public static Factory create(String value, int foo) {
     return new Factory(value, foo);
   }
 
   // summary=p;Factory;false;create;(String);;Argument[0];ReturnValue;taint;df-generated
-  // contentbased-summary=p;Factory;false;create;(String);;Argument[0];ReturnValue.Field[p.Factory.value];value;df-generated
+  // contentbased-summary=p;Factory;false;create;(String);;Argument[0];ReturnValue.Field[p.Factory.value];value;dfc-generated
   public static Factory create(String value) {
     return new Factory(value, 0);
   }
@@ -24,7 +24,7 @@ public final class Factory {
   }
 
   // summary=p;Factory;false;getValue;();;Argument[this];ReturnValue;taint;df-generated
-  // contentbased-summary=p;Factory;false;getValue;();;Argument[this].Field[p.Factory.value];ReturnValue;value;df-generated
+  // contentbased-summary=p;Factory;false;getValue;();;Argument[this].Field[p.Factory.value];ReturnValue;value;dfc-generated
   public String getValue() {
     return value;
   }
diff --git a/java/ql/test/utils/modelgenerator/dataflow/p/Fanout.java b/java/ql/test/utils/modelgenerator/dataflow/p/Fanout.java
new file mode 100644
index 00000000000..65dd715cc52
--- /dev/null
+++ b/java/ql/test/utils/modelgenerator/dataflow/p/Fanout.java
@@ -0,0 +1,68 @@
+package p;
+
+public class Fanout {
+  public interface I1 {
+    String getValue();
+  }
+
+  public interface I2 extends I1 {}
+
+  public class Impl1 implements I1 {
+    public String v;
+
+    // summary=p;Fanout$I1;true;getValue;();;Argument[this];ReturnValue;taint;df-generated
+    // contentbased-summary=p;Fanout$Impl1;true;getValue;();;Argument[this].Field[p.Fanout$Impl1.v];ReturnValue;value;dfc-generated
+    public String getValue() {
+      return v;
+    }
+  }
+
+  public class Impl2 implements I2 {
+    public String v;
+
+    // summary=p;Fanout$I1;true;getValue;();;Argument[this];ReturnValue;taint;df-generated
+    // contentbased-summary=p;Fanout$Impl2;true;getValue;();;Argument[this].Field[p.Fanout$Impl2.v];ReturnValue;value;dfc-generated
+    public String getValue() {
+      return v;
+    }
+  }
+
+  public class Impl3 implements I2 {
+    public String v;
+
+    // summary=p;Fanout$I1;true;getValue;();;Argument[this];ReturnValue;taint;df-generated
+    // contentbased-summary=p;Fanout$Impl3;true;getValue;();;Argument[this].Field[p.Fanout$Impl3.v];ReturnValue;value;dfc-generated
+    public String getValue() {
+      return v;
+    }
+  }
+
+  public class Impl4 implements I2 {
+    public String v;
+
+    // summary=p;Fanout$I1;true;getValue;();;Argument[this];ReturnValue;taint;df-generated
+    // contentbased-summary=p;Fanout$Impl4;true;getValue;();;Argument[this].Field[p.Fanout$Impl4.v];ReturnValue;value;dfc-generated
+    public String getValue() {
+      return v;
+    }
+  }
+
+  // summary=p;Fanout;true;concatGetValueOnI1;(String,Fanout$I1);;Argument[0];ReturnValue;taint;df-generated
+  // summary=p;Fanout;true;concatGetValueOnI1;(String,Fanout$I1);;Argument[1];ReturnValue;taint;df-generated
+  // No content based summaries are expected for this method on parameter `i`
+  // as the fanout (number of content flows) exceeds the limit of 3.
+  // contentbased-summary=p;Fanout;true;concatGetValueOnI1;(String,Fanout$I1);;Argument[0];ReturnValue;taint;dfc-generated
+  public String concatGetValueOnI1(String other, I1 i) {
+    return other + i.getValue();
+  }
+
+  // summary=p;Fanout;true;concatGetValueOnI2;(String,Fanout$I2);;Argument[0];ReturnValue;taint;df-generated
+  // summary=p;Fanout;true;concatGetValueOnI2;(String,Fanout$I2);;Argument[1];ReturnValue;taint;df-generated
+  // contentbased-summary=p;Fanout;true;concatGetValueOnI2;(String,Fanout$I2);;Argument[0];ReturnValue;taint;dfc-generated
+  // contentbased-summary=p;Fanout;true;concatGetValueOnI2;(String,Fanout$I2);;Argument[1].Field[p.Fanout$Impl2.v];ReturnValue;taint;dfc-generated
+  // contentbased-summary=p;Fanout;true;concatGetValueOnI2;(String,Fanout$I2);;Argument[1].Field[p.Fanout$Impl3.v];ReturnValue;taint;dfc-generated
+  // contentbased-summary=p;Fanout;true;concatGetValueOnI2;(String,Fanout$I2);;Argument[1].Field[p.Fanout$Impl4.v];ReturnValue;taint;dfc-generated
+  public String concatGetValueOnI2(String other, I2 i) {
+    return other + i.getValue();
+  }
+}
diff --git a/java/ql/test/utils/modelgenerator/dataflow/p/FinalClass.java b/java/ql/test/utils/modelgenerator/dataflow/p/FinalClass.java
index b436a4ed650..f34f5c9c0ba 100644
--- a/java/ql/test/utils/modelgenerator/dataflow/p/FinalClass.java
+++ b/java/ql/test/utils/modelgenerator/dataflow/p/FinalClass.java
@@ -5,7 +5,7 @@ public final class FinalClass {
   private static final String C = "constant";
 
   // summary=p;FinalClass;false;returnsInput;(String);;Argument[0];ReturnValue;taint;df-generated
-  // contentbased-summary=p;FinalClass;false;returnsInput;(String);;Argument[0];ReturnValue;value;df-generated
+  // contentbased-summary=p;FinalClass;false;returnsInput;(String);;Argument[0];ReturnValue;value;dfc-generated
   public String returnsInput(String input) {
     return input;
   }
diff --git a/java/ql/test/utils/modelgenerator/dataflow/p/FluentAPI.java b/java/ql/test/utils/modelgenerator/dataflow/p/FluentAPI.java
index 1799dc3ec4c..39d0590aa3c 100644
--- a/java/ql/test/utils/modelgenerator/dataflow/p/FluentAPI.java
+++ b/java/ql/test/utils/modelgenerator/dataflow/p/FluentAPI.java
@@ -3,7 +3,7 @@ package p;
 public final class FluentAPI {
 
   // summary=p;FluentAPI;false;returnsThis;(String);;Argument[this];ReturnValue;value;df-generated
-  // contentbased-summary=p;FluentAPI;false;returnsThis;(String);;Argument[this];ReturnValue;value;df-generated
+  // contentbased-summary=p;FluentAPI;false;returnsThis;(String);;Argument[this];ReturnValue;value;dfc-generated
   public FluentAPI returnsThis(String input) {
     return this;
   }
diff --git a/java/ql/test/utils/modelgenerator/dataflow/p/ImmutablePojo.java b/java/ql/test/utils/modelgenerator/dataflow/p/ImmutablePojo.java
index 9d83f6bf842..0b2da302d7a 100644
--- a/java/ql/test/utils/modelgenerator/dataflow/p/ImmutablePojo.java
+++ b/java/ql/test/utils/modelgenerator/dataflow/p/ImmutablePojo.java
@@ -7,14 +7,14 @@ public final class ImmutablePojo {
   private final long x;
 
   // summary=p;ImmutablePojo;false;ImmutablePojo;(String,int);;Argument[0];Argument[this];taint;df-generated
-  // contentbased-summary=p;ImmutablePojo;false;ImmutablePojo;(String,int);;Argument[0];Argument[this].SyntheticField[p.ImmutablePojo.value];value;df-generated
+  // contentbased-summary=p;ImmutablePojo;false;ImmutablePojo;(String,int);;Argument[0];Argument[this].SyntheticField[p.ImmutablePojo.value];value;dfc-generated
   public ImmutablePojo(String value, int x) {
     this.value = value;
     this.x = x;
   }
 
   // summary=p;ImmutablePojo;false;getValue;();;Argument[this];ReturnValue;taint;df-generated
-  // contentbased-summary=p;ImmutablePojo;false;getValue;();;Argument[this].SyntheticField[p.ImmutablePojo.value];ReturnValue;value;df-generated
+  // contentbased-summary=p;ImmutablePojo;false;getValue;();;Argument[this].SyntheticField[p.ImmutablePojo.value];ReturnValue;value;dfc-generated
   public String getValue() {
     return value;
   }
@@ -26,8 +26,8 @@ public final class ImmutablePojo {
 
   // summary=p;ImmutablePojo;false;or;(String);;Argument[0];ReturnValue;taint;df-generated
   // summary=p;ImmutablePojo;false;or;(String);;Argument[this];ReturnValue;taint;df-generated
-  // contentbased-summary=p;ImmutablePojo;false;or;(String);;Argument[0];ReturnValue;value;df-generated
-  // contentbased-summary=p;ImmutablePojo;false;or;(String);;Argument[this].SyntheticField[p.ImmutablePojo.value];ReturnValue;value;df-generated
+  // contentbased-summary=p;ImmutablePojo;false;or;(String);;Argument[0];ReturnValue;value;dfc-generated
+  // contentbased-summary=p;ImmutablePojo;false;or;(String);;Argument[this].SyntheticField[p.ImmutablePojo.value];ReturnValue;value;dfc-generated
   public String or(String defaultValue) {
     return value != null ? value : defaultValue;
   }
diff --git a/java/ql/test/utils/modelgenerator/dataflow/p/Inheritance.java b/java/ql/test/utils/modelgenerator/dataflow/p/Inheritance.java
index d36cba1e099..b5d03fdc8a1 100644
--- a/java/ql/test/utils/modelgenerator/dataflow/p/Inheritance.java
+++ b/java/ql/test/utils/modelgenerator/dataflow/p/Inheritance.java
@@ -11,7 +11,7 @@ public class Inheritance {
 
   public class AImplBasePrivateImpl extends BasePrivate {
     // summary=p;Inheritance$AImplBasePrivateImpl;true;id;(String);;Argument[0];ReturnValue;taint;df-generated
-    // contentbased-summary=p;Inheritance$AImplBasePrivateImpl;true;id;(String);;Argument[0];ReturnValue;value;df-generated
+    // contentbased-summary=p;Inheritance$AImplBasePrivateImpl;true;id;(String);;Argument[0];ReturnValue;value;dfc-generated
     @Override
     public String id(String s) {
       return s;
@@ -20,7 +20,7 @@ public class Inheritance {
 
   public class AImplBasePublic extends BasePublic {
     // summary=p;Inheritance$BasePublic;true;id;(String);;Argument[0];ReturnValue;taint;df-generated
-    // contentbased-summary=p;Inheritance$BasePublic;true;id;(String);;Argument[0];ReturnValue;value;df-generated
+    // contentbased-summary=p;Inheritance$BasePublic;true;id;(String);;Argument[0];ReturnValue;value;dfc-generated
     @Override
     public String id(String s) {
       return s;
@@ -61,7 +61,7 @@ public class Inheritance {
 
   public class BImpl extends B {
     // summary=p;Inheritance$IPublic1;true;id;(String);;Argument[0];ReturnValue;taint;df-generated
-    // contentbased-summary=p;Inheritance$IPublic1;true;id;(String);;Argument[0];ReturnValue;value;df-generated
+    // contentbased-summary=p;Inheritance$IPublic1;true;id;(String);;Argument[0];ReturnValue;value;dfc-generated
     @Override
     public String id(String s) {
       return s;
@@ -70,7 +70,7 @@ public class Inheritance {
 
   public class CImpl extends C {
     // summary=p;Inheritance$C;true;id;(String);;Argument[0];ReturnValue;taint;df-generated
-    // contentbased-summary=p;Inheritance$C;true;id;(String);;Argument[0];ReturnValue;value;df-generated
+    // contentbased-summary=p;Inheritance$C;true;id;(String);;Argument[0];ReturnValue;value;dfc-generated
     @Override
     public String id(String s) {
       return s;
@@ -79,7 +79,7 @@ public class Inheritance {
 
   public class DImpl extends D {
     // summary=p;Inheritance$IPublic2;true;id;(String);;Argument[0];ReturnValue;taint;df-generated
-    // contentbased-summary=p;Inheritance$IPublic2;true;id;(String);;Argument[0];ReturnValue;value;df-generated
+    // contentbased-summary=p;Inheritance$IPublic2;true;id;(String);;Argument[0];ReturnValue;value;dfc-generated
     @Override
     public String id(String s) {
       return s;
@@ -88,7 +88,7 @@ public class Inheritance {
 
   public class EImpl extends E {
     // summary=p;Inheritance$EImpl;true;id;(String);;Argument[0];ReturnValue;taint;df-generated
-    // contentbased-summary=p;Inheritance$EImpl;true;id;(String);;Argument[0];ReturnValue;value;df-generated
+    // contentbased-summary=p;Inheritance$EImpl;true;id;(String);;Argument[0];ReturnValue;value;dfc-generated
     @Override
     public String id(String s) {
       return s;
diff --git a/java/ql/test/utils/modelgenerator/dataflow/p/InnerClasses.java b/java/ql/test/utils/modelgenerator/dataflow/p/InnerClasses.java
index 8fef83143cb..b9aaeb63893 100644
--- a/java/ql/test/utils/modelgenerator/dataflow/p/InnerClasses.java
+++ b/java/ql/test/utils/modelgenerator/dataflow/p/InnerClasses.java
@@ -10,14 +10,14 @@ public class InnerClasses {
 
   public class CaptureMe {
     // summary=p;InnerClasses$CaptureMe;true;yesCm;(String);;Argument[0];ReturnValue;taint;df-generated
-    // contentbased-summary=p;InnerClasses$CaptureMe;true;yesCm;(String);;Argument[0];ReturnValue;value;df-generated
+    // contentbased-summary=p;InnerClasses$CaptureMe;true;yesCm;(String);;Argument[0];ReturnValue;value;dfc-generated
     public String yesCm(String input) {
       return input;
     }
   }
 
   // summary=p;InnerClasses;true;yes;(String);;Argument[0];ReturnValue;taint;df-generated
-  // contentbased-summary=p;InnerClasses;true;yes;(String);;Argument[0];ReturnValue;value;df-generated
+  // contentbased-summary=p;InnerClasses;true;yes;(String);;Argument[0];ReturnValue;value;dfc-generated
   public String yes(String input) {
     return input;
   }
diff --git a/java/ql/test/utils/modelgenerator/dataflow/p/InnerHolder.java b/java/ql/test/utils/modelgenerator/dataflow/p/InnerHolder.java
index 5e8a050a428..01655cb413f 100644
--- a/java/ql/test/utils/modelgenerator/dataflow/p/InnerHolder.java
+++ b/java/ql/test/utils/modelgenerator/dataflow/p/InnerHolder.java
@@ -19,26 +19,32 @@ public final class InnerHolder {
   private StringBuilder sb = new StringBuilder();
 
   // summary=p;InnerHolder;false;setContext;(String);;Argument[0];Argument[this];taint;df-generated
-  // contentbased-summary=p;InnerHolder;false;setContext;(String);;Argument[0];Argument[this].SyntheticField[p.InnerHolder.context].SyntheticField[p.InnerHolder$Context.value];value;df-generated
+  // contentbased-summary=p;InnerHolder;false;setContext;(String);;Argument[0];Argument[this].SyntheticField[p.InnerHolder.context].SyntheticField[p.InnerHolder$Context.value];value;dfc-generated
   public void setContext(String value) {
     context = new Context(value);
   }
 
   // summary=p;InnerHolder;false;explicitSetContext;(String);;Argument[0];Argument[this];taint;df-generated
-  // contentbased-summary=p;InnerHolder;false;explicitSetContext;(String);;Argument[0];Argument[this].SyntheticField[p.InnerHolder.context].SyntheticField[p.InnerHolder$Context.value];value;df-generated
+  // contentbased-summary=p;InnerHolder;false;explicitSetContext;(String);;Argument[0];Argument[this].SyntheticField[p.InnerHolder.context].SyntheticField[p.InnerHolder$Context.value];value;dfc-generated
   public void explicitSetContext(String value) {
     this.context = new Context(value);
   }
 
   // summary=p;InnerHolder;false;append;(String);;Argument[0];Argument[this];taint;df-generated
-  // contentbased-summary=p;InnerHolder;false;append;(String);;Argument[0];Argument[this].SyntheticField[p.InnerHolder.sb];taint;df-generated
+  // contentbased-summary=p;InnerHolder;false;append;(String);;Argument[0];Argument[this].SyntheticField[p.InnerHolder.sb];taint;dfc-generated
   public void append(String value) {
     sb.append(value);
   }
 
   // summary=p;InnerHolder;false;getValue;();;Argument[this];ReturnValue;taint;df-generated
-  // contentbased-summary=p;InnerHolder;false;getValue;();;Argument[this].SyntheticField[p.InnerHolder.context].SyntheticField[p.InnerHolder$Context.value];ReturnValue;value;df-generated
+  // contentbased-summary=p;InnerHolder;false;getValue;();;Argument[this].SyntheticField[p.InnerHolder.sb];ReturnValue;taint;dfc-generated
   public String getValue() {
+    return sb.toString();
+  }
+
+  // summary=p;InnerHolder;false;getContextValue;();;Argument[this];ReturnValue;taint;df-generated
+  // contentbased-summary=p;InnerHolder;false;getContextValue;();;Argument[this].SyntheticField[p.InnerHolder.context].SyntheticField[p.InnerHolder$Context.value];ReturnValue;value;dfc-generated
+  public String getContextValue() {
     return context.getValue();
   }
 }
diff --git a/java/ql/test/utils/modelgenerator/dataflow/p/Joiner.java b/java/ql/test/utils/modelgenerator/dataflow/p/Joiner.java
index cf7626eba61..da1e7214a01 100644
--- a/java/ql/test/utils/modelgenerator/dataflow/p/Joiner.java
+++ b/java/ql/test/utils/modelgenerator/dataflow/p/Joiner.java
@@ -13,7 +13,7 @@ public final class Joiner {
   private String emptyValue;
 
   // summary=p;Joiner;false;Joiner;(CharSequence);;Argument[0];Argument[this];taint;df-generated
-  // contentbased-summary=p;Joiner;false;Joiner;(CharSequence);;Argument[0];Argument[this].SyntheticField[p.Joiner.delimiter];taint;df-generated
+  // contentbased-summary=p;Joiner;false;Joiner;(CharSequence);;Argument[0];Argument[this].SyntheticField[p.Joiner.delimiter];taint;dfc-generated
   public Joiner(CharSequence delimiter) {
     this(delimiter, "", "");
   }
@@ -21,9 +21,8 @@ public final class Joiner {
   // summary=p;Joiner;false;Joiner;(CharSequence,CharSequence,CharSequence);;Argument[0];Argument[this];taint;df-generated
   // summary=p;Joiner;false;Joiner;(CharSequence,CharSequence,CharSequence);;Argument[1];Argument[this];taint;df-generated
   // summary=p;Joiner;false;Joiner;(CharSequence,CharSequence,CharSequence);;Argument[2];Argument[this];taint;df-generated
-  // contentbased-summary=p;Joiner;false;Joiner;(CharSequence,CharSequence,CharSequence);;Argument[0];Argument[this].SyntheticField[p.Joiner.delimiter];taint;df-generated
-  // contentbased-summary=p;Joiner;false;Joiner;(CharSequence,CharSequence,CharSequence);;Argument[1];Argument[this].SyntheticField[p.Joiner.prefix];taint;df-generated
-  // contentbased-summary=p;Joiner;false;Joiner;(CharSequence,CharSequence,CharSequence);;Argument[2];Argument[this].SyntheticField[p.Joiner.suffix];taint;df-generated
+  // contentbased-summary=p;Joiner;false;Joiner;(CharSequence,CharSequence,CharSequence);;Argument[0];Argument[this].SyntheticField[p.Joiner.delimiter];taint;dfc-generated
+  // No content based summaries for prefix and suffix as they are "dead" synthetic fields.
   public Joiner(CharSequence delimiter, CharSequence prefix, CharSequence suffix) {
     Objects.requireNonNull(prefix, "The prefix must not be null");
     Objects.requireNonNull(delimiter, "The delimiter must not be null");
@@ -36,15 +35,20 @@ public final class Joiner {
 
   // summary=p;Joiner;false;setEmptyValue;(CharSequence);;Argument[0];Argument[this];taint;df-generated
   // summary=p;Joiner;false;setEmptyValue;(CharSequence);;Argument[this];ReturnValue;value;df-generated
-  // contentbased-summary=p;Joiner;false;setEmptyValue;(CharSequence);;Argument[0];Argument[this].SyntheticField[p.Joiner.emptyValue];taint;df-generated
-  // contentbased-summary=p;Joiner;false;setEmptyValue;(CharSequence);;Argument[0];ReturnValue.SyntheticField[p.Joiner.emptyValue];taint;df-generated
-  // contentbased-summary=p;Joiner;false;setEmptyValue;(CharSequence);;Argument[this];ReturnValue;value;df-generated
+  // No content based summary as emptyValue is "dead" (synthetic)field.
+  // contentbased-summary=p;Joiner;false;setEmptyValue;(CharSequence);;Argument[this];ReturnValue;value;dfc-generated
   public Joiner setEmptyValue(CharSequence emptyValue) {
     this.emptyValue =
         Objects.requireNonNull(emptyValue, "The empty value must not be null").toString();
     return this;
   }
 
+  // summary=p;Joiner;false;getDelimiter;();;Argument[this];ReturnValue;taint;df-generated
+  // contentbased-summary=p;Joiner;false;getDelimiter;();;Argument[this].SyntheticField[p.Joiner.delimiter];ReturnValue;value;dfc-generated
+  public String getDelimiter() {
+    return delimiter;
+  }
+
   private static int getChars(String s, char[] chars, int start) {
     int len = s.length();
     s.getChars(0, len, chars, start);
@@ -78,8 +82,8 @@ public final class Joiner {
   }
 
   // summary=p;Joiner;false;add;(CharSequence);;Argument[this];ReturnValue;value;df-generated
-  // contentbased-summary=p;Joiner;false;add;(CharSequence);;Argument[this].SyntheticField[p.Joiner.elts].ArrayElement;ReturnValue.SyntheticField[p.Joiner.elts].ArrayElement;value;df-generated
-  // contentbased-summary=p;Joiner;false;add;(CharSequence);;Argument[this];ReturnValue;value;df-generated
+  // contentbased-summary=p;Joiner;false;add;(CharSequence);;Argument[this];ReturnValue;value;dfc-generated
+  // MISSING content based summaries for "elts". This could be a synthetic field.
   public Joiner add(CharSequence newElement) {
     final String elt = String.valueOf(newElement);
     if (elts == null) {
@@ -103,8 +107,8 @@ public final class Joiner {
   }
 
   // summary=p;Joiner;false;merge;(Joiner);;Argument[this];ReturnValue;value;df-generated
-  // contentbased-summary=p;Joiner;false;merge;(Joiner);;Argument[this].SyntheticField[p.Joiner.elts].ArrayElement;ReturnValue.SyntheticField[p.Joiner.elts].ArrayElement;value;df-generated
-  // contentbased-summary=p;Joiner;false;merge;(Joiner);;Argument[this];ReturnValue;value;df-generated
+  // contentbased-summary=p;Joiner;false;merge;(Joiner);;Argument[this];ReturnValue;value;dfc-generated
+  // MISSING content based summaries for "elts". This could be a synthetic field.
   public Joiner merge(Joiner other) {
     Objects.requireNonNull(other);
     if (other.elts == null) {
diff --git a/java/ql/test/utils/modelgenerator/dataflow/p/MultiPaths.java b/java/ql/test/utils/modelgenerator/dataflow/p/MultiPaths.java
new file mode 100644
index 00000000000..827346604df
--- /dev/null
+++ b/java/ql/test/utils/modelgenerator/dataflow/p/MultiPaths.java
@@ -0,0 +1,19 @@
+package p;
+
+public class MultiPaths {
+
+  // summary=p;MultiPaths;true;cond;(String,String);;Argument[0];ReturnValue;taint;df-generated
+  // contentbased-summary=p;MultiPaths;true;cond;(String,String);;Argument[0];ReturnValue;value;dfc-generated
+  public String cond(String x, String other) {
+    if (x == other) {
+      return x.substring(0, 100);
+    }
+    return x;
+  }
+
+  // No summary for the clone method as it is explicitly handled by the dataflow library.
+  @Override
+  public Object clone() {
+    return this;
+  }
+}
diff --git a/java/ql/test/utils/modelgenerator/dataflow/p/MultipleImpl2.java b/java/ql/test/utils/modelgenerator/dataflow/p/MultipleImpl2.java
index 09984a4742f..32c846cb1da 100644
--- a/java/ql/test/utils/modelgenerator/dataflow/p/MultipleImpl2.java
+++ b/java/ql/test/utils/modelgenerator/dataflow/p/MultipleImpl2.java
@@ -17,7 +17,7 @@ class MultipleImpl2 {
 
   public class Impl2 implements IInterface {
     // summary=p;MultipleImpl2$IInterface;true;m;(Object);;Argument[0];ReturnValue;taint;df-generated
-    // contentbased-summary=p;MultipleImpl2$IInterface;true;m;(Object);;Argument[0];ReturnValue;value;df-generated
+    // contentbased-summary=p;MultipleImpl2$IInterface;true;m;(Object);;Argument[0];ReturnValue;value;dfc-generated
     public Object m(Object value) {
       return value;
     }
diff --git a/java/ql/test/utils/modelgenerator/dataflow/p/MultipleImpls.java b/java/ql/test/utils/modelgenerator/dataflow/p/MultipleImpls.java
index 164f55ae732..c44c3268918 100644
--- a/java/ql/test/utils/modelgenerator/dataflow/p/MultipleImpls.java
+++ b/java/ql/test/utils/modelgenerator/dataflow/p/MultipleImpls.java
@@ -10,7 +10,7 @@ public class MultipleImpls {
 
   public static class Strat1 implements Strategy {
     // summary=p;MultipleImpls$Strategy;true;doSomething;(String);;Argument[0];ReturnValue;taint;df-generated
-    // contentbased-summary=p;MultipleImpls$Strategy;true;doSomething;(String);;Argument[0];ReturnValue;value;df-generated
+    // contentbased-summary=p;MultipleImpls$Strategy;true;doSomething;(String);;Argument[0];ReturnValue;value;dfc-generated
     public String doSomething(String value) {
       return value;
     }
@@ -30,18 +30,16 @@ public class MultipleImpls {
     private String foo;
 
     // summary=p;MultipleImpls$Strategy;true;doSomething;(String);;Argument[0];Argument[this];taint;df-generated
-    // A field based model should not be lifted if the field pertains to the concrete
-    // implementation.
-    // SPURIOUS-contentbased-summary=p;MultipleImpls$Strategy;true;doSomething;(String);;Argument[0];Argument[this].SyntheticField[p.MultipleImpls$Strat2.foo];value;df-generated
+    // The content based summary is not lifted as it pertains to a (synthetic)field.
+    // contentbased-summary=p;MultipleImpls$Strat2;true;doSomething;(String);;Argument[0];Argument[this].SyntheticField[p.MultipleImpls$Strat2.foo];value;dfc-generated
     public String doSomething(String value) {
       this.foo = value;
       return "none";
     }
 
     // summary=p;MultipleImpls$Strat2;true;getValue;();;Argument[this];ReturnValue;taint;df-generated
-    // A field based model should not be lifted if the field pertains to the concrete
-    // implementation.
-    // SPURIOUS-contentbased-summary=p;MultipleImpls$Strat2;true;getValue;();;Argument[this].SyntheticField[p.MultipleImpls$Strat2.foo];ReturnValue;value;df-generated
+    // The content based summary is not lifted as it pertains to a (synthetic)field.
+    // contentbased-summary=p;MultipleImpls$Strat2;true;getValue;();;Argument[this].SyntheticField[p.MultipleImpls$Strat2.foo];ReturnValue;value;dfc-generated
     public String getValue() {
       return this.foo;
     }
diff --git a/java/ql/test/utils/modelgenerator/dataflow/p/ParamFlow.java b/java/ql/test/utils/modelgenerator/dataflow/p/ParamFlow.java
index 05614c392e4..41268ff1156 100644
--- a/java/ql/test/utils/modelgenerator/dataflow/p/ParamFlow.java
+++ b/java/ql/test/utils/modelgenerator/dataflow/p/ParamFlow.java
@@ -8,7 +8,7 @@ import java.util.List;
 public class ParamFlow {
 
   // summary=p;ParamFlow;true;returnsInput;(String);;Argument[0];ReturnValue;taint;df-generated
-  // contentbased-summary=p;ParamFlow;true;returnsInput;(String);;Argument[0];ReturnValue;value;df-generated
+  // contentbased-summary=p;ParamFlow;true;returnsInput;(String);;Argument[0];ReturnValue;value;dfc-generated
   public String returnsInput(String input) {
     return input;
   }
@@ -20,8 +20,8 @@ public class ParamFlow {
 
   // summary=p;ParamFlow;true;returnMultipleParameters;(String,String);;Argument[0];ReturnValue;taint;df-generated
   // summary=p;ParamFlow;true;returnMultipleParameters;(String,String);;Argument[1];ReturnValue;taint;df-generated
-  // contentbased-summary=p;ParamFlow;true;returnMultipleParameters;(String,String);;Argument[0];ReturnValue;value;df-generated
-  // contentbased-summary=p;ParamFlow;true;returnMultipleParameters;(String,String);;Argument[1];ReturnValue;value;df-generated
+  // contentbased-summary=p;ParamFlow;true;returnMultipleParameters;(String,String);;Argument[0];ReturnValue;value;dfc-generated
+  // contentbased-summary=p;ParamFlow;true;returnMultipleParameters;(String,String);;Argument[1];ReturnValue;value;dfc-generated
   public String returnMultipleParameters(String one, String two) {
     if (System.currentTimeMillis() > 100) {
       return two;
@@ -30,31 +30,31 @@ public class ParamFlow {
   }
 
   // summary=p;ParamFlow;true;returnArrayElement;(String[]);;Argument[0].ArrayElement;ReturnValue;taint;df-generated
-  // contentbased-summary=p;ParamFlow;true;returnArrayElement;(String[]);;Argument[0].ArrayElement;ReturnValue;value;df-generated
+  // contentbased-summary=p;ParamFlow;true;returnArrayElement;(String[]);;Argument[0].ArrayElement;ReturnValue;value;dfc-generated
   public String returnArrayElement(String[] input) {
     return input[0];
   }
 
   // summary=p;ParamFlow;true;returnVarArgElement;(String[]);;Argument[0].ArrayElement;ReturnValue;taint;df-generated
-  // contentbased-summary=p;ParamFlow;true;returnVarArgElement;(String[]);;Argument[0].ArrayElement;ReturnValue;value;df-generated
+  // contentbased-summary=p;ParamFlow;true;returnVarArgElement;(String[]);;Argument[0].ArrayElement;ReturnValue;value;dfc-generated
   public String returnVarArgElement(String... input) {
     return input[0];
   }
 
   // summary=p;ParamFlow;true;returnCollectionElement;(List);;Argument[0].Element;ReturnValue;taint;df-generated
-  // contentbased-summary=p;ParamFlow;true;returnCollectionElement;(List);;Argument[0].Element;ReturnValue;value;df-generated
+  // contentbased-summary=p;ParamFlow;true;returnCollectionElement;(List);;Argument[0].Element;ReturnValue;value;dfc-generated
   public String returnCollectionElement(List<String> input) {
     return input.get(0);
   }
 
   // summary=p;ParamFlow;true;returnIteratorElement;(Iterator);;Argument[0].Element;ReturnValue;taint;df-generated
-  // contentbased-summary=p;ParamFlow;true;returnIteratorElement;(Iterator);;Argument[0].Element;ReturnValue;value;df-generated
+  // contentbased-summary=p;ParamFlow;true;returnIteratorElement;(Iterator);;Argument[0].Element;ReturnValue;value;dfc-generated
   public String returnIteratorElement(Iterator<String> input) {
     return input.next();
   }
 
   // summary=p;ParamFlow;true;returnIterableElement;(Iterable);;Argument[0].Element;ReturnValue;taint;df-generated
-  // contentbased-summary=p;ParamFlow;true;returnIterableElement;(Iterable);;Argument[0].Element;ReturnValue;value;df-generated
+  // contentbased-summary=p;ParamFlow;true;returnIterableElement;(Iterable);;Argument[0].Element;ReturnValue;value;dfc-generated
   public String returnIterableElement(Iterable<String> input) {
     return input.iterator().next();
   }
@@ -65,19 +65,19 @@ public class ParamFlow {
   }
 
   // summary=p;ParamFlow;true;writeChunked;(byte[],OutputStream);;Argument[0];Argument[1];taint;df-generated
-  // contentbased-summary=p;ParamFlow;true;writeChunked;(byte[],OutputStream);;Argument[0];Argument[1];taint;df-generated
+  // contentbased-summary=p;ParamFlow;true;writeChunked;(byte[],OutputStream);;Argument[0];Argument[1];taint;dfc-generated
   public void writeChunked(byte[] data, OutputStream output) throws IOException {
     output.write(data, 0, data.length);
   }
 
   // summary=p;ParamFlow;true;writeChunked;(char[],OutputStream);;Argument[0];Argument[1];taint;df-generated
-  // contentbased-summary=p;ParamFlow;true;writeChunked;(char[],OutputStream);;Argument[0];Argument[1];taint;df-generated
+  // contentbased-summary=p;ParamFlow;true;writeChunked;(char[],OutputStream);;Argument[0];Argument[1];taint;dfc-generated
   public void writeChunked(char[] data, OutputStream output) throws IOException {
     output.write(String.valueOf(data).getBytes(), 0, data.length);
   }
 
   // summary=p;ParamFlow;true;addTo;(String,List);;Argument[0];Argument[1].Element;taint;df-generated
-  // contentbased-summary=p;ParamFlow;true;addTo;(String,List);;Argument[0];Argument[1].Element;value;df-generated
+  // contentbased-summary=p;ParamFlow;true;addTo;(String,List);;Argument[0];Argument[1].Element;value;dfc-generated
   public void addTo(String data, List<String> target) {
     target.add(data);
   }
diff --git a/java/ql/test/utils/modelgenerator/dataflow/p/Pojo.java b/java/ql/test/utils/modelgenerator/dataflow/p/Pojo.java
index e6fb581aac2..1c30f83bccf 100644
--- a/java/ql/test/utils/modelgenerator/dataflow/p/Pojo.java
+++ b/java/ql/test/utils/modelgenerator/dataflow/p/Pojo.java
@@ -26,18 +26,29 @@ public final class Pojo {
 
   public byte[] byteArray = new byte[] {1, 2, 3};
   private float[] floatArray = new float[] {1, 2, 3};
-  private char[] charArray = new char[] {'a', 'b', 'c'};
   private List<Character> charList = Arrays.asList('a', 'b', 'c');
-  private Byte[] byteObjectArray = new Byte[] {1, 2, 3};
+  private char[] charArray;
+  private Byte[] byteObjectArray;
+  private String stringValue1;
+  private String stringValue2;
+
+  // summary=p;Pojo;false;Pojo;(Byte[],char[]);;Argument[0];Argument[this];taint;df-generated
+  // summary=p;Pojo;false;Pojo;(Byte[],char[]);;Argument[1];Argument[this];taint;df-generated
+  // contentbased-summary=p;Pojo;false;Pojo;(Byte[],char[]);;Argument[0];Argument[this].SyntheticField[p.Pojo.byteObjectArray];value;dfc-generated
+  // contentbased-summary=p;Pojo;false;Pojo;(Byte[],char[]);;Argument[1];Argument[this].SyntheticField[p.Pojo.charArray];value;dfc-generated
+  public Pojo(Byte[] byteObjectArray, char[] charArray) {
+    this.byteObjectArray = byteObjectArray;
+    this.charArray = charArray;
+  }
 
   // summary=p;Pojo;false;getValue;();;Argument[this];ReturnValue;taint;df-generated
-  // contentbased-summary=p;Pojo;false;getValue;();;Argument[this].SyntheticField[p.Pojo.value];ReturnValue;value;df-generated
+  // contentbased-summary=p;Pojo;false;getValue;();;Argument[this].SyntheticField[p.Pojo.value];ReturnValue;value;dfc-generated
   public String getValue() {
     return value;
   }
 
   // summary=p;Pojo;false;setValue;(String);;Argument[0];Argument[this];taint;df-generated
-  // contentbased-summary=p;Pojo;false;setValue;(String);;Argument[0];Argument[this].SyntheticField[p.Pojo.value];value;df-generated
+  // contentbased-summary=p;Pojo;false;setValue;(String);;Argument[0];Argument[this].SyntheticField[p.Pojo.value];value;dfc-generated
   public void setValue(String value) {
     this.value = value;
   }
@@ -64,17 +75,23 @@ public final class Pojo {
   }
 
   // summary=p;Pojo;false;getCharArray;();;Argument[this];ReturnValue;taint;df-generated
-  // contentbased-summary=p;Pojo;false;getCharArray;();;Argument[this].SyntheticField[p.Pojo.charArray];ReturnValue;value;df-generated
+  // contentbased-summary=p;Pojo;false;getCharArray;();;Argument[this].SyntheticField[p.Pojo.charArray];ReturnValue;value;dfc-generated
   public char[] getCharArray() {
     return charArray;
   }
 
   // summary=p;Pojo;false;getByteArray;();;Argument[this];ReturnValue;taint;df-generated
-  // contentbased-summary=p;Pojo;false;getByteArray;();;Argument[this].Field[p.Pojo.byteArray];ReturnValue;value;df-generated
+  // contentbased-summary=p;Pojo;false;getByteArray;();;Argument[this].Field[p.Pojo.byteArray];ReturnValue;value;dfc-generated
   public byte[] getByteArray() {
     return byteArray;
   }
 
+  // summary=p;Pojo;false;setByteArray;(byte[]);;Argument[0];Argument[this];taint;df-generated
+  // contentbased-summary=p;Pojo;false;setByteArray;(byte[]);;Argument[0];Argument[this].Field[p.Pojo.byteArray];value;dfc-generated
+  public void setByteArray(byte[] value) {
+    byteArray = value;
+  }
+
   // neutral=p;Pojo;getFloatArray;();summary;df-generated
   public float[] getFloatArray() {
     return floatArray;
@@ -91,13 +108,13 @@ public final class Pojo {
   }
 
   // summary=p;Pojo;false;getBoxedChars;();;Argument[this];ReturnValue;taint;df-generated
-  // contentbased-summary=p;Pojo;false;getBoxedChars;();;Argument[this].SyntheticField[p.Pojo.charList];ReturnValue;value;df-generated
+  // No content based summary as charList is a "dead" (synthetic)field.
   public List<Character> getBoxedChars() {
     return charList;
   }
 
   // summary=p;Pojo;false;getBoxedBytes;();;Argument[this];ReturnValue;taint;df-generated
-  // contentbased-summary=p;Pojo;false;getBoxedBytes;();;Argument[this].SyntheticField[p.Pojo.byteObjectArray];ReturnValue;value;df-generated
+  // contentbased-summary=p;Pojo;false;getBoxedBytes;();;Argument[this].SyntheticField[p.Pojo.byteObjectArray];ReturnValue;value;dfc-generated
   public Byte[] getBoxedBytes() {
     return byteObjectArray;
   }
@@ -113,8 +130,48 @@ public final class Pojo {
   }
 
   // summary=p;Pojo;false;fillIn;(List);;Argument[this];Argument[0].Element;taint;df-generated
-  // contentbased-summary=p;Pojo;false;fillIn;(List);;Argument[this].SyntheticField[p.Pojo.value];Argument[0].Element;value;df-generated
+  // contentbased-summary=p;Pojo;false;fillIn;(List);;Argument[this].SyntheticField[p.Pojo.value];Argument[0].Element;value;dfc-generated
   public void fillIn(List<String> target) {
     target.add(value);
   }
+
+  // summary=p;Pojo;false;setStringValue1;(String);;Argument[0];Argument[this];taint;df-generated
+  // contentbased-summary=p;Pojo;false;setStringValue1;(String);;Argument[0];Argument[this].SyntheticField[p.Pojo.stringValue1];value;dfc-generated
+  public void setStringValue1(String value) {
+    this.stringValue1 = value;
+  }
+
+  // neutral=p;Pojo;copyStringValue;();summary;df-generated
+  // contentbased-summary=p;Pojo;false;copyStringValue;();;Argument[this].SyntheticField[p.Pojo.stringValue1];Argument[this].SyntheticField[p.Pojo.stringValue2];value;dfc-generated
+  public void copyStringValue() {
+    this.stringValue2 = this.stringValue1;
+  }
+
+  // summary=p;Pojo;false;getStringValue2;();;Argument[this];ReturnValue;taint;df-generated
+  // contentbased-summary=p;Pojo;false;getStringValue2;();;Argument[this].SyntheticField[p.Pojo.stringValue2];ReturnValue;value;dfc-generated
+  public String getStringValue2() {
+    return this.stringValue2;
+  }
+
+  public class InnerPojo {
+    private String value;
+
+    // summary=p;Pojo$InnerPojo;true;InnerPojo;(String);;Argument[0];Argument[this];taint;df-generated
+    // contentbased-summary=p;Pojo$InnerPojo;true;InnerPojo;(String);;Argument[0];Argument[this].SyntheticField[p.Pojo$InnerPojo.value];value;dfc-generated
+    public InnerPojo(String value) {
+      this.value = value;
+    }
+
+    // summary=p;Pojo$InnerPojo;true;getValue;();;Argument[this];ReturnValue;taint;df-generated
+    // contentbased-summary=p;Pojo$InnerPojo;true;getValue;();;Argument[this].SyntheticField[p.Pojo$InnerPojo.value];ReturnValue;value;dfc-generated
+    public String getValue() {
+      return value;
+    }
+  }
+
+  // summary=p;Pojo;false;makeInnerPojo;(String);;Argument[0];ReturnValue;taint;df-generated
+  // contentbased-summary=p;Pojo;false;makeInnerPojo;(String);;Argument[0];ReturnValue.SyntheticField[p.Pojo$InnerPojo.value];value;dfc-generated
+  public InnerPojo makeInnerPojo(String value) {
+    return new InnerPojo(value);
+  }
 }
diff --git a/java/ql/test/utils/modelgenerator/dataflow/p/PrivateFlowViaPublicInterface.java b/java/ql/test/utils/modelgenerator/dataflow/p/PrivateFlowViaPublicInterface.java
index b5a1de27d4a..282d0b077b7 100644
--- a/java/ql/test/utils/modelgenerator/dataflow/p/PrivateFlowViaPublicInterface.java
+++ b/java/ql/test/utils/modelgenerator/dataflow/p/PrivateFlowViaPublicInterface.java
@@ -29,9 +29,6 @@ public class PrivateFlowViaPublicInterface {
     }
 
     // summary=p;PrivateFlowViaPublicInterface$SPI;true;openStream;();;Argument[this];ReturnValue;taint;df-generated
-    // A field based model should not be lifted if the field pertains to the concrete
-    // implementation.
-    // SPURIOUS-contentbased-summary=p;PrivateFlowViaPublicInterface$SPI;true;openStream;();;Argument[this].SyntheticField[p.PrivateFlowViaPublicInterface$PrivateImplWithSink.file];ReturnValue;taint;df-generated
     @Override
     public OutputStream openStream() throws IOException {
       return new FileOutputStream(file);
@@ -54,9 +51,7 @@ public class PrivateFlowViaPublicInterface {
   }
 
   // summary=p;PrivateFlowViaPublicInterface;true;createAnSPI;(File);;Argument[0];ReturnValue;taint;df-generated
-  // A field based model should not be lifted if the field pertains to the concrete
-  // implementation.
-  // SPURIOUS-contentbased-summary=p;PrivateFlowViaPublicInterface;true;createAnSPI;(File);;Argument[0];ReturnValue.SyntheticField[p.PrivateFlowViaPublicInterface$PrivateImplWithSink.file];value;df-generated
+  // contentbased-summary=p;PrivateFlowViaPublicInterface;true;createAnSPI;(File);;Argument[0];ReturnValue.SyntheticField[p.PrivateFlowViaPublicInterface$PrivateImplWithSink.file];value;dfc-generated
   public static SPI createAnSPI(File file) {
     return new PrivateImplWithSink(file);
   }
diff --git a/java/ql/test/utils/modelgenerator/dataflow/p/SyntheticCollections.java b/java/ql/test/utils/modelgenerator/dataflow/p/SyntheticCollections.java
new file mode 100644
index 00000000000..6dd351e12bf
--- /dev/null
+++ b/java/ql/test/utils/modelgenerator/dataflow/p/SyntheticCollections.java
@@ -0,0 +1,17 @@
+package p;
+
+public class SyntheticCollections {
+  private String[] array;
+
+  // summary=p;SyntheticCollections;true;SyntheticCollections;(String[]);;Argument[0].ArrayElement;Argument[this];taint;df-generated
+  // contentbased-summary=p;SyntheticCollections;true;SyntheticCollections;(String[]);;Argument[0];Argument[this].SyntheticField[p.SyntheticCollections.array];value;dfc-generated
+  public SyntheticCollections(String[] array) {
+    this.array = array;
+  }
+
+  // summary=p;SyntheticCollections;true;getElement;(Integer);;Argument[this];ReturnValue;taint;df-generated
+  // contentbased-summary=p;SyntheticCollections;true;getElement;(Integer);;Argument[this].SyntheticField[p.SyntheticCollections.array].ArrayElement;ReturnValue;value;dfc-generated
+  public String getElement(Integer index) {
+    return array[index];
+  }
+}
diff --git a/javascript/extractor/lib/typescript/src/type_table.ts b/javascript/extractor/lib/typescript/src/type_table.ts
index 42eaedf4ab6..4a00dfcc9c7 100644
--- a/javascript/extractor/lib/typescript/src/type_table.ts
+++ b/javascript/extractor/lib/typescript/src/type_table.ts
@@ -435,6 +435,7 @@ export class TypeTable {
    * Returns `null` if we do not support extraction of this type.
    */
   public getId(type: ts.Type, unfoldAlias: boolean): number | null {
+    if (this.skipExtractingTypes) return null;
     let cached = this.idCache.get(type) ?? [undefined, undefined];
     let cachedValue = cached[unfoldAlias ? 1 : 0];
     if (cachedValue !== undefined) return cachedValue;
diff --git a/javascript/extractor/src/com/semmle/js/extractor/HTMLExtractor.java b/javascript/extractor/src/com/semmle/js/extractor/HTMLExtractor.java
index 83fd3236b2e..bcc0e4b6af6 100644
--- a/javascript/extractor/src/com/semmle/js/extractor/HTMLExtractor.java
+++ b/javascript/extractor/src/com/semmle/js/extractor/HTMLExtractor.java
@@ -184,8 +184,9 @@ public class HTMLExtractor implements IExtractor {
   private static final Pattern ANGULAR_FOR_LOOP_DECL =
       Pattern.compile("^ *let +(\\w+) +of(?: +|(?!\\w))(.*)");
 
+  /** Attribute names that look valid in HTML or in one of the template languages we support, like Vue and Angular. */
   private static final Pattern VALID_ATTRIBUTE_NAME =
-      Pattern.compile("\\*?\\[?\\(?[\\w:_\\-]+\\]?\\)?");
+      Pattern.compile("[*:@]?\\[?\\(?[\\w:_\\-.]+\\]?\\)?");
 
   /** List of HTML attributes whose value is interpreted as JavaScript. */
   private static final Pattern JS_ATTRIBUTE =
diff --git a/javascript/extractor/src/com/semmle/js/extractor/Main.java b/javascript/extractor/src/com/semmle/js/extractor/Main.java
index 1f3923810c2..4b2575b47f3 100644
--- a/javascript/extractor/src/com/semmle/js/extractor/Main.java
+++ b/javascript/extractor/src/com/semmle/js/extractor/Main.java
@@ -41,7 +41,7 @@ public class Main {
    * A version identifier that should be updated every time the extractor changes in such a way that
    * it may produce different tuples for the same file under the same {@link ExtractorConfig}.
    */
-  public static final String EXTRACTOR_VERSION = "2024-04-17";
+  public static final String EXTRACTOR_VERSION = "2024-10-29";
 
   public static final Pattern NEWLINE = Pattern.compile("\n");
 
diff --git a/javascript/ql/lib/CHANGELOG.md b/javascript/ql/lib/CHANGELOG.md
index 105414b5b37..50d1486c006 100644
--- a/javascript/ql/lib/CHANGELOG.md
+++ b/javascript/ql/lib/CHANGELOG.md
@@ -1,3 +1,17 @@
+## 2.1.0
+
+### New Features
+
+* Added support for custom threat-models, which can be used in most of our taint-tracking queries, see our [documentation](https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/customizing-your-advanced-setup-for-code-scanning#extending-codeql-coverage-with-threat-models) for more details.
+
+## 2.0.2
+
+No user-facing changes.
+
+## 2.0.1
+
+No user-facing changes.
+
 ## 2.0.0
 
 ### Breaking Changes
diff --git a/javascript/ql/lib/change-notes/2024-11-11-matchAll-support.md b/javascript/ql/lib/change-notes/2024-11-11-matchAll-support.md
new file mode 100644
index 00000000000..74d7c3f34c2
--- /dev/null
+++ b/javascript/ql/lib/change-notes/2024-11-11-matchAll-support.md
@@ -0,0 +1,4 @@
+---
+category: minorAnalysis
+---
+Added support for `String.prototype.matchAll`.
diff --git a/javascript/ql/lib/change-notes/2024-11-11-reserve-support.md b/javascript/ql/lib/change-notes/2024-11-11-reserve-support.md
new file mode 100644
index 00000000000..bd2e6808e0c
--- /dev/null
+++ b/javascript/ql/lib/change-notes/2024-11-11-reserve-support.md
@@ -0,0 +1,4 @@
+---
+category: minorAnalysis
+---
+* Added taint-steps for `Array.prototype.reverse`
diff --git a/javascript/ql/lib/change-notes/2024-11-12-immutable-array-operations.md b/javascript/ql/lib/change-notes/2024-11-12-immutable-array-operations.md
new file mode 100644
index 00000000000..20c16d88c6e
--- /dev/null
+++ b/javascript/ql/lib/change-notes/2024-11-12-immutable-array-operations.md
@@ -0,0 +1,5 @@
+---
+category: minorAnalysis
+---
+* Added taint-steps for `Array.prototype.toReversed`.
+* Added taint-steps for `Array.prototype.toSorted`.
diff --git a/javascript/ql/lib/change-notes/2024-11-15-toSpliced-support.md b/javascript/ql/lib/change-notes/2024-11-15-toSpliced-support.md
new file mode 100644
index 00000000000..a73955e5d2a
--- /dev/null
+++ b/javascript/ql/lib/change-notes/2024-11-15-toSpliced-support.md
@@ -0,0 +1,4 @@
+---
+category: minorAnalysis
+---
+Added taint-steps for `Array.prototype.toSpliced`
diff --git a/javascript/ql/lib/change-notes/2024-11-18-ES2023-array-protype-with.md b/javascript/ql/lib/change-notes/2024-11-18-ES2023-array-protype-with.md
new file mode 100644
index 00000000000..92f160ec1de
--- /dev/null
+++ b/javascript/ql/lib/change-notes/2024-11-18-ES2023-array-protype-with.md
@@ -0,0 +1,4 @@
+---
+category: minorAnalysis
+---
+Added taint-steps for `Array.prototype.with`.
diff --git a/javascript/ql/lib/change-notes/released/2.0.1.md b/javascript/ql/lib/change-notes/released/2.0.1.md
new file mode 100644
index 00000000000..b5b6d0dee91
--- /dev/null
+++ b/javascript/ql/lib/change-notes/released/2.0.1.md
@@ -0,0 +1,3 @@
+## 2.0.1
+
+No user-facing changes.
diff --git a/javascript/ql/lib/change-notes/released/2.0.2.md b/javascript/ql/lib/change-notes/released/2.0.2.md
new file mode 100644
index 00000000000..862ef0e9df7
--- /dev/null
+++ b/javascript/ql/lib/change-notes/released/2.0.2.md
@@ -0,0 +1,3 @@
+## 2.0.2
+
+No user-facing changes.
diff --git a/javascript/ql/lib/change-notes/released/2.1.0.md b/javascript/ql/lib/change-notes/released/2.1.0.md
new file mode 100644
index 00000000000..3f8f8b0413c
--- /dev/null
+++ b/javascript/ql/lib/change-notes/released/2.1.0.md
@@ -0,0 +1,5 @@
+## 2.1.0
+
+### New Features
+
+* Added support for custom threat-models, which can be used in most of our taint-tracking queries, see our [documentation](https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/customizing-your-advanced-setup-for-code-scanning#extending-codeql-coverage-with-threat-models) for more details.
diff --git a/javascript/ql/lib/codeql-pack.release.yml b/javascript/ql/lib/codeql-pack.release.yml
index 0abe6ccede0..487a1a58b2b 100644
--- a/javascript/ql/lib/codeql-pack.release.yml
+++ b/javascript/ql/lib/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 2.0.0
+lastReleaseVersion: 2.1.0
diff --git a/javascript/ql/lib/ext/default-threat-models-fixup.model.yml b/javascript/ql/lib/ext/default-threat-models-fixup.model.yml
new file mode 100644
index 00000000000..31363571544
--- /dev/null
+++ b/javascript/ql/lib/ext/default-threat-models-fixup.model.yml
@@ -0,0 +1,8 @@
+extensions:
+  - addsTo:
+      pack: codeql/threat-models
+      extensible: threatModelConfiguration
+    data:
+    # Since responses are enabled by default in the shared threat-models configuration,
+    # we need to disable it here to keep existing behavior for the javascript analysis.
+      - ["response", false, -2147483647]
diff --git a/javascript/ql/lib/javascript.qll b/javascript/ql/lib/javascript.qll
index 07fb759bd65..7bb2b767610 100644
--- a/javascript/ql/lib/javascript.qll
+++ b/javascript/ql/lib/javascript.qll
@@ -81,6 +81,7 @@ import semmle.javascript.frameworks.Classnames
 import semmle.javascript.frameworks.ClassValidator
 import semmle.javascript.frameworks.ClientRequests
 import semmle.javascript.frameworks.ClosureLibrary
+import semmle.javascript.frameworks.CommandLineArguments
 import semmle.javascript.frameworks.CookieLibraries
 import semmle.javascript.frameworks.Credentials
 import semmle.javascript.frameworks.CryptoLibraries
diff --git a/javascript/ql/lib/qlpack.yml b/javascript/ql/lib/qlpack.yml
index 6355ae8868a..f732755a75b 100644
--- a/javascript/ql/lib/qlpack.yml
+++ b/javascript/ql/lib/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/javascript-all
-version: 2.0.1-dev
+version: 2.1.1-dev
 groups: javascript
 dbscheme: semmlecode.javascript.dbscheme
 extractor: javascript
@@ -9,6 +9,7 @@ dependencies:
   codeql/dataflow: ${workspace}
   codeql/mad: ${workspace}
   codeql/regex: ${workspace}
+  codeql/threat-models: ${workspace}
   codeql/tutorial: ${workspace}
   codeql/util: ${workspace}
   codeql/xml: ${workspace}
@@ -17,4 +18,5 @@ dataExtensions:
   - semmle/javascript/frameworks/**/model.yml
   - semmle/javascript/frameworks/**/*.model.yml
   - semmle/javascript/security/domains/**/*.model.yml
+  - ext/*.model.yml
 warnOnImplicitThis: true
diff --git a/javascript/ql/lib/semmle/javascript/Arrays.qll b/javascript/ql/lib/semmle/javascript/Arrays.qll
index a7cf62078a1..7ce37130996 100644
--- a/javascript/ql/lib/semmle/javascript/Arrays.qll
+++ b/javascript/ql/lib/semmle/javascript/Arrays.qll
@@ -81,12 +81,23 @@ module ArrayTaintTracking {
     pred = call.getArgument(any(int i | i >= 2)) and
     succ.(DataFlow::SourceNode).getAMethodCall("splice") = call
     or
+    // `array.toSpliced(x, y, source())`: if `source()` is tainted, then so is the result of `toSpliced`, but not the original array.
+    call.(DataFlow::MethodCallNode).getMethodName() = "toSpliced" and
+    pred = call.getArgument(any(int i | i >= 2)) and
+    succ = call
+    or
     // `array.splice(i, del, ...e)`: if `e` is tainted, then so is `array`.
     pred = call.getASpreadArgument() and
     succ.(DataFlow::SourceNode).getAMethodCall("splice") = call
     or
+    // `array.toSpliced(i, del, ...e)`: if `e` is tainted, then so is the result of `toSpliced`, but not the original array.
+    pred = call.getASpreadArgument() and
+    call.(DataFlow::MethodCallNode).getMethodName() = "toSpliced" and
+    succ = call
+    or
     // `e = array.pop()`, `e = array.shift()`, or similar: if `array` is tainted, then so is `e`.
-    call.(DataFlow::MethodCallNode).calls(pred, ["pop", "shift", "slice", "splice", "at"]) and
+    call.(DataFlow::MethodCallNode)
+        .calls(pred, ["pop", "shift", "slice", "splice", "at", "toSpliced"]) and
     succ = call
     or
     // `e = Array.from(x)`: if `x` is tainted, then so is `e`.
@@ -283,7 +294,7 @@ private module ArrayDataFlow {
   private class ArraySpliceStep extends PreCallGraphStep {
     override predicate storeStep(DataFlow::Node element, DataFlow::SourceNode obj, string prop) {
       exists(DataFlow::MethodCallNode call |
-        call.getMethodName() = "splice" and
+        call.getMethodName() = ["splice", "toSpliced"] and
         prop = arrayElement() and
         element = call.getArgument(any(int i | i >= 2)) and
         call = obj.getAMethodCall()
@@ -297,7 +308,7 @@ private module ArrayDataFlow {
       toProp = arrayElement() and
       // `array.splice(i, del, ...arr)` variant
       exists(DataFlow::MethodCallNode mcn |
-        mcn.getMethodName() = "splice" and
+        mcn.getMethodName() = ["splice", "toSpliced"] and
         pred = mcn.getASpreadArgument() and
         succ = mcn.getReceiver().getALocalSource()
       )
@@ -320,12 +331,12 @@ private module ArrayDataFlow {
   }
 
   /**
-   * A step for modeling that elements from an array `arr` also appear in the result from calling `slice`/`splice`/`filter`.
+   * A step for modeling that elements from an array `arr` also appear in the result from calling `slice`/`splice`/`filter`/`toSpliced`.
    */
   private class ArraySliceStep extends PreCallGraphStep {
     override predicate loadStoreStep(DataFlow::Node pred, DataFlow::SourceNode succ, string prop) {
       exists(DataFlow::MethodCallNode call |
-        call.getMethodName() = ["slice", "splice", "filter"] and
+        call.getMethodName() = ["slice", "splice", "filter", "toSpliced"] and
         prop = arrayElement() and
         pred = call.getReceiver() and
         succ = call
@@ -444,4 +455,32 @@ private module ArrayLibraries {
       )
     }
   }
+
+  /**
+   * A taint propagating data flow edge arising from in-place array manipulation operations.
+   * The methods return the pointer to `this` array as well.
+   */
+  private class ArrayInPlaceManipulationTaintStep extends TaintTracking::SharedTaintStep {
+    override predicate heapStep(DataFlow::Node pred, DataFlow::Node succ) {
+      exists(DataFlow::MethodCallNode call |
+        call.getMethodName() in ["sort", "reverse"] and
+        pred = call.getReceiver() and
+        succ = call
+      )
+    }
+  }
+
+  /**
+   * A taint propagating data flow edge arising from array transformation operations
+   * that return a new array instead of modifying the original array in place.
+   */
+  private class ImmutableArrayTransformStep extends TaintTracking::SharedTaintStep {
+    override predicate heapStep(DataFlow::Node pred, DataFlow::Node succ) {
+      exists(DataFlow::MethodCallNode call |
+        call.getMethodName() in ["toSorted", "toReversed", "with"] and
+        pred = call.getReceiver() and
+        succ = call
+      )
+    }
+  }
 }
diff --git a/javascript/ql/lib/semmle/javascript/Concepts.qll b/javascript/ql/lib/semmle/javascript/Concepts.qll
index 14102556a87..6cab648f556 100644
--- a/javascript/ql/lib/semmle/javascript/Concepts.qll
+++ b/javascript/ql/lib/semmle/javascript/Concepts.qll
@@ -5,6 +5,63 @@
  */
 
 import javascript
+private import codeql.threatmodels.ThreatModels
+
+/**
+ * A data flow source, for a specific threat-model.
+ *
+ * Extend this class to refine existing API models. If you want to model new APIs,
+ * extend `ThreatModelSource::Range` instead.
+ */
+class ThreatModelSource extends DataFlow::Node instanceof ThreatModelSource::Range {
+  /**
+   * Gets a string that represents the source kind with respect to threat modeling.
+   *
+   *
+   * See
+   * - https://github.com/github/codeql/blob/main/docs/codeql/reusables/threat-model-description.rst
+   * - https://github.com/github/codeql/blob/main/shared/threat-models/ext/threat-model-grouping.model.yml
+   */
+  string getThreatModel() { result = super.getThreatModel() }
+
+  /** Gets a string that describes the type of this threat-model source. */
+  string getSourceType() { result = super.getSourceType() }
+}
+
+/** Provides a class for modeling new sources for specific threat-models. */
+module ThreatModelSource {
+  /**
+   * A data flow source, for a specific threat-model.
+   *
+   * Extend this class to model new APIs. If you want to refine existing API models,
+   * extend `ThreatModelSource` instead.
+   */
+  abstract class Range extends DataFlow::Node {
+    /**
+     * Gets a string that represents the source kind with respect to threat modeling.
+     *
+     * See
+     * - https://github.com/github/codeql/blob/main/docs/codeql/reusables/threat-model-description.rst
+     * - https://github.com/github/codeql/blob/main/shared/threat-models/ext/threat-model-grouping.model.yml
+     */
+    abstract string getThreatModel();
+
+    /** Gets a string that describes the type of this threat-model source. */
+    abstract string getSourceType();
+  }
+}
+
+/**
+ * A data flow source that is enabled in the current threat model configuration.
+ */
+class ActiveThreatModelSource extends ThreatModelSource {
+  ActiveThreatModelSource() {
+    exists(string kind |
+      currentThreatModel(kind) and
+      this.getThreatModel() = kind
+    )
+  }
+}
 
 /**
  * A data flow node that executes an operating system command,
@@ -65,6 +122,19 @@ abstract class FileSystemReadAccess extends FileSystemAccess {
   abstract DataFlow::Node getADataNode();
 }
 
+/**
+ * A FileSystemReadAccess seen as a ThreatModelSource.
+ */
+private class FileSystemReadAccessAsThreatModelSource extends ThreatModelSource::Range {
+  FileSystemReadAccessAsThreatModelSource() {
+    this = any(FileSystemReadAccess access).getADataNode()
+  }
+
+  override string getThreatModel() { result = "file" }
+
+  override string getSourceType() { result = "FileSystemReadAccess" }
+}
+
 /**
  * A data flow node that writes data to the file system.
  */
@@ -91,6 +161,17 @@ abstract class DatabaseAccess extends DataFlow::Node {
   }
 }
 
+/**
+ * A DatabaseAccess seen as a ThreatModelSource.
+ */
+private class DatabaseAccessAsThreatModelSource extends ThreatModelSource::Range {
+  DatabaseAccessAsThreatModelSource() { this = any(DatabaseAccess access).getAResult() }
+
+  override string getThreatModel() { result = "database" }
+
+  override string getSourceType() { result = "DatabaseAccess" }
+}
+
 /**
  * A data flow node that reads persistent data.
  */
diff --git a/javascript/ql/lib/semmle/javascript/MembershipCandidates.qll b/javascript/ql/lib/semmle/javascript/MembershipCandidates.qll
index 21f4cc1b1c5..da9e90744ef 100644
--- a/javascript/ql/lib/semmle/javascript/MembershipCandidates.qll
+++ b/javascript/ql/lib/semmle/javascript/MembershipCandidates.qll
@@ -193,7 +193,7 @@ module MembershipCandidate {
         or
         // u.match(/re/) or u.match("re")
         base = this and
-        m = "match" and
+        m = ["match", "matchAll"] and
         enumeration = RegExp::getRegExpFromNode(firstArg)
       )
     }
diff --git a/javascript/ql/lib/semmle/javascript/Regexp.qll b/javascript/ql/lib/semmle/javascript/Regexp.qll
index 27ad339c733..dc7b0190c91 100644
--- a/javascript/ql/lib/semmle/javascript/Regexp.qll
+++ b/javascript/ql/lib/semmle/javascript/Regexp.qll
@@ -938,7 +938,7 @@ private predicate isMatchObjectProperty(string name) {
 
 /** Holds if `call` is a call to `match` whose result is used in a way that is incompatible with Match objects. */
 private predicate isUsedAsNonMatchObject(DataFlow::MethodCallNode call) {
-  call.getMethodName() = "match" and
+  call.getMethodName() = ["match", "matchAll"] and
   call.getNumArgument() = 1 and
   (
     // Accessing a property that is absent on Match objects
@@ -972,7 +972,7 @@ private predicate isUsedAsNumber(DataFlow::LocalSourceNode value) {
   or
   exists(DataFlow::CallNode call |
     call.getCalleeName() =
-      ["substring", "substr", "slice", "splice", "charAt", "charCodeAt", "codePointAt"] and
+      ["substring", "substr", "slice", "splice", "charAt", "charCodeAt", "codePointAt", "toSpliced"] and
     value.flowsTo(call.getAnArgument())
   )
 }
@@ -996,7 +996,7 @@ predicate isInterpretedAsRegExp(DataFlow::Node source) {
         not isNativeStringMethod(func, methodName)
       )
     |
-      methodName = "match" and
+      methodName = ["match", "matchAll"] and
       source = mce.getArgument(0) and
       mce.getNumArgument() = 1 and
       not isUsedAsNonMatchObject(mce)
diff --git a/javascript/ql/lib/semmle/javascript/StringOps.qll b/javascript/ql/lib/semmle/javascript/StringOps.qll
index 6b7820e964d..f2b7f3eb9aa 100644
--- a/javascript/ql/lib/semmle/javascript/StringOps.qll
+++ b/javascript/ql/lib/semmle/javascript/StringOps.qll
@@ -722,7 +722,7 @@ module StringOps {
     }
 
     private class MatchCall extends DataFlow::MethodCallNode {
-      MatchCall() { this.getMethodName() = "match" }
+      MatchCall() { this.getMethodName() = ["match", "matchAll"] }
     }
 
     private class ExecCall extends DataFlow::MethodCallNode {
diff --git a/javascript/ql/lib/semmle/javascript/dataflow/TaintTracking.qll b/javascript/ql/lib/semmle/javascript/dataflow/TaintTracking.qll
index 11ce802ac72..a19691e9448 100644
--- a/javascript/ql/lib/semmle/javascript/dataflow/TaintTracking.qll
+++ b/javascript/ql/lib/semmle/javascript/dataflow/TaintTracking.qll
@@ -716,7 +716,7 @@ module TaintTracking {
 
   pragma[nomagic]
   private DataFlow::MethodCallNode matchMethodCall() {
-    result.getMethodName() = "match" and
+    result.getMethodName() = ["match", "matchAll"] and
     exists(DataFlow::AnalyzedNode analyzed |
       pragma[only_bind_into](analyzed) = result.getArgument(0).analyze() and
       analyzed.getAType() = TTRegExp()
@@ -869,19 +869,6 @@ module TaintTracking {
     }
   }
 
-  /**
-   * A taint propagating data flow edge arising from sorting.
-   */
-  private class SortTaintStep extends SharedTaintStep {
-    override predicate heapStep(DataFlow::Node pred, DataFlow::Node succ) {
-      exists(DataFlow::MethodCallNode call |
-        call.getMethodName() = "sort" and
-        pred = call.getReceiver() and
-        succ = call
-      )
-    }
-  }
-
   /**
    * A taint step through an exception constructor, such as `x` to `new Error(x)`.
    */
@@ -917,7 +904,7 @@ module TaintTracking {
      */
     private ControlFlowNode getACaptureSetter(DataFlow::Node input) {
       exists(DataFlow::MethodCallNode call | result = call.asExpr() |
-        call.getMethodName() = ["search", "replace", "replaceAll", "match"] and
+        call.getMethodName() = ["search", "replace", "replaceAll", "match", "matchAll"] and
         input = call.getReceiver()
         or
         call.getMethodName() = ["test", "exec"] and input = call.getArgument(0)
@@ -998,7 +985,7 @@ module TaintTracking {
         or
         // u.match(/re/) or u.match("re")
         base = expr and
-        m = "match" and
+        m = ["match", "matchAll"] and
         RegExp::isGenericRegExpSanitizer(RegExp::getRegExpFromNode(firstArg.flow()),
           sanitizedOutcome)
       )
diff --git a/javascript/ql/lib/semmle/javascript/frameworks/CommandLineArguments.qll b/javascript/ql/lib/semmle/javascript/frameworks/CommandLineArguments.qll
new file mode 100644
index 00000000000..50beb04b887
--- /dev/null
+++ b/javascript/ql/lib/semmle/javascript/frameworks/CommandLineArguments.qll
@@ -0,0 +1,144 @@
+/** Provides modeling for parsed command line arguments. */
+
+import javascript
+
+/**
+ * An object containing command-line arguments, potentially parsed by a library.
+ *
+ * Extend this class to refine existing API models. If you want to model new APIs,
+ * extend `CommandLineArguments::Range` instead.
+ */
+class CommandLineArguments extends ThreatModelSource instanceof CommandLineArguments::Range { }
+
+/** Provides a class for modeling new sources of remote user input. */
+module CommandLineArguments {
+  /**
+   * An object containing command-line arguments, potentially parsed by a library.
+   *
+   * Extend this class to model new APIs. If you want to refine existing API models,
+   * extend `CommandLineArguments` instead.
+   */
+  abstract class Range extends ThreatModelSource::Range {
+    override string getThreatModel() { result = "commandargs" }
+
+    override string getSourceType() { result = "CommandLineArguments" }
+  }
+}
+
+/** A read of `process.argv`, considered as a threat-model source. */
+private class ProcessArgv extends CommandLineArguments::Range {
+  ProcessArgv() {
+    // `process.argv[0]` and `process.argv[1]` are paths to `node` and `main`, and
+    // therefore should not be considered a threat-source... However, we don't have an
+    // easy way to exclude them, so we need to allow them.
+    this = NodeJSLib::process().getAPropertyRead("argv")
+  }
+
+  override string getSourceType() { result = "process.argv" }
+}
+
+private class DefaultModels extends CommandLineArguments::Range {
+  DefaultModels() {
+    // `require('get-them-args')(...)` => `{ unknown: [], a: ... b: ... }`
+    this = DataFlow::moduleImport("get-them-args").getACall()
+    or
+    // `require('optimist').argv` => `{ _: [], a: ... b: ... }`
+    this = DataFlow::moduleMember("optimist", "argv")
+    or
+    // `require("arg")({...spec})` => `{_: [], a: ..., b: ...}`
+    this = DataFlow::moduleImport("arg").getACall()
+    or
+    // `(new (require(argparse)).ArgumentParser({...spec})).parse_args()` => `{a: ..., b: ...}`
+    this =
+      API::moduleImport("argparse")
+          .getMember("ArgumentParser")
+          .getInstance()
+          .getMember("parse_args")
+          .getACall()
+    or
+    // `require('command-line-args')({...spec})` => `{a: ..., b: ...}`
+    this = DataFlow::moduleImport("command-line-args").getACall()
+    or
+    // `require('meow')(help, {...spec})` => `{a: ..., b: ....}`
+    this = DataFlow::moduleImport("meow").getACall()
+    or
+    // `require("dashdash").createParser(...spec)` => `{a: ..., b: ...}`
+    this =
+      [
+        API::moduleImport("dashdash"),
+        API::moduleImport("dashdash").getMember("createParser").getReturn()
+      ].getMember("parse").getACall()
+    or
+    // `require('commander').myCmdArgumentName`
+    this = commander().getAMember().asSource()
+    or
+    // `require('commander').opt()` => `{a: ..., b: ...}`
+    this = commander().getMember("opts").getACall()
+    or
+    this = API::moduleImport("yargs/yargs").getReturn().getMember("argv").asSource()
+  }
+}
+
+/**
+ * A step for propagating taint through command line parsing,
+ * such as `var succ = require("minimist")(pred)`.
+ */
+private class ArgsParseStep extends TaintTracking::SharedTaintStep {
+  override predicate step(DataFlow::Node pred, DataFlow::Node succ) {
+    exists(DataFlow::CallNode call |
+      call = DataFlow::moduleMember("args", "parse").getACall() or
+      call = DataFlow::moduleImport(["yargs-parser", "minimist", "subarg"]).getACall()
+    |
+      succ = call and
+      pred = call.getArgument(0)
+    )
+  }
+}
+
+/**
+ * Gets a Command instance from the `commander` library.
+ */
+private API::Node commander() {
+  result = API::moduleImport("commander")
+  or
+  // `require("commander").program === require("commander")`
+  result = commander().getMember("program")
+  or
+  result = commander().getMember("Command").getInstance()
+  or
+  // lots of chainable methods
+  result = commander().getAMember().getReturn()
+}
+
+/**
+ * Gets an instance of `yargs`.
+ * Either directly imported as a module, or through some chained method call.
+ */
+private DataFlow::SourceNode yargs() {
+  result = DataFlow::moduleImport("yargs")
+  or
+  // script used to generate list of chained methods: https://gist.github.com/erik-krogh/f8afe952c0577f4b563a993e613269ba
+  exists(string method |
+    not method =
+      // the methods that does not return a chained `yargs` object.
+      [
+        "getContext", "getDemandedOptions", "getDemandedCommands", "getDeprecatedOptions",
+        "_getParseContext", "getOptions", "getGroups", "getStrict", "getStrictCommands",
+        "getExitProcess", "locale", "getUsageInstance", "getCommandInstance"
+      ]
+  |
+    result = yargs().getAMethodCall(method)
+  )
+}
+
+/**
+ * An array of command line arguments (`argv`) parsed by the `yargs` library.
+ */
+private class YargsArgv extends CommandLineArguments::Range {
+  YargsArgv() {
+    this = yargs().getAPropertyRead("argv")
+    or
+    this = yargs().getAMethodCall("parse") and
+    this.(DataFlow::MethodCallNode).getNumArgument() = 0
+  }
+}
diff --git a/javascript/ql/lib/semmle/javascript/frameworks/NodeJSLib.model.yml b/javascript/ql/lib/semmle/javascript/frameworks/NodeJSLib.model.yml
new file mode 100644
index 00000000000..43035615a12
--- /dev/null
+++ b/javascript/ql/lib/semmle/javascript/frameworks/NodeJSLib.model.yml
@@ -0,0 +1,10 @@
+extensions:
+  - addsTo:
+      pack: codeql/javascript-all
+      extensible: sourceModel
+    data:
+      - ['fs', 'Member[promises].Member[readFile].ReturnValue.Member[then].Argument[0].Parameter[0]', 'file']
+      - ['global', 'Member[process].Member[stdin].Member[read].ReturnValue', 'stdin']
+      - ['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']
diff --git a/javascript/ql/lib/semmle/javascript/frameworks/NodeJSLib.qll b/javascript/ql/lib/semmle/javascript/frameworks/NodeJSLib.qll
index 98bb0f615b6..3427591bc1b 100644
--- a/javascript/ql/lib/semmle/javascript/frameworks/NodeJSLib.qll
+++ b/javascript/ql/lib/semmle/javascript/frameworks/NodeJSLib.qll
@@ -1244,4 +1244,13 @@ module NodeJSLib {
       result = moduleImport().getAPropertyRead(member)
     }
   }
+
+  /** A read of `process.env`, considered as a threat-model source. */
+  private class ProcessEnvThreatSource extends ThreatModelSource::Range {
+    ProcessEnvThreatSource() { this = NodeJSLib::process().getAPropertyRead("env") }
+
+    override string getThreatModel() { result = "environment" }
+
+    override string getSourceType() { result = "process.env" }
+  }
 }
diff --git a/javascript/ql/lib/semmle/javascript/frameworks/data/ModelsAsData.qll b/javascript/ql/lib/semmle/javascript/frameworks/data/ModelsAsData.qll
index 6e95955749b..856a61276a0 100644
--- a/javascript/ql/lib/semmle/javascript/frameworks/data/ModelsAsData.qll
+++ b/javascript/ql/lib/semmle/javascript/frameworks/data/ModelsAsData.qll
@@ -32,6 +32,19 @@ private class RemoteFlowSourceFromMaD extends RemoteFlowSource {
   override string getSourceType() { result = "Remote flow" }
 }
 
+/**
+ * A threat-model flow source originating from a data extension.
+ */
+private class ThreatModelSourceFromDataExtension extends ThreatModelSource::Range {
+  ThreatModelSourceFromDataExtension() { this = ModelOutput::getASourceNode(_).asSource() }
+
+  override string getThreatModel() { this = ModelOutput::getASourceNode(result).asSource() }
+
+  override string getSourceType() {
+    result = "Source node (" + this.getThreatModel() + ") [from data-extension]"
+  }
+}
+
 /**
  * Like `ModelOutput::summaryStep` but with API nodes mapped to data-flow nodes.
  */
diff --git a/javascript/ql/lib/semmle/javascript/security/dataflow/ClientSideUrlRedirectCustomizations.qll b/javascript/ql/lib/semmle/javascript/security/dataflow/ClientSideUrlRedirectCustomizations.qll
index 3a0c65f295d..e1d7f0a22c2 100644
--- a/javascript/ql/lib/semmle/javascript/security/dataflow/ClientSideUrlRedirectCustomizations.qll
+++ b/javascript/ql/lib/semmle/javascript/security/dataflow/ClientSideUrlRedirectCustomizations.qll
@@ -38,9 +38,16 @@ module ClientSideUrlRedirect {
     DocumentUrl() { this = "document.url" }
   }
 
-  /** A source of remote user input, considered as a flow source for unvalidated URL redirects. */
-  class RemoteFlowSourceAsSource extends Source instanceof RemoteFlowSource {
-    RemoteFlowSourceAsSource() { not this.(ClientSideRemoteFlowSource).getKind().isPath() }
+  /**
+   * DEPRECATED: Use `ActiveThreatModelSource` from Concepts instead!
+   */
+  deprecated class RemoteFlowSourceAsSource = ActiveThreatModelSourceAsSource;
+
+  /**
+   * An active threat-model source, considered as a flow source.
+   */
+  private class ActiveThreatModelSourceAsSource extends Source instanceof ActiveThreatModelSource {
+    ActiveThreatModelSourceAsSource() { not this.(ClientSideRemoteFlowSource).getKind().isPath() }
 
     override DataFlow::FlowLabel getAFlowLabel() {
       if this.(ClientSideRemoteFlowSource).getKind().isUrl()
diff --git a/javascript/ql/lib/semmle/javascript/security/dataflow/CodeInjectionCustomizations.qll b/javascript/ql/lib/semmle/javascript/security/dataflow/CodeInjectionCustomizations.qll
index 4d014768325..8fded55bc89 100644
--- a/javascript/ql/lib/semmle/javascript/security/dataflow/CodeInjectionCustomizations.qll
+++ b/javascript/ql/lib/semmle/javascript/security/dataflow/CodeInjectionCustomizations.qll
@@ -27,8 +27,15 @@ module CodeInjection {
    */
   abstract class Sanitizer extends DataFlow::Node { }
 
-  /** A source of remote user input, considered as a flow source for code injection. */
-  class RemoteFlowSourceAsSource extends Source instanceof RemoteFlowSource { }
+  /**
+   * DEPRECATED: Use `ActiveThreatModelSource` from Concepts instead!
+   */
+  deprecated class RemoteFlowSourceAsSource = ActiveThreatModelSourceAsSource;
+
+  /**
+   * An active threat-model source, considered as a flow source.
+   */
+  private class ActiveThreatModelSourceAsSource extends Source, ActiveThreatModelSource { }
 
   /**
    * An expression which may be interpreted as an AngularJS expression.
diff --git a/javascript/ql/lib/semmle/javascript/security/dataflow/CommandInjectionCustomizations.qll b/javascript/ql/lib/semmle/javascript/security/dataflow/CommandInjectionCustomizations.qll
index 8581a5b0cb0..132a5cc2eda 100644
--- a/javascript/ql/lib/semmle/javascript/security/dataflow/CommandInjectionCustomizations.qll
+++ b/javascript/ql/lib/semmle/javascript/security/dataflow/CommandInjectionCustomizations.qll
@@ -25,9 +25,16 @@ module CommandInjection {
    */
   abstract class Sanitizer extends DataFlow::Node { }
 
-  /** A source of remote user input, considered as a flow source for command injection. */
-  class RemoteFlowSourceAsSource extends Source instanceof RemoteFlowSource {
-    RemoteFlowSourceAsSource() { not this instanceof ClientSideRemoteFlowSource }
+  /**
+   * DEPRECATED: Use `ActiveThreatModelSource` from Concepts instead!
+   */
+  deprecated class RemoteFlowSourceAsSource = ActiveThreatModelSourceAsSource;
+
+  /**
+   * An active threat-model source, considered as a flow source.
+   */
+  private class ActiveThreatModelSourceAsSource extends Source instanceof ActiveThreatModelSource {
+    ActiveThreatModelSourceAsSource() { not this instanceof ClientSideRemoteFlowSource }
 
     override string getSourceType() { result = "a user-provided value" }
   }
diff --git a/javascript/ql/lib/semmle/javascript/security/dataflow/ConditionalBypassCustomizations.qll b/javascript/ql/lib/semmle/javascript/security/dataflow/ConditionalBypassCustomizations.qll
index 224615c1e8f..034699cee0d 100644
--- a/javascript/ql/lib/semmle/javascript/security/dataflow/ConditionalBypassCustomizations.qll
+++ b/javascript/ql/lib/semmle/javascript/security/dataflow/ConditionalBypassCustomizations.qll
@@ -29,10 +29,14 @@ module ConditionalBypass {
   abstract class Sanitizer extends DataFlow::Node { }
 
   /**
-   * A source of remote user input, considered as a flow source for bypass of
-   * sensitive action guards.
+   * DEPRECATED: Use `ActiveThreatModelSource` from Concepts instead!
    */
-  class RemoteFlowSourceAsSource extends Source instanceof RemoteFlowSource { }
+  deprecated class RemoteFlowSourceAsSource = ActiveThreatModelSourceAsSource;
+
+  /**
+   * An active threat-model source, considered as a flow source.
+   */
+  private class ActiveThreatModelSourceAsSource extends Source, ActiveThreatModelSource { }
 
   /**
    * Holds if `bb` dominates the basic block in which `action` occurs.
diff --git a/javascript/ql/lib/semmle/javascript/security/dataflow/CorsMisconfigurationForCredentialsCustomizations.qll b/javascript/ql/lib/semmle/javascript/security/dataflow/CorsMisconfigurationForCredentialsCustomizations.qll
index 690bc61e14b..54da0a8709f 100644
--- a/javascript/ql/lib/semmle/javascript/security/dataflow/CorsMisconfigurationForCredentialsCustomizations.qll
+++ b/javascript/ql/lib/semmle/javascript/security/dataflow/CorsMisconfigurationForCredentialsCustomizations.qll
@@ -27,9 +27,16 @@ module CorsMisconfigurationForCredentials {
    */
   abstract class Sanitizer extends DataFlow::Node { }
 
-  /** A source of remote user input, considered as a flow source for CORS misconfiguration. */
-  class RemoteFlowSourceAsSource extends Source instanceof RemoteFlowSource {
-    RemoteFlowSourceAsSource() { not this instanceof ClientSideRemoteFlowSource }
+  /**
+   * DEPRECATED: Use `ActiveThreatModelSource` from Concepts instead!
+   */
+  deprecated class RemoteFlowSourceAsSource = ActiveThreatModelSourceAsSource;
+
+  /**
+   * An active threat-model source, considered as a flow source.
+   */
+  private class ActiveThreatModelSourceAsSource extends Source instanceof ActiveThreatModelSource {
+    ActiveThreatModelSourceAsSource() { not this instanceof ClientSideRemoteFlowSource }
   }
 
   /**
diff --git a/javascript/ql/lib/semmle/javascript/security/dataflow/DeepObjectResourceExhaustionCustomizations.qll b/javascript/ql/lib/semmle/javascript/security/dataflow/DeepObjectResourceExhaustionCustomizations.qll
index baa62720717..58d8d02808e 100644
--- a/javascript/ql/lib/semmle/javascript/security/dataflow/DeepObjectResourceExhaustionCustomizations.qll
+++ b/javascript/ql/lib/semmle/javascript/security/dataflow/DeepObjectResourceExhaustionCustomizations.qll
@@ -23,7 +23,8 @@ module DeepObjectResourceExhaustion {
     override DataFlow::FlowLabel getAFlowLabel() { result = TaintedObject::label() }
   }
 
-  private class RemoteFlowSourceAsSource extends Source instanceof RemoteFlowSource {
+  /** An active threat-model source, considered as a flow source. */
+  private class ActiveThreatModelSourceAsSource extends Source, ActiveThreatModelSource {
     override DataFlow::FlowLabel getAFlowLabel() { result.isTaint() }
   }
 
diff --git a/javascript/ql/lib/semmle/javascript/security/dataflow/DomBasedXssCustomizations.qll b/javascript/ql/lib/semmle/javascript/security/dataflow/DomBasedXssCustomizations.qll
index b3ab20583ef..72d9ae4e55a 100644
--- a/javascript/ql/lib/semmle/javascript/security/dataflow/DomBasedXssCustomizations.qll
+++ b/javascript/ql/lib/semmle/javascript/security/dataflow/DomBasedXssCustomizations.qll
@@ -331,8 +331,15 @@ module DomBasedXss {
     isOptionallySanitizedEdgeInternal(_, node)
   }
 
-  /** A source of remote user input, considered as a flow source for DOM-based XSS. */
-  class RemoteFlowSourceAsSource extends Source instanceof RemoteFlowSource { }
+  /**
+   * DEPRECATED: Use `ActiveThreatModelSource` from Concepts instead!
+   */
+  deprecated class RemoteFlowSourceAsSource = ActiveThreatModelSourceAsSource;
+
+  /**
+   * An active threat-model source, considered as a flow source.
+   */
+  private class ActiveThreatModelSourceAsSource extends Source, ActiveThreatModelSource { }
 
   /**
    * A flow-label representing tainted values where the prefix is attacker controlled.
diff --git a/javascript/ql/lib/semmle/javascript/security/dataflow/IndirectCommandInjectionCustomizations.qll b/javascript/ql/lib/semmle/javascript/security/dataflow/IndirectCommandInjectionCustomizations.qll
index b2b94fcca8d..9dd6ab4b4a9 100644
--- a/javascript/ql/lib/semmle/javascript/security/dataflow/IndirectCommandInjectionCustomizations.qll
+++ b/javascript/ql/lib/semmle/javascript/security/dataflow/IndirectCommandInjectionCustomizations.qll
@@ -25,21 +25,6 @@ module IndirectCommandInjection {
    */
   abstract class Sanitizer extends DataFlow::Node { }
 
-  /**
-   * A source of user input from the command-line, considered as a flow source for command injection.
-   */
-  private class CommandLineArgumentsArrayAsSource extends Source instanceof CommandLineArgumentsArray
-  { }
-
-  /**
-   * An array of command-line arguments.
-   */
-  class CommandLineArgumentsArray extends DataFlow::SourceNode {
-    CommandLineArgumentsArray() {
-      this = DataFlow::globalVarRef("process").getAPropertyRead("argv")
-    }
-  }
-
   /**
    * A read of `process.env`, considered as a flow source for command injection.
    */
@@ -82,109 +67,9 @@ module IndirectCommandInjection {
   }
 
   /**
-   * An object containing parsed command-line arguments, considered as a flow source for command injection.
+   * An object containing command-line arguments, considered as a flow source for command injection.
    */
-  class ParsedCommandLineArgumentsAsSource extends Source {
-    ParsedCommandLineArgumentsAsSource() {
-      // `require('get-them-args')(...)` => `{ unknown: [], a: ... b: ... }`
-      this = DataFlow::moduleImport("get-them-args").getACall()
-      or
-      // `require('optimist').argv` => `{ _: [], a: ... b: ... }`
-      this = DataFlow::moduleMember("optimist", "argv")
-      or
-      // `require("arg")({...spec})` => `{_: [], a: ..., b: ...}`
-      this = DataFlow::moduleImport("arg").getACall()
-      or
-      // `(new (require(argparse)).ArgumentParser({...spec})).parse_args()` => `{a: ..., b: ...}`
-      this =
-        API::moduleImport("argparse")
-            .getMember("ArgumentParser")
-            .getInstance()
-            .getMember("parse_args")
-            .getACall()
-      or
-      // `require('command-line-args')({...spec})` => `{a: ..., b: ...}`
-      this = DataFlow::moduleImport("command-line-args").getACall()
-      or
-      // `require('meow')(help, {...spec})` => `{a: ..., b: ....}`
-      this = DataFlow::moduleImport("meow").getACall()
-      or
-      // `require("dashdash").createParser(...spec)` => `{a: ..., b: ...}`
-      this =
-        [
-          API::moduleImport("dashdash"),
-          API::moduleImport("dashdash").getMember("createParser").getReturn()
-        ].getMember("parse").getACall()
-      or
-      // `require('commander').myCmdArgumentName`
-      this = commander().getAMember().asSource()
-      or
-      // `require('commander').opt()` => `{a: ..., b: ...}`
-      this = commander().getMember("opts").getACall()
-    }
-  }
-
-  /**
-   * Holds if there is a command line parsing step from `pred` to `succ`.
-   * E.g: `var succ = require("minimist")(pred)`.
-   */
-  predicate argsParseStep(DataFlow::Node pred, DataFlow::Node succ) {
-    exists(DataFlow::CallNode call |
-      call = DataFlow::moduleMember("args", "parse").getACall() or
-      call = DataFlow::moduleImport(["yargs-parser", "minimist", "subarg"]).getACall()
-    |
-      succ = call and
-      pred = call.getArgument(0)
-    )
-  }
-
-  /**
-   * Gets a Command instance from the `commander` library.
-   */
-  private API::Node commander() {
-    result = API::moduleImport("commander")
-    or
-    // `require("commander").program === require("commander")`
-    result = commander().getMember("program")
-    or
-    result = commander().getMember("Command").getInstance()
-    or
-    // lots of chainable methods
-    result = commander().getAMember().getReturn()
-  }
-
-  /**
-   * Gets an instance of `yargs`.
-   * Either directly imported as a module, or through some chained method call.
-   */
-  private DataFlow::SourceNode yargs() {
-    result = DataFlow::moduleImport("yargs")
-    or
-    // script used to generate list of chained methods: https://gist.github.com/erik-krogh/f8afe952c0577f4b563a993e613269ba
-    exists(string method |
-      not method =
-        // the methods that does not return a chained `yargs` object.
-        [
-          "getContext", "getDemandedOptions", "getDemandedCommands", "getDeprecatedOptions",
-          "_getParseContext", "getOptions", "getGroups", "getStrict", "getStrictCommands",
-          "getExitProcess", "locale", "getUsageInstance", "getCommandInstance"
-        ]
-    |
-      result = yargs().getAMethodCall(method)
-    )
-  }
-
-  /**
-   * An array of command line arguments (`argv`) parsed by the `yargs` library.
-   */
-  class YargsArgv extends Source {
-    YargsArgv() {
-      this = yargs().getAPropertyRead("argv")
-      or
-      this = yargs().getAMethodCall("parse") and
-      this.(DataFlow::MethodCallNode).getNumArgument() = 0
-    }
-  }
+  private class CommandLineArgumentsAsSource extends Source instanceof CommandLineArguments { }
 
   /**
    * A command-line argument that effectively is system-controlled, and therefore not likely to be exploitable when used in the execution of another command.
@@ -193,7 +78,7 @@ module IndirectCommandInjection {
     SystemControlledCommandLineArgumentSanitizer() {
       // `process.argv[0]` and `process.argv[1]` are paths to `node` and `main`.
       exists(string index | index = "0" or index = "1" |
-        this = any(CommandLineArgumentsArray a).getAPropertyRead(index)
+        this = DataFlow::globalVarRef("process").getAPropertyRead("argv").getAPropertyRead(index)
       )
     }
   }
diff --git a/javascript/ql/lib/semmle/javascript/security/dataflow/IndirectCommandInjectionQuery.qll b/javascript/ql/lib/semmle/javascript/security/dataflow/IndirectCommandInjectionQuery.qll
index d2de26d5cd0..b3e59aec7bd 100644
--- a/javascript/ql/lib/semmle/javascript/security/dataflow/IndirectCommandInjectionQuery.qll
+++ b/javascript/ql/lib/semmle/javascript/security/dataflow/IndirectCommandInjectionQuery.qll
@@ -28,8 +28,4 @@ class Configuration extends TaintTracking::Configuration {
   override predicate isSink(DataFlow::Node sink) { this.isSinkWithHighlight(sink, _) }
 
   override predicate isSanitizer(DataFlow::Node node) { node instanceof Sanitizer }
-
-  override predicate isAdditionalTaintStep(DataFlow::Node pred, DataFlow::Node succ) {
-    argsParseStep(pred, succ)
-  }
 }
diff --git a/javascript/ql/lib/semmle/javascript/security/dataflow/NosqlInjectionCustomizations.qll b/javascript/ql/lib/semmle/javascript/security/dataflow/NosqlInjectionCustomizations.qll
index 988cb59a6e7..536276d5c1d 100644
--- a/javascript/ql/lib/semmle/javascript/security/dataflow/NosqlInjectionCustomizations.qll
+++ b/javascript/ql/lib/semmle/javascript/security/dataflow/NosqlInjectionCustomizations.qll
@@ -30,8 +30,15 @@ module NosqlInjection {
    */
   abstract class Sanitizer extends DataFlow::Node { }
 
-  /** A source of remote user input, considered as a flow source for NoSql injection. */
-  class RemoteFlowSourceAsSource extends Source instanceof RemoteFlowSource { }
+  /**
+   * DEPRECATED: Use `ActiveThreatModelSource` from Concepts instead!
+   */
+  deprecated class RemoteFlowSourceAsSource = ActiveThreatModelSourceAsSource;
+
+  /**
+   * An active threat-model source, considered as a flow source.
+   */
+  private class ActiveThreatModelSourceAsSource extends Source, ActiveThreatModelSource { }
 
   /** An expression interpreted as a NoSql query, viewed as a sink. */
   class NosqlQuerySink extends Sink instanceof NoSql::Query { }
diff --git a/javascript/ql/lib/semmle/javascript/security/dataflow/RegExpInjectionCustomizations.qll b/javascript/ql/lib/semmle/javascript/security/dataflow/RegExpInjectionCustomizations.qll
index 87fbbbd5b93..291d6eebc1c 100644
--- a/javascript/ql/lib/semmle/javascript/security/dataflow/RegExpInjectionCustomizations.qll
+++ b/javascript/ql/lib/semmle/javascript/security/dataflow/RegExpInjectionCustomizations.qll
@@ -26,11 +26,15 @@ module RegExpInjection {
   abstract class Sanitizer extends DataFlow::Node { }
 
   /**
-   * A source of remote user input, considered as a flow source for regular
-   * expression injection.
+   * DEPRECATED: Use `ActiveThreatModelSource` from Concepts instead!
    */
-  class RemoteFlowSourceAsSource extends Source instanceof RemoteFlowSource {
-    RemoteFlowSourceAsSource() { not this instanceof ClientSideRemoteFlowSource }
+  deprecated class RemoteFlowSourceAsSource = ActiveThreatModelSourceAsSource;
+
+  /**
+   * An active threat-model source, considered as a flow source.
+   */
+  private class ActiveThreatModelSourceAsSource extends Source instanceof ActiveThreatModelSource {
+    ActiveThreatModelSourceAsSource() { not this instanceof ClientSideRemoteFlowSource }
   }
 
   private import IndirectCommandInjectionCustomizations
diff --git a/javascript/ql/lib/semmle/javascript/security/dataflow/RemoteFlowSources.qll b/javascript/ql/lib/semmle/javascript/security/dataflow/RemoteFlowSources.qll
index ebd4711288c..aad00b2d22e 100644
--- a/javascript/ql/lib/semmle/javascript/security/dataflow/RemoteFlowSources.qll
+++ b/javascript/ql/lib/semmle/javascript/security/dataflow/RemoteFlowSources.qll
@@ -11,10 +11,9 @@ cached
 private module Cached {
   /** A data flow source of remote user input. */
   cached
-  abstract class RemoteFlowSource extends DataFlow::Node {
-    /** Gets a human-readable string that describes the type of this remote flow source. */
+  abstract class RemoteFlowSource extends ThreatModelSource::Range {
     cached
-    abstract string getSourceType();
+    override string getThreatModel() { result = "remote" }
 
     /**
      * Holds if this can be a user-controlled object, such as a JSON object parsed from user-controlled data.
diff --git a/javascript/ql/lib/semmle/javascript/security/dataflow/RemotePropertyInjectionCustomizations.qll b/javascript/ql/lib/semmle/javascript/security/dataflow/RemotePropertyInjectionCustomizations.qll
index 8923946f831..6157671e6a9 100644
--- a/javascript/ql/lib/semmle/javascript/security/dataflow/RemotePropertyInjectionCustomizations.qll
+++ b/javascript/ql/lib/semmle/javascript/security/dataflow/RemotePropertyInjectionCustomizations.qll
@@ -31,10 +31,14 @@ module RemotePropertyInjection {
   abstract class Sanitizer extends DataFlow::Node { }
 
   /**
-   * A source of remote user input, considered as a flow source for remote property
-   * injection.
+   * DEPRECATED: Use `ActiveThreatModelSource` from Concepts instead!
    */
-  class RemoteFlowSourceAsSource extends Source instanceof RemoteFlowSource { }
+  deprecated class RemoteFlowSourceAsSource = ActiveThreatModelSourceAsSource;
+
+  /**
+   * An active threat-model source, considered as a flow source.
+   */
+  private class ActiveThreatModelSourceAsSource extends Source, ActiveThreatModelSource { }
 
   /**
    * A sink for property writes with dynamically computed property name.
diff --git a/javascript/ql/lib/semmle/javascript/security/dataflow/RequestForgeryCustomizations.qll b/javascript/ql/lib/semmle/javascript/security/dataflow/RequestForgeryCustomizations.qll
index 5714de221ac..6d2b5e2ce7b 100644
--- a/javascript/ql/lib/semmle/javascript/security/dataflow/RequestForgeryCustomizations.qll
+++ b/javascript/ql/lib/semmle/javascript/security/dataflow/RequestForgeryCustomizations.qll
@@ -39,9 +39,18 @@ module RequestForgery {
    */
   abstract class Sanitizer extends DataFlow::Node { }
 
-  /** A source of server-side remote user input, considered as a flow source for request forgery. */
-  private class RemoteFlowSourceAsSource extends Source instanceof RemoteFlowSource {
-    RemoteFlowSourceAsSource() { not this.(ClientSideRemoteFlowSource).getKind().isPathOrUrl() }
+  /**
+   * DEPRECATED: Use `ActiveThreatModelSource` from Concepts instead!
+   */
+  deprecated class RemoteFlowSourceAsSource = ActiveThreatModelSourceAsSource;
+
+  /**
+   * An active threat-model source, considered as a flow source.
+   */
+  private class ActiveThreatModelSourceAsSource extends Source instanceof ActiveThreatModelSource {
+    ActiveThreatModelSourceAsSource() {
+      not this.(ClientSideRemoteFlowSource).getKind().isPathOrUrl()
+    }
 
     override predicate isServerSide() { not this instanceof ClientSideRemoteFlowSource }
   }
diff --git a/javascript/ql/lib/semmle/javascript/security/dataflow/ResourceExhaustionCustomizations.qll b/javascript/ql/lib/semmle/javascript/security/dataflow/ResourceExhaustionCustomizations.qll
index 8307c1f6f93..147d725ae9a 100644
--- a/javascript/ql/lib/semmle/javascript/security/dataflow/ResourceExhaustionCustomizations.qll
+++ b/javascript/ql/lib/semmle/javascript/security/dataflow/ResourceExhaustionCustomizations.qll
@@ -31,9 +31,16 @@ module ResourceExhaustion {
    */
   abstract class Sanitizer extends DataFlow::Node { }
 
-  /** A source of remote user input, considered as a data flow source for resource exhaustion vulnerabilities. */
-  class RemoteFlowSourceAsSource extends Source instanceof RemoteFlowSource {
-    RemoteFlowSourceAsSource() {
+  /**
+   * DEPRECATED: Use `ActiveThreatModelSource` from Concepts instead!
+   */
+  deprecated class RemoteFlowSourceAsSource = ActiveThreatModelSourceAsSource;
+
+  /**
+   * An active threat-model source, considered as a flow source.
+   */
+  private class ActiveThreatModelSourceAsSource extends Source instanceof ActiveThreatModelSource {
+    ActiveThreatModelSourceAsSource() {
       // exclude source that only happen client-side
       not this instanceof ClientSideRemoteFlowSource and
       not this = DataFlow::parameterNode(any(PostMessageEventHandler pmeh).getEventParameter())
diff --git a/javascript/ql/lib/semmle/javascript/security/dataflow/SqlInjectionCustomizations.qll b/javascript/ql/lib/semmle/javascript/security/dataflow/SqlInjectionCustomizations.qll
index 3081a1a80b2..8afb65519ad 100644
--- a/javascript/ql/lib/semmle/javascript/security/dataflow/SqlInjectionCustomizations.qll
+++ b/javascript/ql/lib/semmle/javascript/security/dataflow/SqlInjectionCustomizations.qll
@@ -22,8 +22,15 @@ module SqlInjection {
    */
   abstract class Sanitizer extends DataFlow::Node { }
 
-  /** A source of remote user input, considered as a flow source for string based query injection. */
-  class RemoteFlowSourceAsSource extends Source instanceof RemoteFlowSource { }
+  /**
+   * DEPRECATED: Use `ActiveThreatModelSource` from Concepts instead!
+   */
+  deprecated class RemoteFlowSourceAsSource = ActiveThreatModelSourceAsSource;
+
+  /**
+   * An active threat-model source, considered as a flow source.
+   */
+  private class ActiveThreatModelSourceAsSource extends Source, ActiveThreatModelSource { }
 
   /** An SQL expression passed to an API call that executes SQL. */
   class SqlInjectionExprSink extends Sink instanceof SQL::SqlString { }
diff --git a/javascript/ql/lib/semmle/javascript/security/dataflow/TaintedPathCustomizations.qll b/javascript/ql/lib/semmle/javascript/security/dataflow/TaintedPathCustomizations.qll
index 73615bfd78b..c24ea7f6110 100644
--- a/javascript/ql/lib/semmle/javascript/security/dataflow/TaintedPathCustomizations.qll
+++ b/javascript/ql/lib/semmle/javascript/security/dataflow/TaintedPathCustomizations.qll
@@ -572,16 +572,15 @@ module TaintedPath {
   }
 
   /**
-   * A source of remote user input, considered as a flow source for
-   * tainted-path vulnerabilities.
+   * DEPRECATED: Use `ActiveThreatModelSource` from Concepts instead!
    */
-  class RemoteFlowSourceAsSource extends Source {
-    RemoteFlowSourceAsSource() {
-      exists(RemoteFlowSource src |
-        this = src and
-        not src instanceof ClientSideRemoteFlowSource
-      )
-    }
+  deprecated class RemoteFlowSourceAsSource = ActiveThreatModelSourceAsSource;
+
+  /**
+   * An active threat-model source, considered as a flow source.
+   */
+  private class ActiveThreatModelSourceAsSource extends Source instanceof ActiveThreatModelSource {
+    ActiveThreatModelSourceAsSource() { not this instanceof ClientSideRemoteFlowSource }
   }
 
   /**
diff --git a/javascript/ql/lib/semmle/javascript/security/dataflow/TemplateObjectInjectionCustomizations.qll b/javascript/ql/lib/semmle/javascript/security/dataflow/TemplateObjectInjectionCustomizations.qll
index 49911585367..5e7ae35dd88 100644
--- a/javascript/ql/lib/semmle/javascript/security/dataflow/TemplateObjectInjectionCustomizations.qll
+++ b/javascript/ql/lib/semmle/javascript/security/dataflow/TemplateObjectInjectionCustomizations.qll
@@ -34,7 +34,8 @@ module TemplateObjectInjection {
     override DataFlow::FlowLabel getAFlowLabel() { result = TaintedObject::label() }
   }
 
-  private class RemoteFlowSourceAsSource extends Source instanceof RemoteFlowSource {
+  /** An active threat-model source, considered as a flow source. */
+  private class ActiveThreatModelSourceAsSource extends Source, ActiveThreatModelSource {
     override DataFlow::FlowLabel getAFlowLabel() { result.isTaint() }
   }
 
diff --git a/javascript/ql/lib/semmle/javascript/security/dataflow/UnsafeDeserializationCustomizations.qll b/javascript/ql/lib/semmle/javascript/security/dataflow/UnsafeDeserializationCustomizations.qll
index 6871ac93b8e..2e13e0ee7f9 100644
--- a/javascript/ql/lib/semmle/javascript/security/dataflow/UnsafeDeserializationCustomizations.qll
+++ b/javascript/ql/lib/semmle/javascript/security/dataflow/UnsafeDeserializationCustomizations.qll
@@ -22,8 +22,15 @@ module UnsafeDeserialization {
    */
   abstract class Sanitizer extends DataFlow::Node { }
 
-  /** A source of remote user input, considered as a flow source for unsafe deserialization. */
-  class RemoteFlowSourceAsSource extends Source instanceof RemoteFlowSource { }
+  /**
+   * DEPRECATED: Use `ActiveThreatModelSource` from Concepts instead!
+   */
+  deprecated class RemoteFlowSourceAsSource = ActiveThreatModelSourceAsSource;
+
+  /**
+   * An active threat-model source, considered as a flow source.
+   */
+  private class ActiveThreatModelSourceAsSource extends Source, ActiveThreatModelSource { }
 
   private API::Node unsafeYamlSchema() {
     result = API::moduleImport("js-yaml").getMember("DEFAULT_FULL_SCHEMA") // from older versions
diff --git a/javascript/ql/lib/semmle/javascript/security/dataflow/UnsafeDynamicMethodAccessCustomizations.qll b/javascript/ql/lib/semmle/javascript/security/dataflow/UnsafeDynamicMethodAccessCustomizations.qll
index ec365b7d4b2..3c5cc713e6e 100644
--- a/javascript/ql/lib/semmle/javascript/security/dataflow/UnsafeDynamicMethodAccessCustomizations.qll
+++ b/javascript/ql/lib/semmle/javascript/security/dataflow/UnsafeDynamicMethodAccessCustomizations.qll
@@ -52,9 +52,14 @@ module UnsafeDynamicMethodAccess {
   }
 
   /**
-   * A source of remote user input, considered as a source for unsafe dynamic method access.
+   * DEPRECATED: Use `ActiveThreatModelSource` from Concepts instead!
    */
-  class RemoteFlowSourceAsSource extends Source instanceof RemoteFlowSource { }
+  deprecated class RemoteFlowSourceAsSource = ActiveThreatModelSourceAsSource;
+
+  /**
+   * An active threat-model source, considered as a flow source.
+   */
+  private class ActiveThreatModelSourceAsSource extends Source, ActiveThreatModelSource { }
 
   /**
    * A function invocation of an unsafe function, as a sink for remote unsafe dynamic method access.
diff --git a/javascript/ql/lib/semmle/javascript/security/dataflow/UnvalidatedDynamicMethodCallCustomizations.qll b/javascript/ql/lib/semmle/javascript/security/dataflow/UnvalidatedDynamicMethodCallCustomizations.qll
index d81227bcd68..73b9d9fc52d 100644
--- a/javascript/ql/lib/semmle/javascript/security/dataflow/UnvalidatedDynamicMethodCallCustomizations.qll
+++ b/javascript/ql/lib/semmle/javascript/security/dataflow/UnvalidatedDynamicMethodCallCustomizations.qll
@@ -71,9 +71,14 @@ module UnvalidatedDynamicMethodCall {
   }
 
   /**
-   * A source of remote user input, considered as a source for unvalidated dynamic method calls.
+   * DEPRECATED: Use `ActiveThreatModelSource` from Concepts instead!
    */
-  class RemoteFlowSourceAsSource extends Source instanceof RemoteFlowSource { }
+  deprecated class RemoteFlowSourceAsSource = ActiveThreatModelSourceAsSource;
+
+  /**
+   * An active threat-model source, considered as a flow source.
+   */
+  private class ActiveThreatModelSourceAsSource extends Source, ActiveThreatModelSource { }
 
   /**
    * The page URL considered as a flow source for unvalidated dynamic method calls.
diff --git a/javascript/ql/lib/semmle/javascript/security/dataflow/XmlBombCustomizations.qll b/javascript/ql/lib/semmle/javascript/security/dataflow/XmlBombCustomizations.qll
index 9e031fb19fb..15ba3e2a17d 100644
--- a/javascript/ql/lib/semmle/javascript/security/dataflow/XmlBombCustomizations.qll
+++ b/javascript/ql/lib/semmle/javascript/security/dataflow/XmlBombCustomizations.qll
@@ -23,8 +23,15 @@ module XmlBomb {
    */
   abstract class Sanitizer extends DataFlow::Node { }
 
-  /** A source of remote user input, considered as a flow source for XML bomb vulnerabilities. */
-  class RemoteFlowSourceAsSource extends Source instanceof RemoteFlowSource { }
+  /**
+   * DEPRECATED: Use `ActiveThreatModelSource` from Concepts instead!
+   */
+  deprecated class RemoteFlowSourceAsSource = ActiveThreatModelSourceAsSource;
+
+  /**
+   * An active threat-model source, considered as a flow source.
+   */
+  private class ActiveThreatModelSourceAsSource extends Source, ActiveThreatModelSource { }
 
   /**
    * An access to `document.location`, considered as a flow source for XML bomb vulnerabilities.
diff --git a/javascript/ql/lib/semmle/javascript/security/dataflow/XxeCustomizations.qll b/javascript/ql/lib/semmle/javascript/security/dataflow/XxeCustomizations.qll
index 9a225e8f2e4..9f6fe305bdf 100644
--- a/javascript/ql/lib/semmle/javascript/security/dataflow/XxeCustomizations.qll
+++ b/javascript/ql/lib/semmle/javascript/security/dataflow/XxeCustomizations.qll
@@ -23,8 +23,15 @@ module Xxe {
    */
   abstract class Sanitizer extends DataFlow::Node { }
 
-  /** A source of remote user input, considered as a flow source for XXE vulnerabilities. */
-  class RemoteFlowSourceAsSource extends Source instanceof RemoteFlowSource { }
+  /**
+   * DEPRECATED: Use `ActiveThreatModelSource` from Concepts instead!
+   */
+  deprecated class RemoteFlowSourceAsSource = ActiveThreatModelSourceAsSource;
+
+  /**
+   * An active threat-model source, considered as a flow source.
+   */
+  private class ActiveThreatModelSourceAsSource extends Source, ActiveThreatModelSource { }
 
   /**
    * An access to `document.location`, considered as a flow source for XXE vulnerabilities.
diff --git a/javascript/ql/src/CHANGELOG.md b/javascript/ql/src/CHANGELOG.md
index e337a585f63..9a9a4641c6e 100644
--- a/javascript/ql/src/CHANGELOG.md
+++ b/javascript/ql/src/CHANGELOG.md
@@ -1,8 +1,20 @@
+## 1.2.3
+
+No user-facing changes.
+
+## 1.2.2
+
+No user-facing changes.
+
+## 1.2.1
+
+No user-facing changes.
+
 ## 1.2.0
 
 ### Major Analysis Improvements
 
-- Added a new query (`js/actions/actions-artifact-leak`) to detect GitHub Actions artifacts that may leak the `GITHUB_TOKEN` token.
+- Added a new query (`js/actions/actions-artifact-leak`) to detect GitHub Actions artifacts that may leak the GITHUB_TOKEN token.
 
 ## 1.1.3
 
diff --git a/javascript/ql/src/Security/CWE-020/MissingRegExpAnchor.ql b/javascript/ql/src/Security/CWE-020/MissingRegExpAnchor.ql
index 858dedc603e..1057f9ccca5 100644
--- a/javascript/ql/src/Security/CWE-020/MissingRegExpAnchor.ql
+++ b/javascript/ql/src/Security/CWE-020/MissingRegExpAnchor.ql
@@ -35,7 +35,7 @@ private module Impl implements
       |
         name = "replace"
         or
-        name = "match" and exists(mcn.getAPropertyRead())
+        name = ["match", "matchAll"] and exists(mcn.getAPropertyRead())
       )
     )
   }
diff --git a/javascript/ql/src/Security/CWE-312/ActionsArtifactLeak.ql b/javascript/ql/src/Security/CWE-312/ActionsArtifactLeak.ql
index 0b869d5d283..3f001c5e456 100644
--- a/javascript/ql/src/Security/CWE-312/ActionsArtifactLeak.ql
+++ b/javascript/ql/src/Security/CWE-312/ActionsArtifactLeak.ql
@@ -7,7 +7,8 @@
  * @security-severity 7.5
  * @precision high
  * @id js/actions/actions-artifact-leak
- * @tags security
+ * @tags actions
+ *       security
  *       external/cwe/cwe-312
  *       external/cwe/cwe-315
  *       external/cwe/cwe-359
diff --git a/javascript/ql/src/change-notes/released/1.2.1.md b/javascript/ql/src/change-notes/released/1.2.1.md
new file mode 100644
index 00000000000..67aaa1465fd
--- /dev/null
+++ b/javascript/ql/src/change-notes/released/1.2.1.md
@@ -0,0 +1,3 @@
+## 1.2.1
+
+No user-facing changes.
diff --git a/javascript/ql/src/change-notes/released/1.2.2.md b/javascript/ql/src/change-notes/released/1.2.2.md
new file mode 100644
index 00000000000..7b520f6c258
--- /dev/null
+++ b/javascript/ql/src/change-notes/released/1.2.2.md
@@ -0,0 +1,3 @@
+## 1.2.2
+
+No user-facing changes.
diff --git a/javascript/ql/src/change-notes/released/1.2.3.md b/javascript/ql/src/change-notes/released/1.2.3.md
new file mode 100644
index 00000000000..b86fd3af318
--- /dev/null
+++ b/javascript/ql/src/change-notes/released/1.2.3.md
@@ -0,0 +1,3 @@
+## 1.2.3
+
+No user-facing changes.
diff --git a/javascript/ql/src/codeql-pack.release.yml b/javascript/ql/src/codeql-pack.release.yml
index 75430e73d1c..09a7400b594 100644
--- a/javascript/ql/src/codeql-pack.release.yml
+++ b/javascript/ql/src/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.2.0
+lastReleaseVersion: 1.2.3
diff --git a/javascript/ql/src/experimental/Security/CWE-942/CorsPermissiveConfigurationCustomizations.qll b/javascript/ql/src/experimental/Security/CWE-942/CorsPermissiveConfigurationCustomizations.qll
index 045d1c1ef54..103872847a0 100644
--- a/javascript/ql/src/experimental/Security/CWE-942/CorsPermissiveConfigurationCustomizations.qll
+++ b/javascript/ql/src/experimental/Security/CWE-942/CorsPermissiveConfigurationCustomizations.qll
@@ -25,9 +25,16 @@ module CorsPermissiveConfiguration {
    */
   abstract class Sanitizer extends DataFlow::Node { }
 
-  /** A source of remote user input, considered as a flow source for CORS misconfiguration. */
-  class RemoteFlowSourceAsSource extends Source instanceof RemoteFlowSource {
-    RemoteFlowSourceAsSource() { not this instanceof ClientSideRemoteFlowSource }
+  /**
+   * DEPRECATED: Use `ActiveThreatModelSource` from Concepts instead!
+   */
+  deprecated class RemoteFlowSourceAsSource = ActiveThreatModelSourceAsSource;
+
+  /**
+   * An active threat-model source, considered as a flow source.
+   */
+  private class ActiveThreatModelSourceAsSource extends Source instanceof ActiveThreatModelSource {
+    ActiveThreatModelSourceAsSource() { not this instanceof ClientSideRemoteFlowSource }
   }
 
   /** A flow label representing `true` and `null` values. */
diff --git a/javascript/ql/src/qlpack.yml b/javascript/ql/src/qlpack.yml
index 9b1f749b8ac..98c38e64248 100644
--- a/javascript/ql/src/qlpack.yml
+++ b/javascript/ql/src/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/javascript-queries
-version: 1.2.1-dev
+version: 1.2.4-dev
 groups:
   - javascript
   - queries
diff --git a/javascript/ql/test/experimental/Security/CWE-918/SSRF.expected b/javascript/ql/test/experimental/Security/CWE-918/SSRF.expected
index 848264b661b..b8f58cb4c78 100644
--- a/javascript/ql/test/experimental/Security/CWE-918/SSRF.expected
+++ b/javascript/ql/test/experimental/Security/CWE-918/SSRF.expected
@@ -51,6 +51,10 @@ nodes
 | check-regex.js:41:13:41:43 | "test.c ... tainted |
 | check-regex.js:41:27:41:43 | req.query.tainted |
 | check-regex.js:41:27:41:43 | req.query.tainted |
+| check-regex.js:61:15:61:42 | baseURL ... tainted |
+| check-regex.js:61:15:61:42 | baseURL ... tainted |
+| check-regex.js:61:25:61:42 | req.params.tainted |
+| check-regex.js:61:25:61:42 | req.params.tainted |
 | check-validator.js:15:15:15:45 | "test.c ... tainted |
 | check-validator.js:15:15:15:45 | "test.c ... tainted |
 | check-validator.js:15:29:15:45 | req.query.tainted |
@@ -127,6 +131,10 @@ edges
 | check-regex.js:41:27:41:43 | req.query.tainted | check-regex.js:41:13:41:43 | "test.c ... tainted |
 | check-regex.js:41:27:41:43 | req.query.tainted | check-regex.js:41:13:41:43 | "test.c ... tainted |
 | check-regex.js:41:27:41:43 | req.query.tainted | check-regex.js:41:13:41:43 | "test.c ... tainted |
+| check-regex.js:61:25:61:42 | req.params.tainted | check-regex.js:61:15:61:42 | baseURL ... tainted |
+| check-regex.js:61:25:61:42 | req.params.tainted | check-regex.js:61:15:61:42 | baseURL ... tainted |
+| check-regex.js:61:25:61:42 | req.params.tainted | check-regex.js:61:15:61:42 | baseURL ... tainted |
+| check-regex.js:61:25:61:42 | req.params.tainted | check-regex.js:61:15:61:42 | baseURL ... tainted |
 | check-validator.js:15:29:15:45 | req.query.tainted | check-validator.js:15:15:15:45 | "test.c ... tainted |
 | check-validator.js:15:29:15:45 | req.query.tainted | check-validator.js:15:15:15:45 | "test.c ... tainted |
 | check-validator.js:15:29:15:45 | req.query.tainted | check-validator.js:15:15:15:45 | "test.c ... tainted |
@@ -166,6 +174,7 @@ edges
 | check-regex.js:31:15:31:45 | "test.c ... tainted | check-regex.js:31:29:31:45 | req.query.tainted | check-regex.js:31:15:31:45 | "test.c ... tainted | The URL of this request depends on a user-provided value. |
 | check-regex.js:34:15:34:42 | baseURL ... tainted | check-regex.js:34:25:34:42 | req.params.tainted | check-regex.js:34:15:34:42 | baseURL ... tainted | The URL of this request depends on a user-provided value. |
 | check-regex.js:41:13:41:43 | "test.c ... tainted | check-regex.js:41:27:41:43 | req.query.tainted | check-regex.js:41:13:41:43 | "test.c ... tainted | The URL of this request depends on a user-provided value. |
+| check-regex.js:61:15:61:42 | baseURL ... tainted | check-regex.js:61:25:61:42 | req.params.tainted | check-regex.js:61:15:61:42 | baseURL ... tainted | The URL of this request depends on a user-provided value. |
 | check-validator.js:15:15:15:45 | "test.c ... tainted | check-validator.js:15:29:15:45 | req.query.tainted | check-validator.js:15:15:15:45 | "test.c ... tainted | The URL of this request depends on a user-provided value. |
 | check-validator.js:27:15:27:45 | "test.c ... tainted | check-validator.js:27:29:27:45 | req.query.tainted | check-validator.js:27:15:27:45 | "test.c ... tainted | The URL of this request depends on a user-provided value. |
 | check-validator.js:50:15:50:45 | "test.c ... tainted | check-validator.js:50:29:50:45 | req.query.tainted | check-validator.js:50:15:50:45 | "test.c ... tainted | The URL of this request depends on a user-provided value. |
diff --git a/javascript/ql/test/experimental/Security/CWE-918/check-regex.js b/javascript/ql/test/experimental/Security/CWE-918/check-regex.js
index a05c1ae7ddf..238aa906843 100644
--- a/javascript/ql/test/experimental/Security/CWE-918/check-regex.js
+++ b/javascript/ql/test/experimental/Security/CWE-918/check-regex.js
@@ -25,7 +25,7 @@ app.get('/check-with-axios', req => {
   } else {
     axios.get(baseURL + req.params.tainted); // OK
   }
-  
+
   // Blacklists are not safe
   if (!req.query.tainted.match(/^[/\.%]+$/)) {
     axios.get("test.com/" + req.query.tainted); // SSRF
@@ -39,8 +39,29 @@ app.get('/check-with-axios', req => {
   }
 
   axios.get("test.com/" + req.query.tainted); // OK - False Positive
+
+  if (req.query.tainted.matchAll(/^[0-9a-z]+$/g)) { // letters and numbers
+    axios.get("test.com/" + req.query.tainted); // OK
+  }
+  if (req.query.tainted.matchAll(/^[0-9a-z\-_]+$/g)) { // letters, numbers, - and _
+    axios.get("test.com/" + req.query.tainted); // OK
+  }
 });
 
 const isValidPath = path =>  path.match(/^[0-9a-z]+$/);
 
 const isInBlackList = path =>  path.match(/^[/\.%]+$/);
+
+app.get('/check-with-axios', req => {
+  const baseURL = "test.com/"
+  if (isValidPathMatchAll(req.params.tainted) ) {
+    axios.get(baseURL + req.params.tainted); // OK
+  }
+  if (!isValidPathMatchAll(req.params.tainted) ) {
+    axios.get(baseURL + req.params.tainted); // NOT OK - SSRF
+  } else {
+    axios.get(baseURL + req.params.tainted); // OK
+  }
+});
+
+const isValidPathMatchAll = path =>  path.matchAll(/^[0-9a-z]+$/g);
diff --git a/javascript/ql/test/library-tests/Arrays/DataFlow.expected b/javascript/ql/test/library-tests/Arrays/DataFlow.expected
index 6de9bf77257..4332f14c45e 100644
--- a/javascript/ql/test/library-tests/Arrays/DataFlow.expected
+++ b/javascript/ql/test/library-tests/Arrays/DataFlow.expected
@@ -13,6 +13,7 @@
 | arrays.js:2:16:2:23 | "source" | arrays.js:86:8:86:35 | arrayFi ... llback) |
 | arrays.js:2:16:2:23 | "source" | arrays.js:90:10:90:10 | x |
 | arrays.js:2:16:2:23 | "source" | arrays.js:93:8:93:17 | arr.at(-1) |
+| arrays.js:2:16:2:23 | "source" | arrays.js:109:8:109:24 | arr8_spread.pop() |
 | arrays.js:18:22:18:29 | "source" | arrays.js:18:50:18:50 | e |
 | arrays.js:22:15:22:22 | "source" | arrays.js:23:8:23:17 | arr2.pop() |
 | arrays.js:25:15:25:22 | "source" | arrays.js:26:8:26:17 | arr3.pop() |
@@ -22,3 +23,5 @@
 | arrays.js:29:21:29:28 | "source" | arrays.js:50:8:50:17 | arr6.pop() |
 | arrays.js:33:37:33:44 | "source" | arrays.js:35:8:35:25 | arr4_variant.pop() |
 | arrays.js:53:4:53:11 | "source" | arrays.js:54:10:54:18 | ary.pop() |
+| arrays.js:99:31:99:38 | "source" | arrays.js:100:8:100:17 | arr8.pop() |
+| arrays.js:103:55:103:62 | "source" | arrays.js:105:8:105:25 | arr8_variant.pop() |
diff --git a/javascript/ql/test/library-tests/Arrays/TaintFlow.expected b/javascript/ql/test/library-tests/Arrays/TaintFlow.expected
index 6f62ae76f15..a531715bfb6 100644
--- a/javascript/ql/test/library-tests/Arrays/TaintFlow.expected
+++ b/javascript/ql/test/library-tests/Arrays/TaintFlow.expected
@@ -14,6 +14,7 @@
 | arrays.js:2:16:2:23 | "source" | arrays.js:86:8:86:35 | arrayFi ... llback) |
 | arrays.js:2:16:2:23 | "source" | arrays.js:90:10:90:10 | x |
 | arrays.js:2:16:2:23 | "source" | arrays.js:93:8:93:17 | arr.at(-1) |
+| arrays.js:2:16:2:23 | "source" | arrays.js:109:8:109:24 | arr8_spread.pop() |
 | arrays.js:18:22:18:29 | "source" | arrays.js:18:50:18:50 | e |
 | arrays.js:22:15:22:22 | "source" | arrays.js:23:8:23:17 | arr2.pop() |
 | arrays.js:25:15:25:22 | "source" | arrays.js:26:8:26:17 | arr3.pop() |
@@ -26,3 +27,5 @@
 | arrays.js:53:4:53:11 | "source" | arrays.js:55:10:55:12 | ary |
 | arrays.js:95:9:95:16 | "source" | arrays.js:95:8:95:34 | ["sourc ... ) => x) |
 | arrays.js:96:9:96:16 | "source" | arrays.js:96:8:96:36 | ["sourc ... => !!x) |
+| arrays.js:99:31:99:38 | "source" | arrays.js:100:8:100:17 | arr8.pop() |
+| arrays.js:103:55:103:62 | "source" | arrays.js:105:8:105:25 | arr8_variant.pop() |
diff --git a/javascript/ql/test/library-tests/Arrays/arrays.js b/javascript/ql/test/library-tests/Arrays/arrays.js
index 9806ec2e395..579741fa3aa 100644
--- a/javascript/ql/test/library-tests/Arrays/arrays.js
+++ b/javascript/ql/test/library-tests/Arrays/arrays.js
@@ -94,4 +94,17 @@
 
   sink(["source"].filter((x) => x)); // NOT OK
   sink(["source"].filter((x) => !!x)); // NOT OK
+  
+  var arr8 = [];
+  arr8 = arr8.toSpliced(0, 0, "source");
+  sink(arr8.pop()); // NOT OK
+
+  var arr8_variant = [];
+  arr8_variant = arr8_variant.toSpliced(0, 0, "safe", "source");
+  arr8_variant.pop();
+  sink(arr8_variant.pop()); // NOT OK
+
+  var arr8_spread = [];
+  arr8_spread = arr8_spread.toSpliced(0, 0, ...arr);
+  sink(arr8_spread.pop()); // NOT OK
 });
diff --git a/javascript/ql/test/library-tests/Arrays/printAst.expected b/javascript/ql/test/library-tests/Arrays/printAst.expected
index 2d0fdb45863..a7333b29485 100644
--- a/javascript/ql/test/library-tests/Arrays/printAst.expected
+++ b/javascript/ql/test/library-tests/Arrays/printAst.expected
@@ -1,9 +1,9 @@
 nodes
-| arrays.js:1:1:97:2 | [ParExpr] (functi ... T OK }) | semmle.label | [ParExpr] (functi ... T OK }) |
-| arrays.js:1:1:97:3 | [ExprStmt] (functi ... OK }); | semmle.label | [ExprStmt] (functi ... OK }); |
-| arrays.js:1:1:97:3 | [ExprStmt] (functi ... OK }); | semmle.order | 1 |
-| arrays.js:1:2:97:1 | [FunctionExpr] functio ... OT OK } | semmle.label | [FunctionExpr] functio ... OT OK } |
-| arrays.js:1:14:97:1 | [BlockStmt] { let ... OT OK } | semmle.label | [BlockStmt] { let ... OT OK } |
+| arrays.js:1:1:110:2 | [ParExpr] (functi ... T OK }) | semmle.label | [ParExpr] (functi ... T OK }) |
+| arrays.js:1:1:110:3 | [ExprStmt] (functi ... OK }); | semmle.label | [ExprStmt] (functi ... OK }); |
+| arrays.js:1:1:110:3 | [ExprStmt] (functi ... OK }); | semmle.order | 1 |
+| arrays.js:1:2:110:1 | [FunctionExpr] functio ... OT OK } | semmle.label | [FunctionExpr] functio ... OT OK } |
+| arrays.js:1:14:110:1 | [BlockStmt] { let ... OT OK } | semmle.label | [BlockStmt] { let ... OT OK } |
 | arrays.js:2:3:2:24 | [DeclStmt] let source = ... | semmle.label | [DeclStmt] let source = ... |
 | arrays.js:2:7:2:12 | [VarDecl] source | semmle.label | [VarDecl] source |
 | arrays.js:2:7:2:23 | [VariableDeclarator] source = "source" | semmle.label | [VariableDeclarator] source = "source" |
@@ -417,6 +417,82 @@ nodes
 | arrays.js:96:33:96:35 | [UnaryExpr] !!x | semmle.label | [UnaryExpr] !!x |
 | arrays.js:96:34:96:35 | [UnaryExpr] !x | semmle.label | [UnaryExpr] !x |
 | arrays.js:96:35:96:35 | [VarRef] x | semmle.label | [VarRef] x |
+| arrays.js:98:3:98:16 | [DeclStmt] var arr8 = ... | semmle.label | [DeclStmt] var arr8 = ... |
+| arrays.js:98:7:98:10 | [VarDecl] arr8 | semmle.label | [VarDecl] arr8 |
+| arrays.js:98:7:98:15 | [VariableDeclarator] arr8 = [] | semmle.label | [VariableDeclarator] arr8 = [] |
+| arrays.js:98:14:98:15 | [ArrayExpr] [] | semmle.label | [ArrayExpr] [] |
+| arrays.js:99:3:99:6 | [VarRef] arr8 | semmle.label | [VarRef] arr8 |
+| arrays.js:99:3:99:39 | [AssignExpr] arr8 = ... ource") | semmle.label | [AssignExpr] arr8 = ... ource") |
+| arrays.js:99:3:99:40 | [ExprStmt] arr8 = ... urce"); | semmle.label | [ExprStmt] arr8 = ... urce"); |
+| arrays.js:99:10:99:13 | [VarRef] arr8 | semmle.label | [VarRef] arr8 |
+| arrays.js:99:10:99:23 | [DotExpr] arr8.toSpliced | semmle.label | [DotExpr] arr8.toSpliced |
+| arrays.js:99:10:99:39 | [MethodCallExpr] arr8.to ... ource") | semmle.label | [MethodCallExpr] arr8.to ... ource") |
+| arrays.js:99:15:99:23 | [Label] toSpliced | semmle.label | [Label] toSpliced |
+| arrays.js:99:25:99:25 | [Literal] 0 | semmle.label | [Literal] 0 |
+| arrays.js:99:28:99:28 | [Literal] 0 | semmle.label | [Literal] 0 |
+| arrays.js:99:31:99:38 | [Literal] "source" | semmle.label | [Literal] "source" |
+| arrays.js:100:3:100:6 | [VarRef] sink | semmle.label | [VarRef] sink |
+| arrays.js:100:3:100:18 | [CallExpr] sink(arr8.pop()) | semmle.label | [CallExpr] sink(arr8.pop()) |
+| arrays.js:100:3:100:19 | [ExprStmt] sink(arr8.pop()); | semmle.label | [ExprStmt] sink(arr8.pop()); |
+| arrays.js:100:8:100:11 | [VarRef] arr8 | semmle.label | [VarRef] arr8 |
+| arrays.js:100:8:100:15 | [DotExpr] arr8.pop | semmle.label | [DotExpr] arr8.pop |
+| arrays.js:100:8:100:17 | [MethodCallExpr] arr8.pop() | semmle.label | [MethodCallExpr] arr8.pop() |
+| arrays.js:100:13:100:15 | [Label] pop | semmle.label | [Label] pop |
+| arrays.js:102:3:102:24 | [DeclStmt] var arr8_variant = ... | semmle.label | [DeclStmt] var arr8_variant = ... |
+| arrays.js:102:7:102:18 | [VarDecl] arr8_variant | semmle.label | [VarDecl] arr8_variant |
+| arrays.js:102:7:102:23 | [VariableDeclarator] arr8_variant = [] | semmle.label | [VariableDeclarator] arr8_variant = [] |
+| arrays.js:102:22:102:23 | [ArrayExpr] [] | semmle.label | [ArrayExpr] [] |
+| arrays.js:103:3:103:14 | [VarRef] arr8_variant | semmle.label | [VarRef] arr8_variant |
+| arrays.js:103:3:103:63 | [AssignExpr] arr8_va ... ource") | semmle.label | [AssignExpr] arr8_va ... ource") |
+| arrays.js:103:3:103:64 | [ExprStmt] arr8_va ... urce"); | semmle.label | [ExprStmt] arr8_va ... urce"); |
+| arrays.js:103:18:103:29 | [VarRef] arr8_variant | semmle.label | [VarRef] arr8_variant |
+| arrays.js:103:18:103:39 | [DotExpr] arr8_va ... Spliced | semmle.label | [DotExpr] arr8_va ... Spliced |
+| arrays.js:103:18:103:63 | [MethodCallExpr] arr8_va ... ource") | semmle.label | [MethodCallExpr] arr8_va ... ource") |
+| arrays.js:103:31:103:39 | [Label] toSpliced | semmle.label | [Label] toSpliced |
+| arrays.js:103:41:103:41 | [Literal] 0 | semmle.label | [Literal] 0 |
+| arrays.js:103:44:103:44 | [Literal] 0 | semmle.label | [Literal] 0 |
+| arrays.js:103:47:103:52 | [Literal] "safe" | semmle.label | [Literal] "safe" |
+| arrays.js:103:55:103:62 | [Literal] "source" | semmle.label | [Literal] "source" |
+| arrays.js:104:3:104:14 | [VarRef] arr8_variant | semmle.label | [VarRef] arr8_variant |
+| arrays.js:104:3:104:18 | [DotExpr] arr8_variant.pop | semmle.label | [DotExpr] arr8_variant.pop |
+| arrays.js:104:3:104:20 | [MethodCallExpr] arr8_variant.pop() | semmle.label | [MethodCallExpr] arr8_variant.pop() |
+| arrays.js:104:3:104:21 | [ExprStmt] arr8_variant.pop(); | semmle.label | [ExprStmt] arr8_variant.pop(); |
+| arrays.js:104:16:104:18 | [Label] pop | semmle.label | [Label] pop |
+| arrays.js:105:3:105:6 | [VarRef] sink | semmle.label | [VarRef] sink |
+| arrays.js:105:3:105:26 | [CallExpr] sink(ar ... .pop()) | semmle.label | [CallExpr] sink(ar ... .pop()) |
+| arrays.js:105:3:105:27 | [ExprStmt] sink(ar ... pop()); | semmle.label | [ExprStmt] sink(ar ... pop()); |
+| arrays.js:105:8:105:19 | [VarRef] arr8_variant | semmle.label | [VarRef] arr8_variant |
+| arrays.js:105:8:105:23 | [DotExpr] arr8_variant.pop | semmle.label | [DotExpr] arr8_variant.pop |
+| arrays.js:105:8:105:25 | [MethodCallExpr] arr8_variant.pop() | semmle.label | [MethodCallExpr] arr8_variant.pop() |
+| arrays.js:105:21:105:23 | [Label] pop | semmle.label | [Label] pop |
+| arrays.js:107:3:107:23 | [DeclStmt] var arr8_spread = ... | semmle.label | [DeclStmt] var arr8_spread = ... |
+| arrays.js:107:7:107:17 | [VarDecl] arr8_spread | semmle.label | [VarDecl] arr8_spread |
+| arrays.js:107:7:107:22 | [VariableDeclarator] arr8_spread = [] | semmle.label | [VariableDeclarator] arr8_spread = [] |
+| arrays.js:107:21:107:22 | [ArrayExpr] [] | semmle.label | [ArrayExpr] [] |
+| arrays.js:108:3:108:13 | [VarRef] arr8_spread | semmle.label | [VarRef] arr8_spread |
+| arrays.js:108:3:108:51 | [AssignExpr] arr8_sp ... ...arr) | semmle.label | [AssignExpr] arr8_sp ... ...arr) |
+| arrays.js:108:3:108:52 | [ExprStmt] arr8_sp ... ..arr); | semmle.label | [ExprStmt] arr8_sp ... ..arr); |
+| arrays.js:108:17:108:27 | [VarRef] arr8_spread | semmle.label | [VarRef] arr8_spread |
+| arrays.js:108:17:108:37 | [DotExpr] arr8_sp ... Spliced | semmle.label | [DotExpr] arr8_sp ... Spliced |
+| arrays.js:108:17:108:51 | [MethodCallExpr] arr8_sp ... ...arr) | semmle.label | [MethodCallExpr] arr8_sp ... ...arr) |
+| arrays.js:108:29:108:37 | [Label] toSpliced | semmle.label | [Label] toSpliced |
+| arrays.js:108:39:108:39 | [Literal] 0 | semmle.label | [Literal] 0 |
+| arrays.js:108:42:108:42 | [Literal] 0 | semmle.label | [Literal] 0 |
+| arrays.js:108:45:108:50 | [SpreadElement] ...arr | semmle.label | [SpreadElement] ...arr |
+| arrays.js:108:48:108:50 | [VarRef] arr | semmle.label | [VarRef] arr |
+| arrays.js:109:3:109:6 | [VarRef] sink | semmle.label | [VarRef] sink |
+| arrays.js:109:3:109:25 | [CallExpr] sink(ar ... .pop()) | semmle.label | [CallExpr] sink(ar ... .pop()) |
+| arrays.js:109:3:109:26 | [ExprStmt] sink(ar ... pop()); | semmle.label | [ExprStmt] sink(ar ... pop()); |
+| arrays.js:109:8:109:18 | [VarRef] arr8_spread | semmle.label | [VarRef] arr8_spread |
+| arrays.js:109:8:109:22 | [DotExpr] arr8_spread.pop | semmle.label | [DotExpr] arr8_spread.pop |
+| arrays.js:109:8:109:24 | [MethodCallExpr] arr8_spread.pop() | semmle.label | [MethodCallExpr] arr8_spread.pop() |
+| arrays.js:109:20:109:22 | [Label] pop | semmle.label | [Label] pop |
+| file://:0:0:0:0 | (Arguments) | semmle.label | (Arguments) |
+| file://:0:0:0:0 | (Arguments) | semmle.label | (Arguments) |
+| file://:0:0:0:0 | (Arguments) | semmle.label | (Arguments) |
+| file://:0:0:0:0 | (Arguments) | semmle.label | (Arguments) |
+| file://:0:0:0:0 | (Arguments) | semmle.label | (Arguments) |
+| file://:0:0:0:0 | (Arguments) | semmle.label | (Arguments) |
 | file://:0:0:0:0 | (Arguments) | semmle.label | (Arguments) |
 | file://:0:0:0:0 | (Arguments) | semmle.label | (Arguments) |
 | file://:0:0:0:0 | (Arguments) | semmle.label | (Arguments) |
@@ -476,108 +552,128 @@ nodes
 | file://:0:0:0:0 | (Parameters) | semmle.label | (Parameters) |
 | file://:0:0:0:0 | (Parameters) | semmle.label | (Parameters) |
 edges
-| arrays.js:1:1:97:2 | [ParExpr] (functi ... T OK }) | arrays.js:1:2:97:1 | [FunctionExpr] functio ... OT OK } | semmle.label | 1 |
-| arrays.js:1:1:97:2 | [ParExpr] (functi ... T OK }) | arrays.js:1:2:97:1 | [FunctionExpr] functio ... OT OK } | semmle.order | 1 |
-| arrays.js:1:1:97:3 | [ExprStmt] (functi ... OK }); | arrays.js:1:1:97:2 | [ParExpr] (functi ... T OK }) | semmle.label | 1 |
-| arrays.js:1:1:97:3 | [ExprStmt] (functi ... OK }); | arrays.js:1:1:97:2 | [ParExpr] (functi ... T OK }) | semmle.order | 1 |
-| arrays.js:1:2:97:1 | [FunctionExpr] functio ... OT OK } | arrays.js:1:14:97:1 | [BlockStmt] { let ... OT OK } | semmle.label | 5 |
-| arrays.js:1:2:97:1 | [FunctionExpr] functio ... OT OK } | arrays.js:1:14:97:1 | [BlockStmt] { let ... OT OK } | semmle.order | 5 |
-| arrays.js:1:14:97:1 | [BlockStmt] { let ... OT OK } | arrays.js:2:3:2:24 | [DeclStmt] let source = ... | semmle.label | 1 |
-| arrays.js:1:14:97:1 | [BlockStmt] { let ... OT OK } | arrays.js:2:3:2:24 | [DeclStmt] let source = ... | semmle.order | 1 |
-| arrays.js:1:14:97:1 | [BlockStmt] { let ... OT OK } | arrays.js:4:3:4:28 | [DeclStmt] var obj = ... | semmle.label | 2 |
-| arrays.js:1:14:97:1 | [BlockStmt] { let ... OT OK } | arrays.js:4:3:4:28 | [DeclStmt] var obj = ... | semmle.order | 2 |
-| arrays.js:1:14:97:1 | [BlockStmt] { let ... OT OK } | arrays.js:5:3:5:16 | [ExprStmt] sink(obj.foo); | semmle.label | 3 |
-| arrays.js:1:14:97:1 | [BlockStmt] { let ... OT OK } | arrays.js:5:3:5:16 | [ExprStmt] sink(obj.foo); | semmle.order | 3 |
-| arrays.js:1:14:97:1 | [BlockStmt] { let ... OT OK } | arrays.js:7:3:7:15 | [DeclStmt] var arr = ... | semmle.label | 4 |
-| arrays.js:1:14:97:1 | [BlockStmt] { let ... OT OK } | arrays.js:7:3:7:15 | [DeclStmt] var arr = ... | semmle.order | 4 |
-| arrays.js:1:14:97:1 | [BlockStmt] { let ... OT OK } | arrays.js:8:3:8:19 | [ExprStmt] arr.push(source); | semmle.label | 5 |
-| arrays.js:1:14:97:1 | [BlockStmt] { let ... OT OK } | arrays.js:8:3:8:19 | [ExprStmt] arr.push(source); | semmle.order | 5 |
-| arrays.js:1:14:97:1 | [BlockStmt] { let ... OT OK } | arrays.js:10:3:12:3 | [ForStmt] for (va ... OK } | semmle.label | 6 |
-| arrays.js:1:14:97:1 | [BlockStmt] { let ... OT OK } | arrays.js:10:3:12:3 | [ForStmt] for (va ... OK } | semmle.order | 6 |
-| arrays.js:1:14:97:1 | [BlockStmt] { let ... OT OK } | arrays.js:15:3:15:30 | [ExprStmt] arr.for ... nk(e)); | semmle.label | 7 |
-| arrays.js:1:14:97:1 | [BlockStmt] { let ... OT OK } | arrays.js:15:3:15:30 | [ExprStmt] arr.for ... nk(e)); | semmle.order | 7 |
-| arrays.js:1:14:97:1 | [BlockStmt] { let ... OT OK } | arrays.js:16:3:16:26 | [ExprStmt] arr.map ... nk(e)); | semmle.label | 8 |
-| arrays.js:1:14:97:1 | [BlockStmt] { let ... OT OK } | arrays.js:16:3:16:26 | [ExprStmt] arr.map ... nk(e)); | semmle.order | 8 |
-| arrays.js:1:14:97:1 | [BlockStmt] { let ... OT OK } | arrays.js:18:3:18:53 | [ExprStmt] [1, 2, ... nk(e)); | semmle.label | 9 |
-| arrays.js:1:14:97:1 | [BlockStmt] { let ... OT OK } | arrays.js:18:3:18:53 | [ExprStmt] [1, 2, ... nk(e)); | semmle.order | 9 |
-| arrays.js:1:14:97:1 | [BlockStmt] { let ... OT OK } | arrays.js:20:3:20:18 | [ExprStmt] sink(arr.pop()); | semmle.label | 10 |
-| arrays.js:1:14:97:1 | [BlockStmt] { let ... OT OK } | arrays.js:20:3:20:18 | [ExprStmt] sink(arr.pop()); | semmle.order | 10 |
-| arrays.js:1:14:97:1 | [BlockStmt] { let ... OT OK } | arrays.js:22:3:22:24 | [DeclStmt] var arr2 = ... | semmle.label | 11 |
-| arrays.js:1:14:97:1 | [BlockStmt] { let ... OT OK } | arrays.js:22:3:22:24 | [DeclStmt] var arr2 = ... | semmle.order | 11 |
-| arrays.js:1:14:97:1 | [BlockStmt] { let ... OT OK } | arrays.js:23:3:23:19 | [ExprStmt] sink(arr2.pop()); | semmle.label | 12 |
-| arrays.js:1:14:97:1 | [BlockStmt] { let ... OT OK } | arrays.js:23:3:23:19 | [ExprStmt] sink(arr2.pop()); | semmle.order | 12 |
-| arrays.js:1:14:97:1 | [BlockStmt] { let ... OT OK } | arrays.js:25:3:25:24 | [DeclStmt] var arr3 = ... | semmle.label | 13 |
-| arrays.js:1:14:97:1 | [BlockStmt] { let ... OT OK } | arrays.js:25:3:25:24 | [DeclStmt] var arr3 = ... | semmle.order | 13 |
-| arrays.js:1:14:97:1 | [BlockStmt] { let ... OT OK } | arrays.js:26:3:26:19 | [ExprStmt] sink(arr3.pop()); | semmle.label | 14 |
-| arrays.js:1:14:97:1 | [BlockStmt] { let ... OT OK } | arrays.js:26:3:26:19 | [ExprStmt] sink(arr3.pop()); | semmle.order | 14 |
-| arrays.js:1:14:97:1 | [BlockStmt] { let ... OT OK } | arrays.js:28:3:28:16 | [DeclStmt] var arr4 = ... | semmle.label | 15 |
-| arrays.js:1:14:97:1 | [BlockStmt] { let ... OT OK } | arrays.js:28:3:28:16 | [DeclStmt] var arr4 = ... | semmle.order | 15 |
-| arrays.js:1:14:97:1 | [BlockStmt] { let ... OT OK } | arrays.js:29:3:29:30 | [ExprStmt] arr4.sp ... urce"); | semmle.label | 16 |
-| arrays.js:1:14:97:1 | [BlockStmt] { let ... OT OK } | arrays.js:29:3:29:30 | [ExprStmt] arr4.sp ... urce"); | semmle.order | 16 |
-| arrays.js:1:14:97:1 | [BlockStmt] { let ... OT OK } | arrays.js:30:3:30:19 | [ExprStmt] sink(arr4.pop()); | semmle.label | 17 |
-| arrays.js:1:14:97:1 | [BlockStmt] { let ... OT OK } | arrays.js:30:3:30:19 | [ExprStmt] sink(arr4.pop()); | semmle.order | 17 |
-| arrays.js:1:14:97:1 | [BlockStmt] { let ... OT OK } | arrays.js:32:3:32:24 | [DeclStmt] var arr4_variant = ... | semmle.label | 18 |
-| arrays.js:1:14:97:1 | [BlockStmt] { let ... OT OK } | arrays.js:32:3:32:24 | [DeclStmt] var arr4_variant = ... | semmle.order | 18 |
-| arrays.js:1:14:97:1 | [BlockStmt] { let ... OT OK } | arrays.js:33:3:33:46 | [ExprStmt] arr4_va ... urce"); | semmle.label | 19 |
-| arrays.js:1:14:97:1 | [BlockStmt] { let ... OT OK } | arrays.js:33:3:33:46 | [ExprStmt] arr4_va ... urce"); | semmle.order | 19 |
-| arrays.js:1:14:97:1 | [BlockStmt] { let ... OT OK } | arrays.js:34:3:34:21 | [ExprStmt] arr4_variant.pop(); | semmle.label | 20 |
-| arrays.js:1:14:97:1 | [BlockStmt] { let ... OT OK } | arrays.js:34:3:34:21 | [ExprStmt] arr4_variant.pop(); | semmle.order | 20 |
-| arrays.js:1:14:97:1 | [BlockStmt] { let ... OT OK } | arrays.js:35:3:35:27 | [ExprStmt] sink(ar ... pop()); | semmle.label | 21 |
-| arrays.js:1:14:97:1 | [BlockStmt] { let ... OT OK } | arrays.js:35:3:35:27 | [ExprStmt] sink(ar ... pop()); | semmle.order | 21 |
-| arrays.js:1:14:97:1 | [BlockStmt] { let ... OT OK } | arrays.js:37:3:37:23 | [DeclStmt] var arr4_spread = ... | semmle.label | 22 |
-| arrays.js:1:14:97:1 | [BlockStmt] { let ... OT OK } | arrays.js:37:3:37:23 | [DeclStmt] var arr4_spread = ... | semmle.order | 22 |
-| arrays.js:1:14:97:1 | [BlockStmt] { let ... OT OK } | arrays.js:38:3:38:35 | [ExprStmt] arr4_sp ... ..arr); | semmle.label | 23 |
-| arrays.js:1:14:97:1 | [BlockStmt] { let ... OT OK } | arrays.js:38:3:38:35 | [ExprStmt] arr4_sp ... ..arr); | semmle.order | 23 |
-| arrays.js:1:14:97:1 | [BlockStmt] { let ... OT OK } | arrays.js:39:3:39:26 | [ExprStmt] sink(ar ... pop()); | semmle.label | 24 |
-| arrays.js:1:14:97:1 | [BlockStmt] { let ... OT OK } | arrays.js:39:3:39:26 | [ExprStmt] sink(ar ... pop()); | semmle.order | 24 |
-| arrays.js:1:14:97:1 | [BlockStmt] { let ... OT OK } | arrays.js:41:3:41:29 | [DeclStmt] var arr5 = ... | semmle.label | 25 |
-| arrays.js:1:14:97:1 | [BlockStmt] { let ... OT OK } | arrays.js:41:3:41:29 | [DeclStmt] var arr5 = ... | semmle.order | 25 |
-| arrays.js:1:14:97:1 | [BlockStmt] { let ... OT OK } | arrays.js:42:3:42:19 | [ExprStmt] sink(arr5.pop()); | semmle.label | 26 |
-| arrays.js:1:14:97:1 | [BlockStmt] { let ... OT OK } | arrays.js:42:3:42:19 | [ExprStmt] sink(arr5.pop()); | semmle.order | 26 |
-| arrays.js:1:14:97:1 | [BlockStmt] { let ... OT OK } | arrays.js:44:3:44:28 | [ExprStmt] sink(ar ... pop()); | semmle.label | 27 |
-| arrays.js:1:14:97:1 | [BlockStmt] { let ... OT OK } | arrays.js:44:3:44:28 | [ExprStmt] sink(ar ... pop()); | semmle.order | 27 |
-| arrays.js:1:14:97:1 | [BlockStmt] { let ... OT OK } | arrays.js:46:3:46:16 | [DeclStmt] var arr6 = ... | semmle.label | 28 |
-| arrays.js:1:14:97:1 | [BlockStmt] { let ... OT OK } | arrays.js:46:3:46:16 | [DeclStmt] var arr6 = ... | semmle.order | 28 |
-| arrays.js:1:14:97:1 | [BlockStmt] { let ... OT OK } | arrays.js:47:3:49:3 | [ForStmt] for (va ... i]; } | semmle.label | 29 |
-| arrays.js:1:14:97:1 | [BlockStmt] { let ... OT OK } | arrays.js:47:3:49:3 | [ForStmt] for (va ... i]; } | semmle.order | 29 |
-| arrays.js:1:14:97:1 | [BlockStmt] { let ... OT OK } | arrays.js:50:3:50:19 | [ExprStmt] sink(arr6.pop()); | semmle.label | 30 |
-| arrays.js:1:14:97:1 | [BlockStmt] { let ... OT OK } | arrays.js:50:3:50:19 | [ExprStmt] sink(arr6.pop()); | semmle.order | 30 |
-| arrays.js:1:14:97:1 | [BlockStmt] { let ... OT OK } | arrays.js:53:3:56:5 | [ExprStmt] ["sourc ... . }); | semmle.label | 31 |
-| arrays.js:1:14:97:1 | [BlockStmt] { let ... OT OK } | arrays.js:53:3:56:5 | [ExprStmt] ["sourc ... . }); | semmle.order | 31 |
-| arrays.js:1:14:97:1 | [BlockStmt] { let ... OT OK } | arrays.js:58:3:58:15 | [ExprStmt] sink(arr[0]); | semmle.label | 32 |
-| arrays.js:1:14:97:1 | [BlockStmt] { let ... OT OK } | arrays.js:58:3:58:15 | [ExprStmt] sink(arr[0]); | semmle.order | 32 |
-| arrays.js:1:14:97:1 | [BlockStmt] { let ... OT OK } | arrays.js:60:3:62:3 | [ForOfStmt] for (co ... OK } | semmle.label | 33 |
-| arrays.js:1:14:97:1 | [BlockStmt] { let ... OT OK } | arrays.js:60:3:62:3 | [ForOfStmt] for (co ... OK } | semmle.order | 33 |
-| arrays.js:1:14:97:1 | [BlockStmt] { let ... OT OK } | arrays.js:64:3:66:3 | [ForOfStmt] for (co ... OK } | semmle.label | 34 |
-| arrays.js:1:14:97:1 | [BlockStmt] { let ... OT OK } | arrays.js:64:3:66:3 | [ForOfStmt] for (co ... OK } | semmle.order | 34 |
-| arrays.js:1:14:97:1 | [BlockStmt] { let ... OT OK } | arrays.js:68:3:70:3 | [ForOfStmt] for (co ... OK } | semmle.label | 35 |
-| arrays.js:1:14:97:1 | [BlockStmt] { let ... OT OK } | arrays.js:68:3:70:3 | [ForOfStmt] for (co ... OK } | semmle.order | 35 |
-| arrays.js:1:14:97:1 | [BlockStmt] { let ... OT OK } | arrays.js:72:3:72:16 | [DeclStmt] var arr7 = ... | semmle.label | 36 |
-| arrays.js:1:14:97:1 | [BlockStmt] { let ... OT OK } | arrays.js:72:3:72:16 | [DeclStmt] var arr7 = ... | semmle.order | 36 |
-| arrays.js:1:14:97:1 | [BlockStmt] { let ... OT OK } | arrays.js:73:3:73:20 | [ExprStmt] arr7.push(...arr); | semmle.label | 37 |
-| arrays.js:1:14:97:1 | [BlockStmt] { let ... OT OK } | arrays.js:73:3:73:20 | [ExprStmt] arr7.push(...arr); | semmle.order | 37 |
-| arrays.js:1:14:97:1 | [BlockStmt] { let ... OT OK } | arrays.js:74:3:76:3 | [ForOfStmt] for (co ... OK } | semmle.label | 38 |
-| arrays.js:1:14:97:1 | [BlockStmt] { let ... OT OK } | arrays.js:74:3:76:3 | [ForOfStmt] for (co ... OK } | semmle.order | 38 |
-| arrays.js:1:14:97:1 | [BlockStmt] { let ... OT OK } | arrays.js:78:3:78:42 | [DeclStmt] const arrayFrom = ... | semmle.label | 39 |
-| arrays.js:1:14:97:1 | [BlockStmt] { let ... OT OK } | arrays.js:78:3:78:42 | [DeclStmt] const arrayFrom = ... | semmle.order | 39 |
-| arrays.js:1:14:97:1 | [BlockStmt] { let ... OT OK } | arrays.js:79:3:81:3 | [ForOfStmt] for (co ... OK } | semmle.label | 40 |
-| arrays.js:1:14:97:1 | [BlockStmt] { let ... OT OK } | arrays.js:79:3:81:3 | [ForOfStmt] for (co ... OK } | semmle.order | 40 |
-| arrays.js:1:14:97:1 | [BlockStmt] { let ... OT OK } | arrays.js:83:3:83:31 | [ExprStmt] sink(ar ... back)); | semmle.label | 41 |
-| arrays.js:1:14:97:1 | [BlockStmt] { let ... OT OK } | arrays.js:83:3:83:31 | [ExprStmt] sink(ar ... back)); | semmle.order | 41 |
-| arrays.js:1:14:97:1 | [BlockStmt] { let ... OT OK } | arrays.js:85:3:85:42 | [DeclStmt] const arrayFind = ... | semmle.label | 42 |
-| arrays.js:1:14:97:1 | [BlockStmt] { let ... OT OK } | arrays.js:85:3:85:42 | [DeclStmt] const arrayFind = ... | semmle.order | 42 |
-| arrays.js:1:14:97:1 | [BlockStmt] { let ... OT OK } | arrays.js:86:3:86:37 | [ExprStmt] sink(ar ... back)); | semmle.label | 43 |
-| arrays.js:1:14:97:1 | [BlockStmt] { let ... OT OK } | arrays.js:86:3:86:37 | [ExprStmt] sink(ar ... back)); | semmle.order | 43 |
-| arrays.js:1:14:97:1 | [BlockStmt] { let ... OT OK } | arrays.js:88:3:88:31 | [DeclStmt] const uniq = ... | semmle.label | 44 |
-| arrays.js:1:14:97:1 | [BlockStmt] { let ... OT OK } | arrays.js:88:3:88:31 | [DeclStmt] const uniq = ... | semmle.order | 44 |
-| arrays.js:1:14:97:1 | [BlockStmt] { let ... OT OK } | arrays.js:89:3:91:3 | [ForOfStmt] for (co ... OK } | semmle.label | 45 |
-| arrays.js:1:14:97:1 | [BlockStmt] { let ... OT OK } | arrays.js:89:3:91:3 | [ForOfStmt] for (co ... OK } | semmle.order | 45 |
-| arrays.js:1:14:97:1 | [BlockStmt] { let ... OT OK } | arrays.js:93:3:93:19 | [ExprStmt] sink(arr.at(-1)); | semmle.label | 46 |
-| arrays.js:1:14:97:1 | [BlockStmt] { let ... OT OK } | arrays.js:93:3:93:19 | [ExprStmt] sink(arr.at(-1)); | semmle.order | 46 |
-| arrays.js:1:14:97:1 | [BlockStmt] { let ... OT OK } | arrays.js:95:3:95:36 | [ExprStmt] sink([" ... => x)); | semmle.label | 47 |
-| arrays.js:1:14:97:1 | [BlockStmt] { let ... OT OK } | arrays.js:95:3:95:36 | [ExprStmt] sink([" ... => x)); | semmle.order | 47 |
-| arrays.js:1:14:97:1 | [BlockStmt] { let ... OT OK } | arrays.js:96:3:96:38 | [ExprStmt] sink([" ... !!x)); | semmle.label | 48 |
-| arrays.js:1:14:97:1 | [BlockStmt] { let ... OT OK } | arrays.js:96:3:96:38 | [ExprStmt] sink([" ... !!x)); | semmle.order | 48 |
+| arrays.js:1:1:110:2 | [ParExpr] (functi ... T OK }) | arrays.js:1:2:110:1 | [FunctionExpr] functio ... OT OK } | semmle.label | 1 |
+| arrays.js:1:1:110:2 | [ParExpr] (functi ... T OK }) | arrays.js:1:2:110:1 | [FunctionExpr] functio ... OT OK } | semmle.order | 1 |
+| arrays.js:1:1:110:3 | [ExprStmt] (functi ... OK }); | arrays.js:1:1:110:2 | [ParExpr] (functi ... T OK }) | semmle.label | 1 |
+| arrays.js:1:1:110:3 | [ExprStmt] (functi ... OK }); | arrays.js:1:1:110:2 | [ParExpr] (functi ... T OK }) | semmle.order | 1 |
+| arrays.js:1:2:110:1 | [FunctionExpr] functio ... OT OK } | arrays.js:1:14:110:1 | [BlockStmt] { let ... OT OK } | semmle.label | 5 |
+| arrays.js:1:2:110:1 | [FunctionExpr] functio ... OT OK } | arrays.js:1:14:110:1 | [BlockStmt] { let ... OT OK } | semmle.order | 5 |
+| arrays.js:1:14:110:1 | [BlockStmt] { let ... OT OK } | arrays.js:2:3:2:24 | [DeclStmt] let source = ... | semmle.label | 1 |
+| arrays.js:1:14:110:1 | [BlockStmt] { let ... OT OK } | arrays.js:2:3:2:24 | [DeclStmt] let source = ... | semmle.order | 1 |
+| arrays.js:1:14:110:1 | [BlockStmt] { let ... OT OK } | arrays.js:4:3:4:28 | [DeclStmt] var obj = ... | semmle.label | 2 |
+| arrays.js:1:14:110:1 | [BlockStmt] { let ... OT OK } | arrays.js:4:3:4:28 | [DeclStmt] var obj = ... | semmle.order | 2 |
+| arrays.js:1:14:110:1 | [BlockStmt] { let ... OT OK } | arrays.js:5:3:5:16 | [ExprStmt] sink(obj.foo); | semmle.label | 3 |
+| arrays.js:1:14:110:1 | [BlockStmt] { let ... OT OK } | arrays.js:5:3:5:16 | [ExprStmt] sink(obj.foo); | semmle.order | 3 |
+| arrays.js:1:14:110:1 | [BlockStmt] { let ... OT OK } | arrays.js:7:3:7:15 | [DeclStmt] var arr = ... | semmle.label | 4 |
+| arrays.js:1:14:110:1 | [BlockStmt] { let ... OT OK } | arrays.js:7:3:7:15 | [DeclStmt] var arr = ... | semmle.order | 4 |
+| arrays.js:1:14:110:1 | [BlockStmt] { let ... OT OK } | arrays.js:8:3:8:19 | [ExprStmt] arr.push(source); | semmle.label | 5 |
+| arrays.js:1:14:110:1 | [BlockStmt] { let ... OT OK } | arrays.js:8:3:8:19 | [ExprStmt] arr.push(source); | semmle.order | 5 |
+| arrays.js:1:14:110:1 | [BlockStmt] { let ... OT OK } | arrays.js:10:3:12:3 | [ForStmt] for (va ... OK } | semmle.label | 6 |
+| arrays.js:1:14:110:1 | [BlockStmt] { let ... OT OK } | arrays.js:10:3:12:3 | [ForStmt] for (va ... OK } | semmle.order | 6 |
+| arrays.js:1:14:110:1 | [BlockStmt] { let ... OT OK } | arrays.js:15:3:15:30 | [ExprStmt] arr.for ... nk(e)); | semmle.label | 7 |
+| arrays.js:1:14:110:1 | [BlockStmt] { let ... OT OK } | arrays.js:15:3:15:30 | [ExprStmt] arr.for ... nk(e)); | semmle.order | 7 |
+| arrays.js:1:14:110:1 | [BlockStmt] { let ... OT OK } | arrays.js:16:3:16:26 | [ExprStmt] arr.map ... nk(e)); | semmle.label | 8 |
+| arrays.js:1:14:110:1 | [BlockStmt] { let ... OT OK } | arrays.js:16:3:16:26 | [ExprStmt] arr.map ... nk(e)); | semmle.order | 8 |
+| arrays.js:1:14:110:1 | [BlockStmt] { let ... OT OK } | arrays.js:18:3:18:53 | [ExprStmt] [1, 2, ... nk(e)); | semmle.label | 9 |
+| arrays.js:1:14:110:1 | [BlockStmt] { let ... OT OK } | arrays.js:18:3:18:53 | [ExprStmt] [1, 2, ... nk(e)); | semmle.order | 9 |
+| arrays.js:1:14:110:1 | [BlockStmt] { let ... OT OK } | arrays.js:20:3:20:18 | [ExprStmt] sink(arr.pop()); | semmle.label | 10 |
+| arrays.js:1:14:110:1 | [BlockStmt] { let ... OT OK } | arrays.js:20:3:20:18 | [ExprStmt] sink(arr.pop()); | semmle.order | 10 |
+| arrays.js:1:14:110:1 | [BlockStmt] { let ... OT OK } | arrays.js:22:3:22:24 | [DeclStmt] var arr2 = ... | semmle.label | 11 |
+| arrays.js:1:14:110:1 | [BlockStmt] { let ... OT OK } | arrays.js:22:3:22:24 | [DeclStmt] var arr2 = ... | semmle.order | 11 |
+| arrays.js:1:14:110:1 | [BlockStmt] { let ... OT OK } | arrays.js:23:3:23:19 | [ExprStmt] sink(arr2.pop()); | semmle.label | 12 |
+| arrays.js:1:14:110:1 | [BlockStmt] { let ... OT OK } | arrays.js:23:3:23:19 | [ExprStmt] sink(arr2.pop()); | semmle.order | 12 |
+| arrays.js:1:14:110:1 | [BlockStmt] { let ... OT OK } | arrays.js:25:3:25:24 | [DeclStmt] var arr3 = ... | semmle.label | 13 |
+| arrays.js:1:14:110:1 | [BlockStmt] { let ... OT OK } | arrays.js:25:3:25:24 | [DeclStmt] var arr3 = ... | semmle.order | 13 |
+| arrays.js:1:14:110:1 | [BlockStmt] { let ... OT OK } | arrays.js:26:3:26:19 | [ExprStmt] sink(arr3.pop()); | semmle.label | 14 |
+| arrays.js:1:14:110:1 | [BlockStmt] { let ... OT OK } | arrays.js:26:3:26:19 | [ExprStmt] sink(arr3.pop()); | semmle.order | 14 |
+| arrays.js:1:14:110:1 | [BlockStmt] { let ... OT OK } | arrays.js:28:3:28:16 | [DeclStmt] var arr4 = ... | semmle.label | 15 |
+| arrays.js:1:14:110:1 | [BlockStmt] { let ... OT OK } | arrays.js:28:3:28:16 | [DeclStmt] var arr4 = ... | semmle.order | 15 |
+| arrays.js:1:14:110:1 | [BlockStmt] { let ... OT OK } | arrays.js:29:3:29:30 | [ExprStmt] arr4.sp ... urce"); | semmle.label | 16 |
+| arrays.js:1:14:110:1 | [BlockStmt] { let ... OT OK } | arrays.js:29:3:29:30 | [ExprStmt] arr4.sp ... urce"); | semmle.order | 16 |
+| arrays.js:1:14:110:1 | [BlockStmt] { let ... OT OK } | arrays.js:30:3:30:19 | [ExprStmt] sink(arr4.pop()); | semmle.label | 17 |
+| arrays.js:1:14:110:1 | [BlockStmt] { let ... OT OK } | arrays.js:30:3:30:19 | [ExprStmt] sink(arr4.pop()); | semmle.order | 17 |
+| arrays.js:1:14:110:1 | [BlockStmt] { let ... OT OK } | arrays.js:32:3:32:24 | [DeclStmt] var arr4_variant = ... | semmle.label | 18 |
+| arrays.js:1:14:110:1 | [BlockStmt] { let ... OT OK } | arrays.js:32:3:32:24 | [DeclStmt] var arr4_variant = ... | semmle.order | 18 |
+| arrays.js:1:14:110:1 | [BlockStmt] { let ... OT OK } | arrays.js:33:3:33:46 | [ExprStmt] arr4_va ... urce"); | semmle.label | 19 |
+| arrays.js:1:14:110:1 | [BlockStmt] { let ... OT OK } | arrays.js:33:3:33:46 | [ExprStmt] arr4_va ... urce"); | semmle.order | 19 |
+| arrays.js:1:14:110:1 | [BlockStmt] { let ... OT OK } | arrays.js:34:3:34:21 | [ExprStmt] arr4_variant.pop(); | semmle.label | 20 |
+| arrays.js:1:14:110:1 | [BlockStmt] { let ... OT OK } | arrays.js:34:3:34:21 | [ExprStmt] arr4_variant.pop(); | semmle.order | 20 |
+| arrays.js:1:14:110:1 | [BlockStmt] { let ... OT OK } | arrays.js:35:3:35:27 | [ExprStmt] sink(ar ... pop()); | semmle.label | 21 |
+| arrays.js:1:14:110:1 | [BlockStmt] { let ... OT OK } | arrays.js:35:3:35:27 | [ExprStmt] sink(ar ... pop()); | semmle.order | 21 |
+| arrays.js:1:14:110:1 | [BlockStmt] { let ... OT OK } | arrays.js:37:3:37:23 | [DeclStmt] var arr4_spread = ... | semmle.label | 22 |
+| arrays.js:1:14:110:1 | [BlockStmt] { let ... OT OK } | arrays.js:37:3:37:23 | [DeclStmt] var arr4_spread = ... | semmle.order | 22 |
+| arrays.js:1:14:110:1 | [BlockStmt] { let ... OT OK } | arrays.js:38:3:38:35 | [ExprStmt] arr4_sp ... ..arr); | semmle.label | 23 |
+| arrays.js:1:14:110:1 | [BlockStmt] { let ... OT OK } | arrays.js:38:3:38:35 | [ExprStmt] arr4_sp ... ..arr); | semmle.order | 23 |
+| arrays.js:1:14:110:1 | [BlockStmt] { let ... OT OK } | arrays.js:39:3:39:26 | [ExprStmt] sink(ar ... pop()); | semmle.label | 24 |
+| arrays.js:1:14:110:1 | [BlockStmt] { let ... OT OK } | arrays.js:39:3:39:26 | [ExprStmt] sink(ar ... pop()); | semmle.order | 24 |
+| arrays.js:1:14:110:1 | [BlockStmt] { let ... OT OK } | arrays.js:41:3:41:29 | [DeclStmt] var arr5 = ... | semmle.label | 25 |
+| arrays.js:1:14:110:1 | [BlockStmt] { let ... OT OK } | arrays.js:41:3:41:29 | [DeclStmt] var arr5 = ... | semmle.order | 25 |
+| arrays.js:1:14:110:1 | [BlockStmt] { let ... OT OK } | arrays.js:42:3:42:19 | [ExprStmt] sink(arr5.pop()); | semmle.label | 26 |
+| arrays.js:1:14:110:1 | [BlockStmt] { let ... OT OK } | arrays.js:42:3:42:19 | [ExprStmt] sink(arr5.pop()); | semmle.order | 26 |
+| arrays.js:1:14:110:1 | [BlockStmt] { let ... OT OK } | arrays.js:44:3:44:28 | [ExprStmt] sink(ar ... pop()); | semmle.label | 27 |
+| arrays.js:1:14:110:1 | [BlockStmt] { let ... OT OK } | arrays.js:44:3:44:28 | [ExprStmt] sink(ar ... pop()); | semmle.order | 27 |
+| arrays.js:1:14:110:1 | [BlockStmt] { let ... OT OK } | arrays.js:46:3:46:16 | [DeclStmt] var arr6 = ... | semmle.label | 28 |
+| arrays.js:1:14:110:1 | [BlockStmt] { let ... OT OK } | arrays.js:46:3:46:16 | [DeclStmt] var arr6 = ... | semmle.order | 28 |
+| arrays.js:1:14:110:1 | [BlockStmt] { let ... OT OK } | arrays.js:47:3:49:3 | [ForStmt] for (va ... i]; } | semmle.label | 29 |
+| arrays.js:1:14:110:1 | [BlockStmt] { let ... OT OK } | arrays.js:47:3:49:3 | [ForStmt] for (va ... i]; } | semmle.order | 29 |
+| arrays.js:1:14:110:1 | [BlockStmt] { let ... OT OK } | arrays.js:50:3:50:19 | [ExprStmt] sink(arr6.pop()); | semmle.label | 30 |
+| arrays.js:1:14:110:1 | [BlockStmt] { let ... OT OK } | arrays.js:50:3:50:19 | [ExprStmt] sink(arr6.pop()); | semmle.order | 30 |
+| arrays.js:1:14:110:1 | [BlockStmt] { let ... OT OK } | arrays.js:53:3:56:5 | [ExprStmt] ["sourc ... . }); | semmle.label | 31 |
+| arrays.js:1:14:110:1 | [BlockStmt] { let ... OT OK } | arrays.js:53:3:56:5 | [ExprStmt] ["sourc ... . }); | semmle.order | 31 |
+| arrays.js:1:14:110:1 | [BlockStmt] { let ... OT OK } | arrays.js:58:3:58:15 | [ExprStmt] sink(arr[0]); | semmle.label | 32 |
+| arrays.js:1:14:110:1 | [BlockStmt] { let ... OT OK } | arrays.js:58:3:58:15 | [ExprStmt] sink(arr[0]); | semmle.order | 32 |
+| arrays.js:1:14:110:1 | [BlockStmt] { let ... OT OK } | arrays.js:60:3:62:3 | [ForOfStmt] for (co ... OK } | semmle.label | 33 |
+| arrays.js:1:14:110:1 | [BlockStmt] { let ... OT OK } | arrays.js:60:3:62:3 | [ForOfStmt] for (co ... OK } | semmle.order | 33 |
+| arrays.js:1:14:110:1 | [BlockStmt] { let ... OT OK } | arrays.js:64:3:66:3 | [ForOfStmt] for (co ... OK } | semmle.label | 34 |
+| arrays.js:1:14:110:1 | [BlockStmt] { let ... OT OK } | arrays.js:64:3:66:3 | [ForOfStmt] for (co ... OK } | semmle.order | 34 |
+| arrays.js:1:14:110:1 | [BlockStmt] { let ... OT OK } | arrays.js:68:3:70:3 | [ForOfStmt] for (co ... OK } | semmle.label | 35 |
+| arrays.js:1:14:110:1 | [BlockStmt] { let ... OT OK } | arrays.js:68:3:70:3 | [ForOfStmt] for (co ... OK } | semmle.order | 35 |
+| arrays.js:1:14:110:1 | [BlockStmt] { let ... OT OK } | arrays.js:72:3:72:16 | [DeclStmt] var arr7 = ... | semmle.label | 36 |
+| arrays.js:1:14:110:1 | [BlockStmt] { let ... OT OK } | arrays.js:72:3:72:16 | [DeclStmt] var arr7 = ... | semmle.order | 36 |
+| arrays.js:1:14:110:1 | [BlockStmt] { let ... OT OK } | arrays.js:73:3:73:20 | [ExprStmt] arr7.push(...arr); | semmle.label | 37 |
+| arrays.js:1:14:110:1 | [BlockStmt] { let ... OT OK } | arrays.js:73:3:73:20 | [ExprStmt] arr7.push(...arr); | semmle.order | 37 |
+| arrays.js:1:14:110:1 | [BlockStmt] { let ... OT OK } | arrays.js:74:3:76:3 | [ForOfStmt] for (co ... OK } | semmle.label | 38 |
+| arrays.js:1:14:110:1 | [BlockStmt] { let ... OT OK } | arrays.js:74:3:76:3 | [ForOfStmt] for (co ... OK } | semmle.order | 38 |
+| arrays.js:1:14:110:1 | [BlockStmt] { let ... OT OK } | arrays.js:78:3:78:42 | [DeclStmt] const arrayFrom = ... | semmle.label | 39 |
+| arrays.js:1:14:110:1 | [BlockStmt] { let ... OT OK } | arrays.js:78:3:78:42 | [DeclStmt] const arrayFrom = ... | semmle.order | 39 |
+| arrays.js:1:14:110:1 | [BlockStmt] { let ... OT OK } | arrays.js:79:3:81:3 | [ForOfStmt] for (co ... OK } | semmle.label | 40 |
+| arrays.js:1:14:110:1 | [BlockStmt] { let ... OT OK } | arrays.js:79:3:81:3 | [ForOfStmt] for (co ... OK } | semmle.order | 40 |
+| arrays.js:1:14:110:1 | [BlockStmt] { let ... OT OK } | arrays.js:83:3:83:31 | [ExprStmt] sink(ar ... back)); | semmle.label | 41 |
+| arrays.js:1:14:110:1 | [BlockStmt] { let ... OT OK } | arrays.js:83:3:83:31 | [ExprStmt] sink(ar ... back)); | semmle.order | 41 |
+| arrays.js:1:14:110:1 | [BlockStmt] { let ... OT OK } | arrays.js:85:3:85:42 | [DeclStmt] const arrayFind = ... | semmle.label | 42 |
+| arrays.js:1:14:110:1 | [BlockStmt] { let ... OT OK } | arrays.js:85:3:85:42 | [DeclStmt] const arrayFind = ... | semmle.order | 42 |
+| arrays.js:1:14:110:1 | [BlockStmt] { let ... OT OK } | arrays.js:86:3:86:37 | [ExprStmt] sink(ar ... back)); | semmle.label | 43 |
+| arrays.js:1:14:110:1 | [BlockStmt] { let ... OT OK } | arrays.js:86:3:86:37 | [ExprStmt] sink(ar ... back)); | semmle.order | 43 |
+| arrays.js:1:14:110:1 | [BlockStmt] { let ... OT OK } | arrays.js:88:3:88:31 | [DeclStmt] const uniq = ... | semmle.label | 44 |
+| arrays.js:1:14:110:1 | [BlockStmt] { let ... OT OK } | arrays.js:88:3:88:31 | [DeclStmt] const uniq = ... | semmle.order | 44 |
+| arrays.js:1:14:110:1 | [BlockStmt] { let ... OT OK } | arrays.js:89:3:91:3 | [ForOfStmt] for (co ... OK } | semmle.label | 45 |
+| arrays.js:1:14:110:1 | [BlockStmt] { let ... OT OK } | arrays.js:89:3:91:3 | [ForOfStmt] for (co ... OK } | semmle.order | 45 |
+| arrays.js:1:14:110:1 | [BlockStmt] { let ... OT OK } | arrays.js:93:3:93:19 | [ExprStmt] sink(arr.at(-1)); | semmle.label | 46 |
+| arrays.js:1:14:110:1 | [BlockStmt] { let ... OT OK } | arrays.js:93:3:93:19 | [ExprStmt] sink(arr.at(-1)); | semmle.order | 46 |
+| arrays.js:1:14:110:1 | [BlockStmt] { let ... OT OK } | arrays.js:95:3:95:36 | [ExprStmt] sink([" ... => x)); | semmle.label | 47 |
+| arrays.js:1:14:110:1 | [BlockStmt] { let ... OT OK } | arrays.js:95:3:95:36 | [ExprStmt] sink([" ... => x)); | semmle.order | 47 |
+| arrays.js:1:14:110:1 | [BlockStmt] { let ... OT OK } | arrays.js:96:3:96:38 | [ExprStmt] sink([" ... !!x)); | semmle.label | 48 |
+| arrays.js:1:14:110:1 | [BlockStmt] { let ... OT OK } | arrays.js:96:3:96:38 | [ExprStmt] sink([" ... !!x)); | semmle.order | 48 |
+| arrays.js:1:14:110:1 | [BlockStmt] { let ... OT OK } | arrays.js:98:3:98:16 | [DeclStmt] var arr8 = ... | semmle.label | 49 |
+| arrays.js:1:14:110:1 | [BlockStmt] { let ... OT OK } | arrays.js:98:3:98:16 | [DeclStmt] var arr8 = ... | semmle.order | 49 |
+| arrays.js:1:14:110:1 | [BlockStmt] { let ... OT OK } | arrays.js:99:3:99:40 | [ExprStmt] arr8 = ... urce"); | semmle.label | 50 |
+| arrays.js:1:14:110:1 | [BlockStmt] { let ... OT OK } | arrays.js:99:3:99:40 | [ExprStmt] arr8 = ... urce"); | semmle.order | 50 |
+| arrays.js:1:14:110:1 | [BlockStmt] { let ... OT OK } | arrays.js:100:3:100:19 | [ExprStmt] sink(arr8.pop()); | semmle.label | 51 |
+| arrays.js:1:14:110:1 | [BlockStmt] { let ... OT OK } | arrays.js:100:3:100:19 | [ExprStmt] sink(arr8.pop()); | semmle.order | 51 |
+| arrays.js:1:14:110:1 | [BlockStmt] { let ... OT OK } | arrays.js:102:3:102:24 | [DeclStmt] var arr8_variant = ... | semmle.label | 52 |
+| arrays.js:1:14:110:1 | [BlockStmt] { let ... OT OK } | arrays.js:102:3:102:24 | [DeclStmt] var arr8_variant = ... | semmle.order | 52 |
+| arrays.js:1:14:110:1 | [BlockStmt] { let ... OT OK } | arrays.js:103:3:103:64 | [ExprStmt] arr8_va ... urce"); | semmle.label | 53 |
+| arrays.js:1:14:110:1 | [BlockStmt] { let ... OT OK } | arrays.js:103:3:103:64 | [ExprStmt] arr8_va ... urce"); | semmle.order | 53 |
+| arrays.js:1:14:110:1 | [BlockStmt] { let ... OT OK } | arrays.js:104:3:104:21 | [ExprStmt] arr8_variant.pop(); | semmle.label | 54 |
+| arrays.js:1:14:110:1 | [BlockStmt] { let ... OT OK } | arrays.js:104:3:104:21 | [ExprStmt] arr8_variant.pop(); | semmle.order | 54 |
+| arrays.js:1:14:110:1 | [BlockStmt] { let ... OT OK } | arrays.js:105:3:105:27 | [ExprStmt] sink(ar ... pop()); | semmle.label | 55 |
+| arrays.js:1:14:110:1 | [BlockStmt] { let ... OT OK } | arrays.js:105:3:105:27 | [ExprStmt] sink(ar ... pop()); | semmle.order | 55 |
+| arrays.js:1:14:110:1 | [BlockStmt] { let ... OT OK } | arrays.js:107:3:107:23 | [DeclStmt] var arr8_spread = ... | semmle.label | 56 |
+| arrays.js:1:14:110:1 | [BlockStmt] { let ... OT OK } | arrays.js:107:3:107:23 | [DeclStmt] var arr8_spread = ... | semmle.order | 56 |
+| arrays.js:1:14:110:1 | [BlockStmt] { let ... OT OK } | arrays.js:108:3:108:52 | [ExprStmt] arr8_sp ... ..arr); | semmle.label | 57 |
+| arrays.js:1:14:110:1 | [BlockStmt] { let ... OT OK } | arrays.js:108:3:108:52 | [ExprStmt] arr8_sp ... ..arr); | semmle.order | 57 |
+| arrays.js:1:14:110:1 | [BlockStmt] { let ... OT OK } | arrays.js:109:3:109:26 | [ExprStmt] sink(ar ... pop()); | semmle.label | 58 |
+| arrays.js:1:14:110:1 | [BlockStmt] { let ... OT OK } | arrays.js:109:3:109:26 | [ExprStmt] sink(ar ... pop()); | semmle.order | 58 |
 | arrays.js:2:3:2:24 | [DeclStmt] let source = ... | arrays.js:2:7:2:23 | [VariableDeclarator] source = "source" | semmle.label | 1 |
 | arrays.js:2:3:2:24 | [DeclStmt] let source = ... | arrays.js:2:7:2:23 | [VariableDeclarator] source = "source" | semmle.order | 1 |
 | arrays.js:2:7:2:23 | [VariableDeclarator] source = "source" | arrays.js:2:7:2:12 | [VarDecl] source | semmle.label | 1 |
@@ -1288,6 +1384,112 @@ edges
 | arrays.js:96:33:96:35 | [UnaryExpr] !!x | arrays.js:96:34:96:35 | [UnaryExpr] !x | semmle.order | 1 |
 | arrays.js:96:34:96:35 | [UnaryExpr] !x | arrays.js:96:35:96:35 | [VarRef] x | semmle.label | 1 |
 | arrays.js:96:34:96:35 | [UnaryExpr] !x | arrays.js:96:35:96:35 | [VarRef] x | semmle.order | 1 |
+| arrays.js:98:3:98:16 | [DeclStmt] var arr8 = ... | arrays.js:98:7:98:15 | [VariableDeclarator] arr8 = [] | semmle.label | 1 |
+| arrays.js:98:3:98:16 | [DeclStmt] var arr8 = ... | arrays.js:98:7:98:15 | [VariableDeclarator] arr8 = [] | semmle.order | 1 |
+| arrays.js:98:7:98:15 | [VariableDeclarator] arr8 = [] | arrays.js:98:7:98:10 | [VarDecl] arr8 | semmle.label | 1 |
+| arrays.js:98:7:98:15 | [VariableDeclarator] arr8 = [] | arrays.js:98:7:98:10 | [VarDecl] arr8 | semmle.order | 1 |
+| arrays.js:98:7:98:15 | [VariableDeclarator] arr8 = [] | arrays.js:98:14:98:15 | [ArrayExpr] [] | semmle.label | 2 |
+| arrays.js:98:7:98:15 | [VariableDeclarator] arr8 = [] | arrays.js:98:14:98:15 | [ArrayExpr] [] | semmle.order | 2 |
+| arrays.js:99:3:99:39 | [AssignExpr] arr8 = ... ource") | arrays.js:99:3:99:6 | [VarRef] arr8 | semmle.label | 1 |
+| arrays.js:99:3:99:39 | [AssignExpr] arr8 = ... ource") | arrays.js:99:3:99:6 | [VarRef] arr8 | semmle.order | 1 |
+| arrays.js:99:3:99:39 | [AssignExpr] arr8 = ... ource") | arrays.js:99:10:99:39 | [MethodCallExpr] arr8.to ... ource") | semmle.label | 2 |
+| arrays.js:99:3:99:39 | [AssignExpr] arr8 = ... ource") | arrays.js:99:10:99:39 | [MethodCallExpr] arr8.to ... ource") | semmle.order | 2 |
+| arrays.js:99:3:99:40 | [ExprStmt] arr8 = ... urce"); | arrays.js:99:3:99:39 | [AssignExpr] arr8 = ... ource") | semmle.label | 1 |
+| arrays.js:99:3:99:40 | [ExprStmt] arr8 = ... urce"); | arrays.js:99:3:99:39 | [AssignExpr] arr8 = ... ource") | semmle.order | 1 |
+| arrays.js:99:10:99:23 | [DotExpr] arr8.toSpliced | arrays.js:99:10:99:13 | [VarRef] arr8 | semmle.label | 1 |
+| arrays.js:99:10:99:23 | [DotExpr] arr8.toSpliced | arrays.js:99:10:99:13 | [VarRef] arr8 | semmle.order | 1 |
+| arrays.js:99:10:99:23 | [DotExpr] arr8.toSpliced | arrays.js:99:15:99:23 | [Label] toSpliced | semmle.label | 2 |
+| arrays.js:99:10:99:23 | [DotExpr] arr8.toSpliced | arrays.js:99:15:99:23 | [Label] toSpliced | semmle.order | 2 |
+| arrays.js:99:10:99:39 | [MethodCallExpr] arr8.to ... ource") | arrays.js:99:10:99:23 | [DotExpr] arr8.toSpliced | semmle.label | 0 |
+| arrays.js:99:10:99:39 | [MethodCallExpr] arr8.to ... ource") | arrays.js:99:10:99:23 | [DotExpr] arr8.toSpliced | semmle.order | 0 |
+| arrays.js:99:10:99:39 | [MethodCallExpr] arr8.to ... ource") | file://:0:0:0:0 | (Arguments) | semmle.label | 1 |
+| arrays.js:99:10:99:39 | [MethodCallExpr] arr8.to ... ource") | file://:0:0:0:0 | (Arguments) | semmle.order | 1 |
+| arrays.js:100:3:100:18 | [CallExpr] sink(arr8.pop()) | arrays.js:100:3:100:6 | [VarRef] sink | semmle.label | 0 |
+| arrays.js:100:3:100:18 | [CallExpr] sink(arr8.pop()) | arrays.js:100:3:100:6 | [VarRef] sink | semmle.order | 0 |
+| arrays.js:100:3:100:18 | [CallExpr] sink(arr8.pop()) | file://:0:0:0:0 | (Arguments) | semmle.label | 1 |
+| arrays.js:100:3:100:18 | [CallExpr] sink(arr8.pop()) | file://:0:0:0:0 | (Arguments) | semmle.order | 1 |
+| arrays.js:100:3:100:19 | [ExprStmt] sink(arr8.pop()); | arrays.js:100:3:100:18 | [CallExpr] sink(arr8.pop()) | semmle.label | 1 |
+| arrays.js:100:3:100:19 | [ExprStmt] sink(arr8.pop()); | arrays.js:100:3:100:18 | [CallExpr] sink(arr8.pop()) | semmle.order | 1 |
+| arrays.js:100:8:100:15 | [DotExpr] arr8.pop | arrays.js:100:8:100:11 | [VarRef] arr8 | semmle.label | 1 |
+| arrays.js:100:8:100:15 | [DotExpr] arr8.pop | arrays.js:100:8:100:11 | [VarRef] arr8 | semmle.order | 1 |
+| arrays.js:100:8:100:15 | [DotExpr] arr8.pop | arrays.js:100:13:100:15 | [Label] pop | semmle.label | 2 |
+| arrays.js:100:8:100:15 | [DotExpr] arr8.pop | arrays.js:100:13:100:15 | [Label] pop | semmle.order | 2 |
+| arrays.js:100:8:100:17 | [MethodCallExpr] arr8.pop() | arrays.js:100:8:100:15 | [DotExpr] arr8.pop | semmle.label | 0 |
+| arrays.js:100:8:100:17 | [MethodCallExpr] arr8.pop() | arrays.js:100:8:100:15 | [DotExpr] arr8.pop | semmle.order | 0 |
+| arrays.js:102:3:102:24 | [DeclStmt] var arr8_variant = ... | arrays.js:102:7:102:23 | [VariableDeclarator] arr8_variant = [] | semmle.label | 1 |
+| arrays.js:102:3:102:24 | [DeclStmt] var arr8_variant = ... | arrays.js:102:7:102:23 | [VariableDeclarator] arr8_variant = [] | semmle.order | 1 |
+| arrays.js:102:7:102:23 | [VariableDeclarator] arr8_variant = [] | arrays.js:102:7:102:18 | [VarDecl] arr8_variant | semmle.label | 1 |
+| arrays.js:102:7:102:23 | [VariableDeclarator] arr8_variant = [] | arrays.js:102:7:102:18 | [VarDecl] arr8_variant | semmle.order | 1 |
+| arrays.js:102:7:102:23 | [VariableDeclarator] arr8_variant = [] | arrays.js:102:22:102:23 | [ArrayExpr] [] | semmle.label | 2 |
+| arrays.js:102:7:102:23 | [VariableDeclarator] arr8_variant = [] | arrays.js:102:22:102:23 | [ArrayExpr] [] | semmle.order | 2 |
+| arrays.js:103:3:103:63 | [AssignExpr] arr8_va ... ource") | arrays.js:103:3:103:14 | [VarRef] arr8_variant | semmle.label | 1 |
+| arrays.js:103:3:103:63 | [AssignExpr] arr8_va ... ource") | arrays.js:103:3:103:14 | [VarRef] arr8_variant | semmle.order | 1 |
+| arrays.js:103:3:103:63 | [AssignExpr] arr8_va ... ource") | arrays.js:103:18:103:63 | [MethodCallExpr] arr8_va ... ource") | semmle.label | 2 |
+| arrays.js:103:3:103:63 | [AssignExpr] arr8_va ... ource") | arrays.js:103:18:103:63 | [MethodCallExpr] arr8_va ... ource") | semmle.order | 2 |
+| arrays.js:103:3:103:64 | [ExprStmt] arr8_va ... urce"); | arrays.js:103:3:103:63 | [AssignExpr] arr8_va ... ource") | semmle.label | 1 |
+| arrays.js:103:3:103:64 | [ExprStmt] arr8_va ... urce"); | arrays.js:103:3:103:63 | [AssignExpr] arr8_va ... ource") | semmle.order | 1 |
+| arrays.js:103:18:103:39 | [DotExpr] arr8_va ... Spliced | arrays.js:103:18:103:29 | [VarRef] arr8_variant | semmle.label | 1 |
+| arrays.js:103:18:103:39 | [DotExpr] arr8_va ... Spliced | arrays.js:103:18:103:29 | [VarRef] arr8_variant | semmle.order | 1 |
+| arrays.js:103:18:103:39 | [DotExpr] arr8_va ... Spliced | arrays.js:103:31:103:39 | [Label] toSpliced | semmle.label | 2 |
+| arrays.js:103:18:103:39 | [DotExpr] arr8_va ... Spliced | arrays.js:103:31:103:39 | [Label] toSpliced | semmle.order | 2 |
+| arrays.js:103:18:103:63 | [MethodCallExpr] arr8_va ... ource") | arrays.js:103:18:103:39 | [DotExpr] arr8_va ... Spliced | semmle.label | 0 |
+| arrays.js:103:18:103:63 | [MethodCallExpr] arr8_va ... ource") | arrays.js:103:18:103:39 | [DotExpr] arr8_va ... Spliced | semmle.order | 0 |
+| arrays.js:103:18:103:63 | [MethodCallExpr] arr8_va ... ource") | file://:0:0:0:0 | (Arguments) | semmle.label | 1 |
+| arrays.js:103:18:103:63 | [MethodCallExpr] arr8_va ... ource") | file://:0:0:0:0 | (Arguments) | semmle.order | 1 |
+| arrays.js:104:3:104:18 | [DotExpr] arr8_variant.pop | arrays.js:104:3:104:14 | [VarRef] arr8_variant | semmle.label | 1 |
+| arrays.js:104:3:104:18 | [DotExpr] arr8_variant.pop | arrays.js:104:3:104:14 | [VarRef] arr8_variant | semmle.order | 1 |
+| arrays.js:104:3:104:18 | [DotExpr] arr8_variant.pop | arrays.js:104:16:104:18 | [Label] pop | semmle.label | 2 |
+| arrays.js:104:3:104:18 | [DotExpr] arr8_variant.pop | arrays.js:104:16:104:18 | [Label] pop | semmle.order | 2 |
+| arrays.js:104:3:104:20 | [MethodCallExpr] arr8_variant.pop() | arrays.js:104:3:104:18 | [DotExpr] arr8_variant.pop | semmle.label | 0 |
+| arrays.js:104:3:104:20 | [MethodCallExpr] arr8_variant.pop() | arrays.js:104:3:104:18 | [DotExpr] arr8_variant.pop | semmle.order | 0 |
+| arrays.js:104:3:104:21 | [ExprStmt] arr8_variant.pop(); | arrays.js:104:3:104:20 | [MethodCallExpr] arr8_variant.pop() | semmle.label | 1 |
+| arrays.js:104:3:104:21 | [ExprStmt] arr8_variant.pop(); | arrays.js:104:3:104:20 | [MethodCallExpr] arr8_variant.pop() | semmle.order | 1 |
+| arrays.js:105:3:105:26 | [CallExpr] sink(ar ... .pop()) | arrays.js:105:3:105:6 | [VarRef] sink | semmle.label | 0 |
+| arrays.js:105:3:105:26 | [CallExpr] sink(ar ... .pop()) | arrays.js:105:3:105:6 | [VarRef] sink | semmle.order | 0 |
+| arrays.js:105:3:105:26 | [CallExpr] sink(ar ... .pop()) | file://:0:0:0:0 | (Arguments) | semmle.label | 1 |
+| arrays.js:105:3:105:26 | [CallExpr] sink(ar ... .pop()) | file://:0:0:0:0 | (Arguments) | semmle.order | 1 |
+| arrays.js:105:3:105:27 | [ExprStmt] sink(ar ... pop()); | arrays.js:105:3:105:26 | [CallExpr] sink(ar ... .pop()) | semmle.label | 1 |
+| arrays.js:105:3:105:27 | [ExprStmt] sink(ar ... pop()); | arrays.js:105:3:105:26 | [CallExpr] sink(ar ... .pop()) | semmle.order | 1 |
+| arrays.js:105:8:105:23 | [DotExpr] arr8_variant.pop | arrays.js:105:8:105:19 | [VarRef] arr8_variant | semmle.label | 1 |
+| arrays.js:105:8:105:23 | [DotExpr] arr8_variant.pop | arrays.js:105:8:105:19 | [VarRef] arr8_variant | semmle.order | 1 |
+| arrays.js:105:8:105:23 | [DotExpr] arr8_variant.pop | arrays.js:105:21:105:23 | [Label] pop | semmle.label | 2 |
+| arrays.js:105:8:105:23 | [DotExpr] arr8_variant.pop | arrays.js:105:21:105:23 | [Label] pop | semmle.order | 2 |
+| arrays.js:105:8:105:25 | [MethodCallExpr] arr8_variant.pop() | arrays.js:105:8:105:23 | [DotExpr] arr8_variant.pop | semmle.label | 0 |
+| arrays.js:105:8:105:25 | [MethodCallExpr] arr8_variant.pop() | arrays.js:105:8:105:23 | [DotExpr] arr8_variant.pop | semmle.order | 0 |
+| arrays.js:107:3:107:23 | [DeclStmt] var arr8_spread = ... | arrays.js:107:7:107:22 | [VariableDeclarator] arr8_spread = [] | semmle.label | 1 |
+| arrays.js:107:3:107:23 | [DeclStmt] var arr8_spread = ... | arrays.js:107:7:107:22 | [VariableDeclarator] arr8_spread = [] | semmle.order | 1 |
+| arrays.js:107:7:107:22 | [VariableDeclarator] arr8_spread = [] | arrays.js:107:7:107:17 | [VarDecl] arr8_spread | semmle.label | 1 |
+| arrays.js:107:7:107:22 | [VariableDeclarator] arr8_spread = [] | arrays.js:107:7:107:17 | [VarDecl] arr8_spread | semmle.order | 1 |
+| arrays.js:107:7:107:22 | [VariableDeclarator] arr8_spread = [] | arrays.js:107:21:107:22 | [ArrayExpr] [] | semmle.label | 2 |
+| arrays.js:107:7:107:22 | [VariableDeclarator] arr8_spread = [] | arrays.js:107:21:107:22 | [ArrayExpr] [] | semmle.order | 2 |
+| arrays.js:108:3:108:51 | [AssignExpr] arr8_sp ... ...arr) | arrays.js:108:3:108:13 | [VarRef] arr8_spread | semmle.label | 1 |
+| arrays.js:108:3:108:51 | [AssignExpr] arr8_sp ... ...arr) | arrays.js:108:3:108:13 | [VarRef] arr8_spread | semmle.order | 1 |
+| arrays.js:108:3:108:51 | [AssignExpr] arr8_sp ... ...arr) | arrays.js:108:17:108:51 | [MethodCallExpr] arr8_sp ... ...arr) | semmle.label | 2 |
+| arrays.js:108:3:108:51 | [AssignExpr] arr8_sp ... ...arr) | arrays.js:108:17:108:51 | [MethodCallExpr] arr8_sp ... ...arr) | semmle.order | 2 |
+| arrays.js:108:3:108:52 | [ExprStmt] arr8_sp ... ..arr); | arrays.js:108:3:108:51 | [AssignExpr] arr8_sp ... ...arr) | semmle.label | 1 |
+| arrays.js:108:3:108:52 | [ExprStmt] arr8_sp ... ..arr); | arrays.js:108:3:108:51 | [AssignExpr] arr8_sp ... ...arr) | semmle.order | 1 |
+| arrays.js:108:17:108:37 | [DotExpr] arr8_sp ... Spliced | arrays.js:108:17:108:27 | [VarRef] arr8_spread | semmle.label | 1 |
+| arrays.js:108:17:108:37 | [DotExpr] arr8_sp ... Spliced | arrays.js:108:17:108:27 | [VarRef] arr8_spread | semmle.order | 1 |
+| arrays.js:108:17:108:37 | [DotExpr] arr8_sp ... Spliced | arrays.js:108:29:108:37 | [Label] toSpliced | semmle.label | 2 |
+| arrays.js:108:17:108:37 | [DotExpr] arr8_sp ... Spliced | arrays.js:108:29:108:37 | [Label] toSpliced | semmle.order | 2 |
+| arrays.js:108:17:108:51 | [MethodCallExpr] arr8_sp ... ...arr) | arrays.js:108:17:108:37 | [DotExpr] arr8_sp ... Spliced | semmle.label | 0 |
+| arrays.js:108:17:108:51 | [MethodCallExpr] arr8_sp ... ...arr) | arrays.js:108:17:108:37 | [DotExpr] arr8_sp ... Spliced | semmle.order | 0 |
+| arrays.js:108:17:108:51 | [MethodCallExpr] arr8_sp ... ...arr) | file://:0:0:0:0 | (Arguments) | semmle.label | 1 |
+| arrays.js:108:17:108:51 | [MethodCallExpr] arr8_sp ... ...arr) | file://:0:0:0:0 | (Arguments) | semmle.order | 1 |
+| arrays.js:108:45:108:50 | [SpreadElement] ...arr | arrays.js:108:48:108:50 | [VarRef] arr | semmle.label | 1 |
+| arrays.js:108:45:108:50 | [SpreadElement] ...arr | arrays.js:108:48:108:50 | [VarRef] arr | semmle.order | 1 |
+| arrays.js:109:3:109:25 | [CallExpr] sink(ar ... .pop()) | arrays.js:109:3:109:6 | [VarRef] sink | semmle.label | 0 |
+| arrays.js:109:3:109:25 | [CallExpr] sink(ar ... .pop()) | arrays.js:109:3:109:6 | [VarRef] sink | semmle.order | 0 |
+| arrays.js:109:3:109:25 | [CallExpr] sink(ar ... .pop()) | file://:0:0:0:0 | (Arguments) | semmle.label | 1 |
+| arrays.js:109:3:109:25 | [CallExpr] sink(ar ... .pop()) | file://:0:0:0:0 | (Arguments) | semmle.order | 1 |
+| arrays.js:109:3:109:26 | [ExprStmt] sink(ar ... pop()); | arrays.js:109:3:109:25 | [CallExpr] sink(ar ... .pop()) | semmle.label | 1 |
+| arrays.js:109:3:109:26 | [ExprStmt] sink(ar ... pop()); | arrays.js:109:3:109:25 | [CallExpr] sink(ar ... .pop()) | semmle.order | 1 |
+| arrays.js:109:8:109:22 | [DotExpr] arr8_spread.pop | arrays.js:109:8:109:18 | [VarRef] arr8_spread | semmle.label | 1 |
+| arrays.js:109:8:109:22 | [DotExpr] arr8_spread.pop | arrays.js:109:8:109:18 | [VarRef] arr8_spread | semmle.order | 1 |
+| arrays.js:109:8:109:22 | [DotExpr] arr8_spread.pop | arrays.js:109:20:109:22 | [Label] pop | semmle.label | 2 |
+| arrays.js:109:8:109:22 | [DotExpr] arr8_spread.pop | arrays.js:109:20:109:22 | [Label] pop | semmle.order | 2 |
+| arrays.js:109:8:109:24 | [MethodCallExpr] arr8_spread.pop() | arrays.js:109:8:109:22 | [DotExpr] arr8_spread.pop | semmle.label | 0 |
+| arrays.js:109:8:109:24 | [MethodCallExpr] arr8_spread.pop() | arrays.js:109:8:109:22 | [DotExpr] arr8_spread.pop | semmle.order | 0 |
 | file://:0:0:0:0 | (Arguments) | arrays.js:5:8:5:14 | [DotExpr] obj.foo | semmle.label | 0 |
 | file://:0:0:0:0 | (Arguments) | arrays.js:5:8:5:14 | [DotExpr] obj.foo | semmle.order | 0 |
 | file://:0:0:0:0 | (Arguments) | arrays.js:8:12:8:17 | [VarRef] source | semmle.label | 0 |
@@ -1406,6 +1608,32 @@ edges
 | file://:0:0:0:0 | (Arguments) | arrays.js:96:8:96:36 | [MethodCallExpr] ["sourc ... => !!x) | semmle.order | 0 |
 | file://:0:0:0:0 | (Arguments) | arrays.js:96:26:96:35 | [ArrowFunctionExpr] (x) => !!x | semmle.label | 0 |
 | file://:0:0:0:0 | (Arguments) | arrays.js:96:26:96:35 | [ArrowFunctionExpr] (x) => !!x | semmle.order | 0 |
+| file://:0:0:0:0 | (Arguments) | arrays.js:99:25:99:25 | [Literal] 0 | semmle.label | 0 |
+| file://:0:0:0:0 | (Arguments) | arrays.js:99:25:99:25 | [Literal] 0 | semmle.order | 0 |
+| file://:0:0:0:0 | (Arguments) | arrays.js:99:28:99:28 | [Literal] 0 | semmle.label | 1 |
+| file://:0:0:0:0 | (Arguments) | arrays.js:99:28:99:28 | [Literal] 0 | semmle.order | 1 |
+| file://:0:0:0:0 | (Arguments) | arrays.js:99:31:99:38 | [Literal] "source" | semmle.label | 2 |
+| file://:0:0:0:0 | (Arguments) | arrays.js:99:31:99:38 | [Literal] "source" | semmle.order | 2 |
+| file://:0:0:0:0 | (Arguments) | arrays.js:100:8:100:17 | [MethodCallExpr] arr8.pop() | semmle.label | 0 |
+| file://:0:0:0:0 | (Arguments) | arrays.js:100:8:100:17 | [MethodCallExpr] arr8.pop() | semmle.order | 0 |
+| file://:0:0:0:0 | (Arguments) | arrays.js:103:41:103:41 | [Literal] 0 | semmle.label | 0 |
+| file://:0:0:0:0 | (Arguments) | arrays.js:103:41:103:41 | [Literal] 0 | semmle.order | 0 |
+| file://:0:0:0:0 | (Arguments) | arrays.js:103:44:103:44 | [Literal] 0 | semmle.label | 1 |
+| file://:0:0:0:0 | (Arguments) | arrays.js:103:44:103:44 | [Literal] 0 | semmle.order | 1 |
+| file://:0:0:0:0 | (Arguments) | arrays.js:103:47:103:52 | [Literal] "safe" | semmle.label | 2 |
+| file://:0:0:0:0 | (Arguments) | arrays.js:103:47:103:52 | [Literal] "safe" | semmle.order | 2 |
+| file://:0:0:0:0 | (Arguments) | arrays.js:103:55:103:62 | [Literal] "source" | semmle.label | 3 |
+| file://:0:0:0:0 | (Arguments) | arrays.js:103:55:103:62 | [Literal] "source" | semmle.order | 3 |
+| file://:0:0:0:0 | (Arguments) | arrays.js:105:8:105:25 | [MethodCallExpr] arr8_variant.pop() | semmle.label | 0 |
+| file://:0:0:0:0 | (Arguments) | arrays.js:105:8:105:25 | [MethodCallExpr] arr8_variant.pop() | semmle.order | 0 |
+| file://:0:0:0:0 | (Arguments) | arrays.js:108:39:108:39 | [Literal] 0 | semmle.label | 0 |
+| file://:0:0:0:0 | (Arguments) | arrays.js:108:39:108:39 | [Literal] 0 | semmle.order | 0 |
+| file://:0:0:0:0 | (Arguments) | arrays.js:108:42:108:42 | [Literal] 0 | semmle.label | 1 |
+| file://:0:0:0:0 | (Arguments) | arrays.js:108:42:108:42 | [Literal] 0 | semmle.order | 1 |
+| file://:0:0:0:0 | (Arguments) | arrays.js:108:45:108:50 | [SpreadElement] ...arr | semmle.label | 2 |
+| file://:0:0:0:0 | (Arguments) | arrays.js:108:45:108:50 | [SpreadElement] ...arr | semmle.order | 2 |
+| file://:0:0:0:0 | (Arguments) | arrays.js:109:8:109:24 | [MethodCallExpr] arr8_spread.pop() | semmle.label | 0 |
+| file://:0:0:0:0 | (Arguments) | arrays.js:109:8:109:24 | [MethodCallExpr] arr8_spread.pop() | semmle.order | 0 |
 | file://:0:0:0:0 | (Parameters) | arrays.js:15:16:15:16 | [SimpleParameter] e | semmle.label | 0 |
 | file://:0:0:0:0 | (Parameters) | arrays.js:15:16:15:16 | [SimpleParameter] e | semmle.order | 0 |
 | file://:0:0:0:0 | (Parameters) | arrays.js:16:12:16:12 | [SimpleParameter] e | semmle.label | 0 |
diff --git a/javascript/ql/test/library-tests/Files/relativePaths.expected b/javascript/ql/test/library-tests/Files/relativePaths.expected
index d7041666695..16c365fdbb1 100644
--- a/javascript/ql/test/library-tests/Files/relativePaths.expected
+++ b/javascript/ql/test/library-tests/Files/relativePaths.expected
@@ -1,2 +1,2 @@
-| a.js:0:0:0:0 | a.js | library-tests/Files/a.js |
-| b/c.js:0:0:0:0 | b/c.js | library-tests/Files/b/c.js |
+| a.js:0:0:0:0 | a.js | a.js |
+| b/c.js:0:0:0:0 | b/c.js | b/c.js |
diff --git a/javascript/ql/test/library-tests/Modules/tests.expected b/javascript/ql/test/library-tests/Modules/tests.expected
index cec0b96049e..bf0efddba55 100644
--- a/javascript/ql/test/library-tests/Modules/tests.expected
+++ b/javascript/ql/test/library-tests/Modules/tests.expected
@@ -115,16 +115,16 @@ test_ReExportDeclarations
 | m/c.js:5:1:5:30 | export  ... '../b'; | m/c.js:5:24:5:29 | '../b' |
 | reExportNamespace.js:1:1:1:26 | export  ...  "./a"; | reExportNamespace.js:1:21:1:25 | "./a" |
 test_getAnImportedModule
-| library-tests/Modules/b.js | library-tests/Modules/a.js |
-| library-tests/Modules/d.js | library-tests/Modules/a.js |
-| library-tests/Modules/d.js | library-tests/Modules/b.js |
-| library-tests/Modules/es2015_require.js | library-tests/Modules/d.js |
-| library-tests/Modules/f.ts | library-tests/Modules/e.js |
-| library-tests/Modules/g.ts | library-tests/Modules/f.ts |
-| library-tests/Modules/import-indirect-path.js | library-tests/Modules/a.js |
-| library-tests/Modules/import-ts-with-js-extension.ts | library-tests/Modules/f.ts |
-| library-tests/Modules/m/c.js | library-tests/Modules/b.js |
-| library-tests/Modules/reExportNamespaceClient.js | library-tests/Modules/reExportNamespace.js |
+| b.js | a.js |
+| d.js | a.js |
+| d.js | b.js |
+| es2015_require.js | d.js |
+| f.ts | e.js |
+| g.ts | f.ts |
+| import-indirect-path.js | a.js |
+| import-ts-with-js-extension.ts | f.ts |
+| m/c.js | b.js |
+| reExportNamespaceClient.js | reExportNamespace.js |
 test_getExportedName
 | arbitrarySpecifier.ts:5:10:5:30 | Foo_new ... o::new" | Foo::new |
 | arbitrarySpecifier.ts:6:13:6:28 | * as "Foo_types" | Foo_types |
diff --git a/javascript/ql/test/library-tests/NodeJS/tests.expected b/javascript/ql/test/library-tests/NodeJS/tests.expected
index 2f5d09245ec..b97c6a345e8 100644
--- a/javascript/ql/test/library-tests/NodeJS/tests.expected
+++ b/javascript/ql/test/library-tests/NodeJS/tests.expected
@@ -94,12 +94,12 @@ requireImport
 | a.js:3:6:3:23 | require('./sub/c') | ./sub/c | sub/c.js:1:1:4:0 | <toplevel> |
 | a.js:4:6:4:29 | require ... /d.js') | ./sub/../d.js | d.js:1:1:7:15 | <toplevel> |
 | a.js:7:1:7:18 | require('./sub/c') | ./sub/c | sub/c.js:1:1:4:0 | <toplevel> |
-| a.js:10:1:10:18 | require(__dirname) | /library-tests/NodeJS | index.js:1:1:3:0 | <toplevel> |
-| a.js:11:1:11:25 | require ... + '/e') | /library-tests/NodeJS/e | e.js:1:1:6:0 | <toplevel> |
+| a.js:10:1:10:18 | require(__dirname) |  | index.js:1:1:3:0 | <toplevel> |
+| a.js:11:1:11:25 | require ... + '/e') | /e | e.js:1:1:6:0 | <toplevel> |
 | a.js:12:1:12:28 | require ...  + 'c') | ./sub/c | sub/c.js:1:1:4:0 | <toplevel> |
 | b.js:1:1:1:18 | require('./sub/c') | ./sub/c | sub/c.js:1:1:4:0 | <toplevel> |
 | d.js:7:1:7:14 | require('foo') | foo | sub/f.js:1:1:4:17 | <toplevel> |
-| index.js:2:1:2:41 | require ... b.js")) | /library-tests/NodeJS/index.js/../b.js | b.js:1:1:8:0 | <toplevel> |
+| index.js:2:1:2:41 | require ... b.js")) | /index.js/../b.js | b.js:1:1:8:0 | <toplevel> |
 | mjs-files/require-from-js.js:1:12:1:36 | require ... on-me') | ./depend-on-me | mjs-files/depend-on-me.mjs:1:1:7:1 | <toplevel> |
 | mjs-files/require-from-js.js:2:12:2:39 | require ... me.js') | ./depend-on-me.js | mjs-files/depend-on-me.js:1:1:8:0 | <toplevel> |
 | mjs-files/require-from-js.js:3:12:3:40 | require ... e.mjs') | ./depend-on-me.mjs | mjs-files/depend-on-me.mjs:1:1:7:1 | <toplevel> |
diff --git a/javascript/ql/test/library-tests/RegExp/IsRegex/IsRegex.expected b/javascript/ql/test/library-tests/RegExp/IsRegex/IsRegex.expected
new file mode 100644
index 00000000000..0fb07c050d4
--- /dev/null
+++ b/javascript/ql/test/library-tests/RegExp/IsRegex/IsRegex.expected
@@ -0,0 +1,3 @@
+| tst.js:1:12:1:38 | '^http: ... le.com' | is a regular expression |
+| tst.js:4:37:4:43 | 'regex' | is a regular expression |
+| tst.js:9:37:9:43 | 'regex' | is a regular expression |
diff --git a/javascript/ql/test/library-tests/RegExp/IsRegex/IsRegex.ql b/javascript/ql/test/library-tests/RegExp/IsRegex/IsRegex.ql
new file mode 100644
index 00000000000..0e57c822660
--- /dev/null
+++ b/javascript/ql/test/library-tests/RegExp/IsRegex/IsRegex.ql
@@ -0,0 +1,4 @@
+import javascript
+
+from RegExpPatternSource regex
+select regex, "is a regular expression"
diff --git a/javascript/ql/test/library-tests/RegExp/IsRegex/tst.js b/javascript/ql/test/library-tests/RegExp/IsRegex/tst.js
new file mode 100644
index 00000000000..3776821f785
--- /dev/null
+++ b/javascript/ql/test/library-tests/RegExp/IsRegex/tst.js
@@ -0,0 +1,11 @@
+new RegExp('^http://test\.example.com'); // NOT OK
+
+function detectRegexViaSplice(string) {
+    let found = getMyThing().search('regex'); // NOT OK
+    arr.splice(found, 1);
+};
+
+function detectRegexViaToSpliced(string) {
+    let found = getMyThing().search('regex'); // NOT OK
+    arr.toSpliced(found, 1);
+};
diff --git a/javascript/ql/test/library-tests/TaintTracking/BasicTaintTracking.expected b/javascript/ql/test/library-tests/TaintTracking/BasicTaintTracking.expected
index 3856d2ae689..f81405a32a2 100644
--- a/javascript/ql/test/library-tests/TaintTracking/BasicTaintTracking.expected
+++ b/javascript/ql/test/library-tests/TaintTracking/BasicTaintTracking.expected
@@ -23,6 +23,11 @@ typeInferenceMismatch
 | array-mutation.js:31:33:31:40 | source() | array-mutation.js:32:8:32:8 | h |
 | array-mutation.js:35:36:35:43 | source() | array-mutation.js:36:8:36:8 | i |
 | array-mutation.js:39:17:39:24 | source() | array-mutation.js:40:8:40:8 | j |
+| array-mutation.js:43:36:43:43 | source() | array-mutation.js:45:8:45:15 | kSpliced |
+| array-mutation.js:48:25:48:32 | source() | array-mutation.js:49:8:49:8 | l |
+| array-mutation.js:68:21:68:28 | source() | array-mutation.js:69:8:69:8 | q |
+| array-mutation.js:72:39:72:46 | source() | array-mutation.js:73:8:73:15 | rSpliced |
+| array-mutation.js:75:28:75:35 | source() | array-mutation.js:76:8:76:8 | r |
 | arrays-init.js:2:16:2:23 | source() | arrays-init.js:17:8:17:13 | arr[1] |
 | arrays-init.js:2:16:2:23 | source() | arrays-init.js:22:8:22:13 | arr[6] |
 | arrays-init.js:2:16:2:23 | source() | arrays-init.js:27:8:27:13 | arr[0] |
@@ -233,6 +238,14 @@ typeInferenceMismatch
 | tst.js:2:13:2:20 | source() | tst.js:48:10:48:22 | new Buffer(x) |
 | tst.js:2:13:2:20 | source() | tst.js:51:10:51:31 | seriali ... ript(x) |
 | tst.js:2:13:2:20 | source() | tst.js:54:14:54:19 | unsafe |
+| tst.js:2:13:2:20 | source() | tst.js:61:10:61:20 | x.reverse() |
+| tst.js:2:13:2:20 | source() | tst.js:62:10:62:22 | x.toSpliced() |
+| tst.js:2:13:2:20 | source() | tst.js:64:10:64:21 | x.toSorted() |
+| tst.js:2:13:2:20 | source() | tst.js:66:10:66:16 | xSorted |
+| tst.js:2:13:2:20 | source() | tst.js:68:10:68:23 | x.toReversed() |
+| tst.js:2:13:2:20 | source() | tst.js:70:10:70:18 | xReversed |
+| tst.js:2:13:2:20 | source() | tst.js:72:10:72:17 | x.with() |
+| tst.js:2:13:2:20 | source() | tst.js:74:10:74:14 | xWith |
 | xml.js:5:18:5:25 | source() | xml.js:8:14:8:17 | text |
 | xml.js:12:17:12:24 | source() | xml.js:13:14:13:19 | result |
 | xml.js:23:18:23:25 | source() | xml.js:20:14:20:17 | attr |
diff --git a/javascript/ql/test/library-tests/TaintTracking/array-mutation.js b/javascript/ql/test/library-tests/TaintTracking/array-mutation.js
index cc581d34a25..07235536845 100644
--- a/javascript/ql/test/library-tests/TaintTracking/array-mutation.js
+++ b/javascript/ql/test/library-tests/TaintTracking/array-mutation.js
@@ -38,4 +38,40 @@ function test(x, y) {
   let j = [];
   j[j.length] = source();
   sink(j); // NOT OK
+
+  let k = [];
+  let kSpliced = k.toSpliced(x, y, source());
+  sink(k); // OK
+  sink(kSpliced); // NOT OK
+
+  let l = [];
+  l = l.toSpliced(x, y, source());
+  sink(l); // NOT OK
+
+  let m = [];
+  m = m.toSpliced(q, source(), y);
+  sink(m); // OK
+
+  let n = [];
+  n = n.toSpliced(source(), x);
+  sink(n); // OK
+
+  let o = [];
+  o = o.toSpliced(x, source());
+  sink(o); // OK
+
+  let p = [];
+  p = p.toSpliced(source(), x, y);
+  sink(p); // OK
+
+  let q = [];
+  q.splice(x, y, ...source());
+  sink(q); // NOT OK
+
+  let r = [];
+  let rSpliced = r.toSpliced(x, y, ...source());
+  sink(rSpliced); // NOT OK
+  sink(r); // OK
+  r = r.toSpliced(x, y, ...source());
+  sink(r); // NOT OK
 }
diff --git a/javascript/ql/test/library-tests/TaintTracking/tst.js b/javascript/ql/test/library-tests/TaintTracking/tst.js
index dd9829c9e0b..13b4ea48d8d 100644
--- a/javascript/ql/test/library-tests/TaintTracking/tst.js
+++ b/javascript/ql/test/library-tests/TaintTracking/tst.js
@@ -57,4 +57,19 @@ function test() {
     }
 
     tagged`foo ${"safe"} bar ${x} baz`;
+
+    sink(x.reverse()); // NOT OK
+    sink(x.toSpliced()); // NOT OK
+
+    sink(x.toSorted()) // NOT OK
+    const xSorted = x.toSorted();
+    sink(xSorted) // NOT OK
+
+    sink(x.toReversed()) // NOT OK
+    const xReversed = x.toReversed();
+    sink(xReversed) // NOT OK
+
+    sink(x.with()) // NOT OK
+    const xWith = x.with();
+    sink(xWith) // NOT OK
 }
diff --git a/javascript/ql/test/library-tests/TypeScript/EmbeddedInScript/Test.expected b/javascript/ql/test/library-tests/TypeScript/EmbeddedInScript/Test.expected
index 711e94cfdaa..2bb7faf59eb 100644
--- a/javascript/ql/test/library-tests/TypeScript/EmbeddedInScript/Test.expected
+++ b/javascript/ql/test/library-tests/TypeScript/EmbeddedInScript/Test.expected
@@ -8,27 +8,27 @@ exprType
 | htmlfile.html:5:26:5:28 | foo | () => void |
 | htmlfile.html:5:26:5:30 | foo() | void |
 | htmlfile.html:5:26:5:42 | foo() as number[] | number[] |
-| other.ts:1:8:1:16 | Component | typeof default in library-tests/TypeScript/EmbeddedInScript/test.vue |
+| other.ts:1:8:1:16 | Component | typeof default in test.vue |
 | other.ts:1:23:1:34 | "./test.vue" | any |
-| other.ts:2:8:2:19 | ComponentTsx | typeof default in library-tests/TypeScript/EmbeddedInScript/test_tsx.vue |
+| other.ts:2:8:2:19 | ComponentTsx | typeof default in test_tsx.vue |
 | other.ts:2:26:2:41 | "./test_tsx.vue" | any |
 | other.ts:4:1:4:15 | new Component() | MyComponent |
-| other.ts:4:5:4:13 | Component | typeof default in library-tests/TypeScript/EmbeddedInScript/test.vue |
+| other.ts:4:5:4:13 | Component | typeof default in test.vue |
 | other.ts:5:1:5:18 | new ComponentTsx() | MyComponentTsx |
-| other.ts:5:5:5:16 | ComponentTsx | typeof default in library-tests/TypeScript/EmbeddedInScript/test_tsx.vue |
+| other.ts:5:5:5:16 | ComponentTsx | typeof default in test_tsx.vue |
 | other.ts:7:17:7:19 | foo | () => void |
-| test.vue:2:15:2:19 | other | typeof library-tests/TypeScript/EmbeddedInScript/other.ts |
+| test.vue:2:15:2:19 | other | typeof other.ts |
 | test.vue:2:26:2:34 | "./other" | any |
 | test.vue:3:24:3:34 | MyComponent | MyComponent |
 | test.vue:4:7:4:7 | x | number |
-| test_tsx.vue:2:15:2:19 | other | typeof library-tests/TypeScript/EmbeddedInScript/other.ts |
+| test_tsx.vue:2:15:2:19 | other | typeof other.ts |
 | test_tsx.vue:2:26:2:34 | "./other" | any |
 | test_tsx.vue:3:24:3:37 | MyComponentTsx | MyComponentTsx |
 | test_tsx.vue:4:7:4:7 | x | number |
 symbols
-| other.ts:1:1:8:0 | <toplevel> | library-tests/TypeScript/EmbeddedInScript/other.ts |
-| test.vue:2:3:6:0 | <toplevel> | library-tests/TypeScript/EmbeddedInScript/test.vue |
-| test_tsx.vue:2:3:6:0 | <toplevel> | library-tests/TypeScript/EmbeddedInScript/test_tsx.vue |
+| other.ts:1:1:8:0 | <toplevel> | other.ts |
+| test.vue:2:3:6:0 | <toplevel> | test.vue |
+| test_tsx.vue:2:3:6:0 | <toplevel> | test_tsx.vue |
 importTarget
 | htmlfile.html:4:13:4:42 | import  ... other"; | other.ts:1:1:8:0 | <toplevel> |
 | other.ts:1:1:1:35 | import  ... t.vue"; | test.vue:2:3:6:0 | <toplevel> |
diff --git a/javascript/ql/test/library-tests/TypeScript/HasQualifiedNameFallback/Test.expected b/javascript/ql/test/library-tests/TypeScript/HasQualifiedNameFallback/Test.expected
index 5da73c5cfe4..5ee97e2dfb5 100644
--- a/javascript/ql/test/library-tests/TypeScript/HasQualifiedNameFallback/Test.expected
+++ b/javascript/ql/test/library-tests/TypeScript/HasQualifiedNameFallback/Test.expected
@@ -1,12 +1,12 @@
 hasQualifiedNameModule
 | default-import | default | tst.ts:11:9:11:21 | DefaultImport |
 | import-assign | Foo | tst.ts:10:9:10:15 | asn.Foo |
-| library-tests/TypeScript/HasQualifiedNameFallback/tst.ts | ExportedClass | relative.ts:4:8:4:20 | ExportedClass |
 | named-import | Name1 | tst.ts:7:9:7:13 | Name1 |
 | named-import | Name1 | tst.ts:13:9:13:13 | Name1 |
 | named-import | Name1 | tst.ts:13:9:13:21 | Name1<number> |
 | named-import | Name2 | tst.ts:8:9:8:13 | Name2 |
 | namespace-import | Foo | tst.ts:9:9:9:21 | namespace.Foo |
+| tst.ts | ExportedClass | relative.ts:4:8:4:20 | ExportedClass |
 hasQualifiedNameGlobal
 | UnresolvedName | tst.ts:12:9:12:22 | UnresolvedName |
 paramExample
diff --git a/javascript/ql/test/library-tests/TypeScript/PathMapping/Imports.expected b/javascript/ql/test/library-tests/TypeScript/PathMapping/Imports.expected
index c608ea2c7b6..886391b1455 100644
--- a/javascript/ql/test/library-tests/TypeScript/PathMapping/Imports.expected
+++ b/javascript/ql/test/library-tests/TypeScript/PathMapping/Imports.expected
@@ -1,11 +1,11 @@
 symbols
-| src/lib/foo.ts:1:1:4:0 | <toplevel> | library-tests/TypeScript/PathMapping/src/lib/foo.ts |
-| src/lib/foo.ts:1:8:3:1 | functio ...  123;\\n} | foo in library-tests/TypeScript/PathMapping/src/lib/foo.ts |
-| test/test_foo.ts:1:1:1:28 | import  ... @/foo"; | library-tests/TypeScript/PathMapping/src/lib/foo.ts |
-| test/test_foo.ts:1:1:7:0 | <toplevel> | library-tests/TypeScript/PathMapping/test/test_foo.ts |
-| test/test_foo.ts:2:17:2:32 | require("@/foo") | library-tests/TypeScript/PathMapping/src/lib/foo.ts |
-| test/test_foo.ts:4:1:4:5 | foo() | foo in library-tests/TypeScript/PathMapping/src/lib/foo.ts |
-| test/test_foo.ts:6:1:6:12 | foolib.foo() | foo in library-tests/TypeScript/PathMapping/src/lib/foo.ts |
+| src/lib/foo.ts:1:1:4:0 | <toplevel> | src/lib/foo.ts |
+| src/lib/foo.ts:1:8:3:1 | functio ...  123;\\n} | foo in src/lib/foo.ts |
+| test/test_foo.ts:1:1:1:28 | import  ... @/foo"; | src/lib/foo.ts |
+| test/test_foo.ts:1:1:7:0 | <toplevel> | test/test_foo.ts |
+| test/test_foo.ts:2:17:2:32 | require("@/foo") | src/lib/foo.ts |
+| test/test_foo.ts:4:1:4:5 | foo() | foo in src/lib/foo.ts |
+| test/test_foo.ts:6:1:6:12 | foolib.foo() | foo in src/lib/foo.ts |
 #select
 | test/test_foo.ts:1:1:1:28 | import  ... @/foo"; | src/lib/foo.ts:1:1:4:0 | <toplevel> |
 | test/test_foo.ts:2:17:2:32 | require("@/foo") | src/lib/foo.ts:1:1:4:0 | <toplevel> |
diff --git a/javascript/ql/test/library-tests/TypeScript/QualifiedNameResolution/Namespaces.expected b/javascript/ql/test/library-tests/TypeScript/QualifiedNameResolution/Namespaces.expected
index 214b23594e7..0494011bc70 100644
--- a/javascript/ql/test/library-tests/TypeScript/QualifiedNameResolution/Namespaces.expected
+++ b/javascript/ql/test/library-tests/TypeScript/QualifiedNameResolution/Namespaces.expected
@@ -1,33 +1,33 @@
-| A in library-tests/TypeScript/QualifiedNameResolution/enums.ts |
-| A in library-tests/TypeScript/QualifiedNameResolution/export-qualified.ts |
-| A in library-tests/TypeScript/QualifiedNameResolution/namespaces.ts |
-| A.B in library-tests/TypeScript/QualifiedNameResolution/export-qualified.ts |
-| A.C in library-tests/TypeScript/QualifiedNameResolution/namespaces.ts |
-| A.E in library-tests/TypeScript/QualifiedNameResolution/enums.ts |
+| A in enums.ts |
+| A in export-qualified.ts |
+| A in namespaces.ts |
+| A.B in export-qualified.ts |
+| A.C in namespaces.ts |
+| A.E in enums.ts |
 | B in namespaces.ts:3 |
 | B in namespaces.ts:10 |
 | B.Bx in namespaces.ts:3 |
 | B.Bx in namespaces.ts:10 |
-| D in library-tests/TypeScript/QualifiedNameResolution/export-specifiers.ts |
-| D in library-tests/TypeScript/QualifiedNameResolution/namespaces.ts |
-| D in library-tests/TypeScript/QualifiedNameResolution/otherlib.ts |
-| D.F in library-tests/TypeScript/QualifiedNameResolution/namespaces.ts |
+| D in export-specifiers.ts |
+| D in namespaces.ts |
+| D in otherlib.ts |
+| D.F in namespaces.ts |
 | E in namespaces.ts:17 |
 | E in namespaces.ts:22 |
 | Foo in global scope |
-| G in library-tests/TypeScript/QualifiedNameResolution/namespaces.ts |
-| G.J in library-tests/TypeScript/QualifiedNameResolution/namespaces.ts |
+| G in namespaces.ts |
+| G.J in namespaces.ts |
 | Glob in global scope |
 | H in namespaces.ts:27 |
 | H.I in namespaces.ts:27 |
-| N in library-tests/TypeScript/QualifiedNameResolution/export-specifiers.ts |
+| N in export-specifiers.ts |
 | X in global scope |
-| X in library-tests/TypeScript/QualifiedNameResolution/namespaces.ts |
-| X.Y in library-tests/TypeScript/QualifiedNameResolution/namespaces.ts |
-| X.Y.Z in library-tests/TypeScript/QualifiedNameResolution/namespaces.ts |
+| X in namespaces.ts |
+| X.Y in namespaces.ts |
+| X.Y.Z in namespaces.ts |
 | Y in global scope |
-| library-tests/TypeScript/QualifiedNameResolution/export-class.ts |
-| library-tests/TypeScript/QualifiedNameResolution/namespaces.ts |
-| library-tests/TypeScript/QualifiedNameResolution/otherlib.ts |
-| library-tests/TypeScript/QualifiedNameResolution/reexport-all.ts |
-| library-tests/TypeScript/QualifiedNameResolution/reexport-named.ts |
+| export-class.ts |
+| namespaces.ts |
+| otherlib.ts |
+| reexport-all.ts |
+| reexport-named.ts |
diff --git a/javascript/ql/test/library-tests/TypeScript/QualifiedNameResolution/ResolveNamespace.expected b/javascript/ql/test/library-tests/TypeScript/QualifiedNameResolution/ResolveNamespace.expected
index 20df7b95bd9..7ec8faec19f 100644
--- a/javascript/ql/test/library-tests/TypeScript/QualifiedNameResolution/ResolveNamespace.expected
+++ b/javascript/ql/test/library-tests/TypeScript/QualifiedNameResolution/ResolveNamespace.expected
@@ -1,31 +1,31 @@
 | ambient.ts:5:16:5:18 | Foo | Foo in global scope |
-| enums.ts:9:8:9:8 | A | A in library-tests/TypeScript/QualifiedNameResolution/enums.ts |
-| enums.ts:9:8:9:10 | A.E | A.E in library-tests/TypeScript/QualifiedNameResolution/enums.ts |
-| enums.ts:10:8:10:8 | A | A in library-tests/TypeScript/QualifiedNameResolution/enums.ts |
-| export-qualified-client.ts:3:8:3:9 | AB | A.B in library-tests/TypeScript/QualifiedNameResolution/export-qualified.ts |
-| export-specifiers-client.ts:4:8:4:8 | N | N in library-tests/TypeScript/QualifiedNameResolution/export-specifiers.ts |
-| export-specifiers-client.ts:5:8:5:8 | D | D in library-tests/TypeScript/QualifiedNameResolution/export-specifiers.ts |
+| enums.ts:9:8:9:8 | A | A in enums.ts |
+| enums.ts:9:8:9:10 | A.E | A.E in enums.ts |
+| enums.ts:10:8:10:8 | A | A in enums.ts |
+| export-qualified-client.ts:3:8:3:9 | AB | A.B in export-qualified.ts |
+| export-specifiers-client.ts:4:8:4:8 | N | N in export-specifiers.ts |
+| export-specifiers-client.ts:5:8:5:8 | D | D in export-specifiers.ts |
 | global.ts:5:9:5:12 | Glob | Glob in global scope |
 | import-in-namespace.ts:9:13:9:13 | A | X in global scope |
-| namespaces-client.ts:4:9:4:10 | ns | library-tests/TypeScript/QualifiedNameResolution/namespaces.ts |
-| namespaces-client.ts:4:9:4:12 | ns.G | G in library-tests/TypeScript/QualifiedNameResolution/namespaces.ts |
-| namespaces-client.ts:5:9:5:9 | G | G in library-tests/TypeScript/QualifiedNameResolution/namespaces.ts |
-| namespaces-client.ts:6:9:6:9 | G | G in library-tests/TypeScript/QualifiedNameResolution/namespaces.ts |
-| namespaces-client.ts:6:9:6:11 | G.J | G.J in library-tests/TypeScript/QualifiedNameResolution/namespaces.ts |
-| reexport-all-client.ts:4:9:4:10 | ns | library-tests/TypeScript/QualifiedNameResolution/reexport-all.ts |
-| reexport-all-client.ts:4:9:4:12 | ns.G | G in library-tests/TypeScript/QualifiedNameResolution/namespaces.ts |
-| reexport-all-client.ts:5:9:5:9 | G | G in library-tests/TypeScript/QualifiedNameResolution/namespaces.ts |
-| reexport-all-client.ts:6:9:6:9 | G | G in library-tests/TypeScript/QualifiedNameResolution/namespaces.ts |
-| reexport-all-client.ts:6:9:6:11 | G.J | G.J in library-tests/TypeScript/QualifiedNameResolution/namespaces.ts |
-| reexport-all-client.ts:8:8:8:8 | D | D in library-tests/TypeScript/QualifiedNameResolution/otherlib.ts |
-| reexport-all-client.ts:9:8:9:9 | ns | library-tests/TypeScript/QualifiedNameResolution/reexport-all.ts |
-| reexport-all-client.ts:9:8:9:11 | ns.D | D in library-tests/TypeScript/QualifiedNameResolution/otherlib.ts |
-| reexport-all-client.ts:11:8:11:9 | ns | library-tests/TypeScript/QualifiedNameResolution/reexport-all.ts |
-| reexport-named-client.ts:4:9:4:10 | ns | library-tests/TypeScript/QualifiedNameResolution/reexport-named.ts |
-| reexport-named-client.ts:4:9:4:12 | ns.G | G in library-tests/TypeScript/QualifiedNameResolution/namespaces.ts |
-| reexport-named-client.ts:5:9:5:9 | G | G in library-tests/TypeScript/QualifiedNameResolution/namespaces.ts |
-| reexport-named-client.ts:6:9:6:9 | G | G in library-tests/TypeScript/QualifiedNameResolution/namespaces.ts |
-| reexport-named-client.ts:6:9:6:11 | G.J | G.J in library-tests/TypeScript/QualifiedNameResolution/namespaces.ts |
-| reexport-named-client.ts:8:8:8:8 | X | D in library-tests/TypeScript/QualifiedNameResolution/namespaces.ts |
-| reexport-named-client.ts:9:8:9:9 | ns | library-tests/TypeScript/QualifiedNameResolution/reexport-named.ts |
-| reexport-named-client.ts:9:8:9:11 | ns.X | D in library-tests/TypeScript/QualifiedNameResolution/namespaces.ts |
+| namespaces-client.ts:4:9:4:10 | ns | namespaces.ts |
+| namespaces-client.ts:4:9:4:12 | ns.G | G in namespaces.ts |
+| namespaces-client.ts:5:9:5:9 | G | G in namespaces.ts |
+| namespaces-client.ts:6:9:6:9 | G | G in namespaces.ts |
+| namespaces-client.ts:6:9:6:11 | G.J | G.J in namespaces.ts |
+| reexport-all-client.ts:4:9:4:10 | ns | reexport-all.ts |
+| reexport-all-client.ts:4:9:4:12 | ns.G | G in namespaces.ts |
+| reexport-all-client.ts:5:9:5:9 | G | G in namespaces.ts |
+| reexport-all-client.ts:6:9:6:9 | G | G in namespaces.ts |
+| reexport-all-client.ts:6:9:6:11 | G.J | G.J in namespaces.ts |
+| reexport-all-client.ts:8:8:8:8 | D | D in otherlib.ts |
+| reexport-all-client.ts:9:8:9:9 | ns | reexport-all.ts |
+| reexport-all-client.ts:9:8:9:11 | ns.D | D in otherlib.ts |
+| reexport-all-client.ts:11:8:11:9 | ns | reexport-all.ts |
+| reexport-named-client.ts:4:9:4:10 | ns | reexport-named.ts |
+| reexport-named-client.ts:4:9:4:12 | ns.G | G in namespaces.ts |
+| reexport-named-client.ts:5:9:5:9 | G | G in namespaces.ts |
+| reexport-named-client.ts:6:9:6:9 | G | G in namespaces.ts |
+| reexport-named-client.ts:6:9:6:11 | G.J | G.J in namespaces.ts |
+| reexport-named-client.ts:8:8:8:8 | X | D in namespaces.ts |
+| reexport-named-client.ts:9:8:9:9 | ns | reexport-named.ts |
+| reexport-named-client.ts:9:8:9:11 | ns.X | D in namespaces.ts |
diff --git a/javascript/ql/test/library-tests/TypeScript/QualifiedNameResolution/ResolveTypeName.expected b/javascript/ql/test/library-tests/TypeScript/QualifiedNameResolution/ResolveTypeName.expected
index 008b2cbbbeb..1629bdac5b1 100644
--- a/javascript/ql/test/library-tests/TypeScript/QualifiedNameResolution/ResolveTypeName.expected
+++ b/javascript/ql/test/library-tests/TypeScript/QualifiedNameResolution/ResolveTypeName.expected
@@ -1,27 +1,27 @@
 | ambient.ts:5:16:5:20 | Foo.C | Foo.C in global scope |
-| enums.ts:9:8:9:12 | A.E.x | A.E.x in library-tests/TypeScript/QualifiedNameResolution/enums.ts |
-| enums.ts:10:8:10:10 | A.E | A.E in library-tests/TypeScript/QualifiedNameResolution/enums.ts |
-| export-class-client-renamed.ts:3:8:3:8 | X | Banana in library-tests/TypeScript/QualifiedNameResolution/export-class.ts |
-| export-class-client.ts:3:8:3:13 | Banana | Banana in library-tests/TypeScript/QualifiedNameResolution/export-class.ts |
-| export-qualified-client.ts:3:8:3:11 | AB.C | A.B.C in library-tests/TypeScript/QualifiedNameResolution/export-qualified.ts |
-| export-specifiers-client.ts:4:8:4:10 | N.C | N.C in library-tests/TypeScript/QualifiedNameResolution/export-specifiers.ts |
-| export-specifiers-client.ts:5:8:5:10 | D.C | D.C in library-tests/TypeScript/QualifiedNameResolution/export-specifiers.ts |
-| export-specifiers-client.ts:6:8:6:8 | C | C in library-tests/TypeScript/QualifiedNameResolution/export-specifiers.ts |
+| enums.ts:9:8:9:12 | A.E.x | A.E.x in enums.ts |
+| enums.ts:10:8:10:10 | A.E | A.E in enums.ts |
+| export-class-client-renamed.ts:3:8:3:8 | X | Banana in export-class.ts |
+| export-class-client.ts:3:8:3:13 | Banana | Banana in export-class.ts |
+| export-qualified-client.ts:3:8:3:11 | AB.C | A.B.C in export-qualified.ts |
+| export-specifiers-client.ts:4:8:4:10 | N.C | N.C in export-specifiers.ts |
+| export-specifiers-client.ts:5:8:5:10 | D.C | D.C in export-specifiers.ts |
+| export-specifiers-client.ts:6:8:6:8 | C | C in export-specifiers.ts |
 | global.ts:5:9:5:14 | Glob.C | Glob.C in global scope |
 | import-in-namespace.ts:9:13:9:15 | A.C | X.C in global scope |
 | import-in-namespace.ts:10:13:10:13 | D | X.C in global scope |
-| namespaces-client.ts:4:9:4:14 | ns.G.C | G.C in library-tests/TypeScript/QualifiedNameResolution/namespaces.ts |
-| namespaces-client.ts:5:9:5:11 | G.C | G.C in library-tests/TypeScript/QualifiedNameResolution/namespaces.ts |
-| namespaces-client.ts:6:9:6:13 | G.J.C | G.J.C in library-tests/TypeScript/QualifiedNameResolution/namespaces.ts |
-| reexport-all-client.ts:4:9:4:14 | ns.G.C | G.C in library-tests/TypeScript/QualifiedNameResolution/namespaces.ts |
-| reexport-all-client.ts:5:9:5:11 | G.C | G.C in library-tests/TypeScript/QualifiedNameResolution/namespaces.ts |
-| reexport-all-client.ts:6:9:6:13 | G.J.C | G.J.C in library-tests/TypeScript/QualifiedNameResolution/namespaces.ts |
+| namespaces-client.ts:4:9:4:14 | ns.G.C | G.C in namespaces.ts |
+| namespaces-client.ts:5:9:5:11 | G.C | G.C in namespaces.ts |
+| namespaces-client.ts:6:9:6:13 | G.J.C | G.J.C in namespaces.ts |
+| reexport-all-client.ts:4:9:4:14 | ns.G.C | G.C in namespaces.ts |
+| reexport-all-client.ts:5:9:5:11 | G.C | G.C in namespaces.ts |
+| reexport-all-client.ts:6:9:6:13 | G.J.C | G.J.C in namespaces.ts |
 | reexport-all-client.ts:8:8:8:10 | D.F | D.F in unknown scope |
 | reexport-all-client.ts:9:8:9:13 | ns.D.F | ns.D.F in unknown scope |
-| reexport-all-client.ts:11:8:11:16 | ns.Banana | Banana in library-tests/TypeScript/QualifiedNameResolution/export-class.ts |
-| reexport-named-client.ts:4:9:4:14 | ns.G.C | G.C in library-tests/TypeScript/QualifiedNameResolution/namespaces.ts |
-| reexport-named-client.ts:5:9:5:11 | G.C | G.C in library-tests/TypeScript/QualifiedNameResolution/namespaces.ts |
-| reexport-named-client.ts:6:9:6:13 | G.J.C | G.J.C in library-tests/TypeScript/QualifiedNameResolution/namespaces.ts |
+| reexport-all-client.ts:11:8:11:16 | ns.Banana | Banana in export-class.ts |
+| reexport-named-client.ts:4:9:4:14 | ns.G.C | G.C in namespaces.ts |
+| reexport-named-client.ts:5:9:5:11 | G.C | G.C in namespaces.ts |
+| reexport-named-client.ts:6:9:6:13 | G.J.C | G.J.C in namespaces.ts |
 | reexport-named-client.ts:8:8:8:10 | X.F | X.F in unknown scope |
 | reexport-named-client.ts:9:8:9:13 | ns.X.F | ns.X.F in unknown scope |
-| reexport-named-client.ts:11:9:11:9 | Y | Banana in library-tests/TypeScript/QualifiedNameResolution/export-class.ts |
+| reexport-named-client.ts:11:9:11:9 | Y | Banana in export-class.ts |
diff --git a/javascript/ql/test/library-tests/TypeScript/RegressionTests/EmptyName/test.expected b/javascript/ql/test/library-tests/TypeScript/RegressionTests/EmptyName/test.expected
index 47317a00a86..85cb86df42a 100644
--- a/javascript/ql/test/library-tests/TypeScript/RegressionTests/EmptyName/test.expected
+++ b/javascript/ql/test/library-tests/TypeScript/RegressionTests/EmptyName/test.expected
@@ -1,4 +1,4 @@
 | MK in unknown scope |
-| Mapped in library-tests/TypeScript/RegressionTests/EmptyName/test.ts |
-| fn in library-tests/TypeScript/RegressionTests/EmptyName/test.ts |
-| library-tests/TypeScript/RegressionTests/EmptyName/test.ts |
+| Mapped in test.ts |
+| fn in test.ts |
+| test.ts |
diff --git a/javascript/ql/test/library-tests/TypeScript/RegressionTests/ExportEqualsExpr/test.expected b/javascript/ql/test/library-tests/TypeScript/RegressionTests/ExportEqualsExpr/test.expected
index 3736c602bc3..24fc1205875 100644
--- a/javascript/ql/test/library-tests/TypeScript/RegressionTests/ExportEqualsExpr/test.expected
+++ b/javascript/ql/test/library-tests/TypeScript/RegressionTests/ExportEqualsExpr/test.expected
@@ -1,7 +1,7 @@
 | "bar" in global scope |
 | C in module 'bar' |
 | Foo in global scope |
-| Foo in library-tests/TypeScript/RegressionTests/ExportEqualsExpr/tst.ts |
-| library-tests/TypeScript/RegressionTests/ExportEqualsExpr/tst.ts |
+| Foo in tst.ts |
 | module 'bar' |
 | module 'foo' |
+| tst.ts |
diff --git a/javascript/ql/test/library-tests/TypeScript/RegressionTests/SemicolonInName/test.expected b/javascript/ql/test/library-tests/TypeScript/RegressionTests/SemicolonInName/test.expected
index 074e6d0c277..603eaba0d27 100644
--- a/javascript/ql/test/library-tests/TypeScript/RegressionTests/SemicolonInName/test.expected
+++ b/javascript/ql/test/library-tests/TypeScript/RegressionTests/SemicolonInName/test.expected
@@ -1,2 +1,2 @@
 | Bar.Foo in global scope | Bar in global scope |
-| fn in library-tests/TypeScript/RegressionTests/SemicolonInName/test.ts | library-tests/TypeScript/RegressionTests/SemicolonInName/test.ts |
+| fn in test.ts | test.ts |
diff --git a/javascript/ql/test/library-tests/TypeScript/SyntaxErrors/SyntaxErrors.expected b/javascript/ql/test/library-tests/TypeScript/SyntaxErrors/SyntaxErrors.expected
index 58e88ed6fe1..cca870438e9 100644
--- a/javascript/ql/test/library-tests/TypeScript/SyntaxErrors/SyntaxErrors.expected
+++ b/javascript/ql/test/library-tests/TypeScript/SyntaxErrors/SyntaxErrors.expected
@@ -1 +1 @@
-| library-tests/TypeScript/SyntaxErrors/jsdocTypes.ts | This file contains a parse error |
+| jsdocTypes.ts | This file contains a parse error |
diff --git a/javascript/ql/test/library-tests/TypeScript/Types/tests.expected b/javascript/ql/test/library-tests/TypeScript/Types/tests.expected
index 1cf1ca607ae..b786fae3713 100644
--- a/javascript/ql/test/library-tests/TypeScript/Types/tests.expected
+++ b/javascript/ql/test/library-tests/TypeScript/Types/tests.expected
@@ -1,7 +1,7 @@
 booleans
 | boolean |
 getExprType
-| boolean-type.ts:1:13:1:17 | dummy | typeof library-tests/TypeScript/Types/dummy.ts |
+| boolean-type.ts:1:13:1:17 | dummy | typeof dummy.ts |
 | boolean-type.ts:1:24:1:32 | "./dummy" | any |
 | boolean-type.ts:3:5:3:9 | true1 | true |
 | boolean-type.ts:4:5:4:9 | true2 | true |
@@ -24,7 +24,7 @@ getExprType
 | middle-rest.ts:3:8:3:11 | true | true |
 | middle-rest.ts:3:14:3:20 | "hello" | "hello" |
 | middle-rest.ts:3:23:3:25 | 123 | 123 |
-| tst.ts:1:13:1:17 | dummy | typeof library-tests/TypeScript/Types/dummy.ts |
+| tst.ts:1:13:1:17 | dummy | typeof dummy.ts |
 | tst.ts:1:24:1:32 | "./dummy" | any |
 | tst.ts:3:5:3:10 | numVar | number |
 | tst.ts:5:5:5:8 | num1 | number |
@@ -127,7 +127,7 @@ getExprType
 | tst.ts:69:24:69:45 | {yetAno ... : true} | MyUnion2 |
 | tst.ts:69:25:69:38 | yetAnotherType | true |
 | tst.ts:69:41:69:44 | true | true |
-| tst.ts:71:8:71:11 | TS43 | typeof TS43 in library-tests/TypeScript/Types/tst.ts |
+| tst.ts:71:8:71:11 | TS43 | typeof TS43 in tst.ts |
 | tst.ts:74:5:74:22 | get size(): number | number |
 | tst.ts:74:9:74:12 | size | number |
 | tst.ts:75:5:75:47 | set siz ... olean); | number |
@@ -175,7 +175,7 @@ getExprType
 | tst.ts:126:7:126:22 | this.#someMethod | () => number |
 | tst.ts:126:7:126:24 | this.#someMethod() | number |
 | tst.ts:127:14:127:28 | this.#someValue | number |
-| tst.ts:132:8:132:11 | TS44 | typeof TS44 in library-tests/TypeScript/Types/tst.ts |
+| tst.ts:132:8:132:11 | TS44 | typeof TS44 in tst.ts |
 | tst.ts:133:12:133:14 | foo | (arg: unknown) => void |
 | tst.ts:133:16:133:18 | arg | unknown |
 | tst.ts:134:11:134:21 | argIsString | boolean |
@@ -260,7 +260,7 @@ getExprType
 | tst.ts:189:11:189:15 | count | number |
 | tst.ts:189:19:189:21 | Foo | typeof Foo in tst.ts:132 |
 | tst.ts:189:19:189:28 | Foo.#count | number |
-| tst.ts:195:8:195:11 | TS45 | typeof TS45 in library-tests/TypeScript/Types/tst.ts |
+| tst.ts:195:8:195:11 | TS45 | typeof TS45 in tst.ts |
 | tst.ts:207:5:207:8 | body | string |
 | tst.ts:212:7:212:13 | message | string |
 | tst.ts:215:19:215:25 | handler | (r: Success \| Error) => void |
@@ -301,7 +301,7 @@ getExprType
 | tst.ts:238:11:238:14 | Foo3 | { foo: string; } |
 | tst.ts:238:11:238:18 | Foo3.foo | string |
 | tst.ts:238:16:238:18 | foo | string |
-| tst.ts:240:8:240:11 | TS46 | typeof TS46 in library-tests/TypeScript/Types/tst.ts |
+| tst.ts:240:8:240:11 | TS46 | typeof TS46 in tst.ts |
 | tst.ts:241:9:241:12 | Base | Base |
 | tst.ts:243:9:243:15 | Derived | Derived |
 | tst.ts:243:25:243:28 | Base | Base |
@@ -481,27 +481,27 @@ getExprType
 | tst.ts:362:9:362:11 | log | (...data: any[]) => void |
 | tst.ts:362:13:362:24 | tstModuleCJS | () => "a" \| "b" |
 | tst.ts:362:13:362:26 | tstModuleCJS() | "a" \| "b" |
-| tst.ts:368:13:368:13 | A | typeof library-tests/TypeScript/Types/tstSuffixA.ts |
+| tst.ts:368:13:368:13 | A | typeof tstSuffixA.ts |
 | tst.ts:368:20:368:33 | './tstSuffixA' | any |
 | tst.ts:370:1:370:7 | console | Console |
 | tst.ts:370:1:370:11 | console.log | (...data: any[]) => void |
 | tst.ts:370:1:370:29 | console ... File()) | void |
 | tst.ts:370:9:370:11 | log | (...data: any[]) => void |
-| tst.ts:370:13:370:13 | A | typeof library-tests/TypeScript/Types/tstSuffixA.ts |
+| tst.ts:370:13:370:13 | A | typeof tstSuffixA.ts |
 | tst.ts:370:13:370:26 | A.resolvedFile | () => "tstSuffixA.ts" |
 | tst.ts:370:13:370:28 | A.resolvedFile() | "tstSuffixA.ts" |
 | tst.ts:370:15:370:26 | resolvedFile | () => "tstSuffixA.ts" |
-| tst.ts:372:13:372:13 | B | typeof library-tests/TypeScript/Types/tstSuffixB.ios.ts |
+| tst.ts:372:13:372:13 | B | typeof tstSuffixB.ios.ts |
 | tst.ts:372:20:372:33 | './tstSuffixB' | any |
 | tst.ts:374:1:374:7 | console | Console |
 | tst.ts:374:1:374:11 | console.log | (...data: any[]) => void |
 | tst.ts:374:1:374:29 | console ... File()) | void |
 | tst.ts:374:9:374:11 | log | (...data: any[]) => void |
-| tst.ts:374:13:374:13 | B | typeof library-tests/TypeScript/Types/tstSuffixB.ios.ts |
+| tst.ts:374:13:374:13 | B | typeof tstSuffixB.ios.ts |
 | tst.ts:374:13:374:26 | B.resolvedFile | () => "tstSuffixB.ios.ts" |
 | tst.ts:374:13:374:28 | B.resolvedFile() | "tstSuffixB.ios.ts" |
 | tst.ts:374:15:374:26 | resolvedFile | () => "tstSuffixB.ios.ts" |
-| tst.ts:379:8:379:11 | TS48 | typeof TS48 in library-tests/TypeScript/Types/tst.ts |
+| tst.ts:379:8:379:11 | TS48 | typeof TS48 in tst.ts |
 | tst.ts:383:22:383:35 | chooseRandomly | <T>(x: T, y: T) => T |
 | tst.ts:383:40:383:40 | x | T |
 | tst.ts:383:46:383:46 | y | T |
@@ -518,7 +518,7 @@ getExprType
 | tst.ts:385:56:385:56 | 0 | 0 |
 | tst.ts:385:59:385:63 | false | false |
 | tst.ts:385:66:385:71 | "bye!" | "bye!" |
-| tst.ts:390:8:390:11 | TS49 | typeof TS49 in library-tests/TypeScript/Types/tst.ts |
+| tst.ts:390:8:390:11 | TS49 | typeof TS49 in tst.ts |
 | tst.ts:395:9:395:15 | palette | { red: [number, number, number]; green: string;... |
 | tst.ts:395:19:399:3 | {\\n    r ... 5],\\n  } | Record<Colors, string \| RGB> |
 | tst.ts:395:19:399:42 | {\\n    r ...  \| RGB> | { red: [number, number, number]; green: string;... |
@@ -559,7 +559,7 @@ getExprType
 | tst.ts:423:7:423:22 | this.name = name | string |
 | tst.ts:423:12:423:15 | name | string |
 | tst.ts:423:19:423:22 | name | string |
-| tst.ts:430:8:430:11 | TS50 | typeof TS50 in library-tests/TypeScript/Types/tst.ts |
+| tst.ts:430:8:430:11 | TS50 | typeof TS50 in tst.ts |
 | tst.ts:432:33:432:36 | args | Args |
 | tst.ts:433:68:433:71 | args | Args |
 | tst.ts:435:15:435:24 | methodName | string |
@@ -632,7 +632,7 @@ getExprType
 | tst.ts:467:15:467:17 | foo | readonly ["a", "b", "c"] |
 | tst.ts:467:15:467:20 | foo[1] | "b" |
 | tst.ts:467:19:467:19 | 1 | 1 |
-| tst.ts:472:8:472:11 | TS52 | typeof TS52 in library-tests/TypeScript/Types/tst.ts |
+| tst.ts:472:8:472:11 | TS52 | typeof TS52 in tst.ts |
 | tst.ts:473:11:473:19 | SomeClass | SomeClass |
 | tst.ts:474:10:474:36 | ((_targ ...  => {}) | (_target: undefined, _context: ClassFieldDecora... |
 | tst.ts:474:11:474:35 | (_targe ... ) => {} | (_target: undefined, _context: ClassFieldDecora... |
@@ -657,7 +657,7 @@ getExprType
 | tst.ts:483:17:483:58 | ["hello ... string> | [first: string, string] |
 | tst.ts:483:18:483:24 | "hello" | "hello" |
 | tst.ts:483:27:483:33 | "world" | "world" |
-| tst.ts:486:8:486:11 | TS54 | typeof TS54 in library-tests/TypeScript/Types/tst.ts |
+| tst.ts:486:8:486:11 | TS54 | typeof TS54 in tst.ts |
 | tst.ts:487:48:487:53 | colors | C[] |
 | tst.ts:488:12:488:17 | colors | C[] |
 | tst.ts:488:12:488:20 | colors[0] | C |
@@ -691,7 +691,7 @@ getExprType
 | tst.ts:494:24:494:24 | 0 | 0 |
 | tst.ts:494:28:494:33 | "even" | "even" |
 | tst.ts:494:36:494:40 | "odd" | "odd" |
-| tst.ts:498:8:498:11 | TS55 | typeof TS55 in library-tests/TypeScript/Types/tst.ts |
+| tst.ts:498:8:498:11 | TS55 | typeof TS55 in tst.ts |
 | tst.ts:499:9:499:15 | strings | string[] |
 | tst.ts:499:19:499:32 | (["foo", 123]) | (string \| number)[] |
 | tst.ts:499:19:500:11 | (["foo" ... .filter | { <S extends string \| number>(predicate: (value... |
@@ -779,18 +779,18 @@ getExprType
 | type_alias.ts:26:19:26:20 | id | string |
 | type_alias.ts:26:23:26:36 | "second-child" | "second-child" |
 | type_alias.ts:26:41:26:62 | "I'm th ...  child" | "I'm the second child" |
-| type_definition_objects.ts:1:13:1:17 | dummy | typeof library-tests/TypeScript/Types/dummy.ts |
+| type_definition_objects.ts:1:13:1:17 | dummy | typeof dummy.ts |
 | type_definition_objects.ts:1:24:1:32 | "./dummy" | any |
 | type_definition_objects.ts:3:14:3:14 | C | C |
-| type_definition_objects.ts:4:5:4:12 | classObj | typeof C in library-tests/TypeScript/Types/type_definition_objects.ts |
-| type_definition_objects.ts:4:16:4:16 | C | typeof C in library-tests/TypeScript/Types/type_definition_objects.ts |
+| type_definition_objects.ts:4:5:4:12 | classObj | typeof C in type_definition_objects.ts |
+| type_definition_objects.ts:4:16:4:16 | C | typeof C in type_definition_objects.ts |
 | type_definition_objects.ts:6:13:6:13 | E | E |
-| type_definition_objects.ts:7:5:7:11 | enumObj | typeof E in library-tests/TypeScript/Types/type_definition_objects.ts |
-| type_definition_objects.ts:7:15:7:15 | E | typeof E in library-tests/TypeScript/Types/type_definition_objects.ts |
-| type_definition_objects.ts:9:18:9:18 | N | typeof N in library-tests/TypeScript/Types/type_definition_objects.ts |
-| type_definition_objects.ts:10:5:10:16 | namespaceObj | typeof N in library-tests/TypeScript/Types/type_definition_objects.ts |
-| type_definition_objects.ts:10:20:10:20 | N | typeof N in library-tests/TypeScript/Types/type_definition_objects.ts |
-| type_definitions.ts:1:13:1:17 | dummy | typeof library-tests/TypeScript/Types/dummy.ts |
+| type_definition_objects.ts:7:5:7:11 | enumObj | typeof E in type_definition_objects.ts |
+| type_definition_objects.ts:7:15:7:15 | E | typeof E in type_definition_objects.ts |
+| type_definition_objects.ts:9:18:9:18 | N | typeof N in type_definition_objects.ts |
+| type_definition_objects.ts:10:5:10:16 | namespaceObj | typeof N in type_definition_objects.ts |
+| type_definition_objects.ts:10:20:10:20 | N | typeof N in type_definition_objects.ts |
+| type_definitions.ts:1:13:1:17 | dummy | typeof dummy.ts |
 | type_definitions.ts:1:24:1:32 | "./dummy" | any |
 | type_definitions.ts:4:3:4:3 | x | S |
 | type_definitions.ts:6:5:6:5 | i | I<number> |
diff --git a/javascript/ql/test/library-tests/frameworks/Vue/special-syntax.vue b/javascript/ql/test/library-tests/frameworks/Vue/special-syntax.vue
new file mode 100644
index 00000000000..fa3008dcf96
--- /dev/null
+++ b/javascript/ql/test/library-tests/frameworks/Vue/special-syntax.vue
@@ -0,0 +1,5 @@
+<template>
+  <Blah :colonProp="x" @atProp="x" />
+  <Blah :colonField.field="x" />
+</template>
+<script></script>
diff --git a/javascript/ql/test/library-tests/frameworks/Vue/tests.expected b/javascript/ql/test/library-tests/frameworks/Vue/tests.expected
index 0bba4c6073c..7f0ea1aa9ac 100644
--- a/javascript/ql/test/library-tests/frameworks/Vue/tests.expected
+++ b/javascript/ql/test/library-tests/frameworks/Vue/tests.expected
@@ -76,6 +76,7 @@ component
 | single-file-component-3.vue:0:0:0:0 | single-file-component-3.vue |
 | single-file-component-4.vue:0:0:0:0 | single-file-component-4.vue |
 | single-file-component-5.vue:0:0:0:0 | single-file-component-5.vue |
+| special-syntax.vue:0:0:0:0 | special-syntax.vue |
 | tst.js:3:1:10:2 | new Vue ... 2\\n\\t}\\n}) |
 | tst.js:12:1:16:2 | new Vue ... \\t}),\\n}) |
 | tst.js:18:1:27:2 | Vue.com ... }\\n\\t}\\n}) |
@@ -126,6 +127,10 @@ templateElement
 | single-file-component-5.vue:2:5:18:9 | <p>...</> |
 | single-file-component-5.vue:4:1:16:9 | <script>...</> |
 | single-file-component-5.vue:17:1:18:8 | <style>...</> |
+| special-syntax.vue:1:1:4:11 | <template>...</> |
+| special-syntax.vue:2:3:2:37 | <blah>...</> |
+| special-syntax.vue:3:3:3:32 | <blah>...</> |
+| special-syntax.vue:5:1:5:17 | <script>...</> |
 xssSink
 | compont-with-route.vue:2:8:2:21 | v-html=dataA |
 | single-component-file-1.vue:2:8:2:21 | v-html=dataA |
@@ -161,3 +166,15 @@ remoteFlowSource
 | router.js:30:5:30:14 | from.query |
 | router.js:34:5:34:12 | to.query |
 | router.js:35:5:35:14 | from.query |
+parseErrors
+attribute
+| compont-with-route.vue:2:8:2:21 | v-html=dataA | v-html |
+| single-component-file-1.vue:2:8:2:21 | v-html=dataA | v-html |
+| single-file-component-2.vue:2:8:2:21 | v-html=dataA | v-html |
+| single-file-component-3.vue:2:8:2:21 | v-html=dataA | v-html |
+| single-file-component-3.vue:4:9:4:49 | src=./single-file-component-3-script.js | src |
+| single-file-component-4.vue:2:8:2:21 | v-html=dataA | v-html |
+| single-file-component-5.vue:2:8:2:21 | v-html=dataA | v-html |
+| special-syntax.vue:2:9:2:22 | :colonProp=x | :colonProp |
+| special-syntax.vue:2:24:2:34 | @atProp=x | @atProp |
+| special-syntax.vue:3:9:3:29 | :colonField.field=x | :colonField.field |
diff --git a/javascript/ql/test/library-tests/frameworks/Vue/tests.ql b/javascript/ql/test/library-tests/frameworks/Vue/tests.ql
index 3f959a92fac..1f85d56bd47 100644
--- a/javascript/ql/test/library-tests/frameworks/Vue/tests.ql
+++ b/javascript/ql/test/library-tests/frameworks/Vue/tests.ql
@@ -20,3 +20,7 @@ query predicate templateElement(Vue::Template::Element template) { any() }
 query predicate xssSink(DomBasedXss::Sink s) { any() }
 
 query RemoteFlowSource remoteFlowSource() { any() }
+
+query predicate parseErrors(JSParseError err) { exists(err) }
+
+query predicate attribute(HTML::Attribute attrib, string name) { attrib.getName() = name }
diff --git a/javascript/ql/test/library-tests/threat-models/default/ActiveKinds.expected b/javascript/ql/test/library-tests/threat-models/default/ActiveKinds.expected
new file mode 100644
index 00000000000..892f0fa5f6c
--- /dev/null
+++ b/javascript/ql/test/library-tests/threat-models/default/ActiveKinds.expected
@@ -0,0 +1,3 @@
+| default |
+| remote |
+| request |
diff --git a/javascript/ql/test/library-tests/threat-models/default/ActiveKinds.ql b/javascript/ql/test/library-tests/threat-models/default/ActiveKinds.ql
new file mode 100644
index 00000000000..93a1354b7af
--- /dev/null
+++ b/javascript/ql/test/library-tests/threat-models/default/ActiveKinds.ql
@@ -0,0 +1,7 @@
+private import codeql.threatmodels.ThreatModels
+
+from string kind
+where
+  knownThreatModel(kind) and
+  currentThreatModel(kind)
+select kind
diff --git a/javascript/ql/test/library-tests/threat-models/sources/TestSources.expected b/javascript/ql/test/library-tests/threat-models/sources/TestSources.expected
new file mode 100644
index 00000000000..8ec8033d086
--- /dev/null
+++ b/javascript/ql/test/library-tests/threat-models/sources/TestSources.expected
@@ -0,0 +1,2 @@
+testFailures
+failures
diff --git a/javascript/ql/test/library-tests/threat-models/sources/TestSources.ql b/javascript/ql/test/library-tests/threat-models/sources/TestSources.ql
new file mode 100644
index 00000000000..3dc112c487e
--- /dev/null
+++ b/javascript/ql/test/library-tests/threat-models/sources/TestSources.ql
@@ -0,0 +1,38 @@
+import javascript
+import testUtilities.InlineExpectationsTest
+
+class TestSourcesConfiguration extends TaintTracking::Configuration {
+  TestSourcesConfiguration() { this = "TestSources" }
+
+  override predicate isSource(DataFlow::Node source) { source instanceof ThreatModelSource }
+
+  override predicate isSink(DataFlow::Node sink) {
+    exists(CallExpr call |
+      call.getAnArgument() = sink.asExpr() and
+      call.getCalleeName() = "SINK"
+    )
+  }
+}
+
+private module InlineTestSources implements TestSig {
+  string getARelevantTag() { result in ["hasFlow", "threat-source"] }
+
+  predicate hasActualResult(Location location, string element, string tag, string value) {
+    exists(DataFlow::Node sink |
+      any(TestSourcesConfiguration c).hasFlow(_, sink) and
+      value = "" and
+      location = sink.getLocation() and
+      tag = "hasFlow" and
+      element = sink.toString()
+    )
+    or
+    exists(ThreatModelSource source |
+      value = source.getThreatModel() and
+      location = source.getLocation() and
+      tag = "threat-source" and
+      element = source.toString()
+    )
+  }
+}
+
+import MakeTest<InlineTestSources>
diff --git a/javascript/ql/test/library-tests/threat-models/sources/externs.js b/javascript/ql/test/library-tests/threat-models/sources/externs.js
new file mode 100644
index 00000000000..1afdf83bcd0
--- /dev/null
+++ b/javascript/ql/test/library-tests/threat-models/sources/externs.js
@@ -0,0 +1,1698 @@
+// Automatically generated from TypeScript type definitions provided by
+// DefinitelyTyped (https://github.com/DefinitelyTyped/DefinitelyTyped),
+// which is licensed under the MIT license; see file DefinitelyTyped-LICENSE
+// in parent directory.
+// Type definitions for Node.js 10.5.x
+// Project: http://nodejs.org/
+// Definitions by: Microsoft TypeScript <http://typescriptlang.org>
+//                 DefinitelyTyped <https://github.com/DefinitelyTyped/DefinitelyTyped>
+//                 Parambir Singh <https://github.com/parambirs>
+//                 Christian Vaagland Tellnes <https://github.com/tellnes>
+//                 Wilco Bakker <https://github.com/WilcoBakker>
+//                 Nicolas Voigt <https://github.com/octo-sniffle>
+//                 Chigozirim C. <https://github.com/smac89>
+//                 Flarna <https://github.com/Flarna>
+//                 Mariusz Wiktorczyk <https://github.com/mwiktorczyk>
+//                 wwwy3y3 <https://github.com/wwwy3y3>
+//                 Deividas Bakanas <https://github.com/DeividasBakanas>
+//                 Kelvin Jin <https://github.com/kjin>
+//                 Alvis HT Tang <https://github.com/alvis>
+//                 Sebastian Silbermann <https://github.com/eps1lon>
+//                 Hannes Magnusson <https://github.com/Hannes-Magnusson-CK>
+//                 Alberto Schiabel <https://github.com/jkomyno>
+//                 Klaus Meinhardt <https://github.com/ajafff>
+//                 Huw <https://github.com/hoo29>
+//                 Nicolas Even <https://github.com/n-e>
+//                 Bruno Scheufler <https://github.com/brunoscheufler>
+//                 Mohsen Azimi <https://github.com/mohsen1>
+//                 Hoàng Văn Khải <https://github.com/KSXGitHub>
+//                 Alexander T. <https://github.com/a-tarasyuk>
+//                 Lishude <https://github.com/islishude>
+//                 Andrew Makarov <https://github.com/r3nya>
+//                 Zane Hannan AU <https://github.com/ZaneHannanAU>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/**
+ * @externs
+ * @fileoverview Definitions for module "fs"
+ */
+
+var fs = {};
+
+var events = require("events");
+
+/**
+ * @interface
+ */
+function Stats() {}
+
+/**
+ * @return {boolean}
+ */
+Stats.prototype.isFile = function() {};
+
+/**
+ * @return {boolean}
+ */
+Stats.prototype.isDirectory = function() {};
+
+/**
+ * @return {boolean}
+ */
+Stats.prototype.isBlockDevice = function() {};
+
+/**
+ * @return {boolean}
+ */
+Stats.prototype.isCharacterDevice = function() {};
+
+/**
+ * @return {boolean}
+ */
+Stats.prototype.isSymbolicLink = function() {};
+
+/**
+ * @return {boolean}
+ */
+Stats.prototype.isFIFO = function() {};
+
+/**
+ * @return {boolean}
+ */
+Stats.prototype.isSocket = function() {};
+
+/**
+ * @type {number}
+ */
+Stats.prototype.dev;
+
+/**
+ * @type {number}
+ */
+Stats.prototype.ino;
+
+/**
+ * @type {number}
+ */
+Stats.prototype.mode;
+
+/**
+ * @type {number}
+ */
+Stats.prototype.nlink;
+
+/**
+ * @type {number}
+ */
+Stats.prototype.uid;
+
+/**
+ * @type {number}
+ */
+Stats.prototype.gid;
+
+/**
+ * @type {number}
+ */
+Stats.prototype.rdev;
+
+/**
+ * @type {number}
+ */
+Stats.prototype.size;
+
+/**
+ * @type {number}
+ */
+Stats.prototype.blksize;
+
+/**
+ * @type {number}
+ */
+Stats.prototype.blocks;
+
+/**
+ * @type {Date}
+ */
+Stats.prototype.atime;
+
+/**
+ * @type {Date}
+ */
+Stats.prototype.mtime;
+
+/**
+ * @type {Date}
+ */
+Stats.prototype.ctime;
+
+/**
+ * @type {Date}
+ */
+Stats.prototype.birthtime;
+
+/**
+ * @interface
+ * @extends {events.EventEmitter}
+ */
+function FSWatcher() {}
+
+/**
+ * @return {void}
+ */
+FSWatcher.prototype.close = function() {};
+
+/**
+ * @param {string} event
+ * @param {Function} listener
+ * @return {*}
+ */
+FSWatcher.prototype.addListener = function(event, listener) {};
+
+/**
+ * @param {string} event
+ * @param {(function(string, (string|Buffer)): void)} listener
+ * @return {*}
+ */
+FSWatcher.prototype.addListener = function(event, listener) {};
+
+/**
+ * @param {string} event
+ * @param {(function(number, string): void)} listener
+ * @return {*}
+ */
+FSWatcher.prototype.addListener = function(event, listener) {};
+
+/**
+ * @param {string} event
+ * @param {Function} listener
+ * @return {*}
+ */
+FSWatcher.prototype.on = function(event, listener) {};
+
+/**
+ * @param {string} event
+ * @param {(function(string, (string|Buffer)): void)} listener
+ * @return {*}
+ */
+FSWatcher.prototype.on = function(event, listener) {};
+
+/**
+ * @param {string} event
+ * @param {(function(number, string): void)} listener
+ * @return {*}
+ */
+FSWatcher.prototype.on = function(event, listener) {};
+
+/**
+ * @param {string} event
+ * @param {Function} listener
+ * @return {*}
+ */
+FSWatcher.prototype.once = function(event, listener) {};
+
+/**
+ * @param {string} event
+ * @param {(function(string, (string|Buffer)): void)} listener
+ * @return {*}
+ */
+FSWatcher.prototype.once = function(event, listener) {};
+
+/**
+ * @param {string} event
+ * @param {(function(number, string): void)} listener
+ * @return {*}
+ */
+FSWatcher.prototype.once = function(event, listener) {};
+
+/**
+ * @param {string} event
+ * @param {Function} listener
+ * @return {*}
+ */
+FSWatcher.prototype.prependListener = function(event, listener) {};
+
+/**
+ * @param {string} event
+ * @param {(function(string, (string|Buffer)): void)} listener
+ * @return {*}
+ */
+FSWatcher.prototype.prependListener = function(event, listener) {};
+
+/**
+ * @param {string} event
+ * @param {(function(number, string): void)} listener
+ * @return {*}
+ */
+FSWatcher.prototype.prependListener = function(event, listener) {};
+
+/**
+ * @param {string} event
+ * @param {Function} listener
+ * @return {*}
+ */
+FSWatcher.prototype.prependOnceListener = function(event, listener) {};
+
+/**
+ * @param {string} event
+ * @param {(function(string, (string|Buffer)): void)} listener
+ * @return {*}
+ */
+FSWatcher.prototype.prependOnceListener = function(event, listener) {};
+
+/**
+ * @param {string} event
+ * @param {(function(number, string): void)} listener
+ * @return {*}
+ */
+FSWatcher.prototype.prependOnceListener = function(event, listener) {};
+
+/**
+ * @interface
+ * @extends {internal.Readable}
+ */
+fs.ReadStream = function() {};
+
+/**
+ * @return {void}
+ */
+fs.ReadStream.prototype.close = function() {};
+
+/**
+ * @return {void}
+ */
+fs.ReadStream.prototype.destroy = function() {};
+
+/**
+ * @param {string} event
+ * @param {Function} listener
+ * @return {*}
+ */
+fs.ReadStream.prototype.addListener = function(event, listener) {};
+
+/**
+ * @param {string} event
+ * @param {(function(number): void)} listener
+ * @return {*}
+ */
+fs.ReadStream.prototype.addListener = function(event, listener) {};
+
+/**
+ * @param {string} event
+ * @param {(function(): void)} listener
+ * @return {*}
+ */
+fs.ReadStream.prototype.addListener = function(event, listener) {};
+
+/**
+ * @param {string} event
+ * @param {Function} listener
+ * @return {*}
+ */
+fs.ReadStream.prototype.on = function(event, listener) {};
+
+/**
+ * @param {string} event
+ * @param {(function(number): void)} listener
+ * @return {*}
+ */
+fs.ReadStream.prototype.on = function(event, listener) {};
+
+/**
+ * @param {string} event
+ * @param {(function(): void)} listener
+ * @return {*}
+ */
+fs.ReadStream.prototype.on = function(event, listener) {};
+
+/**
+ * @param {string} event
+ * @param {Function} listener
+ * @return {*}
+ */
+fs.ReadStream.prototype.once = function(event, listener) {};
+
+/**
+ * @param {string} event
+ * @param {(function(number): void)} listener
+ * @return {*}
+ */
+fs.ReadStream.prototype.once = function(event, listener) {};
+
+/**
+ * @param {string} event
+ * @param {(function(): void)} listener
+ * @return {*}
+ */
+fs.ReadStream.prototype.once = function(event, listener) {};
+
+/**
+ * @param {string} event
+ * @param {Function} listener
+ * @return {*}
+ */
+fs.ReadStream.prototype.prependListener = function(event, listener) {};
+
+/**
+ * @param {string} event
+ * @param {(function(number): void)} listener
+ * @return {*}
+ */
+fs.ReadStream.prototype.prependListener = function(event, listener) {};
+
+/**
+ * @param {string} event
+ * @param {(function(): void)} listener
+ * @return {*}
+ */
+fs.ReadStream.prototype.prependListener = function(event, listener) {};
+
+/**
+ * @param {string} event
+ * @param {Function} listener
+ * @return {*}
+ */
+fs.ReadStream.prototype.prependOnceListener = function(event, listener) {};
+
+/**
+ * @param {string} event
+ * @param {(function(number): void)} listener
+ * @return {*}
+ */
+fs.ReadStream.prototype.prependOnceListener = function(event, listener) {};
+
+/**
+ * @param {string} event
+ * @param {(function(): void)} listener
+ * @return {*}
+ */
+fs.ReadStream.prototype.prependOnceListener = function(event, listener) {};
+
+/**
+ * @interface
+ * @extends {internal.Writable}
+ */
+fs.WriteStream = function() {};
+
+/**
+ * @return {void}
+ */
+fs.WriteStream.prototype.close = function() {};
+
+/**
+ * @type {number}
+ */
+fs.WriteStream.prototype.bytesWritten;
+
+/**
+ * @type {(string|Buffer)}
+ */
+fs.WriteStream.prototype.path;
+
+/**
+ * @param {string} event
+ * @param {Function} listener
+ * @return {*}
+ */
+fs.WriteStream.prototype.addListener = function(event, listener) {};
+
+/**
+ * @param {string} event
+ * @param {(function(number): void)} listener
+ * @return {*}
+ */
+fs.WriteStream.prototype.addListener = function(event, listener) {};
+
+/**
+ * @param {string} event
+ * @param {(function(): void)} listener
+ * @return {*}
+ */
+fs.WriteStream.prototype.addListener = function(event, listener) {};
+
+/**
+ * @param {string} event
+ * @param {Function} listener
+ * @return {*}
+ */
+fs.WriteStream.prototype.on = function(event, listener) {};
+
+/**
+ * @param {string} event
+ * @param {(function(number): void)} listener
+ * @return {*}
+ */
+fs.WriteStream.prototype.on = function(event, listener) {};
+
+/**
+ * @param {string} event
+ * @param {(function(): void)} listener
+ * @return {*}
+ */
+fs.WriteStream.prototype.on = function(event, listener) {};
+
+/**
+ * @param {string} event
+ * @param {Function} listener
+ * @return {*}
+ */
+fs.WriteStream.prototype.once = function(event, listener) {};
+
+/**
+ * @param {string} event
+ * @param {(function(number): void)} listener
+ * @return {*}
+ */
+fs.WriteStream.prototype.once = function(event, listener) {};
+
+/**
+ * @param {string} event
+ * @param {(function(): void)} listener
+ * @return {*}
+ */
+fs.WriteStream.prototype.once = function(event, listener) {};
+
+/**
+ * @param {string} event
+ * @param {Function} listener
+ * @return {*}
+ */
+fs.WriteStream.prototype.prependListener = function(event, listener) {};
+
+/**
+ * @param {string} event
+ * @param {(function(number): void)} listener
+ * @return {*}
+ */
+fs.WriteStream.prototype.prependListener = function(event, listener) {};
+
+/**
+ * @param {string} event
+ * @param {(function(): void)} listener
+ * @return {*}
+ */
+fs.WriteStream.prototype.prependListener = function(event, listener) {};
+
+/**
+ * @param {string} event
+ * @param {Function} listener
+ * @return {*}
+ */
+fs.WriteStream.prototype.prependOnceListener = function(event, listener) {};
+
+/**
+ * @param {string} event
+ * @param {(function(number): void)} listener
+ * @return {*}
+ */
+fs.WriteStream.prototype.prependOnceListener = function(event, listener) {};
+
+/**
+ * @param {string} event
+ * @param {(function(): void)} listener
+ * @return {*}
+ */
+fs.WriteStream.prototype.prependOnceListener = function(event, listener) {};
+
+/**
+ * @param {string} oldPath
+ * @param {string} newPath
+ * @param {(function(NodeJS.ErrnoException=): void)=} callback
+ * @return {void}
+ */
+fs.rename = function(oldPath, newPath, callback) {};
+
+/**
+ * @param {string} oldPath
+ * @param {string} newPath
+ * @return {void}
+ */
+fs.renameSync = function(oldPath, newPath) {};
+
+/**
+ * @param {(string|Buffer)} path
+ * @param {(function(NodeJS.ErrnoException=): void)=} callback
+ * @return {void}
+ */
+fs.truncate = function(path, callback) {};
+
+/**
+ * @param {(string|Buffer)} path
+ * @param {number} len
+ * @param {(function(NodeJS.ErrnoException=): void)=} callback
+ * @return {void}
+ */
+fs.truncate = function(path, len, callback) {};
+
+/**
+ * @param {(string|Buffer)} path
+ * @param {number=} len
+ * @return {void}
+ */
+fs.truncateSync = function(path, len) {};
+
+/**
+ * @param {number} fd
+ * @param {(function(NodeJS.ErrnoException=): void)=} callback
+ * @return {void}
+ */
+fs.ftruncate = function(fd, callback) {};
+
+/**
+ * @param {number} fd
+ * @param {number} len
+ * @param {(function(NodeJS.ErrnoException=): void)=} callback
+ * @return {void}
+ */
+fs.ftruncate = function(fd, len, callback) {};
+
+/**
+ * @param {number} fd
+ * @param {number=} len
+ * @return {void}
+ */
+fs.ftruncateSync = function(fd, len) {};
+
+/**
+ * @param {(string|Buffer)} path
+ * @param {number} uid
+ * @param {number} gid
+ * @param {(function(NodeJS.ErrnoException=): void)=} callback
+ * @return {void}
+ */
+fs.chown = function(path, uid, gid, callback) {};
+
+/**
+ * @param {(string|Buffer)} path
+ * @param {number} uid
+ * @param {number} gid
+ * @return {void}
+ */
+fs.chownSync = function(path, uid, gid) {};
+
+/**
+ * @param {number} fd
+ * @param {number} uid
+ * @param {number} gid
+ * @param {(function(NodeJS.ErrnoException=): void)=} callback
+ * @return {void}
+ */
+fs.fchown = function(fd, uid, gid, callback) {};
+
+/**
+ * @param {number} fd
+ * @param {number} uid
+ * @param {number} gid
+ * @return {void}
+ */
+fs.fchownSync = function(fd, uid, gid) {};
+
+/**
+ * @param {(string|Buffer)} path
+ * @param {number} uid
+ * @param {number} gid
+ * @param {(function(NodeJS.ErrnoException=): void)=} callback
+ * @return {void}
+ */
+fs.lchown = function(path, uid, gid, callback) {};
+
+/**
+ * @param {(string|Buffer)} path
+ * @param {number} uid
+ * @param {number} gid
+ * @return {void}
+ */
+fs.lchownSync = function(path, uid, gid) {};
+
+/**
+ * @param {(string|Buffer)} path
+ * @param {number} mode
+ * @param {(function(NodeJS.ErrnoException=): void)=} callback
+ * @return {void}
+ */
+fs.chmod = function(path, mode, callback) {};
+
+/**
+ * @param {(string|Buffer)} path
+ * @param {string} mode
+ * @param {(function(NodeJS.ErrnoException=): void)=} callback
+ * @return {void}
+ */
+fs.chmod = function(path, mode, callback) {};
+
+/**
+ * @param {(string|Buffer)} path
+ * @param {number} mode
+ * @return {void}
+ */
+fs.chmodSync = function(path, mode) {};
+
+/**
+ * @param {(string|Buffer)} path
+ * @param {string} mode
+ * @return {void}
+ */
+fs.chmodSync = function(path, mode) {};
+
+/**
+ * @param {number} fd
+ * @param {number} mode
+ * @param {(function(NodeJS.ErrnoException=): void)=} callback
+ * @return {void}
+ */
+fs.fchmod = function(fd, mode, callback) {};
+
+/**
+ * @param {number} fd
+ * @param {string} mode
+ * @param {(function(NodeJS.ErrnoException=): void)=} callback
+ * @return {void}
+ */
+fs.fchmod = function(fd, mode, callback) {};
+
+/**
+ * @param {number} fd
+ * @param {number} mode
+ * @return {void}
+ */
+fs.fchmodSync = function(fd, mode) {};
+
+/**
+ * @param {number} fd
+ * @param {string} mode
+ * @return {void}
+ */
+fs.fchmodSync = function(fd, mode) {};
+
+/**
+ * @param {(string|Buffer)} path
+ * @param {number} mode
+ * @param {(function(NodeJS.ErrnoException=): void)=} callback
+ * @return {void}
+ */
+fs.lchmod = function(path, mode, callback) {};
+
+/**
+ * @param {(string|Buffer)} path
+ * @param {string} mode
+ * @param {(function(NodeJS.ErrnoException=): void)=} callback
+ * @return {void}
+ */
+fs.lchmod = function(path, mode, callback) {};
+
+/**
+ * @param {(string|Buffer)} path
+ * @param {number} mode
+ * @return {void}
+ */
+fs.lchmodSync = function(path, mode) {};
+
+/**
+ * @param {(string|Buffer)} path
+ * @param {string} mode
+ * @return {void}
+ */
+fs.lchmodSync = function(path, mode) {};
+
+/**
+ * @param {(string|Buffer)} path
+ * @param {(function(NodeJS.ErrnoException, fs.Stats): *)=} callback
+ * @return {void}
+ */
+fs.stat = function(path, callback) {};
+
+/**
+ * @param {(string|Buffer)} path
+ * @param {(function(NodeJS.ErrnoException, fs.Stats): *)=} callback
+ * @return {void}
+ */
+fs.lstat = function(path, callback) {};
+
+/**
+ * @param {number} fd
+ * @param {(function(NodeJS.ErrnoException, fs.Stats): *)=} callback
+ * @return {void}
+ */
+fs.fstat = function(fd, callback) {};
+
+/**
+ * @param {(string|Buffer)} path
+ * @return {fs.Stats}
+ */
+fs.statSync = function(path) {};
+
+/**
+ * @param {(string|Buffer)} path
+ * @return {fs.Stats}
+ */
+fs.lstatSync = function(path) {};
+
+/**
+ * @param {number} fd
+ * @return {fs.Stats}
+ */
+fs.fstatSync = function(fd) {};
+
+/**
+ * @param {(string|Buffer)} srcpath
+ * @param {(string|Buffer)} dstpath
+ * @param {(function(NodeJS.ErrnoException=): void)=} callback
+ * @return {void}
+ */
+fs.link = function(srcpath, dstpath, callback) {};
+
+/**
+ * @param {(string|Buffer)} srcpath
+ * @param {(string|Buffer)} dstpath
+ * @return {void}
+ */
+fs.linkSync = function(srcpath, dstpath) {};
+
+/**
+ * @param {(string|Buffer)} srcpath
+ * @param {(string|Buffer)} dstpath
+ * @param {string=} type
+ * @param {(function(NodeJS.ErrnoException=): void)=} callback
+ * @return {void}
+ */
+fs.symlink = function(srcpath, dstpath, type, callback) {};
+
+/**
+ * @param {(string|Buffer)} srcpath
+ * @param {(string|Buffer)} dstpath
+ * @param {string=} type
+ * @return {void}
+ */
+fs.symlinkSync = function(srcpath, dstpath, type) {};
+
+/**
+ * @param {(string|Buffer)} path
+ * @param {(function(NodeJS.ErrnoException, string): *)=} callback
+ * @return {void}
+ */
+fs.readlink = function(path, callback) {};
+
+/**
+ * @param {(string|Buffer)} path
+ * @return {string}
+ */
+fs.readlinkSync = function(path) {};
+
+/**
+ * @param {(string|Buffer)} path
+ * @param {(function(NodeJS.ErrnoException, string): *)=} callback
+ * @return {void}
+ */
+fs.realpath = function(path, callback) {};
+
+/**
+ * @param {(string|Buffer)} path
+ * @param {Object<string,string>} cache
+ * @param {(function(NodeJS.ErrnoException, string): *)} callback
+ * @return {void}
+ */
+fs.realpath = function(path, cache, callback) {};
+
+/**
+ * @param {(string|Buffer)} path
+ * @param {Object<string,string>=} cache
+ * @return {string}
+ */
+fs.realpathSync = function(path, cache) {};
+
+/**
+ * @param {(string|Buffer)} path
+ * @param {(function(NodeJS.ErrnoException=): void)=} callback
+ * @return {void}
+ */
+fs.unlink = function(path, callback) {};
+
+/**
+ * @param {(string|Buffer)} path
+ * @return {void}
+ */
+fs.unlinkSync = function(path) {};
+
+/**
+ * @param {(string|Buffer)} path
+ * @param {(function(NodeJS.ErrnoException=): void)=} callback
+ * @return {void}
+ */
+fs.rmdir = function(path, callback) {};
+
+/**
+ * @param {(string|Buffer)} path
+ * @return {void}
+ */
+fs.rmdirSync = function(path) {};
+
+/**
+ * @param {(string|Buffer)} path
+ * @param {(function(NodeJS.ErrnoException=): void)=} callback
+ * @return {void}
+ */
+fs.mkdir = function(path, callback) {};
+
+/**
+ * @param {(string|Buffer)} path
+ * @param {number} mode
+ * @param {(function(NodeJS.ErrnoException=): void)=} callback
+ * @return {void}
+ */
+fs.mkdir = function(path, mode, callback) {};
+
+/**
+ * @param {(string|Buffer)} path
+ * @param {string} mode
+ * @param {(function(NodeJS.ErrnoException=): void)=} callback
+ * @return {void}
+ */
+fs.mkdir = function(path, mode, callback) {};
+
+/**
+ * @param {(string|Buffer)} path
+ * @param {number=} mode
+ * @return {void}
+ */
+fs.mkdirSync = function(path, mode) {};
+
+/**
+ * @param {(string|Buffer)} path
+ * @param {string=} mode
+ * @return {void}
+ */
+fs.mkdirSync = function(path, mode) {};
+
+/**
+ * @param {string} prefix
+ * @param {(function(NodeJS.ErrnoException, string): void)=} callback
+ * @return {void}
+ */
+fs.mkdtemp = function(prefix, callback) {};
+
+/**
+ * @param {string} prefix
+ * @return {string}
+ */
+fs.mkdtempSync = function(prefix) {};
+
+/**
+ * @param {(string|Buffer)} path
+ * @param {(function(NodeJS.ErrnoException, Array<string>): void)=} callback
+ * @return {void}
+ */
+fs.readdir = function(path, callback) {};
+
+/**
+ * @param {(string|Buffer)} path
+ * @return {Array<string>}
+ */
+fs.readdirSync = function(path) {};
+
+/**
+ * @param {number} fd
+ * @param {(function(NodeJS.ErrnoException=): void)=} callback
+ * @return {void}
+ */
+fs.close = function(fd, callback) {};
+
+/**
+ * @param {number} fd
+ * @return {void}
+ */
+fs.closeSync = function(fd) {};
+
+/**
+ * @param {(string|Buffer)} path
+ * @param {(string|number)} flags
+ * @param {(function(NodeJS.ErrnoException, number): void)} callback
+ * @return {void}
+ */
+fs.open = function(path, flags, callback) {};
+
+/**
+ * @param {(string|Buffer)} path
+ * @param {(string|number)} flags
+ * @param {number} mode
+ * @param {(function(NodeJS.ErrnoException, number): void)} callback
+ * @return {void}
+ */
+fs.open = function(path, flags, mode, callback) {};
+
+/**
+ * @param {(string|Buffer)} path
+ * @param {(string|number)} flags
+ * @param {number=} mode
+ * @return {number}
+ */
+fs.openSync = function(path, flags, mode) {};
+
+/**
+ * @param {(string|Buffer)} path
+ * @param {number} atime
+ * @param {number} mtime
+ * @param {(function(NodeJS.ErrnoException=): void)=} callback
+ * @return {void}
+ */
+fs.utimes = function(path, atime, mtime, callback) {};
+
+/**
+ * @param {(string|Buffer)} path
+ * @param {Date} atime
+ * @param {Date} mtime
+ * @param {(function(NodeJS.ErrnoException=): void)=} callback
+ * @return {void}
+ */
+fs.utimes = function(path, atime, mtime, callback) {};
+
+/**
+ * @param {(string|Buffer)} path
+ * @param {number} atime
+ * @param {number} mtime
+ * @return {void}
+ */
+fs.utimesSync = function(path, atime, mtime) {};
+
+/**
+ * @param {(string|Buffer)} path
+ * @param {Date} atime
+ * @param {Date} mtime
+ * @return {void}
+ */
+fs.utimesSync = function(path, atime, mtime) {};
+
+/**
+ * @param {number} fd
+ * @param {number} atime
+ * @param {number} mtime
+ * @param {(function(NodeJS.ErrnoException=): void)=} callback
+ * @return {void}
+ */
+fs.futimes = function(fd, atime, mtime, callback) {};
+
+/**
+ * @param {number} fd
+ * @param {Date} atime
+ * @param {Date} mtime
+ * @param {(function(NodeJS.ErrnoException=): void)=} callback
+ * @return {void}
+ */
+fs.futimes = function(fd, atime, mtime, callback) {};
+
+/**
+ * @param {number} fd
+ * @param {number} atime
+ * @param {number} mtime
+ * @return {void}
+ */
+fs.futimesSync = function(fd, atime, mtime) {};
+
+/**
+ * @param {number} fd
+ * @param {Date} atime
+ * @param {Date} mtime
+ * @return {void}
+ */
+fs.futimesSync = function(fd, atime, mtime) {};
+
+/**
+ * @param {number} fd
+ * @param {(function(NodeJS.ErrnoException=): void)=} callback
+ * @return {void}
+ */
+fs.fsync = function(fd, callback) {};
+
+/**
+ * @param {number} fd
+ * @return {void}
+ */
+fs.fsyncSync = function(fd) {};
+
+/**
+ * @param {number} fd
+ * @param {Buffer} buffer
+ * @param {number} offset
+ * @param {number} length
+ * @param {number} position
+ * @param {(function(NodeJS.ErrnoException, number, Buffer): void)=} callback
+ * @return {void}
+ */
+fs.write = function(fd, buffer, offset, length, position, callback) {};
+
+/**
+ * @param {number} fd
+ * @param {Buffer} buffer
+ * @param {number} offset
+ * @param {number} length
+ * @param {(function(NodeJS.ErrnoException, number, Buffer): void)=} callback
+ * @return {void}
+ */
+fs.write = function(fd, buffer, offset, length, callback) {};
+
+/**
+ * @param {number} fd
+ * @param {*} data
+ * @param {(function(NodeJS.ErrnoException, number, string): void)=} callback
+ * @return {void}
+ */
+fs.write = function(fd, data, callback) {};
+
+/**
+ * @param {number} fd
+ * @param {*} data
+ * @param {number} offset
+ * @param {(function(NodeJS.ErrnoException, number, string): void)=} callback
+ * @return {void}
+ */
+fs.write = function(fd, data, offset, callback) {};
+
+/**
+ * @param {number} fd
+ * @param {*} data
+ * @param {number} offset
+ * @param {string} encoding
+ * @param {(function(NodeJS.ErrnoException, number, string): void)=} callback
+ * @return {void}
+ */
+fs.write = function(fd, data, offset, encoding, callback) {};
+
+/**
+ * @param {number} fd
+ * @param {Buffer} buffer
+ * @param {number} offset
+ * @param {number} length
+ * @param {number=} position
+ * @return {number}
+ */
+fs.writeSync = function(fd, buffer, offset, length, position) {};
+
+/**
+ * @param {number} fd
+ * @param {*} data
+ * @param {number=} position
+ * @param {string=} enconding
+ * @return {number}
+ */
+fs.writeSync = function(fd, data, position, enconding) {};
+
+/**
+ * @param {number} fd
+ * @param {Buffer} buffer
+ * @param {number} offset
+ * @param {number} length
+ * @param {number} position
+ * @param {(function(NodeJS.ErrnoException, number, Buffer): void)=} callback
+ * @return {void}
+ */
+fs.read = function(fd, buffer, offset, length, position, callback) {};
+
+/**
+ * @param {number} fd
+ * @param {Buffer} buffer
+ * @param {number} offset
+ * @param {number} length
+ * @param {number} position
+ * @return {number}
+ */
+fs.readSync = function(fd, buffer, offset, length, position) {};
+
+/**
+ * @param {string} filename
+ * @param {string} encoding
+ * @param {(function(NodeJS.ErrnoException, string): void)} callback
+ * @return {void}
+ */
+fs.readFile = function(filename, encoding, callback) {};
+
+/**
+ * @param {string} filename
+ * @param {{encoding: string, flag: string}} options
+ * @param {(function(NodeJS.ErrnoException, string): void)} callback
+ * @return {void}
+ */
+fs.readFile = function(filename, options, callback) {};
+
+/**
+ * @param {string} filename
+ * @param {{flag: string}} options
+ * @param {(function(NodeJS.ErrnoException, Buffer): void)} callback
+ * @return {void}
+ */
+fs.readFile = function(filename, options, callback) {};
+
+/**
+ * @param {string} filename
+ * @param {(function(NodeJS.ErrnoException, Buffer): void)} callback
+ * @return {void}
+ */
+fs.readFile = function(filename, callback) {};
+
+/**
+ * @param {string} filename
+ * @param {string} encoding
+ * @return {string}
+ */
+fs.readFileSync = function(filename, encoding) {};
+
+/**
+ * @param {string} filename
+ * @param {{encoding: string, flag: string}} options
+ * @return {string}
+ */
+fs.readFileSync = function(filename, options) {};
+
+/**
+ * @param {string} filename
+ * @param {{flag: string}=} options
+ * @return {Buffer}
+ */
+fs.readFileSync = function(filename, options) {};
+
+/**
+ * @param {string} filename
+ * @param {*} data
+ * @param {(function(NodeJS.ErrnoException): void)=} callback
+ * @return {void}
+ */
+fs.writeFile = function(filename, data, callback) {};
+
+/**
+ * @param {string} filename
+ * @param {*} data
+ * @param {{encoding: string, mode: number, flag: string}} options
+ * @param {(function(NodeJS.ErrnoException): void)=} callback
+ * @return {void}
+ */
+fs.writeFile = function(filename, data, options, callback) {};
+
+/**
+ * @param {string} filename
+ * @param {*} data
+ * @param {{encoding: string, mode: string, flag: string}} options
+ * @param {(function(NodeJS.ErrnoException): void)=} callback
+ * @return {void}
+ */
+fs.writeFile = function(filename, data, options, callback) {};
+
+/**
+ * @param {string} filename
+ * @param {*} data
+ * @param {{encoding: string, mode: number, flag: string}=} options
+ * @return {void}
+ */
+fs.writeFileSync = function(filename, data, options) {};
+
+/**
+ * @param {string} filename
+ * @param {*} data
+ * @param {{encoding: string, mode: string, flag: string}=} options
+ * @return {void}
+ */
+fs.writeFileSync = function(filename, data, options) {};
+
+/**
+ * @param {string} filename
+ * @param {*} data
+ * @param {{encoding: string, mode: number, flag: string}} options
+ * @param {(function(NodeJS.ErrnoException): void)=} callback
+ * @return {void}
+ */
+fs.appendFile = function(filename, data, options, callback) {};
+
+/**
+ * @param {string} filename
+ * @param {*} data
+ * @param {{encoding: string, mode: string, flag: string}} options
+ * @param {(function(NodeJS.ErrnoException): void)=} callback
+ * @return {void}
+ */
+fs.appendFile = function(filename, data, options, callback) {};
+
+/**
+ * @param {string} filename
+ * @param {*} data
+ * @param {(function(NodeJS.ErrnoException): void)=} callback
+ * @return {void}
+ */
+fs.appendFile = function(filename, data, callback) {};
+
+/**
+ * @param {string} filename
+ * @param {*} data
+ * @param {{encoding: string, mode: number, flag: string}=} options
+ * @return {void}
+ */
+fs.appendFileSync = function(filename, data, options) {};
+
+/**
+ * @param {string} filename
+ * @param {*} data
+ * @param {{encoding: string, mode: string, flag: string}=} options
+ * @return {void}
+ */
+fs.appendFileSync = function(filename, data, options) {};
+
+/**
+ * @param {string} filename
+ * @param {(function(fs.Stats, fs.Stats): void)} listener
+ * @return {void}
+ */
+fs.watchFile = function(filename, listener) {};
+
+/**
+ * @param {string} filename
+ * @param {{persistent: boolean, interval: number}} options
+ * @param {(function(fs.Stats, fs.Stats): void)} listener
+ * @return {void}
+ */
+fs.watchFile = function(filename, options, listener) {};
+
+/**
+ * @param {string} filename
+ * @param {(function(fs.Stats, fs.Stats): void)=} listener
+ * @return {void}
+ */
+fs.unwatchFile = function(filename, listener) {};
+
+/**
+ * @param {string} filename
+ * @param {(function(string, string): *)=} listener
+ * @return {fs.FSWatcher}
+ */
+fs.watch = function(filename, listener) {};
+
+/**
+ * @param {string} filename
+ * @param {string} encoding
+ * @param {(function(string, (string|Buffer)): *)=} listener
+ * @return {fs.FSWatcher}
+ */
+fs.watch = function(filename, encoding, listener) {};
+
+/**
+ * @param {string} filename
+ * @param {{persistent: boolean, recursive: boolean, encoding: string}} options
+ * @param {(function(string, (string|Buffer)): *)=} listener
+ * @return {fs.FSWatcher}
+ */
+fs.watch = function(filename, options, listener) {};
+
+/**
+ * @param {(string|Buffer)} path
+ * @param {(function(boolean): void)=} callback
+ * @return {void}
+ */
+fs.exists = function(path, callback) {};
+
+/**
+ * @param {(string|Buffer)} path
+ * @return {boolean}
+ */
+fs.existsSync = function(path) {};
+
+/**
+ * @interface
+ */
+function Constants() {}
+
+/**
+ * @type {number}
+ */
+Constants.prototype.F_OK;
+
+/**
+ * @type {number}
+ */
+Constants.prototype.R_OK;
+
+/**
+ * @type {number}
+ */
+Constants.prototype.W_OK;
+
+/**
+ * @type {number}
+ */
+Constants.prototype.X_OK;
+
+/**
+ * @type {fs.Constants}
+ */
+fs.constants;
+
+/**
+ * @param {(string|Buffer)} path
+ * @param {(function(NodeJS.ErrnoException): void)} callback
+ * @return {void}
+ */
+fs.access = function(path, callback) {};
+
+/**
+ * @param {(string|Buffer)} path
+ * @param {number} mode
+ * @param {(function(NodeJS.ErrnoException): void)} callback
+ * @return {void}
+ */
+fs.access = function(path, mode, callback) {};
+
+/**
+ * @param {(string|Buffer)} path
+ * @param {number=} mode
+ * @return {void}
+ */
+fs.accessSync = function(path, mode) {};
+
+/**
+ * @param {(string|Buffer)} path
+ * @param {{flags: string, encoding: string, fd: number, mode: number, autoClose: boolean, start: number, end: number}=} options
+ * @return {fs.ReadStream}
+ */
+fs.createReadStream = function(path, options) {};
+
+/**
+ * @param {(string|Buffer)} path
+ * @param {{flags: string, encoding: string, fd: number, mode: number}=} options
+ * @return {fs.WriteStream}
+ */
+fs.createWriteStream = function(path, options) {};
+
+/**
+ * @param {number} fd
+ * @param {Function} callback
+ * @return {void}
+ */
+fs.fdatasync = function(fd, callback) {};
+
+/**
+ * @param {number} fd
+ * @return {void}
+ */
+fs.fdatasyncSync = function(fd) {};
+
+module.exports.ReadStream = fs.ReadStream;
+
+module.exports.WriteStream = fs.WriteStream;
+
+module.exports.rename = fs.rename;
+
+module.exports.renameSync = fs.renameSync;
+
+module.exports.truncate = fs.truncate;
+
+module.exports.truncate = fs.truncate;
+
+module.exports.truncateSync = fs.truncateSync;
+
+module.exports.ftruncate = fs.ftruncate;
+
+module.exports.ftruncate = fs.ftruncate;
+
+module.exports.ftruncateSync = fs.ftruncateSync;
+
+module.exports.chown = fs.chown;
+
+module.exports.chownSync = fs.chownSync;
+
+module.exports.fchown = fs.fchown;
+
+module.exports.fchownSync = fs.fchownSync;
+
+module.exports.lchown = fs.lchown;
+
+module.exports.lchownSync = fs.lchownSync;
+
+module.exports.chmod = fs.chmod;
+
+module.exports.chmod = fs.chmod;
+
+module.exports.chmodSync = fs.chmodSync;
+
+module.exports.chmodSync = fs.chmodSync;
+
+module.exports.fchmod = fs.fchmod;
+
+module.exports.fchmod = fs.fchmod;
+
+module.exports.fchmodSync = fs.fchmodSync;
+
+module.exports.fchmodSync = fs.fchmodSync;
+
+module.exports.lchmod = fs.lchmod;
+
+module.exports.lchmod = fs.lchmod;
+
+module.exports.lchmodSync = fs.lchmodSync;
+
+module.exports.lchmodSync = fs.lchmodSync;
+
+module.exports.stat = fs.stat;
+
+module.exports.lstat = fs.lstat;
+
+module.exports.fstat = fs.fstat;
+
+module.exports.statSync = fs.statSync;
+
+module.exports.lstatSync = fs.lstatSync;
+
+module.exports.fstatSync = fs.fstatSync;
+
+module.exports.link = fs.link;
+
+module.exports.linkSync = fs.linkSync;
+
+module.exports.symlink = fs.symlink;
+
+module.exports.symlinkSync = fs.symlinkSync;
+
+module.exports.readlink = fs.readlink;
+
+module.exports.readlinkSync = fs.readlinkSync;
+
+module.exports.realpath = fs.realpath;
+
+module.exports.realpath = fs.realpath;
+
+module.exports.realpathSync = fs.realpathSync;
+
+module.exports.unlink = fs.unlink;
+
+module.exports.unlinkSync = fs.unlinkSync;
+
+module.exports.rmdir = fs.rmdir;
+
+module.exports.rmdirSync = fs.rmdirSync;
+
+module.exports.mkdir = fs.mkdir;
+
+module.exports.mkdir = fs.mkdir;
+
+module.exports.mkdir = fs.mkdir;
+
+module.exports.mkdirSync = fs.mkdirSync;
+
+module.exports.mkdirSync = fs.mkdirSync;
+
+module.exports.mkdtemp = fs.mkdtemp;
+
+module.exports.mkdtempSync = fs.mkdtempSync;
+
+module.exports.readdir = fs.readdir;
+
+module.exports.readdirSync = fs.readdirSync;
+
+module.exports.close = fs.close;
+
+module.exports.closeSync = fs.closeSync;
+
+module.exports.open = fs.open;
+
+module.exports.open = fs.open;
+
+module.exports.openSync = fs.openSync;
+
+module.exports.utimes = fs.utimes;
+
+module.exports.utimes = fs.utimes;
+
+module.exports.utimesSync = fs.utimesSync;
+
+module.exports.utimesSync = fs.utimesSync;
+
+module.exports.futimes = fs.futimes;
+
+module.exports.futimes = fs.futimes;
+
+module.exports.futimesSync = fs.futimesSync;
+
+module.exports.futimesSync = fs.futimesSync;
+
+module.exports.fsync = fs.fsync;
+
+module.exports.fsyncSync = fs.fsyncSync;
+
+module.exports.write = fs.write;
+
+module.exports.write = fs.write;
+
+module.exports.write = fs.write;
+
+module.exports.write = fs.write;
+
+module.exports.write = fs.write;
+
+module.exports.writeSync = fs.writeSync;
+
+module.exports.writeSync = fs.writeSync;
+
+module.exports.read = fs.read;
+
+module.exports.readSync = fs.readSync;
+
+module.exports.readFile = fs.readFile;
+
+module.exports.readFile = fs.readFile;
+
+module.exports.readFile = fs.readFile;
+
+module.exports.readFile = fs.readFile;
+
+module.exports.readFileSync = fs.readFileSync;
+
+module.exports.readFileSync = fs.readFileSync;
+
+module.exports.readFileSync = fs.readFileSync;
+
+module.exports.writeFile = fs.writeFile;
+
+module.exports.writeFile = fs.writeFile;
+
+module.exports.writeFile = fs.writeFile;
+
+module.exports.writeFileSync = fs.writeFileSync;
+
+module.exports.writeFileSync = fs.writeFileSync;
+
+module.exports.appendFile = fs.appendFile;
+
+module.exports.appendFile = fs.appendFile;
+
+module.exports.appendFile = fs.appendFile;
+
+module.exports.appendFileSync = fs.appendFileSync;
+
+module.exports.appendFileSync = fs.appendFileSync;
+
+module.exports.watchFile = fs.watchFile;
+
+module.exports.watchFile = fs.watchFile;
+
+module.exports.unwatchFile = fs.unwatchFile;
+
+module.exports.watch = fs.watch;
+
+module.exports.watch = fs.watch;
+
+module.exports.watch = fs.watch;
+
+module.exports.exists = fs.exists;
+
+module.exports.existsSync = fs.existsSync;
+
+module.exports.constants = fs.constants;
+
+module.exports.access = fs.access;
+
+module.exports.access = fs.access;
+
+module.exports.accessSync = fs.accessSync;
+
+module.exports.createReadStream = fs.createReadStream;
+
+module.exports.createWriteStream = fs.createWriteStream;
+
+module.exports.fdatasync = fs.fdatasync;
+
+module.exports.fdatasyncSync = fs.fdatasyncSync;
+
+/**
+ * @param {string} path
+ * @param {(number|Date)} atime
+ * @param {(number|Date)} mtime
+ * @param {number=} flags
+ * @param {Function=} callback
+ * @return {void}
+ */
+fs.utimensat = function(path, atime, mtime, flags, callback) {};
+
+/**
+ * @param {string} path
+ * @param {(number|Date)} atime
+ * @param {(number|Date)} mtime
+ * @param {number=} flags
+ * @return {void}
+ */
+fs.utimensatSync = function(path, atime, mtime, flags) {};
+
+/**
+ * @param {*} fd
+ * @param {(number|Date)} atime
+ * @param {(number|Date)} mtime
+ * @param {number=} flags
+ * @param {Function=} callback
+ * @return {void}
+ */
+fs.futimensat = function(fd, atime, mtime, flags, callback) {};
+
+/**
+ * @param {*} fd
+ * @param {(number|Date)} atime
+ * @param {(number|Date)} mtime
+ * @param {number=} flags
+ * @return {void}
+ */
+fs.futimensatSync = function(fd, atime, mtime, flags) {};
+
+/**
+ * @constructor
+ * @extends {internal.Writable}
+ */
+fs.SyncWriteStream;
+
+/**
+ * @type {number}
+ */
+fs.F_OK;
+
+/**
+ * @type {number}
+ */
+fs.R_OK;
+
+/**
+ * @type {number}
+ */
+fs.W_OK;
+
+/**
+ * @type {number}
+ */
+fs.X_OK;
+
+module.exports.utimensat = fs.utimensat;
+
+module.exports.utimensatSync = fs.utimensatSync;
+
+module.exports.futimensat = fs.futimensat;
+
+module.exports.futimensatSync = fs.futimensatSync;
+
+module.exports.SyncWriteStream = fs.SyncWriteStream;
+
+module.exports.F_OK = fs.F_OK;
+
+module.exports.R_OK = fs.R_OK;
+
+module.exports.W_OK = fs.W_OK;
+
+module.exports.X_OK = fs.X_OK;
diff --git a/javascript/ql/test/library-tests/threat-models/sources/sources.js b/javascript/ql/test/library-tests/threat-models/sources/sources.js
new file mode 100644
index 00000000000..a87e4335de4
--- /dev/null
+++ b/javascript/ql/test/library-tests/threat-models/sources/sources.js
@@ -0,0 +1,120 @@
+import 'dummy';
+
+var x = process.env['foo']; // $ threat-source=environment
+SINK(x); // $ hasFlow
+
+var y = process.argv[2]; // $ threat-source=commandargs
+SINK(y); // $ hasFlow
+
+
+// Accessing command line arguments using yargs
+// https://www.npmjs.com/package/yargs/v/17.7.2
+const yargs = require('yargs/yargs');
+const { hideBin } = require('yargs/helpers');
+const argv = yargs(hideBin(process.argv)).argv; // $ threat-source=commandargs
+
+SINK(argv.foo); // $ hasFlow
+
+// older version
+// https://www.npmjs.com/package/yargs/v/7.1.2
+const yargsOld = require('yargs');
+const argvOld = yargsOld.argv; // $ threat-source=commandargs
+
+SINK(argvOld.foo); // $ hasFlow
+
+// Accessing command line arguments using yargs-parser
+const yargsParser = require('yargs-parser');
+const src = process.argv.slice(2); // $ threat-source=commandargs
+const parsedArgs = yargsParser(src);
+
+SINK(parsedArgs.foo); // $ hasFlow
+
+// Accessing command line arguments using minimist
+const minimist = require('minimist');
+const args = minimist(process.argv.slice(2)); // $ threat-source=commandargs
+
+SINK(args.foo); // $ hasFlow
+
+
+// Accessing command line arguments using commander
+const { Command } = require('commander'); // $ SPURIOUS: threat-source=commandargs
+const program = new Command();
+program.parse(process.argv); // $ threat-source=commandargs
+
+SINK(program.opts().foo); // $ hasFlow SPURIOUS: threat-source=commandargs
+
+// ------ reading from database ------
+
+// Accessing database using mysql
+const mysql = require('mysql');
+const connection = mysql.createConnection({host: 'localhost'});
+connection.connect();
+connection.query('SELECT 1 + 1 AS solution', function (error, results, fields) { // $ threat-source=database
+    if (error) throw error;
+    SINK(results); // $ hasFlow
+    SINK(results[0]); // $ hasFlow
+    SINK(results[0].solution); // $ hasFlow
+});
+
+// ------ reading from file ------
+
+// Accessing file contents using fs
+const fs = require('fs');
+fs.readFile('file.txt', 'utf8', (err, data) => { // $ threat-source=file
+  SINK(data); // $ hasFlow
+});
+
+// Accessing file contents using fs.readFileSync
+const fileContent = fs.readFileSync('file.txt', 'utf8'); // $ threat-source=file
+SINK(fileContent); // $ hasFlow
+
+// Accessing file contents using fs.promises
+fs.promises.readFile('file.txt', 'utf8').then((data) => { // $ threat-source=file
+  SINK(data); // $ hasFlow
+});
+
+// Accessing file contents using fs.createReadStream
+const readStream = fs.createReadStream('file.txt');
+readStream.on('data', (chunk) => { // $ threat-source=file
+  SINK(chunk); // $ hasFlow
+});
+const data = readStream.read(); // $ threat-source=file
+SINK(data); // $ hasFlow
+
+// using readline
+const readline = require('readline');
+const rl_file = readline.createInterface({
+    input: fs.createReadStream('file.txt')
+});
+rl_file.on("line", (line) => { // $ SPURIOUS: threat-source=stdin MISSING: threat-source=file
+    SINK(line); // $ hasFlow
+});
+
+
+// ------ reading from stdin ------
+
+// Accessing stdin using process.stdin
+process.stdin.on('data', (data) => { // $ threat-source=stdin
+    SINK(data); // $ hasFlow
+});
+
+const stdin_line = process.stdin.read(); // $ threat-source=stdin
+SINK(stdin_line); // $ hasFlow
+
+// Accessing stdin using readline
+const readline = require('readline');
+const rl_stdin = readline.createInterface({
+    input: process.stdin
+});
+rl_stdin.question('<question>', (answer) => { // $ threat-source=stdin
+    SINK(answer); // $ hasFlow
+});
+
+function handler(answer) { // $ threat-source=stdin
+    SINK(answer); // $ hasFlow
+}
+rl_stdin.question('<question>', handler);
+
+rl_stdin.on("line", (line) => { // $ threat-source=stdin
+    SINK(line); // $ hasFlow
+});
diff --git a/javascript/ql/test/query-tests/Metrics/ExternalDependencies/ExternalDependencies.expected b/javascript/ql/test/query-tests/Metrics/ExternalDependencies/ExternalDependencies.expected
index d690d12e11b..39b6d8ffcad 100644
--- a/javascript/ql/test/query-tests/Metrics/ExternalDependencies/ExternalDependencies.expected
+++ b/javascript/ql/test/query-tests/Metrics/ExternalDependencies/ExternalDependencies.expected
@@ -1,9 +1,9 @@
-| /query-tests/Metrics/ExternalDependencies/src/tst.html<\|>jquery<\|>23.0.0 | 4 |
-| /query-tests/Metrics/ExternalDependencies/src/a.js<\|>lib3<\|>unknown | 3 |
-| /query-tests/Metrics/ExternalDependencies/src/tst.html<\|>jquery<\|>42.0.0 | 3 |
-| /query-tests/Metrics/ExternalDependencies/src/a.js<\|>lib1<\|>1.0.2 | 2 |
-| /query-tests/Metrics/ExternalDependencies/src/b.js<\|>lib3<\|>unknown | 2 |
-| /query-tests/Metrics/ExternalDependencies/src/a.js<\|>lib2<\|>1.0.0 | 1 |
-| /query-tests/Metrics/ExternalDependencies/src/b.js<\|>lib2<\|>1.0.0 | 1 |
-| /query-tests/Metrics/ExternalDependencies/src/sub/c.js<\|>lib1<\|>1.0.2 | 1 |
-| /query-tests/Metrics/ExternalDependencies/src/sub/subsub/d.js<\|>lib1<\|>1.0.3 | 1 |
+| /src/tst.html<\|>jquery<\|>23.0.0 | 4 |
+| /src/a.js<\|>lib3<\|>unknown | 3 |
+| /src/tst.html<\|>jquery<\|>42.0.0 | 3 |
+| /src/a.js<\|>lib1<\|>1.0.2 | 2 |
+| /src/b.js<\|>lib3<\|>unknown | 2 |
+| /src/a.js<\|>lib2<\|>1.0.0 | 1 |
+| /src/b.js<\|>lib2<\|>1.0.0 | 1 |
+| /src/sub/c.js<\|>lib1<\|>1.0.2 | 1 |
+| /src/sub/subsub/d.js<\|>lib1<\|>1.0.3 | 1 |
diff --git a/javascript/ql/test/query-tests/NodeJS/CyclicImport/CyclicImport.expected b/javascript/ql/test/query-tests/NodeJS/CyclicImport/CyclicImport.expected
index c19bb230344..2fb5f863389 100644
--- a/javascript/ql/test/query-tests/NodeJS/CyclicImport/CyclicImport.expected
+++ b/javascript/ql/test/query-tests/NodeJS/CyclicImport/CyclicImport.expected
@@ -1,7 +1,7 @@
 | a.js:4:9:4:25 | require('./b.js') | Module a imports module b, which in turn $@ it. | b.js:4:9:4:25 | require('./a.js') | imports |
 | b.js:4:9:4:25 | require('./a.js') | Module b imports module a, which in turn $@ it. | a.js:4:9:4:25 | require('./b.js') | imports |
 | selfimport.js:1:1:1:23 | require ... mport') | Module selfimport directly imports itself. | selfimport.js:1:1:1:24 | <toplevel> |  |
-| test1/a.js:1:1:1:27 | require ... ner/a') | Module .../test1/a.js imports module .../inner/a.js, which in turn $@ it. | test2/inner/a.js:1:1:1:24 | require ... st1/a') | imports |
+| test1/a.js:1:1:1:27 | require ... ner/a') | Module /test1/a.js imports module .../inner/a.js, which in turn $@ it. | test2/inner/a.js:1:1:1:24 | require ... st1/a') | imports |
 | test1/a.js:2:1:2:14 | require('./b') | Module a imports module b, which in turn $@ it. | test1/b.js:1:1:1:27 | require ... ner/a') | indirectly imports |
 | test1/b.js:1:1:1:27 | require ... ner/a') | Module b imports module a, which in turn $@ it. | test2/inner/a.js:1:1:1:24 | require ... st1/a') | indirectly imports |
-| test2/inner/a.js:1:1:1:24 | require ... st1/a') | Module .../inner/a.js imports module .../test1/a.js, which in turn $@ it. | test1/a.js:1:1:1:27 | require ... ner/a') | imports |
+| test2/inner/a.js:1:1:1:24 | require ... st1/a') | Module .../inner/a.js imports module /test1/a.js, which in turn $@ it. | test1/a.js:1:1:1:27 | require ... ner/a') | imports |
diff --git a/javascript/ql/test/query-tests/Security/CWE-020/IncompleteHostnameRegExp/IncompleteHostnameRegExp.expected b/javascript/ql/test/query-tests/Security/CWE-020/IncompleteHostnameRegExp/IncompleteHostnameRegExp.expected
index d0fb91322fe..8341636994e 100644
--- a/javascript/ql/test/query-tests/Security/CWE-020/IncompleteHostnameRegExp/IncompleteHostnameRegExp.expected
+++ b/javascript/ql/test/query-tests/Security/CWE-020/IncompleteHostnameRegExp/IncompleteHostnameRegExp.expected
@@ -25,3 +25,4 @@
 | tst-IncompleteHostnameRegExp.js:53:14:53:35 | test.example.com$ | This regular expression has an unescaped '.' before 'example.com', so it might match more hosts than expected. | tst-IncompleteHostnameRegExp.js:53:13:53:36 | 'test.' ... e.com$' | here |
 | tst-IncompleteHostnameRegExp.js:55:14:55:38 | ^http://test.example.com | This regular expression has an unescaped '.' before 'example.com', so it might match more hosts than expected. | tst-IncompleteHostnameRegExp.js:55:13:55:39 | '^http: ... le.com' | here |
 | tst-IncompleteHostnameRegExp.js:59:5:59:20 | foo.example\\.com | This regular expression has an unescaped '.' before 'example\\.com', so it might match more hosts than expected. | tst-IncompleteHostnameRegExp.js:59:2:59:32 | /^(foo. ... ever)$/ | here |
+| tst-IncompleteHostnameRegExp.js:61:18:61:41 | ^http://test.example.com | This regular expression has an unescaped '.' before 'example.com', so it might match more hosts than expected. | tst-IncompleteHostnameRegExp.js:61:17:61:42 | "^http: ... le.com" | here |
diff --git a/javascript/ql/test/query-tests/Security/CWE-020/IncompleteHostnameRegExp/tst-IncompleteHostnameRegExp.js b/javascript/ql/test/query-tests/Security/CWE-020/IncompleteHostnameRegExp/tst-IncompleteHostnameRegExp.js
index ddc267ebdd7..51c2c991420 100644
--- a/javascript/ql/test/query-tests/Security/CWE-020/IncompleteHostnameRegExp/tst-IncompleteHostnameRegExp.js
+++ b/javascript/ql/test/query-tests/Security/CWE-020/IncompleteHostnameRegExp/tst-IncompleteHostnameRegExp.js
@@ -57,4 +57,6 @@
 	/^http:\/\/(..|...)\.example\.com\/index\.html/; // OK, wildcards are intentional
 	/^http:\/\/.\.example\.com\/index\.html/; // OK, the wildcard is intentional
 	/^(foo.example\.com|whatever)$/; // kinda OK - one disjunction doesn't even look like a hostname
+
+	if (s.matchAll("^http://test.example.com")) {} // NOT OK
 });
diff --git a/javascript/ql/test/query-tests/Security/CWE-020/MissingRegExpAnchor/MissingRegExpAnchor.expected b/javascript/ql/test/query-tests/Security/CWE-020/MissingRegExpAnchor/MissingRegExpAnchor.expected
index a7933f2926e..ebff0b583c0 100644
--- a/javascript/ql/test/query-tests/Security/CWE-020/MissingRegExpAnchor/MissingRegExpAnchor.expected
+++ b/javascript/ql/test/query-tests/Security/CWE-020/MissingRegExpAnchor/MissingRegExpAnchor.expected
@@ -59,3 +59,12 @@
 | tst-UnanchoredUrlRegExp.js:26:3:26:22 | "^https?://good.com" | This hostname pattern may match any domain name, as it is missing a '$' or '/' at the end. |
 | tst-UnanchoredUrlRegExp.js:35:2:35:32 | /https? ... 0-9]+)/ | When this is used as a regular expression on a URL, it may match anywhere, and arbitrary hosts may come before or after it. |
 | tst-UnanchoredUrlRegExp.js:77:11:77:32 | /vimeo\\ ... 0-9]+)/ | When this is used as a regular expression on a URL, it may match anywhere, and arbitrary hosts may come before or after it. |
+| tst-UnanchoredUrlRegExp.js:111:50:111:68 | "https?://good.com" | When this is used as a regular expression on a URL, it may match anywhere, and arbitrary hosts may come before or after it. |
+| tst-UnanchoredUrlRegExp.js:112:61:112:79 | "https?://good.com" | When this is used as a regular expression on a URL, it may match anywhere, and arbitrary hosts may come before or after it. |
+| tst-UnanchoredUrlRegExp.js:113:50:113:69 | "^https?://good.com" | This hostname pattern may match any domain name, as it is missing a '$' or '/' at the end. |
+| tst-UnanchoredUrlRegExp.js:114:50:114:72 | /^https ... d.com/g | This hostname pattern may match any domain name, as it is missing a '$' or '/' at the end. |
+| tst-UnanchoredUrlRegExp.js:115:50:115:94 | "(^http ... 2.com)" | This hostname pattern may match any domain name, as it is missing a '$' or '/' at the end. |
+| tst-UnanchoredUrlRegExp.js:116:50:116:93 | "(https ... e.com)" | This hostname pattern may match any domain name, as it is missing a '$' or '/' at the end. |
+| tst-UnanchoredUrlRegExp.js:117:50:117:59 | "good.com" | When this is used as a regular expression on a URL, it may match anywhere, and arbitrary hosts may come before or after it. |
+| tst-UnanchoredUrlRegExp.js:118:50:118:68 | "https?://good.com" | When this is used as a regular expression on a URL, it may match anywhere, and arbitrary hosts may come before or after it. |
+| tst-UnanchoredUrlRegExp.js:119:50:119:73 | "https? ... m:8080" | When this is used as a regular expression on a URL, it may match anywhere, and arbitrary hosts may come before or after it. |
diff --git a/javascript/ql/test/query-tests/Security/CWE-020/MissingRegExpAnchor/tst-UnanchoredUrlRegExp.js b/javascript/ql/test/query-tests/Security/CWE-020/MissingRegExpAnchor/tst-UnanchoredUrlRegExp.js
index 24815ebe59e..c0c5ecb3e3e 100644
--- a/javascript/ql/test/query-tests/Security/CWE-020/MissingRegExpAnchor/tst-UnanchoredUrlRegExp.js
+++ b/javascript/ql/test/query-tests/Security/CWE-020/MissingRegExpAnchor/tst-UnanchoredUrlRegExp.js
@@ -105,4 +105,27 @@
 
 	/\.com|\.org/; // OK, has no domain name
 	/example\.com|whatever/; // OK, the other disjunction doesn't match a hostname
+
+	// MatchAll test cases:
+	// Vulnerable patterns
+	if ("http://evil.com/?http://good.com".matchAll("https?://good.com")) {} // NOT OK
+	if ("http://evil.com/?http://good.com".matchAll(new RegExp("https?://good.com"))) {} // NOT OK
+	if ("http://evil.com/?http://good.com".matchAll("^https?://good.com")) {} // NOT OK - missing post-anchor
+	if ("http://evil.com/?http://good.com".matchAll(/^https?:\/\/good.com/g)) {} // NOT OK - missing post-anchor
+	if ("http://evil.com/?http://good.com".matchAll("(^https?://good1.com)|(^https?://good2.com)")) {} // NOT OK - missing post-anchor
+	if ("http://evil.com/?http://good.com".matchAll("(https?://good.com)|(^https?://goodie.com)")) {} // NOT OK - missing post-anchor
+	if ("http://evil.com/?http://good.com".matchAll("good.com")) {} // NOT OK - missing protocol
+	if ("http://evil.com/?http://good.com".matchAll("https?://good.com")) {} // NOT OK
+	if ("http://evil.com/?http://good.com".matchAll("https?://good.com:8080")) {} // NOT OK
+
+	// Non-vulnerable patterns
+	if ("something".matchAll("other")) {} // OK
+	if ("something".matchAll("x.commissary")) {} // OK
+	if ("http://evil.com/?http://good.com".matchAll("^https?://good.com$")) {} // OK
+	if ("http://evil.com/?http://good.com".matchAll(new RegExp("^https?://good.com$"))) {} // OK
+	if ("http://evil.com/?http://good.com".matchAll("^https?://good.com/$")) {} // OK
+	if ("http://evil.com/?http://good.com".matchAll(/^https?:\/\/good.com\/$/)) {} // OK
+	if ("http://evil.com/?http://good.com".matchAll("(^https?://good1.com$)|(^https?://good2.com$)")) {} // OK
+	if ("http://evil.com/?http://good.com".matchAll("(https?://good.com$)|(^https?://goodie.com$)")) {} // OK
+
 });
diff --git a/javascript/ql/test/query-tests/Security/CWE-022/TaintedPath/TaintedPath.expected b/javascript/ql/test/query-tests/Security/CWE-022/TaintedPath/TaintedPath.expected
index 2a3784617e7..0022ca69c6b 100644
--- a/javascript/ql/test/query-tests/Security/CWE-022/TaintedPath/TaintedPath.expected
+++ b/javascript/ql/test/query-tests/Security/CWE-022/TaintedPath/TaintedPath.expected
@@ -2237,6 +2237,19 @@ nodes
 | normalizedPaths.js:408:38:408:59 | req.que ... it('/') |
 | normalizedPaths.js:408:38:408:59 | req.que ... it('/') |
 | normalizedPaths.js:408:38:408:59 | req.que ... it('/') |
+| normalizedPaths.js:412:7:412:46 | path |
+| normalizedPaths.js:412:7:412:46 | path |
+| normalizedPaths.js:412:14:412:46 | pathMod ... uery.x) |
+| normalizedPaths.js:412:14:412:46 | pathMod ... uery.x) |
+| normalizedPaths.js:412:35:412:45 | req.query.x |
+| normalizedPaths.js:412:35:412:45 | req.query.x |
+| normalizedPaths.js:412:35:412:45 | req.query.x |
+| normalizedPaths.js:415:19:415:22 | path |
+| normalizedPaths.js:415:19:415:22 | path |
+| normalizedPaths.js:415:19:415:22 | path |
+| normalizedPaths.js:426:21:426:24 | path |
+| normalizedPaths.js:426:21:426:24 | path |
+| normalizedPaths.js:426:21:426:24 | path |
 | other-fs-libraries.js:9:7:9:48 | path |
 | other-fs-libraries.js:9:7:9:48 | path |
 | other-fs-libraries.js:9:7:9:48 | path |
@@ -7524,6 +7537,20 @@ edges
 | normalizedPaths.js:408:38:408:59 | req.que ... it('/') | normalizedPaths.js:408:19:408:60 | pathMod ... t('/')) |
 | normalizedPaths.js:408:38:408:59 | req.que ... it('/') | normalizedPaths.js:408:19:408:60 | pathMod ... t('/')) |
 | normalizedPaths.js:408:38:408:59 | req.que ... it('/') | normalizedPaths.js:408:19:408:60 | pathMod ... t('/')) |
+| normalizedPaths.js:412:7:412:46 | path | normalizedPaths.js:415:19:415:22 | path |
+| normalizedPaths.js:412:7:412:46 | path | normalizedPaths.js:415:19:415:22 | path |
+| normalizedPaths.js:412:7:412:46 | path | normalizedPaths.js:415:19:415:22 | path |
+| normalizedPaths.js:412:7:412:46 | path | normalizedPaths.js:415:19:415:22 | path |
+| normalizedPaths.js:412:7:412:46 | path | normalizedPaths.js:426:21:426:24 | path |
+| normalizedPaths.js:412:7:412:46 | path | normalizedPaths.js:426:21:426:24 | path |
+| normalizedPaths.js:412:7:412:46 | path | normalizedPaths.js:426:21:426:24 | path |
+| normalizedPaths.js:412:7:412:46 | path | normalizedPaths.js:426:21:426:24 | path |
+| normalizedPaths.js:412:14:412:46 | pathMod ... uery.x) | normalizedPaths.js:412:7:412:46 | path |
+| normalizedPaths.js:412:14:412:46 | pathMod ... uery.x) | normalizedPaths.js:412:7:412:46 | path |
+| normalizedPaths.js:412:35:412:45 | req.query.x | normalizedPaths.js:412:14:412:46 | pathMod ... uery.x) |
+| normalizedPaths.js:412:35:412:45 | req.query.x | normalizedPaths.js:412:14:412:46 | pathMod ... uery.x) |
+| normalizedPaths.js:412:35:412:45 | req.query.x | normalizedPaths.js:412:14:412:46 | pathMod ... uery.x) |
+| normalizedPaths.js:412:35:412:45 | req.query.x | normalizedPaths.js:412:14:412:46 | pathMod ... uery.x) |
 | other-fs-libraries.js:9:7:9:48 | path | other-fs-libraries.js:11:19:11:22 | path |
 | other-fs-libraries.js:9:7:9:48 | path | other-fs-libraries.js:11:19:11:22 | path |
 | other-fs-libraries.js:9:7:9:48 | path | other-fs-libraries.js:11:19:11:22 | path |
@@ -10539,6 +10566,8 @@ edges
 | normalizedPaths.js:399:21:399:24 | path | normalizedPaths.js:385:35:385:45 | req.query.x | normalizedPaths.js:399:21:399:24 | path | This path depends on a $@. | normalizedPaths.js:385:35:385:45 | req.query.x | user-provided value |
 | normalizedPaths.js:407:19:407:67 | pathMod ... t('/')) | normalizedPaths.js:407:45:407:55 | req.query.x | normalizedPaths.js:407:19:407:67 | pathMod ... t('/')) | This path depends on a $@. | normalizedPaths.js:407:45:407:55 | req.query.x | user-provided value |
 | normalizedPaths.js:408:19:408:60 | pathMod ... t('/')) | normalizedPaths.js:408:38:408:48 | req.query.x | normalizedPaths.js:408:19:408:60 | pathMod ... t('/')) | This path depends on a $@. | normalizedPaths.js:408:38:408:48 | req.query.x | user-provided value |
+| normalizedPaths.js:415:19:415:22 | path | normalizedPaths.js:412:35:412:45 | req.query.x | normalizedPaths.js:415:19:415:22 | path | This path depends on a $@. | normalizedPaths.js:412:35:412:45 | req.query.x | user-provided value |
+| normalizedPaths.js:426:21:426:24 | path | normalizedPaths.js:412:35:412:45 | req.query.x | normalizedPaths.js:426:21:426:24 | path | This path depends on a $@. | normalizedPaths.js:412:35:412:45 | req.query.x | user-provided value |
 | other-fs-libraries.js:11:19:11:22 | path | other-fs-libraries.js:9:24:9:30 | req.url | other-fs-libraries.js:11:19:11:22 | path | This path depends on a $@. | other-fs-libraries.js:9:24:9:30 | req.url | user-provided value |
 | other-fs-libraries.js:12:27:12:30 | path | other-fs-libraries.js:9:24:9:30 | req.url | other-fs-libraries.js:12:27:12:30 | path | This path depends on a $@. | other-fs-libraries.js:9:24:9:30 | req.url | user-provided value |
 | other-fs-libraries.js:13:24:13:27 | path | other-fs-libraries.js:9:24:9:30 | req.url | other-fs-libraries.js:13:24:13:27 | path | This path depends on a $@. | other-fs-libraries.js:9:24:9:30 | req.url | user-provided value |
diff --git a/javascript/ql/test/query-tests/Security/CWE-022/TaintedPath/normalizedPaths.js b/javascript/ql/test/query-tests/Security/CWE-022/TaintedPath/normalizedPaths.js
index a5453a728d3..4fa6b3f50d5 100644
--- a/javascript/ql/test/query-tests/Security/CWE-022/TaintedPath/normalizedPaths.js
+++ b/javascript/ql/test/query-tests/Security/CWE-022/TaintedPath/normalizedPaths.js
@@ -407,3 +407,25 @@ app.get('/join-spread', (req, res) => {
   fs.readFileSync(pathModule.join('foo', ...req.query.x.split('/'))); // NOT OK
   fs.readFileSync(pathModule.join(...req.query.x.split('/'))); // NOT OK
 });
+
+app.get('/dotdot-matchAll-regexp', (req, res) => {
+  let path = pathModule.normalize(req.query.x);
+  if (pathModule.isAbsolute(path))
+    return;
+  fs.readFileSync(path); // NOT OK
+  if (!path.matchAll(/\./)) {
+    fs.readFileSync(path); // OK
+  }
+  if (!path.matchAll(/\.\./)) {
+    fs.readFileSync(path); // OK
+  }
+  if (!path.matchAll(/\.\.\//)) {
+    fs.readFileSync(path); // OK
+  }
+  if (!path.matchAll(/\.\.\/foo/)) {
+    fs.readFileSync(path); // NOT OK
+  }
+  if (!path.matchAll(/(\.\.\/|\.\.\\)/)) {
+    fs.readFileSync(path); // OK
+  }
+});
diff --git a/javascript/ql/test/query-tests/Security/CWE-079/DomBasedXss/XssWithAdditionalSources.ql b/javascript/ql/test/query-tests/Security/CWE-079/DomBasedXss/XssWithAdditionalSources.ql
index 9a27e9db4d4..df9c43e3b5b 100644
--- a/javascript/ql/test/query-tests/Security/CWE-079/DomBasedXss/XssWithAdditionalSources.ql
+++ b/javascript/ql/test/query-tests/Security/CWE-079/DomBasedXss/XssWithAdditionalSources.ql
@@ -5,7 +5,7 @@
  * @kind path-problem
  * @problem.severity error
  * @precision high
- * @id js/xss
+ * @id js/xss-additional-sources-dom-test
  * @tags security
  *       external/cwe/cwe-079
  *       external/cwe/cwe-116
diff --git a/javascript/ql/test/query-tests/Security/CWE-089/local-threat-source/SqlInjection.expected b/javascript/ql/test/query-tests/Security/CWE-089/local-threat-source/SqlInjection.expected
new file mode 100644
index 00000000000..05749a54c5b
--- /dev/null
+++ b/javascript/ql/test/query-tests/Security/CWE-089/local-threat-source/SqlInjection.expected
@@ -0,0 +1,17 @@
+nodes
+| test.js:4:5:4:29 | temp |
+| test.js:4:12:4:22 | process.env |
+| test.js:4:12:4:22 | process.env |
+| test.js:4:12:4:29 | process.env['foo'] |
+| test.js:7:14:7:61 | 'SELECT ...  + temp |
+| test.js:7:14:7:61 | 'SELECT ...  + temp |
+| test.js:7:58:7:61 | temp |
+edges
+| test.js:4:5:4:29 | temp | test.js:7:58:7:61 | temp |
+| test.js:4:12:4:22 | process.env | test.js:4:12:4:29 | process.env['foo'] |
+| test.js:4:12:4:22 | process.env | test.js:4:12:4:29 | process.env['foo'] |
+| test.js:4:12:4:29 | process.env['foo'] | test.js:4:5:4:29 | temp |
+| test.js:7:58:7:61 | temp | test.js:7:14:7:61 | 'SELECT ...  + temp |
+| test.js:7:58:7:61 | temp | test.js:7:14:7:61 | 'SELECT ...  + temp |
+#select
+| test.js:7:14:7:61 | 'SELECT ...  + temp | test.js:4:12:4:22 | process.env | test.js:7:14:7:61 | 'SELECT ...  + temp | This query string depends on a $@. | test.js:4:12:4:22 | process.env | user-provided value |
diff --git a/javascript/ql/test/query-tests/Security/CWE-089/local-threat-source/SqlInjection.ext.yml b/javascript/ql/test/query-tests/Security/CWE-089/local-threat-source/SqlInjection.ext.yml
new file mode 100644
index 00000000000..63507f47738
--- /dev/null
+++ b/javascript/ql/test/query-tests/Security/CWE-089/local-threat-source/SqlInjection.ext.yml
@@ -0,0 +1,6 @@
+extensions:
+  - addsTo:
+      pack: codeql/threat-models
+      extensible: threatModelConfiguration
+    data:
+      - ["local", true, 0]
diff --git a/javascript/ql/test/query-tests/Security/CWE-089/local-threat-source/SqlInjection.qlref b/javascript/ql/test/query-tests/Security/CWE-089/local-threat-source/SqlInjection.qlref
new file mode 100644
index 00000000000..d1d02cbe8d3
--- /dev/null
+++ b/javascript/ql/test/query-tests/Security/CWE-089/local-threat-source/SqlInjection.qlref
@@ -0,0 +1 @@
+Security/CWE-089/SqlInjection.ql
diff --git a/javascript/ql/test/query-tests/Security/CWE-089/local-threat-source/test.js b/javascript/ql/test/query-tests/Security/CWE-089/local-threat-source/test.js
new file mode 100644
index 00000000000..42b11b27b6e
--- /dev/null
+++ b/javascript/ql/test/query-tests/Security/CWE-089/local-threat-source/test.js
@@ -0,0 +1,9 @@
+const mysql = require('mysql');
+const pool = mysql.createPool(getConfig());
+
+let temp = process.env['foo'];
+pool.getConnection(function(err, connection) {
+    connection.query({
+        sql: 'SELECT * FROM `books` WHERE `author` = ' + temp, // NOT OK
+    }, function(error, results, fields) {});
+});
diff --git a/javascript/ql/test/query-tests/Security/CWE-117/LogInjection.expected b/javascript/ql/test/query-tests/Security/CWE-117/LogInjection.expected
index db473a17d2c..1f810f1beea 100644
--- a/javascript/ql/test/query-tests/Security/CWE-117/LogInjection.expected
+++ b/javascript/ql/test/query-tests/Security/CWE-117/LogInjection.expected
@@ -94,6 +94,25 @@ nodes
 | logInjectionBad.js:99:26:99:33 | username |
 | logInjectionBad.js:113:37:113:44 | username |
 | logInjectionBad.js:113:37:113:44 | username |
+| logInjectionBad.js:122:9:122:58 | username |
+| logInjectionBad.js:122:20:122:43 | url.par ... , true) |
+| logInjectionBad.js:122:20:122:49 | url.par ... ).query |
+| logInjectionBad.js:122:20:122:58 | url.par ... sername |
+| logInjectionBad.js:122:30:122:36 | req.url |
+| logInjectionBad.js:122:30:122:36 | req.url |
+| logInjectionBad.js:123:9:123:46 | otherStr |
+| logInjectionBad.js:123:20:123:27 | username |
+| logInjectionBad.js:123:20:123:43 | usernam ... (/.*/g) |
+| logInjectionBad.js:123:20:123:46 | usernam ... */g)[0] |
+| logInjectionBad.js:124:17:124:24 | otherStr |
+| logInjectionBad.js:124:17:124:24 | otherStr |
+| logInjectionBad.js:128:20:128:43 | url.par ... , true) |
+| logInjectionBad.js:128:20:128:49 | url.par ... ).query |
+| logInjectionBad.js:128:20:128:58 | url.par ... sername |
+| logInjectionBad.js:128:30:128:36 | req.url |
+| logInjectionBad.js:128:30:128:36 | req.url |
+| logInjectionBad.js:129:42:129:50 | RegExp.$1 |
+| logInjectionBad.js:129:42:129:50 | RegExp.$1 |
 edges
 | logInjectionBad.js:19:9:19:36 | q | logInjectionBad.js:20:20:20:20 | q |
 | logInjectionBad.js:19:13:19:36 | url.par ... , true) | logInjectionBad.js:19:9:19:36 | q |
@@ -186,6 +205,23 @@ edges
 | logInjectionBad.js:73:20:73:20 | q | logInjectionBad.js:73:20:73:26 | q.query |
 | logInjectionBad.js:73:20:73:26 | q.query | logInjectionBad.js:73:20:73:35 | q.query.username |
 | logInjectionBad.js:73:20:73:35 | q.query.username | logInjectionBad.js:73:9:73:35 | username |
+| logInjectionBad.js:122:9:122:58 | username | logInjectionBad.js:123:20:123:27 | username |
+| logInjectionBad.js:122:20:122:43 | url.par ... , true) | logInjectionBad.js:122:20:122:49 | url.par ... ).query |
+| logInjectionBad.js:122:20:122:49 | url.par ... ).query | logInjectionBad.js:122:20:122:58 | url.par ... sername |
+| logInjectionBad.js:122:20:122:58 | url.par ... sername | logInjectionBad.js:122:9:122:58 | username |
+| logInjectionBad.js:122:30:122:36 | req.url | logInjectionBad.js:122:20:122:43 | url.par ... , true) |
+| logInjectionBad.js:122:30:122:36 | req.url | logInjectionBad.js:122:20:122:43 | url.par ... , true) |
+| logInjectionBad.js:123:9:123:46 | otherStr | logInjectionBad.js:124:17:124:24 | otherStr |
+| logInjectionBad.js:123:9:123:46 | otherStr | logInjectionBad.js:124:17:124:24 | otherStr |
+| logInjectionBad.js:123:20:123:27 | username | logInjectionBad.js:123:20:123:43 | usernam ... (/.*/g) |
+| logInjectionBad.js:123:20:123:43 | usernam ... (/.*/g) | logInjectionBad.js:123:20:123:46 | usernam ... */g)[0] |
+| logInjectionBad.js:123:20:123:46 | usernam ... */g)[0] | logInjectionBad.js:123:9:123:46 | otherStr |
+| logInjectionBad.js:128:20:128:43 | url.par ... , true) | logInjectionBad.js:128:20:128:49 | url.par ... ).query |
+| logInjectionBad.js:128:20:128:49 | url.par ... ).query | logInjectionBad.js:128:20:128:58 | url.par ... sername |
+| logInjectionBad.js:128:20:128:58 | url.par ... sername | logInjectionBad.js:129:42:129:50 | RegExp.$1 |
+| logInjectionBad.js:128:20:128:58 | url.par ... sername | logInjectionBad.js:129:42:129:50 | RegExp.$1 |
+| logInjectionBad.js:128:30:128:36 | req.url | logInjectionBad.js:128:20:128:43 | url.par ... , true) |
+| logInjectionBad.js:128:30:128:36 | req.url | logInjectionBad.js:128:20:128:43 | url.par ... , true) |
 #select
 | logInjectionBad.js:22:18:22:43 | `[INFO] ... rname}` | logInjectionBad.js:19:23:19:29 | req.url | logInjectionBad.js:22:18:22:43 | `[INFO] ... rname}` | Log entry depends on a $@. | logInjectionBad.js:19:23:19:29 | req.url | user-provided value |
 | logInjectionBad.js:23:37:23:44 | username | logInjectionBad.js:19:23:19:29 | req.url | logInjectionBad.js:23:37:23:44 | username | Log entry depends on a $@. | logInjectionBad.js:19:23:19:29 | req.url | user-provided value |
@@ -208,3 +244,5 @@ edges
 | logInjectionBad.js:91:26:91:33 | username | logInjectionBad.js:72:23:72:29 | req.url | logInjectionBad.js:91:26:91:33 | username | Log entry depends on a $@. | logInjectionBad.js:72:23:72:29 | req.url | user-provided value |
 | logInjectionBad.js:99:26:99:33 | username | logInjectionBad.js:72:23:72:29 | req.url | logInjectionBad.js:99:26:99:33 | username | Log entry depends on a $@. | logInjectionBad.js:72:23:72:29 | req.url | user-provided value |
 | logInjectionBad.js:113:37:113:44 | username | logInjectionBad.js:72:23:72:29 | req.url | logInjectionBad.js:113:37:113:44 | username | Log entry depends on a $@. | logInjectionBad.js:72:23:72:29 | req.url | user-provided value |
+| logInjectionBad.js:124:17:124:24 | otherStr | logInjectionBad.js:122:30:122:36 | req.url | logInjectionBad.js:124:17:124:24 | otherStr | Log entry depends on a $@. | logInjectionBad.js:122:30:122:36 | req.url | user-provided value |
+| logInjectionBad.js:129:42:129:50 | RegExp.$1 | logInjectionBad.js:128:30:128:36 | req.url | logInjectionBad.js:129:42:129:50 | RegExp.$1 | Log entry depends on a $@. | logInjectionBad.js:128:30:128:36 | req.url | user-provided value |
diff --git a/javascript/ql/test/query-tests/Security/CWE-117/logInjectionBad.js b/javascript/ql/test/query-tests/Security/CWE-117/logInjectionBad.js
index c6c86363164..028412c346b 100644
--- a/javascript/ql/test/query-tests/Security/CWE-117/logInjectionBad.js
+++ b/javascript/ql/test/query-tests/Security/CWE-117/logInjectionBad.js
@@ -116,4 +116,15 @@ const server4 = http.createServer((req, res) => {
         });
         server.start();
     }
-});
\ No newline at end of file
+});
+
+const serverMatchAll = http.createServer((req, res) => {
+    let username = url.parse(req.url, true).query.username;
+    let otherStr = username.matchAll(/.*/g)[0]; // BAD
+    console.log(otherStr);
+});
+
+const serverMatchAl2l = http.createServer((req, res) => {
+    const result = url.parse(req.url, true).query.username.matchAll(/(\d+)/g); // BAD
+    console.log("First captured group:", RegExp.$1);
+});
diff --git a/javascript/ql/test/query-tests/Security/CWE-200/PrivateFileExposure.expected b/javascript/ql/test/query-tests/Security/CWE-200/PrivateFileExposure.expected
index 3cf199ce371..39a5a884af1 100644
--- a/javascript/ql/test/query-tests/Security/CWE-200/PrivateFileExposure.expected
+++ b/javascript/ql/test/query-tests/Security/CWE-200/PrivateFileExposure.expected
@@ -1,6 +1,6 @@
-| lib/tst.js:7:1:7:45 | app.use ... rname)) | Serves the folder query-tests/Security/CWE-200/lib, which can contain private information. |
-| lib/tst.js:9:1:9:43 | app.use ... otDir)) | Serves the folder query-tests/Security/CWE-200/lib, which can contain private information. |
-| lib/tst.js:11:1:11:52 | app.use ... + '/')) | Serves the folder query-tests/Security/CWE-200/lib, which can contain private information. |
+| lib/tst.js:7:1:7:45 | app.use ... rname)) | Serves the folder lib, which can contain private information. |
+| lib/tst.js:9:1:9:43 | app.use ... otDir)) | Serves the folder lib, which can contain private information. |
+| lib/tst.js:11:1:11:52 | app.use ... + '/')) | Serves the folder lib, which can contain private information. |
 | private-file-exposure.js:8:1:8:49 | app.use ... ular')) | Serves the folder "./node_modules/angular", which can contain private information. |
 | private-file-exposure.js:9:1:9:59 | app.use ... ular')) | Serves the folder "node_modules/angular", which can contain private information. |
 | private-file-exposure.js:10:1:10:67 | app.use ... mate')) | Serves the folder "node_modules/angular-animate", which can contain private information. |
@@ -20,4 +20,4 @@
 | private-file-exposure.js:43:1:43:46 | app.use ... )("/")) | Serves the root folder, which can contain private information. |
 | private-file-exposure.js:51:5:51:88 | app.use ... les'))) | Serves the folder "../node_modules", which can contain private information. |
 | private-file-exposure.js:70:5:70:71 | serveHa ... ular"}) | Serves the folder "./node_modules/angular", which can contain private information. |
-| subfolder/private-file-exposure-2.js:6:1:6:34 | app.use ... rname)) | Serves the folder query-tests/Security/CWE-200/subfolder, which can contain private information. |
+| subfolder/private-file-exposure-2.js:6:1:6:34 | app.use ... rname)) | Serves the folder subfolder, which can contain private information. |
diff --git a/javascript/ql/test/query-tests/Security/CWE-611/Xxe.qlref b/javascript/ql/test/query-tests/Security/CWE-611/Xxe.qlref
index 62a3f7f22d9..38e346c1a8b 100644
--- a/javascript/ql/test/query-tests/Security/CWE-611/Xxe.qlref
+++ b/javascript/ql/test/query-tests/Security/CWE-611/Xxe.qlref
@@ -1 +1,2 @@
-Security/CWE-611/Xxe.ql
+query: Security/CWE-611/Xxe.ql
+postprocess: testUtilities/InlineExpectationsTestQuery.ql
\ No newline at end of file
diff --git a/javascript/ql/test/query-tests/Security/CWE-611/domparser.js b/javascript/ql/test/query-tests/Security/CWE-611/domparser.js
index dca7a3333e7..eeb2236a1d1 100644
--- a/javascript/ql/test/query-tests/Security/CWE-611/domparser.js
+++ b/javascript/ql/test/query-tests/Security/CWE-611/domparser.js
@@ -1,5 +1,5 @@
 function test() {
-  var src = document.location.search;
+  var src = document.location.search; // $ Source=search
 
   if (window.DOMParser) {
     // OK: DOMParser only expands internal general entities
@@ -8,10 +8,10 @@ function test() {
     var parser;
     try {
       // NOT OK: XMLDOM expands external entities by default
-      (new ActiveXObject("Microsoft.XMLDOM")).loadXML(src);
+      (new ActiveXObject("Microsoft.XMLDOM")).loadXML(src); // $ Alert=search
     } catch (e) {
       // NOT OK: MSXML expands external entities by default
-      (new ActiveXObject("Msxml2.DOMDocument")).loadXML(src);
+      (new ActiveXObject("Msxml2.DOMDocument")).loadXML(src); // $ Alert=search
     }
   }
 }
diff --git a/javascript/ql/test/query-tests/Security/CWE-611/libxml.noent.js b/javascript/ql/test/query-tests/Security/CWE-611/libxml.noent.js
index 47df4223e0e..40cb0148b57 100644
--- a/javascript/ql/test/query-tests/Security/CWE-611/libxml.noent.js
+++ b/javascript/ql/test/query-tests/Security/CWE-611/libxml.noent.js
@@ -1,20 +1,20 @@
 const express = require('express');
 const libxmljs = require('libxmljs');
 
-express().get('/some/path', function(req) {
+express().get('/some/path', function (req) {
   // NOT OK: unguarded entity expansion
-  libxmljs.parseXml(req.param("some-xml"), { noent: true });
+  libxmljs.parseXml(req.param("some-xml"), { noent: true }); // $ Alert
 });
 
-express().post('/some/path', function(req, res) {
+express().post('/some/path', function (req, res) {
   // NOT OK: unguarded entity expansion
-  libxmljs.parseXml(req.param("some-xml"), { noent: true });
+  libxmljs.parseXml(req.param("some-xml"), { noent: true }); // $ Alert
 
   // NOT OK: unguarded entity expansion
-  libxmljs.parseXmlString(req.param("some-xml"), {noent:true})
+  libxmljs.parseXmlString(req.param("some-xml"), { noent: true }) // $ Alert
   // NOT OK: unguarded entity expansion
-  libxmljs.parseXmlString(req.files.products.data.toString('utf8'), {noent:true})
-  
+  libxmljs.parseXmlString(req.files.products.data.toString('utf8'), { noent: true })// $ Source=files $ Alert=files
+
   // OK - no entity expansion
-  libxmljs.parseXmlString(req.files.products.data.toString('utf8'), {noent:false})
+  libxmljs.parseXmlString(req.files.products.data.toString('utf8'), { noent: false })
 });
diff --git a/javascript/ql/test/query-tests/Security/CWE-611/libxml.sax.js b/javascript/ql/test/query-tests/Security/CWE-611/libxml.sax.js
index 2c837c750d3..ba5723c794b 100644
--- a/javascript/ql/test/query-tests/Security/CWE-611/libxml.sax.js
+++ b/javascript/ql/test/query-tests/Security/CWE-611/libxml.sax.js
@@ -1,7 +1,7 @@
 const express = require('express');
 const libxmljs = require('libxmljs');
 
-express().get('/some/path', function(req) {
+express().get('/some/path', function (req) {
   const parser = new libxmljs.SaxParser();
-  parser.parseString(req.param("some-xml")); // NOT OK: the SAX parser expands external entities by default
+  parser.parseString(req.param("some-xml")); // $ Alert: the SAX parser expands external entities by default
 });
diff --git a/javascript/ql/test/query-tests/Security/CWE-611/libxml.saxpush.js b/javascript/ql/test/query-tests/Security/CWE-611/libxml.saxpush.js
index 0e939e191c6..f8106b37803 100644
--- a/javascript/ql/test/query-tests/Security/CWE-611/libxml.saxpush.js
+++ b/javascript/ql/test/query-tests/Security/CWE-611/libxml.saxpush.js
@@ -1,7 +1,7 @@
 const express = require('express');
 const libxmljs = require('libxmljs');
 
-express().get('/some/path', function(req) {
+express().get('/some/path', function (req) {
   const parser = new libxmljs.SaxPushParser();
-  parser.push(req.param("some-xml"));  // NOT OK: the SAX parser expands external entities by default
+  parser.push(req.param("some-xml")); // $ Alert: the SAX parser expands external entities by default
 });
diff --git a/javascript/ql/test/testUtilities/InlineExpectationsTestQuery.ql b/javascript/ql/test/testUtilities/InlineExpectationsTestQuery.ql
new file mode 100644
index 00000000000..55892be75d7
--- /dev/null
+++ b/javascript/ql/test/testUtilities/InlineExpectationsTestQuery.ql
@@ -0,0 +1,21 @@
+/**
+ * @kind test-postprocess
+ */
+
+private import javascript
+private import codeql.util.test.InlineExpectationsTest as T
+private import internal.InlineExpectationsTestImpl
+import T::TestPostProcessing
+import T::TestPostProcessing::Make<Impl, Input>
+
+private module Input implements T::TestPostProcessing::InputSig<Impl> {
+  string getRelativeUrl(Location location) {
+    exists(File f, int startline, int startcolumn, int endline, int endcolumn |
+      location.hasLocationInfo(_, startline, startcolumn, endline, endcolumn) and
+      f = location.getFile()
+    |
+      result =
+        f.getRelativePath() + ":" + startline + ":" + startcolumn + ":" + endline + ":" + endcolumn
+    )
+  }
+}
diff --git a/javascript/ql/test/tutorials/Introducing the JavaScript libraries/tests.expected b/javascript/ql/test/tutorials/Introducing the JavaScript libraries/tests.expected
index d9f7f800502..bd22abd7c82 100644
--- a/javascript/ql/test/tutorials/Introducing the JavaScript libraries/tests.expected	
+++ b/javascript/ql/test/tutorials/Introducing the JavaScript libraries/tests.expected	
@@ -1,7 +1,5 @@
 test_query1
-|  | 0 |
-| tutorials | 0 |
-| tutorials/Introducing the JavaScript libraries | 2 |
+|  | 2 |
 test_query3
 | tst.js:27:1:27:4 | <!-- | Do not use HTML comments. |
 test_query4
diff --git a/javascript/resources/tools/autobuild.cmd b/javascript/resources/tools/autobuild.cmd
index c64898bea78..72feddeab12 100644
--- a/javascript/resources/tools/autobuild.cmd
+++ b/javascript/resources/tools/autobuild.cmd
@@ -6,7 +6,7 @@ set jvm_args=-Xss16m
 rem If CODEQL_RAM is set, use half for Java and half for TS.
 if NOT [%CODEQL_RAM%] == [] (
     set /a "half_ram=CODEQL_RAM/2"
-    set LGTM_TYPESCRIPT_RAM=%half_ram%
+    set LGTM_TYPESCRIPT_RAM=!half_ram!
     set jvm_args=!jvm_args! -Xmx!half_ram!m
 )
 
diff --git a/misc/bazel/3rdparty/.gitattributes b/misc/bazel/3rdparty/.gitattributes
new file mode 100644
index 00000000000..c114c961c67
--- /dev/null
+++ b/misc/bazel/3rdparty/.gitattributes
@@ -0,0 +1,2 @@
+/tree_sitter_extractors_deps/** linguist-generated=true
+/py_deps/** linguist-generated=true
diff --git a/misc/bazel/3rdparty/BUILD.bazel b/misc/bazel/3rdparty/BUILD.bazel
new file mode 100644
index 00000000000..4429e3f296b
--- /dev/null
+++ b/misc/bazel/3rdparty/BUILD.bazel
@@ -0,0 +1,34 @@
+load("@rules_rust//crate_universe:defs.bzl", "crates_vendor")
+
+# The targets in this file re-do the vendoring of the rust cargo dependencies. Use the update_cargo_deps.sh script to run the targets, and do all the necessary work around vendoring.
+crates_vendor(
+    name = "vendor_tree_sitter_extractors",
+    cargo_lockfile = "//:Cargo.lock",
+    generate_build_scripts = True,
+    manifests = [
+        "//:Cargo.toml",
+        "//ruby/extractor:Cargo.toml",
+        "//rust/extractor:Cargo.toml",
+        "//rust/extractor/macros:Cargo.toml",
+        "//rust/ast-generator:Cargo.toml",
+        "//shared/tree-sitter-extractor:Cargo.toml",
+    ],
+    mode = "remote",
+    repository_name = "vendor",
+    tags = ["manual"],
+    vendor_path = "tree_sitter_extractors_deps",
+)
+
+crates_vendor(
+    name = "vendor_py_deps",
+    cargo_lockfile = "//python/extractor/tsg-python:Cargo.lock",
+    generate_build_scripts = True,
+    manifests = [
+        "//python/extractor/tsg-python:Cargo.toml",
+        "//python/extractor/tsg-python/tsp:Cargo.toml",
+    ],
+    mode = "remote",
+    repository_name = "vendor",
+    tags = ["manual"],
+    vendor_path = "py_deps",
+)
diff --git a/misc/bazel/3rdparty/py_deps/BUILD.ahash-0.4.7.bazel b/misc/bazel/3rdparty/py_deps/BUILD.ahash-0.4.7.bazel
new file mode 100644
index 00000000000..8a4714a2861
--- /dev/null
+++ b/misc/bazel/3rdparty/py_deps/BUILD.ahash-0.4.7.bazel
@@ -0,0 +1,81 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_py_deps
+###############################################################################
+
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "ahash",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2018",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=ahash",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.4.7",
+)
diff --git a/misc/bazel/3rdparty/py_deps/BUILD.aho-corasick-0.7.18.bazel b/misc/bazel/3rdparty/py_deps/BUILD.aho-corasick-0.7.18.bazel
new file mode 100644
index 00000000000..7e5d905c8d9
--- /dev/null
+++ b/misc/bazel/3rdparty/py_deps/BUILD.aho-corasick-0.7.18.bazel
@@ -0,0 +1,88 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_py_deps
+###############################################################################
+
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "aho_corasick",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "default",
+        "std",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2018",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=aho-corasick",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.7.18",
+    deps = [
+        "@vendor__memchr-2.4.1//:memchr",
+    ],
+)
diff --git a/misc/bazel/3rdparty/py_deps/BUILD.ansi_term-0.11.0.bazel b/misc/bazel/3rdparty/py_deps/BUILD.ansi_term-0.11.0.bazel
new file mode 100644
index 00000000000..9bf7fb975cd
--- /dev/null
+++ b/misc/bazel/3rdparty/py_deps/BUILD.ansi_term-0.11.0.bazel
@@ -0,0 +1,93 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_py_deps
+###############################################################################
+
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "ansi_term",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2015",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=ansi_term",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.11.0",
+    deps = select({
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [
+            "@vendor__winapi-0.3.9//:winapi",  # cfg(target_os = "windows")
+        ],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [
+            "@vendor__winapi-0.3.9//:winapi",  # cfg(target_os = "windows")
+        ],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [
+            "@vendor__winapi-0.3.9//:winapi",  # cfg(target_os = "windows")
+        ],
+        "//conditions:default": [],
+    }),
+)
diff --git a/misc/bazel/3rdparty/py_deps/BUILD.anyhow-1.0.44.bazel b/misc/bazel/3rdparty/py_deps/BUILD.anyhow-1.0.44.bazel
new file mode 100644
index 00000000000..df159a1684e
--- /dev/null
+++ b/misc/bazel/3rdparty/py_deps/BUILD.anyhow-1.0.44.bazel
@@ -0,0 +1,148 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_py_deps
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_build_script")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "anyhow",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "default",
+        "std",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2018",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=anyhow",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "1.0.44",
+    deps = [
+        "@vendor__anyhow-1.0.44//:build_script_build",
+    ],
+)
+
+cargo_build_script(
+    name = "_bs",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            "**/*.rs",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "default",
+        "std",
+    ],
+    crate_name = "build_script_build",
+    crate_root = "build.rs",
+    data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    edition = "2018",
+    pkg_name = "anyhow",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=anyhow",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    version = "1.0.44",
+    visibility = ["//visibility:private"],
+)
+
+alias(
+    name = "build_script_build",
+    actual = ":_bs",
+    tags = ["manual"],
+)
diff --git a/misc/bazel/3rdparty/py_deps/BUILD.atty-0.2.14.bazel b/misc/bazel/3rdparty/py_deps/BUILD.atty-0.2.14.bazel
new file mode 100644
index 00000000000..366adf24e72
--- /dev/null
+++ b/misc/bazel/3rdparty/py_deps/BUILD.atty-0.2.14.bazel
@@ -0,0 +1,165 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_py_deps
+###############################################################################
+
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "atty",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2015",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=atty",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.2.14",
+    deps = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [
+            "@vendor__libc-0.2.101//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [
+            "@vendor__libc-0.2.101//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [
+            "@vendor__libc-0.2.101//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [
+            "@vendor__libc-0.2.101//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:aarch64-linux-android": [
+            "@vendor__libc-0.2.101//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [
+            "@vendor__winapi-0.3.9//:winapi",  # cfg(windows)
+        ],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [
+            "@vendor__libc-0.2.101//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [
+            "@vendor__libc-0.2.101//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [
+            "@vendor__libc-0.2.101//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [
+            "@vendor__libc-0.2.101//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [
+            "@vendor__libc-0.2.101//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [
+            "@vendor__libc-0.2.101//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:i686-apple-darwin": [
+            "@vendor__libc-0.2.101//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:i686-linux-android": [
+            "@vendor__libc-0.2.101//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [
+            "@vendor__winapi-0.3.9//:winapi",  # cfg(windows)
+        ],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [
+            "@vendor__libc-0.2.101//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [
+            "@vendor__libc-0.2.101//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [
+            "@vendor__libc-0.2.101//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [
+            "@vendor__libc-0.2.101//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [
+            "@vendor__libc-0.2.101//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [
+            "@vendor__libc-0.2.101//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [
+            "@vendor__libc-0.2.101//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:x86_64-linux-android": [
+            "@vendor__libc-0.2.101//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [
+            "@vendor__winapi-0.3.9//:winapi",  # cfg(windows)
+        ],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [
+            "@vendor__libc-0.2.101//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [
+            "@vendor__libc-0.2.101//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [
+            "@vendor__libc-0.2.101//:libc",  # cfg(unix)
+        ],
+        "//conditions:default": [],
+    }),
+)
diff --git a/misc/bazel/3rdparty/py_deps/BUILD.bazel b/misc/bazel/3rdparty/py_deps/BUILD.bazel
new file mode 100644
index 00000000000..769738d8152
--- /dev/null
+++ b/misc/bazel/3rdparty/py_deps/BUILD.bazel
@@ -0,0 +1,86 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_py_deps
+###############################################################################
+
+package(default_visibility = ["//visibility:public"])
+
+exports_files(
+    [
+        "cargo-bazel.json",
+        "crates.bzl",
+        "defs.bzl",
+    ] + glob(
+        include = ["*.bazel"],
+        allow_empty = True,
+    ),
+)
+
+filegroup(
+    name = "srcs",
+    srcs = glob(
+        include = [
+            "*.bazel",
+            "*.bzl",
+        ],
+        allow_empty = True,
+    ),
+)
+
+# Workspace Member Dependencies
+alias(
+    name = "anyhow",
+    actual = "@vendor__anyhow-1.0.44//:anyhow",
+    tags = ["manual"],
+)
+
+alias(
+    name = "clap",
+    actual = "@vendor__clap-2.33.3//:clap",
+    tags = ["manual"],
+)
+
+alias(
+    name = "regex",
+    actual = "@vendor__regex-1.5.5//:regex",
+    tags = ["manual"],
+)
+
+alias(
+    name = "smallvec",
+    actual = "@vendor__smallvec-1.6.1//:smallvec",
+    tags = ["manual"],
+)
+
+alias(
+    name = "string-interner",
+    actual = "@vendor__string-interner-0.12.2//:string_interner",
+    tags = ["manual"],
+)
+
+alias(
+    name = "thiserror",
+    actual = "@vendor__thiserror-1.0.29//:thiserror",
+    tags = ["manual"],
+)
+
+alias(
+    name = "tree-sitter",
+    actual = "@vendor__tree-sitter-0.20.4//:tree_sitter",
+    tags = ["manual"],
+)
+
+alias(
+    name = "tree-sitter-graph",
+    actual = "@vendor__tree-sitter-graph-0.7.0//:tree_sitter_graph",
+    tags = ["manual"],
+)
+
+alias(
+    name = "tsp",
+    actual = "@vendor__tsp-0.19.0//:tsp",
+    tags = ["manual"],
+)
diff --git a/misc/bazel/3rdparty/py_deps/BUILD.bitflags-1.3.2.bazel b/misc/bazel/3rdparty/py_deps/BUILD.bitflags-1.3.2.bazel
new file mode 100644
index 00000000000..2c7147f64d0
--- /dev/null
+++ b/misc/bazel/3rdparty/py_deps/BUILD.bitflags-1.3.2.bazel
@@ -0,0 +1,84 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_py_deps
+###############################################################################
+
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "bitflags",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "default",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2018",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=bitflags",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "1.3.2",
+)
diff --git a/misc/bazel/3rdparty/py_deps/BUILD.cc-1.0.70.bazel b/misc/bazel/3rdparty/py_deps/BUILD.cc-1.0.70.bazel
new file mode 100644
index 00000000000..8f10276ee76
--- /dev/null
+++ b/misc/bazel/3rdparty/py_deps/BUILD.cc-1.0.70.bazel
@@ -0,0 +1,81 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_py_deps
+###############################################################################
+
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "cc",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2018",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=cc",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "1.0.70",
+)
diff --git a/misc/bazel/3rdparty/py_deps/BUILD.cfg-if-1.0.0.bazel b/misc/bazel/3rdparty/py_deps/BUILD.cfg-if-1.0.0.bazel
new file mode 100644
index 00000000000..d703467e19f
--- /dev/null
+++ b/misc/bazel/3rdparty/py_deps/BUILD.cfg-if-1.0.0.bazel
@@ -0,0 +1,81 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_py_deps
+###############################################################################
+
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "cfg_if",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2018",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=cfg-if",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "1.0.0",
+)
diff --git a/misc/bazel/3rdparty/py_deps/BUILD.clap-2.33.3.bazel b/misc/bazel/3rdparty/py_deps/BUILD.clap-2.33.3.bazel
new file mode 100644
index 00000000000..f4d6e0b1a39
--- /dev/null
+++ b/misc/bazel/3rdparty/py_deps/BUILD.clap-2.33.3.bazel
@@ -0,0 +1,193 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_py_deps
+###############################################################################
+
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "clap",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "ansi_term",
+        "atty",
+        "color",
+        "default",
+        "strsim",
+        "suggestions",
+        "vec_map",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2015",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=clap",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "2.33.3",
+    deps = [
+        "@vendor__atty-0.2.14//:atty",
+        "@vendor__bitflags-1.3.2//:bitflags",
+        "@vendor__strsim-0.8.0//:strsim",
+        "@vendor__textwrap-0.11.0//:textwrap",
+        "@vendor__unicode-width-0.1.8//:unicode_width",
+        "@vendor__vec_map-0.8.2//:vec_map",
+    ] + select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [
+            "@vendor__ansi_term-0.11.0//:ansi_term",  # aarch64-apple-darwin
+        ],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [
+            "@vendor__ansi_term-0.11.0//:ansi_term",  # aarch64-apple-ios
+        ],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [
+            "@vendor__ansi_term-0.11.0//:ansi_term",  # aarch64-apple-ios-sim
+        ],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [
+            "@vendor__ansi_term-0.11.0//:ansi_term",  # aarch64-fuchsia
+        ],
+        "@rules_rust//rust/platform:aarch64-linux-android": [
+            "@vendor__ansi_term-0.11.0//:ansi_term",  # aarch64-linux-android
+        ],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [
+            "@vendor__ansi_term-0.11.0//:ansi_term",  # aarch64-unknown-linux-gnu
+        ],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [
+            "@vendor__ansi_term-0.11.0//:ansi_term",  # aarch64-unknown-linux-gnu, aarch64-unknown-nixos-gnu
+        ],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [
+            "@vendor__ansi_term-0.11.0//:ansi_term",  # aarch64-unknown-nto-qnx710
+        ],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [
+            "@vendor__ansi_term-0.11.0//:ansi_term",  # arm-unknown-linux-gnueabi
+        ],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [
+            "@vendor__ansi_term-0.11.0//:ansi_term",  # armv7-linux-androideabi
+        ],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [
+            "@vendor__ansi_term-0.11.0//:ansi_term",  # armv7-unknown-linux-gnueabi
+        ],
+        "@rules_rust//rust/platform:i686-apple-darwin": [
+            "@vendor__ansi_term-0.11.0//:ansi_term",  # i686-apple-darwin
+        ],
+        "@rules_rust//rust/platform:i686-linux-android": [
+            "@vendor__ansi_term-0.11.0//:ansi_term",  # i686-linux-android
+        ],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [
+            "@vendor__ansi_term-0.11.0//:ansi_term",  # i686-unknown-freebsd
+        ],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [
+            "@vendor__ansi_term-0.11.0//:ansi_term",  # i686-unknown-linux-gnu
+        ],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [
+            "@vendor__ansi_term-0.11.0//:ansi_term",  # powerpc-unknown-linux-gnu
+        ],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [
+            "@vendor__ansi_term-0.11.0//:ansi_term",  # riscv32imc-unknown-none-elf
+        ],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [
+            "@vendor__ansi_term-0.11.0//:ansi_term",  # riscv64gc-unknown-none-elf
+        ],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [
+            "@vendor__ansi_term-0.11.0//:ansi_term",  # s390x-unknown-linux-gnu
+        ],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [
+            "@vendor__ansi_term-0.11.0//:ansi_term",  # thumbv7em-none-eabi
+        ],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [
+            "@vendor__ansi_term-0.11.0//:ansi_term",  # thumbv8m.main-none-eabi
+        ],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [
+            "@vendor__ansi_term-0.11.0//:ansi_term",  # wasm32-unknown-unknown
+        ],
+        "@rules_rust//rust/platform:wasm32-wasi": [
+            "@vendor__ansi_term-0.11.0//:ansi_term",  # wasm32-wasi
+        ],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [
+            "@vendor__ansi_term-0.11.0//:ansi_term",  # x86_64-apple-darwin
+        ],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [
+            "@vendor__ansi_term-0.11.0//:ansi_term",  # x86_64-apple-ios
+        ],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [
+            "@vendor__ansi_term-0.11.0//:ansi_term",  # x86_64-fuchsia
+        ],
+        "@rules_rust//rust/platform:x86_64-linux-android": [
+            "@vendor__ansi_term-0.11.0//:ansi_term",  # x86_64-linux-android
+        ],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [
+            "@vendor__ansi_term-0.11.0//:ansi_term",  # x86_64-unknown-freebsd
+        ],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [
+            "@vendor__ansi_term-0.11.0//:ansi_term",  # x86_64-unknown-linux-gnu
+        ],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [
+            "@vendor__ansi_term-0.11.0//:ansi_term",  # x86_64-unknown-linux-gnu, x86_64-unknown-nixos-gnu
+        ],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [
+            "@vendor__ansi_term-0.11.0//:ansi_term",  # x86_64-unknown-none
+        ],
+        "//conditions:default": [],
+    }),
+)
diff --git a/misc/bazel/3rdparty/py_deps/BUILD.hashbrown-0.9.1.bazel b/misc/bazel/3rdparty/py_deps/BUILD.hashbrown-0.9.1.bazel
new file mode 100644
index 00000000000..d16f42d953c
--- /dev/null
+++ b/misc/bazel/3rdparty/py_deps/BUILD.hashbrown-0.9.1.bazel
@@ -0,0 +1,88 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_py_deps
+###############################################################################
+
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "hashbrown",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "ahash",
+        "inline-more",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2018",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=hashbrown",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.9.1",
+    deps = [
+        "@vendor__ahash-0.4.7//:ahash",
+    ],
+)
diff --git a/misc/bazel/3rdparty/py_deps/BUILD.hermit-abi-0.1.19.bazel b/misc/bazel/3rdparty/py_deps/BUILD.hermit-abi-0.1.19.bazel
new file mode 100644
index 00000000000..073aeb5c126
--- /dev/null
+++ b/misc/bazel/3rdparty/py_deps/BUILD.hermit-abi-0.1.19.bazel
@@ -0,0 +1,84 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_py_deps
+###############################################################################
+
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "hermit_abi",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2018",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=hermit-abi",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.1.19",
+    deps = [
+        "@vendor__libc-0.2.101//:libc",
+    ],
+)
diff --git a/misc/bazel/3rdparty/py_deps/BUILD.itoa-1.0.1.bazel b/misc/bazel/3rdparty/py_deps/BUILD.itoa-1.0.1.bazel
new file mode 100644
index 00000000000..8af32bcf017
--- /dev/null
+++ b/misc/bazel/3rdparty/py_deps/BUILD.itoa-1.0.1.bazel
@@ -0,0 +1,81 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_py_deps
+###############################################################################
+
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "itoa",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2018",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=itoa",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "1.0.1",
+)
diff --git a/misc/bazel/3rdparty/py_deps/BUILD.libc-0.2.101.bazel b/misc/bazel/3rdparty/py_deps/BUILD.libc-0.2.101.bazel
new file mode 100644
index 00000000000..5d6a13412d3
--- /dev/null
+++ b/misc/bazel/3rdparty/py_deps/BUILD.libc-0.2.101.bazel
@@ -0,0 +1,140 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_py_deps
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_build_script")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "libc",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2015",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=libc",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.2.101",
+    deps = [
+        "@vendor__libc-0.2.101//:build_script_build",
+    ],
+)
+
+cargo_build_script(
+    name = "_bs",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            "**/*.rs",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_name = "build_script_build",
+    crate_root = "build.rs",
+    data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    edition = "2015",
+    pkg_name = "libc",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=libc",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    version = "0.2.101",
+    visibility = ["//visibility:private"],
+)
+
+alias(
+    name = "build_script_build",
+    actual = ":_bs",
+    tags = ["manual"],
+)
diff --git a/misc/bazel/3rdparty/py_deps/BUILD.log-0.4.14.bazel b/misc/bazel/3rdparty/py_deps/BUILD.log-0.4.14.bazel
new file mode 100644
index 00000000000..4b6d2b39aae
--- /dev/null
+++ b/misc/bazel/3rdparty/py_deps/BUILD.log-0.4.14.bazel
@@ -0,0 +1,141 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_py_deps
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_build_script")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "log",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2015",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=log",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.4.14",
+    deps = [
+        "@vendor__cfg-if-1.0.0//:cfg_if",
+        "@vendor__log-0.4.14//:build_script_build",
+    ],
+)
+
+cargo_build_script(
+    name = "_bs",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            "**/*.rs",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_name = "build_script_build",
+    crate_root = "build.rs",
+    data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    edition = "2015",
+    pkg_name = "log",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=log",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    version = "0.4.14",
+    visibility = ["//visibility:private"],
+)
+
+alias(
+    name = "build_script_build",
+    actual = ":_bs",
+    tags = ["manual"],
+)
diff --git a/misc/bazel/3rdparty/py_deps/BUILD.memchr-2.4.1.bazel b/misc/bazel/3rdparty/py_deps/BUILD.memchr-2.4.1.bazel
new file mode 100644
index 00000000000..a52947ba5d5
--- /dev/null
+++ b/misc/bazel/3rdparty/py_deps/BUILD.memchr-2.4.1.bazel
@@ -0,0 +1,148 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_py_deps
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_build_script")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "memchr",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "default",
+        "std",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2018",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=memchr",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "2.4.1",
+    deps = [
+        "@vendor__memchr-2.4.1//:build_script_build",
+    ],
+)
+
+cargo_build_script(
+    name = "_bs",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            "**/*.rs",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "default",
+        "std",
+    ],
+    crate_name = "build_script_build",
+    crate_root = "build.rs",
+    data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    edition = "2018",
+    pkg_name = "memchr",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=memchr",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    version = "2.4.1",
+    visibility = ["//visibility:private"],
+)
+
+alias(
+    name = "build_script_build",
+    actual = ":_bs",
+    tags = ["manual"],
+)
diff --git a/misc/bazel/3rdparty/py_deps/BUILD.proc-macro2-1.0.29.bazel b/misc/bazel/3rdparty/py_deps/BUILD.proc-macro2-1.0.29.bazel
new file mode 100644
index 00000000000..6f1945e5209
--- /dev/null
+++ b/misc/bazel/3rdparty/py_deps/BUILD.proc-macro2-1.0.29.bazel
@@ -0,0 +1,149 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_py_deps
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_build_script")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "proc_macro2",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "default",
+        "proc-macro",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2018",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=proc-macro2",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "1.0.29",
+    deps = [
+        "@vendor__proc-macro2-1.0.29//:build_script_build",
+        "@vendor__unicode-xid-0.2.2//:unicode_xid",
+    ],
+)
+
+cargo_build_script(
+    name = "_bs",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            "**/*.rs",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "default",
+        "proc-macro",
+    ],
+    crate_name = "build_script_build",
+    crate_root = "build.rs",
+    data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    edition = "2018",
+    pkg_name = "proc-macro2",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=proc-macro2",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    version = "1.0.29",
+    visibility = ["//visibility:private"],
+)
+
+alias(
+    name = "build_script_build",
+    actual = ":_bs",
+    tags = ["manual"],
+)
diff --git a/misc/bazel/3rdparty/py_deps/BUILD.quote-1.0.9.bazel b/misc/bazel/3rdparty/py_deps/BUILD.quote-1.0.9.bazel
new file mode 100644
index 00000000000..49c27788199
--- /dev/null
+++ b/misc/bazel/3rdparty/py_deps/BUILD.quote-1.0.9.bazel
@@ -0,0 +1,88 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_py_deps
+###############################################################################
+
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "quote",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "default",
+        "proc-macro",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2018",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=quote",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "1.0.9",
+    deps = [
+        "@vendor__proc-macro2-1.0.29//:proc_macro2",
+    ],
+)
diff --git a/misc/bazel/3rdparty/py_deps/BUILD.regex-1.5.5.bazel b/misc/bazel/3rdparty/py_deps/BUILD.regex-1.5.5.bazel
new file mode 100644
index 00000000000..797ba8a5452
--- /dev/null
+++ b/misc/bazel/3rdparty/py_deps/BUILD.regex-1.5.5.bazel
@@ -0,0 +1,105 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_py_deps
+###############################################################################
+
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "regex",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "aho-corasick",
+        "default",
+        "memchr",
+        "perf",
+        "perf-cache",
+        "perf-dfa",
+        "perf-inline",
+        "perf-literal",
+        "std",
+        "unicode",
+        "unicode-age",
+        "unicode-bool",
+        "unicode-case",
+        "unicode-gencat",
+        "unicode-perl",
+        "unicode-script",
+        "unicode-segment",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2018",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=regex",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "1.5.5",
+    deps = [
+        "@vendor__aho-corasick-0.7.18//:aho_corasick",
+        "@vendor__memchr-2.4.1//:memchr",
+        "@vendor__regex-syntax-0.6.25//:regex_syntax",
+    ],
+)
diff --git a/misc/bazel/3rdparty/py_deps/BUILD.regex-syntax-0.6.25.bazel b/misc/bazel/3rdparty/py_deps/BUILD.regex-syntax-0.6.25.bazel
new file mode 100644
index 00000000000..ae2e36c9ef4
--- /dev/null
+++ b/misc/bazel/3rdparty/py_deps/BUILD.regex-syntax-0.6.25.bazel
@@ -0,0 +1,92 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_py_deps
+###############################################################################
+
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "regex_syntax",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "default",
+        "unicode",
+        "unicode-age",
+        "unicode-bool",
+        "unicode-case",
+        "unicode-gencat",
+        "unicode-perl",
+        "unicode-script",
+        "unicode-segment",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2018",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=regex-syntax",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.6.25",
+)
diff --git a/misc/bazel/3rdparty/py_deps/BUILD.ryu-1.0.9.bazel b/misc/bazel/3rdparty/py_deps/BUILD.ryu-1.0.9.bazel
new file mode 100644
index 00000000000..16b944bcb4e
--- /dev/null
+++ b/misc/bazel/3rdparty/py_deps/BUILD.ryu-1.0.9.bazel
@@ -0,0 +1,81 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_py_deps
+###############################################################################
+
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "ryu",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2018",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=ryu",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "1.0.9",
+)
diff --git a/misc/bazel/3rdparty/py_deps/BUILD.serde-1.0.136.bazel b/misc/bazel/3rdparty/py_deps/BUILD.serde-1.0.136.bazel
new file mode 100644
index 00000000000..eead2539e23
--- /dev/null
+++ b/misc/bazel/3rdparty/py_deps/BUILD.serde-1.0.136.bazel
@@ -0,0 +1,148 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_py_deps
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_build_script")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "serde",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "default",
+        "std",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2015",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=serde",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "1.0.136",
+    deps = [
+        "@vendor__serde-1.0.136//:build_script_build",
+    ],
+)
+
+cargo_build_script(
+    name = "_bs",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            "**/*.rs",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "default",
+        "std",
+    ],
+    crate_name = "build_script_build",
+    crate_root = "build.rs",
+    data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    edition = "2015",
+    pkg_name = "serde",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=serde",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    version = "1.0.136",
+    visibility = ["//visibility:private"],
+)
+
+alias(
+    name = "build_script_build",
+    actual = ":_bs",
+    tags = ["manual"],
+)
diff --git a/misc/bazel/3rdparty/py_deps/BUILD.serde_json-1.0.79.bazel b/misc/bazel/3rdparty/py_deps/BUILD.serde_json-1.0.79.bazel
new file mode 100644
index 00000000000..06b057381d5
--- /dev/null
+++ b/misc/bazel/3rdparty/py_deps/BUILD.serde_json-1.0.79.bazel
@@ -0,0 +1,151 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_py_deps
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_build_script")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "serde_json",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "default",
+        "std",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2018",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=serde_json",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "1.0.79",
+    deps = [
+        "@vendor__itoa-1.0.1//:itoa",
+        "@vendor__ryu-1.0.9//:ryu",
+        "@vendor__serde-1.0.136//:serde",
+        "@vendor__serde_json-1.0.79//:build_script_build",
+    ],
+)
+
+cargo_build_script(
+    name = "_bs",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            "**/*.rs",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "default",
+        "std",
+    ],
+    crate_name = "build_script_build",
+    crate_root = "build.rs",
+    data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    edition = "2018",
+    pkg_name = "serde_json",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=serde_json",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    version = "1.0.79",
+    visibility = ["//visibility:private"],
+)
+
+alias(
+    name = "build_script_build",
+    actual = ":_bs",
+    tags = ["manual"],
+)
diff --git a/misc/bazel/3rdparty/py_deps/BUILD.smallvec-1.6.1.bazel b/misc/bazel/3rdparty/py_deps/BUILD.smallvec-1.6.1.bazel
new file mode 100644
index 00000000000..1f2ebbed03c
--- /dev/null
+++ b/misc/bazel/3rdparty/py_deps/BUILD.smallvec-1.6.1.bazel
@@ -0,0 +1,84 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_py_deps
+###############################################################################
+
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "smallvec",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "union",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2018",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=smallvec",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "1.6.1",
+)
diff --git a/misc/bazel/3rdparty/py_deps/BUILD.string-interner-0.12.2.bazel b/misc/bazel/3rdparty/py_deps/BUILD.string-interner-0.12.2.bazel
new file mode 100644
index 00000000000..16b7b36db25
--- /dev/null
+++ b/misc/bazel/3rdparty/py_deps/BUILD.string-interner-0.12.2.bazel
@@ -0,0 +1,90 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_py_deps
+###############################################################################
+
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "string_interner",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "backends",
+        "inline-more",
+        "std",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2018",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=string-interner",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.12.2",
+    deps = [
+        "@vendor__cfg-if-1.0.0//:cfg_if",
+        "@vendor__hashbrown-0.9.1//:hashbrown",
+    ],
+)
diff --git a/misc/bazel/3rdparty/py_deps/BUILD.strsim-0.8.0.bazel b/misc/bazel/3rdparty/py_deps/BUILD.strsim-0.8.0.bazel
new file mode 100644
index 00000000000..662c5488ae4
--- /dev/null
+++ b/misc/bazel/3rdparty/py_deps/BUILD.strsim-0.8.0.bazel
@@ -0,0 +1,81 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_py_deps
+###############################################################################
+
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "strsim",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2015",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=strsim",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.8.0",
+)
diff --git a/misc/bazel/3rdparty/py_deps/BUILD.syn-1.0.76.bazel b/misc/bazel/3rdparty/py_deps/BUILD.syn-1.0.76.bazel
new file mode 100644
index 00000000000..c74a425ed94
--- /dev/null
+++ b/misc/bazel/3rdparty/py_deps/BUILD.syn-1.0.76.bazel
@@ -0,0 +1,161 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_py_deps
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_build_script")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "syn",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "clone-impls",
+        "default",
+        "derive",
+        "parsing",
+        "printing",
+        "proc-macro",
+        "quote",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2018",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=syn",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "1.0.76",
+    deps = [
+        "@vendor__proc-macro2-1.0.29//:proc_macro2",
+        "@vendor__quote-1.0.9//:quote",
+        "@vendor__syn-1.0.76//:build_script_build",
+        "@vendor__unicode-xid-0.2.2//:unicode_xid",
+    ],
+)
+
+cargo_build_script(
+    name = "_bs",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            "**/*.rs",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "clone-impls",
+        "default",
+        "derive",
+        "parsing",
+        "printing",
+        "proc-macro",
+        "quote",
+    ],
+    crate_name = "build_script_build",
+    crate_root = "build.rs",
+    data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    edition = "2018",
+    pkg_name = "syn",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=syn",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    version = "1.0.76",
+    visibility = ["//visibility:private"],
+)
+
+alias(
+    name = "build_script_build",
+    actual = ":_bs",
+    tags = ["manual"],
+)
diff --git a/misc/bazel/3rdparty/py_deps/BUILD.textwrap-0.11.0.bazel b/misc/bazel/3rdparty/py_deps/BUILD.textwrap-0.11.0.bazel
new file mode 100644
index 00000000000..3baaf0dceb0
--- /dev/null
+++ b/misc/bazel/3rdparty/py_deps/BUILD.textwrap-0.11.0.bazel
@@ -0,0 +1,84 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_py_deps
+###############################################################################
+
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "textwrap",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2015",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=textwrap",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.11.0",
+    deps = [
+        "@vendor__unicode-width-0.1.8//:unicode_width",
+    ],
+)
diff --git a/misc/bazel/3rdparty/py_deps/BUILD.thiserror-1.0.29.bazel b/misc/bazel/3rdparty/py_deps/BUILD.thiserror-1.0.29.bazel
new file mode 100644
index 00000000000..2626c050ee1
--- /dev/null
+++ b/misc/bazel/3rdparty/py_deps/BUILD.thiserror-1.0.29.bazel
@@ -0,0 +1,84 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_py_deps
+###############################################################################
+
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "thiserror",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2018",
+    proc_macro_deps = [
+        "@vendor__thiserror-impl-1.0.29//:thiserror_impl",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=thiserror",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "1.0.29",
+)
diff --git a/misc/bazel/3rdparty/py_deps/BUILD.thiserror-impl-1.0.29.bazel b/misc/bazel/3rdparty/py_deps/BUILD.thiserror-impl-1.0.29.bazel
new file mode 100644
index 00000000000..917cceb5802
--- /dev/null
+++ b/misc/bazel/3rdparty/py_deps/BUILD.thiserror-impl-1.0.29.bazel
@@ -0,0 +1,86 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_py_deps
+###############################################################################
+
+load("@rules_rust//rust:defs.bzl", "rust_proc_macro")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_proc_macro(
+    name = "thiserror_impl",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2018",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=thiserror-impl",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "1.0.29",
+    deps = [
+        "@vendor__proc-macro2-1.0.29//:proc_macro2",
+        "@vendor__quote-1.0.9//:quote",
+        "@vendor__syn-1.0.76//:syn",
+    ],
+)
diff --git a/misc/bazel/3rdparty/py_deps/BUILD.tree-sitter-0.20.4.bazel b/misc/bazel/3rdparty/py_deps/BUILD.tree-sitter-0.20.4.bazel
new file mode 100644
index 00000000000..d376a52bb1f
--- /dev/null
+++ b/misc/bazel/3rdparty/py_deps/BUILD.tree-sitter-0.20.4.bazel
@@ -0,0 +1,144 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_py_deps
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_build_script")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "tree_sitter",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "binding_rust/lib.rs",
+    edition = "2018",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=tree-sitter",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.20.4",
+    deps = [
+        "@vendor__regex-1.5.5//:regex",
+        "@vendor__tree-sitter-0.20.4//:build_script_build",
+    ],
+)
+
+cargo_build_script(
+    name = "_bs",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            "**/*.rs",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_name = "build_script_build",
+    crate_root = "binding_rust/build.rs",
+    data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    edition = "2018",
+    pkg_name = "tree-sitter",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=tree-sitter",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    version = "0.20.4",
+    visibility = ["//visibility:private"],
+    deps = [
+        "@vendor__cc-1.0.70//:cc",
+    ],
+)
+
+alias(
+    name = "build_script_build",
+    actual = ":_bs",
+    tags = ["manual"],
+)
diff --git a/misc/bazel/3rdparty/py_deps/BUILD.tree-sitter-graph-0.7.0.bazel b/misc/bazel/3rdparty/py_deps/BUILD.tree-sitter-graph-0.7.0.bazel
new file mode 100644
index 00000000000..e56c2d770e2
--- /dev/null
+++ b/misc/bazel/3rdparty/py_deps/BUILD.tree-sitter-graph-0.7.0.bazel
@@ -0,0 +1,91 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_py_deps
+###############################################################################
+
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "tree_sitter_graph",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2018",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=tree-sitter-graph",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.7.0",
+    deps = [
+        "@vendor__log-0.4.14//:log",
+        "@vendor__regex-1.5.5//:regex",
+        "@vendor__serde-1.0.136//:serde",
+        "@vendor__serde_json-1.0.79//:serde_json",
+        "@vendor__smallvec-1.6.1//:smallvec",
+        "@vendor__string-interner-0.12.2//:string_interner",
+        "@vendor__thiserror-1.0.29//:thiserror",
+        "@vendor__tree-sitter-0.20.4//:tree_sitter",
+    ],
+)
diff --git a/misc/bazel/3rdparty/py_deps/BUILD.unicode-width-0.1.8.bazel b/misc/bazel/3rdparty/py_deps/BUILD.unicode-width-0.1.8.bazel
new file mode 100644
index 00000000000..c3d0dde9e2e
--- /dev/null
+++ b/misc/bazel/3rdparty/py_deps/BUILD.unicode-width-0.1.8.bazel
@@ -0,0 +1,84 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_py_deps
+###############################################################################
+
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "unicode_width",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "default",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2015",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=unicode-width",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.1.8",
+)
diff --git a/misc/bazel/3rdparty/py_deps/BUILD.unicode-xid-0.2.2.bazel b/misc/bazel/3rdparty/py_deps/BUILD.unicode-xid-0.2.2.bazel
new file mode 100644
index 00000000000..283e2c1935c
--- /dev/null
+++ b/misc/bazel/3rdparty/py_deps/BUILD.unicode-xid-0.2.2.bazel
@@ -0,0 +1,84 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_py_deps
+###############################################################################
+
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "unicode_xid",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "default",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2015",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=unicode-xid",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.2.2",
+)
diff --git a/misc/bazel/3rdparty/py_deps/BUILD.vec_map-0.8.2.bazel b/misc/bazel/3rdparty/py_deps/BUILD.vec_map-0.8.2.bazel
new file mode 100644
index 00000000000..72bfd540ebb
--- /dev/null
+++ b/misc/bazel/3rdparty/py_deps/BUILD.vec_map-0.8.2.bazel
@@ -0,0 +1,81 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_py_deps
+###############################################################################
+
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "vec_map",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2015",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=vec_map",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.8.2",
+)
diff --git a/misc/bazel/3rdparty/py_deps/BUILD.winapi-0.3.9.bazel b/misc/bazel/3rdparty/py_deps/BUILD.winapi-0.3.9.bazel
new file mode 100644
index 00000000000..5f52e06a20e
--- /dev/null
+++ b/misc/bazel/3rdparty/py_deps/BUILD.winapi-0.3.9.bazel
@@ -0,0 +1,154 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_py_deps
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_build_script")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "winapi",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "consoleapi",
+        "minwinbase",
+        "minwindef",
+        "processenv",
+        "winbase",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2015",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=winapi",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.3.9",
+    deps = [
+        "@vendor__winapi-0.3.9//:build_script_build",
+    ],
+)
+
+cargo_build_script(
+    name = "_bs",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            "**/*.rs",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "consoleapi",
+        "minwinbase",
+        "minwindef",
+        "processenv",
+        "winbase",
+    ],
+    crate_name = "build_script_build",
+    crate_root = "build.rs",
+    data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    edition = "2015",
+    pkg_name = "winapi",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=winapi",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    version = "0.3.9",
+    visibility = ["//visibility:private"],
+)
+
+alias(
+    name = "build_script_build",
+    actual = ":_bs",
+    tags = ["manual"],
+)
diff --git a/misc/bazel/3rdparty/py_deps/BUILD.winapi-i686-pc-windows-gnu-0.4.0.bazel b/misc/bazel/3rdparty/py_deps/BUILD.winapi-i686-pc-windows-gnu-0.4.0.bazel
new file mode 100644
index 00000000000..c2ae7180997
--- /dev/null
+++ b/misc/bazel/3rdparty/py_deps/BUILD.winapi-i686-pc-windows-gnu-0.4.0.bazel
@@ -0,0 +1,140 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_py_deps
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_build_script")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "winapi_i686_pc_windows_gnu",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2015",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=winapi-i686-pc-windows-gnu",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.4.0",
+    deps = [
+        "@vendor__winapi-i686-pc-windows-gnu-0.4.0//:build_script_build",
+    ],
+)
+
+cargo_build_script(
+    name = "_bs",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            "**/*.rs",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_name = "build_script_build",
+    crate_root = "build.rs",
+    data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    edition = "2015",
+    pkg_name = "winapi-i686-pc-windows-gnu",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=winapi-i686-pc-windows-gnu",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    version = "0.4.0",
+    visibility = ["//visibility:private"],
+)
+
+alias(
+    name = "build_script_build",
+    actual = ":_bs",
+    tags = ["manual"],
+)
diff --git a/misc/bazel/3rdparty/py_deps/BUILD.winapi-x86_64-pc-windows-gnu-0.4.0.bazel b/misc/bazel/3rdparty/py_deps/BUILD.winapi-x86_64-pc-windows-gnu-0.4.0.bazel
new file mode 100644
index 00000000000..9ed3ad67a08
--- /dev/null
+++ b/misc/bazel/3rdparty/py_deps/BUILD.winapi-x86_64-pc-windows-gnu-0.4.0.bazel
@@ -0,0 +1,140 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_py_deps
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_build_script")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "winapi_x86_64_pc_windows_gnu",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2015",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=winapi-x86_64-pc-windows-gnu",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.4.0",
+    deps = [
+        "@vendor__winapi-x86_64-pc-windows-gnu-0.4.0//:build_script_build",
+    ],
+)
+
+cargo_build_script(
+    name = "_bs",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            "**/*.rs",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_name = "build_script_build",
+    crate_root = "build.rs",
+    data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    edition = "2015",
+    pkg_name = "winapi-x86_64-pc-windows-gnu",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=winapi-x86_64-pc-windows-gnu",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    version = "0.4.0",
+    visibility = ["//visibility:private"],
+)
+
+alias(
+    name = "build_script_build",
+    actual = ":_bs",
+    tags = ["manual"],
+)
diff --git a/misc/bazel/3rdparty/py_deps/alias_rules.bzl b/misc/bazel/3rdparty/py_deps/alias_rules.bzl
new file mode 100644
index 00000000000..14b04c12728
--- /dev/null
+++ b/misc/bazel/3rdparty/py_deps/alias_rules.bzl
@@ -0,0 +1,47 @@
+"""Alias that transitions its target to `compilation_mode=opt`.  Use `transition_alias="opt"` to enable."""
+
+load("@rules_cc//cc:defs.bzl", "CcInfo")
+load("@rules_rust//rust:rust_common.bzl", "COMMON_PROVIDERS")
+
+def _transition_alias_impl(ctx):
+    # `ctx.attr.actual` is a list of 1 item due to the transition
+    providers = [ctx.attr.actual[0][provider] for provider in COMMON_PROVIDERS]
+    if CcInfo in ctx.attr.actual[0]:
+        providers.append(ctx.attr.actual[0][CcInfo])
+    return providers
+
+def _change_compilation_mode(compilation_mode):
+    def _change_compilation_mode_impl(_settings, _attr):
+        return {
+            "//command_line_option:compilation_mode": compilation_mode,
+        }
+
+    return transition(
+        implementation = _change_compilation_mode_impl,
+        inputs = [],
+        outputs = [
+            "//command_line_option:compilation_mode",
+        ],
+    )
+
+def _transition_alias_rule(compilation_mode):
+    return rule(
+        implementation = _transition_alias_impl,
+        provides = COMMON_PROVIDERS,
+        attrs = {
+            "actual": attr.label(
+                mandatory = True,
+                doc = "`rust_library()` target to transition to `compilation_mode=opt`.",
+                providers = COMMON_PROVIDERS,
+                cfg = _change_compilation_mode(compilation_mode),
+            ),
+            "_allowlist_function_transition": attr.label(
+                default = "@bazel_tools//tools/allowlists/function_transition_allowlist",
+            ),
+        },
+        doc = "Transitions a Rust library crate to the `compilation_mode=opt`.",
+    )
+
+transition_alias_dbg = _transition_alias_rule("dbg")
+transition_alias_fastbuild = _transition_alias_rule("fastbuild")
+transition_alias_opt = _transition_alias_rule("opt")
diff --git a/misc/bazel/3rdparty/py_deps/crates.bzl b/misc/bazel/3rdparty/py_deps/crates.bzl
new file mode 100644
index 00000000000..75143f72421
--- /dev/null
+++ b/misc/bazel/3rdparty/py_deps/crates.bzl
@@ -0,0 +1,32 @@
+###############################################################################
+# @generated
+# This file is auto-generated by the cargo-bazel tool.
+#
+# DO NOT MODIFY: Local changes may be replaced in future executions.
+###############################################################################
+"""Rules for defining repositories for remote `crates_vendor` repositories"""
+
+load("@bazel_tools//tools/build_defs/repo:utils.bzl", "maybe")
+
+# buildifier: disable=bzl-visibility
+load("@rules_rust//crate_universe/private:crates_vendor.bzl", "crates_vendor_remote_repository")
+
+# buildifier: disable=bzl-visibility
+load("//misc/bazel/3rdparty/py_deps:defs.bzl", _crate_repositories = "crate_repositories")
+
+def crate_repositories():
+    """Generates repositories for vendored crates.
+
+    Returns:
+      A list of repos visible to the module through the module extension.
+    """
+    maybe(
+        crates_vendor_remote_repository,
+        name = "vendor",
+        build_file = Label("//misc/bazel/3rdparty/py_deps:BUILD.bazel"),
+        defs_module = Label("//misc/bazel/3rdparty/py_deps:defs.bzl"),
+    )
+
+    direct_deps = [struct(repo = "vendor", is_dev_dep = False)]
+    direct_deps.extend(_crate_repositories())
+    return direct_deps
diff --git a/misc/bazel/3rdparty/py_deps/defs.bzl b/misc/bazel/3rdparty/py_deps/defs.bzl
new file mode 100644
index 00000000000..4c182814eae
--- /dev/null
+++ b/misc/bazel/3rdparty/py_deps/defs.bzl
@@ -0,0 +1,832 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_py_deps
+###############################################################################
+"""
+# `crates_repository` API
+
+- [aliases](#aliases)
+- [crate_deps](#crate_deps)
+- [all_crate_deps](#all_crate_deps)
+- [crate_repositories](#crate_repositories)
+
+"""
+
+load("@bazel_skylib//lib:selects.bzl", "selects")
+load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
+load("@bazel_tools//tools/build_defs/repo:utils.bzl", "maybe")
+
+###############################################################################
+# MACROS API
+###############################################################################
+
+# An identifier that represent common dependencies (unconditional).
+_COMMON_CONDITION = ""
+
+def _flatten_dependency_maps(all_dependency_maps):
+    """Flatten a list of dependency maps into one dictionary.
+
+    Dependency maps have the following structure:
+
+    ```python
+    DEPENDENCIES_MAP = {
+        # The first key in the map is a Bazel package
+        # name of the workspace this file is defined in.
+        "workspace_member_package": {
+
+            # Not all dependencies are supported for all platforms.
+            # the condition key is the condition required to be true
+            # on the host platform.
+            "condition": {
+
+                # An alias to a crate target.     # The label of the crate target the
+                # Aliases are only crate names.   # package name refers to.
+                "package_name":                   "@full//:label",
+            }
+        }
+    }
+    ```
+
+    Args:
+        all_dependency_maps (list): A list of dicts as described above
+
+    Returns:
+        dict: A dictionary as described above
+    """
+    dependencies = {}
+
+    for workspace_deps_map in all_dependency_maps:
+        for pkg_name, conditional_deps_map in workspace_deps_map.items():
+            if pkg_name not in dependencies:
+                non_frozen_map = dict()
+                for key, values in conditional_deps_map.items():
+                    non_frozen_map.update({key: dict(values.items())})
+                dependencies.setdefault(pkg_name, non_frozen_map)
+                continue
+
+            for condition, deps_map in conditional_deps_map.items():
+                # If the condition has not been recorded, do so and continue
+                if condition not in dependencies[pkg_name]:
+                    dependencies[pkg_name].setdefault(condition, dict(deps_map.items()))
+                    continue
+
+                # Alert on any miss-matched dependencies
+                inconsistent_entries = []
+                for crate_name, crate_label in deps_map.items():
+                    existing = dependencies[pkg_name][condition].get(crate_name)
+                    if existing and existing != crate_label:
+                        inconsistent_entries.append((crate_name, existing, crate_label))
+                    dependencies[pkg_name][condition].update({crate_name: crate_label})
+
+    return dependencies
+
+def crate_deps(deps, package_name = None):
+    """Finds the fully qualified label of the requested crates for the package where this macro is called.
+
+    Args:
+        deps (list): The desired list of crate targets.
+        package_name (str, optional): The package name of the set of dependencies to look up.
+            Defaults to `native.package_name()`.
+
+    Returns:
+        list: A list of labels to generated rust targets (str)
+    """
+
+    if not deps:
+        return []
+
+    if package_name == None:
+        package_name = native.package_name()
+
+    # Join both sets of dependencies
+    dependencies = _flatten_dependency_maps([
+        _NORMAL_DEPENDENCIES,
+        _NORMAL_DEV_DEPENDENCIES,
+        _PROC_MACRO_DEPENDENCIES,
+        _PROC_MACRO_DEV_DEPENDENCIES,
+        _BUILD_DEPENDENCIES,
+        _BUILD_PROC_MACRO_DEPENDENCIES,
+    ]).pop(package_name, {})
+
+    # Combine all conditional packages so we can easily index over a flat list
+    # TODO: Perhaps this should actually return select statements and maintain
+    # the conditionals of the dependencies
+    flat_deps = {}
+    for deps_set in dependencies.values():
+        for crate_name, crate_label in deps_set.items():
+            flat_deps.update({crate_name: crate_label})
+
+    missing_crates = []
+    crate_targets = []
+    for crate_target in deps:
+        if crate_target not in flat_deps:
+            missing_crates.append(crate_target)
+        else:
+            crate_targets.append(flat_deps[crate_target])
+
+    if missing_crates:
+        fail("Could not find crates `{}` among dependencies of `{}`. Available dependencies were `{}`".format(
+            missing_crates,
+            package_name,
+            dependencies,
+        ))
+
+    return crate_targets
+
+def all_crate_deps(
+        normal = False,
+        normal_dev = False,
+        proc_macro = False,
+        proc_macro_dev = False,
+        build = False,
+        build_proc_macro = False,
+        package_name = None):
+    """Finds the fully qualified label of all requested direct crate dependencies \
+    for the package where this macro is called.
+
+    If no parameters are set, all normal dependencies are returned. Setting any one flag will
+    otherwise impact the contents of the returned list.
+
+    Args:
+        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..
+        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
+            included in the output list.
+        build (bool, optional): If True, build dependencies are included
+            in the output list.
+        build_proc_macro (bool, optional): If True, build proc_macro dependencies are
+            included in the output list.
+        package_name (str, optional): The package name of the set of dependencies to look up.
+            Defaults to `native.package_name()` when unset.
+
+    Returns:
+        list: A list of labels to generated rust targets (str)
+    """
+
+    if package_name == None:
+        package_name = native.package_name()
+
+    # Determine the relevant maps to use
+    all_dependency_maps = []
+    if normal:
+        all_dependency_maps.append(_NORMAL_DEPENDENCIES)
+    if normal_dev:
+        all_dependency_maps.append(_NORMAL_DEV_DEPENDENCIES)
+    if proc_macro:
+        all_dependency_maps.append(_PROC_MACRO_DEPENDENCIES)
+    if proc_macro_dev:
+        all_dependency_maps.append(_PROC_MACRO_DEV_DEPENDENCIES)
+    if build:
+        all_dependency_maps.append(_BUILD_DEPENDENCIES)
+    if build_proc_macro:
+        all_dependency_maps.append(_BUILD_PROC_MACRO_DEPENDENCIES)
+
+    # Default to always using normal dependencies
+    if not all_dependency_maps:
+        all_dependency_maps.append(_NORMAL_DEPENDENCIES)
+
+    dependencies = _flatten_dependency_maps(all_dependency_maps).pop(package_name, None)
+
+    if not dependencies:
+        if dependencies == None:
+            fail("Tried to get all_crate_deps for package " + package_name + " but that package had no Cargo.toml file")
+        else:
+            return []
+
+    crate_deps = list(dependencies.pop(_COMMON_CONDITION, {}).values())
+    for condition, deps in dependencies.items():
+        crate_deps += selects.with_or({
+            tuple(_CONDITIONS[condition]): deps.values(),
+            "//conditions:default": [],
+        })
+
+    return crate_deps
+
+def aliases(
+        normal = False,
+        normal_dev = False,
+        proc_macro = False,
+        proc_macro_dev = False,
+        build = False,
+        build_proc_macro = False,
+        package_name = None):
+    """Produces a map of Crate alias names to their original label
+
+    If no dependency kinds are specified, `normal` and `proc_macro` are used by default.
+    Setting any one flag will otherwise determine the contents of the returned dict.
+
+    Args:
+        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..
+        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
+            included in the output list.
+        build (bool, optional): If True, build dependencies are included
+            in the output list.
+        build_proc_macro (bool, optional): If True, build proc_macro dependencies are
+            included in the output list.
+        package_name (str, optional): The package name of the set of dependencies to look up.
+            Defaults to `native.package_name()` when unset.
+
+    Returns:
+        dict: The aliases of all associated packages
+    """
+    if package_name == None:
+        package_name = native.package_name()
+
+    # Determine the relevant maps to use
+    all_aliases_maps = []
+    if normal:
+        all_aliases_maps.append(_NORMAL_ALIASES)
+    if normal_dev:
+        all_aliases_maps.append(_NORMAL_DEV_ALIASES)
+    if proc_macro:
+        all_aliases_maps.append(_PROC_MACRO_ALIASES)
+    if proc_macro_dev:
+        all_aliases_maps.append(_PROC_MACRO_DEV_ALIASES)
+    if build:
+        all_aliases_maps.append(_BUILD_ALIASES)
+    if build_proc_macro:
+        all_aliases_maps.append(_BUILD_PROC_MACRO_ALIASES)
+
+    # Default to always using normal aliases
+    if not all_aliases_maps:
+        all_aliases_maps.append(_NORMAL_ALIASES)
+        all_aliases_maps.append(_PROC_MACRO_ALIASES)
+
+    aliases = _flatten_dependency_maps(all_aliases_maps).pop(package_name, None)
+
+    if not aliases:
+        return dict()
+
+    common_items = aliases.pop(_COMMON_CONDITION, {}).items()
+
+    # If there are only common items in the dictionary, immediately return them
+    if not len(aliases.keys()) == 1:
+        return dict(common_items)
+
+    # Build a single select statement where each conditional has accounted for the
+    # common set of aliases.
+    crate_aliases = {"//conditions:default": dict(common_items)}
+    for condition, deps in aliases.items():
+        condition_triples = _CONDITIONS[condition]
+        for triple in condition_triples:
+            if triple in crate_aliases:
+                crate_aliases[triple].update(deps)
+            else:
+                crate_aliases.update({triple: dict(deps.items() + common_items)})
+
+    return select(crate_aliases)
+
+###############################################################################
+# WORKSPACE MEMBER DEPS AND ALIASES
+###############################################################################
+
+_NORMAL_DEPENDENCIES = {
+    "python/extractor/tsg-python": {
+        _COMMON_CONDITION: {
+            "anyhow": Label("@vendor__anyhow-1.0.44//:anyhow"),
+            "clap": Label("@vendor__clap-2.33.3//:clap"),
+            "regex": Label("@vendor__regex-1.5.5//:regex"),
+            "smallvec": Label("@vendor__smallvec-1.6.1//:smallvec"),
+            "string-interner": Label("@vendor__string-interner-0.12.2//:string_interner"),
+            "thiserror": Label("@vendor__thiserror-1.0.29//:thiserror"),
+            "tree-sitter": Label("@vendor__tree-sitter-0.20.4//:tree_sitter"),
+            "tree-sitter-graph": Label("@vendor__tree-sitter-graph-0.7.0//:tree_sitter_graph"),
+        },
+    },
+    "python/extractor/tsg-python/tsp": {
+        _COMMON_CONDITION: {
+            "tree-sitter": Label("@vendor__tree-sitter-0.20.4//:tree_sitter"),
+        },
+    },
+}
+
+_NORMAL_ALIASES = {
+    "python/extractor/tsg-python": {
+        _COMMON_CONDITION: {
+        },
+    },
+    "python/extractor/tsg-python/tsp": {
+        _COMMON_CONDITION: {
+        },
+    },
+}
+
+_NORMAL_DEV_DEPENDENCIES = {
+    "python/extractor/tsg-python": {
+    },
+    "python/extractor/tsg-python/tsp": {
+    },
+}
+
+_NORMAL_DEV_ALIASES = {
+    "python/extractor/tsg-python": {
+    },
+    "python/extractor/tsg-python/tsp": {
+    },
+}
+
+_PROC_MACRO_DEPENDENCIES = {
+    "python/extractor/tsg-python": {
+    },
+    "python/extractor/tsg-python/tsp": {
+    },
+}
+
+_PROC_MACRO_ALIASES = {
+    "python/extractor/tsg-python": {
+    },
+    "python/extractor/tsg-python/tsp": {
+    },
+}
+
+_PROC_MACRO_DEV_DEPENDENCIES = {
+    "python/extractor/tsg-python": {
+    },
+    "python/extractor/tsg-python/tsp": {
+    },
+}
+
+_PROC_MACRO_DEV_ALIASES = {
+    "python/extractor/tsg-python": {
+    },
+    "python/extractor/tsg-python/tsp": {
+    },
+}
+
+_BUILD_DEPENDENCIES = {
+    "python/extractor/tsg-python": {
+    },
+    "python/extractor/tsg-python/tsp": {
+        _COMMON_CONDITION: {
+            "cc": Label("@vendor__cc-1.0.70//:cc"),
+        },
+    },
+}
+
+_BUILD_ALIASES = {
+    "python/extractor/tsg-python": {
+    },
+    "python/extractor/tsg-python/tsp": {
+        _COMMON_CONDITION: {
+        },
+    },
+}
+
+_BUILD_PROC_MACRO_DEPENDENCIES = {
+    "python/extractor/tsg-python": {
+    },
+    "python/extractor/tsg-python/tsp": {
+    },
+}
+
+_BUILD_PROC_MACRO_ALIASES = {
+    "python/extractor/tsg-python": {
+    },
+    "python/extractor/tsg-python/tsp": {
+    },
+}
+
+_CONDITIONS = {
+    "aarch64-apple-darwin": ["@rules_rust//rust/platform:aarch64-apple-darwin"],
+    "aarch64-apple-ios": ["@rules_rust//rust/platform:aarch64-apple-ios"],
+    "aarch64-apple-ios-sim": ["@rules_rust//rust/platform:aarch64-apple-ios-sim"],
+    "aarch64-fuchsia": ["@rules_rust//rust/platform:aarch64-fuchsia"],
+    "aarch64-linux-android": ["@rules_rust//rust/platform:aarch64-linux-android"],
+    "aarch64-pc-windows-msvc": ["@rules_rust//rust/platform:aarch64-pc-windows-msvc"],
+    "aarch64-unknown-linux-gnu": ["@rules_rust//rust/platform:aarch64-unknown-linux-gnu", "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu"],
+    "aarch64-unknown-nixos-gnu": ["@rules_rust//rust/platform:aarch64-unknown-nixos-gnu"],
+    "aarch64-unknown-nto-qnx710": ["@rules_rust//rust/platform:aarch64-unknown-nto-qnx710"],
+    "arm-unknown-linux-gnueabi": ["@rules_rust//rust/platform:arm-unknown-linux-gnueabi"],
+    "armv7-linux-androideabi": ["@rules_rust//rust/platform:armv7-linux-androideabi"],
+    "armv7-unknown-linux-gnueabi": ["@rules_rust//rust/platform:armv7-unknown-linux-gnueabi"],
+    "cfg(target_os = \"hermit\")": [],
+    "cfg(target_os = \"windows\")": ["@rules_rust//rust/platform:aarch64-pc-windows-msvc", "@rules_rust//rust/platform:i686-pc-windows-msvc", "@rules_rust//rust/platform:x86_64-pc-windows-msvc"],
+    "cfg(unix)": ["@rules_rust//rust/platform:aarch64-apple-darwin", "@rules_rust//rust/platform:aarch64-apple-ios", "@rules_rust//rust/platform:aarch64-apple-ios-sim", "@rules_rust//rust/platform:aarch64-fuchsia", "@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:aarch64-unknown-nto-qnx710", "@rules_rust//rust/platform:arm-unknown-linux-gnueabi", "@rules_rust//rust/platform:armv7-linux-androideabi", "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi", "@rules_rust//rust/platform:i686-apple-darwin", "@rules_rust//rust/platform:i686-linux-android", "@rules_rust//rust/platform:i686-unknown-freebsd", "@rules_rust//rust/platform:i686-unknown-linux-gnu", "@rules_rust//rust/platform:powerpc-unknown-linux-gnu", "@rules_rust//rust/platform:s390x-unknown-linux-gnu", "@rules_rust//rust/platform:x86_64-apple-darwin", "@rules_rust//rust/platform:x86_64-apple-ios", "@rules_rust//rust/platform:x86_64-fuchsia", "@rules_rust//rust/platform:x86_64-linux-android", "@rules_rust//rust/platform:x86_64-unknown-freebsd", "@rules_rust//rust/platform:x86_64-unknown-linux-gnu", "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu"],
+    "cfg(windows)": ["@rules_rust//rust/platform:aarch64-pc-windows-msvc", "@rules_rust//rust/platform:i686-pc-windows-msvc", "@rules_rust//rust/platform:x86_64-pc-windows-msvc"],
+    "i686-apple-darwin": ["@rules_rust//rust/platform:i686-apple-darwin"],
+    "i686-linux-android": ["@rules_rust//rust/platform:i686-linux-android"],
+    "i686-pc-windows-gnu": [],
+    "i686-pc-windows-msvc": ["@rules_rust//rust/platform:i686-pc-windows-msvc"],
+    "i686-unknown-freebsd": ["@rules_rust//rust/platform:i686-unknown-freebsd"],
+    "i686-unknown-linux-gnu": ["@rules_rust//rust/platform:i686-unknown-linux-gnu"],
+    "powerpc-unknown-linux-gnu": ["@rules_rust//rust/platform:powerpc-unknown-linux-gnu"],
+    "riscv32imc-unknown-none-elf": ["@rules_rust//rust/platform:riscv32imc-unknown-none-elf"],
+    "riscv64gc-unknown-none-elf": ["@rules_rust//rust/platform:riscv64gc-unknown-none-elf"],
+    "s390x-unknown-linux-gnu": ["@rules_rust//rust/platform:s390x-unknown-linux-gnu"],
+    "thumbv7em-none-eabi": ["@rules_rust//rust/platform:thumbv7em-none-eabi"],
+    "thumbv8m.main-none-eabi": ["@rules_rust//rust/platform:thumbv8m.main-none-eabi"],
+    "wasm32-unknown-unknown": ["@rules_rust//rust/platform:wasm32-unknown-unknown"],
+    "wasm32-wasi": ["@rules_rust//rust/platform:wasm32-wasi"],
+    "x86_64-apple-darwin": ["@rules_rust//rust/platform:x86_64-apple-darwin"],
+    "x86_64-apple-ios": ["@rules_rust//rust/platform:x86_64-apple-ios"],
+    "x86_64-fuchsia": ["@rules_rust//rust/platform:x86_64-fuchsia"],
+    "x86_64-linux-android": ["@rules_rust//rust/platform:x86_64-linux-android"],
+    "x86_64-pc-windows-gnu": [],
+    "x86_64-pc-windows-msvc": ["@rules_rust//rust/platform:x86_64-pc-windows-msvc"],
+    "x86_64-unknown-freebsd": ["@rules_rust//rust/platform:x86_64-unknown-freebsd"],
+    "x86_64-unknown-linux-gnu": ["@rules_rust//rust/platform:x86_64-unknown-linux-gnu", "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu"],
+    "x86_64-unknown-nixos-gnu": ["@rules_rust//rust/platform:x86_64-unknown-nixos-gnu"],
+    "x86_64-unknown-none": ["@rules_rust//rust/platform:x86_64-unknown-none"],
+}
+
+###############################################################################
+
+def crate_repositories():
+    """A macro for defining repositories for all generated crates.
+
+    Returns:
+      A list of repos visible to the module through the module extension.
+    """
+    maybe(
+        http_archive,
+        name = "vendor__ahash-0.4.7",
+        sha256 = "739f4a8db6605981345c5654f3a85b056ce52f37a39d34da03f25bf2151ea16e",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/ahash/0.4.7/download"],
+        strip_prefix = "ahash-0.4.7",
+        build_file = Label("//misc/bazel/3rdparty/py_deps:BUILD.ahash-0.4.7.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__aho-corasick-0.7.18",
+        sha256 = "1e37cfd5e7657ada45f742d6e99ca5788580b5c529dc78faf11ece6dc702656f",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/aho-corasick/0.7.18/download"],
+        strip_prefix = "aho-corasick-0.7.18",
+        build_file = Label("//misc/bazel/3rdparty/py_deps:BUILD.aho-corasick-0.7.18.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__ansi_term-0.11.0",
+        sha256 = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/ansi_term/0.11.0/download"],
+        strip_prefix = "ansi_term-0.11.0",
+        build_file = Label("//misc/bazel/3rdparty/py_deps:BUILD.ansi_term-0.11.0.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__anyhow-1.0.44",
+        sha256 = "61604a8f862e1d5c3229fdd78f8b02c68dcf73a4c4b05fd636d12240aaa242c1",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/anyhow/1.0.44/download"],
+        strip_prefix = "anyhow-1.0.44",
+        build_file = Label("//misc/bazel/3rdparty/py_deps:BUILD.anyhow-1.0.44.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__atty-0.2.14",
+        sha256 = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/atty/0.2.14/download"],
+        strip_prefix = "atty-0.2.14",
+        build_file = Label("//misc/bazel/3rdparty/py_deps:BUILD.atty-0.2.14.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__bitflags-1.3.2",
+        sha256 = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/bitflags/1.3.2/download"],
+        strip_prefix = "bitflags-1.3.2",
+        build_file = Label("//misc/bazel/3rdparty/py_deps:BUILD.bitflags-1.3.2.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__cc-1.0.70",
+        sha256 = "d26a6ce4b6a484fa3edb70f7efa6fc430fd2b87285fe8b84304fd0936faa0dc0",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/cc/1.0.70/download"],
+        strip_prefix = "cc-1.0.70",
+        build_file = Label("//misc/bazel/3rdparty/py_deps:BUILD.cc-1.0.70.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__cfg-if-1.0.0",
+        sha256 = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/cfg-if/1.0.0/download"],
+        strip_prefix = "cfg-if-1.0.0",
+        build_file = Label("//misc/bazel/3rdparty/py_deps:BUILD.cfg-if-1.0.0.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__clap-2.33.3",
+        sha256 = "37e58ac78573c40708d45522f0d80fa2f01cc4f9b4e2bf749807255454312002",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/clap/2.33.3/download"],
+        strip_prefix = "clap-2.33.3",
+        build_file = Label("//misc/bazel/3rdparty/py_deps:BUILD.clap-2.33.3.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__hashbrown-0.9.1",
+        sha256 = "d7afe4a420e3fe79967a00898cc1f4db7c8a49a9333a29f8a4bd76a253d5cd04",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/hashbrown/0.9.1/download"],
+        strip_prefix = "hashbrown-0.9.1",
+        build_file = Label("//misc/bazel/3rdparty/py_deps:BUILD.hashbrown-0.9.1.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__hermit-abi-0.1.19",
+        sha256 = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/hermit-abi/0.1.19/download"],
+        strip_prefix = "hermit-abi-0.1.19",
+        build_file = Label("//misc/bazel/3rdparty/py_deps:BUILD.hermit-abi-0.1.19.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__itoa-1.0.1",
+        sha256 = "1aab8fc367588b89dcee83ab0fd66b72b50b72fa1904d7095045ace2b0c81c35",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/itoa/1.0.1/download"],
+        strip_prefix = "itoa-1.0.1",
+        build_file = Label("//misc/bazel/3rdparty/py_deps:BUILD.itoa-1.0.1.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__libc-0.2.101",
+        sha256 = "3cb00336871be5ed2c8ed44b60ae9959dc5b9f08539422ed43f09e34ecaeba21",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/libc/0.2.101/download"],
+        strip_prefix = "libc-0.2.101",
+        build_file = Label("//misc/bazel/3rdparty/py_deps:BUILD.libc-0.2.101.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__log-0.4.14",
+        sha256 = "51b9bbe6c47d51fc3e1a9b945965946b4c44142ab8792c50835a980d362c2710",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/log/0.4.14/download"],
+        strip_prefix = "log-0.4.14",
+        build_file = Label("//misc/bazel/3rdparty/py_deps:BUILD.log-0.4.14.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__memchr-2.4.1",
+        sha256 = "308cc39be01b73d0d18f82a0e7b2a3df85245f84af96fdddc5d202d27e47b86a",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/memchr/2.4.1/download"],
+        strip_prefix = "memchr-2.4.1",
+        build_file = Label("//misc/bazel/3rdparty/py_deps:BUILD.memchr-2.4.1.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__proc-macro2-1.0.29",
+        sha256 = "b9f5105d4fdaab20335ca9565e106a5d9b82b6219b5ba735731124ac6711d23d",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/proc-macro2/1.0.29/download"],
+        strip_prefix = "proc-macro2-1.0.29",
+        build_file = Label("//misc/bazel/3rdparty/py_deps:BUILD.proc-macro2-1.0.29.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__quote-1.0.9",
+        sha256 = "c3d0b9745dc2debf507c8422de05d7226cc1f0644216dfdfead988f9b1ab32a7",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/quote/1.0.9/download"],
+        strip_prefix = "quote-1.0.9",
+        build_file = Label("//misc/bazel/3rdparty/py_deps:BUILD.quote-1.0.9.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__regex-1.5.5",
+        sha256 = "1a11647b6b25ff05a515cb92c365cec08801e83423a235b51e231e1808747286",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/regex/1.5.5/download"],
+        strip_prefix = "regex-1.5.5",
+        build_file = Label("//misc/bazel/3rdparty/py_deps:BUILD.regex-1.5.5.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__regex-syntax-0.6.25",
+        sha256 = "f497285884f3fcff424ffc933e56d7cbca511def0c9831a7f9b5f6153e3cc89b",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/regex-syntax/0.6.25/download"],
+        strip_prefix = "regex-syntax-0.6.25",
+        build_file = Label("//misc/bazel/3rdparty/py_deps:BUILD.regex-syntax-0.6.25.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__ryu-1.0.9",
+        sha256 = "73b4b750c782965c211b42f022f59af1fbceabdd026623714f104152f1ec149f",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/ryu/1.0.9/download"],
+        strip_prefix = "ryu-1.0.9",
+        build_file = Label("//misc/bazel/3rdparty/py_deps:BUILD.ryu-1.0.9.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__serde-1.0.136",
+        sha256 = "ce31e24b01e1e524df96f1c2fdd054405f8d7376249a5110886fb4b658484789",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/serde/1.0.136/download"],
+        strip_prefix = "serde-1.0.136",
+        build_file = Label("//misc/bazel/3rdparty/py_deps:BUILD.serde-1.0.136.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__serde_json-1.0.79",
+        sha256 = "8e8d9fa5c3b304765ce1fd9c4c8a3de2c8db365a5b91be52f186efc675681d95",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/serde_json/1.0.79/download"],
+        strip_prefix = "serde_json-1.0.79",
+        build_file = Label("//misc/bazel/3rdparty/py_deps:BUILD.serde_json-1.0.79.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__smallvec-1.6.1",
+        sha256 = "fe0f37c9e8f3c5a4a66ad655a93c74daac4ad00c441533bf5c6e7990bb42604e",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/smallvec/1.6.1/download"],
+        strip_prefix = "smallvec-1.6.1",
+        build_file = Label("//misc/bazel/3rdparty/py_deps:BUILD.smallvec-1.6.1.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__string-interner-0.12.2",
+        sha256 = "383196d1876517ee6f9f0864d1fc1070331b803335d3c6daaa04bbcccd823c08",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/string-interner/0.12.2/download"],
+        strip_prefix = "string-interner-0.12.2",
+        build_file = Label("//misc/bazel/3rdparty/py_deps:BUILD.string-interner-0.12.2.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__strsim-0.8.0",
+        sha256 = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/strsim/0.8.0/download"],
+        strip_prefix = "strsim-0.8.0",
+        build_file = Label("//misc/bazel/3rdparty/py_deps:BUILD.strsim-0.8.0.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__syn-1.0.76",
+        sha256 = "c6f107db402c2c2055242dbf4d2af0e69197202e9faacbef9571bbe47f5a1b84",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/syn/1.0.76/download"],
+        strip_prefix = "syn-1.0.76",
+        build_file = Label("//misc/bazel/3rdparty/py_deps:BUILD.syn-1.0.76.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__textwrap-0.11.0",
+        sha256 = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/textwrap/0.11.0/download"],
+        strip_prefix = "textwrap-0.11.0",
+        build_file = Label("//misc/bazel/3rdparty/py_deps:BUILD.textwrap-0.11.0.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__thiserror-1.0.29",
+        sha256 = "602eca064b2d83369e2b2f34b09c70b605402801927c65c11071ac911d299b88",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/thiserror/1.0.29/download"],
+        strip_prefix = "thiserror-1.0.29",
+        build_file = Label("//misc/bazel/3rdparty/py_deps:BUILD.thiserror-1.0.29.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__thiserror-impl-1.0.29",
+        sha256 = "bad553cc2c78e8de258400763a647e80e6d1b31ee237275d756f6836d204494c",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/thiserror-impl/1.0.29/download"],
+        strip_prefix = "thiserror-impl-1.0.29",
+        build_file = Label("//misc/bazel/3rdparty/py_deps:BUILD.thiserror-impl-1.0.29.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__tree-sitter-0.20.4",
+        sha256 = "4e34327f8eac545e3f037382471b2b19367725a242bba7bc45edb9efb49fe39a",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/tree-sitter/0.20.4/download"],
+        strip_prefix = "tree-sitter-0.20.4",
+        build_file = Label("//misc/bazel/3rdparty/py_deps:BUILD.tree-sitter-0.20.4.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__tree-sitter-graph-0.7.0",
+        sha256 = "639d21e886f581d293de5f5081f09af003c54607ff3fa85efa159b243ba1f97a",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/tree-sitter-graph/0.7.0/download"],
+        strip_prefix = "tree-sitter-graph-0.7.0",
+        build_file = Label("//misc/bazel/3rdparty/py_deps:BUILD.tree-sitter-graph-0.7.0.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__unicode-width-0.1.8",
+        sha256 = "9337591893a19b88d8d87f2cec1e73fad5cdfd10e5a6f349f498ad6ea2ffb1e3",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/unicode-width/0.1.8/download"],
+        strip_prefix = "unicode-width-0.1.8",
+        build_file = Label("//misc/bazel/3rdparty/py_deps:BUILD.unicode-width-0.1.8.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__unicode-xid-0.2.2",
+        sha256 = "8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/unicode-xid/0.2.2/download"],
+        strip_prefix = "unicode-xid-0.2.2",
+        build_file = Label("//misc/bazel/3rdparty/py_deps:BUILD.unicode-xid-0.2.2.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__vec_map-0.8.2",
+        sha256 = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/vec_map/0.8.2/download"],
+        strip_prefix = "vec_map-0.8.2",
+        build_file = Label("//misc/bazel/3rdparty/py_deps:BUILD.vec_map-0.8.2.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__winapi-0.3.9",
+        sha256 = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/winapi/0.3.9/download"],
+        strip_prefix = "winapi-0.3.9",
+        build_file = Label("//misc/bazel/3rdparty/py_deps:BUILD.winapi-0.3.9.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__winapi-i686-pc-windows-gnu-0.4.0",
+        sha256 = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/winapi-i686-pc-windows-gnu/0.4.0/download"],
+        strip_prefix = "winapi-i686-pc-windows-gnu-0.4.0",
+        build_file = Label("//misc/bazel/3rdparty/py_deps:BUILD.winapi-i686-pc-windows-gnu-0.4.0.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__winapi-x86_64-pc-windows-gnu-0.4.0",
+        sha256 = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download"],
+        strip_prefix = "winapi-x86_64-pc-windows-gnu-0.4.0",
+        build_file = Label("//misc/bazel/3rdparty/py_deps:BUILD.winapi-x86_64-pc-windows-gnu-0.4.0.bazel"),
+    )
+
+    return [
+        struct(repo = "vendor__anyhow-1.0.44", is_dev_dep = False),
+        struct(repo = "vendor__cc-1.0.70", is_dev_dep = False),
+        struct(repo = "vendor__clap-2.33.3", is_dev_dep = False),
+        struct(repo = "vendor__regex-1.5.5", is_dev_dep = False),
+        struct(repo = "vendor__smallvec-1.6.1", is_dev_dep = False),
+        struct(repo = "vendor__string-interner-0.12.2", is_dev_dep = False),
+        struct(repo = "vendor__thiserror-1.0.29", is_dev_dep = False),
+        struct(repo = "vendor__tree-sitter-0.20.4", is_dev_dep = False),
+        struct(repo = "vendor__tree-sitter-graph-0.7.0", is_dev_dep = False),
+    ]
diff --git a/misc/bazel/3rdparty/py_deps_extension.bzl b/misc/bazel/3rdparty/py_deps_extension.bzl
new file mode 100644
index 00000000000..10541df3530
--- /dev/null
+++ b/misc/bazel/3rdparty/py_deps_extension.bzl
@@ -0,0 +1,15 @@
+"""Module extensions for using vendored crates with bzlmod"""
+
+load("//misc/bazel/3rdparty/py_deps:defs.bzl", _crate_repositories = "crate_repositories")
+
+def _crate_repositories_impl(module_ctx):
+    direct_deps = _crate_repositories()
+    return module_ctx.extension_metadata(
+        root_module_direct_deps = [repo.repo for repo in direct_deps],
+        root_module_direct_dev_deps = [],
+    )
+
+# short name to address Windows path length issues
+p = module_extension(
+    implementation = _crate_repositories_impl,
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.adler2-2.0.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.adler2-2.0.0.bazel
new file mode 100644
index 00000000000..fb71634251c
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.adler2-2.0.0.bazel
@@ -0,0 +1,81 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "adler2",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=adler2",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "2.0.0",
+)
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
new file mode 100644
index 00000000000..f1610817cd6
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.aho-corasick-1.1.3.bazel
@@ -0,0 +1,89 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "aho_corasick",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "default",
+        "perf-literal",
+        "std",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=aho-corasick",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "1.1.3",
+    deps = [
+        "@vendor__memchr-2.7.4//:memchr",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.always-assert-0.2.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.always-assert-0.2.0.bazel
new file mode 100644
index 00000000000..8fe080bd8d5
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.always-assert-0.2.0.bazel
@@ -0,0 +1,87 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "always_assert",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "tracing",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2018",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=always-assert",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.2.0",
+    deps = [
+        "@vendor__tracing-0.1.40//:tracing",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.android-tzdata-0.1.1.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.android-tzdata-0.1.1.bazel
new file mode 100644
index 00000000000..250612d4dc1
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.android-tzdata-0.1.1.bazel
@@ -0,0 +1,81 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "android_tzdata",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2018",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=android-tzdata",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.1.1",
+)
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
new file mode 100644
index 00000000000..c4200bb140b
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.android_system_properties-0.1.5.bazel
@@ -0,0 +1,84 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "android_system_properties",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2018",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=android_system_properties",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.1.5",
+    deps = [
+        "@vendor__libc-0.2.162//:libc",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.anstream-0.6.18.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.anstream-0.6.18.bazel
new file mode 100644
index 00000000000..8cf694a4fd5
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.anstream-0.6.18.bazel
@@ -0,0 +1,105 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "anstream",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "auto",
+        "default",
+        "wincon",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=anstream",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.6.18",
+    deps = [
+        "@vendor__anstyle-1.0.10//:anstyle",
+        "@vendor__anstyle-parse-0.2.6//:anstyle_parse",
+        "@vendor__anstyle-query-1.1.2//:anstyle_query",
+        "@vendor__colorchoice-1.0.3//:colorchoice",
+        "@vendor__is_terminal_polyfill-1.70.1//:is_terminal_polyfill",
+        "@vendor__utf8parse-0.2.2//:utf8parse",
+    ] + select({
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [
+            "@vendor__anstyle-wincon-3.0.6//:anstyle_wincon",  # aarch64-pc-windows-msvc
+        ],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [
+            "@vendor__anstyle-wincon-3.0.6//:anstyle_wincon",  # i686-pc-windows-msvc
+        ],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [
+            "@vendor__anstyle-wincon-3.0.6//:anstyle_wincon",  # x86_64-pc-windows-msvc
+        ],
+        "//conditions:default": [],
+    }),
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.anstyle-1.0.10.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.anstyle-1.0.10.bazel
new file mode 100644
index 00000000000..ee93802e45a
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.anstyle-1.0.10.bazel
@@ -0,0 +1,85 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "anstyle",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "default",
+        "std",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=anstyle",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "1.0.10",
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.anstyle-parse-0.2.6.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.anstyle-parse-0.2.6.bazel
new file mode 100644
index 00000000000..fab42524692
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.anstyle-parse-0.2.6.bazel
@@ -0,0 +1,88 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "anstyle_parse",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "default",
+        "utf8",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=anstyle-parse",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.2.6",
+    deps = [
+        "@vendor__utf8parse-0.2.2//:utf8parse",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.anstyle-query-1.1.2.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.anstyle-query-1.1.2.bazel
new file mode 100644
index 00000000000..86b851f5c10
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.anstyle-query-1.1.2.bazel
@@ -0,0 +1,93 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "anstyle_query",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=anstyle-query",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "1.1.2",
+    deps = select({
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [
+            "@vendor__windows-sys-0.59.0//:windows_sys",  # cfg(windows)
+        ],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [
+            "@vendor__windows-sys-0.59.0//:windows_sys",  # cfg(windows)
+        ],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [
+            "@vendor__windows-sys-0.59.0//:windows_sys",  # cfg(windows)
+        ],
+        "//conditions:default": [],
+    }),
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.anstyle-wincon-3.0.6.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.anstyle-wincon-3.0.6.bazel
new file mode 100644
index 00000000000..a06c681a1cd
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.anstyle-wincon-3.0.6.bazel
@@ -0,0 +1,95 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "anstyle_wincon",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=anstyle-wincon",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "3.0.6",
+    deps = [
+        "@vendor__anstyle-1.0.10//:anstyle",
+    ] + select({
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [
+            "@vendor__windows-sys-0.59.0//:windows_sys",  # cfg(windows)
+        ],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [
+            "@vendor__windows-sys-0.59.0//:windows_sys",  # cfg(windows)
+        ],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [
+            "@vendor__windows-sys-0.59.0//:windows_sys",  # cfg(windows)
+        ],
+        "//conditions:default": [],
+    }),
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.anyhow-1.0.93.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.anyhow-1.0.93.bazel
new file mode 100644
index 00000000000..8fee4d0ea17
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.anyhow-1.0.93.bazel
@@ -0,0 +1,148 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_build_script")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "anyhow",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "default",
+        "std",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2018",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=anyhow",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "1.0.93",
+    deps = [
+        "@vendor__anyhow-1.0.93//:build_script_build",
+    ],
+)
+
+cargo_build_script(
+    name = "_bs",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            "**/*.rs",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "default",
+        "std",
+    ],
+    crate_name = "build_script_build",
+    crate_root = "build.rs",
+    data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    edition = "2018",
+    pkg_name = "anyhow",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=anyhow",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    version = "1.0.93",
+    visibility = ["//visibility:private"],
+)
+
+alias(
+    name = "build_script_build",
+    actual = ":_bs",
+    tags = ["manual"],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.argfile-0.2.1.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.argfile-0.2.1.bazel
new file mode 100644
index 00000000000..2bdf8263cf0
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.argfile-0.2.1.bazel
@@ -0,0 +1,88 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "argfile",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "default",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=argfile",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.2.1",
+    deps = [
+        "@vendor__fs-err-2.11.0//:fs_err",
+        "@vendor__os_str_bytes-7.0.0//:os_str_bytes",
+    ],
+)
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
new file mode 100644
index 00000000000..d629043ac39
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.arrayvec-0.7.6.bazel
@@ -0,0 +1,85 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "arrayvec",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "default",
+        "std",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2018",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=arrayvec",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.7.6",
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.atomic-0.6.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.atomic-0.6.0.bazel
new file mode 100644
index 00000000000..97b44b69119
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.atomic-0.6.0.bazel
@@ -0,0 +1,88 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "atomic",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "default",
+        "fallback",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2018",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=atomic",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.6.0",
+    deps = [
+        "@vendor__bytemuck-1.19.0//:bytemuck",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.autocfg-1.4.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.autocfg-1.4.0.bazel
new file mode 100644
index 00000000000..6c33e57f909
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.autocfg-1.4.0.bazel
@@ -0,0 +1,81 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "autocfg",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2015",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=autocfg",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "1.4.0",
+)
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
new file mode 100644
index 00000000000..f6facb8c394
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.base64-0.22.1.bazel
@@ -0,0 +1,81 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "base64",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2018",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=base64",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.22.1",
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.bazel
new file mode 100644
index 00000000000..844d385f8a4
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.bazel
@@ -0,0 +1,320 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+package(default_visibility = ["//visibility:public"])
+
+exports_files(
+    [
+        "cargo-bazel.json",
+        "crates.bzl",
+        "defs.bzl",
+    ] + glob(
+        include = ["*.bazel"],
+        allow_empty = True,
+    ),
+)
+
+filegroup(
+    name = "srcs",
+    srcs = glob(
+        include = [
+            "*.bazel",
+            "*.bzl",
+        ],
+        allow_empty = True,
+    ),
+)
+
+# Workspace Member Dependencies
+alias(
+    name = "anyhow",
+    actual = "@vendor__anyhow-1.0.93//:anyhow",
+    tags = ["manual"],
+)
+
+alias(
+    name = "argfile",
+    actual = "@vendor__argfile-0.2.1//:argfile",
+    tags = ["manual"],
+)
+
+alias(
+    name = "chrono",
+    actual = "@vendor__chrono-0.4.38//:chrono",
+    tags = ["manual"],
+)
+
+alias(
+    name = "clap",
+    actual = "@vendor__clap-4.5.20//:clap",
+    tags = ["manual"],
+)
+
+alias(
+    name = "encoding",
+    actual = "@vendor__encoding-0.2.33//:encoding",
+    tags = ["manual"],
+)
+
+alias(
+    name = "figment",
+    actual = "@vendor__figment-0.10.19//:figment",
+    tags = ["manual"],
+)
+
+alias(
+    name = "flate2",
+    actual = "@vendor__flate2-1.0.34//:flate2",
+    tags = ["manual"],
+)
+
+alias(
+    name = "glob",
+    actual = "@vendor__glob-0.3.1//:glob",
+    tags = ["manual"],
+)
+
+alias(
+    name = "globset",
+    actual = "@vendor__globset-0.4.15//:globset",
+    tags = ["manual"],
+)
+
+alias(
+    name = "itertools-0.10.5",
+    actual = "@vendor__itertools-0.10.5//:itertools",
+    tags = ["manual"],
+)
+
+alias(
+    name = "itertools-0.13.0",
+    actual = "@vendor__itertools-0.13.0//:itertools",
+    tags = ["manual"],
+)
+
+alias(
+    name = "lazy_static",
+    actual = "@vendor__lazy_static-1.5.0//:lazy_static",
+    tags = ["manual"],
+)
+
+alias(
+    name = "log",
+    actual = "@vendor__log-0.4.22//:log",
+    tags = ["manual"],
+)
+
+alias(
+    name = "num-traits",
+    actual = "@vendor__num-traits-0.2.19//:num_traits",
+    tags = ["manual"],
+)
+
+alias(
+    name = "num_cpus",
+    actual = "@vendor__num_cpus-1.16.0//:num_cpus",
+    tags = ["manual"],
+)
+
+alias(
+    name = "proc-macro2",
+    actual = "@vendor__proc-macro2-1.0.89//:proc_macro2",
+    tags = ["manual"],
+)
+
+alias(
+    name = "quote",
+    actual = "@vendor__quote-1.0.37//:quote",
+    tags = ["manual"],
+)
+
+alias(
+    name = "ra_ap_base_db",
+    actual = "@vendor__ra_ap_base_db-0.0.232//:ra_ap_base_db",
+    tags = ["manual"],
+)
+
+alias(
+    name = "ra_ap_cfg",
+    actual = "@vendor__ra_ap_cfg-0.0.232//:ra_ap_cfg",
+    tags = ["manual"],
+)
+
+alias(
+    name = "ra_ap_hir",
+    actual = "@vendor__ra_ap_hir-0.0.232//:ra_ap_hir",
+    tags = ["manual"],
+)
+
+alias(
+    name = "ra_ap_hir_def",
+    actual = "@vendor__ra_ap_hir_def-0.0.232//:ra_ap_hir_def",
+    tags = ["manual"],
+)
+
+alias(
+    name = "ra_ap_hir_expand",
+    actual = "@vendor__ra_ap_hir_expand-0.0.232//:ra_ap_hir_expand",
+    tags = ["manual"],
+)
+
+alias(
+    name = "ra_ap_ide_db",
+    actual = "@vendor__ra_ap_ide_db-0.0.232//:ra_ap_ide_db",
+    tags = ["manual"],
+)
+
+alias(
+    name = "ra_ap_intern",
+    actual = "@vendor__ra_ap_intern-0.0.232//:ra_ap_intern",
+    tags = ["manual"],
+)
+
+alias(
+    name = "ra_ap_load-cargo",
+    actual = "@vendor__ra_ap_load-cargo-0.0.232//:ra_ap_load_cargo",
+    tags = ["manual"],
+)
+
+alias(
+    name = "ra_ap_parser",
+    actual = "@vendor__ra_ap_parser-0.0.232//:ra_ap_parser",
+    tags = ["manual"],
+)
+
+alias(
+    name = "ra_ap_paths",
+    actual = "@vendor__ra_ap_paths-0.0.232//:ra_ap_paths",
+    tags = ["manual"],
+)
+
+alias(
+    name = "ra_ap_project_model",
+    actual = "@vendor__ra_ap_project_model-0.0.232//:ra_ap_project_model",
+    tags = ["manual"],
+)
+
+alias(
+    name = "ra_ap_span",
+    actual = "@vendor__ra_ap_span-0.0.232//:ra_ap_span",
+    tags = ["manual"],
+)
+
+alias(
+    name = "ra_ap_syntax",
+    actual = "@vendor__ra_ap_syntax-0.0.232//:ra_ap_syntax",
+    tags = ["manual"],
+)
+
+alias(
+    name = "ra_ap_vfs",
+    actual = "@vendor__ra_ap_vfs-0.0.232//:ra_ap_vfs",
+    tags = ["manual"],
+)
+
+alias(
+    name = "rand",
+    actual = "@vendor__rand-0.8.5//:rand",
+    tags = ["manual"],
+)
+
+alias(
+    name = "rayon",
+    actual = "@vendor__rayon-1.10.0//:rayon",
+    tags = ["manual"],
+)
+
+alias(
+    name = "regex",
+    actual = "@vendor__regex-1.11.1//:regex",
+    tags = ["manual"],
+)
+
+alias(
+    name = "serde",
+    actual = "@vendor__serde-1.0.214//:serde",
+    tags = ["manual"],
+)
+
+alias(
+    name = "serde_json",
+    actual = "@vendor__serde_json-1.0.132//:serde_json",
+    tags = ["manual"],
+)
+
+alias(
+    name = "serde_with",
+    actual = "@vendor__serde_with-3.11.0//:serde_with",
+    tags = ["manual"],
+)
+
+alias(
+    name = "stderrlog",
+    actual = "@vendor__stderrlog-0.6.0//:stderrlog",
+    tags = ["manual"],
+)
+
+alias(
+    name = "syn",
+    actual = "@vendor__syn-2.0.87//:syn",
+    tags = ["manual"],
+)
+
+alias(
+    name = "tracing",
+    actual = "@vendor__tracing-0.1.40//:tracing",
+    tags = ["manual"],
+)
+
+alias(
+    name = "tracing-subscriber",
+    actual = "@vendor__tracing-subscriber-0.3.18//:tracing_subscriber",
+    tags = ["manual"],
+)
+
+alias(
+    name = "tree-sitter",
+    actual = "@vendor__tree-sitter-0.24.4//:tree_sitter",
+    tags = ["manual"],
+)
+
+alias(
+    name = "tree-sitter-embedded-template",
+    actual = "@vendor__tree-sitter-embedded-template-0.23.2//:tree_sitter_embedded_template",
+    tags = ["manual"],
+)
+
+alias(
+    name = "tree-sitter-json",
+    actual = "@vendor__tree-sitter-json-0.24.8//:tree_sitter_json",
+    tags = ["manual"],
+)
+
+alias(
+    name = "tree-sitter-ql",
+    actual = "@vendor__tree-sitter-ql-0.23.1//:tree_sitter_ql",
+    tags = ["manual"],
+)
+
+alias(
+    name = "tree-sitter-ruby",
+    actual = "@vendor__tree-sitter-ruby-0.23.1//:tree_sitter_ruby",
+    tags = ["manual"],
+)
+
+alias(
+    name = "triomphe",
+    actual = "@vendor__triomphe-0.1.14//:triomphe",
+    tags = ["manual"],
+)
+
+alias(
+    name = "ungrammar",
+    actual = "@vendor__ungrammar-1.16.1//:ungrammar",
+    tags = ["manual"],
+)
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
new file mode 100644
index 00000000000..7217327cc4f
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.bitflags-1.3.2.bazel
@@ -0,0 +1,84 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "bitflags",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "default",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2018",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=bitflags",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "1.3.2",
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.bitflags-2.6.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.bitflags-2.6.0.bazel
new file mode 100644
index 00000000000..5caba5987cd
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.bitflags-2.6.0.bazel
@@ -0,0 +1,81 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "bitflags",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=bitflags",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "2.6.0",
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.bstr-1.10.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.bstr-1.10.0.bazel
new file mode 100644
index 00000000000..4473cd6a8e9
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.bstr-1.10.0.bazel
@@ -0,0 +1,88 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "bstr",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "alloc",
+        "std",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=bstr",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "1.10.0",
+    deps = [
+        "@vendor__memchr-2.7.4//:memchr",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.bumpalo-3.16.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.bumpalo-3.16.0.bazel
new file mode 100644
index 00000000000..00e59b46437
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.bumpalo-3.16.0.bazel
@@ -0,0 +1,84 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "bumpalo",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "default",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=bumpalo",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "3.16.0",
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.bytemuck-1.19.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.bytemuck-1.19.0.bazel
new file mode 100644
index 00000000000..d401e7596ee
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.bytemuck-1.19.0.bazel
@@ -0,0 +1,81 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "bytemuck",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2018",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=bytemuck",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "1.19.0",
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.byteorder-1.5.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.byteorder-1.5.0.bazel
new file mode 100644
index 00000000000..b38b1eb7633
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.byteorder-1.5.0.bazel
@@ -0,0 +1,81 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "byteorder",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=byteorder",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "1.5.0",
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.camino-1.1.9.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.camino-1.1.9.bazel
new file mode 100644
index 00000000000..8470df3d2a3
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.camino-1.1.9.bazel
@@ -0,0 +1,149 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_build_script")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "camino",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "serde",
+        "serde1",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2018",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=camino",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "1.1.9",
+    deps = [
+        "@vendor__camino-1.1.9//:build_script_build",
+        "@vendor__serde-1.0.214//:serde",
+    ],
+)
+
+cargo_build_script(
+    name = "_bs",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            "**/*.rs",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "serde",
+        "serde1",
+    ],
+    crate_name = "build_script_build",
+    crate_root = "build.rs",
+    data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    edition = "2018",
+    pkg_name = "camino",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=camino",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    version = "1.1.9",
+    visibility = ["//visibility:private"],
+)
+
+alias(
+    name = "build_script_build",
+    actual = ":_bs",
+    tags = ["manual"],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.cargo-platform-0.1.8.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.cargo-platform-0.1.8.bazel
new file mode 100644
index 00000000000..817a4e0270d
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.cargo-platform-0.1.8.bazel
@@ -0,0 +1,84 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "cargo_platform",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=cargo-platform",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.1.8",
+    deps = [
+        "@vendor__serde-1.0.214//:serde",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.cargo_metadata-0.18.1.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.cargo_metadata-0.18.1.bazel
new file mode 100644
index 00000000000..e31c61cfac7
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.cargo_metadata-0.18.1.bazel
@@ -0,0 +1,92 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "cargo_metadata",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "default",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2018",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=cargo_metadata",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.18.1",
+    deps = [
+        "@vendor__camino-1.1.9//:camino",
+        "@vendor__cargo-platform-0.1.8//:cargo_platform",
+        "@vendor__semver-1.0.23//:semver",
+        "@vendor__serde-1.0.214//:serde",
+        "@vendor__serde_json-1.0.132//:serde_json",
+        "@vendor__thiserror-1.0.69//:thiserror",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.cc-1.1.37.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.cc-1.1.37.bazel
new file mode 100644
index 00000000000..8324309b5c8
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.cc-1.1.37.bazel
@@ -0,0 +1,84 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "cc",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2018",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=cc",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "1.1.37",
+    deps = [
+        "@vendor__shlex-1.3.0//:shlex",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.cfg-if-1.0.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.cfg-if-1.0.0.bazel
new file mode 100644
index 00000000000..31a5abe10dc
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.cfg-if-1.0.0.bazel
@@ -0,0 +1,81 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "cfg_if",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2018",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=cfg-if",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "1.0.0",
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.chalk-derive-0.98.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.chalk-derive-0.98.0.bazel
new file mode 100644
index 00000000000..525064ac249
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.chalk-derive-0.98.0.bazel
@@ -0,0 +1,87 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//rust:defs.bzl", "rust_proc_macro")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_proc_macro(
+    name = "chalk_derive",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2018",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=chalk-derive",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.98.0",
+    deps = [
+        "@vendor__proc-macro2-1.0.89//:proc_macro2",
+        "@vendor__quote-1.0.37//:quote",
+        "@vendor__syn-2.0.87//:syn",
+        "@vendor__synstructure-0.13.1//:synstructure",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.chalk-ir-0.98.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.chalk-ir-0.98.0.bazel
new file mode 100644
index 00000000000..29d3c026bd3
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.chalk-ir-0.98.0.bazel
@@ -0,0 +1,87 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "chalk_ir",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2018",
+    proc_macro_deps = [
+        "@vendor__chalk-derive-0.98.0//:chalk_derive",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=chalk-ir",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.98.0",
+    deps = [
+        "@vendor__bitflags-2.6.0//:bitflags",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.chalk-recursive-0.98.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.chalk-recursive-0.98.0.bazel
new file mode 100644
index 00000000000..139c4e0e064
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.chalk-recursive-0.98.0.bazel
@@ -0,0 +1,90 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "chalk_recursive",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2018",
+    proc_macro_deps = [
+        "@vendor__chalk-derive-0.98.0//:chalk_derive",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=chalk-recursive",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.98.0",
+    deps = [
+        "@vendor__chalk-ir-0.98.0//:chalk_ir",
+        "@vendor__chalk-solve-0.98.0//:chalk_solve",
+        "@vendor__rustc-hash-1.1.0//:rustc_hash",
+        "@vendor__tracing-0.1.40//:tracing",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.chalk-solve-0.98.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.chalk-solve-0.98.0.bazel
new file mode 100644
index 00000000000..40d8b533d2c
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.chalk-solve-0.98.0.bazel
@@ -0,0 +1,93 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "chalk_solve",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2018",
+    proc_macro_deps = [
+        "@vendor__chalk-derive-0.98.0//:chalk_derive",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=chalk-solve",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.98.0",
+    deps = [
+        "@vendor__chalk-ir-0.98.0//:chalk_ir",
+        "@vendor__ena-0.14.3//:ena",
+        "@vendor__indexmap-2.6.0//:indexmap",
+        "@vendor__itertools-0.12.1//:itertools",
+        "@vendor__petgraph-0.6.5//:petgraph",
+        "@vendor__rustc-hash-1.1.0//:rustc_hash",
+        "@vendor__tracing-0.1.40//:tracing",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.chrono-0.4.38.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.chrono-0.4.38.bazel
new file mode 100644
index 00000000000..c9de91e9284
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.chrono-0.4.38.bazel
@@ -0,0 +1,192 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "chrono",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "alloc",
+        "android-tzdata",
+        "clock",
+        "default",
+        "iana-time-zone",
+        "js-sys",
+        "now",
+        "oldtime",
+        "serde",
+        "std",
+        "wasm-bindgen",
+        "wasmbind",
+        "winapi",
+        "windows-targets",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=chrono",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.4.38",
+    deps = [
+        "@vendor__num-traits-0.2.19//:num_traits",
+        "@vendor__serde-1.0.214//:serde",
+    ] + select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [
+            "@vendor__iana-time-zone-0.1.61//:iana_time_zone",  # aarch64-apple-darwin
+        ],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [
+            "@vendor__iana-time-zone-0.1.61//:iana_time_zone",  # aarch64-apple-ios
+        ],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [
+            "@vendor__iana-time-zone-0.1.61//:iana_time_zone",  # aarch64-apple-ios-sim
+        ],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [
+            "@vendor__iana-time-zone-0.1.61//:iana_time_zone",  # aarch64-fuchsia
+        ],
+        "@rules_rust//rust/platform:aarch64-linux-android": [
+            "@vendor__android-tzdata-0.1.1//:android_tzdata",  # aarch64-linux-android
+            "@vendor__iana-time-zone-0.1.61//:iana_time_zone",  # aarch64-linux-android
+        ],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [
+            "@vendor__windows-targets-0.52.6//:windows_targets",  # aarch64-pc-windows-msvc
+        ],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [
+            "@vendor__iana-time-zone-0.1.61//:iana_time_zone",  # aarch64-unknown-linux-gnu
+        ],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [
+            "@vendor__iana-time-zone-0.1.61//:iana_time_zone",  # aarch64-unknown-linux-gnu, aarch64-unknown-nixos-gnu
+        ],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [
+            "@vendor__iana-time-zone-0.1.61//:iana_time_zone",  # aarch64-unknown-nto-qnx710
+        ],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [
+            "@vendor__iana-time-zone-0.1.61//:iana_time_zone",  # arm-unknown-linux-gnueabi
+        ],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [
+            "@vendor__android-tzdata-0.1.1//:android_tzdata",  # armv7-linux-androideabi
+            "@vendor__iana-time-zone-0.1.61//:iana_time_zone",  # armv7-linux-androideabi
+        ],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [
+            "@vendor__iana-time-zone-0.1.61//:iana_time_zone",  # armv7-unknown-linux-gnueabi
+        ],
+        "@rules_rust//rust/platform:i686-apple-darwin": [
+            "@vendor__iana-time-zone-0.1.61//:iana_time_zone",  # i686-apple-darwin
+        ],
+        "@rules_rust//rust/platform:i686-linux-android": [
+            "@vendor__android-tzdata-0.1.1//:android_tzdata",  # i686-linux-android
+            "@vendor__iana-time-zone-0.1.61//:iana_time_zone",  # i686-linux-android
+        ],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [
+            "@vendor__windows-targets-0.52.6//:windows_targets",  # i686-pc-windows-msvc
+        ],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [
+            "@vendor__iana-time-zone-0.1.61//:iana_time_zone",  # i686-unknown-freebsd
+        ],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [
+            "@vendor__iana-time-zone-0.1.61//:iana_time_zone",  # i686-unknown-linux-gnu
+        ],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [
+            "@vendor__iana-time-zone-0.1.61//:iana_time_zone",  # powerpc-unknown-linux-gnu
+        ],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [
+            "@vendor__iana-time-zone-0.1.61//:iana_time_zone",  # s390x-unknown-linux-gnu
+        ],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [
+            "@vendor__js-sys-0.3.72//:js_sys",  # wasm32-unknown-unknown
+            "@vendor__wasm-bindgen-0.2.95//:wasm_bindgen",  # wasm32-unknown-unknown
+        ],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [
+            "@vendor__iana-time-zone-0.1.61//:iana_time_zone",  # x86_64-apple-darwin
+        ],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [
+            "@vendor__iana-time-zone-0.1.61//:iana_time_zone",  # x86_64-apple-ios
+        ],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [
+            "@vendor__iana-time-zone-0.1.61//:iana_time_zone",  # x86_64-fuchsia
+        ],
+        "@rules_rust//rust/platform:x86_64-linux-android": [
+            "@vendor__android-tzdata-0.1.1//:android_tzdata",  # x86_64-linux-android
+            "@vendor__iana-time-zone-0.1.61//:iana_time_zone",  # x86_64-linux-android
+        ],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [
+            "@vendor__windows-targets-0.52.6//:windows_targets",  # x86_64-pc-windows-msvc
+        ],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [
+            "@vendor__iana-time-zone-0.1.61//:iana_time_zone",  # x86_64-unknown-freebsd
+        ],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [
+            "@vendor__iana-time-zone-0.1.61//:iana_time_zone",  # x86_64-unknown-linux-gnu
+        ],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [
+            "@vendor__iana-time-zone-0.1.61//:iana_time_zone",  # x86_64-unknown-linux-gnu, x86_64-unknown-nixos-gnu
+        ],
+        "//conditions:default": [],
+    }),
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.clap-4.5.20.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.clap-4.5.20.bazel
new file mode 100644
index 00000000000..8348908cd3b
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.clap-4.5.20.bazel
@@ -0,0 +1,97 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "clap",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "color",
+        "default",
+        "derive",
+        "error-context",
+        "help",
+        "std",
+        "suggestions",
+        "usage",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    proc_macro_deps = [
+        "@vendor__clap_derive-4.5.18//:clap_derive",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=clap",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "4.5.20",
+    deps = [
+        "@vendor__clap_builder-4.5.20//:clap_builder",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.clap_builder-4.5.20.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.clap_builder-4.5.20.bazel
new file mode 100644
index 00000000000..1e4720d1719
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.clap_builder-4.5.20.bazel
@@ -0,0 +1,95 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "clap_builder",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "color",
+        "error-context",
+        "help",
+        "std",
+        "suggestions",
+        "usage",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=clap_builder",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "4.5.20",
+    deps = [
+        "@vendor__anstream-0.6.18//:anstream",
+        "@vendor__anstyle-1.0.10//:anstyle",
+        "@vendor__clap_lex-0.7.2//:clap_lex",
+        "@vendor__strsim-0.11.1//:strsim",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.clap_derive-4.5.18.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.clap_derive-4.5.18.bazel
new file mode 100644
index 00000000000..8e358dcd01d
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.clap_derive-4.5.18.bazel
@@ -0,0 +1,90 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//rust:defs.bzl", "rust_proc_macro")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_proc_macro(
+    name = "clap_derive",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "default",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=clap_derive",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "4.5.18",
+    deps = [
+        "@vendor__heck-0.5.0//:heck",
+        "@vendor__proc-macro2-1.0.89//:proc_macro2",
+        "@vendor__quote-1.0.37//:quote",
+        "@vendor__syn-2.0.87//:syn",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.clap_lex-0.7.2.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.clap_lex-0.7.2.bazel
new file mode 100644
index 00000000000..36a02fe87c0
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.clap_lex-0.7.2.bazel
@@ -0,0 +1,81 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "clap_lex",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=clap_lex",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.7.2",
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.colorchoice-1.0.3.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.colorchoice-1.0.3.bazel
new file mode 100644
index 00000000000..9d8b8edaf51
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.colorchoice-1.0.3.bazel
@@ -0,0 +1,81 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "colorchoice",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=colorchoice",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "1.0.3",
+)
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
new file mode 100644
index 00000000000..cd28792f2cf
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.core-foundation-sys-0.8.7.bazel
@@ -0,0 +1,85 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "core_foundation_sys",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "default",
+        "link",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2018",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=core-foundation-sys",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.8.7",
+)
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
new file mode 100644
index 00000000000..664156169ba
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.countme-3.0.1.bazel
@@ -0,0 +1,81 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "countme",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2018",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=countme",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "3.0.1",
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.cov-mark-2.0.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.cov-mark-2.0.0.bazel
new file mode 100644
index 00000000000..d08a8e7d343
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.cov-mark-2.0.0.bazel
@@ -0,0 +1,85 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "cov_mark",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "default",
+        "enable",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=cov-mark",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "2.0.0",
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.crc32fast-1.4.2.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.crc32fast-1.4.2.bazel
new file mode 100644
index 00000000000..b544814fef6
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.crc32fast-1.4.2.bazel
@@ -0,0 +1,88 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "crc32fast",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "default",
+        "std",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2015",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=crc32fast",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "1.4.2",
+    deps = [
+        "@vendor__cfg-if-1.0.0//:cfg_if",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.crossbeam-channel-0.5.13.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.crossbeam-channel-0.5.13.bazel
new file mode 100644
index 00000000000..1e26b61f1d6
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.crossbeam-channel-0.5.13.bazel
@@ -0,0 +1,88 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "crossbeam_channel",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "default",
+        "std",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=crossbeam-channel",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.5.13",
+    deps = [
+        "@vendor__crossbeam-utils-0.8.20//:crossbeam_utils",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.crossbeam-deque-0.8.5.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.crossbeam-deque-0.8.5.bazel
new file mode 100644
index 00000000000..757d98d4e6d
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.crossbeam-deque-0.8.5.bazel
@@ -0,0 +1,89 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "crossbeam_deque",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "default",
+        "std",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=crossbeam-deque",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.8.5",
+    deps = [
+        "@vendor__crossbeam-epoch-0.9.18//:crossbeam_epoch",
+        "@vendor__crossbeam-utils-0.8.20//:crossbeam_utils",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.crossbeam-epoch-0.9.18.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.crossbeam-epoch-0.9.18.bazel
new file mode 100644
index 00000000000..9d3032c9f9e
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.crossbeam-epoch-0.9.18.bazel
@@ -0,0 +1,88 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "crossbeam_epoch",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "alloc",
+        "std",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=crossbeam-epoch",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.9.18",
+    deps = [
+        "@vendor__crossbeam-utils-0.8.20//:crossbeam_utils",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.crossbeam-utils-0.8.20.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.crossbeam-utils-0.8.20.bazel
new file mode 100644
index 00000000000..21f536b0f34
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.crossbeam-utils-0.8.20.bazel
@@ -0,0 +1,148 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_build_script")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "crossbeam_utils",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "default",
+        "std",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=crossbeam-utils",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.8.20",
+    deps = [
+        "@vendor__crossbeam-utils-0.8.20//:build_script_build",
+    ],
+)
+
+cargo_build_script(
+    name = "_bs",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            "**/*.rs",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "default",
+        "std",
+    ],
+    crate_name = "build_script_build",
+    crate_root = "build.rs",
+    data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    edition = "2021",
+    pkg_name = "crossbeam-utils",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=crossbeam-utils",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    version = "0.8.20",
+    visibility = ["//visibility:private"],
+)
+
+alias(
+    name = "build_script_build",
+    actual = ":_bs",
+    tags = ["manual"],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.darling-0.20.10.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.darling-0.20.10.bazel
new file mode 100644
index 00000000000..f0b2ed469b3
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.darling-0.20.10.bazel
@@ -0,0 +1,91 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "darling",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "default",
+        "suggestions",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    proc_macro_deps = [
+        "@vendor__darling_macro-0.20.10//:darling_macro",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=darling",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.20.10",
+    deps = [
+        "@vendor__darling_core-0.20.10//:darling_core",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.darling_core-0.20.10.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.darling_core-0.20.10.bazel
new file mode 100644
index 00000000000..d73c104dcd8
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.darling_core-0.20.10.bazel
@@ -0,0 +1,93 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "darling_core",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "strsim",
+        "suggestions",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=darling_core",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.20.10",
+    deps = [
+        "@vendor__fnv-1.0.7//:fnv",
+        "@vendor__ident_case-1.0.1//:ident_case",
+        "@vendor__proc-macro2-1.0.89//:proc_macro2",
+        "@vendor__quote-1.0.37//:quote",
+        "@vendor__strsim-0.11.1//:strsim",
+        "@vendor__syn-2.0.87//:syn",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.darling_macro-0.20.10.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.darling_macro-0.20.10.bazel
new file mode 100644
index 00000000000..3fcf90d20b6
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.darling_macro-0.20.10.bazel
@@ -0,0 +1,86 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//rust:defs.bzl", "rust_proc_macro")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_proc_macro(
+    name = "darling_macro",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=darling_macro",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.20.10",
+    deps = [
+        "@vendor__darling_core-0.20.10//:darling_core",
+        "@vendor__quote-1.0.37//:quote",
+        "@vendor__syn-2.0.87//:syn",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.dashmap-5.5.3.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.dashmap-5.5.3.bazel
new file mode 100644
index 00000000000..c5a50a68856
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.dashmap-5.5.3.bazel
@@ -0,0 +1,91 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "dashmap",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "raw-api",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2018",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=dashmap",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "5.5.3",
+    deps = [
+        "@vendor__cfg-if-1.0.0//:cfg_if",
+        "@vendor__hashbrown-0.14.5//:hashbrown",
+        "@vendor__lock_api-0.4.12//:lock_api",
+        "@vendor__once_cell-1.20.2//:once_cell",
+        "@vendor__parking_lot_core-0.9.10//:parking_lot_core",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.deranged-0.3.11.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.deranged-0.3.11.bazel
new file mode 100644
index 00000000000..c37b407191a
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.deranged-0.3.11.bazel
@@ -0,0 +1,81 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "deranged",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=deranged",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.3.11",
+)
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
new file mode 100644
index 00000000000..996b945784c
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.drop_bomb-0.1.5.bazel
@@ -0,0 +1,81 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "drop_bomb",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2015",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=drop_bomb",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.1.5",
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.either-1.13.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.either-1.13.0.bazel
new file mode 100644
index 00000000000..3ea68c0f3e7
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.either-1.13.0.bazel
@@ -0,0 +1,85 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "either",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "default",
+        "use_std",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2018",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=either",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "1.13.0",
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ena-0.14.3.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ena-0.14.3.bazel
new file mode 100644
index 00000000000..76d099a4cb2
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ena-0.14.3.bazel
@@ -0,0 +1,84 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "ena",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2015",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=ena",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.14.3",
+    deps = [
+        "@vendor__log-0.4.22//:log",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.encoding-0.2.33.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.encoding-0.2.33.bazel
new file mode 100644
index 00000000000..48e2b36de48
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.encoding-0.2.33.bazel
@@ -0,0 +1,88 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "encoding",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2015",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=encoding",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.2.33",
+    deps = [
+        "@vendor__encoding-index-japanese-1.20141219.5//:encoding_index_japanese",
+        "@vendor__encoding-index-korean-1.20141219.5//:encoding_index_korean",
+        "@vendor__encoding-index-simpchinese-1.20141219.5//:encoding_index_simpchinese",
+        "@vendor__encoding-index-singlebyte-1.20141219.5//:encoding_index_singlebyte",
+        "@vendor__encoding-index-tradchinese-1.20141219.5//:encoding_index_tradchinese",
+    ],
+)
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
new file mode 100644
index 00000000000..892d4925645
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.encoding-index-japanese-1.20141219.5.bazel
@@ -0,0 +1,84 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "encoding_index_japanese",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "lib.rs",
+    edition = "2015",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=encoding-index-japanese",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "1.20141219.5",
+    deps = [
+        "@vendor__encoding_index_tests-0.1.4//:encoding_index_tests",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.encoding-index-korean-1.20141219.5.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.encoding-index-korean-1.20141219.5.bazel
new file mode 100644
index 00000000000..c34cf5efed3
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.encoding-index-korean-1.20141219.5.bazel
@@ -0,0 +1,84 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "encoding_index_korean",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "lib.rs",
+    edition = "2015",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=encoding-index-korean",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "1.20141219.5",
+    deps = [
+        "@vendor__encoding_index_tests-0.1.4//:encoding_index_tests",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.encoding-index-simpchinese-1.20141219.5.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.encoding-index-simpchinese-1.20141219.5.bazel
new file mode 100644
index 00000000000..3b180729c1f
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.encoding-index-simpchinese-1.20141219.5.bazel
@@ -0,0 +1,84 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "encoding_index_simpchinese",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "lib.rs",
+    edition = "2015",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=encoding-index-simpchinese",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "1.20141219.5",
+    deps = [
+        "@vendor__encoding_index_tests-0.1.4//:encoding_index_tests",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.encoding-index-singlebyte-1.20141219.5.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.encoding-index-singlebyte-1.20141219.5.bazel
new file mode 100644
index 00000000000..18a2758e544
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.encoding-index-singlebyte-1.20141219.5.bazel
@@ -0,0 +1,84 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "encoding_index_singlebyte",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "lib.rs",
+    edition = "2015",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=encoding-index-singlebyte",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "1.20141219.5",
+    deps = [
+        "@vendor__encoding_index_tests-0.1.4//:encoding_index_tests",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.encoding-index-tradchinese-1.20141219.5.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.encoding-index-tradchinese-1.20141219.5.bazel
new file mode 100644
index 00000000000..7d45d9c0f8c
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.encoding-index-tradchinese-1.20141219.5.bazel
@@ -0,0 +1,84 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "encoding_index_tradchinese",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "lib.rs",
+    edition = "2015",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=encoding-index-tradchinese",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "1.20141219.5",
+    deps = [
+        "@vendor__encoding_index_tests-0.1.4//:encoding_index_tests",
+    ],
+)
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
new file mode 100644
index 00000000000..b844b4f064c
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.encoding_index_tests-0.1.4.bazel
@@ -0,0 +1,81 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "encoding_index_tests",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "index_tests.rs",
+    edition = "2015",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=encoding_index_tests",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.1.4",
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.equivalent-1.0.1.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.equivalent-1.0.1.bazel
new file mode 100644
index 00000000000..e567a8999d6
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.equivalent-1.0.1.bazel
@@ -0,0 +1,81 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "equivalent",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2015",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=equivalent",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "1.0.1",
+)
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
new file mode 100644
index 00000000000..bfafa8562e9
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.figment-0.10.19.bazel
@@ -0,0 +1,205 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_build_script")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "figment",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "env",
+        "parse-value",
+        "pear",
+        "serde_yaml",
+        "yaml",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2018",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=figment",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.10.19",
+    deps = [
+        "@vendor__figment-0.10.19//:build_script_build",
+        "@vendor__pear-0.2.9//:pear",
+        "@vendor__serde-1.0.214//:serde",
+        "@vendor__serde_yaml-0.9.34-deprecated//:serde_yaml",
+        "@vendor__uncased-0.9.10//:uncased",
+    ] + select({
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [
+            "@vendor__atomic-0.6.0//:atomic",  # cfg(any(target_pointer_width = "8", target_pointer_width = "16", target_pointer_width = "32"))
+        ],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [
+            "@vendor__atomic-0.6.0//:atomic",  # cfg(any(target_pointer_width = "8", target_pointer_width = "16", target_pointer_width = "32"))
+        ],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [
+            "@vendor__atomic-0.6.0//:atomic",  # cfg(any(target_pointer_width = "8", target_pointer_width = "16", target_pointer_width = "32"))
+        ],
+        "@rules_rust//rust/platform:i686-apple-darwin": [
+            "@vendor__atomic-0.6.0//:atomic",  # cfg(any(target_pointer_width = "8", target_pointer_width = "16", target_pointer_width = "32"))
+        ],
+        "@rules_rust//rust/platform:i686-linux-android": [
+            "@vendor__atomic-0.6.0//:atomic",  # cfg(any(target_pointer_width = "8", target_pointer_width = "16", target_pointer_width = "32"))
+        ],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [
+            "@vendor__atomic-0.6.0//:atomic",  # cfg(any(target_pointer_width = "8", target_pointer_width = "16", target_pointer_width = "32"))
+        ],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [
+            "@vendor__atomic-0.6.0//:atomic",  # cfg(any(target_pointer_width = "8", target_pointer_width = "16", target_pointer_width = "32"))
+        ],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [
+            "@vendor__atomic-0.6.0//:atomic",  # cfg(any(target_pointer_width = "8", target_pointer_width = "16", target_pointer_width = "32"))
+        ],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [
+            "@vendor__atomic-0.6.0//:atomic",  # cfg(any(target_pointer_width = "8", target_pointer_width = "16", target_pointer_width = "32"))
+        ],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [
+            "@vendor__atomic-0.6.0//:atomic",  # cfg(any(target_pointer_width = "8", target_pointer_width = "16", target_pointer_width = "32"))
+        ],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [
+            "@vendor__atomic-0.6.0//:atomic",  # cfg(any(target_pointer_width = "8", target_pointer_width = "16", target_pointer_width = "32"))
+        ],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [
+            "@vendor__atomic-0.6.0//:atomic",  # cfg(any(target_pointer_width = "8", target_pointer_width = "16", target_pointer_width = "32"))
+        ],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [
+            "@vendor__atomic-0.6.0//:atomic",  # cfg(any(target_pointer_width = "8", target_pointer_width = "16", target_pointer_width = "32"))
+        ],
+        "@rules_rust//rust/platform:wasm32-wasi": [
+            "@vendor__atomic-0.6.0//:atomic",  # cfg(any(target_pointer_width = "8", target_pointer_width = "16", target_pointer_width = "32"))
+        ],
+        "//conditions:default": [],
+    }),
+)
+
+cargo_build_script(
+    name = "_bs",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            "**/*.rs",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "env",
+        "parse-value",
+        "pear",
+        "serde_yaml",
+        "yaml",
+    ],
+    crate_name = "build_script_build",
+    crate_root = "build.rs",
+    data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    edition = "2018",
+    pkg_name = "figment",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=figment",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    version = "0.10.19",
+    visibility = ["//visibility:private"],
+    deps = [
+        "@vendor__version_check-0.9.5//:version_check",
+    ],
+)
+
+alias(
+    name = "build_script_build",
+    actual = ":_bs",
+    tags = ["manual"],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.filetime-0.2.25.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.filetime-0.2.25.bazel
new file mode 100644
index 00000000000..3f054e089e3
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.filetime-0.2.25.bazel
@@ -0,0 +1,167 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "filetime",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2018",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=filetime",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.2.25",
+    deps = [
+        "@vendor__cfg-if-1.0.0//:cfg_if",
+    ] + select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [
+            "@vendor__libc-0.2.162//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [
+            "@vendor__libc-0.2.162//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [
+            "@vendor__libc-0.2.162//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [
+            "@vendor__libc-0.2.162//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:aarch64-linux-android": [
+            "@vendor__libc-0.2.162//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [
+            "@vendor__windows-sys-0.59.0//:windows_sys",  # cfg(windows)
+        ],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [
+            "@vendor__libc-0.2.162//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [
+            "@vendor__libc-0.2.162//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [
+            "@vendor__libc-0.2.162//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [
+            "@vendor__libc-0.2.162//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [
+            "@vendor__libc-0.2.162//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [
+            "@vendor__libc-0.2.162//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:i686-apple-darwin": [
+            "@vendor__libc-0.2.162//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:i686-linux-android": [
+            "@vendor__libc-0.2.162//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [
+            "@vendor__windows-sys-0.59.0//:windows_sys",  # cfg(windows)
+        ],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [
+            "@vendor__libc-0.2.162//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [
+            "@vendor__libc-0.2.162//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [
+            "@vendor__libc-0.2.162//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [
+            "@vendor__libc-0.2.162//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [
+            "@vendor__libc-0.2.162//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [
+            "@vendor__libc-0.2.162//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [
+            "@vendor__libc-0.2.162//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:x86_64-linux-android": [
+            "@vendor__libc-0.2.162//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [
+            "@vendor__windows-sys-0.59.0//:windows_sys",  # cfg(windows)
+        ],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [
+            "@vendor__libc-0.2.162//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [
+            "@vendor__libc-0.2.162//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [
+            "@vendor__libc-0.2.162//:libc",  # cfg(unix)
+        ],
+        "//conditions:default": [],
+    }),
+)
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
new file mode 100644
index 00000000000..4d879e253b9
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.fixedbitset-0.4.2.bazel
@@ -0,0 +1,81 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "fixedbitset",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2015",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=fixedbitset",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.4.2",
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.flate2-1.0.34.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.flate2-1.0.34.bazel
new file mode 100644
index 00000000000..0d56d2ec647
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.flate2-1.0.34.bazel
@@ -0,0 +1,91 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "flate2",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "any_impl",
+        "default",
+        "miniz_oxide",
+        "rust_backend",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2018",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=flate2",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "1.0.34",
+    deps = [
+        "@vendor__crc32fast-1.4.2//:crc32fast",
+        "@vendor__miniz_oxide-0.8.0//:miniz_oxide",
+    ],
+)
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
new file mode 100644
index 00000000000..f72561fdf85
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.fnv-1.0.7.bazel
@@ -0,0 +1,85 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "fnv",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "default",
+        "std",
+    ],
+    crate_root = "lib.rs",
+    edition = "2015",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=fnv",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "1.0.7",
+)
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
new file mode 100644
index 00000000000..d0e4f94c286
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.fs-err-2.11.0.bazel
@@ -0,0 +1,143 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_build_script")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "fs_err",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2018",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=fs-err",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "2.11.0",
+    deps = [
+        "@vendor__fs-err-2.11.0//:build_script_build",
+    ],
+)
+
+cargo_build_script(
+    name = "_bs",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            "**/*.rs",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_name = "build_script_build",
+    crate_root = "build.rs",
+    data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    edition = "2018",
+    pkg_name = "fs-err",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=fs-err",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    version = "2.11.0",
+    visibility = ["//visibility:private"],
+    deps = [
+        "@vendor__autocfg-1.4.0//:autocfg",
+    ],
+)
+
+alias(
+    name = "build_script_build",
+    actual = ":_bs",
+    tags = ["manual"],
+)
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
new file mode 100644
index 00000000000..9c6ac1940bc
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.fsevent-sys-4.1.0.bazel
@@ -0,0 +1,84 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "fsevent_sys",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2018",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=fsevent-sys",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "4.1.0",
+    deps = [
+        "@vendor__libc-0.2.162//:libc",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.fst-0.4.7.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.fst-0.4.7.bazel
new file mode 100644
index 00000000000..ff0498c104d
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.fst-0.4.7.bazel
@@ -0,0 +1,146 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_build_script")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "fst",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "default",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2018",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=fst",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.4.7",
+    deps = [
+        "@vendor__fst-0.4.7//:build_script_build",
+    ],
+)
+
+cargo_build_script(
+    name = "_bs",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            "**/*.rs",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "default",
+    ],
+    crate_name = "build_script_build",
+    crate_root = "build.rs",
+    data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    edition = "2018",
+    pkg_name = "fst",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=fst",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    version = "0.4.7",
+    visibility = ["//visibility:private"],
+)
+
+alias(
+    name = "build_script_build",
+    actual = ":_bs",
+    tags = ["manual"],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.getrandom-0.2.15.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.getrandom-0.2.15.bazel
new file mode 100644
index 00000000000..16944c60c92
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.getrandom-0.2.15.bazel
@@ -0,0 +1,164 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "getrandom",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "std",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2018",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=getrandom",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.2.15",
+    deps = [
+        "@vendor__cfg-if-1.0.0//:cfg_if",
+    ] + select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [
+            "@vendor__libc-0.2.162//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [
+            "@vendor__libc-0.2.162//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [
+            "@vendor__libc-0.2.162//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [
+            "@vendor__libc-0.2.162//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:aarch64-linux-android": [
+            "@vendor__libc-0.2.162//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [
+            "@vendor__libc-0.2.162//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [
+            "@vendor__libc-0.2.162//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [
+            "@vendor__libc-0.2.162//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [
+            "@vendor__libc-0.2.162//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [
+            "@vendor__libc-0.2.162//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [
+            "@vendor__libc-0.2.162//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:i686-apple-darwin": [
+            "@vendor__libc-0.2.162//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:i686-linux-android": [
+            "@vendor__libc-0.2.162//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [
+            "@vendor__libc-0.2.162//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [
+            "@vendor__libc-0.2.162//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [
+            "@vendor__libc-0.2.162//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [
+            "@vendor__libc-0.2.162//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:wasm32-wasi": [
+            "@vendor__wasi-0.11.0-wasi-snapshot-preview1//:wasi",  # cfg(target_os = "wasi")
+        ],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [
+            "@vendor__libc-0.2.162//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [
+            "@vendor__libc-0.2.162//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [
+            "@vendor__libc-0.2.162//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:x86_64-linux-android": [
+            "@vendor__libc-0.2.162//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [
+            "@vendor__libc-0.2.162//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [
+            "@vendor__libc-0.2.162//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [
+            "@vendor__libc-0.2.162//:libc",  # cfg(unix)
+        ],
+        "//conditions:default": [],
+    }),
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.glob-0.3.1.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.glob-0.3.1.bazel
new file mode 100644
index 00000000000..5d051f2cbc3
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.glob-0.3.1.bazel
@@ -0,0 +1,81 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "glob",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2015",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=glob",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.3.1",
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.globset-0.4.15.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.globset-0.4.15.bazel
new file mode 100644
index 00000000000..7dd28cdbf40
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.globset-0.4.15.bazel
@@ -0,0 +1,92 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "globset",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "default",
+        "log",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=globset",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.4.15",
+    deps = [
+        "@vendor__aho-corasick-1.1.3//:aho_corasick",
+        "@vendor__bstr-1.10.0//:bstr",
+        "@vendor__log-0.4.22//:log",
+        "@vendor__regex-automata-0.4.8//:regex_automata",
+        "@vendor__regex-syntax-0.8.5//:regex_syntax",
+    ],
+)
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
new file mode 100644
index 00000000000..bc3c84c2000
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.hashbrown-0.12.3.bazel
@@ -0,0 +1,81 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "hashbrown",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=hashbrown",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.12.3",
+)
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
new file mode 100644
index 00000000000..0955c09b114
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.hashbrown-0.14.5.bazel
@@ -0,0 +1,84 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "hashbrown",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "inline-more",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=hashbrown",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.14.5",
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.hashbrown-0.15.1.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.hashbrown-0.15.1.bazel
new file mode 100644
index 00000000000..63f8895a32e
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.hashbrown-0.15.1.bazel
@@ -0,0 +1,81 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "hashbrown",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=hashbrown",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.15.1",
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.heck-0.4.1.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.heck-0.4.1.bazel
new file mode 100644
index 00000000000..c6020a54053
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.heck-0.4.1.bazel
@@ -0,0 +1,84 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "heck",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "default",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2018",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=heck",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.4.1",
+)
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
new file mode 100644
index 00000000000..2e36a835890
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.heck-0.5.0.bazel
@@ -0,0 +1,81 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "heck",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=heck",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.5.0",
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.hermit-abi-0.3.9.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.hermit-abi-0.3.9.bazel
new file mode 100644
index 00000000000..b45878a57ac
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.hermit-abi-0.3.9.bazel
@@ -0,0 +1,81 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "hermit_abi",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=hermit-abi",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.3.9",
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.hermit-abi-0.4.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.hermit-abi-0.4.0.bazel
new file mode 100644
index 00000000000..c326d28995f
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.hermit-abi-0.4.0.bazel
@@ -0,0 +1,81 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "hermit_abi",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=hermit-abi",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.4.0",
+)
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
new file mode 100644
index 00000000000..175e5f1a882
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.hex-0.4.3.bazel
@@ -0,0 +1,81 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "hex",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2018",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=hex",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.4.3",
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.home-0.5.9.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.home-0.5.9.bazel
new file mode 100644
index 00000000000..32868b530e8
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.home-0.5.9.bazel
@@ -0,0 +1,93 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "home",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=home",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.5.9",
+    deps = select({
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [
+            "@vendor__windows-sys-0.52.0//:windows_sys",  # cfg(windows)
+        ],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [
+            "@vendor__windows-sys-0.52.0//:windows_sys",  # cfg(windows)
+        ],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [
+            "@vendor__windows-sys-0.52.0//:windows_sys",  # cfg(windows)
+        ],
+        "//conditions:default": [],
+    }),
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.iana-time-zone-0.1.61.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.iana-time-zone-0.1.61.bazel
new file mode 100644
index 00000000000..a58468f6e10
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.iana-time-zone-0.1.61.bazel
@@ -0,0 +1,130 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "iana_time_zone",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "fallback",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2018",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=iana-time-zone",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.1.61",
+    deps = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [
+            "@vendor__core-foundation-sys-0.8.7//:core_foundation_sys",  # cfg(any(target_os = "macos", target_os = "ios"))
+        ],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [
+            "@vendor__core-foundation-sys-0.8.7//:core_foundation_sys",  # cfg(any(target_os = "macos", target_os = "ios"))
+        ],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [
+            "@vendor__core-foundation-sys-0.8.7//:core_foundation_sys",  # cfg(any(target_os = "macos", target_os = "ios"))
+        ],
+        "@rules_rust//rust/platform:aarch64-linux-android": [
+            "@vendor__android_system_properties-0.1.5//:android_system_properties",  # cfg(target_os = "android")
+        ],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [
+            "@vendor__windows-core-0.52.0//:windows_core",  # cfg(target_os = "windows")
+        ],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [
+            "@vendor__android_system_properties-0.1.5//:android_system_properties",  # cfg(target_os = "android")
+        ],
+        "@rules_rust//rust/platform:i686-apple-darwin": [
+            "@vendor__core-foundation-sys-0.8.7//:core_foundation_sys",  # cfg(any(target_os = "macos", target_os = "ios"))
+        ],
+        "@rules_rust//rust/platform:i686-linux-android": [
+            "@vendor__android_system_properties-0.1.5//:android_system_properties",  # cfg(target_os = "android")
+        ],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [
+            "@vendor__windows-core-0.52.0//:windows_core",  # cfg(target_os = "windows")
+        ],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [
+            "@vendor__js-sys-0.3.72//:js_sys",  # cfg(all(target_arch = "wasm32", target_os = "unknown"))
+            "@vendor__wasm-bindgen-0.2.95//:wasm_bindgen",  # cfg(all(target_arch = "wasm32", target_os = "unknown"))
+        ],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [
+            "@vendor__core-foundation-sys-0.8.7//:core_foundation_sys",  # cfg(any(target_os = "macos", target_os = "ios"))
+        ],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [
+            "@vendor__core-foundation-sys-0.8.7//:core_foundation_sys",  # cfg(any(target_os = "macos", target_os = "ios"))
+        ],
+        "@rules_rust//rust/platform:x86_64-linux-android": [
+            "@vendor__android_system_properties-0.1.5//:android_system_properties",  # cfg(target_os = "android")
+        ],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [
+            "@vendor__windows-core-0.52.0//:windows_core",  # cfg(target_os = "windows")
+        ],
+        "//conditions:default": [],
+    }),
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.iana-time-zone-haiku-0.1.2.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.iana-time-zone-haiku-0.1.2.bazel
new file mode 100644
index 00000000000..86aec61e266
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.iana-time-zone-haiku-0.1.2.bazel
@@ -0,0 +1,143 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_build_script")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "iana_time_zone_haiku",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2018",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=iana-time-zone-haiku",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.1.2",
+    deps = [
+        "@vendor__iana-time-zone-haiku-0.1.2//:build_script_build",
+    ],
+)
+
+cargo_build_script(
+    name = "_bs",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            "**/*.rs",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_name = "build_script_build",
+    crate_root = "build.rs",
+    data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    edition = "2018",
+    pkg_name = "iana-time-zone-haiku",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=iana-time-zone-haiku",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    version = "0.1.2",
+    visibility = ["//visibility:private"],
+    deps = [
+        "@vendor__cc-1.1.37//:cc",
+    ],
+)
+
+alias(
+    name = "build_script_build",
+    actual = ":_bs",
+    tags = ["manual"],
+)
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
new file mode 100644
index 00000000000..8679ec32479
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ident_case-1.0.1.bazel
@@ -0,0 +1,81 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "ident_case",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2015",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=ident_case",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "1.0.1",
+)
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
new file mode 100644
index 00000000000..110b363ea61
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.indexmap-1.9.3.bazel
@@ -0,0 +1,144 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_build_script")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "indexmap",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=indexmap",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "1.9.3",
+    deps = [
+        "@vendor__hashbrown-0.12.3//:hashbrown",
+        "@vendor__indexmap-1.9.3//:build_script_build",
+    ],
+)
+
+cargo_build_script(
+    name = "_bs",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            "**/*.rs",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_name = "build_script_build",
+    crate_root = "build.rs",
+    data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    edition = "2021",
+    pkg_name = "indexmap",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=indexmap",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    version = "1.9.3",
+    visibility = ["//visibility:private"],
+    deps = [
+        "@vendor__autocfg-1.4.0//:autocfg",
+    ],
+)
+
+alias(
+    name = "build_script_build",
+    actual = ":_bs",
+    tags = ["manual"],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.indexmap-2.6.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.indexmap-2.6.0.bazel
new file mode 100644
index 00000000000..83052d3fe53
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.indexmap-2.6.0.bazel
@@ -0,0 +1,89 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "indexmap",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "default",
+        "std",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=indexmap",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "2.6.0",
+    deps = [
+        "@vendor__equivalent-1.0.1//:equivalent",
+        "@vendor__hashbrown-0.15.1//:hashbrown",
+    ],
+)
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
new file mode 100644
index 00000000000..59b8f57fea1
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.inlinable_string-0.1.15.bazel
@@ -0,0 +1,81 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "inlinable_string",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2018",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=inlinable_string",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.1.15",
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.inotify-0.9.6.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.inotify-0.9.6.bazel
new file mode 100644
index 00000000000..a08aeee3d13
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.inotify-0.9.6.bazel
@@ -0,0 +1,86 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "inotify",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2018",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=inotify",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.9.6",
+    deps = [
+        "@vendor__bitflags-1.3.2//:bitflags",
+        "@vendor__inotify-sys-0.1.5//:inotify_sys",
+        "@vendor__libc-0.2.162//:libc",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.inotify-sys-0.1.5.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.inotify-sys-0.1.5.bazel
new file mode 100644
index 00000000000..4d7ed476452
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.inotify-sys-0.1.5.bazel
@@ -0,0 +1,84 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "inotify_sys",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2015",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=inotify-sys",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.1.5",
+    deps = [
+        "@vendor__libc-0.2.162//:libc",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.is-terminal-0.4.13.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.is-terminal-0.4.13.bazel
new file mode 100644
index 00000000000..bf61ed4aa0f
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.is-terminal-0.4.13.bazel
@@ -0,0 +1,168 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "is_terminal",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2018",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=is-terminal",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.4.13",
+    deps = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [
+            "@vendor__libc-0.2.162//:libc",  # cfg(any(unix, target_os = "wasi"))
+        ],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [
+            "@vendor__libc-0.2.162//:libc",  # cfg(any(unix, target_os = "wasi"))
+        ],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [
+            "@vendor__libc-0.2.162//:libc",  # cfg(any(unix, target_os = "wasi"))
+        ],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [
+            "@vendor__libc-0.2.162//:libc",  # cfg(any(unix, target_os = "wasi"))
+        ],
+        "@rules_rust//rust/platform:aarch64-linux-android": [
+            "@vendor__libc-0.2.162//:libc",  # cfg(any(unix, target_os = "wasi"))
+        ],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [
+            "@vendor__windows-sys-0.52.0//:windows_sys",  # cfg(windows)
+        ],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [
+            "@vendor__libc-0.2.162//:libc",  # cfg(any(unix, target_os = "wasi"))
+        ],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [
+            "@vendor__libc-0.2.162//:libc",  # cfg(any(unix, target_os = "wasi"))
+        ],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [
+            "@vendor__libc-0.2.162//:libc",  # cfg(any(unix, target_os = "wasi"))
+        ],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [
+            "@vendor__libc-0.2.162//:libc",  # cfg(any(unix, target_os = "wasi"))
+        ],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [
+            "@vendor__libc-0.2.162//:libc",  # cfg(any(unix, target_os = "wasi"))
+        ],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [
+            "@vendor__libc-0.2.162//:libc",  # cfg(any(unix, target_os = "wasi"))
+        ],
+        "@rules_rust//rust/platform:i686-apple-darwin": [
+            "@vendor__libc-0.2.162//:libc",  # cfg(any(unix, target_os = "wasi"))
+        ],
+        "@rules_rust//rust/platform:i686-linux-android": [
+            "@vendor__libc-0.2.162//:libc",  # cfg(any(unix, target_os = "wasi"))
+        ],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [
+            "@vendor__windows-sys-0.52.0//:windows_sys",  # cfg(windows)
+        ],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [
+            "@vendor__libc-0.2.162//:libc",  # cfg(any(unix, target_os = "wasi"))
+        ],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [
+            "@vendor__libc-0.2.162//:libc",  # cfg(any(unix, target_os = "wasi"))
+        ],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [
+            "@vendor__libc-0.2.162//:libc",  # cfg(any(unix, target_os = "wasi"))
+        ],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [
+            "@vendor__libc-0.2.162//:libc",  # cfg(any(unix, target_os = "wasi"))
+        ],
+        "@rules_rust//rust/platform:wasm32-wasi": [
+            "@vendor__libc-0.2.162//:libc",  # cfg(any(unix, target_os = "wasi"))
+        ],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [
+            "@vendor__libc-0.2.162//:libc",  # cfg(any(unix, target_os = "wasi"))
+        ],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [
+            "@vendor__libc-0.2.162//:libc",  # cfg(any(unix, target_os = "wasi"))
+        ],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [
+            "@vendor__libc-0.2.162//:libc",  # cfg(any(unix, target_os = "wasi"))
+        ],
+        "@rules_rust//rust/platform:x86_64-linux-android": [
+            "@vendor__libc-0.2.162//:libc",  # cfg(any(unix, target_os = "wasi"))
+        ],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [
+            "@vendor__windows-sys-0.52.0//:windows_sys",  # cfg(windows)
+        ],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [
+            "@vendor__libc-0.2.162//:libc",  # cfg(any(unix, target_os = "wasi"))
+        ],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [
+            "@vendor__libc-0.2.162//:libc",  # cfg(any(unix, target_os = "wasi"))
+        ],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [
+            "@vendor__libc-0.2.162//:libc",  # cfg(any(unix, target_os = "wasi"))
+        ],
+        "//conditions:default": [],
+    }),
+)
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
new file mode 100644
index 00000000000..5be68b0e91f
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.is_terminal_polyfill-1.70.1.bazel
@@ -0,0 +1,84 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "is_terminal_polyfill",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "default",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=is_terminal_polyfill",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "1.70.1",
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.itertools-0.10.5.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.itertools-0.10.5.bazel
new file mode 100644
index 00000000000..5c891c943c8
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.itertools-0.10.5.bazel
@@ -0,0 +1,89 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "itertools",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "default",
+        "use_alloc",
+        "use_std",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2018",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=itertools",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.10.5",
+    deps = [
+        "@vendor__either-1.13.0//:either",
+    ],
+)
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
new file mode 100644
index 00000000000..050ca3d7d33
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.itertools-0.12.1.bazel
@@ -0,0 +1,89 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "itertools",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "default",
+        "use_alloc",
+        "use_std",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2018",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=itertools",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.12.1",
+    deps = [
+        "@vendor__either-1.13.0//:either",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.itertools-0.13.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.itertools-0.13.0.bazel
new file mode 100644
index 00000000000..a6001d32c92
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.itertools-0.13.0.bazel
@@ -0,0 +1,89 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "itertools",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "default",
+        "use_alloc",
+        "use_std",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2018",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=itertools",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.13.0",
+    deps = [
+        "@vendor__either-1.13.0//:either",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.itoa-1.0.11.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.itoa-1.0.11.bazel
new file mode 100644
index 00000000000..a3a94e1c6c1
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.itoa-1.0.11.bazel
@@ -0,0 +1,81 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "itoa",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2018",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=itoa",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "1.0.11",
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.jod-thread-0.1.2.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.jod-thread-0.1.2.bazel
new file mode 100644
index 00000000000..909439d25a9
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.jod-thread-0.1.2.bazel
@@ -0,0 +1,81 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "jod_thread",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2018",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=jod-thread",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.1.2",
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.js-sys-0.3.72.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.js-sys-0.3.72.bazel
new file mode 100644
index 00000000000..7dd82a69878
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.js-sys-0.3.72.bazel
@@ -0,0 +1,84 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "js_sys",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=js-sys",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.3.72",
+    deps = [
+        "@vendor__wasm-bindgen-0.2.95//:wasm_bindgen",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.kqueue-1.0.8.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.kqueue-1.0.8.bazel
new file mode 100644
index 00000000000..8cc09ad6e19
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.kqueue-1.0.8.bazel
@@ -0,0 +1,85 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "kqueue",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2018",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=kqueue",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "1.0.8",
+    deps = [
+        "@vendor__kqueue-sys-1.0.4//:kqueue_sys",
+        "@vendor__libc-0.2.162//:libc",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.kqueue-sys-1.0.4.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.kqueue-sys-1.0.4.bazel
new file mode 100644
index 00000000000..6e96c2f34bf
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.kqueue-sys-1.0.4.bazel
@@ -0,0 +1,85 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "kqueue_sys",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2018",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=kqueue-sys",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "1.0.4",
+    deps = [
+        "@vendor__bitflags-1.3.2//:bitflags",
+        "@vendor__libc-0.2.162//:libc",
+    ],
+)
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
new file mode 100644
index 00000000000..ab65aaa759e
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.la-arena-0.3.1.bazel
@@ -0,0 +1,81 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "la_arena",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=la-arena",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.3.1",
+)
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
new file mode 100644
index 00000000000..03e24a24cf2
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.lazy_static-1.5.0.bazel
@@ -0,0 +1,81 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "lazy_static",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2015",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=lazy_static",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "1.5.0",
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.libc-0.2.162.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.libc-0.2.162.bazel
new file mode 100644
index 00000000000..a9ae3896f0d
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.libc-0.2.162.bazel
@@ -0,0 +1,148 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_build_script")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "libc",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "default",
+        "std",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2015",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=libc",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.2.162",
+    deps = [
+        "@vendor__libc-0.2.162//:build_script_build",
+    ],
+)
+
+cargo_build_script(
+    name = "_bs",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            "**/*.rs",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "default",
+        "std",
+    ],
+    crate_name = "build_script_build",
+    crate_root = "build.rs",
+    data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    edition = "2015",
+    pkg_name = "libc",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=libc",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    version = "0.2.162",
+    visibility = ["//visibility:private"],
+)
+
+alias(
+    name = "build_script_build",
+    actual = ":_bs",
+    tags = ["manual"],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.libredox-0.1.3.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.libredox-0.1.3.bazel
new file mode 100644
index 00000000000..c3f2e025c7d
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.libredox-0.1.3.bazel
@@ -0,0 +1,86 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "libredox",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=libredox",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.1.3",
+    deps = [
+        "@vendor__bitflags-2.6.0//:bitflags",
+        "@vendor__libc-0.2.162//:libc",
+        "@vendor__redox_syscall-0.5.7//:syscall",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.line-index-0.1.2.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.line-index-0.1.2.bazel
new file mode 100644
index 00000000000..35a75f68182
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.line-index-0.1.2.bazel
@@ -0,0 +1,85 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "line_index",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=line-index",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.1.2",
+    deps = [
+        "@vendor__nohash-hasher-0.2.0//:nohash_hasher",
+        "@vendor__text-size-1.1.1//:text_size",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.lock_api-0.4.12.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.lock_api-0.4.12.bazel
new file mode 100644
index 00000000000..d671c7e2f9c
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.lock_api-0.4.12.bazel
@@ -0,0 +1,152 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_build_script")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "lock_api",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "atomic_usize",
+        "default",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=lock_api",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.4.12",
+    deps = [
+        "@vendor__lock_api-0.4.12//:build_script_build",
+        "@vendor__scopeguard-1.2.0//:scopeguard",
+    ],
+)
+
+cargo_build_script(
+    name = "_bs",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            "**/*.rs",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "atomic_usize",
+        "default",
+    ],
+    crate_name = "build_script_build",
+    crate_root = "build.rs",
+    data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    edition = "2021",
+    pkg_name = "lock_api",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=lock_api",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    version = "0.4.12",
+    visibility = ["//visibility:private"],
+    deps = [
+        "@vendor__autocfg-1.4.0//:autocfg",
+    ],
+)
+
+alias(
+    name = "build_script_build",
+    actual = ":_bs",
+    tags = ["manual"],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.log-0.4.22.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.log-0.4.22.bazel
new file mode 100644
index 00000000000..d124633cd61
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.log-0.4.22.bazel
@@ -0,0 +1,84 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "log",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "std",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=log",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.4.22",
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.lz4_flex-0.11.3.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.lz4_flex-0.11.3.bazel
new file mode 100644
index 00000000000..796bdb15798
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.lz4_flex-0.11.3.bazel
@@ -0,0 +1,81 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "lz4_flex",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=lz4_flex",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.11.3",
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.matchers-0.1.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.matchers-0.1.0.bazel
new file mode 100644
index 00000000000..c6cac995fa4
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.matchers-0.1.0.bazel
@@ -0,0 +1,84 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "matchers",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2018",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=matchers",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.1.0",
+    deps = [
+        "@vendor__regex-automata-0.1.10//:regex_automata",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.memchr-2.7.4.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.memchr-2.7.4.bazel
new file mode 100644
index 00000000000..318a1c77a47
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.memchr-2.7.4.bazel
@@ -0,0 +1,86 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "memchr",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "alloc",
+        "default",
+        "std",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=memchr",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "2.7.4",
+)
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
new file mode 100644
index 00000000000..4e2f20f76cb
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.memoffset-0.9.1.bazel
@@ -0,0 +1,149 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_build_script")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "memoffset",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "default",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2015",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=memoffset",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.9.1",
+    deps = [
+        "@vendor__memoffset-0.9.1//:build_script_build",
+    ],
+)
+
+cargo_build_script(
+    name = "_bs",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            "**/*.rs",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "default",
+    ],
+    crate_name = "build_script_build",
+    crate_root = "build.rs",
+    data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    edition = "2015",
+    pkg_name = "memoffset",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=memoffset",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    version = "0.9.1",
+    visibility = ["//visibility:private"],
+    deps = [
+        "@vendor__autocfg-1.4.0//:autocfg",
+    ],
+)
+
+alias(
+    name = "build_script_build",
+    actual = ":_bs",
+    tags = ["manual"],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.miniz_oxide-0.8.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.miniz_oxide-0.8.0.bazel
new file mode 100644
index 00000000000..3d369f4e80d
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.miniz_oxide-0.8.0.bazel
@@ -0,0 +1,87 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "miniz_oxide",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "with-alloc",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=miniz_oxide",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.8.0",
+    deps = [
+        "@vendor__adler2-2.0.0//:adler2",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.mio-0.8.11.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.mio-0.8.11.bazel
new file mode 100644
index 00000000000..5f3f858bb87
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.mio-0.8.11.bazel
@@ -0,0 +1,177 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "mio",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "default",
+        "log",
+        "os-ext",
+        "os-poll",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2018",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=mio",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.8.11",
+    deps = [
+        "@vendor__log-0.4.22//:log",
+    ] + select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [
+            "@vendor__libc-0.2.162//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [
+            "@vendor__libc-0.2.162//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [
+            "@vendor__libc-0.2.162//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [
+            "@vendor__libc-0.2.162//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:aarch64-linux-android": [
+            "@vendor__libc-0.2.162//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [
+            "@vendor__windows-sys-0.48.0//:windows_sys",  # cfg(windows)
+        ],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [
+            "@vendor__libc-0.2.162//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [
+            "@vendor__libc-0.2.162//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [
+            "@vendor__libc-0.2.162//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [
+            "@vendor__libc-0.2.162//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [
+            "@vendor__libc-0.2.162//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [
+            "@vendor__libc-0.2.162//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:i686-apple-darwin": [
+            "@vendor__libc-0.2.162//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:i686-linux-android": [
+            "@vendor__libc-0.2.162//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [
+            "@vendor__windows-sys-0.48.0//:windows_sys",  # cfg(windows)
+        ],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [
+            "@vendor__libc-0.2.162//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [
+            "@vendor__libc-0.2.162//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [
+            "@vendor__libc-0.2.162//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [
+            "@vendor__libc-0.2.162//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:wasm32-wasi": [
+            "@vendor__libc-0.2.162//:libc",  # cfg(target_os = "wasi")
+            "@vendor__wasi-0.11.0-wasi-snapshot-preview1//:wasi",  # cfg(target_os = "wasi")
+        ],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [
+            "@vendor__libc-0.2.162//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [
+            "@vendor__libc-0.2.162//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [
+            "@vendor__libc-0.2.162//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:x86_64-linux-android": [
+            "@vendor__libc-0.2.162//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [
+            "@vendor__windows-sys-0.48.0//:windows_sys",  # cfg(windows)
+        ],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [
+            "@vendor__libc-0.2.162//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [
+            "@vendor__libc-0.2.162//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [
+            "@vendor__libc-0.2.162//:libc",  # cfg(unix)
+        ],
+        "//conditions:default": [],
+    }),
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.miow-0.6.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.miow-0.6.0.bazel
new file mode 100644
index 00000000000..4845afd5985
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.miow-0.6.0.bazel
@@ -0,0 +1,84 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "miow",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2018",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=miow",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.6.0",
+    deps = [
+        "@vendor__windows-sys-0.48.0//:windows_sys",
+    ],
+)
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
new file mode 100644
index 00000000000..6fd19b6a864
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.nohash-hasher-0.2.0.bazel
@@ -0,0 +1,85 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "nohash_hasher",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "default",
+        "std",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2018",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=nohash-hasher",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.2.0",
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.notify-6.1.1.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.notify-6.1.1.bazel
new file mode 100644
index 00000000000..8894db5f2e0
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.notify-6.1.1.bazel
@@ -0,0 +1,177 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "notify",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "crossbeam-channel",
+        "default",
+        "fsevent-sys",
+        "macos_fsevent",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=notify",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "6.1.1",
+    deps = [
+        "@vendor__crossbeam-channel-0.5.13//:crossbeam_channel",
+        "@vendor__filetime-0.2.25//:filetime",
+        "@vendor__libc-0.2.162//:libc",
+        "@vendor__log-0.4.22//:log",
+        "@vendor__walkdir-2.5.0//:walkdir",
+    ] + select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [
+            "@vendor__bitflags-2.6.0//:bitflags",  # cfg(target_os = "macos")
+            "@vendor__fsevent-sys-4.1.0//:fsevent_sys",  # aarch64-apple-darwin
+        ],
+        "@rules_rust//rust/platform:aarch64-linux-android": [
+            "@vendor__inotify-0.9.6//:inotify",  # cfg(any(target_os = "linux", target_os = "android"))
+            "@vendor__mio-0.8.11//:mio",  # cfg(any(target_os = "linux", target_os = "android"))
+        ],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [
+            "@vendor__windows-sys-0.48.0//:windows_sys",  # cfg(windows)
+        ],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [
+            "@vendor__inotify-0.9.6//:inotify",  # cfg(any(target_os = "linux", target_os = "android"))
+            "@vendor__mio-0.8.11//:mio",  # cfg(any(target_os = "linux", target_os = "android"))
+        ],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [
+            "@vendor__inotify-0.9.6//:inotify",  # cfg(any(target_os = "linux", target_os = "android"))
+            "@vendor__mio-0.8.11//:mio",  # cfg(any(target_os = "linux", target_os = "android"))
+        ],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [
+            "@vendor__inotify-0.9.6//:inotify",  # cfg(any(target_os = "linux", target_os = "android"))
+            "@vendor__mio-0.8.11//:mio",  # cfg(any(target_os = "linux", target_os = "android"))
+        ],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [
+            "@vendor__inotify-0.9.6//:inotify",  # cfg(any(target_os = "linux", target_os = "android"))
+            "@vendor__mio-0.8.11//:mio",  # cfg(any(target_os = "linux", target_os = "android"))
+        ],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [
+            "@vendor__inotify-0.9.6//:inotify",  # cfg(any(target_os = "linux", target_os = "android"))
+            "@vendor__mio-0.8.11//:mio",  # cfg(any(target_os = "linux", target_os = "android"))
+        ],
+        "@rules_rust//rust/platform:i686-apple-darwin": [
+            "@vendor__bitflags-2.6.0//:bitflags",  # cfg(target_os = "macos")
+            "@vendor__fsevent-sys-4.1.0//:fsevent_sys",  # i686-apple-darwin
+        ],
+        "@rules_rust//rust/platform:i686-linux-android": [
+            "@vendor__inotify-0.9.6//:inotify",  # cfg(any(target_os = "linux", target_os = "android"))
+            "@vendor__mio-0.8.11//:mio",  # cfg(any(target_os = "linux", target_os = "android"))
+        ],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [
+            "@vendor__windows-sys-0.48.0//:windows_sys",  # cfg(windows)
+        ],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [
+            "@vendor__kqueue-1.0.8//:kqueue",  # cfg(any(target_os = "freebsd", target_os = "openbsd", target_os = "netbsd", target_os = "dragonflybsd"))
+            "@vendor__mio-0.8.11//:mio",  # cfg(any(target_os = "freebsd", target_os = "openbsd", target_os = "netbsd", target_os = "dragonflybsd"))
+        ],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [
+            "@vendor__inotify-0.9.6//:inotify",  # cfg(any(target_os = "linux", target_os = "android"))
+            "@vendor__mio-0.8.11//:mio",  # cfg(any(target_os = "linux", target_os = "android"))
+        ],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [
+            "@vendor__inotify-0.9.6//:inotify",  # cfg(any(target_os = "linux", target_os = "android"))
+            "@vendor__mio-0.8.11//:mio",  # cfg(any(target_os = "linux", target_os = "android"))
+        ],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [
+            "@vendor__inotify-0.9.6//:inotify",  # cfg(any(target_os = "linux", target_os = "android"))
+            "@vendor__mio-0.8.11//:mio",  # cfg(any(target_os = "linux", target_os = "android"))
+        ],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [
+            "@vendor__bitflags-2.6.0//:bitflags",  # cfg(target_os = "macos")
+            "@vendor__fsevent-sys-4.1.0//:fsevent_sys",  # x86_64-apple-darwin
+        ],
+        "@rules_rust//rust/platform:x86_64-linux-android": [
+            "@vendor__inotify-0.9.6//:inotify",  # cfg(any(target_os = "linux", target_os = "android"))
+            "@vendor__mio-0.8.11//:mio",  # cfg(any(target_os = "linux", target_os = "android"))
+        ],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [
+            "@vendor__windows-sys-0.48.0//:windows_sys",  # cfg(windows)
+        ],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [
+            "@vendor__kqueue-1.0.8//:kqueue",  # cfg(any(target_os = "freebsd", target_os = "openbsd", target_os = "netbsd", target_os = "dragonflybsd"))
+            "@vendor__mio-0.8.11//:mio",  # cfg(any(target_os = "freebsd", target_os = "openbsd", target_os = "netbsd", target_os = "dragonflybsd"))
+        ],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [
+            "@vendor__inotify-0.9.6//:inotify",  # cfg(any(target_os = "linux", target_os = "android"))
+            "@vendor__mio-0.8.11//:mio",  # cfg(any(target_os = "linux", target_os = "android"))
+        ],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [
+            "@vendor__inotify-0.9.6//:inotify",  # cfg(any(target_os = "linux", target_os = "android"))
+            "@vendor__mio-0.8.11//:mio",  # cfg(any(target_os = "linux", target_os = "android"))
+        ],
+        "//conditions:default": [],
+    }),
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.nu-ansi-term-0.46.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.nu-ansi-term-0.46.0.bazel
new file mode 100644
index 00000000000..2d839fd982b
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.nu-ansi-term-0.46.0.bazel
@@ -0,0 +1,95 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "nu_ansi_term",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2018",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=nu-ansi-term",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.46.0",
+    deps = [
+        "@vendor__overload-0.1.1//:overload",
+    ] + select({
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [
+            "@vendor__winapi-0.3.9//:winapi",  # cfg(target_os = "windows")
+        ],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [
+            "@vendor__winapi-0.3.9//:winapi",  # cfg(target_os = "windows")
+        ],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [
+            "@vendor__winapi-0.3.9//:winapi",  # cfg(target_os = "windows")
+        ],
+        "//conditions:default": [],
+    }),
+)
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
new file mode 100644
index 00000000000..96ee6af158c
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.num-conv-0.1.0.bazel
@@ -0,0 +1,81 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "num_conv",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=num-conv",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.1.0",
+)
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
new file mode 100644
index 00000000000..6fc3ba861b9
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.num-traits-0.2.19.bazel
@@ -0,0 +1,151 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_build_script")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "num_traits",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "default",
+        "std",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=num-traits",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.2.19",
+    deps = [
+        "@vendor__num-traits-0.2.19//:build_script_build",
+    ],
+)
+
+cargo_build_script(
+    name = "_bs",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            "**/*.rs",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "default",
+        "std",
+    ],
+    crate_name = "build_script_build",
+    crate_root = "build.rs",
+    data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    edition = "2021",
+    pkg_name = "num-traits",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=num-traits",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    version = "0.2.19",
+    visibility = ["//visibility:private"],
+    deps = [
+        "@vendor__autocfg-1.4.0//:autocfg",
+    ],
+)
+
+alias(
+    name = "build_script_build",
+    actual = ":_bs",
+    tags = ["manual"],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.num_cpus-1.16.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.num_cpus-1.16.0.bazel
new file mode 100644
index 00000000000..27bb9411e56
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.num_cpus-1.16.0.bazel
@@ -0,0 +1,177 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "num_cpus",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2015",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=num_cpus",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "1.16.0",
+    deps = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [
+            "@vendor__libc-0.2.162//:libc",  # cfg(not(windows))
+        ],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [
+            "@vendor__libc-0.2.162//:libc",  # cfg(not(windows))
+        ],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [
+            "@vendor__libc-0.2.162//:libc",  # cfg(not(windows))
+        ],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [
+            "@vendor__libc-0.2.162//:libc",  # cfg(not(windows))
+        ],
+        "@rules_rust//rust/platform:aarch64-linux-android": [
+            "@vendor__libc-0.2.162//:libc",  # cfg(not(windows))
+        ],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [
+            "@vendor__libc-0.2.162//:libc",  # cfg(not(windows))
+        ],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [
+            "@vendor__libc-0.2.162//:libc",  # cfg(not(windows))
+        ],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [
+            "@vendor__libc-0.2.162//:libc",  # cfg(not(windows))
+        ],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [
+            "@vendor__libc-0.2.162//:libc",  # cfg(not(windows))
+        ],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [
+            "@vendor__libc-0.2.162//:libc",  # cfg(not(windows))
+        ],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [
+            "@vendor__libc-0.2.162//:libc",  # cfg(not(windows))
+        ],
+        "@rules_rust//rust/platform:i686-apple-darwin": [
+            "@vendor__libc-0.2.162//:libc",  # cfg(not(windows))
+        ],
+        "@rules_rust//rust/platform:i686-linux-android": [
+            "@vendor__libc-0.2.162//:libc",  # cfg(not(windows))
+        ],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [
+            "@vendor__libc-0.2.162//:libc",  # cfg(not(windows))
+        ],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [
+            "@vendor__libc-0.2.162//:libc",  # cfg(not(windows))
+        ],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [
+            "@vendor__libc-0.2.162//:libc",  # cfg(not(windows))
+        ],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [
+            "@vendor__libc-0.2.162//:libc",  # cfg(not(windows))
+        ],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [
+            "@vendor__libc-0.2.162//:libc",  # cfg(not(windows))
+        ],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [
+            "@vendor__libc-0.2.162//:libc",  # cfg(not(windows))
+        ],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [
+            "@vendor__libc-0.2.162//:libc",  # cfg(not(windows))
+        ],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [
+            "@vendor__libc-0.2.162//:libc",  # cfg(not(windows))
+        ],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [
+            "@vendor__libc-0.2.162//:libc",  # cfg(not(windows))
+        ],
+        "@rules_rust//rust/platform:wasm32-wasi": [
+            "@vendor__libc-0.2.162//:libc",  # cfg(not(windows))
+        ],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [
+            "@vendor__libc-0.2.162//:libc",  # cfg(not(windows))
+        ],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [
+            "@vendor__libc-0.2.162//:libc",  # cfg(not(windows))
+        ],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [
+            "@vendor__libc-0.2.162//:libc",  # cfg(not(windows))
+        ],
+        "@rules_rust//rust/platform:x86_64-linux-android": [
+            "@vendor__libc-0.2.162//:libc",  # cfg(not(windows))
+        ],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [
+            "@vendor__libc-0.2.162//:libc",  # cfg(not(windows))
+        ],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [
+            "@vendor__libc-0.2.162//:libc",  # cfg(not(windows))
+        ],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [
+            "@vendor__libc-0.2.162//:libc",  # cfg(not(windows))
+        ],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [
+            "@vendor__libc-0.2.162//:libc",  # cfg(not(windows))
+        ],
+        "//conditions:default": [],
+    }),
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.once_cell-1.20.2.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.once_cell-1.20.2.bazel
new file mode 100644
index 00000000000..14fc72faad8
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.once_cell-1.20.2.bazel
@@ -0,0 +1,87 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "once_cell",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "alloc",
+        "default",
+        "race",
+        "std",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=once_cell",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "1.20.2",
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.oorandom-11.1.4.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.oorandom-11.1.4.bazel
new file mode 100644
index 00000000000..156c46c9499
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.oorandom-11.1.4.bazel
@@ -0,0 +1,81 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "oorandom",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2018",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=oorandom",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "11.1.4",
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.os_str_bytes-7.0.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.os_str_bytes-7.0.0.bazel
new file mode 100644
index 00000000000..df955393b59
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.os_str_bytes-7.0.0.bazel
@@ -0,0 +1,89 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "os_str_bytes",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "default",
+        "memchr",
+        "raw_os_str",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=os_str_bytes",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "7.0.0",
+    deps = [
+        "@vendor__memchr-2.7.4//:memchr",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.overload-0.1.1.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.overload-0.1.1.bazel
new file mode 100644
index 00000000000..0ba943de30a
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.overload-0.1.1.bazel
@@ -0,0 +1,81 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "overload",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2018",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=overload",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.1.1",
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.parking_lot-0.12.3.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.parking_lot-0.12.3.bazel
new file mode 100644
index 00000000000..7d4110ccb2b
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.parking_lot-0.12.3.bazel
@@ -0,0 +1,88 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "parking_lot",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "default",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=parking_lot",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.12.3",
+    deps = [
+        "@vendor__lock_api-0.4.12//:lock_api",
+        "@vendor__parking_lot_core-0.9.10//:parking_lot_core",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.parking_lot_core-0.9.10.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.parking_lot_core-0.9.10.bazel
new file mode 100644
index 00000000000..ce65c3b65ea
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.parking_lot_core-0.9.10.bazel
@@ -0,0 +1,225 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_build_script")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "parking_lot_core",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=parking_lot_core",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.9.10",
+    deps = [
+        "@vendor__cfg-if-1.0.0//:cfg_if",
+        "@vendor__parking_lot_core-0.9.10//:build_script_build",
+        "@vendor__smallvec-1.13.2//:smallvec",
+    ] + select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [
+            "@vendor__libc-0.2.162//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [
+            "@vendor__libc-0.2.162//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [
+            "@vendor__libc-0.2.162//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [
+            "@vendor__libc-0.2.162//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:aarch64-linux-android": [
+            "@vendor__libc-0.2.162//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [
+            "@vendor__windows-targets-0.52.6//:windows_targets",  # cfg(windows)
+        ],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [
+            "@vendor__libc-0.2.162//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [
+            "@vendor__libc-0.2.162//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [
+            "@vendor__libc-0.2.162//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [
+            "@vendor__libc-0.2.162//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [
+            "@vendor__libc-0.2.162//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [
+            "@vendor__libc-0.2.162//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:i686-apple-darwin": [
+            "@vendor__libc-0.2.162//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:i686-linux-android": [
+            "@vendor__libc-0.2.162//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [
+            "@vendor__windows-targets-0.52.6//:windows_targets",  # cfg(windows)
+        ],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [
+            "@vendor__libc-0.2.162//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [
+            "@vendor__libc-0.2.162//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [
+            "@vendor__libc-0.2.162//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [
+            "@vendor__libc-0.2.162//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [
+            "@vendor__libc-0.2.162//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [
+            "@vendor__libc-0.2.162//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [
+            "@vendor__libc-0.2.162//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:x86_64-linux-android": [
+            "@vendor__libc-0.2.162//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [
+            "@vendor__windows-targets-0.52.6//:windows_targets",  # cfg(windows)
+        ],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [
+            "@vendor__libc-0.2.162//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [
+            "@vendor__libc-0.2.162//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [
+            "@vendor__libc-0.2.162//:libc",  # cfg(unix)
+        ],
+        "//conditions:default": [],
+    }),
+)
+
+cargo_build_script(
+    name = "_bs",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            "**/*.rs",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_name = "build_script_build",
+    crate_root = "build.rs",
+    data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    edition = "2021",
+    pkg_name = "parking_lot_core",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=parking_lot_core",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    version = "0.9.10",
+    visibility = ["//visibility:private"],
+)
+
+alias(
+    name = "build_script_build",
+    actual = ":_bs",
+    tags = ["manual"],
+)
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
new file mode 100644
index 00000000000..9dd42d9ba13
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.pear-0.2.9.bazel
@@ -0,0 +1,93 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "pear",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "color",
+        "default",
+        "yansi",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2018",
+    proc_macro_deps = [
+        "@vendor__pear_codegen-0.2.9//:pear_codegen",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=pear",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.2.9",
+    deps = [
+        "@vendor__inlinable_string-0.1.15//:inlinable_string",
+        "@vendor__yansi-1.0.1//:yansi",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.pear_codegen-0.2.9.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.pear_codegen-0.2.9.bazel
new file mode 100644
index 00000000000..3028decaf06
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.pear_codegen-0.2.9.bazel
@@ -0,0 +1,87 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//rust:defs.bzl", "rust_proc_macro")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_proc_macro(
+    name = "pear_codegen",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2018",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=pear_codegen",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.2.9",
+    deps = [
+        "@vendor__proc-macro2-1.0.89//:proc_macro2",
+        "@vendor__proc-macro2-diagnostics-0.10.1//:proc_macro2_diagnostics",
+        "@vendor__quote-1.0.37//:quote",
+        "@vendor__syn-2.0.87//:syn",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.perf-event-0.4.7.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.perf-event-0.4.7.bazel
new file mode 100644
index 00000000000..7d62f68f92a
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.perf-event-0.4.7.bazel
@@ -0,0 +1,85 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "perf_event",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2018",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=perf-event",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.4.7",
+    deps = [
+        "@vendor__libc-0.2.162//:libc",
+        "@vendor__perf-event-open-sys-1.0.1//:perf_event_open_sys",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.perf-event-open-sys-1.0.1.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.perf-event-open-sys-1.0.1.bazel
new file mode 100644
index 00000000000..2dfe6b455da
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.perf-event-open-sys-1.0.1.bazel
@@ -0,0 +1,84 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "perf_event_open_sys",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2018",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=perf-event-open-sys",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "1.0.1",
+    deps = [
+        "@vendor__libc-0.2.162//:libc",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.petgraph-0.6.5.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.petgraph-0.6.5.bazel
new file mode 100644
index 00000000000..eca79ef4948
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.petgraph-0.6.5.bazel
@@ -0,0 +1,91 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "petgraph",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "default",
+        "graphmap",
+        "matrix_graph",
+        "stable_graph",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2018",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=petgraph",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.6.5",
+    deps = [
+        "@vendor__fixedbitset-0.4.2//:fixedbitset",
+        "@vendor__indexmap-2.6.0//:indexmap",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.pin-project-lite-0.2.15.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.pin-project-lite-0.2.15.bazel
new file mode 100644
index 00000000000..3c03acccb59
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.pin-project-lite-0.2.15.bazel
@@ -0,0 +1,81 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "pin_project_lite",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2018",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=pin-project-lite",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.2.15",
+)
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
new file mode 100644
index 00000000000..464f5db6126
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.powerfmt-0.2.0.bazel
@@ -0,0 +1,81 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "powerfmt",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=powerfmt",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.2.0",
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ppv-lite86-0.2.20.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ppv-lite86-0.2.20.bazel
new file mode 100644
index 00000000000..4bce7c6187f
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ppv-lite86-0.2.20.bazel
@@ -0,0 +1,88 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "ppv_lite86",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "simd",
+        "std",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=ppv-lite86",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.2.20",
+    deps = [
+        "@vendor__zerocopy-0.7.35//:zerocopy",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.proc-macro2-1.0.89.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.proc-macro2-1.0.89.bazel
new file mode 100644
index 00000000000..bc7bf5f6e44
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.proc-macro2-1.0.89.bazel
@@ -0,0 +1,149 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_build_script")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "proc_macro2",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "default",
+        "proc-macro",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=proc-macro2",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "1.0.89",
+    deps = [
+        "@vendor__proc-macro2-1.0.89//:build_script_build",
+        "@vendor__unicode-ident-1.0.13//:unicode_ident",
+    ],
+)
+
+cargo_build_script(
+    name = "_bs",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            "**/*.rs",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "default",
+        "proc-macro",
+    ],
+    crate_name = "build_script_build",
+    crate_root = "build.rs",
+    data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    edition = "2021",
+    pkg_name = "proc-macro2",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=proc-macro2",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    version = "1.0.89",
+    visibility = ["//visibility:private"],
+)
+
+alias(
+    name = "build_script_build",
+    actual = ":_bs",
+    tags = ["manual"],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.proc-macro2-diagnostics-0.10.1.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.proc-macro2-diagnostics-0.10.1.bazel
new file mode 100644
index 00000000000..8e5c6f135db
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.proc-macro2-diagnostics-0.10.1.bazel
@@ -0,0 +1,157 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_build_script")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "proc_macro2_diagnostics",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "colors",
+        "default",
+        "yansi",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2018",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=proc-macro2-diagnostics",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.10.1",
+    deps = [
+        "@vendor__proc-macro2-1.0.89//:proc_macro2",
+        "@vendor__proc-macro2-diagnostics-0.10.1//:build_script_build",
+        "@vendor__quote-1.0.37//:quote",
+        "@vendor__syn-2.0.87//:syn",
+        "@vendor__yansi-1.0.1//:yansi",
+    ],
+)
+
+cargo_build_script(
+    name = "_bs",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            "**/*.rs",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "colors",
+        "default",
+        "yansi",
+    ],
+    crate_name = "build_script_build",
+    crate_root = "build.rs",
+    data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    edition = "2018",
+    pkg_name = "proc-macro2-diagnostics",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=proc-macro2-diagnostics",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    version = "0.10.1",
+    visibility = ["//visibility:private"],
+    deps = [
+        "@vendor__version_check-0.9.5//:version_check",
+    ],
+)
+
+alias(
+    name = "build_script_build",
+    actual = ":_bs",
+    tags = ["manual"],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.quote-1.0.37.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.quote-1.0.37.bazel
new file mode 100644
index 00000000000..2ad19e547c1
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.quote-1.0.37.bazel
@@ -0,0 +1,88 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "quote",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "default",
+        "proc-macro",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2018",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=quote",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "1.0.37",
+    deps = [
+        "@vendor__proc-macro2-1.0.89//:proc_macro2",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra-ap-rustc_abi-0.63.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra-ap-rustc_abi-0.63.0.bazel
new file mode 100644
index 00000000000..8cb5c012bd6
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra-ap-rustc_abi-0.63.0.bazel
@@ -0,0 +1,89 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "ra_ap_rustc_abi",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    aliases = {
+        "@vendor__ra-ap-rustc_index-0.63.0//:ra_ap_rustc_index": "rustc_index",
+    },
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=ra-ap-rustc_abi",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.63.0",
+    deps = [
+        "@vendor__bitflags-2.6.0//:bitflags",
+        "@vendor__ra-ap-rustc_index-0.63.0//:ra_ap_rustc_index",
+        "@vendor__tracing-0.1.40//:tracing",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra-ap-rustc_index-0.63.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra-ap-rustc_index-0.63.0.bazel
new file mode 100644
index 00000000000..c9036e9112e
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra-ap-rustc_index-0.63.0.bazel
@@ -0,0 +1,91 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "ra_ap_rustc_index",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    aliases = {
+        "@vendor__ra-ap-rustc_index_macros-0.63.0//:ra_ap_rustc_index_macros": "rustc_index_macros",
+    },
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    proc_macro_deps = [
+        "@vendor__ra-ap-rustc_index_macros-0.63.0//:ra_ap_rustc_index_macros",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=ra-ap-rustc_index",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.63.0",
+    deps = [
+        "@vendor__arrayvec-0.7.6//:arrayvec",
+        "@vendor__smallvec-1.13.2//:smallvec",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra-ap-rustc_index_macros-0.63.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra-ap-rustc_index_macros-0.63.0.bazel
new file mode 100644
index 00000000000..99bc76323f3
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra-ap-rustc_index_macros-0.63.0.bazel
@@ -0,0 +1,86 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//rust:defs.bzl", "rust_proc_macro")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_proc_macro(
+    name = "ra_ap_rustc_index_macros",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=ra-ap-rustc_index_macros",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.63.0",
+    deps = [
+        "@vendor__proc-macro2-1.0.89//:proc_macro2",
+        "@vendor__quote-1.0.37//:quote",
+        "@vendor__syn-2.0.87//:syn",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra-ap-rustc_lexer-0.63.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra-ap-rustc_lexer-0.63.0.bazel
new file mode 100644
index 00000000000..b0dc0fbb822
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra-ap-rustc_lexer-0.63.0.bazel
@@ -0,0 +1,85 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "ra_ap_rustc_lexer",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=ra-ap-rustc_lexer",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.63.0",
+    deps = [
+        "@vendor__unicode-properties-0.1.3//:unicode_properties",
+        "@vendor__unicode-xid-0.2.6//:unicode_xid",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra-ap-rustc_parse_format-0.63.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra-ap-rustc_parse_format-0.63.0.bazel
new file mode 100644
index 00000000000..8b9700233eb
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra-ap-rustc_parse_format-0.63.0.bazel
@@ -0,0 +1,89 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "ra_ap_rustc_parse_format",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    aliases = {
+        "@vendor__ra-ap-rustc_index-0.63.0//:ra_ap_rustc_index": "rustc_index",
+        "@vendor__ra-ap-rustc_lexer-0.63.0//:ra_ap_rustc_lexer": "rustc_lexer",
+    },
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=ra-ap-rustc_parse_format",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.63.0",
+    deps = [
+        "@vendor__ra-ap-rustc_index-0.63.0//:ra_ap_rustc_index",
+        "@vendor__ra-ap-rustc_lexer-0.63.0//:ra_ap_rustc_lexer",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra-ap-rustc_pattern_analysis-0.63.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra-ap-rustc_pattern_analysis-0.63.0.bazel
new file mode 100644
index 00000000000..29456d75bd9
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra-ap-rustc_pattern_analysis-0.63.0.bazel
@@ -0,0 +1,91 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "ra_ap_rustc_pattern_analysis",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    aliases = {
+        "@vendor__ra-ap-rustc_index-0.63.0//:ra_ap_rustc_index": "rustc_index",
+    },
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=ra-ap-rustc_pattern_analysis",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.63.0",
+    deps = [
+        "@vendor__ra-ap-rustc_index-0.63.0//:ra_ap_rustc_index",
+        "@vendor__rustc-hash-1.1.0//:rustc_hash",
+        "@vendor__rustc_apfloat-0.2.1-llvm-462a31f5a5ab//:rustc_apfloat",
+        "@vendor__smallvec-1.13.2//:smallvec",
+        "@vendor__tracing-0.1.40//:tracing",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_base_db-0.0.232.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_base_db-0.0.232.bazel
new file mode 100644
index 00000000000..ac62e9fa6e8
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_base_db-0.0.232.bazel
@@ -0,0 +1,104 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "ra_ap_base_db",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    aliases = {
+        "@vendor__ra_ap_cfg-0.0.232//:ra_ap_cfg": "cfg",
+        "@vendor__ra_ap_intern-0.0.232//:ra_ap_intern": "intern",
+        "@vendor__ra_ap_span-0.0.232//:ra_ap_span": "span",
+        "@vendor__ra_ap_stdx-0.0.232//:ra_ap_stdx": "stdx",
+        "@vendor__ra_ap_syntax-0.0.232//:ra_ap_syntax": "syntax",
+        "@vendor__ra_ap_vfs-0.0.232//:ra_ap_vfs": "vfs",
+    },
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=ra_ap_base_db",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.0.232",
+    deps = [
+        "@vendor__la-arena-0.3.1//:la_arena",
+        "@vendor__lz4_flex-0.11.3//:lz4_flex",
+        "@vendor__ra_ap_cfg-0.0.232//:ra_ap_cfg",
+        "@vendor__ra_ap_intern-0.0.232//:ra_ap_intern",
+        "@vendor__ra_ap_salsa-0.0.232//:salsa",
+        "@vendor__ra_ap_span-0.0.232//:ra_ap_span",
+        "@vendor__ra_ap_stdx-0.0.232//:ra_ap_stdx",
+        "@vendor__ra_ap_syntax-0.0.232//:ra_ap_syntax",
+        "@vendor__ra_ap_vfs-0.0.232//:ra_ap_vfs",
+        "@vendor__rustc-hash-1.1.0//:rustc_hash",
+        "@vendor__semver-1.0.23//:semver",
+        "@vendor__tracing-0.1.40//:tracing",
+        "@vendor__triomphe-0.1.14//:triomphe",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_cfg-0.0.232.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_cfg-0.0.232.bazel
new file mode 100644
index 00000000000..4a40dd49384
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_cfg-0.0.232.bazel
@@ -0,0 +1,93 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "ra_ap_cfg",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    aliases = {
+        "@vendor__ra_ap_intern-0.0.232//:ra_ap_intern": "intern",
+        "@vendor__ra_ap_tt-0.0.232//:ra_ap_tt": "tt",
+    },
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "tt",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=ra_ap_cfg",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.0.232",
+    deps = [
+        "@vendor__ra_ap_intern-0.0.232//:ra_ap_intern",
+        "@vendor__ra_ap_tt-0.0.232//:ra_ap_tt",
+        "@vendor__rustc-hash-1.1.0//:rustc_hash",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_hir-0.0.232.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_hir-0.0.232.bazel
new file mode 100644
index 00000000000..c5ed2d5e99c
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_hir-0.0.232.bazel
@@ -0,0 +1,112 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "ra_ap_hir",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    aliases = {
+        "@vendor__ra_ap_base_db-0.0.232//:ra_ap_base_db": "base_db",
+        "@vendor__ra_ap_cfg-0.0.232//:ra_ap_cfg": "cfg",
+        "@vendor__ra_ap_hir_def-0.0.232//:ra_ap_hir_def": "hir_def",
+        "@vendor__ra_ap_hir_expand-0.0.232//:ra_ap_hir_expand": "hir_expand",
+        "@vendor__ra_ap_hir_ty-0.0.232//:ra_ap_hir_ty": "hir_ty",
+        "@vendor__ra_ap_intern-0.0.232//:ra_ap_intern": "intern",
+        "@vendor__ra_ap_span-0.0.232//:ra_ap_span": "span",
+        "@vendor__ra_ap_stdx-0.0.232//:ra_ap_stdx": "stdx",
+        "@vendor__ra_ap_syntax-0.0.232//:ra_ap_syntax": "syntax",
+        "@vendor__ra_ap_tt-0.0.232//:ra_ap_tt": "tt",
+    },
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=ra_ap_hir",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.0.232",
+    deps = [
+        "@vendor__arrayvec-0.7.6//:arrayvec",
+        "@vendor__either-1.13.0//:either",
+        "@vendor__itertools-0.12.1//:itertools",
+        "@vendor__ra_ap_base_db-0.0.232//:ra_ap_base_db",
+        "@vendor__ra_ap_cfg-0.0.232//:ra_ap_cfg",
+        "@vendor__ra_ap_hir_def-0.0.232//:ra_ap_hir_def",
+        "@vendor__ra_ap_hir_expand-0.0.232//:ra_ap_hir_expand",
+        "@vendor__ra_ap_hir_ty-0.0.232//:ra_ap_hir_ty",
+        "@vendor__ra_ap_intern-0.0.232//:ra_ap_intern",
+        "@vendor__ra_ap_span-0.0.232//:ra_ap_span",
+        "@vendor__ra_ap_stdx-0.0.232//:ra_ap_stdx",
+        "@vendor__ra_ap_syntax-0.0.232//:ra_ap_syntax",
+        "@vendor__ra_ap_tt-0.0.232//:ra_ap_tt",
+        "@vendor__rustc-hash-1.1.0//:rustc_hash",
+        "@vendor__smallvec-1.13.2//:smallvec",
+        "@vendor__tracing-0.1.40//:tracing",
+        "@vendor__triomphe-0.1.14//:triomphe",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_hir_def-0.0.232.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_hir_def-0.0.232.bazel
new file mode 100644
index 00000000000..692d67bd783
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_hir_def-0.0.232.bazel
@@ -0,0 +1,123 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "ra_ap_hir_def",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    aliases = {
+        "@vendor__ra_ap_base_db-0.0.232//:ra_ap_base_db": "base_db",
+        "@vendor__ra_ap_cfg-0.0.232//:ra_ap_cfg": "cfg",
+        "@vendor__ra_ap_hir_expand-0.0.232//:ra_ap_hir_expand": "hir_expand",
+        "@vendor__ra_ap_intern-0.0.232//:ra_ap_intern": "intern",
+        "@vendor__ra_ap_limit-0.0.232//:ra_ap_limit": "limit",
+        "@vendor__ra_ap_mbe-0.0.232//:ra_ap_mbe": "mbe",
+        "@vendor__ra_ap_span-0.0.232//:ra_ap_span": "span",
+        "@vendor__ra_ap_stdx-0.0.232//:ra_ap_stdx": "stdx",
+        "@vendor__ra_ap_syntax-0.0.232//:ra_ap_syntax": "syntax",
+        "@vendor__ra_ap_tt-0.0.232//:ra_ap_tt": "tt",
+    },
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=ra_ap_hir_def",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.0.232",
+    deps = [
+        "@vendor__arrayvec-0.7.6//:arrayvec",
+        "@vendor__bitflags-2.6.0//:bitflags",
+        "@vendor__cov-mark-2.0.0//:cov_mark",
+        "@vendor__dashmap-5.5.3//:dashmap",
+        "@vendor__drop_bomb-0.1.5//:drop_bomb",
+        "@vendor__either-1.13.0//:either",
+        "@vendor__fst-0.4.7//:fst",
+        "@vendor__hashbrown-0.14.5//:hashbrown",
+        "@vendor__indexmap-2.6.0//:indexmap",
+        "@vendor__itertools-0.12.1//:itertools",
+        "@vendor__la-arena-0.3.1//:la_arena",
+        "@vendor__ra-ap-rustc_abi-0.63.0//:ra_ap_rustc_abi",
+        "@vendor__ra-ap-rustc_parse_format-0.63.0//:ra_ap_rustc_parse_format",
+        "@vendor__ra_ap_base_db-0.0.232//:ra_ap_base_db",
+        "@vendor__ra_ap_cfg-0.0.232//:ra_ap_cfg",
+        "@vendor__ra_ap_hir_expand-0.0.232//:ra_ap_hir_expand",
+        "@vendor__ra_ap_intern-0.0.232//:ra_ap_intern",
+        "@vendor__ra_ap_limit-0.0.232//:ra_ap_limit",
+        "@vendor__ra_ap_mbe-0.0.232//:ra_ap_mbe",
+        "@vendor__ra_ap_span-0.0.232//:ra_ap_span",
+        "@vendor__ra_ap_stdx-0.0.232//:ra_ap_stdx",
+        "@vendor__ra_ap_syntax-0.0.232//:ra_ap_syntax",
+        "@vendor__ra_ap_tt-0.0.232//:ra_ap_tt",
+        "@vendor__rustc-hash-1.1.0//:rustc_hash",
+        "@vendor__rustc_apfloat-0.2.1-llvm-462a31f5a5ab//:rustc_apfloat",
+        "@vendor__smallvec-1.13.2//:smallvec",
+        "@vendor__tracing-0.1.40//:tracing",
+        "@vendor__triomphe-0.1.14//:triomphe",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_hir_expand-0.0.232.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_hir_expand-0.0.232.bazel
new file mode 100644
index 00000000000..63bbc0bcce9
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_hir_expand-0.0.232.bazel
@@ -0,0 +1,116 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "ra_ap_hir_expand",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    aliases = {
+        "@vendor__ra_ap_base_db-0.0.232//:ra_ap_base_db": "base_db",
+        "@vendor__ra_ap_cfg-0.0.232//:ra_ap_cfg": "cfg",
+        "@vendor__ra_ap_intern-0.0.232//:ra_ap_intern": "intern",
+        "@vendor__ra_ap_limit-0.0.232//:ra_ap_limit": "limit",
+        "@vendor__ra_ap_mbe-0.0.232//:ra_ap_mbe": "mbe",
+        "@vendor__ra_ap_parser-0.0.232//:ra_ap_parser": "parser",
+        "@vendor__ra_ap_span-0.0.232//:ra_ap_span": "span",
+        "@vendor__ra_ap_stdx-0.0.232//:ra_ap_stdx": "stdx",
+        "@vendor__ra_ap_syntax-0.0.232//:ra_ap_syntax": "syntax",
+        "@vendor__ra_ap_syntax-bridge-0.0.232//:ra_ap_syntax_bridge": "syntax_bridge",
+        "@vendor__ra_ap_tt-0.0.232//:ra_ap_tt": "tt",
+    },
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=ra_ap_hir_expand",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.0.232",
+    deps = [
+        "@vendor__cov-mark-2.0.0//:cov_mark",
+        "@vendor__either-1.13.0//:either",
+        "@vendor__hashbrown-0.14.5//:hashbrown",
+        "@vendor__itertools-0.12.1//:itertools",
+        "@vendor__la-arena-0.3.1//:la_arena",
+        "@vendor__ra_ap_base_db-0.0.232//:ra_ap_base_db",
+        "@vendor__ra_ap_cfg-0.0.232//:ra_ap_cfg",
+        "@vendor__ra_ap_intern-0.0.232//:ra_ap_intern",
+        "@vendor__ra_ap_limit-0.0.232//:ra_ap_limit",
+        "@vendor__ra_ap_mbe-0.0.232//:ra_ap_mbe",
+        "@vendor__ra_ap_parser-0.0.232//:ra_ap_parser",
+        "@vendor__ra_ap_span-0.0.232//:ra_ap_span",
+        "@vendor__ra_ap_stdx-0.0.232//:ra_ap_stdx",
+        "@vendor__ra_ap_syntax-0.0.232//:ra_ap_syntax",
+        "@vendor__ra_ap_syntax-bridge-0.0.232//:ra_ap_syntax_bridge",
+        "@vendor__ra_ap_tt-0.0.232//:ra_ap_tt",
+        "@vendor__rustc-hash-1.1.0//:rustc_hash",
+        "@vendor__smallvec-1.13.2//:smallvec",
+        "@vendor__tracing-0.1.40//:tracing",
+        "@vendor__triomphe-0.1.14//:triomphe",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_hir_ty-0.0.232.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_hir_ty-0.0.232.bazel
new file mode 100644
index 00000000000..2ab7288dddb
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_hir_ty-0.0.232.bazel
@@ -0,0 +1,127 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "ra_ap_hir_ty",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    aliases = {
+        "@vendor__ra_ap_base_db-0.0.232//:ra_ap_base_db": "base_db",
+        "@vendor__ra_ap_hir_def-0.0.232//:ra_ap_hir_def": "hir_def",
+        "@vendor__ra_ap_hir_expand-0.0.232//:ra_ap_hir_expand": "hir_expand",
+        "@vendor__ra_ap_intern-0.0.232//:ra_ap_intern": "intern",
+        "@vendor__ra_ap_limit-0.0.232//:ra_ap_limit": "limit",
+        "@vendor__ra_ap_span-0.0.232//:ra_ap_span": "span",
+        "@vendor__ra_ap_stdx-0.0.232//:ra_ap_stdx": "stdx",
+        "@vendor__ra_ap_syntax-0.0.232//:ra_ap_syntax": "syntax",
+    },
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    proc_macro_deps = [
+        "@vendor__chalk-derive-0.98.0//:chalk_derive",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=ra_ap_hir_ty",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.0.232",
+    deps = [
+        "@vendor__arrayvec-0.7.6//:arrayvec",
+        "@vendor__bitflags-2.6.0//:bitflags",
+        "@vendor__chalk-ir-0.98.0//:chalk_ir",
+        "@vendor__chalk-recursive-0.98.0//:chalk_recursive",
+        "@vendor__chalk-solve-0.98.0//:chalk_solve",
+        "@vendor__cov-mark-2.0.0//:cov_mark",
+        "@vendor__either-1.13.0//:either",
+        "@vendor__ena-0.14.3//:ena",
+        "@vendor__indexmap-2.6.0//:indexmap",
+        "@vendor__itertools-0.12.1//:itertools",
+        "@vendor__la-arena-0.3.1//:la_arena",
+        "@vendor__nohash-hasher-0.2.0//:nohash_hasher",
+        "@vendor__oorandom-11.1.4//:oorandom",
+        "@vendor__ra-ap-rustc_abi-0.63.0//:ra_ap_rustc_abi",
+        "@vendor__ra-ap-rustc_index-0.63.0//:ra_ap_rustc_index",
+        "@vendor__ra-ap-rustc_pattern_analysis-0.63.0//:ra_ap_rustc_pattern_analysis",
+        "@vendor__ra_ap_base_db-0.0.232//:ra_ap_base_db",
+        "@vendor__ra_ap_hir_def-0.0.232//:ra_ap_hir_def",
+        "@vendor__ra_ap_hir_expand-0.0.232//:ra_ap_hir_expand",
+        "@vendor__ra_ap_intern-0.0.232//:ra_ap_intern",
+        "@vendor__ra_ap_limit-0.0.232//:ra_ap_limit",
+        "@vendor__ra_ap_span-0.0.232//:ra_ap_span",
+        "@vendor__ra_ap_stdx-0.0.232//:ra_ap_stdx",
+        "@vendor__ra_ap_syntax-0.0.232//:ra_ap_syntax",
+        "@vendor__rustc-hash-1.1.0//:rustc_hash",
+        "@vendor__rustc_apfloat-0.2.1-llvm-462a31f5a5ab//:rustc_apfloat",
+        "@vendor__scoped-tls-1.0.1//:scoped_tls",
+        "@vendor__smallvec-1.13.2//:smallvec",
+        "@vendor__tracing-0.1.40//:tracing",
+        "@vendor__triomphe-0.1.14//:triomphe",
+        "@vendor__typed-arena-2.0.2//:typed_arena",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_ide_db-0.0.232.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_ide_db-0.0.232.bazel
new file mode 100644
index 00000000000..c9a42c26509
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_ide_db-0.0.232.bazel
@@ -0,0 +1,118 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "ra_ap_ide_db",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    aliases = {
+        "@vendor__ra_ap_base_db-0.0.232//:ra_ap_base_db": "base_db",
+        "@vendor__ra_ap_hir-0.0.232//:ra_ap_hir": "hir",
+        "@vendor__ra_ap_limit-0.0.232//:ra_ap_limit": "limit",
+        "@vendor__ra_ap_parser-0.0.232//:ra_ap_parser": "parser",
+        "@vendor__ra_ap_profile-0.0.232//:ra_ap_profile": "profile",
+        "@vendor__ra_ap_span-0.0.232//:ra_ap_span": "span",
+        "@vendor__ra_ap_stdx-0.0.232//:ra_ap_stdx": "stdx",
+        "@vendor__ra_ap_syntax-0.0.232//:ra_ap_syntax": "syntax",
+        "@vendor__ra_ap_text_edit-0.0.232//:ra_ap_text_edit": "text_edit",
+    },
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=ra_ap_ide_db",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.0.232",
+    deps = [
+        "@vendor__arrayvec-0.7.6//:arrayvec",
+        "@vendor__bitflags-2.6.0//:bitflags",
+        "@vendor__cov-mark-2.0.0//:cov_mark",
+        "@vendor__crossbeam-channel-0.5.13//:crossbeam_channel",
+        "@vendor__either-1.13.0//:either",
+        "@vendor__fst-0.4.7//:fst",
+        "@vendor__indexmap-2.6.0//:indexmap",
+        "@vendor__itertools-0.12.1//:itertools",
+        "@vendor__line-index-0.1.2//:line_index",
+        "@vendor__memchr-2.7.4//:memchr",
+        "@vendor__nohash-hasher-0.2.0//:nohash_hasher",
+        "@vendor__ra_ap_base_db-0.0.232//:ra_ap_base_db",
+        "@vendor__ra_ap_hir-0.0.232//:ra_ap_hir",
+        "@vendor__ra_ap_limit-0.0.232//:ra_ap_limit",
+        "@vendor__ra_ap_parser-0.0.232//:ra_ap_parser",
+        "@vendor__ra_ap_profile-0.0.232//:ra_ap_profile",
+        "@vendor__ra_ap_span-0.0.232//:ra_ap_span",
+        "@vendor__ra_ap_stdx-0.0.232//:ra_ap_stdx",
+        "@vendor__ra_ap_syntax-0.0.232//:ra_ap_syntax",
+        "@vendor__ra_ap_text_edit-0.0.232//:ra_ap_text_edit",
+        "@vendor__rayon-1.10.0//:rayon",
+        "@vendor__rustc-hash-1.1.0//:rustc_hash",
+        "@vendor__tracing-0.1.40//:tracing",
+        "@vendor__triomphe-0.1.14//:triomphe",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_intern-0.0.232.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_intern-0.0.232.bazel
new file mode 100644
index 00000000000..a45f6112832
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_intern-0.0.232.bazel
@@ -0,0 +1,88 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "ra_ap_intern",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=ra_ap_intern",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.0.232",
+    deps = [
+        "@vendor__dashmap-5.5.3//:dashmap",
+        "@vendor__hashbrown-0.14.5//:hashbrown",
+        "@vendor__rustc-hash-1.1.0//:rustc_hash",
+        "@vendor__sptr-0.3.2//:sptr",
+        "@vendor__triomphe-0.1.14//:triomphe",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_limit-0.0.232.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_limit-0.0.232.bazel
new file mode 100644
index 00000000000..dae361476ac
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_limit-0.0.232.bazel
@@ -0,0 +1,81 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "ra_ap_limit",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=ra_ap_limit",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.0.232",
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_load-cargo-0.0.232.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_load-cargo-0.0.232.bazel
new file mode 100644
index 00000000000..bd587db5731
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_load-cargo-0.0.232.bazel
@@ -0,0 +1,109 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "ra_ap_load_cargo",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    aliases = {
+        "@vendor__ra_ap_hir_expand-0.0.232//:ra_ap_hir_expand": "hir_expand",
+        "@vendor__ra_ap_ide_db-0.0.232//:ra_ap_ide_db": "ide_db",
+        "@vendor__ra_ap_intern-0.0.232//:ra_ap_intern": "intern",
+        "@vendor__ra_ap_paths-0.0.232//:ra_ap_paths": "paths",
+        "@vendor__ra_ap_proc_macro_api-0.0.232//:ra_ap_proc_macro_api": "proc_macro_api",
+        "@vendor__ra_ap_project_model-0.0.232//:ra_ap_project_model": "project_model",
+        "@vendor__ra_ap_span-0.0.232//:ra_ap_span": "span",
+        "@vendor__ra_ap_tt-0.0.232//:ra_ap_tt": "tt",
+        "@vendor__ra_ap_vfs-0.0.232//:ra_ap_vfs": "vfs",
+        "@vendor__ra_ap_vfs-notify-0.0.232//:ra_ap_vfs_notify": "vfs_notify",
+    },
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=ra_ap_load-cargo",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.0.232",
+    deps = [
+        "@vendor__anyhow-1.0.93//:anyhow",
+        "@vendor__crossbeam-channel-0.5.13//:crossbeam_channel",
+        "@vendor__itertools-0.12.1//:itertools",
+        "@vendor__ra_ap_hir_expand-0.0.232//:ra_ap_hir_expand",
+        "@vendor__ra_ap_ide_db-0.0.232//:ra_ap_ide_db",
+        "@vendor__ra_ap_intern-0.0.232//:ra_ap_intern",
+        "@vendor__ra_ap_paths-0.0.232//:ra_ap_paths",
+        "@vendor__ra_ap_proc_macro_api-0.0.232//:ra_ap_proc_macro_api",
+        "@vendor__ra_ap_project_model-0.0.232//:ra_ap_project_model",
+        "@vendor__ra_ap_span-0.0.232//:ra_ap_span",
+        "@vendor__ra_ap_tt-0.0.232//:ra_ap_tt",
+        "@vendor__ra_ap_vfs-0.0.232//:ra_ap_vfs",
+        "@vendor__ra_ap_vfs-notify-0.0.232//:ra_ap_vfs_notify",
+        "@vendor__tracing-0.1.40//:tracing",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_mbe-0.0.232.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_mbe-0.0.232.bazel
new file mode 100644
index 00000000000..daed6a0e2bc
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_mbe-0.0.232.bazel
@@ -0,0 +1,104 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "ra_ap_mbe",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    aliases = {
+        "@vendor__ra_ap_intern-0.0.232//:ra_ap_intern": "intern",
+        "@vendor__ra_ap_parser-0.0.232//:ra_ap_parser": "parser",
+        "@vendor__ra_ap_span-0.0.232//:ra_ap_span": "span",
+        "@vendor__ra_ap_stdx-0.0.232//:ra_ap_stdx": "stdx",
+        "@vendor__ra_ap_syntax-0.0.232//:ra_ap_syntax": "syntax",
+        "@vendor__ra_ap_syntax-bridge-0.0.232//:ra_ap_syntax_bridge": "syntax_bridge",
+        "@vendor__ra_ap_tt-0.0.232//:ra_ap_tt": "tt",
+    },
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=ra_ap_mbe",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.0.232",
+    deps = [
+        "@vendor__arrayvec-0.7.6//:arrayvec",
+        "@vendor__cov-mark-2.0.0//:cov_mark",
+        "@vendor__ra_ap_intern-0.0.232//:ra_ap_intern",
+        "@vendor__ra_ap_parser-0.0.232//:ra_ap_parser",
+        "@vendor__ra_ap_span-0.0.232//:ra_ap_span",
+        "@vendor__ra_ap_stdx-0.0.232//:ra_ap_stdx",
+        "@vendor__ra_ap_syntax-0.0.232//:ra_ap_syntax",
+        "@vendor__ra_ap_syntax-bridge-0.0.232//:ra_ap_syntax_bridge",
+        "@vendor__ra_ap_tt-0.0.232//:ra_ap_tt",
+        "@vendor__rustc-hash-1.1.0//:rustc_hash",
+        "@vendor__smallvec-1.13.2//:smallvec",
+        "@vendor__tracing-0.1.40//:tracing",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_parser-0.0.232.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_parser-0.0.232.bazel
new file mode 100644
index 00000000000..d512c568421
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_parser-0.0.232.bazel
@@ -0,0 +1,94 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "ra_ap_parser",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    aliases = {
+        "@vendor__ra_ap_limit-0.0.232//:ra_ap_limit": "limit",
+    },
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "default",
+        "tracing",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=ra_ap_parser",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.0.232",
+    deps = [
+        "@vendor__drop_bomb-0.1.5//:drop_bomb",
+        "@vendor__ra-ap-rustc_lexer-0.63.0//:ra_ap_rustc_lexer",
+        "@vendor__ra_ap_limit-0.0.232//:ra_ap_limit",
+        "@vendor__tracing-0.1.40//:tracing",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_paths-0.0.232.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_paths-0.0.232.bazel
new file mode 100644
index 00000000000..631643fbc6b
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_paths-0.0.232.bazel
@@ -0,0 +1,88 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "ra_ap_paths",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "serde1",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=ra_ap_paths",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.0.232",
+    deps = [
+        "@vendor__camino-1.1.9//:camino",
+        "@vendor__serde-1.0.214//:serde",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_proc_macro_api-0.0.232.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_proc_macro_api-0.0.232.bazel
new file mode 100644
index 00000000000..d1f5d480d71
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_proc_macro_api-0.0.232.bazel
@@ -0,0 +1,102 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "ra_ap_proc_macro_api",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    aliases = {
+        "@vendor__ra_ap_base_db-0.0.232//:ra_ap_base_db": "base_db",
+        "@vendor__ra_ap_intern-0.0.232//:ra_ap_intern": "intern",
+        "@vendor__ra_ap_paths-0.0.232//:ra_ap_paths": "paths",
+        "@vendor__ra_ap_span-0.0.232//:ra_ap_span": "span",
+        "@vendor__ra_ap_stdx-0.0.232//:ra_ap_stdx": "stdx",
+        "@vendor__ra_ap_tt-0.0.232//:ra_ap_tt": "tt",
+    },
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=ra_ap_proc_macro_api",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.0.232",
+    deps = [
+        "@vendor__indexmap-2.6.0//:indexmap",
+        "@vendor__ra_ap_base_db-0.0.232//:ra_ap_base_db",
+        "@vendor__ra_ap_intern-0.0.232//:ra_ap_intern",
+        "@vendor__ra_ap_paths-0.0.232//:ra_ap_paths",
+        "@vendor__ra_ap_span-0.0.232//:ra_ap_span",
+        "@vendor__ra_ap_stdx-0.0.232//:ra_ap_stdx",
+        "@vendor__ra_ap_tt-0.0.232//:ra_ap_tt",
+        "@vendor__rustc-hash-1.1.0//:rustc_hash",
+        "@vendor__serde-1.0.214//:serde",
+        "@vendor__serde_json-1.0.132//:serde_json",
+        "@vendor__tracing-0.1.40//:tracing",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_profile-0.0.232.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_profile-0.0.232.bazel
new file mode 100644
index 00000000000..b91c889ab5c
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_profile-0.0.232.bazel
@@ -0,0 +1,123 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "ra_ap_profile",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=ra_ap_profile",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.0.232",
+    deps = [
+        "@vendor__cfg-if-1.0.0//:cfg_if",
+        "@vendor__libc-0.2.162//:libc",
+    ] + select({
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [
+            "@vendor__windows-sys-0.52.0//:windows_sys",  # cfg(windows)
+        ],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [
+            "@vendor__perf-event-0.4.7//:perf_event",  # cfg(target_os = "linux")
+        ],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [
+            "@vendor__perf-event-0.4.7//:perf_event",  # cfg(target_os = "linux")
+        ],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [
+            "@vendor__perf-event-0.4.7//:perf_event",  # cfg(target_os = "linux")
+        ],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [
+            "@vendor__perf-event-0.4.7//:perf_event",  # cfg(target_os = "linux")
+        ],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [
+            "@vendor__windows-sys-0.52.0//:windows_sys",  # cfg(windows)
+        ],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [
+            "@vendor__perf-event-0.4.7//:perf_event",  # cfg(target_os = "linux")
+        ],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [
+            "@vendor__perf-event-0.4.7//:perf_event",  # cfg(target_os = "linux")
+        ],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [
+            "@vendor__perf-event-0.4.7//:perf_event",  # cfg(target_os = "linux")
+        ],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [
+            "@vendor__windows-sys-0.52.0//:windows_sys",  # cfg(windows)
+        ],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [
+            "@vendor__perf-event-0.4.7//:perf_event",  # cfg(target_os = "linux")
+        ],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [
+            "@vendor__perf-event-0.4.7//:perf_event",  # cfg(target_os = "linux")
+        ],
+        "//conditions:default": [],
+    }),
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_project_model-0.0.232.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_project_model-0.0.232.bazel
new file mode 100644
index 00000000000..6f6f3bb303a
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_project_model-0.0.232.bazel
@@ -0,0 +1,109 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "ra_ap_project_model",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    aliases = {
+        "@vendor__ra_ap_base_db-0.0.232//:ra_ap_base_db": "base_db",
+        "@vendor__ra_ap_cfg-0.0.232//:ra_ap_cfg": "cfg",
+        "@vendor__ra_ap_intern-0.0.232//:ra_ap_intern": "intern",
+        "@vendor__ra_ap_paths-0.0.232//:ra_ap_paths": "paths",
+        "@vendor__ra_ap_span-0.0.232//:ra_ap_span": "span",
+        "@vendor__ra_ap_stdx-0.0.232//:ra_ap_stdx": "stdx",
+        "@vendor__ra_ap_toolchain-0.0.232//:ra_ap_toolchain": "toolchain",
+    },
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=ra_ap_project_model",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.0.232",
+    deps = [
+        "@vendor__anyhow-1.0.93//:anyhow",
+        "@vendor__cargo_metadata-0.18.1//:cargo_metadata",
+        "@vendor__itertools-0.12.1//:itertools",
+        "@vendor__la-arena-0.3.1//:la_arena",
+        "@vendor__ra_ap_base_db-0.0.232//:ra_ap_base_db",
+        "@vendor__ra_ap_cfg-0.0.232//:ra_ap_cfg",
+        "@vendor__ra_ap_intern-0.0.232//:ra_ap_intern",
+        "@vendor__ra_ap_paths-0.0.232//:ra_ap_paths",
+        "@vendor__ra_ap_span-0.0.232//:ra_ap_span",
+        "@vendor__ra_ap_stdx-0.0.232//:ra_ap_stdx",
+        "@vendor__ra_ap_toolchain-0.0.232//:ra_ap_toolchain",
+        "@vendor__rustc-hash-1.1.0//:rustc_hash",
+        "@vendor__semver-1.0.23//:semver",
+        "@vendor__serde-1.0.214//:serde",
+        "@vendor__serde_json-1.0.132//:serde_json",
+        "@vendor__tracing-0.1.40//:tracing",
+        "@vendor__triomphe-0.1.14//:triomphe",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_salsa-0.0.232.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_salsa-0.0.232.bazel
new file mode 100644
index 00000000000..b448b6c1919
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_salsa-0.0.232.bazel
@@ -0,0 +1,95 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "salsa",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    proc_macro_deps = [
+        "@vendor__ra_ap_salsa-macros-0.0.232//:salsa_macros",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=ra_ap_salsa",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.0.232",
+    deps = [
+        "@vendor__indexmap-2.6.0//:indexmap",
+        "@vendor__itertools-0.12.1//:itertools",
+        "@vendor__lock_api-0.4.12//:lock_api",
+        "@vendor__oorandom-11.1.4//:oorandom",
+        "@vendor__parking_lot-0.12.3//:parking_lot",
+        "@vendor__rustc-hash-1.1.0//:rustc_hash",
+        "@vendor__smallvec-1.13.2//:smallvec",
+        "@vendor__tracing-0.1.40//:tracing",
+        "@vendor__triomphe-0.1.14//:triomphe",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_salsa-macros-0.0.232.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_salsa-macros-0.0.232.bazel
new file mode 100644
index 00000000000..c5eba6cdaa2
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_salsa-macros-0.0.232.bazel
@@ -0,0 +1,87 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//rust:defs.bzl", "rust_proc_macro")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_proc_macro(
+    name = "salsa_macros",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=ra_ap_salsa-macros",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.0.232",
+    deps = [
+        "@vendor__heck-0.4.1//:heck",
+        "@vendor__proc-macro2-1.0.89//:proc_macro2",
+        "@vendor__quote-1.0.37//:quote",
+        "@vendor__syn-2.0.87//:syn",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_span-0.0.232.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_span-0.0.232.bazel
new file mode 100644
index 00000000000..83cd6321f37
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_span-0.0.232.bazel
@@ -0,0 +1,96 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "ra_ap_span",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    aliases = {
+        "@vendor__ra_ap_stdx-0.0.232//:ra_ap_stdx": "stdx",
+        "@vendor__ra_ap_syntax-0.0.232//:ra_ap_syntax": "syntax",
+        "@vendor__ra_ap_vfs-0.0.232//:ra_ap_vfs": "vfs",
+    },
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=ra_ap_span",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.0.232",
+    deps = [
+        "@vendor__hashbrown-0.14.5//:hashbrown",
+        "@vendor__la-arena-0.3.1//:la_arena",
+        "@vendor__ra_ap_salsa-0.0.232//:salsa",
+        "@vendor__ra_ap_stdx-0.0.232//:ra_ap_stdx",
+        "@vendor__ra_ap_syntax-0.0.232//:ra_ap_syntax",
+        "@vendor__ra_ap_vfs-0.0.232//:ra_ap_vfs",
+        "@vendor__rustc-hash-1.1.0//:rustc_hash",
+        "@vendor__text-size-1.1.1//:text_size",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_stdx-0.0.232.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_stdx-0.0.232.bazel
new file mode 100644
index 00000000000..d342495ff50
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_stdx-0.0.232.bazel
@@ -0,0 +1,102 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "ra_ap_stdx",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=ra_ap_stdx",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.0.232",
+    deps = [
+        "@vendor__always-assert-0.2.0//:always_assert",
+        "@vendor__crossbeam-channel-0.5.13//:crossbeam_channel",
+        "@vendor__itertools-0.12.1//:itertools",
+        "@vendor__jod-thread-0.1.2//:jod_thread",
+        "@vendor__libc-0.2.162//:libc",
+    ] + select({
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [
+            "@vendor__miow-0.6.0//:miow",  # cfg(windows)
+            "@vendor__windows-sys-0.52.0//:windows_sys",  # cfg(windows)
+        ],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [
+            "@vendor__miow-0.6.0//:miow",  # cfg(windows)
+            "@vendor__windows-sys-0.52.0//:windows_sys",  # cfg(windows)
+        ],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [
+            "@vendor__miow-0.6.0//:miow",  # cfg(windows)
+            "@vendor__windows-sys-0.52.0//:windows_sys",  # cfg(windows)
+        ],
+        "//conditions:default": [],
+    }),
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_syntax-0.0.232.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_syntax-0.0.232.bazel
new file mode 100644
index 00000000000..47005eb0567
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_syntax-0.0.232.bazel
@@ -0,0 +1,101 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "ra_ap_syntax",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    aliases = {
+        "@vendor__ra_ap_parser-0.0.232//:ra_ap_parser": "parser",
+        "@vendor__ra_ap_stdx-0.0.232//:ra_ap_stdx": "stdx",
+        "@vendor__ra_ap_text_edit-0.0.232//:ra_ap_text_edit": "text_edit",
+    },
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=ra_ap_syntax",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.0.232",
+    deps = [
+        "@vendor__cov-mark-2.0.0//:cov_mark",
+        "@vendor__either-1.13.0//:either",
+        "@vendor__indexmap-2.6.0//:indexmap",
+        "@vendor__itertools-0.12.1//:itertools",
+        "@vendor__ra-ap-rustc_lexer-0.63.0//:ra_ap_rustc_lexer",
+        "@vendor__ra_ap_parser-0.0.232//:ra_ap_parser",
+        "@vendor__ra_ap_stdx-0.0.232//:ra_ap_stdx",
+        "@vendor__ra_ap_text_edit-0.0.232//:ra_ap_text_edit",
+        "@vendor__rowan-0.15.15//:rowan",
+        "@vendor__rustc-hash-1.1.0//:rustc_hash",
+        "@vendor__smol_str-0.2.2//:smol_str",
+        "@vendor__tracing-0.1.40//:tracing",
+        "@vendor__triomphe-0.1.14//:triomphe",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_syntax-bridge-0.0.232.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_syntax-bridge-0.0.232.bazel
new file mode 100644
index 00000000000..5cf3b23802f
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_syntax-bridge-0.0.232.bazel
@@ -0,0 +1,99 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "ra_ap_syntax_bridge",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    aliases = {
+        "@vendor__ra_ap_intern-0.0.232//:ra_ap_intern": "intern",
+        "@vendor__ra_ap_parser-0.0.232//:ra_ap_parser": "parser",
+        "@vendor__ra_ap_span-0.0.232//:ra_ap_span": "span",
+        "@vendor__ra_ap_stdx-0.0.232//:ra_ap_stdx": "stdx",
+        "@vendor__ra_ap_syntax-0.0.232//:ra_ap_syntax": "syntax",
+        "@vendor__ra_ap_tt-0.0.232//:ra_ap_tt": "tt",
+    },
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=ra_ap_syntax-bridge",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.0.232",
+    deps = [
+        "@vendor__ra_ap_intern-0.0.232//:ra_ap_intern",
+        "@vendor__ra_ap_parser-0.0.232//:ra_ap_parser",
+        "@vendor__ra_ap_span-0.0.232//:ra_ap_span",
+        "@vendor__ra_ap_stdx-0.0.232//:ra_ap_stdx",
+        "@vendor__ra_ap_syntax-0.0.232//:ra_ap_syntax",
+        "@vendor__ra_ap_tt-0.0.232//:ra_ap_tt",
+        "@vendor__rustc-hash-1.1.0//:rustc_hash",
+        "@vendor__tracing-0.1.40//:tracing",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_text_edit-0.0.232.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_text_edit-0.0.232.bazel
new file mode 100644
index 00000000000..7631c485b7c
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_text_edit-0.0.232.bazel
@@ -0,0 +1,85 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "ra_ap_text_edit",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=ra_ap_text_edit",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.0.232",
+    deps = [
+        "@vendor__itertools-0.12.1//:itertools",
+        "@vendor__text-size-1.1.1//:text_size",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_toolchain-0.0.232.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_toolchain-0.0.232.bazel
new file mode 100644
index 00000000000..badcaa2f812
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_toolchain-0.0.232.bazel
@@ -0,0 +1,85 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "ra_ap_toolchain",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=ra_ap_toolchain",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.0.232",
+    deps = [
+        "@vendor__camino-1.1.9//:camino",
+        "@vendor__home-0.5.9//:home",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_tt-0.0.232.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_tt-0.0.232.bazel
new file mode 100644
index 00000000000..bfd3751c49b
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_tt-0.0.232.bazel
@@ -0,0 +1,92 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "ra_ap_tt",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    aliases = {
+        "@vendor__ra_ap_intern-0.0.232//:ra_ap_intern": "intern",
+        "@vendor__ra_ap_stdx-0.0.232//:ra_ap_stdx": "stdx",
+    },
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=ra_ap_tt",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.0.232",
+    deps = [
+        "@vendor__arrayvec-0.7.6//:arrayvec",
+        "@vendor__ra-ap-rustc_lexer-0.63.0//:ra_ap_rustc_lexer",
+        "@vendor__ra_ap_intern-0.0.232//:ra_ap_intern",
+        "@vendor__ra_ap_stdx-0.0.232//:ra_ap_stdx",
+        "@vendor__text-size-1.1.1//:text_size",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_vfs-0.0.232.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_vfs-0.0.232.bazel
new file mode 100644
index 00000000000..99585402a00
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_vfs-0.0.232.bazel
@@ -0,0 +1,95 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "ra_ap_vfs",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    aliases = {
+        "@vendor__ra_ap_paths-0.0.232//:ra_ap_paths": "paths",
+        "@vendor__ra_ap_stdx-0.0.232//:ra_ap_stdx": "stdx",
+    },
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=ra_ap_vfs",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.0.232",
+    deps = [
+        "@vendor__crossbeam-channel-0.5.13//:crossbeam_channel",
+        "@vendor__fst-0.4.7//:fst",
+        "@vendor__indexmap-2.6.0//:indexmap",
+        "@vendor__nohash-hasher-0.2.0//:nohash_hasher",
+        "@vendor__ra_ap_paths-0.0.232//:ra_ap_paths",
+        "@vendor__ra_ap_stdx-0.0.232//:ra_ap_stdx",
+        "@vendor__rustc-hash-1.1.0//:rustc_hash",
+        "@vendor__tracing-0.1.40//:tracing",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_vfs-notify-0.0.232.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_vfs-notify-0.0.232.bazel
new file mode 100644
index 00000000000..b9587c0142a
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_vfs-notify-0.0.232.bazel
@@ -0,0 +1,97 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "ra_ap_vfs_notify",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    aliases = {
+        "@vendor__ra_ap_paths-0.0.232//:ra_ap_paths": "paths",
+        "@vendor__ra_ap_stdx-0.0.232//:ra_ap_stdx": "stdx",
+        "@vendor__ra_ap_vfs-0.0.232//:ra_ap_vfs": "vfs",
+    },
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=ra_ap_vfs-notify",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.0.232",
+    deps = [
+        "@vendor__crossbeam-channel-0.5.13//:crossbeam_channel",
+        "@vendor__notify-6.1.1//:notify",
+        "@vendor__ra_ap_paths-0.0.232//:ra_ap_paths",
+        "@vendor__ra_ap_stdx-0.0.232//:ra_ap_stdx",
+        "@vendor__ra_ap_vfs-0.0.232//:ra_ap_vfs",
+        "@vendor__rayon-1.10.0//:rayon",
+        "@vendor__rustc-hash-1.1.0//:rustc_hash",
+        "@vendor__tracing-0.1.40//:tracing",
+        "@vendor__walkdir-2.5.0//:walkdir",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.rand-0.8.5.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.rand-0.8.5.bazel
new file mode 100644
index 00000000000..43642b336b3
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.rand-0.8.5.bazel
@@ -0,0 +1,168 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "rand",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "alloc",
+        "default",
+        "getrandom",
+        "libc",
+        "rand_chacha",
+        "std",
+        "std_rng",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2018",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=rand",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.8.5",
+    deps = [
+        "@vendor__rand_chacha-0.3.1//:rand_chacha",
+        "@vendor__rand_core-0.6.4//:rand_core",
+    ] + select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [
+            "@vendor__libc-0.2.162//:libc",  # aarch64-apple-darwin
+        ],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [
+            "@vendor__libc-0.2.162//:libc",  # aarch64-apple-ios
+        ],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [
+            "@vendor__libc-0.2.162//:libc",  # aarch64-apple-ios-sim
+        ],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [
+            "@vendor__libc-0.2.162//:libc",  # aarch64-fuchsia
+        ],
+        "@rules_rust//rust/platform:aarch64-linux-android": [
+            "@vendor__libc-0.2.162//:libc",  # aarch64-linux-android
+        ],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [
+            "@vendor__libc-0.2.162//:libc",  # aarch64-unknown-linux-gnu
+        ],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [
+            "@vendor__libc-0.2.162//:libc",  # aarch64-unknown-linux-gnu, aarch64-unknown-nixos-gnu
+        ],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [
+            "@vendor__libc-0.2.162//:libc",  # aarch64-unknown-nto-qnx710
+        ],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [
+            "@vendor__libc-0.2.162//:libc",  # arm-unknown-linux-gnueabi
+        ],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [
+            "@vendor__libc-0.2.162//:libc",  # armv7-linux-androideabi
+        ],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [
+            "@vendor__libc-0.2.162//:libc",  # armv7-unknown-linux-gnueabi
+        ],
+        "@rules_rust//rust/platform:i686-apple-darwin": [
+            "@vendor__libc-0.2.162//:libc",  # i686-apple-darwin
+        ],
+        "@rules_rust//rust/platform:i686-linux-android": [
+            "@vendor__libc-0.2.162//:libc",  # i686-linux-android
+        ],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [
+            "@vendor__libc-0.2.162//:libc",  # i686-unknown-freebsd
+        ],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [
+            "@vendor__libc-0.2.162//:libc",  # i686-unknown-linux-gnu
+        ],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [
+            "@vendor__libc-0.2.162//:libc",  # powerpc-unknown-linux-gnu
+        ],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [
+            "@vendor__libc-0.2.162//:libc",  # s390x-unknown-linux-gnu
+        ],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [
+            "@vendor__libc-0.2.162//:libc",  # x86_64-apple-darwin
+        ],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [
+            "@vendor__libc-0.2.162//:libc",  # x86_64-apple-ios
+        ],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [
+            "@vendor__libc-0.2.162//:libc",  # x86_64-fuchsia
+        ],
+        "@rules_rust//rust/platform:x86_64-linux-android": [
+            "@vendor__libc-0.2.162//:libc",  # x86_64-linux-android
+        ],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [
+            "@vendor__libc-0.2.162//:libc",  # x86_64-unknown-freebsd
+        ],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [
+            "@vendor__libc-0.2.162//:libc",  # x86_64-unknown-linux-gnu
+        ],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [
+            "@vendor__libc-0.2.162//:libc",  # x86_64-unknown-linux-gnu, x86_64-unknown-nixos-gnu
+        ],
+        "//conditions:default": [],
+    }),
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.rand_chacha-0.3.1.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.rand_chacha-0.3.1.bazel
new file mode 100644
index 00000000000..b09d36249e5
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.rand_chacha-0.3.1.bazel
@@ -0,0 +1,88 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "rand_chacha",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "std",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2018",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=rand_chacha",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.3.1",
+    deps = [
+        "@vendor__ppv-lite86-0.2.20//:ppv_lite86",
+        "@vendor__rand_core-0.6.4//:rand_core",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.rand_core-0.6.4.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.rand_core-0.6.4.bazel
new file mode 100644
index 00000000000..8fa9c34407c
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.rand_core-0.6.4.bazel
@@ -0,0 +1,89 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "rand_core",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "alloc",
+        "getrandom",
+        "std",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2018",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=rand_core",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.6.4",
+    deps = [
+        "@vendor__getrandom-0.2.15//:getrandom",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.rayon-1.10.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.rayon-1.10.0.bazel
new file mode 100644
index 00000000000..c6083af9cd9
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.rayon-1.10.0.bazel
@@ -0,0 +1,85 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "rayon",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=rayon",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "1.10.0",
+    deps = [
+        "@vendor__either-1.13.0//:either",
+        "@vendor__rayon-core-1.12.1//:rayon_core",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.rayon-core-1.12.1.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.rayon-core-1.12.1.bazel
new file mode 100644
index 00000000000..316412a436e
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.rayon-core-1.12.1.bazel
@@ -0,0 +1,143 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_build_script")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "rayon_core",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=rayon-core",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "1.12.1",
+    deps = [
+        "@vendor__crossbeam-deque-0.8.5//:crossbeam_deque",
+        "@vendor__crossbeam-utils-0.8.20//:crossbeam_utils",
+        "@vendor__rayon-core-1.12.1//:build_script_build",
+    ],
+)
+
+cargo_build_script(
+    name = "_bs",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            "**/*.rs",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_name = "build_script_build",
+    crate_root = "build.rs",
+    data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    edition = "2021",
+    links = "rayon-core",
+    pkg_name = "rayon-core",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=rayon-core",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    version = "1.12.1",
+    visibility = ["//visibility:private"],
+)
+
+alias(
+    name = "build_script_build",
+    actual = ":_bs",
+    tags = ["manual"],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.redox_syscall-0.5.7.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.redox_syscall-0.5.7.bazel
new file mode 100644
index 00000000000..2d8499e0e2b
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.redox_syscall-0.5.7.bazel
@@ -0,0 +1,84 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "syscall",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=redox_syscall",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.5.7",
+    deps = [
+        "@vendor__bitflags-2.6.0//:bitflags",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.regex-1.11.1.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.regex-1.11.1.bazel
new file mode 100644
index 00000000000..b0d29b8bfe4
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.regex-1.11.1.bazel
@@ -0,0 +1,106 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "regex",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "default",
+        "perf",
+        "perf-backtrack",
+        "perf-cache",
+        "perf-dfa",
+        "perf-inline",
+        "perf-literal",
+        "perf-onepass",
+        "std",
+        "unicode",
+        "unicode-age",
+        "unicode-bool",
+        "unicode-case",
+        "unicode-gencat",
+        "unicode-perl",
+        "unicode-script",
+        "unicode-segment",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=regex",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "1.11.1",
+    deps = [
+        "@vendor__aho-corasick-1.1.3//:aho_corasick",
+        "@vendor__memchr-2.7.4//:memchr",
+        "@vendor__regex-automata-0.4.8//:regex_automata",
+        "@vendor__regex-syntax-0.8.5//:regex_syntax",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.regex-automata-0.1.10.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.regex-automata-0.1.10.bazel
new file mode 100644
index 00000000000..867e12eb458
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.regex-automata-0.1.10.bazel
@@ -0,0 +1,89 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "regex_automata",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "default",
+        "regex-syntax",
+        "std",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2015",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=regex-automata",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.1.10",
+    deps = [
+        "@vendor__regex-syntax-0.6.29//:regex_syntax",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.regex-automata-0.4.8.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.regex-automata-0.4.8.bazel
new file mode 100644
index 00000000000..c6fad9e5ccf
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.regex-automata-0.4.8.bazel
@@ -0,0 +1,112 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "regex_automata",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "alloc",
+        "dfa-onepass",
+        "hybrid",
+        "meta",
+        "nfa",
+        "nfa-backtrack",
+        "nfa-pikevm",
+        "nfa-thompson",
+        "perf",
+        "perf-inline",
+        "perf-literal",
+        "perf-literal-multisubstring",
+        "perf-literal-substring",
+        "std",
+        "syntax",
+        "unicode",
+        "unicode-age",
+        "unicode-bool",
+        "unicode-case",
+        "unicode-gencat",
+        "unicode-perl",
+        "unicode-script",
+        "unicode-segment",
+        "unicode-word-boundary",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=regex-automata",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.4.8",
+    deps = [
+        "@vendor__aho-corasick-1.1.3//:aho_corasick",
+        "@vendor__memchr-2.7.4//:memchr",
+        "@vendor__regex-syntax-0.8.5//:regex_syntax",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.regex-syntax-0.6.29.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.regex-syntax-0.6.29.bazel
new file mode 100644
index 00000000000..4529a872538
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.regex-syntax-0.6.29.bazel
@@ -0,0 +1,92 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "regex_syntax",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "default",
+        "unicode",
+        "unicode-age",
+        "unicode-bool",
+        "unicode-case",
+        "unicode-gencat",
+        "unicode-perl",
+        "unicode-script",
+        "unicode-segment",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2018",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=regex-syntax",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.6.29",
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.regex-syntax-0.8.5.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.regex-syntax-0.8.5.bazel
new file mode 100644
index 00000000000..09fce246fd7
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.regex-syntax-0.8.5.bazel
@@ -0,0 +1,93 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "regex_syntax",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "default",
+        "std",
+        "unicode",
+        "unicode-age",
+        "unicode-bool",
+        "unicode-case",
+        "unicode-gencat",
+        "unicode-perl",
+        "unicode-script",
+        "unicode-segment",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=regex-syntax",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.8.5",
+)
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
new file mode 100644
index 00000000000..07e2458214a
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.rowan-0.15.15.bazel
@@ -0,0 +1,88 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "rowan",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=rowan",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.15.15",
+    deps = [
+        "@vendor__countme-3.0.1//:countme",
+        "@vendor__hashbrown-0.14.5//:hashbrown",
+        "@vendor__memoffset-0.9.1//:memoffset",
+        "@vendor__rustc-hash-1.1.0//:rustc_hash",
+        "@vendor__text-size-1.1.1//:text_size",
+    ],
+)
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
new file mode 100644
index 00000000000..4ee3580af2a
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.rustc-hash-1.1.0.bazel
@@ -0,0 +1,85 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "rustc_hash",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "default",
+        "std",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2015",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=rustc-hash",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "1.1.0",
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.rustc_apfloat-0.2.1+llvm-462a31f5a5ab.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.rustc_apfloat-0.2.1+llvm-462a31f5a5ab.bazel
new file mode 100644
index 00000000000..faa9d8b2eb8
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.rustc_apfloat-0.2.1+llvm-462a31f5a5ab.bazel
@@ -0,0 +1,142 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_build_script")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "rustc_apfloat",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=rustc_apfloat",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.2.1+llvm-462a31f5a5ab",
+    deps = [
+        "@vendor__bitflags-1.3.2//:bitflags",
+        "@vendor__rustc_apfloat-0.2.1-llvm-462a31f5a5ab//:build_script_build",
+        "@vendor__smallvec-1.13.2//:smallvec",
+    ],
+)
+
+cargo_build_script(
+    name = "_bs",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            "**/*.rs",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_name = "build_script_build",
+    crate_root = "build.rs",
+    data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    edition = "2021",
+    pkg_name = "rustc_apfloat",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=rustc_apfloat",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    version = "0.2.1+llvm-462a31f5a5ab",
+    visibility = ["//visibility:private"],
+)
+
+alias(
+    name = "build_script_build",
+    actual = ":_bs",
+    tags = ["manual"],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ryu-1.0.18.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ryu-1.0.18.bazel
new file mode 100644
index 00000000000..54e5b8ecdb7
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ryu-1.0.18.bazel
@@ -0,0 +1,81 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "ryu",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2018",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=ryu",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "1.0.18",
+)
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
new file mode 100644
index 00000000000..ad1ad30c0e4
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.same-file-1.0.6.bazel
@@ -0,0 +1,93 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "same_file",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2018",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=same-file",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "1.0.6",
+    deps = select({
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [
+            "@vendor__winapi-util-0.1.9//:winapi_util",  # cfg(windows)
+        ],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [
+            "@vendor__winapi-util-0.1.9//:winapi_util",  # cfg(windows)
+        ],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [
+            "@vendor__winapi-util-0.1.9//:winapi_util",  # cfg(windows)
+        ],
+        "//conditions:default": [],
+    }),
+)
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
new file mode 100644
index 00000000000..7cf73361b51
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.scoped-tls-1.0.1.bazel
@@ -0,0 +1,81 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "scoped_tls",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2015",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=scoped-tls",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "1.0.1",
+)
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
new file mode 100644
index 00000000000..2a0cc72698e
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.scopeguard-1.2.0.bazel
@@ -0,0 +1,81 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "scopeguard",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2015",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=scopeguard",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "1.2.0",
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.semver-1.0.23.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.semver-1.0.23.bazel
new file mode 100644
index 00000000000..58420e8e964
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.semver-1.0.23.bazel
@@ -0,0 +1,151 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_build_script")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "semver",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "default",
+        "serde",
+        "std",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2018",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=semver",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "1.0.23",
+    deps = [
+        "@vendor__semver-1.0.23//:build_script_build",
+        "@vendor__serde-1.0.214//:serde",
+    ],
+)
+
+cargo_build_script(
+    name = "_bs",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            "**/*.rs",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "default",
+        "serde",
+        "std",
+    ],
+    crate_name = "build_script_build",
+    crate_root = "build.rs",
+    data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    edition = "2018",
+    pkg_name = "semver",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=semver",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    version = "1.0.23",
+    visibility = ["//visibility:private"],
+)
+
+alias(
+    name = "build_script_build",
+    actual = ":_bs",
+    tags = ["manual"],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.serde-1.0.214.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.serde-1.0.214.bazel
new file mode 100644
index 00000000000..fd0cc658253
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.serde-1.0.214.bazel
@@ -0,0 +1,157 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_build_script")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "serde",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "alloc",
+        "default",
+        "derive",
+        "serde_derive",
+        "std",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2018",
+    proc_macro_deps = [
+        "@vendor__serde_derive-1.0.214//:serde_derive",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=serde",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "1.0.214",
+    deps = [
+        "@vendor__serde-1.0.214//:build_script_build",
+    ],
+)
+
+cargo_build_script(
+    name = "_bs",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            "**/*.rs",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "alloc",
+        "default",
+        "derive",
+        "serde_derive",
+        "std",
+    ],
+    crate_name = "build_script_build",
+    crate_root = "build.rs",
+    data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    edition = "2018",
+    pkg_name = "serde",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=serde",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    version = "1.0.214",
+    visibility = ["//visibility:private"],
+)
+
+alias(
+    name = "build_script_build",
+    actual = ":_bs",
+    tags = ["manual"],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.serde_derive-1.0.214.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.serde_derive-1.0.214.bazel
new file mode 100644
index 00000000000..1fd8a0312ce
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.serde_derive-1.0.214.bazel
@@ -0,0 +1,89 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//rust:defs.bzl", "rust_proc_macro")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_proc_macro(
+    name = "serde_derive",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "default",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2015",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=serde_derive",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "1.0.214",
+    deps = [
+        "@vendor__proc-macro2-1.0.89//:proc_macro2",
+        "@vendor__quote-1.0.37//:quote",
+        "@vendor__syn-2.0.87//:syn",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.serde_json-1.0.132.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.serde_json-1.0.132.bazel
new file mode 100644
index 00000000000..ecbae32eeaf
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.serde_json-1.0.132.bazel
@@ -0,0 +1,154 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_build_script")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "serde_json",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "default",
+        "std",
+        "unbounded_depth",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=serde_json",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "1.0.132",
+    deps = [
+        "@vendor__itoa-1.0.11//:itoa",
+        "@vendor__memchr-2.7.4//:memchr",
+        "@vendor__ryu-1.0.18//:ryu",
+        "@vendor__serde-1.0.214//:serde",
+        "@vendor__serde_json-1.0.132//:build_script_build",
+    ],
+)
+
+cargo_build_script(
+    name = "_bs",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            "**/*.rs",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "default",
+        "std",
+        "unbounded_depth",
+    ],
+    crate_name = "build_script_build",
+    crate_root = "build.rs",
+    data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    edition = "2021",
+    pkg_name = "serde_json",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=serde_json",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    version = "1.0.132",
+    visibility = ["//visibility:private"],
+)
+
+alias(
+    name = "build_script_build",
+    actual = ":_bs",
+    tags = ["manual"],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.serde_with-3.11.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.serde_with-3.11.0.bazel
new file mode 100644
index 00000000000..d1fc0675a77
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.serde_with-3.11.0.bazel
@@ -0,0 +1,94 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "serde_with",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "alloc",
+        "default",
+        "macros",
+        "std",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    proc_macro_deps = [
+        "@vendor__serde_derive-1.0.214//:serde_derive",
+        "@vendor__serde_with_macros-3.11.0//:serde_with_macros",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=serde_with",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "3.11.0",
+    deps = [
+        "@vendor__serde-1.0.214//:serde",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.serde_with_macros-3.11.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.serde_with_macros-3.11.0.bazel
new file mode 100644
index 00000000000..43340411b31
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.serde_with_macros-3.11.0.bazel
@@ -0,0 +1,87 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//rust:defs.bzl", "rust_proc_macro")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_proc_macro(
+    name = "serde_with_macros",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=serde_with_macros",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "3.11.0",
+    deps = [
+        "@vendor__darling-0.20.10//:darling",
+        "@vendor__proc-macro2-1.0.89//:proc_macro2",
+        "@vendor__quote-1.0.37//:quote",
+        "@vendor__syn-2.0.87//:syn",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.serde_yaml-0.9.34+deprecated.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.serde_yaml-0.9.34+deprecated.bazel
new file mode 100644
index 00000000000..3f19e37ec9d
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.serde_yaml-0.9.34+deprecated.bazel
@@ -0,0 +1,88 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "serde_yaml",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=serde_yaml",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.9.34+deprecated",
+    deps = [
+        "@vendor__indexmap-2.6.0//:indexmap",
+        "@vendor__itoa-1.0.11//:itoa",
+        "@vendor__ryu-1.0.18//:ryu",
+        "@vendor__serde-1.0.214//:serde",
+        "@vendor__unsafe-libyaml-0.2.11//:unsafe_libyaml",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.sharded-slab-0.1.7.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.sharded-slab-0.1.7.bazel
new file mode 100644
index 00000000000..17768dd035f
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.sharded-slab-0.1.7.bazel
@@ -0,0 +1,84 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "sharded_slab",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2018",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=sharded-slab",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.1.7",
+    deps = [
+        "@vendor__lazy_static-1.5.0//:lazy_static",
+    ],
+)
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
new file mode 100644
index 00000000000..cf421704016
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.shlex-1.3.0.bazel
@@ -0,0 +1,85 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "shlex",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "default",
+        "std",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2015",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=shlex",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "1.3.0",
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.smallvec-1.13.2.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.smallvec-1.13.2.bazel
new file mode 100644
index 00000000000..cae068592b6
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.smallvec-1.13.2.bazel
@@ -0,0 +1,86 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "smallvec",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "const_generics",
+        "const_new",
+        "union",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2018",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=smallvec",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "1.13.2",
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.smol_str-0.2.2.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.smol_str-0.2.2.bazel
new file mode 100644
index 00000000000..233563672c4
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.smol_str-0.2.2.bazel
@@ -0,0 +1,85 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "smol_str",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "default",
+        "std",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2018",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=smol_str",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.2.2",
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.sptr-0.3.2.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.sptr-0.3.2.bazel
new file mode 100644
index 00000000000..02668d79d1e
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.sptr-0.3.2.bazel
@@ -0,0 +1,84 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "sptr",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "default",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2018",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=sptr",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.3.2",
+)
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
new file mode 100644
index 00000000000..688de934736
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.stable_deref_trait-1.2.0.bazel
@@ -0,0 +1,81 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "stable_deref_trait",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2015",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=stable_deref_trait",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "1.2.0",
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.stderrlog-0.6.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.stderrlog-0.6.0.bazel
new file mode 100644
index 00000000000..31bb8746430
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.stderrlog-0.6.0.bazel
@@ -0,0 +1,93 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "stderrlog",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "chrono",
+        "default",
+        "timestamps",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2018",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=stderrlog",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.6.0",
+    deps = [
+        "@vendor__chrono-0.4.38//:chrono",
+        "@vendor__is-terminal-0.4.13//:is_terminal",
+        "@vendor__log-0.4.22//:log",
+        "@vendor__termcolor-1.1.3//:termcolor",
+        "@vendor__thread_local-1.1.8//:thread_local",
+    ],
+)
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
new file mode 100644
index 00000000000..fa231c4bc04
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.streaming-iterator-0.1.9.bazel
@@ -0,0 +1,81 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "streaming_iterator",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=streaming-iterator",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.1.9",
+)
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
new file mode 100644
index 00000000000..5438e273e7e
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.strsim-0.11.1.bazel
@@ -0,0 +1,81 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "strsim",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2015",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=strsim",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.11.1",
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.syn-2.0.87.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.syn-2.0.87.bazel
new file mode 100644
index 00000000000..34f75db30a5
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.syn-2.0.87.bazel
@@ -0,0 +1,98 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "syn",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "clone-impls",
+        "default",
+        "derive",
+        "extra-traits",
+        "full",
+        "parsing",
+        "printing",
+        "proc-macro",
+        "visit",
+        "visit-mut",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=syn",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "2.0.87",
+    deps = [
+        "@vendor__proc-macro2-1.0.89//:proc_macro2",
+        "@vendor__quote-1.0.37//:quote",
+        "@vendor__unicode-ident-1.0.13//:unicode_ident",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.synstructure-0.13.1.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.synstructure-0.13.1.bazel
new file mode 100644
index 00000000000..76017bcc7c0
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.synstructure-0.13.1.bazel
@@ -0,0 +1,90 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "synstructure",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "default",
+        "proc-macro",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2018",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=synstructure",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.13.1",
+    deps = [
+        "@vendor__proc-macro2-1.0.89//:proc_macro2",
+        "@vendor__quote-1.0.37//:quote",
+        "@vendor__syn-2.0.87//:syn",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.termcolor-1.1.3.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.termcolor-1.1.3.bazel
new file mode 100644
index 00000000000..2c6b1ee1d96
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.termcolor-1.1.3.bazel
@@ -0,0 +1,93 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "termcolor",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2018",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=termcolor",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "1.1.3",
+    deps = select({
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [
+            "@vendor__winapi-util-0.1.9//:winapi_util",  # cfg(windows)
+        ],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [
+            "@vendor__winapi-util-0.1.9//:winapi_util",  # cfg(windows)
+        ],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [
+            "@vendor__winapi-util-0.1.9//:winapi_util",  # cfg(windows)
+        ],
+        "//conditions:default": [],
+    }),
+)
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
new file mode 100644
index 00000000000..d82fe4af768
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.text-size-1.1.1.bazel
@@ -0,0 +1,81 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "text_size",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2018",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=text-size",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "1.1.1",
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.thiserror-1.0.69.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.thiserror-1.0.69.bazel
new file mode 100644
index 00000000000..5fba245ae6a
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.thiserror-1.0.69.bazel
@@ -0,0 +1,143 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_build_script")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "thiserror",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    proc_macro_deps = [
+        "@vendor__thiserror-impl-1.0.69//:thiserror_impl",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=thiserror",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "1.0.69",
+    deps = [
+        "@vendor__thiserror-1.0.69//:build_script_build",
+    ],
+)
+
+cargo_build_script(
+    name = "_bs",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            "**/*.rs",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_name = "build_script_build",
+    crate_root = "build.rs",
+    data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    edition = "2021",
+    pkg_name = "thiserror",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=thiserror",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    version = "1.0.69",
+    visibility = ["//visibility:private"],
+)
+
+alias(
+    name = "build_script_build",
+    actual = ":_bs",
+    tags = ["manual"],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.thiserror-impl-1.0.69.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.thiserror-impl-1.0.69.bazel
new file mode 100644
index 00000000000..c6691c47915
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.thiserror-impl-1.0.69.bazel
@@ -0,0 +1,86 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//rust:defs.bzl", "rust_proc_macro")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_proc_macro(
+    name = "thiserror_impl",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=thiserror-impl",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "1.0.69",
+    deps = [
+        "@vendor__proc-macro2-1.0.89//:proc_macro2",
+        "@vendor__quote-1.0.37//:quote",
+        "@vendor__syn-2.0.87//:syn",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.thread_local-1.1.8.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.thread_local-1.1.8.bazel
new file mode 100644
index 00000000000..e2e0fbb50c1
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.thread_local-1.1.8.bazel
@@ -0,0 +1,85 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "thread_local",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=thread_local",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "1.1.8",
+    deps = [
+        "@vendor__cfg-if-1.0.0//:cfg_if",
+        "@vendor__once_cell-1.20.2//:once_cell",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.time-0.3.36.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.time-0.3.36.bazel
new file mode 100644
index 00000000000..535fc15525f
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.time-0.3.36.bazel
@@ -0,0 +1,87 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "time",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=time",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.3.36",
+    deps = [
+        "@vendor__deranged-0.3.11//:deranged",
+        "@vendor__num-conv-0.1.0//:num_conv",
+        "@vendor__powerfmt-0.2.0//:powerfmt",
+        "@vendor__time-core-0.1.2//:time_core",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.time-core-0.1.2.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.time-core-0.1.2.bazel
new file mode 100644
index 00000000000..e81d00355d3
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.time-core-0.1.2.bazel
@@ -0,0 +1,81 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "time_core",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=time-core",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.1.2",
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.time-macros-0.2.18.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.time-macros-0.2.18.bazel
new file mode 100644
index 00000000000..e1ad5edd6f5
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.time-macros-0.2.18.bazel
@@ -0,0 +1,85 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//rust:defs.bzl", "rust_proc_macro")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_proc_macro(
+    name = "time_macros",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=time-macros",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.2.18",
+    deps = [
+        "@vendor__num-conv-0.1.0//:num_conv",
+        "@vendor__time-core-0.1.2//:time_core",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.tracing-0.1.40.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.tracing-0.1.40.bazel
new file mode 100644
index 00000000000..d16d281f94c
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.tracing-0.1.40.bazel
@@ -0,0 +1,94 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "tracing",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "attributes",
+        "default",
+        "std",
+        "tracing-attributes",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2018",
+    proc_macro_deps = [
+        "@vendor__tracing-attributes-0.1.27//:tracing_attributes",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=tracing",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.1.40",
+    deps = [
+        "@vendor__pin-project-lite-0.2.15//:pin_project_lite",
+        "@vendor__tracing-core-0.1.32//:tracing_core",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.tracing-attributes-0.1.27.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.tracing-attributes-0.1.27.bazel
new file mode 100644
index 00000000000..a2e0bb0ba1e
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.tracing-attributes-0.1.27.bazel
@@ -0,0 +1,86 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//rust:defs.bzl", "rust_proc_macro")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_proc_macro(
+    name = "tracing_attributes",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2018",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=tracing-attributes",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.1.27",
+    deps = [
+        "@vendor__proc-macro2-1.0.89//:proc_macro2",
+        "@vendor__quote-1.0.37//:quote",
+        "@vendor__syn-2.0.87//:syn",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.tracing-core-0.1.32.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.tracing-core-0.1.32.bazel
new file mode 100644
index 00000000000..485a23a3ac3
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.tracing-core-0.1.32.bazel
@@ -0,0 +1,89 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "tracing_core",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "default",
+        "once_cell",
+        "std",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2018",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=tracing-core",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.1.32",
+    deps = [
+        "@vendor__once_cell-1.20.2//:once_cell",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.tracing-log-0.2.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.tracing-log-0.2.0.bazel
new file mode 100644
index 00000000000..ab07ec6d70c
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.tracing-log-0.2.0.bazel
@@ -0,0 +1,90 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "tracing_log",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "log-tracer",
+        "std",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2018",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=tracing-log",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.2.0",
+    deps = [
+        "@vendor__log-0.4.22//:log",
+        "@vendor__once_cell-1.20.2//:once_cell",
+        "@vendor__tracing-core-0.1.32//:tracing_core",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.tracing-subscriber-0.3.18.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.tracing-subscriber-0.3.18.bazel
new file mode 100644
index 00000000000..810d1a29c47
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.tracing-subscriber-0.3.18.bazel
@@ -0,0 +1,111 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "tracing_subscriber",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "alloc",
+        "ansi",
+        "default",
+        "env-filter",
+        "fmt",
+        "matchers",
+        "nu-ansi-term",
+        "once_cell",
+        "regex",
+        "registry",
+        "sharded-slab",
+        "smallvec",
+        "std",
+        "thread_local",
+        "tracing",
+        "tracing-log",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2018",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=tracing-subscriber",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.3.18",
+    deps = [
+        "@vendor__matchers-0.1.0//:matchers",
+        "@vendor__nu-ansi-term-0.46.0//:nu_ansi_term",
+        "@vendor__once_cell-1.20.2//:once_cell",
+        "@vendor__regex-1.11.1//:regex",
+        "@vendor__sharded-slab-0.1.7//:sharded_slab",
+        "@vendor__smallvec-1.13.2//:smallvec",
+        "@vendor__thread_local-1.1.8//:thread_local",
+        "@vendor__tracing-0.1.40//:tracing",
+        "@vendor__tracing-core-0.1.32//:tracing_core",
+        "@vendor__tracing-log-0.2.0//:tracing_log",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.tree-sitter-0.24.4.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.tree-sitter-0.24.4.bazel
new file mode 100644
index 00000000000..52310271a2d
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.tree-sitter-0.24.4.bazel
@@ -0,0 +1,156 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_build_script")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "tree_sitter",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "default",
+        "std",
+    ],
+    crate_root = "binding_rust/lib.rs",
+    edition = "2021",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=tree-sitter",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.24.4",
+    deps = [
+        "@vendor__regex-1.11.1//:regex",
+        "@vendor__regex-syntax-0.8.5//:regex_syntax",
+        "@vendor__streaming-iterator-0.1.9//:streaming_iterator",
+        "@vendor__tree-sitter-0.24.4//:build_script_build",
+        "@vendor__tree-sitter-language-0.1.2//:tree_sitter_language",
+    ],
+)
+
+cargo_build_script(
+    name = "_bs",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            "**/*.rs",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "default",
+        "std",
+    ],
+    crate_name = "build_script_build",
+    crate_root = "binding_rust/build.rs",
+    data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    edition = "2021",
+    links = "tree-sitter",
+    pkg_name = "tree-sitter",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=tree-sitter",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    version = "0.24.4",
+    visibility = ["//visibility:private"],
+    deps = [
+        "@vendor__cc-1.1.37//:cc",
+    ],
+)
+
+alias(
+    name = "build_script_build",
+    actual = ":_bs",
+    tags = ["manual"],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.tree-sitter-embedded-template-0.23.2.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.tree-sitter-embedded-template-0.23.2.bazel
new file mode 100644
index 00000000000..685c6225efe
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.tree-sitter-embedded-template-0.23.2.bazel
@@ -0,0 +1,144 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_build_script")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "tree_sitter_embedded_template",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "bindings/rust/lib.rs",
+    edition = "2021",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=tree-sitter-embedded-template",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.23.2",
+    deps = [
+        "@vendor__tree-sitter-embedded-template-0.23.2//:build_script_build",
+        "@vendor__tree-sitter-language-0.1.2//:tree_sitter_language",
+    ],
+)
+
+cargo_build_script(
+    name = "_bs",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            "**/*.rs",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_name = "build_script_build",
+    crate_root = "bindings/rust/build.rs",
+    data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    edition = "2021",
+    pkg_name = "tree-sitter-embedded-template",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=tree-sitter-embedded-template",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    version = "0.23.2",
+    visibility = ["//visibility:private"],
+    deps = [
+        "@vendor__cc-1.1.37//:cc",
+    ],
+)
+
+alias(
+    name = "build_script_build",
+    actual = ":_bs",
+    tags = ["manual"],
+)
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
new file mode 100644
index 00000000000..62920260f9c
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.tree-sitter-json-0.24.8.bazel
@@ -0,0 +1,144 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_build_script")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "tree_sitter_json",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "bindings/rust/lib.rs",
+    edition = "2021",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=tree-sitter-json",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.24.8",
+    deps = [
+        "@vendor__tree-sitter-json-0.24.8//:build_script_build",
+        "@vendor__tree-sitter-language-0.1.2//:tree_sitter_language",
+    ],
+)
+
+cargo_build_script(
+    name = "_bs",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            "**/*.rs",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_name = "build_script_build",
+    crate_root = "bindings/rust/build.rs",
+    data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    edition = "2021",
+    pkg_name = "tree-sitter-json",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=tree-sitter-json",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    version = "0.24.8",
+    visibility = ["//visibility:private"],
+    deps = [
+        "@vendor__cc-1.1.37//:cc",
+    ],
+)
+
+alias(
+    name = "build_script_build",
+    actual = ":_bs",
+    tags = ["manual"],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.tree-sitter-language-0.1.2.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.tree-sitter-language-0.1.2.bazel
new file mode 100644
index 00000000000..fe13d9985d1
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.tree-sitter-language-0.1.2.bazel
@@ -0,0 +1,81 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "tree_sitter_language",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "language.rs",
+    edition = "2021",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=tree-sitter-language",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.1.2",
+)
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
new file mode 100644
index 00000000000..565196ce541
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.tree-sitter-ql-0.23.1.bazel
@@ -0,0 +1,144 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_build_script")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "tree_sitter_ql",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "bindings/rust/lib.rs",
+    edition = "2021",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=tree-sitter-ql",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.23.1",
+    deps = [
+        "@vendor__tree-sitter-language-0.1.2//:tree_sitter_language",
+        "@vendor__tree-sitter-ql-0.23.1//:build_script_build",
+    ],
+)
+
+cargo_build_script(
+    name = "_bs",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            "**/*.rs",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_name = "build_script_build",
+    crate_root = "bindings/rust/build.rs",
+    data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    edition = "2021",
+    pkg_name = "tree-sitter-ql",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=tree-sitter-ql",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    version = "0.23.1",
+    visibility = ["//visibility:private"],
+    deps = [
+        "@vendor__cc-1.1.37//:cc",
+    ],
+)
+
+alias(
+    name = "build_script_build",
+    actual = ":_bs",
+    tags = ["manual"],
+)
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
new file mode 100644
index 00000000000..d1d0d52eb1f
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.tree-sitter-ruby-0.23.1.bazel
@@ -0,0 +1,144 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_build_script")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "tree_sitter_ruby",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "bindings/rust/lib.rs",
+    edition = "2021",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=tree-sitter-ruby",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.23.1",
+    deps = [
+        "@vendor__tree-sitter-language-0.1.2//:tree_sitter_language",
+        "@vendor__tree-sitter-ruby-0.23.1//:build_script_build",
+    ],
+)
+
+cargo_build_script(
+    name = "_bs",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            "**/*.rs",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_name = "build_script_build",
+    crate_root = "bindings/rust/build.rs",
+    data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    edition = "2021",
+    pkg_name = "tree-sitter-ruby",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=tree-sitter-ruby",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    version = "0.23.1",
+    visibility = ["//visibility:private"],
+    deps = [
+        "@vendor__cc-1.1.37//:cc",
+    ],
+)
+
+alias(
+    name = "build_script_build",
+    actual = ":_bs",
+    tags = ["manual"],
+)
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
new file mode 100644
index 00000000000..2c1e5e96383
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.triomphe-0.1.14.bazel
@@ -0,0 +1,91 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "triomphe",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "default",
+        "serde",
+        "stable_deref_trait",
+        "std",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2015",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=triomphe",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.1.14",
+    deps = [
+        "@vendor__serde-1.0.214//:serde",
+        "@vendor__stable_deref_trait-1.2.0//:stable_deref_trait",
+    ],
+)
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
new file mode 100644
index 00000000000..1ea77086ca5
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.typed-arena-2.0.2.bazel
@@ -0,0 +1,85 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "typed_arena",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "default",
+        "std",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2015",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=typed-arena",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "2.0.2",
+)
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
new file mode 100644
index 00000000000..45484bd698c
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.uncased-0.9.10.bazel
@@ -0,0 +1,151 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_build_script")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "uncased",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "alloc",
+        "default",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2018",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=uncased",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.9.10",
+    deps = [
+        "@vendor__uncased-0.9.10//:build_script_build",
+    ],
+)
+
+cargo_build_script(
+    name = "_bs",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            "**/*.rs",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "alloc",
+        "default",
+    ],
+    crate_name = "build_script_build",
+    crate_root = "build.rs",
+    data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    edition = "2018",
+    pkg_name = "uncased",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=uncased",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    version = "0.9.10",
+    visibility = ["//visibility:private"],
+    deps = [
+        "@vendor__version_check-0.9.5//:version_check",
+    ],
+)
+
+alias(
+    name = "build_script_build",
+    actual = ":_bs",
+    tags = ["manual"],
+)
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
new file mode 100644
index 00000000000..c166cb1f235
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ungrammar-1.16.1.bazel
@@ -0,0 +1,81 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "ungrammar",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2018",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=ungrammar",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "1.16.1",
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.unicode-ident-1.0.13.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.unicode-ident-1.0.13.bazel
new file mode 100644
index 00000000000..b01e16bb259
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.unicode-ident-1.0.13.bazel
@@ -0,0 +1,81 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "unicode_ident",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2018",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=unicode-ident",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "1.0.13",
+)
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
new file mode 100644
index 00000000000..5b4c5999de1
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.unicode-properties-0.1.3.bazel
@@ -0,0 +1,84 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "unicode_properties",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "emoji",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=unicode-properties",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.1.3",
+)
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
new file mode 100644
index 00000000000..827752aff40
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.unicode-xid-0.2.6.bazel
@@ -0,0 +1,84 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "unicode_xid",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "default",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2015",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=unicode-xid",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.2.6",
+)
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
new file mode 100644
index 00000000000..55de8b565f8
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.unsafe-libyaml-0.2.11.bazel
@@ -0,0 +1,81 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "unsafe_libyaml",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=unsafe-libyaml",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.2.11",
+)
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
new file mode 100644
index 00000000000..9a22c856c81
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.utf8parse-0.2.2.bazel
@@ -0,0 +1,84 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "utf8parse",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "default",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2018",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=utf8parse",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.2.2",
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.valuable-0.1.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.valuable-0.1.0.bazel
new file mode 100644
index 00000000000..d0e4eefd53c
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.valuable-0.1.0.bazel
@@ -0,0 +1,140 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_build_script")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "valuable",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2018",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=valuable",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.1.0",
+    deps = [
+        "@vendor__valuable-0.1.0//:build_script_build",
+    ],
+)
+
+cargo_build_script(
+    name = "_bs",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            "**/*.rs",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_name = "build_script_build",
+    crate_root = "build.rs",
+    data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    edition = "2018",
+    pkg_name = "valuable",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=valuable",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    version = "0.1.0",
+    visibility = ["//visibility:private"],
+)
+
+alias(
+    name = "build_script_build",
+    actual = ":_bs",
+    tags = ["manual"],
+)
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
new file mode 100644
index 00000000000..ba27035debd
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.version_check-0.9.5.bazel
@@ -0,0 +1,81 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "version_check",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2015",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=version_check",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.9.5",
+)
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
new file mode 100644
index 00000000000..cffec831128
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.walkdir-2.5.0.bazel
@@ -0,0 +1,95 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "walkdir",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2018",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=walkdir",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "2.5.0",
+    deps = [
+        "@vendor__same-file-1.0.6//:same_file",
+    ] + select({
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [
+            "@vendor__winapi-util-0.1.9//:winapi_util",  # cfg(windows)
+        ],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [
+            "@vendor__winapi-util-0.1.9//:winapi_util",  # cfg(windows)
+        ],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [
+            "@vendor__winapi-util-0.1.9//:winapi_util",  # cfg(windows)
+        ],
+        "//conditions:default": [],
+    }),
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.wasi-0.11.0+wasi-snapshot-preview1.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.wasi-0.11.0+wasi-snapshot-preview1.bazel
new file mode 100644
index 00000000000..c082e00c09b
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.wasi-0.11.0+wasi-snapshot-preview1.bazel
@@ -0,0 +1,81 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "wasi",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2018",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=wasi",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.11.0+wasi-snapshot-preview1",
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.wasm-bindgen-0.2.95.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.wasm-bindgen-0.2.95.bazel
new file mode 100644
index 00000000000..eaa584866e3
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.wasm-bindgen-0.2.95.bazel
@@ -0,0 +1,155 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_build_script")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "wasm_bindgen",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "default",
+        "spans",
+        "std",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    proc_macro_deps = [
+        "@vendor__wasm-bindgen-macro-0.2.95//:wasm_bindgen_macro",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=wasm-bindgen",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.2.95",
+    deps = [
+        "@vendor__cfg-if-1.0.0//:cfg_if",
+        "@vendor__once_cell-1.20.2//:once_cell",
+        "@vendor__wasm-bindgen-0.2.95//:build_script_build",
+    ],
+)
+
+cargo_build_script(
+    name = "_bs",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            "**/*.rs",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "default",
+        "spans",
+        "std",
+    ],
+    crate_name = "build_script_build",
+    crate_root = "build.rs",
+    data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    edition = "2021",
+    pkg_name = "wasm-bindgen",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=wasm-bindgen",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    version = "0.2.95",
+    visibility = ["//visibility:private"],
+)
+
+alias(
+    name = "build_script_build",
+    actual = ":_bs",
+    tags = ["manual"],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.wasm-bindgen-backend-0.2.95.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.wasm-bindgen-backend-0.2.95.bazel
new file mode 100644
index 00000000000..553672da95d
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.wasm-bindgen-backend-0.2.95.bazel
@@ -0,0 +1,93 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "wasm_bindgen_backend",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "spans",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=wasm-bindgen-backend",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.2.95",
+    deps = [
+        "@vendor__bumpalo-3.16.0//:bumpalo",
+        "@vendor__log-0.4.22//:log",
+        "@vendor__once_cell-1.20.2//:once_cell",
+        "@vendor__proc-macro2-1.0.89//:proc_macro2",
+        "@vendor__quote-1.0.37//:quote",
+        "@vendor__syn-2.0.87//:syn",
+        "@vendor__wasm-bindgen-shared-0.2.95//:wasm_bindgen_shared",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.wasm-bindgen-macro-0.2.95.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.wasm-bindgen-macro-0.2.95.bazel
new file mode 100644
index 00000000000..f080cde7159
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.wasm-bindgen-macro-0.2.95.bazel
@@ -0,0 +1,88 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//rust:defs.bzl", "rust_proc_macro")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_proc_macro(
+    name = "wasm_bindgen_macro",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "spans",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=wasm-bindgen-macro",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.2.95",
+    deps = [
+        "@vendor__quote-1.0.37//:quote",
+        "@vendor__wasm-bindgen-macro-support-0.2.95//:wasm_bindgen_macro_support",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.wasm-bindgen-macro-support-0.2.95.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.wasm-bindgen-macro-support-0.2.95.bazel
new file mode 100644
index 00000000000..e6d3ef62cc5
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.wasm-bindgen-macro-support-0.2.95.bazel
@@ -0,0 +1,91 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "wasm_bindgen_macro_support",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "spans",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=wasm-bindgen-macro-support",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.2.95",
+    deps = [
+        "@vendor__proc-macro2-1.0.89//:proc_macro2",
+        "@vendor__quote-1.0.37//:quote",
+        "@vendor__syn-2.0.87//:syn",
+        "@vendor__wasm-bindgen-backend-0.2.95//:wasm_bindgen_backend",
+        "@vendor__wasm-bindgen-shared-0.2.95//:wasm_bindgen_shared",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.wasm-bindgen-shared-0.2.95.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.wasm-bindgen-shared-0.2.95.bazel
new file mode 100644
index 00000000000..70dec9f570b
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.wasm-bindgen-shared-0.2.95.bazel
@@ -0,0 +1,141 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_build_script")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "wasm_bindgen_shared",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=wasm-bindgen-shared",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.2.95",
+    deps = [
+        "@vendor__wasm-bindgen-shared-0.2.95//:build_script_build",
+    ],
+)
+
+cargo_build_script(
+    name = "_bs",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            "**/*.rs",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_name = "build_script_build",
+    crate_root = "build.rs",
+    data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    edition = "2021",
+    links = "wasm_bindgen",
+    pkg_name = "wasm-bindgen-shared",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=wasm-bindgen-shared",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    version = "0.2.95",
+    visibility = ["//visibility:private"],
+)
+
+alias(
+    name = "build_script_build",
+    actual = ":_bs",
+    tags = ["manual"],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.winapi-0.3.9.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.winapi-0.3.9.bazel
new file mode 100644
index 00000000000..10f4ecf603d
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.winapi-0.3.9.bazel
@@ -0,0 +1,154 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_build_script")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "winapi",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "consoleapi",
+        "errhandlingapi",
+        "fileapi",
+        "handleapi",
+        "processenv",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2015",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=winapi",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.3.9",
+    deps = [
+        "@vendor__winapi-0.3.9//:build_script_build",
+    ],
+)
+
+cargo_build_script(
+    name = "_bs",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            "**/*.rs",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "consoleapi",
+        "errhandlingapi",
+        "fileapi",
+        "handleapi",
+        "processenv",
+    ],
+    crate_name = "build_script_build",
+    crate_root = "build.rs",
+    data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    edition = "2015",
+    pkg_name = "winapi",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=winapi",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    version = "0.3.9",
+    visibility = ["//visibility:private"],
+)
+
+alias(
+    name = "build_script_build",
+    actual = ":_bs",
+    tags = ["manual"],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.winapi-i686-pc-windows-gnu-0.4.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.winapi-i686-pc-windows-gnu-0.4.0.bazel
new file mode 100644
index 00000000000..92d9e803f15
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.winapi-i686-pc-windows-gnu-0.4.0.bazel
@@ -0,0 +1,140 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_build_script")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "winapi_i686_pc_windows_gnu",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2015",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=winapi-i686-pc-windows-gnu",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.4.0",
+    deps = [
+        "@vendor__winapi-i686-pc-windows-gnu-0.4.0//:build_script_build",
+    ],
+)
+
+cargo_build_script(
+    name = "_bs",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            "**/*.rs",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_name = "build_script_build",
+    crate_root = "build.rs",
+    data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    edition = "2015",
+    pkg_name = "winapi-i686-pc-windows-gnu",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=winapi-i686-pc-windows-gnu",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    version = "0.4.0",
+    visibility = ["//visibility:private"],
+)
+
+alias(
+    name = "build_script_build",
+    actual = ":_bs",
+    tags = ["manual"],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.winapi-util-0.1.9.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.winapi-util-0.1.9.bazel
new file mode 100644
index 00000000000..c45eda5259b
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.winapi-util-0.1.9.bazel
@@ -0,0 +1,93 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "winapi_util",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=winapi-util",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.1.9",
+    deps = select({
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [
+            "@vendor__windows-sys-0.59.0//:windows_sys",  # cfg(windows)
+        ],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [
+            "@vendor__windows-sys-0.59.0//:windows_sys",  # cfg(windows)
+        ],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [
+            "@vendor__windows-sys-0.59.0//:windows_sys",  # cfg(windows)
+        ],
+        "//conditions:default": [],
+    }),
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.winapi-x86_64-pc-windows-gnu-0.4.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.winapi-x86_64-pc-windows-gnu-0.4.0.bazel
new file mode 100644
index 00000000000..a61db1e2c0a
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.winapi-x86_64-pc-windows-gnu-0.4.0.bazel
@@ -0,0 +1,140 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_build_script")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "winapi_x86_64_pc_windows_gnu",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2015",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=winapi-x86_64-pc-windows-gnu",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.4.0",
+    deps = [
+        "@vendor__winapi-x86_64-pc-windows-gnu-0.4.0//:build_script_build",
+    ],
+)
+
+cargo_build_script(
+    name = "_bs",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            "**/*.rs",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_name = "build_script_build",
+    crate_root = "build.rs",
+    data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    edition = "2015",
+    pkg_name = "winapi-x86_64-pc-windows-gnu",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=winapi-x86_64-pc-windows-gnu",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    version = "0.4.0",
+    visibility = ["//visibility:private"],
+)
+
+alias(
+    name = "build_script_build",
+    actual = ":_bs",
+    tags = ["manual"],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows-core-0.52.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows-core-0.52.0.bazel
new file mode 100644
index 00000000000..c89284531c5
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows-core-0.52.0.bazel
@@ -0,0 +1,84 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "windows_core",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=windows-core",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.52.0",
+    deps = [
+        "@vendor__windows-targets-0.52.6//:windows_targets",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows-sys-0.48.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows-sys-0.48.0.bazel
new file mode 100644
index 00000000000..a79e1aab272
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows-sys-0.48.0.bazel
@@ -0,0 +1,99 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "windows_sys",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "Win32",
+        "Win32_Foundation",
+        "Win32_Networking",
+        "Win32_Networking_WinSock",
+        "Win32_Security",
+        "Win32_Storage",
+        "Win32_Storage_FileSystem",
+        "Win32_System",
+        "Win32_System_IO",
+        "Win32_System_Pipes",
+        "Win32_System_Threading",
+        "Win32_System_WindowsProgramming",
+        "default",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2018",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=windows-sys",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.48.0",
+    deps = [
+        "@vendor__windows-targets-0.48.5//:windows_targets",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows-sys-0.52.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows-sys-0.52.0.bazel
new file mode 100644
index 00000000000..bd961408e72
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows-sys-0.52.0.bazel
@@ -0,0 +1,98 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "windows_sys",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "Win32",
+        "Win32_Foundation",
+        "Win32_Storage",
+        "Win32_Storage_FileSystem",
+        "Win32_System",
+        "Win32_System_Com",
+        "Win32_System_Console",
+        "Win32_System_ProcessStatus",
+        "Win32_System_Threading",
+        "Win32_UI",
+        "Win32_UI_Shell",
+        "default",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=windows-sys",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.52.0",
+    deps = [
+        "@vendor__windows-targets-0.52.6//:windows_targets",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows-sys-0.59.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows-sys-0.59.0.bazel
new file mode 100644
index 00000000000..eea0d44c815
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows-sys-0.59.0.bazel
@@ -0,0 +1,94 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "windows_sys",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "Win32",
+        "Win32_Foundation",
+        "Win32_Storage",
+        "Win32_Storage_FileSystem",
+        "Win32_System",
+        "Win32_System_Console",
+        "Win32_System_SystemInformation",
+        "default",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=windows-sys",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.59.0",
+    deps = [
+        "@vendor__windows-targets-0.52.6//:windows_targets",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows-targets-0.48.5.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows-targets-0.48.5.bazel
new file mode 100644
index 00000000000..a17193b75d2
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows-targets-0.48.5.bazel
@@ -0,0 +1,102 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "windows_targets",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2018",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=windows-targets",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.48.5",
+    deps = select({
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [
+            "@vendor__windows_aarch64_msvc-0.48.5//:windows_aarch64_msvc",  # cfg(all(target_arch = "aarch64", target_env = "msvc", not(windows_raw_dylib)))
+        ],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [
+            "@vendor__windows_i686_msvc-0.48.5//:windows_i686_msvc",  # cfg(all(target_arch = "x86", target_env = "msvc", not(windows_raw_dylib)))
+        ],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [
+            "@vendor__windows_i686_gnu-0.48.5//:windows_i686_gnu",  # cfg(all(target_arch = "x86", target_env = "gnu", not(windows_raw_dylib)))
+        ],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [
+            "@vendor__windows_x86_64_msvc-0.48.5//:windows_x86_64_msvc",  # cfg(all(target_arch = "x86_64", target_env = "msvc", not(windows_raw_dylib)))
+        ],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [
+            "@vendor__windows_x86_64_gnu-0.48.5//:windows_x86_64_gnu",  # cfg(all(target_arch = "x86_64", target_env = "gnu", not(target_abi = "llvm"), not(windows_raw_dylib)))
+        ],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [
+            "@vendor__windows_x86_64_gnu-0.48.5//:windows_x86_64_gnu",  # cfg(all(target_arch = "x86_64", target_env = "gnu", not(target_abi = "llvm"), not(windows_raw_dylib)))
+        ],
+        "//conditions:default": [],
+    }),
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows-targets-0.52.6.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows-targets-0.52.6.bazel
new file mode 100644
index 00000000000..bd39f4b679f
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows-targets-0.52.6.bazel
@@ -0,0 +1,102 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "windows_targets",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=windows-targets",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.52.6",
+    deps = select({
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [
+            "@vendor__windows_aarch64_msvc-0.52.6//:windows_aarch64_msvc",  # cfg(all(target_arch = "aarch64", target_env = "msvc", not(windows_raw_dylib)))
+        ],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [
+            "@vendor__windows_i686_msvc-0.52.6//:windows_i686_msvc",  # cfg(all(target_arch = "x86", target_env = "msvc", not(windows_raw_dylib)))
+        ],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [
+            "@vendor__windows_i686_gnu-0.52.6//:windows_i686_gnu",  # cfg(all(target_arch = "x86", target_env = "gnu", not(target_abi = "llvm"), not(windows_raw_dylib)))
+        ],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [
+            "@vendor__windows_x86_64_msvc-0.52.6//:windows_x86_64_msvc",  # cfg(all(any(target_arch = "x86_64", target_arch = "arm64ec"), target_env = "msvc", not(windows_raw_dylib)))
+        ],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [
+            "@vendor__windows_x86_64_gnu-0.52.6//:windows_x86_64_gnu",  # cfg(all(target_arch = "x86_64", target_env = "gnu", not(target_abi = "llvm"), not(windows_raw_dylib)))
+        ],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [
+            "@vendor__windows_x86_64_gnu-0.52.6//:windows_x86_64_gnu",  # cfg(all(target_arch = "x86_64", target_env = "gnu", not(target_abi = "llvm"), not(windows_raw_dylib)))
+        ],
+        "//conditions:default": [],
+    }),
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_aarch64_gnullvm-0.48.5.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_aarch64_gnullvm-0.48.5.bazel
new file mode 100644
index 00000000000..74cff769894
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_aarch64_gnullvm-0.48.5.bazel
@@ -0,0 +1,140 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_build_script")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "windows_aarch64_gnullvm",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2018",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=windows_aarch64_gnullvm",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.48.5",
+    deps = [
+        "@vendor__windows_aarch64_gnullvm-0.48.5//:build_script_build",
+    ],
+)
+
+cargo_build_script(
+    name = "_bs",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            "**/*.rs",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_name = "build_script_build",
+    crate_root = "build.rs",
+    data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    edition = "2018",
+    pkg_name = "windows_aarch64_gnullvm",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=windows_aarch64_gnullvm",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    version = "0.48.5",
+    visibility = ["//visibility:private"],
+)
+
+alias(
+    name = "build_script_build",
+    actual = ":_bs",
+    tags = ["manual"],
+)
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
new file mode 100644
index 00000000000..3322fe44370
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_aarch64_gnullvm-0.52.6.bazel
@@ -0,0 +1,140 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_build_script")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "windows_aarch64_gnullvm",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=windows_aarch64_gnullvm",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.52.6",
+    deps = [
+        "@vendor__windows_aarch64_gnullvm-0.52.6//:build_script_build",
+    ],
+)
+
+cargo_build_script(
+    name = "_bs",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            "**/*.rs",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_name = "build_script_build",
+    crate_root = "build.rs",
+    data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    edition = "2021",
+    pkg_name = "windows_aarch64_gnullvm",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=windows_aarch64_gnullvm",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    version = "0.52.6",
+    visibility = ["//visibility:private"],
+)
+
+alias(
+    name = "build_script_build",
+    actual = ":_bs",
+    tags = ["manual"],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_aarch64_msvc-0.48.5.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_aarch64_msvc-0.48.5.bazel
new file mode 100644
index 00000000000..9509b0112dd
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_aarch64_msvc-0.48.5.bazel
@@ -0,0 +1,140 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_build_script")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "windows_aarch64_msvc",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2018",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=windows_aarch64_msvc",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.48.5",
+    deps = [
+        "@vendor__windows_aarch64_msvc-0.48.5//:build_script_build",
+    ],
+)
+
+cargo_build_script(
+    name = "_bs",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            "**/*.rs",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_name = "build_script_build",
+    crate_root = "build.rs",
+    data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    edition = "2018",
+    pkg_name = "windows_aarch64_msvc",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=windows_aarch64_msvc",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    version = "0.48.5",
+    visibility = ["//visibility:private"],
+)
+
+alias(
+    name = "build_script_build",
+    actual = ":_bs",
+    tags = ["manual"],
+)
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
new file mode 100644
index 00000000000..e74cb2741f3
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_aarch64_msvc-0.52.6.bazel
@@ -0,0 +1,140 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_build_script")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "windows_aarch64_msvc",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=windows_aarch64_msvc",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.52.6",
+    deps = [
+        "@vendor__windows_aarch64_msvc-0.52.6//:build_script_build",
+    ],
+)
+
+cargo_build_script(
+    name = "_bs",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            "**/*.rs",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_name = "build_script_build",
+    crate_root = "build.rs",
+    data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    edition = "2021",
+    pkg_name = "windows_aarch64_msvc",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=windows_aarch64_msvc",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    version = "0.52.6",
+    visibility = ["//visibility:private"],
+)
+
+alias(
+    name = "build_script_build",
+    actual = ":_bs",
+    tags = ["manual"],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_i686_gnu-0.48.5.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_i686_gnu-0.48.5.bazel
new file mode 100644
index 00000000000..3aa488a183e
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_i686_gnu-0.48.5.bazel
@@ -0,0 +1,140 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_build_script")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "windows_i686_gnu",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2018",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=windows_i686_gnu",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.48.5",
+    deps = [
+        "@vendor__windows_i686_gnu-0.48.5//:build_script_build",
+    ],
+)
+
+cargo_build_script(
+    name = "_bs",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            "**/*.rs",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_name = "build_script_build",
+    crate_root = "build.rs",
+    data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    edition = "2018",
+    pkg_name = "windows_i686_gnu",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=windows_i686_gnu",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    version = "0.48.5",
+    visibility = ["//visibility:private"],
+)
+
+alias(
+    name = "build_script_build",
+    actual = ":_bs",
+    tags = ["manual"],
+)
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
new file mode 100644
index 00000000000..e515f814417
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_i686_gnu-0.52.6.bazel
@@ -0,0 +1,140 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_build_script")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "windows_i686_gnu",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=windows_i686_gnu",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.52.6",
+    deps = [
+        "@vendor__windows_i686_gnu-0.52.6//:build_script_build",
+    ],
+)
+
+cargo_build_script(
+    name = "_bs",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            "**/*.rs",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_name = "build_script_build",
+    crate_root = "build.rs",
+    data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    edition = "2021",
+    pkg_name = "windows_i686_gnu",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=windows_i686_gnu",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    version = "0.52.6",
+    visibility = ["//visibility:private"],
+)
+
+alias(
+    name = "build_script_build",
+    actual = ":_bs",
+    tags = ["manual"],
+)
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
new file mode 100644
index 00000000000..7655df70057
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_i686_gnullvm-0.52.6.bazel
@@ -0,0 +1,140 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_build_script")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "windows_i686_gnullvm",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=windows_i686_gnullvm",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.52.6",
+    deps = [
+        "@vendor__windows_i686_gnullvm-0.52.6//:build_script_build",
+    ],
+)
+
+cargo_build_script(
+    name = "_bs",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            "**/*.rs",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_name = "build_script_build",
+    crate_root = "build.rs",
+    data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    edition = "2021",
+    pkg_name = "windows_i686_gnullvm",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=windows_i686_gnullvm",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    version = "0.52.6",
+    visibility = ["//visibility:private"],
+)
+
+alias(
+    name = "build_script_build",
+    actual = ":_bs",
+    tags = ["manual"],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_i686_msvc-0.48.5.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_i686_msvc-0.48.5.bazel
new file mode 100644
index 00000000000..9ae12425fe8
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_i686_msvc-0.48.5.bazel
@@ -0,0 +1,140 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_build_script")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "windows_i686_msvc",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2018",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=windows_i686_msvc",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.48.5",
+    deps = [
+        "@vendor__windows_i686_msvc-0.48.5//:build_script_build",
+    ],
+)
+
+cargo_build_script(
+    name = "_bs",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            "**/*.rs",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_name = "build_script_build",
+    crate_root = "build.rs",
+    data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    edition = "2018",
+    pkg_name = "windows_i686_msvc",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=windows_i686_msvc",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    version = "0.48.5",
+    visibility = ["//visibility:private"],
+)
+
+alias(
+    name = "build_script_build",
+    actual = ":_bs",
+    tags = ["manual"],
+)
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
new file mode 100644
index 00000000000..cbff46f7d99
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_i686_msvc-0.52.6.bazel
@@ -0,0 +1,140 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_build_script")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "windows_i686_msvc",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=windows_i686_msvc",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.52.6",
+    deps = [
+        "@vendor__windows_i686_msvc-0.52.6//:build_script_build",
+    ],
+)
+
+cargo_build_script(
+    name = "_bs",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            "**/*.rs",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_name = "build_script_build",
+    crate_root = "build.rs",
+    data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    edition = "2021",
+    pkg_name = "windows_i686_msvc",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=windows_i686_msvc",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    version = "0.52.6",
+    visibility = ["//visibility:private"],
+)
+
+alias(
+    name = "build_script_build",
+    actual = ":_bs",
+    tags = ["manual"],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_x86_64_gnu-0.48.5.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_x86_64_gnu-0.48.5.bazel
new file mode 100644
index 00000000000..a19b5366df4
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_x86_64_gnu-0.48.5.bazel
@@ -0,0 +1,140 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_build_script")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "windows_x86_64_gnu",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2018",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=windows_x86_64_gnu",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.48.5",
+    deps = [
+        "@vendor__windows_x86_64_gnu-0.48.5//:build_script_build",
+    ],
+)
+
+cargo_build_script(
+    name = "_bs",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            "**/*.rs",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_name = "build_script_build",
+    crate_root = "build.rs",
+    data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    edition = "2018",
+    pkg_name = "windows_x86_64_gnu",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=windows_x86_64_gnu",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    version = "0.48.5",
+    visibility = ["//visibility:private"],
+)
+
+alias(
+    name = "build_script_build",
+    actual = ":_bs",
+    tags = ["manual"],
+)
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
new file mode 100644
index 00000000000..72eb1be73a2
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_x86_64_gnu-0.52.6.bazel
@@ -0,0 +1,140 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_build_script")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "windows_x86_64_gnu",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=windows_x86_64_gnu",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.52.6",
+    deps = [
+        "@vendor__windows_x86_64_gnu-0.52.6//:build_script_build",
+    ],
+)
+
+cargo_build_script(
+    name = "_bs",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            "**/*.rs",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_name = "build_script_build",
+    crate_root = "build.rs",
+    data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    edition = "2021",
+    pkg_name = "windows_x86_64_gnu",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=windows_x86_64_gnu",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    version = "0.52.6",
+    visibility = ["//visibility:private"],
+)
+
+alias(
+    name = "build_script_build",
+    actual = ":_bs",
+    tags = ["manual"],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_x86_64_gnullvm-0.48.5.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_x86_64_gnullvm-0.48.5.bazel
new file mode 100644
index 00000000000..0a98facdb2f
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_x86_64_gnullvm-0.48.5.bazel
@@ -0,0 +1,140 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_build_script")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "windows_x86_64_gnullvm",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2018",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=windows_x86_64_gnullvm",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.48.5",
+    deps = [
+        "@vendor__windows_x86_64_gnullvm-0.48.5//:build_script_build",
+    ],
+)
+
+cargo_build_script(
+    name = "_bs",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            "**/*.rs",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_name = "build_script_build",
+    crate_root = "build.rs",
+    data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    edition = "2018",
+    pkg_name = "windows_x86_64_gnullvm",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=windows_x86_64_gnullvm",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    version = "0.48.5",
+    visibility = ["//visibility:private"],
+)
+
+alias(
+    name = "build_script_build",
+    actual = ":_bs",
+    tags = ["manual"],
+)
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
new file mode 100644
index 00000000000..390fb2d463a
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_x86_64_gnullvm-0.52.6.bazel
@@ -0,0 +1,140 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_build_script")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "windows_x86_64_gnullvm",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=windows_x86_64_gnullvm",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.52.6",
+    deps = [
+        "@vendor__windows_x86_64_gnullvm-0.52.6//:build_script_build",
+    ],
+)
+
+cargo_build_script(
+    name = "_bs",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            "**/*.rs",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_name = "build_script_build",
+    crate_root = "build.rs",
+    data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    edition = "2021",
+    pkg_name = "windows_x86_64_gnullvm",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=windows_x86_64_gnullvm",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    version = "0.52.6",
+    visibility = ["//visibility:private"],
+)
+
+alias(
+    name = "build_script_build",
+    actual = ":_bs",
+    tags = ["manual"],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_x86_64_msvc-0.48.5.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_x86_64_msvc-0.48.5.bazel
new file mode 100644
index 00000000000..992d264d66c
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_x86_64_msvc-0.48.5.bazel
@@ -0,0 +1,140 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_build_script")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "windows_x86_64_msvc",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2018",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=windows_x86_64_msvc",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.48.5",
+    deps = [
+        "@vendor__windows_x86_64_msvc-0.48.5//:build_script_build",
+    ],
+)
+
+cargo_build_script(
+    name = "_bs",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            "**/*.rs",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_name = "build_script_build",
+    crate_root = "build.rs",
+    data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    edition = "2018",
+    pkg_name = "windows_x86_64_msvc",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=windows_x86_64_msvc",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    version = "0.48.5",
+    visibility = ["//visibility:private"],
+)
+
+alias(
+    name = "build_script_build",
+    actual = ":_bs",
+    tags = ["manual"],
+)
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
new file mode 100644
index 00000000000..a163b4a6067
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_x86_64_msvc-0.52.6.bazel
@@ -0,0 +1,140 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_build_script")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "windows_x86_64_msvc",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=windows_x86_64_msvc",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.52.6",
+    deps = [
+        "@vendor__windows_x86_64_msvc-0.52.6//:build_script_build",
+    ],
+)
+
+cargo_build_script(
+    name = "_bs",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            "**/*.rs",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_name = "build_script_build",
+    crate_root = "build.rs",
+    data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    edition = "2021",
+    pkg_name = "windows_x86_64_msvc",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=windows_x86_64_msvc",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    version = "0.52.6",
+    visibility = ["//visibility:private"],
+)
+
+alias(
+    name = "build_script_build",
+    actual = ":_bs",
+    tags = ["manual"],
+)
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
new file mode 100644
index 00000000000..29767f6e4a3
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.yansi-1.0.1.bazel
@@ -0,0 +1,86 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "yansi",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "alloc",
+        "default",
+        "std",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=yansi",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "1.0.1",
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.zerocopy-0.7.35.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.zerocopy-0.7.35.bazel
new file mode 100644
index 00000000000..f31a09f1e23
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.zerocopy-0.7.35.bazel
@@ -0,0 +1,94 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "zerocopy",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "byteorder",
+        "default",
+        "derive",
+        "simd",
+        "zerocopy-derive",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2018",
+    proc_macro_deps = [
+        "@vendor__zerocopy-derive-0.7.35//:zerocopy_derive",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=zerocopy",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.7.35",
+    deps = [
+        "@vendor__byteorder-1.5.0//:byteorder",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.zerocopy-derive-0.7.35.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.zerocopy-derive-0.7.35.bazel
new file mode 100644
index 00000000000..cab5ffc54d9
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.zerocopy-derive-0.7.35.bazel
@@ -0,0 +1,86 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//rust:defs.bzl", "rust_proc_macro")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_proc_macro(
+    name = "zerocopy_derive",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2018",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=zerocopy-derive",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.7.35",
+    deps = [
+        "@vendor__proc-macro2-1.0.89//:proc_macro2",
+        "@vendor__quote-1.0.37//:quote",
+        "@vendor__syn-2.0.87//:syn",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/alias_rules.bzl b/misc/bazel/3rdparty/tree_sitter_extractors_deps/alias_rules.bzl
new file mode 100644
index 00000000000..14b04c12728
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/alias_rules.bzl
@@ -0,0 +1,47 @@
+"""Alias that transitions its target to `compilation_mode=opt`.  Use `transition_alias="opt"` to enable."""
+
+load("@rules_cc//cc:defs.bzl", "CcInfo")
+load("@rules_rust//rust:rust_common.bzl", "COMMON_PROVIDERS")
+
+def _transition_alias_impl(ctx):
+    # `ctx.attr.actual` is a list of 1 item due to the transition
+    providers = [ctx.attr.actual[0][provider] for provider in COMMON_PROVIDERS]
+    if CcInfo in ctx.attr.actual[0]:
+        providers.append(ctx.attr.actual[0][CcInfo])
+    return providers
+
+def _change_compilation_mode(compilation_mode):
+    def _change_compilation_mode_impl(_settings, _attr):
+        return {
+            "//command_line_option:compilation_mode": compilation_mode,
+        }
+
+    return transition(
+        implementation = _change_compilation_mode_impl,
+        inputs = [],
+        outputs = [
+            "//command_line_option:compilation_mode",
+        ],
+    )
+
+def _transition_alias_rule(compilation_mode):
+    return rule(
+        implementation = _transition_alias_impl,
+        provides = COMMON_PROVIDERS,
+        attrs = {
+            "actual": attr.label(
+                mandatory = True,
+                doc = "`rust_library()` target to transition to `compilation_mode=opt`.",
+                providers = COMMON_PROVIDERS,
+                cfg = _change_compilation_mode(compilation_mode),
+            ),
+            "_allowlist_function_transition": attr.label(
+                default = "@bazel_tools//tools/allowlists/function_transition_allowlist",
+            ),
+        },
+        doc = "Transitions a Rust library crate to the `compilation_mode=opt`.",
+    )
+
+transition_alias_dbg = _transition_alias_rule("dbg")
+transition_alias_fastbuild = _transition_alias_rule("fastbuild")
+transition_alias_opt = _transition_alias_rule("opt")
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/crates.bzl b/misc/bazel/3rdparty/tree_sitter_extractors_deps/crates.bzl
new file mode 100644
index 00000000000..932b9ce66d0
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/crates.bzl
@@ -0,0 +1,32 @@
+###############################################################################
+# @generated
+# This file is auto-generated by the cargo-bazel tool.
+#
+# DO NOT MODIFY: Local changes may be replaced in future executions.
+###############################################################################
+"""Rules for defining repositories for remote `crates_vendor` repositories"""
+
+load("@bazel_tools//tools/build_defs/repo:utils.bzl", "maybe")
+
+# buildifier: disable=bzl-visibility
+load("@rules_rust//crate_universe/private:crates_vendor.bzl", "crates_vendor_remote_repository")
+
+# buildifier: disable=bzl-visibility
+load("//misc/bazel/3rdparty/tree_sitter_extractors_deps:defs.bzl", _crate_repositories = "crate_repositories")
+
+def crate_repositories():
+    """Generates repositories for vendored crates.
+
+    Returns:
+      A list of repos visible to the module through the module extension.
+    """
+    maybe(
+        crates_vendor_remote_repository,
+        name = "vendor",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.bazel"),
+        defs_module = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:defs.bzl"),
+    )
+
+    direct_deps = [struct(repo = "vendor", is_dev_dep = False)]
+    direct_deps.extend(_crate_repositories())
+    return direct_deps
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/defs.bzl b/misc/bazel/3rdparty/tree_sitter_extractors_deps/defs.bzl
new file mode 100644
index 00000000000..1d0b825c235
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/defs.bzl
@@ -0,0 +1,3358 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+"""
+# `crates_repository` API
+
+- [aliases](#aliases)
+- [crate_deps](#crate_deps)
+- [all_crate_deps](#all_crate_deps)
+- [crate_repositories](#crate_repositories)
+
+"""
+
+load("@bazel_skylib//lib:selects.bzl", "selects")
+load("@bazel_tools//tools/build_defs/repo:git.bzl", "new_git_repository")
+load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
+load("@bazel_tools//tools/build_defs/repo:utils.bzl", "maybe")
+
+###############################################################################
+# MACROS API
+###############################################################################
+
+# An identifier that represent common dependencies (unconditional).
+_COMMON_CONDITION = ""
+
+def _flatten_dependency_maps(all_dependency_maps):
+    """Flatten a list of dependency maps into one dictionary.
+
+    Dependency maps have the following structure:
+
+    ```python
+    DEPENDENCIES_MAP = {
+        # The first key in the map is a Bazel package
+        # name of the workspace this file is defined in.
+        "workspace_member_package": {
+
+            # Not all dependencies are supported for all platforms.
+            # the condition key is the condition required to be true
+            # on the host platform.
+            "condition": {
+
+                # An alias to a crate target.     # The label of the crate target the
+                # Aliases are only crate names.   # package name refers to.
+                "package_name":                   "@full//:label",
+            }
+        }
+    }
+    ```
+
+    Args:
+        all_dependency_maps (list): A list of dicts as described above
+
+    Returns:
+        dict: A dictionary as described above
+    """
+    dependencies = {}
+
+    for workspace_deps_map in all_dependency_maps:
+        for pkg_name, conditional_deps_map in workspace_deps_map.items():
+            if pkg_name not in dependencies:
+                non_frozen_map = dict()
+                for key, values in conditional_deps_map.items():
+                    non_frozen_map.update({key: dict(values.items())})
+                dependencies.setdefault(pkg_name, non_frozen_map)
+                continue
+
+            for condition, deps_map in conditional_deps_map.items():
+                # If the condition has not been recorded, do so and continue
+                if condition not in dependencies[pkg_name]:
+                    dependencies[pkg_name].setdefault(condition, dict(deps_map.items()))
+                    continue
+
+                # Alert on any miss-matched dependencies
+                inconsistent_entries = []
+                for crate_name, crate_label in deps_map.items():
+                    existing = dependencies[pkg_name][condition].get(crate_name)
+                    if existing and existing != crate_label:
+                        inconsistent_entries.append((crate_name, existing, crate_label))
+                    dependencies[pkg_name][condition].update({crate_name: crate_label})
+
+    return dependencies
+
+def crate_deps(deps, package_name = None):
+    """Finds the fully qualified label of the requested crates for the package where this macro is called.
+
+    Args:
+        deps (list): The desired list of crate targets.
+        package_name (str, optional): The package name of the set of dependencies to look up.
+            Defaults to `native.package_name()`.
+
+    Returns:
+        list: A list of labels to generated rust targets (str)
+    """
+
+    if not deps:
+        return []
+
+    if package_name == None:
+        package_name = native.package_name()
+
+    # Join both sets of dependencies
+    dependencies = _flatten_dependency_maps([
+        _NORMAL_DEPENDENCIES,
+        _NORMAL_DEV_DEPENDENCIES,
+        _PROC_MACRO_DEPENDENCIES,
+        _PROC_MACRO_DEV_DEPENDENCIES,
+        _BUILD_DEPENDENCIES,
+        _BUILD_PROC_MACRO_DEPENDENCIES,
+    ]).pop(package_name, {})
+
+    # Combine all conditional packages so we can easily index over a flat list
+    # TODO: Perhaps this should actually return select statements and maintain
+    # the conditionals of the dependencies
+    flat_deps = {}
+    for deps_set in dependencies.values():
+        for crate_name, crate_label in deps_set.items():
+            flat_deps.update({crate_name: crate_label})
+
+    missing_crates = []
+    crate_targets = []
+    for crate_target in deps:
+        if crate_target not in flat_deps:
+            missing_crates.append(crate_target)
+        else:
+            crate_targets.append(flat_deps[crate_target])
+
+    if missing_crates:
+        fail("Could not find crates `{}` among dependencies of `{}`. Available dependencies were `{}`".format(
+            missing_crates,
+            package_name,
+            dependencies,
+        ))
+
+    return crate_targets
+
+def all_crate_deps(
+        normal = False,
+        normal_dev = False,
+        proc_macro = False,
+        proc_macro_dev = False,
+        build = False,
+        build_proc_macro = False,
+        package_name = None):
+    """Finds the fully qualified label of all requested direct crate dependencies \
+    for the package where this macro is called.
+
+    If no parameters are set, all normal dependencies are returned. Setting any one flag will
+    otherwise impact the contents of the returned list.
+
+    Args:
+        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..
+        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
+            included in the output list.
+        build (bool, optional): If True, build dependencies are included
+            in the output list.
+        build_proc_macro (bool, optional): If True, build proc_macro dependencies are
+            included in the output list.
+        package_name (str, optional): The package name of the set of dependencies to look up.
+            Defaults to `native.package_name()` when unset.
+
+    Returns:
+        list: A list of labels to generated rust targets (str)
+    """
+
+    if package_name == None:
+        package_name = native.package_name()
+
+    # Determine the relevant maps to use
+    all_dependency_maps = []
+    if normal:
+        all_dependency_maps.append(_NORMAL_DEPENDENCIES)
+    if normal_dev:
+        all_dependency_maps.append(_NORMAL_DEV_DEPENDENCIES)
+    if proc_macro:
+        all_dependency_maps.append(_PROC_MACRO_DEPENDENCIES)
+    if proc_macro_dev:
+        all_dependency_maps.append(_PROC_MACRO_DEV_DEPENDENCIES)
+    if build:
+        all_dependency_maps.append(_BUILD_DEPENDENCIES)
+    if build_proc_macro:
+        all_dependency_maps.append(_BUILD_PROC_MACRO_DEPENDENCIES)
+
+    # Default to always using normal dependencies
+    if not all_dependency_maps:
+        all_dependency_maps.append(_NORMAL_DEPENDENCIES)
+
+    dependencies = _flatten_dependency_maps(all_dependency_maps).pop(package_name, None)
+
+    if not dependencies:
+        if dependencies == None:
+            fail("Tried to get all_crate_deps for package " + package_name + " but that package had no Cargo.toml file")
+        else:
+            return []
+
+    crate_deps = list(dependencies.pop(_COMMON_CONDITION, {}).values())
+    for condition, deps in dependencies.items():
+        crate_deps += selects.with_or({
+            tuple(_CONDITIONS[condition]): deps.values(),
+            "//conditions:default": [],
+        })
+
+    return crate_deps
+
+def aliases(
+        normal = False,
+        normal_dev = False,
+        proc_macro = False,
+        proc_macro_dev = False,
+        build = False,
+        build_proc_macro = False,
+        package_name = None):
+    """Produces a map of Crate alias names to their original label
+
+    If no dependency kinds are specified, `normal` and `proc_macro` are used by default.
+    Setting any one flag will otherwise determine the contents of the returned dict.
+
+    Args:
+        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..
+        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
+            included in the output list.
+        build (bool, optional): If True, build dependencies are included
+            in the output list.
+        build_proc_macro (bool, optional): If True, build proc_macro dependencies are
+            included in the output list.
+        package_name (str, optional): The package name of the set of dependencies to look up.
+            Defaults to `native.package_name()` when unset.
+
+    Returns:
+        dict: The aliases of all associated packages
+    """
+    if package_name == None:
+        package_name = native.package_name()
+
+    # Determine the relevant maps to use
+    all_aliases_maps = []
+    if normal:
+        all_aliases_maps.append(_NORMAL_ALIASES)
+    if normal_dev:
+        all_aliases_maps.append(_NORMAL_DEV_ALIASES)
+    if proc_macro:
+        all_aliases_maps.append(_PROC_MACRO_ALIASES)
+    if proc_macro_dev:
+        all_aliases_maps.append(_PROC_MACRO_DEV_ALIASES)
+    if build:
+        all_aliases_maps.append(_BUILD_ALIASES)
+    if build_proc_macro:
+        all_aliases_maps.append(_BUILD_PROC_MACRO_ALIASES)
+
+    # Default to always using normal aliases
+    if not all_aliases_maps:
+        all_aliases_maps.append(_NORMAL_ALIASES)
+        all_aliases_maps.append(_PROC_MACRO_ALIASES)
+
+    aliases = _flatten_dependency_maps(all_aliases_maps).pop(package_name, None)
+
+    if not aliases:
+        return dict()
+
+    common_items = aliases.pop(_COMMON_CONDITION, {}).items()
+
+    # If there are only common items in the dictionary, immediately return them
+    if not len(aliases.keys()) == 1:
+        return dict(common_items)
+
+    # Build a single select statement where each conditional has accounted for the
+    # common set of aliases.
+    crate_aliases = {"//conditions:default": dict(common_items)}
+    for condition, deps in aliases.items():
+        condition_triples = _CONDITIONS[condition]
+        for triple in condition_triples:
+            if triple in crate_aliases:
+                crate_aliases[triple].update(deps)
+            else:
+                crate_aliases.update({triple: dict(deps.items() + common_items)})
+
+    return select(crate_aliases)
+
+###############################################################################
+# WORKSPACE MEMBER DEPS AND ALIASES
+###############################################################################
+
+_NORMAL_DEPENDENCIES = {
+    "ruby/extractor": {
+        _COMMON_CONDITION: {
+            "clap": Label("@vendor__clap-4.5.20//:clap"),
+            "encoding": Label("@vendor__encoding-0.2.33//:encoding"),
+            "lazy_static": Label("@vendor__lazy_static-1.5.0//:lazy_static"),
+            "rayon": Label("@vendor__rayon-1.10.0//:rayon"),
+            "regex": Label("@vendor__regex-1.11.1//:regex"),
+            "tracing": Label("@vendor__tracing-0.1.40//:tracing"),
+            "tracing-subscriber": Label("@vendor__tracing-subscriber-0.3.18//:tracing_subscriber"),
+            "tree-sitter": Label("@vendor__tree-sitter-0.24.4//:tree_sitter"),
+            "tree-sitter-embedded-template": Label("@vendor__tree-sitter-embedded-template-0.23.2//:tree_sitter_embedded_template"),
+            "tree-sitter-ruby": Label("@vendor__tree-sitter-ruby-0.23.1//:tree_sitter_ruby"),
+        },
+    },
+    "rust/ast-generator": {
+        _COMMON_CONDITION: {
+            "itertools": Label("@vendor__itertools-0.10.5//:itertools"),
+            "proc-macro2": Label("@vendor__proc-macro2-1.0.89//:proc_macro2"),
+            "quote": Label("@vendor__quote-1.0.37//:quote"),
+            "ungrammar": Label("@vendor__ungrammar-1.16.1//:ungrammar"),
+        },
+    },
+    "rust/extractor": {
+        _COMMON_CONDITION: {
+            "anyhow": Label("@vendor__anyhow-1.0.93//:anyhow"),
+            "argfile": Label("@vendor__argfile-0.2.1//:argfile"),
+            "clap": Label("@vendor__clap-4.5.20//:clap"),
+            "figment": Label("@vendor__figment-0.10.19//:figment"),
+            "glob": Label("@vendor__glob-0.3.1//:glob"),
+            "itertools": Label("@vendor__itertools-0.13.0//:itertools"),
+            "log": Label("@vendor__log-0.4.22//:log"),
+            "num-traits": Label("@vendor__num-traits-0.2.19//:num_traits"),
+            "ra_ap_base_db": Label("@vendor__ra_ap_base_db-0.0.232//:ra_ap_base_db"),
+            "ra_ap_cfg": Label("@vendor__ra_ap_cfg-0.0.232//:ra_ap_cfg"),
+            "ra_ap_hir": Label("@vendor__ra_ap_hir-0.0.232//:ra_ap_hir"),
+            "ra_ap_hir_def": Label("@vendor__ra_ap_hir_def-0.0.232//:ra_ap_hir_def"),
+            "ra_ap_hir_expand": Label("@vendor__ra_ap_hir_expand-0.0.232//:ra_ap_hir_expand"),
+            "ra_ap_ide_db": Label("@vendor__ra_ap_ide_db-0.0.232//:ra_ap_ide_db"),
+            "ra_ap_intern": Label("@vendor__ra_ap_intern-0.0.232//:ra_ap_intern"),
+            "ra_ap_load-cargo": Label("@vendor__ra_ap_load-cargo-0.0.232//:ra_ap_load_cargo"),
+            "ra_ap_parser": Label("@vendor__ra_ap_parser-0.0.232//:ra_ap_parser"),
+            "ra_ap_paths": Label("@vendor__ra_ap_paths-0.0.232//:ra_ap_paths"),
+            "ra_ap_project_model": Label("@vendor__ra_ap_project_model-0.0.232//:ra_ap_project_model"),
+            "ra_ap_span": Label("@vendor__ra_ap_span-0.0.232//:ra_ap_span"),
+            "ra_ap_syntax": Label("@vendor__ra_ap_syntax-0.0.232//:ra_ap_syntax"),
+            "ra_ap_vfs": Label("@vendor__ra_ap_vfs-0.0.232//:ra_ap_vfs"),
+            "serde": Label("@vendor__serde-1.0.214//:serde"),
+            "serde_with": Label("@vendor__serde_with-3.11.0//:serde_with"),
+            "stderrlog": Label("@vendor__stderrlog-0.6.0//:stderrlog"),
+            "triomphe": Label("@vendor__triomphe-0.1.14//:triomphe"),
+        },
+    },
+    "rust/extractor/macros": {
+        _COMMON_CONDITION: {
+            "quote": Label("@vendor__quote-1.0.37//:quote"),
+            "syn": Label("@vendor__syn-2.0.87//:syn"),
+        },
+    },
+    "shared/tree-sitter-extractor": {
+        _COMMON_CONDITION: {
+            "chrono": Label("@vendor__chrono-0.4.38//:chrono"),
+            "encoding": Label("@vendor__encoding-0.2.33//:encoding"),
+            "flate2": Label("@vendor__flate2-1.0.34//:flate2"),
+            "globset": Label("@vendor__globset-0.4.15//:globset"),
+            "lazy_static": Label("@vendor__lazy_static-1.5.0//:lazy_static"),
+            "num_cpus": Label("@vendor__num_cpus-1.16.0//:num_cpus"),
+            "rayon": Label("@vendor__rayon-1.10.0//:rayon"),
+            "regex": Label("@vendor__regex-1.11.1//:regex"),
+            "serde": Label("@vendor__serde-1.0.214//:serde"),
+            "serde_json": Label("@vendor__serde_json-1.0.132//:serde_json"),
+            "tracing": Label("@vendor__tracing-0.1.40//:tracing"),
+            "tracing-subscriber": Label("@vendor__tracing-subscriber-0.3.18//:tracing_subscriber"),
+            "tree-sitter": Label("@vendor__tree-sitter-0.24.4//:tree_sitter"),
+        },
+    },
+}
+
+_NORMAL_ALIASES = {
+    "ruby/extractor": {
+        _COMMON_CONDITION: {
+        },
+    },
+    "rust/ast-generator": {
+        _COMMON_CONDITION: {
+        },
+    },
+    "rust/extractor": {
+        _COMMON_CONDITION: {
+        },
+    },
+    "rust/extractor/macros": {
+        _COMMON_CONDITION: {
+        },
+    },
+    "shared/tree-sitter-extractor": {
+        _COMMON_CONDITION: {
+        },
+    },
+}
+
+_NORMAL_DEV_DEPENDENCIES = {
+    "ruby/extractor": {
+    },
+    "rust/ast-generator": {
+    },
+    "rust/extractor": {
+    },
+    "rust/extractor/macros": {
+    },
+    "shared/tree-sitter-extractor": {
+        _COMMON_CONDITION: {
+            "rand": Label("@vendor__rand-0.8.5//:rand"),
+            "tree-sitter-json": Label("@vendor__tree-sitter-json-0.24.8//:tree_sitter_json"),
+            "tree-sitter-ql": Label("@vendor__tree-sitter-ql-0.23.1//:tree_sitter_ql"),
+        },
+    },
+}
+
+_NORMAL_DEV_ALIASES = {
+    "ruby/extractor": {
+    },
+    "rust/ast-generator": {
+    },
+    "rust/extractor": {
+    },
+    "rust/extractor/macros": {
+    },
+    "shared/tree-sitter-extractor": {
+        _COMMON_CONDITION: {
+        },
+    },
+}
+
+_PROC_MACRO_DEPENDENCIES = {
+    "ruby/extractor": {
+    },
+    "rust/ast-generator": {
+    },
+    "rust/extractor": {
+    },
+    "rust/extractor/macros": {
+    },
+    "shared/tree-sitter-extractor": {
+    },
+}
+
+_PROC_MACRO_ALIASES = {
+    "ruby/extractor": {
+    },
+    "rust/ast-generator": {
+    },
+    "rust/extractor": {
+    },
+    "rust/extractor/macros": {
+    },
+    "shared/tree-sitter-extractor": {
+    },
+}
+
+_PROC_MACRO_DEV_DEPENDENCIES = {
+    "ruby/extractor": {
+    },
+    "rust/ast-generator": {
+    },
+    "rust/extractor": {
+    },
+    "rust/extractor/macros": {
+    },
+    "shared/tree-sitter-extractor": {
+    },
+}
+
+_PROC_MACRO_DEV_ALIASES = {
+    "ruby/extractor": {
+    },
+    "rust/ast-generator": {
+    },
+    "rust/extractor": {
+    },
+    "rust/extractor/macros": {
+    },
+    "shared/tree-sitter-extractor": {
+        _COMMON_CONDITION: {
+        },
+    },
+}
+
+_BUILD_DEPENDENCIES = {
+    "ruby/extractor": {
+    },
+    "rust/ast-generator": {
+    },
+    "rust/extractor": {
+    },
+    "rust/extractor/macros": {
+    },
+    "shared/tree-sitter-extractor": {
+    },
+}
+
+_BUILD_ALIASES = {
+    "ruby/extractor": {
+    },
+    "rust/ast-generator": {
+    },
+    "rust/extractor": {
+    },
+    "rust/extractor/macros": {
+    },
+    "shared/tree-sitter-extractor": {
+    },
+}
+
+_BUILD_PROC_MACRO_DEPENDENCIES = {
+    "ruby/extractor": {
+    },
+    "rust/ast-generator": {
+    },
+    "rust/extractor": {
+    },
+    "rust/extractor/macros": {
+    },
+    "shared/tree-sitter-extractor": {
+    },
+}
+
+_BUILD_PROC_MACRO_ALIASES = {
+    "ruby/extractor": {
+    },
+    "rust/ast-generator": {
+    },
+    "rust/extractor": {
+    },
+    "rust/extractor/macros": {
+    },
+    "shared/tree-sitter-extractor": {
+    },
+}
+
+_CONDITIONS = {
+    "aarch64-apple-darwin": ["@rules_rust//rust/platform:aarch64-apple-darwin"],
+    "aarch64-apple-ios": ["@rules_rust//rust/platform:aarch64-apple-ios"],
+    "aarch64-apple-ios-sim": ["@rules_rust//rust/platform:aarch64-apple-ios-sim"],
+    "aarch64-fuchsia": ["@rules_rust//rust/platform:aarch64-fuchsia"],
+    "aarch64-linux-android": ["@rules_rust//rust/platform:aarch64-linux-android"],
+    "aarch64-pc-windows-gnullvm": [],
+    "aarch64-pc-windows-msvc": ["@rules_rust//rust/platform:aarch64-pc-windows-msvc"],
+    "aarch64-unknown-linux-gnu": ["@rules_rust//rust/platform:aarch64-unknown-linux-gnu", "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu"],
+    "aarch64-unknown-nixos-gnu": ["@rules_rust//rust/platform:aarch64-unknown-nixos-gnu"],
+    "aarch64-unknown-nto-qnx710": ["@rules_rust//rust/platform:aarch64-unknown-nto-qnx710"],
+    "arm-unknown-linux-gnueabi": ["@rules_rust//rust/platform:arm-unknown-linux-gnueabi"],
+    "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(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 = \"x86\", target_env = \"gnu\", not(target_abi = \"llvm\"), not(windows_raw_dylib)))": ["@rules_rust//rust/platform:i686-unknown-linux-gnu"],
+    "cfg(all(target_arch = \"x86\", target_env = \"gnu\", not(windows_raw_dylib)))": ["@rules_rust//rust/platform:i686-unknown-linux-gnu"],
+    "cfg(all(target_arch = \"x86\", target_env = \"msvc\", not(windows_raw_dylib)))": ["@rules_rust//rust/platform:i686-pc-windows-msvc"],
+    "cfg(all(target_arch = \"x86_64\", target_env = \"gnu\", not(target_abi = \"llvm\"), not(windows_raw_dylib)))": ["@rules_rust//rust/platform:x86_64-unknown-linux-gnu", "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu"],
+    "cfg(all(target_arch = \"x86_64\", target_env = \"msvc\", not(windows_raw_dylib)))": ["@rules_rust//rust/platform:x86_64-pc-windows-msvc"],
+    "cfg(any(target_os = \"freebsd\", target_os = \"openbsd\", target_os = \"netbsd\", target_os = \"dragonflybsd\"))": ["@rules_rust//rust/platform:i686-unknown-freebsd", "@rules_rust//rust/platform:x86_64-unknown-freebsd"],
+    "cfg(any(target_os = \"linux\", target_os = \"android\"))": ["@rules_rust//rust/platform:aarch64-linux-android", "@rules_rust//rust/platform:aarch64-unknown-linux-gnu", "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu", "@rules_rust//rust/platform:arm-unknown-linux-gnueabi", "@rules_rust//rust/platform:armv7-linux-androideabi", "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi", "@rules_rust//rust/platform:i686-linux-android", "@rules_rust//rust/platform:i686-unknown-linux-gnu", "@rules_rust//rust/platform:powerpc-unknown-linux-gnu", "@rules_rust//rust/platform:s390x-unknown-linux-gnu", "@rules_rust//rust/platform:x86_64-linux-android", "@rules_rust//rust/platform:x86_64-unknown-linux-gnu", "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu"],
+    "cfg(any(target_os = \"macos\", target_os = \"ios\"))": ["@rules_rust//rust/platform:aarch64-apple-darwin", "@rules_rust//rust/platform:aarch64-apple-ios", "@rules_rust//rust/platform:aarch64-apple-ios-sim", "@rules_rust//rust/platform:i686-apple-darwin", "@rules_rust//rust/platform:x86_64-apple-darwin", "@rules_rust//rust/platform:x86_64-apple-ios"],
+    "cfg(any(target_pointer_width = \"8\", target_pointer_width = \"16\", target_pointer_width = \"32\"))": ["@rules_rust//rust/platform:arm-unknown-linux-gnueabi", "@rules_rust//rust/platform:armv7-linux-androideabi", "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi", "@rules_rust//rust/platform:i686-apple-darwin", "@rules_rust//rust/platform:i686-linux-android", "@rules_rust//rust/platform:i686-pc-windows-msvc", "@rules_rust//rust/platform:i686-unknown-freebsd", "@rules_rust//rust/platform:i686-unknown-linux-gnu", "@rules_rust//rust/platform:powerpc-unknown-linux-gnu", "@rules_rust//rust/platform:riscv32imc-unknown-none-elf", "@rules_rust//rust/platform:thumbv7em-none-eabi", "@rules_rust//rust/platform:thumbv8m.main-none-eabi", "@rules_rust//rust/platform:wasm32-unknown-unknown", "@rules_rust//rust/platform:wasm32-wasi"],
+    "cfg(any(unix, target_os = \"wasi\"))": ["@rules_rust//rust/platform:aarch64-apple-darwin", "@rules_rust//rust/platform:aarch64-apple-ios", "@rules_rust//rust/platform:aarch64-apple-ios-sim", "@rules_rust//rust/platform:aarch64-fuchsia", "@rules_rust//rust/platform:aarch64-linux-android", "@rules_rust//rust/platform:aarch64-unknown-linux-gnu", "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu", "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710", "@rules_rust//rust/platform:arm-unknown-linux-gnueabi", "@rules_rust//rust/platform:armv7-linux-androideabi", "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi", "@rules_rust//rust/platform:i686-apple-darwin", "@rules_rust//rust/platform:i686-linux-android", "@rules_rust//rust/platform:i686-unknown-freebsd", "@rules_rust//rust/platform:i686-unknown-linux-gnu", "@rules_rust//rust/platform:powerpc-unknown-linux-gnu", "@rules_rust//rust/platform:s390x-unknown-linux-gnu", "@rules_rust//rust/platform:wasm32-wasi", "@rules_rust//rust/platform:x86_64-apple-darwin", "@rules_rust//rust/platform:x86_64-apple-ios", "@rules_rust//rust/platform:x86_64-fuchsia", "@rules_rust//rust/platform:x86_64-linux-android", "@rules_rust//rust/platform:x86_64-unknown-freebsd", "@rules_rust//rust/platform:x86_64-unknown-linux-gnu", "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu"],
+    "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-fuchsia", "@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: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:riscv32imc-unknown-none-elf", "@rules_rust//rust/platform:riscv64gc-unknown-none-elf", "@rules_rust//rust/platform:s390x-unknown-linux-gnu", "@rules_rust//rust/platform:thumbv7em-none-eabi", "@rules_rust//rust/platform:thumbv8m.main-none-eabi", "@rules_rust//rust/platform:wasm32-unknown-unknown", "@rules_rust//rust/platform:wasm32-wasi", "@rules_rust//rust/platform:x86_64-apple-darwin", "@rules_rust//rust/platform:x86_64-apple-ios", "@rules_rust//rust/platform:x86_64-fuchsia", "@rules_rust//rust/platform:x86_64-linux-android", "@rules_rust//rust/platform:x86_64-unknown-freebsd", "@rules_rust//rust/platform:x86_64-unknown-linux-gnu", "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu", "@rules_rust//rust/platform:x86_64-unknown-none"],
+    "cfg(target_os = \"android\")": ["@rules_rust//rust/platform:aarch64-linux-android", "@rules_rust//rust/platform:armv7-linux-androideabi", "@rules_rust//rust/platform:i686-linux-android", "@rules_rust//rust/platform:x86_64-linux-android"],
+    "cfg(target_os = \"haiku\")": [],
+    "cfg(target_os = \"hermit\")": [],
+    "cfg(target_os = \"linux\")": ["@rules_rust//rust/platform:aarch64-unknown-linux-gnu", "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu", "@rules_rust//rust/platform:arm-unknown-linux-gnueabi", "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi", "@rules_rust//rust/platform:i686-unknown-linux-gnu", "@rules_rust//rust/platform:powerpc-unknown-linux-gnu", "@rules_rust//rust/platform:s390x-unknown-linux-gnu", "@rules_rust//rust/platform:x86_64-unknown-linux-gnu", "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu"],
+    "cfg(target_os = \"macos\")": ["@rules_rust//rust/platform:aarch64-apple-darwin", "@rules_rust//rust/platform:i686-apple-darwin", "@rules_rust//rust/platform:x86_64-apple-darwin"],
+    "cfg(target_os = \"redox\")": [],
+    "cfg(target_os = \"wasi\")": ["@rules_rust//rust/platform:wasm32-wasi"],
+    "cfg(target_os = \"windows\")": ["@rules_rust//rust/platform:aarch64-pc-windows-msvc", "@rules_rust//rust/platform:i686-pc-windows-msvc", "@rules_rust//rust/platform:x86_64-pc-windows-msvc"],
+    "cfg(unix)": ["@rules_rust//rust/platform:aarch64-apple-darwin", "@rules_rust//rust/platform:aarch64-apple-ios", "@rules_rust//rust/platform:aarch64-apple-ios-sim", "@rules_rust//rust/platform:aarch64-fuchsia", "@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:aarch64-unknown-nto-qnx710", "@rules_rust//rust/platform:arm-unknown-linux-gnueabi", "@rules_rust//rust/platform:armv7-linux-androideabi", "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi", "@rules_rust//rust/platform:i686-apple-darwin", "@rules_rust//rust/platform:i686-linux-android", "@rules_rust//rust/platform:i686-unknown-freebsd", "@rules_rust//rust/platform:i686-unknown-linux-gnu", "@rules_rust//rust/platform:powerpc-unknown-linux-gnu", "@rules_rust//rust/platform:s390x-unknown-linux-gnu", "@rules_rust//rust/platform:x86_64-apple-darwin", "@rules_rust//rust/platform:x86_64-apple-ios", "@rules_rust//rust/platform:x86_64-fuchsia", "@rules_rust//rust/platform:x86_64-linux-android", "@rules_rust//rust/platform:x86_64-unknown-freebsd", "@rules_rust//rust/platform:x86_64-unknown-linux-gnu", "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu"],
+    "cfg(windows)": ["@rules_rust//rust/platform:aarch64-pc-windows-msvc", "@rules_rust//rust/platform:i686-pc-windows-msvc", "@rules_rust//rust/platform:x86_64-pc-windows-msvc"],
+    "i686-apple-darwin": ["@rules_rust//rust/platform:i686-apple-darwin"],
+    "i686-linux-android": ["@rules_rust//rust/platform:i686-linux-android"],
+    "i686-pc-windows-gnu": [],
+    "i686-pc-windows-gnullvm": [],
+    "i686-pc-windows-msvc": ["@rules_rust//rust/platform:i686-pc-windows-msvc"],
+    "i686-unknown-freebsd": ["@rules_rust//rust/platform:i686-unknown-freebsd"],
+    "i686-unknown-linux-gnu": ["@rules_rust//rust/platform:i686-unknown-linux-gnu"],
+    "powerpc-unknown-linux-gnu": ["@rules_rust//rust/platform:powerpc-unknown-linux-gnu"],
+    "riscv32imc-unknown-none-elf": ["@rules_rust//rust/platform:riscv32imc-unknown-none-elf"],
+    "riscv64gc-unknown-none-elf": ["@rules_rust//rust/platform:riscv64gc-unknown-none-elf"],
+    "s390x-unknown-linux-gnu": ["@rules_rust//rust/platform:s390x-unknown-linux-gnu"],
+    "thumbv7em-none-eabi": ["@rules_rust//rust/platform:thumbv7em-none-eabi"],
+    "thumbv8m.main-none-eabi": ["@rules_rust//rust/platform:thumbv8m.main-none-eabi"],
+    "wasm32-unknown-unknown": ["@rules_rust//rust/platform:wasm32-unknown-unknown"],
+    "wasm32-wasi": ["@rules_rust//rust/platform:wasm32-wasi"],
+    "x86_64-apple-darwin": ["@rules_rust//rust/platform:x86_64-apple-darwin"],
+    "x86_64-apple-ios": ["@rules_rust//rust/platform:x86_64-apple-ios"],
+    "x86_64-fuchsia": ["@rules_rust//rust/platform:x86_64-fuchsia"],
+    "x86_64-linux-android": ["@rules_rust//rust/platform:x86_64-linux-android"],
+    "x86_64-pc-windows-gnu": [],
+    "x86_64-pc-windows-gnullvm": [],
+    "x86_64-pc-windows-msvc": ["@rules_rust//rust/platform:x86_64-pc-windows-msvc"],
+    "x86_64-unknown-freebsd": ["@rules_rust//rust/platform:x86_64-unknown-freebsd"],
+    "x86_64-unknown-linux-gnu": ["@rules_rust//rust/platform:x86_64-unknown-linux-gnu", "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu"],
+    "x86_64-unknown-nixos-gnu": ["@rules_rust//rust/platform:x86_64-unknown-nixos-gnu"],
+    "x86_64-unknown-none": ["@rules_rust//rust/platform:x86_64-unknown-none"],
+}
+
+###############################################################################
+
+def crate_repositories():
+    """A macro for defining repositories for all generated crates.
+
+    Returns:
+      A list of repos visible to the module through the module extension.
+    """
+    maybe(
+        http_archive,
+        name = "vendor__adler2-2.0.0",
+        sha256 = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/adler2/2.0.0/download"],
+        strip_prefix = "adler2-2.0.0",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.adler2-2.0.0.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__aho-corasick-1.1.3",
+        sha256 = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/aho-corasick/1.1.3/download"],
+        strip_prefix = "aho-corasick-1.1.3",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.aho-corasick-1.1.3.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__always-assert-0.2.0",
+        sha256 = "a1078fa1ce1e34b1872d8611ad921196d76bdd7027e949fbe31231abde201892",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/always-assert/0.2.0/download"],
+        strip_prefix = "always-assert-0.2.0",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.always-assert-0.2.0.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__android-tzdata-0.1.1",
+        sha256 = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/android-tzdata/0.1.1/download"],
+        strip_prefix = "android-tzdata-0.1.1",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.android-tzdata-0.1.1.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__android_system_properties-0.1.5",
+        sha256 = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/android_system_properties/0.1.5/download"],
+        strip_prefix = "android_system_properties-0.1.5",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.android_system_properties-0.1.5.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__anstream-0.6.18",
+        sha256 = "8acc5369981196006228e28809f761875c0327210a891e941f4c683b3a99529b",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/anstream/0.6.18/download"],
+        strip_prefix = "anstream-0.6.18",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.anstream-0.6.18.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__anstyle-1.0.10",
+        sha256 = "55cc3b69f167a1ef2e161439aa98aed94e6028e5f9a59be9a6ffb47aef1651f9",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/anstyle/1.0.10/download"],
+        strip_prefix = "anstyle-1.0.10",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.anstyle-1.0.10.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__anstyle-parse-0.2.6",
+        sha256 = "3b2d16507662817a6a20a9ea92df6652ee4f94f914589377d69f3b21bc5798a9",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/anstyle-parse/0.2.6/download"],
+        strip_prefix = "anstyle-parse-0.2.6",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.anstyle-parse-0.2.6.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__anstyle-query-1.1.2",
+        sha256 = "79947af37f4177cfead1110013d678905c37501914fba0efea834c3fe9a8d60c",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/anstyle-query/1.1.2/download"],
+        strip_prefix = "anstyle-query-1.1.2",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.anstyle-query-1.1.2.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__anstyle-wincon-3.0.6",
+        sha256 = "2109dbce0e72be3ec00bed26e6a7479ca384ad226efdd66db8fa2e3a38c83125",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/anstyle-wincon/3.0.6/download"],
+        strip_prefix = "anstyle-wincon-3.0.6",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.anstyle-wincon-3.0.6.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__anyhow-1.0.93",
+        sha256 = "4c95c10ba0b00a02636238b814946408b1322d5ac4760326e6fb8ec956d85775",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/anyhow/1.0.93/download"],
+        strip_prefix = "anyhow-1.0.93",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.anyhow-1.0.93.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__argfile-0.2.1",
+        sha256 = "0a1cc0ba69de57db40674c66f7cf2caee3981ddef084388482c95c0e2133e5e8",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/argfile/0.2.1/download"],
+        strip_prefix = "argfile-0.2.1",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.argfile-0.2.1.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__arrayvec-0.7.6",
+        sha256 = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/arrayvec/0.7.6/download"],
+        strip_prefix = "arrayvec-0.7.6",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.arrayvec-0.7.6.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__atomic-0.6.0",
+        sha256 = "8d818003e740b63afc82337e3160717f4f63078720a810b7b903e70a5d1d2994",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/atomic/0.6.0/download"],
+        strip_prefix = "atomic-0.6.0",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.atomic-0.6.0.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__autocfg-1.4.0",
+        sha256 = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/autocfg/1.4.0/download"],
+        strip_prefix = "autocfg-1.4.0",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.autocfg-1.4.0.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__base64-0.22.1",
+        sha256 = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/base64/0.22.1/download"],
+        strip_prefix = "base64-0.22.1",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.base64-0.22.1.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__bitflags-1.3.2",
+        sha256 = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/bitflags/1.3.2/download"],
+        strip_prefix = "bitflags-1.3.2",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.bitflags-1.3.2.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__bitflags-2.6.0",
+        sha256 = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/bitflags/2.6.0/download"],
+        strip_prefix = "bitflags-2.6.0",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.bitflags-2.6.0.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__bstr-1.10.0",
+        sha256 = "40723b8fb387abc38f4f4a37c09073622e41dd12327033091ef8950659e6dc0c",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/bstr/1.10.0/download"],
+        strip_prefix = "bstr-1.10.0",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.bstr-1.10.0.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__bumpalo-3.16.0",
+        sha256 = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/bumpalo/3.16.0/download"],
+        strip_prefix = "bumpalo-3.16.0",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.bumpalo-3.16.0.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__bytemuck-1.19.0",
+        sha256 = "8334215b81e418a0a7bdb8ef0849474f40bb10c8b71f1c4ed315cff49f32494d",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/bytemuck/1.19.0/download"],
+        strip_prefix = "bytemuck-1.19.0",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.bytemuck-1.19.0.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__byteorder-1.5.0",
+        sha256 = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/byteorder/1.5.0/download"],
+        strip_prefix = "byteorder-1.5.0",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.byteorder-1.5.0.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__camino-1.1.9",
+        sha256 = "8b96ec4966b5813e2c0507c1f86115c8c5abaadc3980879c3424042a02fd1ad3",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/camino/1.1.9/download"],
+        strip_prefix = "camino-1.1.9",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.camino-1.1.9.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__cargo-platform-0.1.8",
+        sha256 = "24b1f0365a6c6bb4020cd05806fd0d33c44d38046b8bd7f0e40814b9763cabfc",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/cargo-platform/0.1.8/download"],
+        strip_prefix = "cargo-platform-0.1.8",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.cargo-platform-0.1.8.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__cargo_metadata-0.18.1",
+        sha256 = "2d886547e41f740c616ae73108f6eb70afe6d940c7bc697cb30f13daec073037",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/cargo_metadata/0.18.1/download"],
+        strip_prefix = "cargo_metadata-0.18.1",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.cargo_metadata-0.18.1.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__cc-1.1.37",
+        sha256 = "40545c26d092346d8a8dab71ee48e7685a7a9cba76e634790c215b41a4a7b4cf",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/cc/1.1.37/download"],
+        strip_prefix = "cc-1.1.37",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.cc-1.1.37.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__cfg-if-1.0.0",
+        sha256 = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/cfg-if/1.0.0/download"],
+        strip_prefix = "cfg-if-1.0.0",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.cfg-if-1.0.0.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__chalk-derive-0.98.0",
+        sha256 = "9426c8fd0fe61c3da880b801d3b510524df17843a8f9ec1f5b9cec24fb7412df",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/chalk-derive/0.98.0/download"],
+        strip_prefix = "chalk-derive-0.98.0",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.chalk-derive-0.98.0.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__chalk-ir-0.98.0",
+        sha256 = "d5f2eb1cd6054da221bd1ac0197fb2fe5e2caf3dcb93619398fc1433f8f09093",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/chalk-ir/0.98.0/download"],
+        strip_prefix = "chalk-ir-0.98.0",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.chalk-ir-0.98.0.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__chalk-recursive-0.98.0",
+        sha256 = "129dc03458f71cfb9c3cd621c9c68166a94e87b85b16ccd29af015d7ff9a1c61",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/chalk-recursive/0.98.0/download"],
+        strip_prefix = "chalk-recursive-0.98.0",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.chalk-recursive-0.98.0.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__chalk-solve-0.98.0",
+        sha256 = "d7e8a8c1e928f98cdf227b868416ef21dcd8cc3c61b347576d783713444d41c8",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/chalk-solve/0.98.0/download"],
+        strip_prefix = "chalk-solve-0.98.0",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.chalk-solve-0.98.0.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__chrono-0.4.38",
+        sha256 = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/chrono/0.4.38/download"],
+        strip_prefix = "chrono-0.4.38",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.chrono-0.4.38.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__clap-4.5.20",
+        sha256 = "b97f376d85a664d5837dbae44bf546e6477a679ff6610010f17276f686d867e8",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/clap/4.5.20/download"],
+        strip_prefix = "clap-4.5.20",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.clap-4.5.20.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__clap_builder-4.5.20",
+        sha256 = "19bc80abd44e4bed93ca373a0704ccbd1b710dc5749406201bb018272808dc54",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/clap_builder/4.5.20/download"],
+        strip_prefix = "clap_builder-4.5.20",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.clap_builder-4.5.20.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__clap_derive-4.5.18",
+        sha256 = "4ac6a0c7b1a9e9a5186361f67dfa1b88213572f427fb9ab038efb2bd8c582dab",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/clap_derive/4.5.18/download"],
+        strip_prefix = "clap_derive-4.5.18",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.clap_derive-4.5.18.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__clap_lex-0.7.2",
+        sha256 = "1462739cb27611015575c0c11df5df7601141071f07518d56fcc1be504cbec97",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/clap_lex/0.7.2/download"],
+        strip_prefix = "clap_lex-0.7.2",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.clap_lex-0.7.2.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__colorchoice-1.0.3",
+        sha256 = "5b63caa9aa9397e2d9480a9b13673856c78d8ac123288526c37d7839f2a86990",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/colorchoice/1.0.3/download"],
+        strip_prefix = "colorchoice-1.0.3",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.colorchoice-1.0.3.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__core-foundation-sys-0.8.7",
+        sha256 = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/core-foundation-sys/0.8.7/download"],
+        strip_prefix = "core-foundation-sys-0.8.7",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.core-foundation-sys-0.8.7.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__countme-3.0.1",
+        sha256 = "7704b5fdd17b18ae31c4c1da5a2e0305a2bf17b5249300a9ee9ed7b72114c636",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/countme/3.0.1/download"],
+        strip_prefix = "countme-3.0.1",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.countme-3.0.1.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__cov-mark-2.0.0",
+        sha256 = "0570650661aa447e7335f1d5e4f499d8e58796e617bedc9267d971e51c8b49d4",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/cov-mark/2.0.0/download"],
+        strip_prefix = "cov-mark-2.0.0",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.cov-mark-2.0.0.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__crc32fast-1.4.2",
+        sha256 = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/crc32fast/1.4.2/download"],
+        strip_prefix = "crc32fast-1.4.2",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.crc32fast-1.4.2.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__crossbeam-channel-0.5.13",
+        sha256 = "33480d6946193aa8033910124896ca395333cae7e2d1113d1fef6c3272217df2",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/crossbeam-channel/0.5.13/download"],
+        strip_prefix = "crossbeam-channel-0.5.13",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.crossbeam-channel-0.5.13.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__crossbeam-deque-0.8.5",
+        sha256 = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/crossbeam-deque/0.8.5/download"],
+        strip_prefix = "crossbeam-deque-0.8.5",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.crossbeam-deque-0.8.5.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__crossbeam-epoch-0.9.18",
+        sha256 = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/crossbeam-epoch/0.9.18/download"],
+        strip_prefix = "crossbeam-epoch-0.9.18",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.crossbeam-epoch-0.9.18.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__crossbeam-utils-0.8.20",
+        sha256 = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/crossbeam-utils/0.8.20/download"],
+        strip_prefix = "crossbeam-utils-0.8.20",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.crossbeam-utils-0.8.20.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__darling-0.20.10",
+        sha256 = "6f63b86c8a8826a49b8c21f08a2d07338eec8d900540f8630dc76284be802989",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/darling/0.20.10/download"],
+        strip_prefix = "darling-0.20.10",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.darling-0.20.10.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__darling_core-0.20.10",
+        sha256 = "95133861a8032aaea082871032f5815eb9e98cef03fa916ab4500513994df9e5",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/darling_core/0.20.10/download"],
+        strip_prefix = "darling_core-0.20.10",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.darling_core-0.20.10.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__darling_macro-0.20.10",
+        sha256 = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/darling_macro/0.20.10/download"],
+        strip_prefix = "darling_macro-0.20.10",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.darling_macro-0.20.10.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__dashmap-5.5.3",
+        sha256 = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/dashmap/5.5.3/download"],
+        strip_prefix = "dashmap-5.5.3",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.dashmap-5.5.3.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__deranged-0.3.11",
+        sha256 = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/deranged/0.3.11/download"],
+        strip_prefix = "deranged-0.3.11",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.deranged-0.3.11.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__drop_bomb-0.1.5",
+        sha256 = "9bda8e21c04aca2ae33ffc2fd8c23134f3cac46db123ba97bd9d3f3b8a4a85e1",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/drop_bomb/0.1.5/download"],
+        strip_prefix = "drop_bomb-0.1.5",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.drop_bomb-0.1.5.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__either-1.13.0",
+        sha256 = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/either/1.13.0/download"],
+        strip_prefix = "either-1.13.0",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.either-1.13.0.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__ena-0.14.3",
+        sha256 = "3d248bdd43ce613d87415282f69b9bb99d947d290b10962dd6c56233312c2ad5",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/ena/0.14.3/download"],
+        strip_prefix = "ena-0.14.3",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ena-0.14.3.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__encoding-0.2.33",
+        sha256 = "6b0d943856b990d12d3b55b359144ff341533e516d94098b1d3fc1ac666d36ec",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/encoding/0.2.33/download"],
+        strip_prefix = "encoding-0.2.33",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.encoding-0.2.33.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__encoding-index-japanese-1.20141219.5",
+        sha256 = "04e8b2ff42e9a05335dbf8b5c6f7567e5591d0d916ccef4e0b1710d32a0d0c91",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/encoding-index-japanese/1.20141219.5/download"],
+        strip_prefix = "encoding-index-japanese-1.20141219.5",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.encoding-index-japanese-1.20141219.5.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__encoding-index-korean-1.20141219.5",
+        sha256 = "4dc33fb8e6bcba213fe2f14275f0963fd16f0a02c878e3095ecfdf5bee529d81",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/encoding-index-korean/1.20141219.5/download"],
+        strip_prefix = "encoding-index-korean-1.20141219.5",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.encoding-index-korean-1.20141219.5.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__encoding-index-simpchinese-1.20141219.5",
+        sha256 = "d87a7194909b9118fc707194baa434a4e3b0fb6a5a757c73c3adb07aa25031f7",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/encoding-index-simpchinese/1.20141219.5/download"],
+        strip_prefix = "encoding-index-simpchinese-1.20141219.5",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.encoding-index-simpchinese-1.20141219.5.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__encoding-index-singlebyte-1.20141219.5",
+        sha256 = "3351d5acffb224af9ca265f435b859c7c01537c0849754d3db3fdf2bfe2ae84a",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/encoding-index-singlebyte/1.20141219.5/download"],
+        strip_prefix = "encoding-index-singlebyte-1.20141219.5",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.encoding-index-singlebyte-1.20141219.5.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__encoding-index-tradchinese-1.20141219.5",
+        sha256 = "fd0e20d5688ce3cab59eb3ef3a2083a5c77bf496cb798dc6fcdb75f323890c18",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/encoding-index-tradchinese/1.20141219.5/download"],
+        strip_prefix = "encoding-index-tradchinese-1.20141219.5",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.encoding-index-tradchinese-1.20141219.5.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__encoding_index_tests-0.1.4",
+        sha256 = "a246d82be1c9d791c5dfde9a2bd045fc3cbba3fa2b11ad558f27d01712f00569",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/encoding_index_tests/0.1.4/download"],
+        strip_prefix = "encoding_index_tests-0.1.4",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.encoding_index_tests-0.1.4.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__equivalent-1.0.1",
+        sha256 = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/equivalent/1.0.1/download"],
+        strip_prefix = "equivalent-1.0.1",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.equivalent-1.0.1.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__figment-0.10.19",
+        sha256 = "8cb01cd46b0cf372153850f4c6c272d9cbea2da513e07538405148f95bd789f3",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/figment/0.10.19/download"],
+        strip_prefix = "figment-0.10.19",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.figment-0.10.19.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__filetime-0.2.25",
+        sha256 = "35c0522e981e68cbfa8c3f978441a5f34b30b96e146b33cd3359176b50fe8586",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/filetime/0.2.25/download"],
+        strip_prefix = "filetime-0.2.25",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.filetime-0.2.25.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__fixedbitset-0.4.2",
+        sha256 = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/fixedbitset/0.4.2/download"],
+        strip_prefix = "fixedbitset-0.4.2",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.fixedbitset-0.4.2.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__flate2-1.0.34",
+        sha256 = "a1b589b4dc103969ad3cf85c950899926ec64300a1a46d76c03a6072957036f0",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/flate2/1.0.34/download"],
+        strip_prefix = "flate2-1.0.34",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.flate2-1.0.34.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__fnv-1.0.7",
+        sha256 = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/fnv/1.0.7/download"],
+        strip_prefix = "fnv-1.0.7",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.fnv-1.0.7.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__fs-err-2.11.0",
+        sha256 = "88a41f105fe1d5b6b34b2055e3dc59bb79b46b48b2040b9e6c7b4b5de097aa41",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/fs-err/2.11.0/download"],
+        strip_prefix = "fs-err-2.11.0",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.fs-err-2.11.0.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__fsevent-sys-4.1.0",
+        sha256 = "76ee7a02da4d231650c7cea31349b889be2f45ddb3ef3032d2ec8185f6313fd2",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/fsevent-sys/4.1.0/download"],
+        strip_prefix = "fsevent-sys-4.1.0",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.fsevent-sys-4.1.0.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__fst-0.4.7",
+        sha256 = "7ab85b9b05e3978cc9a9cf8fea7f01b494e1a09ed3037e16ba39edc7a29eb61a",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/fst/0.4.7/download"],
+        strip_prefix = "fst-0.4.7",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.fst-0.4.7.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__getrandom-0.2.15",
+        sha256 = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/getrandom/0.2.15/download"],
+        strip_prefix = "getrandom-0.2.15",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.getrandom-0.2.15.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__glob-0.3.1",
+        sha256 = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/glob/0.3.1/download"],
+        strip_prefix = "glob-0.3.1",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.glob-0.3.1.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__globset-0.4.15",
+        sha256 = "15f1ce686646e7f1e19bf7d5533fe443a45dbfb990e00629110797578b42fb19",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/globset/0.4.15/download"],
+        strip_prefix = "globset-0.4.15",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.globset-0.4.15.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__hashbrown-0.12.3",
+        sha256 = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/hashbrown/0.12.3/download"],
+        strip_prefix = "hashbrown-0.12.3",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.hashbrown-0.12.3.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__hashbrown-0.14.5",
+        sha256 = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/hashbrown/0.14.5/download"],
+        strip_prefix = "hashbrown-0.14.5",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.hashbrown-0.14.5.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__hashbrown-0.15.1",
+        sha256 = "3a9bfc1af68b1726ea47d3d5109de126281def866b33970e10fbab11b5dafab3",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/hashbrown/0.15.1/download"],
+        strip_prefix = "hashbrown-0.15.1",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.hashbrown-0.15.1.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__heck-0.4.1",
+        sha256 = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/heck/0.4.1/download"],
+        strip_prefix = "heck-0.4.1",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.heck-0.4.1.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__heck-0.5.0",
+        sha256 = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/heck/0.5.0/download"],
+        strip_prefix = "heck-0.5.0",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.heck-0.5.0.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__hermit-abi-0.3.9",
+        sha256 = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/hermit-abi/0.3.9/download"],
+        strip_prefix = "hermit-abi-0.3.9",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.hermit-abi-0.3.9.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__hermit-abi-0.4.0",
+        sha256 = "fbf6a919d6cf397374f7dfeeea91d974c7c0a7221d0d0f4f20d859d329e53fcc",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/hermit-abi/0.4.0/download"],
+        strip_prefix = "hermit-abi-0.4.0",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.hermit-abi-0.4.0.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__hex-0.4.3",
+        sha256 = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/hex/0.4.3/download"],
+        strip_prefix = "hex-0.4.3",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.hex-0.4.3.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__home-0.5.9",
+        sha256 = "e3d1354bf6b7235cb4a0576c2619fd4ed18183f689b12b006a0ee7329eeff9a5",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/home/0.5.9/download"],
+        strip_prefix = "home-0.5.9",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.home-0.5.9.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__iana-time-zone-0.1.61",
+        sha256 = "235e081f3925a06703c2d0117ea8b91f042756fd6e7a6e5d901e8ca1a996b220",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/iana-time-zone/0.1.61/download"],
+        strip_prefix = "iana-time-zone-0.1.61",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.iana-time-zone-0.1.61.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__iana-time-zone-haiku-0.1.2",
+        sha256 = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/iana-time-zone-haiku/0.1.2/download"],
+        strip_prefix = "iana-time-zone-haiku-0.1.2",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.iana-time-zone-haiku-0.1.2.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__ident_case-1.0.1",
+        sha256 = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/ident_case/1.0.1/download"],
+        strip_prefix = "ident_case-1.0.1",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ident_case-1.0.1.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__indexmap-1.9.3",
+        sha256 = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/indexmap/1.9.3/download"],
+        strip_prefix = "indexmap-1.9.3",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.indexmap-1.9.3.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__indexmap-2.6.0",
+        sha256 = "707907fe3c25f5424cce2cb7e1cbcafee6bdbe735ca90ef77c29e84591e5b9da",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/indexmap/2.6.0/download"],
+        strip_prefix = "indexmap-2.6.0",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.indexmap-2.6.0.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__inlinable_string-0.1.15",
+        sha256 = "c8fae54786f62fb2918dcfae3d568594e50eb9b5c25bf04371af6fe7516452fb",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/inlinable_string/0.1.15/download"],
+        strip_prefix = "inlinable_string-0.1.15",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.inlinable_string-0.1.15.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__inotify-0.9.6",
+        sha256 = "f8069d3ec154eb856955c1c0fbffefbf5f3c40a104ec912d4797314c1801abff",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/inotify/0.9.6/download"],
+        strip_prefix = "inotify-0.9.6",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.inotify-0.9.6.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__inotify-sys-0.1.5",
+        sha256 = "e05c02b5e89bff3b946cedeca278abc628fe811e604f027c45a8aa3cf793d0eb",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/inotify-sys/0.1.5/download"],
+        strip_prefix = "inotify-sys-0.1.5",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.inotify-sys-0.1.5.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__is-terminal-0.4.13",
+        sha256 = "261f68e344040fbd0edea105bef17c66edf46f984ddb1115b775ce31be948f4b",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/is-terminal/0.4.13/download"],
+        strip_prefix = "is-terminal-0.4.13",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.is-terminal-0.4.13.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__is_terminal_polyfill-1.70.1",
+        sha256 = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/is_terminal_polyfill/1.70.1/download"],
+        strip_prefix = "is_terminal_polyfill-1.70.1",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.is_terminal_polyfill-1.70.1.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__itertools-0.10.5",
+        sha256 = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/itertools/0.10.5/download"],
+        strip_prefix = "itertools-0.10.5",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.itertools-0.10.5.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__itertools-0.12.1",
+        sha256 = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/itertools/0.12.1/download"],
+        strip_prefix = "itertools-0.12.1",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.itertools-0.12.1.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__itertools-0.13.0",
+        sha256 = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/itertools/0.13.0/download"],
+        strip_prefix = "itertools-0.13.0",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.itertools-0.13.0.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__itoa-1.0.11",
+        sha256 = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/itoa/1.0.11/download"],
+        strip_prefix = "itoa-1.0.11",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.itoa-1.0.11.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__jod-thread-0.1.2",
+        sha256 = "8b23360e99b8717f20aaa4598f5a6541efbe30630039fbc7706cf954a87947ae",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/jod-thread/0.1.2/download"],
+        strip_prefix = "jod-thread-0.1.2",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.jod-thread-0.1.2.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__js-sys-0.3.72",
+        sha256 = "6a88f1bda2bd75b0452a14784937d796722fdebfe50df998aeb3f0b7603019a9",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/js-sys/0.3.72/download"],
+        strip_prefix = "js-sys-0.3.72",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.js-sys-0.3.72.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__kqueue-1.0.8",
+        sha256 = "7447f1ca1b7b563588a205fe93dea8df60fd981423a768bc1c0ded35ed147d0c",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/kqueue/1.0.8/download"],
+        strip_prefix = "kqueue-1.0.8",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.kqueue-1.0.8.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__kqueue-sys-1.0.4",
+        sha256 = "ed9625ffda8729b85e45cf04090035ac368927b8cebc34898e7c120f52e4838b",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/kqueue-sys/1.0.4/download"],
+        strip_prefix = "kqueue-sys-1.0.4",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.kqueue-sys-1.0.4.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__la-arena-0.3.1",
+        sha256 = "3752f229dcc5a481d60f385fa479ff46818033d881d2d801aa27dffcfb5e8306",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/la-arena/0.3.1/download"],
+        strip_prefix = "la-arena-0.3.1",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.la-arena-0.3.1.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__lazy_static-1.5.0",
+        sha256 = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/lazy_static/1.5.0/download"],
+        strip_prefix = "lazy_static-1.5.0",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.lazy_static-1.5.0.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__libc-0.2.162",
+        sha256 = "18d287de67fe55fd7e1581fe933d965a5a9477b38e949cfa9f8574ef01506398",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/libc/0.2.162/download"],
+        strip_prefix = "libc-0.2.162",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.libc-0.2.162.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__libredox-0.1.3",
+        sha256 = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/libredox/0.1.3/download"],
+        strip_prefix = "libredox-0.1.3",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.libredox-0.1.3.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__line-index-0.1.2",
+        sha256 = "3e27e0ed5a392a7f5ba0b3808a2afccff16c64933312c84b57618b49d1209bd2",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/line-index/0.1.2/download"],
+        strip_prefix = "line-index-0.1.2",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.line-index-0.1.2.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__lock_api-0.4.12",
+        sha256 = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/lock_api/0.4.12/download"],
+        strip_prefix = "lock_api-0.4.12",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.lock_api-0.4.12.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__log-0.4.22",
+        sha256 = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/log/0.4.22/download"],
+        strip_prefix = "log-0.4.22",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.log-0.4.22.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__lz4_flex-0.11.3",
+        sha256 = "75761162ae2b0e580d7e7c390558127e5f01b4194debd6221fd8c207fc80e3f5",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/lz4_flex/0.11.3/download"],
+        strip_prefix = "lz4_flex-0.11.3",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.lz4_flex-0.11.3.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__matchers-0.1.0",
+        sha256 = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/matchers/0.1.0/download"],
+        strip_prefix = "matchers-0.1.0",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.matchers-0.1.0.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__memchr-2.7.4",
+        sha256 = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/memchr/2.7.4/download"],
+        strip_prefix = "memchr-2.7.4",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.memchr-2.7.4.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__memoffset-0.9.1",
+        sha256 = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/memoffset/0.9.1/download"],
+        strip_prefix = "memoffset-0.9.1",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.memoffset-0.9.1.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__miniz_oxide-0.8.0",
+        sha256 = "e2d80299ef12ff69b16a84bb182e3b9df68b5a91574d3d4fa6e41b65deec4df1",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/miniz_oxide/0.8.0/download"],
+        strip_prefix = "miniz_oxide-0.8.0",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.miniz_oxide-0.8.0.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__mio-0.8.11",
+        sha256 = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/mio/0.8.11/download"],
+        strip_prefix = "mio-0.8.11",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.mio-0.8.11.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__miow-0.6.0",
+        sha256 = "359f76430b20a79f9e20e115b3428614e654f04fab314482fc0fda0ebd3c6044",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/miow/0.6.0/download"],
+        strip_prefix = "miow-0.6.0",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.miow-0.6.0.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__nohash-hasher-0.2.0",
+        sha256 = "2bf50223579dc7cdcfb3bfcacf7069ff68243f8c363f62ffa99cf000a6b9c451",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/nohash-hasher/0.2.0/download"],
+        strip_prefix = "nohash-hasher-0.2.0",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.nohash-hasher-0.2.0.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__notify-6.1.1",
+        sha256 = "6205bd8bb1e454ad2e27422015fb5e4f2bcc7e08fa8f27058670d208324a4d2d",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/notify/6.1.1/download"],
+        strip_prefix = "notify-6.1.1",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.notify-6.1.1.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__nu-ansi-term-0.46.0",
+        sha256 = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/nu-ansi-term/0.46.0/download"],
+        strip_prefix = "nu-ansi-term-0.46.0",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.nu-ansi-term-0.46.0.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__num-conv-0.1.0",
+        sha256 = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/num-conv/0.1.0/download"],
+        strip_prefix = "num-conv-0.1.0",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.num-conv-0.1.0.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__num-traits-0.2.19",
+        sha256 = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/num-traits/0.2.19/download"],
+        strip_prefix = "num-traits-0.2.19",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.num-traits-0.2.19.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__num_cpus-1.16.0",
+        sha256 = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/num_cpus/1.16.0/download"],
+        strip_prefix = "num_cpus-1.16.0",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.num_cpus-1.16.0.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__once_cell-1.20.2",
+        sha256 = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/once_cell/1.20.2/download"],
+        strip_prefix = "once_cell-1.20.2",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.once_cell-1.20.2.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__oorandom-11.1.4",
+        sha256 = "b410bbe7e14ab526a0e86877eb47c6996a2bd7746f027ba551028c925390e4e9",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/oorandom/11.1.4/download"],
+        strip_prefix = "oorandom-11.1.4",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.oorandom-11.1.4.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__os_str_bytes-7.0.0",
+        sha256 = "7ac44c994af577c799b1b4bd80dc214701e349873ad894d6cdf96f4f7526e0b9",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/os_str_bytes/7.0.0/download"],
+        strip_prefix = "os_str_bytes-7.0.0",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.os_str_bytes-7.0.0.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__overload-0.1.1",
+        sha256 = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/overload/0.1.1/download"],
+        strip_prefix = "overload-0.1.1",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.overload-0.1.1.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__parking_lot-0.12.3",
+        sha256 = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/parking_lot/0.12.3/download"],
+        strip_prefix = "parking_lot-0.12.3",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.parking_lot-0.12.3.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__parking_lot_core-0.9.10",
+        sha256 = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/parking_lot_core/0.9.10/download"],
+        strip_prefix = "parking_lot_core-0.9.10",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.parking_lot_core-0.9.10.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__pear-0.2.9",
+        sha256 = "bdeeaa00ce488657faba8ebf44ab9361f9365a97bd39ffb8a60663f57ff4b467",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/pear/0.2.9/download"],
+        strip_prefix = "pear-0.2.9",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.pear-0.2.9.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__pear_codegen-0.2.9",
+        sha256 = "4bab5b985dc082b345f812b7df84e1bef27e7207b39e448439ba8bd69c93f147",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/pear_codegen/0.2.9/download"],
+        strip_prefix = "pear_codegen-0.2.9",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.pear_codegen-0.2.9.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__perf-event-0.4.7",
+        sha256 = "5396562cd2eaa828445d6d34258ae21ee1eb9d40fe626ca7f51c8dccb4af9d66",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/perf-event/0.4.7/download"],
+        strip_prefix = "perf-event-0.4.7",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.perf-event-0.4.7.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__perf-event-open-sys-1.0.1",
+        sha256 = "ce9bedf5da2c234fdf2391ede2b90fabf585355f33100689bc364a3ea558561a",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/perf-event-open-sys/1.0.1/download"],
+        strip_prefix = "perf-event-open-sys-1.0.1",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.perf-event-open-sys-1.0.1.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__petgraph-0.6.5",
+        sha256 = "b4c5cc86750666a3ed20bdaf5ca2a0344f9c67674cae0515bec2da16fbaa47db",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/petgraph/0.6.5/download"],
+        strip_prefix = "petgraph-0.6.5",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.petgraph-0.6.5.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__pin-project-lite-0.2.15",
+        sha256 = "915a1e146535de9163f3987b8944ed8cf49a18bb0056bcebcdcece385cece4ff",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/pin-project-lite/0.2.15/download"],
+        strip_prefix = "pin-project-lite-0.2.15",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.pin-project-lite-0.2.15.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__powerfmt-0.2.0",
+        sha256 = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/powerfmt/0.2.0/download"],
+        strip_prefix = "powerfmt-0.2.0",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.powerfmt-0.2.0.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__ppv-lite86-0.2.20",
+        sha256 = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/ppv-lite86/0.2.20/download"],
+        strip_prefix = "ppv-lite86-0.2.20",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ppv-lite86-0.2.20.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__proc-macro2-1.0.89",
+        sha256 = "f139b0662de085916d1fb67d2b4169d1addddda1919e696f3252b740b629986e",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/proc-macro2/1.0.89/download"],
+        strip_prefix = "proc-macro2-1.0.89",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.proc-macro2-1.0.89.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__proc-macro2-diagnostics-0.10.1",
+        sha256 = "af066a9c399a26e020ada66a034357a868728e72cd426f3adcd35f80d88d88c8",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/proc-macro2-diagnostics/0.10.1/download"],
+        strip_prefix = "proc-macro2-diagnostics-0.10.1",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.proc-macro2-diagnostics-0.10.1.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__quote-1.0.37",
+        sha256 = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/quote/1.0.37/download"],
+        strip_prefix = "quote-1.0.37",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.quote-1.0.37.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__ra-ap-rustc_abi-0.63.0",
+        sha256 = "b011c39d409940a890414e3a7b239762ac16d88029ad71b050a8374831b93790",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/ra-ap-rustc_abi/0.63.0/download"],
+        strip_prefix = "ra-ap-rustc_abi-0.63.0",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra-ap-rustc_abi-0.63.0.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__ra-ap-rustc_index-0.63.0",
+        sha256 = "9027acdee649b0b27eb10b7db5be833efee3362d394935c5eed8f0745a9d43ce",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/ra-ap-rustc_index/0.63.0/download"],
+        strip_prefix = "ra-ap-rustc_index-0.63.0",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra-ap-rustc_index-0.63.0.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__ra-ap-rustc_index_macros-0.63.0",
+        sha256 = "540b86dc0384141ac8e825fc2874cd44bffd4277d99d8ec63ee416f1a98d5997",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/ra-ap-rustc_index_macros/0.63.0/download"],
+        strip_prefix = "ra-ap-rustc_index_macros-0.63.0",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra-ap-rustc_index_macros-0.63.0.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__ra-ap-rustc_lexer-0.63.0",
+        sha256 = "3bdf98bb457b47b9ae4aeebf867d0ca440c86925e0b6381658c4a02589748c9d",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/ra-ap-rustc_lexer/0.63.0/download"],
+        strip_prefix = "ra-ap-rustc_lexer-0.63.0",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra-ap-rustc_lexer-0.63.0.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__ra-ap-rustc_parse_format-0.63.0",
+        sha256 = "e8fe3556ab6311bb775220563a300e2bf62ec56404521fe0c511a583937683d5",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/ra-ap-rustc_parse_format/0.63.0/download"],
+        strip_prefix = "ra-ap-rustc_parse_format-0.63.0",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra-ap-rustc_parse_format-0.63.0.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__ra-ap-rustc_pattern_analysis-0.63.0",
+        sha256 = "1709080fdeb5db630e1c2644026c2962aaa32416cd92f0190c04b0c21e114b91",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/ra-ap-rustc_pattern_analysis/0.63.0/download"],
+        strip_prefix = "ra-ap-rustc_pattern_analysis-0.63.0",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra-ap-rustc_pattern_analysis-0.63.0.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__ra_ap_base_db-0.0.232",
+        sha256 = "3bcb25fbab872d3f85798739db011212a98444e55163d71edb1dfdb509e616b3",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/ra_ap_base_db/0.0.232/download"],
+        strip_prefix = "ra_ap_base_db-0.0.232",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra_ap_base_db-0.0.232.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__ra_ap_cfg-0.0.232",
+        sha256 = "fbec14556d01bf34fb795d70941f929ed4c024dee11be9c99c712ea92225a20b",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/ra_ap_cfg/0.0.232/download"],
+        strip_prefix = "ra_ap_cfg-0.0.232",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra_ap_cfg-0.0.232.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__ra_ap_hir-0.0.232",
+        sha256 = "c7c38520eb4770af561c34b908431f4e548c3282093cf3daf3c6e566d99a2937",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/ra_ap_hir/0.0.232/download"],
+        strip_prefix = "ra_ap_hir-0.0.232",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra_ap_hir-0.0.232.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__ra_ap_hir_def-0.0.232",
+        sha256 = "f00b546cacca816b94a12d51df076d50965d6bae411fd68f9024420bfa026e7b",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/ra_ap_hir_def/0.0.232/download"],
+        strip_prefix = "ra_ap_hir_def-0.0.232",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra_ap_hir_def-0.0.232.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__ra_ap_hir_expand-0.0.232",
+        sha256 = "b6c9675e1331dadf43cbc807ae39d2c289b8ba2af33a8e197c0927d926a6610d",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/ra_ap_hir_expand/0.0.232/download"],
+        strip_prefix = "ra_ap_hir_expand-0.0.232",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra_ap_hir_expand-0.0.232.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__ra_ap_hir_ty-0.0.232",
+        sha256 = "e308aa1b956137c82547a8b46eb60c6ee295628322e00aa5266a1ea5ea8e522e",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/ra_ap_hir_ty/0.0.232/download"],
+        strip_prefix = "ra_ap_hir_ty-0.0.232",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra_ap_hir_ty-0.0.232.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__ra_ap_ide_db-0.0.232",
+        sha256 = "95ea9c17702025001c1672ab23bf9be3cf40785376c0f368a10fe812db1327eb",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/ra_ap_ide_db/0.0.232/download"],
+        strip_prefix = "ra_ap_ide_db-0.0.232",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra_ap_ide_db-0.0.232.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__ra_ap_intern-0.0.232",
+        sha256 = "78e0928f2c403ebea95f97a38a720900216ea896212347e893a37ae7c1419030",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/ra_ap_intern/0.0.232/download"],
+        strip_prefix = "ra_ap_intern-0.0.232",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra_ap_intern-0.0.232.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__ra_ap_limit-0.0.232",
+        sha256 = "60972e02e4dfe05b2755e09a6b11b27db8a47cea01cd2697e77a34c4cf60b31c",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/ra_ap_limit/0.0.232/download"],
+        strip_prefix = "ra_ap_limit-0.0.232",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra_ap_limit-0.0.232.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__ra_ap_load-cargo-0.0.232",
+        sha256 = "82e6f24b61f1ef1f3a756493d1fb7e711b69b2e4d5f4746fcb959313dfd41471",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/ra_ap_load-cargo/0.0.232/download"],
+        strip_prefix = "ra_ap_load-cargo-0.0.232",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra_ap_load-cargo-0.0.232.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__ra_ap_mbe-0.0.232",
+        sha256 = "714a0997373ff65e7748e7768186598c6831e95f71639f66c3f79ef591c9d496",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/ra_ap_mbe/0.0.232/download"],
+        strip_prefix = "ra_ap_mbe-0.0.232",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra_ap_mbe-0.0.232.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__ra_ap_parser-0.0.232",
+        sha256 = "8da0314db93eabbd2b92e13907690782688cfc8aaaf42b8e6726e7f5b338c2e3",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/ra_ap_parser/0.0.232/download"],
+        strip_prefix = "ra_ap_parser-0.0.232",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra_ap_parser-0.0.232.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__ra_ap_paths-0.0.232",
+        sha256 = "2cc084003225204a9e5e50957a565f1cc23ebef18cd779f31563a8d2180f8940",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/ra_ap_paths/0.0.232/download"],
+        strip_prefix = "ra_ap_paths-0.0.232",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra_ap_paths-0.0.232.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__ra_ap_proc_macro_api-0.0.232",
+        sha256 = "809670622e93f105abc60ea0cb371cfaff990beae7ce534b127fb39b423b4b92",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/ra_ap_proc_macro_api/0.0.232/download"],
+        strip_prefix = "ra_ap_proc_macro_api-0.0.232",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra_ap_proc_macro_api-0.0.232.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__ra_ap_profile-0.0.232",
+        sha256 = "572193d698a8bc4245463688d10f20932ab04940d5b6c32be457bc45dc1e6ab0",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/ra_ap_profile/0.0.232/download"],
+        strip_prefix = "ra_ap_profile-0.0.232",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra_ap_profile-0.0.232.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__ra_ap_project_model-0.0.232",
+        sha256 = "db83d1844c74b22c110c4b8e8f2519be2b1723964008527281a11c3398749756",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/ra_ap_project_model/0.0.232/download"],
+        strip_prefix = "ra_ap_project_model-0.0.232",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra_ap_project_model-0.0.232.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__ra_ap_salsa-0.0.232",
+        sha256 = "370b302873eeafd07ccc6a714fc9395cae11e385955ccb78081093ee3b86f94e",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/ra_ap_salsa/0.0.232/download"],
+        strip_prefix = "ra_ap_salsa-0.0.232",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra_ap_salsa-0.0.232.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__ra_ap_salsa-macros-0.0.232",
+        sha256 = "414ff383af5abdb731917ca46c1a0f6b291278430736fe1ff2430a8548206a62",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/ra_ap_salsa-macros/0.0.232/download"],
+        strip_prefix = "ra_ap_salsa-macros-0.0.232",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra_ap_salsa-macros-0.0.232.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__ra_ap_span-0.0.232",
+        sha256 = "e1b982f799c7a8051219902ff5c1974ee353ac6ca2aa5b17ab0e3db9b8d8a7bf",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/ra_ap_span/0.0.232/download"],
+        strip_prefix = "ra_ap_span-0.0.232",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra_ap_span-0.0.232.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__ra_ap_stdx-0.0.232",
+        sha256 = "bb63ff9d6b11b4553fc0835f16705975258905e3b1230fcf1ddbf24c46aff69d",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/ra_ap_stdx/0.0.232/download"],
+        strip_prefix = "ra_ap_stdx-0.0.232",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra_ap_stdx-0.0.232.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__ra_ap_syntax-0.0.232",
+        sha256 = "f1ac12decfd5cadd880177316fc16afc1f2c67f241f6290b51fd6f222e2bd4d5",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/ra_ap_syntax/0.0.232/download"],
+        strip_prefix = "ra_ap_syntax-0.0.232",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra_ap_syntax-0.0.232.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__ra_ap_syntax-bridge-0.0.232",
+        sha256 = "8d57ec874cf6d45d25ce5d63dbfdf60912d5a33138855c4ab7e4314cfd01f6fa",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/ra_ap_syntax-bridge/0.0.232/download"],
+        strip_prefix = "ra_ap_syntax-bridge-0.0.232",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra_ap_syntax-bridge-0.0.232.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__ra_ap_text_edit-0.0.232",
+        sha256 = "7cb72ee1901baec556f4f2ef77e287d749ac0e973f063990672d6207b076aeac",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/ra_ap_text_edit/0.0.232/download"],
+        strip_prefix = "ra_ap_text_edit-0.0.232",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra_ap_text_edit-0.0.232.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__ra_ap_toolchain-0.0.232",
+        sha256 = "897200f5ab09335a77e9c8344fd8d5fd67f312c402179a378613421b4dec8d8f",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/ra_ap_toolchain/0.0.232/download"],
+        strip_prefix = "ra_ap_toolchain-0.0.232",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra_ap_toolchain-0.0.232.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__ra_ap_tt-0.0.232",
+        sha256 = "a9730313c495e88a89ee33f6e34205a92652d9c9a5061ebaed59436058a33000",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/ra_ap_tt/0.0.232/download"],
+        strip_prefix = "ra_ap_tt-0.0.232",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra_ap_tt-0.0.232.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__ra_ap_vfs-0.0.232",
+        sha256 = "d833eaa5422de9bb51ab1841fe505ed00fb51e64cce397e21de6c324bbcbffa0",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/ra_ap_vfs/0.0.232/download"],
+        strip_prefix = "ra_ap_vfs-0.0.232",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra_ap_vfs-0.0.232.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__ra_ap_vfs-notify-0.0.232",
+        sha256 = "388ea8af458d6f06ed6b67c8e3dcf634a798cb3f4e62df51bd6be00c2b219bca",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/ra_ap_vfs-notify/0.0.232/download"],
+        strip_prefix = "ra_ap_vfs-notify-0.0.232",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra_ap_vfs-notify-0.0.232.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__rand-0.8.5",
+        sha256 = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/rand/0.8.5/download"],
+        strip_prefix = "rand-0.8.5",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.rand-0.8.5.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__rand_chacha-0.3.1",
+        sha256 = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/rand_chacha/0.3.1/download"],
+        strip_prefix = "rand_chacha-0.3.1",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.rand_chacha-0.3.1.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__rand_core-0.6.4",
+        sha256 = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/rand_core/0.6.4/download"],
+        strip_prefix = "rand_core-0.6.4",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.rand_core-0.6.4.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__rayon-1.10.0",
+        sha256 = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/rayon/1.10.0/download"],
+        strip_prefix = "rayon-1.10.0",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.rayon-1.10.0.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__rayon-core-1.12.1",
+        sha256 = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/rayon-core/1.12.1/download"],
+        strip_prefix = "rayon-core-1.12.1",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.rayon-core-1.12.1.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__redox_syscall-0.5.7",
+        sha256 = "9b6dfecf2c74bce2466cabf93f6664d6998a69eb21e39f4207930065b27b771f",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/redox_syscall/0.5.7/download"],
+        strip_prefix = "redox_syscall-0.5.7",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.redox_syscall-0.5.7.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__regex-1.11.1",
+        sha256 = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/regex/1.11.1/download"],
+        strip_prefix = "regex-1.11.1",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.regex-1.11.1.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__regex-automata-0.1.10",
+        sha256 = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/regex-automata/0.1.10/download"],
+        strip_prefix = "regex-automata-0.1.10",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.regex-automata-0.1.10.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__regex-automata-0.4.8",
+        sha256 = "368758f23274712b504848e9d5a6f010445cc8b87a7cdb4d7cbee666c1288da3",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/regex-automata/0.4.8/download"],
+        strip_prefix = "regex-automata-0.4.8",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.regex-automata-0.4.8.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__regex-syntax-0.6.29",
+        sha256 = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/regex-syntax/0.6.29/download"],
+        strip_prefix = "regex-syntax-0.6.29",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.regex-syntax-0.6.29.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__regex-syntax-0.8.5",
+        sha256 = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/regex-syntax/0.8.5/download"],
+        strip_prefix = "regex-syntax-0.8.5",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.regex-syntax-0.8.5.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__rowan-0.15.15",
+        sha256 = "32a58fa8a7ccff2aec4f39cc45bf5f985cec7125ab271cf681c279fd00192b49",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/rowan/0.15.15/download"],
+        strip_prefix = "rowan-0.15.15",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.rowan-0.15.15.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__rustc-hash-1.1.0",
+        sha256 = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/rustc-hash/1.1.0/download"],
+        strip_prefix = "rustc-hash-1.1.0",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.rustc-hash-1.1.0.bazel"),
+    )
+
+    maybe(
+        new_git_repository,
+        name = "vendor__rustc_apfloat-0.2.1-llvm-462a31f5a5ab",
+        commit = "096d585100636bc2e9f09d7eefec38c5b334d47b",
+        init_submodules = True,
+        remote = "https://github.com/redsun82/rustc_apfloat.git",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.rustc_apfloat-0.2.1+llvm-462a31f5a5ab.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__ryu-1.0.18",
+        sha256 = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/ryu/1.0.18/download"],
+        strip_prefix = "ryu-1.0.18",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ryu-1.0.18.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__same-file-1.0.6",
+        sha256 = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/same-file/1.0.6/download"],
+        strip_prefix = "same-file-1.0.6",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.same-file-1.0.6.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__scoped-tls-1.0.1",
+        sha256 = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/scoped-tls/1.0.1/download"],
+        strip_prefix = "scoped-tls-1.0.1",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.scoped-tls-1.0.1.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__scopeguard-1.2.0",
+        sha256 = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/scopeguard/1.2.0/download"],
+        strip_prefix = "scopeguard-1.2.0",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.scopeguard-1.2.0.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__semver-1.0.23",
+        sha256 = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/semver/1.0.23/download"],
+        strip_prefix = "semver-1.0.23",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.semver-1.0.23.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__serde-1.0.214",
+        sha256 = "f55c3193aca71c12ad7890f1785d2b73e1b9f63a0bbc353c08ef26fe03fc56b5",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/serde/1.0.214/download"],
+        strip_prefix = "serde-1.0.214",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.serde-1.0.214.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__serde_derive-1.0.214",
+        sha256 = "de523f781f095e28fa605cdce0f8307e451cc0fd14e2eb4cd2e98a355b147766",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/serde_derive/1.0.214/download"],
+        strip_prefix = "serde_derive-1.0.214",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.serde_derive-1.0.214.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__serde_json-1.0.132",
+        sha256 = "d726bfaff4b320266d395898905d0eba0345aae23b54aee3a737e260fd46db03",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/serde_json/1.0.132/download"],
+        strip_prefix = "serde_json-1.0.132",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.serde_json-1.0.132.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__serde_with-3.11.0",
+        sha256 = "8e28bdad6db2b8340e449f7108f020b3b092e8583a9e3fb82713e1d4e71fe817",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/serde_with/3.11.0/download"],
+        strip_prefix = "serde_with-3.11.0",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.serde_with-3.11.0.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__serde_with_macros-3.11.0",
+        sha256 = "9d846214a9854ef724f3da161b426242d8de7c1fc7de2f89bb1efcb154dca79d",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/serde_with_macros/3.11.0/download"],
+        strip_prefix = "serde_with_macros-3.11.0",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.serde_with_macros-3.11.0.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__serde_yaml-0.9.34-deprecated",
+        sha256 = "6a8b1a1a2ebf674015cc02edccce75287f1a0130d394307b36743c2f5d504b47",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/serde_yaml/0.9.34+deprecated/download"],
+        strip_prefix = "serde_yaml-0.9.34+deprecated",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.serde_yaml-0.9.34+deprecated.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__sharded-slab-0.1.7",
+        sha256 = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/sharded-slab/0.1.7/download"],
+        strip_prefix = "sharded-slab-0.1.7",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.sharded-slab-0.1.7.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__shlex-1.3.0",
+        sha256 = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/shlex/1.3.0/download"],
+        strip_prefix = "shlex-1.3.0",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.shlex-1.3.0.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__smallvec-1.13.2",
+        sha256 = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/smallvec/1.13.2/download"],
+        strip_prefix = "smallvec-1.13.2",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.smallvec-1.13.2.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__smol_str-0.2.2",
+        sha256 = "dd538fb6910ac1099850255cf94a94df6551fbdd602454387d0adb2d1ca6dead",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/smol_str/0.2.2/download"],
+        strip_prefix = "smol_str-0.2.2",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.smol_str-0.2.2.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__sptr-0.3.2",
+        sha256 = "3b9b39299b249ad65f3b7e96443bad61c02ca5cd3589f46cb6d610a0fd6c0d6a",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/sptr/0.3.2/download"],
+        strip_prefix = "sptr-0.3.2",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.sptr-0.3.2.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__stable_deref_trait-1.2.0",
+        sha256 = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/stable_deref_trait/1.2.0/download"],
+        strip_prefix = "stable_deref_trait-1.2.0",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.stable_deref_trait-1.2.0.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__stderrlog-0.6.0",
+        sha256 = "61c910772f992ab17d32d6760e167d2353f4130ed50e796752689556af07dc6b",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/stderrlog/0.6.0/download"],
+        strip_prefix = "stderrlog-0.6.0",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.stderrlog-0.6.0.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__streaming-iterator-0.1.9",
+        sha256 = "2b2231b7c3057d5e4ad0156fb3dc807d900806020c5ffa3ee6ff2c8c76fb8520",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/streaming-iterator/0.1.9/download"],
+        strip_prefix = "streaming-iterator-0.1.9",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.streaming-iterator-0.1.9.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__strsim-0.11.1",
+        sha256 = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/strsim/0.11.1/download"],
+        strip_prefix = "strsim-0.11.1",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.strsim-0.11.1.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__syn-2.0.87",
+        sha256 = "25aa4ce346d03a6dcd68dd8b4010bcb74e54e62c90c573f394c46eae99aba32d",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/syn/2.0.87/download"],
+        strip_prefix = "syn-2.0.87",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.syn-2.0.87.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__synstructure-0.13.1",
+        sha256 = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/synstructure/0.13.1/download"],
+        strip_prefix = "synstructure-0.13.1",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.synstructure-0.13.1.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__termcolor-1.1.3",
+        sha256 = "bab24d30b911b2376f3a13cc2cd443142f0c81dda04c118693e35b3835757755",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/termcolor/1.1.3/download"],
+        strip_prefix = "termcolor-1.1.3",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.termcolor-1.1.3.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__text-size-1.1.1",
+        sha256 = "f18aa187839b2bdb1ad2fa35ead8c4c2976b64e4363c386d45ac0f7ee85c9233",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/text-size/1.1.1/download"],
+        strip_prefix = "text-size-1.1.1",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.text-size-1.1.1.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__thiserror-1.0.69",
+        sha256 = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/thiserror/1.0.69/download"],
+        strip_prefix = "thiserror-1.0.69",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.thiserror-1.0.69.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__thiserror-impl-1.0.69",
+        sha256 = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/thiserror-impl/1.0.69/download"],
+        strip_prefix = "thiserror-impl-1.0.69",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.thiserror-impl-1.0.69.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__thread_local-1.1.8",
+        sha256 = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/thread_local/1.1.8/download"],
+        strip_prefix = "thread_local-1.1.8",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.thread_local-1.1.8.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__time-0.3.36",
+        sha256 = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/time/0.3.36/download"],
+        strip_prefix = "time-0.3.36",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.time-0.3.36.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__time-core-0.1.2",
+        sha256 = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/time-core/0.1.2/download"],
+        strip_prefix = "time-core-0.1.2",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.time-core-0.1.2.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__time-macros-0.2.18",
+        sha256 = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/time-macros/0.2.18/download"],
+        strip_prefix = "time-macros-0.2.18",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.time-macros-0.2.18.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__tracing-0.1.40",
+        sha256 = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/tracing/0.1.40/download"],
+        strip_prefix = "tracing-0.1.40",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.tracing-0.1.40.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__tracing-attributes-0.1.27",
+        sha256 = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/tracing-attributes/0.1.27/download"],
+        strip_prefix = "tracing-attributes-0.1.27",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.tracing-attributes-0.1.27.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__tracing-core-0.1.32",
+        sha256 = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/tracing-core/0.1.32/download"],
+        strip_prefix = "tracing-core-0.1.32",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.tracing-core-0.1.32.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__tracing-log-0.2.0",
+        sha256 = "ee855f1f400bd0e5c02d150ae5de3840039a3f54b025156404e34c23c03f47c3",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/tracing-log/0.2.0/download"],
+        strip_prefix = "tracing-log-0.2.0",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.tracing-log-0.2.0.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__tracing-subscriber-0.3.18",
+        sha256 = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/tracing-subscriber/0.3.18/download"],
+        strip_prefix = "tracing-subscriber-0.3.18",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.tracing-subscriber-0.3.18.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__tree-sitter-0.24.4",
+        sha256 = "b67baf55e7e1b6806063b1e51041069c90afff16afcbbccd278d899f9d84bca4",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/tree-sitter/0.24.4/download"],
+        strip_prefix = "tree-sitter-0.24.4",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.tree-sitter-0.24.4.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__tree-sitter-embedded-template-0.23.2",
+        sha256 = "790063ef14e5b67556abc0b3be0ed863fb41d65ee791cf8c0b20eb42a1fa46af",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/tree-sitter-embedded-template/0.23.2/download"],
+        strip_prefix = "tree-sitter-embedded-template-0.23.2",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.tree-sitter-embedded-template-0.23.2.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__tree-sitter-json-0.24.8",
+        sha256 = "4d727acca406c0020cffc6cf35516764f36c8e3dc4408e5ebe2cb35a947ec471",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/tree-sitter-json/0.24.8/download"],
+        strip_prefix = "tree-sitter-json-0.24.8",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.tree-sitter-json-0.24.8.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__tree-sitter-language-0.1.2",
+        sha256 = "e8ddffe35a0e5eeeadf13ff7350af564c6e73993a24db62caee1822b185c2600",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/tree-sitter-language/0.1.2/download"],
+        strip_prefix = "tree-sitter-language-0.1.2",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.tree-sitter-language-0.1.2.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__tree-sitter-ql-0.23.1",
+        sha256 = "80b7bcaf39acefbb199417a6ec2fd0c038083ba115da3e4f4426c820dc76d386",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/tree-sitter-ql/0.23.1/download"],
+        strip_prefix = "tree-sitter-ql-0.23.1",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.tree-sitter-ql-0.23.1.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__tree-sitter-ruby-0.23.1",
+        sha256 = "be0484ea4ef6bb9c575b4fdabde7e31340a8d2dbc7d52b321ac83da703249f95",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/tree-sitter-ruby/0.23.1/download"],
+        strip_prefix = "tree-sitter-ruby-0.23.1",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.tree-sitter-ruby-0.23.1.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__triomphe-0.1.14",
+        sha256 = "ef8f7726da4807b58ea5c96fdc122f80702030edc33b35aff9190a51148ccc85",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/triomphe/0.1.14/download"],
+        strip_prefix = "triomphe-0.1.14",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.triomphe-0.1.14.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__typed-arena-2.0.2",
+        sha256 = "6af6ae20167a9ece4bcb41af5b80f8a1f1df981f6391189ce00fd257af04126a",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/typed-arena/2.0.2/download"],
+        strip_prefix = "typed-arena-2.0.2",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.typed-arena-2.0.2.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__uncased-0.9.10",
+        sha256 = "e1b88fcfe09e89d3866a5c11019378088af2d24c3fbd4f0543f96b479ec90697",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/uncased/0.9.10/download"],
+        strip_prefix = "uncased-0.9.10",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.uncased-0.9.10.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__ungrammar-1.16.1",
+        sha256 = "a3e5df347f0bf3ec1d670aad6ca5c6a1859cd9ea61d2113125794654ccced68f",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/ungrammar/1.16.1/download"],
+        strip_prefix = "ungrammar-1.16.1",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ungrammar-1.16.1.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__unicode-ident-1.0.13",
+        sha256 = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/unicode-ident/1.0.13/download"],
+        strip_prefix = "unicode-ident-1.0.13",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.unicode-ident-1.0.13.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__unicode-properties-0.1.3",
+        sha256 = "e70f2a8b45122e719eb623c01822704c4e0907e7e426a05927e1a1cfff5b75d0",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/unicode-properties/0.1.3/download"],
+        strip_prefix = "unicode-properties-0.1.3",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.unicode-properties-0.1.3.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__unicode-xid-0.2.6",
+        sha256 = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/unicode-xid/0.2.6/download"],
+        strip_prefix = "unicode-xid-0.2.6",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.unicode-xid-0.2.6.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__unsafe-libyaml-0.2.11",
+        sha256 = "673aac59facbab8a9007c7f6108d11f63b603f7cabff99fabf650fea5c32b861",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/unsafe-libyaml/0.2.11/download"],
+        strip_prefix = "unsafe-libyaml-0.2.11",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.unsafe-libyaml-0.2.11.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__utf8parse-0.2.2",
+        sha256 = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/utf8parse/0.2.2/download"],
+        strip_prefix = "utf8parse-0.2.2",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.utf8parse-0.2.2.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__valuable-0.1.0",
+        sha256 = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/valuable/0.1.0/download"],
+        strip_prefix = "valuable-0.1.0",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.valuable-0.1.0.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__version_check-0.9.5",
+        sha256 = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/version_check/0.9.5/download"],
+        strip_prefix = "version_check-0.9.5",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.version_check-0.9.5.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__walkdir-2.5.0",
+        sha256 = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/walkdir/2.5.0/download"],
+        strip_prefix = "walkdir-2.5.0",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.walkdir-2.5.0.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__wasi-0.11.0-wasi-snapshot-preview1",
+        sha256 = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/wasi/0.11.0+wasi-snapshot-preview1/download"],
+        strip_prefix = "wasi-0.11.0+wasi-snapshot-preview1",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.wasi-0.11.0+wasi-snapshot-preview1.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__wasm-bindgen-0.2.95",
+        sha256 = "128d1e363af62632b8eb57219c8fd7877144af57558fb2ef0368d0087bddeb2e",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/wasm-bindgen/0.2.95/download"],
+        strip_prefix = "wasm-bindgen-0.2.95",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.wasm-bindgen-0.2.95.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__wasm-bindgen-backend-0.2.95",
+        sha256 = "cb6dd4d3ca0ddffd1dd1c9c04f94b868c37ff5fac97c30b97cff2d74fce3a358",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/wasm-bindgen-backend/0.2.95/download"],
+        strip_prefix = "wasm-bindgen-backend-0.2.95",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.wasm-bindgen-backend-0.2.95.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__wasm-bindgen-macro-0.2.95",
+        sha256 = "e79384be7f8f5a9dd5d7167216f022090cf1f9ec128e6e6a482a2cb5c5422c56",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/wasm-bindgen-macro/0.2.95/download"],
+        strip_prefix = "wasm-bindgen-macro-0.2.95",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.wasm-bindgen-macro-0.2.95.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__wasm-bindgen-macro-support-0.2.95",
+        sha256 = "26c6ab57572f7a24a4985830b120de1594465e5d500f24afe89e16b4e833ef68",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/wasm-bindgen-macro-support/0.2.95/download"],
+        strip_prefix = "wasm-bindgen-macro-support-0.2.95",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.wasm-bindgen-macro-support-0.2.95.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__wasm-bindgen-shared-0.2.95",
+        sha256 = "65fc09f10666a9f147042251e0dda9c18f166ff7de300607007e96bdebc1068d",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/wasm-bindgen-shared/0.2.95/download"],
+        strip_prefix = "wasm-bindgen-shared-0.2.95",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.wasm-bindgen-shared-0.2.95.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__winapi-0.3.9",
+        sha256 = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/winapi/0.3.9/download"],
+        strip_prefix = "winapi-0.3.9",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.winapi-0.3.9.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__winapi-i686-pc-windows-gnu-0.4.0",
+        sha256 = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/winapi-i686-pc-windows-gnu/0.4.0/download"],
+        strip_prefix = "winapi-i686-pc-windows-gnu-0.4.0",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.winapi-i686-pc-windows-gnu-0.4.0.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__winapi-util-0.1.9",
+        sha256 = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/winapi-util/0.1.9/download"],
+        strip_prefix = "winapi-util-0.1.9",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.winapi-util-0.1.9.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__winapi-x86_64-pc-windows-gnu-0.4.0",
+        sha256 = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download"],
+        strip_prefix = "winapi-x86_64-pc-windows-gnu-0.4.0",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.winapi-x86_64-pc-windows-gnu-0.4.0.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__windows-core-0.52.0",
+        sha256 = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/windows-core/0.52.0/download"],
+        strip_prefix = "windows-core-0.52.0",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.windows-core-0.52.0.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__windows-sys-0.48.0",
+        sha256 = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/windows-sys/0.48.0/download"],
+        strip_prefix = "windows-sys-0.48.0",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.windows-sys-0.48.0.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__windows-sys-0.52.0",
+        sha256 = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/windows-sys/0.52.0/download"],
+        strip_prefix = "windows-sys-0.52.0",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.windows-sys-0.52.0.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__windows-sys-0.59.0",
+        sha256 = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/windows-sys/0.59.0/download"],
+        strip_prefix = "windows-sys-0.59.0",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.windows-sys-0.59.0.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__windows-targets-0.48.5",
+        sha256 = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/windows-targets/0.48.5/download"],
+        strip_prefix = "windows-targets-0.48.5",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.windows-targets-0.48.5.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__windows-targets-0.52.6",
+        sha256 = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/windows-targets/0.52.6/download"],
+        strip_prefix = "windows-targets-0.52.6",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.windows-targets-0.52.6.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__windows_aarch64_gnullvm-0.48.5",
+        sha256 = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/windows_aarch64_gnullvm/0.48.5/download"],
+        strip_prefix = "windows_aarch64_gnullvm-0.48.5",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.windows_aarch64_gnullvm-0.48.5.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__windows_aarch64_gnullvm-0.52.6",
+        sha256 = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/windows_aarch64_gnullvm/0.52.6/download"],
+        strip_prefix = "windows_aarch64_gnullvm-0.52.6",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.windows_aarch64_gnullvm-0.52.6.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__windows_aarch64_msvc-0.48.5",
+        sha256 = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/windows_aarch64_msvc/0.48.5/download"],
+        strip_prefix = "windows_aarch64_msvc-0.48.5",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.windows_aarch64_msvc-0.48.5.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__windows_aarch64_msvc-0.52.6",
+        sha256 = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/windows_aarch64_msvc/0.52.6/download"],
+        strip_prefix = "windows_aarch64_msvc-0.52.6",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.windows_aarch64_msvc-0.52.6.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__windows_i686_gnu-0.48.5",
+        sha256 = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/windows_i686_gnu/0.48.5/download"],
+        strip_prefix = "windows_i686_gnu-0.48.5",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.windows_i686_gnu-0.48.5.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__windows_i686_gnu-0.52.6",
+        sha256 = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/windows_i686_gnu/0.52.6/download"],
+        strip_prefix = "windows_i686_gnu-0.52.6",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.windows_i686_gnu-0.52.6.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__windows_i686_gnullvm-0.52.6",
+        sha256 = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/windows_i686_gnullvm/0.52.6/download"],
+        strip_prefix = "windows_i686_gnullvm-0.52.6",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.windows_i686_gnullvm-0.52.6.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__windows_i686_msvc-0.48.5",
+        sha256 = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/windows_i686_msvc/0.48.5/download"],
+        strip_prefix = "windows_i686_msvc-0.48.5",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.windows_i686_msvc-0.48.5.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__windows_i686_msvc-0.52.6",
+        sha256 = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/windows_i686_msvc/0.52.6/download"],
+        strip_prefix = "windows_i686_msvc-0.52.6",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.windows_i686_msvc-0.52.6.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__windows_x86_64_gnu-0.48.5",
+        sha256 = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/windows_x86_64_gnu/0.48.5/download"],
+        strip_prefix = "windows_x86_64_gnu-0.48.5",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.windows_x86_64_gnu-0.48.5.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__windows_x86_64_gnu-0.52.6",
+        sha256 = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/windows_x86_64_gnu/0.52.6/download"],
+        strip_prefix = "windows_x86_64_gnu-0.52.6",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.windows_x86_64_gnu-0.52.6.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__windows_x86_64_gnullvm-0.48.5",
+        sha256 = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/windows_x86_64_gnullvm/0.48.5/download"],
+        strip_prefix = "windows_x86_64_gnullvm-0.48.5",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.windows_x86_64_gnullvm-0.48.5.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__windows_x86_64_gnullvm-0.52.6",
+        sha256 = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/windows_x86_64_gnullvm/0.52.6/download"],
+        strip_prefix = "windows_x86_64_gnullvm-0.52.6",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.windows_x86_64_gnullvm-0.52.6.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__windows_x86_64_msvc-0.48.5",
+        sha256 = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/windows_x86_64_msvc/0.48.5/download"],
+        strip_prefix = "windows_x86_64_msvc-0.48.5",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.windows_x86_64_msvc-0.48.5.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__windows_x86_64_msvc-0.52.6",
+        sha256 = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/windows_x86_64_msvc/0.52.6/download"],
+        strip_prefix = "windows_x86_64_msvc-0.52.6",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.windows_x86_64_msvc-0.52.6.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__yansi-1.0.1",
+        sha256 = "cfe53a6657fd280eaa890a3bc59152892ffa3e30101319d168b781ed6529b049",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/yansi/1.0.1/download"],
+        strip_prefix = "yansi-1.0.1",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.yansi-1.0.1.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__zerocopy-0.7.35",
+        sha256 = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/zerocopy/0.7.35/download"],
+        strip_prefix = "zerocopy-0.7.35",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.zerocopy-0.7.35.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor__zerocopy-derive-0.7.35",
+        sha256 = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/zerocopy-derive/0.7.35/download"],
+        strip_prefix = "zerocopy-derive-0.7.35",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.zerocopy-derive-0.7.35.bazel"),
+    )
+
+    return [
+        struct(repo = "vendor__anyhow-1.0.93", is_dev_dep = False),
+        struct(repo = "vendor__argfile-0.2.1", is_dev_dep = False),
+        struct(repo = "vendor__chrono-0.4.38", is_dev_dep = False),
+        struct(repo = "vendor__clap-4.5.20", is_dev_dep = False),
+        struct(repo = "vendor__encoding-0.2.33", is_dev_dep = False),
+        struct(repo = "vendor__figment-0.10.19", is_dev_dep = False),
+        struct(repo = "vendor__flate2-1.0.34", is_dev_dep = False),
+        struct(repo = "vendor__glob-0.3.1", is_dev_dep = False),
+        struct(repo = "vendor__globset-0.4.15", is_dev_dep = False),
+        struct(repo = "vendor__itertools-0.10.5", is_dev_dep = False),
+        struct(repo = "vendor__itertools-0.13.0", is_dev_dep = False),
+        struct(repo = "vendor__lazy_static-1.5.0", is_dev_dep = False),
+        struct(repo = "vendor__log-0.4.22", is_dev_dep = False),
+        struct(repo = "vendor__num-traits-0.2.19", is_dev_dep = False),
+        struct(repo = "vendor__num_cpus-1.16.0", is_dev_dep = False),
+        struct(repo = "vendor__proc-macro2-1.0.89", is_dev_dep = False),
+        struct(repo = "vendor__quote-1.0.37", is_dev_dep = False),
+        struct(repo = "vendor__ra_ap_base_db-0.0.232", is_dev_dep = False),
+        struct(repo = "vendor__ra_ap_cfg-0.0.232", is_dev_dep = False),
+        struct(repo = "vendor__ra_ap_hir-0.0.232", is_dev_dep = False),
+        struct(repo = "vendor__ra_ap_hir_def-0.0.232", is_dev_dep = False),
+        struct(repo = "vendor__ra_ap_hir_expand-0.0.232", is_dev_dep = False),
+        struct(repo = "vendor__ra_ap_ide_db-0.0.232", is_dev_dep = False),
+        struct(repo = "vendor__ra_ap_intern-0.0.232", is_dev_dep = False),
+        struct(repo = "vendor__ra_ap_load-cargo-0.0.232", is_dev_dep = False),
+        struct(repo = "vendor__ra_ap_parser-0.0.232", is_dev_dep = False),
+        struct(repo = "vendor__ra_ap_paths-0.0.232", is_dev_dep = False),
+        struct(repo = "vendor__ra_ap_project_model-0.0.232", is_dev_dep = False),
+        struct(repo = "vendor__ra_ap_span-0.0.232", is_dev_dep = False),
+        struct(repo = "vendor__ra_ap_syntax-0.0.232", is_dev_dep = False),
+        struct(repo = "vendor__ra_ap_vfs-0.0.232", is_dev_dep = False),
+        struct(repo = "vendor__rayon-1.10.0", is_dev_dep = False),
+        struct(repo = "vendor__regex-1.11.1", is_dev_dep = False),
+        struct(repo = "vendor__serde-1.0.214", is_dev_dep = False),
+        struct(repo = "vendor__serde_json-1.0.132", is_dev_dep = False),
+        struct(repo = "vendor__serde_with-3.11.0", is_dev_dep = False),
+        struct(repo = "vendor__stderrlog-0.6.0", is_dev_dep = False),
+        struct(repo = "vendor__syn-2.0.87", is_dev_dep = False),
+        struct(repo = "vendor__tracing-0.1.40", is_dev_dep = False),
+        struct(repo = "vendor__tracing-subscriber-0.3.18", is_dev_dep = False),
+        struct(repo = "vendor__tree-sitter-0.24.4", is_dev_dep = False),
+        struct(repo = "vendor__tree-sitter-embedded-template-0.23.2", is_dev_dep = False),
+        struct(repo = "vendor__tree-sitter-ruby-0.23.1", is_dev_dep = False),
+        struct(repo = "vendor__triomphe-0.1.14", is_dev_dep = False),
+        struct(repo = "vendor__ungrammar-1.16.1", is_dev_dep = False),
+        struct(repo = "vendor__rand-0.8.5", is_dev_dep = True),
+        struct(repo = "vendor__tree-sitter-json-0.24.8", is_dev_dep = True),
+        struct(repo = "vendor__tree-sitter-ql-0.23.1", is_dev_dep = True),
+    ]
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_extension.bzl b/misc/bazel/3rdparty/tree_sitter_extractors_extension.bzl
new file mode 100644
index 00000000000..bdf3e6866ac
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_extension.bzl
@@ -0,0 +1,15 @@
+"""Module extensions for using vendored crates with bzlmod"""
+
+load("//misc/bazel/3rdparty/tree_sitter_extractors_deps:defs.bzl", _crate_repositories = "crate_repositories")
+
+def _crate_repositories_impl(module_ctx):
+    direct_deps = _crate_repositories()
+    return module_ctx.extension_metadata(
+        root_module_direct_deps = [repo.repo for repo in direct_deps],
+        root_module_direct_dev_deps = [],
+    )
+
+# short name to address Windows path length issues
+r = module_extension(
+    implementation = _crate_repositories_impl,
+)
diff --git a/misc/bazel/3rdparty/update_cargo_deps.sh b/misc/bazel/3rdparty/update_cargo_deps.sh
new file mode 100755
index 00000000000..5f265b6be45
--- /dev/null
+++ b/misc/bazel/3rdparty/update_cargo_deps.sh
@@ -0,0 +1,12 @@
+#! /usr/bin/env bash
+
+SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
+
+(
+    cd "$SCRIPT_DIR" || exit 1
+    cd ../../../
+    time bazel run //misc/bazel/3rdparty:vendor_py_deps
+    bazel mod tidy
+    time bazel run //misc/bazel/3rdparty:vendor_tree_sitter_extractors
+    bazel mod tidy
+)
diff --git a/misc/bazel/internal/git_lfs_probe.py b/misc/bazel/internal/git_lfs_probe.py
index 22ca9855f54..57f0fd5b8bb 100755
--- a/misc/bazel/internal/git_lfs_probe.py
+++ b/misc/bazel/internal/git_lfs_probe.py
@@ -179,15 +179,18 @@ def get_locations(objects):
         try:
             with urllib.request.urlopen(req, timeout=TIMEOUT) as resp:
                 data = json.load(resp)
+            assert len(data["objects"]) == len(
+                indexes
+            ), f"received {len(data)} objects, expected {len(indexes)}"
+            for i, resp in zip(indexes, data["objects"]):
+                ret[i] = f'{resp["oid"]} {resp["actions"]["download"]["href"]}'
+            return ret
         except urllib.error.URLError as e:
             warn(f"encountered {type(e).__name__} {e}, ignoring endpoint {endpoint.name}")
             continue
-        assert len(data["objects"]) == len(
-            indexes
-        ), f"received {len(data)} objects, expected {len(indexes)}"
-        for i, resp in zip(indexes, data["objects"]):
-            ret[i] = f'{resp["oid"]} {resp["actions"]["download"]["href"]}'
-        return ret
+        except KeyError:
+            warn(f"encountered malformed response, ignoring endpoint {endpoint.name}:\n{json.dumps(data, indent=2)}")
+            continue
     raise NoEndpointsFound
 
 
@@ -210,5 +213,12 @@ try:
     for resp in get_locations(objects):
         print(resp)
 except NoEndpointsFound as e:
-    print(f"ERROR: no valid endpoints found", file=sys.stderr)
+    print("""\
+ERROR: no valid endpoints found, your git authentication method might be currently unsupported by this script.
+You can bypass this error by running from semmle-code (this might take a while):
+  git config lfs.fetchexclude ""
+  git -C ql config lfs.fetchinclude \\*
+  git lfs fetch && git lfs checkout
+  cd ql
+  git lfs fetch && git lfs checkout""", file=sys.stderr)
     sys.exit(1)
diff --git a/misc/bazel/internal/zipmerge/zipmerge_test.cpp b/misc/bazel/internal/zipmerge/zipmerge_test.cpp
index 9bee1a79c02..65278a679f5 100644
--- a/misc/bazel/internal/zipmerge/zipmerge_test.cpp
+++ b/misc/bazel/internal/zipmerge/zipmerge_test.cpp
@@ -75,7 +75,7 @@ std::string get_file(const char* name) {
     return ret;
   }();
   // this works from both `codeql` and the internal repository
-  for (auto prefix : {"_main", "ql~"}) {
+  for (auto prefix : {"_main", "ql+"}) {
     auto ret = runfiles->Rlocation(prefix + "/misc/bazel/internal/zipmerge/test-files/"s + name);
     if (fs::exists(ret)) {
       return ret;
diff --git a/misc/bazel/lfs.bzl b/misc/bazel/lfs.bzl
index a068d76b2ea..7c37c0a5523 100644
--- a/misc/bazel/lfs.bzl
+++ b/misc/bazel/lfs.bzl
@@ -64,8 +64,8 @@ def _download_lfs(repository_ctx):
         srcs = [f for f in dir.readdir() if not f.is_dir]
     lfs_smudge(repository_ctx, srcs, executable = repository_ctx.attr.executable)
 
-    # with bzlmod the name is qualified with `~` separators, and we want the base name here
-    name = repository_ctx.name.split("~")[-1]
+    # with bzlmod the name is qualified with `+` separators, and we want the base name here
+    name = repository_ctx.name.split("+")[-1]
     basenames = [src.basename for src in srcs]
     build = "exports_files(%s)\n" % repr(basenames)
 
diff --git a/misc/bazel/pkg.bzl b/misc/bazel/pkg.bzl
index 62c2ee19945..d455e99c749 100644
--- a/misc/bazel/pkg.bzl
+++ b/misc/bazel/pkg.bzl
@@ -429,6 +429,8 @@ def codeql_pack(
         arch_overrides = None,
         pack_prefix = None,
         install_dest = "extractor-pack",
+        installer_alias = "install",
+        experimental = False,
         **kwargs):
     """
     Define a codeql pack.
@@ -448,21 +450,64 @@ def codeql_pack(
     contain the `{CODEQL_PLATFORM}` marker.
     All files in the pack will be prefixed with `name`, unless `pack_prefix` is set, then is used instead.
 
-    This rule also provides a convenient installer target, with a path governed by `install_dest`.
-    This installer is used for installing this pack into the source-tree, relative to the directory where the rule is used.
-    See `codeql_pack_install` for more details.
+    This rule also provides a convenient installer target named `<name>-installer`, with a path governed by `install_dest`,
+    unless `install_dest == None`. This installer is used for installing this pack into the source-tree, relative to the
+    directory where the rule is used. See `codeql_pack_install` for more details. If present, `installer_alias` is used
+    to define a shorthand alias for `<name>-installer`. Be sure to change `installer_alias` or set it to `None` if a
+    bazel package defines multiple `codeql_pack`s.
+
+    If `experimental = True`, a second `codeql_pack` named `<name>-experimental` is defined alongside the primary one with
+    an `experimental` pack prefix and no installer, intended to be used when packaging the full distribution.
 
     This function does not accept `visibility`, as packs are always public to make it easy to define pack groups.
     """
-    internal = _make_internal(name)
-    zips = zips or {}
     if pack_prefix == None:
         pack_prefix = name
+    _codeql_pack_impl(
+        name,
+        srcs,
+        zips,
+        arch_overrides,
+        pack_prefix,
+        install_dest,
+        installer_alias,
+        pkg_filegroup_kwargs = kwargs,
+    )
+    if experimental:
+        _codeql_pack_impl(
+            "%s-experimental" % name,
+            srcs,
+            zips,
+            arch_overrides,
+            pack_prefix = "experimental/%s" % pack_prefix,
+            install_dest = None,
+            installer_alias = None,
+            pkg_filegroup_kwargs = kwargs,
+        )
+
+        # TODO: remove this after internal repo update
+        native.alias(
+            name = "experimental-%s" % name,
+            actual = "%s-experimental" % name,
+            visibility = ["//visibility:public"],
+        )
+
+def _codeql_pack_impl(
+        name,
+        srcs,
+        zips,
+        arch_overrides,
+        pack_prefix,
+        install_dest,
+        installer_alias,
+        pkg_filegroup_kwargs):
+    internal = _make_internal(name)
+    zips = zips or {}
     pkg_filegroup(
         name = internal("all"),
         srcs = srcs,
         visibility = ["//visibility:private"],
-        **kwargs
+        **pkg_filegroup_kwargs
     )
     _codeql_pack_info(
         name = name,
@@ -473,7 +518,12 @@ def codeql_pack(
         # packs are always public, so that we can easily bundle them into groups
         visibility = ["//visibility:public"],
     )
-    _codeql_pack_install(internal("installer"), [name], install_dest = install_dest, apply_pack_prefix = False)
+    if install_dest:
+        _codeql_pack_install(internal("installer"), [name], install_dest = install_dest, apply_pack_prefix = False)
+
+        # TODO: remove deprecated `native.existing_rule(installer_alias)` after internal repo update
+        if installer_alias and not native.existing_rule(installer_alias):
+            native.alias(name = installer_alias, actual = internal("installer"))
 
 strip_prefix = _strip_prefix
 
diff --git a/misc/bazel/registry/modules/rules_kotlin/1.9.4-codeql.1/source.json b/misc/bazel/registry/modules/rules_kotlin/1.9.4-codeql.1/source.json
deleted file mode 100644
index 5089476d754..00000000000
--- a/misc/bazel/registry/modules/rules_kotlin/1.9.4-codeql.1/source.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-    "integrity": "sha256-dsD8wsI+33NjIK3tGs2d3guuQY5XMd8Skz2IbLqGt5U=",
-    "url": "https://github.com/bazelbuild/rules_kotlin/releases/download/v1.9.4/rules_kotlin-v1.9.4.tar.gz",
-    "patches": {
-        "codeql_do_not_emit_jdeps.patch": "sha256-x/HsujFlR1FGrgmbAbRZag9V4vKZZinBcs73tgRS478=",
-        "codeql_add_language_version_option.patch": "sha256-qFpP/hIvqGzjJi0h8LAQK0UuWqwlj/oCecZYGqlMVP8="
-    },
-    "patch_strip": 1
-}
diff --git a/misc/bazel/registry/modules/rules_kotlin/1.9.4-codeql.1/MODULE.bazel b/misc/bazel/registry/modules/rules_kotlin/2.0.0-codeql.1/MODULE.bazel
similarity index 74%
rename from misc/bazel/registry/modules/rules_kotlin/1.9.4-codeql.1/MODULE.bazel
rename to misc/bazel/registry/modules/rules_kotlin/2.0.0-codeql.1/MODULE.bazel
index 4982ad4b9a4..6c11301e234 100644
--- a/misc/bazel/registry/modules/rules_kotlin/1.9.4-codeql.1/MODULE.bazel
+++ b/misc/bazel/registry/modules/rules_kotlin/2.0.0-codeql.1/MODULE.bazel
@@ -1,14 +1,16 @@
 module(
     name = "rules_kotlin",
-    version = "1.9.4-codeql.1",
+    version = "2.0.0-codeql.1",
+    compatibility_level = 1,
     repo_name = "rules_kotlin",
 )
 
-bazel_dep(name = "platforms", version = "0.0.6")
-bazel_dep(name = "bazel_skylib", version = "1.4.2")
+bazel_dep(name = "platforms", version = "0.0.10")
+bazel_dep(name = "bazel_skylib", version = "1.7.1")
 bazel_dep(name = "rules_java", version = "7.2.0")
 bazel_dep(name = "rules_python", version = "0.23.1")
 bazel_dep(name = "rules_cc", version = "0.0.8")
+bazel_dep(name = "rules_android", version = "0.1.1")
 
 rules_kotlin_extensions = use_extension(
     "//src/main/starlark/core/repositories:bzlmod_setup.bzl",
@@ -19,7 +21,9 @@ use_repo(
     "com_github_google_ksp",
     "com_github_jetbrains_kotlin",
     "com_github_pinterest_ktlint",
-    "rules_android",
+    "kotlinx_serialization_core_jvm",
+    "kotlinx_serialization_json",
+    "kotlinx_serialization_json_jvm",
 )
 
 register_toolchains("//kotlin/internal:default_toolchain")
diff --git a/misc/bazel/registry/modules/rules_kotlin/1.9.4-codeql.1/patches/codeql_add_language_version_option.patch b/misc/bazel/registry/modules/rules_kotlin/2.0.0-codeql.1/patches/codeql_add_language_version_option.patch
similarity index 80%
rename from misc/bazel/registry/modules/rules_kotlin/1.9.4-codeql.1/patches/codeql_add_language_version_option.patch
rename to misc/bazel/registry/modules/rules_kotlin/2.0.0-codeql.1/patches/codeql_add_language_version_option.patch
index bb8fa5e4fca..d5716daba07 100644
--- a/misc/bazel/registry/modules/rules_kotlin/1.9.4-codeql.1/patches/codeql_add_language_version_option.patch
+++ b/misc/bazel/registry/modules/rules_kotlin/2.0.0-codeql.1/patches/codeql_add_language_version_option.patch
@@ -1,13 +1,13 @@
 We need to build different extractor variants with different -language-version options, which is not allowed
 in current kotlin_rules
 diff --git a/src/main/starlark/core/options/opts.kotlinc.bzl b/src/main/starlark/core/options/opts.kotlinc.bzl
-index 9b15fb8..c0ac2cd 100644
+index 5e1461b..b93e6aa 100644
 --- a/src/main/starlark/core/options/opts.kotlinc.bzl
 +++ b/src/main/starlark/core/options/opts.kotlinc.bzl
-@@ -28,6 +28,11 @@ def _map_jvm_target_to_flag(version):
+@@ -33,6 +33,11 @@ def _map_jdk_release_to_flag(version):
          return None
-     return ["-jvm-target=%s" % version]
- 
+     return ["-Xjdk-release=%s" % version]
+
 +def _map_language_version_to_flag(version):
 +    if not version:
 +        return None
@@ -16,9 +16,9 @@ index 9b15fb8..c0ac2cd 100644
  _KOPTS_ALL = {
      "warn": struct(
          args = dict(
-@@ -349,6 +354,15 @@ _KOPTS_ALL = {
+@@ -417,6 +422,15 @@ _KOPTS_ALL = {
          value_to_flag = None,
-         map_value_to_flag = _map_jvm_target_to_flag,
+         map_value_to_flag = _map_jdk_release_to_flag,
      ),
 +    "language_version": struct(
 +        args = dict(
@@ -30,5 +30,5 @@ index 9b15fb8..c0ac2cd 100644
 +        map_value_to_flag = _map_language_version_to_flag,
 +    ),
  }
- 
- # Filters out options that are not available in current compiler release
+
+ # Filters out options that are not available in current compiler release
\ No newline at end of file
diff --git a/misc/bazel/registry/modules/rules_kotlin/1.9.4-codeql.1/patches/codeql_do_not_emit_jdeps.patch b/misc/bazel/registry/modules/rules_kotlin/2.0.0-codeql.1/patches/codeql_do_not_emit_jdeps.patch
similarity index 73%
rename from misc/bazel/registry/modules/rules_kotlin/1.9.4-codeql.1/patches/codeql_do_not_emit_jdeps.patch
rename to misc/bazel/registry/modules/rules_kotlin/2.0.0-codeql.1/patches/codeql_do_not_emit_jdeps.patch
index 1a01bd2c91b..380c837d06a 100644
--- a/misc/bazel/registry/modules/rules_kotlin/1.9.4-codeql.1/patches/codeql_do_not_emit_jdeps.patch
+++ b/misc/bazel/registry/modules/rules_kotlin/2.0.0-codeql.1/patches/codeql_do_not_emit_jdeps.patch
@@ -1,9 +1,11 @@
 Emitting jdeps is broken for the 2.0.0 kotlin extractor, and we don't need those files.
 Patching it here rather than passing `--@rules_kotlin//kotlin/settings:jvm_emit_jdeps=false`
 allows us to not have to specify that option (and therefore pull in `rules_kotlin`) in `semmle-code`.
---- a/kotlin/settings/BUILD.bazel	2000-01-01 01:00:00.000000000 +0100
-+++ b/kotlin/settings/BUILD.bazel	2024-04-10 14:51:16.060085986 +0200
-@@ -16,7 +16,7 @@
+diff --git a/kotlin/settings/BUILD.bazel b/kotlin/settings/BUILD.bazel
+index 2c93c11..f352b80 100644
+--- a/kotlin/settings/BUILD.bazel
++++ b/kotlin/settings/BUILD.bazel
+@@ -25,7 +25,7 @@ release_archive(
  # Flag that controls the emission of jdeps files during kotlin jvm compilation.
  bool_flag(
      name = "jvm_emit_jdeps",
diff --git a/misc/bazel/registry/modules/rules_kotlin/2.0.0-codeql.1/source.json b/misc/bazel/registry/modules/rules_kotlin/2.0.0-codeql.1/source.json
new file mode 100644
index 00000000000..96d828e3455
--- /dev/null
+++ b/misc/bazel/registry/modules/rules_kotlin/2.0.0-codeql.1/source.json
@@ -0,0 +1,9 @@
+{
+    "integrity": "sha256-2JcjzJ67t72y66yhr30jg+B0YVZDz5ejZrdYp2t9xEM=",
+    "url": "https://github.com/bazelbuild/rules_kotlin/releases/download/v2.0.0/rules_kotlin-v2.0.0.tar.gz",
+    "patches": {
+        "codeql_do_not_emit_jdeps.patch": "sha256-1ir4Aio1SICxnj1wafQ0GefT/m7bwn2n+SQwq19V3A8=",
+        "codeql_add_language_version_option.patch": "sha256-t8Fm0bYZ4Q4vTqcoXZjyK4WPEoAafjE4whJLNnrnRbg="
+    },
+    "patch_strip": 1
+}
diff --git a/misc/bazel/registry/modules/rules_kotlin/metadata.json b/misc/bazel/registry/modules/rules_kotlin/metadata.json
index e399c3f5b0a..ac259b2e729 100644
--- a/misc/bazel/registry/modules/rules_kotlin/metadata.json
+++ b/misc/bazel/registry/modules/rules_kotlin/metadata.json
@@ -21,7 +21,7 @@
         "github:bazelbuild/rules_kotlin"
     ],
     "versions": [
-        "1.9.4-codeql.1"
+        "2.0.0-codeql.1"
     ],
     "yanked_versions": {}
 }
diff --git a/misc/codegen/codegen.py b/misc/codegen/codegen.py
index a199d19dd12..acc8e59bba5 100755
--- a/misc/codegen/codegen.py
+++ b/misc/codegen/codegen.py
@@ -43,8 +43,8 @@ def _parse_args() -> argparse.Namespace:
                         "compute QL imports and in some comments and as root for relative paths provided as options. "
                         "If not provided it defaults to the directory of the configuration file, if any")
     path_arguments = [
-        p.add_argument("--schema", default="schema.py",
-                       help="input schema file (default %(default)s)"),
+        p.add_argument("--schema",
+                       help="input schema file (default schema.py)"),
         p.add_argument("--dbscheme",
                        help="output file for dbscheme generation, input file for trap generation"),
         p.add_argument("--ql-output",
@@ -87,6 +87,8 @@ def _parse_args() -> argparse.Namespace:
                     setattr(opts, flag, getattr(defaults, flag))
         if opts.root_dir is None:
             opts.root_dir = opts.configuration_file.parent
+    if opts.schema is None:
+        opts.schema = "schema.py"
     if not opts.generate:
         p.error("Nothing to do, specify --generate")
     # absolutize all paths
diff --git a/misc/codegen/generators/qlgen.py b/misc/codegen/generators/qlgen.py
index 952889ee9c2..c5e7153489b 100755
--- a/misc/codegen/generators/qlgen.py
+++ b/misc/codegen/generators/qlgen.py
@@ -96,7 +96,7 @@ def _get_doc(cls: schema.Class, prop: schema.Property, plural=None):
         return format.format(**{noun: transform(noun) for noun in nouns})
 
     prop_name = _humanize(prop.name)
-    class_name = cls.default_doc_name or _humanize(inflection.underscore(cls.name))
+    class_name = cls.pragmas.get("ql_default_doc_name", _humanize(inflection.underscore(cls.name)))
     if prop.is_predicate:
         return f"this {class_name} {prop_name}"
     if plural is not None:
@@ -115,7 +115,7 @@ def get_ql_property(cls: schema.Class, prop: schema.Property, lookup: typing.Dic
         is_unordered=prop.is_unordered,
         description=prop.description,
         synth=bool(cls.synth) or prop.synth,
-        type_is_hideable=lookup[prop.type].hideable if prop.type in lookup else False,
+        type_is_hideable="ql_hideable" in lookup[prop.type].pragmas if prop.type in lookup else False,
         internal="ql_internal" in prop.pragmas,
     )
     if prop.is_single:
@@ -154,7 +154,6 @@ def get_ql_property(cls: schema.Class, prop: schema.Property, lookup: typing.Dic
 
 
 def get_ql_class(cls: schema.Class, lookup: typing.Dict[str, schema.Class]) -> ql.Class:
-    pragmas = {k: True for k in cls.pragmas if k.startswith("qltest")}
     prev_child = ""
     properties = []
     for p in cls.properties:
@@ -170,9 +169,8 @@ def get_ql_class(cls: schema.Class, lookup: typing.Dict[str, schema.Class]) -> q
         properties=properties,
         dir=pathlib.Path(cls.group or ""),
         doc=cls.doc,
-        hideable=cls.hideable,
+        hideable="ql_hideable" in cls.pragmas,
         internal="ql_internal" in cls.pragmas,
-        **pragmas,
     )
 
 
@@ -448,7 +446,8 @@ def generate(opts, renderer):
             for c in data.classes.values():
                 if should_skip_qltest(c, data.classes):
                     continue
-                test_with = data.classes[c.test_with] if c.test_with else c
+                test_with_name = c.pragmas.get("qltest_test_with")
+                test_with = data.classes[test_with_name] if test_with_name else c
                 test_dir = test_out / test_with.group / test_with.name
                 test_dir.mkdir(parents=True, exist_ok=True)
                 if all(f.suffix in (".txt", ".ql", ".actual", ".expected") for f in test_dir.glob("*.*")):
diff --git a/misc/codegen/generators/rustgen.py b/misc/codegen/generators/rustgen.py
index 5d981197b37..f4c977c0fdb 100644
--- a/misc/codegen/generators/rustgen.py
+++ b/misc/codegen/generators/rustgen.py
@@ -72,13 +72,28 @@ class Processor:
 
     def _get_class(self, name: str) -> rust.Class:
         cls = self._classmap[name]
+        properties = [
+            (c, p)
+            for c, p in _get_properties(cls, self._classmap)
+            if "rust_skip" not in p.pragmas and not p.synth
+        ]
+        fields = []
+        detached_fields = []
+        for c, p in properties:
+            if "rust_detach" in p.pragmas:
+                # only generate detached fields in the actual class defining them, not the derived ones
+                if c is cls:
+                    # TODO lift this restriction if required (requires change in dbschemegen as well)
+                    assert c.derived or not p.is_single, \
+                        f"property {p.name} in concrete class marked as detached but not optional"
+                    detached_fields.append(_get_field(c, p))
+            elif not cls.derived:
+                # for non-detached ones, only generate fields in the concrete classes
+                fields.append(_get_field(c, p))
         return rust.Class(
             name=name,
-            fields=[
-                _get_field(c, p)
-                for c, p in _get_properties(cls, self._classmap)
-                if "rust_skip" not in p.pragmas and not p.synth
-            ] if not cls.derived else [],
+            fields=fields,
+            detached_fields=detached_fields,
             ancestors=sorted(set(a.name for a in _get_ancestors(cls, self._classmap))),
             entry_table=inflection.tableize(cls.name) if not cls.derived else None,
         )
diff --git a/misc/codegen/generators/rusttestgen.py b/misc/codegen/generators/rusttestgen.py
index e9fee845c79..d360db27a65 100644
--- a/misc/codegen/generators/rusttestgen.py
+++ b/misc/codegen/generators/rusttestgen.py
@@ -1,5 +1,7 @@
 import dataclasses
 import typing
+from collections.abc import Iterable
+
 import inflection
 
 from misc.codegen.loaders import schemaloader
@@ -27,6 +29,25 @@ class TestCode:
     function: Function | None = None
 
 
+def _get_code(doc: list[str]) -> list[str]:
+    adding_code = False
+    has_code = False
+    code = []
+    for line in doc:
+        match line, adding_code:
+            case ("```", _) | ("```rust", _):
+                adding_code = not adding_code
+                has_code = True
+            case _, False:
+                code.append(f"// {line}")
+            case _, True:
+                code.append(line)
+    assert not adding_code, "Unterminated code block in docstring:\n  " + "\n  ".join(doc)
+    if has_code:
+        return code
+    return []
+
+
 def generate(opts, renderer):
     assert opts.ql_test_output
     schema = schemaloader.load_file(opts.schema)
@@ -36,30 +57,25 @@ def generate(opts, renderer):
                          force=opts.force) as renderer:
         for cls in schema.classes.values():
             if (qlgen.should_skip_qltest(cls, schema.classes) or
-                    "rust_skip_test_from_doc" in cls.pragmas or
-                    not cls.doc):
+                    "rust_skip_doc_test" in cls.pragmas):
                 continue
-            code = []
-            adding_code = False
-            has_code = False
-            for line in cls.doc:
-                match line, adding_code:
-                    case ("```", _) | ("```rust", _):
-                        adding_code = not adding_code
-                        has_code = True
-                    case _, False:
-                        code.append(f"// {line}")
-                    case _, True:
-                        code.append(line)
-            if not has_code:
+            code = _get_code(cls.doc)
+            for p in schema.iter_properties(cls.name):
+                if "rust_skip_doc_test" in p.pragmas:
+                    continue
+                property_code = _get_code(p.description)
+                if property_code:
+                    code.append(f"// # {p.name}")
+                    code += property_code
+            if not code:
                 continue
-            assert not adding_code, "Unterminated code block in docstring: " + "\n".join(cls.doc)
             test_name = inflection.underscore(cls.name)
-            signature = cls.rust_doc_test_function
+            signature = cls.pragmas.get("rust_doc_test_signature", "() -> ()")
             fn = signature and Function(f"test_{test_name}", signature)
             if fn:
                 indent = 4 * " "
                 code = [indent + l for l in code]
-            test_with = schema.classes[cls.test_with] if cls.test_with else cls
+            test_with_name = typing.cast(str, cls.pragmas.get("qltest_test_with"))
+            test_with = schema.classes[test_with_name] if test_with_name else cls
             test = opts.ql_test_output / test_with.group / test_with.name / f"gen_{test_name}.rs"
             renderer.render(TestCode(code="\n".join(code), function=fn), test)
diff --git a/misc/codegen/lib/ql.py b/misc/codegen/lib/ql.py
index 9c7e3d84637..1920a813e20 100644
--- a/misc/codegen/lib/ql.py
+++ b/misc/codegen/lib/ql.py
@@ -107,9 +107,6 @@ class Class:
     dir: pathlib.Path = pathlib.Path()
     imports: List[str] = field(default_factory=list)
     import_prefix: Optional[str] = None
-    qltest_skip: bool = False
-    qltest_collapse_hierarchy: bool = False
-    qltest_uncollapse_hierarchy: bool = False
     internal: bool = False
     doc: List[str] = field(default_factory=list)
     hideable: bool = False
diff --git a/misc/codegen/lib/rust.py b/misc/codegen/lib/rust.py
index e4ec8e871c2..4c34952311c 100644
--- a/misc/codegen/lib/rust.py
+++ b/misc/codegen/lib/rust.py
@@ -1,6 +1,7 @@
 import dataclasses
 import re
 import typing
+import inflection
 
 # taken from https://doc.rust-lang.org/reference/keywords.html
 keywords = {
@@ -106,12 +107,17 @@ class Field:
     def is_label(self):
         return self.base_type == "trap::Label"
 
+    @property
+    def singular_field_name(self) -> str:
+        return inflection.singularize(self.field_name.rstrip("_"))
+
 
 @dataclasses.dataclass
 class Class:
     name: str
     entry_table: str | None = None
     fields: list[Field] = dataclasses.field(default_factory=list)
+    detached_fields: list[Field] = dataclasses.field(default_factory=list)
     ancestors: list[str] = dataclasses.field(default_factory=list)
 
     @property
@@ -128,6 +134,10 @@ class Class:
                 ret.setdefault(f.table_name, []).append(f)
         return [{"table_name": k, "fields": v} for k, v in ret.items()]
 
+    @property
+    def has_detached_fields(self) -> bool:
+        return bool(self.detached_fields)
+
 
 @dataclasses.dataclass
 class ClassList:
diff --git a/misc/codegen/lib/schema.py b/misc/codegen/lib/schema.py
index 025c1330cce..c5c3dc810b6 100644
--- a/misc/codegen/lib/schema.py
+++ b/misc/codegen/lib/schema.py
@@ -1,5 +1,7 @@
 """ schema format representation """
+import abc
 import typing
+from collections.abc import Iterable
 from dataclasses import dataclass, field
 from typing import List, Set, Union, Dict, Optional
 from enum import Enum, auto
@@ -31,11 +33,15 @@ class Property:
     name: Optional[str] = None
     type: Optional[str] = None
     is_child: bool = False
-    pragmas: List[str] = field(default_factory=list)
+    pragmas: List[str] | Dict[str, object] = field(default_factory=dict)
     doc: Optional[str] = None
     description: List[str] = field(default_factory=list)
     synth: bool = False
 
+    def __post_init__(self):
+        if not isinstance(self.pragmas, dict):
+            self.pragmas = dict.fromkeys(self.pragmas, None)
+
     @property
     def is_single(self) -> bool:
         return self.kind == self.Kind.SINGLE
@@ -86,15 +92,12 @@ class Class:
     bases: List[str] = field(default_factory=list)
     derived: Set[str] = field(default_factory=set)
     properties: List[Property] = field(default_factory=list)
-    group: str = ""
-    pragmas: List[str] = field(default_factory=list)
-    synth: Optional[Union[SynthInfo, bool]] = None
-    """^^^ filled with `True` for non-final classes with only synthesized final descendants """
+    pragmas: List[str] | Dict[str, object] = field(default_factory=dict)
     doc: List[str] = field(default_factory=list)
-    default_doc_name: Optional[str] = None
-    hideable: bool = False
-    test_with: Optional[str] = None
-    rust_doc_test_function: Optional["FunctionInfo"] = "() -> ()"  # TODO: parametrized pragmas
+
+    def __post_init__(self):
+        if not isinstance(self.pragmas, dict):
+            self.pragmas = dict.fromkeys(self.pragmas, None)
 
     @property
     def final(self):
@@ -107,12 +110,24 @@ class Class:
             _check_type(d, known)
         for p in self.properties:
             _check_type(p.type, known)
-        if self.synth is not None:
-            _check_type(self.synth.from_class, known)
-            if self.synth.on_arguments is not None:
-                for t in self.synth.on_arguments.values():
+        if "synth" in self.pragmas:
+            synth = self.pragmas["synth"]
+            _check_type(synth.from_class, known)
+            if synth.on_arguments is not None:
+                for t in synth.on_arguments.values():
                     _check_type(t, known)
-        _check_type(self.test_with, known)
+        _check_type(self.pragmas.get("qltest_test_with"), known)
+
+    @property
+    def synth(self) -> SynthInfo | bool | None:
+        return self.pragmas.get("synth")
+
+    def mark_synth(self):
+        self.pragmas.setdefault("synth", True)
+
+    @property
+    def group(self) -> str:
+        return typing.cast(str, self.pragmas.get("group", ""))
 
 
 @dataclass
@@ -130,46 +145,41 @@ class Schema:
     def null_class(self):
         return self.classes[self.null] if self.null else None
 
+    def iter_properties(self, cls: str) -> Iterable[Property]:
+        cls = self.classes[cls]
+        for b in cls.bases:
+            yield from self.iter_properties(b)
+        yield from cls.properties
+
 
 predicate_marker = object()
 
 TypeRef = Union[type, str]
 
 
-@functools.singledispatch
 def get_type_name(arg: TypeRef) -> str:
-    raise Error(f"Not a schema type or string ({arg})")
+    match arg:
+        case type():
+            return arg.__name__
+        case str():
+            return arg
+        case _:
+            raise Error(f"Not a schema type or string ({arg})")
 
 
-@get_type_name.register
-def _(arg: type):
-    return arg.__name__
-
-
-@get_type_name.register
-def _(arg: str):
-    return arg
-
-
-@functools.singledispatch
 def _make_property(arg: object) -> Property:
-    if arg is predicate_marker:
-        return PredicateProperty()
-    raise Error(f"Illegal property specifier {arg}")
+    match arg:
+        case _ if arg is predicate_marker:
+            return PredicateProperty()
+        case str() | type():
+            return SingleProperty(type=get_type_name(arg))
+        case Property():
+            return arg
+        case _:
+            raise Error(f"Illegal property specifier {arg}")
 
 
-@_make_property.register(str)
-@_make_property.register(type)
-def _(arg: TypeRef):
-    return SingleProperty(type=get_type_name(arg))
-
-
-@_make_property.register
-def _(arg: Property):
-    return arg
-
-
-class PropertyModifier:
+class PropertyModifier(abc.ABC):
     """ Modifier of `Property` objects.
         Being on the right of `|` it will trigger construction of a `Property` from
         the left operand.
@@ -180,8 +190,14 @@ class PropertyModifier:
         self.modify(ret)
         return ret
 
+    def __invert__(self) -> "PropertyModifier":
+        return self.negate()
+
     def modify(self, prop: Property):
-        raise NotImplementedError
+        ...
+
+    def negate(self) -> "PropertyModifier":
+        ...
 
 
 def split_doc(doc):
@@ -203,3 +219,6 @@ def split_doc(doc):
     while trimmed and not trimmed[0]:
         trimmed.pop(0)
     return trimmed
+
+
+inheritable_pragma_prefix = "_inheritable_pragma_"
diff --git a/misc/codegen/lib/schemadefs.py b/misc/codegen/lib/schemadefs.py
index 5f424b2bffc..997b85b4ca6 100644
--- a/misc/codegen/lib/schemadefs.py
+++ b/misc/codegen/lib/schemadefs.py
@@ -1,83 +1,177 @@
-from typing import Callable as _Callable
+from typing import (
+    Callable as _Callable,
+    Dict as _Dict,
+    Iterable as _Iterable,
+    ClassVar as _ClassVar,
+)
 from misc.codegen.lib import schema as _schema
 import inspect as _inspect
 from dataclasses import dataclass as _dataclass
 
+from misc.codegen.lib.schema import Property
 
+_set = set
+
+
+@_dataclass
 class _ChildModifier(_schema.PropertyModifier):
+    child: bool = True
+
     def modify(self, prop: _schema.Property):
         if prop.type is None or prop.type[0].islower():
             raise _schema.Error("Non-class properties cannot be children")
         if prop.is_unordered:
             raise _schema.Error("Set properties cannot be children")
-        prop.is_child = True
+        prop.is_child = self.child
+
+    def negate(self) -> _schema.PropertyModifier:
+        return _ChildModifier(False)
+
+
+class _DocModifierMetaclass(type(_schema.PropertyModifier)):
+    # make ~doc same as doc(None)
+    def __invert__(self) -> _schema.PropertyModifier:
+        return _DocModifier(None)
 
 
 @_dataclass
-class _DocModifier(_schema.PropertyModifier):
-    doc: str
+class _DocModifier(_schema.PropertyModifier, metaclass=_DocModifierMetaclass):
+    doc: str | None
 
     def modify(self, prop: _schema.Property):
-        if "\n" in self.doc or self.doc[-1] == ".":
+        if self.doc and ("\n" in self.doc or self.doc[-1] == "."):
             raise _schema.Error("No newlines or trailing dots are allowed in doc, did you intend to use desc?")
         prop.doc = self.doc
 
+    def negate(self) -> _schema.PropertyModifier:
+        return _DocModifier(None)
+
+
+class _DescModifierMetaclass(type(_schema.PropertyModifier)):
+    # make ~desc same as desc(None)
+    def __invert__(self) -> _schema.PropertyModifier:
+        return _DescModifier(None)
+
 
 @_dataclass
-class _DescModifier(_schema.PropertyModifier):
-    description: str
+class _DescModifier(_schema.PropertyModifier, metaclass=_DescModifierMetaclass):
+    description: str | None
 
     def modify(self, prop: _schema.Property):
         prop.description = _schema.split_doc(self.description)
 
+    def negate(self) -> _schema.PropertyModifier:
+        return _DescModifier(None)
+
 
 def include(source: str):
     # add to `includes` variable in calling context
-    _inspect.currentframe().f_back.f_locals.setdefault(
-        "__includes", []).append(source)
-
-
-class _Namespace:
-    """ simple namespacing mechanism """
-
-    def __init__(self, **kwargs):
-        self.__dict__.update(kwargs)
-
-
-class _SynthModifier(_schema.PropertyModifier, _Namespace):
-    def modify(self, prop: _schema.Property):
-        prop.synth = True
-
-
-qltest = _Namespace()
-ql = _Namespace()
-cpp = _Namespace()
-rust = _Namespace()
-synth = _SynthModifier()
+    _inspect.currentframe().f_back.f_locals.setdefault("includes", []).append(source)
 
 
 @_dataclass
-class _Pragma(_schema.PropertyModifier):
+class _Namespace:
+    """ simple namespacing mechanism """
+    name: str
+
+    def add(self, pragma: "_PragmaBase", key: str | None = None):
+        self.__dict__[pragma.pragma] = pragma
+        pragma.pragma = key or f"{self.name}_{pragma.pragma}"
+
+
+@_dataclass
+class _SynthModifier(_schema.PropertyModifier, _Namespace):
+    synth: bool = True
+
+    def modify(self, prop: _schema.Property):
+        prop.synth = self.synth
+
+    def negate(self) -> _schema.PropertyModifier:
+        return _SynthModifier(self.name, False)
+
+
+qltest = _Namespace("qltest")
+ql = _Namespace("ql")
+cpp = _Namespace("cpp")
+rust = _Namespace("rust")
+synth = _SynthModifier("synth")
+
+
+@_dataclass
+class _PragmaBase:
+    pragma: str
+
+
+@_dataclass
+class _ClassPragma(_PragmaBase):
+    """ A class pragma.
+    For schema classes it acts as a python decorator with `@`.
+    """
+    inherited: bool = False
+    value: object = None
+
+    def __call__(self, cls: type) -> type:
+        """ use this pragma as a decorator on classes """
+        if self.inherited:
+            setattr(cls, f"{_schema.inheritable_pragma_prefix}{self.pragma}", self.value)
+        else:
+            # not using hasattr as we don't want to land on inherited pragmas
+            if "_pragmas" not in cls.__dict__:
+                cls._pragmas = {}
+            self._apply(cls._pragmas)
+        return cls
+
+    def _apply(self, pragmas: _Dict[str, object]) -> None:
+        pragmas[self.pragma] = self.value
+
+
+@_dataclass
+class _Pragma(_ClassPragma, _schema.PropertyModifier):
     """ A class or property pragma.
     For properties, it functions similarly to a `_PropertyModifier` with `|`, adding the pragma.
     For schema classes it acts as a python decorator with `@`.
     """
-    pragma: str
-
-    def __post_init__(self):
-        namespace, _, name = self.pragma.partition('_')
-        setattr(globals()[namespace], name, self)
+    remove: bool = False
 
     def modify(self, prop: _schema.Property):
-        prop.pragmas.append(self.pragma)
+        self._apply(prop.pragmas)
 
-    def __call__(self, cls: type) -> type:
-        """ use this pragma as a decorator on classes """
-        if "_pragmas" in cls.__dict__:  # not using hasattr as we don't want to land on inherited pragmas
-            cls._pragmas.append(self.pragma)
+    def negate(self) -> _schema.PropertyModifier:
+        return _Pragma(self.pragma, remove=True)
+
+    def _apply(self, pragmas: _Dict[str, object]) -> None:
+        if self.remove:
+            pragmas.pop(self.pragma, None)
         else:
-            cls._pragmas = [self.pragma]
-        return cls
+            super()._apply(pragmas)
+
+
+@_dataclass
+class _ParametrizedClassPragma(_PragmaBase):
+    """ A class parametrized pragma.
+    Needs to be applied to a parameter to give a class pragma.
+    """
+    _pragma_class: _ClassVar[type] = _ClassPragma
+
+    inherited: bool = False
+    factory: _Callable[..., object] = None
+
+    def __post_init__(self):
+        self.__signature__ = _inspect.signature(self.factory).replace(return_annotation=self._pragma_class)
+
+    def __call__(self, *args, **kwargs) -> _pragma_class:
+        return self._pragma_class(self.pragma, self.inherited, value=self.factory(*args, **kwargs))
+
+
+@_dataclass
+class _ParametrizedPragma(_ParametrizedClassPragma):
+    """ A class or property parametrized pragma.
+    Needs to be applied to a parameter to give a pragma.
+    """
+    _pragma_class: _ClassVar[type] = _Pragma
+
+    def __invert__(self) -> _Pragma:
+        return _Pragma(self.pragma, remove=True)
 
 
 class _Optionalizer(_schema.PropertyModifier):
@@ -122,15 +216,6 @@ class _TypeModifier:
 _ClassDecorator = _Callable[[type], type]
 
 
-def _annotate(**kwargs) -> _ClassDecorator:
-    def f(cls: type) -> type:
-        for k, v in kwargs.items():
-            setattr(cls, f"_{k}", v)
-        return cls
-
-    return f
-
-
 boolean = "boolean"
 int = "int"
 string = "string"
@@ -144,29 +229,87 @@ child = _ChildModifier()
 doc = _DocModifier
 desc = _DescModifier
 
-use_for_null = _annotate(null=True)
+use_for_null = _ClassPragma("null")
 
-_Pragma("qltest_skip")
-_Pragma("qltest_collapse_hierarchy")
-_Pragma("qltest_uncollapse_hierarchy")
-qltest.test_with = lambda cls: _annotate(test_with=cls)
+qltest.add(_Pragma("skip"))
+qltest.add(_ClassPragma("collapse_hierarchy"))
+qltest.add(_ClassPragma("uncollapse_hierarchy"))
+qltest.add(_ParametrizedClassPragma("test_with", inherited=True, factory=_schema.get_type_name))
 
-ql.default_doc_name = lambda doc: _annotate(doc_name=doc)
-ql.hideable = _annotate(hideable=True)
-_Pragma("ql_internal")
+ql.add(_ParametrizedClassPragma("default_doc_name", factory=lambda doc: doc))
+ql.add(_ClassPragma("hideable", inherited=True))
+ql.add(_Pragma("internal"))
 
-_Pragma("cpp_skip")
+cpp.add(_Pragma("skip"))
 
-_Pragma("rust_skip_doc_test")
+rust.add(_Pragma("detach"))
+rust.add(_Pragma("skip_doc_test"))
 
-rust.doc_test_signature = lambda signature: _annotate(rust_doc_test_function=signature)
+rust.add(_ParametrizedClassPragma("doc_test_signature", factory=lambda signature: signature))
+
+group = _ParametrizedClassPragma("group", inherited=True, factory=lambda group: group)
 
 
-def group(name: str = "") -> _ClassDecorator:
-    return _annotate(group=name)
+synth.add(_ParametrizedClassPragma("from_class", factory=lambda ref: _schema.SynthInfo(
+    from_class=_schema.get_type_name(ref))), key="synth")
+synth.add(_ParametrizedClassPragma("on_arguments", factory=lambda **kwargs:
+                                   _schema.SynthInfo(on_arguments={k: _schema.get_type_name(t) for k, t in kwargs.items()})), key="synth")
 
 
-synth.from_class = lambda ref: _annotate(synth=_schema.SynthInfo(
-    from_class=_schema.get_type_name(ref)))
-synth.on_arguments = lambda **kwargs: _annotate(
-    synth=_schema.SynthInfo(on_arguments={k: _schema.get_type_name(t) for k, t in kwargs.items()}))
+class _PropertyModifierList(_schema.PropertyModifier):
+    def __init__(self):
+        self._mods = []
+
+    def __or__(self, other: _schema.PropertyModifier):
+        self._mods.append(other)
+        return self
+
+    def modify(self, prop: Property):
+        for m in self._mods:
+            m.modify(prop)
+
+
+class _PropertyAnnotation:
+    def __or__(self, other: _schema.PropertyModifier):
+        return _PropertyModifierList() | other
+
+
+_ = _PropertyAnnotation()
+
+drop = object()
+
+
+def annotate(annotated_cls: type, add_bases: _Iterable[type] | None = None, replace_bases: _Dict[type, type] | None = None) -> _Callable[[type], _PropertyAnnotation]:
+    """
+    Add or modify schema annotations after a class has been defined previously.
+
+    The name of the class used for annotation must be `_`.
+
+    `replace_bases` can be used to replace bases on the annotated class.
+    """
+    def decorator(cls: type) -> _PropertyAnnotation:
+        if cls.__name__ != "_":
+            raise _schema.Error("Annotation classes must be named _")
+        if cls.__doc__ is not None:
+            annotated_cls.__doc__ = cls.__doc__
+        for p, v in cls.__dict__.get("_pragmas", {}).items():
+            _ClassPragma(p, value=v)(annotated_cls)
+        if replace_bases:
+            annotated_cls.__bases__ = tuple(replace_bases.get(b, b) for b in annotated_cls.__bases__)
+        if add_bases:
+            annotated_cls.__bases__ += tuple(add_bases)
+        for a in dir(cls):
+            if a.startswith(_schema.inheritable_pragma_prefix):
+                setattr(annotated_cls, a, getattr(cls, a))
+        for p, a in cls.__annotations__.items():
+            if a is drop:
+                del annotated_cls.__annotations__[p]
+            elif p in annotated_cls.__annotations__:
+                annotated_cls.__annotations__[p] |= a
+            elif isinstance(a, (_PropertyAnnotation, _PropertyModifierList)):
+                raise _schema.Error(f"annotated property {p} not present in annotated class "
+                                    f"{annotated_cls.__name__}")
+            else:
+                annotated_cls.__annotations__[p] = a
+        return _
+    return decorator
diff --git a/misc/codegen/loaders/schemaloader.py b/misc/codegen/loaders/schemaloader.py
index 34dba347740..069e3b65474 100644
--- a/misc/codegen/loaders/schemaloader.py
+++ b/misc/codegen/loaders/schemaloader.py
@@ -1,4 +1,5 @@
 """ schema loader """
+import sys
 
 import inflection
 import typing
@@ -36,28 +37,28 @@ def _get_class(cls: type) -> schema.Class:
     if cls.__name__ != to_underscore_and_back:
         raise schema.Error(f"Class name must be upper camel-case, without capitalized acronyms, found {cls.__name__} "
                            f"instead of {to_underscore_and_back}")
-    if len({b._group for b in cls.__bases__ if hasattr(b, "_group")}) > 1:
+    if len({g for g in (getattr(b, f"{schema.inheritable_pragma_prefix}group", None)
+                        for b in cls.__bases__) if g}) > 1:
         raise schema.Error(f"Bases with mixed groups for {cls.__name__}")
-    if any(getattr(b, "_null", False) for b in cls.__bases__):
+    pragmas = {
+        # dir and getattr inherit from bases
+        a[len(schema.inheritable_pragma_prefix):]: getattr(cls, a)
+        for a in dir(cls) if a.startswith(schema.inheritable_pragma_prefix)
+    }
+    pragmas |= cls.__dict__.get("_pragmas", {})
+    derived = {d.__name__ for d in cls.__subclasses__()}
+    if "null" in pragmas and derived:
         raise schema.Error(f"Null class cannot be derived")
     return schema.Class(name=cls.__name__,
                         bases=[b.__name__ for b in cls.__bases__ if b is not object],
-                        derived={d.__name__ for d in cls.__subclasses__()},
-                        # getattr to inherit from bases
-                        group=getattr(cls, "_group", ""),
-                        hideable=getattr(cls, "_hideable", False),
-                        test_with=_get_name(getattr(cls, "_test_with", None)),
+                        derived=derived,
+                        pragmas=pragmas,
                         # in the following we don't use `getattr` to avoid inheriting
-                        pragmas=cls.__dict__.get("_pragmas", []),
-                        synth=cls.__dict__.get("_synth", None),
                         properties=[
                             a | _PropertyNamer(n)
                             for n, a in cls.__dict__.get("__annotations__", {}).items()
                         ],
                         doc=schema.split_doc(cls.__doc__),
-                        default_doc_name=cls.__dict__.get("_doc_name"),
-                        rust_doc_test_function=cls.__dict__.get("_rust_doc_test_function",
-                                                                schema.Class.rust_doc_test_function)
                         )
 
 
@@ -102,27 +103,29 @@ def _fill_synth_information(classes: typing.Dict[str, schema.Class]):
     fill_is_synth(root)
 
     for name, cls in classes.items():
-        if cls.synth is None and is_synth[name]:
-            cls.synth = True
+        if is_synth[name]:
+            cls.mark_synth()
 
 
 def _fill_hideable_information(classes: typing.Dict[str, schema.Class]):
     """ Update the class map propagating the `hideable` attribute upwards in the hierarchy """
-    todo = [cls for cls in classes.values() if cls.hideable]
+    todo = [cls for cls in classes.values() if "ql_hideable" in cls.pragmas]
     while todo:
         cls = todo.pop()
         for base in cls.bases:
             supercls = classes[base]
-            if not supercls.hideable:
-                supercls.hideable = True
+            if "ql_hideable" not in supercls.pragmas:
+                supercls.pragmas["ql_hideable"] = None
                 todo.append(supercls)
 
 
 def _check_test_with(classes: typing.Dict[str, schema.Class]):
     for cls in classes.values():
-        if cls.test_with is not None and classes[cls.test_with].test_with is not None:
-            raise schema.Error(f"{cls.name} has test_with {cls.test_with} which in turn "
-                               f"has test_with {classes[cls.test_with].test_with}, use that directly")
+        test_with = typing.cast(str, cls.pragmas.get("qltest_test_with"))
+        transitive_test_with = test_with and classes[test_with].pragmas.get("qltest_test_with")
+        if test_with and transitive_test_with:
+            raise schema.Error(f"{cls.name} has test_with {test_with} which in turn "
+                               f"has test_with {transitive_test_with}, use that directly")
 
 
 def load(m: types.ModuleType) -> schema.Schema:
@@ -135,10 +138,12 @@ def load(m: types.ModuleType) -> schema.Schema:
     for name, data in m.__dict__.items():
         if hasattr(defs, name):
             continue
-        if name == "__includes":
+        if name == "includes":
             includes = data
             continue
-        if name.startswith("__"):
+        if name.startswith("__") or name == "_":
+            continue
+        if isinstance(data, types.ModuleType):
             continue
         cls = _get_class(data)
         if classes and not cls.bases:
@@ -146,11 +151,11 @@ def load(m: types.ModuleType) -> schema.Schema:
                 f"Only one root class allowed, found second root {name}")
         cls.check_types(known)
         classes[name] = cls
-        if getattr(data, "_null", False):
+        if "null" in cls.pragmas:
+            del cls.pragmas["null"]
             if null is not None:
                 raise schema.Error(f"Null class {null} already defined, second null class {name} not allowed")
             null = name
-            cls.is_null_class = True
 
     _fill_synth_information(classes)
     _fill_hideable_information(classes)
@@ -160,7 +165,10 @@ def load(m: types.ModuleType) -> schema.Schema:
 
 
 def load_file(path: pathlib.Path) -> schema.Schema:
-    spec = importlib.util.spec_from_file_location("schema", path)
-    module = importlib.util.module_from_spec(spec)
-    spec.loader.exec_module(module)
+    assert path.suffix in ("", ".py")
+    sys.path.insert(0, str(path.parent))
+    try:
+        module = importlib.import_module(path.with_suffix("").name)
+    finally:
+        sys.path.remove(str(path.parent))
     return load(module)
diff --git a/misc/codegen/templates/ql_synth_types.mustache b/misc/codegen/templates/ql_synth_types.mustache
index a174d141a6b..c76654b8ea9 100644
--- a/misc/codegen/templates/ql_synth_types.mustache
+++ b/misc/codegen/templates/ql_synth_types.mustache
@@ -7,7 +7,7 @@
 private import {{import_prefix}}.SynthConstructors
 private import {{import_prefix}}.Raw
 
-cached module Synth {
+module Synth {
   /**
    * INTERNAL: Do not use.
    * The synthesized type of all elements.
@@ -37,7 +37,7 @@ cached module Synth {
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `T{{name}}`, if possible.
    */
-  cached T{{name}} convert{{name}}FromRaw(Raw::Element e) {
+  T{{name}} convert{{name}}FromRaw(Raw::Element e) {
     {{^is_fresh_synth}}
     result = T{{name}}(e)
     {{/is_fresh_synth}}
@@ -52,7 +52,7 @@ cached module Synth {
    * INTERNAL: Do not use.
    * Converts a raw DB element to a synthesized `T{{name}}`, if possible.
    */
-  cached T{{name}} convert{{name}}FromRaw(Raw::Element e) {
+  T{{name}} convert{{name}}FromRaw(Raw::Element e) {
     {{#derived}}
     {{^first}}
     or
@@ -67,7 +67,7 @@ cached module Synth {
    * INTERNAL: Do not use.
    * Converts a synthesized `T{{name}}` to a raw DB element, if possible.
    */
-  cached Raw::Element convert{{name}}ToRaw(T{{name}} e) {
+  Raw::Element convert{{name}}ToRaw(T{{name}} e) {
     {{^is_fresh_synth}}
     e = T{{name}}(result)
     {{/is_fresh_synth}}
@@ -82,7 +82,7 @@ cached module Synth {
    * INTERNAL: Do not use.
    * Converts a synthesized `T{{name}}` to a raw DB element, if possible.
    */
-  cached Raw::Element convert{{name}}ToRaw(T{{name}} e) {
+  Raw::Element convert{{name}}ToRaw(T{{name}} e) {
     {{#derived}}
     {{^first}}
     or
diff --git a/misc/codegen/templates/rust_classes.mustache b/misc/codegen/templates/rust_classes.mustache
index 94dd957da02..0fa29b1eb69 100644
--- a/misc/codegen/templates/rust_classes.mustache
+++ b/misc/codegen/templates/rust_classes.mustache
@@ -59,6 +59,16 @@ pub struct {{name}} {
     _unused: ()
 }
 {{/is_entry}}
+{{#has_detached_fields}}
+
+impl {{name}} {
+{{#detached_fields}}
+    pub fn emit_{{singular_field_name}}(id: trap::Label<Self>, {{#is_repeated}}{{^is_unordered}}i: usize, {{/is_unordered}}{{/is_repeated}}value: {{base_type}}, out: &mut trap::Writer) {
+        out.add_tuple("{{table_name}}", vec![id.into(), {{#is_repeated}}{{^is_unordered}}i.into(), {{/is_unordered}}{{/is_repeated}}value.into()]);
+    }
+{{/detached_fields}}
+}
+{{/has_detached_fields}}
 
 impl trap::TrapClass for {{name}} {
     fn class_name() -> &'static str { "{{name}}" }
diff --git a/misc/codegen/test/test_cppgen.py b/misc/codegen/test/test_cppgen.py
index fcd9b15e8d0..fea9be2037f 100644
--- a/misc/codegen/test/test_cppgen.py
+++ b/misc/codegen/test/test_cppgen.py
@@ -156,10 +156,10 @@ def test_classes_with_dirs(generate_grouped):
     cbase = cpp.Class(name="CBase")
     assert generate_grouped([
         schema.Class(name="A"),
-        schema.Class(name="B", group="foo"),
-        schema.Class(name="CBase", derived={"C"}, group="bar"),
-        schema.Class(name="C", bases=["CBase"], group="bar"),
-        schema.Class(name="D", group="foo/bar/baz"),
+        schema.Class(name="B", pragmas={"group": "foo"}),
+        schema.Class(name="CBase", derived={"C"}, pragmas={"group": "bar"}),
+        schema.Class(name="C", bases=["CBase"], pragmas={"group": "bar"}),
+        schema.Class(name="D", pragmas={"group": "foo/bar/baz"}),
     ]) == {
         ".": [cpp.Class(name="A", trap_name="As", final=True)],
         "foo": [cpp.Class(name="B", trap_name="Bs", final=True)],
@@ -185,15 +185,15 @@ def test_synth_classes_ignored(generate):
     assert generate([
         schema.Class(
             name="W",
-            synth=schema.SynthInfo(),
+            pragmas={"synth": schema.SynthInfo()},
         ),
         schema.Class(
             name="X",
-            synth=schema.SynthInfo(from_class="A"),
+            pragmas={"synth": schema.SynthInfo(from_class="A")},
         ),
         schema.Class(
             name="Y",
-            synth=schema.SynthInfo(on_arguments={"a": "A", "b": "int"}),
+            pragmas={"synth": schema.SynthInfo(on_arguments={"a": "A", "b": "int"})},
         ),
         schema.Class(
             name="Z",
diff --git a/misc/codegen/test/test_dbschemegen.py b/misc/codegen/test/test_dbschemegen.py
index 1fbbc046785..96a6b0d0f7f 100644
--- a/misc/codegen/test/test_dbschemegen.py
+++ b/misc/codegen/test/test_dbschemegen.py
@@ -56,7 +56,7 @@ def test_includes(input, opts, generate):
 
 def test_empty_final_class(generate, dir_param):
     assert generate([
-        schema.Class("Object", group=dir_param.input),
+        schema.Class("Object", pragmas={"group": dir_param.input}),
     ]) == dbscheme.Scheme(
         src=schema_file.name,
         includes=[],
@@ -74,7 +74,7 @@ def test_empty_final_class(generate, dir_param):
 
 def test_final_class_with_single_scalar_field(generate, dir_param):
     assert generate([
-        schema.Class("Object", group=dir_param.input, properties=[
+        schema.Class("Object", pragmas={"group": dir_param.input}, properties=[
             schema.SingleProperty("foo", "bar"),
         ]),
     ]) == dbscheme.Scheme(
@@ -94,7 +94,7 @@ def test_final_class_with_single_scalar_field(generate, dir_param):
 
 def test_final_class_with_single_class_field(generate, dir_param):
     assert generate([
-        schema.Class("Object", group=dir_param.input, properties=[
+        schema.Class("Object", pragmas={"group": dir_param.input}, properties=[
             schema.SingleProperty("foo", "Bar"),
         ]),
     ]) == dbscheme.Scheme(
@@ -114,7 +114,7 @@ def test_final_class_with_single_class_field(generate, dir_param):
 
 def test_final_class_with_optional_field(generate, dir_param):
     assert generate([
-        schema.Class("Object", group=dir_param.input, properties=[
+        schema.Class("Object", pragmas={"group": dir_param.input}, properties=[
             schema.OptionalProperty("foo", "bar"),
         ]),
     ]) == dbscheme.Scheme(
@@ -142,7 +142,7 @@ def test_final_class_with_optional_field(generate, dir_param):
 @pytest.mark.parametrize("property_cls", [schema.RepeatedProperty, schema.RepeatedOptionalProperty])
 def test_final_class_with_repeated_field(generate, property_cls, dir_param):
     assert generate([
-        schema.Class("Object", group=dir_param.input, properties=[
+        schema.Class("Object", pragmas={"group": dir_param.input}, properties=[
             property_cls("foo", "bar"),
         ]),
     ]) == dbscheme.Scheme(
@@ -170,7 +170,7 @@ def test_final_class_with_repeated_field(generate, property_cls, dir_param):
 
 def test_final_class_with_repeated_unordered_field(generate, dir_param):
     assert generate([
-        schema.Class("Object", group=dir_param.input, properties=[
+        schema.Class("Object", pragmas={"group": dir_param.input}, properties=[
             schema.RepeatedUnorderedProperty("foo", "bar"),
         ]),
     ]) == dbscheme.Scheme(
@@ -196,7 +196,7 @@ def test_final_class_with_repeated_unordered_field(generate, dir_param):
 
 def test_final_class_with_predicate_field(generate, dir_param):
     assert generate([
-        schema.Class("Object", group=dir_param.input, properties=[
+        schema.Class("Object", pragmas={"group": dir_param.input}, properties=[
             schema.PredicateProperty("foo"),
         ]),
     ]) == dbscheme.Scheme(
@@ -222,7 +222,7 @@ def test_final_class_with_predicate_field(generate, dir_param):
 
 def test_final_class_with_more_fields(generate, dir_param):
     assert generate([
-        schema.Class("Object", group=dir_param.input, properties=[
+        schema.Class("Object", pragmas={"group": dir_param.input}, properties=[
             schema.SingleProperty("one", "x"),
             schema.SingleProperty("two", "y"),
             schema.OptionalProperty("three", "z"),
@@ -309,7 +309,7 @@ def test_class_with_derived_and_single_property(generate, dir_param):
         schema.Class(
             name="Base",
             derived={"Left", "Right"},
-            group=dir_param.input,
+            pragmas={"group": dir_param.input},
             properties=[
                 schema.SingleProperty("single", "Prop"),
             ]),
@@ -349,7 +349,7 @@ def test_class_with_derived_and_optional_property(generate, dir_param):
         schema.Class(
             name="Base",
             derived={"Left", "Right"},
-            group=dir_param.input,
+            pragmas={"group": dir_param.input},
             properties=[
                 schema.OptionalProperty("opt", "Prop"),
             ]),
@@ -388,7 +388,7 @@ def test_class_with_derived_and_repeated_property(generate, dir_param):
     assert generate([
         schema.Class(
             name="Base",
-            group=dir_param.input,
+            pragmas={"group": dir_param.input},
             derived={"Left", "Right"},
             properties=[
                 schema.RepeatedProperty("rep", "Prop"),
@@ -536,9 +536,9 @@ def test_null_class(generate):
 
 def test_synth_classes_ignored(generate):
     assert generate([
-        schema.Class(name="A", synth=schema.SynthInfo()),
-        schema.Class(name="B", synth=schema.SynthInfo(from_class="A")),
-        schema.Class(name="C", synth=schema.SynthInfo(on_arguments={"x": "A"})),
+        schema.Class(name="A", pragmas={"synth": schema.SynthInfo()}),
+        schema.Class(name="B", pragmas={"synth": schema.SynthInfo(from_class="A")}),
+        schema.Class(name="C", pragmas={"synth": schema.SynthInfo(on_arguments={"x": "A"})}),
     ]) == dbscheme.Scheme(
         src=schema_file.name,
         includes=[],
@@ -549,7 +549,7 @@ def test_synth_classes_ignored(generate):
 def test_synth_derived_classes_ignored(generate):
     assert generate([
         schema.Class(name="A", derived={"B", "C"}),
-        schema.Class(name="B", bases=["A"], synth=schema.SynthInfo()),
+        schema.Class(name="B", bases=["A"], pragmas={"synth": schema.SynthInfo()}),
         schema.Class(name="C", bases=["A"]),
     ]) == dbscheme.Scheme(
         src=schema_file.name,
diff --git a/misc/codegen/test/test_qlgen.py b/misc/codegen/test/test_qlgen.py
index f364fcbd92c..684d3d6a1a1 100644
--- a/misc/codegen/test/test_qlgen.py
+++ b/misc/codegen/test/test_qlgen.py
@@ -467,7 +467,7 @@ def test_class_with_doc(generate_classes):
 def test_class_dir(generate_classes):
     dir = "another/rel/path"
     assert generate_classes([
-        schema.Class("A", derived={"B"}, group=dir),
+        schema.Class("A", derived={"B"}, pragmas={"group": dir}),
         schema.Class("B", bases=["A"]),
     ]) == {
         f"{dir}/A.qll": (
@@ -489,7 +489,7 @@ def test_root_element_cannot_have_children(generate_classes):
 def test_class_dir_imports(generate_import_list):
     dir = "another/rel/path"
     assert generate_import_list([
-        schema.Class("A", derived={"B"}, group=dir),
+        schema.Class("A", derived={"B"}, pragmas={"group": dir}),
         schema.Class("B", bases=["A"]),
     ]) == ql.ImportList([
         stub_import_prefix + "B",
@@ -583,7 +583,7 @@ def test_test_source_present(opts, generate_tests):
 def test_test_source_present_with_dir(opts, generate_tests):
     write(opts.ql_test_output / "foo" / "A" / "test.swift")
     assert generate_tests([
-        schema.Class("A", group="foo"),
+        schema.Class("A", pragmas={"group": "foo"}),
     ]) == {
         "foo/A/A.ql": a_ql_class_tester(class_name="A"),
     }
@@ -749,7 +749,7 @@ def test_test_with(opts, generate_tests):
     write(opts.ql_test_output / "B" / "test.swift")
     assert generate_tests([
         schema.Class("Base", derived={"A", "B"}),
-        schema.Class("A", bases=["Base"], test_with="B"),
+        schema.Class("A", bases=["Base"], pragmas={"qltest_test_with": "B"}),
         schema.Class("B", bases=["Base"]),
     ]) == {
         "B/A.ql": a_ql_class_tester(class_name="A"),
@@ -922,7 +922,7 @@ def test_property_on_class_with_default_doc_name(generate_classes):
     assert generate_classes([
         schema.Class("MyObject", properties=[
             schema.SingleProperty("foo", "bar")],
-            default_doc_name="baz"),
+            pragmas={"ql_default_doc_name": "baz"}),
     ]) == {
         "MyObject.qll": (a_ql_class_public(name="MyObject"),
                          a_ql_stub(name="MyObject"),
@@ -937,7 +937,7 @@ def test_property_on_class_with_default_doc_name(generate_classes):
 
 def test_stub_on_class_with_synth_from_class(generate_classes):
     assert generate_classes([
-        schema.Class("MyObject", synth=schema.SynthInfo(from_class="A"),
+        schema.Class("MyObject", pragmas={"synth": schema.SynthInfo(from_class="A")},
                      properties=[schema.SingleProperty("foo", "bar")]),
     ]) == {
         "MyObject.qll": (a_ql_class_public(name="MyObject"), a_ql_stub(name="MyObject", synth_accessors=[
@@ -952,7 +952,7 @@ def test_stub_on_class_with_synth_from_class(generate_classes):
 
 def test_stub_on_class_with_synth_on_arguments(generate_classes):
     assert generate_classes([
-        schema.Class("MyObject", synth=schema.SynthInfo(on_arguments={"base": "A", "index": "int", "label": "string"}),
+        schema.Class("MyObject", pragmas={"synth": schema.SynthInfo(on_arguments={"base": "A", "index": "int", "label": "string"})},
                      properties=[schema.SingleProperty("foo", "bar")]),
     ]) == {
         "MyObject.qll": (a_ql_class_public(name="MyObject"), a_ql_stub(name="MyObject", synth_accessors=[
@@ -986,7 +986,7 @@ def test_synth_property(generate_classes):
 
 def test_hideable_class(generate_classes):
     assert generate_classes([
-        schema.Class("MyObject", hideable=True),
+        schema.Class("MyObject", pragmas=["ql_hideable"]),
     ]) == {
         "MyObject.qll": (a_ql_class_public(name="MyObject"), a_ql_stub(name="MyObject"), a_ql_class(name="MyObject", final=True, hideable=True, imports=[stub_import_prefix + "MyObject"])),
     }
@@ -994,7 +994,7 @@ def test_hideable_class(generate_classes):
 
 def test_hideable_property(generate_classes):
     assert generate_classes([
-        schema.Class("MyObject", hideable=True),
+        schema.Class("MyObject", pragmas=["ql_hideable"]),
         schema.Class("Other", properties=[
             schema.SingleProperty("x", "MyObject"),
         ]),
diff --git a/misc/codegen/test/test_schemaloader.py b/misc/codegen/test/test_schemaloader.py
index 0b64b26ea77..6c6fccfb3ea 100644
--- a/misc/codegen/test/test_schemaloader.py
+++ b/misc/codegen/test/test_schemaloader.py
@@ -1,6 +1,7 @@
 import sys
 
 import pytest
+from misc.codegen.lib.schemadefs import optional
 
 from misc.codegen.test.utils import *
 from misc.codegen.lib import schemadefs as defs
@@ -100,7 +101,7 @@ def test_group():
             pass
 
     assert data.classes == {
-        'A': schema.Class('A', group="xxx"),
+        'A': schema.Class('A', pragmas={"group": "xxx"}),
     }
 
 
@@ -123,8 +124,8 @@ def test_group_is_inherited():
     assert data.classes == {
         'A': schema.Class('A', derived={'B', 'C'}),
         'B': schema.Class('B', bases=['A'], derived={'D'}),
-        'C': schema.Class('C', bases=['A'], derived={'D'}, group='xxx'),
-        'D': schema.Class('D', bases=['B', 'C'], group='xxx'),
+        'C': schema.Class('C', bases=['A'], derived={'D'}, pragmas={"group": "xxx"}),
+        'D': schema.Class('D', bases=['B', 'C'], pragmas={"group": "xxx"}),
     }
 
 
@@ -268,15 +269,21 @@ def test_builtin_predicate_and_set_children_not_allowed(spec):
                 x: spec | defs.child
 
 
-_pragmas = [(defs.qltest.skip, "qltest_skip"),
-            (defs.qltest.collapse_hierarchy, "qltest_collapse_hierarchy"),
-            (defs.qltest.uncollapse_hierarchy, "qltest_uncollapse_hierarchy"),
-            (defs.cpp.skip, "cpp_skip"),
-            (defs.ql.internal, "ql_internal"),
-            ]
+_class_pragmas = [
+    (defs.qltest.collapse_hierarchy, "qltest_collapse_hierarchy"),
+    (defs.qltest.uncollapse_hierarchy, "qltest_uncollapse_hierarchy"),
+]
+
+_property_pragmas = [
+    (defs.qltest.skip, "qltest_skip"),
+    (defs.cpp.skip, "cpp_skip"),
+    (defs.ql.internal, "ql_internal"),
+]
+
+_pragmas = _class_pragmas + _property_pragmas
 
 
-@pytest.mark.parametrize("pragma,expected", _pragmas)
+@pytest.mark.parametrize("pragma,expected", _property_pragmas)
 def test_property_with_pragma(pragma, expected):
     @load
     class data:
@@ -292,7 +299,7 @@ def test_property_with_pragma(pragma, expected):
 
 def test_property_with_pragmas():
     spec = defs.string
-    for pragma, _ in _pragmas:
+    for pragma, _ in _property_pragmas:
         spec |= pragma
 
     @load
@@ -302,7 +309,7 @@ def test_property_with_pragmas():
 
     assert data.classes == {
         'A': schema.Class('A', properties=[
-            schema.SingleProperty('x', 'string', pragmas=[expected for _, expected in _pragmas]),
+            schema.SingleProperty('x', 'string', pragmas=[expected for _, expected in _property_pragmas]),
         ]),
     }
 
@@ -348,8 +355,8 @@ def test_synth_from_class():
             pass
 
     assert data.classes == {
-        'A': schema.Class('A', derived={'B'}, synth=True),
-        'B': schema.Class('B', bases=['A'], synth=schema.SynthInfo(from_class="A")),
+        'A': schema.Class('A', derived={'B'}, pragmas={"synth": True}),
+        'B': schema.Class('B', bases=['A'], pragmas={"synth": schema.SynthInfo(from_class="A")}),
     }
 
 
@@ -364,7 +371,7 @@ def test_synth_from_class_ref():
             pass
 
     assert data.classes == {
-        'A': schema.Class('A', derived={'B'}, synth=schema.SynthInfo(from_class="B")),
+        'A': schema.Class('A', derived={'B'}, pragmas={"synth": schema.SynthInfo(from_class="B")}),
         'B': schema.Class('B', bases=['A']),
     }
 
@@ -389,8 +396,8 @@ def test_synth_class_on():
             pass
 
     assert data.classes == {
-        'A': schema.Class('A', derived={'B'}, synth=True),
-        'B': schema.Class('B', bases=['A'], synth=schema.SynthInfo(on_arguments={'a': 'A', 'i': 'int'})),
+        'A': schema.Class('A', derived={'B'}, pragmas={"synth": True}),
+        'B': schema.Class('B', bases=['A'], pragmas={"synth": schema.SynthInfo(on_arguments={'a': 'A', 'i': 'int'})}),
     }
 
 
@@ -408,7 +415,7 @@ def test_synth_class_on_ref():
             pass
 
     assert data.classes == {
-        'A': schema.Class('A', derived={'B'}, synth=schema.SynthInfo(on_arguments={'b': 'B', 'i': 'int'})),
+        'A': schema.Class('A', derived={'B'}, pragmas={"synth": schema.SynthInfo(on_arguments={'b': 'B', 'i': 'int'})}),
         'B': schema.Class('B', bases=['A']),
     }
 
@@ -447,10 +454,10 @@ def test_synth_class_hierarchy():
 
     assert data.classes == {
         'Root': schema.Class('Root', derived={'Base', 'C'}),
-        'Base': schema.Class('Base', bases=['Root'], derived={'Intermediate', 'B'}, synth=True),
-        'Intermediate': schema.Class('Intermediate', bases=['Base'], derived={'A'}, synth=True),
-        'A': schema.Class('A', bases=['Intermediate'], synth=schema.SynthInfo(on_arguments={'a': 'Base', 'i': 'int'})),
-        'B': schema.Class('B', bases=['Base'], synth=schema.SynthInfo(from_class='Base')),
+        'Base': schema.Class('Base', bases=['Root'], derived={'Intermediate', 'B'}, pragmas={"synth": True}),
+        'Intermediate': schema.Class('Intermediate', bases=['Base'], derived={'A'}, pragmas={"synth": True}),
+        'A': schema.Class('A', bases=['Intermediate'], pragmas={"synth": schema.SynthInfo(on_arguments={'a': 'Base', 'i': 'int'})}),
+        'B': schema.Class('B', bases=['Base'], pragmas={"synth": schema.SynthInfo(from_class='Base')}),
         'C': schema.Class('C', bases=['Root']),
     }
 
@@ -635,7 +642,7 @@ def test_class_default_doc_name():
             pass
 
     assert data.classes == {
-        'A': schema.Class('A', default_doc_name="b"),
+        'A': schema.Class('A', pragmas={"ql_default_doc_name": "b"}),
     }
 
 
@@ -719,11 +726,11 @@ def test_hideable():
             pass
 
     assert data.classes == {
-        "Root": schema.Class("Root", derived={"A", "IndirectlyHideable", "NonHideable"}, hideable=True),
-        "A": schema.Class("A", bases=["Root"], derived={"B"}, hideable=True),
-        "IndirectlyHideable": schema.Class("IndirectlyHideable", bases=["Root"], derived={"B"}, hideable=True),
-        "B": schema.Class("B", bases=["A", "IndirectlyHideable"], hideable=True),
-        "NonHideable": schema.Class("NonHideable", bases=["Root"], hideable=False),
+        "Root": schema.Class("Root", derived={"A", "IndirectlyHideable", "NonHideable"}, pragmas=["ql_hideable"]),
+        "A": schema.Class("A", bases=["Root"], derived={"B"}, pragmas=["ql_hideable"]),
+        "IndirectlyHideable": schema.Class("IndirectlyHideable", bases=["Root"], derived={"B"}, pragmas=["ql_hideable"]),
+        "B": schema.Class("B", bases=["A", "IndirectlyHideable"], pragmas=["ql_hideable"]),
+        "NonHideable": schema.Class("NonHideable", bases=["Root"]),
     }
 
 
@@ -747,12 +754,213 @@ def test_test_with():
         class D(Root):
             pass
 
+        class E(B):
+            pass
+
     assert data.classes == {
         "Root": schema.Class("Root", derived=set("ABCD")),
         "A": schema.Class("A", bases=["Root"]),
-        "B": schema.Class("B", bases=["Root"], test_with="A"),
-        "C": schema.Class("C", bases=["Root"], test_with="D"),
+        "B": schema.Class("B", bases=["Root"], pragmas={"qltest_test_with": "A"}, derived={'E'}),
+        "C": schema.Class("C", bases=["Root"], pragmas={"qltest_test_with": "D"}),
         "D": schema.Class("D", bases=["Root"]),
+        "E": schema.Class("E", bases=["B"], pragmas={"qltest_test_with": "A"}),
+    }
+
+
+def test_annotate_docstring():
+    @load
+    class data:
+        class Root:
+            """ old docstring """
+
+        class A(Root):
+            """ A docstring """
+
+        @defs.annotate(Root)
+        class _:
+            """
+            new
+            docstring
+            """
+
+        @defs.annotate(A)
+        class _:
+            pass
+
+    assert data.classes == {
+        "Root": schema.Class("Root", doc=["new", "docstring"], derived={"A"}),
+        "A": schema.Class("A", bases=["Root"], doc=["A docstring"]),
+    }
+
+
+def test_annotate_decorations():
+    @load
+    class data:
+        @defs.qltest.skip
+        class Root:
+            pass
+
+        @defs.annotate(Root)
+        @defs.qltest.collapse_hierarchy
+        @defs.ql.hideable
+        @defs.cpp.skip
+        class _:
+            pass
+
+    assert data.classes == {
+        "Root": schema.Class("Root", pragmas=["qltest_skip", "cpp_skip", "ql_hideable", "qltest_collapse_hierarchy"]),
+    }
+
+
+def test_annotate_fields():
+    @load
+    class data:
+        class Root:
+            x: defs.int
+            y: defs.optional["Root"] | defs.child
+
+        @defs.annotate(Root)
+        class _:
+            x: defs._ | defs.doc("foo")
+            y: defs._ | defs.ql.internal
+            z: defs.string
+
+    assert data.classes == {
+        "Root": schema.Class("Root", properties=[
+            schema.SingleProperty("x", "int", doc="foo"),
+            schema.OptionalProperty("y", "Root", pragmas=["ql_internal"], is_child=True),
+            schema.SingleProperty("z", "string"),
+        ]),
+    }
+
+
+def test_annotate_fields_negations():
+    @load
+    class data:
+        class Root:
+            x: defs.int | defs.ql.internal | defs.qltest.skip
+            y: defs.optional["Root"] | defs.child | defs.desc("foo\nbar\n")
+            z: defs.string | defs.synth | defs.doc("foo")
+
+        @defs.annotate(Root)
+        class _:
+            x: defs._ | ~defs.ql.internal
+            y: defs._ | ~defs.child | ~defs.ql.internal | ~defs.desc
+            z: defs._ | ~defs.synth | ~defs.doc
+
+    assert data.classes == {
+        "Root": schema.Class("Root", properties=[
+            schema.SingleProperty("x", "int", pragmas=["qltest_skip"]),
+            schema.OptionalProperty("y", "Root"),
+            schema.SingleProperty("z", "string"),
+        ]),
+    }
+
+
+def test_annotate_non_existing_field():
+    with pytest.raises(schema.Error):
+        @load
+        class data:
+            class Root:
+                pass
+
+            @defs.annotate(Root)
+            class _:
+                x: defs._ | defs.doc("foo")
+
+
+def test_annotate_not_underscore():
+    with pytest.raises(schema.Error):
+        @load
+        class data:
+            class Root:
+                pass
+
+            @defs.annotate(Root)
+            class Something:
+                """
+                new
+                docstring
+                """
+
+
+def test_annotate_replace_bases():
+    @load
+    class data:
+        class Root:
+            pass
+
+        class A(Root):
+            pass
+
+        class B(Root):
+            pass
+
+        class C(B):
+            pass
+
+        class Derived(A, B):
+            pass
+
+        @defs.annotate(Derived, replace_bases={B: C})
+        class _:
+            pass
+    assert data.classes == {
+        "Root": schema.Class("Root", derived={"A", "B"}),
+        "A": schema.Class("A", bases=["Root"], derived={"Derived"}),
+        "B": schema.Class("B", bases=["Root"], derived={"C"}),
+        "C": schema.Class("C", bases=["B"], derived={"Derived"}),
+        "Derived": schema.Class("Derived", bases=["A", "C"]),
+    }
+
+
+def test_annotate_add_bases():
+    @load
+    class data:
+        class Root:
+            pass
+
+        class A(Root):
+            pass
+
+        class B(Root):
+            pass
+
+        class C(Root):
+            pass
+
+        class Derived(A):
+            pass
+
+        @defs.annotate(Derived, add_bases=(B, C))
+        class _:
+            pass
+    assert data.classes == {
+        "Root": schema.Class("Root", derived={"A", "B", "C"}),
+        "A": schema.Class("A", bases=["Root"], derived={"Derived"}),
+        "B": schema.Class("B", bases=["Root"], derived={"Derived"}),
+        "C": schema.Class("C", bases=["Root"], derived={"Derived"}),
+        "Derived": schema.Class("Derived", bases=["A", "B", "C"]),
+    }
+
+
+def test_annotate_drop_field():
+    @load
+    class data:
+        class Root:
+            x: defs.int
+            y: defs.string
+            z: defs.boolean
+
+        @defs.annotate(Root)
+        class _:
+            y: defs.drop
+
+    assert data.classes == {
+        "Root": schema.Class("Root", properties=[
+            schema.SingleProperty("x", "int"),
+            schema.SingleProperty("z", "boolean"),
+        ]),
     }
 
 
diff --git a/misc/ripunzip/install.sh b/misc/ripunzip/install.sh
index d9ee6dda1cb..d383381f0e2 100755
--- a/misc/ripunzip/install.sh
+++ b/misc/ripunzip/install.sh
@@ -2,7 +2,7 @@
 
 set -eu
 
-source misc/bazel/runfiles.sh 2>/dev/null || source external/ql~/misc/bazel/runfiles.sh
+source misc/bazel/runfiles.sh 2>/dev/null || source external/ql+/misc/bazel/runfiles.sh
 
 dest="${2:-$HOME/.local/bin}"
 
diff --git a/misc/scripts/accept-expected-changes-from-ci.py b/misc/scripts/accept-expected-changes-from-ci.py
index 26e31c1169e..9cf500671e6 100755
--- a/misc/scripts/accept-expected-changes-from-ci.py
+++ b/misc/scripts/accept-expected-changes-from-ci.py
@@ -196,15 +196,16 @@ class GithubStatus():
     target_url: str
     created_at: datetime
     nwo: str
-    job_id: int = None
+    job_ids: set = None
 
 
 def get_log_content(status: GithubStatus) -> str:
     LOGGER.debug(f"'{status.context}': Getting logs")
-    if status.job_id:
-        content = subprocess.check_output(
-            ["gh", "api", f"/repos/{status.nwo}/actions/jobs/{status.job_id}/logs"],
-        ).decode("utf-8")
+    if status.job_ids:
+        contents = [subprocess.check_output(
+            ["gh", "api", f"/repos/{status.nwo}/actions/jobs/{job_id}/logs"],
+        ).decode("utf-8") for job_id in status.job_ids]
+        content = "\n".join(contents)
     else:
         m = re.fullmatch(r"^https://github\.com/([^/]+/[^/]+)/actions/runs/(\d+)(?:/jobs/(\d+))?$", status.target_url)
         nwo = m.group(1)
@@ -301,8 +302,10 @@ def main(pr_number: Optional[int], sha_override: Optional[str] = None, force=Fal
                 api_name: str = job["name"]
 
                 if api_name.lower().startswith(expected_workflow_name.lower()):
-                    lang_test_failure.job_id = job["id"]
-                    break
+                    if lang_test_failure.job_ids is None:
+                        lang_test_failure.job_ids = set()
+                    lang_test_failure.job_ids.add(job["id"])
+                    continue
 
                 if " / " not in api_name:
                     continue
@@ -311,11 +314,11 @@ def main(pr_number: Optional[int], sha_override: Optional[str] = None, force=Fal
                 # The job names we're looking for looks like "Python2 Language Tests / Python2 Language Tests" or "Java Language Tests / Java Language Tests Linux"
                 # for "Java Integration Tests Linux / Java Integration tests Linux" we need to ignore case :|
                 if workflow_name == expected_workflow_name and job_name.lower().startswith(lang_test_failure.context.lower()):
-                    lang_test_failure.job_id = job["id"]
-                    break
+                    lang_test_failure.job_ids.add(job["id"])
+                    continue
 
     for lang_test_failure in lang_test_failures:
-        if lang_test_failure.job_id is None:
+        if lang_test_failure.job_ids is None:
             LOGGER.error(f"Could not find job for {lang_test_failure.context!r}")
             sys.exit(1)
 
@@ -370,7 +373,7 @@ def main(pr_number: Optional[int], sha_override: Optional[str] = None, force=Fal
                             target_url=job["html_url"],
                             created_at=check_run["completed_at"],
                             nwo=nwo,
-                            job_id=job["id"],
+                            job_ids={job["id"]},
                         ))
                         break
                 else:
diff --git a/misc/scripts/models-as-data/generate_flow_model.py b/misc/scripts/models-as-data/generate_flow_model.py
index 4d440725298..cfd524066cb 100644
--- a/misc/scripts/models-as-data/generate_flow_model.py
+++ b/misc/scripts/models-as-data/generate_flow_model.py
@@ -33,7 +33,8 @@ class Generator:
         self.generateSources = False
         self.generateSummaries = False
         self.generateNeutrals = False
-        self.generateContentSummaries = False
+        self.generateMixedSummaries = False
+        self.generateMixedNeutrals = False
         self.generateTypeBasedSummaries = False
         self.dryRun = False
         self.dirname = "modelgenerator"
@@ -51,7 +52,8 @@ Which models are generated is controlled by the flags:
     --with-sources
     --with-summaries
     --with-neutrals
-    --with-content-summaries (Experimental). May not be used in conjunction with --with-summaries
+    --with-mixed-summaries (Experimental). May not be used in conjunction with --with-summaries.
+    --with-mixed-neutrals (Experimental). Should only be used in conjunction with --with-mixed-summaries.
     --with-typebased-summaries (Experimental)
 If none of these flags are specified, all models are generated except for the type based models.
 
@@ -83,7 +85,7 @@ Requirements: `codeql` should both appear on your path.
             generator.printHelp()
             sys.exit(0)
 
-        if "--with-summaries" in sys.argv and "--with-content-summaries" in sys.argv:
+        if "--with-summaries" in sys.argv and "--with-mixed-summaries" in sys.argv:
             generator.printHelp()
             sys.exit(0)
 
@@ -103,9 +105,13 @@ Requirements: `codeql` should both appear on your path.
             sys.argv.remove("--with-neutrals")
             generator.generateNeutrals = True
 
-        if "--with-content-summaries" in sys.argv:
-            sys.argv.remove("--with-content-summaries")
-            generator.generateContentSummaries = True
+        if "--with-mixed-summaries" in sys.argv:
+            sys.argv.remove("--with-mixed-summaries")
+            generator.generateMixedSummaries = True
+
+        if "--with-mixed-neutrals" in sys.argv:
+            sys.argv.remove("--with-mixed-neutrals")
+            generator.generateMixedNeutrals = True
 
         if "--with-typebased-summaries" in sys.argv:
             sys.argv.remove("--with-typebased-summaries")
@@ -115,7 +121,13 @@ Requirements: `codeql` should both appear on your path.
             sys.argv.remove("--dry-run")
             generator.dryRun = True
 
-        if not generator.generateSinks and not generator.generateSources and not generator.generateSummaries and not generator.generateNeutrals and not generator.generateTypeBasedSummaries and not generator.generateContentSummaries:
+        if (not generator.generateSinks and
+           not generator.generateSources and
+           not generator.generateSummaries and
+           not generator.generateNeutrals and
+           not generator.generateTypeBasedSummaries and
+           not generator.generateMixedSummaries and
+           not generator.generateMixedNeutrals):
             generator.generateSinks = generator.generateSources = generator.generateSummaries = generator.generateNeutrals = True
 
         n = len(sys.argv)
@@ -173,12 +185,17 @@ Requirements: `codeql` should both appear on your path.
         else:
             neutralAddsTo = { }
 
-        if self.generateContentSummaries:
-            contentSummaryAddsTo = self.getAddsTo("CaptureContentSummaryModels.ql", helpers.summaryModelPredicate)
+        if self.generateMixedSummaries:
+            mixedSummaryAddsTo = self.getAddsTo("CaptureMixedSummaryModels.ql", helpers.summaryModelPredicate)
         else:
-            contentSummaryAddsTo = { }
+            mixedSummaryAddsTo = { }
 
-        return helpers.merge(summaryAddsTo, contentSummaryAddsTo, sinkAddsTo, sourceAddsTo, neutralAddsTo)
+        if self.generateMixedNeutrals:
+            mixedNeutralAddsTo = self.getAddsTo("CaptureMixedNeutralModels.ql", helpers.neutralModelPredicate)
+        else:
+            mixedNeutralAddsTo = { }
+
+        return helpers.merge(summaryAddsTo, mixedSummaryAddsTo, sinkAddsTo, sourceAddsTo, neutralAddsTo, mixedNeutralAddsTo)
 
     def makeTypeBasedContent(self):
         if self.generateTypeBasedSummaries:
@@ -208,7 +225,12 @@ extensions:
             print("Models as data extensions generated, but not written to file.")
             sys.exit(0)
         
-        if self.generateSinks or self.generateSources or self.generateSummaries or self.generateNeutrals:
+        if (self.generateSinks or
+           self.generateSources or
+           self.generateSummaries or
+           self.generateNeutrals or
+           self.generateMixedSummaries or
+           self.generatedMixedNeutrals):
             self.save(content, ".model.yml")
 
         if self.generateTypeBasedSummaries:
diff --git a/misc/suite-helpers/CHANGELOG.md b/misc/suite-helpers/CHANGELOG.md
index 1d5d3b7b386..0992e6bd9c5 100644
--- a/misc/suite-helpers/CHANGELOG.md
+++ b/misc/suite-helpers/CHANGELOG.md
@@ -1,3 +1,15 @@
+## 1.0.11
+
+No user-facing changes.
+
+## 1.0.10
+
+No user-facing changes.
+
+## 1.0.9
+
+No user-facing changes.
+
 ## 1.0.8
 
 No user-facing changes.
diff --git a/misc/suite-helpers/change-notes/released/1.0.10.md b/misc/suite-helpers/change-notes/released/1.0.10.md
new file mode 100644
index 00000000000..b601d878453
--- /dev/null
+++ b/misc/suite-helpers/change-notes/released/1.0.10.md
@@ -0,0 +1,3 @@
+## 1.0.10
+
+No user-facing changes.
diff --git a/misc/suite-helpers/change-notes/released/1.0.11.md b/misc/suite-helpers/change-notes/released/1.0.11.md
new file mode 100644
index 00000000000..245e0812108
--- /dev/null
+++ b/misc/suite-helpers/change-notes/released/1.0.11.md
@@ -0,0 +1,3 @@
+## 1.0.11
+
+No user-facing changes.
diff --git a/misc/suite-helpers/change-notes/released/1.0.9.md b/misc/suite-helpers/change-notes/released/1.0.9.md
new file mode 100644
index 00000000000..ee073f7ec16
--- /dev/null
+++ b/misc/suite-helpers/change-notes/released/1.0.9.md
@@ -0,0 +1,3 @@
+## 1.0.9
+
+No user-facing changes.
diff --git a/misc/suite-helpers/codeql-pack.release.yml b/misc/suite-helpers/codeql-pack.release.yml
index 5c55fbd52ed..56a2fb38872 100644
--- a/misc/suite-helpers/codeql-pack.release.yml
+++ b/misc/suite-helpers/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.0.8
+lastReleaseVersion: 1.0.11
diff --git a/misc/suite-helpers/qlpack.yml b/misc/suite-helpers/qlpack.yml
index a349dd3c6d2..f40fb8fcde4 100644
--- a/misc/suite-helpers/qlpack.yml
+++ b/misc/suite-helpers/qlpack.yml
@@ -1,4 +1,4 @@
 name: codeql/suite-helpers
-version: 1.0.9-dev
+version: 1.0.12-dev
 groups: shared
 warnOnImplicitThis: true
diff --git a/python/downgrades/5af903da088e3746aa283700a43a779302453523/old.dbscheme b/python/downgrades/5af903da088e3746aa283700a43a779302453523/old.dbscheme
new file mode 100644
index 00000000000..5af903da088
--- /dev/null
+++ b/python/downgrades/5af903da088e3746aa283700a43a779302453523/old.dbscheme
@@ -0,0 +1,1236 @@
+/*
+ *      This dbscheme is auto-generated by 'semmle/dbscheme_gen.py'.
+ *      WARNING: Any modifications to this file will be lost.
+ *      Relations can be changed by modifying master.py or
+ *      by adding rules to dbscheme.template
+ */
+
+/* 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.
+ *
+ * 2020-07-02
+ *
+ * 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.
+ */
+
+/*- DEPRECATED: External defects and metrics -*/
+
+externalDefects(
+  unique int id : @externalDefect,
+  varchar(900) queryPath : string ref,
+  int location : @location ref,
+  varchar(900) message : string ref,
+  float severity : float ref
+);
+
+externalMetrics(
+  unique int id : @externalMetric,
+  varchar(900) queryPath : string ref,
+  int location : @location ref,
+  float value : 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
+);
+
+/*- DEPRECATED: Snapshot date -*/
+
+snapshotDate(unique date snapshotDate : date ref);
+
+/*- Source location prefix -*/
+
+/**
+ * The source location of the snapshot.
+ */
+sourceLocationPrefix(string prefix : string ref);
+
+/*- DEPRECATED: Duplicate code -*/
+
+duplicateCode(
+  unique int id : @duplication,
+  string relativePath : string ref,
+  int equivClass : int ref
+);
+
+similarCode(
+  unique int id : @similarity,
+  string relativePath : string ref,
+  int equivClass : int ref
+);
+
+@duplication_or_similarity = @duplication | @similarity
+
+tokens(
+  int id : @duplication_or_similarity ref,
+  int offset : int ref,
+  int beginLine : int ref,
+  int beginColumn : int ref,
+  int endLine : int ref,
+  int endColumn : int ref
+);
+
+/*- DEPRECATED: Version control data -*/
+
+svnentries(
+  unique int id : @svnentry,
+  string revision : string ref,
+  string author : string ref,
+  date revisionDate : date ref,
+  int changeSize : int ref
+)
+
+svnaffectedfiles(
+  int id : @svnentry ref,
+  int file : @file ref,
+  string action : string ref
+)
+
+svnentrymsg(
+  unique int id : @svnentry ref,
+  string message : string ref
+)
+
+svnchurn(
+  int commit : @svnentry ref,
+  int file : @file ref,
+  int addedLines : int ref,
+  int deletedLines : int ref
+)
+
+/*- Lines of code -*/
+
+numlines(
+  int element_id: @sourceline ref,
+  int num_lines: int ref,
+  int num_code: int ref,
+  int num_comment: int 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
+);
+
+/*- 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;
+
+/*- 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;
+
+/*- Python dbscheme -*/
+
+/*
+ * Line metrics
+ */
+py_codelines(int id : @py_scope ref,
+             int count : int ref);
+
+py_commentlines(int id : @py_scope ref,
+                int count : int ref);
+
+py_docstringlines(int id : @py_scope ref,
+                int count : int ref);
+
+py_alllines(int id : @py_scope ref,
+                int count : int ref);
+
+/****************************
+        Python dbscheme
+****************************/
+
+@sourceline = @file | @py_Module | @xmllocatable;
+
+@location = @location_ast | @location_default ;
+
+locations_ast(unique int id: @location_ast,
+          int module: @py_Module ref,
+          int beginLine: int ref,
+          int beginColumn: int ref,
+          int endLine: int ref,
+          int endColumn: int ref);
+
+file_contents(unique int file: @file ref, string contents: string ref);
+
+py_module_path(int module: @py_Module ref, int file: @container ref);
+
+variable(unique int id : @py_variable,
+         int scope : @py_scope ref,
+         varchar(1) name : string ref);
+
+py_line_lengths(unique int id : @py_line,
+                int file: @py_Module ref,
+                int line : int ref,
+                int length : int ref);
+
+py_extracted_version(int module : @py_Module ref,
+                     varchar(1) version : string ref);
+
+/* AUTO GENERATED PART STARTS HERE */
+
+
+/* <Field> AnnAssign.location = 0, location */
+/* <Field> AnnAssign.value = 1, expr */
+/* <Field> AnnAssign.annotation = 2, expr */
+/* <Field> AnnAssign.target = 3, expr */
+
+/* <Field> Assert.location = 0, location */
+/* <Field> Assert.test = 1, expr */
+/* <Field> Assert.msg = 2, expr */
+
+/* <Field> Assign.location = 0, location */
+/* <Field> Assign.value = 1, expr */
+/* <Field> Assign.targets = 2, expr_list */
+
+/* <Field> AssignExpr.location = 0, location */
+/* <Field> AssignExpr.parenthesised = 1, bool */
+/* <Field> AssignExpr.value = 2, expr */
+/* <Field> AssignExpr.target = 3, expr */
+
+/* <Field> Attribute.location = 0, location */
+/* <Field> Attribute.parenthesised = 1, bool */
+/* <Field> Attribute.value = 2, expr */
+/* <Field> Attribute.attr = 3, str */
+/* <Field> Attribute.ctx = 4, expr_context */
+
+/* <Field> AugAssign.location = 0, location */
+/* <Field> AugAssign.operation = 1, BinOp */
+
+/* <Field> Await.location = 0, location */
+/* <Field> Await.parenthesised = 1, bool */
+/* <Field> Await.value = 2, expr */
+
+/* <Field> BinaryExpr.location = 0, location */
+/* <Field> BinaryExpr.parenthesised = 1, bool */
+/* <Field> BinaryExpr.left = 2, expr */
+/* <Field> BinaryExpr.op = 3, operator */
+/* <Field> BinaryExpr.right = 4, expr */
+/* <Parent> BinaryExpr = AugAssign  */
+
+/* <Field> BoolExpr.location = 0, location */
+/* <Field> BoolExpr.parenthesised = 1, bool */
+/* <Field> BoolExpr.op = 2, boolop */
+/* <Field> BoolExpr.values = 3, expr_list */
+
+/* <Field> Break.location = 0, location */
+
+/* <Field> Bytes.location = 0, location */
+/* <Field> Bytes.parenthesised = 1, bool */
+/* <Field> Bytes.s = 2, bytes */
+/* <Field> Bytes.prefix = 3, bytes */
+/* <Field> Bytes.implicitly_concatenated_parts = 4, StringPart_list */
+
+/* <Field> Call.location = 0, location */
+/* <Field> Call.parenthesised = 1, bool */
+/* <Field> Call.func = 2, expr */
+/* <Field> Call.positional_args = 3, expr_list */
+/* <Field> Call.named_args = 4, dict_item_list */
+
+/* <Field> Case.location = 0, location */
+/* <Field> Case.pattern = 1, pattern */
+/* <Field> Case.guard = 2, expr */
+/* <Field> Case.body = 3, stmt_list */
+
+/* <Field> Class.name = 0, str */
+/* <Field> Class.body = 1, stmt_list */
+/* <Parent> Class = ClassExpr  */
+
+/* <Field> ClassExpr.location = 0, location */
+/* <Field> ClassExpr.parenthesised = 1, bool */
+/* <Field> ClassExpr.name = 2, str */
+/* <Field> ClassExpr.bases = 3, expr_list */
+/* <Field> ClassExpr.keywords = 4, dict_item_list */
+/* <Field> ClassExpr.inner_scope = 5, Class */
+/* <Field> ClassExpr.type_parameters = 6, type_parameter_list */
+
+/* <Field> Compare.location = 0, location */
+/* <Field> Compare.parenthesised = 1, bool */
+/* <Field> Compare.left = 2, expr */
+/* <Field> Compare.ops = 3, cmpop_list */
+/* <Field> Compare.comparators = 4, expr_list */
+
+/* <Field> Continue.location = 0, location */
+
+/* <Field> Delete.location = 0, location */
+/* <Field> Delete.targets = 1, expr_list */
+
+/* <Field> Dict.location = 0, location */
+/* <Field> Dict.parenthesised = 1, bool */
+/* <Field> Dict.items = 2, dict_item_list */
+
+/* <Field> DictComp.location = 0, location */
+/* <Field> DictComp.parenthesised = 1, bool */
+/* <Field> DictComp.function = 2, Function */
+/* <Field> DictComp.iterable = 3, expr */
+
+/* <Field> DictUnpacking.location = 0, location */
+/* <Field> DictUnpacking.value = 1, expr */
+
+/* <Field> Ellipsis.location = 0, location */
+/* <Field> Ellipsis.parenthesised = 1, bool */
+
+/* <Field> ExceptGroupStmt.location = 0, location */
+/* <Field> ExceptGroupStmt.type = 1, expr */
+/* <Field> ExceptGroupStmt.name = 2, expr */
+/* <Field> ExceptGroupStmt.body = 3, stmt_list */
+
+/* <Field> ExceptStmt.location = 0, location */
+/* <Field> ExceptStmt.type = 1, expr */
+/* <Field> ExceptStmt.name = 2, expr */
+/* <Field> ExceptStmt.body = 3, stmt_list */
+
+/* <Field> Exec.location = 0, location */
+/* <Field> Exec.body = 1, expr */
+/* <Field> Exec.globals = 2, expr */
+/* <Field> Exec.locals = 3, expr */
+
+/* <Field> ExprStmt.location = 0, location */
+/* <Field> ExprStmt.value = 1, expr */
+
+/* <Field> Filter.location = 0, location */
+/* <Field> Filter.parenthesised = 1, bool */
+/* <Field> Filter.value = 2, expr */
+/* <Field> Filter.filter = 3, expr */
+
+/* <Field> For.location = 0, location */
+/* <Field> For.target = 1, expr */
+/* <Field> For.iter = 2, expr */
+/* <Field> For.body = 3, stmt_list */
+/* <Field> For.orelse = 4, stmt_list */
+/* <Field> For.is_async = 5, bool */
+
+/* <Field> FormattedValue.location = 0, location */
+/* <Field> FormattedValue.parenthesised = 1, bool */
+/* <Field> FormattedValue.value = 2, expr */
+/* <Field> FormattedValue.conversion = 3, str */
+/* <Field> FormattedValue.format_spec = 4, JoinedStr */
+
+/* <Field> Function.name = 0, str */
+/* <Field> Function.args = 1, parameter_list */
+/* <Field> Function.vararg = 2, expr */
+/* <Field> Function.kwonlyargs = 3, expr_list */
+/* <Field> Function.kwarg = 4, expr */
+/* <Field> Function.body = 5, stmt_list */
+/* <Field> Function.is_async = 6, bool */
+/* <Field> Function.type_parameters = 7, type_parameter_list */
+/* <Parent> Function = FunctionParent  */
+
+/* <Field> FunctionExpr.location = 0, location */
+/* <Field> FunctionExpr.parenthesised = 1, bool */
+/* <Field> FunctionExpr.name = 2, str */
+/* <Field> FunctionExpr.args = 3, arguments */
+/* <Field> FunctionExpr.returns = 4, expr */
+/* <Field> FunctionExpr.inner_scope = 5, Function */
+
+/* <Field> GeneratorExp.location = 0, location */
+/* <Field> GeneratorExp.parenthesised = 1, bool */
+/* <Field> GeneratorExp.function = 2, Function */
+/* <Field> GeneratorExp.iterable = 3, expr */
+
+/* <Field> Global.location = 0, location */
+/* <Field> Global.names = 1, str_list */
+
+/* <Field> Guard.location = 0, location */
+/* <Field> Guard.parenthesised = 1, bool */
+/* <Field> Guard.test = 2, expr */
+
+/* <Field> If.location = 0, location */
+/* <Field> If.test = 1, expr */
+/* <Field> If.body = 2, stmt_list */
+/* <Field> If.orelse = 3, stmt_list */
+
+/* <Field> IfExp.location = 0, location */
+/* <Field> IfExp.parenthesised = 1, bool */
+/* <Field> IfExp.test = 2, expr */
+/* <Field> IfExp.body = 3, expr */
+/* <Field> IfExp.orelse = 4, expr */
+
+/* <Field> Import.location = 0, location */
+/* <Field> Import.names = 1, alias_list */
+
+/* <Field> ImportExpr.location = 0, location */
+/* <Field> ImportExpr.parenthesised = 1, bool */
+/* <Field> ImportExpr.level = 2, int */
+/* <Field> ImportExpr.name = 3, str */
+/* <Field> ImportExpr.top = 4, bool */
+
+/* <Field> ImportStar.location = 0, location */
+/* <Field> ImportStar.module = 1, expr */
+
+/* <Field> ImportMember.location = 0, location */
+/* <Field> ImportMember.parenthesised = 1, bool */
+/* <Field> ImportMember.module = 2, expr */
+/* <Field> ImportMember.name = 3, str */
+
+/* <Field> Fstring.location = 0, location */
+/* <Field> Fstring.parenthesised = 1, bool */
+/* <Field> Fstring.values = 2, expr_list */
+/* <Parent> Fstring = FormattedValue  */
+
+/* <Field> KeyValuePair.location = 0, location */
+/* <Field> KeyValuePair.value = 1, expr */
+/* <Field> KeyValuePair.key = 2, expr */
+
+/* <Field> Lambda.location = 0, location */
+/* <Field> Lambda.parenthesised = 1, bool */
+/* <Field> Lambda.args = 2, arguments */
+/* <Field> Lambda.inner_scope = 3, Function */
+
+/* <Field> List.location = 0, location */
+/* <Field> List.parenthesised = 1, bool */
+/* <Field> List.elts = 2, expr_list */
+/* <Field> List.ctx = 3, expr_context */
+
+/* <Field> ListComp.location = 0, location */
+/* <Field> ListComp.parenthesised = 1, bool */
+/* <Field> ListComp.function = 2, Function */
+/* <Field> ListComp.iterable = 3, expr */
+/* <Field> ListComp.generators = 4, comprehension_list */
+/* <Field> ListComp.elt = 5, expr */
+
+/* <Field> MatchStmt.location = 0, location */
+/* <Field> MatchStmt.subject = 1, expr */
+/* <Field> MatchStmt.cases = 2, stmt_list */
+
+/* <Field> MatchAsPattern.location = 0, location */
+/* <Field> MatchAsPattern.parenthesised = 1, bool */
+/* <Field> MatchAsPattern.pattern = 2, pattern */
+/* <Field> MatchAsPattern.alias = 3, expr */
+
+/* <Field> MatchCapturePattern.location = 0, location */
+/* <Field> MatchCapturePattern.parenthesised = 1, bool */
+/* <Field> MatchCapturePattern.variable = 2, expr */
+
+/* <Field> MatchClassPattern.location = 0, location */
+/* <Field> MatchClassPattern.parenthesised = 1, bool */
+/* <Field> MatchClassPattern.class = 2, expr */
+/* <Field> MatchClassPattern.class_name = 3, expr */
+/* <Field> MatchClassPattern.positional = 4, pattern_list */
+/* <Field> MatchClassPattern.keyword = 5, pattern_list */
+
+/* <Field> MatchDoubleStarPattern.location = 0, location */
+/* <Field> MatchDoubleStarPattern.parenthesised = 1, bool */
+/* <Field> MatchDoubleStarPattern.target = 2, pattern */
+
+/* <Field> MatchKeyValuePattern.location = 0, location */
+/* <Field> MatchKeyValuePattern.parenthesised = 1, bool */
+/* <Field> MatchKeyValuePattern.key = 2, pattern */
+/* <Field> MatchKeyValuePattern.value = 3, pattern */
+
+/* <Field> MatchKeywordPattern.location = 0, location */
+/* <Field> MatchKeywordPattern.parenthesised = 1, bool */
+/* <Field> MatchKeywordPattern.attribute = 2, expr */
+/* <Field> MatchKeywordPattern.value = 3, pattern */
+
+/* <Field> MatchLiteralPattern.location = 0, location */
+/* <Field> MatchLiteralPattern.parenthesised = 1, bool */
+/* <Field> MatchLiteralPattern.literal = 2, expr */
+
+/* <Field> MatchMappingPattern.location = 0, location */
+/* <Field> MatchMappingPattern.parenthesised = 1, bool */
+/* <Field> MatchMappingPattern.mappings = 2, pattern_list */
+
+/* <Field> MatchOrPattern.location = 0, location */
+/* <Field> MatchOrPattern.parenthesised = 1, bool */
+/* <Field> MatchOrPattern.patterns = 2, pattern_list */
+
+/* <Field> MatchSequencePattern.location = 0, location */
+/* <Field> MatchSequencePattern.parenthesised = 1, bool */
+/* <Field> MatchSequencePattern.patterns = 2, pattern_list */
+
+/* <Field> MatchStarPattern.location = 0, location */
+/* <Field> MatchStarPattern.parenthesised = 1, bool */
+/* <Field> MatchStarPattern.target = 2, pattern */
+
+/* <Field> MatchValuePattern.location = 0, location */
+/* <Field> MatchValuePattern.parenthesised = 1, bool */
+/* <Field> MatchValuePattern.value = 2, expr */
+
+/* <Field> MatchWildcardPattern.location = 0, location */
+/* <Field> MatchWildcardPattern.parenthesised = 1, bool */
+
+/* <Field> Module.name = 0, str */
+/* <Field> Module.hash = 1, str */
+/* <Field> Module.body = 2, stmt_list */
+/* <Field> Module.kind = 3, str */
+
+/* <Field> Name.location = 0, location */
+/* <Field> Name.parenthesised = 1, bool */
+/* <Field> Name.variable = 2, variable */
+/* <Field> Name.ctx = 3, expr_context */
+/* <Parent> Name = ParameterList  */
+
+/* <Field> Nonlocal.location = 0, location */
+/* <Field> Nonlocal.names = 1, str_list */
+
+/* <Field> Num.location = 0, location */
+/* <Field> Num.parenthesised = 1, bool */
+/* <Field> Num.n = 2, number */
+/* <Field> Num.text = 3, number */
+
+/* <Field> ParamSpec.location = 0, location */
+/* <Field> ParamSpec.name = 1, expr */
+/* <Field> ParamSpec.default = 2, expr */
+
+/* <Field> Pass.location = 0, location */
+
+/* <Field> PlaceHolder.location = 0, location */
+/* <Field> PlaceHolder.parenthesised = 1, bool */
+/* <Field> PlaceHolder.variable = 2, variable */
+/* <Field> PlaceHolder.ctx = 3, expr_context */
+
+/* <Field> Print.location = 0, location */
+/* <Field> Print.dest = 1, expr */
+/* <Field> Print.values = 2, expr_list */
+/* <Field> Print.nl = 3, bool */
+
+/* <Field> Raise.location = 0, location */
+/* <Field> Raise.exc = 1, expr */
+/* <Field> Raise.cause = 2, expr */
+/* <Field> Raise.type = 3, expr */
+/* <Field> Raise.inst = 4, expr */
+/* <Field> Raise.tback = 5, expr */
+
+/* <Field> Repr.location = 0, location */
+/* <Field> Repr.parenthesised = 1, bool */
+/* <Field> Repr.value = 2, expr */
+
+/* <Field> Return.location = 0, location */
+/* <Field> Return.value = 1, expr */
+
+/* <Field> Set.location = 0, location */
+/* <Field> Set.parenthesised = 1, bool */
+/* <Field> Set.elts = 2, expr_list */
+
+/* <Field> SetComp.location = 0, location */
+/* <Field> SetComp.parenthesised = 1, bool */
+/* <Field> SetComp.function = 2, Function */
+/* <Field> SetComp.iterable = 3, expr */
+
+/* <Field> Slice.location = 0, location */
+/* <Field> Slice.parenthesised = 1, bool */
+/* <Field> Slice.start = 2, expr */
+/* <Field> Slice.stop = 3, expr */
+/* <Field> Slice.step = 4, expr */
+
+/* <Field> SpecialOperation.location = 0, location */
+/* <Field> SpecialOperation.parenthesised = 1, bool */
+/* <Field> SpecialOperation.name = 2, str */
+/* <Field> SpecialOperation.arguments = 3, expr_list */
+
+/* <Field> Starred.location = 0, location */
+/* <Field> Starred.parenthesised = 1, bool */
+/* <Field> Starred.value = 2, expr */
+/* <Field> Starred.ctx = 3, expr_context */
+
+/* <Field> Str.location = 0, location */
+/* <Field> Str.parenthesised = 1, bool */
+/* <Field> Str.s = 2, str */
+/* <Field> Str.prefix = 3, str */
+/* <Field> Str.implicitly_concatenated_parts = 4, StringPart_list */
+
+/* <Field> StringPart.text = 0, str */
+/* <Field> StringPart.location = 1, location */
+/* <Parent> StringPart = StringPartList  */
+/* <Parent> StringPartList = BytesOrStr  */
+
+/* <Field> Subscript.location = 0, location */
+/* <Field> Subscript.parenthesised = 1, bool */
+/* <Field> Subscript.value = 2, expr */
+/* <Field> Subscript.index = 3, expr */
+/* <Field> Subscript.ctx = 4, expr_context */
+
+/* <Field> TemplateDottedNotation.location = 0, location */
+/* <Field> TemplateDottedNotation.parenthesised = 1, bool */
+/* <Field> TemplateDottedNotation.value = 2, expr */
+/* <Field> TemplateDottedNotation.attr = 3, str */
+/* <Field> TemplateDottedNotation.ctx = 4, expr_context */
+
+/* <Field> TemplateWrite.location = 0, location */
+/* <Field> TemplateWrite.value = 1, expr */
+
+/* <Field> Try.location = 0, location */
+/* <Field> Try.body = 1, stmt_list */
+/* <Field> Try.orelse = 2, stmt_list */
+/* <Field> Try.handlers = 3, stmt_list */
+/* <Field> Try.finalbody = 4, stmt_list */
+
+/* <Field> Tuple.location = 0, location */
+/* <Field> Tuple.parenthesised = 1, bool */
+/* <Field> Tuple.elts = 2, expr_list */
+/* <Field> Tuple.ctx = 3, expr_context */
+/* <Parent> Tuple = ParameterList  */
+
+/* <Field> TypeAlias.location = 0, location */
+/* <Field> TypeAlias.name = 1, expr */
+/* <Field> TypeAlias.type_parameters = 2, type_parameter_list */
+/* <Field> TypeAlias.value = 3, expr */
+
+/* <Field> TypeVar.location = 0, location */
+/* <Field> TypeVar.name = 1, expr */
+/* <Field> TypeVar.bound = 2, expr */
+/* <Field> TypeVar.default = 3, expr */
+
+/* <Field> TypeVarTuple.location = 0, location */
+/* <Field> TypeVarTuple.name = 1, expr */
+/* <Field> TypeVarTuple.default = 2, expr */
+
+/* <Field> UnaryExpr.location = 0, location */
+/* <Field> UnaryExpr.parenthesised = 1, bool */
+/* <Field> UnaryExpr.op = 2, unaryop */
+/* <Field> UnaryExpr.operand = 3, expr */
+
+/* <Field> While.location = 0, location */
+/* <Field> While.test = 1, expr */
+/* <Field> While.body = 2, stmt_list */
+/* <Field> While.orelse = 3, stmt_list */
+
+/* <Field> With.location = 0, location */
+/* <Field> With.context_expr = 1, expr */
+/* <Field> With.optional_vars = 2, expr */
+/* <Field> With.body = 3, stmt_list */
+/* <Field> With.is_async = 4, bool */
+
+/* <Field> Yield.location = 0, location */
+/* <Field> Yield.parenthesised = 1, bool */
+/* <Field> Yield.value = 2, expr */
+
+/* <Field> YieldFrom.location = 0, location */
+/* <Field> YieldFrom.parenthesised = 1, bool */
+/* <Field> YieldFrom.value = 2, expr */
+
+/* <Field> Alias.value = 0, expr */
+/* <Field> Alias.asname = 1, expr */
+/* <Parent> Alias = AliasList  */
+/* <Parent> AliasList = Import  */
+
+/* <Field> Arguments.kw_defaults = 0, expr_list */
+/* <Field> Arguments.defaults = 1, expr_list */
+/* <Field> Arguments.annotations = 2, expr_list */
+/* <Field> Arguments.varargannotation = 3, expr */
+/* <Field> Arguments.kwargannotation = 4, expr */
+/* <Field> Arguments.kw_annotations = 5, expr_list */
+/* <Parent> Arguments = ArgumentsParent  */
+/* <Parent> boolean = BoolParent  */
+/* <Parent> Boolop = BoolExpr  */
+/* <Parent> string = Bytes  */
+/* <Parent> Cmpop = CmpopList  */
+/* <Parent> CmpopList = Compare  */
+
+/* <Field> Comprehension.location = 0, location */
+/* <Field> Comprehension.iter = 1, expr */
+/* <Field> Comprehension.target = 2, expr */
+/* <Field> Comprehension.ifs = 3, expr_list */
+/* <Parent> Comprehension = ComprehensionList  */
+/* <Parent> ComprehensionList = ListComp  */
+/* <Parent> DictItem = DictItemList  */
+/* <Parent> DictItemList = DictItemListParent  */
+
+/* <Field> Expr.location = 0, location */
+/* <Field> Expr.parenthesised = 1, bool */
+/* <Parent> Expr = ExprParent  */
+/* <Parent> ExprContext = ExprContextParent  */
+/* <Parent> ExprList = ExprListParent  */
+/* <Parent> int = ImportExpr  */
+
+/* <Field> Keyword.location = 0, location */
+/* <Field> Keyword.value = 1, expr */
+/* <Field> Keyword.arg = 2, str */
+/* <Parent> Location = LocationParent  */
+/* <Parent> string = Num  */
+/* <Parent> Operator = BinaryExpr  */
+/* <Parent> ParameterList = Function  */
+
+/* <Field> Pattern.location = 0, location */
+/* <Field> Pattern.parenthesised = 1, bool */
+/* <Parent> Pattern = PatternParent  */
+/* <Parent> PatternList = PatternListParent  */
+
+/* <Field> Stmt.location = 0, location */
+/* <Parent> Stmt = StmtList  */
+/* <Parent> StmtList = StmtListParent  */
+/* <Parent> string = StrParent  */
+/* <Parent> StringList = StrListParent  */
+
+/* <Field> TypeParameter.location = 0, location */
+/* <Parent> TypeParameter = TypeParameterList  */
+/* <Parent> TypeParameterList = TypeParameterListParent  */
+/* <Parent> Unaryop = UnaryExpr  */
+/* <Parent> Variable = VariableParent  */
+py_Classes(unique int id : @py_Class,
+    unique int parent : @py_ClassExpr ref);
+
+py_Functions(unique int id : @py_Function,
+    unique int parent : @py_Function_parent ref);
+
+py_Modules(unique int id : @py_Module);
+
+py_StringParts(unique int id : @py_StringPart,
+    int parent : @py_StringPart_list ref,
+    int idx : int ref);
+
+py_StringPart_lists(unique int id : @py_StringPart_list,
+    unique int parent : @py_Bytes_or_Str ref);
+
+py_aliases(unique int id : @py_alias,
+    int parent : @py_alias_list ref,
+    int idx : int ref);
+
+py_alias_lists(unique int id : @py_alias_list,
+    unique int parent : @py_Import ref);
+
+py_arguments(unique int id : @py_arguments,
+    unique int parent : @py_arguments_parent ref);
+
+py_bools(int parent : @py_bool_parent ref,
+    int idx : int ref);
+
+py_boolops(unique int id : @py_boolop,
+    int kind: int ref,
+    unique int parent : @py_BoolExpr ref);
+
+py_bytes(varchar(1) id : string ref,
+    int parent : @py_Bytes ref,
+    int idx : int ref);
+
+py_cmpops(unique int id : @py_cmpop,
+    int kind: int ref,
+    int parent : @py_cmpop_list ref,
+    int idx : int ref);
+
+py_cmpop_lists(unique int id : @py_cmpop_list,
+    unique int parent : @py_Compare ref);
+
+py_comprehensions(unique int id : @py_comprehension,
+    int parent : @py_comprehension_list ref,
+    int idx : int ref);
+
+py_comprehension_lists(unique int id : @py_comprehension_list,
+    unique int parent : @py_ListComp ref);
+
+py_dict_items(unique int id : @py_dict_item,
+    int kind: int ref,
+    int parent : @py_dict_item_list ref,
+    int idx : int ref);
+
+py_dict_item_lists(unique int id : @py_dict_item_list,
+    unique int parent : @py_dict_item_list_parent ref);
+
+py_exprs(unique int id : @py_expr,
+    int kind: int ref,
+    int parent : @py_expr_parent ref,
+    int idx : int ref);
+
+py_expr_contexts(unique int id : @py_expr_context,
+    int kind: int ref,
+    unique int parent : @py_expr_context_parent ref);
+
+py_expr_lists(unique int id : @py_expr_list,
+    int parent : @py_expr_list_parent ref,
+    int idx : int ref);
+
+py_ints(int id : int ref,
+    unique int parent : @py_ImportExpr ref);
+
+py_locations(unique int id : @location ref,
+    unique int parent : @py_location_parent ref);
+
+py_numbers(varchar(1) id : string ref,
+    int parent : @py_Num ref,
+    int idx : int ref);
+
+py_operators(unique int id : @py_operator,
+    int kind: int ref,
+    unique int parent : @py_BinaryExpr ref);
+
+py_parameter_lists(unique int id : @py_parameter_list,
+    unique int parent : @py_Function ref);
+
+py_patterns(unique int id : @py_pattern,
+    int kind: int ref,
+    int parent : @py_pattern_parent ref,
+    int idx : int ref);
+
+py_pattern_lists(unique int id : @py_pattern_list,
+    int parent : @py_pattern_list_parent ref,
+    int idx : int ref);
+
+py_stmts(unique int id : @py_stmt,
+    int kind: int ref,
+    int parent : @py_stmt_list ref,
+    int idx : int ref);
+
+py_stmt_lists(unique int id : @py_stmt_list,
+    int parent : @py_stmt_list_parent ref,
+    int idx : int ref);
+
+py_strs(varchar(1) id : string ref,
+    int parent : @py_str_parent ref,
+    int idx : int ref);
+
+py_str_lists(unique int id : @py_str_list,
+    unique int parent : @py_str_list_parent ref);
+
+py_type_parameters(unique int id : @py_type_parameter,
+    int kind: int ref,
+    int parent : @py_type_parameter_list ref,
+    int idx : int ref);
+
+py_type_parameter_lists(unique int id : @py_type_parameter_list,
+    unique int parent : @py_type_parameter_list_parent ref);
+
+py_unaryops(unique int id : @py_unaryop,
+    int kind: int ref,
+    unique int parent : @py_UnaryExpr ref);
+
+py_variables(int id : @py_variable ref,
+    unique int parent : @py_variable_parent ref);
+
+case @py_boolop.kind of
+    0 = @py_And
+|   1 = @py_Or;
+
+case @py_cmpop.kind of
+    0 = @py_Eq
+|   1 = @py_Gt
+|   2 = @py_GtE
+|   3 = @py_In
+|   4 = @py_Is
+|   5 = @py_IsNot
+|   6 = @py_Lt
+|   7 = @py_LtE
+|   8 = @py_NotEq
+|   9 = @py_NotIn;
+
+case @py_dict_item.kind of
+    0 = @py_DictUnpacking
+|   1 = @py_KeyValuePair
+|   2 = @py_keyword;
+
+case @py_expr.kind of
+    0 = @py_Attribute
+|   1 = @py_BinaryExpr
+|   2 = @py_BoolExpr
+|   3 = @py_Bytes
+|   4 = @py_Call
+|   5 = @py_ClassExpr
+|   6 = @py_Compare
+|   7 = @py_Dict
+|   8 = @py_DictComp
+|   9 = @py_Ellipsis
+|   10 = @py_FunctionExpr
+|   11 = @py_GeneratorExp
+|   12 = @py_IfExp
+|   13 = @py_ImportExpr
+|   14 = @py_ImportMember
+|   15 = @py_Lambda
+|   16 = @py_List
+|   17 = @py_ListComp
+|   18 = @py_Guard
+|   19 = @py_Name
+|   20 = @py_Num
+|   21 = @py_Repr
+|   22 = @py_Set
+|   23 = @py_SetComp
+|   24 = @py_Slice
+|   25 = @py_Starred
+|   26 = @py_Str
+|   27 = @py_Subscript
+|   28 = @py_Tuple
+|   29 = @py_UnaryExpr
+|   30 = @py_Yield
+|   31 = @py_YieldFrom
+|   32 = @py_TemplateDottedNotation
+|   33 = @py_Filter
+|   34 = @py_PlaceHolder
+|   35 = @py_Await
+|   36 = @py_Fstring
+|   37 = @py_FormattedValue
+|   38 = @py_AssignExpr
+|   39 = @py_SpecialOperation;
+
+case @py_expr_context.kind of
+    0 = @py_AugLoad
+|   1 = @py_AugStore
+|   2 = @py_Del
+|   3 = @py_Load
+|   4 = @py_Param
+|   5 = @py_Store;
+
+case @py_operator.kind of
+    0 = @py_Add
+|   1 = @py_BitAnd
+|   2 = @py_BitOr
+|   3 = @py_BitXor
+|   4 = @py_Div
+|   5 = @py_FloorDiv
+|   6 = @py_LShift
+|   7 = @py_Mod
+|   8 = @py_Mult
+|   9 = @py_Pow
+|   10 = @py_RShift
+|   11 = @py_Sub
+|   12 = @py_MatMult;
+
+case @py_pattern.kind of
+    0 = @py_MatchAsPattern
+|   1 = @py_MatchOrPattern
+|   2 = @py_MatchLiteralPattern
+|   3 = @py_MatchCapturePattern
+|   4 = @py_MatchWildcardPattern
+|   5 = @py_MatchValuePattern
+|   6 = @py_MatchSequencePattern
+|   7 = @py_MatchStarPattern
+|   8 = @py_MatchMappingPattern
+|   9 = @py_MatchDoubleStarPattern
+|   10 = @py_MatchKeyValuePattern
+|   11 = @py_MatchClassPattern
+|   12 = @py_MatchKeywordPattern;
+
+case @py_stmt.kind of
+    0 = @py_Assert
+|   1 = @py_Assign
+|   2 = @py_AugAssign
+|   3 = @py_Break
+|   4 = @py_Continue
+|   5 = @py_Delete
+|   6 = @py_ExceptStmt
+|   7 = @py_ExceptGroupStmt
+|   8 = @py_Exec
+|   9 = @py_Expr_stmt
+|   10 = @py_For
+|   11 = @py_Global
+|   12 = @py_If
+|   13 = @py_Import
+|   14 = @py_ImportStar
+|   15 = @py_MatchStmt
+|   16 = @py_Case
+|   17 = @py_Nonlocal
+|   18 = @py_Pass
+|   19 = @py_Print
+|   20 = @py_Raise
+|   21 = @py_Return
+|   22 = @py_Try
+|   23 = @py_While
+|   24 = @py_With
+|   25 = @py_TemplateWrite
+|   26 = @py_AnnAssign
+|   27 = @py_TypeAlias;
+
+case @py_type_parameter.kind of
+    0 = @py_ParamSpec
+|   1 = @py_TypeVar
+|   2 = @py_TypeVarTuple;
+
+case @py_unaryop.kind of
+    0 = @py_Invert
+|   1 = @py_Not
+|   2 = @py_UAdd
+|   3 = @py_USub;
+
+@py_Bytes_or_Str = @py_Bytes | @py_Str;
+
+@py_Function_parent = @py_DictComp | @py_FunctionExpr | @py_GeneratorExp | @py_Lambda | @py_ListComp | @py_SetComp;
+
+@py_arguments_parent = @py_FunctionExpr | @py_Lambda;
+
+@py_ast_node = @py_Class | @py_Function | @py_Module | @py_StringPart | @py_comprehension | @py_dict_item | @py_expr | @py_pattern | @py_stmt | @py_type_parameter;
+
+@py_bool_parent = @py_For | @py_Function | @py_Print | @py_With | @py_expr | @py_pattern;
+
+@py_dict_item_list_parent = @py_Call | @py_ClassExpr | @py_Dict;
+
+@py_expr_context_parent = @py_Attribute | @py_List | @py_Name | @py_PlaceHolder | @py_Starred | @py_Subscript | @py_TemplateDottedNotation | @py_Tuple;
+
+@py_expr_list_parent = @py_Assign | @py_BoolExpr | @py_Call | @py_ClassExpr | @py_Compare | @py_Delete | @py_Fstring | @py_Function | @py_List | @py_Print | @py_Set | @py_SpecialOperation | @py_Tuple | @py_arguments | @py_comprehension;
+
+@py_expr_or_stmt = @py_expr | @py_stmt;
+
+@py_expr_parent = @py_AnnAssign | @py_Assert | @py_Assign | @py_AssignExpr | @py_Attribute | @py_AugAssign | @py_Await | @py_BinaryExpr | @py_Call | @py_Case | @py_Compare | @py_DictComp | @py_DictUnpacking | @py_ExceptGroupStmt | @py_ExceptStmt | @py_Exec | @py_Expr_stmt | @py_Filter | @py_For | @py_FormattedValue | @py_Function | @py_FunctionExpr | @py_GeneratorExp | @py_Guard | @py_If | @py_IfExp | @py_ImportMember | @py_ImportStar | @py_KeyValuePair | @py_ListComp | @py_MatchAsPattern | @py_MatchCapturePattern | @py_MatchClassPattern | @py_MatchKeywordPattern | @py_MatchLiteralPattern | @py_MatchStmt | @py_MatchValuePattern | @py_ParamSpec | @py_Print | @py_Raise | @py_Repr | @py_Return | @py_SetComp | @py_Slice | @py_Starred | @py_Subscript | @py_TemplateDottedNotation | @py_TemplateWrite | @py_TypeAlias | @py_TypeVar | @py_TypeVarTuple | @py_UnaryExpr | @py_While | @py_With | @py_Yield | @py_YieldFrom | @py_alias | @py_arguments | @py_comprehension | @py_expr_list | @py_keyword | @py_parameter_list;
+
+@py_location_parent = @py_DictUnpacking | @py_KeyValuePair | @py_StringPart | @py_comprehension | @py_expr | @py_keyword | @py_pattern | @py_stmt | @py_type_parameter;
+
+@py_parameter = @py_Name | @py_Tuple;
+
+@py_pattern_list_parent = @py_MatchClassPattern | @py_MatchMappingPattern | @py_MatchOrPattern | @py_MatchSequencePattern;
+
+@py_pattern_parent = @py_Case | @py_MatchAsPattern | @py_MatchDoubleStarPattern | @py_MatchKeyValuePattern | @py_MatchKeywordPattern | @py_MatchStarPattern | @py_pattern_list;
+
+@py_scope = @py_Class | @py_Function | @py_Module;
+
+@py_stmt_list_parent = @py_Case | @py_Class | @py_ExceptGroupStmt | @py_ExceptStmt | @py_For | @py_Function | @py_If | @py_MatchStmt | @py_Module | @py_Try | @py_While | @py_With;
+
+@py_str_list_parent = @py_Global | @py_Nonlocal;
+
+@py_str_parent = @py_Attribute | @py_Class | @py_ClassExpr | @py_FormattedValue | @py_Function | @py_FunctionExpr | @py_ImportExpr | @py_ImportMember | @py_Module | @py_SpecialOperation | @py_Str | @py_StringPart | @py_TemplateDottedNotation | @py_keyword | @py_str_list;
+
+@py_type_parameter_list_parent = @py_ClassExpr | @py_Function | @py_TypeAlias;
+
+@py_variable_parent = @py_Name | @py_PlaceHolder;
+
+
+/*
+ * End of auto-generated part
+ */
+
+
+
+/* Map relative names to absolute names for imports */
+py_absolute_names(int module : @py_Module ref,
+                  varchar(1) relname : string ref,
+                  varchar(1) absname : string ref);
+
+py_exports(int id : @py_Module ref,
+           varchar(1) name : string ref);
+
+/* Successor information */
+py_successors(int predecessor : @py_flow_node ref,
+              int successor : @py_flow_node ref);
+
+py_true_successors(int predecessor : @py_flow_node ref,
+              int successor : @py_flow_node ref);
+
+py_exception_successors(int predecessor : @py_flow_node ref,
+              int successor : @py_flow_node ref);
+
+py_false_successors(int predecessor : @py_flow_node ref,
+              int successor : @py_flow_node ref);
+
+py_flow_bb_node(unique int flownode : @py_flow_node,
+             int realnode : @py_ast_node ref,
+             int basicblock : @py_flow_node ref,
+             int index : int ref);
+
+py_scope_flow(int flow : @py_flow_node ref,
+              int scope : @py_scope ref,
+              int kind : int ref);
+
+py_idoms(unique int node : @py_flow_node ref,
+         int immediate_dominator : @py_flow_node ref);
+
+py_ssa_phi(int phi : @py_ssa_var ref,
+           int arg: @py_ssa_var ref);
+
+py_ssa_var(unique int id : @py_ssa_var,
+            int var : @py_variable ref);
+
+py_ssa_use(int node: @py_flow_node ref,
+           int var : @py_ssa_var ref);
+
+py_ssa_defn(unique int id : @py_ssa_var ref,
+                  int node: @py_flow_node ref);
+
+@py_base_var = @py_variable | @py_ssa_var;
+
+py_scopes(unique int node : @py_expr_or_stmt ref,
+         int scope : @py_scope ref);
+
+py_scope_location(unique int id : @location ref,
+                   unique int scope : @py_scope ref);
+
+py_flags_versioned(varchar(1) name : string ref,
+                   varchar(1) value : string ref,
+                   varchar(1) version : string ref);
+
+py_syntax_error_versioned(unique int id : @location ref,
+                varchar(1) message : string ref,
+                varchar(1) version : string ref);
+
+py_comments(unique int id : @py_comment,
+           varchar(1) text : string ref,
+           unique int location : @location ref);
+
+/* Type information support */
+
+py_cobjects(unique int obj : @py_cobject);
+
+py_cobjecttypes(unique int obj : @py_cobject ref,
+                int typeof : @py_cobject ref);
+
+py_cobjectnames(unique int obj : @py_cobject ref,
+                varchar(1) name : string ref);
+
+/* Kind should be 0 for introspection, > 0 from source, as follows:
+   1 from C extension source
+ */
+py_cobject_sources(int obj : @py_cobject ref,
+                  int kind : int ref);
+
+py_cmembers_versioned(int object : @py_cobject ref,
+                      varchar(1) name : string ref,
+                      int member : @py_cobject ref,
+                      varchar(1) version : string ref);
+
+py_citems(int object : @py_cobject ref,
+            int index : int ref,
+            int member : @py_cobject ref);
+
+ext_argtype(int funcid : @py_object ref,
+            int arg : int ref,
+            int typeid : @py_object ref);
+
+ext_rettype(int funcid : @py_object ref,
+            int typeid : @py_object ref);
+
+ext_proptype(int propid : @py_object ref,
+             int typeid : @py_object ref);
+
+ext_argreturn(int funcid : @py_object ref,
+              int arg : int ref);
+
+py_special_objects(unique int obj : @py_cobject ref,
+                   unique varchar(1) name : string ref);
+
+py_decorated_object(int object : @py_object ref,
+                    int level: int ref);
+
+@py_object = @py_cobject | @py_flow_node;
+
+@py_source_element = @py_ast_node | @container;
diff --git a/python/downgrades/5af903da088e3746aa283700a43a779302453523/py_exprs.ql b/python/downgrades/5af903da088e3746aa283700a43a779302453523/py_exprs.ql
new file mode 100644
index 00000000000..567ceec31ca
--- /dev/null
+++ b/python/downgrades/5af903da088e3746aa283700a43a779302453523/py_exprs.ql
@@ -0,0 +1,42 @@
+// We must wrap the DB types, as these cannot appear in argument lists
+class TypeParameter_ extends @py_type_parameter {
+  string toString() { result = "TypeParameter" }
+}
+
+class Expr_ extends @py_expr {
+  string toString() { result = "Expr" }
+}
+
+class ExprParent_ extends @py_expr_parent {
+  string toString() { result = "ExprParent" }
+}
+
+class TypeVar_ extends @py_TypeVar, TypeParameter_ {
+  override string toString() { result = "TypeVar" }
+}
+
+class TypeVarTuple_ extends @py_TypeVarTuple, TypeParameter_ {
+  override string toString() { result = "TypeVarTuple" }
+}
+
+class ParamSpec_ extends @py_ParamSpec, TypeParameter_ {
+  override string toString() { result = "ParamSpec" }
+}
+
+// From the dbscheme:
+// py_exprs(unique int id : @py_expr,
+//    int kind: int ref,
+//    int parent : @py_expr_parent ref,
+//    int idx : int ref);
+query predicate py_exprs_without_type_parameter_defaults(
+  Expr_ id, int kind, ExprParent_ parent, int idx
+) {
+  py_exprs(id, kind, parent, idx) and
+  // From the dbscheme
+  // /* <Field> ParamSpec.default = 2, expr */
+  // /* <Field> TypeVar.default = 3, expr */
+  // /* <Field> TypeVarTuple.default = 2, expr */
+  (parent instanceof ParamSpec_ implies idx != 2) and
+  (parent instanceof TypeVar_ implies idx != 3) and
+  (parent instanceof TypeVarTuple_ implies idx != 2)
+}
diff --git a/python/downgrades/5af903da088e3746aa283700a43a779302453523/semmlecode.python.dbscheme b/python/downgrades/5af903da088e3746aa283700a43a779302453523/semmlecode.python.dbscheme
new file mode 100644
index 00000000000..728c6d65e61
--- /dev/null
+++ b/python/downgrades/5af903da088e3746aa283700a43a779302453523/semmlecode.python.dbscheme
@@ -0,0 +1,1233 @@
+/*
+ *      This dbscheme is auto-generated by 'semmle/dbscheme_gen.py'.
+ *      WARNING: Any modifications to this file will be lost.
+ *      Relations can be changed by modifying master.py or
+ *      by adding rules to dbscheme.template
+ */
+
+/* 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.
+ *
+ * 2020-07-02
+ *
+ * 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.
+ */
+
+/*- DEPRECATED: External defects and metrics -*/
+
+externalDefects(
+  unique int id : @externalDefect,
+  varchar(900) queryPath : string ref,
+  int location : @location ref,
+  varchar(900) message : string ref,
+  float severity : float ref
+);
+
+externalMetrics(
+  unique int id : @externalMetric,
+  varchar(900) queryPath : string ref,
+  int location : @location ref,
+  float value : 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
+);
+
+/*- DEPRECATED: Snapshot date -*/
+
+snapshotDate(unique date snapshotDate : date ref);
+
+/*- Source location prefix -*/
+
+/**
+ * The source location of the snapshot.
+ */
+sourceLocationPrefix(string prefix : string ref);
+
+/*- DEPRECATED: Duplicate code -*/
+
+duplicateCode(
+  unique int id : @duplication,
+  string relativePath : string ref,
+  int equivClass : int ref
+);
+
+similarCode(
+  unique int id : @similarity,
+  string relativePath : string ref,
+  int equivClass : int ref
+);
+
+@duplication_or_similarity = @duplication | @similarity
+
+tokens(
+  int id : @duplication_or_similarity ref,
+  int offset : int ref,
+  int beginLine : int ref,
+  int beginColumn : int ref,
+  int endLine : int ref,
+  int endColumn : int ref
+);
+
+/*- DEPRECATED: Version control data -*/
+
+svnentries(
+  unique int id : @svnentry,
+  string revision : string ref,
+  string author : string ref,
+  date revisionDate : date ref,
+  int changeSize : int ref
+)
+
+svnaffectedfiles(
+  int id : @svnentry ref,
+  int file : @file ref,
+  string action : string ref
+)
+
+svnentrymsg(
+  unique int id : @svnentry ref,
+  string message : string ref
+)
+
+svnchurn(
+  int commit : @svnentry ref,
+  int file : @file ref,
+  int addedLines : int ref,
+  int deletedLines : int ref
+)
+
+/*- Lines of code -*/
+
+numlines(
+  int element_id: @sourceline ref,
+  int num_lines: int ref,
+  int num_code: int ref,
+  int num_comment: int 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
+);
+
+/*- 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;
+
+/*- 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;
+
+/*- Python dbscheme -*/
+
+/*
+ * Line metrics
+ */
+py_codelines(int id : @py_scope ref,
+             int count : int ref);
+
+py_commentlines(int id : @py_scope ref,
+                int count : int ref);
+
+py_docstringlines(int id : @py_scope ref,
+                int count : int ref);
+
+py_alllines(int id : @py_scope ref,
+                int count : int ref);
+
+/****************************
+        Python dbscheme
+****************************/
+
+@sourceline = @file | @py_Module | @xmllocatable;
+
+@location = @location_ast | @location_default ;
+
+locations_ast(unique int id: @location_ast,
+          int module: @py_Module ref,
+          int beginLine: int ref,
+          int beginColumn: int ref,
+          int endLine: int ref,
+          int endColumn: int ref);
+
+file_contents(unique int file: @file ref, string contents: string ref);
+
+py_module_path(int module: @py_Module ref, int file: @container ref);
+
+variable(unique int id : @py_variable,
+         int scope : @py_scope ref,
+         varchar(1) name : string ref);
+
+py_line_lengths(unique int id : @py_line,
+                int file: @py_Module ref,
+                int line : int ref,
+                int length : int ref);
+
+py_extracted_version(int module : @py_Module ref,
+                     varchar(1) version : string ref);
+
+/* AUTO GENERATED PART STARTS HERE */
+
+
+/* <Field> AnnAssign.location = 0, location */
+/* <Field> AnnAssign.value = 1, expr */
+/* <Field> AnnAssign.annotation = 2, expr */
+/* <Field> AnnAssign.target = 3, expr */
+
+/* <Field> Assert.location = 0, location */
+/* <Field> Assert.test = 1, expr */
+/* <Field> Assert.msg = 2, expr */
+
+/* <Field> Assign.location = 0, location */
+/* <Field> Assign.value = 1, expr */
+/* <Field> Assign.targets = 2, expr_list */
+
+/* <Field> AssignExpr.location = 0, location */
+/* <Field> AssignExpr.parenthesised = 1, bool */
+/* <Field> AssignExpr.value = 2, expr */
+/* <Field> AssignExpr.target = 3, expr */
+
+/* <Field> Attribute.location = 0, location */
+/* <Field> Attribute.parenthesised = 1, bool */
+/* <Field> Attribute.value = 2, expr */
+/* <Field> Attribute.attr = 3, str */
+/* <Field> Attribute.ctx = 4, expr_context */
+
+/* <Field> AugAssign.location = 0, location */
+/* <Field> AugAssign.operation = 1, BinOp */
+
+/* <Field> Await.location = 0, location */
+/* <Field> Await.parenthesised = 1, bool */
+/* <Field> Await.value = 2, expr */
+
+/* <Field> BinaryExpr.location = 0, location */
+/* <Field> BinaryExpr.parenthesised = 1, bool */
+/* <Field> BinaryExpr.left = 2, expr */
+/* <Field> BinaryExpr.op = 3, operator */
+/* <Field> BinaryExpr.right = 4, expr */
+/* <Parent> BinaryExpr = AugAssign  */
+
+/* <Field> BoolExpr.location = 0, location */
+/* <Field> BoolExpr.parenthesised = 1, bool */
+/* <Field> BoolExpr.op = 2, boolop */
+/* <Field> BoolExpr.values = 3, expr_list */
+
+/* <Field> Break.location = 0, location */
+
+/* <Field> Bytes.location = 0, location */
+/* <Field> Bytes.parenthesised = 1, bool */
+/* <Field> Bytes.s = 2, bytes */
+/* <Field> Bytes.prefix = 3, bytes */
+/* <Field> Bytes.implicitly_concatenated_parts = 4, StringPart_list */
+
+/* <Field> Call.location = 0, location */
+/* <Field> Call.parenthesised = 1, bool */
+/* <Field> Call.func = 2, expr */
+/* <Field> Call.positional_args = 3, expr_list */
+/* <Field> Call.named_args = 4, dict_item_list */
+
+/* <Field> Case.location = 0, location */
+/* <Field> Case.pattern = 1, pattern */
+/* <Field> Case.guard = 2, expr */
+/* <Field> Case.body = 3, stmt_list */
+
+/* <Field> Class.name = 0, str */
+/* <Field> Class.body = 1, stmt_list */
+/* <Parent> Class = ClassExpr  */
+
+/* <Field> ClassExpr.location = 0, location */
+/* <Field> ClassExpr.parenthesised = 1, bool */
+/* <Field> ClassExpr.name = 2, str */
+/* <Field> ClassExpr.bases = 3, expr_list */
+/* <Field> ClassExpr.keywords = 4, dict_item_list */
+/* <Field> ClassExpr.inner_scope = 5, Class */
+/* <Field> ClassExpr.type_parameters = 6, type_parameter_list */
+
+/* <Field> Compare.location = 0, location */
+/* <Field> Compare.parenthesised = 1, bool */
+/* <Field> Compare.left = 2, expr */
+/* <Field> Compare.ops = 3, cmpop_list */
+/* <Field> Compare.comparators = 4, expr_list */
+
+/* <Field> Continue.location = 0, location */
+
+/* <Field> Delete.location = 0, location */
+/* <Field> Delete.targets = 1, expr_list */
+
+/* <Field> Dict.location = 0, location */
+/* <Field> Dict.parenthesised = 1, bool */
+/* <Field> Dict.items = 2, dict_item_list */
+
+/* <Field> DictComp.location = 0, location */
+/* <Field> DictComp.parenthesised = 1, bool */
+/* <Field> DictComp.function = 2, Function */
+/* <Field> DictComp.iterable = 3, expr */
+
+/* <Field> DictUnpacking.location = 0, location */
+/* <Field> DictUnpacking.value = 1, expr */
+
+/* <Field> Ellipsis.location = 0, location */
+/* <Field> Ellipsis.parenthesised = 1, bool */
+
+/* <Field> ExceptGroupStmt.location = 0, location */
+/* <Field> ExceptGroupStmt.type = 1, expr */
+/* <Field> ExceptGroupStmt.name = 2, expr */
+/* <Field> ExceptGroupStmt.body = 3, stmt_list */
+
+/* <Field> ExceptStmt.location = 0, location */
+/* <Field> ExceptStmt.type = 1, expr */
+/* <Field> ExceptStmt.name = 2, expr */
+/* <Field> ExceptStmt.body = 3, stmt_list */
+
+/* <Field> Exec.location = 0, location */
+/* <Field> Exec.body = 1, expr */
+/* <Field> Exec.globals = 2, expr */
+/* <Field> Exec.locals = 3, expr */
+
+/* <Field> ExprStmt.location = 0, location */
+/* <Field> ExprStmt.value = 1, expr */
+
+/* <Field> Filter.location = 0, location */
+/* <Field> Filter.parenthesised = 1, bool */
+/* <Field> Filter.value = 2, expr */
+/* <Field> Filter.filter = 3, expr */
+
+/* <Field> For.location = 0, location */
+/* <Field> For.target = 1, expr */
+/* <Field> For.iter = 2, expr */
+/* <Field> For.body = 3, stmt_list */
+/* <Field> For.orelse = 4, stmt_list */
+/* <Field> For.is_async = 5, bool */
+
+/* <Field> FormattedValue.location = 0, location */
+/* <Field> FormattedValue.parenthesised = 1, bool */
+/* <Field> FormattedValue.value = 2, expr */
+/* <Field> FormattedValue.conversion = 3, str */
+/* <Field> FormattedValue.format_spec = 4, JoinedStr */
+
+/* <Field> Function.name = 0, str */
+/* <Field> Function.args = 1, parameter_list */
+/* <Field> Function.vararg = 2, expr */
+/* <Field> Function.kwonlyargs = 3, expr_list */
+/* <Field> Function.kwarg = 4, expr */
+/* <Field> Function.body = 5, stmt_list */
+/* <Field> Function.is_async = 6, bool */
+/* <Field> Function.type_parameters = 7, type_parameter_list */
+/* <Parent> Function = FunctionParent  */
+
+/* <Field> FunctionExpr.location = 0, location */
+/* <Field> FunctionExpr.parenthesised = 1, bool */
+/* <Field> FunctionExpr.name = 2, str */
+/* <Field> FunctionExpr.args = 3, arguments */
+/* <Field> FunctionExpr.returns = 4, expr */
+/* <Field> FunctionExpr.inner_scope = 5, Function */
+
+/* <Field> GeneratorExp.location = 0, location */
+/* <Field> GeneratorExp.parenthesised = 1, bool */
+/* <Field> GeneratorExp.function = 2, Function */
+/* <Field> GeneratorExp.iterable = 3, expr */
+
+/* <Field> Global.location = 0, location */
+/* <Field> Global.names = 1, str_list */
+
+/* <Field> Guard.location = 0, location */
+/* <Field> Guard.parenthesised = 1, bool */
+/* <Field> Guard.test = 2, expr */
+
+/* <Field> If.location = 0, location */
+/* <Field> If.test = 1, expr */
+/* <Field> If.body = 2, stmt_list */
+/* <Field> If.orelse = 3, stmt_list */
+
+/* <Field> IfExp.location = 0, location */
+/* <Field> IfExp.parenthesised = 1, bool */
+/* <Field> IfExp.test = 2, expr */
+/* <Field> IfExp.body = 3, expr */
+/* <Field> IfExp.orelse = 4, expr */
+
+/* <Field> Import.location = 0, location */
+/* <Field> Import.names = 1, alias_list */
+
+/* <Field> ImportExpr.location = 0, location */
+/* <Field> ImportExpr.parenthesised = 1, bool */
+/* <Field> ImportExpr.level = 2, int */
+/* <Field> ImportExpr.name = 3, str */
+/* <Field> ImportExpr.top = 4, bool */
+
+/* <Field> ImportStar.location = 0, location */
+/* <Field> ImportStar.module = 1, expr */
+
+/* <Field> ImportMember.location = 0, location */
+/* <Field> ImportMember.parenthesised = 1, bool */
+/* <Field> ImportMember.module = 2, expr */
+/* <Field> ImportMember.name = 3, str */
+
+/* <Field> Fstring.location = 0, location */
+/* <Field> Fstring.parenthesised = 1, bool */
+/* <Field> Fstring.values = 2, expr_list */
+/* <Parent> Fstring = FormattedValue  */
+
+/* <Field> KeyValuePair.location = 0, location */
+/* <Field> KeyValuePair.value = 1, expr */
+/* <Field> KeyValuePair.key = 2, expr */
+
+/* <Field> Lambda.location = 0, location */
+/* <Field> Lambda.parenthesised = 1, bool */
+/* <Field> Lambda.args = 2, arguments */
+/* <Field> Lambda.inner_scope = 3, Function */
+
+/* <Field> List.location = 0, location */
+/* <Field> List.parenthesised = 1, bool */
+/* <Field> List.elts = 2, expr_list */
+/* <Field> List.ctx = 3, expr_context */
+
+/* <Field> ListComp.location = 0, location */
+/* <Field> ListComp.parenthesised = 1, bool */
+/* <Field> ListComp.function = 2, Function */
+/* <Field> ListComp.iterable = 3, expr */
+/* <Field> ListComp.generators = 4, comprehension_list */
+/* <Field> ListComp.elt = 5, expr */
+
+/* <Field> MatchStmt.location = 0, location */
+/* <Field> MatchStmt.subject = 1, expr */
+/* <Field> MatchStmt.cases = 2, stmt_list */
+
+/* <Field> MatchAsPattern.location = 0, location */
+/* <Field> MatchAsPattern.parenthesised = 1, bool */
+/* <Field> MatchAsPattern.pattern = 2, pattern */
+/* <Field> MatchAsPattern.alias = 3, expr */
+
+/* <Field> MatchCapturePattern.location = 0, location */
+/* <Field> MatchCapturePattern.parenthesised = 1, bool */
+/* <Field> MatchCapturePattern.variable = 2, expr */
+
+/* <Field> MatchClassPattern.location = 0, location */
+/* <Field> MatchClassPattern.parenthesised = 1, bool */
+/* <Field> MatchClassPattern.class = 2, expr */
+/* <Field> MatchClassPattern.class_name = 3, expr */
+/* <Field> MatchClassPattern.positional = 4, pattern_list */
+/* <Field> MatchClassPattern.keyword = 5, pattern_list */
+
+/* <Field> MatchDoubleStarPattern.location = 0, location */
+/* <Field> MatchDoubleStarPattern.parenthesised = 1, bool */
+/* <Field> MatchDoubleStarPattern.target = 2, pattern */
+
+/* <Field> MatchKeyValuePattern.location = 0, location */
+/* <Field> MatchKeyValuePattern.parenthesised = 1, bool */
+/* <Field> MatchKeyValuePattern.key = 2, pattern */
+/* <Field> MatchKeyValuePattern.value = 3, pattern */
+
+/* <Field> MatchKeywordPattern.location = 0, location */
+/* <Field> MatchKeywordPattern.parenthesised = 1, bool */
+/* <Field> MatchKeywordPattern.attribute = 2, expr */
+/* <Field> MatchKeywordPattern.value = 3, pattern */
+
+/* <Field> MatchLiteralPattern.location = 0, location */
+/* <Field> MatchLiteralPattern.parenthesised = 1, bool */
+/* <Field> MatchLiteralPattern.literal = 2, expr */
+
+/* <Field> MatchMappingPattern.location = 0, location */
+/* <Field> MatchMappingPattern.parenthesised = 1, bool */
+/* <Field> MatchMappingPattern.mappings = 2, pattern_list */
+
+/* <Field> MatchOrPattern.location = 0, location */
+/* <Field> MatchOrPattern.parenthesised = 1, bool */
+/* <Field> MatchOrPattern.patterns = 2, pattern_list */
+
+/* <Field> MatchSequencePattern.location = 0, location */
+/* <Field> MatchSequencePattern.parenthesised = 1, bool */
+/* <Field> MatchSequencePattern.patterns = 2, pattern_list */
+
+/* <Field> MatchStarPattern.location = 0, location */
+/* <Field> MatchStarPattern.parenthesised = 1, bool */
+/* <Field> MatchStarPattern.target = 2, pattern */
+
+/* <Field> MatchValuePattern.location = 0, location */
+/* <Field> MatchValuePattern.parenthesised = 1, bool */
+/* <Field> MatchValuePattern.value = 2, expr */
+
+/* <Field> MatchWildcardPattern.location = 0, location */
+/* <Field> MatchWildcardPattern.parenthesised = 1, bool */
+
+/* <Field> Module.name = 0, str */
+/* <Field> Module.hash = 1, str */
+/* <Field> Module.body = 2, stmt_list */
+/* <Field> Module.kind = 3, str */
+
+/* <Field> Name.location = 0, location */
+/* <Field> Name.parenthesised = 1, bool */
+/* <Field> Name.variable = 2, variable */
+/* <Field> Name.ctx = 3, expr_context */
+/* <Parent> Name = ParameterList  */
+
+/* <Field> Nonlocal.location = 0, location */
+/* <Field> Nonlocal.names = 1, str_list */
+
+/* <Field> Num.location = 0, location */
+/* <Field> Num.parenthesised = 1, bool */
+/* <Field> Num.n = 2, number */
+/* <Field> Num.text = 3, number */
+
+/* <Field> ParamSpec.location = 0, location */
+/* <Field> ParamSpec.name = 1, expr */
+
+/* <Field> Pass.location = 0, location */
+
+/* <Field> PlaceHolder.location = 0, location */
+/* <Field> PlaceHolder.parenthesised = 1, bool */
+/* <Field> PlaceHolder.variable = 2, variable */
+/* <Field> PlaceHolder.ctx = 3, expr_context */
+
+/* <Field> Print.location = 0, location */
+/* <Field> Print.dest = 1, expr */
+/* <Field> Print.values = 2, expr_list */
+/* <Field> Print.nl = 3, bool */
+
+/* <Field> Raise.location = 0, location */
+/* <Field> Raise.exc = 1, expr */
+/* <Field> Raise.cause = 2, expr */
+/* <Field> Raise.type = 3, expr */
+/* <Field> Raise.inst = 4, expr */
+/* <Field> Raise.tback = 5, expr */
+
+/* <Field> Repr.location = 0, location */
+/* <Field> Repr.parenthesised = 1, bool */
+/* <Field> Repr.value = 2, expr */
+
+/* <Field> Return.location = 0, location */
+/* <Field> Return.value = 1, expr */
+
+/* <Field> Set.location = 0, location */
+/* <Field> Set.parenthesised = 1, bool */
+/* <Field> Set.elts = 2, expr_list */
+
+/* <Field> SetComp.location = 0, location */
+/* <Field> SetComp.parenthesised = 1, bool */
+/* <Field> SetComp.function = 2, Function */
+/* <Field> SetComp.iterable = 3, expr */
+
+/* <Field> Slice.location = 0, location */
+/* <Field> Slice.parenthesised = 1, bool */
+/* <Field> Slice.start = 2, expr */
+/* <Field> Slice.stop = 3, expr */
+/* <Field> Slice.step = 4, expr */
+
+/* <Field> SpecialOperation.location = 0, location */
+/* <Field> SpecialOperation.parenthesised = 1, bool */
+/* <Field> SpecialOperation.name = 2, str */
+/* <Field> SpecialOperation.arguments = 3, expr_list */
+
+/* <Field> Starred.location = 0, location */
+/* <Field> Starred.parenthesised = 1, bool */
+/* <Field> Starred.value = 2, expr */
+/* <Field> Starred.ctx = 3, expr_context */
+
+/* <Field> Str.location = 0, location */
+/* <Field> Str.parenthesised = 1, bool */
+/* <Field> Str.s = 2, str */
+/* <Field> Str.prefix = 3, str */
+/* <Field> Str.implicitly_concatenated_parts = 4, StringPart_list */
+
+/* <Field> StringPart.text = 0, str */
+/* <Field> StringPart.location = 1, location */
+/* <Parent> StringPart = StringPartList  */
+/* <Parent> StringPartList = BytesOrStr  */
+
+/* <Field> Subscript.location = 0, location */
+/* <Field> Subscript.parenthesised = 1, bool */
+/* <Field> Subscript.value = 2, expr */
+/* <Field> Subscript.index = 3, expr */
+/* <Field> Subscript.ctx = 4, expr_context */
+
+/* <Field> TemplateDottedNotation.location = 0, location */
+/* <Field> TemplateDottedNotation.parenthesised = 1, bool */
+/* <Field> TemplateDottedNotation.value = 2, expr */
+/* <Field> TemplateDottedNotation.attr = 3, str */
+/* <Field> TemplateDottedNotation.ctx = 4, expr_context */
+
+/* <Field> TemplateWrite.location = 0, location */
+/* <Field> TemplateWrite.value = 1, expr */
+
+/* <Field> Try.location = 0, location */
+/* <Field> Try.body = 1, stmt_list */
+/* <Field> Try.orelse = 2, stmt_list */
+/* <Field> Try.handlers = 3, stmt_list */
+/* <Field> Try.finalbody = 4, stmt_list */
+
+/* <Field> Tuple.location = 0, location */
+/* <Field> Tuple.parenthesised = 1, bool */
+/* <Field> Tuple.elts = 2, expr_list */
+/* <Field> Tuple.ctx = 3, expr_context */
+/* <Parent> Tuple = ParameterList  */
+
+/* <Field> TypeAlias.location = 0, location */
+/* <Field> TypeAlias.name = 1, expr */
+/* <Field> TypeAlias.type_parameters = 2, type_parameter_list */
+/* <Field> TypeAlias.value = 3, expr */
+
+/* <Field> TypeVar.location = 0, location */
+/* <Field> TypeVar.name = 1, expr */
+/* <Field> TypeVar.bound = 2, expr */
+
+/* <Field> TypeVarTuple.location = 0, location */
+/* <Field> TypeVarTuple.name = 1, expr */
+
+/* <Field> UnaryExpr.location = 0, location */
+/* <Field> UnaryExpr.parenthesised = 1, bool */
+/* <Field> UnaryExpr.op = 2, unaryop */
+/* <Field> UnaryExpr.operand = 3, expr */
+
+/* <Field> While.location = 0, location */
+/* <Field> While.test = 1, expr */
+/* <Field> While.body = 2, stmt_list */
+/* <Field> While.orelse = 3, stmt_list */
+
+/* <Field> With.location = 0, location */
+/* <Field> With.context_expr = 1, expr */
+/* <Field> With.optional_vars = 2, expr */
+/* <Field> With.body = 3, stmt_list */
+/* <Field> With.is_async = 4, bool */
+
+/* <Field> Yield.location = 0, location */
+/* <Field> Yield.parenthesised = 1, bool */
+/* <Field> Yield.value = 2, expr */
+
+/* <Field> YieldFrom.location = 0, location */
+/* <Field> YieldFrom.parenthesised = 1, bool */
+/* <Field> YieldFrom.value = 2, expr */
+
+/* <Field> Alias.value = 0, expr */
+/* <Field> Alias.asname = 1, expr */
+/* <Parent> Alias = AliasList  */
+/* <Parent> AliasList = Import  */
+
+/* <Field> Arguments.kw_defaults = 0, expr_list */
+/* <Field> Arguments.defaults = 1, expr_list */
+/* <Field> Arguments.annotations = 2, expr_list */
+/* <Field> Arguments.varargannotation = 3, expr */
+/* <Field> Arguments.kwargannotation = 4, expr */
+/* <Field> Arguments.kw_annotations = 5, expr_list */
+/* <Parent> Arguments = ArgumentsParent  */
+/* <Parent> boolean = BoolParent  */
+/* <Parent> Boolop = BoolExpr  */
+/* <Parent> string = Bytes  */
+/* <Parent> Cmpop = CmpopList  */
+/* <Parent> CmpopList = Compare  */
+
+/* <Field> Comprehension.location = 0, location */
+/* <Field> Comprehension.iter = 1, expr */
+/* <Field> Comprehension.target = 2, expr */
+/* <Field> Comprehension.ifs = 3, expr_list */
+/* <Parent> Comprehension = ComprehensionList  */
+/* <Parent> ComprehensionList = ListComp  */
+/* <Parent> DictItem = DictItemList  */
+/* <Parent> DictItemList = DictItemListParent  */
+
+/* <Field> Expr.location = 0, location */
+/* <Field> Expr.parenthesised = 1, bool */
+/* <Parent> Expr = ExprParent  */
+/* <Parent> ExprContext = ExprContextParent  */
+/* <Parent> ExprList = ExprListParent  */
+/* <Parent> int = ImportExpr  */
+
+/* <Field> Keyword.location = 0, location */
+/* <Field> Keyword.value = 1, expr */
+/* <Field> Keyword.arg = 2, str */
+/* <Parent> Location = LocationParent  */
+/* <Parent> string = Num  */
+/* <Parent> Operator = BinaryExpr  */
+/* <Parent> ParameterList = Function  */
+
+/* <Field> Pattern.location = 0, location */
+/* <Field> Pattern.parenthesised = 1, bool */
+/* <Parent> Pattern = PatternParent  */
+/* <Parent> PatternList = PatternListParent  */
+
+/* <Field> Stmt.location = 0, location */
+/* <Parent> Stmt = StmtList  */
+/* <Parent> StmtList = StmtListParent  */
+/* <Parent> string = StrParent  */
+/* <Parent> StringList = StrListParent  */
+
+/* <Field> TypeParameter.location = 0, location */
+/* <Parent> TypeParameter = TypeParameterList  */
+/* <Parent> TypeParameterList = TypeParameterListParent  */
+/* <Parent> Unaryop = UnaryExpr  */
+/* <Parent> Variable = VariableParent  */
+py_Classes(unique int id : @py_Class,
+    unique int parent : @py_ClassExpr ref);
+
+py_Functions(unique int id : @py_Function,
+    unique int parent : @py_Function_parent ref);
+
+py_Modules(unique int id : @py_Module);
+
+py_StringParts(unique int id : @py_StringPart,
+    int parent : @py_StringPart_list ref,
+    int idx : int ref);
+
+py_StringPart_lists(unique int id : @py_StringPart_list,
+    unique int parent : @py_Bytes_or_Str ref);
+
+py_aliases(unique int id : @py_alias,
+    int parent : @py_alias_list ref,
+    int idx : int ref);
+
+py_alias_lists(unique int id : @py_alias_list,
+    unique int parent : @py_Import ref);
+
+py_arguments(unique int id : @py_arguments,
+    unique int parent : @py_arguments_parent ref);
+
+py_bools(int parent : @py_bool_parent ref,
+    int idx : int ref);
+
+py_boolops(unique int id : @py_boolop,
+    int kind: int ref,
+    unique int parent : @py_BoolExpr ref);
+
+py_bytes(varchar(1) id : string ref,
+    int parent : @py_Bytes ref,
+    int idx : int ref);
+
+py_cmpops(unique int id : @py_cmpop,
+    int kind: int ref,
+    int parent : @py_cmpop_list ref,
+    int idx : int ref);
+
+py_cmpop_lists(unique int id : @py_cmpop_list,
+    unique int parent : @py_Compare ref);
+
+py_comprehensions(unique int id : @py_comprehension,
+    int parent : @py_comprehension_list ref,
+    int idx : int ref);
+
+py_comprehension_lists(unique int id : @py_comprehension_list,
+    unique int parent : @py_ListComp ref);
+
+py_dict_items(unique int id : @py_dict_item,
+    int kind: int ref,
+    int parent : @py_dict_item_list ref,
+    int idx : int ref);
+
+py_dict_item_lists(unique int id : @py_dict_item_list,
+    unique int parent : @py_dict_item_list_parent ref);
+
+py_exprs(unique int id : @py_expr,
+    int kind: int ref,
+    int parent : @py_expr_parent ref,
+    int idx : int ref);
+
+py_expr_contexts(unique int id : @py_expr_context,
+    int kind: int ref,
+    unique int parent : @py_expr_context_parent ref);
+
+py_expr_lists(unique int id : @py_expr_list,
+    int parent : @py_expr_list_parent ref,
+    int idx : int ref);
+
+py_ints(int id : int ref,
+    unique int parent : @py_ImportExpr ref);
+
+py_locations(unique int id : @location ref,
+    unique int parent : @py_location_parent ref);
+
+py_numbers(varchar(1) id : string ref,
+    int parent : @py_Num ref,
+    int idx : int ref);
+
+py_operators(unique int id : @py_operator,
+    int kind: int ref,
+    unique int parent : @py_BinaryExpr ref);
+
+py_parameter_lists(unique int id : @py_parameter_list,
+    unique int parent : @py_Function ref);
+
+py_patterns(unique int id : @py_pattern,
+    int kind: int ref,
+    int parent : @py_pattern_parent ref,
+    int idx : int ref);
+
+py_pattern_lists(unique int id : @py_pattern_list,
+    int parent : @py_pattern_list_parent ref,
+    int idx : int ref);
+
+py_stmts(unique int id : @py_stmt,
+    int kind: int ref,
+    int parent : @py_stmt_list ref,
+    int idx : int ref);
+
+py_stmt_lists(unique int id : @py_stmt_list,
+    int parent : @py_stmt_list_parent ref,
+    int idx : int ref);
+
+py_strs(varchar(1) id : string ref,
+    int parent : @py_str_parent ref,
+    int idx : int ref);
+
+py_str_lists(unique int id : @py_str_list,
+    unique int parent : @py_str_list_parent ref);
+
+py_type_parameters(unique int id : @py_type_parameter,
+    int kind: int ref,
+    int parent : @py_type_parameter_list ref,
+    int idx : int ref);
+
+py_type_parameter_lists(unique int id : @py_type_parameter_list,
+    unique int parent : @py_type_parameter_list_parent ref);
+
+py_unaryops(unique int id : @py_unaryop,
+    int kind: int ref,
+    unique int parent : @py_UnaryExpr ref);
+
+py_variables(int id : @py_variable ref,
+    unique int parent : @py_variable_parent ref);
+
+case @py_boolop.kind of
+    0 = @py_And
+|   1 = @py_Or;
+
+case @py_cmpop.kind of
+    0 = @py_Eq
+|   1 = @py_Gt
+|   2 = @py_GtE
+|   3 = @py_In
+|   4 = @py_Is
+|   5 = @py_IsNot
+|   6 = @py_Lt
+|   7 = @py_LtE
+|   8 = @py_NotEq
+|   9 = @py_NotIn;
+
+case @py_dict_item.kind of
+    0 = @py_DictUnpacking
+|   1 = @py_KeyValuePair
+|   2 = @py_keyword;
+
+case @py_expr.kind of
+    0 = @py_Attribute
+|   1 = @py_BinaryExpr
+|   2 = @py_BoolExpr
+|   3 = @py_Bytes
+|   4 = @py_Call
+|   5 = @py_ClassExpr
+|   6 = @py_Compare
+|   7 = @py_Dict
+|   8 = @py_DictComp
+|   9 = @py_Ellipsis
+|   10 = @py_FunctionExpr
+|   11 = @py_GeneratorExp
+|   12 = @py_IfExp
+|   13 = @py_ImportExpr
+|   14 = @py_ImportMember
+|   15 = @py_Lambda
+|   16 = @py_List
+|   17 = @py_ListComp
+|   18 = @py_Guard
+|   19 = @py_Name
+|   20 = @py_Num
+|   21 = @py_Repr
+|   22 = @py_Set
+|   23 = @py_SetComp
+|   24 = @py_Slice
+|   25 = @py_Starred
+|   26 = @py_Str
+|   27 = @py_Subscript
+|   28 = @py_Tuple
+|   29 = @py_UnaryExpr
+|   30 = @py_Yield
+|   31 = @py_YieldFrom
+|   32 = @py_TemplateDottedNotation
+|   33 = @py_Filter
+|   34 = @py_PlaceHolder
+|   35 = @py_Await
+|   36 = @py_Fstring
+|   37 = @py_FormattedValue
+|   38 = @py_AssignExpr
+|   39 = @py_SpecialOperation;
+
+case @py_expr_context.kind of
+    0 = @py_AugLoad
+|   1 = @py_AugStore
+|   2 = @py_Del
+|   3 = @py_Load
+|   4 = @py_Param
+|   5 = @py_Store;
+
+case @py_operator.kind of
+    0 = @py_Add
+|   1 = @py_BitAnd
+|   2 = @py_BitOr
+|   3 = @py_BitXor
+|   4 = @py_Div
+|   5 = @py_FloorDiv
+|   6 = @py_LShift
+|   7 = @py_Mod
+|   8 = @py_Mult
+|   9 = @py_Pow
+|   10 = @py_RShift
+|   11 = @py_Sub
+|   12 = @py_MatMult;
+
+case @py_pattern.kind of
+    0 = @py_MatchAsPattern
+|   1 = @py_MatchOrPattern
+|   2 = @py_MatchLiteralPattern
+|   3 = @py_MatchCapturePattern
+|   4 = @py_MatchWildcardPattern
+|   5 = @py_MatchValuePattern
+|   6 = @py_MatchSequencePattern
+|   7 = @py_MatchStarPattern
+|   8 = @py_MatchMappingPattern
+|   9 = @py_MatchDoubleStarPattern
+|   10 = @py_MatchKeyValuePattern
+|   11 = @py_MatchClassPattern
+|   12 = @py_MatchKeywordPattern;
+
+case @py_stmt.kind of
+    0 = @py_Assert
+|   1 = @py_Assign
+|   2 = @py_AugAssign
+|   3 = @py_Break
+|   4 = @py_Continue
+|   5 = @py_Delete
+|   6 = @py_ExceptStmt
+|   7 = @py_ExceptGroupStmt
+|   8 = @py_Exec
+|   9 = @py_Expr_stmt
+|   10 = @py_For
+|   11 = @py_Global
+|   12 = @py_If
+|   13 = @py_Import
+|   14 = @py_ImportStar
+|   15 = @py_MatchStmt
+|   16 = @py_Case
+|   17 = @py_Nonlocal
+|   18 = @py_Pass
+|   19 = @py_Print
+|   20 = @py_Raise
+|   21 = @py_Return
+|   22 = @py_Try
+|   23 = @py_While
+|   24 = @py_With
+|   25 = @py_TemplateWrite
+|   26 = @py_AnnAssign
+|   27 = @py_TypeAlias;
+
+case @py_type_parameter.kind of
+    0 = @py_ParamSpec
+|   1 = @py_TypeVar
+|   2 = @py_TypeVarTuple;
+
+case @py_unaryop.kind of
+    0 = @py_Invert
+|   1 = @py_Not
+|   2 = @py_UAdd
+|   3 = @py_USub;
+
+@py_Bytes_or_Str = @py_Bytes | @py_Str;
+
+@py_Function_parent = @py_DictComp | @py_FunctionExpr | @py_GeneratorExp | @py_Lambda | @py_ListComp | @py_SetComp;
+
+@py_arguments_parent = @py_FunctionExpr | @py_Lambda;
+
+@py_ast_node = @py_Class | @py_Function | @py_Module | @py_StringPart | @py_comprehension | @py_dict_item | @py_expr | @py_pattern | @py_stmt | @py_type_parameter;
+
+@py_bool_parent = @py_For | @py_Function | @py_Print | @py_With | @py_expr | @py_pattern;
+
+@py_dict_item_list_parent = @py_Call | @py_ClassExpr | @py_Dict;
+
+@py_expr_context_parent = @py_Attribute | @py_List | @py_Name | @py_PlaceHolder | @py_Starred | @py_Subscript | @py_TemplateDottedNotation | @py_Tuple;
+
+@py_expr_list_parent = @py_Assign | @py_BoolExpr | @py_Call | @py_ClassExpr | @py_Compare | @py_Delete | @py_Fstring | @py_Function | @py_List | @py_Print | @py_Set | @py_SpecialOperation | @py_Tuple | @py_arguments | @py_comprehension;
+
+@py_expr_or_stmt = @py_expr | @py_stmt;
+
+@py_expr_parent = @py_AnnAssign | @py_Assert | @py_Assign | @py_AssignExpr | @py_Attribute | @py_AugAssign | @py_Await | @py_BinaryExpr | @py_Call | @py_Case | @py_Compare | @py_DictComp | @py_DictUnpacking | @py_ExceptGroupStmt | @py_ExceptStmt | @py_Exec | @py_Expr_stmt | @py_Filter | @py_For | @py_FormattedValue | @py_Function | @py_FunctionExpr | @py_GeneratorExp | @py_Guard | @py_If | @py_IfExp | @py_ImportMember | @py_ImportStar | @py_KeyValuePair | @py_ListComp | @py_MatchAsPattern | @py_MatchCapturePattern | @py_MatchClassPattern | @py_MatchKeywordPattern | @py_MatchLiteralPattern | @py_MatchStmt | @py_MatchValuePattern | @py_ParamSpec | @py_Print | @py_Raise | @py_Repr | @py_Return | @py_SetComp | @py_Slice | @py_Starred | @py_Subscript | @py_TemplateDottedNotation | @py_TemplateWrite | @py_TypeAlias | @py_TypeVar | @py_TypeVarTuple | @py_UnaryExpr | @py_While | @py_With | @py_Yield | @py_YieldFrom | @py_alias | @py_arguments | @py_comprehension | @py_expr_list | @py_keyword | @py_parameter_list;
+
+@py_location_parent = @py_DictUnpacking | @py_KeyValuePair | @py_StringPart | @py_comprehension | @py_expr | @py_keyword | @py_pattern | @py_stmt | @py_type_parameter;
+
+@py_parameter = @py_Name | @py_Tuple;
+
+@py_pattern_list_parent = @py_MatchClassPattern | @py_MatchMappingPattern | @py_MatchOrPattern | @py_MatchSequencePattern;
+
+@py_pattern_parent = @py_Case | @py_MatchAsPattern | @py_MatchDoubleStarPattern | @py_MatchKeyValuePattern | @py_MatchKeywordPattern | @py_MatchStarPattern | @py_pattern_list;
+
+@py_scope = @py_Class | @py_Function | @py_Module;
+
+@py_stmt_list_parent = @py_Case | @py_Class | @py_ExceptGroupStmt | @py_ExceptStmt | @py_For | @py_Function | @py_If | @py_MatchStmt | @py_Module | @py_Try | @py_While | @py_With;
+
+@py_str_list_parent = @py_Global | @py_Nonlocal;
+
+@py_str_parent = @py_Attribute | @py_Class | @py_ClassExpr | @py_FormattedValue | @py_Function | @py_FunctionExpr | @py_ImportExpr | @py_ImportMember | @py_Module | @py_SpecialOperation | @py_Str | @py_StringPart | @py_TemplateDottedNotation | @py_keyword | @py_str_list;
+
+@py_type_parameter_list_parent = @py_ClassExpr | @py_Function | @py_TypeAlias;
+
+@py_variable_parent = @py_Name | @py_PlaceHolder;
+
+
+/*
+ * End of auto-generated part
+ */
+
+
+
+/* Map relative names to absolute names for imports */
+py_absolute_names(int module : @py_Module ref,
+                  varchar(1) relname : string ref,
+                  varchar(1) absname : string ref);
+
+py_exports(int id : @py_Module ref,
+           varchar(1) name : string ref);
+
+/* Successor information */
+py_successors(int predecessor : @py_flow_node ref,
+              int successor : @py_flow_node ref);
+
+py_true_successors(int predecessor : @py_flow_node ref,
+              int successor : @py_flow_node ref);
+
+py_exception_successors(int predecessor : @py_flow_node ref,
+              int successor : @py_flow_node ref);
+
+py_false_successors(int predecessor : @py_flow_node ref,
+              int successor : @py_flow_node ref);
+
+py_flow_bb_node(unique int flownode : @py_flow_node,
+             int realnode : @py_ast_node ref,
+             int basicblock : @py_flow_node ref,
+             int index : int ref);
+
+py_scope_flow(int flow : @py_flow_node ref,
+              int scope : @py_scope ref,
+              int kind : int ref);
+
+py_idoms(unique int node : @py_flow_node ref,
+         int immediate_dominator : @py_flow_node ref);
+
+py_ssa_phi(int phi : @py_ssa_var ref,
+           int arg: @py_ssa_var ref);
+
+py_ssa_var(unique int id : @py_ssa_var,
+            int var : @py_variable ref);
+
+py_ssa_use(int node: @py_flow_node ref,
+           int var : @py_ssa_var ref);
+
+py_ssa_defn(unique int id : @py_ssa_var ref,
+                  int node: @py_flow_node ref);
+
+@py_base_var = @py_variable | @py_ssa_var;
+
+py_scopes(unique int node : @py_expr_or_stmt ref,
+         int scope : @py_scope ref);
+
+py_scope_location(unique int id : @location ref,
+                   unique int scope : @py_scope ref);
+
+py_flags_versioned(varchar(1) name : string ref,
+                   varchar(1) value : string ref,
+                   varchar(1) version : string ref);
+
+py_syntax_error_versioned(unique int id : @location ref,
+                varchar(1) message : string ref,
+                varchar(1) version : string ref);
+
+py_comments(unique int id : @py_comment,
+           varchar(1) text : string ref,
+           unique int location : @location ref);
+
+/* Type information support */
+
+py_cobjects(unique int obj : @py_cobject);
+
+py_cobjecttypes(unique int obj : @py_cobject ref,
+                int typeof : @py_cobject ref);
+
+py_cobjectnames(unique int obj : @py_cobject ref,
+                varchar(1) name : string ref);
+
+/* Kind should be 0 for introspection, > 0 from source, as follows:
+   1 from C extension source
+ */
+py_cobject_sources(int obj : @py_cobject ref,
+                  int kind : int ref);
+
+py_cmembers_versioned(int object : @py_cobject ref,
+                      varchar(1) name : string ref,
+                      int member : @py_cobject ref,
+                      varchar(1) version : string ref);
+
+py_citems(int object : @py_cobject ref,
+            int index : int ref,
+            int member : @py_cobject ref);
+
+ext_argtype(int funcid : @py_object ref,
+            int arg : int ref,
+            int typeid : @py_object ref);
+
+ext_rettype(int funcid : @py_object ref,
+            int typeid : @py_object ref);
+
+ext_proptype(int propid : @py_object ref,
+             int typeid : @py_object ref);
+
+ext_argreturn(int funcid : @py_object ref,
+              int arg : int ref);
+
+py_special_objects(unique int obj : @py_cobject ref,
+                   unique varchar(1) name : string ref);
+
+py_decorated_object(int object : @py_object ref,
+                    int level: int ref);
+
+@py_object = @py_cobject | @py_flow_node;
+
+@py_source_element = @py_ast_node | @container;
diff --git a/python/downgrades/5af903da088e3746aa283700a43a779302453523/upgrade.properties b/python/downgrades/5af903da088e3746aa283700a43a779302453523/upgrade.properties
new file mode 100644
index 00000000000..f9c39c31ea0
--- /dev/null
+++ b/python/downgrades/5af903da088e3746aa283700a43a779302453523/upgrade.properties
@@ -0,0 +1,3 @@
+description: Remove support for type parameter defaults.
+compatibility: backwards
+py_exprs.rel: run py_exprs.qlo py_exprs_without_type_parameter_defaults
diff --git a/python/extractor/Makefile b/python/extractor/Makefile
index 1f2c5d0752b..54095f6572b 100644
--- a/python/extractor/Makefile
+++ b/python/extractor/Makefile
@@ -21,19 +21,19 @@ $(TOKENIZER_FILE): $(TOKENIZER_DEPS)
 
 MASTER_FILE = semmle/python/master.py
 
-DBSCHEME_FILE = $(GIT_ROOT)/ql/python/ql/lib/semmlecode.python.dbscheme
+DBSCHEME_FILE = $(GIT_ROOT)/python/ql/lib/semmlecode.python.dbscheme
 
 .PHONY: dbscheme
 dbscheme: $(MASTER_FILE)
 	python3 -m semmle.dbscheme_gen $(DBSCHEME_FILE)
 
-AST_GENERATED_DIR = $(GIT_ROOT)/ql/python/ql/lib/semmle/python/
+AST_GENERATED_DIR = $(GIT_ROOT)/python/ql/lib/semmle/python/
 AST_GENERATED_FILE = $(AST_GENERATED_DIR)AstGenerated.qll
 
 .PHONY: ast
 ast: $(MASTER_FILE)
 	python3 -m semmle.query_gen $(AST_GENERATED_DIR)
-	$(GIT_ROOT)/target/intree/codeql/codeql query format --in-place $(AST_GENERATED_FILE)
+	codeql query format --in-place $(AST_GENERATED_FILE)
 
 ################################################################################
 # Tests
diff --git a/python/extractor/cli-integration-test/.gitignore b/python/extractor/cli-integration-test/.gitignore
index d3606b9b666..9c021a4450e 100644
--- a/python/extractor/cli-integration-test/.gitignore
+++ b/python/extractor/cli-integration-test/.gitignore
@@ -3,3 +3,5 @@
 */venv/
 **/*.egg-info/
 */.cache
+**/trap/
+**/*.testproj/
\ No newline at end of file
diff --git a/python/extractor/cli-integration-test/extract-stdlib/test.sh b/python/extractor/cli-integration-test/extract-stdlib/test.sh
index 6a61becd25c..937cf08ce43 100755
--- a/python/extractor/cli-integration-test/extract-stdlib/test.sh
+++ b/python/extractor/cli-integration-test/extract-stdlib/test.sh
@@ -13,10 +13,10 @@ rm -rf dbs
 
 mkdir dbs
 
-CODEQL_EXTRACTOR_PYTHON_DONT_EXTRACT_STDLIB=True $CODEQL database create dbs/without-stdlib --language python --source-root repo_dir/
+$CODEQL database create dbs/without-stdlib --language python --source-root repo_dir/
 $CODEQL query run --database dbs/without-stdlib query.ql > query.without-stdlib.actual
 diff query.without-stdlib.expected query.without-stdlib.actual
 
-LGTM_INDEX_EXCLUDE="/usr/lib/**" $CODEQL database create dbs/with-stdlib --language python --source-root repo_dir/
+LGTM_INDEX_EXCLUDE="/usr/lib/**" CODEQL_EXTRACTOR_PYTHON_EXTRACT_STDLIB=True $CODEQL database create dbs/with-stdlib --language python --source-root repo_dir/
 $CODEQL query run --database dbs/with-stdlib query.ql > query.with-stdlib.actual
 diff query.with-stdlib.expected query.with-stdlib.actual
diff --git a/python/extractor/cli-integration-test/python-2-deprecation/query.only-python2.expected b/python/extractor/cli-integration-test/python-2-deprecation/query.only-python2.expected
deleted file mode 100644
index 75bc5074059..00000000000
--- a/python/extractor/cli-integration-test/python-2-deprecation/query.only-python2.expected
+++ /dev/null
@@ -1,5 +0,0 @@
-|   name   |
-+----------+
-| dircache |
-| stat     |
-| test     |
diff --git a/python/extractor/cli-integration-test/python-2-deprecation/query.python2-using-python3.expected b/python/extractor/cli-integration-test/python-2-deprecation/query.python2-using-python3.expected
index 75bc5074059..d43fc3e2a7e 100644
--- a/python/extractor/cli-integration-test/python-2-deprecation/query.python2-using-python3.expected
+++ b/python/extractor/cli-integration-test/python-2-deprecation/query.python2-using-python3.expected
@@ -1,5 +1,3 @@
-|   name   |
-+----------+
-| dircache |
-| stat     |
-| test     |
+| name |
++------+
+| test |
diff --git a/python/extractor/cli-integration-test/python-2-deprecation/query.without-python2.expected b/python/extractor/cli-integration-test/python-2-deprecation/query.without-python2.expected
index 3fa1f24a785..d43fc3e2a7e 100644
--- a/python/extractor/cli-integration-test/python-2-deprecation/query.without-python2.expected
+++ b/python/extractor/cli-integration-test/python-2-deprecation/query.without-python2.expected
@@ -1,4 +1,3 @@
 | name |
 +------+
-| stat |
 | test |
diff --git a/python/extractor/cli-integration-test/string-encoding/repo_dir/test.py b/python/extractor/cli-integration-test/string-encoding/repo_dir/test.py
new file mode 100644
index 00000000000..8e7efcaf926
--- /dev/null
+++ b/python/extractor/cli-integration-test/string-encoding/repo_dir/test.py
@@ -0,0 +1,2 @@
+"\uD800"
+"?"
diff --git a/python/extractor/cli-integration-test/string-encoding/test.sh b/python/extractor/cli-integration-test/string-encoding/test.sh
new file mode 100755
index 00000000000..3bf1a6b0301
--- /dev/null
+++ b/python/extractor/cli-integration-test/string-encoding/test.sh
@@ -0,0 +1,18 @@
+#!/bin/bash
+
+set -Eeuo pipefail # see https://vaneyckt.io/posts/safer_bash_scripts_with_set_euxo_pipefail/
+
+set -x
+
+CODEQL=${CODEQL:-codeql}
+
+SCRIPTDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
+cd "$SCRIPTDIR"
+
+rm -rf db
+
+$CODEQL database create db --language python --source-root repo_dir/
+
+$CODEQL dataset check db/db-python
+
+echo "Test successfully completed."
diff --git a/python/extractor/semmle/cmdline.py b/python/extractor/semmle/cmdline.py
index 9c2ff4a3274..47007c065fd 100644
--- a/python/extractor/semmle/cmdline.py
+++ b/python/extractor/semmle/cmdline.py
@@ -102,8 +102,10 @@ def make_parser():
     config_options.add_option("--colorize", dest="colorize", default=False, action="store_true",
                       help = """Colorize the logging output.""")
 
-    config_options.add_option("--dont-extract-stdlib", dest="extract_stdlib", default=True, action="store_false",
-        help="Do not extract the standard library.")
+    config_options.add_option("--dont-extract-stdlib", dest="extract_stdlib", action="store_false",
+        help="This flag is deprecated; not extracting the standard library is now the default.")
+    config_options.add_option("--extract-stdlib", dest="extract_stdlib", default=False, action="store_true",
+        help="Extract the standard library.")
 
     parser.add_option_group(config_options)
 
@@ -226,8 +228,18 @@ def parse(command_line):
 
     if 'CODEQL_EXTRACTOR_PYTHON_DONT_EXTRACT_STDLIB' in os.environ:
         options.extract_stdlib = False
+        print ("WARNING: CODEQL_EXTRACTOR_PYTHON_DONT_EXTRACT_STDLIB is deprecated; the default is now to not extract the standard library.")
+
+    if 'CODEQL_EXTRACTOR_PYTHON_EXTRACT_STDLIB' in os.environ:
+        options.extract_stdlib = True
 
     options.prune = True
+
+    if options.extract_stdlib:
+        print ("WARNING: The analysis will extract the standard library. This behavior is deprecated and will be removed in a future release. We expect it to be gone in CLI version 2.20.0.")
+    else:
+        print ("INFO: The Python extractor has recently stopped extracting the standard library by default. If you encounter problems, please let us know by submitting an issue to https://github.com/github/codeql. It is possible to re-enable extraction of the standard library by setting the environment variable CODEQL_EXTRACTOR_PYTHON_EXTRACT_STDLIB.")
+
     return options, args
 
 def split_and_flatten(options_list, div):
diff --git a/python/extractor/semmle/populator.py b/python/extractor/semmle/populator.py
index c2d6b6277c9..a1be196ffaf 100644
--- a/python/extractor/semmle/populator.py
+++ b/python/extractor/semmle/populator.py
@@ -67,7 +67,7 @@ def main(sys_path = sys.path[:]):
         update_analysis_version(last_version)
 
     found_py2 = False
-    if get_analysis_major_version() == 2:
+    if get_analysis_major_version() == 2 and options.extract_stdlib:
         # Setup `sys_path` to use the Python 2 standard library
         sys_path, found_py2 = get_py2_sys_path(logger, sys_path)
 
diff --git a/python/extractor/semmle/python/ast.py b/python/extractor/semmle/python/ast.py
index 25b93cae72a..6033e39e009 100644
--- a/python/extractor/semmle/python/ast.py
+++ b/python/extractor/semmle/python/ast.py
@@ -500,10 +500,11 @@ class Num(expr):
         self.text = text
 
 class ParamSpec(type_parameter):
-    __slots__ = "name",
+    __slots__ = "name", "default",
 
-    def __init__(self, name):
+    def __init__(self, name, default):
         self.name = name
+        self.default = default
 
 
 
@@ -607,17 +608,19 @@ class TypeAlias(stmt):
         self.value = value
 
 class TypeVar(type_parameter):
-    __slots__ = "name", "bound",
+    __slots__ = "name", "bound", "default"
 
-    def __init__(self, name, bound):
+    def __init__(self, name, bound, default):
         self.name = name
         self.bound = bound
+        self.default = default
 
 class TypeVarTuple(type_parameter):
-    __slots__ = "name",
+    __slots__ = "name", "default",
 
-    def __init__(self, name):
+    def __init__(self, name, default):
         self.name = name
+        self.default = default
 
 class UnaryOp(expr):
     __slots__ = "op", "operand",
diff --git a/python/extractor/semmle/python/imports.py b/python/extractor/semmle/python/imports.py
index 851193e89f5..8da7df47448 100644
--- a/python/extractor/semmle/python/imports.py
+++ b/python/extractor/semmle/python/imports.py
@@ -98,6 +98,7 @@ class ModuleImporter(object):
     def get_import_nodes(self, loaded_module):
         'Return list of AST nodes representing imports'
         try:
+            self.logger.debug("Looking for imports in %s", loaded_module.path)
             return imports_from_ast(loaded_module.py_ast)
         except Exception as ex:
             if isinstance(ex, SyntaxError):
diff --git a/python/extractor/semmle/python/master.py b/python/extractor/semmle/python/master.py
index 200340061fc..508a706a97a 100755
--- a/python/extractor/semmle/python/master.py
+++ b/python/extractor/semmle/python/master.py
@@ -397,6 +397,7 @@ Num.field('n', number, 'value')
 Num.field('text', number)
 
 ParamSpec.field('name', expr)
+ParamSpec.field('default', expr)
 
 Print.field('dest', expr, 'destination')
 Print.field('values', expr_list)
@@ -448,8 +449,10 @@ TypeAlias.field('value', expr)
 
 TypeVar.field('name', expr)
 TypeVar.field('bound', expr)
+TypeVar.field('default', expr)
 
 TypeVarTuple.field('name', expr)
+TypeVarTuple.field('default', expr)
 
 UnaryOp.field('op', unaryop, 'operator')
 UnaryOp.field('operand', expr)
diff --git a/python/extractor/semmle/python/modules.py b/python/extractor/semmle/python/modules.py
index 8934d810eb8..810c4e060f7 100644
--- a/python/extractor/semmle/python/modules.py
+++ b/python/extractor/semmle/python/modules.py
@@ -109,14 +109,25 @@ class PythonSourceModule(object):
     def old_py_ast(self):
         # The py_ast is the raw ast from the Python parser.
         if self._py_ast is None:
-            self._py_ast = semmle.python.parser.parse(self.tokens, self.logger)
+            with timers["old_py_ast"]:
+                self.logger.debug("Trying old parser on %s", self.path)
+                self._py_ast = semmle.python.parser.parse(self.tokens, self.logger)
+                self.logger.debug("Old parser successful on %s", self.path)
+        else:
+            self.logger.debug("Found (during old_py_ast) parse tree for %s in cache", self.path)
         return self._py_ast
 
     @property
     def py_ast(self):
         try:
-            # First, try to parse the source with the old Python parser.
-            return self.old_py_ast
+            # If the `CODEQL_PYTHON_DISABLE_OLD_PARSER` flag is present, we do not try to use the
+            # old parser, and instead jump straight to the exception handler.
+            if os.environ.get("CODEQL_PYTHON_DISABLE_OLD_PARSER"):
+                self.logger.debug("Old parser disabled, skipping old parse attempt for %s", self.path)
+                raise Exception("Skipping old parser")
+            # Otherwise, we first try to parse the source with the old Python parser.
+            self._py_ast = self.old_py_ast
+            return self._py_ast
         except Exception as ex:
             # If that fails, try to parse the source with the new Python parser (unless it has been
             # explicitly disabled).
@@ -131,7 +142,13 @@ class PythonSourceModule(object):
                     raise SyntaxError("Exception %s while parsing %s" % (ex, self.path))
             else:
                 try:
-                    self._py_ast = semmle.python.parser.tsg_parser.parse(self.path, self.logger)
+                    with timers["tsg_py_ast"]:
+                        if self._py_ast is None:
+                            self.logger.debug("Trying tsg-python on %s", self.path)
+                            self._py_ast = semmle.python.parser.tsg_parser.parse(self.path, self.logger)
+                            self.logger.debug("tsg-python successful on %s", self.path)
+                        else:
+                            self.logger.debug("Found (during py_ast) parse tree for %s in cache", self.path)
                     return self._py_ast
                 except SyntaxError as ex:
                     raise ex
diff --git a/python/extractor/semmle/python/parser/dump_ast.py b/python/extractor/semmle/python/parser/dump_ast.py
index fbeaabb2939..23e1a973dfc 100644
--- a/python/extractor/semmle/python/parser/dump_ast.py
+++ b/python/extractor/semmle/python/parser/dump_ast.py
@@ -97,9 +97,27 @@ class AstDumper(object):
 
 
 class StdoutLogger(logging.Logger):
+    error_count = 0
     def log(self, level, fmt, *args):
         sys.stdout.write(fmt % args + "\n")
 
+    def info(self, fmt, *args):
+        self.log(logging.INFO, fmt, *args)
+
+    def warn(self, fmt, *args):
+        self.log(logging.WARN, fmt, *args)
+        self.error_count += 1
+
+    def error(self, fmt, *args):
+        self.log(logging.ERROR, fmt, *args)
+        self.error_count += 1
+
+    def had_errors(self):
+        return self.error_count > 0
+
+    def reset_error_count(self):
+        self.error_count = 0
+
 def old_parser(inputfile, logger):
     mod = PythonSourceModule(None, inputfile, logger)
     logger.close()
diff --git a/python/extractor/semmle/python/parser/tsg_parser.py b/python/extractor/semmle/python/parser/tsg_parser.py
index 46784c4e860..d516e1aeb53 100644
--- a/python/extractor/semmle/python/parser/tsg_parser.py
+++ b/python/extractor/semmle/python/parser/tsg_parser.py
@@ -168,7 +168,7 @@ def read_tsg_python_output(path, logger):
     p.stdout.close()
     p.terminate()
     p.wait()
-    logger.info("Read {} nodes and {} edges from TSG output".format(len(node_attr), len(edge_attr)))
+    logger.debug("Read {} nodes and {} edges from TSG output".format(len(node_attr), len(edge_attr)))
     return node_attr, edge_attr
 
 def evaluate_string(s):
@@ -440,7 +440,7 @@ def concatenate_stringparts(stringparts, logger):
     try:
         return "".join(decode_str(stringpart.s) for stringpart in stringparts)
     except Exception as ex:
-        logger.error("Unable to concatenate string %s getting error %s", stringparts, ex)
+        logger.error("Unable to concatenate string {} getting error {}".format(stringparts, ex))
         return stringparts[0].s
 
 
diff --git a/python/extractor/semmle/python/passes/objects.py b/python/extractor/semmle/python/passes/objects.py
index 599539bc541..335603c131d 100644
--- a/python/extractor/semmle/python/passes/objects.py
+++ b/python/extractor/semmle/python/passes/objects.py
@@ -43,6 +43,23 @@ BUILTINS_NAME = 'builtins'
 
 LITERALS = (ast.Num, ast.Str)
 
+# A variant of the 'replace' error handler that replaces unencodable characters with U+FFFD
+# rather than '?'. Without this, a string like '\uD800' (which is not encodable) would get mapped
+# to '?', and potentially clash with the regular string '?' if it appeared elsewhere in the source
+# code. Used in 'get_label_for_object' below. Based on code from https://peps.python.org/pep-0293/
+def fffd_replace(exc):
+     if isinstance(exc, UnicodeEncodeError):
+         return ((exc.end-exc.start)*u"\\ufffd", exc.end)
+     elif isinstance(exc, UnicodeDecodeError):
+         return (u"\\ufffd", exc.end)
+     elif isinstance(exc, UnicodeTranslateError):
+         return ((exc.end-exc.start)*u"\\ufffd", exc.end)
+     else:
+         raise TypeError("can't handle %s" % exc.__name__)
+
+import codecs
+codecs.register_error("fffdreplace", fffd_replace)
+
 class _CObject(object):
     '''Utility class to wrap arbitrary C objects.
     Treat all objects as unique. Rely on naming in the
@@ -239,7 +256,7 @@ class ObjectPass(Pass):
         else:
             prefix = u"C_bytes$"
         if t is str:
-            obj = obj.encode("utf8", errors='replace')
+            obj = obj.encode("utf8", errors='fffdreplace')
             return prefix + hashlib.sha1(obj).hexdigest()
         if t is bytes:
             return prefix + hashlib.sha1(obj).hexdigest()
diff --git a/python/extractor/semmle/python/passes/pruner.py b/python/extractor/semmle/python/passes/pruner.py
index d6363e529f1..fe3b03d453c 100644
--- a/python/extractor/semmle/python/passes/pruner.py
+++ b/python/extractor/semmle/python/passes/pruner.py
@@ -196,6 +196,25 @@ class SkippedVisitor(ASTVisitor):
         if isinstance(node.value, ast.Name):
             self.nodes.add(node.value)
 
+class NotBooleanTestVisitor(ASTVisitor):
+    """Visitor that checks if a test is not a boolean test."""
+
+    def __init__(self):
+        self.nodes = set()
+
+    def visit_MatchLiteralPattern(self, node):
+        # MatchLiteralPatterns _look_ like boolean tests, but are not.
+        # Thus, without this check, we would interpret
+        #
+        # match x:
+        #    case False:
+        #        pass
+        #
+        # (and similarly for True) as if it was a boolean test. This would cause the true edge
+        # (leading to pass) to be pruned later on.
+        if isinstance(node.literal, ast.Name) and node.literal.id in ('True', 'False'):
+            self.nodes.add(node.literal)
+
 class NonlocalVisitor(ASTVisitor):
     def __init__(self):
         self.names = set()
@@ -306,6 +325,8 @@ def effective_constants_definitions(bool_const_defns, graph, branching_edges):
 def do_pruning(tree, graph):
     v = BoolConstVisitor()
     v.visit(tree)
+    not_boolean_test = NotBooleanTestVisitor()
+    not_boolean_test.visit(tree)
     nonlocals = NonlocalVisitor()
     nonlocals.visit(tree)
     global_vars = GlobalVisitor()
@@ -353,6 +374,8 @@ def do_pruning(tree, graph):
             b = const_value(pred.node)
             if b is None:
                 continue
+            if pred.node in not_boolean_test.nodes:
+                continue
             if b.contradicts(val):
                 to_be_removed.add((pred, succ))
         if not to_be_removed:
diff --git a/python/extractor/semmle/util.py b/python/extractor/semmle/util.py
index 8e1a371fc71..1763d24e99e 100644
--- a/python/extractor/semmle/util.py
+++ b/python/extractor/semmle/util.py
@@ -10,7 +10,7 @@ from io import BytesIO
 
 #Semantic version of extractor.
 #Update this if any changes are made
-VERSION = "6.1.2"
+VERSION = "7.1.1"
 
 PY_EXTENSIONS = ".py", ".pyw"
 
diff --git a/python/extractor/tests/parser/.gitignore b/python/extractor/tests/parser/.gitignore
new file mode 100644
index 00000000000..247b8ca8c74
--- /dev/null
+++ b/python/extractor/tests/parser/.gitignore
@@ -0,0 +1,2 @@
+*.old
+*.new
\ No newline at end of file
diff --git a/python/extractor/tests/parser/assignment.py b/python/extractor/tests/parser/assignment.py
index c47eec4dd0d..d4955d999b1 100644
--- a/python/extractor/tests/parser/assignment.py
+++ b/python/extractor/tests/parser/assignment.py
@@ -14,4 +14,6 @@ x, y = z, w = 3, 4
 
 s, *t = u
 
+[v, *w] = x
+
 o,p, = q,r,
diff --git a/python/extractor/tests/parser/async-await.py b/python/extractor/tests/parser/async-await.py
new file mode 100644
index 00000000000..ec6a945abce
--- /dev/null
+++ b/python/extractor/tests/parser/async-await.py
@@ -0,0 +1,8 @@
+async def foo():
+    await bar() + await baz()
+
+    async with foo() as bar, baz() as quux:
+        pass
+
+    async for spam in eggs:
+        pass
diff --git a/python/extractor/tests/parser/class.py b/python/extractor/tests/parser/class.py
index d1d4694fb3f..ffaefbcb5da 100644
--- a/python/extractor/tests/parser/class.py
+++ b/python/extractor/tests/parser/class.py
@@ -1,2 +1,2 @@
-class Foo(int, object, metaclass=type):
+class Foo(int, object, metaclass=type, **kwargs):
     x = 5
diff --git a/python/extractor/tests/parser/collections.py b/python/extractor/tests/parser/collections.py
index 4e570fd0adc..9331cd467c0 100644
--- a/python/extractor/tests/parser/collections.py
+++ b/python/extractor/tests/parser/collections.py
@@ -35,3 +35,5 @@ t, u,
   x, y,
 #comment
 )
+
+((z,))
diff --git a/python/extractor/tests/parser/comprehensions.py b/python/extractor/tests/parser/comprehensions.py
index 52de5828467..1fade0f26b8 100644
--- a/python/extractor/tests/parser/comprehensions.py
+++ b/python/extractor/tests/parser/comprehensions.py
@@ -55,3 +55,20 @@
 t = tuple(x for y in z)
 
 [(  t,  ) for v in w]
+
+[# comment
+    a for b in c # comment
+    # comment
+] # comment
+
+[# comment
+    d for e in f if g # comment
+    # comment
+] # comment
+
+# Generator expression with comments
+(# comment
+    alpha # comment
+    for beta in gamma # comment
+    # comment
+)
diff --git a/python/extractor/tests/parser/exception_groups_new.expected b/python/extractor/tests/parser/exception_groups_new.expected
index 1d2de92755f..a70bf1b2485 100644
--- a/python/extractor/tests/parser/exception_groups_new.expected
+++ b/python/extractor/tests/parser/exception_groups_new.expected
@@ -1,4 +1,4 @@
-Module: [1, 0] - [22, 0]
+Module: [1, 0] - [27, 0]
   body: [
     Try: [1, 0] - [1, 4]
       body: [
@@ -133,4 +133,24 @@ Module: [1, 0] - [22, 0]
               variable: Variable('v', None)
               ctx: Load
       ]
+    Try: [23, 0] - [23, 4]
+      body: [
+        Pass: [24, 4] - [24, 8]
+      ]
+      orelse: []
+      handlers: [
+        ExceptGroupStmt: [25, 0] - [26, 8]
+          type:
+            Name: [25, 8] - [25, 11]
+              variable: Variable('foo', None)
+              ctx: Load
+          name:
+            Name: [25, 15] - [25, 16]
+              variable: Variable('e', None)
+              ctx: Store
+          body: [
+            Pass: [26, 4] - [26, 8]
+          ]
+      ]
+      finalbody: []
   ]
diff --git a/python/extractor/tests/parser/exception_groups_new.py b/python/extractor/tests/parser/exception_groups_new.py
index f24e3b00f4e..01fe58b9a98 100644
--- a/python/extractor/tests/parser/exception_groups_new.py
+++ b/python/extractor/tests/parser/exception_groups_new.py
@@ -19,3 +19,8 @@ else:
 finally:
     u
     v
+
+try:
+    pass
+except *foo as e:
+    pass
diff --git a/python/extractor/tests/parser/functions_new.expected b/python/extractor/tests/parser/functions_new.expected
new file mode 100644
index 00000000000..491226c9bc1
--- /dev/null
+++ b/python/extractor/tests/parser/functions_new.expected
@@ -0,0 +1,41 @@
+Module: [1, 0] - [3, 0]
+  body: [
+    Assign: [1, 0] - [1, 42]
+      targets: [
+        Name: [1, 4] - [1, 26]
+          variable: Variable('tuple_typed_list_splat', None)
+          ctx: Store
+      ]
+      value:
+        FunctionExpr: [1, 0] - [1, 42]
+          name: 'tuple_typed_list_splat'
+          args:
+            arguments
+              defaults: []
+              kw_defaults: []
+              annotations: []
+              varargannotation:
+                Starred: [1, 35] - [1, 40]
+                  value:
+                    Name: [1, 36] - [1, 40]
+                      variable: Variable('ARGS', None)
+                      ctx: Load
+                  ctx: Load
+              kwargannotation: None
+              kw_annotations: []
+          returns: None
+          inner_scope:
+            Function: [1, 0] - [1, 42]
+              name: 'tuple_typed_list_splat'
+              type_parameters: []
+              args: []
+              vararg:
+                Name: [1, 28] - [1, 32]
+                  variable: Variable('args', None)
+                  ctx: Param
+              kwonlyargs: []
+              kwarg: None
+              body: [
+                Pass: [2, 4] - [2, 8]
+              ]
+  ]
diff --git a/python/extractor/tests/parser/functions_new.py b/python/extractor/tests/parser/functions_new.py
new file mode 100644
index 00000000000..eb5d9d06d45
--- /dev/null
+++ b/python/extractor/tests/parser/functions_new.py
@@ -0,0 +1,2 @@
+def tuple_typed_list_splat(*args : *ARGS):
+    pass
diff --git a/python/extractor/tests/parser/strings.py b/python/extractor/tests/parser/strings.py
index 8d465d25752..c7b772a44aa 100644
--- a/python/extractor/tests/parser/strings.py
+++ b/python/extractor/tests/parser/strings.py
@@ -77,3 +77,12 @@ if 34:
     b'\xc5\xe5'
 if 35:
     f"{x=}"
+if 36:
+    r"a\"a"
+if 37:
+    r'a\'a'
+if 38:
+    r'a\\'
+if 39:
+    r'a\
+    '
diff --git a/python/extractor/tests/parser/types_new.expected b/python/extractor/tests/parser/types_new.expected
index be42268c201..a390ed1aae2 100644
--- a/python/extractor/tests/parser/types_new.expected
+++ b/python/extractor/tests/parser/types_new.expected
@@ -1,4 +1,4 @@
-Module: [1, 0] - [6, 0]
+Module: [1, 0] - [23, 0]
   body: [
     TypeAlias: [1, 0] - [1, 34]
       name:
@@ -12,6 +12,7 @@ Module: [1, 0] - [6, 0]
               variable: Variable('T1', None)
               ctx: Store
           bound: None
+          default: None
         TypeVar: [1, 11] - [1, 17]
           name:
             Name: [1, 11] - [1, 13]
@@ -21,16 +22,19 @@ Module: [1, 0] - [6, 0]
             Name: [1, 15] - [1, 17]
               variable: Variable('E1', None)
               ctx: Load
+          default: None
         TypeVarTuple: [1, 19] - [1, 22]
           name:
             Name: [1, 20] - [1, 22]
               variable: Variable('T3', None)
               ctx: Store
+          default: None
         ParamSpec: [1, 24] - [1, 28]
           name:
             Name: [1, 26] - [1, 28]
               variable: Variable('T4', None)
               ctx: Store
+          default: None
       ]
       value:
         Name: [1, 32] - [1, 34]
@@ -64,6 +68,7 @@ Module: [1, 0] - [6, 0]
                       variable: Variable('T6', None)
                       ctx: Store
                   bound: None
+                  default: None
                 TypeVar: [3, 10] - [3, 16]
                   name:
                     Name: [3, 10] - [3, 12]
@@ -73,16 +78,19 @@ Module: [1, 0] - [6, 0]
                     Name: [3, 14] - [3, 16]
                       variable: Variable('E2', None)
                       ctx: Load
+                  default: None
                 TypeVarTuple: [3, 18] - [3, 21]
                   name:
                     Name: [3, 19] - [3, 21]
                       variable: Variable('T8', None)
                       ctx: Store
+                  default: None
                 ParamSpec: [3, 23] - [3, 27]
                   name:
                     Name: [3, 25] - [3, 27]
                       variable: Variable('T9', None)
                       ctx: Store
+                  default: None
               ]
               args: []
               vararg: None
@@ -109,6 +117,7 @@ Module: [1, 0] - [6, 0]
                   variable: Variable('T10', None)
                   ctx: Store
               bound: None
+              default: None
             TypeVar: [5, 13] - [5, 20]
               name:
                 Name: [5, 13] - [5, 16]
@@ -118,16 +127,19 @@ Module: [1, 0] - [6, 0]
                 Name: [5, 18] - [5, 20]
                   variable: Variable('E3', None)
                   ctx: Load
+              default: None
             TypeVarTuple: [5, 22] - [5, 26]
               name:
                 Name: [5, 23] - [5, 26]
                   variable: Variable('T12', None)
                   ctx: Store
+              default: None
             ParamSpec: [5, 28] - [5, 33]
               name:
                 Name: [5, 30] - [5, 33]
                   variable: Variable('T13', None)
                   ctx: Store
+              default: None
           ]
           bases: []
           keywords: []
@@ -139,4 +151,284 @@ Module: [1, 0] - [6, 0]
                   value:
                     Ellipsis: [5, 36] - [5, 39]
               ]
+    Assign: [10, 0] - [10, 22]
+      targets: [
+        Name: [10, 6] - [10, 10]
+          variable: Variable('Foo1', None)
+          ctx: Store
+      ]
+      value:
+        ClassExpr: [10, 0] - [10, 22]
+          name: 'Foo1'
+          type_parameters: [
+            TypeVar: [10, 11] - [10, 20]
+              name:
+                Name: [10, 11] - [10, 14]
+                  variable: Variable('T14', None)
+                  ctx: Store
+              bound: None
+              default:
+                Name: [10, 17] - [10, 20]
+                  variable: Variable('str', None)
+                  ctx: Load
+          ]
+          bases: []
+          keywords: []
+          inner_scope:
+            Class: [10, 0] - [10, 22]
+              name: 'Foo1'
+              body: [
+                Expr: [10, 23] - [10, 26]
+                  value:
+                    Ellipsis: [10, 23] - [10, 26]
+              ]
+    Assign: [13, 0] - [13, 30]
+      targets: [
+        Name: [13, 6] - [13, 10]
+          variable: Variable('Baz1', None)
+          ctx: Store
+      ]
+      value:
+        ClassExpr: [13, 0] - [13, 30]
+          name: 'Baz1'
+          type_parameters: [
+            ParamSpec: [13, 11] - [13, 28]
+              name:
+                Name: [13, 13] - [13, 15]
+                  variable: Variable('P1', None)
+                  ctx: Store
+              default:
+                List: [13, 18] - [13, 28]
+                  elts: [
+                    Name: [13, 19] - [13, 22]
+                      variable: Variable('int', None)
+                      ctx: Load
+                    Name: [13, 24] - [13, 27]
+                      variable: Variable('str', None)
+                      ctx: Load
+                  ]
+                  ctx: Load
+          ]
+          bases: []
+          keywords: []
+          inner_scope:
+            Class: [13, 0] - [13, 30]
+              name: 'Baz1'
+              body: [
+                Expr: [13, 31] - [13, 34]
+                  value:
+                    Ellipsis: [13, 31] - [13, 34]
+              ]
+    Assign: [16, 0] - [16, 37]
+      targets: [
+        Name: [16, 6] - [16, 10]
+          variable: Variable('Qux1', None)
+          ctx: Store
+      ]
+      value:
+        ClassExpr: [16, 0] - [16, 37]
+          name: 'Qux1'
+          type_parameters: [
+            TypeVarTuple: [16, 11] - [16, 35]
+              name:
+                Name: [16, 12] - [16, 15]
+                  variable: Variable('Ts1', None)
+                  ctx: Store
+              default:
+                Starred: [16, 18] - [16, 35]
+                  value:
+                    Subscript: [16, 19] - [16, 35]
+                      value:
+                        Name: [16, 19] - [16, 24]
+                          variable: Variable('tuple', None)
+                          ctx: Load
+                      index:
+                        Tuple: [16, 25] - [16, 34]
+                          elts: [
+                            Name: [16, 25] - [16, 28]
+                              variable: Variable('int', None)
+                              ctx: Load
+                            Name: [16, 30] - [16, 34]
+                              variable: Variable('bool', None)
+                              ctx: Load
+                          ]
+                          ctx: Load
+                      ctx: Load
+                  ctx: Load
+          ]
+          bases: []
+          keywords: []
+          inner_scope:
+            Class: [16, 0] - [16, 37]
+              name: 'Qux1'
+              body: [
+                Expr: [16, 38] - [16, 41]
+                  value:
+                    Ellipsis: [16, 38] - [16, 41]
+              ]
+    TypeAlias: [19, 0] - [19, 40]
+      name:
+        Name: [19, 5] - [19, 9]
+          variable: Variable('Foo2', None)
+          ctx: Store
+      type_parameters: [
+        TypeVar: [19, 10] - [19, 13]
+          name:
+            Name: [19, 10] - [19, 13]
+              variable: Variable('T15', None)
+              ctx: Store
+          bound: None
+          default: None
+        TypeVar: [19, 15] - [19, 23]
+          name:
+            Name: [19, 15] - [19, 17]
+              variable: Variable('U1', None)
+              ctx: Store
+          bound: None
+          default:
+            Name: [19, 20] - [19, 23]
+              variable: Variable('str', None)
+              ctx: Load
+      ]
+      value:
+        Subscript: [19, 27] - [19, 40]
+          value:
+            Name: [19, 27] - [19, 31]
+              variable: Variable('Bar1', None)
+              ctx: Load
+          index:
+            Tuple: [19, 32] - [19, 39]
+              elts: [
+                Name: [19, 32] - [19, 35]
+                  variable: Variable('T15', None)
+                  ctx: Load
+                Name: [19, 37] - [19, 39]
+                  variable: Variable('U1', None)
+                  ctx: Load
+              ]
+              ctx: Load
+          ctx: Load
+    TypeAlias: [20, 0] - [20, 41]
+      name:
+        Name: [20, 5] - [20, 9]
+          variable: Variable('Baz2', None)
+          ctx: Store
+      type_parameters: [
+        ParamSpec: [20, 10] - [20, 27]
+          name:
+            Name: [20, 12] - [20, 14]
+              variable: Variable('P2', None)
+              ctx: Store
+          default:
+            List: [20, 17] - [20, 27]
+              elts: [
+                Name: [20, 18] - [20, 21]
+                  variable: Variable('int', None)
+                  ctx: Load
+                Name: [20, 23] - [20, 26]
+                  variable: Variable('str', None)
+                  ctx: Load
+              ]
+              ctx: Load
+      ]
+      value:
+        Subscript: [20, 31] - [20, 41]
+          value:
+            Name: [20, 31] - [20, 35]
+              variable: Variable('Spam', None)
+              ctx: Load
+          index:
+            BinOp: [20, 36] - [20, 40]
+              left:
+                Name: [20, 36] - [20, 36]
+                  variable: Variable('', None)
+                  ctx: Load
+              op: Pow
+              right:
+                Name: [20, 38] - [20, 40]
+                  variable: Variable('P2', None)
+                  ctx: Load
+          ctx: Load
+    TypeAlias: [21, 0] - [21, 41]
+      name:
+        Name: [21, 5] - [21, 9]
+          variable: Variable('Qux2', None)
+          ctx: Store
+      type_parameters: [
+        TypeVarTuple: [21, 10] - [21, 28]
+          name:
+            Name: [21, 11] - [21, 14]
+              variable: Variable('Ts2', None)
+              ctx: Store
+          default:
+            Starred: [21, 17] - [21, 28]
+              value:
+                Subscript: [21, 18] - [21, 28]
+                  value:
+                    Name: [21, 18] - [21, 23]
+                      variable: Variable('tuple', None)
+                      ctx: Load
+                  index:
+                    Name: [21, 24] - [21, 27]
+                      variable: Variable('str', None)
+                      ctx: Load
+                  ctx: Load
+              ctx: Load
+      ]
+      value:
+        Subscript: [21, 32] - [21, 41]
+          value:
+            Name: [21, 32] - [21, 35]
+              variable: Variable('Ham', None)
+              ctx: Load
+          index:
+            Starred: [21, 36] - [21, 40]
+              value:
+                Name: [21, 37] - [21, 40]
+                  variable: Variable('Ts2', None)
+                  ctx: Load
+              ctx: Load
+          ctx: Load
+    TypeAlias: [22, 0] - [22, 39]
+      name:
+        Name: [22, 5] - [22, 8]
+          variable: Variable('Rab', None)
+          ctx: Store
+      type_parameters: [
+        TypeVar: [22, 9] - [22, 11]
+          name:
+            Name: [22, 9] - [22, 11]
+              variable: Variable('U2', None)
+              ctx: Store
+          bound: None
+          default: None
+        TypeVar: [22, 13] - [22, 22]
+          name:
+            Name: [22, 13] - [22, 16]
+              variable: Variable('T15', None)
+              ctx: Store
+          bound: None
+          default:
+            Name: [22, 19] - [22, 22]
+              variable: Variable('str', None)
+              ctx: Load
+      ]
+      value:
+        Subscript: [22, 26] - [22, 39]
+          value:
+            Name: [22, 26] - [22, 30]
+              variable: Variable('Bar2', None)
+              ctx: Load
+          index:
+            Tuple: [22, 31] - [22, 38]
+              elts: [
+                Name: [22, 31] - [22, 34]
+                  variable: Variable('T15', None)
+                  ctx: Load
+                Name: [22, 36] - [22, 38]
+                  variable: Variable('U2', None)
+                  ctx: Load
+              ]
+              ctx: Load
+          ctx: Load
   ]
diff --git a/python/extractor/tests/parser/types_new.py b/python/extractor/tests/parser/types_new.py
index 844ba4930ed..12e5eac0556 100644
--- a/python/extractor/tests/parser/types_new.py
+++ b/python/extractor/tests/parser/types_new.py
@@ -3,3 +3,20 @@ type T[T1, T2: E1, *T3, **T4] = T5
 def f[T6, T7: E2, *T8, **T9](): ...
 
 class C[T10, T11: E3, *T12, **T13]: ...
+
+# From PEP-696 (https://peps.python.org/pep-0696/#grammar-changes):
+
+# TypeVars
+class Foo1[T14 = str]: ...
+
+# ParamSpecs
+class Baz1[**P1 = [int, str]]: ...
+
+# TypeVarTuples
+class Qux1[*Ts1 = *tuple[int, bool]]: ...
+
+# TypeAliases
+type Foo2[T15, U1 = str] = Bar1[T15, U1]
+type Baz2[**P2 = [int, str]] = Spam[**P2]
+type Qux2[*Ts2 = *tuple[str]] = Ham[*Ts2]
+type Rab[U2, T15 = str] = Bar2[T15, U2]
diff --git a/python/extractor/tests/test_parser.py b/python/extractor/tests/test_parser.py
index e93ffd1ffd7..0c74a62f452 100644
--- a/python/extractor/tests/test_parser.py
+++ b/python/extractor/tests/test_parser.py
@@ -49,6 +49,8 @@ class ParserTest(unittest.TestCase):
             diff = e.output
         if diff:
             pytest.fail(diff.decode("utf-8"))
+        self.check_for_stdout_errors(logger)
+
         self.assertEqual(self.capsys.readouterr().err, "")
         os.remove(oldfile)
         os.remove(newfile)
@@ -84,9 +86,15 @@ class ParserTest(unittest.TestCase):
             diff = e.output
         if diff:
             pytest.fail(diff.decode("utf-8"))
+
+        self.check_for_stdout_errors(logger)
         self.assertEqual(self.capsys.readouterr().err, "")
         os.remove(actual)
 
+    def check_for_stdout_errors(self, logger):
+        if logger.had_errors():
+            logger.reset_error_count()
+            pytest.fail("Errors/warnings were logged to stdout during testing.")
 
 def setup_tests():
     test_folder = os.path.join(os.path.dirname(__file__), "parser")
diff --git a/python/extractor/tsg-python/BUILD.bazel b/python/extractor/tsg-python/BUILD.bazel
index 8afaef6a4d7..30786ffcd3d 100644
--- a/python/extractor/tsg-python/BUILD.bazel
+++ b/python/extractor/tsg-python/BUILD.bazel
@@ -1,5 +1,5 @@
-load("@py_deps//:defs.bzl", "aliases", "all_crate_deps")
 load("//misc/bazel:rust.bzl", "codeql_rust_binary")
+load("//misc/bazel/3rdparty/py_deps:defs.bzl", "aliases", "all_crate_deps")
 
 codeql_rust_binary(
     name = "tsg-python",
@@ -14,3 +14,8 @@ codeql_rust_binary(
         normal = True,
     ) + ["//python/extractor/tsg-python/tsp"],
 )
+
+exports_files([
+    "Cargo.toml",
+    "Cargo.lock",
+])
diff --git a/python/extractor/tsg-python/Cargo.toml b/python/extractor/tsg-python/Cargo.toml
index 6585b1b9d52..ffb36176101 100644
--- a/python/extractor/tsg-python/Cargo.toml
+++ b/python/extractor/tsg-python/Cargo.toml
@@ -6,6 +6,7 @@ version = "0.1.0"
 authors = ["Taus Brock-Nannestad <tausbn@github.com>"]
 edition = "2021"
 
+# When updating these dependencies, run `misc/bazel/3rdparty/update_cargo_deps.sh`
 [dependencies]
 anyhow = "1.0"
 regex = "1"
diff --git a/python/extractor/tsg-python/python.tsg b/python/extractor/tsg-python/python.tsg
index e185bbbae79..097eb47a6e0 100644
--- a/python/extractor/tsg-python/python.tsg
+++ b/python/extractor/tsg-python/python.tsg
@@ -25,6 +25,9 @@
 [ (expression_list) (tuple) (tuple_pattern) (pattern_list) ] @tuple
 { let @tuple.node = (ast-node @tuple "Tuple") }
 
+(list_pattern) @list
+{ let @list.node = (ast-node @list "List") }
+
 (call) @call { let @call.node = (ast-node @call "Call") }
 
 (for_statement) @for
@@ -401,7 +404,7 @@
 
 ;;; GeneratorExp
 
-(generator_expression . "(" . (comment)* . (_) @start (_) @end . (comment)* . ")" .) @generatorexp
+(generator_expression . "(" . (comment)* . (expression) @start [(for_in_clause) (if_clause)] @end . (comment)* . ")" .) @generatorexp
 {
     attr (@generatorexp.node) _location_start = (location-start @start)
     attr (@generatorexp.node) _location_end = (location-end @end)
@@ -413,13 +416,13 @@
     attr (@if.node) _location_end = (location-end @expr)
 }
 
-(generator_expression . "(" . (comment)* . (_) @start (for_in_clause) @child (_) @end . (comment)* . ")" .) @genexpr
+(generator_expression . "(" . (comment)* . (expression) @start (for_in_clause) @child [(for_in_clause) (if_clause)] @end . (comment)* . ")" .) @genexpr
 {
     attr (@child.node) _location_start = (location-start @start)
     attr (@child.node) _location_end = (location-end @end)
 }
 
-(generator_expression . "(" . (comment)* . (_) @start (for_in_clause) @end . (comment)* . ")" .) @genexpr
+(generator_expression . "(" . (comment)* . (expression) @start (for_in_clause) @end . (comment)* . ")" .) @genexpr
 {
     attr (@end.node) _location_start = (location-start @start)
     attr (@end.node) _location_end = (location-end @end)
@@ -860,7 +863,7 @@
 ; information for the entire generator expression (yes, it is a wide parameter!) and so we must recreate the logic for
 ; setting this location information correctly.
 
-(generator_expression . "(" . (comment)* . (_) @start  (_) @end . (comment)* . ")" .) @genexpr
+(generator_expression . "(" . (comment)* . (expression) @start  [(for_in_clause) (if_clause)] @end . (comment)* . ")" .) @genexpr
 {
     ; Synthesize the `genexpr` function
     let @genexpr.fun = (ast-node @genexpr "Function")
@@ -1059,30 +1062,38 @@
     let @genexpr.result = tuple
 }
 
-; For the final `if` clause, we need to hook it up with the `yield` expression and with its associated `for` clause.
+; For the final clause, we need to hook it up with the rest of the expression.
+; If it's an `if` clause, we need to hook it up with the `yield` expression and with its associated
+; `for` clause.
+; If it's a `for` clause, we only need to create and hook it up with the `yield` expression.
+;
+; It would be tempting to use anchors here, but they just don't work. In particular, an anchor of
+; the form `. (comment)* . )` (which would be needed in order to handle the case where there are
+; comments after the last clause) cause the `tree-sitter` query engine to match _all_ clauses, not
+; just the last one.
+; Instead, we gather up all clauses in a list (these will be in the order they appear in the source
+; code), and extract the last element using a custom Rust function.
 [
     (generator_expression
         body: (_) @body
-        (if_clause) @last
-        .
+        [(if_clause) (for_in_clause)]+ @last_candidates
     ) @genexpr
     (list_comprehension
         body: (_) @body
-        (if_clause) @last
-        .
+        [(if_clause) (for_in_clause)]+ @last_candidates
     ) @genexpr
     (set_comprehension
         body: (_) @body
-        (if_clause) @last
-        .
+        [(if_clause) (for_in_clause)]+ @last_candidates
     ) @genexpr
     (dictionary_comprehension
         body: (_) @body
-        (if_clause) @last
-        .
+        [(if_clause) (for_in_clause)]+ @last_candidates
     ) @genexpr
 ]
 {
+    let last = (get-last-element @last_candidates)
+
     let expr = (ast-node @body "Expr")
     let yield = (ast-node @body "Yield")
 
@@ -1093,50 +1104,19 @@
 
     attr (yield) value = @genexpr.result
     attr (@body.node) ctx = "load"
-    edge @last.first_if -> expr
-    attr (@last.first_if -> expr) body = 0
 
-    ; Hook up this `if` clause with its `for` clause
-    edge @last.for -> @last.node
-    attr (@last.for -> @last.node) body = 0
-}
+    if (instance-of last "if_clause") {
+        edge last.first_if -> expr
+        attr (last.first_if -> expr) body = 0
 
-; If the last clause is a `for`, we only have to create and hook up the `yield` expression.
-[
-    (generator_expression
-        body: (_) @body
-        (for_in_clause) @last
-        .
-    ) @genexpr
-    (list_comprehension
-        body: (_) @body
-        (for_in_clause) @last
-        .
-    ) @genexpr
-    (set_comprehension
-        body: (_) @body
-        (for_in_clause) @last
-        .
-    ) @genexpr
-    (dictionary_comprehension
-        body: (_) @body
-        (for_in_clause) @last
-        .
-    ) @genexpr
-]
-{
-    let expr = (ast-node @body "Expr")
-    let yield = (ast-node @body "Yield")
-
-    let @genexpr.expr = expr
-    let @genexpr.yield = yield
-
-    attr (expr) value = yield
-
-    attr (yield) value = @genexpr.result
-    attr (@body.node) ctx = "load"
-    edge @last.node -> expr
-    attr (@last.node -> expr) body = 0
+        ; Hook up this `if` clause with its `for` clause
+        edge last.for -> last.node
+        attr (last.for -> last.node) body = 0
+    } else {
+        ; If the last clause is a `for`, we only have to create and hook up the `yield` expression.
+        edge last.node -> expr
+        attr (last.node -> expr) body = 0
+    }
 }
 
 ; For whatever reason, we do not consider parentheses around the yielded expression if they are present, so
@@ -1277,16 +1257,18 @@
     attr (@class.inner_scope -> @stmt.node) body = (named-child-index @stmt)
 }
 
-; Class.bases - using `(_ !name)` as a proxy for all non-keyword arguments.
+; Class.bases - using `(_  !value !name)` as a proxy for all non-keyword arguments.
+; In particular, `keyword_argument` nodes have a `name` field, and `dictionary_splat`
+; nodes have a `value` field.
 (class_definition
-    superclasses: (argument_list element: (_ !name) @arg)
+    superclasses: (argument_list element: (_ !value !name) @arg)
 ) @class
 {
     edge @class.class_expr -> @arg.node
     attr (@class.class_expr -> @arg.node) bases = (named-child-index @arg)
 }
 
-; Class.keywords
+; Class.keywords of the form `foo=bar`
 (class_definition
     superclasses: (argument_list element: (keyword_argument) @arg)
 ) @class
@@ -1295,6 +1277,15 @@
     attr (@class.class_expr -> @arg.node) keywords = (named-child-index @arg)
 }
 
+; Class.keywords of the form `**kwargs`
+(class_definition
+    superclasses: (argument_list element: (dictionary_splat) @arg)
+) @class
+{
+    edge @class.class_expr -> @arg.node
+    attr (@class.class_expr -> @arg.node) keywords = (named-child-index @arg)
+}
+
 ;;;;;; End of Class
 
 ;;;;;; Assign statements
@@ -2670,6 +2661,14 @@
     let @with.first = @first.node
 }
 
+; Async status
+; NOTE: We only set the `is_async` field on the _first_ clause of the `with` statement,
+; as this is the behaviour of the old parser.
+(with_statement "async" "with" @with_keyword (with_clause . (with_item) @with))
+{
+    attr (@with.node) is_async = #true
+}
+
 (with_item
     value: (_) @value
 ) @with
@@ -3169,11 +3168,11 @@
             (typed_parameter
                 (identifier) @name
                 .
-                type: (type (expression) @type)
+                type: (type (_) @type)
             )
             (typed_default_parameter
                 name: (_) @name
-                type: (type (expression) @type)
+                type: (type (_) @type)
                 value: (_) @value
             )
         ] @param
@@ -3228,7 +3227,7 @@
             (list_splat_pattern vararg: (_) @name) @starred
             (typed_parameter
                 (list_splat_pattern vararg: (_) @name) @starred
-                type: (type (expression) @type)
+                type: (type (_) @type)
             )
         ]
     ) @params
@@ -3245,7 +3244,7 @@
 
 ; Return type
 (function_definition
-    return_type: (type (expression) @type)
+    return_type: (type (_) @type)
 ) @funcdef
 {
     attr (@funcdef.funcexpr) returns = @type.node
@@ -3259,7 +3258,7 @@
             (dictionary_splat_pattern kwarg: (identifier) @name)
             (typed_parameter
                 (dictionary_splat_pattern kwarg: (identifier) @name)
-                type: (type (expression) @type)
+                type: (type (_) @type)
             )
         ]
     ) @params
@@ -3273,6 +3272,16 @@
     }
 }
 
+; Async status
+(function_definition "async" "def" @def_keyword) @funcdef
+{
+    let start = (location-start @def_keyword)
+    attr (@funcdef.function) is_async = #true
+    attr (@funcdef.node) _location_start = start
+    attr (@funcdef.function) _location_start = start
+    attr (@funcdef.funcexpr) _location_start = start
+}
+
 ;;; Decorators
 
 (decorated_definition
@@ -3388,6 +3397,7 @@
 (typevar_parameter
     name: (_) @name
     bound: (_)? @bound
+    default: (_)? @default
 ) @typevar
 {
     attr (@name.node) ctx = "store"
@@ -3396,22 +3406,36 @@
         attr (@bound.node) ctx = "load"
         attr (@typevar.node) bound = @bound.node
     }
+    if some @default {
+        attr (@default.node) ctx = "load"
+        attr (@typevar.node) default = @default.node
+    }
 }
 
 (typevartuple_parameter
     name: (_) @name
+    default: (_)? @default
 ) @typevartuple
 {
     attr (@name.node) ctx = "store"
     attr (@typevartuple.node) name = @name.node
+    if some @default {
+        attr (@default.node) ctx = "load"
+        attr (@typevartuple.node) default = @default.node
+    }
 }
 
 (paramspec_parameter
     name: (_) @name
+    default: (_)? @default
 ) @paramspec
 {
     attr (@name.node) ctx = "store"
     attr (@paramspec.node) name = @name.node
+    if some @default {
+        attr (@default.node) ctx = "load"
+        attr (@paramspec.node) default = @default.node
+    }
 }
 
 ;;;;;; End of Type parameters (`T: ..., *T, **T`)
@@ -3421,6 +3445,9 @@
     ; Left hand side of an assignment such as `foo, bar = ...`
     (pattern_list element: (_) @elt) @parent
 
+    ; Left hand side of an assignment such as `[foo, bar] = ...`
+    (list_pattern element: (_) @elt) @parent
+
     ; An unadorned tuple (such as in `x = y, z`)
     (expression_list element: (_) @elt) @parent
 
@@ -3457,6 +3484,7 @@
     (tuple element: (_) @elt)
     (tuple_pattern element: (_) @elt)
     (pattern_list element: (_) @elt)
+    (list_pattern element: (_) @elt)
     (expression_list element: (_) @elt)
     (parenthesized_expression inner: (_) @elt)
     (set element: (_) @elt)
@@ -3468,5 +3496,9 @@
 
 [(tuple element: (_)) (tuple_pattern)] @tup
 {
-    attr (@tup.node) parenthesised = #true
+    ; In order to avoid writing to the `parenthesised` attribute twice, we only set it here
+    ; if the surrounding expression is not a `parenthesized_expression`.
+    if (not (instance-of (get-parent @tup) "parenthesized_expression")) {
+        attr (@tup.node) parenthesised = #true
+    }
 }
diff --git a/python/extractor/tsg-python/src/main.rs b/python/extractor/tsg-python/src/main.rs
index ebfcd01a74e..4f876a083e8 100644
--- a/python/extractor/tsg-python/src/main.rs
+++ b/python/extractor/tsg-python/src/main.rs
@@ -463,6 +463,22 @@ pub mod extra_functions {
             Ok(Value::Integer(left % right))
         }
     }
+
+    pub struct GetLastElement;
+
+    impl Function for GetLastElement {
+        fn call(
+            &self,
+            _graph: &mut Graph,
+            _source: &str,
+            parameters: &mut dyn Parameters,
+        ) -> Result<Value, ExecutionError> {
+            let list = parameters.param()?.into_list()?;
+            parameters.finish()?;
+            let last = list.last().unwrap_or(&Value::Null).clone();
+            Ok(last)
+        }
+    }
 }
 
 fn main() -> Result<()> {
@@ -562,6 +578,12 @@ fn main() -> Result<()> {
     );
 
     functions.add(Identifier::from("mod"), extra_functions::Modulo);
+
+    functions.add(
+        Identifier::from("get-last-element"),
+        extra_functions::GetLastElement,
+    );
+
     let globals = Variables::new();
     let mut config = ExecutionConfig::new(&mut functions, &globals).lazy(false);
     let graph = file
diff --git a/python/extractor/tsg-python/tsp/BUILD.bazel b/python/extractor/tsg-python/tsp/BUILD.bazel
index 1f7ec006c65..f45d8f7f41f 100644
--- a/python/extractor/tsg-python/tsp/BUILD.bazel
+++ b/python/extractor/tsg-python/tsp/BUILD.bazel
@@ -1,6 +1,6 @@
-load("@py_deps//:defs.bzl", "aliases", "all_crate_deps")
 load("@rules_rust//cargo:defs.bzl", "cargo_build_script")
 load("@rules_rust//rust:defs.bzl", "rust_library")
+load("//misc/bazel/3rdparty/py_deps:defs.bzl", "aliases", "all_crate_deps")
 
 package(default_visibility = ["//visibility:public"])
 
@@ -36,3 +36,5 @@ rust_library(
         normal = True,
     ),
 )
+
+exports_files(["Cargo.toml"])
diff --git a/python/extractor/tsg-python/tsp/Cargo.toml b/python/extractor/tsg-python/tsp/Cargo.toml
index 995f39a3bd9..ccbb4b558c3 100644
--- a/python/extractor/tsg-python/tsp/Cargo.toml
+++ b/python/extractor/tsg-python/tsp/Cargo.toml
@@ -24,6 +24,7 @@ include = [
 [lib]
 path = "bindings/rust/lib.rs"
 
+## When updating these dependencies, run `misc/bazel/3rdparty/update_cargo_deps.sh`
 [dependencies]
 tree-sitter = ">= 0.20, < 0.21"
 
diff --git a/python/extractor/tsg-python/tsp/grammar.js b/python/extractor/tsg-python/tsp/grammar.js
index 3fc832cb4e5..b41906d9d7b 100644
--- a/python/extractor/tsg-python/tsp/grammar.js
+++ b/python/extractor/tsg-python/tsp/grammar.js
@@ -309,7 +309,8 @@ module.exports = grammar({
     ),
 
     except_group_clause: $ => seq(
-      'except*',
+      'except',
+      '*',
       seq(
         field('type', $.expression),
         optional(seq(
@@ -589,17 +590,20 @@ module.exports = grammar({
 
     typevar_parameter: $ => seq(
       field('name', $.identifier),
-      optional($._type_bound)
+      optional($._type_bound),
+      optional($._type_param_default)
     ),
 
     typevartuple_parameter: $ => seq(
       '*',
       field('name', $.identifier),
+      optional($._type_param_default)
     ),
 
     paramspec_parameter: $ => seq(
       '**',
       field('name', $.identifier),
+      optional($._type_param_default),
     ),
 
     _type_parameter: $ => choice(
@@ -608,6 +612,11 @@ module.exports = grammar({
         $.paramspec_parameter,
     ),
 
+    _type_param_default: $ => seq(
+      '=',
+      field('default', choice($.list_splat, $.expression))
+    ),
+
     parenthesized_list_splat: $ => prec(PREC.parenthesized_list_splat, seq(
       '(',
       choice(
@@ -742,7 +751,6 @@ module.exports = grammar({
       $.comparison_operator,
       $.not_operator,
       $.boolean_operator,
-      $.await,
       $.lambda,
       $.primary_expression,
       $.conditional_expression,
@@ -750,6 +758,7 @@ module.exports = grammar({
     ),
 
     primary_expression: $ => choice(
+      $.await,
       $.binary_operator,
       $.identifier,
       $.keyword_identifier,
@@ -923,7 +932,7 @@ module.exports = grammar({
     subscript: $ => prec(PREC.call, seq(
       field('value', $.primary_expression),
       '[',
-      commaSep1(field('subscript', choice($.expression, $.slice))),
+      commaSep1(field('subscript', choice($.list_splat, $.expression, $.slice))),
       optional(','),
       ']'
     )),
@@ -955,7 +964,7 @@ module.exports = grammar({
       field('type', $.type)
     )),
 
-    type: $ => $.expression,
+    type: $ => choice($.list_splat, $.expression),
 
     keyword_argument: $ => seq(
       field('name', choice($.identifier, $.keyword_identifier)),
@@ -1193,7 +1202,7 @@ module.exports = grammar({
 
     await: $ => prec(PREC.unary, seq(
       'await',
-      $.expression
+      $.primary_expression
     )),
 
     comment: $ => token(seq('#', /.*/)),
diff --git a/python/extractor/tsg-python/tsp/src/grammar.json b/python/extractor/tsg-python/tsp/src/grammar.json
index 957471765c3..fd8b8033851 100644
--- a/python/extractor/tsg-python/tsp/src/grammar.json
+++ b/python/extractor/tsg-python/tsp/src/grammar.json
@@ -1168,7 +1168,11 @@
       "members": [
         {
           "type": "STRING",
-          "value": "except*"
+          "value": "except"
+        },
+        {
+          "type": "STRING",
+          "value": "*"
         },
         {
           "type": "SEQ",
@@ -2970,6 +2974,18 @@
               "type": "BLANK"
             }
           ]
+        },
+        {
+          "type": "CHOICE",
+          "members": [
+            {
+              "type": "SYMBOL",
+              "name": "_type_param_default"
+            },
+            {
+              "type": "BLANK"
+            }
+          ]
         }
       ]
     },
@@ -2987,6 +3003,18 @@
             "type": "SYMBOL",
             "name": "identifier"
           }
+        },
+        {
+          "type": "CHOICE",
+          "members": [
+            {
+              "type": "SYMBOL",
+              "name": "_type_param_default"
+            },
+            {
+              "type": "BLANK"
+            }
+          ]
         }
       ]
     },
@@ -3004,6 +3032,18 @@
             "type": "SYMBOL",
             "name": "identifier"
           }
+        },
+        {
+          "type": "CHOICE",
+          "members": [
+            {
+              "type": "SYMBOL",
+              "name": "_type_param_default"
+            },
+            {
+              "type": "BLANK"
+            }
+          ]
         }
       ]
     },
@@ -3024,6 +3064,32 @@
         }
       ]
     },
+    "_type_param_default": {
+      "type": "SEQ",
+      "members": [
+        {
+          "type": "STRING",
+          "value": "="
+        },
+        {
+          "type": "FIELD",
+          "name": "default",
+          "content": {
+            "type": "CHOICE",
+            "members": [
+              {
+                "type": "SYMBOL",
+                "name": "list_splat"
+              },
+              {
+                "type": "SYMBOL",
+                "name": "expression"
+              }
+            ]
+          }
+        }
+      ]
+    },
     "parenthesized_list_splat": {
       "type": "PREC",
       "value": 1,
@@ -3776,10 +3842,6 @@
           "type": "SYMBOL",
           "name": "boolean_operator"
         },
-        {
-          "type": "SYMBOL",
-          "name": "await"
-        },
         {
           "type": "SYMBOL",
           "name": "lambda"
@@ -3801,6 +3863,10 @@
     "primary_expression": {
       "type": "CHOICE",
       "members": [
+        {
+          "type": "SYMBOL",
+          "name": "await"
+        },
         {
           "type": "SYMBOL",
           "name": "binary_operator"
@@ -5006,6 +5072,10 @@
                 "content": {
                   "type": "CHOICE",
                   "members": [
+                    {
+                      "type": "SYMBOL",
+                      "name": "list_splat"
+                    },
                     {
                       "type": "SYMBOL",
                       "name": "expression"
@@ -5032,6 +5102,10 @@
                       "content": {
                         "type": "CHOICE",
                         "members": [
+                          {
+                            "type": "SYMBOL",
+                            "name": "list_splat"
+                          },
                           {
                             "type": "SYMBOL",
                             "name": "expression"
@@ -5218,8 +5292,17 @@
       }
     },
     "type": {
-      "type": "SYMBOL",
-      "name": "expression"
+      "type": "CHOICE",
+      "members": [
+        {
+          "type": "SYMBOL",
+          "name": "list_splat"
+        },
+        {
+          "type": "SYMBOL",
+          "name": "expression"
+        }
+      ]
     },
     "keyword_argument": {
       "type": "SEQ",
@@ -6502,7 +6585,7 @@
           },
           {
             "type": "SYMBOL",
-            "name": "expression"
+            "name": "primary_expression"
           }
         ]
       }
diff --git a/python/extractor/tsg-python/tsp/src/node-types.json b/python/extractor/tsg-python/tsp/src/node-types.json
index 515d815d833..553f75fa6c7 100644
--- a/python/extractor/tsg-python/tsp/src/node-types.json
+++ b/python/extractor/tsg-python/tsp/src/node-types.json
@@ -115,10 +115,6 @@
     "type": "expression",
     "named": true,
     "subtypes": [
-      {
-        "type": "await",
-        "named": true
-      },
       {
         "type": "boolean_operator",
         "named": true
@@ -229,6 +225,10 @@
         "type": "attribute",
         "named": true
       },
+      {
+        "type": "await",
+        "named": true
+      },
       {
         "type": "binary_operator",
         "named": true
@@ -587,7 +587,7 @@
       "required": true,
       "types": [
         {
-          "type": "expression",
+          "type": "primary_expression",
           "named": true
         }
       ]
@@ -2809,6 +2809,20 @@
     "type": "paramspec_parameter",
     "named": true,
     "fields": {
+      "default": {
+        "multiple": false,
+        "required": false,
+        "types": [
+          {
+            "type": "expression",
+            "named": true
+          },
+          {
+            "type": "list_splat",
+            "named": true
+          }
+        ]
+      },
       "name": {
         "multiple": false,
         "required": true,
@@ -3193,6 +3207,10 @@
             "type": "expression",
             "named": true
           },
+          {
+            "type": "list_splat",
+            "named": true
+          },
           {
             "type": "slice",
             "named": true
@@ -3328,6 +3346,10 @@
         {
           "type": "expression",
           "named": true
+        },
+        {
+          "type": "list_splat",
+          "named": true
         }
       ]
     }
@@ -3476,6 +3498,20 @@
           }
         ]
       },
+      "default": {
+        "multiple": false,
+        "required": false,
+        "types": [
+          {
+            "type": "expression",
+            "named": true
+          },
+          {
+            "type": "list_splat",
+            "named": true
+          }
+        ]
+      },
       "name": {
         "multiple": false,
         "required": true,
@@ -3492,6 +3528,20 @@
     "type": "typevartuple_parameter",
     "named": true,
     "fields": {
+      "default": {
+        "multiple": false,
+        "required": false,
+        "types": [
+          {
+            "type": "expression",
+            "named": true
+          },
+          {
+            "type": "list_splat",
+            "named": true
+          }
+        ]
+      },
       "name": {
         "multiple": false,
         "required": true,
@@ -3905,10 +3955,6 @@
     "type": "except",
     "named": false
   },
-  {
-    "type": "except*",
-    "named": false
-  },
   {
     "type": "exec",
     "named": false
diff --git a/python/extractor/tsg-python/tsp/src/parser.c b/python/extractor/tsg-python/tsp/src/parser.c
index 05a076d96a2..3bf02375121 100644
--- a/python/extractor/tsg-python/tsp/src/parser.c
+++ b/python/extractor/tsg-python/tsp/src/parser.c
@@ -5,16 +5,16 @@
 #pragma GCC diagnostic ignored "-Wmissing-field-initializers"
 #endif
 
-#define LANGUAGE_VERSION 14
-#define STATE_COUNT 1525
-#define LARGE_STATE_COUNT 155
+#define LANGUAGE_VERSION 13
+#define STATE_COUNT 1506
+#define LARGE_STATE_COUNT 149
 #define SYMBOL_COUNT 280
 #define ALIAS_COUNT 3
-#define TOKEN_COUNT 108
+#define TOKEN_COUNT 107
 #define EXTERNAL_TOKEN_COUNT 6
-#define FIELD_COUNT 53
+#define FIELD_COUNT 54
 #define MAX_ALIAS_SEQUENCE_LENGTH 10
-#define PRODUCTION_ID_COUNT 161
+#define PRODUCTION_ID_COUNT 169
 
 enum {
   sym_identifier = 1,
@@ -47,158 +47,158 @@ enum {
   anon_sym_while = 28,
   anon_sym_try = 29,
   anon_sym_except = 30,
-  anon_sym_except_STAR = 31,
-  anon_sym_finally = 32,
-  anon_sym_with = 33,
-  anon_sym_match = 34,
-  anon_sym_case = 35,
-  anon_sym_PIPE = 36,
-  anon_sym_DASH = 37,
-  anon_sym_PLUS = 38,
-  sym_match_wildcard_pattern = 39,
-  anon_sym_LBRACK = 40,
-  anon_sym_RBRACK = 41,
-  anon_sym_LBRACE = 42,
-  anon_sym_RBRACE = 43,
-  anon_sym_STAR_STAR = 44,
-  anon_sym_EQ = 45,
-  anon_sym_def = 46,
-  anon_sym_DASH_GT = 47,
-  anon_sym_global = 48,
-  anon_sym_nonlocal = 49,
-  anon_sym_exec = 50,
-  anon_sym_type = 51,
-  anon_sym_class = 52,
-  anon_sym_AT = 53,
-  anon_sym_not = 54,
-  anon_sym_and = 55,
-  anon_sym_or = 56,
-  anon_sym_SLASH = 57,
-  anon_sym_PERCENT = 58,
-  anon_sym_SLASH_SLASH = 59,
-  anon_sym_AMP = 60,
-  anon_sym_CARET = 61,
-  anon_sym_LT_LT = 62,
-  anon_sym_TILDE = 63,
-  anon_sym_LT = 64,
-  anon_sym_LT_EQ = 65,
-  anon_sym_EQ_EQ = 66,
-  anon_sym_BANG_EQ = 67,
-  anon_sym_GT_EQ = 68,
-  anon_sym_GT = 69,
-  anon_sym_LT_GT = 70,
-  anon_sym_is = 71,
-  anon_sym_lambda = 72,
-  anon_sym_PLUS_EQ = 73,
-  anon_sym_DASH_EQ = 74,
-  anon_sym_STAR_EQ = 75,
-  anon_sym_SLASH_EQ = 76,
-  anon_sym_AT_EQ = 77,
-  anon_sym_SLASH_SLASH_EQ = 78,
-  anon_sym_PERCENT_EQ = 79,
-  anon_sym_STAR_STAR_EQ = 80,
-  anon_sym_GT_GT_EQ = 81,
-  anon_sym_LT_LT_EQ = 82,
-  anon_sym_AMP_EQ = 83,
-  anon_sym_CARET_EQ = 84,
-  anon_sym_PIPE_EQ = 85,
-  anon_sym_yield = 86,
-  sym_ellipsis = 87,
-  anon_sym_LBRACE2 = 88,
-  sym__escape_interpolation = 89,
-  sym_escape_sequence = 90,
-  sym__not_escape_sequence = 91,
-  aux_sym_format_specifier_token1 = 92,
-  sym_type_conversion = 93,
-  sym_integer = 94,
-  sym_float = 95,
-  anon_sym_await = 96,
-  sym_true = 97,
-  sym_false = 98,
-  sym_none = 99,
-  sym_comment = 100,
-  sym__semicolon = 101,
-  sym__newline = 102,
-  sym__indent = 103,
-  sym__dedent = 104,
-  sym__string_start = 105,
-  sym__string_content = 106,
-  sym__string_end = 107,
-  sym_module = 108,
-  sym__statement = 109,
-  sym__simple_statements = 110,
-  sym_import_statement = 111,
-  sym_import_prefix = 112,
-  sym_relative_import = 113,
-  sym_future_import_statement = 114,
-  sym_import_from_statement = 115,
-  sym__import_list = 116,
-  sym_aliased_import = 117,
-  sym_wildcard_import = 118,
-  sym_print_statement = 119,
-  sym_chevron = 120,
-  sym_assert_statement = 121,
-  sym_expression_statement = 122,
-  sym_named_expression = 123,
-  sym_return_statement = 124,
-  sym_delete_statement = 125,
-  sym_raise_statement = 126,
-  sym_pass_statement = 127,
-  sym_break_statement = 128,
-  sym_continue_statement = 129,
-  sym_if_statement = 130,
-  sym_elif_clause = 131,
-  sym_else_clause = 132,
-  sym_for_statement = 133,
-  sym_while_statement = 134,
-  sym_try_statement = 135,
-  sym_except_clause = 136,
-  sym_except_group_clause = 137,
-  sym_finally_clause = 138,
-  sym_with_statement = 139,
-  sym_with_clause = 140,
-  sym_with_item = 141,
-  sym_match_statement = 142,
-  sym_cases = 143,
-  sym_case_block = 144,
-  sym__match_patterns = 145,
-  sym_open_sequence_match_pattern = 146,
-  sym__match_pattern = 147,
-  sym_match_as_pattern = 148,
-  sym__match_or_pattern = 149,
-  sym_match_or_pattern = 150,
-  sym__closed_pattern = 151,
-  sym_match_literal_pattern = 152,
-  sym_match_capture_pattern = 153,
-  sym_match_value_pattern = 154,
-  sym_match_group_pattern = 155,
-  sym_match_sequence_pattern = 156,
-  sym__match_maybe_star_pattern = 157,
-  sym_match_star_pattern = 158,
-  sym_match_mapping_pattern = 159,
-  sym_match_double_star_pattern = 160,
-  sym_match_key_value_pattern = 161,
-  sym_match_class_pattern = 162,
-  sym_pattern_class_name = 163,
-  sym_match_positional_pattern = 164,
-  sym_match_keyword_pattern = 165,
-  sym_guard = 166,
-  sym_function_definition = 167,
-  sym_parameters = 168,
-  sym_lambda_parameters = 169,
-  sym_list_splat = 170,
-  sym_dictionary_splat = 171,
-  sym_global_statement = 172,
-  sym_nonlocal_statement = 173,
-  sym_exec_statement = 174,
-  sym_type_alias_statement = 175,
-  sym_class_definition = 176,
-  sym_type_parameters = 177,
-  sym__type_bound = 178,
-  sym_typevar_parameter = 179,
-  sym_typevartuple_parameter = 180,
-  sym_paramspec_parameter = 181,
-  sym__type_parameter = 182,
+  anon_sym_finally = 31,
+  anon_sym_with = 32,
+  anon_sym_match = 33,
+  anon_sym_case = 34,
+  anon_sym_PIPE = 35,
+  anon_sym_DASH = 36,
+  anon_sym_PLUS = 37,
+  sym_match_wildcard_pattern = 38,
+  anon_sym_LBRACK = 39,
+  anon_sym_RBRACK = 40,
+  anon_sym_LBRACE = 41,
+  anon_sym_RBRACE = 42,
+  anon_sym_STAR_STAR = 43,
+  anon_sym_EQ = 44,
+  anon_sym_def = 45,
+  anon_sym_DASH_GT = 46,
+  anon_sym_global = 47,
+  anon_sym_nonlocal = 48,
+  anon_sym_exec = 49,
+  anon_sym_type = 50,
+  anon_sym_class = 51,
+  anon_sym_AT = 52,
+  anon_sym_not = 53,
+  anon_sym_and = 54,
+  anon_sym_or = 55,
+  anon_sym_SLASH = 56,
+  anon_sym_PERCENT = 57,
+  anon_sym_SLASH_SLASH = 58,
+  anon_sym_AMP = 59,
+  anon_sym_CARET = 60,
+  anon_sym_LT_LT = 61,
+  anon_sym_TILDE = 62,
+  anon_sym_LT = 63,
+  anon_sym_LT_EQ = 64,
+  anon_sym_EQ_EQ = 65,
+  anon_sym_BANG_EQ = 66,
+  anon_sym_GT_EQ = 67,
+  anon_sym_GT = 68,
+  anon_sym_LT_GT = 69,
+  anon_sym_is = 70,
+  anon_sym_lambda = 71,
+  anon_sym_PLUS_EQ = 72,
+  anon_sym_DASH_EQ = 73,
+  anon_sym_STAR_EQ = 74,
+  anon_sym_SLASH_EQ = 75,
+  anon_sym_AT_EQ = 76,
+  anon_sym_SLASH_SLASH_EQ = 77,
+  anon_sym_PERCENT_EQ = 78,
+  anon_sym_STAR_STAR_EQ = 79,
+  anon_sym_GT_GT_EQ = 80,
+  anon_sym_LT_LT_EQ = 81,
+  anon_sym_AMP_EQ = 82,
+  anon_sym_CARET_EQ = 83,
+  anon_sym_PIPE_EQ = 84,
+  anon_sym_yield = 85,
+  sym_ellipsis = 86,
+  anon_sym_LBRACE2 = 87,
+  sym__escape_interpolation = 88,
+  sym_escape_sequence = 89,
+  sym__not_escape_sequence = 90,
+  aux_sym_format_specifier_token1 = 91,
+  sym_type_conversion = 92,
+  sym_integer = 93,
+  sym_float = 94,
+  anon_sym_await = 95,
+  sym_true = 96,
+  sym_false = 97,
+  sym_none = 98,
+  sym_comment = 99,
+  sym__semicolon = 100,
+  sym__newline = 101,
+  sym__indent = 102,
+  sym__dedent = 103,
+  sym__string_start = 104,
+  sym__string_content = 105,
+  sym__string_end = 106,
+  sym_module = 107,
+  sym__statement = 108,
+  sym__simple_statements = 109,
+  sym_import_statement = 110,
+  sym_import_prefix = 111,
+  sym_relative_import = 112,
+  sym_future_import_statement = 113,
+  sym_import_from_statement = 114,
+  sym__import_list = 115,
+  sym_aliased_import = 116,
+  sym_wildcard_import = 117,
+  sym_print_statement = 118,
+  sym_chevron = 119,
+  sym_assert_statement = 120,
+  sym_expression_statement = 121,
+  sym_named_expression = 122,
+  sym_return_statement = 123,
+  sym_delete_statement = 124,
+  sym_raise_statement = 125,
+  sym_pass_statement = 126,
+  sym_break_statement = 127,
+  sym_continue_statement = 128,
+  sym_if_statement = 129,
+  sym_elif_clause = 130,
+  sym_else_clause = 131,
+  sym_for_statement = 132,
+  sym_while_statement = 133,
+  sym_try_statement = 134,
+  sym_except_clause = 135,
+  sym_except_group_clause = 136,
+  sym_finally_clause = 137,
+  sym_with_statement = 138,
+  sym_with_clause = 139,
+  sym_with_item = 140,
+  sym_match_statement = 141,
+  sym_cases = 142,
+  sym_case_block = 143,
+  sym__match_patterns = 144,
+  sym_open_sequence_match_pattern = 145,
+  sym__match_pattern = 146,
+  sym_match_as_pattern = 147,
+  sym__match_or_pattern = 148,
+  sym_match_or_pattern = 149,
+  sym__closed_pattern = 150,
+  sym_match_literal_pattern = 151,
+  sym_match_capture_pattern = 152,
+  sym_match_value_pattern = 153,
+  sym_match_group_pattern = 154,
+  sym_match_sequence_pattern = 155,
+  sym__match_maybe_star_pattern = 156,
+  sym_match_star_pattern = 157,
+  sym_match_mapping_pattern = 158,
+  sym_match_double_star_pattern = 159,
+  sym_match_key_value_pattern = 160,
+  sym_match_class_pattern = 161,
+  sym_pattern_class_name = 162,
+  sym_match_positional_pattern = 163,
+  sym_match_keyword_pattern = 164,
+  sym_guard = 165,
+  sym_function_definition = 166,
+  sym_parameters = 167,
+  sym_lambda_parameters = 168,
+  sym_list_splat = 169,
+  sym_dictionary_splat = 170,
+  sym_global_statement = 171,
+  sym_nonlocal_statement = 172,
+  sym_exec_statement = 173,
+  sym_type_alias_statement = 174,
+  sym_class_definition = 175,
+  sym_type_parameters = 176,
+  sym__type_bound = 177,
+  sym_typevar_parameter = 178,
+  sym_typevartuple_parameter = 179,
+  sym_paramspec_parameter = 180,
+  sym__type_parameter = 181,
+  sym__type_param_default = 182,
   sym_parenthesized_list_splat = 183,
   sym_argument_list = 184,
   sym_decorated_definition = 185,
@@ -333,7 +333,6 @@ static const char * const ts_symbol_names[] = {
   [anon_sym_while] = "while",
   [anon_sym_try] = "try",
   [anon_sym_except] = "except",
-  [anon_sym_except_STAR] = "except*",
   [anon_sym_finally] = "finally",
   [anon_sym_with] = "with",
   [anon_sym_match] = "match",
@@ -485,6 +484,7 @@ static const char * const ts_symbol_names[] = {
   [sym_typevartuple_parameter] = "typevartuple_parameter",
   [sym_paramspec_parameter] = "paramspec_parameter",
   [sym__type_parameter] = "_type_parameter",
+  [sym__type_param_default] = "_type_param_default",
   [sym_parenthesized_list_splat] = "parenthesized_list_splat",
   [sym_argument_list] = "argument_list",
   [sym_decorated_definition] = "decorated_definition",
@@ -619,7 +619,6 @@ static const TSSymbol ts_symbol_map[] = {
   [anon_sym_while] = anon_sym_while,
   [anon_sym_try] = anon_sym_try,
   [anon_sym_except] = anon_sym_except,
-  [anon_sym_except_STAR] = anon_sym_except_STAR,
   [anon_sym_finally] = anon_sym_finally,
   [anon_sym_with] = anon_sym_with,
   [anon_sym_match] = anon_sym_match,
@@ -771,6 +770,7 @@ static const TSSymbol ts_symbol_map[] = {
   [sym_typevartuple_parameter] = sym_typevartuple_parameter,
   [sym_paramspec_parameter] = sym_paramspec_parameter,
   [sym__type_parameter] = sym__type_parameter,
+  [sym__type_param_default] = sym__type_param_default,
   [sym_parenthesized_list_splat] = sym_parenthesized_list_splat,
   [sym_argument_list] = sym_argument_list,
   [sym_decorated_definition] = sym_decorated_definition,
@@ -998,10 +998,6 @@ static const TSSymbolMetadata ts_symbol_metadata[] = {
     .visible = true,
     .named = false,
   },
-  [anon_sym_except_STAR] = {
-    .visible = true,
-    .named = false,
-  },
   [anon_sym_finally] = {
     .visible = true,
     .named = false,
@@ -1606,6 +1602,10 @@ static const TSSymbolMetadata ts_symbol_metadata[] = {
     .visible = false,
     .named = true,
   },
+  [sym__type_param_default] = {
+    .visible = false,
+    .named = true,
+  },
   [sym_parenthesized_list_splat] = {
     .visible = true,
     .named = true,
@@ -2027,45 +2027,46 @@ enum {
   field_condition = 12,
   field_consequence = 13,
   field_content = 14,
-  field_definition = 15,
-  field_element = 16,
-  field_expression = 17,
-  field_function = 18,
-  field_guard = 19,
-  field_imaginary = 20,
-  field_inner = 21,
-  field_interpolation = 22,
-  field_key = 23,
-  field_kwarg = 24,
-  field_left = 25,
-  field_module_name = 26,
-  field_name = 27,
-  field_object = 28,
-  field_operator = 29,
-  field_operators = 30,
-  field_parameters = 31,
-  field_pattern = 32,
-  field_prefix = 33,
-  field_prefix_operator = 34,
-  field_real = 35,
-  field_return_type = 36,
-  field_right = 37,
-  field_start = 38,
-  field_step = 39,
-  field_stop = 40,
-  field_string_content = 41,
-  field_subject = 42,
-  field_subscript = 43,
-  field_suffix = 44,
-  field_superclasses = 45,
-  field_target = 46,
-  field_test = 47,
-  field_trailing_comma = 48,
-  field_type = 49,
-  field_type_parameter = 50,
-  field_type_parameters = 51,
-  field_value = 52,
-  field_vararg = 53,
+  field_default = 15,
+  field_definition = 16,
+  field_element = 17,
+  field_expression = 18,
+  field_function = 19,
+  field_guard = 20,
+  field_imaginary = 21,
+  field_inner = 22,
+  field_interpolation = 23,
+  field_key = 24,
+  field_kwarg = 25,
+  field_left = 26,
+  field_module_name = 27,
+  field_name = 28,
+  field_object = 29,
+  field_operator = 30,
+  field_operators = 31,
+  field_parameters = 32,
+  field_pattern = 33,
+  field_prefix = 34,
+  field_prefix_operator = 35,
+  field_real = 36,
+  field_return_type = 37,
+  field_right = 38,
+  field_start = 39,
+  field_step = 40,
+  field_stop = 41,
+  field_string_content = 42,
+  field_subject = 43,
+  field_subscript = 44,
+  field_suffix = 45,
+  field_superclasses = 46,
+  field_target = 47,
+  field_test = 48,
+  field_trailing_comma = 49,
+  field_type = 50,
+  field_type_parameter = 51,
+  field_type_parameters = 52,
+  field_value = 53,
+  field_vararg = 54,
 };
 
 static const char * const ts_field_names[] = {
@@ -2084,6 +2085,7 @@ static const char * const ts_field_names[] = {
   [field_condition] = "condition",
   [field_consequence] = "consequence",
   [field_content] = "content",
+  [field_default] = "default",
   [field_definition] = "definition",
   [field_element] = "element",
   [field_expression] = "expression",
@@ -2192,8 +2194,8 @@ static const TSFieldMapSlice ts_field_map_slices[PRODUCTION_ID_COUNT] = {
   [66] = {.index = 94, .length = 2},
   [67] = {.index = 43, .length = 1},
   [68] = {.index = 96, .length = 1},
-  [69] = {.index = 97, .length = 1},
-  [70] = {.index = 98, .length = 2},
+  [69] = {.index = 97, .length = 2},
+  [70] = {.index = 99, .length = 1},
   [71] = {.index = 100, .length = 2},
   [72] = {.index = 100, .length = 2},
   [74] = {.index = 102, .length = 1},
@@ -2207,82 +2209,90 @@ static const TSFieldMapSlice ts_field_map_slices[PRODUCTION_ID_COUNT] = {
   [82] = {.index = 121, .length = 2},
   [83] = {.index = 123, .length = 1},
   [84] = {.index = 124, .length = 2},
-  [85] = {.index = 126, .length = 1},
-  [86] = {.index = 127, .length = 3},
-  [87] = {.index = 130, .length = 3},
-  [88] = {.index = 133, .length = 3},
-  [89] = {.index = 136, .length = 3},
-  [90] = {.index = 139, .length = 3},
-  [91] = {.index = 142, .length = 3},
-  [92] = {.index = 85, .length = 2},
-  [93] = {.index = 145, .length = 1},
-  [94] = {.index = 146, .length = 1},
-  [95] = {.index = 147, .length = 2},
+  [85] = {.index = 126, .length = 2},
+  [86] = {.index = 128, .length = 1},
+  [87] = {.index = 129, .length = 3},
+  [88] = {.index = 132, .length = 3},
+  [89] = {.index = 135, .length = 3},
+  [90] = {.index = 138, .length = 3},
+  [91] = {.index = 141, .length = 3},
+  [92] = {.index = 144, .length = 3},
+  [93] = {.index = 85, .length = 2},
+  [94] = {.index = 147, .length = 1},
+  [95] = {.index = 148, .length = 1},
   [96] = {.index = 149, .length = 3},
   [97] = {.index = 152, .length = 2},
-  [98] = {.index = 154, .length = 1},
-  [99] = {.index = 155, .length = 2},
+  [98] = {.index = 154, .length = 2},
+  [99] = {.index = 156, .length = 1},
   [100] = {.index = 157, .length = 2},
-  [101] = {.index = 159, .length = 4},
-  [102] = {.index = 163, .length = 2},
-  [103] = {.index = 165, .length = 4},
-  [104] = {.index = 169, .length = 4},
-  [105] = {.index = 173, .length = 2},
-  [106] = {.index = 175, .length = 3},
-  [107] = {.index = 178, .length = 3},
-  [108] = {.index = 181, .length = 4},
-  [109] = {.index = 185, .length = 2},
-  [110] = {.index = 187, .length = 1},
-  [111] = {.index = 188, .length = 2},
-  [112] = {.index = 190, .length = 2},
-  [113] = {.index = 192, .length = 4},
-  [114] = {.index = 196, .length = 4},
-  [115] = {.index = 200, .length = 4},
-  [116] = {.index = 204, .length = 4},
-  [117] = {.index = 208, .length = 4},
-  [118] = {.index = 212, .length = 3},
-  [119] = {.index = 215, .length = 2},
-  [120] = {.index = 217, .length = 2},
-  [121] = {.index = 219, .length = 2},
-  [122] = {.index = 221, .length = 3},
-  [123] = {.index = 224, .length = 5},
-  [124] = {.index = 229, .length = 3},
-  [125] = {.index = 232, .length = 4},
-  [126] = {.index = 236, .length = 4},
-  [127] = {.index = 240, .length = 4},
-  [128] = {.index = 244, .length = 4},
-  [129] = {.index = 248, .length = 2},
-  [130] = {.index = 250, .length = 1},
-  [131] = {.index = 251, .length = 3},
-  [132] = {.index = 254, .length = 1},
-  [133] = {.index = 255, .length = 2},
-  [134] = {.index = 257, .length = 2},
-  [135] = {.index = 259, .length = 1},
-  [136] = {.index = 260, .length = 4},
-  [137] = {.index = 264, .length = 5},
-  [138] = {.index = 269, .length = 5},
-  [139] = {.index = 274, .length = 3},
-  [140] = {.index = 277, .length = 3},
-  [141] = {.index = 280, .length = 4},
-  [142] = {.index = 284, .length = 4},
-  [143] = {.index = 288, .length = 4},
-  [144] = {.index = 292, .length = 5},
-  [145] = {.index = 297, .length = 5},
-  [146] = {.index = 302, .length = 3},
-  [147] = {.index = 305, .length = 4},
-  [148] = {.index = 309, .length = 3},
-  [149] = {.index = 312, .length = 3},
-  [150] = {.index = 315, .length = 5},
-  [151] = {.index = 320, .length = 5},
-  [152] = {.index = 325, .length = 5},
-  [153] = {.index = 330, .length = 5},
-  [154] = {.index = 335, .length = 5},
-  [155] = {.index = 340, .length = 3},
-  [156] = {.index = 343, .length = 4},
-  [157] = {.index = 347, .length = 2},
-  [158] = {.index = 349, .length = 6},
-  [159] = {.index = 355, .length = 6},
-  [160] = {.index = 361, .length = 4},
+  [101] = {.index = 159, .length = 2},
+  [102] = {.index = 161, .length = 4},
+  [103] = {.index = 165, .length = 2},
+  [104] = {.index = 167, .length = 4},
+  [105] = {.index = 171, .length = 4},
+  [106] = {.index = 175, .length = 2},
+  [107] = {.index = 177, .length = 3},
+  [108] = {.index = 180, .length = 3},
+  [109] = {.index = 183, .length = 4},
+  [110] = {.index = 187, .length = 2},
+  [111] = {.index = 189, .length = 2},
+  [112] = {.index = 191, .length = 1},
+  [113] = {.index = 192, .length = 1},
+  [114] = {.index = 193, .length = 3},
+  [115] = {.index = 196, .length = 2},
+  [116] = {.index = 198, .length = 2},
+  [117] = {.index = 200, .length = 4},
+  [118] = {.index = 204, .length = 4},
+  [119] = {.index = 208, .length = 4},
+  [120] = {.index = 212, .length = 4},
+  [121] = {.index = 216, .length = 4},
+  [122] = {.index = 220, .length = 3},
+  [123] = {.index = 223, .length = 2},
+  [124] = {.index = 225, .length = 2},
+  [125] = {.index = 227, .length = 2},
+  [126] = {.index = 229, .length = 3},
+  [127] = {.index = 232, .length = 5},
+  [128] = {.index = 237, .length = 3},
+  [129] = {.index = 240, .length = 4},
+  [130] = {.index = 244, .length = 4},
+  [131] = {.index = 248, .length = 4},
+  [132] = {.index = 252, .length = 4},
+  [133] = {.index = 256, .length = 2},
+  [134] = {.index = 258, .length = 1},
+  [135] = {.index = 259, .length = 3},
+  [136] = {.index = 262, .length = 1},
+  [137] = {.index = 263, .length = 2},
+  [138] = {.index = 265, .length = 2},
+  [139] = {.index = 267, .length = 1},
+  [140] = {.index = 268, .length = 4},
+  [141] = {.index = 272, .length = 5},
+  [142] = {.index = 277, .length = 5},
+  [143] = {.index = 282, .length = 3},
+  [144] = {.index = 285, .length = 3},
+  [145] = {.index = 288, .length = 4},
+  [146] = {.index = 292, .length = 4},
+  [147] = {.index = 296, .length = 4},
+  [148] = {.index = 300, .length = 5},
+  [149] = {.index = 305, .length = 5},
+  [150] = {.index = 310, .length = 2},
+  [151] = {.index = 312, .length = 3},
+  [152] = {.index = 315, .length = 4},
+  [153] = {.index = 319, .length = 3},
+  [154] = {.index = 322, .length = 3},
+  [155] = {.index = 325, .length = 5},
+  [156] = {.index = 330, .length = 5},
+  [157] = {.index = 335, .length = 5},
+  [158] = {.index = 340, .length = 5},
+  [159] = {.index = 345, .length = 5},
+  [160] = {.index = 350, .length = 3},
+  [161] = {.index = 353, .length = 3},
+  [162] = {.index = 356, .length = 4},
+  [163] = {.index = 360, .length = 2},
+  [164] = {.index = 362, .length = 6},
+  [165] = {.index = 368, .length = 6},
+  [166] = {.index = 374, .length = 3},
+  [167] = {.index = 377, .length = 4},
+  [168] = {.index = 381, .length = 4},
 };
 
 static const TSFieldMapEntry ts_field_map_entries[] = {
@@ -2444,10 +2454,10 @@ static const TSFieldMapEntry ts_field_map_entries[] = {
   [96] =
     {field_stop, 1},
   [97] =
-    {field_start, 0},
-  [98] =
     {field_subscript, 2},
     {field_value, 0},
+  [99] =
+    {field_start, 0},
   [100] =
     {field_operators, 0},
     {field_operators, 1},
@@ -2487,38 +2497,38 @@ static const TSFieldMapEntry ts_field_map_entries[] = {
     {field_bound, 1, .inherited = true},
     {field_name, 0},
   [126] =
+    {field_default, 1, .inherited = true},
+    {field_name, 0},
+  [128] =
     {field_type_parameter, 1},
-  [127] =
+  [129] =
     {field_body, 4},
     {field_name, 1},
     {field_parameters, 2},
-  [130] =
+  [132] =
     {field_name, 1},
     {field_type_parameters, 2},
     {field_value, 4},
-  [133] =
+  [135] =
     {field_body, 3},
     {field_body, 4},
     {field_name, 1},
-  [136] =
+  [138] =
     {field_body, 4},
     {field_name, 1},
     {field_type_parameters, 2},
-  [139] =
+  [141] =
     {field_body, 4},
     {field_name, 1},
     {field_superclasses, 2},
-  [142] =
+  [144] =
     {field_left, 0},
     {field_right, 4},
     {field_type, 2},
-  [145] =
-    {field_step, 2},
-  [146] =
-    {field_subscript, 1},
   [147] =
-    {field_start, 0},
-    {field_stop, 2},
+    {field_step, 2},
+  [148] =
+    {field_subscript, 1},
   [149] =
     {field_subscript, 2},
     {field_subscript, 3, .inherited = true},
@@ -2527,279 +2537,307 @@ static const TSFieldMapEntry ts_field_map_entries[] = {
     {field_subscript, 0, .inherited = true},
     {field_subscript, 1, .inherited = true},
   [154] =
-    {field_name, 4, .inherited = true},
-  [155] =
-    {field_module_name, 1},
+    {field_start, 0},
+    {field_stop, 2},
+  [156] =
     {field_name, 4, .inherited = true},
   [157] =
+    {field_module_name, 1},
+    {field_name, 4, .inherited = true},
+  [159] =
     {field_left, 1},
     {field_right, 3},
-  [159] =
+  [161] =
     {field_alternative, 4, .inherited = true},
     {field_alternative, 5},
     {field_condition, 1},
     {field_consequence, 3},
-  [163] =
+  [165] =
     {field_alternative, 0, .inherited = true},
     {field_alternative, 1, .inherited = true},
-  [165] =
+  [167] =
     {field_alternative, 5},
     {field_condition, 1},
     {field_consequence, 3},
     {field_consequence, 4},
-  [169] =
+  [171] =
     {field_alternative, 5, .inherited = true},
     {field_condition, 1},
     {field_consequence, 3},
     {field_consequence, 4},
-  [173] =
+  [175] =
     {field_body, 4},
     {field_body, 5},
-  [175] =
+  [177] =
     {field_body, 5},
     {field_name, 2},
     {field_parameters, 3},
-  [178] =
+  [180] =
     {field_body, 5},
     {field_left, 1},
     {field_right, 3},
-  [181] =
+  [183] =
     {field_alternative, 5},
     {field_body, 3},
     {field_body, 4},
     {field_condition, 1},
-  [185] =
+  [187] =
     {field_prefix_operator, 0},
     {field_real, 1},
-  [187] =
+  [189] =
+    {field_default, 2, .inherited = true},
+    {field_name, 1},
+  [191] =
     {field_bound, 1},
-  [188] =
+  [192] =
+    {field_default, 1},
+  [193] =
+    {field_bound, 1, .inherited = true},
+    {field_default, 2, .inherited = true},
+    {field_name, 0},
+  [196] =
     {field_type_parameter, 1},
     {field_type_parameter, 2, .inherited = true},
-  [190] =
+  [198] =
     {field_type_parameter, 0, .inherited = true},
     {field_type_parameter, 1, .inherited = true},
-  [192] =
-    {field_body, 4},
-    {field_body, 5},
-    {field_name, 1},
-    {field_parameters, 2},
-  [196] =
-    {field_body, 5},
-    {field_name, 1},
-    {field_parameters, 3},
-    {field_type_parameters, 2},
   [200] =
     {field_body, 4},
     {field_body, 5},
     {field_name, 1},
-    {field_type_parameters, 2},
+    {field_parameters, 2},
   [204] =
     {field_body, 5},
     {field_name, 1},
-    {field_superclasses, 3},
+    {field_parameters, 3},
     {field_type_parameters, 2},
   [208] =
     {field_body, 4},
     {field_body, 5},
     {field_name, 1},
-    {field_superclasses, 2},
+    {field_type_parameters, 2},
   [212] =
+    {field_body, 5},
+    {field_name, 1},
+    {field_superclasses, 3},
+    {field_type_parameters, 2},
+  [216] =
+    {field_body, 4},
+    {field_body, 5},
+    {field_name, 1},
+    {field_superclasses, 2},
+  [220] =
     {field_name, 0},
     {field_type, 2},
     {field_value, 4},
-  [215] =
+  [223] =
     {field_step, 3},
     {field_stop, 1},
-  [217] =
+  [225] =
     {field_start, 0},
     {field_step, 3},
-  [219] =
+  [227] =
     {field_left, 2},
     {field_right, 4},
-  [221] =
+  [229] =
     {field_left, 1},
     {field_right, 3},
     {field_right, 4},
-  [224] =
+  [232] =
     {field_alternative, 5, .inherited = true},
     {field_alternative, 6},
     {field_condition, 1},
     {field_consequence, 3},
     {field_consequence, 4},
-  [229] =
+  [237] =
     {field_body, 6},
     {field_left, 2},
     {field_right, 4},
-  [232] =
+  [240] =
     {field_body, 5},
     {field_body, 6},
     {field_name, 2},
     {field_parameters, 3},
-  [236] =
+  [244] =
     {field_body, 6},
     {field_name, 2},
     {field_parameters, 4},
     {field_type_parameters, 3},
-  [240] =
+  [248] =
     {field_alternative, 6},
     {field_body, 5},
     {field_left, 1},
     {field_right, 3},
-  [244] =
+  [252] =
     {field_body, 5},
     {field_body, 6},
     {field_left, 1},
     {field_right, 3},
-  [248] =
+  [256] =
     {field_body, 3},
     {field_type, 1},
-  [250] =
+  [258] =
     {field_content, 1},
-  [251] =
+  [259] =
     {field_imaginary, 2},
     {field_operator, 1},
     {field_real, 0},
-  [254] =
+  [262] =
     {field_test, 1},
-  [255] =
+  [263] =
     {field_body, 3},
     {field_pattern, 1},
-  [257] =
+  [265] =
     {field_alias, 2},
     {field_pattern, 0},
-  [259] =
+  [267] =
     {field_class, 0},
-  [260] =
+  [268] =
     {field_body, 6},
     {field_name, 1},
     {field_parameters, 2},
     {field_return_type, 4},
-  [264] =
+  [272] =
     {field_body, 5},
     {field_body, 6},
     {field_name, 1},
     {field_parameters, 3},
     {field_type_parameters, 2},
-  [269] =
+  [277] =
     {field_body, 5},
     {field_body, 6},
     {field_name, 1},
     {field_superclasses, 3},
     {field_type_parameters, 2},
-  [274] =
+  [282] =
     {field_start, 0},
     {field_step, 4},
     {field_stop, 2},
-  [277] =
+  [285] =
     {field_left, 2},
     {field_right, 4},
     {field_right, 5},
-  [280] =
+  [288] =
     {field_alternative, 7},
     {field_body, 6},
     {field_left, 2},
     {field_right, 4},
-  [284] =
+  [292] =
     {field_body, 6},
     {field_body, 7},
     {field_left, 2},
     {field_right, 4},
-  [288] =
+  [296] =
     {field_body, 7},
     {field_name, 2},
     {field_parameters, 3},
     {field_return_type, 5},
-  [292] =
+  [300] =
     {field_body, 6},
     {field_body, 7},
     {field_name, 2},
     {field_parameters, 4},
     {field_type_parameters, 3},
-  [297] =
+  [305] =
     {field_alternative, 7},
     {field_body, 5},
     {field_body, 6},
     {field_left, 1},
     {field_right, 3},
-  [302] =
+  [310] =
+    {field_body, 4},
+    {field_type, 2},
+  [312] =
     {field_body, 3},
     {field_body, 4},
     {field_type, 1},
-  [305] =
+  [315] =
     {field_imaginary, 3},
     {field_operator, 2},
     {field_prefix_operator, 0},
     {field_real, 1},
-  [309] =
+  [319] =
     {field_body, 3},
     {field_body, 4},
     {field_pattern, 1},
-  [312] =
+  [322] =
     {field_body, 4},
     {field_guard, 2},
     {field_pattern, 1},
-  [315] =
+  [325] =
     {field_body, 6},
     {field_body, 7},
     {field_name, 1},
     {field_parameters, 2},
     {field_return_type, 4},
-  [320] =
+  [330] =
     {field_body, 7},
     {field_name, 1},
     {field_parameters, 3},
     {field_return_type, 5},
     {field_type_parameters, 2},
-  [325] =
+  [335] =
     {field_alternative, 8},
     {field_body, 6},
     {field_body, 7},
     {field_left, 2},
     {field_right, 4},
-  [330] =
+  [340] =
     {field_body, 7},
     {field_body, 8},
     {field_name, 2},
     {field_parameters, 3},
     {field_return_type, 5},
-  [335] =
+  [345] =
     {field_body, 8},
     {field_name, 2},
     {field_parameters, 4},
     {field_return_type, 6},
     {field_type_parameters, 3},
-  [340] =
+  [350] =
+    {field_body, 4},
+    {field_body, 5},
+    {field_type, 2},
+  [353] =
     {field_alias, 3},
     {field_body, 5},
     {field_type, 1},
-  [343] =
+  [356] =
     {field_body, 4},
     {field_body, 5},
     {field_guard, 2},
     {field_pattern, 1},
-  [347] =
+  [360] =
     {field_attribute, 0},
     {field_value, 2},
-  [349] =
+  [362] =
     {field_body, 7},
     {field_body, 8},
     {field_name, 1},
     {field_parameters, 3},
     {field_return_type, 5},
     {field_type_parameters, 2},
-  [355] =
+  [368] =
     {field_body, 8},
     {field_body, 9},
     {field_name, 2},
     {field_parameters, 4},
     {field_return_type, 6},
     {field_type_parameters, 3},
-  [361] =
+  [374] =
+    {field_alias, 4},
+    {field_body, 6},
+    {field_type, 2},
+  [377] =
     {field_alias, 3},
     {field_body, 5},
     {field_body, 6},
     {field_type, 1},
+  [381] =
+    {field_alias, 4},
+    {field_body, 6},
+    {field_body, 7},
+    {field_type, 2},
 };
 
 static const TSSymbol ts_alias_sequences[PRODUCTION_ID_COUNT][MAX_ALIAS_SEQUENCE_LENGTH] = {
@@ -2863,69 +2901,75 @@ static const TSSymbol ts_alias_sequences[PRODUCTION_ID_COUNT][MAX_ALIAS_SEQUENCE
   [79] = {
     [3] = sym_block,
   },
-  [86] = {
-    [4] = sym_block,
-  },
-  [89] = {
+  [87] = {
     [4] = sym_block,
   },
   [90] = {
     [4] = sym_block,
   },
-  [92] = {
+  [91] = {
+    [4] = sym_block,
+  },
+  [93] = {
     [1] = sym_parenthesized_expression,
   },
-  [101] = {
+  [102] = {
     [3] = sym_block,
   },
-  [106] = {
-    [5] = sym_block,
-  },
   [107] = {
     [5] = sym_block,
   },
-  [114] = {
+  [108] = {
     [5] = sym_block,
   },
-  [116] = {
+  [118] = {
     [5] = sym_block,
   },
-  [124] = {
+  [120] = {
+    [5] = sym_block,
+  },
+  [128] = {
     [6] = sym_block,
   },
-  [126] = {
+  [130] = {
     [6] = sym_block,
   },
-  [127] = {
+  [131] = {
     [5] = sym_block,
   },
-  [129] = {
-    [3] = sym_block,
-  },
   [133] = {
     [3] = sym_block,
   },
-  [136] = {
+  [137] = {
+    [3] = sym_block,
+  },
+  [140] = {
     [6] = sym_block,
   },
-  [141] = {
+  [145] = {
     [6] = sym_block,
   },
-  [143] = {
+  [147] = {
     [7] = sym_block,
   },
-  [149] = {
+  [150] = {
     [4] = sym_block,
   },
-  [151] = {
+  [154] = {
+    [4] = sym_block,
+  },
+  [156] = {
     [7] = sym_block,
   },
-  [154] = {
+  [159] = {
     [8] = sym_block,
   },
-  [155] = {
+  [161] = {
     [5] = sym_block,
   },
+  [166] = {
+    [6] = sym_block,
+  },
 };
 
 static const uint16_t ts_non_terminal_alias_map[] = {
@@ -2944,2351 +2988,19 @@ static const uint16_t ts_non_terminal_alias_map[] = {
   0,
 };
 
-static const TSStateId ts_primary_state_ids[STATE_COUNT] = {
-  [0] = 0,
-  [1] = 1,
-  [2] = 2,
-  [3] = 3,
-  [4] = 4,
-  [5] = 5,
-  [6] = 6,
-  [7] = 7,
-  [8] = 8,
-  [9] = 9,
-  [10] = 8,
-  [11] = 11,
-  [12] = 12,
-  [13] = 13,
-  [14] = 14,
-  [15] = 15,
-  [16] = 16,
-  [17] = 5,
-  [18] = 13,
-  [19] = 14,
-  [20] = 20,
-  [21] = 16,
-  [22] = 22,
-  [23] = 23,
-  [24] = 24,
-  [25] = 6,
-  [26] = 3,
-  [27] = 12,
-  [28] = 15,
-  [29] = 29,
-  [30] = 30,
-  [31] = 22,
-  [32] = 23,
-  [33] = 33,
-  [34] = 34,
-  [35] = 35,
-  [36] = 36,
-  [37] = 20,
-  [38] = 38,
-  [39] = 39,
-  [40] = 36,
-  [41] = 41,
-  [42] = 9,
-  [43] = 24,
-  [44] = 4,
-  [45] = 41,
-  [46] = 39,
-  [47] = 34,
-  [48] = 35,
-  [49] = 49,
-  [50] = 2,
-  [51] = 7,
-  [52] = 33,
-  [53] = 30,
-  [54] = 54,
-  [55] = 54,
-  [56] = 11,
-  [57] = 38,
-  [58] = 49,
-  [59] = 29,
-  [60] = 60,
-  [61] = 60,
-  [62] = 60,
-  [63] = 63,
-  [64] = 64,
-  [65] = 60,
-  [66] = 60,
-  [67] = 63,
-  [68] = 60,
-  [69] = 60,
-  [70] = 70,
-  [71] = 70,
-  [72] = 72,
-  [73] = 73,
-  [74] = 74,
-  [75] = 75,
-  [76] = 76,
-  [77] = 77,
-  [78] = 78,
-  [79] = 79,
-  [80] = 80,
-  [81] = 81,
-  [82] = 82,
-  [83] = 80,
-  [84] = 84,
-  [85] = 74,
-  [86] = 86,
-  [87] = 82,
-  [88] = 88,
-  [89] = 89,
-  [90] = 84,
-  [91] = 72,
-  [92] = 92,
-  [93] = 93,
-  [94] = 77,
-  [95] = 95,
-  [96] = 96,
-  [97] = 97,
-  [98] = 76,
-  [99] = 89,
-  [100] = 100,
-  [101] = 78,
-  [102] = 102,
-  [103] = 103,
-  [104] = 104,
-  [105] = 105,
-  [106] = 102,
-  [107] = 81,
-  [108] = 108,
-  [109] = 96,
-  [110] = 88,
-  [111] = 93,
-  [112] = 112,
-  [113] = 105,
-  [114] = 114,
-  [115] = 115,
-  [116] = 116,
-  [117] = 79,
-  [118] = 73,
-  [119] = 108,
-  [120] = 92,
-  [121] = 116,
-  [122] = 115,
-  [123] = 104,
-  [124] = 97,
-  [125] = 103,
-  [126] = 100,
-  [127] = 95,
-  [128] = 112,
-  [129] = 86,
-  [130] = 114,
-  [131] = 131,
-  [132] = 132,
-  [133] = 133,
-  [134] = 133,
-  [135] = 135,
-  [136] = 135,
-  [137] = 133,
-  [138] = 133,
-  [139] = 133,
-  [140] = 133,
-  [141] = 135,
-  [142] = 135,
-  [143] = 135,
-  [144] = 135,
-  [145] = 133,
-  [146] = 135,
-  [147] = 147,
-  [148] = 148,
-  [149] = 148,
-  [150] = 148,
-  [151] = 151,
-  [152] = 131,
-  [153] = 148,
-  [154] = 151,
-  [155] = 155,
-  [156] = 156,
-  [157] = 157,
-  [158] = 158,
-  [159] = 159,
-  [160] = 159,
-  [161] = 159,
-  [162] = 162,
-  [163] = 163,
-  [164] = 162,
-  [165] = 165,
-  [166] = 166,
-  [167] = 167,
-  [168] = 168,
-  [169] = 166,
-  [170] = 166,
-  [171] = 171,
-  [172] = 172,
-  [173] = 173,
-  [174] = 174,
-  [175] = 175,
-  [176] = 176,
-  [177] = 177,
-  [178] = 178,
-  [179] = 177,
-  [180] = 158,
-  [181] = 181,
-  [182] = 182,
-  [183] = 178,
-  [184] = 177,
-  [185] = 185,
-  [186] = 186,
-  [187] = 187,
-  [188] = 188,
-  [189] = 189,
-  [190] = 187,
-  [191] = 187,
-  [192] = 192,
-  [193] = 188,
-  [194] = 194,
-  [195] = 168,
-  [196] = 196,
-  [197] = 194,
-  [198] = 189,
-  [199] = 199,
-  [200] = 200,
-  [201] = 201,
-  [202] = 202,
-  [203] = 196,
-  [204] = 188,
-  [205] = 171,
-  [206] = 194,
-  [207] = 189,
-  [208] = 186,
-  [209] = 199,
-  [210] = 167,
-  [211] = 200,
-  [212] = 188,
-  [213] = 213,
-  [214] = 186,
-  [215] = 199,
-  [216] = 196,
-  [217] = 187,
-  [218] = 218,
-  [219] = 219,
-  [220] = 220,
-  [221] = 221,
-  [222] = 222,
-  [223] = 223,
-  [224] = 224,
-  [225] = 225,
-  [226] = 226,
-  [227] = 227,
-  [228] = 228,
-  [229] = 229,
-  [230] = 230,
-  [231] = 231,
-  [232] = 232,
-  [233] = 233,
-  [234] = 234,
-  [235] = 233,
-  [236] = 236,
-  [237] = 234,
-  [238] = 232,
-  [239] = 236,
-  [240] = 229,
-  [241] = 228,
-  [242] = 242,
-  [243] = 243,
-  [244] = 244,
-  [245] = 244,
-  [246] = 246,
-  [247] = 247,
-  [248] = 243,
-  [249] = 243,
-  [250] = 242,
-  [251] = 246,
-  [252] = 246,
-  [253] = 242,
-  [254] = 247,
-  [255] = 255,
-  [256] = 256,
-  [257] = 255,
-  [258] = 258,
-  [259] = 259,
-  [260] = 256,
-  [261] = 261,
-  [262] = 261,
-  [263] = 263,
-  [264] = 264,
-  [265] = 265,
-  [266] = 266,
-  [267] = 267,
-  [268] = 268,
-  [269] = 261,
-  [270] = 267,
-  [271] = 266,
-  [272] = 268,
-  [273] = 256,
-  [274] = 255,
-  [275] = 275,
-  [276] = 263,
-  [277] = 258,
-  [278] = 278,
-  [279] = 265,
-  [280] = 280,
-  [281] = 281,
-  [282] = 282,
-  [283] = 283,
-  [284] = 284,
-  [285] = 285,
-  [286] = 286,
-  [287] = 287,
-  [288] = 288,
-  [289] = 289,
-  [290] = 290,
-  [291] = 281,
-  [292] = 283,
-  [293] = 293,
-  [294] = 294,
-  [295] = 295,
-  [296] = 296,
-  [297] = 297,
-  [298] = 296,
-  [299] = 299,
-  [300] = 300,
-  [301] = 299,
-  [302] = 302,
-  [303] = 303,
-  [304] = 304,
-  [305] = 288,
-  [306] = 306,
-  [307] = 285,
-  [308] = 308,
-  [309] = 309,
-  [310] = 299,
-  [311] = 287,
-  [312] = 312,
-  [313] = 308,
-  [314] = 314,
-  [315] = 282,
-  [316] = 316,
-  [317] = 317,
-  [318] = 318,
-  [319] = 288,
-  [320] = 320,
-  [321] = 321,
-  [322] = 322,
-  [323] = 323,
-  [324] = 324,
-  [325] = 325,
-  [326] = 281,
-  [327] = 316,
-  [328] = 328,
-  [329] = 329,
-  [330] = 330,
-  [331] = 331,
-  [332] = 317,
-  [333] = 333,
-  [334] = 334,
-  [335] = 335,
-  [336] = 226,
-  [337] = 218,
-  [338] = 338,
-  [339] = 339,
-  [340] = 340,
-  [341] = 321,
-  [342] = 220,
-  [343] = 221,
-  [344] = 223,
-  [345] = 345,
-  [346] = 322,
-  [347] = 347,
-  [348] = 348,
-  [349] = 347,
-  [350] = 323,
-  [351] = 351,
-  [352] = 219,
-  [353] = 340,
-  [354] = 288,
-  [355] = 282,
-  [356] = 281,
-  [357] = 333,
-  [358] = 308,
-  [359] = 288,
-  [360] = 308,
-  [361] = 361,
-  [362] = 308,
-  [363] = 329,
-  [364] = 364,
-  [365] = 227,
-  [366] = 328,
-  [367] = 287,
-  [368] = 324,
-  [369] = 308,
-  [370] = 281,
-  [371] = 282,
-  [372] = 318,
-  [373] = 320,
-  [374] = 287,
-  [375] = 287,
-  [376] = 281,
-  [377] = 325,
-  [378] = 287,
-  [379] = 282,
-  [380] = 345,
-  [381] = 288,
-  [382] = 282,
-  [383] = 335,
-  [384] = 331,
-  [385] = 385,
-  [386] = 386,
-  [387] = 387,
-  [388] = 388,
-  [389] = 389,
-  [390] = 390,
-  [391] = 391,
-  [392] = 392,
-  [393] = 393,
-  [394] = 394,
-  [395] = 395,
-  [396] = 396,
-  [397] = 397,
-  [398] = 398,
-  [399] = 399,
-  [400] = 400,
-  [401] = 401,
-  [402] = 402,
-  [403] = 403,
-  [404] = 404,
-  [405] = 389,
-  [406] = 406,
-  [407] = 403,
-  [408] = 408,
-  [409] = 396,
-  [410] = 396,
-  [411] = 395,
-  [412] = 412,
-  [413] = 413,
-  [414] = 408,
-  [415] = 386,
-  [416] = 402,
-  [417] = 417,
-  [418] = 387,
-  [419] = 391,
-  [420] = 420,
-  [421] = 388,
-  [422] = 392,
-  [423] = 404,
-  [424] = 400,
-  [425] = 425,
-  [426] = 386,
-  [427] = 427,
-  [428] = 427,
-  [429] = 386,
-  [430] = 430,
-  [431] = 431,
-  [432] = 430,
-  [433] = 420,
-  [434] = 434,
-  [435] = 435,
-  [436] = 397,
-  [437] = 397,
-  [438] = 438,
-  [439] = 385,
-  [440] = 413,
-  [441] = 441,
-  [442] = 442,
-  [443] = 385,
-  [444] = 444,
-  [445] = 391,
-  [446] = 395,
-  [447] = 425,
-  [448] = 389,
-  [449] = 449,
-  [450] = 450,
-  [451] = 451,
-  [452] = 392,
-  [453] = 453,
-  [454] = 454,
-  [455] = 395,
-  [456] = 385,
-  [457] = 396,
-  [458] = 444,
-  [459] = 459,
-  [460] = 442,
-  [461] = 461,
-  [462] = 462,
-  [463] = 444,
-  [464] = 464,
-  [465] = 397,
-  [466] = 466,
-  [467] = 454,
-  [468] = 398,
-  [469] = 406,
-  [470] = 391,
-  [471] = 399,
-  [472] = 464,
-  [473] = 473,
-  [474] = 473,
-  [475] = 475,
-  [476] = 392,
-  [477] = 477,
-  [478] = 401,
-  [479] = 479,
-  [480] = 480,
-  [481] = 444,
-  [482] = 389,
-  [483] = 483,
-  [484] = 412,
-  [485] = 485,
-  [486] = 485,
-  [487] = 487,
-  [488] = 488,
-  [489] = 489,
-  [490] = 487,
-  [491] = 491,
-  [492] = 492,
-  [493] = 492,
-  [494] = 491,
-  [495] = 488,
-  [496] = 489,
-  [497] = 497,
-  [498] = 498,
-  [499] = 499,
-  [500] = 500,
-  [501] = 501,
-  [502] = 502,
-  [503] = 503,
-  [504] = 504,
-  [505] = 505,
-  [506] = 506,
-  [507] = 507,
-  [508] = 508,
-  [509] = 509,
-  [510] = 510,
-  [511] = 511,
-  [512] = 512,
-  [513] = 512,
-  [514] = 514,
-  [515] = 498,
-  [516] = 507,
-  [517] = 517,
-  [518] = 518,
-  [519] = 519,
-  [520] = 504,
-  [521] = 521,
-  [522] = 522,
-  [523] = 523,
-  [524] = 524,
-  [525] = 500,
-  [526] = 524,
-  [527] = 527,
-  [528] = 528,
-  [529] = 529,
-  [530] = 530,
-  [531] = 531,
-  [532] = 532,
-  [533] = 533,
-  [534] = 534,
-  [535] = 535,
-  [536] = 534,
-  [537] = 529,
-  [538] = 530,
-  [539] = 511,
-  [540] = 533,
-  [541] = 541,
-  [542] = 502,
-  [543] = 543,
-  [544] = 544,
-  [545] = 510,
-  [546] = 509,
-  [547] = 508,
-  [548] = 501,
-  [549] = 549,
-  [550] = 527,
-  [551] = 503,
-  [552] = 552,
-  [553] = 531,
-  [554] = 549,
-  [555] = 528,
-  [556] = 506,
-  [557] = 505,
-  [558] = 532,
-  [559] = 559,
-  [560] = 543,
-  [561] = 561,
-  [562] = 541,
-  [563] = 535,
-  [564] = 559,
-  [565] = 561,
-  [566] = 517,
-  [567] = 567,
-  [568] = 514,
-  [569] = 567,
-  [570] = 570,
-  [571] = 571,
-  [572] = 571,
-  [573] = 573,
-  [574] = 573,
-  [575] = 575,
-  [576] = 522,
-  [577] = 575,
-  [578] = 544,
-  [579] = 579,
-  [580] = 497,
-  [581] = 581,
-  [582] = 582,
-  [583] = 579,
-  [584] = 499,
-  [585] = 570,
-  [586] = 581,
-  [587] = 587,
-  [588] = 523,
-  [589] = 582,
-  [590] = 587,
-  [591] = 518,
-  [592] = 521,
-  [593] = 519,
-  [594] = 552,
-  [595] = 595,
-  [596] = 596,
-  [597] = 597,
-  [598] = 598,
-  [599] = 599,
-  [600] = 600,
-  [601] = 601,
-  [602] = 602,
-  [603] = 603,
-  [604] = 602,
-  [605] = 603,
-  [606] = 606,
-  [607] = 607,
-  [608] = 608,
-  [609] = 609,
-  [610] = 610,
-  [611] = 611,
-  [612] = 612,
-  [613] = 613,
-  [614] = 614,
-  [615] = 615,
-  [616] = 616,
-  [617] = 617,
-  [618] = 618,
-  [619] = 619,
-  [620] = 620,
-  [621] = 621,
-  [622] = 622,
-  [623] = 623,
-  [624] = 624,
-  [625] = 625,
-  [626] = 626,
-  [627] = 627,
-  [628] = 628,
-  [629] = 629,
-  [630] = 630,
-  [631] = 631,
-  [632] = 632,
-  [633] = 633,
-  [634] = 634,
-  [635] = 635,
-  [636] = 636,
-  [637] = 637,
-  [638] = 638,
-  [639] = 639,
-  [640] = 640,
-  [641] = 641,
-  [642] = 642,
-  [643] = 630,
-  [644] = 644,
-  [645] = 645,
-  [646] = 646,
-  [647] = 647,
-  [648] = 647,
-  [649] = 649,
-  [650] = 650,
-  [651] = 651,
-  [652] = 652,
-  [653] = 653,
-  [654] = 651,
-  [655] = 645,
-  [656] = 656,
-  [657] = 656,
-  [658] = 653,
-  [659] = 659,
-  [660] = 646,
-  [661] = 650,
-  [662] = 662,
-  [663] = 662,
-  [664] = 659,
-  [665] = 652,
-  [666] = 649,
-  [667] = 667,
-  [668] = 668,
-  [669] = 669,
-  [670] = 669,
-  [671] = 671,
-  [672] = 672,
-  [673] = 669,
-  [674] = 667,
-  [675] = 668,
-  [676] = 669,
-  [677] = 599,
-  [678] = 598,
-  [679] = 679,
-  [680] = 680,
-  [681] = 681,
-  [682] = 682,
-  [683] = 683,
-  [684] = 630,
-  [685] = 685,
-  [686] = 682,
-  [687] = 687,
-  [688] = 688,
-  [689] = 599,
-  [690] = 690,
-  [691] = 679,
-  [692] = 681,
-  [693] = 693,
-  [694] = 679,
-  [695] = 695,
-  [696] = 680,
-  [697] = 695,
-  [698] = 698,
-  [699] = 690,
-  [700] = 682,
-  [701] = 688,
-  [702] = 680,
-  [703] = 695,
-  [704] = 681,
-  [705] = 690,
-  [706] = 687,
-  [707] = 698,
-  [708] = 687,
-  [709] = 683,
-  [710] = 687,
-  [711] = 682,
-  [712] = 679,
-  [713] = 600,
-  [714] = 690,
-  [715] = 715,
-  [716] = 693,
-  [717] = 681,
-  [718] = 688,
-  [719] = 683,
-  [720] = 598,
-  [721] = 695,
-  [722] = 680,
-  [723] = 698,
-  [724] = 688,
-  [725] = 672,
-  [726] = 683,
-  [727] = 671,
-  [728] = 698,
-  [729] = 693,
-  [730] = 693,
-  [731] = 662,
-  [732] = 649,
-  [733] = 652,
-  [734] = 659,
-  [735] = 647,
-  [736] = 609,
-  [737] = 653,
-  [738] = 651,
-  [739] = 645,
-  [740] = 630,
-  [741] = 646,
-  [742] = 600,
-  [743] = 656,
-  [744] = 610,
-  [745] = 650,
-  [746] = 662,
-  [747] = 651,
-  [748] = 748,
-  [749] = 330,
-  [750] = 653,
-  [751] = 652,
-  [752] = 649,
-  [753] = 647,
-  [754] = 667,
-  [755] = 668,
-  [756] = 645,
-  [757] = 659,
-  [758] = 609,
-  [759] = 759,
-  [760] = 760,
-  [761] = 646,
-  [762] = 449,
-  [763] = 656,
-  [764] = 334,
-  [765] = 475,
-  [766] = 650,
-  [767] = 767,
-  [768] = 441,
-  [769] = 610,
-  [770] = 431,
-  [771] = 626,
-  [772] = 639,
-  [773] = 625,
-  [774] = 624,
-  [775] = 637,
-  [776] = 620,
-  [777] = 623,
-  [778] = 617,
-  [779] = 475,
-  [780] = 622,
-  [781] = 629,
-  [782] = 632,
-  [783] = 615,
-  [784] = 627,
-  [785] = 628,
-  [786] = 671,
-  [787] = 672,
-  [788] = 631,
-  [789] = 441,
-  [790] = 634,
-  [791] = 635,
-  [792] = 633,
-  [793] = 613,
-  [794] = 618,
-  [795] = 612,
-  [796] = 640,
-  [797] = 642,
-  [798] = 667,
-  [799] = 621,
-  [800] = 641,
-  [801] = 668,
-  [802] = 644,
-  [803] = 619,
-  [804] = 611,
-  [805] = 638,
-  [806] = 431,
-  [807] = 616,
-  [808] = 614,
-  [809] = 634,
-  [810] = 220,
-  [811] = 642,
-  [812] = 759,
-  [813] = 626,
-  [814] = 625,
-  [815] = 624,
-  [816] = 623,
-  [817] = 611,
-  [818] = 622,
-  [819] = 637,
-  [820] = 621,
-  [821] = 620,
-  [822] = 219,
-  [823] = 616,
-  [824] = 614,
-  [825] = 629,
-  [826] = 641,
-  [827] = 632,
-  [828] = 638,
-  [829] = 227,
-  [830] = 644,
-  [831] = 613,
-  [832] = 618,
-  [833] = 631,
-  [834] = 223,
-  [835] = 640,
-  [836] = 221,
-  [837] = 760,
-  [838] = 639,
-  [839] = 612,
-  [840] = 627,
-  [841] = 617,
-  [842] = 628,
-  [843] = 615,
-  [844] = 218,
-  [845] = 226,
-  [846] = 619,
-  [847] = 633,
-  [848] = 635,
-  [849] = 849,
-  [850] = 850,
-  [851] = 851,
-  [852] = 849,
-  [853] = 853,
-  [854] = 854,
-  [855] = 855,
-  [856] = 856,
-  [857] = 857,
-  [858] = 858,
-  [859] = 859,
-  [860] = 860,
-  [861] = 861,
-  [862] = 862,
-  [863] = 863,
-  [864] = 864,
-  [865] = 865,
-  [866] = 866,
-  [867] = 867,
-  [868] = 868,
-  [869] = 868,
-  [870] = 870,
-  [871] = 870,
-  [872] = 872,
-  [873] = 873,
-  [874] = 874,
-  [875] = 875,
-  [876] = 876,
-  [877] = 868,
-  [878] = 870,
-  [879] = 879,
-  [880] = 880,
-  [881] = 870,
-  [882] = 882,
-  [883] = 868,
-  [884] = 884,
-  [885] = 885,
-  [886] = 885,
-  [887] = 887,
-  [888] = 885,
-  [889] = 889,
-  [890] = 885,
-  [891] = 891,
-  [892] = 892,
-  [893] = 893,
-  [894] = 894,
-  [895] = 895,
-  [896] = 896,
-  [897] = 897,
-  [898] = 895,
-  [899] = 896,
-  [900] = 900,
-  [901] = 901,
-  [902] = 902,
-  [903] = 902,
-  [904] = 904,
-  [905] = 905,
-  [906] = 906,
-  [907] = 907,
-  [908] = 908,
-  [909] = 909,
-  [910] = 910,
-  [911] = 907,
-  [912] = 912,
-  [913] = 913,
-  [914] = 914,
-  [915] = 915,
-  [916] = 916,
-  [917] = 917,
-  [918] = 907,
-  [919] = 909,
-  [920] = 920,
-  [921] = 914,
-  [922] = 916,
-  [923] = 908,
-  [924] = 912,
-  [925] = 925,
-  [926] = 926,
-  [927] = 920,
-  [928] = 926,
-  [929] = 929,
-  [930] = 930,
-  [931] = 930,
-  [932] = 932,
-  [933] = 933,
-  [934] = 934,
-  [935] = 932,
-  [936] = 936,
-  [937] = 937,
-  [938] = 936,
-  [939] = 939,
-  [940] = 940,
-  [941] = 932,
-  [942] = 936,
-  [943] = 943,
-  [944] = 934,
-  [945] = 930,
-  [946] = 940,
-  [947] = 947,
-  [948] = 948,
-  [949] = 936,
-  [950] = 934,
-  [951] = 951,
-  [952] = 934,
-  [953] = 940,
-  [954] = 954,
-  [955] = 955,
-  [956] = 956,
-  [957] = 957,
-  [958] = 958,
-  [959] = 959,
-  [960] = 960,
-  [961] = 961,
-  [962] = 962,
-  [963] = 963,
-  [964] = 964,
-  [965] = 965,
-  [966] = 966,
-  [967] = 904,
-  [968] = 968,
-  [969] = 969,
-  [970] = 970,
-  [971] = 971,
-  [972] = 972,
-  [973] = 973,
-  [974] = 914,
-  [975] = 975,
-  [976] = 901,
-  [977] = 977,
-  [978] = 978,
-  [979] = 979,
-  [980] = 926,
-  [981] = 981,
-  [982] = 982,
-  [983] = 983,
-  [984] = 984,
-  [985] = 985,
-  [986] = 986,
-  [987] = 987,
-  [988] = 988,
-  [989] = 989,
-  [990] = 990,
-  [991] = 965,
-  [992] = 909,
-  [993] = 993,
-  [994] = 994,
-  [995] = 995,
-  [996] = 996,
-  [997] = 912,
-  [998] = 998,
-  [999] = 999,
-  [1000] = 916,
-  [1001] = 920,
-  [1002] = 996,
-  [1003] = 983,
-  [1004] = 1004,
-  [1005] = 1005,
-  [1006] = 1006,
-  [1007] = 908,
-  [1008] = 1008,
-  [1009] = 900,
-  [1010] = 1010,
-  [1011] = 1011,
-  [1012] = 1012,
-  [1013] = 1013,
-  [1014] = 929,
-  [1015] = 900,
-  [1016] = 1016,
-  [1017] = 1017,
-  [1018] = 1018,
-  [1019] = 1019,
-  [1020] = 1020,
-  [1021] = 1021,
-  [1022] = 1022,
-  [1023] = 1023,
-  [1024] = 1024,
-  [1025] = 926,
-  [1026] = 1026,
-  [1027] = 912,
-  [1028] = 914,
-  [1029] = 920,
-  [1030] = 916,
-  [1031] = 1031,
-  [1032] = 908,
-  [1033] = 1033,
-  [1034] = 1034,
-  [1035] = 909,
-  [1036] = 933,
-  [1037] = 1037,
-  [1038] = 1038,
-  [1039] = 1039,
-  [1040] = 1021,
-  [1041] = 1041,
-  [1042] = 901,
-  [1043] = 1043,
-  [1044] = 1044,
-  [1045] = 1045,
-  [1046] = 1046,
-  [1047] = 1021,
-  [1048] = 947,
-  [1049] = 1038,
-  [1050] = 1050,
-  [1051] = 904,
-  [1052] = 1038,
-  [1053] = 1053,
-  [1054] = 948,
-  [1055] = 1055,
-  [1056] = 1056,
-  [1057] = 906,
-  [1058] = 1058,
-  [1059] = 1059,
-  [1060] = 1060,
-  [1061] = 1061,
-  [1062] = 1062,
-  [1063] = 1063,
-  [1064] = 1064,
-  [1065] = 1065,
-  [1066] = 1066,
-  [1067] = 1067,
-  [1068] = 1058,
-  [1069] = 1069,
-  [1070] = 1070,
-  [1071] = 1071,
-  [1072] = 1072,
-  [1073] = 1073,
-  [1074] = 1074,
-  [1075] = 1059,
-  [1076] = 1076,
-  [1077] = 1077,
-  [1078] = 1078,
-  [1079] = 1079,
-  [1080] = 1079,
-  [1081] = 1063,
-  [1082] = 1022,
-  [1083] = 1083,
-  [1084] = 1084,
-  [1085] = 1070,
-  [1086] = 1086,
-  [1087] = 1087,
-  [1088] = 1061,
-  [1089] = 1089,
-  [1090] = 1090,
-  [1091] = 1091,
-  [1092] = 964,
-  [1093] = 1093,
-  [1094] = 939,
-  [1095] = 1095,
-  [1096] = 1005,
-  [1097] = 1097,
-  [1098] = 1098,
-  [1099] = 1099,
-  [1100] = 1100,
-  [1101] = 917,
-  [1102] = 1039,
-  [1103] = 1103,
-  [1104] = 1104,
-  [1105] = 1105,
-  [1106] = 1106,
-  [1107] = 1107,
-  [1108] = 1107,
-  [1109] = 1109,
-  [1110] = 1110,
-  [1111] = 1111,
-  [1112] = 985,
-  [1113] = 1113,
-  [1114] = 1114,
-  [1115] = 1115,
-  [1116] = 1116,
-  [1117] = 1117,
-  [1118] = 1118,
-  [1119] = 1119,
-  [1120] = 1097,
-  [1121] = 1121,
-  [1122] = 1122,
-  [1123] = 1104,
-  [1124] = 1124,
-  [1125] = 1125,
-  [1126] = 1126,
-  [1127] = 1127,
-  [1128] = 1128,
-  [1129] = 1129,
-  [1130] = 1130,
-  [1131] = 1131,
-  [1132] = 1128,
-  [1133] = 1133,
-  [1134] = 1134,
-  [1135] = 1135,
-  [1136] = 1136,
-  [1137] = 1137,
-  [1138] = 1138,
-  [1139] = 1139,
-  [1140] = 1140,
-  [1141] = 1141,
-  [1142] = 1095,
-  [1143] = 1143,
-  [1144] = 1144,
-  [1145] = 1145,
-  [1146] = 1146,
-  [1147] = 1093,
-  [1148] = 1148,
-  [1149] = 1149,
-  [1150] = 1150,
-  [1151] = 1141,
-  [1152] = 1149,
-  [1153] = 1140,
-  [1154] = 1154,
-  [1155] = 1155,
-  [1156] = 1156,
-  [1157] = 1134,
-  [1158] = 1135,
-  [1159] = 1136,
-  [1160] = 1160,
-  [1161] = 1109,
-  [1162] = 1162,
-  [1163] = 1163,
-  [1164] = 1164,
-  [1165] = 1165,
-  [1166] = 1166,
-  [1167] = 1167,
-  [1168] = 913,
-  [1169] = 1149,
-  [1170] = 1170,
-  [1171] = 1171,
-  [1172] = 1172,
-  [1173] = 1173,
-  [1174] = 1174,
-  [1175] = 1175,
-  [1176] = 1131,
-  [1177] = 1177,
-  [1178] = 1178,
-  [1179] = 1129,
-  [1180] = 1180,
-  [1181] = 1173,
-  [1182] = 1118,
-  [1183] = 1183,
-  [1184] = 1180,
-  [1185] = 1185,
-  [1186] = 1149,
-  [1187] = 1023,
-  [1188] = 1188,
-  [1189] = 1189,
-  [1190] = 1190,
-  [1191] = 1191,
-  [1192] = 1192,
-  [1193] = 1193,
-  [1194] = 1194,
-  [1195] = 1195,
-  [1196] = 1196,
-  [1197] = 1197,
-  [1198] = 1198,
-  [1199] = 1199,
-  [1200] = 1200,
-  [1201] = 1201,
-  [1202] = 1202,
-  [1203] = 1203,
-  [1204] = 1204,
-  [1205] = 1164,
-  [1206] = 1163,
-  [1207] = 1207,
-  [1208] = 1208,
-  [1209] = 1209,
-  [1210] = 1210,
-  [1211] = 1211,
-  [1212] = 1212,
-  [1213] = 1213,
-  [1214] = 1209,
-  [1215] = 1215,
-  [1216] = 1216,
-  [1217] = 282,
-  [1218] = 1218,
-  [1219] = 1219,
-  [1220] = 1220,
-  [1221] = 1221,
-  [1222] = 1074,
-  [1223] = 1223,
-  [1224] = 1210,
-  [1225] = 1225,
-  [1226] = 1226,
-  [1227] = 1227,
-  [1228] = 1228,
-  [1229] = 1229,
-  [1230] = 1230,
-  [1231] = 1194,
-  [1232] = 1232,
-  [1233] = 308,
-  [1234] = 1234,
-  [1235] = 1235,
-  [1236] = 1236,
-  [1237] = 1194,
-  [1238] = 1209,
-  [1239] = 1239,
-  [1240] = 1189,
-  [1241] = 1194,
-  [1242] = 1242,
-  [1243] = 1242,
-  [1244] = 1209,
-  [1245] = 1183,
-  [1246] = 1194,
-  [1247] = 1234,
-  [1248] = 1209,
-  [1249] = 1204,
-  [1250] = 1250,
-  [1251] = 1219,
-  [1252] = 1252,
-  [1253] = 1060,
-  [1254] = 1194,
-  [1255] = 1239,
-  [1256] = 1256,
-  [1257] = 1257,
-  [1258] = 1220,
-  [1259] = 1259,
-  [1260] = 1260,
-  [1261] = 1209,
-  [1262] = 1262,
-  [1263] = 1263,
-  [1264] = 1264,
-  [1265] = 281,
-  [1266] = 1266,
-  [1267] = 1267,
-  [1268] = 1268,
-  [1269] = 1269,
-  [1270] = 1270,
-  [1271] = 1196,
-  [1272] = 1203,
-  [1273] = 1228,
-  [1274] = 1230,
-  [1275] = 1275,
-  [1276] = 1197,
-  [1277] = 1264,
-  [1278] = 1260,
-  [1279] = 1230,
-  [1280] = 1228,
-  [1281] = 1281,
-  [1282] = 1203,
-  [1283] = 1196,
-  [1284] = 1284,
-  [1285] = 1264,
-  [1286] = 1221,
-  [1287] = 1287,
-  [1288] = 1288,
-  [1289] = 1289,
-  [1290] = 1290,
-  [1291] = 609,
-  [1292] = 1292,
-  [1293] = 1293,
-  [1294] = 1220,
-  [1295] = 1275,
-  [1296] = 1296,
-  [1297] = 1256,
-  [1298] = 1239,
-  [1299] = 1299,
-  [1300] = 1234,
-  [1301] = 1301,
-  [1302] = 1242,
-  [1303] = 1303,
-  [1304] = 287,
-  [1305] = 1305,
-  [1306] = 1199,
-  [1307] = 1069,
-  [1308] = 1308,
-  [1309] = 1194,
-  [1310] = 1310,
-  [1311] = 1225,
-  [1312] = 1312,
-  [1313] = 1219,
-  [1314] = 1314,
-  [1315] = 1284,
-  [1316] = 1316,
-  [1317] = 1312,
-  [1318] = 610,
-  [1319] = 1209,
-  [1320] = 1320,
-  [1321] = 1143,
-  [1322] = 1322,
-  [1323] = 1323,
-  [1324] = 288,
-  [1325] = 1325,
-  [1326] = 1326,
-  [1327] = 1225,
-  [1328] = 1256,
-  [1329] = 1329,
-  [1330] = 1330,
-  [1331] = 1331,
-  [1332] = 1067,
-  [1333] = 1333,
-  [1334] = 1229,
-  [1335] = 1335,
-  [1336] = 1336,
-  [1337] = 1337,
-  [1338] = 1338,
-  [1339] = 1177,
-  [1340] = 1340,
-  [1341] = 1341,
-  [1342] = 1342,
-  [1343] = 1343,
-  [1344] = 1344,
-  [1345] = 1345,
-  [1346] = 1346,
-  [1347] = 1267,
-  [1348] = 1041,
-  [1349] = 1349,
-  [1350] = 1350,
-  [1351] = 1351,
-  [1352] = 1352,
-  [1353] = 1353,
-  [1354] = 1354,
-  [1355] = 1355,
-  [1356] = 1356,
-  [1357] = 1357,
-  [1358] = 1354,
-  [1359] = 1359,
-  [1360] = 1360,
-  [1361] = 1361,
-  [1362] = 1362,
-  [1363] = 1363,
-  [1364] = 1364,
-  [1365] = 1365,
-  [1366] = 1360,
-  [1367] = 1367,
-  [1368] = 1368,
-  [1369] = 1369,
-  [1370] = 1356,
-  [1371] = 1371,
-  [1372] = 1344,
-  [1373] = 1373,
-  [1374] = 1374,
-  [1375] = 1375,
-  [1376] = 1375,
-  [1377] = 1363,
-  [1378] = 1371,
-  [1379] = 1379,
-  [1380] = 1380,
-  [1381] = 1381,
-  [1382] = 1226,
-  [1383] = 1383,
-  [1384] = 1384,
-  [1385] = 1385,
-  [1386] = 1386,
-  [1387] = 1387,
-  [1388] = 1388,
-  [1389] = 1389,
-  [1390] = 1390,
-  [1391] = 1391,
-  [1392] = 1392,
-  [1393] = 1393,
-  [1394] = 1394,
-  [1395] = 1395,
-  [1396] = 1396,
-  [1397] = 1198,
-  [1398] = 1398,
-  [1399] = 1399,
-  [1400] = 1400,
-  [1401] = 1401,
-  [1402] = 1402,
-  [1403] = 1403,
-  [1404] = 1404,
-  [1405] = 1405,
-  [1406] = 1406,
-  [1407] = 1407,
-  [1408] = 1408,
-  [1409] = 1409,
-  [1410] = 1405,
-  [1411] = 1411,
-  [1412] = 1412,
-  [1413] = 1413,
-  [1414] = 1414,
-  [1415] = 1415,
-  [1416] = 1416,
-  [1417] = 1417,
-  [1418] = 1418,
-  [1419] = 1419,
-  [1420] = 1420,
-  [1421] = 1421,
-  [1422] = 1422,
-  [1423] = 1423,
-  [1424] = 1424,
-  [1425] = 1425,
-  [1426] = 1426,
-  [1427] = 1427,
-  [1428] = 1428,
-  [1429] = 1407,
-  [1430] = 1430,
-  [1431] = 1431,
-  [1432] = 1414,
-  [1433] = 1411,
-  [1434] = 1434,
-  [1435] = 1435,
-  [1436] = 1430,
-  [1437] = 1407,
-  [1438] = 1405,
-  [1439] = 1411,
-  [1440] = 1440,
-  [1441] = 1441,
-  [1442] = 1417,
-  [1443] = 1443,
-  [1444] = 1444,
-  [1445] = 1445,
-  [1446] = 1430,
-  [1447] = 1414,
-  [1448] = 1448,
-  [1449] = 1448,
-  [1450] = 1443,
-  [1451] = 1451,
-  [1452] = 1452,
-  [1453] = 1427,
-  [1454] = 1454,
-  [1455] = 1455,
-  [1456] = 1456,
-  [1457] = 1457,
-  [1458] = 1427,
-  [1459] = 1422,
-  [1460] = 1460,
-  [1461] = 1460,
-  [1462] = 1462,
-  [1463] = 1463,
-  [1464] = 1417,
-  [1465] = 1465,
-  [1466] = 1466,
-  [1467] = 1467,
-  [1468] = 1435,
-  [1469] = 1462,
-  [1470] = 1470,
-  [1471] = 1471,
-  [1472] = 1472,
-  [1473] = 1467,
-  [1474] = 1451,
-  [1475] = 1431,
-  [1476] = 1470,
-  [1477] = 1445,
-  [1478] = 1478,
-  [1479] = 1420,
-  [1480] = 1480,
-  [1481] = 1481,
-  [1482] = 1428,
-  [1483] = 1483,
-  [1484] = 1431,
-  [1485] = 1483,
-  [1486] = 1486,
-  [1487] = 1487,
-  [1488] = 1488,
-  [1489] = 1489,
-  [1490] = 1490,
-  [1491] = 1478,
-  [1492] = 1492,
-  [1493] = 1452,
-  [1494] = 1430,
-  [1495] = 1495,
-  [1496] = 1496,
-  [1497] = 1497,
-  [1498] = 1498,
-  [1499] = 1463,
-  [1500] = 1448,
-  [1501] = 1481,
-  [1502] = 1502,
-  [1503] = 1467,
-  [1504] = 1462,
-  [1505] = 1480,
-  [1506] = 1471,
-  [1507] = 1465,
-  [1508] = 1498,
-  [1509] = 1509,
-  [1510] = 1510,
-  [1511] = 1511,
-  [1512] = 1495,
-  [1513] = 1460,
-  [1514] = 1514,
-  [1515] = 1409,
-  [1516] = 1511,
-  [1517] = 1514,
-  [1518] = 1472,
-  [1519] = 1454,
-  [1520] = 1488,
-  [1521] = 1521,
-  [1522] = 1421,
-  [1523] = 1425,
-  [1524] = 1427,
-};
-
 static inline bool sym_identifier_character_set_1(int32_t c) {
-  return (c < 43514
-    ? (c < 4193
-      ? (c < 2707
-        ? (c < 1994
-          ? (c < 931
-            ? (c < 748
-              ? (c < 192
+  return (c < 43020
+    ? (c < 4096
+      ? (c < 2693
+        ? (c < 1969
+          ? (c < 910
+            ? (c < 736
+              ? (c < 186
                 ? (c < 170
                   ? (c < 'a'
                     ? (c >= 'A' && c <= '_')
                     : c <= 'z')
-                  : (c <= 170 || (c < 186
-                    ? c == 181
-                    : c <= 186)))
-                : (c <= 214 || (c < 710
-                  ? (c < 248
-                    ? (c >= 216 && c <= 246)
-                    : c <= 705)
-                  : (c <= 721 || (c >= 736 && c <= 740)))))
-              : (c <= 748 || (c < 895
-                ? (c < 886
-                  ? (c < 880
-                    ? c == 750
-                    : c <= 884)
-                  : (c <= 887 || (c >= 891 && c <= 893)))
-                : (c <= 895 || (c < 908
-                  ? (c < 904
-                    ? c == 902
-                    : c <= 906)
-                  : (c <= 908 || (c >= 910 && c <= 929)))))))
-            : (c <= 1013 || (c < 1649
-              ? (c < 1376
-                ? (c < 1329
-                  ? (c < 1162
-                    ? (c >= 1015 && c <= 1153)
-                    : c <= 1327)
-                  : (c <= 1366 || c == 1369))
-                : (c <= 1416 || (c < 1568
-                  ? (c < 1519
-                    ? (c >= 1488 && c <= 1514)
-                    : c <= 1522)
-                  : (c <= 1610 || (c >= 1646 && c <= 1647)))))
-              : (c <= 1747 || (c < 1791
-                ? (c < 1774
-                  ? (c < 1765
-                    ? c == 1749
-                    : c <= 1766)
-                  : (c <= 1775 || (c >= 1786 && c <= 1788)))
-                : (c <= 1791 || (c < 1869
-                  ? (c < 1810
-                    ? c == 1808
-                    : c <= 1839)
-                  : (c <= 1957 || c == 1969))))))))
-          : (c <= 2026 || (c < 2482
-            ? (c < 2208
-              ? (c < 2088
-                ? (c < 2048
-                  ? (c < 2042
-                    ? (c >= 2036 && c <= 2037)
-                    : c <= 2042)
-                  : (c <= 2069 || (c < 2084
-                    ? c == 2074
-                    : c <= 2084)))
-                : (c <= 2088 || (c < 2160
-                  ? (c < 2144
-                    ? (c >= 2112 && c <= 2136)
-                    : c <= 2154)
-                  : (c <= 2183 || (c >= 2185 && c <= 2190)))))
-              : (c <= 2249 || (c < 2417
-                ? (c < 2384
-                  ? (c < 2365
-                    ? (c >= 2308 && c <= 2361)
-                    : c <= 2365)
-                  : (c <= 2384 || (c >= 2392 && c <= 2401)))
-                : (c <= 2432 || (c < 2451
-                  ? (c < 2447
-                    ? (c >= 2437 && c <= 2444)
-                    : c <= 2448)
-                  : (c <= 2472 || (c >= 2474 && c <= 2480)))))))
-            : (c <= 2482 || (c < 2579
-              ? (c < 2527
-                ? (c < 2510
-                  ? (c < 2493
-                    ? (c >= 2486 && c <= 2489)
-                    : c <= 2493)
-                  : (c <= 2510 || (c >= 2524 && c <= 2525)))
-                : (c <= 2529 || (c < 2565
-                  ? (c < 2556
-                    ? (c >= 2544 && c <= 2545)
-                    : c <= 2556)
-                  : (c <= 2570 || (c >= 2575 && c <= 2576)))))
-              : (c <= 2600 || (c < 2649
-                ? (c < 2613
-                  ? (c < 2610
-                    ? (c >= 2602 && c <= 2608)
-                    : c <= 2611)
-                  : (c <= 2614 || (c >= 2616 && c <= 2617)))
-                : (c <= 2652 || (c < 2693
-                  ? (c < 2674
-                    ? c == 2654
-                    : c <= 2676)
-                  : (c <= 2701 || (c >= 2703 && c <= 2705)))))))))))
-        : (c <= 2728 || (c < 3242
-          ? (c < 2962
-            ? (c < 2858
-              ? (c < 2784
-                ? (c < 2741
-                  ? (c < 2738
-                    ? (c >= 2730 && c <= 2736)
-                    : c <= 2739)
-                  : (c <= 2745 || (c < 2768
-                    ? c == 2749
-                    : c <= 2768)))
-                : (c <= 2785 || (c < 2831
-                  ? (c < 2821
-                    ? c == 2809
-                    : c <= 2828)
-                  : (c <= 2832 || (c >= 2835 && c <= 2856)))))
-              : (c <= 2864 || (c < 2911
-                ? (c < 2877
-                  ? (c < 2869
-                    ? (c >= 2866 && c <= 2867)
-                    : c <= 2873)
-                  : (c <= 2877 || (c >= 2908 && c <= 2909)))
-                : (c <= 2913 || (c < 2949
-                  ? (c < 2947
-                    ? c == 2929
-                    : c <= 2947)
-                  : (c <= 2954 || (c >= 2958 && c <= 2960)))))))
-            : (c <= 2965 || (c < 3090
-              ? (c < 2984
-                ? (c < 2974
-                  ? (c < 2972
-                    ? (c >= 2969 && c <= 2970)
-                    : c <= 2972)
-                  : (c <= 2975 || (c >= 2979 && c <= 2980)))
-                : (c <= 2986 || (c < 3077
-                  ? (c < 3024
-                    ? (c >= 2990 && c <= 3001)
-                    : c <= 3024)
-                  : (c <= 3084 || (c >= 3086 && c <= 3088)))))
-              : (c <= 3112 || (c < 3168
-                ? (c < 3160
-                  ? (c < 3133
-                    ? (c >= 3114 && c <= 3129)
-                    : c <= 3133)
-                  : (c <= 3162 || c == 3165))
-                : (c <= 3169 || (c < 3214
-                  ? (c < 3205
-                    ? c == 3200
-                    : c <= 3212)
-                  : (c <= 3216 || (c >= 3218 && c <= 3240)))))))))
-          : (c <= 3251 || (c < 3648
-            ? (c < 3412
-              ? (c < 3332
-                ? (c < 3293
-                  ? (c < 3261
-                    ? (c >= 3253 && c <= 3257)
-                    : c <= 3261)
-                  : (c <= 3294 || (c < 3313
-                    ? (c >= 3296 && c <= 3297)
-                    : c <= 3314)))
-                : (c <= 3340 || (c < 3389
-                  ? (c < 3346
-                    ? (c >= 3342 && c <= 3344)
-                    : c <= 3386)
-                  : (c <= 3389 || c == 3406))))
-              : (c <= 3414 || (c < 3507
-                ? (c < 3461
-                  ? (c < 3450
-                    ? (c >= 3423 && c <= 3425)
-                    : c <= 3455)
-                  : (c <= 3478 || (c >= 3482 && c <= 3505)))
-                : (c <= 3515 || (c < 3585
-                  ? (c < 3520
-                    ? c == 3517
-                    : c <= 3526)
-                  : (c <= 3632 || c == 3634))))))
-            : (c <= 3654 || (c < 3782
-              ? (c < 3749
-                ? (c < 3718
-                  ? (c < 3716
-                    ? (c >= 3713 && c <= 3714)
-                    : c <= 3716)
-                  : (c <= 3722 || (c >= 3724 && c <= 3747)))
-                : (c <= 3749 || (c < 3773
-                  ? (c < 3762
-                    ? (c >= 3751 && c <= 3760)
-                    : c <= 3762)
-                  : (c <= 3773 || (c >= 3776 && c <= 3780)))))
-              : (c <= 3782 || (c < 3976
-                ? (c < 3904
-                  ? (c < 3840
-                    ? (c >= 3804 && c <= 3807)
-                    : c <= 3840)
-                  : (c <= 3911 || (c >= 3913 && c <= 3948)))
-                : (c <= 3980 || (c < 4176
-                  ? (c < 4159
-                    ? (c >= 4096 && c <= 4138)
-                    : c <= 4159)
-                  : (c <= 4181 || (c >= 4186 && c <= 4189)))))))))))))
-      : (c <= 4193 || (c < 8134
-        ? (c < 6176
-          ? (c < 4808
-            ? (c < 4688
-              ? (c < 4295
-                ? (c < 4213
-                  ? (c < 4206
-                    ? (c >= 4197 && c <= 4198)
-                    : c <= 4208)
-                  : (c <= 4225 || (c < 4256
-                    ? c == 4238
-                    : c <= 4293)))
-                : (c <= 4295 || (c < 4348
-                  ? (c < 4304
-                    ? c == 4301
-                    : c <= 4346)
-                  : (c <= 4680 || (c >= 4682 && c <= 4685)))))
-              : (c <= 4694 || (c < 4752
-                ? (c < 4704
-                  ? (c < 4698
-                    ? c == 4696
-                    : c <= 4701)
-                  : (c <= 4744 || (c >= 4746 && c <= 4749)))
-                : (c <= 4784 || (c < 4800
-                  ? (c < 4792
-                    ? (c >= 4786 && c <= 4789)
-                    : c <= 4798)
-                  : (c <= 4800 || (c >= 4802 && c <= 4805)))))))
-            : (c <= 4822 || (c < 5792
-              ? (c < 5024
-                ? (c < 4888
-                  ? (c < 4882
-                    ? (c >= 4824 && c <= 4880)
-                    : c <= 4885)
-                  : (c <= 4954 || (c >= 4992 && c <= 5007)))
-                : (c <= 5109 || (c < 5743
-                  ? (c < 5121
-                    ? (c >= 5112 && c <= 5117)
-                    : c <= 5740)
-                  : (c <= 5759 || (c >= 5761 && c <= 5786)))))
-              : (c <= 5866 || (c < 5984
-                ? (c < 5919
-                  ? (c < 5888
-                    ? (c >= 5870 && c <= 5880)
-                    : c <= 5905)
-                  : (c <= 5937 || (c >= 5952 && c <= 5969)))
-                : (c <= 5996 || (c < 6103
-                  ? (c < 6016
-                    ? (c >= 5998 && c <= 6000)
-                    : c <= 6067)
-                  : (c <= 6103 || c == 6108))))))))
-          : (c <= 6264 || (c < 7312
-            ? (c < 6823
-              ? (c < 6512
-                ? (c < 6320
-                  ? (c < 6314
-                    ? (c >= 6272 && c <= 6312)
-                    : c <= 6314)
-                  : (c <= 6389 || (c < 6480
-                    ? (c >= 6400 && c <= 6430)
-                    : c <= 6509)))
-                : (c <= 6516 || (c < 6656
-                  ? (c < 6576
-                    ? (c >= 6528 && c <= 6571)
-                    : c <= 6601)
-                  : (c <= 6678 || (c >= 6688 && c <= 6740)))))
-              : (c <= 6823 || (c < 7098
-                ? (c < 7043
-                  ? (c < 6981
-                    ? (c >= 6917 && c <= 6963)
-                    : c <= 6988)
-                  : (c <= 7072 || (c >= 7086 && c <= 7087)))
-                : (c <= 7141 || (c < 7258
-                  ? (c < 7245
-                    ? (c >= 7168 && c <= 7203)
-                    : c <= 7247)
-                  : (c <= 7293 || (c >= 7296 && c <= 7304)))))))
-            : (c <= 7354 || (c < 8008
-              ? (c < 7418
-                ? (c < 7406
-                  ? (c < 7401
-                    ? (c >= 7357 && c <= 7359)
-                    : c <= 7404)
-                  : (c <= 7411 || (c >= 7413 && c <= 7414)))
-                : (c <= 7418 || (c < 7960
-                  ? (c < 7680
-                    ? (c >= 7424 && c <= 7615)
-                    : c <= 7957)
-                  : (c <= 7965 || (c >= 7968 && c <= 8005)))))
-              : (c <= 8013 || (c < 8031
-                ? (c < 8027
-                  ? (c < 8025
-                    ? (c >= 8016 && c <= 8023)
-                    : c <= 8025)
-                  : (c <= 8027 || c == 8029))
-                : (c <= 8061 || (c < 8126
-                  ? (c < 8118
-                    ? (c >= 8064 && c <= 8116)
-                    : c <= 8124)
-                  : (c <= 8126 || (c >= 8130 && c <= 8132)))))))))))
-        : (c <= 8140 || (c < 12337
-          ? (c < 8544
-            ? (c < 8458
-              ? (c < 8305
-                ? (c < 8160
-                  ? (c < 8150
-                    ? (c >= 8144 && c <= 8147)
-                    : c <= 8155)
-                  : (c <= 8172 || (c < 8182
-                    ? (c >= 8178 && c <= 8180)
-                    : c <= 8188)))
-                : (c <= 8305 || (c < 8450
-                  ? (c < 8336
-                    ? c == 8319
-                    : c <= 8348)
-                  : (c <= 8450 || c == 8455))))
-              : (c <= 8467 || (c < 8488
-                ? (c < 8484
-                  ? (c < 8472
-                    ? c == 8469
-                    : c <= 8477)
-                  : (c <= 8484 || c == 8486))
-                : (c <= 8488 || (c < 8517
-                  ? (c < 8508
-                    ? (c >= 8490 && c <= 8505)
-                    : c <= 8511)
-                  : (c <= 8521 || c == 8526))))))
-            : (c <= 8584 || (c < 11680
-              ? (c < 11559
-                ? (c < 11506
-                  ? (c < 11499
-                    ? (c >= 11264 && c <= 11492)
-                    : c <= 11502)
-                  : (c <= 11507 || (c >= 11520 && c <= 11557)))
-                : (c <= 11559 || (c < 11631
-                  ? (c < 11568
-                    ? c == 11565
-                    : c <= 11623)
-                  : (c <= 11631 || (c >= 11648 && c <= 11670)))))
-              : (c <= 11686 || (c < 11720
-                ? (c < 11704
-                  ? (c < 11696
-                    ? (c >= 11688 && c <= 11694)
-                    : c <= 11702)
-                  : (c <= 11710 || (c >= 11712 && c <= 11718)))
-                : (c <= 11726 || (c < 12293
-                  ? (c < 11736
-                    ? (c >= 11728 && c <= 11734)
-                    : c <= 11742)
-                  : (c <= 12295 || (c >= 12321 && c <= 12329)))))))))
-          : (c <= 12341 || (c < 42891
-            ? (c < 19968
-              ? (c < 12549
-                ? (c < 12445
-                  ? (c < 12353
-                    ? (c >= 12344 && c <= 12348)
-                    : c <= 12438)
-                  : (c <= 12447 || (c < 12540
-                    ? (c >= 12449 && c <= 12538)
-                    : c <= 12543)))
-                : (c <= 12591 || (c < 12784
-                  ? (c < 12704
-                    ? (c >= 12593 && c <= 12686)
-                    : c <= 12735)
-                  : (c <= 12799 || (c >= 13312 && c <= 19903)))))
-              : (c <= 42124 || (c < 42560
-                ? (c < 42512
-                  ? (c < 42240
-                    ? (c >= 42192 && c <= 42237)
-                    : c <= 42508)
-                  : (c <= 42527 || (c >= 42538 && c <= 42539)))
-                : (c <= 42606 || (c < 42775
-                  ? (c < 42656
-                    ? (c >= 42623 && c <= 42653)
-                    : c <= 42735)
-                  : (c <= 42783 || (c >= 42786 && c <= 42888)))))))
-            : (c <= 42954 || (c < 43250
-              ? (c < 43011
-                ? (c < 42965
-                  ? (c < 42963
-                    ? (c >= 42960 && c <= 42961)
-                    : c <= 42963)
-                  : (c <= 42969 || (c >= 42994 && c <= 43009)))
-                : (c <= 43013 || (c < 43072
-                  ? (c < 43020
-                    ? (c >= 43015 && c <= 43018)
-                    : c <= 43042)
-                  : (c <= 43123 || (c >= 43138 && c <= 43187)))))
-              : (c <= 43255 || (c < 43360
-                ? (c < 43274
-                  ? (c < 43261
-                    ? c == 43259
-                    : c <= 43262)
-                  : (c <= 43301 || (c >= 43312 && c <= 43334)))
-                : (c <= 43388 || (c < 43488
-                  ? (c < 43471
-                    ? (c >= 43396 && c <= 43442)
-                    : c <= 43471)
-                  : (c <= 43492 || (c >= 43494 && c <= 43503)))))))))))))))
-    : (c <= 43518 || (c < 70727
-      ? (c < 66956
-        ? (c < 64914
-          ? (c < 43868
-            ? (c < 43714
-              ? (c < 43646
-                ? (c < 43588
-                  ? (c < 43584
-                    ? (c >= 43520 && c <= 43560)
-                    : c <= 43586)
-                  : (c <= 43595 || (c < 43642
-                    ? (c >= 43616 && c <= 43638)
-                    : c <= 43642)))
-                : (c <= 43695 || (c < 43705
-                  ? (c < 43701
-                    ? c == 43697
-                    : c <= 43702)
-                  : (c <= 43709 || c == 43712))))
-              : (c <= 43714 || (c < 43785
-                ? (c < 43762
-                  ? (c < 43744
-                    ? (c >= 43739 && c <= 43741)
-                    : c <= 43754)
-                  : (c <= 43764 || (c >= 43777 && c <= 43782)))
-                : (c <= 43790 || (c < 43816
-                  ? (c < 43808
-                    ? (c >= 43793 && c <= 43798)
-                    : c <= 43814)
-                  : (c <= 43822 || (c >= 43824 && c <= 43866)))))))
-            : (c <= 43881 || (c < 64287
-              ? (c < 63744
-                ? (c < 55216
-                  ? (c < 44032
-                    ? (c >= 43888 && c <= 44002)
-                    : c <= 55203)
-                  : (c <= 55238 || (c >= 55243 && c <= 55291)))
-                : (c <= 64109 || (c < 64275
-                  ? (c < 64256
-                    ? (c >= 64112 && c <= 64217)
-                    : c <= 64262)
-                  : (c <= 64279 || c == 64285))))
-              : (c <= 64296 || (c < 64323
-                ? (c < 64318
-                  ? (c < 64312
-                    ? (c >= 64298 && c <= 64310)
-                    : c <= 64316)
-                  : (c <= 64318 || (c >= 64320 && c <= 64321)))
-                : (c <= 64324 || (c < 64612
-                  ? (c < 64467
-                    ? (c >= 64326 && c <= 64433)
-                    : c <= 64605)
-                  : (c <= 64829 || (c >= 64848 && c <= 64911)))))))))
-          : (c <= 64967 || (c < 65599
-            ? (c < 65382
-              ? (c < 65147
-                ? (c < 65139
-                  ? (c < 65137
-                    ? (c >= 65008 && c <= 65017)
-                    : c <= 65137)
-                  : (c <= 65139 || (c < 65145
-                    ? c == 65143
-                    : c <= 65145)))
-                : (c <= 65147 || (c < 65313
-                  ? (c < 65151
-                    ? c == 65149
-                    : c <= 65276)
-                  : (c <= 65338 || (c >= 65345 && c <= 65370)))))
-              : (c <= 65437 || (c < 65498
-                ? (c < 65482
-                  ? (c < 65474
-                    ? (c >= 65440 && c <= 65470)
-                    : c <= 65479)
-                  : (c <= 65487 || (c >= 65490 && c <= 65495)))
-                : (c <= 65500 || (c < 65576
-                  ? (c < 65549
-                    ? (c >= 65536 && c <= 65547)
-                    : c <= 65574)
-                  : (c <= 65594 || (c >= 65596 && c <= 65597)))))))
-            : (c <= 65613 || (c < 66464
-              ? (c < 66208
-                ? (c < 65856
-                  ? (c < 65664
-                    ? (c >= 65616 && c <= 65629)
-                    : c <= 65786)
-                  : (c <= 65908 || (c >= 66176 && c <= 66204)))
-                : (c <= 66256 || (c < 66384
-                  ? (c < 66349
-                    ? (c >= 66304 && c <= 66335)
-                    : c <= 66378)
-                  : (c <= 66421 || (c >= 66432 && c <= 66461)))))
-              : (c <= 66499 || (c < 66776
-                ? (c < 66560
-                  ? (c < 66513
-                    ? (c >= 66504 && c <= 66511)
-                    : c <= 66517)
-                  : (c <= 66717 || (c >= 66736 && c <= 66771)))
-                : (c <= 66811 || (c < 66928
-                  ? (c < 66864
-                    ? (c >= 66816 && c <= 66855)
-                    : c <= 66915)
-                  : (c <= 66938 || (c >= 66940 && c <= 66954)))))))))))
-        : (c <= 66962 || (c < 68864
-          ? (c < 67828
-            ? (c < 67506
-              ? (c < 67072
-                ? (c < 66979
-                  ? (c < 66967
-                    ? (c >= 66964 && c <= 66965)
-                    : c <= 66977)
-                  : (c <= 66993 || (c < 67003
-                    ? (c >= 66995 && c <= 67001)
-                    : c <= 67004)))
-                : (c <= 67382 || (c < 67456
-                  ? (c < 67424
-                    ? (c >= 67392 && c <= 67413)
-                    : c <= 67431)
-                  : (c <= 67461 || (c >= 67463 && c <= 67504)))))
-              : (c <= 67514 || (c < 67644
-                ? (c < 67594
-                  ? (c < 67592
-                    ? (c >= 67584 && c <= 67589)
-                    : c <= 67592)
-                  : (c <= 67637 || (c >= 67639 && c <= 67640)))
-                : (c <= 67644 || (c < 67712
-                  ? (c < 67680
-                    ? (c >= 67647 && c <= 67669)
-                    : c <= 67702)
-                  : (c <= 67742 || (c >= 67808 && c <= 67826)))))))
-            : (c <= 67829 || (c < 68224
-              ? (c < 68096
-                ? (c < 67968
-                  ? (c < 67872
-                    ? (c >= 67840 && c <= 67861)
-                    : c <= 67897)
-                  : (c <= 68023 || (c >= 68030 && c <= 68031)))
-                : (c <= 68096 || (c < 68121
-                  ? (c < 68117
-                    ? (c >= 68112 && c <= 68115)
-                    : c <= 68119)
-                  : (c <= 68149 || (c >= 68192 && c <= 68220)))))
-              : (c <= 68252 || (c < 68448
-                ? (c < 68352
-                  ? (c < 68297
-                    ? (c >= 68288 && c <= 68295)
-                    : c <= 68324)
-                  : (c <= 68405 || (c >= 68416 && c <= 68437)))
-                : (c <= 68466 || (c < 68736
-                  ? (c < 68608
-                    ? (c >= 68480 && c <= 68497)
-                    : c <= 68680)
-                  : (c <= 68786 || (c >= 68800 && c <= 68850)))))))))
-          : (c <= 68899 || (c < 70106
-            ? (c < 69749
-              ? (c < 69488
-                ? (c < 69376
-                  ? (c < 69296
-                    ? (c >= 69248 && c <= 69289)
-                    : c <= 69297)
-                  : (c <= 69404 || (c < 69424
-                    ? c == 69415
-                    : c <= 69445)))
-                : (c <= 69505 || (c < 69635
-                  ? (c < 69600
-                    ? (c >= 69552 && c <= 69572)
-                    : c <= 69622)
-                  : (c <= 69687 || (c >= 69745 && c <= 69746)))))
-              : (c <= 69749 || (c < 69959
-                ? (c < 69891
-                  ? (c < 69840
-                    ? (c >= 69763 && c <= 69807)
-                    : c <= 69864)
-                  : (c <= 69926 || c == 69956))
-                : (c <= 69959 || (c < 70019
-                  ? (c < 70006
-                    ? (c >= 69968 && c <= 70002)
-                    : c <= 70006)
-                  : (c <= 70066 || (c >= 70081 && c <= 70084)))))))
-            : (c <= 70106 || (c < 70405
-              ? (c < 70280
-                ? (c < 70163
-                  ? (c < 70144
-                    ? c == 70108
-                    : c <= 70161)
-                  : (c <= 70187 || (c >= 70272 && c <= 70278)))
-                : (c <= 70280 || (c < 70303
-                  ? (c < 70287
-                    ? (c >= 70282 && c <= 70285)
-                    : c <= 70301)
-                  : (c <= 70312 || (c >= 70320 && c <= 70366)))))
-              : (c <= 70412 || (c < 70453
-                ? (c < 70442
-                  ? (c < 70419
-                    ? (c >= 70415 && c <= 70416)
-                    : c <= 70440)
-                  : (c <= 70448 || (c >= 70450 && c <= 70451)))
-                : (c <= 70457 || (c < 70493
-                  ? (c < 70480
-                    ? c == 70461
-                    : c <= 70480)
-                  : (c <= 70497 || (c >= 70656 && c <= 70708)))))))))))))
-      : (c <= 70730 || (c < 119894
-        ? (c < 73056
-          ? (c < 72001
-            ? (c < 71424
-              ? (c < 71128
-                ? (c < 70852
-                  ? (c < 70784
-                    ? (c >= 70751 && c <= 70753)
-                    : c <= 70831)
-                  : (c <= 70853 || (c < 71040
-                    ? c == 70855
-                    : c <= 71086)))
-                : (c <= 71131 || (c < 71296
-                  ? (c < 71236
-                    ? (c >= 71168 && c <= 71215)
-                    : c <= 71236)
-                  : (c <= 71338 || c == 71352))))
-              : (c <= 71450 || (c < 71945
-                ? (c < 71840
-                  ? (c < 71680
-                    ? (c >= 71488 && c <= 71494)
-                    : c <= 71723)
-                  : (c <= 71903 || (c >= 71935 && c <= 71942)))
-                : (c <= 71945 || (c < 71960
-                  ? (c < 71957
-                    ? (c >= 71948 && c <= 71955)
-                    : c <= 71958)
-                  : (c <= 71983 || c == 71999))))))
-            : (c <= 72001 || (c < 72349
-              ? (c < 72192
-                ? (c < 72161
-                  ? (c < 72106
-                    ? (c >= 72096 && c <= 72103)
-                    : c <= 72144)
-                  : (c <= 72161 || c == 72163))
-                : (c <= 72192 || (c < 72272
-                  ? (c < 72250
-                    ? (c >= 72203 && c <= 72242)
-                    : c <= 72250)
-                  : (c <= 72272 || (c >= 72284 && c <= 72329)))))
-              : (c <= 72349 || (c < 72818
-                ? (c < 72714
-                  ? (c < 72704
-                    ? (c >= 72368 && c <= 72440)
-                    : c <= 72712)
-                  : (c <= 72750 || c == 72768))
-                : (c <= 72847 || (c < 72971
-                  ? (c < 72968
-                    ? (c >= 72960 && c <= 72966)
-                    : c <= 72969)
-                  : (c <= 73008 || c == 73030))))))))
-          : (c <= 73061 || (c < 93952
-            ? (c < 82944
-              ? (c < 73728
-                ? (c < 73112
-                  ? (c < 73066
-                    ? (c >= 73063 && c <= 73064)
-                    : c <= 73097)
-                  : (c <= 73112 || (c < 73648
-                    ? (c >= 73440 && c <= 73458)
-                    : c <= 73648)))
-                : (c <= 74649 || (c < 77712
-                  ? (c < 74880
-                    ? (c >= 74752 && c <= 74862)
-                    : c <= 75075)
-                  : (c <= 77808 || (c >= 77824 && c <= 78894)))))
-              : (c <= 83526 || (c < 92928
-                ? (c < 92784
-                  ? (c < 92736
-                    ? (c >= 92160 && c <= 92728)
-                    : c <= 92766)
-                  : (c <= 92862 || (c >= 92880 && c <= 92909)))
-                : (c <= 92975 || (c < 93053
-                  ? (c < 93027
-                    ? (c >= 92992 && c <= 92995)
-                    : c <= 93047)
-                  : (c <= 93071 || (c >= 93760 && c <= 93823)))))))
-            : (c <= 94026 || (c < 110589
-              ? (c < 94208
-                ? (c < 94176
-                  ? (c < 94099
-                    ? c == 94032
-                    : c <= 94111)
-                  : (c <= 94177 || c == 94179))
-                : (c <= 100343 || (c < 110576
-                  ? (c < 101632
-                    ? (c >= 100352 && c <= 101589)
-                    : c <= 101640)
-                  : (c <= 110579 || (c >= 110581 && c <= 110587)))))
-              : (c <= 110590 || (c < 113664
-                ? (c < 110948
-                  ? (c < 110928
-                    ? (c >= 110592 && c <= 110882)
-                    : c <= 110930)
-                  : (c <= 110951 || (c >= 110960 && c <= 111355)))
-                : (c <= 113770 || (c < 113808
-                  ? (c < 113792
-                    ? (c >= 113776 && c <= 113788)
-                    : c <= 113800)
-                  : (c <= 113817 || (c >= 119808 && c <= 119892)))))))))))
-        : (c <= 119964 || (c < 125259
-          ? (c < 120572
-            ? (c < 120086
-              ? (c < 119995
-                ? (c < 119973
-                  ? (c < 119970
-                    ? (c >= 119966 && c <= 119967)
-                    : c <= 119970)
-                  : (c <= 119974 || (c < 119982
-                    ? (c >= 119977 && c <= 119980)
-                    : c <= 119993)))
-                : (c <= 119995 || (c < 120071
-                  ? (c < 120005
-                    ? (c >= 119997 && c <= 120003)
-                    : c <= 120069)
-                  : (c <= 120074 || (c >= 120077 && c <= 120084)))))
-              : (c <= 120092 || (c < 120138
-                ? (c < 120128
-                  ? (c < 120123
-                    ? (c >= 120094 && c <= 120121)
-                    : c <= 120126)
-                  : (c <= 120132 || c == 120134))
-                : (c <= 120144 || (c < 120514
-                  ? (c < 120488
-                    ? (c >= 120146 && c <= 120485)
-                    : c <= 120512)
-                  : (c <= 120538 || (c >= 120540 && c <= 120570)))))))
-            : (c <= 120596 || (c < 123191
-              ? (c < 120714
-                ? (c < 120656
-                  ? (c < 120630
-                    ? (c >= 120598 && c <= 120628)
-                    : c <= 120654)
-                  : (c <= 120686 || (c >= 120688 && c <= 120712)))
-                : (c <= 120744 || (c < 122624
-                  ? (c < 120772
-                    ? (c >= 120746 && c <= 120770)
-                    : c <= 120779)
-                  : (c <= 122654 || (c >= 123136 && c <= 123180)))))
-              : (c <= 123197 || (c < 124904
-                ? (c < 123584
-                  ? (c < 123536
-                    ? c == 123214
-                    : c <= 123565)
-                  : (c <= 123627 || (c >= 124896 && c <= 124902)))
-                : (c <= 124907 || (c < 124928
-                  ? (c < 124912
-                    ? (c >= 124909 && c <= 124910)
-                    : c <= 124926)
-                  : (c <= 125124 || (c >= 125184 && c <= 125251)))))))))
-          : (c <= 125259 || (c < 126559
-            ? (c < 126535
-              ? (c < 126505
-                ? (c < 126497
-                  ? (c < 126469
-                    ? (c >= 126464 && c <= 126467)
-                    : c <= 126495)
-                  : (c <= 126498 || (c < 126503
-                    ? c == 126500
-                    : c <= 126503)))
-                : (c <= 126514 || (c < 126523
-                  ? (c < 126521
-                    ? (c >= 126516 && c <= 126519)
-                    : c <= 126521)
-                  : (c <= 126523 || c == 126530))))
-              : (c <= 126535 || (c < 126548
-                ? (c < 126541
-                  ? (c < 126539
-                    ? c == 126537
-                    : c <= 126539)
-                  : (c <= 126543 || (c >= 126545 && c <= 126546)))
-                : (c <= 126548 || (c < 126555
-                  ? (c < 126553
-                    ? c == 126551
-                    : c <= 126553)
-                  : (c <= 126555 || c == 126557))))))
-            : (c <= 126559 || (c < 126625
-              ? (c < 126580
-                ? (c < 126567
-                  ? (c < 126564
-                    ? (c >= 126561 && c <= 126562)
-                    : c <= 126564)
-                  : (c <= 126570 || (c >= 126572 && c <= 126578)))
-                : (c <= 126583 || (c < 126592
-                  ? (c < 126590
-                    ? (c >= 126585 && c <= 126588)
-                    : c <= 126590)
-                  : (c <= 126601 || (c >= 126603 && c <= 126619)))))
-              : (c <= 126627 || (c < 177984
-                ? (c < 131072
-                  ? (c < 126635
-                    ? (c >= 126629 && c <= 126633)
-                    : c <= 126651)
-                  : (c <= 173791 || (c >= 173824 && c <= 177976)))
-                : (c <= 178205 || (c < 194560
-                  ? (c < 183984
-                    ? (c >= 178208 && c <= 183969)
-                    : c <= 191456)
-                  : (c <= 195101 || (c >= 196608 && c <= 201546)))))))))))))))));
-}
-
-static inline bool sym_identifier_character_set_2(int32_t c) {
-  return (c < 43514
-    ? (c < 4193
-      ? (c < 2707
-        ? (c < 1994
-          ? (c < 910
-            ? (c < 736
-              ? (c < 186
-                ? (c < 'a'
-                  ? (c < '_'
-                    ? (c >= 'A' && c <= 'Z')
-                    : c <= '_')
-                  : (c <= 'z' || (c < 181
-                    ? c == 170
-                    : c <= 181)))
+                  : (c <= 170 || c == 181))
                 : (c <= 186 || (c < 248
                   ? (c < 216
                     ? (c >= 192 && c <= 214)
@@ -5305,784 +3017,732 @@ static inline bool sym_identifier_character_set_2(int32_t c) {
                     ? c == 895
                     : c <= 902)
                   : (c <= 906 || c == 908))))))
-            : (c <= 929 || (c < 1649
-              ? (c < 1376
+            : (c <= 929 || (c < 1646
+              ? (c < 1369
                 ? (c < 1162
                   ? (c < 1015
                     ? (c >= 931 && c <= 1013)
                     : c <= 1153)
-                  : (c <= 1327 || (c < 1369
-                    ? (c >= 1329 && c <= 1366)
-                    : c <= 1369)))
-                : (c <= 1416 || (c < 1568
-                  ? (c < 1519
-                    ? (c >= 1488 && c <= 1514)
-                    : c <= 1522)
-                  : (c <= 1610 || (c >= 1646 && c <= 1647)))))
-              : (c <= 1747 || (c < 1791
-                ? (c < 1774
-                  ? (c < 1765
-                    ? c == 1749
-                    : c <= 1766)
-                  : (c <= 1775 || (c >= 1786 && c <= 1788)))
-                : (c <= 1791 || (c < 1869
-                  ? (c < 1810
-                    ? c == 1808
-                    : c <= 1839)
-                  : (c <= 1957 || c == 1969))))))))
-          : (c <= 2026 || (c < 2482
+                  : (c <= 1327 || (c >= 1329 && c <= 1366)))
+                : (c <= 1369 || (c < 1519
+                  ? (c < 1488
+                    ? (c >= 1376 && c <= 1416)
+                    : c <= 1514)
+                  : (c <= 1522 || (c >= 1568 && c <= 1610)))))
+              : (c <= 1647 || (c < 1786
+                ? (c < 1765
+                  ? (c < 1749
+                    ? (c >= 1649 && c <= 1747)
+                    : c <= 1749)
+                  : (c <= 1766 || (c >= 1774 && c <= 1775)))
+                : (c <= 1788 || (c < 1810
+                  ? (c < 1808
+                    ? c == 1791
+                    : c <= 1808)
+                  : (c <= 1839 || (c >= 1869 && c <= 1957)))))))))
+          : (c <= 1969 || (c < 2474
             ? (c < 2208
-              ? (c < 2088
-                ? (c < 2048
-                  ? (c < 2042
-                    ? (c >= 2036 && c <= 2037)
-                    : c <= 2042)
-                  : (c <= 2069 || (c < 2084
-                    ? c == 2074
-                    : c <= 2084)))
-                : (c <= 2088 || (c < 2160
-                  ? (c < 2144
-                    ? (c >= 2112 && c <= 2136)
-                    : c <= 2154)
-                  : (c <= 2183 || (c >= 2185 && c <= 2190)))))
-              : (c <= 2249 || (c < 2417
-                ? (c < 2384
-                  ? (c < 2365
-                    ? (c >= 2308 && c <= 2361)
-                    : c <= 2365)
-                  : (c <= 2384 || (c >= 2392 && c <= 2401)))
-                : (c <= 2432 || (c < 2451
-                  ? (c < 2447
-                    ? (c >= 2437 && c <= 2444)
-                    : c <= 2448)
-                  : (c <= 2472 || (c >= 2474 && c <= 2480)))))))
-            : (c <= 2482 || (c < 2579
-              ? (c < 2527
-                ? (c < 2510
-                  ? (c < 2493
-                    ? (c >= 2486 && c <= 2489)
-                    : c <= 2493)
-                  : (c <= 2510 || (c >= 2524 && c <= 2525)))
-                : (c <= 2529 || (c < 2565
-                  ? (c < 2556
-                    ? (c >= 2544 && c <= 2545)
-                    : c <= 2556)
-                  : (c <= 2570 || (c >= 2575 && c <= 2576)))))
-              : (c <= 2600 || (c < 2649
-                ? (c < 2613
-                  ? (c < 2610
-                    ? (c >= 2602 && c <= 2608)
-                    : c <= 2611)
-                  : (c <= 2614 || (c >= 2616 && c <= 2617)))
-                : (c <= 2652 || (c < 2693
-                  ? (c < 2674
-                    ? c == 2654
-                    : c <= 2676)
-                  : (c <= 2701 || (c >= 2703 && c <= 2705)))))))))))
-        : (c <= 2728 || (c < 3242
-          ? (c < 2962
-            ? (c < 2858
-              ? (c < 2784
-                ? (c < 2741
-                  ? (c < 2738
-                    ? (c >= 2730 && c <= 2736)
-                    : c <= 2739)
-                  : (c <= 2745 || (c < 2768
+              ? (c < 2074
+                ? (c < 2042
+                  ? (c < 2036
+                    ? (c >= 1994 && c <= 2026)
+                    : c <= 2037)
+                  : (c <= 2042 || (c >= 2048 && c <= 2069)))
+                : (c <= 2074 || (c < 2112
+                  ? (c < 2088
+                    ? c == 2084
+                    : c <= 2088)
+                  : (c <= 2136 || (c >= 2144 && c <= 2154)))))
+              : (c <= 2228 || (c < 2392
+                ? (c < 2365
+                  ? (c < 2308
+                    ? (c >= 2230 && c <= 2247)
+                    : c <= 2361)
+                  : (c <= 2365 || c == 2384))
+                : (c <= 2401 || (c < 2447
+                  ? (c < 2437
+                    ? (c >= 2417 && c <= 2432)
+                    : c <= 2444)
+                  : (c <= 2448 || (c >= 2451 && c <= 2472)))))))
+            : (c <= 2480 || (c < 2575
+              ? (c < 2524
+                ? (c < 2493
+                  ? (c < 2486
+                    ? c == 2482
+                    : c <= 2489)
+                  : (c <= 2493 || c == 2510))
+                : (c <= 2525 || (c < 2556
+                  ? (c < 2544
+                    ? (c >= 2527 && c <= 2529)
+                    : c <= 2545)
+                  : (c <= 2556 || (c >= 2565 && c <= 2570)))))
+              : (c <= 2576 || (c < 2616
+                ? (c < 2610
+                  ? (c < 2602
+                    ? (c >= 2579 && c <= 2600)
+                    : c <= 2608)
+                  : (c <= 2611 || (c >= 2613 && c <= 2614)))
+                : (c <= 2617 || (c < 2654
+                  ? (c >= 2649 && c <= 2652)
+                  : (c <= 2654 || (c >= 2674 && c <= 2676)))))))))))
+        : (c <= 2701 || (c < 3214
+          ? (c < 2947
+            ? (c < 2821
+              ? (c < 2741
+                ? (c < 2730
+                  ? (c < 2707
+                    ? (c >= 2703 && c <= 2705)
+                    : c <= 2728)
+                  : (c <= 2736 || (c >= 2738 && c <= 2739)))
+                : (c <= 2745 || (c < 2784
+                  ? (c < 2768
                     ? c == 2749
-                    : c <= 2768)))
-                : (c <= 2785 || (c < 2831
-                  ? (c < 2821
-                    ? c == 2809
-                    : c <= 2828)
-                  : (c <= 2832 || (c >= 2835 && c <= 2856)))))
-              : (c <= 2864 || (c < 2911
-                ? (c < 2877
-                  ? (c < 2869
-                    ? (c >= 2866 && c <= 2867)
-                    : c <= 2873)
-                  : (c <= 2877 || (c >= 2908 && c <= 2909)))
-                : (c <= 2913 || (c < 2949
-                  ? (c < 2947
-                    ? c == 2929
-                    : c <= 2947)
-                  : (c <= 2954 || (c >= 2958 && c <= 2960)))))))
-            : (c <= 2965 || (c < 3090
-              ? (c < 2984
-                ? (c < 2974
-                  ? (c < 2972
-                    ? (c >= 2969 && c <= 2970)
-                    : c <= 2972)
-                  : (c <= 2975 || (c >= 2979 && c <= 2980)))
-                : (c <= 2986 || (c < 3077
-                  ? (c < 3024
-                    ? (c >= 2990 && c <= 3001)
-                    : c <= 3024)
-                  : (c <= 3084 || (c >= 3086 && c <= 3088)))))
-              : (c <= 3112 || (c < 3168
-                ? (c < 3160
-                  ? (c < 3133
-                    ? (c >= 3114 && c <= 3129)
-                    : c <= 3133)
-                  : (c <= 3162 || c == 3165))
-                : (c <= 3169 || (c < 3214
-                  ? (c < 3205
-                    ? c == 3200
-                    : c <= 3212)
-                  : (c <= 3216 || (c >= 3218 && c <= 3240)))))))))
-          : (c <= 3251 || (c < 3648
-            ? (c < 3412
-              ? (c < 3332
-                ? (c < 3293
-                  ? (c < 3261
-                    ? (c >= 3253 && c <= 3257)
-                    : c <= 3261)
-                  : (c <= 3294 || (c < 3313
+                    : c <= 2768)
+                  : (c <= 2785 || c == 2809))))
+              : (c <= 2828 || (c < 2869
+                ? (c < 2858
+                  ? (c < 2835
+                    ? (c >= 2831 && c <= 2832)
+                    : c <= 2856)
+                  : (c <= 2864 || (c >= 2866 && c <= 2867)))
+                : (c <= 2873 || (c < 2911
+                  ? (c < 2908
+                    ? c == 2877
+                    : c <= 2909)
+                  : (c <= 2913 || c == 2929))))))
+            : (c <= 2947 || (c < 3024
+              ? (c < 2972
+                ? (c < 2962
+                  ? (c < 2958
+                    ? (c >= 2949 && c <= 2954)
+                    : c <= 2960)
+                  : (c <= 2965 || (c >= 2969 && c <= 2970)))
+                : (c <= 2972 || (c < 2984
+                  ? (c < 2979
+                    ? (c >= 2974 && c <= 2975)
+                    : c <= 2980)
+                  : (c <= 2986 || (c >= 2990 && c <= 3001)))))
+              : (c <= 3024 || (c < 3133
+                ? (c < 3090
+                  ? (c < 3086
+                    ? (c >= 3077 && c <= 3084)
+                    : c <= 3088)
+                  : (c <= 3112 || (c >= 3114 && c <= 3129)))
+                : (c <= 3133 || (c < 3200
+                  ? (c < 3168
+                    ? (c >= 3160 && c <= 3162)
+                    : c <= 3169)
+                  : (c <= 3200 || (c >= 3205 && c <= 3212)))))))))
+          : (c <= 3216 || (c < 3520
+            ? (c < 3346
+              ? (c < 3294
+                ? (c < 3253
+                  ? (c < 3242
+                    ? (c >= 3218 && c <= 3240)
+                    : c <= 3251)
+                  : (c <= 3257 || c == 3261))
+                : (c <= 3294 || (c < 3332
+                  ? (c < 3313
                     ? (c >= 3296 && c <= 3297)
-                    : c <= 3314)))
-                : (c <= 3340 || (c < 3389
-                  ? (c < 3346
-                    ? (c >= 3342 && c <= 3344)
-                    : c <= 3386)
-                  : (c <= 3389 || c == 3406))))
-              : (c <= 3414 || (c < 3507
-                ? (c < 3461
-                  ? (c < 3450
-                    ? (c >= 3423 && c <= 3425)
-                    : c <= 3455)
-                  : (c <= 3478 || (c >= 3482 && c <= 3505)))
-                : (c <= 3515 || (c < 3585
-                  ? (c < 3520
-                    ? c == 3517
-                    : c <= 3526)
-                  : (c <= 3632 || c == 3634))))))
-            : (c <= 3654 || (c < 3782
-              ? (c < 3749
-                ? (c < 3718
-                  ? (c < 3716
-                    ? (c >= 3713 && c <= 3714)
-                    : c <= 3716)
-                  : (c <= 3722 || (c >= 3724 && c <= 3747)))
-                : (c <= 3749 || (c < 3773
-                  ? (c < 3762
-                    ? (c >= 3751 && c <= 3760)
-                    : c <= 3762)
-                  : (c <= 3773 || (c >= 3776 && c <= 3780)))))
-              : (c <= 3782 || (c < 3976
-                ? (c < 3904
-                  ? (c < 3840
-                    ? (c >= 3804 && c <= 3807)
-                    : c <= 3840)
-                  : (c <= 3911 || (c >= 3913 && c <= 3948)))
-                : (c <= 3980 || (c < 4176
-                  ? (c < 4159
-                    ? (c >= 4096 && c <= 4138)
-                    : c <= 4159)
-                  : (c <= 4181 || (c >= 4186 && c <= 4189)))))))))))))
-      : (c <= 4193 || (c < 8134
-        ? (c < 6176
-          ? (c < 4808
-            ? (c < 4688
-              ? (c < 4295
-                ? (c < 4213
-                  ? (c < 4206
-                    ? (c >= 4197 && c <= 4198)
-                    : c <= 4208)
-                  : (c <= 4225 || (c < 4256
-                    ? c == 4238
-                    : c <= 4293)))
-                : (c <= 4295 || (c < 4348
+                    : c <= 3314)
+                  : (c <= 3340 || (c >= 3342 && c <= 3344)))))
+              : (c <= 3386 || (c < 3450
+                ? (c < 3412
+                  ? (c < 3406
+                    ? c == 3389
+                    : c <= 3406)
+                  : (c <= 3414 || (c >= 3423 && c <= 3425)))
+                : (c <= 3455 || (c < 3507
+                  ? (c < 3482
+                    ? (c >= 3461 && c <= 3478)
+                    : c <= 3505)
+                  : (c <= 3515 || c == 3517))))))
+            : (c <= 3526 || (c < 3762
+              ? (c < 3716
+                ? (c < 3648
+                  ? (c < 3634
+                    ? (c >= 3585 && c <= 3632)
+                    : c <= 3634)
+                  : (c <= 3654 || (c >= 3713 && c <= 3714)))
+                : (c <= 3716 || (c < 3749
+                  ? (c < 3724
+                    ? (c >= 3718 && c <= 3722)
+                    : c <= 3747)
+                  : (c <= 3749 || (c >= 3751 && c <= 3760)))))
+              : (c <= 3762 || (c < 3840
+                ? (c < 3782
+                  ? (c < 3776
+                    ? c == 3773
+                    : c <= 3780)
+                  : (c <= 3782 || (c >= 3804 && c <= 3807)))
+                : (c <= 3840 || (c < 3913
+                  ? (c >= 3904 && c <= 3911)
+                  : (c <= 3948 || (c >= 3976 && c <= 3980)))))))))))))
+      : (c <= 4138 || (c < 8025
+        ? (c < 5952
+          ? (c < 4752
+            ? (c < 4295
+              ? (c < 4197
+                ? (c < 4186
+                  ? (c < 4176
+                    ? c == 4159
+                    : c <= 4181)
+                  : (c <= 4189 || c == 4193))
+                : (c <= 4198 || (c < 4238
+                  ? (c < 4213
+                    ? (c >= 4206 && c <= 4208)
+                    : c <= 4225)
+                  : (c <= 4238 || (c >= 4256 && c <= 4293)))))
+              : (c <= 4295 || (c < 4688
+                ? (c < 4348
                   ? (c < 4304
                     ? c == 4301
                     : c <= 4346)
-                  : (c <= 4680 || (c >= 4682 && c <= 4685)))))
-              : (c <= 4694 || (c < 4752
-                ? (c < 4704
+                  : (c <= 4680 || (c >= 4682 && c <= 4685)))
+                : (c <= 4694 || (c < 4704
                   ? (c < 4698
                     ? c == 4696
                     : c <= 4701)
-                  : (c <= 4744 || (c >= 4746 && c <= 4749)))
-                : (c <= 4784 || (c < 4800
+                  : (c <= 4744 || (c >= 4746 && c <= 4749)))))))
+            : (c <= 4784 || (c < 5024
+              ? (c < 4808
+                ? (c < 4800
                   ? (c < 4792
                     ? (c >= 4786 && c <= 4789)
                     : c <= 4798)
-                  : (c <= 4800 || (c >= 4802 && c <= 4805)))))))
-            : (c <= 4822 || (c < 5792
-              ? (c < 5024
-                ? (c < 4888
+                  : (c <= 4800 || (c >= 4802 && c <= 4805)))
+                : (c <= 4822 || (c < 4888
                   ? (c < 4882
                     ? (c >= 4824 && c <= 4880)
                     : c <= 4885)
-                  : (c <= 4954 || (c >= 4992 && c <= 5007)))
-                : (c <= 5109 || (c < 5743
+                  : (c <= 4954 || (c >= 4992 && c <= 5007)))))
+              : (c <= 5109 || (c < 5792
+                ? (c < 5743
                   ? (c < 5121
                     ? (c >= 5112 && c <= 5117)
                     : c <= 5740)
-                  : (c <= 5759 || (c >= 5761 && c <= 5786)))))
-              : (c <= 5866 || (c < 5984
-                ? (c < 5919
+                  : (c <= 5759 || (c >= 5761 && c <= 5786)))
+                : (c <= 5866 || (c < 5902
                   ? (c < 5888
                     ? (c >= 5870 && c <= 5880)
-                    : c <= 5905)
-                  : (c <= 5937 || (c >= 5952 && c <= 5969)))
-                : (c <= 5996 || (c < 6103
-                  ? (c < 6016
-                    ? (c >= 5998 && c <= 6000)
-                    : c <= 6067)
-                  : (c <= 6103 || c == 6108))))))))
-          : (c <= 6264 || (c < 7312
-            ? (c < 6823
-              ? (c < 6512
-                ? (c < 6320
-                  ? (c < 6314
-                    ? (c >= 6272 && c <= 6312)
-                    : c <= 6314)
-                  : (c <= 6389 || (c < 6480
-                    ? (c >= 6400 && c <= 6430)
-                    : c <= 6509)))
-                : (c <= 6516 || (c < 6656
-                  ? (c < 6576
-                    ? (c >= 6528 && c <= 6571)
-                    : c <= 6601)
-                  : (c <= 6678 || (c >= 6688 && c <= 6740)))))
-              : (c <= 6823 || (c < 7098
-                ? (c < 7043
-                  ? (c < 6981
-                    ? (c >= 6917 && c <= 6963)
-                    : c <= 6988)
-                  : (c <= 7072 || (c >= 7086 && c <= 7087)))
-                : (c <= 7141 || (c < 7258
-                  ? (c < 7245
-                    ? (c >= 7168 && c <= 7203)
-                    : c <= 7247)
-                  : (c <= 7293 || (c >= 7296 && c <= 7304)))))))
-            : (c <= 7354 || (c < 8008
-              ? (c < 7418
-                ? (c < 7406
-                  ? (c < 7401
-                    ? (c >= 7357 && c <= 7359)
-                    : c <= 7404)
-                  : (c <= 7411 || (c >= 7413 && c <= 7414)))
-                : (c <= 7418 || (c < 7960
-                  ? (c < 7680
-                    ? (c >= 7424 && c <= 7615)
-                    : c <= 7957)
-                  : (c <= 7965 || (c >= 7968 && c <= 8005)))))
-              : (c <= 8013 || (c < 8031
-                ? (c < 8027
-                  ? (c < 8025
-                    ? (c >= 8016 && c <= 8023)
-                    : c <= 8025)
-                  : (c <= 8027 || c == 8029))
-                : (c <= 8061 || (c < 8126
-                  ? (c < 8118
-                    ? (c >= 8064 && c <= 8116)
-                    : c <= 8124)
-                  : (c <= 8126 || (c >= 8130 && c <= 8132)))))))))))
-        : (c <= 8140 || (c < 12337
-          ? (c < 8544
-            ? (c < 8458
-              ? (c < 8305
-                ? (c < 8160
-                  ? (c < 8150
-                    ? (c >= 8144 && c <= 8147)
-                    : c <= 8155)
-                  : (c <= 8172 || (c < 8182
-                    ? (c >= 8178 && c <= 8180)
-                    : c <= 8188)))
-                : (c <= 8305 || (c < 8450
-                  ? (c < 8336
-                    ? c == 8319
-                    : c <= 8348)
-                  : (c <= 8450 || c == 8455))))
-              : (c <= 8467 || (c < 8488
-                ? (c < 8484
-                  ? (c < 8472
-                    ? c == 8469
-                    : c <= 8477)
-                  : (c <= 8484 || c == 8486))
-                : (c <= 8488 || (c < 8517
-                  ? (c < 8508
-                    ? (c >= 8490 && c <= 8505)
-                    : c <= 8511)
-                  : (c <= 8521 || c == 8526))))))
-            : (c <= 8584 || (c < 11680
-              ? (c < 11559
-                ? (c < 11506
-                  ? (c < 11499
-                    ? (c >= 11264 && c <= 11492)
-                    : c <= 11502)
-                  : (c <= 11507 || (c >= 11520 && c <= 11557)))
-                : (c <= 11559 || (c < 11631
-                  ? (c < 11568
-                    ? c == 11565
-                    : c <= 11623)
-                  : (c <= 11631 || (c >= 11648 && c <= 11670)))))
-              : (c <= 11686 || (c < 11720
-                ? (c < 11704
-                  ? (c < 11696
-                    ? (c >= 11688 && c <= 11694)
-                    : c <= 11702)
-                  : (c <= 11710 || (c >= 11712 && c <= 11718)))
-                : (c <= 11726 || (c < 12293
-                  ? (c < 11736
-                    ? (c >= 11728 && c <= 11734)
-                    : c <= 11742)
-                  : (c <= 12295 || (c >= 12321 && c <= 12329)))))))))
-          : (c <= 12341 || (c < 42891
-            ? (c < 19968
-              ? (c < 12549
-                ? (c < 12445
-                  ? (c < 12353
-                    ? (c >= 12344 && c <= 12348)
-                    : c <= 12438)
-                  : (c <= 12447 || (c < 12540
+                    : c <= 5900)
+                  : (c <= 5905 || (c >= 5920 && c <= 5937)))))))))
+          : (c <= 5969 || (c < 7043
+            ? (c < 6400
+              ? (c < 6108
+                ? (c < 6016
+                  ? (c < 5998
+                    ? (c >= 5984 && c <= 5996)
+                    : c <= 6000)
+                  : (c <= 6067 || c == 6103))
+                : (c <= 6108 || (c < 6314
+                  ? (c < 6272
+                    ? (c >= 6176 && c <= 6264)
+                    : c <= 6312)
+                  : (c <= 6314 || (c >= 6320 && c <= 6389)))))
+              : (c <= 6430 || (c < 6656
+                ? (c < 6528
+                  ? (c < 6512
+                    ? (c >= 6480 && c <= 6509)
+                    : c <= 6516)
+                  : (c <= 6571 || (c >= 6576 && c <= 6601)))
+                : (c <= 6678 || (c < 6917
+                  ? (c < 6823
+                    ? (c >= 6688 && c <= 6740)
+                    : c <= 6823)
+                  : (c <= 6963 || (c >= 6981 && c <= 6987)))))))
+            : (c <= 7072 || (c < 7406
+              ? (c < 7258
+                ? (c < 7168
+                  ? (c < 7098
+                    ? (c >= 7086 && c <= 7087)
+                    : c <= 7141)
+                  : (c <= 7203 || (c >= 7245 && c <= 7247)))
+                : (c <= 7293 || (c < 7357
+                  ? (c < 7312
+                    ? (c >= 7296 && c <= 7304)
+                    : c <= 7354)
+                  : (c <= 7359 || (c >= 7401 && c <= 7404)))))
+              : (c <= 7411 || (c < 7960
+                ? (c < 7424
+                  ? (c < 7418
+                    ? (c >= 7413 && c <= 7414)
+                    : c <= 7418)
+                  : (c <= 7615 || (c >= 7680 && c <= 7957)))
+                : (c <= 7965 || (c < 8008
+                  ? (c >= 7968 && c <= 8005)
+                  : (c <= 8013 || (c >= 8016 && c <= 8023)))))))))))
+        : (c <= 8025 || (c < 11631
+          ? (c < 8469
+            ? (c < 8150
+              ? (c < 8118
+                ? (c < 8031
+                  ? (c < 8029
+                    ? c == 8027
+                    : c <= 8029)
+                  : (c <= 8061 || (c >= 8064 && c <= 8116)))
+                : (c <= 8124 || (c < 8134
+                  ? (c < 8130
+                    ? c == 8126
+                    : c <= 8132)
+                  : (c <= 8140 || (c >= 8144 && c <= 8147)))))
+              : (c <= 8155 || (c < 8319
+                ? (c < 8182
+                  ? (c < 8178
+                    ? (c >= 8160 && c <= 8172)
+                    : c <= 8180)
+                  : (c <= 8188 || c == 8305))
+                : (c <= 8319 || (c < 8455
+                  ? (c < 8450
+                    ? (c >= 8336 && c <= 8348)
+                    : c <= 8450)
+                  : (c <= 8455 || (c >= 8458 && c <= 8467)))))))
+            : (c <= 8469 || (c < 11264
+              ? (c < 8490
+                ? (c < 8486
+                  ? (c < 8484
+                    ? (c >= 8472 && c <= 8477)
+                    : c <= 8484)
+                  : (c <= 8486 || c == 8488))
+                : (c <= 8505 || (c < 8526
+                  ? (c < 8517
+                    ? (c >= 8508 && c <= 8511)
+                    : c <= 8521)
+                  : (c <= 8526 || (c >= 8544 && c <= 8584)))))
+              : (c <= 11310 || (c < 11520
+                ? (c < 11499
+                  ? (c < 11360
+                    ? (c >= 11312 && c <= 11358)
+                    : c <= 11492)
+                  : (c <= 11502 || (c >= 11506 && c <= 11507)))
+                : (c <= 11557 || (c < 11565
+                  ? c == 11559
+                  : (c <= 11565 || (c >= 11568 && c <= 11623)))))))))
+          : (c <= 11631 || (c < 12704
+            ? (c < 12293
+              ? (c < 11704
+                ? (c < 11688
+                  ? (c < 11680
+                    ? (c >= 11648 && c <= 11670)
+                    : c <= 11686)
+                  : (c <= 11694 || (c >= 11696 && c <= 11702)))
+                : (c <= 11710 || (c < 11728
+                  ? (c < 11720
+                    ? (c >= 11712 && c <= 11718)
+                    : c <= 11726)
+                  : (c <= 11734 || (c >= 11736 && c <= 11742)))))
+              : (c <= 12295 || (c < 12445
+                ? (c < 12344
+                  ? (c < 12337
+                    ? (c >= 12321 && c <= 12329)
+                    : c <= 12341)
+                  : (c <= 12348 || (c >= 12353 && c <= 12438)))
+                : (c <= 12447 || (c < 12549
+                  ? (c < 12540
                     ? (c >= 12449 && c <= 12538)
-                    : c <= 12543)))
-                : (c <= 12591 || (c < 12784
-                  ? (c < 12704
-                    ? (c >= 12593 && c <= 12686)
-                    : c <= 12735)
-                  : (c <= 12799 || (c >= 13312 && c <= 19903)))))
-              : (c <= 42124 || (c < 42560
-                ? (c < 42512
-                  ? (c < 42240
-                    ? (c >= 42192 && c <= 42237)
-                    : c <= 42508)
-                  : (c <= 42527 || (c >= 42538 && c <= 42539)))
-                : (c <= 42606 || (c < 42775
-                  ? (c < 42656
-                    ? (c >= 42623 && c <= 42653)
-                    : c <= 42735)
-                  : (c <= 42783 || (c >= 42786 && c <= 42888)))))))
-            : (c <= 42954 || (c < 43250
-              ? (c < 43011
-                ? (c < 42965
-                  ? (c < 42963
-                    ? (c >= 42960 && c <= 42961)
-                    : c <= 42963)
-                  : (c <= 42969 || (c >= 42994 && c <= 43009)))
-                : (c <= 43013 || (c < 43072
-                  ? (c < 43020
-                    ? (c >= 43015 && c <= 43018)
-                    : c <= 43042)
-                  : (c <= 43123 || (c >= 43138 && c <= 43187)))))
-              : (c <= 43255 || (c < 43360
-                ? (c < 43274
-                  ? (c < 43261
-                    ? c == 43259
-                    : c <= 43262)
-                  : (c <= 43301 || (c >= 43312 && c <= 43334)))
-                : (c <= 43388 || (c < 43488
-                  ? (c < 43471
-                    ? (c >= 43396 && c <= 43442)
-                    : c <= 43471)
-                  : (c <= 43492 || (c >= 43494 && c <= 43503)))))))))))))))
-    : (c <= 43518 || (c < 70727
-      ? (c < 66956
-        ? (c < 64914
-          ? (c < 43868
-            ? (c < 43714
-              ? (c < 43646
-                ? (c < 43588
-                  ? (c < 43584
-                    ? (c >= 43520 && c <= 43560)
-                    : c <= 43586)
-                  : (c <= 43595 || (c < 43642
-                    ? (c >= 43616 && c <= 43638)
-                    : c <= 43642)))
-                : (c <= 43695 || (c < 43705
-                  ? (c < 43701
-                    ? c == 43697
-                    : c <= 43702)
-                  : (c <= 43709 || c == 43712))))
-              : (c <= 43714 || (c < 43785
-                ? (c < 43762
-                  ? (c < 43744
-                    ? (c >= 43739 && c <= 43741)
-                    : c <= 43754)
-                  : (c <= 43764 || (c >= 43777 && c <= 43782)))
-                : (c <= 43790 || (c < 43816
-                  ? (c < 43808
-                    ? (c >= 43793 && c <= 43798)
-                    : c <= 43814)
-                  : (c <= 43822 || (c >= 43824 && c <= 43866)))))))
-            : (c <= 43881 || (c < 64287
-              ? (c < 63744
-                ? (c < 55216
-                  ? (c < 44032
-                    ? (c >= 43888 && c <= 44002)
-                    : c <= 55203)
-                  : (c <= 55238 || (c >= 55243 && c <= 55291)))
-                : (c <= 64109 || (c < 64275
-                  ? (c < 64256
-                    ? (c >= 64112 && c <= 64217)
-                    : c <= 64262)
-                  : (c <= 64279 || c == 64285))))
-              : (c <= 64296 || (c < 64323
-                ? (c < 64318
-                  ? (c < 64312
-                    ? (c >= 64298 && c <= 64310)
-                    : c <= 64316)
-                  : (c <= 64318 || (c >= 64320 && c <= 64321)))
-                : (c <= 64324 || (c < 64612
-                  ? (c < 64467
-                    ? (c >= 64326 && c <= 64433)
-                    : c <= 64605)
-                  : (c <= 64829 || (c >= 64848 && c <= 64911)))))))))
-          : (c <= 64967 || (c < 65599
-            ? (c < 65382
-              ? (c < 65147
-                ? (c < 65139
-                  ? (c < 65137
-                    ? (c >= 65008 && c <= 65017)
-                    : c <= 65137)
-                  : (c <= 65139 || (c < 65145
-                    ? c == 65143
-                    : c <= 65145)))
-                : (c <= 65147 || (c < 65313
+                    : c <= 12543)
+                  : (c <= 12591 || (c >= 12593 && c <= 12686)))))))
+            : (c <= 12735 || (c < 42623
+              ? (c < 42192
+                ? (c < 19968
+                  ? (c < 13312
+                    ? (c >= 12784 && c <= 12799)
+                    : c <= 19903)
+                  : (c <= 40956 || (c >= 40960 && c <= 42124)))
+                : (c <= 42237 || (c < 42538
+                  ? (c < 42512
+                    ? (c >= 42240 && c <= 42508)
+                    : c <= 42527)
+                  : (c <= 42539 || (c >= 42560 && c <= 42606)))))
+              : (c <= 42653 || (c < 42946
+                ? (c < 42786
+                  ? (c < 42775
+                    ? (c >= 42656 && c <= 42735)
+                    : c <= 42783)
+                  : (c <= 42888 || (c >= 42891 && c <= 42943)))
+                : (c <= 42954 || (c < 43011
+                  ? (c >= 42997 && c <= 43009)
+                  : (c <= 43013 || (c >= 43015 && c <= 43018)))))))))))))))
+    : (c <= 43042 || (c < 70453
+      ? (c < 66176
+        ? (c < 64112
+          ? (c < 43697
+            ? (c < 43471
+              ? (c < 43261
+                ? (c < 43250
+                  ? (c < 43138
+                    ? (c >= 43072 && c <= 43123)
+                    : c <= 43187)
+                  : (c <= 43255 || c == 43259))
+                : (c <= 43262 || (c < 43360
+                  ? (c < 43312
+                    ? (c >= 43274 && c <= 43301)
+                    : c <= 43334)
+                  : (c <= 43388 || (c >= 43396 && c <= 43442)))))
+              : (c <= 43471 || (c < 43584
+                ? (c < 43514
+                  ? (c < 43494
+                    ? (c >= 43488 && c <= 43492)
+                    : c <= 43503)
+                  : (c <= 43518 || (c >= 43520 && c <= 43560)))
+                : (c <= 43586 || (c < 43642
+                  ? (c < 43616
+                    ? (c >= 43588 && c <= 43595)
+                    : c <= 43638)
+                  : (c <= 43642 || (c >= 43646 && c <= 43695)))))))
+            : (c <= 43697 || (c < 43793
+              ? (c < 43739
+                ? (c < 43712
+                  ? (c < 43705
+                    ? (c >= 43701 && c <= 43702)
+                    : c <= 43709)
+                  : (c <= 43712 || c == 43714))
+                : (c <= 43741 || (c < 43777
+                  ? (c < 43762
+                    ? (c >= 43744 && c <= 43754)
+                    : c <= 43764)
+                  : (c <= 43782 || (c >= 43785 && c <= 43790)))))
+              : (c <= 43798 || (c < 43888
+                ? (c < 43824
+                  ? (c < 43816
+                    ? (c >= 43808 && c <= 43814)
+                    : c <= 43822)
+                  : (c <= 43866 || (c >= 43868 && c <= 43881)))
+                : (c <= 44002 || (c < 55243
+                  ? (c < 55216
+                    ? (c >= 44032 && c <= 55203)
+                    : c <= 55238)
+                  : (c <= 55291 || (c >= 63744 && c <= 64109)))))))))
+          : (c <= 64217 || (c < 65147
+            ? (c < 64326
+              ? (c < 64298
+                ? (c < 64285
+                  ? (c < 64275
+                    ? (c >= 64256 && c <= 64262)
+                    : c <= 64279)
+                  : (c <= 64285 || (c >= 64287 && c <= 64296)))
+                : (c <= 64310 || (c < 64320
+                  ? (c < 64318
+                    ? (c >= 64312 && c <= 64316)
+                    : c <= 64318)
+                  : (c <= 64321 || (c >= 64323 && c <= 64324)))))
+              : (c <= 64433 || (c < 65008
+                ? (c < 64848
+                  ? (c < 64612
+                    ? (c >= 64467 && c <= 64605)
+                    : c <= 64829)
+                  : (c <= 64911 || (c >= 64914 && c <= 64967)))
+                : (c <= 65017 || (c < 65143
+                  ? (c < 65139
+                    ? c == 65137
+                    : c <= 65139)
+                  : (c <= 65143 || c == 65145))))))
+            : (c <= 65147 || (c < 65498
+              ? (c < 65382
+                ? (c < 65313
                   ? (c < 65151
                     ? c == 65149
                     : c <= 65276)
-                  : (c <= 65338 || (c >= 65345 && c <= 65370)))))
-              : (c <= 65437 || (c < 65498
-                ? (c < 65482
+                  : (c <= 65338 || (c >= 65345 && c <= 65370)))
+                : (c <= 65437 || (c < 65482
                   ? (c < 65474
                     ? (c >= 65440 && c <= 65470)
                     : c <= 65479)
-                  : (c <= 65487 || (c >= 65490 && c <= 65495)))
-                : (c <= 65500 || (c < 65576
+                  : (c <= 65487 || (c >= 65490 && c <= 65495)))))
+              : (c <= 65500 || (c < 65599
+                ? (c < 65576
                   ? (c < 65549
                     ? (c >= 65536 && c <= 65547)
                     : c <= 65574)
-                  : (c <= 65594 || (c >= 65596 && c <= 65597)))))))
-            : (c <= 65613 || (c < 66464
-              ? (c < 66208
-                ? (c < 65856
-                  ? (c < 65664
-                    ? (c >= 65616 && c <= 65629)
-                    : c <= 65786)
-                  : (c <= 65908 || (c >= 66176 && c <= 66204)))
-                : (c <= 66256 || (c < 66384
-                  ? (c < 66349
-                    ? (c >= 66304 && c <= 66335)
-                    : c <= 66378)
-                  : (c <= 66421 || (c >= 66432 && c <= 66461)))))
-              : (c <= 66499 || (c < 66776
-                ? (c < 66560
-                  ? (c < 66513
-                    ? (c >= 66504 && c <= 66511)
-                    : c <= 66517)
-                  : (c <= 66717 || (c >= 66736 && c <= 66771)))
-                : (c <= 66811 || (c < 66928
-                  ? (c < 66864
-                    ? (c >= 66816 && c <= 66855)
-                    : c <= 66915)
-                  : (c <= 66938 || (c >= 66940 && c <= 66954)))))))))))
-        : (c <= 66962 || (c < 68864
-          ? (c < 67828
-            ? (c < 67506
-              ? (c < 67072
-                ? (c < 66979
-                  ? (c < 66967
-                    ? (c >= 66964 && c <= 66965)
-                    : c <= 66977)
-                  : (c <= 66993 || (c < 67003
-                    ? (c >= 66995 && c <= 67001)
-                    : c <= 67004)))
-                : (c <= 67382 || (c < 67456
-                  ? (c < 67424
-                    ? (c >= 67392 && c <= 67413)
-                    : c <= 67431)
-                  : (c <= 67461 || (c >= 67463 && c <= 67504)))))
-              : (c <= 67514 || (c < 67644
-                ? (c < 67594
-                  ? (c < 67592
-                    ? (c >= 67584 && c <= 67589)
-                    : c <= 67592)
-                  : (c <= 67637 || (c >= 67639 && c <= 67640)))
-                : (c <= 67644 || (c < 67712
-                  ? (c < 67680
-                    ? (c >= 67647 && c <= 67669)
-                    : c <= 67702)
-                  : (c <= 67742 || (c >= 67808 && c <= 67826)))))))
-            : (c <= 67829 || (c < 68224
-              ? (c < 68096
-                ? (c < 67968
-                  ? (c < 67872
-                    ? (c >= 67840 && c <= 67861)
-                    : c <= 67897)
-                  : (c <= 68023 || (c >= 68030 && c <= 68031)))
-                : (c <= 68096 || (c < 68121
-                  ? (c < 68117
-                    ? (c >= 68112 && c <= 68115)
-                    : c <= 68119)
-                  : (c <= 68149 || (c >= 68192 && c <= 68220)))))
-              : (c <= 68252 || (c < 68448
-                ? (c < 68352
-                  ? (c < 68297
-                    ? (c >= 68288 && c <= 68295)
-                    : c <= 68324)
-                  : (c <= 68405 || (c >= 68416 && c <= 68437)))
-                : (c <= 68466 || (c < 68736
-                  ? (c < 68608
-                    ? (c >= 68480 && c <= 68497)
-                    : c <= 68680)
-                  : (c <= 68786 || (c >= 68800 && c <= 68850)))))))))
-          : (c <= 68899 || (c < 70106
-            ? (c < 69749
-              ? (c < 69488
-                ? (c < 69376
-                  ? (c < 69296
-                    ? (c >= 69248 && c <= 69289)
-                    : c <= 69297)
-                  : (c <= 69404 || (c < 69424
-                    ? c == 69415
-                    : c <= 69445)))
-                : (c <= 69505 || (c < 69635
-                  ? (c < 69600
-                    ? (c >= 69552 && c <= 69572)
-                    : c <= 69622)
-                  : (c <= 69687 || (c >= 69745 && c <= 69746)))))
-              : (c <= 69749 || (c < 69959
-                ? (c < 69891
-                  ? (c < 69840
-                    ? (c >= 69763 && c <= 69807)
-                    : c <= 69864)
-                  : (c <= 69926 || c == 69956))
-                : (c <= 69959 || (c < 70019
-                  ? (c < 70006
-                    ? (c >= 69968 && c <= 70002)
-                    : c <= 70006)
-                  : (c <= 70066 || (c >= 70081 && c <= 70084)))))))
-            : (c <= 70106 || (c < 70405
-              ? (c < 70280
-                ? (c < 70163
-                  ? (c < 70144
-                    ? c == 70108
-                    : c <= 70161)
-                  : (c <= 70187 || (c >= 70272 && c <= 70278)))
-                : (c <= 70280 || (c < 70303
-                  ? (c < 70287
-                    ? (c >= 70282 && c <= 70285)
-                    : c <= 70301)
-                  : (c <= 70312 || (c >= 70320 && c <= 70366)))))
-              : (c <= 70412 || (c < 70453
-                ? (c < 70442
-                  ? (c < 70419
-                    ? (c >= 70415 && c <= 70416)
-                    : c <= 70440)
-                  : (c <= 70448 || (c >= 70450 && c <= 70451)))
-                : (c <= 70457 || (c < 70493
+                  : (c <= 65594 || (c >= 65596 && c <= 65597)))
+                : (c <= 65613 || (c < 65664
+                  ? (c >= 65616 && c <= 65629)
+                  : (c <= 65786 || (c >= 65856 && c <= 65908)))))))))))
+        : (c <= 66204 || (c < 68416
+          ? (c < 67639
+            ? (c < 66736
+              ? (c < 66432
+                ? (c < 66349
+                  ? (c < 66304
+                    ? (c >= 66208 && c <= 66256)
+                    : c <= 66335)
+                  : (c <= 66378 || (c >= 66384 && c <= 66421)))
+                : (c <= 66461 || (c < 66513
+                  ? (c < 66504
+                    ? (c >= 66464 && c <= 66499)
+                    : c <= 66511)
+                  : (c <= 66517 || (c >= 66560 && c <= 66717)))))
+              : (c <= 66771 || (c < 67392
+                ? (c < 66864
+                  ? (c < 66816
+                    ? (c >= 66776 && c <= 66811)
+                    : c <= 66855)
+                  : (c <= 66915 || (c >= 67072 && c <= 67382)))
+                : (c <= 67413 || (c < 67592
+                  ? (c < 67584
+                    ? (c >= 67424 && c <= 67431)
+                    : c <= 67589)
+                  : (c <= 67592 || (c >= 67594 && c <= 67637)))))))
+            : (c <= 67640 || (c < 68030
+              ? (c < 67808
+                ? (c < 67680
+                  ? (c < 67647
+                    ? c == 67644
+                    : c <= 67669)
+                  : (c <= 67702 || (c >= 67712 && c <= 67742)))
+                : (c <= 67826 || (c < 67872
+                  ? (c < 67840
+                    ? (c >= 67828 && c <= 67829)
+                    : c <= 67861)
+                  : (c <= 67897 || (c >= 67968 && c <= 68023)))))
+              : (c <= 68031 || (c < 68192
+                ? (c < 68117
+                  ? (c < 68112
+                    ? c == 68096
+                    : c <= 68115)
+                  : (c <= 68119 || (c >= 68121 && c <= 68149)))
+                : (c <= 68220 || (c < 68297
+                  ? (c < 68288
+                    ? (c >= 68224 && c <= 68252)
+                    : c <= 68295)
+                  : (c <= 68324 || (c >= 68352 && c <= 68405)))))))))
+          : (c <= 68437 || (c < 69968
+            ? (c < 69415
+              ? (c < 68800
+                ? (c < 68608
+                  ? (c < 68480
+                    ? (c >= 68448 && c <= 68466)
+                    : c <= 68497)
+                  : (c <= 68680 || (c >= 68736 && c <= 68786)))
+                : (c <= 68850 || (c < 69296
+                  ? (c < 69248
+                    ? (c >= 68864 && c <= 68899)
+                    : c <= 69289)
+                  : (c <= 69297 || (c >= 69376 && c <= 69404)))))
+              : (c <= 69415 || (c < 69763
+                ? (c < 69600
+                  ? (c < 69552
+                    ? (c >= 69424 && c <= 69445)
+                    : c <= 69572)
+                  : (c <= 69622 || (c >= 69635 && c <= 69687)))
+                : (c <= 69807 || (c < 69956
+                  ? (c < 69891
+                    ? (c >= 69840 && c <= 69864)
+                    : c <= 69926)
+                  : (c <= 69956 || c == 69959))))))
+            : (c <= 70002 || (c < 70282
+              ? (c < 70108
+                ? (c < 70081
+                  ? (c < 70019
+                    ? c == 70006
+                    : c <= 70066)
+                  : (c <= 70084 || c == 70106))
+                : (c <= 70108 || (c < 70272
+                  ? (c < 70163
+                    ? (c >= 70144 && c <= 70161)
+                    : c <= 70187)
+                  : (c <= 70278 || c == 70280))))
+              : (c <= 70285 || (c < 70415
+                ? (c < 70320
+                  ? (c < 70303
+                    ? (c >= 70287 && c <= 70301)
+                    : c <= 70312)
+                  : (c <= 70366 || (c >= 70405 && c <= 70412)))
+                : (c <= 70416 || (c < 70442
+                  ? (c >= 70419 && c <= 70440)
+                  : (c <= 70448 || (c >= 70450 && c <= 70451)))))))))))))
+      : (c <= 70457 || (c < 113808
+        ? (c < 72818
+          ? (c < 71945
+            ? (c < 71040
+              ? (c < 70727
+                ? (c < 70493
                   ? (c < 70480
                     ? c == 70461
                     : c <= 70480)
-                  : (c <= 70497 || (c >= 70656 && c <= 70708)))))))))))))
-      : (c <= 70730 || (c < 119894
-        ? (c < 73056
-          ? (c < 72001
-            ? (c < 71424
-              ? (c < 71128
-                ? (c < 70852
+                  : (c <= 70497 || (c >= 70656 && c <= 70708)))
+                : (c <= 70730 || (c < 70852
                   ? (c < 70784
                     ? (c >= 70751 && c <= 70753)
                     : c <= 70831)
-                  : (c <= 70853 || (c < 71040
-                    ? c == 70855
-                    : c <= 71086)))
-                : (c <= 71131 || (c < 71296
-                  ? (c < 71236
-                    ? (c >= 71168 && c <= 71215)
-                    : c <= 71236)
-                  : (c <= 71338 || c == 71352))))
-              : (c <= 71450 || (c < 71945
-                ? (c < 71840
+                  : (c <= 70853 || c == 70855))))
+              : (c <= 71086 || (c < 71352
+                ? (c < 71236
+                  ? (c < 71168
+                    ? (c >= 71128 && c <= 71131)
+                    : c <= 71215)
+                  : (c <= 71236 || (c >= 71296 && c <= 71338)))
+                : (c <= 71352 || (c < 71840
                   ? (c < 71680
-                    ? (c >= 71488 && c <= 71494)
+                    ? (c >= 71424 && c <= 71450)
                     : c <= 71723)
-                  : (c <= 71903 || (c >= 71935 && c <= 71942)))
-                : (c <= 71945 || (c < 71960
+                  : (c <= 71903 || (c >= 71935 && c <= 71942)))))))
+            : (c <= 71945 || (c < 72192
+              ? (c < 72001
+                ? (c < 71960
                   ? (c < 71957
                     ? (c >= 71948 && c <= 71955)
                     : c <= 71958)
-                  : (c <= 71983 || c == 71999))))))
-            : (c <= 72001 || (c < 72349
-              ? (c < 72192
-                ? (c < 72161
+                  : (c <= 71983 || c == 71999))
+                : (c <= 72001 || (c < 72161
                   ? (c < 72106
                     ? (c >= 72096 && c <= 72103)
                     : c <= 72144)
-                  : (c <= 72161 || c == 72163))
-                : (c <= 72192 || (c < 72272
+                  : (c <= 72161 || c == 72163))))
+              : (c <= 72192 || (c < 72349
+                ? (c < 72272
                   ? (c < 72250
                     ? (c >= 72203 && c <= 72242)
                     : c <= 72250)
-                  : (c <= 72272 || (c >= 72284 && c <= 72329)))))
-              : (c <= 72349 || (c < 72818
-                ? (c < 72714
+                  : (c <= 72272 || (c >= 72284 && c <= 72329)))
+                : (c <= 72349 || (c < 72714
                   ? (c < 72704
-                    ? (c >= 72368 && c <= 72440)
+                    ? (c >= 72384 && c <= 72440)
                     : c <= 72712)
-                  : (c <= 72750 || c == 72768))
-                : (c <= 72847 || (c < 72971
+                  : (c <= 72750 || c == 72768))))))))
+          : (c <= 72847 || (c < 92992
+            ? (c < 73648
+              ? (c < 73056
+                ? (c < 72971
                   ? (c < 72968
                     ? (c >= 72960 && c <= 72966)
                     : c <= 72969)
-                  : (c <= 73008 || c == 73030))))))))
-          : (c <= 73061 || (c < 93952
-            ? (c < 82944
-              ? (c < 73728
-                ? (c < 73112
+                  : (c <= 73008 || c == 73030))
+                : (c <= 73061 || (c < 73112
                   ? (c < 73066
                     ? (c >= 73063 && c <= 73064)
                     : c <= 73097)
-                  : (c <= 73112 || (c < 73648
-                    ? (c >= 73440 && c <= 73458)
-                    : c <= 73648)))
-                : (c <= 74649 || (c < 77712
-                  ? (c < 74880
-                    ? (c >= 74752 && c <= 74862)
-                    : c <= 75075)
-                  : (c <= 77808 || (c >= 77824 && c <= 78894)))))
-              : (c <= 83526 || (c < 92928
-                ? (c < 92784
+                  : (c <= 73112 || (c >= 73440 && c <= 73458)))))
+              : (c <= 73648 || (c < 82944
+                ? (c < 74880
+                  ? (c < 74752
+                    ? (c >= 73728 && c <= 74649)
+                    : c <= 74862)
+                  : (c <= 75075 || (c >= 77824 && c <= 78894)))
+                : (c <= 83526 || (c < 92880
                   ? (c < 92736
                     ? (c >= 92160 && c <= 92728)
                     : c <= 92766)
-                  : (c <= 92862 || (c >= 92880 && c <= 92909)))
-                : (c <= 92975 || (c < 93053
-                  ? (c < 93027
-                    ? (c >= 92992 && c <= 92995)
-                    : c <= 93047)
-                  : (c <= 93071 || (c >= 93760 && c <= 93823)))))))
-            : (c <= 94026 || (c < 110589
-              ? (c < 94208
-                ? (c < 94176
-                  ? (c < 94099
-                    ? c == 94032
-                    : c <= 94111)
-                  : (c <= 94177 || c == 94179))
-                : (c <= 100343 || (c < 110576
-                  ? (c < 101632
-                    ? (c >= 100352 && c <= 101589)
-                    : c <= 101640)
-                  : (c <= 110579 || (c >= 110581 && c <= 110587)))))
-              : (c <= 110590 || (c < 113664
-                ? (c < 110948
-                  ? (c < 110928
-                    ? (c >= 110592 && c <= 110882)
-                    : c <= 110930)
-                  : (c <= 110951 || (c >= 110960 && c <= 111355)))
-                : (c <= 113770 || (c < 113808
-                  ? (c < 113792
-                    ? (c >= 113776 && c <= 113788)
-                    : c <= 113800)
-                  : (c <= 113817 || (c >= 119808 && c <= 119892)))))))))))
-        : (c <= 119964 || (c < 125259
-          ? (c < 120572
-            ? (c < 120086
-              ? (c < 119995
-                ? (c < 119973
-                  ? (c < 119970
-                    ? (c >= 119966 && c <= 119967)
-                    : c <= 119970)
-                  : (c <= 119974 || (c < 119982
+                  : (c <= 92909 || (c >= 92928 && c <= 92975)))))))
+            : (c <= 92995 || (c < 100352
+              ? (c < 94032
+                ? (c < 93760
+                  ? (c < 93053
+                    ? (c >= 93027 && c <= 93047)
+                    : c <= 93071)
+                  : (c <= 93823 || (c >= 93952 && c <= 94026)))
+                : (c <= 94032 || (c < 94179
+                  ? (c < 94176
+                    ? (c >= 94099 && c <= 94111)
+                    : c <= 94177)
+                  : (c <= 94179 || (c >= 94208 && c <= 100343)))))
+              : (c <= 101589 || (c < 110960
+                ? (c < 110928
+                  ? (c < 110592
+                    ? (c >= 101632 && c <= 101640)
+                    : c <= 110878)
+                  : (c <= 110930 || (c >= 110948 && c <= 110951)))
+                : (c <= 111355 || (c < 113776
+                  ? (c >= 113664 && c <= 113770)
+                  : (c <= 113788 || (c >= 113792 && c <= 113800)))))))))))
+        : (c <= 113817 || (c < 126469
+          ? (c < 120488
+            ? (c < 120005
+              ? (c < 119973
+                ? (c < 119966
+                  ? (c < 119894
+                    ? (c >= 119808 && c <= 119892)
+                    : c <= 119964)
+                  : (c <= 119967 || c == 119970))
+                : (c <= 119974 || (c < 119995
+                  ? (c < 119982
                     ? (c >= 119977 && c <= 119980)
-                    : c <= 119993)))
-                : (c <= 119995 || (c < 120071
-                  ? (c < 120005
-                    ? (c >= 119997 && c <= 120003)
-                    : c <= 120069)
-                  : (c <= 120074 || (c >= 120077 && c <= 120084)))))
-              : (c <= 120092 || (c < 120138
-                ? (c < 120128
-                  ? (c < 120123
-                    ? (c >= 120094 && c <= 120121)
-                    : c <= 120126)
-                  : (c <= 120132 || c == 120134))
-                : (c <= 120144 || (c < 120514
-                  ? (c < 120488
-                    ? (c >= 120146 && c <= 120485)
-                    : c <= 120512)
-                  : (c <= 120538 || (c >= 120540 && c <= 120570)))))))
-            : (c <= 120596 || (c < 123191
-              ? (c < 120714
-                ? (c < 120656
-                  ? (c < 120630
-                    ? (c >= 120598 && c <= 120628)
-                    : c <= 120654)
-                  : (c <= 120686 || (c >= 120688 && c <= 120712)))
-                : (c <= 120744 || (c < 122624
-                  ? (c < 120772
-                    ? (c >= 120746 && c <= 120770)
-                    : c <= 120779)
-                  : (c <= 122654 || (c >= 123136 && c <= 123180)))))
-              : (c <= 123197 || (c < 124904
-                ? (c < 123584
-                  ? (c < 123536
-                    ? c == 123214
-                    : c <= 123565)
-                  : (c <= 123627 || (c >= 124896 && c <= 124902)))
-                : (c <= 124907 || (c < 124928
-                  ? (c < 124912
-                    ? (c >= 124909 && c <= 124910)
-                    : c <= 124926)
-                  : (c <= 125124 || (c >= 125184 && c <= 125251)))))))))
-          : (c <= 125259 || (c < 126559
-            ? (c < 126535
-              ? (c < 126505
-                ? (c < 126497
-                  ? (c < 126469
-                    ? (c >= 126464 && c <= 126467)
-                    : c <= 126495)
-                  : (c <= 126498 || (c < 126503
-                    ? c == 126500
-                    : c <= 126503)))
-                : (c <= 126514 || (c < 126523
-                  ? (c < 126521
-                    ? (c >= 126516 && c <= 126519)
-                    : c <= 126521)
-                  : (c <= 126523 || c == 126530))))
-              : (c <= 126535 || (c < 126548
-                ? (c < 126541
-                  ? (c < 126539
-                    ? c == 126537
-                    : c <= 126539)
-                  : (c <= 126543 || (c >= 126545 && c <= 126546)))
-                : (c <= 126548 || (c < 126555
-                  ? (c < 126553
-                    ? c == 126551
-                    : c <= 126553)
-                  : (c <= 126555 || c == 126557))))))
-            : (c <= 126559 || (c < 126625
-              ? (c < 126580
-                ? (c < 126567
-                  ? (c < 126564
-                    ? (c >= 126561 && c <= 126562)
-                    : c <= 126564)
-                  : (c <= 126570 || (c >= 126572 && c <= 126578)))
-                : (c <= 126583 || (c < 126592
-                  ? (c < 126590
-                    ? (c >= 126585 && c <= 126588)
-                    : c <= 126590)
-                  : (c <= 126601 || (c >= 126603 && c <= 126619)))))
-              : (c <= 126627 || (c < 177984
-                ? (c < 131072
-                  ? (c < 126635
-                    ? (c >= 126629 && c <= 126633)
-                    : c <= 126651)
-                  : (c <= 173791 || (c >= 173824 && c <= 177976)))
-                : (c <= 178205 || (c < 194560
-                  ? (c < 183984
-                    ? (c >= 178208 && c <= 183969)
-                    : c <= 191456)
+                    : c <= 119993)
+                  : (c <= 119995 || (c >= 119997 && c <= 120003)))))
+              : (c <= 120069 || (c < 120123
+                ? (c < 120086
+                  ? (c < 120077
+                    ? (c >= 120071 && c <= 120074)
+                    : c <= 120084)
+                  : (c <= 120092 || (c >= 120094 && c <= 120121)))
+                : (c <= 120126 || (c < 120138
+                  ? (c < 120134
+                    ? (c >= 120128 && c <= 120132)
+                    : c <= 120134)
+                  : (c <= 120144 || (c >= 120146 && c <= 120485)))))))
+            : (c <= 120512 || (c < 120772
+              ? (c < 120630
+                ? (c < 120572
+                  ? (c < 120540
+                    ? (c >= 120514 && c <= 120538)
+                    : c <= 120570)
+                  : (c <= 120596 || (c >= 120598 && c <= 120628)))
+                : (c <= 120654 || (c < 120714
+                  ? (c < 120688
+                    ? (c >= 120656 && c <= 120686)
+                    : c <= 120712)
+                  : (c <= 120744 || (c >= 120746 && c <= 120770)))))
+              : (c <= 120779 || (c < 124928
+                ? (c < 123214
+                  ? (c < 123191
+                    ? (c >= 123136 && c <= 123180)
+                    : c <= 123197)
+                  : (c <= 123214 || (c >= 123584 && c <= 123627)))
+                : (c <= 125124 || (c < 125259
+                  ? (c >= 125184 && c <= 125251)
+                  : (c <= 125259 || (c >= 126464 && c <= 126467)))))))))
+          : (c <= 126495 || (c < 126561
+            ? (c < 126537
+              ? (c < 126516
+                ? (c < 126503
+                  ? (c < 126500
+                    ? (c >= 126497 && c <= 126498)
+                    : c <= 126500)
+                  : (c <= 126503 || (c >= 126505 && c <= 126514)))
+                : (c <= 126519 || (c < 126530
+                  ? (c < 126523
+                    ? c == 126521
+                    : c <= 126523)
+                  : (c <= 126530 || c == 126535))))
+              : (c <= 126537 || (c < 126551
+                ? (c < 126545
+                  ? (c < 126541
+                    ? c == 126539
+                    : c <= 126543)
+                  : (c <= 126546 || c == 126548))
+                : (c <= 126551 || (c < 126557
+                  ? (c < 126555
+                    ? c == 126553
+                    : c <= 126555)
+                  : (c <= 126557 || c == 126559))))))
+            : (c <= 126562 || (c < 126629
+              ? (c < 126585
+                ? (c < 126572
+                  ? (c < 126567
+                    ? c == 126564
+                    : c <= 126570)
+                  : (c <= 126578 || (c >= 126580 && c <= 126583)))
+                : (c <= 126588 || (c < 126603
+                  ? (c < 126592
+                    ? c == 126590
+                    : c <= 126601)
+                  : (c <= 126619 || (c >= 126625 && c <= 126627)))))
+              : (c <= 126633 || (c < 178208
+                ? (c < 173824
+                  ? (c < 131072
+                    ? (c >= 126635 && c <= 126651)
+                    : c <= 173789)
+                  : (c <= 177972 || (c >= 177984 && c <= 178205)))
+                : (c <= 183969 || (c < 194560
+                  ? (c >= 183984 && c <= 191456)
                   : (c <= 195101 || (c >= 196608 && c <= 201546)))))))))))))))));
 }
 
-static inline bool sym_identifier_character_set_3(int32_t c) {
-  return (c < 43616
-    ? (c < 3782
-      ? (c < 2748
-        ? (c < 2045
+static inline bool sym_identifier_character_set_2(int32_t c) {
+  return (c < 43052
+    ? (c < 3718
+      ? (c < 2730
+        ? (c < 2042
           ? (c < 1015
             ? (c < 710
               ? (c < 181
@@ -6143,344 +3803,338 @@ static inline bool sym_identifier_character_set_3(int32_t c) {
                   ? (c < 1808
                     ? c == 1791
                     : c <= 1866)
-                  : (c <= 1969 || (c < 2042
-                    ? (c >= 1984 && c <= 2037)
-                    : c <= 2042)))))))))
-          : (c <= 2045 || (c < 2558
-            ? (c < 2451
-              ? (c < 2200
-                ? (c < 2144
-                  ? (c < 2112
-                    ? (c >= 2048 && c <= 2093)
-                    : c <= 2139)
-                  : (c <= 2154 || (c < 2185
-                    ? (c >= 2160 && c <= 2183)
-                    : c <= 2190)))
-                : (c <= 2273 || (c < 2417
-                  ? (c < 2406
-                    ? (c >= 2275 && c <= 2403)
-                    : c <= 2415)
-                  : (c <= 2435 || (c < 2447
-                    ? (c >= 2437 && c <= 2444)
-                    : c <= 2448)))))
-              : (c <= 2472 || (c < 2507
-                ? (c < 2486
-                  ? (c < 2482
-                    ? (c >= 2474 && c <= 2480)
-                    : c <= 2482)
-                  : (c <= 2489 || (c < 2503
-                    ? (c >= 2492 && c <= 2500)
-                    : c <= 2504)))
-                : (c <= 2510 || (c < 2527
-                  ? (c < 2524
-                    ? c == 2519
-                    : c <= 2525)
-                  : (c <= 2531 || (c < 2556
-                    ? (c >= 2534 && c <= 2545)
-                    : c <= 2556)))))))
-            : (c <= 2558 || (c < 2635
-              ? (c < 2610
-                ? (c < 2575
-                  ? (c < 2565
-                    ? (c >= 2561 && c <= 2563)
-                    : c <= 2570)
-                  : (c <= 2576 || (c < 2602
-                    ? (c >= 2579 && c <= 2600)
-                    : c <= 2608)))
-                : (c <= 2611 || (c < 2620
-                  ? (c < 2616
-                    ? (c >= 2613 && c <= 2614)
-                    : c <= 2617)
-                  : (c <= 2620 || (c < 2631
-                    ? (c >= 2622 && c <= 2626)
-                    : c <= 2632)))))
-              : (c <= 2637 || (c < 2693
-                ? (c < 2654
-                  ? (c < 2649
-                    ? c == 2641
-                    : c <= 2652)
-                  : (c <= 2654 || (c < 2689
-                    ? (c >= 2662 && c <= 2677)
-                    : c <= 2691)))
-                : (c <= 2701 || (c < 2730
-                  ? (c < 2707
-                    ? (c >= 2703 && c <= 2705)
-                    : c <= 2728)
-                  : (c <= 2736 || (c < 2741
+                  : (c <= 1969 || (c >= 1984 && c <= 2037)))))))))
+          : (c <= 2042 || (c < 2534
+            ? (c < 2447
+              ? (c < 2230
+                ? (c < 2112
+                  ? (c < 2048
+                    ? c == 2045
+                    : c <= 2093)
+                  : (c <= 2139 || (c < 2208
+                    ? (c >= 2144 && c <= 2154)
+                    : c <= 2228)))
+                : (c <= 2247 || (c < 2406
+                  ? (c < 2275
+                    ? (c >= 2259 && c <= 2273)
+                    : c <= 2403)
+                  : (c <= 2415 || (c < 2437
+                    ? (c >= 2417 && c <= 2435)
+                    : c <= 2444)))))
+              : (c <= 2448 || (c < 2503
+                ? (c < 2482
+                  ? (c < 2474
+                    ? (c >= 2451 && c <= 2472)
+                    : c <= 2480)
+                  : (c <= 2482 || (c < 2492
+                    ? (c >= 2486 && c <= 2489)
+                    : c <= 2500)))
+                : (c <= 2504 || (c < 2524
+                  ? (c < 2519
+                    ? (c >= 2507 && c <= 2510)
+                    : c <= 2519)
+                  : (c <= 2525 || (c >= 2527 && c <= 2531)))))))
+            : (c <= 2545 || (c < 2622
+              ? (c < 2579
+                ? (c < 2561
+                  ? (c < 2558
+                    ? c == 2556
+                    : c <= 2558)
+                  : (c <= 2563 || (c < 2575
+                    ? (c >= 2565 && c <= 2570)
+                    : c <= 2576)))
+                : (c <= 2600 || (c < 2613
+                  ? (c < 2610
+                    ? (c >= 2602 && c <= 2608)
+                    : c <= 2611)
+                  : (c <= 2614 || (c < 2620
+                    ? (c >= 2616 && c <= 2617)
+                    : c <= 2620)))))
+              : (c <= 2626 || (c < 2662
+                ? (c < 2641
+                  ? (c < 2635
+                    ? (c >= 2631 && c <= 2632)
+                    : c <= 2637)
+                  : (c <= 2641 || (c < 2654
+                    ? (c >= 2649 && c <= 2652)
+                    : c <= 2654)))
+                : (c <= 2677 || (c < 2703
+                  ? (c < 2693
+                    ? (c >= 2689 && c <= 2691)
+                    : c <= 2701)
+                  : (c <= 2705 || (c >= 2707 && c <= 2728)))))))))))
+        : (c <= 2736 || (c < 3142
+          ? (c < 2918
+            ? (c < 2831
+              ? (c < 2768
+                ? (c < 2748
+                  ? (c < 2741
                     ? (c >= 2738 && c <= 2739)
-                    : c <= 2745)))))))))))
-        : (c <= 2757 || (c < 3168
-          ? (c < 2958
-            ? (c < 2866
-              ? (c < 2809
-                ? (c < 2768
-                  ? (c < 2763
+                    : c <= 2745)
+                  : (c <= 2757 || (c < 2763
                     ? (c >= 2759 && c <= 2761)
-                    : c <= 2765)
-                  : (c <= 2768 || (c < 2790
+                    : c <= 2765)))
+                : (c <= 2768 || (c < 2809
+                  ? (c < 2790
                     ? (c >= 2784 && c <= 2787)
-                    : c <= 2799)))
-                : (c <= 2815 || (c < 2831
-                  ? (c < 2821
+                    : c <= 2799)
+                  : (c <= 2815 || (c < 2821
                     ? (c >= 2817 && c <= 2819)
-                    : c <= 2828)
-                  : (c <= 2832 || (c < 2858
+                    : c <= 2828)))))
+              : (c <= 2832 || (c < 2887
+                ? (c < 2866
+                  ? (c < 2858
                     ? (c >= 2835 && c <= 2856)
-                    : c <= 2864)))))
-              : (c <= 2867 || (c < 2908
-                ? (c < 2887
-                  ? (c < 2876
+                    : c <= 2864)
+                  : (c <= 2867 || (c < 2876
                     ? (c >= 2869 && c <= 2873)
-                    : c <= 2884)
-                  : (c <= 2888 || (c < 2901
+                    : c <= 2884)))
+                : (c <= 2888 || (c < 2908
+                  ? (c < 2901
                     ? (c >= 2891 && c <= 2893)
-                    : c <= 2903)))
-                : (c <= 2909 || (c < 2929
-                  ? (c < 2918
-                    ? (c >= 2911 && c <= 2915)
-                    : c <= 2927)
-                  : (c <= 2929 || (c < 2949
-                    ? (c >= 2946 && c <= 2947)
-                    : c <= 2954)))))))
-            : (c <= 2960 || (c < 3031
-              ? (c < 2984
-                ? (c < 2972
-                  ? (c < 2969
-                    ? (c >= 2962 && c <= 2965)
-                    : c <= 2970)
-                  : (c <= 2972 || (c < 2979
-                    ? (c >= 2974 && c <= 2975)
-                    : c <= 2980)))
-                : (c <= 2986 || (c < 3014
-                  ? (c < 3006
-                    ? (c >= 2990 && c <= 3001)
-                    : c <= 3010)
-                  : (c <= 3016 || (c < 3024
-                    ? (c >= 3018 && c <= 3021)
-                    : c <= 3024)))))
-              : (c <= 3031 || (c < 3132
-                ? (c < 3086
-                  ? (c < 3072
-                    ? (c >= 3046 && c <= 3055)
-                    : c <= 3084)
-                  : (c <= 3088 || (c < 3114
-                    ? (c >= 3090 && c <= 3112)
-                    : c <= 3129)))
-                : (c <= 3140 || (c < 3157
-                  ? (c < 3146
-                    ? (c >= 3142 && c <= 3144)
-                    : c <= 3149)
-                  : (c <= 3158 || (c < 3165
-                    ? (c >= 3160 && c <= 3162)
-                    : c <= 3165)))))))))
-          : (c <= 3171 || (c < 3450
-            ? (c < 3293
-              ? (c < 3242
-                ? (c < 3205
-                  ? (c < 3200
-                    ? (c >= 3174 && c <= 3183)
-                    : c <= 3203)
-                  : (c <= 3212 || (c < 3218
-                    ? (c >= 3214 && c <= 3216)
-                    : c <= 3240)))
-                : (c <= 3251 || (c < 3270
-                  ? (c < 3260
-                    ? (c >= 3253 && c <= 3257)
-                    : c <= 3268)
-                  : (c <= 3272 || (c < 3285
-                    ? (c >= 3274 && c <= 3277)
-                    : c <= 3286)))))
-              : (c <= 3294 || (c < 3346
-                ? (c < 3313
-                  ? (c < 3302
-                    ? (c >= 3296 && c <= 3299)
-                    : c <= 3311)
-                  : (c <= 3314 || (c < 3342
-                    ? (c >= 3328 && c <= 3340)
-                    : c <= 3344)))
-                : (c <= 3396 || (c < 3412
-                  ? (c < 3402
-                    ? (c >= 3398 && c <= 3400)
-                    : c <= 3406)
-                  : (c <= 3415 || (c < 3430
-                    ? (c >= 3423 && c <= 3427)
-                    : c <= 3439)))))))
-            : (c <= 3455 || (c < 3570
-              ? (c < 3520
-                ? (c < 3482
-                  ? (c < 3461
-                    ? (c >= 3457 && c <= 3459)
-                    : c <= 3478)
-                  : (c <= 3505 || (c < 3517
-                    ? (c >= 3507 && c <= 3515)
-                    : c <= 3517)))
-                : (c <= 3526 || (c < 3542
-                  ? (c < 3535
-                    ? c == 3530
-                    : c <= 3540)
-                  : (c <= 3542 || (c < 3558
-                    ? (c >= 3544 && c <= 3551)
-                    : c <= 3567)))))
-              : (c <= 3571 || (c < 3718
-                ? (c < 3664
-                  ? (c < 3648
-                    ? (c >= 3585 && c <= 3642)
-                    : c <= 3662)
-                  : (c <= 3673 || (c < 3716
-                    ? (c >= 3713 && c <= 3714)
-                    : c <= 3716)))
-                : (c <= 3722 || (c < 3751
+                    : c <= 2903)
+                  : (c <= 2909 || (c >= 2911 && c <= 2915)))))))
+            : (c <= 2927 || (c < 3006
+              ? (c < 2969
+                ? (c < 2949
+                  ? (c < 2946
+                    ? c == 2929
+                    : c <= 2947)
+                  : (c <= 2954 || (c < 2962
+                    ? (c >= 2958 && c <= 2960)
+                    : c <= 2965)))
+                : (c <= 2970 || (c < 2979
+                  ? (c < 2974
+                    ? c == 2972
+                    : c <= 2975)
+                  : (c <= 2980 || (c < 2990
+                    ? (c >= 2984 && c <= 2986)
+                    : c <= 3001)))))
+              : (c <= 3010 || (c < 3072
+                ? (c < 3024
+                  ? (c < 3018
+                    ? (c >= 3014 && c <= 3016)
+                    : c <= 3021)
+                  : (c <= 3024 || (c < 3046
+                    ? c == 3031
+                    : c <= 3055)))
+                : (c <= 3084 || (c < 3114
+                  ? (c < 3090
+                    ? (c >= 3086 && c <= 3088)
+                    : c <= 3112)
+                  : (c <= 3129 || (c >= 3133 && c <= 3140)))))))))
+          : (c <= 3144 || (c < 3398
+            ? (c < 3260
+              ? (c < 3200
+                ? (c < 3160
+                  ? (c < 3157
+                    ? (c >= 3146 && c <= 3149)
+                    : c <= 3158)
+                  : (c <= 3162 || (c < 3174
+                    ? (c >= 3168 && c <= 3171)
+                    : c <= 3183)))
+                : (c <= 3203 || (c < 3218
+                  ? (c < 3214
+                    ? (c >= 3205 && c <= 3212)
+                    : c <= 3216)
+                  : (c <= 3240 || (c < 3253
+                    ? (c >= 3242 && c <= 3251)
+                    : c <= 3257)))))
+              : (c <= 3268 || (c < 3302
+                ? (c < 3285
+                  ? (c < 3274
+                    ? (c >= 3270 && c <= 3272)
+                    : c <= 3277)
+                  : (c <= 3286 || (c < 3296
+                    ? c == 3294
+                    : c <= 3299)))
+                : (c <= 3311 || (c < 3342
+                  ? (c < 3328
+                    ? (c >= 3313 && c <= 3314)
+                    : c <= 3340)
+                  : (c <= 3344 || (c >= 3346 && c <= 3396)))))))
+            : (c <= 3400 || (c < 3530
+              ? (c < 3457
+                ? (c < 3423
+                  ? (c < 3412
+                    ? (c >= 3402 && c <= 3406)
+                    : c <= 3415)
+                  : (c <= 3427 || (c < 3450
+                    ? (c >= 3430 && c <= 3439)
+                    : c <= 3455)))
+                : (c <= 3459 || (c < 3507
+                  ? (c < 3482
+                    ? (c >= 3461 && c <= 3478)
+                    : c <= 3505)
+                  : (c <= 3515 || (c < 3520
+                    ? c == 3517
+                    : c <= 3526)))))
+              : (c <= 3530 || (c < 3585
+                ? (c < 3544
+                  ? (c < 3542
+                    ? (c >= 3535 && c <= 3540)
+                    : c <= 3542)
+                  : (c <= 3551 || (c < 3570
+                    ? (c >= 3558 && c <= 3567)
+                    : c <= 3571)))
+                : (c <= 3642 || (c < 3713
+                  ? (c < 3664
+                    ? (c >= 3648 && c <= 3662)
+                    : c <= 3673)
+                  : (c <= 3714 || c == 3716))))))))))))
+      : (c <= 3722 || (c < 7296
+        ? (c < 5024
+          ? (c < 4256
+            ? (c < 3893
+              ? (c < 3784
+                ? (c < 3751
                   ? (c < 3749
                     ? (c >= 3724 && c <= 3747)
                     : c <= 3749)
-                  : (c <= 3773 || (c >= 3776 && c <= 3780)))))))))))))
-      : (c <= 3782 || (c < 8025
-        ? (c < 5888
-          ? (c < 4688
-            ? (c < 3953
-              ? (c < 3872
-                ? (c < 3804
-                  ? (c < 3792
-                    ? (c >= 3784 && c <= 3789)
-                    : c <= 3801)
-                  : (c <= 3807 || (c < 3864
-                    ? c == 3840
-                    : c <= 3865)))
-                : (c <= 3881 || (c < 3897
-                  ? (c < 3895
-                    ? c == 3893
-                    : c <= 3895)
-                  : (c <= 3897 || (c < 3913
-                    ? (c >= 3902 && c <= 3911)
-                    : c <= 3948)))))
-              : (c <= 3972 || (c < 4256
-                ? (c < 4038
-                  ? (c < 3993
-                    ? (c >= 3974 && c <= 3991)
-                    : c <= 4028)
-                  : (c <= 4038 || (c < 4176
-                    ? (c >= 4096 && c <= 4169)
-                    : c <= 4253)))
-                : (c <= 4293 || (c < 4304
+                  : (c <= 3773 || (c < 3782
+                    ? (c >= 3776 && c <= 3780)
+                    : c <= 3782)))
+                : (c <= 3789 || (c < 3840
+                  ? (c < 3804
+                    ? (c >= 3792 && c <= 3801)
+                    : c <= 3807)
+                  : (c <= 3840 || (c < 3872
+                    ? (c >= 3864 && c <= 3865)
+                    : c <= 3881)))))
+              : (c <= 3893 || (c < 3974
+                ? (c < 3902
+                  ? (c < 3897
+                    ? c == 3895
+                    : c <= 3897)
+                  : (c <= 3911 || (c < 3953
+                    ? (c >= 3913 && c <= 3948)
+                    : c <= 3972)))
+                : (c <= 3991 || (c < 4096
+                  ? (c < 4038
+                    ? (c >= 3993 && c <= 4028)
+                    : c <= 4038)
+                  : (c <= 4169 || (c >= 4176 && c <= 4253)))))))
+            : (c <= 4293 || (c < 4786
+              ? (c < 4688
+                ? (c < 4304
                   ? (c < 4301
                     ? c == 4295
                     : c <= 4301)
                   : (c <= 4346 || (c < 4682
                     ? (c >= 4348 && c <= 4680)
-                    : c <= 4685)))))))
-            : (c <= 4694 || (c < 4882
-              ? (c < 4786
-                ? (c < 4704
+                    : c <= 4685)))
+                : (c <= 4694 || (c < 4704
                   ? (c < 4698
                     ? c == 4696
                     : c <= 4701)
                   : (c <= 4744 || (c < 4752
                     ? (c >= 4746 && c <= 4749)
-                    : c <= 4784)))
-                : (c <= 4789 || (c < 4802
+                    : c <= 4784)))))
+              : (c <= 4789 || (c < 4882
+                ? (c < 4802
                   ? (c < 4800
                     ? (c >= 4792 && c <= 4798)
                     : c <= 4800)
                   : (c <= 4805 || (c < 4824
                     ? (c >= 4808 && c <= 4822)
-                    : c <= 4880)))))
-              : (c <= 4885 || (c < 5112
-                ? (c < 4969
+                    : c <= 4880)))
+                : (c <= 4885 || (c < 4969
                   ? (c < 4957
                     ? (c >= 4888 && c <= 4954)
                     : c <= 4959)
-                  : (c <= 4977 || (c < 5024
-                    ? (c >= 4992 && c <= 5007)
-                    : c <= 5109)))
-                : (c <= 5117 || (c < 5761
-                  ? (c < 5743
-                    ? (c >= 5121 && c <= 5740)
-                    : c <= 5759)
-                  : (c <= 5786 || (c < 5870
-                    ? (c >= 5792 && c <= 5866)
-                    : c <= 5880)))))))))
-          : (c <= 5909 || (c < 6688
-            ? (c < 6176
-              ? (c < 6016
-                ? (c < 5984
-                  ? (c < 5952
-                    ? (c >= 5919 && c <= 5940)
-                    : c <= 5971)
-                  : (c <= 5996 || (c < 6002
-                    ? (c >= 5998 && c <= 6000)
-                    : c <= 6003)))
-                : (c <= 6099 || (c < 6112
-                  ? (c < 6108
-                    ? c == 6103
-                    : c <= 6109)
-                  : (c <= 6121 || (c < 6159
-                    ? (c >= 6155 && c <= 6157)
-                    : c <= 6169)))))
-              : (c <= 6264 || (c < 6470
-                ? (c < 6400
-                  ? (c < 6320
-                    ? (c >= 6272 && c <= 6314)
-                    : c <= 6389)
-                  : (c <= 6430 || (c < 6448
+                  : (c <= 4977 || (c >= 4992 && c <= 5007)))))))))
+          : (c <= 5109 || (c < 6400
+            ? (c < 5998
+              ? (c < 5870
+                ? (c < 5743
+                  ? (c < 5121
+                    ? (c >= 5112 && c <= 5117)
+                    : c <= 5740)
+                  : (c <= 5759 || (c < 5792
+                    ? (c >= 5761 && c <= 5786)
+                    : c <= 5866)))
+                : (c <= 5880 || (c < 5920
+                  ? (c < 5902
+                    ? (c >= 5888 && c <= 5900)
+                    : c <= 5908)
+                  : (c <= 5940 || (c < 5984
+                    ? (c >= 5952 && c <= 5971)
+                    : c <= 5996)))))
+              : (c <= 6000 || (c < 6155
+                ? (c < 6103
+                  ? (c < 6016
+                    ? (c >= 6002 && c <= 6003)
+                    : c <= 6099)
+                  : (c <= 6103 || (c < 6112
+                    ? (c >= 6108 && c <= 6109)
+                    : c <= 6121)))
+                : (c <= 6157 || (c < 6272
+                  ? (c < 6176
+                    ? (c >= 6160 && c <= 6169)
+                    : c <= 6264)
+                  : (c <= 6314 || (c >= 6320 && c <= 6389)))))))
+            : (c <= 6430 || (c < 6800
+              ? (c < 6576
+                ? (c < 6470
+                  ? (c < 6448
                     ? (c >= 6432 && c <= 6443)
-                    : c <= 6459)))
-                : (c <= 6509 || (c < 6576
-                  ? (c < 6528
+                    : c <= 6459)
+                  : (c <= 6509 || (c < 6528
                     ? (c >= 6512 && c <= 6516)
-                    : c <= 6571)
-                  : (c <= 6601 || (c < 6656
+                    : c <= 6571)))
+                : (c <= 6601 || (c < 6688
+                  ? (c < 6656
                     ? (c >= 6608 && c <= 6618)
-                    : c <= 6683)))))))
-            : (c <= 6750 || (c < 7232
-              ? (c < 6847
-                ? (c < 6800
-                  ? (c < 6783
+                    : c <= 6683)
+                  : (c <= 6750 || (c < 6783
                     ? (c >= 6752 && c <= 6780)
-                    : c <= 6793)
-                  : (c <= 6809 || (c < 6832
+                    : c <= 6793)))))
+              : (c <= 6809 || (c < 7019
+                ? (c < 6847
+                  ? (c < 6832
                     ? c == 6823
-                    : c <= 6845)))
-                : (c <= 6862 || (c < 7019
-                  ? (c < 6992
-                    ? (c >= 6912 && c <= 6988)
-                    : c <= 7001)
-                  : (c <= 7027 || (c < 7168
+                    : c <= 6845)
+                  : (c <= 6848 || (c < 6992
+                    ? (c >= 6912 && c <= 6987)
+                    : c <= 7001)))
+                : (c <= 7027 || (c < 7232
+                  ? (c < 7168
                     ? (c >= 7040 && c <= 7155)
-                    : c <= 7223)))))
-              : (c <= 7241 || (c < 7380
-                ? (c < 7312
-                  ? (c < 7296
-                    ? (c >= 7245 && c <= 7293)
-                    : c <= 7304)
-                  : (c <= 7354 || (c < 7376
-                    ? (c >= 7357 && c <= 7359)
-                    : c <= 7378)))
-                : (c <= 7418 || (c < 7968
-                  ? (c < 7960
-                    ? (c >= 7424 && c <= 7957)
-                    : c <= 7965)
-                  : (c <= 8005 || (c < 8016
-                    ? (c >= 8008 && c <= 8013)
-                    : c <= 8023)))))))))))
-        : (c <= 8025 || (c < 11720
-          ? (c < 8458
-            ? (c < 8178
-              ? (c < 8126
-                ? (c < 8031
-                  ? (c < 8029
-                    ? c == 8027
-                    : c <= 8029)
-                  : (c <= 8061 || (c < 8118
-                    ? (c >= 8064 && c <= 8116)
-                    : c <= 8124)))
-                : (c <= 8126 || (c < 8144
-                  ? (c < 8134
-                    ? (c >= 8130 && c <= 8132)
-                    : c <= 8140)
-                  : (c <= 8147 || (c < 8160
-                    ? (c >= 8150 && c <= 8155)
-                    : c <= 8172)))))
-              : (c <= 8180 || (c < 8336
+                    : c <= 7223)
+                  : (c <= 7241 || (c >= 7245 && c <= 7293)))))))))))
+        : (c <= 7304 || (c < 11264
+          ? (c < 8178
+            ? (c < 8027
+              ? (c < 7675
+                ? (c < 7376
+                  ? (c < 7357
+                    ? (c >= 7312 && c <= 7354)
+                    : c <= 7359)
+                  : (c <= 7378 || (c < 7424
+                    ? (c >= 7380 && c <= 7418)
+                    : c <= 7673)))
+                : (c <= 7957 || (c < 8008
+                  ? (c < 7968
+                    ? (c >= 7960 && c <= 7965)
+                    : c <= 8005)
+                  : (c <= 8013 || (c < 8025
+                    ? (c >= 8016 && c <= 8023)
+                    : c <= 8025)))))
+              : (c <= 8027 || (c < 8130
+                ? (c < 8064
+                  ? (c < 8031
+                    ? c == 8029
+                    : c <= 8061)
+                  : (c <= 8116 || (c < 8126
+                    ? (c >= 8118 && c <= 8124)
+                    : c <= 8126)))
+                : (c <= 8132 || (c < 8150
+                  ? (c < 8144
+                    ? (c >= 8134 && c <= 8140)
+                    : c <= 8147)
+                  : (c <= 8155 || (c >= 8160 && c <= 8172)))))))
+            : (c <= 8180 || (c < 8458
+              ? (c < 8336
                 ? (c < 8276
                   ? (c < 8255
                     ? (c >= 8182 && c <= 8188)
@@ -6494,9 +4148,8 @@ static inline bool sym_identifier_character_set_3(int32_t c) {
                     : c <= 8417)
                   : (c <= 8432 || (c < 8455
                     ? c == 8450
-                    : c <= 8455)))))))
-            : (c <= 8467 || (c < 11499
-              ? (c < 8490
+                    : c <= 8455)))))
+              : (c <= 8467 || (c < 8490
                 ? (c < 8484
                   ? (c < 8472
                     ? c == 8469
@@ -6508,563 +4161,518 @@ static inline bool sym_identifier_character_set_3(int32_t c) {
                   ? (c < 8517
                     ? (c >= 8508 && c <= 8511)
                     : c <= 8521)
-                  : (c <= 8526 || (c < 11264
-                    ? (c >= 8544 && c <= 8584)
-                    : c <= 11492)))))
-              : (c <= 11507 || (c < 11647
-                ? (c < 11565
-                  ? (c < 11559
+                  : (c <= 8526 || (c >= 8544 && c <= 8584)))))))))
+          : (c <= 11310 || (c < 12353
+            ? (c < 11696
+              ? (c < 11565
+                ? (c < 11499
+                  ? (c < 11360
+                    ? (c >= 11312 && c <= 11358)
+                    : c <= 11492)
+                  : (c <= 11507 || (c < 11559
                     ? (c >= 11520 && c <= 11557)
-                    : c <= 11559)
-                  : (c <= 11565 || (c < 11631
+                    : c <= 11559)))
+                : (c <= 11565 || (c < 11647
+                  ? (c < 11631
                     ? (c >= 11568 && c <= 11623)
-                    : c <= 11631)))
-                : (c <= 11670 || (c < 11696
-                  ? (c < 11688
+                    : c <= 11631)
+                  : (c <= 11670 || (c < 11688
                     ? (c >= 11680 && c <= 11686)
-                    : c <= 11694)
-                  : (c <= 11702 || (c < 11712
+                    : c <= 11694)))))
+              : (c <= 11702 || (c < 11744
+                ? (c < 11720
+                  ? (c < 11712
                     ? (c >= 11704 && c <= 11710)
-                    : c <= 11718)))))))))
-          : (c <= 11726 || (c < 42623
-            ? (c < 12540
-              ? (c < 12337
-                ? (c < 11744
-                  ? (c < 11736
+                    : c <= 11718)
+                  : (c <= 11726 || (c < 11736
                     ? (c >= 11728 && c <= 11734)
-                    : c <= 11742)
-                  : (c <= 11775 || (c < 12321
+                    : c <= 11742)))
+                : (c <= 11775 || (c < 12337
+                  ? (c < 12321
                     ? (c >= 12293 && c <= 12295)
-                    : c <= 12335)))
-                : (c <= 12341 || (c < 12441
-                  ? (c < 12353
-                    ? (c >= 12344 && c <= 12348)
-                    : c <= 12438)
-                  : (c <= 12442 || (c < 12449
-                    ? (c >= 12445 && c <= 12447)
-                    : c <= 12538)))))
-              : (c <= 12543 || (c < 19968
-                ? (c < 12704
-                  ? (c < 12593
-                    ? (c >= 12549 && c <= 12591)
-                    : c <= 12686)
-                  : (c <= 12735 || (c < 13312
-                    ? (c >= 12784 && c <= 12799)
-                    : c <= 19903)))
-                : (c <= 42124 || (c < 42512
-                  ? (c < 42240
-                    ? (c >= 42192 && c <= 42237)
-                    : c <= 42508)
-                  : (c <= 42539 || (c < 42612
-                    ? (c >= 42560 && c <= 42607)
-                    : c <= 42621)))))))
-            : (c <= 42737 || (c < 43232
-              ? (c < 42965
-                ? (c < 42891
-                  ? (c < 42786
-                    ? (c >= 42775 && c <= 42783)
-                    : c <= 42888)
-                  : (c <= 42954 || (c < 42963
-                    ? (c >= 42960 && c <= 42961)
-                    : c <= 42963)))
-                : (c <= 42969 || (c < 43072
-                  ? (c < 43052
-                    ? (c >= 42994 && c <= 43047)
-                    : c <= 43052)
-                  : (c <= 43123 || (c < 43216
-                    ? (c >= 43136 && c <= 43205)
-                    : c <= 43225)))))
-              : (c <= 43255 || (c < 43471
-                ? (c < 43312
-                  ? (c < 43261
-                    ? c == 43259
-                    : c <= 43309)
-                  : (c <= 43347 || (c < 43392
-                    ? (c >= 43360 && c <= 43388)
-                    : c <= 43456)))
-                : (c <= 43481 || (c < 43584
-                  ? (c < 43520
-                    ? (c >= 43488 && c <= 43518)
-                    : c <= 43574)
-                  : (c <= 43597 || (c >= 43600 && c <= 43609)))))))))))))))
-    : (c <= 43638 || (c < 71453
-      ? (c < 67639
-        ? (c < 65345
-          ? (c < 64312
-            ? (c < 43888
-              ? (c < 43785
-                ? (c < 43744
-                  ? (c < 43739
+                    : c <= 12335)
+                  : (c <= 12341 || (c >= 12344 && c <= 12348)))))))
+            : (c <= 12438 || (c < 42192
+              ? (c < 12593
+                ? (c < 12449
+                  ? (c < 12445
+                    ? (c >= 12441 && c <= 12442)
+                    : c <= 12447)
+                  : (c <= 12538 || (c < 12549
+                    ? (c >= 12540 && c <= 12543)
+                    : c <= 12591)))
+                : (c <= 12686 || (c < 13312
+                  ? (c < 12784
+                    ? (c >= 12704 && c <= 12735)
+                    : c <= 12799)
+                  : (c <= 19903 || (c < 40960
+                    ? (c >= 19968 && c <= 40956)
+                    : c <= 42124)))))
+              : (c <= 42237 || (c < 42775
+                ? (c < 42560
+                  ? (c < 42512
+                    ? (c >= 42240 && c <= 42508)
+                    : c <= 42539)
+                  : (c <= 42607 || (c < 42623
+                    ? (c >= 42612 && c <= 42621)
+                    : c <= 42737)))
+                : (c <= 42783 || (c < 42946
+                  ? (c < 42891
+                    ? (c >= 42786 && c <= 42888)
+                    : c <= 42943)
+                  : (c <= 42954 || (c >= 42997 && c <= 43047)))))))))))))))
+    : (c <= 43052 || (c < 71096
+      ? (c < 66864
+        ? (c < 64914
+          ? (c < 43816
+            ? (c < 43520
+              ? (c < 43261
+                ? (c < 43216
+                  ? (c < 43136
+                    ? (c >= 43072 && c <= 43123)
+                    : c <= 43205)
+                  : (c <= 43225 || (c < 43259
+                    ? (c >= 43232 && c <= 43255)
+                    : c <= 43259)))
+                : (c <= 43309 || (c < 43392
+                  ? (c < 43360
+                    ? (c >= 43312 && c <= 43347)
+                    : c <= 43388)
+                  : (c <= 43456 || (c < 43488
+                    ? (c >= 43471 && c <= 43481)
+                    : c <= 43518)))))
+              : (c <= 43574 || (c < 43744
+                ? (c < 43616
+                  ? (c < 43600
+                    ? (c >= 43584 && c <= 43597)
+                    : c <= 43609)
+                  : (c <= 43638 || (c < 43739
                     ? (c >= 43642 && c <= 43714)
-                    : c <= 43741)
-                  : (c <= 43759 || (c < 43777
+                    : c <= 43741)))
+                : (c <= 43759 || (c < 43785
+                  ? (c < 43777
                     ? (c >= 43762 && c <= 43766)
-                    : c <= 43782)))
-                : (c <= 43790 || (c < 43816
-                  ? (c < 43808
+                    : c <= 43782)
+                  : (c <= 43790 || (c < 43808
                     ? (c >= 43793 && c <= 43798)
-                    : c <= 43814)
-                  : (c <= 43822 || (c < 43868
+                    : c <= 43814)))))))
+            : (c <= 43822 || (c < 64275
+              ? (c < 44032
+                ? (c < 43888
+                  ? (c < 43868
                     ? (c >= 43824 && c <= 43866)
-                    : c <= 43881)))))
-              : (c <= 44010 || (c < 63744
-                ? (c < 44032
-                  ? (c < 44016
+                    : c <= 43881)
+                  : (c <= 44010 || (c < 44016
                     ? (c >= 44012 && c <= 44013)
-                    : c <= 44025)
-                  : (c <= 55203 || (c < 55243
+                    : c <= 44025)))
+                : (c <= 55203 || (c < 63744
+                  ? (c < 55243
                     ? (c >= 55216 && c <= 55238)
-                    : c <= 55291)))
-                : (c <= 64109 || (c < 64275
-                  ? (c < 64256
+                    : c <= 55291)
+                  : (c <= 64109 || (c < 64256
                     ? (c >= 64112 && c <= 64217)
-                    : c <= 64262)
-                  : (c <= 64279 || (c < 64298
+                    : c <= 64262)))))
+              : (c <= 64279 || (c < 64323
+                ? (c < 64312
+                  ? (c < 64298
                     ? (c >= 64285 && c <= 64296)
-                    : c <= 64310)))))))
-            : (c <= 64316 || (c < 65075
-              ? (c < 64612
-                ? (c < 64323
-                  ? (c < 64320
+                    : c <= 64310)
+                  : (c <= 64316 || (c < 64320
                     ? c == 64318
-                    : c <= 64321)
-                  : (c <= 64324 || (c < 64467
+                    : c <= 64321)))
+                : (c <= 64324 || (c < 64612
+                  ? (c < 64467
                     ? (c >= 64326 && c <= 64433)
-                    : c <= 64605)))
-                : (c <= 64829 || (c < 65008
-                  ? (c < 64914
-                    ? (c >= 64848 && c <= 64911)
-                    : c <= 64967)
-                  : (c <= 65017 || (c < 65056
-                    ? (c >= 65024 && c <= 65039)
-                    : c <= 65071)))))
-              : (c <= 65076 || (c < 65147
-                ? (c < 65139
-                  ? (c < 65137
-                    ? (c >= 65101 && c <= 65103)
-                    : c <= 65137)
-                  : (c <= 65139 || (c < 65145
-                    ? c == 65143
-                    : c <= 65145)))
-                : (c <= 65147 || (c < 65296
-                  ? (c < 65151
-                    ? c == 65149
-                    : c <= 65276)
-                  : (c <= 65305 || (c < 65343
-                    ? (c >= 65313 && c <= 65338)
-                    : c <= 65343)))))))))
-          : (c <= 65370 || (c < 66513
-            ? (c < 65664
-              ? (c < 65536
-                ? (c < 65482
-                  ? (c < 65474
-                    ? (c >= 65382 && c <= 65470)
-                    : c <= 65479)
-                  : (c <= 65487 || (c < 65498
-                    ? (c >= 65490 && c <= 65495)
-                    : c <= 65500)))
-                : (c <= 65547 || (c < 65596
-                  ? (c < 65576
-                    ? (c >= 65549 && c <= 65574)
-                    : c <= 65594)
-                  : (c <= 65597 || (c < 65616
-                    ? (c >= 65599 && c <= 65613)
-                    : c <= 65629)))))
-              : (c <= 65786 || (c < 66304
-                ? (c < 66176
-                  ? (c < 66045
-                    ? (c >= 65856 && c <= 65908)
-                    : c <= 66045)
-                  : (c <= 66204 || (c < 66272
-                    ? (c >= 66208 && c <= 66256)
-                    : c <= 66272)))
-                : (c <= 66335 || (c < 66432
-                  ? (c < 66384
-                    ? (c >= 66349 && c <= 66378)
-                    : c <= 66426)
-                  : (c <= 66461 || (c < 66504
-                    ? (c >= 66464 && c <= 66499)
-                    : c <= 66511)))))))
-            : (c <= 66517 || (c < 66979
-              ? (c < 66864
-                ? (c < 66736
-                  ? (c < 66720
-                    ? (c >= 66560 && c <= 66717)
-                    : c <= 66729)
-                  : (c <= 66771 || (c < 66816
-                    ? (c >= 66776 && c <= 66811)
-                    : c <= 66855)))
-                : (c <= 66915 || (c < 66956
-                  ? (c < 66940
-                    ? (c >= 66928 && c <= 66938)
-                    : c <= 66954)
-                  : (c <= 66962 || (c < 66967
-                    ? (c >= 66964 && c <= 66965)
-                    : c <= 66977)))))
-              : (c <= 66993 || (c < 67456
-                ? (c < 67072
-                  ? (c < 67003
-                    ? (c >= 66995 && c <= 67001)
-                    : c <= 67004)
-                  : (c <= 67382 || (c < 67424
-                    ? (c >= 67392 && c <= 67413)
-                    : c <= 67431)))
-                : (c <= 67461 || (c < 67584
-                  ? (c < 67506
-                    ? (c >= 67463 && c <= 67504)
-                    : c <= 67514)
-                  : (c <= 67589 || (c < 67594
-                    ? c == 67592
-                    : c <= 67637)))))))))))
-        : (c <= 67640 || (c < 69956
-          ? (c < 68448
-            ? (c < 68101
-              ? (c < 67828
-                ? (c < 67680
-                  ? (c < 67647
-                    ? c == 67644
-                    : c <= 67669)
-                  : (c <= 67702 || (c < 67808
-                    ? (c >= 67712 && c <= 67742)
-                    : c <= 67826)))
-                : (c <= 67829 || (c < 67968
-                  ? (c < 67872
-                    ? (c >= 67840 && c <= 67861)
-                    : c <= 67897)
-                  : (c <= 68023 || (c < 68096
-                    ? (c >= 68030 && c <= 68031)
-                    : c <= 68099)))))
-              : (c <= 68102 || (c < 68192
-                ? (c < 68121
-                  ? (c < 68117
-                    ? (c >= 68108 && c <= 68115)
-                    : c <= 68119)
-                  : (c <= 68149 || (c < 68159
-                    ? (c >= 68152 && c <= 68154)
-                    : c <= 68159)))
-                : (c <= 68220 || (c < 68297
-                  ? (c < 68288
-                    ? (c >= 68224 && c <= 68252)
-                    : c <= 68295)
-                  : (c <= 68326 || (c < 68416
-                    ? (c >= 68352 && c <= 68405)
-                    : c <= 68437)))))))
-            : (c <= 68466 || (c < 69424
-              ? (c < 68912
-                ? (c < 68736
-                  ? (c < 68608
-                    ? (c >= 68480 && c <= 68497)
-                    : c <= 68680)
-                  : (c <= 68786 || (c < 68864
-                    ? (c >= 68800 && c <= 68850)
-                    : c <= 68903)))
-                : (c <= 68921 || (c < 69296
-                  ? (c < 69291
-                    ? (c >= 69248 && c <= 69289)
-                    : c <= 69292)
-                  : (c <= 69297 || (c < 69415
-                    ? (c >= 69376 && c <= 69404)
-                    : c <= 69415)))))
-              : (c <= 69456 || (c < 69759
-                ? (c < 69600
-                  ? (c < 69552
-                    ? (c >= 69488 && c <= 69509)
-                    : c <= 69572)
-                  : (c <= 69622 || (c < 69734
-                    ? (c >= 69632 && c <= 69702)
-                    : c <= 69749)))
-                : (c <= 69818 || (c < 69872
-                  ? (c < 69840
-                    ? c == 69826
-                    : c <= 69864)
-                  : (c <= 69881 || (c < 69942
-                    ? (c >= 69888 && c <= 69940)
-                    : c <= 69951)))))))))
-          : (c <= 69959 || (c < 70459
-            ? (c < 70282
-              ? (c < 70108
-                ? (c < 70016
-                  ? (c < 70006
-                    ? (c >= 69968 && c <= 70003)
-                    : c <= 70006)
-                  : (c <= 70084 || (c < 70094
-                    ? (c >= 70089 && c <= 70092)
-                    : c <= 70106)))
-                : (c <= 70108 || (c < 70206
-                  ? (c < 70163
-                    ? (c >= 70144 && c <= 70161)
-                    : c <= 70199)
-                  : (c <= 70206 || (c < 70280
-                    ? (c >= 70272 && c <= 70278)
-                    : c <= 70280)))))
-              : (c <= 70285 || (c < 70405
-                ? (c < 70320
-                  ? (c < 70303
-                    ? (c >= 70287 && c <= 70301)
-                    : c <= 70312)
-                  : (c <= 70378 || (c < 70400
-                    ? (c >= 70384 && c <= 70393)
-                    : c <= 70403)))
-                : (c <= 70412 || (c < 70442
-                  ? (c < 70419
-                    ? (c >= 70415 && c <= 70416)
-                    : c <= 70440)
-                  : (c <= 70448 || (c < 70453
-                    ? (c >= 70450 && c <= 70451)
-                    : c <= 70457)))))))
-            : (c <= 70468 || (c < 70855
-              ? (c < 70502
-                ? (c < 70480
-                  ? (c < 70475
-                    ? (c >= 70471 && c <= 70472)
-                    : c <= 70477)
-                  : (c <= 70480 || (c < 70493
-                    ? c == 70487
-                    : c <= 70499)))
-                : (c <= 70508 || (c < 70736
-                  ? (c < 70656
-                    ? (c >= 70512 && c <= 70516)
-                    : c <= 70730)
-                  : (c <= 70745 || (c < 70784
-                    ? (c >= 70750 && c <= 70753)
-                    : c <= 70853)))))
-              : (c <= 70855 || (c < 71236
-                ? (c < 71096
-                  ? (c < 71040
-                    ? (c >= 70864 && c <= 70873)
-                    : c <= 71093)
-                  : (c <= 71104 || (c < 71168
+                    : c <= 64605)
+                  : (c <= 64829 || (c >= 64848 && c <= 64911)))))))))
+          : (c <= 64967 || (c < 65549
+            ? (c < 65151
+              ? (c < 65137
+                ? (c < 65056
+                  ? (c < 65024
+                    ? (c >= 65008 && c <= 65017)
+                    : c <= 65039)
+                  : (c <= 65071 || (c < 65101
+                    ? (c >= 65075 && c <= 65076)
+                    : c <= 65103)))
+                : (c <= 65137 || (c < 65145
+                  ? (c < 65143
+                    ? c == 65139
+                    : c <= 65143)
+                  : (c <= 65145 || (c < 65149
+                    ? c == 65147
+                    : c <= 65149)))))
+              : (c <= 65276 || (c < 65474
+                ? (c < 65343
+                  ? (c < 65313
+                    ? (c >= 65296 && c <= 65305)
+                    : c <= 65338)
+                  : (c <= 65343 || (c < 65382
+                    ? (c >= 65345 && c <= 65370)
+                    : c <= 65470)))
+                : (c <= 65479 || (c < 65498
+                  ? (c < 65490
+                    ? (c >= 65482 && c <= 65487)
+                    : c <= 65495)
+                  : (c <= 65500 || (c >= 65536 && c <= 65547)))))))
+            : (c <= 65574 || (c < 66349
+              ? (c < 65856
+                ? (c < 65599
+                  ? (c < 65596
+                    ? (c >= 65576 && c <= 65594)
+                    : c <= 65597)
+                  : (c <= 65613 || (c < 65664
+                    ? (c >= 65616 && c <= 65629)
+                    : c <= 65786)))
+                : (c <= 65908 || (c < 66208
+                  ? (c < 66176
+                    ? c == 66045
+                    : c <= 66204)
+                  : (c <= 66256 || (c < 66304
+                    ? c == 66272
+                    : c <= 66335)))))
+              : (c <= 66378 || (c < 66560
+                ? (c < 66464
+                  ? (c < 66432
+                    ? (c >= 66384 && c <= 66426)
+                    : c <= 66461)
+                  : (c <= 66499 || (c < 66513
+                    ? (c >= 66504 && c <= 66511)
+                    : c <= 66517)))
+                : (c <= 66717 || (c < 66776
+                  ? (c < 66736
+                    ? (c >= 66720 && c <= 66729)
+                    : c <= 66771)
+                  : (c <= 66811 || (c >= 66816 && c <= 66855)))))))))))
+        : (c <= 66915 || (c < 69632
+          ? (c < 68152
+            ? (c < 67808
+              ? (c < 67594
+                ? (c < 67424
+                  ? (c < 67392
+                    ? (c >= 67072 && c <= 67382)
+                    : c <= 67413)
+                  : (c <= 67431 || (c < 67592
+                    ? (c >= 67584 && c <= 67589)
+                    : c <= 67592)))
+                : (c <= 67637 || (c < 67647
+                  ? (c < 67644
+                    ? (c >= 67639 && c <= 67640)
+                    : c <= 67644)
+                  : (c <= 67669 || (c < 67712
+                    ? (c >= 67680 && c <= 67702)
+                    : c <= 67742)))))
+              : (c <= 67826 || (c < 68096
+                ? (c < 67872
+                  ? (c < 67840
+                    ? (c >= 67828 && c <= 67829)
+                    : c <= 67861)
+                  : (c <= 67897 || (c < 68030
+                    ? (c >= 67968 && c <= 68023)
+                    : c <= 68031)))
+                : (c <= 68099 || (c < 68117
+                  ? (c < 68108
+                    ? (c >= 68101 && c <= 68102)
+                    : c <= 68115)
+                  : (c <= 68119 || (c >= 68121 && c <= 68149)))))))
+            : (c <= 68154 || (c < 68800
+              ? (c < 68352
+                ? (c < 68224
+                  ? (c < 68192
+                    ? c == 68159
+                    : c <= 68220)
+                  : (c <= 68252 || (c < 68297
+                    ? (c >= 68288 && c <= 68295)
+                    : c <= 68326)))
+                : (c <= 68405 || (c < 68480
+                  ? (c < 68448
+                    ? (c >= 68416 && c <= 68437)
+                    : c <= 68466)
+                  : (c <= 68497 || (c < 68736
+                    ? (c >= 68608 && c <= 68680)
+                    : c <= 68786)))))
+              : (c <= 68850 || (c < 69376
+                ? (c < 69248
+                  ? (c < 68912
+                    ? (c >= 68864 && c <= 68903)
+                    : c <= 68921)
+                  : (c <= 69289 || (c < 69296
+                    ? (c >= 69291 && c <= 69292)
+                    : c <= 69297)))
+                : (c <= 69404 || (c < 69552
+                  ? (c < 69424
+                    ? c == 69415
+                    : c <= 69456)
+                  : (c <= 69572 || (c >= 69600 && c <= 69622)))))))))
+          : (c <= 69702 || (c < 70384
+            ? (c < 70094
+              ? (c < 69942
+                ? (c < 69840
+                  ? (c < 69759
+                    ? (c >= 69734 && c <= 69743)
+                    : c <= 69818)
+                  : (c <= 69864 || (c < 69888
+                    ? (c >= 69872 && c <= 69881)
+                    : c <= 69940)))
+                : (c <= 69951 || (c < 70006
+                  ? (c < 69968
+                    ? (c >= 69956 && c <= 69959)
+                    : c <= 70003)
+                  : (c <= 70006 || (c < 70089
+                    ? (c >= 70016 && c <= 70084)
+                    : c <= 70092)))))
+              : (c <= 70106 || (c < 70280
+                ? (c < 70163
+                  ? (c < 70144
+                    ? c == 70108
+                    : c <= 70161)
+                  : (c <= 70199 || (c < 70272
+                    ? c == 70206
+                    : c <= 70278)))
+                : (c <= 70280 || (c < 70303
+                  ? (c < 70287
+                    ? (c >= 70282 && c <= 70285)
+                    : c <= 70301)
+                  : (c <= 70312 || (c >= 70320 && c <= 70378)))))))
+            : (c <= 70393 || (c < 70487
+              ? (c < 70450
+                ? (c < 70415
+                  ? (c < 70405
+                    ? (c >= 70400 && c <= 70403)
+                    : c <= 70412)
+                  : (c <= 70416 || (c < 70442
+                    ? (c >= 70419 && c <= 70440)
+                    : c <= 70448)))
+                : (c <= 70451 || (c < 70471
+                  ? (c < 70459
+                    ? (c >= 70453 && c <= 70457)
+                    : c <= 70468)
+                  : (c <= 70472 || (c < 70480
+                    ? (c >= 70475 && c <= 70477)
+                    : c <= 70480)))))
+              : (c <= 70487 || (c < 70750
+                ? (c < 70512
+                  ? (c < 70502
+                    ? (c >= 70493 && c <= 70499)
+                    : c <= 70508)
+                  : (c <= 70516 || (c < 70736
+                    ? (c >= 70656 && c <= 70730)
+                    : c <= 70745)))
+                : (c <= 70753 || (c < 70864
+                  ? (c < 70855
+                    ? (c >= 70784 && c <= 70853)
+                    : c <= 70855)
+                  : (c <= 70873 || (c >= 71040 && c <= 71093)))))))))))))
+      : (c <= 71104 || (c < 119894
+        ? (c < 73104
+          ? (c < 72163
+            ? (c < 71935
+              ? (c < 71360
+                ? (c < 71236
+                  ? (c < 71168
                     ? (c >= 71128 && c <= 71133)
-                    : c <= 71232)))
-                : (c <= 71236 || (c < 71360
-                  ? (c < 71296
+                    : c <= 71232)
+                  : (c <= 71236 || (c < 71296
                     ? (c >= 71248 && c <= 71257)
-                    : c <= 71352)
-                  : (c <= 71369 || (c >= 71424 && c <= 71450)))))))))))))
-      : (c <= 71467 || (c < 119973
-        ? (c < 77824
-          ? (c < 72760
-            ? (c < 72016
-              ? (c < 71945
-                ? (c < 71680
-                  ? (c < 71488
-                    ? (c >= 71472 && c <= 71481)
-                    : c <= 71494)
-                  : (c <= 71738 || (c < 71935
-                    ? (c >= 71840 && c <= 71913)
-                    : c <= 71942)))
-                : (c <= 71945 || (c < 71960
-                  ? (c < 71957
-                    ? (c >= 71948 && c <= 71955)
-                    : c <= 71958)
-                  : (c <= 71989 || (c < 71995
-                    ? (c >= 71991 && c <= 71992)
-                    : c <= 72003)))))
-              : (c <= 72025 || (c < 72263
-                ? (c < 72154
-                  ? (c < 72106
-                    ? (c >= 72096 && c <= 72103)
-                    : c <= 72151)
-                  : (c <= 72161 || (c < 72192
-                    ? (c >= 72163 && c <= 72164)
-                    : c <= 72254)))
-                : (c <= 72263 || (c < 72368
-                  ? (c < 72349
-                    ? (c >= 72272 && c <= 72345)
-                    : c <= 72349)
-                  : (c <= 72440 || (c < 72714
-                    ? (c >= 72704 && c <= 72712)
-                    : c <= 72758)))))))
-            : (c <= 72768 || (c < 73056
-              ? (c < 72968
-                ? (c < 72850
-                  ? (c < 72818
-                    ? (c >= 72784 && c <= 72793)
-                    : c <= 72847)
-                  : (c <= 72871 || (c < 72960
-                    ? (c >= 72873 && c <= 72886)
-                    : c <= 72966)))
-                : (c <= 72969 || (c < 73020
-                  ? (c < 73018
-                    ? (c >= 72971 && c <= 73014)
-                    : c <= 73018)
-                  : (c <= 73021 || (c < 73040
-                    ? (c >= 73023 && c <= 73031)
-                    : c <= 73049)))))
-              : (c <= 73061 || (c < 73440
-                ? (c < 73104
-                  ? (c < 73066
-                    ? (c >= 73063 && c <= 73064)
-                    : c <= 73102)
-                  : (c <= 73105 || (c < 73120
+                    : c <= 71352)))
+                : (c <= 71369 || (c < 71472
+                  ? (c < 71453
+                    ? (c >= 71424 && c <= 71450)
+                    : c <= 71467)
+                  : (c <= 71481 || (c < 71840
+                    ? (c >= 71680 && c <= 71738)
+                    : c <= 71913)))))
+              : (c <= 71942 || (c < 71995
+                ? (c < 71957
+                  ? (c < 71948
+                    ? c == 71945
+                    : c <= 71955)
+                  : (c <= 71958 || (c < 71991
+                    ? (c >= 71960 && c <= 71989)
+                    : c <= 71992)))
+                : (c <= 72003 || (c < 72106
+                  ? (c < 72096
+                    ? (c >= 72016 && c <= 72025)
+                    : c <= 72103)
+                  : (c <= 72151 || (c >= 72154 && c <= 72161)))))))
+            : (c <= 72164 || (c < 72873
+              ? (c < 72704
+                ? (c < 72272
+                  ? (c < 72263
+                    ? (c >= 72192 && c <= 72254)
+                    : c <= 72263)
+                  : (c <= 72345 || (c < 72384
+                    ? c == 72349
+                    : c <= 72440)))
+                : (c <= 72712 || (c < 72784
+                  ? (c < 72760
+                    ? (c >= 72714 && c <= 72758)
+                    : c <= 72768)
+                  : (c <= 72793 || (c < 72850
+                    ? (c >= 72818 && c <= 72847)
+                    : c <= 72871)))))
+              : (c <= 72886 || (c < 73023
+                ? (c < 72971
+                  ? (c < 72968
+                    ? (c >= 72960 && c <= 72966)
+                    : c <= 72969)
+                  : (c <= 73014 || (c < 73020
+                    ? c == 73018
+                    : c <= 73021)))
+                : (c <= 73031 || (c < 73063
+                  ? (c < 73056
+                    ? (c >= 73040 && c <= 73049)
+                    : c <= 73061)
+                  : (c <= 73064 || (c >= 73066 && c <= 73102)))))))))
+          : (c <= 73105 || (c < 94095
+            ? (c < 92768
+              ? (c < 74752
+                ? (c < 73440
+                  ? (c < 73120
                     ? (c >= 73107 && c <= 73112)
-                    : c <= 73129)))
-                : (c <= 73462 || (c < 74752
-                  ? (c < 73728
+                    : c <= 73129)
+                  : (c <= 73462 || (c < 73728
                     ? c == 73648
-                    : c <= 74649)
-                  : (c <= 74862 || (c < 77712
+                    : c <= 74649)))
+                : (c <= 74862 || (c < 82944
+                  ? (c < 77824
                     ? (c >= 74880 && c <= 75075)
-                    : c <= 77808)))))))))
-          : (c <= 78894 || (c < 110576
-            ? (c < 93027
-              ? (c < 92864
-                ? (c < 92736
-                  ? (c < 92160
-                    ? (c >= 82944 && c <= 83526)
-                    : c <= 92728)
-                  : (c <= 92766 || (c < 92784
-                    ? (c >= 92768 && c <= 92777)
-                    : c <= 92862)))
-                : (c <= 92873 || (c < 92928
+                    : c <= 78894)
+                  : (c <= 83526 || (c < 92736
+                    ? (c >= 92160 && c <= 92728)
+                    : c <= 92766)))))
+              : (c <= 92777 || (c < 93027
+                ? (c < 92928
                   ? (c < 92912
                     ? (c >= 92880 && c <= 92909)
                     : c <= 92916)
                   : (c <= 92982 || (c < 93008
                     ? (c >= 92992 && c <= 92995)
-                    : c <= 93017)))))
-              : (c <= 93047 || (c < 94176
-                ? (c < 93952
+                    : c <= 93017)))
+                : (c <= 93047 || (c < 93952
                   ? (c < 93760
                     ? (c >= 93053 && c <= 93071)
                     : c <= 93823)
-                  : (c <= 94026 || (c < 94095
-                    ? (c >= 94031 && c <= 94087)
-                    : c <= 94111)))
-                : (c <= 94177 || (c < 94208
-                  ? (c < 94192
-                    ? (c >= 94179 && c <= 94180)
-                    : c <= 94193)
-                  : (c <= 100343 || (c < 101632
-                    ? (c >= 100352 && c <= 101589)
-                    : c <= 101640)))))))
-            : (c <= 110579 || (c < 118528
-              ? (c < 110960
-                ? (c < 110592
-                  ? (c < 110589
-                    ? (c >= 110581 && c <= 110587)
-                    : c <= 110590)
-                  : (c <= 110882 || (c < 110948
-                    ? (c >= 110928 && c <= 110930)
-                    : c <= 110951)))
-                : (c <= 111355 || (c < 113792
-                  ? (c < 113776
-                    ? (c >= 113664 && c <= 113770)
-                    : c <= 113788)
-                  : (c <= 113800 || (c < 113821
-                    ? (c >= 113808 && c <= 113817)
-                    : c <= 113822)))))
-              : (c <= 118573 || (c < 119210
-                ? (c < 119149
-                  ? (c < 119141
-                    ? (c >= 118576 && c <= 118598)
-                    : c <= 119145)
-                  : (c <= 119154 || (c < 119173
-                    ? (c >= 119163 && c <= 119170)
-                    : c <= 119179)))
-                : (c <= 119213 || (c < 119894
-                  ? (c < 119808
-                    ? (c >= 119362 && c <= 119364)
-                    : c <= 119892)
-                  : (c <= 119964 || (c < 119970
+                  : (c <= 94026 || (c >= 94031 && c <= 94087)))))))
+            : (c <= 94111 || (c < 113776
+              ? (c < 101632
+                ? (c < 94192
+                  ? (c < 94179
+                    ? (c >= 94176 && c <= 94177)
+                    : c <= 94180)
+                  : (c <= 94193 || (c < 100352
+                    ? (c >= 94208 && c <= 100343)
+                    : c <= 101589)))
+                : (c <= 101640 || (c < 110948
+                  ? (c < 110928
+                    ? (c >= 110592 && c <= 110878)
+                    : c <= 110930)
+                  : (c <= 110951 || (c < 113664
+                    ? (c >= 110960 && c <= 111355)
+                    : c <= 113770)))))
+              : (c <= 113788 || (c < 119163
+                ? (c < 113821
+                  ? (c < 113808
+                    ? (c >= 113792 && c <= 113800)
+                    : c <= 113817)
+                  : (c <= 113822 || (c < 119149
+                    ? (c >= 119141 && c <= 119145)
+                    : c <= 119154)))
+                : (c <= 119170 || (c < 119362
+                  ? (c < 119210
+                    ? (c >= 119173 && c <= 119179)
+                    : c <= 119213)
+                  : (c <= 119364 || (c >= 119808 && c <= 119892)))))))))))
+        : (c <= 119964 || (c < 124928
+          ? (c < 120630
+            ? (c < 120094
+              ? (c < 119995
+                ? (c < 119973
+                  ? (c < 119970
                     ? (c >= 119966 && c <= 119967)
-                    : c <= 119970)))))))))))
-        : (c <= 119974 || (c < 124912
-          ? (c < 120746
-            ? (c < 120134
-              ? (c < 120071
-                ? (c < 119995
-                  ? (c < 119982
+                    : c <= 119970)
+                  : (c <= 119974 || (c < 119982
                     ? (c >= 119977 && c <= 119980)
-                    : c <= 119993)
-                  : (c <= 119995 || (c < 120005
+                    : c <= 119993)))
+                : (c <= 119995 || (c < 120071
+                  ? (c < 120005
                     ? (c >= 119997 && c <= 120003)
-                    : c <= 120069)))
-                : (c <= 120074 || (c < 120094
-                  ? (c < 120086
+                    : c <= 120069)
+                  : (c <= 120074 || (c < 120086
                     ? (c >= 120077 && c <= 120084)
-                    : c <= 120092)
-                  : (c <= 120121 || (c < 120128
+                    : c <= 120092)))))
+              : (c <= 120121 || (c < 120488
+                ? (c < 120134
+                  ? (c < 120128
                     ? (c >= 120123 && c <= 120126)
-                    : c <= 120132)))))
-              : (c <= 120134 || (c < 120572
-                ? (c < 120488
-                  ? (c < 120146
+                    : c <= 120132)
+                  : (c <= 120134 || (c < 120146
                     ? (c >= 120138 && c <= 120144)
-                    : c <= 120485)
-                  : (c <= 120512 || (c < 120540
+                    : c <= 120485)))
+                : (c <= 120512 || (c < 120572
+                  ? (c < 120540
                     ? (c >= 120514 && c <= 120538)
-                    : c <= 120570)))
-                : (c <= 120596 || (c < 120656
-                  ? (c < 120630
-                    ? (c >= 120598 && c <= 120628)
-                    : c <= 120654)
-                  : (c <= 120686 || (c < 120714
-                    ? (c >= 120688 && c <= 120712)
-                    : c <= 120744)))))))
-            : (c <= 120770 || (c < 122907
-              ? (c < 121476
-                ? (c < 121344
-                  ? (c < 120782
-                    ? (c >= 120772 && c <= 120779)
-                    : c <= 120831)
-                  : (c <= 121398 || (c < 121461
-                    ? (c >= 121403 && c <= 121452)
-                    : c <= 121461)))
-                : (c <= 121476 || (c < 122624
-                  ? (c < 121505
-                    ? (c >= 121499 && c <= 121503)
-                    : c <= 121519)
-                  : (c <= 122654 || (c < 122888
+                    : c <= 120570)
+                  : (c <= 120596 || (c >= 120598 && c <= 120628)))))))
+            : (c <= 120654 || (c < 121505
+              ? (c < 120782
+                ? (c < 120714
+                  ? (c < 120688
+                    ? (c >= 120656 && c <= 120686)
+                    : c <= 120712)
+                  : (c <= 120744 || (c < 120772
+                    ? (c >= 120746 && c <= 120770)
+                    : c <= 120779)))
+                : (c <= 120831 || (c < 121461
+                  ? (c < 121403
+                    ? (c >= 121344 && c <= 121398)
+                    : c <= 121452)
+                  : (c <= 121461 || (c < 121499
+                    ? c == 121476
+                    : c <= 121503)))))
+              : (c <= 121519 || (c < 123136
+                ? (c < 122907
+                  ? (c < 122888
                     ? (c >= 122880 && c <= 122886)
-                    : c <= 122904)))))
-              : (c <= 122913 || (c < 123214
-                ? (c < 123136
-                  ? (c < 122918
+                    : c <= 122904)
+                  : (c <= 122913 || (c < 122918
                     ? (c >= 122915 && c <= 122916)
-                    : c <= 122922)
-                  : (c <= 123180 || (c < 123200
+                    : c <= 122922)))
+                : (c <= 123180 || (c < 123214
+                  ? (c < 123200
                     ? (c >= 123184 && c <= 123197)
-                    : c <= 123209)))
-                : (c <= 123214 || (c < 124896
-                  ? (c < 123584
-                    ? (c >= 123536 && c <= 123566)
-                    : c <= 123641)
-                  : (c <= 124902 || (c < 124909
-                    ? (c >= 124904 && c <= 124907)
-                    : c <= 124910)))))))))
-          : (c <= 124926 || (c < 126557
-            ? (c < 126521
-              ? (c < 126469
-                ? (c < 125184
-                  ? (c < 125136
-                    ? (c >= 124928 && c <= 125124)
-                    : c <= 125142)
-                  : (c <= 125259 || (c < 126464
-                    ? (c >= 125264 && c <= 125273)
-                    : c <= 126467)))
-                : (c <= 126495 || (c < 126503
-                  ? (c < 126500
-                    ? (c >= 126497 && c <= 126498)
-                    : c <= 126500)
-                  : (c <= 126503 || (c < 126516
-                    ? (c >= 126505 && c <= 126514)
-                    : c <= 126519)))))
-              : (c <= 126521 || (c < 126541
-                ? (c < 126535
-                  ? (c < 126530
-                    ? c == 126523
-                    : c <= 126530)
-                  : (c <= 126535 || (c < 126539
-                    ? c == 126537
-                    : c <= 126539)))
-                : (c <= 126543 || (c < 126551
-                  ? (c < 126548
-                    ? (c >= 126545 && c <= 126546)
-                    : c <= 126548)
-                  : (c <= 126551 || (c < 126555
-                    ? c == 126553
-                    : c <= 126555)))))))
+                    : c <= 123209)
+                  : (c <= 123214 || (c >= 123584 && c <= 123641)))))))))
+          : (c <= 125124 || (c < 126557
+            ? (c < 126523
+              ? (c < 126497
+                ? (c < 125264
+                  ? (c < 125184
+                    ? (c >= 125136 && c <= 125142)
+                    : c <= 125259)
+                  : (c <= 125273 || (c < 126469
+                    ? (c >= 126464 && c <= 126467)
+                    : c <= 126495)))
+                : (c <= 126498 || (c < 126505
+                  ? (c < 126503
+                    ? c == 126500
+                    : c <= 126503)
+                  : (c <= 126514 || (c < 126521
+                    ? (c >= 126516 && c <= 126519)
+                    : c <= 126521)))))
+              : (c <= 126523 || (c < 126545
+                ? (c < 126537
+                  ? (c < 126535
+                    ? c == 126530
+                    : c <= 126535)
+                  : (c <= 126537 || (c < 126541
+                    ? c == 126539
+                    : c <= 126543)))
+                : (c <= 126546 || (c < 126553
+                  ? (c < 126551
+                    ? c == 126548
+                    : c <= 126551)
+                  : (c <= 126553 || c == 126555))))))
             : (c <= 126557 || (c < 126629
               ? (c < 126580
                 ? (c < 126564
@@ -7086,8 +4694,8 @@ static inline bool sym_identifier_character_set_3(int32_t c) {
                   ? (c < 130032
                     ? (c >= 126635 && c <= 126651)
                     : c <= 130041)
-                  : (c <= 173791 || (c < 177984
-                    ? (c >= 173824 && c <= 177976)
+                  : (c <= 173789 || (c < 177984
+                    ? (c >= 173824 && c <= 177972)
                     : c <= 178205)))
                 : (c <= 183969 || (c < 196608
                   ? (c < 194560
@@ -7101,35 +4709,34 @@ static bool ts_lex(TSLexer *lexer, TSStateId state) {
   eof = lexer->eof(lexer);
   switch (state) {
     case 0:
-      if (eof) ADVANCE(65);
-      if (lookahead == '!') ADVANCE(22);
-      if (lookahead == '#') ADVANCE(165);
-      if (lookahead == '%') ADVANCE(98);
-      if (lookahead == '&') ADVANCE(100);
-      if (lookahead == '(') ADVANCE(68);
-      if (lookahead == ')') ADVANCE(69);
-      if (lookahead == '*') ADVANCE(71);
-      if (lookahead == '+') ADVANCE(85);
-      if (lookahead == ',') ADVANCE(70);
-      if (lookahead == '-') ADVANCE(83);
-      if (lookahead == '.') ADVANCE(67);
-      if (lookahead == '/') ADVANCE(96);
-      if (lookahead == '0') ADVANCE(138);
-      if (lookahead == ':') ADVANCE(76);
-      if (lookahead == ';') ADVANCE(166);
-      if (lookahead == '<') ADVANCE(104);
-      if (lookahead == '=') ADVANCE(92);
-      if (lookahead == '>') ADVANCE(110);
-      if (lookahead == '@') ADVANCE(95);
-      if (lookahead == '[') ADVANCE(86);
-      if (lookahead == '\\') SKIP(54)
-      if (lookahead == ']') ADVANCE(87);
-      if (lookahead == '^') ADVANCE(101);
-      if (lookahead == 'e') ADVANCE(161);
-      if (lookahead == '{') ADVANCE(127);
-      if (lookahead == '|') ADVANCE(80);
-      if (lookahead == '}') ADVANCE(89);
-      if (lookahead == '~') ADVANCE(103);
+      if (eof) ADVANCE(51);
+      if (lookahead == '!') ADVANCE(21);
+      if (lookahead == '#') ADVANCE(124);
+      if (lookahead == '%') ADVANCE(75);
+      if (lookahead == '&') ADVANCE(77);
+      if (lookahead == '(') ADVANCE(54);
+      if (lookahead == ')') ADVANCE(55);
+      if (lookahead == '*') ADVANCE(57);
+      if (lookahead == '+') ADVANCE(65);
+      if (lookahead == ',') ADVANCE(56);
+      if (lookahead == '-') ADVANCE(64);
+      if (lookahead == '.') ADVANCE(53);
+      if (lookahead == '/') ADVANCE(74);
+      if (lookahead == '0') ADVANCE(113);
+      if (lookahead == ':') ADVANCE(61);
+      if (lookahead == ';') ADVANCE(125);
+      if (lookahead == '<') ADVANCE(81);
+      if (lookahead == '=') ADVANCE(71);
+      if (lookahead == '>') ADVANCE(86);
+      if (lookahead == '@') ADVANCE(73);
+      if (lookahead == '[') ADVANCE(66);
+      if (lookahead == '\\') SKIP(46)
+      if (lookahead == ']') ADVANCE(67);
+      if (lookahead == '^') ADVANCE(78);
+      if (lookahead == '{') ADVANCE(102);
+      if (lookahead == '|') ADVANCE(62);
+      if (lookahead == '}') ADVANCE(69);
+      if (lookahead == '~') ADVANCE(80);
       if (lookahead == '\t' ||
           lookahead == '\n' ||
           lookahead == '\f' ||
@@ -7137,22 +4744,22 @@ static bool ts_lex(TSLexer *lexer, TSStateId state) {
           lookahead == ' ' ||
           lookahead == 8203 ||
           lookahead == 8288 ||
-          lookahead == 65279) SKIP(61)
-      if (('1' <= lookahead && lookahead <= '9')) ADVANCE(137);
-      if (sym_identifier_character_set_1(lookahead)) ADVANCE(164);
+          lookahead == 65279) SKIP(49)
+      if (('1' <= lookahead && lookahead <= '9')) ADVANCE(112);
+      if (sym_identifier_character_set_1(lookahead)) ADVANCE(123);
       END_STATE();
     case 1:
-      if (lookahead == '\n') SKIP(16)
+      if (lookahead == '\n') SKIP(14)
       END_STATE();
     case 2:
-      if (lookahead == '\n') SKIP(16)
+      if (lookahead == '\n') SKIP(14)
       if (lookahead == '\r') SKIP(1)
       END_STATE();
     case 3:
-      if (lookahead == '\n') SKIP(15)
+      if (lookahead == '\n') SKIP(16)
       END_STATE();
     case 4:
-      if (lookahead == '\n') SKIP(15)
+      if (lookahead == '\n') SKIP(16)
       if (lookahead == '\r') SKIP(3)
       END_STATE();
     case 5:
@@ -7163,37 +4770,37 @@ static bool ts_lex(TSLexer *lexer, TSStateId state) {
       if (lookahead == '\r') SKIP(5)
       END_STATE();
     case 7:
-      if (lookahead == '\n') ADVANCE(130);
+      if (lookahead == '\n') ADVANCE(105);
       END_STATE();
     case 8:
       if (lookahead == '\n') SKIP(9)
-      if (lookahead == '#') ADVANCE(134);
-      if (lookahead == '\\') ADVANCE(132);
-      if (lookahead == '{') ADVANCE(127);
-      if (lookahead == '}') ADVANCE(89);
+      if (lookahead == '#') ADVANCE(109);
+      if (lookahead == '\\') ADVANCE(107);
+      if (lookahead == '{') ADVANCE(102);
+      if (lookahead == '}') ADVANCE(69);
       if (lookahead == '\t' ||
           lookahead == '\f' ||
           lookahead == '\r' ||
           lookahead == ' ' ||
           lookahead == 8203 ||
           lookahead == 8288 ||
-          lookahead == 65279) ADVANCE(133);
-      if (lookahead != 0) ADVANCE(134);
+          lookahead == 65279) ADVANCE(108);
+      if (lookahead != 0) ADVANCE(109);
       END_STATE();
     case 9:
       if (lookahead == '\n') SKIP(9)
-      if (lookahead == '#') ADVANCE(134);
-      if (lookahead == '\\') ADVANCE(132);
-      if (lookahead == '}') ADVANCE(89);
+      if (lookahead == '#') ADVANCE(109);
+      if (lookahead == '\\') ADVANCE(107);
+      if (lookahead == '}') ADVANCE(69);
       if (lookahead == '\t' ||
           lookahead == '\f' ||
           lookahead == '\r' ||
           lookahead == ' ' ||
           lookahead == 8203 ||
           lookahead == 8288 ||
-          lookahead == 65279) ADVANCE(133);
+          lookahead == 65279) ADVANCE(108);
       if (lookahead != 0 &&
-          lookahead != '{') ADVANCE(134);
+          lookahead != '{') ADVANCE(109);
       END_STATE();
     case 10:
       if (lookahead == '\n') SKIP(17)
@@ -7203,37 +4810,39 @@ static bool ts_lex(TSLexer *lexer, TSStateId state) {
       if (lookahead == '\r') SKIP(10)
       END_STATE();
     case 12:
-      if (lookahead == '\n') SKIP(14)
+      if (lookahead == '\n') SKIP(15)
       END_STATE();
     case 13:
-      if (lookahead == '\n') SKIP(14)
+      if (lookahead == '\n') SKIP(15)
       if (lookahead == '\r') SKIP(12)
       END_STATE();
     case 14:
-      if (lookahead == '!') ADVANCE(22);
-      if (lookahead == '#') ADVANCE(165);
-      if (lookahead == '%') ADVANCE(98);
-      if (lookahead == '&') ADVANCE(100);
-      if (lookahead == '(') ADVANCE(68);
-      if (lookahead == ')') ADVANCE(69);
-      if (lookahead == '*') ADVANCE(71);
-      if (lookahead == '+') ADVANCE(85);
-      if (lookahead == ',') ADVANCE(70);
-      if (lookahead == '-') ADVANCE(82);
-      if (lookahead == '.') ADVANCE(66);
-      if (lookahead == '/') ADVANCE(96);
-      if (lookahead == ':') ADVANCE(76);
-      if (lookahead == ';') ADVANCE(166);
-      if (lookahead == '<') ADVANCE(104);
-      if (lookahead == '=') ADVANCE(92);
-      if (lookahead == '>') ADVANCE(110);
-      if (lookahead == '@') ADVANCE(95);
-      if (lookahead == '[') ADVANCE(86);
-      if (lookahead == '\\') SKIP(13)
-      if (lookahead == ']') ADVANCE(87);
-      if (lookahead == '^') ADVANCE(101);
-      if (lookahead == '|') ADVANCE(80);
-      if (lookahead == '}') ADVANCE(89);
+      if (lookahead == '!') ADVANCE(21);
+      if (lookahead == '#') ADVANCE(124);
+      if (lookahead == '%') ADVANCE(75);
+      if (lookahead == '&') ADVANCE(77);
+      if (lookahead == '(') ADVANCE(54);
+      if (lookahead == ')') ADVANCE(55);
+      if (lookahead == '*') ADVANCE(57);
+      if (lookahead == '+') ADVANCE(65);
+      if (lookahead == ',') ADVANCE(56);
+      if (lookahead == '-') ADVANCE(63);
+      if (lookahead == '.') ADVANCE(53);
+      if (lookahead == '/') ADVANCE(74);
+      if (lookahead == '0') ADVANCE(113);
+      if (lookahead == ':') ADVANCE(60);
+      if (lookahead == '<') ADVANCE(81);
+      if (lookahead == '=') ADVANCE(71);
+      if (lookahead == '>') ADVANCE(86);
+      if (lookahead == '@') ADVANCE(73);
+      if (lookahead == '[') ADVANCE(66);
+      if (lookahead == '\\') SKIP(2)
+      if (lookahead == ']') ADVANCE(67);
+      if (lookahead == '^') ADVANCE(78);
+      if (lookahead == '{') ADVANCE(68);
+      if (lookahead == '|') ADVANCE(62);
+      if (lookahead == '}') ADVANCE(69);
+      if (lookahead == '~') ADVANCE(80);
       if (lookahead == '\t' ||
           lookahead == '\n' ||
           lookahead == '\f' ||
@@ -7242,33 +4851,34 @@ static bool ts_lex(TSLexer *lexer, TSStateId state) {
           lookahead == 8203 ||
           lookahead == 8288 ||
           lookahead == 65279) SKIP(14)
-      if (sym_identifier_character_set_1(lookahead)) ADVANCE(164);
+      if (('1' <= lookahead && lookahead <= '9')) ADVANCE(112);
+      if (sym_identifier_character_set_1(lookahead)) ADVANCE(123);
       END_STATE();
     case 15:
-      if (lookahead == '!') ADVANCE(22);
-      if (lookahead == '#') ADVANCE(165);
-      if (lookahead == '%') ADVANCE(98);
-      if (lookahead == '&') ADVANCE(100);
-      if (lookahead == '(') ADVANCE(68);
-      if (lookahead == ')') ADVANCE(69);
-      if (lookahead == '*') ADVANCE(71);
-      if (lookahead == '+') ADVANCE(85);
-      if (lookahead == ',') ADVANCE(70);
-      if (lookahead == '-') ADVANCE(82);
-      if (lookahead == '.') ADVANCE(66);
-      if (lookahead == '/') ADVANCE(96);
-      if (lookahead == ':') ADVANCE(75);
-      if (lookahead == ';') ADVANCE(166);
-      if (lookahead == '<') ADVANCE(104);
-      if (lookahead == '=') ADVANCE(92);
-      if (lookahead == '>') ADVANCE(110);
-      if (lookahead == '@') ADVANCE(95);
-      if (lookahead == '[') ADVANCE(86);
-      if (lookahead == '\\') SKIP(4)
-      if (lookahead == ']') ADVANCE(87);
-      if (lookahead == '^') ADVANCE(101);
-      if (lookahead == '|') ADVANCE(80);
-      if (lookahead == '}') ADVANCE(89);
+      if (lookahead == '!') ADVANCE(21);
+      if (lookahead == '#') ADVANCE(124);
+      if (lookahead == '%') ADVANCE(75);
+      if (lookahead == '&') ADVANCE(77);
+      if (lookahead == '(') ADVANCE(54);
+      if (lookahead == ')') ADVANCE(55);
+      if (lookahead == '*') ADVANCE(57);
+      if (lookahead == '+') ADVANCE(65);
+      if (lookahead == ',') ADVANCE(56);
+      if (lookahead == '-') ADVANCE(63);
+      if (lookahead == '.') ADVANCE(52);
+      if (lookahead == '/') ADVANCE(74);
+      if (lookahead == ':') ADVANCE(61);
+      if (lookahead == ';') ADVANCE(125);
+      if (lookahead == '<') ADVANCE(81);
+      if (lookahead == '=') ADVANCE(71);
+      if (lookahead == '>') ADVANCE(86);
+      if (lookahead == '@') ADVANCE(73);
+      if (lookahead == '[') ADVANCE(66);
+      if (lookahead == '\\') SKIP(13)
+      if (lookahead == ']') ADVANCE(67);
+      if (lookahead == '^') ADVANCE(78);
+      if (lookahead == '|') ADVANCE(62);
+      if (lookahead == '}') ADVANCE(69);
       if (lookahead == '\t' ||
           lookahead == '\n' ||
           lookahead == '\f' ||
@@ -7277,35 +4887,33 @@ static bool ts_lex(TSLexer *lexer, TSStateId state) {
           lookahead == 8203 ||
           lookahead == 8288 ||
           lookahead == 65279) SKIP(15)
-      if (sym_identifier_character_set_1(lookahead)) ADVANCE(164);
+      if (sym_identifier_character_set_1(lookahead)) ADVANCE(123);
       END_STATE();
     case 16:
-      if (lookahead == '!') ADVANCE(22);
-      if (lookahead == '#') ADVANCE(165);
-      if (lookahead == '%') ADVANCE(23);
-      if (lookahead == '&') ADVANCE(24);
-      if (lookahead == '(') ADVANCE(68);
-      if (lookahead == ')') ADVANCE(69);
-      if (lookahead == '*') ADVANCE(71);
-      if (lookahead == '+') ADVANCE(85);
-      if (lookahead == ',') ADVANCE(70);
-      if (lookahead == '-') ADVANCE(82);
-      if (lookahead == '.') ADVANCE(20);
-      if (lookahead == '/') ADVANCE(97);
-      if (lookahead == '0') ADVANCE(138);
-      if (lookahead == ':') ADVANCE(75);
-      if (lookahead == '<') ADVANCE(105);
-      if (lookahead == '=') ADVANCE(92);
-      if (lookahead == '>') ADVANCE(111);
-      if (lookahead == '@') ADVANCE(25);
-      if (lookahead == '[') ADVANCE(86);
-      if (lookahead == '\\') SKIP(2)
-      if (lookahead == ']') ADVANCE(87);
-      if (lookahead == '^') ADVANCE(26);
-      if (lookahead == '{') ADVANCE(88);
-      if (lookahead == '|') ADVANCE(80);
-      if (lookahead == '}') ADVANCE(89);
-      if (lookahead == '~') ADVANCE(103);
+      if (lookahead == '!') ADVANCE(21);
+      if (lookahead == '#') ADVANCE(124);
+      if (lookahead == '%') ADVANCE(75);
+      if (lookahead == '&') ADVANCE(77);
+      if (lookahead == '(') ADVANCE(54);
+      if (lookahead == ')') ADVANCE(55);
+      if (lookahead == '*') ADVANCE(57);
+      if (lookahead == '+') ADVANCE(65);
+      if (lookahead == ',') ADVANCE(56);
+      if (lookahead == '-') ADVANCE(63);
+      if (lookahead == '.') ADVANCE(52);
+      if (lookahead == '/') ADVANCE(74);
+      if (lookahead == ':') ADVANCE(60);
+      if (lookahead == ';') ADVANCE(125);
+      if (lookahead == '<') ADVANCE(81);
+      if (lookahead == '=') ADVANCE(71);
+      if (lookahead == '>') ADVANCE(86);
+      if (lookahead == '@') ADVANCE(73);
+      if (lookahead == '[') ADVANCE(66);
+      if (lookahead == '\\') SKIP(4)
+      if (lookahead == ']') ADVANCE(67);
+      if (lookahead == '^') ADVANCE(78);
+      if (lookahead == '|') ADVANCE(62);
+      if (lookahead == '}') ADVANCE(69);
       if (lookahead == '\t' ||
           lookahead == '\n' ||
           lookahead == '\f' ||
@@ -7314,13 +4922,12 @@ static bool ts_lex(TSLexer *lexer, TSStateId state) {
           lookahead == 8203 ||
           lookahead == 8288 ||
           lookahead == 65279) SKIP(16)
-      if (('1' <= lookahead && lookahead <= '9')) ADVANCE(137);
-      if (sym_identifier_character_set_1(lookahead)) ADVANCE(164);
+      if (sym_identifier_character_set_1(lookahead)) ADVANCE(123);
       END_STATE();
     case 17:
-      if (lookahead == '#') ADVANCE(165);
-      if (lookahead == '-') ADVANCE(30);
-      if (lookahead == ':') ADVANCE(75);
+      if (lookahead == '#') ADVANCE(124);
+      if (lookahead == '-') ADVANCE(22);
+      if (lookahead == ':') ADVANCE(60);
       if (lookahead == '\\') SKIP(11)
       if (lookahead == '\t' ||
           lookahead == '\n' ||
@@ -7332,10 +4939,10 @@ static bool ts_lex(TSLexer *lexer, TSStateId state) {
           lookahead == 65279) SKIP(17)
       END_STATE();
     case 18:
-      if (lookahead == '#') ADVANCE(165);
-      if (lookahead == '\\') ADVANCE(131);
-      if (lookahead == '{') ADVANCE(128);
-      if (lookahead == '}') ADVANCE(36);
+      if (lookahead == '#') ADVANCE(124);
+      if (lookahead == '\\') ADVANCE(106);
+      if (lookahead == '{') ADVANCE(103);
+      if (lookahead == '}') ADVANCE(28);
       if (lookahead == '\t' ||
           lookahead == '\n' ||
           lookahead == '\f' ||
@@ -7346,7 +4953,7 @@ static bool ts_lex(TSLexer *lexer, TSStateId state) {
           lookahead == 65279) SKIP(19)
       END_STATE();
     case 19:
-      if (lookahead == '#') ADVANCE(165);
+      if (lookahead == '#') ADVANCE(124);
       if (lookahead == '\\') SKIP(6)
       if (lookahead == '\t' ||
           lookahead == '\n' ||
@@ -7358,548 +4965,408 @@ static bool ts_lex(TSLexer *lexer, TSStateId state) {
           lookahead == 65279) SKIP(19)
       END_STATE();
     case 20:
-      if (lookahead == '.') ADVANCE(21);
-      if (('0' <= lookahead && lookahead <= '9')) ADVANCE(144);
+      if (lookahead == '.') ADVANCE(101);
       END_STATE();
     case 21:
-      if (lookahead == '.') ADVANCE(126);
+      if (lookahead == '=') ADVANCE(84);
+      if (('a' <= lookahead && lookahead <= 'z')) ADVANCE(110);
       END_STATE();
     case 22:
-      if (lookahead == '=') ADVANCE(108);
-      if (('a' <= lookahead && lookahead <= 'z')) ADVANCE(135);
+      if (lookahead == '>') ADVANCE(72);
       END_STATE();
     case 23:
-      if (lookahead == '=') ADVANCE(119);
+      if (lookahead == '_') ADVANCE(30);
+      if (lookahead == '0' ||
+          lookahead == '1') ADVANCE(115);
       END_STATE();
     case 24:
-      if (lookahead == '=') ADVANCE(123);
+      if (lookahead == '_') ADVANCE(31);
+      if (('0' <= lookahead && lookahead <= '7')) ADVANCE(116);
       END_STATE();
     case 25:
-      if (lookahead == '=') ADVANCE(117);
-      END_STATE();
-    case 26:
-      if (lookahead == '=') ADVANCE(124);
-      END_STATE();
-    case 27:
-      if (lookahead == '=') ADVANCE(118);
-      END_STATE();
-    case 28:
-      if (lookahead == '=') ADVANCE(122);
-      END_STATE();
-    case 29:
-      if (lookahead == '=') ADVANCE(121);
-      END_STATE();
-    case 30:
-      if (lookahead == '>') ADVANCE(93);
-      END_STATE();
-    case 31:
-      if (lookahead == '_') ADVANCE(38);
-      if (lookahead == '0' ||
-          lookahead == '1') ADVANCE(140);
-      END_STATE();
-    case 32:
-      if (lookahead == '_') ADVANCE(39);
-      if (('0' <= lookahead && lookahead <= '7')) ADVANCE(141);
-      END_STATE();
-    case 33:
-      if (lookahead == '_') ADVANCE(43);
+      if (lookahead == '_') ADVANCE(35);
       if (('0' <= lookahead && lookahead <= '9') ||
           ('A' <= lookahead && lookahead <= 'F') ||
-          ('a' <= lookahead && lookahead <= 'f')) ADVANCE(142);
+          ('a' <= lookahead && lookahead <= 'f')) ADVANCE(117);
+      END_STATE();
+    case 26:
+      if (lookahead == '{') ADVANCE(44);
+      END_STATE();
+    case 27:
+      if (lookahead == '}') ADVANCE(105);
+      if (lookahead != 0) ADVANCE(27);
+      END_STATE();
+    case 28:
+      if (lookahead == '}') ADVANCE(104);
+      END_STATE();
+    case 29:
+      if (lookahead == '+' ||
+          lookahead == '-') ADVANCE(32);
+      if (('0' <= lookahead && lookahead <= '9')) ADVANCE(120);
+      END_STATE();
+    case 30:
+      if (lookahead == '0' ||
+          lookahead == '1') ADVANCE(115);
+      END_STATE();
+    case 31:
+      if (('0' <= lookahead && lookahead <= '7')) ADVANCE(116);
+      END_STATE();
+    case 32:
+      if (('0' <= lookahead && lookahead <= '9')) ADVANCE(120);
+      END_STATE();
+    case 33:
+      if (('0' <= lookahead && lookahead <= '9')) ADVANCE(105);
       END_STATE();
     case 34:
-      if (lookahead == '{') ADVANCE(52);
+      if (('0' <= lookahead && lookahead <= '9')) ADVANCE(33);
       END_STATE();
     case 35:
-      if (lookahead == '}') ADVANCE(130);
-      if (lookahead != 0) ADVANCE(35);
+      if (('0' <= lookahead && lookahead <= '9') ||
+          ('A' <= lookahead && lookahead <= 'F') ||
+          ('a' <= lookahead && lookahead <= 'f')) ADVANCE(117);
       END_STATE();
     case 36:
-      if (lookahead == '}') ADVANCE(129);
+      if (('0' <= lookahead && lookahead <= '9') ||
+          ('A' <= lookahead && lookahead <= 'F') ||
+          ('a' <= lookahead && lookahead <= 'f')) ADVANCE(105);
       END_STATE();
     case 37:
-      if (lookahead == '+' ||
-          lookahead == '-') ADVANCE(40);
-      if (('0' <= lookahead && lookahead <= '9')) ADVANCE(145);
+      if (('0' <= lookahead && lookahead <= '9') ||
+          ('A' <= lookahead && lookahead <= 'F') ||
+          ('a' <= lookahead && lookahead <= 'f')) ADVANCE(36);
       END_STATE();
     case 38:
-      if (lookahead == '0' ||
-          lookahead == '1') ADVANCE(140);
+      if (('0' <= lookahead && lookahead <= '9') ||
+          ('A' <= lookahead && lookahead <= 'F') ||
+          ('a' <= lookahead && lookahead <= 'f')) ADVANCE(37);
       END_STATE();
     case 39:
-      if (('0' <= lookahead && lookahead <= '7')) ADVANCE(141);
+      if (('0' <= lookahead && lookahead <= '9') ||
+          ('A' <= lookahead && lookahead <= 'F') ||
+          ('a' <= lookahead && lookahead <= 'f')) ADVANCE(38);
       END_STATE();
     case 40:
-      if (('0' <= lookahead && lookahead <= '9')) ADVANCE(145);
+      if (('0' <= lookahead && lookahead <= '9') ||
+          ('A' <= lookahead && lookahead <= 'F') ||
+          ('a' <= lookahead && lookahead <= 'f')) ADVANCE(39);
       END_STATE();
     case 41:
-      if (('0' <= lookahead && lookahead <= '9')) ADVANCE(130);
+      if (('0' <= lookahead && lookahead <= '9') ||
+          ('A' <= lookahead && lookahead <= 'F') ||
+          ('a' <= lookahead && lookahead <= 'f')) ADVANCE(40);
       END_STATE();
     case 42:
-      if (('0' <= lookahead && lookahead <= '9')) ADVANCE(41);
+      if (('0' <= lookahead && lookahead <= '9') ||
+          ('A' <= lookahead && lookahead <= 'F') ||
+          ('a' <= lookahead && lookahead <= 'f')) ADVANCE(41);
       END_STATE();
     case 43:
       if (('0' <= lookahead && lookahead <= '9') ||
           ('A' <= lookahead && lookahead <= 'F') ||
-          ('a' <= lookahead && lookahead <= 'f')) ADVANCE(142);
+          ('a' <= lookahead && lookahead <= 'f')) ADVANCE(42);
       END_STATE();
     case 44:
-      if (('0' <= lookahead && lookahead <= '9') ||
-          ('A' <= lookahead && lookahead <= 'F') ||
-          ('a' <= lookahead && lookahead <= 'f')) ADVANCE(130);
+      if (lookahead != 0 &&
+          lookahead != '}') ADVANCE(27);
       END_STATE();
     case 45:
-      if (('0' <= lookahead && lookahead <= '9') ||
-          ('A' <= lookahead && lookahead <= 'F') ||
-          ('a' <= lookahead && lookahead <= 'f')) ADVANCE(44);
+      if (eof) ADVANCE(51);
+      if (lookahead == '\n') SKIP(49)
       END_STATE();
     case 46:
-      if (('0' <= lookahead && lookahead <= '9') ||
-          ('A' <= lookahead && lookahead <= 'F') ||
-          ('a' <= lookahead && lookahead <= 'f')) ADVANCE(45);
+      if (eof) ADVANCE(51);
+      if (lookahead == '\n') SKIP(49)
+      if (lookahead == '\r') SKIP(45)
       END_STATE();
     case 47:
-      if (('0' <= lookahead && lookahead <= '9') ||
-          ('A' <= lookahead && lookahead <= 'F') ||
-          ('a' <= lookahead && lookahead <= 'f')) ADVANCE(46);
+      if (eof) ADVANCE(51);
+      if (lookahead == '\n') SKIP(50)
       END_STATE();
     case 48:
-      if (('0' <= lookahead && lookahead <= '9') ||
-          ('A' <= lookahead && lookahead <= 'F') ||
-          ('a' <= lookahead && lookahead <= 'f')) ADVANCE(47);
+      if (eof) ADVANCE(51);
+      if (lookahead == '\n') SKIP(50)
+      if (lookahead == '\r') SKIP(47)
       END_STATE();
     case 49:
-      if (('0' <= lookahead && lookahead <= '9') ||
-          ('A' <= lookahead && lookahead <= 'F') ||
-          ('a' <= lookahead && lookahead <= 'f')) ADVANCE(48);
+      if (eof) ADVANCE(51);
+      if (lookahead == '!') ADVANCE(21);
+      if (lookahead == '#') ADVANCE(124);
+      if (lookahead == '%') ADVANCE(75);
+      if (lookahead == '&') ADVANCE(77);
+      if (lookahead == '(') ADVANCE(54);
+      if (lookahead == ')') ADVANCE(55);
+      if (lookahead == '*') ADVANCE(57);
+      if (lookahead == '+') ADVANCE(65);
+      if (lookahead == ',') ADVANCE(56);
+      if (lookahead == '-') ADVANCE(64);
+      if (lookahead == '.') ADVANCE(53);
+      if (lookahead == '/') ADVANCE(74);
+      if (lookahead == '0') ADVANCE(113);
+      if (lookahead == ':') ADVANCE(61);
+      if (lookahead == ';') ADVANCE(125);
+      if (lookahead == '<') ADVANCE(81);
+      if (lookahead == '=') ADVANCE(71);
+      if (lookahead == '>') ADVANCE(86);
+      if (lookahead == '@') ADVANCE(73);
+      if (lookahead == '[') ADVANCE(66);
+      if (lookahead == '\\') SKIP(46)
+      if (lookahead == ']') ADVANCE(67);
+      if (lookahead == '^') ADVANCE(78);
+      if (lookahead == '{') ADVANCE(68);
+      if (lookahead == '|') ADVANCE(62);
+      if (lookahead == '}') ADVANCE(69);
+      if (lookahead == '~') ADVANCE(80);
+      if (lookahead == '\t' ||
+          lookahead == '\n' ||
+          lookahead == '\f' ||
+          lookahead == '\r' ||
+          lookahead == ' ' ||
+          lookahead == 8203 ||
+          lookahead == 8288 ||
+          lookahead == 65279) SKIP(49)
+      if (('1' <= lookahead && lookahead <= '9')) ADVANCE(112);
+      if (sym_identifier_character_set_1(lookahead)) ADVANCE(123);
       END_STATE();
     case 50:
-      if (('0' <= lookahead && lookahead <= '9') ||
-          ('A' <= lookahead && lookahead <= 'F') ||
-          ('a' <= lookahead && lookahead <= 'f')) ADVANCE(49);
+      if (eof) ADVANCE(51);
+      if (lookahead == '!') ADVANCE(21);
+      if (lookahead == '#') ADVANCE(124);
+      if (lookahead == '%') ADVANCE(75);
+      if (lookahead == '&') ADVANCE(77);
+      if (lookahead == '(') ADVANCE(54);
+      if (lookahead == ')') ADVANCE(55);
+      if (lookahead == '*') ADVANCE(57);
+      if (lookahead == '+') ADVANCE(65);
+      if (lookahead == ',') ADVANCE(56);
+      if (lookahead == '-') ADVANCE(63);
+      if (lookahead == '.') ADVANCE(53);
+      if (lookahead == '/') ADVANCE(74);
+      if (lookahead == '0') ADVANCE(113);
+      if (lookahead == ':') ADVANCE(61);
+      if (lookahead == ';') ADVANCE(125);
+      if (lookahead == '<') ADVANCE(81);
+      if (lookahead == '=') ADVANCE(71);
+      if (lookahead == '>') ADVANCE(86);
+      if (lookahead == '@') ADVANCE(73);
+      if (lookahead == '[') ADVANCE(66);
+      if (lookahead == '\\') SKIP(48)
+      if (lookahead == ']') ADVANCE(67);
+      if (lookahead == '^') ADVANCE(78);
+      if (lookahead == '{') ADVANCE(68);
+      if (lookahead == '|') ADVANCE(62);
+      if (lookahead == '}') ADVANCE(69);
+      if (lookahead == '~') ADVANCE(80);
+      if (lookahead == '\t' ||
+          lookahead == '\n' ||
+          lookahead == '\f' ||
+          lookahead == '\r' ||
+          lookahead == ' ' ||
+          lookahead == 8203 ||
+          lookahead == 8288 ||
+          lookahead == 65279) SKIP(50)
+      if (('1' <= lookahead && lookahead <= '9')) ADVANCE(112);
+      if (sym_identifier_character_set_1(lookahead)) ADVANCE(123);
       END_STATE();
     case 51:
-      if (('0' <= lookahead && lookahead <= '9') ||
-          ('A' <= lookahead && lookahead <= 'F') ||
-          ('a' <= lookahead && lookahead <= 'f')) ADVANCE(50);
-      END_STATE();
-    case 52:
-      if (lookahead != 0 &&
-          lookahead != '}') ADVANCE(35);
-      END_STATE();
-    case 53:
-      if (eof) ADVANCE(65);
-      if (lookahead == '\n') SKIP(61)
-      END_STATE();
-    case 54:
-      if (eof) ADVANCE(65);
-      if (lookahead == '\n') SKIP(61)
-      if (lookahead == '\r') SKIP(53)
-      END_STATE();
-    case 55:
-      if (eof) ADVANCE(65);
-      if (lookahead == '\n') SKIP(62)
-      END_STATE();
-    case 56:
-      if (eof) ADVANCE(65);
-      if (lookahead == '\n') SKIP(62)
-      if (lookahead == '\r') SKIP(55)
-      END_STATE();
-    case 57:
-      if (eof) ADVANCE(65);
-      if (lookahead == '\n') SKIP(63)
-      END_STATE();
-    case 58:
-      if (eof) ADVANCE(65);
-      if (lookahead == '\n') SKIP(63)
-      if (lookahead == '\r') SKIP(57)
-      END_STATE();
-    case 59:
-      if (eof) ADVANCE(65);
-      if (lookahead == '\n') SKIP(64)
-      END_STATE();
-    case 60:
-      if (eof) ADVANCE(65);
-      if (lookahead == '\n') SKIP(64)
-      if (lookahead == '\r') SKIP(59)
-      END_STATE();
-    case 61:
-      if (eof) ADVANCE(65);
-      if (lookahead == '!') ADVANCE(22);
-      if (lookahead == '#') ADVANCE(165);
-      if (lookahead == '%') ADVANCE(98);
-      if (lookahead == '&') ADVANCE(100);
-      if (lookahead == '(') ADVANCE(68);
-      if (lookahead == ')') ADVANCE(69);
-      if (lookahead == '*') ADVANCE(71);
-      if (lookahead == '+') ADVANCE(85);
-      if (lookahead == ',') ADVANCE(70);
-      if (lookahead == '-') ADVANCE(83);
-      if (lookahead == '.') ADVANCE(67);
-      if (lookahead == '/') ADVANCE(96);
-      if (lookahead == '0') ADVANCE(138);
-      if (lookahead == ':') ADVANCE(76);
-      if (lookahead == ';') ADVANCE(166);
-      if (lookahead == '<') ADVANCE(104);
-      if (lookahead == '=') ADVANCE(92);
-      if (lookahead == '>') ADVANCE(110);
-      if (lookahead == '@') ADVANCE(95);
-      if (lookahead == '[') ADVANCE(86);
-      if (lookahead == '\\') SKIP(54)
-      if (lookahead == ']') ADVANCE(87);
-      if (lookahead == '^') ADVANCE(101);
-      if (lookahead == 'e') ADVANCE(161);
-      if (lookahead == '{') ADVANCE(88);
-      if (lookahead == '|') ADVANCE(80);
-      if (lookahead == '}') ADVANCE(89);
-      if (lookahead == '~') ADVANCE(103);
-      if (lookahead == '\t' ||
-          lookahead == '\n' ||
-          lookahead == '\f' ||
-          lookahead == '\r' ||
-          lookahead == ' ' ||
-          lookahead == 8203 ||
-          lookahead == 8288 ||
-          lookahead == 65279) SKIP(61)
-      if (('1' <= lookahead && lookahead <= '9')) ADVANCE(137);
-      if (sym_identifier_character_set_1(lookahead)) ADVANCE(164);
-      END_STATE();
-    case 62:
-      if (eof) ADVANCE(65);
-      if (lookahead == '!') ADVANCE(22);
-      if (lookahead == '#') ADVANCE(165);
-      if (lookahead == '%') ADVANCE(98);
-      if (lookahead == '&') ADVANCE(100);
-      if (lookahead == '(') ADVANCE(68);
-      if (lookahead == ')') ADVANCE(69);
-      if (lookahead == '*') ADVANCE(71);
-      if (lookahead == '+') ADVANCE(85);
-      if (lookahead == ',') ADVANCE(70);
-      if (lookahead == '-') ADVANCE(82);
-      if (lookahead == '.') ADVANCE(67);
-      if (lookahead == '/') ADVANCE(96);
-      if (lookahead == '0') ADVANCE(138);
-      if (lookahead == ':') ADVANCE(76);
-      if (lookahead == ';') ADVANCE(166);
-      if (lookahead == '<') ADVANCE(104);
-      if (lookahead == '=') ADVANCE(92);
-      if (lookahead == '>') ADVANCE(110);
-      if (lookahead == '@') ADVANCE(95);
-      if (lookahead == '[') ADVANCE(86);
-      if (lookahead == '\\') SKIP(56)
-      if (lookahead == ']') ADVANCE(87);
-      if (lookahead == '^') ADVANCE(101);
-      if (lookahead == '{') ADVANCE(88);
-      if (lookahead == '|') ADVANCE(80);
-      if (lookahead == '}') ADVANCE(89);
-      if (lookahead == '~') ADVANCE(103);
-      if (lookahead == '\t' ||
-          lookahead == '\n' ||
-          lookahead == '\f' ||
-          lookahead == '\r' ||
-          lookahead == ' ' ||
-          lookahead == 8203 ||
-          lookahead == 8288 ||
-          lookahead == 65279) SKIP(62)
-      if (('1' <= lookahead && lookahead <= '9')) ADVANCE(137);
-      if (sym_identifier_character_set_1(lookahead)) ADVANCE(164);
-      END_STATE();
-    case 63:
-      if (eof) ADVANCE(65);
-      if (lookahead == '#') ADVANCE(165);
-      if (lookahead == '(') ADVANCE(68);
-      if (lookahead == '*') ADVANCE(72);
-      if (lookahead == '+') ADVANCE(84);
-      if (lookahead == '-') ADVANCE(81);
-      if (lookahead == '.') ADVANCE(20);
-      if (lookahead == '0') ADVANCE(138);
-      if (lookahead == '@') ADVANCE(94);
-      if (lookahead == '[') ADVANCE(86);
-      if (lookahead == '\\') SKIP(58)
-      if (lookahead == 'e') ADVANCE(162);
-      if (lookahead == '{') ADVANCE(88);
-      if (lookahead == '~') ADVANCE(103);
-      if (lookahead == '\t' ||
-          lookahead == '\n' ||
-          lookahead == '\f' ||
-          lookahead == '\r' ||
-          lookahead == ' ' ||
-          lookahead == 8203 ||
-          lookahead == 8288 ||
-          lookahead == 65279) SKIP(63)
-      if (('1' <= lookahead && lookahead <= '9')) ADVANCE(137);
-      if (sym_identifier_character_set_2(lookahead)) ADVANCE(164);
-      END_STATE();
-    case 64:
-      if (eof) ADVANCE(65);
-      if (lookahead == '#') ADVANCE(165);
-      if (lookahead == '(') ADVANCE(68);
-      if (lookahead == '*') ADVANCE(72);
-      if (lookahead == '+') ADVANCE(84);
-      if (lookahead == '-') ADVANCE(81);
-      if (lookahead == '.') ADVANCE(20);
-      if (lookahead == '0') ADVANCE(138);
-      if (lookahead == '@') ADVANCE(94);
-      if (lookahead == '[') ADVANCE(86);
-      if (lookahead == '\\') SKIP(60)
-      if (lookahead == 'e') ADVANCE(163);
-      if (lookahead == '{') ADVANCE(88);
-      if (lookahead == '~') ADVANCE(103);
-      if (lookahead == '\t' ||
-          lookahead == '\n' ||
-          lookahead == '\f' ||
-          lookahead == '\r' ||
-          lookahead == ' ' ||
-          lookahead == 8203 ||
-          lookahead == 8288 ||
-          lookahead == 65279) SKIP(64)
-      if (('1' <= lookahead && lookahead <= '9')) ADVANCE(137);
-      if (sym_identifier_character_set_2(lookahead)) ADVANCE(164);
-      END_STATE();
-    case 65:
       ACCEPT_TOKEN(ts_builtin_sym_end);
       END_STATE();
-    case 66:
+    case 52:
       ACCEPT_TOKEN(anon_sym_DOT);
       END_STATE();
-    case 67:
+    case 53:
       ACCEPT_TOKEN(anon_sym_DOT);
-      if (lookahead == '.') ADVANCE(21);
-      if (('0' <= lookahead && lookahead <= '9')) ADVANCE(144);
+      if (lookahead == '.') ADVANCE(20);
+      if (('0' <= lookahead && lookahead <= '9')) ADVANCE(119);
       END_STATE();
-    case 68:
+    case 54:
       ACCEPT_TOKEN(anon_sym_LPAREN);
       END_STATE();
-    case 69:
+    case 55:
       ACCEPT_TOKEN(anon_sym_RPAREN);
       END_STATE();
-    case 70:
+    case 56:
       ACCEPT_TOKEN(anon_sym_COMMA);
       END_STATE();
-    case 71:
+    case 57:
       ACCEPT_TOKEN(anon_sym_STAR);
-      if (lookahead == '*') ADVANCE(91);
-      if (lookahead == '=') ADVANCE(115);
+      if (lookahead == '*') ADVANCE(70);
+      if (lookahead == '=') ADVANCE(90);
       END_STATE();
-    case 72:
-      ACCEPT_TOKEN(anon_sym_STAR);
-      if (lookahead == '*') ADVANCE(90);
-      END_STATE();
-    case 73:
+    case 58:
       ACCEPT_TOKEN(anon_sym_GT_GT);
-      if (lookahead == '=') ADVANCE(121);
+      if (lookahead == '=') ADVANCE(96);
       END_STATE();
-    case 74:
+    case 59:
       ACCEPT_TOKEN(anon_sym_COLON_EQ);
       END_STATE();
-    case 75:
+    case 60:
       ACCEPT_TOKEN(anon_sym_COLON);
       END_STATE();
-    case 76:
+    case 61:
       ACCEPT_TOKEN(anon_sym_COLON);
-      if (lookahead == '=') ADVANCE(74);
+      if (lookahead == '=') ADVANCE(59);
       END_STATE();
-    case 77:
-      ACCEPT_TOKEN(anon_sym_except);
-      if (lookahead == '*') ADVANCE(79);
-      if (sym_identifier_character_set_3(lookahead)) ADVANCE(164);
-      END_STATE();
-    case 78:
-      ACCEPT_TOKEN(anon_sym_except);
-      if (sym_identifier_character_set_3(lookahead)) ADVANCE(164);
-      END_STATE();
-    case 79:
-      ACCEPT_TOKEN(anon_sym_except_STAR);
-      END_STATE();
-    case 80:
+    case 62:
       ACCEPT_TOKEN(anon_sym_PIPE);
-      if (lookahead == '=') ADVANCE(125);
+      if (lookahead == '=') ADVANCE(100);
       END_STATE();
-    case 81:
+    case 63:
       ACCEPT_TOKEN(anon_sym_DASH);
+      if (lookahead == '=') ADVANCE(89);
       END_STATE();
-    case 82:
+    case 64:
       ACCEPT_TOKEN(anon_sym_DASH);
-      if (lookahead == '=') ADVANCE(114);
+      if (lookahead == '=') ADVANCE(89);
+      if (lookahead == '>') ADVANCE(72);
       END_STATE();
-    case 83:
-      ACCEPT_TOKEN(anon_sym_DASH);
-      if (lookahead == '=') ADVANCE(114);
-      if (lookahead == '>') ADVANCE(93);
-      END_STATE();
-    case 84:
+    case 65:
       ACCEPT_TOKEN(anon_sym_PLUS);
+      if (lookahead == '=') ADVANCE(88);
       END_STATE();
-    case 85:
-      ACCEPT_TOKEN(anon_sym_PLUS);
-      if (lookahead == '=') ADVANCE(113);
-      END_STATE();
-    case 86:
+    case 66:
       ACCEPT_TOKEN(anon_sym_LBRACK);
       END_STATE();
-    case 87:
+    case 67:
       ACCEPT_TOKEN(anon_sym_RBRACK);
       END_STATE();
-    case 88:
+    case 68:
       ACCEPT_TOKEN(anon_sym_LBRACE);
       END_STATE();
-    case 89:
+    case 69:
       ACCEPT_TOKEN(anon_sym_RBRACE);
       END_STATE();
-    case 90:
+    case 70:
       ACCEPT_TOKEN(anon_sym_STAR_STAR);
+      if (lookahead == '=') ADVANCE(95);
       END_STATE();
-    case 91:
-      ACCEPT_TOKEN(anon_sym_STAR_STAR);
-      if (lookahead == '=') ADVANCE(120);
-      END_STATE();
-    case 92:
+    case 71:
       ACCEPT_TOKEN(anon_sym_EQ);
-      if (lookahead == '=') ADVANCE(107);
+      if (lookahead == '=') ADVANCE(83);
       END_STATE();
-    case 93:
+    case 72:
       ACCEPT_TOKEN(anon_sym_DASH_GT);
       END_STATE();
-    case 94:
+    case 73:
       ACCEPT_TOKEN(anon_sym_AT);
+      if (lookahead == '=') ADVANCE(92);
       END_STATE();
-    case 95:
-      ACCEPT_TOKEN(anon_sym_AT);
-      if (lookahead == '=') ADVANCE(117);
-      END_STATE();
-    case 96:
+    case 74:
       ACCEPT_TOKEN(anon_sym_SLASH);
-      if (lookahead == '/') ADVANCE(99);
-      if (lookahead == '=') ADVANCE(116);
+      if (lookahead == '/') ADVANCE(76);
+      if (lookahead == '=') ADVANCE(91);
       END_STATE();
-    case 97:
-      ACCEPT_TOKEN(anon_sym_SLASH);
-      if (lookahead == '/') ADVANCE(27);
-      if (lookahead == '=') ADVANCE(116);
-      END_STATE();
-    case 98:
+    case 75:
       ACCEPT_TOKEN(anon_sym_PERCENT);
-      if (lookahead == '=') ADVANCE(119);
+      if (lookahead == '=') ADVANCE(94);
       END_STATE();
-    case 99:
+    case 76:
       ACCEPT_TOKEN(anon_sym_SLASH_SLASH);
-      if (lookahead == '=') ADVANCE(118);
+      if (lookahead == '=') ADVANCE(93);
       END_STATE();
-    case 100:
+    case 77:
       ACCEPT_TOKEN(anon_sym_AMP);
-      if (lookahead == '=') ADVANCE(123);
+      if (lookahead == '=') ADVANCE(98);
       END_STATE();
-    case 101:
+    case 78:
       ACCEPT_TOKEN(anon_sym_CARET);
-      if (lookahead == '=') ADVANCE(124);
+      if (lookahead == '=') ADVANCE(99);
       END_STATE();
-    case 102:
+    case 79:
       ACCEPT_TOKEN(anon_sym_LT_LT);
-      if (lookahead == '=') ADVANCE(122);
+      if (lookahead == '=') ADVANCE(97);
       END_STATE();
-    case 103:
+    case 80:
       ACCEPT_TOKEN(anon_sym_TILDE);
       END_STATE();
-    case 104:
+    case 81:
       ACCEPT_TOKEN(anon_sym_LT);
-      if (lookahead == '<') ADVANCE(102);
-      if (lookahead == '=') ADVANCE(106);
-      if (lookahead == '>') ADVANCE(112);
+      if (lookahead == '<') ADVANCE(79);
+      if (lookahead == '=') ADVANCE(82);
+      if (lookahead == '>') ADVANCE(87);
       END_STATE();
-    case 105:
-      ACCEPT_TOKEN(anon_sym_LT);
-      if (lookahead == '<') ADVANCE(28);
-      if (lookahead == '=') ADVANCE(106);
-      if (lookahead == '>') ADVANCE(112);
-      END_STATE();
-    case 106:
+    case 82:
       ACCEPT_TOKEN(anon_sym_LT_EQ);
       END_STATE();
-    case 107:
+    case 83:
       ACCEPT_TOKEN(anon_sym_EQ_EQ);
       END_STATE();
-    case 108:
+    case 84:
       ACCEPT_TOKEN(anon_sym_BANG_EQ);
       END_STATE();
-    case 109:
+    case 85:
       ACCEPT_TOKEN(anon_sym_GT_EQ);
       END_STATE();
-    case 110:
+    case 86:
       ACCEPT_TOKEN(anon_sym_GT);
-      if (lookahead == '=') ADVANCE(109);
-      if (lookahead == '>') ADVANCE(73);
+      if (lookahead == '=') ADVANCE(85);
+      if (lookahead == '>') ADVANCE(58);
       END_STATE();
-    case 111:
-      ACCEPT_TOKEN(anon_sym_GT);
-      if (lookahead == '=') ADVANCE(109);
-      if (lookahead == '>') ADVANCE(29);
-      END_STATE();
-    case 112:
+    case 87:
       ACCEPT_TOKEN(anon_sym_LT_GT);
       END_STATE();
-    case 113:
+    case 88:
       ACCEPT_TOKEN(anon_sym_PLUS_EQ);
       END_STATE();
-    case 114:
+    case 89:
       ACCEPT_TOKEN(anon_sym_DASH_EQ);
       END_STATE();
-    case 115:
+    case 90:
       ACCEPT_TOKEN(anon_sym_STAR_EQ);
       END_STATE();
-    case 116:
+    case 91:
       ACCEPT_TOKEN(anon_sym_SLASH_EQ);
       END_STATE();
-    case 117:
+    case 92:
       ACCEPT_TOKEN(anon_sym_AT_EQ);
       END_STATE();
-    case 118:
+    case 93:
       ACCEPT_TOKEN(anon_sym_SLASH_SLASH_EQ);
       END_STATE();
-    case 119:
+    case 94:
       ACCEPT_TOKEN(anon_sym_PERCENT_EQ);
       END_STATE();
-    case 120:
+    case 95:
       ACCEPT_TOKEN(anon_sym_STAR_STAR_EQ);
       END_STATE();
-    case 121:
+    case 96:
       ACCEPT_TOKEN(anon_sym_GT_GT_EQ);
       END_STATE();
-    case 122:
+    case 97:
       ACCEPT_TOKEN(anon_sym_LT_LT_EQ);
       END_STATE();
-    case 123:
+    case 98:
       ACCEPT_TOKEN(anon_sym_AMP_EQ);
       END_STATE();
-    case 124:
+    case 99:
       ACCEPT_TOKEN(anon_sym_CARET_EQ);
       END_STATE();
-    case 125:
+    case 100:
       ACCEPT_TOKEN(anon_sym_PIPE_EQ);
       END_STATE();
-    case 126:
+    case 101:
       ACCEPT_TOKEN(sym_ellipsis);
       END_STATE();
-    case 127:
+    case 102:
       ACCEPT_TOKEN(anon_sym_LBRACE2);
       END_STATE();
-    case 128:
+    case 103:
       ACCEPT_TOKEN(anon_sym_LBRACE2);
-      if (lookahead == '{') ADVANCE(129);
+      if (lookahead == '{') ADVANCE(104);
       END_STATE();
-    case 129:
+    case 104:
       ACCEPT_TOKEN(sym__escape_interpolation);
       END_STATE();
-    case 130:
+    case 105:
       ACCEPT_TOKEN(sym_escape_sequence);
       END_STATE();
-    case 131:
+    case 106:
       ACCEPT_TOKEN(sym__not_escape_sequence);
-      if (lookahead == '\n') ADVANCE(130);
+      if (lookahead == '\n') ADVANCE(105);
       if (lookahead == '\r') ADVANCE(7);
-      if (lookahead == 'N') ADVANCE(34);
-      if (lookahead == 'U') ADVANCE(51);
-      if (lookahead == 'u') ADVANCE(47);
-      if (lookahead == 'x') ADVANCE(45);
+      if (lookahead == 'N') ADVANCE(26);
+      if (lookahead == 'U') ADVANCE(43);
+      if (lookahead == 'u') ADVANCE(39);
+      if (lookahead == 'x') ADVANCE(37);
       if (lookahead == '"' ||
           lookahead == '\'' ||
           lookahead == '\\' ||
@@ -7908,242 +5375,162 @@ static bool ts_lex(TSLexer *lexer, TSStateId state) {
           lookahead == 'f' ||
           lookahead == 'n' ||
           lookahead == 'r' ||
-          ('t' <= lookahead && lookahead <= 'v')) ADVANCE(130);
-      if (('0' <= lookahead && lookahead <= '9')) ADVANCE(42);
+          ('t' <= lookahead && lookahead <= 'v')) ADVANCE(105);
+      if (('0' <= lookahead && lookahead <= '9')) ADVANCE(34);
       END_STATE();
-    case 132:
+    case 107:
       ACCEPT_TOKEN(aux_sym_format_specifier_token1);
-      if (lookahead == '\r') ADVANCE(134);
+      if (lookahead == '\r') ADVANCE(109);
       if (lookahead != 0 &&
           lookahead != '\n' &&
           lookahead != '{' &&
-          lookahead != '}') ADVANCE(134);
+          lookahead != '}') ADVANCE(109);
       END_STATE();
-    case 133:
+    case 108:
       ACCEPT_TOKEN(aux_sym_format_specifier_token1);
-      if (lookahead == '#') ADVANCE(134);
-      if (lookahead == '\\') ADVANCE(132);
+      if (lookahead == '#') ADVANCE(109);
+      if (lookahead == '\\') ADVANCE(107);
       if (lookahead == '\t' ||
           lookahead == '\f' ||
           lookahead == '\r' ||
           lookahead == ' ' ||
           lookahead == 8203 ||
           lookahead == 8288 ||
-          lookahead == 65279) ADVANCE(133);
+          lookahead == 65279) ADVANCE(108);
       if (lookahead != 0 &&
           lookahead != '\n' &&
           lookahead != '{' &&
-          lookahead != '}') ADVANCE(134);
+          lookahead != '}') ADVANCE(109);
       END_STATE();
-    case 134:
+    case 109:
       ACCEPT_TOKEN(aux_sym_format_specifier_token1);
       if (lookahead != 0 &&
           lookahead != '\n' &&
           lookahead != '{' &&
-          lookahead != '}') ADVANCE(134);
+          lookahead != '}') ADVANCE(109);
       END_STATE();
-    case 135:
+    case 110:
       ACCEPT_TOKEN(sym_type_conversion);
       END_STATE();
-    case 136:
+    case 111:
       ACCEPT_TOKEN(sym_integer);
       END_STATE();
-    case 137:
+    case 112:
       ACCEPT_TOKEN(sym_integer);
-      if (lookahead == '.') ADVANCE(146);
-      if (lookahead == '_') ADVANCE(139);
+      if (lookahead == '.') ADVANCE(121);
+      if (lookahead == '_') ADVANCE(114);
       if (lookahead == 'E' ||
-          lookahead == 'e') ADVANCE(37);
+          lookahead == 'e') ADVANCE(29);
       if (lookahead == 'J' ||
           lookahead == 'L' ||
           lookahead == 'j' ||
-          lookahead == 'l') ADVANCE(136);
-      if (('0' <= lookahead && lookahead <= '9')) ADVANCE(137);
+          lookahead == 'l') ADVANCE(111);
+      if (('0' <= lookahead && lookahead <= '9')) ADVANCE(112);
       END_STATE();
-    case 138:
+    case 113:
       ACCEPT_TOKEN(sym_integer);
-      if (lookahead == '.') ADVANCE(146);
+      if (lookahead == '.') ADVANCE(121);
       if (lookahead == 'B' ||
-          lookahead == 'b') ADVANCE(31);
+          lookahead == 'b') ADVANCE(23);
       if (lookahead == 'O' ||
-          lookahead == 'o') ADVANCE(32);
+          lookahead == 'o') ADVANCE(24);
       if (lookahead == 'X' ||
-          lookahead == 'x') ADVANCE(33);
-      if (lookahead == '_') ADVANCE(139);
+          lookahead == 'x') ADVANCE(25);
+      if (lookahead == '_') ADVANCE(114);
       if (lookahead == 'E' ||
-          lookahead == 'e') ADVANCE(37);
+          lookahead == 'e') ADVANCE(29);
       if (lookahead == 'J' ||
           lookahead == 'L' ||
           lookahead == 'j' ||
-          lookahead == 'l') ADVANCE(136);
-      if (('0' <= lookahead && lookahead <= '9')) ADVANCE(137);
+          lookahead == 'l') ADVANCE(111);
+      if (('0' <= lookahead && lookahead <= '9')) ADVANCE(112);
       END_STATE();
-    case 139:
+    case 114:
       ACCEPT_TOKEN(sym_integer);
-      if (lookahead == '.') ADVANCE(146);
+      if (lookahead == '.') ADVANCE(121);
       if (lookahead == 'E' ||
-          lookahead == 'e') ADVANCE(37);
+          lookahead == 'e') ADVANCE(29);
       if (lookahead == 'J' ||
           lookahead == 'L' ||
           lookahead == 'j' ||
-          lookahead == 'l') ADVANCE(136);
-      if (('0' <= lookahead && lookahead <= '9')) ADVANCE(137);
+          lookahead == 'l') ADVANCE(111);
+      if (('0' <= lookahead && lookahead <= '9')) ADVANCE(112);
       END_STATE();
-    case 140:
+    case 115:
       ACCEPT_TOKEN(sym_integer);
-      if (lookahead == '_') ADVANCE(38);
+      if (lookahead == '_') ADVANCE(30);
       if (lookahead == 'L' ||
-          lookahead == 'l') ADVANCE(136);
+          lookahead == 'l') ADVANCE(111);
       if (lookahead == '0' ||
-          lookahead == '1') ADVANCE(140);
+          lookahead == '1') ADVANCE(115);
       END_STATE();
-    case 141:
+    case 116:
       ACCEPT_TOKEN(sym_integer);
-      if (lookahead == '_') ADVANCE(39);
+      if (lookahead == '_') ADVANCE(31);
       if (lookahead == 'L' ||
-          lookahead == 'l') ADVANCE(136);
-      if (('0' <= lookahead && lookahead <= '7')) ADVANCE(141);
+          lookahead == 'l') ADVANCE(111);
+      if (('0' <= lookahead && lookahead <= '7')) ADVANCE(116);
       END_STATE();
-    case 142:
+    case 117:
       ACCEPT_TOKEN(sym_integer);
-      if (lookahead == '_') ADVANCE(43);
+      if (lookahead == '_') ADVANCE(35);
       if (lookahead == 'L' ||
-          lookahead == 'l') ADVANCE(136);
+          lookahead == 'l') ADVANCE(111);
       if (('0' <= lookahead && lookahead <= '9') ||
           ('A' <= lookahead && lookahead <= 'F') ||
-          ('a' <= lookahead && lookahead <= 'f')) ADVANCE(142);
+          ('a' <= lookahead && lookahead <= 'f')) ADVANCE(117);
       END_STATE();
-    case 143:
+    case 118:
       ACCEPT_TOKEN(sym_float);
       END_STATE();
-    case 144:
+    case 119:
       ACCEPT_TOKEN(sym_float);
-      if (lookahead == '_') ADVANCE(146);
+      if (lookahead == '_') ADVANCE(121);
       if (lookahead == 'E' ||
-          lookahead == 'e') ADVANCE(37);
+          lookahead == 'e') ADVANCE(29);
       if (lookahead == 'J' ||
           lookahead == 'L' ||
           lookahead == 'j' ||
-          lookahead == 'l') ADVANCE(143);
-      if (('0' <= lookahead && lookahead <= '9')) ADVANCE(144);
+          lookahead == 'l') ADVANCE(118);
+      if (('0' <= lookahead && lookahead <= '9')) ADVANCE(119);
       END_STATE();
-    case 145:
+    case 120:
       ACCEPT_TOKEN(sym_float);
-      if (lookahead == '_') ADVANCE(147);
+      if (lookahead == '_') ADVANCE(122);
       if (lookahead == 'J' ||
           lookahead == 'L' ||
           lookahead == 'j' ||
-          lookahead == 'l') ADVANCE(143);
-      if (('0' <= lookahead && lookahead <= '9')) ADVANCE(145);
+          lookahead == 'l') ADVANCE(118);
+      if (('0' <= lookahead && lookahead <= '9')) ADVANCE(120);
       END_STATE();
-    case 146:
+    case 121:
       ACCEPT_TOKEN(sym_float);
       if (lookahead == 'E' ||
-          lookahead == 'e') ADVANCE(37);
+          lookahead == 'e') ADVANCE(29);
       if (lookahead == 'J' ||
           lookahead == 'L' ||
           lookahead == 'j' ||
-          lookahead == 'l') ADVANCE(143);
-      if (('0' <= lookahead && lookahead <= '9')) ADVANCE(144);
+          lookahead == 'l') ADVANCE(118);
+      if (('0' <= lookahead && lookahead <= '9')) ADVANCE(119);
       END_STATE();
-    case 147:
+    case 122:
       ACCEPT_TOKEN(sym_float);
       if (lookahead == 'J' ||
           lookahead == 'L' ||
           lookahead == 'j' ||
-          lookahead == 'l') ADVANCE(143);
-      if (('0' <= lookahead && lookahead <= '9')) ADVANCE(145);
+          lookahead == 'l') ADVANCE(118);
+      if (('0' <= lookahead && lookahead <= '9')) ADVANCE(120);
       END_STATE();
-    case 148:
+    case 123:
       ACCEPT_TOKEN(sym_identifier);
-      if (lookahead == '*') ADVANCE(79);
-      if (sym_identifier_character_set_3(lookahead)) ADVANCE(164);
+      if (sym_identifier_character_set_2(lookahead)) ADVANCE(123);
       END_STATE();
-    case 149:
-      ACCEPT_TOKEN(sym_identifier);
-      if (lookahead == 'c') ADVANCE(152);
-      if (sym_identifier_character_set_3(lookahead)) ADVANCE(164);
-      END_STATE();
-    case 150:
-      ACCEPT_TOKEN(sym_identifier);
-      if (lookahead == 'c') ADVANCE(153);
-      if (sym_identifier_character_set_3(lookahead)) ADVANCE(164);
-      END_STATE();
-    case 151:
-      ACCEPT_TOKEN(sym_identifier);
-      if (lookahead == 'c') ADVANCE(154);
-      if (sym_identifier_character_set_3(lookahead)) ADVANCE(164);
-      END_STATE();
-    case 152:
-      ACCEPT_TOKEN(sym_identifier);
-      if (lookahead == 'e') ADVANCE(155);
-      if (sym_identifier_character_set_3(lookahead)) ADVANCE(164);
-      END_STATE();
-    case 153:
-      ACCEPT_TOKEN(sym_identifier);
-      if (lookahead == 'e') ADVANCE(156);
-      if (sym_identifier_character_set_3(lookahead)) ADVANCE(164);
-      END_STATE();
-    case 154:
-      ACCEPT_TOKEN(sym_identifier);
-      if (lookahead == 'e') ADVANCE(157);
-      if (sym_identifier_character_set_3(lookahead)) ADVANCE(164);
-      END_STATE();
-    case 155:
-      ACCEPT_TOKEN(sym_identifier);
-      if (lookahead == 'p') ADVANCE(158);
-      if (sym_identifier_character_set_3(lookahead)) ADVANCE(164);
-      END_STATE();
-    case 156:
-      ACCEPT_TOKEN(sym_identifier);
-      if (lookahead == 'p') ADVANCE(159);
-      if (sym_identifier_character_set_3(lookahead)) ADVANCE(164);
-      END_STATE();
-    case 157:
-      ACCEPT_TOKEN(sym_identifier);
-      if (lookahead == 'p') ADVANCE(160);
-      if (sym_identifier_character_set_3(lookahead)) ADVANCE(164);
-      END_STATE();
-    case 158:
-      ACCEPT_TOKEN(sym_identifier);
-      if (lookahead == 't') ADVANCE(77);
-      if (sym_identifier_character_set_3(lookahead)) ADVANCE(164);
-      END_STATE();
-    case 159:
-      ACCEPT_TOKEN(sym_identifier);
-      if (lookahead == 't') ADVANCE(78);
-      if (sym_identifier_character_set_3(lookahead)) ADVANCE(164);
-      END_STATE();
-    case 160:
-      ACCEPT_TOKEN(sym_identifier);
-      if (lookahead == 't') ADVANCE(148);
-      if (sym_identifier_character_set_3(lookahead)) ADVANCE(164);
-      END_STATE();
-    case 161:
-      ACCEPT_TOKEN(sym_identifier);
-      if (lookahead == 'x') ADVANCE(149);
-      if (sym_identifier_character_set_3(lookahead)) ADVANCE(164);
-      END_STATE();
-    case 162:
-      ACCEPT_TOKEN(sym_identifier);
-      if (lookahead == 'x') ADVANCE(150);
-      if (sym_identifier_character_set_3(lookahead)) ADVANCE(164);
-      END_STATE();
-    case 163:
-      ACCEPT_TOKEN(sym_identifier);
-      if (lookahead == 'x') ADVANCE(151);
-      if (sym_identifier_character_set_3(lookahead)) ADVANCE(164);
-      END_STATE();
-    case 164:
-      ACCEPT_TOKEN(sym_identifier);
-      if (sym_identifier_character_set_3(lookahead)) ADVANCE(164);
-      END_STATE();
-    case 165:
+    case 124:
       ACCEPT_TOKEN(sym_comment);
       if (lookahead != 0 &&
-          lookahead != '\n') ADVANCE(165);
+          lookahead != '\n') ADVANCE(124);
       END_STATE();
-    case 166:
+    case 125:
       ACCEPT_TOKEN(sym__semicolon);
       END_STATE();
     default:
@@ -8316,25 +5703,26 @@ static bool ts_lex_keywords(TSLexer *lexer, TSStateId state) {
       if (lookahead == 's') ADVANCE(74);
       END_STATE();
     case 37:
-      if (lookahead == 'e') ADVANCE(75);
+      if (lookahead == 'c') ADVANCE(75);
+      if (lookahead == 'e') ADVANCE(76);
       END_STATE();
     case 38:
-      if (lookahead == 'n') ADVANCE(76);
+      if (lookahead == 'n') ADVANCE(77);
       END_STATE();
     case 39:
-      if (lookahead == 'r') ADVANCE(77);
+      if (lookahead == 'r') ADVANCE(78);
       END_STATE();
     case 40:
-      if (lookahead == 'o') ADVANCE(78);
+      if (lookahead == 'o') ADVANCE(79);
       END_STATE();
     case 41:
-      if (lookahead == 'o') ADVANCE(79);
+      if (lookahead == 'o') ADVANCE(80);
       END_STATE();
     case 42:
       ACCEPT_TOKEN(anon_sym_if);
       END_STATE();
     case 43:
-      if (lookahead == 'p') ADVANCE(80);
+      if (lookahead == 'p') ADVANCE(81);
       END_STATE();
     case 44:
       ACCEPT_TOKEN(anon_sym_in);
@@ -8343,80 +5731,80 @@ static bool ts_lex_keywords(TSLexer *lexer, TSStateId state) {
       ACCEPT_TOKEN(anon_sym_is);
       END_STATE();
     case 46:
-      if (lookahead == 'm') ADVANCE(81);
+      if (lookahead == 'm') ADVANCE(82);
       END_STATE();
     case 47:
-      if (lookahead == 't') ADVANCE(82);
+      if (lookahead == 't') ADVANCE(83);
       END_STATE();
     case 48:
-      if (lookahead == 'n') ADVANCE(83);
-      if (lookahead == 't') ADVANCE(84);
+      if (lookahead == 'n') ADVANCE(84);
+      if (lookahead == 't') ADVANCE(85);
       END_STATE();
     case 49:
       ACCEPT_TOKEN(anon_sym_or);
       END_STATE();
     case 50:
-      if (lookahead == 's') ADVANCE(85);
+      if (lookahead == 's') ADVANCE(86);
       END_STATE();
     case 51:
-      if (lookahead == 'i') ADVANCE(86);
-      END_STATE();
-    case 52:
       if (lookahead == 'i') ADVANCE(87);
       END_STATE();
+    case 52:
+      if (lookahead == 'i') ADVANCE(88);
+      END_STATE();
     case 53:
-      if (lookahead == 't') ADVANCE(88);
+      if (lookahead == 't') ADVANCE(89);
       END_STATE();
     case 54:
-      if (lookahead == 'y') ADVANCE(89);
+      if (lookahead == 'y') ADVANCE(90);
       END_STATE();
     case 55:
-      if (lookahead == 'p') ADVANCE(90);
+      if (lookahead == 'p') ADVANCE(91);
       END_STATE();
     case 56:
-      if (lookahead == 'i') ADVANCE(91);
+      if (lookahead == 'i') ADVANCE(92);
       END_STATE();
     case 57:
-      if (lookahead == 't') ADVANCE(92);
+      if (lookahead == 't') ADVANCE(93);
       END_STATE();
     case 58:
-      if (lookahead == 'e') ADVANCE(93);
+      if (lookahead == 'e') ADVANCE(94);
       END_STATE();
     case 59:
-      if (lookahead == 's') ADVANCE(94);
+      if (lookahead == 's') ADVANCE(95);
       END_STATE();
     case 60:
-      if (lookahead == 'e') ADVANCE(95);
-      END_STATE();
-    case 61:
       if (lookahead == 'e') ADVANCE(96);
       END_STATE();
+    case 61:
+      if (lookahead == 'e') ADVANCE(97);
+      END_STATE();
     case 62:
-      if (lookahead == 'u') ADVANCE(97);
+      if (lookahead == 'u') ADVANCE(98);
       END_STATE();
     case 63:
       ACCEPT_TOKEN(anon_sym_and);
       END_STATE();
     case 64:
-      if (lookahead == 'e') ADVANCE(98);
+      if (lookahead == 'e') ADVANCE(99);
       END_STATE();
     case 65:
-      if (lookahead == 'n') ADVANCE(99);
+      if (lookahead == 'n') ADVANCE(100);
       END_STATE();
     case 66:
-      if (lookahead == 'i') ADVANCE(100);
+      if (lookahead == 'i') ADVANCE(101);
       END_STATE();
     case 67:
-      if (lookahead == 'a') ADVANCE(101);
+      if (lookahead == 'a') ADVANCE(102);
       END_STATE();
     case 68:
-      if (lookahead == 'e') ADVANCE(102);
+      if (lookahead == 'e') ADVANCE(103);
       END_STATE();
     case 69:
-      if (lookahead == 's') ADVANCE(103);
+      if (lookahead == 's') ADVANCE(104);
       END_STATE();
     case 70:
-      if (lookahead == 't') ADVANCE(104);
+      if (lookahead == 't') ADVANCE(105);
       END_STATE();
     case 71:
       ACCEPT_TOKEN(anon_sym_def);
@@ -8425,264 +5813,276 @@ static bool ts_lex_keywords(TSLexer *lexer, TSStateId state) {
       ACCEPT_TOKEN(anon_sym_del);
       END_STATE();
     case 73:
-      if (lookahead == 'f') ADVANCE(105);
+      if (lookahead == 'f') ADVANCE(106);
       END_STATE();
     case 74:
-      if (lookahead == 'e') ADVANCE(106);
+      if (lookahead == 'e') ADVANCE(107);
       END_STATE();
     case 75:
-      if (lookahead == 'c') ADVANCE(107);
+      if (lookahead == 'e') ADVANCE(108);
       END_STATE();
     case 76:
-      if (lookahead == 'a') ADVANCE(108);
+      if (lookahead == 'c') ADVANCE(109);
       END_STATE();
     case 77:
-      ACCEPT_TOKEN(anon_sym_for);
+      if (lookahead == 'a') ADVANCE(110);
       END_STATE();
     case 78:
-      if (lookahead == 'm') ADVANCE(109);
+      ACCEPT_TOKEN(anon_sym_for);
       END_STATE();
     case 79:
-      if (lookahead == 'b') ADVANCE(110);
+      if (lookahead == 'm') ADVANCE(111);
       END_STATE();
     case 80:
-      if (lookahead == 'o') ADVANCE(111);
-      END_STATE();
-    case 81:
       if (lookahead == 'b') ADVANCE(112);
       END_STATE();
+    case 81:
+      if (lookahead == 'o') ADVANCE(113);
+      END_STATE();
     case 82:
-      if (lookahead == 'c') ADVANCE(113);
+      if (lookahead == 'b') ADVANCE(114);
       END_STATE();
     case 83:
-      if (lookahead == 'l') ADVANCE(114);
+      if (lookahead == 'c') ADVANCE(115);
       END_STATE();
     case 84:
-      ACCEPT_TOKEN(anon_sym_not);
+      if (lookahead == 'l') ADVANCE(116);
       END_STATE();
     case 85:
-      if (lookahead == 's') ADVANCE(115);
+      ACCEPT_TOKEN(anon_sym_not);
       END_STATE();
     case 86:
-      if (lookahead == 'n') ADVANCE(116);
-      END_STATE();
-    case 87:
       if (lookahead == 's') ADVANCE(117);
       END_STATE();
+    case 87:
+      if (lookahead == 'n') ADVANCE(118);
+      END_STATE();
     case 88:
-      if (lookahead == 'u') ADVANCE(118);
+      if (lookahead == 's') ADVANCE(119);
       END_STATE();
     case 89:
-      ACCEPT_TOKEN(anon_sym_try);
+      if (lookahead == 'u') ADVANCE(120);
       END_STATE();
     case 90:
-      if (lookahead == 'e') ADVANCE(119);
+      ACCEPT_TOKEN(anon_sym_try);
       END_STATE();
     case 91:
-      if (lookahead == 'l') ADVANCE(120);
+      if (lookahead == 'e') ADVANCE(121);
       END_STATE();
     case 92:
-      if (lookahead == 'h') ADVANCE(121);
-      END_STATE();
-    case 93:
       if (lookahead == 'l') ADVANCE(122);
       END_STATE();
+    case 93:
+      if (lookahead == 'h') ADVANCE(123);
+      END_STATE();
     case 94:
-      if (lookahead == 'e') ADVANCE(123);
+      if (lookahead == 'l') ADVANCE(124);
       END_STATE();
     case 95:
-      ACCEPT_TOKEN(sym_none);
+      if (lookahead == 'e') ADVANCE(125);
       END_STATE();
     case 96:
-      ACCEPT_TOKEN(sym_true);
+      ACCEPT_TOKEN(sym_none);
       END_STATE();
     case 97:
-      if (lookahead == 't') ADVANCE(124);
+      ACCEPT_TOKEN(sym_true);
       END_STATE();
     case 98:
-      if (lookahead == 'r') ADVANCE(125);
+      if (lookahead == 't') ADVANCE(126);
       END_STATE();
     case 99:
-      if (lookahead == 'c') ADVANCE(126);
+      if (lookahead == 'r') ADVANCE(127);
       END_STATE();
     case 100:
-      if (lookahead == 't') ADVANCE(127);
+      if (lookahead == 'c') ADVANCE(128);
       END_STATE();
     case 101:
-      if (lookahead == 'k') ADVANCE(128);
+      if (lookahead == 't') ADVANCE(129);
       END_STATE();
     case 102:
-      ACCEPT_TOKEN(anon_sym_case);
+      if (lookahead == 'k') ADVANCE(130);
       END_STATE();
     case 103:
-      if (lookahead == 's') ADVANCE(129);
+      ACCEPT_TOKEN(anon_sym_case);
       END_STATE();
     case 104:
-      if (lookahead == 'i') ADVANCE(130);
+      if (lookahead == 's') ADVANCE(131);
       END_STATE();
     case 105:
-      ACCEPT_TOKEN(anon_sym_elif);
+      if (lookahead == 'i') ADVANCE(132);
       END_STATE();
     case 106:
-      ACCEPT_TOKEN(anon_sym_else);
+      ACCEPT_TOKEN(anon_sym_elif);
       END_STATE();
     case 107:
-      ACCEPT_TOKEN(anon_sym_exec);
+      ACCEPT_TOKEN(anon_sym_else);
       END_STATE();
     case 108:
-      if (lookahead == 'l') ADVANCE(131);
+      if (lookahead == 'p') ADVANCE(133);
       END_STATE();
     case 109:
-      ACCEPT_TOKEN(anon_sym_from);
+      ACCEPT_TOKEN(anon_sym_exec);
       END_STATE();
     case 110:
-      if (lookahead == 'a') ADVANCE(132);
+      if (lookahead == 'l') ADVANCE(134);
       END_STATE();
     case 111:
-      if (lookahead == 'r') ADVANCE(133);
+      ACCEPT_TOKEN(anon_sym_from);
       END_STATE();
     case 112:
-      if (lookahead == 'd') ADVANCE(134);
+      if (lookahead == 'a') ADVANCE(135);
       END_STATE();
     case 113:
-      if (lookahead == 'h') ADVANCE(135);
+      if (lookahead == 'r') ADVANCE(136);
       END_STATE();
     case 114:
-      if (lookahead == 'o') ADVANCE(136);
+      if (lookahead == 'd') ADVANCE(137);
       END_STATE();
     case 115:
-      ACCEPT_TOKEN(anon_sym_pass);
+      if (lookahead == 'h') ADVANCE(138);
       END_STATE();
     case 116:
-      if (lookahead == 't') ADVANCE(137);
+      if (lookahead == 'o') ADVANCE(139);
       END_STATE();
     case 117:
-      if (lookahead == 'e') ADVANCE(138);
+      ACCEPT_TOKEN(anon_sym_pass);
       END_STATE();
     case 118:
-      if (lookahead == 'r') ADVANCE(139);
+      if (lookahead == 't') ADVANCE(140);
       END_STATE();
     case 119:
-      ACCEPT_TOKEN(anon_sym_type);
+      if (lookahead == 'e') ADVANCE(141);
       END_STATE();
     case 120:
-      if (lookahead == 'e') ADVANCE(140);
+      if (lookahead == 'r') ADVANCE(142);
       END_STATE();
     case 121:
-      ACCEPT_TOKEN(anon_sym_with);
+      ACCEPT_TOKEN(anon_sym_type);
       END_STATE();
     case 122:
-      if (lookahead == 'd') ADVANCE(141);
+      if (lookahead == 'e') ADVANCE(143);
       END_STATE();
     case 123:
-      ACCEPT_TOKEN(sym_false);
+      ACCEPT_TOKEN(anon_sym_with);
       END_STATE();
     case 124:
-      if (lookahead == 'u') ADVANCE(142);
+      if (lookahead == 'd') ADVANCE(144);
       END_STATE();
     case 125:
-      if (lookahead == 't') ADVANCE(143);
+      ACCEPT_TOKEN(sym_false);
       END_STATE();
     case 126:
-      ACCEPT_TOKEN(anon_sym_async);
+      if (lookahead == 'u') ADVANCE(145);
       END_STATE();
     case 127:
-      ACCEPT_TOKEN(anon_sym_await);
+      if (lookahead == 't') ADVANCE(146);
       END_STATE();
     case 128:
-      ACCEPT_TOKEN(anon_sym_break);
+      ACCEPT_TOKEN(anon_sym_async);
       END_STATE();
     case 129:
-      ACCEPT_TOKEN(anon_sym_class);
+      ACCEPT_TOKEN(anon_sym_await);
       END_STATE();
     case 130:
-      if (lookahead == 'n') ADVANCE(144);
+      ACCEPT_TOKEN(anon_sym_break);
       END_STATE();
     case 131:
-      if (lookahead == 'l') ADVANCE(145);
+      ACCEPT_TOKEN(anon_sym_class);
       END_STATE();
     case 132:
-      if (lookahead == 'l') ADVANCE(146);
+      if (lookahead == 'n') ADVANCE(147);
       END_STATE();
     case 133:
-      if (lookahead == 't') ADVANCE(147);
+      if (lookahead == 't') ADVANCE(148);
       END_STATE();
     case 134:
-      if (lookahead == 'a') ADVANCE(148);
+      if (lookahead == 'l') ADVANCE(149);
       END_STATE();
     case 135:
-      ACCEPT_TOKEN(anon_sym_match);
+      if (lookahead == 'l') ADVANCE(150);
       END_STATE();
     case 136:
-      if (lookahead == 'c') ADVANCE(149);
+      if (lookahead == 't') ADVANCE(151);
       END_STATE();
     case 137:
-      ACCEPT_TOKEN(anon_sym_print);
+      if (lookahead == 'a') ADVANCE(152);
       END_STATE();
     case 138:
-      ACCEPT_TOKEN(anon_sym_raise);
+      ACCEPT_TOKEN(anon_sym_match);
       END_STATE();
     case 139:
-      if (lookahead == 'n') ADVANCE(150);
+      if (lookahead == 'c') ADVANCE(153);
       END_STATE();
     case 140:
-      ACCEPT_TOKEN(anon_sym_while);
+      ACCEPT_TOKEN(anon_sym_print);
       END_STATE();
     case 141:
-      ACCEPT_TOKEN(anon_sym_yield);
+      ACCEPT_TOKEN(anon_sym_raise);
       END_STATE();
     case 142:
-      if (lookahead == 'r') ADVANCE(151);
+      if (lookahead == 'n') ADVANCE(154);
       END_STATE();
     case 143:
-      ACCEPT_TOKEN(anon_sym_assert);
+      ACCEPT_TOKEN(anon_sym_while);
       END_STATE();
     case 144:
-      if (lookahead == 'u') ADVANCE(152);
+      ACCEPT_TOKEN(anon_sym_yield);
       END_STATE();
     case 145:
-      if (lookahead == 'y') ADVANCE(153);
+      if (lookahead == 'r') ADVANCE(155);
       END_STATE();
     case 146:
-      ACCEPT_TOKEN(anon_sym_global);
+      ACCEPT_TOKEN(anon_sym_assert);
       END_STATE();
     case 147:
-      ACCEPT_TOKEN(anon_sym_import);
+      if (lookahead == 'u') ADVANCE(156);
       END_STATE();
     case 148:
-      ACCEPT_TOKEN(anon_sym_lambda);
+      ACCEPT_TOKEN(anon_sym_except);
       END_STATE();
     case 149:
-      if (lookahead == 'a') ADVANCE(154);
+      if (lookahead == 'y') ADVANCE(157);
       END_STATE();
     case 150:
-      ACCEPT_TOKEN(anon_sym_return);
+      ACCEPT_TOKEN(anon_sym_global);
       END_STATE();
     case 151:
-      if (lookahead == 'e') ADVANCE(155);
+      ACCEPT_TOKEN(anon_sym_import);
       END_STATE();
     case 152:
-      if (lookahead == 'e') ADVANCE(156);
+      ACCEPT_TOKEN(anon_sym_lambda);
       END_STATE();
     case 153:
-      ACCEPT_TOKEN(anon_sym_finally);
+      if (lookahead == 'a') ADVANCE(158);
       END_STATE();
     case 154:
-      if (lookahead == 'l') ADVANCE(157);
+      ACCEPT_TOKEN(anon_sym_return);
       END_STATE();
     case 155:
-      if (lookahead == '_') ADVANCE(158);
+      if (lookahead == 'e') ADVANCE(159);
       END_STATE();
     case 156:
-      ACCEPT_TOKEN(anon_sym_continue);
+      if (lookahead == 'e') ADVANCE(160);
       END_STATE();
     case 157:
-      ACCEPT_TOKEN(anon_sym_nonlocal);
+      ACCEPT_TOKEN(anon_sym_finally);
       END_STATE();
     case 158:
-      if (lookahead == '_') ADVANCE(159);
+      if (lookahead == 'l') ADVANCE(161);
       END_STATE();
     case 159:
+      if (lookahead == '_') ADVANCE(162);
+      END_STATE();
+    case 160:
+      ACCEPT_TOKEN(anon_sym_continue);
+      END_STATE();
+    case 161:
+      ACCEPT_TOKEN(anon_sym_nonlocal);
+      END_STATE();
+    case 162:
+      if (lookahead == '_') ADVANCE(163);
+      END_STATE();
+    case 163:
       ACCEPT_TOKEN(anon_sym___future__);
       END_STATE();
     default:
@@ -8692,1530 +6092,1511 @@ static bool ts_lex_keywords(TSLexer *lexer, TSStateId state) {
 
 static const TSLexMode ts_lex_modes[STATE_COUNT] = {
   [0] = {.lex_state = 0, .external_lex_state = 1},
-  [1] = {.lex_state = 62, .external_lex_state = 2},
-  [2] = {.lex_state = 62, .external_lex_state = 3},
-  [3] = {.lex_state = 62, .external_lex_state = 3},
-  [4] = {.lex_state = 62, .external_lex_state = 3},
-  [5] = {.lex_state = 62, .external_lex_state = 3},
-  [6] = {.lex_state = 62, .external_lex_state = 3},
-  [7] = {.lex_state = 62, .external_lex_state = 3},
-  [8] = {.lex_state = 62, .external_lex_state = 3},
-  [9] = {.lex_state = 62, .external_lex_state = 3},
-  [10] = {.lex_state = 62, .external_lex_state = 3},
-  [11] = {.lex_state = 62, .external_lex_state = 3},
-  [12] = {.lex_state = 62, .external_lex_state = 3},
-  [13] = {.lex_state = 62, .external_lex_state = 3},
-  [14] = {.lex_state = 62, .external_lex_state = 3},
-  [15] = {.lex_state = 62, .external_lex_state = 3},
-  [16] = {.lex_state = 62, .external_lex_state = 3},
-  [17] = {.lex_state = 62, .external_lex_state = 3},
-  [18] = {.lex_state = 62, .external_lex_state = 3},
-  [19] = {.lex_state = 62, .external_lex_state = 3},
-  [20] = {.lex_state = 62, .external_lex_state = 3},
-  [21] = {.lex_state = 62, .external_lex_state = 3},
-  [22] = {.lex_state = 62, .external_lex_state = 3},
-  [23] = {.lex_state = 62, .external_lex_state = 3},
-  [24] = {.lex_state = 62, .external_lex_state = 3},
-  [25] = {.lex_state = 62, .external_lex_state = 3},
-  [26] = {.lex_state = 62, .external_lex_state = 3},
-  [27] = {.lex_state = 62, .external_lex_state = 3},
-  [28] = {.lex_state = 62, .external_lex_state = 3},
-  [29] = {.lex_state = 62, .external_lex_state = 3},
-  [30] = {.lex_state = 62, .external_lex_state = 3},
-  [31] = {.lex_state = 62, .external_lex_state = 3},
-  [32] = {.lex_state = 62, .external_lex_state = 3},
-  [33] = {.lex_state = 62, .external_lex_state = 3},
-  [34] = {.lex_state = 62, .external_lex_state = 3},
-  [35] = {.lex_state = 62, .external_lex_state = 3},
-  [36] = {.lex_state = 62, .external_lex_state = 3},
-  [37] = {.lex_state = 62, .external_lex_state = 3},
-  [38] = {.lex_state = 62, .external_lex_state = 3},
-  [39] = {.lex_state = 62, .external_lex_state = 3},
-  [40] = {.lex_state = 62, .external_lex_state = 3},
-  [41] = {.lex_state = 62, .external_lex_state = 3},
-  [42] = {.lex_state = 62, .external_lex_state = 3},
-  [43] = {.lex_state = 62, .external_lex_state = 3},
-  [44] = {.lex_state = 62, .external_lex_state = 3},
-  [45] = {.lex_state = 62, .external_lex_state = 3},
-  [46] = {.lex_state = 62, .external_lex_state = 3},
-  [47] = {.lex_state = 62, .external_lex_state = 3},
-  [48] = {.lex_state = 62, .external_lex_state = 3},
-  [49] = {.lex_state = 62, .external_lex_state = 3},
-  [50] = {.lex_state = 62, .external_lex_state = 3},
-  [51] = {.lex_state = 62, .external_lex_state = 3},
-  [52] = {.lex_state = 62, .external_lex_state = 3},
-  [53] = {.lex_state = 62, .external_lex_state = 3},
-  [54] = {.lex_state = 62, .external_lex_state = 3},
-  [55] = {.lex_state = 62, .external_lex_state = 3},
-  [56] = {.lex_state = 62, .external_lex_state = 3},
-  [57] = {.lex_state = 62, .external_lex_state = 3},
-  [58] = {.lex_state = 62, .external_lex_state = 3},
-  [59] = {.lex_state = 62, .external_lex_state = 3},
-  [60] = {.lex_state = 62, .external_lex_state = 3},
-  [61] = {.lex_state = 62, .external_lex_state = 3},
-  [62] = {.lex_state = 62, .external_lex_state = 3},
-  [63] = {.lex_state = 62, .external_lex_state = 3},
-  [64] = {.lex_state = 62, .external_lex_state = 2},
-  [65] = {.lex_state = 62, .external_lex_state = 3},
-  [66] = {.lex_state = 62, .external_lex_state = 3},
-  [67] = {.lex_state = 62, .external_lex_state = 2},
-  [68] = {.lex_state = 62, .external_lex_state = 3},
-  [69] = {.lex_state = 62, .external_lex_state = 3},
-  [70] = {.lex_state = 62, .external_lex_state = 4},
-  [71] = {.lex_state = 62, .external_lex_state = 4},
-  [72] = {.lex_state = 62, .external_lex_state = 5},
-  [73] = {.lex_state = 62, .external_lex_state = 5},
-  [74] = {.lex_state = 62, .external_lex_state = 5},
-  [75] = {.lex_state = 62, .external_lex_state = 4},
-  [76] = {.lex_state = 62, .external_lex_state = 5},
-  [77] = {.lex_state = 62, .external_lex_state = 5},
-  [78] = {.lex_state = 62, .external_lex_state = 5},
-  [79] = {.lex_state = 62, .external_lex_state = 5},
-  [80] = {.lex_state = 62, .external_lex_state = 5},
-  [81] = {.lex_state = 62, .external_lex_state = 5},
-  [82] = {.lex_state = 62, .external_lex_state = 5},
-  [83] = {.lex_state = 62, .external_lex_state = 5},
-  [84] = {.lex_state = 62, .external_lex_state = 5},
-  [85] = {.lex_state = 62, .external_lex_state = 5},
-  [86] = {.lex_state = 62, .external_lex_state = 5},
-  [87] = {.lex_state = 62, .external_lex_state = 5},
-  [88] = {.lex_state = 62, .external_lex_state = 5},
-  [89] = {.lex_state = 62, .external_lex_state = 5},
-  [90] = {.lex_state = 62, .external_lex_state = 5},
-  [91] = {.lex_state = 62, .external_lex_state = 5},
-  [92] = {.lex_state = 62, .external_lex_state = 5},
-  [93] = {.lex_state = 62, .external_lex_state = 5},
-  [94] = {.lex_state = 62, .external_lex_state = 5},
-  [95] = {.lex_state = 62, .external_lex_state = 5},
-  [96] = {.lex_state = 62, .external_lex_state = 5},
-  [97] = {.lex_state = 62, .external_lex_state = 5},
-  [98] = {.lex_state = 62, .external_lex_state = 5},
-  [99] = {.lex_state = 62, .external_lex_state = 5},
-  [100] = {.lex_state = 62, .external_lex_state = 5},
-  [101] = {.lex_state = 62, .external_lex_state = 5},
-  [102] = {.lex_state = 62, .external_lex_state = 5},
-  [103] = {.lex_state = 62, .external_lex_state = 5},
-  [104] = {.lex_state = 62, .external_lex_state = 5},
-  [105] = {.lex_state = 62, .external_lex_state = 5},
-  [106] = {.lex_state = 62, .external_lex_state = 5},
-  [107] = {.lex_state = 62, .external_lex_state = 5},
-  [108] = {.lex_state = 62, .external_lex_state = 5},
-  [109] = {.lex_state = 62, .external_lex_state = 5},
-  [110] = {.lex_state = 62, .external_lex_state = 5},
-  [111] = {.lex_state = 62, .external_lex_state = 5},
-  [112] = {.lex_state = 62, .external_lex_state = 5},
-  [113] = {.lex_state = 62, .external_lex_state = 5},
-  [114] = {.lex_state = 62, .external_lex_state = 5},
-  [115] = {.lex_state = 62, .external_lex_state = 5},
-  [116] = {.lex_state = 62, .external_lex_state = 5},
-  [117] = {.lex_state = 62, .external_lex_state = 5},
-  [118] = {.lex_state = 62, .external_lex_state = 5},
-  [119] = {.lex_state = 62, .external_lex_state = 5},
-  [120] = {.lex_state = 62, .external_lex_state = 5},
-  [121] = {.lex_state = 62, .external_lex_state = 5},
-  [122] = {.lex_state = 62, .external_lex_state = 5},
-  [123] = {.lex_state = 62, .external_lex_state = 5},
-  [124] = {.lex_state = 62, .external_lex_state = 5},
-  [125] = {.lex_state = 62, .external_lex_state = 5},
-  [126] = {.lex_state = 62, .external_lex_state = 5},
-  [127] = {.lex_state = 62, .external_lex_state = 5},
-  [128] = {.lex_state = 62, .external_lex_state = 5},
-  [129] = {.lex_state = 62, .external_lex_state = 5},
-  [130] = {.lex_state = 62, .external_lex_state = 5},
-  [131] = {.lex_state = 62, .external_lex_state = 4},
-  [132] = {.lex_state = 62, .external_lex_state = 2},
-  [133] = {.lex_state = 62, .external_lex_state = 4},
-  [134] = {.lex_state = 62, .external_lex_state = 4},
-  [135] = {.lex_state = 62, .external_lex_state = 4},
-  [136] = {.lex_state = 62, .external_lex_state = 4},
-  [137] = {.lex_state = 62, .external_lex_state = 4},
-  [138] = {.lex_state = 62, .external_lex_state = 4},
-  [139] = {.lex_state = 62, .external_lex_state = 4},
-  [140] = {.lex_state = 62, .external_lex_state = 4},
-  [141] = {.lex_state = 62, .external_lex_state = 4},
-  [142] = {.lex_state = 62, .external_lex_state = 4},
-  [143] = {.lex_state = 62, .external_lex_state = 4},
-  [144] = {.lex_state = 62, .external_lex_state = 4},
-  [145] = {.lex_state = 62, .external_lex_state = 4},
-  [146] = {.lex_state = 62, .external_lex_state = 4},
-  [147] = {.lex_state = 62, .external_lex_state = 2},
-  [148] = {.lex_state = 62, .external_lex_state = 2},
-  [149] = {.lex_state = 62, .external_lex_state = 2},
-  [150] = {.lex_state = 62, .external_lex_state = 4},
-  [151] = {.lex_state = 62, .external_lex_state = 2},
-  [152] = {.lex_state = 62, .external_lex_state = 2},
-  [153] = {.lex_state = 62, .external_lex_state = 2},
-  [154] = {.lex_state = 62, .external_lex_state = 2},
-  [155] = {.lex_state = 62, .external_lex_state = 2},
-  [156] = {.lex_state = 62, .external_lex_state = 2},
-  [157] = {.lex_state = 62, .external_lex_state = 2},
-  [158] = {.lex_state = 16, .external_lex_state = 2},
-  [159] = {.lex_state = 62, .external_lex_state = 2},
-  [160] = {.lex_state = 62, .external_lex_state = 2},
-  [161] = {.lex_state = 62, .external_lex_state = 2},
-  [162] = {.lex_state = 62, .external_lex_state = 2},
-  [163] = {.lex_state = 62, .external_lex_state = 2},
-  [164] = {.lex_state = 62, .external_lex_state = 2},
-  [165] = {.lex_state = 16, .external_lex_state = 2},
-  [166] = {.lex_state = 62, .external_lex_state = 2},
-  [167] = {.lex_state = 16, .external_lex_state = 2},
-  [168] = {.lex_state = 16, .external_lex_state = 2},
-  [169] = {.lex_state = 62, .external_lex_state = 2},
-  [170] = {.lex_state = 62, .external_lex_state = 2},
-  [171] = {.lex_state = 16, .external_lex_state = 2},
-  [172] = {.lex_state = 16, .external_lex_state = 2},
-  [173] = {.lex_state = 62, .external_lex_state = 2},
-  [174] = {.lex_state = 62, .external_lex_state = 2},
-  [175] = {.lex_state = 62, .external_lex_state = 2},
-  [176] = {.lex_state = 62, .external_lex_state = 2},
-  [177] = {.lex_state = 62, .external_lex_state = 2},
-  [178] = {.lex_state = 62, .external_lex_state = 2},
-  [179] = {.lex_state = 62, .external_lex_state = 2},
-  [180] = {.lex_state = 62, .external_lex_state = 4},
-  [181] = {.lex_state = 62, .external_lex_state = 4},
-  [182] = {.lex_state = 62, .external_lex_state = 2},
-  [183] = {.lex_state = 62, .external_lex_state = 2},
-  [184] = {.lex_state = 62, .external_lex_state = 2},
-  [185] = {.lex_state = 62, .external_lex_state = 2},
-  [186] = {.lex_state = 62, .external_lex_state = 2},
-  [187] = {.lex_state = 62, .external_lex_state = 2},
-  [188] = {.lex_state = 62, .external_lex_state = 2},
-  [189] = {.lex_state = 62, .external_lex_state = 2},
-  [190] = {.lex_state = 62, .external_lex_state = 2},
-  [191] = {.lex_state = 62, .external_lex_state = 2},
-  [192] = {.lex_state = 62, .external_lex_state = 2},
-  [193] = {.lex_state = 62, .external_lex_state = 2},
-  [194] = {.lex_state = 62, .external_lex_state = 2},
-  [195] = {.lex_state = 62, .external_lex_state = 4},
-  [196] = {.lex_state = 62, .external_lex_state = 2},
-  [197] = {.lex_state = 62, .external_lex_state = 2},
-  [198] = {.lex_state = 62, .external_lex_state = 2},
-  [199] = {.lex_state = 62, .external_lex_state = 2},
-  [200] = {.lex_state = 62, .external_lex_state = 2},
-  [201] = {.lex_state = 62, .external_lex_state = 4},
-  [202] = {.lex_state = 62, .external_lex_state = 2},
-  [203] = {.lex_state = 62, .external_lex_state = 2},
-  [204] = {.lex_state = 62, .external_lex_state = 2},
-  [205] = {.lex_state = 62, .external_lex_state = 4},
-  [206] = {.lex_state = 62, .external_lex_state = 2},
-  [207] = {.lex_state = 62, .external_lex_state = 2},
-  [208] = {.lex_state = 62, .external_lex_state = 2},
-  [209] = {.lex_state = 62, .external_lex_state = 2},
-  [210] = {.lex_state = 62, .external_lex_state = 4},
-  [211] = {.lex_state = 62, .external_lex_state = 2},
-  [212] = {.lex_state = 62, .external_lex_state = 2},
-  [213] = {.lex_state = 62, .external_lex_state = 2},
-  [214] = {.lex_state = 62, .external_lex_state = 2},
-  [215] = {.lex_state = 62, .external_lex_state = 2},
-  [216] = {.lex_state = 62, .external_lex_state = 2},
-  [217] = {.lex_state = 62, .external_lex_state = 2},
-  [218] = {.lex_state = 15},
-  [219] = {.lex_state = 15},
-  [220] = {.lex_state = 15},
-  [221] = {.lex_state = 15},
-  [222] = {.lex_state = 62, .external_lex_state = 2},
-  [223] = {.lex_state = 15},
-  [224] = {.lex_state = 62, .external_lex_state = 2},
-  [225] = {.lex_state = 62, .external_lex_state = 2},
-  [226] = {.lex_state = 15},
-  [227] = {.lex_state = 15},
-  [228] = {.lex_state = 63, .external_lex_state = 2},
-  [229] = {.lex_state = 64, .external_lex_state = 3},
-  [230] = {.lex_state = 62, .external_lex_state = 2},
-  [231] = {.lex_state = 62, .external_lex_state = 2},
-  [232] = {.lex_state = 63, .external_lex_state = 3},
-  [233] = {.lex_state = 62, .external_lex_state = 2},
-  [234] = {.lex_state = 64, .external_lex_state = 3},
-  [235] = {.lex_state = 62, .external_lex_state = 2},
-  [236] = {.lex_state = 62, .external_lex_state = 2},
-  [237] = {.lex_state = 64, .external_lex_state = 2},
-  [238] = {.lex_state = 63, .external_lex_state = 2},
-  [239] = {.lex_state = 62, .external_lex_state = 2},
-  [240] = {.lex_state = 64, .external_lex_state = 2},
-  [241] = {.lex_state = 63, .external_lex_state = 3},
-  [242] = {.lex_state = 62, .external_lex_state = 2},
-  [243] = {.lex_state = 62, .external_lex_state = 2},
-  [244] = {.lex_state = 62, .external_lex_state = 2},
-  [245] = {.lex_state = 62, .external_lex_state = 2},
-  [246] = {.lex_state = 62, .external_lex_state = 2},
-  [247] = {.lex_state = 14, .external_lex_state = 6},
-  [248] = {.lex_state = 62, .external_lex_state = 2},
-  [249] = {.lex_state = 62, .external_lex_state = 2},
-  [250] = {.lex_state = 62, .external_lex_state = 2},
-  [251] = {.lex_state = 62, .external_lex_state = 2},
-  [252] = {.lex_state = 62, .external_lex_state = 2},
-  [253] = {.lex_state = 62, .external_lex_state = 2},
-  [254] = {.lex_state = 14, .external_lex_state = 6},
-  [255] = {.lex_state = 16, .external_lex_state = 2},
-  [256] = {.lex_state = 16, .external_lex_state = 2},
-  [257] = {.lex_state = 16, .external_lex_state = 2},
-  [258] = {.lex_state = 62, .external_lex_state = 3},
-  [259] = {.lex_state = 16, .external_lex_state = 2},
-  [260] = {.lex_state = 16, .external_lex_state = 2},
-  [261] = {.lex_state = 16, .external_lex_state = 2},
-  [262] = {.lex_state = 16, .external_lex_state = 2},
-  [263] = {.lex_state = 62, .external_lex_state = 3},
-  [264] = {.lex_state = 16, .external_lex_state = 2},
-  [265] = {.lex_state = 62, .external_lex_state = 3},
-  [266] = {.lex_state = 63, .external_lex_state = 3},
-  [267] = {.lex_state = 64, .external_lex_state = 3},
-  [268] = {.lex_state = 62, .external_lex_state = 2},
-  [269] = {.lex_state = 16, .external_lex_state = 2},
-  [270] = {.lex_state = 64, .external_lex_state = 2},
-  [271] = {.lex_state = 63, .external_lex_state = 2},
-  [272] = {.lex_state = 62, .external_lex_state = 3},
-  [273] = {.lex_state = 16, .external_lex_state = 2},
-  [274] = {.lex_state = 16, .external_lex_state = 2},
-  [275] = {.lex_state = 62, .external_lex_state = 2},
-  [276] = {.lex_state = 62, .external_lex_state = 2},
-  [277] = {.lex_state = 62, .external_lex_state = 2},
-  [278] = {.lex_state = 14, .external_lex_state = 4},
-  [279] = {.lex_state = 62, .external_lex_state = 2},
-  [280] = {.lex_state = 62, .external_lex_state = 2},
-  [281] = {.lex_state = 62, .external_lex_state = 2},
-  [282] = {.lex_state = 62, .external_lex_state = 2},
-  [283] = {.lex_state = 62, .external_lex_state = 2},
-  [284] = {.lex_state = 14, .external_lex_state = 6},
-  [285] = {.lex_state = 62, .external_lex_state = 2},
-  [286] = {.lex_state = 62, .external_lex_state = 2},
-  [287] = {.lex_state = 62, .external_lex_state = 2},
-  [288] = {.lex_state = 62, .external_lex_state = 3},
-  [289] = {.lex_state = 62, .external_lex_state = 2},
-  [290] = {.lex_state = 62, .external_lex_state = 2},
-  [291] = {.lex_state = 62, .external_lex_state = 3},
-  [292] = {.lex_state = 62, .external_lex_state = 2},
-  [293] = {.lex_state = 62, .external_lex_state = 2},
-  [294] = {.lex_state = 62, .external_lex_state = 2},
-  [295] = {.lex_state = 62, .external_lex_state = 4},
-  [296] = {.lex_state = 62, .external_lex_state = 2},
-  [297] = {.lex_state = 62, .external_lex_state = 2},
-  [298] = {.lex_state = 62, .external_lex_state = 2},
-  [299] = {.lex_state = 16, .external_lex_state = 2},
-  [300] = {.lex_state = 62, .external_lex_state = 4},
-  [301] = {.lex_state = 16, .external_lex_state = 2},
-  [302] = {.lex_state = 62, .external_lex_state = 2},
-  [303] = {.lex_state = 62, .external_lex_state = 4},
-  [304] = {.lex_state = 62, .external_lex_state = 4},
-  [305] = {.lex_state = 62, .external_lex_state = 2},
-  [306] = {.lex_state = 62, .external_lex_state = 2},
-  [307] = {.lex_state = 62, .external_lex_state = 3},
-  [308] = {.lex_state = 62, .external_lex_state = 3},
-  [309] = {.lex_state = 62, .external_lex_state = 2},
-  [310] = {.lex_state = 16, .external_lex_state = 2},
-  [311] = {.lex_state = 62, .external_lex_state = 3},
-  [312] = {.lex_state = 62, .external_lex_state = 2},
-  [313] = {.lex_state = 62, .external_lex_state = 2},
-  [314] = {.lex_state = 16, .external_lex_state = 2},
-  [315] = {.lex_state = 62, .external_lex_state = 3},
-  [316] = {.lex_state = 64, .external_lex_state = 3},
-  [317] = {.lex_state = 63, .external_lex_state = 3},
-  [318] = {.lex_state = 64, .external_lex_state = 2},
-  [319] = {.lex_state = 63, .external_lex_state = 2},
-  [320] = {.lex_state = 63, .external_lex_state = 2},
-  [321] = {.lex_state = 62, .external_lex_state = 2},
-  [322] = {.lex_state = 62, .external_lex_state = 2},
-  [323] = {.lex_state = 62, .external_lex_state = 2},
-  [324] = {.lex_state = 62, .external_lex_state = 2},
-  [325] = {.lex_state = 63, .external_lex_state = 2},
-  [326] = {.lex_state = 63, .external_lex_state = 2},
-  [327] = {.lex_state = 64, .external_lex_state = 2},
-  [328] = {.lex_state = 63, .external_lex_state = 2},
-  [329] = {.lex_state = 64, .external_lex_state = 2},
-  [330] = {.lex_state = 14, .external_lex_state = 6},
-  [331] = {.lex_state = 64, .external_lex_state = 2},
-  [332] = {.lex_state = 63, .external_lex_state = 2},
-  [333] = {.lex_state = 63, .external_lex_state = 2},
-  [334] = {.lex_state = 14, .external_lex_state = 6},
-  [335] = {.lex_state = 16, .external_lex_state = 2},
-  [336] = {.lex_state = 15, .external_lex_state = 6},
-  [337] = {.lex_state = 15, .external_lex_state = 6},
-  [338] = {.lex_state = 14},
-  [339] = {.lex_state = 14},
-  [340] = {.lex_state = 63, .external_lex_state = 2},
-  [341] = {.lex_state = 62, .external_lex_state = 2},
-  [342] = {.lex_state = 15, .external_lex_state = 6},
-  [343] = {.lex_state = 15, .external_lex_state = 6},
-  [344] = {.lex_state = 15, .external_lex_state = 6},
-  [345] = {.lex_state = 62, .external_lex_state = 3},
-  [346] = {.lex_state = 62, .external_lex_state = 2},
-  [347] = {.lex_state = 62, .external_lex_state = 2},
-  [348] = {.lex_state = 62, .external_lex_state = 2},
-  [349] = {.lex_state = 62, .external_lex_state = 3},
-  [350] = {.lex_state = 62, .external_lex_state = 2},
-  [351] = {.lex_state = 62, .external_lex_state = 2},
-  [352] = {.lex_state = 15, .external_lex_state = 6},
-  [353] = {.lex_state = 63, .external_lex_state = 3},
-  [354] = {.lex_state = 64, .external_lex_state = 3},
-  [355] = {.lex_state = 64, .external_lex_state = 3},
-  [356] = {.lex_state = 64, .external_lex_state = 3},
-  [357] = {.lex_state = 63, .external_lex_state = 3},
-  [358] = {.lex_state = 64, .external_lex_state = 3},
-  [359] = {.lex_state = 64, .external_lex_state = 2},
-  [360] = {.lex_state = 63, .external_lex_state = 3},
-  [361] = {.lex_state = 62, .external_lex_state = 2},
-  [362] = {.lex_state = 64, .external_lex_state = 2},
-  [363] = {.lex_state = 64, .external_lex_state = 3},
-  [364] = {.lex_state = 62, .external_lex_state = 2},
-  [365] = {.lex_state = 15, .external_lex_state = 6},
-  [366] = {.lex_state = 63, .external_lex_state = 3},
-  [367] = {.lex_state = 64, .external_lex_state = 2},
-  [368] = {.lex_state = 62, .external_lex_state = 2},
-  [369] = {.lex_state = 63, .external_lex_state = 2},
-  [370] = {.lex_state = 63, .external_lex_state = 3},
-  [371] = {.lex_state = 64, .external_lex_state = 2},
-  [372] = {.lex_state = 64, .external_lex_state = 3},
-  [373] = {.lex_state = 63, .external_lex_state = 3},
-  [374] = {.lex_state = 64, .external_lex_state = 3},
-  [375] = {.lex_state = 63, .external_lex_state = 2},
-  [376] = {.lex_state = 64, .external_lex_state = 2},
-  [377] = {.lex_state = 63, .external_lex_state = 3},
-  [378] = {.lex_state = 63, .external_lex_state = 3},
-  [379] = {.lex_state = 63, .external_lex_state = 3},
-  [380] = {.lex_state = 62, .external_lex_state = 2},
-  [381] = {.lex_state = 63, .external_lex_state = 3},
-  [382] = {.lex_state = 63, .external_lex_state = 2},
-  [383] = {.lex_state = 16, .external_lex_state = 2},
-  [384] = {.lex_state = 64, .external_lex_state = 3},
-  [385] = {.lex_state = 62, .external_lex_state = 2},
-  [386] = {.lex_state = 62, .external_lex_state = 2},
-  [387] = {.lex_state = 62, .external_lex_state = 2},
-  [388] = {.lex_state = 62, .external_lex_state = 2},
-  [389] = {.lex_state = 62, .external_lex_state = 2},
-  [390] = {.lex_state = 62, .external_lex_state = 2},
-  [391] = {.lex_state = 62, .external_lex_state = 2},
-  [392] = {.lex_state = 62, .external_lex_state = 2},
-  [393] = {.lex_state = 62, .external_lex_state = 2},
-  [394] = {.lex_state = 62, .external_lex_state = 2},
-  [395] = {.lex_state = 62, .external_lex_state = 2},
-  [396] = {.lex_state = 62, .external_lex_state = 2},
-  [397] = {.lex_state = 62, .external_lex_state = 2},
-  [398] = {.lex_state = 62, .external_lex_state = 2},
-  [399] = {.lex_state = 62, .external_lex_state = 2},
-  [400] = {.lex_state = 62, .external_lex_state = 2},
-  [401] = {.lex_state = 62, .external_lex_state = 2},
-  [402] = {.lex_state = 62, .external_lex_state = 2},
-  [403] = {.lex_state = 62, .external_lex_state = 3},
-  [404] = {.lex_state = 62, .external_lex_state = 2},
-  [405] = {.lex_state = 62, .external_lex_state = 2},
-  [406] = {.lex_state = 62, .external_lex_state = 2},
-  [407] = {.lex_state = 62, .external_lex_state = 2},
-  [408] = {.lex_state = 62, .external_lex_state = 2},
-  [409] = {.lex_state = 62, .external_lex_state = 2},
-  [410] = {.lex_state = 62, .external_lex_state = 2},
-  [411] = {.lex_state = 62, .external_lex_state = 2},
-  [412] = {.lex_state = 62, .external_lex_state = 2},
-  [413] = {.lex_state = 62, .external_lex_state = 3},
-  [414] = {.lex_state = 62, .external_lex_state = 3},
-  [415] = {.lex_state = 62, .external_lex_state = 2},
-  [416] = {.lex_state = 62, .external_lex_state = 2},
-  [417] = {.lex_state = 62, .external_lex_state = 2},
-  [418] = {.lex_state = 62, .external_lex_state = 3},
-  [419] = {.lex_state = 62, .external_lex_state = 2},
-  [420] = {.lex_state = 62, .external_lex_state = 3},
-  [421] = {.lex_state = 62, .external_lex_state = 3},
-  [422] = {.lex_state = 62, .external_lex_state = 2},
-  [423] = {.lex_state = 62, .external_lex_state = 2},
-  [424] = {.lex_state = 62, .external_lex_state = 2},
-  [425] = {.lex_state = 62, .external_lex_state = 2},
-  [426] = {.lex_state = 62, .external_lex_state = 2},
-  [427] = {.lex_state = 62, .external_lex_state = 2},
-  [428] = {.lex_state = 62, .external_lex_state = 3},
-  [429] = {.lex_state = 62, .external_lex_state = 2},
-  [430] = {.lex_state = 62, .external_lex_state = 2},
-  [431] = {.lex_state = 15, .external_lex_state = 6},
-  [432] = {.lex_state = 62, .external_lex_state = 3},
-  [433] = {.lex_state = 62, .external_lex_state = 2},
-  [434] = {.lex_state = 62, .external_lex_state = 2},
-  [435] = {.lex_state = 62, .external_lex_state = 2},
-  [436] = {.lex_state = 62, .external_lex_state = 2},
-  [437] = {.lex_state = 62, .external_lex_state = 2},
-  [438] = {.lex_state = 62, .external_lex_state = 2},
-  [439] = {.lex_state = 62, .external_lex_state = 2},
-  [440] = {.lex_state = 62, .external_lex_state = 2},
-  [441] = {.lex_state = 15, .external_lex_state = 6},
-  [442] = {.lex_state = 62, .external_lex_state = 2},
-  [443] = {.lex_state = 62, .external_lex_state = 2},
-  [444] = {.lex_state = 62, .external_lex_state = 2},
-  [445] = {.lex_state = 62, .external_lex_state = 2},
-  [446] = {.lex_state = 62, .external_lex_state = 2},
-  [447] = {.lex_state = 62, .external_lex_state = 2},
-  [448] = {.lex_state = 62, .external_lex_state = 2},
-  [449] = {.lex_state = 15},
-  [450] = {.lex_state = 62, .external_lex_state = 2},
-  [451] = {.lex_state = 62, .external_lex_state = 2},
-  [452] = {.lex_state = 62, .external_lex_state = 2},
-  [453] = {.lex_state = 62, .external_lex_state = 2},
-  [454] = {.lex_state = 62, .external_lex_state = 3},
-  [455] = {.lex_state = 62, .external_lex_state = 2},
-  [456] = {.lex_state = 62, .external_lex_state = 2},
-  [457] = {.lex_state = 62, .external_lex_state = 2},
-  [458] = {.lex_state = 62, .external_lex_state = 2},
-  [459] = {.lex_state = 62, .external_lex_state = 2},
-  [460] = {.lex_state = 62, .external_lex_state = 2},
-  [461] = {.lex_state = 62, .external_lex_state = 2},
-  [462] = {.lex_state = 62, .external_lex_state = 2},
-  [463] = {.lex_state = 62, .external_lex_state = 2},
-  [464] = {.lex_state = 62, .external_lex_state = 3},
-  [465] = {.lex_state = 62, .external_lex_state = 2},
-  [466] = {.lex_state = 62, .external_lex_state = 2},
-  [467] = {.lex_state = 62, .external_lex_state = 2},
-  [468] = {.lex_state = 62, .external_lex_state = 2},
-  [469] = {.lex_state = 62, .external_lex_state = 2},
-  [470] = {.lex_state = 62, .external_lex_state = 2},
-  [471] = {.lex_state = 62, .external_lex_state = 2},
-  [472] = {.lex_state = 62, .external_lex_state = 2},
-  [473] = {.lex_state = 62, .external_lex_state = 2},
-  [474] = {.lex_state = 62, .external_lex_state = 2},
-  [475] = {.lex_state = 15, .external_lex_state = 6},
-  [476] = {.lex_state = 62, .external_lex_state = 2},
-  [477] = {.lex_state = 62, .external_lex_state = 2},
-  [478] = {.lex_state = 62, .external_lex_state = 3},
-  [479] = {.lex_state = 62, .external_lex_state = 2},
-  [480] = {.lex_state = 62, .external_lex_state = 2},
-  [481] = {.lex_state = 62, .external_lex_state = 2},
-  [482] = {.lex_state = 62, .external_lex_state = 2},
-  [483] = {.lex_state = 62, .external_lex_state = 2},
-  [484] = {.lex_state = 62, .external_lex_state = 2},
-  [485] = {.lex_state = 62, .external_lex_state = 3},
-  [486] = {.lex_state = 62, .external_lex_state = 2},
-  [487] = {.lex_state = 62, .external_lex_state = 3},
-  [488] = {.lex_state = 62, .external_lex_state = 2},
-  [489] = {.lex_state = 62, .external_lex_state = 3},
-  [490] = {.lex_state = 62, .external_lex_state = 2},
-  [491] = {.lex_state = 62, .external_lex_state = 3},
-  [492] = {.lex_state = 62, .external_lex_state = 3},
-  [493] = {.lex_state = 62, .external_lex_state = 2},
-  [494] = {.lex_state = 62, .external_lex_state = 2},
-  [495] = {.lex_state = 62, .external_lex_state = 3},
-  [496] = {.lex_state = 62, .external_lex_state = 2},
-  [497] = {.lex_state = 62, .external_lex_state = 2},
-  [498] = {.lex_state = 62, .external_lex_state = 3},
-  [499] = {.lex_state = 62, .external_lex_state = 2},
-  [500] = {.lex_state = 62, .external_lex_state = 2},
-  [501] = {.lex_state = 62, .external_lex_state = 2},
-  [502] = {.lex_state = 62, .external_lex_state = 3},
-  [503] = {.lex_state = 62, .external_lex_state = 2},
-  [504] = {.lex_state = 62, .external_lex_state = 2},
-  [505] = {.lex_state = 62, .external_lex_state = 3},
-  [506] = {.lex_state = 62, .external_lex_state = 3},
-  [507] = {.lex_state = 62, .external_lex_state = 2},
-  [508] = {.lex_state = 62, .external_lex_state = 3},
-  [509] = {.lex_state = 62, .external_lex_state = 3},
-  [510] = {.lex_state = 62, .external_lex_state = 3},
-  [511] = {.lex_state = 62, .external_lex_state = 2},
-  [512] = {.lex_state = 62, .external_lex_state = 2},
-  [513] = {.lex_state = 62, .external_lex_state = 3},
-  [514] = {.lex_state = 62, .external_lex_state = 2},
-  [515] = {.lex_state = 62, .external_lex_state = 2},
-  [516] = {.lex_state = 62, .external_lex_state = 3},
-  [517] = {.lex_state = 62, .external_lex_state = 3},
-  [518] = {.lex_state = 62, .external_lex_state = 2},
-  [519] = {.lex_state = 62, .external_lex_state = 2},
-  [520] = {.lex_state = 62, .external_lex_state = 3},
-  [521] = {.lex_state = 62, .external_lex_state = 2},
-  [522] = {.lex_state = 62, .external_lex_state = 3},
-  [523] = {.lex_state = 62, .external_lex_state = 2},
-  [524] = {.lex_state = 62, .external_lex_state = 2},
-  [525] = {.lex_state = 62, .external_lex_state = 3},
-  [526] = {.lex_state = 62, .external_lex_state = 3},
-  [527] = {.lex_state = 62, .external_lex_state = 3},
-  [528] = {.lex_state = 62, .external_lex_state = 2},
-  [529] = {.lex_state = 62, .external_lex_state = 3},
-  [530] = {.lex_state = 62, .external_lex_state = 3},
-  [531] = {.lex_state = 62, .external_lex_state = 3},
-  [532] = {.lex_state = 62, .external_lex_state = 2},
-  [533] = {.lex_state = 62, .external_lex_state = 2},
-  [534] = {.lex_state = 62, .external_lex_state = 3},
-  [535] = {.lex_state = 62, .external_lex_state = 2},
-  [536] = {.lex_state = 62, .external_lex_state = 2},
-  [537] = {.lex_state = 62, .external_lex_state = 2},
-  [538] = {.lex_state = 62, .external_lex_state = 2},
-  [539] = {.lex_state = 62, .external_lex_state = 3},
-  [540] = {.lex_state = 62, .external_lex_state = 3},
-  [541] = {.lex_state = 62, .external_lex_state = 2},
-  [542] = {.lex_state = 62, .external_lex_state = 2},
-  [543] = {.lex_state = 62, .external_lex_state = 2},
-  [544] = {.lex_state = 62, .external_lex_state = 3},
-  [545] = {.lex_state = 62, .external_lex_state = 2},
-  [546] = {.lex_state = 62, .external_lex_state = 2},
-  [547] = {.lex_state = 62, .external_lex_state = 2},
-  [548] = {.lex_state = 62, .external_lex_state = 3},
-  [549] = {.lex_state = 62, .external_lex_state = 2},
-  [550] = {.lex_state = 62, .external_lex_state = 2},
-  [551] = {.lex_state = 62, .external_lex_state = 3},
-  [552] = {.lex_state = 62, .external_lex_state = 2},
-  [553] = {.lex_state = 62, .external_lex_state = 2},
-  [554] = {.lex_state = 62, .external_lex_state = 3},
-  [555] = {.lex_state = 62, .external_lex_state = 3},
-  [556] = {.lex_state = 62, .external_lex_state = 2},
-  [557] = {.lex_state = 62, .external_lex_state = 2},
-  [558] = {.lex_state = 62, .external_lex_state = 3},
-  [559] = {.lex_state = 62, .external_lex_state = 2},
-  [560] = {.lex_state = 62, .external_lex_state = 3},
-  [561] = {.lex_state = 62, .external_lex_state = 2},
-  [562] = {.lex_state = 62, .external_lex_state = 3},
-  [563] = {.lex_state = 62, .external_lex_state = 3},
-  [564] = {.lex_state = 62, .external_lex_state = 3},
-  [565] = {.lex_state = 62, .external_lex_state = 3},
-  [566] = {.lex_state = 62, .external_lex_state = 2},
-  [567] = {.lex_state = 62, .external_lex_state = 3},
-  [568] = {.lex_state = 62, .external_lex_state = 3},
-  [569] = {.lex_state = 62, .external_lex_state = 2},
-  [570] = {.lex_state = 62, .external_lex_state = 3},
-  [571] = {.lex_state = 62, .external_lex_state = 3},
-  [572] = {.lex_state = 62, .external_lex_state = 2},
-  [573] = {.lex_state = 62, .external_lex_state = 2},
-  [574] = {.lex_state = 62, .external_lex_state = 3},
-  [575] = {.lex_state = 62, .external_lex_state = 2},
-  [576] = {.lex_state = 62, .external_lex_state = 2},
-  [577] = {.lex_state = 62, .external_lex_state = 3},
-  [578] = {.lex_state = 62, .external_lex_state = 2},
-  [579] = {.lex_state = 62, .external_lex_state = 3},
-  [580] = {.lex_state = 62, .external_lex_state = 3},
-  [581] = {.lex_state = 62, .external_lex_state = 3},
-  [582] = {.lex_state = 62, .external_lex_state = 3},
-  [583] = {.lex_state = 62, .external_lex_state = 2},
-  [584] = {.lex_state = 62, .external_lex_state = 3},
-  [585] = {.lex_state = 62, .external_lex_state = 2},
-  [586] = {.lex_state = 62, .external_lex_state = 2},
-  [587] = {.lex_state = 62, .external_lex_state = 3},
-  [588] = {.lex_state = 62, .external_lex_state = 3},
-  [589] = {.lex_state = 62, .external_lex_state = 2},
-  [590] = {.lex_state = 62, .external_lex_state = 2},
-  [591] = {.lex_state = 62, .external_lex_state = 3},
-  [592] = {.lex_state = 62, .external_lex_state = 3},
-  [593] = {.lex_state = 62, .external_lex_state = 3},
-  [594] = {.lex_state = 62, .external_lex_state = 3},
-  [595] = {.lex_state = 62, .external_lex_state = 2},
-  [596] = {.lex_state = 62, .external_lex_state = 2},
-  [597] = {.lex_state = 62, .external_lex_state = 2},
-  [598] = {.lex_state = 15, .external_lex_state = 2},
-  [599] = {.lex_state = 15, .external_lex_state = 2},
-  [600] = {.lex_state = 15, .external_lex_state = 2},
-  [601] = {.lex_state = 62, .external_lex_state = 2},
-  [602] = {.lex_state = 62, .external_lex_state = 2},
-  [603] = {.lex_state = 62, .external_lex_state = 2},
-  [604] = {.lex_state = 62, .external_lex_state = 2},
-  [605] = {.lex_state = 62, .external_lex_state = 2},
-  [606] = {.lex_state = 62, .external_lex_state = 2},
-  [607] = {.lex_state = 62, .external_lex_state = 2},
-  [608] = {.lex_state = 62, .external_lex_state = 2},
-  [609] = {.lex_state = 15, .external_lex_state = 2},
-  [610] = {.lex_state = 15, .external_lex_state = 2},
-  [611] = {.lex_state = 15},
-  [612] = {.lex_state = 15},
-  [613] = {.lex_state = 15},
-  [614] = {.lex_state = 15},
-  [615] = {.lex_state = 15},
-  [616] = {.lex_state = 15},
-  [617] = {.lex_state = 15},
-  [618] = {.lex_state = 15},
-  [619] = {.lex_state = 15},
-  [620] = {.lex_state = 15},
-  [621] = {.lex_state = 15},
-  [622] = {.lex_state = 15},
-  [623] = {.lex_state = 15},
-  [624] = {.lex_state = 15},
-  [625] = {.lex_state = 15},
-  [626] = {.lex_state = 15},
-  [627] = {.lex_state = 15},
-  [628] = {.lex_state = 15},
-  [629] = {.lex_state = 15},
-  [630] = {.lex_state = 15},
-  [631] = {.lex_state = 15},
-  [632] = {.lex_state = 15},
-  [633] = {.lex_state = 15},
-  [634] = {.lex_state = 15},
-  [635] = {.lex_state = 15},
-  [636] = {.lex_state = 16, .external_lex_state = 2},
-  [637] = {.lex_state = 15},
-  [638] = {.lex_state = 15},
-  [639] = {.lex_state = 15},
-  [640] = {.lex_state = 15},
-  [641] = {.lex_state = 15},
-  [642] = {.lex_state = 15},
-  [643] = {.lex_state = 15},
-  [644] = {.lex_state = 15},
-  [645] = {.lex_state = 15},
-  [646] = {.lex_state = 15},
-  [647] = {.lex_state = 15},
-  [648] = {.lex_state = 15},
-  [649] = {.lex_state = 15},
-  [650] = {.lex_state = 15},
+  [1] = {.lex_state = 50, .external_lex_state = 2},
+  [2] = {.lex_state = 50, .external_lex_state = 3},
+  [3] = {.lex_state = 50, .external_lex_state = 3},
+  [4] = {.lex_state = 50, .external_lex_state = 3},
+  [5] = {.lex_state = 50, .external_lex_state = 3},
+  [6] = {.lex_state = 50, .external_lex_state = 3},
+  [7] = {.lex_state = 50, .external_lex_state = 3},
+  [8] = {.lex_state = 50, .external_lex_state = 3},
+  [9] = {.lex_state = 50, .external_lex_state = 3},
+  [10] = {.lex_state = 50, .external_lex_state = 3},
+  [11] = {.lex_state = 50, .external_lex_state = 3},
+  [12] = {.lex_state = 50, .external_lex_state = 3},
+  [13] = {.lex_state = 50, .external_lex_state = 3},
+  [14] = {.lex_state = 50, .external_lex_state = 3},
+  [15] = {.lex_state = 50, .external_lex_state = 3},
+  [16] = {.lex_state = 50, .external_lex_state = 3},
+  [17] = {.lex_state = 50, .external_lex_state = 3},
+  [18] = {.lex_state = 50, .external_lex_state = 3},
+  [19] = {.lex_state = 50, .external_lex_state = 3},
+  [20] = {.lex_state = 50, .external_lex_state = 3},
+  [21] = {.lex_state = 50, .external_lex_state = 3},
+  [22] = {.lex_state = 50, .external_lex_state = 3},
+  [23] = {.lex_state = 50, .external_lex_state = 3},
+  [24] = {.lex_state = 50, .external_lex_state = 3},
+  [25] = {.lex_state = 50, .external_lex_state = 3},
+  [26] = {.lex_state = 50, .external_lex_state = 3},
+  [27] = {.lex_state = 50, .external_lex_state = 3},
+  [28] = {.lex_state = 50, .external_lex_state = 3},
+  [29] = {.lex_state = 50, .external_lex_state = 3},
+  [30] = {.lex_state = 50, .external_lex_state = 3},
+  [31] = {.lex_state = 50, .external_lex_state = 3},
+  [32] = {.lex_state = 50, .external_lex_state = 3},
+  [33] = {.lex_state = 50, .external_lex_state = 3},
+  [34] = {.lex_state = 50, .external_lex_state = 3},
+  [35] = {.lex_state = 50, .external_lex_state = 3},
+  [36] = {.lex_state = 50, .external_lex_state = 3},
+  [37] = {.lex_state = 50, .external_lex_state = 3},
+  [38] = {.lex_state = 50, .external_lex_state = 3},
+  [39] = {.lex_state = 50, .external_lex_state = 3},
+  [40] = {.lex_state = 50, .external_lex_state = 3},
+  [41] = {.lex_state = 50, .external_lex_state = 3},
+  [42] = {.lex_state = 50, .external_lex_state = 3},
+  [43] = {.lex_state = 50, .external_lex_state = 3},
+  [44] = {.lex_state = 50, .external_lex_state = 3},
+  [45] = {.lex_state = 50, .external_lex_state = 3},
+  [46] = {.lex_state = 50, .external_lex_state = 3},
+  [47] = {.lex_state = 50, .external_lex_state = 3},
+  [48] = {.lex_state = 50, .external_lex_state = 3},
+  [49] = {.lex_state = 50, .external_lex_state = 3},
+  [50] = {.lex_state = 50, .external_lex_state = 3},
+  [51] = {.lex_state = 50, .external_lex_state = 3},
+  [52] = {.lex_state = 50, .external_lex_state = 3},
+  [53] = {.lex_state = 50, .external_lex_state = 3},
+  [54] = {.lex_state = 50, .external_lex_state = 3},
+  [55] = {.lex_state = 50, .external_lex_state = 3},
+  [56] = {.lex_state = 50, .external_lex_state = 3},
+  [57] = {.lex_state = 50, .external_lex_state = 3},
+  [58] = {.lex_state = 50, .external_lex_state = 3},
+  [59] = {.lex_state = 50, .external_lex_state = 3},
+  [60] = {.lex_state = 50, .external_lex_state = 3},
+  [61] = {.lex_state = 50, .external_lex_state = 3},
+  [62] = {.lex_state = 50, .external_lex_state = 2},
+  [63] = {.lex_state = 50, .external_lex_state = 3},
+  [64] = {.lex_state = 50, .external_lex_state = 3},
+  [65] = {.lex_state = 50, .external_lex_state = 2},
+  [66] = {.lex_state = 50, .external_lex_state = 4},
+  [67] = {.lex_state = 50, .external_lex_state = 4},
+  [68] = {.lex_state = 50, .external_lex_state = 5},
+  [69] = {.lex_state = 50, .external_lex_state = 5},
+  [70] = {.lex_state = 50, .external_lex_state = 5},
+  [71] = {.lex_state = 50, .external_lex_state = 5},
+  [72] = {.lex_state = 50, .external_lex_state = 5},
+  [73] = {.lex_state = 50, .external_lex_state = 5},
+  [74] = {.lex_state = 50, .external_lex_state = 4},
+  [75] = {.lex_state = 50, .external_lex_state = 5},
+  [76] = {.lex_state = 50, .external_lex_state = 5},
+  [77] = {.lex_state = 50, .external_lex_state = 5},
+  [78] = {.lex_state = 50, .external_lex_state = 5},
+  [79] = {.lex_state = 50, .external_lex_state = 5},
+  [80] = {.lex_state = 50, .external_lex_state = 5},
+  [81] = {.lex_state = 50, .external_lex_state = 5},
+  [82] = {.lex_state = 50, .external_lex_state = 5},
+  [83] = {.lex_state = 50, .external_lex_state = 5},
+  [84] = {.lex_state = 50, .external_lex_state = 5},
+  [85] = {.lex_state = 50, .external_lex_state = 5},
+  [86] = {.lex_state = 50, .external_lex_state = 5},
+  [87] = {.lex_state = 50, .external_lex_state = 5},
+  [88] = {.lex_state = 50, .external_lex_state = 5},
+  [89] = {.lex_state = 50, .external_lex_state = 5},
+  [90] = {.lex_state = 50, .external_lex_state = 5},
+  [91] = {.lex_state = 50, .external_lex_state = 5},
+  [92] = {.lex_state = 50, .external_lex_state = 5},
+  [93] = {.lex_state = 50, .external_lex_state = 5},
+  [94] = {.lex_state = 50, .external_lex_state = 5},
+  [95] = {.lex_state = 50, .external_lex_state = 5},
+  [96] = {.lex_state = 50, .external_lex_state = 5},
+  [97] = {.lex_state = 50, .external_lex_state = 5},
+  [98] = {.lex_state = 50, .external_lex_state = 5},
+  [99] = {.lex_state = 50, .external_lex_state = 5},
+  [100] = {.lex_state = 50, .external_lex_state = 5},
+  [101] = {.lex_state = 50, .external_lex_state = 5},
+  [102] = {.lex_state = 50, .external_lex_state = 5},
+  [103] = {.lex_state = 50, .external_lex_state = 5},
+  [104] = {.lex_state = 50, .external_lex_state = 5},
+  [105] = {.lex_state = 50, .external_lex_state = 5},
+  [106] = {.lex_state = 50, .external_lex_state = 5},
+  [107] = {.lex_state = 50, .external_lex_state = 5},
+  [108] = {.lex_state = 50, .external_lex_state = 5},
+  [109] = {.lex_state = 50, .external_lex_state = 5},
+  [110] = {.lex_state = 50, .external_lex_state = 5},
+  [111] = {.lex_state = 50, .external_lex_state = 5},
+  [112] = {.lex_state = 50, .external_lex_state = 5},
+  [113] = {.lex_state = 50, .external_lex_state = 5},
+  [114] = {.lex_state = 50, .external_lex_state = 5},
+  [115] = {.lex_state = 50, .external_lex_state = 5},
+  [116] = {.lex_state = 50, .external_lex_state = 5},
+  [117] = {.lex_state = 50, .external_lex_state = 5},
+  [118] = {.lex_state = 50, .external_lex_state = 5},
+  [119] = {.lex_state = 50, .external_lex_state = 5},
+  [120] = {.lex_state = 50, .external_lex_state = 5},
+  [121] = {.lex_state = 50, .external_lex_state = 5},
+  [122] = {.lex_state = 50, .external_lex_state = 5},
+  [123] = {.lex_state = 50, .external_lex_state = 5},
+  [124] = {.lex_state = 50, .external_lex_state = 5},
+  [125] = {.lex_state = 50, .external_lex_state = 5},
+  [126] = {.lex_state = 50, .external_lex_state = 5},
+  [127] = {.lex_state = 50, .external_lex_state = 4},
+  [128] = {.lex_state = 50, .external_lex_state = 4},
+  [129] = {.lex_state = 50, .external_lex_state = 4},
+  [130] = {.lex_state = 50, .external_lex_state = 4},
+  [131] = {.lex_state = 50, .external_lex_state = 4},
+  [132] = {.lex_state = 50, .external_lex_state = 4},
+  [133] = {.lex_state = 50, .external_lex_state = 2},
+  [134] = {.lex_state = 50, .external_lex_state = 2},
+  [135] = {.lex_state = 50, .external_lex_state = 4},
+  [136] = {.lex_state = 50, .external_lex_state = 2},
+  [137] = {.lex_state = 50, .external_lex_state = 2},
+  [138] = {.lex_state = 14, .external_lex_state = 2},
+  [139] = {.lex_state = 14, .external_lex_state = 2},
+  [140] = {.lex_state = 14, .external_lex_state = 2},
+  [141] = {.lex_state = 14, .external_lex_state = 2},
+  [142] = {.lex_state = 50, .external_lex_state = 4},
+  [143] = {.lex_state = 50, .external_lex_state = 2},
+  [144] = {.lex_state = 50, .external_lex_state = 2},
+  [145] = {.lex_state = 50, .external_lex_state = 4},
+  [146] = {.lex_state = 50, .external_lex_state = 2},
+  [147] = {.lex_state = 14, .external_lex_state = 2},
+  [148] = {.lex_state = 50, .external_lex_state = 2},
+  [149] = {.lex_state = 50, .external_lex_state = 2},
+  [150] = {.lex_state = 50, .external_lex_state = 2},
+  [151] = {.lex_state = 50, .external_lex_state = 2},
+  [152] = {.lex_state = 14, .external_lex_state = 2},
+  [153] = {.lex_state = 50, .external_lex_state = 2},
+  [154] = {.lex_state = 50, .external_lex_state = 2},
+  [155] = {.lex_state = 50, .external_lex_state = 2},
+  [156] = {.lex_state = 50, .external_lex_state = 2},
+  [157] = {.lex_state = 50, .external_lex_state = 2},
+  [158] = {.lex_state = 14, .external_lex_state = 2},
+  [159] = {.lex_state = 50, .external_lex_state = 2},
+  [160] = {.lex_state = 14, .external_lex_state = 2},
+  [161] = {.lex_state = 14, .external_lex_state = 2},
+  [162] = {.lex_state = 14, .external_lex_state = 2},
+  [163] = {.lex_state = 50, .external_lex_state = 2},
+  [164] = {.lex_state = 14, .external_lex_state = 2},
+  [165] = {.lex_state = 50, .external_lex_state = 2},
+  [166] = {.lex_state = 50, .external_lex_state = 2},
+  [167] = {.lex_state = 50, .external_lex_state = 2},
+  [168] = {.lex_state = 50, .external_lex_state = 2},
+  [169] = {.lex_state = 50, .external_lex_state = 4},
+  [170] = {.lex_state = 50, .external_lex_state = 2},
+  [171] = {.lex_state = 50, .external_lex_state = 2},
+  [172] = {.lex_state = 50, .external_lex_state = 2},
+  [173] = {.lex_state = 50, .external_lex_state = 2},
+  [174] = {.lex_state = 50, .external_lex_state = 2},
+  [175] = {.lex_state = 50, .external_lex_state = 2},
+  [176] = {.lex_state = 50, .external_lex_state = 2},
+  [177] = {.lex_state = 50, .external_lex_state = 4},
+  [178] = {.lex_state = 50, .external_lex_state = 2},
+  [179] = {.lex_state = 50, .external_lex_state = 2},
+  [180] = {.lex_state = 50, .external_lex_state = 2},
+  [181] = {.lex_state = 50, .external_lex_state = 2},
+  [182] = {.lex_state = 50, .external_lex_state = 4},
+  [183] = {.lex_state = 50, .external_lex_state = 2},
+  [184] = {.lex_state = 50, .external_lex_state = 2},
+  [185] = {.lex_state = 50, .external_lex_state = 2},
+  [186] = {.lex_state = 50, .external_lex_state = 4},
+  [187] = {.lex_state = 50, .external_lex_state = 2},
+  [188] = {.lex_state = 50, .external_lex_state = 2},
+  [189] = {.lex_state = 50, .external_lex_state = 2},
+  [190] = {.lex_state = 50, .external_lex_state = 2},
+  [191] = {.lex_state = 50, .external_lex_state = 4},
+  [192] = {.lex_state = 50, .external_lex_state = 2},
+  [193] = {.lex_state = 50, .external_lex_state = 2},
+  [194] = {.lex_state = 50, .external_lex_state = 4},
+  [195] = {.lex_state = 50, .external_lex_state = 2},
+  [196] = {.lex_state = 50, .external_lex_state = 2},
+  [197] = {.lex_state = 50, .external_lex_state = 2},
+  [198] = {.lex_state = 50, .external_lex_state = 2},
+  [199] = {.lex_state = 50, .external_lex_state = 2},
+  [200] = {.lex_state = 50, .external_lex_state = 2},
+  [201] = {.lex_state = 50, .external_lex_state = 2},
+  [202] = {.lex_state = 50, .external_lex_state = 2},
+  [203] = {.lex_state = 50, .external_lex_state = 2},
+  [204] = {.lex_state = 50, .external_lex_state = 2},
+  [205] = {.lex_state = 50, .external_lex_state = 2},
+  [206] = {.lex_state = 50, .external_lex_state = 2},
+  [207] = {.lex_state = 50, .external_lex_state = 2},
+  [208] = {.lex_state = 50, .external_lex_state = 2},
+  [209] = {.lex_state = 50, .external_lex_state = 2},
+  [210] = {.lex_state = 50, .external_lex_state = 2},
+  [211] = {.lex_state = 50, .external_lex_state = 2},
+  [212] = {.lex_state = 16},
+  [213] = {.lex_state = 50, .external_lex_state = 2},
+  [214] = {.lex_state = 16},
+  [215] = {.lex_state = 16},
+  [216] = {.lex_state = 16},
+  [217] = {.lex_state = 16},
+  [218] = {.lex_state = 16},
+  [219] = {.lex_state = 50, .external_lex_state = 2},
+  [220] = {.lex_state = 16},
+  [221] = {.lex_state = 50, .external_lex_state = 2},
+  [222] = {.lex_state = 14, .external_lex_state = 2},
+  [223] = {.lex_state = 50, .external_lex_state = 3},
+  [224] = {.lex_state = 14, .external_lex_state = 2},
+  [225] = {.lex_state = 50, .external_lex_state = 3},
+  [226] = {.lex_state = 14, .external_lex_state = 2},
+  [227] = {.lex_state = 14, .external_lex_state = 2},
+  [228] = {.lex_state = 50, .external_lex_state = 2},
+  [229] = {.lex_state = 50, .external_lex_state = 2},
+  [230] = {.lex_state = 50, .external_lex_state = 2},
+  [231] = {.lex_state = 50, .external_lex_state = 2},
+  [232] = {.lex_state = 50, .external_lex_state = 2},
+  [233] = {.lex_state = 14, .external_lex_state = 2},
+  [234] = {.lex_state = 14, .external_lex_state = 2},
+  [235] = {.lex_state = 50, .external_lex_state = 2},
+  [236] = {.lex_state = 14, .external_lex_state = 2},
+  [237] = {.lex_state = 50, .external_lex_state = 2},
+  [238] = {.lex_state = 50, .external_lex_state = 3},
+  [239] = {.lex_state = 50, .external_lex_state = 2},
+  [240] = {.lex_state = 14, .external_lex_state = 2},
+  [241] = {.lex_state = 50, .external_lex_state = 2},
+  [242] = {.lex_state = 14, .external_lex_state = 2},
+  [243] = {.lex_state = 50, .external_lex_state = 3},
+  [244] = {.lex_state = 50, .external_lex_state = 2},
+  [245] = {.lex_state = 14, .external_lex_state = 2},
+  [246] = {.lex_state = 50, .external_lex_state = 2},
+  [247] = {.lex_state = 50, .external_lex_state = 2},
+  [248] = {.lex_state = 50, .external_lex_state = 2},
+  [249] = {.lex_state = 14, .external_lex_state = 2},
+  [250] = {.lex_state = 15, .external_lex_state = 6},
+  [251] = {.lex_state = 50, .external_lex_state = 2},
+  [252] = {.lex_state = 50, .external_lex_state = 2},
+  [253] = {.lex_state = 50, .external_lex_state = 2},
+  [254] = {.lex_state = 50, .external_lex_state = 2},
+  [255] = {.lex_state = 50, .external_lex_state = 2},
+  [256] = {.lex_state = 15, .external_lex_state = 6},
+  [257] = {.lex_state = 50, .external_lex_state = 2},
+  [258] = {.lex_state = 50, .external_lex_state = 2},
+  [259] = {.lex_state = 14, .external_lex_state = 2},
+  [260] = {.lex_state = 50, .external_lex_state = 2},
+  [261] = {.lex_state = 14, .external_lex_state = 2},
+  [262] = {.lex_state = 14, .external_lex_state = 2},
+  [263] = {.lex_state = 50, .external_lex_state = 3},
+  [264] = {.lex_state = 50, .external_lex_state = 2},
+  [265] = {.lex_state = 50, .external_lex_state = 2},
+  [266] = {.lex_state = 50, .external_lex_state = 2},
+  [267] = {.lex_state = 14, .external_lex_state = 2},
+  [268] = {.lex_state = 50, .external_lex_state = 3},
+  [269] = {.lex_state = 50, .external_lex_state = 2},
+  [270] = {.lex_state = 50, .external_lex_state = 2},
+  [271] = {.lex_state = 15, .external_lex_state = 4},
+  [272] = {.lex_state = 50, .external_lex_state = 3},
+  [273] = {.lex_state = 50, .external_lex_state = 2},
+  [274] = {.lex_state = 50, .external_lex_state = 2},
+  [275] = {.lex_state = 50, .external_lex_state = 3},
+  [276] = {.lex_state = 50, .external_lex_state = 3},
+  [277] = {.lex_state = 50, .external_lex_state = 2},
+  [278] = {.lex_state = 14, .external_lex_state = 2},
+  [279] = {.lex_state = 50, .external_lex_state = 2},
+  [280] = {.lex_state = 50, .external_lex_state = 3},
+  [281] = {.lex_state = 50, .external_lex_state = 3},
+  [282] = {.lex_state = 50, .external_lex_state = 2},
+  [283] = {.lex_state = 50, .external_lex_state = 2},
+  [284] = {.lex_state = 50, .external_lex_state = 3},
+  [285] = {.lex_state = 50, .external_lex_state = 3},
+  [286] = {.lex_state = 50, .external_lex_state = 2},
+  [287] = {.lex_state = 50, .external_lex_state = 2},
+  [288] = {.lex_state = 50, .external_lex_state = 2},
+  [289] = {.lex_state = 50, .external_lex_state = 2},
+  [290] = {.lex_state = 50, .external_lex_state = 2},
+  [291] = {.lex_state = 50, .external_lex_state = 2},
+  [292] = {.lex_state = 50, .external_lex_state = 2},
+  [293] = {.lex_state = 50, .external_lex_state = 3},
+  [294] = {.lex_state = 50, .external_lex_state = 3},
+  [295] = {.lex_state = 50, .external_lex_state = 2},
+  [296] = {.lex_state = 50, .external_lex_state = 2},
+  [297] = {.lex_state = 50, .external_lex_state = 2},
+  [298] = {.lex_state = 50, .external_lex_state = 2},
+  [299] = {.lex_state = 50, .external_lex_state = 2},
+  [300] = {.lex_state = 50, .external_lex_state = 2},
+  [301] = {.lex_state = 50, .external_lex_state = 4},
+  [302] = {.lex_state = 50, .external_lex_state = 2},
+  [303] = {.lex_state = 50, .external_lex_state = 2},
+  [304] = {.lex_state = 50, .external_lex_state = 2},
+  [305] = {.lex_state = 50, .external_lex_state = 4},
+  [306] = {.lex_state = 14, .external_lex_state = 2},
+  [307] = {.lex_state = 50, .external_lex_state = 4},
+  [308] = {.lex_state = 50, .external_lex_state = 2},
+  [309] = {.lex_state = 50, .external_lex_state = 2},
+  [310] = {.lex_state = 50, .external_lex_state = 4},
+  [311] = {.lex_state = 50, .external_lex_state = 2},
+  [312] = {.lex_state = 50, .external_lex_state = 2},
+  [313] = {.lex_state = 50, .external_lex_state = 2},
+  [314] = {.lex_state = 50, .external_lex_state = 2},
+  [315] = {.lex_state = 50, .external_lex_state = 2},
+  [316] = {.lex_state = 50, .external_lex_state = 2},
+  [317] = {.lex_state = 50, .external_lex_state = 2},
+  [318] = {.lex_state = 50, .external_lex_state = 3},
+  [319] = {.lex_state = 50, .external_lex_state = 2},
+  [320] = {.lex_state = 50, .external_lex_state = 2},
+  [321] = {.lex_state = 50, .external_lex_state = 2},
+  [322] = {.lex_state = 15, .external_lex_state = 6},
+  [323] = {.lex_state = 50, .external_lex_state = 2},
+  [324] = {.lex_state = 14, .external_lex_state = 2},
+  [325] = {.lex_state = 50, .external_lex_state = 3},
+  [326] = {.lex_state = 16, .external_lex_state = 6},
+  [327] = {.lex_state = 16, .external_lex_state = 6},
+  [328] = {.lex_state = 50, .external_lex_state = 3},
+  [329] = {.lex_state = 50, .external_lex_state = 2},
+  [330] = {.lex_state = 50, .external_lex_state = 2},
+  [331] = {.lex_state = 50, .external_lex_state = 2},
+  [332] = {.lex_state = 14, .external_lex_state = 2},
+  [333] = {.lex_state = 50, .external_lex_state = 2},
+  [334] = {.lex_state = 50, .external_lex_state = 3},
+  [335] = {.lex_state = 15, .external_lex_state = 6},
+  [336] = {.lex_state = 50, .external_lex_state = 3},
+  [337] = {.lex_state = 50, .external_lex_state = 3},
+  [338] = {.lex_state = 50, .external_lex_state = 3},
+  [339] = {.lex_state = 50, .external_lex_state = 2},
+  [340] = {.lex_state = 50, .external_lex_state = 2},
+  [341] = {.lex_state = 50, .external_lex_state = 2},
+  [342] = {.lex_state = 50, .external_lex_state = 3},
+  [343] = {.lex_state = 50, .external_lex_state = 3},
+  [344] = {.lex_state = 50, .external_lex_state = 2},
+  [345] = {.lex_state = 50, .external_lex_state = 2},
+  [346] = {.lex_state = 50, .external_lex_state = 3},
+  [347] = {.lex_state = 50, .external_lex_state = 2},
+  [348] = {.lex_state = 50, .external_lex_state = 2},
+  [349] = {.lex_state = 50, .external_lex_state = 3},
+  [350] = {.lex_state = 16, .external_lex_state = 6},
+  [351] = {.lex_state = 16, .external_lex_state = 6},
+  [352] = {.lex_state = 50, .external_lex_state = 2},
+  [353] = {.lex_state = 16, .external_lex_state = 6},
+  [354] = {.lex_state = 16, .external_lex_state = 6},
+  [355] = {.lex_state = 50, .external_lex_state = 2},
+  [356] = {.lex_state = 14, .external_lex_state = 2},
+  [357] = {.lex_state = 15, .external_lex_state = 6},
+  [358] = {.lex_state = 15},
+  [359] = {.lex_state = 16, .external_lex_state = 6},
+  [360] = {.lex_state = 15},
+  [361] = {.lex_state = 50, .external_lex_state = 3},
+  [362] = {.lex_state = 50, .external_lex_state = 3},
+  [363] = {.lex_state = 50, .external_lex_state = 2},
+  [364] = {.lex_state = 50, .external_lex_state = 2},
+  [365] = {.lex_state = 50, .external_lex_state = 2},
+  [366] = {.lex_state = 50, .external_lex_state = 2},
+  [367] = {.lex_state = 50, .external_lex_state = 3},
+  [368] = {.lex_state = 50, .external_lex_state = 3},
+  [369] = {.lex_state = 50, .external_lex_state = 2},
+  [370] = {.lex_state = 50, .external_lex_state = 2},
+  [371] = {.lex_state = 50, .external_lex_state = 3},
+  [372] = {.lex_state = 50, .external_lex_state = 2},
+  [373] = {.lex_state = 16, .external_lex_state = 6},
+  [374] = {.lex_state = 50, .external_lex_state = 2},
+  [375] = {.lex_state = 50, .external_lex_state = 2},
+  [376] = {.lex_state = 50, .external_lex_state = 2},
+  [377] = {.lex_state = 50, .external_lex_state = 2},
+  [378] = {.lex_state = 50, .external_lex_state = 2},
+  [379] = {.lex_state = 16},
+  [380] = {.lex_state = 50, .external_lex_state = 2},
+  [381] = {.lex_state = 50, .external_lex_state = 2},
+  [382] = {.lex_state = 50, .external_lex_state = 2},
+  [383] = {.lex_state = 50, .external_lex_state = 2},
+  [384] = {.lex_state = 50, .external_lex_state = 2},
+  [385] = {.lex_state = 50, .external_lex_state = 2},
+  [386] = {.lex_state = 50, .external_lex_state = 3},
+  [387] = {.lex_state = 50, .external_lex_state = 2},
+  [388] = {.lex_state = 50, .external_lex_state = 2},
+  [389] = {.lex_state = 50, .external_lex_state = 2},
+  [390] = {.lex_state = 50, .external_lex_state = 2},
+  [391] = {.lex_state = 50, .external_lex_state = 2},
+  [392] = {.lex_state = 50, .external_lex_state = 2},
+  [393] = {.lex_state = 50, .external_lex_state = 2},
+  [394] = {.lex_state = 50, .external_lex_state = 2},
+  [395] = {.lex_state = 50, .external_lex_state = 3},
+  [396] = {.lex_state = 50, .external_lex_state = 2},
+  [397] = {.lex_state = 50, .external_lex_state = 2},
+  [398] = {.lex_state = 50, .external_lex_state = 2},
+  [399] = {.lex_state = 50, .external_lex_state = 2},
+  [400] = {.lex_state = 50, .external_lex_state = 2},
+  [401] = {.lex_state = 50, .external_lex_state = 3},
+  [402] = {.lex_state = 50, .external_lex_state = 2},
+  [403] = {.lex_state = 50, .external_lex_state = 2},
+  [404] = {.lex_state = 50, .external_lex_state = 2},
+  [405] = {.lex_state = 50, .external_lex_state = 2},
+  [406] = {.lex_state = 50, .external_lex_state = 2},
+  [407] = {.lex_state = 50, .external_lex_state = 2},
+  [408] = {.lex_state = 50, .external_lex_state = 2},
+  [409] = {.lex_state = 50, .external_lex_state = 2},
+  [410] = {.lex_state = 50, .external_lex_state = 3},
+  [411] = {.lex_state = 50, .external_lex_state = 3},
+  [412] = {.lex_state = 50, .external_lex_state = 2},
+  [413] = {.lex_state = 50, .external_lex_state = 2},
+  [414] = {.lex_state = 50, .external_lex_state = 2},
+  [415] = {.lex_state = 50, .external_lex_state = 2},
+  [416] = {.lex_state = 50, .external_lex_state = 3},
+  [417] = {.lex_state = 50, .external_lex_state = 2},
+  [418] = {.lex_state = 50, .external_lex_state = 2},
+  [419] = {.lex_state = 50, .external_lex_state = 2},
+  [420] = {.lex_state = 50, .external_lex_state = 2},
+  [421] = {.lex_state = 50, .external_lex_state = 2},
+  [422] = {.lex_state = 16, .external_lex_state = 6},
+  [423] = {.lex_state = 50, .external_lex_state = 2},
+  [424] = {.lex_state = 50, .external_lex_state = 2},
+  [425] = {.lex_state = 16, .external_lex_state = 6},
+  [426] = {.lex_state = 50, .external_lex_state = 2},
+  [427] = {.lex_state = 50, .external_lex_state = 2},
+  [428] = {.lex_state = 50, .external_lex_state = 2},
+  [429] = {.lex_state = 50, .external_lex_state = 2},
+  [430] = {.lex_state = 50, .external_lex_state = 2},
+  [431] = {.lex_state = 50, .external_lex_state = 2},
+  [432] = {.lex_state = 50, .external_lex_state = 2},
+  [433] = {.lex_state = 50, .external_lex_state = 2},
+  [434] = {.lex_state = 50, .external_lex_state = 2},
+  [435] = {.lex_state = 50, .external_lex_state = 2},
+  [436] = {.lex_state = 50, .external_lex_state = 3},
+  [437] = {.lex_state = 50, .external_lex_state = 2},
+  [438] = {.lex_state = 50, .external_lex_state = 2},
+  [439] = {.lex_state = 50, .external_lex_state = 2},
+  [440] = {.lex_state = 50, .external_lex_state = 2},
+  [441] = {.lex_state = 50, .external_lex_state = 2},
+  [442] = {.lex_state = 50, .external_lex_state = 2},
+  [443] = {.lex_state = 50, .external_lex_state = 2},
+  [444] = {.lex_state = 50, .external_lex_state = 2},
+  [445] = {.lex_state = 50, .external_lex_state = 2},
+  [446] = {.lex_state = 50, .external_lex_state = 2},
+  [447] = {.lex_state = 50, .external_lex_state = 2},
+  [448] = {.lex_state = 50, .external_lex_state = 2},
+  [449] = {.lex_state = 50, .external_lex_state = 2},
+  [450] = {.lex_state = 50, .external_lex_state = 2},
+  [451] = {.lex_state = 50, .external_lex_state = 2},
+  [452] = {.lex_state = 50, .external_lex_state = 2},
+  [453] = {.lex_state = 50, .external_lex_state = 3},
+  [454] = {.lex_state = 50, .external_lex_state = 2},
+  [455] = {.lex_state = 50, .external_lex_state = 2},
+  [456] = {.lex_state = 50, .external_lex_state = 2},
+  [457] = {.lex_state = 50, .external_lex_state = 2},
+  [458] = {.lex_state = 50, .external_lex_state = 2},
+  [459] = {.lex_state = 50, .external_lex_state = 2},
+  [460] = {.lex_state = 50, .external_lex_state = 2},
+  [461] = {.lex_state = 50, .external_lex_state = 2},
+  [462] = {.lex_state = 50, .external_lex_state = 2},
+  [463] = {.lex_state = 50, .external_lex_state = 2},
+  [464] = {.lex_state = 50, .external_lex_state = 3},
+  [465] = {.lex_state = 50, .external_lex_state = 2},
+  [466] = {.lex_state = 50, .external_lex_state = 2},
+  [467] = {.lex_state = 50, .external_lex_state = 3},
+  [468] = {.lex_state = 50, .external_lex_state = 2},
+  [469] = {.lex_state = 50, .external_lex_state = 3},
+  [470] = {.lex_state = 50, .external_lex_state = 3},
+  [471] = {.lex_state = 50, .external_lex_state = 2},
+  [472] = {.lex_state = 50, .external_lex_state = 2},
+  [473] = {.lex_state = 50, .external_lex_state = 3},
+  [474] = {.lex_state = 50, .external_lex_state = 3},
+  [475] = {.lex_state = 50, .external_lex_state = 2},
+  [476] = {.lex_state = 50, .external_lex_state = 2},
+  [477] = {.lex_state = 50, .external_lex_state = 2},
+  [478] = {.lex_state = 50, .external_lex_state = 2},
+  [479] = {.lex_state = 50, .external_lex_state = 2},
+  [480] = {.lex_state = 50, .external_lex_state = 2},
+  [481] = {.lex_state = 50, .external_lex_state = 3},
+  [482] = {.lex_state = 50, .external_lex_state = 2},
+  [483] = {.lex_state = 50, .external_lex_state = 2},
+  [484] = {.lex_state = 50, .external_lex_state = 2},
+  [485] = {.lex_state = 50, .external_lex_state = 3},
+  [486] = {.lex_state = 50, .external_lex_state = 3},
+  [487] = {.lex_state = 50, .external_lex_state = 3},
+  [488] = {.lex_state = 50, .external_lex_state = 2},
+  [489] = {.lex_state = 50, .external_lex_state = 3},
+  [490] = {.lex_state = 50, .external_lex_state = 2},
+  [491] = {.lex_state = 50, .external_lex_state = 2},
+  [492] = {.lex_state = 50, .external_lex_state = 2},
+  [493] = {.lex_state = 50, .external_lex_state = 2},
+  [494] = {.lex_state = 50, .external_lex_state = 2},
+  [495] = {.lex_state = 50, .external_lex_state = 2},
+  [496] = {.lex_state = 50, .external_lex_state = 2},
+  [497] = {.lex_state = 50, .external_lex_state = 3},
+  [498] = {.lex_state = 50, .external_lex_state = 2},
+  [499] = {.lex_state = 50, .external_lex_state = 2},
+  [500] = {.lex_state = 50, .external_lex_state = 3},
+  [501] = {.lex_state = 50, .external_lex_state = 2},
+  [502] = {.lex_state = 50, .external_lex_state = 2},
+  [503] = {.lex_state = 50, .external_lex_state = 2},
+  [504] = {.lex_state = 50, .external_lex_state = 2},
+  [505] = {.lex_state = 50, .external_lex_state = 3},
+  [506] = {.lex_state = 50, .external_lex_state = 3},
+  [507] = {.lex_state = 50, .external_lex_state = 3},
+  [508] = {.lex_state = 50, .external_lex_state = 2},
+  [509] = {.lex_state = 50, .external_lex_state = 2},
+  [510] = {.lex_state = 50, .external_lex_state = 2},
+  [511] = {.lex_state = 50, .external_lex_state = 2},
+  [512] = {.lex_state = 50, .external_lex_state = 2},
+  [513] = {.lex_state = 50, .external_lex_state = 3},
+  [514] = {.lex_state = 50, .external_lex_state = 2},
+  [515] = {.lex_state = 50, .external_lex_state = 3},
+  [516] = {.lex_state = 50, .external_lex_state = 3},
+  [517] = {.lex_state = 50, .external_lex_state = 3},
+  [518] = {.lex_state = 50, .external_lex_state = 3},
+  [519] = {.lex_state = 50, .external_lex_state = 3},
+  [520] = {.lex_state = 50, .external_lex_state = 2},
+  [521] = {.lex_state = 50, .external_lex_state = 2},
+  [522] = {.lex_state = 50, .external_lex_state = 3},
+  [523] = {.lex_state = 50, .external_lex_state = 3},
+  [524] = {.lex_state = 50, .external_lex_state = 3},
+  [525] = {.lex_state = 50, .external_lex_state = 2},
+  [526] = {.lex_state = 50, .external_lex_state = 3},
+  [527] = {.lex_state = 50, .external_lex_state = 3},
+  [528] = {.lex_state = 50, .external_lex_state = 2},
+  [529] = {.lex_state = 50, .external_lex_state = 2},
+  [530] = {.lex_state = 50, .external_lex_state = 2},
+  [531] = {.lex_state = 50, .external_lex_state = 3},
+  [532] = {.lex_state = 50, .external_lex_state = 3},
+  [533] = {.lex_state = 50, .external_lex_state = 2},
+  [534] = {.lex_state = 50, .external_lex_state = 3},
+  [535] = {.lex_state = 50, .external_lex_state = 3},
+  [536] = {.lex_state = 50, .external_lex_state = 3},
+  [537] = {.lex_state = 50, .external_lex_state = 2},
+  [538] = {.lex_state = 50, .external_lex_state = 2},
+  [539] = {.lex_state = 50, .external_lex_state = 3},
+  [540] = {.lex_state = 50, .external_lex_state = 2},
+  [541] = {.lex_state = 50, .external_lex_state = 3},
+  [542] = {.lex_state = 50, .external_lex_state = 3},
+  [543] = {.lex_state = 50, .external_lex_state = 3},
+  [544] = {.lex_state = 50, .external_lex_state = 3},
+  [545] = {.lex_state = 50, .external_lex_state = 3},
+  [546] = {.lex_state = 50, .external_lex_state = 3},
+  [547] = {.lex_state = 50, .external_lex_state = 3},
+  [548] = {.lex_state = 50, .external_lex_state = 3},
+  [549] = {.lex_state = 50, .external_lex_state = 3},
+  [550] = {.lex_state = 50, .external_lex_state = 2},
+  [551] = {.lex_state = 50, .external_lex_state = 3},
+  [552] = {.lex_state = 50, .external_lex_state = 3},
+  [553] = {.lex_state = 50, .external_lex_state = 2},
+  [554] = {.lex_state = 50, .external_lex_state = 3},
+  [555] = {.lex_state = 50, .external_lex_state = 2},
+  [556] = {.lex_state = 50, .external_lex_state = 2},
+  [557] = {.lex_state = 50, .external_lex_state = 2},
+  [558] = {.lex_state = 50, .external_lex_state = 2},
+  [559] = {.lex_state = 50, .external_lex_state = 3},
+  [560] = {.lex_state = 50, .external_lex_state = 2},
+  [561] = {.lex_state = 50, .external_lex_state = 2},
+  [562] = {.lex_state = 50, .external_lex_state = 3},
+  [563] = {.lex_state = 50, .external_lex_state = 2},
+  [564] = {.lex_state = 50, .external_lex_state = 3},
+  [565] = {.lex_state = 50, .external_lex_state = 2},
+  [566] = {.lex_state = 50, .external_lex_state = 3},
+  [567] = {.lex_state = 50, .external_lex_state = 3},
+  [568] = {.lex_state = 50, .external_lex_state = 3},
+  [569] = {.lex_state = 50, .external_lex_state = 2},
+  [570] = {.lex_state = 50, .external_lex_state = 3},
+  [571] = {.lex_state = 50, .external_lex_state = 2},
+  [572] = {.lex_state = 50, .external_lex_state = 3},
+  [573] = {.lex_state = 50, .external_lex_state = 3},
+  [574] = {.lex_state = 50, .external_lex_state = 3},
+  [575] = {.lex_state = 50, .external_lex_state = 2},
+  [576] = {.lex_state = 50, .external_lex_state = 2},
+  [577] = {.lex_state = 50, .external_lex_state = 2},
+  [578] = {.lex_state = 50, .external_lex_state = 2},
+  [579] = {.lex_state = 50, .external_lex_state = 2},
+  [580] = {.lex_state = 50, .external_lex_state = 2},
+  [581] = {.lex_state = 50, .external_lex_state = 2},
+  [582] = {.lex_state = 16, .external_lex_state = 2},
+  [583] = {.lex_state = 50, .external_lex_state = 2},
+  [584] = {.lex_state = 16, .external_lex_state = 2},
+  [585] = {.lex_state = 50, .external_lex_state = 2},
+  [586] = {.lex_state = 16, .external_lex_state = 2},
+  [587] = {.lex_state = 14, .external_lex_state = 2},
+  [588] = {.lex_state = 16, .external_lex_state = 2},
+  [589] = {.lex_state = 16, .external_lex_state = 2},
+  [590] = {.lex_state = 16},
+  [591] = {.lex_state = 16},
+  [592] = {.lex_state = 16},
+  [593] = {.lex_state = 16},
+  [594] = {.lex_state = 16},
+  [595] = {.lex_state = 16},
+  [596] = {.lex_state = 16},
+  [597] = {.lex_state = 16},
+  [598] = {.lex_state = 16},
+  [599] = {.lex_state = 16},
+  [600] = {.lex_state = 16},
+  [601] = {.lex_state = 16},
+  [602] = {.lex_state = 16},
+  [603] = {.lex_state = 16},
+  [604] = {.lex_state = 16},
+  [605] = {.lex_state = 16},
+  [606] = {.lex_state = 16},
+  [607] = {.lex_state = 16},
+  [608] = {.lex_state = 16},
+  [609] = {.lex_state = 16},
+  [610] = {.lex_state = 16},
+  [611] = {.lex_state = 16},
+  [612] = {.lex_state = 16},
+  [613] = {.lex_state = 16},
+  [614] = {.lex_state = 16},
+  [615] = {.lex_state = 16},
+  [616] = {.lex_state = 16},
+  [617] = {.lex_state = 16},
+  [618] = {.lex_state = 16},
+  [619] = {.lex_state = 16},
+  [620] = {.lex_state = 16},
+  [621] = {.lex_state = 16},
+  [622] = {.lex_state = 16},
+  [623] = {.lex_state = 16},
+  [624] = {.lex_state = 16},
+  [625] = {.lex_state = 16},
+  [626] = {.lex_state = 50, .external_lex_state = 2},
+  [627] = {.lex_state = 16},
+  [628] = {.lex_state = 16},
+  [629] = {.lex_state = 16},
+  [630] = {.lex_state = 16},
+  [631] = {.lex_state = 16},
+  [632] = {.lex_state = 16},
+  [633] = {.lex_state = 16},
+  [634] = {.lex_state = 16},
+  [635] = {.lex_state = 50, .external_lex_state = 2},
+  [636] = {.lex_state = 16},
+  [637] = {.lex_state = 16},
+  [638] = {.lex_state = 16},
+  [639] = {.lex_state = 16},
+  [640] = {.lex_state = 16},
+  [641] = {.lex_state = 50, .external_lex_state = 2},
+  [642] = {.lex_state = 16},
+  [643] = {.lex_state = 16},
+  [644] = {.lex_state = 16},
+  [645] = {.lex_state = 16},
+  [646] = {.lex_state = 50, .external_lex_state = 2},
+  [647] = {.lex_state = 16},
+  [648] = {.lex_state = 16},
+  [649] = {.lex_state = 16},
+  [650] = {.lex_state = 16},
   [651] = {.lex_state = 15},
-  [652] = {.lex_state = 15},
-  [653] = {.lex_state = 15},
-  [654] = {.lex_state = 15},
-  [655] = {.lex_state = 15},
-  [656] = {.lex_state = 15},
-  [657] = {.lex_state = 15},
-  [658] = {.lex_state = 15},
-  [659] = {.lex_state = 15},
-  [660] = {.lex_state = 15},
-  [661] = {.lex_state = 15},
-  [662] = {.lex_state = 15},
-  [663] = {.lex_state = 15},
-  [664] = {.lex_state = 15},
-  [665] = {.lex_state = 15},
-  [666] = {.lex_state = 15},
-  [667] = {.lex_state = 14},
-  [668] = {.lex_state = 14},
-  [669] = {.lex_state = 62, .external_lex_state = 2},
-  [670] = {.lex_state = 62, .external_lex_state = 2},
-  [671] = {.lex_state = 15},
+  [652] = {.lex_state = 50, .external_lex_state = 2},
+  [653] = {.lex_state = 50, .external_lex_state = 2},
+  [654] = {.lex_state = 50, .external_lex_state = 2},
+  [655] = {.lex_state = 50, .external_lex_state = 2},
+  [656] = {.lex_state = 50, .external_lex_state = 2},
+  [657] = {.lex_state = 50, .external_lex_state = 2},
+  [658] = {.lex_state = 50, .external_lex_state = 2},
+  [659] = {.lex_state = 50, .external_lex_state = 2},
+  [660] = {.lex_state = 50, .external_lex_state = 2},
+  [661] = {.lex_state = 50, .external_lex_state = 2},
+  [662] = {.lex_state = 50, .external_lex_state = 2},
+  [663] = {.lex_state = 50, .external_lex_state = 2},
+  [664] = {.lex_state = 50, .external_lex_state = 2},
+  [665] = {.lex_state = 50, .external_lex_state = 2},
+  [666] = {.lex_state = 50, .external_lex_state = 2},
+  [667] = {.lex_state = 50, .external_lex_state = 2},
+  [668] = {.lex_state = 16, .external_lex_state = 2},
+  [669] = {.lex_state = 50, .external_lex_state = 2},
+  [670] = {.lex_state = 50, .external_lex_state = 2},
+  [671] = {.lex_state = 50, .external_lex_state = 2},
   [672] = {.lex_state = 15},
-  [673] = {.lex_state = 62, .external_lex_state = 2},
-  [674] = {.lex_state = 14},
-  [675] = {.lex_state = 14},
-  [676] = {.lex_state = 62, .external_lex_state = 2},
-  [677] = {.lex_state = 15, .external_lex_state = 2},
-  [678] = {.lex_state = 15, .external_lex_state = 2},
-  [679] = {.lex_state = 62, .external_lex_state = 2},
-  [680] = {.lex_state = 62, .external_lex_state = 2},
-  [681] = {.lex_state = 62, .external_lex_state = 2},
-  [682] = {.lex_state = 62, .external_lex_state = 2},
-  [683] = {.lex_state = 62, .external_lex_state = 2},
-  [684] = {.lex_state = 15, .external_lex_state = 6},
-  [685] = {.lex_state = 62, .external_lex_state = 2},
-  [686] = {.lex_state = 62, .external_lex_state = 2},
-  [687] = {.lex_state = 62, .external_lex_state = 2},
-  [688] = {.lex_state = 62, .external_lex_state = 2},
-  [689] = {.lex_state = 15, .external_lex_state = 4},
-  [690] = {.lex_state = 62, .external_lex_state = 2},
-  [691] = {.lex_state = 62, .external_lex_state = 2},
-  [692] = {.lex_state = 62, .external_lex_state = 2},
-  [693] = {.lex_state = 62, .external_lex_state = 2},
-  [694] = {.lex_state = 62, .external_lex_state = 2},
-  [695] = {.lex_state = 62, .external_lex_state = 2},
-  [696] = {.lex_state = 62, .external_lex_state = 2},
-  [697] = {.lex_state = 62, .external_lex_state = 2},
-  [698] = {.lex_state = 62, .external_lex_state = 2},
-  [699] = {.lex_state = 62, .external_lex_state = 2},
-  [700] = {.lex_state = 62, .external_lex_state = 2},
-  [701] = {.lex_state = 62, .external_lex_state = 2},
-  [702] = {.lex_state = 62, .external_lex_state = 2},
-  [703] = {.lex_state = 62, .external_lex_state = 2},
-  [704] = {.lex_state = 62, .external_lex_state = 2},
-  [705] = {.lex_state = 62, .external_lex_state = 2},
-  [706] = {.lex_state = 62, .external_lex_state = 2},
-  [707] = {.lex_state = 62, .external_lex_state = 2},
-  [708] = {.lex_state = 62, .external_lex_state = 2},
-  [709] = {.lex_state = 62, .external_lex_state = 2},
-  [710] = {.lex_state = 62, .external_lex_state = 2},
-  [711] = {.lex_state = 62, .external_lex_state = 2},
-  [712] = {.lex_state = 62, .external_lex_state = 2},
-  [713] = {.lex_state = 15, .external_lex_state = 4},
-  [714] = {.lex_state = 62, .external_lex_state = 2},
-  [715] = {.lex_state = 62, .external_lex_state = 2},
-  [716] = {.lex_state = 62, .external_lex_state = 2},
-  [717] = {.lex_state = 62, .external_lex_state = 2},
-  [718] = {.lex_state = 62, .external_lex_state = 2},
-  [719] = {.lex_state = 62, .external_lex_state = 2},
-  [720] = {.lex_state = 15, .external_lex_state = 4},
-  [721] = {.lex_state = 62, .external_lex_state = 2},
-  [722] = {.lex_state = 62, .external_lex_state = 2},
-  [723] = {.lex_state = 62, .external_lex_state = 2},
-  [724] = {.lex_state = 62, .external_lex_state = 2},
-  [725] = {.lex_state = 15},
-  [726] = {.lex_state = 62, .external_lex_state = 2},
+  [673] = {.lex_state = 50, .external_lex_state = 2},
+  [674] = {.lex_state = 16, .external_lex_state = 2},
+  [675] = {.lex_state = 50, .external_lex_state = 2},
+  [676] = {.lex_state = 50, .external_lex_state = 2},
+  [677] = {.lex_state = 50, .external_lex_state = 2},
+  [678] = {.lex_state = 50, .external_lex_state = 2},
+  [679] = {.lex_state = 50, .external_lex_state = 2},
+  [680] = {.lex_state = 50, .external_lex_state = 2},
+  [681] = {.lex_state = 50, .external_lex_state = 2},
+  [682] = {.lex_state = 50, .external_lex_state = 2},
+  [683] = {.lex_state = 50, .external_lex_state = 2},
+  [684] = {.lex_state = 50, .external_lex_state = 2},
+  [685] = {.lex_state = 50, .external_lex_state = 2},
+  [686] = {.lex_state = 50, .external_lex_state = 2},
+  [687] = {.lex_state = 50, .external_lex_state = 2},
+  [688] = {.lex_state = 50, .external_lex_state = 2},
+  [689] = {.lex_state = 50, .external_lex_state = 2},
+  [690] = {.lex_state = 50, .external_lex_state = 2},
+  [691] = {.lex_state = 50, .external_lex_state = 2},
+  [692] = {.lex_state = 15},
+  [693] = {.lex_state = 50, .external_lex_state = 2},
+  [694] = {.lex_state = 50, .external_lex_state = 2},
+  [695] = {.lex_state = 50, .external_lex_state = 2},
+  [696] = {.lex_state = 50, .external_lex_state = 2},
+  [697] = {.lex_state = 50, .external_lex_state = 2},
+  [698] = {.lex_state = 16},
+  [699] = {.lex_state = 50, .external_lex_state = 2},
+  [700] = {.lex_state = 50, .external_lex_state = 2},
+  [701] = {.lex_state = 16},
+  [702] = {.lex_state = 50, .external_lex_state = 2},
+  [703] = {.lex_state = 15},
+  [704] = {.lex_state = 50, .external_lex_state = 2},
+  [705] = {.lex_state = 16},
+  [706] = {.lex_state = 16},
+  [707] = {.lex_state = 16, .external_lex_state = 6},
+  [708] = {.lex_state = 16, .external_lex_state = 4},
+  [709] = {.lex_state = 16, .external_lex_state = 4},
+  [710] = {.lex_state = 16, .external_lex_state = 4},
+  [711] = {.lex_state = 16, .external_lex_state = 6},
+  [712] = {.lex_state = 16, .external_lex_state = 6},
+  [713] = {.lex_state = 16, .external_lex_state = 2},
+  [714] = {.lex_state = 16, .external_lex_state = 6},
+  [715] = {.lex_state = 16, .external_lex_state = 2},
+  [716] = {.lex_state = 16, .external_lex_state = 6},
+  [717] = {.lex_state = 16, .external_lex_state = 6},
+  [718] = {.lex_state = 16, .external_lex_state = 6},
+  [719] = {.lex_state = 16, .external_lex_state = 6},
+  [720] = {.lex_state = 16, .external_lex_state = 2},
+  [721] = {.lex_state = 16, .external_lex_state = 6},
+  [722] = {.lex_state = 16, .external_lex_state = 6},
+  [723] = {.lex_state = 16, .external_lex_state = 6},
+  [724] = {.lex_state = 16, .external_lex_state = 6},
+  [725] = {.lex_state = 16, .external_lex_state = 6},
+  [726] = {.lex_state = 16},
   [727] = {.lex_state = 15},
-  [728] = {.lex_state = 62, .external_lex_state = 2},
-  [729] = {.lex_state = 62, .external_lex_state = 2},
-  [730] = {.lex_state = 62, .external_lex_state = 2},
-  [731] = {.lex_state = 15, .external_lex_state = 6},
-  [732] = {.lex_state = 15, .external_lex_state = 6},
+  [728] = {.lex_state = 16},
+  [729] = {.lex_state = 16},
+  [730] = {.lex_state = 16},
+  [731] = {.lex_state = 16},
+  [732] = {.lex_state = 16, .external_lex_state = 4},
   [733] = {.lex_state = 15, .external_lex_state = 6},
-  [734] = {.lex_state = 15, .external_lex_state = 6},
-  [735] = {.lex_state = 15, .external_lex_state = 6},
-  [736] = {.lex_state = 15, .external_lex_state = 2},
-  [737] = {.lex_state = 15, .external_lex_state = 6},
-  [738] = {.lex_state = 15, .external_lex_state = 6},
-  [739] = {.lex_state = 15, .external_lex_state = 6},
-  [740] = {.lex_state = 15},
-  [741] = {.lex_state = 15, .external_lex_state = 6},
-  [742] = {.lex_state = 15, .external_lex_state = 2},
-  [743] = {.lex_state = 15, .external_lex_state = 6},
-  [744] = {.lex_state = 15, .external_lex_state = 2},
-  [745] = {.lex_state = 15, .external_lex_state = 6},
-  [746] = {.lex_state = 15},
-  [747] = {.lex_state = 15},
-  [748] = {.lex_state = 15},
-  [749] = {.lex_state = 14},
+  [734] = {.lex_state = 16},
+  [735] = {.lex_state = 16, .external_lex_state = 4},
+  [736] = {.lex_state = 16},
+  [737] = {.lex_state = 15},
+  [738] = {.lex_state = 16},
+  [739] = {.lex_state = 16},
+  [740] = {.lex_state = 15, .external_lex_state = 6},
+  [741] = {.lex_state = 16},
+  [742] = {.lex_state = 16},
+  [743] = {.lex_state = 16},
+  [744] = {.lex_state = 15},
+  [745] = {.lex_state = 16},
+  [746] = {.lex_state = 16},
+  [747] = {.lex_state = 16},
+  [748] = {.lex_state = 16},
+  [749] = {.lex_state = 16},
   [750] = {.lex_state = 15},
-  [751] = {.lex_state = 15},
-  [752] = {.lex_state = 15},
-  [753] = {.lex_state = 15},
-  [754] = {.lex_state = 14, .external_lex_state = 6},
-  [755] = {.lex_state = 14, .external_lex_state = 6},
-  [756] = {.lex_state = 15},
-  [757] = {.lex_state = 15},
-  [758] = {.lex_state = 15, .external_lex_state = 4},
-  [759] = {.lex_state = 14},
-  [760] = {.lex_state = 14},
-  [761] = {.lex_state = 15},
-  [762] = {.lex_state = 15},
-  [763] = {.lex_state = 15},
-  [764] = {.lex_state = 14},
-  [765] = {.lex_state = 15},
-  [766] = {.lex_state = 15},
-  [767] = {.lex_state = 15},
-  [768] = {.lex_state = 15},
-  [769] = {.lex_state = 15, .external_lex_state = 4},
+  [751] = {.lex_state = 16},
+  [752] = {.lex_state = 16},
+  [753] = {.lex_state = 16, .external_lex_state = 6},
+  [754] = {.lex_state = 16, .external_lex_state = 6},
+  [755] = {.lex_state = 16, .external_lex_state = 6},
+  [756] = {.lex_state = 16, .external_lex_state = 6},
+  [757] = {.lex_state = 16, .external_lex_state = 6},
+  [758] = {.lex_state = 16, .external_lex_state = 6},
+  [759] = {.lex_state = 16, .external_lex_state = 6},
+  [760] = {.lex_state = 16, .external_lex_state = 6},
+  [761] = {.lex_state = 16, .external_lex_state = 6},
+  [762] = {.lex_state = 16, .external_lex_state = 6},
+  [763] = {.lex_state = 16, .external_lex_state = 6},
+  [764] = {.lex_state = 16, .external_lex_state = 6},
+  [765] = {.lex_state = 16},
+  [766] = {.lex_state = 16, .external_lex_state = 6},
+  [767] = {.lex_state = 16, .external_lex_state = 6},
+  [768] = {.lex_state = 16, .external_lex_state = 6},
+  [769] = {.lex_state = 15},
   [770] = {.lex_state = 15},
-  [771] = {.lex_state = 15, .external_lex_state = 6},
-  [772] = {.lex_state = 15, .external_lex_state = 6},
-  [773] = {.lex_state = 15, .external_lex_state = 6},
-  [774] = {.lex_state = 15, .external_lex_state = 6},
-  [775] = {.lex_state = 15, .external_lex_state = 6},
-  [776] = {.lex_state = 15, .external_lex_state = 6},
-  [777] = {.lex_state = 15, .external_lex_state = 6},
-  [778] = {.lex_state = 15, .external_lex_state = 6},
-  [779] = {.lex_state = 15},
-  [780] = {.lex_state = 15, .external_lex_state = 6},
-  [781] = {.lex_state = 15, .external_lex_state = 6},
-  [782] = {.lex_state = 15, .external_lex_state = 6},
-  [783] = {.lex_state = 15, .external_lex_state = 6},
-  [784] = {.lex_state = 15, .external_lex_state = 6},
-  [785] = {.lex_state = 15, .external_lex_state = 6},
-  [786] = {.lex_state = 15, .external_lex_state = 6},
-  [787] = {.lex_state = 15, .external_lex_state = 6},
-  [788] = {.lex_state = 15, .external_lex_state = 6},
-  [789] = {.lex_state = 15},
-  [790] = {.lex_state = 15, .external_lex_state = 6},
-  [791] = {.lex_state = 15, .external_lex_state = 6},
-  [792] = {.lex_state = 15, .external_lex_state = 6},
-  [793] = {.lex_state = 15, .external_lex_state = 6},
-  [794] = {.lex_state = 15, .external_lex_state = 6},
-  [795] = {.lex_state = 15, .external_lex_state = 6},
-  [796] = {.lex_state = 15, .external_lex_state = 6},
-  [797] = {.lex_state = 15, .external_lex_state = 6},
-  [798] = {.lex_state = 14},
-  [799] = {.lex_state = 15, .external_lex_state = 6},
-  [800] = {.lex_state = 15, .external_lex_state = 6},
-  [801] = {.lex_state = 14},
-  [802] = {.lex_state = 15, .external_lex_state = 6},
-  [803] = {.lex_state = 15, .external_lex_state = 6},
-  [804] = {.lex_state = 15, .external_lex_state = 6},
-  [805] = {.lex_state = 15, .external_lex_state = 6},
-  [806] = {.lex_state = 15},
-  [807] = {.lex_state = 15, .external_lex_state = 6},
-  [808] = {.lex_state = 15, .external_lex_state = 6},
-  [809] = {.lex_state = 15},
-  [810] = {.lex_state = 15},
-  [811] = {.lex_state = 15},
-  [812] = {.lex_state = 14},
-  [813] = {.lex_state = 15},
-  [814] = {.lex_state = 15},
-  [815] = {.lex_state = 15},
-  [816] = {.lex_state = 15},
-  [817] = {.lex_state = 15},
-  [818] = {.lex_state = 15},
-  [819] = {.lex_state = 15},
-  [820] = {.lex_state = 15},
-  [821] = {.lex_state = 15},
-  [822] = {.lex_state = 15},
+  [771] = {.lex_state = 16, .external_lex_state = 6},
+  [772] = {.lex_state = 16, .external_lex_state = 6},
+  [773] = {.lex_state = 16, .external_lex_state = 6},
+  [774] = {.lex_state = 16, .external_lex_state = 6},
+  [775] = {.lex_state = 16, .external_lex_state = 6},
+  [776] = {.lex_state = 16, .external_lex_state = 6},
+  [777] = {.lex_state = 16, .external_lex_state = 6},
+  [778] = {.lex_state = 16, .external_lex_state = 6},
+  [779] = {.lex_state = 16, .external_lex_state = 6},
+  [780] = {.lex_state = 16, .external_lex_state = 6},
+  [781] = {.lex_state = 16, .external_lex_state = 6},
+  [782] = {.lex_state = 16, .external_lex_state = 6},
+  [783] = {.lex_state = 16},
+  [784] = {.lex_state = 16, .external_lex_state = 6},
+  [785] = {.lex_state = 16, .external_lex_state = 6},
+  [786] = {.lex_state = 16, .external_lex_state = 6},
+  [787] = {.lex_state = 16, .external_lex_state = 6},
+  [788] = {.lex_state = 16},
+  [789] = {.lex_state = 16, .external_lex_state = 6},
+  [790] = {.lex_state = 16, .external_lex_state = 6},
+  [791] = {.lex_state = 16},
+  [792] = {.lex_state = 16},
+  [793] = {.lex_state = 16},
+  [794] = {.lex_state = 16},
+  [795] = {.lex_state = 16},
+  [796] = {.lex_state = 16},
+  [797] = {.lex_state = 16},
+  [798] = {.lex_state = 16},
+  [799] = {.lex_state = 16},
+  [800] = {.lex_state = 16},
+  [801] = {.lex_state = 16},
+  [802] = {.lex_state = 16},
+  [803] = {.lex_state = 16},
+  [804] = {.lex_state = 16},
+  [805] = {.lex_state = 16},
+  [806] = {.lex_state = 16},
+  [807] = {.lex_state = 16},
+  [808] = {.lex_state = 16},
+  [809] = {.lex_state = 16},
+  [810] = {.lex_state = 16},
+  [811] = {.lex_state = 16},
+  [812] = {.lex_state = 16},
+  [813] = {.lex_state = 16},
+  [814] = {.lex_state = 16},
+  [815] = {.lex_state = 16},
+  [816] = {.lex_state = 16},
+  [817] = {.lex_state = 16},
+  [818] = {.lex_state = 16},
+  [819] = {.lex_state = 16},
+  [820] = {.lex_state = 16},
+  [821] = {.lex_state = 16},
+  [822] = {.lex_state = 16},
   [823] = {.lex_state = 15},
   [824] = {.lex_state = 15},
-  [825] = {.lex_state = 15},
-  [826] = {.lex_state = 15},
-  [827] = {.lex_state = 15},
-  [828] = {.lex_state = 15},
-  [829] = {.lex_state = 15},
-  [830] = {.lex_state = 15},
-  [831] = {.lex_state = 15},
-  [832] = {.lex_state = 15},
-  [833] = {.lex_state = 15},
-  [834] = {.lex_state = 15},
-  [835] = {.lex_state = 15},
-  [836] = {.lex_state = 15},
-  [837] = {.lex_state = 14},
-  [838] = {.lex_state = 15},
-  [839] = {.lex_state = 15},
-  [840] = {.lex_state = 15},
-  [841] = {.lex_state = 15},
-  [842] = {.lex_state = 15},
-  [843] = {.lex_state = 15},
-  [844] = {.lex_state = 15},
-  [845] = {.lex_state = 15},
-  [846] = {.lex_state = 15},
-  [847] = {.lex_state = 15},
-  [848] = {.lex_state = 15},
-  [849] = {.lex_state = 62, .external_lex_state = 2},
-  [850] = {.lex_state = 16, .external_lex_state = 2},
-  [851] = {.lex_state = 16, .external_lex_state = 2},
-  [852] = {.lex_state = 62, .external_lex_state = 2},
-  [853] = {.lex_state = 62, .external_lex_state = 2},
-  [854] = {.lex_state = 62, .external_lex_state = 2},
-  [855] = {.lex_state = 62, .external_lex_state = 2},
-  [856] = {.lex_state = 62, .external_lex_state = 2},
-  [857] = {.lex_state = 62, .external_lex_state = 2},
-  [858] = {.lex_state = 62, .external_lex_state = 2},
-  [859] = {.lex_state = 62, .external_lex_state = 2},
-  [860] = {.lex_state = 62, .external_lex_state = 2},
-  [861] = {.lex_state = 62, .external_lex_state = 2},
-  [862] = {.lex_state = 62, .external_lex_state = 2},
-  [863] = {.lex_state = 62, .external_lex_state = 2},
-  [864] = {.lex_state = 62, .external_lex_state = 2},
-  [865] = {.lex_state = 62, .external_lex_state = 2},
-  [866] = {.lex_state = 62, .external_lex_state = 2},
-  [867] = {.lex_state = 62, .external_lex_state = 2},
-  [868] = {.lex_state = 16},
-  [869] = {.lex_state = 16},
-  [870] = {.lex_state = 16},
-  [871] = {.lex_state = 16},
-  [872] = {.lex_state = 16},
-  [873] = {.lex_state = 16},
-  [874] = {.lex_state = 16},
-  [875] = {.lex_state = 16},
-  [876] = {.lex_state = 16},
-  [877] = {.lex_state = 62, .external_lex_state = 6},
-  [878] = {.lex_state = 62, .external_lex_state = 6},
-  [879] = {.lex_state = 15},
-  [880] = {.lex_state = 15},
-  [881] = {.lex_state = 16},
-  [882] = {.lex_state = 15},
-  [883] = {.lex_state = 16},
-  [884] = {.lex_state = 16},
-  [885] = {.lex_state = 16},
-  [886] = {.lex_state = 16},
+  [825] = {.lex_state = 16},
+  [826] = {.lex_state = 16},
+  [827] = {.lex_state = 16},
+  [828] = {.lex_state = 16},
+  [829] = {.lex_state = 16},
+  [830] = {.lex_state = 16},
+  [831] = {.lex_state = 50, .external_lex_state = 2},
+  [832] = {.lex_state = 14, .external_lex_state = 2},
+  [833] = {.lex_state = 50, .external_lex_state = 2},
+  [834] = {.lex_state = 14, .external_lex_state = 2},
+  [835] = {.lex_state = 50, .external_lex_state = 2},
+  [836] = {.lex_state = 50, .external_lex_state = 2},
+  [837] = {.lex_state = 50, .external_lex_state = 2},
+  [838] = {.lex_state = 50, .external_lex_state = 2},
+  [839] = {.lex_state = 50, .external_lex_state = 2},
+  [840] = {.lex_state = 50, .external_lex_state = 2},
+  [841] = {.lex_state = 50, .external_lex_state = 2},
+  [842] = {.lex_state = 50, .external_lex_state = 2},
+  [843] = {.lex_state = 50, .external_lex_state = 2},
+  [844] = {.lex_state = 50, .external_lex_state = 2},
+  [845] = {.lex_state = 50, .external_lex_state = 2},
+  [846] = {.lex_state = 50, .external_lex_state = 2},
+  [847] = {.lex_state = 50, .external_lex_state = 2},
+  [848] = {.lex_state = 50, .external_lex_state = 2},
+  [849] = {.lex_state = 50, .external_lex_state = 2},
+  [850] = {.lex_state = 14},
+  [851] = {.lex_state = 14},
+  [852] = {.lex_state = 14},
+  [853] = {.lex_state = 14},
+  [854] = {.lex_state = 14},
+  [855] = {.lex_state = 14},
+  [856] = {.lex_state = 14},
+  [857] = {.lex_state = 0, .external_lex_state = 6},
+  [858] = {.lex_state = 0, .external_lex_state = 6},
+  [859] = {.lex_state = 14},
+  [860] = {.lex_state = 14},
+  [861] = {.lex_state = 16},
+  [862] = {.lex_state = 16},
+  [863] = {.lex_state = 14},
+  [864] = {.lex_state = 14},
+  [865] = {.lex_state = 16},
+  [866] = {.lex_state = 14},
+  [867] = {.lex_state = 14},
+  [868] = {.lex_state = 14},
+  [869] = {.lex_state = 14},
+  [870] = {.lex_state = 14},
+  [871] = {.lex_state = 14},
+  [872] = {.lex_state = 14},
+  [873] = {.lex_state = 50, .external_lex_state = 2},
+  [874] = {.lex_state = 0},
+  [875] = {.lex_state = 50, .external_lex_state = 2},
+  [876] = {.lex_state = 50, .external_lex_state = 2},
+  [877] = {.lex_state = 14},
+  [878] = {.lex_state = 0},
+  [879] = {.lex_state = 14},
+  [880] = {.lex_state = 14},
+  [881] = {.lex_state = 0},
+  [882] = {.lex_state = 14},
+  [883] = {.lex_state = 14},
+  [884] = {.lex_state = 0},
+  [885] = {.lex_state = 0},
+  [886] = {.lex_state = 50, .external_lex_state = 2},
   [887] = {.lex_state = 16},
-  [888] = {.lex_state = 16},
-  [889] = {.lex_state = 16},
-  [890] = {.lex_state = 16},
-  [891] = {.lex_state = 62, .external_lex_state = 2},
-  [892] = {.lex_state = 62, .external_lex_state = 2},
-  [893] = {.lex_state = 62},
-  [894] = {.lex_state = 62, .external_lex_state = 2},
-  [895] = {.lex_state = 62},
-  [896] = {.lex_state = 16},
-  [897] = {.lex_state = 16},
-  [898] = {.lex_state = 16},
-  [899] = {.lex_state = 62},
-  [900] = {.lex_state = 16},
-  [901] = {.lex_state = 16},
-  [902] = {.lex_state = 62},
-  [903] = {.lex_state = 62},
-  [904] = {.lex_state = 16},
-  [905] = {.lex_state = 62, .external_lex_state = 2},
-  [906] = {.lex_state = 15},
-  [907] = {.lex_state = 16},
-  [908] = {.lex_state = 16},
-  [909] = {.lex_state = 16},
-  [910] = {.lex_state = 15},
-  [911] = {.lex_state = 16},
-  [912] = {.lex_state = 16},
-  [913] = {.lex_state = 16, .external_lex_state = 2},
-  [914] = {.lex_state = 16},
-  [915] = {.lex_state = 62},
-  [916] = {.lex_state = 16},
-  [917] = {.lex_state = 15},
-  [918] = {.lex_state = 16},
-  [919] = {.lex_state = 16},
-  [920] = {.lex_state = 16},
-  [921] = {.lex_state = 16},
-  [922] = {.lex_state = 16},
-  [923] = {.lex_state = 16},
-  [924] = {.lex_state = 16},
-  [925] = {.lex_state = 15},
-  [926] = {.lex_state = 16},
-  [927] = {.lex_state = 16},
-  [928] = {.lex_state = 16},
-  [929] = {.lex_state = 16},
-  [930] = {.lex_state = 62},
-  [931] = {.lex_state = 62},
-  [932] = {.lex_state = 62},
-  [933] = {.lex_state = 16},
-  [934] = {.lex_state = 18, .external_lex_state = 7},
-  [935] = {.lex_state = 62},
-  [936] = {.lex_state = 18, .external_lex_state = 7},
-  [937] = {.lex_state = 18, .external_lex_state = 7},
-  [938] = {.lex_state = 18, .external_lex_state = 7},
-  [939] = {.lex_state = 16},
-  [940] = {.lex_state = 62},
-  [941] = {.lex_state = 62},
-  [942] = {.lex_state = 18, .external_lex_state = 7},
-  [943] = {.lex_state = 16},
-  [944] = {.lex_state = 18, .external_lex_state = 7},
-  [945] = {.lex_state = 62},
-  [946] = {.lex_state = 62},
-  [947] = {.lex_state = 16},
-  [948] = {.lex_state = 16},
-  [949] = {.lex_state = 18, .external_lex_state = 7},
-  [950] = {.lex_state = 18, .external_lex_state = 7},
-  [951] = {.lex_state = 16},
-  [952] = {.lex_state = 18, .external_lex_state = 7},
-  [953] = {.lex_state = 62},
-  [954] = {.lex_state = 16},
-  [955] = {.lex_state = 62},
-  [956] = {.lex_state = 62},
-  [957] = {.lex_state = 16},
-  [958] = {.lex_state = 62},
-  [959] = {.lex_state = 62},
-  [960] = {.lex_state = 16},
-  [961] = {.lex_state = 16},
-  [962] = {.lex_state = 62},
-  [963] = {.lex_state = 62},
-  [964] = {.lex_state = 16},
-  [965] = {.lex_state = 0},
-  [966] = {.lex_state = 16},
-  [967] = {.lex_state = 62, .external_lex_state = 6},
-  [968] = {.lex_state = 16},
-  [969] = {.lex_state = 16},
-  [970] = {.lex_state = 16},
-  [971] = {.lex_state = 16},
-  [972] = {.lex_state = 16},
-  [973] = {.lex_state = 16},
-  [974] = {.lex_state = 62, .external_lex_state = 6},
-  [975] = {.lex_state = 16},
-  [976] = {.lex_state = 62, .external_lex_state = 6},
-  [977] = {.lex_state = 16},
-  [978] = {.lex_state = 62},
-  [979] = {.lex_state = 62},
-  [980] = {.lex_state = 62, .external_lex_state = 6},
-  [981] = {.lex_state = 16},
-  [982] = {.lex_state = 62, .external_lex_state = 6},
-  [983] = {.lex_state = 0},
-  [984] = {.lex_state = 16},
-  [985] = {.lex_state = 16},
-  [986] = {.lex_state = 16},
-  [987] = {.lex_state = 16},
-  [988] = {.lex_state = 16},
-  [989] = {.lex_state = 16},
-  [990] = {.lex_state = 16},
+  [888] = {.lex_state = 14},
+  [889] = {.lex_state = 14},
+  [890] = {.lex_state = 14},
+  [891] = {.lex_state = 14},
+  [892] = {.lex_state = 16},
+  [893] = {.lex_state = 14},
+  [894] = {.lex_state = 14},
+  [895] = {.lex_state = 14},
+  [896] = {.lex_state = 14},
+  [897] = {.lex_state = 14},
+  [898] = {.lex_state = 0},
+  [899] = {.lex_state = 14},
+  [900] = {.lex_state = 14},
+  [901] = {.lex_state = 14},
+  [902] = {.lex_state = 14, .external_lex_state = 2},
+  [903] = {.lex_state = 14},
+  [904] = {.lex_state = 14},
+  [905] = {.lex_state = 16},
+  [906] = {.lex_state = 16},
+  [907] = {.lex_state = 14},
+  [908] = {.lex_state = 14},
+  [909] = {.lex_state = 14},
+  [910] = {.lex_state = 14},
+  [911] = {.lex_state = 14},
+  [912] = {.lex_state = 14},
+  [913] = {.lex_state = 0},
+  [914] = {.lex_state = 14},
+  [915] = {.lex_state = 18, .external_lex_state = 7},
+  [916] = {.lex_state = 18, .external_lex_state = 7},
+  [917] = {.lex_state = 0},
+  [918] = {.lex_state = 0},
+  [919] = {.lex_state = 14},
+  [920] = {.lex_state = 14},
+  [921] = {.lex_state = 18, .external_lex_state = 7},
+  [922] = {.lex_state = 18, .external_lex_state = 7},
+  [923] = {.lex_state = 18, .external_lex_state = 7},
+  [924] = {.lex_state = 18, .external_lex_state = 7},
+  [925] = {.lex_state = 14},
+  [926] = {.lex_state = 0},
+  [927] = {.lex_state = 0},
+  [928] = {.lex_state = 18, .external_lex_state = 7},
+  [929] = {.lex_state = 0},
+  [930] = {.lex_state = 0},
+  [931] = {.lex_state = 18, .external_lex_state = 7},
+  [932] = {.lex_state = 0},
+  [933] = {.lex_state = 18, .external_lex_state = 7},
+  [934] = {.lex_state = 0},
+  [935] = {.lex_state = 0},
+  [936] = {.lex_state = 0},
+  [937] = {.lex_state = 14},
+  [938] = {.lex_state = 0},
+  [939] = {.lex_state = 0},
+  [940] = {.lex_state = 14},
+  [941] = {.lex_state = 14},
+  [942] = {.lex_state = 0},
+  [943] = {.lex_state = 0},
+  [944] = {.lex_state = 14},
+  [945] = {.lex_state = 14},
+  [946] = {.lex_state = 0, .external_lex_state = 6},
+  [947] = {.lex_state = 0},
+  [948] = {.lex_state = 14},
+  [949] = {.lex_state = 14},
+  [950] = {.lex_state = 0, .external_lex_state = 6},
+  [951] = {.lex_state = 14},
+  [952] = {.lex_state = 14},
+  [953] = {.lex_state = 14},
+  [954] = {.lex_state = 14},
+  [955] = {.lex_state = 14},
+  [956] = {.lex_state = 0, .external_lex_state = 6},
+  [957] = {.lex_state = 0},
+  [958] = {.lex_state = 14},
+  [959] = {.lex_state = 14},
+  [960] = {.lex_state = 14},
+  [961] = {.lex_state = 14},
+  [962] = {.lex_state = 0, .external_lex_state = 6},
+  [963] = {.lex_state = 14},
+  [964] = {.lex_state = 14},
+  [965] = {.lex_state = 14},
+  [966] = {.lex_state = 14},
+  [967] = {.lex_state = 14},
+  [968] = {.lex_state = 14},
+  [969] = {.lex_state = 14},
+  [970] = {.lex_state = 14},
+  [971] = {.lex_state = 0, .external_lex_state = 6},
+  [972] = {.lex_state = 0},
+  [973] = {.lex_state = 0, .external_lex_state = 6},
+  [974] = {.lex_state = 14},
+  [975] = {.lex_state = 0, .external_lex_state = 6},
+  [976] = {.lex_state = 0},
+  [977] = {.lex_state = 0},
+  [978] = {.lex_state = 0, .external_lex_state = 6},
+  [979] = {.lex_state = 0, .external_lex_state = 6},
+  [980] = {.lex_state = 0},
+  [981] = {.lex_state = 0},
+  [982] = {.lex_state = 0},
+  [983] = {.lex_state = 16},
+  [984] = {.lex_state = 14},
+  [985] = {.lex_state = 0, .external_lex_state = 6},
+  [986] = {.lex_state = 14},
+  [987] = {.lex_state = 0, .external_lex_state = 6},
+  [988] = {.lex_state = 14},
+  [989] = {.lex_state = 14},
+  [990] = {.lex_state = 14},
   [991] = {.lex_state = 0},
-  [992] = {.lex_state = 62, .external_lex_state = 6},
+  [992] = {.lex_state = 14},
   [993] = {.lex_state = 16},
-  [994] = {.lex_state = 62},
-  [995] = {.lex_state = 62},
-  [996] = {.lex_state = 62},
-  [997] = {.lex_state = 62, .external_lex_state = 6},
-  [998] = {.lex_state = 16},
-  [999] = {.lex_state = 15},
-  [1000] = {.lex_state = 62, .external_lex_state = 6},
-  [1001] = {.lex_state = 62, .external_lex_state = 6},
-  [1002] = {.lex_state = 62},
-  [1003] = {.lex_state = 0},
-  [1004] = {.lex_state = 16},
-  [1005] = {.lex_state = 16},
-  [1006] = {.lex_state = 16},
-  [1007] = {.lex_state = 62, .external_lex_state = 6},
-  [1008] = {.lex_state = 16},
-  [1009] = {.lex_state = 62, .external_lex_state = 6},
-  [1010] = {.lex_state = 16},
-  [1011] = {.lex_state = 16},
-  [1012] = {.lex_state = 62},
-  [1013] = {.lex_state = 62},
-  [1014] = {.lex_state = 62, .external_lex_state = 6},
-  [1015] = {.lex_state = 16},
-  [1016] = {.lex_state = 15},
-  [1017] = {.lex_state = 62},
-  [1018] = {.lex_state = 62},
-  [1019] = {.lex_state = 62, .external_lex_state = 6},
-  [1020] = {.lex_state = 62},
-  [1021] = {.lex_state = 16},
-  [1022] = {.lex_state = 16},
-  [1023] = {.lex_state = 16},
-  [1024] = {.lex_state = 16},
-  [1025] = {.lex_state = 16},
-  [1026] = {.lex_state = 62, .external_lex_state = 6},
-  [1027] = {.lex_state = 16},
-  [1028] = {.lex_state = 16},
-  [1029] = {.lex_state = 16},
-  [1030] = {.lex_state = 16},
-  [1031] = {.lex_state = 18, .external_lex_state = 7},
-  [1032] = {.lex_state = 16},
-  [1033] = {.lex_state = 62},
-  [1034] = {.lex_state = 62, .external_lex_state = 6},
-  [1035] = {.lex_state = 16},
-  [1036] = {.lex_state = 62, .external_lex_state = 6},
-  [1037] = {.lex_state = 62},
-  [1038] = {.lex_state = 62},
-  [1039] = {.lex_state = 62},
-  [1040] = {.lex_state = 16},
-  [1041] = {.lex_state = 16},
-  [1042] = {.lex_state = 16},
-  [1043] = {.lex_state = 62, .external_lex_state = 6},
-  [1044] = {.lex_state = 62, .external_lex_state = 6},
-  [1045] = {.lex_state = 62, .external_lex_state = 6},
-  [1046] = {.lex_state = 62, .external_lex_state = 6},
-  [1047] = {.lex_state = 16},
-  [1048] = {.lex_state = 62, .external_lex_state = 6},
-  [1049] = {.lex_state = 62},
-  [1050] = {.lex_state = 16},
-  [1051] = {.lex_state = 16},
-  [1052] = {.lex_state = 62},
-  [1053] = {.lex_state = 62},
-  [1054] = {.lex_state = 62, .external_lex_state = 6},
-  [1055] = {.lex_state = 18, .external_lex_state = 7},
-  [1056] = {.lex_state = 62},
-  [1057] = {.lex_state = 15, .external_lex_state = 6},
-  [1058] = {.lex_state = 15},
-  [1059] = {.lex_state = 16},
-  [1060] = {.lex_state = 18, .external_lex_state = 7},
-  [1061] = {.lex_state = 15},
-  [1062] = {.lex_state = 62},
-  [1063] = {.lex_state = 16},
-  [1064] = {.lex_state = 16},
-  [1065] = {.lex_state = 62, .external_lex_state = 6},
-  [1066] = {.lex_state = 62, .external_lex_state = 6},
-  [1067] = {.lex_state = 18, .external_lex_state = 7},
-  [1068] = {.lex_state = 15, .external_lex_state = 6},
-  [1069] = {.lex_state = 18, .external_lex_state = 7},
-  [1070] = {.lex_state = 16},
-  [1071] = {.lex_state = 62},
-  [1072] = {.lex_state = 18, .external_lex_state = 7},
-  [1073] = {.lex_state = 16},
-  [1074] = {.lex_state = 18, .external_lex_state = 7},
-  [1075] = {.lex_state = 16},
-  [1076] = {.lex_state = 18, .external_lex_state = 7},
-  [1077] = {.lex_state = 16},
-  [1078] = {.lex_state = 62, .external_lex_state = 6},
-  [1079] = {.lex_state = 16},
-  [1080] = {.lex_state = 16},
-  [1081] = {.lex_state = 16},
-  [1082] = {.lex_state = 62, .external_lex_state = 6},
-  [1083] = {.lex_state = 16},
-  [1084] = {.lex_state = 16},
-  [1085] = {.lex_state = 16},
-  [1086] = {.lex_state = 16},
-  [1087] = {.lex_state = 16},
-  [1088] = {.lex_state = 15, .external_lex_state = 6},
-  [1089] = {.lex_state = 16},
-  [1090] = {.lex_state = 62},
-  [1091] = {.lex_state = 62},
-  [1092] = {.lex_state = 62, .external_lex_state = 6},
-  [1093] = {.lex_state = 62, .external_lex_state = 6},
-  [1094] = {.lex_state = 62, .external_lex_state = 6},
-  [1095] = {.lex_state = 62, .external_lex_state = 6},
-  [1096] = {.lex_state = 62, .external_lex_state = 6},
-  [1097] = {.lex_state = 16},
-  [1098] = {.lex_state = 62},
-  [1099] = {.lex_state = 8},
+  [994] = {.lex_state = 18, .external_lex_state = 7},
+  [995] = {.lex_state = 0, .external_lex_state = 6},
+  [996] = {.lex_state = 0, .external_lex_state = 6},
+  [997] = {.lex_state = 0},
+  [998] = {.lex_state = 0, .external_lex_state = 6},
+  [999] = {.lex_state = 14},
+  [1000] = {.lex_state = 14},
+  [1001] = {.lex_state = 18, .external_lex_state = 7},
+  [1002] = {.lex_state = 0},
+  [1003] = {.lex_state = 14},
+  [1004] = {.lex_state = 14},
+  [1005] = {.lex_state = 0},
+  [1006] = {.lex_state = 0},
+  [1007] = {.lex_state = 14},
+  [1008] = {.lex_state = 14},
+  [1009] = {.lex_state = 14},
+  [1010] = {.lex_state = 14},
+  [1011] = {.lex_state = 14},
+  [1012] = {.lex_state = 14},
+  [1013] = {.lex_state = 0},
+  [1014] = {.lex_state = 0, .external_lex_state = 6},
+  [1015] = {.lex_state = 0},
+  [1016] = {.lex_state = 14},
+  [1017] = {.lex_state = 14},
+  [1018] = {.lex_state = 14},
+  [1019] = {.lex_state = 0, .external_lex_state = 6},
+  [1020] = {.lex_state = 0},
+  [1021] = {.lex_state = 0, .external_lex_state = 6},
+  [1022] = {.lex_state = 0},
+  [1023] = {.lex_state = 14},
+  [1024] = {.lex_state = 0},
+  [1025] = {.lex_state = 0, .external_lex_state = 6},
+  [1026] = {.lex_state = 0, .external_lex_state = 6},
+  [1027] = {.lex_state = 0, .external_lex_state = 6},
+  [1028] = {.lex_state = 14},
+  [1029] = {.lex_state = 0, .external_lex_state = 6},
+  [1030] = {.lex_state = 0},
+  [1031] = {.lex_state = 0},
+  [1032] = {.lex_state = 0},
+  [1033] = {.lex_state = 14},
+  [1034] = {.lex_state = 0},
+  [1035] = {.lex_state = 0},
+  [1036] = {.lex_state = 0},
+  [1037] = {.lex_state = 16, .external_lex_state = 6},
+  [1038] = {.lex_state = 14},
+  [1039] = {.lex_state = 18, .external_lex_state = 7},
+  [1040] = {.lex_state = 0, .external_lex_state = 6},
+  [1041] = {.lex_state = 14},
+  [1042] = {.lex_state = 16, .external_lex_state = 6},
+  [1043] = {.lex_state = 18, .external_lex_state = 7},
+  [1044] = {.lex_state = 14},
+  [1045] = {.lex_state = 0},
+  [1046] = {.lex_state = 16},
+  [1047] = {.lex_state = 14},
+  [1048] = {.lex_state = 18, .external_lex_state = 7},
+  [1049] = {.lex_state = 14},
+  [1050] = {.lex_state = 18, .external_lex_state = 7},
+  [1051] = {.lex_state = 14},
+  [1052] = {.lex_state = 14},
+  [1053] = {.lex_state = 18, .external_lex_state = 7},
+  [1054] = {.lex_state = 14},
+  [1055] = {.lex_state = 0},
+  [1056] = {.lex_state = 14},
+  [1057] = {.lex_state = 14},
+  [1058] = {.lex_state = 16},
+  [1059] = {.lex_state = 0, .external_lex_state = 6},
+  [1060] = {.lex_state = 0, .external_lex_state = 6},
+  [1061] = {.lex_state = 14},
+  [1062] = {.lex_state = 14},
+  [1063] = {.lex_state = 14},
+  [1064] = {.lex_state = 14},
+  [1065] = {.lex_state = 0, .external_lex_state = 6},
+  [1066] = {.lex_state = 14},
+  [1067] = {.lex_state = 14},
+  [1068] = {.lex_state = 18, .external_lex_state = 7},
+  [1069] = {.lex_state = 14},
+  [1070] = {.lex_state = 16, .external_lex_state = 6},
+  [1071] = {.lex_state = 14},
+  [1072] = {.lex_state = 0},
+  [1073] = {.lex_state = 14},
+  [1074] = {.lex_state = 0, .external_lex_state = 6},
+  [1075] = {.lex_state = 16, .external_lex_state = 6},
+  [1076] = {.lex_state = 0},
+  [1077] = {.lex_state = 0},
+  [1078] = {.lex_state = 0},
+  [1079] = {.lex_state = 0, .external_lex_state = 6},
+  [1080] = {.lex_state = 0, .external_lex_state = 6},
+  [1081] = {.lex_state = 0},
+  [1082] = {.lex_state = 0},
+  [1083] = {.lex_state = 0, .external_lex_state = 6},
+  [1084] = {.lex_state = 14},
+  [1085] = {.lex_state = 0, .external_lex_state = 6},
+  [1086] = {.lex_state = 0},
+  [1087] = {.lex_state = 0, .external_lex_state = 6},
+  [1088] = {.lex_state = 0, .external_lex_state = 6},
+  [1089] = {.lex_state = 0},
+  [1090] = {.lex_state = 14},
+  [1091] = {.lex_state = 14},
+  [1092] = {.lex_state = 0},
+  [1093] = {.lex_state = 0},
+  [1094] = {.lex_state = 8},
+  [1095] = {.lex_state = 14},
+  [1096] = {.lex_state = 0},
+  [1097] = {.lex_state = 0, .external_lex_state = 6},
+  [1098] = {.lex_state = 8},
+  [1099] = {.lex_state = 0},
   [1100] = {.lex_state = 0},
-  [1101] = {.lex_state = 15, .external_lex_state = 6},
-  [1102] = {.lex_state = 62},
-  [1103] = {.lex_state = 62},
-  [1104] = {.lex_state = 16},
-  [1105] = {.lex_state = 62, .external_lex_state = 6},
-  [1106] = {.lex_state = 16},
-  [1107] = {.lex_state = 16},
-  [1108] = {.lex_state = 16},
-  [1109] = {.lex_state = 62, .external_lex_state = 6},
-  [1110] = {.lex_state = 16},
+  [1101] = {.lex_state = 0},
+  [1102] = {.lex_state = 0, .external_lex_state = 6},
+  [1103] = {.lex_state = 0, .external_lex_state = 6},
+  [1104] = {.lex_state = 14},
+  [1105] = {.lex_state = 0, .external_lex_state = 6},
+  [1106] = {.lex_state = 14},
+  [1107] = {.lex_state = 0, .external_lex_state = 6},
+  [1108] = {.lex_state = 8},
+  [1109] = {.lex_state = 14},
+  [1110] = {.lex_state = 0},
   [1111] = {.lex_state = 0},
-  [1112] = {.lex_state = 62, .external_lex_state = 6},
-  [1113] = {.lex_state = 62, .external_lex_state = 6},
-  [1114] = {.lex_state = 0},
-  [1115] = {.lex_state = 0},
-  [1116] = {.lex_state = 62},
-  [1117] = {.lex_state = 8},
-  [1118] = {.lex_state = 62, .external_lex_state = 6},
-  [1119] = {.lex_state = 62},
-  [1120] = {.lex_state = 16},
-  [1121] = {.lex_state = 62, .external_lex_state = 6},
-  [1122] = {.lex_state = 62, .external_lex_state = 6},
-  [1123] = {.lex_state = 16},
-  [1124] = {.lex_state = 62},
-  [1125] = {.lex_state = 8},
-  [1126] = {.lex_state = 62},
-  [1127] = {.lex_state = 62},
-  [1128] = {.lex_state = 0},
-  [1129] = {.lex_state = 62},
-  [1130] = {.lex_state = 62},
-  [1131] = {.lex_state = 0},
+  [1112] = {.lex_state = 14},
+  [1113] = {.lex_state = 0},
+  [1114] = {.lex_state = 14},
+  [1115] = {.lex_state = 14},
+  [1116] = {.lex_state = 0},
+  [1117] = {.lex_state = 14},
+  [1118] = {.lex_state = 0},
+  [1119] = {.lex_state = 0, .external_lex_state = 6},
+  [1120] = {.lex_state = 0, .external_lex_state = 6},
+  [1121] = {.lex_state = 0, .external_lex_state = 6},
+  [1122] = {.lex_state = 14},
+  [1123] = {.lex_state = 0, .external_lex_state = 6},
+  [1124] = {.lex_state = 0, .external_lex_state = 6},
+  [1125] = {.lex_state = 16},
+  [1126] = {.lex_state = 14},
+  [1127] = {.lex_state = 0},
+  [1128] = {.lex_state = 0, .external_lex_state = 6},
+  [1129] = {.lex_state = 0, .external_lex_state = 6},
+  [1130] = {.lex_state = 0, .external_lex_state = 6},
+  [1131] = {.lex_state = 0, .external_lex_state = 6},
   [1132] = {.lex_state = 0},
-  [1133] = {.lex_state = 16},
-  [1134] = {.lex_state = 16},
-  [1135] = {.lex_state = 16},
-  [1136] = {.lex_state = 16},
-  [1137] = {.lex_state = 0, .external_lex_state = 6},
-  [1138] = {.lex_state = 0, .external_lex_state = 6},
-  [1139] = {.lex_state = 16},
-  [1140] = {.lex_state = 16},
-  [1141] = {.lex_state = 16},
-  [1142] = {.lex_state = 62},
+  [1133] = {.lex_state = 0, .external_lex_state = 6},
+  [1134] = {.lex_state = 0},
+  [1135] = {.lex_state = 0},
+  [1136] = {.lex_state = 0},
+  [1137] = {.lex_state = 0},
+  [1138] = {.lex_state = 14},
+  [1139] = {.lex_state = 14, .external_lex_state = 2},
+  [1140] = {.lex_state = 14},
+  [1141] = {.lex_state = 0, .external_lex_state = 6},
+  [1142] = {.lex_state = 14},
   [1143] = {.lex_state = 0, .external_lex_state = 6},
-  [1144] = {.lex_state = 15},
-  [1145] = {.lex_state = 16},
+  [1144] = {.lex_state = 16},
+  [1145] = {.lex_state = 14},
   [1146] = {.lex_state = 0},
-  [1147] = {.lex_state = 62},
-  [1148] = {.lex_state = 16},
-  [1149] = {.lex_state = 62},
+  [1147] = {.lex_state = 14},
+  [1148] = {.lex_state = 0},
+  [1149] = {.lex_state = 14},
   [1150] = {.lex_state = 0, .external_lex_state = 6},
-  [1151] = {.lex_state = 16},
-  [1152] = {.lex_state = 62},
-  [1153] = {.lex_state = 16},
+  [1151] = {.lex_state = 0},
+  [1152] = {.lex_state = 0},
+  [1153] = {.lex_state = 14},
   [1154] = {.lex_state = 0, .external_lex_state = 6},
   [1155] = {.lex_state = 0, .external_lex_state = 6},
-  [1156] = {.lex_state = 62, .external_lex_state = 6},
-  [1157] = {.lex_state = 16},
-  [1158] = {.lex_state = 16},
-  [1159] = {.lex_state = 16},
-  [1160] = {.lex_state = 0, .external_lex_state = 6},
-  [1161] = {.lex_state = 62},
-  [1162] = {.lex_state = 0, .external_lex_state = 6},
-  [1163] = {.lex_state = 0, .external_lex_state = 6},
-  [1164] = {.lex_state = 0, .external_lex_state = 6},
-  [1165] = {.lex_state = 15},
-  [1166] = {.lex_state = 0},
+  [1156] = {.lex_state = 0},
+  [1157] = {.lex_state = 0, .external_lex_state = 6},
+  [1158] = {.lex_state = 0, .external_lex_state = 6},
+  [1159] = {.lex_state = 0, .external_lex_state = 6},
+  [1160] = {.lex_state = 14},
+  [1161] = {.lex_state = 0},
+  [1162] = {.lex_state = 0},
+  [1163] = {.lex_state = 14},
+  [1164] = {.lex_state = 0},
+  [1165] = {.lex_state = 0},
+  [1166] = {.lex_state = 14},
   [1167] = {.lex_state = 0},
-  [1168] = {.lex_state = 16, .external_lex_state = 2},
-  [1169] = {.lex_state = 62},
+  [1168] = {.lex_state = 0},
+  [1169] = {.lex_state = 0},
   [1170] = {.lex_state = 0},
-  [1171] = {.lex_state = 0, .external_lex_state = 6},
+  [1171] = {.lex_state = 14},
   [1172] = {.lex_state = 0, .external_lex_state = 6},
-  [1173] = {.lex_state = 16},
-  [1174] = {.lex_state = 0, .external_lex_state = 6},
+  [1173] = {.lex_state = 14},
+  [1174] = {.lex_state = 0},
   [1175] = {.lex_state = 0},
   [1176] = {.lex_state = 0},
-  [1177] = {.lex_state = 16},
-  [1178] = {.lex_state = 16},
-  [1179] = {.lex_state = 62},
-  [1180] = {.lex_state = 62},
-  [1181] = {.lex_state = 16},
-  [1182] = {.lex_state = 62},
-  [1183] = {.lex_state = 62, .external_lex_state = 6},
-  [1184] = {.lex_state = 62},
-  [1185] = {.lex_state = 62},
-  [1186] = {.lex_state = 62},
-  [1187] = {.lex_state = 62, .external_lex_state = 6},
-  [1188] = {.lex_state = 62},
-  [1189] = {.lex_state = 0, .external_lex_state = 6},
-  [1190] = {.lex_state = 16},
-  [1191] = {.lex_state = 0, .external_lex_state = 6},
-  [1192] = {.lex_state = 0, .external_lex_state = 6},
-  [1193] = {.lex_state = 62},
+  [1177] = {.lex_state = 0},
+  [1178] = {.lex_state = 0, .external_lex_state = 6},
+  [1179] = {.lex_state = 14},
+  [1180] = {.lex_state = 0},
+  [1181] = {.lex_state = 0},
+  [1182] = {.lex_state = 0},
+  [1183] = {.lex_state = 14},
+  [1184] = {.lex_state = 14},
+  [1185] = {.lex_state = 0},
+  [1186] = {.lex_state = 0},
+  [1187] = {.lex_state = 14},
+  [1188] = {.lex_state = 0, .external_lex_state = 6},
+  [1189] = {.lex_state = 0},
+  [1190] = {.lex_state = 0},
+  [1191] = {.lex_state = 0},
+  [1192] = {.lex_state = 0},
+  [1193] = {.lex_state = 0},
   [1194] = {.lex_state = 0, .external_lex_state = 6},
-  [1195] = {.lex_state = 62},
+  [1195] = {.lex_state = 0, .external_lex_state = 6},
   [1196] = {.lex_state = 0},
-  [1197] = {.lex_state = 62},
-  [1198] = {.lex_state = 0, .external_lex_state = 6},
-  [1199] = {.lex_state = 62},
-  [1200] = {.lex_state = 0, .external_lex_state = 6},
-  [1201] = {.lex_state = 16},
+  [1197] = {.lex_state = 0, .external_lex_state = 6},
+  [1198] = {.lex_state = 14},
+  [1199] = {.lex_state = 0},
+  [1200] = {.lex_state = 0},
+  [1201] = {.lex_state = 14},
   [1202] = {.lex_state = 0},
-  [1203] = {.lex_state = 0},
-  [1204] = {.lex_state = 16},
+  [1203] = {.lex_state = 14},
+  [1204] = {.lex_state = 0},
   [1205] = {.lex_state = 0},
   [1206] = {.lex_state = 0},
-  [1207] = {.lex_state = 16},
+  [1207] = {.lex_state = 0},
   [1208] = {.lex_state = 0},
-  [1209] = {.lex_state = 0, .external_lex_state = 6},
-  [1210] = {.lex_state = 16},
+  [1209] = {.lex_state = 0},
+  [1210] = {.lex_state = 0},
   [1211] = {.lex_state = 0},
-  [1212] = {.lex_state = 0},
-  [1213] = {.lex_state = 0},
-  [1214] = {.lex_state = 0, .external_lex_state = 6},
-  [1215] = {.lex_state = 62},
+  [1212] = {.lex_state = 0, .external_lex_state = 6},
+  [1213] = {.lex_state = 0, .external_lex_state = 6},
+  [1214] = {.lex_state = 0},
+  [1215] = {.lex_state = 0},
   [1216] = {.lex_state = 0},
   [1217] = {.lex_state = 0},
   [1218] = {.lex_state = 0},
   [1219] = {.lex_state = 0},
   [1220] = {.lex_state = 0},
-  [1221] = {.lex_state = 16},
-  [1222] = {.lex_state = 8},
-  [1223] = {.lex_state = 0, .external_lex_state = 6},
-  [1224] = {.lex_state = 16},
+  [1221] = {.lex_state = 8},
+  [1222] = {.lex_state = 0},
+  [1223] = {.lex_state = 0},
+  [1224] = {.lex_state = 0},
   [1225] = {.lex_state = 0},
-  [1226] = {.lex_state = 0, .external_lex_state = 6},
-  [1227] = {.lex_state = 0},
-  [1228] = {.lex_state = 0},
+  [1226] = {.lex_state = 0},
+  [1227] = {.lex_state = 0, .external_lex_state = 6},
+  [1228] = {.lex_state = 0, .external_lex_state = 6},
   [1229] = {.lex_state = 0},
   [1230] = {.lex_state = 0},
-  [1231] = {.lex_state = 0, .external_lex_state = 6},
-  [1232] = {.lex_state = 0},
+  [1231] = {.lex_state = 14},
+  [1232] = {.lex_state = 16},
   [1233] = {.lex_state = 0},
   [1234] = {.lex_state = 0},
-  [1235] = {.lex_state = 0},
-  [1236] = {.lex_state = 62},
+  [1235] = {.lex_state = 14},
+  [1236] = {.lex_state = 0},
   [1237] = {.lex_state = 0, .external_lex_state = 6},
-  [1238] = {.lex_state = 0, .external_lex_state = 6},
-  [1239] = {.lex_state = 0},
-  [1240] = {.lex_state = 0},
-  [1241] = {.lex_state = 0, .external_lex_state = 6},
+  [1238] = {.lex_state = 0},
+  [1239] = {.lex_state = 0, .external_lex_state = 6},
+  [1240] = {.lex_state = 0, .external_lex_state = 6},
+  [1241] = {.lex_state = 0},
   [1242] = {.lex_state = 0},
-  [1243] = {.lex_state = 0},
-  [1244] = {.lex_state = 0, .external_lex_state = 6},
-  [1245] = {.lex_state = 62},
-  [1246] = {.lex_state = 0, .external_lex_state = 6},
+  [1243] = {.lex_state = 0, .external_lex_state = 6},
+  [1244] = {.lex_state = 0},
+  [1245] = {.lex_state = 8},
+  [1246] = {.lex_state = 0},
   [1247] = {.lex_state = 0},
-  [1248] = {.lex_state = 0, .external_lex_state = 6},
-  [1249] = {.lex_state = 0},
-  [1250] = {.lex_state = 16},
+  [1248] = {.lex_state = 0},
+  [1249] = {.lex_state = 14},
+  [1250] = {.lex_state = 14},
   [1251] = {.lex_state = 0},
   [1252] = {.lex_state = 0},
-  [1253] = {.lex_state = 8},
-  [1254] = {.lex_state = 0, .external_lex_state = 6},
-  [1255] = {.lex_state = 0},
+  [1253] = {.lex_state = 0},
+  [1254] = {.lex_state = 0},
+  [1255] = {.lex_state = 14},
   [1256] = {.lex_state = 0},
-  [1257] = {.lex_state = 0},
-  [1258] = {.lex_state = 0},
-  [1259] = {.lex_state = 62},
-  [1260] = {.lex_state = 16},
-  [1261] = {.lex_state = 0, .external_lex_state = 6},
-  [1262] = {.lex_state = 15},
-  [1263] = {.lex_state = 0, .external_lex_state = 6},
-  [1264] = {.lex_state = 0},
-  [1265] = {.lex_state = 0},
-  [1266] = {.lex_state = 16},
-  [1267] = {.lex_state = 16},
-  [1268] = {.lex_state = 0},
-  [1269] = {.lex_state = 8},
-  [1270] = {.lex_state = 16},
-  [1271] = {.lex_state = 0},
+  [1257] = {.lex_state = 14},
+  [1258] = {.lex_state = 14},
+  [1259] = {.lex_state = 14},
+  [1260] = {.lex_state = 0},
+  [1261] = {.lex_state = 0},
+  [1262] = {.lex_state = 0, .external_lex_state = 6},
+  [1263] = {.lex_state = 14},
+  [1264] = {.lex_state = 8},
+  [1265] = {.lex_state = 14},
+  [1266] = {.lex_state = 0},
+  [1267] = {.lex_state = 0},
+  [1268] = {.lex_state = 14},
+  [1269] = {.lex_state = 14},
+  [1270] = {.lex_state = 0},
+  [1271] = {.lex_state = 14},
   [1272] = {.lex_state = 0},
   [1273] = {.lex_state = 0},
   [1274] = {.lex_state = 0},
   [1275] = {.lex_state = 0},
-  [1276] = {.lex_state = 62},
+  [1276] = {.lex_state = 0},
   [1277] = {.lex_state = 0},
-  [1278] = {.lex_state = 16},
+  [1278] = {.lex_state = 0},
   [1279] = {.lex_state = 0},
   [1280] = {.lex_state = 0},
-  [1281] = {.lex_state = 16},
+  [1281] = {.lex_state = 0},
   [1282] = {.lex_state = 0},
   [1283] = {.lex_state = 0},
-  [1284] = {.lex_state = 16},
+  [1284] = {.lex_state = 0},
   [1285] = {.lex_state = 0},
-  [1286] = {.lex_state = 16},
-  [1287] = {.lex_state = 16},
-  [1288] = {.lex_state = 62, .external_lex_state = 6},
+  [1286] = {.lex_state = 0},
+  [1287] = {.lex_state = 0},
+  [1288] = {.lex_state = 0},
   [1289] = {.lex_state = 0},
   [1290] = {.lex_state = 0},
-  [1291] = {.lex_state = 62, .external_lex_state = 6},
+  [1291] = {.lex_state = 8},
   [1292] = {.lex_state = 0},
-  [1293] = {.lex_state = 62},
-  [1294] = {.lex_state = 0},
-  [1295] = {.lex_state = 16},
+  [1293] = {.lex_state = 14},
+  [1294] = {.lex_state = 8},
+  [1295] = {.lex_state = 0},
   [1296] = {.lex_state = 0},
   [1297] = {.lex_state = 0},
   [1298] = {.lex_state = 0},
-  [1299] = {.lex_state = 0},
+  [1299] = {.lex_state = 0, .external_lex_state = 6},
   [1300] = {.lex_state = 0},
   [1301] = {.lex_state = 0},
-  [1302] = {.lex_state = 0},
+  [1302] = {.lex_state = 14},
   [1303] = {.lex_state = 0},
-  [1304] = {.lex_state = 0},
-  [1305] = {.lex_state = 62},
-  [1306] = {.lex_state = 62},
-  [1307] = {.lex_state = 8},
-  [1308] = {.lex_state = 16},
-  [1309] = {.lex_state = 0, .external_lex_state = 6},
+  [1304] = {.lex_state = 0, .external_lex_state = 6},
+  [1305] = {.lex_state = 14},
+  [1306] = {.lex_state = 0},
+  [1307] = {.lex_state = 0},
+  [1308] = {.lex_state = 0},
+  [1309] = {.lex_state = 0},
   [1310] = {.lex_state = 0},
-  [1311] = {.lex_state = 0},
-  [1312] = {.lex_state = 62},
-  [1313] = {.lex_state = 0},
-  [1314] = {.lex_state = 62},
-  [1315] = {.lex_state = 16},
-  [1316] = {.lex_state = 0},
-  [1317] = {.lex_state = 62},
-  [1318] = {.lex_state = 62, .external_lex_state = 6},
-  [1319] = {.lex_state = 0, .external_lex_state = 6},
-  [1320] = {.lex_state = 16},
+  [1311] = {.lex_state = 14},
+  [1312] = {.lex_state = 14},
+  [1313] = {.lex_state = 0, .external_lex_state = 6},
+  [1314] = {.lex_state = 0},
+  [1315] = {.lex_state = 0},
+  [1316] = {.lex_state = 17},
+  [1317] = {.lex_state = 0},
+  [1318] = {.lex_state = 0},
+  [1319] = {.lex_state = 0},
+  [1320] = {.lex_state = 0},
   [1321] = {.lex_state = 0},
-  [1322] = {.lex_state = 16},
-  [1323] = {.lex_state = 0},
+  [1322] = {.lex_state = 0, .external_lex_state = 6},
+  [1323] = {.lex_state = 17},
   [1324] = {.lex_state = 0},
   [1325] = {.lex_state = 0},
   [1326] = {.lex_state = 0},
   [1327] = {.lex_state = 0},
   [1328] = {.lex_state = 0},
-  [1329] = {.lex_state = 62},
+  [1329] = {.lex_state = 17},
   [1330] = {.lex_state = 0},
   [1331] = {.lex_state = 0},
-  [1332] = {.lex_state = 8},
-  [1333] = {.lex_state = 16},
-  [1334] = {.lex_state = 16},
-  [1335] = {.lex_state = 62, .external_lex_state = 6},
+  [1332] = {.lex_state = 0},
+  [1333] = {.lex_state = 0, .external_lex_state = 6},
+  [1334] = {.lex_state = 0},
+  [1335] = {.lex_state = 0},
   [1336] = {.lex_state = 0},
   [1337] = {.lex_state = 0},
-  [1338] = {.lex_state = 62},
-  [1339] = {.lex_state = 16},
-  [1340] = {.lex_state = 16},
-  [1341] = {.lex_state = 0},
-  [1342] = {.lex_state = 0, .external_lex_state = 6},
-  [1343] = {.lex_state = 0},
-  [1344] = {.lex_state = 17},
-  [1345] = {.lex_state = 0, .external_lex_state = 6},
-  [1346] = {.lex_state = 0, .external_lex_state = 6},
-  [1347] = {.lex_state = 16},
-  [1348] = {.lex_state = 0, .external_lex_state = 6},
-  [1349] = {.lex_state = 0, .external_lex_state = 6},
-  [1350] = {.lex_state = 0, .external_lex_state = 6},
-  [1351] = {.lex_state = 0, .external_lex_state = 6},
-  [1352] = {.lex_state = 0},
-  [1353] = {.lex_state = 62},
+  [1338] = {.lex_state = 0},
+  [1339] = {.lex_state = 0, .external_lex_state = 6},
+  [1340] = {.lex_state = 14},
+  [1341] = {.lex_state = 0, .external_lex_state = 6},
+  [1342] = {.lex_state = 17},
+  [1343] = {.lex_state = 17},
+  [1344] = {.lex_state = 0},
+  [1345] = {.lex_state = 17},
+  [1346] = {.lex_state = 0},
+  [1347] = {.lex_state = 0},
+  [1348] = {.lex_state = 0},
+  [1349] = {.lex_state = 0},
+  [1350] = {.lex_state = 17},
+  [1351] = {.lex_state = 17},
+  [1352] = {.lex_state = 16},
+  [1353] = {.lex_state = 0, .external_lex_state = 6},
   [1354] = {.lex_state = 0},
-  [1355] = {.lex_state = 0},
-  [1356] = {.lex_state = 0},
-  [1357] = {.lex_state = 62},
+  [1355] = {.lex_state = 0, .external_lex_state = 6},
+  [1356] = {.lex_state = 0, .external_lex_state = 6},
+  [1357] = {.lex_state = 0, .external_lex_state = 6},
   [1358] = {.lex_state = 0},
   [1359] = {.lex_state = 0},
   [1360] = {.lex_state = 0},
-  [1361] = {.lex_state = 0, .external_lex_state = 6},
-  [1362] = {.lex_state = 0},
-  [1363] = {.lex_state = 17},
+  [1361] = {.lex_state = 0},
+  [1362] = {.lex_state = 0, .external_lex_state = 6},
+  [1363] = {.lex_state = 0},
   [1364] = {.lex_state = 0},
-  [1365] = {.lex_state = 15},
-  [1366] = {.lex_state = 0},
+  [1365] = {.lex_state = 0, .external_lex_state = 6},
+  [1366] = {.lex_state = 0, .external_lex_state = 6},
   [1367] = {.lex_state = 0},
-  [1368] = {.lex_state = 0},
-  [1369] = {.lex_state = 0, .external_lex_state = 6},
+  [1368] = {.lex_state = 0, .external_lex_state = 6},
+  [1369] = {.lex_state = 0},
   [1370] = {.lex_state = 0},
-  [1371] = {.lex_state = 17},
-  [1372] = {.lex_state = 17},
-  [1373] = {.lex_state = 0},
-  [1374] = {.lex_state = 17},
-  [1375] = {.lex_state = 17},
-  [1376] = {.lex_state = 17},
-  [1377] = {.lex_state = 17},
-  [1378] = {.lex_state = 17},
-  [1379] = {.lex_state = 0},
-  [1380] = {.lex_state = 17},
+  [1371] = {.lex_state = 0},
+  [1372] = {.lex_state = 0},
+  [1373] = {.lex_state = 0, .external_lex_state = 6},
+  [1374] = {.lex_state = 0},
+  [1375] = {.lex_state = 0, .external_lex_state = 6},
+  [1376] = {.lex_state = 0, .external_lex_state = 6},
+  [1377] = {.lex_state = 0, .external_lex_state = 6},
+  [1378] = {.lex_state = 0, .external_lex_state = 6},
+  [1379] = {.lex_state = 17},
+  [1380] = {.lex_state = 0},
   [1381] = {.lex_state = 0},
   [1382] = {.lex_state = 0},
-  [1383] = {.lex_state = 0, .external_lex_state = 6},
-  [1384] = {.lex_state = 0},
-  [1385] = {.lex_state = 0, .external_lex_state = 6},
-  [1386] = {.lex_state = 0, .external_lex_state = 6},
+  [1383] = {.lex_state = 17},
+  [1384] = {.lex_state = 14},
+  [1385] = {.lex_state = 0},
+  [1386] = {.lex_state = 0},
   [1387] = {.lex_state = 0},
-  [1388] = {.lex_state = 0},
-  [1389] = {.lex_state = 0, .external_lex_state = 6},
+  [1388] = {.lex_state = 14},
+  [1389] = {.lex_state = 0},
   [1390] = {.lex_state = 0},
-  [1391] = {.lex_state = 0, .external_lex_state = 6},
+  [1391] = {.lex_state = 0},
   [1392] = {.lex_state = 0},
-  [1393] = {.lex_state = 0, .external_lex_state = 6},
-  [1394] = {.lex_state = 0, .external_lex_state = 6},
-  [1395] = {.lex_state = 0, .external_lex_state = 6},
+  [1393] = {.lex_state = 0},
+  [1394] = {.lex_state = 0},
+  [1395] = {.lex_state = 0},
   [1396] = {.lex_state = 0},
   [1397] = {.lex_state = 0},
   [1398] = {.lex_state = 0},
-  [1399] = {.lex_state = 0},
-  [1400] = {.lex_state = 0, .external_lex_state = 6},
-  [1401] = {.lex_state = 0},
+  [1399] = {.lex_state = 14},
+  [1400] = {.lex_state = 0},
+  [1401] = {.lex_state = 14},
   [1402] = {.lex_state = 0},
   [1403] = {.lex_state = 0},
   [1404] = {.lex_state = 0},
-  [1405] = {.lex_state = 0},
-  [1406] = {.lex_state = 0},
-  [1407] = {.lex_state = 0},
-  [1408] = {.lex_state = 62},
+  [1405] = {.lex_state = 14},
+  [1406] = {.lex_state = 14},
+  [1407] = {.lex_state = 14},
+  [1408] = {.lex_state = 0},
   [1409] = {.lex_state = 0},
   [1410] = {.lex_state = 0},
   [1411] = {.lex_state = 0},
   [1412] = {.lex_state = 0},
-  [1413] = {.lex_state = 16},
+  [1413] = {.lex_state = 0},
   [1414] = {.lex_state = 0},
   [1415] = {.lex_state = 0},
-  [1416] = {.lex_state = 62},
-  [1417] = {.lex_state = 0},
+  [1416] = {.lex_state = 0},
+  [1417] = {.lex_state = 14},
   [1418] = {.lex_state = 0},
-  [1419] = {.lex_state = 62},
-  [1420] = {.lex_state = 0},
-  [1421] = {.lex_state = 62},
-  [1422] = {.lex_state = 16},
-  [1423] = {.lex_state = 16},
+  [1419] = {.lex_state = 14},
+  [1420] = {.lex_state = 14},
+  [1421] = {.lex_state = 14},
+  [1422] = {.lex_state = 0},
+  [1423] = {.lex_state = 0},
   [1424] = {.lex_state = 0},
   [1425] = {.lex_state = 0},
   [1426] = {.lex_state = 0},
-  [1427] = {.lex_state = 16},
-  [1428] = {.lex_state = 16},
+  [1427] = {.lex_state = 14},
+  [1428] = {.lex_state = 0},
   [1429] = {.lex_state = 0},
-  [1430] = {.lex_state = 62},
-  [1431] = {.lex_state = 0},
+  [1430] = {.lex_state = 14},
+  [1431] = {.lex_state = 14},
   [1432] = {.lex_state = 0},
   [1433] = {.lex_state = 0},
   [1434] = {.lex_state = 0},
-  [1435] = {.lex_state = 16},
-  [1436] = {.lex_state = 62},
+  [1435] = {.lex_state = 0},
+  [1436] = {.lex_state = 0},
   [1437] = {.lex_state = 0},
-  [1438] = {.lex_state = 0},
-  [1439] = {.lex_state = 0},
-  [1440] = {.lex_state = 62},
-  [1441] = {.lex_state = 62},
-  [1442] = {.lex_state = 0},
-  [1443] = {.lex_state = 62},
-  [1444] = {.lex_state = 62},
-  [1445] = {.lex_state = 62},
-  [1446] = {.lex_state = 62},
-  [1447] = {.lex_state = 0},
-  [1448] = {.lex_state = 62},
-  [1449] = {.lex_state = 62},
-  [1450] = {.lex_state = 62},
-  [1451] = {.lex_state = 16},
-  [1452] = {.lex_state = 16},
-  [1453] = {.lex_state = 16},
-  [1454] = {.lex_state = 62},
+  [1438] = {.lex_state = 14},
+  [1439] = {.lex_state = 14},
+  [1440] = {.lex_state = 0},
+  [1441] = {.lex_state = 0},
+  [1442] = {.lex_state = 14},
+  [1443] = {.lex_state = 14},
+  [1444] = {.lex_state = 14},
+  [1445] = {.lex_state = 0},
+  [1446] = {.lex_state = 0},
+  [1447] = {.lex_state = 14},
+  [1448] = {.lex_state = 0},
+  [1449] = {.lex_state = 14},
+  [1450] = {.lex_state = 14},
+  [1451] = {.lex_state = 14},
+  [1452] = {.lex_state = 0},
+  [1453] = {.lex_state = 0},
+  [1454] = {.lex_state = 0},
   [1455] = {.lex_state = 0},
-  [1456] = {.lex_state = 62},
-  [1457] = {.lex_state = 62},
-  [1458] = {.lex_state = 16},
-  [1459] = {.lex_state = 16},
-  [1460] = {.lex_state = 0},
-  [1461] = {.lex_state = 0},
-  [1462] = {.lex_state = 0},
-  [1463] = {.lex_state = 16},
+  [1456] = {.lex_state = 14},
+  [1457] = {.lex_state = 0},
+  [1458] = {.lex_state = 14},
+  [1459] = {.lex_state = 0},
+  [1460] = {.lex_state = 14},
+  [1461] = {.lex_state = 14},
+  [1462] = {.lex_state = 14},
+  [1463] = {.lex_state = 0},
   [1464] = {.lex_state = 0},
-  [1465] = {.lex_state = 16},
-  [1466] = {.lex_state = 62},
+  [1465] = {.lex_state = 0},
+  [1466] = {.lex_state = 14},
   [1467] = {.lex_state = 0},
-  [1468] = {.lex_state = 16},
+  [1468] = {.lex_state = 0},
   [1469] = {.lex_state = 0},
-  [1470] = {.lex_state = 16},
-  [1471] = {.lex_state = 16},
-  [1472] = {.lex_state = 16},
+  [1470] = {.lex_state = 0},
+  [1471] = {.lex_state = 0},
+  [1472] = {.lex_state = 14},
   [1473] = {.lex_state = 0},
-  [1474] = {.lex_state = 16},
-  [1475] = {.lex_state = 0},
-  [1476] = {.lex_state = 16},
-  [1477] = {.lex_state = 62},
-  [1478] = {.lex_state = 16},
+  [1474] = {.lex_state = 14},
+  [1475] = {.lex_state = 14},
+  [1476] = {.lex_state = 0},
+  [1477] = {.lex_state = 0},
+  [1478] = {.lex_state = 0},
   [1479] = {.lex_state = 0},
-  [1480] = {.lex_state = 16},
-  [1481] = {.lex_state = 16},
-  [1482] = {.lex_state = 16},
-  [1483] = {.lex_state = 16},
+  [1480] = {.lex_state = 14},
+  [1481] = {.lex_state = 14},
+  [1482] = {.lex_state = 14},
+  [1483] = {.lex_state = 0},
   [1484] = {.lex_state = 0},
-  [1485] = {.lex_state = 16},
-  [1486] = {.lex_state = 16},
-  [1487] = {.lex_state = 16},
-  [1488] = {.lex_state = 62},
-  [1489] = {.lex_state = 16},
-  [1490] = {.lex_state = 62},
-  [1491] = {.lex_state = 16},
+  [1485] = {.lex_state = 0},
+  [1486] = {.lex_state = 14},
+  [1487] = {.lex_state = 0},
+  [1488] = {.lex_state = 0},
+  [1489] = {.lex_state = 0},
+  [1490] = {.lex_state = 0},
+  [1491] = {.lex_state = 0},
   [1492] = {.lex_state = 0},
-  [1493] = {.lex_state = 16},
-  [1494] = {.lex_state = 62},
-  [1495] = {.lex_state = 16},
+  [1493] = {.lex_state = 14},
+  [1494] = {.lex_state = 14},
+  [1495] = {.lex_state = 0},
   [1496] = {.lex_state = 0},
   [1497] = {.lex_state = 0},
-  [1498] = {.lex_state = 62},
-  [1499] = {.lex_state = 16},
-  [1500] = {.lex_state = 62},
-  [1501] = {.lex_state = 16},
+  [1498] = {.lex_state = 0},
+  [1499] = {.lex_state = 0},
+  [1500] = {.lex_state = 0},
+  [1501] = {.lex_state = 0},
   [1502] = {.lex_state = 0},
   [1503] = {.lex_state = 0},
-  [1504] = {.lex_state = 0},
-  [1505] = {.lex_state = 16},
-  [1506] = {.lex_state = 16},
-  [1507] = {.lex_state = 16},
-  [1508] = {.lex_state = 62},
-  [1509] = {.lex_state = 62},
-  [1510] = {.lex_state = 62},
-  [1511] = {.lex_state = 62},
-  [1512] = {.lex_state = 16},
-  [1513] = {.lex_state = 0},
-  [1514] = {.lex_state = 62},
-  [1515] = {.lex_state = 0},
-  [1516] = {.lex_state = 62},
-  [1517] = {.lex_state = 62},
-  [1518] = {.lex_state = 16},
-  [1519] = {.lex_state = 62},
-  [1520] = {.lex_state = 62},
-  [1521] = {.lex_state = 16},
-  [1522] = {.lex_state = 62},
-  [1523] = {.lex_state = 0},
-  [1524] = {.lex_state = 16},
+  [1504] = {.lex_state = 14},
+  [1505] = {.lex_state = 14},
 };
 
 enum {
@@ -10303,7 +7684,6 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_while] = ACTIONS(1),
     [anon_sym_try] = ACTIONS(1),
     [anon_sym_except] = ACTIONS(1),
-    [anon_sym_except_STAR] = ACTIONS(1),
     [anon_sym_finally] = ACTIONS(1),
     [anon_sym_with] = ACTIONS(1),
     [anon_sym_match] = ACTIONS(1),
@@ -10378,73 +7758,73 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym__string_end] = ACTIONS(1),
   },
   [1] = {
-    [sym_module] = STATE(1502),
-    [sym__statement] = STATE(64),
-    [sym__simple_statements] = STATE(64),
-    [sym_import_statement] = STATE(1209),
-    [sym_future_import_statement] = STATE(1209),
-    [sym_import_from_statement] = STATE(1209),
-    [sym_print_statement] = STATE(1209),
-    [sym_assert_statement] = STATE(1209),
-    [sym_expression_statement] = STATE(1209),
-    [sym_named_expression] = STATE(1009),
-    [sym_return_statement] = STATE(1209),
-    [sym_delete_statement] = STATE(1209),
-    [sym_raise_statement] = STATE(1209),
-    [sym_pass_statement] = STATE(1209),
-    [sym_break_statement] = STATE(1209),
-    [sym_continue_statement] = STATE(1209),
-    [sym_if_statement] = STATE(64),
-    [sym_for_statement] = STATE(64),
-    [sym_while_statement] = STATE(64),
-    [sym_try_statement] = STATE(64),
-    [sym_with_statement] = STATE(64),
-    [sym_match_statement] = STATE(64),
-    [sym_function_definition] = STATE(64),
-    [sym_list_splat] = STATE(1360),
-    [sym_dictionary_splat] = STATE(1360),
-    [sym_global_statement] = STATE(1209),
-    [sym_nonlocal_statement] = STATE(1209),
-    [sym_exec_statement] = STATE(1209),
-    [sym_type_alias_statement] = STATE(1209),
-    [sym_class_definition] = STATE(64),
-    [sym_decorated_definition] = STATE(64),
-    [sym_decorator] = STATE(1002),
-    [sym_expression_list] = STATE(1361),
-    [sym_pattern] = STATE(889),
-    [sym_tuple_pattern] = STATE(875),
-    [sym_list_pattern] = STATE(875),
-    [sym_list_splat_pattern] = STATE(875),
-    [sym_expression] = STATE(1019),
-    [sym_primary_expression] = STATE(684),
-    [sym_not_operator] = STATE(1009),
-    [sym_boolean_operator] = STATE(1009),
-    [sym_binary_operator] = STATE(797),
-    [sym_unary_operator] = STATE(797),
-    [sym_comparison_operator] = STATE(1009),
-    [sym_lambda] = STATE(1009),
-    [sym_assignment] = STATE(1361),
-    [sym_augmented_assignment] = STATE(1361),
-    [sym_pattern_list] = STATE(897),
-    [sym_yield] = STATE(1361),
-    [sym_attribute] = STATE(431),
-    [sym_subscript] = STATE(431),
-    [sym_call] = STATE(797),
-    [sym_list] = STATE(797),
-    [sym_set] = STATE(797),
-    [sym_tuple] = STATE(797),
-    [sym_dictionary] = STATE(797),
-    [sym_list_comprehension] = STATE(797),
-    [sym_dictionary_comprehension] = STATE(797),
-    [sym_set_comprehension] = STATE(797),
-    [sym_generator_expression] = STATE(797),
-    [sym_parenthesized_expression] = STATE(797),
-    [sym_conditional_expression] = STATE(1009),
-    [sym_concatenated_string] = STATE(797),
-    [sym_string] = STATE(713),
-    [sym_await] = STATE(1009),
-    [aux_sym_module_repeat1] = STATE(64),
-    [aux_sym_decorated_definition_repeat1] = STATE(1002),
+    [sym_module] = STATE(1487),
+    [sym__statement] = STATE(62),
+    [sym__simple_statements] = STATE(62),
+    [sym_import_statement] = STATE(1304),
+    [sym_future_import_statement] = STATE(1304),
+    [sym_import_from_statement] = STATE(1304),
+    [sym_print_statement] = STATE(1304),
+    [sym_assert_statement] = STATE(1304),
+    [sym_expression_statement] = STATE(1304),
+    [sym_named_expression] = STATE(985),
+    [sym_return_statement] = STATE(1304),
+    [sym_delete_statement] = STATE(1304),
+    [sym_raise_statement] = STATE(1304),
+    [sym_pass_statement] = STATE(1304),
+    [sym_break_statement] = STATE(1304),
+    [sym_continue_statement] = STATE(1304),
+    [sym_if_statement] = STATE(62),
+    [sym_for_statement] = STATE(62),
+    [sym_while_statement] = STATE(62),
+    [sym_try_statement] = STATE(62),
+    [sym_with_statement] = STATE(62),
+    [sym_match_statement] = STATE(62),
+    [sym_function_definition] = STATE(62),
+    [sym_list_splat] = STATE(1321),
+    [sym_dictionary_splat] = STATE(1321),
+    [sym_global_statement] = STATE(1304),
+    [sym_nonlocal_statement] = STATE(1304),
+    [sym_exec_statement] = STATE(1304),
+    [sym_type_alias_statement] = STATE(1304),
+    [sym_class_definition] = STATE(62),
+    [sym_decorated_definition] = STATE(62),
+    [sym_decorator] = STATE(982),
+    [sym_expression_list] = STATE(1313),
+    [sym_pattern] = STATE(871),
+    [sym_tuple_pattern] = STATE(860),
+    [sym_list_pattern] = STATE(860),
+    [sym_list_splat_pattern] = STATE(860),
+    [sym_expression] = STATE(995),
+    [sym_primary_expression] = STATE(707),
+    [sym_not_operator] = STATE(985),
+    [sym_boolean_operator] = STATE(985),
+    [sym_binary_operator] = STATE(759),
+    [sym_unary_operator] = STATE(759),
+    [sym_comparison_operator] = STATE(985),
+    [sym_lambda] = STATE(985),
+    [sym_assignment] = STATE(1313),
+    [sym_augmented_assignment] = STATE(1313),
+    [sym_pattern_list] = STATE(880),
+    [sym_yield] = STATE(1313),
+    [sym_attribute] = STATE(422),
+    [sym_subscript] = STATE(422),
+    [sym_call] = STATE(759),
+    [sym_list] = STATE(759),
+    [sym_set] = STATE(759),
+    [sym_tuple] = STATE(759),
+    [sym_dictionary] = STATE(759),
+    [sym_list_comprehension] = STATE(759),
+    [sym_dictionary_comprehension] = STATE(759),
+    [sym_set_comprehension] = STATE(759),
+    [sym_generator_expression] = STATE(759),
+    [sym_parenthesized_expression] = STATE(759),
+    [sym_conditional_expression] = STATE(985),
+    [sym_concatenated_string] = STATE(759),
+    [sym_string] = STATE(709),
+    [sym_await] = STATE(759),
+    [aux_sym_module_repeat1] = STATE(62),
+    [aux_sym_decorated_definition_repeat1] = STATE(982),
     [ts_builtin_sym_end] = ACTIONS(5),
     [sym_identifier] = ACTIONS(7),
     [anon_sym_import] = ACTIONS(9),
@@ -10493,73 +7873,73 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym__string_start] = ACTIONS(81),
   },
   [2] = {
-    [sym__statement] = STATE(65),
-    [sym__simple_statements] = STATE(65),
-    [sym_import_statement] = STATE(1319),
-    [sym_future_import_statement] = STATE(1319),
-    [sym_import_from_statement] = STATE(1319),
-    [sym_print_statement] = STATE(1319),
-    [sym_assert_statement] = STATE(1319),
-    [sym_expression_statement] = STATE(1319),
-    [sym_named_expression] = STATE(1009),
-    [sym_return_statement] = STATE(1319),
-    [sym_delete_statement] = STATE(1319),
-    [sym_raise_statement] = STATE(1319),
-    [sym_pass_statement] = STATE(1319),
-    [sym_break_statement] = STATE(1319),
-    [sym_continue_statement] = STATE(1319),
-    [sym_if_statement] = STATE(65),
-    [sym_for_statement] = STATE(65),
-    [sym_while_statement] = STATE(65),
-    [sym_try_statement] = STATE(65),
-    [sym_with_statement] = STATE(65),
-    [sym_match_statement] = STATE(65),
-    [sym_function_definition] = STATE(65),
-    [sym_list_splat] = STATE(1360),
-    [sym_dictionary_splat] = STATE(1360),
-    [sym_global_statement] = STATE(1319),
-    [sym_nonlocal_statement] = STATE(1319),
-    [sym_exec_statement] = STATE(1319),
-    [sym_type_alias_statement] = STATE(1319),
-    [sym_class_definition] = STATE(65),
-    [sym_decorated_definition] = STATE(65),
-    [sym_decorator] = STATE(996),
-    [sym_block] = STATE(357),
-    [sym_expression_list] = STATE(1361),
-    [sym_pattern] = STATE(889),
-    [sym_tuple_pattern] = STATE(875),
-    [sym_list_pattern] = STATE(875),
-    [sym_list_splat_pattern] = STATE(875),
-    [sym_expression] = STATE(1019),
-    [sym_primary_expression] = STATE(684),
-    [sym_not_operator] = STATE(1009),
-    [sym_boolean_operator] = STATE(1009),
-    [sym_binary_operator] = STATE(797),
-    [sym_unary_operator] = STATE(797),
-    [sym_comparison_operator] = STATE(1009),
-    [sym_lambda] = STATE(1009),
-    [sym_assignment] = STATE(1361),
-    [sym_augmented_assignment] = STATE(1361),
-    [sym_pattern_list] = STATE(897),
-    [sym_yield] = STATE(1361),
-    [sym_attribute] = STATE(431),
-    [sym_subscript] = STATE(431),
-    [sym_call] = STATE(797),
-    [sym_list] = STATE(797),
-    [sym_set] = STATE(797),
-    [sym_tuple] = STATE(797),
-    [sym_dictionary] = STATE(797),
-    [sym_list_comprehension] = STATE(797),
-    [sym_dictionary_comprehension] = STATE(797),
-    [sym_set_comprehension] = STATE(797),
-    [sym_generator_expression] = STATE(797),
-    [sym_parenthesized_expression] = STATE(797),
-    [sym_conditional_expression] = STATE(1009),
-    [sym_concatenated_string] = STATE(797),
-    [sym_string] = STATE(713),
-    [sym_await] = STATE(1009),
-    [aux_sym_module_repeat1] = STATE(65),
-    [aux_sym_decorated_definition_repeat1] = STATE(996),
+    [sym__statement] = STATE(60),
+    [sym__simple_statements] = STATE(60),
+    [sym_import_statement] = STATE(1213),
+    [sym_future_import_statement] = STATE(1213),
+    [sym_import_from_statement] = STATE(1213),
+    [sym_print_statement] = STATE(1213),
+    [sym_assert_statement] = STATE(1213),
+    [sym_expression_statement] = STATE(1213),
+    [sym_named_expression] = STATE(985),
+    [sym_return_statement] = STATE(1213),
+    [sym_delete_statement] = STATE(1213),
+    [sym_raise_statement] = STATE(1213),
+    [sym_pass_statement] = STATE(1213),
+    [sym_break_statement] = STATE(1213),
+    [sym_continue_statement] = STATE(1213),
+    [sym_if_statement] = STATE(60),
+    [sym_for_statement] = STATE(60),
+    [sym_while_statement] = STATE(60),
+    [sym_try_statement] = STATE(60),
+    [sym_with_statement] = STATE(60),
+    [sym_match_statement] = STATE(60),
+    [sym_function_definition] = STATE(60),
+    [sym_list_splat] = STATE(1321),
+    [sym_dictionary_splat] = STATE(1321),
+    [sym_global_statement] = STATE(1213),
+    [sym_nonlocal_statement] = STATE(1213),
+    [sym_exec_statement] = STATE(1213),
+    [sym_type_alias_statement] = STATE(1213),
+    [sym_class_definition] = STATE(60),
+    [sym_decorated_definition] = STATE(60),
+    [sym_decorator] = STATE(947),
+    [sym_block] = STATE(289),
+    [sym_expression_list] = STATE(1313),
+    [sym_pattern] = STATE(871),
+    [sym_tuple_pattern] = STATE(860),
+    [sym_list_pattern] = STATE(860),
+    [sym_list_splat_pattern] = STATE(860),
+    [sym_expression] = STATE(995),
+    [sym_primary_expression] = STATE(707),
+    [sym_not_operator] = STATE(985),
+    [sym_boolean_operator] = STATE(985),
+    [sym_binary_operator] = STATE(759),
+    [sym_unary_operator] = STATE(759),
+    [sym_comparison_operator] = STATE(985),
+    [sym_lambda] = STATE(985),
+    [sym_assignment] = STATE(1313),
+    [sym_augmented_assignment] = STATE(1313),
+    [sym_pattern_list] = STATE(880),
+    [sym_yield] = STATE(1313),
+    [sym_attribute] = STATE(422),
+    [sym_subscript] = STATE(422),
+    [sym_call] = STATE(759),
+    [sym_list] = STATE(759),
+    [sym_set] = STATE(759),
+    [sym_tuple] = STATE(759),
+    [sym_dictionary] = STATE(759),
+    [sym_list_comprehension] = STATE(759),
+    [sym_dictionary_comprehension] = STATE(759),
+    [sym_set_comprehension] = STATE(759),
+    [sym_generator_expression] = STATE(759),
+    [sym_parenthesized_expression] = STATE(759),
+    [sym_conditional_expression] = STATE(985),
+    [sym_concatenated_string] = STATE(759),
+    [sym_string] = STATE(709),
+    [sym_await] = STATE(759),
+    [aux_sym_module_repeat1] = STATE(60),
+    [aux_sym_decorated_definition_repeat1] = STATE(947),
     [sym_identifier] = ACTIONS(7),
     [anon_sym_import] = ACTIONS(9),
     [anon_sym_from] = ACTIONS(11),
@@ -10608,418 +7988,73 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym__string_start] = ACTIONS(81),
   },
   [3] = {
-    [sym__statement] = STATE(68),
-    [sym__simple_statements] = STATE(68),
-    [sym_import_statement] = STATE(1319),
-    [sym_future_import_statement] = STATE(1319),
-    [sym_import_from_statement] = STATE(1319),
-    [sym_print_statement] = STATE(1319),
-    [sym_assert_statement] = STATE(1319),
-    [sym_expression_statement] = STATE(1319),
-    [sym_named_expression] = STATE(1009),
-    [sym_return_statement] = STATE(1319),
-    [sym_delete_statement] = STATE(1319),
-    [sym_raise_statement] = STATE(1319),
-    [sym_pass_statement] = STATE(1319),
-    [sym_break_statement] = STATE(1319),
-    [sym_continue_statement] = STATE(1319),
-    [sym_if_statement] = STATE(68),
-    [sym_for_statement] = STATE(68),
-    [sym_while_statement] = STATE(68),
-    [sym_try_statement] = STATE(68),
-    [sym_with_statement] = STATE(68),
-    [sym_match_statement] = STATE(68),
-    [sym_function_definition] = STATE(68),
-    [sym_list_splat] = STATE(1360),
-    [sym_dictionary_splat] = STATE(1360),
-    [sym_global_statement] = STATE(1319),
-    [sym_nonlocal_statement] = STATE(1319),
-    [sym_exec_statement] = STATE(1319),
-    [sym_type_alias_statement] = STATE(1319),
-    [sym_class_definition] = STATE(68),
-    [sym_decorated_definition] = STATE(68),
-    [sym_decorator] = STATE(996),
-    [sym_block] = STATE(587),
-    [sym_expression_list] = STATE(1361),
-    [sym_pattern] = STATE(889),
-    [sym_tuple_pattern] = STATE(875),
-    [sym_list_pattern] = STATE(875),
-    [sym_list_splat_pattern] = STATE(875),
-    [sym_expression] = STATE(1019),
-    [sym_primary_expression] = STATE(684),
-    [sym_not_operator] = STATE(1009),
-    [sym_boolean_operator] = STATE(1009),
-    [sym_binary_operator] = STATE(797),
-    [sym_unary_operator] = STATE(797),
-    [sym_comparison_operator] = STATE(1009),
-    [sym_lambda] = STATE(1009),
-    [sym_assignment] = STATE(1361),
-    [sym_augmented_assignment] = STATE(1361),
-    [sym_pattern_list] = STATE(897),
-    [sym_yield] = STATE(1361),
-    [sym_attribute] = STATE(431),
-    [sym_subscript] = STATE(431),
-    [sym_call] = STATE(797),
-    [sym_list] = STATE(797),
-    [sym_set] = STATE(797),
-    [sym_tuple] = STATE(797),
-    [sym_dictionary] = STATE(797),
-    [sym_list_comprehension] = STATE(797),
-    [sym_dictionary_comprehension] = STATE(797),
-    [sym_set_comprehension] = STATE(797),
-    [sym_generator_expression] = STATE(797),
-    [sym_parenthesized_expression] = STATE(797),
-    [sym_conditional_expression] = STATE(1009),
-    [sym_concatenated_string] = STATE(797),
-    [sym_string] = STATE(713),
-    [sym_await] = STATE(1009),
-    [aux_sym_module_repeat1] = STATE(68),
-    [aux_sym_decorated_definition_repeat1] = STATE(996),
-    [sym_identifier] = ACTIONS(7),
-    [anon_sym_import] = ACTIONS(9),
-    [anon_sym_from] = ACTIONS(11),
-    [anon_sym_LPAREN] = ACTIONS(13),
-    [anon_sym_STAR] = ACTIONS(15),
-    [anon_sym_print] = ACTIONS(17),
-    [anon_sym_assert] = ACTIONS(19),
-    [anon_sym_return] = ACTIONS(21),
-    [anon_sym_del] = ACTIONS(23),
-    [anon_sym_raise] = ACTIONS(25),
-    [anon_sym_pass] = ACTIONS(27),
-    [anon_sym_break] = ACTIONS(29),
-    [anon_sym_continue] = ACTIONS(31),
-    [anon_sym_if] = ACTIONS(83),
-    [anon_sym_async] = ACTIONS(85),
-    [anon_sym_for] = ACTIONS(87),
-    [anon_sym_while] = ACTIONS(89),
-    [anon_sym_try] = ACTIONS(91),
-    [anon_sym_with] = ACTIONS(93),
-    [anon_sym_match] = ACTIONS(95),
-    [anon_sym_DASH] = ACTIONS(47),
-    [anon_sym_PLUS] = ACTIONS(47),
-    [anon_sym_LBRACK] = ACTIONS(49),
-    [anon_sym_LBRACE] = ACTIONS(51),
-    [anon_sym_STAR_STAR] = ACTIONS(53),
-    [anon_sym_def] = ACTIONS(97),
-    [anon_sym_global] = ACTIONS(57),
-    [anon_sym_nonlocal] = ACTIONS(59),
-    [anon_sym_exec] = ACTIONS(61),
-    [anon_sym_type] = ACTIONS(63),
-    [anon_sym_class] = ACTIONS(99),
-    [anon_sym_AT] = ACTIONS(67),
-    [anon_sym_not] = ACTIONS(69),
-    [anon_sym_TILDE] = ACTIONS(47),
-    [anon_sym_lambda] = ACTIONS(71),
-    [anon_sym_yield] = ACTIONS(73),
-    [sym_ellipsis] = ACTIONS(75),
-    [sym_integer] = ACTIONS(77),
-    [sym_float] = ACTIONS(75),
-    [anon_sym_await] = ACTIONS(79),
-    [sym_true] = ACTIONS(77),
-    [sym_false] = ACTIONS(77),
-    [sym_none] = ACTIONS(77),
-    [sym_comment] = ACTIONS(3),
-    [sym__dedent] = ACTIONS(103),
-    [sym__string_start] = ACTIONS(81),
-  },
-  [4] = {
-    [sym__statement] = STATE(68),
-    [sym__simple_statements] = STATE(68),
-    [sym_import_statement] = STATE(1319),
-    [sym_future_import_statement] = STATE(1319),
-    [sym_import_from_statement] = STATE(1319),
-    [sym_print_statement] = STATE(1319),
-    [sym_assert_statement] = STATE(1319),
-    [sym_expression_statement] = STATE(1319),
-    [sym_named_expression] = STATE(1009),
-    [sym_return_statement] = STATE(1319),
-    [sym_delete_statement] = STATE(1319),
-    [sym_raise_statement] = STATE(1319),
-    [sym_pass_statement] = STATE(1319),
-    [sym_break_statement] = STATE(1319),
-    [sym_continue_statement] = STATE(1319),
-    [sym_if_statement] = STATE(68),
-    [sym_for_statement] = STATE(68),
-    [sym_while_statement] = STATE(68),
-    [sym_try_statement] = STATE(68),
-    [sym_with_statement] = STATE(68),
-    [sym_match_statement] = STATE(68),
-    [sym_function_definition] = STATE(68),
-    [sym_list_splat] = STATE(1360),
-    [sym_dictionary_splat] = STATE(1360),
-    [sym_global_statement] = STATE(1319),
-    [sym_nonlocal_statement] = STATE(1319),
-    [sym_exec_statement] = STATE(1319),
-    [sym_type_alias_statement] = STATE(1319),
-    [sym_class_definition] = STATE(68),
-    [sym_decorated_definition] = STATE(68),
-    [sym_decorator] = STATE(996),
-    [sym_block] = STATE(540),
-    [sym_expression_list] = STATE(1361),
-    [sym_pattern] = STATE(889),
-    [sym_tuple_pattern] = STATE(875),
-    [sym_list_pattern] = STATE(875),
-    [sym_list_splat_pattern] = STATE(875),
-    [sym_expression] = STATE(1019),
-    [sym_primary_expression] = STATE(684),
-    [sym_not_operator] = STATE(1009),
-    [sym_boolean_operator] = STATE(1009),
-    [sym_binary_operator] = STATE(797),
-    [sym_unary_operator] = STATE(797),
-    [sym_comparison_operator] = STATE(1009),
-    [sym_lambda] = STATE(1009),
-    [sym_assignment] = STATE(1361),
-    [sym_augmented_assignment] = STATE(1361),
-    [sym_pattern_list] = STATE(897),
-    [sym_yield] = STATE(1361),
-    [sym_attribute] = STATE(431),
-    [sym_subscript] = STATE(431),
-    [sym_call] = STATE(797),
-    [sym_list] = STATE(797),
-    [sym_set] = STATE(797),
-    [sym_tuple] = STATE(797),
-    [sym_dictionary] = STATE(797),
-    [sym_list_comprehension] = STATE(797),
-    [sym_dictionary_comprehension] = STATE(797),
-    [sym_set_comprehension] = STATE(797),
-    [sym_generator_expression] = STATE(797),
-    [sym_parenthesized_expression] = STATE(797),
-    [sym_conditional_expression] = STATE(1009),
-    [sym_concatenated_string] = STATE(797),
-    [sym_string] = STATE(713),
-    [sym_await] = STATE(1009),
-    [aux_sym_module_repeat1] = STATE(68),
-    [aux_sym_decorated_definition_repeat1] = STATE(996),
-    [sym_identifier] = ACTIONS(7),
-    [anon_sym_import] = ACTIONS(9),
-    [anon_sym_from] = ACTIONS(11),
-    [anon_sym_LPAREN] = ACTIONS(13),
-    [anon_sym_STAR] = ACTIONS(15),
-    [anon_sym_print] = ACTIONS(17),
-    [anon_sym_assert] = ACTIONS(19),
-    [anon_sym_return] = ACTIONS(21),
-    [anon_sym_del] = ACTIONS(23),
-    [anon_sym_raise] = ACTIONS(25),
-    [anon_sym_pass] = ACTIONS(27),
-    [anon_sym_break] = ACTIONS(29),
-    [anon_sym_continue] = ACTIONS(31),
-    [anon_sym_if] = ACTIONS(83),
-    [anon_sym_async] = ACTIONS(85),
-    [anon_sym_for] = ACTIONS(87),
-    [anon_sym_while] = ACTIONS(89),
-    [anon_sym_try] = ACTIONS(91),
-    [anon_sym_with] = ACTIONS(93),
-    [anon_sym_match] = ACTIONS(95),
-    [anon_sym_DASH] = ACTIONS(47),
-    [anon_sym_PLUS] = ACTIONS(47),
-    [anon_sym_LBRACK] = ACTIONS(49),
-    [anon_sym_LBRACE] = ACTIONS(51),
-    [anon_sym_STAR_STAR] = ACTIONS(53),
-    [anon_sym_def] = ACTIONS(97),
-    [anon_sym_global] = ACTIONS(57),
-    [anon_sym_nonlocal] = ACTIONS(59),
-    [anon_sym_exec] = ACTIONS(61),
-    [anon_sym_type] = ACTIONS(63),
-    [anon_sym_class] = ACTIONS(99),
-    [anon_sym_AT] = ACTIONS(67),
-    [anon_sym_not] = ACTIONS(69),
-    [anon_sym_TILDE] = ACTIONS(47),
-    [anon_sym_lambda] = ACTIONS(71),
-    [anon_sym_yield] = ACTIONS(73),
-    [sym_ellipsis] = ACTIONS(75),
-    [sym_integer] = ACTIONS(77),
-    [sym_float] = ACTIONS(75),
-    [anon_sym_await] = ACTIONS(79),
-    [sym_true] = ACTIONS(77),
-    [sym_false] = ACTIONS(77),
-    [sym_none] = ACTIONS(77),
-    [sym_comment] = ACTIONS(3),
-    [sym__dedent] = ACTIONS(103),
-    [sym__string_start] = ACTIONS(81),
-  },
-  [5] = {
-    [sym__statement] = STATE(68),
-    [sym__simple_statements] = STATE(68),
-    [sym_import_statement] = STATE(1319),
-    [sym_future_import_statement] = STATE(1319),
-    [sym_import_from_statement] = STATE(1319),
-    [sym_print_statement] = STATE(1319),
-    [sym_assert_statement] = STATE(1319),
-    [sym_expression_statement] = STATE(1319),
-    [sym_named_expression] = STATE(1009),
-    [sym_return_statement] = STATE(1319),
-    [sym_delete_statement] = STATE(1319),
-    [sym_raise_statement] = STATE(1319),
-    [sym_pass_statement] = STATE(1319),
-    [sym_break_statement] = STATE(1319),
-    [sym_continue_statement] = STATE(1319),
-    [sym_if_statement] = STATE(68),
-    [sym_for_statement] = STATE(68),
-    [sym_while_statement] = STATE(68),
-    [sym_try_statement] = STATE(68),
-    [sym_with_statement] = STATE(68),
-    [sym_match_statement] = STATE(68),
-    [sym_function_definition] = STATE(68),
-    [sym_list_splat] = STATE(1360),
-    [sym_dictionary_splat] = STATE(1360),
-    [sym_global_statement] = STATE(1319),
-    [sym_nonlocal_statement] = STATE(1319),
-    [sym_exec_statement] = STATE(1319),
-    [sym_type_alias_statement] = STATE(1319),
-    [sym_class_definition] = STATE(68),
-    [sym_decorated_definition] = STATE(68),
-    [sym_decorator] = STATE(996),
-    [sym_block] = STATE(534),
-    [sym_expression_list] = STATE(1361),
-    [sym_pattern] = STATE(889),
-    [sym_tuple_pattern] = STATE(875),
-    [sym_list_pattern] = STATE(875),
-    [sym_list_splat_pattern] = STATE(875),
-    [sym_expression] = STATE(1019),
-    [sym_primary_expression] = STATE(684),
-    [sym_not_operator] = STATE(1009),
-    [sym_boolean_operator] = STATE(1009),
-    [sym_binary_operator] = STATE(797),
-    [sym_unary_operator] = STATE(797),
-    [sym_comparison_operator] = STATE(1009),
-    [sym_lambda] = STATE(1009),
-    [sym_assignment] = STATE(1361),
-    [sym_augmented_assignment] = STATE(1361),
-    [sym_pattern_list] = STATE(897),
-    [sym_yield] = STATE(1361),
-    [sym_attribute] = STATE(431),
-    [sym_subscript] = STATE(431),
-    [sym_call] = STATE(797),
-    [sym_list] = STATE(797),
-    [sym_set] = STATE(797),
-    [sym_tuple] = STATE(797),
-    [sym_dictionary] = STATE(797),
-    [sym_list_comprehension] = STATE(797),
-    [sym_dictionary_comprehension] = STATE(797),
-    [sym_set_comprehension] = STATE(797),
-    [sym_generator_expression] = STATE(797),
-    [sym_parenthesized_expression] = STATE(797),
-    [sym_conditional_expression] = STATE(1009),
-    [sym_concatenated_string] = STATE(797),
-    [sym_string] = STATE(713),
-    [sym_await] = STATE(1009),
-    [aux_sym_module_repeat1] = STATE(68),
-    [aux_sym_decorated_definition_repeat1] = STATE(996),
-    [sym_identifier] = ACTIONS(7),
-    [anon_sym_import] = ACTIONS(9),
-    [anon_sym_from] = ACTIONS(11),
-    [anon_sym_LPAREN] = ACTIONS(13),
-    [anon_sym_STAR] = ACTIONS(15),
-    [anon_sym_print] = ACTIONS(17),
-    [anon_sym_assert] = ACTIONS(19),
-    [anon_sym_return] = ACTIONS(21),
-    [anon_sym_del] = ACTIONS(23),
-    [anon_sym_raise] = ACTIONS(25),
-    [anon_sym_pass] = ACTIONS(27),
-    [anon_sym_break] = ACTIONS(29),
-    [anon_sym_continue] = ACTIONS(31),
-    [anon_sym_if] = ACTIONS(83),
-    [anon_sym_async] = ACTIONS(85),
-    [anon_sym_for] = ACTIONS(87),
-    [anon_sym_while] = ACTIONS(89),
-    [anon_sym_try] = ACTIONS(91),
-    [anon_sym_with] = ACTIONS(93),
-    [anon_sym_match] = ACTIONS(95),
-    [anon_sym_DASH] = ACTIONS(47),
-    [anon_sym_PLUS] = ACTIONS(47),
-    [anon_sym_LBRACK] = ACTIONS(49),
-    [anon_sym_LBRACE] = ACTIONS(51),
-    [anon_sym_STAR_STAR] = ACTIONS(53),
-    [anon_sym_def] = ACTIONS(97),
-    [anon_sym_global] = ACTIONS(57),
-    [anon_sym_nonlocal] = ACTIONS(59),
-    [anon_sym_exec] = ACTIONS(61),
-    [anon_sym_type] = ACTIONS(63),
-    [anon_sym_class] = ACTIONS(99),
-    [anon_sym_AT] = ACTIONS(67),
-    [anon_sym_not] = ACTIONS(69),
-    [anon_sym_TILDE] = ACTIONS(47),
-    [anon_sym_lambda] = ACTIONS(71),
-    [anon_sym_yield] = ACTIONS(73),
-    [sym_ellipsis] = ACTIONS(75),
-    [sym_integer] = ACTIONS(77),
-    [sym_float] = ACTIONS(75),
-    [anon_sym_await] = ACTIONS(79),
-    [sym_true] = ACTIONS(77),
-    [sym_false] = ACTIONS(77),
-    [sym_none] = ACTIONS(77),
-    [sym_comment] = ACTIONS(3),
-    [sym__dedent] = ACTIONS(103),
-    [sym__string_start] = ACTIONS(81),
-  },
-  [6] = {
-    [sym__statement] = STATE(65),
-    [sym__simple_statements] = STATE(65),
-    [sym_import_statement] = STATE(1319),
-    [sym_future_import_statement] = STATE(1319),
-    [sym_import_from_statement] = STATE(1319),
-    [sym_print_statement] = STATE(1319),
-    [sym_assert_statement] = STATE(1319),
-    [sym_expression_statement] = STATE(1319),
-    [sym_named_expression] = STATE(1009),
-    [sym_return_statement] = STATE(1319),
-    [sym_delete_statement] = STATE(1319),
-    [sym_raise_statement] = STATE(1319),
-    [sym_pass_statement] = STATE(1319),
-    [sym_break_statement] = STATE(1319),
-    [sym_continue_statement] = STATE(1319),
-    [sym_if_statement] = STATE(65),
-    [sym_for_statement] = STATE(65),
-    [sym_while_statement] = STATE(65),
-    [sym_try_statement] = STATE(65),
-    [sym_with_statement] = STATE(65),
-    [sym_match_statement] = STATE(65),
-    [sym_function_definition] = STATE(65),
-    [sym_list_splat] = STATE(1360),
-    [sym_dictionary_splat] = STATE(1360),
-    [sym_global_statement] = STATE(1319),
-    [sym_nonlocal_statement] = STATE(1319),
-    [sym_exec_statement] = STATE(1319),
-    [sym_type_alias_statement] = STATE(1319),
-    [sym_class_definition] = STATE(65),
-    [sym_decorated_definition] = STATE(65),
-    [sym_decorator] = STATE(996),
-    [sym_block] = STATE(373),
-    [sym_expression_list] = STATE(1361),
-    [sym_pattern] = STATE(889),
-    [sym_tuple_pattern] = STATE(875),
-    [sym_list_pattern] = STATE(875),
-    [sym_list_splat_pattern] = STATE(875),
-    [sym_expression] = STATE(1019),
-    [sym_primary_expression] = STATE(684),
-    [sym_not_operator] = STATE(1009),
-    [sym_boolean_operator] = STATE(1009),
-    [sym_binary_operator] = STATE(797),
-    [sym_unary_operator] = STATE(797),
-    [sym_comparison_operator] = STATE(1009),
-    [sym_lambda] = STATE(1009),
-    [sym_assignment] = STATE(1361),
-    [sym_augmented_assignment] = STATE(1361),
-    [sym_pattern_list] = STATE(897),
-    [sym_yield] = STATE(1361),
-    [sym_attribute] = STATE(431),
-    [sym_subscript] = STATE(431),
-    [sym_call] = STATE(797),
-    [sym_list] = STATE(797),
-    [sym_set] = STATE(797),
-    [sym_tuple] = STATE(797),
-    [sym_dictionary] = STATE(797),
-    [sym_list_comprehension] = STATE(797),
-    [sym_dictionary_comprehension] = STATE(797),
-    [sym_set_comprehension] = STATE(797),
-    [sym_generator_expression] = STATE(797),
-    [sym_parenthesized_expression] = STATE(797),
-    [sym_conditional_expression] = STATE(1009),
-    [sym_concatenated_string] = STATE(797),
-    [sym_string] = STATE(713),
-    [sym_await] = STATE(1009),
-    [aux_sym_module_repeat1] = STATE(65),
-    [aux_sym_decorated_definition_repeat1] = STATE(996),
+    [sym__statement] = STATE(60),
+    [sym__simple_statements] = STATE(60),
+    [sym_import_statement] = STATE(1213),
+    [sym_future_import_statement] = STATE(1213),
+    [sym_import_from_statement] = STATE(1213),
+    [sym_print_statement] = STATE(1213),
+    [sym_assert_statement] = STATE(1213),
+    [sym_expression_statement] = STATE(1213),
+    [sym_named_expression] = STATE(985),
+    [sym_return_statement] = STATE(1213),
+    [sym_delete_statement] = STATE(1213),
+    [sym_raise_statement] = STATE(1213),
+    [sym_pass_statement] = STATE(1213),
+    [sym_break_statement] = STATE(1213),
+    [sym_continue_statement] = STATE(1213),
+    [sym_if_statement] = STATE(60),
+    [sym_for_statement] = STATE(60),
+    [sym_while_statement] = STATE(60),
+    [sym_try_statement] = STATE(60),
+    [sym_with_statement] = STATE(60),
+    [sym_match_statement] = STATE(60),
+    [sym_function_definition] = STATE(60),
+    [sym_list_splat] = STATE(1321),
+    [sym_dictionary_splat] = STATE(1321),
+    [sym_global_statement] = STATE(1213),
+    [sym_nonlocal_statement] = STATE(1213),
+    [sym_exec_statement] = STATE(1213),
+    [sym_type_alias_statement] = STATE(1213),
+    [sym_class_definition] = STATE(60),
+    [sym_decorated_definition] = STATE(60),
+    [sym_decorator] = STATE(947),
+    [sym_block] = STATE(520),
+    [sym_expression_list] = STATE(1313),
+    [sym_pattern] = STATE(871),
+    [sym_tuple_pattern] = STATE(860),
+    [sym_list_pattern] = STATE(860),
+    [sym_list_splat_pattern] = STATE(860),
+    [sym_expression] = STATE(995),
+    [sym_primary_expression] = STATE(707),
+    [sym_not_operator] = STATE(985),
+    [sym_boolean_operator] = STATE(985),
+    [sym_binary_operator] = STATE(759),
+    [sym_unary_operator] = STATE(759),
+    [sym_comparison_operator] = STATE(985),
+    [sym_lambda] = STATE(985),
+    [sym_assignment] = STATE(1313),
+    [sym_augmented_assignment] = STATE(1313),
+    [sym_pattern_list] = STATE(880),
+    [sym_yield] = STATE(1313),
+    [sym_attribute] = STATE(422),
+    [sym_subscript] = STATE(422),
+    [sym_call] = STATE(759),
+    [sym_list] = STATE(759),
+    [sym_set] = STATE(759),
+    [sym_tuple] = STATE(759),
+    [sym_dictionary] = STATE(759),
+    [sym_list_comprehension] = STATE(759),
+    [sym_dictionary_comprehension] = STATE(759),
+    [sym_set_comprehension] = STATE(759),
+    [sym_generator_expression] = STATE(759),
+    [sym_parenthesized_expression] = STATE(759),
+    [sym_conditional_expression] = STATE(985),
+    [sym_concatenated_string] = STATE(759),
+    [sym_string] = STATE(709),
+    [sym_await] = STATE(759),
+    [aux_sym_module_repeat1] = STATE(60),
+    [aux_sym_decorated_definition_repeat1] = STATE(947),
     [sym_identifier] = ACTIONS(7),
     [anon_sym_import] = ACTIONS(9),
     [anon_sym_from] = ACTIONS(11),
@@ -11067,74 +8102,419 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym__dedent] = ACTIONS(101),
     [sym__string_start] = ACTIONS(81),
   },
+  [4] = {
+    [sym__statement] = STATE(60),
+    [sym__simple_statements] = STATE(60),
+    [sym_import_statement] = STATE(1213),
+    [sym_future_import_statement] = STATE(1213),
+    [sym_import_from_statement] = STATE(1213),
+    [sym_print_statement] = STATE(1213),
+    [sym_assert_statement] = STATE(1213),
+    [sym_expression_statement] = STATE(1213),
+    [sym_named_expression] = STATE(985),
+    [sym_return_statement] = STATE(1213),
+    [sym_delete_statement] = STATE(1213),
+    [sym_raise_statement] = STATE(1213),
+    [sym_pass_statement] = STATE(1213),
+    [sym_break_statement] = STATE(1213),
+    [sym_continue_statement] = STATE(1213),
+    [sym_if_statement] = STATE(60),
+    [sym_for_statement] = STATE(60),
+    [sym_while_statement] = STATE(60),
+    [sym_try_statement] = STATE(60),
+    [sym_with_statement] = STATE(60),
+    [sym_match_statement] = STATE(60),
+    [sym_function_definition] = STATE(60),
+    [sym_list_splat] = STATE(1321),
+    [sym_dictionary_splat] = STATE(1321),
+    [sym_global_statement] = STATE(1213),
+    [sym_nonlocal_statement] = STATE(1213),
+    [sym_exec_statement] = STATE(1213),
+    [sym_type_alias_statement] = STATE(1213),
+    [sym_class_definition] = STATE(60),
+    [sym_decorated_definition] = STATE(60),
+    [sym_decorator] = STATE(947),
+    [sym_block] = STATE(333),
+    [sym_expression_list] = STATE(1313),
+    [sym_pattern] = STATE(871),
+    [sym_tuple_pattern] = STATE(860),
+    [sym_list_pattern] = STATE(860),
+    [sym_list_splat_pattern] = STATE(860),
+    [sym_expression] = STATE(995),
+    [sym_primary_expression] = STATE(707),
+    [sym_not_operator] = STATE(985),
+    [sym_boolean_operator] = STATE(985),
+    [sym_binary_operator] = STATE(759),
+    [sym_unary_operator] = STATE(759),
+    [sym_comparison_operator] = STATE(985),
+    [sym_lambda] = STATE(985),
+    [sym_assignment] = STATE(1313),
+    [sym_augmented_assignment] = STATE(1313),
+    [sym_pattern_list] = STATE(880),
+    [sym_yield] = STATE(1313),
+    [sym_attribute] = STATE(422),
+    [sym_subscript] = STATE(422),
+    [sym_call] = STATE(759),
+    [sym_list] = STATE(759),
+    [sym_set] = STATE(759),
+    [sym_tuple] = STATE(759),
+    [sym_dictionary] = STATE(759),
+    [sym_list_comprehension] = STATE(759),
+    [sym_dictionary_comprehension] = STATE(759),
+    [sym_set_comprehension] = STATE(759),
+    [sym_generator_expression] = STATE(759),
+    [sym_parenthesized_expression] = STATE(759),
+    [sym_conditional_expression] = STATE(985),
+    [sym_concatenated_string] = STATE(759),
+    [sym_string] = STATE(709),
+    [sym_await] = STATE(759),
+    [aux_sym_module_repeat1] = STATE(60),
+    [aux_sym_decorated_definition_repeat1] = STATE(947),
+    [sym_identifier] = ACTIONS(7),
+    [anon_sym_import] = ACTIONS(9),
+    [anon_sym_from] = ACTIONS(11),
+    [anon_sym_LPAREN] = ACTIONS(13),
+    [anon_sym_STAR] = ACTIONS(15),
+    [anon_sym_print] = ACTIONS(17),
+    [anon_sym_assert] = ACTIONS(19),
+    [anon_sym_return] = ACTIONS(21),
+    [anon_sym_del] = ACTIONS(23),
+    [anon_sym_raise] = ACTIONS(25),
+    [anon_sym_pass] = ACTIONS(27),
+    [anon_sym_break] = ACTIONS(29),
+    [anon_sym_continue] = ACTIONS(31),
+    [anon_sym_if] = ACTIONS(83),
+    [anon_sym_async] = ACTIONS(85),
+    [anon_sym_for] = ACTIONS(87),
+    [anon_sym_while] = ACTIONS(89),
+    [anon_sym_try] = ACTIONS(91),
+    [anon_sym_with] = ACTIONS(93),
+    [anon_sym_match] = ACTIONS(95),
+    [anon_sym_DASH] = ACTIONS(47),
+    [anon_sym_PLUS] = ACTIONS(47),
+    [anon_sym_LBRACK] = ACTIONS(49),
+    [anon_sym_LBRACE] = ACTIONS(51),
+    [anon_sym_STAR_STAR] = ACTIONS(53),
+    [anon_sym_def] = ACTIONS(97),
+    [anon_sym_global] = ACTIONS(57),
+    [anon_sym_nonlocal] = ACTIONS(59),
+    [anon_sym_exec] = ACTIONS(61),
+    [anon_sym_type] = ACTIONS(63),
+    [anon_sym_class] = ACTIONS(99),
+    [anon_sym_AT] = ACTIONS(67),
+    [anon_sym_not] = ACTIONS(69),
+    [anon_sym_TILDE] = ACTIONS(47),
+    [anon_sym_lambda] = ACTIONS(71),
+    [anon_sym_yield] = ACTIONS(73),
+    [sym_ellipsis] = ACTIONS(75),
+    [sym_integer] = ACTIONS(77),
+    [sym_float] = ACTIONS(75),
+    [anon_sym_await] = ACTIONS(79),
+    [sym_true] = ACTIONS(77),
+    [sym_false] = ACTIONS(77),
+    [sym_none] = ACTIONS(77),
+    [sym_comment] = ACTIONS(3),
+    [sym__dedent] = ACTIONS(101),
+    [sym__string_start] = ACTIONS(81),
+  },
+  [5] = {
+    [sym__statement] = STATE(60),
+    [sym__simple_statements] = STATE(60),
+    [sym_import_statement] = STATE(1213),
+    [sym_future_import_statement] = STATE(1213),
+    [sym_import_from_statement] = STATE(1213),
+    [sym_print_statement] = STATE(1213),
+    [sym_assert_statement] = STATE(1213),
+    [sym_expression_statement] = STATE(1213),
+    [sym_named_expression] = STATE(985),
+    [sym_return_statement] = STATE(1213),
+    [sym_delete_statement] = STATE(1213),
+    [sym_raise_statement] = STATE(1213),
+    [sym_pass_statement] = STATE(1213),
+    [sym_break_statement] = STATE(1213),
+    [sym_continue_statement] = STATE(1213),
+    [sym_if_statement] = STATE(60),
+    [sym_for_statement] = STATE(60),
+    [sym_while_statement] = STATE(60),
+    [sym_try_statement] = STATE(60),
+    [sym_with_statement] = STATE(60),
+    [sym_match_statement] = STATE(60),
+    [sym_function_definition] = STATE(60),
+    [sym_list_splat] = STATE(1321),
+    [sym_dictionary_splat] = STATE(1321),
+    [sym_global_statement] = STATE(1213),
+    [sym_nonlocal_statement] = STATE(1213),
+    [sym_exec_statement] = STATE(1213),
+    [sym_type_alias_statement] = STATE(1213),
+    [sym_class_definition] = STATE(60),
+    [sym_decorated_definition] = STATE(60),
+    [sym_decorator] = STATE(947),
+    [sym_block] = STATE(465),
+    [sym_expression_list] = STATE(1313),
+    [sym_pattern] = STATE(871),
+    [sym_tuple_pattern] = STATE(860),
+    [sym_list_pattern] = STATE(860),
+    [sym_list_splat_pattern] = STATE(860),
+    [sym_expression] = STATE(995),
+    [sym_primary_expression] = STATE(707),
+    [sym_not_operator] = STATE(985),
+    [sym_boolean_operator] = STATE(985),
+    [sym_binary_operator] = STATE(759),
+    [sym_unary_operator] = STATE(759),
+    [sym_comparison_operator] = STATE(985),
+    [sym_lambda] = STATE(985),
+    [sym_assignment] = STATE(1313),
+    [sym_augmented_assignment] = STATE(1313),
+    [sym_pattern_list] = STATE(880),
+    [sym_yield] = STATE(1313),
+    [sym_attribute] = STATE(422),
+    [sym_subscript] = STATE(422),
+    [sym_call] = STATE(759),
+    [sym_list] = STATE(759),
+    [sym_set] = STATE(759),
+    [sym_tuple] = STATE(759),
+    [sym_dictionary] = STATE(759),
+    [sym_list_comprehension] = STATE(759),
+    [sym_dictionary_comprehension] = STATE(759),
+    [sym_set_comprehension] = STATE(759),
+    [sym_generator_expression] = STATE(759),
+    [sym_parenthesized_expression] = STATE(759),
+    [sym_conditional_expression] = STATE(985),
+    [sym_concatenated_string] = STATE(759),
+    [sym_string] = STATE(709),
+    [sym_await] = STATE(759),
+    [aux_sym_module_repeat1] = STATE(60),
+    [aux_sym_decorated_definition_repeat1] = STATE(947),
+    [sym_identifier] = ACTIONS(7),
+    [anon_sym_import] = ACTIONS(9),
+    [anon_sym_from] = ACTIONS(11),
+    [anon_sym_LPAREN] = ACTIONS(13),
+    [anon_sym_STAR] = ACTIONS(15),
+    [anon_sym_print] = ACTIONS(17),
+    [anon_sym_assert] = ACTIONS(19),
+    [anon_sym_return] = ACTIONS(21),
+    [anon_sym_del] = ACTIONS(23),
+    [anon_sym_raise] = ACTIONS(25),
+    [anon_sym_pass] = ACTIONS(27),
+    [anon_sym_break] = ACTIONS(29),
+    [anon_sym_continue] = ACTIONS(31),
+    [anon_sym_if] = ACTIONS(83),
+    [anon_sym_async] = ACTIONS(85),
+    [anon_sym_for] = ACTIONS(87),
+    [anon_sym_while] = ACTIONS(89),
+    [anon_sym_try] = ACTIONS(91),
+    [anon_sym_with] = ACTIONS(93),
+    [anon_sym_match] = ACTIONS(95),
+    [anon_sym_DASH] = ACTIONS(47),
+    [anon_sym_PLUS] = ACTIONS(47),
+    [anon_sym_LBRACK] = ACTIONS(49),
+    [anon_sym_LBRACE] = ACTIONS(51),
+    [anon_sym_STAR_STAR] = ACTIONS(53),
+    [anon_sym_def] = ACTIONS(97),
+    [anon_sym_global] = ACTIONS(57),
+    [anon_sym_nonlocal] = ACTIONS(59),
+    [anon_sym_exec] = ACTIONS(61),
+    [anon_sym_type] = ACTIONS(63),
+    [anon_sym_class] = ACTIONS(99),
+    [anon_sym_AT] = ACTIONS(67),
+    [anon_sym_not] = ACTIONS(69),
+    [anon_sym_TILDE] = ACTIONS(47),
+    [anon_sym_lambda] = ACTIONS(71),
+    [anon_sym_yield] = ACTIONS(73),
+    [sym_ellipsis] = ACTIONS(75),
+    [sym_integer] = ACTIONS(77),
+    [sym_float] = ACTIONS(75),
+    [anon_sym_await] = ACTIONS(79),
+    [sym_true] = ACTIONS(77),
+    [sym_false] = ACTIONS(77),
+    [sym_none] = ACTIONS(77),
+    [sym_comment] = ACTIONS(3),
+    [sym__dedent] = ACTIONS(101),
+    [sym__string_start] = ACTIONS(81),
+  },
+  [6] = {
+    [sym__statement] = STATE(61),
+    [sym__simple_statements] = STATE(61),
+    [sym_import_statement] = STATE(1213),
+    [sym_future_import_statement] = STATE(1213),
+    [sym_import_from_statement] = STATE(1213),
+    [sym_print_statement] = STATE(1213),
+    [sym_assert_statement] = STATE(1213),
+    [sym_expression_statement] = STATE(1213),
+    [sym_named_expression] = STATE(985),
+    [sym_return_statement] = STATE(1213),
+    [sym_delete_statement] = STATE(1213),
+    [sym_raise_statement] = STATE(1213),
+    [sym_pass_statement] = STATE(1213),
+    [sym_break_statement] = STATE(1213),
+    [sym_continue_statement] = STATE(1213),
+    [sym_if_statement] = STATE(61),
+    [sym_for_statement] = STATE(61),
+    [sym_while_statement] = STATE(61),
+    [sym_try_statement] = STATE(61),
+    [sym_with_statement] = STATE(61),
+    [sym_match_statement] = STATE(61),
+    [sym_function_definition] = STATE(61),
+    [sym_list_splat] = STATE(1321),
+    [sym_dictionary_splat] = STATE(1321),
+    [sym_global_statement] = STATE(1213),
+    [sym_nonlocal_statement] = STATE(1213),
+    [sym_exec_statement] = STATE(1213),
+    [sym_type_alias_statement] = STATE(1213),
+    [sym_class_definition] = STATE(61),
+    [sym_decorated_definition] = STATE(61),
+    [sym_decorator] = STATE(947),
+    [sym_block] = STATE(467),
+    [sym_expression_list] = STATE(1313),
+    [sym_pattern] = STATE(871),
+    [sym_tuple_pattern] = STATE(860),
+    [sym_list_pattern] = STATE(860),
+    [sym_list_splat_pattern] = STATE(860),
+    [sym_expression] = STATE(995),
+    [sym_primary_expression] = STATE(707),
+    [sym_not_operator] = STATE(985),
+    [sym_boolean_operator] = STATE(985),
+    [sym_binary_operator] = STATE(759),
+    [sym_unary_operator] = STATE(759),
+    [sym_comparison_operator] = STATE(985),
+    [sym_lambda] = STATE(985),
+    [sym_assignment] = STATE(1313),
+    [sym_augmented_assignment] = STATE(1313),
+    [sym_pattern_list] = STATE(880),
+    [sym_yield] = STATE(1313),
+    [sym_attribute] = STATE(422),
+    [sym_subscript] = STATE(422),
+    [sym_call] = STATE(759),
+    [sym_list] = STATE(759),
+    [sym_set] = STATE(759),
+    [sym_tuple] = STATE(759),
+    [sym_dictionary] = STATE(759),
+    [sym_list_comprehension] = STATE(759),
+    [sym_dictionary_comprehension] = STATE(759),
+    [sym_set_comprehension] = STATE(759),
+    [sym_generator_expression] = STATE(759),
+    [sym_parenthesized_expression] = STATE(759),
+    [sym_conditional_expression] = STATE(985),
+    [sym_concatenated_string] = STATE(759),
+    [sym_string] = STATE(709),
+    [sym_await] = STATE(759),
+    [aux_sym_module_repeat1] = STATE(61),
+    [aux_sym_decorated_definition_repeat1] = STATE(947),
+    [sym_identifier] = ACTIONS(7),
+    [anon_sym_import] = ACTIONS(9),
+    [anon_sym_from] = ACTIONS(11),
+    [anon_sym_LPAREN] = ACTIONS(13),
+    [anon_sym_STAR] = ACTIONS(15),
+    [anon_sym_print] = ACTIONS(17),
+    [anon_sym_assert] = ACTIONS(19),
+    [anon_sym_return] = ACTIONS(21),
+    [anon_sym_del] = ACTIONS(23),
+    [anon_sym_raise] = ACTIONS(25),
+    [anon_sym_pass] = ACTIONS(27),
+    [anon_sym_break] = ACTIONS(29),
+    [anon_sym_continue] = ACTIONS(31),
+    [anon_sym_if] = ACTIONS(83),
+    [anon_sym_async] = ACTIONS(85),
+    [anon_sym_for] = ACTIONS(87),
+    [anon_sym_while] = ACTIONS(89),
+    [anon_sym_try] = ACTIONS(91),
+    [anon_sym_with] = ACTIONS(93),
+    [anon_sym_match] = ACTIONS(95),
+    [anon_sym_DASH] = ACTIONS(47),
+    [anon_sym_PLUS] = ACTIONS(47),
+    [anon_sym_LBRACK] = ACTIONS(49),
+    [anon_sym_LBRACE] = ACTIONS(51),
+    [anon_sym_STAR_STAR] = ACTIONS(53),
+    [anon_sym_def] = ACTIONS(97),
+    [anon_sym_global] = ACTIONS(57),
+    [anon_sym_nonlocal] = ACTIONS(59),
+    [anon_sym_exec] = ACTIONS(61),
+    [anon_sym_type] = ACTIONS(63),
+    [anon_sym_class] = ACTIONS(99),
+    [anon_sym_AT] = ACTIONS(67),
+    [anon_sym_not] = ACTIONS(69),
+    [anon_sym_TILDE] = ACTIONS(47),
+    [anon_sym_lambda] = ACTIONS(71),
+    [anon_sym_yield] = ACTIONS(73),
+    [sym_ellipsis] = ACTIONS(75),
+    [sym_integer] = ACTIONS(77),
+    [sym_float] = ACTIONS(75),
+    [anon_sym_await] = ACTIONS(79),
+    [sym_true] = ACTIONS(77),
+    [sym_false] = ACTIONS(77),
+    [sym_none] = ACTIONS(77),
+    [sym_comment] = ACTIONS(3),
+    [sym__dedent] = ACTIONS(103),
+    [sym__string_start] = ACTIONS(81),
+  },
   [7] = {
-    [sym__statement] = STATE(68),
-    [sym__simple_statements] = STATE(68),
-    [sym_import_statement] = STATE(1319),
-    [sym_future_import_statement] = STATE(1319),
-    [sym_import_from_statement] = STATE(1319),
-    [sym_print_statement] = STATE(1319),
-    [sym_assert_statement] = STATE(1319),
-    [sym_expression_statement] = STATE(1319),
-    [sym_named_expression] = STATE(1009),
-    [sym_return_statement] = STATE(1319),
-    [sym_delete_statement] = STATE(1319),
-    [sym_raise_statement] = STATE(1319),
-    [sym_pass_statement] = STATE(1319),
-    [sym_break_statement] = STATE(1319),
-    [sym_continue_statement] = STATE(1319),
-    [sym_if_statement] = STATE(68),
-    [sym_for_statement] = STATE(68),
-    [sym_while_statement] = STATE(68),
-    [sym_try_statement] = STATE(68),
-    [sym_with_statement] = STATE(68),
-    [sym_match_statement] = STATE(68),
-    [sym_function_definition] = STATE(68),
-    [sym_list_splat] = STATE(1360),
-    [sym_dictionary_splat] = STATE(1360),
-    [sym_global_statement] = STATE(1319),
-    [sym_nonlocal_statement] = STATE(1319),
-    [sym_exec_statement] = STATE(1319),
-    [sym_type_alias_statement] = STATE(1319),
-    [sym_class_definition] = STATE(68),
-    [sym_decorated_definition] = STATE(68),
-    [sym_decorator] = STATE(996),
-    [sym_block] = STATE(403),
-    [sym_expression_list] = STATE(1361),
-    [sym_pattern] = STATE(889),
-    [sym_tuple_pattern] = STATE(875),
-    [sym_list_pattern] = STATE(875),
-    [sym_list_splat_pattern] = STATE(875),
-    [sym_expression] = STATE(1019),
-    [sym_primary_expression] = STATE(684),
-    [sym_not_operator] = STATE(1009),
-    [sym_boolean_operator] = STATE(1009),
-    [sym_binary_operator] = STATE(797),
-    [sym_unary_operator] = STATE(797),
-    [sym_comparison_operator] = STATE(1009),
-    [sym_lambda] = STATE(1009),
-    [sym_assignment] = STATE(1361),
-    [sym_augmented_assignment] = STATE(1361),
-    [sym_pattern_list] = STATE(897),
-    [sym_yield] = STATE(1361),
-    [sym_attribute] = STATE(431),
-    [sym_subscript] = STATE(431),
-    [sym_call] = STATE(797),
-    [sym_list] = STATE(797),
-    [sym_set] = STATE(797),
-    [sym_tuple] = STATE(797),
-    [sym_dictionary] = STATE(797),
-    [sym_list_comprehension] = STATE(797),
-    [sym_dictionary_comprehension] = STATE(797),
-    [sym_set_comprehension] = STATE(797),
-    [sym_generator_expression] = STATE(797),
-    [sym_parenthesized_expression] = STATE(797),
-    [sym_conditional_expression] = STATE(1009),
-    [sym_concatenated_string] = STATE(797),
-    [sym_string] = STATE(713),
-    [sym_await] = STATE(1009),
-    [aux_sym_module_repeat1] = STATE(68),
-    [aux_sym_decorated_definition_repeat1] = STATE(996),
+    [sym__statement] = STATE(61),
+    [sym__simple_statements] = STATE(61),
+    [sym_import_statement] = STATE(1213),
+    [sym_future_import_statement] = STATE(1213),
+    [sym_import_from_statement] = STATE(1213),
+    [sym_print_statement] = STATE(1213),
+    [sym_assert_statement] = STATE(1213),
+    [sym_expression_statement] = STATE(1213),
+    [sym_named_expression] = STATE(985),
+    [sym_return_statement] = STATE(1213),
+    [sym_delete_statement] = STATE(1213),
+    [sym_raise_statement] = STATE(1213),
+    [sym_pass_statement] = STATE(1213),
+    [sym_break_statement] = STATE(1213),
+    [sym_continue_statement] = STATE(1213),
+    [sym_if_statement] = STATE(61),
+    [sym_for_statement] = STATE(61),
+    [sym_while_statement] = STATE(61),
+    [sym_try_statement] = STATE(61),
+    [sym_with_statement] = STATE(61),
+    [sym_match_statement] = STATE(61),
+    [sym_function_definition] = STATE(61),
+    [sym_list_splat] = STATE(1321),
+    [sym_dictionary_splat] = STATE(1321),
+    [sym_global_statement] = STATE(1213),
+    [sym_nonlocal_statement] = STATE(1213),
+    [sym_exec_statement] = STATE(1213),
+    [sym_type_alias_statement] = STATE(1213),
+    [sym_class_definition] = STATE(61),
+    [sym_decorated_definition] = STATE(61),
+    [sym_decorator] = STATE(947),
+    [sym_block] = STATE(535),
+    [sym_expression_list] = STATE(1313),
+    [sym_pattern] = STATE(871),
+    [sym_tuple_pattern] = STATE(860),
+    [sym_list_pattern] = STATE(860),
+    [sym_list_splat_pattern] = STATE(860),
+    [sym_expression] = STATE(995),
+    [sym_primary_expression] = STATE(707),
+    [sym_not_operator] = STATE(985),
+    [sym_boolean_operator] = STATE(985),
+    [sym_binary_operator] = STATE(759),
+    [sym_unary_operator] = STATE(759),
+    [sym_comparison_operator] = STATE(985),
+    [sym_lambda] = STATE(985),
+    [sym_assignment] = STATE(1313),
+    [sym_augmented_assignment] = STATE(1313),
+    [sym_pattern_list] = STATE(880),
+    [sym_yield] = STATE(1313),
+    [sym_attribute] = STATE(422),
+    [sym_subscript] = STATE(422),
+    [sym_call] = STATE(759),
+    [sym_list] = STATE(759),
+    [sym_set] = STATE(759),
+    [sym_tuple] = STATE(759),
+    [sym_dictionary] = STATE(759),
+    [sym_list_comprehension] = STATE(759),
+    [sym_dictionary_comprehension] = STATE(759),
+    [sym_set_comprehension] = STATE(759),
+    [sym_generator_expression] = STATE(759),
+    [sym_parenthesized_expression] = STATE(759),
+    [sym_conditional_expression] = STATE(985),
+    [sym_concatenated_string] = STATE(759),
+    [sym_string] = STATE(709),
+    [sym_await] = STATE(759),
+    [aux_sym_module_repeat1] = STATE(61),
+    [aux_sym_decorated_definition_repeat1] = STATE(947),
     [sym_identifier] = ACTIONS(7),
     [anon_sym_import] = ACTIONS(9),
     [anon_sym_from] = ACTIONS(11),
@@ -11183,73 +8563,188 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym__string_start] = ACTIONS(81),
   },
   [8] = {
-    [sym__statement] = STATE(68),
-    [sym__simple_statements] = STATE(68),
-    [sym_import_statement] = STATE(1319),
-    [sym_future_import_statement] = STATE(1319),
-    [sym_import_from_statement] = STATE(1319),
-    [sym_print_statement] = STATE(1319),
-    [sym_assert_statement] = STATE(1319),
-    [sym_expression_statement] = STATE(1319),
-    [sym_named_expression] = STATE(1009),
-    [sym_return_statement] = STATE(1319),
-    [sym_delete_statement] = STATE(1319),
-    [sym_raise_statement] = STATE(1319),
-    [sym_pass_statement] = STATE(1319),
-    [sym_break_statement] = STATE(1319),
-    [sym_continue_statement] = STATE(1319),
-    [sym_if_statement] = STATE(68),
-    [sym_for_statement] = STATE(68),
-    [sym_while_statement] = STATE(68),
-    [sym_try_statement] = STATE(68),
-    [sym_with_statement] = STATE(68),
-    [sym_match_statement] = STATE(68),
-    [sym_function_definition] = STATE(68),
-    [sym_list_splat] = STATE(1360),
-    [sym_dictionary_splat] = STATE(1360),
-    [sym_global_statement] = STATE(1319),
-    [sym_nonlocal_statement] = STATE(1319),
-    [sym_exec_statement] = STATE(1319),
-    [sym_type_alias_statement] = STATE(1319),
-    [sym_class_definition] = STATE(68),
-    [sym_decorated_definition] = STATE(68),
-    [sym_decorator] = STATE(996),
-    [sym_block] = STATE(509),
-    [sym_expression_list] = STATE(1361),
-    [sym_pattern] = STATE(889),
-    [sym_tuple_pattern] = STATE(875),
-    [sym_list_pattern] = STATE(875),
-    [sym_list_splat_pattern] = STATE(875),
-    [sym_expression] = STATE(1019),
-    [sym_primary_expression] = STATE(684),
-    [sym_not_operator] = STATE(1009),
-    [sym_boolean_operator] = STATE(1009),
-    [sym_binary_operator] = STATE(797),
-    [sym_unary_operator] = STATE(797),
-    [sym_comparison_operator] = STATE(1009),
-    [sym_lambda] = STATE(1009),
-    [sym_assignment] = STATE(1361),
-    [sym_augmented_assignment] = STATE(1361),
-    [sym_pattern_list] = STATE(897),
-    [sym_yield] = STATE(1361),
-    [sym_attribute] = STATE(431),
-    [sym_subscript] = STATE(431),
-    [sym_call] = STATE(797),
-    [sym_list] = STATE(797),
-    [sym_set] = STATE(797),
-    [sym_tuple] = STATE(797),
-    [sym_dictionary] = STATE(797),
-    [sym_list_comprehension] = STATE(797),
-    [sym_dictionary_comprehension] = STATE(797),
-    [sym_set_comprehension] = STATE(797),
-    [sym_generator_expression] = STATE(797),
-    [sym_parenthesized_expression] = STATE(797),
-    [sym_conditional_expression] = STATE(1009),
-    [sym_concatenated_string] = STATE(797),
-    [sym_string] = STATE(713),
-    [sym_await] = STATE(1009),
-    [aux_sym_module_repeat1] = STATE(68),
-    [aux_sym_decorated_definition_repeat1] = STATE(996),
+    [sym__statement] = STATE(60),
+    [sym__simple_statements] = STATE(60),
+    [sym_import_statement] = STATE(1213),
+    [sym_future_import_statement] = STATE(1213),
+    [sym_import_from_statement] = STATE(1213),
+    [sym_print_statement] = STATE(1213),
+    [sym_assert_statement] = STATE(1213),
+    [sym_expression_statement] = STATE(1213),
+    [sym_named_expression] = STATE(985),
+    [sym_return_statement] = STATE(1213),
+    [sym_delete_statement] = STATE(1213),
+    [sym_raise_statement] = STATE(1213),
+    [sym_pass_statement] = STATE(1213),
+    [sym_break_statement] = STATE(1213),
+    [sym_continue_statement] = STATE(1213),
+    [sym_if_statement] = STATE(60),
+    [sym_for_statement] = STATE(60),
+    [sym_while_statement] = STATE(60),
+    [sym_try_statement] = STATE(60),
+    [sym_with_statement] = STATE(60),
+    [sym_match_statement] = STATE(60),
+    [sym_function_definition] = STATE(60),
+    [sym_list_splat] = STATE(1321),
+    [sym_dictionary_splat] = STATE(1321),
+    [sym_global_statement] = STATE(1213),
+    [sym_nonlocal_statement] = STATE(1213),
+    [sym_exec_statement] = STATE(1213),
+    [sym_type_alias_statement] = STATE(1213),
+    [sym_class_definition] = STATE(60),
+    [sym_decorated_definition] = STATE(60),
+    [sym_decorator] = STATE(947),
+    [sym_block] = STATE(340),
+    [sym_expression_list] = STATE(1313),
+    [sym_pattern] = STATE(871),
+    [sym_tuple_pattern] = STATE(860),
+    [sym_list_pattern] = STATE(860),
+    [sym_list_splat_pattern] = STATE(860),
+    [sym_expression] = STATE(995),
+    [sym_primary_expression] = STATE(707),
+    [sym_not_operator] = STATE(985),
+    [sym_boolean_operator] = STATE(985),
+    [sym_binary_operator] = STATE(759),
+    [sym_unary_operator] = STATE(759),
+    [sym_comparison_operator] = STATE(985),
+    [sym_lambda] = STATE(985),
+    [sym_assignment] = STATE(1313),
+    [sym_augmented_assignment] = STATE(1313),
+    [sym_pattern_list] = STATE(880),
+    [sym_yield] = STATE(1313),
+    [sym_attribute] = STATE(422),
+    [sym_subscript] = STATE(422),
+    [sym_call] = STATE(759),
+    [sym_list] = STATE(759),
+    [sym_set] = STATE(759),
+    [sym_tuple] = STATE(759),
+    [sym_dictionary] = STATE(759),
+    [sym_list_comprehension] = STATE(759),
+    [sym_dictionary_comprehension] = STATE(759),
+    [sym_set_comprehension] = STATE(759),
+    [sym_generator_expression] = STATE(759),
+    [sym_parenthesized_expression] = STATE(759),
+    [sym_conditional_expression] = STATE(985),
+    [sym_concatenated_string] = STATE(759),
+    [sym_string] = STATE(709),
+    [sym_await] = STATE(759),
+    [aux_sym_module_repeat1] = STATE(60),
+    [aux_sym_decorated_definition_repeat1] = STATE(947),
+    [sym_identifier] = ACTIONS(7),
+    [anon_sym_import] = ACTIONS(9),
+    [anon_sym_from] = ACTIONS(11),
+    [anon_sym_LPAREN] = ACTIONS(13),
+    [anon_sym_STAR] = ACTIONS(15),
+    [anon_sym_print] = ACTIONS(17),
+    [anon_sym_assert] = ACTIONS(19),
+    [anon_sym_return] = ACTIONS(21),
+    [anon_sym_del] = ACTIONS(23),
+    [anon_sym_raise] = ACTIONS(25),
+    [anon_sym_pass] = ACTIONS(27),
+    [anon_sym_break] = ACTIONS(29),
+    [anon_sym_continue] = ACTIONS(31),
+    [anon_sym_if] = ACTIONS(83),
+    [anon_sym_async] = ACTIONS(85),
+    [anon_sym_for] = ACTIONS(87),
+    [anon_sym_while] = ACTIONS(89),
+    [anon_sym_try] = ACTIONS(91),
+    [anon_sym_with] = ACTIONS(93),
+    [anon_sym_match] = ACTIONS(95),
+    [anon_sym_DASH] = ACTIONS(47),
+    [anon_sym_PLUS] = ACTIONS(47),
+    [anon_sym_LBRACK] = ACTIONS(49),
+    [anon_sym_LBRACE] = ACTIONS(51),
+    [anon_sym_STAR_STAR] = ACTIONS(53),
+    [anon_sym_def] = ACTIONS(97),
+    [anon_sym_global] = ACTIONS(57),
+    [anon_sym_nonlocal] = ACTIONS(59),
+    [anon_sym_exec] = ACTIONS(61),
+    [anon_sym_type] = ACTIONS(63),
+    [anon_sym_class] = ACTIONS(99),
+    [anon_sym_AT] = ACTIONS(67),
+    [anon_sym_not] = ACTIONS(69),
+    [anon_sym_TILDE] = ACTIONS(47),
+    [anon_sym_lambda] = ACTIONS(71),
+    [anon_sym_yield] = ACTIONS(73),
+    [sym_ellipsis] = ACTIONS(75),
+    [sym_integer] = ACTIONS(77),
+    [sym_float] = ACTIONS(75),
+    [anon_sym_await] = ACTIONS(79),
+    [sym_true] = ACTIONS(77),
+    [sym_false] = ACTIONS(77),
+    [sym_none] = ACTIONS(77),
+    [sym_comment] = ACTIONS(3),
+    [sym__dedent] = ACTIONS(101),
+    [sym__string_start] = ACTIONS(81),
+  },
+  [9] = {
+    [sym__statement] = STATE(61),
+    [sym__simple_statements] = STATE(61),
+    [sym_import_statement] = STATE(1213),
+    [sym_future_import_statement] = STATE(1213),
+    [sym_import_from_statement] = STATE(1213),
+    [sym_print_statement] = STATE(1213),
+    [sym_assert_statement] = STATE(1213),
+    [sym_expression_statement] = STATE(1213),
+    [sym_named_expression] = STATE(985),
+    [sym_return_statement] = STATE(1213),
+    [sym_delete_statement] = STATE(1213),
+    [sym_raise_statement] = STATE(1213),
+    [sym_pass_statement] = STATE(1213),
+    [sym_break_statement] = STATE(1213),
+    [sym_continue_statement] = STATE(1213),
+    [sym_if_statement] = STATE(61),
+    [sym_for_statement] = STATE(61),
+    [sym_while_statement] = STATE(61),
+    [sym_try_statement] = STATE(61),
+    [sym_with_statement] = STATE(61),
+    [sym_match_statement] = STATE(61),
+    [sym_function_definition] = STATE(61),
+    [sym_list_splat] = STATE(1321),
+    [sym_dictionary_splat] = STATE(1321),
+    [sym_global_statement] = STATE(1213),
+    [sym_nonlocal_statement] = STATE(1213),
+    [sym_exec_statement] = STATE(1213),
+    [sym_type_alias_statement] = STATE(1213),
+    [sym_class_definition] = STATE(61),
+    [sym_decorated_definition] = STATE(61),
+    [sym_decorator] = STATE(947),
+    [sym_block] = STATE(336),
+    [sym_expression_list] = STATE(1313),
+    [sym_pattern] = STATE(871),
+    [sym_tuple_pattern] = STATE(860),
+    [sym_list_pattern] = STATE(860),
+    [sym_list_splat_pattern] = STATE(860),
+    [sym_expression] = STATE(995),
+    [sym_primary_expression] = STATE(707),
+    [sym_not_operator] = STATE(985),
+    [sym_boolean_operator] = STATE(985),
+    [sym_binary_operator] = STATE(759),
+    [sym_unary_operator] = STATE(759),
+    [sym_comparison_operator] = STATE(985),
+    [sym_lambda] = STATE(985),
+    [sym_assignment] = STATE(1313),
+    [sym_augmented_assignment] = STATE(1313),
+    [sym_pattern_list] = STATE(880),
+    [sym_yield] = STATE(1313),
+    [sym_attribute] = STATE(422),
+    [sym_subscript] = STATE(422),
+    [sym_call] = STATE(759),
+    [sym_list] = STATE(759),
+    [sym_set] = STATE(759),
+    [sym_tuple] = STATE(759),
+    [sym_dictionary] = STATE(759),
+    [sym_list_comprehension] = STATE(759),
+    [sym_dictionary_comprehension] = STATE(759),
+    [sym_set_comprehension] = STATE(759),
+    [sym_generator_expression] = STATE(759),
+    [sym_parenthesized_expression] = STATE(759),
+    [sym_conditional_expression] = STATE(985),
+    [sym_concatenated_string] = STATE(759),
+    [sym_string] = STATE(709),
+    [sym_await] = STATE(759),
+    [aux_sym_module_repeat1] = STATE(61),
+    [aux_sym_decorated_definition_repeat1] = STATE(947),
     [sym_identifier] = ACTIONS(7),
     [anon_sym_import] = ACTIONS(9),
     [anon_sym_from] = ACTIONS(11),
@@ -11297,137 +8792,22 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym__dedent] = ACTIONS(103),
     [sym__string_start] = ACTIONS(81),
   },
-  [9] = {
-    [sym__statement] = STATE(62),
-    [sym__simple_statements] = STATE(62),
-    [sym_import_statement] = STATE(1319),
-    [sym_future_import_statement] = STATE(1319),
-    [sym_import_from_statement] = STATE(1319),
-    [sym_print_statement] = STATE(1319),
-    [sym_assert_statement] = STATE(1319),
-    [sym_expression_statement] = STATE(1319),
-    [sym_named_expression] = STATE(1009),
-    [sym_return_statement] = STATE(1319),
-    [sym_delete_statement] = STATE(1319),
-    [sym_raise_statement] = STATE(1319),
-    [sym_pass_statement] = STATE(1319),
-    [sym_break_statement] = STATE(1319),
-    [sym_continue_statement] = STATE(1319),
-    [sym_if_statement] = STATE(62),
-    [sym_for_statement] = STATE(62),
-    [sym_while_statement] = STATE(62),
-    [sym_try_statement] = STATE(62),
-    [sym_with_statement] = STATE(62),
-    [sym_match_statement] = STATE(62),
-    [sym_function_definition] = STATE(62),
-    [sym_list_splat] = STATE(1360),
-    [sym_dictionary_splat] = STATE(1360),
-    [sym_global_statement] = STATE(1319),
-    [sym_nonlocal_statement] = STATE(1319),
-    [sym_exec_statement] = STATE(1319),
-    [sym_type_alias_statement] = STATE(1319),
-    [sym_class_definition] = STATE(62),
-    [sym_decorated_definition] = STATE(62),
-    [sym_decorator] = STATE(996),
-    [sym_block] = STATE(372),
-    [sym_expression_list] = STATE(1361),
-    [sym_pattern] = STATE(889),
-    [sym_tuple_pattern] = STATE(875),
-    [sym_list_pattern] = STATE(875),
-    [sym_list_splat_pattern] = STATE(875),
-    [sym_expression] = STATE(1019),
-    [sym_primary_expression] = STATE(684),
-    [sym_not_operator] = STATE(1009),
-    [sym_boolean_operator] = STATE(1009),
-    [sym_binary_operator] = STATE(797),
-    [sym_unary_operator] = STATE(797),
-    [sym_comparison_operator] = STATE(1009),
-    [sym_lambda] = STATE(1009),
-    [sym_assignment] = STATE(1361),
-    [sym_augmented_assignment] = STATE(1361),
-    [sym_pattern_list] = STATE(897),
-    [sym_yield] = STATE(1361),
-    [sym_attribute] = STATE(431),
-    [sym_subscript] = STATE(431),
-    [sym_call] = STATE(797),
-    [sym_list] = STATE(797),
-    [sym_set] = STATE(797),
-    [sym_tuple] = STATE(797),
-    [sym_dictionary] = STATE(797),
-    [sym_list_comprehension] = STATE(797),
-    [sym_dictionary_comprehension] = STATE(797),
-    [sym_set_comprehension] = STATE(797),
-    [sym_generator_expression] = STATE(797),
-    [sym_parenthesized_expression] = STATE(797),
-    [sym_conditional_expression] = STATE(1009),
-    [sym_concatenated_string] = STATE(797),
-    [sym_string] = STATE(713),
-    [sym_await] = STATE(1009),
-    [aux_sym_module_repeat1] = STATE(62),
-    [aux_sym_decorated_definition_repeat1] = STATE(996),
-    [sym_identifier] = ACTIONS(7),
-    [anon_sym_import] = ACTIONS(9),
-    [anon_sym_from] = ACTIONS(11),
-    [anon_sym_LPAREN] = ACTIONS(13),
-    [anon_sym_STAR] = ACTIONS(15),
-    [anon_sym_print] = ACTIONS(17),
-    [anon_sym_assert] = ACTIONS(19),
-    [anon_sym_return] = ACTIONS(21),
-    [anon_sym_del] = ACTIONS(23),
-    [anon_sym_raise] = ACTIONS(25),
-    [anon_sym_pass] = ACTIONS(27),
-    [anon_sym_break] = ACTIONS(29),
-    [anon_sym_continue] = ACTIONS(31),
-    [anon_sym_if] = ACTIONS(83),
-    [anon_sym_async] = ACTIONS(85),
-    [anon_sym_for] = ACTIONS(87),
-    [anon_sym_while] = ACTIONS(89),
-    [anon_sym_try] = ACTIONS(91),
-    [anon_sym_with] = ACTIONS(93),
-    [anon_sym_match] = ACTIONS(95),
-    [anon_sym_DASH] = ACTIONS(47),
-    [anon_sym_PLUS] = ACTIONS(47),
-    [anon_sym_LBRACK] = ACTIONS(49),
-    [anon_sym_LBRACE] = ACTIONS(51),
-    [anon_sym_STAR_STAR] = ACTIONS(53),
-    [anon_sym_def] = ACTIONS(97),
-    [anon_sym_global] = ACTIONS(57),
-    [anon_sym_nonlocal] = ACTIONS(59),
-    [anon_sym_exec] = ACTIONS(61),
-    [anon_sym_type] = ACTIONS(63),
-    [anon_sym_class] = ACTIONS(99),
-    [anon_sym_AT] = ACTIONS(67),
-    [anon_sym_not] = ACTIONS(69),
-    [anon_sym_TILDE] = ACTIONS(47),
-    [anon_sym_lambda] = ACTIONS(71),
-    [anon_sym_yield] = ACTIONS(73),
-    [sym_ellipsis] = ACTIONS(75),
-    [sym_integer] = ACTIONS(77),
-    [sym_float] = ACTIONS(75),
-    [anon_sym_await] = ACTIONS(79),
-    [sym_true] = ACTIONS(77),
-    [sym_false] = ACTIONS(77),
-    [sym_none] = ACTIONS(77),
-    [sym_comment] = ACTIONS(3),
-    [sym__dedent] = ACTIONS(105),
-    [sym__string_start] = ACTIONS(81),
-  },
   [10] = {
     [sym__statement] = STATE(61),
     [sym__simple_statements] = STATE(61),
-    [sym_import_statement] = STATE(1319),
-    [sym_future_import_statement] = STATE(1319),
-    [sym_import_from_statement] = STATE(1319),
-    [sym_print_statement] = STATE(1319),
-    [sym_assert_statement] = STATE(1319),
-    [sym_expression_statement] = STATE(1319),
-    [sym_named_expression] = STATE(1009),
-    [sym_return_statement] = STATE(1319),
-    [sym_delete_statement] = STATE(1319),
-    [sym_raise_statement] = STATE(1319),
-    [sym_pass_statement] = STATE(1319),
-    [sym_break_statement] = STATE(1319),
-    [sym_continue_statement] = STATE(1319),
+    [sym_import_statement] = STATE(1213),
+    [sym_future_import_statement] = STATE(1213),
+    [sym_import_from_statement] = STATE(1213),
+    [sym_print_statement] = STATE(1213),
+    [sym_assert_statement] = STATE(1213),
+    [sym_expression_statement] = STATE(1213),
+    [sym_named_expression] = STATE(985),
+    [sym_return_statement] = STATE(1213),
+    [sym_delete_statement] = STATE(1213),
+    [sym_raise_statement] = STATE(1213),
+    [sym_pass_statement] = STATE(1213),
+    [sym_break_statement] = STATE(1213),
+    [sym_continue_statement] = STATE(1213),
     [sym_if_statement] = STATE(61),
     [sym_for_statement] = STATE(61),
     [sym_while_statement] = STATE(61),
@@ -11435,51 +8815,51 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_with_statement] = STATE(61),
     [sym_match_statement] = STATE(61),
     [sym_function_definition] = STATE(61),
-    [sym_list_splat] = STATE(1360),
-    [sym_dictionary_splat] = STATE(1360),
-    [sym_global_statement] = STATE(1319),
-    [sym_nonlocal_statement] = STATE(1319),
-    [sym_exec_statement] = STATE(1319),
-    [sym_type_alias_statement] = STATE(1319),
+    [sym_list_splat] = STATE(1321),
+    [sym_dictionary_splat] = STATE(1321),
+    [sym_global_statement] = STATE(1213),
+    [sym_nonlocal_statement] = STATE(1213),
+    [sym_exec_statement] = STATE(1213),
+    [sym_type_alias_statement] = STATE(1213),
     [sym_class_definition] = STATE(61),
     [sym_decorated_definition] = STATE(61),
-    [sym_decorator] = STATE(996),
-    [sym_block] = STATE(546),
-    [sym_expression_list] = STATE(1361),
-    [sym_pattern] = STATE(889),
-    [sym_tuple_pattern] = STATE(875),
-    [sym_list_pattern] = STATE(875),
-    [sym_list_splat_pattern] = STATE(875),
-    [sym_expression] = STATE(1019),
-    [sym_primary_expression] = STATE(684),
-    [sym_not_operator] = STATE(1009),
-    [sym_boolean_operator] = STATE(1009),
-    [sym_binary_operator] = STATE(797),
-    [sym_unary_operator] = STATE(797),
-    [sym_comparison_operator] = STATE(1009),
-    [sym_lambda] = STATE(1009),
-    [sym_assignment] = STATE(1361),
-    [sym_augmented_assignment] = STATE(1361),
-    [sym_pattern_list] = STATE(897),
-    [sym_yield] = STATE(1361),
-    [sym_attribute] = STATE(431),
-    [sym_subscript] = STATE(431),
-    [sym_call] = STATE(797),
-    [sym_list] = STATE(797),
-    [sym_set] = STATE(797),
-    [sym_tuple] = STATE(797),
-    [sym_dictionary] = STATE(797),
-    [sym_list_comprehension] = STATE(797),
-    [sym_dictionary_comprehension] = STATE(797),
-    [sym_set_comprehension] = STATE(797),
-    [sym_generator_expression] = STATE(797),
-    [sym_parenthesized_expression] = STATE(797),
-    [sym_conditional_expression] = STATE(1009),
-    [sym_concatenated_string] = STATE(797),
-    [sym_string] = STATE(713),
-    [sym_await] = STATE(1009),
+    [sym_decorator] = STATE(947),
+    [sym_block] = STATE(470),
+    [sym_expression_list] = STATE(1313),
+    [sym_pattern] = STATE(871),
+    [sym_tuple_pattern] = STATE(860),
+    [sym_list_pattern] = STATE(860),
+    [sym_list_splat_pattern] = STATE(860),
+    [sym_expression] = STATE(995),
+    [sym_primary_expression] = STATE(707),
+    [sym_not_operator] = STATE(985),
+    [sym_boolean_operator] = STATE(985),
+    [sym_binary_operator] = STATE(759),
+    [sym_unary_operator] = STATE(759),
+    [sym_comparison_operator] = STATE(985),
+    [sym_lambda] = STATE(985),
+    [sym_assignment] = STATE(1313),
+    [sym_augmented_assignment] = STATE(1313),
+    [sym_pattern_list] = STATE(880),
+    [sym_yield] = STATE(1313),
+    [sym_attribute] = STATE(422),
+    [sym_subscript] = STATE(422),
+    [sym_call] = STATE(759),
+    [sym_list] = STATE(759),
+    [sym_set] = STATE(759),
+    [sym_tuple] = STATE(759),
+    [sym_dictionary] = STATE(759),
+    [sym_list_comprehension] = STATE(759),
+    [sym_dictionary_comprehension] = STATE(759),
+    [sym_set_comprehension] = STATE(759),
+    [sym_generator_expression] = STATE(759),
+    [sym_parenthesized_expression] = STATE(759),
+    [sym_conditional_expression] = STATE(985),
+    [sym_concatenated_string] = STATE(759),
+    [sym_string] = STATE(709),
+    [sym_await] = STATE(759),
     [aux_sym_module_repeat1] = STATE(61),
-    [aux_sym_decorated_definition_repeat1] = STATE(996),
+    [aux_sym_decorated_definition_repeat1] = STATE(947),
     [sym_identifier] = ACTIONS(7),
     [anon_sym_import] = ACTIONS(9),
     [anon_sym_from] = ACTIONS(11),
@@ -11524,25 +8904,25 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_false] = ACTIONS(77),
     [sym_none] = ACTIONS(77),
     [sym_comment] = ACTIONS(3),
-    [sym__dedent] = ACTIONS(107),
+    [sym__dedent] = ACTIONS(103),
     [sym__string_start] = ACTIONS(81),
   },
   [11] = {
     [sym__statement] = STATE(61),
     [sym__simple_statements] = STATE(61),
-    [sym_import_statement] = STATE(1319),
-    [sym_future_import_statement] = STATE(1319),
-    [sym_import_from_statement] = STATE(1319),
-    [sym_print_statement] = STATE(1319),
-    [sym_assert_statement] = STATE(1319),
-    [sym_expression_statement] = STATE(1319),
-    [sym_named_expression] = STATE(1009),
-    [sym_return_statement] = STATE(1319),
-    [sym_delete_statement] = STATE(1319),
-    [sym_raise_statement] = STATE(1319),
-    [sym_pass_statement] = STATE(1319),
-    [sym_break_statement] = STATE(1319),
-    [sym_continue_statement] = STATE(1319),
+    [sym_import_statement] = STATE(1213),
+    [sym_future_import_statement] = STATE(1213),
+    [sym_import_from_statement] = STATE(1213),
+    [sym_print_statement] = STATE(1213),
+    [sym_assert_statement] = STATE(1213),
+    [sym_expression_statement] = STATE(1213),
+    [sym_named_expression] = STATE(985),
+    [sym_return_statement] = STATE(1213),
+    [sym_delete_statement] = STATE(1213),
+    [sym_raise_statement] = STATE(1213),
+    [sym_pass_statement] = STATE(1213),
+    [sym_break_statement] = STATE(1213),
+    [sym_continue_statement] = STATE(1213),
     [sym_if_statement] = STATE(61),
     [sym_for_statement] = STATE(61),
     [sym_while_statement] = STATE(61),
@@ -11550,51 +8930,51 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_with_statement] = STATE(61),
     [sym_match_statement] = STATE(61),
     [sym_function_definition] = STATE(61),
-    [sym_list_splat] = STATE(1360),
-    [sym_dictionary_splat] = STATE(1360),
-    [sym_global_statement] = STATE(1319),
-    [sym_nonlocal_statement] = STATE(1319),
-    [sym_exec_statement] = STATE(1319),
-    [sym_type_alias_statement] = STATE(1319),
+    [sym_list_splat] = STATE(1321),
+    [sym_dictionary_splat] = STATE(1321),
+    [sym_global_statement] = STATE(1213),
+    [sym_nonlocal_statement] = STATE(1213),
+    [sym_exec_statement] = STATE(1213),
+    [sym_type_alias_statement] = STATE(1213),
     [sym_class_definition] = STATE(61),
     [sym_decorated_definition] = STATE(61),
-    [sym_decorator] = STATE(996),
-    [sym_block] = STATE(279),
-    [sym_expression_list] = STATE(1361),
-    [sym_pattern] = STATE(889),
-    [sym_tuple_pattern] = STATE(875),
-    [sym_list_pattern] = STATE(875),
-    [sym_list_splat_pattern] = STATE(875),
-    [sym_expression] = STATE(1019),
-    [sym_primary_expression] = STATE(684),
-    [sym_not_operator] = STATE(1009),
-    [sym_boolean_operator] = STATE(1009),
-    [sym_binary_operator] = STATE(797),
-    [sym_unary_operator] = STATE(797),
-    [sym_comparison_operator] = STATE(1009),
-    [sym_lambda] = STATE(1009),
-    [sym_assignment] = STATE(1361),
-    [sym_augmented_assignment] = STATE(1361),
-    [sym_pattern_list] = STATE(897),
-    [sym_yield] = STATE(1361),
-    [sym_attribute] = STATE(431),
-    [sym_subscript] = STATE(431),
-    [sym_call] = STATE(797),
-    [sym_list] = STATE(797),
-    [sym_set] = STATE(797),
-    [sym_tuple] = STATE(797),
-    [sym_dictionary] = STATE(797),
-    [sym_list_comprehension] = STATE(797),
-    [sym_dictionary_comprehension] = STATE(797),
-    [sym_set_comprehension] = STATE(797),
-    [sym_generator_expression] = STATE(797),
-    [sym_parenthesized_expression] = STATE(797),
-    [sym_conditional_expression] = STATE(1009),
-    [sym_concatenated_string] = STATE(797),
-    [sym_string] = STATE(713),
-    [sym_await] = STATE(1009),
+    [sym_decorator] = STATE(947),
+    [sym_block] = STATE(534),
+    [sym_expression_list] = STATE(1313),
+    [sym_pattern] = STATE(871),
+    [sym_tuple_pattern] = STATE(860),
+    [sym_list_pattern] = STATE(860),
+    [sym_list_splat_pattern] = STATE(860),
+    [sym_expression] = STATE(995),
+    [sym_primary_expression] = STATE(707),
+    [sym_not_operator] = STATE(985),
+    [sym_boolean_operator] = STATE(985),
+    [sym_binary_operator] = STATE(759),
+    [sym_unary_operator] = STATE(759),
+    [sym_comparison_operator] = STATE(985),
+    [sym_lambda] = STATE(985),
+    [sym_assignment] = STATE(1313),
+    [sym_augmented_assignment] = STATE(1313),
+    [sym_pattern_list] = STATE(880),
+    [sym_yield] = STATE(1313),
+    [sym_attribute] = STATE(422),
+    [sym_subscript] = STATE(422),
+    [sym_call] = STATE(759),
+    [sym_list] = STATE(759),
+    [sym_set] = STATE(759),
+    [sym_tuple] = STATE(759),
+    [sym_dictionary] = STATE(759),
+    [sym_list_comprehension] = STATE(759),
+    [sym_dictionary_comprehension] = STATE(759),
+    [sym_set_comprehension] = STATE(759),
+    [sym_generator_expression] = STATE(759),
+    [sym_parenthesized_expression] = STATE(759),
+    [sym_conditional_expression] = STATE(985),
+    [sym_concatenated_string] = STATE(759),
+    [sym_string] = STATE(709),
+    [sym_await] = STATE(759),
     [aux_sym_module_repeat1] = STATE(61),
-    [aux_sym_decorated_definition_repeat1] = STATE(996),
+    [aux_sym_decorated_definition_repeat1] = STATE(947),
     [sym_identifier] = ACTIONS(7),
     [anon_sym_import] = ACTIONS(9),
     [anon_sym_from] = ACTIONS(11),
@@ -11639,77 +9019,77 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_false] = ACTIONS(77),
     [sym_none] = ACTIONS(77),
     [sym_comment] = ACTIONS(3),
-    [sym__dedent] = ACTIONS(107),
+    [sym__dedent] = ACTIONS(103),
     [sym__string_start] = ACTIONS(81),
   },
   [12] = {
-    [sym__statement] = STATE(68),
-    [sym__simple_statements] = STATE(68),
-    [sym_import_statement] = STATE(1319),
-    [sym_future_import_statement] = STATE(1319),
-    [sym_import_from_statement] = STATE(1319),
-    [sym_print_statement] = STATE(1319),
-    [sym_assert_statement] = STATE(1319),
-    [sym_expression_statement] = STATE(1319),
-    [sym_named_expression] = STATE(1009),
-    [sym_return_statement] = STATE(1319),
-    [sym_delete_statement] = STATE(1319),
-    [sym_raise_statement] = STATE(1319),
-    [sym_pass_statement] = STATE(1319),
-    [sym_break_statement] = STATE(1319),
-    [sym_continue_statement] = STATE(1319),
-    [sym_if_statement] = STATE(68),
-    [sym_for_statement] = STATE(68),
-    [sym_while_statement] = STATE(68),
-    [sym_try_statement] = STATE(68),
-    [sym_with_statement] = STATE(68),
-    [sym_match_statement] = STATE(68),
-    [sym_function_definition] = STATE(68),
-    [sym_list_splat] = STATE(1360),
-    [sym_dictionary_splat] = STATE(1360),
-    [sym_global_statement] = STATE(1319),
-    [sym_nonlocal_statement] = STATE(1319),
-    [sym_exec_statement] = STATE(1319),
-    [sym_type_alias_statement] = STATE(1319),
-    [sym_class_definition] = STATE(68),
-    [sym_decorated_definition] = STATE(68),
-    [sym_decorator] = STATE(996),
-    [sym_block] = STATE(491),
-    [sym_expression_list] = STATE(1361),
-    [sym_pattern] = STATE(889),
-    [sym_tuple_pattern] = STATE(875),
-    [sym_list_pattern] = STATE(875),
-    [sym_list_splat_pattern] = STATE(875),
-    [sym_expression] = STATE(1019),
-    [sym_primary_expression] = STATE(684),
-    [sym_not_operator] = STATE(1009),
-    [sym_boolean_operator] = STATE(1009),
-    [sym_binary_operator] = STATE(797),
-    [sym_unary_operator] = STATE(797),
-    [sym_comparison_operator] = STATE(1009),
-    [sym_lambda] = STATE(1009),
-    [sym_assignment] = STATE(1361),
-    [sym_augmented_assignment] = STATE(1361),
-    [sym_pattern_list] = STATE(897),
-    [sym_yield] = STATE(1361),
-    [sym_attribute] = STATE(431),
-    [sym_subscript] = STATE(431),
-    [sym_call] = STATE(797),
-    [sym_list] = STATE(797),
-    [sym_set] = STATE(797),
-    [sym_tuple] = STATE(797),
-    [sym_dictionary] = STATE(797),
-    [sym_list_comprehension] = STATE(797),
-    [sym_dictionary_comprehension] = STATE(797),
-    [sym_set_comprehension] = STATE(797),
-    [sym_generator_expression] = STATE(797),
-    [sym_parenthesized_expression] = STATE(797),
-    [sym_conditional_expression] = STATE(1009),
-    [sym_concatenated_string] = STATE(797),
-    [sym_string] = STATE(713),
-    [sym_await] = STATE(1009),
-    [aux_sym_module_repeat1] = STATE(68),
-    [aux_sym_decorated_definition_repeat1] = STATE(996),
+    [sym__statement] = STATE(61),
+    [sym__simple_statements] = STATE(61),
+    [sym_import_statement] = STATE(1213),
+    [sym_future_import_statement] = STATE(1213),
+    [sym_import_from_statement] = STATE(1213),
+    [sym_print_statement] = STATE(1213),
+    [sym_assert_statement] = STATE(1213),
+    [sym_expression_statement] = STATE(1213),
+    [sym_named_expression] = STATE(985),
+    [sym_return_statement] = STATE(1213),
+    [sym_delete_statement] = STATE(1213),
+    [sym_raise_statement] = STATE(1213),
+    [sym_pass_statement] = STATE(1213),
+    [sym_break_statement] = STATE(1213),
+    [sym_continue_statement] = STATE(1213),
+    [sym_if_statement] = STATE(61),
+    [sym_for_statement] = STATE(61),
+    [sym_while_statement] = STATE(61),
+    [sym_try_statement] = STATE(61),
+    [sym_with_statement] = STATE(61),
+    [sym_match_statement] = STATE(61),
+    [sym_function_definition] = STATE(61),
+    [sym_list_splat] = STATE(1321),
+    [sym_dictionary_splat] = STATE(1321),
+    [sym_global_statement] = STATE(1213),
+    [sym_nonlocal_statement] = STATE(1213),
+    [sym_exec_statement] = STATE(1213),
+    [sym_type_alias_statement] = STATE(1213),
+    [sym_class_definition] = STATE(61),
+    [sym_decorated_definition] = STATE(61),
+    [sym_decorator] = STATE(947),
+    [sym_block] = STATE(541),
+    [sym_expression_list] = STATE(1313),
+    [sym_pattern] = STATE(871),
+    [sym_tuple_pattern] = STATE(860),
+    [sym_list_pattern] = STATE(860),
+    [sym_list_splat_pattern] = STATE(860),
+    [sym_expression] = STATE(995),
+    [sym_primary_expression] = STATE(707),
+    [sym_not_operator] = STATE(985),
+    [sym_boolean_operator] = STATE(985),
+    [sym_binary_operator] = STATE(759),
+    [sym_unary_operator] = STATE(759),
+    [sym_comparison_operator] = STATE(985),
+    [sym_lambda] = STATE(985),
+    [sym_assignment] = STATE(1313),
+    [sym_augmented_assignment] = STATE(1313),
+    [sym_pattern_list] = STATE(880),
+    [sym_yield] = STATE(1313),
+    [sym_attribute] = STATE(422),
+    [sym_subscript] = STATE(422),
+    [sym_call] = STATE(759),
+    [sym_list] = STATE(759),
+    [sym_set] = STATE(759),
+    [sym_tuple] = STATE(759),
+    [sym_dictionary] = STATE(759),
+    [sym_list_comprehension] = STATE(759),
+    [sym_dictionary_comprehension] = STATE(759),
+    [sym_set_comprehension] = STATE(759),
+    [sym_generator_expression] = STATE(759),
+    [sym_parenthesized_expression] = STATE(759),
+    [sym_conditional_expression] = STATE(985),
+    [sym_concatenated_string] = STATE(759),
+    [sym_string] = STATE(709),
+    [sym_await] = STATE(759),
+    [aux_sym_module_repeat1] = STATE(61),
+    [aux_sym_decorated_definition_repeat1] = STATE(947),
     [sym_identifier] = ACTIONS(7),
     [anon_sym_import] = ACTIONS(9),
     [anon_sym_from] = ACTIONS(11),
@@ -11758,73 +9138,73 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym__string_start] = ACTIONS(81),
   },
   [13] = {
-    [sym__statement] = STATE(68),
-    [sym__simple_statements] = STATE(68),
-    [sym_import_statement] = STATE(1319),
-    [sym_future_import_statement] = STATE(1319),
-    [sym_import_from_statement] = STATE(1319),
-    [sym_print_statement] = STATE(1319),
-    [sym_assert_statement] = STATE(1319),
-    [sym_expression_statement] = STATE(1319),
-    [sym_named_expression] = STATE(1009),
-    [sym_return_statement] = STATE(1319),
-    [sym_delete_statement] = STATE(1319),
-    [sym_raise_statement] = STATE(1319),
-    [sym_pass_statement] = STATE(1319),
-    [sym_break_statement] = STATE(1319),
-    [sym_continue_statement] = STATE(1319),
-    [sym_if_statement] = STATE(68),
-    [sym_for_statement] = STATE(68),
-    [sym_while_statement] = STATE(68),
-    [sym_try_statement] = STATE(68),
-    [sym_with_statement] = STATE(68),
-    [sym_match_statement] = STATE(68),
-    [sym_function_definition] = STATE(68),
-    [sym_list_splat] = STATE(1360),
-    [sym_dictionary_splat] = STATE(1360),
-    [sym_global_statement] = STATE(1319),
-    [sym_nonlocal_statement] = STATE(1319),
-    [sym_exec_statement] = STATE(1319),
-    [sym_type_alias_statement] = STATE(1319),
-    [sym_class_definition] = STATE(68),
-    [sym_decorated_definition] = STATE(68),
-    [sym_decorator] = STATE(996),
-    [sym_block] = STATE(495),
-    [sym_expression_list] = STATE(1361),
-    [sym_pattern] = STATE(889),
-    [sym_tuple_pattern] = STATE(875),
-    [sym_list_pattern] = STATE(875),
-    [sym_list_splat_pattern] = STATE(875),
-    [sym_expression] = STATE(1019),
-    [sym_primary_expression] = STATE(684),
-    [sym_not_operator] = STATE(1009),
-    [sym_boolean_operator] = STATE(1009),
-    [sym_binary_operator] = STATE(797),
-    [sym_unary_operator] = STATE(797),
-    [sym_comparison_operator] = STATE(1009),
-    [sym_lambda] = STATE(1009),
-    [sym_assignment] = STATE(1361),
-    [sym_augmented_assignment] = STATE(1361),
-    [sym_pattern_list] = STATE(897),
-    [sym_yield] = STATE(1361),
-    [sym_attribute] = STATE(431),
-    [sym_subscript] = STATE(431),
-    [sym_call] = STATE(797),
-    [sym_list] = STATE(797),
-    [sym_set] = STATE(797),
-    [sym_tuple] = STATE(797),
-    [sym_dictionary] = STATE(797),
-    [sym_list_comprehension] = STATE(797),
-    [sym_dictionary_comprehension] = STATE(797),
-    [sym_set_comprehension] = STATE(797),
-    [sym_generator_expression] = STATE(797),
-    [sym_parenthesized_expression] = STATE(797),
-    [sym_conditional_expression] = STATE(1009),
-    [sym_concatenated_string] = STATE(797),
-    [sym_string] = STATE(713),
-    [sym_await] = STATE(1009),
-    [aux_sym_module_repeat1] = STATE(68),
-    [aux_sym_decorated_definition_repeat1] = STATE(996),
+    [sym__statement] = STATE(61),
+    [sym__simple_statements] = STATE(61),
+    [sym_import_statement] = STATE(1213),
+    [sym_future_import_statement] = STATE(1213),
+    [sym_import_from_statement] = STATE(1213),
+    [sym_print_statement] = STATE(1213),
+    [sym_assert_statement] = STATE(1213),
+    [sym_expression_statement] = STATE(1213),
+    [sym_named_expression] = STATE(985),
+    [sym_return_statement] = STATE(1213),
+    [sym_delete_statement] = STATE(1213),
+    [sym_raise_statement] = STATE(1213),
+    [sym_pass_statement] = STATE(1213),
+    [sym_break_statement] = STATE(1213),
+    [sym_continue_statement] = STATE(1213),
+    [sym_if_statement] = STATE(61),
+    [sym_for_statement] = STATE(61),
+    [sym_while_statement] = STATE(61),
+    [sym_try_statement] = STATE(61),
+    [sym_with_statement] = STATE(61),
+    [sym_match_statement] = STATE(61),
+    [sym_function_definition] = STATE(61),
+    [sym_list_splat] = STATE(1321),
+    [sym_dictionary_splat] = STATE(1321),
+    [sym_global_statement] = STATE(1213),
+    [sym_nonlocal_statement] = STATE(1213),
+    [sym_exec_statement] = STATE(1213),
+    [sym_type_alias_statement] = STATE(1213),
+    [sym_class_definition] = STATE(61),
+    [sym_decorated_definition] = STATE(61),
+    [sym_decorator] = STATE(947),
+    [sym_block] = STATE(552),
+    [sym_expression_list] = STATE(1313),
+    [sym_pattern] = STATE(871),
+    [sym_tuple_pattern] = STATE(860),
+    [sym_list_pattern] = STATE(860),
+    [sym_list_splat_pattern] = STATE(860),
+    [sym_expression] = STATE(995),
+    [sym_primary_expression] = STATE(707),
+    [sym_not_operator] = STATE(985),
+    [sym_boolean_operator] = STATE(985),
+    [sym_binary_operator] = STATE(759),
+    [sym_unary_operator] = STATE(759),
+    [sym_comparison_operator] = STATE(985),
+    [sym_lambda] = STATE(985),
+    [sym_assignment] = STATE(1313),
+    [sym_augmented_assignment] = STATE(1313),
+    [sym_pattern_list] = STATE(880),
+    [sym_yield] = STATE(1313),
+    [sym_attribute] = STATE(422),
+    [sym_subscript] = STATE(422),
+    [sym_call] = STATE(759),
+    [sym_list] = STATE(759),
+    [sym_set] = STATE(759),
+    [sym_tuple] = STATE(759),
+    [sym_dictionary] = STATE(759),
+    [sym_list_comprehension] = STATE(759),
+    [sym_dictionary_comprehension] = STATE(759),
+    [sym_set_comprehension] = STATE(759),
+    [sym_generator_expression] = STATE(759),
+    [sym_parenthesized_expression] = STATE(759),
+    [sym_conditional_expression] = STATE(985),
+    [sym_concatenated_string] = STATE(759),
+    [sym_string] = STATE(709),
+    [sym_await] = STATE(759),
+    [aux_sym_module_repeat1] = STATE(61),
+    [aux_sym_decorated_definition_repeat1] = STATE(947),
     [sym_identifier] = ACTIONS(7),
     [anon_sym_import] = ACTIONS(9),
     [anon_sym_from] = ACTIONS(11),
@@ -11873,73 +9253,73 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym__string_start] = ACTIONS(81),
   },
   [14] = {
-    [sym__statement] = STATE(68),
-    [sym__simple_statements] = STATE(68),
-    [sym_import_statement] = STATE(1319),
-    [sym_future_import_statement] = STATE(1319),
-    [sym_import_from_statement] = STATE(1319),
-    [sym_print_statement] = STATE(1319),
-    [sym_assert_statement] = STATE(1319),
-    [sym_expression_statement] = STATE(1319),
-    [sym_named_expression] = STATE(1009),
-    [sym_return_statement] = STATE(1319),
-    [sym_delete_statement] = STATE(1319),
-    [sym_raise_statement] = STATE(1319),
-    [sym_pass_statement] = STATE(1319),
-    [sym_break_statement] = STATE(1319),
-    [sym_continue_statement] = STATE(1319),
-    [sym_if_statement] = STATE(68),
-    [sym_for_statement] = STATE(68),
-    [sym_while_statement] = STATE(68),
-    [sym_try_statement] = STATE(68),
-    [sym_with_statement] = STATE(68),
-    [sym_match_statement] = STATE(68),
-    [sym_function_definition] = STATE(68),
-    [sym_list_splat] = STATE(1360),
-    [sym_dictionary_splat] = STATE(1360),
-    [sym_global_statement] = STATE(1319),
-    [sym_nonlocal_statement] = STATE(1319),
-    [sym_exec_statement] = STATE(1319),
-    [sym_type_alias_statement] = STATE(1319),
-    [sym_class_definition] = STATE(68),
-    [sym_decorated_definition] = STATE(68),
-    [sym_decorator] = STATE(996),
-    [sym_block] = STATE(506),
-    [sym_expression_list] = STATE(1361),
-    [sym_pattern] = STATE(889),
-    [sym_tuple_pattern] = STATE(875),
-    [sym_list_pattern] = STATE(875),
-    [sym_list_splat_pattern] = STATE(875),
-    [sym_expression] = STATE(1019),
-    [sym_primary_expression] = STATE(684),
-    [sym_not_operator] = STATE(1009),
-    [sym_boolean_operator] = STATE(1009),
-    [sym_binary_operator] = STATE(797),
-    [sym_unary_operator] = STATE(797),
-    [sym_comparison_operator] = STATE(1009),
-    [sym_lambda] = STATE(1009),
-    [sym_assignment] = STATE(1361),
-    [sym_augmented_assignment] = STATE(1361),
-    [sym_pattern_list] = STATE(897),
-    [sym_yield] = STATE(1361),
-    [sym_attribute] = STATE(431),
-    [sym_subscript] = STATE(431),
-    [sym_call] = STATE(797),
-    [sym_list] = STATE(797),
-    [sym_set] = STATE(797),
-    [sym_tuple] = STATE(797),
-    [sym_dictionary] = STATE(797),
-    [sym_list_comprehension] = STATE(797),
-    [sym_dictionary_comprehension] = STATE(797),
-    [sym_set_comprehension] = STATE(797),
-    [sym_generator_expression] = STATE(797),
-    [sym_parenthesized_expression] = STATE(797),
-    [sym_conditional_expression] = STATE(1009),
-    [sym_concatenated_string] = STATE(797),
-    [sym_string] = STATE(713),
-    [sym_await] = STATE(1009),
-    [aux_sym_module_repeat1] = STATE(68),
-    [aux_sym_decorated_definition_repeat1] = STATE(996),
+    [sym__statement] = STATE(61),
+    [sym__simple_statements] = STATE(61),
+    [sym_import_statement] = STATE(1213),
+    [sym_future_import_statement] = STATE(1213),
+    [sym_import_from_statement] = STATE(1213),
+    [sym_print_statement] = STATE(1213),
+    [sym_assert_statement] = STATE(1213),
+    [sym_expression_statement] = STATE(1213),
+    [sym_named_expression] = STATE(985),
+    [sym_return_statement] = STATE(1213),
+    [sym_delete_statement] = STATE(1213),
+    [sym_raise_statement] = STATE(1213),
+    [sym_pass_statement] = STATE(1213),
+    [sym_break_statement] = STATE(1213),
+    [sym_continue_statement] = STATE(1213),
+    [sym_if_statement] = STATE(61),
+    [sym_for_statement] = STATE(61),
+    [sym_while_statement] = STATE(61),
+    [sym_try_statement] = STATE(61),
+    [sym_with_statement] = STATE(61),
+    [sym_match_statement] = STATE(61),
+    [sym_function_definition] = STATE(61),
+    [sym_list_splat] = STATE(1321),
+    [sym_dictionary_splat] = STATE(1321),
+    [sym_global_statement] = STATE(1213),
+    [sym_nonlocal_statement] = STATE(1213),
+    [sym_exec_statement] = STATE(1213),
+    [sym_type_alias_statement] = STATE(1213),
+    [sym_class_definition] = STATE(61),
+    [sym_decorated_definition] = STATE(61),
+    [sym_decorator] = STATE(947),
+    [sym_block] = STATE(410),
+    [sym_expression_list] = STATE(1313),
+    [sym_pattern] = STATE(871),
+    [sym_tuple_pattern] = STATE(860),
+    [sym_list_pattern] = STATE(860),
+    [sym_list_splat_pattern] = STATE(860),
+    [sym_expression] = STATE(995),
+    [sym_primary_expression] = STATE(707),
+    [sym_not_operator] = STATE(985),
+    [sym_boolean_operator] = STATE(985),
+    [sym_binary_operator] = STATE(759),
+    [sym_unary_operator] = STATE(759),
+    [sym_comparison_operator] = STATE(985),
+    [sym_lambda] = STATE(985),
+    [sym_assignment] = STATE(1313),
+    [sym_augmented_assignment] = STATE(1313),
+    [sym_pattern_list] = STATE(880),
+    [sym_yield] = STATE(1313),
+    [sym_attribute] = STATE(422),
+    [sym_subscript] = STATE(422),
+    [sym_call] = STATE(759),
+    [sym_list] = STATE(759),
+    [sym_set] = STATE(759),
+    [sym_tuple] = STATE(759),
+    [sym_dictionary] = STATE(759),
+    [sym_list_comprehension] = STATE(759),
+    [sym_dictionary_comprehension] = STATE(759),
+    [sym_set_comprehension] = STATE(759),
+    [sym_generator_expression] = STATE(759),
+    [sym_parenthesized_expression] = STATE(759),
+    [sym_conditional_expression] = STATE(985),
+    [sym_concatenated_string] = STATE(759),
+    [sym_string] = STATE(709),
+    [sym_await] = STATE(759),
+    [aux_sym_module_repeat1] = STATE(61),
+    [aux_sym_decorated_definition_repeat1] = STATE(947),
     [sym_identifier] = ACTIONS(7),
     [anon_sym_import] = ACTIONS(9),
     [anon_sym_from] = ACTIONS(11),
@@ -11988,73 +9368,303 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym__string_start] = ACTIONS(81),
   },
   [15] = {
-    [sym__statement] = STATE(68),
-    [sym__simple_statements] = STATE(68),
-    [sym_import_statement] = STATE(1319),
-    [sym_future_import_statement] = STATE(1319),
-    [sym_import_from_statement] = STATE(1319),
-    [sym_print_statement] = STATE(1319),
-    [sym_assert_statement] = STATE(1319),
-    [sym_expression_statement] = STATE(1319),
-    [sym_named_expression] = STATE(1009),
-    [sym_return_statement] = STATE(1319),
-    [sym_delete_statement] = STATE(1319),
-    [sym_raise_statement] = STATE(1319),
-    [sym_pass_statement] = STATE(1319),
-    [sym_break_statement] = STATE(1319),
-    [sym_continue_statement] = STATE(1319),
-    [sym_if_statement] = STATE(68),
-    [sym_for_statement] = STATE(68),
-    [sym_while_statement] = STATE(68),
-    [sym_try_statement] = STATE(68),
-    [sym_with_statement] = STATE(68),
-    [sym_match_statement] = STATE(68),
-    [sym_function_definition] = STATE(68),
-    [sym_list_splat] = STATE(1360),
-    [sym_dictionary_splat] = STATE(1360),
-    [sym_global_statement] = STATE(1319),
-    [sym_nonlocal_statement] = STATE(1319),
-    [sym_exec_statement] = STATE(1319),
-    [sym_type_alias_statement] = STATE(1319),
-    [sym_class_definition] = STATE(68),
-    [sym_decorated_definition] = STATE(68),
-    [sym_decorator] = STATE(996),
-    [sym_block] = STATE(505),
-    [sym_expression_list] = STATE(1361),
-    [sym_pattern] = STATE(889),
-    [sym_tuple_pattern] = STATE(875),
-    [sym_list_pattern] = STATE(875),
-    [sym_list_splat_pattern] = STATE(875),
-    [sym_expression] = STATE(1019),
-    [sym_primary_expression] = STATE(684),
-    [sym_not_operator] = STATE(1009),
-    [sym_boolean_operator] = STATE(1009),
-    [sym_binary_operator] = STATE(797),
-    [sym_unary_operator] = STATE(797),
-    [sym_comparison_operator] = STATE(1009),
-    [sym_lambda] = STATE(1009),
-    [sym_assignment] = STATE(1361),
-    [sym_augmented_assignment] = STATE(1361),
-    [sym_pattern_list] = STATE(897),
-    [sym_yield] = STATE(1361),
-    [sym_attribute] = STATE(431),
-    [sym_subscript] = STATE(431),
-    [sym_call] = STATE(797),
-    [sym_list] = STATE(797),
-    [sym_set] = STATE(797),
-    [sym_tuple] = STATE(797),
-    [sym_dictionary] = STATE(797),
-    [sym_list_comprehension] = STATE(797),
-    [sym_dictionary_comprehension] = STATE(797),
-    [sym_set_comprehension] = STATE(797),
-    [sym_generator_expression] = STATE(797),
-    [sym_parenthesized_expression] = STATE(797),
-    [sym_conditional_expression] = STATE(1009),
-    [sym_concatenated_string] = STATE(797),
-    [sym_string] = STATE(713),
-    [sym_await] = STATE(1009),
-    [aux_sym_module_repeat1] = STATE(68),
-    [aux_sym_decorated_definition_repeat1] = STATE(996),
+    [sym__statement] = STATE(60),
+    [sym__simple_statements] = STATE(60),
+    [sym_import_statement] = STATE(1213),
+    [sym_future_import_statement] = STATE(1213),
+    [sym_import_from_statement] = STATE(1213),
+    [sym_print_statement] = STATE(1213),
+    [sym_assert_statement] = STATE(1213),
+    [sym_expression_statement] = STATE(1213),
+    [sym_named_expression] = STATE(985),
+    [sym_return_statement] = STATE(1213),
+    [sym_delete_statement] = STATE(1213),
+    [sym_raise_statement] = STATE(1213),
+    [sym_pass_statement] = STATE(1213),
+    [sym_break_statement] = STATE(1213),
+    [sym_continue_statement] = STATE(1213),
+    [sym_if_statement] = STATE(60),
+    [sym_for_statement] = STATE(60),
+    [sym_while_statement] = STATE(60),
+    [sym_try_statement] = STATE(60),
+    [sym_with_statement] = STATE(60),
+    [sym_match_statement] = STATE(60),
+    [sym_function_definition] = STATE(60),
+    [sym_list_splat] = STATE(1321),
+    [sym_dictionary_splat] = STATE(1321),
+    [sym_global_statement] = STATE(1213),
+    [sym_nonlocal_statement] = STATE(1213),
+    [sym_exec_statement] = STATE(1213),
+    [sym_type_alias_statement] = STATE(1213),
+    [sym_class_definition] = STATE(60),
+    [sym_decorated_definition] = STATE(60),
+    [sym_decorator] = STATE(947),
+    [sym_block] = STATE(557),
+    [sym_expression_list] = STATE(1313),
+    [sym_pattern] = STATE(871),
+    [sym_tuple_pattern] = STATE(860),
+    [sym_list_pattern] = STATE(860),
+    [sym_list_splat_pattern] = STATE(860),
+    [sym_expression] = STATE(995),
+    [sym_primary_expression] = STATE(707),
+    [sym_not_operator] = STATE(985),
+    [sym_boolean_operator] = STATE(985),
+    [sym_binary_operator] = STATE(759),
+    [sym_unary_operator] = STATE(759),
+    [sym_comparison_operator] = STATE(985),
+    [sym_lambda] = STATE(985),
+    [sym_assignment] = STATE(1313),
+    [sym_augmented_assignment] = STATE(1313),
+    [sym_pattern_list] = STATE(880),
+    [sym_yield] = STATE(1313),
+    [sym_attribute] = STATE(422),
+    [sym_subscript] = STATE(422),
+    [sym_call] = STATE(759),
+    [sym_list] = STATE(759),
+    [sym_set] = STATE(759),
+    [sym_tuple] = STATE(759),
+    [sym_dictionary] = STATE(759),
+    [sym_list_comprehension] = STATE(759),
+    [sym_dictionary_comprehension] = STATE(759),
+    [sym_set_comprehension] = STATE(759),
+    [sym_generator_expression] = STATE(759),
+    [sym_parenthesized_expression] = STATE(759),
+    [sym_conditional_expression] = STATE(985),
+    [sym_concatenated_string] = STATE(759),
+    [sym_string] = STATE(709),
+    [sym_await] = STATE(759),
+    [aux_sym_module_repeat1] = STATE(60),
+    [aux_sym_decorated_definition_repeat1] = STATE(947),
+    [sym_identifier] = ACTIONS(7),
+    [anon_sym_import] = ACTIONS(9),
+    [anon_sym_from] = ACTIONS(11),
+    [anon_sym_LPAREN] = ACTIONS(13),
+    [anon_sym_STAR] = ACTIONS(15),
+    [anon_sym_print] = ACTIONS(17),
+    [anon_sym_assert] = ACTIONS(19),
+    [anon_sym_return] = ACTIONS(21),
+    [anon_sym_del] = ACTIONS(23),
+    [anon_sym_raise] = ACTIONS(25),
+    [anon_sym_pass] = ACTIONS(27),
+    [anon_sym_break] = ACTIONS(29),
+    [anon_sym_continue] = ACTIONS(31),
+    [anon_sym_if] = ACTIONS(83),
+    [anon_sym_async] = ACTIONS(85),
+    [anon_sym_for] = ACTIONS(87),
+    [anon_sym_while] = ACTIONS(89),
+    [anon_sym_try] = ACTIONS(91),
+    [anon_sym_with] = ACTIONS(93),
+    [anon_sym_match] = ACTIONS(95),
+    [anon_sym_DASH] = ACTIONS(47),
+    [anon_sym_PLUS] = ACTIONS(47),
+    [anon_sym_LBRACK] = ACTIONS(49),
+    [anon_sym_LBRACE] = ACTIONS(51),
+    [anon_sym_STAR_STAR] = ACTIONS(53),
+    [anon_sym_def] = ACTIONS(97),
+    [anon_sym_global] = ACTIONS(57),
+    [anon_sym_nonlocal] = ACTIONS(59),
+    [anon_sym_exec] = ACTIONS(61),
+    [anon_sym_type] = ACTIONS(63),
+    [anon_sym_class] = ACTIONS(99),
+    [anon_sym_AT] = ACTIONS(67),
+    [anon_sym_not] = ACTIONS(69),
+    [anon_sym_TILDE] = ACTIONS(47),
+    [anon_sym_lambda] = ACTIONS(71),
+    [anon_sym_yield] = ACTIONS(73),
+    [sym_ellipsis] = ACTIONS(75),
+    [sym_integer] = ACTIONS(77),
+    [sym_float] = ACTIONS(75),
+    [anon_sym_await] = ACTIONS(79),
+    [sym_true] = ACTIONS(77),
+    [sym_false] = ACTIONS(77),
+    [sym_none] = ACTIONS(77),
+    [sym_comment] = ACTIONS(3),
+    [sym__dedent] = ACTIONS(101),
+    [sym__string_start] = ACTIONS(81),
+  },
+  [16] = {
+    [sym__statement] = STATE(60),
+    [sym__simple_statements] = STATE(60),
+    [sym_import_statement] = STATE(1213),
+    [sym_future_import_statement] = STATE(1213),
+    [sym_import_from_statement] = STATE(1213),
+    [sym_print_statement] = STATE(1213),
+    [sym_assert_statement] = STATE(1213),
+    [sym_expression_statement] = STATE(1213),
+    [sym_named_expression] = STATE(985),
+    [sym_return_statement] = STATE(1213),
+    [sym_delete_statement] = STATE(1213),
+    [sym_raise_statement] = STATE(1213),
+    [sym_pass_statement] = STATE(1213),
+    [sym_break_statement] = STATE(1213),
+    [sym_continue_statement] = STATE(1213),
+    [sym_if_statement] = STATE(60),
+    [sym_for_statement] = STATE(60),
+    [sym_while_statement] = STATE(60),
+    [sym_try_statement] = STATE(60),
+    [sym_with_statement] = STATE(60),
+    [sym_match_statement] = STATE(60),
+    [sym_function_definition] = STATE(60),
+    [sym_list_splat] = STATE(1321),
+    [sym_dictionary_splat] = STATE(1321),
+    [sym_global_statement] = STATE(1213),
+    [sym_nonlocal_statement] = STATE(1213),
+    [sym_exec_statement] = STATE(1213),
+    [sym_type_alias_statement] = STATE(1213),
+    [sym_class_definition] = STATE(60),
+    [sym_decorated_definition] = STATE(60),
+    [sym_decorator] = STATE(947),
+    [sym_block] = STATE(484),
+    [sym_expression_list] = STATE(1313),
+    [sym_pattern] = STATE(871),
+    [sym_tuple_pattern] = STATE(860),
+    [sym_list_pattern] = STATE(860),
+    [sym_list_splat_pattern] = STATE(860),
+    [sym_expression] = STATE(995),
+    [sym_primary_expression] = STATE(707),
+    [sym_not_operator] = STATE(985),
+    [sym_boolean_operator] = STATE(985),
+    [sym_binary_operator] = STATE(759),
+    [sym_unary_operator] = STATE(759),
+    [sym_comparison_operator] = STATE(985),
+    [sym_lambda] = STATE(985),
+    [sym_assignment] = STATE(1313),
+    [sym_augmented_assignment] = STATE(1313),
+    [sym_pattern_list] = STATE(880),
+    [sym_yield] = STATE(1313),
+    [sym_attribute] = STATE(422),
+    [sym_subscript] = STATE(422),
+    [sym_call] = STATE(759),
+    [sym_list] = STATE(759),
+    [sym_set] = STATE(759),
+    [sym_tuple] = STATE(759),
+    [sym_dictionary] = STATE(759),
+    [sym_list_comprehension] = STATE(759),
+    [sym_dictionary_comprehension] = STATE(759),
+    [sym_set_comprehension] = STATE(759),
+    [sym_generator_expression] = STATE(759),
+    [sym_parenthesized_expression] = STATE(759),
+    [sym_conditional_expression] = STATE(985),
+    [sym_concatenated_string] = STATE(759),
+    [sym_string] = STATE(709),
+    [sym_await] = STATE(759),
+    [aux_sym_module_repeat1] = STATE(60),
+    [aux_sym_decorated_definition_repeat1] = STATE(947),
+    [sym_identifier] = ACTIONS(7),
+    [anon_sym_import] = ACTIONS(9),
+    [anon_sym_from] = ACTIONS(11),
+    [anon_sym_LPAREN] = ACTIONS(13),
+    [anon_sym_STAR] = ACTIONS(15),
+    [anon_sym_print] = ACTIONS(17),
+    [anon_sym_assert] = ACTIONS(19),
+    [anon_sym_return] = ACTIONS(21),
+    [anon_sym_del] = ACTIONS(23),
+    [anon_sym_raise] = ACTIONS(25),
+    [anon_sym_pass] = ACTIONS(27),
+    [anon_sym_break] = ACTIONS(29),
+    [anon_sym_continue] = ACTIONS(31),
+    [anon_sym_if] = ACTIONS(83),
+    [anon_sym_async] = ACTIONS(85),
+    [anon_sym_for] = ACTIONS(87),
+    [anon_sym_while] = ACTIONS(89),
+    [anon_sym_try] = ACTIONS(91),
+    [anon_sym_with] = ACTIONS(93),
+    [anon_sym_match] = ACTIONS(95),
+    [anon_sym_DASH] = ACTIONS(47),
+    [anon_sym_PLUS] = ACTIONS(47),
+    [anon_sym_LBRACK] = ACTIONS(49),
+    [anon_sym_LBRACE] = ACTIONS(51),
+    [anon_sym_STAR_STAR] = ACTIONS(53),
+    [anon_sym_def] = ACTIONS(97),
+    [anon_sym_global] = ACTIONS(57),
+    [anon_sym_nonlocal] = ACTIONS(59),
+    [anon_sym_exec] = ACTIONS(61),
+    [anon_sym_type] = ACTIONS(63),
+    [anon_sym_class] = ACTIONS(99),
+    [anon_sym_AT] = ACTIONS(67),
+    [anon_sym_not] = ACTIONS(69),
+    [anon_sym_TILDE] = ACTIONS(47),
+    [anon_sym_lambda] = ACTIONS(71),
+    [anon_sym_yield] = ACTIONS(73),
+    [sym_ellipsis] = ACTIONS(75),
+    [sym_integer] = ACTIONS(77),
+    [sym_float] = ACTIONS(75),
+    [anon_sym_await] = ACTIONS(79),
+    [sym_true] = ACTIONS(77),
+    [sym_false] = ACTIONS(77),
+    [sym_none] = ACTIONS(77),
+    [sym_comment] = ACTIONS(3),
+    [sym__dedent] = ACTIONS(101),
+    [sym__string_start] = ACTIONS(81),
+  },
+  [17] = {
+    [sym__statement] = STATE(61),
+    [sym__simple_statements] = STATE(61),
+    [sym_import_statement] = STATE(1213),
+    [sym_future_import_statement] = STATE(1213),
+    [sym_import_from_statement] = STATE(1213),
+    [sym_print_statement] = STATE(1213),
+    [sym_assert_statement] = STATE(1213),
+    [sym_expression_statement] = STATE(1213),
+    [sym_named_expression] = STATE(985),
+    [sym_return_statement] = STATE(1213),
+    [sym_delete_statement] = STATE(1213),
+    [sym_raise_statement] = STATE(1213),
+    [sym_pass_statement] = STATE(1213),
+    [sym_break_statement] = STATE(1213),
+    [sym_continue_statement] = STATE(1213),
+    [sym_if_statement] = STATE(61),
+    [sym_for_statement] = STATE(61),
+    [sym_while_statement] = STATE(61),
+    [sym_try_statement] = STATE(61),
+    [sym_with_statement] = STATE(61),
+    [sym_match_statement] = STATE(61),
+    [sym_function_definition] = STATE(61),
+    [sym_list_splat] = STATE(1321),
+    [sym_dictionary_splat] = STATE(1321),
+    [sym_global_statement] = STATE(1213),
+    [sym_nonlocal_statement] = STATE(1213),
+    [sym_exec_statement] = STATE(1213),
+    [sym_type_alias_statement] = STATE(1213),
+    [sym_class_definition] = STATE(61),
+    [sym_decorated_definition] = STATE(61),
+    [sym_decorator] = STATE(947),
+    [sym_block] = STATE(546),
+    [sym_expression_list] = STATE(1313),
+    [sym_pattern] = STATE(871),
+    [sym_tuple_pattern] = STATE(860),
+    [sym_list_pattern] = STATE(860),
+    [sym_list_splat_pattern] = STATE(860),
+    [sym_expression] = STATE(995),
+    [sym_primary_expression] = STATE(707),
+    [sym_not_operator] = STATE(985),
+    [sym_boolean_operator] = STATE(985),
+    [sym_binary_operator] = STATE(759),
+    [sym_unary_operator] = STATE(759),
+    [sym_comparison_operator] = STATE(985),
+    [sym_lambda] = STATE(985),
+    [sym_assignment] = STATE(1313),
+    [sym_augmented_assignment] = STATE(1313),
+    [sym_pattern_list] = STATE(880),
+    [sym_yield] = STATE(1313),
+    [sym_attribute] = STATE(422),
+    [sym_subscript] = STATE(422),
+    [sym_call] = STATE(759),
+    [sym_list] = STATE(759),
+    [sym_set] = STATE(759),
+    [sym_tuple] = STATE(759),
+    [sym_dictionary] = STATE(759),
+    [sym_list_comprehension] = STATE(759),
+    [sym_dictionary_comprehension] = STATE(759),
+    [sym_set_comprehension] = STATE(759),
+    [sym_generator_expression] = STATE(759),
+    [sym_parenthesized_expression] = STATE(759),
+    [sym_conditional_expression] = STATE(985),
+    [sym_concatenated_string] = STATE(759),
+    [sym_string] = STATE(709),
+    [sym_await] = STATE(759),
+    [aux_sym_module_repeat1] = STATE(61),
+    [aux_sym_decorated_definition_repeat1] = STATE(947),
     [sym_identifier] = ACTIONS(7),
     [anon_sym_import] = ACTIONS(9),
     [anon_sym_from] = ACTIONS(11),
@@ -12102,304 +9712,74 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym__dedent] = ACTIONS(103),
     [sym__string_start] = ACTIONS(81),
   },
-  [16] = {
-    [sym__statement] = STATE(61),
-    [sym__simple_statements] = STATE(61),
-    [sym_import_statement] = STATE(1319),
-    [sym_future_import_statement] = STATE(1319),
-    [sym_import_from_statement] = STATE(1319),
-    [sym_print_statement] = STATE(1319),
-    [sym_assert_statement] = STATE(1319),
-    [sym_expression_statement] = STATE(1319),
-    [sym_named_expression] = STATE(1009),
-    [sym_return_statement] = STATE(1319),
-    [sym_delete_statement] = STATE(1319),
-    [sym_raise_statement] = STATE(1319),
-    [sym_pass_statement] = STATE(1319),
-    [sym_break_statement] = STATE(1319),
-    [sym_continue_statement] = STATE(1319),
-    [sym_if_statement] = STATE(61),
-    [sym_for_statement] = STATE(61),
-    [sym_while_statement] = STATE(61),
-    [sym_try_statement] = STATE(61),
-    [sym_with_statement] = STATE(61),
-    [sym_match_statement] = STATE(61),
-    [sym_function_definition] = STATE(61),
-    [sym_list_splat] = STATE(1360),
-    [sym_dictionary_splat] = STATE(1360),
-    [sym_global_statement] = STATE(1319),
-    [sym_nonlocal_statement] = STATE(1319),
-    [sym_exec_statement] = STATE(1319),
-    [sym_type_alias_statement] = STATE(1319),
-    [sym_class_definition] = STATE(61),
-    [sym_decorated_definition] = STATE(61),
-    [sym_decorator] = STATE(996),
-    [sym_block] = STATE(408),
-    [sym_expression_list] = STATE(1361),
-    [sym_pattern] = STATE(889),
-    [sym_tuple_pattern] = STATE(875),
-    [sym_list_pattern] = STATE(875),
-    [sym_list_splat_pattern] = STATE(875),
-    [sym_expression] = STATE(1019),
-    [sym_primary_expression] = STATE(684),
-    [sym_not_operator] = STATE(1009),
-    [sym_boolean_operator] = STATE(1009),
-    [sym_binary_operator] = STATE(797),
-    [sym_unary_operator] = STATE(797),
-    [sym_comparison_operator] = STATE(1009),
-    [sym_lambda] = STATE(1009),
-    [sym_assignment] = STATE(1361),
-    [sym_augmented_assignment] = STATE(1361),
-    [sym_pattern_list] = STATE(897),
-    [sym_yield] = STATE(1361),
-    [sym_attribute] = STATE(431),
-    [sym_subscript] = STATE(431),
-    [sym_call] = STATE(797),
-    [sym_list] = STATE(797),
-    [sym_set] = STATE(797),
-    [sym_tuple] = STATE(797),
-    [sym_dictionary] = STATE(797),
-    [sym_list_comprehension] = STATE(797),
-    [sym_dictionary_comprehension] = STATE(797),
-    [sym_set_comprehension] = STATE(797),
-    [sym_generator_expression] = STATE(797),
-    [sym_parenthesized_expression] = STATE(797),
-    [sym_conditional_expression] = STATE(1009),
-    [sym_concatenated_string] = STATE(797),
-    [sym_string] = STATE(713),
-    [sym_await] = STATE(1009),
-    [aux_sym_module_repeat1] = STATE(61),
-    [aux_sym_decorated_definition_repeat1] = STATE(996),
-    [sym_identifier] = ACTIONS(7),
-    [anon_sym_import] = ACTIONS(9),
-    [anon_sym_from] = ACTIONS(11),
-    [anon_sym_LPAREN] = ACTIONS(13),
-    [anon_sym_STAR] = ACTIONS(15),
-    [anon_sym_print] = ACTIONS(17),
-    [anon_sym_assert] = ACTIONS(19),
-    [anon_sym_return] = ACTIONS(21),
-    [anon_sym_del] = ACTIONS(23),
-    [anon_sym_raise] = ACTIONS(25),
-    [anon_sym_pass] = ACTIONS(27),
-    [anon_sym_break] = ACTIONS(29),
-    [anon_sym_continue] = ACTIONS(31),
-    [anon_sym_if] = ACTIONS(83),
-    [anon_sym_async] = ACTIONS(85),
-    [anon_sym_for] = ACTIONS(87),
-    [anon_sym_while] = ACTIONS(89),
-    [anon_sym_try] = ACTIONS(91),
-    [anon_sym_with] = ACTIONS(93),
-    [anon_sym_match] = ACTIONS(95),
-    [anon_sym_DASH] = ACTIONS(47),
-    [anon_sym_PLUS] = ACTIONS(47),
-    [anon_sym_LBRACK] = ACTIONS(49),
-    [anon_sym_LBRACE] = ACTIONS(51),
-    [anon_sym_STAR_STAR] = ACTIONS(53),
-    [anon_sym_def] = ACTIONS(97),
-    [anon_sym_global] = ACTIONS(57),
-    [anon_sym_nonlocal] = ACTIONS(59),
-    [anon_sym_exec] = ACTIONS(61),
-    [anon_sym_type] = ACTIONS(63),
-    [anon_sym_class] = ACTIONS(99),
-    [anon_sym_AT] = ACTIONS(67),
-    [anon_sym_not] = ACTIONS(69),
-    [anon_sym_TILDE] = ACTIONS(47),
-    [anon_sym_lambda] = ACTIONS(71),
-    [anon_sym_yield] = ACTIONS(73),
-    [sym_ellipsis] = ACTIONS(75),
-    [sym_integer] = ACTIONS(77),
-    [sym_float] = ACTIONS(75),
-    [anon_sym_await] = ACTIONS(79),
-    [sym_true] = ACTIONS(77),
-    [sym_false] = ACTIONS(77),
-    [sym_none] = ACTIONS(77),
-    [sym_comment] = ACTIONS(3),
-    [sym__dedent] = ACTIONS(107),
-    [sym__string_start] = ACTIONS(81),
-  },
-  [17] = {
-    [sym__statement] = STATE(61),
-    [sym__simple_statements] = STATE(61),
-    [sym_import_statement] = STATE(1319),
-    [sym_future_import_statement] = STATE(1319),
-    [sym_import_from_statement] = STATE(1319),
-    [sym_print_statement] = STATE(1319),
-    [sym_assert_statement] = STATE(1319),
-    [sym_expression_statement] = STATE(1319),
-    [sym_named_expression] = STATE(1009),
-    [sym_return_statement] = STATE(1319),
-    [sym_delete_statement] = STATE(1319),
-    [sym_raise_statement] = STATE(1319),
-    [sym_pass_statement] = STATE(1319),
-    [sym_break_statement] = STATE(1319),
-    [sym_continue_statement] = STATE(1319),
-    [sym_if_statement] = STATE(61),
-    [sym_for_statement] = STATE(61),
-    [sym_while_statement] = STATE(61),
-    [sym_try_statement] = STATE(61),
-    [sym_with_statement] = STATE(61),
-    [sym_match_statement] = STATE(61),
-    [sym_function_definition] = STATE(61),
-    [sym_list_splat] = STATE(1360),
-    [sym_dictionary_splat] = STATE(1360),
-    [sym_global_statement] = STATE(1319),
-    [sym_nonlocal_statement] = STATE(1319),
-    [sym_exec_statement] = STATE(1319),
-    [sym_type_alias_statement] = STATE(1319),
-    [sym_class_definition] = STATE(61),
-    [sym_decorated_definition] = STATE(61),
-    [sym_decorator] = STATE(996),
-    [sym_block] = STATE(536),
-    [sym_expression_list] = STATE(1361),
-    [sym_pattern] = STATE(889),
-    [sym_tuple_pattern] = STATE(875),
-    [sym_list_pattern] = STATE(875),
-    [sym_list_splat_pattern] = STATE(875),
-    [sym_expression] = STATE(1019),
-    [sym_primary_expression] = STATE(684),
-    [sym_not_operator] = STATE(1009),
-    [sym_boolean_operator] = STATE(1009),
-    [sym_binary_operator] = STATE(797),
-    [sym_unary_operator] = STATE(797),
-    [sym_comparison_operator] = STATE(1009),
-    [sym_lambda] = STATE(1009),
-    [sym_assignment] = STATE(1361),
-    [sym_augmented_assignment] = STATE(1361),
-    [sym_pattern_list] = STATE(897),
-    [sym_yield] = STATE(1361),
-    [sym_attribute] = STATE(431),
-    [sym_subscript] = STATE(431),
-    [sym_call] = STATE(797),
-    [sym_list] = STATE(797),
-    [sym_set] = STATE(797),
-    [sym_tuple] = STATE(797),
-    [sym_dictionary] = STATE(797),
-    [sym_list_comprehension] = STATE(797),
-    [sym_dictionary_comprehension] = STATE(797),
-    [sym_set_comprehension] = STATE(797),
-    [sym_generator_expression] = STATE(797),
-    [sym_parenthesized_expression] = STATE(797),
-    [sym_conditional_expression] = STATE(1009),
-    [sym_concatenated_string] = STATE(797),
-    [sym_string] = STATE(713),
-    [sym_await] = STATE(1009),
-    [aux_sym_module_repeat1] = STATE(61),
-    [aux_sym_decorated_definition_repeat1] = STATE(996),
-    [sym_identifier] = ACTIONS(7),
-    [anon_sym_import] = ACTIONS(9),
-    [anon_sym_from] = ACTIONS(11),
-    [anon_sym_LPAREN] = ACTIONS(13),
-    [anon_sym_STAR] = ACTIONS(15),
-    [anon_sym_print] = ACTIONS(17),
-    [anon_sym_assert] = ACTIONS(19),
-    [anon_sym_return] = ACTIONS(21),
-    [anon_sym_del] = ACTIONS(23),
-    [anon_sym_raise] = ACTIONS(25),
-    [anon_sym_pass] = ACTIONS(27),
-    [anon_sym_break] = ACTIONS(29),
-    [anon_sym_continue] = ACTIONS(31),
-    [anon_sym_if] = ACTIONS(83),
-    [anon_sym_async] = ACTIONS(85),
-    [anon_sym_for] = ACTIONS(87),
-    [anon_sym_while] = ACTIONS(89),
-    [anon_sym_try] = ACTIONS(91),
-    [anon_sym_with] = ACTIONS(93),
-    [anon_sym_match] = ACTIONS(95),
-    [anon_sym_DASH] = ACTIONS(47),
-    [anon_sym_PLUS] = ACTIONS(47),
-    [anon_sym_LBRACK] = ACTIONS(49),
-    [anon_sym_LBRACE] = ACTIONS(51),
-    [anon_sym_STAR_STAR] = ACTIONS(53),
-    [anon_sym_def] = ACTIONS(97),
-    [anon_sym_global] = ACTIONS(57),
-    [anon_sym_nonlocal] = ACTIONS(59),
-    [anon_sym_exec] = ACTIONS(61),
-    [anon_sym_type] = ACTIONS(63),
-    [anon_sym_class] = ACTIONS(99),
-    [anon_sym_AT] = ACTIONS(67),
-    [anon_sym_not] = ACTIONS(69),
-    [anon_sym_TILDE] = ACTIONS(47),
-    [anon_sym_lambda] = ACTIONS(71),
-    [anon_sym_yield] = ACTIONS(73),
-    [sym_ellipsis] = ACTIONS(75),
-    [sym_integer] = ACTIONS(77),
-    [sym_float] = ACTIONS(75),
-    [anon_sym_await] = ACTIONS(79),
-    [sym_true] = ACTIONS(77),
-    [sym_false] = ACTIONS(77),
-    [sym_none] = ACTIONS(77),
-    [sym_comment] = ACTIONS(3),
-    [sym__dedent] = ACTIONS(107),
-    [sym__string_start] = ACTIONS(81),
-  },
   [18] = {
-    [sym__statement] = STATE(61),
-    [sym__simple_statements] = STATE(61),
-    [sym_import_statement] = STATE(1319),
-    [sym_future_import_statement] = STATE(1319),
-    [sym_import_from_statement] = STATE(1319),
-    [sym_print_statement] = STATE(1319),
-    [sym_assert_statement] = STATE(1319),
-    [sym_expression_statement] = STATE(1319),
-    [sym_named_expression] = STATE(1009),
-    [sym_return_statement] = STATE(1319),
-    [sym_delete_statement] = STATE(1319),
-    [sym_raise_statement] = STATE(1319),
-    [sym_pass_statement] = STATE(1319),
-    [sym_break_statement] = STATE(1319),
-    [sym_continue_statement] = STATE(1319),
-    [sym_if_statement] = STATE(61),
-    [sym_for_statement] = STATE(61),
-    [sym_while_statement] = STATE(61),
-    [sym_try_statement] = STATE(61),
-    [sym_with_statement] = STATE(61),
-    [sym_match_statement] = STATE(61),
-    [sym_function_definition] = STATE(61),
-    [sym_list_splat] = STATE(1360),
-    [sym_dictionary_splat] = STATE(1360),
-    [sym_global_statement] = STATE(1319),
-    [sym_nonlocal_statement] = STATE(1319),
-    [sym_exec_statement] = STATE(1319),
-    [sym_type_alias_statement] = STATE(1319),
-    [sym_class_definition] = STATE(61),
-    [sym_decorated_definition] = STATE(61),
-    [sym_decorator] = STATE(996),
-    [sym_block] = STATE(488),
-    [sym_expression_list] = STATE(1361),
-    [sym_pattern] = STATE(889),
-    [sym_tuple_pattern] = STATE(875),
-    [sym_list_pattern] = STATE(875),
-    [sym_list_splat_pattern] = STATE(875),
-    [sym_expression] = STATE(1019),
-    [sym_primary_expression] = STATE(684),
-    [sym_not_operator] = STATE(1009),
-    [sym_boolean_operator] = STATE(1009),
-    [sym_binary_operator] = STATE(797),
-    [sym_unary_operator] = STATE(797),
-    [sym_comparison_operator] = STATE(1009),
-    [sym_lambda] = STATE(1009),
-    [sym_assignment] = STATE(1361),
-    [sym_augmented_assignment] = STATE(1361),
-    [sym_pattern_list] = STATE(897),
-    [sym_yield] = STATE(1361),
-    [sym_attribute] = STATE(431),
-    [sym_subscript] = STATE(431),
-    [sym_call] = STATE(797),
-    [sym_list] = STATE(797),
-    [sym_set] = STATE(797),
-    [sym_tuple] = STATE(797),
-    [sym_dictionary] = STATE(797),
-    [sym_list_comprehension] = STATE(797),
-    [sym_dictionary_comprehension] = STATE(797),
-    [sym_set_comprehension] = STATE(797),
-    [sym_generator_expression] = STATE(797),
-    [sym_parenthesized_expression] = STATE(797),
-    [sym_conditional_expression] = STATE(1009),
-    [sym_concatenated_string] = STATE(797),
-    [sym_string] = STATE(713),
-    [sym_await] = STATE(1009),
-    [aux_sym_module_repeat1] = STATE(61),
-    [aux_sym_decorated_definition_repeat1] = STATE(996),
+    [sym__statement] = STATE(60),
+    [sym__simple_statements] = STATE(60),
+    [sym_import_statement] = STATE(1213),
+    [sym_future_import_statement] = STATE(1213),
+    [sym_import_from_statement] = STATE(1213),
+    [sym_print_statement] = STATE(1213),
+    [sym_assert_statement] = STATE(1213),
+    [sym_expression_statement] = STATE(1213),
+    [sym_named_expression] = STATE(985),
+    [sym_return_statement] = STATE(1213),
+    [sym_delete_statement] = STATE(1213),
+    [sym_raise_statement] = STATE(1213),
+    [sym_pass_statement] = STATE(1213),
+    [sym_break_statement] = STATE(1213),
+    [sym_continue_statement] = STATE(1213),
+    [sym_if_statement] = STATE(60),
+    [sym_for_statement] = STATE(60),
+    [sym_while_statement] = STATE(60),
+    [sym_try_statement] = STATE(60),
+    [sym_with_statement] = STATE(60),
+    [sym_match_statement] = STATE(60),
+    [sym_function_definition] = STATE(60),
+    [sym_list_splat] = STATE(1321),
+    [sym_dictionary_splat] = STATE(1321),
+    [sym_global_statement] = STATE(1213),
+    [sym_nonlocal_statement] = STATE(1213),
+    [sym_exec_statement] = STATE(1213),
+    [sym_type_alias_statement] = STATE(1213),
+    [sym_class_definition] = STATE(60),
+    [sym_decorated_definition] = STATE(60),
+    [sym_decorator] = STATE(947),
+    [sym_block] = STATE(493),
+    [sym_expression_list] = STATE(1313),
+    [sym_pattern] = STATE(871),
+    [sym_tuple_pattern] = STATE(860),
+    [sym_list_pattern] = STATE(860),
+    [sym_list_splat_pattern] = STATE(860),
+    [sym_expression] = STATE(995),
+    [sym_primary_expression] = STATE(707),
+    [sym_not_operator] = STATE(985),
+    [sym_boolean_operator] = STATE(985),
+    [sym_binary_operator] = STATE(759),
+    [sym_unary_operator] = STATE(759),
+    [sym_comparison_operator] = STATE(985),
+    [sym_lambda] = STATE(985),
+    [sym_assignment] = STATE(1313),
+    [sym_augmented_assignment] = STATE(1313),
+    [sym_pattern_list] = STATE(880),
+    [sym_yield] = STATE(1313),
+    [sym_attribute] = STATE(422),
+    [sym_subscript] = STATE(422),
+    [sym_call] = STATE(759),
+    [sym_list] = STATE(759),
+    [sym_set] = STATE(759),
+    [sym_tuple] = STATE(759),
+    [sym_dictionary] = STATE(759),
+    [sym_list_comprehension] = STATE(759),
+    [sym_dictionary_comprehension] = STATE(759),
+    [sym_set_comprehension] = STATE(759),
+    [sym_generator_expression] = STATE(759),
+    [sym_parenthesized_expression] = STATE(759),
+    [sym_conditional_expression] = STATE(985),
+    [sym_concatenated_string] = STATE(759),
+    [sym_string] = STATE(709),
+    [sym_await] = STATE(759),
+    [aux_sym_module_repeat1] = STATE(60),
+    [aux_sym_decorated_definition_repeat1] = STATE(947),
     [sym_identifier] = ACTIONS(7),
     [anon_sym_import] = ACTIONS(9),
     [anon_sym_from] = ACTIONS(11),
@@ -12444,25 +9824,25 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_false] = ACTIONS(77),
     [sym_none] = ACTIONS(77),
     [sym_comment] = ACTIONS(3),
-    [sym__dedent] = ACTIONS(107),
+    [sym__dedent] = ACTIONS(101),
     [sym__string_start] = ACTIONS(81),
   },
   [19] = {
     [sym__statement] = STATE(61),
     [sym__simple_statements] = STATE(61),
-    [sym_import_statement] = STATE(1319),
-    [sym_future_import_statement] = STATE(1319),
-    [sym_import_from_statement] = STATE(1319),
-    [sym_print_statement] = STATE(1319),
-    [sym_assert_statement] = STATE(1319),
-    [sym_expression_statement] = STATE(1319),
-    [sym_named_expression] = STATE(1009),
-    [sym_return_statement] = STATE(1319),
-    [sym_delete_statement] = STATE(1319),
-    [sym_raise_statement] = STATE(1319),
-    [sym_pass_statement] = STATE(1319),
-    [sym_break_statement] = STATE(1319),
-    [sym_continue_statement] = STATE(1319),
+    [sym_import_statement] = STATE(1213),
+    [sym_future_import_statement] = STATE(1213),
+    [sym_import_from_statement] = STATE(1213),
+    [sym_print_statement] = STATE(1213),
+    [sym_assert_statement] = STATE(1213),
+    [sym_expression_statement] = STATE(1213),
+    [sym_named_expression] = STATE(985),
+    [sym_return_statement] = STATE(1213),
+    [sym_delete_statement] = STATE(1213),
+    [sym_raise_statement] = STATE(1213),
+    [sym_pass_statement] = STATE(1213),
+    [sym_break_statement] = STATE(1213),
+    [sym_continue_statement] = STATE(1213),
     [sym_if_statement] = STATE(61),
     [sym_for_statement] = STATE(61),
     [sym_while_statement] = STATE(61),
@@ -12470,51 +9850,51 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_with_statement] = STATE(61),
     [sym_match_statement] = STATE(61),
     [sym_function_definition] = STATE(61),
-    [sym_list_splat] = STATE(1360),
-    [sym_dictionary_splat] = STATE(1360),
-    [sym_global_statement] = STATE(1319),
-    [sym_nonlocal_statement] = STATE(1319),
-    [sym_exec_statement] = STATE(1319),
-    [sym_type_alias_statement] = STATE(1319),
+    [sym_list_splat] = STATE(1321),
+    [sym_dictionary_splat] = STATE(1321),
+    [sym_global_statement] = STATE(1213),
+    [sym_nonlocal_statement] = STATE(1213),
+    [sym_exec_statement] = STATE(1213),
+    [sym_type_alias_statement] = STATE(1213),
     [sym_class_definition] = STATE(61),
     [sym_decorated_definition] = STATE(61),
-    [sym_decorator] = STATE(996),
-    [sym_block] = STATE(556),
-    [sym_expression_list] = STATE(1361),
-    [sym_pattern] = STATE(889),
-    [sym_tuple_pattern] = STATE(875),
-    [sym_list_pattern] = STATE(875),
-    [sym_list_splat_pattern] = STATE(875),
-    [sym_expression] = STATE(1019),
-    [sym_primary_expression] = STATE(684),
-    [sym_not_operator] = STATE(1009),
-    [sym_boolean_operator] = STATE(1009),
-    [sym_binary_operator] = STATE(797),
-    [sym_unary_operator] = STATE(797),
-    [sym_comparison_operator] = STATE(1009),
-    [sym_lambda] = STATE(1009),
-    [sym_assignment] = STATE(1361),
-    [sym_augmented_assignment] = STATE(1361),
-    [sym_pattern_list] = STATE(897),
-    [sym_yield] = STATE(1361),
-    [sym_attribute] = STATE(431),
-    [sym_subscript] = STATE(431),
-    [sym_call] = STATE(797),
-    [sym_list] = STATE(797),
-    [sym_set] = STATE(797),
-    [sym_tuple] = STATE(797),
-    [sym_dictionary] = STATE(797),
-    [sym_list_comprehension] = STATE(797),
-    [sym_dictionary_comprehension] = STATE(797),
-    [sym_set_comprehension] = STATE(797),
-    [sym_generator_expression] = STATE(797),
-    [sym_parenthesized_expression] = STATE(797),
-    [sym_conditional_expression] = STATE(1009),
-    [sym_concatenated_string] = STATE(797),
-    [sym_string] = STATE(713),
-    [sym_await] = STATE(1009),
+    [sym_decorator] = STATE(947),
+    [sym_block] = STATE(346),
+    [sym_expression_list] = STATE(1313),
+    [sym_pattern] = STATE(871),
+    [sym_tuple_pattern] = STATE(860),
+    [sym_list_pattern] = STATE(860),
+    [sym_list_splat_pattern] = STATE(860),
+    [sym_expression] = STATE(995),
+    [sym_primary_expression] = STATE(707),
+    [sym_not_operator] = STATE(985),
+    [sym_boolean_operator] = STATE(985),
+    [sym_binary_operator] = STATE(759),
+    [sym_unary_operator] = STATE(759),
+    [sym_comparison_operator] = STATE(985),
+    [sym_lambda] = STATE(985),
+    [sym_assignment] = STATE(1313),
+    [sym_augmented_assignment] = STATE(1313),
+    [sym_pattern_list] = STATE(880),
+    [sym_yield] = STATE(1313),
+    [sym_attribute] = STATE(422),
+    [sym_subscript] = STATE(422),
+    [sym_call] = STATE(759),
+    [sym_list] = STATE(759),
+    [sym_set] = STATE(759),
+    [sym_tuple] = STATE(759),
+    [sym_dictionary] = STATE(759),
+    [sym_list_comprehension] = STATE(759),
+    [sym_dictionary_comprehension] = STATE(759),
+    [sym_set_comprehension] = STATE(759),
+    [sym_generator_expression] = STATE(759),
+    [sym_parenthesized_expression] = STATE(759),
+    [sym_conditional_expression] = STATE(985),
+    [sym_concatenated_string] = STATE(759),
+    [sym_string] = STATE(709),
+    [sym_await] = STATE(759),
     [aux_sym_module_repeat1] = STATE(61),
-    [aux_sym_decorated_definition_repeat1] = STATE(996),
+    [aux_sym_decorated_definition_repeat1] = STATE(947),
     [sym_identifier] = ACTIONS(7),
     [anon_sym_import] = ACTIONS(9),
     [anon_sym_from] = ACTIONS(11),
@@ -12559,77 +9939,77 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_false] = ACTIONS(77),
     [sym_none] = ACTIONS(77),
     [sym_comment] = ACTIONS(3),
-    [sym__dedent] = ACTIONS(107),
+    [sym__dedent] = ACTIONS(103),
     [sym__string_start] = ACTIONS(81),
   },
   [20] = {
-    [sym__statement] = STATE(61),
-    [sym__simple_statements] = STATE(61),
-    [sym_import_statement] = STATE(1319),
-    [sym_future_import_statement] = STATE(1319),
-    [sym_import_from_statement] = STATE(1319),
-    [sym_print_statement] = STATE(1319),
-    [sym_assert_statement] = STATE(1319),
-    [sym_expression_statement] = STATE(1319),
-    [sym_named_expression] = STATE(1009),
-    [sym_return_statement] = STATE(1319),
-    [sym_delete_statement] = STATE(1319),
-    [sym_raise_statement] = STATE(1319),
-    [sym_pass_statement] = STATE(1319),
-    [sym_break_statement] = STATE(1319),
-    [sym_continue_statement] = STATE(1319),
-    [sym_if_statement] = STATE(61),
-    [sym_for_statement] = STATE(61),
-    [sym_while_statement] = STATE(61),
-    [sym_try_statement] = STATE(61),
-    [sym_with_statement] = STATE(61),
-    [sym_match_statement] = STATE(61),
-    [sym_function_definition] = STATE(61),
-    [sym_list_splat] = STATE(1360),
-    [sym_dictionary_splat] = STATE(1360),
-    [sym_global_statement] = STATE(1319),
-    [sym_nonlocal_statement] = STATE(1319),
-    [sym_exec_statement] = STATE(1319),
-    [sym_type_alias_statement] = STATE(1319),
-    [sym_class_definition] = STATE(61),
-    [sym_decorated_definition] = STATE(61),
-    [sym_decorator] = STATE(996),
-    [sym_block] = STATE(528),
-    [sym_expression_list] = STATE(1361),
-    [sym_pattern] = STATE(889),
-    [sym_tuple_pattern] = STATE(875),
-    [sym_list_pattern] = STATE(875),
-    [sym_list_splat_pattern] = STATE(875),
-    [sym_expression] = STATE(1019),
-    [sym_primary_expression] = STATE(684),
-    [sym_not_operator] = STATE(1009),
-    [sym_boolean_operator] = STATE(1009),
-    [sym_binary_operator] = STATE(797),
-    [sym_unary_operator] = STATE(797),
-    [sym_comparison_operator] = STATE(1009),
-    [sym_lambda] = STATE(1009),
-    [sym_assignment] = STATE(1361),
-    [sym_augmented_assignment] = STATE(1361),
-    [sym_pattern_list] = STATE(897),
-    [sym_yield] = STATE(1361),
-    [sym_attribute] = STATE(431),
-    [sym_subscript] = STATE(431),
-    [sym_call] = STATE(797),
-    [sym_list] = STATE(797),
-    [sym_set] = STATE(797),
-    [sym_tuple] = STATE(797),
-    [sym_dictionary] = STATE(797),
-    [sym_list_comprehension] = STATE(797),
-    [sym_dictionary_comprehension] = STATE(797),
-    [sym_set_comprehension] = STATE(797),
-    [sym_generator_expression] = STATE(797),
-    [sym_parenthesized_expression] = STATE(797),
-    [sym_conditional_expression] = STATE(1009),
-    [sym_concatenated_string] = STATE(797),
-    [sym_string] = STATE(713),
-    [sym_await] = STATE(1009),
-    [aux_sym_module_repeat1] = STATE(61),
-    [aux_sym_decorated_definition_repeat1] = STATE(996),
+    [sym__statement] = STATE(60),
+    [sym__simple_statements] = STATE(60),
+    [sym_import_statement] = STATE(1213),
+    [sym_future_import_statement] = STATE(1213),
+    [sym_import_from_statement] = STATE(1213),
+    [sym_print_statement] = STATE(1213),
+    [sym_assert_statement] = STATE(1213),
+    [sym_expression_statement] = STATE(1213),
+    [sym_named_expression] = STATE(985),
+    [sym_return_statement] = STATE(1213),
+    [sym_delete_statement] = STATE(1213),
+    [sym_raise_statement] = STATE(1213),
+    [sym_pass_statement] = STATE(1213),
+    [sym_break_statement] = STATE(1213),
+    [sym_continue_statement] = STATE(1213),
+    [sym_if_statement] = STATE(60),
+    [sym_for_statement] = STATE(60),
+    [sym_while_statement] = STATE(60),
+    [sym_try_statement] = STATE(60),
+    [sym_with_statement] = STATE(60),
+    [sym_match_statement] = STATE(60),
+    [sym_function_definition] = STATE(60),
+    [sym_list_splat] = STATE(1321),
+    [sym_dictionary_splat] = STATE(1321),
+    [sym_global_statement] = STATE(1213),
+    [sym_nonlocal_statement] = STATE(1213),
+    [sym_exec_statement] = STATE(1213),
+    [sym_type_alias_statement] = STATE(1213),
+    [sym_class_definition] = STATE(60),
+    [sym_decorated_definition] = STATE(60),
+    [sym_decorator] = STATE(947),
+    [sym_block] = STATE(571),
+    [sym_expression_list] = STATE(1313),
+    [sym_pattern] = STATE(871),
+    [sym_tuple_pattern] = STATE(860),
+    [sym_list_pattern] = STATE(860),
+    [sym_list_splat_pattern] = STATE(860),
+    [sym_expression] = STATE(995),
+    [sym_primary_expression] = STATE(707),
+    [sym_not_operator] = STATE(985),
+    [sym_boolean_operator] = STATE(985),
+    [sym_binary_operator] = STATE(759),
+    [sym_unary_operator] = STATE(759),
+    [sym_comparison_operator] = STATE(985),
+    [sym_lambda] = STATE(985),
+    [sym_assignment] = STATE(1313),
+    [sym_augmented_assignment] = STATE(1313),
+    [sym_pattern_list] = STATE(880),
+    [sym_yield] = STATE(1313),
+    [sym_attribute] = STATE(422),
+    [sym_subscript] = STATE(422),
+    [sym_call] = STATE(759),
+    [sym_list] = STATE(759),
+    [sym_set] = STATE(759),
+    [sym_tuple] = STATE(759),
+    [sym_dictionary] = STATE(759),
+    [sym_list_comprehension] = STATE(759),
+    [sym_dictionary_comprehension] = STATE(759),
+    [sym_set_comprehension] = STATE(759),
+    [sym_generator_expression] = STATE(759),
+    [sym_parenthesized_expression] = STATE(759),
+    [sym_conditional_expression] = STATE(985),
+    [sym_concatenated_string] = STATE(759),
+    [sym_string] = STATE(709),
+    [sym_await] = STATE(759),
+    [aux_sym_module_repeat1] = STATE(60),
+    [aux_sym_decorated_definition_repeat1] = STATE(947),
     [sym_identifier] = ACTIONS(7),
     [anon_sym_import] = ACTIONS(9),
     [anon_sym_from] = ACTIONS(11),
@@ -12674,77 +10054,77 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_false] = ACTIONS(77),
     [sym_none] = ACTIONS(77),
     [sym_comment] = ACTIONS(3),
-    [sym__dedent] = ACTIONS(107),
+    [sym__dedent] = ACTIONS(101),
     [sym__string_start] = ACTIONS(81),
   },
   [21] = {
-    [sym__statement] = STATE(68),
-    [sym__simple_statements] = STATE(68),
-    [sym_import_statement] = STATE(1319),
-    [sym_future_import_statement] = STATE(1319),
-    [sym_import_from_statement] = STATE(1319),
-    [sym_print_statement] = STATE(1319),
-    [sym_assert_statement] = STATE(1319),
-    [sym_expression_statement] = STATE(1319),
-    [sym_named_expression] = STATE(1009),
-    [sym_return_statement] = STATE(1319),
-    [sym_delete_statement] = STATE(1319),
-    [sym_raise_statement] = STATE(1319),
-    [sym_pass_statement] = STATE(1319),
-    [sym_break_statement] = STATE(1319),
-    [sym_continue_statement] = STATE(1319),
-    [sym_if_statement] = STATE(68),
-    [sym_for_statement] = STATE(68),
-    [sym_while_statement] = STATE(68),
-    [sym_try_statement] = STATE(68),
-    [sym_with_statement] = STATE(68),
-    [sym_match_statement] = STATE(68),
-    [sym_function_definition] = STATE(68),
-    [sym_list_splat] = STATE(1360),
-    [sym_dictionary_splat] = STATE(1360),
-    [sym_global_statement] = STATE(1319),
-    [sym_nonlocal_statement] = STATE(1319),
-    [sym_exec_statement] = STATE(1319),
-    [sym_type_alias_statement] = STATE(1319),
-    [sym_class_definition] = STATE(68),
-    [sym_decorated_definition] = STATE(68),
-    [sym_decorator] = STATE(996),
-    [sym_block] = STATE(414),
-    [sym_expression_list] = STATE(1361),
-    [sym_pattern] = STATE(889),
-    [sym_tuple_pattern] = STATE(875),
-    [sym_list_pattern] = STATE(875),
-    [sym_list_splat_pattern] = STATE(875),
-    [sym_expression] = STATE(1019),
-    [sym_primary_expression] = STATE(684),
-    [sym_not_operator] = STATE(1009),
-    [sym_boolean_operator] = STATE(1009),
-    [sym_binary_operator] = STATE(797),
-    [sym_unary_operator] = STATE(797),
-    [sym_comparison_operator] = STATE(1009),
-    [sym_lambda] = STATE(1009),
-    [sym_assignment] = STATE(1361),
-    [sym_augmented_assignment] = STATE(1361),
-    [sym_pattern_list] = STATE(897),
-    [sym_yield] = STATE(1361),
-    [sym_attribute] = STATE(431),
-    [sym_subscript] = STATE(431),
-    [sym_call] = STATE(797),
-    [sym_list] = STATE(797),
-    [sym_set] = STATE(797),
-    [sym_tuple] = STATE(797),
-    [sym_dictionary] = STATE(797),
-    [sym_list_comprehension] = STATE(797),
-    [sym_dictionary_comprehension] = STATE(797),
-    [sym_set_comprehension] = STATE(797),
-    [sym_generator_expression] = STATE(797),
-    [sym_parenthesized_expression] = STATE(797),
-    [sym_conditional_expression] = STATE(1009),
-    [sym_concatenated_string] = STATE(797),
-    [sym_string] = STATE(713),
-    [sym_await] = STATE(1009),
-    [aux_sym_module_repeat1] = STATE(68),
-    [aux_sym_decorated_definition_repeat1] = STATE(996),
+    [sym__statement] = STATE(61),
+    [sym__simple_statements] = STATE(61),
+    [sym_import_statement] = STATE(1213),
+    [sym_future_import_statement] = STATE(1213),
+    [sym_import_from_statement] = STATE(1213),
+    [sym_print_statement] = STATE(1213),
+    [sym_assert_statement] = STATE(1213),
+    [sym_expression_statement] = STATE(1213),
+    [sym_named_expression] = STATE(985),
+    [sym_return_statement] = STATE(1213),
+    [sym_delete_statement] = STATE(1213),
+    [sym_raise_statement] = STATE(1213),
+    [sym_pass_statement] = STATE(1213),
+    [sym_break_statement] = STATE(1213),
+    [sym_continue_statement] = STATE(1213),
+    [sym_if_statement] = STATE(61),
+    [sym_for_statement] = STATE(61),
+    [sym_while_statement] = STATE(61),
+    [sym_try_statement] = STATE(61),
+    [sym_with_statement] = STATE(61),
+    [sym_match_statement] = STATE(61),
+    [sym_function_definition] = STATE(61),
+    [sym_list_splat] = STATE(1321),
+    [sym_dictionary_splat] = STATE(1321),
+    [sym_global_statement] = STATE(1213),
+    [sym_nonlocal_statement] = STATE(1213),
+    [sym_exec_statement] = STATE(1213),
+    [sym_type_alias_statement] = STATE(1213),
+    [sym_class_definition] = STATE(61),
+    [sym_decorated_definition] = STATE(61),
+    [sym_decorator] = STATE(947),
+    [sym_block] = STATE(568),
+    [sym_expression_list] = STATE(1313),
+    [sym_pattern] = STATE(871),
+    [sym_tuple_pattern] = STATE(860),
+    [sym_list_pattern] = STATE(860),
+    [sym_list_splat_pattern] = STATE(860),
+    [sym_expression] = STATE(995),
+    [sym_primary_expression] = STATE(707),
+    [sym_not_operator] = STATE(985),
+    [sym_boolean_operator] = STATE(985),
+    [sym_binary_operator] = STATE(759),
+    [sym_unary_operator] = STATE(759),
+    [sym_comparison_operator] = STATE(985),
+    [sym_lambda] = STATE(985),
+    [sym_assignment] = STATE(1313),
+    [sym_augmented_assignment] = STATE(1313),
+    [sym_pattern_list] = STATE(880),
+    [sym_yield] = STATE(1313),
+    [sym_attribute] = STATE(422),
+    [sym_subscript] = STATE(422),
+    [sym_call] = STATE(759),
+    [sym_list] = STATE(759),
+    [sym_set] = STATE(759),
+    [sym_tuple] = STATE(759),
+    [sym_dictionary] = STATE(759),
+    [sym_list_comprehension] = STATE(759),
+    [sym_dictionary_comprehension] = STATE(759),
+    [sym_set_comprehension] = STATE(759),
+    [sym_generator_expression] = STATE(759),
+    [sym_parenthesized_expression] = STATE(759),
+    [sym_conditional_expression] = STATE(985),
+    [sym_concatenated_string] = STATE(759),
+    [sym_string] = STATE(709),
+    [sym_await] = STATE(759),
+    [aux_sym_module_repeat1] = STATE(61),
+    [aux_sym_decorated_definition_repeat1] = STATE(947),
     [sym_identifier] = ACTIONS(7),
     [anon_sym_import] = ACTIONS(9),
     [anon_sym_from] = ACTIONS(11),
@@ -12793,73 +10173,303 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym__string_start] = ACTIONS(81),
   },
   [22] = {
-    [sym__statement] = STATE(65),
-    [sym__simple_statements] = STATE(65),
-    [sym_import_statement] = STATE(1319),
-    [sym_future_import_statement] = STATE(1319),
-    [sym_import_from_statement] = STATE(1319),
-    [sym_print_statement] = STATE(1319),
-    [sym_assert_statement] = STATE(1319),
-    [sym_expression_statement] = STATE(1319),
-    [sym_named_expression] = STATE(1009),
-    [sym_return_statement] = STATE(1319),
-    [sym_delete_statement] = STATE(1319),
-    [sym_raise_statement] = STATE(1319),
-    [sym_pass_statement] = STATE(1319),
-    [sym_break_statement] = STATE(1319),
-    [sym_continue_statement] = STATE(1319),
-    [sym_if_statement] = STATE(65),
-    [sym_for_statement] = STATE(65),
-    [sym_while_statement] = STATE(65),
-    [sym_try_statement] = STATE(65),
-    [sym_with_statement] = STATE(65),
-    [sym_match_statement] = STATE(65),
-    [sym_function_definition] = STATE(65),
-    [sym_list_splat] = STATE(1360),
-    [sym_dictionary_splat] = STATE(1360),
-    [sym_global_statement] = STATE(1319),
-    [sym_nonlocal_statement] = STATE(1319),
-    [sym_exec_statement] = STATE(1319),
-    [sym_type_alias_statement] = STATE(1319),
-    [sym_class_definition] = STATE(65),
-    [sym_decorated_definition] = STATE(65),
-    [sym_decorator] = STATE(996),
-    [sym_block] = STATE(366),
-    [sym_expression_list] = STATE(1361),
-    [sym_pattern] = STATE(889),
-    [sym_tuple_pattern] = STATE(875),
-    [sym_list_pattern] = STATE(875),
-    [sym_list_splat_pattern] = STATE(875),
-    [sym_expression] = STATE(1019),
-    [sym_primary_expression] = STATE(684),
-    [sym_not_operator] = STATE(1009),
-    [sym_boolean_operator] = STATE(1009),
-    [sym_binary_operator] = STATE(797),
-    [sym_unary_operator] = STATE(797),
-    [sym_comparison_operator] = STATE(1009),
-    [sym_lambda] = STATE(1009),
-    [sym_assignment] = STATE(1361),
-    [sym_augmented_assignment] = STATE(1361),
-    [sym_pattern_list] = STATE(897),
-    [sym_yield] = STATE(1361),
-    [sym_attribute] = STATE(431),
-    [sym_subscript] = STATE(431),
-    [sym_call] = STATE(797),
-    [sym_list] = STATE(797),
-    [sym_set] = STATE(797),
-    [sym_tuple] = STATE(797),
-    [sym_dictionary] = STATE(797),
-    [sym_list_comprehension] = STATE(797),
-    [sym_dictionary_comprehension] = STATE(797),
-    [sym_set_comprehension] = STATE(797),
-    [sym_generator_expression] = STATE(797),
-    [sym_parenthesized_expression] = STATE(797),
-    [sym_conditional_expression] = STATE(1009),
-    [sym_concatenated_string] = STATE(797),
-    [sym_string] = STATE(713),
-    [sym_await] = STATE(1009),
-    [aux_sym_module_repeat1] = STATE(65),
-    [aux_sym_decorated_definition_repeat1] = STATE(996),
+    [sym__statement] = STATE(61),
+    [sym__simple_statements] = STATE(61),
+    [sym_import_statement] = STATE(1213),
+    [sym_future_import_statement] = STATE(1213),
+    [sym_import_from_statement] = STATE(1213),
+    [sym_print_statement] = STATE(1213),
+    [sym_assert_statement] = STATE(1213),
+    [sym_expression_statement] = STATE(1213),
+    [sym_named_expression] = STATE(985),
+    [sym_return_statement] = STATE(1213),
+    [sym_delete_statement] = STATE(1213),
+    [sym_raise_statement] = STATE(1213),
+    [sym_pass_statement] = STATE(1213),
+    [sym_break_statement] = STATE(1213),
+    [sym_continue_statement] = STATE(1213),
+    [sym_if_statement] = STATE(61),
+    [sym_for_statement] = STATE(61),
+    [sym_while_statement] = STATE(61),
+    [sym_try_statement] = STATE(61),
+    [sym_with_statement] = STATE(61),
+    [sym_match_statement] = STATE(61),
+    [sym_function_definition] = STATE(61),
+    [sym_list_splat] = STATE(1321),
+    [sym_dictionary_splat] = STATE(1321),
+    [sym_global_statement] = STATE(1213),
+    [sym_nonlocal_statement] = STATE(1213),
+    [sym_exec_statement] = STATE(1213),
+    [sym_type_alias_statement] = STATE(1213),
+    [sym_class_definition] = STATE(61),
+    [sym_decorated_definition] = STATE(61),
+    [sym_decorator] = STATE(947),
+    [sym_block] = STATE(395),
+    [sym_expression_list] = STATE(1313),
+    [sym_pattern] = STATE(871),
+    [sym_tuple_pattern] = STATE(860),
+    [sym_list_pattern] = STATE(860),
+    [sym_list_splat_pattern] = STATE(860),
+    [sym_expression] = STATE(995),
+    [sym_primary_expression] = STATE(707),
+    [sym_not_operator] = STATE(985),
+    [sym_boolean_operator] = STATE(985),
+    [sym_binary_operator] = STATE(759),
+    [sym_unary_operator] = STATE(759),
+    [sym_comparison_operator] = STATE(985),
+    [sym_lambda] = STATE(985),
+    [sym_assignment] = STATE(1313),
+    [sym_augmented_assignment] = STATE(1313),
+    [sym_pattern_list] = STATE(880),
+    [sym_yield] = STATE(1313),
+    [sym_attribute] = STATE(422),
+    [sym_subscript] = STATE(422),
+    [sym_call] = STATE(759),
+    [sym_list] = STATE(759),
+    [sym_set] = STATE(759),
+    [sym_tuple] = STATE(759),
+    [sym_dictionary] = STATE(759),
+    [sym_list_comprehension] = STATE(759),
+    [sym_dictionary_comprehension] = STATE(759),
+    [sym_set_comprehension] = STATE(759),
+    [sym_generator_expression] = STATE(759),
+    [sym_parenthesized_expression] = STATE(759),
+    [sym_conditional_expression] = STATE(985),
+    [sym_concatenated_string] = STATE(759),
+    [sym_string] = STATE(709),
+    [sym_await] = STATE(759),
+    [aux_sym_module_repeat1] = STATE(61),
+    [aux_sym_decorated_definition_repeat1] = STATE(947),
+    [sym_identifier] = ACTIONS(7),
+    [anon_sym_import] = ACTIONS(9),
+    [anon_sym_from] = ACTIONS(11),
+    [anon_sym_LPAREN] = ACTIONS(13),
+    [anon_sym_STAR] = ACTIONS(15),
+    [anon_sym_print] = ACTIONS(17),
+    [anon_sym_assert] = ACTIONS(19),
+    [anon_sym_return] = ACTIONS(21),
+    [anon_sym_del] = ACTIONS(23),
+    [anon_sym_raise] = ACTIONS(25),
+    [anon_sym_pass] = ACTIONS(27),
+    [anon_sym_break] = ACTIONS(29),
+    [anon_sym_continue] = ACTIONS(31),
+    [anon_sym_if] = ACTIONS(83),
+    [anon_sym_async] = ACTIONS(85),
+    [anon_sym_for] = ACTIONS(87),
+    [anon_sym_while] = ACTIONS(89),
+    [anon_sym_try] = ACTIONS(91),
+    [anon_sym_with] = ACTIONS(93),
+    [anon_sym_match] = ACTIONS(95),
+    [anon_sym_DASH] = ACTIONS(47),
+    [anon_sym_PLUS] = ACTIONS(47),
+    [anon_sym_LBRACK] = ACTIONS(49),
+    [anon_sym_LBRACE] = ACTIONS(51),
+    [anon_sym_STAR_STAR] = ACTIONS(53),
+    [anon_sym_def] = ACTIONS(97),
+    [anon_sym_global] = ACTIONS(57),
+    [anon_sym_nonlocal] = ACTIONS(59),
+    [anon_sym_exec] = ACTIONS(61),
+    [anon_sym_type] = ACTIONS(63),
+    [anon_sym_class] = ACTIONS(99),
+    [anon_sym_AT] = ACTIONS(67),
+    [anon_sym_not] = ACTIONS(69),
+    [anon_sym_TILDE] = ACTIONS(47),
+    [anon_sym_lambda] = ACTIONS(71),
+    [anon_sym_yield] = ACTIONS(73),
+    [sym_ellipsis] = ACTIONS(75),
+    [sym_integer] = ACTIONS(77),
+    [sym_float] = ACTIONS(75),
+    [anon_sym_await] = ACTIONS(79),
+    [sym_true] = ACTIONS(77),
+    [sym_false] = ACTIONS(77),
+    [sym_none] = ACTIONS(77),
+    [sym_comment] = ACTIONS(3),
+    [sym__dedent] = ACTIONS(103),
+    [sym__string_start] = ACTIONS(81),
+  },
+  [23] = {
+    [sym__statement] = STATE(61),
+    [sym__simple_statements] = STATE(61),
+    [sym_import_statement] = STATE(1213),
+    [sym_future_import_statement] = STATE(1213),
+    [sym_import_from_statement] = STATE(1213),
+    [sym_print_statement] = STATE(1213),
+    [sym_assert_statement] = STATE(1213),
+    [sym_expression_statement] = STATE(1213),
+    [sym_named_expression] = STATE(985),
+    [sym_return_statement] = STATE(1213),
+    [sym_delete_statement] = STATE(1213),
+    [sym_raise_statement] = STATE(1213),
+    [sym_pass_statement] = STATE(1213),
+    [sym_break_statement] = STATE(1213),
+    [sym_continue_statement] = STATE(1213),
+    [sym_if_statement] = STATE(61),
+    [sym_for_statement] = STATE(61),
+    [sym_while_statement] = STATE(61),
+    [sym_try_statement] = STATE(61),
+    [sym_with_statement] = STATE(61),
+    [sym_match_statement] = STATE(61),
+    [sym_function_definition] = STATE(61),
+    [sym_list_splat] = STATE(1321),
+    [sym_dictionary_splat] = STATE(1321),
+    [sym_global_statement] = STATE(1213),
+    [sym_nonlocal_statement] = STATE(1213),
+    [sym_exec_statement] = STATE(1213),
+    [sym_type_alias_statement] = STATE(1213),
+    [sym_class_definition] = STATE(61),
+    [sym_decorated_definition] = STATE(61),
+    [sym_decorator] = STATE(947),
+    [sym_block] = STATE(473),
+    [sym_expression_list] = STATE(1313),
+    [sym_pattern] = STATE(871),
+    [sym_tuple_pattern] = STATE(860),
+    [sym_list_pattern] = STATE(860),
+    [sym_list_splat_pattern] = STATE(860),
+    [sym_expression] = STATE(995),
+    [sym_primary_expression] = STATE(707),
+    [sym_not_operator] = STATE(985),
+    [sym_boolean_operator] = STATE(985),
+    [sym_binary_operator] = STATE(759),
+    [sym_unary_operator] = STATE(759),
+    [sym_comparison_operator] = STATE(985),
+    [sym_lambda] = STATE(985),
+    [sym_assignment] = STATE(1313),
+    [sym_augmented_assignment] = STATE(1313),
+    [sym_pattern_list] = STATE(880),
+    [sym_yield] = STATE(1313),
+    [sym_attribute] = STATE(422),
+    [sym_subscript] = STATE(422),
+    [sym_call] = STATE(759),
+    [sym_list] = STATE(759),
+    [sym_set] = STATE(759),
+    [sym_tuple] = STATE(759),
+    [sym_dictionary] = STATE(759),
+    [sym_list_comprehension] = STATE(759),
+    [sym_dictionary_comprehension] = STATE(759),
+    [sym_set_comprehension] = STATE(759),
+    [sym_generator_expression] = STATE(759),
+    [sym_parenthesized_expression] = STATE(759),
+    [sym_conditional_expression] = STATE(985),
+    [sym_concatenated_string] = STATE(759),
+    [sym_string] = STATE(709),
+    [sym_await] = STATE(759),
+    [aux_sym_module_repeat1] = STATE(61),
+    [aux_sym_decorated_definition_repeat1] = STATE(947),
+    [sym_identifier] = ACTIONS(7),
+    [anon_sym_import] = ACTIONS(9),
+    [anon_sym_from] = ACTIONS(11),
+    [anon_sym_LPAREN] = ACTIONS(13),
+    [anon_sym_STAR] = ACTIONS(15),
+    [anon_sym_print] = ACTIONS(17),
+    [anon_sym_assert] = ACTIONS(19),
+    [anon_sym_return] = ACTIONS(21),
+    [anon_sym_del] = ACTIONS(23),
+    [anon_sym_raise] = ACTIONS(25),
+    [anon_sym_pass] = ACTIONS(27),
+    [anon_sym_break] = ACTIONS(29),
+    [anon_sym_continue] = ACTIONS(31),
+    [anon_sym_if] = ACTIONS(83),
+    [anon_sym_async] = ACTIONS(85),
+    [anon_sym_for] = ACTIONS(87),
+    [anon_sym_while] = ACTIONS(89),
+    [anon_sym_try] = ACTIONS(91),
+    [anon_sym_with] = ACTIONS(93),
+    [anon_sym_match] = ACTIONS(95),
+    [anon_sym_DASH] = ACTIONS(47),
+    [anon_sym_PLUS] = ACTIONS(47),
+    [anon_sym_LBRACK] = ACTIONS(49),
+    [anon_sym_LBRACE] = ACTIONS(51),
+    [anon_sym_STAR_STAR] = ACTIONS(53),
+    [anon_sym_def] = ACTIONS(97),
+    [anon_sym_global] = ACTIONS(57),
+    [anon_sym_nonlocal] = ACTIONS(59),
+    [anon_sym_exec] = ACTIONS(61),
+    [anon_sym_type] = ACTIONS(63),
+    [anon_sym_class] = ACTIONS(99),
+    [anon_sym_AT] = ACTIONS(67),
+    [anon_sym_not] = ACTIONS(69),
+    [anon_sym_TILDE] = ACTIONS(47),
+    [anon_sym_lambda] = ACTIONS(71),
+    [anon_sym_yield] = ACTIONS(73),
+    [sym_ellipsis] = ACTIONS(75),
+    [sym_integer] = ACTIONS(77),
+    [sym_float] = ACTIONS(75),
+    [anon_sym_await] = ACTIONS(79),
+    [sym_true] = ACTIONS(77),
+    [sym_false] = ACTIONS(77),
+    [sym_none] = ACTIONS(77),
+    [sym_comment] = ACTIONS(3),
+    [sym__dedent] = ACTIONS(103),
+    [sym__string_start] = ACTIONS(81),
+  },
+  [24] = {
+    [sym__statement] = STATE(60),
+    [sym__simple_statements] = STATE(60),
+    [sym_import_statement] = STATE(1213),
+    [sym_future_import_statement] = STATE(1213),
+    [sym_import_from_statement] = STATE(1213),
+    [sym_print_statement] = STATE(1213),
+    [sym_assert_statement] = STATE(1213),
+    [sym_expression_statement] = STATE(1213),
+    [sym_named_expression] = STATE(985),
+    [sym_return_statement] = STATE(1213),
+    [sym_delete_statement] = STATE(1213),
+    [sym_raise_statement] = STATE(1213),
+    [sym_pass_statement] = STATE(1213),
+    [sym_break_statement] = STATE(1213),
+    [sym_continue_statement] = STATE(1213),
+    [sym_if_statement] = STATE(60),
+    [sym_for_statement] = STATE(60),
+    [sym_while_statement] = STATE(60),
+    [sym_try_statement] = STATE(60),
+    [sym_with_statement] = STATE(60),
+    [sym_match_statement] = STATE(60),
+    [sym_function_definition] = STATE(60),
+    [sym_list_splat] = STATE(1321),
+    [sym_dictionary_splat] = STATE(1321),
+    [sym_global_statement] = STATE(1213),
+    [sym_nonlocal_statement] = STATE(1213),
+    [sym_exec_statement] = STATE(1213),
+    [sym_type_alias_statement] = STATE(1213),
+    [sym_class_definition] = STATE(60),
+    [sym_decorated_definition] = STATE(60),
+    [sym_decorator] = STATE(947),
+    [sym_block] = STATE(427),
+    [sym_expression_list] = STATE(1313),
+    [sym_pattern] = STATE(871),
+    [sym_tuple_pattern] = STATE(860),
+    [sym_list_pattern] = STATE(860),
+    [sym_list_splat_pattern] = STATE(860),
+    [sym_expression] = STATE(995),
+    [sym_primary_expression] = STATE(707),
+    [sym_not_operator] = STATE(985),
+    [sym_boolean_operator] = STATE(985),
+    [sym_binary_operator] = STATE(759),
+    [sym_unary_operator] = STATE(759),
+    [sym_comparison_operator] = STATE(985),
+    [sym_lambda] = STATE(985),
+    [sym_assignment] = STATE(1313),
+    [sym_augmented_assignment] = STATE(1313),
+    [sym_pattern_list] = STATE(880),
+    [sym_yield] = STATE(1313),
+    [sym_attribute] = STATE(422),
+    [sym_subscript] = STATE(422),
+    [sym_call] = STATE(759),
+    [sym_list] = STATE(759),
+    [sym_set] = STATE(759),
+    [sym_tuple] = STATE(759),
+    [sym_dictionary] = STATE(759),
+    [sym_list_comprehension] = STATE(759),
+    [sym_dictionary_comprehension] = STATE(759),
+    [sym_set_comprehension] = STATE(759),
+    [sym_generator_expression] = STATE(759),
+    [sym_parenthesized_expression] = STATE(759),
+    [sym_conditional_expression] = STATE(985),
+    [sym_concatenated_string] = STATE(759),
+    [sym_string] = STATE(709),
+    [sym_await] = STATE(759),
+    [aux_sym_module_repeat1] = STATE(60),
+    [aux_sym_decorated_definition_repeat1] = STATE(947),
     [sym_identifier] = ACTIONS(7),
     [anon_sym_import] = ACTIONS(9),
     [anon_sym_from] = ACTIONS(11),
@@ -12907,252 +10517,22 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym__dedent] = ACTIONS(101),
     [sym__string_start] = ACTIONS(81),
   },
-  [23] = {
-    [sym__statement] = STATE(62),
-    [sym__simple_statements] = STATE(62),
-    [sym_import_statement] = STATE(1319),
-    [sym_future_import_statement] = STATE(1319),
-    [sym_import_from_statement] = STATE(1319),
-    [sym_print_statement] = STATE(1319),
-    [sym_assert_statement] = STATE(1319),
-    [sym_expression_statement] = STATE(1319),
-    [sym_named_expression] = STATE(1009),
-    [sym_return_statement] = STATE(1319),
-    [sym_delete_statement] = STATE(1319),
-    [sym_raise_statement] = STATE(1319),
-    [sym_pass_statement] = STATE(1319),
-    [sym_break_statement] = STATE(1319),
-    [sym_continue_statement] = STATE(1319),
-    [sym_if_statement] = STATE(62),
-    [sym_for_statement] = STATE(62),
-    [sym_while_statement] = STATE(62),
-    [sym_try_statement] = STATE(62),
-    [sym_with_statement] = STATE(62),
-    [sym_match_statement] = STATE(62),
-    [sym_function_definition] = STATE(62),
-    [sym_list_splat] = STATE(1360),
-    [sym_dictionary_splat] = STATE(1360),
-    [sym_global_statement] = STATE(1319),
-    [sym_nonlocal_statement] = STATE(1319),
-    [sym_exec_statement] = STATE(1319),
-    [sym_type_alias_statement] = STATE(1319),
-    [sym_class_definition] = STATE(62),
-    [sym_decorated_definition] = STATE(62),
-    [sym_decorator] = STATE(996),
-    [sym_block] = STATE(363),
-    [sym_expression_list] = STATE(1361),
-    [sym_pattern] = STATE(889),
-    [sym_tuple_pattern] = STATE(875),
-    [sym_list_pattern] = STATE(875),
-    [sym_list_splat_pattern] = STATE(875),
-    [sym_expression] = STATE(1019),
-    [sym_primary_expression] = STATE(684),
-    [sym_not_operator] = STATE(1009),
-    [sym_boolean_operator] = STATE(1009),
-    [sym_binary_operator] = STATE(797),
-    [sym_unary_operator] = STATE(797),
-    [sym_comparison_operator] = STATE(1009),
-    [sym_lambda] = STATE(1009),
-    [sym_assignment] = STATE(1361),
-    [sym_augmented_assignment] = STATE(1361),
-    [sym_pattern_list] = STATE(897),
-    [sym_yield] = STATE(1361),
-    [sym_attribute] = STATE(431),
-    [sym_subscript] = STATE(431),
-    [sym_call] = STATE(797),
-    [sym_list] = STATE(797),
-    [sym_set] = STATE(797),
-    [sym_tuple] = STATE(797),
-    [sym_dictionary] = STATE(797),
-    [sym_list_comprehension] = STATE(797),
-    [sym_dictionary_comprehension] = STATE(797),
-    [sym_set_comprehension] = STATE(797),
-    [sym_generator_expression] = STATE(797),
-    [sym_parenthesized_expression] = STATE(797),
-    [sym_conditional_expression] = STATE(1009),
-    [sym_concatenated_string] = STATE(797),
-    [sym_string] = STATE(713),
-    [sym_await] = STATE(1009),
-    [aux_sym_module_repeat1] = STATE(62),
-    [aux_sym_decorated_definition_repeat1] = STATE(996),
-    [sym_identifier] = ACTIONS(7),
-    [anon_sym_import] = ACTIONS(9),
-    [anon_sym_from] = ACTIONS(11),
-    [anon_sym_LPAREN] = ACTIONS(13),
-    [anon_sym_STAR] = ACTIONS(15),
-    [anon_sym_print] = ACTIONS(17),
-    [anon_sym_assert] = ACTIONS(19),
-    [anon_sym_return] = ACTIONS(21),
-    [anon_sym_del] = ACTIONS(23),
-    [anon_sym_raise] = ACTIONS(25),
-    [anon_sym_pass] = ACTIONS(27),
-    [anon_sym_break] = ACTIONS(29),
-    [anon_sym_continue] = ACTIONS(31),
-    [anon_sym_if] = ACTIONS(83),
-    [anon_sym_async] = ACTIONS(85),
-    [anon_sym_for] = ACTIONS(87),
-    [anon_sym_while] = ACTIONS(89),
-    [anon_sym_try] = ACTIONS(91),
-    [anon_sym_with] = ACTIONS(93),
-    [anon_sym_match] = ACTIONS(95),
-    [anon_sym_DASH] = ACTIONS(47),
-    [anon_sym_PLUS] = ACTIONS(47),
-    [anon_sym_LBRACK] = ACTIONS(49),
-    [anon_sym_LBRACE] = ACTIONS(51),
-    [anon_sym_STAR_STAR] = ACTIONS(53),
-    [anon_sym_def] = ACTIONS(97),
-    [anon_sym_global] = ACTIONS(57),
-    [anon_sym_nonlocal] = ACTIONS(59),
-    [anon_sym_exec] = ACTIONS(61),
-    [anon_sym_type] = ACTIONS(63),
-    [anon_sym_class] = ACTIONS(99),
-    [anon_sym_AT] = ACTIONS(67),
-    [anon_sym_not] = ACTIONS(69),
-    [anon_sym_TILDE] = ACTIONS(47),
-    [anon_sym_lambda] = ACTIONS(71),
-    [anon_sym_yield] = ACTIONS(73),
-    [sym_ellipsis] = ACTIONS(75),
-    [sym_integer] = ACTIONS(77),
-    [sym_float] = ACTIONS(75),
-    [anon_sym_await] = ACTIONS(79),
-    [sym_true] = ACTIONS(77),
-    [sym_false] = ACTIONS(77),
-    [sym_none] = ACTIONS(77),
-    [sym_comment] = ACTIONS(3),
-    [sym__dedent] = ACTIONS(105),
-    [sym__string_start] = ACTIONS(81),
-  },
-  [24] = {
-    [sym__statement] = STATE(61),
-    [sym__simple_statements] = STATE(61),
-    [sym_import_statement] = STATE(1319),
-    [sym_future_import_statement] = STATE(1319),
-    [sym_import_from_statement] = STATE(1319),
-    [sym_print_statement] = STATE(1319),
-    [sym_assert_statement] = STATE(1319),
-    [sym_expression_statement] = STATE(1319),
-    [sym_named_expression] = STATE(1009),
-    [sym_return_statement] = STATE(1319),
-    [sym_delete_statement] = STATE(1319),
-    [sym_raise_statement] = STATE(1319),
-    [sym_pass_statement] = STATE(1319),
-    [sym_break_statement] = STATE(1319),
-    [sym_continue_statement] = STATE(1319),
-    [sym_if_statement] = STATE(61),
-    [sym_for_statement] = STATE(61),
-    [sym_while_statement] = STATE(61),
-    [sym_try_statement] = STATE(61),
-    [sym_with_statement] = STATE(61),
-    [sym_match_statement] = STATE(61),
-    [sym_function_definition] = STATE(61),
-    [sym_list_splat] = STATE(1360),
-    [sym_dictionary_splat] = STATE(1360),
-    [sym_global_statement] = STATE(1319),
-    [sym_nonlocal_statement] = STATE(1319),
-    [sym_exec_statement] = STATE(1319),
-    [sym_type_alias_statement] = STATE(1319),
-    [sym_class_definition] = STATE(61),
-    [sym_decorated_definition] = STATE(61),
-    [sym_decorator] = STATE(996),
-    [sym_block] = STATE(512),
-    [sym_expression_list] = STATE(1361),
-    [sym_pattern] = STATE(889),
-    [sym_tuple_pattern] = STATE(875),
-    [sym_list_pattern] = STATE(875),
-    [sym_list_splat_pattern] = STATE(875),
-    [sym_expression] = STATE(1019),
-    [sym_primary_expression] = STATE(684),
-    [sym_not_operator] = STATE(1009),
-    [sym_boolean_operator] = STATE(1009),
-    [sym_binary_operator] = STATE(797),
-    [sym_unary_operator] = STATE(797),
-    [sym_comparison_operator] = STATE(1009),
-    [sym_lambda] = STATE(1009),
-    [sym_assignment] = STATE(1361),
-    [sym_augmented_assignment] = STATE(1361),
-    [sym_pattern_list] = STATE(897),
-    [sym_yield] = STATE(1361),
-    [sym_attribute] = STATE(431),
-    [sym_subscript] = STATE(431),
-    [sym_call] = STATE(797),
-    [sym_list] = STATE(797),
-    [sym_set] = STATE(797),
-    [sym_tuple] = STATE(797),
-    [sym_dictionary] = STATE(797),
-    [sym_list_comprehension] = STATE(797),
-    [sym_dictionary_comprehension] = STATE(797),
-    [sym_set_comprehension] = STATE(797),
-    [sym_generator_expression] = STATE(797),
-    [sym_parenthesized_expression] = STATE(797),
-    [sym_conditional_expression] = STATE(1009),
-    [sym_concatenated_string] = STATE(797),
-    [sym_string] = STATE(713),
-    [sym_await] = STATE(1009),
-    [aux_sym_module_repeat1] = STATE(61),
-    [aux_sym_decorated_definition_repeat1] = STATE(996),
-    [sym_identifier] = ACTIONS(7),
-    [anon_sym_import] = ACTIONS(9),
-    [anon_sym_from] = ACTIONS(11),
-    [anon_sym_LPAREN] = ACTIONS(13),
-    [anon_sym_STAR] = ACTIONS(15),
-    [anon_sym_print] = ACTIONS(17),
-    [anon_sym_assert] = ACTIONS(19),
-    [anon_sym_return] = ACTIONS(21),
-    [anon_sym_del] = ACTIONS(23),
-    [anon_sym_raise] = ACTIONS(25),
-    [anon_sym_pass] = ACTIONS(27),
-    [anon_sym_break] = ACTIONS(29),
-    [anon_sym_continue] = ACTIONS(31),
-    [anon_sym_if] = ACTIONS(83),
-    [anon_sym_async] = ACTIONS(85),
-    [anon_sym_for] = ACTIONS(87),
-    [anon_sym_while] = ACTIONS(89),
-    [anon_sym_try] = ACTIONS(91),
-    [anon_sym_with] = ACTIONS(93),
-    [anon_sym_match] = ACTIONS(95),
-    [anon_sym_DASH] = ACTIONS(47),
-    [anon_sym_PLUS] = ACTIONS(47),
-    [anon_sym_LBRACK] = ACTIONS(49),
-    [anon_sym_LBRACE] = ACTIONS(51),
-    [anon_sym_STAR_STAR] = ACTIONS(53),
-    [anon_sym_def] = ACTIONS(97),
-    [anon_sym_global] = ACTIONS(57),
-    [anon_sym_nonlocal] = ACTIONS(59),
-    [anon_sym_exec] = ACTIONS(61),
-    [anon_sym_type] = ACTIONS(63),
-    [anon_sym_class] = ACTIONS(99),
-    [anon_sym_AT] = ACTIONS(67),
-    [anon_sym_not] = ACTIONS(69),
-    [anon_sym_TILDE] = ACTIONS(47),
-    [anon_sym_lambda] = ACTIONS(71),
-    [anon_sym_yield] = ACTIONS(73),
-    [sym_ellipsis] = ACTIONS(75),
-    [sym_integer] = ACTIONS(77),
-    [sym_float] = ACTIONS(75),
-    [anon_sym_await] = ACTIONS(79),
-    [sym_true] = ACTIONS(77),
-    [sym_false] = ACTIONS(77),
-    [sym_none] = ACTIONS(77),
-    [sym_comment] = ACTIONS(3),
-    [sym__dedent] = ACTIONS(107),
-    [sym__string_start] = ACTIONS(81),
-  },
   [25] = {
     [sym__statement] = STATE(60),
     [sym__simple_statements] = STATE(60),
-    [sym_import_statement] = STATE(1319),
-    [sym_future_import_statement] = STATE(1319),
-    [sym_import_from_statement] = STATE(1319),
-    [sym_print_statement] = STATE(1319),
-    [sym_assert_statement] = STATE(1319),
-    [sym_expression_statement] = STATE(1319),
-    [sym_named_expression] = STATE(1009),
-    [sym_return_statement] = STATE(1319),
-    [sym_delete_statement] = STATE(1319),
-    [sym_raise_statement] = STATE(1319),
-    [sym_pass_statement] = STATE(1319),
-    [sym_break_statement] = STATE(1319),
-    [sym_continue_statement] = STATE(1319),
+    [sym_import_statement] = STATE(1213),
+    [sym_future_import_statement] = STATE(1213),
+    [sym_import_from_statement] = STATE(1213),
+    [sym_print_statement] = STATE(1213),
+    [sym_assert_statement] = STATE(1213),
+    [sym_expression_statement] = STATE(1213),
+    [sym_named_expression] = STATE(985),
+    [sym_return_statement] = STATE(1213),
+    [sym_delete_statement] = STATE(1213),
+    [sym_raise_statement] = STATE(1213),
+    [sym_pass_statement] = STATE(1213),
+    [sym_break_statement] = STATE(1213),
+    [sym_continue_statement] = STATE(1213),
     [sym_if_statement] = STATE(60),
     [sym_for_statement] = STATE(60),
     [sym_while_statement] = STATE(60),
@@ -13160,51 +10540,51 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_with_statement] = STATE(60),
     [sym_match_statement] = STATE(60),
     [sym_function_definition] = STATE(60),
-    [sym_list_splat] = STATE(1360),
-    [sym_dictionary_splat] = STATE(1360),
-    [sym_global_statement] = STATE(1319),
-    [sym_nonlocal_statement] = STATE(1319),
-    [sym_exec_statement] = STATE(1319),
-    [sym_type_alias_statement] = STATE(1319),
+    [sym_list_splat] = STATE(1321),
+    [sym_dictionary_splat] = STATE(1321),
+    [sym_global_statement] = STATE(1213),
+    [sym_nonlocal_statement] = STATE(1213),
+    [sym_exec_statement] = STATE(1213),
+    [sym_type_alias_statement] = STATE(1213),
     [sym_class_definition] = STATE(60),
     [sym_decorated_definition] = STATE(60),
-    [sym_decorator] = STATE(996),
-    [sym_block] = STATE(320),
-    [sym_expression_list] = STATE(1361),
-    [sym_pattern] = STATE(889),
-    [sym_tuple_pattern] = STATE(875),
-    [sym_list_pattern] = STATE(875),
-    [sym_list_splat_pattern] = STATE(875),
-    [sym_expression] = STATE(1019),
-    [sym_primary_expression] = STATE(684),
-    [sym_not_operator] = STATE(1009),
-    [sym_boolean_operator] = STATE(1009),
-    [sym_binary_operator] = STATE(797),
-    [sym_unary_operator] = STATE(797),
-    [sym_comparison_operator] = STATE(1009),
-    [sym_lambda] = STATE(1009),
-    [sym_assignment] = STATE(1361),
-    [sym_augmented_assignment] = STATE(1361),
-    [sym_pattern_list] = STATE(897),
-    [sym_yield] = STATE(1361),
-    [sym_attribute] = STATE(431),
-    [sym_subscript] = STATE(431),
-    [sym_call] = STATE(797),
-    [sym_list] = STATE(797),
-    [sym_set] = STATE(797),
-    [sym_tuple] = STATE(797),
-    [sym_dictionary] = STATE(797),
-    [sym_list_comprehension] = STATE(797),
-    [sym_dictionary_comprehension] = STATE(797),
-    [sym_set_comprehension] = STATE(797),
-    [sym_generator_expression] = STATE(797),
-    [sym_parenthesized_expression] = STATE(797),
-    [sym_conditional_expression] = STATE(1009),
-    [sym_concatenated_string] = STATE(797),
-    [sym_string] = STATE(713),
-    [sym_await] = STATE(1009),
+    [sym_decorator] = STATE(947),
+    [sym_block] = STATE(563),
+    [sym_expression_list] = STATE(1313),
+    [sym_pattern] = STATE(871),
+    [sym_tuple_pattern] = STATE(860),
+    [sym_list_pattern] = STATE(860),
+    [sym_list_splat_pattern] = STATE(860),
+    [sym_expression] = STATE(995),
+    [sym_primary_expression] = STATE(707),
+    [sym_not_operator] = STATE(985),
+    [sym_boolean_operator] = STATE(985),
+    [sym_binary_operator] = STATE(759),
+    [sym_unary_operator] = STATE(759),
+    [sym_comparison_operator] = STATE(985),
+    [sym_lambda] = STATE(985),
+    [sym_assignment] = STATE(1313),
+    [sym_augmented_assignment] = STATE(1313),
+    [sym_pattern_list] = STATE(880),
+    [sym_yield] = STATE(1313),
+    [sym_attribute] = STATE(422),
+    [sym_subscript] = STATE(422),
+    [sym_call] = STATE(759),
+    [sym_list] = STATE(759),
+    [sym_set] = STATE(759),
+    [sym_tuple] = STATE(759),
+    [sym_dictionary] = STATE(759),
+    [sym_list_comprehension] = STATE(759),
+    [sym_dictionary_comprehension] = STATE(759),
+    [sym_set_comprehension] = STATE(759),
+    [sym_generator_expression] = STATE(759),
+    [sym_parenthesized_expression] = STATE(759),
+    [sym_conditional_expression] = STATE(985),
+    [sym_concatenated_string] = STATE(759),
+    [sym_string] = STATE(709),
+    [sym_await] = STATE(759),
     [aux_sym_module_repeat1] = STATE(60),
-    [aux_sym_decorated_definition_repeat1] = STATE(996),
+    [aux_sym_decorated_definition_repeat1] = STATE(947),
     [sym_identifier] = ACTIONS(7),
     [anon_sym_import] = ACTIONS(9),
     [anon_sym_from] = ACTIONS(11),
@@ -13249,25 +10629,25 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_false] = ACTIONS(77),
     [sym_none] = ACTIONS(77),
     [sym_comment] = ACTIONS(3),
-    [sym__dedent] = ACTIONS(109),
+    [sym__dedent] = ACTIONS(101),
     [sym__string_start] = ACTIONS(81),
   },
   [26] = {
     [sym__statement] = STATE(61),
     [sym__simple_statements] = STATE(61),
-    [sym_import_statement] = STATE(1319),
-    [sym_future_import_statement] = STATE(1319),
-    [sym_import_from_statement] = STATE(1319),
-    [sym_print_statement] = STATE(1319),
-    [sym_assert_statement] = STATE(1319),
-    [sym_expression_statement] = STATE(1319),
-    [sym_named_expression] = STATE(1009),
-    [sym_return_statement] = STATE(1319),
-    [sym_delete_statement] = STATE(1319),
-    [sym_raise_statement] = STATE(1319),
-    [sym_pass_statement] = STATE(1319),
-    [sym_break_statement] = STATE(1319),
-    [sym_continue_statement] = STATE(1319),
+    [sym_import_statement] = STATE(1213),
+    [sym_future_import_statement] = STATE(1213),
+    [sym_import_from_statement] = STATE(1213),
+    [sym_print_statement] = STATE(1213),
+    [sym_assert_statement] = STATE(1213),
+    [sym_expression_statement] = STATE(1213),
+    [sym_named_expression] = STATE(985),
+    [sym_return_statement] = STATE(1213),
+    [sym_delete_statement] = STATE(1213),
+    [sym_raise_statement] = STATE(1213),
+    [sym_pass_statement] = STATE(1213),
+    [sym_break_statement] = STATE(1213),
+    [sym_continue_statement] = STATE(1213),
     [sym_if_statement] = STATE(61),
     [sym_for_statement] = STATE(61),
     [sym_while_statement] = STATE(61),
@@ -13275,51 +10655,51 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_with_statement] = STATE(61),
     [sym_match_statement] = STATE(61),
     [sym_function_definition] = STATE(61),
-    [sym_list_splat] = STATE(1360),
-    [sym_dictionary_splat] = STATE(1360),
-    [sym_global_statement] = STATE(1319),
-    [sym_nonlocal_statement] = STATE(1319),
-    [sym_exec_statement] = STATE(1319),
-    [sym_type_alias_statement] = STATE(1319),
+    [sym_list_splat] = STATE(1321),
+    [sym_dictionary_splat] = STATE(1321),
+    [sym_global_statement] = STATE(1213),
+    [sym_nonlocal_statement] = STATE(1213),
+    [sym_exec_statement] = STATE(1213),
+    [sym_type_alias_statement] = STATE(1213),
     [sym_class_definition] = STATE(61),
     [sym_decorated_definition] = STATE(61),
-    [sym_decorator] = STATE(996),
-    [sym_block] = STATE(590),
-    [sym_expression_list] = STATE(1361),
-    [sym_pattern] = STATE(889),
-    [sym_tuple_pattern] = STATE(875),
-    [sym_list_pattern] = STATE(875),
-    [sym_list_splat_pattern] = STATE(875),
-    [sym_expression] = STATE(1019),
-    [sym_primary_expression] = STATE(684),
-    [sym_not_operator] = STATE(1009),
-    [sym_boolean_operator] = STATE(1009),
-    [sym_binary_operator] = STATE(797),
-    [sym_unary_operator] = STATE(797),
-    [sym_comparison_operator] = STATE(1009),
-    [sym_lambda] = STATE(1009),
-    [sym_assignment] = STATE(1361),
-    [sym_augmented_assignment] = STATE(1361),
-    [sym_pattern_list] = STATE(897),
-    [sym_yield] = STATE(1361),
-    [sym_attribute] = STATE(431),
-    [sym_subscript] = STATE(431),
-    [sym_call] = STATE(797),
-    [sym_list] = STATE(797),
-    [sym_set] = STATE(797),
-    [sym_tuple] = STATE(797),
-    [sym_dictionary] = STATE(797),
-    [sym_list_comprehension] = STATE(797),
-    [sym_dictionary_comprehension] = STATE(797),
-    [sym_set_comprehension] = STATE(797),
-    [sym_generator_expression] = STATE(797),
-    [sym_parenthesized_expression] = STATE(797),
-    [sym_conditional_expression] = STATE(1009),
-    [sym_concatenated_string] = STATE(797),
-    [sym_string] = STATE(713),
-    [sym_await] = STATE(1009),
+    [sym_decorator] = STATE(947),
+    [sym_block] = STATE(551),
+    [sym_expression_list] = STATE(1313),
+    [sym_pattern] = STATE(871),
+    [sym_tuple_pattern] = STATE(860),
+    [sym_list_pattern] = STATE(860),
+    [sym_list_splat_pattern] = STATE(860),
+    [sym_expression] = STATE(995),
+    [sym_primary_expression] = STATE(707),
+    [sym_not_operator] = STATE(985),
+    [sym_boolean_operator] = STATE(985),
+    [sym_binary_operator] = STATE(759),
+    [sym_unary_operator] = STATE(759),
+    [sym_comparison_operator] = STATE(985),
+    [sym_lambda] = STATE(985),
+    [sym_assignment] = STATE(1313),
+    [sym_augmented_assignment] = STATE(1313),
+    [sym_pattern_list] = STATE(880),
+    [sym_yield] = STATE(1313),
+    [sym_attribute] = STATE(422),
+    [sym_subscript] = STATE(422),
+    [sym_call] = STATE(759),
+    [sym_list] = STATE(759),
+    [sym_set] = STATE(759),
+    [sym_tuple] = STATE(759),
+    [sym_dictionary] = STATE(759),
+    [sym_list_comprehension] = STATE(759),
+    [sym_dictionary_comprehension] = STATE(759),
+    [sym_set_comprehension] = STATE(759),
+    [sym_generator_expression] = STATE(759),
+    [sym_parenthesized_expression] = STATE(759),
+    [sym_conditional_expression] = STATE(985),
+    [sym_concatenated_string] = STATE(759),
+    [sym_string] = STATE(709),
+    [sym_await] = STATE(759),
     [aux_sym_module_repeat1] = STATE(61),
-    [aux_sym_decorated_definition_repeat1] = STATE(996),
+    [aux_sym_decorated_definition_repeat1] = STATE(947),
     [sym_identifier] = ACTIONS(7),
     [anon_sym_import] = ACTIONS(9),
     [anon_sym_from] = ACTIONS(11),
@@ -13364,485 +10744,25 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_false] = ACTIONS(77),
     [sym_none] = ACTIONS(77),
     [sym_comment] = ACTIONS(3),
-    [sym__dedent] = ACTIONS(107),
+    [sym__dedent] = ACTIONS(103),
     [sym__string_start] = ACTIONS(81),
   },
   [27] = {
-    [sym__statement] = STATE(61),
-    [sym__simple_statements] = STATE(61),
-    [sym_import_statement] = STATE(1319),
-    [sym_future_import_statement] = STATE(1319),
-    [sym_import_from_statement] = STATE(1319),
-    [sym_print_statement] = STATE(1319),
-    [sym_assert_statement] = STATE(1319),
-    [sym_expression_statement] = STATE(1319),
-    [sym_named_expression] = STATE(1009),
-    [sym_return_statement] = STATE(1319),
-    [sym_delete_statement] = STATE(1319),
-    [sym_raise_statement] = STATE(1319),
-    [sym_pass_statement] = STATE(1319),
-    [sym_break_statement] = STATE(1319),
-    [sym_continue_statement] = STATE(1319),
-    [sym_if_statement] = STATE(61),
-    [sym_for_statement] = STATE(61),
-    [sym_while_statement] = STATE(61),
-    [sym_try_statement] = STATE(61),
-    [sym_with_statement] = STATE(61),
-    [sym_match_statement] = STATE(61),
-    [sym_function_definition] = STATE(61),
-    [sym_list_splat] = STATE(1360),
-    [sym_dictionary_splat] = STATE(1360),
-    [sym_global_statement] = STATE(1319),
-    [sym_nonlocal_statement] = STATE(1319),
-    [sym_exec_statement] = STATE(1319),
-    [sym_type_alias_statement] = STATE(1319),
-    [sym_class_definition] = STATE(61),
-    [sym_decorated_definition] = STATE(61),
-    [sym_decorator] = STATE(996),
-    [sym_block] = STATE(494),
-    [sym_expression_list] = STATE(1361),
-    [sym_pattern] = STATE(889),
-    [sym_tuple_pattern] = STATE(875),
-    [sym_list_pattern] = STATE(875),
-    [sym_list_splat_pattern] = STATE(875),
-    [sym_expression] = STATE(1019),
-    [sym_primary_expression] = STATE(684),
-    [sym_not_operator] = STATE(1009),
-    [sym_boolean_operator] = STATE(1009),
-    [sym_binary_operator] = STATE(797),
-    [sym_unary_operator] = STATE(797),
-    [sym_comparison_operator] = STATE(1009),
-    [sym_lambda] = STATE(1009),
-    [sym_assignment] = STATE(1361),
-    [sym_augmented_assignment] = STATE(1361),
-    [sym_pattern_list] = STATE(897),
-    [sym_yield] = STATE(1361),
-    [sym_attribute] = STATE(431),
-    [sym_subscript] = STATE(431),
-    [sym_call] = STATE(797),
-    [sym_list] = STATE(797),
-    [sym_set] = STATE(797),
-    [sym_tuple] = STATE(797),
-    [sym_dictionary] = STATE(797),
-    [sym_list_comprehension] = STATE(797),
-    [sym_dictionary_comprehension] = STATE(797),
-    [sym_set_comprehension] = STATE(797),
-    [sym_generator_expression] = STATE(797),
-    [sym_parenthesized_expression] = STATE(797),
-    [sym_conditional_expression] = STATE(1009),
-    [sym_concatenated_string] = STATE(797),
-    [sym_string] = STATE(713),
-    [sym_await] = STATE(1009),
-    [aux_sym_module_repeat1] = STATE(61),
-    [aux_sym_decorated_definition_repeat1] = STATE(996),
-    [sym_identifier] = ACTIONS(7),
-    [anon_sym_import] = ACTIONS(9),
-    [anon_sym_from] = ACTIONS(11),
-    [anon_sym_LPAREN] = ACTIONS(13),
-    [anon_sym_STAR] = ACTIONS(15),
-    [anon_sym_print] = ACTIONS(17),
-    [anon_sym_assert] = ACTIONS(19),
-    [anon_sym_return] = ACTIONS(21),
-    [anon_sym_del] = ACTIONS(23),
-    [anon_sym_raise] = ACTIONS(25),
-    [anon_sym_pass] = ACTIONS(27),
-    [anon_sym_break] = ACTIONS(29),
-    [anon_sym_continue] = ACTIONS(31),
-    [anon_sym_if] = ACTIONS(83),
-    [anon_sym_async] = ACTIONS(85),
-    [anon_sym_for] = ACTIONS(87),
-    [anon_sym_while] = ACTIONS(89),
-    [anon_sym_try] = ACTIONS(91),
-    [anon_sym_with] = ACTIONS(93),
-    [anon_sym_match] = ACTIONS(95),
-    [anon_sym_DASH] = ACTIONS(47),
-    [anon_sym_PLUS] = ACTIONS(47),
-    [anon_sym_LBRACK] = ACTIONS(49),
-    [anon_sym_LBRACE] = ACTIONS(51),
-    [anon_sym_STAR_STAR] = ACTIONS(53),
-    [anon_sym_def] = ACTIONS(97),
-    [anon_sym_global] = ACTIONS(57),
-    [anon_sym_nonlocal] = ACTIONS(59),
-    [anon_sym_exec] = ACTIONS(61),
-    [anon_sym_type] = ACTIONS(63),
-    [anon_sym_class] = ACTIONS(99),
-    [anon_sym_AT] = ACTIONS(67),
-    [anon_sym_not] = ACTIONS(69),
-    [anon_sym_TILDE] = ACTIONS(47),
-    [anon_sym_lambda] = ACTIONS(71),
-    [anon_sym_yield] = ACTIONS(73),
-    [sym_ellipsis] = ACTIONS(75),
-    [sym_integer] = ACTIONS(77),
-    [sym_float] = ACTIONS(75),
-    [anon_sym_await] = ACTIONS(79),
-    [sym_true] = ACTIONS(77),
-    [sym_false] = ACTIONS(77),
-    [sym_none] = ACTIONS(77),
-    [sym_comment] = ACTIONS(3),
-    [sym__dedent] = ACTIONS(107),
-    [sym__string_start] = ACTIONS(81),
-  },
-  [28] = {
-    [sym__statement] = STATE(61),
-    [sym__simple_statements] = STATE(61),
-    [sym_import_statement] = STATE(1319),
-    [sym_future_import_statement] = STATE(1319),
-    [sym_import_from_statement] = STATE(1319),
-    [sym_print_statement] = STATE(1319),
-    [sym_assert_statement] = STATE(1319),
-    [sym_expression_statement] = STATE(1319),
-    [sym_named_expression] = STATE(1009),
-    [sym_return_statement] = STATE(1319),
-    [sym_delete_statement] = STATE(1319),
-    [sym_raise_statement] = STATE(1319),
-    [sym_pass_statement] = STATE(1319),
-    [sym_break_statement] = STATE(1319),
-    [sym_continue_statement] = STATE(1319),
-    [sym_if_statement] = STATE(61),
-    [sym_for_statement] = STATE(61),
-    [sym_while_statement] = STATE(61),
-    [sym_try_statement] = STATE(61),
-    [sym_with_statement] = STATE(61),
-    [sym_match_statement] = STATE(61),
-    [sym_function_definition] = STATE(61),
-    [sym_list_splat] = STATE(1360),
-    [sym_dictionary_splat] = STATE(1360),
-    [sym_global_statement] = STATE(1319),
-    [sym_nonlocal_statement] = STATE(1319),
-    [sym_exec_statement] = STATE(1319),
-    [sym_type_alias_statement] = STATE(1319),
-    [sym_class_definition] = STATE(61),
-    [sym_decorated_definition] = STATE(61),
-    [sym_decorator] = STATE(996),
-    [sym_block] = STATE(557),
-    [sym_expression_list] = STATE(1361),
-    [sym_pattern] = STATE(889),
-    [sym_tuple_pattern] = STATE(875),
-    [sym_list_pattern] = STATE(875),
-    [sym_list_splat_pattern] = STATE(875),
-    [sym_expression] = STATE(1019),
-    [sym_primary_expression] = STATE(684),
-    [sym_not_operator] = STATE(1009),
-    [sym_boolean_operator] = STATE(1009),
-    [sym_binary_operator] = STATE(797),
-    [sym_unary_operator] = STATE(797),
-    [sym_comparison_operator] = STATE(1009),
-    [sym_lambda] = STATE(1009),
-    [sym_assignment] = STATE(1361),
-    [sym_augmented_assignment] = STATE(1361),
-    [sym_pattern_list] = STATE(897),
-    [sym_yield] = STATE(1361),
-    [sym_attribute] = STATE(431),
-    [sym_subscript] = STATE(431),
-    [sym_call] = STATE(797),
-    [sym_list] = STATE(797),
-    [sym_set] = STATE(797),
-    [sym_tuple] = STATE(797),
-    [sym_dictionary] = STATE(797),
-    [sym_list_comprehension] = STATE(797),
-    [sym_dictionary_comprehension] = STATE(797),
-    [sym_set_comprehension] = STATE(797),
-    [sym_generator_expression] = STATE(797),
-    [sym_parenthesized_expression] = STATE(797),
-    [sym_conditional_expression] = STATE(1009),
-    [sym_concatenated_string] = STATE(797),
-    [sym_string] = STATE(713),
-    [sym_await] = STATE(1009),
-    [aux_sym_module_repeat1] = STATE(61),
-    [aux_sym_decorated_definition_repeat1] = STATE(996),
-    [sym_identifier] = ACTIONS(7),
-    [anon_sym_import] = ACTIONS(9),
-    [anon_sym_from] = ACTIONS(11),
-    [anon_sym_LPAREN] = ACTIONS(13),
-    [anon_sym_STAR] = ACTIONS(15),
-    [anon_sym_print] = ACTIONS(17),
-    [anon_sym_assert] = ACTIONS(19),
-    [anon_sym_return] = ACTIONS(21),
-    [anon_sym_del] = ACTIONS(23),
-    [anon_sym_raise] = ACTIONS(25),
-    [anon_sym_pass] = ACTIONS(27),
-    [anon_sym_break] = ACTIONS(29),
-    [anon_sym_continue] = ACTIONS(31),
-    [anon_sym_if] = ACTIONS(83),
-    [anon_sym_async] = ACTIONS(85),
-    [anon_sym_for] = ACTIONS(87),
-    [anon_sym_while] = ACTIONS(89),
-    [anon_sym_try] = ACTIONS(91),
-    [anon_sym_with] = ACTIONS(93),
-    [anon_sym_match] = ACTIONS(95),
-    [anon_sym_DASH] = ACTIONS(47),
-    [anon_sym_PLUS] = ACTIONS(47),
-    [anon_sym_LBRACK] = ACTIONS(49),
-    [anon_sym_LBRACE] = ACTIONS(51),
-    [anon_sym_STAR_STAR] = ACTIONS(53),
-    [anon_sym_def] = ACTIONS(97),
-    [anon_sym_global] = ACTIONS(57),
-    [anon_sym_nonlocal] = ACTIONS(59),
-    [anon_sym_exec] = ACTIONS(61),
-    [anon_sym_type] = ACTIONS(63),
-    [anon_sym_class] = ACTIONS(99),
-    [anon_sym_AT] = ACTIONS(67),
-    [anon_sym_not] = ACTIONS(69),
-    [anon_sym_TILDE] = ACTIONS(47),
-    [anon_sym_lambda] = ACTIONS(71),
-    [anon_sym_yield] = ACTIONS(73),
-    [sym_ellipsis] = ACTIONS(75),
-    [sym_integer] = ACTIONS(77),
-    [sym_float] = ACTIONS(75),
-    [anon_sym_await] = ACTIONS(79),
-    [sym_true] = ACTIONS(77),
-    [sym_false] = ACTIONS(77),
-    [sym_none] = ACTIONS(77),
-    [sym_comment] = ACTIONS(3),
-    [sym__dedent] = ACTIONS(107),
-    [sym__string_start] = ACTIONS(81),
-  },
-  [29] = {
-    [sym__statement] = STATE(61),
-    [sym__simple_statements] = STATE(61),
-    [sym_import_statement] = STATE(1319),
-    [sym_future_import_statement] = STATE(1319),
-    [sym_import_from_statement] = STATE(1319),
-    [sym_print_statement] = STATE(1319),
-    [sym_assert_statement] = STATE(1319),
-    [sym_expression_statement] = STATE(1319),
-    [sym_named_expression] = STATE(1009),
-    [sym_return_statement] = STATE(1319),
-    [sym_delete_statement] = STATE(1319),
-    [sym_raise_statement] = STATE(1319),
-    [sym_pass_statement] = STATE(1319),
-    [sym_break_statement] = STATE(1319),
-    [sym_continue_statement] = STATE(1319),
-    [sym_if_statement] = STATE(61),
-    [sym_for_statement] = STATE(61),
-    [sym_while_statement] = STATE(61),
-    [sym_try_statement] = STATE(61),
-    [sym_with_statement] = STATE(61),
-    [sym_match_statement] = STATE(61),
-    [sym_function_definition] = STATE(61),
-    [sym_list_splat] = STATE(1360),
-    [sym_dictionary_splat] = STATE(1360),
-    [sym_global_statement] = STATE(1319),
-    [sym_nonlocal_statement] = STATE(1319),
-    [sym_exec_statement] = STATE(1319),
-    [sym_type_alias_statement] = STATE(1319),
-    [sym_class_definition] = STATE(61),
-    [sym_decorated_definition] = STATE(61),
-    [sym_decorator] = STATE(996),
-    [sym_block] = STATE(549),
-    [sym_expression_list] = STATE(1361),
-    [sym_pattern] = STATE(889),
-    [sym_tuple_pattern] = STATE(875),
-    [sym_list_pattern] = STATE(875),
-    [sym_list_splat_pattern] = STATE(875),
-    [sym_expression] = STATE(1019),
-    [sym_primary_expression] = STATE(684),
-    [sym_not_operator] = STATE(1009),
-    [sym_boolean_operator] = STATE(1009),
-    [sym_binary_operator] = STATE(797),
-    [sym_unary_operator] = STATE(797),
-    [sym_comparison_operator] = STATE(1009),
-    [sym_lambda] = STATE(1009),
-    [sym_assignment] = STATE(1361),
-    [sym_augmented_assignment] = STATE(1361),
-    [sym_pattern_list] = STATE(897),
-    [sym_yield] = STATE(1361),
-    [sym_attribute] = STATE(431),
-    [sym_subscript] = STATE(431),
-    [sym_call] = STATE(797),
-    [sym_list] = STATE(797),
-    [sym_set] = STATE(797),
-    [sym_tuple] = STATE(797),
-    [sym_dictionary] = STATE(797),
-    [sym_list_comprehension] = STATE(797),
-    [sym_dictionary_comprehension] = STATE(797),
-    [sym_set_comprehension] = STATE(797),
-    [sym_generator_expression] = STATE(797),
-    [sym_parenthesized_expression] = STATE(797),
-    [sym_conditional_expression] = STATE(1009),
-    [sym_concatenated_string] = STATE(797),
-    [sym_string] = STATE(713),
-    [sym_await] = STATE(1009),
-    [aux_sym_module_repeat1] = STATE(61),
-    [aux_sym_decorated_definition_repeat1] = STATE(996),
-    [sym_identifier] = ACTIONS(7),
-    [anon_sym_import] = ACTIONS(9),
-    [anon_sym_from] = ACTIONS(11),
-    [anon_sym_LPAREN] = ACTIONS(13),
-    [anon_sym_STAR] = ACTIONS(15),
-    [anon_sym_print] = ACTIONS(17),
-    [anon_sym_assert] = ACTIONS(19),
-    [anon_sym_return] = ACTIONS(21),
-    [anon_sym_del] = ACTIONS(23),
-    [anon_sym_raise] = ACTIONS(25),
-    [anon_sym_pass] = ACTIONS(27),
-    [anon_sym_break] = ACTIONS(29),
-    [anon_sym_continue] = ACTIONS(31),
-    [anon_sym_if] = ACTIONS(83),
-    [anon_sym_async] = ACTIONS(85),
-    [anon_sym_for] = ACTIONS(87),
-    [anon_sym_while] = ACTIONS(89),
-    [anon_sym_try] = ACTIONS(91),
-    [anon_sym_with] = ACTIONS(93),
-    [anon_sym_match] = ACTIONS(95),
-    [anon_sym_DASH] = ACTIONS(47),
-    [anon_sym_PLUS] = ACTIONS(47),
-    [anon_sym_LBRACK] = ACTIONS(49),
-    [anon_sym_LBRACE] = ACTIONS(51),
-    [anon_sym_STAR_STAR] = ACTIONS(53),
-    [anon_sym_def] = ACTIONS(97),
-    [anon_sym_global] = ACTIONS(57),
-    [anon_sym_nonlocal] = ACTIONS(59),
-    [anon_sym_exec] = ACTIONS(61),
-    [anon_sym_type] = ACTIONS(63),
-    [anon_sym_class] = ACTIONS(99),
-    [anon_sym_AT] = ACTIONS(67),
-    [anon_sym_not] = ACTIONS(69),
-    [anon_sym_TILDE] = ACTIONS(47),
-    [anon_sym_lambda] = ACTIONS(71),
-    [anon_sym_yield] = ACTIONS(73),
-    [sym_ellipsis] = ACTIONS(75),
-    [sym_integer] = ACTIONS(77),
-    [sym_float] = ACTIONS(75),
-    [anon_sym_await] = ACTIONS(79),
-    [sym_true] = ACTIONS(77),
-    [sym_false] = ACTIONS(77),
-    [sym_none] = ACTIONS(77),
-    [sym_comment] = ACTIONS(3),
-    [sym__dedent] = ACTIONS(107),
-    [sym__string_start] = ACTIONS(81),
-  },
-  [30] = {
-    [sym__statement] = STATE(61),
-    [sym__simple_statements] = STATE(61),
-    [sym_import_statement] = STATE(1319),
-    [sym_future_import_statement] = STATE(1319),
-    [sym_import_from_statement] = STATE(1319),
-    [sym_print_statement] = STATE(1319),
-    [sym_assert_statement] = STATE(1319),
-    [sym_expression_statement] = STATE(1319),
-    [sym_named_expression] = STATE(1009),
-    [sym_return_statement] = STATE(1319),
-    [sym_delete_statement] = STATE(1319),
-    [sym_raise_statement] = STATE(1319),
-    [sym_pass_statement] = STATE(1319),
-    [sym_break_statement] = STATE(1319),
-    [sym_continue_statement] = STATE(1319),
-    [sym_if_statement] = STATE(61),
-    [sym_for_statement] = STATE(61),
-    [sym_while_statement] = STATE(61),
-    [sym_try_statement] = STATE(61),
-    [sym_with_statement] = STATE(61),
-    [sym_match_statement] = STATE(61),
-    [sym_function_definition] = STATE(61),
-    [sym_list_splat] = STATE(1360),
-    [sym_dictionary_splat] = STATE(1360),
-    [sym_global_statement] = STATE(1319),
-    [sym_nonlocal_statement] = STATE(1319),
-    [sym_exec_statement] = STATE(1319),
-    [sym_type_alias_statement] = STATE(1319),
-    [sym_class_definition] = STATE(61),
-    [sym_decorated_definition] = STATE(61),
-    [sym_decorator] = STATE(996),
-    [sym_block] = STATE(586),
-    [sym_expression_list] = STATE(1361),
-    [sym_pattern] = STATE(889),
-    [sym_tuple_pattern] = STATE(875),
-    [sym_list_pattern] = STATE(875),
-    [sym_list_splat_pattern] = STATE(875),
-    [sym_expression] = STATE(1019),
-    [sym_primary_expression] = STATE(684),
-    [sym_not_operator] = STATE(1009),
-    [sym_boolean_operator] = STATE(1009),
-    [sym_binary_operator] = STATE(797),
-    [sym_unary_operator] = STATE(797),
-    [sym_comparison_operator] = STATE(1009),
-    [sym_lambda] = STATE(1009),
-    [sym_assignment] = STATE(1361),
-    [sym_augmented_assignment] = STATE(1361),
-    [sym_pattern_list] = STATE(897),
-    [sym_yield] = STATE(1361),
-    [sym_attribute] = STATE(431),
-    [sym_subscript] = STATE(431),
-    [sym_call] = STATE(797),
-    [sym_list] = STATE(797),
-    [sym_set] = STATE(797),
-    [sym_tuple] = STATE(797),
-    [sym_dictionary] = STATE(797),
-    [sym_list_comprehension] = STATE(797),
-    [sym_dictionary_comprehension] = STATE(797),
-    [sym_set_comprehension] = STATE(797),
-    [sym_generator_expression] = STATE(797),
-    [sym_parenthesized_expression] = STATE(797),
-    [sym_conditional_expression] = STATE(1009),
-    [sym_concatenated_string] = STATE(797),
-    [sym_string] = STATE(713),
-    [sym_await] = STATE(1009),
-    [aux_sym_module_repeat1] = STATE(61),
-    [aux_sym_decorated_definition_repeat1] = STATE(996),
-    [sym_identifier] = ACTIONS(7),
-    [anon_sym_import] = ACTIONS(9),
-    [anon_sym_from] = ACTIONS(11),
-    [anon_sym_LPAREN] = ACTIONS(13),
-    [anon_sym_STAR] = ACTIONS(15),
-    [anon_sym_print] = ACTIONS(17),
-    [anon_sym_assert] = ACTIONS(19),
-    [anon_sym_return] = ACTIONS(21),
-    [anon_sym_del] = ACTIONS(23),
-    [anon_sym_raise] = ACTIONS(25),
-    [anon_sym_pass] = ACTIONS(27),
-    [anon_sym_break] = ACTIONS(29),
-    [anon_sym_continue] = ACTIONS(31),
-    [anon_sym_if] = ACTIONS(83),
-    [anon_sym_async] = ACTIONS(85),
-    [anon_sym_for] = ACTIONS(87),
-    [anon_sym_while] = ACTIONS(89),
-    [anon_sym_try] = ACTIONS(91),
-    [anon_sym_with] = ACTIONS(93),
-    [anon_sym_match] = ACTIONS(95),
-    [anon_sym_DASH] = ACTIONS(47),
-    [anon_sym_PLUS] = ACTIONS(47),
-    [anon_sym_LBRACK] = ACTIONS(49),
-    [anon_sym_LBRACE] = ACTIONS(51),
-    [anon_sym_STAR_STAR] = ACTIONS(53),
-    [anon_sym_def] = ACTIONS(97),
-    [anon_sym_global] = ACTIONS(57),
-    [anon_sym_nonlocal] = ACTIONS(59),
-    [anon_sym_exec] = ACTIONS(61),
-    [anon_sym_type] = ACTIONS(63),
-    [anon_sym_class] = ACTIONS(99),
-    [anon_sym_AT] = ACTIONS(67),
-    [anon_sym_not] = ACTIONS(69),
-    [anon_sym_TILDE] = ACTIONS(47),
-    [anon_sym_lambda] = ACTIONS(71),
-    [anon_sym_yield] = ACTIONS(73),
-    [sym_ellipsis] = ACTIONS(75),
-    [sym_integer] = ACTIONS(77),
-    [sym_float] = ACTIONS(75),
-    [anon_sym_await] = ACTIONS(79),
-    [sym_true] = ACTIONS(77),
-    [sym_false] = ACTIONS(77),
-    [sym_none] = ACTIONS(77),
-    [sym_comment] = ACTIONS(3),
-    [sym__dedent] = ACTIONS(107),
-    [sym__string_start] = ACTIONS(81),
-  },
-  [31] = {
     [sym__statement] = STATE(60),
     [sym__simple_statements] = STATE(60),
-    [sym_import_statement] = STATE(1319),
-    [sym_future_import_statement] = STATE(1319),
-    [sym_import_from_statement] = STATE(1319),
-    [sym_print_statement] = STATE(1319),
-    [sym_assert_statement] = STATE(1319),
-    [sym_expression_statement] = STATE(1319),
-    [sym_named_expression] = STATE(1009),
-    [sym_return_statement] = STATE(1319),
-    [sym_delete_statement] = STATE(1319),
-    [sym_raise_statement] = STATE(1319),
-    [sym_pass_statement] = STATE(1319),
-    [sym_break_statement] = STATE(1319),
-    [sym_continue_statement] = STATE(1319),
+    [sym_import_statement] = STATE(1213),
+    [sym_future_import_statement] = STATE(1213),
+    [sym_import_from_statement] = STATE(1213),
+    [sym_print_statement] = STATE(1213),
+    [sym_assert_statement] = STATE(1213),
+    [sym_expression_statement] = STATE(1213),
+    [sym_named_expression] = STATE(985),
+    [sym_return_statement] = STATE(1213),
+    [sym_delete_statement] = STATE(1213),
+    [sym_raise_statement] = STATE(1213),
+    [sym_pass_statement] = STATE(1213),
+    [sym_break_statement] = STATE(1213),
+    [sym_continue_statement] = STATE(1213),
     [sym_if_statement] = STATE(60),
     [sym_for_statement] = STATE(60),
     [sym_while_statement] = STATE(60),
@@ -13850,51 +10770,51 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_with_statement] = STATE(60),
     [sym_match_statement] = STATE(60),
     [sym_function_definition] = STATE(60),
-    [sym_list_splat] = STATE(1360),
-    [sym_dictionary_splat] = STATE(1360),
-    [sym_global_statement] = STATE(1319),
-    [sym_nonlocal_statement] = STATE(1319),
-    [sym_exec_statement] = STATE(1319),
-    [sym_type_alias_statement] = STATE(1319),
+    [sym_list_splat] = STATE(1321),
+    [sym_dictionary_splat] = STATE(1321),
+    [sym_global_statement] = STATE(1213),
+    [sym_nonlocal_statement] = STATE(1213),
+    [sym_exec_statement] = STATE(1213),
+    [sym_type_alias_statement] = STATE(1213),
     [sym_class_definition] = STATE(60),
     [sym_decorated_definition] = STATE(60),
-    [sym_decorator] = STATE(996),
-    [sym_block] = STATE(328),
-    [sym_expression_list] = STATE(1361),
-    [sym_pattern] = STATE(889),
-    [sym_tuple_pattern] = STATE(875),
-    [sym_list_pattern] = STATE(875),
-    [sym_list_splat_pattern] = STATE(875),
-    [sym_expression] = STATE(1019),
-    [sym_primary_expression] = STATE(684),
-    [sym_not_operator] = STATE(1009),
-    [sym_boolean_operator] = STATE(1009),
-    [sym_binary_operator] = STATE(797),
-    [sym_unary_operator] = STATE(797),
-    [sym_comparison_operator] = STATE(1009),
-    [sym_lambda] = STATE(1009),
-    [sym_assignment] = STATE(1361),
-    [sym_augmented_assignment] = STATE(1361),
-    [sym_pattern_list] = STATE(897),
-    [sym_yield] = STATE(1361),
-    [sym_attribute] = STATE(431),
-    [sym_subscript] = STATE(431),
-    [sym_call] = STATE(797),
-    [sym_list] = STATE(797),
-    [sym_set] = STATE(797),
-    [sym_tuple] = STATE(797),
-    [sym_dictionary] = STATE(797),
-    [sym_list_comprehension] = STATE(797),
-    [sym_dictionary_comprehension] = STATE(797),
-    [sym_set_comprehension] = STATE(797),
-    [sym_generator_expression] = STATE(797),
-    [sym_parenthesized_expression] = STATE(797),
-    [sym_conditional_expression] = STATE(1009),
-    [sym_concatenated_string] = STATE(797),
-    [sym_string] = STATE(713),
-    [sym_await] = STATE(1009),
+    [sym_decorator] = STATE(947),
+    [sym_block] = STATE(560),
+    [sym_expression_list] = STATE(1313),
+    [sym_pattern] = STATE(871),
+    [sym_tuple_pattern] = STATE(860),
+    [sym_list_pattern] = STATE(860),
+    [sym_list_splat_pattern] = STATE(860),
+    [sym_expression] = STATE(995),
+    [sym_primary_expression] = STATE(707),
+    [sym_not_operator] = STATE(985),
+    [sym_boolean_operator] = STATE(985),
+    [sym_binary_operator] = STATE(759),
+    [sym_unary_operator] = STATE(759),
+    [sym_comparison_operator] = STATE(985),
+    [sym_lambda] = STATE(985),
+    [sym_assignment] = STATE(1313),
+    [sym_augmented_assignment] = STATE(1313),
+    [sym_pattern_list] = STATE(880),
+    [sym_yield] = STATE(1313),
+    [sym_attribute] = STATE(422),
+    [sym_subscript] = STATE(422),
+    [sym_call] = STATE(759),
+    [sym_list] = STATE(759),
+    [sym_set] = STATE(759),
+    [sym_tuple] = STATE(759),
+    [sym_dictionary] = STATE(759),
+    [sym_list_comprehension] = STATE(759),
+    [sym_dictionary_comprehension] = STATE(759),
+    [sym_set_comprehension] = STATE(759),
+    [sym_generator_expression] = STATE(759),
+    [sym_parenthesized_expression] = STATE(759),
+    [sym_conditional_expression] = STATE(985),
+    [sym_concatenated_string] = STATE(759),
+    [sym_string] = STATE(709),
+    [sym_await] = STATE(759),
     [aux_sym_module_repeat1] = STATE(60),
-    [aux_sym_decorated_definition_repeat1] = STATE(996),
+    [aux_sym_decorated_definition_repeat1] = STATE(947),
     [sym_identifier] = ACTIONS(7),
     [anon_sym_import] = ACTIONS(9),
     [anon_sym_from] = ACTIONS(11),
@@ -13939,140 +10859,25 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_false] = ACTIONS(77),
     [sym_none] = ACTIONS(77),
     [sym_comment] = ACTIONS(3),
-    [sym__dedent] = ACTIONS(109),
+    [sym__dedent] = ACTIONS(101),
     [sym__string_start] = ACTIONS(81),
   },
-  [32] = {
-    [sym__statement] = STATE(66),
-    [sym__simple_statements] = STATE(66),
-    [sym_import_statement] = STATE(1319),
-    [sym_future_import_statement] = STATE(1319),
-    [sym_import_from_statement] = STATE(1319),
-    [sym_print_statement] = STATE(1319),
-    [sym_assert_statement] = STATE(1319),
-    [sym_expression_statement] = STATE(1319),
-    [sym_named_expression] = STATE(1009),
-    [sym_return_statement] = STATE(1319),
-    [sym_delete_statement] = STATE(1319),
-    [sym_raise_statement] = STATE(1319),
-    [sym_pass_statement] = STATE(1319),
-    [sym_break_statement] = STATE(1319),
-    [sym_continue_statement] = STATE(1319),
-    [sym_if_statement] = STATE(66),
-    [sym_for_statement] = STATE(66),
-    [sym_while_statement] = STATE(66),
-    [sym_try_statement] = STATE(66),
-    [sym_with_statement] = STATE(66),
-    [sym_match_statement] = STATE(66),
-    [sym_function_definition] = STATE(66),
-    [sym_list_splat] = STATE(1360),
-    [sym_dictionary_splat] = STATE(1360),
-    [sym_global_statement] = STATE(1319),
-    [sym_nonlocal_statement] = STATE(1319),
-    [sym_exec_statement] = STATE(1319),
-    [sym_type_alias_statement] = STATE(1319),
-    [sym_class_definition] = STATE(66),
-    [sym_decorated_definition] = STATE(66),
-    [sym_decorator] = STATE(996),
-    [sym_block] = STATE(329),
-    [sym_expression_list] = STATE(1361),
-    [sym_pattern] = STATE(889),
-    [sym_tuple_pattern] = STATE(875),
-    [sym_list_pattern] = STATE(875),
-    [sym_list_splat_pattern] = STATE(875),
-    [sym_expression] = STATE(1019),
-    [sym_primary_expression] = STATE(684),
-    [sym_not_operator] = STATE(1009),
-    [sym_boolean_operator] = STATE(1009),
-    [sym_binary_operator] = STATE(797),
-    [sym_unary_operator] = STATE(797),
-    [sym_comparison_operator] = STATE(1009),
-    [sym_lambda] = STATE(1009),
-    [sym_assignment] = STATE(1361),
-    [sym_augmented_assignment] = STATE(1361),
-    [sym_pattern_list] = STATE(897),
-    [sym_yield] = STATE(1361),
-    [sym_attribute] = STATE(431),
-    [sym_subscript] = STATE(431),
-    [sym_call] = STATE(797),
-    [sym_list] = STATE(797),
-    [sym_set] = STATE(797),
-    [sym_tuple] = STATE(797),
-    [sym_dictionary] = STATE(797),
-    [sym_list_comprehension] = STATE(797),
-    [sym_dictionary_comprehension] = STATE(797),
-    [sym_set_comprehension] = STATE(797),
-    [sym_generator_expression] = STATE(797),
-    [sym_parenthesized_expression] = STATE(797),
-    [sym_conditional_expression] = STATE(1009),
-    [sym_concatenated_string] = STATE(797),
-    [sym_string] = STATE(713),
-    [sym_await] = STATE(1009),
-    [aux_sym_module_repeat1] = STATE(66),
-    [aux_sym_decorated_definition_repeat1] = STATE(996),
-    [sym_identifier] = ACTIONS(7),
-    [anon_sym_import] = ACTIONS(9),
-    [anon_sym_from] = ACTIONS(11),
-    [anon_sym_LPAREN] = ACTIONS(13),
-    [anon_sym_STAR] = ACTIONS(15),
-    [anon_sym_print] = ACTIONS(17),
-    [anon_sym_assert] = ACTIONS(19),
-    [anon_sym_return] = ACTIONS(21),
-    [anon_sym_del] = ACTIONS(23),
-    [anon_sym_raise] = ACTIONS(25),
-    [anon_sym_pass] = ACTIONS(27),
-    [anon_sym_break] = ACTIONS(29),
-    [anon_sym_continue] = ACTIONS(31),
-    [anon_sym_if] = ACTIONS(83),
-    [anon_sym_async] = ACTIONS(85),
-    [anon_sym_for] = ACTIONS(87),
-    [anon_sym_while] = ACTIONS(89),
-    [anon_sym_try] = ACTIONS(91),
-    [anon_sym_with] = ACTIONS(93),
-    [anon_sym_match] = ACTIONS(95),
-    [anon_sym_DASH] = ACTIONS(47),
-    [anon_sym_PLUS] = ACTIONS(47),
-    [anon_sym_LBRACK] = ACTIONS(49),
-    [anon_sym_LBRACE] = ACTIONS(51),
-    [anon_sym_STAR_STAR] = ACTIONS(53),
-    [anon_sym_def] = ACTIONS(97),
-    [anon_sym_global] = ACTIONS(57),
-    [anon_sym_nonlocal] = ACTIONS(59),
-    [anon_sym_exec] = ACTIONS(61),
-    [anon_sym_type] = ACTIONS(63),
-    [anon_sym_class] = ACTIONS(99),
-    [anon_sym_AT] = ACTIONS(67),
-    [anon_sym_not] = ACTIONS(69),
-    [anon_sym_TILDE] = ACTIONS(47),
-    [anon_sym_lambda] = ACTIONS(71),
-    [anon_sym_yield] = ACTIONS(73),
-    [sym_ellipsis] = ACTIONS(75),
-    [sym_integer] = ACTIONS(77),
-    [sym_float] = ACTIONS(75),
-    [anon_sym_await] = ACTIONS(79),
-    [sym_true] = ACTIONS(77),
-    [sym_false] = ACTIONS(77),
-    [sym_none] = ACTIONS(77),
-    [sym_comment] = ACTIONS(3),
-    [sym__dedent] = ACTIONS(111),
-    [sym__string_start] = ACTIONS(81),
-  },
-  [33] = {
+  [28] = {
     [sym__statement] = STATE(61),
     [sym__simple_statements] = STATE(61),
-    [sym_import_statement] = STATE(1319),
-    [sym_future_import_statement] = STATE(1319),
-    [sym_import_from_statement] = STATE(1319),
-    [sym_print_statement] = STATE(1319),
-    [sym_assert_statement] = STATE(1319),
-    [sym_expression_statement] = STATE(1319),
-    [sym_named_expression] = STATE(1009),
-    [sym_return_statement] = STATE(1319),
-    [sym_delete_statement] = STATE(1319),
-    [sym_raise_statement] = STATE(1319),
-    [sym_pass_statement] = STATE(1319),
-    [sym_break_statement] = STATE(1319),
-    [sym_continue_statement] = STATE(1319),
+    [sym_import_statement] = STATE(1213),
+    [sym_future_import_statement] = STATE(1213),
+    [sym_import_from_statement] = STATE(1213),
+    [sym_print_statement] = STATE(1213),
+    [sym_assert_statement] = STATE(1213),
+    [sym_expression_statement] = STATE(1213),
+    [sym_named_expression] = STATE(985),
+    [sym_return_statement] = STATE(1213),
+    [sym_delete_statement] = STATE(1213),
+    [sym_raise_statement] = STATE(1213),
+    [sym_pass_statement] = STATE(1213),
+    [sym_break_statement] = STATE(1213),
+    [sym_continue_statement] = STATE(1213),
     [sym_if_statement] = STATE(61),
     [sym_for_statement] = STATE(61),
     [sym_while_statement] = STATE(61),
@@ -14080,51 +10885,51 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_with_statement] = STATE(61),
     [sym_match_statement] = STATE(61),
     [sym_function_definition] = STATE(61),
-    [sym_list_splat] = STATE(1360),
-    [sym_dictionary_splat] = STATE(1360),
-    [sym_global_statement] = STATE(1319),
-    [sym_nonlocal_statement] = STATE(1319),
-    [sym_exec_statement] = STATE(1319),
-    [sym_type_alias_statement] = STATE(1319),
+    [sym_list_splat] = STATE(1321),
+    [sym_dictionary_splat] = STATE(1321),
+    [sym_global_statement] = STATE(1213),
+    [sym_nonlocal_statement] = STATE(1213),
+    [sym_exec_statement] = STATE(1213),
+    [sym_type_alias_statement] = STATE(1213),
     [sym_class_definition] = STATE(61),
     [sym_decorated_definition] = STATE(61),
-    [sym_decorator] = STATE(996),
-    [sym_block] = STATE(583),
-    [sym_expression_list] = STATE(1361),
-    [sym_pattern] = STATE(889),
-    [sym_tuple_pattern] = STATE(875),
-    [sym_list_pattern] = STATE(875),
-    [sym_list_splat_pattern] = STATE(875),
-    [sym_expression] = STATE(1019),
-    [sym_primary_expression] = STATE(684),
-    [sym_not_operator] = STATE(1009),
-    [sym_boolean_operator] = STATE(1009),
-    [sym_binary_operator] = STATE(797),
-    [sym_unary_operator] = STATE(797),
-    [sym_comparison_operator] = STATE(1009),
-    [sym_lambda] = STATE(1009),
-    [sym_assignment] = STATE(1361),
-    [sym_augmented_assignment] = STATE(1361),
-    [sym_pattern_list] = STATE(897),
-    [sym_yield] = STATE(1361),
-    [sym_attribute] = STATE(431),
-    [sym_subscript] = STATE(431),
-    [sym_call] = STATE(797),
-    [sym_list] = STATE(797),
-    [sym_set] = STATE(797),
-    [sym_tuple] = STATE(797),
-    [sym_dictionary] = STATE(797),
-    [sym_list_comprehension] = STATE(797),
-    [sym_dictionary_comprehension] = STATE(797),
-    [sym_set_comprehension] = STATE(797),
-    [sym_generator_expression] = STATE(797),
-    [sym_parenthesized_expression] = STATE(797),
-    [sym_conditional_expression] = STATE(1009),
-    [sym_concatenated_string] = STATE(797),
-    [sym_string] = STATE(713),
-    [sym_await] = STATE(1009),
+    [sym_decorator] = STATE(947),
+    [sym_block] = STATE(544),
+    [sym_expression_list] = STATE(1313),
+    [sym_pattern] = STATE(871),
+    [sym_tuple_pattern] = STATE(860),
+    [sym_list_pattern] = STATE(860),
+    [sym_list_splat_pattern] = STATE(860),
+    [sym_expression] = STATE(995),
+    [sym_primary_expression] = STATE(707),
+    [sym_not_operator] = STATE(985),
+    [sym_boolean_operator] = STATE(985),
+    [sym_binary_operator] = STATE(759),
+    [sym_unary_operator] = STATE(759),
+    [sym_comparison_operator] = STATE(985),
+    [sym_lambda] = STATE(985),
+    [sym_assignment] = STATE(1313),
+    [sym_augmented_assignment] = STATE(1313),
+    [sym_pattern_list] = STATE(880),
+    [sym_yield] = STATE(1313),
+    [sym_attribute] = STATE(422),
+    [sym_subscript] = STATE(422),
+    [sym_call] = STATE(759),
+    [sym_list] = STATE(759),
+    [sym_set] = STATE(759),
+    [sym_tuple] = STATE(759),
+    [sym_dictionary] = STATE(759),
+    [sym_list_comprehension] = STATE(759),
+    [sym_dictionary_comprehension] = STATE(759),
+    [sym_set_comprehension] = STATE(759),
+    [sym_generator_expression] = STATE(759),
+    [sym_parenthesized_expression] = STATE(759),
+    [sym_conditional_expression] = STATE(985),
+    [sym_concatenated_string] = STATE(759),
+    [sym_string] = STATE(709),
+    [sym_await] = STATE(759),
     [aux_sym_module_repeat1] = STATE(61),
-    [aux_sym_decorated_definition_repeat1] = STATE(996),
+    [aux_sym_decorated_definition_repeat1] = STATE(947),
     [sym_identifier] = ACTIONS(7),
     [anon_sym_import] = ACTIONS(9),
     [anon_sym_from] = ACTIONS(11),
@@ -14169,77 +10974,652 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_false] = ACTIONS(77),
     [sym_none] = ACTIONS(77),
     [sym_comment] = ACTIONS(3),
-    [sym__dedent] = ACTIONS(107),
+    [sym__dedent] = ACTIONS(103),
+    [sym__string_start] = ACTIONS(81),
+  },
+  [29] = {
+    [sym__statement] = STATE(60),
+    [sym__simple_statements] = STATE(60),
+    [sym_import_statement] = STATE(1213),
+    [sym_future_import_statement] = STATE(1213),
+    [sym_import_from_statement] = STATE(1213),
+    [sym_print_statement] = STATE(1213),
+    [sym_assert_statement] = STATE(1213),
+    [sym_expression_statement] = STATE(1213),
+    [sym_named_expression] = STATE(985),
+    [sym_return_statement] = STATE(1213),
+    [sym_delete_statement] = STATE(1213),
+    [sym_raise_statement] = STATE(1213),
+    [sym_pass_statement] = STATE(1213),
+    [sym_break_statement] = STATE(1213),
+    [sym_continue_statement] = STATE(1213),
+    [sym_if_statement] = STATE(60),
+    [sym_for_statement] = STATE(60),
+    [sym_while_statement] = STATE(60),
+    [sym_try_statement] = STATE(60),
+    [sym_with_statement] = STATE(60),
+    [sym_match_statement] = STATE(60),
+    [sym_function_definition] = STATE(60),
+    [sym_list_splat] = STATE(1321),
+    [sym_dictionary_splat] = STATE(1321),
+    [sym_global_statement] = STATE(1213),
+    [sym_nonlocal_statement] = STATE(1213),
+    [sym_exec_statement] = STATE(1213),
+    [sym_type_alias_statement] = STATE(1213),
+    [sym_class_definition] = STATE(60),
+    [sym_decorated_definition] = STATE(60),
+    [sym_decorator] = STATE(947),
+    [sym_block] = STATE(355),
+    [sym_expression_list] = STATE(1313),
+    [sym_pattern] = STATE(871),
+    [sym_tuple_pattern] = STATE(860),
+    [sym_list_pattern] = STATE(860),
+    [sym_list_splat_pattern] = STATE(860),
+    [sym_expression] = STATE(995),
+    [sym_primary_expression] = STATE(707),
+    [sym_not_operator] = STATE(985),
+    [sym_boolean_operator] = STATE(985),
+    [sym_binary_operator] = STATE(759),
+    [sym_unary_operator] = STATE(759),
+    [sym_comparison_operator] = STATE(985),
+    [sym_lambda] = STATE(985),
+    [sym_assignment] = STATE(1313),
+    [sym_augmented_assignment] = STATE(1313),
+    [sym_pattern_list] = STATE(880),
+    [sym_yield] = STATE(1313),
+    [sym_attribute] = STATE(422),
+    [sym_subscript] = STATE(422),
+    [sym_call] = STATE(759),
+    [sym_list] = STATE(759),
+    [sym_set] = STATE(759),
+    [sym_tuple] = STATE(759),
+    [sym_dictionary] = STATE(759),
+    [sym_list_comprehension] = STATE(759),
+    [sym_dictionary_comprehension] = STATE(759),
+    [sym_set_comprehension] = STATE(759),
+    [sym_generator_expression] = STATE(759),
+    [sym_parenthesized_expression] = STATE(759),
+    [sym_conditional_expression] = STATE(985),
+    [sym_concatenated_string] = STATE(759),
+    [sym_string] = STATE(709),
+    [sym_await] = STATE(759),
+    [aux_sym_module_repeat1] = STATE(60),
+    [aux_sym_decorated_definition_repeat1] = STATE(947),
+    [sym_identifier] = ACTIONS(7),
+    [anon_sym_import] = ACTIONS(9),
+    [anon_sym_from] = ACTIONS(11),
+    [anon_sym_LPAREN] = ACTIONS(13),
+    [anon_sym_STAR] = ACTIONS(15),
+    [anon_sym_print] = ACTIONS(17),
+    [anon_sym_assert] = ACTIONS(19),
+    [anon_sym_return] = ACTIONS(21),
+    [anon_sym_del] = ACTIONS(23),
+    [anon_sym_raise] = ACTIONS(25),
+    [anon_sym_pass] = ACTIONS(27),
+    [anon_sym_break] = ACTIONS(29),
+    [anon_sym_continue] = ACTIONS(31),
+    [anon_sym_if] = ACTIONS(83),
+    [anon_sym_async] = ACTIONS(85),
+    [anon_sym_for] = ACTIONS(87),
+    [anon_sym_while] = ACTIONS(89),
+    [anon_sym_try] = ACTIONS(91),
+    [anon_sym_with] = ACTIONS(93),
+    [anon_sym_match] = ACTIONS(95),
+    [anon_sym_DASH] = ACTIONS(47),
+    [anon_sym_PLUS] = ACTIONS(47),
+    [anon_sym_LBRACK] = ACTIONS(49),
+    [anon_sym_LBRACE] = ACTIONS(51),
+    [anon_sym_STAR_STAR] = ACTIONS(53),
+    [anon_sym_def] = ACTIONS(97),
+    [anon_sym_global] = ACTIONS(57),
+    [anon_sym_nonlocal] = ACTIONS(59),
+    [anon_sym_exec] = ACTIONS(61),
+    [anon_sym_type] = ACTIONS(63),
+    [anon_sym_class] = ACTIONS(99),
+    [anon_sym_AT] = ACTIONS(67),
+    [anon_sym_not] = ACTIONS(69),
+    [anon_sym_TILDE] = ACTIONS(47),
+    [anon_sym_lambda] = ACTIONS(71),
+    [anon_sym_yield] = ACTIONS(73),
+    [sym_ellipsis] = ACTIONS(75),
+    [sym_integer] = ACTIONS(77),
+    [sym_float] = ACTIONS(75),
+    [anon_sym_await] = ACTIONS(79),
+    [sym_true] = ACTIONS(77),
+    [sym_false] = ACTIONS(77),
+    [sym_none] = ACTIONS(77),
+    [sym_comment] = ACTIONS(3),
+    [sym__dedent] = ACTIONS(101),
+    [sym__string_start] = ACTIONS(81),
+  },
+  [30] = {
+    [sym__statement] = STATE(60),
+    [sym__simple_statements] = STATE(60),
+    [sym_import_statement] = STATE(1213),
+    [sym_future_import_statement] = STATE(1213),
+    [sym_import_from_statement] = STATE(1213),
+    [sym_print_statement] = STATE(1213),
+    [sym_assert_statement] = STATE(1213),
+    [sym_expression_statement] = STATE(1213),
+    [sym_named_expression] = STATE(985),
+    [sym_return_statement] = STATE(1213),
+    [sym_delete_statement] = STATE(1213),
+    [sym_raise_statement] = STATE(1213),
+    [sym_pass_statement] = STATE(1213),
+    [sym_break_statement] = STATE(1213),
+    [sym_continue_statement] = STATE(1213),
+    [sym_if_statement] = STATE(60),
+    [sym_for_statement] = STATE(60),
+    [sym_while_statement] = STATE(60),
+    [sym_try_statement] = STATE(60),
+    [sym_with_statement] = STATE(60),
+    [sym_match_statement] = STATE(60),
+    [sym_function_definition] = STATE(60),
+    [sym_list_splat] = STATE(1321),
+    [sym_dictionary_splat] = STATE(1321),
+    [sym_global_statement] = STATE(1213),
+    [sym_nonlocal_statement] = STATE(1213),
+    [sym_exec_statement] = STATE(1213),
+    [sym_type_alias_statement] = STATE(1213),
+    [sym_class_definition] = STATE(60),
+    [sym_decorated_definition] = STATE(60),
+    [sym_decorator] = STATE(947),
+    [sym_block] = STATE(444),
+    [sym_expression_list] = STATE(1313),
+    [sym_pattern] = STATE(871),
+    [sym_tuple_pattern] = STATE(860),
+    [sym_list_pattern] = STATE(860),
+    [sym_list_splat_pattern] = STATE(860),
+    [sym_expression] = STATE(995),
+    [sym_primary_expression] = STATE(707),
+    [sym_not_operator] = STATE(985),
+    [sym_boolean_operator] = STATE(985),
+    [sym_binary_operator] = STATE(759),
+    [sym_unary_operator] = STATE(759),
+    [sym_comparison_operator] = STATE(985),
+    [sym_lambda] = STATE(985),
+    [sym_assignment] = STATE(1313),
+    [sym_augmented_assignment] = STATE(1313),
+    [sym_pattern_list] = STATE(880),
+    [sym_yield] = STATE(1313),
+    [sym_attribute] = STATE(422),
+    [sym_subscript] = STATE(422),
+    [sym_call] = STATE(759),
+    [sym_list] = STATE(759),
+    [sym_set] = STATE(759),
+    [sym_tuple] = STATE(759),
+    [sym_dictionary] = STATE(759),
+    [sym_list_comprehension] = STATE(759),
+    [sym_dictionary_comprehension] = STATE(759),
+    [sym_set_comprehension] = STATE(759),
+    [sym_generator_expression] = STATE(759),
+    [sym_parenthesized_expression] = STATE(759),
+    [sym_conditional_expression] = STATE(985),
+    [sym_concatenated_string] = STATE(759),
+    [sym_string] = STATE(709),
+    [sym_await] = STATE(759),
+    [aux_sym_module_repeat1] = STATE(60),
+    [aux_sym_decorated_definition_repeat1] = STATE(947),
+    [sym_identifier] = ACTIONS(7),
+    [anon_sym_import] = ACTIONS(9),
+    [anon_sym_from] = ACTIONS(11),
+    [anon_sym_LPAREN] = ACTIONS(13),
+    [anon_sym_STAR] = ACTIONS(15),
+    [anon_sym_print] = ACTIONS(17),
+    [anon_sym_assert] = ACTIONS(19),
+    [anon_sym_return] = ACTIONS(21),
+    [anon_sym_del] = ACTIONS(23),
+    [anon_sym_raise] = ACTIONS(25),
+    [anon_sym_pass] = ACTIONS(27),
+    [anon_sym_break] = ACTIONS(29),
+    [anon_sym_continue] = ACTIONS(31),
+    [anon_sym_if] = ACTIONS(83),
+    [anon_sym_async] = ACTIONS(85),
+    [anon_sym_for] = ACTIONS(87),
+    [anon_sym_while] = ACTIONS(89),
+    [anon_sym_try] = ACTIONS(91),
+    [anon_sym_with] = ACTIONS(93),
+    [anon_sym_match] = ACTIONS(95),
+    [anon_sym_DASH] = ACTIONS(47),
+    [anon_sym_PLUS] = ACTIONS(47),
+    [anon_sym_LBRACK] = ACTIONS(49),
+    [anon_sym_LBRACE] = ACTIONS(51),
+    [anon_sym_STAR_STAR] = ACTIONS(53),
+    [anon_sym_def] = ACTIONS(97),
+    [anon_sym_global] = ACTIONS(57),
+    [anon_sym_nonlocal] = ACTIONS(59),
+    [anon_sym_exec] = ACTIONS(61),
+    [anon_sym_type] = ACTIONS(63),
+    [anon_sym_class] = ACTIONS(99),
+    [anon_sym_AT] = ACTIONS(67),
+    [anon_sym_not] = ACTIONS(69),
+    [anon_sym_TILDE] = ACTIONS(47),
+    [anon_sym_lambda] = ACTIONS(71),
+    [anon_sym_yield] = ACTIONS(73),
+    [sym_ellipsis] = ACTIONS(75),
+    [sym_integer] = ACTIONS(77),
+    [sym_float] = ACTIONS(75),
+    [anon_sym_await] = ACTIONS(79),
+    [sym_true] = ACTIONS(77),
+    [sym_false] = ACTIONS(77),
+    [sym_none] = ACTIONS(77),
+    [sym_comment] = ACTIONS(3),
+    [sym__dedent] = ACTIONS(101),
+    [sym__string_start] = ACTIONS(81),
+  },
+  [31] = {
+    [sym__statement] = STATE(60),
+    [sym__simple_statements] = STATE(60),
+    [sym_import_statement] = STATE(1213),
+    [sym_future_import_statement] = STATE(1213),
+    [sym_import_from_statement] = STATE(1213),
+    [sym_print_statement] = STATE(1213),
+    [sym_assert_statement] = STATE(1213),
+    [sym_expression_statement] = STATE(1213),
+    [sym_named_expression] = STATE(985),
+    [sym_return_statement] = STATE(1213),
+    [sym_delete_statement] = STATE(1213),
+    [sym_raise_statement] = STATE(1213),
+    [sym_pass_statement] = STATE(1213),
+    [sym_break_statement] = STATE(1213),
+    [sym_continue_statement] = STATE(1213),
+    [sym_if_statement] = STATE(60),
+    [sym_for_statement] = STATE(60),
+    [sym_while_statement] = STATE(60),
+    [sym_try_statement] = STATE(60),
+    [sym_with_statement] = STATE(60),
+    [sym_match_statement] = STATE(60),
+    [sym_function_definition] = STATE(60),
+    [sym_list_splat] = STATE(1321),
+    [sym_dictionary_splat] = STATE(1321),
+    [sym_global_statement] = STATE(1213),
+    [sym_nonlocal_statement] = STATE(1213),
+    [sym_exec_statement] = STATE(1213),
+    [sym_type_alias_statement] = STATE(1213),
+    [sym_class_definition] = STATE(60),
+    [sym_decorated_definition] = STATE(60),
+    [sym_decorator] = STATE(947),
+    [sym_block] = STATE(479),
+    [sym_expression_list] = STATE(1313),
+    [sym_pattern] = STATE(871),
+    [sym_tuple_pattern] = STATE(860),
+    [sym_list_pattern] = STATE(860),
+    [sym_list_splat_pattern] = STATE(860),
+    [sym_expression] = STATE(995),
+    [sym_primary_expression] = STATE(707),
+    [sym_not_operator] = STATE(985),
+    [sym_boolean_operator] = STATE(985),
+    [sym_binary_operator] = STATE(759),
+    [sym_unary_operator] = STATE(759),
+    [sym_comparison_operator] = STATE(985),
+    [sym_lambda] = STATE(985),
+    [sym_assignment] = STATE(1313),
+    [sym_augmented_assignment] = STATE(1313),
+    [sym_pattern_list] = STATE(880),
+    [sym_yield] = STATE(1313),
+    [sym_attribute] = STATE(422),
+    [sym_subscript] = STATE(422),
+    [sym_call] = STATE(759),
+    [sym_list] = STATE(759),
+    [sym_set] = STATE(759),
+    [sym_tuple] = STATE(759),
+    [sym_dictionary] = STATE(759),
+    [sym_list_comprehension] = STATE(759),
+    [sym_dictionary_comprehension] = STATE(759),
+    [sym_set_comprehension] = STATE(759),
+    [sym_generator_expression] = STATE(759),
+    [sym_parenthesized_expression] = STATE(759),
+    [sym_conditional_expression] = STATE(985),
+    [sym_concatenated_string] = STATE(759),
+    [sym_string] = STATE(709),
+    [sym_await] = STATE(759),
+    [aux_sym_module_repeat1] = STATE(60),
+    [aux_sym_decorated_definition_repeat1] = STATE(947),
+    [sym_identifier] = ACTIONS(7),
+    [anon_sym_import] = ACTIONS(9),
+    [anon_sym_from] = ACTIONS(11),
+    [anon_sym_LPAREN] = ACTIONS(13),
+    [anon_sym_STAR] = ACTIONS(15),
+    [anon_sym_print] = ACTIONS(17),
+    [anon_sym_assert] = ACTIONS(19),
+    [anon_sym_return] = ACTIONS(21),
+    [anon_sym_del] = ACTIONS(23),
+    [anon_sym_raise] = ACTIONS(25),
+    [anon_sym_pass] = ACTIONS(27),
+    [anon_sym_break] = ACTIONS(29),
+    [anon_sym_continue] = ACTIONS(31),
+    [anon_sym_if] = ACTIONS(83),
+    [anon_sym_async] = ACTIONS(85),
+    [anon_sym_for] = ACTIONS(87),
+    [anon_sym_while] = ACTIONS(89),
+    [anon_sym_try] = ACTIONS(91),
+    [anon_sym_with] = ACTIONS(93),
+    [anon_sym_match] = ACTIONS(95),
+    [anon_sym_DASH] = ACTIONS(47),
+    [anon_sym_PLUS] = ACTIONS(47),
+    [anon_sym_LBRACK] = ACTIONS(49),
+    [anon_sym_LBRACE] = ACTIONS(51),
+    [anon_sym_STAR_STAR] = ACTIONS(53),
+    [anon_sym_def] = ACTIONS(97),
+    [anon_sym_global] = ACTIONS(57),
+    [anon_sym_nonlocal] = ACTIONS(59),
+    [anon_sym_exec] = ACTIONS(61),
+    [anon_sym_type] = ACTIONS(63),
+    [anon_sym_class] = ACTIONS(99),
+    [anon_sym_AT] = ACTIONS(67),
+    [anon_sym_not] = ACTIONS(69),
+    [anon_sym_TILDE] = ACTIONS(47),
+    [anon_sym_lambda] = ACTIONS(71),
+    [anon_sym_yield] = ACTIONS(73),
+    [sym_ellipsis] = ACTIONS(75),
+    [sym_integer] = ACTIONS(77),
+    [sym_float] = ACTIONS(75),
+    [anon_sym_await] = ACTIONS(79),
+    [sym_true] = ACTIONS(77),
+    [sym_false] = ACTIONS(77),
+    [sym_none] = ACTIONS(77),
+    [sym_comment] = ACTIONS(3),
+    [sym__dedent] = ACTIONS(101),
+    [sym__string_start] = ACTIONS(81),
+  },
+  [32] = {
+    [sym__statement] = STATE(60),
+    [sym__simple_statements] = STATE(60),
+    [sym_import_statement] = STATE(1213),
+    [sym_future_import_statement] = STATE(1213),
+    [sym_import_from_statement] = STATE(1213),
+    [sym_print_statement] = STATE(1213),
+    [sym_assert_statement] = STATE(1213),
+    [sym_expression_statement] = STATE(1213),
+    [sym_named_expression] = STATE(985),
+    [sym_return_statement] = STATE(1213),
+    [sym_delete_statement] = STATE(1213),
+    [sym_raise_statement] = STATE(1213),
+    [sym_pass_statement] = STATE(1213),
+    [sym_break_statement] = STATE(1213),
+    [sym_continue_statement] = STATE(1213),
+    [sym_if_statement] = STATE(60),
+    [sym_for_statement] = STATE(60),
+    [sym_while_statement] = STATE(60),
+    [sym_try_statement] = STATE(60),
+    [sym_with_statement] = STATE(60),
+    [sym_match_statement] = STATE(60),
+    [sym_function_definition] = STATE(60),
+    [sym_list_splat] = STATE(1321),
+    [sym_dictionary_splat] = STATE(1321),
+    [sym_global_statement] = STATE(1213),
+    [sym_nonlocal_statement] = STATE(1213),
+    [sym_exec_statement] = STATE(1213),
+    [sym_type_alias_statement] = STATE(1213),
+    [sym_class_definition] = STATE(60),
+    [sym_decorated_definition] = STATE(60),
+    [sym_decorator] = STATE(947),
+    [sym_block] = STATE(509),
+    [sym_expression_list] = STATE(1313),
+    [sym_pattern] = STATE(871),
+    [sym_tuple_pattern] = STATE(860),
+    [sym_list_pattern] = STATE(860),
+    [sym_list_splat_pattern] = STATE(860),
+    [sym_expression] = STATE(995),
+    [sym_primary_expression] = STATE(707),
+    [sym_not_operator] = STATE(985),
+    [sym_boolean_operator] = STATE(985),
+    [sym_binary_operator] = STATE(759),
+    [sym_unary_operator] = STATE(759),
+    [sym_comparison_operator] = STATE(985),
+    [sym_lambda] = STATE(985),
+    [sym_assignment] = STATE(1313),
+    [sym_augmented_assignment] = STATE(1313),
+    [sym_pattern_list] = STATE(880),
+    [sym_yield] = STATE(1313),
+    [sym_attribute] = STATE(422),
+    [sym_subscript] = STATE(422),
+    [sym_call] = STATE(759),
+    [sym_list] = STATE(759),
+    [sym_set] = STATE(759),
+    [sym_tuple] = STATE(759),
+    [sym_dictionary] = STATE(759),
+    [sym_list_comprehension] = STATE(759),
+    [sym_dictionary_comprehension] = STATE(759),
+    [sym_set_comprehension] = STATE(759),
+    [sym_generator_expression] = STATE(759),
+    [sym_parenthesized_expression] = STATE(759),
+    [sym_conditional_expression] = STATE(985),
+    [sym_concatenated_string] = STATE(759),
+    [sym_string] = STATE(709),
+    [sym_await] = STATE(759),
+    [aux_sym_module_repeat1] = STATE(60),
+    [aux_sym_decorated_definition_repeat1] = STATE(947),
+    [sym_identifier] = ACTIONS(7),
+    [anon_sym_import] = ACTIONS(9),
+    [anon_sym_from] = ACTIONS(11),
+    [anon_sym_LPAREN] = ACTIONS(13),
+    [anon_sym_STAR] = ACTIONS(15),
+    [anon_sym_print] = ACTIONS(17),
+    [anon_sym_assert] = ACTIONS(19),
+    [anon_sym_return] = ACTIONS(21),
+    [anon_sym_del] = ACTIONS(23),
+    [anon_sym_raise] = ACTIONS(25),
+    [anon_sym_pass] = ACTIONS(27),
+    [anon_sym_break] = ACTIONS(29),
+    [anon_sym_continue] = ACTIONS(31),
+    [anon_sym_if] = ACTIONS(83),
+    [anon_sym_async] = ACTIONS(85),
+    [anon_sym_for] = ACTIONS(87),
+    [anon_sym_while] = ACTIONS(89),
+    [anon_sym_try] = ACTIONS(91),
+    [anon_sym_with] = ACTIONS(93),
+    [anon_sym_match] = ACTIONS(95),
+    [anon_sym_DASH] = ACTIONS(47),
+    [anon_sym_PLUS] = ACTIONS(47),
+    [anon_sym_LBRACK] = ACTIONS(49),
+    [anon_sym_LBRACE] = ACTIONS(51),
+    [anon_sym_STAR_STAR] = ACTIONS(53),
+    [anon_sym_def] = ACTIONS(97),
+    [anon_sym_global] = ACTIONS(57),
+    [anon_sym_nonlocal] = ACTIONS(59),
+    [anon_sym_exec] = ACTIONS(61),
+    [anon_sym_type] = ACTIONS(63),
+    [anon_sym_class] = ACTIONS(99),
+    [anon_sym_AT] = ACTIONS(67),
+    [anon_sym_not] = ACTIONS(69),
+    [anon_sym_TILDE] = ACTIONS(47),
+    [anon_sym_lambda] = ACTIONS(71),
+    [anon_sym_yield] = ACTIONS(73),
+    [sym_ellipsis] = ACTIONS(75),
+    [sym_integer] = ACTIONS(77),
+    [sym_float] = ACTIONS(75),
+    [anon_sym_await] = ACTIONS(79),
+    [sym_true] = ACTIONS(77),
+    [sym_false] = ACTIONS(77),
+    [sym_none] = ACTIONS(77),
+    [sym_comment] = ACTIONS(3),
+    [sym__dedent] = ACTIONS(101),
+    [sym__string_start] = ACTIONS(81),
+  },
+  [33] = {
+    [sym__statement] = STATE(61),
+    [sym__simple_statements] = STATE(61),
+    [sym_import_statement] = STATE(1213),
+    [sym_future_import_statement] = STATE(1213),
+    [sym_import_from_statement] = STATE(1213),
+    [sym_print_statement] = STATE(1213),
+    [sym_assert_statement] = STATE(1213),
+    [sym_expression_statement] = STATE(1213),
+    [sym_named_expression] = STATE(985),
+    [sym_return_statement] = STATE(1213),
+    [sym_delete_statement] = STATE(1213),
+    [sym_raise_statement] = STATE(1213),
+    [sym_pass_statement] = STATE(1213),
+    [sym_break_statement] = STATE(1213),
+    [sym_continue_statement] = STATE(1213),
+    [sym_if_statement] = STATE(61),
+    [sym_for_statement] = STATE(61),
+    [sym_while_statement] = STATE(61),
+    [sym_try_statement] = STATE(61),
+    [sym_with_statement] = STATE(61),
+    [sym_match_statement] = STATE(61),
+    [sym_function_definition] = STATE(61),
+    [sym_list_splat] = STATE(1321),
+    [sym_dictionary_splat] = STATE(1321),
+    [sym_global_statement] = STATE(1213),
+    [sym_nonlocal_statement] = STATE(1213),
+    [sym_exec_statement] = STATE(1213),
+    [sym_type_alias_statement] = STATE(1213),
+    [sym_class_definition] = STATE(61),
+    [sym_decorated_definition] = STATE(61),
+    [sym_decorator] = STATE(947),
+    [sym_block] = STATE(343),
+    [sym_expression_list] = STATE(1313),
+    [sym_pattern] = STATE(871),
+    [sym_tuple_pattern] = STATE(860),
+    [sym_list_pattern] = STATE(860),
+    [sym_list_splat_pattern] = STATE(860),
+    [sym_expression] = STATE(995),
+    [sym_primary_expression] = STATE(707),
+    [sym_not_operator] = STATE(985),
+    [sym_boolean_operator] = STATE(985),
+    [sym_binary_operator] = STATE(759),
+    [sym_unary_operator] = STATE(759),
+    [sym_comparison_operator] = STATE(985),
+    [sym_lambda] = STATE(985),
+    [sym_assignment] = STATE(1313),
+    [sym_augmented_assignment] = STATE(1313),
+    [sym_pattern_list] = STATE(880),
+    [sym_yield] = STATE(1313),
+    [sym_attribute] = STATE(422),
+    [sym_subscript] = STATE(422),
+    [sym_call] = STATE(759),
+    [sym_list] = STATE(759),
+    [sym_set] = STATE(759),
+    [sym_tuple] = STATE(759),
+    [sym_dictionary] = STATE(759),
+    [sym_list_comprehension] = STATE(759),
+    [sym_dictionary_comprehension] = STATE(759),
+    [sym_set_comprehension] = STATE(759),
+    [sym_generator_expression] = STATE(759),
+    [sym_parenthesized_expression] = STATE(759),
+    [sym_conditional_expression] = STATE(985),
+    [sym_concatenated_string] = STATE(759),
+    [sym_string] = STATE(709),
+    [sym_await] = STATE(759),
+    [aux_sym_module_repeat1] = STATE(61),
+    [aux_sym_decorated_definition_repeat1] = STATE(947),
+    [sym_identifier] = ACTIONS(7),
+    [anon_sym_import] = ACTIONS(9),
+    [anon_sym_from] = ACTIONS(11),
+    [anon_sym_LPAREN] = ACTIONS(13),
+    [anon_sym_STAR] = ACTIONS(15),
+    [anon_sym_print] = ACTIONS(17),
+    [anon_sym_assert] = ACTIONS(19),
+    [anon_sym_return] = ACTIONS(21),
+    [anon_sym_del] = ACTIONS(23),
+    [anon_sym_raise] = ACTIONS(25),
+    [anon_sym_pass] = ACTIONS(27),
+    [anon_sym_break] = ACTIONS(29),
+    [anon_sym_continue] = ACTIONS(31),
+    [anon_sym_if] = ACTIONS(83),
+    [anon_sym_async] = ACTIONS(85),
+    [anon_sym_for] = ACTIONS(87),
+    [anon_sym_while] = ACTIONS(89),
+    [anon_sym_try] = ACTIONS(91),
+    [anon_sym_with] = ACTIONS(93),
+    [anon_sym_match] = ACTIONS(95),
+    [anon_sym_DASH] = ACTIONS(47),
+    [anon_sym_PLUS] = ACTIONS(47),
+    [anon_sym_LBRACK] = ACTIONS(49),
+    [anon_sym_LBRACE] = ACTIONS(51),
+    [anon_sym_STAR_STAR] = ACTIONS(53),
+    [anon_sym_def] = ACTIONS(97),
+    [anon_sym_global] = ACTIONS(57),
+    [anon_sym_nonlocal] = ACTIONS(59),
+    [anon_sym_exec] = ACTIONS(61),
+    [anon_sym_type] = ACTIONS(63),
+    [anon_sym_class] = ACTIONS(99),
+    [anon_sym_AT] = ACTIONS(67),
+    [anon_sym_not] = ACTIONS(69),
+    [anon_sym_TILDE] = ACTIONS(47),
+    [anon_sym_lambda] = ACTIONS(71),
+    [anon_sym_yield] = ACTIONS(73),
+    [sym_ellipsis] = ACTIONS(75),
+    [sym_integer] = ACTIONS(77),
+    [sym_float] = ACTIONS(75),
+    [anon_sym_await] = ACTIONS(79),
+    [sym_true] = ACTIONS(77),
+    [sym_false] = ACTIONS(77),
+    [sym_none] = ACTIONS(77),
+    [sym_comment] = ACTIONS(3),
+    [sym__dedent] = ACTIONS(103),
     [sym__string_start] = ACTIONS(81),
   },
   [34] = {
-    [sym__statement] = STATE(68),
-    [sym__simple_statements] = STATE(68),
-    [sym_import_statement] = STATE(1319),
-    [sym_future_import_statement] = STATE(1319),
-    [sym_import_from_statement] = STATE(1319),
-    [sym_print_statement] = STATE(1319),
-    [sym_assert_statement] = STATE(1319),
-    [sym_expression_statement] = STATE(1319),
-    [sym_named_expression] = STATE(1009),
-    [sym_return_statement] = STATE(1319),
-    [sym_delete_statement] = STATE(1319),
-    [sym_raise_statement] = STATE(1319),
-    [sym_pass_statement] = STATE(1319),
-    [sym_break_statement] = STATE(1319),
-    [sym_continue_statement] = STATE(1319),
-    [sym_if_statement] = STATE(68),
-    [sym_for_statement] = STATE(68),
-    [sym_while_statement] = STATE(68),
-    [sym_try_statement] = STATE(68),
-    [sym_with_statement] = STATE(68),
-    [sym_match_statement] = STATE(68),
-    [sym_function_definition] = STATE(68),
-    [sym_list_splat] = STATE(1360),
-    [sym_dictionary_splat] = STATE(1360),
-    [sym_global_statement] = STATE(1319),
-    [sym_nonlocal_statement] = STATE(1319),
-    [sym_exec_statement] = STATE(1319),
-    [sym_type_alias_statement] = STATE(1319),
-    [sym_class_definition] = STATE(68),
-    [sym_decorated_definition] = STATE(68),
-    [sym_decorator] = STATE(996),
-    [sym_block] = STATE(418),
-    [sym_expression_list] = STATE(1361),
-    [sym_pattern] = STATE(889),
-    [sym_tuple_pattern] = STATE(875),
-    [sym_list_pattern] = STATE(875),
-    [sym_list_splat_pattern] = STATE(875),
-    [sym_expression] = STATE(1019),
-    [sym_primary_expression] = STATE(684),
-    [sym_not_operator] = STATE(1009),
-    [sym_boolean_operator] = STATE(1009),
-    [sym_binary_operator] = STATE(797),
-    [sym_unary_operator] = STATE(797),
-    [sym_comparison_operator] = STATE(1009),
-    [sym_lambda] = STATE(1009),
-    [sym_assignment] = STATE(1361),
-    [sym_augmented_assignment] = STATE(1361),
-    [sym_pattern_list] = STATE(897),
-    [sym_yield] = STATE(1361),
-    [sym_attribute] = STATE(431),
-    [sym_subscript] = STATE(431),
-    [sym_call] = STATE(797),
-    [sym_list] = STATE(797),
-    [sym_set] = STATE(797),
-    [sym_tuple] = STATE(797),
-    [sym_dictionary] = STATE(797),
-    [sym_list_comprehension] = STATE(797),
-    [sym_dictionary_comprehension] = STATE(797),
-    [sym_set_comprehension] = STATE(797),
-    [sym_generator_expression] = STATE(797),
-    [sym_parenthesized_expression] = STATE(797),
-    [sym_conditional_expression] = STATE(1009),
-    [sym_concatenated_string] = STATE(797),
-    [sym_string] = STATE(713),
-    [sym_await] = STATE(1009),
-    [aux_sym_module_repeat1] = STATE(68),
-    [aux_sym_decorated_definition_repeat1] = STATE(996),
+    [sym__statement] = STATE(61),
+    [sym__simple_statements] = STATE(61),
+    [sym_import_statement] = STATE(1213),
+    [sym_future_import_statement] = STATE(1213),
+    [sym_import_from_statement] = STATE(1213),
+    [sym_print_statement] = STATE(1213),
+    [sym_assert_statement] = STATE(1213),
+    [sym_expression_statement] = STATE(1213),
+    [sym_named_expression] = STATE(985),
+    [sym_return_statement] = STATE(1213),
+    [sym_delete_statement] = STATE(1213),
+    [sym_raise_statement] = STATE(1213),
+    [sym_pass_statement] = STATE(1213),
+    [sym_break_statement] = STATE(1213),
+    [sym_continue_statement] = STATE(1213),
+    [sym_if_statement] = STATE(61),
+    [sym_for_statement] = STATE(61),
+    [sym_while_statement] = STATE(61),
+    [sym_try_statement] = STATE(61),
+    [sym_with_statement] = STATE(61),
+    [sym_match_statement] = STATE(61),
+    [sym_function_definition] = STATE(61),
+    [sym_list_splat] = STATE(1321),
+    [sym_dictionary_splat] = STATE(1321),
+    [sym_global_statement] = STATE(1213),
+    [sym_nonlocal_statement] = STATE(1213),
+    [sym_exec_statement] = STATE(1213),
+    [sym_type_alias_statement] = STATE(1213),
+    [sym_class_definition] = STATE(61),
+    [sym_decorated_definition] = STATE(61),
+    [sym_decorator] = STATE(947),
+    [sym_block] = STATE(337),
+    [sym_expression_list] = STATE(1313),
+    [sym_pattern] = STATE(871),
+    [sym_tuple_pattern] = STATE(860),
+    [sym_list_pattern] = STATE(860),
+    [sym_list_splat_pattern] = STATE(860),
+    [sym_expression] = STATE(995),
+    [sym_primary_expression] = STATE(707),
+    [sym_not_operator] = STATE(985),
+    [sym_boolean_operator] = STATE(985),
+    [sym_binary_operator] = STATE(759),
+    [sym_unary_operator] = STATE(759),
+    [sym_comparison_operator] = STATE(985),
+    [sym_lambda] = STATE(985),
+    [sym_assignment] = STATE(1313),
+    [sym_augmented_assignment] = STATE(1313),
+    [sym_pattern_list] = STATE(880),
+    [sym_yield] = STATE(1313),
+    [sym_attribute] = STATE(422),
+    [sym_subscript] = STATE(422),
+    [sym_call] = STATE(759),
+    [sym_list] = STATE(759),
+    [sym_set] = STATE(759),
+    [sym_tuple] = STATE(759),
+    [sym_dictionary] = STATE(759),
+    [sym_list_comprehension] = STATE(759),
+    [sym_dictionary_comprehension] = STATE(759),
+    [sym_set_comprehension] = STATE(759),
+    [sym_generator_expression] = STATE(759),
+    [sym_parenthesized_expression] = STATE(759),
+    [sym_conditional_expression] = STATE(985),
+    [sym_concatenated_string] = STATE(759),
+    [sym_string] = STATE(709),
+    [sym_await] = STATE(759),
+    [aux_sym_module_repeat1] = STATE(61),
+    [aux_sym_decorated_definition_repeat1] = STATE(947),
     [sym_identifier] = ACTIONS(7),
     [anon_sym_import] = ACTIONS(9),
     [anon_sym_from] = ACTIONS(11),
@@ -14288,73 +11668,73 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym__string_start] = ACTIONS(81),
   },
   [35] = {
-    [sym__statement] = STATE(68),
-    [sym__simple_statements] = STATE(68),
-    [sym_import_statement] = STATE(1319),
-    [sym_future_import_statement] = STATE(1319),
-    [sym_import_from_statement] = STATE(1319),
-    [sym_print_statement] = STATE(1319),
-    [sym_assert_statement] = STATE(1319),
-    [sym_expression_statement] = STATE(1319),
-    [sym_named_expression] = STATE(1009),
-    [sym_return_statement] = STATE(1319),
-    [sym_delete_statement] = STATE(1319),
-    [sym_raise_statement] = STATE(1319),
-    [sym_pass_statement] = STATE(1319),
-    [sym_break_statement] = STATE(1319),
-    [sym_continue_statement] = STATE(1319),
-    [sym_if_statement] = STATE(68),
-    [sym_for_statement] = STATE(68),
-    [sym_while_statement] = STATE(68),
-    [sym_try_statement] = STATE(68),
-    [sym_with_statement] = STATE(68),
-    [sym_match_statement] = STATE(68),
-    [sym_function_definition] = STATE(68),
-    [sym_list_splat] = STATE(1360),
-    [sym_dictionary_splat] = STATE(1360),
-    [sym_global_statement] = STATE(1319),
-    [sym_nonlocal_statement] = STATE(1319),
-    [sym_exec_statement] = STATE(1319),
-    [sym_type_alias_statement] = STATE(1319),
-    [sym_class_definition] = STATE(68),
-    [sym_decorated_definition] = STATE(68),
-    [sym_decorator] = STATE(996),
-    [sym_block] = STATE(489),
-    [sym_expression_list] = STATE(1361),
-    [sym_pattern] = STATE(889),
-    [sym_tuple_pattern] = STATE(875),
-    [sym_list_pattern] = STATE(875),
-    [sym_list_splat_pattern] = STATE(875),
-    [sym_expression] = STATE(1019),
-    [sym_primary_expression] = STATE(684),
-    [sym_not_operator] = STATE(1009),
-    [sym_boolean_operator] = STATE(1009),
-    [sym_binary_operator] = STATE(797),
-    [sym_unary_operator] = STATE(797),
-    [sym_comparison_operator] = STATE(1009),
-    [sym_lambda] = STATE(1009),
-    [sym_assignment] = STATE(1361),
-    [sym_augmented_assignment] = STATE(1361),
-    [sym_pattern_list] = STATE(897),
-    [sym_yield] = STATE(1361),
-    [sym_attribute] = STATE(431),
-    [sym_subscript] = STATE(431),
-    [sym_call] = STATE(797),
-    [sym_list] = STATE(797),
-    [sym_set] = STATE(797),
-    [sym_tuple] = STATE(797),
-    [sym_dictionary] = STATE(797),
-    [sym_list_comprehension] = STATE(797),
-    [sym_dictionary_comprehension] = STATE(797),
-    [sym_set_comprehension] = STATE(797),
-    [sym_generator_expression] = STATE(797),
-    [sym_parenthesized_expression] = STATE(797),
-    [sym_conditional_expression] = STATE(1009),
-    [sym_concatenated_string] = STATE(797),
-    [sym_string] = STATE(713),
-    [sym_await] = STATE(1009),
-    [aux_sym_module_repeat1] = STATE(68),
-    [aux_sym_decorated_definition_repeat1] = STATE(996),
+    [sym__statement] = STATE(61),
+    [sym__simple_statements] = STATE(61),
+    [sym_import_statement] = STATE(1213),
+    [sym_future_import_statement] = STATE(1213),
+    [sym_import_from_statement] = STATE(1213),
+    [sym_print_statement] = STATE(1213),
+    [sym_assert_statement] = STATE(1213),
+    [sym_expression_statement] = STATE(1213),
+    [sym_named_expression] = STATE(985),
+    [sym_return_statement] = STATE(1213),
+    [sym_delete_statement] = STATE(1213),
+    [sym_raise_statement] = STATE(1213),
+    [sym_pass_statement] = STATE(1213),
+    [sym_break_statement] = STATE(1213),
+    [sym_continue_statement] = STATE(1213),
+    [sym_if_statement] = STATE(61),
+    [sym_for_statement] = STATE(61),
+    [sym_while_statement] = STATE(61),
+    [sym_try_statement] = STATE(61),
+    [sym_with_statement] = STATE(61),
+    [sym_match_statement] = STATE(61),
+    [sym_function_definition] = STATE(61),
+    [sym_list_splat] = STATE(1321),
+    [sym_dictionary_splat] = STATE(1321),
+    [sym_global_statement] = STATE(1213),
+    [sym_nonlocal_statement] = STATE(1213),
+    [sym_exec_statement] = STATE(1213),
+    [sym_type_alias_statement] = STATE(1213),
+    [sym_class_definition] = STATE(61),
+    [sym_decorated_definition] = STATE(61),
+    [sym_decorator] = STATE(947),
+    [sym_block] = STATE(523),
+    [sym_expression_list] = STATE(1313),
+    [sym_pattern] = STATE(871),
+    [sym_tuple_pattern] = STATE(860),
+    [sym_list_pattern] = STATE(860),
+    [sym_list_splat_pattern] = STATE(860),
+    [sym_expression] = STATE(995),
+    [sym_primary_expression] = STATE(707),
+    [sym_not_operator] = STATE(985),
+    [sym_boolean_operator] = STATE(985),
+    [sym_binary_operator] = STATE(759),
+    [sym_unary_operator] = STATE(759),
+    [sym_comparison_operator] = STATE(985),
+    [sym_lambda] = STATE(985),
+    [sym_assignment] = STATE(1313),
+    [sym_augmented_assignment] = STATE(1313),
+    [sym_pattern_list] = STATE(880),
+    [sym_yield] = STATE(1313),
+    [sym_attribute] = STATE(422),
+    [sym_subscript] = STATE(422),
+    [sym_call] = STATE(759),
+    [sym_list] = STATE(759),
+    [sym_set] = STATE(759),
+    [sym_tuple] = STATE(759),
+    [sym_dictionary] = STATE(759),
+    [sym_list_comprehension] = STATE(759),
+    [sym_dictionary_comprehension] = STATE(759),
+    [sym_set_comprehension] = STATE(759),
+    [sym_generator_expression] = STATE(759),
+    [sym_parenthesized_expression] = STATE(759),
+    [sym_conditional_expression] = STATE(985),
+    [sym_concatenated_string] = STATE(759),
+    [sym_string] = STATE(709),
+    [sym_await] = STATE(759),
+    [aux_sym_module_repeat1] = STATE(61),
+    [aux_sym_decorated_definition_repeat1] = STATE(947),
     [sym_identifier] = ACTIONS(7),
     [anon_sym_import] = ACTIONS(9),
     [anon_sym_from] = ACTIONS(11),
@@ -14403,73 +11783,73 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym__string_start] = ACTIONS(81),
   },
   [36] = {
-    [sym__statement] = STATE(68),
-    [sym__simple_statements] = STATE(68),
-    [sym_import_statement] = STATE(1319),
-    [sym_future_import_statement] = STATE(1319),
-    [sym_import_from_statement] = STATE(1319),
-    [sym_print_statement] = STATE(1319),
-    [sym_assert_statement] = STATE(1319),
-    [sym_expression_statement] = STATE(1319),
-    [sym_named_expression] = STATE(1009),
-    [sym_return_statement] = STATE(1319),
-    [sym_delete_statement] = STATE(1319),
-    [sym_raise_statement] = STATE(1319),
-    [sym_pass_statement] = STATE(1319),
-    [sym_break_statement] = STATE(1319),
-    [sym_continue_statement] = STATE(1319),
-    [sym_if_statement] = STATE(68),
-    [sym_for_statement] = STATE(68),
-    [sym_while_statement] = STATE(68),
-    [sym_try_statement] = STATE(68),
-    [sym_with_statement] = STATE(68),
-    [sym_match_statement] = STATE(68),
-    [sym_function_definition] = STATE(68),
-    [sym_list_splat] = STATE(1360),
-    [sym_dictionary_splat] = STATE(1360),
-    [sym_global_statement] = STATE(1319),
-    [sym_nonlocal_statement] = STATE(1319),
-    [sym_exec_statement] = STATE(1319),
-    [sym_type_alias_statement] = STATE(1319),
-    [sym_class_definition] = STATE(68),
-    [sym_decorated_definition] = STATE(68),
-    [sym_decorator] = STATE(996),
-    [sym_block] = STATE(498),
-    [sym_expression_list] = STATE(1361),
-    [sym_pattern] = STATE(889),
-    [sym_tuple_pattern] = STATE(875),
-    [sym_list_pattern] = STATE(875),
-    [sym_list_splat_pattern] = STATE(875),
-    [sym_expression] = STATE(1019),
-    [sym_primary_expression] = STATE(684),
-    [sym_not_operator] = STATE(1009),
-    [sym_boolean_operator] = STATE(1009),
-    [sym_binary_operator] = STATE(797),
-    [sym_unary_operator] = STATE(797),
-    [sym_comparison_operator] = STATE(1009),
-    [sym_lambda] = STATE(1009),
-    [sym_assignment] = STATE(1361),
-    [sym_augmented_assignment] = STATE(1361),
-    [sym_pattern_list] = STATE(897),
-    [sym_yield] = STATE(1361),
-    [sym_attribute] = STATE(431),
-    [sym_subscript] = STATE(431),
-    [sym_call] = STATE(797),
-    [sym_list] = STATE(797),
-    [sym_set] = STATE(797),
-    [sym_tuple] = STATE(797),
-    [sym_dictionary] = STATE(797),
-    [sym_list_comprehension] = STATE(797),
-    [sym_dictionary_comprehension] = STATE(797),
-    [sym_set_comprehension] = STATE(797),
-    [sym_generator_expression] = STATE(797),
-    [sym_parenthesized_expression] = STATE(797),
-    [sym_conditional_expression] = STATE(1009),
-    [sym_concatenated_string] = STATE(797),
-    [sym_string] = STATE(713),
-    [sym_await] = STATE(1009),
-    [aux_sym_module_repeat1] = STATE(68),
-    [aux_sym_decorated_definition_repeat1] = STATE(996),
+    [sym__statement] = STATE(60),
+    [sym__simple_statements] = STATE(60),
+    [sym_import_statement] = STATE(1213),
+    [sym_future_import_statement] = STATE(1213),
+    [sym_import_from_statement] = STATE(1213),
+    [sym_print_statement] = STATE(1213),
+    [sym_assert_statement] = STATE(1213),
+    [sym_expression_statement] = STATE(1213),
+    [sym_named_expression] = STATE(985),
+    [sym_return_statement] = STATE(1213),
+    [sym_delete_statement] = STATE(1213),
+    [sym_raise_statement] = STATE(1213),
+    [sym_pass_statement] = STATE(1213),
+    [sym_break_statement] = STATE(1213),
+    [sym_continue_statement] = STATE(1213),
+    [sym_if_statement] = STATE(60),
+    [sym_for_statement] = STATE(60),
+    [sym_while_statement] = STATE(60),
+    [sym_try_statement] = STATE(60),
+    [sym_with_statement] = STATE(60),
+    [sym_match_statement] = STATE(60),
+    [sym_function_definition] = STATE(60),
+    [sym_list_splat] = STATE(1321),
+    [sym_dictionary_splat] = STATE(1321),
+    [sym_global_statement] = STATE(1213),
+    [sym_nonlocal_statement] = STATE(1213),
+    [sym_exec_statement] = STATE(1213),
+    [sym_type_alias_statement] = STATE(1213),
+    [sym_class_definition] = STATE(60),
+    [sym_decorated_definition] = STATE(60),
+    [sym_decorator] = STATE(947),
+    [sym_block] = STATE(471),
+    [sym_expression_list] = STATE(1313),
+    [sym_pattern] = STATE(871),
+    [sym_tuple_pattern] = STATE(860),
+    [sym_list_pattern] = STATE(860),
+    [sym_list_splat_pattern] = STATE(860),
+    [sym_expression] = STATE(995),
+    [sym_primary_expression] = STATE(707),
+    [sym_not_operator] = STATE(985),
+    [sym_boolean_operator] = STATE(985),
+    [sym_binary_operator] = STATE(759),
+    [sym_unary_operator] = STATE(759),
+    [sym_comparison_operator] = STATE(985),
+    [sym_lambda] = STATE(985),
+    [sym_assignment] = STATE(1313),
+    [sym_augmented_assignment] = STATE(1313),
+    [sym_pattern_list] = STATE(880),
+    [sym_yield] = STATE(1313),
+    [sym_attribute] = STATE(422),
+    [sym_subscript] = STATE(422),
+    [sym_call] = STATE(759),
+    [sym_list] = STATE(759),
+    [sym_set] = STATE(759),
+    [sym_tuple] = STATE(759),
+    [sym_dictionary] = STATE(759),
+    [sym_list_comprehension] = STATE(759),
+    [sym_dictionary_comprehension] = STATE(759),
+    [sym_set_comprehension] = STATE(759),
+    [sym_generator_expression] = STATE(759),
+    [sym_parenthesized_expression] = STATE(759),
+    [sym_conditional_expression] = STATE(985),
+    [sym_concatenated_string] = STATE(759),
+    [sym_string] = STATE(709),
+    [sym_await] = STATE(759),
+    [aux_sym_module_repeat1] = STATE(60),
+    [aux_sym_decorated_definition_repeat1] = STATE(947),
     [sym_identifier] = ACTIONS(7),
     [anon_sym_import] = ACTIONS(9),
     [anon_sym_from] = ACTIONS(11),
@@ -14514,77 +11894,77 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_false] = ACTIONS(77),
     [sym_none] = ACTIONS(77),
     [sym_comment] = ACTIONS(3),
-    [sym__dedent] = ACTIONS(103),
+    [sym__dedent] = ACTIONS(101),
     [sym__string_start] = ACTIONS(81),
   },
   [37] = {
-    [sym__statement] = STATE(68),
-    [sym__simple_statements] = STATE(68),
-    [sym_import_statement] = STATE(1319),
-    [sym_future_import_statement] = STATE(1319),
-    [sym_import_from_statement] = STATE(1319),
-    [sym_print_statement] = STATE(1319),
-    [sym_assert_statement] = STATE(1319),
-    [sym_expression_statement] = STATE(1319),
-    [sym_named_expression] = STATE(1009),
-    [sym_return_statement] = STATE(1319),
-    [sym_delete_statement] = STATE(1319),
-    [sym_raise_statement] = STATE(1319),
-    [sym_pass_statement] = STATE(1319),
-    [sym_break_statement] = STATE(1319),
-    [sym_continue_statement] = STATE(1319),
-    [sym_if_statement] = STATE(68),
-    [sym_for_statement] = STATE(68),
-    [sym_while_statement] = STATE(68),
-    [sym_try_statement] = STATE(68),
-    [sym_with_statement] = STATE(68),
-    [sym_match_statement] = STATE(68),
-    [sym_function_definition] = STATE(68),
-    [sym_list_splat] = STATE(1360),
-    [sym_dictionary_splat] = STATE(1360),
-    [sym_global_statement] = STATE(1319),
-    [sym_nonlocal_statement] = STATE(1319),
-    [sym_exec_statement] = STATE(1319),
-    [sym_type_alias_statement] = STATE(1319),
-    [sym_class_definition] = STATE(68),
-    [sym_decorated_definition] = STATE(68),
-    [sym_decorator] = STATE(996),
-    [sym_block] = STATE(555),
-    [sym_expression_list] = STATE(1361),
-    [sym_pattern] = STATE(889),
-    [sym_tuple_pattern] = STATE(875),
-    [sym_list_pattern] = STATE(875),
-    [sym_list_splat_pattern] = STATE(875),
-    [sym_expression] = STATE(1019),
-    [sym_primary_expression] = STATE(684),
-    [sym_not_operator] = STATE(1009),
-    [sym_boolean_operator] = STATE(1009),
-    [sym_binary_operator] = STATE(797),
-    [sym_unary_operator] = STATE(797),
-    [sym_comparison_operator] = STATE(1009),
-    [sym_lambda] = STATE(1009),
-    [sym_assignment] = STATE(1361),
-    [sym_augmented_assignment] = STATE(1361),
-    [sym_pattern_list] = STATE(897),
-    [sym_yield] = STATE(1361),
-    [sym_attribute] = STATE(431),
-    [sym_subscript] = STATE(431),
-    [sym_call] = STATE(797),
-    [sym_list] = STATE(797),
-    [sym_set] = STATE(797),
-    [sym_tuple] = STATE(797),
-    [sym_dictionary] = STATE(797),
-    [sym_list_comprehension] = STATE(797),
-    [sym_dictionary_comprehension] = STATE(797),
-    [sym_set_comprehension] = STATE(797),
-    [sym_generator_expression] = STATE(797),
-    [sym_parenthesized_expression] = STATE(797),
-    [sym_conditional_expression] = STATE(1009),
-    [sym_concatenated_string] = STATE(797),
-    [sym_string] = STATE(713),
-    [sym_await] = STATE(1009),
-    [aux_sym_module_repeat1] = STATE(68),
-    [aux_sym_decorated_definition_repeat1] = STATE(996),
+    [sym__statement] = STATE(60),
+    [sym__simple_statements] = STATE(60),
+    [sym_import_statement] = STATE(1213),
+    [sym_future_import_statement] = STATE(1213),
+    [sym_import_from_statement] = STATE(1213),
+    [sym_print_statement] = STATE(1213),
+    [sym_assert_statement] = STATE(1213),
+    [sym_expression_statement] = STATE(1213),
+    [sym_named_expression] = STATE(985),
+    [sym_return_statement] = STATE(1213),
+    [sym_delete_statement] = STATE(1213),
+    [sym_raise_statement] = STATE(1213),
+    [sym_pass_statement] = STATE(1213),
+    [sym_break_statement] = STATE(1213),
+    [sym_continue_statement] = STATE(1213),
+    [sym_if_statement] = STATE(60),
+    [sym_for_statement] = STATE(60),
+    [sym_while_statement] = STATE(60),
+    [sym_try_statement] = STATE(60),
+    [sym_with_statement] = STATE(60),
+    [sym_match_statement] = STATE(60),
+    [sym_function_definition] = STATE(60),
+    [sym_list_splat] = STATE(1321),
+    [sym_dictionary_splat] = STATE(1321),
+    [sym_global_statement] = STATE(1213),
+    [sym_nonlocal_statement] = STATE(1213),
+    [sym_exec_statement] = STATE(1213),
+    [sym_type_alias_statement] = STATE(1213),
+    [sym_class_definition] = STATE(60),
+    [sym_decorated_definition] = STATE(60),
+    [sym_decorator] = STATE(947),
+    [sym_block] = STATE(501),
+    [sym_expression_list] = STATE(1313),
+    [sym_pattern] = STATE(871),
+    [sym_tuple_pattern] = STATE(860),
+    [sym_list_pattern] = STATE(860),
+    [sym_list_splat_pattern] = STATE(860),
+    [sym_expression] = STATE(995),
+    [sym_primary_expression] = STATE(707),
+    [sym_not_operator] = STATE(985),
+    [sym_boolean_operator] = STATE(985),
+    [sym_binary_operator] = STATE(759),
+    [sym_unary_operator] = STATE(759),
+    [sym_comparison_operator] = STATE(985),
+    [sym_lambda] = STATE(985),
+    [sym_assignment] = STATE(1313),
+    [sym_augmented_assignment] = STATE(1313),
+    [sym_pattern_list] = STATE(880),
+    [sym_yield] = STATE(1313),
+    [sym_attribute] = STATE(422),
+    [sym_subscript] = STATE(422),
+    [sym_call] = STATE(759),
+    [sym_list] = STATE(759),
+    [sym_set] = STATE(759),
+    [sym_tuple] = STATE(759),
+    [sym_dictionary] = STATE(759),
+    [sym_list_comprehension] = STATE(759),
+    [sym_dictionary_comprehension] = STATE(759),
+    [sym_set_comprehension] = STATE(759),
+    [sym_generator_expression] = STATE(759),
+    [sym_parenthesized_expression] = STATE(759),
+    [sym_conditional_expression] = STATE(985),
+    [sym_concatenated_string] = STATE(759),
+    [sym_string] = STATE(709),
+    [sym_await] = STATE(759),
+    [aux_sym_module_repeat1] = STATE(60),
+    [aux_sym_decorated_definition_repeat1] = STATE(947),
     [sym_identifier] = ACTIONS(7),
     [anon_sym_import] = ACTIONS(9),
     [anon_sym_from] = ACTIONS(11),
@@ -14629,77 +12009,77 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_false] = ACTIONS(77),
     [sym_none] = ACTIONS(77),
     [sym_comment] = ACTIONS(3),
-    [sym__dedent] = ACTIONS(103),
+    [sym__dedent] = ACTIONS(101),
     [sym__string_start] = ACTIONS(81),
   },
   [38] = {
-    [sym__statement] = STATE(68),
-    [sym__simple_statements] = STATE(68),
-    [sym_import_statement] = STATE(1319),
-    [sym_future_import_statement] = STATE(1319),
-    [sym_import_from_statement] = STATE(1319),
-    [sym_print_statement] = STATE(1319),
-    [sym_assert_statement] = STATE(1319),
-    [sym_expression_statement] = STATE(1319),
-    [sym_named_expression] = STATE(1009),
-    [sym_return_statement] = STATE(1319),
-    [sym_delete_statement] = STATE(1319),
-    [sym_raise_statement] = STATE(1319),
-    [sym_pass_statement] = STATE(1319),
-    [sym_break_statement] = STATE(1319),
-    [sym_continue_statement] = STATE(1319),
-    [sym_if_statement] = STATE(68),
-    [sym_for_statement] = STATE(68),
-    [sym_while_statement] = STATE(68),
-    [sym_try_statement] = STATE(68),
-    [sym_with_statement] = STATE(68),
-    [sym_match_statement] = STATE(68),
-    [sym_function_definition] = STATE(68),
-    [sym_list_splat] = STATE(1360),
-    [sym_dictionary_splat] = STATE(1360),
-    [sym_global_statement] = STATE(1319),
-    [sym_nonlocal_statement] = STATE(1319),
-    [sym_exec_statement] = STATE(1319),
-    [sym_type_alias_statement] = STATE(1319),
-    [sym_class_definition] = STATE(68),
-    [sym_decorated_definition] = STATE(68),
-    [sym_decorator] = STATE(996),
-    [sym_block] = STATE(565),
-    [sym_expression_list] = STATE(1361),
-    [sym_pattern] = STATE(889),
-    [sym_tuple_pattern] = STATE(875),
-    [sym_list_pattern] = STATE(875),
-    [sym_list_splat_pattern] = STATE(875),
-    [sym_expression] = STATE(1019),
-    [sym_primary_expression] = STATE(684),
-    [sym_not_operator] = STATE(1009),
-    [sym_boolean_operator] = STATE(1009),
-    [sym_binary_operator] = STATE(797),
-    [sym_unary_operator] = STATE(797),
-    [sym_comparison_operator] = STATE(1009),
-    [sym_lambda] = STATE(1009),
-    [sym_assignment] = STATE(1361),
-    [sym_augmented_assignment] = STATE(1361),
-    [sym_pattern_list] = STATE(897),
-    [sym_yield] = STATE(1361),
-    [sym_attribute] = STATE(431),
-    [sym_subscript] = STATE(431),
-    [sym_call] = STATE(797),
-    [sym_list] = STATE(797),
-    [sym_set] = STATE(797),
-    [sym_tuple] = STATE(797),
-    [sym_dictionary] = STATE(797),
-    [sym_list_comprehension] = STATE(797),
-    [sym_dictionary_comprehension] = STATE(797),
-    [sym_set_comprehension] = STATE(797),
-    [sym_generator_expression] = STATE(797),
-    [sym_parenthesized_expression] = STATE(797),
-    [sym_conditional_expression] = STATE(1009),
-    [sym_concatenated_string] = STATE(797),
-    [sym_string] = STATE(713),
-    [sym_await] = STATE(1009),
-    [aux_sym_module_repeat1] = STATE(68),
-    [aux_sym_decorated_definition_repeat1] = STATE(996),
+    [sym__statement] = STATE(60),
+    [sym__simple_statements] = STATE(60),
+    [sym_import_statement] = STATE(1213),
+    [sym_future_import_statement] = STATE(1213),
+    [sym_import_from_statement] = STATE(1213),
+    [sym_print_statement] = STATE(1213),
+    [sym_assert_statement] = STATE(1213),
+    [sym_expression_statement] = STATE(1213),
+    [sym_named_expression] = STATE(985),
+    [sym_return_statement] = STATE(1213),
+    [sym_delete_statement] = STATE(1213),
+    [sym_raise_statement] = STATE(1213),
+    [sym_pass_statement] = STATE(1213),
+    [sym_break_statement] = STATE(1213),
+    [sym_continue_statement] = STATE(1213),
+    [sym_if_statement] = STATE(60),
+    [sym_for_statement] = STATE(60),
+    [sym_while_statement] = STATE(60),
+    [sym_try_statement] = STATE(60),
+    [sym_with_statement] = STATE(60),
+    [sym_match_statement] = STATE(60),
+    [sym_function_definition] = STATE(60),
+    [sym_list_splat] = STATE(1321),
+    [sym_dictionary_splat] = STATE(1321),
+    [sym_global_statement] = STATE(1213),
+    [sym_nonlocal_statement] = STATE(1213),
+    [sym_exec_statement] = STATE(1213),
+    [sym_type_alias_statement] = STATE(1213),
+    [sym_class_definition] = STATE(60),
+    [sym_decorated_definition] = STATE(60),
+    [sym_decorator] = STATE(947),
+    [sym_block] = STATE(476),
+    [sym_expression_list] = STATE(1313),
+    [sym_pattern] = STATE(871),
+    [sym_tuple_pattern] = STATE(860),
+    [sym_list_pattern] = STATE(860),
+    [sym_list_splat_pattern] = STATE(860),
+    [sym_expression] = STATE(995),
+    [sym_primary_expression] = STATE(707),
+    [sym_not_operator] = STATE(985),
+    [sym_boolean_operator] = STATE(985),
+    [sym_binary_operator] = STATE(759),
+    [sym_unary_operator] = STATE(759),
+    [sym_comparison_operator] = STATE(985),
+    [sym_lambda] = STATE(985),
+    [sym_assignment] = STATE(1313),
+    [sym_augmented_assignment] = STATE(1313),
+    [sym_pattern_list] = STATE(880),
+    [sym_yield] = STATE(1313),
+    [sym_attribute] = STATE(422),
+    [sym_subscript] = STATE(422),
+    [sym_call] = STATE(759),
+    [sym_list] = STATE(759),
+    [sym_set] = STATE(759),
+    [sym_tuple] = STATE(759),
+    [sym_dictionary] = STATE(759),
+    [sym_list_comprehension] = STATE(759),
+    [sym_dictionary_comprehension] = STATE(759),
+    [sym_set_comprehension] = STATE(759),
+    [sym_generator_expression] = STATE(759),
+    [sym_parenthesized_expression] = STATE(759),
+    [sym_conditional_expression] = STATE(985),
+    [sym_concatenated_string] = STATE(759),
+    [sym_string] = STATE(709),
+    [sym_await] = STATE(759),
+    [aux_sym_module_repeat1] = STATE(60),
+    [aux_sym_decorated_definition_repeat1] = STATE(947),
     [sym_identifier] = ACTIONS(7),
     [anon_sym_import] = ACTIONS(9),
     [anon_sym_from] = ACTIONS(11),
@@ -14744,77 +12124,77 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_false] = ACTIONS(77),
     [sym_none] = ACTIONS(77),
     [sym_comment] = ACTIONS(3),
-    [sym__dedent] = ACTIONS(103),
+    [sym__dedent] = ACTIONS(101),
     [sym__string_start] = ACTIONS(81),
   },
   [39] = {
-    [sym__statement] = STATE(68),
-    [sym__simple_statements] = STATE(68),
-    [sym_import_statement] = STATE(1319),
-    [sym_future_import_statement] = STATE(1319),
-    [sym_import_from_statement] = STATE(1319),
-    [sym_print_statement] = STATE(1319),
-    [sym_assert_statement] = STATE(1319),
-    [sym_expression_statement] = STATE(1319),
-    [sym_named_expression] = STATE(1009),
-    [sym_return_statement] = STATE(1319),
-    [sym_delete_statement] = STATE(1319),
-    [sym_raise_statement] = STATE(1319),
-    [sym_pass_statement] = STATE(1319),
-    [sym_break_statement] = STATE(1319),
-    [sym_continue_statement] = STATE(1319),
-    [sym_if_statement] = STATE(68),
-    [sym_for_statement] = STATE(68),
-    [sym_while_statement] = STATE(68),
-    [sym_try_statement] = STATE(68),
-    [sym_with_statement] = STATE(68),
-    [sym_match_statement] = STATE(68),
-    [sym_function_definition] = STATE(68),
-    [sym_list_splat] = STATE(1360),
-    [sym_dictionary_splat] = STATE(1360),
-    [sym_global_statement] = STATE(1319),
-    [sym_nonlocal_statement] = STATE(1319),
-    [sym_exec_statement] = STATE(1319),
-    [sym_type_alias_statement] = STATE(1319),
-    [sym_class_definition] = STATE(68),
-    [sym_decorated_definition] = STATE(68),
-    [sym_decorator] = STATE(996),
-    [sym_block] = STATE(428),
-    [sym_expression_list] = STATE(1361),
-    [sym_pattern] = STATE(889),
-    [sym_tuple_pattern] = STATE(875),
-    [sym_list_pattern] = STATE(875),
-    [sym_list_splat_pattern] = STATE(875),
-    [sym_expression] = STATE(1019),
-    [sym_primary_expression] = STATE(684),
-    [sym_not_operator] = STATE(1009),
-    [sym_boolean_operator] = STATE(1009),
-    [sym_binary_operator] = STATE(797),
-    [sym_unary_operator] = STATE(797),
-    [sym_comparison_operator] = STATE(1009),
-    [sym_lambda] = STATE(1009),
-    [sym_assignment] = STATE(1361),
-    [sym_augmented_assignment] = STATE(1361),
-    [sym_pattern_list] = STATE(897),
-    [sym_yield] = STATE(1361),
-    [sym_attribute] = STATE(431),
-    [sym_subscript] = STATE(431),
-    [sym_call] = STATE(797),
-    [sym_list] = STATE(797),
-    [sym_set] = STATE(797),
-    [sym_tuple] = STATE(797),
-    [sym_dictionary] = STATE(797),
-    [sym_list_comprehension] = STATE(797),
-    [sym_dictionary_comprehension] = STATE(797),
-    [sym_set_comprehension] = STATE(797),
-    [sym_generator_expression] = STATE(797),
-    [sym_parenthesized_expression] = STATE(797),
-    [sym_conditional_expression] = STATE(1009),
-    [sym_concatenated_string] = STATE(797),
-    [sym_string] = STATE(713),
-    [sym_await] = STATE(1009),
-    [aux_sym_module_repeat1] = STATE(68),
-    [aux_sym_decorated_definition_repeat1] = STATE(996),
+    [sym__statement] = STATE(61),
+    [sym__simple_statements] = STATE(61),
+    [sym_import_statement] = STATE(1213),
+    [sym_future_import_statement] = STATE(1213),
+    [sym_import_from_statement] = STATE(1213),
+    [sym_print_statement] = STATE(1213),
+    [sym_assert_statement] = STATE(1213),
+    [sym_expression_statement] = STATE(1213),
+    [sym_named_expression] = STATE(985),
+    [sym_return_statement] = STATE(1213),
+    [sym_delete_statement] = STATE(1213),
+    [sym_raise_statement] = STATE(1213),
+    [sym_pass_statement] = STATE(1213),
+    [sym_break_statement] = STATE(1213),
+    [sym_continue_statement] = STATE(1213),
+    [sym_if_statement] = STATE(61),
+    [sym_for_statement] = STATE(61),
+    [sym_while_statement] = STATE(61),
+    [sym_try_statement] = STATE(61),
+    [sym_with_statement] = STATE(61),
+    [sym_match_statement] = STATE(61),
+    [sym_function_definition] = STATE(61),
+    [sym_list_splat] = STATE(1321),
+    [sym_dictionary_splat] = STATE(1321),
+    [sym_global_statement] = STATE(1213),
+    [sym_nonlocal_statement] = STATE(1213),
+    [sym_exec_statement] = STATE(1213),
+    [sym_type_alias_statement] = STATE(1213),
+    [sym_class_definition] = STATE(61),
+    [sym_decorated_definition] = STATE(61),
+    [sym_decorator] = STATE(947),
+    [sym_block] = STATE(361),
+    [sym_expression_list] = STATE(1313),
+    [sym_pattern] = STATE(871),
+    [sym_tuple_pattern] = STATE(860),
+    [sym_list_pattern] = STATE(860),
+    [sym_list_splat_pattern] = STATE(860),
+    [sym_expression] = STATE(995),
+    [sym_primary_expression] = STATE(707),
+    [sym_not_operator] = STATE(985),
+    [sym_boolean_operator] = STATE(985),
+    [sym_binary_operator] = STATE(759),
+    [sym_unary_operator] = STATE(759),
+    [sym_comparison_operator] = STATE(985),
+    [sym_lambda] = STATE(985),
+    [sym_assignment] = STATE(1313),
+    [sym_augmented_assignment] = STATE(1313),
+    [sym_pattern_list] = STATE(880),
+    [sym_yield] = STATE(1313),
+    [sym_attribute] = STATE(422),
+    [sym_subscript] = STATE(422),
+    [sym_call] = STATE(759),
+    [sym_list] = STATE(759),
+    [sym_set] = STATE(759),
+    [sym_tuple] = STATE(759),
+    [sym_dictionary] = STATE(759),
+    [sym_list_comprehension] = STATE(759),
+    [sym_dictionary_comprehension] = STATE(759),
+    [sym_set_comprehension] = STATE(759),
+    [sym_generator_expression] = STATE(759),
+    [sym_parenthesized_expression] = STATE(759),
+    [sym_conditional_expression] = STATE(985),
+    [sym_concatenated_string] = STATE(759),
+    [sym_string] = STATE(709),
+    [sym_await] = STATE(759),
+    [aux_sym_module_repeat1] = STATE(61),
+    [aux_sym_decorated_definition_repeat1] = STATE(947),
     [sym_identifier] = ACTIONS(7),
     [anon_sym_import] = ACTIONS(9),
     [anon_sym_from] = ACTIONS(11),
@@ -14863,73 +12243,73 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym__string_start] = ACTIONS(81),
   },
   [40] = {
-    [sym__statement] = STATE(61),
-    [sym__simple_statements] = STATE(61),
-    [sym_import_statement] = STATE(1319),
-    [sym_future_import_statement] = STATE(1319),
-    [sym_import_from_statement] = STATE(1319),
-    [sym_print_statement] = STATE(1319),
-    [sym_assert_statement] = STATE(1319),
-    [sym_expression_statement] = STATE(1319),
-    [sym_named_expression] = STATE(1009),
-    [sym_return_statement] = STATE(1319),
-    [sym_delete_statement] = STATE(1319),
-    [sym_raise_statement] = STATE(1319),
-    [sym_pass_statement] = STATE(1319),
-    [sym_break_statement] = STATE(1319),
-    [sym_continue_statement] = STATE(1319),
-    [sym_if_statement] = STATE(61),
-    [sym_for_statement] = STATE(61),
-    [sym_while_statement] = STATE(61),
-    [sym_try_statement] = STATE(61),
-    [sym_with_statement] = STATE(61),
-    [sym_match_statement] = STATE(61),
-    [sym_function_definition] = STATE(61),
-    [sym_list_splat] = STATE(1360),
-    [sym_dictionary_splat] = STATE(1360),
-    [sym_global_statement] = STATE(1319),
-    [sym_nonlocal_statement] = STATE(1319),
-    [sym_exec_statement] = STATE(1319),
-    [sym_type_alias_statement] = STATE(1319),
-    [sym_class_definition] = STATE(61),
-    [sym_decorated_definition] = STATE(61),
-    [sym_decorator] = STATE(996),
-    [sym_block] = STATE(515),
-    [sym_expression_list] = STATE(1361),
-    [sym_pattern] = STATE(889),
-    [sym_tuple_pattern] = STATE(875),
-    [sym_list_pattern] = STATE(875),
-    [sym_list_splat_pattern] = STATE(875),
-    [sym_expression] = STATE(1019),
-    [sym_primary_expression] = STATE(684),
-    [sym_not_operator] = STATE(1009),
-    [sym_boolean_operator] = STATE(1009),
-    [sym_binary_operator] = STATE(797),
-    [sym_unary_operator] = STATE(797),
-    [sym_comparison_operator] = STATE(1009),
-    [sym_lambda] = STATE(1009),
-    [sym_assignment] = STATE(1361),
-    [sym_augmented_assignment] = STATE(1361),
-    [sym_pattern_list] = STATE(897),
-    [sym_yield] = STATE(1361),
-    [sym_attribute] = STATE(431),
-    [sym_subscript] = STATE(431),
-    [sym_call] = STATE(797),
-    [sym_list] = STATE(797),
-    [sym_set] = STATE(797),
-    [sym_tuple] = STATE(797),
-    [sym_dictionary] = STATE(797),
-    [sym_list_comprehension] = STATE(797),
-    [sym_dictionary_comprehension] = STATE(797),
-    [sym_set_comprehension] = STATE(797),
-    [sym_generator_expression] = STATE(797),
-    [sym_parenthesized_expression] = STATE(797),
-    [sym_conditional_expression] = STATE(1009),
-    [sym_concatenated_string] = STATE(797),
-    [sym_string] = STATE(713),
-    [sym_await] = STATE(1009),
-    [aux_sym_module_repeat1] = STATE(61),
-    [aux_sym_decorated_definition_repeat1] = STATE(996),
+    [sym__statement] = STATE(60),
+    [sym__simple_statements] = STATE(60),
+    [sym_import_statement] = STATE(1213),
+    [sym_future_import_statement] = STATE(1213),
+    [sym_import_from_statement] = STATE(1213),
+    [sym_print_statement] = STATE(1213),
+    [sym_assert_statement] = STATE(1213),
+    [sym_expression_statement] = STATE(1213),
+    [sym_named_expression] = STATE(985),
+    [sym_return_statement] = STATE(1213),
+    [sym_delete_statement] = STATE(1213),
+    [sym_raise_statement] = STATE(1213),
+    [sym_pass_statement] = STATE(1213),
+    [sym_break_statement] = STATE(1213),
+    [sym_continue_statement] = STATE(1213),
+    [sym_if_statement] = STATE(60),
+    [sym_for_statement] = STATE(60),
+    [sym_while_statement] = STATE(60),
+    [sym_try_statement] = STATE(60),
+    [sym_with_statement] = STATE(60),
+    [sym_match_statement] = STATE(60),
+    [sym_function_definition] = STATE(60),
+    [sym_list_splat] = STATE(1321),
+    [sym_dictionary_splat] = STATE(1321),
+    [sym_global_statement] = STATE(1213),
+    [sym_nonlocal_statement] = STATE(1213),
+    [sym_exec_statement] = STATE(1213),
+    [sym_type_alias_statement] = STATE(1213),
+    [sym_class_definition] = STATE(60),
+    [sym_decorated_definition] = STATE(60),
+    [sym_decorator] = STATE(947),
+    [sym_block] = STATE(538),
+    [sym_expression_list] = STATE(1313),
+    [sym_pattern] = STATE(871),
+    [sym_tuple_pattern] = STATE(860),
+    [sym_list_pattern] = STATE(860),
+    [sym_list_splat_pattern] = STATE(860),
+    [sym_expression] = STATE(995),
+    [sym_primary_expression] = STATE(707),
+    [sym_not_operator] = STATE(985),
+    [sym_boolean_operator] = STATE(985),
+    [sym_binary_operator] = STATE(759),
+    [sym_unary_operator] = STATE(759),
+    [sym_comparison_operator] = STATE(985),
+    [sym_lambda] = STATE(985),
+    [sym_assignment] = STATE(1313),
+    [sym_augmented_assignment] = STATE(1313),
+    [sym_pattern_list] = STATE(880),
+    [sym_yield] = STATE(1313),
+    [sym_attribute] = STATE(422),
+    [sym_subscript] = STATE(422),
+    [sym_call] = STATE(759),
+    [sym_list] = STATE(759),
+    [sym_set] = STATE(759),
+    [sym_tuple] = STATE(759),
+    [sym_dictionary] = STATE(759),
+    [sym_list_comprehension] = STATE(759),
+    [sym_dictionary_comprehension] = STATE(759),
+    [sym_set_comprehension] = STATE(759),
+    [sym_generator_expression] = STATE(759),
+    [sym_parenthesized_expression] = STATE(759),
+    [sym_conditional_expression] = STATE(985),
+    [sym_concatenated_string] = STATE(759),
+    [sym_string] = STATE(709),
+    [sym_await] = STATE(759),
+    [aux_sym_module_repeat1] = STATE(60),
+    [aux_sym_decorated_definition_repeat1] = STATE(947),
     [sym_identifier] = ACTIONS(7),
     [anon_sym_import] = ACTIONS(9),
     [anon_sym_from] = ACTIONS(11),
@@ -14974,77 +12354,77 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_false] = ACTIONS(77),
     [sym_none] = ACTIONS(77),
     [sym_comment] = ACTIONS(3),
-    [sym__dedent] = ACTIONS(107),
+    [sym__dedent] = ACTIONS(101),
     [sym__string_start] = ACTIONS(81),
   },
   [41] = {
-    [sym__statement] = STATE(68),
-    [sym__simple_statements] = STATE(68),
-    [sym_import_statement] = STATE(1319),
-    [sym_future_import_statement] = STATE(1319),
-    [sym_import_from_statement] = STATE(1319),
-    [sym_print_statement] = STATE(1319),
-    [sym_assert_statement] = STATE(1319),
-    [sym_expression_statement] = STATE(1319),
-    [sym_named_expression] = STATE(1009),
-    [sym_return_statement] = STATE(1319),
-    [sym_delete_statement] = STATE(1319),
-    [sym_raise_statement] = STATE(1319),
-    [sym_pass_statement] = STATE(1319),
-    [sym_break_statement] = STATE(1319),
-    [sym_continue_statement] = STATE(1319),
-    [sym_if_statement] = STATE(68),
-    [sym_for_statement] = STATE(68),
-    [sym_while_statement] = STATE(68),
-    [sym_try_statement] = STATE(68),
-    [sym_with_statement] = STATE(68),
-    [sym_match_statement] = STATE(68),
-    [sym_function_definition] = STATE(68),
-    [sym_list_splat] = STATE(1360),
-    [sym_dictionary_splat] = STATE(1360),
-    [sym_global_statement] = STATE(1319),
-    [sym_nonlocal_statement] = STATE(1319),
-    [sym_exec_statement] = STATE(1319),
-    [sym_type_alias_statement] = STATE(1319),
-    [sym_class_definition] = STATE(68),
-    [sym_decorated_definition] = STATE(68),
-    [sym_decorator] = STATE(996),
-    [sym_block] = STATE(574),
-    [sym_expression_list] = STATE(1361),
-    [sym_pattern] = STATE(889),
-    [sym_tuple_pattern] = STATE(875),
-    [sym_list_pattern] = STATE(875),
-    [sym_list_splat_pattern] = STATE(875),
-    [sym_expression] = STATE(1019),
-    [sym_primary_expression] = STATE(684),
-    [sym_not_operator] = STATE(1009),
-    [sym_boolean_operator] = STATE(1009),
-    [sym_binary_operator] = STATE(797),
-    [sym_unary_operator] = STATE(797),
-    [sym_comparison_operator] = STATE(1009),
-    [sym_lambda] = STATE(1009),
-    [sym_assignment] = STATE(1361),
-    [sym_augmented_assignment] = STATE(1361),
-    [sym_pattern_list] = STATE(897),
-    [sym_yield] = STATE(1361),
-    [sym_attribute] = STATE(431),
-    [sym_subscript] = STATE(431),
-    [sym_call] = STATE(797),
-    [sym_list] = STATE(797),
-    [sym_set] = STATE(797),
-    [sym_tuple] = STATE(797),
-    [sym_dictionary] = STATE(797),
-    [sym_list_comprehension] = STATE(797),
-    [sym_dictionary_comprehension] = STATE(797),
-    [sym_set_comprehension] = STATE(797),
-    [sym_generator_expression] = STATE(797),
-    [sym_parenthesized_expression] = STATE(797),
-    [sym_conditional_expression] = STATE(1009),
-    [sym_concatenated_string] = STATE(797),
-    [sym_string] = STATE(713),
-    [sym_await] = STATE(1009),
-    [aux_sym_module_repeat1] = STATE(68),
-    [aux_sym_decorated_definition_repeat1] = STATE(996),
+    [sym__statement] = STATE(61),
+    [sym__simple_statements] = STATE(61),
+    [sym_import_statement] = STATE(1213),
+    [sym_future_import_statement] = STATE(1213),
+    [sym_import_from_statement] = STATE(1213),
+    [sym_print_statement] = STATE(1213),
+    [sym_assert_statement] = STATE(1213),
+    [sym_expression_statement] = STATE(1213),
+    [sym_named_expression] = STATE(985),
+    [sym_return_statement] = STATE(1213),
+    [sym_delete_statement] = STATE(1213),
+    [sym_raise_statement] = STATE(1213),
+    [sym_pass_statement] = STATE(1213),
+    [sym_break_statement] = STATE(1213),
+    [sym_continue_statement] = STATE(1213),
+    [sym_if_statement] = STATE(61),
+    [sym_for_statement] = STATE(61),
+    [sym_while_statement] = STATE(61),
+    [sym_try_statement] = STATE(61),
+    [sym_with_statement] = STATE(61),
+    [sym_match_statement] = STATE(61),
+    [sym_function_definition] = STATE(61),
+    [sym_list_splat] = STATE(1321),
+    [sym_dictionary_splat] = STATE(1321),
+    [sym_global_statement] = STATE(1213),
+    [sym_nonlocal_statement] = STATE(1213),
+    [sym_exec_statement] = STATE(1213),
+    [sym_type_alias_statement] = STATE(1213),
+    [sym_class_definition] = STATE(61),
+    [sym_decorated_definition] = STATE(61),
+    [sym_decorator] = STATE(947),
+    [sym_block] = STATE(371),
+    [sym_expression_list] = STATE(1313),
+    [sym_pattern] = STATE(871),
+    [sym_tuple_pattern] = STATE(860),
+    [sym_list_pattern] = STATE(860),
+    [sym_list_splat_pattern] = STATE(860),
+    [sym_expression] = STATE(995),
+    [sym_primary_expression] = STATE(707),
+    [sym_not_operator] = STATE(985),
+    [sym_boolean_operator] = STATE(985),
+    [sym_binary_operator] = STATE(759),
+    [sym_unary_operator] = STATE(759),
+    [sym_comparison_operator] = STATE(985),
+    [sym_lambda] = STATE(985),
+    [sym_assignment] = STATE(1313),
+    [sym_augmented_assignment] = STATE(1313),
+    [sym_pattern_list] = STATE(880),
+    [sym_yield] = STATE(1313),
+    [sym_attribute] = STATE(422),
+    [sym_subscript] = STATE(422),
+    [sym_call] = STATE(759),
+    [sym_list] = STATE(759),
+    [sym_set] = STATE(759),
+    [sym_tuple] = STATE(759),
+    [sym_dictionary] = STATE(759),
+    [sym_list_comprehension] = STATE(759),
+    [sym_dictionary_comprehension] = STATE(759),
+    [sym_set_comprehension] = STATE(759),
+    [sym_generator_expression] = STATE(759),
+    [sym_parenthesized_expression] = STATE(759),
+    [sym_conditional_expression] = STATE(985),
+    [sym_concatenated_string] = STATE(759),
+    [sym_string] = STATE(709),
+    [sym_await] = STATE(759),
+    [aux_sym_module_repeat1] = STATE(61),
+    [aux_sym_decorated_definition_repeat1] = STATE(947),
     [sym_identifier] = ACTIONS(7),
     [anon_sym_import] = ACTIONS(9),
     [anon_sym_from] = ACTIONS(11),
@@ -15093,73 +12473,73 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym__string_start] = ACTIONS(81),
   },
   [42] = {
-    [sym__statement] = STATE(66),
-    [sym__simple_statements] = STATE(66),
-    [sym_import_statement] = STATE(1319),
-    [sym_future_import_statement] = STATE(1319),
-    [sym_import_from_statement] = STATE(1319),
-    [sym_print_statement] = STATE(1319),
-    [sym_assert_statement] = STATE(1319),
-    [sym_expression_statement] = STATE(1319),
-    [sym_named_expression] = STATE(1009),
-    [sym_return_statement] = STATE(1319),
-    [sym_delete_statement] = STATE(1319),
-    [sym_raise_statement] = STATE(1319),
-    [sym_pass_statement] = STATE(1319),
-    [sym_break_statement] = STATE(1319),
-    [sym_continue_statement] = STATE(1319),
-    [sym_if_statement] = STATE(66),
-    [sym_for_statement] = STATE(66),
-    [sym_while_statement] = STATE(66),
-    [sym_try_statement] = STATE(66),
-    [sym_with_statement] = STATE(66),
-    [sym_match_statement] = STATE(66),
-    [sym_function_definition] = STATE(66),
-    [sym_list_splat] = STATE(1360),
-    [sym_dictionary_splat] = STATE(1360),
-    [sym_global_statement] = STATE(1319),
-    [sym_nonlocal_statement] = STATE(1319),
-    [sym_exec_statement] = STATE(1319),
-    [sym_type_alias_statement] = STATE(1319),
-    [sym_class_definition] = STATE(66),
-    [sym_decorated_definition] = STATE(66),
-    [sym_decorator] = STATE(996),
-    [sym_block] = STATE(318),
-    [sym_expression_list] = STATE(1361),
-    [sym_pattern] = STATE(889),
-    [sym_tuple_pattern] = STATE(875),
-    [sym_list_pattern] = STATE(875),
-    [sym_list_splat_pattern] = STATE(875),
-    [sym_expression] = STATE(1019),
-    [sym_primary_expression] = STATE(684),
-    [sym_not_operator] = STATE(1009),
-    [sym_boolean_operator] = STATE(1009),
-    [sym_binary_operator] = STATE(797),
-    [sym_unary_operator] = STATE(797),
-    [sym_comparison_operator] = STATE(1009),
-    [sym_lambda] = STATE(1009),
-    [sym_assignment] = STATE(1361),
-    [sym_augmented_assignment] = STATE(1361),
-    [sym_pattern_list] = STATE(897),
-    [sym_yield] = STATE(1361),
-    [sym_attribute] = STATE(431),
-    [sym_subscript] = STATE(431),
-    [sym_call] = STATE(797),
-    [sym_list] = STATE(797),
-    [sym_set] = STATE(797),
-    [sym_tuple] = STATE(797),
-    [sym_dictionary] = STATE(797),
-    [sym_list_comprehension] = STATE(797),
-    [sym_dictionary_comprehension] = STATE(797),
-    [sym_set_comprehension] = STATE(797),
-    [sym_generator_expression] = STATE(797),
-    [sym_parenthesized_expression] = STATE(797),
-    [sym_conditional_expression] = STATE(1009),
-    [sym_concatenated_string] = STATE(797),
-    [sym_string] = STATE(713),
-    [sym_await] = STATE(1009),
-    [aux_sym_module_repeat1] = STATE(66),
-    [aux_sym_decorated_definition_repeat1] = STATE(996),
+    [sym__statement] = STATE(60),
+    [sym__simple_statements] = STATE(60),
+    [sym_import_statement] = STATE(1213),
+    [sym_future_import_statement] = STATE(1213),
+    [sym_import_from_statement] = STATE(1213),
+    [sym_print_statement] = STATE(1213),
+    [sym_assert_statement] = STATE(1213),
+    [sym_expression_statement] = STATE(1213),
+    [sym_named_expression] = STATE(985),
+    [sym_return_statement] = STATE(1213),
+    [sym_delete_statement] = STATE(1213),
+    [sym_raise_statement] = STATE(1213),
+    [sym_pass_statement] = STATE(1213),
+    [sym_break_statement] = STATE(1213),
+    [sym_continue_statement] = STATE(1213),
+    [sym_if_statement] = STATE(60),
+    [sym_for_statement] = STATE(60),
+    [sym_while_statement] = STATE(60),
+    [sym_try_statement] = STATE(60),
+    [sym_with_statement] = STATE(60),
+    [sym_match_statement] = STATE(60),
+    [sym_function_definition] = STATE(60),
+    [sym_list_splat] = STATE(1321),
+    [sym_dictionary_splat] = STATE(1321),
+    [sym_global_statement] = STATE(1213),
+    [sym_nonlocal_statement] = STATE(1213),
+    [sym_exec_statement] = STATE(1213),
+    [sym_type_alias_statement] = STATE(1213),
+    [sym_class_definition] = STATE(60),
+    [sym_decorated_definition] = STATE(60),
+    [sym_decorator] = STATE(947),
+    [sym_block] = STATE(432),
+    [sym_expression_list] = STATE(1313),
+    [sym_pattern] = STATE(871),
+    [sym_tuple_pattern] = STATE(860),
+    [sym_list_pattern] = STATE(860),
+    [sym_list_splat_pattern] = STATE(860),
+    [sym_expression] = STATE(995),
+    [sym_primary_expression] = STATE(707),
+    [sym_not_operator] = STATE(985),
+    [sym_boolean_operator] = STATE(985),
+    [sym_binary_operator] = STATE(759),
+    [sym_unary_operator] = STATE(759),
+    [sym_comparison_operator] = STATE(985),
+    [sym_lambda] = STATE(985),
+    [sym_assignment] = STATE(1313),
+    [sym_augmented_assignment] = STATE(1313),
+    [sym_pattern_list] = STATE(880),
+    [sym_yield] = STATE(1313),
+    [sym_attribute] = STATE(422),
+    [sym_subscript] = STATE(422),
+    [sym_call] = STATE(759),
+    [sym_list] = STATE(759),
+    [sym_set] = STATE(759),
+    [sym_tuple] = STATE(759),
+    [sym_dictionary] = STATE(759),
+    [sym_list_comprehension] = STATE(759),
+    [sym_dictionary_comprehension] = STATE(759),
+    [sym_set_comprehension] = STATE(759),
+    [sym_generator_expression] = STATE(759),
+    [sym_parenthesized_expression] = STATE(759),
+    [sym_conditional_expression] = STATE(985),
+    [sym_concatenated_string] = STATE(759),
+    [sym_string] = STATE(709),
+    [sym_await] = STATE(759),
+    [aux_sym_module_repeat1] = STATE(60),
+    [aux_sym_decorated_definition_repeat1] = STATE(947),
     [sym_identifier] = ACTIONS(7),
     [anon_sym_import] = ACTIONS(9),
     [anon_sym_from] = ACTIONS(11),
@@ -15204,77 +12584,77 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_false] = ACTIONS(77),
     [sym_none] = ACTIONS(77),
     [sym_comment] = ACTIONS(3),
-    [sym__dedent] = ACTIONS(111),
+    [sym__dedent] = ACTIONS(101),
     [sym__string_start] = ACTIONS(81),
   },
   [43] = {
-    [sym__statement] = STATE(68),
-    [sym__simple_statements] = STATE(68),
-    [sym_import_statement] = STATE(1319),
-    [sym_future_import_statement] = STATE(1319),
-    [sym_import_from_statement] = STATE(1319),
-    [sym_print_statement] = STATE(1319),
-    [sym_assert_statement] = STATE(1319),
-    [sym_expression_statement] = STATE(1319),
-    [sym_named_expression] = STATE(1009),
-    [sym_return_statement] = STATE(1319),
-    [sym_delete_statement] = STATE(1319),
-    [sym_raise_statement] = STATE(1319),
-    [sym_pass_statement] = STATE(1319),
-    [sym_break_statement] = STATE(1319),
-    [sym_continue_statement] = STATE(1319),
-    [sym_if_statement] = STATE(68),
-    [sym_for_statement] = STATE(68),
-    [sym_while_statement] = STATE(68),
-    [sym_try_statement] = STATE(68),
-    [sym_with_statement] = STATE(68),
-    [sym_match_statement] = STATE(68),
-    [sym_function_definition] = STATE(68),
-    [sym_list_splat] = STATE(1360),
-    [sym_dictionary_splat] = STATE(1360),
-    [sym_global_statement] = STATE(1319),
-    [sym_nonlocal_statement] = STATE(1319),
-    [sym_exec_statement] = STATE(1319),
-    [sym_type_alias_statement] = STATE(1319),
-    [sym_class_definition] = STATE(68),
-    [sym_decorated_definition] = STATE(68),
-    [sym_decorator] = STATE(996),
-    [sym_block] = STATE(513),
-    [sym_expression_list] = STATE(1361),
-    [sym_pattern] = STATE(889),
-    [sym_tuple_pattern] = STATE(875),
-    [sym_list_pattern] = STATE(875),
-    [sym_list_splat_pattern] = STATE(875),
-    [sym_expression] = STATE(1019),
-    [sym_primary_expression] = STATE(684),
-    [sym_not_operator] = STATE(1009),
-    [sym_boolean_operator] = STATE(1009),
-    [sym_binary_operator] = STATE(797),
-    [sym_unary_operator] = STATE(797),
-    [sym_comparison_operator] = STATE(1009),
-    [sym_lambda] = STATE(1009),
-    [sym_assignment] = STATE(1361),
-    [sym_augmented_assignment] = STATE(1361),
-    [sym_pattern_list] = STATE(897),
-    [sym_yield] = STATE(1361),
-    [sym_attribute] = STATE(431),
-    [sym_subscript] = STATE(431),
-    [sym_call] = STATE(797),
-    [sym_list] = STATE(797),
-    [sym_set] = STATE(797),
-    [sym_tuple] = STATE(797),
-    [sym_dictionary] = STATE(797),
-    [sym_list_comprehension] = STATE(797),
-    [sym_dictionary_comprehension] = STATE(797),
-    [sym_set_comprehension] = STATE(797),
-    [sym_generator_expression] = STATE(797),
-    [sym_parenthesized_expression] = STATE(797),
-    [sym_conditional_expression] = STATE(1009),
-    [sym_concatenated_string] = STATE(797),
-    [sym_string] = STATE(713),
-    [sym_await] = STATE(1009),
-    [aux_sym_module_repeat1] = STATE(68),
-    [aux_sym_decorated_definition_repeat1] = STATE(996),
+    [sym__statement] = STATE(61),
+    [sym__simple_statements] = STATE(61),
+    [sym_import_statement] = STATE(1213),
+    [sym_future_import_statement] = STATE(1213),
+    [sym_import_from_statement] = STATE(1213),
+    [sym_print_statement] = STATE(1213),
+    [sym_assert_statement] = STATE(1213),
+    [sym_expression_statement] = STATE(1213),
+    [sym_named_expression] = STATE(985),
+    [sym_return_statement] = STATE(1213),
+    [sym_delete_statement] = STATE(1213),
+    [sym_raise_statement] = STATE(1213),
+    [sym_pass_statement] = STATE(1213),
+    [sym_break_statement] = STATE(1213),
+    [sym_continue_statement] = STATE(1213),
+    [sym_if_statement] = STATE(61),
+    [sym_for_statement] = STATE(61),
+    [sym_while_statement] = STATE(61),
+    [sym_try_statement] = STATE(61),
+    [sym_with_statement] = STATE(61),
+    [sym_match_statement] = STATE(61),
+    [sym_function_definition] = STATE(61),
+    [sym_list_splat] = STATE(1321),
+    [sym_dictionary_splat] = STATE(1321),
+    [sym_global_statement] = STATE(1213),
+    [sym_nonlocal_statement] = STATE(1213),
+    [sym_exec_statement] = STATE(1213),
+    [sym_type_alias_statement] = STATE(1213),
+    [sym_class_definition] = STATE(61),
+    [sym_decorated_definition] = STATE(61),
+    [sym_decorator] = STATE(947),
+    [sym_block] = STATE(505),
+    [sym_expression_list] = STATE(1313),
+    [sym_pattern] = STATE(871),
+    [sym_tuple_pattern] = STATE(860),
+    [sym_list_pattern] = STATE(860),
+    [sym_list_splat_pattern] = STATE(860),
+    [sym_expression] = STATE(995),
+    [sym_primary_expression] = STATE(707),
+    [sym_not_operator] = STATE(985),
+    [sym_boolean_operator] = STATE(985),
+    [sym_binary_operator] = STATE(759),
+    [sym_unary_operator] = STATE(759),
+    [sym_comparison_operator] = STATE(985),
+    [sym_lambda] = STATE(985),
+    [sym_assignment] = STATE(1313),
+    [sym_augmented_assignment] = STATE(1313),
+    [sym_pattern_list] = STATE(880),
+    [sym_yield] = STATE(1313),
+    [sym_attribute] = STATE(422),
+    [sym_subscript] = STATE(422),
+    [sym_call] = STATE(759),
+    [sym_list] = STATE(759),
+    [sym_set] = STATE(759),
+    [sym_tuple] = STATE(759),
+    [sym_dictionary] = STATE(759),
+    [sym_list_comprehension] = STATE(759),
+    [sym_dictionary_comprehension] = STATE(759),
+    [sym_set_comprehension] = STATE(759),
+    [sym_generator_expression] = STATE(759),
+    [sym_parenthesized_expression] = STATE(759),
+    [sym_conditional_expression] = STATE(985),
+    [sym_concatenated_string] = STATE(759),
+    [sym_string] = STATE(709),
+    [sym_await] = STATE(759),
+    [aux_sym_module_repeat1] = STATE(61),
+    [aux_sym_decorated_definition_repeat1] = STATE(947),
     [sym_identifier] = ACTIONS(7),
     [anon_sym_import] = ACTIONS(9),
     [anon_sym_from] = ACTIONS(11),
@@ -15323,711 +12703,21 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym__string_start] = ACTIONS(81),
   },
   [44] = {
-    [sym__statement] = STATE(61),
-    [sym__simple_statements] = STATE(61),
-    [sym_import_statement] = STATE(1319),
-    [sym_future_import_statement] = STATE(1319),
-    [sym_import_from_statement] = STATE(1319),
-    [sym_print_statement] = STATE(1319),
-    [sym_assert_statement] = STATE(1319),
-    [sym_expression_statement] = STATE(1319),
-    [sym_named_expression] = STATE(1009),
-    [sym_return_statement] = STATE(1319),
-    [sym_delete_statement] = STATE(1319),
-    [sym_raise_statement] = STATE(1319),
-    [sym_pass_statement] = STATE(1319),
-    [sym_break_statement] = STATE(1319),
-    [sym_continue_statement] = STATE(1319),
-    [sym_if_statement] = STATE(61),
-    [sym_for_statement] = STATE(61),
-    [sym_while_statement] = STATE(61),
-    [sym_try_statement] = STATE(61),
-    [sym_with_statement] = STATE(61),
-    [sym_match_statement] = STATE(61),
-    [sym_function_definition] = STATE(61),
-    [sym_list_splat] = STATE(1360),
-    [sym_dictionary_splat] = STATE(1360),
-    [sym_global_statement] = STATE(1319),
-    [sym_nonlocal_statement] = STATE(1319),
-    [sym_exec_statement] = STATE(1319),
-    [sym_type_alias_statement] = STATE(1319),
-    [sym_class_definition] = STATE(61),
-    [sym_decorated_definition] = STATE(61),
-    [sym_decorator] = STATE(996),
-    [sym_block] = STATE(533),
-    [sym_expression_list] = STATE(1361),
-    [sym_pattern] = STATE(889),
-    [sym_tuple_pattern] = STATE(875),
-    [sym_list_pattern] = STATE(875),
-    [sym_list_splat_pattern] = STATE(875),
-    [sym_expression] = STATE(1019),
-    [sym_primary_expression] = STATE(684),
-    [sym_not_operator] = STATE(1009),
-    [sym_boolean_operator] = STATE(1009),
-    [sym_binary_operator] = STATE(797),
-    [sym_unary_operator] = STATE(797),
-    [sym_comparison_operator] = STATE(1009),
-    [sym_lambda] = STATE(1009),
-    [sym_assignment] = STATE(1361),
-    [sym_augmented_assignment] = STATE(1361),
-    [sym_pattern_list] = STATE(897),
-    [sym_yield] = STATE(1361),
-    [sym_attribute] = STATE(431),
-    [sym_subscript] = STATE(431),
-    [sym_call] = STATE(797),
-    [sym_list] = STATE(797),
-    [sym_set] = STATE(797),
-    [sym_tuple] = STATE(797),
-    [sym_dictionary] = STATE(797),
-    [sym_list_comprehension] = STATE(797),
-    [sym_dictionary_comprehension] = STATE(797),
-    [sym_set_comprehension] = STATE(797),
-    [sym_generator_expression] = STATE(797),
-    [sym_parenthesized_expression] = STATE(797),
-    [sym_conditional_expression] = STATE(1009),
-    [sym_concatenated_string] = STATE(797),
-    [sym_string] = STATE(713),
-    [sym_await] = STATE(1009),
-    [aux_sym_module_repeat1] = STATE(61),
-    [aux_sym_decorated_definition_repeat1] = STATE(996),
-    [sym_identifier] = ACTIONS(7),
-    [anon_sym_import] = ACTIONS(9),
-    [anon_sym_from] = ACTIONS(11),
-    [anon_sym_LPAREN] = ACTIONS(13),
-    [anon_sym_STAR] = ACTIONS(15),
-    [anon_sym_print] = ACTIONS(17),
-    [anon_sym_assert] = ACTIONS(19),
-    [anon_sym_return] = ACTIONS(21),
-    [anon_sym_del] = ACTIONS(23),
-    [anon_sym_raise] = ACTIONS(25),
-    [anon_sym_pass] = ACTIONS(27),
-    [anon_sym_break] = ACTIONS(29),
-    [anon_sym_continue] = ACTIONS(31),
-    [anon_sym_if] = ACTIONS(83),
-    [anon_sym_async] = ACTIONS(85),
-    [anon_sym_for] = ACTIONS(87),
-    [anon_sym_while] = ACTIONS(89),
-    [anon_sym_try] = ACTIONS(91),
-    [anon_sym_with] = ACTIONS(93),
-    [anon_sym_match] = ACTIONS(95),
-    [anon_sym_DASH] = ACTIONS(47),
-    [anon_sym_PLUS] = ACTIONS(47),
-    [anon_sym_LBRACK] = ACTIONS(49),
-    [anon_sym_LBRACE] = ACTIONS(51),
-    [anon_sym_STAR_STAR] = ACTIONS(53),
-    [anon_sym_def] = ACTIONS(97),
-    [anon_sym_global] = ACTIONS(57),
-    [anon_sym_nonlocal] = ACTIONS(59),
-    [anon_sym_exec] = ACTIONS(61),
-    [anon_sym_type] = ACTIONS(63),
-    [anon_sym_class] = ACTIONS(99),
-    [anon_sym_AT] = ACTIONS(67),
-    [anon_sym_not] = ACTIONS(69),
-    [anon_sym_TILDE] = ACTIONS(47),
-    [anon_sym_lambda] = ACTIONS(71),
-    [anon_sym_yield] = ACTIONS(73),
-    [sym_ellipsis] = ACTIONS(75),
-    [sym_integer] = ACTIONS(77),
-    [sym_float] = ACTIONS(75),
-    [anon_sym_await] = ACTIONS(79),
-    [sym_true] = ACTIONS(77),
-    [sym_false] = ACTIONS(77),
-    [sym_none] = ACTIONS(77),
-    [sym_comment] = ACTIONS(3),
-    [sym__dedent] = ACTIONS(107),
-    [sym__string_start] = ACTIONS(81),
-  },
-  [45] = {
-    [sym__statement] = STATE(61),
-    [sym__simple_statements] = STATE(61),
-    [sym_import_statement] = STATE(1319),
-    [sym_future_import_statement] = STATE(1319),
-    [sym_import_from_statement] = STATE(1319),
-    [sym_print_statement] = STATE(1319),
-    [sym_assert_statement] = STATE(1319),
-    [sym_expression_statement] = STATE(1319),
-    [sym_named_expression] = STATE(1009),
-    [sym_return_statement] = STATE(1319),
-    [sym_delete_statement] = STATE(1319),
-    [sym_raise_statement] = STATE(1319),
-    [sym_pass_statement] = STATE(1319),
-    [sym_break_statement] = STATE(1319),
-    [sym_continue_statement] = STATE(1319),
-    [sym_if_statement] = STATE(61),
-    [sym_for_statement] = STATE(61),
-    [sym_while_statement] = STATE(61),
-    [sym_try_statement] = STATE(61),
-    [sym_with_statement] = STATE(61),
-    [sym_match_statement] = STATE(61),
-    [sym_function_definition] = STATE(61),
-    [sym_list_splat] = STATE(1360),
-    [sym_dictionary_splat] = STATE(1360),
-    [sym_global_statement] = STATE(1319),
-    [sym_nonlocal_statement] = STATE(1319),
-    [sym_exec_statement] = STATE(1319),
-    [sym_type_alias_statement] = STATE(1319),
-    [sym_class_definition] = STATE(61),
-    [sym_decorated_definition] = STATE(61),
-    [sym_decorator] = STATE(996),
-    [sym_block] = STATE(573),
-    [sym_expression_list] = STATE(1361),
-    [sym_pattern] = STATE(889),
-    [sym_tuple_pattern] = STATE(875),
-    [sym_list_pattern] = STATE(875),
-    [sym_list_splat_pattern] = STATE(875),
-    [sym_expression] = STATE(1019),
-    [sym_primary_expression] = STATE(684),
-    [sym_not_operator] = STATE(1009),
-    [sym_boolean_operator] = STATE(1009),
-    [sym_binary_operator] = STATE(797),
-    [sym_unary_operator] = STATE(797),
-    [sym_comparison_operator] = STATE(1009),
-    [sym_lambda] = STATE(1009),
-    [sym_assignment] = STATE(1361),
-    [sym_augmented_assignment] = STATE(1361),
-    [sym_pattern_list] = STATE(897),
-    [sym_yield] = STATE(1361),
-    [sym_attribute] = STATE(431),
-    [sym_subscript] = STATE(431),
-    [sym_call] = STATE(797),
-    [sym_list] = STATE(797),
-    [sym_set] = STATE(797),
-    [sym_tuple] = STATE(797),
-    [sym_dictionary] = STATE(797),
-    [sym_list_comprehension] = STATE(797),
-    [sym_dictionary_comprehension] = STATE(797),
-    [sym_set_comprehension] = STATE(797),
-    [sym_generator_expression] = STATE(797),
-    [sym_parenthesized_expression] = STATE(797),
-    [sym_conditional_expression] = STATE(1009),
-    [sym_concatenated_string] = STATE(797),
-    [sym_string] = STATE(713),
-    [sym_await] = STATE(1009),
-    [aux_sym_module_repeat1] = STATE(61),
-    [aux_sym_decorated_definition_repeat1] = STATE(996),
-    [sym_identifier] = ACTIONS(7),
-    [anon_sym_import] = ACTIONS(9),
-    [anon_sym_from] = ACTIONS(11),
-    [anon_sym_LPAREN] = ACTIONS(13),
-    [anon_sym_STAR] = ACTIONS(15),
-    [anon_sym_print] = ACTIONS(17),
-    [anon_sym_assert] = ACTIONS(19),
-    [anon_sym_return] = ACTIONS(21),
-    [anon_sym_del] = ACTIONS(23),
-    [anon_sym_raise] = ACTIONS(25),
-    [anon_sym_pass] = ACTIONS(27),
-    [anon_sym_break] = ACTIONS(29),
-    [anon_sym_continue] = ACTIONS(31),
-    [anon_sym_if] = ACTIONS(83),
-    [anon_sym_async] = ACTIONS(85),
-    [anon_sym_for] = ACTIONS(87),
-    [anon_sym_while] = ACTIONS(89),
-    [anon_sym_try] = ACTIONS(91),
-    [anon_sym_with] = ACTIONS(93),
-    [anon_sym_match] = ACTIONS(95),
-    [anon_sym_DASH] = ACTIONS(47),
-    [anon_sym_PLUS] = ACTIONS(47),
-    [anon_sym_LBRACK] = ACTIONS(49),
-    [anon_sym_LBRACE] = ACTIONS(51),
-    [anon_sym_STAR_STAR] = ACTIONS(53),
-    [anon_sym_def] = ACTIONS(97),
-    [anon_sym_global] = ACTIONS(57),
-    [anon_sym_nonlocal] = ACTIONS(59),
-    [anon_sym_exec] = ACTIONS(61),
-    [anon_sym_type] = ACTIONS(63),
-    [anon_sym_class] = ACTIONS(99),
-    [anon_sym_AT] = ACTIONS(67),
-    [anon_sym_not] = ACTIONS(69),
-    [anon_sym_TILDE] = ACTIONS(47),
-    [anon_sym_lambda] = ACTIONS(71),
-    [anon_sym_yield] = ACTIONS(73),
-    [sym_ellipsis] = ACTIONS(75),
-    [sym_integer] = ACTIONS(77),
-    [sym_float] = ACTIONS(75),
-    [anon_sym_await] = ACTIONS(79),
-    [sym_true] = ACTIONS(77),
-    [sym_false] = ACTIONS(77),
-    [sym_none] = ACTIONS(77),
-    [sym_comment] = ACTIONS(3),
-    [sym__dedent] = ACTIONS(107),
-    [sym__string_start] = ACTIONS(81),
-  },
-  [46] = {
-    [sym__statement] = STATE(61),
-    [sym__simple_statements] = STATE(61),
-    [sym_import_statement] = STATE(1319),
-    [sym_future_import_statement] = STATE(1319),
-    [sym_import_from_statement] = STATE(1319),
-    [sym_print_statement] = STATE(1319),
-    [sym_assert_statement] = STATE(1319),
-    [sym_expression_statement] = STATE(1319),
-    [sym_named_expression] = STATE(1009),
-    [sym_return_statement] = STATE(1319),
-    [sym_delete_statement] = STATE(1319),
-    [sym_raise_statement] = STATE(1319),
-    [sym_pass_statement] = STATE(1319),
-    [sym_break_statement] = STATE(1319),
-    [sym_continue_statement] = STATE(1319),
-    [sym_if_statement] = STATE(61),
-    [sym_for_statement] = STATE(61),
-    [sym_while_statement] = STATE(61),
-    [sym_try_statement] = STATE(61),
-    [sym_with_statement] = STATE(61),
-    [sym_match_statement] = STATE(61),
-    [sym_function_definition] = STATE(61),
-    [sym_list_splat] = STATE(1360),
-    [sym_dictionary_splat] = STATE(1360),
-    [sym_global_statement] = STATE(1319),
-    [sym_nonlocal_statement] = STATE(1319),
-    [sym_exec_statement] = STATE(1319),
-    [sym_type_alias_statement] = STATE(1319),
-    [sym_class_definition] = STATE(61),
-    [sym_decorated_definition] = STATE(61),
-    [sym_decorator] = STATE(996),
-    [sym_block] = STATE(427),
-    [sym_expression_list] = STATE(1361),
-    [sym_pattern] = STATE(889),
-    [sym_tuple_pattern] = STATE(875),
-    [sym_list_pattern] = STATE(875),
-    [sym_list_splat_pattern] = STATE(875),
-    [sym_expression] = STATE(1019),
-    [sym_primary_expression] = STATE(684),
-    [sym_not_operator] = STATE(1009),
-    [sym_boolean_operator] = STATE(1009),
-    [sym_binary_operator] = STATE(797),
-    [sym_unary_operator] = STATE(797),
-    [sym_comparison_operator] = STATE(1009),
-    [sym_lambda] = STATE(1009),
-    [sym_assignment] = STATE(1361),
-    [sym_augmented_assignment] = STATE(1361),
-    [sym_pattern_list] = STATE(897),
-    [sym_yield] = STATE(1361),
-    [sym_attribute] = STATE(431),
-    [sym_subscript] = STATE(431),
-    [sym_call] = STATE(797),
-    [sym_list] = STATE(797),
-    [sym_set] = STATE(797),
-    [sym_tuple] = STATE(797),
-    [sym_dictionary] = STATE(797),
-    [sym_list_comprehension] = STATE(797),
-    [sym_dictionary_comprehension] = STATE(797),
-    [sym_set_comprehension] = STATE(797),
-    [sym_generator_expression] = STATE(797),
-    [sym_parenthesized_expression] = STATE(797),
-    [sym_conditional_expression] = STATE(1009),
-    [sym_concatenated_string] = STATE(797),
-    [sym_string] = STATE(713),
-    [sym_await] = STATE(1009),
-    [aux_sym_module_repeat1] = STATE(61),
-    [aux_sym_decorated_definition_repeat1] = STATE(996),
-    [sym_identifier] = ACTIONS(7),
-    [anon_sym_import] = ACTIONS(9),
-    [anon_sym_from] = ACTIONS(11),
-    [anon_sym_LPAREN] = ACTIONS(13),
-    [anon_sym_STAR] = ACTIONS(15),
-    [anon_sym_print] = ACTIONS(17),
-    [anon_sym_assert] = ACTIONS(19),
-    [anon_sym_return] = ACTIONS(21),
-    [anon_sym_del] = ACTIONS(23),
-    [anon_sym_raise] = ACTIONS(25),
-    [anon_sym_pass] = ACTIONS(27),
-    [anon_sym_break] = ACTIONS(29),
-    [anon_sym_continue] = ACTIONS(31),
-    [anon_sym_if] = ACTIONS(83),
-    [anon_sym_async] = ACTIONS(85),
-    [anon_sym_for] = ACTIONS(87),
-    [anon_sym_while] = ACTIONS(89),
-    [anon_sym_try] = ACTIONS(91),
-    [anon_sym_with] = ACTIONS(93),
-    [anon_sym_match] = ACTIONS(95),
-    [anon_sym_DASH] = ACTIONS(47),
-    [anon_sym_PLUS] = ACTIONS(47),
-    [anon_sym_LBRACK] = ACTIONS(49),
-    [anon_sym_LBRACE] = ACTIONS(51),
-    [anon_sym_STAR_STAR] = ACTIONS(53),
-    [anon_sym_def] = ACTIONS(97),
-    [anon_sym_global] = ACTIONS(57),
-    [anon_sym_nonlocal] = ACTIONS(59),
-    [anon_sym_exec] = ACTIONS(61),
-    [anon_sym_type] = ACTIONS(63),
-    [anon_sym_class] = ACTIONS(99),
-    [anon_sym_AT] = ACTIONS(67),
-    [anon_sym_not] = ACTIONS(69),
-    [anon_sym_TILDE] = ACTIONS(47),
-    [anon_sym_lambda] = ACTIONS(71),
-    [anon_sym_yield] = ACTIONS(73),
-    [sym_ellipsis] = ACTIONS(75),
-    [sym_integer] = ACTIONS(77),
-    [sym_float] = ACTIONS(75),
-    [anon_sym_await] = ACTIONS(79),
-    [sym_true] = ACTIONS(77),
-    [sym_false] = ACTIONS(77),
-    [sym_none] = ACTIONS(77),
-    [sym_comment] = ACTIONS(3),
-    [sym__dedent] = ACTIONS(107),
-    [sym__string_start] = ACTIONS(81),
-  },
-  [47] = {
-    [sym__statement] = STATE(61),
-    [sym__simple_statements] = STATE(61),
-    [sym_import_statement] = STATE(1319),
-    [sym_future_import_statement] = STATE(1319),
-    [sym_import_from_statement] = STATE(1319),
-    [sym_print_statement] = STATE(1319),
-    [sym_assert_statement] = STATE(1319),
-    [sym_expression_statement] = STATE(1319),
-    [sym_named_expression] = STATE(1009),
-    [sym_return_statement] = STATE(1319),
-    [sym_delete_statement] = STATE(1319),
-    [sym_raise_statement] = STATE(1319),
-    [sym_pass_statement] = STATE(1319),
-    [sym_break_statement] = STATE(1319),
-    [sym_continue_statement] = STATE(1319),
-    [sym_if_statement] = STATE(61),
-    [sym_for_statement] = STATE(61),
-    [sym_while_statement] = STATE(61),
-    [sym_try_statement] = STATE(61),
-    [sym_with_statement] = STATE(61),
-    [sym_match_statement] = STATE(61),
-    [sym_function_definition] = STATE(61),
-    [sym_list_splat] = STATE(1360),
-    [sym_dictionary_splat] = STATE(1360),
-    [sym_global_statement] = STATE(1319),
-    [sym_nonlocal_statement] = STATE(1319),
-    [sym_exec_statement] = STATE(1319),
-    [sym_type_alias_statement] = STATE(1319),
-    [sym_class_definition] = STATE(61),
-    [sym_decorated_definition] = STATE(61),
-    [sym_decorator] = STATE(996),
-    [sym_block] = STATE(387),
-    [sym_expression_list] = STATE(1361),
-    [sym_pattern] = STATE(889),
-    [sym_tuple_pattern] = STATE(875),
-    [sym_list_pattern] = STATE(875),
-    [sym_list_splat_pattern] = STATE(875),
-    [sym_expression] = STATE(1019),
-    [sym_primary_expression] = STATE(684),
-    [sym_not_operator] = STATE(1009),
-    [sym_boolean_operator] = STATE(1009),
-    [sym_binary_operator] = STATE(797),
-    [sym_unary_operator] = STATE(797),
-    [sym_comparison_operator] = STATE(1009),
-    [sym_lambda] = STATE(1009),
-    [sym_assignment] = STATE(1361),
-    [sym_augmented_assignment] = STATE(1361),
-    [sym_pattern_list] = STATE(897),
-    [sym_yield] = STATE(1361),
-    [sym_attribute] = STATE(431),
-    [sym_subscript] = STATE(431),
-    [sym_call] = STATE(797),
-    [sym_list] = STATE(797),
-    [sym_set] = STATE(797),
-    [sym_tuple] = STATE(797),
-    [sym_dictionary] = STATE(797),
-    [sym_list_comprehension] = STATE(797),
-    [sym_dictionary_comprehension] = STATE(797),
-    [sym_set_comprehension] = STATE(797),
-    [sym_generator_expression] = STATE(797),
-    [sym_parenthesized_expression] = STATE(797),
-    [sym_conditional_expression] = STATE(1009),
-    [sym_concatenated_string] = STATE(797),
-    [sym_string] = STATE(713),
-    [sym_await] = STATE(1009),
-    [aux_sym_module_repeat1] = STATE(61),
-    [aux_sym_decorated_definition_repeat1] = STATE(996),
-    [sym_identifier] = ACTIONS(7),
-    [anon_sym_import] = ACTIONS(9),
-    [anon_sym_from] = ACTIONS(11),
-    [anon_sym_LPAREN] = ACTIONS(13),
-    [anon_sym_STAR] = ACTIONS(15),
-    [anon_sym_print] = ACTIONS(17),
-    [anon_sym_assert] = ACTIONS(19),
-    [anon_sym_return] = ACTIONS(21),
-    [anon_sym_del] = ACTIONS(23),
-    [anon_sym_raise] = ACTIONS(25),
-    [anon_sym_pass] = ACTIONS(27),
-    [anon_sym_break] = ACTIONS(29),
-    [anon_sym_continue] = ACTIONS(31),
-    [anon_sym_if] = ACTIONS(83),
-    [anon_sym_async] = ACTIONS(85),
-    [anon_sym_for] = ACTIONS(87),
-    [anon_sym_while] = ACTIONS(89),
-    [anon_sym_try] = ACTIONS(91),
-    [anon_sym_with] = ACTIONS(93),
-    [anon_sym_match] = ACTIONS(95),
-    [anon_sym_DASH] = ACTIONS(47),
-    [anon_sym_PLUS] = ACTIONS(47),
-    [anon_sym_LBRACK] = ACTIONS(49),
-    [anon_sym_LBRACE] = ACTIONS(51),
-    [anon_sym_STAR_STAR] = ACTIONS(53),
-    [anon_sym_def] = ACTIONS(97),
-    [anon_sym_global] = ACTIONS(57),
-    [anon_sym_nonlocal] = ACTIONS(59),
-    [anon_sym_exec] = ACTIONS(61),
-    [anon_sym_type] = ACTIONS(63),
-    [anon_sym_class] = ACTIONS(99),
-    [anon_sym_AT] = ACTIONS(67),
-    [anon_sym_not] = ACTIONS(69),
-    [anon_sym_TILDE] = ACTIONS(47),
-    [anon_sym_lambda] = ACTIONS(71),
-    [anon_sym_yield] = ACTIONS(73),
-    [sym_ellipsis] = ACTIONS(75),
-    [sym_integer] = ACTIONS(77),
-    [sym_float] = ACTIONS(75),
-    [anon_sym_await] = ACTIONS(79),
-    [sym_true] = ACTIONS(77),
-    [sym_false] = ACTIONS(77),
-    [sym_none] = ACTIONS(77),
-    [sym_comment] = ACTIONS(3),
-    [sym__dedent] = ACTIONS(107),
-    [sym__string_start] = ACTIONS(81),
-  },
-  [48] = {
-    [sym__statement] = STATE(61),
-    [sym__simple_statements] = STATE(61),
-    [sym_import_statement] = STATE(1319),
-    [sym_future_import_statement] = STATE(1319),
-    [sym_import_from_statement] = STATE(1319),
-    [sym_print_statement] = STATE(1319),
-    [sym_assert_statement] = STATE(1319),
-    [sym_expression_statement] = STATE(1319),
-    [sym_named_expression] = STATE(1009),
-    [sym_return_statement] = STATE(1319),
-    [sym_delete_statement] = STATE(1319),
-    [sym_raise_statement] = STATE(1319),
-    [sym_pass_statement] = STATE(1319),
-    [sym_break_statement] = STATE(1319),
-    [sym_continue_statement] = STATE(1319),
-    [sym_if_statement] = STATE(61),
-    [sym_for_statement] = STATE(61),
-    [sym_while_statement] = STATE(61),
-    [sym_try_statement] = STATE(61),
-    [sym_with_statement] = STATE(61),
-    [sym_match_statement] = STATE(61),
-    [sym_function_definition] = STATE(61),
-    [sym_list_splat] = STATE(1360),
-    [sym_dictionary_splat] = STATE(1360),
-    [sym_global_statement] = STATE(1319),
-    [sym_nonlocal_statement] = STATE(1319),
-    [sym_exec_statement] = STATE(1319),
-    [sym_type_alias_statement] = STATE(1319),
-    [sym_class_definition] = STATE(61),
-    [sym_decorated_definition] = STATE(61),
-    [sym_decorator] = STATE(996),
-    [sym_block] = STATE(496),
-    [sym_expression_list] = STATE(1361),
-    [sym_pattern] = STATE(889),
-    [sym_tuple_pattern] = STATE(875),
-    [sym_list_pattern] = STATE(875),
-    [sym_list_splat_pattern] = STATE(875),
-    [sym_expression] = STATE(1019),
-    [sym_primary_expression] = STATE(684),
-    [sym_not_operator] = STATE(1009),
-    [sym_boolean_operator] = STATE(1009),
-    [sym_binary_operator] = STATE(797),
-    [sym_unary_operator] = STATE(797),
-    [sym_comparison_operator] = STATE(1009),
-    [sym_lambda] = STATE(1009),
-    [sym_assignment] = STATE(1361),
-    [sym_augmented_assignment] = STATE(1361),
-    [sym_pattern_list] = STATE(897),
-    [sym_yield] = STATE(1361),
-    [sym_attribute] = STATE(431),
-    [sym_subscript] = STATE(431),
-    [sym_call] = STATE(797),
-    [sym_list] = STATE(797),
-    [sym_set] = STATE(797),
-    [sym_tuple] = STATE(797),
-    [sym_dictionary] = STATE(797),
-    [sym_list_comprehension] = STATE(797),
-    [sym_dictionary_comprehension] = STATE(797),
-    [sym_set_comprehension] = STATE(797),
-    [sym_generator_expression] = STATE(797),
-    [sym_parenthesized_expression] = STATE(797),
-    [sym_conditional_expression] = STATE(1009),
-    [sym_concatenated_string] = STATE(797),
-    [sym_string] = STATE(713),
-    [sym_await] = STATE(1009),
-    [aux_sym_module_repeat1] = STATE(61),
-    [aux_sym_decorated_definition_repeat1] = STATE(996),
-    [sym_identifier] = ACTIONS(7),
-    [anon_sym_import] = ACTIONS(9),
-    [anon_sym_from] = ACTIONS(11),
-    [anon_sym_LPAREN] = ACTIONS(13),
-    [anon_sym_STAR] = ACTIONS(15),
-    [anon_sym_print] = ACTIONS(17),
-    [anon_sym_assert] = ACTIONS(19),
-    [anon_sym_return] = ACTIONS(21),
-    [anon_sym_del] = ACTIONS(23),
-    [anon_sym_raise] = ACTIONS(25),
-    [anon_sym_pass] = ACTIONS(27),
-    [anon_sym_break] = ACTIONS(29),
-    [anon_sym_continue] = ACTIONS(31),
-    [anon_sym_if] = ACTIONS(83),
-    [anon_sym_async] = ACTIONS(85),
-    [anon_sym_for] = ACTIONS(87),
-    [anon_sym_while] = ACTIONS(89),
-    [anon_sym_try] = ACTIONS(91),
-    [anon_sym_with] = ACTIONS(93),
-    [anon_sym_match] = ACTIONS(95),
-    [anon_sym_DASH] = ACTIONS(47),
-    [anon_sym_PLUS] = ACTIONS(47),
-    [anon_sym_LBRACK] = ACTIONS(49),
-    [anon_sym_LBRACE] = ACTIONS(51),
-    [anon_sym_STAR_STAR] = ACTIONS(53),
-    [anon_sym_def] = ACTIONS(97),
-    [anon_sym_global] = ACTIONS(57),
-    [anon_sym_nonlocal] = ACTIONS(59),
-    [anon_sym_exec] = ACTIONS(61),
-    [anon_sym_type] = ACTIONS(63),
-    [anon_sym_class] = ACTIONS(99),
-    [anon_sym_AT] = ACTIONS(67),
-    [anon_sym_not] = ACTIONS(69),
-    [anon_sym_TILDE] = ACTIONS(47),
-    [anon_sym_lambda] = ACTIONS(71),
-    [anon_sym_yield] = ACTIONS(73),
-    [sym_ellipsis] = ACTIONS(75),
-    [sym_integer] = ACTIONS(77),
-    [sym_float] = ACTIONS(75),
-    [anon_sym_await] = ACTIONS(79),
-    [sym_true] = ACTIONS(77),
-    [sym_false] = ACTIONS(77),
-    [sym_none] = ACTIONS(77),
-    [sym_comment] = ACTIONS(3),
-    [sym__dedent] = ACTIONS(107),
-    [sym__string_start] = ACTIONS(81),
-  },
-  [49] = {
-    [sym__statement] = STATE(61),
-    [sym__simple_statements] = STATE(61),
-    [sym_import_statement] = STATE(1319),
-    [sym_future_import_statement] = STATE(1319),
-    [sym_import_from_statement] = STATE(1319),
-    [sym_print_statement] = STATE(1319),
-    [sym_assert_statement] = STATE(1319),
-    [sym_expression_statement] = STATE(1319),
-    [sym_named_expression] = STATE(1009),
-    [sym_return_statement] = STATE(1319),
-    [sym_delete_statement] = STATE(1319),
-    [sym_raise_statement] = STATE(1319),
-    [sym_pass_statement] = STATE(1319),
-    [sym_break_statement] = STATE(1319),
-    [sym_continue_statement] = STATE(1319),
-    [sym_if_statement] = STATE(61),
-    [sym_for_statement] = STATE(61),
-    [sym_while_statement] = STATE(61),
-    [sym_try_statement] = STATE(61),
-    [sym_with_statement] = STATE(61),
-    [sym_match_statement] = STATE(61),
-    [sym_function_definition] = STATE(61),
-    [sym_list_splat] = STATE(1360),
-    [sym_dictionary_splat] = STATE(1360),
-    [sym_global_statement] = STATE(1319),
-    [sym_nonlocal_statement] = STATE(1319),
-    [sym_exec_statement] = STATE(1319),
-    [sym_type_alias_statement] = STATE(1319),
-    [sym_class_definition] = STATE(61),
-    [sym_decorated_definition] = STATE(61),
-    [sym_decorator] = STATE(996),
-    [sym_block] = STATE(566),
-    [sym_expression_list] = STATE(1361),
-    [sym_pattern] = STATE(889),
-    [sym_tuple_pattern] = STATE(875),
-    [sym_list_pattern] = STATE(875),
-    [sym_list_splat_pattern] = STATE(875),
-    [sym_expression] = STATE(1019),
-    [sym_primary_expression] = STATE(684),
-    [sym_not_operator] = STATE(1009),
-    [sym_boolean_operator] = STATE(1009),
-    [sym_binary_operator] = STATE(797),
-    [sym_unary_operator] = STATE(797),
-    [sym_comparison_operator] = STATE(1009),
-    [sym_lambda] = STATE(1009),
-    [sym_assignment] = STATE(1361),
-    [sym_augmented_assignment] = STATE(1361),
-    [sym_pattern_list] = STATE(897),
-    [sym_yield] = STATE(1361),
-    [sym_attribute] = STATE(431),
-    [sym_subscript] = STATE(431),
-    [sym_call] = STATE(797),
-    [sym_list] = STATE(797),
-    [sym_set] = STATE(797),
-    [sym_tuple] = STATE(797),
-    [sym_dictionary] = STATE(797),
-    [sym_list_comprehension] = STATE(797),
-    [sym_dictionary_comprehension] = STATE(797),
-    [sym_set_comprehension] = STATE(797),
-    [sym_generator_expression] = STATE(797),
-    [sym_parenthesized_expression] = STATE(797),
-    [sym_conditional_expression] = STATE(1009),
-    [sym_concatenated_string] = STATE(797),
-    [sym_string] = STATE(713),
-    [sym_await] = STATE(1009),
-    [aux_sym_module_repeat1] = STATE(61),
-    [aux_sym_decorated_definition_repeat1] = STATE(996),
-    [sym_identifier] = ACTIONS(7),
-    [anon_sym_import] = ACTIONS(9),
-    [anon_sym_from] = ACTIONS(11),
-    [anon_sym_LPAREN] = ACTIONS(13),
-    [anon_sym_STAR] = ACTIONS(15),
-    [anon_sym_print] = ACTIONS(17),
-    [anon_sym_assert] = ACTIONS(19),
-    [anon_sym_return] = ACTIONS(21),
-    [anon_sym_del] = ACTIONS(23),
-    [anon_sym_raise] = ACTIONS(25),
-    [anon_sym_pass] = ACTIONS(27),
-    [anon_sym_break] = ACTIONS(29),
-    [anon_sym_continue] = ACTIONS(31),
-    [anon_sym_if] = ACTIONS(83),
-    [anon_sym_async] = ACTIONS(85),
-    [anon_sym_for] = ACTIONS(87),
-    [anon_sym_while] = ACTIONS(89),
-    [anon_sym_try] = ACTIONS(91),
-    [anon_sym_with] = ACTIONS(93),
-    [anon_sym_match] = ACTIONS(95),
-    [anon_sym_DASH] = ACTIONS(47),
-    [anon_sym_PLUS] = ACTIONS(47),
-    [anon_sym_LBRACK] = ACTIONS(49),
-    [anon_sym_LBRACE] = ACTIONS(51),
-    [anon_sym_STAR_STAR] = ACTIONS(53),
-    [anon_sym_def] = ACTIONS(97),
-    [anon_sym_global] = ACTIONS(57),
-    [anon_sym_nonlocal] = ACTIONS(59),
-    [anon_sym_exec] = ACTIONS(61),
-    [anon_sym_type] = ACTIONS(63),
-    [anon_sym_class] = ACTIONS(99),
-    [anon_sym_AT] = ACTIONS(67),
-    [anon_sym_not] = ACTIONS(69),
-    [anon_sym_TILDE] = ACTIONS(47),
-    [anon_sym_lambda] = ACTIONS(71),
-    [anon_sym_yield] = ACTIONS(73),
-    [sym_ellipsis] = ACTIONS(75),
-    [sym_integer] = ACTIONS(77),
-    [sym_float] = ACTIONS(75),
-    [anon_sym_await] = ACTIONS(79),
-    [sym_true] = ACTIONS(77),
-    [sym_false] = ACTIONS(77),
-    [sym_none] = ACTIONS(77),
-    [sym_comment] = ACTIONS(3),
-    [sym__dedent] = ACTIONS(107),
-    [sym__string_start] = ACTIONS(81),
-  },
-  [50] = {
     [sym__statement] = STATE(60),
     [sym__simple_statements] = STATE(60),
-    [sym_import_statement] = STATE(1319),
-    [sym_future_import_statement] = STATE(1319),
-    [sym_import_from_statement] = STATE(1319),
-    [sym_print_statement] = STATE(1319),
-    [sym_assert_statement] = STATE(1319),
-    [sym_expression_statement] = STATE(1319),
-    [sym_named_expression] = STATE(1009),
-    [sym_return_statement] = STATE(1319),
-    [sym_delete_statement] = STATE(1319),
-    [sym_raise_statement] = STATE(1319),
-    [sym_pass_statement] = STATE(1319),
-    [sym_break_statement] = STATE(1319),
-    [sym_continue_statement] = STATE(1319),
+    [sym_import_statement] = STATE(1213),
+    [sym_future_import_statement] = STATE(1213),
+    [sym_import_from_statement] = STATE(1213),
+    [sym_print_statement] = STATE(1213),
+    [sym_assert_statement] = STATE(1213),
+    [sym_expression_statement] = STATE(1213),
+    [sym_named_expression] = STATE(985),
+    [sym_return_statement] = STATE(1213),
+    [sym_delete_statement] = STATE(1213),
+    [sym_raise_statement] = STATE(1213),
+    [sym_pass_statement] = STATE(1213),
+    [sym_break_statement] = STATE(1213),
+    [sym_continue_statement] = STATE(1213),
     [sym_if_statement] = STATE(60),
     [sym_for_statement] = STATE(60),
     [sym_while_statement] = STATE(60),
@@ -16035,51 +12725,51 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_with_statement] = STATE(60),
     [sym_match_statement] = STATE(60),
     [sym_function_definition] = STATE(60),
-    [sym_list_splat] = STATE(1360),
-    [sym_dictionary_splat] = STATE(1360),
-    [sym_global_statement] = STATE(1319),
-    [sym_nonlocal_statement] = STATE(1319),
-    [sym_exec_statement] = STATE(1319),
-    [sym_type_alias_statement] = STATE(1319),
+    [sym_list_splat] = STATE(1321),
+    [sym_dictionary_splat] = STATE(1321),
+    [sym_global_statement] = STATE(1213),
+    [sym_nonlocal_statement] = STATE(1213),
+    [sym_exec_statement] = STATE(1213),
+    [sym_type_alias_statement] = STATE(1213),
     [sym_class_definition] = STATE(60),
     [sym_decorated_definition] = STATE(60),
-    [sym_decorator] = STATE(996),
-    [sym_block] = STATE(333),
-    [sym_expression_list] = STATE(1361),
-    [sym_pattern] = STATE(889),
-    [sym_tuple_pattern] = STATE(875),
-    [sym_list_pattern] = STATE(875),
-    [sym_list_splat_pattern] = STATE(875),
-    [sym_expression] = STATE(1019),
-    [sym_primary_expression] = STATE(684),
-    [sym_not_operator] = STATE(1009),
-    [sym_boolean_operator] = STATE(1009),
-    [sym_binary_operator] = STATE(797),
-    [sym_unary_operator] = STATE(797),
-    [sym_comparison_operator] = STATE(1009),
-    [sym_lambda] = STATE(1009),
-    [sym_assignment] = STATE(1361),
-    [sym_augmented_assignment] = STATE(1361),
-    [sym_pattern_list] = STATE(897),
-    [sym_yield] = STATE(1361),
-    [sym_attribute] = STATE(431),
-    [sym_subscript] = STATE(431),
-    [sym_call] = STATE(797),
-    [sym_list] = STATE(797),
-    [sym_set] = STATE(797),
-    [sym_tuple] = STATE(797),
-    [sym_dictionary] = STATE(797),
-    [sym_list_comprehension] = STATE(797),
-    [sym_dictionary_comprehension] = STATE(797),
-    [sym_set_comprehension] = STATE(797),
-    [sym_generator_expression] = STATE(797),
-    [sym_parenthesized_expression] = STATE(797),
-    [sym_conditional_expression] = STATE(1009),
-    [sym_concatenated_string] = STATE(797),
-    [sym_string] = STATE(713),
-    [sym_await] = STATE(1009),
+    [sym_decorator] = STATE(947),
+    [sym_block] = STATE(330),
+    [sym_expression_list] = STATE(1313),
+    [sym_pattern] = STATE(871),
+    [sym_tuple_pattern] = STATE(860),
+    [sym_list_pattern] = STATE(860),
+    [sym_list_splat_pattern] = STATE(860),
+    [sym_expression] = STATE(995),
+    [sym_primary_expression] = STATE(707),
+    [sym_not_operator] = STATE(985),
+    [sym_boolean_operator] = STATE(985),
+    [sym_binary_operator] = STATE(759),
+    [sym_unary_operator] = STATE(759),
+    [sym_comparison_operator] = STATE(985),
+    [sym_lambda] = STATE(985),
+    [sym_assignment] = STATE(1313),
+    [sym_augmented_assignment] = STATE(1313),
+    [sym_pattern_list] = STATE(880),
+    [sym_yield] = STATE(1313),
+    [sym_attribute] = STATE(422),
+    [sym_subscript] = STATE(422),
+    [sym_call] = STATE(759),
+    [sym_list] = STATE(759),
+    [sym_set] = STATE(759),
+    [sym_tuple] = STATE(759),
+    [sym_dictionary] = STATE(759),
+    [sym_list_comprehension] = STATE(759),
+    [sym_dictionary_comprehension] = STATE(759),
+    [sym_set_comprehension] = STATE(759),
+    [sym_generator_expression] = STATE(759),
+    [sym_parenthesized_expression] = STATE(759),
+    [sym_conditional_expression] = STATE(985),
+    [sym_concatenated_string] = STATE(759),
+    [sym_string] = STATE(709),
+    [sym_await] = STATE(759),
     [aux_sym_module_repeat1] = STATE(60),
-    [aux_sym_decorated_definition_repeat1] = STATE(996),
+    [aux_sym_decorated_definition_repeat1] = STATE(947),
     [sym_identifier] = ACTIONS(7),
     [anon_sym_import] = ACTIONS(9),
     [anon_sym_from] = ACTIONS(11),
@@ -16124,25 +12814,715 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_false] = ACTIONS(77),
     [sym_none] = ACTIONS(77),
     [sym_comment] = ACTIONS(3),
-    [sym__dedent] = ACTIONS(109),
+    [sym__dedent] = ACTIONS(101),
+    [sym__string_start] = ACTIONS(81),
+  },
+  [45] = {
+    [sym__statement] = STATE(60),
+    [sym__simple_statements] = STATE(60),
+    [sym_import_statement] = STATE(1213),
+    [sym_future_import_statement] = STATE(1213),
+    [sym_import_from_statement] = STATE(1213),
+    [sym_print_statement] = STATE(1213),
+    [sym_assert_statement] = STATE(1213),
+    [sym_expression_statement] = STATE(1213),
+    [sym_named_expression] = STATE(985),
+    [sym_return_statement] = STATE(1213),
+    [sym_delete_statement] = STATE(1213),
+    [sym_raise_statement] = STATE(1213),
+    [sym_pass_statement] = STATE(1213),
+    [sym_break_statement] = STATE(1213),
+    [sym_continue_statement] = STATE(1213),
+    [sym_if_statement] = STATE(60),
+    [sym_for_statement] = STATE(60),
+    [sym_while_statement] = STATE(60),
+    [sym_try_statement] = STATE(60),
+    [sym_with_statement] = STATE(60),
+    [sym_match_statement] = STATE(60),
+    [sym_function_definition] = STATE(60),
+    [sym_list_splat] = STATE(1321),
+    [sym_dictionary_splat] = STATE(1321),
+    [sym_global_statement] = STATE(1213),
+    [sym_nonlocal_statement] = STATE(1213),
+    [sym_exec_statement] = STATE(1213),
+    [sym_type_alias_statement] = STATE(1213),
+    [sym_class_definition] = STATE(60),
+    [sym_decorated_definition] = STATE(60),
+    [sym_decorator] = STATE(947),
+    [sym_block] = STATE(553),
+    [sym_expression_list] = STATE(1313),
+    [sym_pattern] = STATE(871),
+    [sym_tuple_pattern] = STATE(860),
+    [sym_list_pattern] = STATE(860),
+    [sym_list_splat_pattern] = STATE(860),
+    [sym_expression] = STATE(995),
+    [sym_primary_expression] = STATE(707),
+    [sym_not_operator] = STATE(985),
+    [sym_boolean_operator] = STATE(985),
+    [sym_binary_operator] = STATE(759),
+    [sym_unary_operator] = STATE(759),
+    [sym_comparison_operator] = STATE(985),
+    [sym_lambda] = STATE(985),
+    [sym_assignment] = STATE(1313),
+    [sym_augmented_assignment] = STATE(1313),
+    [sym_pattern_list] = STATE(880),
+    [sym_yield] = STATE(1313),
+    [sym_attribute] = STATE(422),
+    [sym_subscript] = STATE(422),
+    [sym_call] = STATE(759),
+    [sym_list] = STATE(759),
+    [sym_set] = STATE(759),
+    [sym_tuple] = STATE(759),
+    [sym_dictionary] = STATE(759),
+    [sym_list_comprehension] = STATE(759),
+    [sym_dictionary_comprehension] = STATE(759),
+    [sym_set_comprehension] = STATE(759),
+    [sym_generator_expression] = STATE(759),
+    [sym_parenthesized_expression] = STATE(759),
+    [sym_conditional_expression] = STATE(985),
+    [sym_concatenated_string] = STATE(759),
+    [sym_string] = STATE(709),
+    [sym_await] = STATE(759),
+    [aux_sym_module_repeat1] = STATE(60),
+    [aux_sym_decorated_definition_repeat1] = STATE(947),
+    [sym_identifier] = ACTIONS(7),
+    [anon_sym_import] = ACTIONS(9),
+    [anon_sym_from] = ACTIONS(11),
+    [anon_sym_LPAREN] = ACTIONS(13),
+    [anon_sym_STAR] = ACTIONS(15),
+    [anon_sym_print] = ACTIONS(17),
+    [anon_sym_assert] = ACTIONS(19),
+    [anon_sym_return] = ACTIONS(21),
+    [anon_sym_del] = ACTIONS(23),
+    [anon_sym_raise] = ACTIONS(25),
+    [anon_sym_pass] = ACTIONS(27),
+    [anon_sym_break] = ACTIONS(29),
+    [anon_sym_continue] = ACTIONS(31),
+    [anon_sym_if] = ACTIONS(83),
+    [anon_sym_async] = ACTIONS(85),
+    [anon_sym_for] = ACTIONS(87),
+    [anon_sym_while] = ACTIONS(89),
+    [anon_sym_try] = ACTIONS(91),
+    [anon_sym_with] = ACTIONS(93),
+    [anon_sym_match] = ACTIONS(95),
+    [anon_sym_DASH] = ACTIONS(47),
+    [anon_sym_PLUS] = ACTIONS(47),
+    [anon_sym_LBRACK] = ACTIONS(49),
+    [anon_sym_LBRACE] = ACTIONS(51),
+    [anon_sym_STAR_STAR] = ACTIONS(53),
+    [anon_sym_def] = ACTIONS(97),
+    [anon_sym_global] = ACTIONS(57),
+    [anon_sym_nonlocal] = ACTIONS(59),
+    [anon_sym_exec] = ACTIONS(61),
+    [anon_sym_type] = ACTIONS(63),
+    [anon_sym_class] = ACTIONS(99),
+    [anon_sym_AT] = ACTIONS(67),
+    [anon_sym_not] = ACTIONS(69),
+    [anon_sym_TILDE] = ACTIONS(47),
+    [anon_sym_lambda] = ACTIONS(71),
+    [anon_sym_yield] = ACTIONS(73),
+    [sym_ellipsis] = ACTIONS(75),
+    [sym_integer] = ACTIONS(77),
+    [sym_float] = ACTIONS(75),
+    [anon_sym_await] = ACTIONS(79),
+    [sym_true] = ACTIONS(77),
+    [sym_false] = ACTIONS(77),
+    [sym_none] = ACTIONS(77),
+    [sym_comment] = ACTIONS(3),
+    [sym__dedent] = ACTIONS(101),
+    [sym__string_start] = ACTIONS(81),
+  },
+  [46] = {
+    [sym__statement] = STATE(60),
+    [sym__simple_statements] = STATE(60),
+    [sym_import_statement] = STATE(1213),
+    [sym_future_import_statement] = STATE(1213),
+    [sym_import_from_statement] = STATE(1213),
+    [sym_print_statement] = STATE(1213),
+    [sym_assert_statement] = STATE(1213),
+    [sym_expression_statement] = STATE(1213),
+    [sym_named_expression] = STATE(985),
+    [sym_return_statement] = STATE(1213),
+    [sym_delete_statement] = STATE(1213),
+    [sym_raise_statement] = STATE(1213),
+    [sym_pass_statement] = STATE(1213),
+    [sym_break_statement] = STATE(1213),
+    [sym_continue_statement] = STATE(1213),
+    [sym_if_statement] = STATE(60),
+    [sym_for_statement] = STATE(60),
+    [sym_while_statement] = STATE(60),
+    [sym_try_statement] = STATE(60),
+    [sym_with_statement] = STATE(60),
+    [sym_match_statement] = STATE(60),
+    [sym_function_definition] = STATE(60),
+    [sym_list_splat] = STATE(1321),
+    [sym_dictionary_splat] = STATE(1321),
+    [sym_global_statement] = STATE(1213),
+    [sym_nonlocal_statement] = STATE(1213),
+    [sym_exec_statement] = STATE(1213),
+    [sym_type_alias_statement] = STATE(1213),
+    [sym_class_definition] = STATE(60),
+    [sym_decorated_definition] = STATE(60),
+    [sym_decorator] = STATE(947),
+    [sym_block] = STATE(449),
+    [sym_expression_list] = STATE(1313),
+    [sym_pattern] = STATE(871),
+    [sym_tuple_pattern] = STATE(860),
+    [sym_list_pattern] = STATE(860),
+    [sym_list_splat_pattern] = STATE(860),
+    [sym_expression] = STATE(995),
+    [sym_primary_expression] = STATE(707),
+    [sym_not_operator] = STATE(985),
+    [sym_boolean_operator] = STATE(985),
+    [sym_binary_operator] = STATE(759),
+    [sym_unary_operator] = STATE(759),
+    [sym_comparison_operator] = STATE(985),
+    [sym_lambda] = STATE(985),
+    [sym_assignment] = STATE(1313),
+    [sym_augmented_assignment] = STATE(1313),
+    [sym_pattern_list] = STATE(880),
+    [sym_yield] = STATE(1313),
+    [sym_attribute] = STATE(422),
+    [sym_subscript] = STATE(422),
+    [sym_call] = STATE(759),
+    [sym_list] = STATE(759),
+    [sym_set] = STATE(759),
+    [sym_tuple] = STATE(759),
+    [sym_dictionary] = STATE(759),
+    [sym_list_comprehension] = STATE(759),
+    [sym_dictionary_comprehension] = STATE(759),
+    [sym_set_comprehension] = STATE(759),
+    [sym_generator_expression] = STATE(759),
+    [sym_parenthesized_expression] = STATE(759),
+    [sym_conditional_expression] = STATE(985),
+    [sym_concatenated_string] = STATE(759),
+    [sym_string] = STATE(709),
+    [sym_await] = STATE(759),
+    [aux_sym_module_repeat1] = STATE(60),
+    [aux_sym_decorated_definition_repeat1] = STATE(947),
+    [sym_identifier] = ACTIONS(7),
+    [anon_sym_import] = ACTIONS(9),
+    [anon_sym_from] = ACTIONS(11),
+    [anon_sym_LPAREN] = ACTIONS(13),
+    [anon_sym_STAR] = ACTIONS(15),
+    [anon_sym_print] = ACTIONS(17),
+    [anon_sym_assert] = ACTIONS(19),
+    [anon_sym_return] = ACTIONS(21),
+    [anon_sym_del] = ACTIONS(23),
+    [anon_sym_raise] = ACTIONS(25),
+    [anon_sym_pass] = ACTIONS(27),
+    [anon_sym_break] = ACTIONS(29),
+    [anon_sym_continue] = ACTIONS(31),
+    [anon_sym_if] = ACTIONS(83),
+    [anon_sym_async] = ACTIONS(85),
+    [anon_sym_for] = ACTIONS(87),
+    [anon_sym_while] = ACTIONS(89),
+    [anon_sym_try] = ACTIONS(91),
+    [anon_sym_with] = ACTIONS(93),
+    [anon_sym_match] = ACTIONS(95),
+    [anon_sym_DASH] = ACTIONS(47),
+    [anon_sym_PLUS] = ACTIONS(47),
+    [anon_sym_LBRACK] = ACTIONS(49),
+    [anon_sym_LBRACE] = ACTIONS(51),
+    [anon_sym_STAR_STAR] = ACTIONS(53),
+    [anon_sym_def] = ACTIONS(97),
+    [anon_sym_global] = ACTIONS(57),
+    [anon_sym_nonlocal] = ACTIONS(59),
+    [anon_sym_exec] = ACTIONS(61),
+    [anon_sym_type] = ACTIONS(63),
+    [anon_sym_class] = ACTIONS(99),
+    [anon_sym_AT] = ACTIONS(67),
+    [anon_sym_not] = ACTIONS(69),
+    [anon_sym_TILDE] = ACTIONS(47),
+    [anon_sym_lambda] = ACTIONS(71),
+    [anon_sym_yield] = ACTIONS(73),
+    [sym_ellipsis] = ACTIONS(75),
+    [sym_integer] = ACTIONS(77),
+    [sym_float] = ACTIONS(75),
+    [anon_sym_await] = ACTIONS(79),
+    [sym_true] = ACTIONS(77),
+    [sym_false] = ACTIONS(77),
+    [sym_none] = ACTIONS(77),
+    [sym_comment] = ACTIONS(3),
+    [sym__dedent] = ACTIONS(101),
+    [sym__string_start] = ACTIONS(81),
+  },
+  [47] = {
+    [sym__statement] = STATE(60),
+    [sym__simple_statements] = STATE(60),
+    [sym_import_statement] = STATE(1213),
+    [sym_future_import_statement] = STATE(1213),
+    [sym_import_from_statement] = STATE(1213),
+    [sym_print_statement] = STATE(1213),
+    [sym_assert_statement] = STATE(1213),
+    [sym_expression_statement] = STATE(1213),
+    [sym_named_expression] = STATE(985),
+    [sym_return_statement] = STATE(1213),
+    [sym_delete_statement] = STATE(1213),
+    [sym_raise_statement] = STATE(1213),
+    [sym_pass_statement] = STATE(1213),
+    [sym_break_statement] = STATE(1213),
+    [sym_continue_statement] = STATE(1213),
+    [sym_if_statement] = STATE(60),
+    [sym_for_statement] = STATE(60),
+    [sym_while_statement] = STATE(60),
+    [sym_try_statement] = STATE(60),
+    [sym_with_statement] = STATE(60),
+    [sym_match_statement] = STATE(60),
+    [sym_function_definition] = STATE(60),
+    [sym_list_splat] = STATE(1321),
+    [sym_dictionary_splat] = STATE(1321),
+    [sym_global_statement] = STATE(1213),
+    [sym_nonlocal_statement] = STATE(1213),
+    [sym_exec_statement] = STATE(1213),
+    [sym_type_alias_statement] = STATE(1213),
+    [sym_class_definition] = STATE(60),
+    [sym_decorated_definition] = STATE(60),
+    [sym_decorator] = STATE(947),
+    [sym_block] = STATE(352),
+    [sym_expression_list] = STATE(1313),
+    [sym_pattern] = STATE(871),
+    [sym_tuple_pattern] = STATE(860),
+    [sym_list_pattern] = STATE(860),
+    [sym_list_splat_pattern] = STATE(860),
+    [sym_expression] = STATE(995),
+    [sym_primary_expression] = STATE(707),
+    [sym_not_operator] = STATE(985),
+    [sym_boolean_operator] = STATE(985),
+    [sym_binary_operator] = STATE(759),
+    [sym_unary_operator] = STATE(759),
+    [sym_comparison_operator] = STATE(985),
+    [sym_lambda] = STATE(985),
+    [sym_assignment] = STATE(1313),
+    [sym_augmented_assignment] = STATE(1313),
+    [sym_pattern_list] = STATE(880),
+    [sym_yield] = STATE(1313),
+    [sym_attribute] = STATE(422),
+    [sym_subscript] = STATE(422),
+    [sym_call] = STATE(759),
+    [sym_list] = STATE(759),
+    [sym_set] = STATE(759),
+    [sym_tuple] = STATE(759),
+    [sym_dictionary] = STATE(759),
+    [sym_list_comprehension] = STATE(759),
+    [sym_dictionary_comprehension] = STATE(759),
+    [sym_set_comprehension] = STATE(759),
+    [sym_generator_expression] = STATE(759),
+    [sym_parenthesized_expression] = STATE(759),
+    [sym_conditional_expression] = STATE(985),
+    [sym_concatenated_string] = STATE(759),
+    [sym_string] = STATE(709),
+    [sym_await] = STATE(759),
+    [aux_sym_module_repeat1] = STATE(60),
+    [aux_sym_decorated_definition_repeat1] = STATE(947),
+    [sym_identifier] = ACTIONS(7),
+    [anon_sym_import] = ACTIONS(9),
+    [anon_sym_from] = ACTIONS(11),
+    [anon_sym_LPAREN] = ACTIONS(13),
+    [anon_sym_STAR] = ACTIONS(15),
+    [anon_sym_print] = ACTIONS(17),
+    [anon_sym_assert] = ACTIONS(19),
+    [anon_sym_return] = ACTIONS(21),
+    [anon_sym_del] = ACTIONS(23),
+    [anon_sym_raise] = ACTIONS(25),
+    [anon_sym_pass] = ACTIONS(27),
+    [anon_sym_break] = ACTIONS(29),
+    [anon_sym_continue] = ACTIONS(31),
+    [anon_sym_if] = ACTIONS(83),
+    [anon_sym_async] = ACTIONS(85),
+    [anon_sym_for] = ACTIONS(87),
+    [anon_sym_while] = ACTIONS(89),
+    [anon_sym_try] = ACTIONS(91),
+    [anon_sym_with] = ACTIONS(93),
+    [anon_sym_match] = ACTIONS(95),
+    [anon_sym_DASH] = ACTIONS(47),
+    [anon_sym_PLUS] = ACTIONS(47),
+    [anon_sym_LBRACK] = ACTIONS(49),
+    [anon_sym_LBRACE] = ACTIONS(51),
+    [anon_sym_STAR_STAR] = ACTIONS(53),
+    [anon_sym_def] = ACTIONS(97),
+    [anon_sym_global] = ACTIONS(57),
+    [anon_sym_nonlocal] = ACTIONS(59),
+    [anon_sym_exec] = ACTIONS(61),
+    [anon_sym_type] = ACTIONS(63),
+    [anon_sym_class] = ACTIONS(99),
+    [anon_sym_AT] = ACTIONS(67),
+    [anon_sym_not] = ACTIONS(69),
+    [anon_sym_TILDE] = ACTIONS(47),
+    [anon_sym_lambda] = ACTIONS(71),
+    [anon_sym_yield] = ACTIONS(73),
+    [sym_ellipsis] = ACTIONS(75),
+    [sym_integer] = ACTIONS(77),
+    [sym_float] = ACTIONS(75),
+    [anon_sym_await] = ACTIONS(79),
+    [sym_true] = ACTIONS(77),
+    [sym_false] = ACTIONS(77),
+    [sym_none] = ACTIONS(77),
+    [sym_comment] = ACTIONS(3),
+    [sym__dedent] = ACTIONS(101),
+    [sym__string_start] = ACTIONS(81),
+  },
+  [48] = {
+    [sym__statement] = STATE(64),
+    [sym__simple_statements] = STATE(64),
+    [sym_import_statement] = STATE(1213),
+    [sym_future_import_statement] = STATE(1213),
+    [sym_import_from_statement] = STATE(1213),
+    [sym_print_statement] = STATE(1213),
+    [sym_assert_statement] = STATE(1213),
+    [sym_expression_statement] = STATE(1213),
+    [sym_named_expression] = STATE(985),
+    [sym_return_statement] = STATE(1213),
+    [sym_delete_statement] = STATE(1213),
+    [sym_raise_statement] = STATE(1213),
+    [sym_pass_statement] = STATE(1213),
+    [sym_break_statement] = STATE(1213),
+    [sym_continue_statement] = STATE(1213),
+    [sym_if_statement] = STATE(64),
+    [sym_for_statement] = STATE(64),
+    [sym_while_statement] = STATE(64),
+    [sym_try_statement] = STATE(64),
+    [sym_with_statement] = STATE(64),
+    [sym_match_statement] = STATE(64),
+    [sym_function_definition] = STATE(64),
+    [sym_list_splat] = STATE(1321),
+    [sym_dictionary_splat] = STATE(1321),
+    [sym_global_statement] = STATE(1213),
+    [sym_nonlocal_statement] = STATE(1213),
+    [sym_exec_statement] = STATE(1213),
+    [sym_type_alias_statement] = STATE(1213),
+    [sym_class_definition] = STATE(64),
+    [sym_decorated_definition] = STATE(64),
+    [sym_decorator] = STATE(947),
+    [sym_block] = STATE(1020),
+    [sym_expression_list] = STATE(1313),
+    [sym_pattern] = STATE(871),
+    [sym_tuple_pattern] = STATE(860),
+    [sym_list_pattern] = STATE(860),
+    [sym_list_splat_pattern] = STATE(860),
+    [sym_expression] = STATE(995),
+    [sym_primary_expression] = STATE(707),
+    [sym_not_operator] = STATE(985),
+    [sym_boolean_operator] = STATE(985),
+    [sym_binary_operator] = STATE(759),
+    [sym_unary_operator] = STATE(759),
+    [sym_comparison_operator] = STATE(985),
+    [sym_lambda] = STATE(985),
+    [sym_assignment] = STATE(1313),
+    [sym_augmented_assignment] = STATE(1313),
+    [sym_pattern_list] = STATE(880),
+    [sym_yield] = STATE(1313),
+    [sym_attribute] = STATE(422),
+    [sym_subscript] = STATE(422),
+    [sym_call] = STATE(759),
+    [sym_list] = STATE(759),
+    [sym_set] = STATE(759),
+    [sym_tuple] = STATE(759),
+    [sym_dictionary] = STATE(759),
+    [sym_list_comprehension] = STATE(759),
+    [sym_dictionary_comprehension] = STATE(759),
+    [sym_set_comprehension] = STATE(759),
+    [sym_generator_expression] = STATE(759),
+    [sym_parenthesized_expression] = STATE(759),
+    [sym_conditional_expression] = STATE(985),
+    [sym_concatenated_string] = STATE(759),
+    [sym_string] = STATE(709),
+    [sym_await] = STATE(759),
+    [aux_sym_module_repeat1] = STATE(64),
+    [aux_sym_decorated_definition_repeat1] = STATE(947),
+    [sym_identifier] = ACTIONS(7),
+    [anon_sym_import] = ACTIONS(9),
+    [anon_sym_from] = ACTIONS(11),
+    [anon_sym_LPAREN] = ACTIONS(13),
+    [anon_sym_STAR] = ACTIONS(15),
+    [anon_sym_print] = ACTIONS(17),
+    [anon_sym_assert] = ACTIONS(19),
+    [anon_sym_return] = ACTIONS(21),
+    [anon_sym_del] = ACTIONS(23),
+    [anon_sym_raise] = ACTIONS(25),
+    [anon_sym_pass] = ACTIONS(27),
+    [anon_sym_break] = ACTIONS(29),
+    [anon_sym_continue] = ACTIONS(31),
+    [anon_sym_if] = ACTIONS(83),
+    [anon_sym_async] = ACTIONS(85),
+    [anon_sym_for] = ACTIONS(87),
+    [anon_sym_while] = ACTIONS(89),
+    [anon_sym_try] = ACTIONS(91),
+    [anon_sym_with] = ACTIONS(93),
+    [anon_sym_match] = ACTIONS(95),
+    [anon_sym_DASH] = ACTIONS(47),
+    [anon_sym_PLUS] = ACTIONS(47),
+    [anon_sym_LBRACK] = ACTIONS(49),
+    [anon_sym_LBRACE] = ACTIONS(51),
+    [anon_sym_STAR_STAR] = ACTIONS(53),
+    [anon_sym_def] = ACTIONS(97),
+    [anon_sym_global] = ACTIONS(57),
+    [anon_sym_nonlocal] = ACTIONS(59),
+    [anon_sym_exec] = ACTIONS(61),
+    [anon_sym_type] = ACTIONS(63),
+    [anon_sym_class] = ACTIONS(99),
+    [anon_sym_AT] = ACTIONS(67),
+    [anon_sym_not] = ACTIONS(69),
+    [anon_sym_TILDE] = ACTIONS(47),
+    [anon_sym_lambda] = ACTIONS(71),
+    [anon_sym_yield] = ACTIONS(73),
+    [sym_ellipsis] = ACTIONS(75),
+    [sym_integer] = ACTIONS(77),
+    [sym_float] = ACTIONS(75),
+    [anon_sym_await] = ACTIONS(79),
+    [sym_true] = ACTIONS(77),
+    [sym_false] = ACTIONS(77),
+    [sym_none] = ACTIONS(77),
+    [sym_comment] = ACTIONS(3),
+    [sym__dedent] = ACTIONS(105),
+    [sym__string_start] = ACTIONS(81),
+  },
+  [49] = {
+    [sym__statement] = STATE(64),
+    [sym__simple_statements] = STATE(64),
+    [sym_import_statement] = STATE(1213),
+    [sym_future_import_statement] = STATE(1213),
+    [sym_import_from_statement] = STATE(1213),
+    [sym_print_statement] = STATE(1213),
+    [sym_assert_statement] = STATE(1213),
+    [sym_expression_statement] = STATE(1213),
+    [sym_named_expression] = STATE(985),
+    [sym_return_statement] = STATE(1213),
+    [sym_delete_statement] = STATE(1213),
+    [sym_raise_statement] = STATE(1213),
+    [sym_pass_statement] = STATE(1213),
+    [sym_break_statement] = STATE(1213),
+    [sym_continue_statement] = STATE(1213),
+    [sym_if_statement] = STATE(64),
+    [sym_for_statement] = STATE(64),
+    [sym_while_statement] = STATE(64),
+    [sym_try_statement] = STATE(64),
+    [sym_with_statement] = STATE(64),
+    [sym_match_statement] = STATE(64),
+    [sym_function_definition] = STATE(64),
+    [sym_list_splat] = STATE(1321),
+    [sym_dictionary_splat] = STATE(1321),
+    [sym_global_statement] = STATE(1213),
+    [sym_nonlocal_statement] = STATE(1213),
+    [sym_exec_statement] = STATE(1213),
+    [sym_type_alias_statement] = STATE(1213),
+    [sym_class_definition] = STATE(64),
+    [sym_decorated_definition] = STATE(64),
+    [sym_decorator] = STATE(947),
+    [sym_block] = STATE(997),
+    [sym_expression_list] = STATE(1313),
+    [sym_pattern] = STATE(871),
+    [sym_tuple_pattern] = STATE(860),
+    [sym_list_pattern] = STATE(860),
+    [sym_list_splat_pattern] = STATE(860),
+    [sym_expression] = STATE(995),
+    [sym_primary_expression] = STATE(707),
+    [sym_not_operator] = STATE(985),
+    [sym_boolean_operator] = STATE(985),
+    [sym_binary_operator] = STATE(759),
+    [sym_unary_operator] = STATE(759),
+    [sym_comparison_operator] = STATE(985),
+    [sym_lambda] = STATE(985),
+    [sym_assignment] = STATE(1313),
+    [sym_augmented_assignment] = STATE(1313),
+    [sym_pattern_list] = STATE(880),
+    [sym_yield] = STATE(1313),
+    [sym_attribute] = STATE(422),
+    [sym_subscript] = STATE(422),
+    [sym_call] = STATE(759),
+    [sym_list] = STATE(759),
+    [sym_set] = STATE(759),
+    [sym_tuple] = STATE(759),
+    [sym_dictionary] = STATE(759),
+    [sym_list_comprehension] = STATE(759),
+    [sym_dictionary_comprehension] = STATE(759),
+    [sym_set_comprehension] = STATE(759),
+    [sym_generator_expression] = STATE(759),
+    [sym_parenthesized_expression] = STATE(759),
+    [sym_conditional_expression] = STATE(985),
+    [sym_concatenated_string] = STATE(759),
+    [sym_string] = STATE(709),
+    [sym_await] = STATE(759),
+    [aux_sym_module_repeat1] = STATE(64),
+    [aux_sym_decorated_definition_repeat1] = STATE(947),
+    [sym_identifier] = ACTIONS(7),
+    [anon_sym_import] = ACTIONS(9),
+    [anon_sym_from] = ACTIONS(11),
+    [anon_sym_LPAREN] = ACTIONS(13),
+    [anon_sym_STAR] = ACTIONS(15),
+    [anon_sym_print] = ACTIONS(17),
+    [anon_sym_assert] = ACTIONS(19),
+    [anon_sym_return] = ACTIONS(21),
+    [anon_sym_del] = ACTIONS(23),
+    [anon_sym_raise] = ACTIONS(25),
+    [anon_sym_pass] = ACTIONS(27),
+    [anon_sym_break] = ACTIONS(29),
+    [anon_sym_continue] = ACTIONS(31),
+    [anon_sym_if] = ACTIONS(83),
+    [anon_sym_async] = ACTIONS(85),
+    [anon_sym_for] = ACTIONS(87),
+    [anon_sym_while] = ACTIONS(89),
+    [anon_sym_try] = ACTIONS(91),
+    [anon_sym_with] = ACTIONS(93),
+    [anon_sym_match] = ACTIONS(95),
+    [anon_sym_DASH] = ACTIONS(47),
+    [anon_sym_PLUS] = ACTIONS(47),
+    [anon_sym_LBRACK] = ACTIONS(49),
+    [anon_sym_LBRACE] = ACTIONS(51),
+    [anon_sym_STAR_STAR] = ACTIONS(53),
+    [anon_sym_def] = ACTIONS(97),
+    [anon_sym_global] = ACTIONS(57),
+    [anon_sym_nonlocal] = ACTIONS(59),
+    [anon_sym_exec] = ACTIONS(61),
+    [anon_sym_type] = ACTIONS(63),
+    [anon_sym_class] = ACTIONS(99),
+    [anon_sym_AT] = ACTIONS(67),
+    [anon_sym_not] = ACTIONS(69),
+    [anon_sym_TILDE] = ACTIONS(47),
+    [anon_sym_lambda] = ACTIONS(71),
+    [anon_sym_yield] = ACTIONS(73),
+    [sym_ellipsis] = ACTIONS(75),
+    [sym_integer] = ACTIONS(77),
+    [sym_float] = ACTIONS(75),
+    [anon_sym_await] = ACTIONS(79),
+    [sym_true] = ACTIONS(77),
+    [sym_false] = ACTIONS(77),
+    [sym_none] = ACTIONS(77),
+    [sym_comment] = ACTIONS(3),
+    [sym__dedent] = ACTIONS(105),
+    [sym__string_start] = ACTIONS(81),
+  },
+  [50] = {
+    [sym__statement] = STATE(60),
+    [sym__simple_statements] = STATE(60),
+    [sym_import_statement] = STATE(1213),
+    [sym_future_import_statement] = STATE(1213),
+    [sym_import_from_statement] = STATE(1213),
+    [sym_print_statement] = STATE(1213),
+    [sym_assert_statement] = STATE(1213),
+    [sym_expression_statement] = STATE(1213),
+    [sym_named_expression] = STATE(985),
+    [sym_return_statement] = STATE(1213),
+    [sym_delete_statement] = STATE(1213),
+    [sym_raise_statement] = STATE(1213),
+    [sym_pass_statement] = STATE(1213),
+    [sym_break_statement] = STATE(1213),
+    [sym_continue_statement] = STATE(1213),
+    [sym_if_statement] = STATE(60),
+    [sym_for_statement] = STATE(60),
+    [sym_while_statement] = STATE(60),
+    [sym_try_statement] = STATE(60),
+    [sym_with_statement] = STATE(60),
+    [sym_match_statement] = STATE(60),
+    [sym_function_definition] = STATE(60),
+    [sym_list_splat] = STATE(1321),
+    [sym_dictionary_splat] = STATE(1321),
+    [sym_global_statement] = STATE(1213),
+    [sym_nonlocal_statement] = STATE(1213),
+    [sym_exec_statement] = STATE(1213),
+    [sym_type_alias_statement] = STATE(1213),
+    [sym_class_definition] = STATE(60),
+    [sym_decorated_definition] = STATE(60),
+    [sym_decorator] = STATE(947),
+    [sym_block] = STATE(529),
+    [sym_expression_list] = STATE(1313),
+    [sym_pattern] = STATE(871),
+    [sym_tuple_pattern] = STATE(860),
+    [sym_list_pattern] = STATE(860),
+    [sym_list_splat_pattern] = STATE(860),
+    [sym_expression] = STATE(995),
+    [sym_primary_expression] = STATE(707),
+    [sym_not_operator] = STATE(985),
+    [sym_boolean_operator] = STATE(985),
+    [sym_binary_operator] = STATE(759),
+    [sym_unary_operator] = STATE(759),
+    [sym_comparison_operator] = STATE(985),
+    [sym_lambda] = STATE(985),
+    [sym_assignment] = STATE(1313),
+    [sym_augmented_assignment] = STATE(1313),
+    [sym_pattern_list] = STATE(880),
+    [sym_yield] = STATE(1313),
+    [sym_attribute] = STATE(422),
+    [sym_subscript] = STATE(422),
+    [sym_call] = STATE(759),
+    [sym_list] = STATE(759),
+    [sym_set] = STATE(759),
+    [sym_tuple] = STATE(759),
+    [sym_dictionary] = STATE(759),
+    [sym_list_comprehension] = STATE(759),
+    [sym_dictionary_comprehension] = STATE(759),
+    [sym_set_comprehension] = STATE(759),
+    [sym_generator_expression] = STATE(759),
+    [sym_parenthesized_expression] = STATE(759),
+    [sym_conditional_expression] = STATE(985),
+    [sym_concatenated_string] = STATE(759),
+    [sym_string] = STATE(709),
+    [sym_await] = STATE(759),
+    [aux_sym_module_repeat1] = STATE(60),
+    [aux_sym_decorated_definition_repeat1] = STATE(947),
+    [sym_identifier] = ACTIONS(7),
+    [anon_sym_import] = ACTIONS(9),
+    [anon_sym_from] = ACTIONS(11),
+    [anon_sym_LPAREN] = ACTIONS(13),
+    [anon_sym_STAR] = ACTIONS(15),
+    [anon_sym_print] = ACTIONS(17),
+    [anon_sym_assert] = ACTIONS(19),
+    [anon_sym_return] = ACTIONS(21),
+    [anon_sym_del] = ACTIONS(23),
+    [anon_sym_raise] = ACTIONS(25),
+    [anon_sym_pass] = ACTIONS(27),
+    [anon_sym_break] = ACTIONS(29),
+    [anon_sym_continue] = ACTIONS(31),
+    [anon_sym_if] = ACTIONS(83),
+    [anon_sym_async] = ACTIONS(85),
+    [anon_sym_for] = ACTIONS(87),
+    [anon_sym_while] = ACTIONS(89),
+    [anon_sym_try] = ACTIONS(91),
+    [anon_sym_with] = ACTIONS(93),
+    [anon_sym_match] = ACTIONS(95),
+    [anon_sym_DASH] = ACTIONS(47),
+    [anon_sym_PLUS] = ACTIONS(47),
+    [anon_sym_LBRACK] = ACTIONS(49),
+    [anon_sym_LBRACE] = ACTIONS(51),
+    [anon_sym_STAR_STAR] = ACTIONS(53),
+    [anon_sym_def] = ACTIONS(97),
+    [anon_sym_global] = ACTIONS(57),
+    [anon_sym_nonlocal] = ACTIONS(59),
+    [anon_sym_exec] = ACTIONS(61),
+    [anon_sym_type] = ACTIONS(63),
+    [anon_sym_class] = ACTIONS(99),
+    [anon_sym_AT] = ACTIONS(67),
+    [anon_sym_not] = ACTIONS(69),
+    [anon_sym_TILDE] = ACTIONS(47),
+    [anon_sym_lambda] = ACTIONS(71),
+    [anon_sym_yield] = ACTIONS(73),
+    [sym_ellipsis] = ACTIONS(75),
+    [sym_integer] = ACTIONS(77),
+    [sym_float] = ACTIONS(75),
+    [anon_sym_await] = ACTIONS(79),
+    [sym_true] = ACTIONS(77),
+    [sym_false] = ACTIONS(77),
+    [sym_none] = ACTIONS(77),
+    [sym_comment] = ACTIONS(3),
+    [sym__dedent] = ACTIONS(101),
     [sym__string_start] = ACTIONS(81),
   },
   [51] = {
     [sym__statement] = STATE(61),
     [sym__simple_statements] = STATE(61),
-    [sym_import_statement] = STATE(1319),
-    [sym_future_import_statement] = STATE(1319),
-    [sym_import_from_statement] = STATE(1319),
-    [sym_print_statement] = STATE(1319),
-    [sym_assert_statement] = STATE(1319),
-    [sym_expression_statement] = STATE(1319),
-    [sym_named_expression] = STATE(1009),
-    [sym_return_statement] = STATE(1319),
-    [sym_delete_statement] = STATE(1319),
-    [sym_raise_statement] = STATE(1319),
-    [sym_pass_statement] = STATE(1319),
-    [sym_break_statement] = STATE(1319),
-    [sym_continue_statement] = STATE(1319),
+    [sym_import_statement] = STATE(1213),
+    [sym_future_import_statement] = STATE(1213),
+    [sym_import_from_statement] = STATE(1213),
+    [sym_print_statement] = STATE(1213),
+    [sym_assert_statement] = STATE(1213),
+    [sym_expression_statement] = STATE(1213),
+    [sym_named_expression] = STATE(985),
+    [sym_return_statement] = STATE(1213),
+    [sym_delete_statement] = STATE(1213),
+    [sym_raise_statement] = STATE(1213),
+    [sym_pass_statement] = STATE(1213),
+    [sym_break_statement] = STATE(1213),
+    [sym_continue_statement] = STATE(1213),
     [sym_if_statement] = STATE(61),
     [sym_for_statement] = STATE(61),
     [sym_while_statement] = STATE(61),
@@ -16150,51 +13530,51 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_with_statement] = STATE(61),
     [sym_match_statement] = STATE(61),
     [sym_function_definition] = STATE(61),
-    [sym_list_splat] = STATE(1360),
-    [sym_dictionary_splat] = STATE(1360),
-    [sym_global_statement] = STATE(1319),
-    [sym_nonlocal_statement] = STATE(1319),
-    [sym_exec_statement] = STATE(1319),
-    [sym_type_alias_statement] = STATE(1319),
+    [sym_list_splat] = STATE(1321),
+    [sym_dictionary_splat] = STATE(1321),
+    [sym_global_statement] = STATE(1213),
+    [sym_nonlocal_statement] = STATE(1213),
+    [sym_exec_statement] = STATE(1213),
+    [sym_type_alias_statement] = STATE(1213),
     [sym_class_definition] = STATE(61),
     [sym_decorated_definition] = STATE(61),
-    [sym_decorator] = STATE(996),
-    [sym_block] = STATE(407),
-    [sym_expression_list] = STATE(1361),
-    [sym_pattern] = STATE(889),
-    [sym_tuple_pattern] = STATE(875),
-    [sym_list_pattern] = STATE(875),
-    [sym_list_splat_pattern] = STATE(875),
-    [sym_expression] = STATE(1019),
-    [sym_primary_expression] = STATE(684),
-    [sym_not_operator] = STATE(1009),
-    [sym_boolean_operator] = STATE(1009),
-    [sym_binary_operator] = STATE(797),
-    [sym_unary_operator] = STATE(797),
-    [sym_comparison_operator] = STATE(1009),
-    [sym_lambda] = STATE(1009),
-    [sym_assignment] = STATE(1361),
-    [sym_augmented_assignment] = STATE(1361),
-    [sym_pattern_list] = STATE(897),
-    [sym_yield] = STATE(1361),
-    [sym_attribute] = STATE(431),
-    [sym_subscript] = STATE(431),
-    [sym_call] = STATE(797),
-    [sym_list] = STATE(797),
-    [sym_set] = STATE(797),
-    [sym_tuple] = STATE(797),
-    [sym_dictionary] = STATE(797),
-    [sym_list_comprehension] = STATE(797),
-    [sym_dictionary_comprehension] = STATE(797),
-    [sym_set_comprehension] = STATE(797),
-    [sym_generator_expression] = STATE(797),
-    [sym_parenthesized_expression] = STATE(797),
-    [sym_conditional_expression] = STATE(1009),
-    [sym_concatenated_string] = STATE(797),
-    [sym_string] = STATE(713),
-    [sym_await] = STATE(1009),
+    [sym_decorator] = STATE(947),
+    [sym_block] = STATE(281),
+    [sym_expression_list] = STATE(1313),
+    [sym_pattern] = STATE(871),
+    [sym_tuple_pattern] = STATE(860),
+    [sym_list_pattern] = STATE(860),
+    [sym_list_splat_pattern] = STATE(860),
+    [sym_expression] = STATE(995),
+    [sym_primary_expression] = STATE(707),
+    [sym_not_operator] = STATE(985),
+    [sym_boolean_operator] = STATE(985),
+    [sym_binary_operator] = STATE(759),
+    [sym_unary_operator] = STATE(759),
+    [sym_comparison_operator] = STATE(985),
+    [sym_lambda] = STATE(985),
+    [sym_assignment] = STATE(1313),
+    [sym_augmented_assignment] = STATE(1313),
+    [sym_pattern_list] = STATE(880),
+    [sym_yield] = STATE(1313),
+    [sym_attribute] = STATE(422),
+    [sym_subscript] = STATE(422),
+    [sym_call] = STATE(759),
+    [sym_list] = STATE(759),
+    [sym_set] = STATE(759),
+    [sym_tuple] = STATE(759),
+    [sym_dictionary] = STATE(759),
+    [sym_list_comprehension] = STATE(759),
+    [sym_dictionary_comprehension] = STATE(759),
+    [sym_set_comprehension] = STATE(759),
+    [sym_generator_expression] = STATE(759),
+    [sym_parenthesized_expression] = STATE(759),
+    [sym_conditional_expression] = STATE(985),
+    [sym_concatenated_string] = STATE(759),
+    [sym_string] = STATE(709),
+    [sym_await] = STATE(759),
     [aux_sym_module_repeat1] = STATE(61),
-    [aux_sym_decorated_definition_repeat1] = STATE(996),
+    [aux_sym_decorated_definition_repeat1] = STATE(947),
     [sym_identifier] = ACTIONS(7),
     [anon_sym_import] = ACTIONS(9),
     [anon_sym_from] = ACTIONS(11),
@@ -16239,77 +13619,77 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_false] = ACTIONS(77),
     [sym_none] = ACTIONS(77),
     [sym_comment] = ACTIONS(3),
-    [sym__dedent] = ACTIONS(107),
+    [sym__dedent] = ACTIONS(103),
     [sym__string_start] = ACTIONS(81),
   },
   [52] = {
-    [sym__statement] = STATE(68),
-    [sym__simple_statements] = STATE(68),
-    [sym_import_statement] = STATE(1319),
-    [sym_future_import_statement] = STATE(1319),
-    [sym_import_from_statement] = STATE(1319),
-    [sym_print_statement] = STATE(1319),
-    [sym_assert_statement] = STATE(1319),
-    [sym_expression_statement] = STATE(1319),
-    [sym_named_expression] = STATE(1009),
-    [sym_return_statement] = STATE(1319),
-    [sym_delete_statement] = STATE(1319),
-    [sym_raise_statement] = STATE(1319),
-    [sym_pass_statement] = STATE(1319),
-    [sym_break_statement] = STATE(1319),
-    [sym_continue_statement] = STATE(1319),
-    [sym_if_statement] = STATE(68),
-    [sym_for_statement] = STATE(68),
-    [sym_while_statement] = STATE(68),
-    [sym_try_statement] = STATE(68),
-    [sym_with_statement] = STATE(68),
-    [sym_match_statement] = STATE(68),
-    [sym_function_definition] = STATE(68),
-    [sym_list_splat] = STATE(1360),
-    [sym_dictionary_splat] = STATE(1360),
-    [sym_global_statement] = STATE(1319),
-    [sym_nonlocal_statement] = STATE(1319),
-    [sym_exec_statement] = STATE(1319),
-    [sym_type_alias_statement] = STATE(1319),
-    [sym_class_definition] = STATE(68),
-    [sym_decorated_definition] = STATE(68),
-    [sym_decorator] = STATE(996),
-    [sym_block] = STATE(579),
-    [sym_expression_list] = STATE(1361),
-    [sym_pattern] = STATE(889),
-    [sym_tuple_pattern] = STATE(875),
-    [sym_list_pattern] = STATE(875),
-    [sym_list_splat_pattern] = STATE(875),
-    [sym_expression] = STATE(1019),
-    [sym_primary_expression] = STATE(684),
-    [sym_not_operator] = STATE(1009),
-    [sym_boolean_operator] = STATE(1009),
-    [sym_binary_operator] = STATE(797),
-    [sym_unary_operator] = STATE(797),
-    [sym_comparison_operator] = STATE(1009),
-    [sym_lambda] = STATE(1009),
-    [sym_assignment] = STATE(1361),
-    [sym_augmented_assignment] = STATE(1361),
-    [sym_pattern_list] = STATE(897),
-    [sym_yield] = STATE(1361),
-    [sym_attribute] = STATE(431),
-    [sym_subscript] = STATE(431),
-    [sym_call] = STATE(797),
-    [sym_list] = STATE(797),
-    [sym_set] = STATE(797),
-    [sym_tuple] = STATE(797),
-    [sym_dictionary] = STATE(797),
-    [sym_list_comprehension] = STATE(797),
-    [sym_dictionary_comprehension] = STATE(797),
-    [sym_set_comprehension] = STATE(797),
-    [sym_generator_expression] = STATE(797),
-    [sym_parenthesized_expression] = STATE(797),
-    [sym_conditional_expression] = STATE(1009),
-    [sym_concatenated_string] = STATE(797),
-    [sym_string] = STATE(713),
-    [sym_await] = STATE(1009),
-    [aux_sym_module_repeat1] = STATE(68),
-    [aux_sym_decorated_definition_repeat1] = STATE(996),
+    [sym__statement] = STATE(61),
+    [sym__simple_statements] = STATE(61),
+    [sym_import_statement] = STATE(1213),
+    [sym_future_import_statement] = STATE(1213),
+    [sym_import_from_statement] = STATE(1213),
+    [sym_print_statement] = STATE(1213),
+    [sym_assert_statement] = STATE(1213),
+    [sym_expression_statement] = STATE(1213),
+    [sym_named_expression] = STATE(985),
+    [sym_return_statement] = STATE(1213),
+    [sym_delete_statement] = STATE(1213),
+    [sym_raise_statement] = STATE(1213),
+    [sym_pass_statement] = STATE(1213),
+    [sym_break_statement] = STATE(1213),
+    [sym_continue_statement] = STATE(1213),
+    [sym_if_statement] = STATE(61),
+    [sym_for_statement] = STATE(61),
+    [sym_while_statement] = STATE(61),
+    [sym_try_statement] = STATE(61),
+    [sym_with_statement] = STATE(61),
+    [sym_match_statement] = STATE(61),
+    [sym_function_definition] = STATE(61),
+    [sym_list_splat] = STATE(1321),
+    [sym_dictionary_splat] = STATE(1321),
+    [sym_global_statement] = STATE(1213),
+    [sym_nonlocal_statement] = STATE(1213),
+    [sym_exec_statement] = STATE(1213),
+    [sym_type_alias_statement] = STATE(1213),
+    [sym_class_definition] = STATE(61),
+    [sym_decorated_definition] = STATE(61),
+    [sym_decorator] = STATE(947),
+    [sym_block] = STATE(548),
+    [sym_expression_list] = STATE(1313),
+    [sym_pattern] = STATE(871),
+    [sym_tuple_pattern] = STATE(860),
+    [sym_list_pattern] = STATE(860),
+    [sym_list_splat_pattern] = STATE(860),
+    [sym_expression] = STATE(995),
+    [sym_primary_expression] = STATE(707),
+    [sym_not_operator] = STATE(985),
+    [sym_boolean_operator] = STATE(985),
+    [sym_binary_operator] = STATE(759),
+    [sym_unary_operator] = STATE(759),
+    [sym_comparison_operator] = STATE(985),
+    [sym_lambda] = STATE(985),
+    [sym_assignment] = STATE(1313),
+    [sym_augmented_assignment] = STATE(1313),
+    [sym_pattern_list] = STATE(880),
+    [sym_yield] = STATE(1313),
+    [sym_attribute] = STATE(422),
+    [sym_subscript] = STATE(422),
+    [sym_call] = STATE(759),
+    [sym_list] = STATE(759),
+    [sym_set] = STATE(759),
+    [sym_tuple] = STATE(759),
+    [sym_dictionary] = STATE(759),
+    [sym_list_comprehension] = STATE(759),
+    [sym_dictionary_comprehension] = STATE(759),
+    [sym_set_comprehension] = STATE(759),
+    [sym_generator_expression] = STATE(759),
+    [sym_parenthesized_expression] = STATE(759),
+    [sym_conditional_expression] = STATE(985),
+    [sym_concatenated_string] = STATE(759),
+    [sym_string] = STATE(709),
+    [sym_await] = STATE(759),
+    [aux_sym_module_repeat1] = STATE(61),
+    [aux_sym_decorated_definition_repeat1] = STATE(947),
     [sym_identifier] = ACTIONS(7),
     [anon_sym_import] = ACTIONS(9),
     [anon_sym_from] = ACTIONS(11),
@@ -16358,73 +13738,73 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym__string_start] = ACTIONS(81),
   },
   [53] = {
-    [sym__statement] = STATE(68),
-    [sym__simple_statements] = STATE(68),
-    [sym_import_statement] = STATE(1319),
-    [sym_future_import_statement] = STATE(1319),
-    [sym_import_from_statement] = STATE(1319),
-    [sym_print_statement] = STATE(1319),
-    [sym_assert_statement] = STATE(1319),
-    [sym_expression_statement] = STATE(1319),
-    [sym_named_expression] = STATE(1009),
-    [sym_return_statement] = STATE(1319),
-    [sym_delete_statement] = STATE(1319),
-    [sym_raise_statement] = STATE(1319),
-    [sym_pass_statement] = STATE(1319),
-    [sym_break_statement] = STATE(1319),
-    [sym_continue_statement] = STATE(1319),
-    [sym_if_statement] = STATE(68),
-    [sym_for_statement] = STATE(68),
-    [sym_while_statement] = STATE(68),
-    [sym_try_statement] = STATE(68),
-    [sym_with_statement] = STATE(68),
-    [sym_match_statement] = STATE(68),
-    [sym_function_definition] = STATE(68),
-    [sym_list_splat] = STATE(1360),
-    [sym_dictionary_splat] = STATE(1360),
-    [sym_global_statement] = STATE(1319),
-    [sym_nonlocal_statement] = STATE(1319),
-    [sym_exec_statement] = STATE(1319),
-    [sym_type_alias_statement] = STATE(1319),
-    [sym_class_definition] = STATE(68),
-    [sym_decorated_definition] = STATE(68),
-    [sym_decorator] = STATE(996),
-    [sym_block] = STATE(581),
-    [sym_expression_list] = STATE(1361),
-    [sym_pattern] = STATE(889),
-    [sym_tuple_pattern] = STATE(875),
-    [sym_list_pattern] = STATE(875),
-    [sym_list_splat_pattern] = STATE(875),
-    [sym_expression] = STATE(1019),
-    [sym_primary_expression] = STATE(684),
-    [sym_not_operator] = STATE(1009),
-    [sym_boolean_operator] = STATE(1009),
-    [sym_binary_operator] = STATE(797),
-    [sym_unary_operator] = STATE(797),
-    [sym_comparison_operator] = STATE(1009),
-    [sym_lambda] = STATE(1009),
-    [sym_assignment] = STATE(1361),
-    [sym_augmented_assignment] = STATE(1361),
-    [sym_pattern_list] = STATE(897),
-    [sym_yield] = STATE(1361),
-    [sym_attribute] = STATE(431),
-    [sym_subscript] = STATE(431),
-    [sym_call] = STATE(797),
-    [sym_list] = STATE(797),
-    [sym_set] = STATE(797),
-    [sym_tuple] = STATE(797),
-    [sym_dictionary] = STATE(797),
-    [sym_list_comprehension] = STATE(797),
-    [sym_dictionary_comprehension] = STATE(797),
-    [sym_set_comprehension] = STATE(797),
-    [sym_generator_expression] = STATE(797),
-    [sym_parenthesized_expression] = STATE(797),
-    [sym_conditional_expression] = STATE(1009),
-    [sym_concatenated_string] = STATE(797),
-    [sym_string] = STATE(713),
-    [sym_await] = STATE(1009),
-    [aux_sym_module_repeat1] = STATE(68),
-    [aux_sym_decorated_definition_repeat1] = STATE(996),
+    [sym__statement] = STATE(61),
+    [sym__simple_statements] = STATE(61),
+    [sym_import_statement] = STATE(1213),
+    [sym_future_import_statement] = STATE(1213),
+    [sym_import_from_statement] = STATE(1213),
+    [sym_print_statement] = STATE(1213),
+    [sym_assert_statement] = STATE(1213),
+    [sym_expression_statement] = STATE(1213),
+    [sym_named_expression] = STATE(985),
+    [sym_return_statement] = STATE(1213),
+    [sym_delete_statement] = STATE(1213),
+    [sym_raise_statement] = STATE(1213),
+    [sym_pass_statement] = STATE(1213),
+    [sym_break_statement] = STATE(1213),
+    [sym_continue_statement] = STATE(1213),
+    [sym_if_statement] = STATE(61),
+    [sym_for_statement] = STATE(61),
+    [sym_while_statement] = STATE(61),
+    [sym_try_statement] = STATE(61),
+    [sym_with_statement] = STATE(61),
+    [sym_match_statement] = STATE(61),
+    [sym_function_definition] = STATE(61),
+    [sym_list_splat] = STATE(1321),
+    [sym_dictionary_splat] = STATE(1321),
+    [sym_global_statement] = STATE(1213),
+    [sym_nonlocal_statement] = STATE(1213),
+    [sym_exec_statement] = STATE(1213),
+    [sym_type_alias_statement] = STATE(1213),
+    [sym_class_definition] = STATE(61),
+    [sym_decorated_definition] = STATE(61),
+    [sym_decorator] = STATE(947),
+    [sym_block] = STATE(513),
+    [sym_expression_list] = STATE(1313),
+    [sym_pattern] = STATE(871),
+    [sym_tuple_pattern] = STATE(860),
+    [sym_list_pattern] = STATE(860),
+    [sym_list_splat_pattern] = STATE(860),
+    [sym_expression] = STATE(995),
+    [sym_primary_expression] = STATE(707),
+    [sym_not_operator] = STATE(985),
+    [sym_boolean_operator] = STATE(985),
+    [sym_binary_operator] = STATE(759),
+    [sym_unary_operator] = STATE(759),
+    [sym_comparison_operator] = STATE(985),
+    [sym_lambda] = STATE(985),
+    [sym_assignment] = STATE(1313),
+    [sym_augmented_assignment] = STATE(1313),
+    [sym_pattern_list] = STATE(880),
+    [sym_yield] = STATE(1313),
+    [sym_attribute] = STATE(422),
+    [sym_subscript] = STATE(422),
+    [sym_call] = STATE(759),
+    [sym_list] = STATE(759),
+    [sym_set] = STATE(759),
+    [sym_tuple] = STATE(759),
+    [sym_dictionary] = STATE(759),
+    [sym_list_comprehension] = STATE(759),
+    [sym_dictionary_comprehension] = STATE(759),
+    [sym_set_comprehension] = STATE(759),
+    [sym_generator_expression] = STATE(759),
+    [sym_parenthesized_expression] = STATE(759),
+    [sym_conditional_expression] = STATE(985),
+    [sym_concatenated_string] = STATE(759),
+    [sym_string] = STATE(709),
+    [sym_await] = STATE(759),
+    [aux_sym_module_repeat1] = STATE(61),
+    [aux_sym_decorated_definition_repeat1] = STATE(947),
     [sym_identifier] = ACTIONS(7),
     [anon_sym_import] = ACTIONS(9),
     [anon_sym_from] = ACTIONS(11),
@@ -16473,366 +13853,21 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym__string_start] = ACTIONS(81),
   },
   [54] = {
-    [sym__statement] = STATE(69),
-    [sym__simple_statements] = STATE(69),
-    [sym_import_statement] = STATE(1319),
-    [sym_future_import_statement] = STATE(1319),
-    [sym_import_from_statement] = STATE(1319),
-    [sym_print_statement] = STATE(1319),
-    [sym_assert_statement] = STATE(1319),
-    [sym_expression_statement] = STATE(1319),
-    [sym_named_expression] = STATE(1009),
-    [sym_return_statement] = STATE(1319),
-    [sym_delete_statement] = STATE(1319),
-    [sym_raise_statement] = STATE(1319),
-    [sym_pass_statement] = STATE(1319),
-    [sym_break_statement] = STATE(1319),
-    [sym_continue_statement] = STATE(1319),
-    [sym_if_statement] = STATE(69),
-    [sym_for_statement] = STATE(69),
-    [sym_while_statement] = STATE(69),
-    [sym_try_statement] = STATE(69),
-    [sym_with_statement] = STATE(69),
-    [sym_match_statement] = STATE(69),
-    [sym_function_definition] = STATE(69),
-    [sym_list_splat] = STATE(1360),
-    [sym_dictionary_splat] = STATE(1360),
-    [sym_global_statement] = STATE(1319),
-    [sym_nonlocal_statement] = STATE(1319),
-    [sym_exec_statement] = STATE(1319),
-    [sym_type_alias_statement] = STATE(1319),
-    [sym_class_definition] = STATE(69),
-    [sym_decorated_definition] = STATE(69),
-    [sym_decorator] = STATE(996),
-    [sym_block] = STATE(1003),
-    [sym_expression_list] = STATE(1361),
-    [sym_pattern] = STATE(889),
-    [sym_tuple_pattern] = STATE(875),
-    [sym_list_pattern] = STATE(875),
-    [sym_list_splat_pattern] = STATE(875),
-    [sym_expression] = STATE(1019),
-    [sym_primary_expression] = STATE(684),
-    [sym_not_operator] = STATE(1009),
-    [sym_boolean_operator] = STATE(1009),
-    [sym_binary_operator] = STATE(797),
-    [sym_unary_operator] = STATE(797),
-    [sym_comparison_operator] = STATE(1009),
-    [sym_lambda] = STATE(1009),
-    [sym_assignment] = STATE(1361),
-    [sym_augmented_assignment] = STATE(1361),
-    [sym_pattern_list] = STATE(897),
-    [sym_yield] = STATE(1361),
-    [sym_attribute] = STATE(431),
-    [sym_subscript] = STATE(431),
-    [sym_call] = STATE(797),
-    [sym_list] = STATE(797),
-    [sym_set] = STATE(797),
-    [sym_tuple] = STATE(797),
-    [sym_dictionary] = STATE(797),
-    [sym_list_comprehension] = STATE(797),
-    [sym_dictionary_comprehension] = STATE(797),
-    [sym_set_comprehension] = STATE(797),
-    [sym_generator_expression] = STATE(797),
-    [sym_parenthesized_expression] = STATE(797),
-    [sym_conditional_expression] = STATE(1009),
-    [sym_concatenated_string] = STATE(797),
-    [sym_string] = STATE(713),
-    [sym_await] = STATE(1009),
-    [aux_sym_module_repeat1] = STATE(69),
-    [aux_sym_decorated_definition_repeat1] = STATE(996),
-    [sym_identifier] = ACTIONS(7),
-    [anon_sym_import] = ACTIONS(9),
-    [anon_sym_from] = ACTIONS(11),
-    [anon_sym_LPAREN] = ACTIONS(13),
-    [anon_sym_STAR] = ACTIONS(15),
-    [anon_sym_print] = ACTIONS(17),
-    [anon_sym_assert] = ACTIONS(19),
-    [anon_sym_return] = ACTIONS(21),
-    [anon_sym_del] = ACTIONS(23),
-    [anon_sym_raise] = ACTIONS(25),
-    [anon_sym_pass] = ACTIONS(27),
-    [anon_sym_break] = ACTIONS(29),
-    [anon_sym_continue] = ACTIONS(31),
-    [anon_sym_if] = ACTIONS(83),
-    [anon_sym_async] = ACTIONS(85),
-    [anon_sym_for] = ACTIONS(87),
-    [anon_sym_while] = ACTIONS(89),
-    [anon_sym_try] = ACTIONS(91),
-    [anon_sym_with] = ACTIONS(93),
-    [anon_sym_match] = ACTIONS(95),
-    [anon_sym_DASH] = ACTIONS(47),
-    [anon_sym_PLUS] = ACTIONS(47),
-    [anon_sym_LBRACK] = ACTIONS(49),
-    [anon_sym_LBRACE] = ACTIONS(51),
-    [anon_sym_STAR_STAR] = ACTIONS(53),
-    [anon_sym_def] = ACTIONS(97),
-    [anon_sym_global] = ACTIONS(57),
-    [anon_sym_nonlocal] = ACTIONS(59),
-    [anon_sym_exec] = ACTIONS(61),
-    [anon_sym_type] = ACTIONS(63),
-    [anon_sym_class] = ACTIONS(99),
-    [anon_sym_AT] = ACTIONS(67),
-    [anon_sym_not] = ACTIONS(69),
-    [anon_sym_TILDE] = ACTIONS(47),
-    [anon_sym_lambda] = ACTIONS(71),
-    [anon_sym_yield] = ACTIONS(73),
-    [sym_ellipsis] = ACTIONS(75),
-    [sym_integer] = ACTIONS(77),
-    [sym_float] = ACTIONS(75),
-    [anon_sym_await] = ACTIONS(79),
-    [sym_true] = ACTIONS(77),
-    [sym_false] = ACTIONS(77),
-    [sym_none] = ACTIONS(77),
-    [sym_comment] = ACTIONS(3),
-    [sym__dedent] = ACTIONS(113),
-    [sym__string_start] = ACTIONS(81),
-  },
-  [55] = {
-    [sym__statement] = STATE(69),
-    [sym__simple_statements] = STATE(69),
-    [sym_import_statement] = STATE(1319),
-    [sym_future_import_statement] = STATE(1319),
-    [sym_import_from_statement] = STATE(1319),
-    [sym_print_statement] = STATE(1319),
-    [sym_assert_statement] = STATE(1319),
-    [sym_expression_statement] = STATE(1319),
-    [sym_named_expression] = STATE(1009),
-    [sym_return_statement] = STATE(1319),
-    [sym_delete_statement] = STATE(1319),
-    [sym_raise_statement] = STATE(1319),
-    [sym_pass_statement] = STATE(1319),
-    [sym_break_statement] = STATE(1319),
-    [sym_continue_statement] = STATE(1319),
-    [sym_if_statement] = STATE(69),
-    [sym_for_statement] = STATE(69),
-    [sym_while_statement] = STATE(69),
-    [sym_try_statement] = STATE(69),
-    [sym_with_statement] = STATE(69),
-    [sym_match_statement] = STATE(69),
-    [sym_function_definition] = STATE(69),
-    [sym_list_splat] = STATE(1360),
-    [sym_dictionary_splat] = STATE(1360),
-    [sym_global_statement] = STATE(1319),
-    [sym_nonlocal_statement] = STATE(1319),
-    [sym_exec_statement] = STATE(1319),
-    [sym_type_alias_statement] = STATE(1319),
-    [sym_class_definition] = STATE(69),
-    [sym_decorated_definition] = STATE(69),
-    [sym_decorator] = STATE(996),
-    [sym_block] = STATE(983),
-    [sym_expression_list] = STATE(1361),
-    [sym_pattern] = STATE(889),
-    [sym_tuple_pattern] = STATE(875),
-    [sym_list_pattern] = STATE(875),
-    [sym_list_splat_pattern] = STATE(875),
-    [sym_expression] = STATE(1019),
-    [sym_primary_expression] = STATE(684),
-    [sym_not_operator] = STATE(1009),
-    [sym_boolean_operator] = STATE(1009),
-    [sym_binary_operator] = STATE(797),
-    [sym_unary_operator] = STATE(797),
-    [sym_comparison_operator] = STATE(1009),
-    [sym_lambda] = STATE(1009),
-    [sym_assignment] = STATE(1361),
-    [sym_augmented_assignment] = STATE(1361),
-    [sym_pattern_list] = STATE(897),
-    [sym_yield] = STATE(1361),
-    [sym_attribute] = STATE(431),
-    [sym_subscript] = STATE(431),
-    [sym_call] = STATE(797),
-    [sym_list] = STATE(797),
-    [sym_set] = STATE(797),
-    [sym_tuple] = STATE(797),
-    [sym_dictionary] = STATE(797),
-    [sym_list_comprehension] = STATE(797),
-    [sym_dictionary_comprehension] = STATE(797),
-    [sym_set_comprehension] = STATE(797),
-    [sym_generator_expression] = STATE(797),
-    [sym_parenthesized_expression] = STATE(797),
-    [sym_conditional_expression] = STATE(1009),
-    [sym_concatenated_string] = STATE(797),
-    [sym_string] = STATE(713),
-    [sym_await] = STATE(1009),
-    [aux_sym_module_repeat1] = STATE(69),
-    [aux_sym_decorated_definition_repeat1] = STATE(996),
-    [sym_identifier] = ACTIONS(7),
-    [anon_sym_import] = ACTIONS(9),
-    [anon_sym_from] = ACTIONS(11),
-    [anon_sym_LPAREN] = ACTIONS(13),
-    [anon_sym_STAR] = ACTIONS(15),
-    [anon_sym_print] = ACTIONS(17),
-    [anon_sym_assert] = ACTIONS(19),
-    [anon_sym_return] = ACTIONS(21),
-    [anon_sym_del] = ACTIONS(23),
-    [anon_sym_raise] = ACTIONS(25),
-    [anon_sym_pass] = ACTIONS(27),
-    [anon_sym_break] = ACTIONS(29),
-    [anon_sym_continue] = ACTIONS(31),
-    [anon_sym_if] = ACTIONS(83),
-    [anon_sym_async] = ACTIONS(85),
-    [anon_sym_for] = ACTIONS(87),
-    [anon_sym_while] = ACTIONS(89),
-    [anon_sym_try] = ACTIONS(91),
-    [anon_sym_with] = ACTIONS(93),
-    [anon_sym_match] = ACTIONS(95),
-    [anon_sym_DASH] = ACTIONS(47),
-    [anon_sym_PLUS] = ACTIONS(47),
-    [anon_sym_LBRACK] = ACTIONS(49),
-    [anon_sym_LBRACE] = ACTIONS(51),
-    [anon_sym_STAR_STAR] = ACTIONS(53),
-    [anon_sym_def] = ACTIONS(97),
-    [anon_sym_global] = ACTIONS(57),
-    [anon_sym_nonlocal] = ACTIONS(59),
-    [anon_sym_exec] = ACTIONS(61),
-    [anon_sym_type] = ACTIONS(63),
-    [anon_sym_class] = ACTIONS(99),
-    [anon_sym_AT] = ACTIONS(67),
-    [anon_sym_not] = ACTIONS(69),
-    [anon_sym_TILDE] = ACTIONS(47),
-    [anon_sym_lambda] = ACTIONS(71),
-    [anon_sym_yield] = ACTIONS(73),
-    [sym_ellipsis] = ACTIONS(75),
-    [sym_integer] = ACTIONS(77),
-    [sym_float] = ACTIONS(75),
-    [anon_sym_await] = ACTIONS(79),
-    [sym_true] = ACTIONS(77),
-    [sym_false] = ACTIONS(77),
-    [sym_none] = ACTIONS(77),
-    [sym_comment] = ACTIONS(3),
-    [sym__dedent] = ACTIONS(113),
-    [sym__string_start] = ACTIONS(81),
-  },
-  [56] = {
-    [sym__statement] = STATE(68),
-    [sym__simple_statements] = STATE(68),
-    [sym_import_statement] = STATE(1319),
-    [sym_future_import_statement] = STATE(1319),
-    [sym_import_from_statement] = STATE(1319),
-    [sym_print_statement] = STATE(1319),
-    [sym_assert_statement] = STATE(1319),
-    [sym_expression_statement] = STATE(1319),
-    [sym_named_expression] = STATE(1009),
-    [sym_return_statement] = STATE(1319),
-    [sym_delete_statement] = STATE(1319),
-    [sym_raise_statement] = STATE(1319),
-    [sym_pass_statement] = STATE(1319),
-    [sym_break_statement] = STATE(1319),
-    [sym_continue_statement] = STATE(1319),
-    [sym_if_statement] = STATE(68),
-    [sym_for_statement] = STATE(68),
-    [sym_while_statement] = STATE(68),
-    [sym_try_statement] = STATE(68),
-    [sym_with_statement] = STATE(68),
-    [sym_match_statement] = STATE(68),
-    [sym_function_definition] = STATE(68),
-    [sym_list_splat] = STATE(1360),
-    [sym_dictionary_splat] = STATE(1360),
-    [sym_global_statement] = STATE(1319),
-    [sym_nonlocal_statement] = STATE(1319),
-    [sym_exec_statement] = STATE(1319),
-    [sym_type_alias_statement] = STATE(1319),
-    [sym_class_definition] = STATE(68),
-    [sym_decorated_definition] = STATE(68),
-    [sym_decorator] = STATE(996),
-    [sym_block] = STATE(265),
-    [sym_expression_list] = STATE(1361),
-    [sym_pattern] = STATE(889),
-    [sym_tuple_pattern] = STATE(875),
-    [sym_list_pattern] = STATE(875),
-    [sym_list_splat_pattern] = STATE(875),
-    [sym_expression] = STATE(1019),
-    [sym_primary_expression] = STATE(684),
-    [sym_not_operator] = STATE(1009),
-    [sym_boolean_operator] = STATE(1009),
-    [sym_binary_operator] = STATE(797),
-    [sym_unary_operator] = STATE(797),
-    [sym_comparison_operator] = STATE(1009),
-    [sym_lambda] = STATE(1009),
-    [sym_assignment] = STATE(1361),
-    [sym_augmented_assignment] = STATE(1361),
-    [sym_pattern_list] = STATE(897),
-    [sym_yield] = STATE(1361),
-    [sym_attribute] = STATE(431),
-    [sym_subscript] = STATE(431),
-    [sym_call] = STATE(797),
-    [sym_list] = STATE(797),
-    [sym_set] = STATE(797),
-    [sym_tuple] = STATE(797),
-    [sym_dictionary] = STATE(797),
-    [sym_list_comprehension] = STATE(797),
-    [sym_dictionary_comprehension] = STATE(797),
-    [sym_set_comprehension] = STATE(797),
-    [sym_generator_expression] = STATE(797),
-    [sym_parenthesized_expression] = STATE(797),
-    [sym_conditional_expression] = STATE(1009),
-    [sym_concatenated_string] = STATE(797),
-    [sym_string] = STATE(713),
-    [sym_await] = STATE(1009),
-    [aux_sym_module_repeat1] = STATE(68),
-    [aux_sym_decorated_definition_repeat1] = STATE(996),
-    [sym_identifier] = ACTIONS(7),
-    [anon_sym_import] = ACTIONS(9),
-    [anon_sym_from] = ACTIONS(11),
-    [anon_sym_LPAREN] = ACTIONS(13),
-    [anon_sym_STAR] = ACTIONS(15),
-    [anon_sym_print] = ACTIONS(17),
-    [anon_sym_assert] = ACTIONS(19),
-    [anon_sym_return] = ACTIONS(21),
-    [anon_sym_del] = ACTIONS(23),
-    [anon_sym_raise] = ACTIONS(25),
-    [anon_sym_pass] = ACTIONS(27),
-    [anon_sym_break] = ACTIONS(29),
-    [anon_sym_continue] = ACTIONS(31),
-    [anon_sym_if] = ACTIONS(83),
-    [anon_sym_async] = ACTIONS(85),
-    [anon_sym_for] = ACTIONS(87),
-    [anon_sym_while] = ACTIONS(89),
-    [anon_sym_try] = ACTIONS(91),
-    [anon_sym_with] = ACTIONS(93),
-    [anon_sym_match] = ACTIONS(95),
-    [anon_sym_DASH] = ACTIONS(47),
-    [anon_sym_PLUS] = ACTIONS(47),
-    [anon_sym_LBRACK] = ACTIONS(49),
-    [anon_sym_LBRACE] = ACTIONS(51),
-    [anon_sym_STAR_STAR] = ACTIONS(53),
-    [anon_sym_def] = ACTIONS(97),
-    [anon_sym_global] = ACTIONS(57),
-    [anon_sym_nonlocal] = ACTIONS(59),
-    [anon_sym_exec] = ACTIONS(61),
-    [anon_sym_type] = ACTIONS(63),
-    [anon_sym_class] = ACTIONS(99),
-    [anon_sym_AT] = ACTIONS(67),
-    [anon_sym_not] = ACTIONS(69),
-    [anon_sym_TILDE] = ACTIONS(47),
-    [anon_sym_lambda] = ACTIONS(71),
-    [anon_sym_yield] = ACTIONS(73),
-    [sym_ellipsis] = ACTIONS(75),
-    [sym_integer] = ACTIONS(77),
-    [sym_float] = ACTIONS(75),
-    [anon_sym_await] = ACTIONS(79),
-    [sym_true] = ACTIONS(77),
-    [sym_false] = ACTIONS(77),
-    [sym_none] = ACTIONS(77),
-    [sym_comment] = ACTIONS(3),
-    [sym__dedent] = ACTIONS(103),
-    [sym__string_start] = ACTIONS(81),
-  },
-  [57] = {
     [sym__statement] = STATE(61),
     [sym__simple_statements] = STATE(61),
-    [sym_import_statement] = STATE(1319),
-    [sym_future_import_statement] = STATE(1319),
-    [sym_import_from_statement] = STATE(1319),
-    [sym_print_statement] = STATE(1319),
-    [sym_assert_statement] = STATE(1319),
-    [sym_expression_statement] = STATE(1319),
-    [sym_named_expression] = STATE(1009),
-    [sym_return_statement] = STATE(1319),
-    [sym_delete_statement] = STATE(1319),
-    [sym_raise_statement] = STATE(1319),
-    [sym_pass_statement] = STATE(1319),
-    [sym_break_statement] = STATE(1319),
-    [sym_continue_statement] = STATE(1319),
+    [sym_import_statement] = STATE(1213),
+    [sym_future_import_statement] = STATE(1213),
+    [sym_import_from_statement] = STATE(1213),
+    [sym_print_statement] = STATE(1213),
+    [sym_assert_statement] = STATE(1213),
+    [sym_expression_statement] = STATE(1213),
+    [sym_named_expression] = STATE(985),
+    [sym_return_statement] = STATE(1213),
+    [sym_delete_statement] = STATE(1213),
+    [sym_raise_statement] = STATE(1213),
+    [sym_pass_statement] = STATE(1213),
+    [sym_break_statement] = STATE(1213),
+    [sym_continue_statement] = STATE(1213),
     [sym_if_statement] = STATE(61),
     [sym_for_statement] = STATE(61),
     [sym_while_statement] = STATE(61),
@@ -16840,166 +13875,51 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_with_statement] = STATE(61),
     [sym_match_statement] = STATE(61),
     [sym_function_definition] = STATE(61),
-    [sym_list_splat] = STATE(1360),
-    [sym_dictionary_splat] = STATE(1360),
-    [sym_global_statement] = STATE(1319),
-    [sym_nonlocal_statement] = STATE(1319),
-    [sym_exec_statement] = STATE(1319),
-    [sym_type_alias_statement] = STATE(1319),
+    [sym_list_splat] = STATE(1321),
+    [sym_dictionary_splat] = STATE(1321),
+    [sym_global_statement] = STATE(1213),
+    [sym_nonlocal_statement] = STATE(1213),
+    [sym_exec_statement] = STATE(1213),
+    [sym_type_alias_statement] = STATE(1213),
     [sym_class_definition] = STATE(61),
     [sym_decorated_definition] = STATE(61),
-    [sym_decorator] = STATE(996),
-    [sym_block] = STATE(561),
-    [sym_expression_list] = STATE(1361),
-    [sym_pattern] = STATE(889),
-    [sym_tuple_pattern] = STATE(875),
-    [sym_list_pattern] = STATE(875),
-    [sym_list_splat_pattern] = STATE(875),
-    [sym_expression] = STATE(1019),
-    [sym_primary_expression] = STATE(684),
-    [sym_not_operator] = STATE(1009),
-    [sym_boolean_operator] = STATE(1009),
-    [sym_binary_operator] = STATE(797),
-    [sym_unary_operator] = STATE(797),
-    [sym_comparison_operator] = STATE(1009),
-    [sym_lambda] = STATE(1009),
-    [sym_assignment] = STATE(1361),
-    [sym_augmented_assignment] = STATE(1361),
-    [sym_pattern_list] = STATE(897),
-    [sym_yield] = STATE(1361),
-    [sym_attribute] = STATE(431),
-    [sym_subscript] = STATE(431),
-    [sym_call] = STATE(797),
-    [sym_list] = STATE(797),
-    [sym_set] = STATE(797),
-    [sym_tuple] = STATE(797),
-    [sym_dictionary] = STATE(797),
-    [sym_list_comprehension] = STATE(797),
-    [sym_dictionary_comprehension] = STATE(797),
-    [sym_set_comprehension] = STATE(797),
-    [sym_generator_expression] = STATE(797),
-    [sym_parenthesized_expression] = STATE(797),
-    [sym_conditional_expression] = STATE(1009),
-    [sym_concatenated_string] = STATE(797),
-    [sym_string] = STATE(713),
-    [sym_await] = STATE(1009),
+    [sym_decorator] = STATE(947),
+    [sym_block] = STATE(527),
+    [sym_expression_list] = STATE(1313),
+    [sym_pattern] = STATE(871),
+    [sym_tuple_pattern] = STATE(860),
+    [sym_list_pattern] = STATE(860),
+    [sym_list_splat_pattern] = STATE(860),
+    [sym_expression] = STATE(995),
+    [sym_primary_expression] = STATE(707),
+    [sym_not_operator] = STATE(985),
+    [sym_boolean_operator] = STATE(985),
+    [sym_binary_operator] = STATE(759),
+    [sym_unary_operator] = STATE(759),
+    [sym_comparison_operator] = STATE(985),
+    [sym_lambda] = STATE(985),
+    [sym_assignment] = STATE(1313),
+    [sym_augmented_assignment] = STATE(1313),
+    [sym_pattern_list] = STATE(880),
+    [sym_yield] = STATE(1313),
+    [sym_attribute] = STATE(422),
+    [sym_subscript] = STATE(422),
+    [sym_call] = STATE(759),
+    [sym_list] = STATE(759),
+    [sym_set] = STATE(759),
+    [sym_tuple] = STATE(759),
+    [sym_dictionary] = STATE(759),
+    [sym_list_comprehension] = STATE(759),
+    [sym_dictionary_comprehension] = STATE(759),
+    [sym_set_comprehension] = STATE(759),
+    [sym_generator_expression] = STATE(759),
+    [sym_parenthesized_expression] = STATE(759),
+    [sym_conditional_expression] = STATE(985),
+    [sym_concatenated_string] = STATE(759),
+    [sym_string] = STATE(709),
+    [sym_await] = STATE(759),
     [aux_sym_module_repeat1] = STATE(61),
-    [aux_sym_decorated_definition_repeat1] = STATE(996),
-    [sym_identifier] = ACTIONS(7),
-    [anon_sym_import] = ACTIONS(9),
-    [anon_sym_from] = ACTIONS(11),
-    [anon_sym_LPAREN] = ACTIONS(13),
-    [anon_sym_STAR] = ACTIONS(15),
-    [anon_sym_print] = ACTIONS(17),
-    [anon_sym_assert] = ACTIONS(19),
-    [anon_sym_return] = ACTIONS(21),
-    [anon_sym_del] = ACTIONS(23),
-    [anon_sym_raise] = ACTIONS(25),
-    [anon_sym_pass] = ACTIONS(27),
-    [anon_sym_break] = ACTIONS(29),
-    [anon_sym_continue] = ACTIONS(31),
-    [anon_sym_if] = ACTIONS(83),
-    [anon_sym_async] = ACTIONS(85),
-    [anon_sym_for] = ACTIONS(87),
-    [anon_sym_while] = ACTIONS(89),
-    [anon_sym_try] = ACTIONS(91),
-    [anon_sym_with] = ACTIONS(93),
-    [anon_sym_match] = ACTIONS(95),
-    [anon_sym_DASH] = ACTIONS(47),
-    [anon_sym_PLUS] = ACTIONS(47),
-    [anon_sym_LBRACK] = ACTIONS(49),
-    [anon_sym_LBRACE] = ACTIONS(51),
-    [anon_sym_STAR_STAR] = ACTIONS(53),
-    [anon_sym_def] = ACTIONS(97),
-    [anon_sym_global] = ACTIONS(57),
-    [anon_sym_nonlocal] = ACTIONS(59),
-    [anon_sym_exec] = ACTIONS(61),
-    [anon_sym_type] = ACTIONS(63),
-    [anon_sym_class] = ACTIONS(99),
-    [anon_sym_AT] = ACTIONS(67),
-    [anon_sym_not] = ACTIONS(69),
-    [anon_sym_TILDE] = ACTIONS(47),
-    [anon_sym_lambda] = ACTIONS(71),
-    [anon_sym_yield] = ACTIONS(73),
-    [sym_ellipsis] = ACTIONS(75),
-    [sym_integer] = ACTIONS(77),
-    [sym_float] = ACTIONS(75),
-    [anon_sym_await] = ACTIONS(79),
-    [sym_true] = ACTIONS(77),
-    [sym_false] = ACTIONS(77),
-    [sym_none] = ACTIONS(77),
-    [sym_comment] = ACTIONS(3),
-    [sym__dedent] = ACTIONS(107),
-    [sym__string_start] = ACTIONS(81),
-  },
-  [58] = {
-    [sym__statement] = STATE(68),
-    [sym__simple_statements] = STATE(68),
-    [sym_import_statement] = STATE(1319),
-    [sym_future_import_statement] = STATE(1319),
-    [sym_import_from_statement] = STATE(1319),
-    [sym_print_statement] = STATE(1319),
-    [sym_assert_statement] = STATE(1319),
-    [sym_expression_statement] = STATE(1319),
-    [sym_named_expression] = STATE(1009),
-    [sym_return_statement] = STATE(1319),
-    [sym_delete_statement] = STATE(1319),
-    [sym_raise_statement] = STATE(1319),
-    [sym_pass_statement] = STATE(1319),
-    [sym_break_statement] = STATE(1319),
-    [sym_continue_statement] = STATE(1319),
-    [sym_if_statement] = STATE(68),
-    [sym_for_statement] = STATE(68),
-    [sym_while_statement] = STATE(68),
-    [sym_try_statement] = STATE(68),
-    [sym_with_statement] = STATE(68),
-    [sym_match_statement] = STATE(68),
-    [sym_function_definition] = STATE(68),
-    [sym_list_splat] = STATE(1360),
-    [sym_dictionary_splat] = STATE(1360),
-    [sym_global_statement] = STATE(1319),
-    [sym_nonlocal_statement] = STATE(1319),
-    [sym_exec_statement] = STATE(1319),
-    [sym_type_alias_statement] = STATE(1319),
-    [sym_class_definition] = STATE(68),
-    [sym_decorated_definition] = STATE(68),
-    [sym_decorator] = STATE(996),
-    [sym_block] = STATE(517),
-    [sym_expression_list] = STATE(1361),
-    [sym_pattern] = STATE(889),
-    [sym_tuple_pattern] = STATE(875),
-    [sym_list_pattern] = STATE(875),
-    [sym_list_splat_pattern] = STATE(875),
-    [sym_expression] = STATE(1019),
-    [sym_primary_expression] = STATE(684),
-    [sym_not_operator] = STATE(1009),
-    [sym_boolean_operator] = STATE(1009),
-    [sym_binary_operator] = STATE(797),
-    [sym_unary_operator] = STATE(797),
-    [sym_comparison_operator] = STATE(1009),
-    [sym_lambda] = STATE(1009),
-    [sym_assignment] = STATE(1361),
-    [sym_augmented_assignment] = STATE(1361),
-    [sym_pattern_list] = STATE(897),
-    [sym_yield] = STATE(1361),
-    [sym_attribute] = STATE(431),
-    [sym_subscript] = STATE(431),
-    [sym_call] = STATE(797),
-    [sym_list] = STATE(797),
-    [sym_set] = STATE(797),
-    [sym_tuple] = STATE(797),
-    [sym_dictionary] = STATE(797),
-    [sym_list_comprehension] = STATE(797),
-    [sym_dictionary_comprehension] = STATE(797),
-    [sym_set_comprehension] = STATE(797),
-    [sym_generator_expression] = STATE(797),
-    [sym_parenthesized_expression] = STATE(797),
-    [sym_conditional_expression] = STATE(1009),
-    [sym_concatenated_string] = STATE(797),
-    [sym_string] = STATE(713),
-    [sym_await] = STATE(1009),
-    [aux_sym_module_repeat1] = STATE(68),
-    [aux_sym_decorated_definition_repeat1] = STATE(996),
+    [aux_sym_decorated_definition_repeat1] = STATE(947),
     [sym_identifier] = ACTIONS(7),
     [anon_sym_import] = ACTIONS(9),
     [anon_sym_from] = ACTIONS(11),
@@ -17047,74 +13967,534 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym__dedent] = ACTIONS(103),
     [sym__string_start] = ACTIONS(81),
   },
+  [55] = {
+    [sym__statement] = STATE(61),
+    [sym__simple_statements] = STATE(61),
+    [sym_import_statement] = STATE(1213),
+    [sym_future_import_statement] = STATE(1213),
+    [sym_import_from_statement] = STATE(1213),
+    [sym_print_statement] = STATE(1213),
+    [sym_assert_statement] = STATE(1213),
+    [sym_expression_statement] = STATE(1213),
+    [sym_named_expression] = STATE(985),
+    [sym_return_statement] = STATE(1213),
+    [sym_delete_statement] = STATE(1213),
+    [sym_raise_statement] = STATE(1213),
+    [sym_pass_statement] = STATE(1213),
+    [sym_break_statement] = STATE(1213),
+    [sym_continue_statement] = STATE(1213),
+    [sym_if_statement] = STATE(61),
+    [sym_for_statement] = STATE(61),
+    [sym_while_statement] = STATE(61),
+    [sym_try_statement] = STATE(61),
+    [sym_with_statement] = STATE(61),
+    [sym_match_statement] = STATE(61),
+    [sym_function_definition] = STATE(61),
+    [sym_list_splat] = STATE(1321),
+    [sym_dictionary_splat] = STATE(1321),
+    [sym_global_statement] = STATE(1213),
+    [sym_nonlocal_statement] = STATE(1213),
+    [sym_exec_statement] = STATE(1213),
+    [sym_type_alias_statement] = STATE(1213),
+    [sym_class_definition] = STATE(61),
+    [sym_decorated_definition] = STATE(61),
+    [sym_decorator] = STATE(947),
+    [sym_block] = STATE(416),
+    [sym_expression_list] = STATE(1313),
+    [sym_pattern] = STATE(871),
+    [sym_tuple_pattern] = STATE(860),
+    [sym_list_pattern] = STATE(860),
+    [sym_list_splat_pattern] = STATE(860),
+    [sym_expression] = STATE(995),
+    [sym_primary_expression] = STATE(707),
+    [sym_not_operator] = STATE(985),
+    [sym_boolean_operator] = STATE(985),
+    [sym_binary_operator] = STATE(759),
+    [sym_unary_operator] = STATE(759),
+    [sym_comparison_operator] = STATE(985),
+    [sym_lambda] = STATE(985),
+    [sym_assignment] = STATE(1313),
+    [sym_augmented_assignment] = STATE(1313),
+    [sym_pattern_list] = STATE(880),
+    [sym_yield] = STATE(1313),
+    [sym_attribute] = STATE(422),
+    [sym_subscript] = STATE(422),
+    [sym_call] = STATE(759),
+    [sym_list] = STATE(759),
+    [sym_set] = STATE(759),
+    [sym_tuple] = STATE(759),
+    [sym_dictionary] = STATE(759),
+    [sym_list_comprehension] = STATE(759),
+    [sym_dictionary_comprehension] = STATE(759),
+    [sym_set_comprehension] = STATE(759),
+    [sym_generator_expression] = STATE(759),
+    [sym_parenthesized_expression] = STATE(759),
+    [sym_conditional_expression] = STATE(985),
+    [sym_concatenated_string] = STATE(759),
+    [sym_string] = STATE(709),
+    [sym_await] = STATE(759),
+    [aux_sym_module_repeat1] = STATE(61),
+    [aux_sym_decorated_definition_repeat1] = STATE(947),
+    [sym_identifier] = ACTIONS(7),
+    [anon_sym_import] = ACTIONS(9),
+    [anon_sym_from] = ACTIONS(11),
+    [anon_sym_LPAREN] = ACTIONS(13),
+    [anon_sym_STAR] = ACTIONS(15),
+    [anon_sym_print] = ACTIONS(17),
+    [anon_sym_assert] = ACTIONS(19),
+    [anon_sym_return] = ACTIONS(21),
+    [anon_sym_del] = ACTIONS(23),
+    [anon_sym_raise] = ACTIONS(25),
+    [anon_sym_pass] = ACTIONS(27),
+    [anon_sym_break] = ACTIONS(29),
+    [anon_sym_continue] = ACTIONS(31),
+    [anon_sym_if] = ACTIONS(83),
+    [anon_sym_async] = ACTIONS(85),
+    [anon_sym_for] = ACTIONS(87),
+    [anon_sym_while] = ACTIONS(89),
+    [anon_sym_try] = ACTIONS(91),
+    [anon_sym_with] = ACTIONS(93),
+    [anon_sym_match] = ACTIONS(95),
+    [anon_sym_DASH] = ACTIONS(47),
+    [anon_sym_PLUS] = ACTIONS(47),
+    [anon_sym_LBRACK] = ACTIONS(49),
+    [anon_sym_LBRACE] = ACTIONS(51),
+    [anon_sym_STAR_STAR] = ACTIONS(53),
+    [anon_sym_def] = ACTIONS(97),
+    [anon_sym_global] = ACTIONS(57),
+    [anon_sym_nonlocal] = ACTIONS(59),
+    [anon_sym_exec] = ACTIONS(61),
+    [anon_sym_type] = ACTIONS(63),
+    [anon_sym_class] = ACTIONS(99),
+    [anon_sym_AT] = ACTIONS(67),
+    [anon_sym_not] = ACTIONS(69),
+    [anon_sym_TILDE] = ACTIONS(47),
+    [anon_sym_lambda] = ACTIONS(71),
+    [anon_sym_yield] = ACTIONS(73),
+    [sym_ellipsis] = ACTIONS(75),
+    [sym_integer] = ACTIONS(77),
+    [sym_float] = ACTIONS(75),
+    [anon_sym_await] = ACTIONS(79),
+    [sym_true] = ACTIONS(77),
+    [sym_false] = ACTIONS(77),
+    [sym_none] = ACTIONS(77),
+    [sym_comment] = ACTIONS(3),
+    [sym__dedent] = ACTIONS(103),
+    [sym__string_start] = ACTIONS(81),
+  },
+  [56] = {
+    [sym__statement] = STATE(60),
+    [sym__simple_statements] = STATE(60),
+    [sym_import_statement] = STATE(1213),
+    [sym_future_import_statement] = STATE(1213),
+    [sym_import_from_statement] = STATE(1213),
+    [sym_print_statement] = STATE(1213),
+    [sym_assert_statement] = STATE(1213),
+    [sym_expression_statement] = STATE(1213),
+    [sym_named_expression] = STATE(985),
+    [sym_return_statement] = STATE(1213),
+    [sym_delete_statement] = STATE(1213),
+    [sym_raise_statement] = STATE(1213),
+    [sym_pass_statement] = STATE(1213),
+    [sym_break_statement] = STATE(1213),
+    [sym_continue_statement] = STATE(1213),
+    [sym_if_statement] = STATE(60),
+    [sym_for_statement] = STATE(60),
+    [sym_while_statement] = STATE(60),
+    [sym_try_statement] = STATE(60),
+    [sym_with_statement] = STATE(60),
+    [sym_match_statement] = STATE(60),
+    [sym_function_definition] = STATE(60),
+    [sym_list_splat] = STATE(1321),
+    [sym_dictionary_splat] = STATE(1321),
+    [sym_global_statement] = STATE(1213),
+    [sym_nonlocal_statement] = STATE(1213),
+    [sym_exec_statement] = STATE(1213),
+    [sym_type_alias_statement] = STATE(1213),
+    [sym_class_definition] = STATE(60),
+    [sym_decorated_definition] = STATE(60),
+    [sym_decorator] = STATE(947),
+    [sym_block] = STATE(463),
+    [sym_expression_list] = STATE(1313),
+    [sym_pattern] = STATE(871),
+    [sym_tuple_pattern] = STATE(860),
+    [sym_list_pattern] = STATE(860),
+    [sym_list_splat_pattern] = STATE(860),
+    [sym_expression] = STATE(995),
+    [sym_primary_expression] = STATE(707),
+    [sym_not_operator] = STATE(985),
+    [sym_boolean_operator] = STATE(985),
+    [sym_binary_operator] = STATE(759),
+    [sym_unary_operator] = STATE(759),
+    [sym_comparison_operator] = STATE(985),
+    [sym_lambda] = STATE(985),
+    [sym_assignment] = STATE(1313),
+    [sym_augmented_assignment] = STATE(1313),
+    [sym_pattern_list] = STATE(880),
+    [sym_yield] = STATE(1313),
+    [sym_attribute] = STATE(422),
+    [sym_subscript] = STATE(422),
+    [sym_call] = STATE(759),
+    [sym_list] = STATE(759),
+    [sym_set] = STATE(759),
+    [sym_tuple] = STATE(759),
+    [sym_dictionary] = STATE(759),
+    [sym_list_comprehension] = STATE(759),
+    [sym_dictionary_comprehension] = STATE(759),
+    [sym_set_comprehension] = STATE(759),
+    [sym_generator_expression] = STATE(759),
+    [sym_parenthesized_expression] = STATE(759),
+    [sym_conditional_expression] = STATE(985),
+    [sym_concatenated_string] = STATE(759),
+    [sym_string] = STATE(709),
+    [sym_await] = STATE(759),
+    [aux_sym_module_repeat1] = STATE(60),
+    [aux_sym_decorated_definition_repeat1] = STATE(947),
+    [sym_identifier] = ACTIONS(7),
+    [anon_sym_import] = ACTIONS(9),
+    [anon_sym_from] = ACTIONS(11),
+    [anon_sym_LPAREN] = ACTIONS(13),
+    [anon_sym_STAR] = ACTIONS(15),
+    [anon_sym_print] = ACTIONS(17),
+    [anon_sym_assert] = ACTIONS(19),
+    [anon_sym_return] = ACTIONS(21),
+    [anon_sym_del] = ACTIONS(23),
+    [anon_sym_raise] = ACTIONS(25),
+    [anon_sym_pass] = ACTIONS(27),
+    [anon_sym_break] = ACTIONS(29),
+    [anon_sym_continue] = ACTIONS(31),
+    [anon_sym_if] = ACTIONS(83),
+    [anon_sym_async] = ACTIONS(85),
+    [anon_sym_for] = ACTIONS(87),
+    [anon_sym_while] = ACTIONS(89),
+    [anon_sym_try] = ACTIONS(91),
+    [anon_sym_with] = ACTIONS(93),
+    [anon_sym_match] = ACTIONS(95),
+    [anon_sym_DASH] = ACTIONS(47),
+    [anon_sym_PLUS] = ACTIONS(47),
+    [anon_sym_LBRACK] = ACTIONS(49),
+    [anon_sym_LBRACE] = ACTIONS(51),
+    [anon_sym_STAR_STAR] = ACTIONS(53),
+    [anon_sym_def] = ACTIONS(97),
+    [anon_sym_global] = ACTIONS(57),
+    [anon_sym_nonlocal] = ACTIONS(59),
+    [anon_sym_exec] = ACTIONS(61),
+    [anon_sym_type] = ACTIONS(63),
+    [anon_sym_class] = ACTIONS(99),
+    [anon_sym_AT] = ACTIONS(67),
+    [anon_sym_not] = ACTIONS(69),
+    [anon_sym_TILDE] = ACTIONS(47),
+    [anon_sym_lambda] = ACTIONS(71),
+    [anon_sym_yield] = ACTIONS(73),
+    [sym_ellipsis] = ACTIONS(75),
+    [sym_integer] = ACTIONS(77),
+    [sym_float] = ACTIONS(75),
+    [anon_sym_await] = ACTIONS(79),
+    [sym_true] = ACTIONS(77),
+    [sym_false] = ACTIONS(77),
+    [sym_none] = ACTIONS(77),
+    [sym_comment] = ACTIONS(3),
+    [sym__dedent] = ACTIONS(101),
+    [sym__string_start] = ACTIONS(81),
+  },
+  [57] = {
+    [sym__statement] = STATE(61),
+    [sym__simple_statements] = STATE(61),
+    [sym_import_statement] = STATE(1213),
+    [sym_future_import_statement] = STATE(1213),
+    [sym_import_from_statement] = STATE(1213),
+    [sym_print_statement] = STATE(1213),
+    [sym_assert_statement] = STATE(1213),
+    [sym_expression_statement] = STATE(1213),
+    [sym_named_expression] = STATE(985),
+    [sym_return_statement] = STATE(1213),
+    [sym_delete_statement] = STATE(1213),
+    [sym_raise_statement] = STATE(1213),
+    [sym_pass_statement] = STATE(1213),
+    [sym_break_statement] = STATE(1213),
+    [sym_continue_statement] = STATE(1213),
+    [sym_if_statement] = STATE(61),
+    [sym_for_statement] = STATE(61),
+    [sym_while_statement] = STATE(61),
+    [sym_try_statement] = STATE(61),
+    [sym_with_statement] = STATE(61),
+    [sym_match_statement] = STATE(61),
+    [sym_function_definition] = STATE(61),
+    [sym_list_splat] = STATE(1321),
+    [sym_dictionary_splat] = STATE(1321),
+    [sym_global_statement] = STATE(1213),
+    [sym_nonlocal_statement] = STATE(1213),
+    [sym_exec_statement] = STATE(1213),
+    [sym_type_alias_statement] = STATE(1213),
+    [sym_class_definition] = STATE(61),
+    [sym_decorated_definition] = STATE(61),
+    [sym_decorator] = STATE(947),
+    [sym_block] = STATE(566),
+    [sym_expression_list] = STATE(1313),
+    [sym_pattern] = STATE(871),
+    [sym_tuple_pattern] = STATE(860),
+    [sym_list_pattern] = STATE(860),
+    [sym_list_splat_pattern] = STATE(860),
+    [sym_expression] = STATE(995),
+    [sym_primary_expression] = STATE(707),
+    [sym_not_operator] = STATE(985),
+    [sym_boolean_operator] = STATE(985),
+    [sym_binary_operator] = STATE(759),
+    [sym_unary_operator] = STATE(759),
+    [sym_comparison_operator] = STATE(985),
+    [sym_lambda] = STATE(985),
+    [sym_assignment] = STATE(1313),
+    [sym_augmented_assignment] = STATE(1313),
+    [sym_pattern_list] = STATE(880),
+    [sym_yield] = STATE(1313),
+    [sym_attribute] = STATE(422),
+    [sym_subscript] = STATE(422),
+    [sym_call] = STATE(759),
+    [sym_list] = STATE(759),
+    [sym_set] = STATE(759),
+    [sym_tuple] = STATE(759),
+    [sym_dictionary] = STATE(759),
+    [sym_list_comprehension] = STATE(759),
+    [sym_dictionary_comprehension] = STATE(759),
+    [sym_set_comprehension] = STATE(759),
+    [sym_generator_expression] = STATE(759),
+    [sym_parenthesized_expression] = STATE(759),
+    [sym_conditional_expression] = STATE(985),
+    [sym_concatenated_string] = STATE(759),
+    [sym_string] = STATE(709),
+    [sym_await] = STATE(759),
+    [aux_sym_module_repeat1] = STATE(61),
+    [aux_sym_decorated_definition_repeat1] = STATE(947),
+    [sym_identifier] = ACTIONS(7),
+    [anon_sym_import] = ACTIONS(9),
+    [anon_sym_from] = ACTIONS(11),
+    [anon_sym_LPAREN] = ACTIONS(13),
+    [anon_sym_STAR] = ACTIONS(15),
+    [anon_sym_print] = ACTIONS(17),
+    [anon_sym_assert] = ACTIONS(19),
+    [anon_sym_return] = ACTIONS(21),
+    [anon_sym_del] = ACTIONS(23),
+    [anon_sym_raise] = ACTIONS(25),
+    [anon_sym_pass] = ACTIONS(27),
+    [anon_sym_break] = ACTIONS(29),
+    [anon_sym_continue] = ACTIONS(31),
+    [anon_sym_if] = ACTIONS(83),
+    [anon_sym_async] = ACTIONS(85),
+    [anon_sym_for] = ACTIONS(87),
+    [anon_sym_while] = ACTIONS(89),
+    [anon_sym_try] = ACTIONS(91),
+    [anon_sym_with] = ACTIONS(93),
+    [anon_sym_match] = ACTIONS(95),
+    [anon_sym_DASH] = ACTIONS(47),
+    [anon_sym_PLUS] = ACTIONS(47),
+    [anon_sym_LBRACK] = ACTIONS(49),
+    [anon_sym_LBRACE] = ACTIONS(51),
+    [anon_sym_STAR_STAR] = ACTIONS(53),
+    [anon_sym_def] = ACTIONS(97),
+    [anon_sym_global] = ACTIONS(57),
+    [anon_sym_nonlocal] = ACTIONS(59),
+    [anon_sym_exec] = ACTIONS(61),
+    [anon_sym_type] = ACTIONS(63),
+    [anon_sym_class] = ACTIONS(99),
+    [anon_sym_AT] = ACTIONS(67),
+    [anon_sym_not] = ACTIONS(69),
+    [anon_sym_TILDE] = ACTIONS(47),
+    [anon_sym_lambda] = ACTIONS(71),
+    [anon_sym_yield] = ACTIONS(73),
+    [sym_ellipsis] = ACTIONS(75),
+    [sym_integer] = ACTIONS(77),
+    [sym_float] = ACTIONS(75),
+    [anon_sym_await] = ACTIONS(79),
+    [sym_true] = ACTIONS(77),
+    [sym_false] = ACTIONS(77),
+    [sym_none] = ACTIONS(77),
+    [sym_comment] = ACTIONS(3),
+    [sym__dedent] = ACTIONS(103),
+    [sym__string_start] = ACTIONS(81),
+  },
+  [58] = {
+    [sym__statement] = STATE(60),
+    [sym__simple_statements] = STATE(60),
+    [sym_import_statement] = STATE(1213),
+    [sym_future_import_statement] = STATE(1213),
+    [sym_import_from_statement] = STATE(1213),
+    [sym_print_statement] = STATE(1213),
+    [sym_assert_statement] = STATE(1213),
+    [sym_expression_statement] = STATE(1213),
+    [sym_named_expression] = STATE(985),
+    [sym_return_statement] = STATE(1213),
+    [sym_delete_statement] = STATE(1213),
+    [sym_raise_statement] = STATE(1213),
+    [sym_pass_statement] = STATE(1213),
+    [sym_break_statement] = STATE(1213),
+    [sym_continue_statement] = STATE(1213),
+    [sym_if_statement] = STATE(60),
+    [sym_for_statement] = STATE(60),
+    [sym_while_statement] = STATE(60),
+    [sym_try_statement] = STATE(60),
+    [sym_with_statement] = STATE(60),
+    [sym_match_statement] = STATE(60),
+    [sym_function_definition] = STATE(60),
+    [sym_list_splat] = STATE(1321),
+    [sym_dictionary_splat] = STATE(1321),
+    [sym_global_statement] = STATE(1213),
+    [sym_nonlocal_statement] = STATE(1213),
+    [sym_exec_statement] = STATE(1213),
+    [sym_type_alias_statement] = STATE(1213),
+    [sym_class_definition] = STATE(60),
+    [sym_decorated_definition] = STATE(60),
+    [sym_decorator] = STATE(947),
+    [sym_block] = STATE(508),
+    [sym_expression_list] = STATE(1313),
+    [sym_pattern] = STATE(871),
+    [sym_tuple_pattern] = STATE(860),
+    [sym_list_pattern] = STATE(860),
+    [sym_list_splat_pattern] = STATE(860),
+    [sym_expression] = STATE(995),
+    [sym_primary_expression] = STATE(707),
+    [sym_not_operator] = STATE(985),
+    [sym_boolean_operator] = STATE(985),
+    [sym_binary_operator] = STATE(759),
+    [sym_unary_operator] = STATE(759),
+    [sym_comparison_operator] = STATE(985),
+    [sym_lambda] = STATE(985),
+    [sym_assignment] = STATE(1313),
+    [sym_augmented_assignment] = STATE(1313),
+    [sym_pattern_list] = STATE(880),
+    [sym_yield] = STATE(1313),
+    [sym_attribute] = STATE(422),
+    [sym_subscript] = STATE(422),
+    [sym_call] = STATE(759),
+    [sym_list] = STATE(759),
+    [sym_set] = STATE(759),
+    [sym_tuple] = STATE(759),
+    [sym_dictionary] = STATE(759),
+    [sym_list_comprehension] = STATE(759),
+    [sym_dictionary_comprehension] = STATE(759),
+    [sym_set_comprehension] = STATE(759),
+    [sym_generator_expression] = STATE(759),
+    [sym_parenthesized_expression] = STATE(759),
+    [sym_conditional_expression] = STATE(985),
+    [sym_concatenated_string] = STATE(759),
+    [sym_string] = STATE(709),
+    [sym_await] = STATE(759),
+    [aux_sym_module_repeat1] = STATE(60),
+    [aux_sym_decorated_definition_repeat1] = STATE(947),
+    [sym_identifier] = ACTIONS(7),
+    [anon_sym_import] = ACTIONS(9),
+    [anon_sym_from] = ACTIONS(11),
+    [anon_sym_LPAREN] = ACTIONS(13),
+    [anon_sym_STAR] = ACTIONS(15),
+    [anon_sym_print] = ACTIONS(17),
+    [anon_sym_assert] = ACTIONS(19),
+    [anon_sym_return] = ACTIONS(21),
+    [anon_sym_del] = ACTIONS(23),
+    [anon_sym_raise] = ACTIONS(25),
+    [anon_sym_pass] = ACTIONS(27),
+    [anon_sym_break] = ACTIONS(29),
+    [anon_sym_continue] = ACTIONS(31),
+    [anon_sym_if] = ACTIONS(83),
+    [anon_sym_async] = ACTIONS(85),
+    [anon_sym_for] = ACTIONS(87),
+    [anon_sym_while] = ACTIONS(89),
+    [anon_sym_try] = ACTIONS(91),
+    [anon_sym_with] = ACTIONS(93),
+    [anon_sym_match] = ACTIONS(95),
+    [anon_sym_DASH] = ACTIONS(47),
+    [anon_sym_PLUS] = ACTIONS(47),
+    [anon_sym_LBRACK] = ACTIONS(49),
+    [anon_sym_LBRACE] = ACTIONS(51),
+    [anon_sym_STAR_STAR] = ACTIONS(53),
+    [anon_sym_def] = ACTIONS(97),
+    [anon_sym_global] = ACTIONS(57),
+    [anon_sym_nonlocal] = ACTIONS(59),
+    [anon_sym_exec] = ACTIONS(61),
+    [anon_sym_type] = ACTIONS(63),
+    [anon_sym_class] = ACTIONS(99),
+    [anon_sym_AT] = ACTIONS(67),
+    [anon_sym_not] = ACTIONS(69),
+    [anon_sym_TILDE] = ACTIONS(47),
+    [anon_sym_lambda] = ACTIONS(71),
+    [anon_sym_yield] = ACTIONS(73),
+    [sym_ellipsis] = ACTIONS(75),
+    [sym_integer] = ACTIONS(77),
+    [sym_float] = ACTIONS(75),
+    [anon_sym_await] = ACTIONS(79),
+    [sym_true] = ACTIONS(77),
+    [sym_false] = ACTIONS(77),
+    [sym_none] = ACTIONS(77),
+    [sym_comment] = ACTIONS(3),
+    [sym__dedent] = ACTIONS(101),
+    [sym__string_start] = ACTIONS(81),
+  },
   [59] = {
-    [sym__statement] = STATE(68),
-    [sym__simple_statements] = STATE(68),
-    [sym_import_statement] = STATE(1319),
-    [sym_future_import_statement] = STATE(1319),
-    [sym_import_from_statement] = STATE(1319),
-    [sym_print_statement] = STATE(1319),
-    [sym_assert_statement] = STATE(1319),
-    [sym_expression_statement] = STATE(1319),
-    [sym_named_expression] = STATE(1009),
-    [sym_return_statement] = STATE(1319),
-    [sym_delete_statement] = STATE(1319),
-    [sym_raise_statement] = STATE(1319),
-    [sym_pass_statement] = STATE(1319),
-    [sym_break_statement] = STATE(1319),
-    [sym_continue_statement] = STATE(1319),
-    [sym_if_statement] = STATE(68),
-    [sym_for_statement] = STATE(68),
-    [sym_while_statement] = STATE(68),
-    [sym_try_statement] = STATE(68),
-    [sym_with_statement] = STATE(68),
-    [sym_match_statement] = STATE(68),
-    [sym_function_definition] = STATE(68),
-    [sym_list_splat] = STATE(1360),
-    [sym_dictionary_splat] = STATE(1360),
-    [sym_global_statement] = STATE(1319),
-    [sym_nonlocal_statement] = STATE(1319),
-    [sym_exec_statement] = STATE(1319),
-    [sym_type_alias_statement] = STATE(1319),
-    [sym_class_definition] = STATE(68),
-    [sym_decorated_definition] = STATE(68),
-    [sym_decorator] = STATE(996),
-    [sym_block] = STATE(554),
-    [sym_expression_list] = STATE(1361),
-    [sym_pattern] = STATE(889),
-    [sym_tuple_pattern] = STATE(875),
-    [sym_list_pattern] = STATE(875),
-    [sym_list_splat_pattern] = STATE(875),
-    [sym_expression] = STATE(1019),
-    [sym_primary_expression] = STATE(684),
-    [sym_not_operator] = STATE(1009),
-    [sym_boolean_operator] = STATE(1009),
-    [sym_binary_operator] = STATE(797),
-    [sym_unary_operator] = STATE(797),
-    [sym_comparison_operator] = STATE(1009),
-    [sym_lambda] = STATE(1009),
-    [sym_assignment] = STATE(1361),
-    [sym_augmented_assignment] = STATE(1361),
-    [sym_pattern_list] = STATE(897),
-    [sym_yield] = STATE(1361),
-    [sym_attribute] = STATE(431),
-    [sym_subscript] = STATE(431),
-    [sym_call] = STATE(797),
-    [sym_list] = STATE(797),
-    [sym_set] = STATE(797),
-    [sym_tuple] = STATE(797),
-    [sym_dictionary] = STATE(797),
-    [sym_list_comprehension] = STATE(797),
-    [sym_dictionary_comprehension] = STATE(797),
-    [sym_set_comprehension] = STATE(797),
-    [sym_generator_expression] = STATE(797),
-    [sym_parenthesized_expression] = STATE(797),
-    [sym_conditional_expression] = STATE(1009),
-    [sym_concatenated_string] = STATE(797),
-    [sym_string] = STATE(713),
-    [sym_await] = STATE(1009),
-    [aux_sym_module_repeat1] = STATE(68),
-    [aux_sym_decorated_definition_repeat1] = STATE(996),
+    [sym__statement] = STATE(61),
+    [sym__simple_statements] = STATE(61),
+    [sym_import_statement] = STATE(1213),
+    [sym_future_import_statement] = STATE(1213),
+    [sym_import_from_statement] = STATE(1213),
+    [sym_print_statement] = STATE(1213),
+    [sym_assert_statement] = STATE(1213),
+    [sym_expression_statement] = STATE(1213),
+    [sym_named_expression] = STATE(985),
+    [sym_return_statement] = STATE(1213),
+    [sym_delete_statement] = STATE(1213),
+    [sym_raise_statement] = STATE(1213),
+    [sym_pass_statement] = STATE(1213),
+    [sym_break_statement] = STATE(1213),
+    [sym_continue_statement] = STATE(1213),
+    [sym_if_statement] = STATE(61),
+    [sym_for_statement] = STATE(61),
+    [sym_while_statement] = STATE(61),
+    [sym_try_statement] = STATE(61),
+    [sym_with_statement] = STATE(61),
+    [sym_match_statement] = STATE(61),
+    [sym_function_definition] = STATE(61),
+    [sym_list_splat] = STATE(1321),
+    [sym_dictionary_splat] = STATE(1321),
+    [sym_global_statement] = STATE(1213),
+    [sym_nonlocal_statement] = STATE(1213),
+    [sym_exec_statement] = STATE(1213),
+    [sym_type_alias_statement] = STATE(1213),
+    [sym_class_definition] = STATE(61),
+    [sym_decorated_definition] = STATE(61),
+    [sym_decorator] = STATE(947),
+    [sym_block] = STATE(526),
+    [sym_expression_list] = STATE(1313),
+    [sym_pattern] = STATE(871),
+    [sym_tuple_pattern] = STATE(860),
+    [sym_list_pattern] = STATE(860),
+    [sym_list_splat_pattern] = STATE(860),
+    [sym_expression] = STATE(995),
+    [sym_primary_expression] = STATE(707),
+    [sym_not_operator] = STATE(985),
+    [sym_boolean_operator] = STATE(985),
+    [sym_binary_operator] = STATE(759),
+    [sym_unary_operator] = STATE(759),
+    [sym_comparison_operator] = STATE(985),
+    [sym_lambda] = STATE(985),
+    [sym_assignment] = STATE(1313),
+    [sym_augmented_assignment] = STATE(1313),
+    [sym_pattern_list] = STATE(880),
+    [sym_yield] = STATE(1313),
+    [sym_attribute] = STATE(422),
+    [sym_subscript] = STATE(422),
+    [sym_call] = STATE(759),
+    [sym_list] = STATE(759),
+    [sym_set] = STATE(759),
+    [sym_tuple] = STATE(759),
+    [sym_dictionary] = STATE(759),
+    [sym_list_comprehension] = STATE(759),
+    [sym_dictionary_comprehension] = STATE(759),
+    [sym_set_comprehension] = STATE(759),
+    [sym_generator_expression] = STATE(759),
+    [sym_parenthesized_expression] = STATE(759),
+    [sym_conditional_expression] = STATE(985),
+    [sym_concatenated_string] = STATE(759),
+    [sym_string] = STATE(709),
+    [sym_await] = STATE(759),
+    [aux_sym_module_repeat1] = STATE(61),
+    [aux_sym_decorated_definition_repeat1] = STATE(947),
     [sym_identifier] = ACTIONS(7),
     [anon_sym_import] = ACTIONS(9),
     [anon_sym_from] = ACTIONS(11),
@@ -17165,19 +14545,19 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
   [60] = {
     [sym__statement] = STATE(63),
     [sym__simple_statements] = STATE(63),
-    [sym_import_statement] = STATE(1319),
-    [sym_future_import_statement] = STATE(1319),
-    [sym_import_from_statement] = STATE(1319),
-    [sym_print_statement] = STATE(1319),
-    [sym_assert_statement] = STATE(1319),
-    [sym_expression_statement] = STATE(1319),
-    [sym_named_expression] = STATE(1009),
-    [sym_return_statement] = STATE(1319),
-    [sym_delete_statement] = STATE(1319),
-    [sym_raise_statement] = STATE(1319),
-    [sym_pass_statement] = STATE(1319),
-    [sym_break_statement] = STATE(1319),
-    [sym_continue_statement] = STATE(1319),
+    [sym_import_statement] = STATE(1213),
+    [sym_future_import_statement] = STATE(1213),
+    [sym_import_from_statement] = STATE(1213),
+    [sym_print_statement] = STATE(1213),
+    [sym_assert_statement] = STATE(1213),
+    [sym_expression_statement] = STATE(1213),
+    [sym_named_expression] = STATE(985),
+    [sym_return_statement] = STATE(1213),
+    [sym_delete_statement] = STATE(1213),
+    [sym_raise_statement] = STATE(1213),
+    [sym_pass_statement] = STATE(1213),
+    [sym_break_statement] = STATE(1213),
+    [sym_continue_statement] = STATE(1213),
     [sym_if_statement] = STATE(63),
     [sym_for_statement] = STATE(63),
     [sym_while_statement] = STATE(63),
@@ -17185,50 +14565,50 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_with_statement] = STATE(63),
     [sym_match_statement] = STATE(63),
     [sym_function_definition] = STATE(63),
-    [sym_list_splat] = STATE(1360),
-    [sym_dictionary_splat] = STATE(1360),
-    [sym_global_statement] = STATE(1319),
-    [sym_nonlocal_statement] = STATE(1319),
-    [sym_exec_statement] = STATE(1319),
-    [sym_type_alias_statement] = STATE(1319),
+    [sym_list_splat] = STATE(1321),
+    [sym_dictionary_splat] = STATE(1321),
+    [sym_global_statement] = STATE(1213),
+    [sym_nonlocal_statement] = STATE(1213),
+    [sym_exec_statement] = STATE(1213),
+    [sym_type_alias_statement] = STATE(1213),
     [sym_class_definition] = STATE(63),
     [sym_decorated_definition] = STATE(63),
-    [sym_decorator] = STATE(996),
-    [sym_expression_list] = STATE(1361),
-    [sym_pattern] = STATE(889),
-    [sym_tuple_pattern] = STATE(875),
-    [sym_list_pattern] = STATE(875),
-    [sym_list_splat_pattern] = STATE(875),
-    [sym_expression] = STATE(1019),
-    [sym_primary_expression] = STATE(684),
-    [sym_not_operator] = STATE(1009),
-    [sym_boolean_operator] = STATE(1009),
-    [sym_binary_operator] = STATE(797),
-    [sym_unary_operator] = STATE(797),
-    [sym_comparison_operator] = STATE(1009),
-    [sym_lambda] = STATE(1009),
-    [sym_assignment] = STATE(1361),
-    [sym_augmented_assignment] = STATE(1361),
-    [sym_pattern_list] = STATE(897),
-    [sym_yield] = STATE(1361),
-    [sym_attribute] = STATE(431),
-    [sym_subscript] = STATE(431),
-    [sym_call] = STATE(797),
-    [sym_list] = STATE(797),
-    [sym_set] = STATE(797),
-    [sym_tuple] = STATE(797),
-    [sym_dictionary] = STATE(797),
-    [sym_list_comprehension] = STATE(797),
-    [sym_dictionary_comprehension] = STATE(797),
-    [sym_set_comprehension] = STATE(797),
-    [sym_generator_expression] = STATE(797),
-    [sym_parenthesized_expression] = STATE(797),
-    [sym_conditional_expression] = STATE(1009),
-    [sym_concatenated_string] = STATE(797),
-    [sym_string] = STATE(713),
-    [sym_await] = STATE(1009),
+    [sym_decorator] = STATE(947),
+    [sym_expression_list] = STATE(1313),
+    [sym_pattern] = STATE(871),
+    [sym_tuple_pattern] = STATE(860),
+    [sym_list_pattern] = STATE(860),
+    [sym_list_splat_pattern] = STATE(860),
+    [sym_expression] = STATE(995),
+    [sym_primary_expression] = STATE(707),
+    [sym_not_operator] = STATE(985),
+    [sym_boolean_operator] = STATE(985),
+    [sym_binary_operator] = STATE(759),
+    [sym_unary_operator] = STATE(759),
+    [sym_comparison_operator] = STATE(985),
+    [sym_lambda] = STATE(985),
+    [sym_assignment] = STATE(1313),
+    [sym_augmented_assignment] = STATE(1313),
+    [sym_pattern_list] = STATE(880),
+    [sym_yield] = STATE(1313),
+    [sym_attribute] = STATE(422),
+    [sym_subscript] = STATE(422),
+    [sym_call] = STATE(759),
+    [sym_list] = STATE(759),
+    [sym_set] = STATE(759),
+    [sym_tuple] = STATE(759),
+    [sym_dictionary] = STATE(759),
+    [sym_list_comprehension] = STATE(759),
+    [sym_dictionary_comprehension] = STATE(759),
+    [sym_set_comprehension] = STATE(759),
+    [sym_generator_expression] = STATE(759),
+    [sym_parenthesized_expression] = STATE(759),
+    [sym_conditional_expression] = STATE(985),
+    [sym_concatenated_string] = STATE(759),
+    [sym_string] = STATE(709),
+    [sym_await] = STATE(759),
     [aux_sym_module_repeat1] = STATE(63),
-    [aux_sym_decorated_definition_repeat1] = STATE(996),
+    [aux_sym_decorated_definition_repeat1] = STATE(947),
     [sym_identifier] = ACTIONS(7),
     [anon_sym_import] = ACTIONS(9),
     [anon_sym_from] = ACTIONS(11),
@@ -17273,25 +14653,25 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_false] = ACTIONS(77),
     [sym_none] = ACTIONS(77),
     [sym_comment] = ACTIONS(3),
-    [sym__dedent] = ACTIONS(115),
+    [sym__dedent] = ACTIONS(107),
     [sym__string_start] = ACTIONS(81),
   },
   [61] = {
     [sym__statement] = STATE(63),
     [sym__simple_statements] = STATE(63),
-    [sym_import_statement] = STATE(1319),
-    [sym_future_import_statement] = STATE(1319),
-    [sym_import_from_statement] = STATE(1319),
-    [sym_print_statement] = STATE(1319),
-    [sym_assert_statement] = STATE(1319),
-    [sym_expression_statement] = STATE(1319),
-    [sym_named_expression] = STATE(1009),
-    [sym_return_statement] = STATE(1319),
-    [sym_delete_statement] = STATE(1319),
-    [sym_raise_statement] = STATE(1319),
-    [sym_pass_statement] = STATE(1319),
-    [sym_break_statement] = STATE(1319),
-    [sym_continue_statement] = STATE(1319),
+    [sym_import_statement] = STATE(1213),
+    [sym_future_import_statement] = STATE(1213),
+    [sym_import_from_statement] = STATE(1213),
+    [sym_print_statement] = STATE(1213),
+    [sym_assert_statement] = STATE(1213),
+    [sym_expression_statement] = STATE(1213),
+    [sym_named_expression] = STATE(985),
+    [sym_return_statement] = STATE(1213),
+    [sym_delete_statement] = STATE(1213),
+    [sym_raise_statement] = STATE(1213),
+    [sym_pass_statement] = STATE(1213),
+    [sym_break_statement] = STATE(1213),
+    [sym_continue_statement] = STATE(1213),
     [sym_if_statement] = STATE(63),
     [sym_for_statement] = STATE(63),
     [sym_while_statement] = STATE(63),
@@ -17299,50 +14679,50 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_with_statement] = STATE(63),
     [sym_match_statement] = STATE(63),
     [sym_function_definition] = STATE(63),
-    [sym_list_splat] = STATE(1360),
-    [sym_dictionary_splat] = STATE(1360),
-    [sym_global_statement] = STATE(1319),
-    [sym_nonlocal_statement] = STATE(1319),
-    [sym_exec_statement] = STATE(1319),
-    [sym_type_alias_statement] = STATE(1319),
+    [sym_list_splat] = STATE(1321),
+    [sym_dictionary_splat] = STATE(1321),
+    [sym_global_statement] = STATE(1213),
+    [sym_nonlocal_statement] = STATE(1213),
+    [sym_exec_statement] = STATE(1213),
+    [sym_type_alias_statement] = STATE(1213),
     [sym_class_definition] = STATE(63),
     [sym_decorated_definition] = STATE(63),
-    [sym_decorator] = STATE(996),
-    [sym_expression_list] = STATE(1361),
-    [sym_pattern] = STATE(889),
-    [sym_tuple_pattern] = STATE(875),
-    [sym_list_pattern] = STATE(875),
-    [sym_list_splat_pattern] = STATE(875),
-    [sym_expression] = STATE(1019),
-    [sym_primary_expression] = STATE(684),
-    [sym_not_operator] = STATE(1009),
-    [sym_boolean_operator] = STATE(1009),
-    [sym_binary_operator] = STATE(797),
-    [sym_unary_operator] = STATE(797),
-    [sym_comparison_operator] = STATE(1009),
-    [sym_lambda] = STATE(1009),
-    [sym_assignment] = STATE(1361),
-    [sym_augmented_assignment] = STATE(1361),
-    [sym_pattern_list] = STATE(897),
-    [sym_yield] = STATE(1361),
-    [sym_attribute] = STATE(431),
-    [sym_subscript] = STATE(431),
-    [sym_call] = STATE(797),
-    [sym_list] = STATE(797),
-    [sym_set] = STATE(797),
-    [sym_tuple] = STATE(797),
-    [sym_dictionary] = STATE(797),
-    [sym_list_comprehension] = STATE(797),
-    [sym_dictionary_comprehension] = STATE(797),
-    [sym_set_comprehension] = STATE(797),
-    [sym_generator_expression] = STATE(797),
-    [sym_parenthesized_expression] = STATE(797),
-    [sym_conditional_expression] = STATE(1009),
-    [sym_concatenated_string] = STATE(797),
-    [sym_string] = STATE(713),
-    [sym_await] = STATE(1009),
+    [sym_decorator] = STATE(947),
+    [sym_expression_list] = STATE(1313),
+    [sym_pattern] = STATE(871),
+    [sym_tuple_pattern] = STATE(860),
+    [sym_list_pattern] = STATE(860),
+    [sym_list_splat_pattern] = STATE(860),
+    [sym_expression] = STATE(995),
+    [sym_primary_expression] = STATE(707),
+    [sym_not_operator] = STATE(985),
+    [sym_boolean_operator] = STATE(985),
+    [sym_binary_operator] = STATE(759),
+    [sym_unary_operator] = STATE(759),
+    [sym_comparison_operator] = STATE(985),
+    [sym_lambda] = STATE(985),
+    [sym_assignment] = STATE(1313),
+    [sym_augmented_assignment] = STATE(1313),
+    [sym_pattern_list] = STATE(880),
+    [sym_yield] = STATE(1313),
+    [sym_attribute] = STATE(422),
+    [sym_subscript] = STATE(422),
+    [sym_call] = STATE(759),
+    [sym_list] = STATE(759),
+    [sym_set] = STATE(759),
+    [sym_tuple] = STATE(759),
+    [sym_dictionary] = STATE(759),
+    [sym_list_comprehension] = STATE(759),
+    [sym_dictionary_comprehension] = STATE(759),
+    [sym_set_comprehension] = STATE(759),
+    [sym_generator_expression] = STATE(759),
+    [sym_parenthesized_expression] = STATE(759),
+    [sym_conditional_expression] = STATE(985),
+    [sym_concatenated_string] = STATE(759),
+    [sym_string] = STATE(709),
+    [sym_await] = STATE(759),
     [aux_sym_module_repeat1] = STATE(63),
-    [aux_sym_decorated_definition_repeat1] = STATE(996),
+    [aux_sym_decorated_definition_repeat1] = STATE(947),
     [sym_identifier] = ACTIONS(7),
     [anon_sym_import] = ACTIONS(9),
     [anon_sym_from] = ACTIONS(11),
@@ -17387,305 +14767,77 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_false] = ACTIONS(77),
     [sym_none] = ACTIONS(77),
     [sym_comment] = ACTIONS(3),
-    [sym__dedent] = ACTIONS(117),
+    [sym__dedent] = ACTIONS(109),
     [sym__string_start] = ACTIONS(81),
   },
   [62] = {
-    [sym__statement] = STATE(63),
-    [sym__simple_statements] = STATE(63),
-    [sym_import_statement] = STATE(1319),
-    [sym_future_import_statement] = STATE(1319),
-    [sym_import_from_statement] = STATE(1319),
-    [sym_print_statement] = STATE(1319),
-    [sym_assert_statement] = STATE(1319),
-    [sym_expression_statement] = STATE(1319),
-    [sym_named_expression] = STATE(1009),
-    [sym_return_statement] = STATE(1319),
-    [sym_delete_statement] = STATE(1319),
-    [sym_raise_statement] = STATE(1319),
-    [sym_pass_statement] = STATE(1319),
-    [sym_break_statement] = STATE(1319),
-    [sym_continue_statement] = STATE(1319),
-    [sym_if_statement] = STATE(63),
-    [sym_for_statement] = STATE(63),
-    [sym_while_statement] = STATE(63),
-    [sym_try_statement] = STATE(63),
-    [sym_with_statement] = STATE(63),
-    [sym_match_statement] = STATE(63),
-    [sym_function_definition] = STATE(63),
-    [sym_list_splat] = STATE(1360),
-    [sym_dictionary_splat] = STATE(1360),
-    [sym_global_statement] = STATE(1319),
-    [sym_nonlocal_statement] = STATE(1319),
-    [sym_exec_statement] = STATE(1319),
-    [sym_type_alias_statement] = STATE(1319),
-    [sym_class_definition] = STATE(63),
-    [sym_decorated_definition] = STATE(63),
-    [sym_decorator] = STATE(996),
-    [sym_expression_list] = STATE(1361),
-    [sym_pattern] = STATE(889),
-    [sym_tuple_pattern] = STATE(875),
-    [sym_list_pattern] = STATE(875),
-    [sym_list_splat_pattern] = STATE(875),
-    [sym_expression] = STATE(1019),
-    [sym_primary_expression] = STATE(684),
-    [sym_not_operator] = STATE(1009),
-    [sym_boolean_operator] = STATE(1009),
-    [sym_binary_operator] = STATE(797),
-    [sym_unary_operator] = STATE(797),
-    [sym_comparison_operator] = STATE(1009),
-    [sym_lambda] = STATE(1009),
-    [sym_assignment] = STATE(1361),
-    [sym_augmented_assignment] = STATE(1361),
-    [sym_pattern_list] = STATE(897),
-    [sym_yield] = STATE(1361),
-    [sym_attribute] = STATE(431),
-    [sym_subscript] = STATE(431),
-    [sym_call] = STATE(797),
-    [sym_list] = STATE(797),
-    [sym_set] = STATE(797),
-    [sym_tuple] = STATE(797),
-    [sym_dictionary] = STATE(797),
-    [sym_list_comprehension] = STATE(797),
-    [sym_dictionary_comprehension] = STATE(797),
-    [sym_set_comprehension] = STATE(797),
-    [sym_generator_expression] = STATE(797),
-    [sym_parenthesized_expression] = STATE(797),
-    [sym_conditional_expression] = STATE(1009),
-    [sym_concatenated_string] = STATE(797),
-    [sym_string] = STATE(713),
-    [sym_await] = STATE(1009),
-    [aux_sym_module_repeat1] = STATE(63),
-    [aux_sym_decorated_definition_repeat1] = STATE(996),
-    [sym_identifier] = ACTIONS(7),
-    [anon_sym_import] = ACTIONS(9),
-    [anon_sym_from] = ACTIONS(11),
-    [anon_sym_LPAREN] = ACTIONS(13),
-    [anon_sym_STAR] = ACTIONS(15),
-    [anon_sym_print] = ACTIONS(17),
-    [anon_sym_assert] = ACTIONS(19),
-    [anon_sym_return] = ACTIONS(21),
-    [anon_sym_del] = ACTIONS(23),
-    [anon_sym_raise] = ACTIONS(25),
-    [anon_sym_pass] = ACTIONS(27),
-    [anon_sym_break] = ACTIONS(29),
-    [anon_sym_continue] = ACTIONS(31),
-    [anon_sym_if] = ACTIONS(83),
-    [anon_sym_async] = ACTIONS(85),
-    [anon_sym_for] = ACTIONS(87),
-    [anon_sym_while] = ACTIONS(89),
-    [anon_sym_try] = ACTIONS(91),
-    [anon_sym_with] = ACTIONS(93),
-    [anon_sym_match] = ACTIONS(95),
-    [anon_sym_DASH] = ACTIONS(47),
-    [anon_sym_PLUS] = ACTIONS(47),
-    [anon_sym_LBRACK] = ACTIONS(49),
-    [anon_sym_LBRACE] = ACTIONS(51),
-    [anon_sym_STAR_STAR] = ACTIONS(53),
-    [anon_sym_def] = ACTIONS(97),
-    [anon_sym_global] = ACTIONS(57),
-    [anon_sym_nonlocal] = ACTIONS(59),
-    [anon_sym_exec] = ACTIONS(61),
-    [anon_sym_type] = ACTIONS(63),
-    [anon_sym_class] = ACTIONS(99),
-    [anon_sym_AT] = ACTIONS(67),
-    [anon_sym_not] = ACTIONS(69),
-    [anon_sym_TILDE] = ACTIONS(47),
-    [anon_sym_lambda] = ACTIONS(71),
-    [anon_sym_yield] = ACTIONS(73),
-    [sym_ellipsis] = ACTIONS(75),
-    [sym_integer] = ACTIONS(77),
-    [sym_float] = ACTIONS(75),
-    [anon_sym_await] = ACTIONS(79),
-    [sym_true] = ACTIONS(77),
-    [sym_false] = ACTIONS(77),
-    [sym_none] = ACTIONS(77),
-    [sym_comment] = ACTIONS(3),
-    [sym__dedent] = ACTIONS(119),
-    [sym__string_start] = ACTIONS(81),
-  },
-  [63] = {
-    [sym__statement] = STATE(63),
-    [sym__simple_statements] = STATE(63),
-    [sym_import_statement] = STATE(1319),
-    [sym_future_import_statement] = STATE(1319),
-    [sym_import_from_statement] = STATE(1319),
-    [sym_print_statement] = STATE(1319),
-    [sym_assert_statement] = STATE(1319),
-    [sym_expression_statement] = STATE(1319),
-    [sym_named_expression] = STATE(1009),
-    [sym_return_statement] = STATE(1319),
-    [sym_delete_statement] = STATE(1319),
-    [sym_raise_statement] = STATE(1319),
-    [sym_pass_statement] = STATE(1319),
-    [sym_break_statement] = STATE(1319),
-    [sym_continue_statement] = STATE(1319),
-    [sym_if_statement] = STATE(63),
-    [sym_for_statement] = STATE(63),
-    [sym_while_statement] = STATE(63),
-    [sym_try_statement] = STATE(63),
-    [sym_with_statement] = STATE(63),
-    [sym_match_statement] = STATE(63),
-    [sym_function_definition] = STATE(63),
-    [sym_list_splat] = STATE(1360),
-    [sym_dictionary_splat] = STATE(1360),
-    [sym_global_statement] = STATE(1319),
-    [sym_nonlocal_statement] = STATE(1319),
-    [sym_exec_statement] = STATE(1319),
-    [sym_type_alias_statement] = STATE(1319),
-    [sym_class_definition] = STATE(63),
-    [sym_decorated_definition] = STATE(63),
-    [sym_decorator] = STATE(996),
-    [sym_expression_list] = STATE(1361),
-    [sym_pattern] = STATE(889),
-    [sym_tuple_pattern] = STATE(875),
-    [sym_list_pattern] = STATE(875),
-    [sym_list_splat_pattern] = STATE(875),
-    [sym_expression] = STATE(1019),
-    [sym_primary_expression] = STATE(684),
-    [sym_not_operator] = STATE(1009),
-    [sym_boolean_operator] = STATE(1009),
-    [sym_binary_operator] = STATE(797),
-    [sym_unary_operator] = STATE(797),
-    [sym_comparison_operator] = STATE(1009),
-    [sym_lambda] = STATE(1009),
-    [sym_assignment] = STATE(1361),
-    [sym_augmented_assignment] = STATE(1361),
-    [sym_pattern_list] = STATE(897),
-    [sym_yield] = STATE(1361),
-    [sym_attribute] = STATE(431),
-    [sym_subscript] = STATE(431),
-    [sym_call] = STATE(797),
-    [sym_list] = STATE(797),
-    [sym_set] = STATE(797),
-    [sym_tuple] = STATE(797),
-    [sym_dictionary] = STATE(797),
-    [sym_list_comprehension] = STATE(797),
-    [sym_dictionary_comprehension] = STATE(797),
-    [sym_set_comprehension] = STATE(797),
-    [sym_generator_expression] = STATE(797),
-    [sym_parenthesized_expression] = STATE(797),
-    [sym_conditional_expression] = STATE(1009),
-    [sym_concatenated_string] = STATE(797),
-    [sym_string] = STATE(713),
-    [sym_await] = STATE(1009),
-    [aux_sym_module_repeat1] = STATE(63),
-    [aux_sym_decorated_definition_repeat1] = STATE(996),
-    [sym_identifier] = ACTIONS(121),
-    [anon_sym_import] = ACTIONS(124),
-    [anon_sym_from] = ACTIONS(127),
-    [anon_sym_LPAREN] = ACTIONS(130),
-    [anon_sym_STAR] = ACTIONS(133),
-    [anon_sym_print] = ACTIONS(136),
-    [anon_sym_assert] = ACTIONS(139),
-    [anon_sym_return] = ACTIONS(142),
-    [anon_sym_del] = ACTIONS(145),
-    [anon_sym_raise] = ACTIONS(148),
-    [anon_sym_pass] = ACTIONS(151),
-    [anon_sym_break] = ACTIONS(154),
-    [anon_sym_continue] = ACTIONS(157),
-    [anon_sym_if] = ACTIONS(160),
-    [anon_sym_async] = ACTIONS(163),
-    [anon_sym_for] = ACTIONS(166),
-    [anon_sym_while] = ACTIONS(169),
-    [anon_sym_try] = ACTIONS(172),
-    [anon_sym_with] = ACTIONS(175),
-    [anon_sym_match] = ACTIONS(178),
-    [anon_sym_DASH] = ACTIONS(181),
-    [anon_sym_PLUS] = ACTIONS(181),
-    [anon_sym_LBRACK] = ACTIONS(184),
-    [anon_sym_LBRACE] = ACTIONS(187),
-    [anon_sym_STAR_STAR] = ACTIONS(190),
-    [anon_sym_def] = ACTIONS(193),
-    [anon_sym_global] = ACTIONS(196),
-    [anon_sym_nonlocal] = ACTIONS(199),
-    [anon_sym_exec] = ACTIONS(202),
-    [anon_sym_type] = ACTIONS(205),
-    [anon_sym_class] = ACTIONS(208),
-    [anon_sym_AT] = ACTIONS(211),
-    [anon_sym_not] = ACTIONS(214),
-    [anon_sym_TILDE] = ACTIONS(181),
-    [anon_sym_lambda] = ACTIONS(217),
-    [anon_sym_yield] = ACTIONS(220),
-    [sym_ellipsis] = ACTIONS(223),
-    [sym_integer] = ACTIONS(226),
-    [sym_float] = ACTIONS(223),
-    [anon_sym_await] = ACTIONS(229),
-    [sym_true] = ACTIONS(226),
-    [sym_false] = ACTIONS(226),
-    [sym_none] = ACTIONS(226),
-    [sym_comment] = ACTIONS(3),
-    [sym__dedent] = ACTIONS(232),
-    [sym__string_start] = ACTIONS(234),
-  },
-  [64] = {
-    [sym__statement] = STATE(67),
-    [sym__simple_statements] = STATE(67),
-    [sym_import_statement] = STATE(1209),
-    [sym_future_import_statement] = STATE(1209),
-    [sym_import_from_statement] = STATE(1209),
-    [sym_print_statement] = STATE(1209),
-    [sym_assert_statement] = STATE(1209),
-    [sym_expression_statement] = STATE(1209),
-    [sym_named_expression] = STATE(1009),
-    [sym_return_statement] = STATE(1209),
-    [sym_delete_statement] = STATE(1209),
-    [sym_raise_statement] = STATE(1209),
-    [sym_pass_statement] = STATE(1209),
-    [sym_break_statement] = STATE(1209),
-    [sym_continue_statement] = STATE(1209),
-    [sym_if_statement] = STATE(67),
-    [sym_for_statement] = STATE(67),
-    [sym_while_statement] = STATE(67),
-    [sym_try_statement] = STATE(67),
-    [sym_with_statement] = STATE(67),
-    [sym_match_statement] = STATE(67),
-    [sym_function_definition] = STATE(67),
-    [sym_list_splat] = STATE(1360),
-    [sym_dictionary_splat] = STATE(1360),
-    [sym_global_statement] = STATE(1209),
-    [sym_nonlocal_statement] = STATE(1209),
-    [sym_exec_statement] = STATE(1209),
-    [sym_type_alias_statement] = STATE(1209),
-    [sym_class_definition] = STATE(67),
-    [sym_decorated_definition] = STATE(67),
-    [sym_decorator] = STATE(1002),
-    [sym_expression_list] = STATE(1361),
-    [sym_pattern] = STATE(889),
-    [sym_tuple_pattern] = STATE(875),
-    [sym_list_pattern] = STATE(875),
-    [sym_list_splat_pattern] = STATE(875),
-    [sym_expression] = STATE(1019),
-    [sym_primary_expression] = STATE(684),
-    [sym_not_operator] = STATE(1009),
-    [sym_boolean_operator] = STATE(1009),
-    [sym_binary_operator] = STATE(797),
-    [sym_unary_operator] = STATE(797),
-    [sym_comparison_operator] = STATE(1009),
-    [sym_lambda] = STATE(1009),
-    [sym_assignment] = STATE(1361),
-    [sym_augmented_assignment] = STATE(1361),
-    [sym_pattern_list] = STATE(897),
-    [sym_yield] = STATE(1361),
-    [sym_attribute] = STATE(431),
-    [sym_subscript] = STATE(431),
-    [sym_call] = STATE(797),
-    [sym_list] = STATE(797),
-    [sym_set] = STATE(797),
-    [sym_tuple] = STATE(797),
-    [sym_dictionary] = STATE(797),
-    [sym_list_comprehension] = STATE(797),
-    [sym_dictionary_comprehension] = STATE(797),
-    [sym_set_comprehension] = STATE(797),
-    [sym_generator_expression] = STATE(797),
-    [sym_parenthesized_expression] = STATE(797),
-    [sym_conditional_expression] = STATE(1009),
-    [sym_concatenated_string] = STATE(797),
-    [sym_string] = STATE(713),
-    [sym_await] = STATE(1009),
-    [aux_sym_module_repeat1] = STATE(67),
-    [aux_sym_decorated_definition_repeat1] = STATE(1002),
-    [ts_builtin_sym_end] = ACTIONS(237),
+    [sym__statement] = STATE(65),
+    [sym__simple_statements] = STATE(65),
+    [sym_import_statement] = STATE(1304),
+    [sym_future_import_statement] = STATE(1304),
+    [sym_import_from_statement] = STATE(1304),
+    [sym_print_statement] = STATE(1304),
+    [sym_assert_statement] = STATE(1304),
+    [sym_expression_statement] = STATE(1304),
+    [sym_named_expression] = STATE(985),
+    [sym_return_statement] = STATE(1304),
+    [sym_delete_statement] = STATE(1304),
+    [sym_raise_statement] = STATE(1304),
+    [sym_pass_statement] = STATE(1304),
+    [sym_break_statement] = STATE(1304),
+    [sym_continue_statement] = STATE(1304),
+    [sym_if_statement] = STATE(65),
+    [sym_for_statement] = STATE(65),
+    [sym_while_statement] = STATE(65),
+    [sym_try_statement] = STATE(65),
+    [sym_with_statement] = STATE(65),
+    [sym_match_statement] = STATE(65),
+    [sym_function_definition] = STATE(65),
+    [sym_list_splat] = STATE(1321),
+    [sym_dictionary_splat] = STATE(1321),
+    [sym_global_statement] = STATE(1304),
+    [sym_nonlocal_statement] = STATE(1304),
+    [sym_exec_statement] = STATE(1304),
+    [sym_type_alias_statement] = STATE(1304),
+    [sym_class_definition] = STATE(65),
+    [sym_decorated_definition] = STATE(65),
+    [sym_decorator] = STATE(982),
+    [sym_expression_list] = STATE(1313),
+    [sym_pattern] = STATE(871),
+    [sym_tuple_pattern] = STATE(860),
+    [sym_list_pattern] = STATE(860),
+    [sym_list_splat_pattern] = STATE(860),
+    [sym_expression] = STATE(995),
+    [sym_primary_expression] = STATE(707),
+    [sym_not_operator] = STATE(985),
+    [sym_boolean_operator] = STATE(985),
+    [sym_binary_operator] = STATE(759),
+    [sym_unary_operator] = STATE(759),
+    [sym_comparison_operator] = STATE(985),
+    [sym_lambda] = STATE(985),
+    [sym_assignment] = STATE(1313),
+    [sym_augmented_assignment] = STATE(1313),
+    [sym_pattern_list] = STATE(880),
+    [sym_yield] = STATE(1313),
+    [sym_attribute] = STATE(422),
+    [sym_subscript] = STATE(422),
+    [sym_call] = STATE(759),
+    [sym_list] = STATE(759),
+    [sym_set] = STATE(759),
+    [sym_tuple] = STATE(759),
+    [sym_dictionary] = STATE(759),
+    [sym_list_comprehension] = STATE(759),
+    [sym_dictionary_comprehension] = STATE(759),
+    [sym_set_comprehension] = STATE(759),
+    [sym_generator_expression] = STATE(759),
+    [sym_parenthesized_expression] = STATE(759),
+    [sym_conditional_expression] = STATE(985),
+    [sym_concatenated_string] = STATE(759),
+    [sym_string] = STATE(709),
+    [sym_await] = STATE(759),
+    [aux_sym_module_repeat1] = STATE(65),
+    [aux_sym_decorated_definition_repeat1] = STATE(982),
+    [ts_builtin_sym_end] = ACTIONS(111),
     [sym_identifier] = ACTIONS(7),
     [anon_sym_import] = ACTIONS(9),
     [anon_sym_from] = ACTIONS(11),
@@ -17732,22 +14884,22 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_comment] = ACTIONS(3),
     [sym__string_start] = ACTIONS(81),
   },
-  [65] = {
+  [63] = {
     [sym__statement] = STATE(63),
     [sym__simple_statements] = STATE(63),
-    [sym_import_statement] = STATE(1319),
-    [sym_future_import_statement] = STATE(1319),
-    [sym_import_from_statement] = STATE(1319),
-    [sym_print_statement] = STATE(1319),
-    [sym_assert_statement] = STATE(1319),
-    [sym_expression_statement] = STATE(1319),
-    [sym_named_expression] = STATE(1009),
-    [sym_return_statement] = STATE(1319),
-    [sym_delete_statement] = STATE(1319),
-    [sym_raise_statement] = STATE(1319),
-    [sym_pass_statement] = STATE(1319),
-    [sym_break_statement] = STATE(1319),
-    [sym_continue_statement] = STATE(1319),
+    [sym_import_statement] = STATE(1213),
+    [sym_future_import_statement] = STATE(1213),
+    [sym_import_from_statement] = STATE(1213),
+    [sym_print_statement] = STATE(1213),
+    [sym_assert_statement] = STATE(1213),
+    [sym_expression_statement] = STATE(1213),
+    [sym_named_expression] = STATE(985),
+    [sym_return_statement] = STATE(1213),
+    [sym_delete_statement] = STATE(1213),
+    [sym_raise_statement] = STATE(1213),
+    [sym_pass_statement] = STATE(1213),
+    [sym_break_statement] = STATE(1213),
+    [sym_continue_statement] = STATE(1213),
     [sym_if_statement] = STATE(63),
     [sym_for_statement] = STATE(63),
     [sym_while_statement] = STATE(63),
@@ -17755,50 +14907,164 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_with_statement] = STATE(63),
     [sym_match_statement] = STATE(63),
     [sym_function_definition] = STATE(63),
-    [sym_list_splat] = STATE(1360),
-    [sym_dictionary_splat] = STATE(1360),
-    [sym_global_statement] = STATE(1319),
-    [sym_nonlocal_statement] = STATE(1319),
-    [sym_exec_statement] = STATE(1319),
-    [sym_type_alias_statement] = STATE(1319),
+    [sym_list_splat] = STATE(1321),
+    [sym_dictionary_splat] = STATE(1321),
+    [sym_global_statement] = STATE(1213),
+    [sym_nonlocal_statement] = STATE(1213),
+    [sym_exec_statement] = STATE(1213),
+    [sym_type_alias_statement] = STATE(1213),
     [sym_class_definition] = STATE(63),
     [sym_decorated_definition] = STATE(63),
-    [sym_decorator] = STATE(996),
-    [sym_expression_list] = STATE(1361),
-    [sym_pattern] = STATE(889),
-    [sym_tuple_pattern] = STATE(875),
-    [sym_list_pattern] = STATE(875),
-    [sym_list_splat_pattern] = STATE(875),
-    [sym_expression] = STATE(1019),
-    [sym_primary_expression] = STATE(684),
-    [sym_not_operator] = STATE(1009),
-    [sym_boolean_operator] = STATE(1009),
-    [sym_binary_operator] = STATE(797),
-    [sym_unary_operator] = STATE(797),
-    [sym_comparison_operator] = STATE(1009),
-    [sym_lambda] = STATE(1009),
-    [sym_assignment] = STATE(1361),
-    [sym_augmented_assignment] = STATE(1361),
-    [sym_pattern_list] = STATE(897),
-    [sym_yield] = STATE(1361),
-    [sym_attribute] = STATE(431),
-    [sym_subscript] = STATE(431),
-    [sym_call] = STATE(797),
-    [sym_list] = STATE(797),
-    [sym_set] = STATE(797),
-    [sym_tuple] = STATE(797),
-    [sym_dictionary] = STATE(797),
-    [sym_list_comprehension] = STATE(797),
-    [sym_dictionary_comprehension] = STATE(797),
-    [sym_set_comprehension] = STATE(797),
-    [sym_generator_expression] = STATE(797),
-    [sym_parenthesized_expression] = STATE(797),
-    [sym_conditional_expression] = STATE(1009),
-    [sym_concatenated_string] = STATE(797),
-    [sym_string] = STATE(713),
-    [sym_await] = STATE(1009),
+    [sym_decorator] = STATE(947),
+    [sym_expression_list] = STATE(1313),
+    [sym_pattern] = STATE(871),
+    [sym_tuple_pattern] = STATE(860),
+    [sym_list_pattern] = STATE(860),
+    [sym_list_splat_pattern] = STATE(860),
+    [sym_expression] = STATE(995),
+    [sym_primary_expression] = STATE(707),
+    [sym_not_operator] = STATE(985),
+    [sym_boolean_operator] = STATE(985),
+    [sym_binary_operator] = STATE(759),
+    [sym_unary_operator] = STATE(759),
+    [sym_comparison_operator] = STATE(985),
+    [sym_lambda] = STATE(985),
+    [sym_assignment] = STATE(1313),
+    [sym_augmented_assignment] = STATE(1313),
+    [sym_pattern_list] = STATE(880),
+    [sym_yield] = STATE(1313),
+    [sym_attribute] = STATE(422),
+    [sym_subscript] = STATE(422),
+    [sym_call] = STATE(759),
+    [sym_list] = STATE(759),
+    [sym_set] = STATE(759),
+    [sym_tuple] = STATE(759),
+    [sym_dictionary] = STATE(759),
+    [sym_list_comprehension] = STATE(759),
+    [sym_dictionary_comprehension] = STATE(759),
+    [sym_set_comprehension] = STATE(759),
+    [sym_generator_expression] = STATE(759),
+    [sym_parenthesized_expression] = STATE(759),
+    [sym_conditional_expression] = STATE(985),
+    [sym_concatenated_string] = STATE(759),
+    [sym_string] = STATE(709),
+    [sym_await] = STATE(759),
     [aux_sym_module_repeat1] = STATE(63),
-    [aux_sym_decorated_definition_repeat1] = STATE(996),
+    [aux_sym_decorated_definition_repeat1] = STATE(947),
+    [sym_identifier] = ACTIONS(113),
+    [anon_sym_import] = ACTIONS(116),
+    [anon_sym_from] = ACTIONS(119),
+    [anon_sym_LPAREN] = ACTIONS(122),
+    [anon_sym_STAR] = ACTIONS(125),
+    [anon_sym_print] = ACTIONS(128),
+    [anon_sym_assert] = ACTIONS(131),
+    [anon_sym_return] = ACTIONS(134),
+    [anon_sym_del] = ACTIONS(137),
+    [anon_sym_raise] = ACTIONS(140),
+    [anon_sym_pass] = ACTIONS(143),
+    [anon_sym_break] = ACTIONS(146),
+    [anon_sym_continue] = ACTIONS(149),
+    [anon_sym_if] = ACTIONS(152),
+    [anon_sym_async] = ACTIONS(155),
+    [anon_sym_for] = ACTIONS(158),
+    [anon_sym_while] = ACTIONS(161),
+    [anon_sym_try] = ACTIONS(164),
+    [anon_sym_with] = ACTIONS(167),
+    [anon_sym_match] = ACTIONS(170),
+    [anon_sym_DASH] = ACTIONS(173),
+    [anon_sym_PLUS] = ACTIONS(173),
+    [anon_sym_LBRACK] = ACTIONS(176),
+    [anon_sym_LBRACE] = ACTIONS(179),
+    [anon_sym_STAR_STAR] = ACTIONS(182),
+    [anon_sym_def] = ACTIONS(185),
+    [anon_sym_global] = ACTIONS(188),
+    [anon_sym_nonlocal] = ACTIONS(191),
+    [anon_sym_exec] = ACTIONS(194),
+    [anon_sym_type] = ACTIONS(197),
+    [anon_sym_class] = ACTIONS(200),
+    [anon_sym_AT] = ACTIONS(203),
+    [anon_sym_not] = ACTIONS(206),
+    [anon_sym_TILDE] = ACTIONS(173),
+    [anon_sym_lambda] = ACTIONS(209),
+    [anon_sym_yield] = ACTIONS(212),
+    [sym_ellipsis] = ACTIONS(215),
+    [sym_integer] = ACTIONS(218),
+    [sym_float] = ACTIONS(215),
+    [anon_sym_await] = ACTIONS(221),
+    [sym_true] = ACTIONS(218),
+    [sym_false] = ACTIONS(218),
+    [sym_none] = ACTIONS(218),
+    [sym_comment] = ACTIONS(3),
+    [sym__dedent] = ACTIONS(224),
+    [sym__string_start] = ACTIONS(226),
+  },
+  [64] = {
+    [sym__statement] = STATE(63),
+    [sym__simple_statements] = STATE(63),
+    [sym_import_statement] = STATE(1213),
+    [sym_future_import_statement] = STATE(1213),
+    [sym_import_from_statement] = STATE(1213),
+    [sym_print_statement] = STATE(1213),
+    [sym_assert_statement] = STATE(1213),
+    [sym_expression_statement] = STATE(1213),
+    [sym_named_expression] = STATE(985),
+    [sym_return_statement] = STATE(1213),
+    [sym_delete_statement] = STATE(1213),
+    [sym_raise_statement] = STATE(1213),
+    [sym_pass_statement] = STATE(1213),
+    [sym_break_statement] = STATE(1213),
+    [sym_continue_statement] = STATE(1213),
+    [sym_if_statement] = STATE(63),
+    [sym_for_statement] = STATE(63),
+    [sym_while_statement] = STATE(63),
+    [sym_try_statement] = STATE(63),
+    [sym_with_statement] = STATE(63),
+    [sym_match_statement] = STATE(63),
+    [sym_function_definition] = STATE(63),
+    [sym_list_splat] = STATE(1321),
+    [sym_dictionary_splat] = STATE(1321),
+    [sym_global_statement] = STATE(1213),
+    [sym_nonlocal_statement] = STATE(1213),
+    [sym_exec_statement] = STATE(1213),
+    [sym_type_alias_statement] = STATE(1213),
+    [sym_class_definition] = STATE(63),
+    [sym_decorated_definition] = STATE(63),
+    [sym_decorator] = STATE(947),
+    [sym_expression_list] = STATE(1313),
+    [sym_pattern] = STATE(871),
+    [sym_tuple_pattern] = STATE(860),
+    [sym_list_pattern] = STATE(860),
+    [sym_list_splat_pattern] = STATE(860),
+    [sym_expression] = STATE(995),
+    [sym_primary_expression] = STATE(707),
+    [sym_not_operator] = STATE(985),
+    [sym_boolean_operator] = STATE(985),
+    [sym_binary_operator] = STATE(759),
+    [sym_unary_operator] = STATE(759),
+    [sym_comparison_operator] = STATE(985),
+    [sym_lambda] = STATE(985),
+    [sym_assignment] = STATE(1313),
+    [sym_augmented_assignment] = STATE(1313),
+    [sym_pattern_list] = STATE(880),
+    [sym_yield] = STATE(1313),
+    [sym_attribute] = STATE(422),
+    [sym_subscript] = STATE(422),
+    [sym_call] = STATE(759),
+    [sym_list] = STATE(759),
+    [sym_set] = STATE(759),
+    [sym_tuple] = STATE(759),
+    [sym_dictionary] = STATE(759),
+    [sym_list_comprehension] = STATE(759),
+    [sym_dictionary_comprehension] = STATE(759),
+    [sym_set_comprehension] = STATE(759),
+    [sym_generator_expression] = STATE(759),
+    [sym_parenthesized_expression] = STATE(759),
+    [sym_conditional_expression] = STATE(985),
+    [sym_concatenated_string] = STATE(759),
+    [sym_string] = STATE(709),
+    [sym_await] = STATE(759),
+    [aux_sym_module_repeat1] = STATE(63),
+    [aux_sym_decorated_definition_repeat1] = STATE(947),
     [sym_identifier] = ACTIONS(7),
     [anon_sym_import] = ACTIONS(9),
     [anon_sym_from] = ACTIONS(11),
@@ -17843,304 +15109,369 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_false] = ACTIONS(77),
     [sym_none] = ACTIONS(77),
     [sym_comment] = ACTIONS(3),
-    [sym__dedent] = ACTIONS(239),
+    [sym__dedent] = ACTIONS(229),
     [sym__string_start] = ACTIONS(81),
   },
+  [65] = {
+    [sym__statement] = STATE(65),
+    [sym__simple_statements] = STATE(65),
+    [sym_import_statement] = STATE(1304),
+    [sym_future_import_statement] = STATE(1304),
+    [sym_import_from_statement] = STATE(1304),
+    [sym_print_statement] = STATE(1304),
+    [sym_assert_statement] = STATE(1304),
+    [sym_expression_statement] = STATE(1304),
+    [sym_named_expression] = STATE(985),
+    [sym_return_statement] = STATE(1304),
+    [sym_delete_statement] = STATE(1304),
+    [sym_raise_statement] = STATE(1304),
+    [sym_pass_statement] = STATE(1304),
+    [sym_break_statement] = STATE(1304),
+    [sym_continue_statement] = STATE(1304),
+    [sym_if_statement] = STATE(65),
+    [sym_for_statement] = STATE(65),
+    [sym_while_statement] = STATE(65),
+    [sym_try_statement] = STATE(65),
+    [sym_with_statement] = STATE(65),
+    [sym_match_statement] = STATE(65),
+    [sym_function_definition] = STATE(65),
+    [sym_list_splat] = STATE(1321),
+    [sym_dictionary_splat] = STATE(1321),
+    [sym_global_statement] = STATE(1304),
+    [sym_nonlocal_statement] = STATE(1304),
+    [sym_exec_statement] = STATE(1304),
+    [sym_type_alias_statement] = STATE(1304),
+    [sym_class_definition] = STATE(65),
+    [sym_decorated_definition] = STATE(65),
+    [sym_decorator] = STATE(982),
+    [sym_expression_list] = STATE(1313),
+    [sym_pattern] = STATE(871),
+    [sym_tuple_pattern] = STATE(860),
+    [sym_list_pattern] = STATE(860),
+    [sym_list_splat_pattern] = STATE(860),
+    [sym_expression] = STATE(995),
+    [sym_primary_expression] = STATE(707),
+    [sym_not_operator] = STATE(985),
+    [sym_boolean_operator] = STATE(985),
+    [sym_binary_operator] = STATE(759),
+    [sym_unary_operator] = STATE(759),
+    [sym_comparison_operator] = STATE(985),
+    [sym_lambda] = STATE(985),
+    [sym_assignment] = STATE(1313),
+    [sym_augmented_assignment] = STATE(1313),
+    [sym_pattern_list] = STATE(880),
+    [sym_yield] = STATE(1313),
+    [sym_attribute] = STATE(422),
+    [sym_subscript] = STATE(422),
+    [sym_call] = STATE(759),
+    [sym_list] = STATE(759),
+    [sym_set] = STATE(759),
+    [sym_tuple] = STATE(759),
+    [sym_dictionary] = STATE(759),
+    [sym_list_comprehension] = STATE(759),
+    [sym_dictionary_comprehension] = STATE(759),
+    [sym_set_comprehension] = STATE(759),
+    [sym_generator_expression] = STATE(759),
+    [sym_parenthesized_expression] = STATE(759),
+    [sym_conditional_expression] = STATE(985),
+    [sym_concatenated_string] = STATE(759),
+    [sym_string] = STATE(709),
+    [sym_await] = STATE(759),
+    [aux_sym_module_repeat1] = STATE(65),
+    [aux_sym_decorated_definition_repeat1] = STATE(982),
+    [ts_builtin_sym_end] = ACTIONS(224),
+    [sym_identifier] = ACTIONS(113),
+    [anon_sym_import] = ACTIONS(116),
+    [anon_sym_from] = ACTIONS(119),
+    [anon_sym_LPAREN] = ACTIONS(122),
+    [anon_sym_STAR] = ACTIONS(125),
+    [anon_sym_print] = ACTIONS(128),
+    [anon_sym_assert] = ACTIONS(131),
+    [anon_sym_return] = ACTIONS(134),
+    [anon_sym_del] = ACTIONS(137),
+    [anon_sym_raise] = ACTIONS(140),
+    [anon_sym_pass] = ACTIONS(143),
+    [anon_sym_break] = ACTIONS(146),
+    [anon_sym_continue] = ACTIONS(149),
+    [anon_sym_if] = ACTIONS(231),
+    [anon_sym_async] = ACTIONS(234),
+    [anon_sym_for] = ACTIONS(237),
+    [anon_sym_while] = ACTIONS(240),
+    [anon_sym_try] = ACTIONS(243),
+    [anon_sym_with] = ACTIONS(246),
+    [anon_sym_match] = ACTIONS(249),
+    [anon_sym_DASH] = ACTIONS(173),
+    [anon_sym_PLUS] = ACTIONS(173),
+    [anon_sym_LBRACK] = ACTIONS(176),
+    [anon_sym_LBRACE] = ACTIONS(179),
+    [anon_sym_STAR_STAR] = ACTIONS(182),
+    [anon_sym_def] = ACTIONS(252),
+    [anon_sym_global] = ACTIONS(188),
+    [anon_sym_nonlocal] = ACTIONS(191),
+    [anon_sym_exec] = ACTIONS(194),
+    [anon_sym_type] = ACTIONS(197),
+    [anon_sym_class] = ACTIONS(255),
+    [anon_sym_AT] = ACTIONS(203),
+    [anon_sym_not] = ACTIONS(206),
+    [anon_sym_TILDE] = ACTIONS(173),
+    [anon_sym_lambda] = ACTIONS(209),
+    [anon_sym_yield] = ACTIONS(212),
+    [sym_ellipsis] = ACTIONS(215),
+    [sym_integer] = ACTIONS(218),
+    [sym_float] = ACTIONS(215),
+    [anon_sym_await] = ACTIONS(221),
+    [sym_true] = ACTIONS(218),
+    [sym_false] = ACTIONS(218),
+    [sym_none] = ACTIONS(218),
+    [sym_comment] = ACTIONS(3),
+    [sym__string_start] = ACTIONS(226),
+  },
   [66] = {
-    [sym__statement] = STATE(63),
-    [sym__simple_statements] = STATE(63),
-    [sym_import_statement] = STATE(1319),
-    [sym_future_import_statement] = STATE(1319),
-    [sym_import_from_statement] = STATE(1319),
-    [sym_print_statement] = STATE(1319),
-    [sym_assert_statement] = STATE(1319),
-    [sym_expression_statement] = STATE(1319),
-    [sym_named_expression] = STATE(1009),
-    [sym_return_statement] = STATE(1319),
-    [sym_delete_statement] = STATE(1319),
-    [sym_raise_statement] = STATE(1319),
-    [sym_pass_statement] = STATE(1319),
-    [sym_break_statement] = STATE(1319),
-    [sym_continue_statement] = STATE(1319),
-    [sym_if_statement] = STATE(63),
-    [sym_for_statement] = STATE(63),
-    [sym_while_statement] = STATE(63),
-    [sym_try_statement] = STATE(63),
-    [sym_with_statement] = STATE(63),
-    [sym_match_statement] = STATE(63),
-    [sym_function_definition] = STATE(63),
-    [sym_list_splat] = STATE(1360),
-    [sym_dictionary_splat] = STATE(1360),
-    [sym_global_statement] = STATE(1319),
-    [sym_nonlocal_statement] = STATE(1319),
-    [sym_exec_statement] = STATE(1319),
-    [sym_type_alias_statement] = STATE(1319),
-    [sym_class_definition] = STATE(63),
-    [sym_decorated_definition] = STATE(63),
-    [sym_decorator] = STATE(996),
-    [sym_expression_list] = STATE(1361),
-    [sym_pattern] = STATE(889),
-    [sym_tuple_pattern] = STATE(875),
-    [sym_list_pattern] = STATE(875),
-    [sym_list_splat_pattern] = STATE(875),
-    [sym_expression] = STATE(1019),
-    [sym_primary_expression] = STATE(684),
-    [sym_not_operator] = STATE(1009),
-    [sym_boolean_operator] = STATE(1009),
-    [sym_binary_operator] = STATE(797),
-    [sym_unary_operator] = STATE(797),
-    [sym_comparison_operator] = STATE(1009),
-    [sym_lambda] = STATE(1009),
-    [sym_assignment] = STATE(1361),
-    [sym_augmented_assignment] = STATE(1361),
-    [sym_pattern_list] = STATE(897),
-    [sym_yield] = STATE(1361),
-    [sym_attribute] = STATE(431),
-    [sym_subscript] = STATE(431),
-    [sym_call] = STATE(797),
-    [sym_list] = STATE(797),
-    [sym_set] = STATE(797),
-    [sym_tuple] = STATE(797),
-    [sym_dictionary] = STATE(797),
-    [sym_list_comprehension] = STATE(797),
-    [sym_dictionary_comprehension] = STATE(797),
-    [sym_set_comprehension] = STATE(797),
-    [sym_generator_expression] = STATE(797),
-    [sym_parenthesized_expression] = STATE(797),
-    [sym_conditional_expression] = STATE(1009),
-    [sym_concatenated_string] = STATE(797),
-    [sym_string] = STATE(713),
-    [sym_await] = STATE(1009),
-    [aux_sym_module_repeat1] = STATE(63),
-    [aux_sym_decorated_definition_repeat1] = STATE(996),
-    [sym_identifier] = ACTIONS(7),
-    [anon_sym_import] = ACTIONS(9),
-    [anon_sym_from] = ACTIONS(11),
-    [anon_sym_LPAREN] = ACTIONS(13),
-    [anon_sym_STAR] = ACTIONS(15),
-    [anon_sym_print] = ACTIONS(17),
-    [anon_sym_assert] = ACTIONS(19),
-    [anon_sym_return] = ACTIONS(21),
-    [anon_sym_del] = ACTIONS(23),
-    [anon_sym_raise] = ACTIONS(25),
-    [anon_sym_pass] = ACTIONS(27),
-    [anon_sym_break] = ACTIONS(29),
-    [anon_sym_continue] = ACTIONS(31),
-    [anon_sym_if] = ACTIONS(83),
-    [anon_sym_async] = ACTIONS(85),
-    [anon_sym_for] = ACTIONS(87),
-    [anon_sym_while] = ACTIONS(89),
-    [anon_sym_try] = ACTIONS(91),
-    [anon_sym_with] = ACTIONS(93),
-    [anon_sym_match] = ACTIONS(95),
-    [anon_sym_DASH] = ACTIONS(47),
-    [anon_sym_PLUS] = ACTIONS(47),
-    [anon_sym_LBRACK] = ACTIONS(49),
-    [anon_sym_LBRACE] = ACTIONS(51),
-    [anon_sym_STAR_STAR] = ACTIONS(53),
-    [anon_sym_def] = ACTIONS(97),
-    [anon_sym_global] = ACTIONS(57),
-    [anon_sym_nonlocal] = ACTIONS(59),
-    [anon_sym_exec] = ACTIONS(61),
-    [anon_sym_type] = ACTIONS(63),
-    [anon_sym_class] = ACTIONS(99),
-    [anon_sym_AT] = ACTIONS(67),
-    [anon_sym_not] = ACTIONS(69),
-    [anon_sym_TILDE] = ACTIONS(47),
-    [anon_sym_lambda] = ACTIONS(71),
-    [anon_sym_yield] = ACTIONS(73),
-    [sym_ellipsis] = ACTIONS(75),
-    [sym_integer] = ACTIONS(77),
-    [sym_float] = ACTIONS(75),
-    [anon_sym_await] = ACTIONS(79),
-    [sym_true] = ACTIONS(77),
-    [sym_false] = ACTIONS(77),
-    [sym_none] = ACTIONS(77),
+    [sym_named_expression] = STATE(883),
+    [sym_list_splat] = STATE(1367),
+    [sym_dictionary_splat] = STATE(1367),
+    [sym_expression_list] = STATE(1431),
+    [sym_expression] = STATE(1047),
+    [sym_primary_expression] = STATE(616),
+    [sym_not_operator] = STATE(883),
+    [sym_boolean_operator] = STATE(883),
+    [sym_binary_operator] = STATE(605),
+    [sym_unary_operator] = STATE(605),
+    [sym_comparison_operator] = STATE(883),
+    [sym_lambda] = STATE(883),
+    [sym_attribute] = STATE(605),
+    [sym_subscript] = STATE(605),
+    [sym_call] = STATE(605),
+    [sym_list] = STATE(605),
+    [sym_set] = STATE(605),
+    [sym_tuple] = STATE(605),
+    [sym_dictionary] = STATE(605),
+    [sym_list_comprehension] = STATE(605),
+    [sym_dictionary_comprehension] = STATE(605),
+    [sym_set_comprehension] = STATE(605),
+    [sym_generator_expression] = STATE(605),
+    [sym_parenthesized_expression] = STATE(605),
+    [sym_conditional_expression] = STATE(883),
+    [sym_concatenated_string] = STATE(605),
+    [sym_string] = STATE(586),
+    [sym_await] = STATE(605),
+    [sym_identifier] = ACTIONS(258),
+    [anon_sym_DOT] = ACTIONS(260),
+    [anon_sym_LPAREN] = ACTIONS(262),
+    [anon_sym_COMMA] = ACTIONS(264),
+    [anon_sym_STAR] = ACTIONS(267),
+    [anon_sym_print] = ACTIONS(269),
+    [anon_sym_GT_GT] = ACTIONS(260),
+    [anon_sym_COLON_EQ] = ACTIONS(271),
+    [anon_sym_if] = ACTIONS(260),
+    [anon_sym_COLON] = ACTIONS(273),
+    [anon_sym_async] = ACTIONS(269),
+    [anon_sym_in] = ACTIONS(260),
+    [anon_sym_match] = ACTIONS(269),
+    [anon_sym_PIPE] = ACTIONS(260),
+    [anon_sym_DASH] = ACTIONS(275),
+    [anon_sym_PLUS] = ACTIONS(275),
+    [anon_sym_LBRACK] = ACTIONS(277),
+    [anon_sym_LBRACE] = ACTIONS(279),
+    [anon_sym_STAR_STAR] = ACTIONS(281),
+    [anon_sym_EQ] = ACTIONS(273),
+    [anon_sym_exec] = ACTIONS(269),
+    [anon_sym_type] = ACTIONS(269),
+    [anon_sym_AT] = ACTIONS(260),
+    [anon_sym_not] = ACTIONS(283),
+    [anon_sym_and] = ACTIONS(260),
+    [anon_sym_or] = ACTIONS(260),
+    [anon_sym_SLASH] = ACTIONS(260),
+    [anon_sym_PERCENT] = ACTIONS(260),
+    [anon_sym_SLASH_SLASH] = ACTIONS(260),
+    [anon_sym_AMP] = ACTIONS(260),
+    [anon_sym_CARET] = ACTIONS(260),
+    [anon_sym_LT_LT] = ACTIONS(260),
+    [anon_sym_TILDE] = ACTIONS(285),
+    [anon_sym_LT] = ACTIONS(260),
+    [anon_sym_LT_EQ] = ACTIONS(287),
+    [anon_sym_EQ_EQ] = ACTIONS(287),
+    [anon_sym_BANG_EQ] = ACTIONS(287),
+    [anon_sym_GT_EQ] = ACTIONS(287),
+    [anon_sym_GT] = ACTIONS(260),
+    [anon_sym_LT_GT] = ACTIONS(287),
+    [anon_sym_is] = ACTIONS(260),
+    [anon_sym_lambda] = ACTIONS(289),
+    [anon_sym_PLUS_EQ] = ACTIONS(291),
+    [anon_sym_DASH_EQ] = ACTIONS(291),
+    [anon_sym_STAR_EQ] = ACTIONS(291),
+    [anon_sym_SLASH_EQ] = ACTIONS(291),
+    [anon_sym_AT_EQ] = ACTIONS(291),
+    [anon_sym_SLASH_SLASH_EQ] = ACTIONS(291),
+    [anon_sym_PERCENT_EQ] = ACTIONS(291),
+    [anon_sym_STAR_STAR_EQ] = ACTIONS(291),
+    [anon_sym_GT_GT_EQ] = ACTIONS(291),
+    [anon_sym_LT_LT_EQ] = ACTIONS(291),
+    [anon_sym_AMP_EQ] = ACTIONS(291),
+    [anon_sym_CARET_EQ] = ACTIONS(291),
+    [anon_sym_PIPE_EQ] = ACTIONS(291),
+    [sym_ellipsis] = ACTIONS(293),
+    [sym_integer] = ACTIONS(295),
+    [sym_float] = ACTIONS(293),
+    [anon_sym_await] = ACTIONS(297),
+    [sym_true] = ACTIONS(295),
+    [sym_false] = ACTIONS(295),
+    [sym_none] = ACTIONS(295),
     [sym_comment] = ACTIONS(3),
-    [sym__dedent] = ACTIONS(241),
-    [sym__string_start] = ACTIONS(81),
+    [sym__semicolon] = ACTIONS(287),
+    [sym__newline] = ACTIONS(287),
+    [sym__string_start] = ACTIONS(299),
   },
   [67] = {
-    [sym__statement] = STATE(67),
-    [sym__simple_statements] = STATE(67),
-    [sym_import_statement] = STATE(1209),
-    [sym_future_import_statement] = STATE(1209),
-    [sym_import_from_statement] = STATE(1209),
-    [sym_print_statement] = STATE(1209),
-    [sym_assert_statement] = STATE(1209),
-    [sym_expression_statement] = STATE(1209),
-    [sym_named_expression] = STATE(1009),
-    [sym_return_statement] = STATE(1209),
-    [sym_delete_statement] = STATE(1209),
-    [sym_raise_statement] = STATE(1209),
-    [sym_pass_statement] = STATE(1209),
-    [sym_break_statement] = STATE(1209),
-    [sym_continue_statement] = STATE(1209),
-    [sym_if_statement] = STATE(67),
-    [sym_for_statement] = STATE(67),
-    [sym_while_statement] = STATE(67),
-    [sym_try_statement] = STATE(67),
-    [sym_with_statement] = STATE(67),
-    [sym_match_statement] = STATE(67),
-    [sym_function_definition] = STATE(67),
-    [sym_list_splat] = STATE(1360),
-    [sym_dictionary_splat] = STATE(1360),
-    [sym_global_statement] = STATE(1209),
-    [sym_nonlocal_statement] = STATE(1209),
-    [sym_exec_statement] = STATE(1209),
-    [sym_type_alias_statement] = STATE(1209),
-    [sym_class_definition] = STATE(67),
-    [sym_decorated_definition] = STATE(67),
-    [sym_decorator] = STATE(1002),
-    [sym_expression_list] = STATE(1361),
-    [sym_pattern] = STATE(889),
-    [sym_tuple_pattern] = STATE(875),
-    [sym_list_pattern] = STATE(875),
-    [sym_list_splat_pattern] = STATE(875),
-    [sym_expression] = STATE(1019),
-    [sym_primary_expression] = STATE(684),
-    [sym_not_operator] = STATE(1009),
-    [sym_boolean_operator] = STATE(1009),
-    [sym_binary_operator] = STATE(797),
-    [sym_unary_operator] = STATE(797),
-    [sym_comparison_operator] = STATE(1009),
-    [sym_lambda] = STATE(1009),
-    [sym_assignment] = STATE(1361),
-    [sym_augmented_assignment] = STATE(1361),
-    [sym_pattern_list] = STATE(897),
-    [sym_yield] = STATE(1361),
-    [sym_attribute] = STATE(431),
-    [sym_subscript] = STATE(431),
-    [sym_call] = STATE(797),
-    [sym_list] = STATE(797),
-    [sym_set] = STATE(797),
-    [sym_tuple] = STATE(797),
-    [sym_dictionary] = STATE(797),
-    [sym_list_comprehension] = STATE(797),
-    [sym_dictionary_comprehension] = STATE(797),
-    [sym_set_comprehension] = STATE(797),
-    [sym_generator_expression] = STATE(797),
-    [sym_parenthesized_expression] = STATE(797),
-    [sym_conditional_expression] = STATE(1009),
-    [sym_concatenated_string] = STATE(797),
-    [sym_string] = STATE(713),
-    [sym_await] = STATE(1009),
-    [aux_sym_module_repeat1] = STATE(67),
-    [aux_sym_decorated_definition_repeat1] = STATE(1002),
-    [ts_builtin_sym_end] = ACTIONS(232),
-    [sym_identifier] = ACTIONS(121),
-    [anon_sym_import] = ACTIONS(124),
-    [anon_sym_from] = ACTIONS(127),
-    [anon_sym_LPAREN] = ACTIONS(130),
-    [anon_sym_STAR] = ACTIONS(133),
-    [anon_sym_print] = ACTIONS(136),
-    [anon_sym_assert] = ACTIONS(139),
-    [anon_sym_return] = ACTIONS(142),
-    [anon_sym_del] = ACTIONS(145),
-    [anon_sym_raise] = ACTIONS(148),
-    [anon_sym_pass] = ACTIONS(151),
-    [anon_sym_break] = ACTIONS(154),
-    [anon_sym_continue] = ACTIONS(157),
-    [anon_sym_if] = ACTIONS(243),
-    [anon_sym_async] = ACTIONS(246),
-    [anon_sym_for] = ACTIONS(249),
-    [anon_sym_while] = ACTIONS(252),
-    [anon_sym_try] = ACTIONS(255),
-    [anon_sym_with] = ACTIONS(258),
-    [anon_sym_match] = ACTIONS(261),
-    [anon_sym_DASH] = ACTIONS(181),
-    [anon_sym_PLUS] = ACTIONS(181),
-    [anon_sym_LBRACK] = ACTIONS(184),
-    [anon_sym_LBRACE] = ACTIONS(187),
-    [anon_sym_STAR_STAR] = ACTIONS(190),
-    [anon_sym_def] = ACTIONS(264),
-    [anon_sym_global] = ACTIONS(196),
-    [anon_sym_nonlocal] = ACTIONS(199),
-    [anon_sym_exec] = ACTIONS(202),
-    [anon_sym_type] = ACTIONS(205),
-    [anon_sym_class] = ACTIONS(267),
-    [anon_sym_AT] = ACTIONS(211),
-    [anon_sym_not] = ACTIONS(214),
-    [anon_sym_TILDE] = ACTIONS(181),
-    [anon_sym_lambda] = ACTIONS(217),
-    [anon_sym_yield] = ACTIONS(220),
-    [sym_ellipsis] = ACTIONS(223),
-    [sym_integer] = ACTIONS(226),
-    [sym_float] = ACTIONS(223),
-    [anon_sym_await] = ACTIONS(229),
-    [sym_true] = ACTIONS(226),
-    [sym_false] = ACTIONS(226),
-    [sym_none] = ACTIONS(226),
+    [sym_named_expression] = STATE(883),
+    [sym_list_splat] = STATE(1367),
+    [sym_dictionary_splat] = STATE(1367),
+    [sym_expression_list] = STATE(1401),
+    [sym_expression] = STATE(1038),
+    [sym_primary_expression] = STATE(616),
+    [sym_not_operator] = STATE(883),
+    [sym_boolean_operator] = STATE(883),
+    [sym_binary_operator] = STATE(605),
+    [sym_unary_operator] = STATE(605),
+    [sym_comparison_operator] = STATE(883),
+    [sym_lambda] = STATE(883),
+    [sym_attribute] = STATE(605),
+    [sym_subscript] = STATE(605),
+    [sym_call] = STATE(605),
+    [sym_list] = STATE(605),
+    [sym_set] = STATE(605),
+    [sym_tuple] = STATE(605),
+    [sym_dictionary] = STATE(605),
+    [sym_list_comprehension] = STATE(605),
+    [sym_dictionary_comprehension] = STATE(605),
+    [sym_set_comprehension] = STATE(605),
+    [sym_generator_expression] = STATE(605),
+    [sym_parenthesized_expression] = STATE(605),
+    [sym_conditional_expression] = STATE(883),
+    [sym_concatenated_string] = STATE(605),
+    [sym_string] = STATE(586),
+    [sym_await] = STATE(605),
+    [sym_identifier] = ACTIONS(258),
+    [anon_sym_DOT] = ACTIONS(260),
+    [anon_sym_LPAREN] = ACTIONS(262),
+    [anon_sym_COMMA] = ACTIONS(264),
+    [anon_sym_STAR] = ACTIONS(267),
+    [anon_sym_print] = ACTIONS(269),
+    [anon_sym_GT_GT] = ACTIONS(260),
+    [anon_sym_COLON_EQ] = ACTIONS(271),
+    [anon_sym_if] = ACTIONS(260),
+    [anon_sym_COLON] = ACTIONS(273),
+    [anon_sym_async] = ACTIONS(269),
+    [anon_sym_in] = ACTIONS(260),
+    [anon_sym_match] = ACTIONS(269),
+    [anon_sym_PIPE] = ACTIONS(260),
+    [anon_sym_DASH] = ACTIONS(275),
+    [anon_sym_PLUS] = ACTIONS(275),
+    [anon_sym_LBRACK] = ACTIONS(277),
+    [anon_sym_LBRACE] = ACTIONS(279),
+    [anon_sym_STAR_STAR] = ACTIONS(281),
+    [anon_sym_EQ] = ACTIONS(273),
+    [anon_sym_exec] = ACTIONS(269),
+    [anon_sym_type] = ACTIONS(269),
+    [anon_sym_AT] = ACTIONS(260),
+    [anon_sym_not] = ACTIONS(283),
+    [anon_sym_and] = ACTIONS(260),
+    [anon_sym_or] = ACTIONS(260),
+    [anon_sym_SLASH] = ACTIONS(260),
+    [anon_sym_PERCENT] = ACTIONS(260),
+    [anon_sym_SLASH_SLASH] = ACTIONS(260),
+    [anon_sym_AMP] = ACTIONS(260),
+    [anon_sym_CARET] = ACTIONS(260),
+    [anon_sym_LT_LT] = ACTIONS(260),
+    [anon_sym_TILDE] = ACTIONS(285),
+    [anon_sym_LT] = ACTIONS(260),
+    [anon_sym_LT_EQ] = ACTIONS(287),
+    [anon_sym_EQ_EQ] = ACTIONS(287),
+    [anon_sym_BANG_EQ] = ACTIONS(287),
+    [anon_sym_GT_EQ] = ACTIONS(287),
+    [anon_sym_GT] = ACTIONS(260),
+    [anon_sym_LT_GT] = ACTIONS(287),
+    [anon_sym_is] = ACTIONS(260),
+    [anon_sym_lambda] = ACTIONS(289),
+    [anon_sym_PLUS_EQ] = ACTIONS(291),
+    [anon_sym_DASH_EQ] = ACTIONS(291),
+    [anon_sym_STAR_EQ] = ACTIONS(291),
+    [anon_sym_SLASH_EQ] = ACTIONS(291),
+    [anon_sym_AT_EQ] = ACTIONS(291),
+    [anon_sym_SLASH_SLASH_EQ] = ACTIONS(291),
+    [anon_sym_PERCENT_EQ] = ACTIONS(291),
+    [anon_sym_STAR_STAR_EQ] = ACTIONS(291),
+    [anon_sym_GT_GT_EQ] = ACTIONS(291),
+    [anon_sym_LT_LT_EQ] = ACTIONS(291),
+    [anon_sym_AMP_EQ] = ACTIONS(291),
+    [anon_sym_CARET_EQ] = ACTIONS(291),
+    [anon_sym_PIPE_EQ] = ACTIONS(291),
+    [sym_ellipsis] = ACTIONS(293),
+    [sym_integer] = ACTIONS(295),
+    [sym_float] = ACTIONS(293),
+    [anon_sym_await] = ACTIONS(297),
+    [sym_true] = ACTIONS(295),
+    [sym_false] = ACTIONS(295),
+    [sym_none] = ACTIONS(295),
     [sym_comment] = ACTIONS(3),
-    [sym__string_start] = ACTIONS(234),
+    [sym__semicolon] = ACTIONS(287),
+    [sym__newline] = ACTIONS(287),
+    [sym__string_start] = ACTIONS(299),
   },
   [68] = {
-    [sym__statement] = STATE(63),
-    [sym__simple_statements] = STATE(63),
-    [sym_import_statement] = STATE(1319),
-    [sym_future_import_statement] = STATE(1319),
-    [sym_import_from_statement] = STATE(1319),
-    [sym_print_statement] = STATE(1319),
-    [sym_assert_statement] = STATE(1319),
-    [sym_expression_statement] = STATE(1319),
-    [sym_named_expression] = STATE(1009),
-    [sym_return_statement] = STATE(1319),
-    [sym_delete_statement] = STATE(1319),
-    [sym_raise_statement] = STATE(1319),
-    [sym_pass_statement] = STATE(1319),
-    [sym_break_statement] = STATE(1319),
-    [sym_continue_statement] = STATE(1319),
-    [sym_if_statement] = STATE(63),
-    [sym_for_statement] = STATE(63),
-    [sym_while_statement] = STATE(63),
-    [sym_try_statement] = STATE(63),
-    [sym_with_statement] = STATE(63),
-    [sym_match_statement] = STATE(63),
-    [sym_function_definition] = STATE(63),
-    [sym_list_splat] = STATE(1360),
-    [sym_dictionary_splat] = STATE(1360),
-    [sym_global_statement] = STATE(1319),
-    [sym_nonlocal_statement] = STATE(1319),
-    [sym_exec_statement] = STATE(1319),
-    [sym_type_alias_statement] = STATE(1319),
-    [sym_class_definition] = STATE(63),
-    [sym_decorated_definition] = STATE(63),
-    [sym_decorator] = STATE(996),
-    [sym_expression_list] = STATE(1361),
-    [sym_pattern] = STATE(889),
-    [sym_tuple_pattern] = STATE(875),
-    [sym_list_pattern] = STATE(875),
-    [sym_list_splat_pattern] = STATE(875),
-    [sym_expression] = STATE(1019),
-    [sym_primary_expression] = STATE(684),
-    [sym_not_operator] = STATE(1009),
-    [sym_boolean_operator] = STATE(1009),
-    [sym_binary_operator] = STATE(797),
-    [sym_unary_operator] = STATE(797),
-    [sym_comparison_operator] = STATE(1009),
-    [sym_lambda] = STATE(1009),
-    [sym_assignment] = STATE(1361),
-    [sym_augmented_assignment] = STATE(1361),
-    [sym_pattern_list] = STATE(897),
-    [sym_yield] = STATE(1361),
-    [sym_attribute] = STATE(431),
-    [sym_subscript] = STATE(431),
-    [sym_call] = STATE(797),
-    [sym_list] = STATE(797),
-    [sym_set] = STATE(797),
-    [sym_tuple] = STATE(797),
-    [sym_dictionary] = STATE(797),
-    [sym_list_comprehension] = STATE(797),
-    [sym_dictionary_comprehension] = STATE(797),
-    [sym_set_comprehension] = STATE(797),
-    [sym_generator_expression] = STATE(797),
-    [sym_parenthesized_expression] = STATE(797),
-    [sym_conditional_expression] = STATE(1009),
-    [sym_concatenated_string] = STATE(797),
-    [sym_string] = STATE(713),
-    [sym_await] = STATE(1009),
-    [aux_sym_module_repeat1] = STATE(63),
-    [aux_sym_decorated_definition_repeat1] = STATE(996),
+    [sym__simple_statements] = STATE(367),
+    [sym_import_statement] = STATE(1213),
+    [sym_future_import_statement] = STATE(1213),
+    [sym_import_from_statement] = STATE(1213),
+    [sym_print_statement] = STATE(1213),
+    [sym_assert_statement] = STATE(1213),
+    [sym_expression_statement] = STATE(1213),
+    [sym_named_expression] = STATE(985),
+    [sym_return_statement] = STATE(1213),
+    [sym_delete_statement] = STATE(1213),
+    [sym_raise_statement] = STATE(1213),
+    [sym_pass_statement] = STATE(1213),
+    [sym_break_statement] = STATE(1213),
+    [sym_continue_statement] = STATE(1213),
+    [sym_list_splat] = STATE(1321),
+    [sym_dictionary_splat] = STATE(1321),
+    [sym_global_statement] = STATE(1213),
+    [sym_nonlocal_statement] = STATE(1213),
+    [sym_exec_statement] = STATE(1213),
+    [sym_type_alias_statement] = STATE(1213),
+    [sym_expression_list] = STATE(1313),
+    [sym_pattern] = STATE(871),
+    [sym_tuple_pattern] = STATE(860),
+    [sym_list_pattern] = STATE(860),
+    [sym_list_splat_pattern] = STATE(860),
+    [sym_expression] = STATE(995),
+    [sym_primary_expression] = STATE(707),
+    [sym_not_operator] = STATE(985),
+    [sym_boolean_operator] = STATE(985),
+    [sym_binary_operator] = STATE(759),
+    [sym_unary_operator] = STATE(759),
+    [sym_comparison_operator] = STATE(985),
+    [sym_lambda] = STATE(985),
+    [sym_assignment] = STATE(1313),
+    [sym_augmented_assignment] = STATE(1313),
+    [sym_pattern_list] = STATE(880),
+    [sym_yield] = STATE(1313),
+    [sym_attribute] = STATE(422),
+    [sym_subscript] = STATE(422),
+    [sym_call] = STATE(759),
+    [sym_list] = STATE(759),
+    [sym_set] = STATE(759),
+    [sym_tuple] = STATE(759),
+    [sym_dictionary] = STATE(759),
+    [sym_list_comprehension] = STATE(759),
+    [sym_dictionary_comprehension] = STATE(759),
+    [sym_set_comprehension] = STATE(759),
+    [sym_generator_expression] = STATE(759),
+    [sym_parenthesized_expression] = STATE(759),
+    [sym_conditional_expression] = STATE(985),
+    [sym_concatenated_string] = STATE(759),
+    [sym_string] = STATE(709),
+    [sym_await] = STATE(759),
     [sym_identifier] = ACTIONS(7),
     [anon_sym_import] = ACTIONS(9),
     [anon_sym_from] = ACTIONS(11),
@@ -18154,25 +15485,17 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_pass] = ACTIONS(27),
     [anon_sym_break] = ACTIONS(29),
     [anon_sym_continue] = ACTIONS(31),
-    [anon_sym_if] = ACTIONS(83),
-    [anon_sym_async] = ACTIONS(85),
-    [anon_sym_for] = ACTIONS(87),
-    [anon_sym_while] = ACTIONS(89),
-    [anon_sym_try] = ACTIONS(91),
-    [anon_sym_with] = ACTIONS(93),
-    [anon_sym_match] = ACTIONS(95),
+    [anon_sym_async] = ACTIONS(301),
+    [anon_sym_match] = ACTIONS(301),
     [anon_sym_DASH] = ACTIONS(47),
     [anon_sym_PLUS] = ACTIONS(47),
     [anon_sym_LBRACK] = ACTIONS(49),
     [anon_sym_LBRACE] = ACTIONS(51),
     [anon_sym_STAR_STAR] = ACTIONS(53),
-    [anon_sym_def] = ACTIONS(97),
     [anon_sym_global] = ACTIONS(57),
     [anon_sym_nonlocal] = ACTIONS(59),
     [anon_sym_exec] = ACTIONS(61),
     [anon_sym_type] = ACTIONS(63),
-    [anon_sym_class] = ACTIONS(99),
-    [anon_sym_AT] = ACTIONS(67),
     [anon_sym_not] = ACTIONS(69),
     [anon_sym_TILDE] = ACTIONS(47),
     [anon_sym_lambda] = ACTIONS(71),
@@ -18185,76 +15508,64 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_false] = ACTIONS(77),
     [sym_none] = ACTIONS(77),
     [sym_comment] = ACTIONS(3),
-    [sym__dedent] = ACTIONS(270),
+    [sym__newline] = ACTIONS(303),
+    [sym__indent] = ACTIONS(305),
     [sym__string_start] = ACTIONS(81),
   },
   [69] = {
-    [sym__statement] = STATE(63),
-    [sym__simple_statements] = STATE(63),
-    [sym_import_statement] = STATE(1319),
-    [sym_future_import_statement] = STATE(1319),
-    [sym_import_from_statement] = STATE(1319),
-    [sym_print_statement] = STATE(1319),
-    [sym_assert_statement] = STATE(1319),
-    [sym_expression_statement] = STATE(1319),
-    [sym_named_expression] = STATE(1009),
-    [sym_return_statement] = STATE(1319),
-    [sym_delete_statement] = STATE(1319),
-    [sym_raise_statement] = STATE(1319),
-    [sym_pass_statement] = STATE(1319),
-    [sym_break_statement] = STATE(1319),
-    [sym_continue_statement] = STATE(1319),
-    [sym_if_statement] = STATE(63),
-    [sym_for_statement] = STATE(63),
-    [sym_while_statement] = STATE(63),
-    [sym_try_statement] = STATE(63),
-    [sym_with_statement] = STATE(63),
-    [sym_match_statement] = STATE(63),
-    [sym_function_definition] = STATE(63),
-    [sym_list_splat] = STATE(1360),
-    [sym_dictionary_splat] = STATE(1360),
-    [sym_global_statement] = STATE(1319),
-    [sym_nonlocal_statement] = STATE(1319),
-    [sym_exec_statement] = STATE(1319),
-    [sym_type_alias_statement] = STATE(1319),
-    [sym_class_definition] = STATE(63),
-    [sym_decorated_definition] = STATE(63),
-    [sym_decorator] = STATE(996),
-    [sym_expression_list] = STATE(1361),
-    [sym_pattern] = STATE(889),
-    [sym_tuple_pattern] = STATE(875),
-    [sym_list_pattern] = STATE(875),
-    [sym_list_splat_pattern] = STATE(875),
-    [sym_expression] = STATE(1019),
-    [sym_primary_expression] = STATE(684),
-    [sym_not_operator] = STATE(1009),
-    [sym_boolean_operator] = STATE(1009),
-    [sym_binary_operator] = STATE(797),
-    [sym_unary_operator] = STATE(797),
-    [sym_comparison_operator] = STATE(1009),
-    [sym_lambda] = STATE(1009),
-    [sym_assignment] = STATE(1361),
-    [sym_augmented_assignment] = STATE(1361),
-    [sym_pattern_list] = STATE(897),
-    [sym_yield] = STATE(1361),
-    [sym_attribute] = STATE(431),
-    [sym_subscript] = STATE(431),
-    [sym_call] = STATE(797),
-    [sym_list] = STATE(797),
-    [sym_set] = STATE(797),
-    [sym_tuple] = STATE(797),
-    [sym_dictionary] = STATE(797),
-    [sym_list_comprehension] = STATE(797),
-    [sym_dictionary_comprehension] = STATE(797),
-    [sym_set_comprehension] = STATE(797),
-    [sym_generator_expression] = STATE(797),
-    [sym_parenthesized_expression] = STATE(797),
-    [sym_conditional_expression] = STATE(1009),
-    [sym_concatenated_string] = STATE(797),
-    [sym_string] = STATE(713),
-    [sym_await] = STATE(1009),
-    [aux_sym_module_repeat1] = STATE(63),
-    [aux_sym_decorated_definition_repeat1] = STATE(996),
+    [sym__simple_statements] = STATE(1030),
+    [sym_import_statement] = STATE(1212),
+    [sym_future_import_statement] = STATE(1212),
+    [sym_import_from_statement] = STATE(1212),
+    [sym_print_statement] = STATE(1212),
+    [sym_assert_statement] = STATE(1212),
+    [sym_expression_statement] = STATE(1212),
+    [sym_named_expression] = STATE(985),
+    [sym_return_statement] = STATE(1212),
+    [sym_delete_statement] = STATE(1212),
+    [sym_raise_statement] = STATE(1212),
+    [sym_pass_statement] = STATE(1212),
+    [sym_break_statement] = STATE(1212),
+    [sym_continue_statement] = STATE(1212),
+    [sym_list_splat] = STATE(1321),
+    [sym_dictionary_splat] = STATE(1321),
+    [sym_global_statement] = STATE(1212),
+    [sym_nonlocal_statement] = STATE(1212),
+    [sym_exec_statement] = STATE(1212),
+    [sym_type_alias_statement] = STATE(1212),
+    [sym_expression_list] = STATE(1313),
+    [sym_pattern] = STATE(871),
+    [sym_tuple_pattern] = STATE(860),
+    [sym_list_pattern] = STATE(860),
+    [sym_list_splat_pattern] = STATE(860),
+    [sym_expression] = STATE(995),
+    [sym_primary_expression] = STATE(707),
+    [sym_not_operator] = STATE(985),
+    [sym_boolean_operator] = STATE(985),
+    [sym_binary_operator] = STATE(759),
+    [sym_unary_operator] = STATE(759),
+    [sym_comparison_operator] = STATE(985),
+    [sym_lambda] = STATE(985),
+    [sym_assignment] = STATE(1313),
+    [sym_augmented_assignment] = STATE(1313),
+    [sym_pattern_list] = STATE(880),
+    [sym_yield] = STATE(1313),
+    [sym_attribute] = STATE(422),
+    [sym_subscript] = STATE(422),
+    [sym_call] = STATE(759),
+    [sym_list] = STATE(759),
+    [sym_set] = STATE(759),
+    [sym_tuple] = STATE(759),
+    [sym_dictionary] = STATE(759),
+    [sym_list_comprehension] = STATE(759),
+    [sym_dictionary_comprehension] = STATE(759),
+    [sym_set_comprehension] = STATE(759),
+    [sym_generator_expression] = STATE(759),
+    [sym_parenthesized_expression] = STATE(759),
+    [sym_conditional_expression] = STATE(985),
+    [sym_concatenated_string] = STATE(759),
+    [sym_string] = STATE(709),
+    [sym_await] = STATE(759),
     [sym_identifier] = ACTIONS(7),
     [anon_sym_import] = ACTIONS(9),
     [anon_sym_from] = ACTIONS(11),
@@ -18268,25 +15579,17 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_pass] = ACTIONS(27),
     [anon_sym_break] = ACTIONS(29),
     [anon_sym_continue] = ACTIONS(31),
-    [anon_sym_if] = ACTIONS(83),
-    [anon_sym_async] = ACTIONS(85),
-    [anon_sym_for] = ACTIONS(87),
-    [anon_sym_while] = ACTIONS(89),
-    [anon_sym_try] = ACTIONS(91),
-    [anon_sym_with] = ACTIONS(93),
-    [anon_sym_match] = ACTIONS(95),
+    [anon_sym_async] = ACTIONS(301),
+    [anon_sym_match] = ACTIONS(301),
     [anon_sym_DASH] = ACTIONS(47),
     [anon_sym_PLUS] = ACTIONS(47),
     [anon_sym_LBRACK] = ACTIONS(49),
     [anon_sym_LBRACE] = ACTIONS(51),
     [anon_sym_STAR_STAR] = ACTIONS(53),
-    [anon_sym_def] = ACTIONS(97),
     [anon_sym_global] = ACTIONS(57),
     [anon_sym_nonlocal] = ACTIONS(59),
     [anon_sym_exec] = ACTIONS(61),
     [anon_sym_type] = ACTIONS(63),
-    [anon_sym_class] = ACTIONS(99),
-    [anon_sym_AT] = ACTIONS(67),
     [anon_sym_not] = ACTIONS(69),
     [anon_sym_TILDE] = ACTIONS(47),
     [anon_sym_lambda] = ACTIONS(71),
@@ -18299,255 +15602,64 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_false] = ACTIONS(77),
     [sym_none] = ACTIONS(77),
     [sym_comment] = ACTIONS(3),
-    [sym__dedent] = ACTIONS(272),
+    [sym__newline] = ACTIONS(307),
+    [sym__indent] = ACTIONS(309),
     [sym__string_start] = ACTIONS(81),
   },
   [70] = {
-    [sym_named_expression] = STATE(900),
-    [sym_list_splat] = STATE(1366),
-    [sym_dictionary_splat] = STATE(1366),
-    [sym_expression_list] = STATE(1452),
-    [sym_expression] = STATE(1079),
-    [sym_primary_expression] = STATE(630),
-    [sym_not_operator] = STATE(900),
-    [sym_boolean_operator] = STATE(900),
-    [sym_binary_operator] = STATE(642),
-    [sym_unary_operator] = STATE(642),
-    [sym_comparison_operator] = STATE(900),
-    [sym_lambda] = STATE(900),
-    [sym_attribute] = STATE(642),
-    [sym_subscript] = STATE(642),
-    [sym_call] = STATE(642),
-    [sym_list] = STATE(642),
-    [sym_set] = STATE(642),
-    [sym_tuple] = STATE(642),
-    [sym_dictionary] = STATE(642),
-    [sym_list_comprehension] = STATE(642),
-    [sym_dictionary_comprehension] = STATE(642),
-    [sym_set_comprehension] = STATE(642),
-    [sym_generator_expression] = STATE(642),
-    [sym_parenthesized_expression] = STATE(642),
-    [sym_conditional_expression] = STATE(900),
-    [sym_concatenated_string] = STATE(642),
-    [sym_string] = STATE(600),
-    [sym_await] = STATE(900),
-    [sym_identifier] = ACTIONS(274),
-    [anon_sym_DOT] = ACTIONS(276),
-    [anon_sym_LPAREN] = ACTIONS(278),
-    [anon_sym_COMMA] = ACTIONS(280),
-    [anon_sym_STAR] = ACTIONS(283),
-    [anon_sym_print] = ACTIONS(285),
-    [anon_sym_GT_GT] = ACTIONS(276),
-    [anon_sym_COLON_EQ] = ACTIONS(287),
-    [anon_sym_if] = ACTIONS(276),
-    [anon_sym_COLON] = ACTIONS(289),
-    [anon_sym_async] = ACTIONS(285),
-    [anon_sym_in] = ACTIONS(276),
-    [anon_sym_match] = ACTIONS(285),
-    [anon_sym_PIPE] = ACTIONS(276),
-    [anon_sym_DASH] = ACTIONS(291),
-    [anon_sym_PLUS] = ACTIONS(291),
-    [anon_sym_LBRACK] = ACTIONS(293),
-    [anon_sym_LBRACE] = ACTIONS(295),
-    [anon_sym_STAR_STAR] = ACTIONS(297),
-    [anon_sym_EQ] = ACTIONS(289),
-    [anon_sym_exec] = ACTIONS(285),
-    [anon_sym_type] = ACTIONS(285),
-    [anon_sym_AT] = ACTIONS(276),
-    [anon_sym_not] = ACTIONS(299),
-    [anon_sym_and] = ACTIONS(276),
-    [anon_sym_or] = ACTIONS(276),
-    [anon_sym_SLASH] = ACTIONS(276),
-    [anon_sym_PERCENT] = ACTIONS(276),
-    [anon_sym_SLASH_SLASH] = ACTIONS(276),
-    [anon_sym_AMP] = ACTIONS(276),
-    [anon_sym_CARET] = ACTIONS(276),
-    [anon_sym_LT_LT] = ACTIONS(276),
-    [anon_sym_TILDE] = ACTIONS(301),
-    [anon_sym_LT] = ACTIONS(276),
-    [anon_sym_LT_EQ] = ACTIONS(303),
-    [anon_sym_EQ_EQ] = ACTIONS(303),
-    [anon_sym_BANG_EQ] = ACTIONS(303),
-    [anon_sym_GT_EQ] = ACTIONS(303),
-    [anon_sym_GT] = ACTIONS(276),
-    [anon_sym_LT_GT] = ACTIONS(303),
-    [anon_sym_is] = ACTIONS(276),
-    [anon_sym_lambda] = ACTIONS(305),
-    [anon_sym_PLUS_EQ] = ACTIONS(307),
-    [anon_sym_DASH_EQ] = ACTIONS(307),
-    [anon_sym_STAR_EQ] = ACTIONS(307),
-    [anon_sym_SLASH_EQ] = ACTIONS(307),
-    [anon_sym_AT_EQ] = ACTIONS(307),
-    [anon_sym_SLASH_SLASH_EQ] = ACTIONS(307),
-    [anon_sym_PERCENT_EQ] = ACTIONS(307),
-    [anon_sym_STAR_STAR_EQ] = ACTIONS(307),
-    [anon_sym_GT_GT_EQ] = ACTIONS(307),
-    [anon_sym_LT_LT_EQ] = ACTIONS(307),
-    [anon_sym_AMP_EQ] = ACTIONS(307),
-    [anon_sym_CARET_EQ] = ACTIONS(307),
-    [anon_sym_PIPE_EQ] = ACTIONS(307),
-    [sym_ellipsis] = ACTIONS(309),
-    [sym_integer] = ACTIONS(311),
-    [sym_float] = ACTIONS(309),
-    [anon_sym_await] = ACTIONS(313),
-    [sym_true] = ACTIONS(311),
-    [sym_false] = ACTIONS(311),
-    [sym_none] = ACTIONS(311),
-    [sym_comment] = ACTIONS(3),
-    [sym__semicolon] = ACTIONS(303),
-    [sym__newline] = ACTIONS(303),
-    [sym__string_start] = ACTIONS(315),
-  },
-  [71] = {
-    [sym_named_expression] = STATE(900),
-    [sym_list_splat] = STATE(1366),
-    [sym_dictionary_splat] = STATE(1366),
-    [sym_expression_list] = STATE(1493),
-    [sym_expression] = STATE(1080),
-    [sym_primary_expression] = STATE(630),
-    [sym_not_operator] = STATE(900),
-    [sym_boolean_operator] = STATE(900),
-    [sym_binary_operator] = STATE(642),
-    [sym_unary_operator] = STATE(642),
-    [sym_comparison_operator] = STATE(900),
-    [sym_lambda] = STATE(900),
-    [sym_attribute] = STATE(642),
-    [sym_subscript] = STATE(642),
-    [sym_call] = STATE(642),
-    [sym_list] = STATE(642),
-    [sym_set] = STATE(642),
-    [sym_tuple] = STATE(642),
-    [sym_dictionary] = STATE(642),
-    [sym_list_comprehension] = STATE(642),
-    [sym_dictionary_comprehension] = STATE(642),
-    [sym_set_comprehension] = STATE(642),
-    [sym_generator_expression] = STATE(642),
-    [sym_parenthesized_expression] = STATE(642),
-    [sym_conditional_expression] = STATE(900),
-    [sym_concatenated_string] = STATE(642),
-    [sym_string] = STATE(600),
-    [sym_await] = STATE(900),
-    [sym_identifier] = ACTIONS(274),
-    [anon_sym_DOT] = ACTIONS(276),
-    [anon_sym_LPAREN] = ACTIONS(278),
-    [anon_sym_COMMA] = ACTIONS(280),
-    [anon_sym_STAR] = ACTIONS(283),
-    [anon_sym_print] = ACTIONS(285),
-    [anon_sym_GT_GT] = ACTIONS(276),
-    [anon_sym_COLON_EQ] = ACTIONS(287),
-    [anon_sym_if] = ACTIONS(276),
-    [anon_sym_COLON] = ACTIONS(289),
-    [anon_sym_async] = ACTIONS(285),
-    [anon_sym_in] = ACTIONS(276),
-    [anon_sym_match] = ACTIONS(285),
-    [anon_sym_PIPE] = ACTIONS(276),
-    [anon_sym_DASH] = ACTIONS(291),
-    [anon_sym_PLUS] = ACTIONS(291),
-    [anon_sym_LBRACK] = ACTIONS(293),
-    [anon_sym_LBRACE] = ACTIONS(295),
-    [anon_sym_STAR_STAR] = ACTIONS(297),
-    [anon_sym_EQ] = ACTIONS(289),
-    [anon_sym_exec] = ACTIONS(285),
-    [anon_sym_type] = ACTIONS(285),
-    [anon_sym_AT] = ACTIONS(276),
-    [anon_sym_not] = ACTIONS(299),
-    [anon_sym_and] = ACTIONS(276),
-    [anon_sym_or] = ACTIONS(276),
-    [anon_sym_SLASH] = ACTIONS(276),
-    [anon_sym_PERCENT] = ACTIONS(276),
-    [anon_sym_SLASH_SLASH] = ACTIONS(276),
-    [anon_sym_AMP] = ACTIONS(276),
-    [anon_sym_CARET] = ACTIONS(276),
-    [anon_sym_LT_LT] = ACTIONS(276),
-    [anon_sym_TILDE] = ACTIONS(301),
-    [anon_sym_LT] = ACTIONS(276),
-    [anon_sym_LT_EQ] = ACTIONS(303),
-    [anon_sym_EQ_EQ] = ACTIONS(303),
-    [anon_sym_BANG_EQ] = ACTIONS(303),
-    [anon_sym_GT_EQ] = ACTIONS(303),
-    [anon_sym_GT] = ACTIONS(276),
-    [anon_sym_LT_GT] = ACTIONS(303),
-    [anon_sym_is] = ACTIONS(276),
-    [anon_sym_lambda] = ACTIONS(305),
-    [anon_sym_PLUS_EQ] = ACTIONS(307),
-    [anon_sym_DASH_EQ] = ACTIONS(307),
-    [anon_sym_STAR_EQ] = ACTIONS(307),
-    [anon_sym_SLASH_EQ] = ACTIONS(307),
-    [anon_sym_AT_EQ] = ACTIONS(307),
-    [anon_sym_SLASH_SLASH_EQ] = ACTIONS(307),
-    [anon_sym_PERCENT_EQ] = ACTIONS(307),
-    [anon_sym_STAR_STAR_EQ] = ACTIONS(307),
-    [anon_sym_GT_GT_EQ] = ACTIONS(307),
-    [anon_sym_LT_LT_EQ] = ACTIONS(307),
-    [anon_sym_AMP_EQ] = ACTIONS(307),
-    [anon_sym_CARET_EQ] = ACTIONS(307),
-    [anon_sym_PIPE_EQ] = ACTIONS(307),
-    [sym_ellipsis] = ACTIONS(309),
-    [sym_integer] = ACTIONS(311),
-    [sym_float] = ACTIONS(309),
-    [anon_sym_await] = ACTIONS(313),
-    [sym_true] = ACTIONS(311),
-    [sym_false] = ACTIONS(311),
-    [sym_none] = ACTIONS(311),
-    [sym_comment] = ACTIONS(3),
-    [sym__semicolon] = ACTIONS(303),
-    [sym__newline] = ACTIONS(303),
-    [sym__string_start] = ACTIONS(315),
-  },
-  [72] = {
-    [sym__simple_statements] = STATE(550),
-    [sym_import_statement] = STATE(1209),
-    [sym_future_import_statement] = STATE(1209),
-    [sym_import_from_statement] = STATE(1209),
-    [sym_print_statement] = STATE(1209),
-    [sym_assert_statement] = STATE(1209),
-    [sym_expression_statement] = STATE(1209),
-    [sym_named_expression] = STATE(1009),
-    [sym_return_statement] = STATE(1209),
-    [sym_delete_statement] = STATE(1209),
-    [sym_raise_statement] = STATE(1209),
-    [sym_pass_statement] = STATE(1209),
-    [sym_break_statement] = STATE(1209),
-    [sym_continue_statement] = STATE(1209),
-    [sym_list_splat] = STATE(1360),
-    [sym_dictionary_splat] = STATE(1360),
-    [sym_global_statement] = STATE(1209),
-    [sym_nonlocal_statement] = STATE(1209),
-    [sym_exec_statement] = STATE(1209),
-    [sym_type_alias_statement] = STATE(1209),
-    [sym_expression_list] = STATE(1361),
-    [sym_pattern] = STATE(889),
-    [sym_tuple_pattern] = STATE(875),
-    [sym_list_pattern] = STATE(875),
-    [sym_list_splat_pattern] = STATE(875),
-    [sym_expression] = STATE(1019),
-    [sym_primary_expression] = STATE(684),
-    [sym_not_operator] = STATE(1009),
-    [sym_boolean_operator] = STATE(1009),
-    [sym_binary_operator] = STATE(797),
-    [sym_unary_operator] = STATE(797),
-    [sym_comparison_operator] = STATE(1009),
-    [sym_lambda] = STATE(1009),
-    [sym_assignment] = STATE(1361),
-    [sym_augmented_assignment] = STATE(1361),
-    [sym_pattern_list] = STATE(897),
-    [sym_yield] = STATE(1361),
-    [sym_attribute] = STATE(431),
-    [sym_subscript] = STATE(431),
-    [sym_call] = STATE(797),
-    [sym_list] = STATE(797),
-    [sym_set] = STATE(797),
-    [sym_tuple] = STATE(797),
-    [sym_dictionary] = STATE(797),
-    [sym_list_comprehension] = STATE(797),
-    [sym_dictionary_comprehension] = STATE(797),
-    [sym_set_comprehension] = STATE(797),
-    [sym_generator_expression] = STATE(797),
-    [sym_parenthesized_expression] = STATE(797),
-    [sym_conditional_expression] = STATE(1009),
-    [sym_concatenated_string] = STATE(797),
-    [sym_string] = STATE(713),
-    [sym_await] = STATE(1009),
+    [sym__simple_statements] = STATE(342),
+    [sym_import_statement] = STATE(1213),
+    [sym_future_import_statement] = STATE(1213),
+    [sym_import_from_statement] = STATE(1213),
+    [sym_print_statement] = STATE(1213),
+    [sym_assert_statement] = STATE(1213),
+    [sym_expression_statement] = STATE(1213),
+    [sym_named_expression] = STATE(985),
+    [sym_return_statement] = STATE(1213),
+    [sym_delete_statement] = STATE(1213),
+    [sym_raise_statement] = STATE(1213),
+    [sym_pass_statement] = STATE(1213),
+    [sym_break_statement] = STATE(1213),
+    [sym_continue_statement] = STATE(1213),
+    [sym_list_splat] = STATE(1321),
+    [sym_dictionary_splat] = STATE(1321),
+    [sym_global_statement] = STATE(1213),
+    [sym_nonlocal_statement] = STATE(1213),
+    [sym_exec_statement] = STATE(1213),
+    [sym_type_alias_statement] = STATE(1213),
+    [sym_expression_list] = STATE(1313),
+    [sym_pattern] = STATE(871),
+    [sym_tuple_pattern] = STATE(860),
+    [sym_list_pattern] = STATE(860),
+    [sym_list_splat_pattern] = STATE(860),
+    [sym_expression] = STATE(995),
+    [sym_primary_expression] = STATE(707),
+    [sym_not_operator] = STATE(985),
+    [sym_boolean_operator] = STATE(985),
+    [sym_binary_operator] = STATE(759),
+    [sym_unary_operator] = STATE(759),
+    [sym_comparison_operator] = STATE(985),
+    [sym_lambda] = STATE(985),
+    [sym_assignment] = STATE(1313),
+    [sym_augmented_assignment] = STATE(1313),
+    [sym_pattern_list] = STATE(880),
+    [sym_yield] = STATE(1313),
+    [sym_attribute] = STATE(422),
+    [sym_subscript] = STATE(422),
+    [sym_call] = STATE(759),
+    [sym_list] = STATE(759),
+    [sym_set] = STATE(759),
+    [sym_tuple] = STATE(759),
+    [sym_dictionary] = STATE(759),
+    [sym_list_comprehension] = STATE(759),
+    [sym_dictionary_comprehension] = STATE(759),
+    [sym_set_comprehension] = STATE(759),
+    [sym_generator_expression] = STATE(759),
+    [sym_parenthesized_expression] = STATE(759),
+    [sym_conditional_expression] = STATE(985),
+    [sym_concatenated_string] = STATE(759),
+    [sym_string] = STATE(709),
+    [sym_await] = STATE(759),
     [sym_identifier] = ACTIONS(7),
     [anon_sym_import] = ACTIONS(9),
     [anon_sym_from] = ACTIONS(11),
@@ -18561,8 +15673,196 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_pass] = ACTIONS(27),
     [anon_sym_break] = ACTIONS(29),
     [anon_sym_continue] = ACTIONS(31),
-    [anon_sym_async] = ACTIONS(317),
-    [anon_sym_match] = ACTIONS(317),
+    [anon_sym_async] = ACTIONS(301),
+    [anon_sym_match] = ACTIONS(301),
+    [anon_sym_DASH] = ACTIONS(47),
+    [anon_sym_PLUS] = ACTIONS(47),
+    [anon_sym_LBRACK] = ACTIONS(49),
+    [anon_sym_LBRACE] = ACTIONS(51),
+    [anon_sym_STAR_STAR] = ACTIONS(53),
+    [anon_sym_global] = ACTIONS(57),
+    [anon_sym_nonlocal] = ACTIONS(59),
+    [anon_sym_exec] = ACTIONS(61),
+    [anon_sym_type] = ACTIONS(63),
+    [anon_sym_not] = ACTIONS(69),
+    [anon_sym_TILDE] = ACTIONS(47),
+    [anon_sym_lambda] = ACTIONS(71),
+    [anon_sym_yield] = ACTIONS(73),
+    [sym_ellipsis] = ACTIONS(75),
+    [sym_integer] = ACTIONS(77),
+    [sym_float] = ACTIONS(75),
+    [anon_sym_await] = ACTIONS(79),
+    [sym_true] = ACTIONS(77),
+    [sym_false] = ACTIONS(77),
+    [sym_none] = ACTIONS(77),
+    [sym_comment] = ACTIONS(3),
+    [sym__newline] = ACTIONS(311),
+    [sym__indent] = ACTIONS(313),
+    [sym__string_start] = ACTIONS(81),
+  },
+  [71] = {
+    [sym__simple_statements] = STATE(466),
+    [sym_import_statement] = STATE(1304),
+    [sym_future_import_statement] = STATE(1304),
+    [sym_import_from_statement] = STATE(1304),
+    [sym_print_statement] = STATE(1304),
+    [sym_assert_statement] = STATE(1304),
+    [sym_expression_statement] = STATE(1304),
+    [sym_named_expression] = STATE(985),
+    [sym_return_statement] = STATE(1304),
+    [sym_delete_statement] = STATE(1304),
+    [sym_raise_statement] = STATE(1304),
+    [sym_pass_statement] = STATE(1304),
+    [sym_break_statement] = STATE(1304),
+    [sym_continue_statement] = STATE(1304),
+    [sym_list_splat] = STATE(1321),
+    [sym_dictionary_splat] = STATE(1321),
+    [sym_global_statement] = STATE(1304),
+    [sym_nonlocal_statement] = STATE(1304),
+    [sym_exec_statement] = STATE(1304),
+    [sym_type_alias_statement] = STATE(1304),
+    [sym_expression_list] = STATE(1313),
+    [sym_pattern] = STATE(871),
+    [sym_tuple_pattern] = STATE(860),
+    [sym_list_pattern] = STATE(860),
+    [sym_list_splat_pattern] = STATE(860),
+    [sym_expression] = STATE(995),
+    [sym_primary_expression] = STATE(707),
+    [sym_not_operator] = STATE(985),
+    [sym_boolean_operator] = STATE(985),
+    [sym_binary_operator] = STATE(759),
+    [sym_unary_operator] = STATE(759),
+    [sym_comparison_operator] = STATE(985),
+    [sym_lambda] = STATE(985),
+    [sym_assignment] = STATE(1313),
+    [sym_augmented_assignment] = STATE(1313),
+    [sym_pattern_list] = STATE(880),
+    [sym_yield] = STATE(1313),
+    [sym_attribute] = STATE(422),
+    [sym_subscript] = STATE(422),
+    [sym_call] = STATE(759),
+    [sym_list] = STATE(759),
+    [sym_set] = STATE(759),
+    [sym_tuple] = STATE(759),
+    [sym_dictionary] = STATE(759),
+    [sym_list_comprehension] = STATE(759),
+    [sym_dictionary_comprehension] = STATE(759),
+    [sym_set_comprehension] = STATE(759),
+    [sym_generator_expression] = STATE(759),
+    [sym_parenthesized_expression] = STATE(759),
+    [sym_conditional_expression] = STATE(985),
+    [sym_concatenated_string] = STATE(759),
+    [sym_string] = STATE(709),
+    [sym_await] = STATE(759),
+    [sym_identifier] = ACTIONS(7),
+    [anon_sym_import] = ACTIONS(9),
+    [anon_sym_from] = ACTIONS(11),
+    [anon_sym_LPAREN] = ACTIONS(13),
+    [anon_sym_STAR] = ACTIONS(15),
+    [anon_sym_print] = ACTIONS(17),
+    [anon_sym_assert] = ACTIONS(19),
+    [anon_sym_return] = ACTIONS(21),
+    [anon_sym_del] = ACTIONS(23),
+    [anon_sym_raise] = ACTIONS(25),
+    [anon_sym_pass] = ACTIONS(27),
+    [anon_sym_break] = ACTIONS(29),
+    [anon_sym_continue] = ACTIONS(31),
+    [anon_sym_async] = ACTIONS(301),
+    [anon_sym_match] = ACTIONS(301),
+    [anon_sym_DASH] = ACTIONS(47),
+    [anon_sym_PLUS] = ACTIONS(47),
+    [anon_sym_LBRACK] = ACTIONS(49),
+    [anon_sym_LBRACE] = ACTIONS(51),
+    [anon_sym_STAR_STAR] = ACTIONS(53),
+    [anon_sym_global] = ACTIONS(57),
+    [anon_sym_nonlocal] = ACTIONS(59),
+    [anon_sym_exec] = ACTIONS(61),
+    [anon_sym_type] = ACTIONS(63),
+    [anon_sym_not] = ACTIONS(69),
+    [anon_sym_TILDE] = ACTIONS(47),
+    [anon_sym_lambda] = ACTIONS(71),
+    [anon_sym_yield] = ACTIONS(73),
+    [sym_ellipsis] = ACTIONS(75),
+    [sym_integer] = ACTIONS(77),
+    [sym_float] = ACTIONS(75),
+    [anon_sym_await] = ACTIONS(79),
+    [sym_true] = ACTIONS(77),
+    [sym_false] = ACTIONS(77),
+    [sym_none] = ACTIONS(77),
+    [sym_comment] = ACTIONS(3),
+    [sym__newline] = ACTIONS(315),
+    [sym__indent] = ACTIONS(317),
+    [sym__string_start] = ACTIONS(81),
+  },
+  [72] = {
+    [sym__simple_statements] = STATE(272),
+    [sym_import_statement] = STATE(1213),
+    [sym_future_import_statement] = STATE(1213),
+    [sym_import_from_statement] = STATE(1213),
+    [sym_print_statement] = STATE(1213),
+    [sym_assert_statement] = STATE(1213),
+    [sym_expression_statement] = STATE(1213),
+    [sym_named_expression] = STATE(985),
+    [sym_return_statement] = STATE(1213),
+    [sym_delete_statement] = STATE(1213),
+    [sym_raise_statement] = STATE(1213),
+    [sym_pass_statement] = STATE(1213),
+    [sym_break_statement] = STATE(1213),
+    [sym_continue_statement] = STATE(1213),
+    [sym_list_splat] = STATE(1321),
+    [sym_dictionary_splat] = STATE(1321),
+    [sym_global_statement] = STATE(1213),
+    [sym_nonlocal_statement] = STATE(1213),
+    [sym_exec_statement] = STATE(1213),
+    [sym_type_alias_statement] = STATE(1213),
+    [sym_expression_list] = STATE(1313),
+    [sym_pattern] = STATE(871),
+    [sym_tuple_pattern] = STATE(860),
+    [sym_list_pattern] = STATE(860),
+    [sym_list_splat_pattern] = STATE(860),
+    [sym_expression] = STATE(995),
+    [sym_primary_expression] = STATE(707),
+    [sym_not_operator] = STATE(985),
+    [sym_boolean_operator] = STATE(985),
+    [sym_binary_operator] = STATE(759),
+    [sym_unary_operator] = STATE(759),
+    [sym_comparison_operator] = STATE(985),
+    [sym_lambda] = STATE(985),
+    [sym_assignment] = STATE(1313),
+    [sym_augmented_assignment] = STATE(1313),
+    [sym_pattern_list] = STATE(880),
+    [sym_yield] = STATE(1313),
+    [sym_attribute] = STATE(422),
+    [sym_subscript] = STATE(422),
+    [sym_call] = STATE(759),
+    [sym_list] = STATE(759),
+    [sym_set] = STATE(759),
+    [sym_tuple] = STATE(759),
+    [sym_dictionary] = STATE(759),
+    [sym_list_comprehension] = STATE(759),
+    [sym_dictionary_comprehension] = STATE(759),
+    [sym_set_comprehension] = STATE(759),
+    [sym_generator_expression] = STATE(759),
+    [sym_parenthesized_expression] = STATE(759),
+    [sym_conditional_expression] = STATE(985),
+    [sym_concatenated_string] = STATE(759),
+    [sym_string] = STATE(709),
+    [sym_await] = STATE(759),
+    [sym_identifier] = ACTIONS(7),
+    [anon_sym_import] = ACTIONS(9),
+    [anon_sym_from] = ACTIONS(11),
+    [anon_sym_LPAREN] = ACTIONS(13),
+    [anon_sym_STAR] = ACTIONS(15),
+    [anon_sym_print] = ACTIONS(17),
+    [anon_sym_assert] = ACTIONS(19),
+    [anon_sym_return] = ACTIONS(21),
+    [anon_sym_del] = ACTIONS(23),
+    [anon_sym_raise] = ACTIONS(25),
+    [anon_sym_pass] = ACTIONS(27),
+    [anon_sym_break] = ACTIONS(29),
+    [anon_sym_continue] = ACTIONS(31),
+    [anon_sym_async] = ACTIONS(301),
+    [anon_sym_match] = ACTIONS(301),
     [anon_sym_DASH] = ACTIONS(47),
     [anon_sym_PLUS] = ACTIONS(47),
     [anon_sym_LBRACK] = ACTIONS(49),
@@ -18589,59 +15889,59 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym__string_start] = ACTIONS(81),
   },
   [73] = {
-    [sym__simple_statements] = STATE(432),
-    [sym_import_statement] = STATE(1319),
-    [sym_future_import_statement] = STATE(1319),
-    [sym_import_from_statement] = STATE(1319),
-    [sym_print_statement] = STATE(1319),
-    [sym_assert_statement] = STATE(1319),
-    [sym_expression_statement] = STATE(1319),
-    [sym_named_expression] = STATE(1009),
-    [sym_return_statement] = STATE(1319),
-    [sym_delete_statement] = STATE(1319),
-    [sym_raise_statement] = STATE(1319),
-    [sym_pass_statement] = STATE(1319),
-    [sym_break_statement] = STATE(1319),
-    [sym_continue_statement] = STATE(1319),
-    [sym_list_splat] = STATE(1360),
-    [sym_dictionary_splat] = STATE(1360),
-    [sym_global_statement] = STATE(1319),
-    [sym_nonlocal_statement] = STATE(1319),
-    [sym_exec_statement] = STATE(1319),
-    [sym_type_alias_statement] = STATE(1319),
-    [sym_expression_list] = STATE(1361),
-    [sym_pattern] = STATE(889),
-    [sym_tuple_pattern] = STATE(875),
-    [sym_list_pattern] = STATE(875),
-    [sym_list_splat_pattern] = STATE(875),
-    [sym_expression] = STATE(1019),
-    [sym_primary_expression] = STATE(684),
-    [sym_not_operator] = STATE(1009),
-    [sym_boolean_operator] = STATE(1009),
-    [sym_binary_operator] = STATE(797),
-    [sym_unary_operator] = STATE(797),
-    [sym_comparison_operator] = STATE(1009),
-    [sym_lambda] = STATE(1009),
-    [sym_assignment] = STATE(1361),
-    [sym_augmented_assignment] = STATE(1361),
-    [sym_pattern_list] = STATE(897),
-    [sym_yield] = STATE(1361),
-    [sym_attribute] = STATE(431),
-    [sym_subscript] = STATE(431),
-    [sym_call] = STATE(797),
-    [sym_list] = STATE(797),
-    [sym_set] = STATE(797),
-    [sym_tuple] = STATE(797),
-    [sym_dictionary] = STATE(797),
-    [sym_list_comprehension] = STATE(797),
-    [sym_dictionary_comprehension] = STATE(797),
-    [sym_set_comprehension] = STATE(797),
-    [sym_generator_expression] = STATE(797),
-    [sym_parenthesized_expression] = STATE(797),
-    [sym_conditional_expression] = STATE(1009),
-    [sym_concatenated_string] = STATE(797),
-    [sym_string] = STATE(713),
-    [sym_await] = STATE(1009),
+    [sym__simple_statements] = STATE(411),
+    [sym_import_statement] = STATE(1213),
+    [sym_future_import_statement] = STATE(1213),
+    [sym_import_from_statement] = STATE(1213),
+    [sym_print_statement] = STATE(1213),
+    [sym_assert_statement] = STATE(1213),
+    [sym_expression_statement] = STATE(1213),
+    [sym_named_expression] = STATE(985),
+    [sym_return_statement] = STATE(1213),
+    [sym_delete_statement] = STATE(1213),
+    [sym_raise_statement] = STATE(1213),
+    [sym_pass_statement] = STATE(1213),
+    [sym_break_statement] = STATE(1213),
+    [sym_continue_statement] = STATE(1213),
+    [sym_list_splat] = STATE(1321),
+    [sym_dictionary_splat] = STATE(1321),
+    [sym_global_statement] = STATE(1213),
+    [sym_nonlocal_statement] = STATE(1213),
+    [sym_exec_statement] = STATE(1213),
+    [sym_type_alias_statement] = STATE(1213),
+    [sym_expression_list] = STATE(1313),
+    [sym_pattern] = STATE(871),
+    [sym_tuple_pattern] = STATE(860),
+    [sym_list_pattern] = STATE(860),
+    [sym_list_splat_pattern] = STATE(860),
+    [sym_expression] = STATE(995),
+    [sym_primary_expression] = STATE(707),
+    [sym_not_operator] = STATE(985),
+    [sym_boolean_operator] = STATE(985),
+    [sym_binary_operator] = STATE(759),
+    [sym_unary_operator] = STATE(759),
+    [sym_comparison_operator] = STATE(985),
+    [sym_lambda] = STATE(985),
+    [sym_assignment] = STATE(1313),
+    [sym_augmented_assignment] = STATE(1313),
+    [sym_pattern_list] = STATE(880),
+    [sym_yield] = STATE(1313),
+    [sym_attribute] = STATE(422),
+    [sym_subscript] = STATE(422),
+    [sym_call] = STATE(759),
+    [sym_list] = STATE(759),
+    [sym_set] = STATE(759),
+    [sym_tuple] = STATE(759),
+    [sym_dictionary] = STATE(759),
+    [sym_list_comprehension] = STATE(759),
+    [sym_dictionary_comprehension] = STATE(759),
+    [sym_set_comprehension] = STATE(759),
+    [sym_generator_expression] = STATE(759),
+    [sym_parenthesized_expression] = STATE(759),
+    [sym_conditional_expression] = STATE(985),
+    [sym_concatenated_string] = STATE(759),
+    [sym_string] = STATE(709),
+    [sym_await] = STATE(759),
     [sym_identifier] = ACTIONS(7),
     [anon_sym_import] = ACTIONS(9),
     [anon_sym_from] = ACTIONS(11),
@@ -18655,8 +15955,8 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_pass] = ACTIONS(27),
     [anon_sym_break] = ACTIONS(29),
     [anon_sym_continue] = ACTIONS(31),
-    [anon_sym_async] = ACTIONS(317),
-    [anon_sym_match] = ACTIONS(317),
+    [anon_sym_async] = ACTIONS(301),
+    [anon_sym_match] = ACTIONS(301),
     [anon_sym_DASH] = ACTIONS(47),
     [anon_sym_PLUS] = ACTIONS(47),
     [anon_sym_LBRACK] = ACTIONS(49),
@@ -18683,59 +15983,153 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym__string_start] = ACTIONS(81),
   },
   [74] = {
-    [sym__simple_statements] = STATE(327),
-    [sym_import_statement] = STATE(1248),
-    [sym_future_import_statement] = STATE(1248),
-    [sym_import_from_statement] = STATE(1248),
-    [sym_print_statement] = STATE(1248),
-    [sym_assert_statement] = STATE(1248),
-    [sym_expression_statement] = STATE(1248),
-    [sym_named_expression] = STATE(1009),
-    [sym_return_statement] = STATE(1248),
-    [sym_delete_statement] = STATE(1248),
-    [sym_raise_statement] = STATE(1248),
-    [sym_pass_statement] = STATE(1248),
-    [sym_break_statement] = STATE(1248),
-    [sym_continue_statement] = STATE(1248),
-    [sym_list_splat] = STATE(1360),
-    [sym_dictionary_splat] = STATE(1360),
-    [sym_global_statement] = STATE(1248),
-    [sym_nonlocal_statement] = STATE(1248),
-    [sym_exec_statement] = STATE(1248),
-    [sym_type_alias_statement] = STATE(1248),
-    [sym_expression_list] = STATE(1361),
-    [sym_pattern] = STATE(889),
-    [sym_tuple_pattern] = STATE(875),
-    [sym_list_pattern] = STATE(875),
-    [sym_list_splat_pattern] = STATE(875),
+    [sym_chevron] = STATE(1128),
+    [sym_named_expression] = STATE(985),
     [sym_expression] = STATE(1019),
-    [sym_primary_expression] = STATE(684),
-    [sym_not_operator] = STATE(1009),
-    [sym_boolean_operator] = STATE(1009),
-    [sym_binary_operator] = STATE(797),
-    [sym_unary_operator] = STATE(797),
-    [sym_comparison_operator] = STATE(1009),
-    [sym_lambda] = STATE(1009),
-    [sym_assignment] = STATE(1361),
-    [sym_augmented_assignment] = STATE(1361),
-    [sym_pattern_list] = STATE(897),
-    [sym_yield] = STATE(1361),
-    [sym_attribute] = STATE(431),
-    [sym_subscript] = STATE(431),
-    [sym_call] = STATE(797),
-    [sym_list] = STATE(797),
-    [sym_set] = STATE(797),
-    [sym_tuple] = STATE(797),
-    [sym_dictionary] = STATE(797),
-    [sym_list_comprehension] = STATE(797),
-    [sym_dictionary_comprehension] = STATE(797),
-    [sym_set_comprehension] = STATE(797),
-    [sym_generator_expression] = STATE(797),
-    [sym_parenthesized_expression] = STATE(797),
-    [sym_conditional_expression] = STATE(1009),
-    [sym_concatenated_string] = STATE(797),
-    [sym_string] = STATE(713),
-    [sym_await] = STATE(1009),
+    [sym_primary_expression] = STATE(707),
+    [sym_not_operator] = STATE(985),
+    [sym_boolean_operator] = STATE(985),
+    [sym_binary_operator] = STATE(759),
+    [sym_unary_operator] = STATE(759),
+    [sym_comparison_operator] = STATE(985),
+    [sym_lambda] = STATE(985),
+    [sym_attribute] = STATE(759),
+    [sym_subscript] = STATE(759),
+    [sym_call] = STATE(759),
+    [sym_list] = STATE(759),
+    [sym_set] = STATE(759),
+    [sym_tuple] = STATE(759),
+    [sym_dictionary] = STATE(759),
+    [sym_list_comprehension] = STATE(759),
+    [sym_dictionary_comprehension] = STATE(759),
+    [sym_set_comprehension] = STATE(759),
+    [sym_generator_expression] = STATE(759),
+    [sym_parenthesized_expression] = STATE(759),
+    [sym_conditional_expression] = STATE(985),
+    [sym_concatenated_string] = STATE(759),
+    [sym_string] = STATE(709),
+    [sym_await] = STATE(759),
+    [sym_identifier] = ACTIONS(327),
+    [anon_sym_DOT] = ACTIONS(260),
+    [anon_sym_LPAREN] = ACTIONS(287),
+    [anon_sym_COMMA] = ACTIONS(264),
+    [anon_sym_STAR] = ACTIONS(260),
+    [anon_sym_print] = ACTIONS(329),
+    [anon_sym_GT_GT] = ACTIONS(331),
+    [anon_sym_COLON_EQ] = ACTIONS(271),
+    [anon_sym_if] = ACTIONS(260),
+    [anon_sym_COLON] = ACTIONS(273),
+    [anon_sym_async] = ACTIONS(329),
+    [anon_sym_in] = ACTIONS(260),
+    [anon_sym_match] = ACTIONS(329),
+    [anon_sym_PIPE] = ACTIONS(260),
+    [anon_sym_DASH] = ACTIONS(260),
+    [anon_sym_PLUS] = ACTIONS(260),
+    [anon_sym_LBRACK] = ACTIONS(287),
+    [anon_sym_LBRACE] = ACTIONS(51),
+    [anon_sym_STAR_STAR] = ACTIONS(260),
+    [anon_sym_EQ] = ACTIONS(273),
+    [anon_sym_exec] = ACTIONS(329),
+    [anon_sym_type] = ACTIONS(329),
+    [anon_sym_AT] = ACTIONS(260),
+    [anon_sym_not] = ACTIONS(260),
+    [anon_sym_and] = ACTIONS(260),
+    [anon_sym_or] = ACTIONS(260),
+    [anon_sym_SLASH] = ACTIONS(260),
+    [anon_sym_PERCENT] = ACTIONS(260),
+    [anon_sym_SLASH_SLASH] = ACTIONS(260),
+    [anon_sym_AMP] = ACTIONS(260),
+    [anon_sym_CARET] = ACTIONS(260),
+    [anon_sym_LT_LT] = ACTIONS(260),
+    [anon_sym_TILDE] = ACTIONS(47),
+    [anon_sym_LT] = ACTIONS(260),
+    [anon_sym_LT_EQ] = ACTIONS(287),
+    [anon_sym_EQ_EQ] = ACTIONS(287),
+    [anon_sym_BANG_EQ] = ACTIONS(287),
+    [anon_sym_GT_EQ] = ACTIONS(287),
+    [anon_sym_GT] = ACTIONS(260),
+    [anon_sym_LT_GT] = ACTIONS(287),
+    [anon_sym_is] = ACTIONS(260),
+    [anon_sym_lambda] = ACTIONS(71),
+    [anon_sym_PLUS_EQ] = ACTIONS(291),
+    [anon_sym_DASH_EQ] = ACTIONS(291),
+    [anon_sym_STAR_EQ] = ACTIONS(291),
+    [anon_sym_SLASH_EQ] = ACTIONS(291),
+    [anon_sym_AT_EQ] = ACTIONS(291),
+    [anon_sym_SLASH_SLASH_EQ] = ACTIONS(291),
+    [anon_sym_PERCENT_EQ] = ACTIONS(291),
+    [anon_sym_STAR_STAR_EQ] = ACTIONS(291),
+    [anon_sym_GT_GT_EQ] = ACTIONS(291),
+    [anon_sym_LT_LT_EQ] = ACTIONS(291),
+    [anon_sym_AMP_EQ] = ACTIONS(291),
+    [anon_sym_CARET_EQ] = ACTIONS(291),
+    [anon_sym_PIPE_EQ] = ACTIONS(291),
+    [sym_ellipsis] = ACTIONS(75),
+    [sym_integer] = ACTIONS(77),
+    [sym_float] = ACTIONS(75),
+    [anon_sym_await] = ACTIONS(333),
+    [sym_true] = ACTIONS(77),
+    [sym_false] = ACTIONS(77),
+    [sym_none] = ACTIONS(77),
+    [sym_comment] = ACTIONS(3),
+    [sym__semicolon] = ACTIONS(287),
+    [sym__newline] = ACTIONS(287),
+    [sym__string_start] = ACTIONS(81),
+  },
+  [75] = {
+    [sym__simple_statements] = STATE(418),
+    [sym_import_statement] = STATE(1304),
+    [sym_future_import_statement] = STATE(1304),
+    [sym_import_from_statement] = STATE(1304),
+    [sym_print_statement] = STATE(1304),
+    [sym_assert_statement] = STATE(1304),
+    [sym_expression_statement] = STATE(1304),
+    [sym_named_expression] = STATE(985),
+    [sym_return_statement] = STATE(1304),
+    [sym_delete_statement] = STATE(1304),
+    [sym_raise_statement] = STATE(1304),
+    [sym_pass_statement] = STATE(1304),
+    [sym_break_statement] = STATE(1304),
+    [sym_continue_statement] = STATE(1304),
+    [sym_list_splat] = STATE(1321),
+    [sym_dictionary_splat] = STATE(1321),
+    [sym_global_statement] = STATE(1304),
+    [sym_nonlocal_statement] = STATE(1304),
+    [sym_exec_statement] = STATE(1304),
+    [sym_type_alias_statement] = STATE(1304),
+    [sym_expression_list] = STATE(1313),
+    [sym_pattern] = STATE(871),
+    [sym_tuple_pattern] = STATE(860),
+    [sym_list_pattern] = STATE(860),
+    [sym_list_splat_pattern] = STATE(860),
+    [sym_expression] = STATE(995),
+    [sym_primary_expression] = STATE(707),
+    [sym_not_operator] = STATE(985),
+    [sym_boolean_operator] = STATE(985),
+    [sym_binary_operator] = STATE(759),
+    [sym_unary_operator] = STATE(759),
+    [sym_comparison_operator] = STATE(985),
+    [sym_lambda] = STATE(985),
+    [sym_assignment] = STATE(1313),
+    [sym_augmented_assignment] = STATE(1313),
+    [sym_pattern_list] = STATE(880),
+    [sym_yield] = STATE(1313),
+    [sym_attribute] = STATE(422),
+    [sym_subscript] = STATE(422),
+    [sym_call] = STATE(759),
+    [sym_list] = STATE(759),
+    [sym_set] = STATE(759),
+    [sym_tuple] = STATE(759),
+    [sym_dictionary] = STATE(759),
+    [sym_list_comprehension] = STATE(759),
+    [sym_dictionary_comprehension] = STATE(759),
+    [sym_set_comprehension] = STATE(759),
+    [sym_generator_expression] = STATE(759),
+    [sym_parenthesized_expression] = STATE(759),
+    [sym_conditional_expression] = STATE(985),
+    [sym_concatenated_string] = STATE(759),
+    [sym_string] = STATE(709),
+    [sym_await] = STATE(759),
     [sym_identifier] = ACTIONS(7),
     [anon_sym_import] = ACTIONS(9),
     [anon_sym_from] = ACTIONS(11),
@@ -18749,8 +16143,8 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_pass] = ACTIONS(27),
     [anon_sym_break] = ACTIONS(29),
     [anon_sym_continue] = ACTIONS(31),
-    [anon_sym_async] = ACTIONS(317),
-    [anon_sym_match] = ACTIONS(317),
+    [anon_sym_async] = ACTIONS(301),
+    [anon_sym_match] = ACTIONS(301),
     [anon_sym_DASH] = ACTIONS(47),
     [anon_sym_PLUS] = ACTIONS(47),
     [anon_sym_LBRACK] = ACTIONS(49),
@@ -18772,158 +16166,64 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_false] = ACTIONS(77),
     [sym_none] = ACTIONS(77),
     [sym_comment] = ACTIONS(3),
-    [sym__newline] = ACTIONS(327),
-    [sym__indent] = ACTIONS(329),
-    [sym__string_start] = ACTIONS(81),
-  },
-  [75] = {
-    [sym_chevron] = STATE(1150),
-    [sym_named_expression] = STATE(1009),
-    [sym_expression] = STATE(1043),
-    [sym_primary_expression] = STATE(684),
-    [sym_not_operator] = STATE(1009),
-    [sym_boolean_operator] = STATE(1009),
-    [sym_binary_operator] = STATE(797),
-    [sym_unary_operator] = STATE(797),
-    [sym_comparison_operator] = STATE(1009),
-    [sym_lambda] = STATE(1009),
-    [sym_attribute] = STATE(797),
-    [sym_subscript] = STATE(797),
-    [sym_call] = STATE(797),
-    [sym_list] = STATE(797),
-    [sym_set] = STATE(797),
-    [sym_tuple] = STATE(797),
-    [sym_dictionary] = STATE(797),
-    [sym_list_comprehension] = STATE(797),
-    [sym_dictionary_comprehension] = STATE(797),
-    [sym_set_comprehension] = STATE(797),
-    [sym_generator_expression] = STATE(797),
-    [sym_parenthesized_expression] = STATE(797),
-    [sym_conditional_expression] = STATE(1009),
-    [sym_concatenated_string] = STATE(797),
-    [sym_string] = STATE(713),
-    [sym_await] = STATE(1009),
-    [sym_identifier] = ACTIONS(331),
-    [anon_sym_DOT] = ACTIONS(276),
-    [anon_sym_LPAREN] = ACTIONS(303),
-    [anon_sym_COMMA] = ACTIONS(280),
-    [anon_sym_STAR] = ACTIONS(276),
-    [anon_sym_print] = ACTIONS(333),
-    [anon_sym_GT_GT] = ACTIONS(335),
-    [anon_sym_COLON_EQ] = ACTIONS(287),
-    [anon_sym_if] = ACTIONS(276),
-    [anon_sym_COLON] = ACTIONS(289),
-    [anon_sym_async] = ACTIONS(333),
-    [anon_sym_in] = ACTIONS(276),
-    [anon_sym_match] = ACTIONS(333),
-    [anon_sym_PIPE] = ACTIONS(276),
-    [anon_sym_DASH] = ACTIONS(276),
-    [anon_sym_PLUS] = ACTIONS(276),
-    [anon_sym_LBRACK] = ACTIONS(303),
-    [anon_sym_LBRACE] = ACTIONS(51),
-    [anon_sym_STAR_STAR] = ACTIONS(276),
-    [anon_sym_EQ] = ACTIONS(289),
-    [anon_sym_exec] = ACTIONS(333),
-    [anon_sym_type] = ACTIONS(333),
-    [anon_sym_AT] = ACTIONS(276),
-    [anon_sym_not] = ACTIONS(276),
-    [anon_sym_and] = ACTIONS(276),
-    [anon_sym_or] = ACTIONS(276),
-    [anon_sym_SLASH] = ACTIONS(276),
-    [anon_sym_PERCENT] = ACTIONS(276),
-    [anon_sym_SLASH_SLASH] = ACTIONS(276),
-    [anon_sym_AMP] = ACTIONS(276),
-    [anon_sym_CARET] = ACTIONS(276),
-    [anon_sym_LT_LT] = ACTIONS(276),
-    [anon_sym_TILDE] = ACTIONS(47),
-    [anon_sym_LT] = ACTIONS(276),
-    [anon_sym_LT_EQ] = ACTIONS(303),
-    [anon_sym_EQ_EQ] = ACTIONS(303),
-    [anon_sym_BANG_EQ] = ACTIONS(303),
-    [anon_sym_GT_EQ] = ACTIONS(303),
-    [anon_sym_GT] = ACTIONS(276),
-    [anon_sym_LT_GT] = ACTIONS(303),
-    [anon_sym_is] = ACTIONS(276),
-    [anon_sym_lambda] = ACTIONS(71),
-    [anon_sym_PLUS_EQ] = ACTIONS(307),
-    [anon_sym_DASH_EQ] = ACTIONS(307),
-    [anon_sym_STAR_EQ] = ACTIONS(307),
-    [anon_sym_SLASH_EQ] = ACTIONS(307),
-    [anon_sym_AT_EQ] = ACTIONS(307),
-    [anon_sym_SLASH_SLASH_EQ] = ACTIONS(307),
-    [anon_sym_PERCENT_EQ] = ACTIONS(307),
-    [anon_sym_STAR_STAR_EQ] = ACTIONS(307),
-    [anon_sym_GT_GT_EQ] = ACTIONS(307),
-    [anon_sym_LT_LT_EQ] = ACTIONS(307),
-    [anon_sym_AMP_EQ] = ACTIONS(307),
-    [anon_sym_CARET_EQ] = ACTIONS(307),
-    [anon_sym_PIPE_EQ] = ACTIONS(307),
-    [sym_ellipsis] = ACTIONS(75),
-    [sym_integer] = ACTIONS(77),
-    [sym_float] = ACTIONS(75),
-    [anon_sym_await] = ACTIONS(337),
-    [sym_true] = ACTIONS(77),
-    [sym_false] = ACTIONS(77),
-    [sym_none] = ACTIONS(77),
-    [sym_comment] = ACTIONS(3),
-    [sym__semicolon] = ACTIONS(303),
-    [sym__newline] = ACTIONS(303),
+    [sym__newline] = ACTIONS(335),
+    [sym__indent] = ACTIONS(337),
     [sym__string_start] = ACTIONS(81),
   },
   [76] = {
-    [sym__simple_statements] = STATE(340),
-    [sym_import_statement] = STATE(1261),
-    [sym_future_import_statement] = STATE(1261),
-    [sym_import_from_statement] = STATE(1261),
-    [sym_print_statement] = STATE(1261),
-    [sym_assert_statement] = STATE(1261),
-    [sym_expression_statement] = STATE(1261),
-    [sym_named_expression] = STATE(1009),
-    [sym_return_statement] = STATE(1261),
-    [sym_delete_statement] = STATE(1261),
-    [sym_raise_statement] = STATE(1261),
-    [sym_pass_statement] = STATE(1261),
-    [sym_break_statement] = STATE(1261),
-    [sym_continue_statement] = STATE(1261),
-    [sym_list_splat] = STATE(1360),
-    [sym_dictionary_splat] = STATE(1360),
-    [sym_global_statement] = STATE(1261),
-    [sym_nonlocal_statement] = STATE(1261),
-    [sym_exec_statement] = STATE(1261),
-    [sym_type_alias_statement] = STATE(1261),
-    [sym_expression_list] = STATE(1361),
-    [sym_pattern] = STATE(889),
-    [sym_tuple_pattern] = STATE(875),
-    [sym_list_pattern] = STATE(875),
-    [sym_list_splat_pattern] = STATE(875),
-    [sym_expression] = STATE(1019),
-    [sym_primary_expression] = STATE(684),
-    [sym_not_operator] = STATE(1009),
-    [sym_boolean_operator] = STATE(1009),
-    [sym_binary_operator] = STATE(797),
-    [sym_unary_operator] = STATE(797),
-    [sym_comparison_operator] = STATE(1009),
-    [sym_lambda] = STATE(1009),
-    [sym_assignment] = STATE(1361),
-    [sym_augmented_assignment] = STATE(1361),
-    [sym_pattern_list] = STATE(897),
-    [sym_yield] = STATE(1361),
-    [sym_attribute] = STATE(431),
-    [sym_subscript] = STATE(431),
-    [sym_call] = STATE(797),
-    [sym_list] = STATE(797),
-    [sym_set] = STATE(797),
-    [sym_tuple] = STATE(797),
-    [sym_dictionary] = STATE(797),
-    [sym_list_comprehension] = STATE(797),
-    [sym_dictionary_comprehension] = STATE(797),
-    [sym_set_comprehension] = STATE(797),
-    [sym_generator_expression] = STATE(797),
-    [sym_parenthesized_expression] = STATE(797),
-    [sym_conditional_expression] = STATE(1009),
-    [sym_concatenated_string] = STATE(797),
-    [sym_string] = STATE(713),
-    [sym_await] = STATE(1009),
+    [sym__simple_statements] = STATE(485),
+    [sym_import_statement] = STATE(1213),
+    [sym_future_import_statement] = STATE(1213),
+    [sym_import_from_statement] = STATE(1213),
+    [sym_print_statement] = STATE(1213),
+    [sym_assert_statement] = STATE(1213),
+    [sym_expression_statement] = STATE(1213),
+    [sym_named_expression] = STATE(985),
+    [sym_return_statement] = STATE(1213),
+    [sym_delete_statement] = STATE(1213),
+    [sym_raise_statement] = STATE(1213),
+    [sym_pass_statement] = STATE(1213),
+    [sym_break_statement] = STATE(1213),
+    [sym_continue_statement] = STATE(1213),
+    [sym_list_splat] = STATE(1321),
+    [sym_dictionary_splat] = STATE(1321),
+    [sym_global_statement] = STATE(1213),
+    [sym_nonlocal_statement] = STATE(1213),
+    [sym_exec_statement] = STATE(1213),
+    [sym_type_alias_statement] = STATE(1213),
+    [sym_expression_list] = STATE(1313),
+    [sym_pattern] = STATE(871),
+    [sym_tuple_pattern] = STATE(860),
+    [sym_list_pattern] = STATE(860),
+    [sym_list_splat_pattern] = STATE(860),
+    [sym_expression] = STATE(995),
+    [sym_primary_expression] = STATE(707),
+    [sym_not_operator] = STATE(985),
+    [sym_boolean_operator] = STATE(985),
+    [sym_binary_operator] = STATE(759),
+    [sym_unary_operator] = STATE(759),
+    [sym_comparison_operator] = STATE(985),
+    [sym_lambda] = STATE(985),
+    [sym_assignment] = STATE(1313),
+    [sym_augmented_assignment] = STATE(1313),
+    [sym_pattern_list] = STATE(880),
+    [sym_yield] = STATE(1313),
+    [sym_attribute] = STATE(422),
+    [sym_subscript] = STATE(422),
+    [sym_call] = STATE(759),
+    [sym_list] = STATE(759),
+    [sym_set] = STATE(759),
+    [sym_tuple] = STATE(759),
+    [sym_dictionary] = STATE(759),
+    [sym_list_comprehension] = STATE(759),
+    [sym_dictionary_comprehension] = STATE(759),
+    [sym_set_comprehension] = STATE(759),
+    [sym_generator_expression] = STATE(759),
+    [sym_parenthesized_expression] = STATE(759),
+    [sym_conditional_expression] = STATE(985),
+    [sym_concatenated_string] = STATE(759),
+    [sym_string] = STATE(709),
+    [sym_await] = STATE(759),
     [sym_identifier] = ACTIONS(7),
     [anon_sym_import] = ACTIONS(9),
     [anon_sym_from] = ACTIONS(11),
@@ -18937,8 +16237,8 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_pass] = ACTIONS(27),
     [anon_sym_break] = ACTIONS(29),
     [anon_sym_continue] = ACTIONS(31),
-    [anon_sym_async] = ACTIONS(317),
-    [anon_sym_match] = ACTIONS(317),
+    [anon_sym_async] = ACTIONS(301),
+    [anon_sym_match] = ACTIONS(301),
     [anon_sym_DASH] = ACTIONS(47),
     [anon_sym_PLUS] = ACTIONS(47),
     [anon_sym_LBRACK] = ACTIONS(49),
@@ -18965,59 +16265,59 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym__string_start] = ACTIONS(81),
   },
   [77] = {
-    [sym__simple_statements] = STATE(530),
-    [sym_import_statement] = STATE(1319),
-    [sym_future_import_statement] = STATE(1319),
-    [sym_import_from_statement] = STATE(1319),
-    [sym_print_statement] = STATE(1319),
-    [sym_assert_statement] = STATE(1319),
-    [sym_expression_statement] = STATE(1319),
-    [sym_named_expression] = STATE(1009),
-    [sym_return_statement] = STATE(1319),
-    [sym_delete_statement] = STATE(1319),
-    [sym_raise_statement] = STATE(1319),
-    [sym_pass_statement] = STATE(1319),
-    [sym_break_statement] = STATE(1319),
-    [sym_continue_statement] = STATE(1319),
-    [sym_list_splat] = STATE(1360),
-    [sym_dictionary_splat] = STATE(1360),
-    [sym_global_statement] = STATE(1319),
-    [sym_nonlocal_statement] = STATE(1319),
-    [sym_exec_statement] = STATE(1319),
-    [sym_type_alias_statement] = STATE(1319),
-    [sym_expression_list] = STATE(1361),
-    [sym_pattern] = STATE(889),
-    [sym_tuple_pattern] = STATE(875),
-    [sym_list_pattern] = STATE(875),
-    [sym_list_splat_pattern] = STATE(875),
-    [sym_expression] = STATE(1019),
-    [sym_primary_expression] = STATE(684),
-    [sym_not_operator] = STATE(1009),
-    [sym_boolean_operator] = STATE(1009),
-    [sym_binary_operator] = STATE(797),
-    [sym_unary_operator] = STATE(797),
-    [sym_comparison_operator] = STATE(1009),
-    [sym_lambda] = STATE(1009),
-    [sym_assignment] = STATE(1361),
-    [sym_augmented_assignment] = STATE(1361),
-    [sym_pattern_list] = STATE(897),
-    [sym_yield] = STATE(1361),
-    [sym_attribute] = STATE(431),
-    [sym_subscript] = STATE(431),
-    [sym_call] = STATE(797),
-    [sym_list] = STATE(797),
-    [sym_set] = STATE(797),
-    [sym_tuple] = STATE(797),
-    [sym_dictionary] = STATE(797),
-    [sym_list_comprehension] = STATE(797),
-    [sym_dictionary_comprehension] = STATE(797),
-    [sym_set_comprehension] = STATE(797),
-    [sym_generator_expression] = STATE(797),
-    [sym_parenthesized_expression] = STATE(797),
-    [sym_conditional_expression] = STATE(1009),
-    [sym_concatenated_string] = STATE(797),
-    [sym_string] = STATE(713),
-    [sym_await] = STATE(1009),
+    [sym__simple_statements] = STATE(348),
+    [sym_import_statement] = STATE(1304),
+    [sym_future_import_statement] = STATE(1304),
+    [sym_import_from_statement] = STATE(1304),
+    [sym_print_statement] = STATE(1304),
+    [sym_assert_statement] = STATE(1304),
+    [sym_expression_statement] = STATE(1304),
+    [sym_named_expression] = STATE(985),
+    [sym_return_statement] = STATE(1304),
+    [sym_delete_statement] = STATE(1304),
+    [sym_raise_statement] = STATE(1304),
+    [sym_pass_statement] = STATE(1304),
+    [sym_break_statement] = STATE(1304),
+    [sym_continue_statement] = STATE(1304),
+    [sym_list_splat] = STATE(1321),
+    [sym_dictionary_splat] = STATE(1321),
+    [sym_global_statement] = STATE(1304),
+    [sym_nonlocal_statement] = STATE(1304),
+    [sym_exec_statement] = STATE(1304),
+    [sym_type_alias_statement] = STATE(1304),
+    [sym_expression_list] = STATE(1313),
+    [sym_pattern] = STATE(871),
+    [sym_tuple_pattern] = STATE(860),
+    [sym_list_pattern] = STATE(860),
+    [sym_list_splat_pattern] = STATE(860),
+    [sym_expression] = STATE(995),
+    [sym_primary_expression] = STATE(707),
+    [sym_not_operator] = STATE(985),
+    [sym_boolean_operator] = STATE(985),
+    [sym_binary_operator] = STATE(759),
+    [sym_unary_operator] = STATE(759),
+    [sym_comparison_operator] = STATE(985),
+    [sym_lambda] = STATE(985),
+    [sym_assignment] = STATE(1313),
+    [sym_augmented_assignment] = STATE(1313),
+    [sym_pattern_list] = STATE(880),
+    [sym_yield] = STATE(1313),
+    [sym_attribute] = STATE(422),
+    [sym_subscript] = STATE(422),
+    [sym_call] = STATE(759),
+    [sym_list] = STATE(759),
+    [sym_set] = STATE(759),
+    [sym_tuple] = STATE(759),
+    [sym_dictionary] = STATE(759),
+    [sym_list_comprehension] = STATE(759),
+    [sym_dictionary_comprehension] = STATE(759),
+    [sym_set_comprehension] = STATE(759),
+    [sym_generator_expression] = STATE(759),
+    [sym_parenthesized_expression] = STATE(759),
+    [sym_conditional_expression] = STATE(985),
+    [sym_concatenated_string] = STATE(759),
+    [sym_string] = STATE(709),
+    [sym_await] = STATE(759),
     [sym_identifier] = ACTIONS(7),
     [anon_sym_import] = ACTIONS(9),
     [anon_sym_from] = ACTIONS(11),
@@ -19031,8 +16331,8 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_pass] = ACTIONS(27),
     [anon_sym_break] = ACTIONS(29),
     [anon_sym_continue] = ACTIONS(31),
-    [anon_sym_async] = ACTIONS(317),
-    [anon_sym_match] = ACTIONS(317),
+    [anon_sym_async] = ACTIONS(301),
+    [anon_sym_match] = ACTIONS(301),
     [anon_sym_DASH] = ACTIONS(47),
     [anon_sym_PLUS] = ACTIONS(47),
     [anon_sym_LBRACK] = ACTIONS(49),
@@ -19059,59 +16359,59 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym__string_start] = ACTIONS(81),
   },
   [78] = {
-    [sym__simple_statements] = STATE(521),
-    [sym_import_statement] = STATE(1209),
-    [sym_future_import_statement] = STATE(1209),
-    [sym_import_from_statement] = STATE(1209),
-    [sym_print_statement] = STATE(1209),
-    [sym_assert_statement] = STATE(1209),
-    [sym_expression_statement] = STATE(1209),
-    [sym_named_expression] = STATE(1009),
-    [sym_return_statement] = STATE(1209),
-    [sym_delete_statement] = STATE(1209),
-    [sym_raise_statement] = STATE(1209),
-    [sym_pass_statement] = STATE(1209),
-    [sym_break_statement] = STATE(1209),
-    [sym_continue_statement] = STATE(1209),
-    [sym_list_splat] = STATE(1360),
-    [sym_dictionary_splat] = STATE(1360),
-    [sym_global_statement] = STATE(1209),
-    [sym_nonlocal_statement] = STATE(1209),
-    [sym_exec_statement] = STATE(1209),
-    [sym_type_alias_statement] = STATE(1209),
-    [sym_expression_list] = STATE(1361),
-    [sym_pattern] = STATE(889),
-    [sym_tuple_pattern] = STATE(875),
-    [sym_list_pattern] = STATE(875),
-    [sym_list_splat_pattern] = STATE(875),
-    [sym_expression] = STATE(1019),
-    [sym_primary_expression] = STATE(684),
-    [sym_not_operator] = STATE(1009),
-    [sym_boolean_operator] = STATE(1009),
-    [sym_binary_operator] = STATE(797),
-    [sym_unary_operator] = STATE(797),
-    [sym_comparison_operator] = STATE(1009),
-    [sym_lambda] = STATE(1009),
-    [sym_assignment] = STATE(1361),
-    [sym_augmented_assignment] = STATE(1361),
-    [sym_pattern_list] = STATE(897),
-    [sym_yield] = STATE(1361),
-    [sym_attribute] = STATE(431),
-    [sym_subscript] = STATE(431),
-    [sym_call] = STATE(797),
-    [sym_list] = STATE(797),
-    [sym_set] = STATE(797),
-    [sym_tuple] = STATE(797),
-    [sym_dictionary] = STATE(797),
-    [sym_list_comprehension] = STATE(797),
-    [sym_dictionary_comprehension] = STATE(797),
-    [sym_set_comprehension] = STATE(797),
-    [sym_generator_expression] = STATE(797),
-    [sym_parenthesized_expression] = STATE(797),
-    [sym_conditional_expression] = STATE(1009),
-    [sym_concatenated_string] = STATE(797),
-    [sym_string] = STATE(713),
-    [sym_await] = STATE(1009),
+    [sym__simple_statements] = STATE(497),
+    [sym_import_statement] = STATE(1213),
+    [sym_future_import_statement] = STATE(1213),
+    [sym_import_from_statement] = STATE(1213),
+    [sym_print_statement] = STATE(1213),
+    [sym_assert_statement] = STATE(1213),
+    [sym_expression_statement] = STATE(1213),
+    [sym_named_expression] = STATE(985),
+    [sym_return_statement] = STATE(1213),
+    [sym_delete_statement] = STATE(1213),
+    [sym_raise_statement] = STATE(1213),
+    [sym_pass_statement] = STATE(1213),
+    [sym_break_statement] = STATE(1213),
+    [sym_continue_statement] = STATE(1213),
+    [sym_list_splat] = STATE(1321),
+    [sym_dictionary_splat] = STATE(1321),
+    [sym_global_statement] = STATE(1213),
+    [sym_nonlocal_statement] = STATE(1213),
+    [sym_exec_statement] = STATE(1213),
+    [sym_type_alias_statement] = STATE(1213),
+    [sym_expression_list] = STATE(1313),
+    [sym_pattern] = STATE(871),
+    [sym_tuple_pattern] = STATE(860),
+    [sym_list_pattern] = STATE(860),
+    [sym_list_splat_pattern] = STATE(860),
+    [sym_expression] = STATE(995),
+    [sym_primary_expression] = STATE(707),
+    [sym_not_operator] = STATE(985),
+    [sym_boolean_operator] = STATE(985),
+    [sym_binary_operator] = STATE(759),
+    [sym_unary_operator] = STATE(759),
+    [sym_comparison_operator] = STATE(985),
+    [sym_lambda] = STATE(985),
+    [sym_assignment] = STATE(1313),
+    [sym_augmented_assignment] = STATE(1313),
+    [sym_pattern_list] = STATE(880),
+    [sym_yield] = STATE(1313),
+    [sym_attribute] = STATE(422),
+    [sym_subscript] = STATE(422),
+    [sym_call] = STATE(759),
+    [sym_list] = STATE(759),
+    [sym_set] = STATE(759),
+    [sym_tuple] = STATE(759),
+    [sym_dictionary] = STATE(759),
+    [sym_list_comprehension] = STATE(759),
+    [sym_dictionary_comprehension] = STATE(759),
+    [sym_set_comprehension] = STATE(759),
+    [sym_generator_expression] = STATE(759),
+    [sym_parenthesized_expression] = STATE(759),
+    [sym_conditional_expression] = STATE(985),
+    [sym_concatenated_string] = STATE(759),
+    [sym_string] = STATE(709),
+    [sym_await] = STATE(759),
     [sym_identifier] = ACTIONS(7),
     [anon_sym_import] = ACTIONS(9),
     [anon_sym_from] = ACTIONS(11),
@@ -19125,8 +16425,8 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_pass] = ACTIONS(27),
     [anon_sym_break] = ACTIONS(29),
     [anon_sym_continue] = ACTIONS(31),
-    [anon_sym_async] = ACTIONS(317),
-    [anon_sym_match] = ACTIONS(317),
+    [anon_sym_async] = ACTIONS(301),
+    [anon_sym_match] = ACTIONS(301),
     [anon_sym_DASH] = ACTIONS(47),
     [anon_sym_PLUS] = ACTIONS(47),
     [anon_sym_LBRACK] = ACTIONS(49),
@@ -19153,59 +16453,59 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym__string_start] = ACTIONS(81),
   },
   [79] = {
-    [sym__simple_statements] = STATE(548),
-    [sym_import_statement] = STATE(1319),
-    [sym_future_import_statement] = STATE(1319),
-    [sym_import_from_statement] = STATE(1319),
-    [sym_print_statement] = STATE(1319),
-    [sym_assert_statement] = STATE(1319),
-    [sym_expression_statement] = STATE(1319),
-    [sym_named_expression] = STATE(1009),
-    [sym_return_statement] = STATE(1319),
-    [sym_delete_statement] = STATE(1319),
-    [sym_raise_statement] = STATE(1319),
-    [sym_pass_statement] = STATE(1319),
-    [sym_break_statement] = STATE(1319),
-    [sym_continue_statement] = STATE(1319),
-    [sym_list_splat] = STATE(1360),
-    [sym_dictionary_splat] = STATE(1360),
-    [sym_global_statement] = STATE(1319),
-    [sym_nonlocal_statement] = STATE(1319),
-    [sym_exec_statement] = STATE(1319),
-    [sym_type_alias_statement] = STATE(1319),
-    [sym_expression_list] = STATE(1361),
-    [sym_pattern] = STATE(889),
-    [sym_tuple_pattern] = STATE(875),
-    [sym_list_pattern] = STATE(875),
-    [sym_list_splat_pattern] = STATE(875),
-    [sym_expression] = STATE(1019),
-    [sym_primary_expression] = STATE(684),
-    [sym_not_operator] = STATE(1009),
-    [sym_boolean_operator] = STATE(1009),
-    [sym_binary_operator] = STATE(797),
-    [sym_unary_operator] = STATE(797),
-    [sym_comparison_operator] = STATE(1009),
-    [sym_lambda] = STATE(1009),
-    [sym_assignment] = STATE(1361),
-    [sym_augmented_assignment] = STATE(1361),
-    [sym_pattern_list] = STATE(897),
-    [sym_yield] = STATE(1361),
-    [sym_attribute] = STATE(431),
-    [sym_subscript] = STATE(431),
-    [sym_call] = STATE(797),
-    [sym_list] = STATE(797),
-    [sym_set] = STATE(797),
-    [sym_tuple] = STATE(797),
-    [sym_dictionary] = STATE(797),
-    [sym_list_comprehension] = STATE(797),
-    [sym_dictionary_comprehension] = STATE(797),
-    [sym_set_comprehension] = STATE(797),
-    [sym_generator_expression] = STATE(797),
-    [sym_parenthesized_expression] = STATE(797),
-    [sym_conditional_expression] = STATE(1009),
-    [sym_concatenated_string] = STATE(797),
-    [sym_string] = STATE(713),
-    [sym_await] = STATE(1009),
+    [sym__simple_statements] = STATE(488),
+    [sym_import_statement] = STATE(1304),
+    [sym_future_import_statement] = STATE(1304),
+    [sym_import_from_statement] = STATE(1304),
+    [sym_print_statement] = STATE(1304),
+    [sym_assert_statement] = STATE(1304),
+    [sym_expression_statement] = STATE(1304),
+    [sym_named_expression] = STATE(985),
+    [sym_return_statement] = STATE(1304),
+    [sym_delete_statement] = STATE(1304),
+    [sym_raise_statement] = STATE(1304),
+    [sym_pass_statement] = STATE(1304),
+    [sym_break_statement] = STATE(1304),
+    [sym_continue_statement] = STATE(1304),
+    [sym_list_splat] = STATE(1321),
+    [sym_dictionary_splat] = STATE(1321),
+    [sym_global_statement] = STATE(1304),
+    [sym_nonlocal_statement] = STATE(1304),
+    [sym_exec_statement] = STATE(1304),
+    [sym_type_alias_statement] = STATE(1304),
+    [sym_expression_list] = STATE(1313),
+    [sym_pattern] = STATE(871),
+    [sym_tuple_pattern] = STATE(860),
+    [sym_list_pattern] = STATE(860),
+    [sym_list_splat_pattern] = STATE(860),
+    [sym_expression] = STATE(995),
+    [sym_primary_expression] = STATE(707),
+    [sym_not_operator] = STATE(985),
+    [sym_boolean_operator] = STATE(985),
+    [sym_binary_operator] = STATE(759),
+    [sym_unary_operator] = STATE(759),
+    [sym_comparison_operator] = STATE(985),
+    [sym_lambda] = STATE(985),
+    [sym_assignment] = STATE(1313),
+    [sym_augmented_assignment] = STATE(1313),
+    [sym_pattern_list] = STATE(880),
+    [sym_yield] = STATE(1313),
+    [sym_attribute] = STATE(422),
+    [sym_subscript] = STATE(422),
+    [sym_call] = STATE(759),
+    [sym_list] = STATE(759),
+    [sym_set] = STATE(759),
+    [sym_tuple] = STATE(759),
+    [sym_dictionary] = STATE(759),
+    [sym_list_comprehension] = STATE(759),
+    [sym_dictionary_comprehension] = STATE(759),
+    [sym_set_comprehension] = STATE(759),
+    [sym_generator_expression] = STATE(759),
+    [sym_parenthesized_expression] = STATE(759),
+    [sym_conditional_expression] = STATE(985),
+    [sym_concatenated_string] = STATE(759),
+    [sym_string] = STATE(709),
+    [sym_await] = STATE(759),
     [sym_identifier] = ACTIONS(7),
     [anon_sym_import] = ACTIONS(9),
     [anon_sym_from] = ACTIONS(11),
@@ -19219,8 +16519,8 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_pass] = ACTIONS(27),
     [anon_sym_break] = ACTIONS(29),
     [anon_sym_continue] = ACTIONS(31),
-    [anon_sym_async] = ACTIONS(317),
-    [anon_sym_match] = ACTIONS(317),
+    [anon_sym_async] = ACTIONS(301),
+    [anon_sym_match] = ACTIONS(301),
     [anon_sym_DASH] = ACTIONS(47),
     [anon_sym_PLUS] = ACTIONS(47),
     [anon_sym_LBRACK] = ACTIONS(49),
@@ -19247,59 +16547,59 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym__string_start] = ACTIONS(81),
   },
   [80] = {
-    [sym__simple_statements] = STATE(325),
-    [sym_import_statement] = STATE(1261),
-    [sym_future_import_statement] = STATE(1261),
-    [sym_import_from_statement] = STATE(1261),
-    [sym_print_statement] = STATE(1261),
-    [sym_assert_statement] = STATE(1261),
-    [sym_expression_statement] = STATE(1261),
-    [sym_named_expression] = STATE(1009),
-    [sym_return_statement] = STATE(1261),
-    [sym_delete_statement] = STATE(1261),
-    [sym_raise_statement] = STATE(1261),
-    [sym_pass_statement] = STATE(1261),
-    [sym_break_statement] = STATE(1261),
-    [sym_continue_statement] = STATE(1261),
-    [sym_list_splat] = STATE(1360),
-    [sym_dictionary_splat] = STATE(1360),
-    [sym_global_statement] = STATE(1261),
-    [sym_nonlocal_statement] = STATE(1261),
-    [sym_exec_statement] = STATE(1261),
-    [sym_type_alias_statement] = STATE(1261),
-    [sym_expression_list] = STATE(1361),
-    [sym_pattern] = STATE(889),
-    [sym_tuple_pattern] = STATE(875),
-    [sym_list_pattern] = STATE(875),
-    [sym_list_splat_pattern] = STATE(875),
-    [sym_expression] = STATE(1019),
-    [sym_primary_expression] = STATE(684),
-    [sym_not_operator] = STATE(1009),
-    [sym_boolean_operator] = STATE(1009),
-    [sym_binary_operator] = STATE(797),
-    [sym_unary_operator] = STATE(797),
-    [sym_comparison_operator] = STATE(1009),
-    [sym_lambda] = STATE(1009),
-    [sym_assignment] = STATE(1361),
-    [sym_augmented_assignment] = STATE(1361),
-    [sym_pattern_list] = STATE(897),
-    [sym_yield] = STATE(1361),
-    [sym_attribute] = STATE(431),
-    [sym_subscript] = STATE(431),
-    [sym_call] = STATE(797),
-    [sym_list] = STATE(797),
-    [sym_set] = STATE(797),
-    [sym_tuple] = STATE(797),
-    [sym_dictionary] = STATE(797),
-    [sym_list_comprehension] = STATE(797),
-    [sym_dictionary_comprehension] = STATE(797),
-    [sym_set_comprehension] = STATE(797),
-    [sym_generator_expression] = STATE(797),
-    [sym_parenthesized_expression] = STATE(797),
-    [sym_conditional_expression] = STATE(1009),
-    [sym_concatenated_string] = STATE(797),
-    [sym_string] = STATE(713),
-    [sym_await] = STATE(1009),
+    [sym__simple_statements] = STATE(561),
+    [sym_import_statement] = STATE(1304),
+    [sym_future_import_statement] = STATE(1304),
+    [sym_import_from_statement] = STATE(1304),
+    [sym_print_statement] = STATE(1304),
+    [sym_assert_statement] = STATE(1304),
+    [sym_expression_statement] = STATE(1304),
+    [sym_named_expression] = STATE(985),
+    [sym_return_statement] = STATE(1304),
+    [sym_delete_statement] = STATE(1304),
+    [sym_raise_statement] = STATE(1304),
+    [sym_pass_statement] = STATE(1304),
+    [sym_break_statement] = STATE(1304),
+    [sym_continue_statement] = STATE(1304),
+    [sym_list_splat] = STATE(1321),
+    [sym_dictionary_splat] = STATE(1321),
+    [sym_global_statement] = STATE(1304),
+    [sym_nonlocal_statement] = STATE(1304),
+    [sym_exec_statement] = STATE(1304),
+    [sym_type_alias_statement] = STATE(1304),
+    [sym_expression_list] = STATE(1313),
+    [sym_pattern] = STATE(871),
+    [sym_tuple_pattern] = STATE(860),
+    [sym_list_pattern] = STATE(860),
+    [sym_list_splat_pattern] = STATE(860),
+    [sym_expression] = STATE(995),
+    [sym_primary_expression] = STATE(707),
+    [sym_not_operator] = STATE(985),
+    [sym_boolean_operator] = STATE(985),
+    [sym_binary_operator] = STATE(759),
+    [sym_unary_operator] = STATE(759),
+    [sym_comparison_operator] = STATE(985),
+    [sym_lambda] = STATE(985),
+    [sym_assignment] = STATE(1313),
+    [sym_augmented_assignment] = STATE(1313),
+    [sym_pattern_list] = STATE(880),
+    [sym_yield] = STATE(1313),
+    [sym_attribute] = STATE(422),
+    [sym_subscript] = STATE(422),
+    [sym_call] = STATE(759),
+    [sym_list] = STATE(759),
+    [sym_set] = STATE(759),
+    [sym_tuple] = STATE(759),
+    [sym_dictionary] = STATE(759),
+    [sym_list_comprehension] = STATE(759),
+    [sym_dictionary_comprehension] = STATE(759),
+    [sym_set_comprehension] = STATE(759),
+    [sym_generator_expression] = STATE(759),
+    [sym_parenthesized_expression] = STATE(759),
+    [sym_conditional_expression] = STATE(985),
+    [sym_concatenated_string] = STATE(759),
+    [sym_string] = STATE(709),
+    [sym_await] = STATE(759),
     [sym_identifier] = ACTIONS(7),
     [anon_sym_import] = ACTIONS(9),
     [anon_sym_from] = ACTIONS(11),
@@ -19313,8 +16613,8 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_pass] = ACTIONS(27),
     [anon_sym_break] = ACTIONS(29),
     [anon_sym_continue] = ACTIONS(31),
-    [anon_sym_async] = ACTIONS(317),
-    [anon_sym_match] = ACTIONS(317),
+    [anon_sym_async] = ACTIONS(301),
+    [anon_sym_match] = ACTIONS(301),
     [anon_sym_DASH] = ACTIONS(47),
     [anon_sym_PLUS] = ACTIONS(47),
     [anon_sym_LBRACK] = ACTIONS(49),
@@ -19341,59 +16641,59 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym__string_start] = ACTIONS(81),
   },
   [81] = {
-    [sym__simple_statements] = STATE(535),
-    [sym_import_statement] = STATE(1209),
-    [sym_future_import_statement] = STATE(1209),
-    [sym_import_from_statement] = STATE(1209),
-    [sym_print_statement] = STATE(1209),
-    [sym_assert_statement] = STATE(1209),
-    [sym_expression_statement] = STATE(1209),
-    [sym_named_expression] = STATE(1009),
-    [sym_return_statement] = STATE(1209),
-    [sym_delete_statement] = STATE(1209),
-    [sym_raise_statement] = STATE(1209),
-    [sym_pass_statement] = STATE(1209),
-    [sym_break_statement] = STATE(1209),
-    [sym_continue_statement] = STATE(1209),
-    [sym_list_splat] = STATE(1360),
-    [sym_dictionary_splat] = STATE(1360),
-    [sym_global_statement] = STATE(1209),
-    [sym_nonlocal_statement] = STATE(1209),
-    [sym_exec_statement] = STATE(1209),
-    [sym_type_alias_statement] = STATE(1209),
-    [sym_expression_list] = STATE(1361),
-    [sym_pattern] = STATE(889),
-    [sym_tuple_pattern] = STATE(875),
-    [sym_list_pattern] = STATE(875),
-    [sym_list_splat_pattern] = STATE(875),
-    [sym_expression] = STATE(1019),
-    [sym_primary_expression] = STATE(684),
-    [sym_not_operator] = STATE(1009),
-    [sym_boolean_operator] = STATE(1009),
-    [sym_binary_operator] = STATE(797),
-    [sym_unary_operator] = STATE(797),
-    [sym_comparison_operator] = STATE(1009),
-    [sym_lambda] = STATE(1009),
-    [sym_assignment] = STATE(1361),
-    [sym_augmented_assignment] = STATE(1361),
-    [sym_pattern_list] = STATE(897),
-    [sym_yield] = STATE(1361),
-    [sym_attribute] = STATE(431),
-    [sym_subscript] = STATE(431),
-    [sym_call] = STATE(797),
-    [sym_list] = STATE(797),
-    [sym_set] = STATE(797),
-    [sym_tuple] = STATE(797),
-    [sym_dictionary] = STATE(797),
-    [sym_list_comprehension] = STATE(797),
-    [sym_dictionary_comprehension] = STATE(797),
-    [sym_set_comprehension] = STATE(797),
-    [sym_generator_expression] = STATE(797),
-    [sym_parenthesized_expression] = STATE(797),
-    [sym_conditional_expression] = STATE(1009),
-    [sym_concatenated_string] = STATE(797),
-    [sym_string] = STATE(713),
-    [sym_await] = STATE(1009),
+    [sym__simple_statements] = STATE(469),
+    [sym_import_statement] = STATE(1213),
+    [sym_future_import_statement] = STATE(1213),
+    [sym_import_from_statement] = STATE(1213),
+    [sym_print_statement] = STATE(1213),
+    [sym_assert_statement] = STATE(1213),
+    [sym_expression_statement] = STATE(1213),
+    [sym_named_expression] = STATE(985),
+    [sym_return_statement] = STATE(1213),
+    [sym_delete_statement] = STATE(1213),
+    [sym_raise_statement] = STATE(1213),
+    [sym_pass_statement] = STATE(1213),
+    [sym_break_statement] = STATE(1213),
+    [sym_continue_statement] = STATE(1213),
+    [sym_list_splat] = STATE(1321),
+    [sym_dictionary_splat] = STATE(1321),
+    [sym_global_statement] = STATE(1213),
+    [sym_nonlocal_statement] = STATE(1213),
+    [sym_exec_statement] = STATE(1213),
+    [sym_type_alias_statement] = STATE(1213),
+    [sym_expression_list] = STATE(1313),
+    [sym_pattern] = STATE(871),
+    [sym_tuple_pattern] = STATE(860),
+    [sym_list_pattern] = STATE(860),
+    [sym_list_splat_pattern] = STATE(860),
+    [sym_expression] = STATE(995),
+    [sym_primary_expression] = STATE(707),
+    [sym_not_operator] = STATE(985),
+    [sym_boolean_operator] = STATE(985),
+    [sym_binary_operator] = STATE(759),
+    [sym_unary_operator] = STATE(759),
+    [sym_comparison_operator] = STATE(985),
+    [sym_lambda] = STATE(985),
+    [sym_assignment] = STATE(1313),
+    [sym_augmented_assignment] = STATE(1313),
+    [sym_pattern_list] = STATE(880),
+    [sym_yield] = STATE(1313),
+    [sym_attribute] = STATE(422),
+    [sym_subscript] = STATE(422),
+    [sym_call] = STATE(759),
+    [sym_list] = STATE(759),
+    [sym_set] = STATE(759),
+    [sym_tuple] = STATE(759),
+    [sym_dictionary] = STATE(759),
+    [sym_list_comprehension] = STATE(759),
+    [sym_dictionary_comprehension] = STATE(759),
+    [sym_set_comprehension] = STATE(759),
+    [sym_generator_expression] = STATE(759),
+    [sym_parenthesized_expression] = STATE(759),
+    [sym_conditional_expression] = STATE(985),
+    [sym_concatenated_string] = STATE(759),
+    [sym_string] = STATE(709),
+    [sym_await] = STATE(759),
     [sym_identifier] = ACTIONS(7),
     [anon_sym_import] = ACTIONS(9),
     [anon_sym_from] = ACTIONS(11),
@@ -19407,8 +16707,8 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_pass] = ACTIONS(27),
     [anon_sym_break] = ACTIONS(29),
     [anon_sym_continue] = ACTIONS(31),
-    [anon_sym_async] = ACTIONS(317),
-    [anon_sym_match] = ACTIONS(317),
+    [anon_sym_async] = ACTIONS(301),
+    [anon_sym_match] = ACTIONS(301),
     [anon_sym_DASH] = ACTIONS(47),
     [anon_sym_PLUS] = ACTIONS(47),
     [anon_sym_LBRACK] = ACTIONS(49),
@@ -19435,59 +16735,59 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym__string_start] = ACTIONS(81),
   },
   [82] = {
-    [sym__simple_statements] = STATE(508),
-    [sym_import_statement] = STATE(1319),
-    [sym_future_import_statement] = STATE(1319),
-    [sym_import_from_statement] = STATE(1319),
-    [sym_print_statement] = STATE(1319),
-    [sym_assert_statement] = STATE(1319),
-    [sym_expression_statement] = STATE(1319),
-    [sym_named_expression] = STATE(1009),
-    [sym_return_statement] = STATE(1319),
-    [sym_delete_statement] = STATE(1319),
-    [sym_raise_statement] = STATE(1319),
-    [sym_pass_statement] = STATE(1319),
-    [sym_break_statement] = STATE(1319),
-    [sym_continue_statement] = STATE(1319),
-    [sym_list_splat] = STATE(1360),
-    [sym_dictionary_splat] = STATE(1360),
-    [sym_global_statement] = STATE(1319),
-    [sym_nonlocal_statement] = STATE(1319),
-    [sym_exec_statement] = STATE(1319),
-    [sym_type_alias_statement] = STATE(1319),
-    [sym_expression_list] = STATE(1361),
-    [sym_pattern] = STATE(889),
-    [sym_tuple_pattern] = STATE(875),
-    [sym_list_pattern] = STATE(875),
-    [sym_list_splat_pattern] = STATE(875),
-    [sym_expression] = STATE(1019),
-    [sym_primary_expression] = STATE(684),
-    [sym_not_operator] = STATE(1009),
-    [sym_boolean_operator] = STATE(1009),
-    [sym_binary_operator] = STATE(797),
-    [sym_unary_operator] = STATE(797),
-    [sym_comparison_operator] = STATE(1009),
-    [sym_lambda] = STATE(1009),
-    [sym_assignment] = STATE(1361),
-    [sym_augmented_assignment] = STATE(1361),
-    [sym_pattern_list] = STATE(897),
-    [sym_yield] = STATE(1361),
-    [sym_attribute] = STATE(431),
-    [sym_subscript] = STATE(431),
-    [sym_call] = STATE(797),
-    [sym_list] = STATE(797),
-    [sym_set] = STATE(797),
-    [sym_tuple] = STATE(797),
-    [sym_dictionary] = STATE(797),
-    [sym_list_comprehension] = STATE(797),
-    [sym_dictionary_comprehension] = STATE(797),
-    [sym_set_comprehension] = STATE(797),
-    [sym_generator_expression] = STATE(797),
-    [sym_parenthesized_expression] = STATE(797),
-    [sym_conditional_expression] = STATE(1009),
-    [sym_concatenated_string] = STATE(797),
-    [sym_string] = STATE(713),
-    [sym_await] = STATE(1009),
+    [sym__simple_statements] = STATE(558),
+    [sym_import_statement] = STATE(1304),
+    [sym_future_import_statement] = STATE(1304),
+    [sym_import_from_statement] = STATE(1304),
+    [sym_print_statement] = STATE(1304),
+    [sym_assert_statement] = STATE(1304),
+    [sym_expression_statement] = STATE(1304),
+    [sym_named_expression] = STATE(985),
+    [sym_return_statement] = STATE(1304),
+    [sym_delete_statement] = STATE(1304),
+    [sym_raise_statement] = STATE(1304),
+    [sym_pass_statement] = STATE(1304),
+    [sym_break_statement] = STATE(1304),
+    [sym_continue_statement] = STATE(1304),
+    [sym_list_splat] = STATE(1321),
+    [sym_dictionary_splat] = STATE(1321),
+    [sym_global_statement] = STATE(1304),
+    [sym_nonlocal_statement] = STATE(1304),
+    [sym_exec_statement] = STATE(1304),
+    [sym_type_alias_statement] = STATE(1304),
+    [sym_expression_list] = STATE(1313),
+    [sym_pattern] = STATE(871),
+    [sym_tuple_pattern] = STATE(860),
+    [sym_list_pattern] = STATE(860),
+    [sym_list_splat_pattern] = STATE(860),
+    [sym_expression] = STATE(995),
+    [sym_primary_expression] = STATE(707),
+    [sym_not_operator] = STATE(985),
+    [sym_boolean_operator] = STATE(985),
+    [sym_binary_operator] = STATE(759),
+    [sym_unary_operator] = STATE(759),
+    [sym_comparison_operator] = STATE(985),
+    [sym_lambda] = STATE(985),
+    [sym_assignment] = STATE(1313),
+    [sym_augmented_assignment] = STATE(1313),
+    [sym_pattern_list] = STATE(880),
+    [sym_yield] = STATE(1313),
+    [sym_attribute] = STATE(422),
+    [sym_subscript] = STATE(422),
+    [sym_call] = STATE(759),
+    [sym_list] = STATE(759),
+    [sym_set] = STATE(759),
+    [sym_tuple] = STATE(759),
+    [sym_dictionary] = STATE(759),
+    [sym_list_comprehension] = STATE(759),
+    [sym_dictionary_comprehension] = STATE(759),
+    [sym_set_comprehension] = STATE(759),
+    [sym_generator_expression] = STATE(759),
+    [sym_parenthesized_expression] = STATE(759),
+    [sym_conditional_expression] = STATE(985),
+    [sym_concatenated_string] = STATE(759),
+    [sym_string] = STATE(709),
+    [sym_await] = STATE(759),
     [sym_identifier] = ACTIONS(7),
     [anon_sym_import] = ACTIONS(9),
     [anon_sym_from] = ACTIONS(11),
@@ -19501,8 +16801,8 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_pass] = ACTIONS(27),
     [anon_sym_break] = ACTIONS(29),
     [anon_sym_continue] = ACTIONS(31),
-    [anon_sym_async] = ACTIONS(317),
-    [anon_sym_match] = ACTIONS(317),
+    [anon_sym_async] = ACTIONS(301),
+    [anon_sym_match] = ACTIONS(301),
     [anon_sym_DASH] = ACTIONS(47),
     [anon_sym_PLUS] = ACTIONS(47),
     [anon_sym_LBRACK] = ACTIONS(49),
@@ -19529,59 +16829,59 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym__string_start] = ACTIONS(81),
   },
   [83] = {
-    [sym__simple_statements] = STATE(377),
-    [sym_import_statement] = STATE(1244),
-    [sym_future_import_statement] = STATE(1244),
-    [sym_import_from_statement] = STATE(1244),
-    [sym_print_statement] = STATE(1244),
-    [sym_assert_statement] = STATE(1244),
-    [sym_expression_statement] = STATE(1244),
-    [sym_named_expression] = STATE(1009),
-    [sym_return_statement] = STATE(1244),
-    [sym_delete_statement] = STATE(1244),
-    [sym_raise_statement] = STATE(1244),
-    [sym_pass_statement] = STATE(1244),
-    [sym_break_statement] = STATE(1244),
-    [sym_continue_statement] = STATE(1244),
-    [sym_list_splat] = STATE(1360),
-    [sym_dictionary_splat] = STATE(1360),
-    [sym_global_statement] = STATE(1244),
-    [sym_nonlocal_statement] = STATE(1244),
-    [sym_exec_statement] = STATE(1244),
-    [sym_type_alias_statement] = STATE(1244),
-    [sym_expression_list] = STATE(1361),
-    [sym_pattern] = STATE(889),
-    [sym_tuple_pattern] = STATE(875),
-    [sym_list_pattern] = STATE(875),
-    [sym_list_splat_pattern] = STATE(875),
-    [sym_expression] = STATE(1019),
-    [sym_primary_expression] = STATE(684),
-    [sym_not_operator] = STATE(1009),
-    [sym_boolean_operator] = STATE(1009),
-    [sym_binary_operator] = STATE(797),
-    [sym_unary_operator] = STATE(797),
-    [sym_comparison_operator] = STATE(1009),
-    [sym_lambda] = STATE(1009),
-    [sym_assignment] = STATE(1361),
-    [sym_augmented_assignment] = STATE(1361),
-    [sym_pattern_list] = STATE(897),
-    [sym_yield] = STATE(1361),
-    [sym_attribute] = STATE(431),
-    [sym_subscript] = STATE(431),
-    [sym_call] = STATE(797),
-    [sym_list] = STATE(797),
-    [sym_set] = STATE(797),
-    [sym_tuple] = STATE(797),
-    [sym_dictionary] = STATE(797),
-    [sym_list_comprehension] = STATE(797),
-    [sym_dictionary_comprehension] = STATE(797),
-    [sym_set_comprehension] = STATE(797),
-    [sym_generator_expression] = STATE(797),
-    [sym_parenthesized_expression] = STATE(797),
-    [sym_conditional_expression] = STATE(1009),
-    [sym_concatenated_string] = STATE(797),
-    [sym_string] = STATE(713),
-    [sym_await] = STATE(1009),
+    [sym__simple_statements] = STATE(549),
+    [sym_import_statement] = STATE(1213),
+    [sym_future_import_statement] = STATE(1213),
+    [sym_import_from_statement] = STATE(1213),
+    [sym_print_statement] = STATE(1213),
+    [sym_assert_statement] = STATE(1213),
+    [sym_expression_statement] = STATE(1213),
+    [sym_named_expression] = STATE(985),
+    [sym_return_statement] = STATE(1213),
+    [sym_delete_statement] = STATE(1213),
+    [sym_raise_statement] = STATE(1213),
+    [sym_pass_statement] = STATE(1213),
+    [sym_break_statement] = STATE(1213),
+    [sym_continue_statement] = STATE(1213),
+    [sym_list_splat] = STATE(1321),
+    [sym_dictionary_splat] = STATE(1321),
+    [sym_global_statement] = STATE(1213),
+    [sym_nonlocal_statement] = STATE(1213),
+    [sym_exec_statement] = STATE(1213),
+    [sym_type_alias_statement] = STATE(1213),
+    [sym_expression_list] = STATE(1313),
+    [sym_pattern] = STATE(871),
+    [sym_tuple_pattern] = STATE(860),
+    [sym_list_pattern] = STATE(860),
+    [sym_list_splat_pattern] = STATE(860),
+    [sym_expression] = STATE(995),
+    [sym_primary_expression] = STATE(707),
+    [sym_not_operator] = STATE(985),
+    [sym_boolean_operator] = STATE(985),
+    [sym_binary_operator] = STATE(759),
+    [sym_unary_operator] = STATE(759),
+    [sym_comparison_operator] = STATE(985),
+    [sym_lambda] = STATE(985),
+    [sym_assignment] = STATE(1313),
+    [sym_augmented_assignment] = STATE(1313),
+    [sym_pattern_list] = STATE(880),
+    [sym_yield] = STATE(1313),
+    [sym_attribute] = STATE(422),
+    [sym_subscript] = STATE(422),
+    [sym_call] = STATE(759),
+    [sym_list] = STATE(759),
+    [sym_set] = STATE(759),
+    [sym_tuple] = STATE(759),
+    [sym_dictionary] = STATE(759),
+    [sym_list_comprehension] = STATE(759),
+    [sym_dictionary_comprehension] = STATE(759),
+    [sym_set_comprehension] = STATE(759),
+    [sym_generator_expression] = STATE(759),
+    [sym_parenthesized_expression] = STATE(759),
+    [sym_conditional_expression] = STATE(985),
+    [sym_concatenated_string] = STATE(759),
+    [sym_string] = STATE(709),
+    [sym_await] = STATE(759),
     [sym_identifier] = ACTIONS(7),
     [anon_sym_import] = ACTIONS(9),
     [anon_sym_from] = ACTIONS(11),
@@ -19595,8 +16895,8 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_pass] = ACTIONS(27),
     [anon_sym_break] = ACTIONS(29),
     [anon_sym_continue] = ACTIONS(31),
-    [anon_sym_async] = ACTIONS(317),
-    [anon_sym_match] = ACTIONS(317),
+    [anon_sym_async] = ACTIONS(301),
+    [anon_sym_match] = ACTIONS(301),
     [anon_sym_DASH] = ACTIONS(47),
     [anon_sym_PLUS] = ACTIONS(47),
     [anon_sym_LBRACK] = ACTIONS(49),
@@ -19623,59 +16923,59 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym__string_start] = ACTIONS(81),
   },
   [84] = {
-    [sym__simple_statements] = STATE(524),
-    [sym_import_statement] = STATE(1209),
-    [sym_future_import_statement] = STATE(1209),
-    [sym_import_from_statement] = STATE(1209),
-    [sym_print_statement] = STATE(1209),
-    [sym_assert_statement] = STATE(1209),
-    [sym_expression_statement] = STATE(1209),
-    [sym_named_expression] = STATE(1009),
-    [sym_return_statement] = STATE(1209),
-    [sym_delete_statement] = STATE(1209),
-    [sym_raise_statement] = STATE(1209),
-    [sym_pass_statement] = STATE(1209),
-    [sym_break_statement] = STATE(1209),
-    [sym_continue_statement] = STATE(1209),
-    [sym_list_splat] = STATE(1360),
-    [sym_dictionary_splat] = STATE(1360),
-    [sym_global_statement] = STATE(1209),
-    [sym_nonlocal_statement] = STATE(1209),
-    [sym_exec_statement] = STATE(1209),
-    [sym_type_alias_statement] = STATE(1209),
-    [sym_expression_list] = STATE(1361),
-    [sym_pattern] = STATE(889),
-    [sym_tuple_pattern] = STATE(875),
-    [sym_list_pattern] = STATE(875),
-    [sym_list_splat_pattern] = STATE(875),
-    [sym_expression] = STATE(1019),
-    [sym_primary_expression] = STATE(684),
-    [sym_not_operator] = STATE(1009),
-    [sym_boolean_operator] = STATE(1009),
-    [sym_binary_operator] = STATE(797),
-    [sym_unary_operator] = STATE(797),
-    [sym_comparison_operator] = STATE(1009),
-    [sym_lambda] = STATE(1009),
-    [sym_assignment] = STATE(1361),
-    [sym_augmented_assignment] = STATE(1361),
-    [sym_pattern_list] = STATE(897),
-    [sym_yield] = STATE(1361),
-    [sym_attribute] = STATE(431),
-    [sym_subscript] = STATE(431),
-    [sym_call] = STATE(797),
-    [sym_list] = STATE(797),
-    [sym_set] = STATE(797),
-    [sym_tuple] = STATE(797),
-    [sym_dictionary] = STATE(797),
-    [sym_list_comprehension] = STATE(797),
-    [sym_dictionary_comprehension] = STATE(797),
-    [sym_set_comprehension] = STATE(797),
-    [sym_generator_expression] = STATE(797),
-    [sym_parenthesized_expression] = STATE(797),
-    [sym_conditional_expression] = STATE(1009),
-    [sym_concatenated_string] = STATE(797),
-    [sym_string] = STATE(713),
-    [sym_await] = STATE(1009),
+    [sym__simple_statements] = STATE(517),
+    [sym_import_statement] = STATE(1213),
+    [sym_future_import_statement] = STATE(1213),
+    [sym_import_from_statement] = STATE(1213),
+    [sym_print_statement] = STATE(1213),
+    [sym_assert_statement] = STATE(1213),
+    [sym_expression_statement] = STATE(1213),
+    [sym_named_expression] = STATE(985),
+    [sym_return_statement] = STATE(1213),
+    [sym_delete_statement] = STATE(1213),
+    [sym_raise_statement] = STATE(1213),
+    [sym_pass_statement] = STATE(1213),
+    [sym_break_statement] = STATE(1213),
+    [sym_continue_statement] = STATE(1213),
+    [sym_list_splat] = STATE(1321),
+    [sym_dictionary_splat] = STATE(1321),
+    [sym_global_statement] = STATE(1213),
+    [sym_nonlocal_statement] = STATE(1213),
+    [sym_exec_statement] = STATE(1213),
+    [sym_type_alias_statement] = STATE(1213),
+    [sym_expression_list] = STATE(1313),
+    [sym_pattern] = STATE(871),
+    [sym_tuple_pattern] = STATE(860),
+    [sym_list_pattern] = STATE(860),
+    [sym_list_splat_pattern] = STATE(860),
+    [sym_expression] = STATE(995),
+    [sym_primary_expression] = STATE(707),
+    [sym_not_operator] = STATE(985),
+    [sym_boolean_operator] = STATE(985),
+    [sym_binary_operator] = STATE(759),
+    [sym_unary_operator] = STATE(759),
+    [sym_comparison_operator] = STATE(985),
+    [sym_lambda] = STATE(985),
+    [sym_assignment] = STATE(1313),
+    [sym_augmented_assignment] = STATE(1313),
+    [sym_pattern_list] = STATE(880),
+    [sym_yield] = STATE(1313),
+    [sym_attribute] = STATE(422),
+    [sym_subscript] = STATE(422),
+    [sym_call] = STATE(759),
+    [sym_list] = STATE(759),
+    [sym_set] = STATE(759),
+    [sym_tuple] = STATE(759),
+    [sym_dictionary] = STATE(759),
+    [sym_list_comprehension] = STATE(759),
+    [sym_dictionary_comprehension] = STATE(759),
+    [sym_set_comprehension] = STATE(759),
+    [sym_generator_expression] = STATE(759),
+    [sym_parenthesized_expression] = STATE(759),
+    [sym_conditional_expression] = STATE(985),
+    [sym_concatenated_string] = STATE(759),
+    [sym_string] = STATE(709),
+    [sym_await] = STATE(759),
     [sym_identifier] = ACTIONS(7),
     [anon_sym_import] = ACTIONS(9),
     [anon_sym_from] = ACTIONS(11),
@@ -19689,8 +16989,8 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_pass] = ACTIONS(27),
     [anon_sym_break] = ACTIONS(29),
     [anon_sym_continue] = ACTIONS(31),
-    [anon_sym_async] = ACTIONS(317),
-    [anon_sym_match] = ACTIONS(317),
+    [anon_sym_async] = ACTIONS(301),
+    [anon_sym_match] = ACTIONS(301),
     [anon_sym_DASH] = ACTIONS(47),
     [anon_sym_PLUS] = ACTIONS(47),
     [anon_sym_LBRACK] = ACTIONS(49),
@@ -19717,59 +17017,59 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym__string_start] = ACTIONS(81),
   },
   [85] = {
-    [sym__simple_statements] = STATE(316),
-    [sym_import_statement] = STATE(1238),
-    [sym_future_import_statement] = STATE(1238),
-    [sym_import_from_statement] = STATE(1238),
-    [sym_print_statement] = STATE(1238),
-    [sym_assert_statement] = STATE(1238),
-    [sym_expression_statement] = STATE(1238),
-    [sym_named_expression] = STATE(1009),
-    [sym_return_statement] = STATE(1238),
-    [sym_delete_statement] = STATE(1238),
-    [sym_raise_statement] = STATE(1238),
-    [sym_pass_statement] = STATE(1238),
-    [sym_break_statement] = STATE(1238),
-    [sym_continue_statement] = STATE(1238),
-    [sym_list_splat] = STATE(1360),
-    [sym_dictionary_splat] = STATE(1360),
-    [sym_global_statement] = STATE(1238),
-    [sym_nonlocal_statement] = STATE(1238),
-    [sym_exec_statement] = STATE(1238),
-    [sym_type_alias_statement] = STATE(1238),
-    [sym_expression_list] = STATE(1361),
-    [sym_pattern] = STATE(889),
-    [sym_tuple_pattern] = STATE(875),
-    [sym_list_pattern] = STATE(875),
-    [sym_list_splat_pattern] = STATE(875),
-    [sym_expression] = STATE(1019),
-    [sym_primary_expression] = STATE(684),
-    [sym_not_operator] = STATE(1009),
-    [sym_boolean_operator] = STATE(1009),
-    [sym_binary_operator] = STATE(797),
-    [sym_unary_operator] = STATE(797),
-    [sym_comparison_operator] = STATE(1009),
-    [sym_lambda] = STATE(1009),
-    [sym_assignment] = STATE(1361),
-    [sym_augmented_assignment] = STATE(1361),
-    [sym_pattern_list] = STATE(897),
-    [sym_yield] = STATE(1361),
-    [sym_attribute] = STATE(431),
-    [sym_subscript] = STATE(431),
-    [sym_call] = STATE(797),
-    [sym_list] = STATE(797),
-    [sym_set] = STATE(797),
-    [sym_tuple] = STATE(797),
-    [sym_dictionary] = STATE(797),
-    [sym_list_comprehension] = STATE(797),
-    [sym_dictionary_comprehension] = STATE(797),
-    [sym_set_comprehension] = STATE(797),
-    [sym_generator_expression] = STATE(797),
-    [sym_parenthesized_expression] = STATE(797),
-    [sym_conditional_expression] = STATE(1009),
-    [sym_concatenated_string] = STATE(797),
-    [sym_string] = STATE(713),
-    [sym_await] = STATE(1009),
+    [sym__simple_statements] = STATE(550),
+    [sym_import_statement] = STATE(1304),
+    [sym_future_import_statement] = STATE(1304),
+    [sym_import_from_statement] = STATE(1304),
+    [sym_print_statement] = STATE(1304),
+    [sym_assert_statement] = STATE(1304),
+    [sym_expression_statement] = STATE(1304),
+    [sym_named_expression] = STATE(985),
+    [sym_return_statement] = STATE(1304),
+    [sym_delete_statement] = STATE(1304),
+    [sym_raise_statement] = STATE(1304),
+    [sym_pass_statement] = STATE(1304),
+    [sym_break_statement] = STATE(1304),
+    [sym_continue_statement] = STATE(1304),
+    [sym_list_splat] = STATE(1321),
+    [sym_dictionary_splat] = STATE(1321),
+    [sym_global_statement] = STATE(1304),
+    [sym_nonlocal_statement] = STATE(1304),
+    [sym_exec_statement] = STATE(1304),
+    [sym_type_alias_statement] = STATE(1304),
+    [sym_expression_list] = STATE(1313),
+    [sym_pattern] = STATE(871),
+    [sym_tuple_pattern] = STATE(860),
+    [sym_list_pattern] = STATE(860),
+    [sym_list_splat_pattern] = STATE(860),
+    [sym_expression] = STATE(995),
+    [sym_primary_expression] = STATE(707),
+    [sym_not_operator] = STATE(985),
+    [sym_boolean_operator] = STATE(985),
+    [sym_binary_operator] = STATE(759),
+    [sym_unary_operator] = STATE(759),
+    [sym_comparison_operator] = STATE(985),
+    [sym_lambda] = STATE(985),
+    [sym_assignment] = STATE(1313),
+    [sym_augmented_assignment] = STATE(1313),
+    [sym_pattern_list] = STATE(880),
+    [sym_yield] = STATE(1313),
+    [sym_attribute] = STATE(422),
+    [sym_subscript] = STATE(422),
+    [sym_call] = STATE(759),
+    [sym_list] = STATE(759),
+    [sym_set] = STATE(759),
+    [sym_tuple] = STATE(759),
+    [sym_dictionary] = STATE(759),
+    [sym_list_comprehension] = STATE(759),
+    [sym_dictionary_comprehension] = STATE(759),
+    [sym_set_comprehension] = STATE(759),
+    [sym_generator_expression] = STATE(759),
+    [sym_parenthesized_expression] = STATE(759),
+    [sym_conditional_expression] = STATE(985),
+    [sym_concatenated_string] = STATE(759),
+    [sym_string] = STATE(709),
+    [sym_await] = STATE(759),
     [sym_identifier] = ACTIONS(7),
     [anon_sym_import] = ACTIONS(9),
     [anon_sym_from] = ACTIONS(11),
@@ -19783,8 +17083,8 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_pass] = ACTIONS(27),
     [anon_sym_break] = ACTIONS(29),
     [anon_sym_continue] = ACTIONS(31),
-    [anon_sym_async] = ACTIONS(317),
-    [anon_sym_match] = ACTIONS(317),
+    [anon_sym_async] = ACTIONS(301),
+    [anon_sym_match] = ACTIONS(301),
     [anon_sym_DASH] = ACTIONS(47),
     [anon_sym_PLUS] = ACTIONS(47),
     [anon_sym_LBRACK] = ACTIONS(49),
@@ -19811,59 +17111,59 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym__string_start] = ACTIONS(81),
   },
   [86] = {
-    [sym__simple_statements] = STATE(532),
-    [sym_import_statement] = STATE(1209),
-    [sym_future_import_statement] = STATE(1209),
-    [sym_import_from_statement] = STATE(1209),
-    [sym_print_statement] = STATE(1209),
-    [sym_assert_statement] = STATE(1209),
-    [sym_expression_statement] = STATE(1209),
-    [sym_named_expression] = STATE(1009),
-    [sym_return_statement] = STATE(1209),
-    [sym_delete_statement] = STATE(1209),
-    [sym_raise_statement] = STATE(1209),
-    [sym_pass_statement] = STATE(1209),
-    [sym_break_statement] = STATE(1209),
-    [sym_continue_statement] = STATE(1209),
-    [sym_list_splat] = STATE(1360),
-    [sym_dictionary_splat] = STATE(1360),
-    [sym_global_statement] = STATE(1209),
-    [sym_nonlocal_statement] = STATE(1209),
-    [sym_exec_statement] = STATE(1209),
-    [sym_type_alias_statement] = STATE(1209),
-    [sym_expression_list] = STATE(1361),
-    [sym_pattern] = STATE(889),
-    [sym_tuple_pattern] = STATE(875),
-    [sym_list_pattern] = STATE(875),
-    [sym_list_splat_pattern] = STATE(875),
-    [sym_expression] = STATE(1019),
-    [sym_primary_expression] = STATE(684),
-    [sym_not_operator] = STATE(1009),
-    [sym_boolean_operator] = STATE(1009),
-    [sym_binary_operator] = STATE(797),
-    [sym_unary_operator] = STATE(797),
-    [sym_comparison_operator] = STATE(1009),
-    [sym_lambda] = STATE(1009),
-    [sym_assignment] = STATE(1361),
-    [sym_augmented_assignment] = STATE(1361),
-    [sym_pattern_list] = STATE(897),
-    [sym_yield] = STATE(1361),
-    [sym_attribute] = STATE(431),
-    [sym_subscript] = STATE(431),
-    [sym_call] = STATE(797),
-    [sym_list] = STATE(797),
-    [sym_set] = STATE(797),
-    [sym_tuple] = STATE(797),
-    [sym_dictionary] = STATE(797),
-    [sym_list_comprehension] = STATE(797),
-    [sym_dictionary_comprehension] = STATE(797),
-    [sym_set_comprehension] = STATE(797),
-    [sym_generator_expression] = STATE(797),
-    [sym_parenthesized_expression] = STATE(797),
-    [sym_conditional_expression] = STATE(1009),
-    [sym_concatenated_string] = STATE(797),
-    [sym_string] = STATE(713),
-    [sym_await] = STATE(1009),
+    [sym__simple_statements] = STATE(536),
+    [sym_import_statement] = STATE(1213),
+    [sym_future_import_statement] = STATE(1213),
+    [sym_import_from_statement] = STATE(1213),
+    [sym_print_statement] = STATE(1213),
+    [sym_assert_statement] = STATE(1213),
+    [sym_expression_statement] = STATE(1213),
+    [sym_named_expression] = STATE(985),
+    [sym_return_statement] = STATE(1213),
+    [sym_delete_statement] = STATE(1213),
+    [sym_raise_statement] = STATE(1213),
+    [sym_pass_statement] = STATE(1213),
+    [sym_break_statement] = STATE(1213),
+    [sym_continue_statement] = STATE(1213),
+    [sym_list_splat] = STATE(1321),
+    [sym_dictionary_splat] = STATE(1321),
+    [sym_global_statement] = STATE(1213),
+    [sym_nonlocal_statement] = STATE(1213),
+    [sym_exec_statement] = STATE(1213),
+    [sym_type_alias_statement] = STATE(1213),
+    [sym_expression_list] = STATE(1313),
+    [sym_pattern] = STATE(871),
+    [sym_tuple_pattern] = STATE(860),
+    [sym_list_pattern] = STATE(860),
+    [sym_list_splat_pattern] = STATE(860),
+    [sym_expression] = STATE(995),
+    [sym_primary_expression] = STATE(707),
+    [sym_not_operator] = STATE(985),
+    [sym_boolean_operator] = STATE(985),
+    [sym_binary_operator] = STATE(759),
+    [sym_unary_operator] = STATE(759),
+    [sym_comparison_operator] = STATE(985),
+    [sym_lambda] = STATE(985),
+    [sym_assignment] = STATE(1313),
+    [sym_augmented_assignment] = STATE(1313),
+    [sym_pattern_list] = STATE(880),
+    [sym_yield] = STATE(1313),
+    [sym_attribute] = STATE(422),
+    [sym_subscript] = STATE(422),
+    [sym_call] = STATE(759),
+    [sym_list] = STATE(759),
+    [sym_set] = STATE(759),
+    [sym_tuple] = STATE(759),
+    [sym_dictionary] = STATE(759),
+    [sym_list_comprehension] = STATE(759),
+    [sym_dictionary_comprehension] = STATE(759),
+    [sym_set_comprehension] = STATE(759),
+    [sym_generator_expression] = STATE(759),
+    [sym_parenthesized_expression] = STATE(759),
+    [sym_conditional_expression] = STATE(985),
+    [sym_concatenated_string] = STATE(759),
+    [sym_string] = STATE(709),
+    [sym_await] = STATE(759),
     [sym_identifier] = ACTIONS(7),
     [anon_sym_import] = ACTIONS(9),
     [anon_sym_from] = ACTIONS(11),
@@ -19877,8 +17177,8 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_pass] = ACTIONS(27),
     [anon_sym_break] = ACTIONS(29),
     [anon_sym_continue] = ACTIONS(31),
-    [anon_sym_async] = ACTIONS(317),
-    [anon_sym_match] = ACTIONS(317),
+    [anon_sym_async] = ACTIONS(301),
+    [anon_sym_match] = ACTIONS(301),
     [anon_sym_DASH] = ACTIONS(47),
     [anon_sym_PLUS] = ACTIONS(47),
     [anon_sym_LBRACK] = ACTIONS(49),
@@ -19905,59 +17205,59 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym__string_start] = ACTIONS(81),
   },
   [87] = {
-    [sym__simple_statements] = STATE(547),
-    [sym_import_statement] = STATE(1209),
-    [sym_future_import_statement] = STATE(1209),
-    [sym_import_from_statement] = STATE(1209),
-    [sym_print_statement] = STATE(1209),
-    [sym_assert_statement] = STATE(1209),
-    [sym_expression_statement] = STATE(1209),
-    [sym_named_expression] = STATE(1009),
-    [sym_return_statement] = STATE(1209),
-    [sym_delete_statement] = STATE(1209),
-    [sym_raise_statement] = STATE(1209),
-    [sym_pass_statement] = STATE(1209),
-    [sym_break_statement] = STATE(1209),
-    [sym_continue_statement] = STATE(1209),
-    [sym_list_splat] = STATE(1360),
-    [sym_dictionary_splat] = STATE(1360),
-    [sym_global_statement] = STATE(1209),
-    [sym_nonlocal_statement] = STATE(1209),
-    [sym_exec_statement] = STATE(1209),
-    [sym_type_alias_statement] = STATE(1209),
-    [sym_expression_list] = STATE(1361),
-    [sym_pattern] = STATE(889),
-    [sym_tuple_pattern] = STATE(875),
-    [sym_list_pattern] = STATE(875),
-    [sym_list_splat_pattern] = STATE(875),
-    [sym_expression] = STATE(1019),
-    [sym_primary_expression] = STATE(684),
-    [sym_not_operator] = STATE(1009),
-    [sym_boolean_operator] = STATE(1009),
-    [sym_binary_operator] = STATE(797),
-    [sym_unary_operator] = STATE(797),
-    [sym_comparison_operator] = STATE(1009),
-    [sym_lambda] = STATE(1009),
-    [sym_assignment] = STATE(1361),
-    [sym_augmented_assignment] = STATE(1361),
-    [sym_pattern_list] = STATE(897),
-    [sym_yield] = STATE(1361),
-    [sym_attribute] = STATE(431),
-    [sym_subscript] = STATE(431),
-    [sym_call] = STATE(797),
-    [sym_list] = STATE(797),
-    [sym_set] = STATE(797),
-    [sym_tuple] = STATE(797),
-    [sym_dictionary] = STATE(797),
-    [sym_list_comprehension] = STATE(797),
-    [sym_dictionary_comprehension] = STATE(797),
-    [sym_set_comprehension] = STATE(797),
-    [sym_generator_expression] = STATE(797),
-    [sym_parenthesized_expression] = STATE(797),
-    [sym_conditional_expression] = STATE(1009),
-    [sym_concatenated_string] = STATE(797),
-    [sym_string] = STATE(713),
-    [sym_await] = STATE(1009),
+    [sym__simple_statements] = STATE(512),
+    [sym_import_statement] = STATE(1304),
+    [sym_future_import_statement] = STATE(1304),
+    [sym_import_from_statement] = STATE(1304),
+    [sym_print_statement] = STATE(1304),
+    [sym_assert_statement] = STATE(1304),
+    [sym_expression_statement] = STATE(1304),
+    [sym_named_expression] = STATE(985),
+    [sym_return_statement] = STATE(1304),
+    [sym_delete_statement] = STATE(1304),
+    [sym_raise_statement] = STATE(1304),
+    [sym_pass_statement] = STATE(1304),
+    [sym_break_statement] = STATE(1304),
+    [sym_continue_statement] = STATE(1304),
+    [sym_list_splat] = STATE(1321),
+    [sym_dictionary_splat] = STATE(1321),
+    [sym_global_statement] = STATE(1304),
+    [sym_nonlocal_statement] = STATE(1304),
+    [sym_exec_statement] = STATE(1304),
+    [sym_type_alias_statement] = STATE(1304),
+    [sym_expression_list] = STATE(1313),
+    [sym_pattern] = STATE(871),
+    [sym_tuple_pattern] = STATE(860),
+    [sym_list_pattern] = STATE(860),
+    [sym_list_splat_pattern] = STATE(860),
+    [sym_expression] = STATE(995),
+    [sym_primary_expression] = STATE(707),
+    [sym_not_operator] = STATE(985),
+    [sym_boolean_operator] = STATE(985),
+    [sym_binary_operator] = STATE(759),
+    [sym_unary_operator] = STATE(759),
+    [sym_comparison_operator] = STATE(985),
+    [sym_lambda] = STATE(985),
+    [sym_assignment] = STATE(1313),
+    [sym_augmented_assignment] = STATE(1313),
+    [sym_pattern_list] = STATE(880),
+    [sym_yield] = STATE(1313),
+    [sym_attribute] = STATE(422),
+    [sym_subscript] = STATE(422),
+    [sym_call] = STATE(759),
+    [sym_list] = STATE(759),
+    [sym_set] = STATE(759),
+    [sym_tuple] = STATE(759),
+    [sym_dictionary] = STATE(759),
+    [sym_list_comprehension] = STATE(759),
+    [sym_dictionary_comprehension] = STATE(759),
+    [sym_set_comprehension] = STATE(759),
+    [sym_generator_expression] = STATE(759),
+    [sym_parenthesized_expression] = STATE(759),
+    [sym_conditional_expression] = STATE(985),
+    [sym_concatenated_string] = STATE(759),
+    [sym_string] = STATE(709),
+    [sym_await] = STATE(759),
     [sym_identifier] = ACTIONS(7),
     [anon_sym_import] = ACTIONS(9),
     [anon_sym_from] = ACTIONS(11),
@@ -19971,8 +17271,8 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_pass] = ACTIONS(27),
     [anon_sym_break] = ACTIONS(29),
     [anon_sym_continue] = ACTIONS(31),
-    [anon_sym_async] = ACTIONS(317),
-    [anon_sym_match] = ACTIONS(317),
+    [anon_sym_async] = ACTIONS(301),
+    [anon_sym_match] = ACTIONS(301),
     [anon_sym_DASH] = ACTIONS(47),
     [anon_sym_PLUS] = ACTIONS(47),
     [anon_sym_LBRACK] = ACTIONS(49),
@@ -19999,59 +17299,59 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym__string_start] = ACTIONS(81),
   },
   [88] = {
-    [sym__simple_statements] = STATE(401),
-    [sym_import_statement] = STATE(1209),
-    [sym_future_import_statement] = STATE(1209),
-    [sym_import_from_statement] = STATE(1209),
-    [sym_print_statement] = STATE(1209),
-    [sym_assert_statement] = STATE(1209),
-    [sym_expression_statement] = STATE(1209),
-    [sym_named_expression] = STATE(1009),
-    [sym_return_statement] = STATE(1209),
-    [sym_delete_statement] = STATE(1209),
-    [sym_raise_statement] = STATE(1209),
-    [sym_pass_statement] = STATE(1209),
-    [sym_break_statement] = STATE(1209),
-    [sym_continue_statement] = STATE(1209),
-    [sym_list_splat] = STATE(1360),
-    [sym_dictionary_splat] = STATE(1360),
-    [sym_global_statement] = STATE(1209),
-    [sym_nonlocal_statement] = STATE(1209),
-    [sym_exec_statement] = STATE(1209),
-    [sym_type_alias_statement] = STATE(1209),
-    [sym_expression_list] = STATE(1361),
-    [sym_pattern] = STATE(889),
-    [sym_tuple_pattern] = STATE(875),
-    [sym_list_pattern] = STATE(875),
-    [sym_list_splat_pattern] = STATE(875),
-    [sym_expression] = STATE(1019),
-    [sym_primary_expression] = STATE(684),
-    [sym_not_operator] = STATE(1009),
-    [sym_boolean_operator] = STATE(1009),
-    [sym_binary_operator] = STATE(797),
-    [sym_unary_operator] = STATE(797),
-    [sym_comparison_operator] = STATE(1009),
-    [sym_lambda] = STATE(1009),
-    [sym_assignment] = STATE(1361),
-    [sym_augmented_assignment] = STATE(1361),
-    [sym_pattern_list] = STATE(897),
-    [sym_yield] = STATE(1361),
-    [sym_attribute] = STATE(431),
-    [sym_subscript] = STATE(431),
-    [sym_call] = STATE(797),
-    [sym_list] = STATE(797),
-    [sym_set] = STATE(797),
-    [sym_tuple] = STATE(797),
-    [sym_dictionary] = STATE(797),
-    [sym_list_comprehension] = STATE(797),
-    [sym_dictionary_comprehension] = STATE(797),
-    [sym_set_comprehension] = STATE(797),
-    [sym_generator_expression] = STATE(797),
-    [sym_parenthesized_expression] = STATE(797),
-    [sym_conditional_expression] = STATE(1009),
-    [sym_concatenated_string] = STATE(797),
-    [sym_string] = STATE(713),
-    [sym_await] = STATE(1009),
+    [sym__simple_statements] = STATE(483),
+    [sym_import_statement] = STATE(1304),
+    [sym_future_import_statement] = STATE(1304),
+    [sym_import_from_statement] = STATE(1304),
+    [sym_print_statement] = STATE(1304),
+    [sym_assert_statement] = STATE(1304),
+    [sym_expression_statement] = STATE(1304),
+    [sym_named_expression] = STATE(985),
+    [sym_return_statement] = STATE(1304),
+    [sym_delete_statement] = STATE(1304),
+    [sym_raise_statement] = STATE(1304),
+    [sym_pass_statement] = STATE(1304),
+    [sym_break_statement] = STATE(1304),
+    [sym_continue_statement] = STATE(1304),
+    [sym_list_splat] = STATE(1321),
+    [sym_dictionary_splat] = STATE(1321),
+    [sym_global_statement] = STATE(1304),
+    [sym_nonlocal_statement] = STATE(1304),
+    [sym_exec_statement] = STATE(1304),
+    [sym_type_alias_statement] = STATE(1304),
+    [sym_expression_list] = STATE(1313),
+    [sym_pattern] = STATE(871),
+    [sym_tuple_pattern] = STATE(860),
+    [sym_list_pattern] = STATE(860),
+    [sym_list_splat_pattern] = STATE(860),
+    [sym_expression] = STATE(995),
+    [sym_primary_expression] = STATE(707),
+    [sym_not_operator] = STATE(985),
+    [sym_boolean_operator] = STATE(985),
+    [sym_binary_operator] = STATE(759),
+    [sym_unary_operator] = STATE(759),
+    [sym_comparison_operator] = STATE(985),
+    [sym_lambda] = STATE(985),
+    [sym_assignment] = STATE(1313),
+    [sym_augmented_assignment] = STATE(1313),
+    [sym_pattern_list] = STATE(880),
+    [sym_yield] = STATE(1313),
+    [sym_attribute] = STATE(422),
+    [sym_subscript] = STATE(422),
+    [sym_call] = STATE(759),
+    [sym_list] = STATE(759),
+    [sym_set] = STATE(759),
+    [sym_tuple] = STATE(759),
+    [sym_dictionary] = STATE(759),
+    [sym_list_comprehension] = STATE(759),
+    [sym_dictionary_comprehension] = STATE(759),
+    [sym_set_comprehension] = STATE(759),
+    [sym_generator_expression] = STATE(759),
+    [sym_parenthesized_expression] = STATE(759),
+    [sym_conditional_expression] = STATE(985),
+    [sym_concatenated_string] = STATE(759),
+    [sym_string] = STATE(709),
+    [sym_await] = STATE(759),
     [sym_identifier] = ACTIONS(7),
     [anon_sym_import] = ACTIONS(9),
     [anon_sym_from] = ACTIONS(11),
@@ -20065,8 +17365,8 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_pass] = ACTIONS(27),
     [anon_sym_break] = ACTIONS(29),
     [anon_sym_continue] = ACTIONS(31),
-    [anon_sym_async] = ACTIONS(317),
-    [anon_sym_match] = ACTIONS(317),
+    [anon_sym_async] = ACTIONS(301),
+    [anon_sym_match] = ACTIONS(301),
     [anon_sym_DASH] = ACTIONS(47),
     [anon_sym_PLUS] = ACTIONS(47),
     [anon_sym_LBRACK] = ACTIONS(49),
@@ -20093,59 +17393,59 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym__string_start] = ACTIONS(81),
   },
   [89] = {
-    [sym__simple_statements] = STATE(502),
-    [sym_import_statement] = STATE(1319),
-    [sym_future_import_statement] = STATE(1319),
-    [sym_import_from_statement] = STATE(1319),
-    [sym_print_statement] = STATE(1319),
-    [sym_assert_statement] = STATE(1319),
-    [sym_expression_statement] = STATE(1319),
-    [sym_named_expression] = STATE(1009),
-    [sym_return_statement] = STATE(1319),
-    [sym_delete_statement] = STATE(1319),
-    [sym_raise_statement] = STATE(1319),
-    [sym_pass_statement] = STATE(1319),
-    [sym_break_statement] = STATE(1319),
-    [sym_continue_statement] = STATE(1319),
-    [sym_list_splat] = STATE(1360),
-    [sym_dictionary_splat] = STATE(1360),
-    [sym_global_statement] = STATE(1319),
-    [sym_nonlocal_statement] = STATE(1319),
-    [sym_exec_statement] = STATE(1319),
-    [sym_type_alias_statement] = STATE(1319),
-    [sym_expression_list] = STATE(1361),
-    [sym_pattern] = STATE(889),
-    [sym_tuple_pattern] = STATE(875),
-    [sym_list_pattern] = STATE(875),
-    [sym_list_splat_pattern] = STATE(875),
-    [sym_expression] = STATE(1019),
-    [sym_primary_expression] = STATE(684),
-    [sym_not_operator] = STATE(1009),
-    [sym_boolean_operator] = STATE(1009),
-    [sym_binary_operator] = STATE(797),
-    [sym_unary_operator] = STATE(797),
-    [sym_comparison_operator] = STATE(1009),
-    [sym_lambda] = STATE(1009),
-    [sym_assignment] = STATE(1361),
-    [sym_augmented_assignment] = STATE(1361),
-    [sym_pattern_list] = STATE(897),
-    [sym_yield] = STATE(1361),
-    [sym_attribute] = STATE(431),
-    [sym_subscript] = STATE(431),
-    [sym_call] = STATE(797),
-    [sym_list] = STATE(797),
-    [sym_set] = STATE(797),
-    [sym_tuple] = STATE(797),
-    [sym_dictionary] = STATE(797),
-    [sym_list_comprehension] = STATE(797),
-    [sym_dictionary_comprehension] = STATE(797),
-    [sym_set_comprehension] = STATE(797),
-    [sym_generator_expression] = STATE(797),
-    [sym_parenthesized_expression] = STATE(797),
-    [sym_conditional_expression] = STATE(1009),
-    [sym_concatenated_string] = STATE(797),
-    [sym_string] = STATE(713),
-    [sym_await] = STATE(1009),
+    [sym__simple_statements] = STATE(545),
+    [sym_import_statement] = STATE(1213),
+    [sym_future_import_statement] = STATE(1213),
+    [sym_import_from_statement] = STATE(1213),
+    [sym_print_statement] = STATE(1213),
+    [sym_assert_statement] = STATE(1213),
+    [sym_expression_statement] = STATE(1213),
+    [sym_named_expression] = STATE(985),
+    [sym_return_statement] = STATE(1213),
+    [sym_delete_statement] = STATE(1213),
+    [sym_raise_statement] = STATE(1213),
+    [sym_pass_statement] = STATE(1213),
+    [sym_break_statement] = STATE(1213),
+    [sym_continue_statement] = STATE(1213),
+    [sym_list_splat] = STATE(1321),
+    [sym_dictionary_splat] = STATE(1321),
+    [sym_global_statement] = STATE(1213),
+    [sym_nonlocal_statement] = STATE(1213),
+    [sym_exec_statement] = STATE(1213),
+    [sym_type_alias_statement] = STATE(1213),
+    [sym_expression_list] = STATE(1313),
+    [sym_pattern] = STATE(871),
+    [sym_tuple_pattern] = STATE(860),
+    [sym_list_pattern] = STATE(860),
+    [sym_list_splat_pattern] = STATE(860),
+    [sym_expression] = STATE(995),
+    [sym_primary_expression] = STATE(707),
+    [sym_not_operator] = STATE(985),
+    [sym_boolean_operator] = STATE(985),
+    [sym_binary_operator] = STATE(759),
+    [sym_unary_operator] = STATE(759),
+    [sym_comparison_operator] = STATE(985),
+    [sym_lambda] = STATE(985),
+    [sym_assignment] = STATE(1313),
+    [sym_augmented_assignment] = STATE(1313),
+    [sym_pattern_list] = STATE(880),
+    [sym_yield] = STATE(1313),
+    [sym_attribute] = STATE(422),
+    [sym_subscript] = STATE(422),
+    [sym_call] = STATE(759),
+    [sym_list] = STATE(759),
+    [sym_set] = STATE(759),
+    [sym_tuple] = STATE(759),
+    [sym_dictionary] = STATE(759),
+    [sym_list_comprehension] = STATE(759),
+    [sym_dictionary_comprehension] = STATE(759),
+    [sym_set_comprehension] = STATE(759),
+    [sym_generator_expression] = STATE(759),
+    [sym_parenthesized_expression] = STATE(759),
+    [sym_conditional_expression] = STATE(985),
+    [sym_concatenated_string] = STATE(759),
+    [sym_string] = STATE(709),
+    [sym_await] = STATE(759),
     [sym_identifier] = ACTIONS(7),
     [anon_sym_import] = ACTIONS(9),
     [anon_sym_from] = ACTIONS(11),
@@ -20159,8 +17459,8 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_pass] = ACTIONS(27),
     [anon_sym_break] = ACTIONS(29),
     [anon_sym_continue] = ACTIONS(31),
-    [anon_sym_async] = ACTIONS(317),
-    [anon_sym_match] = ACTIONS(317),
+    [anon_sym_async] = ACTIONS(301),
+    [anon_sym_match] = ACTIONS(301),
     [anon_sym_DASH] = ACTIONS(47),
     [anon_sym_PLUS] = ACTIONS(47),
     [anon_sym_LBRACK] = ACTIONS(49),
@@ -20187,59 +17487,59 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym__string_start] = ACTIONS(81),
   },
   [90] = {
-    [sym__simple_statements] = STATE(526),
-    [sym_import_statement] = STATE(1319),
-    [sym_future_import_statement] = STATE(1319),
-    [sym_import_from_statement] = STATE(1319),
-    [sym_print_statement] = STATE(1319),
-    [sym_assert_statement] = STATE(1319),
-    [sym_expression_statement] = STATE(1319),
-    [sym_named_expression] = STATE(1009),
-    [sym_return_statement] = STATE(1319),
-    [sym_delete_statement] = STATE(1319),
-    [sym_raise_statement] = STATE(1319),
-    [sym_pass_statement] = STATE(1319),
-    [sym_break_statement] = STATE(1319),
-    [sym_continue_statement] = STATE(1319),
-    [sym_list_splat] = STATE(1360),
-    [sym_dictionary_splat] = STATE(1360),
-    [sym_global_statement] = STATE(1319),
-    [sym_nonlocal_statement] = STATE(1319),
-    [sym_exec_statement] = STATE(1319),
-    [sym_type_alias_statement] = STATE(1319),
-    [sym_expression_list] = STATE(1361),
-    [sym_pattern] = STATE(889),
-    [sym_tuple_pattern] = STATE(875),
-    [sym_list_pattern] = STATE(875),
-    [sym_list_splat_pattern] = STATE(875),
-    [sym_expression] = STATE(1019),
-    [sym_primary_expression] = STATE(684),
-    [sym_not_operator] = STATE(1009),
-    [sym_boolean_operator] = STATE(1009),
-    [sym_binary_operator] = STATE(797),
-    [sym_unary_operator] = STATE(797),
-    [sym_comparison_operator] = STATE(1009),
-    [sym_lambda] = STATE(1009),
-    [sym_assignment] = STATE(1361),
-    [sym_augmented_assignment] = STATE(1361),
-    [sym_pattern_list] = STATE(897),
-    [sym_yield] = STATE(1361),
-    [sym_attribute] = STATE(431),
-    [sym_subscript] = STATE(431),
-    [sym_call] = STATE(797),
-    [sym_list] = STATE(797),
-    [sym_set] = STATE(797),
-    [sym_tuple] = STATE(797),
-    [sym_dictionary] = STATE(797),
-    [sym_list_comprehension] = STATE(797),
-    [sym_dictionary_comprehension] = STATE(797),
-    [sym_set_comprehension] = STATE(797),
-    [sym_generator_expression] = STATE(797),
-    [sym_parenthesized_expression] = STATE(797),
-    [sym_conditional_expression] = STATE(1009),
-    [sym_concatenated_string] = STATE(797),
-    [sym_string] = STATE(713),
-    [sym_await] = STATE(1009),
+    [sym__simple_statements] = STATE(349),
+    [sym_import_statement] = STATE(1213),
+    [sym_future_import_statement] = STATE(1213),
+    [sym_import_from_statement] = STATE(1213),
+    [sym_print_statement] = STATE(1213),
+    [sym_assert_statement] = STATE(1213),
+    [sym_expression_statement] = STATE(1213),
+    [sym_named_expression] = STATE(985),
+    [sym_return_statement] = STATE(1213),
+    [sym_delete_statement] = STATE(1213),
+    [sym_raise_statement] = STATE(1213),
+    [sym_pass_statement] = STATE(1213),
+    [sym_break_statement] = STATE(1213),
+    [sym_continue_statement] = STATE(1213),
+    [sym_list_splat] = STATE(1321),
+    [sym_dictionary_splat] = STATE(1321),
+    [sym_global_statement] = STATE(1213),
+    [sym_nonlocal_statement] = STATE(1213),
+    [sym_exec_statement] = STATE(1213),
+    [sym_type_alias_statement] = STATE(1213),
+    [sym_expression_list] = STATE(1313),
+    [sym_pattern] = STATE(871),
+    [sym_tuple_pattern] = STATE(860),
+    [sym_list_pattern] = STATE(860),
+    [sym_list_splat_pattern] = STATE(860),
+    [sym_expression] = STATE(995),
+    [sym_primary_expression] = STATE(707),
+    [sym_not_operator] = STATE(985),
+    [sym_boolean_operator] = STATE(985),
+    [sym_binary_operator] = STATE(759),
+    [sym_unary_operator] = STATE(759),
+    [sym_comparison_operator] = STATE(985),
+    [sym_lambda] = STATE(985),
+    [sym_assignment] = STATE(1313),
+    [sym_augmented_assignment] = STATE(1313),
+    [sym_pattern_list] = STATE(880),
+    [sym_yield] = STATE(1313),
+    [sym_attribute] = STATE(422),
+    [sym_subscript] = STATE(422),
+    [sym_call] = STATE(759),
+    [sym_list] = STATE(759),
+    [sym_set] = STATE(759),
+    [sym_tuple] = STATE(759),
+    [sym_dictionary] = STATE(759),
+    [sym_list_comprehension] = STATE(759),
+    [sym_dictionary_comprehension] = STATE(759),
+    [sym_set_comprehension] = STATE(759),
+    [sym_generator_expression] = STATE(759),
+    [sym_parenthesized_expression] = STATE(759),
+    [sym_conditional_expression] = STATE(985),
+    [sym_concatenated_string] = STATE(759),
+    [sym_string] = STATE(709),
+    [sym_await] = STATE(759),
     [sym_identifier] = ACTIONS(7),
     [anon_sym_import] = ACTIONS(9),
     [anon_sym_from] = ACTIONS(11),
@@ -20253,8 +17553,8 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_pass] = ACTIONS(27),
     [anon_sym_break] = ACTIONS(29),
     [anon_sym_continue] = ACTIONS(31),
-    [anon_sym_async] = ACTIONS(317),
-    [anon_sym_match] = ACTIONS(317),
+    [anon_sym_async] = ACTIONS(301),
+    [anon_sym_match] = ACTIONS(301),
     [anon_sym_DASH] = ACTIONS(47),
     [anon_sym_PLUS] = ACTIONS(47),
     [anon_sym_LBRACK] = ACTIONS(49),
@@ -20281,59 +17581,59 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym__string_start] = ACTIONS(81),
   },
   [91] = {
-    [sym__simple_statements] = STATE(527),
-    [sym_import_statement] = STATE(1319),
-    [sym_future_import_statement] = STATE(1319),
-    [sym_import_from_statement] = STATE(1319),
-    [sym_print_statement] = STATE(1319),
-    [sym_assert_statement] = STATE(1319),
-    [sym_expression_statement] = STATE(1319),
-    [sym_named_expression] = STATE(1009),
-    [sym_return_statement] = STATE(1319),
-    [sym_delete_statement] = STATE(1319),
-    [sym_raise_statement] = STATE(1319),
-    [sym_pass_statement] = STATE(1319),
-    [sym_break_statement] = STATE(1319),
-    [sym_continue_statement] = STATE(1319),
-    [sym_list_splat] = STATE(1360),
-    [sym_dictionary_splat] = STATE(1360),
-    [sym_global_statement] = STATE(1319),
-    [sym_nonlocal_statement] = STATE(1319),
-    [sym_exec_statement] = STATE(1319),
-    [sym_type_alias_statement] = STATE(1319),
-    [sym_expression_list] = STATE(1361),
-    [sym_pattern] = STATE(889),
-    [sym_tuple_pattern] = STATE(875),
-    [sym_list_pattern] = STATE(875),
-    [sym_list_splat_pattern] = STATE(875),
-    [sym_expression] = STATE(1019),
-    [sym_primary_expression] = STATE(684),
-    [sym_not_operator] = STATE(1009),
-    [sym_boolean_operator] = STATE(1009),
-    [sym_binary_operator] = STATE(797),
-    [sym_unary_operator] = STATE(797),
-    [sym_comparison_operator] = STATE(1009),
-    [sym_lambda] = STATE(1009),
-    [sym_assignment] = STATE(1361),
-    [sym_augmented_assignment] = STATE(1361),
-    [sym_pattern_list] = STATE(897),
-    [sym_yield] = STATE(1361),
-    [sym_attribute] = STATE(431),
-    [sym_subscript] = STATE(431),
-    [sym_call] = STATE(797),
-    [sym_list] = STATE(797),
-    [sym_set] = STATE(797),
-    [sym_tuple] = STATE(797),
-    [sym_dictionary] = STATE(797),
-    [sym_list_comprehension] = STATE(797),
-    [sym_dictionary_comprehension] = STATE(797),
-    [sym_set_comprehension] = STATE(797),
-    [sym_generator_expression] = STATE(797),
-    [sym_parenthesized_expression] = STATE(797),
-    [sym_conditional_expression] = STATE(1009),
-    [sym_concatenated_string] = STATE(797),
-    [sym_string] = STATE(713),
-    [sym_await] = STATE(1009),
+    [sym__simple_statements] = STATE(543),
+    [sym_import_statement] = STATE(1213),
+    [sym_future_import_statement] = STATE(1213),
+    [sym_import_from_statement] = STATE(1213),
+    [sym_print_statement] = STATE(1213),
+    [sym_assert_statement] = STATE(1213),
+    [sym_expression_statement] = STATE(1213),
+    [sym_named_expression] = STATE(985),
+    [sym_return_statement] = STATE(1213),
+    [sym_delete_statement] = STATE(1213),
+    [sym_raise_statement] = STATE(1213),
+    [sym_pass_statement] = STATE(1213),
+    [sym_break_statement] = STATE(1213),
+    [sym_continue_statement] = STATE(1213),
+    [sym_list_splat] = STATE(1321),
+    [sym_dictionary_splat] = STATE(1321),
+    [sym_global_statement] = STATE(1213),
+    [sym_nonlocal_statement] = STATE(1213),
+    [sym_exec_statement] = STATE(1213),
+    [sym_type_alias_statement] = STATE(1213),
+    [sym_expression_list] = STATE(1313),
+    [sym_pattern] = STATE(871),
+    [sym_tuple_pattern] = STATE(860),
+    [sym_list_pattern] = STATE(860),
+    [sym_list_splat_pattern] = STATE(860),
+    [sym_expression] = STATE(995),
+    [sym_primary_expression] = STATE(707),
+    [sym_not_operator] = STATE(985),
+    [sym_boolean_operator] = STATE(985),
+    [sym_binary_operator] = STATE(759),
+    [sym_unary_operator] = STATE(759),
+    [sym_comparison_operator] = STATE(985),
+    [sym_lambda] = STATE(985),
+    [sym_assignment] = STATE(1313),
+    [sym_augmented_assignment] = STATE(1313),
+    [sym_pattern_list] = STATE(880),
+    [sym_yield] = STATE(1313),
+    [sym_attribute] = STATE(422),
+    [sym_subscript] = STATE(422),
+    [sym_call] = STATE(759),
+    [sym_list] = STATE(759),
+    [sym_set] = STATE(759),
+    [sym_tuple] = STATE(759),
+    [sym_dictionary] = STATE(759),
+    [sym_list_comprehension] = STATE(759),
+    [sym_dictionary_comprehension] = STATE(759),
+    [sym_set_comprehension] = STATE(759),
+    [sym_generator_expression] = STATE(759),
+    [sym_parenthesized_expression] = STATE(759),
+    [sym_conditional_expression] = STATE(985),
+    [sym_concatenated_string] = STATE(759),
+    [sym_string] = STATE(709),
+    [sym_await] = STATE(759),
     [sym_identifier] = ACTIONS(7),
     [anon_sym_import] = ACTIONS(9),
     [anon_sym_from] = ACTIONS(11),
@@ -20347,8 +17647,8 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_pass] = ACTIONS(27),
     [anon_sym_break] = ACTIONS(29),
     [anon_sym_continue] = ACTIONS(31),
-    [anon_sym_async] = ACTIONS(317),
-    [anon_sym_match] = ACTIONS(317),
+    [anon_sym_async] = ACTIONS(301),
+    [anon_sym_match] = ACTIONS(301),
     [anon_sym_DASH] = ACTIONS(47),
     [anon_sym_PLUS] = ACTIONS(47),
     [anon_sym_LBRACK] = ACTIONS(49),
@@ -20375,59 +17675,59 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym__string_start] = ACTIONS(81),
   },
   [92] = {
-    [sym__simple_statements] = STATE(531),
-    [sym_import_statement] = STATE(1319),
-    [sym_future_import_statement] = STATE(1319),
-    [sym_import_from_statement] = STATE(1319),
-    [sym_print_statement] = STATE(1319),
-    [sym_assert_statement] = STATE(1319),
-    [sym_expression_statement] = STATE(1319),
-    [sym_named_expression] = STATE(1009),
-    [sym_return_statement] = STATE(1319),
-    [sym_delete_statement] = STATE(1319),
-    [sym_raise_statement] = STATE(1319),
-    [sym_pass_statement] = STATE(1319),
-    [sym_break_statement] = STATE(1319),
-    [sym_continue_statement] = STATE(1319),
-    [sym_list_splat] = STATE(1360),
-    [sym_dictionary_splat] = STATE(1360),
-    [sym_global_statement] = STATE(1319),
-    [sym_nonlocal_statement] = STATE(1319),
-    [sym_exec_statement] = STATE(1319),
-    [sym_type_alias_statement] = STATE(1319),
-    [sym_expression_list] = STATE(1361),
-    [sym_pattern] = STATE(889),
-    [sym_tuple_pattern] = STATE(875),
-    [sym_list_pattern] = STATE(875),
-    [sym_list_splat_pattern] = STATE(875),
-    [sym_expression] = STATE(1019),
-    [sym_primary_expression] = STATE(684),
-    [sym_not_operator] = STATE(1009),
-    [sym_boolean_operator] = STATE(1009),
-    [sym_binary_operator] = STATE(797),
-    [sym_unary_operator] = STATE(797),
-    [sym_comparison_operator] = STATE(1009),
-    [sym_lambda] = STATE(1009),
-    [sym_assignment] = STATE(1361),
-    [sym_augmented_assignment] = STATE(1361),
-    [sym_pattern_list] = STATE(897),
-    [sym_yield] = STATE(1361),
-    [sym_attribute] = STATE(431),
-    [sym_subscript] = STATE(431),
-    [sym_call] = STATE(797),
-    [sym_list] = STATE(797),
-    [sym_set] = STATE(797),
-    [sym_tuple] = STATE(797),
-    [sym_dictionary] = STATE(797),
-    [sym_list_comprehension] = STATE(797),
-    [sym_dictionary_comprehension] = STATE(797),
-    [sym_set_comprehension] = STATE(797),
-    [sym_generator_expression] = STATE(797),
-    [sym_parenthesized_expression] = STATE(797),
-    [sym_conditional_expression] = STATE(1009),
-    [sym_concatenated_string] = STATE(797),
-    [sym_string] = STATE(713),
-    [sym_await] = STATE(1009),
+    [sym__simple_statements] = STATE(491),
+    [sym_import_statement] = STATE(1304),
+    [sym_future_import_statement] = STATE(1304),
+    [sym_import_from_statement] = STATE(1304),
+    [sym_print_statement] = STATE(1304),
+    [sym_assert_statement] = STATE(1304),
+    [sym_expression_statement] = STATE(1304),
+    [sym_named_expression] = STATE(985),
+    [sym_return_statement] = STATE(1304),
+    [sym_delete_statement] = STATE(1304),
+    [sym_raise_statement] = STATE(1304),
+    [sym_pass_statement] = STATE(1304),
+    [sym_break_statement] = STATE(1304),
+    [sym_continue_statement] = STATE(1304),
+    [sym_list_splat] = STATE(1321),
+    [sym_dictionary_splat] = STATE(1321),
+    [sym_global_statement] = STATE(1304),
+    [sym_nonlocal_statement] = STATE(1304),
+    [sym_exec_statement] = STATE(1304),
+    [sym_type_alias_statement] = STATE(1304),
+    [sym_expression_list] = STATE(1313),
+    [sym_pattern] = STATE(871),
+    [sym_tuple_pattern] = STATE(860),
+    [sym_list_pattern] = STATE(860),
+    [sym_list_splat_pattern] = STATE(860),
+    [sym_expression] = STATE(995),
+    [sym_primary_expression] = STATE(707),
+    [sym_not_operator] = STATE(985),
+    [sym_boolean_operator] = STATE(985),
+    [sym_binary_operator] = STATE(759),
+    [sym_unary_operator] = STATE(759),
+    [sym_comparison_operator] = STATE(985),
+    [sym_lambda] = STATE(985),
+    [sym_assignment] = STATE(1313),
+    [sym_augmented_assignment] = STATE(1313),
+    [sym_pattern_list] = STATE(880),
+    [sym_yield] = STATE(1313),
+    [sym_attribute] = STATE(422),
+    [sym_subscript] = STATE(422),
+    [sym_call] = STATE(759),
+    [sym_list] = STATE(759),
+    [sym_set] = STATE(759),
+    [sym_tuple] = STATE(759),
+    [sym_dictionary] = STATE(759),
+    [sym_list_comprehension] = STATE(759),
+    [sym_dictionary_comprehension] = STATE(759),
+    [sym_set_comprehension] = STATE(759),
+    [sym_generator_expression] = STATE(759),
+    [sym_parenthesized_expression] = STATE(759),
+    [sym_conditional_expression] = STATE(985),
+    [sym_concatenated_string] = STATE(759),
+    [sym_string] = STATE(709),
+    [sym_await] = STATE(759),
     [sym_identifier] = ACTIONS(7),
     [anon_sym_import] = ACTIONS(9),
     [anon_sym_from] = ACTIONS(11),
@@ -20441,8 +17741,8 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_pass] = ACTIONS(27),
     [anon_sym_break] = ACTIONS(29),
     [anon_sym_continue] = ACTIONS(31),
-    [anon_sym_async] = ACTIONS(317),
-    [anon_sym_match] = ACTIONS(317),
+    [anon_sym_async] = ACTIONS(301),
+    [anon_sym_match] = ACTIONS(301),
     [anon_sym_DASH] = ACTIONS(47),
     [anon_sym_PLUS] = ACTIONS(47),
     [anon_sym_LBRACK] = ACTIONS(49),
@@ -20469,59 +17769,59 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym__string_start] = ACTIONS(81),
   },
   [93] = {
-    [sym__simple_statements] = STATE(268),
-    [sym_import_statement] = STATE(1209),
-    [sym_future_import_statement] = STATE(1209),
-    [sym_import_from_statement] = STATE(1209),
-    [sym_print_statement] = STATE(1209),
-    [sym_assert_statement] = STATE(1209),
-    [sym_expression_statement] = STATE(1209),
-    [sym_named_expression] = STATE(1009),
-    [sym_return_statement] = STATE(1209),
-    [sym_delete_statement] = STATE(1209),
-    [sym_raise_statement] = STATE(1209),
-    [sym_pass_statement] = STATE(1209),
-    [sym_break_statement] = STATE(1209),
-    [sym_continue_statement] = STATE(1209),
-    [sym_list_splat] = STATE(1360),
-    [sym_dictionary_splat] = STATE(1360),
-    [sym_global_statement] = STATE(1209),
-    [sym_nonlocal_statement] = STATE(1209),
-    [sym_exec_statement] = STATE(1209),
-    [sym_type_alias_statement] = STATE(1209),
-    [sym_expression_list] = STATE(1361),
-    [sym_pattern] = STATE(889),
-    [sym_tuple_pattern] = STATE(875),
-    [sym_list_pattern] = STATE(875),
-    [sym_list_splat_pattern] = STATE(875),
-    [sym_expression] = STATE(1019),
-    [sym_primary_expression] = STATE(684),
-    [sym_not_operator] = STATE(1009),
-    [sym_boolean_operator] = STATE(1009),
-    [sym_binary_operator] = STATE(797),
-    [sym_unary_operator] = STATE(797),
-    [sym_comparison_operator] = STATE(1009),
-    [sym_lambda] = STATE(1009),
-    [sym_assignment] = STATE(1361),
-    [sym_augmented_assignment] = STATE(1361),
-    [sym_pattern_list] = STATE(897),
-    [sym_yield] = STATE(1361),
-    [sym_attribute] = STATE(431),
-    [sym_subscript] = STATE(431),
-    [sym_call] = STATE(797),
-    [sym_list] = STATE(797),
-    [sym_set] = STATE(797),
-    [sym_tuple] = STATE(797),
-    [sym_dictionary] = STATE(797),
-    [sym_list_comprehension] = STATE(797),
-    [sym_dictionary_comprehension] = STATE(797),
-    [sym_set_comprehension] = STATE(797),
-    [sym_generator_expression] = STATE(797),
-    [sym_parenthesized_expression] = STATE(797),
-    [sym_conditional_expression] = STATE(1009),
-    [sym_concatenated_string] = STATE(797),
-    [sym_string] = STATE(713),
-    [sym_await] = STATE(1009),
+    [sym__simple_statements] = STATE(564),
+    [sym_import_statement] = STATE(1213),
+    [sym_future_import_statement] = STATE(1213),
+    [sym_import_from_statement] = STATE(1213),
+    [sym_print_statement] = STATE(1213),
+    [sym_assert_statement] = STATE(1213),
+    [sym_expression_statement] = STATE(1213),
+    [sym_named_expression] = STATE(985),
+    [sym_return_statement] = STATE(1213),
+    [sym_delete_statement] = STATE(1213),
+    [sym_raise_statement] = STATE(1213),
+    [sym_pass_statement] = STATE(1213),
+    [sym_break_statement] = STATE(1213),
+    [sym_continue_statement] = STATE(1213),
+    [sym_list_splat] = STATE(1321),
+    [sym_dictionary_splat] = STATE(1321),
+    [sym_global_statement] = STATE(1213),
+    [sym_nonlocal_statement] = STATE(1213),
+    [sym_exec_statement] = STATE(1213),
+    [sym_type_alias_statement] = STATE(1213),
+    [sym_expression_list] = STATE(1313),
+    [sym_pattern] = STATE(871),
+    [sym_tuple_pattern] = STATE(860),
+    [sym_list_pattern] = STATE(860),
+    [sym_list_splat_pattern] = STATE(860),
+    [sym_expression] = STATE(995),
+    [sym_primary_expression] = STATE(707),
+    [sym_not_operator] = STATE(985),
+    [sym_boolean_operator] = STATE(985),
+    [sym_binary_operator] = STATE(759),
+    [sym_unary_operator] = STATE(759),
+    [sym_comparison_operator] = STATE(985),
+    [sym_lambda] = STATE(985),
+    [sym_assignment] = STATE(1313),
+    [sym_augmented_assignment] = STATE(1313),
+    [sym_pattern_list] = STATE(880),
+    [sym_yield] = STATE(1313),
+    [sym_attribute] = STATE(422),
+    [sym_subscript] = STATE(422),
+    [sym_call] = STATE(759),
+    [sym_list] = STATE(759),
+    [sym_set] = STATE(759),
+    [sym_tuple] = STATE(759),
+    [sym_dictionary] = STATE(759),
+    [sym_list_comprehension] = STATE(759),
+    [sym_dictionary_comprehension] = STATE(759),
+    [sym_set_comprehension] = STATE(759),
+    [sym_generator_expression] = STATE(759),
+    [sym_parenthesized_expression] = STATE(759),
+    [sym_conditional_expression] = STATE(985),
+    [sym_concatenated_string] = STATE(759),
+    [sym_string] = STATE(709),
+    [sym_await] = STATE(759),
     [sym_identifier] = ACTIONS(7),
     [anon_sym_import] = ACTIONS(9),
     [anon_sym_from] = ACTIONS(11),
@@ -20535,8 +17835,8 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_pass] = ACTIONS(27),
     [anon_sym_break] = ACTIONS(29),
     [anon_sym_continue] = ACTIONS(31),
-    [anon_sym_async] = ACTIONS(317),
-    [anon_sym_match] = ACTIONS(317),
+    [anon_sym_async] = ACTIONS(301),
+    [anon_sym_match] = ACTIONS(301),
     [anon_sym_DASH] = ACTIONS(47),
     [anon_sym_PLUS] = ACTIONS(47),
     [anon_sym_LBRACK] = ACTIONS(49),
@@ -20563,59 +17863,59 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym__string_start] = ACTIONS(81),
   },
   [94] = {
-    [sym__simple_statements] = STATE(538),
-    [sym_import_statement] = STATE(1209),
-    [sym_future_import_statement] = STATE(1209),
-    [sym_import_from_statement] = STATE(1209),
-    [sym_print_statement] = STATE(1209),
-    [sym_assert_statement] = STATE(1209),
-    [sym_expression_statement] = STATE(1209),
-    [sym_named_expression] = STATE(1009),
-    [sym_return_statement] = STATE(1209),
-    [sym_delete_statement] = STATE(1209),
-    [sym_raise_statement] = STATE(1209),
-    [sym_pass_statement] = STATE(1209),
-    [sym_break_statement] = STATE(1209),
-    [sym_continue_statement] = STATE(1209),
-    [sym_list_splat] = STATE(1360),
-    [sym_dictionary_splat] = STATE(1360),
-    [sym_global_statement] = STATE(1209),
-    [sym_nonlocal_statement] = STATE(1209),
-    [sym_exec_statement] = STATE(1209),
-    [sym_type_alias_statement] = STATE(1209),
-    [sym_expression_list] = STATE(1361),
-    [sym_pattern] = STATE(889),
-    [sym_tuple_pattern] = STATE(875),
-    [sym_list_pattern] = STATE(875),
-    [sym_list_splat_pattern] = STATE(875),
-    [sym_expression] = STATE(1019),
-    [sym_primary_expression] = STATE(684),
-    [sym_not_operator] = STATE(1009),
-    [sym_boolean_operator] = STATE(1009),
-    [sym_binary_operator] = STATE(797),
-    [sym_unary_operator] = STATE(797),
-    [sym_comparison_operator] = STATE(1009),
-    [sym_lambda] = STATE(1009),
-    [sym_assignment] = STATE(1361),
-    [sym_augmented_assignment] = STATE(1361),
-    [sym_pattern_list] = STATE(897),
-    [sym_yield] = STATE(1361),
-    [sym_attribute] = STATE(431),
-    [sym_subscript] = STATE(431),
-    [sym_call] = STATE(797),
-    [sym_list] = STATE(797),
-    [sym_set] = STATE(797),
-    [sym_tuple] = STATE(797),
-    [sym_dictionary] = STATE(797),
-    [sym_list_comprehension] = STATE(797),
-    [sym_dictionary_comprehension] = STATE(797),
-    [sym_set_comprehension] = STATE(797),
-    [sym_generator_expression] = STATE(797),
-    [sym_parenthesized_expression] = STATE(797),
-    [sym_conditional_expression] = STATE(1009),
-    [sym_concatenated_string] = STATE(797),
-    [sym_string] = STATE(713),
-    [sym_await] = STATE(1009),
+    [sym__simple_statements] = STATE(401),
+    [sym_import_statement] = STATE(1213),
+    [sym_future_import_statement] = STATE(1213),
+    [sym_import_from_statement] = STATE(1213),
+    [sym_print_statement] = STATE(1213),
+    [sym_assert_statement] = STATE(1213),
+    [sym_expression_statement] = STATE(1213),
+    [sym_named_expression] = STATE(985),
+    [sym_return_statement] = STATE(1213),
+    [sym_delete_statement] = STATE(1213),
+    [sym_raise_statement] = STATE(1213),
+    [sym_pass_statement] = STATE(1213),
+    [sym_break_statement] = STATE(1213),
+    [sym_continue_statement] = STATE(1213),
+    [sym_list_splat] = STATE(1321),
+    [sym_dictionary_splat] = STATE(1321),
+    [sym_global_statement] = STATE(1213),
+    [sym_nonlocal_statement] = STATE(1213),
+    [sym_exec_statement] = STATE(1213),
+    [sym_type_alias_statement] = STATE(1213),
+    [sym_expression_list] = STATE(1313),
+    [sym_pattern] = STATE(871),
+    [sym_tuple_pattern] = STATE(860),
+    [sym_list_pattern] = STATE(860),
+    [sym_list_splat_pattern] = STATE(860),
+    [sym_expression] = STATE(995),
+    [sym_primary_expression] = STATE(707),
+    [sym_not_operator] = STATE(985),
+    [sym_boolean_operator] = STATE(985),
+    [sym_binary_operator] = STATE(759),
+    [sym_unary_operator] = STATE(759),
+    [sym_comparison_operator] = STATE(985),
+    [sym_lambda] = STATE(985),
+    [sym_assignment] = STATE(1313),
+    [sym_augmented_assignment] = STATE(1313),
+    [sym_pattern_list] = STATE(880),
+    [sym_yield] = STATE(1313),
+    [sym_attribute] = STATE(422),
+    [sym_subscript] = STATE(422),
+    [sym_call] = STATE(759),
+    [sym_list] = STATE(759),
+    [sym_set] = STATE(759),
+    [sym_tuple] = STATE(759),
+    [sym_dictionary] = STATE(759),
+    [sym_list_comprehension] = STATE(759),
+    [sym_dictionary_comprehension] = STATE(759),
+    [sym_set_comprehension] = STATE(759),
+    [sym_generator_expression] = STATE(759),
+    [sym_parenthesized_expression] = STATE(759),
+    [sym_conditional_expression] = STATE(985),
+    [sym_concatenated_string] = STATE(759),
+    [sym_string] = STATE(709),
+    [sym_await] = STATE(759),
     [sym_identifier] = ACTIONS(7),
     [anon_sym_import] = ACTIONS(9),
     [anon_sym_from] = ACTIONS(11),
@@ -20629,8 +17929,8 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_pass] = ACTIONS(27),
     [anon_sym_break] = ACTIONS(29),
     [anon_sym_continue] = ACTIONS(31),
-    [anon_sym_async] = ACTIONS(317),
-    [anon_sym_match] = ACTIONS(317),
+    [anon_sym_async] = ACTIONS(301),
+    [anon_sym_match] = ACTIONS(301),
     [anon_sym_DASH] = ACTIONS(47),
     [anon_sym_PLUS] = ACTIONS(47),
     [anon_sym_LBRACK] = ACTIONS(49),
@@ -20657,59 +17957,59 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym__string_start] = ACTIONS(81),
   },
   [95] = {
-    [sym__simple_statements] = STATE(594),
-    [sym_import_statement] = STATE(1319),
-    [sym_future_import_statement] = STATE(1319),
-    [sym_import_from_statement] = STATE(1319),
-    [sym_print_statement] = STATE(1319),
-    [sym_assert_statement] = STATE(1319),
-    [sym_expression_statement] = STATE(1319),
-    [sym_named_expression] = STATE(1009),
-    [sym_return_statement] = STATE(1319),
-    [sym_delete_statement] = STATE(1319),
-    [sym_raise_statement] = STATE(1319),
-    [sym_pass_statement] = STATE(1319),
-    [sym_break_statement] = STATE(1319),
-    [sym_continue_statement] = STATE(1319),
-    [sym_list_splat] = STATE(1360),
-    [sym_dictionary_splat] = STATE(1360),
-    [sym_global_statement] = STATE(1319),
-    [sym_nonlocal_statement] = STATE(1319),
-    [sym_exec_statement] = STATE(1319),
-    [sym_type_alias_statement] = STATE(1319),
-    [sym_expression_list] = STATE(1361),
-    [sym_pattern] = STATE(889),
-    [sym_tuple_pattern] = STATE(875),
-    [sym_list_pattern] = STATE(875),
-    [sym_list_splat_pattern] = STATE(875),
-    [sym_expression] = STATE(1019),
-    [sym_primary_expression] = STATE(684),
-    [sym_not_operator] = STATE(1009),
-    [sym_boolean_operator] = STATE(1009),
-    [sym_binary_operator] = STATE(797),
-    [sym_unary_operator] = STATE(797),
-    [sym_comparison_operator] = STATE(1009),
-    [sym_lambda] = STATE(1009),
-    [sym_assignment] = STATE(1361),
-    [sym_augmented_assignment] = STATE(1361),
-    [sym_pattern_list] = STATE(897),
-    [sym_yield] = STATE(1361),
-    [sym_attribute] = STATE(431),
-    [sym_subscript] = STATE(431),
-    [sym_call] = STATE(797),
-    [sym_list] = STATE(797),
-    [sym_set] = STATE(797),
-    [sym_tuple] = STATE(797),
-    [sym_dictionary] = STATE(797),
-    [sym_list_comprehension] = STATE(797),
-    [sym_dictionary_comprehension] = STATE(797),
-    [sym_set_comprehension] = STATE(797),
-    [sym_generator_expression] = STATE(797),
-    [sym_parenthesized_expression] = STATE(797),
-    [sym_conditional_expression] = STATE(1009),
-    [sym_concatenated_string] = STATE(797),
-    [sym_string] = STATE(713),
-    [sym_await] = STATE(1009),
+    [sym__simple_statements] = STATE(325),
+    [sym_import_statement] = STATE(1213),
+    [sym_future_import_statement] = STATE(1213),
+    [sym_import_from_statement] = STATE(1213),
+    [sym_print_statement] = STATE(1213),
+    [sym_assert_statement] = STATE(1213),
+    [sym_expression_statement] = STATE(1213),
+    [sym_named_expression] = STATE(985),
+    [sym_return_statement] = STATE(1213),
+    [sym_delete_statement] = STATE(1213),
+    [sym_raise_statement] = STATE(1213),
+    [sym_pass_statement] = STATE(1213),
+    [sym_break_statement] = STATE(1213),
+    [sym_continue_statement] = STATE(1213),
+    [sym_list_splat] = STATE(1321),
+    [sym_dictionary_splat] = STATE(1321),
+    [sym_global_statement] = STATE(1213),
+    [sym_nonlocal_statement] = STATE(1213),
+    [sym_exec_statement] = STATE(1213),
+    [sym_type_alias_statement] = STATE(1213),
+    [sym_expression_list] = STATE(1313),
+    [sym_pattern] = STATE(871),
+    [sym_tuple_pattern] = STATE(860),
+    [sym_list_pattern] = STATE(860),
+    [sym_list_splat_pattern] = STATE(860),
+    [sym_expression] = STATE(995),
+    [sym_primary_expression] = STATE(707),
+    [sym_not_operator] = STATE(985),
+    [sym_boolean_operator] = STATE(985),
+    [sym_binary_operator] = STATE(759),
+    [sym_unary_operator] = STATE(759),
+    [sym_comparison_operator] = STATE(985),
+    [sym_lambda] = STATE(985),
+    [sym_assignment] = STATE(1313),
+    [sym_augmented_assignment] = STATE(1313),
+    [sym_pattern_list] = STATE(880),
+    [sym_yield] = STATE(1313),
+    [sym_attribute] = STATE(422),
+    [sym_subscript] = STATE(422),
+    [sym_call] = STATE(759),
+    [sym_list] = STATE(759),
+    [sym_set] = STATE(759),
+    [sym_tuple] = STATE(759),
+    [sym_dictionary] = STATE(759),
+    [sym_list_comprehension] = STATE(759),
+    [sym_dictionary_comprehension] = STATE(759),
+    [sym_set_comprehension] = STATE(759),
+    [sym_generator_expression] = STATE(759),
+    [sym_parenthesized_expression] = STATE(759),
+    [sym_conditional_expression] = STATE(985),
+    [sym_concatenated_string] = STATE(759),
+    [sym_string] = STATE(709),
+    [sym_await] = STATE(759),
     [sym_identifier] = ACTIONS(7),
     [anon_sym_import] = ACTIONS(9),
     [anon_sym_from] = ACTIONS(11),
@@ -20723,8 +18023,8 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_pass] = ACTIONS(27),
     [anon_sym_break] = ACTIONS(29),
     [anon_sym_continue] = ACTIONS(31),
-    [anon_sym_async] = ACTIONS(317),
-    [anon_sym_match] = ACTIONS(317),
+    [anon_sym_async] = ACTIONS(301),
+    [anon_sym_match] = ACTIONS(301),
     [anon_sym_DASH] = ACTIONS(47),
     [anon_sym_PLUS] = ACTIONS(47),
     [anon_sym_LBRACK] = ACTIONS(49),
@@ -20751,59 +18051,59 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym__string_start] = ACTIONS(81),
   },
   [96] = {
-    [sym__simple_statements] = STATE(965),
-    [sym_import_statement] = STATE(1214),
-    [sym_future_import_statement] = STATE(1214),
-    [sym_import_from_statement] = STATE(1214),
-    [sym_print_statement] = STATE(1214),
-    [sym_assert_statement] = STATE(1214),
-    [sym_expression_statement] = STATE(1214),
-    [sym_named_expression] = STATE(1009),
-    [sym_return_statement] = STATE(1214),
-    [sym_delete_statement] = STATE(1214),
-    [sym_raise_statement] = STATE(1214),
-    [sym_pass_statement] = STATE(1214),
-    [sym_break_statement] = STATE(1214),
-    [sym_continue_statement] = STATE(1214),
-    [sym_list_splat] = STATE(1360),
-    [sym_dictionary_splat] = STATE(1360),
-    [sym_global_statement] = STATE(1214),
-    [sym_nonlocal_statement] = STATE(1214),
-    [sym_exec_statement] = STATE(1214),
-    [sym_type_alias_statement] = STATE(1214),
-    [sym_expression_list] = STATE(1361),
-    [sym_pattern] = STATE(889),
-    [sym_tuple_pattern] = STATE(875),
-    [sym_list_pattern] = STATE(875),
-    [sym_list_splat_pattern] = STATE(875),
-    [sym_expression] = STATE(1019),
-    [sym_primary_expression] = STATE(684),
-    [sym_not_operator] = STATE(1009),
-    [sym_boolean_operator] = STATE(1009),
-    [sym_binary_operator] = STATE(797),
-    [sym_unary_operator] = STATE(797),
-    [sym_comparison_operator] = STATE(1009),
-    [sym_lambda] = STATE(1009),
-    [sym_assignment] = STATE(1361),
-    [sym_augmented_assignment] = STATE(1361),
-    [sym_pattern_list] = STATE(897),
-    [sym_yield] = STATE(1361),
-    [sym_attribute] = STATE(431),
-    [sym_subscript] = STATE(431),
-    [sym_call] = STATE(797),
-    [sym_list] = STATE(797),
-    [sym_set] = STATE(797),
-    [sym_tuple] = STATE(797),
-    [sym_dictionary] = STATE(797),
-    [sym_list_comprehension] = STATE(797),
-    [sym_dictionary_comprehension] = STATE(797),
-    [sym_set_comprehension] = STATE(797),
-    [sym_generator_expression] = STATE(797),
-    [sym_parenthesized_expression] = STATE(797),
-    [sym_conditional_expression] = STATE(1009),
-    [sym_concatenated_string] = STATE(797),
-    [sym_string] = STATE(713),
-    [sym_await] = STATE(1009),
+    [sym__simple_statements] = STATE(559),
+    [sym_import_statement] = STATE(1213),
+    [sym_future_import_statement] = STATE(1213),
+    [sym_import_from_statement] = STATE(1213),
+    [sym_print_statement] = STATE(1213),
+    [sym_assert_statement] = STATE(1213),
+    [sym_expression_statement] = STATE(1213),
+    [sym_named_expression] = STATE(985),
+    [sym_return_statement] = STATE(1213),
+    [sym_delete_statement] = STATE(1213),
+    [sym_raise_statement] = STATE(1213),
+    [sym_pass_statement] = STATE(1213),
+    [sym_break_statement] = STATE(1213),
+    [sym_continue_statement] = STATE(1213),
+    [sym_list_splat] = STATE(1321),
+    [sym_dictionary_splat] = STATE(1321),
+    [sym_global_statement] = STATE(1213),
+    [sym_nonlocal_statement] = STATE(1213),
+    [sym_exec_statement] = STATE(1213),
+    [sym_type_alias_statement] = STATE(1213),
+    [sym_expression_list] = STATE(1313),
+    [sym_pattern] = STATE(871),
+    [sym_tuple_pattern] = STATE(860),
+    [sym_list_pattern] = STATE(860),
+    [sym_list_splat_pattern] = STATE(860),
+    [sym_expression] = STATE(995),
+    [sym_primary_expression] = STATE(707),
+    [sym_not_operator] = STATE(985),
+    [sym_boolean_operator] = STATE(985),
+    [sym_binary_operator] = STATE(759),
+    [sym_unary_operator] = STATE(759),
+    [sym_comparison_operator] = STATE(985),
+    [sym_lambda] = STATE(985),
+    [sym_assignment] = STATE(1313),
+    [sym_augmented_assignment] = STATE(1313),
+    [sym_pattern_list] = STATE(880),
+    [sym_yield] = STATE(1313),
+    [sym_attribute] = STATE(422),
+    [sym_subscript] = STATE(422),
+    [sym_call] = STATE(759),
+    [sym_list] = STATE(759),
+    [sym_set] = STATE(759),
+    [sym_tuple] = STATE(759),
+    [sym_dictionary] = STATE(759),
+    [sym_list_comprehension] = STATE(759),
+    [sym_dictionary_comprehension] = STATE(759),
+    [sym_set_comprehension] = STATE(759),
+    [sym_generator_expression] = STATE(759),
+    [sym_parenthesized_expression] = STATE(759),
+    [sym_conditional_expression] = STATE(985),
+    [sym_concatenated_string] = STATE(759),
+    [sym_string] = STATE(709),
+    [sym_await] = STATE(759),
     [sym_identifier] = ACTIONS(7),
     [anon_sym_import] = ACTIONS(9),
     [anon_sym_from] = ACTIONS(11),
@@ -20817,8 +18117,8 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_pass] = ACTIONS(27),
     [anon_sym_break] = ACTIONS(29),
     [anon_sym_continue] = ACTIONS(31),
-    [anon_sym_async] = ACTIONS(317),
-    [anon_sym_match] = ACTIONS(317),
+    [anon_sym_async] = ACTIONS(301),
+    [anon_sym_match] = ACTIONS(301),
     [anon_sym_DASH] = ACTIONS(47),
     [anon_sym_PLUS] = ACTIONS(47),
     [anon_sym_LBRACK] = ACTIONS(49),
@@ -20845,59 +18145,59 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym__string_start] = ACTIONS(81),
   },
   [97] = {
-    [sym__simple_statements] = STATE(464),
-    [sym_import_statement] = STATE(1319),
-    [sym_future_import_statement] = STATE(1319),
-    [sym_import_from_statement] = STATE(1319),
-    [sym_print_statement] = STATE(1319),
-    [sym_assert_statement] = STATE(1319),
-    [sym_expression_statement] = STATE(1319),
-    [sym_named_expression] = STATE(1009),
-    [sym_return_statement] = STATE(1319),
-    [sym_delete_statement] = STATE(1319),
-    [sym_raise_statement] = STATE(1319),
-    [sym_pass_statement] = STATE(1319),
-    [sym_break_statement] = STATE(1319),
-    [sym_continue_statement] = STATE(1319),
-    [sym_list_splat] = STATE(1360),
-    [sym_dictionary_splat] = STATE(1360),
-    [sym_global_statement] = STATE(1319),
-    [sym_nonlocal_statement] = STATE(1319),
-    [sym_exec_statement] = STATE(1319),
-    [sym_type_alias_statement] = STATE(1319),
-    [sym_expression_list] = STATE(1361),
-    [sym_pattern] = STATE(889),
-    [sym_tuple_pattern] = STATE(875),
-    [sym_list_pattern] = STATE(875),
-    [sym_list_splat_pattern] = STATE(875),
-    [sym_expression] = STATE(1019),
-    [sym_primary_expression] = STATE(684),
-    [sym_not_operator] = STATE(1009),
-    [sym_boolean_operator] = STATE(1009),
-    [sym_binary_operator] = STATE(797),
-    [sym_unary_operator] = STATE(797),
-    [sym_comparison_operator] = STATE(1009),
-    [sym_lambda] = STATE(1009),
-    [sym_assignment] = STATE(1361),
-    [sym_augmented_assignment] = STATE(1361),
-    [sym_pattern_list] = STATE(897),
-    [sym_yield] = STATE(1361),
-    [sym_attribute] = STATE(431),
-    [sym_subscript] = STATE(431),
-    [sym_call] = STATE(797),
-    [sym_list] = STATE(797),
-    [sym_set] = STATE(797),
-    [sym_tuple] = STATE(797),
-    [sym_dictionary] = STATE(797),
-    [sym_list_comprehension] = STATE(797),
-    [sym_dictionary_comprehension] = STATE(797),
-    [sym_set_comprehension] = STATE(797),
-    [sym_generator_expression] = STATE(797),
-    [sym_parenthesized_expression] = STATE(797),
-    [sym_conditional_expression] = STATE(1009),
-    [sym_concatenated_string] = STATE(797),
-    [sym_string] = STATE(713),
-    [sym_await] = STATE(1009),
+    [sym__simple_statements] = STATE(458),
+    [sym_import_statement] = STATE(1304),
+    [sym_future_import_statement] = STATE(1304),
+    [sym_import_from_statement] = STATE(1304),
+    [sym_print_statement] = STATE(1304),
+    [sym_assert_statement] = STATE(1304),
+    [sym_expression_statement] = STATE(1304),
+    [sym_named_expression] = STATE(985),
+    [sym_return_statement] = STATE(1304),
+    [sym_delete_statement] = STATE(1304),
+    [sym_raise_statement] = STATE(1304),
+    [sym_pass_statement] = STATE(1304),
+    [sym_break_statement] = STATE(1304),
+    [sym_continue_statement] = STATE(1304),
+    [sym_list_splat] = STATE(1321),
+    [sym_dictionary_splat] = STATE(1321),
+    [sym_global_statement] = STATE(1304),
+    [sym_nonlocal_statement] = STATE(1304),
+    [sym_exec_statement] = STATE(1304),
+    [sym_type_alias_statement] = STATE(1304),
+    [sym_expression_list] = STATE(1313),
+    [sym_pattern] = STATE(871),
+    [sym_tuple_pattern] = STATE(860),
+    [sym_list_pattern] = STATE(860),
+    [sym_list_splat_pattern] = STATE(860),
+    [sym_expression] = STATE(995),
+    [sym_primary_expression] = STATE(707),
+    [sym_not_operator] = STATE(985),
+    [sym_boolean_operator] = STATE(985),
+    [sym_binary_operator] = STATE(759),
+    [sym_unary_operator] = STATE(759),
+    [sym_comparison_operator] = STATE(985),
+    [sym_lambda] = STATE(985),
+    [sym_assignment] = STATE(1313),
+    [sym_augmented_assignment] = STATE(1313),
+    [sym_pattern_list] = STATE(880),
+    [sym_yield] = STATE(1313),
+    [sym_attribute] = STATE(422),
+    [sym_subscript] = STATE(422),
+    [sym_call] = STATE(759),
+    [sym_list] = STATE(759),
+    [sym_set] = STATE(759),
+    [sym_tuple] = STATE(759),
+    [sym_dictionary] = STATE(759),
+    [sym_list_comprehension] = STATE(759),
+    [sym_dictionary_comprehension] = STATE(759),
+    [sym_set_comprehension] = STATE(759),
+    [sym_generator_expression] = STATE(759),
+    [sym_parenthesized_expression] = STATE(759),
+    [sym_conditional_expression] = STATE(985),
+    [sym_concatenated_string] = STATE(759),
+    [sym_string] = STATE(709),
+    [sym_await] = STATE(759),
     [sym_identifier] = ACTIONS(7),
     [anon_sym_import] = ACTIONS(9),
     [anon_sym_from] = ACTIONS(11),
@@ -20911,8 +18211,8 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_pass] = ACTIONS(27),
     [anon_sym_break] = ACTIONS(29),
     [anon_sym_continue] = ACTIONS(31),
-    [anon_sym_async] = ACTIONS(317),
-    [anon_sym_match] = ACTIONS(317),
+    [anon_sym_async] = ACTIONS(301),
+    [anon_sym_match] = ACTIONS(301),
     [anon_sym_DASH] = ACTIONS(47),
     [anon_sym_PLUS] = ACTIONS(47),
     [anon_sym_LBRACK] = ACTIONS(49),
@@ -20939,59 +18239,59 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym__string_start] = ACTIONS(81),
   },
   [98] = {
-    [sym__simple_statements] = STATE(353),
-    [sym_import_statement] = STATE(1244),
-    [sym_future_import_statement] = STATE(1244),
-    [sym_import_from_statement] = STATE(1244),
-    [sym_print_statement] = STATE(1244),
-    [sym_assert_statement] = STATE(1244),
-    [sym_expression_statement] = STATE(1244),
-    [sym_named_expression] = STATE(1009),
-    [sym_return_statement] = STATE(1244),
-    [sym_delete_statement] = STATE(1244),
-    [sym_raise_statement] = STATE(1244),
-    [sym_pass_statement] = STATE(1244),
-    [sym_break_statement] = STATE(1244),
-    [sym_continue_statement] = STATE(1244),
-    [sym_list_splat] = STATE(1360),
-    [sym_dictionary_splat] = STATE(1360),
-    [sym_global_statement] = STATE(1244),
-    [sym_nonlocal_statement] = STATE(1244),
-    [sym_exec_statement] = STATE(1244),
-    [sym_type_alias_statement] = STATE(1244),
-    [sym_expression_list] = STATE(1361),
-    [sym_pattern] = STATE(889),
-    [sym_tuple_pattern] = STATE(875),
-    [sym_list_pattern] = STATE(875),
-    [sym_list_splat_pattern] = STATE(875),
-    [sym_expression] = STATE(1019),
-    [sym_primary_expression] = STATE(684),
-    [sym_not_operator] = STATE(1009),
-    [sym_boolean_operator] = STATE(1009),
-    [sym_binary_operator] = STATE(797),
-    [sym_unary_operator] = STATE(797),
-    [sym_comparison_operator] = STATE(1009),
-    [sym_lambda] = STATE(1009),
-    [sym_assignment] = STATE(1361),
-    [sym_augmented_assignment] = STATE(1361),
-    [sym_pattern_list] = STATE(897),
-    [sym_yield] = STATE(1361),
-    [sym_attribute] = STATE(431),
-    [sym_subscript] = STATE(431),
-    [sym_call] = STATE(797),
-    [sym_list] = STATE(797),
-    [sym_set] = STATE(797),
-    [sym_tuple] = STATE(797),
-    [sym_dictionary] = STATE(797),
-    [sym_list_comprehension] = STATE(797),
-    [sym_dictionary_comprehension] = STATE(797),
-    [sym_set_comprehension] = STATE(797),
-    [sym_generator_expression] = STATE(797),
-    [sym_parenthesized_expression] = STATE(797),
-    [sym_conditional_expression] = STATE(1009),
-    [sym_concatenated_string] = STATE(797),
-    [sym_string] = STATE(713),
-    [sym_await] = STATE(1009),
+    [sym__simple_statements] = STATE(569),
+    [sym_import_statement] = STATE(1304),
+    [sym_future_import_statement] = STATE(1304),
+    [sym_import_from_statement] = STATE(1304),
+    [sym_print_statement] = STATE(1304),
+    [sym_assert_statement] = STATE(1304),
+    [sym_expression_statement] = STATE(1304),
+    [sym_named_expression] = STATE(985),
+    [sym_return_statement] = STATE(1304),
+    [sym_delete_statement] = STATE(1304),
+    [sym_raise_statement] = STATE(1304),
+    [sym_pass_statement] = STATE(1304),
+    [sym_break_statement] = STATE(1304),
+    [sym_continue_statement] = STATE(1304),
+    [sym_list_splat] = STATE(1321),
+    [sym_dictionary_splat] = STATE(1321),
+    [sym_global_statement] = STATE(1304),
+    [sym_nonlocal_statement] = STATE(1304),
+    [sym_exec_statement] = STATE(1304),
+    [sym_type_alias_statement] = STATE(1304),
+    [sym_expression_list] = STATE(1313),
+    [sym_pattern] = STATE(871),
+    [sym_tuple_pattern] = STATE(860),
+    [sym_list_pattern] = STATE(860),
+    [sym_list_splat_pattern] = STATE(860),
+    [sym_expression] = STATE(995),
+    [sym_primary_expression] = STATE(707),
+    [sym_not_operator] = STATE(985),
+    [sym_boolean_operator] = STATE(985),
+    [sym_binary_operator] = STATE(759),
+    [sym_unary_operator] = STATE(759),
+    [sym_comparison_operator] = STATE(985),
+    [sym_lambda] = STATE(985),
+    [sym_assignment] = STATE(1313),
+    [sym_augmented_assignment] = STATE(1313),
+    [sym_pattern_list] = STATE(880),
+    [sym_yield] = STATE(1313),
+    [sym_attribute] = STATE(422),
+    [sym_subscript] = STATE(422),
+    [sym_call] = STATE(759),
+    [sym_list] = STATE(759),
+    [sym_set] = STATE(759),
+    [sym_tuple] = STATE(759),
+    [sym_dictionary] = STATE(759),
+    [sym_list_comprehension] = STATE(759),
+    [sym_dictionary_comprehension] = STATE(759),
+    [sym_set_comprehension] = STATE(759),
+    [sym_generator_expression] = STATE(759),
+    [sym_parenthesized_expression] = STATE(759),
+    [sym_conditional_expression] = STATE(985),
+    [sym_concatenated_string] = STATE(759),
+    [sym_string] = STATE(709),
+    [sym_await] = STATE(759),
     [sym_identifier] = ACTIONS(7),
     [anon_sym_import] = ACTIONS(9),
     [anon_sym_from] = ACTIONS(11),
@@ -21005,8 +18305,8 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_pass] = ACTIONS(27),
     [anon_sym_break] = ACTIONS(29),
     [anon_sym_continue] = ACTIONS(31),
-    [anon_sym_async] = ACTIONS(317),
-    [anon_sym_match] = ACTIONS(317),
+    [anon_sym_async] = ACTIONS(301),
+    [anon_sym_match] = ACTIONS(301),
     [anon_sym_DASH] = ACTIONS(47),
     [anon_sym_PLUS] = ACTIONS(47),
     [anon_sym_LBRACK] = ACTIONS(49),
@@ -21033,59 +18333,59 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym__string_start] = ACTIONS(81),
   },
   [99] = {
-    [sym__simple_statements] = STATE(542),
-    [sym_import_statement] = STATE(1209),
-    [sym_future_import_statement] = STATE(1209),
-    [sym_import_from_statement] = STATE(1209),
-    [sym_print_statement] = STATE(1209),
-    [sym_assert_statement] = STATE(1209),
-    [sym_expression_statement] = STATE(1209),
-    [sym_named_expression] = STATE(1009),
-    [sym_return_statement] = STATE(1209),
-    [sym_delete_statement] = STATE(1209),
-    [sym_raise_statement] = STATE(1209),
-    [sym_pass_statement] = STATE(1209),
-    [sym_break_statement] = STATE(1209),
-    [sym_continue_statement] = STATE(1209),
-    [sym_list_splat] = STATE(1360),
-    [sym_dictionary_splat] = STATE(1360),
-    [sym_global_statement] = STATE(1209),
-    [sym_nonlocal_statement] = STATE(1209),
-    [sym_exec_statement] = STATE(1209),
-    [sym_type_alias_statement] = STATE(1209),
-    [sym_expression_list] = STATE(1361),
-    [sym_pattern] = STATE(889),
-    [sym_tuple_pattern] = STATE(875),
-    [sym_list_pattern] = STATE(875),
-    [sym_list_splat_pattern] = STATE(875),
-    [sym_expression] = STATE(1019),
-    [sym_primary_expression] = STATE(684),
-    [sym_not_operator] = STATE(1009),
-    [sym_boolean_operator] = STATE(1009),
-    [sym_binary_operator] = STATE(797),
-    [sym_unary_operator] = STATE(797),
-    [sym_comparison_operator] = STATE(1009),
-    [sym_lambda] = STATE(1009),
-    [sym_assignment] = STATE(1361),
-    [sym_augmented_assignment] = STATE(1361),
-    [sym_pattern_list] = STATE(897),
-    [sym_yield] = STATE(1361),
-    [sym_attribute] = STATE(431),
-    [sym_subscript] = STATE(431),
-    [sym_call] = STATE(797),
-    [sym_list] = STATE(797),
-    [sym_set] = STATE(797),
-    [sym_tuple] = STATE(797),
-    [sym_dictionary] = STATE(797),
-    [sym_list_comprehension] = STATE(797),
-    [sym_dictionary_comprehension] = STATE(797),
-    [sym_set_comprehension] = STATE(797),
-    [sym_generator_expression] = STATE(797),
-    [sym_parenthesized_expression] = STATE(797),
-    [sym_conditional_expression] = STATE(1009),
-    [sym_concatenated_string] = STATE(797),
-    [sym_string] = STATE(713),
-    [sym_await] = STATE(1009),
+    [sym__simple_statements] = STATE(468),
+    [sym_import_statement] = STATE(1304),
+    [sym_future_import_statement] = STATE(1304),
+    [sym_import_from_statement] = STATE(1304),
+    [sym_print_statement] = STATE(1304),
+    [sym_assert_statement] = STATE(1304),
+    [sym_expression_statement] = STATE(1304),
+    [sym_named_expression] = STATE(985),
+    [sym_return_statement] = STATE(1304),
+    [sym_delete_statement] = STATE(1304),
+    [sym_raise_statement] = STATE(1304),
+    [sym_pass_statement] = STATE(1304),
+    [sym_break_statement] = STATE(1304),
+    [sym_continue_statement] = STATE(1304),
+    [sym_list_splat] = STATE(1321),
+    [sym_dictionary_splat] = STATE(1321),
+    [sym_global_statement] = STATE(1304),
+    [sym_nonlocal_statement] = STATE(1304),
+    [sym_exec_statement] = STATE(1304),
+    [sym_type_alias_statement] = STATE(1304),
+    [sym_expression_list] = STATE(1313),
+    [sym_pattern] = STATE(871),
+    [sym_tuple_pattern] = STATE(860),
+    [sym_list_pattern] = STATE(860),
+    [sym_list_splat_pattern] = STATE(860),
+    [sym_expression] = STATE(995),
+    [sym_primary_expression] = STATE(707),
+    [sym_not_operator] = STATE(985),
+    [sym_boolean_operator] = STATE(985),
+    [sym_binary_operator] = STATE(759),
+    [sym_unary_operator] = STATE(759),
+    [sym_comparison_operator] = STATE(985),
+    [sym_lambda] = STATE(985),
+    [sym_assignment] = STATE(1313),
+    [sym_augmented_assignment] = STATE(1313),
+    [sym_pattern_list] = STATE(880),
+    [sym_yield] = STATE(1313),
+    [sym_attribute] = STATE(422),
+    [sym_subscript] = STATE(422),
+    [sym_call] = STATE(759),
+    [sym_list] = STATE(759),
+    [sym_set] = STATE(759),
+    [sym_tuple] = STATE(759),
+    [sym_dictionary] = STATE(759),
+    [sym_list_comprehension] = STATE(759),
+    [sym_dictionary_comprehension] = STATE(759),
+    [sym_set_comprehension] = STATE(759),
+    [sym_generator_expression] = STATE(759),
+    [sym_parenthesized_expression] = STATE(759),
+    [sym_conditional_expression] = STATE(985),
+    [sym_concatenated_string] = STATE(759),
+    [sym_string] = STATE(709),
+    [sym_await] = STATE(759),
     [sym_identifier] = ACTIONS(7),
     [anon_sym_import] = ACTIONS(9),
     [anon_sym_from] = ACTIONS(11),
@@ -21099,8 +18399,8 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_pass] = ACTIONS(27),
     [anon_sym_break] = ACTIONS(29),
     [anon_sym_continue] = ACTIONS(31),
-    [anon_sym_async] = ACTIONS(317),
-    [anon_sym_match] = ACTIONS(317),
+    [anon_sym_async] = ACTIONS(301),
+    [anon_sym_match] = ACTIONS(301),
     [anon_sym_DASH] = ACTIONS(47),
     [anon_sym_PLUS] = ACTIONS(47),
     [anon_sym_LBRACK] = ACTIONS(49),
@@ -21127,59 +18427,59 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym__string_start] = ACTIONS(81),
   },
   [100] = {
-    [sym__simple_statements] = STATE(331),
-    [sym_import_statement] = STATE(1248),
-    [sym_future_import_statement] = STATE(1248),
-    [sym_import_from_statement] = STATE(1248),
-    [sym_print_statement] = STATE(1248),
-    [sym_assert_statement] = STATE(1248),
-    [sym_expression_statement] = STATE(1248),
-    [sym_named_expression] = STATE(1009),
-    [sym_return_statement] = STATE(1248),
-    [sym_delete_statement] = STATE(1248),
-    [sym_raise_statement] = STATE(1248),
-    [sym_pass_statement] = STATE(1248),
-    [sym_break_statement] = STATE(1248),
-    [sym_continue_statement] = STATE(1248),
-    [sym_list_splat] = STATE(1360),
-    [sym_dictionary_splat] = STATE(1360),
-    [sym_global_statement] = STATE(1248),
-    [sym_nonlocal_statement] = STATE(1248),
-    [sym_exec_statement] = STATE(1248),
-    [sym_type_alias_statement] = STATE(1248),
-    [sym_expression_list] = STATE(1361),
-    [sym_pattern] = STATE(889),
-    [sym_tuple_pattern] = STATE(875),
-    [sym_list_pattern] = STATE(875),
-    [sym_list_splat_pattern] = STATE(875),
-    [sym_expression] = STATE(1019),
-    [sym_primary_expression] = STATE(684),
-    [sym_not_operator] = STATE(1009),
-    [sym_boolean_operator] = STATE(1009),
-    [sym_binary_operator] = STATE(797),
-    [sym_unary_operator] = STATE(797),
-    [sym_comparison_operator] = STATE(1009),
-    [sym_lambda] = STATE(1009),
-    [sym_assignment] = STATE(1361),
-    [sym_augmented_assignment] = STATE(1361),
-    [sym_pattern_list] = STATE(897),
-    [sym_yield] = STATE(1361),
-    [sym_attribute] = STATE(431),
-    [sym_subscript] = STATE(431),
-    [sym_call] = STATE(797),
-    [sym_list] = STATE(797),
-    [sym_set] = STATE(797),
-    [sym_tuple] = STATE(797),
-    [sym_dictionary] = STATE(797),
-    [sym_list_comprehension] = STATE(797),
-    [sym_dictionary_comprehension] = STATE(797),
-    [sym_set_comprehension] = STATE(797),
-    [sym_generator_expression] = STATE(797),
-    [sym_parenthesized_expression] = STATE(797),
-    [sym_conditional_expression] = STATE(1009),
-    [sym_concatenated_string] = STATE(797),
-    [sym_string] = STATE(713),
-    [sym_await] = STATE(1009),
+    [sym__simple_statements] = STATE(570),
+    [sym_import_statement] = STATE(1213),
+    [sym_future_import_statement] = STATE(1213),
+    [sym_import_from_statement] = STATE(1213),
+    [sym_print_statement] = STATE(1213),
+    [sym_assert_statement] = STATE(1213),
+    [sym_expression_statement] = STATE(1213),
+    [sym_named_expression] = STATE(985),
+    [sym_return_statement] = STATE(1213),
+    [sym_delete_statement] = STATE(1213),
+    [sym_raise_statement] = STATE(1213),
+    [sym_pass_statement] = STATE(1213),
+    [sym_break_statement] = STATE(1213),
+    [sym_continue_statement] = STATE(1213),
+    [sym_list_splat] = STATE(1321),
+    [sym_dictionary_splat] = STATE(1321),
+    [sym_global_statement] = STATE(1213),
+    [sym_nonlocal_statement] = STATE(1213),
+    [sym_exec_statement] = STATE(1213),
+    [sym_type_alias_statement] = STATE(1213),
+    [sym_expression_list] = STATE(1313),
+    [sym_pattern] = STATE(871),
+    [sym_tuple_pattern] = STATE(860),
+    [sym_list_pattern] = STATE(860),
+    [sym_list_splat_pattern] = STATE(860),
+    [sym_expression] = STATE(995),
+    [sym_primary_expression] = STATE(707),
+    [sym_not_operator] = STATE(985),
+    [sym_boolean_operator] = STATE(985),
+    [sym_binary_operator] = STATE(759),
+    [sym_unary_operator] = STATE(759),
+    [sym_comparison_operator] = STATE(985),
+    [sym_lambda] = STATE(985),
+    [sym_assignment] = STATE(1313),
+    [sym_augmented_assignment] = STATE(1313),
+    [sym_pattern_list] = STATE(880),
+    [sym_yield] = STATE(1313),
+    [sym_attribute] = STATE(422),
+    [sym_subscript] = STATE(422),
+    [sym_call] = STATE(759),
+    [sym_list] = STATE(759),
+    [sym_set] = STATE(759),
+    [sym_tuple] = STATE(759),
+    [sym_dictionary] = STATE(759),
+    [sym_list_comprehension] = STATE(759),
+    [sym_dictionary_comprehension] = STATE(759),
+    [sym_set_comprehension] = STATE(759),
+    [sym_generator_expression] = STATE(759),
+    [sym_parenthesized_expression] = STATE(759),
+    [sym_conditional_expression] = STATE(985),
+    [sym_concatenated_string] = STATE(759),
+    [sym_string] = STATE(709),
+    [sym_await] = STATE(759),
     [sym_identifier] = ACTIONS(7),
     [anon_sym_import] = ACTIONS(9),
     [anon_sym_from] = ACTIONS(11),
@@ -21193,8 +18493,8 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_pass] = ACTIONS(27),
     [anon_sym_break] = ACTIONS(29),
     [anon_sym_continue] = ACTIONS(31),
-    [anon_sym_async] = ACTIONS(317),
-    [anon_sym_match] = ACTIONS(317),
+    [anon_sym_async] = ACTIONS(301),
+    [anon_sym_match] = ACTIONS(301),
     [anon_sym_DASH] = ACTIONS(47),
     [anon_sym_PLUS] = ACTIONS(47),
     [anon_sym_LBRACK] = ACTIONS(49),
@@ -21221,59 +18521,59 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym__string_start] = ACTIONS(81),
   },
   [101] = {
-    [sym__simple_statements] = STATE(592),
-    [sym_import_statement] = STATE(1319),
-    [sym_future_import_statement] = STATE(1319),
-    [sym_import_from_statement] = STATE(1319),
-    [sym_print_statement] = STATE(1319),
-    [sym_assert_statement] = STATE(1319),
-    [sym_expression_statement] = STATE(1319),
-    [sym_named_expression] = STATE(1009),
-    [sym_return_statement] = STATE(1319),
-    [sym_delete_statement] = STATE(1319),
-    [sym_raise_statement] = STATE(1319),
-    [sym_pass_statement] = STATE(1319),
-    [sym_break_statement] = STATE(1319),
-    [sym_continue_statement] = STATE(1319),
-    [sym_list_splat] = STATE(1360),
-    [sym_dictionary_splat] = STATE(1360),
-    [sym_global_statement] = STATE(1319),
-    [sym_nonlocal_statement] = STATE(1319),
-    [sym_exec_statement] = STATE(1319),
-    [sym_type_alias_statement] = STATE(1319),
-    [sym_expression_list] = STATE(1361),
-    [sym_pattern] = STATE(889),
-    [sym_tuple_pattern] = STATE(875),
-    [sym_list_pattern] = STATE(875),
-    [sym_list_splat_pattern] = STATE(875),
-    [sym_expression] = STATE(1019),
-    [sym_primary_expression] = STATE(684),
-    [sym_not_operator] = STATE(1009),
-    [sym_boolean_operator] = STATE(1009),
-    [sym_binary_operator] = STATE(797),
-    [sym_unary_operator] = STATE(797),
-    [sym_comparison_operator] = STATE(1009),
-    [sym_lambda] = STATE(1009),
-    [sym_assignment] = STATE(1361),
-    [sym_augmented_assignment] = STATE(1361),
-    [sym_pattern_list] = STATE(897),
-    [sym_yield] = STATE(1361),
-    [sym_attribute] = STATE(431),
-    [sym_subscript] = STATE(431),
-    [sym_call] = STATE(797),
-    [sym_list] = STATE(797),
-    [sym_set] = STATE(797),
-    [sym_tuple] = STATE(797),
-    [sym_dictionary] = STATE(797),
-    [sym_list_comprehension] = STATE(797),
-    [sym_dictionary_comprehension] = STATE(797),
-    [sym_set_comprehension] = STATE(797),
-    [sym_generator_expression] = STATE(797),
-    [sym_parenthesized_expression] = STATE(797),
-    [sym_conditional_expression] = STATE(1009),
-    [sym_concatenated_string] = STATE(797),
-    [sym_string] = STATE(713),
-    [sym_await] = STATE(1009),
+    [sym__simple_statements] = STATE(515),
+    [sym_import_statement] = STATE(1213),
+    [sym_future_import_statement] = STATE(1213),
+    [sym_import_from_statement] = STATE(1213),
+    [sym_print_statement] = STATE(1213),
+    [sym_assert_statement] = STATE(1213),
+    [sym_expression_statement] = STATE(1213),
+    [sym_named_expression] = STATE(985),
+    [sym_return_statement] = STATE(1213),
+    [sym_delete_statement] = STATE(1213),
+    [sym_raise_statement] = STATE(1213),
+    [sym_pass_statement] = STATE(1213),
+    [sym_break_statement] = STATE(1213),
+    [sym_continue_statement] = STATE(1213),
+    [sym_list_splat] = STATE(1321),
+    [sym_dictionary_splat] = STATE(1321),
+    [sym_global_statement] = STATE(1213),
+    [sym_nonlocal_statement] = STATE(1213),
+    [sym_exec_statement] = STATE(1213),
+    [sym_type_alias_statement] = STATE(1213),
+    [sym_expression_list] = STATE(1313),
+    [sym_pattern] = STATE(871),
+    [sym_tuple_pattern] = STATE(860),
+    [sym_list_pattern] = STATE(860),
+    [sym_list_splat_pattern] = STATE(860),
+    [sym_expression] = STATE(995),
+    [sym_primary_expression] = STATE(707),
+    [sym_not_operator] = STATE(985),
+    [sym_boolean_operator] = STATE(985),
+    [sym_binary_operator] = STATE(759),
+    [sym_unary_operator] = STATE(759),
+    [sym_comparison_operator] = STATE(985),
+    [sym_lambda] = STATE(985),
+    [sym_assignment] = STATE(1313),
+    [sym_augmented_assignment] = STATE(1313),
+    [sym_pattern_list] = STATE(880),
+    [sym_yield] = STATE(1313),
+    [sym_attribute] = STATE(422),
+    [sym_subscript] = STATE(422),
+    [sym_call] = STATE(759),
+    [sym_list] = STATE(759),
+    [sym_set] = STATE(759),
+    [sym_tuple] = STATE(759),
+    [sym_dictionary] = STATE(759),
+    [sym_list_comprehension] = STATE(759),
+    [sym_dictionary_comprehension] = STATE(759),
+    [sym_set_comprehension] = STATE(759),
+    [sym_generator_expression] = STATE(759),
+    [sym_parenthesized_expression] = STATE(759),
+    [sym_conditional_expression] = STATE(985),
+    [sym_concatenated_string] = STATE(759),
+    [sym_string] = STATE(709),
+    [sym_await] = STATE(759),
     [sym_identifier] = ACTIONS(7),
     [anon_sym_import] = ACTIONS(9),
     [anon_sym_from] = ACTIONS(11),
@@ -21287,8 +18587,8 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_pass] = ACTIONS(27),
     [anon_sym_break] = ACTIONS(29),
     [anon_sym_continue] = ACTIONS(31),
-    [anon_sym_async] = ACTIONS(317),
-    [anon_sym_match] = ACTIONS(317),
+    [anon_sym_async] = ACTIONS(301),
+    [anon_sym_match] = ACTIONS(301),
     [anon_sym_DASH] = ACTIONS(47),
     [anon_sym_PLUS] = ACTIONS(47),
     [anon_sym_LBRACK] = ACTIONS(49),
@@ -21315,59 +18615,59 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym__string_start] = ACTIONS(81),
   },
   [102] = {
-    [sym__simple_statements] = STATE(492),
-    [sym_import_statement] = STATE(1319),
-    [sym_future_import_statement] = STATE(1319),
-    [sym_import_from_statement] = STATE(1319),
-    [sym_print_statement] = STATE(1319),
-    [sym_assert_statement] = STATE(1319),
-    [sym_expression_statement] = STATE(1319),
-    [sym_named_expression] = STATE(1009),
-    [sym_return_statement] = STATE(1319),
-    [sym_delete_statement] = STATE(1319),
-    [sym_raise_statement] = STATE(1319),
-    [sym_pass_statement] = STATE(1319),
-    [sym_break_statement] = STATE(1319),
-    [sym_continue_statement] = STATE(1319),
-    [sym_list_splat] = STATE(1360),
-    [sym_dictionary_splat] = STATE(1360),
-    [sym_global_statement] = STATE(1319),
-    [sym_nonlocal_statement] = STATE(1319),
-    [sym_exec_statement] = STATE(1319),
-    [sym_type_alias_statement] = STATE(1319),
-    [sym_expression_list] = STATE(1361),
-    [sym_pattern] = STATE(889),
-    [sym_tuple_pattern] = STATE(875),
-    [sym_list_pattern] = STATE(875),
-    [sym_list_splat_pattern] = STATE(875),
-    [sym_expression] = STATE(1019),
-    [sym_primary_expression] = STATE(684),
-    [sym_not_operator] = STATE(1009),
-    [sym_boolean_operator] = STATE(1009),
-    [sym_binary_operator] = STATE(797),
-    [sym_unary_operator] = STATE(797),
-    [sym_comparison_operator] = STATE(1009),
-    [sym_lambda] = STATE(1009),
-    [sym_assignment] = STATE(1361),
-    [sym_augmented_assignment] = STATE(1361),
-    [sym_pattern_list] = STATE(897),
-    [sym_yield] = STATE(1361),
-    [sym_attribute] = STATE(431),
-    [sym_subscript] = STATE(431),
-    [sym_call] = STATE(797),
-    [sym_list] = STATE(797),
-    [sym_set] = STATE(797),
-    [sym_tuple] = STATE(797),
-    [sym_dictionary] = STATE(797),
-    [sym_list_comprehension] = STATE(797),
-    [sym_dictionary_comprehension] = STATE(797),
-    [sym_set_comprehension] = STATE(797),
-    [sym_generator_expression] = STATE(797),
-    [sym_parenthesized_expression] = STATE(797),
-    [sym_conditional_expression] = STATE(1009),
-    [sym_concatenated_string] = STATE(797),
-    [sym_string] = STATE(713),
-    [sym_await] = STATE(1009),
+    [sym__simple_statements] = STATE(475),
+    [sym_import_statement] = STATE(1304),
+    [sym_future_import_statement] = STATE(1304),
+    [sym_import_from_statement] = STATE(1304),
+    [sym_print_statement] = STATE(1304),
+    [sym_assert_statement] = STATE(1304),
+    [sym_expression_statement] = STATE(1304),
+    [sym_named_expression] = STATE(985),
+    [sym_return_statement] = STATE(1304),
+    [sym_delete_statement] = STATE(1304),
+    [sym_raise_statement] = STATE(1304),
+    [sym_pass_statement] = STATE(1304),
+    [sym_break_statement] = STATE(1304),
+    [sym_continue_statement] = STATE(1304),
+    [sym_list_splat] = STATE(1321),
+    [sym_dictionary_splat] = STATE(1321),
+    [sym_global_statement] = STATE(1304),
+    [sym_nonlocal_statement] = STATE(1304),
+    [sym_exec_statement] = STATE(1304),
+    [sym_type_alias_statement] = STATE(1304),
+    [sym_expression_list] = STATE(1313),
+    [sym_pattern] = STATE(871),
+    [sym_tuple_pattern] = STATE(860),
+    [sym_list_pattern] = STATE(860),
+    [sym_list_splat_pattern] = STATE(860),
+    [sym_expression] = STATE(995),
+    [sym_primary_expression] = STATE(707),
+    [sym_not_operator] = STATE(985),
+    [sym_boolean_operator] = STATE(985),
+    [sym_binary_operator] = STATE(759),
+    [sym_unary_operator] = STATE(759),
+    [sym_comparison_operator] = STATE(985),
+    [sym_lambda] = STATE(985),
+    [sym_assignment] = STATE(1313),
+    [sym_augmented_assignment] = STATE(1313),
+    [sym_pattern_list] = STATE(880),
+    [sym_yield] = STATE(1313),
+    [sym_attribute] = STATE(422),
+    [sym_subscript] = STATE(422),
+    [sym_call] = STATE(759),
+    [sym_list] = STATE(759),
+    [sym_set] = STATE(759),
+    [sym_tuple] = STATE(759),
+    [sym_dictionary] = STATE(759),
+    [sym_list_comprehension] = STATE(759),
+    [sym_dictionary_comprehension] = STATE(759),
+    [sym_set_comprehension] = STATE(759),
+    [sym_generator_expression] = STATE(759),
+    [sym_parenthesized_expression] = STATE(759),
+    [sym_conditional_expression] = STATE(985),
+    [sym_concatenated_string] = STATE(759),
+    [sym_string] = STATE(709),
+    [sym_await] = STATE(759),
     [sym_identifier] = ACTIONS(7),
     [anon_sym_import] = ACTIONS(9),
     [anon_sym_from] = ACTIONS(11),
@@ -21381,8 +18681,8 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_pass] = ACTIONS(27),
     [anon_sym_break] = ACTIONS(29),
     [anon_sym_continue] = ACTIONS(31),
-    [anon_sym_async] = ACTIONS(317),
-    [anon_sym_match] = ACTIONS(317),
+    [anon_sym_async] = ACTIONS(301),
+    [anon_sym_match] = ACTIONS(301),
     [anon_sym_DASH] = ACTIONS(47),
     [anon_sym_PLUS] = ACTIONS(47),
     [anon_sym_LBRACK] = ACTIONS(49),
@@ -21409,59 +18709,59 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym__string_start] = ACTIONS(81),
   },
   [103] = {
-    [sym__simple_statements] = STATE(332),
-    [sym_import_statement] = STATE(1261),
-    [sym_future_import_statement] = STATE(1261),
-    [sym_import_from_statement] = STATE(1261),
-    [sym_print_statement] = STATE(1261),
-    [sym_assert_statement] = STATE(1261),
-    [sym_expression_statement] = STATE(1261),
-    [sym_named_expression] = STATE(1009),
-    [sym_return_statement] = STATE(1261),
-    [sym_delete_statement] = STATE(1261),
-    [sym_raise_statement] = STATE(1261),
-    [sym_pass_statement] = STATE(1261),
-    [sym_break_statement] = STATE(1261),
-    [sym_continue_statement] = STATE(1261),
-    [sym_list_splat] = STATE(1360),
-    [sym_dictionary_splat] = STATE(1360),
-    [sym_global_statement] = STATE(1261),
-    [sym_nonlocal_statement] = STATE(1261),
-    [sym_exec_statement] = STATE(1261),
-    [sym_type_alias_statement] = STATE(1261),
-    [sym_expression_list] = STATE(1361),
-    [sym_pattern] = STATE(889),
-    [sym_tuple_pattern] = STATE(875),
-    [sym_list_pattern] = STATE(875),
-    [sym_list_splat_pattern] = STATE(875),
-    [sym_expression] = STATE(1019),
-    [sym_primary_expression] = STATE(684),
-    [sym_not_operator] = STATE(1009),
-    [sym_boolean_operator] = STATE(1009),
-    [sym_binary_operator] = STATE(797),
-    [sym_unary_operator] = STATE(797),
-    [sym_comparison_operator] = STATE(1009),
-    [sym_lambda] = STATE(1009),
-    [sym_assignment] = STATE(1361),
-    [sym_augmented_assignment] = STATE(1361),
-    [sym_pattern_list] = STATE(897),
-    [sym_yield] = STATE(1361),
-    [sym_attribute] = STATE(431),
-    [sym_subscript] = STATE(431),
-    [sym_call] = STATE(797),
-    [sym_list] = STATE(797),
-    [sym_set] = STATE(797),
-    [sym_tuple] = STATE(797),
-    [sym_dictionary] = STATE(797),
-    [sym_list_comprehension] = STATE(797),
-    [sym_dictionary_comprehension] = STATE(797),
-    [sym_set_comprehension] = STATE(797),
-    [sym_generator_expression] = STATE(797),
-    [sym_parenthesized_expression] = STATE(797),
-    [sym_conditional_expression] = STATE(1009),
-    [sym_concatenated_string] = STATE(797),
-    [sym_string] = STATE(713),
-    [sym_await] = STATE(1009),
+    [sym__simple_statements] = STATE(386),
+    [sym_import_statement] = STATE(1213),
+    [sym_future_import_statement] = STATE(1213),
+    [sym_import_from_statement] = STATE(1213),
+    [sym_print_statement] = STATE(1213),
+    [sym_assert_statement] = STATE(1213),
+    [sym_expression_statement] = STATE(1213),
+    [sym_named_expression] = STATE(985),
+    [sym_return_statement] = STATE(1213),
+    [sym_delete_statement] = STATE(1213),
+    [sym_raise_statement] = STATE(1213),
+    [sym_pass_statement] = STATE(1213),
+    [sym_break_statement] = STATE(1213),
+    [sym_continue_statement] = STATE(1213),
+    [sym_list_splat] = STATE(1321),
+    [sym_dictionary_splat] = STATE(1321),
+    [sym_global_statement] = STATE(1213),
+    [sym_nonlocal_statement] = STATE(1213),
+    [sym_exec_statement] = STATE(1213),
+    [sym_type_alias_statement] = STATE(1213),
+    [sym_expression_list] = STATE(1313),
+    [sym_pattern] = STATE(871),
+    [sym_tuple_pattern] = STATE(860),
+    [sym_list_pattern] = STATE(860),
+    [sym_list_splat_pattern] = STATE(860),
+    [sym_expression] = STATE(995),
+    [sym_primary_expression] = STATE(707),
+    [sym_not_operator] = STATE(985),
+    [sym_boolean_operator] = STATE(985),
+    [sym_binary_operator] = STATE(759),
+    [sym_unary_operator] = STATE(759),
+    [sym_comparison_operator] = STATE(985),
+    [sym_lambda] = STATE(985),
+    [sym_assignment] = STATE(1313),
+    [sym_augmented_assignment] = STATE(1313),
+    [sym_pattern_list] = STATE(880),
+    [sym_yield] = STATE(1313),
+    [sym_attribute] = STATE(422),
+    [sym_subscript] = STATE(422),
+    [sym_call] = STATE(759),
+    [sym_list] = STATE(759),
+    [sym_set] = STATE(759),
+    [sym_tuple] = STATE(759),
+    [sym_dictionary] = STATE(759),
+    [sym_list_comprehension] = STATE(759),
+    [sym_dictionary_comprehension] = STATE(759),
+    [sym_set_comprehension] = STATE(759),
+    [sym_generator_expression] = STATE(759),
+    [sym_parenthesized_expression] = STATE(759),
+    [sym_conditional_expression] = STATE(985),
+    [sym_concatenated_string] = STATE(759),
+    [sym_string] = STATE(709),
+    [sym_await] = STATE(759),
     [sym_identifier] = ACTIONS(7),
     [anon_sym_import] = ACTIONS(9),
     [anon_sym_from] = ACTIONS(11),
@@ -21475,8 +18775,8 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_pass] = ACTIONS(27),
     [anon_sym_break] = ACTIONS(29),
     [anon_sym_continue] = ACTIONS(31),
-    [anon_sym_async] = ACTIONS(317),
-    [anon_sym_match] = ACTIONS(317),
+    [anon_sym_async] = ACTIONS(301),
+    [anon_sym_match] = ACTIONS(301),
     [anon_sym_DASH] = ACTIONS(47),
     [anon_sym_PLUS] = ACTIONS(47),
     [anon_sym_LBRACK] = ACTIONS(49),
@@ -21503,59 +18803,59 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym__string_start] = ACTIONS(81),
   },
   [104] = {
-    [sym__simple_statements] = STATE(544),
-    [sym_import_statement] = STATE(1319),
-    [sym_future_import_statement] = STATE(1319),
-    [sym_import_from_statement] = STATE(1319),
-    [sym_print_statement] = STATE(1319),
-    [sym_assert_statement] = STATE(1319),
-    [sym_expression_statement] = STATE(1319),
-    [sym_named_expression] = STATE(1009),
-    [sym_return_statement] = STATE(1319),
-    [sym_delete_statement] = STATE(1319),
-    [sym_raise_statement] = STATE(1319),
-    [sym_pass_statement] = STATE(1319),
-    [sym_break_statement] = STATE(1319),
-    [sym_continue_statement] = STATE(1319),
-    [sym_list_splat] = STATE(1360),
-    [sym_dictionary_splat] = STATE(1360),
-    [sym_global_statement] = STATE(1319),
-    [sym_nonlocal_statement] = STATE(1319),
-    [sym_exec_statement] = STATE(1319),
-    [sym_type_alias_statement] = STATE(1319),
-    [sym_expression_list] = STATE(1361),
-    [sym_pattern] = STATE(889),
-    [sym_tuple_pattern] = STATE(875),
-    [sym_list_pattern] = STATE(875),
-    [sym_list_splat_pattern] = STATE(875),
-    [sym_expression] = STATE(1019),
-    [sym_primary_expression] = STATE(684),
-    [sym_not_operator] = STATE(1009),
-    [sym_boolean_operator] = STATE(1009),
-    [sym_binary_operator] = STATE(797),
-    [sym_unary_operator] = STATE(797),
-    [sym_comparison_operator] = STATE(1009),
-    [sym_lambda] = STATE(1009),
-    [sym_assignment] = STATE(1361),
-    [sym_augmented_assignment] = STATE(1361),
-    [sym_pattern_list] = STATE(897),
-    [sym_yield] = STATE(1361),
-    [sym_attribute] = STATE(431),
-    [sym_subscript] = STATE(431),
-    [sym_call] = STATE(797),
-    [sym_list] = STATE(797),
-    [sym_set] = STATE(797),
-    [sym_tuple] = STATE(797),
-    [sym_dictionary] = STATE(797),
-    [sym_list_comprehension] = STATE(797),
-    [sym_dictionary_comprehension] = STATE(797),
-    [sym_set_comprehension] = STATE(797),
-    [sym_generator_expression] = STATE(797),
-    [sym_parenthesized_expression] = STATE(797),
-    [sym_conditional_expression] = STATE(1009),
-    [sym_concatenated_string] = STATE(797),
-    [sym_string] = STATE(713),
-    [sym_await] = STATE(1009),
+    [sym__simple_statements] = STATE(565),
+    [sym_import_statement] = STATE(1304),
+    [sym_future_import_statement] = STATE(1304),
+    [sym_import_from_statement] = STATE(1304),
+    [sym_print_statement] = STATE(1304),
+    [sym_assert_statement] = STATE(1304),
+    [sym_expression_statement] = STATE(1304),
+    [sym_named_expression] = STATE(985),
+    [sym_return_statement] = STATE(1304),
+    [sym_delete_statement] = STATE(1304),
+    [sym_raise_statement] = STATE(1304),
+    [sym_pass_statement] = STATE(1304),
+    [sym_break_statement] = STATE(1304),
+    [sym_continue_statement] = STATE(1304),
+    [sym_list_splat] = STATE(1321),
+    [sym_dictionary_splat] = STATE(1321),
+    [sym_global_statement] = STATE(1304),
+    [sym_nonlocal_statement] = STATE(1304),
+    [sym_exec_statement] = STATE(1304),
+    [sym_type_alias_statement] = STATE(1304),
+    [sym_expression_list] = STATE(1313),
+    [sym_pattern] = STATE(871),
+    [sym_tuple_pattern] = STATE(860),
+    [sym_list_pattern] = STATE(860),
+    [sym_list_splat_pattern] = STATE(860),
+    [sym_expression] = STATE(995),
+    [sym_primary_expression] = STATE(707),
+    [sym_not_operator] = STATE(985),
+    [sym_boolean_operator] = STATE(985),
+    [sym_binary_operator] = STATE(759),
+    [sym_unary_operator] = STATE(759),
+    [sym_comparison_operator] = STATE(985),
+    [sym_lambda] = STATE(985),
+    [sym_assignment] = STATE(1313),
+    [sym_augmented_assignment] = STATE(1313),
+    [sym_pattern_list] = STATE(880),
+    [sym_yield] = STATE(1313),
+    [sym_attribute] = STATE(422),
+    [sym_subscript] = STATE(422),
+    [sym_call] = STATE(759),
+    [sym_list] = STATE(759),
+    [sym_set] = STATE(759),
+    [sym_tuple] = STATE(759),
+    [sym_dictionary] = STATE(759),
+    [sym_list_comprehension] = STATE(759),
+    [sym_dictionary_comprehension] = STATE(759),
+    [sym_set_comprehension] = STATE(759),
+    [sym_generator_expression] = STATE(759),
+    [sym_parenthesized_expression] = STATE(759),
+    [sym_conditional_expression] = STATE(985),
+    [sym_concatenated_string] = STATE(759),
+    [sym_string] = STATE(709),
+    [sym_await] = STATE(759),
     [sym_identifier] = ACTIONS(7),
     [anon_sym_import] = ACTIONS(9),
     [anon_sym_from] = ACTIONS(11),
@@ -21569,8 +18869,8 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_pass] = ACTIONS(27),
     [anon_sym_break] = ACTIONS(29),
     [anon_sym_continue] = ACTIONS(31),
-    [anon_sym_async] = ACTIONS(317),
-    [anon_sym_match] = ACTIONS(317),
+    [anon_sym_async] = ACTIONS(301),
+    [anon_sym_match] = ACTIONS(301),
     [anon_sym_DASH] = ACTIONS(47),
     [anon_sym_PLUS] = ACTIONS(47),
     [anon_sym_LBRACK] = ACTIONS(49),
@@ -21597,59 +18897,59 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym__string_start] = ACTIONS(81),
   },
   [105] = {
-    [sym__simple_statements] = STATE(582),
-    [sym_import_statement] = STATE(1319),
-    [sym_future_import_statement] = STATE(1319),
-    [sym_import_from_statement] = STATE(1319),
-    [sym_print_statement] = STATE(1319),
-    [sym_assert_statement] = STATE(1319),
-    [sym_expression_statement] = STATE(1319),
-    [sym_named_expression] = STATE(1009),
-    [sym_return_statement] = STATE(1319),
-    [sym_delete_statement] = STATE(1319),
-    [sym_raise_statement] = STATE(1319),
-    [sym_pass_statement] = STATE(1319),
-    [sym_break_statement] = STATE(1319),
-    [sym_continue_statement] = STATE(1319),
-    [sym_list_splat] = STATE(1360),
-    [sym_dictionary_splat] = STATE(1360),
-    [sym_global_statement] = STATE(1319),
-    [sym_nonlocal_statement] = STATE(1319),
-    [sym_exec_statement] = STATE(1319),
-    [sym_type_alias_statement] = STATE(1319),
-    [sym_expression_list] = STATE(1361),
-    [sym_pattern] = STATE(889),
-    [sym_tuple_pattern] = STATE(875),
-    [sym_list_pattern] = STATE(875),
-    [sym_list_splat_pattern] = STATE(875),
-    [sym_expression] = STATE(1019),
-    [sym_primary_expression] = STATE(684),
-    [sym_not_operator] = STATE(1009),
-    [sym_boolean_operator] = STATE(1009),
-    [sym_binary_operator] = STATE(797),
-    [sym_unary_operator] = STATE(797),
-    [sym_comparison_operator] = STATE(1009),
-    [sym_lambda] = STATE(1009),
-    [sym_assignment] = STATE(1361),
-    [sym_augmented_assignment] = STATE(1361),
-    [sym_pattern_list] = STATE(897),
-    [sym_yield] = STATE(1361),
-    [sym_attribute] = STATE(431),
-    [sym_subscript] = STATE(431),
-    [sym_call] = STATE(797),
-    [sym_list] = STATE(797),
-    [sym_set] = STATE(797),
-    [sym_tuple] = STATE(797),
-    [sym_dictionary] = STATE(797),
-    [sym_list_comprehension] = STATE(797),
-    [sym_dictionary_comprehension] = STATE(797),
-    [sym_set_comprehension] = STATE(797),
-    [sym_generator_expression] = STATE(797),
-    [sym_parenthesized_expression] = STATE(797),
-    [sym_conditional_expression] = STATE(1009),
-    [sym_concatenated_string] = STATE(797),
-    [sym_string] = STATE(713),
-    [sym_await] = STATE(1009),
+    [sym__simple_statements] = STATE(496),
+    [sym_import_statement] = STATE(1304),
+    [sym_future_import_statement] = STATE(1304),
+    [sym_import_from_statement] = STATE(1304),
+    [sym_print_statement] = STATE(1304),
+    [sym_assert_statement] = STATE(1304),
+    [sym_expression_statement] = STATE(1304),
+    [sym_named_expression] = STATE(985),
+    [sym_return_statement] = STATE(1304),
+    [sym_delete_statement] = STATE(1304),
+    [sym_raise_statement] = STATE(1304),
+    [sym_pass_statement] = STATE(1304),
+    [sym_break_statement] = STATE(1304),
+    [sym_continue_statement] = STATE(1304),
+    [sym_list_splat] = STATE(1321),
+    [sym_dictionary_splat] = STATE(1321),
+    [sym_global_statement] = STATE(1304),
+    [sym_nonlocal_statement] = STATE(1304),
+    [sym_exec_statement] = STATE(1304),
+    [sym_type_alias_statement] = STATE(1304),
+    [sym_expression_list] = STATE(1313),
+    [sym_pattern] = STATE(871),
+    [sym_tuple_pattern] = STATE(860),
+    [sym_list_pattern] = STATE(860),
+    [sym_list_splat_pattern] = STATE(860),
+    [sym_expression] = STATE(995),
+    [sym_primary_expression] = STATE(707),
+    [sym_not_operator] = STATE(985),
+    [sym_boolean_operator] = STATE(985),
+    [sym_binary_operator] = STATE(759),
+    [sym_unary_operator] = STATE(759),
+    [sym_comparison_operator] = STATE(985),
+    [sym_lambda] = STATE(985),
+    [sym_assignment] = STATE(1313),
+    [sym_augmented_assignment] = STATE(1313),
+    [sym_pattern_list] = STATE(880),
+    [sym_yield] = STATE(1313),
+    [sym_attribute] = STATE(422),
+    [sym_subscript] = STATE(422),
+    [sym_call] = STATE(759),
+    [sym_list] = STATE(759),
+    [sym_set] = STATE(759),
+    [sym_tuple] = STATE(759),
+    [sym_dictionary] = STATE(759),
+    [sym_list_comprehension] = STATE(759),
+    [sym_dictionary_comprehension] = STATE(759),
+    [sym_set_comprehension] = STATE(759),
+    [sym_generator_expression] = STATE(759),
+    [sym_parenthesized_expression] = STATE(759),
+    [sym_conditional_expression] = STATE(985),
+    [sym_concatenated_string] = STATE(759),
+    [sym_string] = STATE(709),
+    [sym_await] = STATE(759),
     [sym_identifier] = ACTIONS(7),
     [anon_sym_import] = ACTIONS(9),
     [anon_sym_from] = ACTIONS(11),
@@ -21663,8 +18963,8 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_pass] = ACTIONS(27),
     [anon_sym_break] = ACTIONS(29),
     [anon_sym_continue] = ACTIONS(31),
-    [anon_sym_async] = ACTIONS(317),
-    [anon_sym_match] = ACTIONS(317),
+    [anon_sym_async] = ACTIONS(301),
+    [anon_sym_match] = ACTIONS(301),
     [anon_sym_DASH] = ACTIONS(47),
     [anon_sym_PLUS] = ACTIONS(47),
     [anon_sym_LBRACK] = ACTIONS(49),
@@ -21691,59 +18991,59 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym__string_start] = ACTIONS(81),
   },
   [106] = {
-    [sym__simple_statements] = STATE(493),
-    [sym_import_statement] = STATE(1209),
-    [sym_future_import_statement] = STATE(1209),
-    [sym_import_from_statement] = STATE(1209),
-    [sym_print_statement] = STATE(1209),
-    [sym_assert_statement] = STATE(1209),
-    [sym_expression_statement] = STATE(1209),
-    [sym_named_expression] = STATE(1009),
-    [sym_return_statement] = STATE(1209),
-    [sym_delete_statement] = STATE(1209),
-    [sym_raise_statement] = STATE(1209),
-    [sym_pass_statement] = STATE(1209),
-    [sym_break_statement] = STATE(1209),
-    [sym_continue_statement] = STATE(1209),
-    [sym_list_splat] = STATE(1360),
-    [sym_dictionary_splat] = STATE(1360),
-    [sym_global_statement] = STATE(1209),
-    [sym_nonlocal_statement] = STATE(1209),
-    [sym_exec_statement] = STATE(1209),
-    [sym_type_alias_statement] = STATE(1209),
-    [sym_expression_list] = STATE(1361),
-    [sym_pattern] = STATE(889),
-    [sym_tuple_pattern] = STATE(875),
-    [sym_list_pattern] = STATE(875),
-    [sym_list_splat_pattern] = STATE(875),
-    [sym_expression] = STATE(1019),
-    [sym_primary_expression] = STATE(684),
-    [sym_not_operator] = STATE(1009),
-    [sym_boolean_operator] = STATE(1009),
-    [sym_binary_operator] = STATE(797),
-    [sym_unary_operator] = STATE(797),
-    [sym_comparison_operator] = STATE(1009),
-    [sym_lambda] = STATE(1009),
-    [sym_assignment] = STATE(1361),
-    [sym_augmented_assignment] = STATE(1361),
-    [sym_pattern_list] = STATE(897),
-    [sym_yield] = STATE(1361),
-    [sym_attribute] = STATE(431),
-    [sym_subscript] = STATE(431),
-    [sym_call] = STATE(797),
-    [sym_list] = STATE(797),
-    [sym_set] = STATE(797),
-    [sym_tuple] = STATE(797),
-    [sym_dictionary] = STATE(797),
-    [sym_list_comprehension] = STATE(797),
-    [sym_dictionary_comprehension] = STATE(797),
-    [sym_set_comprehension] = STATE(797),
-    [sym_generator_expression] = STATE(797),
-    [sym_parenthesized_expression] = STATE(797),
-    [sym_conditional_expression] = STATE(1009),
-    [sym_concatenated_string] = STATE(797),
-    [sym_string] = STATE(713),
-    [sym_await] = STATE(1009),
+    [sym__simple_statements] = STATE(500),
+    [sym_import_statement] = STATE(1213),
+    [sym_future_import_statement] = STATE(1213),
+    [sym_import_from_statement] = STATE(1213),
+    [sym_print_statement] = STATE(1213),
+    [sym_assert_statement] = STATE(1213),
+    [sym_expression_statement] = STATE(1213),
+    [sym_named_expression] = STATE(985),
+    [sym_return_statement] = STATE(1213),
+    [sym_delete_statement] = STATE(1213),
+    [sym_raise_statement] = STATE(1213),
+    [sym_pass_statement] = STATE(1213),
+    [sym_break_statement] = STATE(1213),
+    [sym_continue_statement] = STATE(1213),
+    [sym_list_splat] = STATE(1321),
+    [sym_dictionary_splat] = STATE(1321),
+    [sym_global_statement] = STATE(1213),
+    [sym_nonlocal_statement] = STATE(1213),
+    [sym_exec_statement] = STATE(1213),
+    [sym_type_alias_statement] = STATE(1213),
+    [sym_expression_list] = STATE(1313),
+    [sym_pattern] = STATE(871),
+    [sym_tuple_pattern] = STATE(860),
+    [sym_list_pattern] = STATE(860),
+    [sym_list_splat_pattern] = STATE(860),
+    [sym_expression] = STATE(995),
+    [sym_primary_expression] = STATE(707),
+    [sym_not_operator] = STATE(985),
+    [sym_boolean_operator] = STATE(985),
+    [sym_binary_operator] = STATE(759),
+    [sym_unary_operator] = STATE(759),
+    [sym_comparison_operator] = STATE(985),
+    [sym_lambda] = STATE(985),
+    [sym_assignment] = STATE(1313),
+    [sym_augmented_assignment] = STATE(1313),
+    [sym_pattern_list] = STATE(880),
+    [sym_yield] = STATE(1313),
+    [sym_attribute] = STATE(422),
+    [sym_subscript] = STATE(422),
+    [sym_call] = STATE(759),
+    [sym_list] = STATE(759),
+    [sym_set] = STATE(759),
+    [sym_tuple] = STATE(759),
+    [sym_dictionary] = STATE(759),
+    [sym_list_comprehension] = STATE(759),
+    [sym_dictionary_comprehension] = STATE(759),
+    [sym_set_comprehension] = STATE(759),
+    [sym_generator_expression] = STATE(759),
+    [sym_parenthesized_expression] = STATE(759),
+    [sym_conditional_expression] = STATE(985),
+    [sym_concatenated_string] = STATE(759),
+    [sym_string] = STATE(709),
+    [sym_await] = STATE(759),
     [sym_identifier] = ACTIONS(7),
     [anon_sym_import] = ACTIONS(9),
     [anon_sym_from] = ACTIONS(11),
@@ -21757,8 +19057,8 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_pass] = ACTIONS(27),
     [anon_sym_break] = ACTIONS(29),
     [anon_sym_continue] = ACTIONS(31),
-    [anon_sym_async] = ACTIONS(317),
-    [anon_sym_match] = ACTIONS(317),
+    [anon_sym_async] = ACTIONS(301),
+    [anon_sym_match] = ACTIONS(301),
     [anon_sym_DASH] = ACTIONS(47),
     [anon_sym_PLUS] = ACTIONS(47),
     [anon_sym_LBRACK] = ACTIONS(49),
@@ -21785,59 +19085,59 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym__string_start] = ACTIONS(81),
   },
   [107] = {
-    [sym__simple_statements] = STATE(563),
-    [sym_import_statement] = STATE(1319),
-    [sym_future_import_statement] = STATE(1319),
-    [sym_import_from_statement] = STATE(1319),
-    [sym_print_statement] = STATE(1319),
-    [sym_assert_statement] = STATE(1319),
-    [sym_expression_statement] = STATE(1319),
-    [sym_named_expression] = STATE(1009),
-    [sym_return_statement] = STATE(1319),
-    [sym_delete_statement] = STATE(1319),
-    [sym_raise_statement] = STATE(1319),
-    [sym_pass_statement] = STATE(1319),
-    [sym_break_statement] = STATE(1319),
-    [sym_continue_statement] = STATE(1319),
-    [sym_list_splat] = STATE(1360),
-    [sym_dictionary_splat] = STATE(1360),
-    [sym_global_statement] = STATE(1319),
-    [sym_nonlocal_statement] = STATE(1319),
-    [sym_exec_statement] = STATE(1319),
-    [sym_type_alias_statement] = STATE(1319),
-    [sym_expression_list] = STATE(1361),
-    [sym_pattern] = STATE(889),
-    [sym_tuple_pattern] = STATE(875),
-    [sym_list_pattern] = STATE(875),
-    [sym_list_splat_pattern] = STATE(875),
-    [sym_expression] = STATE(1019),
-    [sym_primary_expression] = STATE(684),
-    [sym_not_operator] = STATE(1009),
-    [sym_boolean_operator] = STATE(1009),
-    [sym_binary_operator] = STATE(797),
-    [sym_unary_operator] = STATE(797),
-    [sym_comparison_operator] = STATE(1009),
-    [sym_lambda] = STATE(1009),
-    [sym_assignment] = STATE(1361),
-    [sym_augmented_assignment] = STATE(1361),
-    [sym_pattern_list] = STATE(897),
-    [sym_yield] = STATE(1361),
-    [sym_attribute] = STATE(431),
-    [sym_subscript] = STATE(431),
-    [sym_call] = STATE(797),
-    [sym_list] = STATE(797),
-    [sym_set] = STATE(797),
-    [sym_tuple] = STATE(797),
-    [sym_dictionary] = STATE(797),
-    [sym_list_comprehension] = STATE(797),
-    [sym_dictionary_comprehension] = STATE(797),
-    [sym_set_comprehension] = STATE(797),
-    [sym_generator_expression] = STATE(797),
-    [sym_parenthesized_expression] = STATE(797),
-    [sym_conditional_expression] = STATE(1009),
-    [sym_concatenated_string] = STATE(797),
-    [sym_string] = STATE(713),
-    [sym_await] = STATE(1009),
+    [sym__simple_statements] = STATE(331),
+    [sym_import_statement] = STATE(1304),
+    [sym_future_import_statement] = STATE(1304),
+    [sym_import_from_statement] = STATE(1304),
+    [sym_print_statement] = STATE(1304),
+    [sym_assert_statement] = STATE(1304),
+    [sym_expression_statement] = STATE(1304),
+    [sym_named_expression] = STATE(985),
+    [sym_return_statement] = STATE(1304),
+    [sym_delete_statement] = STATE(1304),
+    [sym_raise_statement] = STATE(1304),
+    [sym_pass_statement] = STATE(1304),
+    [sym_break_statement] = STATE(1304),
+    [sym_continue_statement] = STATE(1304),
+    [sym_list_splat] = STATE(1321),
+    [sym_dictionary_splat] = STATE(1321),
+    [sym_global_statement] = STATE(1304),
+    [sym_nonlocal_statement] = STATE(1304),
+    [sym_exec_statement] = STATE(1304),
+    [sym_type_alias_statement] = STATE(1304),
+    [sym_expression_list] = STATE(1313),
+    [sym_pattern] = STATE(871),
+    [sym_tuple_pattern] = STATE(860),
+    [sym_list_pattern] = STATE(860),
+    [sym_list_splat_pattern] = STATE(860),
+    [sym_expression] = STATE(995),
+    [sym_primary_expression] = STATE(707),
+    [sym_not_operator] = STATE(985),
+    [sym_boolean_operator] = STATE(985),
+    [sym_binary_operator] = STATE(759),
+    [sym_unary_operator] = STATE(759),
+    [sym_comparison_operator] = STATE(985),
+    [sym_lambda] = STATE(985),
+    [sym_assignment] = STATE(1313),
+    [sym_augmented_assignment] = STATE(1313),
+    [sym_pattern_list] = STATE(880),
+    [sym_yield] = STATE(1313),
+    [sym_attribute] = STATE(422),
+    [sym_subscript] = STATE(422),
+    [sym_call] = STATE(759),
+    [sym_list] = STATE(759),
+    [sym_set] = STATE(759),
+    [sym_tuple] = STATE(759),
+    [sym_dictionary] = STATE(759),
+    [sym_list_comprehension] = STATE(759),
+    [sym_dictionary_comprehension] = STATE(759),
+    [sym_set_comprehension] = STATE(759),
+    [sym_generator_expression] = STATE(759),
+    [sym_parenthesized_expression] = STATE(759),
+    [sym_conditional_expression] = STATE(985),
+    [sym_concatenated_string] = STATE(759),
+    [sym_string] = STATE(709),
+    [sym_await] = STATE(759),
     [sym_identifier] = ACTIONS(7),
     [anon_sym_import] = ACTIONS(9),
     [anon_sym_from] = ACTIONS(11),
@@ -21851,8 +19151,8 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_pass] = ACTIONS(27),
     [anon_sym_break] = ACTIONS(29),
     [anon_sym_continue] = ACTIONS(31),
-    [anon_sym_async] = ACTIONS(317),
-    [anon_sym_match] = ACTIONS(317),
+    [anon_sym_async] = ACTIONS(301),
+    [anon_sym_match] = ACTIONS(301),
     [anon_sym_DASH] = ACTIONS(47),
     [anon_sym_PLUS] = ACTIONS(47),
     [anon_sym_LBRACK] = ACTIONS(49),
@@ -21879,59 +19179,59 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym__string_start] = ACTIONS(81),
   },
   [108] = {
-    [sym__simple_statements] = STATE(580),
-    [sym_import_statement] = STATE(1319),
-    [sym_future_import_statement] = STATE(1319),
-    [sym_import_from_statement] = STATE(1319),
-    [sym_print_statement] = STATE(1319),
-    [sym_assert_statement] = STATE(1319),
-    [sym_expression_statement] = STATE(1319),
-    [sym_named_expression] = STATE(1009),
-    [sym_return_statement] = STATE(1319),
-    [sym_delete_statement] = STATE(1319),
-    [sym_raise_statement] = STATE(1319),
-    [sym_pass_statement] = STATE(1319),
-    [sym_break_statement] = STATE(1319),
-    [sym_continue_statement] = STATE(1319),
-    [sym_list_splat] = STATE(1360),
-    [sym_dictionary_splat] = STATE(1360),
-    [sym_global_statement] = STATE(1319),
-    [sym_nonlocal_statement] = STATE(1319),
-    [sym_exec_statement] = STATE(1319),
-    [sym_type_alias_statement] = STATE(1319),
-    [sym_expression_list] = STATE(1361),
-    [sym_pattern] = STATE(889),
-    [sym_tuple_pattern] = STATE(875),
-    [sym_list_pattern] = STATE(875),
-    [sym_list_splat_pattern] = STATE(875),
-    [sym_expression] = STATE(1019),
-    [sym_primary_expression] = STATE(684),
-    [sym_not_operator] = STATE(1009),
-    [sym_boolean_operator] = STATE(1009),
-    [sym_binary_operator] = STATE(797),
-    [sym_unary_operator] = STATE(797),
-    [sym_comparison_operator] = STATE(1009),
-    [sym_lambda] = STATE(1009),
-    [sym_assignment] = STATE(1361),
-    [sym_augmented_assignment] = STATE(1361),
-    [sym_pattern_list] = STATE(897),
-    [sym_yield] = STATE(1361),
-    [sym_attribute] = STATE(431),
-    [sym_subscript] = STATE(431),
-    [sym_call] = STATE(797),
-    [sym_list] = STATE(797),
-    [sym_set] = STATE(797),
-    [sym_tuple] = STATE(797),
-    [sym_dictionary] = STATE(797),
-    [sym_list_comprehension] = STATE(797),
-    [sym_dictionary_comprehension] = STATE(797),
-    [sym_set_comprehension] = STATE(797),
-    [sym_generator_expression] = STATE(797),
-    [sym_parenthesized_expression] = STATE(797),
-    [sym_conditional_expression] = STATE(1009),
-    [sym_concatenated_string] = STATE(797),
-    [sym_string] = STATE(713),
-    [sym_await] = STATE(1009),
+    [sym__simple_statements] = STATE(478),
+    [sym_import_statement] = STATE(1304),
+    [sym_future_import_statement] = STATE(1304),
+    [sym_import_from_statement] = STATE(1304),
+    [sym_print_statement] = STATE(1304),
+    [sym_assert_statement] = STATE(1304),
+    [sym_expression_statement] = STATE(1304),
+    [sym_named_expression] = STATE(985),
+    [sym_return_statement] = STATE(1304),
+    [sym_delete_statement] = STATE(1304),
+    [sym_raise_statement] = STATE(1304),
+    [sym_pass_statement] = STATE(1304),
+    [sym_break_statement] = STATE(1304),
+    [sym_continue_statement] = STATE(1304),
+    [sym_list_splat] = STATE(1321),
+    [sym_dictionary_splat] = STATE(1321),
+    [sym_global_statement] = STATE(1304),
+    [sym_nonlocal_statement] = STATE(1304),
+    [sym_exec_statement] = STATE(1304),
+    [sym_type_alias_statement] = STATE(1304),
+    [sym_expression_list] = STATE(1313),
+    [sym_pattern] = STATE(871),
+    [sym_tuple_pattern] = STATE(860),
+    [sym_list_pattern] = STATE(860),
+    [sym_list_splat_pattern] = STATE(860),
+    [sym_expression] = STATE(995),
+    [sym_primary_expression] = STATE(707),
+    [sym_not_operator] = STATE(985),
+    [sym_boolean_operator] = STATE(985),
+    [sym_binary_operator] = STATE(759),
+    [sym_unary_operator] = STATE(759),
+    [sym_comparison_operator] = STATE(985),
+    [sym_lambda] = STATE(985),
+    [sym_assignment] = STATE(1313),
+    [sym_augmented_assignment] = STATE(1313),
+    [sym_pattern_list] = STATE(880),
+    [sym_yield] = STATE(1313),
+    [sym_attribute] = STATE(422),
+    [sym_subscript] = STATE(422),
+    [sym_call] = STATE(759),
+    [sym_list] = STATE(759),
+    [sym_set] = STATE(759),
+    [sym_tuple] = STATE(759),
+    [sym_dictionary] = STATE(759),
+    [sym_list_comprehension] = STATE(759),
+    [sym_dictionary_comprehension] = STATE(759),
+    [sym_set_comprehension] = STATE(759),
+    [sym_generator_expression] = STATE(759),
+    [sym_parenthesized_expression] = STATE(759),
+    [sym_conditional_expression] = STATE(985),
+    [sym_concatenated_string] = STATE(759),
+    [sym_string] = STATE(709),
+    [sym_await] = STATE(759),
     [sym_identifier] = ACTIONS(7),
     [anon_sym_import] = ACTIONS(9),
     [anon_sym_from] = ACTIONS(11),
@@ -21945,8 +19245,8 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_pass] = ACTIONS(27),
     [anon_sym_break] = ACTIONS(29),
     [anon_sym_continue] = ACTIONS(31),
-    [anon_sym_async] = ACTIONS(317),
-    [anon_sym_match] = ACTIONS(317),
+    [anon_sym_async] = ACTIONS(301),
+    [anon_sym_match] = ACTIONS(301),
     [anon_sym_DASH] = ACTIONS(47),
     [anon_sym_PLUS] = ACTIONS(47),
     [anon_sym_LBRACK] = ACTIONS(49),
@@ -21973,59 +19273,59 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym__string_start] = ACTIONS(81),
   },
   [109] = {
-    [sym__simple_statements] = STATE(991),
-    [sym_import_statement] = STATE(1214),
-    [sym_future_import_statement] = STATE(1214),
-    [sym_import_from_statement] = STATE(1214),
-    [sym_print_statement] = STATE(1214),
-    [sym_assert_statement] = STATE(1214),
-    [sym_expression_statement] = STATE(1214),
-    [sym_named_expression] = STATE(1009),
-    [sym_return_statement] = STATE(1214),
-    [sym_delete_statement] = STATE(1214),
-    [sym_raise_statement] = STATE(1214),
-    [sym_pass_statement] = STATE(1214),
-    [sym_break_statement] = STATE(1214),
-    [sym_continue_statement] = STATE(1214),
-    [sym_list_splat] = STATE(1360),
-    [sym_dictionary_splat] = STATE(1360),
-    [sym_global_statement] = STATE(1214),
-    [sym_nonlocal_statement] = STATE(1214),
-    [sym_exec_statement] = STATE(1214),
-    [sym_type_alias_statement] = STATE(1214),
-    [sym_expression_list] = STATE(1361),
-    [sym_pattern] = STATE(889),
-    [sym_tuple_pattern] = STATE(875),
-    [sym_list_pattern] = STATE(875),
-    [sym_list_splat_pattern] = STATE(875),
-    [sym_expression] = STATE(1019),
-    [sym_primary_expression] = STATE(684),
-    [sym_not_operator] = STATE(1009),
-    [sym_boolean_operator] = STATE(1009),
-    [sym_binary_operator] = STATE(797),
-    [sym_unary_operator] = STATE(797),
-    [sym_comparison_operator] = STATE(1009),
-    [sym_lambda] = STATE(1009),
-    [sym_assignment] = STATE(1361),
-    [sym_augmented_assignment] = STATE(1361),
-    [sym_pattern_list] = STATE(897),
-    [sym_yield] = STATE(1361),
-    [sym_attribute] = STATE(431),
-    [sym_subscript] = STATE(431),
-    [sym_call] = STATE(797),
-    [sym_list] = STATE(797),
-    [sym_set] = STATE(797),
-    [sym_tuple] = STATE(797),
-    [sym_dictionary] = STATE(797),
-    [sym_list_comprehension] = STATE(797),
-    [sym_dictionary_comprehension] = STATE(797),
-    [sym_set_comprehension] = STATE(797),
-    [sym_generator_expression] = STATE(797),
-    [sym_parenthesized_expression] = STATE(797),
-    [sym_conditional_expression] = STATE(1009),
-    [sym_concatenated_string] = STATE(797),
-    [sym_string] = STATE(713),
-    [sym_await] = STATE(1009),
+    [sym__simple_statements] = STATE(341),
+    [sym_import_statement] = STATE(1304),
+    [sym_future_import_statement] = STATE(1304),
+    [sym_import_from_statement] = STATE(1304),
+    [sym_print_statement] = STATE(1304),
+    [sym_assert_statement] = STATE(1304),
+    [sym_expression_statement] = STATE(1304),
+    [sym_named_expression] = STATE(985),
+    [sym_return_statement] = STATE(1304),
+    [sym_delete_statement] = STATE(1304),
+    [sym_raise_statement] = STATE(1304),
+    [sym_pass_statement] = STATE(1304),
+    [sym_break_statement] = STATE(1304),
+    [sym_continue_statement] = STATE(1304),
+    [sym_list_splat] = STATE(1321),
+    [sym_dictionary_splat] = STATE(1321),
+    [sym_global_statement] = STATE(1304),
+    [sym_nonlocal_statement] = STATE(1304),
+    [sym_exec_statement] = STATE(1304),
+    [sym_type_alias_statement] = STATE(1304),
+    [sym_expression_list] = STATE(1313),
+    [sym_pattern] = STATE(871),
+    [sym_tuple_pattern] = STATE(860),
+    [sym_list_pattern] = STATE(860),
+    [sym_list_splat_pattern] = STATE(860),
+    [sym_expression] = STATE(995),
+    [sym_primary_expression] = STATE(707),
+    [sym_not_operator] = STATE(985),
+    [sym_boolean_operator] = STATE(985),
+    [sym_binary_operator] = STATE(759),
+    [sym_unary_operator] = STATE(759),
+    [sym_comparison_operator] = STATE(985),
+    [sym_lambda] = STATE(985),
+    [sym_assignment] = STATE(1313),
+    [sym_augmented_assignment] = STATE(1313),
+    [sym_pattern_list] = STATE(880),
+    [sym_yield] = STATE(1313),
+    [sym_attribute] = STATE(422),
+    [sym_subscript] = STATE(422),
+    [sym_call] = STATE(759),
+    [sym_list] = STATE(759),
+    [sym_set] = STATE(759),
+    [sym_tuple] = STATE(759),
+    [sym_dictionary] = STATE(759),
+    [sym_list_comprehension] = STATE(759),
+    [sym_dictionary_comprehension] = STATE(759),
+    [sym_set_comprehension] = STATE(759),
+    [sym_generator_expression] = STATE(759),
+    [sym_parenthesized_expression] = STATE(759),
+    [sym_conditional_expression] = STATE(985),
+    [sym_concatenated_string] = STATE(759),
+    [sym_string] = STATE(709),
+    [sym_await] = STATE(759),
     [sym_identifier] = ACTIONS(7),
     [anon_sym_import] = ACTIONS(9),
     [anon_sym_from] = ACTIONS(11),
@@ -22039,8 +19339,8 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_pass] = ACTIONS(27),
     [anon_sym_break] = ACTIONS(29),
     [anon_sym_continue] = ACTIONS(31),
-    [anon_sym_async] = ACTIONS(317),
-    [anon_sym_match] = ACTIONS(317),
+    [anon_sym_async] = ACTIONS(301),
+    [anon_sym_match] = ACTIONS(301),
     [anon_sym_DASH] = ACTIONS(47),
     [anon_sym_PLUS] = ACTIONS(47),
     [anon_sym_LBRACK] = ACTIONS(49),
@@ -22067,59 +19367,59 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym__string_start] = ACTIONS(81),
   },
   [110] = {
-    [sym__simple_statements] = STATE(478),
-    [sym_import_statement] = STATE(1319),
-    [sym_future_import_statement] = STATE(1319),
-    [sym_import_from_statement] = STATE(1319),
-    [sym_print_statement] = STATE(1319),
-    [sym_assert_statement] = STATE(1319),
-    [sym_expression_statement] = STATE(1319),
-    [sym_named_expression] = STATE(1009),
-    [sym_return_statement] = STATE(1319),
-    [sym_delete_statement] = STATE(1319),
-    [sym_raise_statement] = STATE(1319),
-    [sym_pass_statement] = STATE(1319),
-    [sym_break_statement] = STATE(1319),
-    [sym_continue_statement] = STATE(1319),
-    [sym_list_splat] = STATE(1360),
-    [sym_dictionary_splat] = STATE(1360),
-    [sym_global_statement] = STATE(1319),
-    [sym_nonlocal_statement] = STATE(1319),
-    [sym_exec_statement] = STATE(1319),
-    [sym_type_alias_statement] = STATE(1319),
-    [sym_expression_list] = STATE(1361),
-    [sym_pattern] = STATE(889),
-    [sym_tuple_pattern] = STATE(875),
-    [sym_list_pattern] = STATE(875),
-    [sym_list_splat_pattern] = STATE(875),
-    [sym_expression] = STATE(1019),
-    [sym_primary_expression] = STATE(684),
-    [sym_not_operator] = STATE(1009),
-    [sym_boolean_operator] = STATE(1009),
-    [sym_binary_operator] = STATE(797),
-    [sym_unary_operator] = STATE(797),
-    [sym_comparison_operator] = STATE(1009),
-    [sym_lambda] = STATE(1009),
-    [sym_assignment] = STATE(1361),
-    [sym_augmented_assignment] = STATE(1361),
-    [sym_pattern_list] = STATE(897),
-    [sym_yield] = STATE(1361),
-    [sym_attribute] = STATE(431),
-    [sym_subscript] = STATE(431),
-    [sym_call] = STATE(797),
-    [sym_list] = STATE(797),
-    [sym_set] = STATE(797),
-    [sym_tuple] = STATE(797),
-    [sym_dictionary] = STATE(797),
-    [sym_list_comprehension] = STATE(797),
-    [sym_dictionary_comprehension] = STATE(797),
-    [sym_set_comprehension] = STATE(797),
-    [sym_generator_expression] = STATE(797),
-    [sym_parenthesized_expression] = STATE(797),
-    [sym_conditional_expression] = STATE(1009),
-    [sym_concatenated_string] = STATE(797),
-    [sym_string] = STATE(713),
-    [sym_await] = STATE(1009),
+    [sym__simple_statements] = STATE(1013),
+    [sym_import_statement] = STATE(1212),
+    [sym_future_import_statement] = STATE(1212),
+    [sym_import_from_statement] = STATE(1212),
+    [sym_print_statement] = STATE(1212),
+    [sym_assert_statement] = STATE(1212),
+    [sym_expression_statement] = STATE(1212),
+    [sym_named_expression] = STATE(985),
+    [sym_return_statement] = STATE(1212),
+    [sym_delete_statement] = STATE(1212),
+    [sym_raise_statement] = STATE(1212),
+    [sym_pass_statement] = STATE(1212),
+    [sym_break_statement] = STATE(1212),
+    [sym_continue_statement] = STATE(1212),
+    [sym_list_splat] = STATE(1321),
+    [sym_dictionary_splat] = STATE(1321),
+    [sym_global_statement] = STATE(1212),
+    [sym_nonlocal_statement] = STATE(1212),
+    [sym_exec_statement] = STATE(1212),
+    [sym_type_alias_statement] = STATE(1212),
+    [sym_expression_list] = STATE(1313),
+    [sym_pattern] = STATE(871),
+    [sym_tuple_pattern] = STATE(860),
+    [sym_list_pattern] = STATE(860),
+    [sym_list_splat_pattern] = STATE(860),
+    [sym_expression] = STATE(995),
+    [sym_primary_expression] = STATE(707),
+    [sym_not_operator] = STATE(985),
+    [sym_boolean_operator] = STATE(985),
+    [sym_binary_operator] = STATE(759),
+    [sym_unary_operator] = STATE(759),
+    [sym_comparison_operator] = STATE(985),
+    [sym_lambda] = STATE(985),
+    [sym_assignment] = STATE(1313),
+    [sym_augmented_assignment] = STATE(1313),
+    [sym_pattern_list] = STATE(880),
+    [sym_yield] = STATE(1313),
+    [sym_attribute] = STATE(422),
+    [sym_subscript] = STATE(422),
+    [sym_call] = STATE(759),
+    [sym_list] = STATE(759),
+    [sym_set] = STATE(759),
+    [sym_tuple] = STATE(759),
+    [sym_dictionary] = STATE(759),
+    [sym_list_comprehension] = STATE(759),
+    [sym_dictionary_comprehension] = STATE(759),
+    [sym_set_comprehension] = STATE(759),
+    [sym_generator_expression] = STATE(759),
+    [sym_parenthesized_expression] = STATE(759),
+    [sym_conditional_expression] = STATE(985),
+    [sym_concatenated_string] = STATE(759),
+    [sym_string] = STATE(709),
+    [sym_await] = STATE(759),
     [sym_identifier] = ACTIONS(7),
     [anon_sym_import] = ACTIONS(9),
     [anon_sym_from] = ACTIONS(11),
@@ -22133,8 +19433,8 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_pass] = ACTIONS(27),
     [anon_sym_break] = ACTIONS(29),
     [anon_sym_continue] = ACTIONS(31),
-    [anon_sym_async] = ACTIONS(317),
-    [anon_sym_match] = ACTIONS(317),
+    [anon_sym_async] = ACTIONS(301),
+    [anon_sym_match] = ACTIONS(301),
     [anon_sym_DASH] = ACTIONS(47),
     [anon_sym_PLUS] = ACTIONS(47),
     [anon_sym_LBRACK] = ACTIONS(49),
@@ -22161,59 +19461,59 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym__string_start] = ACTIONS(81),
   },
   [111] = {
-    [sym__simple_statements] = STATE(272),
-    [sym_import_statement] = STATE(1319),
-    [sym_future_import_statement] = STATE(1319),
-    [sym_import_from_statement] = STATE(1319),
-    [sym_print_statement] = STATE(1319),
-    [sym_assert_statement] = STATE(1319),
-    [sym_expression_statement] = STATE(1319),
-    [sym_named_expression] = STATE(1009),
-    [sym_return_statement] = STATE(1319),
-    [sym_delete_statement] = STATE(1319),
-    [sym_raise_statement] = STATE(1319),
-    [sym_pass_statement] = STATE(1319),
-    [sym_break_statement] = STATE(1319),
-    [sym_continue_statement] = STATE(1319),
-    [sym_list_splat] = STATE(1360),
-    [sym_dictionary_splat] = STATE(1360),
-    [sym_global_statement] = STATE(1319),
-    [sym_nonlocal_statement] = STATE(1319),
-    [sym_exec_statement] = STATE(1319),
-    [sym_type_alias_statement] = STATE(1319),
-    [sym_expression_list] = STATE(1361),
-    [sym_pattern] = STATE(889),
-    [sym_tuple_pattern] = STATE(875),
-    [sym_list_pattern] = STATE(875),
-    [sym_list_splat_pattern] = STATE(875),
-    [sym_expression] = STATE(1019),
-    [sym_primary_expression] = STATE(684),
-    [sym_not_operator] = STATE(1009),
-    [sym_boolean_operator] = STATE(1009),
-    [sym_binary_operator] = STATE(797),
-    [sym_unary_operator] = STATE(797),
-    [sym_comparison_operator] = STATE(1009),
-    [sym_lambda] = STATE(1009),
-    [sym_assignment] = STATE(1361),
-    [sym_augmented_assignment] = STATE(1361),
-    [sym_pattern_list] = STATE(897),
-    [sym_yield] = STATE(1361),
-    [sym_attribute] = STATE(431),
-    [sym_subscript] = STATE(431),
-    [sym_call] = STATE(797),
-    [sym_list] = STATE(797),
-    [sym_set] = STATE(797),
-    [sym_tuple] = STATE(797),
-    [sym_dictionary] = STATE(797),
-    [sym_list_comprehension] = STATE(797),
-    [sym_dictionary_comprehension] = STATE(797),
-    [sym_set_comprehension] = STATE(797),
-    [sym_generator_expression] = STATE(797),
-    [sym_parenthesized_expression] = STATE(797),
-    [sym_conditional_expression] = STATE(1009),
-    [sym_concatenated_string] = STATE(797),
-    [sym_string] = STATE(713),
-    [sym_await] = STATE(1009),
+    [sym__simple_statements] = STATE(539),
+    [sym_import_statement] = STATE(1213),
+    [sym_future_import_statement] = STATE(1213),
+    [sym_import_from_statement] = STATE(1213),
+    [sym_print_statement] = STATE(1213),
+    [sym_assert_statement] = STATE(1213),
+    [sym_expression_statement] = STATE(1213),
+    [sym_named_expression] = STATE(985),
+    [sym_return_statement] = STATE(1213),
+    [sym_delete_statement] = STATE(1213),
+    [sym_raise_statement] = STATE(1213),
+    [sym_pass_statement] = STATE(1213),
+    [sym_break_statement] = STATE(1213),
+    [sym_continue_statement] = STATE(1213),
+    [sym_list_splat] = STATE(1321),
+    [sym_dictionary_splat] = STATE(1321),
+    [sym_global_statement] = STATE(1213),
+    [sym_nonlocal_statement] = STATE(1213),
+    [sym_exec_statement] = STATE(1213),
+    [sym_type_alias_statement] = STATE(1213),
+    [sym_expression_list] = STATE(1313),
+    [sym_pattern] = STATE(871),
+    [sym_tuple_pattern] = STATE(860),
+    [sym_list_pattern] = STATE(860),
+    [sym_list_splat_pattern] = STATE(860),
+    [sym_expression] = STATE(995),
+    [sym_primary_expression] = STATE(707),
+    [sym_not_operator] = STATE(985),
+    [sym_boolean_operator] = STATE(985),
+    [sym_binary_operator] = STATE(759),
+    [sym_unary_operator] = STATE(759),
+    [sym_comparison_operator] = STATE(985),
+    [sym_lambda] = STATE(985),
+    [sym_assignment] = STATE(1313),
+    [sym_augmented_assignment] = STATE(1313),
+    [sym_pattern_list] = STATE(880),
+    [sym_yield] = STATE(1313),
+    [sym_attribute] = STATE(422),
+    [sym_subscript] = STATE(422),
+    [sym_call] = STATE(759),
+    [sym_list] = STATE(759),
+    [sym_set] = STATE(759),
+    [sym_tuple] = STATE(759),
+    [sym_dictionary] = STATE(759),
+    [sym_list_comprehension] = STATE(759),
+    [sym_dictionary_comprehension] = STATE(759),
+    [sym_set_comprehension] = STATE(759),
+    [sym_generator_expression] = STATE(759),
+    [sym_parenthesized_expression] = STATE(759),
+    [sym_conditional_expression] = STATE(985),
+    [sym_concatenated_string] = STATE(759),
+    [sym_string] = STATE(709),
+    [sym_await] = STATE(759),
     [sym_identifier] = ACTIONS(7),
     [anon_sym_import] = ACTIONS(9),
     [anon_sym_from] = ACTIONS(11),
@@ -22227,8 +19527,8 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_pass] = ACTIONS(27),
     [anon_sym_break] = ACTIONS(29),
     [anon_sym_continue] = ACTIONS(31),
-    [anon_sym_async] = ACTIONS(317),
-    [anon_sym_match] = ACTIONS(317),
+    [anon_sym_async] = ACTIONS(301),
+    [anon_sym_match] = ACTIONS(301),
     [anon_sym_DASH] = ACTIONS(47),
     [anon_sym_PLUS] = ACTIONS(47),
     [anon_sym_LBRACK] = ACTIONS(49),
@@ -22255,59 +19555,59 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym__string_start] = ACTIONS(81),
   },
   [112] = {
-    [sym__simple_statements] = STATE(490),
-    [sym_import_statement] = STATE(1209),
-    [sym_future_import_statement] = STATE(1209),
-    [sym_import_from_statement] = STATE(1209),
-    [sym_print_statement] = STATE(1209),
-    [sym_assert_statement] = STATE(1209),
-    [sym_expression_statement] = STATE(1209),
-    [sym_named_expression] = STATE(1009),
-    [sym_return_statement] = STATE(1209),
-    [sym_delete_statement] = STATE(1209),
-    [sym_raise_statement] = STATE(1209),
-    [sym_pass_statement] = STATE(1209),
-    [sym_break_statement] = STATE(1209),
-    [sym_continue_statement] = STATE(1209),
-    [sym_list_splat] = STATE(1360),
-    [sym_dictionary_splat] = STATE(1360),
-    [sym_global_statement] = STATE(1209),
-    [sym_nonlocal_statement] = STATE(1209),
-    [sym_exec_statement] = STATE(1209),
-    [sym_type_alias_statement] = STATE(1209),
-    [sym_expression_list] = STATE(1361),
-    [sym_pattern] = STATE(889),
-    [sym_tuple_pattern] = STATE(875),
-    [sym_list_pattern] = STATE(875),
-    [sym_list_splat_pattern] = STATE(875),
-    [sym_expression] = STATE(1019),
-    [sym_primary_expression] = STATE(684),
-    [sym_not_operator] = STATE(1009),
-    [sym_boolean_operator] = STATE(1009),
-    [sym_binary_operator] = STATE(797),
-    [sym_unary_operator] = STATE(797),
-    [sym_comparison_operator] = STATE(1009),
-    [sym_lambda] = STATE(1009),
-    [sym_assignment] = STATE(1361),
-    [sym_augmented_assignment] = STATE(1361),
-    [sym_pattern_list] = STATE(897),
-    [sym_yield] = STATE(1361),
-    [sym_attribute] = STATE(431),
-    [sym_subscript] = STATE(431),
-    [sym_call] = STATE(797),
-    [sym_list] = STATE(797),
-    [sym_set] = STATE(797),
-    [sym_tuple] = STATE(797),
-    [sym_dictionary] = STATE(797),
-    [sym_list_comprehension] = STATE(797),
-    [sym_dictionary_comprehension] = STATE(797),
-    [sym_set_comprehension] = STATE(797),
-    [sym_generator_expression] = STATE(797),
-    [sym_parenthesized_expression] = STATE(797),
-    [sym_conditional_expression] = STATE(1009),
-    [sym_concatenated_string] = STATE(797),
-    [sym_string] = STATE(713),
-    [sym_await] = STATE(1009),
+    [sym__simple_statements] = STATE(474),
+    [sym_import_statement] = STATE(1213),
+    [sym_future_import_statement] = STATE(1213),
+    [sym_import_from_statement] = STATE(1213),
+    [sym_print_statement] = STATE(1213),
+    [sym_assert_statement] = STATE(1213),
+    [sym_expression_statement] = STATE(1213),
+    [sym_named_expression] = STATE(985),
+    [sym_return_statement] = STATE(1213),
+    [sym_delete_statement] = STATE(1213),
+    [sym_raise_statement] = STATE(1213),
+    [sym_pass_statement] = STATE(1213),
+    [sym_break_statement] = STATE(1213),
+    [sym_continue_statement] = STATE(1213),
+    [sym_list_splat] = STATE(1321),
+    [sym_dictionary_splat] = STATE(1321),
+    [sym_global_statement] = STATE(1213),
+    [sym_nonlocal_statement] = STATE(1213),
+    [sym_exec_statement] = STATE(1213),
+    [sym_type_alias_statement] = STATE(1213),
+    [sym_expression_list] = STATE(1313),
+    [sym_pattern] = STATE(871),
+    [sym_tuple_pattern] = STATE(860),
+    [sym_list_pattern] = STATE(860),
+    [sym_list_splat_pattern] = STATE(860),
+    [sym_expression] = STATE(995),
+    [sym_primary_expression] = STATE(707),
+    [sym_not_operator] = STATE(985),
+    [sym_boolean_operator] = STATE(985),
+    [sym_binary_operator] = STATE(759),
+    [sym_unary_operator] = STATE(759),
+    [sym_comparison_operator] = STATE(985),
+    [sym_lambda] = STATE(985),
+    [sym_assignment] = STATE(1313),
+    [sym_augmented_assignment] = STATE(1313),
+    [sym_pattern_list] = STATE(880),
+    [sym_yield] = STATE(1313),
+    [sym_attribute] = STATE(422),
+    [sym_subscript] = STATE(422),
+    [sym_call] = STATE(759),
+    [sym_list] = STATE(759),
+    [sym_set] = STATE(759),
+    [sym_tuple] = STATE(759),
+    [sym_dictionary] = STATE(759),
+    [sym_list_comprehension] = STATE(759),
+    [sym_dictionary_comprehension] = STATE(759),
+    [sym_set_comprehension] = STATE(759),
+    [sym_generator_expression] = STATE(759),
+    [sym_parenthesized_expression] = STATE(759),
+    [sym_conditional_expression] = STATE(985),
+    [sym_concatenated_string] = STATE(759),
+    [sym_string] = STATE(709),
+    [sym_await] = STATE(759),
     [sym_identifier] = ACTIONS(7),
     [anon_sym_import] = ACTIONS(9),
     [anon_sym_from] = ACTIONS(11),
@@ -22321,8 +19621,8 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_pass] = ACTIONS(27),
     [anon_sym_break] = ACTIONS(29),
     [anon_sym_continue] = ACTIONS(31),
-    [anon_sym_async] = ACTIONS(317),
-    [anon_sym_match] = ACTIONS(317),
+    [anon_sym_async] = ACTIONS(301),
+    [anon_sym_match] = ACTIONS(301),
     [anon_sym_DASH] = ACTIONS(47),
     [anon_sym_PLUS] = ACTIONS(47),
     [anon_sym_LBRACK] = ACTIONS(49),
@@ -22349,59 +19649,59 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym__string_start] = ACTIONS(81),
   },
   [113] = {
-    [sym__simple_statements] = STATE(589),
-    [sym_import_statement] = STATE(1209),
-    [sym_future_import_statement] = STATE(1209),
-    [sym_import_from_statement] = STATE(1209),
-    [sym_print_statement] = STATE(1209),
-    [sym_assert_statement] = STATE(1209),
-    [sym_expression_statement] = STATE(1209),
-    [sym_named_expression] = STATE(1009),
-    [sym_return_statement] = STATE(1209),
-    [sym_delete_statement] = STATE(1209),
-    [sym_raise_statement] = STATE(1209),
-    [sym_pass_statement] = STATE(1209),
-    [sym_break_statement] = STATE(1209),
-    [sym_continue_statement] = STATE(1209),
-    [sym_list_splat] = STATE(1360),
-    [sym_dictionary_splat] = STATE(1360),
-    [sym_global_statement] = STATE(1209),
-    [sym_nonlocal_statement] = STATE(1209),
-    [sym_exec_statement] = STATE(1209),
-    [sym_type_alias_statement] = STATE(1209),
-    [sym_expression_list] = STATE(1361),
-    [sym_pattern] = STATE(889),
-    [sym_tuple_pattern] = STATE(875),
-    [sym_list_pattern] = STATE(875),
-    [sym_list_splat_pattern] = STATE(875),
-    [sym_expression] = STATE(1019),
-    [sym_primary_expression] = STATE(684),
-    [sym_not_operator] = STATE(1009),
-    [sym_boolean_operator] = STATE(1009),
-    [sym_binary_operator] = STATE(797),
-    [sym_unary_operator] = STATE(797),
-    [sym_comparison_operator] = STATE(1009),
-    [sym_lambda] = STATE(1009),
-    [sym_assignment] = STATE(1361),
-    [sym_augmented_assignment] = STATE(1361),
-    [sym_pattern_list] = STATE(897),
-    [sym_yield] = STATE(1361),
-    [sym_attribute] = STATE(431),
-    [sym_subscript] = STATE(431),
-    [sym_call] = STATE(797),
-    [sym_list] = STATE(797),
-    [sym_set] = STATE(797),
-    [sym_tuple] = STATE(797),
-    [sym_dictionary] = STATE(797),
-    [sym_list_comprehension] = STATE(797),
-    [sym_dictionary_comprehension] = STATE(797),
-    [sym_set_comprehension] = STATE(797),
-    [sym_generator_expression] = STATE(797),
-    [sym_parenthesized_expression] = STATE(797),
-    [sym_conditional_expression] = STATE(1009),
-    [sym_concatenated_string] = STATE(797),
-    [sym_string] = STATE(713),
-    [sym_await] = STATE(1009),
+    [sym__simple_statements] = STATE(389),
+    [sym_import_statement] = STATE(1304),
+    [sym_future_import_statement] = STATE(1304),
+    [sym_import_from_statement] = STATE(1304),
+    [sym_print_statement] = STATE(1304),
+    [sym_assert_statement] = STATE(1304),
+    [sym_expression_statement] = STATE(1304),
+    [sym_named_expression] = STATE(985),
+    [sym_return_statement] = STATE(1304),
+    [sym_delete_statement] = STATE(1304),
+    [sym_raise_statement] = STATE(1304),
+    [sym_pass_statement] = STATE(1304),
+    [sym_break_statement] = STATE(1304),
+    [sym_continue_statement] = STATE(1304),
+    [sym_list_splat] = STATE(1321),
+    [sym_dictionary_splat] = STATE(1321),
+    [sym_global_statement] = STATE(1304),
+    [sym_nonlocal_statement] = STATE(1304),
+    [sym_exec_statement] = STATE(1304),
+    [sym_type_alias_statement] = STATE(1304),
+    [sym_expression_list] = STATE(1313),
+    [sym_pattern] = STATE(871),
+    [sym_tuple_pattern] = STATE(860),
+    [sym_list_pattern] = STATE(860),
+    [sym_list_splat_pattern] = STATE(860),
+    [sym_expression] = STATE(995),
+    [sym_primary_expression] = STATE(707),
+    [sym_not_operator] = STATE(985),
+    [sym_boolean_operator] = STATE(985),
+    [sym_binary_operator] = STATE(759),
+    [sym_unary_operator] = STATE(759),
+    [sym_comparison_operator] = STATE(985),
+    [sym_lambda] = STATE(985),
+    [sym_assignment] = STATE(1313),
+    [sym_augmented_assignment] = STATE(1313),
+    [sym_pattern_list] = STATE(880),
+    [sym_yield] = STATE(1313),
+    [sym_attribute] = STATE(422),
+    [sym_subscript] = STATE(422),
+    [sym_call] = STATE(759),
+    [sym_list] = STATE(759),
+    [sym_set] = STATE(759),
+    [sym_tuple] = STATE(759),
+    [sym_dictionary] = STATE(759),
+    [sym_list_comprehension] = STATE(759),
+    [sym_dictionary_comprehension] = STATE(759),
+    [sym_set_comprehension] = STATE(759),
+    [sym_generator_expression] = STATE(759),
+    [sym_parenthesized_expression] = STATE(759),
+    [sym_conditional_expression] = STATE(985),
+    [sym_concatenated_string] = STATE(759),
+    [sym_string] = STATE(709),
+    [sym_await] = STATE(759),
     [sym_identifier] = ACTIONS(7),
     [anon_sym_import] = ACTIONS(9),
     [anon_sym_from] = ACTIONS(11),
@@ -22415,8 +19715,8 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_pass] = ACTIONS(27),
     [anon_sym_break] = ACTIONS(29),
     [anon_sym_continue] = ACTIONS(31),
-    [anon_sym_async] = ACTIONS(317),
-    [anon_sym_match] = ACTIONS(317),
+    [anon_sym_async] = ACTIONS(301),
+    [anon_sym_match] = ACTIONS(301),
     [anon_sym_DASH] = ACTIONS(47),
     [anon_sym_PLUS] = ACTIONS(47),
     [anon_sym_LBRACK] = ACTIONS(49),
@@ -22443,59 +19743,59 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym__string_start] = ACTIONS(81),
   },
   [114] = {
-    [sym__simple_statements] = STATE(388),
-    [sym_import_statement] = STATE(1209),
-    [sym_future_import_statement] = STATE(1209),
-    [sym_import_from_statement] = STATE(1209),
-    [sym_print_statement] = STATE(1209),
-    [sym_assert_statement] = STATE(1209),
-    [sym_expression_statement] = STATE(1209),
-    [sym_named_expression] = STATE(1009),
-    [sym_return_statement] = STATE(1209),
-    [sym_delete_statement] = STATE(1209),
-    [sym_raise_statement] = STATE(1209),
-    [sym_pass_statement] = STATE(1209),
-    [sym_break_statement] = STATE(1209),
-    [sym_continue_statement] = STATE(1209),
-    [sym_list_splat] = STATE(1360),
-    [sym_dictionary_splat] = STATE(1360),
-    [sym_global_statement] = STATE(1209),
-    [sym_nonlocal_statement] = STATE(1209),
-    [sym_exec_statement] = STATE(1209),
-    [sym_type_alias_statement] = STATE(1209),
-    [sym_expression_list] = STATE(1361),
-    [sym_pattern] = STATE(889),
-    [sym_tuple_pattern] = STATE(875),
-    [sym_list_pattern] = STATE(875),
-    [sym_list_splat_pattern] = STATE(875),
-    [sym_expression] = STATE(1019),
-    [sym_primary_expression] = STATE(684),
-    [sym_not_operator] = STATE(1009),
-    [sym_boolean_operator] = STATE(1009),
-    [sym_binary_operator] = STATE(797),
-    [sym_unary_operator] = STATE(797),
-    [sym_comparison_operator] = STATE(1009),
-    [sym_lambda] = STATE(1009),
-    [sym_assignment] = STATE(1361),
-    [sym_augmented_assignment] = STATE(1361),
-    [sym_pattern_list] = STATE(897),
-    [sym_yield] = STATE(1361),
-    [sym_attribute] = STATE(431),
-    [sym_subscript] = STATE(431),
-    [sym_call] = STATE(797),
-    [sym_list] = STATE(797),
-    [sym_set] = STATE(797),
-    [sym_tuple] = STATE(797),
-    [sym_dictionary] = STATE(797),
-    [sym_list_comprehension] = STATE(797),
-    [sym_dictionary_comprehension] = STATE(797),
-    [sym_set_comprehension] = STATE(797),
-    [sym_generator_expression] = STATE(797),
-    [sym_parenthesized_expression] = STATE(797),
-    [sym_conditional_expression] = STATE(1009),
-    [sym_concatenated_string] = STATE(797),
-    [sym_string] = STATE(713),
-    [sym_await] = STATE(1009),
+    [sym__simple_statements] = STATE(329),
+    [sym_import_statement] = STATE(1304),
+    [sym_future_import_statement] = STATE(1304),
+    [sym_import_from_statement] = STATE(1304),
+    [sym_print_statement] = STATE(1304),
+    [sym_assert_statement] = STATE(1304),
+    [sym_expression_statement] = STATE(1304),
+    [sym_named_expression] = STATE(985),
+    [sym_return_statement] = STATE(1304),
+    [sym_delete_statement] = STATE(1304),
+    [sym_raise_statement] = STATE(1304),
+    [sym_pass_statement] = STATE(1304),
+    [sym_break_statement] = STATE(1304),
+    [sym_continue_statement] = STATE(1304),
+    [sym_list_splat] = STATE(1321),
+    [sym_dictionary_splat] = STATE(1321),
+    [sym_global_statement] = STATE(1304),
+    [sym_nonlocal_statement] = STATE(1304),
+    [sym_exec_statement] = STATE(1304),
+    [sym_type_alias_statement] = STATE(1304),
+    [sym_expression_list] = STATE(1313),
+    [sym_pattern] = STATE(871),
+    [sym_tuple_pattern] = STATE(860),
+    [sym_list_pattern] = STATE(860),
+    [sym_list_splat_pattern] = STATE(860),
+    [sym_expression] = STATE(995),
+    [sym_primary_expression] = STATE(707),
+    [sym_not_operator] = STATE(985),
+    [sym_boolean_operator] = STATE(985),
+    [sym_binary_operator] = STATE(759),
+    [sym_unary_operator] = STATE(759),
+    [sym_comparison_operator] = STATE(985),
+    [sym_lambda] = STATE(985),
+    [sym_assignment] = STATE(1313),
+    [sym_augmented_assignment] = STATE(1313),
+    [sym_pattern_list] = STATE(880),
+    [sym_yield] = STATE(1313),
+    [sym_attribute] = STATE(422),
+    [sym_subscript] = STATE(422),
+    [sym_call] = STATE(759),
+    [sym_list] = STATE(759),
+    [sym_set] = STATE(759),
+    [sym_tuple] = STATE(759),
+    [sym_dictionary] = STATE(759),
+    [sym_list_comprehension] = STATE(759),
+    [sym_dictionary_comprehension] = STATE(759),
+    [sym_set_comprehension] = STATE(759),
+    [sym_generator_expression] = STATE(759),
+    [sym_parenthesized_expression] = STATE(759),
+    [sym_conditional_expression] = STATE(985),
+    [sym_concatenated_string] = STATE(759),
+    [sym_string] = STATE(709),
+    [sym_await] = STATE(759),
     [sym_identifier] = ACTIONS(7),
     [anon_sym_import] = ACTIONS(9),
     [anon_sym_from] = ACTIONS(11),
@@ -22509,8 +19809,8 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_pass] = ACTIONS(27),
     [anon_sym_break] = ACTIONS(29),
     [anon_sym_continue] = ACTIONS(31),
-    [anon_sym_async] = ACTIONS(317),
-    [anon_sym_match] = ACTIONS(317),
+    [anon_sym_async] = ACTIONS(301),
+    [anon_sym_match] = ACTIONS(301),
     [anon_sym_DASH] = ACTIONS(47),
     [anon_sym_PLUS] = ACTIONS(47),
     [anon_sym_LBRACK] = ACTIONS(49),
@@ -22537,59 +19837,59 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym__string_start] = ACTIONS(81),
   },
   [115] = {
-    [sym__simple_statements] = STATE(572),
-    [sym_import_statement] = STATE(1209),
-    [sym_future_import_statement] = STATE(1209),
-    [sym_import_from_statement] = STATE(1209),
-    [sym_print_statement] = STATE(1209),
-    [sym_assert_statement] = STATE(1209),
-    [sym_expression_statement] = STATE(1209),
-    [sym_named_expression] = STATE(1009),
-    [sym_return_statement] = STATE(1209),
-    [sym_delete_statement] = STATE(1209),
-    [sym_raise_statement] = STATE(1209),
-    [sym_pass_statement] = STATE(1209),
-    [sym_break_statement] = STATE(1209),
-    [sym_continue_statement] = STATE(1209),
-    [sym_list_splat] = STATE(1360),
-    [sym_dictionary_splat] = STATE(1360),
-    [sym_global_statement] = STATE(1209),
-    [sym_nonlocal_statement] = STATE(1209),
-    [sym_exec_statement] = STATE(1209),
-    [sym_type_alias_statement] = STATE(1209),
-    [sym_expression_list] = STATE(1361),
-    [sym_pattern] = STATE(889),
-    [sym_tuple_pattern] = STATE(875),
-    [sym_list_pattern] = STATE(875),
-    [sym_list_splat_pattern] = STATE(875),
-    [sym_expression] = STATE(1019),
-    [sym_primary_expression] = STATE(684),
-    [sym_not_operator] = STATE(1009),
-    [sym_boolean_operator] = STATE(1009),
-    [sym_binary_operator] = STATE(797),
-    [sym_unary_operator] = STATE(797),
-    [sym_comparison_operator] = STATE(1009),
-    [sym_lambda] = STATE(1009),
-    [sym_assignment] = STATE(1361),
-    [sym_augmented_assignment] = STATE(1361),
-    [sym_pattern_list] = STATE(897),
-    [sym_yield] = STATE(1361),
-    [sym_attribute] = STATE(431),
-    [sym_subscript] = STATE(431),
-    [sym_call] = STATE(797),
-    [sym_list] = STATE(797),
-    [sym_set] = STATE(797),
-    [sym_tuple] = STATE(797),
-    [sym_dictionary] = STATE(797),
-    [sym_list_comprehension] = STATE(797),
-    [sym_dictionary_comprehension] = STATE(797),
-    [sym_set_comprehension] = STATE(797),
-    [sym_generator_expression] = STATE(797),
-    [sym_parenthesized_expression] = STATE(797),
-    [sym_conditional_expression] = STATE(1009),
-    [sym_concatenated_string] = STATE(797),
-    [sym_string] = STATE(713),
-    [sym_await] = STATE(1009),
+    [sym__simple_statements] = STATE(472),
+    [sym_import_statement] = STATE(1304),
+    [sym_future_import_statement] = STATE(1304),
+    [sym_import_from_statement] = STATE(1304),
+    [sym_print_statement] = STATE(1304),
+    [sym_assert_statement] = STATE(1304),
+    [sym_expression_statement] = STATE(1304),
+    [sym_named_expression] = STATE(985),
+    [sym_return_statement] = STATE(1304),
+    [sym_delete_statement] = STATE(1304),
+    [sym_raise_statement] = STATE(1304),
+    [sym_pass_statement] = STATE(1304),
+    [sym_break_statement] = STATE(1304),
+    [sym_continue_statement] = STATE(1304),
+    [sym_list_splat] = STATE(1321),
+    [sym_dictionary_splat] = STATE(1321),
+    [sym_global_statement] = STATE(1304),
+    [sym_nonlocal_statement] = STATE(1304),
+    [sym_exec_statement] = STATE(1304),
+    [sym_type_alias_statement] = STATE(1304),
+    [sym_expression_list] = STATE(1313),
+    [sym_pattern] = STATE(871),
+    [sym_tuple_pattern] = STATE(860),
+    [sym_list_pattern] = STATE(860),
+    [sym_list_splat_pattern] = STATE(860),
+    [sym_expression] = STATE(995),
+    [sym_primary_expression] = STATE(707),
+    [sym_not_operator] = STATE(985),
+    [sym_boolean_operator] = STATE(985),
+    [sym_binary_operator] = STATE(759),
+    [sym_unary_operator] = STATE(759),
+    [sym_comparison_operator] = STATE(985),
+    [sym_lambda] = STATE(985),
+    [sym_assignment] = STATE(1313),
+    [sym_augmented_assignment] = STATE(1313),
+    [sym_pattern_list] = STATE(880),
+    [sym_yield] = STATE(1313),
+    [sym_attribute] = STATE(422),
+    [sym_subscript] = STATE(422),
+    [sym_call] = STATE(759),
+    [sym_list] = STATE(759),
+    [sym_set] = STATE(759),
+    [sym_tuple] = STATE(759),
+    [sym_dictionary] = STATE(759),
+    [sym_list_comprehension] = STATE(759),
+    [sym_dictionary_comprehension] = STATE(759),
+    [sym_set_comprehension] = STATE(759),
+    [sym_generator_expression] = STATE(759),
+    [sym_parenthesized_expression] = STATE(759),
+    [sym_conditional_expression] = STATE(985),
+    [sym_concatenated_string] = STATE(759),
+    [sym_string] = STATE(709),
+    [sym_await] = STATE(759),
     [sym_identifier] = ACTIONS(7),
     [anon_sym_import] = ACTIONS(9),
     [anon_sym_from] = ACTIONS(11),
@@ -22603,8 +19903,8 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_pass] = ACTIONS(27),
     [anon_sym_break] = ACTIONS(29),
     [anon_sym_continue] = ACTIONS(31),
-    [anon_sym_async] = ACTIONS(317),
-    [anon_sym_match] = ACTIONS(317),
+    [anon_sym_async] = ACTIONS(301),
+    [anon_sym_match] = ACTIONS(301),
     [anon_sym_DASH] = ACTIONS(47),
     [anon_sym_PLUS] = ACTIONS(47),
     [anon_sym_LBRACK] = ACTIONS(49),
@@ -22631,59 +19931,59 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym__string_start] = ACTIONS(81),
   },
   [116] = {
-    [sym__simple_statements] = STATE(485),
-    [sym_import_statement] = STATE(1319),
-    [sym_future_import_statement] = STATE(1319),
-    [sym_import_from_statement] = STATE(1319),
-    [sym_print_statement] = STATE(1319),
-    [sym_assert_statement] = STATE(1319),
-    [sym_expression_statement] = STATE(1319),
-    [sym_named_expression] = STATE(1009),
-    [sym_return_statement] = STATE(1319),
-    [sym_delete_statement] = STATE(1319),
-    [sym_raise_statement] = STATE(1319),
-    [sym_pass_statement] = STATE(1319),
-    [sym_break_statement] = STATE(1319),
-    [sym_continue_statement] = STATE(1319),
-    [sym_list_splat] = STATE(1360),
-    [sym_dictionary_splat] = STATE(1360),
-    [sym_global_statement] = STATE(1319),
-    [sym_nonlocal_statement] = STATE(1319),
-    [sym_exec_statement] = STATE(1319),
-    [sym_type_alias_statement] = STATE(1319),
-    [sym_expression_list] = STATE(1361),
-    [sym_pattern] = STATE(889),
-    [sym_tuple_pattern] = STATE(875),
-    [sym_list_pattern] = STATE(875),
-    [sym_list_splat_pattern] = STATE(875),
-    [sym_expression] = STATE(1019),
-    [sym_primary_expression] = STATE(684),
-    [sym_not_operator] = STATE(1009),
-    [sym_boolean_operator] = STATE(1009),
-    [sym_binary_operator] = STATE(797),
-    [sym_unary_operator] = STATE(797),
-    [sym_comparison_operator] = STATE(1009),
-    [sym_lambda] = STATE(1009),
-    [sym_assignment] = STATE(1361),
-    [sym_augmented_assignment] = STATE(1361),
-    [sym_pattern_list] = STATE(897),
-    [sym_yield] = STATE(1361),
-    [sym_attribute] = STATE(431),
-    [sym_subscript] = STATE(431),
-    [sym_call] = STATE(797),
-    [sym_list] = STATE(797),
-    [sym_set] = STATE(797),
-    [sym_tuple] = STATE(797),
-    [sym_dictionary] = STATE(797),
-    [sym_list_comprehension] = STATE(797),
-    [sym_dictionary_comprehension] = STATE(797),
-    [sym_set_comprehension] = STATE(797),
-    [sym_generator_expression] = STATE(797),
-    [sym_parenthesized_expression] = STATE(797),
-    [sym_conditional_expression] = STATE(1009),
-    [sym_concatenated_string] = STATE(797),
-    [sym_string] = STATE(713),
-    [sym_await] = STATE(1009),
+    [sym__simple_statements] = STATE(402),
+    [sym_import_statement] = STATE(1304),
+    [sym_future_import_statement] = STATE(1304),
+    [sym_import_from_statement] = STATE(1304),
+    [sym_print_statement] = STATE(1304),
+    [sym_assert_statement] = STATE(1304),
+    [sym_expression_statement] = STATE(1304),
+    [sym_named_expression] = STATE(985),
+    [sym_return_statement] = STATE(1304),
+    [sym_delete_statement] = STATE(1304),
+    [sym_raise_statement] = STATE(1304),
+    [sym_pass_statement] = STATE(1304),
+    [sym_break_statement] = STATE(1304),
+    [sym_continue_statement] = STATE(1304),
+    [sym_list_splat] = STATE(1321),
+    [sym_dictionary_splat] = STATE(1321),
+    [sym_global_statement] = STATE(1304),
+    [sym_nonlocal_statement] = STATE(1304),
+    [sym_exec_statement] = STATE(1304),
+    [sym_type_alias_statement] = STATE(1304),
+    [sym_expression_list] = STATE(1313),
+    [sym_pattern] = STATE(871),
+    [sym_tuple_pattern] = STATE(860),
+    [sym_list_pattern] = STATE(860),
+    [sym_list_splat_pattern] = STATE(860),
+    [sym_expression] = STATE(995),
+    [sym_primary_expression] = STATE(707),
+    [sym_not_operator] = STATE(985),
+    [sym_boolean_operator] = STATE(985),
+    [sym_binary_operator] = STATE(759),
+    [sym_unary_operator] = STATE(759),
+    [sym_comparison_operator] = STATE(985),
+    [sym_lambda] = STATE(985),
+    [sym_assignment] = STATE(1313),
+    [sym_augmented_assignment] = STATE(1313),
+    [sym_pattern_list] = STATE(880),
+    [sym_yield] = STATE(1313),
+    [sym_attribute] = STATE(422),
+    [sym_subscript] = STATE(422),
+    [sym_call] = STATE(759),
+    [sym_list] = STATE(759),
+    [sym_set] = STATE(759),
+    [sym_tuple] = STATE(759),
+    [sym_dictionary] = STATE(759),
+    [sym_list_comprehension] = STATE(759),
+    [sym_dictionary_comprehension] = STATE(759),
+    [sym_set_comprehension] = STATE(759),
+    [sym_generator_expression] = STATE(759),
+    [sym_parenthesized_expression] = STATE(759),
+    [sym_conditional_expression] = STATE(985),
+    [sym_concatenated_string] = STATE(759),
+    [sym_string] = STATE(709),
+    [sym_await] = STATE(759),
     [sym_identifier] = ACTIONS(7),
     [anon_sym_import] = ACTIONS(9),
     [anon_sym_from] = ACTIONS(11),
@@ -22697,8 +19997,8 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_pass] = ACTIONS(27),
     [anon_sym_break] = ACTIONS(29),
     [anon_sym_continue] = ACTIONS(31),
-    [anon_sym_async] = ACTIONS(317),
-    [anon_sym_match] = ACTIONS(317),
+    [anon_sym_async] = ACTIONS(301),
+    [anon_sym_match] = ACTIONS(301),
     [anon_sym_DASH] = ACTIONS(47),
     [anon_sym_PLUS] = ACTIONS(47),
     [anon_sym_LBRACK] = ACTIONS(49),
@@ -22725,59 +20025,59 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym__string_start] = ACTIONS(81),
   },
   [117] = {
-    [sym__simple_statements] = STATE(501),
-    [sym_import_statement] = STATE(1209),
-    [sym_future_import_statement] = STATE(1209),
-    [sym_import_from_statement] = STATE(1209),
-    [sym_print_statement] = STATE(1209),
-    [sym_assert_statement] = STATE(1209),
-    [sym_expression_statement] = STATE(1209),
-    [sym_named_expression] = STATE(1009),
-    [sym_return_statement] = STATE(1209),
-    [sym_delete_statement] = STATE(1209),
-    [sym_raise_statement] = STATE(1209),
-    [sym_pass_statement] = STATE(1209),
-    [sym_break_statement] = STATE(1209),
-    [sym_continue_statement] = STATE(1209),
-    [sym_list_splat] = STATE(1360),
-    [sym_dictionary_splat] = STATE(1360),
-    [sym_global_statement] = STATE(1209),
-    [sym_nonlocal_statement] = STATE(1209),
-    [sym_exec_statement] = STATE(1209),
-    [sym_type_alias_statement] = STATE(1209),
-    [sym_expression_list] = STATE(1361),
-    [sym_pattern] = STATE(889),
-    [sym_tuple_pattern] = STATE(875),
-    [sym_list_pattern] = STATE(875),
-    [sym_list_splat_pattern] = STATE(875),
-    [sym_expression] = STATE(1019),
-    [sym_primary_expression] = STATE(684),
-    [sym_not_operator] = STATE(1009),
-    [sym_boolean_operator] = STATE(1009),
-    [sym_binary_operator] = STATE(797),
-    [sym_unary_operator] = STATE(797),
-    [sym_comparison_operator] = STATE(1009),
-    [sym_lambda] = STATE(1009),
-    [sym_assignment] = STATE(1361),
-    [sym_augmented_assignment] = STATE(1361),
-    [sym_pattern_list] = STATE(897),
-    [sym_yield] = STATE(1361),
-    [sym_attribute] = STATE(431),
-    [sym_subscript] = STATE(431),
-    [sym_call] = STATE(797),
-    [sym_list] = STATE(797),
-    [sym_set] = STATE(797),
-    [sym_tuple] = STATE(797),
-    [sym_dictionary] = STATE(797),
-    [sym_list_comprehension] = STATE(797),
-    [sym_dictionary_comprehension] = STATE(797),
-    [sym_set_comprehension] = STATE(797),
-    [sym_generator_expression] = STATE(797),
-    [sym_parenthesized_expression] = STATE(797),
-    [sym_conditional_expression] = STATE(1009),
-    [sym_concatenated_string] = STATE(797),
-    [sym_string] = STATE(713),
-    [sym_await] = STATE(1009),
+    [sym__simple_statements] = STATE(362),
+    [sym_import_statement] = STATE(1213),
+    [sym_future_import_statement] = STATE(1213),
+    [sym_import_from_statement] = STATE(1213),
+    [sym_print_statement] = STATE(1213),
+    [sym_assert_statement] = STATE(1213),
+    [sym_expression_statement] = STATE(1213),
+    [sym_named_expression] = STATE(985),
+    [sym_return_statement] = STATE(1213),
+    [sym_delete_statement] = STATE(1213),
+    [sym_raise_statement] = STATE(1213),
+    [sym_pass_statement] = STATE(1213),
+    [sym_break_statement] = STATE(1213),
+    [sym_continue_statement] = STATE(1213),
+    [sym_list_splat] = STATE(1321),
+    [sym_dictionary_splat] = STATE(1321),
+    [sym_global_statement] = STATE(1213),
+    [sym_nonlocal_statement] = STATE(1213),
+    [sym_exec_statement] = STATE(1213),
+    [sym_type_alias_statement] = STATE(1213),
+    [sym_expression_list] = STATE(1313),
+    [sym_pattern] = STATE(871),
+    [sym_tuple_pattern] = STATE(860),
+    [sym_list_pattern] = STATE(860),
+    [sym_list_splat_pattern] = STATE(860),
+    [sym_expression] = STATE(995),
+    [sym_primary_expression] = STATE(707),
+    [sym_not_operator] = STATE(985),
+    [sym_boolean_operator] = STATE(985),
+    [sym_binary_operator] = STATE(759),
+    [sym_unary_operator] = STATE(759),
+    [sym_comparison_operator] = STATE(985),
+    [sym_lambda] = STATE(985),
+    [sym_assignment] = STATE(1313),
+    [sym_augmented_assignment] = STATE(1313),
+    [sym_pattern_list] = STATE(880),
+    [sym_yield] = STATE(1313),
+    [sym_attribute] = STATE(422),
+    [sym_subscript] = STATE(422),
+    [sym_call] = STATE(759),
+    [sym_list] = STATE(759),
+    [sym_set] = STATE(759),
+    [sym_tuple] = STATE(759),
+    [sym_dictionary] = STATE(759),
+    [sym_list_comprehension] = STATE(759),
+    [sym_dictionary_comprehension] = STATE(759),
+    [sym_set_comprehension] = STATE(759),
+    [sym_generator_expression] = STATE(759),
+    [sym_parenthesized_expression] = STATE(759),
+    [sym_conditional_expression] = STATE(985),
+    [sym_concatenated_string] = STATE(759),
+    [sym_string] = STATE(709),
+    [sym_await] = STATE(759),
     [sym_identifier] = ACTIONS(7),
     [anon_sym_import] = ACTIONS(9),
     [anon_sym_from] = ACTIONS(11),
@@ -22791,8 +20091,8 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_pass] = ACTIONS(27),
     [anon_sym_break] = ACTIONS(29),
     [anon_sym_continue] = ACTIONS(31),
-    [anon_sym_async] = ACTIONS(317),
-    [anon_sym_match] = ACTIONS(317),
+    [anon_sym_async] = ACTIONS(301),
+    [anon_sym_match] = ACTIONS(301),
     [anon_sym_DASH] = ACTIONS(47),
     [anon_sym_PLUS] = ACTIONS(47),
     [anon_sym_LBRACK] = ACTIONS(49),
@@ -22819,59 +20119,59 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym__string_start] = ACTIONS(81),
   },
   [118] = {
-    [sym__simple_statements] = STATE(430),
-    [sym_import_statement] = STATE(1209),
-    [sym_future_import_statement] = STATE(1209),
-    [sym_import_from_statement] = STATE(1209),
-    [sym_print_statement] = STATE(1209),
-    [sym_assert_statement] = STATE(1209),
-    [sym_expression_statement] = STATE(1209),
-    [sym_named_expression] = STATE(1009),
-    [sym_return_statement] = STATE(1209),
-    [sym_delete_statement] = STATE(1209),
-    [sym_raise_statement] = STATE(1209),
-    [sym_pass_statement] = STATE(1209),
-    [sym_break_statement] = STATE(1209),
-    [sym_continue_statement] = STATE(1209),
-    [sym_list_splat] = STATE(1360),
-    [sym_dictionary_splat] = STATE(1360),
-    [sym_global_statement] = STATE(1209),
-    [sym_nonlocal_statement] = STATE(1209),
-    [sym_exec_statement] = STATE(1209),
-    [sym_type_alias_statement] = STATE(1209),
-    [sym_expression_list] = STATE(1361),
-    [sym_pattern] = STATE(889),
-    [sym_tuple_pattern] = STATE(875),
-    [sym_list_pattern] = STATE(875),
-    [sym_list_splat_pattern] = STATE(875),
-    [sym_expression] = STATE(1019),
-    [sym_primary_expression] = STATE(684),
-    [sym_not_operator] = STATE(1009),
-    [sym_boolean_operator] = STATE(1009),
-    [sym_binary_operator] = STATE(797),
-    [sym_unary_operator] = STATE(797),
-    [sym_comparison_operator] = STATE(1009),
-    [sym_lambda] = STATE(1009),
-    [sym_assignment] = STATE(1361),
-    [sym_augmented_assignment] = STATE(1361),
-    [sym_pattern_list] = STATE(897),
-    [sym_yield] = STATE(1361),
-    [sym_attribute] = STATE(431),
-    [sym_subscript] = STATE(431),
-    [sym_call] = STATE(797),
-    [sym_list] = STATE(797),
-    [sym_set] = STATE(797),
-    [sym_tuple] = STATE(797),
-    [sym_dictionary] = STATE(797),
-    [sym_list_comprehension] = STATE(797),
-    [sym_dictionary_comprehension] = STATE(797),
-    [sym_set_comprehension] = STATE(797),
-    [sym_generator_expression] = STATE(797),
-    [sym_parenthesized_expression] = STATE(797),
-    [sym_conditional_expression] = STATE(1009),
-    [sym_concatenated_string] = STATE(797),
-    [sym_string] = STATE(713),
-    [sym_await] = STATE(1009),
+    [sym__simple_statements] = STATE(503),
+    [sym_import_statement] = STATE(1304),
+    [sym_future_import_statement] = STATE(1304),
+    [sym_import_from_statement] = STATE(1304),
+    [sym_print_statement] = STATE(1304),
+    [sym_assert_statement] = STATE(1304),
+    [sym_expression_statement] = STATE(1304),
+    [sym_named_expression] = STATE(985),
+    [sym_return_statement] = STATE(1304),
+    [sym_delete_statement] = STATE(1304),
+    [sym_raise_statement] = STATE(1304),
+    [sym_pass_statement] = STATE(1304),
+    [sym_break_statement] = STATE(1304),
+    [sym_continue_statement] = STATE(1304),
+    [sym_list_splat] = STATE(1321),
+    [sym_dictionary_splat] = STATE(1321),
+    [sym_global_statement] = STATE(1304),
+    [sym_nonlocal_statement] = STATE(1304),
+    [sym_exec_statement] = STATE(1304),
+    [sym_type_alias_statement] = STATE(1304),
+    [sym_expression_list] = STATE(1313),
+    [sym_pattern] = STATE(871),
+    [sym_tuple_pattern] = STATE(860),
+    [sym_list_pattern] = STATE(860),
+    [sym_list_splat_pattern] = STATE(860),
+    [sym_expression] = STATE(995),
+    [sym_primary_expression] = STATE(707),
+    [sym_not_operator] = STATE(985),
+    [sym_boolean_operator] = STATE(985),
+    [sym_binary_operator] = STATE(759),
+    [sym_unary_operator] = STATE(759),
+    [sym_comparison_operator] = STATE(985),
+    [sym_lambda] = STATE(985),
+    [sym_assignment] = STATE(1313),
+    [sym_augmented_assignment] = STATE(1313),
+    [sym_pattern_list] = STATE(880),
+    [sym_yield] = STATE(1313),
+    [sym_attribute] = STATE(422),
+    [sym_subscript] = STATE(422),
+    [sym_call] = STATE(759),
+    [sym_list] = STATE(759),
+    [sym_set] = STATE(759),
+    [sym_tuple] = STATE(759),
+    [sym_dictionary] = STATE(759),
+    [sym_list_comprehension] = STATE(759),
+    [sym_dictionary_comprehension] = STATE(759),
+    [sym_set_comprehension] = STATE(759),
+    [sym_generator_expression] = STATE(759),
+    [sym_parenthesized_expression] = STATE(759),
+    [sym_conditional_expression] = STATE(985),
+    [sym_concatenated_string] = STATE(759),
+    [sym_string] = STATE(709),
+    [sym_await] = STATE(759),
     [sym_identifier] = ACTIONS(7),
     [anon_sym_import] = ACTIONS(9),
     [anon_sym_from] = ACTIONS(11),
@@ -22885,8 +20185,8 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_pass] = ACTIONS(27),
     [anon_sym_break] = ACTIONS(29),
     [anon_sym_continue] = ACTIONS(31),
-    [anon_sym_async] = ACTIONS(317),
-    [anon_sym_match] = ACTIONS(317),
+    [anon_sym_async] = ACTIONS(301),
+    [anon_sym_match] = ACTIONS(301),
     [anon_sym_DASH] = ACTIONS(47),
     [anon_sym_PLUS] = ACTIONS(47),
     [anon_sym_LBRACK] = ACTIONS(49),
@@ -22913,59 +20213,59 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym__string_start] = ACTIONS(81),
   },
   [119] = {
-    [sym__simple_statements] = STATE(497),
-    [sym_import_statement] = STATE(1209),
-    [sym_future_import_statement] = STATE(1209),
-    [sym_import_from_statement] = STATE(1209),
-    [sym_print_statement] = STATE(1209),
-    [sym_assert_statement] = STATE(1209),
-    [sym_expression_statement] = STATE(1209),
-    [sym_named_expression] = STATE(1009),
-    [sym_return_statement] = STATE(1209),
-    [sym_delete_statement] = STATE(1209),
-    [sym_raise_statement] = STATE(1209),
-    [sym_pass_statement] = STATE(1209),
-    [sym_break_statement] = STATE(1209),
-    [sym_continue_statement] = STATE(1209),
-    [sym_list_splat] = STATE(1360),
-    [sym_dictionary_splat] = STATE(1360),
-    [sym_global_statement] = STATE(1209),
-    [sym_nonlocal_statement] = STATE(1209),
-    [sym_exec_statement] = STATE(1209),
-    [sym_type_alias_statement] = STATE(1209),
-    [sym_expression_list] = STATE(1361),
-    [sym_pattern] = STATE(889),
-    [sym_tuple_pattern] = STATE(875),
-    [sym_list_pattern] = STATE(875),
-    [sym_list_splat_pattern] = STATE(875),
-    [sym_expression] = STATE(1019),
-    [sym_primary_expression] = STATE(684),
-    [sym_not_operator] = STATE(1009),
-    [sym_boolean_operator] = STATE(1009),
-    [sym_binary_operator] = STATE(797),
-    [sym_unary_operator] = STATE(797),
-    [sym_comparison_operator] = STATE(1009),
-    [sym_lambda] = STATE(1009),
-    [sym_assignment] = STATE(1361),
-    [sym_augmented_assignment] = STATE(1361),
-    [sym_pattern_list] = STATE(897),
-    [sym_yield] = STATE(1361),
-    [sym_attribute] = STATE(431),
-    [sym_subscript] = STATE(431),
-    [sym_call] = STATE(797),
-    [sym_list] = STATE(797),
-    [sym_set] = STATE(797),
-    [sym_tuple] = STATE(797),
-    [sym_dictionary] = STATE(797),
-    [sym_list_comprehension] = STATE(797),
-    [sym_dictionary_comprehension] = STATE(797),
-    [sym_set_comprehension] = STATE(797),
-    [sym_generator_expression] = STATE(797),
-    [sym_parenthesized_expression] = STATE(797),
-    [sym_conditional_expression] = STATE(1009),
-    [sym_concatenated_string] = STATE(797),
-    [sym_string] = STATE(713),
-    [sym_await] = STATE(1009),
+    [sym__simple_statements] = STATE(279),
+    [sym_import_statement] = STATE(1304),
+    [sym_future_import_statement] = STATE(1304),
+    [sym_import_from_statement] = STATE(1304),
+    [sym_print_statement] = STATE(1304),
+    [sym_assert_statement] = STATE(1304),
+    [sym_expression_statement] = STATE(1304),
+    [sym_named_expression] = STATE(985),
+    [sym_return_statement] = STATE(1304),
+    [sym_delete_statement] = STATE(1304),
+    [sym_raise_statement] = STATE(1304),
+    [sym_pass_statement] = STATE(1304),
+    [sym_break_statement] = STATE(1304),
+    [sym_continue_statement] = STATE(1304),
+    [sym_list_splat] = STATE(1321),
+    [sym_dictionary_splat] = STATE(1321),
+    [sym_global_statement] = STATE(1304),
+    [sym_nonlocal_statement] = STATE(1304),
+    [sym_exec_statement] = STATE(1304),
+    [sym_type_alias_statement] = STATE(1304),
+    [sym_expression_list] = STATE(1313),
+    [sym_pattern] = STATE(871),
+    [sym_tuple_pattern] = STATE(860),
+    [sym_list_pattern] = STATE(860),
+    [sym_list_splat_pattern] = STATE(860),
+    [sym_expression] = STATE(995),
+    [sym_primary_expression] = STATE(707),
+    [sym_not_operator] = STATE(985),
+    [sym_boolean_operator] = STATE(985),
+    [sym_binary_operator] = STATE(759),
+    [sym_unary_operator] = STATE(759),
+    [sym_comparison_operator] = STATE(985),
+    [sym_lambda] = STATE(985),
+    [sym_assignment] = STATE(1313),
+    [sym_augmented_assignment] = STATE(1313),
+    [sym_pattern_list] = STATE(880),
+    [sym_yield] = STATE(1313),
+    [sym_attribute] = STATE(422),
+    [sym_subscript] = STATE(422),
+    [sym_call] = STATE(759),
+    [sym_list] = STATE(759),
+    [sym_set] = STATE(759),
+    [sym_tuple] = STATE(759),
+    [sym_dictionary] = STATE(759),
+    [sym_list_comprehension] = STATE(759),
+    [sym_dictionary_comprehension] = STATE(759),
+    [sym_set_comprehension] = STATE(759),
+    [sym_generator_expression] = STATE(759),
+    [sym_parenthesized_expression] = STATE(759),
+    [sym_conditional_expression] = STATE(985),
+    [sym_concatenated_string] = STATE(759),
+    [sym_string] = STATE(709),
+    [sym_await] = STATE(759),
     [sym_identifier] = ACTIONS(7),
     [anon_sym_import] = ACTIONS(9),
     [anon_sym_from] = ACTIONS(11),
@@ -22979,8 +20279,8 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_pass] = ACTIONS(27),
     [anon_sym_break] = ACTIONS(29),
     [anon_sym_continue] = ACTIONS(31),
-    [anon_sym_async] = ACTIONS(317),
-    [anon_sym_match] = ACTIONS(317),
+    [anon_sym_async] = ACTIONS(301),
+    [anon_sym_match] = ACTIONS(301),
     [anon_sym_DASH] = ACTIONS(47),
     [anon_sym_PLUS] = ACTIONS(47),
     [anon_sym_LBRACK] = ACTIONS(49),
@@ -23007,59 +20307,59 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym__string_start] = ACTIONS(81),
   },
   [120] = {
-    [sym__simple_statements] = STATE(553),
-    [sym_import_statement] = STATE(1209),
-    [sym_future_import_statement] = STATE(1209),
-    [sym_import_from_statement] = STATE(1209),
-    [sym_print_statement] = STATE(1209),
-    [sym_assert_statement] = STATE(1209),
-    [sym_expression_statement] = STATE(1209),
-    [sym_named_expression] = STATE(1009),
-    [sym_return_statement] = STATE(1209),
-    [sym_delete_statement] = STATE(1209),
-    [sym_raise_statement] = STATE(1209),
-    [sym_pass_statement] = STATE(1209),
-    [sym_break_statement] = STATE(1209),
-    [sym_continue_statement] = STATE(1209),
-    [sym_list_splat] = STATE(1360),
-    [sym_dictionary_splat] = STATE(1360),
-    [sym_global_statement] = STATE(1209),
-    [sym_nonlocal_statement] = STATE(1209),
-    [sym_exec_statement] = STATE(1209),
-    [sym_type_alias_statement] = STATE(1209),
-    [sym_expression_list] = STATE(1361),
-    [sym_pattern] = STATE(889),
-    [sym_tuple_pattern] = STATE(875),
-    [sym_list_pattern] = STATE(875),
-    [sym_list_splat_pattern] = STATE(875),
-    [sym_expression] = STATE(1019),
-    [sym_primary_expression] = STATE(684),
-    [sym_not_operator] = STATE(1009),
-    [sym_boolean_operator] = STATE(1009),
-    [sym_binary_operator] = STATE(797),
-    [sym_unary_operator] = STATE(797),
-    [sym_comparison_operator] = STATE(1009),
-    [sym_lambda] = STATE(1009),
-    [sym_assignment] = STATE(1361),
-    [sym_augmented_assignment] = STATE(1361),
-    [sym_pattern_list] = STATE(897),
-    [sym_yield] = STATE(1361),
-    [sym_attribute] = STATE(431),
-    [sym_subscript] = STATE(431),
-    [sym_call] = STATE(797),
-    [sym_list] = STATE(797),
-    [sym_set] = STATE(797),
-    [sym_tuple] = STATE(797),
-    [sym_dictionary] = STATE(797),
-    [sym_list_comprehension] = STATE(797),
-    [sym_dictionary_comprehension] = STATE(797),
-    [sym_set_comprehension] = STATE(797),
-    [sym_generator_expression] = STATE(797),
-    [sym_parenthesized_expression] = STATE(797),
-    [sym_conditional_expression] = STATE(1009),
-    [sym_concatenated_string] = STATE(797),
-    [sym_string] = STATE(713),
-    [sym_await] = STATE(1009),
+    [sym__simple_statements] = STATE(464),
+    [sym_import_statement] = STATE(1213),
+    [sym_future_import_statement] = STATE(1213),
+    [sym_import_from_statement] = STATE(1213),
+    [sym_print_statement] = STATE(1213),
+    [sym_assert_statement] = STATE(1213),
+    [sym_expression_statement] = STATE(1213),
+    [sym_named_expression] = STATE(985),
+    [sym_return_statement] = STATE(1213),
+    [sym_delete_statement] = STATE(1213),
+    [sym_raise_statement] = STATE(1213),
+    [sym_pass_statement] = STATE(1213),
+    [sym_break_statement] = STATE(1213),
+    [sym_continue_statement] = STATE(1213),
+    [sym_list_splat] = STATE(1321),
+    [sym_dictionary_splat] = STATE(1321),
+    [sym_global_statement] = STATE(1213),
+    [sym_nonlocal_statement] = STATE(1213),
+    [sym_exec_statement] = STATE(1213),
+    [sym_type_alias_statement] = STATE(1213),
+    [sym_expression_list] = STATE(1313),
+    [sym_pattern] = STATE(871),
+    [sym_tuple_pattern] = STATE(860),
+    [sym_list_pattern] = STATE(860),
+    [sym_list_splat_pattern] = STATE(860),
+    [sym_expression] = STATE(995),
+    [sym_primary_expression] = STATE(707),
+    [sym_not_operator] = STATE(985),
+    [sym_boolean_operator] = STATE(985),
+    [sym_binary_operator] = STATE(759),
+    [sym_unary_operator] = STATE(759),
+    [sym_comparison_operator] = STATE(985),
+    [sym_lambda] = STATE(985),
+    [sym_assignment] = STATE(1313),
+    [sym_augmented_assignment] = STATE(1313),
+    [sym_pattern_list] = STATE(880),
+    [sym_yield] = STATE(1313),
+    [sym_attribute] = STATE(422),
+    [sym_subscript] = STATE(422),
+    [sym_call] = STATE(759),
+    [sym_list] = STATE(759),
+    [sym_set] = STATE(759),
+    [sym_tuple] = STATE(759),
+    [sym_dictionary] = STATE(759),
+    [sym_list_comprehension] = STATE(759),
+    [sym_dictionary_comprehension] = STATE(759),
+    [sym_set_comprehension] = STATE(759),
+    [sym_generator_expression] = STATE(759),
+    [sym_parenthesized_expression] = STATE(759),
+    [sym_conditional_expression] = STATE(985),
+    [sym_concatenated_string] = STATE(759),
+    [sym_string] = STATE(709),
+    [sym_await] = STATE(759),
     [sym_identifier] = ACTIONS(7),
     [anon_sym_import] = ACTIONS(9),
     [anon_sym_from] = ACTIONS(11),
@@ -23073,8 +20373,8 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_pass] = ACTIONS(27),
     [anon_sym_break] = ACTIONS(29),
     [anon_sym_continue] = ACTIONS(31),
-    [anon_sym_async] = ACTIONS(317),
-    [anon_sym_match] = ACTIONS(317),
+    [anon_sym_async] = ACTIONS(301),
+    [anon_sym_match] = ACTIONS(301),
     [anon_sym_DASH] = ACTIONS(47),
     [anon_sym_PLUS] = ACTIONS(47),
     [anon_sym_LBRACK] = ACTIONS(49),
@@ -23101,59 +20401,59 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym__string_start] = ACTIONS(81),
   },
   [121] = {
-    [sym__simple_statements] = STATE(486),
-    [sym_import_statement] = STATE(1209),
-    [sym_future_import_statement] = STATE(1209),
-    [sym_import_from_statement] = STATE(1209),
-    [sym_print_statement] = STATE(1209),
-    [sym_assert_statement] = STATE(1209),
-    [sym_expression_statement] = STATE(1209),
-    [sym_named_expression] = STATE(1009),
-    [sym_return_statement] = STATE(1209),
-    [sym_delete_statement] = STATE(1209),
-    [sym_raise_statement] = STATE(1209),
-    [sym_pass_statement] = STATE(1209),
-    [sym_break_statement] = STATE(1209),
-    [sym_continue_statement] = STATE(1209),
-    [sym_list_splat] = STATE(1360),
-    [sym_dictionary_splat] = STATE(1360),
-    [sym_global_statement] = STATE(1209),
-    [sym_nonlocal_statement] = STATE(1209),
-    [sym_exec_statement] = STATE(1209),
-    [sym_type_alias_statement] = STATE(1209),
-    [sym_expression_list] = STATE(1361),
-    [sym_pattern] = STATE(889),
-    [sym_tuple_pattern] = STATE(875),
-    [sym_list_pattern] = STATE(875),
-    [sym_list_splat_pattern] = STATE(875),
-    [sym_expression] = STATE(1019),
-    [sym_primary_expression] = STATE(684),
-    [sym_not_operator] = STATE(1009),
-    [sym_boolean_operator] = STATE(1009),
-    [sym_binary_operator] = STATE(797),
-    [sym_unary_operator] = STATE(797),
-    [sym_comparison_operator] = STATE(1009),
-    [sym_lambda] = STATE(1009),
-    [sym_assignment] = STATE(1361),
-    [sym_augmented_assignment] = STATE(1361),
-    [sym_pattern_list] = STATE(897),
-    [sym_yield] = STATE(1361),
-    [sym_attribute] = STATE(431),
-    [sym_subscript] = STATE(431),
-    [sym_call] = STATE(797),
-    [sym_list] = STATE(797),
-    [sym_set] = STATE(797),
-    [sym_tuple] = STATE(797),
-    [sym_dictionary] = STATE(797),
-    [sym_list_comprehension] = STATE(797),
-    [sym_dictionary_comprehension] = STATE(797),
-    [sym_set_comprehension] = STATE(797),
-    [sym_generator_expression] = STATE(797),
-    [sym_parenthesized_expression] = STATE(797),
-    [sym_conditional_expression] = STATE(1009),
-    [sym_concatenated_string] = STATE(797),
-    [sym_string] = STATE(713),
-    [sym_await] = STATE(1009),
+    [sym__simple_statements] = STATE(537),
+    [sym_import_statement] = STATE(1304),
+    [sym_future_import_statement] = STATE(1304),
+    [sym_import_from_statement] = STATE(1304),
+    [sym_print_statement] = STATE(1304),
+    [sym_assert_statement] = STATE(1304),
+    [sym_expression_statement] = STATE(1304),
+    [sym_named_expression] = STATE(985),
+    [sym_return_statement] = STATE(1304),
+    [sym_delete_statement] = STATE(1304),
+    [sym_raise_statement] = STATE(1304),
+    [sym_pass_statement] = STATE(1304),
+    [sym_break_statement] = STATE(1304),
+    [sym_continue_statement] = STATE(1304),
+    [sym_list_splat] = STATE(1321),
+    [sym_dictionary_splat] = STATE(1321),
+    [sym_global_statement] = STATE(1304),
+    [sym_nonlocal_statement] = STATE(1304),
+    [sym_exec_statement] = STATE(1304),
+    [sym_type_alias_statement] = STATE(1304),
+    [sym_expression_list] = STATE(1313),
+    [sym_pattern] = STATE(871),
+    [sym_tuple_pattern] = STATE(860),
+    [sym_list_pattern] = STATE(860),
+    [sym_list_splat_pattern] = STATE(860),
+    [sym_expression] = STATE(995),
+    [sym_primary_expression] = STATE(707),
+    [sym_not_operator] = STATE(985),
+    [sym_boolean_operator] = STATE(985),
+    [sym_binary_operator] = STATE(759),
+    [sym_unary_operator] = STATE(759),
+    [sym_comparison_operator] = STATE(985),
+    [sym_lambda] = STATE(985),
+    [sym_assignment] = STATE(1313),
+    [sym_augmented_assignment] = STATE(1313),
+    [sym_pattern_list] = STATE(880),
+    [sym_yield] = STATE(1313),
+    [sym_attribute] = STATE(422),
+    [sym_subscript] = STATE(422),
+    [sym_call] = STATE(759),
+    [sym_list] = STATE(759),
+    [sym_set] = STATE(759),
+    [sym_tuple] = STATE(759),
+    [sym_dictionary] = STATE(759),
+    [sym_list_comprehension] = STATE(759),
+    [sym_dictionary_comprehension] = STATE(759),
+    [sym_set_comprehension] = STATE(759),
+    [sym_generator_expression] = STATE(759),
+    [sym_parenthesized_expression] = STATE(759),
+    [sym_conditional_expression] = STATE(985),
+    [sym_concatenated_string] = STATE(759),
+    [sym_string] = STATE(709),
+    [sym_await] = STATE(759),
     [sym_identifier] = ACTIONS(7),
     [anon_sym_import] = ACTIONS(9),
     [anon_sym_from] = ACTIONS(11),
@@ -23167,8 +20467,8 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_pass] = ACTIONS(27),
     [anon_sym_break] = ACTIONS(29),
     [anon_sym_continue] = ACTIONS(31),
-    [anon_sym_async] = ACTIONS(317),
-    [anon_sym_match] = ACTIONS(317),
+    [anon_sym_async] = ACTIONS(301),
+    [anon_sym_match] = ACTIONS(301),
     [anon_sym_DASH] = ACTIONS(47),
     [anon_sym_PLUS] = ACTIONS(47),
     [anon_sym_LBRACK] = ACTIONS(49),
@@ -23195,59 +20495,59 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym__string_start] = ACTIONS(81),
   },
   [122] = {
-    [sym__simple_statements] = STATE(571),
-    [sym_import_statement] = STATE(1319),
-    [sym_future_import_statement] = STATE(1319),
-    [sym_import_from_statement] = STATE(1319),
-    [sym_print_statement] = STATE(1319),
-    [sym_assert_statement] = STATE(1319),
-    [sym_expression_statement] = STATE(1319),
-    [sym_named_expression] = STATE(1009),
-    [sym_return_statement] = STATE(1319),
-    [sym_delete_statement] = STATE(1319),
-    [sym_raise_statement] = STATE(1319),
-    [sym_pass_statement] = STATE(1319),
-    [sym_break_statement] = STATE(1319),
-    [sym_continue_statement] = STATE(1319),
-    [sym_list_splat] = STATE(1360),
-    [sym_dictionary_splat] = STATE(1360),
-    [sym_global_statement] = STATE(1319),
-    [sym_nonlocal_statement] = STATE(1319),
-    [sym_exec_statement] = STATE(1319),
-    [sym_type_alias_statement] = STATE(1319),
-    [sym_expression_list] = STATE(1361),
-    [sym_pattern] = STATE(889),
-    [sym_tuple_pattern] = STATE(875),
-    [sym_list_pattern] = STATE(875),
-    [sym_list_splat_pattern] = STATE(875),
-    [sym_expression] = STATE(1019),
-    [sym_primary_expression] = STATE(684),
-    [sym_not_operator] = STATE(1009),
-    [sym_boolean_operator] = STATE(1009),
-    [sym_binary_operator] = STATE(797),
-    [sym_unary_operator] = STATE(797),
-    [sym_comparison_operator] = STATE(1009),
-    [sym_lambda] = STATE(1009),
-    [sym_assignment] = STATE(1361),
-    [sym_augmented_assignment] = STATE(1361),
-    [sym_pattern_list] = STATE(897),
-    [sym_yield] = STATE(1361),
-    [sym_attribute] = STATE(431),
-    [sym_subscript] = STATE(431),
-    [sym_call] = STATE(797),
-    [sym_list] = STATE(797),
-    [sym_set] = STATE(797),
-    [sym_tuple] = STATE(797),
-    [sym_dictionary] = STATE(797),
-    [sym_list_comprehension] = STATE(797),
-    [sym_dictionary_comprehension] = STATE(797),
-    [sym_set_comprehension] = STATE(797),
-    [sym_generator_expression] = STATE(797),
-    [sym_parenthesized_expression] = STATE(797),
-    [sym_conditional_expression] = STATE(1009),
-    [sym_concatenated_string] = STATE(797),
-    [sym_string] = STATE(713),
-    [sym_await] = STATE(1009),
+    [sym__simple_statements] = STATE(347),
+    [sym_import_statement] = STATE(1304),
+    [sym_future_import_statement] = STATE(1304),
+    [sym_import_from_statement] = STATE(1304),
+    [sym_print_statement] = STATE(1304),
+    [sym_assert_statement] = STATE(1304),
+    [sym_expression_statement] = STATE(1304),
+    [sym_named_expression] = STATE(985),
+    [sym_return_statement] = STATE(1304),
+    [sym_delete_statement] = STATE(1304),
+    [sym_raise_statement] = STATE(1304),
+    [sym_pass_statement] = STATE(1304),
+    [sym_break_statement] = STATE(1304),
+    [sym_continue_statement] = STATE(1304),
+    [sym_list_splat] = STATE(1321),
+    [sym_dictionary_splat] = STATE(1321),
+    [sym_global_statement] = STATE(1304),
+    [sym_nonlocal_statement] = STATE(1304),
+    [sym_exec_statement] = STATE(1304),
+    [sym_type_alias_statement] = STATE(1304),
+    [sym_expression_list] = STATE(1313),
+    [sym_pattern] = STATE(871),
+    [sym_tuple_pattern] = STATE(860),
+    [sym_list_pattern] = STATE(860),
+    [sym_list_splat_pattern] = STATE(860),
+    [sym_expression] = STATE(995),
+    [sym_primary_expression] = STATE(707),
+    [sym_not_operator] = STATE(985),
+    [sym_boolean_operator] = STATE(985),
+    [sym_binary_operator] = STATE(759),
+    [sym_unary_operator] = STATE(759),
+    [sym_comparison_operator] = STATE(985),
+    [sym_lambda] = STATE(985),
+    [sym_assignment] = STATE(1313),
+    [sym_augmented_assignment] = STATE(1313),
+    [sym_pattern_list] = STATE(880),
+    [sym_yield] = STATE(1313),
+    [sym_attribute] = STATE(422),
+    [sym_subscript] = STATE(422),
+    [sym_call] = STATE(759),
+    [sym_list] = STATE(759),
+    [sym_set] = STATE(759),
+    [sym_tuple] = STATE(759),
+    [sym_dictionary] = STATE(759),
+    [sym_list_comprehension] = STATE(759),
+    [sym_dictionary_comprehension] = STATE(759),
+    [sym_set_comprehension] = STATE(759),
+    [sym_generator_expression] = STATE(759),
+    [sym_parenthesized_expression] = STATE(759),
+    [sym_conditional_expression] = STATE(985),
+    [sym_concatenated_string] = STATE(759),
+    [sym_string] = STATE(709),
+    [sym_await] = STATE(759),
     [sym_identifier] = ACTIONS(7),
     [anon_sym_import] = ACTIONS(9),
     [anon_sym_from] = ACTIONS(11),
@@ -23261,8 +20561,8 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_pass] = ACTIONS(27),
     [anon_sym_break] = ACTIONS(29),
     [anon_sym_continue] = ACTIONS(31),
-    [anon_sym_async] = ACTIONS(317),
-    [anon_sym_match] = ACTIONS(317),
+    [anon_sym_async] = ACTIONS(301),
+    [anon_sym_match] = ACTIONS(301),
     [anon_sym_DASH] = ACTIONS(47),
     [anon_sym_PLUS] = ACTIONS(47),
     [anon_sym_LBRACK] = ACTIONS(49),
@@ -23289,59 +20589,59 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym__string_start] = ACTIONS(81),
   },
   [123] = {
-    [sym__simple_statements] = STATE(578),
-    [sym_import_statement] = STATE(1209),
-    [sym_future_import_statement] = STATE(1209),
-    [sym_import_from_statement] = STATE(1209),
-    [sym_print_statement] = STATE(1209),
-    [sym_assert_statement] = STATE(1209),
-    [sym_expression_statement] = STATE(1209),
-    [sym_named_expression] = STATE(1009),
-    [sym_return_statement] = STATE(1209),
-    [sym_delete_statement] = STATE(1209),
-    [sym_raise_statement] = STATE(1209),
-    [sym_pass_statement] = STATE(1209),
-    [sym_break_statement] = STATE(1209),
-    [sym_continue_statement] = STATE(1209),
-    [sym_list_splat] = STATE(1360),
-    [sym_dictionary_splat] = STATE(1360),
-    [sym_global_statement] = STATE(1209),
-    [sym_nonlocal_statement] = STATE(1209),
-    [sym_exec_statement] = STATE(1209),
-    [sym_type_alias_statement] = STATE(1209),
-    [sym_expression_list] = STATE(1361),
-    [sym_pattern] = STATE(889),
-    [sym_tuple_pattern] = STATE(875),
-    [sym_list_pattern] = STATE(875),
-    [sym_list_splat_pattern] = STATE(875),
-    [sym_expression] = STATE(1019),
-    [sym_primary_expression] = STATE(684),
-    [sym_not_operator] = STATE(1009),
-    [sym_boolean_operator] = STATE(1009),
-    [sym_binary_operator] = STATE(797),
-    [sym_unary_operator] = STATE(797),
-    [sym_comparison_operator] = STATE(1009),
-    [sym_lambda] = STATE(1009),
-    [sym_assignment] = STATE(1361),
-    [sym_augmented_assignment] = STATE(1361),
-    [sym_pattern_list] = STATE(897),
-    [sym_yield] = STATE(1361),
-    [sym_attribute] = STATE(431),
-    [sym_subscript] = STATE(431),
-    [sym_call] = STATE(797),
-    [sym_list] = STATE(797),
-    [sym_set] = STATE(797),
-    [sym_tuple] = STATE(797),
-    [sym_dictionary] = STATE(797),
-    [sym_list_comprehension] = STATE(797),
-    [sym_dictionary_comprehension] = STATE(797),
-    [sym_set_comprehension] = STATE(797),
-    [sym_generator_expression] = STATE(797),
-    [sym_parenthesized_expression] = STATE(797),
-    [sym_conditional_expression] = STATE(1009),
-    [sym_concatenated_string] = STATE(797),
-    [sym_string] = STATE(713),
-    [sym_await] = STATE(1009),
+    [sym__simple_statements] = STATE(511),
+    [sym_import_statement] = STATE(1304),
+    [sym_future_import_statement] = STATE(1304),
+    [sym_import_from_statement] = STATE(1304),
+    [sym_print_statement] = STATE(1304),
+    [sym_assert_statement] = STATE(1304),
+    [sym_expression_statement] = STATE(1304),
+    [sym_named_expression] = STATE(985),
+    [sym_return_statement] = STATE(1304),
+    [sym_delete_statement] = STATE(1304),
+    [sym_raise_statement] = STATE(1304),
+    [sym_pass_statement] = STATE(1304),
+    [sym_break_statement] = STATE(1304),
+    [sym_continue_statement] = STATE(1304),
+    [sym_list_splat] = STATE(1321),
+    [sym_dictionary_splat] = STATE(1321),
+    [sym_global_statement] = STATE(1304),
+    [sym_nonlocal_statement] = STATE(1304),
+    [sym_exec_statement] = STATE(1304),
+    [sym_type_alias_statement] = STATE(1304),
+    [sym_expression_list] = STATE(1313),
+    [sym_pattern] = STATE(871),
+    [sym_tuple_pattern] = STATE(860),
+    [sym_list_pattern] = STATE(860),
+    [sym_list_splat_pattern] = STATE(860),
+    [sym_expression] = STATE(995),
+    [sym_primary_expression] = STATE(707),
+    [sym_not_operator] = STATE(985),
+    [sym_boolean_operator] = STATE(985),
+    [sym_binary_operator] = STATE(759),
+    [sym_unary_operator] = STATE(759),
+    [sym_comparison_operator] = STATE(985),
+    [sym_lambda] = STATE(985),
+    [sym_assignment] = STATE(1313),
+    [sym_augmented_assignment] = STATE(1313),
+    [sym_pattern_list] = STATE(880),
+    [sym_yield] = STATE(1313),
+    [sym_attribute] = STATE(422),
+    [sym_subscript] = STATE(422),
+    [sym_call] = STATE(759),
+    [sym_list] = STATE(759),
+    [sym_set] = STATE(759),
+    [sym_tuple] = STATE(759),
+    [sym_dictionary] = STATE(759),
+    [sym_list_comprehension] = STATE(759),
+    [sym_dictionary_comprehension] = STATE(759),
+    [sym_set_comprehension] = STATE(759),
+    [sym_generator_expression] = STATE(759),
+    [sym_parenthesized_expression] = STATE(759),
+    [sym_conditional_expression] = STATE(985),
+    [sym_concatenated_string] = STATE(759),
+    [sym_string] = STATE(709),
+    [sym_await] = STATE(759),
     [sym_identifier] = ACTIONS(7),
     [anon_sym_import] = ACTIONS(9),
     [anon_sym_from] = ACTIONS(11),
@@ -23355,8 +20655,8 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_pass] = ACTIONS(27),
     [anon_sym_break] = ACTIONS(29),
     [anon_sym_continue] = ACTIONS(31),
-    [anon_sym_async] = ACTIONS(317),
-    [anon_sym_match] = ACTIONS(317),
+    [anon_sym_async] = ACTIONS(301),
+    [anon_sym_match] = ACTIONS(301),
     [anon_sym_DASH] = ACTIONS(47),
     [anon_sym_PLUS] = ACTIONS(47),
     [anon_sym_LBRACK] = ACTIONS(49),
@@ -23383,59 +20683,59 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym__string_start] = ACTIONS(81),
   },
   [124] = {
-    [sym__simple_statements] = STATE(472),
-    [sym_import_statement] = STATE(1209),
-    [sym_future_import_statement] = STATE(1209),
-    [sym_import_from_statement] = STATE(1209),
-    [sym_print_statement] = STATE(1209),
-    [sym_assert_statement] = STATE(1209),
-    [sym_expression_statement] = STATE(1209),
-    [sym_named_expression] = STATE(1009),
-    [sym_return_statement] = STATE(1209),
-    [sym_delete_statement] = STATE(1209),
-    [sym_raise_statement] = STATE(1209),
-    [sym_pass_statement] = STATE(1209),
-    [sym_break_statement] = STATE(1209),
-    [sym_continue_statement] = STATE(1209),
-    [sym_list_splat] = STATE(1360),
-    [sym_dictionary_splat] = STATE(1360),
-    [sym_global_statement] = STATE(1209),
-    [sym_nonlocal_statement] = STATE(1209),
-    [sym_exec_statement] = STATE(1209),
-    [sym_type_alias_statement] = STATE(1209),
-    [sym_expression_list] = STATE(1361),
-    [sym_pattern] = STATE(889),
-    [sym_tuple_pattern] = STATE(875),
-    [sym_list_pattern] = STATE(875),
-    [sym_list_splat_pattern] = STATE(875),
-    [sym_expression] = STATE(1019),
-    [sym_primary_expression] = STATE(684),
-    [sym_not_operator] = STATE(1009),
-    [sym_boolean_operator] = STATE(1009),
-    [sym_binary_operator] = STATE(797),
-    [sym_unary_operator] = STATE(797),
-    [sym_comparison_operator] = STATE(1009),
-    [sym_lambda] = STATE(1009),
-    [sym_assignment] = STATE(1361),
-    [sym_augmented_assignment] = STATE(1361),
-    [sym_pattern_list] = STATE(897),
-    [sym_yield] = STATE(1361),
-    [sym_attribute] = STATE(431),
-    [sym_subscript] = STATE(431),
-    [sym_call] = STATE(797),
-    [sym_list] = STATE(797),
-    [sym_set] = STATE(797),
-    [sym_tuple] = STATE(797),
-    [sym_dictionary] = STATE(797),
-    [sym_list_comprehension] = STATE(797),
-    [sym_dictionary_comprehension] = STATE(797),
-    [sym_set_comprehension] = STATE(797),
-    [sym_generator_expression] = STATE(797),
-    [sym_parenthesized_expression] = STATE(797),
-    [sym_conditional_expression] = STATE(1009),
-    [sym_concatenated_string] = STATE(797),
-    [sym_string] = STATE(713),
-    [sym_await] = STATE(1009),
+    [sym__simple_statements] = STATE(542),
+    [sym_import_statement] = STATE(1213),
+    [sym_future_import_statement] = STATE(1213),
+    [sym_import_from_statement] = STATE(1213),
+    [sym_print_statement] = STATE(1213),
+    [sym_assert_statement] = STATE(1213),
+    [sym_expression_statement] = STATE(1213),
+    [sym_named_expression] = STATE(985),
+    [sym_return_statement] = STATE(1213),
+    [sym_delete_statement] = STATE(1213),
+    [sym_raise_statement] = STATE(1213),
+    [sym_pass_statement] = STATE(1213),
+    [sym_break_statement] = STATE(1213),
+    [sym_continue_statement] = STATE(1213),
+    [sym_list_splat] = STATE(1321),
+    [sym_dictionary_splat] = STATE(1321),
+    [sym_global_statement] = STATE(1213),
+    [sym_nonlocal_statement] = STATE(1213),
+    [sym_exec_statement] = STATE(1213),
+    [sym_type_alias_statement] = STATE(1213),
+    [sym_expression_list] = STATE(1313),
+    [sym_pattern] = STATE(871),
+    [sym_tuple_pattern] = STATE(860),
+    [sym_list_pattern] = STATE(860),
+    [sym_list_splat_pattern] = STATE(860),
+    [sym_expression] = STATE(995),
+    [sym_primary_expression] = STATE(707),
+    [sym_not_operator] = STATE(985),
+    [sym_boolean_operator] = STATE(985),
+    [sym_binary_operator] = STATE(759),
+    [sym_unary_operator] = STATE(759),
+    [sym_comparison_operator] = STATE(985),
+    [sym_lambda] = STATE(985),
+    [sym_assignment] = STATE(1313),
+    [sym_augmented_assignment] = STATE(1313),
+    [sym_pattern_list] = STATE(880),
+    [sym_yield] = STATE(1313),
+    [sym_attribute] = STATE(422),
+    [sym_subscript] = STATE(422),
+    [sym_call] = STATE(759),
+    [sym_list] = STATE(759),
+    [sym_set] = STATE(759),
+    [sym_tuple] = STATE(759),
+    [sym_dictionary] = STATE(759),
+    [sym_list_comprehension] = STATE(759),
+    [sym_dictionary_comprehension] = STATE(759),
+    [sym_set_comprehension] = STATE(759),
+    [sym_generator_expression] = STATE(759),
+    [sym_parenthesized_expression] = STATE(759),
+    [sym_conditional_expression] = STATE(985),
+    [sym_concatenated_string] = STATE(759),
+    [sym_string] = STATE(709),
+    [sym_await] = STATE(759),
     [sym_identifier] = ACTIONS(7),
     [anon_sym_import] = ACTIONS(9),
     [anon_sym_from] = ACTIONS(11),
@@ -23449,8 +20749,8 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_pass] = ACTIONS(27),
     [anon_sym_break] = ACTIONS(29),
     [anon_sym_continue] = ACTIONS(31),
-    [anon_sym_async] = ACTIONS(317),
-    [anon_sym_match] = ACTIONS(317),
+    [anon_sym_async] = ACTIONS(301),
+    [anon_sym_match] = ACTIONS(301),
     [anon_sym_DASH] = ACTIONS(47),
     [anon_sym_PLUS] = ACTIONS(47),
     [anon_sym_LBRACK] = ACTIONS(49),
@@ -23477,59 +20777,59 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym__string_start] = ACTIONS(81),
   },
   [125] = {
-    [sym__simple_statements] = STATE(317),
-    [sym_import_statement] = STATE(1244),
-    [sym_future_import_statement] = STATE(1244),
-    [sym_import_from_statement] = STATE(1244),
-    [sym_print_statement] = STATE(1244),
-    [sym_assert_statement] = STATE(1244),
-    [sym_expression_statement] = STATE(1244),
-    [sym_named_expression] = STATE(1009),
-    [sym_return_statement] = STATE(1244),
-    [sym_delete_statement] = STATE(1244),
-    [sym_raise_statement] = STATE(1244),
-    [sym_pass_statement] = STATE(1244),
-    [sym_break_statement] = STATE(1244),
-    [sym_continue_statement] = STATE(1244),
-    [sym_list_splat] = STATE(1360),
-    [sym_dictionary_splat] = STATE(1360),
-    [sym_global_statement] = STATE(1244),
-    [sym_nonlocal_statement] = STATE(1244),
-    [sym_exec_statement] = STATE(1244),
-    [sym_type_alias_statement] = STATE(1244),
-    [sym_expression_list] = STATE(1361),
-    [sym_pattern] = STATE(889),
-    [sym_tuple_pattern] = STATE(875),
-    [sym_list_pattern] = STATE(875),
-    [sym_list_splat_pattern] = STATE(875),
-    [sym_expression] = STATE(1019),
-    [sym_primary_expression] = STATE(684),
-    [sym_not_operator] = STATE(1009),
-    [sym_boolean_operator] = STATE(1009),
-    [sym_binary_operator] = STATE(797),
-    [sym_unary_operator] = STATE(797),
-    [sym_comparison_operator] = STATE(1009),
-    [sym_lambda] = STATE(1009),
-    [sym_assignment] = STATE(1361),
-    [sym_augmented_assignment] = STATE(1361),
-    [sym_pattern_list] = STATE(897),
-    [sym_yield] = STATE(1361),
-    [sym_attribute] = STATE(431),
-    [sym_subscript] = STATE(431),
-    [sym_call] = STATE(797),
-    [sym_list] = STATE(797),
-    [sym_set] = STATE(797),
-    [sym_tuple] = STATE(797),
-    [sym_dictionary] = STATE(797),
-    [sym_list_comprehension] = STATE(797),
-    [sym_dictionary_comprehension] = STATE(797),
-    [sym_set_comprehension] = STATE(797),
-    [sym_generator_expression] = STATE(797),
-    [sym_parenthesized_expression] = STATE(797),
-    [sym_conditional_expression] = STATE(1009),
-    [sym_concatenated_string] = STATE(797),
-    [sym_string] = STATE(713),
-    [sym_await] = STATE(1009),
+    [sym__simple_statements] = STATE(338),
+    [sym_import_statement] = STATE(1213),
+    [sym_future_import_statement] = STATE(1213),
+    [sym_import_from_statement] = STATE(1213),
+    [sym_print_statement] = STATE(1213),
+    [sym_assert_statement] = STATE(1213),
+    [sym_expression_statement] = STATE(1213),
+    [sym_named_expression] = STATE(985),
+    [sym_return_statement] = STATE(1213),
+    [sym_delete_statement] = STATE(1213),
+    [sym_raise_statement] = STATE(1213),
+    [sym_pass_statement] = STATE(1213),
+    [sym_break_statement] = STATE(1213),
+    [sym_continue_statement] = STATE(1213),
+    [sym_list_splat] = STATE(1321),
+    [sym_dictionary_splat] = STATE(1321),
+    [sym_global_statement] = STATE(1213),
+    [sym_nonlocal_statement] = STATE(1213),
+    [sym_exec_statement] = STATE(1213),
+    [sym_type_alias_statement] = STATE(1213),
+    [sym_expression_list] = STATE(1313),
+    [sym_pattern] = STATE(871),
+    [sym_tuple_pattern] = STATE(860),
+    [sym_list_pattern] = STATE(860),
+    [sym_list_splat_pattern] = STATE(860),
+    [sym_expression] = STATE(995),
+    [sym_primary_expression] = STATE(707),
+    [sym_not_operator] = STATE(985),
+    [sym_boolean_operator] = STATE(985),
+    [sym_binary_operator] = STATE(759),
+    [sym_unary_operator] = STATE(759),
+    [sym_comparison_operator] = STATE(985),
+    [sym_lambda] = STATE(985),
+    [sym_assignment] = STATE(1313),
+    [sym_augmented_assignment] = STATE(1313),
+    [sym_pattern_list] = STATE(880),
+    [sym_yield] = STATE(1313),
+    [sym_attribute] = STATE(422),
+    [sym_subscript] = STATE(422),
+    [sym_call] = STATE(759),
+    [sym_list] = STATE(759),
+    [sym_set] = STATE(759),
+    [sym_tuple] = STATE(759),
+    [sym_dictionary] = STATE(759),
+    [sym_list_comprehension] = STATE(759),
+    [sym_dictionary_comprehension] = STATE(759),
+    [sym_set_comprehension] = STATE(759),
+    [sym_generator_expression] = STATE(759),
+    [sym_parenthesized_expression] = STATE(759),
+    [sym_conditional_expression] = STATE(985),
+    [sym_concatenated_string] = STATE(759),
+    [sym_string] = STATE(709),
+    [sym_await] = STATE(759),
     [sym_identifier] = ACTIONS(7),
     [anon_sym_import] = ACTIONS(9),
     [anon_sym_from] = ACTIONS(11),
@@ -23543,8 +20843,8 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_pass] = ACTIONS(27),
     [anon_sym_break] = ACTIONS(29),
     [anon_sym_continue] = ACTIONS(31),
-    [anon_sym_async] = ACTIONS(317),
-    [anon_sym_match] = ACTIONS(317),
+    [anon_sym_async] = ACTIONS(301),
+    [anon_sym_match] = ACTIONS(301),
     [anon_sym_DASH] = ACTIONS(47),
     [anon_sym_PLUS] = ACTIONS(47),
     [anon_sym_LBRACK] = ACTIONS(49),
@@ -23571,59 +20871,59 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym__string_start] = ACTIONS(81),
   },
   [126] = {
-    [sym__simple_statements] = STATE(384),
-    [sym_import_statement] = STATE(1238),
-    [sym_future_import_statement] = STATE(1238),
-    [sym_import_from_statement] = STATE(1238),
-    [sym_print_statement] = STATE(1238),
-    [sym_assert_statement] = STATE(1238),
-    [sym_expression_statement] = STATE(1238),
-    [sym_named_expression] = STATE(1009),
-    [sym_return_statement] = STATE(1238),
-    [sym_delete_statement] = STATE(1238),
-    [sym_raise_statement] = STATE(1238),
-    [sym_pass_statement] = STATE(1238),
-    [sym_break_statement] = STATE(1238),
-    [sym_continue_statement] = STATE(1238),
-    [sym_list_splat] = STATE(1360),
-    [sym_dictionary_splat] = STATE(1360),
-    [sym_global_statement] = STATE(1238),
-    [sym_nonlocal_statement] = STATE(1238),
-    [sym_exec_statement] = STATE(1238),
-    [sym_type_alias_statement] = STATE(1238),
-    [sym_expression_list] = STATE(1361),
-    [sym_pattern] = STATE(889),
-    [sym_tuple_pattern] = STATE(875),
-    [sym_list_pattern] = STATE(875),
-    [sym_list_splat_pattern] = STATE(875),
-    [sym_expression] = STATE(1019),
-    [sym_primary_expression] = STATE(684),
-    [sym_not_operator] = STATE(1009),
-    [sym_boolean_operator] = STATE(1009),
-    [sym_binary_operator] = STATE(797),
-    [sym_unary_operator] = STATE(797),
-    [sym_comparison_operator] = STATE(1009),
-    [sym_lambda] = STATE(1009),
-    [sym_assignment] = STATE(1361),
-    [sym_augmented_assignment] = STATE(1361),
-    [sym_pattern_list] = STATE(897),
-    [sym_yield] = STATE(1361),
-    [sym_attribute] = STATE(431),
-    [sym_subscript] = STATE(431),
-    [sym_call] = STATE(797),
-    [sym_list] = STATE(797),
-    [sym_set] = STATE(797),
-    [sym_tuple] = STATE(797),
-    [sym_dictionary] = STATE(797),
-    [sym_list_comprehension] = STATE(797),
-    [sym_dictionary_comprehension] = STATE(797),
-    [sym_set_comprehension] = STATE(797),
-    [sym_generator_expression] = STATE(797),
-    [sym_parenthesized_expression] = STATE(797),
-    [sym_conditional_expression] = STATE(1009),
-    [sym_concatenated_string] = STATE(797),
-    [sym_string] = STATE(713),
-    [sym_await] = STATE(1009),
+    [sym__simple_statements] = STATE(506),
+    [sym_import_statement] = STATE(1213),
+    [sym_future_import_statement] = STATE(1213),
+    [sym_import_from_statement] = STATE(1213),
+    [sym_print_statement] = STATE(1213),
+    [sym_assert_statement] = STATE(1213),
+    [sym_expression_statement] = STATE(1213),
+    [sym_named_expression] = STATE(985),
+    [sym_return_statement] = STATE(1213),
+    [sym_delete_statement] = STATE(1213),
+    [sym_raise_statement] = STATE(1213),
+    [sym_pass_statement] = STATE(1213),
+    [sym_break_statement] = STATE(1213),
+    [sym_continue_statement] = STATE(1213),
+    [sym_list_splat] = STATE(1321),
+    [sym_dictionary_splat] = STATE(1321),
+    [sym_global_statement] = STATE(1213),
+    [sym_nonlocal_statement] = STATE(1213),
+    [sym_exec_statement] = STATE(1213),
+    [sym_type_alias_statement] = STATE(1213),
+    [sym_expression_list] = STATE(1313),
+    [sym_pattern] = STATE(871),
+    [sym_tuple_pattern] = STATE(860),
+    [sym_list_pattern] = STATE(860),
+    [sym_list_splat_pattern] = STATE(860),
+    [sym_expression] = STATE(995),
+    [sym_primary_expression] = STATE(707),
+    [sym_not_operator] = STATE(985),
+    [sym_boolean_operator] = STATE(985),
+    [sym_binary_operator] = STATE(759),
+    [sym_unary_operator] = STATE(759),
+    [sym_comparison_operator] = STATE(985),
+    [sym_lambda] = STATE(985),
+    [sym_assignment] = STATE(1313),
+    [sym_augmented_assignment] = STATE(1313),
+    [sym_pattern_list] = STATE(880),
+    [sym_yield] = STATE(1313),
+    [sym_attribute] = STATE(422),
+    [sym_subscript] = STATE(422),
+    [sym_call] = STATE(759),
+    [sym_list] = STATE(759),
+    [sym_set] = STATE(759),
+    [sym_tuple] = STATE(759),
+    [sym_dictionary] = STATE(759),
+    [sym_list_comprehension] = STATE(759),
+    [sym_dictionary_comprehension] = STATE(759),
+    [sym_set_comprehension] = STATE(759),
+    [sym_generator_expression] = STATE(759),
+    [sym_parenthesized_expression] = STATE(759),
+    [sym_conditional_expression] = STATE(985),
+    [sym_concatenated_string] = STATE(759),
+    [sym_string] = STATE(709),
+    [sym_await] = STATE(759),
     [sym_identifier] = ACTIONS(7),
     [anon_sym_import] = ACTIONS(9),
     [anon_sym_from] = ACTIONS(11),
@@ -23637,8 +20937,8 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_pass] = ACTIONS(27),
     [anon_sym_break] = ACTIONS(29),
     [anon_sym_continue] = ACTIONS(31),
-    [anon_sym_async] = ACTIONS(317),
-    [anon_sym_match] = ACTIONS(317),
+    [anon_sym_async] = ACTIONS(301),
+    [anon_sym_match] = ACTIONS(301),
     [anon_sym_DASH] = ACTIONS(47),
     [anon_sym_PLUS] = ACTIONS(47),
     [anon_sym_LBRACK] = ACTIONS(49),
@@ -23665,59 +20965,58 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym__string_start] = ACTIONS(81),
   },
   [127] = {
-    [sym__simple_statements] = STATE(552),
-    [sym_import_statement] = STATE(1209),
-    [sym_future_import_statement] = STATE(1209),
-    [sym_import_from_statement] = STATE(1209),
-    [sym_print_statement] = STATE(1209),
-    [sym_assert_statement] = STATE(1209),
-    [sym_expression_statement] = STATE(1209),
-    [sym_named_expression] = STATE(1009),
-    [sym_return_statement] = STATE(1209),
-    [sym_delete_statement] = STATE(1209),
-    [sym_raise_statement] = STATE(1209),
-    [sym_pass_statement] = STATE(1209),
-    [sym_break_statement] = STATE(1209),
-    [sym_continue_statement] = STATE(1209),
-    [sym_list_splat] = STATE(1360),
-    [sym_dictionary_splat] = STATE(1360),
-    [sym_global_statement] = STATE(1209),
-    [sym_nonlocal_statement] = STATE(1209),
-    [sym_exec_statement] = STATE(1209),
-    [sym_type_alias_statement] = STATE(1209),
-    [sym_expression_list] = STATE(1361),
-    [sym_pattern] = STATE(889),
-    [sym_tuple_pattern] = STATE(875),
-    [sym_list_pattern] = STATE(875),
-    [sym_list_splat_pattern] = STATE(875),
-    [sym_expression] = STATE(1019),
-    [sym_primary_expression] = STATE(684),
-    [sym_not_operator] = STATE(1009),
-    [sym_boolean_operator] = STATE(1009),
-    [sym_binary_operator] = STATE(797),
-    [sym_unary_operator] = STATE(797),
-    [sym_comparison_operator] = STATE(1009),
-    [sym_lambda] = STATE(1009),
-    [sym_assignment] = STATE(1361),
-    [sym_augmented_assignment] = STATE(1361),
-    [sym_pattern_list] = STATE(897),
-    [sym_yield] = STATE(1361),
-    [sym_attribute] = STATE(431),
-    [sym_subscript] = STATE(431),
-    [sym_call] = STATE(797),
-    [sym_list] = STATE(797),
-    [sym_set] = STATE(797),
-    [sym_tuple] = STATE(797),
-    [sym_dictionary] = STATE(797),
-    [sym_list_comprehension] = STATE(797),
-    [sym_dictionary_comprehension] = STATE(797),
-    [sym_set_comprehension] = STATE(797),
-    [sym_generator_expression] = STATE(797),
-    [sym_parenthesized_expression] = STATE(797),
-    [sym_conditional_expression] = STATE(1009),
-    [sym_concatenated_string] = STATE(797),
-    [sym_string] = STATE(713),
-    [sym_await] = STATE(1009),
+    [sym_import_statement] = STATE(1341),
+    [sym_future_import_statement] = STATE(1341),
+    [sym_import_from_statement] = STATE(1341),
+    [sym_print_statement] = STATE(1341),
+    [sym_assert_statement] = STATE(1341),
+    [sym_expression_statement] = STATE(1341),
+    [sym_named_expression] = STATE(985),
+    [sym_return_statement] = STATE(1341),
+    [sym_delete_statement] = STATE(1341),
+    [sym_raise_statement] = STATE(1341),
+    [sym_pass_statement] = STATE(1341),
+    [sym_break_statement] = STATE(1341),
+    [sym_continue_statement] = STATE(1341),
+    [sym_list_splat] = STATE(1321),
+    [sym_dictionary_splat] = STATE(1321),
+    [sym_global_statement] = STATE(1341),
+    [sym_nonlocal_statement] = STATE(1341),
+    [sym_exec_statement] = STATE(1341),
+    [sym_type_alias_statement] = STATE(1341),
+    [sym_expression_list] = STATE(1313),
+    [sym_pattern] = STATE(871),
+    [sym_tuple_pattern] = STATE(860),
+    [sym_list_pattern] = STATE(860),
+    [sym_list_splat_pattern] = STATE(860),
+    [sym_expression] = STATE(995),
+    [sym_primary_expression] = STATE(707),
+    [sym_not_operator] = STATE(985),
+    [sym_boolean_operator] = STATE(985),
+    [sym_binary_operator] = STATE(759),
+    [sym_unary_operator] = STATE(759),
+    [sym_comparison_operator] = STATE(985),
+    [sym_lambda] = STATE(985),
+    [sym_assignment] = STATE(1313),
+    [sym_augmented_assignment] = STATE(1313),
+    [sym_pattern_list] = STATE(880),
+    [sym_yield] = STATE(1313),
+    [sym_attribute] = STATE(422),
+    [sym_subscript] = STATE(422),
+    [sym_call] = STATE(759),
+    [sym_list] = STATE(759),
+    [sym_set] = STATE(759),
+    [sym_tuple] = STATE(759),
+    [sym_dictionary] = STATE(759),
+    [sym_list_comprehension] = STATE(759),
+    [sym_dictionary_comprehension] = STATE(759),
+    [sym_set_comprehension] = STATE(759),
+    [sym_generator_expression] = STATE(759),
+    [sym_parenthesized_expression] = STATE(759),
+    [sym_conditional_expression] = STATE(985),
+    [sym_concatenated_string] = STATE(759),
+    [sym_string] = STATE(709),
+    [sym_await] = STATE(759),
     [sym_identifier] = ACTIONS(7),
     [anon_sym_import] = ACTIONS(9),
     [anon_sym_from] = ACTIONS(11),
@@ -23731,8 +21030,8 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_pass] = ACTIONS(27),
     [anon_sym_break] = ACTIONS(29),
     [anon_sym_continue] = ACTIONS(31),
-    [anon_sym_async] = ACTIONS(317),
-    [anon_sym_match] = ACTIONS(317),
+    [anon_sym_async] = ACTIONS(301),
+    [anon_sym_match] = ACTIONS(301),
     [anon_sym_DASH] = ACTIONS(47),
     [anon_sym_PLUS] = ACTIONS(47),
     [anon_sym_LBRACK] = ACTIONS(49),
@@ -23755,63 +21054,61 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_none] = ACTIONS(77),
     [sym_comment] = ACTIONS(3),
     [sym__newline] = ACTIONS(543),
-    [sym__indent] = ACTIONS(545),
     [sym__string_start] = ACTIONS(81),
   },
   [128] = {
-    [sym__simple_statements] = STATE(487),
-    [sym_import_statement] = STATE(1319),
-    [sym_future_import_statement] = STATE(1319),
-    [sym_import_from_statement] = STATE(1319),
-    [sym_print_statement] = STATE(1319),
-    [sym_assert_statement] = STATE(1319),
-    [sym_expression_statement] = STATE(1319),
-    [sym_named_expression] = STATE(1009),
-    [sym_return_statement] = STATE(1319),
-    [sym_delete_statement] = STATE(1319),
-    [sym_raise_statement] = STATE(1319),
-    [sym_pass_statement] = STATE(1319),
-    [sym_break_statement] = STATE(1319),
-    [sym_continue_statement] = STATE(1319),
-    [sym_list_splat] = STATE(1360),
-    [sym_dictionary_splat] = STATE(1360),
-    [sym_global_statement] = STATE(1319),
-    [sym_nonlocal_statement] = STATE(1319),
-    [sym_exec_statement] = STATE(1319),
-    [sym_type_alias_statement] = STATE(1319),
-    [sym_expression_list] = STATE(1361),
-    [sym_pattern] = STATE(889),
-    [sym_tuple_pattern] = STATE(875),
-    [sym_list_pattern] = STATE(875),
-    [sym_list_splat_pattern] = STATE(875),
-    [sym_expression] = STATE(1019),
-    [sym_primary_expression] = STATE(684),
-    [sym_not_operator] = STATE(1009),
-    [sym_boolean_operator] = STATE(1009),
-    [sym_binary_operator] = STATE(797),
-    [sym_unary_operator] = STATE(797),
-    [sym_comparison_operator] = STATE(1009),
-    [sym_lambda] = STATE(1009),
-    [sym_assignment] = STATE(1361),
-    [sym_augmented_assignment] = STATE(1361),
-    [sym_pattern_list] = STATE(897),
-    [sym_yield] = STATE(1361),
-    [sym_attribute] = STATE(431),
-    [sym_subscript] = STATE(431),
-    [sym_call] = STATE(797),
-    [sym_list] = STATE(797),
-    [sym_set] = STATE(797),
-    [sym_tuple] = STATE(797),
-    [sym_dictionary] = STATE(797),
-    [sym_list_comprehension] = STATE(797),
-    [sym_dictionary_comprehension] = STATE(797),
-    [sym_set_comprehension] = STATE(797),
-    [sym_generator_expression] = STATE(797),
-    [sym_parenthesized_expression] = STATE(797),
-    [sym_conditional_expression] = STATE(1009),
-    [sym_concatenated_string] = STATE(797),
-    [sym_string] = STATE(713),
-    [sym_await] = STATE(1009),
+    [sym_import_statement] = STATE(1341),
+    [sym_future_import_statement] = STATE(1341),
+    [sym_import_from_statement] = STATE(1341),
+    [sym_print_statement] = STATE(1341),
+    [sym_assert_statement] = STATE(1341),
+    [sym_expression_statement] = STATE(1341),
+    [sym_named_expression] = STATE(985),
+    [sym_return_statement] = STATE(1341),
+    [sym_delete_statement] = STATE(1341),
+    [sym_raise_statement] = STATE(1341),
+    [sym_pass_statement] = STATE(1341),
+    [sym_break_statement] = STATE(1341),
+    [sym_continue_statement] = STATE(1341),
+    [sym_list_splat] = STATE(1321),
+    [sym_dictionary_splat] = STATE(1321),
+    [sym_global_statement] = STATE(1341),
+    [sym_nonlocal_statement] = STATE(1341),
+    [sym_exec_statement] = STATE(1341),
+    [sym_type_alias_statement] = STATE(1341),
+    [sym_expression_list] = STATE(1313),
+    [sym_pattern] = STATE(871),
+    [sym_tuple_pattern] = STATE(860),
+    [sym_list_pattern] = STATE(860),
+    [sym_list_splat_pattern] = STATE(860),
+    [sym_expression] = STATE(995),
+    [sym_primary_expression] = STATE(707),
+    [sym_not_operator] = STATE(985),
+    [sym_boolean_operator] = STATE(985),
+    [sym_binary_operator] = STATE(759),
+    [sym_unary_operator] = STATE(759),
+    [sym_comparison_operator] = STATE(985),
+    [sym_lambda] = STATE(985),
+    [sym_assignment] = STATE(1313),
+    [sym_augmented_assignment] = STATE(1313),
+    [sym_pattern_list] = STATE(880),
+    [sym_yield] = STATE(1313),
+    [sym_attribute] = STATE(422),
+    [sym_subscript] = STATE(422),
+    [sym_call] = STATE(759),
+    [sym_list] = STATE(759),
+    [sym_set] = STATE(759),
+    [sym_tuple] = STATE(759),
+    [sym_dictionary] = STATE(759),
+    [sym_list_comprehension] = STATE(759),
+    [sym_dictionary_comprehension] = STATE(759),
+    [sym_set_comprehension] = STATE(759),
+    [sym_generator_expression] = STATE(759),
+    [sym_parenthesized_expression] = STATE(759),
+    [sym_conditional_expression] = STATE(985),
+    [sym_concatenated_string] = STATE(759),
+    [sym_string] = STATE(709),
+    [sym_await] = STATE(759),
     [sym_identifier] = ACTIONS(7),
     [anon_sym_import] = ACTIONS(9),
     [anon_sym_from] = ACTIONS(11),
@@ -23825,8 +21122,100 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_pass] = ACTIONS(27),
     [anon_sym_break] = ACTIONS(29),
     [anon_sym_continue] = ACTIONS(31),
-    [anon_sym_async] = ACTIONS(317),
-    [anon_sym_match] = ACTIONS(317),
+    [anon_sym_async] = ACTIONS(301),
+    [anon_sym_match] = ACTIONS(301),
+    [anon_sym_DASH] = ACTIONS(47),
+    [anon_sym_PLUS] = ACTIONS(47),
+    [anon_sym_LBRACK] = ACTIONS(49),
+    [anon_sym_LBRACE] = ACTIONS(51),
+    [anon_sym_STAR_STAR] = ACTIONS(53),
+    [anon_sym_global] = ACTIONS(57),
+    [anon_sym_nonlocal] = ACTIONS(59),
+    [anon_sym_exec] = ACTIONS(61),
+    [anon_sym_type] = ACTIONS(63),
+    [anon_sym_not] = ACTIONS(69),
+    [anon_sym_TILDE] = ACTIONS(47),
+    [anon_sym_lambda] = ACTIONS(71),
+    [anon_sym_yield] = ACTIONS(73),
+    [sym_ellipsis] = ACTIONS(75),
+    [sym_integer] = ACTIONS(77),
+    [sym_float] = ACTIONS(75),
+    [anon_sym_await] = ACTIONS(79),
+    [sym_true] = ACTIONS(77),
+    [sym_false] = ACTIONS(77),
+    [sym_none] = ACTIONS(77),
+    [sym_comment] = ACTIONS(3),
+    [sym__newline] = ACTIONS(545),
+    [sym__string_start] = ACTIONS(81),
+  },
+  [129] = {
+    [sym_import_statement] = STATE(1341),
+    [sym_future_import_statement] = STATE(1341),
+    [sym_import_from_statement] = STATE(1341),
+    [sym_print_statement] = STATE(1341),
+    [sym_assert_statement] = STATE(1341),
+    [sym_expression_statement] = STATE(1341),
+    [sym_named_expression] = STATE(985),
+    [sym_return_statement] = STATE(1341),
+    [sym_delete_statement] = STATE(1341),
+    [sym_raise_statement] = STATE(1341),
+    [sym_pass_statement] = STATE(1341),
+    [sym_break_statement] = STATE(1341),
+    [sym_continue_statement] = STATE(1341),
+    [sym_list_splat] = STATE(1321),
+    [sym_dictionary_splat] = STATE(1321),
+    [sym_global_statement] = STATE(1341),
+    [sym_nonlocal_statement] = STATE(1341),
+    [sym_exec_statement] = STATE(1341),
+    [sym_type_alias_statement] = STATE(1341),
+    [sym_expression_list] = STATE(1313),
+    [sym_pattern] = STATE(871),
+    [sym_tuple_pattern] = STATE(860),
+    [sym_list_pattern] = STATE(860),
+    [sym_list_splat_pattern] = STATE(860),
+    [sym_expression] = STATE(995),
+    [sym_primary_expression] = STATE(707),
+    [sym_not_operator] = STATE(985),
+    [sym_boolean_operator] = STATE(985),
+    [sym_binary_operator] = STATE(759),
+    [sym_unary_operator] = STATE(759),
+    [sym_comparison_operator] = STATE(985),
+    [sym_lambda] = STATE(985),
+    [sym_assignment] = STATE(1313),
+    [sym_augmented_assignment] = STATE(1313),
+    [sym_pattern_list] = STATE(880),
+    [sym_yield] = STATE(1313),
+    [sym_attribute] = STATE(422),
+    [sym_subscript] = STATE(422),
+    [sym_call] = STATE(759),
+    [sym_list] = STATE(759),
+    [sym_set] = STATE(759),
+    [sym_tuple] = STATE(759),
+    [sym_dictionary] = STATE(759),
+    [sym_list_comprehension] = STATE(759),
+    [sym_dictionary_comprehension] = STATE(759),
+    [sym_set_comprehension] = STATE(759),
+    [sym_generator_expression] = STATE(759),
+    [sym_parenthesized_expression] = STATE(759),
+    [sym_conditional_expression] = STATE(985),
+    [sym_concatenated_string] = STATE(759),
+    [sym_string] = STATE(709),
+    [sym_await] = STATE(759),
+    [sym_identifier] = ACTIONS(7),
+    [anon_sym_import] = ACTIONS(9),
+    [anon_sym_from] = ACTIONS(11),
+    [anon_sym_LPAREN] = ACTIONS(13),
+    [anon_sym_STAR] = ACTIONS(15),
+    [anon_sym_print] = ACTIONS(17),
+    [anon_sym_assert] = ACTIONS(19),
+    [anon_sym_return] = ACTIONS(21),
+    [anon_sym_del] = ACTIONS(23),
+    [anon_sym_raise] = ACTIONS(25),
+    [anon_sym_pass] = ACTIONS(27),
+    [anon_sym_break] = ACTIONS(29),
+    [anon_sym_continue] = ACTIONS(31),
+    [anon_sym_async] = ACTIONS(301),
+    [anon_sym_match] = ACTIONS(301),
     [anon_sym_DASH] = ACTIONS(47),
     [anon_sym_PLUS] = ACTIONS(47),
     [anon_sym_LBRACK] = ACTIONS(49),
@@ -23849,63 +21238,61 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_none] = ACTIONS(77),
     [sym_comment] = ACTIONS(3),
     [sym__newline] = ACTIONS(547),
-    [sym__indent] = ACTIONS(549),
     [sym__string_start] = ACTIONS(81),
   },
-  [129] = {
-    [sym__simple_statements] = STATE(558),
-    [sym_import_statement] = STATE(1319),
-    [sym_future_import_statement] = STATE(1319),
-    [sym_import_from_statement] = STATE(1319),
-    [sym_print_statement] = STATE(1319),
-    [sym_assert_statement] = STATE(1319),
-    [sym_expression_statement] = STATE(1319),
-    [sym_named_expression] = STATE(1009),
-    [sym_return_statement] = STATE(1319),
-    [sym_delete_statement] = STATE(1319),
-    [sym_raise_statement] = STATE(1319),
-    [sym_pass_statement] = STATE(1319),
-    [sym_break_statement] = STATE(1319),
-    [sym_continue_statement] = STATE(1319),
-    [sym_list_splat] = STATE(1360),
-    [sym_dictionary_splat] = STATE(1360),
-    [sym_global_statement] = STATE(1319),
-    [sym_nonlocal_statement] = STATE(1319),
-    [sym_exec_statement] = STATE(1319),
-    [sym_type_alias_statement] = STATE(1319),
-    [sym_expression_list] = STATE(1361),
-    [sym_pattern] = STATE(889),
-    [sym_tuple_pattern] = STATE(875),
-    [sym_list_pattern] = STATE(875),
-    [sym_list_splat_pattern] = STATE(875),
-    [sym_expression] = STATE(1019),
-    [sym_primary_expression] = STATE(684),
-    [sym_not_operator] = STATE(1009),
-    [sym_boolean_operator] = STATE(1009),
-    [sym_binary_operator] = STATE(797),
-    [sym_unary_operator] = STATE(797),
-    [sym_comparison_operator] = STATE(1009),
-    [sym_lambda] = STATE(1009),
-    [sym_assignment] = STATE(1361),
-    [sym_augmented_assignment] = STATE(1361),
-    [sym_pattern_list] = STATE(897),
-    [sym_yield] = STATE(1361),
-    [sym_attribute] = STATE(431),
-    [sym_subscript] = STATE(431),
-    [sym_call] = STATE(797),
-    [sym_list] = STATE(797),
-    [sym_set] = STATE(797),
-    [sym_tuple] = STATE(797),
-    [sym_dictionary] = STATE(797),
-    [sym_list_comprehension] = STATE(797),
-    [sym_dictionary_comprehension] = STATE(797),
-    [sym_set_comprehension] = STATE(797),
-    [sym_generator_expression] = STATE(797),
-    [sym_parenthesized_expression] = STATE(797),
-    [sym_conditional_expression] = STATE(1009),
-    [sym_concatenated_string] = STATE(797),
-    [sym_string] = STATE(713),
-    [sym_await] = STATE(1009),
+  [130] = {
+    [sym_import_statement] = STATE(1341),
+    [sym_future_import_statement] = STATE(1341),
+    [sym_import_from_statement] = STATE(1341),
+    [sym_print_statement] = STATE(1341),
+    [sym_assert_statement] = STATE(1341),
+    [sym_expression_statement] = STATE(1341),
+    [sym_named_expression] = STATE(985),
+    [sym_return_statement] = STATE(1341),
+    [sym_delete_statement] = STATE(1341),
+    [sym_raise_statement] = STATE(1341),
+    [sym_pass_statement] = STATE(1341),
+    [sym_break_statement] = STATE(1341),
+    [sym_continue_statement] = STATE(1341),
+    [sym_list_splat] = STATE(1321),
+    [sym_dictionary_splat] = STATE(1321),
+    [sym_global_statement] = STATE(1341),
+    [sym_nonlocal_statement] = STATE(1341),
+    [sym_exec_statement] = STATE(1341),
+    [sym_type_alias_statement] = STATE(1341),
+    [sym_expression_list] = STATE(1313),
+    [sym_pattern] = STATE(871),
+    [sym_tuple_pattern] = STATE(860),
+    [sym_list_pattern] = STATE(860),
+    [sym_list_splat_pattern] = STATE(860),
+    [sym_expression] = STATE(995),
+    [sym_primary_expression] = STATE(707),
+    [sym_not_operator] = STATE(985),
+    [sym_boolean_operator] = STATE(985),
+    [sym_binary_operator] = STATE(759),
+    [sym_unary_operator] = STATE(759),
+    [sym_comparison_operator] = STATE(985),
+    [sym_lambda] = STATE(985),
+    [sym_assignment] = STATE(1313),
+    [sym_augmented_assignment] = STATE(1313),
+    [sym_pattern_list] = STATE(880),
+    [sym_yield] = STATE(1313),
+    [sym_attribute] = STATE(422),
+    [sym_subscript] = STATE(422),
+    [sym_call] = STATE(759),
+    [sym_list] = STATE(759),
+    [sym_set] = STATE(759),
+    [sym_tuple] = STATE(759),
+    [sym_dictionary] = STATE(759),
+    [sym_list_comprehension] = STATE(759),
+    [sym_dictionary_comprehension] = STATE(759),
+    [sym_set_comprehension] = STATE(759),
+    [sym_generator_expression] = STATE(759),
+    [sym_parenthesized_expression] = STATE(759),
+    [sym_conditional_expression] = STATE(985),
+    [sym_concatenated_string] = STATE(759),
+    [sym_string] = STATE(709),
+    [sym_await] = STATE(759),
     [sym_identifier] = ACTIONS(7),
     [anon_sym_import] = ACTIONS(9),
     [anon_sym_from] = ACTIONS(11),
@@ -23919,8 +21306,100 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_pass] = ACTIONS(27),
     [anon_sym_break] = ACTIONS(29),
     [anon_sym_continue] = ACTIONS(31),
-    [anon_sym_async] = ACTIONS(317),
-    [anon_sym_match] = ACTIONS(317),
+    [anon_sym_async] = ACTIONS(301),
+    [anon_sym_match] = ACTIONS(301),
+    [anon_sym_DASH] = ACTIONS(47),
+    [anon_sym_PLUS] = ACTIONS(47),
+    [anon_sym_LBRACK] = ACTIONS(49),
+    [anon_sym_LBRACE] = ACTIONS(51),
+    [anon_sym_STAR_STAR] = ACTIONS(53),
+    [anon_sym_global] = ACTIONS(57),
+    [anon_sym_nonlocal] = ACTIONS(59),
+    [anon_sym_exec] = ACTIONS(61),
+    [anon_sym_type] = ACTIONS(63),
+    [anon_sym_not] = ACTIONS(69),
+    [anon_sym_TILDE] = ACTIONS(47),
+    [anon_sym_lambda] = ACTIONS(71),
+    [anon_sym_yield] = ACTIONS(73),
+    [sym_ellipsis] = ACTIONS(75),
+    [sym_integer] = ACTIONS(77),
+    [sym_float] = ACTIONS(75),
+    [anon_sym_await] = ACTIONS(79),
+    [sym_true] = ACTIONS(77),
+    [sym_false] = ACTIONS(77),
+    [sym_none] = ACTIONS(77),
+    [sym_comment] = ACTIONS(3),
+    [sym__newline] = ACTIONS(549),
+    [sym__string_start] = ACTIONS(81),
+  },
+  [131] = {
+    [sym_import_statement] = STATE(1341),
+    [sym_future_import_statement] = STATE(1341),
+    [sym_import_from_statement] = STATE(1341),
+    [sym_print_statement] = STATE(1341),
+    [sym_assert_statement] = STATE(1341),
+    [sym_expression_statement] = STATE(1341),
+    [sym_named_expression] = STATE(985),
+    [sym_return_statement] = STATE(1341),
+    [sym_delete_statement] = STATE(1341),
+    [sym_raise_statement] = STATE(1341),
+    [sym_pass_statement] = STATE(1341),
+    [sym_break_statement] = STATE(1341),
+    [sym_continue_statement] = STATE(1341),
+    [sym_list_splat] = STATE(1321),
+    [sym_dictionary_splat] = STATE(1321),
+    [sym_global_statement] = STATE(1341),
+    [sym_nonlocal_statement] = STATE(1341),
+    [sym_exec_statement] = STATE(1341),
+    [sym_type_alias_statement] = STATE(1341),
+    [sym_expression_list] = STATE(1313),
+    [sym_pattern] = STATE(871),
+    [sym_tuple_pattern] = STATE(860),
+    [sym_list_pattern] = STATE(860),
+    [sym_list_splat_pattern] = STATE(860),
+    [sym_expression] = STATE(995),
+    [sym_primary_expression] = STATE(707),
+    [sym_not_operator] = STATE(985),
+    [sym_boolean_operator] = STATE(985),
+    [sym_binary_operator] = STATE(759),
+    [sym_unary_operator] = STATE(759),
+    [sym_comparison_operator] = STATE(985),
+    [sym_lambda] = STATE(985),
+    [sym_assignment] = STATE(1313),
+    [sym_augmented_assignment] = STATE(1313),
+    [sym_pattern_list] = STATE(880),
+    [sym_yield] = STATE(1313),
+    [sym_attribute] = STATE(422),
+    [sym_subscript] = STATE(422),
+    [sym_call] = STATE(759),
+    [sym_list] = STATE(759),
+    [sym_set] = STATE(759),
+    [sym_tuple] = STATE(759),
+    [sym_dictionary] = STATE(759),
+    [sym_list_comprehension] = STATE(759),
+    [sym_dictionary_comprehension] = STATE(759),
+    [sym_set_comprehension] = STATE(759),
+    [sym_generator_expression] = STATE(759),
+    [sym_parenthesized_expression] = STATE(759),
+    [sym_conditional_expression] = STATE(985),
+    [sym_concatenated_string] = STATE(759),
+    [sym_string] = STATE(709),
+    [sym_await] = STATE(759),
+    [sym_identifier] = ACTIONS(7),
+    [anon_sym_import] = ACTIONS(9),
+    [anon_sym_from] = ACTIONS(11),
+    [anon_sym_LPAREN] = ACTIONS(13),
+    [anon_sym_STAR] = ACTIONS(15),
+    [anon_sym_print] = ACTIONS(17),
+    [anon_sym_assert] = ACTIONS(19),
+    [anon_sym_return] = ACTIONS(21),
+    [anon_sym_del] = ACTIONS(23),
+    [anon_sym_raise] = ACTIONS(25),
+    [anon_sym_pass] = ACTIONS(27),
+    [anon_sym_break] = ACTIONS(29),
+    [anon_sym_continue] = ACTIONS(31),
+    [anon_sym_async] = ACTIONS(301),
+    [anon_sym_match] = ACTIONS(301),
     [anon_sym_DASH] = ACTIONS(47),
     [anon_sym_PLUS] = ACTIONS(47),
     [anon_sym_LBRACK] = ACTIONS(49),
@@ -23943,342 +21422,61 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_none] = ACTIONS(77),
     [sym_comment] = ACTIONS(3),
     [sym__newline] = ACTIONS(551),
-    [sym__indent] = ACTIONS(553),
-    [sym__string_start] = ACTIONS(81),
-  },
-  [130] = {
-    [sym__simple_statements] = STATE(421),
-    [sym_import_statement] = STATE(1319),
-    [sym_future_import_statement] = STATE(1319),
-    [sym_import_from_statement] = STATE(1319),
-    [sym_print_statement] = STATE(1319),
-    [sym_assert_statement] = STATE(1319),
-    [sym_expression_statement] = STATE(1319),
-    [sym_named_expression] = STATE(1009),
-    [sym_return_statement] = STATE(1319),
-    [sym_delete_statement] = STATE(1319),
-    [sym_raise_statement] = STATE(1319),
-    [sym_pass_statement] = STATE(1319),
-    [sym_break_statement] = STATE(1319),
-    [sym_continue_statement] = STATE(1319),
-    [sym_list_splat] = STATE(1360),
-    [sym_dictionary_splat] = STATE(1360),
-    [sym_global_statement] = STATE(1319),
-    [sym_nonlocal_statement] = STATE(1319),
-    [sym_exec_statement] = STATE(1319),
-    [sym_type_alias_statement] = STATE(1319),
-    [sym_expression_list] = STATE(1361),
-    [sym_pattern] = STATE(889),
-    [sym_tuple_pattern] = STATE(875),
-    [sym_list_pattern] = STATE(875),
-    [sym_list_splat_pattern] = STATE(875),
-    [sym_expression] = STATE(1019),
-    [sym_primary_expression] = STATE(684),
-    [sym_not_operator] = STATE(1009),
-    [sym_boolean_operator] = STATE(1009),
-    [sym_binary_operator] = STATE(797),
-    [sym_unary_operator] = STATE(797),
-    [sym_comparison_operator] = STATE(1009),
-    [sym_lambda] = STATE(1009),
-    [sym_assignment] = STATE(1361),
-    [sym_augmented_assignment] = STATE(1361),
-    [sym_pattern_list] = STATE(897),
-    [sym_yield] = STATE(1361),
-    [sym_attribute] = STATE(431),
-    [sym_subscript] = STATE(431),
-    [sym_call] = STATE(797),
-    [sym_list] = STATE(797),
-    [sym_set] = STATE(797),
-    [sym_tuple] = STATE(797),
-    [sym_dictionary] = STATE(797),
-    [sym_list_comprehension] = STATE(797),
-    [sym_dictionary_comprehension] = STATE(797),
-    [sym_set_comprehension] = STATE(797),
-    [sym_generator_expression] = STATE(797),
-    [sym_parenthesized_expression] = STATE(797),
-    [sym_conditional_expression] = STATE(1009),
-    [sym_concatenated_string] = STATE(797),
-    [sym_string] = STATE(713),
-    [sym_await] = STATE(1009),
-    [sym_identifier] = ACTIONS(7),
-    [anon_sym_import] = ACTIONS(9),
-    [anon_sym_from] = ACTIONS(11),
-    [anon_sym_LPAREN] = ACTIONS(13),
-    [anon_sym_STAR] = ACTIONS(15),
-    [anon_sym_print] = ACTIONS(17),
-    [anon_sym_assert] = ACTIONS(19),
-    [anon_sym_return] = ACTIONS(21),
-    [anon_sym_del] = ACTIONS(23),
-    [anon_sym_raise] = ACTIONS(25),
-    [anon_sym_pass] = ACTIONS(27),
-    [anon_sym_break] = ACTIONS(29),
-    [anon_sym_continue] = ACTIONS(31),
-    [anon_sym_async] = ACTIONS(317),
-    [anon_sym_match] = ACTIONS(317),
-    [anon_sym_DASH] = ACTIONS(47),
-    [anon_sym_PLUS] = ACTIONS(47),
-    [anon_sym_LBRACK] = ACTIONS(49),
-    [anon_sym_LBRACE] = ACTIONS(51),
-    [anon_sym_STAR_STAR] = ACTIONS(53),
-    [anon_sym_global] = ACTIONS(57),
-    [anon_sym_nonlocal] = ACTIONS(59),
-    [anon_sym_exec] = ACTIONS(61),
-    [anon_sym_type] = ACTIONS(63),
-    [anon_sym_not] = ACTIONS(69),
-    [anon_sym_TILDE] = ACTIONS(47),
-    [anon_sym_lambda] = ACTIONS(71),
-    [anon_sym_yield] = ACTIONS(73),
-    [sym_ellipsis] = ACTIONS(75),
-    [sym_integer] = ACTIONS(77),
-    [sym_float] = ACTIONS(75),
-    [anon_sym_await] = ACTIONS(79),
-    [sym_true] = ACTIONS(77),
-    [sym_false] = ACTIONS(77),
-    [sym_none] = ACTIONS(77),
-    [sym_comment] = ACTIONS(3),
-    [sym__newline] = ACTIONS(555),
-    [sym__indent] = ACTIONS(557),
-    [sym__string_start] = ACTIONS(81),
-  },
-  [131] = {
-    [sym_named_expression] = STATE(1009),
-    [sym_expression] = STATE(976),
-    [sym_primary_expression] = STATE(684),
-    [sym_not_operator] = STATE(1009),
-    [sym_boolean_operator] = STATE(1009),
-    [sym_binary_operator] = STATE(797),
-    [sym_unary_operator] = STATE(797),
-    [sym_comparison_operator] = STATE(1009),
-    [sym_lambda] = STATE(1009),
-    [sym_attribute] = STATE(797),
-    [sym_subscript] = STATE(797),
-    [sym_call] = STATE(797),
-    [sym_list] = STATE(797),
-    [sym_set] = STATE(797),
-    [sym_tuple] = STATE(797),
-    [sym_dictionary] = STATE(797),
-    [sym_list_comprehension] = STATE(797),
-    [sym_dictionary_comprehension] = STATE(797),
-    [sym_set_comprehension] = STATE(797),
-    [sym_generator_expression] = STATE(797),
-    [sym_parenthesized_expression] = STATE(797),
-    [sym_conditional_expression] = STATE(1009),
-    [sym_concatenated_string] = STATE(797),
-    [sym_string] = STATE(713),
-    [sym_await] = STATE(1009),
-    [sym_identifier] = ACTIONS(331),
-    [anon_sym_DOT] = ACTIONS(276),
-    [anon_sym_LPAREN] = ACTIONS(559),
-    [anon_sym_COMMA] = ACTIONS(280),
-    [anon_sym_STAR] = ACTIONS(276),
-    [anon_sym_print] = ACTIONS(333),
-    [anon_sym_GT_GT] = ACTIONS(276),
-    [anon_sym_COLON_EQ] = ACTIONS(287),
-    [anon_sym_if] = ACTIONS(276),
-    [anon_sym_COLON] = ACTIONS(289),
-    [anon_sym_async] = ACTIONS(333),
-    [anon_sym_in] = ACTIONS(276),
-    [anon_sym_match] = ACTIONS(333),
-    [anon_sym_PIPE] = ACTIONS(276),
-    [anon_sym_DASH] = ACTIONS(561),
-    [anon_sym_PLUS] = ACTIONS(561),
-    [anon_sym_LBRACK] = ACTIONS(563),
-    [anon_sym_LBRACE] = ACTIONS(51),
-    [anon_sym_STAR_STAR] = ACTIONS(276),
-    [anon_sym_EQ] = ACTIONS(289),
-    [anon_sym_exec] = ACTIONS(333),
-    [anon_sym_type] = ACTIONS(333),
-    [anon_sym_AT] = ACTIONS(276),
-    [anon_sym_not] = ACTIONS(69),
-    [anon_sym_and] = ACTIONS(276),
-    [anon_sym_or] = ACTIONS(276),
-    [anon_sym_SLASH] = ACTIONS(276),
-    [anon_sym_PERCENT] = ACTIONS(276),
-    [anon_sym_SLASH_SLASH] = ACTIONS(276),
-    [anon_sym_AMP] = ACTIONS(276),
-    [anon_sym_CARET] = ACTIONS(276),
-    [anon_sym_LT_LT] = ACTIONS(276),
-    [anon_sym_TILDE] = ACTIONS(47),
-    [anon_sym_LT] = ACTIONS(276),
-    [anon_sym_LT_EQ] = ACTIONS(303),
-    [anon_sym_EQ_EQ] = ACTIONS(303),
-    [anon_sym_BANG_EQ] = ACTIONS(303),
-    [anon_sym_GT_EQ] = ACTIONS(303),
-    [anon_sym_GT] = ACTIONS(276),
-    [anon_sym_LT_GT] = ACTIONS(303),
-    [anon_sym_is] = ACTIONS(276),
-    [anon_sym_lambda] = ACTIONS(71),
-    [anon_sym_PLUS_EQ] = ACTIONS(307),
-    [anon_sym_DASH_EQ] = ACTIONS(307),
-    [anon_sym_STAR_EQ] = ACTIONS(307),
-    [anon_sym_SLASH_EQ] = ACTIONS(307),
-    [anon_sym_AT_EQ] = ACTIONS(307),
-    [anon_sym_SLASH_SLASH_EQ] = ACTIONS(307),
-    [anon_sym_PERCENT_EQ] = ACTIONS(307),
-    [anon_sym_STAR_STAR_EQ] = ACTIONS(307),
-    [anon_sym_GT_GT_EQ] = ACTIONS(307),
-    [anon_sym_LT_LT_EQ] = ACTIONS(307),
-    [anon_sym_AMP_EQ] = ACTIONS(307),
-    [anon_sym_CARET_EQ] = ACTIONS(307),
-    [anon_sym_PIPE_EQ] = ACTIONS(307),
-    [sym_ellipsis] = ACTIONS(75),
-    [sym_integer] = ACTIONS(77),
-    [sym_float] = ACTIONS(75),
-    [anon_sym_await] = ACTIONS(337),
-    [sym_true] = ACTIONS(77),
-    [sym_false] = ACTIONS(77),
-    [sym_none] = ACTIONS(77),
-    [sym_comment] = ACTIONS(3),
-    [sym__semicolon] = ACTIONS(303),
-    [sym__newline] = ACTIONS(303),
     [sym__string_start] = ACTIONS(81),
   },
   [132] = {
-    [sym_named_expression] = STATE(900),
-    [sym_expression] = STATE(901),
-    [sym_primary_expression] = STATE(630),
-    [sym_not_operator] = STATE(900),
-    [sym_boolean_operator] = STATE(900),
-    [sym_binary_operator] = STATE(642),
-    [sym_unary_operator] = STATE(642),
-    [sym_comparison_operator] = STATE(900),
-    [sym_lambda] = STATE(900),
-    [sym_attribute] = STATE(642),
-    [sym_subscript] = STATE(642),
-    [sym_call] = STATE(642),
-    [sym_list] = STATE(642),
-    [sym_set] = STATE(642),
-    [sym_tuple] = STATE(642),
-    [sym_dictionary] = STATE(642),
-    [sym_list_comprehension] = STATE(642),
-    [sym_dictionary_comprehension] = STATE(642),
-    [sym_set_comprehension] = STATE(642),
-    [sym_generator_expression] = STATE(642),
-    [sym_parenthesized_expression] = STATE(642),
-    [sym_conditional_expression] = STATE(900),
-    [sym_concatenated_string] = STATE(642),
-    [sym_string] = STATE(600),
-    [sym_await] = STATE(900),
-    [sym_identifier] = ACTIONS(274),
-    [anon_sym_DOT] = ACTIONS(276),
-    [anon_sym_LPAREN] = ACTIONS(278),
-    [anon_sym_RPAREN] = ACTIONS(565),
-    [anon_sym_COMMA] = ACTIONS(565),
-    [anon_sym_STAR] = ACTIONS(276),
-    [anon_sym_print] = ACTIONS(285),
-    [anon_sym_GT_GT] = ACTIONS(276),
-    [anon_sym_COLON_EQ] = ACTIONS(568),
-    [anon_sym_if] = ACTIONS(276),
-    [anon_sym_COLON] = ACTIONS(570),
-    [anon_sym_async] = ACTIONS(285),
-    [anon_sym_in] = ACTIONS(276),
-    [anon_sym_match] = ACTIONS(285),
-    [anon_sym_PIPE] = ACTIONS(276),
-    [anon_sym_DASH] = ACTIONS(291),
-    [anon_sym_PLUS] = ACTIONS(291),
-    [anon_sym_LBRACK] = ACTIONS(293),
-    [anon_sym_RBRACK] = ACTIONS(565),
-    [anon_sym_LBRACE] = ACTIONS(295),
-    [anon_sym_STAR_STAR] = ACTIONS(276),
-    [anon_sym_EQ] = ACTIONS(570),
-    [anon_sym_exec] = ACTIONS(285),
-    [anon_sym_type] = ACTIONS(285),
-    [anon_sym_AT] = ACTIONS(276),
-    [anon_sym_not] = ACTIONS(299),
-    [anon_sym_and] = ACTIONS(276),
-    [anon_sym_or] = ACTIONS(276),
-    [anon_sym_SLASH] = ACTIONS(276),
-    [anon_sym_PERCENT] = ACTIONS(276),
-    [anon_sym_SLASH_SLASH] = ACTIONS(276),
-    [anon_sym_AMP] = ACTIONS(276),
-    [anon_sym_CARET] = ACTIONS(276),
-    [anon_sym_LT_LT] = ACTIONS(276),
-    [anon_sym_TILDE] = ACTIONS(301),
-    [anon_sym_LT] = ACTIONS(276),
-    [anon_sym_LT_EQ] = ACTIONS(303),
-    [anon_sym_EQ_EQ] = ACTIONS(303),
-    [anon_sym_BANG_EQ] = ACTIONS(303),
-    [anon_sym_GT_EQ] = ACTIONS(303),
-    [anon_sym_GT] = ACTIONS(276),
-    [anon_sym_LT_GT] = ACTIONS(303),
-    [anon_sym_is] = ACTIONS(276),
-    [anon_sym_lambda] = ACTIONS(305),
-    [anon_sym_PLUS_EQ] = ACTIONS(572),
-    [anon_sym_DASH_EQ] = ACTIONS(572),
-    [anon_sym_STAR_EQ] = ACTIONS(572),
-    [anon_sym_SLASH_EQ] = ACTIONS(572),
-    [anon_sym_AT_EQ] = ACTIONS(572),
-    [anon_sym_SLASH_SLASH_EQ] = ACTIONS(572),
-    [anon_sym_PERCENT_EQ] = ACTIONS(572),
-    [anon_sym_STAR_STAR_EQ] = ACTIONS(572),
-    [anon_sym_GT_GT_EQ] = ACTIONS(572),
-    [anon_sym_LT_LT_EQ] = ACTIONS(572),
-    [anon_sym_AMP_EQ] = ACTIONS(572),
-    [anon_sym_CARET_EQ] = ACTIONS(572),
-    [anon_sym_PIPE_EQ] = ACTIONS(572),
-    [sym_ellipsis] = ACTIONS(309),
-    [sym_integer] = ACTIONS(311),
-    [sym_float] = ACTIONS(309),
-    [anon_sym_await] = ACTIONS(313),
-    [sym_true] = ACTIONS(311),
-    [sym_false] = ACTIONS(311),
-    [sym_none] = ACTIONS(311),
-    [sym_comment] = ACTIONS(3),
-    [sym__string_start] = ACTIONS(315),
-  },
-  [133] = {
-    [sym_import_statement] = STATE(1351),
-    [sym_future_import_statement] = STATE(1351),
-    [sym_import_from_statement] = STATE(1351),
-    [sym_print_statement] = STATE(1351),
-    [sym_assert_statement] = STATE(1351),
-    [sym_expression_statement] = STATE(1351),
-    [sym_named_expression] = STATE(1009),
-    [sym_return_statement] = STATE(1351),
-    [sym_delete_statement] = STATE(1351),
-    [sym_raise_statement] = STATE(1351),
-    [sym_pass_statement] = STATE(1351),
-    [sym_break_statement] = STATE(1351),
-    [sym_continue_statement] = STATE(1351),
-    [sym_list_splat] = STATE(1360),
-    [sym_dictionary_splat] = STATE(1360),
-    [sym_global_statement] = STATE(1351),
-    [sym_nonlocal_statement] = STATE(1351),
-    [sym_exec_statement] = STATE(1351),
-    [sym_type_alias_statement] = STATE(1351),
-    [sym_expression_list] = STATE(1361),
-    [sym_pattern] = STATE(889),
-    [sym_tuple_pattern] = STATE(875),
-    [sym_list_pattern] = STATE(875),
-    [sym_list_splat_pattern] = STATE(875),
-    [sym_expression] = STATE(1019),
-    [sym_primary_expression] = STATE(684),
-    [sym_not_operator] = STATE(1009),
-    [sym_boolean_operator] = STATE(1009),
-    [sym_binary_operator] = STATE(797),
-    [sym_unary_operator] = STATE(797),
-    [sym_comparison_operator] = STATE(1009),
-    [sym_lambda] = STATE(1009),
-    [sym_assignment] = STATE(1361),
-    [sym_augmented_assignment] = STATE(1361),
-    [sym_pattern_list] = STATE(897),
-    [sym_yield] = STATE(1361),
-    [sym_attribute] = STATE(431),
-    [sym_subscript] = STATE(431),
-    [sym_call] = STATE(797),
-    [sym_list] = STATE(797),
-    [sym_set] = STATE(797),
-    [sym_tuple] = STATE(797),
-    [sym_dictionary] = STATE(797),
-    [sym_list_comprehension] = STATE(797),
-    [sym_dictionary_comprehension] = STATE(797),
-    [sym_set_comprehension] = STATE(797),
-    [sym_generator_expression] = STATE(797),
-    [sym_parenthesized_expression] = STATE(797),
-    [sym_conditional_expression] = STATE(1009),
-    [sym_concatenated_string] = STATE(797),
-    [sym_string] = STATE(713),
-    [sym_await] = STATE(1009),
+    [sym_import_statement] = STATE(1341),
+    [sym_future_import_statement] = STATE(1341),
+    [sym_import_from_statement] = STATE(1341),
+    [sym_print_statement] = STATE(1341),
+    [sym_assert_statement] = STATE(1341),
+    [sym_expression_statement] = STATE(1341),
+    [sym_named_expression] = STATE(985),
+    [sym_return_statement] = STATE(1341),
+    [sym_delete_statement] = STATE(1341),
+    [sym_raise_statement] = STATE(1341),
+    [sym_pass_statement] = STATE(1341),
+    [sym_break_statement] = STATE(1341),
+    [sym_continue_statement] = STATE(1341),
+    [sym_list_splat] = STATE(1321),
+    [sym_dictionary_splat] = STATE(1321),
+    [sym_global_statement] = STATE(1341),
+    [sym_nonlocal_statement] = STATE(1341),
+    [sym_exec_statement] = STATE(1341),
+    [sym_type_alias_statement] = STATE(1341),
+    [sym_expression_list] = STATE(1313),
+    [sym_pattern] = STATE(871),
+    [sym_tuple_pattern] = STATE(860),
+    [sym_list_pattern] = STATE(860),
+    [sym_list_splat_pattern] = STATE(860),
+    [sym_expression] = STATE(995),
+    [sym_primary_expression] = STATE(707),
+    [sym_not_operator] = STATE(985),
+    [sym_boolean_operator] = STATE(985),
+    [sym_binary_operator] = STATE(759),
+    [sym_unary_operator] = STATE(759),
+    [sym_comparison_operator] = STATE(985),
+    [sym_lambda] = STATE(985),
+    [sym_assignment] = STATE(1313),
+    [sym_augmented_assignment] = STATE(1313),
+    [sym_pattern_list] = STATE(880),
+    [sym_yield] = STATE(1313),
+    [sym_attribute] = STATE(422),
+    [sym_subscript] = STATE(422),
+    [sym_call] = STATE(759),
+    [sym_list] = STATE(759),
+    [sym_set] = STATE(759),
+    [sym_tuple] = STATE(759),
+    [sym_dictionary] = STATE(759),
+    [sym_list_comprehension] = STATE(759),
+    [sym_dictionary_comprehension] = STATE(759),
+    [sym_set_comprehension] = STATE(759),
+    [sym_generator_expression] = STATE(759),
+    [sym_parenthesized_expression] = STATE(759),
+    [sym_conditional_expression] = STATE(985),
+    [sym_concatenated_string] = STATE(759),
+    [sym_string] = STATE(709),
+    [sym_await] = STATE(759),
     [sym_identifier] = ACTIONS(7),
     [anon_sym_import] = ACTIONS(9),
     [anon_sym_from] = ACTIONS(11),
@@ -24292,8 +21490,100 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_pass] = ACTIONS(27),
     [anon_sym_break] = ACTIONS(29),
     [anon_sym_continue] = ACTIONS(31),
-    [anon_sym_async] = ACTIONS(317),
-    [anon_sym_match] = ACTIONS(317),
+    [anon_sym_async] = ACTIONS(301),
+    [anon_sym_match] = ACTIONS(301),
+    [anon_sym_DASH] = ACTIONS(47),
+    [anon_sym_PLUS] = ACTIONS(47),
+    [anon_sym_LBRACK] = ACTIONS(49),
+    [anon_sym_LBRACE] = ACTIONS(51),
+    [anon_sym_STAR_STAR] = ACTIONS(53),
+    [anon_sym_global] = ACTIONS(57),
+    [anon_sym_nonlocal] = ACTIONS(59),
+    [anon_sym_exec] = ACTIONS(61),
+    [anon_sym_type] = ACTIONS(63),
+    [anon_sym_not] = ACTIONS(69),
+    [anon_sym_TILDE] = ACTIONS(47),
+    [anon_sym_lambda] = ACTIONS(71),
+    [anon_sym_yield] = ACTIONS(73),
+    [sym_ellipsis] = ACTIONS(75),
+    [sym_integer] = ACTIONS(77),
+    [sym_float] = ACTIONS(75),
+    [anon_sym_await] = ACTIONS(79),
+    [sym_true] = ACTIONS(77),
+    [sym_false] = ACTIONS(77),
+    [sym_none] = ACTIONS(77),
+    [sym_comment] = ACTIONS(3),
+    [sym__newline] = ACTIONS(553),
+    [sym__string_start] = ACTIONS(81),
+  },
+  [133] = {
+    [sym_import_statement] = STATE(1341),
+    [sym_future_import_statement] = STATE(1341),
+    [sym_import_from_statement] = STATE(1341),
+    [sym_print_statement] = STATE(1341),
+    [sym_assert_statement] = STATE(1341),
+    [sym_expression_statement] = STATE(1341),
+    [sym_named_expression] = STATE(985),
+    [sym_return_statement] = STATE(1341),
+    [sym_delete_statement] = STATE(1341),
+    [sym_raise_statement] = STATE(1341),
+    [sym_pass_statement] = STATE(1341),
+    [sym_break_statement] = STATE(1341),
+    [sym_continue_statement] = STATE(1341),
+    [sym_list_splat] = STATE(1321),
+    [sym_dictionary_splat] = STATE(1321),
+    [sym_global_statement] = STATE(1341),
+    [sym_nonlocal_statement] = STATE(1341),
+    [sym_exec_statement] = STATE(1341),
+    [sym_type_alias_statement] = STATE(1341),
+    [sym_expression_list] = STATE(1313),
+    [sym_pattern] = STATE(871),
+    [sym_tuple_pattern] = STATE(860),
+    [sym_list_pattern] = STATE(860),
+    [sym_list_splat_pattern] = STATE(860),
+    [sym_expression] = STATE(995),
+    [sym_primary_expression] = STATE(707),
+    [sym_not_operator] = STATE(985),
+    [sym_boolean_operator] = STATE(985),
+    [sym_binary_operator] = STATE(759),
+    [sym_unary_operator] = STATE(759),
+    [sym_comparison_operator] = STATE(985),
+    [sym_lambda] = STATE(985),
+    [sym_assignment] = STATE(1313),
+    [sym_augmented_assignment] = STATE(1313),
+    [sym_pattern_list] = STATE(880),
+    [sym_yield] = STATE(1313),
+    [sym_attribute] = STATE(422),
+    [sym_subscript] = STATE(422),
+    [sym_call] = STATE(759),
+    [sym_list] = STATE(759),
+    [sym_set] = STATE(759),
+    [sym_tuple] = STATE(759),
+    [sym_dictionary] = STATE(759),
+    [sym_list_comprehension] = STATE(759),
+    [sym_dictionary_comprehension] = STATE(759),
+    [sym_set_comprehension] = STATE(759),
+    [sym_generator_expression] = STATE(759),
+    [sym_parenthesized_expression] = STATE(759),
+    [sym_conditional_expression] = STATE(985),
+    [sym_concatenated_string] = STATE(759),
+    [sym_string] = STATE(709),
+    [sym_await] = STATE(759),
+    [sym_identifier] = ACTIONS(7),
+    [anon_sym_import] = ACTIONS(9),
+    [anon_sym_from] = ACTIONS(11),
+    [anon_sym_LPAREN] = ACTIONS(13),
+    [anon_sym_STAR] = ACTIONS(15),
+    [anon_sym_print] = ACTIONS(17),
+    [anon_sym_assert] = ACTIONS(19),
+    [anon_sym_return] = ACTIONS(21),
+    [anon_sym_del] = ACTIONS(23),
+    [anon_sym_raise] = ACTIONS(25),
+    [anon_sym_pass] = ACTIONS(27),
+    [anon_sym_break] = ACTIONS(29),
+    [anon_sym_continue] = ACTIONS(31),
+    [anon_sym_async] = ACTIONS(301),
+    [anon_sym_match] = ACTIONS(301),
     [anon_sym_DASH] = ACTIONS(47),
     [anon_sym_PLUS] = ACTIONS(47),
     [anon_sym_LBRACK] = ACTIONS(49),
@@ -24315,1855 +21605,1113 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_false] = ACTIONS(77),
     [sym_none] = ACTIONS(77),
     [sym_comment] = ACTIONS(3),
-    [sym__newline] = ACTIONS(574),
     [sym__string_start] = ACTIONS(81),
   },
   [134] = {
-    [sym_import_statement] = STATE(1351),
-    [sym_future_import_statement] = STATE(1351),
-    [sym_import_from_statement] = STATE(1351),
-    [sym_print_statement] = STATE(1351),
-    [sym_assert_statement] = STATE(1351),
-    [sym_expression_statement] = STATE(1351),
-    [sym_named_expression] = STATE(1009),
-    [sym_return_statement] = STATE(1351),
-    [sym_delete_statement] = STATE(1351),
-    [sym_raise_statement] = STATE(1351),
-    [sym_pass_statement] = STATE(1351),
-    [sym_break_statement] = STATE(1351),
-    [sym_continue_statement] = STATE(1351),
-    [sym_list_splat] = STATE(1360),
-    [sym_dictionary_splat] = STATE(1360),
-    [sym_global_statement] = STATE(1351),
-    [sym_nonlocal_statement] = STATE(1351),
-    [sym_exec_statement] = STATE(1351),
-    [sym_type_alias_statement] = STATE(1351),
-    [sym_expression_list] = STATE(1361),
-    [sym_pattern] = STATE(889),
-    [sym_tuple_pattern] = STATE(875),
-    [sym_list_pattern] = STATE(875),
-    [sym_list_splat_pattern] = STATE(875),
-    [sym_expression] = STATE(1019),
-    [sym_primary_expression] = STATE(684),
-    [sym_not_operator] = STATE(1009),
-    [sym_boolean_operator] = STATE(1009),
-    [sym_binary_operator] = STATE(797),
-    [sym_unary_operator] = STATE(797),
-    [sym_comparison_operator] = STATE(1009),
-    [sym_lambda] = STATE(1009),
-    [sym_assignment] = STATE(1361),
-    [sym_augmented_assignment] = STATE(1361),
-    [sym_pattern_list] = STATE(897),
-    [sym_yield] = STATE(1361),
-    [sym_attribute] = STATE(431),
-    [sym_subscript] = STATE(431),
-    [sym_call] = STATE(797),
-    [sym_list] = STATE(797),
-    [sym_set] = STATE(797),
-    [sym_tuple] = STATE(797),
-    [sym_dictionary] = STATE(797),
-    [sym_list_comprehension] = STATE(797),
-    [sym_dictionary_comprehension] = STATE(797),
-    [sym_set_comprehension] = STATE(797),
-    [sym_generator_expression] = STATE(797),
-    [sym_parenthesized_expression] = STATE(797),
-    [sym_conditional_expression] = STATE(1009),
-    [sym_concatenated_string] = STATE(797),
-    [sym_string] = STATE(713),
-    [sym_await] = STATE(1009),
-    [sym_identifier] = ACTIONS(7),
-    [anon_sym_import] = ACTIONS(9),
-    [anon_sym_from] = ACTIONS(11),
-    [anon_sym_LPAREN] = ACTIONS(13),
-    [anon_sym_STAR] = ACTIONS(15),
-    [anon_sym_print] = ACTIONS(17),
-    [anon_sym_assert] = ACTIONS(19),
-    [anon_sym_return] = ACTIONS(21),
-    [anon_sym_del] = ACTIONS(23),
-    [anon_sym_raise] = ACTIONS(25),
-    [anon_sym_pass] = ACTIONS(27),
-    [anon_sym_break] = ACTIONS(29),
-    [anon_sym_continue] = ACTIONS(31),
-    [anon_sym_async] = ACTIONS(317),
-    [anon_sym_match] = ACTIONS(317),
-    [anon_sym_DASH] = ACTIONS(47),
-    [anon_sym_PLUS] = ACTIONS(47),
-    [anon_sym_LBRACK] = ACTIONS(49),
-    [anon_sym_LBRACE] = ACTIONS(51),
-    [anon_sym_STAR_STAR] = ACTIONS(53),
-    [anon_sym_global] = ACTIONS(57),
-    [anon_sym_nonlocal] = ACTIONS(59),
-    [anon_sym_exec] = ACTIONS(61),
-    [anon_sym_type] = ACTIONS(63),
-    [anon_sym_not] = ACTIONS(69),
-    [anon_sym_TILDE] = ACTIONS(47),
-    [anon_sym_lambda] = ACTIONS(71),
-    [anon_sym_yield] = ACTIONS(73),
-    [sym_ellipsis] = ACTIONS(75),
-    [sym_integer] = ACTIONS(77),
-    [sym_float] = ACTIONS(75),
-    [anon_sym_await] = ACTIONS(79),
-    [sym_true] = ACTIONS(77),
-    [sym_false] = ACTIONS(77),
-    [sym_none] = ACTIONS(77),
+    [sym_primary_expression] = STATE(637),
+    [sym_binary_operator] = STATE(605),
+    [sym_unary_operator] = STATE(605),
+    [sym_attribute] = STATE(605),
+    [sym_subscript] = STATE(605),
+    [sym_call] = STATE(605),
+    [sym_list] = STATE(605),
+    [sym_set] = STATE(605),
+    [sym_tuple] = STATE(605),
+    [sym_dictionary] = STATE(605),
+    [sym_list_comprehension] = STATE(605),
+    [sym_dictionary_comprehension] = STATE(605),
+    [sym_set_comprehension] = STATE(605),
+    [sym_generator_expression] = STATE(605),
+    [sym_parenthesized_expression] = STATE(605),
+    [sym_concatenated_string] = STATE(605),
+    [sym_string] = STATE(586),
+    [sym_await] = STATE(605),
+    [sym_identifier] = ACTIONS(295),
+    [anon_sym_DOT] = ACTIONS(260),
+    [anon_sym_LPAREN] = ACTIONS(262),
+    [anon_sym_RPAREN] = ACTIONS(555),
+    [anon_sym_COMMA] = ACTIONS(555),
+    [anon_sym_STAR] = ACTIONS(260),
+    [anon_sym_print] = ACTIONS(558),
+    [anon_sym_GT_GT] = ACTIONS(260),
+    [anon_sym_COLON_EQ] = ACTIONS(560),
+    [anon_sym_if] = ACTIONS(260),
+    [anon_sym_COLON] = ACTIONS(562),
+    [anon_sym_async] = ACTIONS(558),
+    [anon_sym_in] = ACTIONS(260),
+    [anon_sym_match] = ACTIONS(558),
+    [anon_sym_PIPE] = ACTIONS(260),
+    [anon_sym_DASH] = ACTIONS(275),
+    [anon_sym_PLUS] = ACTIONS(275),
+    [anon_sym_LBRACK] = ACTIONS(277),
+    [anon_sym_RBRACK] = ACTIONS(555),
+    [anon_sym_LBRACE] = ACTIONS(279),
+    [anon_sym_STAR_STAR] = ACTIONS(260),
+    [anon_sym_EQ] = ACTIONS(562),
+    [anon_sym_exec] = ACTIONS(558),
+    [anon_sym_type] = ACTIONS(558),
+    [anon_sym_AT] = ACTIONS(260),
+    [anon_sym_not] = ACTIONS(260),
+    [anon_sym_and] = ACTIONS(260),
+    [anon_sym_or] = ACTIONS(260),
+    [anon_sym_SLASH] = ACTIONS(260),
+    [anon_sym_PERCENT] = ACTIONS(260),
+    [anon_sym_SLASH_SLASH] = ACTIONS(260),
+    [anon_sym_AMP] = ACTIONS(260),
+    [anon_sym_CARET] = ACTIONS(260),
+    [anon_sym_LT_LT] = ACTIONS(260),
+    [anon_sym_TILDE] = ACTIONS(285),
+    [anon_sym_LT] = ACTIONS(260),
+    [anon_sym_LT_EQ] = ACTIONS(287),
+    [anon_sym_EQ_EQ] = ACTIONS(287),
+    [anon_sym_BANG_EQ] = ACTIONS(287),
+    [anon_sym_GT_EQ] = ACTIONS(287),
+    [anon_sym_GT] = ACTIONS(260),
+    [anon_sym_LT_GT] = ACTIONS(287),
+    [anon_sym_is] = ACTIONS(260),
+    [anon_sym_PLUS_EQ] = ACTIONS(564),
+    [anon_sym_DASH_EQ] = ACTIONS(564),
+    [anon_sym_STAR_EQ] = ACTIONS(564),
+    [anon_sym_SLASH_EQ] = ACTIONS(564),
+    [anon_sym_AT_EQ] = ACTIONS(564),
+    [anon_sym_SLASH_SLASH_EQ] = ACTIONS(564),
+    [anon_sym_PERCENT_EQ] = ACTIONS(564),
+    [anon_sym_STAR_STAR_EQ] = ACTIONS(564),
+    [anon_sym_GT_GT_EQ] = ACTIONS(564),
+    [anon_sym_LT_LT_EQ] = ACTIONS(564),
+    [anon_sym_AMP_EQ] = ACTIONS(564),
+    [anon_sym_CARET_EQ] = ACTIONS(564),
+    [anon_sym_PIPE_EQ] = ACTIONS(564),
+    [sym_ellipsis] = ACTIONS(293),
+    [sym_integer] = ACTIONS(295),
+    [sym_float] = ACTIONS(293),
+    [anon_sym_await] = ACTIONS(566),
+    [sym_true] = ACTIONS(295),
+    [sym_false] = ACTIONS(295),
+    [sym_none] = ACTIONS(295),
     [sym_comment] = ACTIONS(3),
-    [sym__newline] = ACTIONS(576),
-    [sym__string_start] = ACTIONS(81),
+    [sym__string_start] = ACTIONS(299),
   },
   [135] = {
-    [sym_import_statement] = STATE(1351),
-    [sym_future_import_statement] = STATE(1351),
-    [sym_import_from_statement] = STATE(1351),
-    [sym_print_statement] = STATE(1351),
-    [sym_assert_statement] = STATE(1351),
-    [sym_expression_statement] = STATE(1351),
-    [sym_named_expression] = STATE(1009),
-    [sym_return_statement] = STATE(1351),
-    [sym_delete_statement] = STATE(1351),
-    [sym_raise_statement] = STATE(1351),
-    [sym_pass_statement] = STATE(1351),
-    [sym_break_statement] = STATE(1351),
-    [sym_continue_statement] = STATE(1351),
-    [sym_list_splat] = STATE(1360),
-    [sym_dictionary_splat] = STATE(1360),
-    [sym_global_statement] = STATE(1351),
-    [sym_nonlocal_statement] = STATE(1351),
-    [sym_exec_statement] = STATE(1351),
-    [sym_type_alias_statement] = STATE(1351),
-    [sym_expression_list] = STATE(1361),
-    [sym_pattern] = STATE(889),
-    [sym_tuple_pattern] = STATE(875),
-    [sym_list_pattern] = STATE(875),
-    [sym_list_splat_pattern] = STATE(875),
-    [sym_expression] = STATE(1019),
-    [sym_primary_expression] = STATE(684),
-    [sym_not_operator] = STATE(1009),
-    [sym_boolean_operator] = STATE(1009),
-    [sym_binary_operator] = STATE(797),
-    [sym_unary_operator] = STATE(797),
-    [sym_comparison_operator] = STATE(1009),
-    [sym_lambda] = STATE(1009),
-    [sym_assignment] = STATE(1361),
-    [sym_augmented_assignment] = STATE(1361),
-    [sym_pattern_list] = STATE(897),
-    [sym_yield] = STATE(1361),
-    [sym_attribute] = STATE(431),
-    [sym_subscript] = STATE(431),
-    [sym_call] = STATE(797),
-    [sym_list] = STATE(797),
-    [sym_set] = STATE(797),
-    [sym_tuple] = STATE(797),
-    [sym_dictionary] = STATE(797),
-    [sym_list_comprehension] = STATE(797),
-    [sym_dictionary_comprehension] = STATE(797),
-    [sym_set_comprehension] = STATE(797),
-    [sym_generator_expression] = STATE(797),
-    [sym_parenthesized_expression] = STATE(797),
-    [sym_conditional_expression] = STATE(1009),
-    [sym_concatenated_string] = STATE(797),
-    [sym_string] = STATE(713),
-    [sym_await] = STATE(1009),
-    [sym_identifier] = ACTIONS(7),
-    [anon_sym_import] = ACTIONS(9),
-    [anon_sym_from] = ACTIONS(11),
-    [anon_sym_LPAREN] = ACTIONS(13),
-    [anon_sym_STAR] = ACTIONS(15),
-    [anon_sym_print] = ACTIONS(17),
-    [anon_sym_assert] = ACTIONS(19),
-    [anon_sym_return] = ACTIONS(21),
-    [anon_sym_del] = ACTIONS(23),
-    [anon_sym_raise] = ACTIONS(25),
-    [anon_sym_pass] = ACTIONS(27),
-    [anon_sym_break] = ACTIONS(29),
-    [anon_sym_continue] = ACTIONS(31),
-    [anon_sym_async] = ACTIONS(317),
-    [anon_sym_match] = ACTIONS(317),
-    [anon_sym_DASH] = ACTIONS(47),
-    [anon_sym_PLUS] = ACTIONS(47),
-    [anon_sym_LBRACK] = ACTIONS(49),
+    [sym_primary_expression] = STATE(725),
+    [sym_binary_operator] = STATE(759),
+    [sym_unary_operator] = STATE(759),
+    [sym_attribute] = STATE(759),
+    [sym_subscript] = STATE(759),
+    [sym_call] = STATE(759),
+    [sym_list] = STATE(759),
+    [sym_set] = STATE(759),
+    [sym_tuple] = STATE(759),
+    [sym_dictionary] = STATE(759),
+    [sym_list_comprehension] = STATE(759),
+    [sym_dictionary_comprehension] = STATE(759),
+    [sym_set_comprehension] = STATE(759),
+    [sym_generator_expression] = STATE(759),
+    [sym_parenthesized_expression] = STATE(759),
+    [sym_concatenated_string] = STATE(759),
+    [sym_string] = STATE(709),
+    [sym_await] = STATE(759),
+    [sym_identifier] = ACTIONS(77),
+    [anon_sym_DOT] = ACTIONS(260),
+    [anon_sym_LPAREN] = ACTIONS(568),
+    [anon_sym_COMMA] = ACTIONS(264),
+    [anon_sym_STAR] = ACTIONS(260),
+    [anon_sym_print] = ACTIONS(570),
+    [anon_sym_GT_GT] = ACTIONS(260),
+    [anon_sym_COLON_EQ] = ACTIONS(271),
+    [anon_sym_if] = ACTIONS(260),
+    [anon_sym_COLON] = ACTIONS(273),
+    [anon_sym_async] = ACTIONS(570),
+    [anon_sym_in] = ACTIONS(260),
+    [anon_sym_match] = ACTIONS(570),
+    [anon_sym_PIPE] = ACTIONS(260),
+    [anon_sym_DASH] = ACTIONS(572),
+    [anon_sym_PLUS] = ACTIONS(572),
+    [anon_sym_LBRACK] = ACTIONS(574),
     [anon_sym_LBRACE] = ACTIONS(51),
-    [anon_sym_STAR_STAR] = ACTIONS(53),
-    [anon_sym_global] = ACTIONS(57),
-    [anon_sym_nonlocal] = ACTIONS(59),
-    [anon_sym_exec] = ACTIONS(61),
-    [anon_sym_type] = ACTIONS(63),
-    [anon_sym_not] = ACTIONS(69),
+    [anon_sym_STAR_STAR] = ACTIONS(260),
+    [anon_sym_EQ] = ACTIONS(273),
+    [anon_sym_exec] = ACTIONS(570),
+    [anon_sym_type] = ACTIONS(570),
+    [anon_sym_AT] = ACTIONS(260),
+    [anon_sym_not] = ACTIONS(260),
+    [anon_sym_and] = ACTIONS(260),
+    [anon_sym_or] = ACTIONS(260),
+    [anon_sym_SLASH] = ACTIONS(260),
+    [anon_sym_PERCENT] = ACTIONS(260),
+    [anon_sym_SLASH_SLASH] = ACTIONS(260),
+    [anon_sym_AMP] = ACTIONS(260),
+    [anon_sym_CARET] = ACTIONS(260),
+    [anon_sym_LT_LT] = ACTIONS(260),
     [anon_sym_TILDE] = ACTIONS(47),
-    [anon_sym_lambda] = ACTIONS(71),
-    [anon_sym_yield] = ACTIONS(73),
+    [anon_sym_LT] = ACTIONS(260),
+    [anon_sym_LT_EQ] = ACTIONS(287),
+    [anon_sym_EQ_EQ] = ACTIONS(287),
+    [anon_sym_BANG_EQ] = ACTIONS(287),
+    [anon_sym_GT_EQ] = ACTIONS(287),
+    [anon_sym_GT] = ACTIONS(260),
+    [anon_sym_LT_GT] = ACTIONS(287),
+    [anon_sym_is] = ACTIONS(260),
+    [anon_sym_PLUS_EQ] = ACTIONS(291),
+    [anon_sym_DASH_EQ] = ACTIONS(291),
+    [anon_sym_STAR_EQ] = ACTIONS(291),
+    [anon_sym_SLASH_EQ] = ACTIONS(291),
+    [anon_sym_AT_EQ] = ACTIONS(291),
+    [anon_sym_SLASH_SLASH_EQ] = ACTIONS(291),
+    [anon_sym_PERCENT_EQ] = ACTIONS(291),
+    [anon_sym_STAR_STAR_EQ] = ACTIONS(291),
+    [anon_sym_GT_GT_EQ] = ACTIONS(291),
+    [anon_sym_LT_LT_EQ] = ACTIONS(291),
+    [anon_sym_AMP_EQ] = ACTIONS(291),
+    [anon_sym_CARET_EQ] = ACTIONS(291),
+    [anon_sym_PIPE_EQ] = ACTIONS(291),
     [sym_ellipsis] = ACTIONS(75),
     [sym_integer] = ACTIONS(77),
     [sym_float] = ACTIONS(75),
-    [anon_sym_await] = ACTIONS(79),
+    [anon_sym_await] = ACTIONS(576),
     [sym_true] = ACTIONS(77),
     [sym_false] = ACTIONS(77),
     [sym_none] = ACTIONS(77),
     [sym_comment] = ACTIONS(3),
-    [sym__newline] = ACTIONS(578),
+    [sym__semicolon] = ACTIONS(287),
+    [sym__newline] = ACTIONS(287),
     [sym__string_start] = ACTIONS(81),
   },
   [136] = {
-    [sym_import_statement] = STATE(1351),
-    [sym_future_import_statement] = STATE(1351),
-    [sym_import_from_statement] = STATE(1351),
-    [sym_print_statement] = STATE(1351),
-    [sym_assert_statement] = STATE(1351),
-    [sym_expression_statement] = STATE(1351),
-    [sym_named_expression] = STATE(1009),
-    [sym_return_statement] = STATE(1351),
-    [sym_delete_statement] = STATE(1351),
-    [sym_raise_statement] = STATE(1351),
-    [sym_pass_statement] = STATE(1351),
-    [sym_break_statement] = STATE(1351),
-    [sym_continue_statement] = STATE(1351),
-    [sym_list_splat] = STATE(1360),
-    [sym_dictionary_splat] = STATE(1360),
-    [sym_global_statement] = STATE(1351),
-    [sym_nonlocal_statement] = STATE(1351),
-    [sym_exec_statement] = STATE(1351),
-    [sym_type_alias_statement] = STATE(1351),
-    [sym_expression_list] = STATE(1361),
-    [sym_pattern] = STATE(889),
-    [sym_tuple_pattern] = STATE(875),
-    [sym_list_pattern] = STATE(875),
-    [sym_list_splat_pattern] = STATE(875),
-    [sym_expression] = STATE(1019),
-    [sym_primary_expression] = STATE(684),
-    [sym_not_operator] = STATE(1009),
-    [sym_boolean_operator] = STATE(1009),
-    [sym_binary_operator] = STATE(797),
-    [sym_unary_operator] = STATE(797),
-    [sym_comparison_operator] = STATE(1009),
-    [sym_lambda] = STATE(1009),
-    [sym_assignment] = STATE(1361),
-    [sym_augmented_assignment] = STATE(1361),
-    [sym_pattern_list] = STATE(897),
-    [sym_yield] = STATE(1361),
-    [sym_attribute] = STATE(431),
-    [sym_subscript] = STATE(431),
-    [sym_call] = STATE(797),
-    [sym_list] = STATE(797),
-    [sym_set] = STATE(797),
-    [sym_tuple] = STATE(797),
-    [sym_dictionary] = STATE(797),
-    [sym_list_comprehension] = STATE(797),
-    [sym_dictionary_comprehension] = STATE(797),
-    [sym_set_comprehension] = STATE(797),
-    [sym_generator_expression] = STATE(797),
-    [sym_parenthesized_expression] = STATE(797),
-    [sym_conditional_expression] = STATE(1009),
-    [sym_concatenated_string] = STATE(797),
-    [sym_string] = STATE(713),
-    [sym_await] = STATE(1009),
-    [sym_identifier] = ACTIONS(7),
-    [anon_sym_import] = ACTIONS(9),
-    [anon_sym_from] = ACTIONS(11),
-    [anon_sym_LPAREN] = ACTIONS(13),
-    [anon_sym_STAR] = ACTIONS(15),
-    [anon_sym_print] = ACTIONS(17),
-    [anon_sym_assert] = ACTIONS(19),
-    [anon_sym_return] = ACTIONS(21),
-    [anon_sym_del] = ACTIONS(23),
-    [anon_sym_raise] = ACTIONS(25),
-    [anon_sym_pass] = ACTIONS(27),
-    [anon_sym_break] = ACTIONS(29),
-    [anon_sym_continue] = ACTIONS(31),
-    [anon_sym_async] = ACTIONS(317),
-    [anon_sym_match] = ACTIONS(317),
-    [anon_sym_DASH] = ACTIONS(47),
-    [anon_sym_PLUS] = ACTIONS(47),
-    [anon_sym_LBRACK] = ACTIONS(49),
-    [anon_sym_LBRACE] = ACTIONS(51),
-    [anon_sym_STAR_STAR] = ACTIONS(53),
-    [anon_sym_global] = ACTIONS(57),
-    [anon_sym_nonlocal] = ACTIONS(59),
-    [anon_sym_exec] = ACTIONS(61),
-    [anon_sym_type] = ACTIONS(63),
-    [anon_sym_not] = ACTIONS(69),
-    [anon_sym_TILDE] = ACTIONS(47),
-    [anon_sym_lambda] = ACTIONS(71),
-    [anon_sym_yield] = ACTIONS(73),
-    [sym_ellipsis] = ACTIONS(75),
-    [sym_integer] = ACTIONS(77),
-    [sym_float] = ACTIONS(75),
-    [anon_sym_await] = ACTIONS(79),
-    [sym_true] = ACTIONS(77),
-    [sym_false] = ACTIONS(77),
-    [sym_none] = ACTIONS(77),
+    [sym_primary_expression] = STATE(637),
+    [sym_binary_operator] = STATE(605),
+    [sym_unary_operator] = STATE(605),
+    [sym_attribute] = STATE(605),
+    [sym_subscript] = STATE(605),
+    [sym_call] = STATE(605),
+    [sym_list] = STATE(605),
+    [sym_set] = STATE(605),
+    [sym_tuple] = STATE(605),
+    [sym_dictionary] = STATE(605),
+    [sym_list_comprehension] = STATE(605),
+    [sym_dictionary_comprehension] = STATE(605),
+    [sym_set_comprehension] = STATE(605),
+    [sym_generator_expression] = STATE(605),
+    [sym_parenthesized_expression] = STATE(605),
+    [sym_concatenated_string] = STATE(605),
+    [sym_string] = STATE(586),
+    [sym_await] = STATE(605),
+    [sym_identifier] = ACTIONS(295),
+    [anon_sym_DOT] = ACTIONS(260),
+    [anon_sym_LPAREN] = ACTIONS(262),
+    [anon_sym_RPAREN] = ACTIONS(287),
+    [anon_sym_COMMA] = ACTIONS(287),
+    [anon_sym_STAR] = ACTIONS(260),
+    [anon_sym_print] = ACTIONS(558),
+    [anon_sym_GT_GT] = ACTIONS(287),
+    [anon_sym_COLON_EQ] = ACTIONS(560),
+    [anon_sym_if] = ACTIONS(260),
+    [anon_sym_COLON] = ACTIONS(260),
+    [anon_sym_else] = ACTIONS(260),
+    [anon_sym_async] = ACTIONS(558),
+    [anon_sym_in] = ACTIONS(260),
+    [anon_sym_match] = ACTIONS(558),
+    [anon_sym_PIPE] = ACTIONS(287),
+    [anon_sym_DASH] = ACTIONS(285),
+    [anon_sym_PLUS] = ACTIONS(285),
+    [anon_sym_LBRACK] = ACTIONS(277),
+    [anon_sym_RBRACK] = ACTIONS(287),
+    [anon_sym_LBRACE] = ACTIONS(279),
+    [anon_sym_RBRACE] = ACTIONS(287),
+    [anon_sym_STAR_STAR] = ACTIONS(287),
+    [anon_sym_EQ] = ACTIONS(260),
+    [anon_sym_exec] = ACTIONS(558),
+    [anon_sym_type] = ACTIONS(558),
+    [anon_sym_AT] = ACTIONS(287),
+    [anon_sym_not] = ACTIONS(260),
+    [anon_sym_and] = ACTIONS(260),
+    [anon_sym_or] = ACTIONS(260),
+    [anon_sym_SLASH] = ACTIONS(260),
+    [anon_sym_PERCENT] = ACTIONS(287),
+    [anon_sym_SLASH_SLASH] = ACTIONS(287),
+    [anon_sym_AMP] = ACTIONS(287),
+    [anon_sym_CARET] = ACTIONS(287),
+    [anon_sym_LT_LT] = ACTIONS(287),
+    [anon_sym_TILDE] = ACTIONS(285),
+    [anon_sym_LT] = ACTIONS(260),
+    [anon_sym_LT_EQ] = ACTIONS(287),
+    [anon_sym_EQ_EQ] = ACTIONS(287),
+    [anon_sym_BANG_EQ] = ACTIONS(287),
+    [anon_sym_GT_EQ] = ACTIONS(287),
+    [anon_sym_GT] = ACTIONS(260),
+    [anon_sym_LT_GT] = ACTIONS(287),
+    [anon_sym_is] = ACTIONS(260),
+    [sym_ellipsis] = ACTIONS(293),
+    [sym_type_conversion] = ACTIONS(287),
+    [sym_integer] = ACTIONS(295),
+    [sym_float] = ACTIONS(293),
+    [anon_sym_await] = ACTIONS(566),
+    [sym_true] = ACTIONS(295),
+    [sym_false] = ACTIONS(295),
+    [sym_none] = ACTIONS(295),
     [sym_comment] = ACTIONS(3),
-    [sym__newline] = ACTIONS(580),
-    [sym__string_start] = ACTIONS(81),
+    [sym__string_start] = ACTIONS(299),
   },
   [137] = {
-    [sym_import_statement] = STATE(1351),
-    [sym_future_import_statement] = STATE(1351),
-    [sym_import_from_statement] = STATE(1351),
-    [sym_print_statement] = STATE(1351),
-    [sym_assert_statement] = STATE(1351),
-    [sym_expression_statement] = STATE(1351),
-    [sym_named_expression] = STATE(1009),
-    [sym_return_statement] = STATE(1351),
-    [sym_delete_statement] = STATE(1351),
-    [sym_raise_statement] = STATE(1351),
-    [sym_pass_statement] = STATE(1351),
-    [sym_break_statement] = STATE(1351),
-    [sym_continue_statement] = STATE(1351),
-    [sym_list_splat] = STATE(1360),
-    [sym_dictionary_splat] = STATE(1360),
-    [sym_global_statement] = STATE(1351),
-    [sym_nonlocal_statement] = STATE(1351),
-    [sym_exec_statement] = STATE(1351),
-    [sym_type_alias_statement] = STATE(1351),
-    [sym_expression_list] = STATE(1361),
-    [sym_pattern] = STATE(889),
-    [sym_tuple_pattern] = STATE(875),
-    [sym_list_pattern] = STATE(875),
-    [sym_list_splat_pattern] = STATE(875),
-    [sym_expression] = STATE(1019),
-    [sym_primary_expression] = STATE(684),
-    [sym_not_operator] = STATE(1009),
-    [sym_boolean_operator] = STATE(1009),
-    [sym_binary_operator] = STATE(797),
-    [sym_unary_operator] = STATE(797),
-    [sym_comparison_operator] = STATE(1009),
-    [sym_lambda] = STATE(1009),
-    [sym_assignment] = STATE(1361),
-    [sym_augmented_assignment] = STATE(1361),
-    [sym_pattern_list] = STATE(897),
-    [sym_yield] = STATE(1361),
-    [sym_attribute] = STATE(431),
-    [sym_subscript] = STATE(431),
-    [sym_call] = STATE(797),
-    [sym_list] = STATE(797),
-    [sym_set] = STATE(797),
-    [sym_tuple] = STATE(797),
-    [sym_dictionary] = STATE(797),
-    [sym_list_comprehension] = STATE(797),
-    [sym_dictionary_comprehension] = STATE(797),
-    [sym_set_comprehension] = STATE(797),
-    [sym_generator_expression] = STATE(797),
-    [sym_parenthesized_expression] = STATE(797),
-    [sym_conditional_expression] = STATE(1009),
-    [sym_concatenated_string] = STATE(797),
-    [sym_string] = STATE(713),
-    [sym_await] = STATE(1009),
-    [sym_identifier] = ACTIONS(7),
-    [anon_sym_import] = ACTIONS(9),
-    [anon_sym_from] = ACTIONS(11),
-    [anon_sym_LPAREN] = ACTIONS(13),
-    [anon_sym_STAR] = ACTIONS(15),
-    [anon_sym_print] = ACTIONS(17),
-    [anon_sym_assert] = ACTIONS(19),
-    [anon_sym_return] = ACTIONS(21),
-    [anon_sym_del] = ACTIONS(23),
-    [anon_sym_raise] = ACTIONS(25),
-    [anon_sym_pass] = ACTIONS(27),
-    [anon_sym_break] = ACTIONS(29),
-    [anon_sym_continue] = ACTIONS(31),
-    [anon_sym_async] = ACTIONS(317),
-    [anon_sym_match] = ACTIONS(317),
-    [anon_sym_DASH] = ACTIONS(47),
-    [anon_sym_PLUS] = ACTIONS(47),
-    [anon_sym_LBRACK] = ACTIONS(49),
-    [anon_sym_LBRACE] = ACTIONS(51),
-    [anon_sym_STAR_STAR] = ACTIONS(53),
-    [anon_sym_global] = ACTIONS(57),
-    [anon_sym_nonlocal] = ACTIONS(59),
-    [anon_sym_exec] = ACTIONS(61),
-    [anon_sym_type] = ACTIONS(63),
-    [anon_sym_not] = ACTIONS(69),
-    [anon_sym_TILDE] = ACTIONS(47),
-    [anon_sym_lambda] = ACTIONS(71),
-    [anon_sym_yield] = ACTIONS(73),
-    [sym_ellipsis] = ACTIONS(75),
-    [sym_integer] = ACTIONS(77),
-    [sym_float] = ACTIONS(75),
-    [anon_sym_await] = ACTIONS(79),
-    [sym_true] = ACTIONS(77),
-    [sym_false] = ACTIONS(77),
-    [sym_none] = ACTIONS(77),
+    [sym_primary_expression] = STATE(640),
+    [sym_binary_operator] = STATE(605),
+    [sym_unary_operator] = STATE(605),
+    [sym_attribute] = STATE(605),
+    [sym_subscript] = STATE(605),
+    [sym_call] = STATE(605),
+    [sym_list] = STATE(605),
+    [sym_set] = STATE(605),
+    [sym_tuple] = STATE(605),
+    [sym_dictionary] = STATE(605),
+    [sym_list_comprehension] = STATE(605),
+    [sym_dictionary_comprehension] = STATE(605),
+    [sym_set_comprehension] = STATE(605),
+    [sym_generator_expression] = STATE(605),
+    [sym_parenthesized_expression] = STATE(605),
+    [sym_concatenated_string] = STATE(605),
+    [sym_string] = STATE(586),
+    [sym_await] = STATE(605),
+    [sym_identifier] = ACTIONS(295),
+    [anon_sym_DOT] = ACTIONS(260),
+    [anon_sym_LPAREN] = ACTIONS(578),
+    [anon_sym_RPAREN] = ACTIONS(287),
+    [anon_sym_COMMA] = ACTIONS(287),
+    [anon_sym_as] = ACTIONS(260),
+    [anon_sym_STAR] = ACTIONS(260),
+    [anon_sym_print] = ACTIONS(558),
+    [anon_sym_GT_GT] = ACTIONS(287),
+    [anon_sym_COLON_EQ] = ACTIONS(580),
+    [anon_sym_if] = ACTIONS(260),
+    [anon_sym_COLON] = ACTIONS(260),
+    [anon_sym_async] = ACTIONS(558),
+    [anon_sym_for] = ACTIONS(260),
+    [anon_sym_in] = ACTIONS(260),
+    [anon_sym_match] = ACTIONS(558),
+    [anon_sym_PIPE] = ACTIONS(287),
+    [anon_sym_DASH] = ACTIONS(582),
+    [anon_sym_PLUS] = ACTIONS(582),
+    [anon_sym_LBRACK] = ACTIONS(584),
+    [anon_sym_RBRACK] = ACTIONS(287),
+    [anon_sym_LBRACE] = ACTIONS(279),
+    [anon_sym_RBRACE] = ACTIONS(287),
+    [anon_sym_STAR_STAR] = ACTIONS(287),
+    [anon_sym_exec] = ACTIONS(558),
+    [anon_sym_type] = ACTIONS(558),
+    [anon_sym_AT] = ACTIONS(287),
+    [anon_sym_not] = ACTIONS(260),
+    [anon_sym_and] = ACTIONS(260),
+    [anon_sym_or] = ACTIONS(260),
+    [anon_sym_SLASH] = ACTIONS(260),
+    [anon_sym_PERCENT] = ACTIONS(287),
+    [anon_sym_SLASH_SLASH] = ACTIONS(287),
+    [anon_sym_AMP] = ACTIONS(287),
+    [anon_sym_CARET] = ACTIONS(287),
+    [anon_sym_LT_LT] = ACTIONS(287),
+    [anon_sym_TILDE] = ACTIONS(582),
+    [anon_sym_LT] = ACTIONS(260),
+    [anon_sym_LT_EQ] = ACTIONS(287),
+    [anon_sym_EQ_EQ] = ACTIONS(287),
+    [anon_sym_BANG_EQ] = ACTIONS(287),
+    [anon_sym_GT_EQ] = ACTIONS(287),
+    [anon_sym_GT] = ACTIONS(260),
+    [anon_sym_LT_GT] = ACTIONS(287),
+    [anon_sym_is] = ACTIONS(260),
+    [sym_ellipsis] = ACTIONS(293),
+    [sym_integer] = ACTIONS(295),
+    [sym_float] = ACTIONS(293),
+    [anon_sym_await] = ACTIONS(586),
+    [sym_true] = ACTIONS(295),
+    [sym_false] = ACTIONS(295),
+    [sym_none] = ACTIONS(295),
     [sym_comment] = ACTIONS(3),
-    [sym__newline] = ACTIONS(582),
-    [sym__string_start] = ACTIONS(81),
+    [sym__string_start] = ACTIONS(299),
   },
   [138] = {
-    [sym_import_statement] = STATE(1351),
-    [sym_future_import_statement] = STATE(1351),
-    [sym_import_from_statement] = STATE(1351),
-    [sym_print_statement] = STATE(1351),
-    [sym_assert_statement] = STATE(1351),
-    [sym_expression_statement] = STATE(1351),
-    [sym_named_expression] = STATE(1009),
-    [sym_return_statement] = STATE(1351),
-    [sym_delete_statement] = STATE(1351),
-    [sym_raise_statement] = STATE(1351),
-    [sym_pass_statement] = STATE(1351),
-    [sym_break_statement] = STATE(1351),
-    [sym_continue_statement] = STATE(1351),
-    [sym_list_splat] = STATE(1360),
-    [sym_dictionary_splat] = STATE(1360),
-    [sym_global_statement] = STATE(1351),
-    [sym_nonlocal_statement] = STATE(1351),
-    [sym_exec_statement] = STATE(1351),
-    [sym_type_alias_statement] = STATE(1351),
-    [sym_expression_list] = STATE(1361),
-    [sym_pattern] = STATE(889),
-    [sym_tuple_pattern] = STATE(875),
-    [sym_list_pattern] = STATE(875),
-    [sym_list_splat_pattern] = STATE(875),
-    [sym_expression] = STATE(1019),
-    [sym_primary_expression] = STATE(684),
-    [sym_not_operator] = STATE(1009),
-    [sym_boolean_operator] = STATE(1009),
-    [sym_binary_operator] = STATE(797),
-    [sym_unary_operator] = STATE(797),
-    [sym_comparison_operator] = STATE(1009),
-    [sym_lambda] = STATE(1009),
-    [sym_assignment] = STATE(1361),
-    [sym_augmented_assignment] = STATE(1361),
-    [sym_pattern_list] = STATE(897),
-    [sym_yield] = STATE(1361),
-    [sym_attribute] = STATE(431),
-    [sym_subscript] = STATE(431),
-    [sym_call] = STATE(797),
-    [sym_list] = STATE(797),
-    [sym_set] = STATE(797),
-    [sym_tuple] = STATE(797),
-    [sym_dictionary] = STATE(797),
-    [sym_list_comprehension] = STATE(797),
-    [sym_dictionary_comprehension] = STATE(797),
-    [sym_set_comprehension] = STATE(797),
-    [sym_generator_expression] = STATE(797),
-    [sym_parenthesized_expression] = STATE(797),
-    [sym_conditional_expression] = STATE(1009),
-    [sym_concatenated_string] = STATE(797),
-    [sym_string] = STATE(713),
-    [sym_await] = STATE(1009),
-    [sym_identifier] = ACTIONS(7),
-    [anon_sym_import] = ACTIONS(9),
-    [anon_sym_from] = ACTIONS(11),
-    [anon_sym_LPAREN] = ACTIONS(13),
-    [anon_sym_STAR] = ACTIONS(15),
-    [anon_sym_print] = ACTIONS(17),
-    [anon_sym_assert] = ACTIONS(19),
-    [anon_sym_return] = ACTIONS(21),
-    [anon_sym_del] = ACTIONS(23),
-    [anon_sym_raise] = ACTIONS(25),
-    [anon_sym_pass] = ACTIONS(27),
-    [anon_sym_break] = ACTIONS(29),
-    [anon_sym_continue] = ACTIONS(31),
-    [anon_sym_async] = ACTIONS(317),
-    [anon_sym_match] = ACTIONS(317),
-    [anon_sym_DASH] = ACTIONS(47),
-    [anon_sym_PLUS] = ACTIONS(47),
-    [anon_sym_LBRACK] = ACTIONS(49),
-    [anon_sym_LBRACE] = ACTIONS(51),
-    [anon_sym_STAR_STAR] = ACTIONS(53),
-    [anon_sym_global] = ACTIONS(57),
-    [anon_sym_nonlocal] = ACTIONS(59),
-    [anon_sym_exec] = ACTIONS(61),
-    [anon_sym_type] = ACTIONS(63),
-    [anon_sym_not] = ACTIONS(69),
-    [anon_sym_TILDE] = ACTIONS(47),
-    [anon_sym_lambda] = ACTIONS(71),
-    [anon_sym_yield] = ACTIONS(73),
-    [sym_ellipsis] = ACTIONS(75),
-    [sym_integer] = ACTIONS(77),
-    [sym_float] = ACTIONS(75),
-    [anon_sym_await] = ACTIONS(79),
-    [sym_true] = ACTIONS(77),
-    [sym_false] = ACTIONS(77),
-    [sym_none] = ACTIONS(77),
+    [sym_primary_expression] = STATE(637),
+    [sym_binary_operator] = STATE(605),
+    [sym_unary_operator] = STATE(605),
+    [sym_attribute] = STATE(605),
+    [sym_subscript] = STATE(605),
+    [sym_call] = STATE(605),
+    [sym_list] = STATE(605),
+    [sym_set] = STATE(605),
+    [sym_tuple] = STATE(605),
+    [sym_dictionary] = STATE(605),
+    [sym_list_comprehension] = STATE(605),
+    [sym_dictionary_comprehension] = STATE(605),
+    [sym_set_comprehension] = STATE(605),
+    [sym_generator_expression] = STATE(605),
+    [sym_parenthesized_expression] = STATE(605),
+    [sym_concatenated_string] = STATE(605),
+    [sym_string] = STATE(586),
+    [sym_await] = STATE(605),
+    [sym_identifier] = ACTIONS(295),
+    [anon_sym_DOT] = ACTIONS(260),
+    [anon_sym_LPAREN] = ACTIONS(262),
+    [anon_sym_RPAREN] = ACTIONS(287),
+    [anon_sym_COMMA] = ACTIONS(287),
+    [anon_sym_STAR] = ACTIONS(260),
+    [anon_sym_print] = ACTIONS(558),
+    [anon_sym_GT_GT] = ACTIONS(287),
+    [anon_sym_if] = ACTIONS(260),
+    [anon_sym_COLON] = ACTIONS(287),
+    [anon_sym_else] = ACTIONS(260),
+    [anon_sym_async] = ACTIONS(558),
+    [anon_sym_in] = ACTIONS(260),
+    [anon_sym_match] = ACTIONS(558),
+    [anon_sym_PIPE] = ACTIONS(287),
+    [anon_sym_DASH] = ACTIONS(285),
+    [anon_sym_PLUS] = ACTIONS(285),
+    [anon_sym_LBRACK] = ACTIONS(277),
+    [anon_sym_RBRACK] = ACTIONS(287),
+    [anon_sym_LBRACE] = ACTIONS(279),
+    [anon_sym_RBRACE] = ACTIONS(287),
+    [anon_sym_STAR_STAR] = ACTIONS(287),
+    [anon_sym_EQ] = ACTIONS(260),
+    [anon_sym_exec] = ACTIONS(558),
+    [anon_sym_type] = ACTIONS(558),
+    [anon_sym_AT] = ACTIONS(287),
+    [anon_sym_not] = ACTIONS(260),
+    [anon_sym_and] = ACTIONS(260),
+    [anon_sym_or] = ACTIONS(260),
+    [anon_sym_SLASH] = ACTIONS(260),
+    [anon_sym_PERCENT] = ACTIONS(287),
+    [anon_sym_SLASH_SLASH] = ACTIONS(287),
+    [anon_sym_AMP] = ACTIONS(287),
+    [anon_sym_CARET] = ACTIONS(287),
+    [anon_sym_LT_LT] = ACTIONS(287),
+    [anon_sym_TILDE] = ACTIONS(285),
+    [anon_sym_LT] = ACTIONS(260),
+    [anon_sym_LT_EQ] = ACTIONS(287),
+    [anon_sym_EQ_EQ] = ACTIONS(287),
+    [anon_sym_BANG_EQ] = ACTIONS(287),
+    [anon_sym_GT_EQ] = ACTIONS(287),
+    [anon_sym_GT] = ACTIONS(260),
+    [anon_sym_LT_GT] = ACTIONS(287),
+    [anon_sym_is] = ACTIONS(260),
+    [sym_ellipsis] = ACTIONS(293),
+    [sym_type_conversion] = ACTIONS(287),
+    [sym_integer] = ACTIONS(295),
+    [sym_float] = ACTIONS(293),
+    [anon_sym_await] = ACTIONS(566),
+    [sym_true] = ACTIONS(295),
+    [sym_false] = ACTIONS(295),
+    [sym_none] = ACTIONS(295),
     [sym_comment] = ACTIONS(3),
-    [sym__newline] = ACTIONS(584),
-    [sym__string_start] = ACTIONS(81),
+    [sym__string_start] = ACTIONS(299),
   },
   [139] = {
-    [sym_import_statement] = STATE(1351),
-    [sym_future_import_statement] = STATE(1351),
-    [sym_import_from_statement] = STATE(1351),
-    [sym_print_statement] = STATE(1351),
-    [sym_assert_statement] = STATE(1351),
-    [sym_expression_statement] = STATE(1351),
-    [sym_named_expression] = STATE(1009),
-    [sym_return_statement] = STATE(1351),
-    [sym_delete_statement] = STATE(1351),
-    [sym_raise_statement] = STATE(1351),
-    [sym_pass_statement] = STATE(1351),
-    [sym_break_statement] = STATE(1351),
-    [sym_continue_statement] = STATE(1351),
-    [sym_list_splat] = STATE(1360),
-    [sym_dictionary_splat] = STATE(1360),
-    [sym_global_statement] = STATE(1351),
-    [sym_nonlocal_statement] = STATE(1351),
-    [sym_exec_statement] = STATE(1351),
-    [sym_type_alias_statement] = STATE(1351),
-    [sym_expression_list] = STATE(1361),
-    [sym_pattern] = STATE(889),
-    [sym_tuple_pattern] = STATE(875),
-    [sym_list_pattern] = STATE(875),
-    [sym_list_splat_pattern] = STATE(875),
-    [sym_expression] = STATE(1019),
-    [sym_primary_expression] = STATE(684),
-    [sym_not_operator] = STATE(1009),
-    [sym_boolean_operator] = STATE(1009),
-    [sym_binary_operator] = STATE(797),
-    [sym_unary_operator] = STATE(797),
-    [sym_comparison_operator] = STATE(1009),
-    [sym_lambda] = STATE(1009),
-    [sym_assignment] = STATE(1361),
-    [sym_augmented_assignment] = STATE(1361),
-    [sym_pattern_list] = STATE(897),
-    [sym_yield] = STATE(1361),
-    [sym_attribute] = STATE(431),
-    [sym_subscript] = STATE(431),
-    [sym_call] = STATE(797),
-    [sym_list] = STATE(797),
-    [sym_set] = STATE(797),
-    [sym_tuple] = STATE(797),
-    [sym_dictionary] = STATE(797),
-    [sym_list_comprehension] = STATE(797),
-    [sym_dictionary_comprehension] = STATE(797),
-    [sym_set_comprehension] = STATE(797),
-    [sym_generator_expression] = STATE(797),
-    [sym_parenthesized_expression] = STATE(797),
-    [sym_conditional_expression] = STATE(1009),
-    [sym_concatenated_string] = STATE(797),
-    [sym_string] = STATE(713),
-    [sym_await] = STATE(1009),
-    [sym_identifier] = ACTIONS(7),
-    [anon_sym_import] = ACTIONS(9),
-    [anon_sym_from] = ACTIONS(11),
-    [anon_sym_LPAREN] = ACTIONS(13),
-    [anon_sym_STAR] = ACTIONS(15),
-    [anon_sym_print] = ACTIONS(17),
-    [anon_sym_assert] = ACTIONS(19),
-    [anon_sym_return] = ACTIONS(21),
-    [anon_sym_del] = ACTIONS(23),
-    [anon_sym_raise] = ACTIONS(25),
-    [anon_sym_pass] = ACTIONS(27),
-    [anon_sym_break] = ACTIONS(29),
-    [anon_sym_continue] = ACTIONS(31),
-    [anon_sym_async] = ACTIONS(317),
-    [anon_sym_match] = ACTIONS(317),
-    [anon_sym_DASH] = ACTIONS(47),
-    [anon_sym_PLUS] = ACTIONS(47),
-    [anon_sym_LBRACK] = ACTIONS(49),
-    [anon_sym_LBRACE] = ACTIONS(51),
-    [anon_sym_STAR_STAR] = ACTIONS(53),
-    [anon_sym_global] = ACTIONS(57),
-    [anon_sym_nonlocal] = ACTIONS(59),
-    [anon_sym_exec] = ACTIONS(61),
-    [anon_sym_type] = ACTIONS(63),
-    [anon_sym_not] = ACTIONS(69),
-    [anon_sym_TILDE] = ACTIONS(47),
-    [anon_sym_lambda] = ACTIONS(71),
-    [anon_sym_yield] = ACTIONS(73),
-    [sym_ellipsis] = ACTIONS(75),
-    [sym_integer] = ACTIONS(77),
-    [sym_float] = ACTIONS(75),
-    [anon_sym_await] = ACTIONS(79),
-    [sym_true] = ACTIONS(77),
-    [sym_false] = ACTIONS(77),
-    [sym_none] = ACTIONS(77),
+    [sym_primary_expression] = STATE(640),
+    [sym_binary_operator] = STATE(605),
+    [sym_unary_operator] = STATE(605),
+    [sym_attribute] = STATE(605),
+    [sym_subscript] = STATE(605),
+    [sym_call] = STATE(605),
+    [sym_list] = STATE(605),
+    [sym_set] = STATE(605),
+    [sym_tuple] = STATE(605),
+    [sym_dictionary] = STATE(605),
+    [sym_list_comprehension] = STATE(605),
+    [sym_dictionary_comprehension] = STATE(605),
+    [sym_set_comprehension] = STATE(605),
+    [sym_generator_expression] = STATE(605),
+    [sym_parenthesized_expression] = STATE(605),
+    [sym_concatenated_string] = STATE(605),
+    [sym_string] = STATE(586),
+    [sym_await] = STATE(605),
+    [sym_identifier] = ACTIONS(295),
+    [anon_sym_DOT] = ACTIONS(260),
+    [anon_sym_LPAREN] = ACTIONS(578),
+    [anon_sym_RPAREN] = ACTIONS(287),
+    [anon_sym_COMMA] = ACTIONS(287),
+    [anon_sym_as] = ACTIONS(260),
+    [anon_sym_STAR] = ACTIONS(260),
+    [anon_sym_print] = ACTIONS(558),
+    [anon_sym_GT_GT] = ACTIONS(287),
+    [anon_sym_if] = ACTIONS(260),
+    [anon_sym_COLON] = ACTIONS(287),
+    [anon_sym_async] = ACTIONS(558),
+    [anon_sym_for] = ACTIONS(260),
+    [anon_sym_in] = ACTIONS(260),
+    [anon_sym_match] = ACTIONS(558),
+    [anon_sym_PIPE] = ACTIONS(287),
+    [anon_sym_DASH] = ACTIONS(582),
+    [anon_sym_PLUS] = ACTIONS(582),
+    [anon_sym_LBRACK] = ACTIONS(584),
+    [anon_sym_RBRACK] = ACTIONS(287),
+    [anon_sym_LBRACE] = ACTIONS(279),
+    [anon_sym_RBRACE] = ACTIONS(287),
+    [anon_sym_STAR_STAR] = ACTIONS(287),
+    [anon_sym_exec] = ACTIONS(558),
+    [anon_sym_type] = ACTIONS(558),
+    [anon_sym_AT] = ACTIONS(287),
+    [anon_sym_not] = ACTIONS(260),
+    [anon_sym_and] = ACTIONS(260),
+    [anon_sym_or] = ACTIONS(260),
+    [anon_sym_SLASH] = ACTIONS(260),
+    [anon_sym_PERCENT] = ACTIONS(287),
+    [anon_sym_SLASH_SLASH] = ACTIONS(287),
+    [anon_sym_AMP] = ACTIONS(287),
+    [anon_sym_CARET] = ACTIONS(287),
+    [anon_sym_LT_LT] = ACTIONS(287),
+    [anon_sym_TILDE] = ACTIONS(582),
+    [anon_sym_LT] = ACTIONS(260),
+    [anon_sym_LT_EQ] = ACTIONS(287),
+    [anon_sym_EQ_EQ] = ACTIONS(287),
+    [anon_sym_BANG_EQ] = ACTIONS(287),
+    [anon_sym_GT_EQ] = ACTIONS(287),
+    [anon_sym_GT] = ACTIONS(260),
+    [anon_sym_LT_GT] = ACTIONS(287),
+    [anon_sym_is] = ACTIONS(260),
+    [sym_ellipsis] = ACTIONS(293),
+    [sym_integer] = ACTIONS(295),
+    [sym_float] = ACTIONS(293),
+    [anon_sym_await] = ACTIONS(586),
+    [sym_true] = ACTIONS(295),
+    [sym_false] = ACTIONS(295),
+    [sym_none] = ACTIONS(295),
     [sym_comment] = ACTIONS(3),
-    [sym__newline] = ACTIONS(586),
-    [sym__string_start] = ACTIONS(81),
+    [sym__string_start] = ACTIONS(299),
   },
   [140] = {
-    [sym_import_statement] = STATE(1351),
-    [sym_future_import_statement] = STATE(1351),
-    [sym_import_from_statement] = STATE(1351),
-    [sym_print_statement] = STATE(1351),
-    [sym_assert_statement] = STATE(1351),
-    [sym_expression_statement] = STATE(1351),
-    [sym_named_expression] = STATE(1009),
-    [sym_return_statement] = STATE(1351),
-    [sym_delete_statement] = STATE(1351),
-    [sym_raise_statement] = STATE(1351),
-    [sym_pass_statement] = STATE(1351),
-    [sym_break_statement] = STATE(1351),
-    [sym_continue_statement] = STATE(1351),
-    [sym_list_splat] = STATE(1360),
-    [sym_dictionary_splat] = STATE(1360),
-    [sym_global_statement] = STATE(1351),
-    [sym_nonlocal_statement] = STATE(1351),
-    [sym_exec_statement] = STATE(1351),
-    [sym_type_alias_statement] = STATE(1351),
-    [sym_expression_list] = STATE(1361),
-    [sym_pattern] = STATE(889),
-    [sym_tuple_pattern] = STATE(875),
-    [sym_list_pattern] = STATE(875),
-    [sym_list_splat_pattern] = STATE(875),
-    [sym_expression] = STATE(1019),
-    [sym_primary_expression] = STATE(684),
-    [sym_not_operator] = STATE(1009),
-    [sym_boolean_operator] = STATE(1009),
-    [sym_binary_operator] = STATE(797),
-    [sym_unary_operator] = STATE(797),
-    [sym_comparison_operator] = STATE(1009),
-    [sym_lambda] = STATE(1009),
-    [sym_assignment] = STATE(1361),
-    [sym_augmented_assignment] = STATE(1361),
-    [sym_pattern_list] = STATE(897),
-    [sym_yield] = STATE(1361),
-    [sym_attribute] = STATE(431),
-    [sym_subscript] = STATE(431),
-    [sym_call] = STATE(797),
-    [sym_list] = STATE(797),
-    [sym_set] = STATE(797),
-    [sym_tuple] = STATE(797),
-    [sym_dictionary] = STATE(797),
-    [sym_list_comprehension] = STATE(797),
-    [sym_dictionary_comprehension] = STATE(797),
-    [sym_set_comprehension] = STATE(797),
-    [sym_generator_expression] = STATE(797),
-    [sym_parenthesized_expression] = STATE(797),
-    [sym_conditional_expression] = STATE(1009),
-    [sym_concatenated_string] = STATE(797),
-    [sym_string] = STATE(713),
-    [sym_await] = STATE(1009),
-    [sym_identifier] = ACTIONS(7),
-    [anon_sym_import] = ACTIONS(9),
-    [anon_sym_from] = ACTIONS(11),
-    [anon_sym_LPAREN] = ACTIONS(13),
-    [anon_sym_STAR] = ACTIONS(15),
-    [anon_sym_print] = ACTIONS(17),
-    [anon_sym_assert] = ACTIONS(19),
-    [anon_sym_return] = ACTIONS(21),
-    [anon_sym_del] = ACTIONS(23),
-    [anon_sym_raise] = ACTIONS(25),
-    [anon_sym_pass] = ACTIONS(27),
-    [anon_sym_break] = ACTIONS(29),
-    [anon_sym_continue] = ACTIONS(31),
-    [anon_sym_async] = ACTIONS(317),
-    [anon_sym_match] = ACTIONS(317),
-    [anon_sym_DASH] = ACTIONS(47),
-    [anon_sym_PLUS] = ACTIONS(47),
-    [anon_sym_LBRACK] = ACTIONS(49),
-    [anon_sym_LBRACE] = ACTIONS(51),
-    [anon_sym_STAR_STAR] = ACTIONS(53),
-    [anon_sym_global] = ACTIONS(57),
-    [anon_sym_nonlocal] = ACTIONS(59),
-    [anon_sym_exec] = ACTIONS(61),
-    [anon_sym_type] = ACTIONS(63),
-    [anon_sym_not] = ACTIONS(69),
-    [anon_sym_TILDE] = ACTIONS(47),
-    [anon_sym_lambda] = ACTIONS(71),
-    [anon_sym_yield] = ACTIONS(73),
-    [sym_ellipsis] = ACTIONS(75),
-    [sym_integer] = ACTIONS(77),
-    [sym_float] = ACTIONS(75),
-    [anon_sym_await] = ACTIONS(79),
-    [sym_true] = ACTIONS(77),
-    [sym_false] = ACTIONS(77),
-    [sym_none] = ACTIONS(77),
+    [sym_primary_expression] = STATE(637),
+    [sym_binary_operator] = STATE(605),
+    [sym_unary_operator] = STATE(605),
+    [sym_attribute] = STATE(605),
+    [sym_subscript] = STATE(605),
+    [sym_call] = STATE(605),
+    [sym_list] = STATE(605),
+    [sym_set] = STATE(605),
+    [sym_tuple] = STATE(605),
+    [sym_dictionary] = STATE(605),
+    [sym_list_comprehension] = STATE(605),
+    [sym_dictionary_comprehension] = STATE(605),
+    [sym_set_comprehension] = STATE(605),
+    [sym_generator_expression] = STATE(605),
+    [sym_parenthesized_expression] = STATE(605),
+    [sym_concatenated_string] = STATE(605),
+    [sym_string] = STATE(586),
+    [sym_await] = STATE(605),
+    [sym_identifier] = ACTIONS(295),
+    [anon_sym_DOT] = ACTIONS(260),
+    [anon_sym_LPAREN] = ACTIONS(262),
+    [anon_sym_RPAREN] = ACTIONS(291),
+    [anon_sym_COMMA] = ACTIONS(291),
+    [anon_sym_STAR] = ACTIONS(260),
+    [anon_sym_print] = ACTIONS(558),
+    [anon_sym_GT_GT] = ACTIONS(260),
+    [anon_sym_COLON] = ACTIONS(291),
+    [anon_sym_async] = ACTIONS(558),
+    [anon_sym_in] = ACTIONS(273),
+    [anon_sym_match] = ACTIONS(558),
+    [anon_sym_PIPE] = ACTIONS(260),
+    [anon_sym_DASH] = ACTIONS(275),
+    [anon_sym_PLUS] = ACTIONS(275),
+    [anon_sym_LBRACK] = ACTIONS(277),
+    [anon_sym_RBRACK] = ACTIONS(291),
+    [anon_sym_LBRACE] = ACTIONS(279),
+    [anon_sym_STAR_STAR] = ACTIONS(260),
+    [anon_sym_EQ] = ACTIONS(291),
+    [anon_sym_exec] = ACTIONS(558),
+    [anon_sym_type] = ACTIONS(558),
+    [anon_sym_AT] = ACTIONS(260),
+    [anon_sym_SLASH] = ACTIONS(260),
+    [anon_sym_PERCENT] = ACTIONS(260),
+    [anon_sym_SLASH_SLASH] = ACTIONS(260),
+    [anon_sym_AMP] = ACTIONS(260),
+    [anon_sym_CARET] = ACTIONS(260),
+    [anon_sym_LT_LT] = ACTIONS(260),
+    [anon_sym_TILDE] = ACTIONS(285),
+    [anon_sym_PLUS_EQ] = ACTIONS(291),
+    [anon_sym_DASH_EQ] = ACTIONS(291),
+    [anon_sym_STAR_EQ] = ACTIONS(291),
+    [anon_sym_SLASH_EQ] = ACTIONS(291),
+    [anon_sym_AT_EQ] = ACTIONS(291),
+    [anon_sym_SLASH_SLASH_EQ] = ACTIONS(291),
+    [anon_sym_PERCENT_EQ] = ACTIONS(291),
+    [anon_sym_STAR_STAR_EQ] = ACTIONS(291),
+    [anon_sym_GT_GT_EQ] = ACTIONS(291),
+    [anon_sym_LT_LT_EQ] = ACTIONS(291),
+    [anon_sym_AMP_EQ] = ACTIONS(291),
+    [anon_sym_CARET_EQ] = ACTIONS(291),
+    [anon_sym_PIPE_EQ] = ACTIONS(291),
+    [sym_ellipsis] = ACTIONS(293),
+    [sym_integer] = ACTIONS(295),
+    [sym_float] = ACTIONS(293),
+    [anon_sym_await] = ACTIONS(566),
+    [sym_true] = ACTIONS(295),
+    [sym_false] = ACTIONS(295),
+    [sym_none] = ACTIONS(295),
     [sym_comment] = ACTIONS(3),
-    [sym__newline] = ACTIONS(588),
-    [sym__string_start] = ACTIONS(81),
+    [sym__string_start] = ACTIONS(299),
   },
   [141] = {
-    [sym_import_statement] = STATE(1351),
-    [sym_future_import_statement] = STATE(1351),
-    [sym_import_from_statement] = STATE(1351),
-    [sym_print_statement] = STATE(1351),
-    [sym_assert_statement] = STATE(1351),
-    [sym_expression_statement] = STATE(1351),
-    [sym_named_expression] = STATE(1009),
-    [sym_return_statement] = STATE(1351),
-    [sym_delete_statement] = STATE(1351),
-    [sym_raise_statement] = STATE(1351),
-    [sym_pass_statement] = STATE(1351),
-    [sym_break_statement] = STATE(1351),
-    [sym_continue_statement] = STATE(1351),
-    [sym_list_splat] = STATE(1360),
-    [sym_dictionary_splat] = STATE(1360),
-    [sym_global_statement] = STATE(1351),
-    [sym_nonlocal_statement] = STATE(1351),
-    [sym_exec_statement] = STATE(1351),
-    [sym_type_alias_statement] = STATE(1351),
-    [sym_expression_list] = STATE(1361),
-    [sym_pattern] = STATE(889),
-    [sym_tuple_pattern] = STATE(875),
-    [sym_list_pattern] = STATE(875),
-    [sym_list_splat_pattern] = STATE(875),
-    [sym_expression] = STATE(1019),
-    [sym_primary_expression] = STATE(684),
-    [sym_not_operator] = STATE(1009),
-    [sym_boolean_operator] = STATE(1009),
-    [sym_binary_operator] = STATE(797),
-    [sym_unary_operator] = STATE(797),
-    [sym_comparison_operator] = STATE(1009),
-    [sym_lambda] = STATE(1009),
-    [sym_assignment] = STATE(1361),
-    [sym_augmented_assignment] = STATE(1361),
-    [sym_pattern_list] = STATE(897),
-    [sym_yield] = STATE(1361),
-    [sym_attribute] = STATE(431),
-    [sym_subscript] = STATE(431),
-    [sym_call] = STATE(797),
-    [sym_list] = STATE(797),
-    [sym_set] = STATE(797),
-    [sym_tuple] = STATE(797),
-    [sym_dictionary] = STATE(797),
-    [sym_list_comprehension] = STATE(797),
-    [sym_dictionary_comprehension] = STATE(797),
-    [sym_set_comprehension] = STATE(797),
-    [sym_generator_expression] = STATE(797),
-    [sym_parenthesized_expression] = STATE(797),
-    [sym_conditional_expression] = STATE(1009),
-    [sym_concatenated_string] = STATE(797),
-    [sym_string] = STATE(713),
-    [sym_await] = STATE(1009),
-    [sym_identifier] = ACTIONS(7),
-    [anon_sym_import] = ACTIONS(9),
-    [anon_sym_from] = ACTIONS(11),
-    [anon_sym_LPAREN] = ACTIONS(13),
-    [anon_sym_STAR] = ACTIONS(15),
-    [anon_sym_print] = ACTIONS(17),
-    [anon_sym_assert] = ACTIONS(19),
-    [anon_sym_return] = ACTIONS(21),
-    [anon_sym_del] = ACTIONS(23),
-    [anon_sym_raise] = ACTIONS(25),
-    [anon_sym_pass] = ACTIONS(27),
-    [anon_sym_break] = ACTIONS(29),
-    [anon_sym_continue] = ACTIONS(31),
-    [anon_sym_async] = ACTIONS(317),
-    [anon_sym_match] = ACTIONS(317),
-    [anon_sym_DASH] = ACTIONS(47),
-    [anon_sym_PLUS] = ACTIONS(47),
-    [anon_sym_LBRACK] = ACTIONS(49),
-    [anon_sym_LBRACE] = ACTIONS(51),
-    [anon_sym_STAR_STAR] = ACTIONS(53),
-    [anon_sym_global] = ACTIONS(57),
-    [anon_sym_nonlocal] = ACTIONS(59),
-    [anon_sym_exec] = ACTIONS(61),
-    [anon_sym_type] = ACTIONS(63),
-    [anon_sym_not] = ACTIONS(69),
-    [anon_sym_TILDE] = ACTIONS(47),
-    [anon_sym_lambda] = ACTIONS(71),
-    [anon_sym_yield] = ACTIONS(73),
-    [sym_ellipsis] = ACTIONS(75),
-    [sym_integer] = ACTIONS(77),
-    [sym_float] = ACTIONS(75),
-    [anon_sym_await] = ACTIONS(79),
-    [sym_true] = ACTIONS(77),
-    [sym_false] = ACTIONS(77),
-    [sym_none] = ACTIONS(77),
+    [sym_primary_expression] = STATE(637),
+    [sym_binary_operator] = STATE(605),
+    [sym_unary_operator] = STATE(605),
+    [sym_attribute] = STATE(605),
+    [sym_subscript] = STATE(605),
+    [sym_call] = STATE(605),
+    [sym_list] = STATE(605),
+    [sym_set] = STATE(605),
+    [sym_tuple] = STATE(605),
+    [sym_dictionary] = STATE(605),
+    [sym_list_comprehension] = STATE(605),
+    [sym_dictionary_comprehension] = STATE(605),
+    [sym_set_comprehension] = STATE(605),
+    [sym_generator_expression] = STATE(605),
+    [sym_parenthesized_expression] = STATE(605),
+    [sym_concatenated_string] = STATE(605),
+    [sym_string] = STATE(586),
+    [sym_await] = STATE(605),
+    [sym_identifier] = ACTIONS(295),
+    [anon_sym_DOT] = ACTIONS(260),
+    [anon_sym_LPAREN] = ACTIONS(262),
+    [anon_sym_RPAREN] = ACTIONS(564),
+    [anon_sym_COMMA] = ACTIONS(564),
+    [anon_sym_STAR] = ACTIONS(260),
+    [anon_sym_print] = ACTIONS(558),
+    [anon_sym_GT_GT] = ACTIONS(260),
+    [anon_sym_COLON] = ACTIONS(564),
+    [anon_sym_async] = ACTIONS(558),
+    [anon_sym_in] = ACTIONS(562),
+    [anon_sym_match] = ACTIONS(558),
+    [anon_sym_PIPE] = ACTIONS(260),
+    [anon_sym_DASH] = ACTIONS(275),
+    [anon_sym_PLUS] = ACTIONS(275),
+    [anon_sym_LBRACK] = ACTIONS(277),
+    [anon_sym_RBRACK] = ACTIONS(564),
+    [anon_sym_LBRACE] = ACTIONS(279),
+    [anon_sym_STAR_STAR] = ACTIONS(260),
+    [anon_sym_EQ] = ACTIONS(564),
+    [anon_sym_exec] = ACTIONS(558),
+    [anon_sym_type] = ACTIONS(558),
+    [anon_sym_AT] = ACTIONS(260),
+    [anon_sym_SLASH] = ACTIONS(260),
+    [anon_sym_PERCENT] = ACTIONS(260),
+    [anon_sym_SLASH_SLASH] = ACTIONS(260),
+    [anon_sym_AMP] = ACTIONS(260),
+    [anon_sym_CARET] = ACTIONS(260),
+    [anon_sym_LT_LT] = ACTIONS(260),
+    [anon_sym_TILDE] = ACTIONS(285),
+    [anon_sym_PLUS_EQ] = ACTIONS(564),
+    [anon_sym_DASH_EQ] = ACTIONS(564),
+    [anon_sym_STAR_EQ] = ACTIONS(564),
+    [anon_sym_SLASH_EQ] = ACTIONS(564),
+    [anon_sym_AT_EQ] = ACTIONS(564),
+    [anon_sym_SLASH_SLASH_EQ] = ACTIONS(564),
+    [anon_sym_PERCENT_EQ] = ACTIONS(564),
+    [anon_sym_STAR_STAR_EQ] = ACTIONS(564),
+    [anon_sym_GT_GT_EQ] = ACTIONS(564),
+    [anon_sym_LT_LT_EQ] = ACTIONS(564),
+    [anon_sym_AMP_EQ] = ACTIONS(564),
+    [anon_sym_CARET_EQ] = ACTIONS(564),
+    [anon_sym_PIPE_EQ] = ACTIONS(564),
+    [sym_ellipsis] = ACTIONS(293),
+    [sym_integer] = ACTIONS(295),
+    [sym_float] = ACTIONS(293),
+    [anon_sym_await] = ACTIONS(566),
+    [sym_true] = ACTIONS(295),
+    [sym_false] = ACTIONS(295),
+    [sym_none] = ACTIONS(295),
     [sym_comment] = ACTIONS(3),
-    [sym__newline] = ACTIONS(590),
-    [sym__string_start] = ACTIONS(81),
+    [sym__string_start] = ACTIONS(299),
   },
   [142] = {
-    [sym_import_statement] = STATE(1351),
-    [sym_future_import_statement] = STATE(1351),
-    [sym_import_from_statement] = STATE(1351),
-    [sym_print_statement] = STATE(1351),
-    [sym_assert_statement] = STATE(1351),
-    [sym_expression_statement] = STATE(1351),
-    [sym_named_expression] = STATE(1009),
-    [sym_return_statement] = STATE(1351),
-    [sym_delete_statement] = STATE(1351),
-    [sym_raise_statement] = STATE(1351),
-    [sym_pass_statement] = STATE(1351),
-    [sym_break_statement] = STATE(1351),
-    [sym_continue_statement] = STATE(1351),
-    [sym_list_splat] = STATE(1360),
-    [sym_dictionary_splat] = STATE(1360),
-    [sym_global_statement] = STATE(1351),
-    [sym_nonlocal_statement] = STATE(1351),
-    [sym_exec_statement] = STATE(1351),
-    [sym_type_alias_statement] = STATE(1351),
-    [sym_expression_list] = STATE(1361),
-    [sym_pattern] = STATE(889),
-    [sym_tuple_pattern] = STATE(875),
-    [sym_list_pattern] = STATE(875),
-    [sym_list_splat_pattern] = STATE(875),
-    [sym_expression] = STATE(1019),
-    [sym_primary_expression] = STATE(684),
-    [sym_not_operator] = STATE(1009),
-    [sym_boolean_operator] = STATE(1009),
-    [sym_binary_operator] = STATE(797),
-    [sym_unary_operator] = STATE(797),
-    [sym_comparison_operator] = STATE(1009),
-    [sym_lambda] = STATE(1009),
-    [sym_assignment] = STATE(1361),
-    [sym_augmented_assignment] = STATE(1361),
-    [sym_pattern_list] = STATE(897),
-    [sym_yield] = STATE(1361),
-    [sym_attribute] = STATE(431),
-    [sym_subscript] = STATE(431),
-    [sym_call] = STATE(797),
-    [sym_list] = STATE(797),
-    [sym_set] = STATE(797),
-    [sym_tuple] = STATE(797),
-    [sym_dictionary] = STATE(797),
-    [sym_list_comprehension] = STATE(797),
-    [sym_dictionary_comprehension] = STATE(797),
-    [sym_set_comprehension] = STATE(797),
-    [sym_generator_expression] = STATE(797),
-    [sym_parenthesized_expression] = STATE(797),
-    [sym_conditional_expression] = STATE(1009),
-    [sym_concatenated_string] = STATE(797),
-    [sym_string] = STATE(713),
-    [sym_await] = STATE(1009),
-    [sym_identifier] = ACTIONS(7),
-    [anon_sym_import] = ACTIONS(9),
-    [anon_sym_from] = ACTIONS(11),
-    [anon_sym_LPAREN] = ACTIONS(13),
-    [anon_sym_STAR] = ACTIONS(15),
-    [anon_sym_print] = ACTIONS(17),
-    [anon_sym_assert] = ACTIONS(19),
-    [anon_sym_return] = ACTIONS(21),
-    [anon_sym_del] = ACTIONS(23),
-    [anon_sym_raise] = ACTIONS(25),
-    [anon_sym_pass] = ACTIONS(27),
-    [anon_sym_break] = ACTIONS(29),
-    [anon_sym_continue] = ACTIONS(31),
-    [anon_sym_async] = ACTIONS(317),
-    [anon_sym_match] = ACTIONS(317),
+    [sym_primary_expression] = STATE(725),
+    [sym_binary_operator] = STATE(759),
+    [sym_unary_operator] = STATE(759),
+    [sym_attribute] = STATE(759),
+    [sym_subscript] = STATE(759),
+    [sym_call] = STATE(759),
+    [sym_list] = STATE(759),
+    [sym_set] = STATE(759),
+    [sym_tuple] = STATE(759),
+    [sym_dictionary] = STATE(759),
+    [sym_list_comprehension] = STATE(759),
+    [sym_dictionary_comprehension] = STATE(759),
+    [sym_set_comprehension] = STATE(759),
+    [sym_generator_expression] = STATE(759),
+    [sym_parenthesized_expression] = STATE(759),
+    [sym_concatenated_string] = STATE(759),
+    [sym_string] = STATE(709),
+    [sym_await] = STATE(759),
+    [sym_identifier] = ACTIONS(77),
+    [anon_sym_DOT] = ACTIONS(260),
+    [anon_sym_from] = ACTIONS(260),
+    [anon_sym_LPAREN] = ACTIONS(568),
+    [anon_sym_COMMA] = ACTIONS(287),
+    [anon_sym_STAR] = ACTIONS(260),
+    [anon_sym_print] = ACTIONS(570),
+    [anon_sym_GT_GT] = ACTIONS(287),
+    [anon_sym_COLON_EQ] = ACTIONS(271),
+    [anon_sym_if] = ACTIONS(260),
+    [anon_sym_async] = ACTIONS(570),
+    [anon_sym_in] = ACTIONS(260),
+    [anon_sym_match] = ACTIONS(570),
+    [anon_sym_PIPE] = ACTIONS(287),
     [anon_sym_DASH] = ACTIONS(47),
     [anon_sym_PLUS] = ACTIONS(47),
-    [anon_sym_LBRACK] = ACTIONS(49),
+    [anon_sym_LBRACK] = ACTIONS(574),
     [anon_sym_LBRACE] = ACTIONS(51),
-    [anon_sym_STAR_STAR] = ACTIONS(53),
-    [anon_sym_global] = ACTIONS(57),
-    [anon_sym_nonlocal] = ACTIONS(59),
-    [anon_sym_exec] = ACTIONS(61),
-    [anon_sym_type] = ACTIONS(63),
-    [anon_sym_not] = ACTIONS(69),
+    [anon_sym_STAR_STAR] = ACTIONS(287),
+    [anon_sym_EQ] = ACTIONS(260),
+    [anon_sym_exec] = ACTIONS(570),
+    [anon_sym_type] = ACTIONS(570),
+    [anon_sym_AT] = ACTIONS(287),
+    [anon_sym_not] = ACTIONS(260),
+    [anon_sym_and] = ACTIONS(260),
+    [anon_sym_or] = ACTIONS(260),
+    [anon_sym_SLASH] = ACTIONS(260),
+    [anon_sym_PERCENT] = ACTIONS(287),
+    [anon_sym_SLASH_SLASH] = ACTIONS(287),
+    [anon_sym_AMP] = ACTIONS(287),
+    [anon_sym_CARET] = ACTIONS(287),
+    [anon_sym_LT_LT] = ACTIONS(287),
     [anon_sym_TILDE] = ACTIONS(47),
-    [anon_sym_lambda] = ACTIONS(71),
-    [anon_sym_yield] = ACTIONS(73),
+    [anon_sym_LT] = ACTIONS(260),
+    [anon_sym_LT_EQ] = ACTIONS(287),
+    [anon_sym_EQ_EQ] = ACTIONS(287),
+    [anon_sym_BANG_EQ] = ACTIONS(287),
+    [anon_sym_GT_EQ] = ACTIONS(287),
+    [anon_sym_GT] = ACTIONS(260),
+    [anon_sym_LT_GT] = ACTIONS(287),
+    [anon_sym_is] = ACTIONS(260),
     [sym_ellipsis] = ACTIONS(75),
     [sym_integer] = ACTIONS(77),
     [sym_float] = ACTIONS(75),
-    [anon_sym_await] = ACTIONS(79),
+    [anon_sym_await] = ACTIONS(576),
     [sym_true] = ACTIONS(77),
     [sym_false] = ACTIONS(77),
     [sym_none] = ACTIONS(77),
     [sym_comment] = ACTIONS(3),
-    [sym__newline] = ACTIONS(592),
+    [sym__semicolon] = ACTIONS(287),
+    [sym__newline] = ACTIONS(287),
     [sym__string_start] = ACTIONS(81),
   },
   [143] = {
-    [sym_import_statement] = STATE(1351),
-    [sym_future_import_statement] = STATE(1351),
-    [sym_import_from_statement] = STATE(1351),
-    [sym_print_statement] = STATE(1351),
-    [sym_assert_statement] = STATE(1351),
-    [sym_expression_statement] = STATE(1351),
-    [sym_named_expression] = STATE(1009),
-    [sym_return_statement] = STATE(1351),
-    [sym_delete_statement] = STATE(1351),
-    [sym_raise_statement] = STATE(1351),
-    [sym_pass_statement] = STATE(1351),
-    [sym_break_statement] = STATE(1351),
-    [sym_continue_statement] = STATE(1351),
-    [sym_list_splat] = STATE(1360),
-    [sym_dictionary_splat] = STATE(1360),
-    [sym_global_statement] = STATE(1351),
-    [sym_nonlocal_statement] = STATE(1351),
-    [sym_exec_statement] = STATE(1351),
-    [sym_type_alias_statement] = STATE(1351),
-    [sym_expression_list] = STATE(1361),
-    [sym_pattern] = STATE(889),
-    [sym_tuple_pattern] = STATE(875),
-    [sym_list_pattern] = STATE(875),
-    [sym_list_splat_pattern] = STATE(875),
-    [sym_expression] = STATE(1019),
-    [sym_primary_expression] = STATE(684),
-    [sym_not_operator] = STATE(1009),
-    [sym_boolean_operator] = STATE(1009),
-    [sym_binary_operator] = STATE(797),
-    [sym_unary_operator] = STATE(797),
-    [sym_comparison_operator] = STATE(1009),
-    [sym_lambda] = STATE(1009),
-    [sym_assignment] = STATE(1361),
-    [sym_augmented_assignment] = STATE(1361),
-    [sym_pattern_list] = STATE(897),
-    [sym_yield] = STATE(1361),
-    [sym_attribute] = STATE(431),
-    [sym_subscript] = STATE(431),
-    [sym_call] = STATE(797),
-    [sym_list] = STATE(797),
-    [sym_set] = STATE(797),
-    [sym_tuple] = STATE(797),
-    [sym_dictionary] = STATE(797),
-    [sym_list_comprehension] = STATE(797),
-    [sym_dictionary_comprehension] = STATE(797),
-    [sym_set_comprehension] = STATE(797),
-    [sym_generator_expression] = STATE(797),
-    [sym_parenthesized_expression] = STATE(797),
-    [sym_conditional_expression] = STATE(1009),
-    [sym_concatenated_string] = STATE(797),
-    [sym_string] = STATE(713),
-    [sym_await] = STATE(1009),
-    [sym_identifier] = ACTIONS(7),
-    [anon_sym_import] = ACTIONS(9),
-    [anon_sym_from] = ACTIONS(11),
-    [anon_sym_LPAREN] = ACTIONS(13),
-    [anon_sym_STAR] = ACTIONS(15),
-    [anon_sym_print] = ACTIONS(17),
-    [anon_sym_assert] = ACTIONS(19),
-    [anon_sym_return] = ACTIONS(21),
-    [anon_sym_del] = ACTIONS(23),
-    [anon_sym_raise] = ACTIONS(25),
-    [anon_sym_pass] = ACTIONS(27),
-    [anon_sym_break] = ACTIONS(29),
-    [anon_sym_continue] = ACTIONS(31),
-    [anon_sym_async] = ACTIONS(317),
-    [anon_sym_match] = ACTIONS(317),
-    [anon_sym_DASH] = ACTIONS(47),
-    [anon_sym_PLUS] = ACTIONS(47),
-    [anon_sym_LBRACK] = ACTIONS(49),
-    [anon_sym_LBRACE] = ACTIONS(51),
-    [anon_sym_STAR_STAR] = ACTIONS(53),
-    [anon_sym_global] = ACTIONS(57),
-    [anon_sym_nonlocal] = ACTIONS(59),
-    [anon_sym_exec] = ACTIONS(61),
-    [anon_sym_type] = ACTIONS(63),
-    [anon_sym_not] = ACTIONS(69),
-    [anon_sym_TILDE] = ACTIONS(47),
-    [anon_sym_lambda] = ACTIONS(71),
-    [anon_sym_yield] = ACTIONS(73),
-    [sym_ellipsis] = ACTIONS(75),
-    [sym_integer] = ACTIONS(77),
-    [sym_float] = ACTIONS(75),
-    [anon_sym_await] = ACTIONS(79),
-    [sym_true] = ACTIONS(77),
-    [sym_false] = ACTIONS(77),
-    [sym_none] = ACTIONS(77),
+    [sym_primary_expression] = STATE(640),
+    [sym_binary_operator] = STATE(605),
+    [sym_unary_operator] = STATE(605),
+    [sym_attribute] = STATE(605),
+    [sym_subscript] = STATE(605),
+    [sym_call] = STATE(605),
+    [sym_list] = STATE(605),
+    [sym_set] = STATE(605),
+    [sym_tuple] = STATE(605),
+    [sym_dictionary] = STATE(605),
+    [sym_list_comprehension] = STATE(605),
+    [sym_dictionary_comprehension] = STATE(605),
+    [sym_set_comprehension] = STATE(605),
+    [sym_generator_expression] = STATE(605),
+    [sym_parenthesized_expression] = STATE(605),
+    [sym_concatenated_string] = STATE(605),
+    [sym_string] = STATE(586),
+    [sym_await] = STATE(605),
+    [sym_identifier] = ACTIONS(295),
+    [anon_sym_DOT] = ACTIONS(260),
+    [anon_sym_LPAREN] = ACTIONS(578),
+    [anon_sym_RPAREN] = ACTIONS(264),
+    [anon_sym_COMMA] = ACTIONS(264),
+    [anon_sym_STAR] = ACTIONS(260),
+    [anon_sym_print] = ACTIONS(558),
+    [anon_sym_GT_GT] = ACTIONS(287),
+    [anon_sym_COLON_EQ] = ACTIONS(580),
+    [anon_sym_if] = ACTIONS(260),
+    [anon_sym_async] = ACTIONS(558),
+    [anon_sym_for] = ACTIONS(260),
+    [anon_sym_in] = ACTIONS(260),
+    [anon_sym_match] = ACTIONS(558),
+    [anon_sym_PIPE] = ACTIONS(287),
+    [anon_sym_DASH] = ACTIONS(582),
+    [anon_sym_PLUS] = ACTIONS(582),
+    [anon_sym_LBRACK] = ACTIONS(584),
+    [anon_sym_RBRACK] = ACTIONS(264),
+    [anon_sym_LBRACE] = ACTIONS(279),
+    [anon_sym_STAR_STAR] = ACTIONS(287),
+    [anon_sym_exec] = ACTIONS(558),
+    [anon_sym_type] = ACTIONS(558),
+    [anon_sym_AT] = ACTIONS(287),
+    [anon_sym_not] = ACTIONS(260),
+    [anon_sym_and] = ACTIONS(260),
+    [anon_sym_or] = ACTIONS(260),
+    [anon_sym_SLASH] = ACTIONS(260),
+    [anon_sym_PERCENT] = ACTIONS(287),
+    [anon_sym_SLASH_SLASH] = ACTIONS(287),
+    [anon_sym_AMP] = ACTIONS(287),
+    [anon_sym_CARET] = ACTIONS(287),
+    [anon_sym_LT_LT] = ACTIONS(287),
+    [anon_sym_TILDE] = ACTIONS(582),
+    [anon_sym_LT] = ACTIONS(260),
+    [anon_sym_LT_EQ] = ACTIONS(287),
+    [anon_sym_EQ_EQ] = ACTIONS(287),
+    [anon_sym_BANG_EQ] = ACTIONS(287),
+    [anon_sym_GT_EQ] = ACTIONS(287),
+    [anon_sym_GT] = ACTIONS(260),
+    [anon_sym_LT_GT] = ACTIONS(287),
+    [anon_sym_is] = ACTIONS(260),
+    [sym_ellipsis] = ACTIONS(293),
+    [sym_integer] = ACTIONS(295),
+    [sym_float] = ACTIONS(293),
+    [anon_sym_await] = ACTIONS(586),
+    [sym_true] = ACTIONS(295),
+    [sym_false] = ACTIONS(295),
+    [sym_none] = ACTIONS(295),
     [sym_comment] = ACTIONS(3),
-    [sym__newline] = ACTIONS(594),
-    [sym__string_start] = ACTIONS(81),
+    [sym__string_start] = ACTIONS(299),
   },
   [144] = {
-    [sym_import_statement] = STATE(1351),
-    [sym_future_import_statement] = STATE(1351),
-    [sym_import_from_statement] = STATE(1351),
-    [sym_print_statement] = STATE(1351),
-    [sym_assert_statement] = STATE(1351),
-    [sym_expression_statement] = STATE(1351),
-    [sym_named_expression] = STATE(1009),
-    [sym_return_statement] = STATE(1351),
-    [sym_delete_statement] = STATE(1351),
-    [sym_raise_statement] = STATE(1351),
-    [sym_pass_statement] = STATE(1351),
-    [sym_break_statement] = STATE(1351),
-    [sym_continue_statement] = STATE(1351),
-    [sym_list_splat] = STATE(1360),
-    [sym_dictionary_splat] = STATE(1360),
-    [sym_global_statement] = STATE(1351),
-    [sym_nonlocal_statement] = STATE(1351),
-    [sym_exec_statement] = STATE(1351),
-    [sym_type_alias_statement] = STATE(1351),
-    [sym_expression_list] = STATE(1361),
-    [sym_pattern] = STATE(889),
-    [sym_tuple_pattern] = STATE(875),
-    [sym_list_pattern] = STATE(875),
-    [sym_list_splat_pattern] = STATE(875),
-    [sym_expression] = STATE(1019),
-    [sym_primary_expression] = STATE(684),
-    [sym_not_operator] = STATE(1009),
-    [sym_boolean_operator] = STATE(1009),
-    [sym_binary_operator] = STATE(797),
-    [sym_unary_operator] = STATE(797),
-    [sym_comparison_operator] = STATE(1009),
-    [sym_lambda] = STATE(1009),
-    [sym_assignment] = STATE(1361),
-    [sym_augmented_assignment] = STATE(1361),
-    [sym_pattern_list] = STATE(897),
-    [sym_yield] = STATE(1361),
-    [sym_attribute] = STATE(431),
-    [sym_subscript] = STATE(431),
-    [sym_call] = STATE(797),
-    [sym_list] = STATE(797),
-    [sym_set] = STATE(797),
-    [sym_tuple] = STATE(797),
-    [sym_dictionary] = STATE(797),
-    [sym_list_comprehension] = STATE(797),
-    [sym_dictionary_comprehension] = STATE(797),
-    [sym_set_comprehension] = STATE(797),
-    [sym_generator_expression] = STATE(797),
-    [sym_parenthesized_expression] = STATE(797),
-    [sym_conditional_expression] = STATE(1009),
-    [sym_concatenated_string] = STATE(797),
-    [sym_string] = STATE(713),
-    [sym_await] = STATE(1009),
-    [sym_identifier] = ACTIONS(7),
-    [anon_sym_import] = ACTIONS(9),
-    [anon_sym_from] = ACTIONS(11),
-    [anon_sym_LPAREN] = ACTIONS(13),
-    [anon_sym_STAR] = ACTIONS(15),
-    [anon_sym_print] = ACTIONS(17),
-    [anon_sym_assert] = ACTIONS(19),
-    [anon_sym_return] = ACTIONS(21),
-    [anon_sym_del] = ACTIONS(23),
-    [anon_sym_raise] = ACTIONS(25),
-    [anon_sym_pass] = ACTIONS(27),
-    [anon_sym_break] = ACTIONS(29),
-    [anon_sym_continue] = ACTIONS(31),
-    [anon_sym_async] = ACTIONS(317),
-    [anon_sym_match] = ACTIONS(317),
-    [anon_sym_DASH] = ACTIONS(47),
-    [anon_sym_PLUS] = ACTIONS(47),
-    [anon_sym_LBRACK] = ACTIONS(49),
-    [anon_sym_LBRACE] = ACTIONS(51),
-    [anon_sym_STAR_STAR] = ACTIONS(53),
-    [anon_sym_global] = ACTIONS(57),
-    [anon_sym_nonlocal] = ACTIONS(59),
-    [anon_sym_exec] = ACTIONS(61),
-    [anon_sym_type] = ACTIONS(63),
-    [anon_sym_not] = ACTIONS(69),
-    [anon_sym_TILDE] = ACTIONS(47),
-    [anon_sym_lambda] = ACTIONS(71),
-    [anon_sym_yield] = ACTIONS(73),
-    [sym_ellipsis] = ACTIONS(75),
-    [sym_integer] = ACTIONS(77),
-    [sym_float] = ACTIONS(75),
-    [anon_sym_await] = ACTIONS(79),
-    [sym_true] = ACTIONS(77),
-    [sym_false] = ACTIONS(77),
-    [sym_none] = ACTIONS(77),
+    [sym_primary_expression] = STATE(640),
+    [sym_binary_operator] = STATE(605),
+    [sym_unary_operator] = STATE(605),
+    [sym_attribute] = STATE(605),
+    [sym_subscript] = STATE(605),
+    [sym_call] = STATE(605),
+    [sym_list] = STATE(605),
+    [sym_set] = STATE(605),
+    [sym_tuple] = STATE(605),
+    [sym_dictionary] = STATE(605),
+    [sym_list_comprehension] = STATE(605),
+    [sym_dictionary_comprehension] = STATE(605),
+    [sym_set_comprehension] = STATE(605),
+    [sym_generator_expression] = STATE(605),
+    [sym_parenthesized_expression] = STATE(605),
+    [sym_concatenated_string] = STATE(605),
+    [sym_string] = STATE(586),
+    [sym_await] = STATE(605),
+    [sym_identifier] = ACTIONS(295),
+    [anon_sym_DOT] = ACTIONS(260),
+    [anon_sym_LPAREN] = ACTIONS(578),
+    [anon_sym_RPAREN] = ACTIONS(287),
+    [anon_sym_COMMA] = ACTIONS(287),
+    [anon_sym_STAR] = ACTIONS(260),
+    [anon_sym_print] = ACTIONS(558),
+    [anon_sym_GT_GT] = ACTIONS(287),
+    [anon_sym_COLON_EQ] = ACTIONS(580),
+    [anon_sym_if] = ACTIONS(260),
+    [anon_sym_async] = ACTIONS(558),
+    [anon_sym_for] = ACTIONS(260),
+    [anon_sym_in] = ACTIONS(260),
+    [anon_sym_match] = ACTIONS(558),
+    [anon_sym_PIPE] = ACTIONS(287),
+    [anon_sym_DASH] = ACTIONS(582),
+    [anon_sym_PLUS] = ACTIONS(582),
+    [anon_sym_LBRACK] = ACTIONS(584),
+    [anon_sym_LBRACE] = ACTIONS(279),
+    [anon_sym_STAR_STAR] = ACTIONS(287),
+    [anon_sym_EQ] = ACTIONS(588),
+    [anon_sym_exec] = ACTIONS(558),
+    [anon_sym_type] = ACTIONS(558),
+    [anon_sym_AT] = ACTIONS(287),
+    [anon_sym_not] = ACTIONS(260),
+    [anon_sym_and] = ACTIONS(260),
+    [anon_sym_or] = ACTIONS(260),
+    [anon_sym_SLASH] = ACTIONS(260),
+    [anon_sym_PERCENT] = ACTIONS(287),
+    [anon_sym_SLASH_SLASH] = ACTIONS(287),
+    [anon_sym_AMP] = ACTIONS(287),
+    [anon_sym_CARET] = ACTIONS(287),
+    [anon_sym_LT_LT] = ACTIONS(287),
+    [anon_sym_TILDE] = ACTIONS(582),
+    [anon_sym_LT] = ACTIONS(260),
+    [anon_sym_LT_EQ] = ACTIONS(287),
+    [anon_sym_EQ_EQ] = ACTIONS(287),
+    [anon_sym_BANG_EQ] = ACTIONS(287),
+    [anon_sym_GT_EQ] = ACTIONS(287),
+    [anon_sym_GT] = ACTIONS(260),
+    [anon_sym_LT_GT] = ACTIONS(287),
+    [anon_sym_is] = ACTIONS(260),
+    [sym_ellipsis] = ACTIONS(293),
+    [sym_integer] = ACTIONS(295),
+    [sym_float] = ACTIONS(293),
+    [anon_sym_await] = ACTIONS(586),
+    [sym_true] = ACTIONS(295),
+    [sym_false] = ACTIONS(295),
+    [sym_none] = ACTIONS(295),
     [sym_comment] = ACTIONS(3),
-    [sym__newline] = ACTIONS(596),
-    [sym__string_start] = ACTIONS(81),
+    [sym__string_start] = ACTIONS(299),
   },
   [145] = {
-    [sym_import_statement] = STATE(1351),
-    [sym_future_import_statement] = STATE(1351),
-    [sym_import_from_statement] = STATE(1351),
-    [sym_print_statement] = STATE(1351),
-    [sym_assert_statement] = STATE(1351),
-    [sym_expression_statement] = STATE(1351),
-    [sym_named_expression] = STATE(1009),
-    [sym_return_statement] = STATE(1351),
-    [sym_delete_statement] = STATE(1351),
-    [sym_raise_statement] = STATE(1351),
-    [sym_pass_statement] = STATE(1351),
-    [sym_break_statement] = STATE(1351),
-    [sym_continue_statement] = STATE(1351),
-    [sym_list_splat] = STATE(1360),
-    [sym_dictionary_splat] = STATE(1360),
-    [sym_global_statement] = STATE(1351),
-    [sym_nonlocal_statement] = STATE(1351),
-    [sym_exec_statement] = STATE(1351),
-    [sym_type_alias_statement] = STATE(1351),
-    [sym_expression_list] = STATE(1361),
-    [sym_pattern] = STATE(889),
-    [sym_tuple_pattern] = STATE(875),
-    [sym_list_pattern] = STATE(875),
-    [sym_list_splat_pattern] = STATE(875),
-    [sym_expression] = STATE(1019),
-    [sym_primary_expression] = STATE(684),
-    [sym_not_operator] = STATE(1009),
-    [sym_boolean_operator] = STATE(1009),
-    [sym_binary_operator] = STATE(797),
-    [sym_unary_operator] = STATE(797),
-    [sym_comparison_operator] = STATE(1009),
-    [sym_lambda] = STATE(1009),
-    [sym_assignment] = STATE(1361),
-    [sym_augmented_assignment] = STATE(1361),
-    [sym_pattern_list] = STATE(897),
-    [sym_yield] = STATE(1361),
-    [sym_attribute] = STATE(431),
-    [sym_subscript] = STATE(431),
-    [sym_call] = STATE(797),
-    [sym_list] = STATE(797),
-    [sym_set] = STATE(797),
-    [sym_tuple] = STATE(797),
-    [sym_dictionary] = STATE(797),
-    [sym_list_comprehension] = STATE(797),
-    [sym_dictionary_comprehension] = STATE(797),
-    [sym_set_comprehension] = STATE(797),
-    [sym_generator_expression] = STATE(797),
-    [sym_parenthesized_expression] = STATE(797),
-    [sym_conditional_expression] = STATE(1009),
-    [sym_concatenated_string] = STATE(797),
-    [sym_string] = STATE(713),
-    [sym_await] = STATE(1009),
-    [sym_identifier] = ACTIONS(7),
-    [anon_sym_import] = ACTIONS(9),
-    [anon_sym_from] = ACTIONS(11),
-    [anon_sym_LPAREN] = ACTIONS(13),
-    [anon_sym_STAR] = ACTIONS(15),
-    [anon_sym_print] = ACTIONS(17),
-    [anon_sym_assert] = ACTIONS(19),
-    [anon_sym_return] = ACTIONS(21),
-    [anon_sym_del] = ACTIONS(23),
-    [anon_sym_raise] = ACTIONS(25),
-    [anon_sym_pass] = ACTIONS(27),
-    [anon_sym_break] = ACTIONS(29),
-    [anon_sym_continue] = ACTIONS(31),
-    [anon_sym_async] = ACTIONS(317),
-    [anon_sym_match] = ACTIONS(317),
+    [sym_primary_expression] = STATE(725),
+    [sym_binary_operator] = STATE(759),
+    [sym_unary_operator] = STATE(759),
+    [sym_attribute] = STATE(759),
+    [sym_subscript] = STATE(759),
+    [sym_call] = STATE(759),
+    [sym_list] = STATE(759),
+    [sym_set] = STATE(759),
+    [sym_tuple] = STATE(759),
+    [sym_dictionary] = STATE(759),
+    [sym_list_comprehension] = STATE(759),
+    [sym_dictionary_comprehension] = STATE(759),
+    [sym_set_comprehension] = STATE(759),
+    [sym_generator_expression] = STATE(759),
+    [sym_parenthesized_expression] = STATE(759),
+    [sym_concatenated_string] = STATE(759),
+    [sym_string] = STATE(709),
+    [sym_await] = STATE(759),
+    [sym_identifier] = ACTIONS(77),
+    [anon_sym_DOT] = ACTIONS(260),
+    [anon_sym_from] = ACTIONS(260),
+    [anon_sym_LPAREN] = ACTIONS(568),
+    [anon_sym_COMMA] = ACTIONS(287),
+    [anon_sym_STAR] = ACTIONS(260),
+    [anon_sym_print] = ACTIONS(570),
+    [anon_sym_GT_GT] = ACTIONS(287),
+    [anon_sym_if] = ACTIONS(260),
+    [anon_sym_async] = ACTIONS(570),
+    [anon_sym_in] = ACTIONS(260),
+    [anon_sym_match] = ACTIONS(570),
+    [anon_sym_PIPE] = ACTIONS(287),
     [anon_sym_DASH] = ACTIONS(47),
     [anon_sym_PLUS] = ACTIONS(47),
-    [anon_sym_LBRACK] = ACTIONS(49),
+    [anon_sym_LBRACK] = ACTIONS(574),
     [anon_sym_LBRACE] = ACTIONS(51),
-    [anon_sym_STAR_STAR] = ACTIONS(53),
-    [anon_sym_global] = ACTIONS(57),
-    [anon_sym_nonlocal] = ACTIONS(59),
-    [anon_sym_exec] = ACTIONS(61),
-    [anon_sym_type] = ACTIONS(63),
-    [anon_sym_not] = ACTIONS(69),
+    [anon_sym_STAR_STAR] = ACTIONS(287),
+    [anon_sym_EQ] = ACTIONS(260),
+    [anon_sym_exec] = ACTIONS(570),
+    [anon_sym_type] = ACTIONS(570),
+    [anon_sym_AT] = ACTIONS(287),
+    [anon_sym_not] = ACTIONS(260),
+    [anon_sym_and] = ACTIONS(260),
+    [anon_sym_or] = ACTIONS(260),
+    [anon_sym_SLASH] = ACTIONS(260),
+    [anon_sym_PERCENT] = ACTIONS(287),
+    [anon_sym_SLASH_SLASH] = ACTIONS(287),
+    [anon_sym_AMP] = ACTIONS(287),
+    [anon_sym_CARET] = ACTIONS(287),
+    [anon_sym_LT_LT] = ACTIONS(287),
     [anon_sym_TILDE] = ACTIONS(47),
-    [anon_sym_lambda] = ACTIONS(71),
-    [anon_sym_yield] = ACTIONS(73),
+    [anon_sym_LT] = ACTIONS(260),
+    [anon_sym_LT_EQ] = ACTIONS(287),
+    [anon_sym_EQ_EQ] = ACTIONS(287),
+    [anon_sym_BANG_EQ] = ACTIONS(287),
+    [anon_sym_GT_EQ] = ACTIONS(287),
+    [anon_sym_GT] = ACTIONS(260),
+    [anon_sym_LT_GT] = ACTIONS(287),
+    [anon_sym_is] = ACTIONS(260),
     [sym_ellipsis] = ACTIONS(75),
     [sym_integer] = ACTIONS(77),
     [sym_float] = ACTIONS(75),
-    [anon_sym_await] = ACTIONS(79),
+    [anon_sym_await] = ACTIONS(576),
     [sym_true] = ACTIONS(77),
     [sym_false] = ACTIONS(77),
     [sym_none] = ACTIONS(77),
     [sym_comment] = ACTIONS(3),
-    [sym__newline] = ACTIONS(598),
+    [sym__semicolon] = ACTIONS(287),
+    [sym__newline] = ACTIONS(287),
     [sym__string_start] = ACTIONS(81),
   },
   [146] = {
-    [sym_import_statement] = STATE(1351),
-    [sym_future_import_statement] = STATE(1351),
-    [sym_import_from_statement] = STATE(1351),
-    [sym_print_statement] = STATE(1351),
-    [sym_assert_statement] = STATE(1351),
-    [sym_expression_statement] = STATE(1351),
-    [sym_named_expression] = STATE(1009),
-    [sym_return_statement] = STATE(1351),
-    [sym_delete_statement] = STATE(1351),
-    [sym_raise_statement] = STATE(1351),
-    [sym_pass_statement] = STATE(1351),
-    [sym_break_statement] = STATE(1351),
-    [sym_continue_statement] = STATE(1351),
-    [sym_list_splat] = STATE(1360),
-    [sym_dictionary_splat] = STATE(1360),
-    [sym_global_statement] = STATE(1351),
-    [sym_nonlocal_statement] = STATE(1351),
-    [sym_exec_statement] = STATE(1351),
-    [sym_type_alias_statement] = STATE(1351),
-    [sym_expression_list] = STATE(1361),
-    [sym_pattern] = STATE(889),
-    [sym_tuple_pattern] = STATE(875),
-    [sym_list_pattern] = STATE(875),
-    [sym_list_splat_pattern] = STATE(875),
-    [sym_expression] = STATE(1019),
-    [sym_primary_expression] = STATE(684),
-    [sym_not_operator] = STATE(1009),
-    [sym_boolean_operator] = STATE(1009),
-    [sym_binary_operator] = STATE(797),
-    [sym_unary_operator] = STATE(797),
-    [sym_comparison_operator] = STATE(1009),
-    [sym_lambda] = STATE(1009),
-    [sym_assignment] = STATE(1361),
-    [sym_augmented_assignment] = STATE(1361),
-    [sym_pattern_list] = STATE(897),
-    [sym_yield] = STATE(1361),
-    [sym_attribute] = STATE(431),
-    [sym_subscript] = STATE(431),
-    [sym_call] = STATE(797),
-    [sym_list] = STATE(797),
-    [sym_set] = STATE(797),
-    [sym_tuple] = STATE(797),
-    [sym_dictionary] = STATE(797),
-    [sym_list_comprehension] = STATE(797),
-    [sym_dictionary_comprehension] = STATE(797),
-    [sym_set_comprehension] = STATE(797),
-    [sym_generator_expression] = STATE(797),
-    [sym_parenthesized_expression] = STATE(797),
-    [sym_conditional_expression] = STATE(1009),
-    [sym_concatenated_string] = STATE(797),
+    [sym_primary_expression] = STATE(741),
+    [sym_binary_operator] = STATE(827),
+    [sym_unary_operator] = STATE(827),
+    [sym_attribute] = STATE(827),
+    [sym_subscript] = STATE(827),
+    [sym_call] = STATE(827),
+    [sym_list] = STATE(827),
+    [sym_set] = STATE(827),
+    [sym_tuple] = STATE(827),
+    [sym_dictionary] = STATE(827),
+    [sym_list_comprehension] = STATE(827),
+    [sym_dictionary_comprehension] = STATE(827),
+    [sym_set_comprehension] = STATE(827),
+    [sym_generator_expression] = STATE(827),
+    [sym_parenthesized_expression] = STATE(827),
+    [sym_concatenated_string] = STATE(827),
     [sym_string] = STATE(713),
-    [sym_await] = STATE(1009),
-    [sym_identifier] = ACTIONS(7),
-    [anon_sym_import] = ACTIONS(9),
-    [anon_sym_from] = ACTIONS(11),
-    [anon_sym_LPAREN] = ACTIONS(13),
-    [anon_sym_STAR] = ACTIONS(15),
-    [anon_sym_print] = ACTIONS(17),
-    [anon_sym_assert] = ACTIONS(19),
-    [anon_sym_return] = ACTIONS(21),
-    [anon_sym_del] = ACTIONS(23),
-    [anon_sym_raise] = ACTIONS(25),
-    [anon_sym_pass] = ACTIONS(27),
-    [anon_sym_break] = ACTIONS(29),
-    [anon_sym_continue] = ACTIONS(31),
-    [anon_sym_async] = ACTIONS(317),
-    [anon_sym_match] = ACTIONS(317),
-    [anon_sym_DASH] = ACTIONS(47),
-    [anon_sym_PLUS] = ACTIONS(47),
-    [anon_sym_LBRACK] = ACTIONS(49),
-    [anon_sym_LBRACE] = ACTIONS(51),
-    [anon_sym_STAR_STAR] = ACTIONS(53),
-    [anon_sym_global] = ACTIONS(57),
-    [anon_sym_nonlocal] = ACTIONS(59),
-    [anon_sym_exec] = ACTIONS(61),
-    [anon_sym_type] = ACTIONS(63),
-    [anon_sym_not] = ACTIONS(69),
-    [anon_sym_TILDE] = ACTIONS(47),
-    [anon_sym_lambda] = ACTIONS(71),
-    [anon_sym_yield] = ACTIONS(73),
-    [sym_ellipsis] = ACTIONS(75),
-    [sym_integer] = ACTIONS(77),
-    [sym_float] = ACTIONS(75),
-    [anon_sym_await] = ACTIONS(79),
-    [sym_true] = ACTIONS(77),
-    [sym_false] = ACTIONS(77),
-    [sym_none] = ACTIONS(77),
+    [sym_await] = STATE(827),
+    [sym_identifier] = ACTIONS(590),
+    [anon_sym_DOT] = ACTIONS(260),
+    [anon_sym_LPAREN] = ACTIONS(592),
+    [anon_sym_RPAREN] = ACTIONS(287),
+    [anon_sym_COMMA] = ACTIONS(287),
+    [anon_sym_as] = ACTIONS(260),
+    [anon_sym_STAR] = ACTIONS(260),
+    [anon_sym_print] = ACTIONS(594),
+    [anon_sym_GT_GT] = ACTIONS(287),
+    [anon_sym_COLON_EQ] = ACTIONS(596),
+    [anon_sym_if] = ACTIONS(260),
+    [anon_sym_COLON] = ACTIONS(260),
+    [anon_sym_async] = ACTIONS(594),
+    [anon_sym_in] = ACTIONS(260),
+    [anon_sym_match] = ACTIONS(594),
+    [anon_sym_PIPE] = ACTIONS(287),
+    [anon_sym_DASH] = ACTIONS(598),
+    [anon_sym_PLUS] = ACTIONS(598),
+    [anon_sym_LBRACK] = ACTIONS(600),
+    [anon_sym_LBRACE] = ACTIONS(602),
+    [anon_sym_STAR_STAR] = ACTIONS(287),
+    [anon_sym_exec] = ACTIONS(594),
+    [anon_sym_type] = ACTIONS(594),
+    [anon_sym_AT] = ACTIONS(287),
+    [anon_sym_not] = ACTIONS(260),
+    [anon_sym_and] = ACTIONS(260),
+    [anon_sym_or] = ACTIONS(260),
+    [anon_sym_SLASH] = ACTIONS(260),
+    [anon_sym_PERCENT] = ACTIONS(287),
+    [anon_sym_SLASH_SLASH] = ACTIONS(287),
+    [anon_sym_AMP] = ACTIONS(287),
+    [anon_sym_CARET] = ACTIONS(287),
+    [anon_sym_LT_LT] = ACTIONS(287),
+    [anon_sym_TILDE] = ACTIONS(598),
+    [anon_sym_LT] = ACTIONS(260),
+    [anon_sym_LT_EQ] = ACTIONS(287),
+    [anon_sym_EQ_EQ] = ACTIONS(287),
+    [anon_sym_BANG_EQ] = ACTIONS(287),
+    [anon_sym_GT_EQ] = ACTIONS(287),
+    [anon_sym_GT] = ACTIONS(260),
+    [anon_sym_LT_GT] = ACTIONS(287),
+    [anon_sym_is] = ACTIONS(260),
+    [sym_ellipsis] = ACTIONS(604),
+    [sym_integer] = ACTIONS(590),
+    [sym_float] = ACTIONS(604),
+    [anon_sym_await] = ACTIONS(606),
+    [sym_true] = ACTIONS(590),
+    [sym_false] = ACTIONS(590),
+    [sym_none] = ACTIONS(590),
     [sym_comment] = ACTIONS(3),
-    [sym__newline] = ACTIONS(600),
-    [sym__string_start] = ACTIONS(81),
+    [sym__string_start] = ACTIONS(608),
   },
   [147] = {
-    [sym_import_statement] = STATE(1351),
-    [sym_future_import_statement] = STATE(1351),
-    [sym_import_from_statement] = STATE(1351),
-    [sym_print_statement] = STATE(1351),
-    [sym_assert_statement] = STATE(1351),
-    [sym_expression_statement] = STATE(1351),
-    [sym_named_expression] = STATE(1009),
-    [sym_return_statement] = STATE(1351),
-    [sym_delete_statement] = STATE(1351),
-    [sym_raise_statement] = STATE(1351),
-    [sym_pass_statement] = STATE(1351),
-    [sym_break_statement] = STATE(1351),
-    [sym_continue_statement] = STATE(1351),
-    [sym_list_splat] = STATE(1360),
-    [sym_dictionary_splat] = STATE(1360),
-    [sym_global_statement] = STATE(1351),
-    [sym_nonlocal_statement] = STATE(1351),
-    [sym_exec_statement] = STATE(1351),
-    [sym_type_alias_statement] = STATE(1351),
-    [sym_expression_list] = STATE(1361),
-    [sym_pattern] = STATE(889),
-    [sym_tuple_pattern] = STATE(875),
-    [sym_list_pattern] = STATE(875),
-    [sym_list_splat_pattern] = STATE(875),
-    [sym_expression] = STATE(1019),
-    [sym_primary_expression] = STATE(684),
-    [sym_not_operator] = STATE(1009),
-    [sym_boolean_operator] = STATE(1009),
-    [sym_binary_operator] = STATE(797),
-    [sym_unary_operator] = STATE(797),
-    [sym_comparison_operator] = STATE(1009),
-    [sym_lambda] = STATE(1009),
-    [sym_assignment] = STATE(1361),
-    [sym_augmented_assignment] = STATE(1361),
-    [sym_pattern_list] = STATE(897),
-    [sym_yield] = STATE(1361),
-    [sym_attribute] = STATE(431),
-    [sym_subscript] = STATE(431),
-    [sym_call] = STATE(797),
-    [sym_list] = STATE(797),
-    [sym_set] = STATE(797),
-    [sym_tuple] = STATE(797),
-    [sym_dictionary] = STATE(797),
-    [sym_list_comprehension] = STATE(797),
-    [sym_dictionary_comprehension] = STATE(797),
-    [sym_set_comprehension] = STATE(797),
-    [sym_generator_expression] = STATE(797),
-    [sym_parenthesized_expression] = STATE(797),
-    [sym_conditional_expression] = STATE(1009),
-    [sym_concatenated_string] = STATE(797),
+    [sym_primary_expression] = STATE(741),
+    [sym_binary_operator] = STATE(827),
+    [sym_unary_operator] = STATE(827),
+    [sym_attribute] = STATE(827),
+    [sym_subscript] = STATE(827),
+    [sym_call] = STATE(827),
+    [sym_list] = STATE(827),
+    [sym_set] = STATE(827),
+    [sym_tuple] = STATE(827),
+    [sym_dictionary] = STATE(827),
+    [sym_list_comprehension] = STATE(827),
+    [sym_dictionary_comprehension] = STATE(827),
+    [sym_set_comprehension] = STATE(827),
+    [sym_generator_expression] = STATE(827),
+    [sym_parenthesized_expression] = STATE(827),
+    [sym_concatenated_string] = STATE(827),
     [sym_string] = STATE(713),
-    [sym_await] = STATE(1009),
-    [sym_identifier] = ACTIONS(7),
-    [anon_sym_import] = ACTIONS(9),
-    [anon_sym_from] = ACTIONS(11),
-    [anon_sym_LPAREN] = ACTIONS(13),
-    [anon_sym_STAR] = ACTIONS(15),
-    [anon_sym_print] = ACTIONS(17),
-    [anon_sym_assert] = ACTIONS(19),
-    [anon_sym_return] = ACTIONS(21),
-    [anon_sym_del] = ACTIONS(23),
-    [anon_sym_raise] = ACTIONS(25),
-    [anon_sym_pass] = ACTIONS(27),
-    [anon_sym_break] = ACTIONS(29),
-    [anon_sym_continue] = ACTIONS(31),
-    [anon_sym_async] = ACTIONS(317),
-    [anon_sym_match] = ACTIONS(317),
-    [anon_sym_DASH] = ACTIONS(47),
-    [anon_sym_PLUS] = ACTIONS(47),
-    [anon_sym_LBRACK] = ACTIONS(49),
-    [anon_sym_LBRACE] = ACTIONS(51),
-    [anon_sym_STAR_STAR] = ACTIONS(53),
-    [anon_sym_global] = ACTIONS(57),
-    [anon_sym_nonlocal] = ACTIONS(59),
-    [anon_sym_exec] = ACTIONS(61),
-    [anon_sym_type] = ACTIONS(63),
-    [anon_sym_not] = ACTIONS(69),
-    [anon_sym_TILDE] = ACTIONS(47),
-    [anon_sym_lambda] = ACTIONS(71),
-    [anon_sym_yield] = ACTIONS(73),
-    [sym_ellipsis] = ACTIONS(75),
-    [sym_integer] = ACTIONS(77),
-    [sym_float] = ACTIONS(75),
-    [anon_sym_await] = ACTIONS(79),
-    [sym_true] = ACTIONS(77),
-    [sym_false] = ACTIONS(77),
-    [sym_none] = ACTIONS(77),
+    [sym_await] = STATE(827),
+    [sym_identifier] = ACTIONS(590),
+    [anon_sym_DOT] = ACTIONS(260),
+    [anon_sym_LPAREN] = ACTIONS(592),
+    [anon_sym_RPAREN] = ACTIONS(287),
+    [anon_sym_COMMA] = ACTIONS(287),
+    [anon_sym_as] = ACTIONS(260),
+    [anon_sym_STAR] = ACTIONS(260),
+    [anon_sym_print] = ACTIONS(594),
+    [anon_sym_GT_GT] = ACTIONS(287),
+    [anon_sym_if] = ACTIONS(260),
+    [anon_sym_COLON] = ACTIONS(287),
+    [anon_sym_async] = ACTIONS(594),
+    [anon_sym_in] = ACTIONS(260),
+    [anon_sym_match] = ACTIONS(594),
+    [anon_sym_PIPE] = ACTIONS(287),
+    [anon_sym_DASH] = ACTIONS(598),
+    [anon_sym_PLUS] = ACTIONS(598),
+    [anon_sym_LBRACK] = ACTIONS(600),
+    [anon_sym_LBRACE] = ACTIONS(602),
+    [anon_sym_STAR_STAR] = ACTIONS(287),
+    [anon_sym_exec] = ACTIONS(594),
+    [anon_sym_type] = ACTIONS(594),
+    [anon_sym_AT] = ACTIONS(287),
+    [anon_sym_not] = ACTIONS(260),
+    [anon_sym_and] = ACTIONS(260),
+    [anon_sym_or] = ACTIONS(260),
+    [anon_sym_SLASH] = ACTIONS(260),
+    [anon_sym_PERCENT] = ACTIONS(287),
+    [anon_sym_SLASH_SLASH] = ACTIONS(287),
+    [anon_sym_AMP] = ACTIONS(287),
+    [anon_sym_CARET] = ACTIONS(287),
+    [anon_sym_LT_LT] = ACTIONS(287),
+    [anon_sym_TILDE] = ACTIONS(598),
+    [anon_sym_LT] = ACTIONS(260),
+    [anon_sym_LT_EQ] = ACTIONS(287),
+    [anon_sym_EQ_EQ] = ACTIONS(287),
+    [anon_sym_BANG_EQ] = ACTIONS(287),
+    [anon_sym_GT_EQ] = ACTIONS(287),
+    [anon_sym_GT] = ACTIONS(260),
+    [anon_sym_LT_GT] = ACTIONS(287),
+    [anon_sym_is] = ACTIONS(260),
+    [sym_ellipsis] = ACTIONS(604),
+    [sym_integer] = ACTIONS(590),
+    [sym_float] = ACTIONS(604),
+    [anon_sym_await] = ACTIONS(606),
+    [sym_true] = ACTIONS(590),
+    [sym_false] = ACTIONS(590),
+    [sym_none] = ACTIONS(590),
     [sym_comment] = ACTIONS(3),
-    [sym__string_start] = ACTIONS(81),
+    [sym__string_start] = ACTIONS(608),
   },
   [148] = {
-    [sym_named_expression] = STATE(900),
-    [sym_expression] = STATE(901),
-    [sym_primary_expression] = STATE(630),
-    [sym_not_operator] = STATE(900),
-    [sym_boolean_operator] = STATE(900),
-    [sym_binary_operator] = STATE(642),
-    [sym_unary_operator] = STATE(642),
-    [sym_comparison_operator] = STATE(900),
-    [sym_lambda] = STATE(900),
-    [sym_attribute] = STATE(642),
-    [sym_subscript] = STATE(642),
-    [sym_call] = STATE(642),
-    [sym_list] = STATE(642),
-    [sym_set] = STATE(642),
-    [sym_tuple] = STATE(642),
-    [sym_dictionary] = STATE(642),
-    [sym_list_comprehension] = STATE(642),
-    [sym_dictionary_comprehension] = STATE(642),
-    [sym_set_comprehension] = STATE(642),
-    [sym_generator_expression] = STATE(642),
-    [sym_parenthesized_expression] = STATE(642),
-    [sym_conditional_expression] = STATE(900),
-    [sym_concatenated_string] = STATE(642),
-    [sym_string] = STATE(600),
-    [sym_await] = STATE(900),
-    [sym_identifier] = ACTIONS(274),
-    [anon_sym_DOT] = ACTIONS(276),
-    [anon_sym_LPAREN] = ACTIONS(278),
-    [anon_sym_RPAREN] = ACTIONS(303),
-    [anon_sym_COMMA] = ACTIONS(303),
-    [anon_sym_STAR] = ACTIONS(276),
-    [anon_sym_print] = ACTIONS(285),
-    [anon_sym_GT_GT] = ACTIONS(303),
-    [anon_sym_COLON_EQ] = ACTIONS(568),
-    [anon_sym_if] = ACTIONS(276),
-    [anon_sym_COLON] = ACTIONS(276),
-    [anon_sym_else] = ACTIONS(276),
-    [anon_sym_async] = ACTIONS(285),
-    [anon_sym_in] = ACTIONS(276),
-    [anon_sym_match] = ACTIONS(285),
-    [anon_sym_PIPE] = ACTIONS(303),
-    [anon_sym_DASH] = ACTIONS(301),
-    [anon_sym_PLUS] = ACTIONS(301),
-    [anon_sym_LBRACK] = ACTIONS(293),
-    [anon_sym_RBRACK] = ACTIONS(303),
-    [anon_sym_LBRACE] = ACTIONS(295),
-    [anon_sym_RBRACE] = ACTIONS(303),
-    [anon_sym_STAR_STAR] = ACTIONS(303),
-    [anon_sym_EQ] = ACTIONS(276),
-    [anon_sym_exec] = ACTIONS(285),
-    [anon_sym_type] = ACTIONS(285),
-    [anon_sym_AT] = ACTIONS(303),
-    [anon_sym_not] = ACTIONS(299),
-    [anon_sym_and] = ACTIONS(276),
-    [anon_sym_or] = ACTIONS(276),
-    [anon_sym_SLASH] = ACTIONS(276),
-    [anon_sym_PERCENT] = ACTIONS(303),
-    [anon_sym_SLASH_SLASH] = ACTIONS(303),
-    [anon_sym_AMP] = ACTIONS(303),
-    [anon_sym_CARET] = ACTIONS(303),
-    [anon_sym_LT_LT] = ACTIONS(303),
-    [anon_sym_TILDE] = ACTIONS(301),
-    [anon_sym_LT] = ACTIONS(276),
-    [anon_sym_LT_EQ] = ACTIONS(303),
-    [anon_sym_EQ_EQ] = ACTIONS(303),
-    [anon_sym_BANG_EQ] = ACTIONS(303),
-    [anon_sym_GT_EQ] = ACTIONS(303),
-    [anon_sym_GT] = ACTIONS(276),
-    [anon_sym_LT_GT] = ACTIONS(303),
-    [anon_sym_is] = ACTIONS(276),
-    [anon_sym_lambda] = ACTIONS(305),
-    [sym_ellipsis] = ACTIONS(309),
-    [sym_type_conversion] = ACTIONS(303),
-    [sym_integer] = ACTIONS(311),
-    [sym_float] = ACTIONS(309),
-    [anon_sym_await] = ACTIONS(313),
-    [sym_true] = ACTIONS(311),
-    [sym_false] = ACTIONS(311),
-    [sym_none] = ACTIONS(311),
+    [sym_primary_expression] = STATE(637),
+    [sym_binary_operator] = STATE(605),
+    [sym_unary_operator] = STATE(605),
+    [sym_attribute] = STATE(605),
+    [sym_subscript] = STATE(605),
+    [sym_call] = STATE(605),
+    [sym_list] = STATE(605),
+    [sym_set] = STATE(605),
+    [sym_tuple] = STATE(605),
+    [sym_dictionary] = STATE(605),
+    [sym_list_comprehension] = STATE(605),
+    [sym_dictionary_comprehension] = STATE(605),
+    [sym_set_comprehension] = STATE(605),
+    [sym_generator_expression] = STATE(605),
+    [sym_parenthesized_expression] = STATE(605),
+    [sym_concatenated_string] = STATE(605),
+    [sym_string] = STATE(586),
+    [sym_await] = STATE(605),
+    [sym_identifier] = ACTIONS(295),
+    [anon_sym_DOT] = ACTIONS(260),
+    [anon_sym_LPAREN] = ACTIONS(262),
+    [anon_sym_RPAREN] = ACTIONS(287),
+    [anon_sym_COMMA] = ACTIONS(287),
+    [anon_sym_STAR] = ACTIONS(260),
+    [anon_sym_print] = ACTIONS(558),
+    [anon_sym_GT_GT] = ACTIONS(287),
+    [anon_sym_COLON_EQ] = ACTIONS(560),
+    [anon_sym_if] = ACTIONS(260),
+    [anon_sym_async] = ACTIONS(558),
+    [anon_sym_in] = ACTIONS(260),
+    [anon_sym_match] = ACTIONS(558),
+    [anon_sym_PIPE] = ACTIONS(287),
+    [anon_sym_DASH] = ACTIONS(285),
+    [anon_sym_PLUS] = ACTIONS(285),
+    [anon_sym_LBRACK] = ACTIONS(277),
+    [anon_sym_LBRACE] = ACTIONS(279),
+    [anon_sym_STAR_STAR] = ACTIONS(287),
+    [anon_sym_EQ] = ACTIONS(588),
+    [anon_sym_exec] = ACTIONS(558),
+    [anon_sym_type] = ACTIONS(558),
+    [anon_sym_AT] = ACTIONS(287),
+    [anon_sym_not] = ACTIONS(260),
+    [anon_sym_and] = ACTIONS(260),
+    [anon_sym_or] = ACTIONS(260),
+    [anon_sym_SLASH] = ACTIONS(260),
+    [anon_sym_PERCENT] = ACTIONS(287),
+    [anon_sym_SLASH_SLASH] = ACTIONS(287),
+    [anon_sym_AMP] = ACTIONS(287),
+    [anon_sym_CARET] = ACTIONS(287),
+    [anon_sym_LT_LT] = ACTIONS(287),
+    [anon_sym_TILDE] = ACTIONS(285),
+    [anon_sym_LT] = ACTIONS(260),
+    [anon_sym_LT_EQ] = ACTIONS(287),
+    [anon_sym_EQ_EQ] = ACTIONS(287),
+    [anon_sym_BANG_EQ] = ACTIONS(287),
+    [anon_sym_GT_EQ] = ACTIONS(287),
+    [anon_sym_GT] = ACTIONS(260),
+    [anon_sym_LT_GT] = ACTIONS(287),
+    [anon_sym_is] = ACTIONS(260),
+    [sym_ellipsis] = ACTIONS(293),
+    [sym_integer] = ACTIONS(295),
+    [sym_float] = ACTIONS(293),
+    [anon_sym_await] = ACTIONS(566),
+    [sym_true] = ACTIONS(295),
+    [sym_false] = ACTIONS(295),
+    [sym_none] = ACTIONS(295),
     [sym_comment] = ACTIONS(3),
-    [sym__string_start] = ACTIONS(315),
-  },
-  [149] = {
-    [sym_named_expression] = STATE(900),
-    [sym_expression] = STATE(901),
-    [sym_primary_expression] = STATE(643),
-    [sym_not_operator] = STATE(900),
-    [sym_boolean_operator] = STATE(900),
-    [sym_binary_operator] = STATE(642),
-    [sym_unary_operator] = STATE(642),
-    [sym_comparison_operator] = STATE(900),
-    [sym_lambda] = STATE(900),
-    [sym_attribute] = STATE(642),
-    [sym_subscript] = STATE(642),
-    [sym_call] = STATE(642),
-    [sym_list] = STATE(642),
-    [sym_set] = STATE(642),
-    [sym_tuple] = STATE(642),
-    [sym_dictionary] = STATE(642),
-    [sym_list_comprehension] = STATE(642),
-    [sym_dictionary_comprehension] = STATE(642),
-    [sym_set_comprehension] = STATE(642),
-    [sym_generator_expression] = STATE(642),
-    [sym_parenthesized_expression] = STATE(642),
-    [sym_conditional_expression] = STATE(900),
-    [sym_concatenated_string] = STATE(642),
-    [sym_string] = STATE(600),
-    [sym_await] = STATE(900),
-    [sym_identifier] = ACTIONS(602),
-    [anon_sym_DOT] = ACTIONS(276),
-    [anon_sym_LPAREN] = ACTIONS(604),
-    [anon_sym_RPAREN] = ACTIONS(303),
-    [anon_sym_COMMA] = ACTIONS(303),
-    [anon_sym_as] = ACTIONS(276),
-    [anon_sym_STAR] = ACTIONS(276),
-    [anon_sym_print] = ACTIONS(606),
-    [anon_sym_GT_GT] = ACTIONS(303),
-    [anon_sym_COLON_EQ] = ACTIONS(608),
-    [anon_sym_if] = ACTIONS(276),
-    [anon_sym_COLON] = ACTIONS(276),
-    [anon_sym_async] = ACTIONS(606),
-    [anon_sym_for] = ACTIONS(276),
-    [anon_sym_in] = ACTIONS(276),
-    [anon_sym_match] = ACTIONS(606),
-    [anon_sym_PIPE] = ACTIONS(303),
-    [anon_sym_DASH] = ACTIONS(610),
-    [anon_sym_PLUS] = ACTIONS(610),
-    [anon_sym_LBRACK] = ACTIONS(612),
-    [anon_sym_RBRACK] = ACTIONS(303),
-    [anon_sym_LBRACE] = ACTIONS(295),
-    [anon_sym_RBRACE] = ACTIONS(303),
-    [anon_sym_STAR_STAR] = ACTIONS(303),
-    [anon_sym_exec] = ACTIONS(606),
-    [anon_sym_type] = ACTIONS(606),
-    [anon_sym_AT] = ACTIONS(303),
-    [anon_sym_not] = ACTIONS(614),
-    [anon_sym_and] = ACTIONS(276),
-    [anon_sym_or] = ACTIONS(276),
-    [anon_sym_SLASH] = ACTIONS(276),
-    [anon_sym_PERCENT] = ACTIONS(303),
-    [anon_sym_SLASH_SLASH] = ACTIONS(303),
-    [anon_sym_AMP] = ACTIONS(303),
-    [anon_sym_CARET] = ACTIONS(303),
-    [anon_sym_LT_LT] = ACTIONS(303),
-    [anon_sym_TILDE] = ACTIONS(610),
-    [anon_sym_LT] = ACTIONS(276),
-    [anon_sym_LT_EQ] = ACTIONS(303),
-    [anon_sym_EQ_EQ] = ACTIONS(303),
-    [anon_sym_BANG_EQ] = ACTIONS(303),
-    [anon_sym_GT_EQ] = ACTIONS(303),
-    [anon_sym_GT] = ACTIONS(276),
-    [anon_sym_LT_GT] = ACTIONS(303),
-    [anon_sym_is] = ACTIONS(276),
-    [anon_sym_lambda] = ACTIONS(616),
-    [sym_ellipsis] = ACTIONS(309),
-    [sym_integer] = ACTIONS(311),
-    [sym_float] = ACTIONS(309),
-    [anon_sym_await] = ACTIONS(618),
-    [sym_true] = ACTIONS(311),
-    [sym_false] = ACTIONS(311),
-    [sym_none] = ACTIONS(311),
-    [sym_comment] = ACTIONS(3),
-    [sym__string_start] = ACTIONS(315),
-  },
-  [150] = {
-    [sym_named_expression] = STATE(1009),
-    [sym_expression] = STATE(976),
-    [sym_primary_expression] = STATE(684),
-    [sym_not_operator] = STATE(1009),
-    [sym_boolean_operator] = STATE(1009),
-    [sym_binary_operator] = STATE(797),
-    [sym_unary_operator] = STATE(797),
-    [sym_comparison_operator] = STATE(1009),
-    [sym_lambda] = STATE(1009),
-    [sym_attribute] = STATE(797),
-    [sym_subscript] = STATE(797),
-    [sym_call] = STATE(797),
-    [sym_list] = STATE(797),
-    [sym_set] = STATE(797),
-    [sym_tuple] = STATE(797),
-    [sym_dictionary] = STATE(797),
-    [sym_list_comprehension] = STATE(797),
-    [sym_dictionary_comprehension] = STATE(797),
-    [sym_set_comprehension] = STATE(797),
-    [sym_generator_expression] = STATE(797),
-    [sym_parenthesized_expression] = STATE(797),
-    [sym_conditional_expression] = STATE(1009),
-    [sym_concatenated_string] = STATE(797),
-    [sym_string] = STATE(713),
-    [sym_await] = STATE(1009),
-    [sym_identifier] = ACTIONS(331),
-    [anon_sym_DOT] = ACTIONS(276),
-    [anon_sym_from] = ACTIONS(276),
-    [anon_sym_LPAREN] = ACTIONS(559),
-    [anon_sym_COMMA] = ACTIONS(303),
-    [anon_sym_STAR] = ACTIONS(276),
-    [anon_sym_print] = ACTIONS(333),
-    [anon_sym_GT_GT] = ACTIONS(303),
-    [anon_sym_COLON_EQ] = ACTIONS(287),
-    [anon_sym_if] = ACTIONS(276),
-    [anon_sym_async] = ACTIONS(333),
-    [anon_sym_in] = ACTIONS(276),
-    [anon_sym_match] = ACTIONS(333),
-    [anon_sym_PIPE] = ACTIONS(303),
-    [anon_sym_DASH] = ACTIONS(47),
-    [anon_sym_PLUS] = ACTIONS(47),
-    [anon_sym_LBRACK] = ACTIONS(563),
-    [anon_sym_LBRACE] = ACTIONS(51),
-    [anon_sym_STAR_STAR] = ACTIONS(303),
-    [anon_sym_EQ] = ACTIONS(276),
-    [anon_sym_exec] = ACTIONS(333),
-    [anon_sym_type] = ACTIONS(333),
-    [anon_sym_AT] = ACTIONS(303),
-    [anon_sym_not] = ACTIONS(69),
-    [anon_sym_and] = ACTIONS(276),
-    [anon_sym_or] = ACTIONS(276),
-    [anon_sym_SLASH] = ACTIONS(276),
-    [anon_sym_PERCENT] = ACTIONS(303),
-    [anon_sym_SLASH_SLASH] = ACTIONS(303),
-    [anon_sym_AMP] = ACTIONS(303),
-    [anon_sym_CARET] = ACTIONS(303),
-    [anon_sym_LT_LT] = ACTIONS(303),
-    [anon_sym_TILDE] = ACTIONS(47),
-    [anon_sym_LT] = ACTIONS(276),
-    [anon_sym_LT_EQ] = ACTIONS(303),
-    [anon_sym_EQ_EQ] = ACTIONS(303),
-    [anon_sym_BANG_EQ] = ACTIONS(303),
-    [anon_sym_GT_EQ] = ACTIONS(303),
-    [anon_sym_GT] = ACTIONS(276),
-    [anon_sym_LT_GT] = ACTIONS(303),
-    [anon_sym_is] = ACTIONS(276),
-    [anon_sym_lambda] = ACTIONS(71),
-    [sym_ellipsis] = ACTIONS(75),
-    [sym_integer] = ACTIONS(77),
-    [sym_float] = ACTIONS(75),
-    [anon_sym_await] = ACTIONS(337),
-    [sym_true] = ACTIONS(77),
-    [sym_false] = ACTIONS(77),
-    [sym_none] = ACTIONS(77),
-    [sym_comment] = ACTIONS(3),
-    [sym__semicolon] = ACTIONS(303),
-    [sym__newline] = ACTIONS(303),
-    [sym__string_start] = ACTIONS(81),
-  },
-  [151] = {
-    [sym_named_expression] = STATE(900),
-    [sym_expression] = STATE(901),
-    [sym_primary_expression] = STATE(643),
-    [sym_not_operator] = STATE(900),
-    [sym_boolean_operator] = STATE(900),
-    [sym_binary_operator] = STATE(642),
-    [sym_unary_operator] = STATE(642),
-    [sym_comparison_operator] = STATE(900),
-    [sym_lambda] = STATE(900),
-    [sym_attribute] = STATE(642),
-    [sym_subscript] = STATE(642),
-    [sym_call] = STATE(642),
-    [sym_list] = STATE(642),
-    [sym_set] = STATE(642),
-    [sym_tuple] = STATE(642),
-    [sym_dictionary] = STATE(642),
-    [sym_list_comprehension] = STATE(642),
-    [sym_dictionary_comprehension] = STATE(642),
-    [sym_set_comprehension] = STATE(642),
-    [sym_generator_expression] = STATE(642),
-    [sym_parenthesized_expression] = STATE(642),
-    [sym_conditional_expression] = STATE(900),
-    [sym_concatenated_string] = STATE(642),
-    [sym_string] = STATE(600),
-    [sym_await] = STATE(900),
-    [sym_identifier] = ACTIONS(602),
-    [anon_sym_DOT] = ACTIONS(276),
-    [anon_sym_LPAREN] = ACTIONS(604),
-    [anon_sym_RPAREN] = ACTIONS(303),
-    [anon_sym_COMMA] = ACTIONS(303),
-    [anon_sym_STAR] = ACTIONS(276),
-    [anon_sym_print] = ACTIONS(606),
-    [anon_sym_GT_GT] = ACTIONS(303),
-    [anon_sym_COLON_EQ] = ACTIONS(608),
-    [anon_sym_if] = ACTIONS(276),
-    [anon_sym_async] = ACTIONS(606),
-    [anon_sym_for] = ACTIONS(276),
-    [anon_sym_in] = ACTIONS(276),
-    [anon_sym_match] = ACTIONS(606),
-    [anon_sym_PIPE] = ACTIONS(303),
-    [anon_sym_DASH] = ACTIONS(610),
-    [anon_sym_PLUS] = ACTIONS(610),
-    [anon_sym_LBRACK] = ACTIONS(612),
-    [anon_sym_LBRACE] = ACTIONS(295),
-    [anon_sym_STAR_STAR] = ACTIONS(303),
-    [anon_sym_EQ] = ACTIONS(620),
-    [anon_sym_exec] = ACTIONS(606),
-    [anon_sym_type] = ACTIONS(606),
-    [anon_sym_AT] = ACTIONS(303),
-    [anon_sym_not] = ACTIONS(614),
-    [anon_sym_and] = ACTIONS(276),
-    [anon_sym_or] = ACTIONS(276),
-    [anon_sym_SLASH] = ACTIONS(276),
-    [anon_sym_PERCENT] = ACTIONS(303),
-    [anon_sym_SLASH_SLASH] = ACTIONS(303),
-    [anon_sym_AMP] = ACTIONS(303),
-    [anon_sym_CARET] = ACTIONS(303),
-    [anon_sym_LT_LT] = ACTIONS(303),
-    [anon_sym_TILDE] = ACTIONS(610),
-    [anon_sym_LT] = ACTIONS(276),
-    [anon_sym_LT_EQ] = ACTIONS(303),
-    [anon_sym_EQ_EQ] = ACTIONS(303),
-    [anon_sym_BANG_EQ] = ACTIONS(303),
-    [anon_sym_GT_EQ] = ACTIONS(303),
-    [anon_sym_GT] = ACTIONS(276),
-    [anon_sym_LT_GT] = ACTIONS(303),
-    [anon_sym_is] = ACTIONS(276),
-    [anon_sym_lambda] = ACTIONS(616),
-    [sym_ellipsis] = ACTIONS(309),
-    [sym_integer] = ACTIONS(311),
-    [sym_float] = ACTIONS(309),
-    [anon_sym_await] = ACTIONS(618),
-    [sym_true] = ACTIONS(311),
-    [sym_false] = ACTIONS(311),
-    [sym_none] = ACTIONS(311),
-    [sym_comment] = ACTIONS(3),
-    [sym__string_start] = ACTIONS(315),
-  },
-  [152] = {
-    [sym_named_expression] = STATE(900),
-    [sym_expression] = STATE(901),
-    [sym_primary_expression] = STATE(643),
-    [sym_not_operator] = STATE(900),
-    [sym_boolean_operator] = STATE(900),
-    [sym_binary_operator] = STATE(642),
-    [sym_unary_operator] = STATE(642),
-    [sym_comparison_operator] = STATE(900),
-    [sym_lambda] = STATE(900),
-    [sym_attribute] = STATE(642),
-    [sym_subscript] = STATE(642),
-    [sym_call] = STATE(642),
-    [sym_list] = STATE(642),
-    [sym_set] = STATE(642),
-    [sym_tuple] = STATE(642),
-    [sym_dictionary] = STATE(642),
-    [sym_list_comprehension] = STATE(642),
-    [sym_dictionary_comprehension] = STATE(642),
-    [sym_set_comprehension] = STATE(642),
-    [sym_generator_expression] = STATE(642),
-    [sym_parenthesized_expression] = STATE(642),
-    [sym_conditional_expression] = STATE(900),
-    [sym_concatenated_string] = STATE(642),
-    [sym_string] = STATE(600),
-    [sym_await] = STATE(900),
-    [sym_identifier] = ACTIONS(602),
-    [anon_sym_DOT] = ACTIONS(276),
-    [anon_sym_LPAREN] = ACTIONS(604),
-    [anon_sym_RPAREN] = ACTIONS(280),
-    [anon_sym_COMMA] = ACTIONS(280),
-    [anon_sym_STAR] = ACTIONS(276),
-    [anon_sym_print] = ACTIONS(606),
-    [anon_sym_GT_GT] = ACTIONS(303),
-    [anon_sym_COLON_EQ] = ACTIONS(608),
-    [anon_sym_if] = ACTIONS(276),
-    [anon_sym_async] = ACTIONS(606),
-    [anon_sym_for] = ACTIONS(276),
-    [anon_sym_in] = ACTIONS(276),
-    [anon_sym_match] = ACTIONS(606),
-    [anon_sym_PIPE] = ACTIONS(303),
-    [anon_sym_DASH] = ACTIONS(610),
-    [anon_sym_PLUS] = ACTIONS(610),
-    [anon_sym_LBRACK] = ACTIONS(612),
-    [anon_sym_RBRACK] = ACTIONS(280),
-    [anon_sym_LBRACE] = ACTIONS(295),
-    [anon_sym_STAR_STAR] = ACTIONS(303),
-    [anon_sym_exec] = ACTIONS(606),
-    [anon_sym_type] = ACTIONS(606),
-    [anon_sym_AT] = ACTIONS(303),
-    [anon_sym_not] = ACTIONS(614),
-    [anon_sym_and] = ACTIONS(276),
-    [anon_sym_or] = ACTIONS(276),
-    [anon_sym_SLASH] = ACTIONS(276),
-    [anon_sym_PERCENT] = ACTIONS(303),
-    [anon_sym_SLASH_SLASH] = ACTIONS(303),
-    [anon_sym_AMP] = ACTIONS(303),
-    [anon_sym_CARET] = ACTIONS(303),
-    [anon_sym_LT_LT] = ACTIONS(303),
-    [anon_sym_TILDE] = ACTIONS(610),
-    [anon_sym_LT] = ACTIONS(276),
-    [anon_sym_LT_EQ] = ACTIONS(303),
-    [anon_sym_EQ_EQ] = ACTIONS(303),
-    [anon_sym_BANG_EQ] = ACTIONS(303),
-    [anon_sym_GT_EQ] = ACTIONS(303),
-    [anon_sym_GT] = ACTIONS(276),
-    [anon_sym_LT_GT] = ACTIONS(303),
-    [anon_sym_is] = ACTIONS(276),
-    [anon_sym_lambda] = ACTIONS(616),
-    [sym_ellipsis] = ACTIONS(309),
-    [sym_integer] = ACTIONS(311),
-    [sym_float] = ACTIONS(309),
-    [anon_sym_await] = ACTIONS(618),
-    [sym_true] = ACTIONS(311),
-    [sym_false] = ACTIONS(311),
-    [sym_none] = ACTIONS(311),
-    [sym_comment] = ACTIONS(3),
-    [sym__string_start] = ACTIONS(315),
-  },
-  [153] = {
-    [sym_named_expression] = STATE(1015),
-    [sym_expression] = STATE(1042),
-    [sym_primary_expression] = STATE(740),
-    [sym_not_operator] = STATE(1015),
-    [sym_boolean_operator] = STATE(1015),
-    [sym_binary_operator] = STATE(811),
-    [sym_unary_operator] = STATE(811),
-    [sym_comparison_operator] = STATE(1015),
-    [sym_lambda] = STATE(1015),
-    [sym_attribute] = STATE(811),
-    [sym_subscript] = STATE(811),
-    [sym_call] = STATE(811),
-    [sym_list] = STATE(811),
-    [sym_set] = STATE(811),
-    [sym_tuple] = STATE(811),
-    [sym_dictionary] = STATE(811),
-    [sym_list_comprehension] = STATE(811),
-    [sym_dictionary_comprehension] = STATE(811),
-    [sym_set_comprehension] = STATE(811),
-    [sym_generator_expression] = STATE(811),
-    [sym_parenthesized_expression] = STATE(811),
-    [sym_conditional_expression] = STATE(1015),
-    [sym_concatenated_string] = STATE(811),
-    [sym_string] = STATE(742),
-    [sym_await] = STATE(1015),
-    [sym_identifier] = ACTIONS(622),
-    [anon_sym_DOT] = ACTIONS(276),
-    [anon_sym_LPAREN] = ACTIONS(624),
-    [anon_sym_RPAREN] = ACTIONS(303),
-    [anon_sym_COMMA] = ACTIONS(303),
-    [anon_sym_as] = ACTIONS(276),
-    [anon_sym_STAR] = ACTIONS(276),
-    [anon_sym_print] = ACTIONS(626),
-    [anon_sym_GT_GT] = ACTIONS(303),
-    [anon_sym_COLON_EQ] = ACTIONS(628),
-    [anon_sym_if] = ACTIONS(276),
-    [anon_sym_COLON] = ACTIONS(276),
-    [anon_sym_async] = ACTIONS(626),
-    [anon_sym_in] = ACTIONS(276),
-    [anon_sym_match] = ACTIONS(626),
-    [anon_sym_PIPE] = ACTIONS(303),
-    [anon_sym_DASH] = ACTIONS(630),
-    [anon_sym_PLUS] = ACTIONS(630),
-    [anon_sym_LBRACK] = ACTIONS(632),
-    [anon_sym_LBRACE] = ACTIONS(634),
-    [anon_sym_STAR_STAR] = ACTIONS(303),
-    [anon_sym_exec] = ACTIONS(626),
-    [anon_sym_type] = ACTIONS(626),
-    [anon_sym_AT] = ACTIONS(303),
-    [anon_sym_not] = ACTIONS(636),
-    [anon_sym_and] = ACTIONS(276),
-    [anon_sym_or] = ACTIONS(276),
-    [anon_sym_SLASH] = ACTIONS(276),
-    [anon_sym_PERCENT] = ACTIONS(303),
-    [anon_sym_SLASH_SLASH] = ACTIONS(303),
-    [anon_sym_AMP] = ACTIONS(303),
-    [anon_sym_CARET] = ACTIONS(303),
-    [anon_sym_LT_LT] = ACTIONS(303),
-    [anon_sym_TILDE] = ACTIONS(630),
-    [anon_sym_LT] = ACTIONS(276),
-    [anon_sym_LT_EQ] = ACTIONS(303),
-    [anon_sym_EQ_EQ] = ACTIONS(303),
-    [anon_sym_BANG_EQ] = ACTIONS(303),
-    [anon_sym_GT_EQ] = ACTIONS(303),
-    [anon_sym_GT] = ACTIONS(276),
-    [anon_sym_LT_GT] = ACTIONS(303),
-    [anon_sym_is] = ACTIONS(276),
-    [anon_sym_lambda] = ACTIONS(638),
-    [sym_ellipsis] = ACTIONS(640),
-    [sym_integer] = ACTIONS(642),
-    [sym_float] = ACTIONS(640),
-    [anon_sym_await] = ACTIONS(644),
-    [sym_true] = ACTIONS(642),
-    [sym_false] = ACTIONS(642),
-    [sym_none] = ACTIONS(642),
-    [sym_comment] = ACTIONS(3),
-    [sym__string_start] = ACTIONS(646),
-  },
-  [154] = {
-    [sym_named_expression] = STATE(900),
-    [sym_expression] = STATE(901),
-    [sym_primary_expression] = STATE(630),
-    [sym_not_operator] = STATE(900),
-    [sym_boolean_operator] = STATE(900),
-    [sym_binary_operator] = STATE(642),
-    [sym_unary_operator] = STATE(642),
-    [sym_comparison_operator] = STATE(900),
-    [sym_lambda] = STATE(900),
-    [sym_attribute] = STATE(642),
-    [sym_subscript] = STATE(642),
-    [sym_call] = STATE(642),
-    [sym_list] = STATE(642),
-    [sym_set] = STATE(642),
-    [sym_tuple] = STATE(642),
-    [sym_dictionary] = STATE(642),
-    [sym_list_comprehension] = STATE(642),
-    [sym_dictionary_comprehension] = STATE(642),
-    [sym_set_comprehension] = STATE(642),
-    [sym_generator_expression] = STATE(642),
-    [sym_parenthesized_expression] = STATE(642),
-    [sym_conditional_expression] = STATE(900),
-    [sym_concatenated_string] = STATE(642),
-    [sym_string] = STATE(600),
-    [sym_await] = STATE(900),
-    [sym_identifier] = ACTIONS(274),
-    [anon_sym_DOT] = ACTIONS(276),
-    [anon_sym_LPAREN] = ACTIONS(278),
-    [anon_sym_RPAREN] = ACTIONS(303),
-    [anon_sym_COMMA] = ACTIONS(303),
-    [anon_sym_STAR] = ACTIONS(276),
-    [anon_sym_print] = ACTIONS(285),
-    [anon_sym_GT_GT] = ACTIONS(303),
-    [anon_sym_COLON_EQ] = ACTIONS(568),
-    [anon_sym_if] = ACTIONS(276),
-    [anon_sym_async] = ACTIONS(285),
-    [anon_sym_in] = ACTIONS(276),
-    [anon_sym_match] = ACTIONS(285),
-    [anon_sym_PIPE] = ACTIONS(303),
-    [anon_sym_DASH] = ACTIONS(301),
-    [anon_sym_PLUS] = ACTIONS(301),
-    [anon_sym_LBRACK] = ACTIONS(293),
-    [anon_sym_LBRACE] = ACTIONS(295),
-    [anon_sym_STAR_STAR] = ACTIONS(303),
-    [anon_sym_EQ] = ACTIONS(620),
-    [anon_sym_exec] = ACTIONS(285),
-    [anon_sym_type] = ACTIONS(285),
-    [anon_sym_AT] = ACTIONS(303),
-    [anon_sym_not] = ACTIONS(299),
-    [anon_sym_and] = ACTIONS(276),
-    [anon_sym_or] = ACTIONS(276),
-    [anon_sym_SLASH] = ACTIONS(276),
-    [anon_sym_PERCENT] = ACTIONS(303),
-    [anon_sym_SLASH_SLASH] = ACTIONS(303),
-    [anon_sym_AMP] = ACTIONS(303),
-    [anon_sym_CARET] = ACTIONS(303),
-    [anon_sym_LT_LT] = ACTIONS(303),
-    [anon_sym_TILDE] = ACTIONS(301),
-    [anon_sym_LT] = ACTIONS(276),
-    [anon_sym_LT_EQ] = ACTIONS(303),
-    [anon_sym_EQ_EQ] = ACTIONS(303),
-    [anon_sym_BANG_EQ] = ACTIONS(303),
-    [anon_sym_GT_EQ] = ACTIONS(303),
-    [anon_sym_GT] = ACTIONS(276),
-    [anon_sym_LT_GT] = ACTIONS(303),
-    [anon_sym_is] = ACTIONS(276),
-    [anon_sym_lambda] = ACTIONS(305),
-    [sym_ellipsis] = ACTIONS(309),
-    [sym_integer] = ACTIONS(311),
-    [sym_float] = ACTIONS(309),
-    [anon_sym_await] = ACTIONS(313),
-    [sym_true] = ACTIONS(311),
-    [sym_false] = ACTIONS(311),
-    [sym_none] = ACTIONS(311),
-    [sym_comment] = ACTIONS(3),
-    [sym__string_start] = ACTIONS(315),
+    [sym__string_start] = ACTIONS(299),
   },
 };
 
@@ -26193,30 +22741,30 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_await,
     ACTIONS(81), 1,
       sym__string_start,
-    STATE(684), 1,
+    STATE(707), 1,
       sym_primary_expression,
-    STATE(713), 1,
+    STATE(709), 1,
       sym_string,
-    STATE(889), 1,
+    STATE(871), 1,
       sym_pattern,
-    STATE(897), 1,
+    STATE(880), 1,
       sym_pattern_list,
-    STATE(1034), 1,
+    STATE(1029), 1,
       sym_expression,
     ACTIONS(75), 2,
       sym_ellipsis,
       sym_float,
-    STATE(431), 2,
+    STATE(422), 2,
       sym_attribute,
       sym_subscript,
-    STATE(1360), 2,
+    STATE(1321), 2,
       sym_list_splat,
       sym_dictionary_splat,
     ACTIONS(47), 3,
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
-    STATE(875), 3,
+    STATE(860), 3,
       sym_tuple_pattern,
       sym_list_pattern,
       sym_list_splat_pattern,
@@ -26225,27 +22773,26 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(317), 5,
+    ACTIONS(301), 5,
       anon_sym_print,
       anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(1369), 5,
+    STATE(1373), 5,
       sym_expression_list,
       sym_assignment,
       sym_augmented_assignment,
       sym__right_hand_side,
       sym_yield,
-    STATE(1009), 7,
+    STATE(985), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-      sym_await,
-    STATE(797), 13,
+    STATE(759), 14,
       sym_binary_operator,
       sym_unary_operator,
       sym_call,
@@ -26259,6 +22806,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_generator_expression,
       sym_parenthesized_expression,
       sym_concatenated_string,
+      sym_await,
   [118] = 27,
     ACTIONS(3), 1,
       sym_comment,
@@ -26284,30 +22832,30 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_await,
     ACTIONS(81), 1,
       sym__string_start,
-    STATE(684), 1,
+    STATE(707), 1,
       sym_primary_expression,
-    STATE(713), 1,
+    STATE(709), 1,
       sym_string,
-    STATE(889), 1,
+    STATE(871), 1,
       sym_pattern,
-    STATE(897), 1,
+    STATE(880), 1,
       sym_pattern_list,
-    STATE(1034), 1,
+    STATE(1029), 1,
       sym_expression,
     ACTIONS(75), 2,
       sym_ellipsis,
       sym_float,
-    STATE(431), 2,
+    STATE(422), 2,
       sym_attribute,
       sym_subscript,
-    STATE(1360), 2,
+    STATE(1321), 2,
       sym_list_splat,
       sym_dictionary_splat,
     ACTIONS(47), 3,
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
-    STATE(875), 3,
+    STATE(860), 3,
       sym_tuple_pattern,
       sym_list_pattern,
       sym_list_splat_pattern,
@@ -26316,27 +22864,26 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(317), 5,
+    ACTIONS(301), 5,
       anon_sym_print,
       anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(1391), 5,
+    STATE(1357), 5,
       sym_expression_list,
       sym_assignment,
       sym_augmented_assignment,
       sym__right_hand_side,
       sym_yield,
-    STATE(1009), 7,
+    STATE(985), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-      sym_await,
-    STATE(797), 13,
+    STATE(759), 14,
       sym_binary_operator,
       sym_unary_operator,
       sym_call,
@@ -26350,6 +22897,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_generator_expression,
       sym_parenthesized_expression,
       sym_concatenated_string,
+      sym_await,
   [236] = 27,
     ACTIONS(3), 1,
       sym_comment,
@@ -26375,30 +22923,30 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_await,
     ACTIONS(81), 1,
       sym__string_start,
-    STATE(684), 1,
+    STATE(707), 1,
       sym_primary_expression,
-    STATE(713), 1,
+    STATE(709), 1,
       sym_string,
-    STATE(889), 1,
+    STATE(871), 1,
       sym_pattern,
-    STATE(897), 1,
+    STATE(880), 1,
       sym_pattern_list,
-    STATE(1034), 1,
+    STATE(1029), 1,
       sym_expression,
     ACTIONS(75), 2,
       sym_ellipsis,
       sym_float,
-    STATE(431), 2,
+    STATE(422), 2,
       sym_attribute,
       sym_subscript,
-    STATE(1360), 2,
+    STATE(1321), 2,
       sym_list_splat,
       sym_dictionary_splat,
     ACTIONS(47), 3,
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
-    STATE(875), 3,
+    STATE(860), 3,
       sym_tuple_pattern,
       sym_list_pattern,
       sym_list_splat_pattern,
@@ -26407,27 +22955,26 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(317), 5,
+    ACTIONS(301), 5,
       anon_sym_print,
       anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(1386), 5,
+    STATE(1356), 5,
       sym_expression_list,
       sym_assignment,
       sym_augmented_assignment,
       sym__right_hand_side,
       sym_yield,
-    STATE(1009), 7,
+    STATE(985), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-      sym_await,
-    STATE(797), 13,
+    STATE(759), 14,
       sym_binary_operator,
       sym_unary_operator,
       sym_call,
@@ -26441,61 +22988,69 @@ static const uint16_t ts_small_parse_table[] = {
       sym_generator_expression,
       sym_parenthesized_expression,
       sym_concatenated_string,
+      sym_await,
   [354] = 24,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(53), 1,
       anon_sym_STAR_STAR,
-    ACTIONS(274), 1,
+    ACTIONS(258), 1,
       sym_identifier,
-    ACTIONS(278), 1,
+    ACTIONS(262), 1,
       anon_sym_LPAREN,
-    ACTIONS(283), 1,
+    ACTIONS(267), 1,
       anon_sym_STAR,
-    ACTIONS(293), 1,
+    ACTIONS(277), 1,
       anon_sym_LBRACK,
-    ACTIONS(295), 1,
+    ACTIONS(279), 1,
       anon_sym_LBRACE,
-    ACTIONS(299), 1,
+    ACTIONS(283), 1,
       anon_sym_not,
-    ACTIONS(305), 1,
+    ACTIONS(289), 1,
       anon_sym_lambda,
-    ACTIONS(313), 1,
+    ACTIONS(297), 1,
       anon_sym_await,
-    ACTIONS(315), 1,
+    ACTIONS(299), 1,
       sym__string_start,
-    ACTIONS(648), 1,
+    ACTIONS(610), 1,
       anon_sym_from,
-    STATE(600), 1,
+    STATE(586), 1,
       sym_string,
-    STATE(630), 1,
+    STATE(616), 1,
       sym_primary_expression,
-    STATE(929), 1,
+    STATE(891), 1,
       sym_expression,
-    STATE(1041), 1,
+    STATE(1000), 1,
       sym_expression_list,
-    ACTIONS(309), 2,
+    ACTIONS(293), 2,
       sym_ellipsis,
       sym_float,
-    STATE(1366), 2,
+    STATE(1367), 2,
       sym_list_splat,
       sym_dictionary_splat,
-    ACTIONS(301), 3,
+    ACTIONS(285), 3,
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
-    ACTIONS(311), 4,
+    ACTIONS(295), 4,
       sym_integer,
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(285), 5,
+    ACTIONS(269), 5,
       anon_sym_print,
       anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    ACTIONS(650), 7,
+    STATE(883), 6,
+      sym_named_expression,
+      sym_not_operator,
+      sym_boolean_operator,
+      sym_comparison_operator,
+      sym_lambda,
+      sym_conditional_expression,
+    ACTIONS(612), 7,
       anon_sym_RPAREN,
       anon_sym_COMMA,
       anon_sym_COLON,
@@ -26503,15 +23058,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_RBRACE,
       anon_sym_EQ,
       sym_type_conversion,
-    STATE(900), 7,
-      sym_named_expression,
-      sym_not_operator,
-      sym_boolean_operator,
-      sym_comparison_operator,
-      sym_lambda,
-      sym_conditional_expression,
-      sym_await,
-    STATE(642), 15,
+    STATE(605), 16,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -26527,694 +23074,83 @@ static const uint16_t ts_small_parse_table[] = {
       sym_generator_expression,
       sym_parenthesized_expression,
       sym_concatenated_string,
+      sym_await,
   [464] = 27,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(295), 1,
+    ACTIONS(279), 1,
       anon_sym_LBRACE,
-    ACTIONS(315), 1,
+    ACTIONS(299), 1,
       sym__string_start,
     ACTIONS(614), 1,
-      anon_sym_not,
-    ACTIONS(616), 1,
-      anon_sym_lambda,
-    ACTIONS(652), 1,
       sym_identifier,
-    ACTIONS(654), 1,
+    ACTIONS(616), 1,
       anon_sym_LPAREN,
-    ACTIONS(656), 1,
+    ACTIONS(618), 1,
       anon_sym_STAR,
-    ACTIONS(660), 1,
+    ACTIONS(622), 1,
       anon_sym_LBRACK,
-    ACTIONS(662), 1,
+    ACTIONS(624), 1,
       anon_sym_RBRACK,
-    ACTIONS(664), 1,
-      anon_sym_yield,
-    ACTIONS(666), 1,
-      anon_sym_await,
-    STATE(600), 1,
-      sym_string,
-    STATE(643), 1,
-      sym_primary_expression,
-    STATE(932), 1,
-      sym_expression,
-    STATE(1146), 1,
-      sym_pattern,
-    STATE(1497), 1,
-      sym__patterns,
-    STATE(1503), 1,
-      sym__collection_elements,
-    ACTIONS(309), 2,
-      sym_ellipsis,
-      sym_float,
-    STATE(806), 2,
-      sym_attribute,
-      sym_subscript,
-    ACTIONS(610), 3,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_TILDE,
-    STATE(875), 3,
-      sym_tuple_pattern,
-      sym_list_pattern,
-      sym_list_splat_pattern,
-    STATE(1100), 3,
-      sym_list_splat,
-      sym_parenthesized_list_splat,
-      sym_yield,
-    ACTIONS(311), 4,
-      sym_integer,
-      sym_true,
-      sym_false,
-      sym_none,
-    ACTIONS(658), 5,
-      anon_sym_print,
-      anon_sym_async,
-      anon_sym_match,
-      anon_sym_exec,
-      anon_sym_type,
-    STATE(900), 7,
-      sym_named_expression,
-      sym_not_operator,
-      sym_boolean_operator,
-      sym_comparison_operator,
-      sym_lambda,
-      sym_conditional_expression,
-      sym_await,
-    STATE(642), 13,
-      sym_binary_operator,
-      sym_unary_operator,
-      sym_call,
-      sym_list,
-      sym_set,
-      sym_tuple,
-      sym_dictionary,
-      sym_list_comprehension,
-      sym_dictionary_comprehension,
-      sym_set_comprehension,
-      sym_generator_expression,
-      sym_parenthesized_expression,
-      sym_concatenated_string,
-  [579] = 27,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(295), 1,
-      anon_sym_LBRACE,
-    ACTIONS(315), 1,
-      sym__string_start,
-    ACTIONS(614), 1,
+    ACTIONS(626), 1,
       anon_sym_not,
-    ACTIONS(616), 1,
+    ACTIONS(628), 1,
       anon_sym_lambda,
-    ACTIONS(652), 1,
-      sym_identifier,
-    ACTIONS(654), 1,
-      anon_sym_LPAREN,
-    ACTIONS(656), 1,
-      anon_sym_STAR,
-    ACTIONS(660), 1,
-      anon_sym_LBRACK,
-    ACTIONS(664), 1,
+    ACTIONS(630), 1,
       anon_sym_yield,
-    ACTIONS(666), 1,
+    ACTIONS(632), 1,
       anon_sym_await,
-    ACTIONS(668), 1,
-      anon_sym_RBRACK,
-    STATE(600), 1,
+    STATE(586), 1,
       sym_string,
-    STATE(643), 1,
-      sym_primary_expression,
-    STATE(941), 1,
-      sym_expression,
-    STATE(1146), 1,
-      sym_pattern,
-    STATE(1467), 1,
-      sym__collection_elements,
-    STATE(1497), 1,
-      sym__patterns,
-    ACTIONS(309), 2,
-      sym_ellipsis,
-      sym_float,
-    STATE(806), 2,
-      sym_attribute,
-      sym_subscript,
-    ACTIONS(610), 3,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_TILDE,
-    STATE(875), 3,
-      sym_tuple_pattern,
-      sym_list_pattern,
-      sym_list_splat_pattern,
-    STATE(1100), 3,
-      sym_list_splat,
-      sym_parenthesized_list_splat,
-      sym_yield,
-    ACTIONS(311), 4,
-      sym_integer,
-      sym_true,
-      sym_false,
-      sym_none,
-    ACTIONS(658), 5,
-      anon_sym_print,
-      anon_sym_async,
-      anon_sym_match,
-      anon_sym_exec,
-      anon_sym_type,
-    STATE(900), 7,
-      sym_named_expression,
-      sym_not_operator,
-      sym_boolean_operator,
-      sym_comparison_operator,
-      sym_lambda,
-      sym_conditional_expression,
-      sym_await,
-    STATE(642), 13,
-      sym_binary_operator,
-      sym_unary_operator,
-      sym_call,
-      sym_list,
-      sym_set,
-      sym_tuple,
-      sym_dictionary,
-      sym_list_comprehension,
-      sym_dictionary_comprehension,
-      sym_set_comprehension,
-      sym_generator_expression,
-      sym_parenthesized_expression,
-      sym_concatenated_string,
-  [694] = 27,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(295), 1,
-      anon_sym_LBRACE,
-    ACTIONS(315), 1,
-      sym__string_start,
-    ACTIONS(614), 1,
-      anon_sym_not,
-    ACTIONS(616), 1,
-      anon_sym_lambda,
-    ACTIONS(652), 1,
-      sym_identifier,
-    ACTIONS(654), 1,
-      anon_sym_LPAREN,
-    ACTIONS(656), 1,
-      anon_sym_STAR,
-    ACTIONS(660), 1,
-      anon_sym_LBRACK,
-    ACTIONS(664), 1,
-      anon_sym_yield,
-    ACTIONS(666), 1,
-      anon_sym_await,
-    ACTIONS(670), 1,
-      anon_sym_RBRACK,
-    STATE(600), 1,
-      sym_string,
-    STATE(643), 1,
-      sym_primary_expression,
-    STATE(941), 1,
-      sym_expression,
-    STATE(1146), 1,
-      sym_pattern,
-    STATE(1467), 1,
-      sym__collection_elements,
-    STATE(1497), 1,
-      sym__patterns,
-    ACTIONS(309), 2,
-      sym_ellipsis,
-      sym_float,
-    STATE(806), 2,
-      sym_attribute,
-      sym_subscript,
-    ACTIONS(610), 3,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_TILDE,
-    STATE(875), 3,
-      sym_tuple_pattern,
-      sym_list_pattern,
-      sym_list_splat_pattern,
-    STATE(1100), 3,
-      sym_list_splat,
-      sym_parenthesized_list_splat,
-      sym_yield,
-    ACTIONS(311), 4,
-      sym_integer,
-      sym_true,
-      sym_false,
-      sym_none,
-    ACTIONS(658), 5,
-      anon_sym_print,
-      anon_sym_async,
-      anon_sym_match,
-      anon_sym_exec,
-      anon_sym_type,
-    STATE(900), 7,
-      sym_named_expression,
-      sym_not_operator,
-      sym_boolean_operator,
-      sym_comparison_operator,
-      sym_lambda,
-      sym_conditional_expression,
-      sym_await,
-    STATE(642), 13,
-      sym_binary_operator,
-      sym_unary_operator,
-      sym_call,
-      sym_list,
-      sym_set,
-      sym_tuple,
-      sym_dictionary,
-      sym_list_comprehension,
-      sym_dictionary_comprehension,
-      sym_set_comprehension,
-      sym_generator_expression,
-      sym_parenthesized_expression,
-      sym_concatenated_string,
-  [809] = 28,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(295), 1,
-      anon_sym_LBRACE,
-    ACTIONS(315), 1,
-      sym__string_start,
-    ACTIONS(614), 1,
-      anon_sym_not,
-    ACTIONS(616), 1,
-      anon_sym_lambda,
-    ACTIONS(652), 1,
-      sym_identifier,
-    ACTIONS(654), 1,
-      anon_sym_LPAREN,
-    ACTIONS(656), 1,
-      anon_sym_STAR,
-    ACTIONS(660), 1,
-      anon_sym_LBRACK,
-    ACTIONS(664), 1,
-      anon_sym_yield,
-    ACTIONS(666), 1,
-      anon_sym_await,
-    ACTIONS(672), 1,
-      anon_sym_RPAREN,
-    STATE(600), 1,
-      sym_string,
-    STATE(643), 1,
+    STATE(590), 1,
       sym_primary_expression,
     STATE(930), 1,
       sym_expression,
-    STATE(1146), 1,
+    STATE(1134), 1,
       sym_pattern,
-    STATE(1219), 1,
-      sym_yield,
-    STATE(1434), 1,
+    STATE(1402), 1,
       sym__patterns,
-    STATE(1484), 1,
+    STATE(1469), 1,
       sym__collection_elements,
-    ACTIONS(309), 2,
+    ACTIONS(293), 2,
       sym_ellipsis,
       sym_float,
-    STATE(806), 2,
+    STATE(765), 2,
       sym_attribute,
       sym_subscript,
-    STATE(1100), 2,
-      sym_list_splat,
-      sym_parenthesized_list_splat,
-    ACTIONS(610), 3,
+    ACTIONS(582), 3,
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
-    STATE(875), 3,
+    STATE(860), 3,
       sym_tuple_pattern,
       sym_list_pattern,
       sym_list_splat_pattern,
-    ACTIONS(311), 4,
-      sym_integer,
-      sym_true,
-      sym_false,
-      sym_none,
-    ACTIONS(658), 5,
-      anon_sym_print,
-      anon_sym_async,
-      anon_sym_match,
-      anon_sym_exec,
-      anon_sym_type,
-    STATE(900), 7,
-      sym_named_expression,
-      sym_not_operator,
-      sym_boolean_operator,
-      sym_comparison_operator,
-      sym_lambda,
-      sym_conditional_expression,
-      sym_await,
-    STATE(642), 13,
-      sym_binary_operator,
-      sym_unary_operator,
-      sym_call,
-      sym_list,
-      sym_set,
-      sym_tuple,
-      sym_dictionary,
-      sym_list_comprehension,
-      sym_dictionary_comprehension,
-      sym_set_comprehension,
-      sym_generator_expression,
-      sym_parenthesized_expression,
-      sym_concatenated_string,
-  [926] = 29,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(295), 1,
-      anon_sym_LBRACE,
-    ACTIONS(315), 1,
-      sym__string_start,
-    ACTIONS(614), 1,
-      anon_sym_not,
-    ACTIONS(616), 1,
-      anon_sym_lambda,
-    ACTIONS(652), 1,
-      sym_identifier,
-    ACTIONS(654), 1,
-      anon_sym_LPAREN,
-    ACTIONS(656), 1,
-      anon_sym_STAR,
-    ACTIONS(660), 1,
-      anon_sym_LBRACK,
-    ACTIONS(664), 1,
-      anon_sym_yield,
-    ACTIONS(666), 1,
-      anon_sym_await,
-    ACTIONS(674), 1,
-      anon_sym_RPAREN,
-    STATE(600), 1,
-      sym_string,
-    STATE(643), 1,
-      sym_primary_expression,
-    STATE(930), 1,
-      sym_expression,
-    STATE(1146), 1,
-      sym_pattern,
-    STATE(1219), 1,
-      sym_yield,
-    STATE(1301), 1,
-      sym_parenthesized_list_splat,
-    STATE(1303), 1,
-      sym_list_splat,
-    STATE(1434), 1,
-      sym__patterns,
-    STATE(1484), 1,
-      sym__collection_elements,
-    ACTIONS(309), 2,
-      sym_ellipsis,
-      sym_float,
-    STATE(806), 2,
-      sym_attribute,
-      sym_subscript,
-    ACTIONS(610), 3,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_TILDE,
-    STATE(875), 3,
-      sym_tuple_pattern,
-      sym_list_pattern,
-      sym_list_splat_pattern,
-    ACTIONS(311), 4,
-      sym_integer,
-      sym_true,
-      sym_false,
-      sym_none,
-    ACTIONS(658), 5,
-      anon_sym_print,
-      anon_sym_async,
-      anon_sym_match,
-      anon_sym_exec,
-      anon_sym_type,
-    STATE(900), 7,
-      sym_named_expression,
-      sym_not_operator,
-      sym_boolean_operator,
-      sym_comparison_operator,
-      sym_lambda,
-      sym_conditional_expression,
-      sym_await,
-    STATE(642), 13,
-      sym_binary_operator,
-      sym_unary_operator,
-      sym_call,
-      sym_list,
-      sym_set,
-      sym_tuple,
-      sym_dictionary,
-      sym_list_comprehension,
-      sym_dictionary_comprehension,
-      sym_set_comprehension,
-      sym_generator_expression,
-      sym_parenthesized_expression,
-      sym_concatenated_string,
-  [1045] = 28,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(295), 1,
-      anon_sym_LBRACE,
-    ACTIONS(315), 1,
-      sym__string_start,
-    ACTIONS(614), 1,
-      anon_sym_not,
-    ACTIONS(616), 1,
-      anon_sym_lambda,
-    ACTIONS(652), 1,
-      sym_identifier,
-    ACTIONS(654), 1,
-      anon_sym_LPAREN,
-    ACTIONS(656), 1,
-      anon_sym_STAR,
-    ACTIONS(660), 1,
-      anon_sym_LBRACK,
-    ACTIONS(664), 1,
-      anon_sym_yield,
-    ACTIONS(666), 1,
-      anon_sym_await,
-    ACTIONS(676), 1,
-      anon_sym_RPAREN,
-    STATE(600), 1,
-      sym_string,
-    STATE(643), 1,
-      sym_primary_expression,
-    STATE(931), 1,
-      sym_expression,
-    STATE(1146), 1,
-      sym_pattern,
-    STATE(1251), 1,
-      sym_yield,
-    STATE(1431), 1,
-      sym__collection_elements,
-    STATE(1434), 1,
-      sym__patterns,
-    ACTIONS(309), 2,
-      sym_ellipsis,
-      sym_float,
-    STATE(806), 2,
-      sym_attribute,
-      sym_subscript,
-    STATE(1100), 2,
-      sym_list_splat,
-      sym_parenthesized_list_splat,
-    ACTIONS(610), 3,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_TILDE,
-    STATE(875), 3,
-      sym_tuple_pattern,
-      sym_list_pattern,
-      sym_list_splat_pattern,
-    ACTIONS(311), 4,
-      sym_integer,
-      sym_true,
-      sym_false,
-      sym_none,
-    ACTIONS(658), 5,
-      anon_sym_print,
-      anon_sym_async,
-      anon_sym_match,
-      anon_sym_exec,
-      anon_sym_type,
-    STATE(900), 7,
-      sym_named_expression,
-      sym_not_operator,
-      sym_boolean_operator,
-      sym_comparison_operator,
-      sym_lambda,
-      sym_conditional_expression,
-      sym_await,
-    STATE(642), 13,
-      sym_binary_operator,
-      sym_unary_operator,
-      sym_call,
-      sym_list,
-      sym_set,
-      sym_tuple,
-      sym_dictionary,
-      sym_list_comprehension,
-      sym_dictionary_comprehension,
-      sym_set_comprehension,
-      sym_generator_expression,
-      sym_parenthesized_expression,
-      sym_concatenated_string,
-  [1162] = 20,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(295), 1,
-      anon_sym_LBRACE,
-    ACTIONS(301), 1,
-      anon_sym_TILDE,
-    ACTIONS(315), 1,
-      sym__string_start,
-    ACTIONS(678), 1,
-      sym_identifier,
-    ACTIONS(680), 1,
-      anon_sym_LPAREN,
-    ACTIONS(682), 1,
-      anon_sym_STAR,
-    ACTIONS(688), 1,
-      anon_sym_in,
-    ACTIONS(690), 1,
-      anon_sym_LBRACK,
-    STATE(600), 1,
-      sym_string,
-    STATE(876), 1,
-      sym_pattern,
-    STATE(882), 1,
-      sym_primary_expression,
-    ACTIONS(291), 2,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-    ACTIONS(309), 2,
-      sym_ellipsis,
-      sym_float,
-    STATE(770), 2,
-      sym_attribute,
-      sym_subscript,
-    STATE(875), 3,
-      sym_tuple_pattern,
-      sym_list_pattern,
-      sym_list_splat_pattern,
-    ACTIONS(311), 4,
-      sym_integer,
-      sym_true,
-      sym_false,
-      sym_none,
-    ACTIONS(684), 6,
-      anon_sym_print,
-      anon_sym_async,
-      anon_sym_match,
-      anon_sym_exec,
-      anon_sym_type,
-      anon_sym_await,
-    STATE(642), 13,
-      sym_binary_operator,
-      sym_unary_operator,
-      sym_call,
-      sym_list,
-      sym_set,
-      sym_tuple,
-      sym_dictionary,
-      sym_list_comprehension,
-      sym_dictionary_comprehension,
-      sym_set_comprehension,
-      sym_generator_expression,
-      sym_parenthesized_expression,
-      sym_concatenated_string,
-    ACTIONS(686), 15,
-      anon_sym_COLON,
-      anon_sym_EQ,
-      anon_sym_PLUS_EQ,
-      anon_sym_DASH_EQ,
-      anon_sym_STAR_EQ,
-      anon_sym_SLASH_EQ,
-      anon_sym_AT_EQ,
-      anon_sym_SLASH_SLASH_EQ,
-      anon_sym_PERCENT_EQ,
-      anon_sym_STAR_STAR_EQ,
-      anon_sym_GT_GT_EQ,
-      anon_sym_LT_LT_EQ,
-      anon_sym_AMP_EQ,
-      anon_sym_CARET_EQ,
-      anon_sym_PIPE_EQ,
-  [1262] = 27,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(53), 1,
-      anon_sym_STAR_STAR,
-    ACTIONS(283), 1,
-      anon_sym_STAR,
-    ACTIONS(295), 1,
-      anon_sym_LBRACE,
-    ACTIONS(315), 1,
-      sym__string_start,
-    ACTIONS(602), 1,
-      sym_identifier,
-    ACTIONS(612), 1,
-      anon_sym_LBRACK,
-    ACTIONS(614), 1,
-      anon_sym_not,
-    ACTIONS(616), 1,
-      anon_sym_lambda,
-    ACTIONS(618), 1,
-      anon_sym_await,
-    ACTIONS(664), 1,
-      anon_sym_yield,
-    ACTIONS(692), 1,
-      anon_sym_LPAREN,
-    ACTIONS(694), 1,
-      anon_sym_COMMA,
-    ACTIONS(696), 1,
-      anon_sym_RBRACE,
-    STATE(600), 1,
-      sym_string,
-    STATE(643), 1,
-      sym_primary_expression,
-    STATE(907), 1,
-      sym_expression,
-    STATE(1052), 1,
-      sym_pair,
-    STATE(1327), 1,
-      sym_dictionary_splat,
-    STATE(1513), 1,
-      sym__collection_elements,
-    ACTIONS(309), 2,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(610), 3,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_TILDE,
     STATE(1100), 3,
       sym_list_splat,
       sym_parenthesized_list_splat,
       sym_yield,
-    ACTIONS(311), 4,
+    ACTIONS(295), 4,
       sym_integer,
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(606), 5,
+    ACTIONS(620), 5,
       anon_sym_print,
       anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(900), 7,
+    STATE(883), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-      sym_await,
-    STATE(642), 15,
+    STATE(605), 14,
       sym_binary_operator,
       sym_unary_operator,
-      sym_attribute,
-      sym_subscript,
       sym_call,
       sym_list,
       sym_set,
@@ -27226,477 +23162,83 @@ static const uint16_t ts_small_parse_table[] = {
       sym_generator_expression,
       sym_parenthesized_expression,
       sym_concatenated_string,
-  [1376] = 22,
+      sym_await,
+  [579] = 29,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(53), 1,
-      anon_sym_STAR_STAR,
-    ACTIONS(274), 1,
-      sym_identifier,
-    ACTIONS(278), 1,
-      anon_sym_LPAREN,
-    ACTIONS(283), 1,
-      anon_sym_STAR,
-    ACTIONS(293), 1,
-      anon_sym_LBRACK,
-    ACTIONS(295), 1,
+    ACTIONS(279), 1,
       anon_sym_LBRACE,
     ACTIONS(299), 1,
-      anon_sym_not,
-    ACTIONS(305), 1,
-      anon_sym_lambda,
-    ACTIONS(313), 1,
-      anon_sym_await,
-    ACTIONS(315), 1,
       sym__string_start,
-    STATE(600), 1,
-      sym_string,
-    STATE(630), 1,
-      sym_primary_expression,
-    STATE(933), 1,
-      sym_expression,
-    ACTIONS(309), 2,
-      sym_ellipsis,
-      sym_float,
-    STATE(1023), 2,
-      sym_list_splat,
-      sym_dictionary_splat,
-    ACTIONS(301), 3,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_TILDE,
-    ACTIONS(311), 4,
-      sym_integer,
-      sym_true,
-      sym_false,
-      sym_none,
-    ACTIONS(285), 5,
-      anon_sym_print,
-      anon_sym_async,
-      anon_sym_match,
-      anon_sym_exec,
-      anon_sym_type,
-    ACTIONS(698), 7,
-      anon_sym_RPAREN,
-      anon_sym_COMMA,
-      anon_sym_COLON,
-      anon_sym_RBRACK,
-      anon_sym_RBRACE,
-      anon_sym_EQ,
-      sym_type_conversion,
-    STATE(900), 7,
-      sym_named_expression,
-      sym_not_operator,
-      sym_boolean_operator,
-      sym_comparison_operator,
-      sym_lambda,
-      sym_conditional_expression,
-      sym_await,
-    STATE(642), 15,
-      sym_binary_operator,
-      sym_unary_operator,
-      sym_attribute,
-      sym_subscript,
-      sym_call,
-      sym_list,
-      sym_set,
-      sym_tuple,
-      sym_dictionary,
-      sym_list_comprehension,
-      sym_dictionary_comprehension,
-      sym_set_comprehension,
-      sym_generator_expression,
-      sym_parenthesized_expression,
-      sym_concatenated_string,
-  [1480] = 22,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(53), 1,
-      anon_sym_STAR_STAR,
-    ACTIONS(274), 1,
-      sym_identifier,
-    ACTIONS(278), 1,
-      anon_sym_LPAREN,
-    ACTIONS(283), 1,
-      anon_sym_STAR,
-    ACTIONS(293), 1,
-      anon_sym_LBRACK,
-    ACTIONS(295), 1,
-      anon_sym_LBRACE,
-    ACTIONS(299), 1,
-      anon_sym_not,
-    ACTIONS(305), 1,
-      anon_sym_lambda,
-    ACTIONS(313), 1,
-      anon_sym_await,
-    ACTIONS(315), 1,
-      sym__string_start,
-    STATE(600), 1,
-      sym_string,
-    STATE(630), 1,
-      sym_primary_expression,
-    STATE(933), 1,
-      sym_expression,
-    ACTIONS(309), 2,
-      sym_ellipsis,
-      sym_float,
-    STATE(1023), 2,
-      sym_list_splat,
-      sym_dictionary_splat,
-    ACTIONS(301), 3,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_TILDE,
-    ACTIONS(311), 4,
-      sym_integer,
-      sym_true,
-      sym_false,
-      sym_none,
-    ACTIONS(285), 5,
-      anon_sym_print,
-      anon_sym_async,
-      anon_sym_match,
-      anon_sym_exec,
-      anon_sym_type,
-    ACTIONS(700), 7,
-      anon_sym_RPAREN,
-      anon_sym_COMMA,
-      anon_sym_COLON,
-      anon_sym_RBRACK,
-      anon_sym_RBRACE,
-      anon_sym_EQ,
-      sym_type_conversion,
-    STATE(900), 7,
-      sym_named_expression,
-      sym_not_operator,
-      sym_boolean_operator,
-      sym_comparison_operator,
-      sym_lambda,
-      sym_conditional_expression,
-      sym_await,
-    STATE(642), 15,
-      sym_binary_operator,
-      sym_unary_operator,
-      sym_attribute,
-      sym_subscript,
-      sym_call,
-      sym_list,
-      sym_set,
-      sym_tuple,
-      sym_dictionary,
-      sym_list_comprehension,
-      sym_dictionary_comprehension,
-      sym_set_comprehension,
-      sym_generator_expression,
-      sym_parenthesized_expression,
-      sym_concatenated_string,
-  [1584] = 27,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(53), 1,
-      anon_sym_STAR_STAR,
-    ACTIONS(283), 1,
-      anon_sym_STAR,
-    ACTIONS(295), 1,
-      anon_sym_LBRACE,
-    ACTIONS(315), 1,
-      sym__string_start,
-    ACTIONS(602), 1,
-      sym_identifier,
-    ACTIONS(612), 1,
-      anon_sym_LBRACK,
     ACTIONS(614), 1,
-      anon_sym_not,
-    ACTIONS(616), 1,
-      anon_sym_lambda,
-    ACTIONS(618), 1,
-      anon_sym_await,
-    ACTIONS(664), 1,
-      anon_sym_yield,
-    ACTIONS(692), 1,
-      anon_sym_LPAREN,
-    ACTIONS(702), 1,
-      anon_sym_COMMA,
-    ACTIONS(704), 1,
-      anon_sym_RBRACE,
-    STATE(600), 1,
-      sym_string,
-    STATE(643), 1,
-      sym_primary_expression,
-    STATE(911), 1,
-      sym_expression,
-    STATE(1038), 1,
-      sym_pair,
-    STATE(1225), 1,
-      sym_dictionary_splat,
-    STATE(1460), 1,
-      sym__collection_elements,
-    ACTIONS(309), 2,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(610), 3,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_TILDE,
-    STATE(1100), 3,
-      sym_list_splat,
-      sym_parenthesized_list_splat,
-      sym_yield,
-    ACTIONS(311), 4,
-      sym_integer,
-      sym_true,
-      sym_false,
-      sym_none,
-    ACTIONS(606), 5,
-      anon_sym_print,
-      anon_sym_async,
-      anon_sym_match,
-      anon_sym_exec,
-      anon_sym_type,
-    STATE(900), 7,
-      sym_named_expression,
-      sym_not_operator,
-      sym_boolean_operator,
-      sym_comparison_operator,
-      sym_lambda,
-      sym_conditional_expression,
-      sym_await,
-    STATE(642), 15,
-      sym_binary_operator,
-      sym_unary_operator,
-      sym_attribute,
-      sym_subscript,
-      sym_call,
-      sym_list,
-      sym_set,
-      sym_tuple,
-      sym_dictionary,
-      sym_list_comprehension,
-      sym_dictionary_comprehension,
-      sym_set_comprehension,
-      sym_generator_expression,
-      sym_parenthesized_expression,
-      sym_concatenated_string,
-  [1698] = 27,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(53), 1,
-      anon_sym_STAR_STAR,
-    ACTIONS(283), 1,
-      anon_sym_STAR,
-    ACTIONS(295), 1,
-      anon_sym_LBRACE,
-    ACTIONS(315), 1,
-      sym__string_start,
-    ACTIONS(602), 1,
       sym_identifier,
-    ACTIONS(612), 1,
-      anon_sym_LBRACK,
-    ACTIONS(614), 1,
-      anon_sym_not,
     ACTIONS(616), 1,
-      anon_sym_lambda,
-    ACTIONS(618), 1,
-      anon_sym_await,
-    ACTIONS(664), 1,
-      anon_sym_yield,
-    ACTIONS(692), 1,
       anon_sym_LPAREN,
-    ACTIONS(706), 1,
-      anon_sym_COMMA,
-    ACTIONS(708), 1,
-      anon_sym_RBRACE,
-    STATE(600), 1,
+    ACTIONS(618), 1,
+      anon_sym_STAR,
+    ACTIONS(622), 1,
+      anon_sym_LBRACK,
+    ACTIONS(626), 1,
+      anon_sym_not,
+    ACTIONS(628), 1,
+      anon_sym_lambda,
+    ACTIONS(630), 1,
+      anon_sym_yield,
+    ACTIONS(632), 1,
+      anon_sym_await,
+    ACTIONS(634), 1,
+      anon_sym_RPAREN,
+    STATE(586), 1,
       sym_string,
-    STATE(643), 1,
+    STATE(590), 1,
       sym_primary_expression,
     STATE(918), 1,
       sym_expression,
-    STATE(1049), 1,
-      sym_pair,
-    STATE(1311), 1,
-      sym_dictionary_splat,
-    STATE(1461), 1,
-      sym__collection_elements,
-    ACTIONS(309), 2,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(610), 3,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_TILDE,
-    STATE(1100), 3,
-      sym_list_splat,
-      sym_parenthesized_list_splat,
-      sym_yield,
-    ACTIONS(311), 4,
-      sym_integer,
-      sym_true,
-      sym_false,
-      sym_none,
-    ACTIONS(606), 5,
-      anon_sym_print,
-      anon_sym_async,
-      anon_sym_match,
-      anon_sym_exec,
-      anon_sym_type,
-    STATE(900), 7,
-      sym_named_expression,
-      sym_not_operator,
-      sym_boolean_operator,
-      sym_comparison_operator,
-      sym_lambda,
-      sym_conditional_expression,
-      sym_await,
-    STATE(642), 15,
-      sym_binary_operator,
-      sym_unary_operator,
-      sym_attribute,
-      sym_subscript,
-      sym_call,
-      sym_list,
-      sym_set,
-      sym_tuple,
-      sym_dictionary,
-      sym_list_comprehension,
-      sym_dictionary_comprehension,
-      sym_set_comprehension,
-      sym_generator_expression,
-      sym_parenthesized_expression,
-      sym_concatenated_string,
-  [1812] = 22,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(53), 1,
-      anon_sym_STAR_STAR,
-    ACTIONS(274), 1,
-      sym_identifier,
-    ACTIONS(278), 1,
-      anon_sym_LPAREN,
-    ACTIONS(283), 1,
-      anon_sym_STAR,
-    ACTIONS(293), 1,
-      anon_sym_LBRACK,
-    ACTIONS(295), 1,
-      anon_sym_LBRACE,
-    ACTIONS(299), 1,
-      anon_sym_not,
-    ACTIONS(305), 1,
-      anon_sym_lambda,
-    ACTIONS(313), 1,
-      anon_sym_await,
-    ACTIONS(315), 1,
-      sym__string_start,
-    STATE(600), 1,
-      sym_string,
-    STATE(630), 1,
-      sym_primary_expression,
-    STATE(933), 1,
-      sym_expression,
-    ACTIONS(309), 2,
-      sym_ellipsis,
-      sym_float,
-    STATE(1023), 2,
-      sym_list_splat,
-      sym_dictionary_splat,
-    ACTIONS(301), 3,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_TILDE,
-    ACTIONS(311), 4,
-      sym_integer,
-      sym_true,
-      sym_false,
-      sym_none,
-    ACTIONS(285), 5,
-      anon_sym_print,
-      anon_sym_async,
-      anon_sym_match,
-      anon_sym_exec,
-      anon_sym_type,
-    ACTIONS(700), 7,
-      anon_sym_RPAREN,
-      anon_sym_COMMA,
-      anon_sym_COLON,
-      anon_sym_RBRACK,
-      anon_sym_RBRACE,
-      anon_sym_EQ,
-      sym_type_conversion,
-    STATE(900), 7,
-      sym_named_expression,
-      sym_not_operator,
-      sym_boolean_operator,
-      sym_comparison_operator,
-      sym_lambda,
-      sym_conditional_expression,
-      sym_await,
-    STATE(642), 15,
-      sym_binary_operator,
-      sym_unary_operator,
-      sym_attribute,
-      sym_subscript,
-      sym_call,
-      sym_list,
-      sym_set,
-      sym_tuple,
-      sym_dictionary,
-      sym_list_comprehension,
-      sym_dictionary_comprehension,
-      sym_set_comprehension,
-      sym_generator_expression,
-      sym_parenthesized_expression,
-      sym_concatenated_string,
-  [1916] = 20,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(295), 1,
-      anon_sym_LBRACE,
-    ACTIONS(301), 1,
-      anon_sym_TILDE,
-    ACTIONS(315), 1,
-      sym__string_start,
-    ACTIONS(678), 1,
-      sym_identifier,
-    ACTIONS(680), 1,
-      anon_sym_LPAREN,
-    ACTIONS(682), 1,
-      anon_sym_STAR,
-    ACTIONS(690), 1,
-      anon_sym_LBRACK,
-    ACTIONS(712), 1,
-      anon_sym_in,
-    STATE(600), 1,
-      sym_string,
-    STATE(876), 1,
+    STATE(1134), 1,
       sym_pattern,
-    STATE(882), 1,
-      sym_primary_expression,
-    ACTIONS(291), 2,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-    ACTIONS(309), 2,
+    STATE(1216), 1,
+      sym_yield,
+    STATE(1298), 1,
+      sym_list_splat,
+    STATE(1303), 1,
+      sym_parenthesized_list_splat,
+    STATE(1426), 1,
+      sym__patterns,
+    STATE(1471), 1,
+      sym__collection_elements,
+    ACTIONS(293), 2,
       sym_ellipsis,
       sym_float,
-    STATE(770), 2,
+    STATE(765), 2,
       sym_attribute,
       sym_subscript,
-    STATE(875), 3,
+    ACTIONS(582), 3,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_TILDE,
+    STATE(860), 3,
       sym_tuple_pattern,
       sym_list_pattern,
       sym_list_splat_pattern,
-    ACTIONS(311), 4,
+    ACTIONS(295), 4,
       sym_integer,
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(684), 6,
+    ACTIONS(620), 5,
       anon_sym_print,
       anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-      anon_sym_await,
-    STATE(642), 13,
+    STATE(883), 6,
+      sym_named_expression,
+      sym_not_operator,
+      sym_boolean_operator,
+      sym_comparison_operator,
+      sym_lambda,
+      sym_conditional_expression,
+    STATE(605), 14,
       sym_binary_operator,
       sym_unary_operator,
       sym_call,
@@ -27710,7 +23252,339 @@ static const uint16_t ts_small_parse_table[] = {
       sym_generator_expression,
       sym_parenthesized_expression,
       sym_concatenated_string,
-    ACTIONS(710), 15,
+      sym_await,
+  [698] = 28,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(279), 1,
+      anon_sym_LBRACE,
+    ACTIONS(299), 1,
+      sym__string_start,
+    ACTIONS(614), 1,
+      sym_identifier,
+    ACTIONS(616), 1,
+      anon_sym_LPAREN,
+    ACTIONS(618), 1,
+      anon_sym_STAR,
+    ACTIONS(622), 1,
+      anon_sym_LBRACK,
+    ACTIONS(626), 1,
+      anon_sym_not,
+    ACTIONS(628), 1,
+      anon_sym_lambda,
+    ACTIONS(630), 1,
+      anon_sym_yield,
+    ACTIONS(632), 1,
+      anon_sym_await,
+    ACTIONS(636), 1,
+      anon_sym_RPAREN,
+    STATE(586), 1,
+      sym_string,
+    STATE(590), 1,
+      sym_primary_expression,
+    STATE(934), 1,
+      sym_expression,
+    STATE(1134), 1,
+      sym_pattern,
+    STATE(1307), 1,
+      sym_yield,
+    STATE(1418), 1,
+      sym__collection_elements,
+    STATE(1426), 1,
+      sym__patterns,
+    ACTIONS(293), 2,
+      sym_ellipsis,
+      sym_float,
+    STATE(765), 2,
+      sym_attribute,
+      sym_subscript,
+    STATE(1100), 2,
+      sym_list_splat,
+      sym_parenthesized_list_splat,
+    ACTIONS(582), 3,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_TILDE,
+    STATE(860), 3,
+      sym_tuple_pattern,
+      sym_list_pattern,
+      sym_list_splat_pattern,
+    ACTIONS(295), 4,
+      sym_integer,
+      sym_true,
+      sym_false,
+      sym_none,
+    ACTIONS(620), 5,
+      anon_sym_print,
+      anon_sym_async,
+      anon_sym_match,
+      anon_sym_exec,
+      anon_sym_type,
+    STATE(883), 6,
+      sym_named_expression,
+      sym_not_operator,
+      sym_boolean_operator,
+      sym_comparison_operator,
+      sym_lambda,
+      sym_conditional_expression,
+    STATE(605), 14,
+      sym_binary_operator,
+      sym_unary_operator,
+      sym_call,
+      sym_list,
+      sym_set,
+      sym_tuple,
+      sym_dictionary,
+      sym_list_comprehension,
+      sym_dictionary_comprehension,
+      sym_set_comprehension,
+      sym_generator_expression,
+      sym_parenthesized_expression,
+      sym_concatenated_string,
+      sym_await,
+  [815] = 27,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(279), 1,
+      anon_sym_LBRACE,
+    ACTIONS(299), 1,
+      sym__string_start,
+    ACTIONS(614), 1,
+      sym_identifier,
+    ACTIONS(616), 1,
+      anon_sym_LPAREN,
+    ACTIONS(618), 1,
+      anon_sym_STAR,
+    ACTIONS(622), 1,
+      anon_sym_LBRACK,
+    ACTIONS(626), 1,
+      anon_sym_not,
+    ACTIONS(628), 1,
+      anon_sym_lambda,
+    ACTIONS(630), 1,
+      anon_sym_yield,
+    ACTIONS(632), 1,
+      anon_sym_await,
+    ACTIONS(638), 1,
+      anon_sym_RBRACK,
+    STATE(586), 1,
+      sym_string,
+    STATE(590), 1,
+      sym_primary_expression,
+    STATE(930), 1,
+      sym_expression,
+    STATE(1134), 1,
+      sym_pattern,
+    STATE(1402), 1,
+      sym__patterns,
+    STATE(1469), 1,
+      sym__collection_elements,
+    ACTIONS(293), 2,
+      sym_ellipsis,
+      sym_float,
+    STATE(765), 2,
+      sym_attribute,
+      sym_subscript,
+    ACTIONS(582), 3,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_TILDE,
+    STATE(860), 3,
+      sym_tuple_pattern,
+      sym_list_pattern,
+      sym_list_splat_pattern,
+    STATE(1100), 3,
+      sym_list_splat,
+      sym_parenthesized_list_splat,
+      sym_yield,
+    ACTIONS(295), 4,
+      sym_integer,
+      sym_true,
+      sym_false,
+      sym_none,
+    ACTIONS(620), 5,
+      anon_sym_print,
+      anon_sym_async,
+      anon_sym_match,
+      anon_sym_exec,
+      anon_sym_type,
+    STATE(883), 6,
+      sym_named_expression,
+      sym_not_operator,
+      sym_boolean_operator,
+      sym_comparison_operator,
+      sym_lambda,
+      sym_conditional_expression,
+    STATE(605), 14,
+      sym_binary_operator,
+      sym_unary_operator,
+      sym_call,
+      sym_list,
+      sym_set,
+      sym_tuple,
+      sym_dictionary,
+      sym_list_comprehension,
+      sym_dictionary_comprehension,
+      sym_set_comprehension,
+      sym_generator_expression,
+      sym_parenthesized_expression,
+      sym_concatenated_string,
+      sym_await,
+  [930] = 27,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(279), 1,
+      anon_sym_LBRACE,
+    ACTIONS(299), 1,
+      sym__string_start,
+    ACTIONS(614), 1,
+      sym_identifier,
+    ACTIONS(616), 1,
+      anon_sym_LPAREN,
+    ACTIONS(618), 1,
+      anon_sym_STAR,
+    ACTIONS(622), 1,
+      anon_sym_LBRACK,
+    ACTIONS(626), 1,
+      anon_sym_not,
+    ACTIONS(628), 1,
+      anon_sym_lambda,
+    ACTIONS(630), 1,
+      anon_sym_yield,
+    ACTIONS(632), 1,
+      anon_sym_await,
+    ACTIONS(640), 1,
+      anon_sym_RBRACK,
+    STATE(586), 1,
+      sym_string,
+    STATE(590), 1,
+      sym_primary_expression,
+    STATE(929), 1,
+      sym_expression,
+    STATE(1134), 1,
+      sym_pattern,
+    STATE(1402), 1,
+      sym__patterns,
+    STATE(1403), 1,
+      sym__collection_elements,
+    ACTIONS(293), 2,
+      sym_ellipsis,
+      sym_float,
+    STATE(765), 2,
+      sym_attribute,
+      sym_subscript,
+    ACTIONS(582), 3,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_TILDE,
+    STATE(860), 3,
+      sym_tuple_pattern,
+      sym_list_pattern,
+      sym_list_splat_pattern,
+    STATE(1100), 3,
+      sym_list_splat,
+      sym_parenthesized_list_splat,
+      sym_yield,
+    ACTIONS(295), 4,
+      sym_integer,
+      sym_true,
+      sym_false,
+      sym_none,
+    ACTIONS(620), 5,
+      anon_sym_print,
+      anon_sym_async,
+      anon_sym_match,
+      anon_sym_exec,
+      anon_sym_type,
+    STATE(883), 6,
+      sym_named_expression,
+      sym_not_operator,
+      sym_boolean_operator,
+      sym_comparison_operator,
+      sym_lambda,
+      sym_conditional_expression,
+    STATE(605), 14,
+      sym_binary_operator,
+      sym_unary_operator,
+      sym_call,
+      sym_list,
+      sym_set,
+      sym_tuple,
+      sym_dictionary,
+      sym_list_comprehension,
+      sym_dictionary_comprehension,
+      sym_set_comprehension,
+      sym_generator_expression,
+      sym_parenthesized_expression,
+      sym_concatenated_string,
+      sym_await,
+  [1045] = 21,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(279), 1,
+      anon_sym_LBRACE,
+    ACTIONS(285), 1,
+      anon_sym_TILDE,
+    ACTIONS(299), 1,
+      sym__string_start,
+    ACTIONS(642), 1,
+      sym_identifier,
+    ACTIONS(644), 1,
+      anon_sym_LPAREN,
+    ACTIONS(646), 1,
+      anon_sym_STAR,
+    ACTIONS(652), 1,
+      anon_sym_in,
+    ACTIONS(654), 1,
+      anon_sym_LBRACK,
+    ACTIONS(656), 1,
+      anon_sym_await,
+    STATE(586), 1,
+      sym_string,
+    STATE(856), 1,
+      sym_pattern,
+    STATE(865), 1,
+      sym_primary_expression,
+    ACTIONS(275), 2,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+    ACTIONS(293), 2,
+      sym_ellipsis,
+      sym_float,
+    STATE(729), 2,
+      sym_attribute,
+      sym_subscript,
+    STATE(860), 3,
+      sym_tuple_pattern,
+      sym_list_pattern,
+      sym_list_splat_pattern,
+    ACTIONS(295), 4,
+      sym_integer,
+      sym_true,
+      sym_false,
+      sym_none,
+    ACTIONS(648), 5,
+      anon_sym_print,
+      anon_sym_async,
+      anon_sym_match,
+      anon_sym_exec,
+      anon_sym_type,
+    STATE(605), 14,
+      sym_binary_operator,
+      sym_unary_operator,
+      sym_call,
+      sym_list,
+      sym_set,
+      sym_tuple,
+      sym_dictionary,
+      sym_list_comprehension,
+      sym_dictionary_comprehension,
+      sym_set_comprehension,
+      sym_generator_expression,
+      sym_parenthesized_expression,
+      sym_concatenated_string,
+      sym_await,
+    ACTIONS(650), 15,
       anon_sym_COLON,
       anon_sym_EQ,
       anon_sym_PLUS_EQ,
@@ -27726,77 +23600,83 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_AMP_EQ,
       anon_sym_CARET_EQ,
       anon_sym_PIPE_EQ,
-  [2016] = 25,
+  [1148] = 28,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(295), 1,
+    ACTIONS(279), 1,
       anon_sym_LBRACE,
-    ACTIONS(315), 1,
+    ACTIONS(299), 1,
       sym__string_start,
-    ACTIONS(602), 1,
-      sym_identifier,
-    ACTIONS(612), 1,
-      anon_sym_LBRACK,
     ACTIONS(614), 1,
-      anon_sym_not,
+      sym_identifier,
     ACTIONS(616), 1,
-      anon_sym_lambda,
-    ACTIONS(618), 1,
-      anon_sym_await,
-    ACTIONS(664), 1,
-      anon_sym_yield,
-    ACTIONS(692), 1,
       anon_sym_LPAREN,
-    ACTIONS(714), 1,
-      anon_sym_RPAREN,
-    ACTIONS(716), 1,
+    ACTIONS(618), 1,
       anon_sym_STAR,
-    STATE(600), 1,
+    ACTIONS(622), 1,
+      anon_sym_LBRACK,
+    ACTIONS(626), 1,
+      anon_sym_not,
+    ACTIONS(628), 1,
+      anon_sym_lambda,
+    ACTIONS(630), 1,
+      anon_sym_yield,
+    ACTIONS(632), 1,
+      anon_sym_await,
+    ACTIONS(658), 1,
+      anon_sym_RPAREN,
+    STATE(586), 1,
       sym_string,
-    STATE(643), 1,
+    STATE(590), 1,
       sym_primary_expression,
-    STATE(915), 1,
+    STATE(918), 1,
       sym_expression,
-    STATE(1268), 1,
-      sym_with_item,
-    STATE(1313), 1,
+    STATE(1134), 1,
+      sym_pattern,
+    STATE(1216), 1,
       sym_yield,
-    STATE(1475), 1,
+    STATE(1426), 1,
+      sym__patterns,
+    STATE(1471), 1,
       sym__collection_elements,
-    ACTIONS(309), 2,
+    ACTIONS(293), 2,
       sym_ellipsis,
       sym_float,
+    STATE(765), 2,
+      sym_attribute,
+      sym_subscript,
     STATE(1100), 2,
       sym_list_splat,
       sym_parenthesized_list_splat,
-    ACTIONS(610), 3,
+    ACTIONS(582), 3,
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
-    ACTIONS(311), 4,
+    STATE(860), 3,
+      sym_tuple_pattern,
+      sym_list_pattern,
+      sym_list_splat_pattern,
+    ACTIONS(295), 4,
       sym_integer,
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(606), 5,
+    ACTIONS(620), 5,
       anon_sym_print,
       anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(900), 7,
+    STATE(883), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-      sym_await,
-    STATE(642), 15,
+    STATE(605), 14,
       sym_binary_operator,
       sym_unary_operator,
-      sym_attribute,
-      sym_subscript,
       sym_call,
       sym_list,
       sym_set,
@@ -27808,74 +23688,61 @@ static const uint16_t ts_small_parse_table[] = {
       sym_generator_expression,
       sym_parenthesized_expression,
       sym_concatenated_string,
-  [2123] = 22,
+      sym_await,
+  [1265] = 21,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(274), 1,
-      sym_identifier,
-    ACTIONS(293), 1,
-      anon_sym_LBRACK,
-    ACTIONS(295), 1,
+    ACTIONS(279), 1,
       anon_sym_LBRACE,
+    ACTIONS(285), 1,
+      anon_sym_TILDE,
     ACTIONS(299), 1,
-      anon_sym_not,
-    ACTIONS(305), 1,
-      anon_sym_lambda,
-    ACTIONS(313), 1,
-      anon_sym_await,
-    ACTIONS(315), 1,
       sym__string_start,
-    ACTIONS(664), 1,
-      anon_sym_yield,
-    ACTIONS(716), 1,
-      anon_sym_STAR,
-    ACTIONS(718), 1,
+    ACTIONS(642), 1,
+      sym_identifier,
+    ACTIONS(644), 1,
       anon_sym_LPAREN,
-    STATE(600), 1,
+    ACTIONS(646), 1,
+      anon_sym_STAR,
+    ACTIONS(654), 1,
+      anon_sym_LBRACK,
+    ACTIONS(656), 1,
+      anon_sym_await,
+    ACTIONS(662), 1,
+      anon_sym_in,
+    STATE(586), 1,
       sym_string,
-    STATE(630), 1,
+    STATE(856), 1,
+      sym_pattern,
+    STATE(865), 1,
       sym_primary_expression,
-    STATE(1053), 1,
-      sym_expression,
-    ACTIONS(309), 2,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(301), 3,
+    ACTIONS(275), 2,
       anon_sym_DASH,
       anon_sym_PLUS,
-      anon_sym_TILDE,
-    ACTIONS(720), 3,
-      anon_sym_RPAREN,
-      anon_sym_RBRACK,
-      anon_sym_RBRACE,
-    STATE(1166), 3,
-      sym_list_splat,
-      sym_parenthesized_list_splat,
-      sym_yield,
-    ACTIONS(311), 4,
+    ACTIONS(293), 2,
+      sym_ellipsis,
+      sym_float,
+    STATE(729), 2,
+      sym_attribute,
+      sym_subscript,
+    STATE(860), 3,
+      sym_tuple_pattern,
+      sym_list_pattern,
+      sym_list_splat_pattern,
+    ACTIONS(295), 4,
       sym_integer,
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(285), 5,
+    ACTIONS(648), 5,
       anon_sym_print,
       anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(900), 7,
-      sym_named_expression,
-      sym_not_operator,
-      sym_boolean_operator,
-      sym_comparison_operator,
-      sym_lambda,
-      sym_conditional_expression,
-      sym_await,
-    STATE(642), 15,
+    STATE(605), 14,
       sym_binary_operator,
       sym_unary_operator,
-      sym_attribute,
-      sym_subscript,
       sym_call,
       sym_list,
       sym_set,
@@ -27887,151 +23754,89 @@ static const uint16_t ts_small_parse_table[] = {
       sym_generator_expression,
       sym_parenthesized_expression,
       sym_concatenated_string,
-  [2224] = 22,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(274), 1,
-      sym_identifier,
-    ACTIONS(293), 1,
-      anon_sym_LBRACK,
-    ACTIONS(295), 1,
-      anon_sym_LBRACE,
-    ACTIONS(299), 1,
-      anon_sym_not,
-    ACTIONS(305), 1,
-      anon_sym_lambda,
-    ACTIONS(313), 1,
-      anon_sym_await,
-    ACTIONS(315), 1,
-      sym__string_start,
-    ACTIONS(664), 1,
-      anon_sym_yield,
-    ACTIONS(716), 1,
-      anon_sym_STAR,
-    ACTIONS(718), 1,
-      anon_sym_LPAREN,
-    STATE(600), 1,
-      sym_string,
-    STATE(630), 1,
-      sym_primary_expression,
-    STATE(1053), 1,
-      sym_expression,
-    ACTIONS(309), 2,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(301), 3,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_TILDE,
-    ACTIONS(720), 3,
-      anon_sym_RPAREN,
-      anon_sym_RBRACK,
-      anon_sym_RBRACE,
-    STATE(1166), 3,
-      sym_list_splat,
-      sym_parenthesized_list_splat,
-      sym_yield,
-    ACTIONS(311), 4,
-      sym_integer,
-      sym_true,
-      sym_false,
-      sym_none,
-    ACTIONS(285), 5,
-      anon_sym_print,
-      anon_sym_async,
-      anon_sym_match,
-      anon_sym_exec,
-      anon_sym_type,
-    STATE(900), 7,
-      sym_named_expression,
-      sym_not_operator,
-      sym_boolean_operator,
-      sym_comparison_operator,
-      sym_lambda,
-      sym_conditional_expression,
       sym_await,
-    STATE(642), 15,
-      sym_binary_operator,
-      sym_unary_operator,
-      sym_attribute,
-      sym_subscript,
-      sym_call,
-      sym_list,
-      sym_set,
-      sym_tuple,
-      sym_dictionary,
-      sym_list_comprehension,
-      sym_dictionary_comprehension,
-      sym_set_comprehension,
-      sym_generator_expression,
-      sym_parenthesized_expression,
-      sym_concatenated_string,
-  [2325] = 24,
+    ACTIONS(660), 15,
+      anon_sym_COLON,
+      anon_sym_EQ,
+      anon_sym_PLUS_EQ,
+      anon_sym_DASH_EQ,
+      anon_sym_STAR_EQ,
+      anon_sym_SLASH_EQ,
+      anon_sym_AT_EQ,
+      anon_sym_SLASH_SLASH_EQ,
+      anon_sym_PERCENT_EQ,
+      anon_sym_STAR_STAR_EQ,
+      anon_sym_GT_GT_EQ,
+      anon_sym_LT_LT_EQ,
+      anon_sym_AMP_EQ,
+      anon_sym_CARET_EQ,
+      anon_sym_PIPE_EQ,
+  [1368] = 22,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(53), 1,
       anon_sym_STAR_STAR,
-    ACTIONS(283), 1,
-      anon_sym_STAR,
-    ACTIONS(293), 1,
-      anon_sym_LBRACK,
-    ACTIONS(295), 1,
-      anon_sym_LBRACE,
-    ACTIONS(299), 1,
-      anon_sym_not,
-    ACTIONS(305), 1,
-      anon_sym_lambda,
-    ACTIONS(315), 1,
-      sym__string_start,
-    ACTIONS(718), 1,
-      anon_sym_LPAREN,
-    ACTIONS(722), 1,
+    ACTIONS(258), 1,
       sym_identifier,
-    ACTIONS(724), 1,
-      anon_sym_RPAREN,
-    ACTIONS(726), 1,
-      anon_sym_COMMA,
-    ACTIONS(730), 1,
+    ACTIONS(262), 1,
+      anon_sym_LPAREN,
+    ACTIONS(267), 1,
+      anon_sym_STAR,
+    ACTIONS(277), 1,
+      anon_sym_LBRACK,
+    ACTIONS(279), 1,
+      anon_sym_LBRACE,
+    ACTIONS(283), 1,
+      anon_sym_not,
+    ACTIONS(289), 1,
+      anon_sym_lambda,
+    ACTIONS(297), 1,
       anon_sym_await,
-    STATE(600), 1,
+    ACTIONS(299), 1,
+      sym__string_start,
+    STATE(586), 1,
       sym_string,
-    STATE(630), 1,
+    STATE(616), 1,
       sym_primary_expression,
-    STATE(1071), 1,
+    STATE(920), 1,
       sym_expression,
-    STATE(1256), 1,
-      sym_parenthesized_list_splat,
-    ACTIONS(309), 2,
+    ACTIONS(293), 2,
       sym_ellipsis,
       sym_float,
-    ACTIONS(301), 3,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_TILDE,
-    STATE(1255), 3,
+    STATE(1004), 2,
       sym_list_splat,
       sym_dictionary_splat,
-      sym_keyword_argument,
-    ACTIONS(311), 4,
+    ACTIONS(285), 3,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_TILDE,
+    ACTIONS(295), 4,
       sym_integer,
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(728), 5,
+    ACTIONS(269), 5,
       anon_sym_print,
       anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(900), 7,
+    STATE(883), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-      sym_await,
-    STATE(642), 15,
+    ACTIONS(664), 7,
+      anon_sym_RPAREN,
+      anon_sym_COMMA,
+      anon_sym_COLON,
+      anon_sym_RBRACK,
+      anon_sym_RBRACE,
+      anon_sym_EQ,
+      sym_type_conversion,
+    STATE(605), 16,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -28047,72 +23852,497 @@ static const uint16_t ts_small_parse_table[] = {
       sym_generator_expression,
       sym_parenthesized_expression,
       sym_concatenated_string,
-  [2430] = 24,
+      sym_await,
+  [1472] = 22,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(53), 1,
       anon_sym_STAR_STAR,
-    ACTIONS(283), 1,
+    ACTIONS(258), 1,
+      sym_identifier,
+    ACTIONS(262), 1,
+      anon_sym_LPAREN,
+    ACTIONS(267), 1,
       anon_sym_STAR,
-    ACTIONS(295), 1,
-      anon_sym_LBRACE,
-    ACTIONS(315), 1,
-      sym__string_start,
-    ACTIONS(612), 1,
+    ACTIONS(277), 1,
       anon_sym_LBRACK,
-    ACTIONS(614), 1,
+    ACTIONS(279), 1,
+      anon_sym_LBRACE,
+    ACTIONS(283), 1,
       anon_sym_not,
-    ACTIONS(616), 1,
+    ACTIONS(289), 1,
       anon_sym_lambda,
+    ACTIONS(297), 1,
+      anon_sym_await,
+    ACTIONS(299), 1,
+      sym__string_start,
+    STATE(586), 1,
+      sym_string,
+    STATE(616), 1,
+      sym_primary_expression,
+    STATE(920), 1,
+      sym_expression,
+    ACTIONS(293), 2,
+      sym_ellipsis,
+      sym_float,
+    STATE(1004), 2,
+      sym_list_splat,
+      sym_dictionary_splat,
+    ACTIONS(285), 3,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_TILDE,
+    ACTIONS(295), 4,
+      sym_integer,
+      sym_true,
+      sym_false,
+      sym_none,
+    ACTIONS(269), 5,
+      anon_sym_print,
+      anon_sym_async,
+      anon_sym_match,
+      anon_sym_exec,
+      anon_sym_type,
+    STATE(883), 6,
+      sym_named_expression,
+      sym_not_operator,
+      sym_boolean_operator,
+      sym_comparison_operator,
+      sym_lambda,
+      sym_conditional_expression,
+    ACTIONS(666), 7,
+      anon_sym_RPAREN,
+      anon_sym_COMMA,
+      anon_sym_COLON,
+      anon_sym_RBRACK,
+      anon_sym_RBRACE,
+      anon_sym_EQ,
+      sym_type_conversion,
+    STATE(605), 16,
+      sym_binary_operator,
+      sym_unary_operator,
+      sym_attribute,
+      sym_subscript,
+      sym_call,
+      sym_list,
+      sym_set,
+      sym_tuple,
+      sym_dictionary,
+      sym_list_comprehension,
+      sym_dictionary_comprehension,
+      sym_set_comprehension,
+      sym_generator_expression,
+      sym_parenthesized_expression,
+      sym_concatenated_string,
+      sym_await,
+  [1576] = 27,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(53), 1,
+      anon_sym_STAR_STAR,
+    ACTIONS(267), 1,
+      anon_sym_STAR,
+    ACTIONS(279), 1,
+      anon_sym_LBRACE,
+    ACTIONS(299), 1,
+      sym__string_start,
+    ACTIONS(584), 1,
+      anon_sym_LBRACK,
+    ACTIONS(626), 1,
+      anon_sym_not,
+    ACTIONS(628), 1,
+      anon_sym_lambda,
+    ACTIONS(630), 1,
+      anon_sym_yield,
+    ACTIONS(668), 1,
+      sym_identifier,
+    ACTIONS(670), 1,
+      anon_sym_LPAREN,
+    ACTIONS(672), 1,
+      anon_sym_COMMA,
+    ACTIONS(676), 1,
+      anon_sym_RBRACE,
+    ACTIONS(678), 1,
+      anon_sym_await,
+    STATE(586), 1,
+      sym_string,
+    STATE(590), 1,
+      sym_primary_expression,
+    STATE(907), 1,
+      sym_expression,
+    STATE(1031), 1,
+      sym_pair,
+    STATE(1192), 1,
+      sym_dictionary_splat,
+    STATE(1392), 1,
+      sym__collection_elements,
+    ACTIONS(293), 2,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(582), 3,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_TILDE,
+    STATE(1100), 3,
+      sym_list_splat,
+      sym_parenthesized_list_splat,
+      sym_yield,
+    ACTIONS(295), 4,
+      sym_integer,
+      sym_true,
+      sym_false,
+      sym_none,
+    ACTIONS(674), 5,
+      anon_sym_print,
+      anon_sym_async,
+      anon_sym_match,
+      anon_sym_exec,
+      anon_sym_type,
+    STATE(883), 6,
+      sym_named_expression,
+      sym_not_operator,
+      sym_boolean_operator,
+      sym_comparison_operator,
+      sym_lambda,
+      sym_conditional_expression,
+    STATE(605), 16,
+      sym_binary_operator,
+      sym_unary_operator,
+      sym_attribute,
+      sym_subscript,
+      sym_call,
+      sym_list,
+      sym_set,
+      sym_tuple,
+      sym_dictionary,
+      sym_list_comprehension,
+      sym_dictionary_comprehension,
+      sym_set_comprehension,
+      sym_generator_expression,
+      sym_parenthesized_expression,
+      sym_concatenated_string,
+      sym_await,
+  [1690] = 22,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(53), 1,
+      anon_sym_STAR_STAR,
+    ACTIONS(258), 1,
+      sym_identifier,
+    ACTIONS(262), 1,
+      anon_sym_LPAREN,
+    ACTIONS(267), 1,
+      anon_sym_STAR,
+    ACTIONS(277), 1,
+      anon_sym_LBRACK,
+    ACTIONS(279), 1,
+      anon_sym_LBRACE,
+    ACTIONS(283), 1,
+      anon_sym_not,
+    ACTIONS(289), 1,
+      anon_sym_lambda,
+    ACTIONS(297), 1,
+      anon_sym_await,
+    ACTIONS(299), 1,
+      sym__string_start,
+    STATE(586), 1,
+      sym_string,
+    STATE(616), 1,
+      sym_primary_expression,
+    STATE(920), 1,
+      sym_expression,
+    ACTIONS(293), 2,
+      sym_ellipsis,
+      sym_float,
+    STATE(1004), 2,
+      sym_list_splat,
+      sym_dictionary_splat,
+    ACTIONS(285), 3,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_TILDE,
+    ACTIONS(295), 4,
+      sym_integer,
+      sym_true,
+      sym_false,
+      sym_none,
+    ACTIONS(269), 5,
+      anon_sym_print,
+      anon_sym_async,
+      anon_sym_match,
+      anon_sym_exec,
+      anon_sym_type,
+    STATE(883), 6,
+      sym_named_expression,
+      sym_not_operator,
+      sym_boolean_operator,
+      sym_comparison_operator,
+      sym_lambda,
+      sym_conditional_expression,
+    ACTIONS(664), 7,
+      anon_sym_RPAREN,
+      anon_sym_COMMA,
+      anon_sym_COLON,
+      anon_sym_RBRACK,
+      anon_sym_RBRACE,
+      anon_sym_EQ,
+      sym_type_conversion,
+    STATE(605), 16,
+      sym_binary_operator,
+      sym_unary_operator,
+      sym_attribute,
+      sym_subscript,
+      sym_call,
+      sym_list,
+      sym_set,
+      sym_tuple,
+      sym_dictionary,
+      sym_list_comprehension,
+      sym_dictionary_comprehension,
+      sym_set_comprehension,
+      sym_generator_expression,
+      sym_parenthesized_expression,
+      sym_concatenated_string,
+      sym_await,
+  [1794] = 27,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(53), 1,
+      anon_sym_STAR_STAR,
+    ACTIONS(267), 1,
+      anon_sym_STAR,
+    ACTIONS(279), 1,
+      anon_sym_LBRACE,
+    ACTIONS(299), 1,
+      sym__string_start,
+    ACTIONS(584), 1,
+      anon_sym_LBRACK,
+    ACTIONS(626), 1,
+      anon_sym_not,
+    ACTIONS(628), 1,
+      anon_sym_lambda,
+    ACTIONS(630), 1,
+      anon_sym_yield,
+    ACTIONS(668), 1,
+      sym_identifier,
+    ACTIONS(670), 1,
+      anon_sym_LPAREN,
+    ACTIONS(678), 1,
+      anon_sym_await,
+    ACTIONS(680), 1,
+      anon_sym_COMMA,
+    ACTIONS(682), 1,
+      anon_sym_RBRACE,
+    STATE(586), 1,
+      sym_string,
+    STATE(590), 1,
+      sym_primary_expression,
+    STATE(893), 1,
+      sym_expression,
+    STATE(1035), 1,
+      sym_pair,
+    STATE(1223), 1,
+      sym_dictionary_splat,
+    STATE(1467), 1,
+      sym__collection_elements,
+    ACTIONS(293), 2,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(582), 3,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_TILDE,
+    STATE(1100), 3,
+      sym_list_splat,
+      sym_parenthesized_list_splat,
+      sym_yield,
+    ACTIONS(295), 4,
+      sym_integer,
+      sym_true,
+      sym_false,
+      sym_none,
+    ACTIONS(674), 5,
+      anon_sym_print,
+      anon_sym_async,
+      anon_sym_match,
+      anon_sym_exec,
+      anon_sym_type,
+    STATE(883), 6,
+      sym_named_expression,
+      sym_not_operator,
+      sym_boolean_operator,
+      sym_comparison_operator,
+      sym_lambda,
+      sym_conditional_expression,
+    STATE(605), 16,
+      sym_binary_operator,
+      sym_unary_operator,
+      sym_attribute,
+      sym_subscript,
+      sym_call,
+      sym_list,
+      sym_set,
+      sym_tuple,
+      sym_dictionary,
+      sym_list_comprehension,
+      sym_dictionary_comprehension,
+      sym_set_comprehension,
+      sym_generator_expression,
+      sym_parenthesized_expression,
+      sym_concatenated_string,
+      sym_await,
+  [1908] = 27,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(53), 1,
+      anon_sym_STAR_STAR,
+    ACTIONS(267), 1,
+      anon_sym_STAR,
+    ACTIONS(279), 1,
+      anon_sym_LBRACE,
+    ACTIONS(299), 1,
+      sym__string_start,
+    ACTIONS(584), 1,
+      anon_sym_LBRACK,
+    ACTIONS(626), 1,
+      anon_sym_not,
+    ACTIONS(628), 1,
+      anon_sym_lambda,
+    ACTIONS(630), 1,
+      anon_sym_yield,
+    ACTIONS(668), 1,
+      sym_identifier,
+    ACTIONS(670), 1,
+      anon_sym_LPAREN,
+    ACTIONS(678), 1,
+      anon_sym_await,
+    ACTIONS(684), 1,
+      anon_sym_COMMA,
+    ACTIONS(686), 1,
+      anon_sym_RBRACE,
+    STATE(586), 1,
+      sym_string,
+    STATE(590), 1,
+      sym_primary_expression,
+    STATE(889), 1,
+      sym_expression,
+    STATE(1032), 1,
+      sym_pair,
+    STATE(1230), 1,
+      sym_dictionary_splat,
+    STATE(1429), 1,
+      sym__collection_elements,
+    ACTIONS(293), 2,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(582), 3,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_TILDE,
+    STATE(1100), 3,
+      sym_list_splat,
+      sym_parenthesized_list_splat,
+      sym_yield,
+    ACTIONS(295), 4,
+      sym_integer,
+      sym_true,
+      sym_false,
+      sym_none,
+    ACTIONS(674), 5,
+      anon_sym_print,
+      anon_sym_async,
+      anon_sym_match,
+      anon_sym_exec,
+      anon_sym_type,
+    STATE(883), 6,
+      sym_named_expression,
+      sym_not_operator,
+      sym_boolean_operator,
+      sym_comparison_operator,
+      sym_lambda,
+      sym_conditional_expression,
+    STATE(605), 16,
+      sym_binary_operator,
+      sym_unary_operator,
+      sym_attribute,
+      sym_subscript,
+      sym_call,
+      sym_list,
+      sym_set,
+      sym_tuple,
+      sym_dictionary,
+      sym_list_comprehension,
+      sym_dictionary_comprehension,
+      sym_set_comprehension,
+      sym_generator_expression,
+      sym_parenthesized_expression,
+      sym_concatenated_string,
+      sym_await,
+  [2022] = 24,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(53), 1,
+      anon_sym_STAR_STAR,
+    ACTIONS(267), 1,
+      anon_sym_STAR,
+    ACTIONS(277), 1,
+      anon_sym_LBRACK,
+    ACTIONS(279), 1,
+      anon_sym_LBRACE,
+    ACTIONS(283), 1,
+      anon_sym_not,
+    ACTIONS(289), 1,
+      anon_sym_lambda,
+    ACTIONS(299), 1,
+      sym__string_start,
+    ACTIONS(688), 1,
+      sym_identifier,
+    ACTIONS(690), 1,
+      anon_sym_LPAREN,
     ACTIONS(692), 1,
-      anon_sym_LPAREN,
-    ACTIONS(724), 1,
       anon_sym_RPAREN,
-    ACTIONS(726), 1,
+    ACTIONS(694), 1,
       anon_sym_COMMA,
-    ACTIONS(732), 1,
-      sym_identifier,
-    ACTIONS(736), 1,
+    ACTIONS(698), 1,
       anon_sym_await,
-    STATE(600), 1,
+    STATE(586), 1,
       sym_string,
-    STATE(643), 1,
+    STATE(616), 1,
       sym_primary_expression,
-    STATE(953), 1,
+    STATE(1036), 1,
       sym_expression,
-    STATE(1256), 1,
+    STATE(1252), 1,
       sym_parenthesized_list_splat,
-    ACTIONS(309), 2,
+    ACTIONS(293), 2,
       sym_ellipsis,
       sym_float,
-    ACTIONS(610), 3,
+    ACTIONS(285), 3,
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
-    STATE(1255), 3,
+    STATE(1251), 3,
       sym_list_splat,
       sym_dictionary_splat,
       sym_keyword_argument,
-    ACTIONS(311), 4,
+    ACTIONS(295), 4,
       sym_integer,
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(734), 5,
+    ACTIONS(696), 5,
       anon_sym_print,
       anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(900), 7,
+    STATE(883), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-      sym_await,
-    STATE(642), 15,
+    STATE(605), 16,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -28128,71 +24358,71 @@ static const uint16_t ts_small_parse_table[] = {
       sym_generator_expression,
       sym_parenthesized_expression,
       sym_concatenated_string,
-  [2535] = 23,
+      sym_await,
+  [2127] = 23,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(53), 1,
       anon_sym_STAR_STAR,
-    ACTIONS(274), 1,
+    ACTIONS(258), 1,
       sym_identifier,
-    ACTIONS(278), 1,
+    ACTIONS(262), 1,
       anon_sym_LPAREN,
-    ACTIONS(283), 1,
+    ACTIONS(267), 1,
       anon_sym_STAR,
-    ACTIONS(293), 1,
+    ACTIONS(277), 1,
       anon_sym_LBRACK,
-    ACTIONS(295), 1,
+    ACTIONS(279), 1,
       anon_sym_LBRACE,
-    ACTIONS(299), 1,
+    ACTIONS(283), 1,
       anon_sym_not,
-    ACTIONS(305), 1,
+    ACTIONS(289), 1,
       anon_sym_lambda,
-    ACTIONS(313), 1,
+    ACTIONS(297), 1,
       anon_sym_await,
-    ACTIONS(315), 1,
+    ACTIONS(299), 1,
       sym__string_start,
-    ACTIONS(664), 1,
+    ACTIONS(630), 1,
       anon_sym_yield,
-    STATE(600), 1,
+    STATE(586), 1,
       sym_string,
-    STATE(630), 1,
+    STATE(616), 1,
       sym_primary_expression,
-    STATE(960), 1,
+    STATE(937), 1,
       sym_expression,
-    ACTIONS(309), 2,
+    ACTIONS(293), 2,
       sym_ellipsis,
       sym_float,
-    STATE(1366), 2,
+    STATE(1367), 2,
       sym_list_splat,
       sym_dictionary_splat,
-    ACTIONS(301), 3,
+    ACTIONS(285), 3,
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
-    STATE(1120), 3,
+    STATE(1073), 3,
       sym_expression_list,
       sym_yield,
       sym__f_expression,
-    ACTIONS(311), 4,
+    ACTIONS(295), 4,
       sym_integer,
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(285), 5,
+    ACTIONS(269), 5,
       anon_sym_print,
       anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(900), 7,
+    STATE(883), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-      sym_await,
-    STATE(642), 15,
+    STATE(605), 16,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -28208,88 +24438,8 @@ static const uint16_t ts_small_parse_table[] = {
       sym_generator_expression,
       sym_parenthesized_expression,
       sym_concatenated_string,
-  [2638] = 24,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(53), 1,
-      anon_sym_STAR_STAR,
-    ACTIONS(283), 1,
-      anon_sym_STAR,
-    ACTIONS(295), 1,
-      anon_sym_LBRACE,
-    ACTIONS(315), 1,
-      sym__string_start,
-    ACTIONS(612), 1,
-      anon_sym_LBRACK,
-    ACTIONS(614), 1,
-      anon_sym_not,
-    ACTIONS(616), 1,
-      anon_sym_lambda,
-    ACTIONS(692), 1,
-      anon_sym_LPAREN,
-    ACTIONS(732), 1,
-      sym_identifier,
-    ACTIONS(736), 1,
-      anon_sym_await,
-    ACTIONS(738), 1,
-      anon_sym_RPAREN,
-    ACTIONS(740), 1,
-      anon_sym_COMMA,
-    STATE(600), 1,
-      sym_string,
-    STATE(643), 1,
-      sym_primary_expression,
-    STATE(940), 1,
-      sym_expression,
-    STATE(1328), 1,
-      sym_parenthesized_list_splat,
-    ACTIONS(309), 2,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(610), 3,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_TILDE,
-    STATE(1239), 3,
-      sym_list_splat,
-      sym_dictionary_splat,
-      sym_keyword_argument,
-    ACTIONS(311), 4,
-      sym_integer,
-      sym_true,
-      sym_false,
-      sym_none,
-    ACTIONS(734), 5,
-      anon_sym_print,
-      anon_sym_async,
-      anon_sym_match,
-      anon_sym_exec,
-      anon_sym_type,
-    STATE(900), 7,
-      sym_named_expression,
-      sym_not_operator,
-      sym_boolean_operator,
-      sym_comparison_operator,
-      sym_lambda,
-      sym_conditional_expression,
       sym_await,
-    STATE(642), 15,
-      sym_binary_operator,
-      sym_unary_operator,
-      sym_attribute,
-      sym_subscript,
-      sym_call,
-      sym_list,
-      sym_set,
-      sym_tuple,
-      sym_dictionary,
-      sym_list_comprehension,
-      sym_dictionary_comprehension,
-      sym_set_comprehension,
-      sym_generator_expression,
-      sym_parenthesized_expression,
-      sym_concatenated_string,
-  [2743] = 24,
+  [2230] = 24,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(51), 1,
@@ -28302,380 +24452,58 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_lambda,
     ACTIONS(81), 1,
       sym__string_start,
-    ACTIONS(283), 1,
+    ACTIONS(267), 1,
       anon_sym_STAR,
-    ACTIONS(331), 1,
+    ACTIONS(327), 1,
       sym_identifier,
-    ACTIONS(337), 1,
+    ACTIONS(333), 1,
       anon_sym_await,
-    ACTIONS(559), 1,
+    ACTIONS(568), 1,
       anon_sym_LPAREN,
-    ACTIONS(563), 1,
+    ACTIONS(574), 1,
       anon_sym_LBRACK,
-    ACTIONS(742), 1,
+    ACTIONS(700), 1,
       anon_sym_from,
-    STATE(684), 1,
+    STATE(707), 1,
       sym_primary_expression,
-    STATE(713), 1,
+    STATE(709), 1,
       sym_string,
-    STATE(1014), 1,
-      sym_expression,
-    STATE(1348), 1,
-      sym_expression_list,
-    ACTIONS(75), 2,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(650), 2,
-      sym__newline,
-      sym__semicolon,
-    STATE(1360), 2,
-      sym_list_splat,
-      sym_dictionary_splat,
-    ACTIONS(47), 3,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_TILDE,
-    ACTIONS(77), 4,
-      sym_integer,
-      sym_true,
-      sym_false,
-      sym_none,
-    ACTIONS(333), 5,
-      anon_sym_print,
-      anon_sym_async,
-      anon_sym_match,
-      anon_sym_exec,
-      anon_sym_type,
-    STATE(1009), 7,
-      sym_named_expression,
-      sym_not_operator,
-      sym_boolean_operator,
-      sym_comparison_operator,
-      sym_lambda,
-      sym_conditional_expression,
-      sym_await,
-    STATE(797), 15,
-      sym_binary_operator,
-      sym_unary_operator,
-      sym_attribute,
-      sym_subscript,
-      sym_call,
-      sym_list,
-      sym_set,
-      sym_tuple,
-      sym_dictionary,
-      sym_list_comprehension,
-      sym_dictionary_comprehension,
-      sym_set_comprehension,
-      sym_generator_expression,
-      sym_parenthesized_expression,
-      sym_concatenated_string,
-  [2848] = 24,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(51), 1,
-      anon_sym_LBRACE,
-    ACTIONS(53), 1,
-      anon_sym_STAR_STAR,
-    ACTIONS(69), 1,
-      anon_sym_not,
-    ACTIONS(71), 1,
-      anon_sym_lambda,
-    ACTIONS(81), 1,
-      sym__string_start,
-    ACTIONS(283), 1,
-      anon_sym_STAR,
-    ACTIONS(331), 1,
-      sym_identifier,
-    ACTIONS(337), 1,
-      anon_sym_await,
-    ACTIONS(559), 1,
-      anon_sym_LPAREN,
-    ACTIONS(563), 1,
-      anon_sym_LBRACK,
-    ACTIONS(744), 1,
-      anon_sym_from,
-    STATE(684), 1,
-      sym_primary_expression,
-    STATE(713), 1,
-      sym_string,
-    STATE(982), 1,
-      sym_expression,
-    STATE(1288), 1,
-      sym_expression_list,
-    ACTIONS(75), 2,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(746), 2,
-      sym__newline,
-      sym__semicolon,
-    STATE(1360), 2,
-      sym_list_splat,
-      sym_dictionary_splat,
-    ACTIONS(47), 3,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_TILDE,
-    ACTIONS(77), 4,
-      sym_integer,
-      sym_true,
-      sym_false,
-      sym_none,
-    ACTIONS(333), 5,
-      anon_sym_print,
-      anon_sym_async,
-      anon_sym_match,
-      anon_sym_exec,
-      anon_sym_type,
-    STATE(1009), 7,
-      sym_named_expression,
-      sym_not_operator,
-      sym_boolean_operator,
-      sym_comparison_operator,
-      sym_lambda,
-      sym_conditional_expression,
-      sym_await,
-    STATE(797), 15,
-      sym_binary_operator,
-      sym_unary_operator,
-      sym_attribute,
-      sym_subscript,
-      sym_call,
-      sym_list,
-      sym_set,
-      sym_tuple,
-      sym_dictionary,
-      sym_list_comprehension,
-      sym_dictionary_comprehension,
-      sym_set_comprehension,
-      sym_generator_expression,
-      sym_parenthesized_expression,
-      sym_concatenated_string,
-  [2953] = 22,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(274), 1,
-      sym_identifier,
-    ACTIONS(293), 1,
-      anon_sym_LBRACK,
-    ACTIONS(295), 1,
-      anon_sym_LBRACE,
-    ACTIONS(299), 1,
-      anon_sym_not,
-    ACTIONS(305), 1,
-      anon_sym_lambda,
-    ACTIONS(313), 1,
-      anon_sym_await,
-    ACTIONS(315), 1,
-      sym__string_start,
-    ACTIONS(664), 1,
-      anon_sym_yield,
-    ACTIONS(716), 1,
-      anon_sym_STAR,
-    ACTIONS(718), 1,
-      anon_sym_LPAREN,
-    STATE(600), 1,
-      sym_string,
-    STATE(630), 1,
-      sym_primary_expression,
-    STATE(1053), 1,
-      sym_expression,
-    ACTIONS(309), 2,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(301), 3,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_TILDE,
-    ACTIONS(748), 3,
-      anon_sym_RPAREN,
-      anon_sym_RBRACK,
-      anon_sym_RBRACE,
-    STATE(1166), 3,
-      sym_list_splat,
-      sym_parenthesized_list_splat,
-      sym_yield,
-    ACTIONS(311), 4,
-      sym_integer,
-      sym_true,
-      sym_false,
-      sym_none,
-    ACTIONS(285), 5,
-      anon_sym_print,
-      anon_sym_async,
-      anon_sym_match,
-      anon_sym_exec,
-      anon_sym_type,
-    STATE(900), 7,
-      sym_named_expression,
-      sym_not_operator,
-      sym_boolean_operator,
-      sym_comparison_operator,
-      sym_lambda,
-      sym_conditional_expression,
-      sym_await,
-    STATE(642), 15,
-      sym_binary_operator,
-      sym_unary_operator,
-      sym_attribute,
-      sym_subscript,
-      sym_call,
-      sym_list,
-      sym_set,
-      sym_tuple,
-      sym_dictionary,
-      sym_list_comprehension,
-      sym_dictionary_comprehension,
-      sym_set_comprehension,
-      sym_generator_expression,
-      sym_parenthesized_expression,
-      sym_concatenated_string,
-  [3054] = 23,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(53), 1,
-      anon_sym_STAR_STAR,
-    ACTIONS(274), 1,
-      sym_identifier,
-    ACTIONS(278), 1,
-      anon_sym_LPAREN,
-    ACTIONS(283), 1,
-      anon_sym_STAR,
-    ACTIONS(293), 1,
-      anon_sym_LBRACK,
-    ACTIONS(295), 1,
-      anon_sym_LBRACE,
-    ACTIONS(299), 1,
-      anon_sym_not,
-    ACTIONS(305), 1,
-      anon_sym_lambda,
-    ACTIONS(313), 1,
-      anon_sym_await,
-    ACTIONS(315), 1,
-      sym__string_start,
-    ACTIONS(664), 1,
-      anon_sym_yield,
-    STATE(600), 1,
-      sym_string,
-    STATE(630), 1,
-      sym_primary_expression,
-    STATE(960), 1,
-      sym_expression,
-    ACTIONS(309), 2,
-      sym_ellipsis,
-      sym_float,
-    STATE(1366), 2,
-      sym_list_splat,
-      sym_dictionary_splat,
-    ACTIONS(301), 3,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_TILDE,
-    STATE(1097), 3,
-      sym_expression_list,
-      sym_yield,
-      sym__f_expression,
-    ACTIONS(311), 4,
-      sym_integer,
-      sym_true,
-      sym_false,
-      sym_none,
-    ACTIONS(285), 5,
-      anon_sym_print,
-      anon_sym_async,
-      anon_sym_match,
-      anon_sym_exec,
-      anon_sym_type,
-    STATE(900), 7,
-      sym_named_expression,
-      sym_not_operator,
-      sym_boolean_operator,
-      sym_comparison_operator,
-      sym_lambda,
-      sym_conditional_expression,
-      sym_await,
-    STATE(642), 15,
-      sym_binary_operator,
-      sym_unary_operator,
-      sym_attribute,
-      sym_subscript,
-      sym_call,
-      sym_list,
-      sym_set,
-      sym_tuple,
-      sym_dictionary,
-      sym_list_comprehension,
-      sym_dictionary_comprehension,
-      sym_set_comprehension,
-      sym_generator_expression,
-      sym_parenthesized_expression,
-      sym_concatenated_string,
-  [3157] = 24,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(53), 1,
-      anon_sym_STAR_STAR,
-    ACTIONS(283), 1,
-      anon_sym_STAR,
-    ACTIONS(295), 1,
-      anon_sym_LBRACE,
-    ACTIONS(315), 1,
-      sym__string_start,
-    ACTIONS(612), 1,
-      anon_sym_LBRACK,
-    ACTIONS(614), 1,
-      anon_sym_not,
-    ACTIONS(616), 1,
-      anon_sym_lambda,
-    ACTIONS(692), 1,
-      anon_sym_LPAREN,
-    ACTIONS(732), 1,
-      sym_identifier,
-    ACTIONS(736), 1,
-      anon_sym_await,
-    ACTIONS(750), 1,
-      anon_sym_RPAREN,
-    ACTIONS(752), 1,
-      anon_sym_COMMA,
-    STATE(600), 1,
-      sym_string,
-    STATE(643), 1,
-      sym_primary_expression,
     STATE(946), 1,
       sym_expression,
-    STATE(1297), 1,
-      sym_parenthesized_list_splat,
-    ACTIONS(309), 2,
+    STATE(1227), 1,
+      sym_expression_list,
+    ACTIONS(75), 2,
       sym_ellipsis,
       sym_float,
-    ACTIONS(610), 3,
+    ACTIONS(702), 2,
+      sym__newline,
+      sym__semicolon,
+    STATE(1321), 2,
+      sym_list_splat,
+      sym_dictionary_splat,
+    ACTIONS(47), 3,
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
-    STATE(1298), 3,
-      sym_list_splat,
-      sym_dictionary_splat,
-      sym_keyword_argument,
-    ACTIONS(311), 4,
+    ACTIONS(77), 4,
       sym_integer,
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(734), 5,
+    ACTIONS(329), 5,
       anon_sym_print,
       anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(900), 7,
+    STATE(985), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-      sym_await,
-    STATE(642), 15,
+    STATE(759), 16,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -28691,68 +24519,70 @@ static const uint16_t ts_small_parse_table[] = {
       sym_generator_expression,
       sym_parenthesized_expression,
       sym_concatenated_string,
-  [3262] = 21,
+      sym_await,
+  [2335] = 22,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(295), 1,
-      anon_sym_LBRACE,
-    ACTIONS(315), 1,
-      sym__string_start,
-    ACTIONS(602), 1,
+    ACTIONS(258), 1,
       sym_identifier,
-    ACTIONS(604), 1,
-      anon_sym_LPAREN,
-    ACTIONS(612), 1,
+    ACTIONS(277), 1,
       anon_sym_LBRACK,
-    ACTIONS(614), 1,
+    ACTIONS(279), 1,
+      anon_sym_LBRACE,
+    ACTIONS(283), 1,
       anon_sym_not,
-    ACTIONS(618), 1,
-      anon_sym_await,
-    ACTIONS(758), 1,
+    ACTIONS(289), 1,
       anon_sym_lambda,
-    STATE(600), 1,
+    ACTIONS(297), 1,
+      anon_sym_await,
+    ACTIONS(299), 1,
+      sym__string_start,
+    ACTIONS(630), 1,
+      anon_sym_yield,
+    ACTIONS(690), 1,
+      anon_sym_LPAREN,
+    ACTIONS(706), 1,
+      anon_sym_STAR,
+    STATE(586), 1,
       sym_string,
-    STATE(643), 1,
+    STATE(616), 1,
       sym_primary_expression,
-    STATE(962), 1,
+    STATE(1005), 1,
       sym_expression,
-    ACTIONS(309), 2,
+    ACTIONS(293), 2,
       sym_ellipsis,
       sym_float,
-    STATE(1018), 2,
-      sym__expression_within_for_in_clause,
-      sym_lambda_within_for_in_clause,
-    ACTIONS(610), 3,
+    ACTIONS(285), 3,
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
-    ACTIONS(754), 3,
+    ACTIONS(704), 3,
       anon_sym_RPAREN,
       anon_sym_RBRACK,
       anon_sym_RBRACE,
-    ACTIONS(756), 3,
-      anon_sym_if,
-      anon_sym_async,
-      anon_sym_for,
-    ACTIONS(311), 4,
+    STATE(1167), 3,
+      sym_list_splat,
+      sym_parenthesized_list_splat,
+      sym_yield,
+    ACTIONS(295), 4,
       sym_integer,
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(606), 4,
+    ACTIONS(269), 5,
       anon_sym_print,
+      anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(900), 7,
+    STATE(883), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-      sym_await,
-    STATE(642), 15,
+    STATE(605), 16,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -28768,70 +24598,72 @@ static const uint16_t ts_small_parse_table[] = {
       sym_generator_expression,
       sym_parenthesized_expression,
       sym_concatenated_string,
-  [3360] = 23,
+      sym_await,
+  [2436] = 24,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(53), 1,
       anon_sym_STAR_STAR,
-    ACTIONS(283), 1,
+    ACTIONS(267), 1,
       anon_sym_STAR,
-    ACTIONS(293), 1,
-      anon_sym_LBRACK,
-    ACTIONS(295), 1,
+    ACTIONS(279), 1,
       anon_sym_LBRACE,
     ACTIONS(299), 1,
-      anon_sym_not,
-    ACTIONS(305), 1,
-      anon_sym_lambda,
-    ACTIONS(315), 1,
       sym__string_start,
-    ACTIONS(718), 1,
+    ACTIONS(584), 1,
+      anon_sym_LBRACK,
+    ACTIONS(626), 1,
+      anon_sym_not,
+    ACTIONS(628), 1,
+      anon_sym_lambda,
+    ACTIONS(670), 1,
       anon_sym_LPAREN,
-    ACTIONS(722), 1,
+    ACTIONS(708), 1,
       sym_identifier,
-    ACTIONS(730), 1,
-      anon_sym_await,
-    ACTIONS(760), 1,
+    ACTIONS(710), 1,
       anon_sym_RPAREN,
-    STATE(600), 1,
+    ACTIONS(712), 1,
+      anon_sym_COMMA,
+    ACTIONS(716), 1,
+      anon_sym_await,
+    STATE(586), 1,
       sym_string,
-    STATE(630), 1,
+    STATE(590), 1,
       sym_primary_expression,
-    STATE(1124), 1,
+    STATE(927), 1,
       sym_expression,
-    STATE(1379), 1,
+    STATE(1211), 1,
       sym_parenthesized_list_splat,
-    ACTIONS(309), 2,
+    ACTIONS(293), 2,
       sym_ellipsis,
       sym_float,
-    ACTIONS(301), 3,
+    ACTIONS(582), 3,
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
-    STATE(1373), 3,
+    STATE(1218), 3,
       sym_list_splat,
       sym_dictionary_splat,
       sym_keyword_argument,
-    ACTIONS(311), 4,
+    ACTIONS(295), 4,
       sym_integer,
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(728), 5,
+    ACTIONS(714), 5,
       anon_sym_print,
       anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(900), 7,
+    STATE(883), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-      sym_await,
-    STATE(642), 15,
+    STATE(605), 16,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -28847,229 +24679,71 @@ static const uint16_t ts_small_parse_table[] = {
       sym_generator_expression,
       sym_parenthesized_expression,
       sym_concatenated_string,
-  [3462] = 23,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(295), 1,
-      anon_sym_LBRACE,
-    ACTIONS(315), 1,
-      sym__string_start,
-    ACTIONS(602), 1,
-      sym_identifier,
-    ACTIONS(612), 1,
-      anon_sym_LBRACK,
-    ACTIONS(614), 1,
-      anon_sym_not,
-    ACTIONS(616), 1,
-      anon_sym_lambda,
-    ACTIONS(618), 1,
-      anon_sym_await,
-    ACTIONS(664), 1,
-      anon_sym_yield,
-    ACTIONS(692), 1,
-      anon_sym_LPAREN,
-    ACTIONS(716), 1,
-      anon_sym_STAR,
-    ACTIONS(762), 1,
-      anon_sym_RBRACK,
-    STATE(600), 1,
-      sym_string,
-    STATE(643), 1,
-      sym_primary_expression,
-    STATE(941), 1,
-      sym_expression,
-    STATE(1467), 1,
-      sym__collection_elements,
-    ACTIONS(309), 2,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(610), 3,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_TILDE,
-    STATE(1100), 3,
-      sym_list_splat,
-      sym_parenthesized_list_splat,
-      sym_yield,
-    ACTIONS(311), 4,
-      sym_integer,
-      sym_true,
-      sym_false,
-      sym_none,
-    ACTIONS(606), 5,
-      anon_sym_print,
-      anon_sym_async,
-      anon_sym_match,
-      anon_sym_exec,
-      anon_sym_type,
-    STATE(900), 7,
-      sym_named_expression,
-      sym_not_operator,
-      sym_boolean_operator,
-      sym_comparison_operator,
-      sym_lambda,
-      sym_conditional_expression,
       sym_await,
-    STATE(642), 15,
-      sym_binary_operator,
-      sym_unary_operator,
-      sym_attribute,
-      sym_subscript,
-      sym_call,
-      sym_list,
-      sym_set,
-      sym_tuple,
-      sym_dictionary,
-      sym_list_comprehension,
-      sym_dictionary_comprehension,
-      sym_set_comprehension,
-      sym_generator_expression,
-      sym_parenthesized_expression,
-      sym_concatenated_string,
-  [3564] = 24,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(295), 1,
-      anon_sym_LBRACE,
-    ACTIONS(315), 1,
-      sym__string_start,
-    ACTIONS(602), 1,
-      sym_identifier,
-    ACTIONS(612), 1,
-      anon_sym_LBRACK,
-    ACTIONS(614), 1,
-      anon_sym_not,
-    ACTIONS(616), 1,
-      anon_sym_lambda,
-    ACTIONS(618), 1,
-      anon_sym_await,
-    ACTIONS(664), 1,
-      anon_sym_yield,
-    ACTIONS(692), 1,
-      anon_sym_LPAREN,
-    ACTIONS(714), 1,
-      anon_sym_RPAREN,
-    ACTIONS(716), 1,
-      anon_sym_STAR,
-    STATE(600), 1,
-      sym_string,
-    STATE(643), 1,
-      sym_primary_expression,
-    STATE(930), 1,
-      sym_expression,
-    STATE(1219), 1,
-      sym_yield,
-    STATE(1484), 1,
-      sym__collection_elements,
-    ACTIONS(309), 2,
-      sym_ellipsis,
-      sym_float,
-    STATE(1100), 2,
-      sym_list_splat,
-      sym_parenthesized_list_splat,
-    ACTIONS(610), 3,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_TILDE,
-    ACTIONS(311), 4,
-      sym_integer,
-      sym_true,
-      sym_false,
-      sym_none,
-    ACTIONS(606), 5,
-      anon_sym_print,
-      anon_sym_async,
-      anon_sym_match,
-      anon_sym_exec,
-      anon_sym_type,
-    STATE(900), 7,
-      sym_named_expression,
-      sym_not_operator,
-      sym_boolean_operator,
-      sym_comparison_operator,
-      sym_lambda,
-      sym_conditional_expression,
-      sym_await,
-    STATE(642), 15,
-      sym_binary_operator,
-      sym_unary_operator,
-      sym_attribute,
-      sym_subscript,
-      sym_call,
-      sym_list,
-      sym_set,
-      sym_tuple,
-      sym_dictionary,
-      sym_list_comprehension,
-      sym_dictionary_comprehension,
-      sym_set_comprehension,
-      sym_generator_expression,
-      sym_parenthesized_expression,
-      sym_concatenated_string,
-  [3668] = 23,
+  [2541] = 23,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(53), 1,
       anon_sym_STAR_STAR,
-    ACTIONS(283), 1,
-      anon_sym_STAR,
-    ACTIONS(293), 1,
-      anon_sym_LBRACK,
-    ACTIONS(295), 1,
-      anon_sym_LBRACE,
-    ACTIONS(299), 1,
-      anon_sym_not,
-    ACTIONS(305), 1,
-      anon_sym_lambda,
-    ACTIONS(315), 1,
-      sym__string_start,
-    ACTIONS(718), 1,
-      anon_sym_LPAREN,
-    ACTIONS(722), 1,
+    ACTIONS(258), 1,
       sym_identifier,
-    ACTIONS(730), 1,
+    ACTIONS(262), 1,
+      anon_sym_LPAREN,
+    ACTIONS(267), 1,
+      anon_sym_STAR,
+    ACTIONS(277), 1,
+      anon_sym_LBRACK,
+    ACTIONS(279), 1,
+      anon_sym_LBRACE,
+    ACTIONS(283), 1,
+      anon_sym_not,
+    ACTIONS(289), 1,
+      anon_sym_lambda,
+    ACTIONS(297), 1,
       anon_sym_await,
-    ACTIONS(764), 1,
-      anon_sym_RPAREN,
-    STATE(600), 1,
+    ACTIONS(299), 1,
+      sym__string_start,
+    ACTIONS(630), 1,
+      anon_sym_yield,
+    STATE(586), 1,
       sym_string,
-    STATE(630), 1,
+    STATE(616), 1,
       sym_primary_expression,
-    STATE(1124), 1,
+    STATE(937), 1,
       sym_expression,
-    STATE(1379), 1,
-      sym_parenthesized_list_splat,
-    ACTIONS(309), 2,
+    ACTIONS(293), 2,
       sym_ellipsis,
       sym_float,
-    ACTIONS(301), 3,
+    STATE(1367), 2,
+      sym_list_splat,
+      sym_dictionary_splat,
+    ACTIONS(285), 3,
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
-    STATE(1373), 3,
-      sym_list_splat,
-      sym_dictionary_splat,
-      sym_keyword_argument,
-    ACTIONS(311), 4,
+    STATE(1090), 3,
+      sym_expression_list,
+      sym_yield,
+      sym__f_expression,
+    ACTIONS(295), 4,
       sym_integer,
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(728), 5,
+    ACTIONS(269), 5,
       anon_sym_print,
       anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(900), 7,
+    STATE(883), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-      sym_await,
-    STATE(642), 15,
+    STATE(605), 16,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -29085,70 +24759,70 @@ static const uint16_t ts_small_parse_table[] = {
       sym_generator_expression,
       sym_parenthesized_expression,
       sym_concatenated_string,
-  [3770] = 23,
+      sym_await,
+  [2644] = 22,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(295), 1,
-      anon_sym_LBRACE,
-    ACTIONS(315), 1,
-      sym__string_start,
-    ACTIONS(602), 1,
+    ACTIONS(258), 1,
       sym_identifier,
-    ACTIONS(612), 1,
+    ACTIONS(277), 1,
       anon_sym_LBRACK,
-    ACTIONS(614), 1,
+    ACTIONS(279), 1,
+      anon_sym_LBRACE,
+    ACTIONS(283), 1,
       anon_sym_not,
-    ACTIONS(616), 1,
+    ACTIONS(289), 1,
       anon_sym_lambda,
-    ACTIONS(618), 1,
+    ACTIONS(297), 1,
       anon_sym_await,
-    ACTIONS(664), 1,
+    ACTIONS(299), 1,
+      sym__string_start,
+    ACTIONS(630), 1,
       anon_sym_yield,
-    ACTIONS(692), 1,
+    ACTIONS(690), 1,
       anon_sym_LPAREN,
-    ACTIONS(716), 1,
+    ACTIONS(706), 1,
       anon_sym_STAR,
-    ACTIONS(766), 1,
-      anon_sym_RBRACK,
-    STATE(600), 1,
+    STATE(586), 1,
       sym_string,
-    STATE(643), 1,
+    STATE(616), 1,
       sym_primary_expression,
-    STATE(941), 1,
+    STATE(1005), 1,
       sym_expression,
-    STATE(1467), 1,
-      sym__collection_elements,
-    ACTIONS(309), 2,
+    ACTIONS(293), 2,
       sym_ellipsis,
       sym_float,
-    ACTIONS(610), 3,
+    ACTIONS(285), 3,
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
-    STATE(1100), 3,
+    ACTIONS(718), 3,
+      anon_sym_RPAREN,
+      anon_sym_RBRACK,
+      anon_sym_RBRACE,
+    STATE(1167), 3,
       sym_list_splat,
       sym_parenthesized_list_splat,
       sym_yield,
-    ACTIONS(311), 4,
+    ACTIONS(295), 4,
       sym_integer,
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(606), 5,
+    ACTIONS(269), 5,
       anon_sym_print,
       anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(900), 7,
+    STATE(883), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-      sym_await,
-    STATE(642), 15,
+    STATE(605), 16,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -29164,43 +24838,606 @@ static const uint16_t ts_small_parse_table[] = {
       sym_generator_expression,
       sym_parenthesized_expression,
       sym_concatenated_string,
-  [3872] = 23,
+      sym_await,
+  [2745] = 24,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(295), 1,
-      anon_sym_LBRACE,
-    ACTIONS(315), 1,
-      sym__string_start,
-    ACTIONS(602), 1,
-      sym_identifier,
-    ACTIONS(612), 1,
-      anon_sym_LBRACK,
-    ACTIONS(614), 1,
-      anon_sym_not,
-    ACTIONS(616), 1,
-      anon_sym_lambda,
-    ACTIONS(618), 1,
-      anon_sym_await,
-    ACTIONS(664), 1,
-      anon_sym_yield,
-    ACTIONS(692), 1,
-      anon_sym_LPAREN,
-    ACTIONS(716), 1,
+    ACTIONS(53), 1,
+      anon_sym_STAR_STAR,
+    ACTIONS(267), 1,
       anon_sym_STAR,
-    ACTIONS(768), 1,
-      anon_sym_RBRACK,
-    STATE(600), 1,
+    ACTIONS(279), 1,
+      anon_sym_LBRACE,
+    ACTIONS(299), 1,
+      sym__string_start,
+    ACTIONS(584), 1,
+      anon_sym_LBRACK,
+    ACTIONS(626), 1,
+      anon_sym_not,
+    ACTIONS(628), 1,
+      anon_sym_lambda,
+    ACTIONS(670), 1,
+      anon_sym_LPAREN,
+    ACTIONS(692), 1,
+      anon_sym_RPAREN,
+    ACTIONS(694), 1,
+      anon_sym_COMMA,
+    ACTIONS(708), 1,
+      sym_identifier,
+    ACTIONS(716), 1,
+      anon_sym_await,
+    STATE(586), 1,
       sym_string,
-    STATE(643), 1,
+    STATE(590), 1,
       sym_primary_expression,
     STATE(932), 1,
       sym_expression,
-    STATE(1503), 1,
-      sym__collection_elements,
-    ACTIONS(309), 2,
+    STATE(1252), 1,
+      sym_parenthesized_list_splat,
+    ACTIONS(293), 2,
       sym_ellipsis,
       sym_float,
-    ACTIONS(610), 3,
+    ACTIONS(582), 3,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_TILDE,
+    STATE(1251), 3,
+      sym_list_splat,
+      sym_dictionary_splat,
+      sym_keyword_argument,
+    ACTIONS(295), 4,
+      sym_integer,
+      sym_true,
+      sym_false,
+      sym_none,
+    ACTIONS(714), 5,
+      anon_sym_print,
+      anon_sym_async,
+      anon_sym_match,
+      anon_sym_exec,
+      anon_sym_type,
+    STATE(883), 6,
+      sym_named_expression,
+      sym_not_operator,
+      sym_boolean_operator,
+      sym_comparison_operator,
+      sym_lambda,
+      sym_conditional_expression,
+    STATE(605), 16,
+      sym_binary_operator,
+      sym_unary_operator,
+      sym_attribute,
+      sym_subscript,
+      sym_call,
+      sym_list,
+      sym_set,
+      sym_tuple,
+      sym_dictionary,
+      sym_list_comprehension,
+      sym_dictionary_comprehension,
+      sym_set_comprehension,
+      sym_generator_expression,
+      sym_parenthesized_expression,
+      sym_concatenated_string,
+      sym_await,
+  [2850] = 24,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(53), 1,
+      anon_sym_STAR_STAR,
+    ACTIONS(267), 1,
+      anon_sym_STAR,
+    ACTIONS(279), 1,
+      anon_sym_LBRACE,
+    ACTIONS(299), 1,
+      sym__string_start,
+    ACTIONS(584), 1,
+      anon_sym_LBRACK,
+    ACTIONS(626), 1,
+      anon_sym_not,
+    ACTIONS(628), 1,
+      anon_sym_lambda,
+    ACTIONS(670), 1,
+      anon_sym_LPAREN,
+    ACTIONS(708), 1,
+      sym_identifier,
+    ACTIONS(716), 1,
+      anon_sym_await,
+    ACTIONS(720), 1,
+      anon_sym_RPAREN,
+    ACTIONS(722), 1,
+      anon_sym_COMMA,
+    STATE(586), 1,
+      sym_string,
+    STATE(590), 1,
+      sym_primary_expression,
+    STATE(917), 1,
+      sym_expression,
+    STATE(1196), 1,
+      sym_parenthesized_list_splat,
+    ACTIONS(293), 2,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(582), 3,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_TILDE,
+    STATE(1193), 3,
+      sym_list_splat,
+      sym_dictionary_splat,
+      sym_keyword_argument,
+    ACTIONS(295), 4,
+      sym_integer,
+      sym_true,
+      sym_false,
+      sym_none,
+    ACTIONS(714), 5,
+      anon_sym_print,
+      anon_sym_async,
+      anon_sym_match,
+      anon_sym_exec,
+      anon_sym_type,
+    STATE(883), 6,
+      sym_named_expression,
+      sym_not_operator,
+      sym_boolean_operator,
+      sym_comparison_operator,
+      sym_lambda,
+      sym_conditional_expression,
+    STATE(605), 16,
+      sym_binary_operator,
+      sym_unary_operator,
+      sym_attribute,
+      sym_subscript,
+      sym_call,
+      sym_list,
+      sym_set,
+      sym_tuple,
+      sym_dictionary,
+      sym_list_comprehension,
+      sym_dictionary_comprehension,
+      sym_set_comprehension,
+      sym_generator_expression,
+      sym_parenthesized_expression,
+      sym_concatenated_string,
+      sym_await,
+  [2955] = 22,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(258), 1,
+      sym_identifier,
+    ACTIONS(277), 1,
+      anon_sym_LBRACK,
+    ACTIONS(279), 1,
+      anon_sym_LBRACE,
+    ACTIONS(283), 1,
+      anon_sym_not,
+    ACTIONS(289), 1,
+      anon_sym_lambda,
+    ACTIONS(297), 1,
+      anon_sym_await,
+    ACTIONS(299), 1,
+      sym__string_start,
+    ACTIONS(630), 1,
+      anon_sym_yield,
+    ACTIONS(690), 1,
+      anon_sym_LPAREN,
+    ACTIONS(706), 1,
+      anon_sym_STAR,
+    STATE(586), 1,
+      sym_string,
+    STATE(616), 1,
+      sym_primary_expression,
+    STATE(1005), 1,
+      sym_expression,
+    ACTIONS(293), 2,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(285), 3,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_TILDE,
+    ACTIONS(718), 3,
+      anon_sym_RPAREN,
+      anon_sym_RBRACK,
+      anon_sym_RBRACE,
+    STATE(1167), 3,
+      sym_list_splat,
+      sym_parenthesized_list_splat,
+      sym_yield,
+    ACTIONS(295), 4,
+      sym_integer,
+      sym_true,
+      sym_false,
+      sym_none,
+    ACTIONS(269), 5,
+      anon_sym_print,
+      anon_sym_async,
+      anon_sym_match,
+      anon_sym_exec,
+      anon_sym_type,
+    STATE(883), 6,
+      sym_named_expression,
+      sym_not_operator,
+      sym_boolean_operator,
+      sym_comparison_operator,
+      sym_lambda,
+      sym_conditional_expression,
+    STATE(605), 16,
+      sym_binary_operator,
+      sym_unary_operator,
+      sym_attribute,
+      sym_subscript,
+      sym_call,
+      sym_list,
+      sym_set,
+      sym_tuple,
+      sym_dictionary,
+      sym_list_comprehension,
+      sym_dictionary_comprehension,
+      sym_set_comprehension,
+      sym_generator_expression,
+      sym_parenthesized_expression,
+      sym_concatenated_string,
+      sym_await,
+  [3056] = 24,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(51), 1,
+      anon_sym_LBRACE,
+    ACTIONS(53), 1,
+      anon_sym_STAR_STAR,
+    ACTIONS(69), 1,
+      anon_sym_not,
+    ACTIONS(71), 1,
+      anon_sym_lambda,
+    ACTIONS(81), 1,
+      sym__string_start,
+    ACTIONS(267), 1,
+      anon_sym_STAR,
+    ACTIONS(327), 1,
+      sym_identifier,
+    ACTIONS(333), 1,
+      anon_sym_await,
+    ACTIONS(568), 1,
+      anon_sym_LPAREN,
+    ACTIONS(574), 1,
+      anon_sym_LBRACK,
+    ACTIONS(724), 1,
+      anon_sym_from,
+    STATE(707), 1,
+      sym_primary_expression,
+    STATE(709), 1,
+      sym_string,
+    STATE(1014), 1,
+      sym_expression,
+    STATE(1339), 1,
+      sym_expression_list,
+    ACTIONS(75), 2,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(612), 2,
+      sym__newline,
+      sym__semicolon,
+    STATE(1321), 2,
+      sym_list_splat,
+      sym_dictionary_splat,
+    ACTIONS(47), 3,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_TILDE,
+    ACTIONS(77), 4,
+      sym_integer,
+      sym_true,
+      sym_false,
+      sym_none,
+    ACTIONS(329), 5,
+      anon_sym_print,
+      anon_sym_async,
+      anon_sym_match,
+      anon_sym_exec,
+      anon_sym_type,
+    STATE(985), 6,
+      sym_named_expression,
+      sym_not_operator,
+      sym_boolean_operator,
+      sym_comparison_operator,
+      sym_lambda,
+      sym_conditional_expression,
+    STATE(759), 16,
+      sym_binary_operator,
+      sym_unary_operator,
+      sym_attribute,
+      sym_subscript,
+      sym_call,
+      sym_list,
+      sym_set,
+      sym_tuple,
+      sym_dictionary,
+      sym_list_comprehension,
+      sym_dictionary_comprehension,
+      sym_set_comprehension,
+      sym_generator_expression,
+      sym_parenthesized_expression,
+      sym_concatenated_string,
+      sym_await,
+  [3161] = 25,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(279), 1,
+      anon_sym_LBRACE,
+    ACTIONS(299), 1,
+      sym__string_start,
+    ACTIONS(584), 1,
+      anon_sym_LBRACK,
+    ACTIONS(626), 1,
+      anon_sym_not,
+    ACTIONS(628), 1,
+      anon_sym_lambda,
+    ACTIONS(630), 1,
+      anon_sym_yield,
+    ACTIONS(668), 1,
+      sym_identifier,
+    ACTIONS(670), 1,
+      anon_sym_LPAREN,
+    ACTIONS(678), 1,
+      anon_sym_await,
+    ACTIONS(706), 1,
+      anon_sym_STAR,
+    ACTIONS(726), 1,
+      anon_sym_RPAREN,
+    STATE(586), 1,
+      sym_string,
+    STATE(590), 1,
+      sym_primary_expression,
+    STATE(898), 1,
+      sym_expression,
+    STATE(1204), 1,
+      sym_yield,
+    STATE(1295), 1,
+      sym_with_item,
+    STATE(1395), 1,
+      sym__collection_elements,
+    ACTIONS(293), 2,
+      sym_ellipsis,
+      sym_float,
+    STATE(1100), 2,
+      sym_list_splat,
+      sym_parenthesized_list_splat,
+    ACTIONS(582), 3,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_TILDE,
+    ACTIONS(295), 4,
+      sym_integer,
+      sym_true,
+      sym_false,
+      sym_none,
+    ACTIONS(674), 5,
+      anon_sym_print,
+      anon_sym_async,
+      anon_sym_match,
+      anon_sym_exec,
+      anon_sym_type,
+    STATE(883), 6,
+      sym_named_expression,
+      sym_not_operator,
+      sym_boolean_operator,
+      sym_comparison_operator,
+      sym_lambda,
+      sym_conditional_expression,
+    STATE(605), 16,
+      sym_binary_operator,
+      sym_unary_operator,
+      sym_attribute,
+      sym_subscript,
+      sym_call,
+      sym_list,
+      sym_set,
+      sym_tuple,
+      sym_dictionary,
+      sym_list_comprehension,
+      sym_dictionary_comprehension,
+      sym_set_comprehension,
+      sym_generator_expression,
+      sym_parenthesized_expression,
+      sym_concatenated_string,
+      sym_await,
+  [3268] = 23,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(53), 1,
+      anon_sym_STAR_STAR,
+    ACTIONS(267), 1,
+      anon_sym_STAR,
+    ACTIONS(277), 1,
+      anon_sym_LBRACK,
+    ACTIONS(279), 1,
+      anon_sym_LBRACE,
+    ACTIONS(283), 1,
+      anon_sym_not,
+    ACTIONS(289), 1,
+      anon_sym_lambda,
+    ACTIONS(299), 1,
+      sym__string_start,
+    ACTIONS(688), 1,
+      sym_identifier,
+    ACTIONS(690), 1,
+      anon_sym_LPAREN,
+    ACTIONS(698), 1,
+      anon_sym_await,
+    ACTIONS(728), 1,
+      anon_sym_RPAREN,
+    STATE(586), 1,
+      sym_string,
+    STATE(616), 1,
+      sym_primary_expression,
+    STATE(1089), 1,
+      sym_expression,
+    STATE(1370), 1,
+      sym_parenthesized_list_splat,
+    ACTIONS(293), 2,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(285), 3,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_TILDE,
+    STATE(1371), 3,
+      sym_list_splat,
+      sym_dictionary_splat,
+      sym_keyword_argument,
+    ACTIONS(295), 4,
+      sym_integer,
+      sym_true,
+      sym_false,
+      sym_none,
+    ACTIONS(696), 5,
+      anon_sym_print,
+      anon_sym_async,
+      anon_sym_match,
+      anon_sym_exec,
+      anon_sym_type,
+    STATE(883), 6,
+      sym_named_expression,
+      sym_not_operator,
+      sym_boolean_operator,
+      sym_comparison_operator,
+      sym_lambda,
+      sym_conditional_expression,
+    STATE(605), 16,
+      sym_binary_operator,
+      sym_unary_operator,
+      sym_attribute,
+      sym_subscript,
+      sym_call,
+      sym_list,
+      sym_set,
+      sym_tuple,
+      sym_dictionary,
+      sym_list_comprehension,
+      sym_dictionary_comprehension,
+      sym_set_comprehension,
+      sym_generator_expression,
+      sym_parenthesized_expression,
+      sym_concatenated_string,
+      sym_await,
+  [3370] = 23,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(53), 1,
+      anon_sym_STAR_STAR,
+    ACTIONS(267), 1,
+      anon_sym_STAR,
+    ACTIONS(277), 1,
+      anon_sym_LBRACK,
+    ACTIONS(279), 1,
+      anon_sym_LBRACE,
+    ACTIONS(283), 1,
+      anon_sym_not,
+    ACTIONS(289), 1,
+      anon_sym_lambda,
+    ACTIONS(299), 1,
+      sym__string_start,
+    ACTIONS(688), 1,
+      sym_identifier,
+    ACTIONS(690), 1,
+      anon_sym_LPAREN,
+    ACTIONS(698), 1,
+      anon_sym_await,
+    ACTIONS(730), 1,
+      anon_sym_RPAREN,
+    STATE(586), 1,
+      sym_string,
+    STATE(616), 1,
+      sym_primary_expression,
+    STATE(1089), 1,
+      sym_expression,
+    STATE(1370), 1,
+      sym_parenthesized_list_splat,
+    ACTIONS(293), 2,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(285), 3,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_TILDE,
+    STATE(1371), 3,
+      sym_list_splat,
+      sym_dictionary_splat,
+      sym_keyword_argument,
+    ACTIONS(295), 4,
+      sym_integer,
+      sym_true,
+      sym_false,
+      sym_none,
+    ACTIONS(696), 5,
+      anon_sym_print,
+      anon_sym_async,
+      anon_sym_match,
+      anon_sym_exec,
+      anon_sym_type,
+    STATE(883), 6,
+      sym_named_expression,
+      sym_not_operator,
+      sym_boolean_operator,
+      sym_comparison_operator,
+      sym_lambda,
+      sym_conditional_expression,
+    STATE(605), 16,
+      sym_binary_operator,
+      sym_unary_operator,
+      sym_attribute,
+      sym_subscript,
+      sym_call,
+      sym_list,
+      sym_set,
+      sym_tuple,
+      sym_dictionary,
+      sym_list_comprehension,
+      sym_dictionary_comprehension,
+      sym_set_comprehension,
+      sym_generator_expression,
+      sym_parenthesized_expression,
+      sym_concatenated_string,
+      sym_await,
+  [3472] = 23,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(279), 1,
+      anon_sym_LBRACE,
+    ACTIONS(299), 1,
+      sym__string_start,
+    ACTIONS(584), 1,
+      anon_sym_LBRACK,
+    ACTIONS(626), 1,
+      anon_sym_not,
+    ACTIONS(628), 1,
+      anon_sym_lambda,
+    ACTIONS(630), 1,
+      anon_sym_yield,
+    ACTIONS(668), 1,
+      sym_identifier,
+    ACTIONS(670), 1,
+      anon_sym_LPAREN,
+    ACTIONS(678), 1,
+      anon_sym_await,
+    ACTIONS(706), 1,
+      anon_sym_STAR,
+    ACTIONS(732), 1,
+      anon_sym_RBRACK,
+    STATE(586), 1,
+      sym_string,
+    STATE(590), 1,
+      sym_primary_expression,
+    STATE(930), 1,
+      sym_expression,
+    STATE(1469), 1,
+      sym__collection_elements,
+    ACTIONS(293), 2,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(582), 3,
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
@@ -29208,26 +25445,25 @@ static const uint16_t ts_small_parse_table[] = {
       sym_list_splat,
       sym_parenthesized_list_splat,
       sym_yield,
-    ACTIONS(311), 4,
+    ACTIONS(295), 4,
       sym_integer,
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(606), 5,
+    ACTIONS(674), 5,
       anon_sym_print,
       anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(900), 7,
+    STATE(883), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-      sym_await,
-    STATE(642), 15,
+    STATE(605), 16,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -29243,243 +25479,8 @@ static const uint16_t ts_small_parse_table[] = {
       sym_generator_expression,
       sym_parenthesized_expression,
       sym_concatenated_string,
-  [3974] = 21,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(295), 1,
-      anon_sym_LBRACE,
-    ACTIONS(315), 1,
-      sym__string_start,
-    ACTIONS(602), 1,
-      sym_identifier,
-    ACTIONS(604), 1,
-      anon_sym_LPAREN,
-    ACTIONS(612), 1,
-      anon_sym_LBRACK,
-    ACTIONS(614), 1,
-      anon_sym_not,
-    ACTIONS(618), 1,
-      anon_sym_await,
-    ACTIONS(758), 1,
-      anon_sym_lambda,
-    STATE(600), 1,
-      sym_string,
-    STATE(643), 1,
-      sym_primary_expression,
-    STATE(962), 1,
-      sym_expression,
-    ACTIONS(309), 2,
-      sym_ellipsis,
-      sym_float,
-    STATE(1018), 2,
-      sym__expression_within_for_in_clause,
-      sym_lambda_within_for_in_clause,
-    ACTIONS(610), 3,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_TILDE,
-    ACTIONS(770), 3,
-      anon_sym_RPAREN,
-      anon_sym_RBRACK,
-      anon_sym_RBRACE,
-    ACTIONS(772), 3,
-      anon_sym_if,
-      anon_sym_async,
-      anon_sym_for,
-    ACTIONS(311), 4,
-      sym_integer,
-      sym_true,
-      sym_false,
-      sym_none,
-    ACTIONS(606), 4,
-      anon_sym_print,
-      anon_sym_match,
-      anon_sym_exec,
-      anon_sym_type,
-    STATE(900), 7,
-      sym_named_expression,
-      sym_not_operator,
-      sym_boolean_operator,
-      sym_comparison_operator,
-      sym_lambda,
-      sym_conditional_expression,
       sym_await,
-    STATE(642), 15,
-      sym_binary_operator,
-      sym_unary_operator,
-      sym_attribute,
-      sym_subscript,
-      sym_call,
-      sym_list,
-      sym_set,
-      sym_tuple,
-      sym_dictionary,
-      sym_list_comprehension,
-      sym_dictionary_comprehension,
-      sym_set_comprehension,
-      sym_generator_expression,
-      sym_parenthesized_expression,
-      sym_concatenated_string,
-  [4072] = 24,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(295), 1,
-      anon_sym_LBRACE,
-    ACTIONS(315), 1,
-      sym__string_start,
-    ACTIONS(602), 1,
-      sym_identifier,
-    ACTIONS(612), 1,
-      anon_sym_LBRACK,
-    ACTIONS(614), 1,
-      anon_sym_not,
-    ACTIONS(616), 1,
-      anon_sym_lambda,
-    ACTIONS(618), 1,
-      anon_sym_await,
-    ACTIONS(664), 1,
-      anon_sym_yield,
-    ACTIONS(692), 1,
-      anon_sym_LPAREN,
-    ACTIONS(716), 1,
-      anon_sym_STAR,
-    ACTIONS(774), 1,
-      anon_sym_RPAREN,
-    STATE(600), 1,
-      sym_string,
-    STATE(643), 1,
-      sym_primary_expression,
-    STATE(931), 1,
-      sym_expression,
-    STATE(1251), 1,
-      sym_yield,
-    STATE(1431), 1,
-      sym__collection_elements,
-    ACTIONS(309), 2,
-      sym_ellipsis,
-      sym_float,
-    STATE(1100), 2,
-      sym_list_splat,
-      sym_parenthesized_list_splat,
-    ACTIONS(610), 3,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_TILDE,
-    ACTIONS(311), 4,
-      sym_integer,
-      sym_true,
-      sym_false,
-      sym_none,
-    ACTIONS(606), 5,
-      anon_sym_print,
-      anon_sym_async,
-      anon_sym_match,
-      anon_sym_exec,
-      anon_sym_type,
-    STATE(900), 7,
-      sym_named_expression,
-      sym_not_operator,
-      sym_boolean_operator,
-      sym_comparison_operator,
-      sym_lambda,
-      sym_conditional_expression,
-      sym_await,
-    STATE(642), 15,
-      sym_binary_operator,
-      sym_unary_operator,
-      sym_attribute,
-      sym_subscript,
-      sym_call,
-      sym_list,
-      sym_set,
-      sym_tuple,
-      sym_dictionary,
-      sym_list_comprehension,
-      sym_dictionary_comprehension,
-      sym_set_comprehension,
-      sym_generator_expression,
-      sym_parenthesized_expression,
-      sym_concatenated_string,
-  [4176] = 23,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(53), 1,
-      anon_sym_STAR_STAR,
-    ACTIONS(283), 1,
-      anon_sym_STAR,
-    ACTIONS(293), 1,
-      anon_sym_LBRACK,
-    ACTIONS(295), 1,
-      anon_sym_LBRACE,
-    ACTIONS(299), 1,
-      anon_sym_not,
-    ACTIONS(305), 1,
-      anon_sym_lambda,
-    ACTIONS(315), 1,
-      sym__string_start,
-    ACTIONS(718), 1,
-      anon_sym_LPAREN,
-    ACTIONS(722), 1,
-      sym_identifier,
-    ACTIONS(730), 1,
-      anon_sym_await,
-    ACTIONS(776), 1,
-      anon_sym_RPAREN,
-    STATE(600), 1,
-      sym_string,
-    STATE(630), 1,
-      sym_primary_expression,
-    STATE(1124), 1,
-      sym_expression,
-    STATE(1379), 1,
-      sym_parenthesized_list_splat,
-    ACTIONS(309), 2,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(301), 3,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_TILDE,
-    STATE(1373), 3,
-      sym_list_splat,
-      sym_dictionary_splat,
-      sym_keyword_argument,
-    ACTIONS(311), 4,
-      sym_integer,
-      sym_true,
-      sym_false,
-      sym_none,
-    ACTIONS(728), 5,
-      anon_sym_print,
-      anon_sym_async,
-      anon_sym_match,
-      anon_sym_exec,
-      anon_sym_type,
-    STATE(900), 7,
-      sym_named_expression,
-      sym_not_operator,
-      sym_boolean_operator,
-      sym_comparison_operator,
-      sym_lambda,
-      sym_conditional_expression,
-      sym_await,
-    STATE(642), 15,
-      sym_binary_operator,
-      sym_unary_operator,
-      sym_attribute,
-      sym_subscript,
-      sym_call,
-      sym_list,
-      sym_set,
-      sym_tuple,
-      sym_dictionary,
-      sym_list_comprehension,
-      sym_dictionary_comprehension,
-      sym_set_comprehension,
-      sym_generator_expression,
-      sym_parenthesized_expression,
-      sym_concatenated_string,
-  [4278] = 23,
+  [3574] = 23,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(51), 1,
@@ -29490,33 +25491,33 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_lambda,
     ACTIONS(81), 1,
       sym__string_start,
-    ACTIONS(331), 1,
+    ACTIONS(327), 1,
       sym_identifier,
-    ACTIONS(337), 1,
+    ACTIONS(333), 1,
       anon_sym_await,
-    ACTIONS(559), 1,
+    ACTIONS(568), 1,
       anon_sym_LPAREN,
-    ACTIONS(563), 1,
+    ACTIONS(574), 1,
       anon_sym_LBRACK,
-    ACTIONS(778), 1,
+    ACTIONS(734), 1,
       anon_sym_from,
-    ACTIONS(780), 1,
+    ACTIONS(736), 1,
       anon_sym_STAR,
-    ACTIONS(782), 1,
+    ACTIONS(738), 1,
       anon_sym_STAR_STAR,
-    STATE(684), 1,
+    STATE(707), 1,
       sym_primary_expression,
-    STATE(713), 1,
+    STATE(709), 1,
       sym_string,
-    STATE(1036), 1,
+    STATE(1026), 1,
       sym_expression,
     ACTIONS(75), 2,
       sym_ellipsis,
       sym_float,
-    ACTIONS(700), 2,
+    ACTIONS(666), 2,
       sym__newline,
       sym__semicolon,
-    STATE(1187), 2,
+    STATE(1150), 2,
       sym_list_splat,
       sym_dictionary_splat,
     ACTIONS(47), 3,
@@ -29528,21 +25529,20 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(333), 5,
+    ACTIONS(329), 5,
       anon_sym_print,
       anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(1009), 7,
+    STATE(985), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-      sym_await,
-    STATE(797), 15,
+    STATE(759), 16,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -29558,388 +25558,71 @@ static const uint16_t ts_small_parse_table[] = {
       sym_generator_expression,
       sym_parenthesized_expression,
       sym_concatenated_string,
-  [4380] = 23,
+      sym_await,
+  [3676] = 24,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(53), 1,
-      anon_sym_STAR_STAR,
-    ACTIONS(283), 1,
-      anon_sym_STAR,
-    ACTIONS(293), 1,
-      anon_sym_LBRACK,
-    ACTIONS(295), 1,
+    ACTIONS(279), 1,
       anon_sym_LBRACE,
     ACTIONS(299), 1,
-      anon_sym_not,
-    ACTIONS(305), 1,
-      anon_sym_lambda,
-    ACTIONS(315), 1,
       sym__string_start,
-    ACTIONS(718), 1,
-      anon_sym_LPAREN,
-    ACTIONS(722), 1,
-      sym_identifier,
-    ACTIONS(730), 1,
-      anon_sym_await,
-    ACTIONS(784), 1,
-      anon_sym_RPAREN,
-    STATE(600), 1,
-      sym_string,
-    STATE(630), 1,
-      sym_primary_expression,
-    STATE(1124), 1,
-      sym_expression,
-    STATE(1379), 1,
-      sym_parenthesized_list_splat,
-    ACTIONS(309), 2,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(301), 3,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_TILDE,
-    STATE(1373), 3,
-      sym_list_splat,
-      sym_dictionary_splat,
-      sym_keyword_argument,
-    ACTIONS(311), 4,
-      sym_integer,
-      sym_true,
-      sym_false,
-      sym_none,
-    ACTIONS(728), 5,
-      anon_sym_print,
-      anon_sym_async,
-      anon_sym_match,
-      anon_sym_exec,
-      anon_sym_type,
-    STATE(900), 7,
-      sym_named_expression,
-      sym_not_operator,
-      sym_boolean_operator,
-      sym_comparison_operator,
-      sym_lambda,
-      sym_conditional_expression,
-      sym_await,
-    STATE(642), 15,
-      sym_binary_operator,
-      sym_unary_operator,
-      sym_attribute,
-      sym_subscript,
-      sym_call,
-      sym_list,
-      sym_set,
-      sym_tuple,
-      sym_dictionary,
-      sym_list_comprehension,
-      sym_dictionary_comprehension,
-      sym_set_comprehension,
-      sym_generator_expression,
-      sym_parenthesized_expression,
-      sym_concatenated_string,
-  [4482] = 23,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(53), 1,
-      anon_sym_STAR_STAR,
-    ACTIONS(283), 1,
-      anon_sym_STAR,
-    ACTIONS(293), 1,
+    ACTIONS(584), 1,
       anon_sym_LBRACK,
-    ACTIONS(295), 1,
-      anon_sym_LBRACE,
-    ACTIONS(299), 1,
+    ACTIONS(626), 1,
       anon_sym_not,
-    ACTIONS(305), 1,
+    ACTIONS(628), 1,
       anon_sym_lambda,
-    ACTIONS(315), 1,
-      sym__string_start,
-    ACTIONS(718), 1,
-      anon_sym_LPAREN,
-    ACTIONS(722), 1,
-      sym_identifier,
-    ACTIONS(730), 1,
-      anon_sym_await,
-    ACTIONS(786), 1,
-      anon_sym_RPAREN,
-    STATE(600), 1,
-      sym_string,
-    STATE(630), 1,
-      sym_primary_expression,
-    STATE(1124), 1,
-      sym_expression,
-    STATE(1379), 1,
-      sym_parenthesized_list_splat,
-    ACTIONS(309), 2,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(301), 3,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_TILDE,
-    STATE(1373), 3,
-      sym_list_splat,
-      sym_dictionary_splat,
-      sym_keyword_argument,
-    ACTIONS(311), 4,
-      sym_integer,
-      sym_true,
-      sym_false,
-      sym_none,
-    ACTIONS(728), 5,
-      anon_sym_print,
-      anon_sym_async,
-      anon_sym_match,
-      anon_sym_exec,
-      anon_sym_type,
-    STATE(900), 7,
-      sym_named_expression,
-      sym_not_operator,
-      sym_boolean_operator,
-      sym_comparison_operator,
-      sym_lambda,
-      sym_conditional_expression,
-      sym_await,
-    STATE(642), 15,
-      sym_binary_operator,
-      sym_unary_operator,
-      sym_attribute,
-      sym_subscript,
-      sym_call,
-      sym_list,
-      sym_set,
-      sym_tuple,
-      sym_dictionary,
-      sym_list_comprehension,
-      sym_dictionary_comprehension,
-      sym_set_comprehension,
-      sym_generator_expression,
-      sym_parenthesized_expression,
-      sym_concatenated_string,
-  [4584] = 23,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(53), 1,
-      anon_sym_STAR_STAR,
-    ACTIONS(283), 1,
-      anon_sym_STAR,
-    ACTIONS(293), 1,
-      anon_sym_LBRACK,
-    ACTIONS(295), 1,
-      anon_sym_LBRACE,
-    ACTIONS(299), 1,
-      anon_sym_not,
-    ACTIONS(305), 1,
-      anon_sym_lambda,
-    ACTIONS(315), 1,
-      sym__string_start,
-    ACTIONS(718), 1,
-      anon_sym_LPAREN,
-    ACTIONS(722), 1,
-      sym_identifier,
-    ACTIONS(730), 1,
-      anon_sym_await,
-    ACTIONS(788), 1,
-      anon_sym_RPAREN,
-    STATE(600), 1,
-      sym_string,
-    STATE(630), 1,
-      sym_primary_expression,
-    STATE(1124), 1,
-      sym_expression,
-    STATE(1379), 1,
-      sym_parenthesized_list_splat,
-    ACTIONS(309), 2,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(301), 3,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_TILDE,
-    STATE(1373), 3,
-      sym_list_splat,
-      sym_dictionary_splat,
-      sym_keyword_argument,
-    ACTIONS(311), 4,
-      sym_integer,
-      sym_true,
-      sym_false,
-      sym_none,
-    ACTIONS(728), 5,
-      anon_sym_print,
-      anon_sym_async,
-      anon_sym_match,
-      anon_sym_exec,
-      anon_sym_type,
-    STATE(900), 7,
-      sym_named_expression,
-      sym_not_operator,
-      sym_boolean_operator,
-      sym_comparison_operator,
-      sym_lambda,
-      sym_conditional_expression,
-      sym_await,
-    STATE(642), 15,
-      sym_binary_operator,
-      sym_unary_operator,
-      sym_attribute,
-      sym_subscript,
-      sym_call,
-      sym_list,
-      sym_set,
-      sym_tuple,
-      sym_dictionary,
-      sym_list_comprehension,
-      sym_dictionary_comprehension,
-      sym_set_comprehension,
-      sym_generator_expression,
-      sym_parenthesized_expression,
-      sym_concatenated_string,
-  [4686] = 23,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(53), 1,
-      anon_sym_STAR_STAR,
-    ACTIONS(283), 1,
-      anon_sym_STAR,
-    ACTIONS(293), 1,
-      anon_sym_LBRACK,
-    ACTIONS(295), 1,
-      anon_sym_LBRACE,
-    ACTIONS(299), 1,
-      anon_sym_not,
-    ACTIONS(305), 1,
-      anon_sym_lambda,
-    ACTIONS(315), 1,
-      sym__string_start,
-    ACTIONS(718), 1,
-      anon_sym_LPAREN,
-    ACTIONS(722), 1,
-      sym_identifier,
-    ACTIONS(730), 1,
-      anon_sym_await,
-    ACTIONS(790), 1,
-      anon_sym_RPAREN,
-    STATE(600), 1,
-      sym_string,
-    STATE(630), 1,
-      sym_primary_expression,
-    STATE(1124), 1,
-      sym_expression,
-    STATE(1379), 1,
-      sym_parenthesized_list_splat,
-    ACTIONS(309), 2,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(301), 3,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_TILDE,
-    STATE(1373), 3,
-      sym_list_splat,
-      sym_dictionary_splat,
-      sym_keyword_argument,
-    ACTIONS(311), 4,
-      sym_integer,
-      sym_true,
-      sym_false,
-      sym_none,
-    ACTIONS(728), 5,
-      anon_sym_print,
-      anon_sym_async,
-      anon_sym_match,
-      anon_sym_exec,
-      anon_sym_type,
-    STATE(900), 7,
-      sym_named_expression,
-      sym_not_operator,
-      sym_boolean_operator,
-      sym_comparison_operator,
-      sym_lambda,
-      sym_conditional_expression,
-      sym_await,
-    STATE(642), 15,
-      sym_binary_operator,
-      sym_unary_operator,
-      sym_attribute,
-      sym_subscript,
-      sym_call,
-      sym_list,
-      sym_set,
-      sym_tuple,
-      sym_dictionary,
-      sym_list_comprehension,
-      sym_dictionary_comprehension,
-      sym_set_comprehension,
-      sym_generator_expression,
-      sym_parenthesized_expression,
-      sym_concatenated_string,
-  [4788] = 25,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(295), 1,
-      anon_sym_LBRACE,
-    ACTIONS(315), 1,
-      sym__string_start,
-    ACTIONS(602), 1,
-      sym_identifier,
-    ACTIONS(612), 1,
-      anon_sym_LBRACK,
-    ACTIONS(614), 1,
-      anon_sym_not,
-    ACTIONS(616), 1,
-      anon_sym_lambda,
-    ACTIONS(618), 1,
-      anon_sym_await,
-    ACTIONS(664), 1,
+    ACTIONS(630), 1,
       anon_sym_yield,
-    ACTIONS(692), 1,
+    ACTIONS(668), 1,
+      sym_identifier,
+    ACTIONS(670), 1,
       anon_sym_LPAREN,
-    ACTIONS(716), 1,
+    ACTIONS(678), 1,
+      anon_sym_await,
+    ACTIONS(706), 1,
       anon_sym_STAR,
-    ACTIONS(792), 1,
+    ACTIONS(726), 1,
       anon_sym_RPAREN,
-    STATE(600), 1,
+    STATE(586), 1,
       sym_string,
-    STATE(643), 1,
+    STATE(590), 1,
       sym_primary_expression,
-    STATE(930), 1,
+    STATE(918), 1,
       sym_expression,
-    STATE(1219), 1,
+    STATE(1216), 1,
       sym_yield,
-    STATE(1301), 1,
-      sym_parenthesized_list_splat,
-    STATE(1303), 1,
-      sym_list_splat,
-    STATE(1484), 1,
+    STATE(1471), 1,
       sym__collection_elements,
-    ACTIONS(309), 2,
+    ACTIONS(293), 2,
       sym_ellipsis,
       sym_float,
-    ACTIONS(610), 3,
+    STATE(1100), 2,
+      sym_list_splat,
+      sym_parenthesized_list_splat,
+    ACTIONS(582), 3,
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
-    ACTIONS(311), 4,
+    ACTIONS(295), 4,
       sym_integer,
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(606), 5,
+    ACTIONS(674), 5,
       anon_sym_print,
       anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(900), 7,
+    STATE(883), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-      sym_await,
-    STATE(642), 15,
+    STATE(605), 16,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -29955,7 +25638,564 @@ static const uint16_t ts_small_parse_table[] = {
       sym_generator_expression,
       sym_parenthesized_expression,
       sym_concatenated_string,
-  [4894] = 23,
+      sym_await,
+  [3780] = 23,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(53), 1,
+      anon_sym_STAR_STAR,
+    ACTIONS(267), 1,
+      anon_sym_STAR,
+    ACTIONS(277), 1,
+      anon_sym_LBRACK,
+    ACTIONS(279), 1,
+      anon_sym_LBRACE,
+    ACTIONS(283), 1,
+      anon_sym_not,
+    ACTIONS(289), 1,
+      anon_sym_lambda,
+    ACTIONS(299), 1,
+      sym__string_start,
+    ACTIONS(688), 1,
+      sym_identifier,
+    ACTIONS(690), 1,
+      anon_sym_LPAREN,
+    ACTIONS(698), 1,
+      anon_sym_await,
+    ACTIONS(740), 1,
+      anon_sym_RPAREN,
+    STATE(586), 1,
+      sym_string,
+    STATE(616), 1,
+      sym_primary_expression,
+    STATE(1089), 1,
+      sym_expression,
+    STATE(1370), 1,
+      sym_parenthesized_list_splat,
+    ACTIONS(293), 2,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(285), 3,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_TILDE,
+    STATE(1371), 3,
+      sym_list_splat,
+      sym_dictionary_splat,
+      sym_keyword_argument,
+    ACTIONS(295), 4,
+      sym_integer,
+      sym_true,
+      sym_false,
+      sym_none,
+    ACTIONS(696), 5,
+      anon_sym_print,
+      anon_sym_async,
+      anon_sym_match,
+      anon_sym_exec,
+      anon_sym_type,
+    STATE(883), 6,
+      sym_named_expression,
+      sym_not_operator,
+      sym_boolean_operator,
+      sym_comparison_operator,
+      sym_lambda,
+      sym_conditional_expression,
+    STATE(605), 16,
+      sym_binary_operator,
+      sym_unary_operator,
+      sym_attribute,
+      sym_subscript,
+      sym_call,
+      sym_list,
+      sym_set,
+      sym_tuple,
+      sym_dictionary,
+      sym_list_comprehension,
+      sym_dictionary_comprehension,
+      sym_set_comprehension,
+      sym_generator_expression,
+      sym_parenthesized_expression,
+      sym_concatenated_string,
+      sym_await,
+  [3882] = 25,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(279), 1,
+      anon_sym_LBRACE,
+    ACTIONS(299), 1,
+      sym__string_start,
+    ACTIONS(584), 1,
+      anon_sym_LBRACK,
+    ACTIONS(626), 1,
+      anon_sym_not,
+    ACTIONS(628), 1,
+      anon_sym_lambda,
+    ACTIONS(630), 1,
+      anon_sym_yield,
+    ACTIONS(668), 1,
+      sym_identifier,
+    ACTIONS(670), 1,
+      anon_sym_LPAREN,
+    ACTIONS(678), 1,
+      anon_sym_await,
+    ACTIONS(706), 1,
+      anon_sym_STAR,
+    ACTIONS(742), 1,
+      anon_sym_RPAREN,
+    STATE(586), 1,
+      sym_string,
+    STATE(590), 1,
+      sym_primary_expression,
+    STATE(918), 1,
+      sym_expression,
+    STATE(1216), 1,
+      sym_yield,
+    STATE(1298), 1,
+      sym_list_splat,
+    STATE(1303), 1,
+      sym_parenthesized_list_splat,
+    STATE(1471), 1,
+      sym__collection_elements,
+    ACTIONS(293), 2,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(582), 3,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_TILDE,
+    ACTIONS(295), 4,
+      sym_integer,
+      sym_true,
+      sym_false,
+      sym_none,
+    ACTIONS(674), 5,
+      anon_sym_print,
+      anon_sym_async,
+      anon_sym_match,
+      anon_sym_exec,
+      anon_sym_type,
+    STATE(883), 6,
+      sym_named_expression,
+      sym_not_operator,
+      sym_boolean_operator,
+      sym_comparison_operator,
+      sym_lambda,
+      sym_conditional_expression,
+    STATE(605), 16,
+      sym_binary_operator,
+      sym_unary_operator,
+      sym_attribute,
+      sym_subscript,
+      sym_call,
+      sym_list,
+      sym_set,
+      sym_tuple,
+      sym_dictionary,
+      sym_list_comprehension,
+      sym_dictionary_comprehension,
+      sym_set_comprehension,
+      sym_generator_expression,
+      sym_parenthesized_expression,
+      sym_concatenated_string,
+      sym_await,
+  [3988] = 23,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(51), 1,
+      anon_sym_LBRACE,
+    ACTIONS(69), 1,
+      anon_sym_not,
+    ACTIONS(71), 1,
+      anon_sym_lambda,
+    ACTIONS(81), 1,
+      sym__string_start,
+    ACTIONS(327), 1,
+      sym_identifier,
+    ACTIONS(333), 1,
+      anon_sym_await,
+    ACTIONS(568), 1,
+      anon_sym_LPAREN,
+    ACTIONS(574), 1,
+      anon_sym_LBRACK,
+    ACTIONS(736), 1,
+      anon_sym_STAR,
+    ACTIONS(738), 1,
+      anon_sym_STAR_STAR,
+    ACTIONS(744), 1,
+      anon_sym_from,
+    STATE(707), 1,
+      sym_primary_expression,
+    STATE(709), 1,
+      sym_string,
+    STATE(1026), 1,
+      sym_expression,
+    ACTIONS(75), 2,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(664), 2,
+      sym__newline,
+      sym__semicolon,
+    STATE(1150), 2,
+      sym_list_splat,
+      sym_dictionary_splat,
+    ACTIONS(47), 3,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_TILDE,
+    ACTIONS(77), 4,
+      sym_integer,
+      sym_true,
+      sym_false,
+      sym_none,
+    ACTIONS(329), 5,
+      anon_sym_print,
+      anon_sym_async,
+      anon_sym_match,
+      anon_sym_exec,
+      anon_sym_type,
+    STATE(985), 6,
+      sym_named_expression,
+      sym_not_operator,
+      sym_boolean_operator,
+      sym_comparison_operator,
+      sym_lambda,
+      sym_conditional_expression,
+    STATE(759), 16,
+      sym_binary_operator,
+      sym_unary_operator,
+      sym_attribute,
+      sym_subscript,
+      sym_call,
+      sym_list,
+      sym_set,
+      sym_tuple,
+      sym_dictionary,
+      sym_list_comprehension,
+      sym_dictionary_comprehension,
+      sym_set_comprehension,
+      sym_generator_expression,
+      sym_parenthesized_expression,
+      sym_concatenated_string,
+      sym_await,
+  [4090] = 23,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(53), 1,
+      anon_sym_STAR_STAR,
+    ACTIONS(267), 1,
+      anon_sym_STAR,
+    ACTIONS(277), 1,
+      anon_sym_LBRACK,
+    ACTIONS(279), 1,
+      anon_sym_LBRACE,
+    ACTIONS(283), 1,
+      anon_sym_not,
+    ACTIONS(289), 1,
+      anon_sym_lambda,
+    ACTIONS(299), 1,
+      sym__string_start,
+    ACTIONS(688), 1,
+      sym_identifier,
+    ACTIONS(690), 1,
+      anon_sym_LPAREN,
+    ACTIONS(698), 1,
+      anon_sym_await,
+    ACTIONS(746), 1,
+      anon_sym_RPAREN,
+    STATE(586), 1,
+      sym_string,
+    STATE(616), 1,
+      sym_primary_expression,
+    STATE(1089), 1,
+      sym_expression,
+    STATE(1370), 1,
+      sym_parenthesized_list_splat,
+    ACTIONS(293), 2,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(285), 3,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_TILDE,
+    STATE(1371), 3,
+      sym_list_splat,
+      sym_dictionary_splat,
+      sym_keyword_argument,
+    ACTIONS(295), 4,
+      sym_integer,
+      sym_true,
+      sym_false,
+      sym_none,
+    ACTIONS(696), 5,
+      anon_sym_print,
+      anon_sym_async,
+      anon_sym_match,
+      anon_sym_exec,
+      anon_sym_type,
+    STATE(883), 6,
+      sym_named_expression,
+      sym_not_operator,
+      sym_boolean_operator,
+      sym_comparison_operator,
+      sym_lambda,
+      sym_conditional_expression,
+    STATE(605), 16,
+      sym_binary_operator,
+      sym_unary_operator,
+      sym_attribute,
+      sym_subscript,
+      sym_call,
+      sym_list,
+      sym_set,
+      sym_tuple,
+      sym_dictionary,
+      sym_list_comprehension,
+      sym_dictionary_comprehension,
+      sym_set_comprehension,
+      sym_generator_expression,
+      sym_parenthesized_expression,
+      sym_concatenated_string,
+      sym_await,
+  [4192] = 24,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(279), 1,
+      anon_sym_LBRACE,
+    ACTIONS(299), 1,
+      sym__string_start,
+    ACTIONS(584), 1,
+      anon_sym_LBRACK,
+    ACTIONS(626), 1,
+      anon_sym_not,
+    ACTIONS(628), 1,
+      anon_sym_lambda,
+    ACTIONS(630), 1,
+      anon_sym_yield,
+    ACTIONS(668), 1,
+      sym_identifier,
+    ACTIONS(670), 1,
+      anon_sym_LPAREN,
+    ACTIONS(678), 1,
+      anon_sym_await,
+    ACTIONS(706), 1,
+      anon_sym_STAR,
+    ACTIONS(748), 1,
+      anon_sym_RPAREN,
+    STATE(586), 1,
+      sym_string,
+    STATE(590), 1,
+      sym_primary_expression,
+    STATE(934), 1,
+      sym_expression,
+    STATE(1307), 1,
+      sym_yield,
+    STATE(1418), 1,
+      sym__collection_elements,
+    ACTIONS(293), 2,
+      sym_ellipsis,
+      sym_float,
+    STATE(1100), 2,
+      sym_list_splat,
+      sym_parenthesized_list_splat,
+    ACTIONS(582), 3,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_TILDE,
+    ACTIONS(295), 4,
+      sym_integer,
+      sym_true,
+      sym_false,
+      sym_none,
+    ACTIONS(674), 5,
+      anon_sym_print,
+      anon_sym_async,
+      anon_sym_match,
+      anon_sym_exec,
+      anon_sym_type,
+    STATE(883), 6,
+      sym_named_expression,
+      sym_not_operator,
+      sym_boolean_operator,
+      sym_comparison_operator,
+      sym_lambda,
+      sym_conditional_expression,
+    STATE(605), 16,
+      sym_binary_operator,
+      sym_unary_operator,
+      sym_attribute,
+      sym_subscript,
+      sym_call,
+      sym_list,
+      sym_set,
+      sym_tuple,
+      sym_dictionary,
+      sym_list_comprehension,
+      sym_dictionary_comprehension,
+      sym_set_comprehension,
+      sym_generator_expression,
+      sym_parenthesized_expression,
+      sym_concatenated_string,
+      sym_await,
+  [4296] = 23,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(53), 1,
+      anon_sym_STAR_STAR,
+    ACTIONS(267), 1,
+      anon_sym_STAR,
+    ACTIONS(277), 1,
+      anon_sym_LBRACK,
+    ACTIONS(279), 1,
+      anon_sym_LBRACE,
+    ACTIONS(283), 1,
+      anon_sym_not,
+    ACTIONS(289), 1,
+      anon_sym_lambda,
+    ACTIONS(299), 1,
+      sym__string_start,
+    ACTIONS(688), 1,
+      sym_identifier,
+    ACTIONS(690), 1,
+      anon_sym_LPAREN,
+    ACTIONS(698), 1,
+      anon_sym_await,
+    ACTIONS(750), 1,
+      anon_sym_RPAREN,
+    STATE(586), 1,
+      sym_string,
+    STATE(616), 1,
+      sym_primary_expression,
+    STATE(1089), 1,
+      sym_expression,
+    STATE(1370), 1,
+      sym_parenthesized_list_splat,
+    ACTIONS(293), 2,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(285), 3,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_TILDE,
+    STATE(1371), 3,
+      sym_list_splat,
+      sym_dictionary_splat,
+      sym_keyword_argument,
+    ACTIONS(295), 4,
+      sym_integer,
+      sym_true,
+      sym_false,
+      sym_none,
+    ACTIONS(696), 5,
+      anon_sym_print,
+      anon_sym_async,
+      anon_sym_match,
+      anon_sym_exec,
+      anon_sym_type,
+    STATE(883), 6,
+      sym_named_expression,
+      sym_not_operator,
+      sym_boolean_operator,
+      sym_comparison_operator,
+      sym_lambda,
+      sym_conditional_expression,
+    STATE(605), 16,
+      sym_binary_operator,
+      sym_unary_operator,
+      sym_attribute,
+      sym_subscript,
+      sym_call,
+      sym_list,
+      sym_set,
+      sym_tuple,
+      sym_dictionary,
+      sym_list_comprehension,
+      sym_dictionary_comprehension,
+      sym_set_comprehension,
+      sym_generator_expression,
+      sym_parenthesized_expression,
+      sym_concatenated_string,
+      sym_await,
+  [4398] = 23,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(53), 1,
+      anon_sym_STAR_STAR,
+    ACTIONS(267), 1,
+      anon_sym_STAR,
+    ACTIONS(277), 1,
+      anon_sym_LBRACK,
+    ACTIONS(279), 1,
+      anon_sym_LBRACE,
+    ACTIONS(283), 1,
+      anon_sym_not,
+    ACTIONS(289), 1,
+      anon_sym_lambda,
+    ACTIONS(299), 1,
+      sym__string_start,
+    ACTIONS(688), 1,
+      sym_identifier,
+    ACTIONS(690), 1,
+      anon_sym_LPAREN,
+    ACTIONS(698), 1,
+      anon_sym_await,
+    ACTIONS(752), 1,
+      anon_sym_RPAREN,
+    STATE(586), 1,
+      sym_string,
+    STATE(616), 1,
+      sym_primary_expression,
+    STATE(1089), 1,
+      sym_expression,
+    STATE(1370), 1,
+      sym_parenthesized_list_splat,
+    ACTIONS(293), 2,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(285), 3,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_TILDE,
+    STATE(1371), 3,
+      sym_list_splat,
+      sym_dictionary_splat,
+      sym_keyword_argument,
+    ACTIONS(295), 4,
+      sym_integer,
+      sym_true,
+      sym_false,
+      sym_none,
+    ACTIONS(696), 5,
+      anon_sym_print,
+      anon_sym_async,
+      anon_sym_match,
+      anon_sym_exec,
+      anon_sym_type,
+    STATE(883), 6,
+      sym_named_expression,
+      sym_not_operator,
+      sym_boolean_operator,
+      sym_comparison_operator,
+      sym_lambda,
+      sym_conditional_expression,
+    STATE(605), 16,
+      sym_binary_operator,
+      sym_unary_operator,
+      sym_attribute,
+      sym_subscript,
+      sym_call,
+      sym_list,
+      sym_set,
+      sym_tuple,
+      sym_dictionary,
+      sym_list_comprehension,
+      sym_dictionary_comprehension,
+      sym_set_comprehension,
+      sym_generator_expression,
+      sym_parenthesized_expression,
+      sym_concatenated_string,
+      sym_await,
+  [4500] = 23,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(51), 1,
@@ -29968,31 +26208,31 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_lambda,
     ACTIONS(81), 1,
       sym__string_start,
-    ACTIONS(283), 1,
+    ACTIONS(267), 1,
       anon_sym_STAR,
-    ACTIONS(331), 1,
+    ACTIONS(327), 1,
       sym_identifier,
-    ACTIONS(337), 1,
+    ACTIONS(333), 1,
       anon_sym_await,
-    ACTIONS(559), 1,
+    ACTIONS(568), 1,
       anon_sym_LPAREN,
-    ACTIONS(563), 1,
+    ACTIONS(574), 1,
       anon_sym_LBRACK,
-    STATE(684), 1,
+    STATE(707), 1,
       sym_primary_expression,
-    STATE(713), 1,
+    STATE(709), 1,
       sym_string,
-    STATE(1045), 1,
+    STATE(1025), 1,
       sym_expression,
-    STATE(1394), 1,
+    STATE(1322), 1,
       sym_expression_list,
     ACTIONS(75), 2,
       sym_ellipsis,
       sym_float,
-    ACTIONS(794), 2,
+    ACTIONS(754), 2,
       sym__newline,
       sym__semicolon,
-    STATE(1360), 2,
+    STATE(1321), 2,
       sym_list_splat,
       sym_dictionary_splat,
     ACTIONS(47), 3,
@@ -30004,21 +26244,20 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(333), 5,
+    ACTIONS(329), 5,
       anon_sym_print,
       anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(1009), 7,
+    STATE(985), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-      sym_await,
-    STATE(797), 15,
+    STATE(759), 16,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -30034,1228 +26273,279 @@ static const uint16_t ts_small_parse_table[] = {
       sym_generator_expression,
       sym_parenthesized_expression,
       sym_concatenated_string,
-  [4996] = 21,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(295), 1,
-      anon_sym_LBRACE,
-    ACTIONS(315), 1,
-      sym__string_start,
-    ACTIONS(602), 1,
-      sym_identifier,
-    ACTIONS(604), 1,
-      anon_sym_LPAREN,
-    ACTIONS(612), 1,
-      anon_sym_LBRACK,
-    ACTIONS(614), 1,
-      anon_sym_not,
-    ACTIONS(618), 1,
-      anon_sym_await,
-    ACTIONS(758), 1,
-      anon_sym_lambda,
-    STATE(600), 1,
-      sym_string,
-    STATE(643), 1,
-      sym_primary_expression,
-    STATE(962), 1,
-      sym_expression,
-    ACTIONS(309), 2,
-      sym_ellipsis,
-      sym_float,
-    STATE(1018), 2,
-      sym__expression_within_for_in_clause,
-      sym_lambda_within_for_in_clause,
-    ACTIONS(610), 3,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_TILDE,
-    ACTIONS(796), 3,
-      anon_sym_RPAREN,
-      anon_sym_RBRACK,
-      anon_sym_RBRACE,
-    ACTIONS(798), 3,
-      anon_sym_if,
-      anon_sym_async,
-      anon_sym_for,
-    ACTIONS(311), 4,
-      sym_integer,
-      sym_true,
-      sym_false,
-      sym_none,
-    ACTIONS(606), 4,
-      anon_sym_print,
-      anon_sym_match,
-      anon_sym_exec,
-      anon_sym_type,
-    STATE(900), 7,
-      sym_named_expression,
-      sym_not_operator,
-      sym_boolean_operator,
-      sym_comparison_operator,
-      sym_lambda,
-      sym_conditional_expression,
       sym_await,
-    STATE(642), 15,
-      sym_binary_operator,
-      sym_unary_operator,
-      sym_attribute,
-      sym_subscript,
-      sym_call,
-      sym_list,
-      sym_set,
-      sym_tuple,
-      sym_dictionary,
-      sym_list_comprehension,
-      sym_dictionary_comprehension,
-      sym_set_comprehension,
-      sym_generator_expression,
-      sym_parenthesized_expression,
-      sym_concatenated_string,
-  [5094] = 23,
+  [4602] = 21,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(53), 1,
-      anon_sym_STAR_STAR,
-    ACTIONS(283), 1,
-      anon_sym_STAR,
-    ACTIONS(293), 1,
-      anon_sym_LBRACK,
-    ACTIONS(295), 1,
+    ACTIONS(279), 1,
       anon_sym_LBRACE,
     ACTIONS(299), 1,
-      anon_sym_not,
-    ACTIONS(305), 1,
-      anon_sym_lambda,
-    ACTIONS(315), 1,
       sym__string_start,
-    ACTIONS(718), 1,
+    ACTIONS(578), 1,
       anon_sym_LPAREN,
-    ACTIONS(722), 1,
-      sym_identifier,
-    ACTIONS(730), 1,
-      anon_sym_await,
-    ACTIONS(800), 1,
-      anon_sym_RPAREN,
-    STATE(600), 1,
-      sym_string,
-    STATE(630), 1,
-      sym_primary_expression,
-    STATE(1124), 1,
-      sym_expression,
-    STATE(1379), 1,
-      sym_parenthesized_list_splat,
-    ACTIONS(309), 2,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(301), 3,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_TILDE,
-    STATE(1373), 3,
-      sym_list_splat,
-      sym_dictionary_splat,
-      sym_keyword_argument,
-    ACTIONS(311), 4,
-      sym_integer,
-      sym_true,
-      sym_false,
-      sym_none,
-    ACTIONS(728), 5,
-      anon_sym_print,
-      anon_sym_async,
-      anon_sym_match,
-      anon_sym_exec,
-      anon_sym_type,
-    STATE(900), 7,
-      sym_named_expression,
-      sym_not_operator,
-      sym_boolean_operator,
-      sym_comparison_operator,
-      sym_lambda,
-      sym_conditional_expression,
-      sym_await,
-    STATE(642), 15,
-      sym_binary_operator,
-      sym_unary_operator,
-      sym_attribute,
-      sym_subscript,
-      sym_call,
-      sym_list,
-      sym_set,
-      sym_tuple,
-      sym_dictionary,
-      sym_list_comprehension,
-      sym_dictionary_comprehension,
-      sym_set_comprehension,
-      sym_generator_expression,
-      sym_parenthesized_expression,
-      sym_concatenated_string,
-  [5196] = 24,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(295), 1,
-      anon_sym_LBRACE,
-    ACTIONS(315), 1,
-      sym__string_start,
-    ACTIONS(602), 1,
-      sym_identifier,
-    ACTIONS(612), 1,
+    ACTIONS(584), 1,
       anon_sym_LBRACK,
-    ACTIONS(614), 1,
+    ACTIONS(626), 1,
       anon_sym_not,
-    ACTIONS(616), 1,
-      anon_sym_lambda,
-    ACTIONS(618), 1,
-      anon_sym_await,
-    ACTIONS(664), 1,
-      anon_sym_yield,
-    ACTIONS(692), 1,
-      anon_sym_LPAREN,
-    ACTIONS(716), 1,
-      anon_sym_STAR,
-    ACTIONS(792), 1,
-      anon_sym_RPAREN,
-    STATE(600), 1,
-      sym_string,
-    STATE(643), 1,
-      sym_primary_expression,
-    STATE(930), 1,
-      sym_expression,
-    STATE(1219), 1,
-      sym_yield,
-    STATE(1484), 1,
-      sym__collection_elements,
-    ACTIONS(309), 2,
-      sym_ellipsis,
-      sym_float,
-    STATE(1100), 2,
-      sym_list_splat,
-      sym_parenthesized_list_splat,
-    ACTIONS(610), 3,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_TILDE,
-    ACTIONS(311), 4,
-      sym_integer,
-      sym_true,
-      sym_false,
-      sym_none,
-    ACTIONS(606), 5,
-      anon_sym_print,
-      anon_sym_async,
-      anon_sym_match,
-      anon_sym_exec,
-      anon_sym_type,
-    STATE(900), 7,
-      sym_named_expression,
-      sym_not_operator,
-      sym_boolean_operator,
-      sym_comparison_operator,
-      sym_lambda,
-      sym_conditional_expression,
-      sym_await,
-    STATE(642), 15,
-      sym_binary_operator,
-      sym_unary_operator,
-      sym_attribute,
-      sym_subscript,
-      sym_call,
-      sym_list,
-      sym_set,
-      sym_tuple,
-      sym_dictionary,
-      sym_list_comprehension,
-      sym_dictionary_comprehension,
-      sym_set_comprehension,
-      sym_generator_expression,
-      sym_parenthesized_expression,
-      sym_concatenated_string,
-  [5300] = 23,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(51), 1,
-      anon_sym_LBRACE,
-    ACTIONS(69), 1,
-      anon_sym_not,
-    ACTIONS(71), 1,
-      anon_sym_lambda,
-    ACTIONS(81), 1,
-      sym__string_start,
-    ACTIONS(331), 1,
+    ACTIONS(668), 1,
       sym_identifier,
-    ACTIONS(337), 1,
+    ACTIONS(678), 1,
       anon_sym_await,
-    ACTIONS(559), 1,
-      anon_sym_LPAREN,
-    ACTIONS(563), 1,
-      anon_sym_LBRACK,
-    ACTIONS(778), 1,
-      anon_sym_from,
-    ACTIONS(780), 1,
-      anon_sym_STAR,
-    ACTIONS(782), 1,
-      anon_sym_STAR_STAR,
-    STATE(684), 1,
-      sym_primary_expression,
-    STATE(713), 1,
-      sym_string,
-    STATE(1036), 1,
-      sym_expression,
-    ACTIONS(75), 2,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(700), 2,
-      sym__newline,
-      sym__semicolon,
-    STATE(1187), 2,
-      sym_list_splat,
-      sym_dictionary_splat,
-    ACTIONS(47), 3,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_TILDE,
-    ACTIONS(77), 4,
-      sym_integer,
-      sym_true,
-      sym_false,
-      sym_none,
-    ACTIONS(333), 5,
-      anon_sym_print,
-      anon_sym_async,
-      anon_sym_match,
-      anon_sym_exec,
-      anon_sym_type,
-    STATE(1009), 7,
-      sym_named_expression,
-      sym_not_operator,
-      sym_boolean_operator,
-      sym_comparison_operator,
-      sym_lambda,
-      sym_conditional_expression,
-      sym_await,
-    STATE(797), 15,
-      sym_binary_operator,
-      sym_unary_operator,
-      sym_attribute,
-      sym_subscript,
-      sym_call,
-      sym_list,
-      sym_set,
-      sym_tuple,
-      sym_dictionary,
-      sym_list_comprehension,
-      sym_dictionary_comprehension,
-      sym_set_comprehension,
-      sym_generator_expression,
-      sym_parenthesized_expression,
-      sym_concatenated_string,
-  [5402] = 23,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(53), 1,
-      anon_sym_STAR_STAR,
-    ACTIONS(283), 1,
-      anon_sym_STAR,
-    ACTIONS(293), 1,
-      anon_sym_LBRACK,
-    ACTIONS(295), 1,
-      anon_sym_LBRACE,
-    ACTIONS(299), 1,
-      anon_sym_not,
-    ACTIONS(305), 1,
+    ACTIONS(760), 1,
       anon_sym_lambda,
-    ACTIONS(315), 1,
-      sym__string_start,
-    ACTIONS(718), 1,
-      anon_sym_LPAREN,
-    ACTIONS(722), 1,
-      sym_identifier,
-    ACTIONS(730), 1,
-      anon_sym_await,
-    ACTIONS(802), 1,
-      anon_sym_RPAREN,
-    STATE(600), 1,
+    STATE(586), 1,
       sym_string,
-    STATE(630), 1,
-      sym_primary_expression,
-    STATE(1124), 1,
-      sym_expression,
-    STATE(1379), 1,
-      sym_parenthesized_list_splat,
-    ACTIONS(309), 2,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(301), 3,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_TILDE,
-    STATE(1373), 3,
-      sym_list_splat,
-      sym_dictionary_splat,
-      sym_keyword_argument,
-    ACTIONS(311), 4,
-      sym_integer,
-      sym_true,
-      sym_false,
-      sym_none,
-    ACTIONS(728), 5,
-      anon_sym_print,
-      anon_sym_async,
-      anon_sym_match,
-      anon_sym_exec,
-      anon_sym_type,
-    STATE(900), 7,
-      sym_named_expression,
-      sym_not_operator,
-      sym_boolean_operator,
-      sym_comparison_operator,
-      sym_lambda,
-      sym_conditional_expression,
-      sym_await,
-    STATE(642), 15,
-      sym_binary_operator,
-      sym_unary_operator,
-      sym_attribute,
-      sym_subscript,
-      sym_call,
-      sym_list,
-      sym_set,
-      sym_tuple,
-      sym_dictionary,
-      sym_list_comprehension,
-      sym_dictionary_comprehension,
-      sym_set_comprehension,
-      sym_generator_expression,
-      sym_parenthesized_expression,
-      sym_concatenated_string,
-  [5504] = 23,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(53), 1,
-      anon_sym_STAR_STAR,
-    ACTIONS(283), 1,
-      anon_sym_STAR,
-    ACTIONS(293), 1,
-      anon_sym_LBRACK,
-    ACTIONS(295), 1,
-      anon_sym_LBRACE,
-    ACTIONS(299), 1,
-      anon_sym_not,
-    ACTIONS(305), 1,
-      anon_sym_lambda,
-    ACTIONS(315), 1,
-      sym__string_start,
-    ACTIONS(718), 1,
-      anon_sym_LPAREN,
-    ACTIONS(722), 1,
-      sym_identifier,
-    ACTIONS(730), 1,
-      anon_sym_await,
-    ACTIONS(804), 1,
-      anon_sym_RPAREN,
-    STATE(600), 1,
-      sym_string,
-    STATE(630), 1,
-      sym_primary_expression,
-    STATE(1124), 1,
-      sym_expression,
-    STATE(1379), 1,
-      sym_parenthesized_list_splat,
-    ACTIONS(309), 2,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(301), 3,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_TILDE,
-    STATE(1373), 3,
-      sym_list_splat,
-      sym_dictionary_splat,
-      sym_keyword_argument,
-    ACTIONS(311), 4,
-      sym_integer,
-      sym_true,
-      sym_false,
-      sym_none,
-    ACTIONS(728), 5,
-      anon_sym_print,
-      anon_sym_async,
-      anon_sym_match,
-      anon_sym_exec,
-      anon_sym_type,
-    STATE(900), 7,
-      sym_named_expression,
-      sym_not_operator,
-      sym_boolean_operator,
-      sym_comparison_operator,
-      sym_lambda,
-      sym_conditional_expression,
-      sym_await,
-    STATE(642), 15,
-      sym_binary_operator,
-      sym_unary_operator,
-      sym_attribute,
-      sym_subscript,
-      sym_call,
-      sym_list,
-      sym_set,
-      sym_tuple,
-      sym_dictionary,
-      sym_list_comprehension,
-      sym_dictionary_comprehension,
-      sym_set_comprehension,
-      sym_generator_expression,
-      sym_parenthesized_expression,
-      sym_concatenated_string,
-  [5606] = 23,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(53), 1,
-      anon_sym_STAR_STAR,
-    ACTIONS(283), 1,
-      anon_sym_STAR,
-    ACTIONS(293), 1,
-      anon_sym_LBRACK,
-    ACTIONS(295), 1,
-      anon_sym_LBRACE,
-    ACTIONS(299), 1,
-      anon_sym_not,
-    ACTIONS(305), 1,
-      anon_sym_lambda,
-    ACTIONS(315), 1,
-      sym__string_start,
-    ACTIONS(718), 1,
-      anon_sym_LPAREN,
-    ACTIONS(722), 1,
-      sym_identifier,
-    ACTIONS(730), 1,
-      anon_sym_await,
-    ACTIONS(806), 1,
-      anon_sym_RPAREN,
-    STATE(600), 1,
-      sym_string,
-    STATE(630), 1,
-      sym_primary_expression,
-    STATE(1124), 1,
-      sym_expression,
-    STATE(1379), 1,
-      sym_parenthesized_list_splat,
-    ACTIONS(309), 2,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(301), 3,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_TILDE,
-    STATE(1373), 3,
-      sym_list_splat,
-      sym_dictionary_splat,
-      sym_keyword_argument,
-    ACTIONS(311), 4,
-      sym_integer,
-      sym_true,
-      sym_false,
-      sym_none,
-    ACTIONS(728), 5,
-      anon_sym_print,
-      anon_sym_async,
-      anon_sym_match,
-      anon_sym_exec,
-      anon_sym_type,
-    STATE(900), 7,
-      sym_named_expression,
-      sym_not_operator,
-      sym_boolean_operator,
-      sym_comparison_operator,
-      sym_lambda,
-      sym_conditional_expression,
-      sym_await,
-    STATE(642), 15,
-      sym_binary_operator,
-      sym_unary_operator,
-      sym_attribute,
-      sym_subscript,
-      sym_call,
-      sym_list,
-      sym_set,
-      sym_tuple,
-      sym_dictionary,
-      sym_list_comprehension,
-      sym_dictionary_comprehension,
-      sym_set_comprehension,
-      sym_generator_expression,
-      sym_parenthesized_expression,
-      sym_concatenated_string,
-  [5708] = 23,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(53), 1,
-      anon_sym_STAR_STAR,
-    ACTIONS(283), 1,
-      anon_sym_STAR,
-    ACTIONS(293), 1,
-      anon_sym_LBRACK,
-    ACTIONS(295), 1,
-      anon_sym_LBRACE,
-    ACTIONS(299), 1,
-      anon_sym_not,
-    ACTIONS(305), 1,
-      anon_sym_lambda,
-    ACTIONS(315), 1,
-      sym__string_start,
-    ACTIONS(718), 1,
-      anon_sym_LPAREN,
-    ACTIONS(722), 1,
-      sym_identifier,
-    ACTIONS(730), 1,
-      anon_sym_await,
-    ACTIONS(808), 1,
-      anon_sym_RPAREN,
-    STATE(600), 1,
-      sym_string,
-    STATE(630), 1,
-      sym_primary_expression,
-    STATE(1124), 1,
-      sym_expression,
-    STATE(1379), 1,
-      sym_parenthesized_list_splat,
-    ACTIONS(309), 2,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(301), 3,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_TILDE,
-    STATE(1373), 3,
-      sym_list_splat,
-      sym_dictionary_splat,
-      sym_keyword_argument,
-    ACTIONS(311), 4,
-      sym_integer,
-      sym_true,
-      sym_false,
-      sym_none,
-    ACTIONS(728), 5,
-      anon_sym_print,
-      anon_sym_async,
-      anon_sym_match,
-      anon_sym_exec,
-      anon_sym_type,
-    STATE(900), 7,
-      sym_named_expression,
-      sym_not_operator,
-      sym_boolean_operator,
-      sym_comparison_operator,
-      sym_lambda,
-      sym_conditional_expression,
-      sym_await,
-    STATE(642), 15,
-      sym_binary_operator,
-      sym_unary_operator,
-      sym_attribute,
-      sym_subscript,
-      sym_call,
-      sym_list,
-      sym_set,
-      sym_tuple,
-      sym_dictionary,
-      sym_list_comprehension,
-      sym_dictionary_comprehension,
-      sym_set_comprehension,
-      sym_generator_expression,
-      sym_parenthesized_expression,
-      sym_concatenated_string,
-  [5810] = 23,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(51), 1,
-      anon_sym_LBRACE,
-    ACTIONS(69), 1,
-      anon_sym_not,
-    ACTIONS(71), 1,
-      anon_sym_lambda,
-    ACTIONS(81), 1,
-      sym__string_start,
-    ACTIONS(331), 1,
-      sym_identifier,
-    ACTIONS(337), 1,
-      anon_sym_await,
-    ACTIONS(559), 1,
-      anon_sym_LPAREN,
-    ACTIONS(563), 1,
-      anon_sym_LBRACK,
-    ACTIONS(780), 1,
-      anon_sym_STAR,
-    ACTIONS(782), 1,
-      anon_sym_STAR_STAR,
-    ACTIONS(810), 1,
-      anon_sym_from,
-    STATE(684), 1,
-      sym_primary_expression,
-    STATE(713), 1,
-      sym_string,
-    STATE(1036), 1,
-      sym_expression,
-    ACTIONS(75), 2,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(698), 2,
-      sym__newline,
-      sym__semicolon,
-    STATE(1187), 2,
-      sym_list_splat,
-      sym_dictionary_splat,
-    ACTIONS(47), 3,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_TILDE,
-    ACTIONS(77), 4,
-      sym_integer,
-      sym_true,
-      sym_false,
-      sym_none,
-    ACTIONS(333), 5,
-      anon_sym_print,
-      anon_sym_async,
-      anon_sym_match,
-      anon_sym_exec,
-      anon_sym_type,
-    STATE(1009), 7,
-      sym_named_expression,
-      sym_not_operator,
-      sym_boolean_operator,
-      sym_comparison_operator,
-      sym_lambda,
-      sym_conditional_expression,
-      sym_await,
-    STATE(797), 15,
-      sym_binary_operator,
-      sym_unary_operator,
-      sym_attribute,
-      sym_subscript,
-      sym_call,
-      sym_list,
-      sym_set,
-      sym_tuple,
-      sym_dictionary,
-      sym_list_comprehension,
-      sym_dictionary_comprehension,
-      sym_set_comprehension,
-      sym_generator_expression,
-      sym_parenthesized_expression,
-      sym_concatenated_string,
-  [5912] = 25,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(295), 1,
-      anon_sym_LBRACE,
-    ACTIONS(315), 1,
-      sym__string_start,
-    ACTIONS(602), 1,
-      sym_identifier,
-    ACTIONS(612), 1,
-      anon_sym_LBRACK,
-    ACTIONS(614), 1,
-      anon_sym_not,
-    ACTIONS(616), 1,
-      anon_sym_lambda,
-    ACTIONS(618), 1,
-      anon_sym_await,
-    ACTIONS(664), 1,
-      anon_sym_yield,
-    ACTIONS(692), 1,
-      anon_sym_LPAREN,
-    ACTIONS(714), 1,
-      anon_sym_RPAREN,
-    ACTIONS(716), 1,
-      anon_sym_STAR,
-    STATE(600), 1,
-      sym_string,
-    STATE(643), 1,
-      sym_primary_expression,
-    STATE(930), 1,
-      sym_expression,
-    STATE(1219), 1,
-      sym_yield,
-    STATE(1301), 1,
-      sym_parenthesized_list_splat,
-    STATE(1303), 1,
-      sym_list_splat,
-    STATE(1484), 1,
-      sym__collection_elements,
-    ACTIONS(309), 2,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(610), 3,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_TILDE,
-    ACTIONS(311), 4,
-      sym_integer,
-      sym_true,
-      sym_false,
-      sym_none,
-    ACTIONS(606), 5,
-      anon_sym_print,
-      anon_sym_async,
-      anon_sym_match,
-      anon_sym_exec,
-      anon_sym_type,
-    STATE(900), 7,
-      sym_named_expression,
-      sym_not_operator,
-      sym_boolean_operator,
-      sym_comparison_operator,
-      sym_lambda,
-      sym_conditional_expression,
-      sym_await,
-    STATE(642), 15,
-      sym_binary_operator,
-      sym_unary_operator,
-      sym_attribute,
-      sym_subscript,
-      sym_call,
-      sym_list,
-      sym_set,
-      sym_tuple,
-      sym_dictionary,
-      sym_list_comprehension,
-      sym_dictionary_comprehension,
-      sym_set_comprehension,
-      sym_generator_expression,
-      sym_parenthesized_expression,
-      sym_concatenated_string,
-  [6018] = 24,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(295), 1,
-      anon_sym_LBRACE,
-    ACTIONS(315), 1,
-      sym__string_start,
-    ACTIONS(602), 1,
-      sym_identifier,
-    ACTIONS(612), 1,
-      anon_sym_LBRACK,
-    ACTIONS(614), 1,
-      anon_sym_not,
-    ACTIONS(616), 1,
-      anon_sym_lambda,
-    ACTIONS(618), 1,
-      anon_sym_await,
-    ACTIONS(664), 1,
-      anon_sym_yield,
-    ACTIONS(692), 1,
-      anon_sym_LPAREN,
-    ACTIONS(714), 1,
-      anon_sym_RPAREN,
-    ACTIONS(716), 1,
-      anon_sym_STAR,
-    STATE(600), 1,
-      sym_string,
-    STATE(643), 1,
-      sym_primary_expression,
-    STATE(945), 1,
-      sym_expression,
-    STATE(1313), 1,
-      sym_yield,
-    STATE(1475), 1,
-      sym__collection_elements,
-    ACTIONS(309), 2,
-      sym_ellipsis,
-      sym_float,
-    STATE(1100), 2,
-      sym_list_splat,
-      sym_parenthesized_list_splat,
-    ACTIONS(610), 3,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_TILDE,
-    ACTIONS(311), 4,
-      sym_integer,
-      sym_true,
-      sym_false,
-      sym_none,
-    ACTIONS(606), 5,
-      anon_sym_print,
-      anon_sym_async,
-      anon_sym_match,
-      anon_sym_exec,
-      anon_sym_type,
-    STATE(900), 7,
-      sym_named_expression,
-      sym_not_operator,
-      sym_boolean_operator,
-      sym_comparison_operator,
-      sym_lambda,
-      sym_conditional_expression,
-      sym_await,
-    STATE(642), 15,
-      sym_binary_operator,
-      sym_unary_operator,
-      sym_attribute,
-      sym_subscript,
-      sym_call,
-      sym_list,
-      sym_set,
-      sym_tuple,
-      sym_dictionary,
-      sym_list_comprehension,
-      sym_dictionary_comprehension,
-      sym_set_comprehension,
-      sym_generator_expression,
-      sym_parenthesized_expression,
-      sym_concatenated_string,
-  [6122] = 21,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(295), 1,
-      anon_sym_LBRACE,
-    ACTIONS(315), 1,
-      sym__string_start,
-    ACTIONS(602), 1,
-      sym_identifier,
-    ACTIONS(604), 1,
-      anon_sym_LPAREN,
-    ACTIONS(612), 1,
-      anon_sym_LBRACK,
-    ACTIONS(614), 1,
-      anon_sym_not,
-    ACTIONS(618), 1,
-      anon_sym_await,
-    ACTIONS(758), 1,
-      anon_sym_lambda,
-    STATE(600), 1,
-      sym_string,
-    STATE(643), 1,
-      sym_primary_expression,
-    STATE(962), 1,
-      sym_expression,
-    ACTIONS(309), 2,
-      sym_ellipsis,
-      sym_float,
-    STATE(1018), 2,
-      sym__expression_within_for_in_clause,
-      sym_lambda_within_for_in_clause,
-    ACTIONS(610), 3,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_TILDE,
-    ACTIONS(812), 3,
-      anon_sym_RPAREN,
-      anon_sym_RBRACK,
-      anon_sym_RBRACE,
-    ACTIONS(814), 3,
-      anon_sym_if,
-      anon_sym_async,
-      anon_sym_for,
-    ACTIONS(311), 4,
-      sym_integer,
-      sym_true,
-      sym_false,
-      sym_none,
-    ACTIONS(606), 4,
-      anon_sym_print,
-      anon_sym_match,
-      anon_sym_exec,
-      anon_sym_type,
-    STATE(900), 7,
-      sym_named_expression,
-      sym_not_operator,
-      sym_boolean_operator,
-      sym_comparison_operator,
-      sym_lambda,
-      sym_conditional_expression,
-      sym_await,
-    STATE(642), 15,
-      sym_binary_operator,
-      sym_unary_operator,
-      sym_attribute,
-      sym_subscript,
-      sym_call,
-      sym_list,
-      sym_set,
-      sym_tuple,
-      sym_dictionary,
-      sym_list_comprehension,
-      sym_dictionary_comprehension,
-      sym_set_comprehension,
-      sym_generator_expression,
-      sym_parenthesized_expression,
-      sym_concatenated_string,
-  [6220] = 23,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(53), 1,
-      anon_sym_STAR_STAR,
-    ACTIONS(283), 1,
-      anon_sym_STAR,
-    ACTIONS(293), 1,
-      anon_sym_LBRACK,
-    ACTIONS(295), 1,
-      anon_sym_LBRACE,
-    ACTIONS(299), 1,
-      anon_sym_not,
-    ACTIONS(305), 1,
-      anon_sym_lambda,
-    ACTIONS(315), 1,
-      sym__string_start,
-    ACTIONS(718), 1,
-      anon_sym_LPAREN,
-    ACTIONS(722), 1,
-      sym_identifier,
-    ACTIONS(730), 1,
-      anon_sym_await,
-    ACTIONS(816), 1,
-      anon_sym_RPAREN,
-    STATE(600), 1,
-      sym_string,
-    STATE(630), 1,
-      sym_primary_expression,
-    STATE(1124), 1,
-      sym_expression,
-    STATE(1379), 1,
-      sym_parenthesized_list_splat,
-    ACTIONS(309), 2,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(301), 3,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_TILDE,
-    STATE(1373), 3,
-      sym_list_splat,
-      sym_dictionary_splat,
-      sym_keyword_argument,
-    ACTIONS(311), 4,
-      sym_integer,
-      sym_true,
-      sym_false,
-      sym_none,
-    ACTIONS(728), 5,
-      anon_sym_print,
-      anon_sym_async,
-      anon_sym_match,
-      anon_sym_exec,
-      anon_sym_type,
-    STATE(900), 7,
-      sym_named_expression,
-      sym_not_operator,
-      sym_boolean_operator,
-      sym_comparison_operator,
-      sym_lambda,
-      sym_conditional_expression,
-      sym_await,
-    STATE(642), 15,
-      sym_binary_operator,
-      sym_unary_operator,
-      sym_attribute,
-      sym_subscript,
-      sym_call,
-      sym_list,
-      sym_set,
-      sym_tuple,
-      sym_dictionary,
-      sym_list_comprehension,
-      sym_dictionary_comprehension,
-      sym_set_comprehension,
-      sym_generator_expression,
-      sym_parenthesized_expression,
-      sym_concatenated_string,
-  [6322] = 23,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(53), 1,
-      anon_sym_STAR_STAR,
-    ACTIONS(283), 1,
-      anon_sym_STAR,
-    ACTIONS(293), 1,
-      anon_sym_LBRACK,
-    ACTIONS(295), 1,
-      anon_sym_LBRACE,
-    ACTIONS(299), 1,
-      anon_sym_not,
-    ACTIONS(305), 1,
-      anon_sym_lambda,
-    ACTIONS(315), 1,
-      sym__string_start,
-    ACTIONS(718), 1,
-      anon_sym_LPAREN,
-    ACTIONS(722), 1,
-      sym_identifier,
-    ACTIONS(730), 1,
-      anon_sym_await,
-    ACTIONS(818), 1,
-      anon_sym_RPAREN,
-    STATE(600), 1,
-      sym_string,
-    STATE(630), 1,
-      sym_primary_expression,
-    STATE(1124), 1,
-      sym_expression,
-    STATE(1379), 1,
-      sym_parenthesized_list_splat,
-    ACTIONS(309), 2,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(301), 3,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_TILDE,
-    STATE(1373), 3,
-      sym_list_splat,
-      sym_dictionary_splat,
-      sym_keyword_argument,
-    ACTIONS(311), 4,
-      sym_integer,
-      sym_true,
-      sym_false,
-      sym_none,
-    ACTIONS(728), 5,
-      anon_sym_print,
-      anon_sym_async,
-      anon_sym_match,
-      anon_sym_exec,
-      anon_sym_type,
-    STATE(900), 7,
-      sym_named_expression,
-      sym_not_operator,
-      sym_boolean_operator,
-      sym_comparison_operator,
-      sym_lambda,
-      sym_conditional_expression,
-      sym_await,
-    STATE(642), 15,
-      sym_binary_operator,
-      sym_unary_operator,
-      sym_attribute,
-      sym_subscript,
-      sym_call,
-      sym_list,
-      sym_set,
-      sym_tuple,
-      sym_dictionary,
-      sym_list_comprehension,
-      sym_dictionary_comprehension,
-      sym_set_comprehension,
-      sym_generator_expression,
-      sym_parenthesized_expression,
-      sym_concatenated_string,
-  [6424] = 23,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(53), 1,
-      anon_sym_STAR_STAR,
-    ACTIONS(283), 1,
-      anon_sym_STAR,
-    ACTIONS(293), 1,
-      anon_sym_LBRACK,
-    ACTIONS(295), 1,
-      anon_sym_LBRACE,
-    ACTIONS(299), 1,
-      anon_sym_not,
-    ACTIONS(305), 1,
-      anon_sym_lambda,
-    ACTIONS(315), 1,
-      sym__string_start,
-    ACTIONS(718), 1,
-      anon_sym_LPAREN,
-    ACTIONS(722), 1,
-      sym_identifier,
-    ACTIONS(730), 1,
-      anon_sym_await,
-    ACTIONS(820), 1,
-      anon_sym_RPAREN,
-    STATE(600), 1,
-      sym_string,
-    STATE(630), 1,
-      sym_primary_expression,
-    STATE(1124), 1,
-      sym_expression,
-    STATE(1379), 1,
-      sym_parenthesized_list_splat,
-    ACTIONS(309), 2,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(301), 3,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_TILDE,
-    STATE(1373), 3,
-      sym_list_splat,
-      sym_dictionary_splat,
-      sym_keyword_argument,
-    ACTIONS(311), 4,
-      sym_integer,
-      sym_true,
-      sym_false,
-      sym_none,
-    ACTIONS(728), 5,
-      anon_sym_print,
-      anon_sym_async,
-      anon_sym_match,
-      anon_sym_exec,
-      anon_sym_type,
-    STATE(900), 7,
-      sym_named_expression,
-      sym_not_operator,
-      sym_boolean_operator,
-      sym_comparison_operator,
-      sym_lambda,
-      sym_conditional_expression,
-      sym_await,
-    STATE(642), 15,
-      sym_binary_operator,
-      sym_unary_operator,
-      sym_attribute,
-      sym_subscript,
-      sym_call,
-      sym_list,
-      sym_set,
-      sym_tuple,
-      sym_dictionary,
-      sym_list_comprehension,
-      sym_dictionary_comprehension,
-      sym_set_comprehension,
-      sym_generator_expression,
-      sym_parenthesized_expression,
-      sym_concatenated_string,
-  [6526] = 23,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(295), 1,
-      anon_sym_LBRACE,
-    ACTIONS(315), 1,
-      sym__string_start,
-    ACTIONS(602), 1,
-      sym_identifier,
-    ACTIONS(612), 1,
-      anon_sym_LBRACK,
-    ACTIONS(614), 1,
-      anon_sym_not,
-    ACTIONS(616), 1,
-      anon_sym_lambda,
-    ACTIONS(618), 1,
-      anon_sym_await,
-    ACTIONS(664), 1,
-      anon_sym_yield,
-    ACTIONS(692), 1,
-      anon_sym_LPAREN,
-    ACTIONS(716), 1,
-      anon_sym_STAR,
-    ACTIONS(766), 1,
-      anon_sym_RBRACK,
-    STATE(600), 1,
-      sym_string,
-    STATE(643), 1,
+    STATE(590), 1,
       sym_primary_expression,
     STATE(935), 1,
       sym_expression,
-    STATE(1473), 1,
-      sym__collection_elements,
-    ACTIONS(309), 2,
+    ACTIONS(293), 2,
       sym_ellipsis,
       sym_float,
-    ACTIONS(610), 3,
+    STATE(1024), 2,
+      sym__expression_within_for_in_clause,
+      sym_lambda_within_for_in_clause,
+    ACTIONS(582), 3,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_TILDE,
+    ACTIONS(756), 3,
+      anon_sym_RPAREN,
+      anon_sym_RBRACK,
+      anon_sym_RBRACE,
+    ACTIONS(758), 3,
+      anon_sym_if,
+      anon_sym_async,
+      anon_sym_for,
+    ACTIONS(295), 4,
+      sym_integer,
+      sym_true,
+      sym_false,
+      sym_none,
+    ACTIONS(674), 4,
+      anon_sym_print,
+      anon_sym_match,
+      anon_sym_exec,
+      anon_sym_type,
+    STATE(883), 6,
+      sym_named_expression,
+      sym_not_operator,
+      sym_boolean_operator,
+      sym_comparison_operator,
+      sym_lambda,
+      sym_conditional_expression,
+    STATE(605), 16,
+      sym_binary_operator,
+      sym_unary_operator,
+      sym_attribute,
+      sym_subscript,
+      sym_call,
+      sym_list,
+      sym_set,
+      sym_tuple,
+      sym_dictionary,
+      sym_list_comprehension,
+      sym_dictionary_comprehension,
+      sym_set_comprehension,
+      sym_generator_expression,
+      sym_parenthesized_expression,
+      sym_concatenated_string,
+      sym_await,
+  [4700] = 23,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(53), 1,
+      anon_sym_STAR_STAR,
+    ACTIONS(267), 1,
+      anon_sym_STAR,
+    ACTIONS(277), 1,
+      anon_sym_LBRACK,
+    ACTIONS(279), 1,
+      anon_sym_LBRACE,
+    ACTIONS(283), 1,
+      anon_sym_not,
+    ACTIONS(289), 1,
+      anon_sym_lambda,
+    ACTIONS(299), 1,
+      sym__string_start,
+    ACTIONS(688), 1,
+      sym_identifier,
+    ACTIONS(690), 1,
+      anon_sym_LPAREN,
+    ACTIONS(698), 1,
+      anon_sym_await,
+    ACTIONS(762), 1,
+      anon_sym_RPAREN,
+    STATE(586), 1,
+      sym_string,
+    STATE(616), 1,
+      sym_primary_expression,
+    STATE(1089), 1,
+      sym_expression,
+    STATE(1370), 1,
+      sym_parenthesized_list_splat,
+    ACTIONS(293), 2,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(285), 3,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_TILDE,
+    STATE(1371), 3,
+      sym_list_splat,
+      sym_dictionary_splat,
+      sym_keyword_argument,
+    ACTIONS(295), 4,
+      sym_integer,
+      sym_true,
+      sym_false,
+      sym_none,
+    ACTIONS(696), 5,
+      anon_sym_print,
+      anon_sym_async,
+      anon_sym_match,
+      anon_sym_exec,
+      anon_sym_type,
+    STATE(883), 6,
+      sym_named_expression,
+      sym_not_operator,
+      sym_boolean_operator,
+      sym_comparison_operator,
+      sym_lambda,
+      sym_conditional_expression,
+    STATE(605), 16,
+      sym_binary_operator,
+      sym_unary_operator,
+      sym_attribute,
+      sym_subscript,
+      sym_call,
+      sym_list,
+      sym_set,
+      sym_tuple,
+      sym_dictionary,
+      sym_list_comprehension,
+      sym_dictionary_comprehension,
+      sym_set_comprehension,
+      sym_generator_expression,
+      sym_parenthesized_expression,
+      sym_concatenated_string,
+      sym_await,
+  [4802] = 23,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(51), 1,
+      anon_sym_LBRACE,
+    ACTIONS(69), 1,
+      anon_sym_not,
+    ACTIONS(71), 1,
+      anon_sym_lambda,
+    ACTIONS(81), 1,
+      sym__string_start,
+    ACTIONS(327), 1,
+      sym_identifier,
+    ACTIONS(333), 1,
+      anon_sym_await,
+    ACTIONS(568), 1,
+      anon_sym_LPAREN,
+    ACTIONS(574), 1,
+      anon_sym_LBRACK,
+    ACTIONS(736), 1,
+      anon_sym_STAR,
+    ACTIONS(738), 1,
+      anon_sym_STAR_STAR,
+    ACTIONS(744), 1,
+      anon_sym_from,
+    STATE(707), 1,
+      sym_primary_expression,
+    STATE(709), 1,
+      sym_string,
+    STATE(1026), 1,
+      sym_expression,
+    ACTIONS(75), 2,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(664), 2,
+      sym__newline,
+      sym__semicolon,
+    STATE(1150), 2,
+      sym_list_splat,
+      sym_dictionary_splat,
+    ACTIONS(47), 3,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_TILDE,
+    ACTIONS(77), 4,
+      sym_integer,
+      sym_true,
+      sym_false,
+      sym_none,
+    ACTIONS(329), 5,
+      anon_sym_print,
+      anon_sym_async,
+      anon_sym_match,
+      anon_sym_exec,
+      anon_sym_type,
+    STATE(985), 6,
+      sym_named_expression,
+      sym_not_operator,
+      sym_boolean_operator,
+      sym_comparison_operator,
+      sym_lambda,
+      sym_conditional_expression,
+    STATE(759), 16,
+      sym_binary_operator,
+      sym_unary_operator,
+      sym_attribute,
+      sym_subscript,
+      sym_call,
+      sym_list,
+      sym_set,
+      sym_tuple,
+      sym_dictionary,
+      sym_list_comprehension,
+      sym_dictionary_comprehension,
+      sym_set_comprehension,
+      sym_generator_expression,
+      sym_parenthesized_expression,
+      sym_concatenated_string,
+      sym_await,
+  [4904] = 23,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(279), 1,
+      anon_sym_LBRACE,
+    ACTIONS(299), 1,
+      sym__string_start,
+    ACTIONS(584), 1,
+      anon_sym_LBRACK,
+    ACTIONS(626), 1,
+      anon_sym_not,
+    ACTIONS(628), 1,
+      anon_sym_lambda,
+    ACTIONS(630), 1,
+      anon_sym_yield,
+    ACTIONS(668), 1,
+      sym_identifier,
+    ACTIONS(670), 1,
+      anon_sym_LPAREN,
+    ACTIONS(678), 1,
+      anon_sym_await,
+    ACTIONS(706), 1,
+      anon_sym_STAR,
+    ACTIONS(764), 1,
+      anon_sym_RBRACK,
+    STATE(586), 1,
+      sym_string,
+    STATE(590), 1,
+      sym_primary_expression,
+    STATE(929), 1,
+      sym_expression,
+    STATE(1403), 1,
+      sym__collection_elements,
+    ACTIONS(293), 2,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(582), 3,
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
@@ -31263,26 +26553,25 @@ static const uint16_t ts_small_parse_table[] = {
       sym_list_splat,
       sym_parenthesized_list_splat,
       sym_yield,
-    ACTIONS(311), 4,
+    ACTIONS(295), 4,
       sym_integer,
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(606), 5,
+    ACTIONS(674), 5,
       anon_sym_print,
       anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(900), 7,
+    STATE(883), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-      sym_await,
-    STATE(642), 15,
+    STATE(605), 16,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -31298,300 +26587,151 @@ static const uint16_t ts_small_parse_table[] = {
       sym_generator_expression,
       sym_parenthesized_expression,
       sym_concatenated_string,
-  [6628] = 3,
+      sym_await,
+  [5006] = 25,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(824), 17,
-      anon_sym_as,
+    ACTIONS(279), 1,
+      anon_sym_LBRACE,
+    ACTIONS(299), 1,
+      sym__string_start,
+    ACTIONS(584), 1,
+      anon_sym_LBRACK,
+    ACTIONS(626), 1,
+      anon_sym_not,
+    ACTIONS(628), 1,
+      anon_sym_lambda,
+    ACTIONS(630), 1,
+      anon_sym_yield,
+    ACTIONS(668), 1,
+      sym_identifier,
+    ACTIONS(670), 1,
+      anon_sym_LPAREN,
+    ACTIONS(678), 1,
+      anon_sym_await,
+    ACTIONS(706), 1,
       anon_sym_STAR,
-      anon_sym_GT_GT,
-      anon_sym_PIPE,
+    ACTIONS(726), 1,
+      anon_sym_RPAREN,
+    STATE(586), 1,
+      sym_string,
+    STATE(590), 1,
+      sym_primary_expression,
+    STATE(918), 1,
+      sym_expression,
+    STATE(1216), 1,
+      sym_yield,
+    STATE(1298), 1,
+      sym_list_splat,
+    STATE(1303), 1,
+      sym_parenthesized_list_splat,
+    STATE(1471), 1,
+      sym__collection_elements,
+    ACTIONS(293), 2,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(582), 3,
       anon_sym_DASH,
       anon_sym_PLUS,
-      anon_sym_STAR_STAR,
-      anon_sym_EQ,
-      anon_sym_AT,
-      anon_sym_SLASH,
-      anon_sym_PERCENT,
-      anon_sym_SLASH_SLASH,
-      anon_sym_AMP,
-      anon_sym_CARET,
-      anon_sym_LT_LT,
-      anon_sym_LT,
-      anon_sym_GT,
-    ACTIONS(822), 36,
-      anon_sym_DOT,
-      anon_sym_LPAREN,
-      anon_sym_RPAREN,
-      anon_sym_COMMA,
-      anon_sym_if,
-      anon_sym_COLON,
-      anon_sym_else,
+      anon_sym_TILDE,
+    ACTIONS(295), 4,
+      sym_integer,
+      sym_true,
+      sym_false,
+      sym_none,
+    ACTIONS(674), 5,
+      anon_sym_print,
       anon_sym_async,
-      anon_sym_for,
-      anon_sym_in,
-      anon_sym_LBRACK,
-      anon_sym_RBRACK,
-      anon_sym_RBRACE,
-      anon_sym_not,
-      anon_sym_and,
-      anon_sym_or,
-      anon_sym_LT_EQ,
-      anon_sym_EQ_EQ,
-      anon_sym_BANG_EQ,
-      anon_sym_GT_EQ,
-      anon_sym_LT_GT,
-      anon_sym_is,
-      anon_sym_PLUS_EQ,
-      anon_sym_DASH_EQ,
-      anon_sym_STAR_EQ,
-      anon_sym_SLASH_EQ,
-      anon_sym_AT_EQ,
-      anon_sym_SLASH_SLASH_EQ,
-      anon_sym_PERCENT_EQ,
-      anon_sym_STAR_STAR_EQ,
-      anon_sym_GT_GT_EQ,
-      anon_sym_LT_LT_EQ,
-      anon_sym_AMP_EQ,
-      anon_sym_CARET_EQ,
-      anon_sym_PIPE_EQ,
-      sym_type_conversion,
-  [6689] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(828), 17,
-      anon_sym_as,
-      anon_sym_STAR,
-      anon_sym_GT_GT,
-      anon_sym_PIPE,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_STAR_STAR,
-      anon_sym_EQ,
-      anon_sym_AT,
-      anon_sym_SLASH,
-      anon_sym_PERCENT,
-      anon_sym_SLASH_SLASH,
-      anon_sym_AMP,
-      anon_sym_CARET,
-      anon_sym_LT_LT,
-      anon_sym_LT,
-      anon_sym_GT,
-    ACTIONS(826), 36,
-      anon_sym_DOT,
-      anon_sym_LPAREN,
-      anon_sym_RPAREN,
-      anon_sym_COMMA,
-      anon_sym_if,
-      anon_sym_COLON,
-      anon_sym_else,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_in,
-      anon_sym_LBRACK,
-      anon_sym_RBRACK,
-      anon_sym_RBRACE,
-      anon_sym_not,
-      anon_sym_and,
-      anon_sym_or,
-      anon_sym_LT_EQ,
-      anon_sym_EQ_EQ,
-      anon_sym_BANG_EQ,
-      anon_sym_GT_EQ,
-      anon_sym_LT_GT,
-      anon_sym_is,
-      anon_sym_PLUS_EQ,
-      anon_sym_DASH_EQ,
-      anon_sym_STAR_EQ,
-      anon_sym_SLASH_EQ,
-      anon_sym_AT_EQ,
-      anon_sym_SLASH_SLASH_EQ,
-      anon_sym_PERCENT_EQ,
-      anon_sym_STAR_STAR_EQ,
-      anon_sym_GT_GT_EQ,
-      anon_sym_LT_LT_EQ,
-      anon_sym_AMP_EQ,
-      anon_sym_CARET_EQ,
-      anon_sym_PIPE_EQ,
-      sym_type_conversion,
-  [6750] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(832), 17,
-      anon_sym_as,
-      anon_sym_STAR,
-      anon_sym_GT_GT,
-      anon_sym_PIPE,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_STAR_STAR,
-      anon_sym_EQ,
-      anon_sym_AT,
-      anon_sym_SLASH,
-      anon_sym_PERCENT,
-      anon_sym_SLASH_SLASH,
-      anon_sym_AMP,
-      anon_sym_CARET,
-      anon_sym_LT_LT,
-      anon_sym_LT,
-      anon_sym_GT,
-    ACTIONS(830), 36,
-      anon_sym_DOT,
-      anon_sym_LPAREN,
-      anon_sym_RPAREN,
-      anon_sym_COMMA,
-      anon_sym_if,
-      anon_sym_COLON,
-      anon_sym_else,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_in,
-      anon_sym_LBRACK,
-      anon_sym_RBRACK,
-      anon_sym_RBRACE,
-      anon_sym_not,
-      anon_sym_and,
-      anon_sym_or,
-      anon_sym_LT_EQ,
-      anon_sym_EQ_EQ,
-      anon_sym_BANG_EQ,
-      anon_sym_GT_EQ,
-      anon_sym_LT_GT,
-      anon_sym_is,
-      anon_sym_PLUS_EQ,
-      anon_sym_DASH_EQ,
-      anon_sym_STAR_EQ,
-      anon_sym_SLASH_EQ,
-      anon_sym_AT_EQ,
-      anon_sym_SLASH_SLASH_EQ,
-      anon_sym_PERCENT_EQ,
-      anon_sym_STAR_STAR_EQ,
-      anon_sym_GT_GT_EQ,
-      anon_sym_LT_LT_EQ,
-      anon_sym_AMP_EQ,
-      anon_sym_CARET_EQ,
-      anon_sym_PIPE_EQ,
-      sym_type_conversion,
-  [6811] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(832), 17,
-      anon_sym_as,
-      anon_sym_STAR,
-      anon_sym_GT_GT,
-      anon_sym_PIPE,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_STAR_STAR,
-      anon_sym_EQ,
-      anon_sym_AT,
-      anon_sym_SLASH,
-      anon_sym_PERCENT,
-      anon_sym_SLASH_SLASH,
-      anon_sym_AMP,
-      anon_sym_CARET,
-      anon_sym_LT_LT,
-      anon_sym_LT,
-      anon_sym_GT,
-    ACTIONS(830), 36,
-      anon_sym_DOT,
-      anon_sym_LPAREN,
-      anon_sym_RPAREN,
-      anon_sym_COMMA,
-      anon_sym_if,
-      anon_sym_COLON,
-      anon_sym_else,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_in,
-      anon_sym_LBRACK,
-      anon_sym_RBRACK,
-      anon_sym_RBRACE,
-      anon_sym_not,
-      anon_sym_and,
-      anon_sym_or,
-      anon_sym_LT_EQ,
-      anon_sym_EQ_EQ,
-      anon_sym_BANG_EQ,
-      anon_sym_GT_EQ,
-      anon_sym_LT_GT,
-      anon_sym_is,
-      anon_sym_PLUS_EQ,
-      anon_sym_DASH_EQ,
-      anon_sym_STAR_EQ,
-      anon_sym_SLASH_EQ,
-      anon_sym_AT_EQ,
-      anon_sym_SLASH_SLASH_EQ,
-      anon_sym_PERCENT_EQ,
-      anon_sym_STAR_STAR_EQ,
-      anon_sym_GT_GT_EQ,
-      anon_sym_LT_LT_EQ,
-      anon_sym_AMP_EQ,
-      anon_sym_CARET_EQ,
-      anon_sym_PIPE_EQ,
-      sym_type_conversion,
-  [6872] = 22,
+      anon_sym_match,
+      anon_sym_exec,
+      anon_sym_type,
+    STATE(883), 6,
+      sym_named_expression,
+      sym_not_operator,
+      sym_boolean_operator,
+      sym_comparison_operator,
+      sym_lambda,
+      sym_conditional_expression,
+    STATE(605), 16,
+      sym_binary_operator,
+      sym_unary_operator,
+      sym_attribute,
+      sym_subscript,
+      sym_call,
+      sym_list,
+      sym_set,
+      sym_tuple,
+      sym_dictionary,
+      sym_list_comprehension,
+      sym_dictionary_comprehension,
+      sym_set_comprehension,
+      sym_generator_expression,
+      sym_parenthesized_expression,
+      sym_concatenated_string,
+      sym_await,
+  [5112] = 23,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(53), 1,
       anon_sym_STAR_STAR,
-    ACTIONS(283), 1,
+    ACTIONS(267), 1,
       anon_sym_STAR,
-    ACTIONS(293), 1,
+    ACTIONS(277), 1,
       anon_sym_LBRACK,
-    ACTIONS(295), 1,
+    ACTIONS(279), 1,
       anon_sym_LBRACE,
-    ACTIONS(299), 1,
+    ACTIONS(283), 1,
       anon_sym_not,
-    ACTIONS(305), 1,
+    ACTIONS(289), 1,
       anon_sym_lambda,
-    ACTIONS(315), 1,
+    ACTIONS(299), 1,
       sym__string_start,
-    ACTIONS(718), 1,
-      anon_sym_LPAREN,
-    ACTIONS(722), 1,
+    ACTIONS(688), 1,
       sym_identifier,
-    ACTIONS(730), 1,
+    ACTIONS(690), 1,
+      anon_sym_LPAREN,
+    ACTIONS(698), 1,
       anon_sym_await,
-    STATE(600), 1,
+    ACTIONS(766), 1,
+      anon_sym_RPAREN,
+    STATE(586), 1,
       sym_string,
-    STATE(630), 1,
+    STATE(616), 1,
       sym_primary_expression,
-    STATE(1124), 1,
+    STATE(1089), 1,
       sym_expression,
-    STATE(1379), 1,
+    STATE(1370), 1,
       sym_parenthesized_list_splat,
-    ACTIONS(309), 2,
+    ACTIONS(293), 2,
       sym_ellipsis,
       sym_float,
-    ACTIONS(301), 3,
+    ACTIONS(285), 3,
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
-    STATE(1373), 3,
+    STATE(1371), 3,
       sym_list_splat,
       sym_dictionary_splat,
       sym_keyword_argument,
-    ACTIONS(311), 4,
+    ACTIONS(295), 4,
       sym_integer,
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(728), 5,
+    ACTIONS(696), 5,
       anon_sym_print,
       anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(900), 7,
+    STATE(883), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-      sym_await,
-    STATE(642), 15,
+    STATE(605), 16,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -31607,520 +26747,382 @@ static const uint16_t ts_small_parse_table[] = {
       sym_generator_expression,
       sym_parenthesized_expression,
       sym_concatenated_string,
-  [6971] = 3,
+      sym_await,
+  [5214] = 23,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(836), 17,
-      anon_sym_as,
+    ACTIONS(53), 1,
+      anon_sym_STAR_STAR,
+    ACTIONS(267), 1,
       anon_sym_STAR,
-      anon_sym_GT_GT,
-      anon_sym_PIPE,
+    ACTIONS(277), 1,
+      anon_sym_LBRACK,
+    ACTIONS(279), 1,
+      anon_sym_LBRACE,
+    ACTIONS(283), 1,
+      anon_sym_not,
+    ACTIONS(289), 1,
+      anon_sym_lambda,
+    ACTIONS(299), 1,
+      sym__string_start,
+    ACTIONS(688), 1,
+      sym_identifier,
+    ACTIONS(690), 1,
+      anon_sym_LPAREN,
+    ACTIONS(698), 1,
+      anon_sym_await,
+    ACTIONS(768), 1,
+      anon_sym_RPAREN,
+    STATE(586), 1,
+      sym_string,
+    STATE(616), 1,
+      sym_primary_expression,
+    STATE(1089), 1,
+      sym_expression,
+    STATE(1370), 1,
+      sym_parenthesized_list_splat,
+    ACTIONS(293), 2,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(285), 3,
       anon_sym_DASH,
       anon_sym_PLUS,
-      anon_sym_STAR_STAR,
-      anon_sym_EQ,
-      anon_sym_AT,
-      anon_sym_SLASH,
-      anon_sym_PERCENT,
-      anon_sym_SLASH_SLASH,
-      anon_sym_AMP,
-      anon_sym_CARET,
-      anon_sym_LT_LT,
-      anon_sym_LT,
-      anon_sym_GT,
-    ACTIONS(834), 36,
-      anon_sym_DOT,
-      anon_sym_LPAREN,
-      anon_sym_RPAREN,
-      anon_sym_COMMA,
-      anon_sym_if,
-      anon_sym_COLON,
-      anon_sym_else,
+      anon_sym_TILDE,
+    STATE(1371), 3,
+      sym_list_splat,
+      sym_dictionary_splat,
+      sym_keyword_argument,
+    ACTIONS(295), 4,
+      sym_integer,
+      sym_true,
+      sym_false,
+      sym_none,
+    ACTIONS(696), 5,
+      anon_sym_print,
       anon_sym_async,
-      anon_sym_for,
-      anon_sym_in,
+      anon_sym_match,
+      anon_sym_exec,
+      anon_sym_type,
+    STATE(883), 6,
+      sym_named_expression,
+      sym_not_operator,
+      sym_boolean_operator,
+      sym_comparison_operator,
+      sym_lambda,
+      sym_conditional_expression,
+    STATE(605), 16,
+      sym_binary_operator,
+      sym_unary_operator,
+      sym_attribute,
+      sym_subscript,
+      sym_call,
+      sym_list,
+      sym_set,
+      sym_tuple,
+      sym_dictionary,
+      sym_list_comprehension,
+      sym_dictionary_comprehension,
+      sym_set_comprehension,
+      sym_generator_expression,
+      sym_parenthesized_expression,
+      sym_concatenated_string,
+      sym_await,
+  [5316] = 23,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(53), 1,
+      anon_sym_STAR_STAR,
+    ACTIONS(267), 1,
+      anon_sym_STAR,
+    ACTIONS(277), 1,
       anon_sym_LBRACK,
+    ACTIONS(279), 1,
+      anon_sym_LBRACE,
+    ACTIONS(283), 1,
+      anon_sym_not,
+    ACTIONS(289), 1,
+      anon_sym_lambda,
+    ACTIONS(299), 1,
+      sym__string_start,
+    ACTIONS(688), 1,
+      sym_identifier,
+    ACTIONS(690), 1,
+      anon_sym_LPAREN,
+    ACTIONS(698), 1,
+      anon_sym_await,
+    ACTIONS(770), 1,
+      anon_sym_RPAREN,
+    STATE(586), 1,
+      sym_string,
+    STATE(616), 1,
+      sym_primary_expression,
+    STATE(1089), 1,
+      sym_expression,
+    STATE(1370), 1,
+      sym_parenthesized_list_splat,
+    ACTIONS(293), 2,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(285), 3,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_TILDE,
+    STATE(1371), 3,
+      sym_list_splat,
+      sym_dictionary_splat,
+      sym_keyword_argument,
+    ACTIONS(295), 4,
+      sym_integer,
+      sym_true,
+      sym_false,
+      sym_none,
+    ACTIONS(696), 5,
+      anon_sym_print,
+      anon_sym_async,
+      anon_sym_match,
+      anon_sym_exec,
+      anon_sym_type,
+    STATE(883), 6,
+      sym_named_expression,
+      sym_not_operator,
+      sym_boolean_operator,
+      sym_comparison_operator,
+      sym_lambda,
+      sym_conditional_expression,
+    STATE(605), 16,
+      sym_binary_operator,
+      sym_unary_operator,
+      sym_attribute,
+      sym_subscript,
+      sym_call,
+      sym_list,
+      sym_set,
+      sym_tuple,
+      sym_dictionary,
+      sym_list_comprehension,
+      sym_dictionary_comprehension,
+      sym_set_comprehension,
+      sym_generator_expression,
+      sym_parenthesized_expression,
+      sym_concatenated_string,
+      sym_await,
+  [5418] = 21,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(279), 1,
+      anon_sym_LBRACE,
+    ACTIONS(299), 1,
+      sym__string_start,
+    ACTIONS(578), 1,
+      anon_sym_LPAREN,
+    ACTIONS(584), 1,
+      anon_sym_LBRACK,
+    ACTIONS(626), 1,
+      anon_sym_not,
+    ACTIONS(668), 1,
+      sym_identifier,
+    ACTIONS(678), 1,
+      anon_sym_await,
+    ACTIONS(760), 1,
+      anon_sym_lambda,
+    STATE(586), 1,
+      sym_string,
+    STATE(590), 1,
+      sym_primary_expression,
+    STATE(935), 1,
+      sym_expression,
+    ACTIONS(293), 2,
+      sym_ellipsis,
+      sym_float,
+    STATE(1024), 2,
+      sym__expression_within_for_in_clause,
+      sym_lambda_within_for_in_clause,
+    ACTIONS(582), 3,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_TILDE,
+    ACTIONS(772), 3,
+      anon_sym_RPAREN,
       anon_sym_RBRACK,
       anon_sym_RBRACE,
-      anon_sym_not,
-      anon_sym_and,
-      anon_sym_or,
-      anon_sym_LT_EQ,
-      anon_sym_EQ_EQ,
-      anon_sym_BANG_EQ,
-      anon_sym_GT_EQ,
-      anon_sym_LT_GT,
-      anon_sym_is,
-      anon_sym_PLUS_EQ,
-      anon_sym_DASH_EQ,
-      anon_sym_STAR_EQ,
-      anon_sym_SLASH_EQ,
-      anon_sym_AT_EQ,
-      anon_sym_SLASH_SLASH_EQ,
-      anon_sym_PERCENT_EQ,
-      anon_sym_STAR_STAR_EQ,
-      anon_sym_GT_GT_EQ,
-      anon_sym_LT_LT_EQ,
-      anon_sym_AMP_EQ,
-      anon_sym_CARET_EQ,
-      anon_sym_PIPE_EQ,
-      sym_type_conversion,
-  [7032] = 22,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(274), 1,
-      sym_identifier,
-    ACTIONS(293), 1,
-      anon_sym_LBRACK,
-    ACTIONS(295), 1,
-      anon_sym_LBRACE,
-    ACTIONS(299), 1,
-      anon_sym_not,
-    ACTIONS(305), 1,
-      anon_sym_lambda,
-    ACTIONS(313), 1,
-      anon_sym_await,
-    ACTIONS(315), 1,
-      sym__string_start,
-    ACTIONS(664), 1,
-      anon_sym_yield,
-    ACTIONS(716), 1,
-      anon_sym_STAR,
-    ACTIONS(718), 1,
-      anon_sym_LPAREN,
-    ACTIONS(720), 1,
-      anon_sym_RPAREN,
-    STATE(600), 1,
-      sym_string,
-    STATE(630), 1,
-      sym_primary_expression,
-    STATE(1053), 1,
-      sym_expression,
-    ACTIONS(309), 2,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(301), 3,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_TILDE,
-    STATE(1166), 3,
-      sym_list_splat,
-      sym_parenthesized_list_splat,
-      sym_yield,
-    ACTIONS(311), 4,
-      sym_integer,
-      sym_true,
-      sym_false,
-      sym_none,
-    ACTIONS(285), 5,
-      anon_sym_print,
-      anon_sym_async,
-      anon_sym_match,
-      anon_sym_exec,
-      anon_sym_type,
-    STATE(900), 7,
-      sym_named_expression,
-      sym_not_operator,
-      sym_boolean_operator,
-      sym_comparison_operator,
-      sym_lambda,
-      sym_conditional_expression,
-      sym_await,
-    STATE(642), 15,
-      sym_binary_operator,
-      sym_unary_operator,
-      sym_attribute,
-      sym_subscript,
-      sym_call,
-      sym_list,
-      sym_set,
-      sym_tuple,
-      sym_dictionary,
-      sym_list_comprehension,
-      sym_dictionary_comprehension,
-      sym_set_comprehension,
-      sym_generator_expression,
-      sym_parenthesized_expression,
-      sym_concatenated_string,
-  [7131] = 22,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(274), 1,
-      sym_identifier,
-    ACTIONS(293), 1,
-      anon_sym_LBRACK,
-    ACTIONS(295), 1,
-      anon_sym_LBRACE,
-    ACTIONS(299), 1,
-      anon_sym_not,
-    ACTIONS(305), 1,
-      anon_sym_lambda,
-    ACTIONS(313), 1,
-      anon_sym_await,
-    ACTIONS(315), 1,
-      sym__string_start,
-    ACTIONS(664), 1,
-      anon_sym_yield,
-    ACTIONS(716), 1,
-      anon_sym_STAR,
-    ACTIONS(718), 1,
-      anon_sym_LPAREN,
-    ACTIONS(720), 1,
-      anon_sym_RPAREN,
-    STATE(600), 1,
-      sym_string,
-    STATE(630), 1,
-      sym_primary_expression,
-    STATE(1053), 1,
-      sym_expression,
-    ACTIONS(309), 2,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(301), 3,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_TILDE,
-    STATE(1166), 3,
-      sym_list_splat,
-      sym_parenthesized_list_splat,
-      sym_yield,
-    ACTIONS(311), 4,
-      sym_integer,
-      sym_true,
-      sym_false,
-      sym_none,
-    ACTIONS(285), 5,
-      anon_sym_print,
-      anon_sym_async,
-      anon_sym_match,
-      anon_sym_exec,
-      anon_sym_type,
-    STATE(900), 7,
-      sym_named_expression,
-      sym_not_operator,
-      sym_boolean_operator,
-      sym_comparison_operator,
-      sym_lambda,
-      sym_conditional_expression,
-      sym_await,
-    STATE(642), 15,
-      sym_binary_operator,
-      sym_unary_operator,
-      sym_attribute,
-      sym_subscript,
-      sym_call,
-      sym_list,
-      sym_set,
-      sym_tuple,
-      sym_dictionary,
-      sym_list_comprehension,
-      sym_dictionary_comprehension,
-      sym_set_comprehension,
-      sym_generator_expression,
-      sym_parenthesized_expression,
-      sym_concatenated_string,
-  [7230] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(824), 17,
-      anon_sym_as,
-      anon_sym_STAR,
-      anon_sym_GT_GT,
-      anon_sym_PIPE,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_STAR_STAR,
-      anon_sym_EQ,
-      anon_sym_AT,
-      anon_sym_SLASH,
-      anon_sym_PERCENT,
-      anon_sym_SLASH_SLASH,
-      anon_sym_AMP,
-      anon_sym_CARET,
-      anon_sym_LT_LT,
-      anon_sym_LT,
-      anon_sym_GT,
-    ACTIONS(822), 36,
-      anon_sym_DOT,
-      anon_sym_LPAREN,
-      anon_sym_RPAREN,
-      anon_sym_COMMA,
+    ACTIONS(774), 3,
       anon_sym_if,
-      anon_sym_COLON,
-      anon_sym_else,
       anon_sym_async,
       anon_sym_for,
-      anon_sym_in,
+    ACTIONS(295), 4,
+      sym_integer,
+      sym_true,
+      sym_false,
+      sym_none,
+    ACTIONS(674), 4,
+      anon_sym_print,
+      anon_sym_match,
+      anon_sym_exec,
+      anon_sym_type,
+    STATE(883), 6,
+      sym_named_expression,
+      sym_not_operator,
+      sym_boolean_operator,
+      sym_comparison_operator,
+      sym_lambda,
+      sym_conditional_expression,
+    STATE(605), 16,
+      sym_binary_operator,
+      sym_unary_operator,
+      sym_attribute,
+      sym_subscript,
+      sym_call,
+      sym_list,
+      sym_set,
+      sym_tuple,
+      sym_dictionary,
+      sym_list_comprehension,
+      sym_dictionary_comprehension,
+      sym_set_comprehension,
+      sym_generator_expression,
+      sym_parenthesized_expression,
+      sym_concatenated_string,
+      sym_await,
+  [5516] = 23,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(53), 1,
+      anon_sym_STAR_STAR,
+    ACTIONS(267), 1,
+      anon_sym_STAR,
+    ACTIONS(277), 1,
       anon_sym_LBRACK,
+    ACTIONS(279), 1,
+      anon_sym_LBRACE,
+    ACTIONS(283), 1,
+      anon_sym_not,
+    ACTIONS(289), 1,
+      anon_sym_lambda,
+    ACTIONS(299), 1,
+      sym__string_start,
+    ACTIONS(688), 1,
+      sym_identifier,
+    ACTIONS(690), 1,
+      anon_sym_LPAREN,
+    ACTIONS(698), 1,
+      anon_sym_await,
+    ACTIONS(776), 1,
+      anon_sym_RPAREN,
+    STATE(586), 1,
+      sym_string,
+    STATE(616), 1,
+      sym_primary_expression,
+    STATE(1089), 1,
+      sym_expression,
+    STATE(1370), 1,
+      sym_parenthesized_list_splat,
+    ACTIONS(293), 2,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(285), 3,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_TILDE,
+    STATE(1371), 3,
+      sym_list_splat,
+      sym_dictionary_splat,
+      sym_keyword_argument,
+    ACTIONS(295), 4,
+      sym_integer,
+      sym_true,
+      sym_false,
+      sym_none,
+    ACTIONS(696), 5,
+      anon_sym_print,
+      anon_sym_async,
+      anon_sym_match,
+      anon_sym_exec,
+      anon_sym_type,
+    STATE(883), 6,
+      sym_named_expression,
+      sym_not_operator,
+      sym_boolean_operator,
+      sym_comparison_operator,
+      sym_lambda,
+      sym_conditional_expression,
+    STATE(605), 16,
+      sym_binary_operator,
+      sym_unary_operator,
+      sym_attribute,
+      sym_subscript,
+      sym_call,
+      sym_list,
+      sym_set,
+      sym_tuple,
+      sym_dictionary,
+      sym_list_comprehension,
+      sym_dictionary_comprehension,
+      sym_set_comprehension,
+      sym_generator_expression,
+      sym_parenthesized_expression,
+      sym_concatenated_string,
+      sym_await,
+  [5618] = 21,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(279), 1,
+      anon_sym_LBRACE,
+    ACTIONS(299), 1,
+      sym__string_start,
+    ACTIONS(578), 1,
+      anon_sym_LPAREN,
+    ACTIONS(584), 1,
+      anon_sym_LBRACK,
+    ACTIONS(626), 1,
+      anon_sym_not,
+    ACTIONS(668), 1,
+      sym_identifier,
+    ACTIONS(678), 1,
+      anon_sym_await,
+    ACTIONS(760), 1,
+      anon_sym_lambda,
+    STATE(586), 1,
+      sym_string,
+    STATE(590), 1,
+      sym_primary_expression,
+    STATE(935), 1,
+      sym_expression,
+    ACTIONS(293), 2,
+      sym_ellipsis,
+      sym_float,
+    STATE(1024), 2,
+      sym__expression_within_for_in_clause,
+      sym_lambda_within_for_in_clause,
+    ACTIONS(582), 3,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_TILDE,
+    ACTIONS(778), 3,
+      anon_sym_RPAREN,
       anon_sym_RBRACK,
       anon_sym_RBRACE,
-      anon_sym_not,
-      anon_sym_and,
-      anon_sym_or,
-      anon_sym_LT_EQ,
-      anon_sym_EQ_EQ,
-      anon_sym_BANG_EQ,
-      anon_sym_GT_EQ,
-      anon_sym_LT_GT,
-      anon_sym_is,
-      anon_sym_PLUS_EQ,
-      anon_sym_DASH_EQ,
-      anon_sym_STAR_EQ,
-      anon_sym_SLASH_EQ,
-      anon_sym_AT_EQ,
-      anon_sym_SLASH_SLASH_EQ,
-      anon_sym_PERCENT_EQ,
-      anon_sym_STAR_STAR_EQ,
-      anon_sym_GT_GT_EQ,
-      anon_sym_LT_LT_EQ,
-      anon_sym_AMP_EQ,
-      anon_sym_CARET_EQ,
-      anon_sym_PIPE_EQ,
-      sym_type_conversion,
-  [7291] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(840), 17,
-      anon_sym_as,
-      anon_sym_STAR,
-      anon_sym_GT_GT,
-      anon_sym_PIPE,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_STAR_STAR,
-      anon_sym_EQ,
-      anon_sym_AT,
-      anon_sym_SLASH,
-      anon_sym_PERCENT,
-      anon_sym_SLASH_SLASH,
-      anon_sym_AMP,
-      anon_sym_CARET,
-      anon_sym_LT_LT,
-      anon_sym_LT,
-      anon_sym_GT,
-    ACTIONS(838), 36,
-      anon_sym_DOT,
-      anon_sym_LPAREN,
-      anon_sym_RPAREN,
-      anon_sym_COMMA,
-      anon_sym_if,
-      anon_sym_COLON,
-      anon_sym_else,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_in,
-      anon_sym_LBRACK,
-      anon_sym_RBRACK,
-      anon_sym_RBRACE,
-      anon_sym_not,
-      anon_sym_and,
-      anon_sym_or,
-      anon_sym_LT_EQ,
-      anon_sym_EQ_EQ,
-      anon_sym_BANG_EQ,
-      anon_sym_GT_EQ,
-      anon_sym_LT_GT,
-      anon_sym_is,
-      anon_sym_PLUS_EQ,
-      anon_sym_DASH_EQ,
-      anon_sym_STAR_EQ,
-      anon_sym_SLASH_EQ,
-      anon_sym_AT_EQ,
-      anon_sym_SLASH_SLASH_EQ,
-      anon_sym_PERCENT_EQ,
-      anon_sym_STAR_STAR_EQ,
-      anon_sym_GT_GT_EQ,
-      anon_sym_LT_LT_EQ,
-      anon_sym_AMP_EQ,
-      anon_sym_CARET_EQ,
-      anon_sym_PIPE_EQ,
-      sym_type_conversion,
-  [7352] = 9,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(846), 1,
-      anon_sym_else,
-    ACTIONS(848), 1,
-      anon_sym_except,
-    ACTIONS(850), 1,
-      anon_sym_finally,
-    STATE(440), 1,
-      sym_else_clause,
-    STATE(504), 1,
-      sym_finally_clause,
-    STATE(271), 2,
-      sym_except_clause,
-      aux_sym_try_statement_repeat1,
-    ACTIONS(842), 12,
-      sym__string_start,
-      ts_builtin_sym_end,
-      anon_sym_LPAREN,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_LBRACE,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_TILDE,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(844), 33,
-      anon_sym_import,
-      anon_sym_from,
-      anon_sym_STAR,
-      anon_sym_print,
-      anon_sym_assert,
-      anon_sym_return,
-      anon_sym_del,
-      anon_sym_raise,
-      anon_sym_pass,
-      anon_sym_break,
-      anon_sym_continue,
+    ACTIONS(780), 3,
       anon_sym_if,
       anon_sym_async,
       anon_sym_for,
-      anon_sym_while,
-      anon_sym_try,
-      anon_sym_with,
-      anon_sym_match,
-      anon_sym_def,
-      anon_sym_global,
-      anon_sym_nonlocal,
-      anon_sym_exec,
-      anon_sym_type,
-      anon_sym_class,
-      anon_sym_not,
-      anon_sym_lambda,
-      anon_sym_yield,
-      sym_integer,
-      sym_identifier,
-      anon_sym_await,
-      sym_true,
-      sym_false,
-      sym_none,
-  [7424] = 9,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(852), 1,
-      anon_sym_else,
-    ACTIONS(854), 1,
-      anon_sym_except_STAR,
-    ACTIONS(856), 1,
-      anon_sym_finally,
-    STATE(413), 1,
-      sym_else_clause,
-    STATE(520), 1,
-      sym_finally_clause,
-    STATE(267), 2,
-      sym_except_group_clause,
-      aux_sym_try_statement_repeat2,
-    ACTIONS(842), 12,
-      sym__dedent,
-      sym__string_start,
-      anon_sym_LPAREN,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_LBRACE,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_TILDE,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(844), 33,
-      anon_sym_import,
-      anon_sym_from,
-      anon_sym_STAR,
-      anon_sym_print,
-      anon_sym_assert,
-      anon_sym_return,
-      anon_sym_del,
-      anon_sym_raise,
-      anon_sym_pass,
-      anon_sym_break,
-      anon_sym_continue,
-      anon_sym_if,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_while,
-      anon_sym_try,
-      anon_sym_with,
-      anon_sym_match,
-      anon_sym_def,
-      anon_sym_global,
-      anon_sym_nonlocal,
-      anon_sym_exec,
-      anon_sym_type,
-      anon_sym_class,
-      anon_sym_not,
-      anon_sym_lambda,
-      anon_sym_yield,
-      sym_integer,
-      sym_identifier,
-      anon_sym_await,
-      sym_true,
-      sym_false,
-      sym_none,
-  [7496] = 21,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(274), 1,
-      sym_identifier,
-    ACTIONS(293), 1,
-      anon_sym_LBRACK,
-    ACTIONS(295), 1,
-      anon_sym_LBRACE,
-    ACTIONS(299), 1,
-      anon_sym_not,
-    ACTIONS(305), 1,
-      anon_sym_lambda,
-    ACTIONS(313), 1,
-      anon_sym_await,
-    ACTIONS(315), 1,
-      sym__string_start,
-    ACTIONS(664), 1,
-      anon_sym_yield,
-    ACTIONS(716), 1,
-      anon_sym_STAR,
-    ACTIONS(718), 1,
-      anon_sym_LPAREN,
-    STATE(600), 1,
-      sym_string,
-    STATE(630), 1,
-      sym_primary_expression,
-    STATE(1053), 1,
-      sym_expression,
-    ACTIONS(309), 2,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(301), 3,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_TILDE,
-    STATE(1166), 3,
-      sym_list_splat,
-      sym_parenthesized_list_splat,
-      sym_yield,
-    ACTIONS(311), 4,
+    ACTIONS(295), 4,
       sym_integer,
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(285), 5,
+    ACTIONS(674), 4,
       anon_sym_print,
-      anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(900), 7,
+    STATE(883), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-      sym_await,
-    STATE(642), 15,
+    STATE(605), 16,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -32136,971 +27138,70 @@ static const uint16_t ts_small_parse_table[] = {
       sym_generator_expression,
       sym_parenthesized_expression,
       sym_concatenated_string,
-  [7592] = 22,
+      sym_await,
+  [5716] = 23,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(51), 1,
-      anon_sym_LBRACE,
     ACTIONS(53), 1,
       anon_sym_STAR_STAR,
-    ACTIONS(69), 1,
-      anon_sym_not,
-    ACTIONS(71), 1,
-      anon_sym_lambda,
-    ACTIONS(81), 1,
-      sym__string_start,
+    ACTIONS(267), 1,
+      anon_sym_STAR,
+    ACTIONS(277), 1,
+      anon_sym_LBRACK,
+    ACTIONS(279), 1,
+      anon_sym_LBRACE,
     ACTIONS(283), 1,
-      anon_sym_STAR,
-    ACTIONS(331), 1,
-      sym_identifier,
-    ACTIONS(337), 1,
-      anon_sym_await,
-    ACTIONS(559), 1,
-      anon_sym_LPAREN,
-    ACTIONS(563), 1,
-      anon_sym_LBRACK,
-    STATE(684), 1,
-      sym_primary_expression,
-    STATE(713), 1,
-      sym_string,
-    STATE(1046), 1,
-      sym_expression,
-    STATE(1389), 1,
-      sym_expression_list,
-    ACTIONS(75), 2,
-      sym_ellipsis,
-      sym_float,
-    STATE(1360), 2,
-      sym_list_splat,
-      sym_dictionary_splat,
-    ACTIONS(47), 3,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_TILDE,
-    ACTIONS(77), 4,
-      sym_integer,
-      sym_true,
-      sym_false,
-      sym_none,
-    ACTIONS(333), 5,
-      anon_sym_print,
-      anon_sym_async,
-      anon_sym_match,
-      anon_sym_exec,
-      anon_sym_type,
-    STATE(1009), 7,
-      sym_named_expression,
-      sym_not_operator,
-      sym_boolean_operator,
-      sym_comparison_operator,
-      sym_lambda,
-      sym_conditional_expression,
-      sym_await,
-    STATE(797), 15,
-      sym_binary_operator,
-      sym_unary_operator,
-      sym_attribute,
-      sym_subscript,
-      sym_call,
-      sym_list,
-      sym_set,
-      sym_tuple,
-      sym_dictionary,
-      sym_list_comprehension,
-      sym_dictionary_comprehension,
-      sym_set_comprehension,
-      sym_generator_expression,
-      sym_parenthesized_expression,
-      sym_concatenated_string,
-  [7690] = 9,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(852), 1,
-      anon_sym_else,
-    ACTIONS(856), 1,
-      anon_sym_finally,
-    ACTIONS(862), 1,
-      anon_sym_except,
-    STATE(454), 1,
-      sym_else_clause,
-    STATE(588), 1,
-      sym_finally_clause,
-    STATE(266), 2,
-      sym_except_clause,
-      aux_sym_try_statement_repeat1,
-    ACTIONS(860), 12,
-      sym__dedent,
-      sym__string_start,
-      anon_sym_LPAREN,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_LBRACE,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_TILDE,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(858), 33,
-      anon_sym_import,
-      anon_sym_from,
-      anon_sym_STAR,
-      anon_sym_print,
-      anon_sym_assert,
-      anon_sym_return,
-      anon_sym_del,
-      anon_sym_raise,
-      anon_sym_pass,
-      anon_sym_break,
-      anon_sym_continue,
-      anon_sym_if,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_while,
-      anon_sym_try,
-      anon_sym_with,
-      anon_sym_match,
-      anon_sym_def,
-      anon_sym_global,
-      anon_sym_nonlocal,
-      anon_sym_exec,
-      anon_sym_type,
-      anon_sym_class,
       anon_sym_not,
+    ACTIONS(289), 1,
       anon_sym_lambda,
-      anon_sym_yield,
-      sym_integer,
-      sym_identifier,
-      anon_sym_await,
-      sym_true,
-      sym_false,
-      sym_none,
-  [7762] = 22,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(53), 1,
-      anon_sym_STAR_STAR,
-    ACTIONS(274), 1,
-      sym_identifier,
-    ACTIONS(278), 1,
-      anon_sym_LPAREN,
-    ACTIONS(283), 1,
-      anon_sym_STAR,
-    ACTIONS(293), 1,
-      anon_sym_LBRACK,
-    ACTIONS(295), 1,
-      anon_sym_LBRACE,
     ACTIONS(299), 1,
-      anon_sym_not,
-    ACTIONS(305), 1,
-      anon_sym_lambda,
-    ACTIONS(313), 1,
-      anon_sym_await,
-    ACTIONS(315), 1,
       sym__string_start,
-    STATE(600), 1,
-      sym_string,
-    STATE(630), 1,
-      sym_primary_expression,
-    STATE(1070), 1,
-      sym_expression,
-    STATE(1472), 1,
-      sym_expression_list,
-    ACTIONS(309), 2,
-      sym_ellipsis,
-      sym_float,
-    STATE(1366), 2,
-      sym_list_splat,
-      sym_dictionary_splat,
-    ACTIONS(301), 3,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_TILDE,
-    ACTIONS(311), 4,
-      sym_integer,
-      sym_true,
-      sym_false,
-      sym_none,
-    ACTIONS(285), 5,
-      anon_sym_print,
-      anon_sym_async,
-      anon_sym_match,
-      anon_sym_exec,
-      anon_sym_type,
-    STATE(900), 7,
-      sym_named_expression,
-      sym_not_operator,
-      sym_boolean_operator,
-      sym_comparison_operator,
-      sym_lambda,
-      sym_conditional_expression,
-      sym_await,
-    STATE(642), 15,
-      sym_binary_operator,
-      sym_unary_operator,
-      sym_attribute,
-      sym_subscript,
-      sym_call,
-      sym_list,
-      sym_set,
-      sym_tuple,
-      sym_dictionary,
-      sym_list_comprehension,
-      sym_dictionary_comprehension,
-      sym_set_comprehension,
-      sym_generator_expression,
-      sym_parenthesized_expression,
-      sym_concatenated_string,
-  [7860] = 9,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(852), 1,
-      anon_sym_else,
-    ACTIONS(854), 1,
-      anon_sym_except_STAR,
-    ACTIONS(856), 1,
-      anon_sym_finally,
-    STATE(454), 1,
-      sym_else_clause,
-    STATE(588), 1,
-      sym_finally_clause,
-    STATE(267), 2,
-      sym_except_group_clause,
-      aux_sym_try_statement_repeat2,
-    ACTIONS(860), 12,
-      sym__dedent,
-      sym__string_start,
-      anon_sym_LPAREN,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_LBRACE,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_TILDE,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(858), 33,
-      anon_sym_import,
-      anon_sym_from,
-      anon_sym_STAR,
-      anon_sym_print,
-      anon_sym_assert,
-      anon_sym_return,
-      anon_sym_del,
-      anon_sym_raise,
-      anon_sym_pass,
-      anon_sym_break,
-      anon_sym_continue,
-      anon_sym_if,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_while,
-      anon_sym_try,
-      anon_sym_with,
-      anon_sym_match,
-      anon_sym_def,
-      anon_sym_global,
-      anon_sym_nonlocal,
-      anon_sym_exec,
-      anon_sym_type,
-      anon_sym_class,
-      anon_sym_not,
-      anon_sym_lambda,
-      anon_sym_yield,
-      sym_integer,
+    ACTIONS(688), 1,
       sym_identifier,
-      anon_sym_await,
-      sym_true,
-      sym_false,
-      sym_none,
-  [7932] = 22,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(53), 1,
-      anon_sym_STAR_STAR,
-    ACTIONS(274), 1,
-      sym_identifier,
-    ACTIONS(278), 1,
+    ACTIONS(690), 1,
       anon_sym_LPAREN,
-    ACTIONS(283), 1,
-      anon_sym_STAR,
-    ACTIONS(293), 1,
-      anon_sym_LBRACK,
-    ACTIONS(295), 1,
-      anon_sym_LBRACE,
-    ACTIONS(299), 1,
-      anon_sym_not,
-    ACTIONS(305), 1,
-      anon_sym_lambda,
-    ACTIONS(313), 1,
+    ACTIONS(698), 1,
       anon_sym_await,
-    ACTIONS(315), 1,
-      sym__string_start,
-    STATE(600), 1,
-      sym_string,
-    STATE(630), 1,
-      sym_primary_expression,
-    STATE(1085), 1,
-      sym_expression,
-    STATE(1518), 1,
-      sym_expression_list,
-    ACTIONS(309), 2,
-      sym_ellipsis,
-      sym_float,
-    STATE(1366), 2,
-      sym_list_splat,
-      sym_dictionary_splat,
-    ACTIONS(301), 3,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_TILDE,
-    ACTIONS(311), 4,
-      sym_integer,
-      sym_true,
-      sym_false,
-      sym_none,
-    ACTIONS(285), 5,
-      anon_sym_print,
-      anon_sym_async,
-      anon_sym_match,
-      anon_sym_exec,
-      anon_sym_type,
-    STATE(900), 7,
-      sym_named_expression,
-      sym_not_operator,
-      sym_boolean_operator,
-      sym_comparison_operator,
-      sym_lambda,
-      sym_conditional_expression,
-      sym_await,
-    STATE(642), 15,
-      sym_binary_operator,
-      sym_unary_operator,
-      sym_attribute,
-      sym_subscript,
-      sym_call,
-      sym_list,
-      sym_set,
-      sym_tuple,
-      sym_dictionary,
-      sym_list_comprehension,
-      sym_dictionary_comprehension,
-      sym_set_comprehension,
-      sym_generator_expression,
-      sym_parenthesized_expression,
-      sym_concatenated_string,
-  [8030] = 22,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(53), 1,
-      anon_sym_STAR_STAR,
-    ACTIONS(274), 1,
-      sym_identifier,
-    ACTIONS(278), 1,
-      anon_sym_LPAREN,
-    ACTIONS(283), 1,
-      anon_sym_STAR,
-    ACTIONS(293), 1,
-      anon_sym_LBRACK,
-    ACTIONS(295), 1,
-      anon_sym_LBRACE,
-    ACTIONS(299), 1,
-      anon_sym_not,
-    ACTIONS(305), 1,
-      anon_sym_lambda,
-    ACTIONS(313), 1,
-      anon_sym_await,
-    ACTIONS(315), 1,
-      sym__string_start,
-    STATE(600), 1,
-      sym_string,
-    STATE(630), 1,
-      sym_primary_expression,
-    STATE(1059), 1,
-      sym_expression,
-    STATE(1507), 1,
-      sym_expression_list,
-    ACTIONS(309), 2,
-      sym_ellipsis,
-      sym_float,
-    STATE(1366), 2,
-      sym_list_splat,
-      sym_dictionary_splat,
-    ACTIONS(301), 3,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_TILDE,
-    ACTIONS(311), 4,
-      sym_integer,
-      sym_true,
-      sym_false,
-      sym_none,
-    ACTIONS(285), 5,
-      anon_sym_print,
-      anon_sym_async,
-      anon_sym_match,
-      anon_sym_exec,
-      anon_sym_type,
-    STATE(900), 7,
-      sym_named_expression,
-      sym_not_operator,
-      sym_boolean_operator,
-      sym_comparison_operator,
-      sym_lambda,
-      sym_conditional_expression,
-      sym_await,
-    STATE(642), 15,
-      sym_binary_operator,
-      sym_unary_operator,
-      sym_attribute,
-      sym_subscript,
-      sym_call,
-      sym_list,
-      sym_set,
-      sym_tuple,
-      sym_dictionary,
-      sym_list_comprehension,
-      sym_dictionary_comprehension,
-      sym_set_comprehension,
-      sym_generator_expression,
-      sym_parenthesized_expression,
-      sym_concatenated_string,
-  [8128] = 9,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(846), 1,
-      anon_sym_else,
-    ACTIONS(850), 1,
-      anon_sym_finally,
-    ACTIONS(864), 1,
-      anon_sym_except_STAR,
-    STATE(467), 1,
-      sym_else_clause,
-    STATE(523), 1,
-      sym_finally_clause,
-    STATE(270), 2,
-      sym_except_group_clause,
-      aux_sym_try_statement_repeat2,
-    ACTIONS(860), 12,
-      sym__string_start,
-      ts_builtin_sym_end,
-      anon_sym_LPAREN,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_LBRACE,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_TILDE,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(858), 33,
-      anon_sym_import,
-      anon_sym_from,
-      anon_sym_STAR,
-      anon_sym_print,
-      anon_sym_assert,
-      anon_sym_return,
-      anon_sym_del,
-      anon_sym_raise,
-      anon_sym_pass,
-      anon_sym_break,
-      anon_sym_continue,
-      anon_sym_if,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_while,
-      anon_sym_try,
-      anon_sym_with,
-      anon_sym_match,
-      anon_sym_def,
-      anon_sym_global,
-      anon_sym_nonlocal,
-      anon_sym_exec,
-      anon_sym_type,
-      anon_sym_class,
-      anon_sym_not,
-      anon_sym_lambda,
-      anon_sym_yield,
-      sym_integer,
-      sym_identifier,
-      anon_sym_await,
-      sym_true,
-      sym_false,
-      sym_none,
-  [8200] = 9,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(846), 1,
-      anon_sym_else,
-    ACTIONS(848), 1,
-      anon_sym_except,
-    ACTIONS(850), 1,
-      anon_sym_finally,
-    STATE(467), 1,
-      sym_else_clause,
-    STATE(523), 1,
-      sym_finally_clause,
-    STATE(271), 2,
-      sym_except_clause,
-      aux_sym_try_statement_repeat1,
-    ACTIONS(860), 12,
-      sym__string_start,
-      ts_builtin_sym_end,
-      anon_sym_LPAREN,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_LBRACE,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_TILDE,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(858), 33,
-      anon_sym_import,
-      anon_sym_from,
-      anon_sym_STAR,
-      anon_sym_print,
-      anon_sym_assert,
-      anon_sym_return,
-      anon_sym_del,
-      anon_sym_raise,
-      anon_sym_pass,
-      anon_sym_break,
-      anon_sym_continue,
-      anon_sym_if,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_while,
-      anon_sym_try,
-      anon_sym_with,
-      anon_sym_match,
-      anon_sym_def,
-      anon_sym_global,
-      anon_sym_nonlocal,
-      anon_sym_exec,
-      anon_sym_type,
-      anon_sym_class,
-      anon_sym_not,
-      anon_sym_lambda,
-      anon_sym_yield,
-      sym_integer,
-      sym_identifier,
-      anon_sym_await,
-      sym_true,
-      sym_false,
-      sym_none,
-  [8272] = 22,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(53), 1,
-      anon_sym_STAR_STAR,
-    ACTIONS(274), 1,
-      sym_identifier,
-    ACTIONS(278), 1,
-      anon_sym_LPAREN,
-    ACTIONS(283), 1,
-      anon_sym_STAR,
-    ACTIONS(293), 1,
-      anon_sym_LBRACK,
-    ACTIONS(295), 1,
-      anon_sym_LBRACE,
-    ACTIONS(299), 1,
-      anon_sym_not,
-    ACTIONS(305), 1,
-      anon_sym_lambda,
-    ACTIONS(313), 1,
-      anon_sym_await,
-    ACTIONS(315), 1,
-      sym__string_start,
-    STATE(600), 1,
-      sym_string,
-    STATE(630), 1,
-      sym_primary_expression,
-    STATE(1075), 1,
-      sym_expression,
-    STATE(1465), 1,
-      sym_expression_list,
-    ACTIONS(309), 2,
-      sym_ellipsis,
-      sym_float,
-    STATE(1366), 2,
-      sym_list_splat,
-      sym_dictionary_splat,
-    ACTIONS(301), 3,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_TILDE,
-    ACTIONS(311), 4,
-      sym_integer,
-      sym_true,
-      sym_false,
-      sym_none,
-    ACTIONS(285), 5,
-      anon_sym_print,
-      anon_sym_async,
-      anon_sym_match,
-      anon_sym_exec,
-      anon_sym_type,
-    STATE(900), 7,
-      sym_named_expression,
-      sym_not_operator,
-      sym_boolean_operator,
-      sym_comparison_operator,
-      sym_lambda,
-      sym_conditional_expression,
-      sym_await,
-    STATE(642), 15,
-      sym_binary_operator,
-      sym_unary_operator,
-      sym_attribute,
-      sym_subscript,
-      sym_call,
-      sym_list,
-      sym_set,
-      sym_tuple,
-      sym_dictionary,
-      sym_list_comprehension,
-      sym_dictionary_comprehension,
-      sym_set_comprehension,
-      sym_generator_expression,
-      sym_parenthesized_expression,
-      sym_concatenated_string,
-  [8370] = 9,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(846), 1,
-      anon_sym_else,
-    ACTIONS(850), 1,
-      anon_sym_finally,
-    ACTIONS(864), 1,
-      anon_sym_except_STAR,
-    STATE(440), 1,
-      sym_else_clause,
-    STATE(504), 1,
-      sym_finally_clause,
-    STATE(270), 2,
-      sym_except_group_clause,
-      aux_sym_try_statement_repeat2,
-    ACTIONS(842), 12,
-      sym__string_start,
-      ts_builtin_sym_end,
-      anon_sym_LPAREN,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_LBRACE,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_TILDE,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(844), 33,
-      anon_sym_import,
-      anon_sym_from,
-      anon_sym_STAR,
-      anon_sym_print,
-      anon_sym_assert,
-      anon_sym_return,
-      anon_sym_del,
-      anon_sym_raise,
-      anon_sym_pass,
-      anon_sym_break,
-      anon_sym_continue,
-      anon_sym_if,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_while,
-      anon_sym_try,
-      anon_sym_with,
-      anon_sym_match,
-      anon_sym_def,
-      anon_sym_global,
-      anon_sym_nonlocal,
-      anon_sym_exec,
-      anon_sym_type,
-      anon_sym_class,
-      anon_sym_not,
-      anon_sym_lambda,
-      anon_sym_yield,
-      sym_integer,
-      sym_identifier,
-      anon_sym_await,
-      sym_true,
-      sym_false,
-      sym_none,
-  [8442] = 9,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(852), 1,
-      anon_sym_else,
-    ACTIONS(856), 1,
-      anon_sym_finally,
-    ACTIONS(862), 1,
-      anon_sym_except,
-    STATE(413), 1,
-      sym_else_clause,
-    STATE(520), 1,
-      sym_finally_clause,
-    STATE(266), 2,
-      sym_except_clause,
-      aux_sym_try_statement_repeat1,
-    ACTIONS(842), 12,
-      sym__dedent,
-      sym__string_start,
-      anon_sym_LPAREN,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_LBRACE,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_TILDE,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(844), 33,
-      anon_sym_import,
-      anon_sym_from,
-      anon_sym_STAR,
-      anon_sym_print,
-      anon_sym_assert,
-      anon_sym_return,
-      anon_sym_del,
-      anon_sym_raise,
-      anon_sym_pass,
-      anon_sym_break,
-      anon_sym_continue,
-      anon_sym_if,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_while,
-      anon_sym_try,
-      anon_sym_with,
-      anon_sym_match,
-      anon_sym_def,
-      anon_sym_global,
-      anon_sym_nonlocal,
-      anon_sym_exec,
-      anon_sym_type,
-      anon_sym_class,
-      anon_sym_not,
-      anon_sym_lambda,
-      anon_sym_yield,
-      sym_integer,
-      sym_identifier,
-      anon_sym_await,
-      sym_true,
-      sym_false,
-      sym_none,
-  [8514] = 21,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(53), 1,
-      anon_sym_STAR_STAR,
-    ACTIONS(274), 1,
-      sym_identifier,
-    ACTIONS(278), 1,
-      anon_sym_LPAREN,
-    ACTIONS(293), 1,
-      anon_sym_LBRACK,
-    ACTIONS(295), 1,
-      anon_sym_LBRACE,
-    ACTIONS(299), 1,
-      anon_sym_not,
-    ACTIONS(305), 1,
-      anon_sym_lambda,
-    ACTIONS(313), 1,
-      anon_sym_await,
-    ACTIONS(315), 1,
-      sym__string_start,
-    ACTIONS(866), 1,
-      anon_sym_RBRACE,
-    STATE(600), 1,
-      sym_string,
-    STATE(630), 1,
-      sym_primary_expression,
-    STATE(1145), 1,
-      sym_expression,
-    ACTIONS(309), 2,
-      sym_ellipsis,
-      sym_float,
-    STATE(1384), 2,
-      sym_dictionary_splat,
-      sym_pair,
-    ACTIONS(301), 3,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_TILDE,
-    ACTIONS(311), 4,
-      sym_integer,
-      sym_true,
-      sym_false,
-      sym_none,
-    ACTIONS(285), 5,
-      anon_sym_print,
-      anon_sym_async,
-      anon_sym_match,
-      anon_sym_exec,
-      anon_sym_type,
-    STATE(900), 7,
-      sym_named_expression,
-      sym_not_operator,
-      sym_boolean_operator,
-      sym_comparison_operator,
-      sym_lambda,
-      sym_conditional_expression,
-      sym_await,
-    STATE(642), 15,
-      sym_binary_operator,
-      sym_unary_operator,
-      sym_attribute,
-      sym_subscript,
-      sym_call,
-      sym_list,
-      sym_set,
-      sym_tuple,
-      sym_dictionary,
-      sym_list_comprehension,
-      sym_dictionary_comprehension,
-      sym_set_comprehension,
-      sym_generator_expression,
-      sym_parenthesized_expression,
-      sym_concatenated_string,
-  [8609] = 21,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(53), 1,
-      anon_sym_STAR_STAR,
-    ACTIONS(274), 1,
-      sym_identifier,
-    ACTIONS(278), 1,
-      anon_sym_LPAREN,
-    ACTIONS(293), 1,
-      anon_sym_LBRACK,
-    ACTIONS(295), 1,
-      anon_sym_LBRACE,
-    ACTIONS(299), 1,
-      anon_sym_not,
-    ACTIONS(305), 1,
-      anon_sym_lambda,
-    ACTIONS(313), 1,
-      anon_sym_await,
-    ACTIONS(315), 1,
-      sym__string_start,
-    ACTIONS(868), 1,
-      anon_sym_RBRACE,
-    STATE(600), 1,
-      sym_string,
-    STATE(630), 1,
-      sym_primary_expression,
-    STATE(1145), 1,
-      sym_expression,
-    ACTIONS(309), 2,
-      sym_ellipsis,
-      sym_float,
-    STATE(1384), 2,
-      sym_dictionary_splat,
-      sym_pair,
-    ACTIONS(301), 3,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_TILDE,
-    ACTIONS(311), 4,
-      sym_integer,
-      sym_true,
-      sym_false,
-      sym_none,
-    ACTIONS(285), 5,
-      anon_sym_print,
-      anon_sym_async,
-      anon_sym_match,
-      anon_sym_exec,
-      anon_sym_type,
-    STATE(900), 7,
-      sym_named_expression,
-      sym_not_operator,
-      sym_boolean_operator,
-      sym_comparison_operator,
-      sym_lambda,
-      sym_conditional_expression,
-      sym_await,
-    STATE(642), 15,
-      sym_binary_operator,
-      sym_unary_operator,
-      sym_attribute,
-      sym_subscript,
-      sym_call,
-      sym_list,
-      sym_set,
-      sym_tuple,
-      sym_dictionary,
-      sym_list_comprehension,
-      sym_dictionary_comprehension,
-      sym_set_comprehension,
-      sym_generator_expression,
-      sym_parenthesized_expression,
-      sym_concatenated_string,
-  [8704] = 21,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(51), 1,
-      anon_sym_LBRACE,
-    ACTIONS(69), 1,
-      anon_sym_not,
-    ACTIONS(71), 1,
-      anon_sym_lambda,
-    ACTIONS(81), 1,
-      sym__string_start,
-    ACTIONS(331), 1,
-      sym_identifier,
-    ACTIONS(337), 1,
-      anon_sym_await,
-    ACTIONS(559), 1,
-      anon_sym_LPAREN,
-    ACTIONS(563), 1,
-      anon_sym_LBRACK,
-    ACTIONS(780), 1,
-      anon_sym_STAR,
     ACTIONS(782), 1,
-      anon_sym_STAR_STAR,
-    STATE(684), 1,
-      sym_primary_expression,
-    STATE(713), 1,
+      anon_sym_RPAREN,
+    STATE(586), 1,
       sym_string,
-    STATE(1036), 1,
+    STATE(616), 1,
+      sym_primary_expression,
+    STATE(1089), 1,
       sym_expression,
-    ACTIONS(75), 2,
+    STATE(1370), 1,
+      sym_parenthesized_list_splat,
+    ACTIONS(293), 2,
       sym_ellipsis,
       sym_float,
-    STATE(1187), 2,
-      sym_list_splat,
-      sym_dictionary_splat,
-    ACTIONS(47), 3,
+    ACTIONS(285), 3,
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
-    ACTIONS(77), 4,
+    STATE(1371), 3,
+      sym_list_splat,
+      sym_dictionary_splat,
+      sym_keyword_argument,
+    ACTIONS(295), 4,
       sym_integer,
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(333), 5,
+    ACTIONS(696), 5,
       anon_sym_print,
       anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(1009), 7,
+    STATE(883), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-      sym_await,
-    STATE(797), 15,
+    STATE(605), 16,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -33116,65 +27217,70 @@ static const uint16_t ts_small_parse_table[] = {
       sym_generator_expression,
       sym_parenthesized_expression,
       sym_concatenated_string,
-  [8799] = 21,
+      sym_await,
+  [5818] = 23,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(53), 1,
-      anon_sym_STAR_STAR,
-    ACTIONS(274), 1,
+    ACTIONS(279), 1,
+      anon_sym_LBRACE,
+    ACTIONS(299), 1,
+      sym__string_start,
+    ACTIONS(584), 1,
+      anon_sym_LBRACK,
+    ACTIONS(626), 1,
+      anon_sym_not,
+    ACTIONS(628), 1,
+      anon_sym_lambda,
+    ACTIONS(630), 1,
+      anon_sym_yield,
+    ACTIONS(668), 1,
       sym_identifier,
-    ACTIONS(278), 1,
+    ACTIONS(670), 1,
       anon_sym_LPAREN,
-    ACTIONS(283), 1,
+    ACTIONS(678), 1,
+      anon_sym_await,
+    ACTIONS(706), 1,
       anon_sym_STAR,
-    ACTIONS(293), 1,
-      anon_sym_LBRACK,
-    ACTIONS(295), 1,
-      anon_sym_LBRACE,
-    ACTIONS(299), 1,
-      anon_sym_not,
-    ACTIONS(305), 1,
-      anon_sym_lambda,
-    ACTIONS(313), 1,
-      anon_sym_await,
-    ACTIONS(315), 1,
-      sym__string_start,
-    STATE(600), 1,
+    ACTIONS(732), 1,
+      anon_sym_RBRACK,
+    STATE(586), 1,
       sym_string,
-    STATE(630), 1,
+    STATE(590), 1,
       sym_primary_expression,
-    STATE(933), 1,
+    STATE(913), 1,
       sym_expression,
-    ACTIONS(309), 2,
+    STATE(1397), 1,
+      sym__collection_elements,
+    ACTIONS(293), 2,
       sym_ellipsis,
       sym_float,
-    STATE(1023), 2,
-      sym_list_splat,
-      sym_dictionary_splat,
-    ACTIONS(301), 3,
+    ACTIONS(582), 3,
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
-    ACTIONS(311), 4,
+    STATE(1100), 3,
+      sym_list_splat,
+      sym_parenthesized_list_splat,
+      sym_yield,
+    ACTIONS(295), 4,
       sym_integer,
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(285), 5,
+    ACTIONS(674), 5,
       anon_sym_print,
       anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(900), 7,
+    STATE(883), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-      sym_await,
-    STATE(642), 15,
+    STATE(605), 16,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -33190,65 +27296,70 @@ static const uint16_t ts_small_parse_table[] = {
       sym_generator_expression,
       sym_parenthesized_expression,
       sym_concatenated_string,
-  [8894] = 21,
+      sym_await,
+  [5920] = 23,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(53), 1,
       anon_sym_STAR_STAR,
-    ACTIONS(274), 1,
-      sym_identifier,
-    ACTIONS(278), 1,
-      anon_sym_LPAREN,
-    ACTIONS(293), 1,
+    ACTIONS(267), 1,
+      anon_sym_STAR,
+    ACTIONS(277), 1,
       anon_sym_LBRACK,
-    ACTIONS(295), 1,
+    ACTIONS(279), 1,
       anon_sym_LBRACE,
-    ACTIONS(299), 1,
+    ACTIONS(283), 1,
       anon_sym_not,
-    ACTIONS(305), 1,
+    ACTIONS(289), 1,
       anon_sym_lambda,
-    ACTIONS(313), 1,
-      anon_sym_await,
-    ACTIONS(315), 1,
+    ACTIONS(299), 1,
       sym__string_start,
-    ACTIONS(870), 1,
-      anon_sym_RBRACE,
-    STATE(600), 1,
+    ACTIONS(688), 1,
+      sym_identifier,
+    ACTIONS(690), 1,
+      anon_sym_LPAREN,
+    ACTIONS(698), 1,
+      anon_sym_await,
+    ACTIONS(784), 1,
+      anon_sym_RPAREN,
+    STATE(586), 1,
       sym_string,
-    STATE(630), 1,
+    STATE(616), 1,
       sym_primary_expression,
-    STATE(1145), 1,
+    STATE(1089), 1,
       sym_expression,
-    ACTIONS(309), 2,
+    STATE(1370), 1,
+      sym_parenthesized_list_splat,
+    ACTIONS(293), 2,
       sym_ellipsis,
       sym_float,
-    STATE(1384), 2,
-      sym_dictionary_splat,
-      sym_pair,
-    ACTIONS(301), 3,
+    ACTIONS(285), 3,
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
-    ACTIONS(311), 4,
+    STATE(1371), 3,
+      sym_list_splat,
+      sym_dictionary_splat,
+      sym_keyword_argument,
+    ACTIONS(295), 4,
       sym_integer,
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(285), 5,
+    ACTIONS(696), 5,
       anon_sym_print,
       anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(900), 7,
+    STATE(883), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-      sym_await,
-    STATE(642), 15,
+    STATE(605), 16,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -33264,23 +27375,525 @@ static const uint16_t ts_small_parse_table[] = {
       sym_generator_expression,
       sym_parenthesized_expression,
       sym_concatenated_string,
-  [8989] = 10,
+      sym_await,
+  [6022] = 23,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(280), 1,
-      anon_sym_COMMA,
-    ACTIONS(287), 1,
-      anon_sym_COLON_EQ,
-    ACTIONS(872), 1,
+    ACTIONS(53), 1,
+      anon_sym_STAR_STAR,
+    ACTIONS(267), 1,
+      anon_sym_STAR,
+    ACTIONS(277), 1,
+      anon_sym_LBRACK,
+    ACTIONS(279), 1,
+      anon_sym_LBRACE,
+    ACTIONS(283), 1,
+      anon_sym_not,
+    ACTIONS(289), 1,
+      anon_sym_lambda,
+    ACTIONS(299), 1,
+      sym__string_start,
+    ACTIONS(688), 1,
+      sym_identifier,
+    ACTIONS(690), 1,
+      anon_sym_LPAREN,
+    ACTIONS(698), 1,
+      anon_sym_await,
+    ACTIONS(786), 1,
+      anon_sym_RPAREN,
+    STATE(586), 1,
+      sym_string,
+    STATE(616), 1,
+      sym_primary_expression,
+    STATE(1089), 1,
+      sym_expression,
+    STATE(1370), 1,
+      sym_parenthesized_list_splat,
+    ACTIONS(293), 2,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(285), 3,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_TILDE,
+    STATE(1371), 3,
+      sym_list_splat,
+      sym_dictionary_splat,
+      sym_keyword_argument,
+    ACTIONS(295), 4,
+      sym_integer,
+      sym_true,
+      sym_false,
+      sym_none,
+    ACTIONS(696), 5,
+      anon_sym_print,
+      anon_sym_async,
+      anon_sym_match,
+      anon_sym_exec,
+      anon_sym_type,
+    STATE(883), 6,
+      sym_named_expression,
+      sym_not_operator,
+      sym_boolean_operator,
+      sym_comparison_operator,
+      sym_lambda,
+      sym_conditional_expression,
+    STATE(605), 16,
+      sym_binary_operator,
+      sym_unary_operator,
+      sym_attribute,
+      sym_subscript,
+      sym_call,
+      sym_list,
+      sym_set,
+      sym_tuple,
+      sym_dictionary,
+      sym_list_comprehension,
+      sym_dictionary_comprehension,
+      sym_set_comprehension,
+      sym_generator_expression,
+      sym_parenthesized_expression,
+      sym_concatenated_string,
+      sym_await,
+  [6124] = 21,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(279), 1,
+      anon_sym_LBRACE,
+    ACTIONS(299), 1,
+      sym__string_start,
+    ACTIONS(578), 1,
+      anon_sym_LPAREN,
+    ACTIONS(584), 1,
+      anon_sym_LBRACK,
+    ACTIONS(626), 1,
+      anon_sym_not,
+    ACTIONS(668), 1,
+      sym_identifier,
+    ACTIONS(678), 1,
+      anon_sym_await,
+    ACTIONS(760), 1,
+      anon_sym_lambda,
+    STATE(586), 1,
+      sym_string,
+    STATE(590), 1,
+      sym_primary_expression,
+    STATE(935), 1,
+      sym_expression,
+    ACTIONS(293), 2,
+      sym_ellipsis,
+      sym_float,
+    STATE(1024), 2,
+      sym__expression_within_for_in_clause,
+      sym_lambda_within_for_in_clause,
+    ACTIONS(582), 3,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_TILDE,
+    ACTIONS(788), 3,
+      anon_sym_RPAREN,
+      anon_sym_RBRACK,
+      anon_sym_RBRACE,
+    ACTIONS(790), 3,
+      anon_sym_if,
+      anon_sym_async,
       anon_sym_for,
-    ACTIONS(874), 1,
-      anon_sym_with,
-    ACTIONS(876), 1,
-      anon_sym_def,
-    ACTIONS(289), 2,
-      anon_sym_COLON,
+    ACTIONS(295), 4,
+      sym_integer,
+      sym_true,
+      sym_false,
+      sym_none,
+    ACTIONS(674), 4,
+      anon_sym_print,
+      anon_sym_match,
+      anon_sym_exec,
+      anon_sym_type,
+    STATE(883), 6,
+      sym_named_expression,
+      sym_not_operator,
+      sym_boolean_operator,
+      sym_comparison_operator,
+      sym_lambda,
+      sym_conditional_expression,
+    STATE(605), 16,
+      sym_binary_operator,
+      sym_unary_operator,
+      sym_attribute,
+      sym_subscript,
+      sym_call,
+      sym_list,
+      sym_set,
+      sym_tuple,
+      sym_dictionary,
+      sym_list_comprehension,
+      sym_dictionary_comprehension,
+      sym_set_comprehension,
+      sym_generator_expression,
+      sym_parenthesized_expression,
+      sym_concatenated_string,
+      sym_await,
+  [6222] = 23,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(53), 1,
+      anon_sym_STAR_STAR,
+    ACTIONS(267), 1,
+      anon_sym_STAR,
+    ACTIONS(277), 1,
+      anon_sym_LBRACK,
+    ACTIONS(279), 1,
+      anon_sym_LBRACE,
+    ACTIONS(283), 1,
+      anon_sym_not,
+    ACTIONS(289), 1,
+      anon_sym_lambda,
+    ACTIONS(299), 1,
+      sym__string_start,
+    ACTIONS(688), 1,
+      sym_identifier,
+    ACTIONS(690), 1,
+      anon_sym_LPAREN,
+    ACTIONS(698), 1,
+      anon_sym_await,
+    ACTIONS(792), 1,
+      anon_sym_RPAREN,
+    STATE(586), 1,
+      sym_string,
+    STATE(616), 1,
+      sym_primary_expression,
+    STATE(1089), 1,
+      sym_expression,
+    STATE(1370), 1,
+      sym_parenthesized_list_splat,
+    ACTIONS(293), 2,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(285), 3,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_TILDE,
+    STATE(1371), 3,
+      sym_list_splat,
+      sym_dictionary_splat,
+      sym_keyword_argument,
+    ACTIONS(295), 4,
+      sym_integer,
+      sym_true,
+      sym_false,
+      sym_none,
+    ACTIONS(696), 5,
+      anon_sym_print,
+      anon_sym_async,
+      anon_sym_match,
+      anon_sym_exec,
+      anon_sym_type,
+    STATE(883), 6,
+      sym_named_expression,
+      sym_not_operator,
+      sym_boolean_operator,
+      sym_comparison_operator,
+      sym_lambda,
+      sym_conditional_expression,
+    STATE(605), 16,
+      sym_binary_operator,
+      sym_unary_operator,
+      sym_attribute,
+      sym_subscript,
+      sym_call,
+      sym_list,
+      sym_set,
+      sym_tuple,
+      sym_dictionary,
+      sym_list_comprehension,
+      sym_dictionary_comprehension,
+      sym_set_comprehension,
+      sym_generator_expression,
+      sym_parenthesized_expression,
+      sym_concatenated_string,
+      sym_await,
+  [6324] = 23,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(279), 1,
+      anon_sym_LBRACE,
+    ACTIONS(299), 1,
+      sym__string_start,
+    ACTIONS(584), 1,
+      anon_sym_LBRACK,
+    ACTIONS(626), 1,
+      anon_sym_not,
+    ACTIONS(628), 1,
+      anon_sym_lambda,
+    ACTIONS(630), 1,
+      anon_sym_yield,
+    ACTIONS(668), 1,
+      sym_identifier,
+    ACTIONS(670), 1,
+      anon_sym_LPAREN,
+    ACTIONS(678), 1,
+      anon_sym_await,
+    ACTIONS(706), 1,
+      anon_sym_STAR,
+    ACTIONS(794), 1,
+      anon_sym_RBRACK,
+    STATE(586), 1,
+      sym_string,
+    STATE(590), 1,
+      sym_primary_expression,
+    STATE(930), 1,
+      sym_expression,
+    STATE(1469), 1,
+      sym__collection_elements,
+    ACTIONS(293), 2,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(582), 3,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_TILDE,
+    STATE(1100), 3,
+      sym_list_splat,
+      sym_parenthesized_list_splat,
+      sym_yield,
+    ACTIONS(295), 4,
+      sym_integer,
+      sym_true,
+      sym_false,
+      sym_none,
+    ACTIONS(674), 5,
+      anon_sym_print,
+      anon_sym_async,
+      anon_sym_match,
+      anon_sym_exec,
+      anon_sym_type,
+    STATE(883), 6,
+      sym_named_expression,
+      sym_not_operator,
+      sym_boolean_operator,
+      sym_comparison_operator,
+      sym_lambda,
+      sym_conditional_expression,
+    STATE(605), 16,
+      sym_binary_operator,
+      sym_unary_operator,
+      sym_attribute,
+      sym_subscript,
+      sym_call,
+      sym_list,
+      sym_set,
+      sym_tuple,
+      sym_dictionary,
+      sym_list_comprehension,
+      sym_dictionary_comprehension,
+      sym_set_comprehension,
+      sym_generator_expression,
+      sym_parenthesized_expression,
+      sym_concatenated_string,
+      sym_await,
+  [6426] = 24,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(279), 1,
+      anon_sym_LBRACE,
+    ACTIONS(299), 1,
+      sym__string_start,
+    ACTIONS(584), 1,
+      anon_sym_LBRACK,
+    ACTIONS(626), 1,
+      anon_sym_not,
+    ACTIONS(628), 1,
+      anon_sym_lambda,
+    ACTIONS(630), 1,
+      anon_sym_yield,
+    ACTIONS(668), 1,
+      sym_identifier,
+    ACTIONS(670), 1,
+      anon_sym_LPAREN,
+    ACTIONS(678), 1,
+      anon_sym_await,
+    ACTIONS(706), 1,
+      anon_sym_STAR,
+    ACTIONS(726), 1,
+      anon_sym_RPAREN,
+    STATE(586), 1,
+      sym_string,
+    STATE(590), 1,
+      sym_primary_expression,
+    STATE(926), 1,
+      sym_expression,
+    STATE(1204), 1,
+      sym_yield,
+    STATE(1395), 1,
+      sym__collection_elements,
+    ACTIONS(293), 2,
+      sym_ellipsis,
+      sym_float,
+    STATE(1100), 2,
+      sym_list_splat,
+      sym_parenthesized_list_splat,
+    ACTIONS(582), 3,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_TILDE,
+    ACTIONS(295), 4,
+      sym_integer,
+      sym_true,
+      sym_false,
+      sym_none,
+    ACTIONS(674), 5,
+      anon_sym_print,
+      anon_sym_async,
+      anon_sym_match,
+      anon_sym_exec,
+      anon_sym_type,
+    STATE(883), 6,
+      sym_named_expression,
+      sym_not_operator,
+      sym_boolean_operator,
+      sym_comparison_operator,
+      sym_lambda,
+      sym_conditional_expression,
+    STATE(605), 16,
+      sym_binary_operator,
+      sym_unary_operator,
+      sym_attribute,
+      sym_subscript,
+      sym_call,
+      sym_list,
+      sym_set,
+      sym_tuple,
+      sym_dictionary,
+      sym_list_comprehension,
+      sym_dictionary_comprehension,
+      sym_set_comprehension,
+      sym_generator_expression,
+      sym_parenthesized_expression,
+      sym_concatenated_string,
+      sym_await,
+  [6530] = 24,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(279), 1,
+      anon_sym_LBRACE,
+    ACTIONS(299), 1,
+      sym__string_start,
+    ACTIONS(584), 1,
+      anon_sym_LBRACK,
+    ACTIONS(626), 1,
+      anon_sym_not,
+    ACTIONS(628), 1,
+      anon_sym_lambda,
+    ACTIONS(630), 1,
+      anon_sym_yield,
+    ACTIONS(668), 1,
+      sym_identifier,
+    ACTIONS(670), 1,
+      anon_sym_LPAREN,
+    ACTIONS(678), 1,
+      anon_sym_await,
+    ACTIONS(706), 1,
+      anon_sym_STAR,
+    ACTIONS(742), 1,
+      anon_sym_RPAREN,
+    STATE(586), 1,
+      sym_string,
+    STATE(590), 1,
+      sym_primary_expression,
+    STATE(918), 1,
+      sym_expression,
+    STATE(1216), 1,
+      sym_yield,
+    STATE(1471), 1,
+      sym__collection_elements,
+    ACTIONS(293), 2,
+      sym_ellipsis,
+      sym_float,
+    STATE(1100), 2,
+      sym_list_splat,
+      sym_parenthesized_list_splat,
+    ACTIONS(582), 3,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_TILDE,
+    ACTIONS(295), 4,
+      sym_integer,
+      sym_true,
+      sym_false,
+      sym_none,
+    ACTIONS(674), 5,
+      anon_sym_print,
+      anon_sym_async,
+      anon_sym_match,
+      anon_sym_exec,
+      anon_sym_type,
+    STATE(883), 6,
+      sym_named_expression,
+      sym_not_operator,
+      sym_boolean_operator,
+      sym_comparison_operator,
+      sym_lambda,
+      sym_conditional_expression,
+    STATE(605), 16,
+      sym_binary_operator,
+      sym_unary_operator,
+      sym_attribute,
+      sym_subscript,
+      sym_call,
+      sym_list,
+      sym_set,
+      sym_tuple,
+      sym_dictionary,
+      sym_list_comprehension,
+      sym_dictionary_comprehension,
+      sym_set_comprehension,
+      sym_generator_expression,
+      sym_parenthesized_expression,
+      sym_concatenated_string,
+      sym_await,
+  [6634] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(798), 17,
+      anon_sym_as,
+      anon_sym_STAR,
+      anon_sym_GT_GT,
+      anon_sym_PIPE,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_STAR_STAR,
       anon_sym_EQ,
-    ACTIONS(307), 13,
+      anon_sym_AT,
+      anon_sym_SLASH,
+      anon_sym_PERCENT,
+      anon_sym_SLASH_SLASH,
+      anon_sym_AMP,
+      anon_sym_CARET,
+      anon_sym_LT_LT,
+      anon_sym_LT,
+      anon_sym_GT,
+    ACTIONS(796), 36,
+      anon_sym_DOT,
+      anon_sym_LPAREN,
+      anon_sym_RPAREN,
+      anon_sym_COMMA,
+      anon_sym_if,
+      anon_sym_COLON,
+      anon_sym_else,
+      anon_sym_async,
+      anon_sym_for,
+      anon_sym_in,
+      anon_sym_LBRACK,
+      anon_sym_RBRACK,
+      anon_sym_RBRACE,
+      anon_sym_not,
+      anon_sym_and,
+      anon_sym_or,
+      anon_sym_LT_EQ,
+      anon_sym_EQ_EQ,
+      anon_sym_BANG_EQ,
+      anon_sym_GT_EQ,
+      anon_sym_LT_GT,
+      anon_sym_is,
       anon_sym_PLUS_EQ,
       anon_sym_DASH_EQ,
       anon_sym_STAR_EQ,
@@ -33294,7 +27907,2627 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_AMP_EQ,
       anon_sym_CARET_EQ,
       anon_sym_PIPE_EQ,
-    ACTIONS(276), 15,
+      sym_type_conversion,
+  [6695] = 22,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(258), 1,
+      sym_identifier,
+    ACTIONS(277), 1,
+      anon_sym_LBRACK,
+    ACTIONS(279), 1,
+      anon_sym_LBRACE,
+    ACTIONS(283), 1,
+      anon_sym_not,
+    ACTIONS(289), 1,
+      anon_sym_lambda,
+    ACTIONS(297), 1,
+      anon_sym_await,
+    ACTIONS(299), 1,
+      sym__string_start,
+    ACTIONS(630), 1,
+      anon_sym_yield,
+    ACTIONS(690), 1,
+      anon_sym_LPAREN,
+    ACTIONS(706), 1,
+      anon_sym_STAR,
+    ACTIONS(718), 1,
+      anon_sym_RPAREN,
+    STATE(586), 1,
+      sym_string,
+    STATE(616), 1,
+      sym_primary_expression,
+    STATE(1005), 1,
+      sym_expression,
+    ACTIONS(293), 2,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(285), 3,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_TILDE,
+    STATE(1167), 3,
+      sym_list_splat,
+      sym_parenthesized_list_splat,
+      sym_yield,
+    ACTIONS(295), 4,
+      sym_integer,
+      sym_true,
+      sym_false,
+      sym_none,
+    ACTIONS(269), 5,
+      anon_sym_print,
+      anon_sym_async,
+      anon_sym_match,
+      anon_sym_exec,
+      anon_sym_type,
+    STATE(883), 6,
+      sym_named_expression,
+      sym_not_operator,
+      sym_boolean_operator,
+      sym_comparison_operator,
+      sym_lambda,
+      sym_conditional_expression,
+    STATE(605), 16,
+      sym_binary_operator,
+      sym_unary_operator,
+      sym_attribute,
+      sym_subscript,
+      sym_call,
+      sym_list,
+      sym_set,
+      sym_tuple,
+      sym_dictionary,
+      sym_list_comprehension,
+      sym_dictionary_comprehension,
+      sym_set_comprehension,
+      sym_generator_expression,
+      sym_parenthesized_expression,
+      sym_concatenated_string,
+      sym_await,
+  [6794] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(802), 17,
+      anon_sym_as,
+      anon_sym_STAR,
+      anon_sym_GT_GT,
+      anon_sym_PIPE,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_STAR_STAR,
+      anon_sym_EQ,
+      anon_sym_AT,
+      anon_sym_SLASH,
+      anon_sym_PERCENT,
+      anon_sym_SLASH_SLASH,
+      anon_sym_AMP,
+      anon_sym_CARET,
+      anon_sym_LT_LT,
+      anon_sym_LT,
+      anon_sym_GT,
+    ACTIONS(800), 36,
+      anon_sym_DOT,
+      anon_sym_LPAREN,
+      anon_sym_RPAREN,
+      anon_sym_COMMA,
+      anon_sym_if,
+      anon_sym_COLON,
+      anon_sym_else,
+      anon_sym_async,
+      anon_sym_for,
+      anon_sym_in,
+      anon_sym_LBRACK,
+      anon_sym_RBRACK,
+      anon_sym_RBRACE,
+      anon_sym_not,
+      anon_sym_and,
+      anon_sym_or,
+      anon_sym_LT_EQ,
+      anon_sym_EQ_EQ,
+      anon_sym_BANG_EQ,
+      anon_sym_GT_EQ,
+      anon_sym_LT_GT,
+      anon_sym_is,
+      anon_sym_PLUS_EQ,
+      anon_sym_DASH_EQ,
+      anon_sym_STAR_EQ,
+      anon_sym_SLASH_EQ,
+      anon_sym_AT_EQ,
+      anon_sym_SLASH_SLASH_EQ,
+      anon_sym_PERCENT_EQ,
+      anon_sym_STAR_STAR_EQ,
+      anon_sym_GT_GT_EQ,
+      anon_sym_LT_LT_EQ,
+      anon_sym_AMP_EQ,
+      anon_sym_CARET_EQ,
+      anon_sym_PIPE_EQ,
+      sym_type_conversion,
+  [6855] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(806), 17,
+      anon_sym_as,
+      anon_sym_STAR,
+      anon_sym_GT_GT,
+      anon_sym_PIPE,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_STAR_STAR,
+      anon_sym_EQ,
+      anon_sym_AT,
+      anon_sym_SLASH,
+      anon_sym_PERCENT,
+      anon_sym_SLASH_SLASH,
+      anon_sym_AMP,
+      anon_sym_CARET,
+      anon_sym_LT_LT,
+      anon_sym_LT,
+      anon_sym_GT,
+    ACTIONS(804), 36,
+      anon_sym_DOT,
+      anon_sym_LPAREN,
+      anon_sym_RPAREN,
+      anon_sym_COMMA,
+      anon_sym_if,
+      anon_sym_COLON,
+      anon_sym_else,
+      anon_sym_async,
+      anon_sym_for,
+      anon_sym_in,
+      anon_sym_LBRACK,
+      anon_sym_RBRACK,
+      anon_sym_RBRACE,
+      anon_sym_not,
+      anon_sym_and,
+      anon_sym_or,
+      anon_sym_LT_EQ,
+      anon_sym_EQ_EQ,
+      anon_sym_BANG_EQ,
+      anon_sym_GT_EQ,
+      anon_sym_LT_GT,
+      anon_sym_is,
+      anon_sym_PLUS_EQ,
+      anon_sym_DASH_EQ,
+      anon_sym_STAR_EQ,
+      anon_sym_SLASH_EQ,
+      anon_sym_AT_EQ,
+      anon_sym_SLASH_SLASH_EQ,
+      anon_sym_PERCENT_EQ,
+      anon_sym_STAR_STAR_EQ,
+      anon_sym_GT_GT_EQ,
+      anon_sym_LT_LT_EQ,
+      anon_sym_AMP_EQ,
+      anon_sym_CARET_EQ,
+      anon_sym_PIPE_EQ,
+      sym_type_conversion,
+  [6916] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(806), 17,
+      anon_sym_as,
+      anon_sym_STAR,
+      anon_sym_GT_GT,
+      anon_sym_PIPE,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_STAR_STAR,
+      anon_sym_EQ,
+      anon_sym_AT,
+      anon_sym_SLASH,
+      anon_sym_PERCENT,
+      anon_sym_SLASH_SLASH,
+      anon_sym_AMP,
+      anon_sym_CARET,
+      anon_sym_LT_LT,
+      anon_sym_LT,
+      anon_sym_GT,
+    ACTIONS(804), 36,
+      anon_sym_DOT,
+      anon_sym_LPAREN,
+      anon_sym_RPAREN,
+      anon_sym_COMMA,
+      anon_sym_if,
+      anon_sym_COLON,
+      anon_sym_else,
+      anon_sym_async,
+      anon_sym_for,
+      anon_sym_in,
+      anon_sym_LBRACK,
+      anon_sym_RBRACK,
+      anon_sym_RBRACE,
+      anon_sym_not,
+      anon_sym_and,
+      anon_sym_or,
+      anon_sym_LT_EQ,
+      anon_sym_EQ_EQ,
+      anon_sym_BANG_EQ,
+      anon_sym_GT_EQ,
+      anon_sym_LT_GT,
+      anon_sym_is,
+      anon_sym_PLUS_EQ,
+      anon_sym_DASH_EQ,
+      anon_sym_STAR_EQ,
+      anon_sym_SLASH_EQ,
+      anon_sym_AT_EQ,
+      anon_sym_SLASH_SLASH_EQ,
+      anon_sym_PERCENT_EQ,
+      anon_sym_STAR_STAR_EQ,
+      anon_sym_GT_GT_EQ,
+      anon_sym_LT_LT_EQ,
+      anon_sym_AMP_EQ,
+      anon_sym_CARET_EQ,
+      anon_sym_PIPE_EQ,
+      sym_type_conversion,
+  [6977] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(810), 17,
+      anon_sym_as,
+      anon_sym_STAR,
+      anon_sym_GT_GT,
+      anon_sym_PIPE,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_STAR_STAR,
+      anon_sym_EQ,
+      anon_sym_AT,
+      anon_sym_SLASH,
+      anon_sym_PERCENT,
+      anon_sym_SLASH_SLASH,
+      anon_sym_AMP,
+      anon_sym_CARET,
+      anon_sym_LT_LT,
+      anon_sym_LT,
+      anon_sym_GT,
+    ACTIONS(808), 36,
+      anon_sym_DOT,
+      anon_sym_LPAREN,
+      anon_sym_RPAREN,
+      anon_sym_COMMA,
+      anon_sym_if,
+      anon_sym_COLON,
+      anon_sym_else,
+      anon_sym_async,
+      anon_sym_for,
+      anon_sym_in,
+      anon_sym_LBRACK,
+      anon_sym_RBRACK,
+      anon_sym_RBRACE,
+      anon_sym_not,
+      anon_sym_and,
+      anon_sym_or,
+      anon_sym_LT_EQ,
+      anon_sym_EQ_EQ,
+      anon_sym_BANG_EQ,
+      anon_sym_GT_EQ,
+      anon_sym_LT_GT,
+      anon_sym_is,
+      anon_sym_PLUS_EQ,
+      anon_sym_DASH_EQ,
+      anon_sym_STAR_EQ,
+      anon_sym_SLASH_EQ,
+      anon_sym_AT_EQ,
+      anon_sym_SLASH_SLASH_EQ,
+      anon_sym_PERCENT_EQ,
+      anon_sym_STAR_STAR_EQ,
+      anon_sym_GT_GT_EQ,
+      anon_sym_LT_LT_EQ,
+      anon_sym_AMP_EQ,
+      anon_sym_CARET_EQ,
+      anon_sym_PIPE_EQ,
+      sym_type_conversion,
+  [7038] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(814), 17,
+      anon_sym_as,
+      anon_sym_STAR,
+      anon_sym_GT_GT,
+      anon_sym_PIPE,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_STAR_STAR,
+      anon_sym_EQ,
+      anon_sym_AT,
+      anon_sym_SLASH,
+      anon_sym_PERCENT,
+      anon_sym_SLASH_SLASH,
+      anon_sym_AMP,
+      anon_sym_CARET,
+      anon_sym_LT_LT,
+      anon_sym_LT,
+      anon_sym_GT,
+    ACTIONS(812), 36,
+      anon_sym_DOT,
+      anon_sym_LPAREN,
+      anon_sym_RPAREN,
+      anon_sym_COMMA,
+      anon_sym_if,
+      anon_sym_COLON,
+      anon_sym_else,
+      anon_sym_async,
+      anon_sym_for,
+      anon_sym_in,
+      anon_sym_LBRACK,
+      anon_sym_RBRACK,
+      anon_sym_RBRACE,
+      anon_sym_not,
+      anon_sym_and,
+      anon_sym_or,
+      anon_sym_LT_EQ,
+      anon_sym_EQ_EQ,
+      anon_sym_BANG_EQ,
+      anon_sym_GT_EQ,
+      anon_sym_LT_GT,
+      anon_sym_is,
+      anon_sym_PLUS_EQ,
+      anon_sym_DASH_EQ,
+      anon_sym_STAR_EQ,
+      anon_sym_SLASH_EQ,
+      anon_sym_AT_EQ,
+      anon_sym_SLASH_SLASH_EQ,
+      anon_sym_PERCENT_EQ,
+      anon_sym_STAR_STAR_EQ,
+      anon_sym_GT_GT_EQ,
+      anon_sym_LT_LT_EQ,
+      anon_sym_AMP_EQ,
+      anon_sym_CARET_EQ,
+      anon_sym_PIPE_EQ,
+      sym_type_conversion,
+  [7099] = 22,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(53), 1,
+      anon_sym_STAR_STAR,
+    ACTIONS(267), 1,
+      anon_sym_STAR,
+    ACTIONS(277), 1,
+      anon_sym_LBRACK,
+    ACTIONS(279), 1,
+      anon_sym_LBRACE,
+    ACTIONS(283), 1,
+      anon_sym_not,
+    ACTIONS(289), 1,
+      anon_sym_lambda,
+    ACTIONS(299), 1,
+      sym__string_start,
+    ACTIONS(688), 1,
+      sym_identifier,
+    ACTIONS(690), 1,
+      anon_sym_LPAREN,
+    ACTIONS(698), 1,
+      anon_sym_await,
+    STATE(586), 1,
+      sym_string,
+    STATE(616), 1,
+      sym_primary_expression,
+    STATE(1089), 1,
+      sym_expression,
+    STATE(1370), 1,
+      sym_parenthesized_list_splat,
+    ACTIONS(293), 2,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(285), 3,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_TILDE,
+    STATE(1371), 3,
+      sym_list_splat,
+      sym_dictionary_splat,
+      sym_keyword_argument,
+    ACTIONS(295), 4,
+      sym_integer,
+      sym_true,
+      sym_false,
+      sym_none,
+    ACTIONS(696), 5,
+      anon_sym_print,
+      anon_sym_async,
+      anon_sym_match,
+      anon_sym_exec,
+      anon_sym_type,
+    STATE(883), 6,
+      sym_named_expression,
+      sym_not_operator,
+      sym_boolean_operator,
+      sym_comparison_operator,
+      sym_lambda,
+      sym_conditional_expression,
+    STATE(605), 16,
+      sym_binary_operator,
+      sym_unary_operator,
+      sym_attribute,
+      sym_subscript,
+      sym_call,
+      sym_list,
+      sym_set,
+      sym_tuple,
+      sym_dictionary,
+      sym_list_comprehension,
+      sym_dictionary_comprehension,
+      sym_set_comprehension,
+      sym_generator_expression,
+      sym_parenthesized_expression,
+      sym_concatenated_string,
+      sym_await,
+  [7198] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(798), 17,
+      anon_sym_as,
+      anon_sym_STAR,
+      anon_sym_GT_GT,
+      anon_sym_PIPE,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_STAR_STAR,
+      anon_sym_EQ,
+      anon_sym_AT,
+      anon_sym_SLASH,
+      anon_sym_PERCENT,
+      anon_sym_SLASH_SLASH,
+      anon_sym_AMP,
+      anon_sym_CARET,
+      anon_sym_LT_LT,
+      anon_sym_LT,
+      anon_sym_GT,
+    ACTIONS(796), 36,
+      anon_sym_DOT,
+      anon_sym_LPAREN,
+      anon_sym_RPAREN,
+      anon_sym_COMMA,
+      anon_sym_if,
+      anon_sym_COLON,
+      anon_sym_else,
+      anon_sym_async,
+      anon_sym_for,
+      anon_sym_in,
+      anon_sym_LBRACK,
+      anon_sym_RBRACK,
+      anon_sym_RBRACE,
+      anon_sym_not,
+      anon_sym_and,
+      anon_sym_or,
+      anon_sym_LT_EQ,
+      anon_sym_EQ_EQ,
+      anon_sym_BANG_EQ,
+      anon_sym_GT_EQ,
+      anon_sym_LT_GT,
+      anon_sym_is,
+      anon_sym_PLUS_EQ,
+      anon_sym_DASH_EQ,
+      anon_sym_STAR_EQ,
+      anon_sym_SLASH_EQ,
+      anon_sym_AT_EQ,
+      anon_sym_SLASH_SLASH_EQ,
+      anon_sym_PERCENT_EQ,
+      anon_sym_STAR_STAR_EQ,
+      anon_sym_GT_GT_EQ,
+      anon_sym_LT_LT_EQ,
+      anon_sym_AMP_EQ,
+      anon_sym_CARET_EQ,
+      anon_sym_PIPE_EQ,
+      sym_type_conversion,
+  [7259] = 22,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(258), 1,
+      sym_identifier,
+    ACTIONS(277), 1,
+      anon_sym_LBRACK,
+    ACTIONS(279), 1,
+      anon_sym_LBRACE,
+    ACTIONS(283), 1,
+      anon_sym_not,
+    ACTIONS(289), 1,
+      anon_sym_lambda,
+    ACTIONS(297), 1,
+      anon_sym_await,
+    ACTIONS(299), 1,
+      sym__string_start,
+    ACTIONS(630), 1,
+      anon_sym_yield,
+    ACTIONS(690), 1,
+      anon_sym_LPAREN,
+    ACTIONS(706), 1,
+      anon_sym_STAR,
+    ACTIONS(718), 1,
+      anon_sym_RPAREN,
+    STATE(586), 1,
+      sym_string,
+    STATE(616), 1,
+      sym_primary_expression,
+    STATE(1005), 1,
+      sym_expression,
+    ACTIONS(293), 2,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(285), 3,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_TILDE,
+    STATE(1167), 3,
+      sym_list_splat,
+      sym_parenthesized_list_splat,
+      sym_yield,
+    ACTIONS(295), 4,
+      sym_integer,
+      sym_true,
+      sym_false,
+      sym_none,
+    ACTIONS(269), 5,
+      anon_sym_print,
+      anon_sym_async,
+      anon_sym_match,
+      anon_sym_exec,
+      anon_sym_type,
+    STATE(883), 6,
+      sym_named_expression,
+      sym_not_operator,
+      sym_boolean_operator,
+      sym_comparison_operator,
+      sym_lambda,
+      sym_conditional_expression,
+    STATE(605), 16,
+      sym_binary_operator,
+      sym_unary_operator,
+      sym_attribute,
+      sym_subscript,
+      sym_call,
+      sym_list,
+      sym_set,
+      sym_tuple,
+      sym_dictionary,
+      sym_list_comprehension,
+      sym_dictionary_comprehension,
+      sym_set_comprehension,
+      sym_generator_expression,
+      sym_parenthesized_expression,
+      sym_concatenated_string,
+      sym_await,
+  [7358] = 16,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(262), 1,
+      anon_sym_LPAREN,
+    ACTIONS(277), 1,
+      anon_sym_LBRACK,
+    ACTIONS(279), 1,
+      anon_sym_LBRACE,
+    ACTIONS(299), 1,
+      sym__string_start,
+    ACTIONS(566), 1,
+      anon_sym_await,
+    STATE(586), 1,
+      sym_string,
+    STATE(637), 1,
+      sym_primary_expression,
+    ACTIONS(293), 2,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(260), 3,
+      anon_sym_DOT,
+      anon_sym_STAR,
+      anon_sym_SLASH,
+    ACTIONS(285), 3,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_TILDE,
+    ACTIONS(816), 3,
+      anon_sym_RPAREN,
+      anon_sym_COMMA,
+      anon_sym_COLON,
+    ACTIONS(295), 5,
+      sym_integer,
+      sym_identifier,
+      sym_true,
+      sym_false,
+      sym_none,
+    ACTIONS(558), 5,
+      anon_sym_print,
+      anon_sym_async,
+      anon_sym_match,
+      anon_sym_exec,
+      anon_sym_type,
+    ACTIONS(287), 9,
+      anon_sym_GT_GT,
+      anon_sym_PIPE,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_PERCENT,
+      anon_sym_SLASH_SLASH,
+      anon_sym_AMP,
+      anon_sym_CARET,
+      anon_sym_LT_LT,
+    STATE(605), 16,
+      sym_binary_operator,
+      sym_unary_operator,
+      sym_attribute,
+      sym_subscript,
+      sym_call,
+      sym_list,
+      sym_set,
+      sym_tuple,
+      sym_dictionary,
+      sym_list_comprehension,
+      sym_dictionary_comprehension,
+      sym_set_comprehension,
+      sym_generator_expression,
+      sym_parenthesized_expression,
+      sym_concatenated_string,
+      sym_await,
+  [7445] = 9,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(822), 1,
+      anon_sym_else,
+    ACTIONS(824), 1,
+      anon_sym_except,
+    ACTIONS(826), 1,
+      anon_sym_finally,
+    STATE(436), 1,
+      sym_else_clause,
+    STATE(519), 1,
+      sym_finally_clause,
+    STATE(285), 2,
+      sym_except_group_clause,
+      aux_sym_try_statement_repeat2,
+    ACTIONS(820), 12,
+      sym__dedent,
+      sym__string_start,
+      anon_sym_LPAREN,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_LBRACE,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_TILDE,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(818), 33,
+      anon_sym_import,
+      anon_sym_from,
+      anon_sym_STAR,
+      anon_sym_print,
+      anon_sym_assert,
+      anon_sym_return,
+      anon_sym_del,
+      anon_sym_raise,
+      anon_sym_pass,
+      anon_sym_break,
+      anon_sym_continue,
+      anon_sym_if,
+      anon_sym_async,
+      anon_sym_for,
+      anon_sym_while,
+      anon_sym_try,
+      anon_sym_with,
+      anon_sym_match,
+      anon_sym_def,
+      anon_sym_global,
+      anon_sym_nonlocal,
+      anon_sym_exec,
+      anon_sym_type,
+      anon_sym_class,
+      anon_sym_not,
+      anon_sym_lambda,
+      anon_sym_yield,
+      sym_integer,
+      sym_identifier,
+      anon_sym_await,
+      sym_true,
+      sym_false,
+      sym_none,
+  [7517] = 22,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(258), 1,
+      sym_identifier,
+    ACTIONS(262), 1,
+      anon_sym_LPAREN,
+    ACTIONS(277), 1,
+      anon_sym_LBRACK,
+    ACTIONS(279), 1,
+      anon_sym_LBRACE,
+    ACTIONS(283), 1,
+      anon_sym_not,
+    ACTIONS(289), 1,
+      anon_sym_lambda,
+    ACTIONS(297), 1,
+      anon_sym_await,
+    ACTIONS(299), 1,
+      sym__string_start,
+    ACTIONS(706), 1,
+      anon_sym_STAR,
+    ACTIONS(828), 1,
+      anon_sym_COLON,
+    ACTIONS(830), 1,
+      anon_sym_RBRACK,
+    STATE(586), 1,
+      sym_string,
+    STATE(616), 1,
+      sym_primary_expression,
+    STATE(1054), 1,
+      sym_expression,
+    ACTIONS(293), 2,
+      sym_ellipsis,
+      sym_float,
+    STATE(1369), 2,
+      sym_list_splat,
+      sym_slice,
+    ACTIONS(285), 3,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_TILDE,
+    ACTIONS(295), 4,
+      sym_integer,
+      sym_true,
+      sym_false,
+      sym_none,
+    ACTIONS(269), 5,
+      anon_sym_print,
+      anon_sym_async,
+      anon_sym_match,
+      anon_sym_exec,
+      anon_sym_type,
+    STATE(883), 6,
+      sym_named_expression,
+      sym_not_operator,
+      sym_boolean_operator,
+      sym_comparison_operator,
+      sym_lambda,
+      sym_conditional_expression,
+    STATE(605), 16,
+      sym_binary_operator,
+      sym_unary_operator,
+      sym_attribute,
+      sym_subscript,
+      sym_call,
+      sym_list,
+      sym_set,
+      sym_tuple,
+      sym_dictionary,
+      sym_list_comprehension,
+      sym_dictionary_comprehension,
+      sym_set_comprehension,
+      sym_generator_expression,
+      sym_parenthesized_expression,
+      sym_concatenated_string,
+      sym_await,
+  [7615] = 9,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(822), 1,
+      anon_sym_else,
+    ACTIONS(826), 1,
+      anon_sym_finally,
+    ACTIONS(832), 1,
+      anon_sym_except,
+    STATE(436), 1,
+      sym_else_clause,
+    STATE(519), 1,
+      sym_finally_clause,
+    STATE(284), 2,
+      sym_except_clause,
+      aux_sym_try_statement_repeat1,
+    ACTIONS(820), 12,
+      sym__dedent,
+      sym__string_start,
+      anon_sym_LPAREN,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_LBRACE,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_TILDE,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(818), 33,
+      anon_sym_import,
+      anon_sym_from,
+      anon_sym_STAR,
+      anon_sym_print,
+      anon_sym_assert,
+      anon_sym_return,
+      anon_sym_del,
+      anon_sym_raise,
+      anon_sym_pass,
+      anon_sym_break,
+      anon_sym_continue,
+      anon_sym_if,
+      anon_sym_async,
+      anon_sym_for,
+      anon_sym_while,
+      anon_sym_try,
+      anon_sym_with,
+      anon_sym_match,
+      anon_sym_def,
+      anon_sym_global,
+      anon_sym_nonlocal,
+      anon_sym_exec,
+      anon_sym_type,
+      anon_sym_class,
+      anon_sym_not,
+      anon_sym_lambda,
+      anon_sym_yield,
+      sym_integer,
+      sym_identifier,
+      anon_sym_await,
+      sym_true,
+      sym_false,
+      sym_none,
+  [7687] = 22,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(258), 1,
+      sym_identifier,
+    ACTIONS(262), 1,
+      anon_sym_LPAREN,
+    ACTIONS(277), 1,
+      anon_sym_LBRACK,
+    ACTIONS(279), 1,
+      anon_sym_LBRACE,
+    ACTIONS(283), 1,
+      anon_sym_not,
+    ACTIONS(289), 1,
+      anon_sym_lambda,
+    ACTIONS(297), 1,
+      anon_sym_await,
+    ACTIONS(299), 1,
+      sym__string_start,
+    ACTIONS(706), 1,
+      anon_sym_STAR,
+    ACTIONS(828), 1,
+      anon_sym_COLON,
+    ACTIONS(834), 1,
+      anon_sym_RBRACK,
+    STATE(586), 1,
+      sym_string,
+    STATE(616), 1,
+      sym_primary_expression,
+    STATE(1054), 1,
+      sym_expression,
+    ACTIONS(293), 2,
+      sym_ellipsis,
+      sym_float,
+    STATE(1369), 2,
+      sym_list_splat,
+      sym_slice,
+    ACTIONS(285), 3,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_TILDE,
+    ACTIONS(295), 4,
+      sym_integer,
+      sym_true,
+      sym_false,
+      sym_none,
+    ACTIONS(269), 5,
+      anon_sym_print,
+      anon_sym_async,
+      anon_sym_match,
+      anon_sym_exec,
+      anon_sym_type,
+    STATE(883), 6,
+      sym_named_expression,
+      sym_not_operator,
+      sym_boolean_operator,
+      sym_comparison_operator,
+      sym_lambda,
+      sym_conditional_expression,
+    STATE(605), 16,
+      sym_binary_operator,
+      sym_unary_operator,
+      sym_attribute,
+      sym_subscript,
+      sym_call,
+      sym_list,
+      sym_set,
+      sym_tuple,
+      sym_dictionary,
+      sym_list_comprehension,
+      sym_dictionary_comprehension,
+      sym_set_comprehension,
+      sym_generator_expression,
+      sym_parenthesized_expression,
+      sym_concatenated_string,
+      sym_await,
+  [7785] = 22,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(258), 1,
+      sym_identifier,
+    ACTIONS(262), 1,
+      anon_sym_LPAREN,
+    ACTIONS(277), 1,
+      anon_sym_LBRACK,
+    ACTIONS(279), 1,
+      anon_sym_LBRACE,
+    ACTIONS(283), 1,
+      anon_sym_not,
+    ACTIONS(289), 1,
+      anon_sym_lambda,
+    ACTIONS(297), 1,
+      anon_sym_await,
+    ACTIONS(299), 1,
+      sym__string_start,
+    ACTIONS(706), 1,
+      anon_sym_STAR,
+    ACTIONS(828), 1,
+      anon_sym_COLON,
+    ACTIONS(836), 1,
+      anon_sym_RBRACK,
+    STATE(586), 1,
+      sym_string,
+    STATE(616), 1,
+      sym_primary_expression,
+    STATE(1054), 1,
+      sym_expression,
+    ACTIONS(293), 2,
+      sym_ellipsis,
+      sym_float,
+    STATE(1369), 2,
+      sym_list_splat,
+      sym_slice,
+    ACTIONS(285), 3,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_TILDE,
+    ACTIONS(295), 4,
+      sym_integer,
+      sym_true,
+      sym_false,
+      sym_none,
+    ACTIONS(269), 5,
+      anon_sym_print,
+      anon_sym_async,
+      anon_sym_match,
+      anon_sym_exec,
+      anon_sym_type,
+    STATE(883), 6,
+      sym_named_expression,
+      sym_not_operator,
+      sym_boolean_operator,
+      sym_comparison_operator,
+      sym_lambda,
+      sym_conditional_expression,
+    STATE(605), 16,
+      sym_binary_operator,
+      sym_unary_operator,
+      sym_attribute,
+      sym_subscript,
+      sym_call,
+      sym_list,
+      sym_set,
+      sym_tuple,
+      sym_dictionary,
+      sym_list_comprehension,
+      sym_dictionary_comprehension,
+      sym_set_comprehension,
+      sym_generator_expression,
+      sym_parenthesized_expression,
+      sym_concatenated_string,
+      sym_await,
+  [7883] = 21,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(258), 1,
+      sym_identifier,
+    ACTIONS(277), 1,
+      anon_sym_LBRACK,
+    ACTIONS(279), 1,
+      anon_sym_LBRACE,
+    ACTIONS(283), 1,
+      anon_sym_not,
+    ACTIONS(289), 1,
+      anon_sym_lambda,
+    ACTIONS(297), 1,
+      anon_sym_await,
+    ACTIONS(299), 1,
+      sym__string_start,
+    ACTIONS(630), 1,
+      anon_sym_yield,
+    ACTIONS(690), 1,
+      anon_sym_LPAREN,
+    ACTIONS(706), 1,
+      anon_sym_STAR,
+    STATE(586), 1,
+      sym_string,
+    STATE(616), 1,
+      sym_primary_expression,
+    STATE(1005), 1,
+      sym_expression,
+    ACTIONS(293), 2,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(285), 3,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_TILDE,
+    STATE(1167), 3,
+      sym_list_splat,
+      sym_parenthesized_list_splat,
+      sym_yield,
+    ACTIONS(295), 4,
+      sym_integer,
+      sym_true,
+      sym_false,
+      sym_none,
+    ACTIONS(269), 5,
+      anon_sym_print,
+      anon_sym_async,
+      anon_sym_match,
+      anon_sym_exec,
+      anon_sym_type,
+    STATE(883), 6,
+      sym_named_expression,
+      sym_not_operator,
+      sym_boolean_operator,
+      sym_comparison_operator,
+      sym_lambda,
+      sym_conditional_expression,
+    STATE(605), 16,
+      sym_binary_operator,
+      sym_unary_operator,
+      sym_attribute,
+      sym_subscript,
+      sym_call,
+      sym_list,
+      sym_set,
+      sym_tuple,
+      sym_dictionary,
+      sym_list_comprehension,
+      sym_dictionary_comprehension,
+      sym_set_comprehension,
+      sym_generator_expression,
+      sym_parenthesized_expression,
+      sym_concatenated_string,
+      sym_await,
+  [7979] = 22,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(53), 1,
+      anon_sym_STAR_STAR,
+    ACTIONS(258), 1,
+      sym_identifier,
+    ACTIONS(262), 1,
+      anon_sym_LPAREN,
+    ACTIONS(267), 1,
+      anon_sym_STAR,
+    ACTIONS(277), 1,
+      anon_sym_LBRACK,
+    ACTIONS(279), 1,
+      anon_sym_LBRACE,
+    ACTIONS(283), 1,
+      anon_sym_not,
+    ACTIONS(289), 1,
+      anon_sym_lambda,
+    ACTIONS(297), 1,
+      anon_sym_await,
+    ACTIONS(299), 1,
+      sym__string_start,
+    STATE(586), 1,
+      sym_string,
+    STATE(616), 1,
+      sym_primary_expression,
+    STATE(1049), 1,
+      sym_expression,
+    STATE(1505), 1,
+      sym_expression_list,
+    ACTIONS(293), 2,
+      sym_ellipsis,
+      sym_float,
+    STATE(1367), 2,
+      sym_list_splat,
+      sym_dictionary_splat,
+    ACTIONS(285), 3,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_TILDE,
+    ACTIONS(295), 4,
+      sym_integer,
+      sym_true,
+      sym_false,
+      sym_none,
+    ACTIONS(269), 5,
+      anon_sym_print,
+      anon_sym_async,
+      anon_sym_match,
+      anon_sym_exec,
+      anon_sym_type,
+    STATE(883), 6,
+      sym_named_expression,
+      sym_not_operator,
+      sym_boolean_operator,
+      sym_comparison_operator,
+      sym_lambda,
+      sym_conditional_expression,
+    STATE(605), 16,
+      sym_binary_operator,
+      sym_unary_operator,
+      sym_attribute,
+      sym_subscript,
+      sym_call,
+      sym_list,
+      sym_set,
+      sym_tuple,
+      sym_dictionary,
+      sym_list_comprehension,
+      sym_dictionary_comprehension,
+      sym_set_comprehension,
+      sym_generator_expression,
+      sym_parenthesized_expression,
+      sym_concatenated_string,
+      sym_await,
+  [8077] = 9,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(842), 1,
+      anon_sym_else,
+    ACTIONS(844), 1,
+      anon_sym_except,
+    ACTIONS(846), 1,
+      anon_sym_finally,
+    STATE(440), 1,
+      sym_else_clause,
+    STATE(477), 1,
+      sym_finally_clause,
+    STATE(297), 2,
+      sym_except_clause,
+      aux_sym_try_statement_repeat1,
+    ACTIONS(838), 12,
+      sym__string_start,
+      ts_builtin_sym_end,
+      anon_sym_LPAREN,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_LBRACE,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_TILDE,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(840), 33,
+      anon_sym_import,
+      anon_sym_from,
+      anon_sym_STAR,
+      anon_sym_print,
+      anon_sym_assert,
+      anon_sym_return,
+      anon_sym_del,
+      anon_sym_raise,
+      anon_sym_pass,
+      anon_sym_break,
+      anon_sym_continue,
+      anon_sym_if,
+      anon_sym_async,
+      anon_sym_for,
+      anon_sym_while,
+      anon_sym_try,
+      anon_sym_with,
+      anon_sym_match,
+      anon_sym_def,
+      anon_sym_global,
+      anon_sym_nonlocal,
+      anon_sym_exec,
+      anon_sym_type,
+      anon_sym_class,
+      anon_sym_not,
+      anon_sym_lambda,
+      anon_sym_yield,
+      sym_integer,
+      sym_identifier,
+      anon_sym_await,
+      sym_true,
+      sym_false,
+      sym_none,
+  [8149] = 9,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(842), 1,
+      anon_sym_else,
+    ACTIONS(846), 1,
+      anon_sym_finally,
+    ACTIONS(848), 1,
+      anon_sym_except,
+    STATE(440), 1,
+      sym_else_clause,
+    STATE(477), 1,
+      sym_finally_clause,
+    STATE(296), 2,
+      sym_except_group_clause,
+      aux_sym_try_statement_repeat2,
+    ACTIONS(838), 12,
+      sym__string_start,
+      ts_builtin_sym_end,
+      anon_sym_LPAREN,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_LBRACE,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_TILDE,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(840), 33,
+      anon_sym_import,
+      anon_sym_from,
+      anon_sym_STAR,
+      anon_sym_print,
+      anon_sym_assert,
+      anon_sym_return,
+      anon_sym_del,
+      anon_sym_raise,
+      anon_sym_pass,
+      anon_sym_break,
+      anon_sym_continue,
+      anon_sym_if,
+      anon_sym_async,
+      anon_sym_for,
+      anon_sym_while,
+      anon_sym_try,
+      anon_sym_with,
+      anon_sym_match,
+      anon_sym_def,
+      anon_sym_global,
+      anon_sym_nonlocal,
+      anon_sym_exec,
+      anon_sym_type,
+      anon_sym_class,
+      anon_sym_not,
+      anon_sym_lambda,
+      anon_sym_yield,
+      sym_integer,
+      sym_identifier,
+      anon_sym_await,
+      sym_true,
+      sym_false,
+      sym_none,
+  [8221] = 22,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(53), 1,
+      anon_sym_STAR_STAR,
+    ACTIONS(258), 1,
+      sym_identifier,
+    ACTIONS(262), 1,
+      anon_sym_LPAREN,
+    ACTIONS(267), 1,
+      anon_sym_STAR,
+    ACTIONS(277), 1,
+      anon_sym_LBRACK,
+    ACTIONS(279), 1,
+      anon_sym_LBRACE,
+    ACTIONS(283), 1,
+      anon_sym_not,
+    ACTIONS(289), 1,
+      anon_sym_lambda,
+    ACTIONS(297), 1,
+      anon_sym_await,
+    ACTIONS(299), 1,
+      sym__string_start,
+    STATE(586), 1,
+      sym_string,
+    STATE(616), 1,
+      sym_primary_expression,
+    STATE(1067), 1,
+      sym_expression,
+    STATE(1444), 1,
+      sym_expression_list,
+    ACTIONS(293), 2,
+      sym_ellipsis,
+      sym_float,
+    STATE(1367), 2,
+      sym_list_splat,
+      sym_dictionary_splat,
+    ACTIONS(285), 3,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_TILDE,
+    ACTIONS(295), 4,
+      sym_integer,
+      sym_true,
+      sym_false,
+      sym_none,
+    ACTIONS(269), 5,
+      anon_sym_print,
+      anon_sym_async,
+      anon_sym_match,
+      anon_sym_exec,
+      anon_sym_type,
+    STATE(883), 6,
+      sym_named_expression,
+      sym_not_operator,
+      sym_boolean_operator,
+      sym_comparison_operator,
+      sym_lambda,
+      sym_conditional_expression,
+    STATE(605), 16,
+      sym_binary_operator,
+      sym_unary_operator,
+      sym_attribute,
+      sym_subscript,
+      sym_call,
+      sym_list,
+      sym_set,
+      sym_tuple,
+      sym_dictionary,
+      sym_list_comprehension,
+      sym_dictionary_comprehension,
+      sym_set_comprehension,
+      sym_generator_expression,
+      sym_parenthesized_expression,
+      sym_concatenated_string,
+      sym_await,
+  [8319] = 22,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(258), 1,
+      sym_identifier,
+    ACTIONS(262), 1,
+      anon_sym_LPAREN,
+    ACTIONS(277), 1,
+      anon_sym_LBRACK,
+    ACTIONS(279), 1,
+      anon_sym_LBRACE,
+    ACTIONS(283), 1,
+      anon_sym_not,
+    ACTIONS(289), 1,
+      anon_sym_lambda,
+    ACTIONS(297), 1,
+      anon_sym_await,
+    ACTIONS(299), 1,
+      sym__string_start,
+    ACTIONS(706), 1,
+      anon_sym_STAR,
+    ACTIONS(828), 1,
+      anon_sym_COLON,
+    ACTIONS(850), 1,
+      anon_sym_RBRACK,
+    STATE(586), 1,
+      sym_string,
+    STATE(616), 1,
+      sym_primary_expression,
+    STATE(1054), 1,
+      sym_expression,
+    ACTIONS(293), 2,
+      sym_ellipsis,
+      sym_float,
+    STATE(1369), 2,
+      sym_list_splat,
+      sym_slice,
+    ACTIONS(285), 3,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_TILDE,
+    ACTIONS(295), 4,
+      sym_integer,
+      sym_true,
+      sym_false,
+      sym_none,
+    ACTIONS(269), 5,
+      anon_sym_print,
+      anon_sym_async,
+      anon_sym_match,
+      anon_sym_exec,
+      anon_sym_type,
+    STATE(883), 6,
+      sym_named_expression,
+      sym_not_operator,
+      sym_boolean_operator,
+      sym_comparison_operator,
+      sym_lambda,
+      sym_conditional_expression,
+    STATE(605), 16,
+      sym_binary_operator,
+      sym_unary_operator,
+      sym_attribute,
+      sym_subscript,
+      sym_call,
+      sym_list,
+      sym_set,
+      sym_tuple,
+      sym_dictionary,
+      sym_list_comprehension,
+      sym_dictionary_comprehension,
+      sym_set_comprehension,
+      sym_generator_expression,
+      sym_parenthesized_expression,
+      sym_concatenated_string,
+      sym_await,
+  [8417] = 22,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(258), 1,
+      sym_identifier,
+    ACTIONS(262), 1,
+      anon_sym_LPAREN,
+    ACTIONS(277), 1,
+      anon_sym_LBRACK,
+    ACTIONS(279), 1,
+      anon_sym_LBRACE,
+    ACTIONS(283), 1,
+      anon_sym_not,
+    ACTIONS(289), 1,
+      anon_sym_lambda,
+    ACTIONS(297), 1,
+      anon_sym_await,
+    ACTIONS(299), 1,
+      sym__string_start,
+    ACTIONS(706), 1,
+      anon_sym_STAR,
+    ACTIONS(828), 1,
+      anon_sym_COLON,
+    ACTIONS(852), 1,
+      anon_sym_RBRACK,
+    STATE(586), 1,
+      sym_string,
+    STATE(616), 1,
+      sym_primary_expression,
+    STATE(1054), 1,
+      sym_expression,
+    ACTIONS(293), 2,
+      sym_ellipsis,
+      sym_float,
+    STATE(1369), 2,
+      sym_list_splat,
+      sym_slice,
+    ACTIONS(285), 3,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_TILDE,
+    ACTIONS(295), 4,
+      sym_integer,
+      sym_true,
+      sym_false,
+      sym_none,
+    ACTIONS(269), 5,
+      anon_sym_print,
+      anon_sym_async,
+      anon_sym_match,
+      anon_sym_exec,
+      anon_sym_type,
+    STATE(883), 6,
+      sym_named_expression,
+      sym_not_operator,
+      sym_boolean_operator,
+      sym_comparison_operator,
+      sym_lambda,
+      sym_conditional_expression,
+    STATE(605), 16,
+      sym_binary_operator,
+      sym_unary_operator,
+      sym_attribute,
+      sym_subscript,
+      sym_call,
+      sym_list,
+      sym_set,
+      sym_tuple,
+      sym_dictionary,
+      sym_list_comprehension,
+      sym_dictionary_comprehension,
+      sym_set_comprehension,
+      sym_generator_expression,
+      sym_parenthesized_expression,
+      sym_concatenated_string,
+      sym_await,
+  [8515] = 9,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(842), 1,
+      anon_sym_else,
+    ACTIONS(844), 1,
+      anon_sym_except,
+    ACTIONS(846), 1,
+      anon_sym_finally,
+    STATE(438), 1,
+      sym_else_clause,
+    STATE(510), 1,
+      sym_finally_clause,
+    STATE(297), 2,
+      sym_except_clause,
+      aux_sym_try_statement_repeat1,
+    ACTIONS(820), 12,
+      sym__string_start,
+      ts_builtin_sym_end,
+      anon_sym_LPAREN,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_LBRACE,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_TILDE,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(818), 33,
+      anon_sym_import,
+      anon_sym_from,
+      anon_sym_STAR,
+      anon_sym_print,
+      anon_sym_assert,
+      anon_sym_return,
+      anon_sym_del,
+      anon_sym_raise,
+      anon_sym_pass,
+      anon_sym_break,
+      anon_sym_continue,
+      anon_sym_if,
+      anon_sym_async,
+      anon_sym_for,
+      anon_sym_while,
+      anon_sym_try,
+      anon_sym_with,
+      anon_sym_match,
+      anon_sym_def,
+      anon_sym_global,
+      anon_sym_nonlocal,
+      anon_sym_exec,
+      anon_sym_type,
+      anon_sym_class,
+      anon_sym_not,
+      anon_sym_lambda,
+      anon_sym_yield,
+      sym_integer,
+      sym_identifier,
+      anon_sym_await,
+      sym_true,
+      sym_false,
+      sym_none,
+  [8587] = 22,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(258), 1,
+      sym_identifier,
+    ACTIONS(262), 1,
+      anon_sym_LPAREN,
+    ACTIONS(277), 1,
+      anon_sym_LBRACK,
+    ACTIONS(279), 1,
+      anon_sym_LBRACE,
+    ACTIONS(283), 1,
+      anon_sym_not,
+    ACTIONS(289), 1,
+      anon_sym_lambda,
+    ACTIONS(297), 1,
+      anon_sym_await,
+    ACTIONS(299), 1,
+      sym__string_start,
+    ACTIONS(706), 1,
+      anon_sym_STAR,
+    ACTIONS(828), 1,
+      anon_sym_COLON,
+    ACTIONS(854), 1,
+      anon_sym_RBRACK,
+    STATE(586), 1,
+      sym_string,
+    STATE(616), 1,
+      sym_primary_expression,
+    STATE(1054), 1,
+      sym_expression,
+    ACTIONS(293), 2,
+      sym_ellipsis,
+      sym_float,
+    STATE(1369), 2,
+      sym_list_splat,
+      sym_slice,
+    ACTIONS(285), 3,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_TILDE,
+    ACTIONS(295), 4,
+      sym_integer,
+      sym_true,
+      sym_false,
+      sym_none,
+    ACTIONS(269), 5,
+      anon_sym_print,
+      anon_sym_async,
+      anon_sym_match,
+      anon_sym_exec,
+      anon_sym_type,
+    STATE(883), 6,
+      sym_named_expression,
+      sym_not_operator,
+      sym_boolean_operator,
+      sym_comparison_operator,
+      sym_lambda,
+      sym_conditional_expression,
+    STATE(605), 16,
+      sym_binary_operator,
+      sym_unary_operator,
+      sym_attribute,
+      sym_subscript,
+      sym_call,
+      sym_list,
+      sym_set,
+      sym_tuple,
+      sym_dictionary,
+      sym_list_comprehension,
+      sym_dictionary_comprehension,
+      sym_set_comprehension,
+      sym_generator_expression,
+      sym_parenthesized_expression,
+      sym_concatenated_string,
+      sym_await,
+  [8685] = 9,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(842), 1,
+      anon_sym_else,
+    ACTIONS(846), 1,
+      anon_sym_finally,
+    ACTIONS(848), 1,
+      anon_sym_except,
+    STATE(438), 1,
+      sym_else_clause,
+    STATE(510), 1,
+      sym_finally_clause,
+    STATE(296), 2,
+      sym_except_group_clause,
+      aux_sym_try_statement_repeat2,
+    ACTIONS(820), 12,
+      sym__string_start,
+      ts_builtin_sym_end,
+      anon_sym_LPAREN,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_LBRACE,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_TILDE,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(818), 33,
+      anon_sym_import,
+      anon_sym_from,
+      anon_sym_STAR,
+      anon_sym_print,
+      anon_sym_assert,
+      anon_sym_return,
+      anon_sym_del,
+      anon_sym_raise,
+      anon_sym_pass,
+      anon_sym_break,
+      anon_sym_continue,
+      anon_sym_if,
+      anon_sym_async,
+      anon_sym_for,
+      anon_sym_while,
+      anon_sym_try,
+      anon_sym_with,
+      anon_sym_match,
+      anon_sym_def,
+      anon_sym_global,
+      anon_sym_nonlocal,
+      anon_sym_exec,
+      anon_sym_type,
+      anon_sym_class,
+      anon_sym_not,
+      anon_sym_lambda,
+      anon_sym_yield,
+      sym_integer,
+      sym_identifier,
+      anon_sym_await,
+      sym_true,
+      sym_false,
+      sym_none,
+  [8757] = 9,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(822), 1,
+      anon_sym_else,
+    ACTIONS(826), 1,
+      anon_sym_finally,
+    ACTIONS(832), 1,
+      anon_sym_except,
+    STATE(453), 1,
+      sym_else_clause,
+    STATE(531), 1,
+      sym_finally_clause,
+    STATE(284), 2,
+      sym_except_clause,
+      aux_sym_try_statement_repeat1,
+    ACTIONS(838), 12,
+      sym__dedent,
+      sym__string_start,
+      anon_sym_LPAREN,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_LBRACE,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_TILDE,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(840), 33,
+      anon_sym_import,
+      anon_sym_from,
+      anon_sym_STAR,
+      anon_sym_print,
+      anon_sym_assert,
+      anon_sym_return,
+      anon_sym_del,
+      anon_sym_raise,
+      anon_sym_pass,
+      anon_sym_break,
+      anon_sym_continue,
+      anon_sym_if,
+      anon_sym_async,
+      anon_sym_for,
+      anon_sym_while,
+      anon_sym_try,
+      anon_sym_with,
+      anon_sym_match,
+      anon_sym_def,
+      anon_sym_global,
+      anon_sym_nonlocal,
+      anon_sym_exec,
+      anon_sym_type,
+      anon_sym_class,
+      anon_sym_not,
+      anon_sym_lambda,
+      anon_sym_yield,
+      sym_integer,
+      sym_identifier,
+      anon_sym_await,
+      sym_true,
+      sym_false,
+      sym_none,
+  [8829] = 22,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(53), 1,
+      anon_sym_STAR_STAR,
+    ACTIONS(258), 1,
+      sym_identifier,
+    ACTIONS(262), 1,
+      anon_sym_LPAREN,
+    ACTIONS(267), 1,
+      anon_sym_STAR,
+    ACTIONS(277), 1,
+      anon_sym_LBRACK,
+    ACTIONS(279), 1,
+      anon_sym_LBRACE,
+    ACTIONS(283), 1,
+      anon_sym_not,
+    ACTIONS(289), 1,
+      anon_sym_lambda,
+    ACTIONS(297), 1,
+      anon_sym_await,
+    ACTIONS(299), 1,
+      sym__string_start,
+    STATE(586), 1,
+      sym_string,
+    STATE(616), 1,
+      sym_primary_expression,
+    STATE(1057), 1,
+      sym_expression,
+    STATE(1481), 1,
+      sym_expression_list,
+    ACTIONS(293), 2,
+      sym_ellipsis,
+      sym_float,
+    STATE(1367), 2,
+      sym_list_splat,
+      sym_dictionary_splat,
+    ACTIONS(285), 3,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_TILDE,
+    ACTIONS(295), 4,
+      sym_integer,
+      sym_true,
+      sym_false,
+      sym_none,
+    ACTIONS(269), 5,
+      anon_sym_print,
+      anon_sym_async,
+      anon_sym_match,
+      anon_sym_exec,
+      anon_sym_type,
+    STATE(883), 6,
+      sym_named_expression,
+      sym_not_operator,
+      sym_boolean_operator,
+      sym_comparison_operator,
+      sym_lambda,
+      sym_conditional_expression,
+    STATE(605), 16,
+      sym_binary_operator,
+      sym_unary_operator,
+      sym_attribute,
+      sym_subscript,
+      sym_call,
+      sym_list,
+      sym_set,
+      sym_tuple,
+      sym_dictionary,
+      sym_list_comprehension,
+      sym_dictionary_comprehension,
+      sym_set_comprehension,
+      sym_generator_expression,
+      sym_parenthesized_expression,
+      sym_concatenated_string,
+      sym_await,
+  [8927] = 22,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(258), 1,
+      sym_identifier,
+    ACTIONS(262), 1,
+      anon_sym_LPAREN,
+    ACTIONS(277), 1,
+      anon_sym_LBRACK,
+    ACTIONS(279), 1,
+      anon_sym_LBRACE,
+    ACTIONS(283), 1,
+      anon_sym_not,
+    ACTIONS(289), 1,
+      anon_sym_lambda,
+    ACTIONS(297), 1,
+      anon_sym_await,
+    ACTIONS(299), 1,
+      sym__string_start,
+    ACTIONS(706), 1,
+      anon_sym_STAR,
+    ACTIONS(828), 1,
+      anon_sym_COLON,
+    ACTIONS(856), 1,
+      anon_sym_RBRACK,
+    STATE(586), 1,
+      sym_string,
+    STATE(616), 1,
+      sym_primary_expression,
+    STATE(1054), 1,
+      sym_expression,
+    ACTIONS(293), 2,
+      sym_ellipsis,
+      sym_float,
+    STATE(1369), 2,
+      sym_list_splat,
+      sym_slice,
+    ACTIONS(285), 3,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_TILDE,
+    ACTIONS(295), 4,
+      sym_integer,
+      sym_true,
+      sym_false,
+      sym_none,
+    ACTIONS(269), 5,
+      anon_sym_print,
+      anon_sym_async,
+      anon_sym_match,
+      anon_sym_exec,
+      anon_sym_type,
+    STATE(883), 6,
+      sym_named_expression,
+      sym_not_operator,
+      sym_boolean_operator,
+      sym_comparison_operator,
+      sym_lambda,
+      sym_conditional_expression,
+    STATE(605), 16,
+      sym_binary_operator,
+      sym_unary_operator,
+      sym_attribute,
+      sym_subscript,
+      sym_call,
+      sym_list,
+      sym_set,
+      sym_tuple,
+      sym_dictionary,
+      sym_list_comprehension,
+      sym_dictionary_comprehension,
+      sym_set_comprehension,
+      sym_generator_expression,
+      sym_parenthesized_expression,
+      sym_concatenated_string,
+      sym_await,
+  [9025] = 22,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(51), 1,
+      anon_sym_LBRACE,
+    ACTIONS(53), 1,
+      anon_sym_STAR_STAR,
+    ACTIONS(69), 1,
+      anon_sym_not,
+    ACTIONS(71), 1,
+      anon_sym_lambda,
+    ACTIONS(81), 1,
+      sym__string_start,
+    ACTIONS(267), 1,
+      anon_sym_STAR,
+    ACTIONS(327), 1,
+      sym_identifier,
+    ACTIONS(333), 1,
+      anon_sym_await,
+    ACTIONS(568), 1,
+      anon_sym_LPAREN,
+    ACTIONS(574), 1,
+      anon_sym_LBRACK,
+    STATE(707), 1,
+      sym_primary_expression,
+    STATE(709), 1,
+      sym_string,
+    STATE(1027), 1,
+      sym_expression,
+    STATE(1333), 1,
+      sym_expression_list,
+    ACTIONS(75), 2,
+      sym_ellipsis,
+      sym_float,
+    STATE(1321), 2,
+      sym_list_splat,
+      sym_dictionary_splat,
+    ACTIONS(47), 3,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_TILDE,
+    ACTIONS(77), 4,
+      sym_integer,
+      sym_true,
+      sym_false,
+      sym_none,
+    ACTIONS(329), 5,
+      anon_sym_print,
+      anon_sym_async,
+      anon_sym_match,
+      anon_sym_exec,
+      anon_sym_type,
+    STATE(985), 6,
+      sym_named_expression,
+      sym_not_operator,
+      sym_boolean_operator,
+      sym_comparison_operator,
+      sym_lambda,
+      sym_conditional_expression,
+    STATE(759), 16,
+      sym_binary_operator,
+      sym_unary_operator,
+      sym_attribute,
+      sym_subscript,
+      sym_call,
+      sym_list,
+      sym_set,
+      sym_tuple,
+      sym_dictionary,
+      sym_list_comprehension,
+      sym_dictionary_comprehension,
+      sym_set_comprehension,
+      sym_generator_expression,
+      sym_parenthesized_expression,
+      sym_concatenated_string,
+      sym_await,
+  [9123] = 22,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(258), 1,
+      sym_identifier,
+    ACTIONS(262), 1,
+      anon_sym_LPAREN,
+    ACTIONS(277), 1,
+      anon_sym_LBRACK,
+    ACTIONS(279), 1,
+      anon_sym_LBRACE,
+    ACTIONS(283), 1,
+      anon_sym_not,
+    ACTIONS(289), 1,
+      anon_sym_lambda,
+    ACTIONS(297), 1,
+      anon_sym_await,
+    ACTIONS(299), 1,
+      sym__string_start,
+    ACTIONS(706), 1,
+      anon_sym_STAR,
+    ACTIONS(828), 1,
+      anon_sym_COLON,
+    ACTIONS(858), 1,
+      anon_sym_RBRACK,
+    STATE(586), 1,
+      sym_string,
+    STATE(616), 1,
+      sym_primary_expression,
+    STATE(1054), 1,
+      sym_expression,
+    ACTIONS(293), 2,
+      sym_ellipsis,
+      sym_float,
+    STATE(1369), 2,
+      sym_list_splat,
+      sym_slice,
+    ACTIONS(285), 3,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_TILDE,
+    ACTIONS(295), 4,
+      sym_integer,
+      sym_true,
+      sym_false,
+      sym_none,
+    ACTIONS(269), 5,
+      anon_sym_print,
+      anon_sym_async,
+      anon_sym_match,
+      anon_sym_exec,
+      anon_sym_type,
+    STATE(883), 6,
+      sym_named_expression,
+      sym_not_operator,
+      sym_boolean_operator,
+      sym_comparison_operator,
+      sym_lambda,
+      sym_conditional_expression,
+    STATE(605), 16,
+      sym_binary_operator,
+      sym_unary_operator,
+      sym_attribute,
+      sym_subscript,
+      sym_call,
+      sym_list,
+      sym_set,
+      sym_tuple,
+      sym_dictionary,
+      sym_list_comprehension,
+      sym_dictionary_comprehension,
+      sym_set_comprehension,
+      sym_generator_expression,
+      sym_parenthesized_expression,
+      sym_concatenated_string,
+      sym_await,
+  [9221] = 9,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(822), 1,
+      anon_sym_else,
+    ACTIONS(824), 1,
+      anon_sym_except,
+    ACTIONS(826), 1,
+      anon_sym_finally,
+    STATE(453), 1,
+      sym_else_clause,
+    STATE(531), 1,
+      sym_finally_clause,
+    STATE(285), 2,
+      sym_except_group_clause,
+      aux_sym_try_statement_repeat2,
+    ACTIONS(838), 12,
+      sym__dedent,
+      sym__string_start,
+      anon_sym_LPAREN,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_LBRACE,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_TILDE,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(840), 33,
+      anon_sym_import,
+      anon_sym_from,
+      anon_sym_STAR,
+      anon_sym_print,
+      anon_sym_assert,
+      anon_sym_return,
+      anon_sym_del,
+      anon_sym_raise,
+      anon_sym_pass,
+      anon_sym_break,
+      anon_sym_continue,
+      anon_sym_if,
+      anon_sym_async,
+      anon_sym_for,
+      anon_sym_while,
+      anon_sym_try,
+      anon_sym_with,
+      anon_sym_match,
+      anon_sym_def,
+      anon_sym_global,
+      anon_sym_nonlocal,
+      anon_sym_exec,
+      anon_sym_type,
+      anon_sym_class,
+      anon_sym_not,
+      anon_sym_lambda,
+      anon_sym_yield,
+      sym_integer,
+      sym_identifier,
+      anon_sym_await,
+      sym_true,
+      sym_false,
+      sym_none,
+  [9293] = 22,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(53), 1,
+      anon_sym_STAR_STAR,
+    ACTIONS(258), 1,
+      sym_identifier,
+    ACTIONS(262), 1,
+      anon_sym_LPAREN,
+    ACTIONS(267), 1,
+      anon_sym_STAR,
+    ACTIONS(277), 1,
+      anon_sym_LBRACK,
+    ACTIONS(279), 1,
+      anon_sym_LBRACE,
+    ACTIONS(283), 1,
+      anon_sym_not,
+    ACTIONS(289), 1,
+      anon_sym_lambda,
+    ACTIONS(297), 1,
+      anon_sym_await,
+    ACTIONS(299), 1,
+      sym__string_start,
+    STATE(586), 1,
+      sym_string,
+    STATE(616), 1,
+      sym_primary_expression,
+    STATE(1066), 1,
+      sym_expression,
+    STATE(1451), 1,
+      sym_expression_list,
+    ACTIONS(293), 2,
+      sym_ellipsis,
+      sym_float,
+    STATE(1367), 2,
+      sym_list_splat,
+      sym_dictionary_splat,
+    ACTIONS(285), 3,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_TILDE,
+    ACTIONS(295), 4,
+      sym_integer,
+      sym_true,
+      sym_false,
+      sym_none,
+    ACTIONS(269), 5,
+      anon_sym_print,
+      anon_sym_async,
+      anon_sym_match,
+      anon_sym_exec,
+      anon_sym_type,
+    STATE(883), 6,
+      sym_named_expression,
+      sym_not_operator,
+      sym_boolean_operator,
+      sym_comparison_operator,
+      sym_lambda,
+      sym_conditional_expression,
+    STATE(605), 16,
+      sym_binary_operator,
+      sym_unary_operator,
+      sym_attribute,
+      sym_subscript,
+      sym_call,
+      sym_list,
+      sym_set,
+      sym_tuple,
+      sym_dictionary,
+      sym_list_comprehension,
+      sym_dictionary_comprehension,
+      sym_set_comprehension,
+      sym_generator_expression,
+      sym_parenthesized_expression,
+      sym_concatenated_string,
+      sym_await,
+  [9391] = 22,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(258), 1,
+      sym_identifier,
+    ACTIONS(262), 1,
+      anon_sym_LPAREN,
+    ACTIONS(277), 1,
+      anon_sym_LBRACK,
+    ACTIONS(279), 1,
+      anon_sym_LBRACE,
+    ACTIONS(283), 1,
+      anon_sym_not,
+    ACTIONS(289), 1,
+      anon_sym_lambda,
+    ACTIONS(297), 1,
+      anon_sym_await,
+    ACTIONS(299), 1,
+      sym__string_start,
+    ACTIONS(706), 1,
+      anon_sym_STAR,
+    ACTIONS(828), 1,
+      anon_sym_COLON,
+    ACTIONS(860), 1,
+      anon_sym_RBRACK,
+    STATE(586), 1,
+      sym_string,
+    STATE(616), 1,
+      sym_primary_expression,
+    STATE(1054), 1,
+      sym_expression,
+    ACTIONS(293), 2,
+      sym_ellipsis,
+      sym_float,
+    STATE(1369), 2,
+      sym_list_splat,
+      sym_slice,
+    ACTIONS(285), 3,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_TILDE,
+    ACTIONS(295), 4,
+      sym_integer,
+      sym_true,
+      sym_false,
+      sym_none,
+    ACTIONS(269), 5,
+      anon_sym_print,
+      anon_sym_async,
+      anon_sym_match,
+      anon_sym_exec,
+      anon_sym_type,
+    STATE(883), 6,
+      sym_named_expression,
+      sym_not_operator,
+      sym_boolean_operator,
+      sym_comparison_operator,
+      sym_lambda,
+      sym_conditional_expression,
+    STATE(605), 16,
+      sym_binary_operator,
+      sym_unary_operator,
+      sym_attribute,
+      sym_subscript,
+      sym_call,
+      sym_list,
+      sym_set,
+      sym_tuple,
+      sym_dictionary,
+      sym_list_comprehension,
+      sym_dictionary_comprehension,
+      sym_set_comprehension,
+      sym_generator_expression,
+      sym_parenthesized_expression,
+      sym_concatenated_string,
+      sym_await,
+  [9489] = 21,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(53), 1,
+      anon_sym_STAR_STAR,
+    ACTIONS(258), 1,
+      sym_identifier,
+    ACTIONS(262), 1,
+      anon_sym_LPAREN,
+    ACTIONS(267), 1,
+      anon_sym_STAR,
+    ACTIONS(277), 1,
+      anon_sym_LBRACK,
+    ACTIONS(279), 1,
+      anon_sym_LBRACE,
+    ACTIONS(283), 1,
+      anon_sym_not,
+    ACTIONS(289), 1,
+      anon_sym_lambda,
+    ACTIONS(297), 1,
+      anon_sym_await,
+    ACTIONS(299), 1,
+      sym__string_start,
+    STATE(586), 1,
+      sym_string,
+    STATE(616), 1,
+      sym_primary_expression,
+    STATE(920), 1,
+      sym_expression,
+    ACTIONS(293), 2,
+      sym_ellipsis,
+      sym_float,
+    STATE(1004), 2,
+      sym_list_splat,
+      sym_dictionary_splat,
+    ACTIONS(285), 3,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_TILDE,
+    ACTIONS(295), 4,
+      sym_integer,
+      sym_true,
+      sym_false,
+      sym_none,
+    ACTIONS(269), 5,
+      anon_sym_print,
+      anon_sym_async,
+      anon_sym_match,
+      anon_sym_exec,
+      anon_sym_type,
+    STATE(883), 6,
+      sym_named_expression,
+      sym_not_operator,
+      sym_boolean_operator,
+      sym_comparison_operator,
+      sym_lambda,
+      sym_conditional_expression,
+    STATE(605), 16,
+      sym_binary_operator,
+      sym_unary_operator,
+      sym_attribute,
+      sym_subscript,
+      sym_call,
+      sym_list,
+      sym_set,
+      sym_tuple,
+      sym_dictionary,
+      sym_list_comprehension,
+      sym_dictionary_comprehension,
+      sym_set_comprehension,
+      sym_generator_expression,
+      sym_parenthesized_expression,
+      sym_concatenated_string,
+      sym_await,
+  [9584] = 21,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(53), 1,
+      anon_sym_STAR_STAR,
+    ACTIONS(258), 1,
+      sym_identifier,
+    ACTIONS(262), 1,
+      anon_sym_LPAREN,
+    ACTIONS(277), 1,
+      anon_sym_LBRACK,
+    ACTIONS(279), 1,
+      anon_sym_LBRACE,
+    ACTIONS(283), 1,
+      anon_sym_not,
+    ACTIONS(289), 1,
+      anon_sym_lambda,
+    ACTIONS(297), 1,
+      anon_sym_await,
+    ACTIONS(299), 1,
+      sym__string_start,
+    ACTIONS(862), 1,
+      anon_sym_RBRACE,
+    STATE(586), 1,
+      sym_string,
+    STATE(616), 1,
+      sym_primary_expression,
+    STATE(1142), 1,
+      sym_expression,
+    ACTIONS(293), 2,
+      sym_ellipsis,
+      sym_float,
+    STATE(1334), 2,
+      sym_dictionary_splat,
+      sym_pair,
+    ACTIONS(285), 3,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_TILDE,
+    ACTIONS(295), 4,
+      sym_integer,
+      sym_true,
+      sym_false,
+      sym_none,
+    ACTIONS(269), 5,
+      anon_sym_print,
+      anon_sym_async,
+      anon_sym_match,
+      anon_sym_exec,
+      anon_sym_type,
+    STATE(883), 6,
+      sym_named_expression,
+      sym_not_operator,
+      sym_boolean_operator,
+      sym_comparison_operator,
+      sym_lambda,
+      sym_conditional_expression,
+    STATE(605), 16,
+      sym_binary_operator,
+      sym_unary_operator,
+      sym_attribute,
+      sym_subscript,
+      sym_call,
+      sym_list,
+      sym_set,
+      sym_tuple,
+      sym_dictionary,
+      sym_list_comprehension,
+      sym_dictionary_comprehension,
+      sym_set_comprehension,
+      sym_generator_expression,
+      sym_parenthesized_expression,
+      sym_concatenated_string,
+      sym_await,
+  [9679] = 21,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(53), 1,
+      anon_sym_STAR_STAR,
+    ACTIONS(258), 1,
+      sym_identifier,
+    ACTIONS(262), 1,
+      anon_sym_LPAREN,
+    ACTIONS(277), 1,
+      anon_sym_LBRACK,
+    ACTIONS(279), 1,
+      anon_sym_LBRACE,
+    ACTIONS(283), 1,
+      anon_sym_not,
+    ACTIONS(289), 1,
+      anon_sym_lambda,
+    ACTIONS(297), 1,
+      anon_sym_await,
+    ACTIONS(299), 1,
+      sym__string_start,
+    ACTIONS(864), 1,
+      anon_sym_RBRACE,
+    STATE(586), 1,
+      sym_string,
+    STATE(616), 1,
+      sym_primary_expression,
+    STATE(1142), 1,
+      sym_expression,
+    ACTIONS(293), 2,
+      sym_ellipsis,
+      sym_float,
+    STATE(1334), 2,
+      sym_dictionary_splat,
+      sym_pair,
+    ACTIONS(285), 3,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_TILDE,
+    ACTIONS(295), 4,
+      sym_integer,
+      sym_true,
+      sym_false,
+      sym_none,
+    ACTIONS(269), 5,
+      anon_sym_print,
+      anon_sym_async,
+      anon_sym_match,
+      anon_sym_exec,
+      anon_sym_type,
+    STATE(883), 6,
+      sym_named_expression,
+      sym_not_operator,
+      sym_boolean_operator,
+      sym_comparison_operator,
+      sym_lambda,
+      sym_conditional_expression,
+    STATE(605), 16,
+      sym_binary_operator,
+      sym_unary_operator,
+      sym_attribute,
+      sym_subscript,
+      sym_call,
+      sym_list,
+      sym_set,
+      sym_tuple,
+      sym_dictionary,
+      sym_list_comprehension,
+      sym_dictionary_comprehension,
+      sym_set_comprehension,
+      sym_generator_expression,
+      sym_parenthesized_expression,
+      sym_concatenated_string,
+      sym_await,
+  [9774] = 21,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(258), 1,
+      sym_identifier,
+    ACTIONS(262), 1,
+      anon_sym_LPAREN,
+    ACTIONS(277), 1,
+      anon_sym_LBRACK,
+    ACTIONS(279), 1,
+      anon_sym_LBRACE,
+    ACTIONS(283), 1,
+      anon_sym_not,
+    ACTIONS(289), 1,
+      anon_sym_lambda,
+    ACTIONS(297), 1,
+      anon_sym_await,
+    ACTIONS(299), 1,
+      sym__string_start,
+    ACTIONS(706), 1,
+      anon_sym_STAR,
+    ACTIONS(828), 1,
+      anon_sym_COLON,
+    STATE(586), 1,
+      sym_string,
+    STATE(616), 1,
+      sym_primary_expression,
+    STATE(1023), 1,
+      sym_expression,
+    ACTIONS(293), 2,
+      sym_ellipsis,
+      sym_float,
+    STATE(1254), 2,
+      sym_list_splat,
+      sym_slice,
+    ACTIONS(285), 3,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_TILDE,
+    ACTIONS(295), 4,
+      sym_integer,
+      sym_true,
+      sym_false,
+      sym_none,
+    ACTIONS(269), 5,
+      anon_sym_print,
+      anon_sym_async,
+      anon_sym_match,
+      anon_sym_exec,
+      anon_sym_type,
+    STATE(883), 6,
+      sym_named_expression,
+      sym_not_operator,
+      sym_boolean_operator,
+      sym_comparison_operator,
+      sym_lambda,
+      sym_conditional_expression,
+    STATE(605), 16,
+      sym_binary_operator,
+      sym_unary_operator,
+      sym_attribute,
+      sym_subscript,
+      sym_call,
+      sym_list,
+      sym_set,
+      sym_tuple,
+      sym_dictionary,
+      sym_list_comprehension,
+      sym_dictionary_comprehension,
+      sym_set_comprehension,
+      sym_generator_expression,
+      sym_parenthesized_expression,
+      sym_concatenated_string,
+      sym_await,
+  [9869] = 10,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(264), 1,
+      anon_sym_COMMA,
+    ACTIONS(271), 1,
+      anon_sym_COLON_EQ,
+    ACTIONS(866), 1,
+      anon_sym_for,
+    ACTIONS(868), 1,
+      anon_sym_with,
+    ACTIONS(870), 1,
+      anon_sym_def,
+    ACTIONS(273), 2,
+      anon_sym_COLON,
+      anon_sym_EQ,
+    ACTIONS(291), 13,
+      anon_sym_PLUS_EQ,
+      anon_sym_DASH_EQ,
+      anon_sym_STAR_EQ,
+      anon_sym_SLASH_EQ,
+      anon_sym_AT_EQ,
+      anon_sym_SLASH_SLASH_EQ,
+      anon_sym_PERCENT_EQ,
+      anon_sym_STAR_STAR_EQ,
+      anon_sym_GT_GT_EQ,
+      anon_sym_LT_LT_EQ,
+      anon_sym_AMP_EQ,
+      anon_sym_CARET_EQ,
+      anon_sym_PIPE_EQ,
+    ACTIONS(260), 15,
       anon_sym_STAR,
       anon_sym_GT_GT,
       anon_sym_PIPE,
@@ -33310,7 +30543,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_LT_LT,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(303), 16,
+    ACTIONS(287), 16,
       sym__newline,
       anon_sym_DOT,
       anon_sym_LPAREN,
@@ -33327,65 +30560,360 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_LT_GT,
       anon_sym_is,
       sym__semicolon,
-  [9062] = 21,
+  [9942] = 21,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(51), 1,
+      anon_sym_LBRACE,
+    ACTIONS(69), 1,
+      anon_sym_not,
+    ACTIONS(71), 1,
+      anon_sym_lambda,
+    ACTIONS(81), 1,
+      sym__string_start,
+    ACTIONS(327), 1,
+      sym_identifier,
+    ACTIONS(333), 1,
+      anon_sym_await,
+    ACTIONS(568), 1,
+      anon_sym_LPAREN,
+    ACTIONS(574), 1,
+      anon_sym_LBRACK,
+    ACTIONS(736), 1,
+      anon_sym_STAR,
+    ACTIONS(738), 1,
+      anon_sym_STAR_STAR,
+    STATE(707), 1,
+      sym_primary_expression,
+    STATE(709), 1,
+      sym_string,
+    STATE(1026), 1,
+      sym_expression,
+    ACTIONS(75), 2,
+      sym_ellipsis,
+      sym_float,
+    STATE(1150), 2,
+      sym_list_splat,
+      sym_dictionary_splat,
+    ACTIONS(47), 3,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_TILDE,
+    ACTIONS(77), 4,
+      sym_integer,
+      sym_true,
+      sym_false,
+      sym_none,
+    ACTIONS(329), 5,
+      anon_sym_print,
+      anon_sym_async,
+      anon_sym_match,
+      anon_sym_exec,
+      anon_sym_type,
+    STATE(985), 6,
+      sym_named_expression,
+      sym_not_operator,
+      sym_boolean_operator,
+      sym_comparison_operator,
+      sym_lambda,
+      sym_conditional_expression,
+    STATE(759), 16,
+      sym_binary_operator,
+      sym_unary_operator,
+      sym_attribute,
+      sym_subscript,
+      sym_call,
+      sym_list,
+      sym_set,
+      sym_tuple,
+      sym_dictionary,
+      sym_list_comprehension,
+      sym_dictionary_comprehension,
+      sym_set_comprehension,
+      sym_generator_expression,
+      sym_parenthesized_expression,
+      sym_concatenated_string,
+      sym_await,
+  [10037] = 21,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(53), 1,
       anon_sym_STAR_STAR,
-    ACTIONS(274), 1,
+    ACTIONS(258), 1,
       sym_identifier,
-    ACTIONS(278), 1,
+    ACTIONS(262), 1,
       anon_sym_LPAREN,
-    ACTIONS(293), 1,
+    ACTIONS(277), 1,
       anon_sym_LBRACK,
-    ACTIONS(295), 1,
+    ACTIONS(279), 1,
       anon_sym_LBRACE,
-    ACTIONS(299), 1,
+    ACTIONS(283), 1,
       anon_sym_not,
-    ACTIONS(305), 1,
+    ACTIONS(289), 1,
       anon_sym_lambda,
-    ACTIONS(313), 1,
+    ACTIONS(297), 1,
       anon_sym_await,
-    ACTIONS(315), 1,
+    ACTIONS(299), 1,
+      sym__string_start,
+    ACTIONS(872), 1,
+      anon_sym_RBRACE,
+    STATE(586), 1,
+      sym_string,
+    STATE(616), 1,
+      sym_primary_expression,
+    STATE(1142), 1,
+      sym_expression,
+    ACTIONS(293), 2,
+      sym_ellipsis,
+      sym_float,
+    STATE(1334), 2,
+      sym_dictionary_splat,
+      sym_pair,
+    ACTIONS(285), 3,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_TILDE,
+    ACTIONS(295), 4,
+      sym_integer,
+      sym_true,
+      sym_false,
+      sym_none,
+    ACTIONS(269), 5,
+      anon_sym_print,
+      anon_sym_async,
+      anon_sym_match,
+      anon_sym_exec,
+      anon_sym_type,
+    STATE(883), 6,
+      sym_named_expression,
+      sym_not_operator,
+      sym_boolean_operator,
+      sym_comparison_operator,
+      sym_lambda,
+      sym_conditional_expression,
+    STATE(605), 16,
+      sym_binary_operator,
+      sym_unary_operator,
+      sym_attribute,
+      sym_subscript,
+      sym_call,
+      sym_list,
+      sym_set,
+      sym_tuple,
+      sym_dictionary,
+      sym_list_comprehension,
+      sym_dictionary_comprehension,
+      sym_set_comprehension,
+      sym_generator_expression,
+      sym_parenthesized_expression,
+      sym_concatenated_string,
+      sym_await,
+  [10132] = 21,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(53), 1,
+      anon_sym_STAR_STAR,
+    ACTIONS(258), 1,
+      sym_identifier,
+    ACTIONS(262), 1,
+      anon_sym_LPAREN,
+    ACTIONS(277), 1,
+      anon_sym_LBRACK,
+    ACTIONS(279), 1,
+      anon_sym_LBRACE,
+    ACTIONS(283), 1,
+      anon_sym_not,
+    ACTIONS(289), 1,
+      anon_sym_lambda,
+    ACTIONS(297), 1,
+      anon_sym_await,
+    ACTIONS(299), 1,
+      sym__string_start,
+    ACTIONS(874), 1,
+      anon_sym_RBRACE,
+    STATE(586), 1,
+      sym_string,
+    STATE(616), 1,
+      sym_primary_expression,
+    STATE(1142), 1,
+      sym_expression,
+    ACTIONS(293), 2,
+      sym_ellipsis,
+      sym_float,
+    STATE(1334), 2,
+      sym_dictionary_splat,
+      sym_pair,
+    ACTIONS(285), 3,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_TILDE,
+    ACTIONS(295), 4,
+      sym_integer,
+      sym_true,
+      sym_false,
+      sym_none,
+    ACTIONS(269), 5,
+      anon_sym_print,
+      anon_sym_async,
+      anon_sym_match,
+      anon_sym_exec,
+      anon_sym_type,
+    STATE(883), 6,
+      sym_named_expression,
+      sym_not_operator,
+      sym_boolean_operator,
+      sym_comparison_operator,
+      sym_lambda,
+      sym_conditional_expression,
+    STATE(605), 16,
+      sym_binary_operator,
+      sym_unary_operator,
+      sym_attribute,
+      sym_subscript,
+      sym_call,
+      sym_list,
+      sym_set,
+      sym_tuple,
+      sym_dictionary,
+      sym_list_comprehension,
+      sym_dictionary_comprehension,
+      sym_set_comprehension,
+      sym_generator_expression,
+      sym_parenthesized_expression,
+      sym_concatenated_string,
+      sym_await,
+  [10227] = 21,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(53), 1,
+      anon_sym_STAR_STAR,
+    ACTIONS(258), 1,
+      sym_identifier,
+    ACTIONS(262), 1,
+      anon_sym_LPAREN,
+    ACTIONS(277), 1,
+      anon_sym_LBRACK,
+    ACTIONS(279), 1,
+      anon_sym_LBRACE,
+    ACTIONS(283), 1,
+      anon_sym_not,
+    ACTIONS(289), 1,
+      anon_sym_lambda,
+    ACTIONS(297), 1,
+      anon_sym_await,
+    ACTIONS(299), 1,
+      sym__string_start,
+    ACTIONS(876), 1,
+      anon_sym_RBRACE,
+    STATE(586), 1,
+      sym_string,
+    STATE(616), 1,
+      sym_primary_expression,
+    STATE(1142), 1,
+      sym_expression,
+    ACTIONS(293), 2,
+      sym_ellipsis,
+      sym_float,
+    STATE(1334), 2,
+      sym_dictionary_splat,
+      sym_pair,
+    ACTIONS(285), 3,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_TILDE,
+    ACTIONS(295), 4,
+      sym_integer,
+      sym_true,
+      sym_false,
+      sym_none,
+    ACTIONS(269), 5,
+      anon_sym_print,
+      anon_sym_async,
+      anon_sym_match,
+      anon_sym_exec,
+      anon_sym_type,
+    STATE(883), 6,
+      sym_named_expression,
+      sym_not_operator,
+      sym_boolean_operator,
+      sym_comparison_operator,
+      sym_lambda,
+      sym_conditional_expression,
+    STATE(605), 16,
+      sym_binary_operator,
+      sym_unary_operator,
+      sym_attribute,
+      sym_subscript,
+      sym_call,
+      sym_list,
+      sym_set,
+      sym_tuple,
+      sym_dictionary,
+      sym_list_comprehension,
+      sym_dictionary_comprehension,
+      sym_set_comprehension,
+      sym_generator_expression,
+      sym_parenthesized_expression,
+      sym_concatenated_string,
+      sym_await,
+  [10322] = 21,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(53), 1,
+      anon_sym_STAR_STAR,
+    ACTIONS(258), 1,
+      sym_identifier,
+    ACTIONS(262), 1,
+      anon_sym_LPAREN,
+    ACTIONS(277), 1,
+      anon_sym_LBRACK,
+    ACTIONS(279), 1,
+      anon_sym_LBRACE,
+    ACTIONS(283), 1,
+      anon_sym_not,
+    ACTIONS(289), 1,
+      anon_sym_lambda,
+    ACTIONS(297), 1,
+      anon_sym_await,
+    ACTIONS(299), 1,
       sym__string_start,
     ACTIONS(878), 1,
       anon_sym_RBRACE,
-    STATE(600), 1,
+    STATE(586), 1,
       sym_string,
-    STATE(630), 1,
+    STATE(616), 1,
       sym_primary_expression,
-    STATE(1145), 1,
+    STATE(1142), 1,
       sym_expression,
-    ACTIONS(309), 2,
+    ACTIONS(293), 2,
       sym_ellipsis,
       sym_float,
-    STATE(1384), 2,
+    STATE(1334), 2,
       sym_dictionary_splat,
       sym_pair,
-    ACTIONS(301), 3,
+    ACTIONS(285), 3,
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
-    ACTIONS(311), 4,
+    ACTIONS(295), 4,
       sym_integer,
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(285), 5,
+    ACTIONS(269), 5,
       anon_sym_print,
       anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(900), 7,
+    STATE(883), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-      sym_await,
-    STATE(642), 15,
+    STATE(605), 16,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -33401,287 +30929,128 @@ static const uint16_t ts_small_parse_table[] = {
       sym_generator_expression,
       sym_parenthesized_expression,
       sym_concatenated_string,
-  [9157] = 21,
+      sym_await,
+  [10417] = 10,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(53), 1,
-      anon_sym_STAR_STAR,
-    ACTIONS(274), 1,
-      sym_identifier,
-    ACTIONS(278), 1,
-      anon_sym_LPAREN,
-    ACTIONS(293), 1,
-      anon_sym_LBRACK,
-    ACTIONS(295), 1,
-      anon_sym_LBRACE,
-    ACTIONS(299), 1,
-      anon_sym_not,
-    ACTIONS(305), 1,
-      anon_sym_lambda,
-    ACTIONS(313), 1,
-      anon_sym_await,
-    ACTIONS(315), 1,
-      sym__string_start,
+    ACTIONS(264), 1,
+      anon_sym_COMMA,
+    ACTIONS(271), 1,
+      anon_sym_COLON_EQ,
     ACTIONS(880), 1,
-      anon_sym_RBRACE,
-    STATE(600), 1,
-      sym_string,
-    STATE(630), 1,
-      sym_primary_expression,
-    STATE(1145), 1,
-      sym_expression,
-    ACTIONS(309), 2,
-      sym_ellipsis,
-      sym_float,
-    STATE(1384), 2,
-      sym_dictionary_splat,
-      sym_pair,
-    ACTIONS(301), 3,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_TILDE,
-    ACTIONS(311), 4,
-      sym_integer,
-      sym_true,
-      sym_false,
-      sym_none,
-    ACTIONS(285), 5,
-      anon_sym_print,
-      anon_sym_async,
-      anon_sym_match,
-      anon_sym_exec,
-      anon_sym_type,
-    STATE(900), 7,
-      sym_named_expression,
-      sym_not_operator,
-      sym_boolean_operator,
-      sym_comparison_operator,
-      sym_lambda,
-      sym_conditional_expression,
-      sym_await,
-    STATE(642), 15,
-      sym_binary_operator,
-      sym_unary_operator,
-      sym_attribute,
-      sym_subscript,
-      sym_call,
-      sym_list,
-      sym_set,
-      sym_tuple,
-      sym_dictionary,
-      sym_list_comprehension,
-      sym_dictionary_comprehension,
-      sym_set_comprehension,
-      sym_generator_expression,
-      sym_parenthesized_expression,
-      sym_concatenated_string,
-  [9252] = 21,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(53), 1,
-      anon_sym_STAR_STAR,
-    ACTIONS(274), 1,
-      sym_identifier,
-    ACTIONS(278), 1,
-      anon_sym_LPAREN,
-    ACTIONS(293), 1,
-      anon_sym_LBRACK,
-    ACTIONS(295), 1,
-      anon_sym_LBRACE,
-    ACTIONS(299), 1,
-      anon_sym_not,
-    ACTIONS(305), 1,
-      anon_sym_lambda,
-    ACTIONS(313), 1,
-      anon_sym_await,
-    ACTIONS(315), 1,
-      sym__string_start,
+      anon_sym_for,
     ACTIONS(882), 1,
-      anon_sym_RBRACE,
-    STATE(600), 1,
-      sym_string,
-    STATE(630), 1,
-      sym_primary_expression,
-    STATE(1145), 1,
-      sym_expression,
-    ACTIONS(309), 2,
-      sym_ellipsis,
-      sym_float,
-    STATE(1384), 2,
-      sym_dictionary_splat,
-      sym_pair,
-    ACTIONS(301), 3,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_TILDE,
-    ACTIONS(311), 4,
-      sym_integer,
-      sym_true,
-      sym_false,
-      sym_none,
-    ACTIONS(285), 5,
-      anon_sym_print,
-      anon_sym_async,
-      anon_sym_match,
-      anon_sym_exec,
-      anon_sym_type,
-    STATE(900), 7,
-      sym_named_expression,
-      sym_not_operator,
-      sym_boolean_operator,
-      sym_comparison_operator,
-      sym_lambda,
-      sym_conditional_expression,
-      sym_await,
-    STATE(642), 15,
-      sym_binary_operator,
-      sym_unary_operator,
-      sym_attribute,
-      sym_subscript,
-      sym_call,
-      sym_list,
-      sym_set,
-      sym_tuple,
-      sym_dictionary,
-      sym_list_comprehension,
-      sym_dictionary_comprehension,
-      sym_set_comprehension,
-      sym_generator_expression,
-      sym_parenthesized_expression,
-      sym_concatenated_string,
-  [9347] = 21,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(53), 1,
-      anon_sym_STAR_STAR,
-    ACTIONS(274), 1,
-      sym_identifier,
-    ACTIONS(278), 1,
-      anon_sym_LPAREN,
-    ACTIONS(293), 1,
-      anon_sym_LBRACK,
-    ACTIONS(295), 1,
-      anon_sym_LBRACE,
-    ACTIONS(299), 1,
-      anon_sym_not,
-    ACTIONS(305), 1,
-      anon_sym_lambda,
-    ACTIONS(313), 1,
-      anon_sym_await,
-    ACTIONS(315), 1,
-      sym__string_start,
+      anon_sym_with,
     ACTIONS(884), 1,
-      anon_sym_RBRACE,
-    STATE(600), 1,
-      sym_string,
-    STATE(630), 1,
-      sym_primary_expression,
-    STATE(1145), 1,
-      sym_expression,
-    ACTIONS(309), 2,
-      sym_ellipsis,
-      sym_float,
-    STATE(1384), 2,
-      sym_dictionary_splat,
-      sym_pair,
-    ACTIONS(301), 3,
+      anon_sym_def,
+    ACTIONS(273), 2,
+      anon_sym_COLON,
+      anon_sym_EQ,
+    ACTIONS(291), 13,
+      anon_sym_PLUS_EQ,
+      anon_sym_DASH_EQ,
+      anon_sym_STAR_EQ,
+      anon_sym_SLASH_EQ,
+      anon_sym_AT_EQ,
+      anon_sym_SLASH_SLASH_EQ,
+      anon_sym_PERCENT_EQ,
+      anon_sym_STAR_STAR_EQ,
+      anon_sym_GT_GT_EQ,
+      anon_sym_LT_LT_EQ,
+      anon_sym_AMP_EQ,
+      anon_sym_CARET_EQ,
+      anon_sym_PIPE_EQ,
+    ACTIONS(260), 15,
+      anon_sym_STAR,
+      anon_sym_GT_GT,
+      anon_sym_PIPE,
       anon_sym_DASH,
       anon_sym_PLUS,
-      anon_sym_TILDE,
-    ACTIONS(311), 4,
-      sym_integer,
-      sym_true,
-      sym_false,
-      sym_none,
-    ACTIONS(285), 5,
-      anon_sym_print,
-      anon_sym_async,
-      anon_sym_match,
-      anon_sym_exec,
-      anon_sym_type,
-    STATE(900), 7,
-      sym_named_expression,
-      sym_not_operator,
-      sym_boolean_operator,
-      sym_comparison_operator,
-      sym_lambda,
-      sym_conditional_expression,
-      sym_await,
-    STATE(642), 15,
-      sym_binary_operator,
-      sym_unary_operator,
-      sym_attribute,
-      sym_subscript,
-      sym_call,
-      sym_list,
-      sym_set,
-      sym_tuple,
-      sym_dictionary,
-      sym_list_comprehension,
-      sym_dictionary_comprehension,
-      sym_set_comprehension,
-      sym_generator_expression,
-      sym_parenthesized_expression,
-      sym_concatenated_string,
-  [9442] = 21,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_SLASH,
+      anon_sym_PERCENT,
+      anon_sym_SLASH_SLASH,
+      anon_sym_AMP,
+      anon_sym_CARET,
+      anon_sym_LT_LT,
+      anon_sym_LT,
+      anon_sym_GT,
+    ACTIONS(287), 16,
+      sym__newline,
+      anon_sym_DOT,
+      anon_sym_LPAREN,
+      anon_sym_if,
+      anon_sym_in,
+      anon_sym_LBRACK,
+      anon_sym_not,
+      anon_sym_and,
+      anon_sym_or,
+      anon_sym_LT_EQ,
+      anon_sym_EQ_EQ,
+      anon_sym_BANG_EQ,
+      anon_sym_GT_EQ,
+      anon_sym_LT_GT,
+      anon_sym_is,
+      sym__semicolon,
+  [10490] = 21,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(53), 1,
       anon_sym_STAR_STAR,
-    ACTIONS(274), 1,
+    ACTIONS(258), 1,
       sym_identifier,
-    ACTIONS(278), 1,
+    ACTIONS(262), 1,
       anon_sym_LPAREN,
-    ACTIONS(293), 1,
+    ACTIONS(277), 1,
       anon_sym_LBRACK,
-    ACTIONS(295), 1,
+    ACTIONS(279), 1,
       anon_sym_LBRACE,
-    ACTIONS(299), 1,
+    ACTIONS(283), 1,
       anon_sym_not,
-    ACTIONS(305), 1,
+    ACTIONS(289), 1,
       anon_sym_lambda,
-    ACTIONS(313), 1,
+    ACTIONS(297), 1,
       anon_sym_await,
-    ACTIONS(315), 1,
+    ACTIONS(299), 1,
       sym__string_start,
     ACTIONS(886), 1,
       anon_sym_RBRACE,
-    STATE(600), 1,
+    STATE(586), 1,
       sym_string,
-    STATE(630), 1,
+    STATE(616), 1,
       sym_primary_expression,
-    STATE(1145), 1,
+    STATE(1142), 1,
       sym_expression,
-    ACTIONS(309), 2,
+    ACTIONS(293), 2,
       sym_ellipsis,
       sym_float,
-    STATE(1384), 2,
+    STATE(1334), 2,
       sym_dictionary_splat,
       sym_pair,
-    ACTIONS(301), 3,
+    ACTIONS(285), 3,
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
-    ACTIONS(311), 4,
+    ACTIONS(295), 4,
       sym_integer,
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(285), 5,
+    ACTIONS(269), 5,
       anon_sym_print,
       anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(900), 7,
+    STATE(883), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-      sym_await,
-    STATE(642), 15,
+    STATE(605), 16,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -33697,65 +31066,65 @@ static const uint16_t ts_small_parse_table[] = {
       sym_generator_expression,
       sym_parenthesized_expression,
       sym_concatenated_string,
-  [9537] = 21,
+      sym_await,
+  [10585] = 21,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(53), 1,
       anon_sym_STAR_STAR,
-    ACTIONS(274), 1,
+    ACTIONS(258), 1,
       sym_identifier,
-    ACTIONS(278), 1,
+    ACTIONS(262), 1,
       anon_sym_LPAREN,
-    ACTIONS(293), 1,
+    ACTIONS(277), 1,
       anon_sym_LBRACK,
-    ACTIONS(295), 1,
+    ACTIONS(279), 1,
       anon_sym_LBRACE,
-    ACTIONS(299), 1,
+    ACTIONS(283), 1,
       anon_sym_not,
-    ACTIONS(305), 1,
+    ACTIONS(289), 1,
       anon_sym_lambda,
-    ACTIONS(313), 1,
+    ACTIONS(297), 1,
       anon_sym_await,
-    ACTIONS(315), 1,
+    ACTIONS(299), 1,
       sym__string_start,
     ACTIONS(888), 1,
       anon_sym_RBRACE,
-    STATE(600), 1,
+    STATE(586), 1,
       sym_string,
-    STATE(630), 1,
+    STATE(616), 1,
       sym_primary_expression,
-    STATE(1145), 1,
+    STATE(1142), 1,
       sym_expression,
-    ACTIONS(309), 2,
+    ACTIONS(293), 2,
       sym_ellipsis,
       sym_float,
-    STATE(1384), 2,
+    STATE(1334), 2,
       sym_dictionary_splat,
       sym_pair,
-    ACTIONS(301), 3,
+    ACTIONS(285), 3,
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
-    ACTIONS(311), 4,
+    ACTIONS(295), 4,
       sym_integer,
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(285), 5,
+    ACTIONS(269), 5,
       anon_sym_print,
       anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(900), 7,
+    STATE(883), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-      sym_await,
-    STATE(642), 15,
+    STATE(605), 16,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -33771,127 +31140,65 @@ static const uint16_t ts_small_parse_table[] = {
       sym_generator_expression,
       sym_parenthesized_expression,
       sym_concatenated_string,
-  [9632] = 10,
+      sym_await,
+  [10680] = 21,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(280), 1,
-      anon_sym_COMMA,
-    ACTIONS(287), 1,
-      anon_sym_COLON_EQ,
-    ACTIONS(890), 1,
-      anon_sym_for,
-    ACTIONS(892), 1,
-      anon_sym_with,
-    ACTIONS(894), 1,
-      anon_sym_def,
-    ACTIONS(289), 2,
-      anon_sym_COLON,
-      anon_sym_EQ,
-    ACTIONS(307), 13,
-      anon_sym_PLUS_EQ,
-      anon_sym_DASH_EQ,
-      anon_sym_STAR_EQ,
-      anon_sym_SLASH_EQ,
-      anon_sym_AT_EQ,
-      anon_sym_SLASH_SLASH_EQ,
-      anon_sym_PERCENT_EQ,
-      anon_sym_STAR_STAR_EQ,
-      anon_sym_GT_GT_EQ,
-      anon_sym_LT_LT_EQ,
-      anon_sym_AMP_EQ,
-      anon_sym_CARET_EQ,
-      anon_sym_PIPE_EQ,
-    ACTIONS(276), 15,
-      anon_sym_STAR,
-      anon_sym_GT_GT,
-      anon_sym_PIPE,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_SLASH,
-      anon_sym_PERCENT,
-      anon_sym_SLASH_SLASH,
-      anon_sym_AMP,
-      anon_sym_CARET,
-      anon_sym_LT_LT,
-      anon_sym_LT,
-      anon_sym_GT,
-    ACTIONS(303), 16,
-      sym__newline,
-      anon_sym_DOT,
-      anon_sym_LPAREN,
-      anon_sym_if,
-      anon_sym_in,
-      anon_sym_LBRACK,
-      anon_sym_not,
-      anon_sym_and,
-      anon_sym_or,
-      anon_sym_LT_EQ,
-      anon_sym_EQ_EQ,
-      anon_sym_BANG_EQ,
-      anon_sym_GT_EQ,
-      anon_sym_LT_GT,
-      anon_sym_is,
-      sym__semicolon,
-  [9705] = 21,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(274), 1,
+    ACTIONS(258), 1,
       sym_identifier,
-    ACTIONS(278), 1,
+    ACTIONS(262), 1,
       anon_sym_LPAREN,
-    ACTIONS(293), 1,
+    ACTIONS(277), 1,
       anon_sym_LBRACK,
-    ACTIONS(295), 1,
+    ACTIONS(279), 1,
       anon_sym_LBRACE,
-    ACTIONS(299), 1,
+    ACTIONS(283), 1,
       anon_sym_not,
-    ACTIONS(305), 1,
+    ACTIONS(289), 1,
       anon_sym_lambda,
-    ACTIONS(313), 1,
+    ACTIONS(297), 1,
       anon_sym_await,
-    ACTIONS(315), 1,
+    ACTIONS(299), 1,
       sym__string_start,
-    ACTIONS(896), 1,
+    ACTIONS(706), 1,
+      anon_sym_STAR,
+    ACTIONS(828), 1,
       anon_sym_COLON,
-    ACTIONS(898), 1,
-      anon_sym_RBRACK,
-    STATE(600), 1,
+    STATE(586), 1,
       sym_string,
-    STATE(630), 1,
+    STATE(616), 1,
       sym_primary_expression,
-    STATE(1086), 1,
+    STATE(1018), 1,
       sym_expression,
-    STATE(1398), 1,
+    ACTIONS(293), 2,
+      sym_ellipsis,
+      sym_float,
+    STATE(1209), 2,
+      sym_list_splat,
       sym_slice,
-    ACTIONS(309), 2,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(301), 3,
+    ACTIONS(285), 3,
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
-    ACTIONS(311), 4,
+    ACTIONS(295), 4,
       sym_integer,
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(285), 5,
+    ACTIONS(269), 5,
       anon_sym_print,
       anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(900), 7,
+    STATE(883), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-      sym_await,
-    STATE(642), 15,
+    STATE(605), 16,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -33907,1319 +31214,65 @@ static const uint16_t ts_small_parse_table[] = {
       sym_generator_expression,
       sym_parenthesized_expression,
       sym_concatenated_string,
-  [9799] = 21,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(274), 1,
-      sym_identifier,
-    ACTIONS(278), 1,
-      anon_sym_LPAREN,
-    ACTIONS(293), 1,
-      anon_sym_LBRACK,
-    ACTIONS(295), 1,
-      anon_sym_LBRACE,
-    ACTIONS(299), 1,
-      anon_sym_not,
-    ACTIONS(305), 1,
-      anon_sym_lambda,
-    ACTIONS(313), 1,
-      anon_sym_await,
-    ACTIONS(315), 1,
-      sym__string_start,
-    ACTIONS(896), 1,
-      anon_sym_COLON,
-    ACTIONS(900), 1,
-      anon_sym_RBRACK,
-    STATE(600), 1,
-      sym_string,
-    STATE(630), 1,
-      sym_primary_expression,
-    STATE(1086), 1,
-      sym_expression,
-    STATE(1398), 1,
-      sym_slice,
-    ACTIONS(309), 2,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(301), 3,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_TILDE,
-    ACTIONS(311), 4,
-      sym_integer,
-      sym_true,
-      sym_false,
-      sym_none,
-    ACTIONS(285), 5,
-      anon_sym_print,
-      anon_sym_async,
-      anon_sym_match,
-      anon_sym_exec,
-      anon_sym_type,
-    STATE(900), 7,
-      sym_named_expression,
-      sym_not_operator,
-      sym_boolean_operator,
-      sym_comparison_operator,
-      sym_lambda,
-      sym_conditional_expression,
       sym_await,
-    STATE(642), 15,
-      sym_binary_operator,
-      sym_unary_operator,
-      sym_attribute,
-      sym_subscript,
-      sym_call,
-      sym_list,
-      sym_set,
-      sym_tuple,
-      sym_dictionary,
-      sym_list_comprehension,
-      sym_dictionary_comprehension,
-      sym_set_comprehension,
-      sym_generator_expression,
-      sym_parenthesized_expression,
-      sym_concatenated_string,
-  [9893] = 21,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(274), 1,
-      sym_identifier,
-    ACTIONS(278), 1,
-      anon_sym_LPAREN,
-    ACTIONS(293), 1,
-      anon_sym_LBRACK,
-    ACTIONS(295), 1,
-      anon_sym_LBRACE,
-    ACTIONS(299), 1,
-      anon_sym_not,
-    ACTIONS(305), 1,
-      anon_sym_lambda,
-    ACTIONS(313), 1,
-      anon_sym_await,
-    ACTIONS(315), 1,
-      sym__string_start,
-    ACTIONS(896), 1,
-      anon_sym_COLON,
-    ACTIONS(902), 1,
-      anon_sym_RBRACK,
-    STATE(600), 1,
-      sym_string,
-    STATE(630), 1,
-      sym_primary_expression,
-    STATE(1086), 1,
-      sym_expression,
-    STATE(1398), 1,
-      sym_slice,
-    ACTIONS(309), 2,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(301), 3,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_TILDE,
-    ACTIONS(311), 4,
-      sym_integer,
-      sym_true,
-      sym_false,
-      sym_none,
-    ACTIONS(285), 5,
-      anon_sym_print,
-      anon_sym_async,
-      anon_sym_match,
-      anon_sym_exec,
-      anon_sym_type,
-    STATE(900), 7,
-      sym_named_expression,
-      sym_not_operator,
-      sym_boolean_operator,
-      sym_comparison_operator,
-      sym_lambda,
-      sym_conditional_expression,
-      sym_await,
-    STATE(642), 15,
-      sym_binary_operator,
-      sym_unary_operator,
-      sym_attribute,
-      sym_subscript,
-      sym_call,
-      sym_list,
-      sym_set,
-      sym_tuple,
-      sym_dictionary,
-      sym_list_comprehension,
-      sym_dictionary_comprehension,
-      sym_set_comprehension,
-      sym_generator_expression,
-      sym_parenthesized_expression,
-      sym_concatenated_string,
-  [9987] = 8,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(852), 1,
-      anon_sym_else,
-    ACTIONS(908), 1,
-      anon_sym_elif,
-    STATE(307), 1,
-      aux_sym_if_statement_repeat1,
-    STATE(420), 1,
-      sym_elif_clause,
-    STATE(577), 1,
-      sym_else_clause,
-    ACTIONS(906), 12,
-      sym__dedent,
-      sym__string_start,
-      anon_sym_LPAREN,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_LBRACE,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_TILDE,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(904), 33,
-      anon_sym_import,
-      anon_sym_from,
-      anon_sym_STAR,
-      anon_sym_print,
-      anon_sym_assert,
-      anon_sym_return,
-      anon_sym_del,
-      anon_sym_raise,
-      anon_sym_pass,
-      anon_sym_break,
-      anon_sym_continue,
-      anon_sym_if,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_while,
-      anon_sym_try,
-      anon_sym_with,
-      anon_sym_match,
-      anon_sym_def,
-      anon_sym_global,
-      anon_sym_nonlocal,
-      anon_sym_exec,
-      anon_sym_type,
-      anon_sym_class,
-      anon_sym_not,
-      anon_sym_lambda,
-      anon_sym_yield,
-      sym_integer,
-      sym_identifier,
-      anon_sym_await,
-      sym_true,
-      sym_false,
-      sym_none,
-  [10055] = 20,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(274), 1,
-      sym_identifier,
-    ACTIONS(278), 1,
-      anon_sym_LPAREN,
-    ACTIONS(293), 1,
-      anon_sym_LBRACK,
-    ACTIONS(295), 1,
-      anon_sym_LBRACE,
-    ACTIONS(299), 1,
-      anon_sym_not,
-    ACTIONS(305), 1,
-      anon_sym_lambda,
-    ACTIONS(313), 1,
-      anon_sym_await,
-    ACTIONS(315), 1,
-      sym__string_start,
-    ACTIONS(912), 1,
-      anon_sym_COLON,
-    STATE(600), 1,
-      sym_string,
-    STATE(630), 1,
-      sym_primary_expression,
-    STATE(1064), 1,
-      sym_expression,
-    ACTIONS(309), 2,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(910), 2,
-      anon_sym_COMMA,
-      anon_sym_RBRACK,
-    ACTIONS(301), 3,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_TILDE,
-    ACTIONS(311), 4,
-      sym_integer,
-      sym_true,
-      sym_false,
-      sym_none,
-    ACTIONS(285), 5,
-      anon_sym_print,
-      anon_sym_async,
-      anon_sym_match,
-      anon_sym_exec,
-      anon_sym_type,
-    STATE(900), 7,
-      sym_named_expression,
-      sym_not_operator,
-      sym_boolean_operator,
-      sym_comparison_operator,
-      sym_lambda,
-      sym_conditional_expression,
-      sym_await,
-    STATE(642), 15,
-      sym_binary_operator,
-      sym_unary_operator,
-      sym_attribute,
-      sym_subscript,
-      sym_call,
-      sym_list,
-      sym_set,
-      sym_tuple,
-      sym_dictionary,
-      sym_list_comprehension,
-      sym_dictionary_comprehension,
-      sym_set_comprehension,
-      sym_generator_expression,
-      sym_parenthesized_expression,
-      sym_concatenated_string,
-  [10147] = 21,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(274), 1,
-      sym_identifier,
-    ACTIONS(278), 1,
-      anon_sym_LPAREN,
-    ACTIONS(293), 1,
-      anon_sym_LBRACK,
-    ACTIONS(295), 1,
-      anon_sym_LBRACE,
-    ACTIONS(299), 1,
-      anon_sym_not,
-    ACTIONS(305), 1,
-      anon_sym_lambda,
-    ACTIONS(313), 1,
-      anon_sym_await,
-    ACTIONS(315), 1,
-      sym__string_start,
-    ACTIONS(896), 1,
-      anon_sym_COLON,
-    ACTIONS(914), 1,
-      anon_sym_RBRACK,
-    STATE(600), 1,
-      sym_string,
-    STATE(630), 1,
-      sym_primary_expression,
-    STATE(1086), 1,
-      sym_expression,
-    STATE(1398), 1,
-      sym_slice,
-    ACTIONS(309), 2,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(301), 3,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_TILDE,
-    ACTIONS(311), 4,
-      sym_integer,
-      sym_true,
-      sym_false,
-      sym_none,
-    ACTIONS(285), 5,
-      anon_sym_print,
-      anon_sym_async,
-      anon_sym_match,
-      anon_sym_exec,
-      anon_sym_type,
-    STATE(900), 7,
-      sym_named_expression,
-      sym_not_operator,
-      sym_boolean_operator,
-      sym_comparison_operator,
-      sym_lambda,
-      sym_conditional_expression,
-      sym_await,
-    STATE(642), 15,
-      sym_binary_operator,
-      sym_unary_operator,
-      sym_attribute,
-      sym_subscript,
-      sym_call,
-      sym_list,
-      sym_set,
-      sym_tuple,
-      sym_dictionary,
-      sym_list_comprehension,
-      sym_dictionary_comprehension,
-      sym_set_comprehension,
-      sym_generator_expression,
-      sym_parenthesized_expression,
-      sym_concatenated_string,
-  [10241] = 21,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(274), 1,
-      sym_identifier,
-    ACTIONS(278), 1,
-      anon_sym_LPAREN,
-    ACTIONS(293), 1,
-      anon_sym_LBRACK,
-    ACTIONS(295), 1,
-      anon_sym_LBRACE,
-    ACTIONS(299), 1,
-      anon_sym_not,
-    ACTIONS(305), 1,
-      anon_sym_lambda,
-    ACTIONS(313), 1,
-      anon_sym_await,
-    ACTIONS(315), 1,
-      sym__string_start,
-    ACTIONS(896), 1,
-      anon_sym_COLON,
-    ACTIONS(916), 1,
-      anon_sym_RBRACK,
-    STATE(600), 1,
-      sym_string,
-    STATE(630), 1,
-      sym_primary_expression,
-    STATE(1086), 1,
-      sym_expression,
-    STATE(1398), 1,
-      sym_slice,
-    ACTIONS(309), 2,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(301), 3,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_TILDE,
-    ACTIONS(311), 4,
-      sym_integer,
-      sym_true,
-      sym_false,
-      sym_none,
-    ACTIONS(285), 5,
-      anon_sym_print,
-      anon_sym_async,
-      anon_sym_match,
-      anon_sym_exec,
-      anon_sym_type,
-    STATE(900), 7,
-      sym_named_expression,
-      sym_not_operator,
-      sym_boolean_operator,
-      sym_comparison_operator,
-      sym_lambda,
-      sym_conditional_expression,
-      sym_await,
-    STATE(642), 15,
-      sym_binary_operator,
-      sym_unary_operator,
-      sym_attribute,
-      sym_subscript,
-      sym_call,
-      sym_list,
-      sym_set,
-      sym_tuple,
-      sym_dictionary,
-      sym_list_comprehension,
-      sym_dictionary_comprehension,
-      sym_set_comprehension,
-      sym_generator_expression,
-      sym_parenthesized_expression,
-      sym_concatenated_string,
-  [10335] = 21,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(274), 1,
-      sym_identifier,
-    ACTIONS(278), 1,
-      anon_sym_LPAREN,
-    ACTIONS(293), 1,
-      anon_sym_LBRACK,
-    ACTIONS(295), 1,
-      anon_sym_LBRACE,
-    ACTIONS(299), 1,
-      anon_sym_not,
-    ACTIONS(305), 1,
-      anon_sym_lambda,
-    ACTIONS(313), 1,
-      anon_sym_await,
-    ACTIONS(315), 1,
-      sym__string_start,
-    ACTIONS(896), 1,
-      anon_sym_COLON,
-    ACTIONS(918), 1,
-      anon_sym_RBRACK,
-    STATE(600), 1,
-      sym_string,
-    STATE(630), 1,
-      sym_primary_expression,
-    STATE(1086), 1,
-      sym_expression,
-    STATE(1398), 1,
-      sym_slice,
-    ACTIONS(309), 2,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(301), 3,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_TILDE,
-    ACTIONS(311), 4,
-      sym_integer,
-      sym_true,
-      sym_false,
-      sym_none,
-    ACTIONS(285), 5,
-      anon_sym_print,
-      anon_sym_async,
-      anon_sym_match,
-      anon_sym_exec,
-      anon_sym_type,
-    STATE(900), 7,
-      sym_named_expression,
-      sym_not_operator,
-      sym_boolean_operator,
-      sym_comparison_operator,
-      sym_lambda,
-      sym_conditional_expression,
-      sym_await,
-    STATE(642), 15,
-      sym_binary_operator,
-      sym_unary_operator,
-      sym_attribute,
-      sym_subscript,
-      sym_call,
-      sym_list,
-      sym_set,
-      sym_tuple,
-      sym_dictionary,
-      sym_list_comprehension,
-      sym_dictionary_comprehension,
-      sym_set_comprehension,
-      sym_generator_expression,
-      sym_parenthesized_expression,
-      sym_concatenated_string,
-  [10429] = 8,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(852), 1,
-      anon_sym_else,
-    ACTIONS(908), 1,
-      anon_sym_elif,
-    STATE(307), 1,
-      aux_sym_if_statement_repeat1,
-    STATE(420), 1,
-      sym_elif_clause,
-    STATE(570), 1,
-      sym_else_clause,
-    ACTIONS(922), 12,
-      sym__dedent,
-      sym__string_start,
-      anon_sym_LPAREN,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_LBRACE,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_TILDE,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(920), 33,
-      anon_sym_import,
-      anon_sym_from,
-      anon_sym_STAR,
-      anon_sym_print,
-      anon_sym_assert,
-      anon_sym_return,
-      anon_sym_del,
-      anon_sym_raise,
-      anon_sym_pass,
-      anon_sym_break,
-      anon_sym_continue,
-      anon_sym_if,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_while,
-      anon_sym_try,
-      anon_sym_with,
-      anon_sym_match,
-      anon_sym_def,
-      anon_sym_global,
-      anon_sym_nonlocal,
-      anon_sym_exec,
-      anon_sym_type,
-      anon_sym_class,
-      anon_sym_not,
-      anon_sym_lambda,
-      anon_sym_yield,
-      sym_integer,
-      sym_identifier,
-      anon_sym_await,
-      sym_true,
-      sym_false,
-      sym_none,
-  [10497] = 20,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(274), 1,
-      sym_identifier,
-    ACTIONS(278), 1,
-      anon_sym_LPAREN,
-    ACTIONS(293), 1,
-      anon_sym_LBRACK,
-    ACTIONS(295), 1,
-      anon_sym_LBRACE,
-    ACTIONS(299), 1,
-      anon_sym_not,
-    ACTIONS(305), 1,
-      anon_sym_lambda,
-    ACTIONS(313), 1,
-      anon_sym_await,
-    ACTIONS(315), 1,
-      sym__string_start,
-    ACTIONS(926), 1,
-      anon_sym_COLON,
-    STATE(600), 1,
-      sym_string,
-    STATE(630), 1,
-      sym_primary_expression,
-    STATE(1083), 1,
-      sym_expression,
-    ACTIONS(309), 2,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(924), 2,
-      anon_sym_COMMA,
-      anon_sym_RBRACK,
-    ACTIONS(301), 3,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_TILDE,
-    ACTIONS(311), 4,
-      sym_integer,
-      sym_true,
-      sym_false,
-      sym_none,
-    ACTIONS(285), 5,
-      anon_sym_print,
-      anon_sym_async,
-      anon_sym_match,
-      anon_sym_exec,
-      anon_sym_type,
-    STATE(900), 7,
-      sym_named_expression,
-      sym_not_operator,
-      sym_boolean_operator,
-      sym_comparison_operator,
-      sym_lambda,
-      sym_conditional_expression,
-      sym_await,
-    STATE(642), 15,
-      sym_binary_operator,
-      sym_unary_operator,
-      sym_attribute,
-      sym_subscript,
-      sym_call,
-      sym_list,
-      sym_set,
-      sym_tuple,
-      sym_dictionary,
-      sym_list_comprehension,
-      sym_dictionary_comprehension,
-      sym_set_comprehension,
-      sym_generator_expression,
-      sym_parenthesized_expression,
-      sym_concatenated_string,
-  [10589] = 8,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(852), 1,
-      anon_sym_else,
-    ACTIONS(908), 1,
-      anon_sym_elif,
-    STATE(258), 1,
-      aux_sym_if_statement_repeat1,
-    STATE(420), 1,
-      sym_elif_clause,
-    STATE(522), 1,
-      sym_else_clause,
-    ACTIONS(930), 12,
-      sym__dedent,
-      sym__string_start,
-      anon_sym_LPAREN,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_LBRACE,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_TILDE,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(928), 33,
-      anon_sym_import,
-      anon_sym_from,
-      anon_sym_STAR,
-      anon_sym_print,
-      anon_sym_assert,
-      anon_sym_return,
-      anon_sym_del,
-      anon_sym_raise,
-      anon_sym_pass,
-      anon_sym_break,
-      anon_sym_continue,
-      anon_sym_if,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_while,
-      anon_sym_try,
-      anon_sym_with,
-      anon_sym_match,
-      anon_sym_def,
-      anon_sym_global,
-      anon_sym_nonlocal,
-      anon_sym_exec,
-      anon_sym_type,
-      anon_sym_class,
-      anon_sym_not,
-      anon_sym_lambda,
-      anon_sym_yield,
-      sym_integer,
-      sym_identifier,
-      anon_sym_await,
-      sym_true,
-      sym_false,
-      sym_none,
-  [10657] = 5,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(936), 1,
-      anon_sym_except,
-    STATE(266), 2,
-      sym_except_clause,
-      aux_sym_try_statement_repeat1,
-    ACTIONS(934), 12,
-      sym__dedent,
-      sym__string_start,
-      anon_sym_LPAREN,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_LBRACE,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_TILDE,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(932), 35,
-      anon_sym_import,
-      anon_sym_from,
-      anon_sym_STAR,
-      anon_sym_print,
-      anon_sym_assert,
-      anon_sym_return,
-      anon_sym_del,
-      anon_sym_raise,
-      anon_sym_pass,
-      anon_sym_break,
-      anon_sym_continue,
-      anon_sym_if,
-      anon_sym_else,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_while,
-      anon_sym_try,
-      anon_sym_finally,
-      anon_sym_with,
-      anon_sym_match,
-      anon_sym_def,
-      anon_sym_global,
-      anon_sym_nonlocal,
-      anon_sym_exec,
-      anon_sym_type,
-      anon_sym_class,
-      anon_sym_not,
-      anon_sym_lambda,
-      anon_sym_yield,
-      sym_integer,
-      sym_identifier,
-      anon_sym_await,
-      sym_true,
-      sym_false,
-      sym_none,
-  [10719] = 5,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(943), 1,
-      anon_sym_except_STAR,
-    STATE(267), 2,
-      sym_except_group_clause,
-      aux_sym_try_statement_repeat2,
-    ACTIONS(941), 12,
-      sym__dedent,
-      sym__string_start,
-      anon_sym_LPAREN,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_LBRACE,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_TILDE,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(939), 35,
-      anon_sym_import,
-      anon_sym_from,
-      anon_sym_STAR,
-      anon_sym_print,
-      anon_sym_assert,
-      anon_sym_return,
-      anon_sym_del,
-      anon_sym_raise,
-      anon_sym_pass,
-      anon_sym_break,
-      anon_sym_continue,
-      anon_sym_if,
-      anon_sym_else,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_while,
-      anon_sym_try,
-      anon_sym_finally,
-      anon_sym_with,
-      anon_sym_match,
-      anon_sym_def,
-      anon_sym_global,
-      anon_sym_nonlocal,
-      anon_sym_exec,
-      anon_sym_type,
-      anon_sym_class,
-      anon_sym_not,
-      anon_sym_lambda,
-      anon_sym_yield,
-      sym_integer,
-      sym_identifier,
-      anon_sym_await,
-      sym_true,
-      sym_false,
-      sym_none,
-  [10781] = 8,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(846), 1,
-      anon_sym_else,
-    ACTIONS(950), 1,
-      anon_sym_elif,
-    STATE(276), 1,
-      aux_sym_if_statement_repeat1,
-    STATE(433), 1,
-      sym_elif_clause,
-    STATE(537), 1,
-      sym_else_clause,
-    ACTIONS(946), 12,
-      sym__string_start,
-      ts_builtin_sym_end,
-      anon_sym_LPAREN,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_LBRACE,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_TILDE,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(948), 33,
-      anon_sym_import,
-      anon_sym_from,
-      anon_sym_STAR,
-      anon_sym_print,
-      anon_sym_assert,
-      anon_sym_return,
-      anon_sym_del,
-      anon_sym_raise,
-      anon_sym_pass,
-      anon_sym_break,
-      anon_sym_continue,
-      anon_sym_if,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_while,
-      anon_sym_try,
-      anon_sym_with,
-      anon_sym_match,
-      anon_sym_def,
-      anon_sym_global,
-      anon_sym_nonlocal,
-      anon_sym_exec,
-      anon_sym_type,
-      anon_sym_class,
-      anon_sym_not,
-      anon_sym_lambda,
-      anon_sym_yield,
-      sym_integer,
-      sym_identifier,
-      anon_sym_await,
-      sym_true,
-      sym_false,
-      sym_none,
-  [10849] = 21,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(274), 1,
-      sym_identifier,
-    ACTIONS(278), 1,
-      anon_sym_LPAREN,
-    ACTIONS(293), 1,
-      anon_sym_LBRACK,
-    ACTIONS(295), 1,
-      anon_sym_LBRACE,
-    ACTIONS(299), 1,
-      anon_sym_not,
-    ACTIONS(305), 1,
-      anon_sym_lambda,
-    ACTIONS(313), 1,
-      anon_sym_await,
-    ACTIONS(315), 1,
-      sym__string_start,
-    ACTIONS(896), 1,
-      anon_sym_COLON,
-    ACTIONS(952), 1,
-      anon_sym_RBRACK,
-    STATE(600), 1,
-      sym_string,
-    STATE(630), 1,
-      sym_primary_expression,
-    STATE(1086), 1,
-      sym_expression,
-    STATE(1398), 1,
-      sym_slice,
-    ACTIONS(309), 2,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(301), 3,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_TILDE,
-    ACTIONS(311), 4,
-      sym_integer,
-      sym_true,
-      sym_false,
-      sym_none,
-    ACTIONS(285), 5,
-      anon_sym_print,
-      anon_sym_async,
-      anon_sym_match,
-      anon_sym_exec,
-      anon_sym_type,
-    STATE(900), 7,
-      sym_named_expression,
-      sym_not_operator,
-      sym_boolean_operator,
-      sym_comparison_operator,
-      sym_lambda,
-      sym_conditional_expression,
-      sym_await,
-    STATE(642), 15,
-      sym_binary_operator,
-      sym_unary_operator,
-      sym_attribute,
-      sym_subscript,
-      sym_call,
-      sym_list,
-      sym_set,
-      sym_tuple,
-      sym_dictionary,
-      sym_list_comprehension,
-      sym_dictionary_comprehension,
-      sym_set_comprehension,
-      sym_generator_expression,
-      sym_parenthesized_expression,
-      sym_concatenated_string,
-  [10943] = 5,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(954), 1,
-      anon_sym_except_STAR,
-    STATE(270), 2,
-      sym_except_group_clause,
-      aux_sym_try_statement_repeat2,
-    ACTIONS(941), 12,
-      sym__string_start,
-      ts_builtin_sym_end,
-      anon_sym_LPAREN,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_LBRACE,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_TILDE,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(939), 35,
-      anon_sym_import,
-      anon_sym_from,
-      anon_sym_STAR,
-      anon_sym_print,
-      anon_sym_assert,
-      anon_sym_return,
-      anon_sym_del,
-      anon_sym_raise,
-      anon_sym_pass,
-      anon_sym_break,
-      anon_sym_continue,
-      anon_sym_if,
-      anon_sym_else,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_while,
-      anon_sym_try,
-      anon_sym_finally,
-      anon_sym_with,
-      anon_sym_match,
-      anon_sym_def,
-      anon_sym_global,
-      anon_sym_nonlocal,
-      anon_sym_exec,
-      anon_sym_type,
-      anon_sym_class,
-      anon_sym_not,
-      anon_sym_lambda,
-      anon_sym_yield,
-      sym_integer,
-      sym_identifier,
-      anon_sym_await,
-      sym_true,
-      sym_false,
-      sym_none,
-  [11005] = 5,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(957), 1,
-      anon_sym_except,
-    STATE(271), 2,
-      sym_except_clause,
-      aux_sym_try_statement_repeat1,
-    ACTIONS(934), 12,
-      sym__string_start,
-      ts_builtin_sym_end,
-      anon_sym_LPAREN,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_LBRACE,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_TILDE,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(932), 35,
-      anon_sym_import,
-      anon_sym_from,
-      anon_sym_STAR,
-      anon_sym_print,
-      anon_sym_assert,
-      anon_sym_return,
-      anon_sym_del,
-      anon_sym_raise,
-      anon_sym_pass,
-      anon_sym_break,
-      anon_sym_continue,
-      anon_sym_if,
-      anon_sym_else,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_while,
-      anon_sym_try,
-      anon_sym_finally,
-      anon_sym_with,
-      anon_sym_match,
-      anon_sym_def,
-      anon_sym_global,
-      anon_sym_nonlocal,
-      anon_sym_exec,
-      anon_sym_type,
-      anon_sym_class,
-      anon_sym_not,
-      anon_sym_lambda,
-      anon_sym_yield,
-      sym_integer,
-      sym_identifier,
-      anon_sym_await,
-      sym_true,
-      sym_false,
-      sym_none,
-  [11067] = 8,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(852), 1,
-      anon_sym_else,
-    ACTIONS(908), 1,
-      anon_sym_elif,
-    STATE(263), 1,
-      aux_sym_if_statement_repeat1,
-    STATE(420), 1,
-      sym_elif_clause,
-    STATE(529), 1,
-      sym_else_clause,
-    ACTIONS(946), 12,
-      sym__dedent,
-      sym__string_start,
-      anon_sym_LPAREN,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_LBRACE,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_TILDE,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(948), 33,
-      anon_sym_import,
-      anon_sym_from,
-      anon_sym_STAR,
-      anon_sym_print,
-      anon_sym_assert,
-      anon_sym_return,
-      anon_sym_del,
-      anon_sym_raise,
-      anon_sym_pass,
-      anon_sym_break,
-      anon_sym_continue,
-      anon_sym_if,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_while,
-      anon_sym_try,
-      anon_sym_with,
-      anon_sym_match,
-      anon_sym_def,
-      anon_sym_global,
-      anon_sym_nonlocal,
-      anon_sym_exec,
-      anon_sym_type,
-      anon_sym_class,
-      anon_sym_not,
-      anon_sym_lambda,
-      anon_sym_yield,
-      sym_integer,
-      sym_identifier,
-      anon_sym_await,
-      sym_true,
-      sym_false,
-      sym_none,
-  [11135] = 21,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(274), 1,
-      sym_identifier,
-    ACTIONS(278), 1,
-      anon_sym_LPAREN,
-    ACTIONS(293), 1,
-      anon_sym_LBRACK,
-    ACTIONS(295), 1,
-      anon_sym_LBRACE,
-    ACTIONS(299), 1,
-      anon_sym_not,
-    ACTIONS(305), 1,
-      anon_sym_lambda,
-    ACTIONS(313), 1,
-      anon_sym_await,
-    ACTIONS(315), 1,
-      sym__string_start,
-    ACTIONS(896), 1,
-      anon_sym_COLON,
-    ACTIONS(960), 1,
-      anon_sym_RBRACK,
-    STATE(600), 1,
-      sym_string,
-    STATE(630), 1,
-      sym_primary_expression,
-    STATE(1086), 1,
-      sym_expression,
-    STATE(1398), 1,
-      sym_slice,
-    ACTIONS(309), 2,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(301), 3,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_TILDE,
-    ACTIONS(311), 4,
-      sym_integer,
-      sym_true,
-      sym_false,
-      sym_none,
-    ACTIONS(285), 5,
-      anon_sym_print,
-      anon_sym_async,
-      anon_sym_match,
-      anon_sym_exec,
-      anon_sym_type,
-    STATE(900), 7,
-      sym_named_expression,
-      sym_not_operator,
-      sym_boolean_operator,
-      sym_comparison_operator,
-      sym_lambda,
-      sym_conditional_expression,
-      sym_await,
-    STATE(642), 15,
-      sym_binary_operator,
-      sym_unary_operator,
-      sym_attribute,
-      sym_subscript,
-      sym_call,
-      sym_list,
-      sym_set,
-      sym_tuple,
-      sym_dictionary,
-      sym_list_comprehension,
-      sym_dictionary_comprehension,
-      sym_set_comprehension,
-      sym_generator_expression,
-      sym_parenthesized_expression,
-      sym_concatenated_string,
-  [11229] = 21,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(274), 1,
-      sym_identifier,
-    ACTIONS(278), 1,
-      anon_sym_LPAREN,
-    ACTIONS(293), 1,
-      anon_sym_LBRACK,
-    ACTIONS(295), 1,
-      anon_sym_LBRACE,
-    ACTIONS(299), 1,
-      anon_sym_not,
-    ACTIONS(305), 1,
-      anon_sym_lambda,
-    ACTIONS(313), 1,
-      anon_sym_await,
-    ACTIONS(315), 1,
-      sym__string_start,
-    ACTIONS(896), 1,
-      anon_sym_COLON,
-    ACTIONS(962), 1,
-      anon_sym_RBRACK,
-    STATE(600), 1,
-      sym_string,
-    STATE(630), 1,
-      sym_primary_expression,
-    STATE(1086), 1,
-      sym_expression,
-    STATE(1398), 1,
-      sym_slice,
-    ACTIONS(309), 2,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(301), 3,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_TILDE,
-    ACTIONS(311), 4,
-      sym_integer,
-      sym_true,
-      sym_false,
-      sym_none,
-    ACTIONS(285), 5,
-      anon_sym_print,
-      anon_sym_async,
-      anon_sym_match,
-      anon_sym_exec,
-      anon_sym_type,
-    STATE(900), 7,
-      sym_named_expression,
-      sym_not_operator,
-      sym_boolean_operator,
-      sym_comparison_operator,
-      sym_lambda,
-      sym_conditional_expression,
-      sym_await,
-    STATE(642), 15,
-      sym_binary_operator,
-      sym_unary_operator,
-      sym_attribute,
-      sym_subscript,
-      sym_call,
-      sym_list,
-      sym_set,
-      sym_tuple,
-      sym_dictionary,
-      sym_list_comprehension,
-      sym_dictionary_comprehension,
-      sym_set_comprehension,
-      sym_generator_expression,
-      sym_parenthesized_expression,
-      sym_concatenated_string,
-  [11323] = 20,
+  [10775] = 21,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(53), 1,
       anon_sym_STAR_STAR,
-    ACTIONS(274), 1,
+    ACTIONS(258), 1,
       sym_identifier,
-    ACTIONS(278), 1,
+    ACTIONS(262), 1,
       anon_sym_LPAREN,
-    ACTIONS(293), 1,
+    ACTIONS(277), 1,
       anon_sym_LBRACK,
-    ACTIONS(295), 1,
+    ACTIONS(279), 1,
       anon_sym_LBRACE,
-    ACTIONS(299), 1,
+    ACTIONS(283), 1,
       anon_sym_not,
-    ACTIONS(305), 1,
+    ACTIONS(289), 1,
       anon_sym_lambda,
-    ACTIONS(313), 1,
+    ACTIONS(297), 1,
       anon_sym_await,
-    ACTIONS(315), 1,
+    ACTIONS(299), 1,
       sym__string_start,
-    STATE(600), 1,
+    ACTIONS(890), 1,
+      anon_sym_RBRACE,
+    STATE(586), 1,
       sym_string,
-    STATE(630), 1,
+    STATE(616), 1,
       sym_primary_expression,
-    STATE(1145), 1,
+    STATE(1142), 1,
       sym_expression,
-    ACTIONS(309), 2,
+    ACTIONS(293), 2,
       sym_ellipsis,
       sym_float,
-    STATE(1384), 2,
+    STATE(1334), 2,
       sym_dictionary_splat,
       sym_pair,
-    ACTIONS(301), 3,
+    ACTIONS(285), 3,
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
-    ACTIONS(311), 4,
+    ACTIONS(295), 4,
       sym_integer,
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(285), 5,
+    ACTIONS(269), 5,
       anon_sym_print,
       anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(900), 7,
+    STATE(883), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-      sym_await,
-    STATE(642), 15,
+    STATE(605), 16,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -35235,302 +31288,65 @@ static const uint16_t ts_small_parse_table[] = {
       sym_generator_expression,
       sym_parenthesized_expression,
       sym_concatenated_string,
-  [11415] = 8,
+      sym_await,
+  [10870] = 21,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(846), 1,
-      anon_sym_else,
-    ACTIONS(950), 1,
-      anon_sym_elif,
-    STATE(285), 1,
-      aux_sym_if_statement_repeat1,
-    STATE(433), 1,
-      sym_elif_clause,
-    STATE(585), 1,
-      sym_else_clause,
-    ACTIONS(922), 12,
-      sym__string_start,
-      ts_builtin_sym_end,
-      anon_sym_LPAREN,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_LBRACE,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_TILDE,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(920), 33,
-      anon_sym_import,
-      anon_sym_from,
-      anon_sym_STAR,
-      anon_sym_print,
-      anon_sym_assert,
-      anon_sym_return,
-      anon_sym_del,
-      anon_sym_raise,
-      anon_sym_pass,
-      anon_sym_break,
-      anon_sym_continue,
-      anon_sym_if,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_while,
-      anon_sym_try,
-      anon_sym_with,
-      anon_sym_match,
-      anon_sym_def,
-      anon_sym_global,
-      anon_sym_nonlocal,
-      anon_sym_exec,
-      anon_sym_type,
-      anon_sym_class,
-      anon_sym_not,
-      anon_sym_lambda,
-      anon_sym_yield,
-      sym_integer,
+    ACTIONS(258), 1,
       sym_identifier,
-      anon_sym_await,
-      sym_true,
-      sym_false,
-      sym_none,
-  [11483] = 8,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(846), 1,
-      anon_sym_else,
-    ACTIONS(950), 1,
-      anon_sym_elif,
-    STATE(285), 1,
-      aux_sym_if_statement_repeat1,
-    STATE(433), 1,
-      sym_elif_clause,
-    STATE(575), 1,
-      sym_else_clause,
-    ACTIONS(906), 12,
-      sym__string_start,
-      ts_builtin_sym_end,
+    ACTIONS(262), 1,
       anon_sym_LPAREN,
-      anon_sym_DASH,
-      anon_sym_PLUS,
+    ACTIONS(277), 1,
       anon_sym_LBRACK,
+    ACTIONS(279), 1,
       anon_sym_LBRACE,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_TILDE,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(904), 33,
-      anon_sym_import,
-      anon_sym_from,
-      anon_sym_STAR,
-      anon_sym_print,
-      anon_sym_assert,
-      anon_sym_return,
-      anon_sym_del,
-      anon_sym_raise,
-      anon_sym_pass,
-      anon_sym_break,
-      anon_sym_continue,
-      anon_sym_if,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_while,
-      anon_sym_try,
-      anon_sym_with,
-      anon_sym_match,
-      anon_sym_def,
-      anon_sym_global,
-      anon_sym_nonlocal,
-      anon_sym_exec,
-      anon_sym_type,
-      anon_sym_class,
+    ACTIONS(283), 1,
       anon_sym_not,
+    ACTIONS(289), 1,
       anon_sym_lambda,
-      anon_sym_yield,
-      sym_integer,
-      sym_identifier,
+    ACTIONS(297), 1,
       anon_sym_await,
-      sym_true,
-      sym_false,
-      sym_none,
-  [11551] = 9,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(280), 1,
-      anon_sym_COMMA,
-    ACTIONS(287), 1,
-      anon_sym_COLON_EQ,
-    ACTIONS(964), 1,
+    ACTIONS(299), 1,
       sym__string_start,
-    STATE(1335), 1,
-      sym_string,
-    ACTIONS(289), 2,
+    ACTIONS(706), 1,
+      anon_sym_STAR,
+    ACTIONS(828), 1,
       anon_sym_COLON,
-      anon_sym_EQ,
-    ACTIONS(307), 13,
-      anon_sym_PLUS_EQ,
-      anon_sym_DASH_EQ,
-      anon_sym_STAR_EQ,
-      anon_sym_SLASH_EQ,
-      anon_sym_AT_EQ,
-      anon_sym_SLASH_SLASH_EQ,
-      anon_sym_PERCENT_EQ,
-      anon_sym_STAR_STAR_EQ,
-      anon_sym_GT_GT_EQ,
-      anon_sym_LT_LT_EQ,
-      anon_sym_AMP_EQ,
-      anon_sym_CARET_EQ,
-      anon_sym_PIPE_EQ,
-    ACTIONS(276), 15,
-      anon_sym_STAR,
-      anon_sym_GT_GT,
-      anon_sym_PIPE,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_SLASH,
-      anon_sym_PERCENT,
-      anon_sym_SLASH_SLASH,
-      anon_sym_AMP,
-      anon_sym_CARET,
-      anon_sym_LT_LT,
-      anon_sym_LT,
-      anon_sym_GT,
-    ACTIONS(303), 16,
-      sym__newline,
-      anon_sym_DOT,
-      anon_sym_LPAREN,
-      anon_sym_if,
-      anon_sym_in,
-      anon_sym_LBRACK,
-      anon_sym_not,
-      anon_sym_and,
-      anon_sym_or,
-      anon_sym_LT_EQ,
-      anon_sym_EQ_EQ,
-      anon_sym_BANG_EQ,
-      anon_sym_GT_EQ,
-      anon_sym_LT_GT,
-      anon_sym_is,
-      sym__semicolon,
-  [11621] = 8,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(846), 1,
-      anon_sym_else,
-    ACTIONS(950), 1,
-      anon_sym_elif,
-    STATE(277), 1,
-      aux_sym_if_statement_repeat1,
-    STATE(433), 1,
-      sym_elif_clause,
-    STATE(576), 1,
-      sym_else_clause,
-    ACTIONS(930), 12,
-      sym__string_start,
-      ts_builtin_sym_end,
-      anon_sym_LPAREN,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_LBRACE,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_TILDE,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(928), 33,
-      anon_sym_import,
-      anon_sym_from,
-      anon_sym_STAR,
-      anon_sym_print,
-      anon_sym_assert,
-      anon_sym_return,
-      anon_sym_del,
-      anon_sym_raise,
-      anon_sym_pass,
-      anon_sym_break,
-      anon_sym_continue,
-      anon_sym_if,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_while,
-      anon_sym_try,
-      anon_sym_with,
-      anon_sym_match,
-      anon_sym_def,
-      anon_sym_global,
-      anon_sym_nonlocal,
-      anon_sym_exec,
-      anon_sym_type,
-      anon_sym_class,
-      anon_sym_not,
-      anon_sym_lambda,
-      anon_sym_yield,
-      sym_integer,
-      sym_identifier,
-      anon_sym_await,
-      sym_true,
-      sym_false,
-      sym_none,
-  [11689] = 19,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(295), 1,
-      anon_sym_LBRACE,
-    ACTIONS(315), 1,
-      sym__string_start,
-    ACTIONS(602), 1,
-      sym_identifier,
-    ACTIONS(604), 1,
-      anon_sym_LPAREN,
-    ACTIONS(612), 1,
-      anon_sym_LBRACK,
-    ACTIONS(614), 1,
-      anon_sym_not,
-    ACTIONS(618), 1,
-      anon_sym_await,
-    ACTIONS(758), 1,
-      anon_sym_lambda,
-    STATE(600), 1,
+    STATE(586), 1,
       sym_string,
-    STATE(643), 1,
+    STATE(616), 1,
       sym_primary_expression,
-    STATE(962), 1,
+    STATE(1054), 1,
       sym_expression,
-    ACTIONS(309), 2,
+    ACTIONS(293), 2,
       sym_ellipsis,
       sym_float,
-    STATE(1018), 2,
-      sym__expression_within_for_in_clause,
-      sym_lambda_within_for_in_clause,
-    ACTIONS(610), 3,
+    STATE(1369), 2,
+      sym_list_splat,
+      sym_slice,
+    ACTIONS(285), 3,
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
-    ACTIONS(311), 4,
+    ACTIONS(295), 4,
       sym_integer,
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(606), 5,
+    ACTIONS(269), 5,
       anon_sym_print,
       anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(900), 7,
+    STATE(883), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-      sym_await,
-    STATE(642), 15,
+    STATE(605), 16,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -35546,356 +31362,65 @@ static const uint16_t ts_small_parse_table[] = {
       sym_generator_expression,
       sym_parenthesized_expression,
       sym_concatenated_string,
-  [11778] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(966), 12,
-      sym__string_start,
-      ts_builtin_sym_end,
-      anon_sym_LPAREN,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_LBRACE,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_TILDE,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(968), 37,
-      anon_sym_import,
-      anon_sym_from,
-      anon_sym_STAR,
-      anon_sym_print,
-      anon_sym_assert,
-      anon_sym_return,
-      anon_sym_del,
-      anon_sym_raise,
-      anon_sym_pass,
-      anon_sym_break,
-      anon_sym_continue,
-      anon_sym_if,
-      anon_sym_elif,
-      anon_sym_else,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_while,
-      anon_sym_try,
-      anon_sym_finally,
-      anon_sym_with,
-      anon_sym_match,
-      anon_sym_case,
-      anon_sym_def,
-      anon_sym_global,
-      anon_sym_nonlocal,
-      anon_sym_exec,
-      anon_sym_type,
-      anon_sym_class,
-      anon_sym_not,
-      anon_sym_lambda,
-      anon_sym_yield,
-      sym_integer,
-      sym_identifier,
-      anon_sym_await,
-      sym_true,
-      sym_false,
-      sym_none,
-  [11835] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(970), 12,
-      sym__string_start,
-      ts_builtin_sym_end,
-      anon_sym_LPAREN,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_LBRACE,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_TILDE,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(972), 37,
-      anon_sym_import,
-      anon_sym_from,
-      anon_sym_STAR,
-      anon_sym_print,
-      anon_sym_assert,
-      anon_sym_return,
-      anon_sym_del,
-      anon_sym_raise,
-      anon_sym_pass,
-      anon_sym_break,
-      anon_sym_continue,
-      anon_sym_if,
-      anon_sym_elif,
-      anon_sym_else,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_while,
-      anon_sym_try,
-      anon_sym_finally,
-      anon_sym_with,
-      anon_sym_match,
-      anon_sym_case,
-      anon_sym_def,
-      anon_sym_global,
-      anon_sym_nonlocal,
-      anon_sym_exec,
-      anon_sym_type,
-      anon_sym_class,
-      anon_sym_not,
-      anon_sym_lambda,
-      anon_sym_yield,
-      sym_integer,
-      sym_identifier,
-      anon_sym_await,
-      sym_true,
-      sym_false,
-      sym_none,
-  [11892] = 20,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(622), 1,
-      sym_identifier,
-    ACTIONS(632), 1,
-      anon_sym_LBRACK,
-    ACTIONS(634), 1,
-      anon_sym_LBRACE,
-    ACTIONS(636), 1,
-      anon_sym_not,
-    ACTIONS(638), 1,
-      anon_sym_lambda,
-    ACTIONS(644), 1,
-      anon_sym_await,
-    ACTIONS(646), 1,
-      sym__string_start,
-    ACTIONS(974), 1,
-      anon_sym_LPAREN,
-    STATE(740), 1,
-      sym_primary_expression,
-    STATE(742), 1,
-      sym_string,
-    STATE(1050), 1,
-      sym_expression,
-    STATE(1320), 1,
-      sym_with_item,
-    STATE(1422), 1,
-      sym_with_clause,
-    ACTIONS(640), 2,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(630), 3,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_TILDE,
-    ACTIONS(642), 4,
-      sym_integer,
-      sym_true,
-      sym_false,
-      sym_none,
-    ACTIONS(626), 5,
-      anon_sym_print,
-      anon_sym_async,
-      anon_sym_match,
-      anon_sym_exec,
-      anon_sym_type,
-    STATE(1015), 7,
-      sym_named_expression,
-      sym_not_operator,
-      sym_boolean_operator,
-      sym_comparison_operator,
-      sym_lambda,
-      sym_conditional_expression,
       sym_await,
-    STATE(811), 15,
-      sym_binary_operator,
-      sym_unary_operator,
-      sym_attribute,
-      sym_subscript,
-      sym_call,
-      sym_list,
-      sym_set,
-      sym_tuple,
-      sym_dictionary,
-      sym_list_comprehension,
-      sym_dictionary_comprehension,
-      sym_set_comprehension,
-      sym_generator_expression,
-      sym_parenthesized_expression,
-      sym_concatenated_string,
-  [11983] = 8,
+  [10965] = 21,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(280), 1,
-      anon_sym_COMMA,
-    ACTIONS(287), 1,
-      anon_sym_COLON_EQ,
-    ACTIONS(976), 1,
+    ACTIONS(258), 1,
       sym_identifier,
-    ACTIONS(289), 2,
+    ACTIONS(262), 1,
+      anon_sym_LPAREN,
+    ACTIONS(277), 1,
+      anon_sym_LBRACK,
+    ACTIONS(279), 1,
+      anon_sym_LBRACE,
+    ACTIONS(283), 1,
+      anon_sym_not,
+    ACTIONS(289), 1,
+      anon_sym_lambda,
+    ACTIONS(297), 1,
+      anon_sym_await,
+    ACTIONS(299), 1,
+      sym__string_start,
+    ACTIONS(706), 1,
+      anon_sym_STAR,
+    ACTIONS(828), 1,
       anon_sym_COLON,
-      anon_sym_EQ,
-    ACTIONS(303), 10,
-      sym__newline,
-      anon_sym_DOT,
-      anon_sym_LPAREN,
-      anon_sym_LBRACK,
-      anon_sym_LT_EQ,
-      anon_sym_EQ_EQ,
-      anon_sym_BANG_EQ,
-      anon_sym_GT_EQ,
-      anon_sym_LT_GT,
-      sym__semicolon,
-    ACTIONS(307), 13,
-      anon_sym_PLUS_EQ,
-      anon_sym_DASH_EQ,
-      anon_sym_STAR_EQ,
-      anon_sym_SLASH_EQ,
-      anon_sym_AT_EQ,
-      anon_sym_SLASH_SLASH_EQ,
-      anon_sym_PERCENT_EQ,
-      anon_sym_STAR_STAR_EQ,
-      anon_sym_GT_GT_EQ,
-      anon_sym_LT_LT_EQ,
-      anon_sym_AMP_EQ,
-      anon_sym_CARET_EQ,
-      anon_sym_PIPE_EQ,
-    ACTIONS(276), 21,
-      anon_sym_STAR,
-      anon_sym_GT_GT,
-      anon_sym_if,
-      anon_sym_in,
-      anon_sym_PIPE,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_not,
-      anon_sym_and,
-      anon_sym_or,
-      anon_sym_SLASH,
-      anon_sym_PERCENT,
-      anon_sym_SLASH_SLASH,
-      anon_sym_AMP,
-      anon_sym_CARET,
-      anon_sym_LT_LT,
-      anon_sym_LT,
-      anon_sym_GT,
-      anon_sym_is,
-  [12050] = 6,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(982), 1,
-      anon_sym_elif,
-    STATE(285), 1,
-      aux_sym_if_statement_repeat1,
-    STATE(433), 1,
-      sym_elif_clause,
-    ACTIONS(978), 12,
-      sym__string_start,
-      ts_builtin_sym_end,
-      anon_sym_LPAREN,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_LBRACE,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_TILDE,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(980), 34,
-      anon_sym_import,
-      anon_sym_from,
-      anon_sym_STAR,
-      anon_sym_print,
-      anon_sym_assert,
-      anon_sym_return,
-      anon_sym_del,
-      anon_sym_raise,
-      anon_sym_pass,
-      anon_sym_break,
-      anon_sym_continue,
-      anon_sym_if,
-      anon_sym_else,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_while,
-      anon_sym_try,
-      anon_sym_with,
-      anon_sym_match,
-      anon_sym_def,
-      anon_sym_global,
-      anon_sym_nonlocal,
-      anon_sym_exec,
-      anon_sym_type,
-      anon_sym_class,
-      anon_sym_not,
-      anon_sym_lambda,
-      anon_sym_yield,
-      sym_integer,
-      sym_identifier,
-      anon_sym_await,
-      sym_true,
-      sym_false,
-      sym_none,
-  [12113] = 19,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(295), 1,
-      anon_sym_LBRACE,
-    ACTIONS(315), 1,
-      sym__string_start,
-    ACTIONS(602), 1,
-      sym_identifier,
-    ACTIONS(604), 1,
-      anon_sym_LPAREN,
-    ACTIONS(612), 1,
-      anon_sym_LBRACK,
-    ACTIONS(614), 1,
-      anon_sym_not,
-    ACTIONS(618), 1,
-      anon_sym_await,
-    ACTIONS(758), 1,
-      anon_sym_lambda,
-    STATE(600), 1,
+    STATE(586), 1,
       sym_string,
-    STATE(643), 1,
+    STATE(616), 1,
       sym_primary_expression,
-    STATE(962), 1,
+    STATE(1028), 1,
       sym_expression,
-    ACTIONS(309), 2,
+    ACTIONS(293), 2,
       sym_ellipsis,
       sym_float,
-    STATE(979), 2,
-      sym__expression_within_for_in_clause,
-      sym_lambda_within_for_in_clause,
-    ACTIONS(610), 3,
+    STATE(1202), 2,
+      sym_list_splat,
+      sym_slice,
+    ACTIONS(285), 3,
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
-    ACTIONS(311), 4,
+    ACTIONS(295), 4,
       sym_integer,
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(606), 5,
+    ACTIONS(269), 5,
       anon_sym_print,
       anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(900), 7,
+    STATE(883), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-      sym_await,
-    STATE(642), 15,
+    STATE(605), 16,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -35911,64 +31436,11 @@ static const uint16_t ts_small_parse_table[] = {
       sym_generator_expression,
       sym_parenthesized_expression,
       sym_concatenated_string,
-  [12202] = 3,
+      sym_await,
+  [11060] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(985), 12,
-      sym__string_start,
-      ts_builtin_sym_end,
-      anon_sym_LPAREN,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_LBRACE,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_TILDE,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(987), 37,
-      anon_sym_import,
-      anon_sym_from,
-      anon_sym_STAR,
-      anon_sym_print,
-      anon_sym_assert,
-      anon_sym_return,
-      anon_sym_del,
-      anon_sym_raise,
-      anon_sym_pass,
-      anon_sym_break,
-      anon_sym_continue,
-      anon_sym_if,
-      anon_sym_elif,
-      anon_sym_else,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_while,
-      anon_sym_try,
-      anon_sym_finally,
-      anon_sym_with,
-      anon_sym_match,
-      anon_sym_case,
-      anon_sym_def,
-      anon_sym_global,
-      anon_sym_nonlocal,
-      anon_sym_exec,
-      anon_sym_type,
-      anon_sym_class,
-      anon_sym_not,
-      anon_sym_lambda,
-      anon_sym_yield,
-      sym_integer,
-      sym_identifier,
-      anon_sym_await,
-      sym_true,
-      sym_false,
-      sym_none,
-  [12259] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(991), 12,
+    ACTIONS(894), 12,
       sym__dedent,
       sym__string_start,
       anon_sym_LPAREN,
@@ -35981,7 +31453,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_TILDE,
       sym_ellipsis,
       sym_float,
-    ACTIONS(989), 37,
+    ACTIONS(892), 38,
       anon_sym_import,
       anon_sym_from,
       anon_sym_STAR,
@@ -36000,6 +31472,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_for,
       anon_sym_while,
       anon_sym_try,
+      anon_sym_except,
       anon_sym_finally,
       anon_sym_with,
       anon_sym_match,
@@ -36019,61 +31492,3101 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-  [12316] = 19,
+  [11118] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(274), 1,
-      sym_identifier,
-    ACTIONS(278), 1,
+    ACTIONS(896), 12,
+      sym__string_start,
+      ts_builtin_sym_end,
       anon_sym_LPAREN,
-    ACTIONS(293), 1,
+      anon_sym_DASH,
+      anon_sym_PLUS,
       anon_sym_LBRACK,
-    ACTIONS(295), 1,
+      anon_sym_LBRACE,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_TILDE,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(898), 38,
+      anon_sym_import,
+      anon_sym_from,
+      anon_sym_STAR,
+      anon_sym_print,
+      anon_sym_assert,
+      anon_sym_return,
+      anon_sym_del,
+      anon_sym_raise,
+      anon_sym_pass,
+      anon_sym_break,
+      anon_sym_continue,
+      anon_sym_if,
+      anon_sym_elif,
+      anon_sym_else,
+      anon_sym_async,
+      anon_sym_for,
+      anon_sym_while,
+      anon_sym_try,
+      anon_sym_except,
+      anon_sym_finally,
+      anon_sym_with,
+      anon_sym_match,
+      anon_sym_case,
+      anon_sym_def,
+      anon_sym_global,
+      anon_sym_nonlocal,
+      anon_sym_exec,
+      anon_sym_type,
+      anon_sym_class,
+      anon_sym_not,
+      anon_sym_lambda,
+      anon_sym_yield,
+      sym_integer,
+      sym_identifier,
+      anon_sym_await,
+      sym_true,
+      sym_false,
+      sym_none,
+  [11176] = 21,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(51), 1,
+      anon_sym_LBRACE,
+    ACTIONS(69), 1,
+      anon_sym_not,
+    ACTIONS(71), 1,
+      anon_sym_lambda,
+    ACTIONS(81), 1,
+      sym__string_start,
+    ACTIONS(327), 1,
+      sym_identifier,
+    ACTIONS(333), 1,
+      anon_sym_await,
+    ACTIONS(568), 1,
+      anon_sym_LPAREN,
+    ACTIONS(574), 1,
+      anon_sym_LBRACK,
+    ACTIONS(900), 1,
+      anon_sym_STAR,
+    STATE(707), 1,
+      sym_primary_expression,
+    STATE(709), 1,
+      sym_string,
+    STATE(1040), 1,
+      sym_expression,
+    STATE(1237), 1,
+      sym_type,
+    STATE(1243), 1,
+      sym_list_splat,
+    ACTIONS(75), 2,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(47), 3,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_TILDE,
+    ACTIONS(77), 4,
+      sym_integer,
+      sym_true,
+      sym_false,
+      sym_none,
+    ACTIONS(329), 5,
+      anon_sym_print,
+      anon_sym_async,
+      anon_sym_match,
+      anon_sym_exec,
+      anon_sym_type,
+    STATE(985), 6,
+      sym_named_expression,
+      sym_not_operator,
+      sym_boolean_operator,
+      sym_comparison_operator,
+      sym_lambda,
+      sym_conditional_expression,
+    STATE(759), 16,
+      sym_binary_operator,
+      sym_unary_operator,
+      sym_attribute,
+      sym_subscript,
+      sym_call,
+      sym_list,
+      sym_set,
+      sym_tuple,
+      sym_dictionary,
+      sym_list_comprehension,
+      sym_dictionary_comprehension,
+      sym_set_comprehension,
+      sym_generator_expression,
+      sym_parenthesized_expression,
+      sym_concatenated_string,
+      sym_await,
+  [11270] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(902), 12,
+      sym__string_start,
+      ts_builtin_sym_end,
+      anon_sym_LPAREN,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_LBRACE,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_TILDE,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(904), 38,
+      anon_sym_import,
+      anon_sym_from,
+      anon_sym_STAR,
+      anon_sym_print,
+      anon_sym_assert,
+      anon_sym_return,
+      anon_sym_del,
+      anon_sym_raise,
+      anon_sym_pass,
+      anon_sym_break,
+      anon_sym_continue,
+      anon_sym_if,
+      anon_sym_elif,
+      anon_sym_else,
+      anon_sym_async,
+      anon_sym_for,
+      anon_sym_while,
+      anon_sym_try,
+      anon_sym_except,
+      anon_sym_finally,
+      anon_sym_with,
+      anon_sym_match,
+      anon_sym_case,
+      anon_sym_def,
+      anon_sym_global,
+      anon_sym_nonlocal,
+      anon_sym_exec,
+      anon_sym_type,
+      anon_sym_class,
+      anon_sym_not,
+      anon_sym_lambda,
+      anon_sym_yield,
+      sym_integer,
+      sym_identifier,
+      anon_sym_await,
+      sym_true,
+      sym_false,
+      sym_none,
+  [11328] = 20,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(258), 1,
+      sym_identifier,
+    ACTIONS(262), 1,
+      anon_sym_LPAREN,
+    ACTIONS(277), 1,
+      anon_sym_LBRACK,
+    ACTIONS(279), 1,
+      anon_sym_LBRACE,
+    ACTIONS(283), 1,
+      anon_sym_not,
+    ACTIONS(289), 1,
+      anon_sym_lambda,
+    ACTIONS(297), 1,
+      anon_sym_await,
+    ACTIONS(299), 1,
+      sym__string_start,
+    ACTIONS(908), 1,
+      anon_sym_COLON,
+    STATE(586), 1,
+      sym_string,
+    STATE(616), 1,
+      sym_primary_expression,
+    STATE(1051), 1,
+      sym_expression,
+    ACTIONS(293), 2,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(906), 2,
+      anon_sym_COMMA,
+      anon_sym_RBRACK,
+    ACTIONS(285), 3,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_TILDE,
+    ACTIONS(295), 4,
+      sym_integer,
+      sym_true,
+      sym_false,
+      sym_none,
+    ACTIONS(269), 5,
+      anon_sym_print,
+      anon_sym_async,
+      anon_sym_match,
+      anon_sym_exec,
+      anon_sym_type,
+    STATE(883), 6,
+      sym_named_expression,
+      sym_not_operator,
+      sym_boolean_operator,
+      sym_comparison_operator,
+      sym_lambda,
+      sym_conditional_expression,
+    STATE(605), 16,
+      sym_binary_operator,
+      sym_unary_operator,
+      sym_attribute,
+      sym_subscript,
+      sym_call,
+      sym_list,
+      sym_set,
+      sym_tuple,
+      sym_dictionary,
+      sym_list_comprehension,
+      sym_dictionary_comprehension,
+      sym_set_comprehension,
+      sym_generator_expression,
+      sym_parenthesized_expression,
+      sym_concatenated_string,
+      sym_await,
+  [11420] = 8,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(822), 1,
+      anon_sym_else,
+    ACTIONS(914), 1,
+      anon_sym_elif,
+    STATE(318), 1,
+      aux_sym_if_statement_repeat1,
+    STATE(368), 1,
+      sym_elif_clause,
+    STATE(489), 1,
+      sym_else_clause,
+    ACTIONS(912), 12,
+      sym__dedent,
+      sym__string_start,
+      anon_sym_LPAREN,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_LBRACE,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_TILDE,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(910), 33,
+      anon_sym_import,
+      anon_sym_from,
+      anon_sym_STAR,
+      anon_sym_print,
+      anon_sym_assert,
+      anon_sym_return,
+      anon_sym_del,
+      anon_sym_raise,
+      anon_sym_pass,
+      anon_sym_break,
+      anon_sym_continue,
+      anon_sym_if,
+      anon_sym_async,
+      anon_sym_for,
+      anon_sym_while,
+      anon_sym_try,
+      anon_sym_with,
+      anon_sym_match,
+      anon_sym_def,
+      anon_sym_global,
+      anon_sym_nonlocal,
+      anon_sym_exec,
+      anon_sym_type,
+      anon_sym_class,
+      anon_sym_not,
+      anon_sym_lambda,
+      anon_sym_yield,
+      sym_integer,
+      sym_identifier,
+      anon_sym_await,
+      sym_true,
+      sym_false,
+      sym_none,
+  [11488] = 21,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(258), 1,
+      sym_identifier,
+    ACTIONS(262), 1,
+      anon_sym_LPAREN,
+    ACTIONS(277), 1,
+      anon_sym_LBRACK,
+    ACTIONS(279), 1,
+      anon_sym_LBRACE,
+    ACTIONS(283), 1,
+      anon_sym_not,
+    ACTIONS(289), 1,
+      anon_sym_lambda,
+    ACTIONS(297), 1,
+      anon_sym_await,
+    ACTIONS(299), 1,
+      sym__string_start,
+    ACTIONS(706), 1,
+      anon_sym_STAR,
+    STATE(586), 1,
+      sym_string,
+    STATE(616), 1,
+      sym_primary_expression,
+    STATE(1011), 1,
+      sym_expression,
+    STATE(1153), 1,
+      sym_list_splat,
+    STATE(1456), 1,
+      sym_type,
+    ACTIONS(293), 2,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(285), 3,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_TILDE,
+    ACTIONS(295), 4,
+      sym_integer,
+      sym_true,
+      sym_false,
+      sym_none,
+    ACTIONS(269), 5,
+      anon_sym_print,
+      anon_sym_async,
+      anon_sym_match,
+      anon_sym_exec,
+      anon_sym_type,
+    STATE(883), 6,
+      sym_named_expression,
+      sym_not_operator,
+      sym_boolean_operator,
+      sym_comparison_operator,
+      sym_lambda,
+      sym_conditional_expression,
+    STATE(605), 16,
+      sym_binary_operator,
+      sym_unary_operator,
+      sym_attribute,
+      sym_subscript,
+      sym_call,
+      sym_list,
+      sym_set,
+      sym_tuple,
+      sym_dictionary,
+      sym_list_comprehension,
+      sym_dictionary_comprehension,
+      sym_set_comprehension,
+      sym_generator_expression,
+      sym_parenthesized_expression,
+      sym_concatenated_string,
+      sym_await,
+  [11582] = 21,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(258), 1,
+      sym_identifier,
+    ACTIONS(262), 1,
+      anon_sym_LPAREN,
+    ACTIONS(277), 1,
+      anon_sym_LBRACK,
+    ACTIONS(279), 1,
+      anon_sym_LBRACE,
+    ACTIONS(283), 1,
+      anon_sym_not,
+    ACTIONS(289), 1,
+      anon_sym_lambda,
+    ACTIONS(297), 1,
+      anon_sym_await,
+    ACTIONS(299), 1,
+      sym__string_start,
+    ACTIONS(706), 1,
+      anon_sym_STAR,
+    STATE(586), 1,
+      sym_string,
+    STATE(616), 1,
+      sym_primary_expression,
+    STATE(1011), 1,
+      sym_expression,
+    STATE(1153), 1,
+      sym_list_splat,
+    STATE(1417), 1,
+      sym_type,
+    ACTIONS(293), 2,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(285), 3,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_TILDE,
+    ACTIONS(295), 4,
+      sym_integer,
+      sym_true,
+      sym_false,
+      sym_none,
+    ACTIONS(269), 5,
+      anon_sym_print,
+      anon_sym_async,
+      anon_sym_match,
+      anon_sym_exec,
+      anon_sym_type,
+    STATE(883), 6,
+      sym_named_expression,
+      sym_not_operator,
+      sym_boolean_operator,
+      sym_comparison_operator,
+      sym_lambda,
+      sym_conditional_expression,
+    STATE(605), 16,
+      sym_binary_operator,
+      sym_unary_operator,
+      sym_attribute,
+      sym_subscript,
+      sym_call,
+      sym_list,
+      sym_set,
+      sym_tuple,
+      sym_dictionary,
+      sym_list_comprehension,
+      sym_dictionary_comprehension,
+      sym_set_comprehension,
+      sym_generator_expression,
+      sym_parenthesized_expression,
+      sym_concatenated_string,
+      sym_await,
+  [11676] = 9,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(264), 1,
+      anon_sym_COMMA,
+    ACTIONS(271), 1,
+      anon_sym_COLON_EQ,
+    ACTIONS(916), 1,
+      sym__string_start,
+    STATE(1239), 1,
+      sym_string,
+    ACTIONS(273), 2,
+      anon_sym_COLON,
+      anon_sym_EQ,
+    ACTIONS(291), 13,
+      anon_sym_PLUS_EQ,
+      anon_sym_DASH_EQ,
+      anon_sym_STAR_EQ,
+      anon_sym_SLASH_EQ,
+      anon_sym_AT_EQ,
+      anon_sym_SLASH_SLASH_EQ,
+      anon_sym_PERCENT_EQ,
+      anon_sym_STAR_STAR_EQ,
+      anon_sym_GT_GT_EQ,
+      anon_sym_LT_LT_EQ,
+      anon_sym_AMP_EQ,
+      anon_sym_CARET_EQ,
+      anon_sym_PIPE_EQ,
+    ACTIONS(260), 15,
+      anon_sym_STAR,
+      anon_sym_GT_GT,
+      anon_sym_PIPE,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_SLASH,
+      anon_sym_PERCENT,
+      anon_sym_SLASH_SLASH,
+      anon_sym_AMP,
+      anon_sym_CARET,
+      anon_sym_LT_LT,
+      anon_sym_LT,
+      anon_sym_GT,
+    ACTIONS(287), 16,
+      sym__newline,
+      anon_sym_DOT,
+      anon_sym_LPAREN,
+      anon_sym_if,
+      anon_sym_in,
+      anon_sym_LBRACK,
+      anon_sym_not,
+      anon_sym_and,
+      anon_sym_or,
+      anon_sym_LT_EQ,
+      anon_sym_EQ_EQ,
+      anon_sym_BANG_EQ,
+      anon_sym_GT_EQ,
+      anon_sym_LT_GT,
+      anon_sym_is,
+      sym__semicolon,
+  [11746] = 8,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(822), 1,
+      anon_sym_else,
+    ACTIONS(914), 1,
+      anon_sym_elif,
+    STATE(280), 1,
+      aux_sym_if_statement_repeat1,
+    STATE(368), 1,
+      sym_elif_clause,
+    STATE(516), 1,
+      sym_else_clause,
+    ACTIONS(920), 12,
+      sym__dedent,
+      sym__string_start,
+      anon_sym_LPAREN,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_LBRACE,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_TILDE,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(918), 33,
+      anon_sym_import,
+      anon_sym_from,
+      anon_sym_STAR,
+      anon_sym_print,
+      anon_sym_assert,
+      anon_sym_return,
+      anon_sym_del,
+      anon_sym_raise,
+      anon_sym_pass,
+      anon_sym_break,
+      anon_sym_continue,
+      anon_sym_if,
+      anon_sym_async,
+      anon_sym_for,
+      anon_sym_while,
+      anon_sym_try,
+      anon_sym_with,
+      anon_sym_match,
+      anon_sym_def,
+      anon_sym_global,
+      anon_sym_nonlocal,
+      anon_sym_exec,
+      anon_sym_type,
+      anon_sym_class,
+      anon_sym_not,
+      anon_sym_lambda,
+      anon_sym_yield,
+      sym_integer,
+      sym_identifier,
+      anon_sym_await,
+      sym_true,
+      sym_false,
+      sym_none,
+  [11814] = 21,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(258), 1,
+      sym_identifier,
+    ACTIONS(262), 1,
+      anon_sym_LPAREN,
+    ACTIONS(277), 1,
+      anon_sym_LBRACK,
+    ACTIONS(279), 1,
+      anon_sym_LBRACE,
+    ACTIONS(283), 1,
+      anon_sym_not,
+    ACTIONS(289), 1,
+      anon_sym_lambda,
+    ACTIONS(297), 1,
+      anon_sym_await,
+    ACTIONS(299), 1,
+      sym__string_start,
+    ACTIONS(706), 1,
+      anon_sym_STAR,
+    STATE(586), 1,
+      sym_string,
+    STATE(616), 1,
+      sym_primary_expression,
+    STATE(1011), 1,
+      sym_expression,
+    STATE(1153), 1,
+      sym_list_splat,
+    STATE(1458), 1,
+      sym_type,
+    ACTIONS(293), 2,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(285), 3,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_TILDE,
+    ACTIONS(295), 4,
+      sym_integer,
+      sym_true,
+      sym_false,
+      sym_none,
+    ACTIONS(269), 5,
+      anon_sym_print,
+      anon_sym_async,
+      anon_sym_match,
+      anon_sym_exec,
+      anon_sym_type,
+    STATE(883), 6,
+      sym_named_expression,
+      sym_not_operator,
+      sym_boolean_operator,
+      sym_comparison_operator,
+      sym_lambda,
+      sym_conditional_expression,
+    STATE(605), 16,
+      sym_binary_operator,
+      sym_unary_operator,
+      sym_attribute,
+      sym_subscript,
+      sym_call,
+      sym_list,
+      sym_set,
+      sym_tuple,
+      sym_dictionary,
+      sym_list_comprehension,
+      sym_dictionary_comprehension,
+      sym_set_comprehension,
+      sym_generator_expression,
+      sym_parenthesized_expression,
+      sym_concatenated_string,
+      sym_await,
+  [11908] = 21,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(258), 1,
+      sym_identifier,
+    ACTIONS(262), 1,
+      anon_sym_LPAREN,
+    ACTIONS(277), 1,
+      anon_sym_LBRACK,
+    ACTIONS(279), 1,
+      anon_sym_LBRACE,
+    ACTIONS(283), 1,
+      anon_sym_not,
+    ACTIONS(289), 1,
+      anon_sym_lambda,
+    ACTIONS(297), 1,
+      anon_sym_await,
+    ACTIONS(299), 1,
+      sym__string_start,
+    ACTIONS(706), 1,
+      anon_sym_STAR,
+    STATE(586), 1,
+      sym_string,
+    STATE(616), 1,
+      sym_primary_expression,
+    STATE(1011), 1,
+      sym_expression,
+    STATE(1153), 1,
+      sym_list_splat,
+    STATE(1420), 1,
+      sym_type,
+    ACTIONS(293), 2,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(285), 3,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_TILDE,
+    ACTIONS(295), 4,
+      sym_integer,
+      sym_true,
+      sym_false,
+      sym_none,
+    ACTIONS(269), 5,
+      anon_sym_print,
+      anon_sym_async,
+      anon_sym_match,
+      anon_sym_exec,
+      anon_sym_type,
+    STATE(883), 6,
+      sym_named_expression,
+      sym_not_operator,
+      sym_boolean_operator,
+      sym_comparison_operator,
+      sym_lambda,
+      sym_conditional_expression,
+    STATE(605), 16,
+      sym_binary_operator,
+      sym_unary_operator,
+      sym_attribute,
+      sym_subscript,
+      sym_call,
+      sym_list,
+      sym_set,
+      sym_tuple,
+      sym_dictionary,
+      sym_list_comprehension,
+      sym_dictionary_comprehension,
+      sym_set_comprehension,
+      sym_generator_expression,
+      sym_parenthesized_expression,
+      sym_concatenated_string,
+      sym_await,
+  [12002] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(924), 12,
+      sym__dedent,
+      sym__string_start,
+      anon_sym_LPAREN,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_LBRACE,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_TILDE,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(922), 38,
+      anon_sym_import,
+      anon_sym_from,
+      anon_sym_STAR,
+      anon_sym_print,
+      anon_sym_assert,
+      anon_sym_return,
+      anon_sym_del,
+      anon_sym_raise,
+      anon_sym_pass,
+      anon_sym_break,
+      anon_sym_continue,
+      anon_sym_if,
+      anon_sym_elif,
+      anon_sym_else,
+      anon_sym_async,
+      anon_sym_for,
+      anon_sym_while,
+      anon_sym_try,
+      anon_sym_except,
+      anon_sym_finally,
+      anon_sym_with,
+      anon_sym_match,
+      anon_sym_case,
+      anon_sym_def,
+      anon_sym_global,
+      anon_sym_nonlocal,
+      anon_sym_exec,
+      anon_sym_type,
+      anon_sym_class,
+      anon_sym_not,
+      anon_sym_lambda,
+      anon_sym_yield,
+      sym_integer,
+      sym_identifier,
+      anon_sym_await,
+      sym_true,
+      sym_false,
+      sym_none,
+  [12060] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(902), 12,
+      sym__dedent,
+      sym__string_start,
+      anon_sym_LPAREN,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_LBRACE,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_TILDE,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(904), 38,
+      anon_sym_import,
+      anon_sym_from,
+      anon_sym_STAR,
+      anon_sym_print,
+      anon_sym_assert,
+      anon_sym_return,
+      anon_sym_del,
+      anon_sym_raise,
+      anon_sym_pass,
+      anon_sym_break,
+      anon_sym_continue,
+      anon_sym_if,
+      anon_sym_elif,
+      anon_sym_else,
+      anon_sym_async,
+      anon_sym_for,
+      anon_sym_while,
+      anon_sym_try,
+      anon_sym_except,
+      anon_sym_finally,
+      anon_sym_with,
+      anon_sym_match,
+      anon_sym_case,
+      anon_sym_def,
+      anon_sym_global,
+      anon_sym_nonlocal,
+      anon_sym_exec,
+      anon_sym_type,
+      anon_sym_class,
+      anon_sym_not,
+      anon_sym_lambda,
+      anon_sym_yield,
+      sym_integer,
+      sym_identifier,
+      anon_sym_await,
+      sym_true,
+      sym_false,
+      sym_none,
+  [12118] = 20,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(53), 1,
+      anon_sym_STAR_STAR,
+    ACTIONS(258), 1,
+      sym_identifier,
+    ACTIONS(262), 1,
+      anon_sym_LPAREN,
+    ACTIONS(277), 1,
+      anon_sym_LBRACK,
+    ACTIONS(279), 1,
+      anon_sym_LBRACE,
+    ACTIONS(283), 1,
+      anon_sym_not,
+    ACTIONS(289), 1,
+      anon_sym_lambda,
+    ACTIONS(297), 1,
+      anon_sym_await,
+    ACTIONS(299), 1,
+      sym__string_start,
+    STATE(586), 1,
+      sym_string,
+    STATE(616), 1,
+      sym_primary_expression,
+    STATE(1142), 1,
+      sym_expression,
+    ACTIONS(293), 2,
+      sym_ellipsis,
+      sym_float,
+    STATE(1334), 2,
+      sym_dictionary_splat,
+      sym_pair,
+    ACTIONS(285), 3,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_TILDE,
+    ACTIONS(295), 4,
+      sym_integer,
+      sym_true,
+      sym_false,
+      sym_none,
+    ACTIONS(269), 5,
+      anon_sym_print,
+      anon_sym_async,
+      anon_sym_match,
+      anon_sym_exec,
+      anon_sym_type,
+    STATE(883), 6,
+      sym_named_expression,
+      sym_not_operator,
+      sym_boolean_operator,
+      sym_comparison_operator,
+      sym_lambda,
+      sym_conditional_expression,
+    STATE(605), 16,
+      sym_binary_operator,
+      sym_unary_operator,
+      sym_attribute,
+      sym_subscript,
+      sym_call,
+      sym_list,
+      sym_set,
+      sym_tuple,
+      sym_dictionary,
+      sym_list_comprehension,
+      sym_dictionary_comprehension,
+      sym_set_comprehension,
+      sym_generator_expression,
+      sym_parenthesized_expression,
+      sym_concatenated_string,
+      sym_await,
+  [12210] = 20,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(258), 1,
+      sym_identifier,
+    ACTIONS(262), 1,
+      anon_sym_LPAREN,
+    ACTIONS(277), 1,
+      anon_sym_LBRACK,
+    ACTIONS(279), 1,
+      anon_sym_LBRACE,
+    ACTIONS(283), 1,
+      anon_sym_not,
+    ACTIONS(289), 1,
+      anon_sym_lambda,
+    ACTIONS(297), 1,
+      anon_sym_await,
+    ACTIONS(299), 1,
+      sym__string_start,
+    ACTIONS(928), 1,
+      anon_sym_COLON,
+    STATE(586), 1,
+      sym_string,
+    STATE(616), 1,
+      sym_primary_expression,
+    STATE(1052), 1,
+      sym_expression,
+    ACTIONS(293), 2,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(926), 2,
+      anon_sym_COMMA,
+      anon_sym_RBRACK,
+    ACTIONS(285), 3,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_TILDE,
+    ACTIONS(295), 4,
+      sym_integer,
+      sym_true,
+      sym_false,
+      sym_none,
+    ACTIONS(269), 5,
+      anon_sym_print,
+      anon_sym_async,
+      anon_sym_match,
+      anon_sym_exec,
+      anon_sym_type,
+    STATE(883), 6,
+      sym_named_expression,
+      sym_not_operator,
+      sym_boolean_operator,
+      sym_comparison_operator,
+      sym_lambda,
+      sym_conditional_expression,
+    STATE(605), 16,
+      sym_binary_operator,
+      sym_unary_operator,
+      sym_attribute,
+      sym_subscript,
+      sym_call,
+      sym_list,
+      sym_set,
+      sym_tuple,
+      sym_dictionary,
+      sym_list_comprehension,
+      sym_dictionary_comprehension,
+      sym_set_comprehension,
+      sym_generator_expression,
+      sym_parenthesized_expression,
+      sym_concatenated_string,
+      sym_await,
+  [12302] = 8,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(842), 1,
+      anon_sym_else,
+    ACTIONS(930), 1,
+      anon_sym_elif,
+    STATE(286), 1,
+      aux_sym_if_statement_repeat1,
+    STATE(400), 1,
+      sym_elif_clause,
+    STATE(492), 1,
+      sym_else_clause,
+    ACTIONS(920), 12,
+      sym__string_start,
+      ts_builtin_sym_end,
+      anon_sym_LPAREN,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_LBRACE,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_TILDE,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(918), 33,
+      anon_sym_import,
+      anon_sym_from,
+      anon_sym_STAR,
+      anon_sym_print,
+      anon_sym_assert,
+      anon_sym_return,
+      anon_sym_del,
+      anon_sym_raise,
+      anon_sym_pass,
+      anon_sym_break,
+      anon_sym_continue,
+      anon_sym_if,
+      anon_sym_async,
+      anon_sym_for,
+      anon_sym_while,
+      anon_sym_try,
+      anon_sym_with,
+      anon_sym_match,
+      anon_sym_def,
+      anon_sym_global,
+      anon_sym_nonlocal,
+      anon_sym_exec,
+      anon_sym_type,
+      anon_sym_class,
+      anon_sym_not,
+      anon_sym_lambda,
+      anon_sym_yield,
+      sym_integer,
+      sym_identifier,
+      anon_sym_await,
+      sym_true,
+      sym_false,
+      sym_none,
+  [12370] = 8,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(822), 1,
+      anon_sym_else,
+    ACTIONS(914), 1,
+      anon_sym_elif,
+    STATE(318), 1,
+      aux_sym_if_statement_repeat1,
+    STATE(368), 1,
+      sym_elif_clause,
+    STATE(574), 1,
+      sym_else_clause,
+    ACTIONS(934), 12,
+      sym__dedent,
+      sym__string_start,
+      anon_sym_LPAREN,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_LBRACE,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_TILDE,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(932), 33,
+      anon_sym_import,
+      anon_sym_from,
+      anon_sym_STAR,
+      anon_sym_print,
+      anon_sym_assert,
+      anon_sym_return,
+      anon_sym_del,
+      anon_sym_raise,
+      anon_sym_pass,
+      anon_sym_break,
+      anon_sym_continue,
+      anon_sym_if,
+      anon_sym_async,
+      anon_sym_for,
+      anon_sym_while,
+      anon_sym_try,
+      anon_sym_with,
+      anon_sym_match,
+      anon_sym_def,
+      anon_sym_global,
+      anon_sym_nonlocal,
+      anon_sym_exec,
+      anon_sym_type,
+      anon_sym_class,
+      anon_sym_not,
+      anon_sym_lambda,
+      anon_sym_yield,
+      sym_integer,
+      sym_identifier,
+      anon_sym_await,
+      sym_true,
+      sym_false,
+      sym_none,
+  [12438] = 8,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(822), 1,
+      anon_sym_else,
+    ACTIONS(914), 1,
+      anon_sym_elif,
+    STATE(268), 1,
+      aux_sym_if_statement_repeat1,
+    STATE(368), 1,
+      sym_elif_clause,
+    STATE(573), 1,
+      sym_else_clause,
+    ACTIONS(938), 12,
+      sym__dedent,
+      sym__string_start,
+      anon_sym_LPAREN,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_LBRACE,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_TILDE,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(936), 33,
+      anon_sym_import,
+      anon_sym_from,
+      anon_sym_STAR,
+      anon_sym_print,
+      anon_sym_assert,
+      anon_sym_return,
+      anon_sym_del,
+      anon_sym_raise,
+      anon_sym_pass,
+      anon_sym_break,
+      anon_sym_continue,
+      anon_sym_if,
+      anon_sym_async,
+      anon_sym_for,
+      anon_sym_while,
+      anon_sym_try,
+      anon_sym_with,
+      anon_sym_match,
+      anon_sym_def,
+      anon_sym_global,
+      anon_sym_nonlocal,
+      anon_sym_exec,
+      anon_sym_type,
+      anon_sym_class,
+      anon_sym_not,
+      anon_sym_lambda,
+      anon_sym_yield,
+      sym_integer,
+      sym_identifier,
+      anon_sym_await,
+      sym_true,
+      sym_false,
+      sym_none,
+  [12506] = 21,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(258), 1,
+      sym_identifier,
+    ACTIONS(262), 1,
+      anon_sym_LPAREN,
+    ACTIONS(277), 1,
+      anon_sym_LBRACK,
+    ACTIONS(279), 1,
+      anon_sym_LBRACE,
+    ACTIONS(283), 1,
+      anon_sym_not,
+    ACTIONS(289), 1,
+      anon_sym_lambda,
+    ACTIONS(297), 1,
+      anon_sym_await,
+    ACTIONS(299), 1,
+      sym__string_start,
+    ACTIONS(706), 1,
+      anon_sym_STAR,
+    STATE(586), 1,
+      sym_string,
+    STATE(616), 1,
+      sym_primary_expression,
+    STATE(1011), 1,
+      sym_expression,
+    STATE(1153), 1,
+      sym_list_splat,
+    STATE(1474), 1,
+      sym_type,
+    ACTIONS(293), 2,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(285), 3,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_TILDE,
+    ACTIONS(295), 4,
+      sym_integer,
+      sym_true,
+      sym_false,
+      sym_none,
+    ACTIONS(269), 5,
+      anon_sym_print,
+      anon_sym_async,
+      anon_sym_match,
+      anon_sym_exec,
+      anon_sym_type,
+    STATE(883), 6,
+      sym_named_expression,
+      sym_not_operator,
+      sym_boolean_operator,
+      sym_comparison_operator,
+      sym_lambda,
+      sym_conditional_expression,
+    STATE(605), 16,
+      sym_binary_operator,
+      sym_unary_operator,
+      sym_attribute,
+      sym_subscript,
+      sym_call,
+      sym_list,
+      sym_set,
+      sym_tuple,
+      sym_dictionary,
+      sym_list_comprehension,
+      sym_dictionary_comprehension,
+      sym_set_comprehension,
+      sym_generator_expression,
+      sym_parenthesized_expression,
+      sym_concatenated_string,
+      sym_await,
+  [12600] = 21,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(258), 1,
+      sym_identifier,
+    ACTIONS(262), 1,
+      anon_sym_LPAREN,
+    ACTIONS(277), 1,
+      anon_sym_LBRACK,
+    ACTIONS(279), 1,
+      anon_sym_LBRACE,
+    ACTIONS(283), 1,
+      anon_sym_not,
+    ACTIONS(289), 1,
+      anon_sym_lambda,
+    ACTIONS(297), 1,
+      anon_sym_await,
+    ACTIONS(299), 1,
+      sym__string_start,
+    ACTIONS(706), 1,
+      anon_sym_STAR,
+    STATE(586), 1,
+      sym_string,
+    STATE(616), 1,
+      sym_primary_expression,
+    STATE(1011), 1,
+      sym_expression,
+    STATE(1153), 1,
+      sym_list_splat,
+    STATE(1171), 1,
+      sym_type,
+    ACTIONS(293), 2,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(285), 3,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_TILDE,
+    ACTIONS(295), 4,
+      sym_integer,
+      sym_true,
+      sym_false,
+      sym_none,
+    ACTIONS(269), 5,
+      anon_sym_print,
+      anon_sym_async,
+      anon_sym_match,
+      anon_sym_exec,
+      anon_sym_type,
+    STATE(883), 6,
+      sym_named_expression,
+      sym_not_operator,
+      sym_boolean_operator,
+      sym_comparison_operator,
+      sym_lambda,
+      sym_conditional_expression,
+    STATE(605), 16,
+      sym_binary_operator,
+      sym_unary_operator,
+      sym_attribute,
+      sym_subscript,
+      sym_call,
+      sym_list,
+      sym_set,
+      sym_tuple,
+      sym_dictionary,
+      sym_list_comprehension,
+      sym_dictionary_comprehension,
+      sym_set_comprehension,
+      sym_generator_expression,
+      sym_parenthesized_expression,
+      sym_concatenated_string,
+      sym_await,
+  [12694] = 5,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(944), 1,
+      anon_sym_except,
+    STATE(284), 2,
+      sym_except_clause,
+      aux_sym_try_statement_repeat1,
+    ACTIONS(942), 12,
+      sym__dedent,
+      sym__string_start,
+      anon_sym_LPAREN,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_LBRACE,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_TILDE,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(940), 35,
+      anon_sym_import,
+      anon_sym_from,
+      anon_sym_STAR,
+      anon_sym_print,
+      anon_sym_assert,
+      anon_sym_return,
+      anon_sym_del,
+      anon_sym_raise,
+      anon_sym_pass,
+      anon_sym_break,
+      anon_sym_continue,
+      anon_sym_if,
+      anon_sym_else,
+      anon_sym_async,
+      anon_sym_for,
+      anon_sym_while,
+      anon_sym_try,
+      anon_sym_finally,
+      anon_sym_with,
+      anon_sym_match,
+      anon_sym_def,
+      anon_sym_global,
+      anon_sym_nonlocal,
+      anon_sym_exec,
+      anon_sym_type,
+      anon_sym_class,
+      anon_sym_not,
+      anon_sym_lambda,
+      anon_sym_yield,
+      sym_integer,
+      sym_identifier,
+      anon_sym_await,
+      sym_true,
+      sym_false,
+      sym_none,
+  [12756] = 5,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(951), 1,
+      anon_sym_except,
+    STATE(285), 2,
+      sym_except_group_clause,
+      aux_sym_try_statement_repeat2,
+    ACTIONS(949), 12,
+      sym__dedent,
+      sym__string_start,
+      anon_sym_LPAREN,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_LBRACE,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_TILDE,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(947), 35,
+      anon_sym_import,
+      anon_sym_from,
+      anon_sym_STAR,
+      anon_sym_print,
+      anon_sym_assert,
+      anon_sym_return,
+      anon_sym_del,
+      anon_sym_raise,
+      anon_sym_pass,
+      anon_sym_break,
+      anon_sym_continue,
+      anon_sym_if,
+      anon_sym_else,
+      anon_sym_async,
+      anon_sym_for,
+      anon_sym_while,
+      anon_sym_try,
+      anon_sym_finally,
+      anon_sym_with,
+      anon_sym_match,
+      anon_sym_def,
+      anon_sym_global,
+      anon_sym_nonlocal,
+      anon_sym_exec,
+      anon_sym_type,
+      anon_sym_class,
+      anon_sym_not,
+      anon_sym_lambda,
+      anon_sym_yield,
+      sym_integer,
+      sym_identifier,
+      anon_sym_await,
+      sym_true,
+      sym_false,
+      sym_none,
+  [12818] = 8,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(842), 1,
+      anon_sym_else,
+    ACTIONS(930), 1,
+      anon_sym_elif,
+    STATE(304), 1,
+      aux_sym_if_statement_repeat1,
+    STATE(400), 1,
+      sym_elif_clause,
+    STATE(499), 1,
+      sym_else_clause,
+    ACTIONS(934), 12,
+      sym__string_start,
+      ts_builtin_sym_end,
+      anon_sym_LPAREN,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_LBRACE,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_TILDE,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(932), 33,
+      anon_sym_import,
+      anon_sym_from,
+      anon_sym_STAR,
+      anon_sym_print,
+      anon_sym_assert,
+      anon_sym_return,
+      anon_sym_del,
+      anon_sym_raise,
+      anon_sym_pass,
+      anon_sym_break,
+      anon_sym_continue,
+      anon_sym_if,
+      anon_sym_async,
+      anon_sym_for,
+      anon_sym_while,
+      anon_sym_try,
+      anon_sym_with,
+      anon_sym_match,
+      anon_sym_def,
+      anon_sym_global,
+      anon_sym_nonlocal,
+      anon_sym_exec,
+      anon_sym_type,
+      anon_sym_class,
+      anon_sym_not,
+      anon_sym_lambda,
+      anon_sym_yield,
+      sym_integer,
+      sym_identifier,
+      anon_sym_await,
+      sym_true,
+      sym_false,
+      sym_none,
+  [12886] = 8,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(842), 1,
+      anon_sym_else,
+    ACTIONS(930), 1,
+      anon_sym_elif,
+    STATE(304), 1,
+      aux_sym_if_statement_repeat1,
+    STATE(400), 1,
+      sym_elif_clause,
+    STATE(540), 1,
+      sym_else_clause,
+    ACTIONS(912), 12,
+      sym__string_start,
+      ts_builtin_sym_end,
+      anon_sym_LPAREN,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_LBRACE,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_TILDE,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(910), 33,
+      anon_sym_import,
+      anon_sym_from,
+      anon_sym_STAR,
+      anon_sym_print,
+      anon_sym_assert,
+      anon_sym_return,
+      anon_sym_del,
+      anon_sym_raise,
+      anon_sym_pass,
+      anon_sym_break,
+      anon_sym_continue,
+      anon_sym_if,
+      anon_sym_async,
+      anon_sym_for,
+      anon_sym_while,
+      anon_sym_try,
+      anon_sym_with,
+      anon_sym_match,
+      anon_sym_def,
+      anon_sym_global,
+      anon_sym_nonlocal,
+      anon_sym_exec,
+      anon_sym_type,
+      anon_sym_class,
+      anon_sym_not,
+      anon_sym_lambda,
+      anon_sym_yield,
+      sym_integer,
+      sym_identifier,
+      anon_sym_await,
+      sym_true,
+      sym_false,
+      sym_none,
+  [12954] = 21,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(258), 1,
+      sym_identifier,
+    ACTIONS(262), 1,
+      anon_sym_LPAREN,
+    ACTIONS(277), 1,
+      anon_sym_LBRACK,
+    ACTIONS(279), 1,
+      anon_sym_LBRACE,
+    ACTIONS(283), 1,
+      anon_sym_not,
+    ACTIONS(289), 1,
+      anon_sym_lambda,
+    ACTIONS(297), 1,
+      anon_sym_await,
+    ACTIONS(299), 1,
+      sym__string_start,
+    ACTIONS(706), 1,
+      anon_sym_STAR,
+    STATE(586), 1,
+      sym_string,
+    STATE(616), 1,
+      sym_primary_expression,
+    STATE(1011), 1,
+      sym_expression,
+    STATE(1153), 1,
+      sym_list_splat,
+    STATE(1312), 1,
+      sym_type,
+    ACTIONS(293), 2,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(285), 3,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_TILDE,
+    ACTIONS(295), 4,
+      sym_integer,
+      sym_true,
+      sym_false,
+      sym_none,
+    ACTIONS(269), 5,
+      anon_sym_print,
+      anon_sym_async,
+      anon_sym_match,
+      anon_sym_exec,
+      anon_sym_type,
+    STATE(883), 6,
+      sym_named_expression,
+      sym_not_operator,
+      sym_boolean_operator,
+      sym_comparison_operator,
+      sym_lambda,
+      sym_conditional_expression,
+    STATE(605), 16,
+      sym_binary_operator,
+      sym_unary_operator,
+      sym_attribute,
+      sym_subscript,
+      sym_call,
+      sym_list,
+      sym_set,
+      sym_tuple,
+      sym_dictionary,
+      sym_list_comprehension,
+      sym_dictionary_comprehension,
+      sym_set_comprehension,
+      sym_generator_expression,
+      sym_parenthesized_expression,
+      sym_concatenated_string,
+      sym_await,
+  [13048] = 8,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(842), 1,
+      anon_sym_else,
+    ACTIONS(930), 1,
+      anon_sym_elif,
+    STATE(287), 1,
+      aux_sym_if_statement_repeat1,
+    STATE(400), 1,
+      sym_elif_clause,
+    STATE(494), 1,
+      sym_else_clause,
+    ACTIONS(938), 12,
+      sym__string_start,
+      ts_builtin_sym_end,
+      anon_sym_LPAREN,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_LBRACE,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_TILDE,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(936), 33,
+      anon_sym_import,
+      anon_sym_from,
+      anon_sym_STAR,
+      anon_sym_print,
+      anon_sym_assert,
+      anon_sym_return,
+      anon_sym_del,
+      anon_sym_raise,
+      anon_sym_pass,
+      anon_sym_break,
+      anon_sym_continue,
+      anon_sym_if,
+      anon_sym_async,
+      anon_sym_for,
+      anon_sym_while,
+      anon_sym_try,
+      anon_sym_with,
+      anon_sym_match,
+      anon_sym_def,
+      anon_sym_global,
+      anon_sym_nonlocal,
+      anon_sym_exec,
+      anon_sym_type,
+      anon_sym_class,
+      anon_sym_not,
+      anon_sym_lambda,
+      anon_sym_yield,
+      sym_integer,
+      sym_identifier,
+      anon_sym_await,
+      sym_true,
+      sym_false,
+      sym_none,
+  [13116] = 21,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(258), 1,
+      sym_identifier,
+    ACTIONS(262), 1,
+      anon_sym_LPAREN,
+    ACTIONS(277), 1,
+      anon_sym_LBRACK,
+    ACTIONS(279), 1,
+      anon_sym_LBRACE,
+    ACTIONS(283), 1,
+      anon_sym_not,
+    ACTIONS(289), 1,
+      anon_sym_lambda,
+    ACTIONS(297), 1,
+      anon_sym_await,
+    ACTIONS(299), 1,
+      sym__string_start,
+    ACTIONS(706), 1,
+      anon_sym_STAR,
+    STATE(586), 1,
+      sym_string,
+    STATE(616), 1,
+      sym_primary_expression,
+    STATE(1011), 1,
+      sym_expression,
+    STATE(1153), 1,
+      sym_list_splat,
+    STATE(1472), 1,
+      sym_type,
+    ACTIONS(293), 2,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(285), 3,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_TILDE,
+    ACTIONS(295), 4,
+      sym_integer,
+      sym_true,
+      sym_false,
+      sym_none,
+    ACTIONS(269), 5,
+      anon_sym_print,
+      anon_sym_async,
+      anon_sym_match,
+      anon_sym_exec,
+      anon_sym_type,
+    STATE(883), 6,
+      sym_named_expression,
+      sym_not_operator,
+      sym_boolean_operator,
+      sym_comparison_operator,
+      sym_lambda,
+      sym_conditional_expression,
+    STATE(605), 16,
+      sym_binary_operator,
+      sym_unary_operator,
+      sym_attribute,
+      sym_subscript,
+      sym_call,
+      sym_list,
+      sym_set,
+      sym_tuple,
+      sym_dictionary,
+      sym_list_comprehension,
+      sym_dictionary_comprehension,
+      sym_set_comprehension,
+      sym_generator_expression,
+      sym_parenthesized_expression,
+      sym_concatenated_string,
+      sym_await,
+  [13210] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(954), 12,
+      sym__string_start,
+      ts_builtin_sym_end,
+      anon_sym_LPAREN,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_LBRACE,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_TILDE,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(956), 38,
+      anon_sym_import,
+      anon_sym_from,
+      anon_sym_STAR,
+      anon_sym_print,
+      anon_sym_assert,
+      anon_sym_return,
+      anon_sym_del,
+      anon_sym_raise,
+      anon_sym_pass,
+      anon_sym_break,
+      anon_sym_continue,
+      anon_sym_if,
+      anon_sym_elif,
+      anon_sym_else,
+      anon_sym_async,
+      anon_sym_for,
+      anon_sym_while,
+      anon_sym_try,
+      anon_sym_except,
+      anon_sym_finally,
+      anon_sym_with,
+      anon_sym_match,
+      anon_sym_case,
+      anon_sym_def,
+      anon_sym_global,
+      anon_sym_nonlocal,
+      anon_sym_exec,
+      anon_sym_type,
+      anon_sym_class,
+      anon_sym_not,
+      anon_sym_lambda,
+      anon_sym_yield,
+      sym_integer,
+      sym_identifier,
+      anon_sym_await,
+      sym_true,
+      sym_false,
+      sym_none,
+  [13268] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(894), 12,
+      sym__string_start,
+      ts_builtin_sym_end,
+      anon_sym_LPAREN,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_LBRACE,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_TILDE,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(892), 38,
+      anon_sym_import,
+      anon_sym_from,
+      anon_sym_STAR,
+      anon_sym_print,
+      anon_sym_assert,
+      anon_sym_return,
+      anon_sym_del,
+      anon_sym_raise,
+      anon_sym_pass,
+      anon_sym_break,
+      anon_sym_continue,
+      anon_sym_if,
+      anon_sym_elif,
+      anon_sym_else,
+      anon_sym_async,
+      anon_sym_for,
+      anon_sym_while,
+      anon_sym_try,
+      anon_sym_except,
+      anon_sym_finally,
+      anon_sym_with,
+      anon_sym_match,
+      anon_sym_case,
+      anon_sym_def,
+      anon_sym_global,
+      anon_sym_nonlocal,
+      anon_sym_exec,
+      anon_sym_type,
+      anon_sym_class,
+      anon_sym_not,
+      anon_sym_lambda,
+      anon_sym_yield,
+      sym_integer,
+      sym_identifier,
+      anon_sym_await,
+      sym_true,
+      sym_false,
+      sym_none,
+  [13326] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(896), 12,
+      sym__dedent,
+      sym__string_start,
+      anon_sym_LPAREN,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_LBRACE,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_TILDE,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(898), 38,
+      anon_sym_import,
+      anon_sym_from,
+      anon_sym_STAR,
+      anon_sym_print,
+      anon_sym_assert,
+      anon_sym_return,
+      anon_sym_del,
+      anon_sym_raise,
+      anon_sym_pass,
+      anon_sym_break,
+      anon_sym_continue,
+      anon_sym_if,
+      anon_sym_elif,
+      anon_sym_else,
+      anon_sym_async,
+      anon_sym_for,
+      anon_sym_while,
+      anon_sym_try,
+      anon_sym_except,
+      anon_sym_finally,
+      anon_sym_with,
+      anon_sym_match,
+      anon_sym_case,
+      anon_sym_def,
+      anon_sym_global,
+      anon_sym_nonlocal,
+      anon_sym_exec,
+      anon_sym_type,
+      anon_sym_class,
+      anon_sym_not,
+      anon_sym_lambda,
+      anon_sym_yield,
+      sym_integer,
+      sym_identifier,
+      anon_sym_await,
+      sym_true,
+      sym_false,
+      sym_none,
+  [13384] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(954), 12,
+      sym__dedent,
+      sym__string_start,
+      anon_sym_LPAREN,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_LBRACE,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_TILDE,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(956), 38,
+      anon_sym_import,
+      anon_sym_from,
+      anon_sym_STAR,
+      anon_sym_print,
+      anon_sym_assert,
+      anon_sym_return,
+      anon_sym_del,
+      anon_sym_raise,
+      anon_sym_pass,
+      anon_sym_break,
+      anon_sym_continue,
+      anon_sym_if,
+      anon_sym_elif,
+      anon_sym_else,
+      anon_sym_async,
+      anon_sym_for,
+      anon_sym_while,
+      anon_sym_try,
+      anon_sym_except,
+      anon_sym_finally,
+      anon_sym_with,
+      anon_sym_match,
+      anon_sym_case,
+      anon_sym_def,
+      anon_sym_global,
+      anon_sym_nonlocal,
+      anon_sym_exec,
+      anon_sym_type,
+      anon_sym_class,
+      anon_sym_not,
+      anon_sym_lambda,
+      anon_sym_yield,
+      sym_integer,
+      sym_identifier,
+      anon_sym_await,
+      sym_true,
+      sym_false,
+      sym_none,
+  [13442] = 21,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(258), 1,
+      sym_identifier,
+    ACTIONS(262), 1,
+      anon_sym_LPAREN,
+    ACTIONS(277), 1,
+      anon_sym_LBRACK,
+    ACTIONS(279), 1,
+      anon_sym_LBRACE,
+    ACTIONS(283), 1,
+      anon_sym_not,
+    ACTIONS(289), 1,
+      anon_sym_lambda,
+    ACTIONS(297), 1,
+      anon_sym_await,
+    ACTIONS(299), 1,
+      sym__string_start,
+    ACTIONS(706), 1,
+      anon_sym_STAR,
+    STATE(586), 1,
+      sym_string,
+    STATE(616), 1,
+      sym_primary_expression,
+    STATE(1011), 1,
+      sym_expression,
+    STATE(1153), 1,
+      sym_list_splat,
+    STATE(1461), 1,
+      sym_type,
+    ACTIONS(293), 2,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(285), 3,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_TILDE,
+    ACTIONS(295), 4,
+      sym_integer,
+      sym_true,
+      sym_false,
+      sym_none,
+    ACTIONS(269), 5,
+      anon_sym_print,
+      anon_sym_async,
+      anon_sym_match,
+      anon_sym_exec,
+      anon_sym_type,
+    STATE(883), 6,
+      sym_named_expression,
+      sym_not_operator,
+      sym_boolean_operator,
+      sym_comparison_operator,
+      sym_lambda,
+      sym_conditional_expression,
+    STATE(605), 16,
+      sym_binary_operator,
+      sym_unary_operator,
+      sym_attribute,
+      sym_subscript,
+      sym_call,
+      sym_list,
+      sym_set,
+      sym_tuple,
+      sym_dictionary,
+      sym_list_comprehension,
+      sym_dictionary_comprehension,
+      sym_set_comprehension,
+      sym_generator_expression,
+      sym_parenthesized_expression,
+      sym_concatenated_string,
+      sym_await,
+  [13536] = 5,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(958), 1,
+      anon_sym_except,
+    STATE(296), 2,
+      sym_except_group_clause,
+      aux_sym_try_statement_repeat2,
+    ACTIONS(949), 12,
+      sym__string_start,
+      ts_builtin_sym_end,
+      anon_sym_LPAREN,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_LBRACE,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_TILDE,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(947), 35,
+      anon_sym_import,
+      anon_sym_from,
+      anon_sym_STAR,
+      anon_sym_print,
+      anon_sym_assert,
+      anon_sym_return,
+      anon_sym_del,
+      anon_sym_raise,
+      anon_sym_pass,
+      anon_sym_break,
+      anon_sym_continue,
+      anon_sym_if,
+      anon_sym_else,
+      anon_sym_async,
+      anon_sym_for,
+      anon_sym_while,
+      anon_sym_try,
+      anon_sym_finally,
+      anon_sym_with,
+      anon_sym_match,
+      anon_sym_def,
+      anon_sym_global,
+      anon_sym_nonlocal,
+      anon_sym_exec,
+      anon_sym_type,
+      anon_sym_class,
+      anon_sym_not,
+      anon_sym_lambda,
+      anon_sym_yield,
+      sym_integer,
+      sym_identifier,
+      anon_sym_await,
+      sym_true,
+      sym_false,
+      sym_none,
+  [13598] = 5,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(961), 1,
+      anon_sym_except,
+    STATE(297), 2,
+      sym_except_clause,
+      aux_sym_try_statement_repeat1,
+    ACTIONS(942), 12,
+      sym__string_start,
+      ts_builtin_sym_end,
+      anon_sym_LPAREN,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_LBRACE,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_TILDE,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(940), 35,
+      anon_sym_import,
+      anon_sym_from,
+      anon_sym_STAR,
+      anon_sym_print,
+      anon_sym_assert,
+      anon_sym_return,
+      anon_sym_del,
+      anon_sym_raise,
+      anon_sym_pass,
+      anon_sym_break,
+      anon_sym_continue,
+      anon_sym_if,
+      anon_sym_else,
+      anon_sym_async,
+      anon_sym_for,
+      anon_sym_while,
+      anon_sym_try,
+      anon_sym_finally,
+      anon_sym_with,
+      anon_sym_match,
+      anon_sym_def,
+      anon_sym_global,
+      anon_sym_nonlocal,
+      anon_sym_exec,
+      anon_sym_type,
+      anon_sym_class,
+      anon_sym_not,
+      anon_sym_lambda,
+      anon_sym_yield,
+      sym_integer,
+      sym_identifier,
+      anon_sym_await,
+      sym_true,
+      sym_false,
+      sym_none,
+  [13660] = 21,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(258), 1,
+      sym_identifier,
+    ACTIONS(262), 1,
+      anon_sym_LPAREN,
+    ACTIONS(277), 1,
+      anon_sym_LBRACK,
+    ACTIONS(279), 1,
+      anon_sym_LBRACE,
+    ACTIONS(283), 1,
+      anon_sym_not,
+    ACTIONS(289), 1,
+      anon_sym_lambda,
+    ACTIONS(297), 1,
+      anon_sym_await,
+    ACTIONS(299), 1,
+      sym__string_start,
+    ACTIONS(706), 1,
+      anon_sym_STAR,
+    STATE(586), 1,
+      sym_string,
+    STATE(616), 1,
+      sym_primary_expression,
+    STATE(1011), 1,
+      sym_expression,
+    STATE(1153), 1,
+      sym_list_splat,
+    STATE(1462), 1,
+      sym_type,
+    ACTIONS(293), 2,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(285), 3,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_TILDE,
+    ACTIONS(295), 4,
+      sym_integer,
+      sym_true,
+      sym_false,
+      sym_none,
+    ACTIONS(269), 5,
+      anon_sym_print,
+      anon_sym_async,
+      anon_sym_match,
+      anon_sym_exec,
+      anon_sym_type,
+    STATE(883), 6,
+      sym_named_expression,
+      sym_not_operator,
+      sym_boolean_operator,
+      sym_comparison_operator,
+      sym_lambda,
+      sym_conditional_expression,
+    STATE(605), 16,
+      sym_binary_operator,
+      sym_unary_operator,
+      sym_attribute,
+      sym_subscript,
+      sym_call,
+      sym_list,
+      sym_set,
+      sym_tuple,
+      sym_dictionary,
+      sym_list_comprehension,
+      sym_dictionary_comprehension,
+      sym_set_comprehension,
+      sym_generator_expression,
+      sym_parenthesized_expression,
+      sym_concatenated_string,
+      sym_await,
+  [13754] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(924), 12,
+      sym__string_start,
+      ts_builtin_sym_end,
+      anon_sym_LPAREN,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_LBRACE,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_TILDE,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(922), 38,
+      anon_sym_import,
+      anon_sym_from,
+      anon_sym_STAR,
+      anon_sym_print,
+      anon_sym_assert,
+      anon_sym_return,
+      anon_sym_del,
+      anon_sym_raise,
+      anon_sym_pass,
+      anon_sym_break,
+      anon_sym_continue,
+      anon_sym_if,
+      anon_sym_elif,
+      anon_sym_else,
+      anon_sym_async,
+      anon_sym_for,
+      anon_sym_while,
+      anon_sym_try,
+      anon_sym_except,
+      anon_sym_finally,
+      anon_sym_with,
+      anon_sym_match,
+      anon_sym_case,
+      anon_sym_def,
+      anon_sym_global,
+      anon_sym_nonlocal,
+      anon_sym_exec,
+      anon_sym_type,
+      anon_sym_class,
+      anon_sym_not,
+      anon_sym_lambda,
+      anon_sym_yield,
+      sym_integer,
+      sym_identifier,
+      anon_sym_await,
+      sym_true,
+      sym_false,
+      sym_none,
+  [13812] = 19,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(258), 1,
+      sym_identifier,
+    ACTIONS(262), 1,
+      anon_sym_LPAREN,
+    ACTIONS(277), 1,
+      anon_sym_LBRACK,
+    ACTIONS(279), 1,
+      anon_sym_LBRACE,
+    ACTIONS(283), 1,
+      anon_sym_not,
+    ACTIONS(289), 1,
+      anon_sym_lambda,
+    ACTIONS(297), 1,
+      anon_sym_await,
+    ACTIONS(299), 1,
+      sym__string_start,
+    STATE(586), 1,
+      sym_string,
+    STATE(616), 1,
+      sym_primary_expression,
+    STATE(1076), 1,
+      sym_expression,
+    ACTIONS(293), 2,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(964), 2,
+      anon_sym_COMMA,
+      anon_sym_RBRACK,
+    ACTIONS(285), 3,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_TILDE,
+    ACTIONS(295), 4,
+      sym_integer,
+      sym_true,
+      sym_false,
+      sym_none,
+    ACTIONS(269), 5,
+      anon_sym_print,
+      anon_sym_async,
+      anon_sym_match,
+      anon_sym_exec,
+      anon_sym_type,
+    STATE(883), 6,
+      sym_named_expression,
+      sym_not_operator,
+      sym_boolean_operator,
+      sym_comparison_operator,
+      sym_lambda,
+      sym_conditional_expression,
+    STATE(605), 16,
+      sym_binary_operator,
+      sym_unary_operator,
+      sym_attribute,
+      sym_subscript,
+      sym_call,
+      sym_list,
+      sym_set,
+      sym_tuple,
+      sym_dictionary,
+      sym_list_comprehension,
+      sym_dictionary_comprehension,
+      sym_set_comprehension,
+      sym_generator_expression,
+      sym_parenthesized_expression,
+      sym_concatenated_string,
+      sym_await,
+  [13901] = 19,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(51), 1,
+      anon_sym_LBRACE,
+    ACTIONS(69), 1,
+      anon_sym_not,
+    ACTIONS(71), 1,
+      anon_sym_lambda,
+    ACTIONS(81), 1,
+      sym__string_start,
+    ACTIONS(327), 1,
+      sym_identifier,
+    ACTIONS(333), 1,
+      anon_sym_await,
+    ACTIONS(568), 1,
+      anon_sym_LPAREN,
+    ACTIONS(574), 1,
+      anon_sym_LBRACK,
+    STATE(707), 1,
+      sym_primary_expression,
+    STATE(709), 1,
+      sym_string,
+    STATE(1060), 1,
+      sym_expression,
+    ACTIONS(75), 2,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(966), 2,
+      sym__newline,
+      sym__semicolon,
+    ACTIONS(47), 3,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_TILDE,
+    ACTIONS(77), 4,
+      sym_integer,
+      sym_true,
+      sym_false,
+      sym_none,
+    ACTIONS(329), 5,
+      anon_sym_print,
+      anon_sym_async,
+      anon_sym_match,
+      anon_sym_exec,
+      anon_sym_type,
+    STATE(985), 6,
+      sym_named_expression,
+      sym_not_operator,
+      sym_boolean_operator,
+      sym_comparison_operator,
+      sym_lambda,
+      sym_conditional_expression,
+    STATE(759), 16,
+      sym_binary_operator,
+      sym_unary_operator,
+      sym_attribute,
+      sym_subscript,
+      sym_call,
+      sym_list,
+      sym_set,
+      sym_tuple,
+      sym_dictionary,
+      sym_list_comprehension,
+      sym_dictionary_comprehension,
+      sym_set_comprehension,
+      sym_generator_expression,
+      sym_parenthesized_expression,
+      sym_concatenated_string,
+      sym_await,
+  [13990] = 19,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(279), 1,
       anon_sym_LBRACE,
     ACTIONS(299), 1,
-      anon_sym_not,
-    ACTIONS(305), 1,
-      anon_sym_lambda,
-    ACTIONS(313), 1,
-      anon_sym_await,
-    ACTIONS(315), 1,
       sym__string_start,
-    STATE(600), 1,
+    ACTIONS(578), 1,
+      anon_sym_LPAREN,
+    ACTIONS(584), 1,
+      anon_sym_LBRACK,
+    ACTIONS(626), 1,
+      anon_sym_not,
+    ACTIONS(668), 1,
+      sym_identifier,
+    ACTIONS(678), 1,
+      anon_sym_await,
+    ACTIONS(760), 1,
+      anon_sym_lambda,
+    STATE(586), 1,
       sym_string,
-    STATE(630), 1,
+    STATE(590), 1,
       sym_primary_expression,
-    STATE(1103), 1,
+    STATE(936), 1,
       sym_expression,
-    ACTIONS(309), 2,
+    ACTIONS(293), 2,
+      sym_ellipsis,
+      sym_float,
+    STATE(1034), 2,
+      sym__expression_within_for_in_clause,
+      sym_lambda_within_for_in_clause,
+    ACTIONS(582), 3,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_TILDE,
+    ACTIONS(295), 4,
+      sym_integer,
+      sym_true,
+      sym_false,
+      sym_none,
+    ACTIONS(674), 5,
+      anon_sym_print,
+      anon_sym_async,
+      anon_sym_match,
+      anon_sym_exec,
+      anon_sym_type,
+    STATE(883), 6,
+      sym_named_expression,
+      sym_not_operator,
+      sym_boolean_operator,
+      sym_comparison_operator,
+      sym_lambda,
+      sym_conditional_expression,
+    STATE(605), 16,
+      sym_binary_operator,
+      sym_unary_operator,
+      sym_attribute,
+      sym_subscript,
+      sym_call,
+      sym_list,
+      sym_set,
+      sym_tuple,
+      sym_dictionary,
+      sym_list_comprehension,
+      sym_dictionary_comprehension,
+      sym_set_comprehension,
+      sym_generator_expression,
+      sym_parenthesized_expression,
+      sym_concatenated_string,
+      sym_await,
+  [14079] = 19,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(279), 1,
+      anon_sym_LBRACE,
+    ACTIONS(299), 1,
+      sym__string_start,
+    ACTIONS(578), 1,
+      anon_sym_LPAREN,
+    ACTIONS(584), 1,
+      anon_sym_LBRACK,
+    ACTIONS(626), 1,
+      anon_sym_not,
+    ACTIONS(668), 1,
+      sym_identifier,
+    ACTIONS(678), 1,
+      anon_sym_await,
+    ACTIONS(760), 1,
+      anon_sym_lambda,
+    STATE(586), 1,
+      sym_string,
+    STATE(590), 1,
+      sym_primary_expression,
+    STATE(935), 1,
+      sym_expression,
+    ACTIONS(293), 2,
+      sym_ellipsis,
+      sym_float,
+    STATE(980), 2,
+      sym__expression_within_for_in_clause,
+      sym_lambda_within_for_in_clause,
+    ACTIONS(582), 3,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_TILDE,
+    ACTIONS(295), 4,
+      sym_integer,
+      sym_true,
+      sym_false,
+      sym_none,
+    ACTIONS(674), 5,
+      anon_sym_print,
+      anon_sym_async,
+      anon_sym_match,
+      anon_sym_exec,
+      anon_sym_type,
+    STATE(883), 6,
+      sym_named_expression,
+      sym_not_operator,
+      sym_boolean_operator,
+      sym_comparison_operator,
+      sym_lambda,
+      sym_conditional_expression,
+    STATE(605), 16,
+      sym_binary_operator,
+      sym_unary_operator,
+      sym_attribute,
+      sym_subscript,
+      sym_call,
+      sym_list,
+      sym_set,
+      sym_tuple,
+      sym_dictionary,
+      sym_list_comprehension,
+      sym_dictionary_comprehension,
+      sym_set_comprehension,
+      sym_generator_expression,
+      sym_parenthesized_expression,
+      sym_concatenated_string,
+      sym_await,
+  [14168] = 6,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(972), 1,
+      anon_sym_elif,
+    STATE(304), 1,
+      aux_sym_if_statement_repeat1,
+    STATE(400), 1,
+      sym_elif_clause,
+    ACTIONS(968), 12,
+      sym__string_start,
+      ts_builtin_sym_end,
+      anon_sym_LPAREN,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_LBRACE,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_TILDE,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(970), 34,
+      anon_sym_import,
+      anon_sym_from,
+      anon_sym_STAR,
+      anon_sym_print,
+      anon_sym_assert,
+      anon_sym_return,
+      anon_sym_del,
+      anon_sym_raise,
+      anon_sym_pass,
+      anon_sym_break,
+      anon_sym_continue,
+      anon_sym_if,
+      anon_sym_else,
+      anon_sym_async,
+      anon_sym_for,
+      anon_sym_while,
+      anon_sym_try,
+      anon_sym_with,
+      anon_sym_match,
+      anon_sym_def,
+      anon_sym_global,
+      anon_sym_nonlocal,
+      anon_sym_exec,
+      anon_sym_type,
+      anon_sym_class,
+      anon_sym_not,
+      anon_sym_lambda,
+      anon_sym_yield,
+      sym_integer,
+      sym_identifier,
+      anon_sym_await,
+      sym_true,
+      sym_false,
+      sym_none,
+  [14231] = 19,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(51), 1,
+      anon_sym_LBRACE,
+    ACTIONS(69), 1,
+      anon_sym_not,
+    ACTIONS(71), 1,
+      anon_sym_lambda,
+    ACTIONS(81), 1,
+      sym__string_start,
+    ACTIONS(327), 1,
+      sym_identifier,
+    ACTIONS(333), 1,
+      anon_sym_await,
+    ACTIONS(568), 1,
+      anon_sym_LPAREN,
+    ACTIONS(574), 1,
+      anon_sym_LBRACK,
+    STATE(707), 1,
+      sym_primary_expression,
+    STATE(709), 1,
+      sym_string,
+    STATE(1060), 1,
+      sym_expression,
+    ACTIONS(75), 2,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(975), 2,
+      sym__newline,
+      sym__semicolon,
+    ACTIONS(47), 3,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_TILDE,
+    ACTIONS(77), 4,
+      sym_integer,
+      sym_true,
+      sym_false,
+      sym_none,
+    ACTIONS(329), 5,
+      anon_sym_print,
+      anon_sym_async,
+      anon_sym_match,
+      anon_sym_exec,
+      anon_sym_type,
+    STATE(985), 6,
+      sym_named_expression,
+      sym_not_operator,
+      sym_boolean_operator,
+      sym_comparison_operator,
+      sym_lambda,
+      sym_conditional_expression,
+    STATE(759), 16,
+      sym_binary_operator,
+      sym_unary_operator,
+      sym_attribute,
+      sym_subscript,
+      sym_call,
+      sym_list,
+      sym_set,
+      sym_tuple,
+      sym_dictionary,
+      sym_list_comprehension,
+      sym_dictionary_comprehension,
+      sym_set_comprehension,
+      sym_generator_expression,
+      sym_parenthesized_expression,
+      sym_concatenated_string,
+      sym_await,
+  [14320] = 20,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(592), 1,
+      anon_sym_LPAREN,
+    ACTIONS(600), 1,
+      anon_sym_LBRACK,
+    ACTIONS(602), 1,
+      anon_sym_LBRACE,
+    ACTIONS(608), 1,
+      sym__string_start,
+    ACTIONS(977), 1,
+      sym_identifier,
+    ACTIONS(979), 1,
+      anon_sym_STAR,
+    ACTIONS(983), 1,
+      anon_sym_COLON,
+    ACTIONS(985), 1,
+      anon_sym_not,
+    ACTIONS(987), 1,
+      anon_sym_lambda,
+    ACTIONS(989), 1,
+      anon_sym_await,
+    STATE(713), 1,
+      sym_string,
+    STATE(726), 1,
+      sym_primary_expression,
+    STATE(1063), 1,
+      sym_expression,
+    ACTIONS(604), 2,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(598), 3,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_TILDE,
+    ACTIONS(590), 4,
+      sym_integer,
+      sym_true,
+      sym_false,
+      sym_none,
+    ACTIONS(981), 5,
+      anon_sym_print,
+      anon_sym_async,
+      anon_sym_match,
+      anon_sym_exec,
+      anon_sym_type,
+    STATE(1003), 6,
+      sym_named_expression,
+      sym_not_operator,
+      sym_boolean_operator,
+      sym_comparison_operator,
+      sym_lambda,
+      sym_conditional_expression,
+    STATE(827), 16,
+      sym_binary_operator,
+      sym_unary_operator,
+      sym_attribute,
+      sym_subscript,
+      sym_call,
+      sym_list,
+      sym_set,
+      sym_tuple,
+      sym_dictionary,
+      sym_list_comprehension,
+      sym_dictionary_comprehension,
+      sym_set_comprehension,
+      sym_generator_expression,
+      sym_parenthesized_expression,
+      sym_concatenated_string,
+      sym_await,
+  [14411] = 19,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(51), 1,
+      anon_sym_LBRACE,
+    ACTIONS(69), 1,
+      anon_sym_not,
+    ACTIONS(71), 1,
+      anon_sym_lambda,
+    ACTIONS(81), 1,
+      sym__string_start,
+    ACTIONS(327), 1,
+      sym_identifier,
+    ACTIONS(333), 1,
+      anon_sym_await,
+    ACTIONS(568), 1,
+      anon_sym_LPAREN,
+    ACTIONS(574), 1,
+      anon_sym_LBRACK,
+    STATE(707), 1,
+      sym_primary_expression,
+    STATE(709), 1,
+      sym_string,
+    STATE(1060), 1,
+      sym_expression,
+    ACTIONS(75), 2,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(991), 2,
+      sym__newline,
+      sym__semicolon,
+    ACTIONS(47), 3,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_TILDE,
+    ACTIONS(77), 4,
+      sym_integer,
+      sym_true,
+      sym_false,
+      sym_none,
+    ACTIONS(329), 5,
+      anon_sym_print,
+      anon_sym_async,
+      anon_sym_match,
+      anon_sym_exec,
+      anon_sym_type,
+    STATE(985), 6,
+      sym_named_expression,
+      sym_not_operator,
+      sym_boolean_operator,
+      sym_comparison_operator,
+      sym_lambda,
+      sym_conditional_expression,
+    STATE(759), 16,
+      sym_binary_operator,
+      sym_unary_operator,
+      sym_attribute,
+      sym_subscript,
+      sym_call,
+      sym_list,
+      sym_set,
+      sym_tuple,
+      sym_dictionary,
+      sym_list_comprehension,
+      sym_dictionary_comprehension,
+      sym_set_comprehension,
+      sym_generator_expression,
+      sym_parenthesized_expression,
+      sym_concatenated_string,
+      sym_await,
+  [14500] = 19,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(279), 1,
+      anon_sym_LBRACE,
+    ACTIONS(299), 1,
+      sym__string_start,
+    ACTIONS(578), 1,
+      anon_sym_LPAREN,
+    ACTIONS(584), 1,
+      anon_sym_LBRACK,
+    ACTIONS(626), 1,
+      anon_sym_not,
+    ACTIONS(668), 1,
+      sym_identifier,
+    ACTIONS(678), 1,
+      anon_sym_await,
+    ACTIONS(760), 1,
+      anon_sym_lambda,
+    STATE(586), 1,
+      sym_string,
+    STATE(590), 1,
+      sym_primary_expression,
+    STATE(935), 1,
+      sym_expression,
+    ACTIONS(293), 2,
+      sym_ellipsis,
+      sym_float,
+    STATE(1024), 2,
+      sym__expression_within_for_in_clause,
+      sym_lambda_within_for_in_clause,
+    ACTIONS(582), 3,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_TILDE,
+    ACTIONS(295), 4,
+      sym_integer,
+      sym_true,
+      sym_false,
+      sym_none,
+    ACTIONS(674), 5,
+      anon_sym_print,
+      anon_sym_async,
+      anon_sym_match,
+      anon_sym_exec,
+      anon_sym_type,
+    STATE(883), 6,
+      sym_named_expression,
+      sym_not_operator,
+      sym_boolean_operator,
+      sym_comparison_operator,
+      sym_lambda,
+      sym_conditional_expression,
+    STATE(605), 16,
+      sym_binary_operator,
+      sym_unary_operator,
+      sym_attribute,
+      sym_subscript,
+      sym_call,
+      sym_list,
+      sym_set,
+      sym_tuple,
+      sym_dictionary,
+      sym_list_comprehension,
+      sym_dictionary_comprehension,
+      sym_set_comprehension,
+      sym_generator_expression,
+      sym_parenthesized_expression,
+      sym_concatenated_string,
+      sym_await,
+  [14589] = 19,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(279), 1,
+      anon_sym_LBRACE,
+    ACTIONS(299), 1,
+      sym__string_start,
+    ACTIONS(578), 1,
+      anon_sym_LPAREN,
+    ACTIONS(584), 1,
+      anon_sym_LBRACK,
+    ACTIONS(626), 1,
+      anon_sym_not,
+    ACTIONS(668), 1,
+      sym_identifier,
+    ACTIONS(678), 1,
+      anon_sym_await,
+    ACTIONS(760), 1,
+      anon_sym_lambda,
+    STATE(586), 1,
+      sym_string,
+    STATE(590), 1,
+      sym_primary_expression,
+    STATE(938), 1,
+      sym_expression,
+    ACTIONS(293), 2,
+      sym_ellipsis,
+      sym_float,
+    STATE(1022), 2,
+      sym__expression_within_for_in_clause,
+      sym_lambda_within_for_in_clause,
+    ACTIONS(582), 3,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_TILDE,
+    ACTIONS(295), 4,
+      sym_integer,
+      sym_true,
+      sym_false,
+      sym_none,
+    ACTIONS(674), 5,
+      anon_sym_print,
+      anon_sym_async,
+      anon_sym_match,
+      anon_sym_exec,
+      anon_sym_type,
+    STATE(883), 6,
+      sym_named_expression,
+      sym_not_operator,
+      sym_boolean_operator,
+      sym_comparison_operator,
+      sym_lambda,
+      sym_conditional_expression,
+    STATE(605), 16,
+      sym_binary_operator,
+      sym_unary_operator,
+      sym_attribute,
+      sym_subscript,
+      sym_call,
+      sym_list,
+      sym_set,
+      sym_tuple,
+      sym_dictionary,
+      sym_list_comprehension,
+      sym_dictionary_comprehension,
+      sym_set_comprehension,
+      sym_generator_expression,
+      sym_parenthesized_expression,
+      sym_concatenated_string,
+      sym_await,
+  [14678] = 19,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(51), 1,
+      anon_sym_LBRACE,
+    ACTIONS(69), 1,
+      anon_sym_not,
+    ACTIONS(71), 1,
+      anon_sym_lambda,
+    ACTIONS(81), 1,
+      sym__string_start,
+    ACTIONS(327), 1,
+      sym_identifier,
+    ACTIONS(333), 1,
+      anon_sym_await,
+    ACTIONS(568), 1,
+      anon_sym_LPAREN,
+    ACTIONS(574), 1,
+      anon_sym_LBRACK,
+    STATE(707), 1,
+      sym_primary_expression,
+    STATE(709), 1,
+      sym_string,
+    STATE(1060), 1,
+      sym_expression,
+    ACTIONS(75), 2,
       sym_ellipsis,
       sym_float,
     ACTIONS(993), 2,
+      sym__newline,
+      sym__semicolon,
+    ACTIONS(47), 3,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_TILDE,
+    ACTIONS(77), 4,
+      sym_integer,
+      sym_true,
+      sym_false,
+      sym_none,
+    ACTIONS(329), 5,
+      anon_sym_print,
+      anon_sym_async,
+      anon_sym_match,
+      anon_sym_exec,
+      anon_sym_type,
+    STATE(985), 6,
+      sym_named_expression,
+      sym_not_operator,
+      sym_boolean_operator,
+      sym_comparison_operator,
+      sym_lambda,
+      sym_conditional_expression,
+    STATE(759), 16,
+      sym_binary_operator,
+      sym_unary_operator,
+      sym_attribute,
+      sym_subscript,
+      sym_call,
+      sym_list,
+      sym_set,
+      sym_tuple,
+      sym_dictionary,
+      sym_list_comprehension,
+      sym_dictionary_comprehension,
+      sym_set_comprehension,
+      sym_generator_expression,
+      sym_parenthesized_expression,
+      sym_concatenated_string,
+      sym_await,
+  [14767] = 19,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(258), 1,
+      sym_identifier,
+    ACTIONS(262), 1,
+      anon_sym_LPAREN,
+    ACTIONS(277), 1,
+      anon_sym_LBRACK,
+    ACTIONS(279), 1,
+      anon_sym_LBRACE,
+    ACTIONS(283), 1,
+      anon_sym_not,
+    ACTIONS(289), 1,
+      anon_sym_lambda,
+    ACTIONS(297), 1,
+      anon_sym_await,
+    ACTIONS(299), 1,
+      sym__string_start,
+    STATE(586), 1,
+      sym_string,
+    STATE(616), 1,
+      sym_primary_expression,
+    STATE(1078), 1,
+      sym_expression,
+    ACTIONS(293), 2,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(995), 2,
       anon_sym_COMMA,
       anon_sym_RBRACK,
-    ACTIONS(301), 3,
+    ACTIONS(285), 3,
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
-    ACTIONS(311), 4,
+    ACTIONS(295), 4,
       sym_integer,
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(285), 5,
+    ACTIONS(269), 5,
       anon_sym_print,
       anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(900), 7,
+    STATE(883), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-      sym_await,
-    STATE(642), 15,
+    STATE(605), 16,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -36089,257 +34602,61 @@ static const uint16_t ts_small_parse_table[] = {
       sym_generator_expression,
       sym_parenthesized_expression,
       sym_concatenated_string,
-  [12405] = 20,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(622), 1,
-      sym_identifier,
-    ACTIONS(624), 1,
-      anon_sym_LPAREN,
-    ACTIONS(632), 1,
-      anon_sym_LBRACK,
-    ACTIONS(634), 1,
-      anon_sym_LBRACE,
-    ACTIONS(636), 1,
-      anon_sym_not,
-    ACTIONS(638), 1,
-      anon_sym_lambda,
-    ACTIONS(644), 1,
-      anon_sym_await,
-    ACTIONS(646), 1,
-      sym__string_start,
-    ACTIONS(995), 1,
-      anon_sym_RPAREN,
-    STATE(740), 1,
-      sym_primary_expression,
-    STATE(742), 1,
-      sym_string,
-    STATE(1050), 1,
-      sym_expression,
-    STATE(1308), 1,
-      sym_with_item,
-    ACTIONS(640), 2,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(630), 3,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_TILDE,
-    ACTIONS(642), 4,
-      sym_integer,
-      sym_true,
-      sym_false,
-      sym_none,
-    ACTIONS(626), 5,
-      anon_sym_print,
-      anon_sym_async,
-      anon_sym_match,
-      anon_sym_exec,
-      anon_sym_type,
-    STATE(1015), 7,
-      sym_named_expression,
-      sym_not_operator,
-      sym_boolean_operator,
-      sym_comparison_operator,
-      sym_lambda,
-      sym_conditional_expression,
       sym_await,
-    STATE(811), 15,
-      sym_binary_operator,
-      sym_unary_operator,
-      sym_attribute,
-      sym_subscript,
-      sym_call,
-      sym_list,
-      sym_set,
-      sym_tuple,
-      sym_dictionary,
-      sym_list_comprehension,
-      sym_dictionary_comprehension,
-      sym_set_comprehension,
-      sym_generator_expression,
-      sym_parenthesized_expression,
-      sym_concatenated_string,
-  [12496] = 3,
+  [14856] = 19,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(966), 12,
-      sym__dedent,
-      sym__string_start,
+    ACTIONS(258), 1,
+      sym_identifier,
+    ACTIONS(262), 1,
       anon_sym_LPAREN,
-      anon_sym_DASH,
-      anon_sym_PLUS,
+    ACTIONS(277), 1,
       anon_sym_LBRACK,
+    ACTIONS(279), 1,
       anon_sym_LBRACE,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_TILDE,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(968), 37,
-      anon_sym_import,
-      anon_sym_from,
-      anon_sym_STAR,
-      anon_sym_print,
-      anon_sym_assert,
-      anon_sym_return,
-      anon_sym_del,
-      anon_sym_raise,
-      anon_sym_pass,
-      anon_sym_break,
-      anon_sym_continue,
-      anon_sym_if,
-      anon_sym_elif,
-      anon_sym_else,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_while,
-      anon_sym_try,
-      anon_sym_finally,
-      anon_sym_with,
-      anon_sym_match,
-      anon_sym_case,
-      anon_sym_def,
-      anon_sym_global,
-      anon_sym_nonlocal,
-      anon_sym_exec,
-      anon_sym_type,
-      anon_sym_class,
+    ACTIONS(283), 1,
       anon_sym_not,
+    ACTIONS(289), 1,
       anon_sym_lambda,
-      anon_sym_yield,
-      sym_integer,
-      sym_identifier,
+    ACTIONS(297), 1,
       anon_sym_await,
-      sym_true,
-      sym_false,
-      sym_none,
-  [12553] = 20,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(622), 1,
-      sym_identifier,
-    ACTIONS(632), 1,
-      anon_sym_LBRACK,
-    ACTIONS(634), 1,
-      anon_sym_LBRACE,
-    ACTIONS(636), 1,
-      anon_sym_not,
-    ACTIONS(638), 1,
-      anon_sym_lambda,
-    ACTIONS(644), 1,
-      anon_sym_await,
-    ACTIONS(646), 1,
-      sym__string_start,
-    ACTIONS(974), 1,
-      anon_sym_LPAREN,
-    STATE(740), 1,
-      sym_primary_expression,
-    STATE(742), 1,
-      sym_string,
-    STATE(1050), 1,
-      sym_expression,
-    STATE(1320), 1,
-      sym_with_item,
-    STATE(1459), 1,
-      sym_with_clause,
-    ACTIONS(640), 2,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(630), 3,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_TILDE,
-    ACTIONS(642), 4,
-      sym_integer,
-      sym_true,
-      sym_false,
-      sym_none,
-    ACTIONS(626), 5,
-      anon_sym_print,
-      anon_sym_async,
-      anon_sym_match,
-      anon_sym_exec,
-      anon_sym_type,
-    STATE(1015), 7,
-      sym_named_expression,
-      sym_not_operator,
-      sym_boolean_operator,
-      sym_comparison_operator,
-      sym_lambda,
-      sym_conditional_expression,
-      sym_await,
-    STATE(811), 15,
-      sym_binary_operator,
-      sym_unary_operator,
-      sym_attribute,
-      sym_subscript,
-      sym_call,
-      sym_list,
-      sym_set,
-      sym_tuple,
-      sym_dictionary,
-      sym_list_comprehension,
-      sym_dictionary_comprehension,
-      sym_set_comprehension,
-      sym_generator_expression,
-      sym_parenthesized_expression,
-      sym_concatenated_string,
-  [12644] = 19,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(274), 1,
-      sym_identifier,
-    ACTIONS(278), 1,
-      anon_sym_LPAREN,
-    ACTIONS(293), 1,
-      anon_sym_LBRACK,
-    ACTIONS(295), 1,
-      anon_sym_LBRACE,
     ACTIONS(299), 1,
-      anon_sym_not,
-    ACTIONS(305), 1,
-      anon_sym_lambda,
-    ACTIONS(313), 1,
-      anon_sym_await,
-    ACTIONS(315), 1,
       sym__string_start,
-    STATE(600), 1,
+    STATE(586), 1,
       sym_string,
-    STATE(630), 1,
+    STATE(616), 1,
       sym_primary_expression,
-    STATE(1090), 1,
+    STATE(1093), 1,
       sym_expression,
-    ACTIONS(309), 2,
+    ACTIONS(293), 2,
       sym_ellipsis,
       sym_float,
     ACTIONS(997), 2,
       anon_sym_COMMA,
       anon_sym_RBRACK,
-    ACTIONS(301), 3,
+    ACTIONS(285), 3,
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
-    ACTIONS(311), 4,
+    ACTIONS(295), 4,
       sym_integer,
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(285), 5,
+    ACTIONS(269), 5,
       anon_sym_print,
       anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(900), 7,
+    STATE(883), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-      sym_await,
-    STATE(642), 15,
+    STATE(605), 16,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -36355,890 +34672,132 @@ static const uint16_t ts_small_parse_table[] = {
       sym_generator_expression,
       sym_parenthesized_expression,
       sym_concatenated_string,
-  [12733] = 19,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(274), 1,
-      sym_identifier,
-    ACTIONS(278), 1,
-      anon_sym_LPAREN,
-    ACTIONS(293), 1,
-      anon_sym_LBRACK,
-    ACTIONS(295), 1,
-      anon_sym_LBRACE,
-    ACTIONS(299), 1,
-      anon_sym_not,
-    ACTIONS(305), 1,
-      anon_sym_lambda,
-    ACTIONS(313), 1,
-      anon_sym_await,
-    ACTIONS(315), 1,
-      sym__string_start,
-    STATE(600), 1,
-      sym_string,
-    STATE(630), 1,
-      sym_primary_expression,
-    STATE(1091), 1,
-      sym_expression,
-    ACTIONS(309), 2,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(999), 2,
-      anon_sym_COMMA,
-      anon_sym_RBRACK,
-    ACTIONS(301), 3,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_TILDE,
-    ACTIONS(311), 4,
-      sym_integer,
-      sym_true,
-      sym_false,
-      sym_none,
-    ACTIONS(285), 5,
-      anon_sym_print,
-      anon_sym_async,
-      anon_sym_match,
-      anon_sym_exec,
-      anon_sym_type,
-    STATE(900), 7,
-      sym_named_expression,
-      sym_not_operator,
-      sym_boolean_operator,
-      sym_comparison_operator,
-      sym_lambda,
-      sym_conditional_expression,
       sym_await,
-    STATE(642), 15,
-      sym_binary_operator,
-      sym_unary_operator,
-      sym_attribute,
-      sym_subscript,
-      sym_call,
-      sym_list,
-      sym_set,
-      sym_tuple,
-      sym_dictionary,
-      sym_list_comprehension,
-      sym_dictionary_comprehension,
-      sym_set_comprehension,
-      sym_generator_expression,
-      sym_parenthesized_expression,
-      sym_concatenated_string,
-  [12822] = 19,
+  [14945] = 20,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(51), 1,
-      anon_sym_LBRACE,
-    ACTIONS(69), 1,
-      anon_sym_not,
-    ACTIONS(71), 1,
-      anon_sym_lambda,
-    ACTIONS(81), 1,
-      sym__string_start,
-    ACTIONS(331), 1,
-      sym_identifier,
-    ACTIONS(337), 1,
-      anon_sym_await,
-    ACTIONS(559), 1,
-      anon_sym_LPAREN,
-    ACTIONS(563), 1,
+    ACTIONS(600), 1,
       anon_sym_LBRACK,
-    STATE(684), 1,
-      sym_primary_expression,
+    ACTIONS(602), 1,
+      anon_sym_LBRACE,
+    ACTIONS(608), 1,
+      sym__string_start,
+    ACTIONS(977), 1,
+      sym_identifier,
+    ACTIONS(985), 1,
+      anon_sym_not,
+    ACTIONS(987), 1,
+      anon_sym_lambda,
+    ACTIONS(989), 1,
+      anon_sym_await,
+    ACTIONS(999), 1,
+      anon_sym_LPAREN,
     STATE(713), 1,
       sym_string,
-    STATE(1066), 1,
+    STATE(726), 1,
+      sym_primary_expression,
+    STATE(1033), 1,
       sym_expression,
-    ACTIONS(75), 2,
+    STATE(1201), 1,
+      sym_with_item,
+    STATE(1405), 1,
+      sym_with_clause,
+    ACTIONS(604), 2,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(598), 3,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_TILDE,
+    ACTIONS(590), 4,
+      sym_integer,
+      sym_true,
+      sym_false,
+      sym_none,
+    ACTIONS(981), 5,
+      anon_sym_print,
+      anon_sym_async,
+      anon_sym_match,
+      anon_sym_exec,
+      anon_sym_type,
+    STATE(1003), 6,
+      sym_named_expression,
+      sym_not_operator,
+      sym_boolean_operator,
+      sym_comparison_operator,
+      sym_lambda,
+      sym_conditional_expression,
+    STATE(827), 16,
+      sym_binary_operator,
+      sym_unary_operator,
+      sym_attribute,
+      sym_subscript,
+      sym_call,
+      sym_list,
+      sym_set,
+      sym_tuple,
+      sym_dictionary,
+      sym_list_comprehension,
+      sym_dictionary_comprehension,
+      sym_set_comprehension,
+      sym_generator_expression,
+      sym_parenthesized_expression,
+      sym_concatenated_string,
+      sym_await,
+  [15036] = 19,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(258), 1,
+      sym_identifier,
+    ACTIONS(262), 1,
+      anon_sym_LPAREN,
+    ACTIONS(277), 1,
+      anon_sym_LBRACK,
+    ACTIONS(279), 1,
+      anon_sym_LBRACE,
+    ACTIONS(283), 1,
+      anon_sym_not,
+    ACTIONS(289), 1,
+      anon_sym_lambda,
+    ACTIONS(297), 1,
+      anon_sym_await,
+    ACTIONS(299), 1,
+      sym__string_start,
+    STATE(586), 1,
+      sym_string,
+    STATE(616), 1,
+      sym_primary_expression,
+    STATE(1099), 1,
+      sym_expression,
+    ACTIONS(293), 2,
       sym_ellipsis,
       sym_float,
     ACTIONS(1001), 2,
-      sym__newline,
-      sym__semicolon,
-    ACTIONS(47), 3,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_TILDE,
-    ACTIONS(77), 4,
-      sym_integer,
-      sym_true,
-      sym_false,
-      sym_none,
-    ACTIONS(333), 5,
-      anon_sym_print,
-      anon_sym_async,
-      anon_sym_match,
-      anon_sym_exec,
-      anon_sym_type,
-    STATE(1009), 7,
-      sym_named_expression,
-      sym_not_operator,
-      sym_boolean_operator,
-      sym_comparison_operator,
-      sym_lambda,
-      sym_conditional_expression,
-      sym_await,
-    STATE(797), 15,
-      sym_binary_operator,
-      sym_unary_operator,
-      sym_attribute,
-      sym_subscript,
-      sym_call,
-      sym_list,
-      sym_set,
-      sym_tuple,
-      sym_dictionary,
-      sym_list_comprehension,
-      sym_dictionary_comprehension,
-      sym_set_comprehension,
-      sym_generator_expression,
-      sym_parenthesized_expression,
-      sym_concatenated_string,
-  [12911] = 20,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(622), 1,
-      sym_identifier,
-    ACTIONS(632), 1,
-      anon_sym_LBRACK,
-    ACTIONS(634), 1,
-      anon_sym_LBRACE,
-    ACTIONS(636), 1,
-      anon_sym_not,
-    ACTIONS(638), 1,
-      anon_sym_lambda,
-    ACTIONS(644), 1,
-      anon_sym_await,
-    ACTIONS(646), 1,
-      sym__string_start,
-    ACTIONS(974), 1,
-      anon_sym_LPAREN,
-    STATE(740), 1,
-      sym_primary_expression,
-    STATE(742), 1,
-      sym_string,
-    STATE(1050), 1,
-      sym_expression,
-    STATE(1320), 1,
-      sym_with_item,
-    STATE(1474), 1,
-      sym_with_clause,
-    ACTIONS(640), 2,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(630), 3,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_TILDE,
-    ACTIONS(642), 4,
-      sym_integer,
-      sym_true,
-      sym_false,
-      sym_none,
-    ACTIONS(626), 5,
-      anon_sym_print,
-      anon_sym_async,
-      anon_sym_match,
-      anon_sym_exec,
-      anon_sym_type,
-    STATE(1015), 7,
-      sym_named_expression,
-      sym_not_operator,
-      sym_boolean_operator,
-      sym_comparison_operator,
-      sym_lambda,
-      sym_conditional_expression,
-      sym_await,
-    STATE(811), 15,
-      sym_binary_operator,
-      sym_unary_operator,
-      sym_attribute,
-      sym_subscript,
-      sym_call,
-      sym_list,
-      sym_set,
-      sym_tuple,
-      sym_dictionary,
-      sym_list_comprehension,
-      sym_dictionary_comprehension,
-      sym_set_comprehension,
-      sym_generator_expression,
-      sym_parenthesized_expression,
-      sym_concatenated_string,
-  [13002] = 19,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(295), 1,
-      anon_sym_LBRACE,
-    ACTIONS(315), 1,
-      sym__string_start,
-    ACTIONS(602), 1,
-      sym_identifier,
-    ACTIONS(604), 1,
-      anon_sym_LPAREN,
-    ACTIONS(612), 1,
-      anon_sym_LBRACK,
-    ACTIONS(614), 1,
-      anon_sym_not,
-    ACTIONS(618), 1,
-      anon_sym_await,
-    ACTIONS(758), 1,
-      anon_sym_lambda,
-    STATE(600), 1,
-      sym_string,
-    STATE(643), 1,
-      sym_primary_expression,
-    STATE(962), 1,
-      sym_expression,
-    ACTIONS(309), 2,
-      sym_ellipsis,
-      sym_float,
-    STATE(1013), 2,
-      sym__expression_within_for_in_clause,
-      sym_lambda_within_for_in_clause,
-    ACTIONS(610), 3,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_TILDE,
-    ACTIONS(311), 4,
-      sym_integer,
-      sym_true,
-      sym_false,
-      sym_none,
-    ACTIONS(606), 5,
-      anon_sym_print,
-      anon_sym_async,
-      anon_sym_match,
-      anon_sym_exec,
-      anon_sym_type,
-    STATE(900), 7,
-      sym_named_expression,
-      sym_not_operator,
-      sym_boolean_operator,
-      sym_comparison_operator,
-      sym_lambda,
-      sym_conditional_expression,
-      sym_await,
-    STATE(642), 15,
-      sym_binary_operator,
-      sym_unary_operator,
-      sym_attribute,
-      sym_subscript,
-      sym_call,
-      sym_list,
-      sym_set,
-      sym_tuple,
-      sym_dictionary,
-      sym_list_comprehension,
-      sym_dictionary_comprehension,
-      sym_set_comprehension,
-      sym_generator_expression,
-      sym_parenthesized_expression,
-      sym_concatenated_string,
-  [13091] = 20,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(622), 1,
-      sym_identifier,
-    ACTIONS(632), 1,
-      anon_sym_LBRACK,
-    ACTIONS(634), 1,
-      anon_sym_LBRACE,
-    ACTIONS(636), 1,
-      anon_sym_not,
-    ACTIONS(638), 1,
-      anon_sym_lambda,
-    ACTIONS(644), 1,
-      anon_sym_await,
-    ACTIONS(646), 1,
-      sym__string_start,
-    ACTIONS(974), 1,
-      anon_sym_LPAREN,
-    STATE(740), 1,
-      sym_primary_expression,
-    STATE(742), 1,
-      sym_string,
-    STATE(1050), 1,
-      sym_expression,
-    STATE(1320), 1,
-      sym_with_item,
-    STATE(1451), 1,
-      sym_with_clause,
-    ACTIONS(640), 2,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(630), 3,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_TILDE,
-    ACTIONS(642), 4,
-      sym_integer,
-      sym_true,
-      sym_false,
-      sym_none,
-    ACTIONS(626), 5,
-      anon_sym_print,
-      anon_sym_async,
-      anon_sym_match,
-      anon_sym_exec,
-      anon_sym_type,
-    STATE(1015), 7,
-      sym_named_expression,
-      sym_not_operator,
-      sym_boolean_operator,
-      sym_comparison_operator,
-      sym_lambda,
-      sym_conditional_expression,
-      sym_await,
-    STATE(811), 15,
-      sym_binary_operator,
-      sym_unary_operator,
-      sym_attribute,
-      sym_subscript,
-      sym_call,
-      sym_list,
-      sym_set,
-      sym_tuple,
-      sym_dictionary,
-      sym_list_comprehension,
-      sym_dictionary_comprehension,
-      sym_set_comprehension,
-      sym_generator_expression,
-      sym_parenthesized_expression,
-      sym_concatenated_string,
-  [13182] = 20,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(274), 1,
-      sym_identifier,
-    ACTIONS(278), 1,
-      anon_sym_LPAREN,
-    ACTIONS(293), 1,
-      anon_sym_LBRACK,
-    ACTIONS(295), 1,
-      anon_sym_LBRACE,
-    ACTIONS(299), 1,
-      anon_sym_not,
-    ACTIONS(305), 1,
-      anon_sym_lambda,
-    ACTIONS(313), 1,
-      anon_sym_await,
-    ACTIONS(315), 1,
-      sym__string_start,
-    ACTIONS(896), 1,
-      anon_sym_COLON,
-    STATE(600), 1,
-      sym_string,
-    STATE(630), 1,
-      sym_primary_expression,
-    STATE(1047), 1,
-      sym_expression,
-    STATE(1294), 1,
-      sym_slice,
-    ACTIONS(309), 2,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(301), 3,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_TILDE,
-    ACTIONS(311), 4,
-      sym_integer,
-      sym_true,
-      sym_false,
-      sym_none,
-    ACTIONS(285), 5,
-      anon_sym_print,
-      anon_sym_async,
-      anon_sym_match,
-      anon_sym_exec,
-      anon_sym_type,
-    STATE(900), 7,
-      sym_named_expression,
-      sym_not_operator,
-      sym_boolean_operator,
-      sym_comparison_operator,
-      sym_lambda,
-      sym_conditional_expression,
-      sym_await,
-    STATE(642), 15,
-      sym_binary_operator,
-      sym_unary_operator,
-      sym_attribute,
-      sym_subscript,
-      sym_call,
-      sym_list,
-      sym_set,
-      sym_tuple,
-      sym_dictionary,
-      sym_list_comprehension,
-      sym_dictionary_comprehension,
-      sym_set_comprehension,
-      sym_generator_expression,
-      sym_parenthesized_expression,
-      sym_concatenated_string,
-  [13273] = 19,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(51), 1,
-      anon_sym_LBRACE,
-    ACTIONS(69), 1,
-      anon_sym_not,
-    ACTIONS(71), 1,
-      anon_sym_lambda,
-    ACTIONS(81), 1,
-      sym__string_start,
-    ACTIONS(331), 1,
-      sym_identifier,
-    ACTIONS(337), 1,
-      anon_sym_await,
-    ACTIONS(559), 1,
-      anon_sym_LPAREN,
-    ACTIONS(563), 1,
-      anon_sym_LBRACK,
-    STATE(684), 1,
-      sym_primary_expression,
-    STATE(713), 1,
-      sym_string,
-    STATE(1066), 1,
-      sym_expression,
-    ACTIONS(75), 2,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(1003), 2,
-      sym__newline,
-      sym__semicolon,
-    ACTIONS(47), 3,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_TILDE,
-    ACTIONS(77), 4,
-      sym_integer,
-      sym_true,
-      sym_false,
-      sym_none,
-    ACTIONS(333), 5,
-      anon_sym_print,
-      anon_sym_async,
-      anon_sym_match,
-      anon_sym_exec,
-      anon_sym_type,
-    STATE(1009), 7,
-      sym_named_expression,
-      sym_not_operator,
-      sym_boolean_operator,
-      sym_comparison_operator,
-      sym_lambda,
-      sym_conditional_expression,
-      sym_await,
-    STATE(797), 15,
-      sym_binary_operator,
-      sym_unary_operator,
-      sym_attribute,
-      sym_subscript,
-      sym_call,
-      sym_list,
-      sym_set,
-      sym_tuple,
-      sym_dictionary,
-      sym_list_comprehension,
-      sym_dictionary_comprehension,
-      sym_set_comprehension,
-      sym_generator_expression,
-      sym_parenthesized_expression,
-      sym_concatenated_string,
-  [13362] = 20,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(274), 1,
-      sym_identifier,
-    ACTIONS(278), 1,
-      anon_sym_LPAREN,
-    ACTIONS(293), 1,
-      anon_sym_LBRACK,
-    ACTIONS(295), 1,
-      anon_sym_LBRACE,
-    ACTIONS(299), 1,
-      anon_sym_not,
-    ACTIONS(305), 1,
-      anon_sym_lambda,
-    ACTIONS(313), 1,
-      anon_sym_await,
-    ACTIONS(315), 1,
-      sym__string_start,
-    ACTIONS(896), 1,
-      anon_sym_COLON,
-    STATE(600), 1,
-      sym_string,
-    STATE(630), 1,
-      sym_primary_expression,
-    STATE(1021), 1,
-      sym_expression,
-    STATE(1220), 1,
-      sym_slice,
-    ACTIONS(309), 2,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(301), 3,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_TILDE,
-    ACTIONS(311), 4,
-      sym_integer,
-      sym_true,
-      sym_false,
-      sym_none,
-    ACTIONS(285), 5,
-      anon_sym_print,
-      anon_sym_async,
-      anon_sym_match,
-      anon_sym_exec,
-      anon_sym_type,
-    STATE(900), 7,
-      sym_named_expression,
-      sym_not_operator,
-      sym_boolean_operator,
-      sym_comparison_operator,
-      sym_lambda,
-      sym_conditional_expression,
-      sym_await,
-    STATE(642), 15,
-      sym_binary_operator,
-      sym_unary_operator,
-      sym_attribute,
-      sym_subscript,
-      sym_call,
-      sym_list,
-      sym_set,
-      sym_tuple,
-      sym_dictionary,
-      sym_list_comprehension,
-      sym_dictionary_comprehension,
-      sym_set_comprehension,
-      sym_generator_expression,
-      sym_parenthesized_expression,
-      sym_concatenated_string,
-  [13453] = 20,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(622), 1,
-      sym_identifier,
-    ACTIONS(624), 1,
-      anon_sym_LPAREN,
-    ACTIONS(632), 1,
-      anon_sym_LBRACK,
-    ACTIONS(634), 1,
-      anon_sym_LBRACE,
-    ACTIONS(636), 1,
-      anon_sym_not,
-    ACTIONS(638), 1,
-      anon_sym_lambda,
-    ACTIONS(644), 1,
-      anon_sym_await,
-    ACTIONS(646), 1,
-      sym__string_start,
-    ACTIONS(1005), 1,
-      anon_sym_RPAREN,
-    STATE(740), 1,
-      sym_primary_expression,
-    STATE(742), 1,
-      sym_string,
-    STATE(1050), 1,
-      sym_expression,
-    STATE(1308), 1,
-      sym_with_item,
-    ACTIONS(640), 2,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(630), 3,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_TILDE,
-    ACTIONS(642), 4,
-      sym_integer,
-      sym_true,
-      sym_false,
-      sym_none,
-    ACTIONS(626), 5,
-      anon_sym_print,
-      anon_sym_async,
-      anon_sym_match,
-      anon_sym_exec,
-      anon_sym_type,
-    STATE(1015), 7,
-      sym_named_expression,
-      sym_not_operator,
-      sym_boolean_operator,
-      sym_comparison_operator,
-      sym_lambda,
-      sym_conditional_expression,
-      sym_await,
-    STATE(811), 15,
-      sym_binary_operator,
-      sym_unary_operator,
-      sym_attribute,
-      sym_subscript,
-      sym_call,
-      sym_list,
-      sym_set,
-      sym_tuple,
-      sym_dictionary,
-      sym_list_comprehension,
-      sym_dictionary_comprehension,
-      sym_set_comprehension,
-      sym_generator_expression,
-      sym_parenthesized_expression,
-      sym_concatenated_string,
-  [13544] = 19,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(51), 1,
-      anon_sym_LBRACE,
-    ACTIONS(69), 1,
-      anon_sym_not,
-    ACTIONS(71), 1,
-      anon_sym_lambda,
-    ACTIONS(81), 1,
-      sym__string_start,
-    ACTIONS(331), 1,
-      sym_identifier,
-    ACTIONS(337), 1,
-      anon_sym_await,
-    ACTIONS(559), 1,
-      anon_sym_LPAREN,
-    ACTIONS(563), 1,
-      anon_sym_LBRACK,
-    STATE(684), 1,
-      sym_primary_expression,
-    STATE(713), 1,
-      sym_string,
-    STATE(1066), 1,
-      sym_expression,
-    ACTIONS(75), 2,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(1007), 2,
-      sym__newline,
-      sym__semicolon,
-    ACTIONS(47), 3,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_TILDE,
-    ACTIONS(77), 4,
-      sym_integer,
-      sym_true,
-      sym_false,
-      sym_none,
-    ACTIONS(333), 5,
-      anon_sym_print,
-      anon_sym_async,
-      anon_sym_match,
-      anon_sym_exec,
-      anon_sym_type,
-    STATE(1009), 7,
-      sym_named_expression,
-      sym_not_operator,
-      sym_boolean_operator,
-      sym_comparison_operator,
-      sym_lambda,
-      sym_conditional_expression,
-      sym_await,
-    STATE(797), 15,
-      sym_binary_operator,
-      sym_unary_operator,
-      sym_attribute,
-      sym_subscript,
-      sym_call,
-      sym_list,
-      sym_set,
-      sym_tuple,
-      sym_dictionary,
-      sym_list_comprehension,
-      sym_dictionary_comprehension,
-      sym_set_comprehension,
-      sym_generator_expression,
-      sym_parenthesized_expression,
-      sym_concatenated_string,
-  [13633] = 19,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(51), 1,
-      anon_sym_LBRACE,
-    ACTIONS(69), 1,
-      anon_sym_not,
-    ACTIONS(71), 1,
-      anon_sym_lambda,
-    ACTIONS(81), 1,
-      sym__string_start,
-    ACTIONS(331), 1,
-      sym_identifier,
-    ACTIONS(337), 1,
-      anon_sym_await,
-    ACTIONS(559), 1,
-      anon_sym_LPAREN,
-    ACTIONS(563), 1,
-      anon_sym_LBRACK,
-    STATE(684), 1,
-      sym_primary_expression,
-    STATE(713), 1,
-      sym_string,
-    STATE(1066), 1,
-      sym_expression,
-    ACTIONS(75), 2,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(1009), 2,
-      sym__newline,
-      sym__semicolon,
-    ACTIONS(47), 3,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_TILDE,
-    ACTIONS(77), 4,
-      sym_integer,
-      sym_true,
-      sym_false,
-      sym_none,
-    ACTIONS(333), 5,
-      anon_sym_print,
-      anon_sym_async,
-      anon_sym_match,
-      anon_sym_exec,
-      anon_sym_type,
-    STATE(1009), 7,
-      sym_named_expression,
-      sym_not_operator,
-      sym_boolean_operator,
-      sym_comparison_operator,
-      sym_lambda,
-      sym_conditional_expression,
-      sym_await,
-    STATE(797), 15,
-      sym_binary_operator,
-      sym_unary_operator,
-      sym_attribute,
-      sym_subscript,
-      sym_call,
-      sym_list,
-      sym_set,
-      sym_tuple,
-      sym_dictionary,
-      sym_list_comprehension,
-      sym_dictionary_comprehension,
-      sym_set_comprehension,
-      sym_generator_expression,
-      sym_parenthesized_expression,
-      sym_concatenated_string,
-  [13722] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(991), 12,
-      sym__string_start,
-      ts_builtin_sym_end,
-      anon_sym_LPAREN,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_LBRACE,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_TILDE,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(989), 37,
-      anon_sym_import,
-      anon_sym_from,
-      anon_sym_STAR,
-      anon_sym_print,
-      anon_sym_assert,
-      anon_sym_return,
-      anon_sym_del,
-      anon_sym_raise,
-      anon_sym_pass,
-      anon_sym_break,
-      anon_sym_continue,
-      anon_sym_if,
-      anon_sym_elif,
-      anon_sym_else,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_while,
-      anon_sym_try,
-      anon_sym_finally,
-      anon_sym_with,
-      anon_sym_match,
-      anon_sym_case,
-      anon_sym_def,
-      anon_sym_global,
-      anon_sym_nonlocal,
-      anon_sym_exec,
-      anon_sym_type,
-      anon_sym_class,
-      anon_sym_not,
-      anon_sym_lambda,
-      anon_sym_yield,
-      sym_integer,
-      sym_identifier,
-      anon_sym_await,
-      sym_true,
-      sym_false,
-      sym_none,
-  [13779] = 19,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(274), 1,
-      sym_identifier,
-    ACTIONS(278), 1,
-      anon_sym_LPAREN,
-    ACTIONS(293), 1,
-      anon_sym_LBRACK,
-    ACTIONS(295), 1,
-      anon_sym_LBRACE,
-    ACTIONS(299), 1,
-      anon_sym_not,
-    ACTIONS(305), 1,
-      anon_sym_lambda,
-    ACTIONS(313), 1,
-      anon_sym_await,
-    ACTIONS(315), 1,
-      sym__string_start,
-    STATE(600), 1,
-      sym_string,
-    STATE(630), 1,
-      sym_primary_expression,
-    STATE(1119), 1,
-      sym_expression,
-    ACTIONS(309), 2,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(1011), 2,
       anon_sym_COMMA,
       anon_sym_RBRACK,
-    ACTIONS(301), 3,
+    ACTIONS(285), 3,
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
-    ACTIONS(311), 4,
+    ACTIONS(295), 4,
       sym_integer,
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(285), 5,
+    ACTIONS(269), 5,
       anon_sym_print,
       anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(900), 7,
+    STATE(883), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-      sym_await,
-    STATE(642), 15,
+    STATE(605), 16,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -37254,16 +34813,230 @@ static const uint16_t ts_small_parse_table[] = {
       sym_generator_expression,
       sym_parenthesized_expression,
       sym_concatenated_string,
-  [13868] = 6,
+      sym_await,
+  [15125] = 20,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1013), 1,
+    ACTIONS(592), 1,
+      anon_sym_LPAREN,
+    ACTIONS(600), 1,
+      anon_sym_LBRACK,
+    ACTIONS(602), 1,
+      anon_sym_LBRACE,
+    ACTIONS(608), 1,
+      sym__string_start,
+    ACTIONS(977), 1,
+      sym_identifier,
+    ACTIONS(985), 1,
+      anon_sym_not,
+    ACTIONS(987), 1,
+      anon_sym_lambda,
+    ACTIONS(989), 1,
+      anon_sym_await,
+    ACTIONS(1003), 1,
+      anon_sym_RPAREN,
+    STATE(713), 1,
+      sym_string,
+    STATE(726), 1,
+      sym_primary_expression,
+    STATE(1033), 1,
+      sym_expression,
+    STATE(1268), 1,
+      sym_with_item,
+    ACTIONS(604), 2,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(598), 3,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_TILDE,
+    ACTIONS(590), 4,
+      sym_integer,
+      sym_true,
+      sym_false,
+      sym_none,
+    ACTIONS(981), 5,
+      anon_sym_print,
+      anon_sym_async,
+      anon_sym_match,
+      anon_sym_exec,
+      anon_sym_type,
+    STATE(1003), 6,
+      sym_named_expression,
+      sym_not_operator,
+      sym_boolean_operator,
+      sym_comparison_operator,
+      sym_lambda,
+      sym_conditional_expression,
+    STATE(827), 16,
+      sym_binary_operator,
+      sym_unary_operator,
+      sym_attribute,
+      sym_subscript,
+      sym_call,
+      sym_list,
+      sym_set,
+      sym_tuple,
+      sym_dictionary,
+      sym_list_comprehension,
+      sym_dictionary_comprehension,
+      sym_set_comprehension,
+      sym_generator_expression,
+      sym_parenthesized_expression,
+      sym_concatenated_string,
+      sym_await,
+  [15216] = 20,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(258), 1,
+      sym_identifier,
+    ACTIONS(262), 1,
+      anon_sym_LPAREN,
+    ACTIONS(277), 1,
+      anon_sym_LBRACK,
+    ACTIONS(279), 1,
+      anon_sym_LBRACE,
+    ACTIONS(283), 1,
+      anon_sym_not,
+    ACTIONS(289), 1,
+      anon_sym_lambda,
+    ACTIONS(297), 1,
+      anon_sym_await,
+    ACTIONS(299), 1,
+      sym__string_start,
+    ACTIONS(706), 1,
+      anon_sym_STAR,
+    STATE(586), 1,
+      sym_string,
+    STATE(616), 1,
+      sym_primary_expression,
+    STATE(1092), 1,
+      sym_expression,
+    STATE(1335), 1,
+      sym_list_splat,
+    ACTIONS(293), 2,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(285), 3,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_TILDE,
+    ACTIONS(295), 4,
+      sym_integer,
+      sym_true,
+      sym_false,
+      sym_none,
+    ACTIONS(269), 5,
+      anon_sym_print,
+      anon_sym_async,
+      anon_sym_match,
+      anon_sym_exec,
+      anon_sym_type,
+    STATE(883), 6,
+      sym_named_expression,
+      sym_not_operator,
+      sym_boolean_operator,
+      sym_comparison_operator,
+      sym_lambda,
+      sym_conditional_expression,
+    STATE(605), 16,
+      sym_binary_operator,
+      sym_unary_operator,
+      sym_attribute,
+      sym_subscript,
+      sym_call,
+      sym_list,
+      sym_set,
+      sym_tuple,
+      sym_dictionary,
+      sym_list_comprehension,
+      sym_dictionary_comprehension,
+      sym_set_comprehension,
+      sym_generator_expression,
+      sym_parenthesized_expression,
+      sym_concatenated_string,
+      sym_await,
+  [15307] = 20,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(600), 1,
+      anon_sym_LBRACK,
+    ACTIONS(602), 1,
+      anon_sym_LBRACE,
+    ACTIONS(608), 1,
+      sym__string_start,
+    ACTIONS(977), 1,
+      sym_identifier,
+    ACTIONS(985), 1,
+      anon_sym_not,
+    ACTIONS(987), 1,
+      anon_sym_lambda,
+    ACTIONS(989), 1,
+      anon_sym_await,
+    ACTIONS(999), 1,
+      anon_sym_LPAREN,
+    STATE(713), 1,
+      sym_string,
+    STATE(726), 1,
+      sym_primary_expression,
+    STATE(1033), 1,
+      sym_expression,
+    STATE(1201), 1,
+      sym_with_item,
+    STATE(1438), 1,
+      sym_with_clause,
+    ACTIONS(604), 2,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(598), 3,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_TILDE,
+    ACTIONS(590), 4,
+      sym_integer,
+      sym_true,
+      sym_false,
+      sym_none,
+    ACTIONS(981), 5,
+      anon_sym_print,
+      anon_sym_async,
+      anon_sym_match,
+      anon_sym_exec,
+      anon_sym_type,
+    STATE(1003), 6,
+      sym_named_expression,
+      sym_not_operator,
+      sym_boolean_operator,
+      sym_comparison_operator,
+      sym_lambda,
+      sym_conditional_expression,
+    STATE(827), 16,
+      sym_binary_operator,
+      sym_unary_operator,
+      sym_attribute,
+      sym_subscript,
+      sym_call,
+      sym_list,
+      sym_set,
+      sym_tuple,
+      sym_dictionary,
+      sym_list_comprehension,
+      sym_dictionary_comprehension,
+      sym_set_comprehension,
+      sym_generator_expression,
+      sym_parenthesized_expression,
+      sym_concatenated_string,
+      sym_await,
+  [15398] = 6,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1005), 1,
       anon_sym_elif,
-    STATE(307), 1,
+    STATE(318), 1,
       aux_sym_if_statement_repeat1,
-    STATE(420), 1,
+    STATE(368), 1,
       sym_elif_clause,
-    ACTIONS(978), 12,
+    ACTIONS(968), 12,
       sym__dedent,
       sym__string_start,
       anon_sym_LPAREN,
@@ -37276,7 +35049,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_TILDE,
       sym_ellipsis,
       sym_float,
-    ACTIONS(980), 34,
+    ACTIONS(970), 34,
       anon_sym_import,
       anon_sym_from,
       anon_sym_STAR,
@@ -37311,115 +35084,61 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-  [13931] = 3,
+  [15461] = 20,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1018), 12,
-      sym__dedent,
-      sym__string_start,
+    ACTIONS(592), 1,
       anon_sym_LPAREN,
-      anon_sym_DASH,
-      anon_sym_PLUS,
+    ACTIONS(600), 1,
       anon_sym_LBRACK,
-      anon_sym_LBRACE,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_TILDE,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(1016), 37,
-      anon_sym_import,
-      anon_sym_from,
-      anon_sym_STAR,
-      anon_sym_print,
-      anon_sym_assert,
-      anon_sym_return,
-      anon_sym_del,
-      anon_sym_raise,
-      anon_sym_pass,
-      anon_sym_break,
-      anon_sym_continue,
-      anon_sym_if,
-      anon_sym_elif,
-      anon_sym_else,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_while,
-      anon_sym_try,
-      anon_sym_finally,
-      anon_sym_with,
-      anon_sym_match,
-      anon_sym_case,
-      anon_sym_def,
-      anon_sym_global,
-      anon_sym_nonlocal,
-      anon_sym_exec,
-      anon_sym_type,
-      anon_sym_class,
-      anon_sym_not,
-      anon_sym_lambda,
-      anon_sym_yield,
-      sym_integer,
-      sym_identifier,
-      anon_sym_await,
-      sym_true,
-      sym_false,
-      sym_none,
-  [13988] = 19,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(295), 1,
-      anon_sym_LBRACE,
-    ACTIONS(315), 1,
-      sym__string_start,
     ACTIONS(602), 1,
+      anon_sym_LBRACE,
+    ACTIONS(608), 1,
+      sym__string_start,
+    ACTIONS(977), 1,
       sym_identifier,
-    ACTIONS(604), 1,
-      anon_sym_LPAREN,
-    ACTIONS(612), 1,
-      anon_sym_LBRACK,
-    ACTIONS(614), 1,
+    ACTIONS(985), 1,
       anon_sym_not,
-    ACTIONS(618), 1,
-      anon_sym_await,
-    ACTIONS(758), 1,
+    ACTIONS(987), 1,
       anon_sym_lambda,
-    STATE(600), 1,
+    ACTIONS(989), 1,
+      anon_sym_await,
+    ACTIONS(1008), 1,
+      anon_sym_RPAREN,
+    STATE(713), 1,
       sym_string,
-    STATE(643), 1,
+    STATE(726), 1,
       sym_primary_expression,
-    STATE(963), 1,
+    STATE(1033), 1,
       sym_expression,
-    ACTIONS(309), 2,
+    STATE(1268), 1,
+      sym_with_item,
+    ACTIONS(604), 2,
       sym_ellipsis,
       sym_float,
-    STATE(1017), 2,
-      sym__expression_within_for_in_clause,
-      sym_lambda_within_for_in_clause,
-    ACTIONS(610), 3,
+    ACTIONS(598), 3,
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
-    ACTIONS(311), 4,
+    ACTIONS(590), 4,
       sym_integer,
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(606), 5,
+    ACTIONS(981), 5,
       anon_sym_print,
       anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(900), 7,
+    STATE(1003), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-      sym_await,
-    STATE(642), 15,
+    STATE(827), 16,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -37435,186 +35154,62 @@ static const uint16_t ts_small_parse_table[] = {
       sym_generator_expression,
       sym_parenthesized_expression,
       sym_concatenated_string,
-  [14077] = 20,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(274), 1,
-      sym_identifier,
-    ACTIONS(278), 1,
-      anon_sym_LPAREN,
-    ACTIONS(293), 1,
-      anon_sym_LBRACK,
-    ACTIONS(295), 1,
-      anon_sym_LBRACE,
-    ACTIONS(299), 1,
-      anon_sym_not,
-    ACTIONS(305), 1,
-      anon_sym_lambda,
-    ACTIONS(313), 1,
-      anon_sym_await,
-    ACTIONS(315), 1,
-      sym__string_start,
-    ACTIONS(896), 1,
-      anon_sym_COLON,
-    STATE(600), 1,
-      sym_string,
-    STATE(630), 1,
-      sym_primary_expression,
-    STATE(1040), 1,
-      sym_expression,
-    STATE(1258), 1,
-      sym_slice,
-    ACTIONS(309), 2,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(301), 3,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_TILDE,
-    ACTIONS(311), 4,
-      sym_integer,
-      sym_true,
-      sym_false,
-      sym_none,
-    ACTIONS(285), 5,
-      anon_sym_print,
-      anon_sym_async,
-      anon_sym_match,
-      anon_sym_exec,
-      anon_sym_type,
-    STATE(900), 7,
-      sym_named_expression,
-      sym_not_operator,
-      sym_boolean_operator,
-      sym_comparison_operator,
-      sym_lambda,
-      sym_conditional_expression,
       sym_await,
-    STATE(642), 15,
-      sym_binary_operator,
-      sym_unary_operator,
-      sym_attribute,
-      sym_subscript,
-      sym_call,
-      sym_list,
-      sym_set,
-      sym_tuple,
-      sym_dictionary,
-      sym_list_comprehension,
-      sym_dictionary_comprehension,
-      sym_set_comprehension,
-      sym_generator_expression,
-      sym_parenthesized_expression,
-      sym_concatenated_string,
-  [14168] = 3,
+  [15552] = 20,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(985), 12,
-      sym__dedent,
-      sym__string_start,
-      anon_sym_LPAREN,
-      anon_sym_DASH,
-      anon_sym_PLUS,
+    ACTIONS(600), 1,
       anon_sym_LBRACK,
-      anon_sym_LBRACE,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_TILDE,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(987), 37,
-      anon_sym_import,
-      anon_sym_from,
-      anon_sym_STAR,
-      anon_sym_print,
-      anon_sym_assert,
-      anon_sym_return,
-      anon_sym_del,
-      anon_sym_raise,
-      anon_sym_pass,
-      anon_sym_break,
-      anon_sym_continue,
-      anon_sym_if,
-      anon_sym_elif,
-      anon_sym_else,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_while,
-      anon_sym_try,
-      anon_sym_finally,
-      anon_sym_with,
-      anon_sym_match,
-      anon_sym_case,
-      anon_sym_def,
-      anon_sym_global,
-      anon_sym_nonlocal,
-      anon_sym_exec,
-      anon_sym_type,
-      anon_sym_class,
-      anon_sym_not,
-      anon_sym_lambda,
-      anon_sym_yield,
-      sym_integer,
-      sym_identifier,
-      anon_sym_await,
-      sym_true,
-      sym_false,
-      sym_none,
-  [14225] = 19,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(295), 1,
-      anon_sym_LBRACE,
-    ACTIONS(315), 1,
-      sym__string_start,
     ACTIONS(602), 1,
+      anon_sym_LBRACE,
+    ACTIONS(608), 1,
+      sym__string_start,
+    ACTIONS(977), 1,
       sym_identifier,
-    ACTIONS(604), 1,
-      anon_sym_LPAREN,
-    ACTIONS(612), 1,
-      anon_sym_LBRACK,
-    ACTIONS(614), 1,
+    ACTIONS(985), 1,
       anon_sym_not,
-    ACTIONS(618), 1,
-      anon_sym_await,
-    ACTIONS(758), 1,
+    ACTIONS(987), 1,
       anon_sym_lambda,
-    STATE(600), 1,
+    ACTIONS(989), 1,
+      anon_sym_await,
+    ACTIONS(999), 1,
+      anon_sym_LPAREN,
+    STATE(713), 1,
       sym_string,
-    STATE(643), 1,
+    STATE(726), 1,
       sym_primary_expression,
-    STATE(958), 1,
+    STATE(1033), 1,
       sym_expression,
-    ACTIONS(309), 2,
+    STATE(1201), 1,
+      sym_with_item,
+    STATE(1430), 1,
+      sym_with_clause,
+    ACTIONS(604), 2,
       sym_ellipsis,
       sym_float,
-    STATE(1033), 2,
-      sym__expression_within_for_in_clause,
-      sym_lambda_within_for_in_clause,
-    ACTIONS(610), 3,
+    ACTIONS(598), 3,
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
-    ACTIONS(311), 4,
+    ACTIONS(590), 4,
       sym_integer,
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(606), 5,
+    ACTIONS(981), 5,
       anon_sym_print,
       anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(900), 7,
+    STATE(1003), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-      sym_await,
-    STATE(642), 15,
+    STATE(827), 16,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -37630,116 +35225,62 @@ static const uint16_t ts_small_parse_table[] = {
       sym_generator_expression,
       sym_parenthesized_expression,
       sym_concatenated_string,
-  [14314] = 3,
+      sym_await,
+  [15643] = 20,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1018), 12,
-      sym__string_start,
-      ts_builtin_sym_end,
-      anon_sym_LPAREN,
-      anon_sym_DASH,
-      anon_sym_PLUS,
+    ACTIONS(600), 1,
       anon_sym_LBRACK,
+    ACTIONS(602), 1,
       anon_sym_LBRACE,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_TILDE,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(1016), 37,
-      anon_sym_import,
-      anon_sym_from,
-      anon_sym_STAR,
-      anon_sym_print,
-      anon_sym_assert,
-      anon_sym_return,
-      anon_sym_del,
-      anon_sym_raise,
-      anon_sym_pass,
-      anon_sym_break,
-      anon_sym_continue,
-      anon_sym_if,
-      anon_sym_elif,
-      anon_sym_else,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_while,
-      anon_sym_try,
-      anon_sym_finally,
-      anon_sym_with,
-      anon_sym_match,
-      anon_sym_case,
-      anon_sym_def,
-      anon_sym_global,
-      anon_sym_nonlocal,
-      anon_sym_exec,
-      anon_sym_type,
-      anon_sym_class,
-      anon_sym_not,
-      anon_sym_lambda,
-      anon_sym_yield,
-      sym_integer,
-      sym_identifier,
-      anon_sym_await,
-      sym_true,
-      sym_false,
-      sym_none,
-  [14371] = 20,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(274), 1,
-      sym_identifier,
-    ACTIONS(278), 1,
-      anon_sym_LPAREN,
-    ACTIONS(293), 1,
-      anon_sym_LBRACK,
-    ACTIONS(295), 1,
-      anon_sym_LBRACE,
-    ACTIONS(299), 1,
-      anon_sym_not,
-    ACTIONS(305), 1,
-      anon_sym_lambda,
-    ACTIONS(313), 1,
-      anon_sym_await,
-    ACTIONS(315), 1,
+    ACTIONS(608), 1,
       sym__string_start,
-    ACTIONS(896), 1,
-      anon_sym_COLON,
-    STATE(600), 1,
+    ACTIONS(977), 1,
+      sym_identifier,
+    ACTIONS(985), 1,
+      anon_sym_not,
+    ACTIONS(987), 1,
+      anon_sym_lambda,
+    ACTIONS(989), 1,
+      anon_sym_await,
+    ACTIONS(999), 1,
+      anon_sym_LPAREN,
+    STATE(713), 1,
       sym_string,
-    STATE(630), 1,
+    STATE(726), 1,
       sym_primary_expression,
-    STATE(1086), 1,
+    STATE(1033), 1,
       sym_expression,
-    STATE(1398), 1,
-      sym_slice,
-    ACTIONS(309), 2,
+    STATE(1201), 1,
+      sym_with_item,
+    STATE(1427), 1,
+      sym_with_clause,
+    ACTIONS(604), 2,
       sym_ellipsis,
       sym_float,
-    ACTIONS(301), 3,
+    ACTIONS(598), 3,
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
-    ACTIONS(311), 4,
+    ACTIONS(590), 4,
       sym_integer,
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(285), 5,
+    ACTIONS(981), 5,
       anon_sym_print,
       anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(900), 7,
+    STATE(1003), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-      sym_await,
-    STATE(642), 15,
+    STATE(827), 16,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -37755,877 +35296,31 @@ static const uint16_t ts_small_parse_table[] = {
       sym_generator_expression,
       sym_parenthesized_expression,
       sym_concatenated_string,
-  [14462] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(970), 12,
-      sym__dedent,
-      sym__string_start,
-      anon_sym_LPAREN,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_LBRACE,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_TILDE,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(972), 37,
-      anon_sym_import,
-      anon_sym_from,
-      anon_sym_STAR,
-      anon_sym_print,
-      anon_sym_assert,
-      anon_sym_return,
-      anon_sym_del,
-      anon_sym_raise,
-      anon_sym_pass,
-      anon_sym_break,
-      anon_sym_continue,
-      anon_sym_if,
-      anon_sym_elif,
-      anon_sym_else,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_while,
-      anon_sym_try,
-      anon_sym_finally,
-      anon_sym_with,
-      anon_sym_match,
-      anon_sym_case,
-      anon_sym_def,
-      anon_sym_global,
-      anon_sym_nonlocal,
-      anon_sym_exec,
-      anon_sym_type,
-      anon_sym_class,
-      anon_sym_not,
-      anon_sym_lambda,
-      anon_sym_yield,
-      sym_integer,
-      sym_identifier,
-      anon_sym_await,
-      sym_true,
-      sym_false,
-      sym_none,
-  [14519] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1022), 13,
-      sym__dedent,
-      sym__string_start,
-      anon_sym_LPAREN,
-      anon_sym_except_STAR,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_LBRACE,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_TILDE,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(1020), 35,
-      anon_sym_import,
-      anon_sym_from,
-      anon_sym_STAR,
-      anon_sym_print,
-      anon_sym_assert,
-      anon_sym_return,
-      anon_sym_del,
-      anon_sym_raise,
-      anon_sym_pass,
-      anon_sym_break,
-      anon_sym_continue,
-      anon_sym_if,
-      anon_sym_else,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_while,
-      anon_sym_try,
-      anon_sym_finally,
-      anon_sym_with,
-      anon_sym_match,
-      anon_sym_def,
-      anon_sym_global,
-      anon_sym_nonlocal,
-      anon_sym_exec,
-      anon_sym_type,
-      anon_sym_class,
-      anon_sym_not,
-      anon_sym_lambda,
-      anon_sym_yield,
-      sym_integer,
-      sym_identifier,
-      anon_sym_await,
-      sym_true,
-      sym_false,
-      sym_none,
-  [14575] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1026), 12,
-      sym__dedent,
-      sym__string_start,
-      anon_sym_LPAREN,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_LBRACE,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_TILDE,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(1024), 36,
-      anon_sym_import,
-      anon_sym_from,
-      anon_sym_STAR,
-      anon_sym_print,
-      anon_sym_assert,
-      anon_sym_return,
-      anon_sym_del,
-      anon_sym_raise,
-      anon_sym_pass,
-      anon_sym_break,
-      anon_sym_continue,
-      anon_sym_if,
-      anon_sym_else,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_while,
-      anon_sym_try,
-      anon_sym_except,
-      anon_sym_finally,
-      anon_sym_with,
-      anon_sym_match,
-      anon_sym_def,
-      anon_sym_global,
-      anon_sym_nonlocal,
-      anon_sym_exec,
-      anon_sym_type,
-      anon_sym_class,
-      anon_sym_not,
-      anon_sym_lambda,
-      anon_sym_yield,
-      sym_integer,
-      sym_identifier,
-      anon_sym_await,
-      sym_true,
-      sym_false,
-      sym_none,
-  [14631] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1028), 13,
-      sym__string_start,
-      ts_builtin_sym_end,
-      anon_sym_LPAREN,
-      anon_sym_except_STAR,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_LBRACE,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_TILDE,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(1030), 35,
-      anon_sym_import,
-      anon_sym_from,
-      anon_sym_STAR,
-      anon_sym_print,
-      anon_sym_assert,
-      anon_sym_return,
-      anon_sym_del,
-      anon_sym_raise,
-      anon_sym_pass,
-      anon_sym_break,
-      anon_sym_continue,
-      anon_sym_if,
-      anon_sym_else,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_while,
-      anon_sym_try,
-      anon_sym_finally,
-      anon_sym_with,
-      anon_sym_match,
-      anon_sym_def,
-      anon_sym_global,
-      anon_sym_nonlocal,
-      anon_sym_exec,
-      anon_sym_type,
-      anon_sym_class,
-      anon_sym_not,
-      anon_sym_lambda,
-      anon_sym_yield,
-      sym_integer,
-      sym_identifier,
-      anon_sym_await,
-      sym_true,
-      sym_false,
-      sym_none,
-  [14687] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(991), 12,
-      sym__string_start,
-      ts_builtin_sym_end,
-      anon_sym_LPAREN,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_LBRACE,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_TILDE,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(989), 36,
-      anon_sym_import,
-      anon_sym_from,
-      anon_sym_STAR,
-      anon_sym_print,
-      anon_sym_assert,
-      anon_sym_return,
-      anon_sym_del,
-      anon_sym_raise,
-      anon_sym_pass,
-      anon_sym_break,
-      anon_sym_continue,
-      anon_sym_if,
-      anon_sym_else,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_while,
-      anon_sym_try,
-      anon_sym_except,
-      anon_sym_finally,
-      anon_sym_with,
-      anon_sym_match,
-      anon_sym_def,
-      anon_sym_global,
-      anon_sym_nonlocal,
-      anon_sym_exec,
-      anon_sym_type,
-      anon_sym_class,
-      anon_sym_not,
-      anon_sym_lambda,
-      anon_sym_yield,
-      sym_integer,
-      sym_identifier,
-      anon_sym_await,
-      sym_true,
-      sym_false,
-      sym_none,
-  [14743] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1032), 12,
-      sym__string_start,
-      ts_builtin_sym_end,
-      anon_sym_LPAREN,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_LBRACE,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_TILDE,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(1034), 36,
-      anon_sym_import,
-      anon_sym_from,
-      anon_sym_STAR,
-      anon_sym_print,
-      anon_sym_assert,
-      anon_sym_return,
-      anon_sym_del,
-      anon_sym_raise,
-      anon_sym_pass,
-      anon_sym_break,
-      anon_sym_continue,
-      anon_sym_if,
-      anon_sym_else,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_while,
-      anon_sym_try,
-      anon_sym_except,
-      anon_sym_finally,
-      anon_sym_with,
-      anon_sym_match,
-      anon_sym_def,
-      anon_sym_global,
-      anon_sym_nonlocal,
-      anon_sym_exec,
-      anon_sym_type,
-      anon_sym_class,
-      anon_sym_not,
-      anon_sym_lambda,
-      anon_sym_yield,
-      sym_integer,
-      sym_identifier,
-      anon_sym_await,
-      sym_true,
-      sym_false,
-      sym_none,
-  [14799] = 19,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(274), 1,
-      sym_identifier,
-    ACTIONS(278), 1,
-      anon_sym_LPAREN,
-    ACTIONS(293), 1,
-      anon_sym_LBRACK,
-    ACTIONS(295), 1,
-      anon_sym_LBRACE,
-    ACTIONS(299), 1,
-      anon_sym_not,
-    ACTIONS(305), 1,
-      anon_sym_lambda,
-    ACTIONS(313), 1,
-      anon_sym_await,
-    ACTIONS(315), 1,
-      sym__string_start,
-    STATE(600), 1,
-      sym_string,
-    STATE(630), 1,
-      sym_primary_expression,
-    STATE(1022), 1,
-      sym_expression,
-    STATE(1483), 1,
-      sym_type,
-    ACTIONS(309), 2,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(301), 3,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_TILDE,
-    ACTIONS(311), 4,
-      sym_integer,
-      sym_true,
-      sym_false,
-      sym_none,
-    ACTIONS(285), 5,
-      anon_sym_print,
-      anon_sym_async,
-      anon_sym_match,
-      anon_sym_exec,
-      anon_sym_type,
-    STATE(900), 7,
-      sym_named_expression,
-      sym_not_operator,
-      sym_boolean_operator,
-      sym_comparison_operator,
-      sym_lambda,
-      sym_conditional_expression,
       sym_await,
-    STATE(642), 15,
-      sym_binary_operator,
-      sym_unary_operator,
-      sym_attribute,
-      sym_subscript,
-      sym_call,
-      sym_list,
-      sym_set,
-      sym_tuple,
-      sym_dictionary,
-      sym_list_comprehension,
-      sym_dictionary_comprehension,
-      sym_set_comprehension,
-      sym_generator_expression,
-      sym_parenthesized_expression,
-      sym_concatenated_string,
-  [14887] = 19,
+  [15734] = 8,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(274), 1,
-      sym_identifier,
-    ACTIONS(278), 1,
-      anon_sym_LPAREN,
-    ACTIONS(293), 1,
-      anon_sym_LBRACK,
-    ACTIONS(295), 1,
-      anon_sym_LBRACE,
-    ACTIONS(299), 1,
-      anon_sym_not,
-    ACTIONS(305), 1,
-      anon_sym_lambda,
-    ACTIONS(313), 1,
-      anon_sym_await,
-    ACTIONS(315), 1,
-      sym__string_start,
-    STATE(600), 1,
-      sym_string,
-    STATE(630), 1,
-      sym_primary_expression,
-    STATE(1022), 1,
-      sym_expression,
-    STATE(1482), 1,
-      sym_type,
-    ACTIONS(309), 2,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(301), 3,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_TILDE,
-    ACTIONS(311), 4,
-      sym_integer,
-      sym_true,
-      sym_false,
-      sym_none,
-    ACTIONS(285), 5,
-      anon_sym_print,
-      anon_sym_async,
-      anon_sym_match,
-      anon_sym_exec,
-      anon_sym_type,
-    STATE(900), 7,
-      sym_named_expression,
-      sym_not_operator,
-      sym_boolean_operator,
-      sym_comparison_operator,
-      sym_lambda,
-      sym_conditional_expression,
-      sym_await,
-    STATE(642), 15,
-      sym_binary_operator,
-      sym_unary_operator,
-      sym_attribute,
-      sym_subscript,
-      sym_call,
-      sym_list,
-      sym_set,
-      sym_tuple,
-      sym_dictionary,
-      sym_list_comprehension,
-      sym_dictionary_comprehension,
-      sym_set_comprehension,
-      sym_generator_expression,
-      sym_parenthesized_expression,
-      sym_concatenated_string,
-  [14975] = 19,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(274), 1,
-      sym_identifier,
-    ACTIONS(278), 1,
-      anon_sym_LPAREN,
-    ACTIONS(293), 1,
-      anon_sym_LBRACK,
-    ACTIONS(295), 1,
-      anon_sym_LBRACE,
-    ACTIONS(299), 1,
-      anon_sym_not,
-    ACTIONS(305), 1,
-      anon_sym_lambda,
-    ACTIONS(313), 1,
-      anon_sym_await,
-    ACTIONS(315), 1,
-      sym__string_start,
-    STATE(600), 1,
-      sym_string,
-    STATE(630), 1,
-      sym_primary_expression,
-    STATE(1022), 1,
-      sym_expression,
-    STATE(1480), 1,
-      sym_type,
-    ACTIONS(309), 2,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(301), 3,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_TILDE,
-    ACTIONS(311), 4,
-      sym_integer,
-      sym_true,
-      sym_false,
-      sym_none,
-    ACTIONS(285), 5,
-      anon_sym_print,
-      anon_sym_async,
-      anon_sym_match,
-      anon_sym_exec,
-      anon_sym_type,
-    STATE(900), 7,
-      sym_named_expression,
-      sym_not_operator,
-      sym_boolean_operator,
-      sym_comparison_operator,
-      sym_lambda,
-      sym_conditional_expression,
-      sym_await,
-    STATE(642), 15,
-      sym_binary_operator,
-      sym_unary_operator,
-      sym_attribute,
-      sym_subscript,
-      sym_call,
-      sym_list,
-      sym_set,
-      sym_tuple,
-      sym_dictionary,
-      sym_list_comprehension,
-      sym_dictionary_comprehension,
-      sym_set_comprehension,
-      sym_generator_expression,
-      sym_parenthesized_expression,
-      sym_concatenated_string,
-  [15063] = 19,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(274), 1,
-      sym_identifier,
-    ACTIONS(278), 1,
-      anon_sym_LPAREN,
-    ACTIONS(293), 1,
-      anon_sym_LBRACK,
-    ACTIONS(295), 1,
-      anon_sym_LBRACE,
-    ACTIONS(299), 1,
-      anon_sym_not,
-    ACTIONS(305), 1,
-      anon_sym_lambda,
-    ACTIONS(313), 1,
-      anon_sym_await,
-    ACTIONS(315), 1,
-      sym__string_start,
-    STATE(600), 1,
-      sym_string,
-    STATE(630), 1,
-      sym_primary_expression,
-    STATE(1022), 1,
-      sym_expression,
-    STATE(1478), 1,
-      sym_type,
-    ACTIONS(309), 2,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(301), 3,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_TILDE,
-    ACTIONS(311), 4,
-      sym_integer,
-      sym_true,
-      sym_false,
-      sym_none,
-    ACTIONS(285), 5,
-      anon_sym_print,
-      anon_sym_async,
-      anon_sym_match,
-      anon_sym_exec,
-      anon_sym_type,
-    STATE(900), 7,
-      sym_named_expression,
-      sym_not_operator,
-      sym_boolean_operator,
-      sym_comparison_operator,
-      sym_lambda,
-      sym_conditional_expression,
-      sym_await,
-    STATE(642), 15,
-      sym_binary_operator,
-      sym_unary_operator,
-      sym_attribute,
-      sym_subscript,
-      sym_call,
-      sym_list,
-      sym_set,
-      sym_tuple,
-      sym_dictionary,
-      sym_list_comprehension,
-      sym_dictionary_comprehension,
-      sym_set_comprehension,
-      sym_generator_expression,
-      sym_parenthesized_expression,
-      sym_concatenated_string,
-  [15151] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1036), 12,
-      sym__string_start,
-      ts_builtin_sym_end,
-      anon_sym_LPAREN,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_LBRACE,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_TILDE,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(1038), 36,
-      anon_sym_import,
-      anon_sym_from,
-      anon_sym_STAR,
-      anon_sym_print,
-      anon_sym_assert,
-      anon_sym_return,
-      anon_sym_del,
-      anon_sym_raise,
-      anon_sym_pass,
-      anon_sym_break,
-      anon_sym_continue,
-      anon_sym_if,
-      anon_sym_else,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_while,
-      anon_sym_try,
-      anon_sym_except,
-      anon_sym_finally,
-      anon_sym_with,
-      anon_sym_match,
-      anon_sym_def,
-      anon_sym_global,
-      anon_sym_nonlocal,
-      anon_sym_exec,
-      anon_sym_type,
-      anon_sym_class,
-      anon_sym_not,
-      anon_sym_lambda,
-      anon_sym_yield,
-      sym_integer,
-      sym_identifier,
-      anon_sym_await,
-      sym_true,
-      sym_false,
-      sym_none,
-  [15207] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(966), 12,
-      sym__string_start,
-      ts_builtin_sym_end,
-      anon_sym_LPAREN,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_LBRACE,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_TILDE,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(968), 36,
-      anon_sym_import,
-      anon_sym_from,
-      anon_sym_STAR,
-      anon_sym_print,
-      anon_sym_assert,
-      anon_sym_return,
-      anon_sym_del,
-      anon_sym_raise,
-      anon_sym_pass,
-      anon_sym_break,
-      anon_sym_continue,
-      anon_sym_if,
-      anon_sym_else,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_while,
-      anon_sym_try,
-      anon_sym_except,
-      anon_sym_finally,
-      anon_sym_with,
-      anon_sym_match,
-      anon_sym_def,
-      anon_sym_global,
-      anon_sym_nonlocal,
-      anon_sym_exec,
-      anon_sym_type,
-      anon_sym_class,
-      anon_sym_not,
-      anon_sym_lambda,
-      anon_sym_yield,
-      sym_integer,
-      sym_identifier,
-      anon_sym_await,
-      sym_true,
-      sym_false,
-      sym_none,
-  [15263] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1022), 13,
-      sym__string_start,
-      ts_builtin_sym_end,
-      anon_sym_LPAREN,
-      anon_sym_except_STAR,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_LBRACE,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_TILDE,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(1020), 35,
-      anon_sym_import,
-      anon_sym_from,
-      anon_sym_STAR,
-      anon_sym_print,
-      anon_sym_assert,
-      anon_sym_return,
-      anon_sym_del,
-      anon_sym_raise,
-      anon_sym_pass,
-      anon_sym_break,
-      anon_sym_continue,
-      anon_sym_if,
-      anon_sym_else,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_while,
-      anon_sym_try,
-      anon_sym_finally,
-      anon_sym_with,
-      anon_sym_match,
-      anon_sym_def,
-      anon_sym_global,
-      anon_sym_nonlocal,
-      anon_sym_exec,
-      anon_sym_type,
-      anon_sym_class,
-      anon_sym_not,
-      anon_sym_lambda,
-      anon_sym_yield,
-      sym_integer,
-      sym_identifier,
-      anon_sym_await,
-      sym_true,
-      sym_false,
-      sym_none,
-  [15319] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1040), 12,
-      sym__string_start,
-      ts_builtin_sym_end,
-      anon_sym_LPAREN,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_LBRACE,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_TILDE,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(1042), 36,
-      anon_sym_import,
-      anon_sym_from,
-      anon_sym_STAR,
-      anon_sym_print,
-      anon_sym_assert,
-      anon_sym_return,
-      anon_sym_del,
-      anon_sym_raise,
-      anon_sym_pass,
-      anon_sym_break,
-      anon_sym_continue,
-      anon_sym_if,
-      anon_sym_else,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_while,
-      anon_sym_try,
-      anon_sym_except,
-      anon_sym_finally,
-      anon_sym_with,
-      anon_sym_match,
-      anon_sym_def,
-      anon_sym_global,
-      anon_sym_nonlocal,
-      anon_sym_exec,
-      anon_sym_type,
-      anon_sym_class,
-      anon_sym_not,
-      anon_sym_lambda,
-      anon_sym_yield,
-      sym_integer,
-      sym_identifier,
-      anon_sym_await,
-      sym_true,
-      sym_false,
-      sym_none,
-  [15375] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1044), 13,
-      sym__string_start,
-      ts_builtin_sym_end,
-      anon_sym_LPAREN,
-      anon_sym_except_STAR,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_LBRACE,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_TILDE,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(1046), 35,
-      anon_sym_import,
-      anon_sym_from,
-      anon_sym_STAR,
-      anon_sym_print,
-      anon_sym_assert,
-      anon_sym_return,
-      anon_sym_del,
-      anon_sym_raise,
-      anon_sym_pass,
-      anon_sym_break,
-      anon_sym_continue,
-      anon_sym_if,
-      anon_sym_else,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_while,
-      anon_sym_try,
-      anon_sym_finally,
-      anon_sym_with,
-      anon_sym_match,
-      anon_sym_def,
-      anon_sym_global,
-      anon_sym_nonlocal,
-      anon_sym_exec,
-      anon_sym_type,
-      anon_sym_class,
-      anon_sym_not,
-      anon_sym_lambda,
-      anon_sym_yield,
-      sym_integer,
-      sym_identifier,
-      anon_sym_await,
-      sym_true,
-      sym_false,
-      sym_none,
-  [15431] = 7,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1050), 1,
+    ACTIONS(264), 1,
       anon_sym_COMMA,
-    ACTIONS(1055), 1,
+    ACTIONS(271), 1,
       anon_sym_COLON_EQ,
-    ACTIONS(1057), 2,
+    ACTIONS(1010), 1,
+      sym_identifier,
+    ACTIONS(273), 2,
       anon_sym_COLON,
       anon_sym_EQ,
-    ACTIONS(1059), 13,
+    ACTIONS(287), 10,
+      sym__newline,
+      anon_sym_DOT,
+      anon_sym_LPAREN,
+      anon_sym_LBRACK,
+      anon_sym_LT_EQ,
+      anon_sym_EQ_EQ,
+      anon_sym_BANG_EQ,
+      anon_sym_GT_EQ,
+      anon_sym_LT_GT,
+      sym__semicolon,
+    ACTIONS(291), 13,
       anon_sym_PLUS_EQ,
       anon_sym_DASH_EQ,
       anon_sym_STAR_EQ,
@@ -38639,7 +35334,744 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_AMP_EQ,
       anon_sym_CARET_EQ,
       anon_sym_PIPE_EQ,
-    ACTIONS(1053), 15,
+    ACTIONS(260), 21,
+      anon_sym_STAR,
+      anon_sym_GT_GT,
+      anon_sym_if,
+      anon_sym_in,
+      anon_sym_PIPE,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_not,
+      anon_sym_and,
+      anon_sym_or,
+      anon_sym_SLASH,
+      anon_sym_PERCENT,
+      anon_sym_SLASH_SLASH,
+      anon_sym_AMP,
+      anon_sym_CARET,
+      anon_sym_LT_LT,
+      anon_sym_LT,
+      anon_sym_GT,
+      anon_sym_is,
+  [15801] = 19,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(279), 1,
+      anon_sym_LBRACE,
+    ACTIONS(299), 1,
+      sym__string_start,
+    ACTIONS(578), 1,
+      anon_sym_LPAREN,
+    ACTIONS(584), 1,
+      anon_sym_LBRACK,
+    ACTIONS(626), 1,
+      anon_sym_not,
+    ACTIONS(668), 1,
+      sym_identifier,
+    ACTIONS(678), 1,
+      anon_sym_await,
+    ACTIONS(760), 1,
+      anon_sym_lambda,
+    STATE(586), 1,
+      sym_string,
+    STATE(590), 1,
+      sym_primary_expression,
+    STATE(935), 1,
+      sym_expression,
+    ACTIONS(293), 2,
+      sym_ellipsis,
+      sym_float,
+    STATE(957), 2,
+      sym__expression_within_for_in_clause,
+      sym_lambda_within_for_in_clause,
+    ACTIONS(582), 3,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_TILDE,
+    ACTIONS(295), 4,
+      sym_integer,
+      sym_true,
+      sym_false,
+      sym_none,
+    ACTIONS(674), 5,
+      anon_sym_print,
+      anon_sym_async,
+      anon_sym_match,
+      anon_sym_exec,
+      anon_sym_type,
+    STATE(883), 6,
+      sym_named_expression,
+      sym_not_operator,
+      sym_boolean_operator,
+      sym_comparison_operator,
+      sym_lambda,
+      sym_conditional_expression,
+    STATE(605), 16,
+      sym_binary_operator,
+      sym_unary_operator,
+      sym_attribute,
+      sym_subscript,
+      sym_call,
+      sym_list,
+      sym_set,
+      sym_tuple,
+      sym_dictionary,
+      sym_list_comprehension,
+      sym_dictionary_comprehension,
+      sym_set_comprehension,
+      sym_generator_expression,
+      sym_parenthesized_expression,
+      sym_concatenated_string,
+      sym_await,
+  [15890] = 20,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(592), 1,
+      anon_sym_LPAREN,
+    ACTIONS(600), 1,
+      anon_sym_LBRACK,
+    ACTIONS(602), 1,
+      anon_sym_LBRACE,
+    ACTIONS(608), 1,
+      sym__string_start,
+    ACTIONS(977), 1,
+      sym_identifier,
+    ACTIONS(985), 1,
+      anon_sym_not,
+    ACTIONS(987), 1,
+      anon_sym_lambda,
+    ACTIONS(989), 1,
+      anon_sym_await,
+    ACTIONS(1012), 1,
+      anon_sym_STAR,
+    ACTIONS(1014), 1,
+      anon_sym_COLON,
+    STATE(713), 1,
+      sym_string,
+    STATE(726), 1,
+      sym_primary_expression,
+    STATE(1056), 1,
+      sym_expression,
+    ACTIONS(604), 2,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(598), 3,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_TILDE,
+    ACTIONS(590), 4,
+      sym_integer,
+      sym_true,
+      sym_false,
+      sym_none,
+    ACTIONS(981), 5,
+      anon_sym_print,
+      anon_sym_async,
+      anon_sym_match,
+      anon_sym_exec,
+      anon_sym_type,
+    STATE(1003), 6,
+      sym_named_expression,
+      sym_not_operator,
+      sym_boolean_operator,
+      sym_comparison_operator,
+      sym_lambda,
+      sym_conditional_expression,
+    STATE(827), 16,
+      sym_binary_operator,
+      sym_unary_operator,
+      sym_attribute,
+      sym_subscript,
+      sym_call,
+      sym_list,
+      sym_set,
+      sym_tuple,
+      sym_dictionary,
+      sym_list_comprehension,
+      sym_dictionary_comprehension,
+      sym_set_comprehension,
+      sym_generator_expression,
+      sym_parenthesized_expression,
+      sym_concatenated_string,
+      sym_await,
+  [15981] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1018), 12,
+      sym__dedent,
+      sym__string_start,
+      anon_sym_LPAREN,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_LBRACE,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_TILDE,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(1016), 36,
+      anon_sym_import,
+      anon_sym_from,
+      anon_sym_STAR,
+      anon_sym_print,
+      anon_sym_assert,
+      anon_sym_return,
+      anon_sym_del,
+      anon_sym_raise,
+      anon_sym_pass,
+      anon_sym_break,
+      anon_sym_continue,
+      anon_sym_if,
+      anon_sym_else,
+      anon_sym_async,
+      anon_sym_for,
+      anon_sym_while,
+      anon_sym_try,
+      anon_sym_except,
+      anon_sym_finally,
+      anon_sym_with,
+      anon_sym_match,
+      anon_sym_def,
+      anon_sym_global,
+      anon_sym_nonlocal,
+      anon_sym_exec,
+      anon_sym_type,
+      anon_sym_class,
+      anon_sym_not,
+      anon_sym_lambda,
+      anon_sym_yield,
+      sym_integer,
+      sym_identifier,
+      anon_sym_await,
+      sym_true,
+      sym_false,
+      sym_none,
+  [16037] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(806), 16,
+      anon_sym_STAR,
+      anon_sym_GT_GT,
+      anon_sym_PIPE,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_STAR_STAR,
+      anon_sym_EQ,
+      anon_sym_AT,
+      anon_sym_SLASH,
+      anon_sym_PERCENT,
+      anon_sym_SLASH_SLASH,
+      anon_sym_AMP,
+      anon_sym_CARET,
+      anon_sym_LT_LT,
+      anon_sym_LT,
+      anon_sym_GT,
+    ACTIONS(804), 32,
+      sym__newline,
+      anon_sym_DOT,
+      anon_sym_from,
+      anon_sym_LPAREN,
+      anon_sym_COMMA,
+      anon_sym_if,
+      anon_sym_COLON,
+      anon_sym_in,
+      anon_sym_LBRACK,
+      anon_sym_not,
+      anon_sym_and,
+      anon_sym_or,
+      anon_sym_LT_EQ,
+      anon_sym_EQ_EQ,
+      anon_sym_BANG_EQ,
+      anon_sym_GT_EQ,
+      anon_sym_LT_GT,
+      anon_sym_is,
+      anon_sym_PLUS_EQ,
+      anon_sym_DASH_EQ,
+      anon_sym_STAR_EQ,
+      anon_sym_SLASH_EQ,
+      anon_sym_AT_EQ,
+      anon_sym_SLASH_SLASH_EQ,
+      anon_sym_PERCENT_EQ,
+      anon_sym_STAR_STAR_EQ,
+      anon_sym_GT_GT_EQ,
+      anon_sym_LT_LT_EQ,
+      anon_sym_AMP_EQ,
+      anon_sym_CARET_EQ,
+      anon_sym_PIPE_EQ,
+      sym__semicolon,
+  [16093] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(814), 16,
+      anon_sym_STAR,
+      anon_sym_GT_GT,
+      anon_sym_PIPE,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_STAR_STAR,
+      anon_sym_EQ,
+      anon_sym_AT,
+      anon_sym_SLASH,
+      anon_sym_PERCENT,
+      anon_sym_SLASH_SLASH,
+      anon_sym_AMP,
+      anon_sym_CARET,
+      anon_sym_LT_LT,
+      anon_sym_LT,
+      anon_sym_GT,
+    ACTIONS(812), 32,
+      sym__newline,
+      anon_sym_DOT,
+      anon_sym_from,
+      anon_sym_LPAREN,
+      anon_sym_COMMA,
+      anon_sym_if,
+      anon_sym_COLON,
+      anon_sym_in,
+      anon_sym_LBRACK,
+      anon_sym_not,
+      anon_sym_and,
+      anon_sym_or,
+      anon_sym_LT_EQ,
+      anon_sym_EQ_EQ,
+      anon_sym_BANG_EQ,
+      anon_sym_GT_EQ,
+      anon_sym_LT_GT,
+      anon_sym_is,
+      anon_sym_PLUS_EQ,
+      anon_sym_DASH_EQ,
+      anon_sym_STAR_EQ,
+      anon_sym_SLASH_EQ,
+      anon_sym_AT_EQ,
+      anon_sym_SLASH_SLASH_EQ,
+      anon_sym_PERCENT_EQ,
+      anon_sym_STAR_STAR_EQ,
+      anon_sym_GT_GT_EQ,
+      anon_sym_LT_LT_EQ,
+      anon_sym_AMP_EQ,
+      anon_sym_CARET_EQ,
+      anon_sym_PIPE_EQ,
+      sym__semicolon,
+  [16149] = 5,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1024), 1,
+      anon_sym_case,
+    STATE(328), 2,
+      sym_case_block,
+      aux_sym_cases_repeat1,
+    ACTIONS(1022), 12,
+      sym__dedent,
+      sym__string_start,
+      anon_sym_LPAREN,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_LBRACE,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_TILDE,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(1020), 33,
+      anon_sym_import,
+      anon_sym_from,
+      anon_sym_STAR,
+      anon_sym_print,
+      anon_sym_assert,
+      anon_sym_return,
+      anon_sym_del,
+      anon_sym_raise,
+      anon_sym_pass,
+      anon_sym_break,
+      anon_sym_continue,
+      anon_sym_if,
+      anon_sym_async,
+      anon_sym_for,
+      anon_sym_while,
+      anon_sym_try,
+      anon_sym_with,
+      anon_sym_match,
+      anon_sym_def,
+      anon_sym_global,
+      anon_sym_nonlocal,
+      anon_sym_exec,
+      anon_sym_type,
+      anon_sym_class,
+      anon_sym_not,
+      anon_sym_lambda,
+      anon_sym_yield,
+      sym_integer,
+      sym_identifier,
+      anon_sym_await,
+      sym_true,
+      sym_false,
+      sym_none,
+  [16209] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1027), 12,
+      sym__string_start,
+      ts_builtin_sym_end,
+      anon_sym_LPAREN,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_LBRACE,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_TILDE,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(1029), 36,
+      anon_sym_import,
+      anon_sym_from,
+      anon_sym_STAR,
+      anon_sym_print,
+      anon_sym_assert,
+      anon_sym_return,
+      anon_sym_del,
+      anon_sym_raise,
+      anon_sym_pass,
+      anon_sym_break,
+      anon_sym_continue,
+      anon_sym_if,
+      anon_sym_else,
+      anon_sym_async,
+      anon_sym_for,
+      anon_sym_while,
+      anon_sym_try,
+      anon_sym_except,
+      anon_sym_finally,
+      anon_sym_with,
+      anon_sym_match,
+      anon_sym_def,
+      anon_sym_global,
+      anon_sym_nonlocal,
+      anon_sym_exec,
+      anon_sym_type,
+      anon_sym_class,
+      anon_sym_not,
+      anon_sym_lambda,
+      anon_sym_yield,
+      sym_integer,
+      sym_identifier,
+      anon_sym_await,
+      sym_true,
+      sym_false,
+      sym_none,
+  [16265] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1031), 12,
+      sym__string_start,
+      ts_builtin_sym_end,
+      anon_sym_LPAREN,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_LBRACE,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_TILDE,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(1033), 36,
+      anon_sym_import,
+      anon_sym_from,
+      anon_sym_STAR,
+      anon_sym_print,
+      anon_sym_assert,
+      anon_sym_return,
+      anon_sym_del,
+      anon_sym_raise,
+      anon_sym_pass,
+      anon_sym_break,
+      anon_sym_continue,
+      anon_sym_if,
+      anon_sym_else,
+      anon_sym_async,
+      anon_sym_for,
+      anon_sym_while,
+      anon_sym_try,
+      anon_sym_except,
+      anon_sym_finally,
+      anon_sym_with,
+      anon_sym_match,
+      anon_sym_def,
+      anon_sym_global,
+      anon_sym_nonlocal,
+      anon_sym_exec,
+      anon_sym_type,
+      anon_sym_class,
+      anon_sym_not,
+      anon_sym_lambda,
+      anon_sym_yield,
+      sym_integer,
+      sym_identifier,
+      anon_sym_await,
+      sym_true,
+      sym_false,
+      sym_none,
+  [16321] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1035), 12,
+      sym__string_start,
+      ts_builtin_sym_end,
+      anon_sym_LPAREN,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_LBRACE,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_TILDE,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(1037), 36,
+      anon_sym_import,
+      anon_sym_from,
+      anon_sym_STAR,
+      anon_sym_print,
+      anon_sym_assert,
+      anon_sym_return,
+      anon_sym_del,
+      anon_sym_raise,
+      anon_sym_pass,
+      anon_sym_break,
+      anon_sym_continue,
+      anon_sym_if,
+      anon_sym_else,
+      anon_sym_async,
+      anon_sym_for,
+      anon_sym_while,
+      anon_sym_try,
+      anon_sym_except,
+      anon_sym_finally,
+      anon_sym_with,
+      anon_sym_match,
+      anon_sym_def,
+      anon_sym_global,
+      anon_sym_nonlocal,
+      anon_sym_exec,
+      anon_sym_type,
+      anon_sym_class,
+      anon_sym_not,
+      anon_sym_lambda,
+      anon_sym_yield,
+      sym_integer,
+      sym_identifier,
+      anon_sym_await,
+      sym_true,
+      sym_false,
+      sym_none,
+  [16377] = 19,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(592), 1,
+      anon_sym_LPAREN,
+    ACTIONS(600), 1,
+      anon_sym_LBRACK,
+    ACTIONS(602), 1,
+      anon_sym_LBRACE,
+    ACTIONS(608), 1,
+      sym__string_start,
+    ACTIONS(977), 1,
+      sym_identifier,
+    ACTIONS(985), 1,
+      anon_sym_not,
+    ACTIONS(987), 1,
+      anon_sym_lambda,
+    ACTIONS(989), 1,
+      anon_sym_await,
+    ACTIONS(1014), 1,
+      anon_sym_COLON,
+    STATE(713), 1,
+      sym_string,
+    STATE(726), 1,
+      sym_primary_expression,
+    STATE(1056), 1,
+      sym_expression,
+    ACTIONS(604), 2,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(598), 3,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_TILDE,
+    ACTIONS(590), 4,
+      sym_integer,
+      sym_true,
+      sym_false,
+      sym_none,
+    ACTIONS(981), 5,
+      anon_sym_print,
+      anon_sym_async,
+      anon_sym_match,
+      anon_sym_exec,
+      anon_sym_type,
+    STATE(1003), 6,
+      sym_named_expression,
+      sym_not_operator,
+      sym_boolean_operator,
+      sym_comparison_operator,
+      sym_lambda,
+      sym_conditional_expression,
+    STATE(827), 16,
+      sym_binary_operator,
+      sym_unary_operator,
+      sym_attribute,
+      sym_subscript,
+      sym_call,
+      sym_list,
+      sym_set,
+      sym_tuple,
+      sym_dictionary,
+      sym_list_comprehension,
+      sym_dictionary_comprehension,
+      sym_set_comprehension,
+      sym_generator_expression,
+      sym_parenthesized_expression,
+      sym_concatenated_string,
+      sym_await,
+  [16465] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1039), 12,
+      sym__string_start,
+      ts_builtin_sym_end,
+      anon_sym_LPAREN,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_LBRACE,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_TILDE,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(1041), 36,
+      anon_sym_import,
+      anon_sym_from,
+      anon_sym_STAR,
+      anon_sym_print,
+      anon_sym_assert,
+      anon_sym_return,
+      anon_sym_del,
+      anon_sym_raise,
+      anon_sym_pass,
+      anon_sym_break,
+      anon_sym_continue,
+      anon_sym_if,
+      anon_sym_else,
+      anon_sym_async,
+      anon_sym_for,
+      anon_sym_while,
+      anon_sym_try,
+      anon_sym_except,
+      anon_sym_finally,
+      anon_sym_with,
+      anon_sym_match,
+      anon_sym_def,
+      anon_sym_global,
+      anon_sym_nonlocal,
+      anon_sym_exec,
+      anon_sym_type,
+      anon_sym_class,
+      anon_sym_not,
+      anon_sym_lambda,
+      anon_sym_yield,
+      sym_integer,
+      sym_identifier,
+      anon_sym_await,
+      sym_true,
+      sym_false,
+      sym_none,
+  [16521] = 5,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1047), 1,
+      anon_sym_case,
+    STATE(328), 2,
+      sym_case_block,
+      aux_sym_cases_repeat1,
+    ACTIONS(1045), 12,
+      sym__dedent,
+      sym__string_start,
+      anon_sym_LPAREN,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_LBRACE,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_TILDE,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(1043), 33,
+      anon_sym_import,
+      anon_sym_from,
+      anon_sym_STAR,
+      anon_sym_print,
+      anon_sym_assert,
+      anon_sym_return,
+      anon_sym_del,
+      anon_sym_raise,
+      anon_sym_pass,
+      anon_sym_break,
+      anon_sym_continue,
+      anon_sym_if,
+      anon_sym_async,
+      anon_sym_for,
+      anon_sym_while,
+      anon_sym_try,
+      anon_sym_with,
+      anon_sym_match,
+      anon_sym_def,
+      anon_sym_global,
+      anon_sym_nonlocal,
+      anon_sym_exec,
+      anon_sym_type,
+      anon_sym_class,
+      anon_sym_not,
+      anon_sym_lambda,
+      anon_sym_yield,
+      sym_integer,
+      sym_identifier,
+      anon_sym_await,
+      sym_true,
+      sym_false,
+      sym_none,
+  [16581] = 7,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(264), 1,
+      anon_sym_COMMA,
+    ACTIONS(271), 1,
+      anon_sym_COLON_EQ,
+    ACTIONS(273), 2,
+      anon_sym_COLON,
+      anon_sym_EQ,
+    ACTIONS(291), 13,
+      anon_sym_PLUS_EQ,
+      anon_sym_DASH_EQ,
+      anon_sym_STAR_EQ,
+      anon_sym_SLASH_EQ,
+      anon_sym_AT_EQ,
+      anon_sym_SLASH_SLASH_EQ,
+      anon_sym_PERCENT_EQ,
+      anon_sym_STAR_STAR_EQ,
+      anon_sym_GT_GT_EQ,
+      anon_sym_LT_LT_EQ,
+      anon_sym_AMP_EQ,
+      anon_sym_CARET_EQ,
+      anon_sym_PIPE_EQ,
+    ACTIONS(260), 15,
       anon_sym_STAR,
       anon_sym_GT_GT,
       anon_sym_PIPE,
@@ -38655,7 +36087,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_LT_LT,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1048), 16,
+    ACTIONS(287), 16,
       sym__newline,
       anon_sym_DOT,
       anon_sym_LPAREN,
@@ -38672,65 +36104,12 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_LT_GT,
       anon_sym_is,
       sym__semicolon,
-  [15495] = 3,
+  [16645] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1061), 13,
+    ACTIONS(1051), 12,
+      sym__dedent,
       sym__string_start,
-      ts_builtin_sym_end,
-      anon_sym_LPAREN,
-      anon_sym_except_STAR,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_LBRACE,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_TILDE,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(1063), 35,
-      anon_sym_import,
-      anon_sym_from,
-      anon_sym_STAR,
-      anon_sym_print,
-      anon_sym_assert,
-      anon_sym_return,
-      anon_sym_del,
-      anon_sym_raise,
-      anon_sym_pass,
-      anon_sym_break,
-      anon_sym_continue,
-      anon_sym_if,
-      anon_sym_else,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_while,
-      anon_sym_try,
-      anon_sym_finally,
-      anon_sym_with,
-      anon_sym_match,
-      anon_sym_def,
-      anon_sym_global,
-      anon_sym_nonlocal,
-      anon_sym_exec,
-      anon_sym_type,
-      anon_sym_class,
-      anon_sym_not,
-      anon_sym_lambda,
-      anon_sym_yield,
-      sym_integer,
-      sym_identifier,
-      anon_sym_await,
-      sym_true,
-      sym_false,
-      sym_none,
-  [15551] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1026), 12,
-      sym__string_start,
-      ts_builtin_sym_end,
       anon_sym_LPAREN,
       anon_sym_DASH,
       anon_sym_PLUS,
@@ -38741,7 +36120,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_TILDE,
       sym_ellipsis,
       sym_float,
-    ACTIONS(1024), 36,
+    ACTIONS(1049), 36,
       anon_sym_import,
       anon_sym_from,
       anon_sym_STAR,
@@ -38778,12 +36157,12 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-  [15607] = 3,
+  [16701] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1065), 12,
+    ACTIONS(1055), 12,
+      sym__dedent,
       sym__string_start,
-      ts_builtin_sym_end,
       anon_sym_LPAREN,
       anon_sym_DASH,
       anon_sym_PLUS,
@@ -38794,7 +36173,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_TILDE,
       sym_ellipsis,
       sym_float,
-    ACTIONS(1067), 36,
+    ACTIONS(1053), 36,
       anon_sym_import,
       anon_sym_from,
       anon_sym_STAR,
@@ -38831,17 +36210,701 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-  [15663] = 7,
+  [16757] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(280), 1,
-      anon_sym_COMMA,
-    ACTIONS(287), 1,
-      anon_sym_COLON_EQ,
-    ACTIONS(289), 2,
-      anon_sym_COLON,
+    ACTIONS(1059), 12,
+      sym__dedent,
+      sym__string_start,
+      anon_sym_LPAREN,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_LBRACE,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_TILDE,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(1057), 36,
+      anon_sym_import,
+      anon_sym_from,
+      anon_sym_STAR,
+      anon_sym_print,
+      anon_sym_assert,
+      anon_sym_return,
+      anon_sym_del,
+      anon_sym_raise,
+      anon_sym_pass,
+      anon_sym_break,
+      anon_sym_continue,
+      anon_sym_if,
+      anon_sym_else,
+      anon_sym_async,
+      anon_sym_for,
+      anon_sym_while,
+      anon_sym_try,
+      anon_sym_except,
+      anon_sym_finally,
+      anon_sym_with,
+      anon_sym_match,
+      anon_sym_def,
+      anon_sym_global,
+      anon_sym_nonlocal,
+      anon_sym_exec,
+      anon_sym_type,
+      anon_sym_class,
+      anon_sym_not,
+      anon_sym_lambda,
+      anon_sym_yield,
+      sym_integer,
+      sym_identifier,
+      anon_sym_await,
+      sym_true,
+      sym_false,
+      sym_none,
+  [16813] = 5,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1061), 1,
+      anon_sym_case,
+    STATE(339), 2,
+      sym_case_block,
+      aux_sym_cases_repeat1,
+    ACTIONS(1022), 12,
+      sym__string_start,
+      ts_builtin_sym_end,
+      anon_sym_LPAREN,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_LBRACE,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_TILDE,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(1020), 33,
+      anon_sym_import,
+      anon_sym_from,
+      anon_sym_STAR,
+      anon_sym_print,
+      anon_sym_assert,
+      anon_sym_return,
+      anon_sym_del,
+      anon_sym_raise,
+      anon_sym_pass,
+      anon_sym_break,
+      anon_sym_continue,
+      anon_sym_if,
+      anon_sym_async,
+      anon_sym_for,
+      anon_sym_while,
+      anon_sym_try,
+      anon_sym_with,
+      anon_sym_match,
+      anon_sym_def,
+      anon_sym_global,
+      anon_sym_nonlocal,
+      anon_sym_exec,
+      anon_sym_type,
+      anon_sym_class,
+      anon_sym_not,
+      anon_sym_lambda,
+      anon_sym_yield,
+      sym_integer,
+      sym_identifier,
+      anon_sym_await,
+      sym_true,
+      sym_false,
+      sym_none,
+  [16873] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1064), 12,
+      sym__string_start,
+      ts_builtin_sym_end,
+      anon_sym_LPAREN,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_LBRACE,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_TILDE,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(1066), 36,
+      anon_sym_import,
+      anon_sym_from,
+      anon_sym_STAR,
+      anon_sym_print,
+      anon_sym_assert,
+      anon_sym_return,
+      anon_sym_del,
+      anon_sym_raise,
+      anon_sym_pass,
+      anon_sym_break,
+      anon_sym_continue,
+      anon_sym_if,
+      anon_sym_else,
+      anon_sym_async,
+      anon_sym_for,
+      anon_sym_while,
+      anon_sym_try,
+      anon_sym_except,
+      anon_sym_finally,
+      anon_sym_with,
+      anon_sym_match,
+      anon_sym_def,
+      anon_sym_global,
+      anon_sym_nonlocal,
+      anon_sym_exec,
+      anon_sym_type,
+      anon_sym_class,
+      anon_sym_not,
+      anon_sym_lambda,
+      anon_sym_yield,
+      sym_integer,
+      sym_identifier,
+      anon_sym_await,
+      sym_true,
+      sym_false,
+      sym_none,
+  [16929] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1068), 12,
+      sym__string_start,
+      ts_builtin_sym_end,
+      anon_sym_LPAREN,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_LBRACE,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_TILDE,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(1070), 36,
+      anon_sym_import,
+      anon_sym_from,
+      anon_sym_STAR,
+      anon_sym_print,
+      anon_sym_assert,
+      anon_sym_return,
+      anon_sym_del,
+      anon_sym_raise,
+      anon_sym_pass,
+      anon_sym_break,
+      anon_sym_continue,
+      anon_sym_if,
+      anon_sym_else,
+      anon_sym_async,
+      anon_sym_for,
+      anon_sym_while,
+      anon_sym_try,
+      anon_sym_except,
+      anon_sym_finally,
+      anon_sym_with,
+      anon_sym_match,
+      anon_sym_def,
+      anon_sym_global,
+      anon_sym_nonlocal,
+      anon_sym_exec,
+      anon_sym_type,
+      anon_sym_class,
+      anon_sym_not,
+      anon_sym_lambda,
+      anon_sym_yield,
+      sym_integer,
+      sym_identifier,
+      anon_sym_await,
+      sym_true,
+      sym_false,
+      sym_none,
+  [16985] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1068), 12,
+      sym__dedent,
+      sym__string_start,
+      anon_sym_LPAREN,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_LBRACE,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_TILDE,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(1070), 36,
+      anon_sym_import,
+      anon_sym_from,
+      anon_sym_STAR,
+      anon_sym_print,
+      anon_sym_assert,
+      anon_sym_return,
+      anon_sym_del,
+      anon_sym_raise,
+      anon_sym_pass,
+      anon_sym_break,
+      anon_sym_continue,
+      anon_sym_if,
+      anon_sym_else,
+      anon_sym_async,
+      anon_sym_for,
+      anon_sym_while,
+      anon_sym_try,
+      anon_sym_except,
+      anon_sym_finally,
+      anon_sym_with,
+      anon_sym_match,
+      anon_sym_def,
+      anon_sym_global,
+      anon_sym_nonlocal,
+      anon_sym_exec,
+      anon_sym_type,
+      anon_sym_class,
+      anon_sym_not,
+      anon_sym_lambda,
+      anon_sym_yield,
+      sym_integer,
+      sym_identifier,
+      anon_sym_await,
+      sym_true,
+      sym_false,
+      sym_none,
+  [17041] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1064), 12,
+      sym__dedent,
+      sym__string_start,
+      anon_sym_LPAREN,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_LBRACE,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_TILDE,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(1066), 36,
+      anon_sym_import,
+      anon_sym_from,
+      anon_sym_STAR,
+      anon_sym_print,
+      anon_sym_assert,
+      anon_sym_return,
+      anon_sym_del,
+      anon_sym_raise,
+      anon_sym_pass,
+      anon_sym_break,
+      anon_sym_continue,
+      anon_sym_if,
+      anon_sym_else,
+      anon_sym_async,
+      anon_sym_for,
+      anon_sym_while,
+      anon_sym_try,
+      anon_sym_except,
+      anon_sym_finally,
+      anon_sym_with,
+      anon_sym_match,
+      anon_sym_def,
+      anon_sym_global,
+      anon_sym_nonlocal,
+      anon_sym_exec,
+      anon_sym_type,
+      anon_sym_class,
+      anon_sym_not,
+      anon_sym_lambda,
+      anon_sym_yield,
+      sym_integer,
+      sym_identifier,
+      anon_sym_await,
+      sym_true,
+      sym_false,
+      sym_none,
+  [17097] = 19,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(592), 1,
+      anon_sym_LPAREN,
+    ACTIONS(600), 1,
+      anon_sym_LBRACK,
+    ACTIONS(602), 1,
+      anon_sym_LBRACE,
+    ACTIONS(608), 1,
+      sym__string_start,
+    ACTIONS(977), 1,
+      sym_identifier,
+    ACTIONS(985), 1,
+      anon_sym_not,
+    ACTIONS(987), 1,
+      anon_sym_lambda,
+    ACTIONS(989), 1,
+      anon_sym_await,
+    STATE(713), 1,
+      sym_string,
+    STATE(726), 1,
+      sym_primary_expression,
+    STATE(1033), 1,
+      sym_expression,
+    STATE(1268), 1,
+      sym_with_item,
+    ACTIONS(604), 2,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(598), 3,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_TILDE,
+    ACTIONS(590), 4,
+      sym_integer,
+      sym_true,
+      sym_false,
+      sym_none,
+    ACTIONS(981), 5,
+      anon_sym_print,
+      anon_sym_async,
+      anon_sym_match,
+      anon_sym_exec,
+      anon_sym_type,
+    STATE(1003), 6,
+      sym_named_expression,
+      sym_not_operator,
+      sym_boolean_operator,
+      sym_comparison_operator,
+      sym_lambda,
+      sym_conditional_expression,
+    STATE(827), 16,
+      sym_binary_operator,
+      sym_unary_operator,
+      sym_attribute,
+      sym_subscript,
+      sym_call,
+      sym_list,
+      sym_set,
+      sym_tuple,
+      sym_dictionary,
+      sym_list_comprehension,
+      sym_dictionary_comprehension,
+      sym_set_comprehension,
+      sym_generator_expression,
+      sym_parenthesized_expression,
+      sym_concatenated_string,
+      sym_await,
+  [17185] = 5,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1072), 1,
+      anon_sym_case,
+    STATE(339), 2,
+      sym_case_block,
+      aux_sym_cases_repeat1,
+    ACTIONS(1045), 12,
+      sym__string_start,
+      ts_builtin_sym_end,
+      anon_sym_LPAREN,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_LBRACE,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_TILDE,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(1043), 33,
+      anon_sym_import,
+      anon_sym_from,
+      anon_sym_STAR,
+      anon_sym_print,
+      anon_sym_assert,
+      anon_sym_return,
+      anon_sym_del,
+      anon_sym_raise,
+      anon_sym_pass,
+      anon_sym_break,
+      anon_sym_continue,
+      anon_sym_if,
+      anon_sym_async,
+      anon_sym_for,
+      anon_sym_while,
+      anon_sym_try,
+      anon_sym_with,
+      anon_sym_match,
+      anon_sym_def,
+      anon_sym_global,
+      anon_sym_nonlocal,
+      anon_sym_exec,
+      anon_sym_type,
+      anon_sym_class,
+      anon_sym_not,
+      anon_sym_lambda,
+      anon_sym_yield,
+      sym_integer,
+      sym_identifier,
+      anon_sym_await,
+      sym_true,
+      sym_false,
+      sym_none,
+  [17245] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1039), 12,
+      sym__dedent,
+      sym__string_start,
+      anon_sym_LPAREN,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_LBRACE,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_TILDE,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(1041), 36,
+      anon_sym_import,
+      anon_sym_from,
+      anon_sym_STAR,
+      anon_sym_print,
+      anon_sym_assert,
+      anon_sym_return,
+      anon_sym_del,
+      anon_sym_raise,
+      anon_sym_pass,
+      anon_sym_break,
+      anon_sym_continue,
+      anon_sym_if,
+      anon_sym_else,
+      anon_sym_async,
+      anon_sym_for,
+      anon_sym_while,
+      anon_sym_try,
+      anon_sym_except,
+      anon_sym_finally,
+      anon_sym_with,
+      anon_sym_match,
+      anon_sym_def,
+      anon_sym_global,
+      anon_sym_nonlocal,
+      anon_sym_exec,
+      anon_sym_type,
+      anon_sym_class,
+      anon_sym_not,
+      anon_sym_lambda,
+      anon_sym_yield,
+      sym_integer,
+      sym_identifier,
+      anon_sym_await,
+      sym_true,
+      sym_false,
+      sym_none,
+  [17301] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1018), 12,
+      sym__string_start,
+      ts_builtin_sym_end,
+      anon_sym_LPAREN,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_LBRACE,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_TILDE,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(1016), 36,
+      anon_sym_import,
+      anon_sym_from,
+      anon_sym_STAR,
+      anon_sym_print,
+      anon_sym_assert,
+      anon_sym_return,
+      anon_sym_del,
+      anon_sym_raise,
+      anon_sym_pass,
+      anon_sym_break,
+      anon_sym_continue,
+      anon_sym_if,
+      anon_sym_else,
+      anon_sym_async,
+      anon_sym_for,
+      anon_sym_while,
+      anon_sym_try,
+      anon_sym_except,
+      anon_sym_finally,
+      anon_sym_with,
+      anon_sym_match,
+      anon_sym_def,
+      anon_sym_global,
+      anon_sym_nonlocal,
+      anon_sym_exec,
+      anon_sym_type,
+      anon_sym_class,
+      anon_sym_not,
+      anon_sym_lambda,
+      anon_sym_yield,
+      sym_integer,
+      sym_identifier,
+      anon_sym_await,
+      sym_true,
+      sym_false,
+      sym_none,
+  [17357] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1059), 12,
+      sym__string_start,
+      ts_builtin_sym_end,
+      anon_sym_LPAREN,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_LBRACE,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_TILDE,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(1057), 36,
+      anon_sym_import,
+      anon_sym_from,
+      anon_sym_STAR,
+      anon_sym_print,
+      anon_sym_assert,
+      anon_sym_return,
+      anon_sym_del,
+      anon_sym_raise,
+      anon_sym_pass,
+      anon_sym_break,
+      anon_sym_continue,
+      anon_sym_if,
+      anon_sym_else,
+      anon_sym_async,
+      anon_sym_for,
+      anon_sym_while,
+      anon_sym_try,
+      anon_sym_except,
+      anon_sym_finally,
+      anon_sym_with,
+      anon_sym_match,
+      anon_sym_def,
+      anon_sym_global,
+      anon_sym_nonlocal,
+      anon_sym_exec,
+      anon_sym_type,
+      anon_sym_class,
+      anon_sym_not,
+      anon_sym_lambda,
+      anon_sym_yield,
+      sym_integer,
+      sym_identifier,
+      anon_sym_await,
+      sym_true,
+      sym_false,
+      sym_none,
+  [17413] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1035), 12,
+      sym__dedent,
+      sym__string_start,
+      anon_sym_LPAREN,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_LBRACE,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_TILDE,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(1037), 36,
+      anon_sym_import,
+      anon_sym_from,
+      anon_sym_STAR,
+      anon_sym_print,
+      anon_sym_assert,
+      anon_sym_return,
+      anon_sym_del,
+      anon_sym_raise,
+      anon_sym_pass,
+      anon_sym_break,
+      anon_sym_continue,
+      anon_sym_if,
+      anon_sym_else,
+      anon_sym_async,
+      anon_sym_for,
+      anon_sym_while,
+      anon_sym_try,
+      anon_sym_except,
+      anon_sym_finally,
+      anon_sym_with,
+      anon_sym_match,
+      anon_sym_def,
+      anon_sym_global,
+      anon_sym_nonlocal,
+      anon_sym_exec,
+      anon_sym_type,
+      anon_sym_class,
+      anon_sym_not,
+      anon_sym_lambda,
+      anon_sym_yield,
+      sym_integer,
+      sym_identifier,
+      anon_sym_await,
+      sym_true,
+      sym_false,
+      sym_none,
+  [17469] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(798), 16,
+      anon_sym_STAR,
+      anon_sym_GT_GT,
+      anon_sym_PIPE,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_STAR_STAR,
       anon_sym_EQ,
-    ACTIONS(307), 13,
+      anon_sym_AT,
+      anon_sym_SLASH,
+      anon_sym_PERCENT,
+      anon_sym_SLASH_SLASH,
+      anon_sym_AMP,
+      anon_sym_CARET,
+      anon_sym_LT_LT,
+      anon_sym_LT,
+      anon_sym_GT,
+    ACTIONS(796), 32,
+      sym__newline,
+      anon_sym_DOT,
+      anon_sym_from,
+      anon_sym_LPAREN,
+      anon_sym_COMMA,
+      anon_sym_if,
+      anon_sym_COLON,
+      anon_sym_in,
+      anon_sym_LBRACK,
+      anon_sym_not,
+      anon_sym_and,
+      anon_sym_or,
+      anon_sym_LT_EQ,
+      anon_sym_EQ_EQ,
+      anon_sym_BANG_EQ,
+      anon_sym_GT_EQ,
+      anon_sym_LT_GT,
+      anon_sym_is,
       anon_sym_PLUS_EQ,
       anon_sym_DASH_EQ,
       anon_sym_STAR_EQ,
@@ -38855,13 +36918,18 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_AMP_EQ,
       anon_sym_CARET_EQ,
       anon_sym_PIPE_EQ,
-    ACTIONS(276), 15,
+      sym__semicolon,
+  [17525] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(802), 16,
       anon_sym_STAR,
       anon_sym_GT_GT,
       anon_sym_PIPE,
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_STAR_STAR,
+      anon_sym_EQ,
       anon_sym_AT,
       anon_sym_SLASH,
       anon_sym_PERCENT,
@@ -38871,11 +36939,14 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_LT_LT,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(303), 16,
+    ACTIONS(800), 32,
       sym__newline,
       anon_sym_DOT,
+      anon_sym_from,
       anon_sym_LPAREN,
+      anon_sym_COMMA,
       anon_sym_if,
+      anon_sym_COLON,
       anon_sym_in,
       anon_sym_LBRACK,
       anon_sym_not,
@@ -38887,61 +36958,285 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_GT_EQ,
       anon_sym_LT_GT,
       anon_sym_is,
+      anon_sym_PLUS_EQ,
+      anon_sym_DASH_EQ,
+      anon_sym_STAR_EQ,
+      anon_sym_SLASH_EQ,
+      anon_sym_AT_EQ,
+      anon_sym_SLASH_SLASH_EQ,
+      anon_sym_PERCENT_EQ,
+      anon_sym_STAR_STAR_EQ,
+      anon_sym_GT_GT_EQ,
+      anon_sym_LT_LT_EQ,
+      anon_sym_AMP_EQ,
+      anon_sym_CARET_EQ,
+      anon_sym_PIPE_EQ,
       sym__semicolon,
-  [15727] = 19,
+  [17581] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(622), 1,
-      sym_identifier,
-    ACTIONS(624), 1,
-      anon_sym_LPAREN,
-    ACTIONS(632), 1,
-      anon_sym_LBRACK,
-    ACTIONS(634), 1,
-      anon_sym_LBRACE,
-    ACTIONS(636), 1,
-      anon_sym_not,
-    ACTIONS(638), 1,
-      anon_sym_lambda,
-    ACTIONS(644), 1,
-      anon_sym_await,
-    ACTIONS(646), 1,
+    ACTIONS(1055), 12,
       sym__string_start,
-    ACTIONS(1069), 1,
+      ts_builtin_sym_end,
+      anon_sym_LPAREN,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_LBRACE,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_TILDE,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(1053), 36,
+      anon_sym_import,
+      anon_sym_from,
+      anon_sym_STAR,
+      anon_sym_print,
+      anon_sym_assert,
+      anon_sym_return,
+      anon_sym_del,
+      anon_sym_raise,
+      anon_sym_pass,
+      anon_sym_break,
+      anon_sym_continue,
+      anon_sym_if,
+      anon_sym_else,
+      anon_sym_async,
+      anon_sym_for,
+      anon_sym_while,
+      anon_sym_try,
+      anon_sym_except,
+      anon_sym_finally,
+      anon_sym_with,
+      anon_sym_match,
+      anon_sym_def,
+      anon_sym_global,
+      anon_sym_nonlocal,
+      anon_sym_exec,
+      anon_sym_type,
+      anon_sym_class,
+      anon_sym_not,
+      anon_sym_lambda,
+      anon_sym_yield,
+      sym_integer,
+      sym_identifier,
+      anon_sym_await,
+      sym_true,
+      sym_false,
+      sym_none,
+  [17637] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(798), 16,
+      anon_sym_STAR,
+      anon_sym_GT_GT,
+      anon_sym_PIPE,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_STAR_STAR,
+      anon_sym_EQ,
+      anon_sym_AT,
+      anon_sym_SLASH,
+      anon_sym_PERCENT,
+      anon_sym_SLASH_SLASH,
+      anon_sym_AMP,
+      anon_sym_CARET,
+      anon_sym_LT_LT,
+      anon_sym_LT,
+      anon_sym_GT,
+    ACTIONS(796), 32,
+      sym__newline,
+      anon_sym_DOT,
+      anon_sym_from,
+      anon_sym_LPAREN,
+      anon_sym_COMMA,
+      anon_sym_if,
       anon_sym_COLON,
-    STATE(740), 1,
-      sym_primary_expression,
-    STATE(742), 1,
+      anon_sym_in,
+      anon_sym_LBRACK,
+      anon_sym_not,
+      anon_sym_and,
+      anon_sym_or,
+      anon_sym_LT_EQ,
+      anon_sym_EQ_EQ,
+      anon_sym_BANG_EQ,
+      anon_sym_GT_EQ,
+      anon_sym_LT_GT,
+      anon_sym_is,
+      anon_sym_PLUS_EQ,
+      anon_sym_DASH_EQ,
+      anon_sym_STAR_EQ,
+      anon_sym_SLASH_EQ,
+      anon_sym_AT_EQ,
+      anon_sym_SLASH_SLASH_EQ,
+      anon_sym_PERCENT_EQ,
+      anon_sym_STAR_STAR_EQ,
+      anon_sym_GT_GT_EQ,
+      anon_sym_LT_LT_EQ,
+      anon_sym_AMP_EQ,
+      anon_sym_CARET_EQ,
+      anon_sym_PIPE_EQ,
+      sym__semicolon,
+  [17693] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(810), 16,
+      anon_sym_STAR,
+      anon_sym_GT_GT,
+      anon_sym_PIPE,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_STAR_STAR,
+      anon_sym_EQ,
+      anon_sym_AT,
+      anon_sym_SLASH,
+      anon_sym_PERCENT,
+      anon_sym_SLASH_SLASH,
+      anon_sym_AMP,
+      anon_sym_CARET,
+      anon_sym_LT_LT,
+      anon_sym_LT,
+      anon_sym_GT,
+    ACTIONS(808), 32,
+      sym__newline,
+      anon_sym_DOT,
+      anon_sym_from,
+      anon_sym_LPAREN,
+      anon_sym_COMMA,
+      anon_sym_if,
+      anon_sym_COLON,
+      anon_sym_in,
+      anon_sym_LBRACK,
+      anon_sym_not,
+      anon_sym_and,
+      anon_sym_or,
+      anon_sym_LT_EQ,
+      anon_sym_EQ_EQ,
+      anon_sym_BANG_EQ,
+      anon_sym_GT_EQ,
+      anon_sym_LT_GT,
+      anon_sym_is,
+      anon_sym_PLUS_EQ,
+      anon_sym_DASH_EQ,
+      anon_sym_STAR_EQ,
+      anon_sym_SLASH_EQ,
+      anon_sym_AT_EQ,
+      anon_sym_SLASH_SLASH_EQ,
+      anon_sym_PERCENT_EQ,
+      anon_sym_STAR_STAR_EQ,
+      anon_sym_GT_GT_EQ,
+      anon_sym_LT_LT_EQ,
+      anon_sym_AMP_EQ,
+      anon_sym_CARET_EQ,
+      anon_sym_PIPE_EQ,
+      sym__semicolon,
+  [17749] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1051), 12,
+      sym__string_start,
+      ts_builtin_sym_end,
+      anon_sym_LPAREN,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_LBRACE,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_TILDE,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(1049), 36,
+      anon_sym_import,
+      anon_sym_from,
+      anon_sym_STAR,
+      anon_sym_print,
+      anon_sym_assert,
+      anon_sym_return,
+      anon_sym_del,
+      anon_sym_raise,
+      anon_sym_pass,
+      anon_sym_break,
+      anon_sym_continue,
+      anon_sym_if,
+      anon_sym_else,
+      anon_sym_async,
+      anon_sym_for,
+      anon_sym_while,
+      anon_sym_try,
+      anon_sym_except,
+      anon_sym_finally,
+      anon_sym_with,
+      anon_sym_match,
+      anon_sym_def,
+      anon_sym_global,
+      anon_sym_nonlocal,
+      anon_sym_exec,
+      anon_sym_type,
+      anon_sym_class,
+      anon_sym_not,
+      anon_sym_lambda,
+      anon_sym_yield,
+      sym_integer,
+      sym_identifier,
+      anon_sym_await,
+      sym_true,
+      sym_false,
+      sym_none,
+  [17805] = 19,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(592), 1,
+      anon_sym_LPAREN,
+    ACTIONS(600), 1,
+      anon_sym_LBRACK,
+    ACTIONS(602), 1,
+      anon_sym_LBRACE,
+    ACTIONS(608), 1,
+      sym__string_start,
+    ACTIONS(977), 1,
+      sym_identifier,
+    ACTIONS(983), 1,
+      anon_sym_COLON,
+    ACTIONS(985), 1,
+      anon_sym_not,
+    ACTIONS(987), 1,
+      anon_sym_lambda,
+    ACTIONS(989), 1,
+      anon_sym_await,
+    STATE(713), 1,
       sym_string,
+    STATE(726), 1,
+      sym_primary_expression,
     STATE(1063), 1,
       sym_expression,
-    ACTIONS(640), 2,
+    ACTIONS(604), 2,
       sym_ellipsis,
       sym_float,
-    ACTIONS(630), 3,
+    ACTIONS(598), 3,
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
-    ACTIONS(642), 4,
+    ACTIONS(590), 4,
       sym_integer,
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(626), 5,
+    ACTIONS(981), 5,
       anon_sym_print,
       anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(1015), 7,
+    STATE(1003), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-      sym_await,
-    STATE(811), 15,
+    STATE(827), 16,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -38957,10 +37252,125 @@ static const uint16_t ts_small_parse_table[] = {
       sym_generator_expression,
       sym_parenthesized_expression,
       sym_concatenated_string,
-  [15815] = 3,
+      sym_await,
+  [17893] = 7,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(824), 16,
+    ACTIONS(1076), 1,
+      anon_sym_COMMA,
+    ACTIONS(1081), 1,
+      anon_sym_COLON_EQ,
+    ACTIONS(1083), 2,
+      anon_sym_COLON,
+      anon_sym_EQ,
+    ACTIONS(1085), 13,
+      anon_sym_PLUS_EQ,
+      anon_sym_DASH_EQ,
+      anon_sym_STAR_EQ,
+      anon_sym_SLASH_EQ,
+      anon_sym_AT_EQ,
+      anon_sym_SLASH_SLASH_EQ,
+      anon_sym_PERCENT_EQ,
+      anon_sym_STAR_STAR_EQ,
+      anon_sym_GT_GT_EQ,
+      anon_sym_LT_LT_EQ,
+      anon_sym_AMP_EQ,
+      anon_sym_CARET_EQ,
+      anon_sym_PIPE_EQ,
+    ACTIONS(1079), 15,
+      anon_sym_STAR,
+      anon_sym_GT_GT,
+      anon_sym_PIPE,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_SLASH,
+      anon_sym_PERCENT,
+      anon_sym_SLASH_SLASH,
+      anon_sym_AMP,
+      anon_sym_CARET,
+      anon_sym_LT_LT,
+      anon_sym_LT,
+      anon_sym_GT,
+    ACTIONS(1074), 16,
+      sym__newline,
+      anon_sym_DOT,
+      anon_sym_LPAREN,
+      anon_sym_if,
+      anon_sym_in,
+      anon_sym_LBRACK,
+      anon_sym_not,
+      anon_sym_and,
+      anon_sym_or,
+      anon_sym_LT_EQ,
+      anon_sym_EQ_EQ,
+      anon_sym_BANG_EQ,
+      anon_sym_GT_EQ,
+      anon_sym_LT_GT,
+      anon_sym_is,
+      sym__semicolon,
+  [17957] = 7,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(560), 1,
+      anon_sym_COLON_EQ,
+    ACTIONS(562), 2,
+      anon_sym_COLON,
+      anon_sym_EQ,
+    ACTIONS(555), 3,
+      anon_sym_RPAREN,
+      anon_sym_COMMA,
+      anon_sym_RBRACK,
+    ACTIONS(564), 13,
+      anon_sym_PLUS_EQ,
+      anon_sym_DASH_EQ,
+      anon_sym_STAR_EQ,
+      anon_sym_SLASH_EQ,
+      anon_sym_AT_EQ,
+      anon_sym_SLASH_SLASH_EQ,
+      anon_sym_PERCENT_EQ,
+      anon_sym_STAR_STAR_EQ,
+      anon_sym_GT_GT_EQ,
+      anon_sym_LT_LT_EQ,
+      anon_sym_AMP_EQ,
+      anon_sym_CARET_EQ,
+      anon_sym_PIPE_EQ,
+    ACTIONS(287), 14,
+      anon_sym_DOT,
+      anon_sym_LPAREN,
+      anon_sym_if,
+      anon_sym_in,
+      anon_sym_LBRACK,
+      anon_sym_not,
+      anon_sym_and,
+      anon_sym_or,
+      anon_sym_LT_EQ,
+      anon_sym_EQ_EQ,
+      anon_sym_BANG_EQ,
+      anon_sym_GT_EQ,
+      anon_sym_LT_GT,
+      anon_sym_is,
+    ACTIONS(260), 15,
+      anon_sym_STAR,
+      anon_sym_GT_GT,
+      anon_sym_PIPE,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_SLASH,
+      anon_sym_PERCENT,
+      anon_sym_SLASH_SLASH,
+      anon_sym_AMP,
+      anon_sym_CARET,
+      anon_sym_LT_LT,
+      anon_sym_LT,
+      anon_sym_GT,
+  [18021] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(806), 16,
       anon_sym_STAR,
       anon_sym_GT_GT,
       anon_sym_PIPE,
@@ -38977,7 +37387,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_LT_LT,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(822), 32,
+    ACTIONS(804), 32,
       sym__newline,
       anon_sym_DOT,
       anon_sym_from,
@@ -39010,45 +37420,19 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_CARET_EQ,
       anon_sym_PIPE_EQ,
       sym__semicolon,
-  [15871] = 3,
+  [18077] = 7,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(824), 16,
-      anon_sym_STAR,
-      anon_sym_GT_GT,
-      anon_sym_PIPE,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_STAR_STAR,
-      anon_sym_EQ,
-      anon_sym_AT,
-      anon_sym_SLASH,
-      anon_sym_PERCENT,
-      anon_sym_SLASH_SLASH,
-      anon_sym_AMP,
-      anon_sym_CARET,
-      anon_sym_LT_LT,
-      anon_sym_LT,
-      anon_sym_GT,
-    ACTIONS(822), 32,
-      sym__newline,
-      anon_sym_DOT,
-      anon_sym_from,
-      anon_sym_LPAREN,
-      anon_sym_COMMA,
-      anon_sym_if,
+    ACTIONS(1090), 1,
+      anon_sym_COLON_EQ,
+    ACTIONS(1092), 2,
       anon_sym_COLON,
-      anon_sym_in,
-      anon_sym_LBRACK,
-      anon_sym_not,
-      anon_sym_and,
-      anon_sym_or,
-      anon_sym_LT_EQ,
-      anon_sym_EQ_EQ,
-      anon_sym_BANG_EQ,
-      anon_sym_GT_EQ,
-      anon_sym_LT_GT,
-      anon_sym_is,
+      anon_sym_EQ,
+    ACTIONS(1087), 3,
+      anon_sym_RPAREN,
+      anon_sym_COMMA,
+      anon_sym_RBRACK,
+    ACTIONS(1094), 13,
       anon_sym_PLUS_EQ,
       anon_sym_DASH_EQ,
       anon_sym_STAR_EQ,
@@ -39062,2682 +37446,301 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_AMP_EQ,
       anon_sym_CARET_EQ,
       anon_sym_PIPE_EQ,
-      sym__semicolon,
-  [15927] = 7,
+    ACTIONS(1074), 14,
+      anon_sym_DOT,
+      anon_sym_LPAREN,
+      anon_sym_if,
+      anon_sym_in,
+      anon_sym_LBRACK,
+      anon_sym_not,
+      anon_sym_and,
+      anon_sym_or,
+      anon_sym_LT_EQ,
+      anon_sym_EQ_EQ,
+      anon_sym_BANG_EQ,
+      anon_sym_GT_EQ,
+      anon_sym_LT_GT,
+      anon_sym_is,
+    ACTIONS(1079), 15,
+      anon_sym_STAR,
+      anon_sym_GT_GT,
+      anon_sym_PIPE,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_SLASH,
+      anon_sym_PERCENT,
+      anon_sym_SLASH_SLASH,
+      anon_sym_AMP,
+      anon_sym_CARET,
+      anon_sym_LT_LT,
+      anon_sym_LT,
+      anon_sym_GT,
+  [18141] = 3,
     ACTIONS(3), 1,
       sym_comment,
+    ACTIONS(1031), 12,
+      sym__dedent,
+      sym__string_start,
+      anon_sym_LPAREN,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_LBRACE,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_TILDE,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(1033), 36,
+      anon_sym_import,
+      anon_sym_from,
+      anon_sym_STAR,
+      anon_sym_print,
+      anon_sym_assert,
+      anon_sym_return,
+      anon_sym_del,
+      anon_sym_raise,
+      anon_sym_pass,
+      anon_sym_break,
+      anon_sym_continue,
+      anon_sym_if,
+      anon_sym_else,
+      anon_sym_async,
+      anon_sym_for,
+      anon_sym_while,
+      anon_sym_try,
+      anon_sym_except,
+      anon_sym_finally,
+      anon_sym_with,
+      anon_sym_match,
+      anon_sym_def,
+      anon_sym_global,
+      anon_sym_nonlocal,
+      anon_sym_exec,
+      anon_sym_type,
+      anon_sym_class,
+      anon_sym_not,
+      anon_sym_lambda,
+      anon_sym_yield,
+      sym_integer,
+      sym_identifier,
+      anon_sym_await,
+      sym_true,
+      sym_false,
+      sym_none,
+  [18197] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1027), 12,
+      sym__dedent,
+      sym__string_start,
+      anon_sym_LPAREN,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_LBRACE,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_TILDE,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(1029), 36,
+      anon_sym_import,
+      anon_sym_from,
+      anon_sym_STAR,
+      anon_sym_print,
+      anon_sym_assert,
+      anon_sym_return,
+      anon_sym_del,
+      anon_sym_raise,
+      anon_sym_pass,
+      anon_sym_break,
+      anon_sym_continue,
+      anon_sym_if,
+      anon_sym_else,
+      anon_sym_async,
+      anon_sym_for,
+      anon_sym_while,
+      anon_sym_try,
+      anon_sym_except,
+      anon_sym_finally,
+      anon_sym_with,
+      anon_sym_match,
+      anon_sym_def,
+      anon_sym_global,
+      anon_sym_nonlocal,
+      anon_sym_exec,
+      anon_sym_type,
+      anon_sym_class,
+      anon_sym_not,
+      anon_sym_lambda,
+      anon_sym_yield,
+      sym_integer,
+      sym_identifier,
+      anon_sym_await,
+      sym_true,
+      sym_false,
+      sym_none,
+  [18253] = 18,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(258), 1,
+      sym_identifier,
+    ACTIONS(262), 1,
+      anon_sym_LPAREN,
+    ACTIONS(277), 1,
+      anon_sym_LBRACK,
+    ACTIONS(279), 1,
+      anon_sym_LBRACE,
+    ACTIONS(283), 1,
+      anon_sym_not,
+    ACTIONS(289), 1,
+      anon_sym_lambda,
+    ACTIONS(297), 1,
+      anon_sym_await,
+    ACTIONS(299), 1,
+      sym__string_start,
+    STATE(586), 1,
+      sym_string,
+    STATE(616), 1,
+      sym_primary_expression,
+    STATE(1166), 1,
+      sym_expression,
+    ACTIONS(293), 2,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(285), 3,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_TILDE,
+    ACTIONS(295), 4,
+      sym_integer,
+      sym_true,
+      sym_false,
+      sym_none,
+    ACTIONS(269), 5,
+      anon_sym_print,
+      anon_sym_async,
+      anon_sym_match,
+      anon_sym_exec,
+      anon_sym_type,
+    STATE(883), 6,
+      sym_named_expression,
+      sym_not_operator,
+      sym_boolean_operator,
+      sym_comparison_operator,
+      sym_lambda,
+      sym_conditional_expression,
+    STATE(605), 16,
+      sym_binary_operator,
+      sym_unary_operator,
+      sym_attribute,
+      sym_subscript,
+      sym_call,
+      sym_list,
+      sym_set,
+      sym_tuple,
+      sym_dictionary,
+      sym_list_comprehension,
+      sym_dictionary_comprehension,
+      sym_set_comprehension,
+      sym_generator_expression,
+      sym_parenthesized_expression,
+      sym_concatenated_string,
+      sym_await,
+  [18338] = 18,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(592), 1,
+      anon_sym_LPAREN,
+    ACTIONS(600), 1,
+      anon_sym_LBRACK,
+    ACTIONS(602), 1,
+      anon_sym_LBRACE,
+    ACTIONS(608), 1,
+      sym__string_start,
+    ACTIONS(977), 1,
+      sym_identifier,
+    ACTIONS(985), 1,
+      anon_sym_not,
+    ACTIONS(987), 1,
+      anon_sym_lambda,
+    ACTIONS(989), 1,
+      anon_sym_await,
+    STATE(713), 1,
+      sym_string,
+    STATE(726), 1,
+      sym_primary_expression,
+    STATE(1010), 1,
+      sym_expression,
+    ACTIONS(604), 2,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(598), 3,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_TILDE,
+    ACTIONS(590), 4,
+      sym_integer,
+      sym_true,
+      sym_false,
+      sym_none,
+    ACTIONS(981), 5,
+      anon_sym_print,
+      anon_sym_async,
+      anon_sym_match,
+      anon_sym_exec,
+      anon_sym_type,
+    STATE(1003), 6,
+      sym_named_expression,
+      sym_not_operator,
+      sym_boolean_operator,
+      sym_comparison_operator,
+      sym_lambda,
+      sym_conditional_expression,
+    STATE(827), 16,
+      sym_binary_operator,
+      sym_unary_operator,
+      sym_attribute,
+      sym_subscript,
+      sym_call,
+      sym_list,
+      sym_set,
+      sym_tuple,
+      sym_dictionary,
+      sym_list_comprehension,
+      sym_dictionary_comprehension,
+      sym_set_comprehension,
+      sym_generator_expression,
+      sym_parenthesized_expression,
+      sym_concatenated_string,
+      sym_await,
+  [18423] = 18,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(51), 1,
+      anon_sym_LBRACE,
+    ACTIONS(69), 1,
+      anon_sym_not,
+    ACTIONS(71), 1,
+      anon_sym_lambda,
+    ACTIONS(81), 1,
+      sym__string_start,
+    ACTIONS(327), 1,
+      sym_identifier,
+    ACTIONS(333), 1,
+      anon_sym_await,
     ACTIONS(568), 1,
-      anon_sym_COLON_EQ,
-    ACTIONS(570), 2,
-      anon_sym_COLON,
-      anon_sym_EQ,
-    ACTIONS(565), 3,
-      anon_sym_RPAREN,
-      anon_sym_COMMA,
-      anon_sym_RBRACK,
-    ACTIONS(572), 13,
-      anon_sym_PLUS_EQ,
-      anon_sym_DASH_EQ,
-      anon_sym_STAR_EQ,
-      anon_sym_SLASH_EQ,
-      anon_sym_AT_EQ,
-      anon_sym_SLASH_SLASH_EQ,
-      anon_sym_PERCENT_EQ,
-      anon_sym_STAR_STAR_EQ,
-      anon_sym_GT_GT_EQ,
-      anon_sym_LT_LT_EQ,
-      anon_sym_AMP_EQ,
-      anon_sym_CARET_EQ,
-      anon_sym_PIPE_EQ,
-    ACTIONS(303), 14,
-      anon_sym_DOT,
       anon_sym_LPAREN,
-      anon_sym_if,
-      anon_sym_in,
+    ACTIONS(574), 1,
       anon_sym_LBRACK,
-      anon_sym_not,
-      anon_sym_and,
-      anon_sym_or,
-      anon_sym_LT_EQ,
-      anon_sym_EQ_EQ,
-      anon_sym_BANG_EQ,
-      anon_sym_GT_EQ,
-      anon_sym_LT_GT,
-      anon_sym_is,
-    ACTIONS(276), 15,
-      anon_sym_STAR,
-      anon_sym_GT_GT,
-      anon_sym_PIPE,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_SLASH,
-      anon_sym_PERCENT,
-      anon_sym_SLASH_SLASH,
-      anon_sym_AMP,
-      anon_sym_CARET,
-      anon_sym_LT_LT,
-      anon_sym_LT,
-      anon_sym_GT,
-  [15991] = 7,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1074), 1,
-      anon_sym_COLON_EQ,
-    ACTIONS(1076), 2,
-      anon_sym_COLON,
-      anon_sym_EQ,
-    ACTIONS(1071), 3,
-      anon_sym_RPAREN,
-      anon_sym_COMMA,
-      anon_sym_RBRACK,
-    ACTIONS(1078), 13,
-      anon_sym_PLUS_EQ,
-      anon_sym_DASH_EQ,
-      anon_sym_STAR_EQ,
-      anon_sym_SLASH_EQ,
-      anon_sym_AT_EQ,
-      anon_sym_SLASH_SLASH_EQ,
-      anon_sym_PERCENT_EQ,
-      anon_sym_STAR_STAR_EQ,
-      anon_sym_GT_GT_EQ,
-      anon_sym_LT_LT_EQ,
-      anon_sym_AMP_EQ,
-      anon_sym_CARET_EQ,
-      anon_sym_PIPE_EQ,
-    ACTIONS(1048), 14,
-      anon_sym_DOT,
-      anon_sym_LPAREN,
-      anon_sym_if,
-      anon_sym_in,
-      anon_sym_LBRACK,
-      anon_sym_not,
-      anon_sym_and,
-      anon_sym_or,
-      anon_sym_LT_EQ,
-      anon_sym_EQ_EQ,
-      anon_sym_BANG_EQ,
-      anon_sym_GT_EQ,
-      anon_sym_LT_GT,
-      anon_sym_is,
-    ACTIONS(1053), 15,
-      anon_sym_STAR,
-      anon_sym_GT_GT,
-      anon_sym_PIPE,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_SLASH,
-      anon_sym_PERCENT,
-      anon_sym_SLASH_SLASH,
-      anon_sym_AMP,
-      anon_sym_CARET,
-      anon_sym_LT_LT,
-      anon_sym_LT,
-      anon_sym_GT,
-  [16055] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1080), 12,
-      sym__string_start,
-      ts_builtin_sym_end,
-      anon_sym_LPAREN,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_LBRACE,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_TILDE,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(1082), 36,
-      anon_sym_import,
-      anon_sym_from,
-      anon_sym_STAR,
-      anon_sym_print,
-      anon_sym_assert,
-      anon_sym_return,
-      anon_sym_del,
-      anon_sym_raise,
-      anon_sym_pass,
-      anon_sym_break,
-      anon_sym_continue,
-      anon_sym_if,
-      anon_sym_else,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_while,
-      anon_sym_try,
-      anon_sym_except,
-      anon_sym_finally,
-      anon_sym_with,
-      anon_sym_match,
-      anon_sym_def,
-      anon_sym_global,
-      anon_sym_nonlocal,
-      anon_sym_exec,
-      anon_sym_type,
-      anon_sym_class,
-      anon_sym_not,
-      anon_sym_lambda,
-      anon_sym_yield,
-      sym_integer,
-      sym_identifier,
-      anon_sym_await,
-      sym_true,
-      sym_false,
-      sym_none,
-  [16111] = 19,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(274), 1,
-      sym_identifier,
-    ACTIONS(278), 1,
-      anon_sym_LPAREN,
-    ACTIONS(293), 1,
-      anon_sym_LBRACK,
-    ACTIONS(295), 1,
-      anon_sym_LBRACE,
-    ACTIONS(299), 1,
-      anon_sym_not,
-    ACTIONS(305), 1,
-      anon_sym_lambda,
-    ACTIONS(313), 1,
-      anon_sym_await,
-    ACTIONS(315), 1,
-      sym__string_start,
-    STATE(600), 1,
-      sym_string,
-    STATE(630), 1,
+    STATE(707), 1,
       sym_primary_expression,
-    STATE(1022), 1,
-      sym_expression,
-    STATE(1485), 1,
-      sym_type,
-    ACTIONS(309), 2,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(301), 3,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_TILDE,
-    ACTIONS(311), 4,
-      sym_integer,
-      sym_true,
-      sym_false,
-      sym_none,
-    ACTIONS(285), 5,
-      anon_sym_print,
-      anon_sym_async,
-      anon_sym_match,
-      anon_sym_exec,
-      anon_sym_type,
-    STATE(900), 7,
-      sym_named_expression,
-      sym_not_operator,
-      sym_boolean_operator,
-      sym_comparison_operator,
-      sym_lambda,
-      sym_conditional_expression,
-      sym_await,
-    STATE(642), 15,
-      sym_binary_operator,
-      sym_unary_operator,
-      sym_attribute,
-      sym_subscript,
-      sym_call,
-      sym_list,
-      sym_set,
-      sym_tuple,
-      sym_dictionary,
-      sym_list_comprehension,
-      sym_dictionary_comprehension,
-      sym_set_comprehension,
-      sym_generator_expression,
-      sym_parenthesized_expression,
-      sym_concatenated_string,
-  [16199] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(832), 16,
-      anon_sym_STAR,
-      anon_sym_GT_GT,
-      anon_sym_PIPE,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_STAR_STAR,
-      anon_sym_EQ,
-      anon_sym_AT,
-      anon_sym_SLASH,
-      anon_sym_PERCENT,
-      anon_sym_SLASH_SLASH,
-      anon_sym_AMP,
-      anon_sym_CARET,
-      anon_sym_LT_LT,
-      anon_sym_LT,
-      anon_sym_GT,
-    ACTIONS(830), 32,
-      sym__newline,
-      anon_sym_DOT,
-      anon_sym_from,
-      anon_sym_LPAREN,
-      anon_sym_COMMA,
-      anon_sym_if,
-      anon_sym_COLON,
-      anon_sym_in,
-      anon_sym_LBRACK,
-      anon_sym_not,
-      anon_sym_and,
-      anon_sym_or,
-      anon_sym_LT_EQ,
-      anon_sym_EQ_EQ,
-      anon_sym_BANG_EQ,
-      anon_sym_GT_EQ,
-      anon_sym_LT_GT,
-      anon_sym_is,
-      anon_sym_PLUS_EQ,
-      anon_sym_DASH_EQ,
-      anon_sym_STAR_EQ,
-      anon_sym_SLASH_EQ,
-      anon_sym_AT_EQ,
-      anon_sym_SLASH_SLASH_EQ,
-      anon_sym_PERCENT_EQ,
-      anon_sym_STAR_STAR_EQ,
-      anon_sym_GT_GT_EQ,
-      anon_sym_LT_LT_EQ,
-      anon_sym_AMP_EQ,
-      anon_sym_CARET_EQ,
-      anon_sym_PIPE_EQ,
-      sym__semicolon,
-  [16255] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(832), 16,
-      anon_sym_STAR,
-      anon_sym_GT_GT,
-      anon_sym_PIPE,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_STAR_STAR,
-      anon_sym_EQ,
-      anon_sym_AT,
-      anon_sym_SLASH,
-      anon_sym_PERCENT,
-      anon_sym_SLASH_SLASH,
-      anon_sym_AMP,
-      anon_sym_CARET,
-      anon_sym_LT_LT,
-      anon_sym_LT,
-      anon_sym_GT,
-    ACTIONS(830), 32,
-      sym__newline,
-      anon_sym_DOT,
-      anon_sym_from,
-      anon_sym_LPAREN,
-      anon_sym_COMMA,
-      anon_sym_if,
-      anon_sym_COLON,
-      anon_sym_in,
-      anon_sym_LBRACK,
-      anon_sym_not,
-      anon_sym_and,
-      anon_sym_or,
-      anon_sym_LT_EQ,
-      anon_sym_EQ_EQ,
-      anon_sym_BANG_EQ,
-      anon_sym_GT_EQ,
-      anon_sym_LT_GT,
-      anon_sym_is,
-      anon_sym_PLUS_EQ,
-      anon_sym_DASH_EQ,
-      anon_sym_STAR_EQ,
-      anon_sym_SLASH_EQ,
-      anon_sym_AT_EQ,
-      anon_sym_SLASH_SLASH_EQ,
-      anon_sym_PERCENT_EQ,
-      anon_sym_STAR_STAR_EQ,
-      anon_sym_GT_GT_EQ,
-      anon_sym_LT_LT_EQ,
-      anon_sym_AMP_EQ,
-      anon_sym_CARET_EQ,
-      anon_sym_PIPE_EQ,
-      sym__semicolon,
-  [16311] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(836), 16,
-      anon_sym_STAR,
-      anon_sym_GT_GT,
-      anon_sym_PIPE,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_STAR_STAR,
-      anon_sym_EQ,
-      anon_sym_AT,
-      anon_sym_SLASH,
-      anon_sym_PERCENT,
-      anon_sym_SLASH_SLASH,
-      anon_sym_AMP,
-      anon_sym_CARET,
-      anon_sym_LT_LT,
-      anon_sym_LT,
-      anon_sym_GT,
-    ACTIONS(834), 32,
-      sym__newline,
-      anon_sym_DOT,
-      anon_sym_from,
-      anon_sym_LPAREN,
-      anon_sym_COMMA,
-      anon_sym_if,
-      anon_sym_COLON,
-      anon_sym_in,
-      anon_sym_LBRACK,
-      anon_sym_not,
-      anon_sym_and,
-      anon_sym_or,
-      anon_sym_LT_EQ,
-      anon_sym_EQ_EQ,
-      anon_sym_BANG_EQ,
-      anon_sym_GT_EQ,
-      anon_sym_LT_GT,
-      anon_sym_is,
-      anon_sym_PLUS_EQ,
-      anon_sym_DASH_EQ,
-      anon_sym_STAR_EQ,
-      anon_sym_SLASH_EQ,
-      anon_sym_AT_EQ,
-      anon_sym_SLASH_SLASH_EQ,
-      anon_sym_PERCENT_EQ,
-      anon_sym_STAR_STAR_EQ,
-      anon_sym_GT_GT_EQ,
-      anon_sym_LT_LT_EQ,
-      anon_sym_AMP_EQ,
-      anon_sym_CARET_EQ,
-      anon_sym_PIPE_EQ,
-      sym__semicolon,
-  [16367] = 5,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1088), 1,
-      anon_sym_case,
-    STATE(349), 2,
-      sym_case_block,
-      aux_sym_cases_repeat1,
-    ACTIONS(1086), 12,
-      sym__dedent,
-      sym__string_start,
-      anon_sym_LPAREN,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_LBRACE,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_TILDE,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(1084), 33,
-      anon_sym_import,
-      anon_sym_from,
-      anon_sym_STAR,
-      anon_sym_print,
-      anon_sym_assert,
-      anon_sym_return,
-      anon_sym_del,
-      anon_sym_raise,
-      anon_sym_pass,
-      anon_sym_break,
-      anon_sym_continue,
-      anon_sym_if,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_while,
-      anon_sym_try,
-      anon_sym_with,
-      anon_sym_match,
-      anon_sym_def,
-      anon_sym_global,
-      anon_sym_nonlocal,
-      anon_sym_exec,
-      anon_sym_type,
-      anon_sym_class,
-      anon_sym_not,
-      anon_sym_lambda,
-      anon_sym_yield,
-      sym_integer,
-      sym_identifier,
-      anon_sym_await,
-      sym_true,
-      sym_false,
-      sym_none,
-  [16427] = 19,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(274), 1,
-      sym_identifier,
-    ACTIONS(278), 1,
-      anon_sym_LPAREN,
-    ACTIONS(293), 1,
-      anon_sym_LBRACK,
-    ACTIONS(295), 1,
-      anon_sym_LBRACE,
-    ACTIONS(299), 1,
-      anon_sym_not,
-    ACTIONS(305), 1,
-      anon_sym_lambda,
-    ACTIONS(313), 1,
-      anon_sym_await,
-    ACTIONS(315), 1,
-      sym__string_start,
-    STATE(600), 1,
+    STATE(709), 1,
       sym_string,
-    STATE(630), 1,
-      sym_primary_expression,
-    STATE(1022), 1,
-      sym_expression,
-    STATE(1428), 1,
-      sym_type,
-    ACTIONS(309), 2,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(301), 3,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_TILDE,
-    ACTIONS(311), 4,
-      sym_integer,
-      sym_true,
-      sym_false,
-      sym_none,
-    ACTIONS(285), 5,
-      anon_sym_print,
-      anon_sym_async,
-      anon_sym_match,
-      anon_sym_exec,
-      anon_sym_type,
-    STATE(900), 7,
-      sym_named_expression,
-      sym_not_operator,
-      sym_boolean_operator,
-      sym_comparison_operator,
-      sym_lambda,
-      sym_conditional_expression,
-      sym_await,
-    STATE(642), 15,
-      sym_binary_operator,
-      sym_unary_operator,
-      sym_attribute,
-      sym_subscript,
-      sym_call,
-      sym_list,
-      sym_set,
-      sym_tuple,
-      sym_dictionary,
-      sym_list_comprehension,
-      sym_dictionary_comprehension,
-      sym_set_comprehension,
-      sym_generator_expression,
-      sym_parenthesized_expression,
-      sym_concatenated_string,
-  [16515] = 5,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1094), 1,
-      anon_sym_case,
-    STATE(347), 2,
-      sym_case_block,
-      aux_sym_cases_repeat1,
-    ACTIONS(1090), 12,
-      sym__string_start,
-      ts_builtin_sym_end,
-      anon_sym_LPAREN,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_LBRACE,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_TILDE,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(1092), 33,
-      anon_sym_import,
-      anon_sym_from,
-      anon_sym_STAR,
-      anon_sym_print,
-      anon_sym_assert,
-      anon_sym_return,
-      anon_sym_del,
-      anon_sym_raise,
-      anon_sym_pass,
-      anon_sym_break,
-      anon_sym_continue,
-      anon_sym_if,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_while,
-      anon_sym_try,
-      anon_sym_with,
-      anon_sym_match,
-      anon_sym_def,
-      anon_sym_global,
-      anon_sym_nonlocal,
-      anon_sym_exec,
-      anon_sym_type,
-      anon_sym_class,
-      anon_sym_not,
-      anon_sym_lambda,
-      anon_sym_yield,
-      sym_integer,
-      sym_identifier,
-      anon_sym_await,
-      sym_true,
-      sym_false,
-      sym_none,
-  [16575] = 19,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(51), 1,
-      anon_sym_LBRACE,
-    ACTIONS(69), 1,
-      anon_sym_not,
-    ACTIONS(71), 1,
-      anon_sym_lambda,
-    ACTIONS(81), 1,
-      sym__string_start,
-    ACTIONS(331), 1,
-      sym_identifier,
-    ACTIONS(337), 1,
-      anon_sym_await,
-    ACTIONS(559), 1,
-      anon_sym_LPAREN,
-    ACTIONS(563), 1,
-      anon_sym_LBRACK,
-    STATE(684), 1,
-      sym_primary_expression,
-    STATE(713), 1,
-      sym_string,
-    STATE(1082), 1,
-      sym_expression,
-    STATE(1263), 1,
-      sym_type,
-    ACTIONS(75), 2,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(47), 3,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_TILDE,
-    ACTIONS(77), 4,
-      sym_integer,
-      sym_true,
-      sym_false,
-      sym_none,
-    ACTIONS(333), 5,
-      anon_sym_print,
-      anon_sym_async,
-      anon_sym_match,
-      anon_sym_exec,
-      anon_sym_type,
-    STATE(1009), 7,
-      sym_named_expression,
-      sym_not_operator,
-      sym_boolean_operator,
-      sym_comparison_operator,
-      sym_lambda,
-      sym_conditional_expression,
-      sym_await,
-    STATE(797), 15,
-      sym_binary_operator,
-      sym_unary_operator,
-      sym_attribute,
-      sym_subscript,
-      sym_call,
-      sym_list,
-      sym_set,
-      sym_tuple,
-      sym_dictionary,
-      sym_list_comprehension,
-      sym_dictionary_comprehension,
-      sym_set_comprehension,
-      sym_generator_expression,
-      sym_parenthesized_expression,
-      sym_concatenated_string,
-  [16663] = 5,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1097), 1,
-      anon_sym_case,
-    STATE(349), 2,
-      sym_case_block,
-      aux_sym_cases_repeat1,
-    ACTIONS(1090), 12,
-      sym__dedent,
-      sym__string_start,
-      anon_sym_LPAREN,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_LBRACE,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_TILDE,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(1092), 33,
-      anon_sym_import,
-      anon_sym_from,
-      anon_sym_STAR,
-      anon_sym_print,
-      anon_sym_assert,
-      anon_sym_return,
-      anon_sym_del,
-      anon_sym_raise,
-      anon_sym_pass,
-      anon_sym_break,
-      anon_sym_continue,
-      anon_sym_if,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_while,
-      anon_sym_try,
-      anon_sym_with,
-      anon_sym_match,
-      anon_sym_def,
-      anon_sym_global,
-      anon_sym_nonlocal,
-      anon_sym_exec,
-      anon_sym_type,
-      anon_sym_class,
-      anon_sym_not,
-      anon_sym_lambda,
-      anon_sym_yield,
-      sym_integer,
-      sym_identifier,
-      anon_sym_await,
-      sym_true,
-      sym_false,
-      sym_none,
-  [16723] = 19,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(274), 1,
-      sym_identifier,
-    ACTIONS(278), 1,
-      anon_sym_LPAREN,
-    ACTIONS(293), 1,
-      anon_sym_LBRACK,
-    ACTIONS(295), 1,
-      anon_sym_LBRACE,
-    ACTIONS(299), 1,
-      anon_sym_not,
-    ACTIONS(305), 1,
-      anon_sym_lambda,
-    ACTIONS(313), 1,
-      anon_sym_await,
-    ACTIONS(315), 1,
-      sym__string_start,
-    STATE(600), 1,
-      sym_string,
-    STATE(630), 1,
-      sym_primary_expression,
-    STATE(1022), 1,
-      sym_expression,
-    STATE(1505), 1,
-      sym_type,
-    ACTIONS(309), 2,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(301), 3,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_TILDE,
-    ACTIONS(311), 4,
-      sym_integer,
-      sym_true,
-      sym_false,
-      sym_none,
-    ACTIONS(285), 5,
-      anon_sym_print,
-      anon_sym_async,
-      anon_sym_match,
-      anon_sym_exec,
-      anon_sym_type,
-    STATE(900), 7,
-      sym_named_expression,
-      sym_not_operator,
-      sym_boolean_operator,
-      sym_comparison_operator,
-      sym_lambda,
-      sym_conditional_expression,
-      sym_await,
-    STATE(642), 15,
-      sym_binary_operator,
-      sym_unary_operator,
-      sym_attribute,
-      sym_subscript,
-      sym_call,
-      sym_list,
-      sym_set,
-      sym_tuple,
-      sym_dictionary,
-      sym_list_comprehension,
-      sym_dictionary_comprehension,
-      sym_set_comprehension,
-      sym_generator_expression,
-      sym_parenthesized_expression,
-      sym_concatenated_string,
-  [16811] = 19,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(622), 1,
-      sym_identifier,
-    ACTIONS(624), 1,
-      anon_sym_LPAREN,
-    ACTIONS(632), 1,
-      anon_sym_LBRACK,
-    ACTIONS(634), 1,
-      anon_sym_LBRACE,
-    ACTIONS(636), 1,
-      anon_sym_not,
-    ACTIONS(638), 1,
-      anon_sym_lambda,
-    ACTIONS(644), 1,
-      anon_sym_await,
-    ACTIONS(646), 1,
-      sym__string_start,
-    STATE(740), 1,
-      sym_primary_expression,
-    STATE(742), 1,
-      sym_string,
-    STATE(1050), 1,
-      sym_expression,
-    STATE(1308), 1,
-      sym_with_item,
-    ACTIONS(640), 2,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(630), 3,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_TILDE,
-    ACTIONS(642), 4,
-      sym_integer,
-      sym_true,
-      sym_false,
-      sym_none,
-    ACTIONS(626), 5,
-      anon_sym_print,
-      anon_sym_async,
-      anon_sym_match,
-      anon_sym_exec,
-      anon_sym_type,
-    STATE(1015), 7,
-      sym_named_expression,
-      sym_not_operator,
-      sym_boolean_operator,
-      sym_comparison_operator,
-      sym_lambda,
-      sym_conditional_expression,
-      sym_await,
-    STATE(811), 15,
-      sym_binary_operator,
-      sym_unary_operator,
-      sym_attribute,
-      sym_subscript,
-      sym_call,
-      sym_list,
-      sym_set,
-      sym_tuple,
-      sym_dictionary,
-      sym_list_comprehension,
-      sym_dictionary_comprehension,
-      sym_set_comprehension,
-      sym_generator_expression,
-      sym_parenthesized_expression,
-      sym_concatenated_string,
-  [16899] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(828), 16,
-      anon_sym_STAR,
-      anon_sym_GT_GT,
-      anon_sym_PIPE,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_STAR_STAR,
-      anon_sym_EQ,
-      anon_sym_AT,
-      anon_sym_SLASH,
-      anon_sym_PERCENT,
-      anon_sym_SLASH_SLASH,
-      anon_sym_AMP,
-      anon_sym_CARET,
-      anon_sym_LT_LT,
-      anon_sym_LT,
-      anon_sym_GT,
-    ACTIONS(826), 32,
-      sym__newline,
-      anon_sym_DOT,
-      anon_sym_from,
-      anon_sym_LPAREN,
-      anon_sym_COMMA,
-      anon_sym_if,
-      anon_sym_COLON,
-      anon_sym_in,
-      anon_sym_LBRACK,
-      anon_sym_not,
-      anon_sym_and,
-      anon_sym_or,
-      anon_sym_LT_EQ,
-      anon_sym_EQ_EQ,
-      anon_sym_BANG_EQ,
-      anon_sym_GT_EQ,
-      anon_sym_LT_GT,
-      anon_sym_is,
-      anon_sym_PLUS_EQ,
-      anon_sym_DASH_EQ,
-      anon_sym_STAR_EQ,
-      anon_sym_SLASH_EQ,
-      anon_sym_AT_EQ,
-      anon_sym_SLASH_SLASH_EQ,
-      anon_sym_PERCENT_EQ,
-      anon_sym_STAR_STAR_EQ,
-      anon_sym_GT_GT_EQ,
-      anon_sym_LT_LT_EQ,
-      anon_sym_AMP_EQ,
-      anon_sym_CARET_EQ,
-      anon_sym_PIPE_EQ,
-      sym__semicolon,
-  [16955] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1080), 12,
-      sym__dedent,
-      sym__string_start,
-      anon_sym_LPAREN,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_LBRACE,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_TILDE,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(1082), 36,
-      anon_sym_import,
-      anon_sym_from,
-      anon_sym_STAR,
-      anon_sym_print,
-      anon_sym_assert,
-      anon_sym_return,
-      anon_sym_del,
-      anon_sym_raise,
-      anon_sym_pass,
-      anon_sym_break,
-      anon_sym_continue,
-      anon_sym_if,
-      anon_sym_else,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_while,
-      anon_sym_try,
-      anon_sym_except,
-      anon_sym_finally,
-      anon_sym_with,
-      anon_sym_match,
-      anon_sym_def,
-      anon_sym_global,
-      anon_sym_nonlocal,
-      anon_sym_exec,
-      anon_sym_type,
-      anon_sym_class,
-      anon_sym_not,
-      anon_sym_lambda,
-      anon_sym_yield,
-      sym_integer,
-      sym_identifier,
-      anon_sym_await,
-      sym_true,
-      sym_false,
-      sym_none,
-  [17011] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(991), 13,
-      sym__dedent,
-      sym__string_start,
-      anon_sym_LPAREN,
-      anon_sym_except_STAR,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_LBRACE,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_TILDE,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(989), 35,
-      anon_sym_import,
-      anon_sym_from,
-      anon_sym_STAR,
-      anon_sym_print,
-      anon_sym_assert,
-      anon_sym_return,
-      anon_sym_del,
-      anon_sym_raise,
-      anon_sym_pass,
-      anon_sym_break,
-      anon_sym_continue,
-      anon_sym_if,
-      anon_sym_else,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_while,
-      anon_sym_try,
-      anon_sym_finally,
-      anon_sym_with,
-      anon_sym_match,
-      anon_sym_def,
-      anon_sym_global,
-      anon_sym_nonlocal,
-      anon_sym_exec,
-      anon_sym_type,
-      anon_sym_class,
-      anon_sym_not,
-      anon_sym_lambda,
-      anon_sym_yield,
-      sym_integer,
-      sym_identifier,
-      anon_sym_await,
-      sym_true,
-      sym_false,
-      sym_none,
-  [17067] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(970), 13,
-      sym__dedent,
-      sym__string_start,
-      anon_sym_LPAREN,
-      anon_sym_except_STAR,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_LBRACE,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_TILDE,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(972), 35,
-      anon_sym_import,
-      anon_sym_from,
-      anon_sym_STAR,
-      anon_sym_print,
-      anon_sym_assert,
-      anon_sym_return,
-      anon_sym_del,
-      anon_sym_raise,
-      anon_sym_pass,
-      anon_sym_break,
-      anon_sym_continue,
-      anon_sym_if,
-      anon_sym_else,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_while,
-      anon_sym_try,
-      anon_sym_finally,
-      anon_sym_with,
-      anon_sym_match,
-      anon_sym_def,
-      anon_sym_global,
-      anon_sym_nonlocal,
-      anon_sym_exec,
-      anon_sym_type,
-      anon_sym_class,
-      anon_sym_not,
-      anon_sym_lambda,
-      anon_sym_yield,
-      sym_integer,
-      sym_identifier,
-      anon_sym_await,
-      sym_true,
-      sym_false,
-      sym_none,
-  [17123] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(966), 13,
-      sym__dedent,
-      sym__string_start,
-      anon_sym_LPAREN,
-      anon_sym_except_STAR,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_LBRACE,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_TILDE,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(968), 35,
-      anon_sym_import,
-      anon_sym_from,
-      anon_sym_STAR,
-      anon_sym_print,
-      anon_sym_assert,
-      anon_sym_return,
-      anon_sym_del,
-      anon_sym_raise,
-      anon_sym_pass,
-      anon_sym_break,
-      anon_sym_continue,
-      anon_sym_if,
-      anon_sym_else,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_while,
-      anon_sym_try,
-      anon_sym_finally,
-      anon_sym_with,
-      anon_sym_match,
-      anon_sym_def,
-      anon_sym_global,
-      anon_sym_nonlocal,
-      anon_sym_exec,
-      anon_sym_type,
-      anon_sym_class,
-      anon_sym_not,
-      anon_sym_lambda,
-      anon_sym_yield,
-      sym_integer,
-      sym_identifier,
-      anon_sym_await,
-      sym_true,
-      sym_false,
-      sym_none,
-  [17179] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1065), 12,
-      sym__dedent,
-      sym__string_start,
-      anon_sym_LPAREN,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_LBRACE,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_TILDE,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(1067), 36,
-      anon_sym_import,
-      anon_sym_from,
-      anon_sym_STAR,
-      anon_sym_print,
-      anon_sym_assert,
-      anon_sym_return,
-      anon_sym_del,
-      anon_sym_raise,
-      anon_sym_pass,
-      anon_sym_break,
-      anon_sym_continue,
-      anon_sym_if,
-      anon_sym_else,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_while,
-      anon_sym_try,
-      anon_sym_except,
-      anon_sym_finally,
-      anon_sym_with,
-      anon_sym_match,
-      anon_sym_def,
-      anon_sym_global,
-      anon_sym_nonlocal,
-      anon_sym_exec,
-      anon_sym_type,
-      anon_sym_class,
-      anon_sym_not,
-      anon_sym_lambda,
-      anon_sym_yield,
-      sym_integer,
-      sym_identifier,
-      anon_sym_await,
-      sym_true,
-      sym_false,
-      sym_none,
-  [17235] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1018), 13,
-      sym__dedent,
-      sym__string_start,
-      anon_sym_LPAREN,
-      anon_sym_except_STAR,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_LBRACE,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_TILDE,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(1016), 35,
-      anon_sym_import,
-      anon_sym_from,
-      anon_sym_STAR,
-      anon_sym_print,
-      anon_sym_assert,
-      anon_sym_return,
-      anon_sym_del,
-      anon_sym_raise,
-      anon_sym_pass,
-      anon_sym_break,
-      anon_sym_continue,
-      anon_sym_if,
-      anon_sym_else,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_while,
-      anon_sym_try,
-      anon_sym_finally,
-      anon_sym_with,
-      anon_sym_match,
-      anon_sym_def,
-      anon_sym_global,
-      anon_sym_nonlocal,
-      anon_sym_exec,
-      anon_sym_type,
-      anon_sym_class,
-      anon_sym_not,
-      anon_sym_lambda,
-      anon_sym_yield,
-      sym_integer,
-      sym_identifier,
-      anon_sym_await,
-      sym_true,
-      sym_false,
-      sym_none,
-  [17291] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(991), 13,
-      sym__string_start,
-      ts_builtin_sym_end,
-      anon_sym_LPAREN,
-      anon_sym_except_STAR,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_LBRACE,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_TILDE,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(989), 35,
-      anon_sym_import,
-      anon_sym_from,
-      anon_sym_STAR,
-      anon_sym_print,
-      anon_sym_assert,
-      anon_sym_return,
-      anon_sym_del,
-      anon_sym_raise,
-      anon_sym_pass,
-      anon_sym_break,
-      anon_sym_continue,
-      anon_sym_if,
-      anon_sym_else,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_while,
-      anon_sym_try,
-      anon_sym_finally,
-      anon_sym_with,
-      anon_sym_match,
-      anon_sym_def,
-      anon_sym_global,
-      anon_sym_nonlocal,
-      anon_sym_exec,
-      anon_sym_type,
-      anon_sym_class,
-      anon_sym_not,
-      anon_sym_lambda,
-      anon_sym_yield,
-      sym_integer,
-      sym_identifier,
-      anon_sym_await,
-      sym_true,
-      sym_false,
-      sym_none,
-  [17347] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1018), 12,
-      sym__dedent,
-      sym__string_start,
-      anon_sym_LPAREN,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_LBRACE,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_TILDE,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(1016), 36,
-      anon_sym_import,
-      anon_sym_from,
-      anon_sym_STAR,
-      anon_sym_print,
-      anon_sym_assert,
-      anon_sym_return,
-      anon_sym_del,
-      anon_sym_raise,
-      anon_sym_pass,
-      anon_sym_break,
-      anon_sym_continue,
-      anon_sym_if,
-      anon_sym_else,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_while,
-      anon_sym_try,
-      anon_sym_except,
-      anon_sym_finally,
-      anon_sym_with,
-      anon_sym_match,
-      anon_sym_def,
-      anon_sym_global,
-      anon_sym_nonlocal,
-      anon_sym_exec,
-      anon_sym_type,
-      anon_sym_class,
-      anon_sym_not,
-      anon_sym_lambda,
-      anon_sym_yield,
-      sym_integer,
-      sym_identifier,
-      anon_sym_await,
-      sym_true,
-      sym_false,
-      sym_none,
-  [17403] = 19,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(274), 1,
-      sym_identifier,
-    ACTIONS(278), 1,
-      anon_sym_LPAREN,
-    ACTIONS(293), 1,
-      anon_sym_LBRACK,
-    ACTIONS(295), 1,
-      anon_sym_LBRACE,
-    ACTIONS(299), 1,
-      anon_sym_not,
-    ACTIONS(305), 1,
-      anon_sym_lambda,
-    ACTIONS(313), 1,
-      anon_sym_await,
-    ACTIONS(315), 1,
-      sym__string_start,
-    STATE(600), 1,
-      sym_string,
-    STATE(630), 1,
-      sym_primary_expression,
-    STATE(1022), 1,
-      sym_expression,
-    STATE(1133), 1,
-      sym_type,
-    ACTIONS(309), 2,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(301), 3,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_TILDE,
-    ACTIONS(311), 4,
-      sym_integer,
-      sym_true,
-      sym_false,
-      sym_none,
-    ACTIONS(285), 5,
-      anon_sym_print,
-      anon_sym_async,
-      anon_sym_match,
-      anon_sym_exec,
-      anon_sym_type,
-    STATE(900), 7,
-      sym_named_expression,
-      sym_not_operator,
-      sym_boolean_operator,
-      sym_comparison_operator,
-      sym_lambda,
-      sym_conditional_expression,
-      sym_await,
-    STATE(642), 15,
-      sym_binary_operator,
-      sym_unary_operator,
-      sym_attribute,
-      sym_subscript,
-      sym_call,
-      sym_list,
-      sym_set,
-      sym_tuple,
-      sym_dictionary,
-      sym_list_comprehension,
-      sym_dictionary_comprehension,
-      sym_set_comprehension,
-      sym_generator_expression,
-      sym_parenthesized_expression,
-      sym_concatenated_string,
-  [17491] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1018), 13,
-      sym__string_start,
-      ts_builtin_sym_end,
-      anon_sym_LPAREN,
-      anon_sym_except_STAR,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_LBRACE,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_TILDE,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(1016), 35,
-      anon_sym_import,
-      anon_sym_from,
-      anon_sym_STAR,
-      anon_sym_print,
-      anon_sym_assert,
-      anon_sym_return,
-      anon_sym_del,
-      anon_sym_raise,
-      anon_sym_pass,
-      anon_sym_break,
-      anon_sym_continue,
-      anon_sym_if,
-      anon_sym_else,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_while,
-      anon_sym_try,
-      anon_sym_finally,
-      anon_sym_with,
-      anon_sym_match,
-      anon_sym_def,
-      anon_sym_global,
-      anon_sym_nonlocal,
-      anon_sym_exec,
-      anon_sym_type,
-      anon_sym_class,
-      anon_sym_not,
-      anon_sym_lambda,
-      anon_sym_yield,
-      sym_integer,
-      sym_identifier,
-      anon_sym_await,
-      sym_true,
-      sym_false,
-      sym_none,
-  [17547] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1044), 13,
-      sym__dedent,
-      sym__string_start,
-      anon_sym_LPAREN,
-      anon_sym_except_STAR,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_LBRACE,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_TILDE,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(1046), 35,
-      anon_sym_import,
-      anon_sym_from,
-      anon_sym_STAR,
-      anon_sym_print,
-      anon_sym_assert,
-      anon_sym_return,
-      anon_sym_del,
-      anon_sym_raise,
-      anon_sym_pass,
-      anon_sym_break,
-      anon_sym_continue,
-      anon_sym_if,
-      anon_sym_else,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_while,
-      anon_sym_try,
-      anon_sym_finally,
-      anon_sym_with,
-      anon_sym_match,
-      anon_sym_def,
-      anon_sym_global,
-      anon_sym_nonlocal,
-      anon_sym_exec,
-      anon_sym_type,
-      anon_sym_class,
-      anon_sym_not,
-      anon_sym_lambda,
-      anon_sym_yield,
-      sym_integer,
-      sym_identifier,
-      anon_sym_await,
-      sym_true,
-      sym_false,
-      sym_none,
-  [17603] = 19,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(274), 1,
-      sym_identifier,
-    ACTIONS(278), 1,
-      anon_sym_LPAREN,
-    ACTIONS(293), 1,
-      anon_sym_LBRACK,
-    ACTIONS(295), 1,
-      anon_sym_LBRACE,
-    ACTIONS(299), 1,
-      anon_sym_not,
-    ACTIONS(305), 1,
-      anon_sym_lambda,
-    ACTIONS(313), 1,
-      anon_sym_await,
-    ACTIONS(315), 1,
-      sym__string_start,
-    STATE(600), 1,
-      sym_string,
-    STATE(630), 1,
-      sym_primary_expression,
-    STATE(1022), 1,
-      sym_expression,
-    STATE(1270), 1,
-      sym_type,
-    ACTIONS(309), 2,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(301), 3,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_TILDE,
-    ACTIONS(311), 4,
-      sym_integer,
-      sym_true,
-      sym_false,
-      sym_none,
-    ACTIONS(285), 5,
-      anon_sym_print,
-      anon_sym_async,
-      anon_sym_match,
-      anon_sym_exec,
-      anon_sym_type,
-    STATE(900), 7,
-      sym_named_expression,
-      sym_not_operator,
-      sym_boolean_operator,
-      sym_comparison_operator,
-      sym_lambda,
-      sym_conditional_expression,
-      sym_await,
-    STATE(642), 15,
-      sym_binary_operator,
-      sym_unary_operator,
-      sym_attribute,
-      sym_subscript,
-      sym_call,
-      sym_list,
-      sym_set,
-      sym_tuple,
-      sym_dictionary,
-      sym_list_comprehension,
-      sym_dictionary_comprehension,
-      sym_set_comprehension,
-      sym_generator_expression,
-      sym_parenthesized_expression,
-      sym_concatenated_string,
-  [17691] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(840), 16,
-      anon_sym_STAR,
-      anon_sym_GT_GT,
-      anon_sym_PIPE,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_STAR_STAR,
-      anon_sym_EQ,
-      anon_sym_AT,
-      anon_sym_SLASH,
-      anon_sym_PERCENT,
-      anon_sym_SLASH_SLASH,
-      anon_sym_AMP,
-      anon_sym_CARET,
-      anon_sym_LT_LT,
-      anon_sym_LT,
-      anon_sym_GT,
-    ACTIONS(838), 32,
-      sym__newline,
-      anon_sym_DOT,
-      anon_sym_from,
-      anon_sym_LPAREN,
-      anon_sym_COMMA,
-      anon_sym_if,
-      anon_sym_COLON,
-      anon_sym_in,
-      anon_sym_LBRACK,
-      anon_sym_not,
-      anon_sym_and,
-      anon_sym_or,
-      anon_sym_LT_EQ,
-      anon_sym_EQ_EQ,
-      anon_sym_BANG_EQ,
-      anon_sym_GT_EQ,
-      anon_sym_LT_GT,
-      anon_sym_is,
-      anon_sym_PLUS_EQ,
-      anon_sym_DASH_EQ,
-      anon_sym_STAR_EQ,
-      anon_sym_SLASH_EQ,
-      anon_sym_AT_EQ,
-      anon_sym_SLASH_SLASH_EQ,
-      anon_sym_PERCENT_EQ,
-      anon_sym_STAR_STAR_EQ,
-      anon_sym_GT_GT_EQ,
-      anon_sym_LT_LT_EQ,
-      anon_sym_AMP_EQ,
-      anon_sym_CARET_EQ,
-      anon_sym_PIPE_EQ,
-      sym__semicolon,
-  [17747] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1040), 12,
-      sym__dedent,
-      sym__string_start,
-      anon_sym_LPAREN,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_LBRACE,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_TILDE,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(1042), 36,
-      anon_sym_import,
-      anon_sym_from,
-      anon_sym_STAR,
-      anon_sym_print,
-      anon_sym_assert,
-      anon_sym_return,
-      anon_sym_del,
-      anon_sym_raise,
-      anon_sym_pass,
-      anon_sym_break,
-      anon_sym_continue,
-      anon_sym_if,
-      anon_sym_else,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_while,
-      anon_sym_try,
-      anon_sym_except,
-      anon_sym_finally,
-      anon_sym_with,
-      anon_sym_match,
-      anon_sym_def,
-      anon_sym_global,
-      anon_sym_nonlocal,
-      anon_sym_exec,
-      anon_sym_type,
-      anon_sym_class,
-      anon_sym_not,
-      anon_sym_lambda,
-      anon_sym_yield,
-      sym_integer,
-      sym_identifier,
-      anon_sym_await,
-      sym_true,
-      sym_false,
-      sym_none,
-  [17803] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(985), 13,
-      sym__string_start,
-      ts_builtin_sym_end,
-      anon_sym_LPAREN,
-      anon_sym_except_STAR,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_LBRACE,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_TILDE,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(987), 35,
-      anon_sym_import,
-      anon_sym_from,
-      anon_sym_STAR,
-      anon_sym_print,
-      anon_sym_assert,
-      anon_sym_return,
-      anon_sym_del,
-      anon_sym_raise,
-      anon_sym_pass,
-      anon_sym_break,
-      anon_sym_continue,
-      anon_sym_if,
-      anon_sym_else,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_while,
-      anon_sym_try,
-      anon_sym_finally,
-      anon_sym_with,
-      anon_sym_match,
-      anon_sym_def,
-      anon_sym_global,
-      anon_sym_nonlocal,
-      anon_sym_exec,
-      anon_sym_type,
-      anon_sym_class,
-      anon_sym_not,
-      anon_sym_lambda,
-      anon_sym_yield,
-      sym_integer,
-      sym_identifier,
-      anon_sym_await,
-      sym_true,
-      sym_false,
-      sym_none,
-  [17859] = 19,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(274), 1,
-      sym_identifier,
-    ACTIONS(278), 1,
-      anon_sym_LPAREN,
-    ACTIONS(293), 1,
-      anon_sym_LBRACK,
-    ACTIONS(295), 1,
-      anon_sym_LBRACE,
-    ACTIONS(299), 1,
-      anon_sym_not,
-    ACTIONS(305), 1,
-      anon_sym_lambda,
-    ACTIONS(313), 1,
-      anon_sym_await,
-    ACTIONS(315), 1,
-      sym__string_start,
-    STATE(600), 1,
-      sym_string,
-    STATE(630), 1,
-      sym_primary_expression,
-    STATE(1022), 1,
-      sym_expression,
-    STATE(1491), 1,
-      sym_type,
-    ACTIONS(309), 2,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(301), 3,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_TILDE,
-    ACTIONS(311), 4,
-      sym_integer,
-      sym_true,
-      sym_false,
-      sym_none,
-    ACTIONS(285), 5,
-      anon_sym_print,
-      anon_sym_async,
-      anon_sym_match,
-      anon_sym_exec,
-      anon_sym_type,
-    STATE(900), 7,
-      sym_named_expression,
-      sym_not_operator,
-      sym_boolean_operator,
-      sym_comparison_operator,
-      sym_lambda,
-      sym_conditional_expression,
-      sym_await,
-    STATE(642), 15,
-      sym_binary_operator,
-      sym_unary_operator,
-      sym_attribute,
-      sym_subscript,
-      sym_call,
-      sym_list,
-      sym_set,
-      sym_tuple,
-      sym_dictionary,
-      sym_list_comprehension,
-      sym_dictionary_comprehension,
-      sym_set_comprehension,
-      sym_generator_expression,
-      sym_parenthesized_expression,
-      sym_concatenated_string,
-  [17947] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1018), 12,
-      sym__string_start,
-      ts_builtin_sym_end,
-      anon_sym_LPAREN,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_LBRACE,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_TILDE,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(1016), 36,
-      anon_sym_import,
-      anon_sym_from,
-      anon_sym_STAR,
-      anon_sym_print,
-      anon_sym_assert,
-      anon_sym_return,
-      anon_sym_del,
-      anon_sym_raise,
-      anon_sym_pass,
-      anon_sym_break,
-      anon_sym_continue,
-      anon_sym_if,
-      anon_sym_else,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_while,
-      anon_sym_try,
-      anon_sym_except,
-      anon_sym_finally,
-      anon_sym_with,
-      anon_sym_match,
-      anon_sym_def,
-      anon_sym_global,
-      anon_sym_nonlocal,
-      anon_sym_exec,
-      anon_sym_type,
-      anon_sym_class,
-      anon_sym_not,
-      anon_sym_lambda,
-      anon_sym_yield,
-      sym_integer,
-      sym_identifier,
-      anon_sym_await,
-      sym_true,
-      sym_false,
-      sym_none,
-  [18003] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(966), 12,
-      sym__dedent,
-      sym__string_start,
-      anon_sym_LPAREN,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_LBRACE,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_TILDE,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(968), 36,
-      anon_sym_import,
-      anon_sym_from,
-      anon_sym_STAR,
-      anon_sym_print,
-      anon_sym_assert,
-      anon_sym_return,
-      anon_sym_del,
-      anon_sym_raise,
-      anon_sym_pass,
-      anon_sym_break,
-      anon_sym_continue,
-      anon_sym_if,
-      anon_sym_else,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_while,
-      anon_sym_try,
-      anon_sym_except,
-      anon_sym_finally,
-      anon_sym_with,
-      anon_sym_match,
-      anon_sym_def,
-      anon_sym_global,
-      anon_sym_nonlocal,
-      anon_sym_exec,
-      anon_sym_type,
-      anon_sym_class,
-      anon_sym_not,
-      anon_sym_lambda,
-      anon_sym_yield,
-      sym_integer,
-      sym_identifier,
-      anon_sym_await,
-      sym_true,
-      sym_false,
-      sym_none,
-  [18059] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(970), 13,
-      sym__string_start,
-      ts_builtin_sym_end,
-      anon_sym_LPAREN,
-      anon_sym_except_STAR,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_LBRACE,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_TILDE,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(972), 35,
-      anon_sym_import,
-      anon_sym_from,
-      anon_sym_STAR,
-      anon_sym_print,
-      anon_sym_assert,
-      anon_sym_return,
-      anon_sym_del,
-      anon_sym_raise,
-      anon_sym_pass,
-      anon_sym_break,
-      anon_sym_continue,
-      anon_sym_if,
-      anon_sym_else,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_while,
-      anon_sym_try,
-      anon_sym_finally,
-      anon_sym_with,
-      anon_sym_match,
-      anon_sym_def,
-      anon_sym_global,
-      anon_sym_nonlocal,
-      anon_sym_exec,
-      anon_sym_type,
-      anon_sym_class,
-      anon_sym_not,
-      anon_sym_lambda,
-      anon_sym_yield,
-      sym_integer,
-      sym_identifier,
-      anon_sym_await,
-      sym_true,
-      sym_false,
-      sym_none,
-  [18115] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1028), 13,
-      sym__dedent,
-      sym__string_start,
-      anon_sym_LPAREN,
-      anon_sym_except_STAR,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_LBRACE,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_TILDE,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(1030), 35,
-      anon_sym_import,
-      anon_sym_from,
-      anon_sym_STAR,
-      anon_sym_print,
-      anon_sym_assert,
-      anon_sym_return,
-      anon_sym_del,
-      anon_sym_raise,
-      anon_sym_pass,
-      anon_sym_break,
-      anon_sym_continue,
-      anon_sym_if,
-      anon_sym_else,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_while,
-      anon_sym_try,
-      anon_sym_finally,
-      anon_sym_with,
-      anon_sym_match,
-      anon_sym_def,
-      anon_sym_global,
-      anon_sym_nonlocal,
-      anon_sym_exec,
-      anon_sym_type,
-      anon_sym_class,
-      anon_sym_not,
-      anon_sym_lambda,
-      anon_sym_yield,
-      sym_integer,
-      sym_identifier,
-      anon_sym_await,
-      sym_true,
-      sym_false,
-      sym_none,
-  [18171] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1032), 12,
-      sym__dedent,
-      sym__string_start,
-      anon_sym_LPAREN,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_LBRACE,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_TILDE,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(1034), 36,
-      anon_sym_import,
-      anon_sym_from,
-      anon_sym_STAR,
-      anon_sym_print,
-      anon_sym_assert,
-      anon_sym_return,
-      anon_sym_del,
-      anon_sym_raise,
-      anon_sym_pass,
-      anon_sym_break,
-      anon_sym_continue,
-      anon_sym_if,
-      anon_sym_else,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_while,
-      anon_sym_try,
-      anon_sym_except,
-      anon_sym_finally,
-      anon_sym_with,
-      anon_sym_match,
-      anon_sym_def,
-      anon_sym_global,
-      anon_sym_nonlocal,
-      anon_sym_exec,
-      anon_sym_type,
-      anon_sym_class,
-      anon_sym_not,
-      anon_sym_lambda,
-      anon_sym_yield,
-      sym_integer,
-      sym_identifier,
-      anon_sym_await,
-      sym_true,
-      sym_false,
-      sym_none,
-  [18227] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(985), 13,
-      sym__dedent,
-      sym__string_start,
-      anon_sym_LPAREN,
-      anon_sym_except_STAR,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_LBRACE,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_TILDE,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(987), 35,
-      anon_sym_import,
-      anon_sym_from,
-      anon_sym_STAR,
-      anon_sym_print,
-      anon_sym_assert,
-      anon_sym_return,
-      anon_sym_del,
-      anon_sym_raise,
-      anon_sym_pass,
-      anon_sym_break,
-      anon_sym_continue,
-      anon_sym_if,
-      anon_sym_else,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_while,
-      anon_sym_try,
-      anon_sym_finally,
-      anon_sym_with,
-      anon_sym_match,
-      anon_sym_def,
-      anon_sym_global,
-      anon_sym_nonlocal,
-      anon_sym_exec,
-      anon_sym_type,
-      anon_sym_class,
-      anon_sym_not,
-      anon_sym_lambda,
-      anon_sym_yield,
-      sym_integer,
-      sym_identifier,
-      anon_sym_await,
-      sym_true,
-      sym_false,
-      sym_none,
-  [18283] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(985), 12,
-      sym__string_start,
-      ts_builtin_sym_end,
-      anon_sym_LPAREN,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_LBRACE,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_TILDE,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(987), 36,
-      anon_sym_import,
-      anon_sym_from,
-      anon_sym_STAR,
-      anon_sym_print,
-      anon_sym_assert,
-      anon_sym_return,
-      anon_sym_del,
-      anon_sym_raise,
-      anon_sym_pass,
-      anon_sym_break,
-      anon_sym_continue,
-      anon_sym_if,
-      anon_sym_else,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_while,
-      anon_sym_try,
-      anon_sym_except,
-      anon_sym_finally,
-      anon_sym_with,
-      anon_sym_match,
-      anon_sym_def,
-      anon_sym_global,
-      anon_sym_nonlocal,
-      anon_sym_exec,
-      anon_sym_type,
-      anon_sym_class,
-      anon_sym_not,
-      anon_sym_lambda,
-      anon_sym_yield,
-      sym_integer,
-      sym_identifier,
-      anon_sym_await,
-      sym_true,
-      sym_false,
-      sym_none,
-  [18339] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(966), 13,
-      sym__string_start,
-      ts_builtin_sym_end,
-      anon_sym_LPAREN,
-      anon_sym_except_STAR,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_LBRACE,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_TILDE,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(968), 35,
-      anon_sym_import,
-      anon_sym_from,
-      anon_sym_STAR,
-      anon_sym_print,
-      anon_sym_assert,
-      anon_sym_return,
-      anon_sym_del,
-      anon_sym_raise,
-      anon_sym_pass,
-      anon_sym_break,
-      anon_sym_continue,
-      anon_sym_if,
-      anon_sym_else,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_while,
-      anon_sym_try,
-      anon_sym_finally,
-      anon_sym_with,
-      anon_sym_match,
-      anon_sym_def,
-      anon_sym_global,
-      anon_sym_nonlocal,
-      anon_sym_exec,
-      anon_sym_type,
-      anon_sym_class,
-      anon_sym_not,
-      anon_sym_lambda,
-      anon_sym_yield,
-      sym_integer,
-      sym_identifier,
-      anon_sym_await,
-      sym_true,
-      sym_false,
-      sym_none,
-  [18395] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1036), 12,
-      sym__dedent,
-      sym__string_start,
-      anon_sym_LPAREN,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_LBRACE,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_TILDE,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(1038), 36,
-      anon_sym_import,
-      anon_sym_from,
-      anon_sym_STAR,
-      anon_sym_print,
-      anon_sym_assert,
-      anon_sym_return,
-      anon_sym_del,
-      anon_sym_raise,
-      anon_sym_pass,
-      anon_sym_break,
-      anon_sym_continue,
-      anon_sym_if,
-      anon_sym_else,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_while,
-      anon_sym_try,
-      anon_sym_except,
-      anon_sym_finally,
-      anon_sym_with,
-      anon_sym_match,
-      anon_sym_def,
-      anon_sym_global,
-      anon_sym_nonlocal,
-      anon_sym_exec,
-      anon_sym_type,
-      anon_sym_class,
-      anon_sym_not,
-      anon_sym_lambda,
-      anon_sym_yield,
-      sym_integer,
-      sym_identifier,
-      anon_sym_await,
-      sym_true,
-      sym_false,
-      sym_none,
-  [18451] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(985), 12,
-      sym__dedent,
-      sym__string_start,
-      anon_sym_LPAREN,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_LBRACE,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_TILDE,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(987), 36,
-      anon_sym_import,
-      anon_sym_from,
-      anon_sym_STAR,
-      anon_sym_print,
-      anon_sym_assert,
-      anon_sym_return,
-      anon_sym_del,
-      anon_sym_raise,
-      anon_sym_pass,
-      anon_sym_break,
-      anon_sym_continue,
-      anon_sym_if,
-      anon_sym_else,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_while,
-      anon_sym_try,
-      anon_sym_except,
-      anon_sym_finally,
-      anon_sym_with,
-      anon_sym_match,
-      anon_sym_def,
-      anon_sym_global,
-      anon_sym_nonlocal,
-      anon_sym_exec,
-      anon_sym_type,
-      anon_sym_class,
-      anon_sym_not,
-      anon_sym_lambda,
-      anon_sym_yield,
-      sym_integer,
-      sym_identifier,
-      anon_sym_await,
-      sym_true,
-      sym_false,
-      sym_none,
-  [18507] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(970), 12,
-      sym__dedent,
-      sym__string_start,
-      anon_sym_LPAREN,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_LBRACE,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_TILDE,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(972), 36,
-      anon_sym_import,
-      anon_sym_from,
-      anon_sym_STAR,
-      anon_sym_print,
-      anon_sym_assert,
-      anon_sym_return,
-      anon_sym_del,
-      anon_sym_raise,
-      anon_sym_pass,
-      anon_sym_break,
-      anon_sym_continue,
-      anon_sym_if,
-      anon_sym_else,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_while,
-      anon_sym_try,
-      anon_sym_except,
-      anon_sym_finally,
-      anon_sym_with,
-      anon_sym_match,
-      anon_sym_def,
-      anon_sym_global,
-      anon_sym_nonlocal,
-      anon_sym_exec,
-      anon_sym_type,
-      anon_sym_class,
-      anon_sym_not,
-      anon_sym_lambda,
-      anon_sym_yield,
-      sym_integer,
-      sym_identifier,
-      anon_sym_await,
-      sym_true,
-      sym_false,
-      sym_none,
-  [18563] = 5,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1100), 1,
-      anon_sym_case,
-    STATE(347), 2,
-      sym_case_block,
-      aux_sym_cases_repeat1,
-    ACTIONS(1086), 12,
-      sym__string_start,
-      ts_builtin_sym_end,
-      anon_sym_LPAREN,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_LBRACE,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_TILDE,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(1084), 33,
-      anon_sym_import,
-      anon_sym_from,
-      anon_sym_STAR,
-      anon_sym_print,
-      anon_sym_assert,
-      anon_sym_return,
-      anon_sym_del,
-      anon_sym_raise,
-      anon_sym_pass,
-      anon_sym_break,
-      anon_sym_continue,
-      anon_sym_if,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_while,
-      anon_sym_try,
-      anon_sym_with,
-      anon_sym_match,
-      anon_sym_def,
-      anon_sym_global,
-      anon_sym_nonlocal,
-      anon_sym_exec,
-      anon_sym_type,
-      anon_sym_class,
-      anon_sym_not,
-      anon_sym_lambda,
-      anon_sym_yield,
-      sym_integer,
-      sym_identifier,
-      anon_sym_await,
-      sym_true,
-      sym_false,
-      sym_none,
-  [18623] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(991), 12,
-      sym__dedent,
-      sym__string_start,
-      anon_sym_LPAREN,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_LBRACE,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_TILDE,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(989), 36,
-      anon_sym_import,
-      anon_sym_from,
-      anon_sym_STAR,
-      anon_sym_print,
-      anon_sym_assert,
-      anon_sym_return,
-      anon_sym_del,
-      anon_sym_raise,
-      anon_sym_pass,
-      anon_sym_break,
-      anon_sym_continue,
-      anon_sym_if,
-      anon_sym_else,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_while,
-      anon_sym_try,
-      anon_sym_except,
-      anon_sym_finally,
-      anon_sym_with,
-      anon_sym_match,
-      anon_sym_def,
-      anon_sym_global,
-      anon_sym_nonlocal,
-      anon_sym_exec,
-      anon_sym_type,
-      anon_sym_class,
-      anon_sym_not,
-      anon_sym_lambda,
-      anon_sym_yield,
-      sym_integer,
-      sym_identifier,
-      anon_sym_await,
-      sym_true,
-      sym_false,
-      sym_none,
-  [18679] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(970), 12,
-      sym__string_start,
-      ts_builtin_sym_end,
-      anon_sym_LPAREN,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_LBRACE,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_TILDE,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(972), 36,
-      anon_sym_import,
-      anon_sym_from,
-      anon_sym_STAR,
-      anon_sym_print,
-      anon_sym_assert,
-      anon_sym_return,
-      anon_sym_del,
-      anon_sym_raise,
-      anon_sym_pass,
-      anon_sym_break,
-      anon_sym_continue,
-      anon_sym_if,
-      anon_sym_else,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_while,
-      anon_sym_try,
-      anon_sym_except,
-      anon_sym_finally,
-      anon_sym_with,
-      anon_sym_match,
-      anon_sym_def,
-      anon_sym_global,
-      anon_sym_nonlocal,
-      anon_sym_exec,
-      anon_sym_type,
-      anon_sym_class,
-      anon_sym_not,
-      anon_sym_lambda,
-      anon_sym_yield,
-      sym_integer,
-      sym_identifier,
-      anon_sym_await,
-      sym_true,
-      sym_false,
-      sym_none,
-  [18735] = 19,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(622), 1,
-      sym_identifier,
-    ACTIONS(624), 1,
-      anon_sym_LPAREN,
-    ACTIONS(632), 1,
-      anon_sym_LBRACK,
-    ACTIONS(634), 1,
-      anon_sym_LBRACE,
-    ACTIONS(636), 1,
-      anon_sym_not,
-    ACTIONS(638), 1,
-      anon_sym_lambda,
-    ACTIONS(644), 1,
-      anon_sym_await,
-    ACTIONS(646), 1,
-      sym__string_start,
-    ACTIONS(1102), 1,
-      anon_sym_COLON,
-    STATE(740), 1,
-      sym_primary_expression,
-    STATE(742), 1,
-      sym_string,
-    STATE(1081), 1,
-      sym_expression,
-    ACTIONS(640), 2,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(630), 3,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_TILDE,
-    ACTIONS(642), 4,
-      sym_integer,
-      sym_true,
-      sym_false,
-      sym_none,
-    ACTIONS(626), 5,
-      anon_sym_print,
-      anon_sym_async,
-      anon_sym_match,
-      anon_sym_exec,
-      anon_sym_type,
-    STATE(1015), 7,
-      sym_named_expression,
-      sym_not_operator,
-      sym_boolean_operator,
-      sym_comparison_operator,
-      sym_lambda,
-      sym_conditional_expression,
-      sym_await,
-    STATE(811), 15,
-      sym_binary_operator,
-      sym_unary_operator,
-      sym_attribute,
-      sym_subscript,
-      sym_call,
-      sym_list,
-      sym_set,
-      sym_tuple,
-      sym_dictionary,
-      sym_list_comprehension,
-      sym_dictionary_comprehension,
-      sym_set_comprehension,
-      sym_generator_expression,
-      sym_parenthesized_expression,
-      sym_concatenated_string,
-  [18823] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1061), 13,
-      sym__dedent,
-      sym__string_start,
-      anon_sym_LPAREN,
-      anon_sym_except_STAR,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_LBRACE,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_TILDE,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(1063), 35,
-      anon_sym_import,
-      anon_sym_from,
-      anon_sym_STAR,
-      anon_sym_print,
-      anon_sym_assert,
-      anon_sym_return,
-      anon_sym_del,
-      anon_sym_raise,
-      anon_sym_pass,
-      anon_sym_break,
-      anon_sym_continue,
-      anon_sym_if,
-      anon_sym_else,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_while,
-      anon_sym_try,
-      anon_sym_finally,
-      anon_sym_with,
-      anon_sym_match,
-      anon_sym_def,
-      anon_sym_global,
-      anon_sym_nonlocal,
-      anon_sym_exec,
-      anon_sym_type,
-      anon_sym_class,
-      anon_sym_not,
-      anon_sym_lambda,
-      anon_sym_yield,
-      sym_integer,
-      sym_identifier,
-      anon_sym_await,
-      sym_true,
-      sym_false,
-      sym_none,
-  [18879] = 18,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(51), 1,
-      anon_sym_LBRACE,
-    ACTIONS(69), 1,
-      anon_sym_not,
-    ACTIONS(71), 1,
-      anon_sym_lambda,
-    ACTIONS(81), 1,
-      sym__string_start,
-    ACTIONS(331), 1,
-      sym_identifier,
-    ACTIONS(337), 1,
-      anon_sym_await,
-    ACTIONS(559), 1,
-      anon_sym_LPAREN,
-    ACTIONS(563), 1,
-      anon_sym_LBRACK,
-    STATE(684), 1,
-      sym_primary_expression,
-    STATE(713), 1,
-      sym_string,
-    STATE(980), 1,
+    STATE(996), 1,
       sym_expression,
     ACTIONS(75), 2,
       sym_ellipsis,
@@ -41751,21 +37754,20 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(333), 5,
+    ACTIONS(329), 5,
       anon_sym_print,
       anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(1009), 7,
+    STATE(985), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-      sym_await,
-    STATE(797), 15,
+    STATE(759), 16,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -41781,58 +37783,58 @@ static const uint16_t ts_small_parse_table[] = {
       sym_generator_expression,
       sym_parenthesized_expression,
       sym_concatenated_string,
-  [18964] = 18,
+      sym_await,
+  [18508] = 18,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(274), 1,
-      sym_identifier,
-    ACTIONS(278), 1,
-      anon_sym_LPAREN,
-    ACTIONS(293), 1,
-      anon_sym_LBRACK,
-    ACTIONS(295), 1,
+    ACTIONS(279), 1,
       anon_sym_LBRACE,
     ACTIONS(299), 1,
-      anon_sym_not,
-    ACTIONS(305), 1,
-      anon_sym_lambda,
-    ACTIONS(313), 1,
-      anon_sym_await,
-    ACTIONS(315), 1,
       sym__string_start,
-    STATE(600), 1,
+    ACTIONS(578), 1,
+      anon_sym_LPAREN,
+    ACTIONS(584), 1,
+      anon_sym_LBRACK,
+    ACTIONS(626), 1,
+      anon_sym_not,
+    ACTIONS(628), 1,
+      anon_sym_lambda,
+    ACTIONS(668), 1,
+      sym_identifier,
+    ACTIONS(678), 1,
+      anon_sym_await,
+    STATE(586), 1,
       sym_string,
-    STATE(630), 1,
+    STATE(590), 1,
       sym_primary_expression,
-    STATE(1186), 1,
+    STATE(882), 1,
       sym_expression,
-    ACTIONS(309), 2,
+    ACTIONS(293), 2,
       sym_ellipsis,
       sym_float,
-    ACTIONS(301), 3,
+    ACTIONS(582), 3,
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
-    ACTIONS(311), 4,
+    ACTIONS(295), 4,
       sym_integer,
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(285), 5,
+    ACTIONS(674), 5,
       anon_sym_print,
       anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(900), 7,
+    STATE(883), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-      sym_await,
-    STATE(642), 15,
+    STATE(605), 16,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -41848,16 +37850,17 @@ static const uint16_t ts_small_parse_table[] = {
       sym_generator_expression,
       sym_parenthesized_expression,
       sym_concatenated_string,
-  [19049] = 5,
+      sym_await,
+  [18593] = 5,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(846), 1,
+    ACTIONS(822), 1,
       anon_sym_else,
-    STATE(545), 1,
+    STATE(572), 1,
       sym_else_clause,
-    ACTIONS(1104), 12,
+    ACTIONS(1098), 12,
+      sym__dedent,
       sym__string_start,
-      ts_builtin_sym_end,
       anon_sym_LPAREN,
       anon_sym_DASH,
       anon_sym_PLUS,
@@ -41868,7 +37871,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_TILDE,
       sym_ellipsis,
       sym_float,
-    ACTIONS(1106), 33,
+    ACTIONS(1096), 33,
       anon_sym_import,
       anon_sym_from,
       anon_sym_STAR,
@@ -41902,12 +37905,12 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-  [19108] = 3,
+  [18652] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1108), 12,
+    ACTIONS(1102), 12,
+      sym__dedent,
       sym__string_start,
-      ts_builtin_sym_end,
       anon_sym_LPAREN,
       anon_sym_DASH,
       anon_sym_PLUS,
@@ -41918,7 +37921,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_TILDE,
       sym_ellipsis,
       sym_float,
-    ACTIONS(1110), 35,
+    ACTIONS(1100), 35,
       anon_sym_import,
       anon_sym_from,
       anon_sym_STAR,
@@ -41954,125 +37957,57 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-  [19163] = 18,
+  [18707] = 18,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(274), 1,
-      sym_identifier,
-    ACTIONS(278), 1,
-      anon_sym_LPAREN,
-    ACTIONS(293), 1,
-      anon_sym_LBRACK,
-    ACTIONS(295), 1,
+    ACTIONS(279), 1,
       anon_sym_LBRACE,
     ACTIONS(299), 1,
+      sym__string_start,
+    ACTIONS(578), 1,
+      anon_sym_LPAREN,
+    ACTIONS(584), 1,
+      anon_sym_LBRACK,
+    ACTIONS(626), 1,
       anon_sym_not,
-    ACTIONS(305), 1,
+    ACTIONS(628), 1,
       anon_sym_lambda,
-    ACTIONS(313), 1,
-      anon_sym_await,
-    ACTIONS(315), 1,
-      sym__string_start,
-    STATE(600), 1,
-      sym_string,
-    STATE(630), 1,
-      sym_primary_expression,
-    STATE(919), 1,
-      sym_expression,
-    ACTIONS(309), 2,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(301), 3,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_TILDE,
-    ACTIONS(311), 4,
-      sym_integer,
-      sym_true,
-      sym_false,
-      sym_none,
-    ACTIONS(285), 5,
-      anon_sym_print,
-      anon_sym_async,
-      anon_sym_match,
-      anon_sym_exec,
-      anon_sym_type,
-    STATE(900), 7,
-      sym_named_expression,
-      sym_not_operator,
-      sym_boolean_operator,
-      sym_comparison_operator,
-      sym_lambda,
-      sym_conditional_expression,
-      sym_await,
-    STATE(642), 15,
-      sym_binary_operator,
-      sym_unary_operator,
-      sym_attribute,
-      sym_subscript,
-      sym_call,
-      sym_list,
-      sym_set,
-      sym_tuple,
-      sym_dictionary,
-      sym_list_comprehension,
-      sym_dictionary_comprehension,
-      sym_set_comprehension,
-      sym_generator_expression,
-      sym_parenthesized_expression,
-      sym_concatenated_string,
-  [19248] = 18,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(295), 1,
-      anon_sym_LBRACE,
-    ACTIONS(315), 1,
-      sym__string_start,
-    ACTIONS(602), 1,
+    ACTIONS(668), 1,
       sym_identifier,
-    ACTIONS(604), 1,
-      anon_sym_LPAREN,
-    ACTIONS(612), 1,
-      anon_sym_LBRACK,
-    ACTIONS(614), 1,
-      anon_sym_not,
-    ACTIONS(616), 1,
-      anon_sym_lambda,
-    ACTIONS(618), 1,
+    ACTIONS(678), 1,
       anon_sym_await,
-    STATE(600), 1,
+    STATE(586), 1,
       sym_string,
-    STATE(643), 1,
+    STATE(590), 1,
       sym_primary_expression,
-    STATE(994), 1,
+    STATE(909), 1,
       sym_expression,
-    ACTIONS(309), 2,
+    ACTIONS(293), 2,
       sym_ellipsis,
       sym_float,
-    ACTIONS(610), 3,
+    ACTIONS(582), 3,
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
-    ACTIONS(311), 4,
+    ACTIONS(295), 4,
       sym_integer,
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(606), 5,
+    ACTIONS(674), 5,
       anon_sym_print,
       anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(900), 7,
+    STATE(883), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-      sym_await,
-    STATE(642), 15,
+    STATE(605), 16,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -42088,662 +38023,58 @@ static const uint16_t ts_small_parse_table[] = {
       sym_generator_expression,
       sym_parenthesized_expression,
       sym_concatenated_string,
-  [19333] = 18,
+      sym_await,
+  [18792] = 18,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(295), 1,
-      anon_sym_LBRACE,
-    ACTIONS(315), 1,
-      sym__string_start,
-    ACTIONS(602), 1,
+    ACTIONS(258), 1,
       sym_identifier,
-    ACTIONS(604), 1,
+    ACTIONS(262), 1,
       anon_sym_LPAREN,
-    ACTIONS(612), 1,
+    ACTIONS(277), 1,
       anon_sym_LBRACK,
-    ACTIONS(614), 1,
-      anon_sym_not,
-    ACTIONS(616), 1,
-      anon_sym_lambda,
-    ACTIONS(618), 1,
-      anon_sym_await,
-    STATE(600), 1,
-      sym_string,
-    STATE(643), 1,
-      sym_primary_expression,
-    STATE(904), 1,
-      sym_expression,
-    ACTIONS(309), 2,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(610), 3,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_TILDE,
-    ACTIONS(311), 4,
-      sym_integer,
-      sym_true,
-      sym_false,
-      sym_none,
-    ACTIONS(606), 5,
-      anon_sym_print,
-      anon_sym_async,
-      anon_sym_match,
-      anon_sym_exec,
-      anon_sym_type,
-    STATE(900), 7,
-      sym_named_expression,
-      sym_not_operator,
-      sym_boolean_operator,
-      sym_comparison_operator,
-      sym_lambda,
-      sym_conditional_expression,
-      sym_await,
-    STATE(642), 15,
-      sym_binary_operator,
-      sym_unary_operator,
-      sym_attribute,
-      sym_subscript,
-      sym_call,
-      sym_list,
-      sym_set,
-      sym_tuple,
-      sym_dictionary,
-      sym_list_comprehension,
-      sym_dictionary_comprehension,
-      sym_set_comprehension,
-      sym_generator_expression,
-      sym_parenthesized_expression,
-      sym_concatenated_string,
-  [19418] = 18,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(622), 1,
-      sym_identifier,
-    ACTIONS(624), 1,
-      anon_sym_LPAREN,
-    ACTIONS(632), 1,
-      anon_sym_LBRACK,
-    ACTIONS(634), 1,
+    ACTIONS(279), 1,
       anon_sym_LBRACE,
-    ACTIONS(636), 1,
+    ACTIONS(283), 1,
       anon_sym_not,
-    ACTIONS(638), 1,
+    ACTIONS(289), 1,
       anon_sym_lambda,
-    ACTIONS(644), 1,
+    ACTIONS(297), 1,
       anon_sym_await,
-    ACTIONS(646), 1,
-      sym__string_start,
-    STATE(740), 1,
-      sym_primary_expression,
-    STATE(742), 1,
-      sym_string,
-    STATE(1028), 1,
-      sym_expression,
-    ACTIONS(640), 2,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(630), 3,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_TILDE,
-    ACTIONS(642), 4,
-      sym_integer,
-      sym_true,
-      sym_false,
-      sym_none,
-    ACTIONS(626), 5,
-      anon_sym_print,
-      anon_sym_async,
-      anon_sym_match,
-      anon_sym_exec,
-      anon_sym_type,
-    STATE(1015), 7,
-      sym_named_expression,
-      sym_not_operator,
-      sym_boolean_operator,
-      sym_comparison_operator,
-      sym_lambda,
-      sym_conditional_expression,
-      sym_await,
-    STATE(811), 15,
-      sym_binary_operator,
-      sym_unary_operator,
-      sym_attribute,
-      sym_subscript,
-      sym_call,
-      sym_list,
-      sym_set,
-      sym_tuple,
-      sym_dictionary,
-      sym_list_comprehension,
-      sym_dictionary_comprehension,
-      sym_set_comprehension,
-      sym_generator_expression,
-      sym_parenthesized_expression,
-      sym_concatenated_string,
-  [19503] = 19,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(278), 1,
-      anon_sym_LPAREN,
-    ACTIONS(293), 1,
-      anon_sym_LBRACK,
-    ACTIONS(295), 1,
-      anon_sym_LBRACE,
     ACTIONS(299), 1,
-      anon_sym_not,
-    ACTIONS(305), 1,
-      anon_sym_lambda,
-    ACTIONS(315), 1,
       sym__string_start,
-    ACTIONS(1112), 1,
-      sym_identifier,
-    ACTIONS(1116), 1,
-      anon_sym_await,
-    STATE(600), 1,
+    STATE(586), 1,
       sym_string,
-    STATE(630), 1,
-      sym_primary_expression,
-    STATE(948), 1,
-      sym_expression,
-    ACTIONS(309), 2,
-      sym_ellipsis,
-      sym_float,
-    STATE(449), 2,
-      sym_attribute,
-      sym_subscript,
-    ACTIONS(301), 3,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_TILDE,
-    ACTIONS(311), 4,
-      sym_integer,
-      sym_true,
-      sym_false,
-      sym_none,
-    ACTIONS(1114), 5,
-      anon_sym_print,
-      anon_sym_async,
-      anon_sym_match,
-      anon_sym_exec,
-      anon_sym_type,
-    STATE(900), 7,
-      sym_named_expression,
-      sym_not_operator,
-      sym_boolean_operator,
-      sym_comparison_operator,
-      sym_lambda,
-      sym_conditional_expression,
-      sym_await,
-    STATE(642), 13,
-      sym_binary_operator,
-      sym_unary_operator,
-      sym_call,
-      sym_list,
-      sym_set,
-      sym_tuple,
-      sym_dictionary,
-      sym_list_comprehension,
-      sym_dictionary_comprehension,
-      sym_set_comprehension,
-      sym_generator_expression,
-      sym_parenthesized_expression,
-      sym_concatenated_string,
-  [19590] = 18,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(51), 1,
-      anon_sym_LBRACE,
-    ACTIONS(69), 1,
-      anon_sym_not,
-    ACTIONS(71), 1,
-      anon_sym_lambda,
-    ACTIONS(81), 1,
-      sym__string_start,
-    ACTIONS(331), 1,
-      sym_identifier,
-    ACTIONS(337), 1,
-      anon_sym_await,
-    ACTIONS(559), 1,
-      anon_sym_LPAREN,
-    ACTIONS(563), 1,
-      anon_sym_LBRACK,
-    STATE(684), 1,
-      sym_primary_expression,
-    STATE(713), 1,
-      sym_string,
-    STATE(1044), 1,
-      sym_expression,
-    ACTIONS(75), 2,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(47), 3,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_TILDE,
-    ACTIONS(77), 4,
-      sym_integer,
-      sym_true,
-      sym_false,
-      sym_none,
-    ACTIONS(333), 5,
-      anon_sym_print,
-      anon_sym_async,
-      anon_sym_match,
-      anon_sym_exec,
-      anon_sym_type,
-    STATE(1009), 7,
-      sym_named_expression,
-      sym_not_operator,
-      sym_boolean_operator,
-      sym_comparison_operator,
-      sym_lambda,
-      sym_conditional_expression,
-      sym_await,
-    STATE(797), 15,
-      sym_binary_operator,
-      sym_unary_operator,
-      sym_attribute,
-      sym_subscript,
-      sym_call,
-      sym_list,
-      sym_set,
-      sym_tuple,
-      sym_dictionary,
-      sym_list_comprehension,
-      sym_dictionary_comprehension,
-      sym_set_comprehension,
-      sym_generator_expression,
-      sym_parenthesized_expression,
-      sym_concatenated_string,
-  [19675] = 18,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(622), 1,
-      sym_identifier,
-    ACTIONS(624), 1,
-      anon_sym_LPAREN,
-    ACTIONS(632), 1,
-      anon_sym_LBRACK,
-    ACTIONS(634), 1,
-      anon_sym_LBRACE,
-    ACTIONS(636), 1,
-      anon_sym_not,
-    ACTIONS(638), 1,
-      anon_sym_lambda,
-    ACTIONS(644), 1,
-      anon_sym_await,
-    ACTIONS(646), 1,
-      sym__string_start,
-    STATE(740), 1,
-      sym_primary_expression,
-    STATE(742), 1,
-      sym_string,
-    STATE(1029), 1,
-      sym_expression,
-    ACTIONS(640), 2,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(630), 3,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_TILDE,
-    ACTIONS(642), 4,
-      sym_integer,
-      sym_true,
-      sym_false,
-      sym_none,
-    ACTIONS(626), 5,
-      anon_sym_print,
-      anon_sym_async,
-      anon_sym_match,
-      anon_sym_exec,
-      anon_sym_type,
-    STATE(1015), 7,
-      sym_named_expression,
-      sym_not_operator,
-      sym_boolean_operator,
-      sym_comparison_operator,
-      sym_lambda,
-      sym_conditional_expression,
-      sym_await,
-    STATE(811), 15,
-      sym_binary_operator,
-      sym_unary_operator,
-      sym_attribute,
-      sym_subscript,
-      sym_call,
-      sym_list,
-      sym_set,
-      sym_tuple,
-      sym_dictionary,
-      sym_list_comprehension,
-      sym_dictionary_comprehension,
-      sym_set_comprehension,
-      sym_generator_expression,
-      sym_parenthesized_expression,
-      sym_concatenated_string,
-  [19760] = 18,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(622), 1,
-      sym_identifier,
-    ACTIONS(624), 1,
-      anon_sym_LPAREN,
-    ACTIONS(632), 1,
-      anon_sym_LBRACK,
-    ACTIONS(634), 1,
-      anon_sym_LBRACE,
-    ACTIONS(636), 1,
-      anon_sym_not,
-    ACTIONS(638), 1,
-      anon_sym_lambda,
-    ACTIONS(644), 1,
-      anon_sym_await,
-    ACTIONS(646), 1,
-      sym__string_start,
-    STATE(740), 1,
-      sym_primary_expression,
-    STATE(742), 1,
-      sym_string,
-    STATE(1030), 1,
-      sym_expression,
-    ACTIONS(640), 2,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(630), 3,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_TILDE,
-    ACTIONS(642), 4,
-      sym_integer,
-      sym_true,
-      sym_false,
-      sym_none,
-    ACTIONS(626), 5,
-      anon_sym_print,
-      anon_sym_async,
-      anon_sym_match,
-      anon_sym_exec,
-      anon_sym_type,
-    STATE(1015), 7,
-      sym_named_expression,
-      sym_not_operator,
-      sym_boolean_operator,
-      sym_comparison_operator,
-      sym_lambda,
-      sym_conditional_expression,
-      sym_await,
-    STATE(811), 15,
-      sym_binary_operator,
-      sym_unary_operator,
-      sym_attribute,
-      sym_subscript,
-      sym_call,
-      sym_list,
-      sym_set,
-      sym_tuple,
-      sym_dictionary,
-      sym_list_comprehension,
-      sym_dictionary_comprehension,
-      sym_set_comprehension,
-      sym_generator_expression,
-      sym_parenthesized_expression,
-      sym_concatenated_string,
-  [19845] = 18,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(622), 1,
-      sym_identifier,
-    ACTIONS(624), 1,
-      anon_sym_LPAREN,
-    ACTIONS(632), 1,
-      anon_sym_LBRACK,
-    ACTIONS(634), 1,
-      anon_sym_LBRACE,
-    ACTIONS(636), 1,
-      anon_sym_not,
-    ACTIONS(638), 1,
-      anon_sym_lambda,
-    ACTIONS(644), 1,
-      anon_sym_await,
-    ACTIONS(646), 1,
-      sym__string_start,
-    STATE(740), 1,
-      sym_primary_expression,
-    STATE(742), 1,
-      sym_string,
-    STATE(1032), 1,
-      sym_expression,
-    ACTIONS(640), 2,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(630), 3,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_TILDE,
-    ACTIONS(642), 4,
-      sym_integer,
-      sym_true,
-      sym_false,
-      sym_none,
-    ACTIONS(626), 5,
-      anon_sym_print,
-      anon_sym_async,
-      anon_sym_match,
-      anon_sym_exec,
-      anon_sym_type,
-    STATE(1015), 7,
-      sym_named_expression,
-      sym_not_operator,
-      sym_boolean_operator,
-      sym_comparison_operator,
-      sym_lambda,
-      sym_conditional_expression,
-      sym_await,
-    STATE(811), 15,
-      sym_binary_operator,
-      sym_unary_operator,
-      sym_attribute,
-      sym_subscript,
-      sym_call,
-      sym_list,
-      sym_set,
-      sym_tuple,
-      sym_dictionary,
-      sym_list_comprehension,
-      sym_dictionary_comprehension,
-      sym_set_comprehension,
-      sym_generator_expression,
-      sym_parenthesized_expression,
-      sym_concatenated_string,
-  [19930] = 18,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(274), 1,
-      sym_identifier,
-    ACTIONS(278), 1,
-      anon_sym_LPAREN,
-    ACTIONS(293), 1,
-      anon_sym_LBRACK,
-    ACTIONS(295), 1,
-      anon_sym_LBRACE,
-    ACTIONS(299), 1,
-      anon_sym_not,
-    ACTIONS(305), 1,
-      anon_sym_lambda,
-    ACTIONS(313), 1,
-      anon_sym_await,
-    ACTIONS(315), 1,
-      sym__string_start,
-    STATE(600), 1,
-      sym_string,
-    STATE(630), 1,
-      sym_primary_expression,
-    STATE(1134), 1,
-      sym_expression,
-    ACTIONS(309), 2,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(301), 3,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_TILDE,
-    ACTIONS(311), 4,
-      sym_integer,
-      sym_true,
-      sym_false,
-      sym_none,
-    ACTIONS(285), 5,
-      anon_sym_print,
-      anon_sym_async,
-      anon_sym_match,
-      anon_sym_exec,
-      anon_sym_type,
-    STATE(900), 7,
-      sym_named_expression,
-      sym_not_operator,
-      sym_boolean_operator,
-      sym_comparison_operator,
-      sym_lambda,
-      sym_conditional_expression,
-      sym_await,
-    STATE(642), 15,
-      sym_binary_operator,
-      sym_unary_operator,
-      sym_attribute,
-      sym_subscript,
-      sym_call,
-      sym_list,
-      sym_set,
-      sym_tuple,
-      sym_dictionary,
-      sym_list_comprehension,
-      sym_dictionary_comprehension,
-      sym_set_comprehension,
-      sym_generator_expression,
-      sym_parenthesized_expression,
-      sym_concatenated_string,
-  [20015] = 18,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(274), 1,
-      sym_identifier,
-    ACTIONS(278), 1,
-      anon_sym_LPAREN,
-    ACTIONS(293), 1,
-      anon_sym_LBRACK,
-    ACTIONS(295), 1,
-      anon_sym_LBRACE,
-    ACTIONS(299), 1,
-      anon_sym_not,
-    ACTIONS(305), 1,
-      anon_sym_lambda,
-    ACTIONS(313), 1,
-      anon_sym_await,
-    ACTIONS(315), 1,
-      sym__string_start,
-    STATE(600), 1,
-      sym_string,
-    STATE(630), 1,
-      sym_primary_expression,
-    STATE(1135), 1,
-      sym_expression,
-    ACTIONS(309), 2,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(301), 3,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_TILDE,
-    ACTIONS(311), 4,
-      sym_integer,
-      sym_true,
-      sym_false,
-      sym_none,
-    ACTIONS(285), 5,
-      anon_sym_print,
-      anon_sym_async,
-      anon_sym_match,
-      anon_sym_exec,
-      anon_sym_type,
-    STATE(900), 7,
-      sym_named_expression,
-      sym_not_operator,
-      sym_boolean_operator,
-      sym_comparison_operator,
-      sym_lambda,
-      sym_conditional_expression,
-      sym_await,
-    STATE(642), 15,
-      sym_binary_operator,
-      sym_unary_operator,
-      sym_attribute,
-      sym_subscript,
-      sym_call,
-      sym_list,
-      sym_set,
-      sym_tuple,
-      sym_dictionary,
-      sym_list_comprehension,
-      sym_dictionary_comprehension,
-      sym_set_comprehension,
-      sym_generator_expression,
-      sym_parenthesized_expression,
-      sym_concatenated_string,
-  [20100] = 18,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(274), 1,
-      sym_identifier,
-    ACTIONS(278), 1,
-      anon_sym_LPAREN,
-    ACTIONS(293), 1,
-      anon_sym_LBRACK,
-    ACTIONS(295), 1,
-      anon_sym_LBRACE,
-    ACTIONS(299), 1,
-      anon_sym_not,
-    ACTIONS(305), 1,
-      anon_sym_lambda,
-    ACTIONS(313), 1,
-      anon_sym_await,
-    ACTIONS(315), 1,
-      sym__string_start,
-    STATE(600), 1,
-      sym_string,
-    STATE(630), 1,
+    STATE(616), 1,
       sym_primary_expression,
     STATE(1151), 1,
       sym_expression,
-    ACTIONS(309), 2,
+    ACTIONS(293), 2,
       sym_ellipsis,
       sym_float,
-    ACTIONS(301), 3,
+    ACTIONS(285), 3,
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
-    ACTIONS(311), 4,
+    ACTIONS(295), 4,
       sym_integer,
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(285), 5,
+    ACTIONS(269), 5,
       anon_sym_print,
       anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(900), 7,
+    STATE(883), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-      sym_await,
-    STATE(642), 15,
+    STATE(605), 16,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -42759,131 +38090,15 @@ static const uint16_t ts_small_parse_table[] = {
       sym_generator_expression,
       sym_parenthesized_expression,
       sym_concatenated_string,
-  [20185] = 5,
+      sym_await,
+  [18877] = 5,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(846), 1,
+    ACTIONS(822), 1,
       anon_sym_else,
-    STATE(500), 1,
+    STATE(567), 1,
       sym_else_clause,
-    ACTIONS(1118), 12,
-      sym__string_start,
-      ts_builtin_sym_end,
-      anon_sym_LPAREN,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_LBRACE,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_TILDE,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(1120), 33,
-      anon_sym_import,
-      anon_sym_from,
-      anon_sym_STAR,
-      anon_sym_print,
-      anon_sym_assert,
-      anon_sym_return,
-      anon_sym_del,
-      anon_sym_raise,
-      anon_sym_pass,
-      anon_sym_break,
-      anon_sym_continue,
-      anon_sym_if,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_while,
-      anon_sym_try,
-      anon_sym_with,
-      anon_sym_match,
-      anon_sym_def,
-      anon_sym_global,
-      anon_sym_nonlocal,
-      anon_sym_exec,
-      anon_sym_type,
-      anon_sym_class,
-      anon_sym_not,
-      anon_sym_lambda,
-      anon_sym_yield,
-      sym_integer,
-      sym_identifier,
-      anon_sym_await,
-      sym_true,
-      sym_false,
-      sym_none,
-  [20244] = 18,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(622), 1,
-      sym_identifier,
-    ACTIONS(624), 1,
-      anon_sym_LPAREN,
-    ACTIONS(632), 1,
-      anon_sym_LBRACK,
-    ACTIONS(634), 1,
-      anon_sym_LBRACE,
-    ACTIONS(636), 1,
-      anon_sym_not,
-    ACTIONS(638), 1,
-      anon_sym_lambda,
-    ACTIONS(644), 1,
-      anon_sym_await,
-    ACTIONS(646), 1,
-      sym__string_start,
-    STATE(740), 1,
-      sym_primary_expression,
-    STATE(742), 1,
-      sym_string,
-    STATE(1104), 1,
-      sym_expression,
-    ACTIONS(640), 2,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(630), 3,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_TILDE,
-    ACTIONS(642), 4,
-      sym_integer,
-      sym_true,
-      sym_false,
-      sym_none,
-    ACTIONS(626), 5,
-      anon_sym_print,
-      anon_sym_async,
-      anon_sym_match,
-      anon_sym_exec,
-      anon_sym_type,
-    STATE(1015), 7,
-      sym_named_expression,
-      sym_not_operator,
-      sym_boolean_operator,
-      sym_comparison_operator,
-      sym_lambda,
-      sym_conditional_expression,
-      sym_await,
-    STATE(811), 15,
-      sym_binary_operator,
-      sym_unary_operator,
-      sym_attribute,
-      sym_subscript,
-      sym_call,
-      sym_list,
-      sym_set,
-      sym_tuple,
-      sym_dictionary,
-      sym_list_comprehension,
-      sym_dictionary_comprehension,
-      sym_set_comprehension,
-      sym_generator_expression,
-      sym_parenthesized_expression,
-      sym_concatenated_string,
-  [20329] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1124), 12,
+    ACTIONS(1106), 12,
       sym__dedent,
       sym__string_start,
       anon_sym_LPAREN,
@@ -42896,7 +38111,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_TILDE,
       sym_ellipsis,
       sym_float,
-    ACTIONS(1122), 35,
+    ACTIONS(1104), 33,
       anon_sym_import,
       anon_sym_from,
       anon_sym_STAR,
@@ -42909,8 +38124,6 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_break,
       anon_sym_continue,
       anon_sym_if,
-      anon_sym_elif,
-      anon_sym_else,
       anon_sym_async,
       anon_sym_for,
       anon_sym_while,
@@ -42932,58 +38145,57 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-  [20384] = 18,
+  [18936] = 18,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(274), 1,
-      sym_identifier,
-    ACTIONS(278), 1,
-      anon_sym_LPAREN,
-    ACTIONS(293), 1,
-      anon_sym_LBRACK,
-    ACTIONS(295), 1,
+    ACTIONS(279), 1,
       anon_sym_LBRACE,
     ACTIONS(299), 1,
-      anon_sym_not,
-    ACTIONS(305), 1,
-      anon_sym_lambda,
-    ACTIONS(313), 1,
-      anon_sym_await,
-    ACTIONS(315), 1,
       sym__string_start,
-    STATE(600), 1,
+    ACTIONS(578), 1,
+      anon_sym_LPAREN,
+    ACTIONS(584), 1,
+      anon_sym_LBRACK,
+    ACTIONS(626), 1,
+      anon_sym_not,
+    ACTIONS(628), 1,
+      anon_sym_lambda,
+    ACTIONS(668), 1,
+      sym_identifier,
+    ACTIONS(678), 1,
+      anon_sym_await,
+    STATE(586), 1,
       sym_string,
-    STATE(630), 1,
+    STATE(590), 1,
       sym_primary_expression,
-    STATE(1153), 1,
+    STATE(910), 1,
       sym_expression,
-    ACTIONS(309), 2,
+    ACTIONS(293), 2,
       sym_ellipsis,
       sym_float,
-    ACTIONS(301), 3,
+    ACTIONS(582), 3,
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
-    ACTIONS(311), 4,
+    ACTIONS(295), 4,
       sym_integer,
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(285), 5,
+    ACTIONS(674), 5,
       anon_sym_print,
       anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(900), 7,
+    STATE(883), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-      sym_await,
-    STATE(642), 15,
+    STATE(605), 16,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -42999,1620 +38211,15 @@ static const uint16_t ts_small_parse_table[] = {
       sym_generator_expression,
       sym_parenthesized_expression,
       sym_concatenated_string,
-  [20469] = 18,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(622), 1,
-      sym_identifier,
-    ACTIONS(624), 1,
-      anon_sym_LPAREN,
-    ACTIONS(632), 1,
-      anon_sym_LBRACK,
-    ACTIONS(634), 1,
-      anon_sym_LBRACE,
-    ACTIONS(636), 1,
-      anon_sym_not,
-    ACTIONS(638), 1,
-      anon_sym_lambda,
-    ACTIONS(644), 1,
-      anon_sym_await,
-    ACTIONS(646), 1,
-      sym__string_start,
-    STATE(740), 1,
-      sym_primary_expression,
-    STATE(742), 1,
-      sym_string,
-    STATE(1035), 1,
-      sym_expression,
-    ACTIONS(640), 2,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(630), 3,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_TILDE,
-    ACTIONS(642), 4,
-      sym_integer,
-      sym_true,
-      sym_false,
-      sym_none,
-    ACTIONS(626), 5,
-      anon_sym_print,
-      anon_sym_async,
-      anon_sym_match,
-      anon_sym_exec,
-      anon_sym_type,
-    STATE(1015), 7,
-      sym_named_expression,
-      sym_not_operator,
-      sym_boolean_operator,
-      sym_comparison_operator,
-      sym_lambda,
-      sym_conditional_expression,
       sym_await,
-    STATE(811), 15,
-      sym_binary_operator,
-      sym_unary_operator,
-      sym_attribute,
-      sym_subscript,
-      sym_call,
-      sym_list,
-      sym_set,
-      sym_tuple,
-      sym_dictionary,
-      sym_list_comprehension,
-      sym_dictionary_comprehension,
-      sym_set_comprehension,
-      sym_generator_expression,
-      sym_parenthesized_expression,
-      sym_concatenated_string,
-  [20554] = 18,
+  [19021] = 6,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(274), 1,
-      sym_identifier,
-    ACTIONS(278), 1,
-      anon_sym_LPAREN,
-    ACTIONS(293), 1,
-      anon_sym_LBRACK,
-    ACTIONS(295), 1,
-      anon_sym_LBRACE,
-    ACTIONS(299), 1,
-      anon_sym_not,
-    ACTIONS(305), 1,
-      anon_sym_lambda,
-    ACTIONS(313), 1,
-      anon_sym_await,
-    ACTIONS(315), 1,
-      sym__string_start,
-    STATE(600), 1,
-      sym_string,
-    STATE(630), 1,
-      sym_primary_expression,
-    STATE(947), 1,
-      sym_expression,
-    ACTIONS(309), 2,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(301), 3,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_TILDE,
-    ACTIONS(311), 4,
-      sym_integer,
-      sym_true,
-      sym_false,
-      sym_none,
-    ACTIONS(285), 5,
-      anon_sym_print,
-      anon_sym_async,
-      anon_sym_match,
-      anon_sym_exec,
-      anon_sym_type,
-    STATE(900), 7,
-      sym_named_expression,
-      sym_not_operator,
-      sym_boolean_operator,
-      sym_comparison_operator,
-      sym_lambda,
-      sym_conditional_expression,
-      sym_await,
-    STATE(642), 15,
-      sym_binary_operator,
-      sym_unary_operator,
-      sym_attribute,
-      sym_subscript,
-      sym_call,
-      sym_list,
-      sym_set,
-      sym_tuple,
-      sym_dictionary,
-      sym_list_comprehension,
-      sym_dictionary_comprehension,
-      sym_set_comprehension,
-      sym_generator_expression,
-      sym_parenthesized_expression,
-      sym_concatenated_string,
-  [20639] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1124), 12,
-      sym__string_start,
-      ts_builtin_sym_end,
-      anon_sym_LPAREN,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_LBRACE,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_TILDE,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(1122), 35,
-      anon_sym_import,
-      anon_sym_from,
-      anon_sym_STAR,
-      anon_sym_print,
-      anon_sym_assert,
-      anon_sym_return,
-      anon_sym_del,
-      anon_sym_raise,
-      anon_sym_pass,
-      anon_sym_break,
-      anon_sym_continue,
-      anon_sym_if,
-      anon_sym_elif,
-      anon_sym_else,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_while,
-      anon_sym_try,
-      anon_sym_with,
-      anon_sym_match,
-      anon_sym_def,
-      anon_sym_global,
-      anon_sym_nonlocal,
-      anon_sym_exec,
-      anon_sym_type,
-      anon_sym_class,
-      anon_sym_not,
-      anon_sym_lambda,
-      anon_sym_yield,
-      sym_integer,
-      sym_identifier,
-      anon_sym_await,
-      sym_true,
-      sym_false,
-      sym_none,
-  [20694] = 5,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(846), 1,
-      anon_sym_else,
-    STATE(519), 1,
-      sym_else_clause,
-    ACTIONS(1126), 12,
-      sym__string_start,
-      ts_builtin_sym_end,
-      anon_sym_LPAREN,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_LBRACE,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_TILDE,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(1128), 33,
-      anon_sym_import,
-      anon_sym_from,
-      anon_sym_STAR,
-      anon_sym_print,
-      anon_sym_assert,
-      anon_sym_return,
-      anon_sym_del,
-      anon_sym_raise,
-      anon_sym_pass,
-      anon_sym_break,
-      anon_sym_continue,
-      anon_sym_if,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_while,
-      anon_sym_try,
-      anon_sym_with,
-      anon_sym_match,
-      anon_sym_def,
-      anon_sym_global,
-      anon_sym_nonlocal,
-      anon_sym_exec,
-      anon_sym_type,
-      anon_sym_class,
-      anon_sym_not,
-      anon_sym_lambda,
-      anon_sym_yield,
-      sym_integer,
-      sym_identifier,
-      anon_sym_await,
-      sym_true,
-      sym_false,
-      sym_none,
-  [20753] = 18,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(274), 1,
-      sym_identifier,
-    ACTIONS(278), 1,
-      anon_sym_LPAREN,
-    ACTIONS(293), 1,
-      anon_sym_LBRACK,
-    ACTIONS(295), 1,
-      anon_sym_LBRACE,
-    ACTIONS(299), 1,
-      anon_sym_not,
-    ACTIONS(305), 1,
-      anon_sym_lambda,
-    ACTIONS(313), 1,
-      anon_sym_await,
-    ACTIONS(315), 1,
-      sym__string_start,
-    STATE(600), 1,
-      sym_string,
-    STATE(630), 1,
-      sym_primary_expression,
-    STATE(916), 1,
-      sym_expression,
-    ACTIONS(309), 2,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(301), 3,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_TILDE,
-    ACTIONS(311), 4,
-      sym_integer,
-      sym_true,
-      sym_false,
-      sym_none,
-    ACTIONS(285), 5,
-      anon_sym_print,
-      anon_sym_async,
-      anon_sym_match,
-      anon_sym_exec,
-      anon_sym_type,
-    STATE(900), 7,
-      sym_named_expression,
-      sym_not_operator,
-      sym_boolean_operator,
-      sym_comparison_operator,
-      sym_lambda,
-      sym_conditional_expression,
-      sym_await,
-    STATE(642), 15,
-      sym_binary_operator,
-      sym_unary_operator,
-      sym_attribute,
-      sym_subscript,
-      sym_call,
-      sym_list,
-      sym_set,
-      sym_tuple,
-      sym_dictionary,
-      sym_list_comprehension,
-      sym_dictionary_comprehension,
-      sym_set_comprehension,
-      sym_generator_expression,
-      sym_parenthesized_expression,
-      sym_concatenated_string,
-  [20838] = 18,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(51), 1,
-      anon_sym_LBRACE,
-    ACTIONS(69), 1,
-      anon_sym_not,
-    ACTIONS(71), 1,
-      anon_sym_lambda,
-    ACTIONS(81), 1,
-      sym__string_start,
-    ACTIONS(331), 1,
-      sym_identifier,
-    ACTIONS(337), 1,
-      anon_sym_await,
-    ACTIONS(559), 1,
-      anon_sym_LPAREN,
-    ACTIONS(563), 1,
-      anon_sym_LBRACK,
-    STATE(684), 1,
-      sym_primary_expression,
-    STATE(713), 1,
-      sym_string,
-    STATE(1000), 1,
-      sym_expression,
-    ACTIONS(75), 2,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(47), 3,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_TILDE,
-    ACTIONS(77), 4,
-      sym_integer,
-      sym_true,
-      sym_false,
-      sym_none,
-    ACTIONS(333), 5,
-      anon_sym_print,
-      anon_sym_async,
-      anon_sym_match,
-      anon_sym_exec,
-      anon_sym_type,
-    STATE(1009), 7,
-      sym_named_expression,
-      sym_not_operator,
-      sym_boolean_operator,
-      sym_comparison_operator,
-      sym_lambda,
-      sym_conditional_expression,
-      sym_await,
-    STATE(797), 15,
-      sym_binary_operator,
-      sym_unary_operator,
-      sym_attribute,
-      sym_subscript,
-      sym_call,
-      sym_list,
-      sym_set,
-      sym_tuple,
-      sym_dictionary,
-      sym_list_comprehension,
-      sym_dictionary_comprehension,
-      sym_set_comprehension,
-      sym_generator_expression,
-      sym_parenthesized_expression,
-      sym_concatenated_string,
-  [20923] = 18,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(51), 1,
-      anon_sym_LBRACE,
-    ACTIONS(69), 1,
-      anon_sym_not,
-    ACTIONS(71), 1,
-      anon_sym_lambda,
-    ACTIONS(81), 1,
-      sym__string_start,
-    ACTIONS(331), 1,
-      sym_identifier,
-    ACTIONS(337), 1,
-      anon_sym_await,
-    ACTIONS(559), 1,
-      anon_sym_LPAREN,
-    ACTIONS(563), 1,
-      anon_sym_LBRACK,
-    STATE(684), 1,
-      sym_primary_expression,
-    STATE(713), 1,
-      sym_string,
-    STATE(1001), 1,
-      sym_expression,
-    ACTIONS(75), 2,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(47), 3,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_TILDE,
-    ACTIONS(77), 4,
-      sym_integer,
-      sym_true,
-      sym_false,
-      sym_none,
-    ACTIONS(333), 5,
-      anon_sym_print,
-      anon_sym_async,
-      anon_sym_match,
-      anon_sym_exec,
-      anon_sym_type,
-    STATE(1009), 7,
-      sym_named_expression,
-      sym_not_operator,
-      sym_boolean_operator,
-      sym_comparison_operator,
-      sym_lambda,
-      sym_conditional_expression,
-      sym_await,
-    STATE(797), 15,
-      sym_binary_operator,
-      sym_unary_operator,
-      sym_attribute,
-      sym_subscript,
-      sym_call,
-      sym_list,
-      sym_set,
-      sym_tuple,
-      sym_dictionary,
-      sym_list_comprehension,
-      sym_dictionary_comprehension,
-      sym_set_comprehension,
-      sym_generator_expression,
-      sym_parenthesized_expression,
-      sym_concatenated_string,
-  [21008] = 18,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(274), 1,
-      sym_identifier,
-    ACTIONS(278), 1,
-      anon_sym_LPAREN,
-    ACTIONS(293), 1,
-      anon_sym_LBRACK,
-    ACTIONS(295), 1,
-      anon_sym_LBRACE,
-    ACTIONS(299), 1,
-      anon_sym_not,
-    ACTIONS(305), 1,
-      anon_sym_lambda,
-    ACTIONS(313), 1,
-      anon_sym_await,
-    ACTIONS(315), 1,
-      sym__string_start,
-    STATE(600), 1,
-      sym_string,
-    STATE(630), 1,
-      sym_primary_expression,
-    STATE(1136), 1,
-      sym_expression,
-    ACTIONS(309), 2,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(301), 3,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_TILDE,
-    ACTIONS(311), 4,
-      sym_integer,
-      sym_true,
-      sym_false,
-      sym_none,
-    ACTIONS(285), 5,
-      anon_sym_print,
-      anon_sym_async,
-      anon_sym_match,
-      anon_sym_exec,
-      anon_sym_type,
-    STATE(900), 7,
-      sym_named_expression,
-      sym_not_operator,
-      sym_boolean_operator,
-      sym_comparison_operator,
-      sym_lambda,
-      sym_conditional_expression,
-      sym_await,
-    STATE(642), 15,
-      sym_binary_operator,
-      sym_unary_operator,
-      sym_attribute,
-      sym_subscript,
-      sym_call,
-      sym_list,
-      sym_set,
-      sym_tuple,
-      sym_dictionary,
-      sym_list_comprehension,
-      sym_dictionary_comprehension,
-      sym_set_comprehension,
-      sym_generator_expression,
-      sym_parenthesized_expression,
-      sym_concatenated_string,
-  [21093] = 5,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(856), 1,
-      anon_sym_finally,
-    STATE(591), 1,
-      sym_finally_clause,
-    ACTIONS(1132), 12,
-      sym__dedent,
-      sym__string_start,
-      anon_sym_LPAREN,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_LBRACE,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_TILDE,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(1130), 33,
-      anon_sym_import,
-      anon_sym_from,
-      anon_sym_STAR,
-      anon_sym_print,
-      anon_sym_assert,
-      anon_sym_return,
-      anon_sym_del,
-      anon_sym_raise,
-      anon_sym_pass,
-      anon_sym_break,
-      anon_sym_continue,
-      anon_sym_if,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_while,
-      anon_sym_try,
-      anon_sym_with,
-      anon_sym_match,
-      anon_sym_def,
-      anon_sym_global,
-      anon_sym_nonlocal,
-      anon_sym_exec,
-      anon_sym_type,
-      anon_sym_class,
-      anon_sym_not,
-      anon_sym_lambda,
-      anon_sym_yield,
-      sym_integer,
-      sym_identifier,
-      anon_sym_await,
-      sym_true,
-      sym_false,
-      sym_none,
-  [21152] = 5,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(852), 1,
-      anon_sym_else,
-    STATE(593), 1,
-      sym_else_clause,
-    ACTIONS(1126), 12,
-      sym__dedent,
-      sym__string_start,
-      anon_sym_LPAREN,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_LBRACE,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_TILDE,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(1128), 33,
-      anon_sym_import,
-      anon_sym_from,
-      anon_sym_STAR,
-      anon_sym_print,
-      anon_sym_assert,
-      anon_sym_return,
-      anon_sym_del,
-      anon_sym_raise,
-      anon_sym_pass,
-      anon_sym_break,
-      anon_sym_continue,
-      anon_sym_if,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_while,
-      anon_sym_try,
-      anon_sym_with,
-      anon_sym_match,
-      anon_sym_def,
-      anon_sym_global,
-      anon_sym_nonlocal,
-      anon_sym_exec,
-      anon_sym_type,
-      anon_sym_class,
-      anon_sym_not,
-      anon_sym_lambda,
-      anon_sym_yield,
-      sym_integer,
-      sym_identifier,
-      anon_sym_await,
-      sym_true,
-      sym_false,
-      sym_none,
-  [21211] = 18,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(274), 1,
-      sym_identifier,
-    ACTIONS(278), 1,
-      anon_sym_LPAREN,
-    ACTIONS(293), 1,
-      anon_sym_LBRACK,
-    ACTIONS(295), 1,
-      anon_sym_LBRACE,
-    ACTIONS(299), 1,
-      anon_sym_not,
-    ACTIONS(305), 1,
-      anon_sym_lambda,
-    ACTIONS(313), 1,
-      anon_sym_await,
-    ACTIONS(315), 1,
-      sym__string_start,
-    STATE(600), 1,
-      sym_string,
-    STATE(630), 1,
-      sym_primary_expression,
-    STATE(1169), 1,
-      sym_expression,
-    ACTIONS(309), 2,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(301), 3,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_TILDE,
-    ACTIONS(311), 4,
-      sym_integer,
-      sym_true,
-      sym_false,
-      sym_none,
-    ACTIONS(285), 5,
-      anon_sym_print,
-      anon_sym_async,
-      anon_sym_match,
-      anon_sym_exec,
-      anon_sym_type,
-    STATE(900), 7,
-      sym_named_expression,
-      sym_not_operator,
-      sym_boolean_operator,
-      sym_comparison_operator,
-      sym_lambda,
-      sym_conditional_expression,
-      sym_await,
-    STATE(642), 15,
-      sym_binary_operator,
-      sym_unary_operator,
-      sym_attribute,
-      sym_subscript,
-      sym_call,
-      sym_list,
-      sym_set,
-      sym_tuple,
-      sym_dictionary,
-      sym_list_comprehension,
-      sym_dictionary_comprehension,
-      sym_set_comprehension,
-      sym_generator_expression,
-      sym_parenthesized_expression,
-      sym_concatenated_string,
-  [21296] = 18,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(622), 1,
-      sym_identifier,
-    ACTIONS(624), 1,
-      anon_sym_LPAREN,
-    ACTIONS(632), 1,
-      anon_sym_LBRACK,
-    ACTIONS(634), 1,
-      anon_sym_LBRACE,
-    ACTIONS(636), 1,
-      anon_sym_not,
-    ACTIONS(638), 1,
-      anon_sym_lambda,
-    ACTIONS(644), 1,
-      anon_sym_await,
-    ACTIONS(646), 1,
-      sym__string_start,
-    STATE(740), 1,
-      sym_primary_expression,
-    STATE(742), 1,
-      sym_string,
-    STATE(1123), 1,
-      sym_expression,
-    ACTIONS(640), 2,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(630), 3,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_TILDE,
-    ACTIONS(642), 4,
-      sym_integer,
-      sym_true,
-      sym_false,
-      sym_none,
-    ACTIONS(626), 5,
-      anon_sym_print,
-      anon_sym_async,
-      anon_sym_match,
-      anon_sym_exec,
-      anon_sym_type,
-    STATE(1015), 7,
-      sym_named_expression,
-      sym_not_operator,
-      sym_boolean_operator,
-      sym_comparison_operator,
-      sym_lambda,
-      sym_conditional_expression,
-      sym_await,
-    STATE(811), 15,
-      sym_binary_operator,
-      sym_unary_operator,
-      sym_attribute,
-      sym_subscript,
-      sym_call,
-      sym_list,
-      sym_set,
-      sym_tuple,
-      sym_dictionary,
-      sym_list_comprehension,
-      sym_dictionary_comprehension,
-      sym_set_comprehension,
-      sym_generator_expression,
-      sym_parenthesized_expression,
-      sym_concatenated_string,
-  [21381] = 18,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(51), 1,
-      anon_sym_LBRACE,
-    ACTIONS(69), 1,
-      anon_sym_not,
-    ACTIONS(71), 1,
-      anon_sym_lambda,
-    ACTIONS(81), 1,
-      sym__string_start,
-    ACTIONS(331), 1,
-      sym_identifier,
-    ACTIONS(337), 1,
-      anon_sym_await,
-    ACTIONS(559), 1,
-      anon_sym_LPAREN,
-    ACTIONS(563), 1,
-      anon_sym_LBRACK,
-    STATE(684), 1,
-      sym_primary_expression,
-    STATE(713), 1,
-      sym_string,
-    STATE(1156), 1,
-      sym_expression,
-    ACTIONS(75), 2,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(47), 3,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_TILDE,
-    ACTIONS(77), 4,
-      sym_integer,
-      sym_true,
-      sym_false,
-      sym_none,
-    ACTIONS(333), 5,
-      anon_sym_print,
-      anon_sym_async,
-      anon_sym_match,
-      anon_sym_exec,
-      anon_sym_type,
-    STATE(1009), 7,
-      sym_named_expression,
-      sym_not_operator,
-      sym_boolean_operator,
-      sym_comparison_operator,
-      sym_lambda,
-      sym_conditional_expression,
-      sym_await,
-    STATE(797), 15,
-      sym_binary_operator,
-      sym_unary_operator,
-      sym_attribute,
-      sym_subscript,
-      sym_call,
-      sym_list,
-      sym_set,
-      sym_tuple,
-      sym_dictionary,
-      sym_list_comprehension,
-      sym_dictionary_comprehension,
-      sym_set_comprehension,
-      sym_generator_expression,
-      sym_parenthesized_expression,
-      sym_concatenated_string,
-  [21466] = 5,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(852), 1,
-      anon_sym_else,
-    STATE(510), 1,
-      sym_else_clause,
-    ACTIONS(1104), 12,
-      sym__dedent,
-      sym__string_start,
-      anon_sym_LPAREN,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_LBRACE,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_TILDE,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(1106), 33,
-      anon_sym_import,
-      anon_sym_from,
-      anon_sym_STAR,
-      anon_sym_print,
-      anon_sym_assert,
-      anon_sym_return,
-      anon_sym_del,
-      anon_sym_raise,
-      anon_sym_pass,
-      anon_sym_break,
-      anon_sym_continue,
-      anon_sym_if,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_while,
-      anon_sym_try,
-      anon_sym_with,
-      anon_sym_match,
-      anon_sym_def,
-      anon_sym_global,
-      anon_sym_nonlocal,
-      anon_sym_exec,
-      anon_sym_type,
-      anon_sym_class,
-      anon_sym_not,
-      anon_sym_lambda,
-      anon_sym_yield,
-      sym_integer,
-      sym_identifier,
-      anon_sym_await,
-      sym_true,
-      sym_false,
-      sym_none,
-  [21525] = 18,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(51), 1,
-      anon_sym_LBRACE,
-    ACTIONS(69), 1,
-      anon_sym_not,
-    ACTIONS(71), 1,
-      anon_sym_lambda,
-    ACTIONS(81), 1,
-      sym__string_start,
-    ACTIONS(331), 1,
-      sym_identifier,
-    ACTIONS(337), 1,
-      anon_sym_await,
-    ACTIONS(559), 1,
-      anon_sym_LPAREN,
-    ACTIONS(563), 1,
-      anon_sym_LBRACK,
-    STATE(684), 1,
-      sym_primary_expression,
-    STATE(713), 1,
-      sym_string,
-    STATE(967), 1,
-      sym_expression,
-    ACTIONS(75), 2,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(47), 3,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_TILDE,
-    ACTIONS(77), 4,
-      sym_integer,
-      sym_true,
-      sym_false,
-      sym_none,
-    ACTIONS(333), 5,
-      anon_sym_print,
-      anon_sym_async,
-      anon_sym_match,
-      anon_sym_exec,
-      anon_sym_type,
-    STATE(1009), 7,
-      sym_named_expression,
-      sym_not_operator,
-      sym_boolean_operator,
-      sym_comparison_operator,
-      sym_lambda,
-      sym_conditional_expression,
-      sym_await,
-    STATE(797), 15,
-      sym_binary_operator,
-      sym_unary_operator,
-      sym_attribute,
-      sym_subscript,
-      sym_call,
-      sym_list,
-      sym_set,
-      sym_tuple,
-      sym_dictionary,
-      sym_list_comprehension,
-      sym_dictionary_comprehension,
-      sym_set_comprehension,
-      sym_generator_expression,
-      sym_parenthesized_expression,
-      sym_concatenated_string,
-  [21610] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1136), 12,
-      sym__dedent,
-      sym__string_start,
-      anon_sym_LPAREN,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_LBRACE,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_TILDE,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(1134), 35,
-      anon_sym_import,
-      anon_sym_from,
-      anon_sym_STAR,
-      anon_sym_print,
-      anon_sym_assert,
-      anon_sym_return,
-      anon_sym_del,
-      anon_sym_raise,
-      anon_sym_pass,
-      anon_sym_break,
-      anon_sym_continue,
-      anon_sym_if,
-      anon_sym_elif,
-      anon_sym_else,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_while,
-      anon_sym_try,
-      anon_sym_with,
-      anon_sym_match,
-      anon_sym_def,
-      anon_sym_global,
-      anon_sym_nonlocal,
-      anon_sym_exec,
-      anon_sym_type,
-      anon_sym_class,
-      anon_sym_not,
-      anon_sym_lambda,
-      anon_sym_yield,
-      sym_integer,
-      sym_identifier,
-      anon_sym_await,
-      sym_true,
-      sym_false,
-      sym_none,
-  [21665] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1108), 12,
-      sym__dedent,
-      sym__string_start,
-      anon_sym_LPAREN,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_LBRACE,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_TILDE,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(1110), 35,
-      anon_sym_import,
-      anon_sym_from,
-      anon_sym_STAR,
-      anon_sym_print,
-      anon_sym_assert,
-      anon_sym_return,
-      anon_sym_del,
-      anon_sym_raise,
-      anon_sym_pass,
-      anon_sym_break,
-      anon_sym_continue,
-      anon_sym_if,
-      anon_sym_elif,
-      anon_sym_else,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_while,
-      anon_sym_try,
-      anon_sym_with,
-      anon_sym_match,
-      anon_sym_def,
-      anon_sym_global,
-      anon_sym_nonlocal,
-      anon_sym_exec,
-      anon_sym_type,
-      anon_sym_class,
-      anon_sym_not,
-      anon_sym_lambda,
-      anon_sym_yield,
-      sym_integer,
-      sym_identifier,
-      anon_sym_await,
-      sym_true,
-      sym_false,
-      sym_none,
-  [21720] = 18,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(51), 1,
-      anon_sym_LBRACE,
-    ACTIONS(69), 1,
-      anon_sym_not,
-    ACTIONS(71), 1,
-      anon_sym_lambda,
-    ACTIONS(81), 1,
-      sym__string_start,
-    ACTIONS(331), 1,
-      sym_identifier,
-    ACTIONS(337), 1,
-      anon_sym_await,
-    ACTIONS(559), 1,
-      anon_sym_LPAREN,
-    ACTIONS(563), 1,
-      anon_sym_LBRACK,
-    STATE(684), 1,
-      sym_primary_expression,
-    STATE(713), 1,
-      sym_string,
-    STATE(974), 1,
-      sym_expression,
-    ACTIONS(75), 2,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(47), 3,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_TILDE,
-    ACTIONS(77), 4,
-      sym_integer,
-      sym_true,
-      sym_false,
-      sym_none,
-    ACTIONS(333), 5,
-      anon_sym_print,
-      anon_sym_async,
-      anon_sym_match,
-      anon_sym_exec,
-      anon_sym_type,
-    STATE(1009), 7,
-      sym_named_expression,
-      sym_not_operator,
-      sym_boolean_operator,
-      sym_comparison_operator,
-      sym_lambda,
-      sym_conditional_expression,
-      sym_await,
-    STATE(797), 15,
-      sym_binary_operator,
-      sym_unary_operator,
-      sym_attribute,
-      sym_subscript,
-      sym_call,
-      sym_list,
-      sym_set,
-      sym_tuple,
-      sym_dictionary,
-      sym_list_comprehension,
-      sym_dictionary_comprehension,
-      sym_set_comprehension,
-      sym_generator_expression,
-      sym_parenthesized_expression,
-      sym_concatenated_string,
-  [21805] = 18,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(274), 1,
-      sym_identifier,
-    ACTIONS(278), 1,
-      anon_sym_LPAREN,
-    ACTIONS(293), 1,
-      anon_sym_LBRACK,
-    ACTIONS(295), 1,
-      anon_sym_LBRACE,
-    ACTIONS(299), 1,
-      anon_sym_not,
-    ACTIONS(305), 1,
-      anon_sym_lambda,
-    ACTIONS(313), 1,
-      anon_sym_await,
-    ACTIONS(315), 1,
-      sym__string_start,
-    STATE(600), 1,
-      sym_string,
-    STATE(630), 1,
-      sym_primary_expression,
-    STATE(1140), 1,
-      sym_expression,
-    ACTIONS(309), 2,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(301), 3,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_TILDE,
-    ACTIONS(311), 4,
-      sym_integer,
-      sym_true,
-      sym_false,
-      sym_none,
-    ACTIONS(285), 5,
-      anon_sym_print,
-      anon_sym_async,
-      anon_sym_match,
-      anon_sym_exec,
-      anon_sym_type,
-    STATE(900), 7,
-      sym_named_expression,
-      sym_not_operator,
-      sym_boolean_operator,
-      sym_comparison_operator,
-      sym_lambda,
-      sym_conditional_expression,
-      sym_await,
-    STATE(642), 15,
-      sym_binary_operator,
-      sym_unary_operator,
-      sym_attribute,
-      sym_subscript,
-      sym_call,
-      sym_list,
-      sym_set,
-      sym_tuple,
-      sym_dictionary,
-      sym_list_comprehension,
-      sym_dictionary_comprehension,
-      sym_set_comprehension,
-      sym_generator_expression,
-      sym_parenthesized_expression,
-      sym_concatenated_string,
-  [21890] = 18,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(274), 1,
-      sym_identifier,
-    ACTIONS(278), 1,
-      anon_sym_LPAREN,
-    ACTIONS(293), 1,
-      anon_sym_LBRACK,
-    ACTIONS(295), 1,
-      anon_sym_LBRACE,
-    ACTIONS(299), 1,
-      anon_sym_not,
-    ACTIONS(305), 1,
-      anon_sym_lambda,
-    ACTIONS(313), 1,
-      anon_sym_await,
-    ACTIONS(315), 1,
-      sym__string_start,
-    STATE(600), 1,
-      sym_string,
-    STATE(630), 1,
-      sym_primary_expression,
-    STATE(1141), 1,
-      sym_expression,
-    ACTIONS(309), 2,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(301), 3,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_TILDE,
-    ACTIONS(311), 4,
-      sym_integer,
-      sym_true,
-      sym_false,
-      sym_none,
-    ACTIONS(285), 5,
-      anon_sym_print,
-      anon_sym_async,
-      anon_sym_match,
-      anon_sym_exec,
-      anon_sym_type,
-    STATE(900), 7,
-      sym_named_expression,
-      sym_not_operator,
-      sym_boolean_operator,
-      sym_comparison_operator,
-      sym_lambda,
-      sym_conditional_expression,
-      sym_await,
-    STATE(642), 15,
-      sym_binary_operator,
-      sym_unary_operator,
-      sym_attribute,
-      sym_subscript,
-      sym_call,
-      sym_list,
-      sym_set,
-      sym_tuple,
-      sym_dictionary,
-      sym_list_comprehension,
-      sym_dictionary_comprehension,
-      sym_set_comprehension,
-      sym_generator_expression,
-      sym_parenthesized_expression,
-      sym_concatenated_string,
-  [21975] = 18,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(51), 1,
-      anon_sym_LBRACE,
-    ACTIONS(69), 1,
-      anon_sym_not,
-    ACTIONS(71), 1,
-      anon_sym_lambda,
-    ACTIONS(81), 1,
-      sym__string_start,
-    ACTIONS(331), 1,
-      sym_identifier,
-    ACTIONS(337), 1,
-      anon_sym_await,
-    ACTIONS(559), 1,
-      anon_sym_LPAREN,
-    ACTIONS(563), 1,
-      anon_sym_LBRACK,
-    STATE(684), 1,
-      sym_primary_expression,
-    STATE(713), 1,
-      sym_string,
-    STATE(1094), 1,
-      sym_expression,
-    ACTIONS(75), 2,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(47), 3,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_TILDE,
-    ACTIONS(77), 4,
-      sym_integer,
-      sym_true,
-      sym_false,
-      sym_none,
-    ACTIONS(333), 5,
-      anon_sym_print,
-      anon_sym_async,
-      anon_sym_match,
-      anon_sym_exec,
-      anon_sym_type,
-    STATE(1009), 7,
-      sym_named_expression,
-      sym_not_operator,
-      sym_boolean_operator,
-      sym_comparison_operator,
-      sym_lambda,
-      sym_conditional_expression,
-      sym_await,
-    STATE(797), 15,
-      sym_binary_operator,
-      sym_unary_operator,
-      sym_attribute,
-      sym_subscript,
-      sym_call,
-      sym_list,
-      sym_set,
-      sym_tuple,
-      sym_dictionary,
-      sym_list_comprehension,
-      sym_dictionary_comprehension,
-      sym_set_comprehension,
-      sym_generator_expression,
-      sym_parenthesized_expression,
-      sym_concatenated_string,
-  [22060] = 18,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(274), 1,
-      sym_identifier,
-    ACTIONS(278), 1,
-      anon_sym_LPAREN,
-    ACTIONS(293), 1,
-      anon_sym_LBRACK,
-    ACTIONS(295), 1,
-      anon_sym_LBRACE,
-    ACTIONS(299), 1,
-      anon_sym_not,
-    ACTIONS(305), 1,
-      anon_sym_lambda,
-    ACTIONS(313), 1,
-      anon_sym_await,
-    ACTIONS(315), 1,
-      sym__string_start,
-    STATE(600), 1,
-      sym_string,
-    STATE(630), 1,
-      sym_primary_expression,
-    STATE(1149), 1,
-      sym_expression,
-    ACTIONS(309), 2,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(301), 3,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_TILDE,
-    ACTIONS(311), 4,
-      sym_integer,
-      sym_true,
-      sym_false,
-      sym_none,
-    ACTIONS(285), 5,
-      anon_sym_print,
-      anon_sym_async,
-      anon_sym_match,
-      anon_sym_exec,
-      anon_sym_type,
-    STATE(900), 7,
-      sym_named_expression,
-      sym_not_operator,
-      sym_boolean_operator,
-      sym_comparison_operator,
-      sym_lambda,
-      sym_conditional_expression,
-      sym_await,
-    STATE(642), 15,
-      sym_binary_operator,
-      sym_unary_operator,
-      sym_attribute,
-      sym_subscript,
-      sym_call,
-      sym_list,
-      sym_set,
-      sym_tuple,
-      sym_dictionary,
-      sym_list_comprehension,
-      sym_dictionary_comprehension,
-      sym_set_comprehension,
-      sym_generator_expression,
-      sym_parenthesized_expression,
-      sym_concatenated_string,
-  [22145] = 5,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(846), 1,
-      anon_sym_else,
-    STATE(511), 1,
-      sym_else_clause,
-    ACTIONS(1138), 12,
-      sym__string_start,
-      ts_builtin_sym_end,
-      anon_sym_LPAREN,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_LBRACE,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_TILDE,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(1140), 33,
-      anon_sym_import,
-      anon_sym_from,
-      anon_sym_STAR,
-      anon_sym_print,
-      anon_sym_assert,
-      anon_sym_return,
-      anon_sym_del,
-      anon_sym_raise,
-      anon_sym_pass,
-      anon_sym_break,
-      anon_sym_continue,
-      anon_sym_if,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_while,
-      anon_sym_try,
-      anon_sym_with,
-      anon_sym_match,
-      anon_sym_def,
-      anon_sym_global,
-      anon_sym_nonlocal,
-      anon_sym_exec,
-      anon_sym_type,
-      anon_sym_class,
-      anon_sym_not,
-      anon_sym_lambda,
-      anon_sym_yield,
-      sym_integer,
-      sym_identifier,
-      anon_sym_await,
-      sym_true,
-      sym_false,
-      sym_none,
-  [22204] = 5,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(852), 1,
-      anon_sym_else,
-    STATE(539), 1,
-      sym_else_clause,
-    ACTIONS(1138), 12,
-      sym__dedent,
-      sym__string_start,
-      anon_sym_LPAREN,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_LBRACE,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_TILDE,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(1140), 33,
-      anon_sym_import,
-      anon_sym_from,
-      anon_sym_STAR,
-      anon_sym_print,
-      anon_sym_assert,
-      anon_sym_return,
-      anon_sym_del,
-      anon_sym_raise,
-      anon_sym_pass,
-      anon_sym_break,
-      anon_sym_continue,
-      anon_sym_if,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_while,
-      anon_sym_try,
-      anon_sym_with,
-      anon_sym_match,
-      anon_sym_def,
-      anon_sym_global,
-      anon_sym_nonlocal,
-      anon_sym_exec,
-      anon_sym_type,
-      anon_sym_class,
-      anon_sym_not,
-      anon_sym_lambda,
-      anon_sym_yield,
-      sym_integer,
-      sym_identifier,
-      anon_sym_await,
-      sym_true,
-      sym_false,
-      sym_none,
-  [22263] = 18,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(274), 1,
-      sym_identifier,
-    ACTIONS(278), 1,
-      anon_sym_LPAREN,
-    ACTIONS(293), 1,
-      anon_sym_LBRACK,
-    ACTIONS(295), 1,
-      anon_sym_LBRACE,
-    ACTIONS(299), 1,
-      anon_sym_not,
-    ACTIONS(305), 1,
-      anon_sym_lambda,
-    ACTIONS(313), 1,
-      anon_sym_await,
-    ACTIONS(315), 1,
-      sym__string_start,
-    STATE(600), 1,
-      sym_string,
-    STATE(630), 1,
-      sym_primary_expression,
-    STATE(1152), 1,
-      sym_expression,
-    ACTIONS(309), 2,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(301), 3,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_TILDE,
-    ACTIONS(311), 4,
-      sym_integer,
-      sym_true,
-      sym_false,
-      sym_none,
-    ACTIONS(285), 5,
-      anon_sym_print,
-      anon_sym_async,
-      anon_sym_match,
-      anon_sym_exec,
-      anon_sym_type,
-    STATE(900), 7,
-      sym_named_expression,
-      sym_not_operator,
-      sym_boolean_operator,
-      sym_comparison_operator,
-      sym_lambda,
-      sym_conditional_expression,
-      sym_await,
-    STATE(642), 15,
-      sym_binary_operator,
-      sym_unary_operator,
-      sym_attribute,
-      sym_subscript,
-      sym_call,
-      sym_list,
-      sym_set,
-      sym_tuple,
-      sym_dictionary,
-      sym_list_comprehension,
-      sym_dictionary_comprehension,
-      sym_set_comprehension,
-      sym_generator_expression,
-      sym_parenthesized_expression,
-      sym_concatenated_string,
-  [22348] = 5,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(846), 1,
-      anon_sym_else,
-    STATE(503), 1,
-      sym_else_clause,
-    ACTIONS(1142), 12,
-      sym__string_start,
-      ts_builtin_sym_end,
-      anon_sym_LPAREN,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_LBRACE,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_TILDE,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(1144), 33,
-      anon_sym_import,
-      anon_sym_from,
-      anon_sym_STAR,
-      anon_sym_print,
-      anon_sym_assert,
-      anon_sym_return,
-      anon_sym_del,
-      anon_sym_raise,
-      anon_sym_pass,
-      anon_sym_break,
-      anon_sym_continue,
-      anon_sym_if,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_while,
-      anon_sym_try,
-      anon_sym_with,
-      anon_sym_match,
-      anon_sym_def,
-      anon_sym_global,
-      anon_sym_nonlocal,
-      anon_sym_exec,
-      anon_sym_type,
-      anon_sym_class,
-      anon_sym_not,
-      anon_sym_lambda,
-      anon_sym_yield,
-      sym_integer,
-      sym_identifier,
-      anon_sym_await,
-      sym_true,
-      sym_false,
-      sym_none,
-  [22407] = 6,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1050), 1,
+    ACTIONS(1110), 1,
       anon_sym_COMMA,
-    ACTIONS(1057), 1,
+    ACTIONS(1117), 1,
       anon_sym_EQ,
-    ACTIONS(1059), 14,
+    ACTIONS(1115), 14,
       anon_sym_COLON,
       anon_sym_PLUS_EQ,
       anon_sym_DASH_EQ,
@@ -44627,7 +38234,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_AMP_EQ,
       anon_sym_CARET_EQ,
       anon_sym_PIPE_EQ,
-    ACTIONS(1053), 15,
+    ACTIONS(1113), 15,
       anon_sym_STAR,
       anon_sym_GT_GT,
       anon_sym_PIPE,
@@ -44643,7 +38250,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_LT_LT,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1048), 16,
+    ACTIONS(1108), 16,
       sym__newline,
       anon_sym_DOT,
       anon_sym_LPAREN,
@@ -44660,164 +38267,57 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_LT_GT,
       anon_sym_is,
       sym__semicolon,
-  [22468] = 5,
+  [19082] = 18,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(852), 1,
-      anon_sym_else,
-    STATE(551), 1,
-      sym_else_clause,
-    ACTIONS(1142), 12,
-      sym__dedent,
-      sym__string_start,
+    ACTIONS(258), 1,
+      sym_identifier,
+    ACTIONS(262), 1,
       anon_sym_LPAREN,
-      anon_sym_DASH,
-      anon_sym_PLUS,
+    ACTIONS(277), 1,
       anon_sym_LBRACK,
+    ACTIONS(279), 1,
       anon_sym_LBRACE,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_TILDE,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(1144), 33,
-      anon_sym_import,
-      anon_sym_from,
-      anon_sym_STAR,
-      anon_sym_print,
-      anon_sym_assert,
-      anon_sym_return,
-      anon_sym_del,
-      anon_sym_raise,
-      anon_sym_pass,
-      anon_sym_break,
-      anon_sym_continue,
-      anon_sym_if,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_while,
-      anon_sym_try,
-      anon_sym_with,
-      anon_sym_match,
-      anon_sym_def,
-      anon_sym_global,
-      anon_sym_nonlocal,
-      anon_sym_exec,
-      anon_sym_type,
-      anon_sym_class,
+    ACTIONS(283), 1,
       anon_sym_not,
+    ACTIONS(289), 1,
       anon_sym_lambda,
-      anon_sym_yield,
-      sym_integer,
-      sym_identifier,
+    ACTIONS(297), 1,
       anon_sym_await,
-      sym_true,
-      sym_false,
-      sym_none,
-  [22527] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1136), 12,
-      sym__string_start,
-      ts_builtin_sym_end,
-      anon_sym_LPAREN,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_LBRACE,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_TILDE,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(1134), 35,
-      anon_sym_import,
-      anon_sym_from,
-      anon_sym_STAR,
-      anon_sym_print,
-      anon_sym_assert,
-      anon_sym_return,
-      anon_sym_del,
-      anon_sym_raise,
-      anon_sym_pass,
-      anon_sym_break,
-      anon_sym_continue,
-      anon_sym_if,
-      anon_sym_elif,
-      anon_sym_else,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_while,
-      anon_sym_try,
-      anon_sym_with,
-      anon_sym_match,
-      anon_sym_def,
-      anon_sym_global,
-      anon_sym_nonlocal,
-      anon_sym_exec,
-      anon_sym_type,
-      anon_sym_class,
-      anon_sym_not,
-      anon_sym_lambda,
-      anon_sym_yield,
-      sym_integer,
-      sym_identifier,
-      anon_sym_await,
-      sym_true,
-      sym_false,
-      sym_none,
-  [22582] = 18,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(274), 1,
-      sym_identifier,
-    ACTIONS(278), 1,
-      anon_sym_LPAREN,
-    ACTIONS(293), 1,
-      anon_sym_LBRACK,
-    ACTIONS(295), 1,
-      anon_sym_LBRACE,
     ACTIONS(299), 1,
-      anon_sym_not,
-    ACTIONS(305), 1,
-      anon_sym_lambda,
-    ACTIONS(313), 1,
-      anon_sym_await,
-    ACTIONS(315), 1,
       sym__string_start,
-    STATE(600), 1,
+    STATE(586), 1,
       sym_string,
-    STATE(630), 1,
+    STATE(616), 1,
       sym_primary_expression,
-    STATE(1098), 1,
+    STATE(1086), 1,
       sym_expression,
-    ACTIONS(309), 2,
+    ACTIONS(293), 2,
       sym_ellipsis,
       sym_float,
-    ACTIONS(301), 3,
+    ACTIONS(285), 3,
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
-    ACTIONS(311), 4,
+    ACTIONS(295), 4,
       sym_integer,
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(285), 5,
+    ACTIONS(269), 5,
       anon_sym_print,
       anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(900), 7,
+    STATE(883), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-      sym_await,
-    STATE(642), 15,
+    STATE(605), 16,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -44833,7 +38333,331 @@ static const uint16_t ts_small_parse_table[] = {
       sym_generator_expression,
       sym_parenthesized_expression,
       sym_concatenated_string,
-  [22667] = 18,
+      sym_await,
+  [19167] = 18,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(258), 1,
+      sym_identifier,
+    ACTIONS(262), 1,
+      anon_sym_LPAREN,
+    ACTIONS(277), 1,
+      anon_sym_LBRACK,
+    ACTIONS(279), 1,
+      anon_sym_LBRACE,
+    ACTIONS(283), 1,
+      anon_sym_not,
+    ACTIONS(289), 1,
+      anon_sym_lambda,
+    ACTIONS(297), 1,
+      anon_sym_await,
+    ACTIONS(299), 1,
+      sym__string_start,
+    STATE(586), 1,
+      sym_string,
+    STATE(616), 1,
+      sym_primary_expression,
+    STATE(901), 1,
+      sym_expression,
+    ACTIONS(293), 2,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(285), 3,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_TILDE,
+    ACTIONS(295), 4,
+      sym_integer,
+      sym_true,
+      sym_false,
+      sym_none,
+    ACTIONS(269), 5,
+      anon_sym_print,
+      anon_sym_async,
+      anon_sym_match,
+      anon_sym_exec,
+      anon_sym_type,
+    STATE(883), 6,
+      sym_named_expression,
+      sym_not_operator,
+      sym_boolean_operator,
+      sym_comparison_operator,
+      sym_lambda,
+      sym_conditional_expression,
+    STATE(605), 16,
+      sym_binary_operator,
+      sym_unary_operator,
+      sym_attribute,
+      sym_subscript,
+      sym_call,
+      sym_list,
+      sym_set,
+      sym_tuple,
+      sym_dictionary,
+      sym_list_comprehension,
+      sym_dictionary_comprehension,
+      sym_set_comprehension,
+      sym_generator_expression,
+      sym_parenthesized_expression,
+      sym_concatenated_string,
+      sym_await,
+  [19252] = 18,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(279), 1,
+      anon_sym_LBRACE,
+    ACTIONS(299), 1,
+      sym__string_start,
+    ACTIONS(578), 1,
+      anon_sym_LPAREN,
+    ACTIONS(584), 1,
+      anon_sym_LBRACK,
+    ACTIONS(626), 1,
+      anon_sym_not,
+    ACTIONS(628), 1,
+      anon_sym_lambda,
+    ACTIONS(668), 1,
+      sym_identifier,
+    ACTIONS(678), 1,
+      anon_sym_await,
+    STATE(586), 1,
+      sym_string,
+    STATE(590), 1,
+      sym_primary_expression,
+    STATE(977), 1,
+      sym_expression,
+    ACTIONS(293), 2,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(582), 3,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_TILDE,
+    ACTIONS(295), 4,
+      sym_integer,
+      sym_true,
+      sym_false,
+      sym_none,
+    ACTIONS(674), 5,
+      anon_sym_print,
+      anon_sym_async,
+      anon_sym_match,
+      anon_sym_exec,
+      anon_sym_type,
+    STATE(883), 6,
+      sym_named_expression,
+      sym_not_operator,
+      sym_boolean_operator,
+      sym_comparison_operator,
+      sym_lambda,
+      sym_conditional_expression,
+    STATE(605), 16,
+      sym_binary_operator,
+      sym_unary_operator,
+      sym_attribute,
+      sym_subscript,
+      sym_call,
+      sym_list,
+      sym_set,
+      sym_tuple,
+      sym_dictionary,
+      sym_list_comprehension,
+      sym_dictionary_comprehension,
+      sym_set_comprehension,
+      sym_generator_expression,
+      sym_parenthesized_expression,
+      sym_concatenated_string,
+      sym_await,
+  [19337] = 18,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(592), 1,
+      anon_sym_LPAREN,
+    ACTIONS(600), 1,
+      anon_sym_LBRACK,
+    ACTIONS(602), 1,
+      anon_sym_LBRACE,
+    ACTIONS(608), 1,
+      sym__string_start,
+    ACTIONS(977), 1,
+      sym_identifier,
+    ACTIONS(985), 1,
+      anon_sym_not,
+    ACTIONS(987), 1,
+      anon_sym_lambda,
+    ACTIONS(989), 1,
+      anon_sym_await,
+    STATE(713), 1,
+      sym_string,
+    STATE(726), 1,
+      sym_primary_expression,
+    STATE(999), 1,
+      sym_expression,
+    ACTIONS(604), 2,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(598), 3,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_TILDE,
+    ACTIONS(590), 4,
+      sym_integer,
+      sym_true,
+      sym_false,
+      sym_none,
+    ACTIONS(981), 5,
+      anon_sym_print,
+      anon_sym_async,
+      anon_sym_match,
+      anon_sym_exec,
+      anon_sym_type,
+    STATE(1003), 6,
+      sym_named_expression,
+      sym_not_operator,
+      sym_boolean_operator,
+      sym_comparison_operator,
+      sym_lambda,
+      sym_conditional_expression,
+    STATE(827), 16,
+      sym_binary_operator,
+      sym_unary_operator,
+      sym_attribute,
+      sym_subscript,
+      sym_call,
+      sym_list,
+      sym_set,
+      sym_tuple,
+      sym_dictionary,
+      sym_list_comprehension,
+      sym_dictionary_comprehension,
+      sym_set_comprehension,
+      sym_generator_expression,
+      sym_parenthesized_expression,
+      sym_concatenated_string,
+      sym_await,
+  [19422] = 18,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(258), 1,
+      sym_identifier,
+    ACTIONS(262), 1,
+      anon_sym_LPAREN,
+    ACTIONS(277), 1,
+      anon_sym_LBRACK,
+    ACTIONS(279), 1,
+      anon_sym_LBRACE,
+    ACTIONS(283), 1,
+      anon_sym_not,
+    ACTIONS(289), 1,
+      anon_sym_lambda,
+    ACTIONS(297), 1,
+      anon_sym_await,
+    ACTIONS(299), 1,
+      sym__string_start,
+    STATE(586), 1,
+      sym_string,
+    STATE(616), 1,
+      sym_primary_expression,
+    STATE(911), 1,
+      sym_expression,
+    ACTIONS(293), 2,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(285), 3,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_TILDE,
+    ACTIONS(295), 4,
+      sym_integer,
+      sym_true,
+      sym_false,
+      sym_none,
+    ACTIONS(269), 5,
+      anon_sym_print,
+      anon_sym_async,
+      anon_sym_match,
+      anon_sym_exec,
+      anon_sym_type,
+    STATE(883), 6,
+      sym_named_expression,
+      sym_not_operator,
+      sym_boolean_operator,
+      sym_comparison_operator,
+      sym_lambda,
+      sym_conditional_expression,
+    STATE(605), 16,
+      sym_binary_operator,
+      sym_unary_operator,
+      sym_attribute,
+      sym_subscript,
+      sym_call,
+      sym_list,
+      sym_set,
+      sym_tuple,
+      sym_dictionary,
+      sym_list_comprehension,
+      sym_dictionary_comprehension,
+      sym_set_comprehension,
+      sym_generator_expression,
+      sym_parenthesized_expression,
+      sym_concatenated_string,
+      sym_await,
+  [19507] = 6,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1092), 1,
+      anon_sym_EQ,
+    ACTIONS(1087), 3,
+      anon_sym_RPAREN,
+      anon_sym_COMMA,
+      anon_sym_RBRACK,
+    ACTIONS(1074), 14,
+      anon_sym_DOT,
+      anon_sym_LPAREN,
+      anon_sym_if,
+      anon_sym_in,
+      anon_sym_LBRACK,
+      anon_sym_not,
+      anon_sym_and,
+      anon_sym_or,
+      anon_sym_LT_EQ,
+      anon_sym_EQ_EQ,
+      anon_sym_BANG_EQ,
+      anon_sym_GT_EQ,
+      anon_sym_LT_GT,
+      anon_sym_is,
+    ACTIONS(1094), 14,
+      anon_sym_COLON,
+      anon_sym_PLUS_EQ,
+      anon_sym_DASH_EQ,
+      anon_sym_STAR_EQ,
+      anon_sym_SLASH_EQ,
+      anon_sym_AT_EQ,
+      anon_sym_SLASH_SLASH_EQ,
+      anon_sym_PERCENT_EQ,
+      anon_sym_STAR_STAR_EQ,
+      anon_sym_GT_GT_EQ,
+      anon_sym_LT_LT_EQ,
+      anon_sym_AMP_EQ,
+      anon_sym_CARET_EQ,
+      anon_sym_PIPE_EQ,
+    ACTIONS(1079), 15,
+      anon_sym_STAR,
+      anon_sym_GT_GT,
+      anon_sym_PIPE,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_SLASH,
+      anon_sym_PERCENT,
+      anon_sym_SLASH_SLASH,
+      anon_sym_AMP,
+      anon_sym_CARET,
+      anon_sym_LT_LT,
+      anon_sym_LT,
+      anon_sym_GT,
+  [19568] = 18,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(51), 1,
@@ -44844,17 +38668,285 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_lambda,
     ACTIONS(81), 1,
       sym__string_start,
-    ACTIONS(331), 1,
+    ACTIONS(327), 1,
       sym_identifier,
-    ACTIONS(337), 1,
+    ACTIONS(333), 1,
       anon_sym_await,
-    ACTIONS(559), 1,
+    ACTIONS(568), 1,
       anon_sym_LPAREN,
-    ACTIONS(563), 1,
+    ACTIONS(574), 1,
       anon_sym_LBRACK,
-    STATE(684), 1,
+    STATE(707), 1,
       sym_primary_expression,
-    STATE(713), 1,
+    STATE(709), 1,
+      sym_string,
+    STATE(987), 1,
+      sym_expression,
+    ACTIONS(75), 2,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(47), 3,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_TILDE,
+    ACTIONS(77), 4,
+      sym_integer,
+      sym_true,
+      sym_false,
+      sym_none,
+    ACTIONS(329), 5,
+      anon_sym_print,
+      anon_sym_async,
+      anon_sym_match,
+      anon_sym_exec,
+      anon_sym_type,
+    STATE(985), 6,
+      sym_named_expression,
+      sym_not_operator,
+      sym_boolean_operator,
+      sym_comparison_operator,
+      sym_lambda,
+      sym_conditional_expression,
+    STATE(759), 16,
+      sym_binary_operator,
+      sym_unary_operator,
+      sym_attribute,
+      sym_subscript,
+      sym_call,
+      sym_list,
+      sym_set,
+      sym_tuple,
+      sym_dictionary,
+      sym_list_comprehension,
+      sym_dictionary_comprehension,
+      sym_set_comprehension,
+      sym_generator_expression,
+      sym_parenthesized_expression,
+      sym_concatenated_string,
+      sym_await,
+  [19653] = 18,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(258), 1,
+      sym_identifier,
+    ACTIONS(262), 1,
+      anon_sym_LPAREN,
+    ACTIONS(277), 1,
+      anon_sym_LBRACK,
+    ACTIONS(279), 1,
+      anon_sym_LBRACE,
+    ACTIONS(283), 1,
+      anon_sym_not,
+    ACTIONS(289), 1,
+      anon_sym_lambda,
+    ACTIONS(297), 1,
+      anon_sym_await,
+    ACTIONS(299), 1,
+      sym__string_start,
+    STATE(586), 1,
+      sym_string,
+    STATE(616), 1,
+      sym_primary_expression,
+    STATE(900), 1,
+      sym_expression,
+    ACTIONS(293), 2,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(285), 3,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_TILDE,
+    ACTIONS(295), 4,
+      sym_integer,
+      sym_true,
+      sym_false,
+      sym_none,
+    ACTIONS(269), 5,
+      anon_sym_print,
+      anon_sym_async,
+      anon_sym_match,
+      anon_sym_exec,
+      anon_sym_type,
+    STATE(883), 6,
+      sym_named_expression,
+      sym_not_operator,
+      sym_boolean_operator,
+      sym_comparison_operator,
+      sym_lambda,
+      sym_conditional_expression,
+    STATE(605), 16,
+      sym_binary_operator,
+      sym_unary_operator,
+      sym_attribute,
+      sym_subscript,
+      sym_call,
+      sym_list,
+      sym_set,
+      sym_tuple,
+      sym_dictionary,
+      sym_list_comprehension,
+      sym_dictionary_comprehension,
+      sym_set_comprehension,
+      sym_generator_expression,
+      sym_parenthesized_expression,
+      sym_concatenated_string,
+      sym_await,
+  [19738] = 18,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(258), 1,
+      sym_identifier,
+    ACTIONS(262), 1,
+      anon_sym_LPAREN,
+    ACTIONS(277), 1,
+      anon_sym_LBRACK,
+    ACTIONS(279), 1,
+      anon_sym_LBRACE,
+    ACTIONS(283), 1,
+      anon_sym_not,
+    ACTIONS(289), 1,
+      anon_sym_lambda,
+    ACTIONS(297), 1,
+      anon_sym_await,
+    ACTIONS(299), 1,
+      sym__string_start,
+    STATE(586), 1,
+      sym_string,
+    STATE(616), 1,
+      sym_primary_expression,
+    STATE(1041), 1,
+      sym_expression,
+    ACTIONS(293), 2,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(285), 3,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_TILDE,
+    ACTIONS(295), 4,
+      sym_integer,
+      sym_true,
+      sym_false,
+      sym_none,
+    ACTIONS(269), 5,
+      anon_sym_print,
+      anon_sym_async,
+      anon_sym_match,
+      anon_sym_exec,
+      anon_sym_type,
+    STATE(883), 6,
+      sym_named_expression,
+      sym_not_operator,
+      sym_boolean_operator,
+      sym_comparison_operator,
+      sym_lambda,
+      sym_conditional_expression,
+    STATE(605), 16,
+      sym_binary_operator,
+      sym_unary_operator,
+      sym_attribute,
+      sym_subscript,
+      sym_call,
+      sym_list,
+      sym_set,
+      sym_tuple,
+      sym_dictionary,
+      sym_list_comprehension,
+      sym_dictionary_comprehension,
+      sym_set_comprehension,
+      sym_generator_expression,
+      sym_parenthesized_expression,
+      sym_concatenated_string,
+      sym_await,
+  [19823] = 18,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(51), 1,
+      anon_sym_LBRACE,
+    ACTIONS(69), 1,
+      anon_sym_not,
+    ACTIONS(71), 1,
+      anon_sym_lambda,
+    ACTIONS(81), 1,
+      sym__string_start,
+    ACTIONS(327), 1,
+      sym_identifier,
+    ACTIONS(333), 1,
+      anon_sym_await,
+    ACTIONS(568), 1,
+      anon_sym_LPAREN,
+    ACTIONS(574), 1,
+      anon_sym_LBRACK,
+    STATE(707), 1,
+      sym_primary_expression,
+    STATE(709), 1,
+      sym_string,
+    STATE(971), 1,
+      sym_expression,
+    ACTIONS(75), 2,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(47), 3,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_TILDE,
+    ACTIONS(77), 4,
+      sym_integer,
+      sym_true,
+      sym_false,
+      sym_none,
+    ACTIONS(329), 5,
+      anon_sym_print,
+      anon_sym_async,
+      anon_sym_match,
+      anon_sym_exec,
+      anon_sym_type,
+    STATE(985), 6,
+      sym_named_expression,
+      sym_not_operator,
+      sym_boolean_operator,
+      sym_comparison_operator,
+      sym_lambda,
+      sym_conditional_expression,
+    STATE(759), 16,
+      sym_binary_operator,
+      sym_unary_operator,
+      sym_attribute,
+      sym_subscript,
+      sym_call,
+      sym_list,
+      sym_set,
+      sym_tuple,
+      sym_dictionary,
+      sym_list_comprehension,
+      sym_dictionary_comprehension,
+      sym_set_comprehension,
+      sym_generator_expression,
+      sym_parenthesized_expression,
+      sym_concatenated_string,
+      sym_await,
+  [19908] = 18,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(51), 1,
+      anon_sym_LBRACE,
+    ACTIONS(69), 1,
+      anon_sym_not,
+    ACTIONS(71), 1,
+      anon_sym_lambda,
+    ACTIONS(81), 1,
+      sym__string_start,
+    ACTIONS(327), 1,
+      sym_identifier,
+    ACTIONS(333), 1,
+      anon_sym_await,
+    ACTIONS(568), 1,
+      anon_sym_LPAREN,
+    ACTIONS(574), 1,
+      anon_sym_LBRACK,
+    STATE(707), 1,
+      sym_primary_expression,
+    STATE(709), 1,
       sym_string,
     STATE(1121), 1,
       sym_expression,
@@ -44870,21 +38962,20 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(333), 5,
+    ACTIONS(329), 5,
       anon_sym_print,
       anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(1009), 7,
+    STATE(985), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-      sym_await,
-    STATE(797), 15,
+    STATE(759), 16,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -44900,74 +38991,8 @@ static const uint16_t ts_small_parse_table[] = {
       sym_generator_expression,
       sym_parenthesized_expression,
       sym_concatenated_string,
-  [22752] = 18,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(274), 1,
-      sym_identifier,
-    ACTIONS(278), 1,
-      anon_sym_LPAREN,
-    ACTIONS(293), 1,
-      anon_sym_LBRACK,
-    ACTIONS(295), 1,
-      anon_sym_LBRACE,
-    ACTIONS(299), 1,
-      anon_sym_not,
-    ACTIONS(305), 1,
-      anon_sym_lambda,
-    ACTIONS(313), 1,
-      anon_sym_await,
-    ACTIONS(315), 1,
-      sym__string_start,
-    STATE(600), 1,
-      sym_string,
-    STATE(630), 1,
-      sym_primary_expression,
-    STATE(908), 1,
-      sym_expression,
-    ACTIONS(309), 2,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(301), 3,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_TILDE,
-    ACTIONS(311), 4,
-      sym_integer,
-      sym_true,
-      sym_false,
-      sym_none,
-    ACTIONS(285), 5,
-      anon_sym_print,
-      anon_sym_async,
-      anon_sym_match,
-      anon_sym_exec,
-      anon_sym_type,
-    STATE(900), 7,
-      sym_named_expression,
-      sym_not_operator,
-      sym_boolean_operator,
-      sym_comparison_operator,
-      sym_lambda,
-      sym_conditional_expression,
       sym_await,
-    STATE(642), 15,
-      sym_binary_operator,
-      sym_unary_operator,
-      sym_attribute,
-      sym_subscript,
-      sym_call,
-      sym_list,
-      sym_set,
-      sym_tuple,
-      sym_dictionary,
-      sym_list_comprehension,
-      sym_dictionary_comprehension,
-      sym_set_comprehension,
-      sym_generator_expression,
-      sym_parenthesized_expression,
-      sym_concatenated_string,
-  [22837] = 18,
+  [19993] = 18,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(51), 1,
@@ -44978,2784 +39003,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_lambda,
     ACTIONS(81), 1,
       sym__string_start,
-    ACTIONS(331), 1,
+    ACTIONS(327), 1,
       sym_identifier,
-    ACTIONS(337), 1,
+    ACTIONS(333), 1,
       anon_sym_await,
-    ACTIONS(559), 1,
+    ACTIONS(568), 1,
       anon_sym_LPAREN,
-    ACTIONS(563), 1,
+    ACTIONS(574), 1,
       anon_sym_LBRACK,
-    STATE(684), 1,
+    STATE(707), 1,
       sym_primary_expression,
-    STATE(713), 1,
-      sym_string,
-    STATE(1007), 1,
-      sym_expression,
-    ACTIONS(75), 2,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(47), 3,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_TILDE,
-    ACTIONS(77), 4,
-      sym_integer,
-      sym_true,
-      sym_false,
-      sym_none,
-    ACTIONS(333), 5,
-      anon_sym_print,
-      anon_sym_async,
-      anon_sym_match,
-      anon_sym_exec,
-      anon_sym_type,
-    STATE(1009), 7,
-      sym_named_expression,
-      sym_not_operator,
-      sym_boolean_operator,
-      sym_comparison_operator,
-      sym_lambda,
-      sym_conditional_expression,
-      sym_await,
-    STATE(797), 15,
-      sym_binary_operator,
-      sym_unary_operator,
-      sym_attribute,
-      sym_subscript,
-      sym_call,
-      sym_list,
-      sym_set,
-      sym_tuple,
-      sym_dictionary,
-      sym_list_comprehension,
-      sym_dictionary_comprehension,
-      sym_set_comprehension,
-      sym_generator_expression,
-      sym_parenthesized_expression,
-      sym_concatenated_string,
-  [22922] = 18,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(274), 1,
-      sym_identifier,
-    ACTIONS(278), 1,
-      anon_sym_LPAREN,
-    ACTIONS(293), 1,
-      anon_sym_LBRACK,
-    ACTIONS(295), 1,
-      anon_sym_LBRACE,
-    ACTIONS(299), 1,
-      anon_sym_not,
-    ACTIONS(305), 1,
-      anon_sym_lambda,
-    ACTIONS(313), 1,
-      anon_sym_await,
-    ACTIONS(315), 1,
-      sym__string_start,
-    STATE(600), 1,
-      sym_string,
-    STATE(630), 1,
-      sym_primary_expression,
-    STATE(1073), 1,
-      sym_expression,
-    ACTIONS(309), 2,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(301), 3,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_TILDE,
-    ACTIONS(311), 4,
-      sym_integer,
-      sym_true,
-      sym_false,
-      sym_none,
-    ACTIONS(285), 5,
-      anon_sym_print,
-      anon_sym_async,
-      anon_sym_match,
-      anon_sym_exec,
-      anon_sym_type,
-    STATE(900), 7,
-      sym_named_expression,
-      sym_not_operator,
-      sym_boolean_operator,
-      sym_comparison_operator,
-      sym_lambda,
-      sym_conditional_expression,
-      sym_await,
-    STATE(642), 15,
-      sym_binary_operator,
-      sym_unary_operator,
-      sym_attribute,
-      sym_subscript,
-      sym_call,
-      sym_list,
-      sym_set,
-      sym_tuple,
-      sym_dictionary,
-      sym_list_comprehension,
-      sym_dictionary_comprehension,
-      sym_set_comprehension,
-      sym_generator_expression,
-      sym_parenthesized_expression,
-      sym_concatenated_string,
-  [23007] = 18,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(295), 1,
-      anon_sym_LBRACE,
-    ACTIONS(315), 1,
-      sym__string_start,
-    ACTIONS(602), 1,
-      sym_identifier,
-    ACTIONS(604), 1,
-      anon_sym_LPAREN,
-    ACTIONS(612), 1,
-      anon_sym_LBRACK,
-    ACTIONS(614), 1,
-      anon_sym_not,
-    ACTIONS(616), 1,
-      anon_sym_lambda,
-    ACTIONS(618), 1,
-      anon_sym_await,
-    STATE(600), 1,
-      sym_string,
-    STATE(643), 1,
-      sym_primary_expression,
-    STATE(928), 1,
-      sym_expression,
-    ACTIONS(309), 2,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(610), 3,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_TILDE,
-    ACTIONS(311), 4,
-      sym_integer,
-      sym_true,
-      sym_false,
-      sym_none,
-    ACTIONS(606), 5,
-      anon_sym_print,
-      anon_sym_async,
-      anon_sym_match,
-      anon_sym_exec,
-      anon_sym_type,
-    STATE(900), 7,
-      sym_named_expression,
-      sym_not_operator,
-      sym_boolean_operator,
-      sym_comparison_operator,
-      sym_lambda,
-      sym_conditional_expression,
-      sym_await,
-    STATE(642), 15,
-      sym_binary_operator,
-      sym_unary_operator,
-      sym_attribute,
-      sym_subscript,
-      sym_call,
-      sym_list,
-      sym_set,
-      sym_tuple,
-      sym_dictionary,
-      sym_list_comprehension,
-      sym_dictionary_comprehension,
-      sym_set_comprehension,
-      sym_generator_expression,
-      sym_parenthesized_expression,
-      sym_concatenated_string,
-  [23092] = 5,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(850), 1,
-      anon_sym_finally,
-    STATE(518), 1,
-      sym_finally_clause,
-    ACTIONS(1132), 12,
-      sym__string_start,
-      ts_builtin_sym_end,
-      anon_sym_LPAREN,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_LBRACE,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_TILDE,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(1130), 33,
-      anon_sym_import,
-      anon_sym_from,
-      anon_sym_STAR,
-      anon_sym_print,
-      anon_sym_assert,
-      anon_sym_return,
-      anon_sym_del,
-      anon_sym_raise,
-      anon_sym_pass,
-      anon_sym_break,
-      anon_sym_continue,
-      anon_sym_if,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_while,
-      anon_sym_try,
-      anon_sym_with,
-      anon_sym_match,
-      anon_sym_def,
-      anon_sym_global,
-      anon_sym_nonlocal,
-      anon_sym_exec,
-      anon_sym_type,
-      anon_sym_class,
-      anon_sym_not,
-      anon_sym_lambda,
-      anon_sym_yield,
-      sym_integer,
-      sym_identifier,
-      anon_sym_await,
-      sym_true,
-      sym_false,
-      sym_none,
-  [23151] = 6,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1148), 1,
-      anon_sym_COMMA,
-    ACTIONS(1155), 1,
-      anon_sym_EQ,
-    ACTIONS(1153), 14,
-      anon_sym_COLON,
-      anon_sym_PLUS_EQ,
-      anon_sym_DASH_EQ,
-      anon_sym_STAR_EQ,
-      anon_sym_SLASH_EQ,
-      anon_sym_AT_EQ,
-      anon_sym_SLASH_SLASH_EQ,
-      anon_sym_PERCENT_EQ,
-      anon_sym_STAR_STAR_EQ,
-      anon_sym_GT_GT_EQ,
-      anon_sym_LT_LT_EQ,
-      anon_sym_AMP_EQ,
-      anon_sym_CARET_EQ,
-      anon_sym_PIPE_EQ,
-    ACTIONS(1151), 15,
-      anon_sym_STAR,
-      anon_sym_GT_GT,
-      anon_sym_PIPE,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_SLASH,
-      anon_sym_PERCENT,
-      anon_sym_SLASH_SLASH,
-      anon_sym_AMP,
-      anon_sym_CARET,
-      anon_sym_LT_LT,
-      anon_sym_LT,
-      anon_sym_GT,
-    ACTIONS(1146), 16,
-      sym__newline,
-      anon_sym_DOT,
-      anon_sym_LPAREN,
-      anon_sym_if,
-      anon_sym_in,
-      anon_sym_LBRACK,
-      anon_sym_not,
-      anon_sym_and,
-      anon_sym_or,
-      anon_sym_LT_EQ,
-      anon_sym_EQ_EQ,
-      anon_sym_BANG_EQ,
-      anon_sym_GT_EQ,
-      anon_sym_LT_GT,
-      anon_sym_is,
-      sym__semicolon,
-  [23212] = 18,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(51), 1,
-      anon_sym_LBRACE,
-    ACTIONS(69), 1,
-      anon_sym_not,
-    ACTIONS(71), 1,
-      anon_sym_lambda,
-    ACTIONS(81), 1,
-      sym__string_start,
-    ACTIONS(331), 1,
-      sym_identifier,
-    ACTIONS(337), 1,
-      anon_sym_await,
-    ACTIONS(559), 1,
-      anon_sym_LPAREN,
-    ACTIONS(563), 1,
-      anon_sym_LBRACK,
-    STATE(684), 1,
-      sym_primary_expression,
-    STATE(713), 1,
-      sym_string,
-    STATE(1054), 1,
-      sym_expression,
-    ACTIONS(75), 2,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(47), 3,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_TILDE,
-    ACTIONS(77), 4,
-      sym_integer,
-      sym_true,
-      sym_false,
-      sym_none,
-    ACTIONS(333), 5,
-      anon_sym_print,
-      anon_sym_async,
-      anon_sym_match,
-      anon_sym_exec,
-      anon_sym_type,
-    STATE(1009), 7,
-      sym_named_expression,
-      sym_not_operator,
-      sym_boolean_operator,
-      sym_comparison_operator,
-      sym_lambda,
-      sym_conditional_expression,
-      sym_await,
-    STATE(797), 15,
-      sym_binary_operator,
-      sym_unary_operator,
-      sym_attribute,
-      sym_subscript,
-      sym_call,
-      sym_list,
-      sym_set,
-      sym_tuple,
-      sym_dictionary,
-      sym_list_comprehension,
-      sym_dictionary_comprehension,
-      sym_set_comprehension,
-      sym_generator_expression,
-      sym_parenthesized_expression,
-      sym_concatenated_string,
-  [23297] = 18,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(622), 1,
-      sym_identifier,
-    ACTIONS(624), 1,
-      anon_sym_LPAREN,
-    ACTIONS(632), 1,
-      anon_sym_LBRACK,
-    ACTIONS(634), 1,
-      anon_sym_LBRACE,
-    ACTIONS(636), 1,
-      anon_sym_not,
-    ACTIONS(638), 1,
-      anon_sym_lambda,
-    ACTIONS(644), 1,
-      anon_sym_await,
-    ACTIONS(646), 1,
-      sym__string_start,
-    STATE(740), 1,
-      sym_primary_expression,
-    STATE(742), 1,
-      sym_string,
-    STATE(1025), 1,
-      sym_expression,
-    ACTIONS(640), 2,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(630), 3,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_TILDE,
-    ACTIONS(642), 4,
-      sym_integer,
-      sym_true,
-      sym_false,
-      sym_none,
-    ACTIONS(626), 5,
-      anon_sym_print,
-      anon_sym_async,
-      anon_sym_match,
-      anon_sym_exec,
-      anon_sym_type,
-    STATE(1015), 7,
-      sym_named_expression,
-      sym_not_operator,
-      sym_boolean_operator,
-      sym_comparison_operator,
-      sym_lambda,
-      sym_conditional_expression,
-      sym_await,
-    STATE(811), 15,
-      sym_binary_operator,
-      sym_unary_operator,
-      sym_attribute,
-      sym_subscript,
-      sym_call,
-      sym_list,
-      sym_set,
-      sym_tuple,
-      sym_dictionary,
-      sym_list_comprehension,
-      sym_dictionary_comprehension,
-      sym_set_comprehension,
-      sym_generator_expression,
-      sym_parenthesized_expression,
-      sym_concatenated_string,
-  [23382] = 18,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(295), 1,
-      anon_sym_LBRACE,
-    ACTIONS(315), 1,
-      sym__string_start,
-    ACTIONS(602), 1,
-      sym_identifier,
-    ACTIONS(604), 1,
-      anon_sym_LPAREN,
-    ACTIONS(612), 1,
-      anon_sym_LBRACK,
-    ACTIONS(614), 1,
-      anon_sym_not,
-    ACTIONS(616), 1,
-      anon_sym_lambda,
-    ACTIONS(618), 1,
-      anon_sym_await,
-    STATE(600), 1,
-      sym_string,
-    STATE(643), 1,
-      sym_primary_expression,
-    STATE(912), 1,
-      sym_expression,
-    ACTIONS(309), 2,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(610), 3,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_TILDE,
-    ACTIONS(311), 4,
-      sym_integer,
-      sym_true,
-      sym_false,
-      sym_none,
-    ACTIONS(606), 5,
-      anon_sym_print,
-      anon_sym_async,
-      anon_sym_match,
-      anon_sym_exec,
-      anon_sym_type,
-    STATE(900), 7,
-      sym_named_expression,
-      sym_not_operator,
-      sym_boolean_operator,
-      sym_comparison_operator,
-      sym_lambda,
-      sym_conditional_expression,
-      sym_await,
-    STATE(642), 15,
-      sym_binary_operator,
-      sym_unary_operator,
-      sym_attribute,
-      sym_subscript,
-      sym_call,
-      sym_list,
-      sym_set,
-      sym_tuple,
-      sym_dictionary,
-      sym_list_comprehension,
-      sym_dictionary_comprehension,
-      sym_set_comprehension,
-      sym_generator_expression,
-      sym_parenthesized_expression,
-      sym_concatenated_string,
-  [23467] = 18,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(622), 1,
-      sym_identifier,
-    ACTIONS(624), 1,
-      anon_sym_LPAREN,
-    ACTIONS(632), 1,
-      anon_sym_LBRACK,
-    ACTIONS(634), 1,
-      anon_sym_LBRACE,
-    ACTIONS(636), 1,
-      anon_sym_not,
-    ACTIONS(638), 1,
-      anon_sym_lambda,
-    ACTIONS(644), 1,
-      anon_sym_await,
-    ACTIONS(646), 1,
-      sym__string_start,
-    STATE(740), 1,
-      sym_primary_expression,
-    STATE(742), 1,
-      sym_string,
-    STATE(1051), 1,
-      sym_expression,
-    ACTIONS(640), 2,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(630), 3,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_TILDE,
-    ACTIONS(642), 4,
-      sym_integer,
-      sym_true,
-      sym_false,
-      sym_none,
-    ACTIONS(626), 5,
-      anon_sym_print,
-      anon_sym_async,
-      anon_sym_match,
-      anon_sym_exec,
-      anon_sym_type,
-    STATE(1015), 7,
-      sym_named_expression,
-      sym_not_operator,
-      sym_boolean_operator,
-      sym_comparison_operator,
-      sym_lambda,
-      sym_conditional_expression,
-      sym_await,
-    STATE(811), 15,
-      sym_binary_operator,
-      sym_unary_operator,
-      sym_attribute,
-      sym_subscript,
-      sym_call,
-      sym_list,
-      sym_set,
-      sym_tuple,
-      sym_dictionary,
-      sym_list_comprehension,
-      sym_dictionary_comprehension,
-      sym_set_comprehension,
-      sym_generator_expression,
-      sym_parenthesized_expression,
-      sym_concatenated_string,
-  [23552] = 18,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(274), 1,
-      sym_identifier,
-    ACTIONS(278), 1,
-      anon_sym_LPAREN,
-    ACTIONS(293), 1,
-      anon_sym_LBRACK,
-    ACTIONS(295), 1,
-      anon_sym_LBRACE,
-    ACTIONS(299), 1,
-      anon_sym_not,
-    ACTIONS(305), 1,
-      anon_sym_lambda,
-    ACTIONS(313), 1,
-      anon_sym_await,
-    ACTIONS(315), 1,
-      sym__string_start,
-    STATE(600), 1,
-      sym_string,
-    STATE(630), 1,
-      sym_primary_expression,
-    STATE(920), 1,
-      sym_expression,
-    ACTIONS(309), 2,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(301), 3,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_TILDE,
-    ACTIONS(311), 4,
-      sym_integer,
-      sym_true,
-      sym_false,
-      sym_none,
-    ACTIONS(285), 5,
-      anon_sym_print,
-      anon_sym_async,
-      anon_sym_match,
-      anon_sym_exec,
-      anon_sym_type,
-    STATE(900), 7,
-      sym_named_expression,
-      sym_not_operator,
-      sym_boolean_operator,
-      sym_comparison_operator,
-      sym_lambda,
-      sym_conditional_expression,
-      sym_await,
-    STATE(642), 15,
-      sym_binary_operator,
-      sym_unary_operator,
-      sym_attribute,
-      sym_subscript,
-      sym_call,
-      sym_list,
-      sym_set,
-      sym_tuple,
-      sym_dictionary,
-      sym_list_comprehension,
-      sym_dictionary_comprehension,
-      sym_set_comprehension,
-      sym_generator_expression,
-      sym_parenthesized_expression,
-      sym_concatenated_string,
-  [23637] = 18,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(274), 1,
-      sym_identifier,
-    ACTIONS(278), 1,
-      anon_sym_LPAREN,
-    ACTIONS(293), 1,
-      anon_sym_LBRACK,
-    ACTIONS(295), 1,
-      anon_sym_LBRACE,
-    ACTIONS(299), 1,
-      anon_sym_not,
-    ACTIONS(305), 1,
-      anon_sym_lambda,
-    ACTIONS(313), 1,
-      anon_sym_await,
-    ACTIONS(315), 1,
-      sym__string_start,
-    STATE(600), 1,
-      sym_string,
-    STATE(630), 1,
-      sym_primary_expression,
-    STATE(939), 1,
-      sym_expression,
-    ACTIONS(309), 2,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(301), 3,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_TILDE,
-    ACTIONS(311), 4,
-      sym_integer,
-      sym_true,
-      sym_false,
-      sym_none,
-    ACTIONS(285), 5,
-      anon_sym_print,
-      anon_sym_async,
-      anon_sym_match,
-      anon_sym_exec,
-      anon_sym_type,
-    STATE(900), 7,
-      sym_named_expression,
-      sym_not_operator,
-      sym_boolean_operator,
-      sym_comparison_operator,
-      sym_lambda,
-      sym_conditional_expression,
-      sym_await,
-    STATE(642), 15,
-      sym_binary_operator,
-      sym_unary_operator,
-      sym_attribute,
-      sym_subscript,
-      sym_call,
-      sym_list,
-      sym_set,
-      sym_tuple,
-      sym_dictionary,
-      sym_list_comprehension,
-      sym_dictionary_comprehension,
-      sym_set_comprehension,
-      sym_generator_expression,
-      sym_parenthesized_expression,
-      sym_concatenated_string,
-  [23722] = 18,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(51), 1,
-      anon_sym_LBRACE,
-    ACTIONS(69), 1,
-      anon_sym_not,
-    ACTIONS(71), 1,
-      anon_sym_lambda,
-    ACTIONS(81), 1,
-      sym__string_start,
-    ACTIONS(331), 1,
-      sym_identifier,
-    ACTIONS(337), 1,
-      anon_sym_await,
-    ACTIONS(559), 1,
-      anon_sym_LPAREN,
-    ACTIONS(563), 1,
-      anon_sym_LBRACK,
-    STATE(684), 1,
-      sym_primary_expression,
-    STATE(713), 1,
-      sym_string,
-    STATE(992), 1,
-      sym_expression,
-    ACTIONS(75), 2,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(47), 3,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_TILDE,
-    ACTIONS(77), 4,
-      sym_integer,
-      sym_true,
-      sym_false,
-      sym_none,
-    ACTIONS(333), 5,
-      anon_sym_print,
-      anon_sym_async,
-      anon_sym_match,
-      anon_sym_exec,
-      anon_sym_type,
-    STATE(1009), 7,
-      sym_named_expression,
-      sym_not_operator,
-      sym_boolean_operator,
-      sym_comparison_operator,
-      sym_lambda,
-      sym_conditional_expression,
-      sym_await,
-    STATE(797), 15,
-      sym_binary_operator,
-      sym_unary_operator,
-      sym_attribute,
-      sym_subscript,
-      sym_call,
-      sym_list,
-      sym_set,
-      sym_tuple,
-      sym_dictionary,
-      sym_list_comprehension,
-      sym_dictionary_comprehension,
-      sym_set_comprehension,
-      sym_generator_expression,
-      sym_parenthesized_expression,
-      sym_concatenated_string,
-  [23807] = 6,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1076), 1,
-      anon_sym_EQ,
-    ACTIONS(1071), 3,
-      anon_sym_RPAREN,
-      anon_sym_COMMA,
-      anon_sym_RBRACK,
-    ACTIONS(1048), 14,
-      anon_sym_DOT,
-      anon_sym_LPAREN,
-      anon_sym_if,
-      anon_sym_in,
-      anon_sym_LBRACK,
-      anon_sym_not,
-      anon_sym_and,
-      anon_sym_or,
-      anon_sym_LT_EQ,
-      anon_sym_EQ_EQ,
-      anon_sym_BANG_EQ,
-      anon_sym_GT_EQ,
-      anon_sym_LT_GT,
-      anon_sym_is,
-    ACTIONS(1078), 14,
-      anon_sym_COLON,
-      anon_sym_PLUS_EQ,
-      anon_sym_DASH_EQ,
-      anon_sym_STAR_EQ,
-      anon_sym_SLASH_EQ,
-      anon_sym_AT_EQ,
-      anon_sym_SLASH_SLASH_EQ,
-      anon_sym_PERCENT_EQ,
-      anon_sym_STAR_STAR_EQ,
-      anon_sym_GT_GT_EQ,
-      anon_sym_LT_LT_EQ,
-      anon_sym_AMP_EQ,
-      anon_sym_CARET_EQ,
-      anon_sym_PIPE_EQ,
-    ACTIONS(1053), 15,
-      anon_sym_STAR,
-      anon_sym_GT_GT,
-      anon_sym_PIPE,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_SLASH,
-      anon_sym_PERCENT,
-      anon_sym_SLASH_SLASH,
-      anon_sym_AMP,
-      anon_sym_CARET,
-      anon_sym_LT_LT,
-      anon_sym_LT,
-      anon_sym_GT,
-  [23868] = 18,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(274), 1,
-      sym_identifier,
-    ACTIONS(278), 1,
-      anon_sym_LPAREN,
-    ACTIONS(293), 1,
-      anon_sym_LBRACK,
-    ACTIONS(295), 1,
-      anon_sym_LBRACE,
-    ACTIONS(299), 1,
-      anon_sym_not,
-    ACTIONS(305), 1,
-      anon_sym_lambda,
-    ACTIONS(313), 1,
-      anon_sym_await,
-    ACTIONS(315), 1,
-      sym__string_start,
-    STATE(600), 1,
-      sym_string,
-    STATE(630), 1,
-      sym_primary_expression,
-    STATE(1126), 1,
-      sym_expression,
-    ACTIONS(309), 2,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(301), 3,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_TILDE,
-    ACTIONS(311), 4,
-      sym_integer,
-      sym_true,
-      sym_false,
-      sym_none,
-    ACTIONS(285), 5,
-      anon_sym_print,
-      anon_sym_async,
-      anon_sym_match,
-      anon_sym_exec,
-      anon_sym_type,
-    STATE(900), 7,
-      sym_named_expression,
-      sym_not_operator,
-      sym_boolean_operator,
-      sym_comparison_operator,
-      sym_lambda,
-      sym_conditional_expression,
-      sym_await,
-    STATE(642), 15,
-      sym_binary_operator,
-      sym_unary_operator,
-      sym_attribute,
-      sym_subscript,
-      sym_call,
-      sym_list,
-      sym_set,
-      sym_tuple,
-      sym_dictionary,
-      sym_list_comprehension,
-      sym_dictionary_comprehension,
-      sym_set_comprehension,
-      sym_generator_expression,
-      sym_parenthesized_expression,
-      sym_concatenated_string,
-  [23953] = 18,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(274), 1,
-      sym_identifier,
-    ACTIONS(278), 1,
-      anon_sym_LPAREN,
-    ACTIONS(293), 1,
-      anon_sym_LBRACK,
-    ACTIONS(295), 1,
-      anon_sym_LBRACE,
-    ACTIONS(299), 1,
-      anon_sym_not,
-    ACTIONS(305), 1,
-      anon_sym_lambda,
-    ACTIONS(313), 1,
-      anon_sym_await,
-    ACTIONS(315), 1,
-      sym__string_start,
-    STATE(600), 1,
-      sym_string,
-    STATE(630), 1,
-      sym_primary_expression,
-    STATE(1127), 1,
-      sym_expression,
-    ACTIONS(309), 2,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(301), 3,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_TILDE,
-    ACTIONS(311), 4,
-      sym_integer,
-      sym_true,
-      sym_false,
-      sym_none,
-    ACTIONS(285), 5,
-      anon_sym_print,
-      anon_sym_async,
-      anon_sym_match,
-      anon_sym_exec,
-      anon_sym_type,
-    STATE(900), 7,
-      sym_named_expression,
-      sym_not_operator,
-      sym_boolean_operator,
-      sym_comparison_operator,
-      sym_lambda,
-      sym_conditional_expression,
-      sym_await,
-    STATE(642), 15,
-      sym_binary_operator,
-      sym_unary_operator,
-      sym_attribute,
-      sym_subscript,
-      sym_call,
-      sym_list,
-      sym_set,
-      sym_tuple,
-      sym_dictionary,
-      sym_list_comprehension,
-      sym_dictionary_comprehension,
-      sym_set_comprehension,
-      sym_generator_expression,
-      sym_parenthesized_expression,
-      sym_concatenated_string,
-  [24038] = 18,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(295), 1,
-      anon_sym_LBRACE,
-    ACTIONS(315), 1,
-      sym__string_start,
-    ACTIONS(602), 1,
-      sym_identifier,
-    ACTIONS(604), 1,
-      anon_sym_LPAREN,
-    ACTIONS(612), 1,
-      anon_sym_LBRACK,
-    ACTIONS(614), 1,
-      anon_sym_not,
-    ACTIONS(616), 1,
-      anon_sym_lambda,
-    ACTIONS(618), 1,
-      anon_sym_await,
-    STATE(600), 1,
-      sym_string,
-    STATE(643), 1,
-      sym_primary_expression,
-    STATE(914), 1,
-      sym_expression,
-    ACTIONS(309), 2,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(610), 3,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_TILDE,
-    ACTIONS(311), 4,
-      sym_integer,
-      sym_true,
-      sym_false,
-      sym_none,
-    ACTIONS(606), 5,
-      anon_sym_print,
-      anon_sym_async,
-      anon_sym_match,
-      anon_sym_exec,
-      anon_sym_type,
-    STATE(900), 7,
-      sym_named_expression,
-      sym_not_operator,
-      sym_boolean_operator,
-      sym_comparison_operator,
-      sym_lambda,
-      sym_conditional_expression,
-      sym_await,
-    STATE(642), 15,
-      sym_binary_operator,
-      sym_unary_operator,
-      sym_attribute,
-      sym_subscript,
-      sym_call,
-      sym_list,
-      sym_set,
-      sym_tuple,
-      sym_dictionary,
-      sym_list_comprehension,
-      sym_dictionary_comprehension,
-      sym_set_comprehension,
-      sym_generator_expression,
-      sym_parenthesized_expression,
-      sym_concatenated_string,
-  [24123] = 18,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(51), 1,
-      anon_sym_LBRACE,
-    ACTIONS(69), 1,
-      anon_sym_not,
-    ACTIONS(71), 1,
-      anon_sym_lambda,
-    ACTIONS(81), 1,
-      sym__string_start,
-    ACTIONS(331), 1,
-      sym_identifier,
-    ACTIONS(337), 1,
-      anon_sym_await,
-    ACTIONS(559), 1,
-      anon_sym_LPAREN,
-    ACTIONS(563), 1,
-      anon_sym_LBRACK,
-    STATE(684), 1,
-      sym_primary_expression,
-    STATE(713), 1,
-      sym_string,
-    STATE(1078), 1,
-      sym_expression,
-    ACTIONS(75), 2,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(47), 3,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_TILDE,
-    ACTIONS(77), 4,
-      sym_integer,
-      sym_true,
-      sym_false,
-      sym_none,
-    ACTIONS(333), 5,
-      anon_sym_print,
-      anon_sym_async,
-      anon_sym_match,
-      anon_sym_exec,
-      anon_sym_type,
-    STATE(1009), 7,
-      sym_named_expression,
-      sym_not_operator,
-      sym_boolean_operator,
-      sym_comparison_operator,
-      sym_lambda,
-      sym_conditional_expression,
-      sym_await,
-    STATE(797), 15,
-      sym_binary_operator,
-      sym_unary_operator,
-      sym_attribute,
-      sym_subscript,
-      sym_call,
-      sym_list,
-      sym_set,
-      sym_tuple,
-      sym_dictionary,
-      sym_list_comprehension,
-      sym_dictionary_comprehension,
-      sym_set_comprehension,
-      sym_generator_expression,
-      sym_parenthesized_expression,
-      sym_concatenated_string,
-  [24208] = 5,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(856), 1,
-      anon_sym_finally,
-    STATE(564), 1,
-      sym_finally_clause,
-    ACTIONS(1159), 12,
-      sym__dedent,
-      sym__string_start,
-      anon_sym_LPAREN,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_LBRACE,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_TILDE,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(1157), 33,
-      anon_sym_import,
-      anon_sym_from,
-      anon_sym_STAR,
-      anon_sym_print,
-      anon_sym_assert,
-      anon_sym_return,
-      anon_sym_del,
-      anon_sym_raise,
-      anon_sym_pass,
-      anon_sym_break,
-      anon_sym_continue,
-      anon_sym_if,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_while,
-      anon_sym_try,
-      anon_sym_with,
-      anon_sym_match,
-      anon_sym_def,
-      anon_sym_global,
-      anon_sym_nonlocal,
-      anon_sym_exec,
-      anon_sym_type,
-      anon_sym_class,
-      anon_sym_not,
-      anon_sym_lambda,
-      anon_sym_yield,
-      sym_integer,
-      sym_identifier,
-      anon_sym_await,
-      sym_true,
-      sym_false,
-      sym_none,
-  [24267] = 18,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(295), 1,
-      anon_sym_LBRACE,
-    ACTIONS(315), 1,
-      sym__string_start,
-    ACTIONS(602), 1,
-      sym_identifier,
-    ACTIONS(604), 1,
-      anon_sym_LPAREN,
-    ACTIONS(612), 1,
-      anon_sym_LBRACK,
-    ACTIONS(614), 1,
-      anon_sym_not,
-    ACTIONS(616), 1,
-      anon_sym_lambda,
-    ACTIONS(618), 1,
-      anon_sym_await,
-    STATE(600), 1,
-      sym_string,
-    STATE(643), 1,
-      sym_primary_expression,
-    STATE(927), 1,
-      sym_expression,
-    ACTIONS(309), 2,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(610), 3,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_TILDE,
-    ACTIONS(311), 4,
-      sym_integer,
-      sym_true,
-      sym_false,
-      sym_none,
-    ACTIONS(606), 5,
-      anon_sym_print,
-      anon_sym_async,
-      anon_sym_match,
-      anon_sym_exec,
-      anon_sym_type,
-    STATE(900), 7,
-      sym_named_expression,
-      sym_not_operator,
-      sym_boolean_operator,
-      sym_comparison_operator,
-      sym_lambda,
-      sym_conditional_expression,
-      sym_await,
-    STATE(642), 15,
-      sym_binary_operator,
-      sym_unary_operator,
-      sym_attribute,
-      sym_subscript,
-      sym_call,
-      sym_list,
-      sym_set,
-      sym_tuple,
-      sym_dictionary,
-      sym_list_comprehension,
-      sym_dictionary_comprehension,
-      sym_set_comprehension,
-      sym_generator_expression,
-      sym_parenthesized_expression,
-      sym_concatenated_string,
-  [24352] = 18,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(274), 1,
-      sym_identifier,
-    ACTIONS(278), 1,
-      anon_sym_LPAREN,
-    ACTIONS(293), 1,
-      anon_sym_LBRACK,
-    ACTIONS(295), 1,
-      anon_sym_LBRACE,
-    ACTIONS(299), 1,
-      anon_sym_not,
-    ACTIONS(305), 1,
-      anon_sym_lambda,
-    ACTIONS(313), 1,
-      anon_sym_await,
-    ACTIONS(315), 1,
-      sym__string_start,
-    STATE(600), 1,
-      sym_string,
-    STATE(630), 1,
-      sym_primary_expression,
-    STATE(926), 1,
-      sym_expression,
-    ACTIONS(309), 2,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(301), 3,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_TILDE,
-    ACTIONS(311), 4,
-      sym_integer,
-      sym_true,
-      sym_false,
-      sym_none,
-    ACTIONS(285), 5,
-      anon_sym_print,
-      anon_sym_async,
-      anon_sym_match,
-      anon_sym_exec,
-      anon_sym_type,
-    STATE(900), 7,
-      sym_named_expression,
-      sym_not_operator,
-      sym_boolean_operator,
-      sym_comparison_operator,
-      sym_lambda,
-      sym_conditional_expression,
-      sym_await,
-    STATE(642), 15,
-      sym_binary_operator,
-      sym_unary_operator,
-      sym_attribute,
-      sym_subscript,
-      sym_call,
-      sym_list,
-      sym_set,
-      sym_tuple,
-      sym_dictionary,
-      sym_list_comprehension,
-      sym_dictionary_comprehension,
-      sym_set_comprehension,
-      sym_generator_expression,
-      sym_parenthesized_expression,
-      sym_concatenated_string,
-  [24437] = 18,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(295), 1,
-      anon_sym_LBRACE,
-    ACTIONS(315), 1,
-      sym__string_start,
-    ACTIONS(602), 1,
-      sym_identifier,
-    ACTIONS(604), 1,
-      anon_sym_LPAREN,
-    ACTIONS(612), 1,
-      anon_sym_LBRACK,
-    ACTIONS(614), 1,
-      anon_sym_not,
-    ACTIONS(616), 1,
-      anon_sym_lambda,
-    ACTIONS(618), 1,
-      anon_sym_await,
-    STATE(600), 1,
-      sym_string,
-    STATE(643), 1,
-      sym_primary_expression,
-    STATE(922), 1,
-      sym_expression,
-    ACTIONS(309), 2,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(610), 3,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_TILDE,
-    ACTIONS(311), 4,
-      sym_integer,
-      sym_true,
-      sym_false,
-      sym_none,
-    ACTIONS(606), 5,
-      anon_sym_print,
-      anon_sym_async,
-      anon_sym_match,
-      anon_sym_exec,
-      anon_sym_type,
-    STATE(900), 7,
-      sym_named_expression,
-      sym_not_operator,
-      sym_boolean_operator,
-      sym_comparison_operator,
-      sym_lambda,
-      sym_conditional_expression,
-      sym_await,
-    STATE(642), 15,
-      sym_binary_operator,
-      sym_unary_operator,
-      sym_attribute,
-      sym_subscript,
-      sym_call,
-      sym_list,
-      sym_set,
-      sym_tuple,
-      sym_dictionary,
-      sym_list_comprehension,
-      sym_dictionary_comprehension,
-      sym_set_comprehension,
-      sym_generator_expression,
-      sym_parenthesized_expression,
-      sym_concatenated_string,
-  [24522] = 18,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(622), 1,
-      sym_identifier,
-    ACTIONS(624), 1,
-      anon_sym_LPAREN,
-    ACTIONS(632), 1,
-      anon_sym_LBRACK,
-    ACTIONS(634), 1,
-      anon_sym_LBRACE,
-    ACTIONS(636), 1,
-      anon_sym_not,
-    ACTIONS(638), 1,
-      anon_sym_lambda,
-    ACTIONS(644), 1,
-      anon_sym_await,
-    ACTIONS(646), 1,
-      sym__string_start,
-    STATE(740), 1,
-      sym_primary_expression,
-    STATE(742), 1,
-      sym_string,
-    STATE(1027), 1,
-      sym_expression,
-    ACTIONS(640), 2,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(630), 3,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_TILDE,
-    ACTIONS(642), 4,
-      sym_integer,
-      sym_true,
-      sym_false,
-      sym_none,
-    ACTIONS(626), 5,
-      anon_sym_print,
-      anon_sym_async,
-      anon_sym_match,
-      anon_sym_exec,
-      anon_sym_type,
-    STATE(1015), 7,
-      sym_named_expression,
-      sym_not_operator,
-      sym_boolean_operator,
-      sym_comparison_operator,
-      sym_lambda,
-      sym_conditional_expression,
-      sym_await,
-    STATE(811), 15,
-      sym_binary_operator,
-      sym_unary_operator,
-      sym_attribute,
-      sym_subscript,
-      sym_call,
-      sym_list,
-      sym_set,
-      sym_tuple,
-      sym_dictionary,
-      sym_list_comprehension,
-      sym_dictionary_comprehension,
-      sym_set_comprehension,
-      sym_generator_expression,
-      sym_parenthesized_expression,
-      sym_concatenated_string,
-  [24607] = 18,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(274), 1,
-      sym_identifier,
-    ACTIONS(278), 1,
-      anon_sym_LPAREN,
-    ACTIONS(293), 1,
-      anon_sym_LBRACK,
-    ACTIONS(295), 1,
-      anon_sym_LBRACE,
-    ACTIONS(299), 1,
-      anon_sym_not,
-    ACTIONS(305), 1,
-      anon_sym_lambda,
-    ACTIONS(313), 1,
-      anon_sym_await,
-    ACTIONS(315), 1,
-      sym__string_start,
-    STATE(600), 1,
-      sym_string,
-    STATE(630), 1,
-      sym_primary_expression,
-    STATE(1148), 1,
-      sym_expression,
-    ACTIONS(309), 2,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(301), 3,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_TILDE,
-    ACTIONS(311), 4,
-      sym_integer,
-      sym_true,
-      sym_false,
-      sym_none,
-    ACTIONS(285), 5,
-      anon_sym_print,
-      anon_sym_async,
-      anon_sym_match,
-      anon_sym_exec,
-      anon_sym_type,
-    STATE(900), 7,
-      sym_named_expression,
-      sym_not_operator,
-      sym_boolean_operator,
-      sym_comparison_operator,
-      sym_lambda,
-      sym_conditional_expression,
-      sym_await,
-    STATE(642), 15,
-      sym_binary_operator,
-      sym_unary_operator,
-      sym_attribute,
-      sym_subscript,
-      sym_call,
-      sym_list,
-      sym_set,
-      sym_tuple,
-      sym_dictionary,
-      sym_list_comprehension,
-      sym_dictionary_comprehension,
-      sym_set_comprehension,
-      sym_generator_expression,
-      sym_parenthesized_expression,
-      sym_concatenated_string,
-  [24692] = 18,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(274), 1,
-      sym_identifier,
-    ACTIONS(278), 1,
-      anon_sym_LPAREN,
-    ACTIONS(293), 1,
-      anon_sym_LBRACK,
-    ACTIONS(295), 1,
-      anon_sym_LBRACE,
-    ACTIONS(299), 1,
-      anon_sym_not,
-    ACTIONS(305), 1,
-      anon_sym_lambda,
-    ACTIONS(313), 1,
-      anon_sym_await,
-    ACTIONS(315), 1,
-      sym__string_start,
-    STATE(600), 1,
-      sym_string,
-    STATE(630), 1,
-      sym_primary_expression,
-    STATE(948), 1,
-      sym_expression,
-    ACTIONS(309), 2,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(301), 3,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_TILDE,
-    ACTIONS(311), 4,
-      sym_integer,
-      sym_true,
-      sym_false,
-      sym_none,
-    ACTIONS(285), 5,
-      anon_sym_print,
-      anon_sym_async,
-      anon_sym_match,
-      anon_sym_exec,
-      anon_sym_type,
-    STATE(900), 7,
-      sym_named_expression,
-      sym_not_operator,
-      sym_boolean_operator,
-      sym_comparison_operator,
-      sym_lambda,
-      sym_conditional_expression,
-      sym_await,
-    STATE(642), 15,
-      sym_binary_operator,
-      sym_unary_operator,
-      sym_attribute,
-      sym_subscript,
-      sym_call,
-      sym_list,
-      sym_set,
-      sym_tuple,
-      sym_dictionary,
-      sym_list_comprehension,
-      sym_dictionary_comprehension,
-      sym_set_comprehension,
-      sym_generator_expression,
-      sym_parenthesized_expression,
-      sym_concatenated_string,
-  [24777] = 18,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(51), 1,
-      anon_sym_LBRACE,
-    ACTIONS(69), 1,
-      anon_sym_not,
-    ACTIONS(71), 1,
-      anon_sym_lambda,
-    ACTIONS(81), 1,
-      sym__string_start,
-    ACTIONS(331), 1,
-      sym_identifier,
-    ACTIONS(337), 1,
-      anon_sym_await,
-    ACTIONS(559), 1,
-      anon_sym_LPAREN,
-    ACTIONS(563), 1,
-      anon_sym_LBRACK,
-    STATE(684), 1,
-      sym_primary_expression,
-    STATE(713), 1,
-      sym_string,
-    STATE(1113), 1,
-      sym_expression,
-    ACTIONS(75), 2,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(47), 3,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_TILDE,
-    ACTIONS(77), 4,
-      sym_integer,
-      sym_true,
-      sym_false,
-      sym_none,
-    ACTIONS(333), 5,
-      anon_sym_print,
-      anon_sym_async,
-      anon_sym_match,
-      anon_sym_exec,
-      anon_sym_type,
-    STATE(1009), 7,
-      sym_named_expression,
-      sym_not_operator,
-      sym_boolean_operator,
-      sym_comparison_operator,
-      sym_lambda,
-      sym_conditional_expression,
-      sym_await,
-    STATE(797), 15,
-      sym_binary_operator,
-      sym_unary_operator,
-      sym_attribute,
-      sym_subscript,
-      sym_call,
-      sym_list,
-      sym_set,
-      sym_tuple,
-      sym_dictionary,
-      sym_list_comprehension,
-      sym_dictionary_comprehension,
-      sym_set_comprehension,
-      sym_generator_expression,
-      sym_parenthesized_expression,
-      sym_concatenated_string,
-  [24862] = 18,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(51), 1,
-      anon_sym_LBRACE,
-    ACTIONS(69), 1,
-      anon_sym_not,
-    ACTIONS(71), 1,
-      anon_sym_lambda,
-    ACTIONS(81), 1,
-      sym__string_start,
-    ACTIONS(331), 1,
-      sym_identifier,
-    ACTIONS(337), 1,
-      anon_sym_await,
-    ACTIONS(559), 1,
-      anon_sym_LPAREN,
-    ACTIONS(563), 1,
-      anon_sym_LBRACK,
-    STATE(684), 1,
-      sym_primary_expression,
-    STATE(713), 1,
-      sym_string,
-    STATE(1026), 1,
-      sym_expression,
-    ACTIONS(75), 2,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(47), 3,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_TILDE,
-    ACTIONS(77), 4,
-      sym_integer,
-      sym_true,
-      sym_false,
-      sym_none,
-    ACTIONS(333), 5,
-      anon_sym_print,
-      anon_sym_async,
-      anon_sym_match,
-      anon_sym_exec,
-      anon_sym_type,
-    STATE(1009), 7,
-      sym_named_expression,
-      sym_not_operator,
-      sym_boolean_operator,
-      sym_comparison_operator,
-      sym_lambda,
-      sym_conditional_expression,
-      sym_await,
-    STATE(797), 15,
-      sym_binary_operator,
-      sym_unary_operator,
-      sym_attribute,
-      sym_subscript,
-      sym_call,
-      sym_list,
-      sym_set,
-      sym_tuple,
-      sym_dictionary,
-      sym_list_comprehension,
-      sym_dictionary_comprehension,
-      sym_set_comprehension,
-      sym_generator_expression,
-      sym_parenthesized_expression,
-      sym_concatenated_string,
-  [24947] = 18,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(274), 1,
-      sym_identifier,
-    ACTIONS(278), 1,
-      anon_sym_LPAREN,
-    ACTIONS(293), 1,
-      anon_sym_LBRACK,
-    ACTIONS(295), 1,
-      anon_sym_LBRACE,
-    ACTIONS(299), 1,
-      anon_sym_not,
-    ACTIONS(305), 1,
-      anon_sym_lambda,
-    ACTIONS(313), 1,
-      anon_sym_await,
-    ACTIONS(315), 1,
-      sym__string_start,
-    STATE(600), 1,
-      sym_string,
-    STATE(630), 1,
-      sym_primary_expression,
-    STATE(924), 1,
-      sym_expression,
-    ACTIONS(309), 2,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(301), 3,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_TILDE,
-    ACTIONS(311), 4,
-      sym_integer,
-      sym_true,
-      sym_false,
-      sym_none,
-    ACTIONS(285), 5,
-      anon_sym_print,
-      anon_sym_async,
-      anon_sym_match,
-      anon_sym_exec,
-      anon_sym_type,
-    STATE(900), 7,
-      sym_named_expression,
-      sym_not_operator,
-      sym_boolean_operator,
-      sym_comparison_operator,
-      sym_lambda,
-      sym_conditional_expression,
-      sym_await,
-    STATE(642), 15,
-      sym_binary_operator,
-      sym_unary_operator,
-      sym_attribute,
-      sym_subscript,
-      sym_call,
-      sym_list,
-      sym_set,
-      sym_tuple,
-      sym_dictionary,
-      sym_list_comprehension,
-      sym_dictionary_comprehension,
-      sym_set_comprehension,
-      sym_generator_expression,
-      sym_parenthesized_expression,
-      sym_concatenated_string,
-  [25032] = 5,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(852), 1,
-      anon_sym_else,
-    STATE(567), 1,
-      sym_else_clause,
-    ACTIONS(1163), 12,
-      sym__dedent,
-      sym__string_start,
-      anon_sym_LPAREN,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_LBRACE,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_TILDE,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(1161), 33,
-      anon_sym_import,
-      anon_sym_from,
-      anon_sym_STAR,
-      anon_sym_print,
-      anon_sym_assert,
-      anon_sym_return,
-      anon_sym_del,
-      anon_sym_raise,
-      anon_sym_pass,
-      anon_sym_break,
-      anon_sym_continue,
-      anon_sym_if,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_while,
-      anon_sym_try,
-      anon_sym_with,
-      anon_sym_match,
-      anon_sym_def,
-      anon_sym_global,
-      anon_sym_nonlocal,
-      anon_sym_exec,
-      anon_sym_type,
-      anon_sym_class,
-      anon_sym_not,
-      anon_sym_lambda,
-      anon_sym_yield,
-      sym_integer,
-      sym_identifier,
-      anon_sym_await,
-      sym_true,
-      sym_false,
-      sym_none,
-  [25091] = 18,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(295), 1,
-      anon_sym_LBRACE,
-    ACTIONS(315), 1,
-      sym__string_start,
-    ACTIONS(602), 1,
-      sym_identifier,
-    ACTIONS(604), 1,
-      anon_sym_LPAREN,
-    ACTIONS(612), 1,
-      anon_sym_LBRACK,
-    ACTIONS(614), 1,
-      anon_sym_not,
-    ACTIONS(616), 1,
-      anon_sym_lambda,
-    ACTIONS(618), 1,
-      anon_sym_await,
-    STATE(600), 1,
-      sym_string,
-    STATE(643), 1,
-      sym_primary_expression,
-    STATE(923), 1,
-      sym_expression,
-    ACTIONS(309), 2,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(610), 3,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_TILDE,
-    ACTIONS(311), 4,
-      sym_integer,
-      sym_true,
-      sym_false,
-      sym_none,
-    ACTIONS(606), 5,
-      anon_sym_print,
-      anon_sym_async,
-      anon_sym_match,
-      anon_sym_exec,
-      anon_sym_type,
-    STATE(900), 7,
-      sym_named_expression,
-      sym_not_operator,
-      sym_boolean_operator,
-      sym_comparison_operator,
-      sym_lambda,
-      sym_conditional_expression,
-      sym_await,
-    STATE(642), 15,
-      sym_binary_operator,
-      sym_unary_operator,
-      sym_attribute,
-      sym_subscript,
-      sym_call,
-      sym_list,
-      sym_set,
-      sym_tuple,
-      sym_dictionary,
-      sym_list_comprehension,
-      sym_dictionary_comprehension,
-      sym_set_comprehension,
-      sym_generator_expression,
-      sym_parenthesized_expression,
-      sym_concatenated_string,
-  [25176] = 18,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(51), 1,
-      anon_sym_LBRACE,
-    ACTIONS(69), 1,
-      anon_sym_not,
-    ACTIONS(71), 1,
-      anon_sym_lambda,
-    ACTIONS(81), 1,
-      sym__string_start,
-    ACTIONS(331), 1,
-      sym_identifier,
-    ACTIONS(337), 1,
-      anon_sym_await,
-    ACTIONS(559), 1,
-      anon_sym_LPAREN,
-    ACTIONS(563), 1,
-      anon_sym_LBRACK,
-    STATE(684), 1,
-      sym_primary_expression,
-    STATE(713), 1,
-      sym_string,
-    STATE(1105), 1,
-      sym_expression,
-    ACTIONS(75), 2,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(47), 3,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_TILDE,
-    ACTIONS(77), 4,
-      sym_integer,
-      sym_true,
-      sym_false,
-      sym_none,
-    ACTIONS(333), 5,
-      anon_sym_print,
-      anon_sym_async,
-      anon_sym_match,
-      anon_sym_exec,
-      anon_sym_type,
-    STATE(1009), 7,
-      sym_named_expression,
-      sym_not_operator,
-      sym_boolean_operator,
-      sym_comparison_operator,
-      sym_lambda,
-      sym_conditional_expression,
-      sym_await,
-    STATE(797), 15,
-      sym_binary_operator,
-      sym_unary_operator,
-      sym_attribute,
-      sym_subscript,
-      sym_call,
-      sym_list,
-      sym_set,
-      sym_tuple,
-      sym_dictionary,
-      sym_list_comprehension,
-      sym_dictionary_comprehension,
-      sym_set_comprehension,
-      sym_generator_expression,
-      sym_parenthesized_expression,
-      sym_concatenated_string,
-  [25261] = 5,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(850), 1,
-      anon_sym_finally,
-    STATE(559), 1,
-      sym_finally_clause,
-    ACTIONS(1159), 12,
-      sym__string_start,
-      ts_builtin_sym_end,
-      anon_sym_LPAREN,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_LBRACE,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_TILDE,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(1157), 33,
-      anon_sym_import,
-      anon_sym_from,
-      anon_sym_STAR,
-      anon_sym_print,
-      anon_sym_assert,
-      anon_sym_return,
-      anon_sym_del,
-      anon_sym_raise,
-      anon_sym_pass,
-      anon_sym_break,
-      anon_sym_continue,
-      anon_sym_if,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_while,
-      anon_sym_try,
-      anon_sym_with,
-      anon_sym_match,
-      anon_sym_def,
-      anon_sym_global,
-      anon_sym_nonlocal,
-      anon_sym_exec,
-      anon_sym_type,
-      anon_sym_class,
-      anon_sym_not,
-      anon_sym_lambda,
-      anon_sym_yield,
-      sym_integer,
-      sym_identifier,
-      anon_sym_await,
-      sym_true,
-      sym_false,
-      sym_none,
-  [25320] = 18,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(274), 1,
-      sym_identifier,
-    ACTIONS(278), 1,
-      anon_sym_LPAREN,
-    ACTIONS(293), 1,
-      anon_sym_LBRACK,
-    ACTIONS(295), 1,
-      anon_sym_LBRACE,
-    ACTIONS(299), 1,
-      anon_sym_not,
-    ACTIONS(305), 1,
-      anon_sym_lambda,
-    ACTIONS(313), 1,
-      anon_sym_await,
-    ACTIONS(315), 1,
-      sym__string_start,
-    STATE(600), 1,
-      sym_string,
-    STATE(630), 1,
-      sym_primary_expression,
-    STATE(1157), 1,
-      sym_expression,
-    ACTIONS(309), 2,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(301), 3,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_TILDE,
-    ACTIONS(311), 4,
-      sym_integer,
-      sym_true,
-      sym_false,
-      sym_none,
-    ACTIONS(285), 5,
-      anon_sym_print,
-      anon_sym_async,
-      anon_sym_match,
-      anon_sym_exec,
-      anon_sym_type,
-    STATE(900), 7,
-      sym_named_expression,
-      sym_not_operator,
-      sym_boolean_operator,
-      sym_comparison_operator,
-      sym_lambda,
-      sym_conditional_expression,
-      sym_await,
-    STATE(642), 15,
-      sym_binary_operator,
-      sym_unary_operator,
-      sym_attribute,
-      sym_subscript,
-      sym_call,
-      sym_list,
-      sym_set,
-      sym_tuple,
-      sym_dictionary,
-      sym_list_comprehension,
-      sym_dictionary_comprehension,
-      sym_set_comprehension,
-      sym_generator_expression,
-      sym_parenthesized_expression,
-      sym_concatenated_string,
-  [25405] = 18,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(51), 1,
-      anon_sym_LBRACE,
-    ACTIONS(69), 1,
-      anon_sym_not,
-    ACTIONS(71), 1,
-      anon_sym_lambda,
-    ACTIONS(81), 1,
-      sym__string_start,
-    ACTIONS(331), 1,
-      sym_identifier,
-    ACTIONS(337), 1,
-      anon_sym_await,
-    ACTIONS(559), 1,
-      anon_sym_LPAREN,
-    ACTIONS(563), 1,
-      anon_sym_LBRACK,
-    STATE(684), 1,
-      sym_primary_expression,
-    STATE(713), 1,
-      sym_string,
-    STATE(1048), 1,
-      sym_expression,
-    ACTIONS(75), 2,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(47), 3,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_TILDE,
-    ACTIONS(77), 4,
-      sym_integer,
-      sym_true,
-      sym_false,
-      sym_none,
-    ACTIONS(333), 5,
-      anon_sym_print,
-      anon_sym_async,
-      anon_sym_match,
-      anon_sym_exec,
-      anon_sym_type,
-    STATE(1009), 7,
-      sym_named_expression,
-      sym_not_operator,
-      sym_boolean_operator,
-      sym_comparison_operator,
-      sym_lambda,
-      sym_conditional_expression,
-      sym_await,
-    STATE(797), 15,
-      sym_binary_operator,
-      sym_unary_operator,
-      sym_attribute,
-      sym_subscript,
-      sym_call,
-      sym_list,
-      sym_set,
-      sym_tuple,
-      sym_dictionary,
-      sym_list_comprehension,
-      sym_dictionary_comprehension,
-      sym_set_comprehension,
-      sym_generator_expression,
-      sym_parenthesized_expression,
-      sym_concatenated_string,
-  [25490] = 18,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(274), 1,
-      sym_identifier,
-    ACTIONS(278), 1,
-      anon_sym_LPAREN,
-    ACTIONS(293), 1,
-      anon_sym_LBRACK,
-    ACTIONS(295), 1,
-      anon_sym_LBRACE,
-    ACTIONS(299), 1,
-      anon_sym_not,
-    ACTIONS(305), 1,
-      anon_sym_lambda,
-    ACTIONS(313), 1,
-      anon_sym_await,
-    ACTIONS(315), 1,
-      sym__string_start,
-    STATE(600), 1,
-      sym_string,
-    STATE(630), 1,
-      sym_primary_expression,
-    STATE(904), 1,
-      sym_expression,
-    ACTIONS(309), 2,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(301), 3,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_TILDE,
-    ACTIONS(311), 4,
-      sym_integer,
-      sym_true,
-      sym_false,
-      sym_none,
-    ACTIONS(285), 5,
-      anon_sym_print,
-      anon_sym_async,
-      anon_sym_match,
-      anon_sym_exec,
-      anon_sym_type,
-    STATE(900), 7,
-      sym_named_expression,
-      sym_not_operator,
-      sym_boolean_operator,
-      sym_comparison_operator,
-      sym_lambda,
-      sym_conditional_expression,
-      sym_await,
-    STATE(642), 15,
-      sym_binary_operator,
-      sym_unary_operator,
-      sym_attribute,
-      sym_subscript,
-      sym_call,
-      sym_list,
-      sym_set,
-      sym_tuple,
-      sym_dictionary,
-      sym_list_comprehension,
-      sym_dictionary_comprehension,
-      sym_set_comprehension,
-      sym_generator_expression,
-      sym_parenthesized_expression,
-      sym_concatenated_string,
-  [25575] = 18,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(274), 1,
-      sym_identifier,
-    ACTIONS(278), 1,
-      anon_sym_LPAREN,
-    ACTIONS(293), 1,
-      anon_sym_LBRACK,
-    ACTIONS(295), 1,
-      anon_sym_LBRACE,
-    ACTIONS(299), 1,
-      anon_sym_not,
-    ACTIONS(305), 1,
-      anon_sym_lambda,
-    ACTIONS(313), 1,
-      anon_sym_await,
-    ACTIONS(315), 1,
-      sym__string_start,
-    STATE(600), 1,
-      sym_string,
-    STATE(630), 1,
-      sym_primary_expression,
-    STATE(1158), 1,
-      sym_expression,
-    ACTIONS(309), 2,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(301), 3,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_TILDE,
-    ACTIONS(311), 4,
-      sym_integer,
-      sym_true,
-      sym_false,
-      sym_none,
-    ACTIONS(285), 5,
-      anon_sym_print,
-      anon_sym_async,
-      anon_sym_match,
-      anon_sym_exec,
-      anon_sym_type,
-    STATE(900), 7,
-      sym_named_expression,
-      sym_not_operator,
-      sym_boolean_operator,
-      sym_comparison_operator,
-      sym_lambda,
-      sym_conditional_expression,
-      sym_await,
-    STATE(642), 15,
-      sym_binary_operator,
-      sym_unary_operator,
-      sym_attribute,
-      sym_subscript,
-      sym_call,
-      sym_list,
-      sym_set,
-      sym_tuple,
-      sym_dictionary,
-      sym_list_comprehension,
-      sym_dictionary_comprehension,
-      sym_set_comprehension,
-      sym_generator_expression,
-      sym_parenthesized_expression,
-      sym_concatenated_string,
-  [25660] = 5,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(846), 1,
-      anon_sym_else,
-    STATE(569), 1,
-      sym_else_clause,
-    ACTIONS(1163), 12,
-      sym__string_start,
-      ts_builtin_sym_end,
-      anon_sym_LPAREN,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_LBRACE,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_TILDE,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(1161), 33,
-      anon_sym_import,
-      anon_sym_from,
-      anon_sym_STAR,
-      anon_sym_print,
-      anon_sym_assert,
-      anon_sym_return,
-      anon_sym_del,
-      anon_sym_raise,
-      anon_sym_pass,
-      anon_sym_break,
-      anon_sym_continue,
-      anon_sym_if,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_while,
-      anon_sym_try,
-      anon_sym_with,
-      anon_sym_match,
-      anon_sym_def,
-      anon_sym_global,
-      anon_sym_nonlocal,
-      anon_sym_exec,
-      anon_sym_type,
-      anon_sym_class,
-      anon_sym_not,
-      anon_sym_lambda,
-      anon_sym_yield,
-      sym_integer,
-      sym_identifier,
-      anon_sym_await,
-      sym_true,
-      sym_false,
-      sym_none,
-  [25719] = 18,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(295), 1,
-      anon_sym_LBRACE,
-    ACTIONS(315), 1,
-      sym__string_start,
-    ACTIONS(602), 1,
-      sym_identifier,
-    ACTIONS(604), 1,
-      anon_sym_LPAREN,
-    ACTIONS(612), 1,
-      anon_sym_LBRACK,
-    ACTIONS(614), 1,
-      anon_sym_not,
-    ACTIONS(616), 1,
-      anon_sym_lambda,
-    ACTIONS(618), 1,
-      anon_sym_await,
-    STATE(600), 1,
-      sym_string,
-    STATE(643), 1,
-      sym_primary_expression,
-    STATE(1039), 1,
-      sym_expression,
-    ACTIONS(309), 2,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(610), 3,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_TILDE,
-    ACTIONS(311), 4,
-      sym_integer,
-      sym_true,
-      sym_false,
-      sym_none,
-    ACTIONS(606), 5,
-      anon_sym_print,
-      anon_sym_async,
-      anon_sym_match,
-      anon_sym_exec,
-      anon_sym_type,
-    STATE(900), 7,
-      sym_named_expression,
-      sym_not_operator,
-      sym_boolean_operator,
-      sym_comparison_operator,
-      sym_lambda,
-      sym_conditional_expression,
-      sym_await,
-    STATE(642), 15,
-      sym_binary_operator,
-      sym_unary_operator,
-      sym_attribute,
-      sym_subscript,
-      sym_call,
-      sym_list,
-      sym_set,
-      sym_tuple,
-      sym_dictionary,
-      sym_list_comprehension,
-      sym_dictionary_comprehension,
-      sym_set_comprehension,
-      sym_generator_expression,
-      sym_parenthesized_expression,
-      sym_concatenated_string,
-  [25804] = 18,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(274), 1,
-      sym_identifier,
-    ACTIONS(278), 1,
-      anon_sym_LPAREN,
-    ACTIONS(293), 1,
-      anon_sym_LBRACK,
-    ACTIONS(295), 1,
-      anon_sym_LBRACE,
-    ACTIONS(299), 1,
-      anon_sym_not,
-    ACTIONS(305), 1,
-      anon_sym_lambda,
-    ACTIONS(313), 1,
-      anon_sym_await,
-    ACTIONS(315), 1,
-      sym__string_start,
-    STATE(600), 1,
-      sym_string,
-    STATE(630), 1,
-      sym_primary_expression,
-    STATE(1102), 1,
-      sym_expression,
-    ACTIONS(309), 2,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(301), 3,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_TILDE,
-    ACTIONS(311), 4,
-      sym_integer,
-      sym_true,
-      sym_false,
-      sym_none,
-    ACTIONS(285), 5,
-      anon_sym_print,
-      anon_sym_async,
-      anon_sym_match,
-      anon_sym_exec,
-      anon_sym_type,
-    STATE(900), 7,
-      sym_named_expression,
-      sym_not_operator,
-      sym_boolean_operator,
-      sym_comparison_operator,
-      sym_lambda,
-      sym_conditional_expression,
-      sym_await,
-    STATE(642), 15,
-      sym_binary_operator,
-      sym_unary_operator,
-      sym_attribute,
-      sym_subscript,
-      sym_call,
-      sym_list,
-      sym_set,
-      sym_tuple,
-      sym_dictionary,
-      sym_list_comprehension,
-      sym_dictionary_comprehension,
-      sym_set_comprehension,
-      sym_generator_expression,
-      sym_parenthesized_expression,
-      sym_concatenated_string,
-  [25889] = 6,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1167), 1,
-      anon_sym_COMMA,
-    ACTIONS(1174), 1,
-      anon_sym_EQ,
-    ACTIONS(1172), 14,
-      anon_sym_COLON,
-      anon_sym_PLUS_EQ,
-      anon_sym_DASH_EQ,
-      anon_sym_STAR_EQ,
-      anon_sym_SLASH_EQ,
-      anon_sym_AT_EQ,
-      anon_sym_SLASH_SLASH_EQ,
-      anon_sym_PERCENT_EQ,
-      anon_sym_STAR_STAR_EQ,
-      anon_sym_GT_GT_EQ,
-      anon_sym_LT_LT_EQ,
-      anon_sym_AMP_EQ,
-      anon_sym_CARET_EQ,
-      anon_sym_PIPE_EQ,
-    ACTIONS(1170), 15,
-      anon_sym_STAR,
-      anon_sym_GT_GT,
-      anon_sym_PIPE,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_SLASH,
-      anon_sym_PERCENT,
-      anon_sym_SLASH_SLASH,
-      anon_sym_AMP,
-      anon_sym_CARET,
-      anon_sym_LT_LT,
-      anon_sym_LT,
-      anon_sym_GT,
-    ACTIONS(1165), 16,
-      sym__newline,
-      anon_sym_DOT,
-      anon_sym_LPAREN,
-      anon_sym_if,
-      anon_sym_in,
-      anon_sym_LBRACK,
-      anon_sym_not,
-      anon_sym_and,
-      anon_sym_or,
-      anon_sym_LT_EQ,
-      anon_sym_EQ_EQ,
-      anon_sym_BANG_EQ,
-      anon_sym_GT_EQ,
-      anon_sym_LT_GT,
-      anon_sym_is,
-      sym__semicolon,
-  [25950] = 18,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(274), 1,
-      sym_identifier,
-    ACTIONS(278), 1,
-      anon_sym_LPAREN,
-    ACTIONS(293), 1,
-      anon_sym_LBRACK,
-    ACTIONS(295), 1,
-      anon_sym_LBRACE,
-    ACTIONS(299), 1,
-      anon_sym_not,
-    ACTIONS(305), 1,
-      anon_sym_lambda,
-    ACTIONS(313), 1,
-      anon_sym_await,
-    ACTIONS(315), 1,
-      sym__string_start,
-    STATE(600), 1,
-      sym_string,
-    STATE(630), 1,
-      sym_primary_expression,
-    STATE(921), 1,
-      sym_expression,
-    ACTIONS(309), 2,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(301), 3,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_TILDE,
-    ACTIONS(311), 4,
-      sym_integer,
-      sym_true,
-      sym_false,
-      sym_none,
-    ACTIONS(285), 5,
-      anon_sym_print,
-      anon_sym_async,
-      anon_sym_match,
-      anon_sym_exec,
-      anon_sym_type,
-    STATE(900), 7,
-      sym_named_expression,
-      sym_not_operator,
-      sym_boolean_operator,
-      sym_comparison_operator,
-      sym_lambda,
-      sym_conditional_expression,
-      sym_await,
-    STATE(642), 15,
-      sym_binary_operator,
-      sym_unary_operator,
-      sym_attribute,
-      sym_subscript,
-      sym_call,
-      sym_list,
-      sym_set,
-      sym_tuple,
-      sym_dictionary,
-      sym_list_comprehension,
-      sym_dictionary_comprehension,
-      sym_set_comprehension,
-      sym_generator_expression,
-      sym_parenthesized_expression,
-      sym_concatenated_string,
-  [26035] = 18,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(51), 1,
-      anon_sym_LBRACE,
-    ACTIONS(69), 1,
-      anon_sym_not,
-    ACTIONS(71), 1,
-      anon_sym_lambda,
-    ACTIONS(81), 1,
-      sym__string_start,
-    ACTIONS(331), 1,
-      sym_identifier,
-    ACTIONS(337), 1,
-      anon_sym_await,
-    ACTIONS(559), 1,
-      anon_sym_LPAREN,
-    ACTIONS(563), 1,
-      anon_sym_LBRACK,
-    STATE(684), 1,
-      sym_primary_expression,
-    STATE(713), 1,
-      sym_string,
-    STATE(1122), 1,
-      sym_expression,
-    ACTIONS(75), 2,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(47), 3,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_TILDE,
-    ACTIONS(77), 4,
-      sym_integer,
-      sym_true,
-      sym_false,
-      sym_none,
-    ACTIONS(333), 5,
-      anon_sym_print,
-      anon_sym_async,
-      anon_sym_match,
-      anon_sym_exec,
-      anon_sym_type,
-    STATE(1009), 7,
-      sym_named_expression,
-      sym_not_operator,
-      sym_boolean_operator,
-      sym_comparison_operator,
-      sym_lambda,
-      sym_conditional_expression,
-      sym_await,
-    STATE(797), 15,
-      sym_binary_operator,
-      sym_unary_operator,
-      sym_attribute,
-      sym_subscript,
-      sym_call,
-      sym_list,
-      sym_set,
-      sym_tuple,
-      sym_dictionary,
-      sym_list_comprehension,
-      sym_dictionary_comprehension,
-      sym_set_comprehension,
-      sym_generator_expression,
-      sym_parenthesized_expression,
-      sym_concatenated_string,
-  [26120] = 5,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(852), 1,
-      anon_sym_else,
-    STATE(525), 1,
-      sym_else_clause,
-    ACTIONS(1118), 12,
-      sym__dedent,
-      sym__string_start,
-      anon_sym_LPAREN,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_LBRACE,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_TILDE,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(1120), 33,
-      anon_sym_import,
-      anon_sym_from,
-      anon_sym_STAR,
-      anon_sym_print,
-      anon_sym_assert,
-      anon_sym_return,
-      anon_sym_del,
-      anon_sym_raise,
-      anon_sym_pass,
-      anon_sym_break,
-      anon_sym_continue,
-      anon_sym_if,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_while,
-      anon_sym_try,
-      anon_sym_with,
-      anon_sym_match,
-      anon_sym_def,
-      anon_sym_global,
-      anon_sym_nonlocal,
-      anon_sym_exec,
-      anon_sym_type,
-      anon_sym_class,
-      anon_sym_not,
-      anon_sym_lambda,
-      anon_sym_yield,
-      sym_integer,
-      sym_identifier,
-      anon_sym_await,
-      sym_true,
-      sym_false,
-      sym_none,
-  [26179] = 18,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(274), 1,
-      sym_identifier,
-    ACTIONS(278), 1,
-      anon_sym_LPAREN,
-    ACTIONS(293), 1,
-      anon_sym_LBRACK,
-    ACTIONS(295), 1,
-      anon_sym_LBRACE,
-    ACTIONS(299), 1,
-      anon_sym_not,
-    ACTIONS(305), 1,
-      anon_sym_lambda,
-    ACTIONS(313), 1,
-      anon_sym_await,
-    ACTIONS(315), 1,
-      sym__string_start,
-    STATE(600), 1,
-      sym_string,
-    STATE(630), 1,
-      sym_primary_expression,
-    STATE(1084), 1,
-      sym_expression,
-    ACTIONS(309), 2,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(301), 3,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_TILDE,
-    ACTIONS(311), 4,
-      sym_integer,
-      sym_true,
-      sym_false,
-      sym_none,
-    ACTIONS(285), 5,
-      anon_sym_print,
-      anon_sym_async,
-      anon_sym_match,
-      anon_sym_exec,
-      anon_sym_type,
-    STATE(900), 7,
-      sym_named_expression,
-      sym_not_operator,
-      sym_boolean_operator,
-      sym_comparison_operator,
-      sym_lambda,
-      sym_conditional_expression,
-      sym_await,
-    STATE(642), 15,
-      sym_binary_operator,
-      sym_unary_operator,
-      sym_attribute,
-      sym_subscript,
-      sym_call,
-      sym_list,
-      sym_set,
-      sym_tuple,
-      sym_dictionary,
-      sym_list_comprehension,
-      sym_dictionary_comprehension,
-      sym_set_comprehension,
-      sym_generator_expression,
-      sym_parenthesized_expression,
-      sym_concatenated_string,
-  [26264] = 18,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(51), 1,
-      anon_sym_LBRACE,
-    ACTIONS(69), 1,
-      anon_sym_not,
-    ACTIONS(71), 1,
-      anon_sym_lambda,
-    ACTIONS(81), 1,
-      sym__string_start,
-    ACTIONS(331), 1,
-      sym_identifier,
-    ACTIONS(337), 1,
-      anon_sym_await,
-    ACTIONS(559), 1,
-      anon_sym_LPAREN,
-    ACTIONS(563), 1,
-      anon_sym_LBRACK,
-    STATE(684), 1,
-      sym_primary_expression,
-    STATE(713), 1,
+    STATE(709), 1,
       sym_string,
     STATE(1065), 1,
       sym_expression,
@@ -47771,21 +39029,20 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(333), 5,
+    ACTIONS(329), 5,
       anon_sym_print,
       anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(1009), 7,
+    STATE(985), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-      sym_await,
-    STATE(797), 15,
+    STATE(759), 16,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -47801,7 +39058,60 @@ static const uint16_t ts_small_parse_table[] = {
       sym_generator_expression,
       sym_parenthesized_expression,
       sym_concatenated_string,
-  [26349] = 18,
+      sym_await,
+  [20078] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1121), 12,
+      sym__dedent,
+      sym__string_start,
+      anon_sym_LPAREN,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_LBRACE,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_TILDE,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(1119), 35,
+      anon_sym_import,
+      anon_sym_from,
+      anon_sym_STAR,
+      anon_sym_print,
+      anon_sym_assert,
+      anon_sym_return,
+      anon_sym_del,
+      anon_sym_raise,
+      anon_sym_pass,
+      anon_sym_break,
+      anon_sym_continue,
+      anon_sym_if,
+      anon_sym_elif,
+      anon_sym_else,
+      anon_sym_async,
+      anon_sym_for,
+      anon_sym_while,
+      anon_sym_try,
+      anon_sym_with,
+      anon_sym_match,
+      anon_sym_def,
+      anon_sym_global,
+      anon_sym_nonlocal,
+      anon_sym_exec,
+      anon_sym_type,
+      anon_sym_class,
+      anon_sym_not,
+      anon_sym_lambda,
+      anon_sym_yield,
+      sym_integer,
+      sym_identifier,
+      anon_sym_await,
+      sym_true,
+      sym_false,
+      sym_none,
+  [20133] = 18,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(51), 1,
@@ -47812,19 +39122,19 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_lambda,
     ACTIONS(81), 1,
       sym__string_start,
-    ACTIONS(331), 1,
+    ACTIONS(327), 1,
       sym_identifier,
-    ACTIONS(337), 1,
+    ACTIONS(333), 1,
       anon_sym_await,
-    ACTIONS(559), 1,
+    ACTIONS(568), 1,
       anon_sym_LPAREN,
-    ACTIONS(563), 1,
+    ACTIONS(574), 1,
       anon_sym_LBRACK,
-    STATE(684), 1,
+    STATE(707), 1,
       sym_primary_expression,
-    STATE(713), 1,
+    STATE(709), 1,
       sym_string,
-    STATE(997), 1,
+    STATE(978), 1,
       sym_expression,
     ACTIONS(75), 2,
       sym_ellipsis,
@@ -47838,21 +39148,20 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(333), 5,
+    ACTIONS(329), 5,
       anon_sym_print,
       anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(1009), 7,
+    STATE(985), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-      sym_await,
-    STATE(797), 15,
+    STATE(759), 16,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -47868,74 +39177,8 @@ static const uint16_t ts_small_parse_table[] = {
       sym_generator_expression,
       sym_parenthesized_expression,
       sym_concatenated_string,
-  [26434] = 18,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(295), 1,
-      anon_sym_LBRACE,
-    ACTIONS(315), 1,
-      sym__string_start,
-    ACTIONS(602), 1,
-      sym_identifier,
-    ACTIONS(604), 1,
-      anon_sym_LPAREN,
-    ACTIONS(612), 1,
-      anon_sym_LBRACK,
-    ACTIONS(614), 1,
-      anon_sym_not,
-    ACTIONS(616), 1,
-      anon_sym_lambda,
-    ACTIONS(618), 1,
-      anon_sym_await,
-    STATE(600), 1,
-      sym_string,
-    STATE(643), 1,
-      sym_primary_expression,
-    STATE(909), 1,
-      sym_expression,
-    ACTIONS(309), 2,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(610), 3,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_TILDE,
-    ACTIONS(311), 4,
-      sym_integer,
-      sym_true,
-      sym_false,
-      sym_none,
-    ACTIONS(606), 5,
-      anon_sym_print,
-      anon_sym_async,
-      anon_sym_match,
-      anon_sym_exec,
-      anon_sym_type,
-    STATE(900), 7,
-      sym_named_expression,
-      sym_not_operator,
-      sym_boolean_operator,
-      sym_comparison_operator,
-      sym_lambda,
-      sym_conditional_expression,
       sym_await,
-    STATE(642), 15,
-      sym_binary_operator,
-      sym_unary_operator,
-      sym_attribute,
-      sym_subscript,
-      sym_call,
-      sym_list,
-      sym_set,
-      sym_tuple,
-      sym_dictionary,
-      sym_list_comprehension,
-      sym_dictionary_comprehension,
-      sym_set_comprehension,
-      sym_generator_expression,
-      sym_parenthesized_expression,
-      sym_concatenated_string,
-  [26519] = 18,
+  [20218] = 18,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(51), 1,
@@ -47946,19 +39189,19 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_lambda,
     ACTIONS(81), 1,
       sym__string_start,
-    ACTIONS(331), 1,
+    ACTIONS(327), 1,
       sym_identifier,
-    ACTIONS(337), 1,
+    ACTIONS(333), 1,
       anon_sym_await,
-    ACTIONS(559), 1,
+    ACTIONS(568), 1,
       anon_sym_LPAREN,
-    ACTIONS(563), 1,
+    ACTIONS(574), 1,
       anon_sym_LBRACK,
-    STATE(684), 1,
+    STATE(707), 1,
       sym_primary_expression,
-    STATE(713), 1,
+    STATE(709), 1,
       sym_string,
-    STATE(1066), 1,
+    STATE(1097), 1,
       sym_expression,
     ACTIONS(75), 2,
       sym_ellipsis,
@@ -47972,21 +39215,20 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(333), 5,
+    ACTIONS(329), 5,
       anon_sym_print,
       anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(1009), 7,
+    STATE(985), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-      sym_await,
-    STATE(797), 15,
+    STATE(759), 16,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -48002,58 +39244,501 @@ static const uint16_t ts_small_parse_table[] = {
       sym_generator_expression,
       sym_parenthesized_expression,
       sym_concatenated_string,
-  [26604] = 18,
+      sym_await,
+  [20303] = 5,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(274), 1,
-      sym_identifier,
-    ACTIONS(278), 1,
+    ACTIONS(842), 1,
+      anon_sym_else,
+    STATE(502), 1,
+      sym_else_clause,
+    ACTIONS(1123), 12,
+      sym__string_start,
+      ts_builtin_sym_end,
       anon_sym_LPAREN,
-    ACTIONS(293), 1,
+      anon_sym_DASH,
+      anon_sym_PLUS,
       anon_sym_LBRACK,
-    ACTIONS(295), 1,
+      anon_sym_LBRACE,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_TILDE,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(1125), 33,
+      anon_sym_import,
+      anon_sym_from,
+      anon_sym_STAR,
+      anon_sym_print,
+      anon_sym_assert,
+      anon_sym_return,
+      anon_sym_del,
+      anon_sym_raise,
+      anon_sym_pass,
+      anon_sym_break,
+      anon_sym_continue,
+      anon_sym_if,
+      anon_sym_async,
+      anon_sym_for,
+      anon_sym_while,
+      anon_sym_try,
+      anon_sym_with,
+      anon_sym_match,
+      anon_sym_def,
+      anon_sym_global,
+      anon_sym_nonlocal,
+      anon_sym_exec,
+      anon_sym_type,
+      anon_sym_class,
+      anon_sym_not,
+      anon_sym_lambda,
+      anon_sym_yield,
+      sym_integer,
+      sym_identifier,
+      anon_sym_await,
+      sym_true,
+      sym_false,
+      sym_none,
+  [20362] = 18,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(51), 1,
+      anon_sym_LBRACE,
+    ACTIONS(69), 1,
+      anon_sym_not,
+    ACTIONS(71), 1,
+      anon_sym_lambda,
+    ACTIONS(81), 1,
+      sym__string_start,
+    ACTIONS(327), 1,
+      sym_identifier,
+    ACTIONS(333), 1,
+      anon_sym_await,
+    ACTIONS(568), 1,
+      anon_sym_LPAREN,
+    ACTIONS(574), 1,
+      anon_sym_LBRACK,
+    STATE(707), 1,
+      sym_primary_expression,
+    STATE(709), 1,
+      sym_string,
+    STATE(998), 1,
+      sym_expression,
+    ACTIONS(75), 2,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(47), 3,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_TILDE,
+    ACTIONS(77), 4,
+      sym_integer,
+      sym_true,
+      sym_false,
+      sym_none,
+    ACTIONS(329), 5,
+      anon_sym_print,
+      anon_sym_async,
+      anon_sym_match,
+      anon_sym_exec,
+      anon_sym_type,
+    STATE(985), 6,
+      sym_named_expression,
+      sym_not_operator,
+      sym_boolean_operator,
+      sym_comparison_operator,
+      sym_lambda,
+      sym_conditional_expression,
+    STATE(759), 16,
+      sym_binary_operator,
+      sym_unary_operator,
+      sym_attribute,
+      sym_subscript,
+      sym_call,
+      sym_list,
+      sym_set,
+      sym_tuple,
+      sym_dictionary,
+      sym_list_comprehension,
+      sym_dictionary_comprehension,
+      sym_set_comprehension,
+      sym_generator_expression,
+      sym_parenthesized_expression,
+      sym_concatenated_string,
+      sym_await,
+  [20447] = 18,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(258), 1,
+      sym_identifier,
+    ACTIONS(262), 1,
+      anon_sym_LPAREN,
+    ACTIONS(277), 1,
+      anon_sym_LBRACK,
+    ACTIONS(279), 1,
+      anon_sym_LBRACE,
+    ACTIONS(283), 1,
+      anon_sym_not,
+    ACTIONS(289), 1,
+      anon_sym_lambda,
+    ACTIONS(297), 1,
+      anon_sym_await,
+    ACTIONS(299), 1,
+      sym__string_start,
+    STATE(586), 1,
+      sym_string,
+    STATE(616), 1,
+      sym_primary_expression,
+    STATE(912), 1,
+      sym_expression,
+    ACTIONS(293), 2,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(285), 3,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_TILDE,
+    ACTIONS(295), 4,
+      sym_integer,
+      sym_true,
+      sym_false,
+      sym_none,
+    ACTIONS(269), 5,
+      anon_sym_print,
+      anon_sym_async,
+      anon_sym_match,
+      anon_sym_exec,
+      anon_sym_type,
+    STATE(883), 6,
+      sym_named_expression,
+      sym_not_operator,
+      sym_boolean_operator,
+      sym_comparison_operator,
+      sym_lambda,
+      sym_conditional_expression,
+    STATE(605), 16,
+      sym_binary_operator,
+      sym_unary_operator,
+      sym_attribute,
+      sym_subscript,
+      sym_call,
+      sym_list,
+      sym_set,
+      sym_tuple,
+      sym_dictionary,
+      sym_list_comprehension,
+      sym_dictionary_comprehension,
+      sym_set_comprehension,
+      sym_generator_expression,
+      sym_parenthesized_expression,
+      sym_concatenated_string,
+      sym_await,
+  [20532] = 18,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(258), 1,
+      sym_identifier,
+    ACTIONS(262), 1,
+      anon_sym_LPAREN,
+    ACTIONS(277), 1,
+      anon_sym_LBRACK,
+    ACTIONS(279), 1,
+      anon_sym_LBRACE,
+    ACTIONS(283), 1,
+      anon_sym_not,
+    ACTIONS(289), 1,
+      anon_sym_lambda,
+    ACTIONS(297), 1,
+      anon_sym_await,
+    ACTIONS(299), 1,
+      sym__string_start,
+    STATE(586), 1,
+      sym_string,
+    STATE(616), 1,
+      sym_primary_expression,
+    STATE(888), 1,
+      sym_expression,
+    ACTIONS(293), 2,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(285), 3,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_TILDE,
+    ACTIONS(295), 4,
+      sym_integer,
+      sym_true,
+      sym_false,
+      sym_none,
+    ACTIONS(269), 5,
+      anon_sym_print,
+      anon_sym_async,
+      anon_sym_match,
+      anon_sym_exec,
+      anon_sym_type,
+    STATE(883), 6,
+      sym_named_expression,
+      sym_not_operator,
+      sym_boolean_operator,
+      sym_comparison_operator,
+      sym_lambda,
+      sym_conditional_expression,
+    STATE(605), 16,
+      sym_binary_operator,
+      sym_unary_operator,
+      sym_attribute,
+      sym_subscript,
+      sym_call,
+      sym_list,
+      sym_set,
+      sym_tuple,
+      sym_dictionary,
+      sym_list_comprehension,
+      sym_dictionary_comprehension,
+      sym_set_comprehension,
+      sym_generator_expression,
+      sym_parenthesized_expression,
+      sym_concatenated_string,
+      sym_await,
+  [20617] = 18,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(51), 1,
+      anon_sym_LBRACE,
+    ACTIONS(69), 1,
+      anon_sym_not,
+    ACTIONS(71), 1,
+      anon_sym_lambda,
+    ACTIONS(81), 1,
+      sym__string_start,
+    ACTIONS(327), 1,
+      sym_identifier,
+    ACTIONS(333), 1,
+      anon_sym_await,
+    ACTIONS(568), 1,
+      anon_sym_LPAREN,
+    ACTIONS(574), 1,
+      anon_sym_LBRACK,
+    STATE(707), 1,
+      sym_primary_expression,
+    STATE(709), 1,
+      sym_string,
+    STATE(1083), 1,
+      sym_expression,
+    ACTIONS(75), 2,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(47), 3,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_TILDE,
+    ACTIONS(77), 4,
+      sym_integer,
+      sym_true,
+      sym_false,
+      sym_none,
+    ACTIONS(329), 5,
+      anon_sym_print,
+      anon_sym_async,
+      anon_sym_match,
+      anon_sym_exec,
+      anon_sym_type,
+    STATE(985), 6,
+      sym_named_expression,
+      sym_not_operator,
+      sym_boolean_operator,
+      sym_comparison_operator,
+      sym_lambda,
+      sym_conditional_expression,
+    STATE(759), 16,
+      sym_binary_operator,
+      sym_unary_operator,
+      sym_attribute,
+      sym_subscript,
+      sym_call,
+      sym_list,
+      sym_set,
+      sym_tuple,
+      sym_dictionary,
+      sym_list_comprehension,
+      sym_dictionary_comprehension,
+      sym_set_comprehension,
+      sym_generator_expression,
+      sym_parenthesized_expression,
+      sym_concatenated_string,
+      sym_await,
+  [20702] = 18,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(279), 1,
       anon_sym_LBRACE,
     ACTIONS(299), 1,
-      anon_sym_not,
-    ACTIONS(305), 1,
-      anon_sym_lambda,
-    ACTIONS(313), 1,
-      anon_sym_await,
-    ACTIONS(315), 1,
       sym__string_start,
-    STATE(600), 1,
+    ACTIONS(578), 1,
+      anon_sym_LPAREN,
+    ACTIONS(584), 1,
+      anon_sym_LBRACK,
+    ACTIONS(626), 1,
+      anon_sym_not,
+    ACTIONS(628), 1,
+      anon_sym_lambda,
+    ACTIONS(668), 1,
+      sym_identifier,
+    ACTIONS(678), 1,
+      anon_sym_await,
+    STATE(586), 1,
       sym_string,
-    STATE(630), 1,
+    STATE(590), 1,
       sym_primary_expression,
-    STATE(1159), 1,
+    STATE(1002), 1,
       sym_expression,
-    ACTIONS(309), 2,
+    ACTIONS(293), 2,
       sym_ellipsis,
       sym_float,
-    ACTIONS(301), 3,
+    ACTIONS(582), 3,
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
-    ACTIONS(311), 4,
+    ACTIONS(295), 4,
       sym_integer,
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(285), 5,
+    ACTIONS(674), 5,
       anon_sym_print,
       anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(900), 7,
+    STATE(883), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
+    STATE(605), 16,
+      sym_binary_operator,
+      sym_unary_operator,
+      sym_attribute,
+      sym_subscript,
+      sym_call,
+      sym_list,
+      sym_set,
+      sym_tuple,
+      sym_dictionary,
+      sym_list_comprehension,
+      sym_dictionary_comprehension,
+      sym_set_comprehension,
+      sym_generator_expression,
+      sym_parenthesized_expression,
+      sym_concatenated_string,
       sym_await,
-    STATE(642), 15,
+  [20787] = 5,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(822), 1,
+      anon_sym_else,
+    STATE(547), 1,
+      sym_else_clause,
+    ACTIONS(1129), 12,
+      sym__dedent,
+      sym__string_start,
+      anon_sym_LPAREN,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_LBRACE,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_TILDE,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(1127), 33,
+      anon_sym_import,
+      anon_sym_from,
+      anon_sym_STAR,
+      anon_sym_print,
+      anon_sym_assert,
+      anon_sym_return,
+      anon_sym_del,
+      anon_sym_raise,
+      anon_sym_pass,
+      anon_sym_break,
+      anon_sym_continue,
+      anon_sym_if,
+      anon_sym_async,
+      anon_sym_for,
+      anon_sym_while,
+      anon_sym_try,
+      anon_sym_with,
+      anon_sym_match,
+      anon_sym_def,
+      anon_sym_global,
+      anon_sym_nonlocal,
+      anon_sym_exec,
+      anon_sym_type,
+      anon_sym_class,
+      anon_sym_not,
+      anon_sym_lambda,
+      anon_sym_yield,
+      sym_integer,
+      sym_identifier,
+      anon_sym_await,
+      sym_true,
+      sym_false,
+      sym_none,
+  [20846] = 18,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(258), 1,
+      sym_identifier,
+    ACTIONS(262), 1,
+      anon_sym_LPAREN,
+    ACTIONS(277), 1,
+      anon_sym_LBRACK,
+    ACTIONS(279), 1,
+      anon_sym_LBRACE,
+    ACTIONS(283), 1,
+      anon_sym_not,
+    ACTIONS(289), 1,
+      anon_sym_lambda,
+    ACTIONS(297), 1,
+      anon_sym_await,
+    ACTIONS(299), 1,
+      sym__string_start,
+    STATE(586), 1,
+      sym_string,
+    STATE(616), 1,
+      sym_primary_expression,
+    STATE(1175), 1,
+      sym_expression,
+    ACTIONS(293), 2,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(285), 3,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_TILDE,
+    ACTIONS(295), 4,
+      sym_integer,
+      sym_true,
+      sym_false,
+      sym_none,
+    ACTIONS(269), 5,
+      anon_sym_print,
+      anon_sym_async,
+      anon_sym_match,
+      anon_sym_exec,
+      anon_sym_type,
+    STATE(883), 6,
+      sym_named_expression,
+      sym_not_operator,
+      sym_boolean_operator,
+      sym_comparison_operator,
+      sym_lambda,
+      sym_conditional_expression,
+    STATE(605), 16,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -48069,10 +39754,268 @@ static const uint16_t ts_small_parse_table[] = {
       sym_generator_expression,
       sym_parenthesized_expression,
       sym_concatenated_string,
-  [26689] = 3,
+      sym_await,
+  [20931] = 18,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1178), 12,
+    ACTIONS(258), 1,
+      sym_identifier,
+    ACTIONS(262), 1,
+      anon_sym_LPAREN,
+    ACTIONS(277), 1,
+      anon_sym_LBRACK,
+    ACTIONS(279), 1,
+      anon_sym_LBRACE,
+    ACTIONS(283), 1,
+      anon_sym_not,
+    ACTIONS(289), 1,
+      anon_sym_lambda,
+    ACTIONS(297), 1,
+      anon_sym_await,
+    ACTIONS(299), 1,
+      sym__string_start,
+    STATE(586), 1,
+      sym_string,
+    STATE(616), 1,
+      sym_primary_expression,
+    STATE(1122), 1,
+      sym_expression,
+    ACTIONS(293), 2,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(285), 3,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_TILDE,
+    ACTIONS(295), 4,
+      sym_integer,
+      sym_true,
+      sym_false,
+      sym_none,
+    ACTIONS(269), 5,
+      anon_sym_print,
+      anon_sym_async,
+      anon_sym_match,
+      anon_sym_exec,
+      anon_sym_type,
+    STATE(883), 6,
+      sym_named_expression,
+      sym_not_operator,
+      sym_boolean_operator,
+      sym_comparison_operator,
+      sym_lambda,
+      sym_conditional_expression,
+    STATE(605), 16,
+      sym_binary_operator,
+      sym_unary_operator,
+      sym_attribute,
+      sym_subscript,
+      sym_call,
+      sym_list,
+      sym_set,
+      sym_tuple,
+      sym_dictionary,
+      sym_list_comprehension,
+      sym_dictionary_comprehension,
+      sym_set_comprehension,
+      sym_generator_expression,
+      sym_parenthesized_expression,
+      sym_concatenated_string,
+      sym_await,
+  [21016] = 18,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(51), 1,
+      anon_sym_LBRACE,
+    ACTIONS(69), 1,
+      anon_sym_not,
+    ACTIONS(71), 1,
+      anon_sym_lambda,
+    ACTIONS(81), 1,
+      sym__string_start,
+    ACTIONS(327), 1,
+      sym_identifier,
+    ACTIONS(333), 1,
+      anon_sym_await,
+    ACTIONS(568), 1,
+      anon_sym_LPAREN,
+    ACTIONS(574), 1,
+      anon_sym_LBRACK,
+    STATE(707), 1,
+      sym_primary_expression,
+    STATE(709), 1,
+      sym_string,
+    STATE(979), 1,
+      sym_expression,
+    ACTIONS(75), 2,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(47), 3,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_TILDE,
+    ACTIONS(77), 4,
+      sym_integer,
+      sym_true,
+      sym_false,
+      sym_none,
+    ACTIONS(329), 5,
+      anon_sym_print,
+      anon_sym_async,
+      anon_sym_match,
+      anon_sym_exec,
+      anon_sym_type,
+    STATE(985), 6,
+      sym_named_expression,
+      sym_not_operator,
+      sym_boolean_operator,
+      sym_comparison_operator,
+      sym_lambda,
+      sym_conditional_expression,
+    STATE(759), 16,
+      sym_binary_operator,
+      sym_unary_operator,
+      sym_attribute,
+      sym_subscript,
+      sym_call,
+      sym_list,
+      sym_set,
+      sym_tuple,
+      sym_dictionary,
+      sym_list_comprehension,
+      sym_dictionary_comprehension,
+      sym_set_comprehension,
+      sym_generator_expression,
+      sym_parenthesized_expression,
+      sym_concatenated_string,
+      sym_await,
+  [21101] = 18,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(258), 1,
+      sym_identifier,
+    ACTIONS(262), 1,
+      anon_sym_LPAREN,
+    ACTIONS(277), 1,
+      anon_sym_LBRACK,
+    ACTIONS(279), 1,
+      anon_sym_LBRACE,
+    ACTIONS(283), 1,
+      anon_sym_not,
+    ACTIONS(289), 1,
+      anon_sym_lambda,
+    ACTIONS(297), 1,
+      anon_sym_await,
+    ACTIONS(299), 1,
+      sym__string_start,
+    STATE(586), 1,
+      sym_string,
+    STATE(616), 1,
+      sym_primary_expression,
+    STATE(1064), 1,
+      sym_expression,
+    ACTIONS(293), 2,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(285), 3,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_TILDE,
+    ACTIONS(295), 4,
+      sym_integer,
+      sym_true,
+      sym_false,
+      sym_none,
+    ACTIONS(269), 5,
+      anon_sym_print,
+      anon_sym_async,
+      anon_sym_match,
+      anon_sym_exec,
+      anon_sym_type,
+    STATE(883), 6,
+      sym_named_expression,
+      sym_not_operator,
+      sym_boolean_operator,
+      sym_comparison_operator,
+      sym_lambda,
+      sym_conditional_expression,
+    STATE(605), 16,
+      sym_binary_operator,
+      sym_unary_operator,
+      sym_attribute,
+      sym_subscript,
+      sym_call,
+      sym_list,
+      sym_set,
+      sym_tuple,
+      sym_dictionary,
+      sym_list_comprehension,
+      sym_dictionary_comprehension,
+      sym_set_comprehension,
+      sym_generator_expression,
+      sym_parenthesized_expression,
+      sym_concatenated_string,
+      sym_await,
+  [21186] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1102), 12,
+      sym__string_start,
+      ts_builtin_sym_end,
+      anon_sym_LPAREN,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_LBRACE,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_TILDE,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(1100), 35,
+      anon_sym_import,
+      anon_sym_from,
+      anon_sym_STAR,
+      anon_sym_print,
+      anon_sym_assert,
+      anon_sym_return,
+      anon_sym_del,
+      anon_sym_raise,
+      anon_sym_pass,
+      anon_sym_break,
+      anon_sym_continue,
+      anon_sym_if,
+      anon_sym_elif,
+      anon_sym_else,
+      anon_sym_async,
+      anon_sym_for,
+      anon_sym_while,
+      anon_sym_try,
+      anon_sym_with,
+      anon_sym_match,
+      anon_sym_def,
+      anon_sym_global,
+      anon_sym_nonlocal,
+      anon_sym_exec,
+      anon_sym_type,
+      anon_sym_class,
+      anon_sym_not,
+      anon_sym_lambda,
+      anon_sym_yield,
+      sym_integer,
+      sym_identifier,
+      anon_sym_await,
+      sym_true,
+      sym_false,
+      sym_none,
+  [21241] = 5,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(822), 1,
+      anon_sym_else,
+    STATE(507), 1,
+      sym_else_clause,
+    ACTIONS(1133), 12,
       sym__dedent,
       sym__string_start,
       anon_sym_LPAREN,
@@ -48085,7 +40028,3933 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_TILDE,
       sym_ellipsis,
       sym_float,
-    ACTIONS(1176), 34,
+    ACTIONS(1131), 33,
+      anon_sym_import,
+      anon_sym_from,
+      anon_sym_STAR,
+      anon_sym_print,
+      anon_sym_assert,
+      anon_sym_return,
+      anon_sym_del,
+      anon_sym_raise,
+      anon_sym_pass,
+      anon_sym_break,
+      anon_sym_continue,
+      anon_sym_if,
+      anon_sym_async,
+      anon_sym_for,
+      anon_sym_while,
+      anon_sym_try,
+      anon_sym_with,
+      anon_sym_match,
+      anon_sym_def,
+      anon_sym_global,
+      anon_sym_nonlocal,
+      anon_sym_exec,
+      anon_sym_type,
+      anon_sym_class,
+      anon_sym_not,
+      anon_sym_lambda,
+      anon_sym_yield,
+      sym_integer,
+      sym_identifier,
+      anon_sym_await,
+      sym_true,
+      sym_false,
+      sym_none,
+  [21300] = 5,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(842), 1,
+      anon_sym_else,
+    STATE(504), 1,
+      sym_else_clause,
+    ACTIONS(1098), 12,
+      sym__string_start,
+      ts_builtin_sym_end,
+      anon_sym_LPAREN,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_LBRACE,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_TILDE,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(1096), 33,
+      anon_sym_import,
+      anon_sym_from,
+      anon_sym_STAR,
+      anon_sym_print,
+      anon_sym_assert,
+      anon_sym_return,
+      anon_sym_del,
+      anon_sym_raise,
+      anon_sym_pass,
+      anon_sym_break,
+      anon_sym_continue,
+      anon_sym_if,
+      anon_sym_async,
+      anon_sym_for,
+      anon_sym_while,
+      anon_sym_try,
+      anon_sym_with,
+      anon_sym_match,
+      anon_sym_def,
+      anon_sym_global,
+      anon_sym_nonlocal,
+      anon_sym_exec,
+      anon_sym_type,
+      anon_sym_class,
+      anon_sym_not,
+      anon_sym_lambda,
+      anon_sym_yield,
+      sym_integer,
+      sym_identifier,
+      anon_sym_await,
+      sym_true,
+      sym_false,
+      sym_none,
+  [21359] = 18,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(592), 1,
+      anon_sym_LPAREN,
+    ACTIONS(600), 1,
+      anon_sym_LBRACK,
+    ACTIONS(602), 1,
+      anon_sym_LBRACE,
+    ACTIONS(608), 1,
+      sym__string_start,
+    ACTIONS(977), 1,
+      sym_identifier,
+    ACTIONS(985), 1,
+      anon_sym_not,
+    ACTIONS(987), 1,
+      anon_sym_lambda,
+    ACTIONS(989), 1,
+      anon_sym_await,
+    STATE(713), 1,
+      sym_string,
+    STATE(726), 1,
+      sym_primary_expression,
+    STATE(1084), 1,
+      sym_expression,
+    ACTIONS(604), 2,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(598), 3,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_TILDE,
+    ACTIONS(590), 4,
+      sym_integer,
+      sym_true,
+      sym_false,
+      sym_none,
+    ACTIONS(981), 5,
+      anon_sym_print,
+      anon_sym_async,
+      anon_sym_match,
+      anon_sym_exec,
+      anon_sym_type,
+    STATE(1003), 6,
+      sym_named_expression,
+      sym_not_operator,
+      sym_boolean_operator,
+      sym_comparison_operator,
+      sym_lambda,
+      sym_conditional_expression,
+    STATE(827), 16,
+      sym_binary_operator,
+      sym_unary_operator,
+      sym_attribute,
+      sym_subscript,
+      sym_call,
+      sym_list,
+      sym_set,
+      sym_tuple,
+      sym_dictionary,
+      sym_list_comprehension,
+      sym_dictionary_comprehension,
+      sym_set_comprehension,
+      sym_generator_expression,
+      sym_parenthesized_expression,
+      sym_concatenated_string,
+      sym_await,
+  [21444] = 18,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(51), 1,
+      anon_sym_LBRACE,
+    ACTIONS(69), 1,
+      anon_sym_not,
+    ACTIONS(71), 1,
+      anon_sym_lambda,
+    ACTIONS(81), 1,
+      sym__string_start,
+    ACTIONS(327), 1,
+      sym_identifier,
+    ACTIONS(333), 1,
+      anon_sym_await,
+    ACTIONS(568), 1,
+      anon_sym_LPAREN,
+    ACTIONS(574), 1,
+      anon_sym_LBRACK,
+    STATE(707), 1,
+      sym_primary_expression,
+    STATE(709), 1,
+      sym_string,
+    STATE(956), 1,
+      sym_expression,
+    ACTIONS(75), 2,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(47), 3,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_TILDE,
+    ACTIONS(77), 4,
+      sym_integer,
+      sym_true,
+      sym_false,
+      sym_none,
+    ACTIONS(329), 5,
+      anon_sym_print,
+      anon_sym_async,
+      anon_sym_match,
+      anon_sym_exec,
+      anon_sym_type,
+    STATE(985), 6,
+      sym_named_expression,
+      sym_not_operator,
+      sym_boolean_operator,
+      sym_comparison_operator,
+      sym_lambda,
+      sym_conditional_expression,
+    STATE(759), 16,
+      sym_binary_operator,
+      sym_unary_operator,
+      sym_attribute,
+      sym_subscript,
+      sym_call,
+      sym_list,
+      sym_set,
+      sym_tuple,
+      sym_dictionary,
+      sym_list_comprehension,
+      sym_dictionary_comprehension,
+      sym_set_comprehension,
+      sym_generator_expression,
+      sym_parenthesized_expression,
+      sym_concatenated_string,
+      sym_await,
+  [21529] = 18,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(51), 1,
+      anon_sym_LBRACE,
+    ACTIONS(69), 1,
+      anon_sym_not,
+    ACTIONS(71), 1,
+      anon_sym_lambda,
+    ACTIONS(81), 1,
+      sym__string_start,
+    ACTIONS(327), 1,
+      sym_identifier,
+    ACTIONS(333), 1,
+      anon_sym_await,
+    ACTIONS(568), 1,
+      anon_sym_LPAREN,
+    ACTIONS(574), 1,
+      anon_sym_LBRACK,
+    STATE(707), 1,
+      sym_primary_expression,
+    STATE(709), 1,
+      sym_string,
+    STATE(950), 1,
+      sym_expression,
+    ACTIONS(75), 2,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(47), 3,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_TILDE,
+    ACTIONS(77), 4,
+      sym_integer,
+      sym_true,
+      sym_false,
+      sym_none,
+    ACTIONS(329), 5,
+      anon_sym_print,
+      anon_sym_async,
+      anon_sym_match,
+      anon_sym_exec,
+      anon_sym_type,
+    STATE(985), 6,
+      sym_named_expression,
+      sym_not_operator,
+      sym_boolean_operator,
+      sym_comparison_operator,
+      sym_lambda,
+      sym_conditional_expression,
+    STATE(759), 16,
+      sym_binary_operator,
+      sym_unary_operator,
+      sym_attribute,
+      sym_subscript,
+      sym_call,
+      sym_list,
+      sym_set,
+      sym_tuple,
+      sym_dictionary,
+      sym_list_comprehension,
+      sym_dictionary_comprehension,
+      sym_set_comprehension,
+      sym_generator_expression,
+      sym_parenthesized_expression,
+      sym_concatenated_string,
+      sym_await,
+  [21614] = 18,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(258), 1,
+      sym_identifier,
+    ACTIONS(262), 1,
+      anon_sym_LPAREN,
+    ACTIONS(277), 1,
+      anon_sym_LBRACK,
+    ACTIONS(279), 1,
+      anon_sym_LBRACE,
+    ACTIONS(283), 1,
+      anon_sym_not,
+    ACTIONS(289), 1,
+      anon_sym_lambda,
+    ACTIONS(297), 1,
+      anon_sym_await,
+    ACTIONS(299), 1,
+      sym__string_start,
+    STATE(586), 1,
+      sym_string,
+    STATE(616), 1,
+      sym_primary_expression,
+    STATE(1110), 1,
+      sym_expression,
+    ACTIONS(293), 2,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(285), 3,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_TILDE,
+    ACTIONS(295), 4,
+      sym_integer,
+      sym_true,
+      sym_false,
+      sym_none,
+    ACTIONS(269), 5,
+      anon_sym_print,
+      anon_sym_async,
+      anon_sym_match,
+      anon_sym_exec,
+      anon_sym_type,
+    STATE(883), 6,
+      sym_named_expression,
+      sym_not_operator,
+      sym_boolean_operator,
+      sym_comparison_operator,
+      sym_lambda,
+      sym_conditional_expression,
+    STATE(605), 16,
+      sym_binary_operator,
+      sym_unary_operator,
+      sym_attribute,
+      sym_subscript,
+      sym_call,
+      sym_list,
+      sym_set,
+      sym_tuple,
+      sym_dictionary,
+      sym_list_comprehension,
+      sym_dictionary_comprehension,
+      sym_set_comprehension,
+      sym_generator_expression,
+      sym_parenthesized_expression,
+      sym_concatenated_string,
+      sym_await,
+  [21699] = 18,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(592), 1,
+      anon_sym_LPAREN,
+    ACTIONS(600), 1,
+      anon_sym_LBRACK,
+    ACTIONS(602), 1,
+      anon_sym_LBRACE,
+    ACTIONS(608), 1,
+      sym__string_start,
+    ACTIONS(977), 1,
+      sym_identifier,
+    ACTIONS(985), 1,
+      anon_sym_not,
+    ACTIONS(987), 1,
+      anon_sym_lambda,
+    ACTIONS(989), 1,
+      anon_sym_await,
+    STATE(713), 1,
+      sym_string,
+    STATE(726), 1,
+      sym_primary_expression,
+    STATE(1007), 1,
+      sym_expression,
+    ACTIONS(604), 2,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(598), 3,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_TILDE,
+    ACTIONS(590), 4,
+      sym_integer,
+      sym_true,
+      sym_false,
+      sym_none,
+    ACTIONS(981), 5,
+      anon_sym_print,
+      anon_sym_async,
+      anon_sym_match,
+      anon_sym_exec,
+      anon_sym_type,
+    STATE(1003), 6,
+      sym_named_expression,
+      sym_not_operator,
+      sym_boolean_operator,
+      sym_comparison_operator,
+      sym_lambda,
+      sym_conditional_expression,
+    STATE(827), 16,
+      sym_binary_operator,
+      sym_unary_operator,
+      sym_attribute,
+      sym_subscript,
+      sym_call,
+      sym_list,
+      sym_set,
+      sym_tuple,
+      sym_dictionary,
+      sym_list_comprehension,
+      sym_dictionary_comprehension,
+      sym_set_comprehension,
+      sym_generator_expression,
+      sym_parenthesized_expression,
+      sym_concatenated_string,
+      sym_await,
+  [21784] = 18,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(258), 1,
+      sym_identifier,
+    ACTIONS(262), 1,
+      anon_sym_LPAREN,
+    ACTIONS(277), 1,
+      anon_sym_LBRACK,
+    ACTIONS(279), 1,
+      anon_sym_LBRACE,
+    ACTIONS(283), 1,
+      anon_sym_not,
+    ACTIONS(289), 1,
+      anon_sym_lambda,
+    ACTIONS(297), 1,
+      anon_sym_await,
+    ACTIONS(299), 1,
+      sym__string_start,
+    STATE(586), 1,
+      sym_string,
+    STATE(616), 1,
+      sym_primary_expression,
+    STATE(914), 1,
+      sym_expression,
+    ACTIONS(293), 2,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(285), 3,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_TILDE,
+    ACTIONS(295), 4,
+      sym_integer,
+      sym_true,
+      sym_false,
+      sym_none,
+    ACTIONS(269), 5,
+      anon_sym_print,
+      anon_sym_async,
+      anon_sym_match,
+      anon_sym_exec,
+      anon_sym_type,
+    STATE(883), 6,
+      sym_named_expression,
+      sym_not_operator,
+      sym_boolean_operator,
+      sym_comparison_operator,
+      sym_lambda,
+      sym_conditional_expression,
+    STATE(605), 16,
+      sym_binary_operator,
+      sym_unary_operator,
+      sym_attribute,
+      sym_subscript,
+      sym_call,
+      sym_list,
+      sym_set,
+      sym_tuple,
+      sym_dictionary,
+      sym_list_comprehension,
+      sym_dictionary_comprehension,
+      sym_set_comprehension,
+      sym_generator_expression,
+      sym_parenthesized_expression,
+      sym_concatenated_string,
+      sym_await,
+  [21869] = 18,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(279), 1,
+      anon_sym_LBRACE,
+    ACTIONS(299), 1,
+      sym__string_start,
+    ACTIONS(578), 1,
+      anon_sym_LPAREN,
+    ACTIONS(584), 1,
+      anon_sym_LBRACK,
+    ACTIONS(626), 1,
+      anon_sym_not,
+    ACTIONS(628), 1,
+      anon_sym_lambda,
+    ACTIONS(668), 1,
+      sym_identifier,
+    ACTIONS(678), 1,
+      anon_sym_await,
+    STATE(586), 1,
+      sym_string,
+    STATE(590), 1,
+      sym_primary_expression,
+    STATE(904), 1,
+      sym_expression,
+    ACTIONS(293), 2,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(582), 3,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_TILDE,
+    ACTIONS(295), 4,
+      sym_integer,
+      sym_true,
+      sym_false,
+      sym_none,
+    ACTIONS(674), 5,
+      anon_sym_print,
+      anon_sym_async,
+      anon_sym_match,
+      anon_sym_exec,
+      anon_sym_type,
+    STATE(883), 6,
+      sym_named_expression,
+      sym_not_operator,
+      sym_boolean_operator,
+      sym_comparison_operator,
+      sym_lambda,
+      sym_conditional_expression,
+    STATE(605), 16,
+      sym_binary_operator,
+      sym_unary_operator,
+      sym_attribute,
+      sym_subscript,
+      sym_call,
+      sym_list,
+      sym_set,
+      sym_tuple,
+      sym_dictionary,
+      sym_list_comprehension,
+      sym_dictionary_comprehension,
+      sym_set_comprehension,
+      sym_generator_expression,
+      sym_parenthesized_expression,
+      sym_concatenated_string,
+      sym_await,
+  [21954] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1137), 12,
+      sym__dedent,
+      sym__string_start,
+      anon_sym_LPAREN,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_LBRACE,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_TILDE,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(1135), 35,
+      anon_sym_import,
+      anon_sym_from,
+      anon_sym_STAR,
+      anon_sym_print,
+      anon_sym_assert,
+      anon_sym_return,
+      anon_sym_del,
+      anon_sym_raise,
+      anon_sym_pass,
+      anon_sym_break,
+      anon_sym_continue,
+      anon_sym_if,
+      anon_sym_elif,
+      anon_sym_else,
+      anon_sym_async,
+      anon_sym_for,
+      anon_sym_while,
+      anon_sym_try,
+      anon_sym_with,
+      anon_sym_match,
+      anon_sym_def,
+      anon_sym_global,
+      anon_sym_nonlocal,
+      anon_sym_exec,
+      anon_sym_type,
+      anon_sym_class,
+      anon_sym_not,
+      anon_sym_lambda,
+      anon_sym_yield,
+      sym_integer,
+      sym_identifier,
+      anon_sym_await,
+      sym_true,
+      sym_false,
+      sym_none,
+  [22009] = 5,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(822), 1,
+      anon_sym_else,
+    STATE(518), 1,
+      sym_else_clause,
+    ACTIONS(1123), 12,
+      sym__dedent,
+      sym__string_start,
+      anon_sym_LPAREN,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_LBRACE,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_TILDE,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(1125), 33,
+      anon_sym_import,
+      anon_sym_from,
+      anon_sym_STAR,
+      anon_sym_print,
+      anon_sym_assert,
+      anon_sym_return,
+      anon_sym_del,
+      anon_sym_raise,
+      anon_sym_pass,
+      anon_sym_break,
+      anon_sym_continue,
+      anon_sym_if,
+      anon_sym_async,
+      anon_sym_for,
+      anon_sym_while,
+      anon_sym_try,
+      anon_sym_with,
+      anon_sym_match,
+      anon_sym_def,
+      anon_sym_global,
+      anon_sym_nonlocal,
+      anon_sym_exec,
+      anon_sym_type,
+      anon_sym_class,
+      anon_sym_not,
+      anon_sym_lambda,
+      anon_sym_yield,
+      sym_integer,
+      sym_identifier,
+      anon_sym_await,
+      sym_true,
+      sym_false,
+      sym_none,
+  [22068] = 18,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(258), 1,
+      sym_identifier,
+    ACTIONS(262), 1,
+      anon_sym_LPAREN,
+    ACTIONS(277), 1,
+      anon_sym_LBRACK,
+    ACTIONS(279), 1,
+      anon_sym_LBRACE,
+    ACTIONS(283), 1,
+      anon_sym_not,
+    ACTIONS(289), 1,
+      anon_sym_lambda,
+    ACTIONS(297), 1,
+      anon_sym_await,
+    ACTIONS(299), 1,
+      sym__string_start,
+    STATE(586), 1,
+      sym_string,
+    STATE(616), 1,
+      sym_primary_expression,
+    STATE(882), 1,
+      sym_expression,
+    ACTIONS(293), 2,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(285), 3,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_TILDE,
+    ACTIONS(295), 4,
+      sym_integer,
+      sym_true,
+      sym_false,
+      sym_none,
+    ACTIONS(269), 5,
+      anon_sym_print,
+      anon_sym_async,
+      anon_sym_match,
+      anon_sym_exec,
+      anon_sym_type,
+    STATE(883), 6,
+      sym_named_expression,
+      sym_not_operator,
+      sym_boolean_operator,
+      sym_comparison_operator,
+      sym_lambda,
+      sym_conditional_expression,
+    STATE(605), 16,
+      sym_binary_operator,
+      sym_unary_operator,
+      sym_attribute,
+      sym_subscript,
+      sym_call,
+      sym_list,
+      sym_set,
+      sym_tuple,
+      sym_dictionary,
+      sym_list_comprehension,
+      sym_dictionary_comprehension,
+      sym_set_comprehension,
+      sym_generator_expression,
+      sym_parenthesized_expression,
+      sym_concatenated_string,
+      sym_await,
+  [22153] = 18,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(258), 1,
+      sym_identifier,
+    ACTIONS(262), 1,
+      anon_sym_LPAREN,
+    ACTIONS(277), 1,
+      anon_sym_LBRACK,
+    ACTIONS(279), 1,
+      anon_sym_LBRACE,
+    ACTIONS(283), 1,
+      anon_sym_not,
+    ACTIONS(289), 1,
+      anon_sym_lambda,
+    ACTIONS(297), 1,
+      anon_sym_await,
+    ACTIONS(299), 1,
+      sym__string_start,
+    STATE(586), 1,
+      sym_string,
+    STATE(616), 1,
+      sym_primary_expression,
+    STATE(1045), 1,
+      sym_expression,
+    ACTIONS(293), 2,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(285), 3,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_TILDE,
+    ACTIONS(295), 4,
+      sym_integer,
+      sym_true,
+      sym_false,
+      sym_none,
+    ACTIONS(269), 5,
+      anon_sym_print,
+      anon_sym_async,
+      anon_sym_match,
+      anon_sym_exec,
+      anon_sym_type,
+    STATE(883), 6,
+      sym_named_expression,
+      sym_not_operator,
+      sym_boolean_operator,
+      sym_comparison_operator,
+      sym_lambda,
+      sym_conditional_expression,
+    STATE(605), 16,
+      sym_binary_operator,
+      sym_unary_operator,
+      sym_attribute,
+      sym_subscript,
+      sym_call,
+      sym_list,
+      sym_set,
+      sym_tuple,
+      sym_dictionary,
+      sym_list_comprehension,
+      sym_dictionary_comprehension,
+      sym_set_comprehension,
+      sym_generator_expression,
+      sym_parenthesized_expression,
+      sym_concatenated_string,
+      sym_await,
+  [22238] = 18,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(279), 1,
+      anon_sym_LBRACE,
+    ACTIONS(299), 1,
+      sym__string_start,
+    ACTIONS(578), 1,
+      anon_sym_LPAREN,
+    ACTIONS(584), 1,
+      anon_sym_LBRACK,
+    ACTIONS(626), 1,
+      anon_sym_not,
+    ACTIONS(628), 1,
+      anon_sym_lambda,
+    ACTIONS(668), 1,
+      sym_identifier,
+    ACTIONS(678), 1,
+      anon_sym_await,
+    STATE(586), 1,
+      sym_string,
+    STATE(590), 1,
+      sym_primary_expression,
+    STATE(908), 1,
+      sym_expression,
+    ACTIONS(293), 2,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(582), 3,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_TILDE,
+    ACTIONS(295), 4,
+      sym_integer,
+      sym_true,
+      sym_false,
+      sym_none,
+    ACTIONS(674), 5,
+      anon_sym_print,
+      anon_sym_async,
+      anon_sym_match,
+      anon_sym_exec,
+      anon_sym_type,
+    STATE(883), 6,
+      sym_named_expression,
+      sym_not_operator,
+      sym_boolean_operator,
+      sym_comparison_operator,
+      sym_lambda,
+      sym_conditional_expression,
+    STATE(605), 16,
+      sym_binary_operator,
+      sym_unary_operator,
+      sym_attribute,
+      sym_subscript,
+      sym_call,
+      sym_list,
+      sym_set,
+      sym_tuple,
+      sym_dictionary,
+      sym_list_comprehension,
+      sym_dictionary_comprehension,
+      sym_set_comprehension,
+      sym_generator_expression,
+      sym_parenthesized_expression,
+      sym_concatenated_string,
+      sym_await,
+  [22323] = 18,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(592), 1,
+      anon_sym_LPAREN,
+    ACTIONS(600), 1,
+      anon_sym_LBRACK,
+    ACTIONS(602), 1,
+      anon_sym_LBRACE,
+    ACTIONS(608), 1,
+      sym__string_start,
+    ACTIONS(977), 1,
+      sym_identifier,
+    ACTIONS(985), 1,
+      anon_sym_not,
+    ACTIONS(987), 1,
+      anon_sym_lambda,
+    ACTIONS(989), 1,
+      anon_sym_await,
+    STATE(713), 1,
+      sym_string,
+    STATE(726), 1,
+      sym_primary_expression,
+    STATE(1008), 1,
+      sym_expression,
+    ACTIONS(604), 2,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(598), 3,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_TILDE,
+    ACTIONS(590), 4,
+      sym_integer,
+      sym_true,
+      sym_false,
+      sym_none,
+    ACTIONS(981), 5,
+      anon_sym_print,
+      anon_sym_async,
+      anon_sym_match,
+      anon_sym_exec,
+      anon_sym_type,
+    STATE(1003), 6,
+      sym_named_expression,
+      sym_not_operator,
+      sym_boolean_operator,
+      sym_comparison_operator,
+      sym_lambda,
+      sym_conditional_expression,
+    STATE(827), 16,
+      sym_binary_operator,
+      sym_unary_operator,
+      sym_attribute,
+      sym_subscript,
+      sym_call,
+      sym_list,
+      sym_set,
+      sym_tuple,
+      sym_dictionary,
+      sym_list_comprehension,
+      sym_dictionary_comprehension,
+      sym_set_comprehension,
+      sym_generator_expression,
+      sym_parenthesized_expression,
+      sym_concatenated_string,
+      sym_await,
+  [22408] = 5,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(822), 1,
+      anon_sym_else,
+    STATE(562), 1,
+      sym_else_clause,
+    ACTIONS(1141), 12,
+      sym__dedent,
+      sym__string_start,
+      anon_sym_LPAREN,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_LBRACE,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_TILDE,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(1139), 33,
+      anon_sym_import,
+      anon_sym_from,
+      anon_sym_STAR,
+      anon_sym_print,
+      anon_sym_assert,
+      anon_sym_return,
+      anon_sym_del,
+      anon_sym_raise,
+      anon_sym_pass,
+      anon_sym_break,
+      anon_sym_continue,
+      anon_sym_if,
+      anon_sym_async,
+      anon_sym_for,
+      anon_sym_while,
+      anon_sym_try,
+      anon_sym_with,
+      anon_sym_match,
+      anon_sym_def,
+      anon_sym_global,
+      anon_sym_nonlocal,
+      anon_sym_exec,
+      anon_sym_type,
+      anon_sym_class,
+      anon_sym_not,
+      anon_sym_lambda,
+      anon_sym_yield,
+      sym_integer,
+      sym_identifier,
+      anon_sym_await,
+      sym_true,
+      sym_false,
+      sym_none,
+  [22467] = 18,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(592), 1,
+      anon_sym_LPAREN,
+    ACTIONS(600), 1,
+      anon_sym_LBRACK,
+    ACTIONS(602), 1,
+      anon_sym_LBRACE,
+    ACTIONS(608), 1,
+      sym__string_start,
+    ACTIONS(977), 1,
+      sym_identifier,
+    ACTIONS(985), 1,
+      anon_sym_not,
+    ACTIONS(987), 1,
+      anon_sym_lambda,
+    ACTIONS(989), 1,
+      anon_sym_await,
+    STATE(713), 1,
+      sym_string,
+    STATE(726), 1,
+      sym_primary_expression,
+    STATE(1009), 1,
+      sym_expression,
+    ACTIONS(604), 2,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(598), 3,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_TILDE,
+    ACTIONS(590), 4,
+      sym_integer,
+      sym_true,
+      sym_false,
+      sym_none,
+    ACTIONS(981), 5,
+      anon_sym_print,
+      anon_sym_async,
+      anon_sym_match,
+      anon_sym_exec,
+      anon_sym_type,
+    STATE(1003), 6,
+      sym_named_expression,
+      sym_not_operator,
+      sym_boolean_operator,
+      sym_comparison_operator,
+      sym_lambda,
+      sym_conditional_expression,
+    STATE(827), 16,
+      sym_binary_operator,
+      sym_unary_operator,
+      sym_attribute,
+      sym_subscript,
+      sym_call,
+      sym_list,
+      sym_set,
+      sym_tuple,
+      sym_dictionary,
+      sym_list_comprehension,
+      sym_dictionary_comprehension,
+      sym_set_comprehension,
+      sym_generator_expression,
+      sym_parenthesized_expression,
+      sym_concatenated_string,
+      sym_await,
+  [22552] = 5,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(842), 1,
+      anon_sym_else,
+    STATE(533), 1,
+      sym_else_clause,
+    ACTIONS(1133), 12,
+      sym__string_start,
+      ts_builtin_sym_end,
+      anon_sym_LPAREN,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_LBRACE,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_TILDE,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(1131), 33,
+      anon_sym_import,
+      anon_sym_from,
+      anon_sym_STAR,
+      anon_sym_print,
+      anon_sym_assert,
+      anon_sym_return,
+      anon_sym_del,
+      anon_sym_raise,
+      anon_sym_pass,
+      anon_sym_break,
+      anon_sym_continue,
+      anon_sym_if,
+      anon_sym_async,
+      anon_sym_for,
+      anon_sym_while,
+      anon_sym_try,
+      anon_sym_with,
+      anon_sym_match,
+      anon_sym_def,
+      anon_sym_global,
+      anon_sym_nonlocal,
+      anon_sym_exec,
+      anon_sym_type,
+      anon_sym_class,
+      anon_sym_not,
+      anon_sym_lambda,
+      anon_sym_yield,
+      sym_integer,
+      sym_identifier,
+      anon_sym_await,
+      sym_true,
+      sym_false,
+      sym_none,
+  [22611] = 18,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(592), 1,
+      anon_sym_LPAREN,
+    ACTIONS(600), 1,
+      anon_sym_LBRACK,
+    ACTIONS(602), 1,
+      anon_sym_LBRACE,
+    ACTIONS(608), 1,
+      sym__string_start,
+    ACTIONS(977), 1,
+      sym_identifier,
+    ACTIONS(985), 1,
+      anon_sym_not,
+    ACTIONS(987), 1,
+      anon_sym_lambda,
+    ACTIONS(989), 1,
+      anon_sym_await,
+    STATE(713), 1,
+      sym_string,
+    STATE(726), 1,
+      sym_primary_expression,
+    STATE(1012), 1,
+      sym_expression,
+    ACTIONS(604), 2,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(598), 3,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_TILDE,
+    ACTIONS(590), 4,
+      sym_integer,
+      sym_true,
+      sym_false,
+      sym_none,
+    ACTIONS(981), 5,
+      anon_sym_print,
+      anon_sym_async,
+      anon_sym_match,
+      anon_sym_exec,
+      anon_sym_type,
+    STATE(1003), 6,
+      sym_named_expression,
+      sym_not_operator,
+      sym_boolean_operator,
+      sym_comparison_operator,
+      sym_lambda,
+      sym_conditional_expression,
+    STATE(827), 16,
+      sym_binary_operator,
+      sym_unary_operator,
+      sym_attribute,
+      sym_subscript,
+      sym_call,
+      sym_list,
+      sym_set,
+      sym_tuple,
+      sym_dictionary,
+      sym_list_comprehension,
+      sym_dictionary_comprehension,
+      sym_set_comprehension,
+      sym_generator_expression,
+      sym_parenthesized_expression,
+      sym_concatenated_string,
+      sym_await,
+  [22696] = 18,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(592), 1,
+      anon_sym_LPAREN,
+    ACTIONS(600), 1,
+      anon_sym_LBRACK,
+    ACTIONS(602), 1,
+      anon_sym_LBRACE,
+    ACTIONS(608), 1,
+      sym__string_start,
+    ACTIONS(977), 1,
+      sym_identifier,
+    ACTIONS(985), 1,
+      anon_sym_not,
+    ACTIONS(987), 1,
+      anon_sym_lambda,
+    ACTIONS(989), 1,
+      anon_sym_await,
+    STATE(713), 1,
+      sym_string,
+    STATE(726), 1,
+      sym_primary_expression,
+    STATE(1016), 1,
+      sym_expression,
+    ACTIONS(604), 2,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(598), 3,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_TILDE,
+    ACTIONS(590), 4,
+      sym_integer,
+      sym_true,
+      sym_false,
+      sym_none,
+    ACTIONS(981), 5,
+      anon_sym_print,
+      anon_sym_async,
+      anon_sym_match,
+      anon_sym_exec,
+      anon_sym_type,
+    STATE(1003), 6,
+      sym_named_expression,
+      sym_not_operator,
+      sym_boolean_operator,
+      sym_comparison_operator,
+      sym_lambda,
+      sym_conditional_expression,
+    STATE(827), 16,
+      sym_binary_operator,
+      sym_unary_operator,
+      sym_attribute,
+      sym_subscript,
+      sym_call,
+      sym_list,
+      sym_set,
+      sym_tuple,
+      sym_dictionary,
+      sym_list_comprehension,
+      sym_dictionary_comprehension,
+      sym_set_comprehension,
+      sym_generator_expression,
+      sym_parenthesized_expression,
+      sym_concatenated_string,
+      sym_await,
+  [22781] = 18,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(592), 1,
+      anon_sym_LPAREN,
+    ACTIONS(600), 1,
+      anon_sym_LBRACK,
+    ACTIONS(602), 1,
+      anon_sym_LBRACE,
+    ACTIONS(608), 1,
+      sym__string_start,
+    ACTIONS(977), 1,
+      sym_identifier,
+    ACTIONS(985), 1,
+      anon_sym_not,
+    ACTIONS(987), 1,
+      anon_sym_lambda,
+    ACTIONS(989), 1,
+      anon_sym_await,
+    STATE(713), 1,
+      sym_string,
+    STATE(726), 1,
+      sym_primary_expression,
+    STATE(1017), 1,
+      sym_expression,
+    ACTIONS(604), 2,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(598), 3,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_TILDE,
+    ACTIONS(590), 4,
+      sym_integer,
+      sym_true,
+      sym_false,
+      sym_none,
+    ACTIONS(981), 5,
+      anon_sym_print,
+      anon_sym_async,
+      anon_sym_match,
+      anon_sym_exec,
+      anon_sym_type,
+    STATE(1003), 6,
+      sym_named_expression,
+      sym_not_operator,
+      sym_boolean_operator,
+      sym_comparison_operator,
+      sym_lambda,
+      sym_conditional_expression,
+    STATE(827), 16,
+      sym_binary_operator,
+      sym_unary_operator,
+      sym_attribute,
+      sym_subscript,
+      sym_call,
+      sym_list,
+      sym_set,
+      sym_tuple,
+      sym_dictionary,
+      sym_list_comprehension,
+      sym_dictionary_comprehension,
+      sym_set_comprehension,
+      sym_generator_expression,
+      sym_parenthesized_expression,
+      sym_concatenated_string,
+      sym_await,
+  [22866] = 6,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1076), 1,
+      anon_sym_COMMA,
+    ACTIONS(1083), 1,
+      anon_sym_EQ,
+    ACTIONS(1085), 14,
+      anon_sym_COLON,
+      anon_sym_PLUS_EQ,
+      anon_sym_DASH_EQ,
+      anon_sym_STAR_EQ,
+      anon_sym_SLASH_EQ,
+      anon_sym_AT_EQ,
+      anon_sym_SLASH_SLASH_EQ,
+      anon_sym_PERCENT_EQ,
+      anon_sym_STAR_STAR_EQ,
+      anon_sym_GT_GT_EQ,
+      anon_sym_LT_LT_EQ,
+      anon_sym_AMP_EQ,
+      anon_sym_CARET_EQ,
+      anon_sym_PIPE_EQ,
+    ACTIONS(1079), 15,
+      anon_sym_STAR,
+      anon_sym_GT_GT,
+      anon_sym_PIPE,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_SLASH,
+      anon_sym_PERCENT,
+      anon_sym_SLASH_SLASH,
+      anon_sym_AMP,
+      anon_sym_CARET,
+      anon_sym_LT_LT,
+      anon_sym_LT,
+      anon_sym_GT,
+    ACTIONS(1074), 16,
+      sym__newline,
+      anon_sym_DOT,
+      anon_sym_LPAREN,
+      anon_sym_if,
+      anon_sym_in,
+      anon_sym_LBRACK,
+      anon_sym_not,
+      anon_sym_and,
+      anon_sym_or,
+      anon_sym_LT_EQ,
+      anon_sym_EQ_EQ,
+      anon_sym_BANG_EQ,
+      anon_sym_GT_EQ,
+      anon_sym_LT_GT,
+      anon_sym_is,
+      sym__semicolon,
+  [22927] = 18,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(51), 1,
+      anon_sym_LBRACE,
+    ACTIONS(69), 1,
+      anon_sym_not,
+    ACTIONS(71), 1,
+      anon_sym_lambda,
+    ACTIONS(81), 1,
+      sym__string_start,
+    ACTIONS(327), 1,
+      sym_identifier,
+    ACTIONS(333), 1,
+      anon_sym_await,
+    ACTIONS(568), 1,
+      anon_sym_LPAREN,
+    ACTIONS(574), 1,
+      anon_sym_LBRACK,
+    STATE(707), 1,
+      sym_primary_expression,
+    STATE(709), 1,
+      sym_string,
+    STATE(1060), 1,
+      sym_expression,
+    ACTIONS(75), 2,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(47), 3,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_TILDE,
+    ACTIONS(77), 4,
+      sym_integer,
+      sym_true,
+      sym_false,
+      sym_none,
+    ACTIONS(329), 5,
+      anon_sym_print,
+      anon_sym_async,
+      anon_sym_match,
+      anon_sym_exec,
+      anon_sym_type,
+    STATE(985), 6,
+      sym_named_expression,
+      sym_not_operator,
+      sym_boolean_operator,
+      sym_comparison_operator,
+      sym_lambda,
+      sym_conditional_expression,
+    STATE(759), 16,
+      sym_binary_operator,
+      sym_unary_operator,
+      sym_attribute,
+      sym_subscript,
+      sym_call,
+      sym_list,
+      sym_set,
+      sym_tuple,
+      sym_dictionary,
+      sym_list_comprehension,
+      sym_dictionary_comprehension,
+      sym_set_comprehension,
+      sym_generator_expression,
+      sym_parenthesized_expression,
+      sym_concatenated_string,
+      sym_await,
+  [23012] = 18,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(258), 1,
+      sym_identifier,
+    ACTIONS(262), 1,
+      anon_sym_LPAREN,
+    ACTIONS(277), 1,
+      anon_sym_LBRACK,
+    ACTIONS(279), 1,
+      anon_sym_LBRACE,
+    ACTIONS(283), 1,
+      anon_sym_not,
+    ACTIONS(289), 1,
+      anon_sym_lambda,
+    ACTIONS(297), 1,
+      anon_sym_await,
+    ACTIONS(299), 1,
+      sym__string_start,
+    STATE(586), 1,
+      sym_string,
+    STATE(616), 1,
+      sym_primary_expression,
+    STATE(890), 1,
+      sym_expression,
+    ACTIONS(293), 2,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(285), 3,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_TILDE,
+    ACTIONS(295), 4,
+      sym_integer,
+      sym_true,
+      sym_false,
+      sym_none,
+    ACTIONS(269), 5,
+      anon_sym_print,
+      anon_sym_async,
+      anon_sym_match,
+      anon_sym_exec,
+      anon_sym_type,
+    STATE(883), 6,
+      sym_named_expression,
+      sym_not_operator,
+      sym_boolean_operator,
+      sym_comparison_operator,
+      sym_lambda,
+      sym_conditional_expression,
+    STATE(605), 16,
+      sym_binary_operator,
+      sym_unary_operator,
+      sym_attribute,
+      sym_subscript,
+      sym_call,
+      sym_list,
+      sym_set,
+      sym_tuple,
+      sym_dictionary,
+      sym_list_comprehension,
+      sym_dictionary_comprehension,
+      sym_set_comprehension,
+      sym_generator_expression,
+      sym_parenthesized_expression,
+      sym_concatenated_string,
+      sym_await,
+  [23097] = 6,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1145), 1,
+      anon_sym_COMMA,
+    ACTIONS(1152), 1,
+      anon_sym_EQ,
+    ACTIONS(1150), 14,
+      anon_sym_COLON,
+      anon_sym_PLUS_EQ,
+      anon_sym_DASH_EQ,
+      anon_sym_STAR_EQ,
+      anon_sym_SLASH_EQ,
+      anon_sym_AT_EQ,
+      anon_sym_SLASH_SLASH_EQ,
+      anon_sym_PERCENT_EQ,
+      anon_sym_STAR_STAR_EQ,
+      anon_sym_GT_GT_EQ,
+      anon_sym_LT_LT_EQ,
+      anon_sym_AMP_EQ,
+      anon_sym_CARET_EQ,
+      anon_sym_PIPE_EQ,
+    ACTIONS(1148), 15,
+      anon_sym_STAR,
+      anon_sym_GT_GT,
+      anon_sym_PIPE,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_SLASH,
+      anon_sym_PERCENT,
+      anon_sym_SLASH_SLASH,
+      anon_sym_AMP,
+      anon_sym_CARET,
+      anon_sym_LT_LT,
+      anon_sym_LT,
+      anon_sym_GT,
+    ACTIONS(1143), 16,
+      sym__newline,
+      anon_sym_DOT,
+      anon_sym_LPAREN,
+      anon_sym_if,
+      anon_sym_in,
+      anon_sym_LBRACK,
+      anon_sym_not,
+      anon_sym_and,
+      anon_sym_or,
+      anon_sym_LT_EQ,
+      anon_sym_EQ_EQ,
+      anon_sym_BANG_EQ,
+      anon_sym_GT_EQ,
+      anon_sym_LT_GT,
+      anon_sym_is,
+      sym__semicolon,
+  [23158] = 18,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(51), 1,
+      anon_sym_LBRACE,
+    ACTIONS(69), 1,
+      anon_sym_not,
+    ACTIONS(71), 1,
+      anon_sym_lambda,
+    ACTIONS(81), 1,
+      sym__string_start,
+    ACTIONS(327), 1,
+      sym_identifier,
+    ACTIONS(333), 1,
+      anon_sym_await,
+    ACTIONS(568), 1,
+      anon_sym_LPAREN,
+    ACTIONS(574), 1,
+      anon_sym_LBRACK,
+    STATE(707), 1,
+      sym_primary_expression,
+    STATE(709), 1,
+      sym_string,
+    STATE(1087), 1,
+      sym_expression,
+    ACTIONS(75), 2,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(47), 3,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_TILDE,
+    ACTIONS(77), 4,
+      sym_integer,
+      sym_true,
+      sym_false,
+      sym_none,
+    ACTIONS(329), 5,
+      anon_sym_print,
+      anon_sym_async,
+      anon_sym_match,
+      anon_sym_exec,
+      anon_sym_type,
+    STATE(985), 6,
+      sym_named_expression,
+      sym_not_operator,
+      sym_boolean_operator,
+      sym_comparison_operator,
+      sym_lambda,
+      sym_conditional_expression,
+    STATE(759), 16,
+      sym_binary_operator,
+      sym_unary_operator,
+      sym_attribute,
+      sym_subscript,
+      sym_call,
+      sym_list,
+      sym_set,
+      sym_tuple,
+      sym_dictionary,
+      sym_list_comprehension,
+      sym_dictionary_comprehension,
+      sym_set_comprehension,
+      sym_generator_expression,
+      sym_parenthesized_expression,
+      sym_concatenated_string,
+      sym_await,
+  [23243] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1137), 12,
+      sym__string_start,
+      ts_builtin_sym_end,
+      anon_sym_LPAREN,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_LBRACE,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_TILDE,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(1135), 35,
+      anon_sym_import,
+      anon_sym_from,
+      anon_sym_STAR,
+      anon_sym_print,
+      anon_sym_assert,
+      anon_sym_return,
+      anon_sym_del,
+      anon_sym_raise,
+      anon_sym_pass,
+      anon_sym_break,
+      anon_sym_continue,
+      anon_sym_if,
+      anon_sym_elif,
+      anon_sym_else,
+      anon_sym_async,
+      anon_sym_for,
+      anon_sym_while,
+      anon_sym_try,
+      anon_sym_with,
+      anon_sym_match,
+      anon_sym_def,
+      anon_sym_global,
+      anon_sym_nonlocal,
+      anon_sym_exec,
+      anon_sym_type,
+      anon_sym_class,
+      anon_sym_not,
+      anon_sym_lambda,
+      anon_sym_yield,
+      sym_integer,
+      sym_identifier,
+      anon_sym_await,
+      sym_true,
+      sym_false,
+      sym_none,
+  [23298] = 18,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(51), 1,
+      anon_sym_LBRACE,
+    ACTIONS(69), 1,
+      anon_sym_not,
+    ACTIONS(71), 1,
+      anon_sym_lambda,
+    ACTIONS(81), 1,
+      sym__string_start,
+    ACTIONS(327), 1,
+      sym_identifier,
+    ACTIONS(333), 1,
+      anon_sym_await,
+    ACTIONS(568), 1,
+      anon_sym_LPAREN,
+    ACTIONS(574), 1,
+      anon_sym_LBRACK,
+    STATE(707), 1,
+      sym_primary_expression,
+    STATE(709), 1,
+      sym_string,
+    STATE(1059), 1,
+      sym_expression,
+    ACTIONS(75), 2,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(47), 3,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_TILDE,
+    ACTIONS(77), 4,
+      sym_integer,
+      sym_true,
+      sym_false,
+      sym_none,
+    ACTIONS(329), 5,
+      anon_sym_print,
+      anon_sym_async,
+      anon_sym_match,
+      anon_sym_exec,
+      anon_sym_type,
+    STATE(985), 6,
+      sym_named_expression,
+      sym_not_operator,
+      sym_boolean_operator,
+      sym_comparison_operator,
+      sym_lambda,
+      sym_conditional_expression,
+    STATE(759), 16,
+      sym_binary_operator,
+      sym_unary_operator,
+      sym_attribute,
+      sym_subscript,
+      sym_call,
+      sym_list,
+      sym_set,
+      sym_tuple,
+      sym_dictionary,
+      sym_list_comprehension,
+      sym_dictionary_comprehension,
+      sym_set_comprehension,
+      sym_generator_expression,
+      sym_parenthesized_expression,
+      sym_concatenated_string,
+      sym_await,
+  [23383] = 18,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(258), 1,
+      sym_identifier,
+    ACTIONS(262), 1,
+      anon_sym_LPAREN,
+    ACTIONS(277), 1,
+      anon_sym_LBRACK,
+    ACTIONS(279), 1,
+      anon_sym_LBRACE,
+    ACTIONS(283), 1,
+      anon_sym_not,
+    ACTIONS(289), 1,
+      anon_sym_lambda,
+    ACTIONS(297), 1,
+      anon_sym_await,
+    ACTIONS(299), 1,
+      sym__string_start,
+    STATE(586), 1,
+      sym_string,
+    STATE(616), 1,
+      sym_primary_expression,
+    STATE(1140), 1,
+      sym_expression,
+    ACTIONS(293), 2,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(285), 3,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_TILDE,
+    ACTIONS(295), 4,
+      sym_integer,
+      sym_true,
+      sym_false,
+      sym_none,
+    ACTIONS(269), 5,
+      anon_sym_print,
+      anon_sym_async,
+      anon_sym_match,
+      anon_sym_exec,
+      anon_sym_type,
+    STATE(883), 6,
+      sym_named_expression,
+      sym_not_operator,
+      sym_boolean_operator,
+      sym_comparison_operator,
+      sym_lambda,
+      sym_conditional_expression,
+    STATE(605), 16,
+      sym_binary_operator,
+      sym_unary_operator,
+      sym_attribute,
+      sym_subscript,
+      sym_call,
+      sym_list,
+      sym_set,
+      sym_tuple,
+      sym_dictionary,
+      sym_list_comprehension,
+      sym_dictionary_comprehension,
+      sym_set_comprehension,
+      sym_generator_expression,
+      sym_parenthesized_expression,
+      sym_concatenated_string,
+      sym_await,
+  [23468] = 18,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(258), 1,
+      sym_identifier,
+    ACTIONS(262), 1,
+      anon_sym_LPAREN,
+    ACTIONS(277), 1,
+      anon_sym_LBRACK,
+    ACTIONS(279), 1,
+      anon_sym_LBRACE,
+    ACTIONS(283), 1,
+      anon_sym_not,
+    ACTIONS(289), 1,
+      anon_sym_lambda,
+    ACTIONS(297), 1,
+      anon_sym_await,
+    ACTIONS(299), 1,
+      sym__string_start,
+    STATE(586), 1,
+      sym_string,
+    STATE(616), 1,
+      sym_primary_expression,
+    STATE(1126), 1,
+      sym_expression,
+    ACTIONS(293), 2,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(285), 3,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_TILDE,
+    ACTIONS(295), 4,
+      sym_integer,
+      sym_true,
+      sym_false,
+      sym_none,
+    ACTIONS(269), 5,
+      anon_sym_print,
+      anon_sym_async,
+      anon_sym_match,
+      anon_sym_exec,
+      anon_sym_type,
+    STATE(883), 6,
+      sym_named_expression,
+      sym_not_operator,
+      sym_boolean_operator,
+      sym_comparison_operator,
+      sym_lambda,
+      sym_conditional_expression,
+    STATE(605), 16,
+      sym_binary_operator,
+      sym_unary_operator,
+      sym_attribute,
+      sym_subscript,
+      sym_call,
+      sym_list,
+      sym_set,
+      sym_tuple,
+      sym_dictionary,
+      sym_list_comprehension,
+      sym_dictionary_comprehension,
+      sym_set_comprehension,
+      sym_generator_expression,
+      sym_parenthesized_expression,
+      sym_concatenated_string,
+      sym_await,
+  [23553] = 18,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(258), 1,
+      sym_identifier,
+    ACTIONS(262), 1,
+      anon_sym_LPAREN,
+    ACTIONS(277), 1,
+      anon_sym_LBRACK,
+    ACTIONS(279), 1,
+      anon_sym_LBRACE,
+    ACTIONS(283), 1,
+      anon_sym_not,
+    ACTIONS(289), 1,
+      anon_sym_lambda,
+    ACTIONS(297), 1,
+      anon_sym_await,
+    ACTIONS(299), 1,
+      sym__string_start,
+    STATE(586), 1,
+      sym_string,
+    STATE(616), 1,
+      sym_primary_expression,
+    STATE(903), 1,
+      sym_expression,
+    ACTIONS(293), 2,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(285), 3,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_TILDE,
+    ACTIONS(295), 4,
+      sym_integer,
+      sym_true,
+      sym_false,
+      sym_none,
+    ACTIONS(269), 5,
+      anon_sym_print,
+      anon_sym_async,
+      anon_sym_match,
+      anon_sym_exec,
+      anon_sym_type,
+    STATE(883), 6,
+      sym_named_expression,
+      sym_not_operator,
+      sym_boolean_operator,
+      sym_comparison_operator,
+      sym_lambda,
+      sym_conditional_expression,
+    STATE(605), 16,
+      sym_binary_operator,
+      sym_unary_operator,
+      sym_attribute,
+      sym_subscript,
+      sym_call,
+      sym_list,
+      sym_set,
+      sym_tuple,
+      sym_dictionary,
+      sym_list_comprehension,
+      sym_dictionary_comprehension,
+      sym_set_comprehension,
+      sym_generator_expression,
+      sym_parenthesized_expression,
+      sym_concatenated_string,
+      sym_await,
+  [23638] = 5,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(842), 1,
+      anon_sym_else,
+    STATE(498), 1,
+      sym_else_clause,
+    ACTIONS(1106), 12,
+      sym__string_start,
+      ts_builtin_sym_end,
+      anon_sym_LPAREN,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_LBRACE,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_TILDE,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(1104), 33,
+      anon_sym_import,
+      anon_sym_from,
+      anon_sym_STAR,
+      anon_sym_print,
+      anon_sym_assert,
+      anon_sym_return,
+      anon_sym_del,
+      anon_sym_raise,
+      anon_sym_pass,
+      anon_sym_break,
+      anon_sym_continue,
+      anon_sym_if,
+      anon_sym_async,
+      anon_sym_for,
+      anon_sym_while,
+      anon_sym_try,
+      anon_sym_with,
+      anon_sym_match,
+      anon_sym_def,
+      anon_sym_global,
+      anon_sym_nonlocal,
+      anon_sym_exec,
+      anon_sym_type,
+      anon_sym_class,
+      anon_sym_not,
+      anon_sym_lambda,
+      anon_sym_yield,
+      sym_integer,
+      sym_identifier,
+      anon_sym_await,
+      sym_true,
+      sym_false,
+      sym_none,
+  [23697] = 18,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(51), 1,
+      anon_sym_LBRACE,
+    ACTIONS(69), 1,
+      anon_sym_not,
+    ACTIONS(71), 1,
+      anon_sym_lambda,
+    ACTIONS(81), 1,
+      sym__string_start,
+    ACTIONS(327), 1,
+      sym_identifier,
+    ACTIONS(333), 1,
+      anon_sym_await,
+    ACTIONS(568), 1,
+      anon_sym_LPAREN,
+    ACTIONS(574), 1,
+      anon_sym_LBRACK,
+    STATE(707), 1,
+      sym_primary_expression,
+    STATE(709), 1,
+      sym_string,
+    STATE(1079), 1,
+      sym_expression,
+    ACTIONS(75), 2,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(47), 3,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_TILDE,
+    ACTIONS(77), 4,
+      sym_integer,
+      sym_true,
+      sym_false,
+      sym_none,
+    ACTIONS(329), 5,
+      anon_sym_print,
+      anon_sym_async,
+      anon_sym_match,
+      anon_sym_exec,
+      anon_sym_type,
+    STATE(985), 6,
+      sym_named_expression,
+      sym_not_operator,
+      sym_boolean_operator,
+      sym_comparison_operator,
+      sym_lambda,
+      sym_conditional_expression,
+    STATE(759), 16,
+      sym_binary_operator,
+      sym_unary_operator,
+      sym_attribute,
+      sym_subscript,
+      sym_call,
+      sym_list,
+      sym_set,
+      sym_tuple,
+      sym_dictionary,
+      sym_list_comprehension,
+      sym_dictionary_comprehension,
+      sym_set_comprehension,
+      sym_generator_expression,
+      sym_parenthesized_expression,
+      sym_concatenated_string,
+      sym_await,
+  [23782] = 18,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(258), 1,
+      sym_identifier,
+    ACTIONS(262), 1,
+      anon_sym_LPAREN,
+    ACTIONS(277), 1,
+      anon_sym_LBRACK,
+    ACTIONS(279), 1,
+      anon_sym_LBRACE,
+    ACTIONS(283), 1,
+      anon_sym_not,
+    ACTIONS(289), 1,
+      anon_sym_lambda,
+    ACTIONS(297), 1,
+      anon_sym_await,
+    ACTIONS(299), 1,
+      sym__string_start,
+    STATE(586), 1,
+      sym_string,
+    STATE(616), 1,
+      sym_primary_expression,
+    STATE(1112), 1,
+      sym_expression,
+    ACTIONS(293), 2,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(285), 3,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_TILDE,
+    ACTIONS(295), 4,
+      sym_integer,
+      sym_true,
+      sym_false,
+      sym_none,
+    ACTIONS(269), 5,
+      anon_sym_print,
+      anon_sym_async,
+      anon_sym_match,
+      anon_sym_exec,
+      anon_sym_type,
+    STATE(883), 6,
+      sym_named_expression,
+      sym_not_operator,
+      sym_boolean_operator,
+      sym_comparison_operator,
+      sym_lambda,
+      sym_conditional_expression,
+    STATE(605), 16,
+      sym_binary_operator,
+      sym_unary_operator,
+      sym_attribute,
+      sym_subscript,
+      sym_call,
+      sym_list,
+      sym_set,
+      sym_tuple,
+      sym_dictionary,
+      sym_list_comprehension,
+      sym_dictionary_comprehension,
+      sym_set_comprehension,
+      sym_generator_expression,
+      sym_parenthesized_expression,
+      sym_concatenated_string,
+      sym_await,
+  [23867] = 18,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(51), 1,
+      anon_sym_LBRACE,
+    ACTIONS(69), 1,
+      anon_sym_not,
+    ACTIONS(71), 1,
+      anon_sym_lambda,
+    ACTIONS(81), 1,
+      sym__string_start,
+    ACTIONS(327), 1,
+      sym_identifier,
+    ACTIONS(333), 1,
+      anon_sym_await,
+    ACTIONS(568), 1,
+      anon_sym_LPAREN,
+    ACTIONS(574), 1,
+      anon_sym_LBRACK,
+    STATE(707), 1,
+      sym_primary_expression,
+    STATE(709), 1,
+      sym_string,
+    STATE(973), 1,
+      sym_expression,
+    ACTIONS(75), 2,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(47), 3,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_TILDE,
+    ACTIONS(77), 4,
+      sym_integer,
+      sym_true,
+      sym_false,
+      sym_none,
+    ACTIONS(329), 5,
+      anon_sym_print,
+      anon_sym_async,
+      anon_sym_match,
+      anon_sym_exec,
+      anon_sym_type,
+    STATE(985), 6,
+      sym_named_expression,
+      sym_not_operator,
+      sym_boolean_operator,
+      sym_comparison_operator,
+      sym_lambda,
+      sym_conditional_expression,
+    STATE(759), 16,
+      sym_binary_operator,
+      sym_unary_operator,
+      sym_attribute,
+      sym_subscript,
+      sym_call,
+      sym_list,
+      sym_set,
+      sym_tuple,
+      sym_dictionary,
+      sym_list_comprehension,
+      sym_dictionary_comprehension,
+      sym_set_comprehension,
+      sym_generator_expression,
+      sym_parenthesized_expression,
+      sym_concatenated_string,
+      sym_await,
+  [23952] = 5,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(826), 1,
+      anon_sym_finally,
+    STATE(532), 1,
+      sym_finally_clause,
+    ACTIONS(1156), 12,
+      sym__dedent,
+      sym__string_start,
+      anon_sym_LPAREN,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_LBRACE,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_TILDE,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(1154), 33,
+      anon_sym_import,
+      anon_sym_from,
+      anon_sym_STAR,
+      anon_sym_print,
+      anon_sym_assert,
+      anon_sym_return,
+      anon_sym_del,
+      anon_sym_raise,
+      anon_sym_pass,
+      anon_sym_break,
+      anon_sym_continue,
+      anon_sym_if,
+      anon_sym_async,
+      anon_sym_for,
+      anon_sym_while,
+      anon_sym_try,
+      anon_sym_with,
+      anon_sym_match,
+      anon_sym_def,
+      anon_sym_global,
+      anon_sym_nonlocal,
+      anon_sym_exec,
+      anon_sym_type,
+      anon_sym_class,
+      anon_sym_not,
+      anon_sym_lambda,
+      anon_sym_yield,
+      sym_integer,
+      sym_identifier,
+      anon_sym_await,
+      sym_true,
+      sym_false,
+      sym_none,
+  [24011] = 18,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(258), 1,
+      sym_identifier,
+    ACTIONS(262), 1,
+      anon_sym_LPAREN,
+    ACTIONS(277), 1,
+      anon_sym_LBRACK,
+    ACTIONS(279), 1,
+      anon_sym_LBRACE,
+    ACTIONS(283), 1,
+      anon_sym_not,
+    ACTIONS(289), 1,
+      anon_sym_lambda,
+    ACTIONS(297), 1,
+      anon_sym_await,
+    ACTIONS(299), 1,
+      sym__string_start,
+    STATE(586), 1,
+      sym_string,
+    STATE(616), 1,
+      sym_primary_expression,
+    STATE(1115), 1,
+      sym_expression,
+    ACTIONS(293), 2,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(285), 3,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_TILDE,
+    ACTIONS(295), 4,
+      sym_integer,
+      sym_true,
+      sym_false,
+      sym_none,
+    ACTIONS(269), 5,
+      anon_sym_print,
+      anon_sym_async,
+      anon_sym_match,
+      anon_sym_exec,
+      anon_sym_type,
+    STATE(883), 6,
+      sym_named_expression,
+      sym_not_operator,
+      sym_boolean_operator,
+      sym_comparison_operator,
+      sym_lambda,
+      sym_conditional_expression,
+    STATE(605), 16,
+      sym_binary_operator,
+      sym_unary_operator,
+      sym_attribute,
+      sym_subscript,
+      sym_call,
+      sym_list,
+      sym_set,
+      sym_tuple,
+      sym_dictionary,
+      sym_list_comprehension,
+      sym_dictionary_comprehension,
+      sym_set_comprehension,
+      sym_generator_expression,
+      sym_parenthesized_expression,
+      sym_concatenated_string,
+      sym_await,
+  [24096] = 5,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(846), 1,
+      anon_sym_finally,
+    STATE(482), 1,
+      sym_finally_clause,
+    ACTIONS(1156), 12,
+      sym__string_start,
+      ts_builtin_sym_end,
+      anon_sym_LPAREN,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_LBRACE,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_TILDE,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(1154), 33,
+      anon_sym_import,
+      anon_sym_from,
+      anon_sym_STAR,
+      anon_sym_print,
+      anon_sym_assert,
+      anon_sym_return,
+      anon_sym_del,
+      anon_sym_raise,
+      anon_sym_pass,
+      anon_sym_break,
+      anon_sym_continue,
+      anon_sym_if,
+      anon_sym_async,
+      anon_sym_for,
+      anon_sym_while,
+      anon_sym_try,
+      anon_sym_with,
+      anon_sym_match,
+      anon_sym_def,
+      anon_sym_global,
+      anon_sym_nonlocal,
+      anon_sym_exec,
+      anon_sym_type,
+      anon_sym_class,
+      anon_sym_not,
+      anon_sym_lambda,
+      anon_sym_yield,
+      sym_integer,
+      sym_identifier,
+      anon_sym_await,
+      sym_true,
+      sym_false,
+      sym_none,
+  [24155] = 18,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(279), 1,
+      anon_sym_LBRACE,
+    ACTIONS(299), 1,
+      sym__string_start,
+    ACTIONS(578), 1,
+      anon_sym_LPAREN,
+    ACTIONS(584), 1,
+      anon_sym_LBRACK,
+    ACTIONS(626), 1,
+      anon_sym_not,
+    ACTIONS(628), 1,
+      anon_sym_lambda,
+    ACTIONS(668), 1,
+      sym_identifier,
+    ACTIONS(678), 1,
+      anon_sym_await,
+    STATE(586), 1,
+      sym_string,
+    STATE(590), 1,
+      sym_primary_expression,
+    STATE(894), 1,
+      sym_expression,
+    ACTIONS(293), 2,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(582), 3,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_TILDE,
+    ACTIONS(295), 4,
+      sym_integer,
+      sym_true,
+      sym_false,
+      sym_none,
+    ACTIONS(674), 5,
+      anon_sym_print,
+      anon_sym_async,
+      anon_sym_match,
+      anon_sym_exec,
+      anon_sym_type,
+    STATE(883), 6,
+      sym_named_expression,
+      sym_not_operator,
+      sym_boolean_operator,
+      sym_comparison_operator,
+      sym_lambda,
+      sym_conditional_expression,
+    STATE(605), 16,
+      sym_binary_operator,
+      sym_unary_operator,
+      sym_attribute,
+      sym_subscript,
+      sym_call,
+      sym_list,
+      sym_set,
+      sym_tuple,
+      sym_dictionary,
+      sym_list_comprehension,
+      sym_dictionary_comprehension,
+      sym_set_comprehension,
+      sym_generator_expression,
+      sym_parenthesized_expression,
+      sym_concatenated_string,
+      sym_await,
+  [24240] = 5,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(846), 1,
+      anon_sym_finally,
+    STATE(528), 1,
+      sym_finally_clause,
+    ACTIONS(1158), 12,
+      sym__string_start,
+      ts_builtin_sym_end,
+      anon_sym_LPAREN,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_LBRACE,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_TILDE,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(1160), 33,
+      anon_sym_import,
+      anon_sym_from,
+      anon_sym_STAR,
+      anon_sym_print,
+      anon_sym_assert,
+      anon_sym_return,
+      anon_sym_del,
+      anon_sym_raise,
+      anon_sym_pass,
+      anon_sym_break,
+      anon_sym_continue,
+      anon_sym_if,
+      anon_sym_async,
+      anon_sym_for,
+      anon_sym_while,
+      anon_sym_try,
+      anon_sym_with,
+      anon_sym_match,
+      anon_sym_def,
+      anon_sym_global,
+      anon_sym_nonlocal,
+      anon_sym_exec,
+      anon_sym_type,
+      anon_sym_class,
+      anon_sym_not,
+      anon_sym_lambda,
+      anon_sym_yield,
+      sym_integer,
+      sym_identifier,
+      anon_sym_await,
+      sym_true,
+      sym_false,
+      sym_none,
+  [24299] = 18,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(258), 1,
+      sym_identifier,
+    ACTIONS(262), 1,
+      anon_sym_LPAREN,
+    ACTIONS(277), 1,
+      anon_sym_LBRACK,
+    ACTIONS(279), 1,
+      anon_sym_LBRACE,
+    ACTIONS(283), 1,
+      anon_sym_not,
+    ACTIONS(289), 1,
+      anon_sym_lambda,
+    ACTIONS(297), 1,
+      anon_sym_await,
+    ACTIONS(299), 1,
+      sym__string_start,
+    STATE(586), 1,
+      sym_string,
+    STATE(616), 1,
+      sym_primary_expression,
+    STATE(1160), 1,
+      sym_expression,
+    ACTIONS(293), 2,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(285), 3,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_TILDE,
+    ACTIONS(295), 4,
+      sym_integer,
+      sym_true,
+      sym_false,
+      sym_none,
+    ACTIONS(269), 5,
+      anon_sym_print,
+      anon_sym_async,
+      anon_sym_match,
+      anon_sym_exec,
+      anon_sym_type,
+    STATE(883), 6,
+      sym_named_expression,
+      sym_not_operator,
+      sym_boolean_operator,
+      sym_comparison_operator,
+      sym_lambda,
+      sym_conditional_expression,
+    STATE(605), 16,
+      sym_binary_operator,
+      sym_unary_operator,
+      sym_attribute,
+      sym_subscript,
+      sym_call,
+      sym_list,
+      sym_set,
+      sym_tuple,
+      sym_dictionary,
+      sym_list_comprehension,
+      sym_dictionary_comprehension,
+      sym_set_comprehension,
+      sym_generator_expression,
+      sym_parenthesized_expression,
+      sym_concatenated_string,
+      sym_await,
+  [24384] = 18,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(258), 1,
+      sym_identifier,
+    ACTIONS(262), 1,
+      anon_sym_LPAREN,
+    ACTIONS(277), 1,
+      anon_sym_LBRACK,
+    ACTIONS(279), 1,
+      anon_sym_LBRACE,
+    ACTIONS(283), 1,
+      anon_sym_not,
+    ACTIONS(289), 1,
+      anon_sym_lambda,
+    ACTIONS(297), 1,
+      anon_sym_await,
+    ACTIONS(299), 1,
+      sym__string_start,
+    STATE(586), 1,
+      sym_string,
+    STATE(616), 1,
+      sym_primary_expression,
+    STATE(1173), 1,
+      sym_expression,
+    ACTIONS(293), 2,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(285), 3,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_TILDE,
+    ACTIONS(295), 4,
+      sym_integer,
+      sym_true,
+      sym_false,
+      sym_none,
+    ACTIONS(269), 5,
+      anon_sym_print,
+      anon_sym_async,
+      anon_sym_match,
+      anon_sym_exec,
+      anon_sym_type,
+    STATE(883), 6,
+      sym_named_expression,
+      sym_not_operator,
+      sym_boolean_operator,
+      sym_comparison_operator,
+      sym_lambda,
+      sym_conditional_expression,
+    STATE(605), 16,
+      sym_binary_operator,
+      sym_unary_operator,
+      sym_attribute,
+      sym_subscript,
+      sym_call,
+      sym_list,
+      sym_set,
+      sym_tuple,
+      sym_dictionary,
+      sym_list_comprehension,
+      sym_dictionary_comprehension,
+      sym_set_comprehension,
+      sym_generator_expression,
+      sym_parenthesized_expression,
+      sym_concatenated_string,
+      sym_await,
+  [24469] = 18,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(592), 1,
+      anon_sym_LPAREN,
+    ACTIONS(600), 1,
+      anon_sym_LBRACK,
+    ACTIONS(602), 1,
+      anon_sym_LBRACE,
+    ACTIONS(608), 1,
+      sym__string_start,
+    ACTIONS(977), 1,
+      sym_identifier,
+    ACTIONS(985), 1,
+      anon_sym_not,
+    ACTIONS(987), 1,
+      anon_sym_lambda,
+    ACTIONS(989), 1,
+      anon_sym_await,
+    STATE(713), 1,
+      sym_string,
+    STATE(726), 1,
+      sym_primary_expression,
+    STATE(1106), 1,
+      sym_expression,
+    ACTIONS(604), 2,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(598), 3,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_TILDE,
+    ACTIONS(590), 4,
+      sym_integer,
+      sym_true,
+      sym_false,
+      sym_none,
+    ACTIONS(981), 5,
+      anon_sym_print,
+      anon_sym_async,
+      anon_sym_match,
+      anon_sym_exec,
+      anon_sym_type,
+    STATE(1003), 6,
+      sym_named_expression,
+      sym_not_operator,
+      sym_boolean_operator,
+      sym_comparison_operator,
+      sym_lambda,
+      sym_conditional_expression,
+    STATE(827), 16,
+      sym_binary_operator,
+      sym_unary_operator,
+      sym_attribute,
+      sym_subscript,
+      sym_call,
+      sym_list,
+      sym_set,
+      sym_tuple,
+      sym_dictionary,
+      sym_list_comprehension,
+      sym_dictionary_comprehension,
+      sym_set_comprehension,
+      sym_generator_expression,
+      sym_parenthesized_expression,
+      sym_concatenated_string,
+      sym_await,
+  [24554] = 5,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(842), 1,
+      anon_sym_else,
+    STATE(490), 1,
+      sym_else_clause,
+    ACTIONS(1141), 12,
+      sym__string_start,
+      ts_builtin_sym_end,
+      anon_sym_LPAREN,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_LBRACE,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_TILDE,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(1139), 33,
+      anon_sym_import,
+      anon_sym_from,
+      anon_sym_STAR,
+      anon_sym_print,
+      anon_sym_assert,
+      anon_sym_return,
+      anon_sym_del,
+      anon_sym_raise,
+      anon_sym_pass,
+      anon_sym_break,
+      anon_sym_continue,
+      anon_sym_if,
+      anon_sym_async,
+      anon_sym_for,
+      anon_sym_while,
+      anon_sym_try,
+      anon_sym_with,
+      anon_sym_match,
+      anon_sym_def,
+      anon_sym_global,
+      anon_sym_nonlocal,
+      anon_sym_exec,
+      anon_sym_type,
+      anon_sym_class,
+      anon_sym_not,
+      anon_sym_lambda,
+      anon_sym_yield,
+      sym_integer,
+      sym_identifier,
+      anon_sym_await,
+      sym_true,
+      sym_false,
+      sym_none,
+  [24613] = 18,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(258), 1,
+      sym_identifier,
+    ACTIONS(262), 1,
+      anon_sym_LPAREN,
+    ACTIONS(277), 1,
+      anon_sym_LBRACK,
+    ACTIONS(279), 1,
+      anon_sym_LBRACE,
+    ACTIONS(283), 1,
+      anon_sym_not,
+    ACTIONS(289), 1,
+      anon_sym_lambda,
+    ACTIONS(297), 1,
+      anon_sym_await,
+    ACTIONS(299), 1,
+      sym__string_start,
+    STATE(586), 1,
+      sym_string,
+    STATE(616), 1,
+      sym_primary_expression,
+    STATE(896), 1,
+      sym_expression,
+    ACTIONS(293), 2,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(285), 3,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_TILDE,
+    ACTIONS(295), 4,
+      sym_integer,
+      sym_true,
+      sym_false,
+      sym_none,
+    ACTIONS(269), 5,
+      anon_sym_print,
+      anon_sym_async,
+      anon_sym_match,
+      anon_sym_exec,
+      anon_sym_type,
+    STATE(883), 6,
+      sym_named_expression,
+      sym_not_operator,
+      sym_boolean_operator,
+      sym_comparison_operator,
+      sym_lambda,
+      sym_conditional_expression,
+    STATE(605), 16,
+      sym_binary_operator,
+      sym_unary_operator,
+      sym_attribute,
+      sym_subscript,
+      sym_call,
+      sym_list,
+      sym_set,
+      sym_tuple,
+      sym_dictionary,
+      sym_list_comprehension,
+      sym_dictionary_comprehension,
+      sym_set_comprehension,
+      sym_generator_expression,
+      sym_parenthesized_expression,
+      sym_concatenated_string,
+      sym_await,
+  [24698] = 18,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(258), 1,
+      sym_identifier,
+    ACTIONS(262), 1,
+      anon_sym_LPAREN,
+    ACTIONS(277), 1,
+      anon_sym_LBRACK,
+    ACTIONS(279), 1,
+      anon_sym_LBRACE,
+    ACTIONS(283), 1,
+      anon_sym_not,
+    ACTIONS(289), 1,
+      anon_sym_lambda,
+    ACTIONS(297), 1,
+      anon_sym_await,
+    ACTIONS(299), 1,
+      sym__string_start,
+    STATE(586), 1,
+      sym_string,
+    STATE(616), 1,
+      sym_primary_expression,
+    STATE(1117), 1,
+      sym_expression,
+    ACTIONS(293), 2,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(285), 3,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_TILDE,
+    ACTIONS(295), 4,
+      sym_integer,
+      sym_true,
+      sym_false,
+      sym_none,
+    ACTIONS(269), 5,
+      anon_sym_print,
+      anon_sym_async,
+      anon_sym_match,
+      anon_sym_exec,
+      anon_sym_type,
+    STATE(883), 6,
+      sym_named_expression,
+      sym_not_operator,
+      sym_boolean_operator,
+      sym_comparison_operator,
+      sym_lambda,
+      sym_conditional_expression,
+    STATE(605), 16,
+      sym_binary_operator,
+      sym_unary_operator,
+      sym_attribute,
+      sym_subscript,
+      sym_call,
+      sym_list,
+      sym_set,
+      sym_tuple,
+      sym_dictionary,
+      sym_list_comprehension,
+      sym_dictionary_comprehension,
+      sym_set_comprehension,
+      sym_generator_expression,
+      sym_parenthesized_expression,
+      sym_concatenated_string,
+      sym_await,
+  [24783] = 18,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(51), 1,
+      anon_sym_LBRACE,
+    ACTIONS(69), 1,
+      anon_sym_not,
+    ACTIONS(71), 1,
+      anon_sym_lambda,
+    ACTIONS(81), 1,
+      sym__string_start,
+    ACTIONS(327), 1,
+      sym_identifier,
+    ACTIONS(333), 1,
+      anon_sym_await,
+    ACTIONS(568), 1,
+      anon_sym_LPAREN,
+    ACTIONS(574), 1,
+      anon_sym_LBRACK,
+    STATE(707), 1,
+      sym_primary_expression,
+    STATE(709), 1,
+      sym_string,
+    STATE(975), 1,
+      sym_expression,
+    ACTIONS(75), 2,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(47), 3,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_TILDE,
+    ACTIONS(77), 4,
+      sym_integer,
+      sym_true,
+      sym_false,
+      sym_none,
+    ACTIONS(329), 5,
+      anon_sym_print,
+      anon_sym_async,
+      anon_sym_match,
+      anon_sym_exec,
+      anon_sym_type,
+    STATE(985), 6,
+      sym_named_expression,
+      sym_not_operator,
+      sym_boolean_operator,
+      sym_comparison_operator,
+      sym_lambda,
+      sym_conditional_expression,
+    STATE(759), 16,
+      sym_binary_operator,
+      sym_unary_operator,
+      sym_attribute,
+      sym_subscript,
+      sym_call,
+      sym_list,
+      sym_set,
+      sym_tuple,
+      sym_dictionary,
+      sym_list_comprehension,
+      sym_dictionary_comprehension,
+      sym_set_comprehension,
+      sym_generator_expression,
+      sym_parenthesized_expression,
+      sym_concatenated_string,
+      sym_await,
+  [24868] = 18,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(51), 1,
+      anon_sym_LBRACE,
+    ACTIONS(69), 1,
+      anon_sym_not,
+    ACTIONS(71), 1,
+      anon_sym_lambda,
+    ACTIONS(81), 1,
+      sym__string_start,
+    ACTIONS(327), 1,
+      sym_identifier,
+    ACTIONS(333), 1,
+      anon_sym_await,
+    ACTIONS(568), 1,
+      anon_sym_LPAREN,
+    ACTIONS(574), 1,
+      anon_sym_LBRACK,
+    STATE(707), 1,
+      sym_primary_expression,
+    STATE(709), 1,
+      sym_string,
+    STATE(1021), 1,
+      sym_expression,
+    ACTIONS(75), 2,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(47), 3,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_TILDE,
+    ACTIONS(77), 4,
+      sym_integer,
+      sym_true,
+      sym_false,
+      sym_none,
+    ACTIONS(329), 5,
+      anon_sym_print,
+      anon_sym_async,
+      anon_sym_match,
+      anon_sym_exec,
+      anon_sym_type,
+    STATE(985), 6,
+      sym_named_expression,
+      sym_not_operator,
+      sym_boolean_operator,
+      sym_comparison_operator,
+      sym_lambda,
+      sym_conditional_expression,
+    STATE(759), 16,
+      sym_binary_operator,
+      sym_unary_operator,
+      sym_attribute,
+      sym_subscript,
+      sym_call,
+      sym_list,
+      sym_set,
+      sym_tuple,
+      sym_dictionary,
+      sym_list_comprehension,
+      sym_dictionary_comprehension,
+      sym_set_comprehension,
+      sym_generator_expression,
+      sym_parenthesized_expression,
+      sym_concatenated_string,
+      sym_await,
+  [24953] = 5,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(842), 1,
+      anon_sym_else,
+    STATE(480), 1,
+      sym_else_clause,
+    ACTIONS(1129), 12,
+      sym__string_start,
+      ts_builtin_sym_end,
+      anon_sym_LPAREN,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_LBRACE,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_TILDE,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(1127), 33,
+      anon_sym_import,
+      anon_sym_from,
+      anon_sym_STAR,
+      anon_sym_print,
+      anon_sym_assert,
+      anon_sym_return,
+      anon_sym_del,
+      anon_sym_raise,
+      anon_sym_pass,
+      anon_sym_break,
+      anon_sym_continue,
+      anon_sym_if,
+      anon_sym_async,
+      anon_sym_for,
+      anon_sym_while,
+      anon_sym_try,
+      anon_sym_with,
+      anon_sym_match,
+      anon_sym_def,
+      anon_sym_global,
+      anon_sym_nonlocal,
+      anon_sym_exec,
+      anon_sym_type,
+      anon_sym_class,
+      anon_sym_not,
+      anon_sym_lambda,
+      anon_sym_yield,
+      sym_integer,
+      sym_identifier,
+      anon_sym_await,
+      sym_true,
+      sym_false,
+      sym_none,
+  [25012] = 19,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(262), 1,
+      anon_sym_LPAREN,
+    ACTIONS(277), 1,
+      anon_sym_LBRACK,
+    ACTIONS(279), 1,
+      anon_sym_LBRACE,
+    ACTIONS(283), 1,
+      anon_sym_not,
+    ACTIONS(289), 1,
+      anon_sym_lambda,
+    ACTIONS(299), 1,
+      sym__string_start,
+    ACTIONS(1162), 1,
+      sym_identifier,
+    ACTIONS(1166), 1,
+      anon_sym_await,
+    STATE(586), 1,
+      sym_string,
+    STATE(616), 1,
+      sym_primary_expression,
+    STATE(912), 1,
+      sym_expression,
+    ACTIONS(293), 2,
+      sym_ellipsis,
+      sym_float,
+    STATE(379), 2,
+      sym_attribute,
+      sym_subscript,
+    ACTIONS(285), 3,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_TILDE,
+    ACTIONS(295), 4,
+      sym_integer,
+      sym_true,
+      sym_false,
+      sym_none,
+    ACTIONS(1164), 5,
+      anon_sym_print,
+      anon_sym_async,
+      anon_sym_match,
+      anon_sym_exec,
+      anon_sym_type,
+    STATE(883), 6,
+      sym_named_expression,
+      sym_not_operator,
+      sym_boolean_operator,
+      sym_comparison_operator,
+      sym_lambda,
+      sym_conditional_expression,
+    STATE(605), 14,
+      sym_binary_operator,
+      sym_unary_operator,
+      sym_call,
+      sym_list,
+      sym_set,
+      sym_tuple,
+      sym_dictionary,
+      sym_list_comprehension,
+      sym_dictionary_comprehension,
+      sym_set_comprehension,
+      sym_generator_expression,
+      sym_parenthesized_expression,
+      sym_concatenated_string,
+      sym_await,
+  [25099] = 18,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(258), 1,
+      sym_identifier,
+    ACTIONS(262), 1,
+      anon_sym_LPAREN,
+    ACTIONS(277), 1,
+      anon_sym_LBRACK,
+    ACTIONS(279), 1,
+      anon_sym_LBRACE,
+    ACTIONS(283), 1,
+      anon_sym_not,
+    ACTIONS(289), 1,
+      anon_sym_lambda,
+    ACTIONS(297), 1,
+      anon_sym_await,
+    ACTIONS(299), 1,
+      sym__string_start,
+    STATE(586), 1,
+      sym_string,
+    STATE(616), 1,
+      sym_primary_expression,
+    STATE(1132), 1,
+      sym_expression,
+    ACTIONS(293), 2,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(285), 3,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_TILDE,
+    ACTIONS(295), 4,
+      sym_integer,
+      sym_true,
+      sym_false,
+      sym_none,
+    ACTIONS(269), 5,
+      anon_sym_print,
+      anon_sym_async,
+      anon_sym_match,
+      anon_sym_exec,
+      anon_sym_type,
+    STATE(883), 6,
+      sym_named_expression,
+      sym_not_operator,
+      sym_boolean_operator,
+      sym_comparison_operator,
+      sym_lambda,
+      sym_conditional_expression,
+    STATE(605), 16,
+      sym_binary_operator,
+      sym_unary_operator,
+      sym_attribute,
+      sym_subscript,
+      sym_call,
+      sym_list,
+      sym_set,
+      sym_tuple,
+      sym_dictionary,
+      sym_list_comprehension,
+      sym_dictionary_comprehension,
+      sym_set_comprehension,
+      sym_generator_expression,
+      sym_parenthesized_expression,
+      sym_concatenated_string,
+      sym_await,
+  [25184] = 18,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(51), 1,
+      anon_sym_LBRACE,
+    ACTIONS(69), 1,
+      anon_sym_not,
+    ACTIONS(71), 1,
+      anon_sym_lambda,
+    ACTIONS(81), 1,
+      sym__string_start,
+    ACTIONS(327), 1,
+      sym_identifier,
+    ACTIONS(333), 1,
+      anon_sym_await,
+    ACTIONS(568), 1,
+      anon_sym_LPAREN,
+    ACTIONS(574), 1,
+      anon_sym_LBRACK,
+    STATE(707), 1,
+      sym_primary_expression,
+    STATE(709), 1,
+      sym_string,
+    STATE(962), 1,
+      sym_expression,
+    ACTIONS(75), 2,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(47), 3,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_TILDE,
+    ACTIONS(77), 4,
+      sym_integer,
+      sym_true,
+      sym_false,
+      sym_none,
+    ACTIONS(329), 5,
+      anon_sym_print,
+      anon_sym_async,
+      anon_sym_match,
+      anon_sym_exec,
+      anon_sym_type,
+    STATE(985), 6,
+      sym_named_expression,
+      sym_not_operator,
+      sym_boolean_operator,
+      sym_comparison_operator,
+      sym_lambda,
+      sym_conditional_expression,
+    STATE(759), 16,
+      sym_binary_operator,
+      sym_unary_operator,
+      sym_attribute,
+      sym_subscript,
+      sym_call,
+      sym_list,
+      sym_set,
+      sym_tuple,
+      sym_dictionary,
+      sym_list_comprehension,
+      sym_dictionary_comprehension,
+      sym_set_comprehension,
+      sym_generator_expression,
+      sym_parenthesized_expression,
+      sym_concatenated_string,
+      sym_await,
+  [25269] = 5,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(826), 1,
+      anon_sym_finally,
+    STATE(524), 1,
+      sym_finally_clause,
+    ACTIONS(1158), 12,
+      sym__dedent,
+      sym__string_start,
+      anon_sym_LPAREN,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_LBRACE,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_TILDE,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(1160), 33,
+      anon_sym_import,
+      anon_sym_from,
+      anon_sym_STAR,
+      anon_sym_print,
+      anon_sym_assert,
+      anon_sym_return,
+      anon_sym_del,
+      anon_sym_raise,
+      anon_sym_pass,
+      anon_sym_break,
+      anon_sym_continue,
+      anon_sym_if,
+      anon_sym_async,
+      anon_sym_for,
+      anon_sym_while,
+      anon_sym_try,
+      anon_sym_with,
+      anon_sym_match,
+      anon_sym_def,
+      anon_sym_global,
+      anon_sym_nonlocal,
+      anon_sym_exec,
+      anon_sym_type,
+      anon_sym_class,
+      anon_sym_not,
+      anon_sym_lambda,
+      anon_sym_yield,
+      sym_integer,
+      sym_identifier,
+      anon_sym_await,
+      sym_true,
+      sym_false,
+      sym_none,
+  [25328] = 18,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(258), 1,
+      sym_identifier,
+    ACTIONS(262), 1,
+      anon_sym_LPAREN,
+    ACTIONS(277), 1,
+      anon_sym_LBRACK,
+    ACTIONS(279), 1,
+      anon_sym_LBRACE,
+    ACTIONS(283), 1,
+      anon_sym_not,
+    ACTIONS(289), 1,
+      anon_sym_lambda,
+    ACTIONS(297), 1,
+      anon_sym_await,
+    ACTIONS(299), 1,
+      sym__string_start,
+    STATE(586), 1,
+      sym_string,
+    STATE(616), 1,
+      sym_primary_expression,
+    STATE(1081), 1,
+      sym_expression,
+    ACTIONS(293), 2,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(285), 3,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_TILDE,
+    ACTIONS(295), 4,
+      sym_integer,
+      sym_true,
+      sym_false,
+      sym_none,
+    ACTIONS(269), 5,
+      anon_sym_print,
+      anon_sym_async,
+      anon_sym_match,
+      anon_sym_exec,
+      anon_sym_type,
+    STATE(883), 6,
+      sym_named_expression,
+      sym_not_operator,
+      sym_boolean_operator,
+      sym_comparison_operator,
+      sym_lambda,
+      sym_conditional_expression,
+    STATE(605), 16,
+      sym_binary_operator,
+      sym_unary_operator,
+      sym_attribute,
+      sym_subscript,
+      sym_call,
+      sym_list,
+      sym_set,
+      sym_tuple,
+      sym_dictionary,
+      sym_list_comprehension,
+      sym_dictionary_comprehension,
+      sym_set_comprehension,
+      sym_generator_expression,
+      sym_parenthesized_expression,
+      sym_concatenated_string,
+      sym_await,
+  [25413] = 18,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(258), 1,
+      sym_identifier,
+    ACTIONS(262), 1,
+      anon_sym_LPAREN,
+    ACTIONS(277), 1,
+      anon_sym_LBRACK,
+    ACTIONS(279), 1,
+      anon_sym_LBRACE,
+    ACTIONS(283), 1,
+      anon_sym_not,
+    ACTIONS(289), 1,
+      anon_sym_lambda,
+    ACTIONS(297), 1,
+      anon_sym_await,
+    ACTIONS(299), 1,
+      sym__string_start,
+    STATE(586), 1,
+      sym_string,
+    STATE(616), 1,
+      sym_primary_expression,
+    STATE(1082), 1,
+      sym_expression,
+    ACTIONS(293), 2,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(285), 3,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_TILDE,
+    ACTIONS(295), 4,
+      sym_integer,
+      sym_true,
+      sym_false,
+      sym_none,
+    ACTIONS(269), 5,
+      anon_sym_print,
+      anon_sym_async,
+      anon_sym_match,
+      anon_sym_exec,
+      anon_sym_type,
+    STATE(883), 6,
+      sym_named_expression,
+      sym_not_operator,
+      sym_boolean_operator,
+      sym_comparison_operator,
+      sym_lambda,
+      sym_conditional_expression,
+    STATE(605), 16,
+      sym_binary_operator,
+      sym_unary_operator,
+      sym_attribute,
+      sym_subscript,
+      sym_call,
+      sym_list,
+      sym_set,
+      sym_tuple,
+      sym_dictionary,
+      sym_list_comprehension,
+      sym_dictionary_comprehension,
+      sym_set_comprehension,
+      sym_generator_expression,
+      sym_parenthesized_expression,
+      sym_concatenated_string,
+      sym_await,
+  [25498] = 18,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(279), 1,
+      anon_sym_LBRACE,
+    ACTIONS(299), 1,
+      sym__string_start,
+    ACTIONS(578), 1,
+      anon_sym_LPAREN,
+    ACTIONS(584), 1,
+      anon_sym_LBRACK,
+    ACTIONS(626), 1,
+      anon_sym_not,
+    ACTIONS(628), 1,
+      anon_sym_lambda,
+    ACTIONS(668), 1,
+      sym_identifier,
+    ACTIONS(678), 1,
+      anon_sym_await,
+    STATE(586), 1,
+      sym_string,
+    STATE(590), 1,
+      sym_primary_expression,
+    STATE(899), 1,
+      sym_expression,
+    ACTIONS(293), 2,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(582), 3,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_TILDE,
+    ACTIONS(295), 4,
+      sym_integer,
+      sym_true,
+      sym_false,
+      sym_none,
+    ACTIONS(674), 5,
+      anon_sym_print,
+      anon_sym_async,
+      anon_sym_match,
+      anon_sym_exec,
+      anon_sym_type,
+    STATE(883), 6,
+      sym_named_expression,
+      sym_not_operator,
+      sym_boolean_operator,
+      sym_comparison_operator,
+      sym_lambda,
+      sym_conditional_expression,
+    STATE(605), 16,
+      sym_binary_operator,
+      sym_unary_operator,
+      sym_attribute,
+      sym_subscript,
+      sym_call,
+      sym_list,
+      sym_set,
+      sym_tuple,
+      sym_dictionary,
+      sym_list_comprehension,
+      sym_dictionary_comprehension,
+      sym_set_comprehension,
+      sym_generator_expression,
+      sym_parenthesized_expression,
+      sym_concatenated_string,
+      sym_await,
+  [25583] = 18,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(258), 1,
+      sym_identifier,
+    ACTIONS(262), 1,
+      anon_sym_LPAREN,
+    ACTIONS(277), 1,
+      anon_sym_LBRACK,
+    ACTIONS(279), 1,
+      anon_sym_LBRACE,
+    ACTIONS(283), 1,
+      anon_sym_not,
+    ACTIONS(289), 1,
+      anon_sym_lambda,
+    ACTIONS(297), 1,
+      anon_sym_await,
+    ACTIONS(299), 1,
+      sym__string_start,
+    STATE(586), 1,
+      sym_string,
+    STATE(616), 1,
+      sym_primary_expression,
+    STATE(1138), 1,
+      sym_expression,
+    ACTIONS(293), 2,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(285), 3,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_TILDE,
+    ACTIONS(295), 4,
+      sym_integer,
+      sym_true,
+      sym_false,
+      sym_none,
+    ACTIONS(269), 5,
+      anon_sym_print,
+      anon_sym_async,
+      anon_sym_match,
+      anon_sym_exec,
+      anon_sym_type,
+    STATE(883), 6,
+      sym_named_expression,
+      sym_not_operator,
+      sym_boolean_operator,
+      sym_comparison_operator,
+      sym_lambda,
+      sym_conditional_expression,
+    STATE(605), 16,
+      sym_binary_operator,
+      sym_unary_operator,
+      sym_attribute,
+      sym_subscript,
+      sym_call,
+      sym_list,
+      sym_set,
+      sym_tuple,
+      sym_dictionary,
+      sym_list_comprehension,
+      sym_dictionary_comprehension,
+      sym_set_comprehension,
+      sym_generator_expression,
+      sym_parenthesized_expression,
+      sym_concatenated_string,
+      sym_await,
+  [25668] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1121), 12,
+      sym__string_start,
+      ts_builtin_sym_end,
+      anon_sym_LPAREN,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_LBRACE,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_TILDE,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(1119), 35,
+      anon_sym_import,
+      anon_sym_from,
+      anon_sym_STAR,
+      anon_sym_print,
+      anon_sym_assert,
+      anon_sym_return,
+      anon_sym_del,
+      anon_sym_raise,
+      anon_sym_pass,
+      anon_sym_break,
+      anon_sym_continue,
+      anon_sym_if,
+      anon_sym_elif,
+      anon_sym_else,
+      anon_sym_async,
+      anon_sym_for,
+      anon_sym_while,
+      anon_sym_try,
+      anon_sym_with,
+      anon_sym_match,
+      anon_sym_def,
+      anon_sym_global,
+      anon_sym_nonlocal,
+      anon_sym_exec,
+      anon_sym_type,
+      anon_sym_class,
+      anon_sym_not,
+      anon_sym_lambda,
+      anon_sym_yield,
+      sym_integer,
+      sym_identifier,
+      anon_sym_await,
+      sym_true,
+      sym_false,
+      sym_none,
+  [25723] = 18,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(258), 1,
+      sym_identifier,
+    ACTIONS(262), 1,
+      anon_sym_LPAREN,
+    ACTIONS(277), 1,
+      anon_sym_LBRACK,
+    ACTIONS(279), 1,
+      anon_sym_LBRACE,
+    ACTIONS(283), 1,
+      anon_sym_not,
+    ACTIONS(289), 1,
+      anon_sym_lambda,
+    ACTIONS(297), 1,
+      anon_sym_await,
+    ACTIONS(299), 1,
+      sym__string_start,
+    STATE(586), 1,
+      sym_string,
+    STATE(616), 1,
+      sym_primary_expression,
+    STATE(1109), 1,
+      sym_expression,
+    ACTIONS(293), 2,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(285), 3,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_TILDE,
+    ACTIONS(295), 4,
+      sym_integer,
+      sym_true,
+      sym_false,
+      sym_none,
+    ACTIONS(269), 5,
+      anon_sym_print,
+      anon_sym_async,
+      anon_sym_match,
+      anon_sym_exec,
+      anon_sym_type,
+    STATE(883), 6,
+      sym_named_expression,
+      sym_not_operator,
+      sym_boolean_operator,
+      sym_comparison_operator,
+      sym_lambda,
+      sym_conditional_expression,
+    STATE(605), 16,
+      sym_binary_operator,
+      sym_unary_operator,
+      sym_attribute,
+      sym_subscript,
+      sym_call,
+      sym_list,
+      sym_set,
+      sym_tuple,
+      sym_dictionary,
+      sym_list_comprehension,
+      sym_dictionary_comprehension,
+      sym_set_comprehension,
+      sym_generator_expression,
+      sym_parenthesized_expression,
+      sym_concatenated_string,
+      sym_await,
+  [25808] = 18,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(279), 1,
+      anon_sym_LBRACE,
+    ACTIONS(299), 1,
+      sym__string_start,
+    ACTIONS(578), 1,
+      anon_sym_LPAREN,
+    ACTIONS(584), 1,
+      anon_sym_LBRACK,
+    ACTIONS(626), 1,
+      anon_sym_not,
+    ACTIONS(628), 1,
+      anon_sym_lambda,
+    ACTIONS(668), 1,
+      sym_identifier,
+    ACTIONS(678), 1,
+      anon_sym_await,
+    STATE(586), 1,
+      sym_string,
+    STATE(590), 1,
+      sym_primary_expression,
+    STATE(897), 1,
+      sym_expression,
+    ACTIONS(293), 2,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(582), 3,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_TILDE,
+    ACTIONS(295), 4,
+      sym_integer,
+      sym_true,
+      sym_false,
+      sym_none,
+    ACTIONS(674), 5,
+      anon_sym_print,
+      anon_sym_async,
+      anon_sym_match,
+      anon_sym_exec,
+      anon_sym_type,
+    STATE(883), 6,
+      sym_named_expression,
+      sym_not_operator,
+      sym_boolean_operator,
+      sym_comparison_operator,
+      sym_lambda,
+      sym_conditional_expression,
+    STATE(605), 16,
+      sym_binary_operator,
+      sym_unary_operator,
+      sym_attribute,
+      sym_subscript,
+      sym_call,
+      sym_list,
+      sym_set,
+      sym_tuple,
+      sym_dictionary,
+      sym_list_comprehension,
+      sym_dictionary_comprehension,
+      sym_set_comprehension,
+      sym_generator_expression,
+      sym_parenthesized_expression,
+      sym_concatenated_string,
+      sym_await,
+  [25893] = 18,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(51), 1,
+      anon_sym_LBRACE,
+    ACTIONS(69), 1,
+      anon_sym_not,
+    ACTIONS(71), 1,
+      anon_sym_lambda,
+    ACTIONS(81), 1,
+      sym__string_start,
+    ACTIONS(327), 1,
+      sym_identifier,
+    ACTIONS(333), 1,
+      anon_sym_await,
+    ACTIONS(568), 1,
+      anon_sym_LPAREN,
+    ACTIONS(574), 1,
+      anon_sym_LBRACK,
+    STATE(707), 1,
+      sym_primary_expression,
+    STATE(709), 1,
+      sym_string,
+    STATE(1102), 1,
+      sym_expression,
+    ACTIONS(75), 2,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(47), 3,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_TILDE,
+    ACTIONS(77), 4,
+      sym_integer,
+      sym_true,
+      sym_false,
+      sym_none,
+    ACTIONS(329), 5,
+      anon_sym_print,
+      anon_sym_async,
+      anon_sym_match,
+      anon_sym_exec,
+      anon_sym_type,
+    STATE(985), 6,
+      sym_named_expression,
+      sym_not_operator,
+      sym_boolean_operator,
+      sym_comparison_operator,
+      sym_lambda,
+      sym_conditional_expression,
+    STATE(759), 16,
+      sym_binary_operator,
+      sym_unary_operator,
+      sym_attribute,
+      sym_subscript,
+      sym_call,
+      sym_list,
+      sym_set,
+      sym_tuple,
+      sym_dictionary,
+      sym_list_comprehension,
+      sym_dictionary_comprehension,
+      sym_set_comprehension,
+      sym_generator_expression,
+      sym_parenthesized_expression,
+      sym_concatenated_string,
+      sym_await,
+  [25978] = 18,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(258), 1,
+      sym_identifier,
+    ACTIONS(262), 1,
+      anon_sym_LPAREN,
+    ACTIONS(277), 1,
+      anon_sym_LBRACK,
+    ACTIONS(279), 1,
+      anon_sym_LBRACE,
+    ACTIONS(283), 1,
+      anon_sym_not,
+    ACTIONS(289), 1,
+      anon_sym_lambda,
+    ACTIONS(297), 1,
+      anon_sym_await,
+    ACTIONS(299), 1,
+      sym__string_start,
+    STATE(586), 1,
+      sym_string,
+    STATE(616), 1,
+      sym_primary_expression,
+    STATE(895), 1,
+      sym_expression,
+    ACTIONS(293), 2,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(285), 3,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_TILDE,
+    ACTIONS(295), 4,
+      sym_integer,
+      sym_true,
+      sym_false,
+      sym_none,
+    ACTIONS(269), 5,
+      anon_sym_print,
+      anon_sym_async,
+      anon_sym_match,
+      anon_sym_exec,
+      anon_sym_type,
+    STATE(883), 6,
+      sym_named_expression,
+      sym_not_operator,
+      sym_boolean_operator,
+      sym_comparison_operator,
+      sym_lambda,
+      sym_conditional_expression,
+    STATE(605), 16,
+      sym_binary_operator,
+      sym_unary_operator,
+      sym_attribute,
+      sym_subscript,
+      sym_call,
+      sym_list,
+      sym_set,
+      sym_tuple,
+      sym_dictionary,
+      sym_list_comprehension,
+      sym_dictionary_comprehension,
+      sym_set_comprehension,
+      sym_generator_expression,
+      sym_parenthesized_expression,
+      sym_concatenated_string,
+      sym_await,
+  [26063] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1168), 12,
+      sym__string_start,
+      ts_builtin_sym_end,
+      anon_sym_LPAREN,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_LBRACE,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_TILDE,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(1170), 34,
       anon_sym_import,
       anon_sym_from,
       anon_sym_STAR,
@@ -48120,12 +43989,12 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-  [26743] = 3,
+  [26117] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1178), 12,
+    ACTIONS(1174), 12,
+      sym__dedent,
       sym__string_start,
-      ts_builtin_sym_end,
       anon_sym_LPAREN,
       anon_sym_DASH,
       anon_sym_PLUS,
@@ -48136,7 +44005,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_TILDE,
       sym_ellipsis,
       sym_float,
-    ACTIONS(1176), 34,
+    ACTIONS(1172), 34,
       anon_sym_import,
       anon_sym_from,
       anon_sym_STAR,
@@ -48171,61 +44040,10 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-  [26797] = 3,
+  [26171] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1182), 12,
-      sym__dedent,
-      sym__string_start,
-      anon_sym_LPAREN,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_LBRACE,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_TILDE,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(1180), 34,
-      anon_sym_import,
-      anon_sym_from,
-      anon_sym_STAR,
-      anon_sym_print,
-      anon_sym_assert,
-      anon_sym_return,
-      anon_sym_del,
-      anon_sym_raise,
-      anon_sym_pass,
-      anon_sym_break,
-      anon_sym_continue,
-      anon_sym_if,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_while,
-      anon_sym_try,
-      anon_sym_with,
-      anon_sym_match,
-      anon_sym_case,
-      anon_sym_def,
-      anon_sym_global,
-      anon_sym_nonlocal,
-      anon_sym_exec,
-      anon_sym_type,
-      anon_sym_class,
-      anon_sym_not,
-      anon_sym_lambda,
-      anon_sym_yield,
-      sym_integer,
-      sym_identifier,
-      anon_sym_await,
-      sym_true,
-      sym_false,
-      sym_none,
-  [26851] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1184), 12,
+    ACTIONS(1176), 12,
       sym__string_start,
       ts_builtin_sym_end,
       anon_sym_LPAREN,
@@ -48238,7 +44056,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_TILDE,
       sym_ellipsis,
       sym_float,
-    ACTIONS(1186), 34,
+    ACTIONS(1178), 34,
       anon_sym_import,
       anon_sym_from,
       anon_sym_STAR,
@@ -48273,10 +44091,61 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-  [26905] = 3,
+  [26225] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1190), 12,
+    ACTIONS(1180), 12,
+      sym__string_start,
+      ts_builtin_sym_end,
+      anon_sym_LPAREN,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_LBRACE,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_TILDE,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(1182), 34,
+      anon_sym_import,
+      anon_sym_from,
+      anon_sym_STAR,
+      anon_sym_print,
+      anon_sym_assert,
+      anon_sym_return,
+      anon_sym_del,
+      anon_sym_raise,
+      anon_sym_pass,
+      anon_sym_break,
+      anon_sym_continue,
+      anon_sym_if,
+      anon_sym_async,
+      anon_sym_for,
+      anon_sym_while,
+      anon_sym_try,
+      anon_sym_with,
+      anon_sym_match,
+      anon_sym_case,
+      anon_sym_def,
+      anon_sym_global,
+      anon_sym_nonlocal,
+      anon_sym_exec,
+      anon_sym_type,
+      anon_sym_class,
+      anon_sym_not,
+      anon_sym_lambda,
+      anon_sym_yield,
+      sym_integer,
+      sym_identifier,
+      anon_sym_await,
+      sym_true,
+      sym_false,
+      sym_none,
+  [26279] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1186), 12,
       sym__dedent,
       sym__string_start,
       anon_sym_LPAREN,
@@ -48289,7 +44158,262 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_TILDE,
       sym_ellipsis,
       sym_float,
-    ACTIONS(1188), 34,
+    ACTIONS(1184), 34,
+      anon_sym_import,
+      anon_sym_from,
+      anon_sym_STAR,
+      anon_sym_print,
+      anon_sym_assert,
+      anon_sym_return,
+      anon_sym_del,
+      anon_sym_raise,
+      anon_sym_pass,
+      anon_sym_break,
+      anon_sym_continue,
+      anon_sym_if,
+      anon_sym_async,
+      anon_sym_for,
+      anon_sym_while,
+      anon_sym_try,
+      anon_sym_with,
+      anon_sym_match,
+      anon_sym_case,
+      anon_sym_def,
+      anon_sym_global,
+      anon_sym_nonlocal,
+      anon_sym_exec,
+      anon_sym_type,
+      anon_sym_class,
+      anon_sym_not,
+      anon_sym_lambda,
+      anon_sym_yield,
+      sym_integer,
+      sym_identifier,
+      anon_sym_await,
+      sym_true,
+      sym_false,
+      sym_none,
+  [26333] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1188), 12,
+      sym__string_start,
+      ts_builtin_sym_end,
+      anon_sym_LPAREN,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_LBRACE,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_TILDE,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(1190), 34,
+      anon_sym_import,
+      anon_sym_from,
+      anon_sym_STAR,
+      anon_sym_print,
+      anon_sym_assert,
+      anon_sym_return,
+      anon_sym_del,
+      anon_sym_raise,
+      anon_sym_pass,
+      anon_sym_break,
+      anon_sym_continue,
+      anon_sym_if,
+      anon_sym_async,
+      anon_sym_for,
+      anon_sym_while,
+      anon_sym_try,
+      anon_sym_with,
+      anon_sym_match,
+      anon_sym_case,
+      anon_sym_def,
+      anon_sym_global,
+      anon_sym_nonlocal,
+      anon_sym_exec,
+      anon_sym_type,
+      anon_sym_class,
+      anon_sym_not,
+      anon_sym_lambda,
+      anon_sym_yield,
+      sym_integer,
+      sym_identifier,
+      anon_sym_await,
+      sym_true,
+      sym_false,
+      sym_none,
+  [26387] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1180), 12,
+      sym__dedent,
+      sym__string_start,
+      anon_sym_LPAREN,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_LBRACE,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_TILDE,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(1182), 34,
+      anon_sym_import,
+      anon_sym_from,
+      anon_sym_STAR,
+      anon_sym_print,
+      anon_sym_assert,
+      anon_sym_return,
+      anon_sym_del,
+      anon_sym_raise,
+      anon_sym_pass,
+      anon_sym_break,
+      anon_sym_continue,
+      anon_sym_if,
+      anon_sym_async,
+      anon_sym_for,
+      anon_sym_while,
+      anon_sym_try,
+      anon_sym_with,
+      anon_sym_match,
+      anon_sym_case,
+      anon_sym_def,
+      anon_sym_global,
+      anon_sym_nonlocal,
+      anon_sym_exec,
+      anon_sym_type,
+      anon_sym_class,
+      anon_sym_not,
+      anon_sym_lambda,
+      anon_sym_yield,
+      sym_integer,
+      sym_identifier,
+      anon_sym_await,
+      sym_true,
+      sym_false,
+      sym_none,
+  [26441] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1176), 12,
+      sym__dedent,
+      sym__string_start,
+      anon_sym_LPAREN,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_LBRACE,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_TILDE,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(1178), 34,
+      anon_sym_import,
+      anon_sym_from,
+      anon_sym_STAR,
+      anon_sym_print,
+      anon_sym_assert,
+      anon_sym_return,
+      anon_sym_del,
+      anon_sym_raise,
+      anon_sym_pass,
+      anon_sym_break,
+      anon_sym_continue,
+      anon_sym_if,
+      anon_sym_async,
+      anon_sym_for,
+      anon_sym_while,
+      anon_sym_try,
+      anon_sym_with,
+      anon_sym_match,
+      anon_sym_case,
+      anon_sym_def,
+      anon_sym_global,
+      anon_sym_nonlocal,
+      anon_sym_exec,
+      anon_sym_type,
+      anon_sym_class,
+      anon_sym_not,
+      anon_sym_lambda,
+      anon_sym_yield,
+      sym_integer,
+      sym_identifier,
+      anon_sym_await,
+      sym_true,
+      sym_false,
+      sym_none,
+  [26495] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1186), 12,
+      sym__string_start,
+      ts_builtin_sym_end,
+      anon_sym_LPAREN,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_LBRACE,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_TILDE,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(1184), 34,
+      anon_sym_import,
+      anon_sym_from,
+      anon_sym_STAR,
+      anon_sym_print,
+      anon_sym_assert,
+      anon_sym_return,
+      anon_sym_del,
+      anon_sym_raise,
+      anon_sym_pass,
+      anon_sym_break,
+      anon_sym_continue,
+      anon_sym_if,
+      anon_sym_async,
+      anon_sym_for,
+      anon_sym_while,
+      anon_sym_try,
+      anon_sym_with,
+      anon_sym_match,
+      anon_sym_case,
+      anon_sym_def,
+      anon_sym_global,
+      anon_sym_nonlocal,
+      anon_sym_exec,
+      anon_sym_type,
+      anon_sym_class,
+      anon_sym_not,
+      anon_sym_lambda,
+      anon_sym_yield,
+      sym_integer,
+      sym_identifier,
+      anon_sym_await,
+      sym_true,
+      sym_false,
+      sym_none,
+  [26549] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1174), 12,
+      sym__string_start,
+      ts_builtin_sym_end,
+      anon_sym_LPAREN,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_LBRACE,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_TILDE,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(1172), 34,
       anon_sym_import,
       anon_sym_from,
       anon_sym_STAR,
@@ -48324,61 +44448,10 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-  [26959] = 3,
+  [26603] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1182), 12,
-      sym__string_start,
-      ts_builtin_sym_end,
-      anon_sym_LPAREN,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_LBRACE,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_TILDE,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(1180), 34,
-      anon_sym_import,
-      anon_sym_from,
-      anon_sym_STAR,
-      anon_sym_print,
-      anon_sym_assert,
-      anon_sym_return,
-      anon_sym_del,
-      anon_sym_raise,
-      anon_sym_pass,
-      anon_sym_break,
-      anon_sym_continue,
-      anon_sym_if,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_while,
-      anon_sym_try,
-      anon_sym_with,
-      anon_sym_match,
-      anon_sym_case,
-      anon_sym_def,
-      anon_sym_global,
-      anon_sym_nonlocal,
-      anon_sym_exec,
-      anon_sym_type,
-      anon_sym_class,
-      anon_sym_not,
-      anon_sym_lambda,
-      anon_sym_yield,
-      sym_integer,
-      sym_identifier,
-      anon_sym_await,
-      sym_true,
-      sym_false,
-      sym_none,
-  [27013] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1194), 12,
+    ACTIONS(1168), 12,
       sym__dedent,
       sym__string_start,
       anon_sym_LPAREN,
@@ -48391,262 +44464,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_TILDE,
       sym_ellipsis,
       sym_float,
-    ACTIONS(1192), 34,
-      anon_sym_import,
-      anon_sym_from,
-      anon_sym_STAR,
-      anon_sym_print,
-      anon_sym_assert,
-      anon_sym_return,
-      anon_sym_del,
-      anon_sym_raise,
-      anon_sym_pass,
-      anon_sym_break,
-      anon_sym_continue,
-      anon_sym_if,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_while,
-      anon_sym_try,
-      anon_sym_with,
-      anon_sym_match,
-      anon_sym_case,
-      anon_sym_def,
-      anon_sym_global,
-      anon_sym_nonlocal,
-      anon_sym_exec,
-      anon_sym_type,
-      anon_sym_class,
-      anon_sym_not,
-      anon_sym_lambda,
-      anon_sym_yield,
-      sym_integer,
-      sym_identifier,
-      anon_sym_await,
-      sym_true,
-      sym_false,
-      sym_none,
-  [27067] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1198), 12,
-      sym__dedent,
-      sym__string_start,
-      anon_sym_LPAREN,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_LBRACE,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_TILDE,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(1196), 34,
-      anon_sym_import,
-      anon_sym_from,
-      anon_sym_STAR,
-      anon_sym_print,
-      anon_sym_assert,
-      anon_sym_return,
-      anon_sym_del,
-      anon_sym_raise,
-      anon_sym_pass,
-      anon_sym_break,
-      anon_sym_continue,
-      anon_sym_if,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_while,
-      anon_sym_try,
-      anon_sym_with,
-      anon_sym_match,
-      anon_sym_case,
-      anon_sym_def,
-      anon_sym_global,
-      anon_sym_nonlocal,
-      anon_sym_exec,
-      anon_sym_type,
-      anon_sym_class,
-      anon_sym_not,
-      anon_sym_lambda,
-      anon_sym_yield,
-      sym_integer,
-      sym_identifier,
-      anon_sym_await,
-      sym_true,
-      sym_false,
-      sym_none,
-  [27121] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1198), 12,
-      sym__string_start,
-      ts_builtin_sym_end,
-      anon_sym_LPAREN,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_LBRACE,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_TILDE,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(1196), 34,
-      anon_sym_import,
-      anon_sym_from,
-      anon_sym_STAR,
-      anon_sym_print,
-      anon_sym_assert,
-      anon_sym_return,
-      anon_sym_del,
-      anon_sym_raise,
-      anon_sym_pass,
-      anon_sym_break,
-      anon_sym_continue,
-      anon_sym_if,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_while,
-      anon_sym_try,
-      anon_sym_with,
-      anon_sym_match,
-      anon_sym_case,
-      anon_sym_def,
-      anon_sym_global,
-      anon_sym_nonlocal,
-      anon_sym_exec,
-      anon_sym_type,
-      anon_sym_class,
-      anon_sym_not,
-      anon_sym_lambda,
-      anon_sym_yield,
-      sym_integer,
-      sym_identifier,
-      anon_sym_await,
-      sym_true,
-      sym_false,
-      sym_none,
-  [27175] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1194), 12,
-      sym__string_start,
-      ts_builtin_sym_end,
-      anon_sym_LPAREN,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_LBRACE,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_TILDE,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(1192), 34,
-      anon_sym_import,
-      anon_sym_from,
-      anon_sym_STAR,
-      anon_sym_print,
-      anon_sym_assert,
-      anon_sym_return,
-      anon_sym_del,
-      anon_sym_raise,
-      anon_sym_pass,
-      anon_sym_break,
-      anon_sym_continue,
-      anon_sym_if,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_while,
-      anon_sym_try,
-      anon_sym_with,
-      anon_sym_match,
-      anon_sym_case,
-      anon_sym_def,
-      anon_sym_global,
-      anon_sym_nonlocal,
-      anon_sym_exec,
-      anon_sym_type,
-      anon_sym_class,
-      anon_sym_not,
-      anon_sym_lambda,
-      anon_sym_yield,
-      sym_integer,
-      sym_identifier,
-      anon_sym_await,
-      sym_true,
-      sym_false,
-      sym_none,
-  [27229] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1184), 12,
-      sym__dedent,
-      sym__string_start,
-      anon_sym_LPAREN,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_LBRACE,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_TILDE,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(1186), 34,
-      anon_sym_import,
-      anon_sym_from,
-      anon_sym_STAR,
-      anon_sym_print,
-      anon_sym_assert,
-      anon_sym_return,
-      anon_sym_del,
-      anon_sym_raise,
-      anon_sym_pass,
-      anon_sym_break,
-      anon_sym_continue,
-      anon_sym_if,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_while,
-      anon_sym_try,
-      anon_sym_with,
-      anon_sym_match,
-      anon_sym_case,
-      anon_sym_def,
-      anon_sym_global,
-      anon_sym_nonlocal,
-      anon_sym_exec,
-      anon_sym_type,
-      anon_sym_class,
-      anon_sym_not,
-      anon_sym_lambda,
-      anon_sym_yield,
-      sym_integer,
-      sym_identifier,
-      anon_sym_await,
-      sym_true,
-      sym_false,
-      sym_none,
-  [27283] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1190), 12,
-      sym__string_start,
-      ts_builtin_sym_end,
-      anon_sym_LPAREN,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_LBRACE,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_TILDE,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(1188), 34,
+    ACTIONS(1170), 34,
       anon_sym_import,
       anon_sym_from,
       anon_sym_STAR,
@@ -48681,7 +44499,208 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-  [27337] = 3,
+  [26657] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1188), 12,
+      sym__dedent,
+      sym__string_start,
+      anon_sym_LPAREN,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_LBRACE,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_TILDE,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(1190), 34,
+      anon_sym_import,
+      anon_sym_from,
+      anon_sym_STAR,
+      anon_sym_print,
+      anon_sym_assert,
+      anon_sym_return,
+      anon_sym_del,
+      anon_sym_raise,
+      anon_sym_pass,
+      anon_sym_break,
+      anon_sym_continue,
+      anon_sym_if,
+      anon_sym_async,
+      anon_sym_for,
+      anon_sym_while,
+      anon_sym_try,
+      anon_sym_with,
+      anon_sym_match,
+      anon_sym_case,
+      anon_sym_def,
+      anon_sym_global,
+      anon_sym_nonlocal,
+      anon_sym_exec,
+      anon_sym_type,
+      anon_sym_class,
+      anon_sym_not,
+      anon_sym_lambda,
+      anon_sym_yield,
+      sym_integer,
+      sym_identifier,
+      anon_sym_await,
+      sym_true,
+      sym_false,
+      sym_none,
+  [26711] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1192), 12,
+      sym__string_start,
+      ts_builtin_sym_end,
+      anon_sym_LPAREN,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_LBRACE,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_TILDE,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(1194), 33,
+      anon_sym_import,
+      anon_sym_from,
+      anon_sym_STAR,
+      anon_sym_print,
+      anon_sym_assert,
+      anon_sym_return,
+      anon_sym_del,
+      anon_sym_raise,
+      anon_sym_pass,
+      anon_sym_break,
+      anon_sym_continue,
+      anon_sym_if,
+      anon_sym_async,
+      anon_sym_for,
+      anon_sym_while,
+      anon_sym_try,
+      anon_sym_with,
+      anon_sym_match,
+      anon_sym_def,
+      anon_sym_global,
+      anon_sym_nonlocal,
+      anon_sym_exec,
+      anon_sym_type,
+      anon_sym_class,
+      anon_sym_not,
+      anon_sym_lambda,
+      anon_sym_yield,
+      sym_integer,
+      sym_identifier,
+      anon_sym_await,
+      sym_true,
+      sym_false,
+      sym_none,
+  [26764] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1196), 12,
+      sym__string_start,
+      ts_builtin_sym_end,
+      anon_sym_LPAREN,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_LBRACE,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_TILDE,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(1198), 33,
+      anon_sym_import,
+      anon_sym_from,
+      anon_sym_STAR,
+      anon_sym_print,
+      anon_sym_assert,
+      anon_sym_return,
+      anon_sym_del,
+      anon_sym_raise,
+      anon_sym_pass,
+      anon_sym_break,
+      anon_sym_continue,
+      anon_sym_if,
+      anon_sym_async,
+      anon_sym_for,
+      anon_sym_while,
+      anon_sym_try,
+      anon_sym_with,
+      anon_sym_match,
+      anon_sym_def,
+      anon_sym_global,
+      anon_sym_nonlocal,
+      anon_sym_exec,
+      anon_sym_type,
+      anon_sym_class,
+      anon_sym_not,
+      anon_sym_lambda,
+      anon_sym_yield,
+      sym_integer,
+      sym_identifier,
+      anon_sym_await,
+      sym_true,
+      sym_false,
+      sym_none,
+  [26817] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1158), 12,
+      sym__string_start,
+      ts_builtin_sym_end,
+      anon_sym_LPAREN,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_LBRACE,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_TILDE,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(1160), 33,
+      anon_sym_import,
+      anon_sym_from,
+      anon_sym_STAR,
+      anon_sym_print,
+      anon_sym_assert,
+      anon_sym_return,
+      anon_sym_del,
+      anon_sym_raise,
+      anon_sym_pass,
+      anon_sym_break,
+      anon_sym_continue,
+      anon_sym_if,
+      anon_sym_async,
+      anon_sym_for,
+      anon_sym_while,
+      anon_sym_try,
+      anon_sym_with,
+      anon_sym_match,
+      anon_sym_def,
+      anon_sym_global,
+      anon_sym_nonlocal,
+      anon_sym_exec,
+      anon_sym_type,
+      anon_sym_class,
+      anon_sym_not,
+      anon_sym_lambda,
+      anon_sym_yield,
+      sym_integer,
+      sym_identifier,
+      anon_sym_await,
+      sym_true,
+      sym_false,
+      sym_none,
+  [26870] = 3,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(1200), 12,
@@ -48731,12 +44750,12 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-  [27390] = 3,
+  [26923] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1206), 12,
-      sym__dedent,
+    ACTIONS(1204), 12,
       sym__string_start,
+      ts_builtin_sym_end,
       anon_sym_LPAREN,
       anon_sym_DASH,
       anon_sym_PLUS,
@@ -48747,7 +44766,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_TILDE,
       sym_ellipsis,
       sym_float,
-    ACTIONS(1204), 33,
+    ACTIONS(1206), 33,
       anon_sym_import,
       anon_sym_from,
       anon_sym_STAR,
@@ -48781,7 +44800,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-  [27443] = 3,
+  [26976] = 3,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(1208), 12,
@@ -48831,7 +44850,57 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-  [27496] = 3,
+  [27029] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(820), 12,
+      sym__dedent,
+      sym__string_start,
+      anon_sym_LPAREN,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_LBRACE,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_TILDE,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(818), 33,
+      anon_sym_import,
+      anon_sym_from,
+      anon_sym_STAR,
+      anon_sym_print,
+      anon_sym_assert,
+      anon_sym_return,
+      anon_sym_del,
+      anon_sym_raise,
+      anon_sym_pass,
+      anon_sym_break,
+      anon_sym_continue,
+      anon_sym_if,
+      anon_sym_async,
+      anon_sym_for,
+      anon_sym_while,
+      anon_sym_try,
+      anon_sym_with,
+      anon_sym_match,
+      anon_sym_def,
+      anon_sym_global,
+      anon_sym_nonlocal,
+      anon_sym_exec,
+      anon_sym_type,
+      anon_sym_class,
+      anon_sym_not,
+      anon_sym_lambda,
+      anon_sym_yield,
+      sym_integer,
+      sym_identifier,
+      anon_sym_await,
+      sym_true,
+      sym_false,
+      sym_none,
+  [27082] = 3,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(1212), 12,
@@ -48881,7 +44950,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-  [27549] = 3,
+  [27135] = 3,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(1216), 12,
@@ -48931,10 +45000,60 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-  [27602] = 3,
+  [27188] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1222), 12,
+    ACTIONS(1220), 12,
+      sym__string_start,
+      ts_builtin_sym_end,
+      anon_sym_LPAREN,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_LBRACE,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_TILDE,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(1222), 33,
+      anon_sym_import,
+      anon_sym_from,
+      anon_sym_STAR,
+      anon_sym_print,
+      anon_sym_assert,
+      anon_sym_return,
+      anon_sym_del,
+      anon_sym_raise,
+      anon_sym_pass,
+      anon_sym_break,
+      anon_sym_continue,
+      anon_sym_if,
+      anon_sym_async,
+      anon_sym_for,
+      anon_sym_while,
+      anon_sym_try,
+      anon_sym_with,
+      anon_sym_match,
+      anon_sym_def,
+      anon_sym_global,
+      anon_sym_nonlocal,
+      anon_sym_exec,
+      anon_sym_type,
+      anon_sym_class,
+      anon_sym_not,
+      anon_sym_lambda,
+      anon_sym_yield,
+      sym_integer,
+      sym_identifier,
+      anon_sym_await,
+      sym_true,
+      sym_false,
+      sym_none,
+  [27241] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1226), 12,
       sym__dedent,
       sym__string_start,
       anon_sym_LPAREN,
@@ -48947,7 +45066,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_TILDE,
       sym_ellipsis,
       sym_float,
-    ACTIONS(1220), 33,
+    ACTIONS(1224), 33,
       anon_sym_import,
       anon_sym_from,
       anon_sym_STAR,
@@ -48981,107 +45100,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-  [27655] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1224), 12,
-      sym__string_start,
-      ts_builtin_sym_end,
-      anon_sym_LPAREN,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_LBRACE,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_TILDE,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(1226), 33,
-      anon_sym_import,
-      anon_sym_from,
-      anon_sym_STAR,
-      anon_sym_print,
-      anon_sym_assert,
-      anon_sym_return,
-      anon_sym_del,
-      anon_sym_raise,
-      anon_sym_pass,
-      anon_sym_break,
-      anon_sym_continue,
-      anon_sym_if,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_while,
-      anon_sym_try,
-      anon_sym_with,
-      anon_sym_match,
-      anon_sym_def,
-      anon_sym_global,
-      anon_sym_nonlocal,
-      anon_sym_exec,
-      anon_sym_type,
-      anon_sym_class,
-      anon_sym_not,
-      anon_sym_lambda,
-      anon_sym_yield,
-      sym_integer,
-      sym_identifier,
-      anon_sym_await,
-      sym_true,
-      sym_false,
-      sym_none,
-  [27708] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1132), 12,
-      sym__string_start,
-      ts_builtin_sym_end,
-      anon_sym_LPAREN,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_LBRACE,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_TILDE,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(1130), 33,
-      anon_sym_import,
-      anon_sym_from,
-      anon_sym_STAR,
-      anon_sym_print,
-      anon_sym_assert,
-      anon_sym_return,
-      anon_sym_del,
-      anon_sym_raise,
-      anon_sym_pass,
-      anon_sym_break,
-      anon_sym_continue,
-      anon_sym_if,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_while,
-      anon_sym_try,
-      anon_sym_with,
-      anon_sym_match,
-      anon_sym_def,
-      anon_sym_global,
-      anon_sym_nonlocal,
-      anon_sym_exec,
-      anon_sym_type,
-      anon_sym_class,
-      anon_sym_not,
-      anon_sym_lambda,
-      anon_sym_yield,
-      sym_integer,
-      sym_identifier,
-      anon_sym_await,
-      sym_true,
-      sym_false,
-      sym_none,
-  [27761] = 3,
+  [27294] = 3,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(1230), 12,
@@ -49131,7 +45150,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-  [27814] = 3,
+  [27347] = 3,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(1234), 12,
@@ -49181,10 +45200,10 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-  [27867] = 3,
+  [27400] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(860), 12,
+    ACTIONS(1236), 12,
       sym__string_start,
       ts_builtin_sym_end,
       anon_sym_LPAREN,
@@ -49197,7 +45216,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_TILDE,
       sym_ellipsis,
       sym_float,
-    ACTIONS(858), 33,
+    ACTIONS(1238), 33,
       anon_sym_import,
       anon_sym_from,
       anon_sym_STAR,
@@ -49231,57 +45250,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-  [27920] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1238), 12,
-      sym__dedent,
-      sym__string_start,
-      anon_sym_LPAREN,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_LBRACE,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_TILDE,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(1236), 33,
-      anon_sym_import,
-      anon_sym_from,
-      anon_sym_STAR,
-      anon_sym_print,
-      anon_sym_assert,
-      anon_sym_return,
-      anon_sym_del,
-      anon_sym_raise,
-      anon_sym_pass,
-      anon_sym_break,
-      anon_sym_continue,
-      anon_sym_if,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_while,
-      anon_sym_try,
-      anon_sym_with,
-      anon_sym_match,
-      anon_sym_def,
-      anon_sym_global,
-      anon_sym_nonlocal,
-      anon_sym_exec,
-      anon_sym_type,
-      anon_sym_class,
-      anon_sym_not,
-      anon_sym_lambda,
-      anon_sym_yield,
-      sym_integer,
-      sym_identifier,
-      anon_sym_await,
-      sym_true,
-      sym_false,
-      sym_none,
-  [27973] = 3,
+  [27453] = 3,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(1242), 12,
@@ -49331,12 +45300,12 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-  [28026] = 3,
+  [27506] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1246), 12,
-      sym__dedent,
+    ACTIONS(1244), 12,
       sym__string_start,
+      ts_builtin_sym_end,
       anon_sym_LPAREN,
       anon_sym_DASH,
       anon_sym_PLUS,
@@ -49347,7 +45316,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_TILDE,
       sym_ellipsis,
       sym_float,
-    ACTIONS(1244), 33,
+    ACTIONS(1246), 33,
       anon_sym_import,
       anon_sym_from,
       anon_sym_STAR,
@@ -49381,7 +45350,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-  [28079] = 3,
+  [27559] = 3,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(1248), 12,
@@ -49431,7 +45400,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-  [28132] = 3,
+  [27612] = 3,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(1252), 12,
@@ -49481,60 +45450,10 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-  [28185] = 3,
+  [27665] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1252), 12,
-      sym__dedent,
-      sym__string_start,
-      anon_sym_LPAREN,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_LBRACE,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_TILDE,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(1254), 33,
-      anon_sym_import,
-      anon_sym_from,
-      anon_sym_STAR,
-      anon_sym_print,
-      anon_sym_assert,
-      anon_sym_return,
-      anon_sym_del,
-      anon_sym_raise,
-      anon_sym_pass,
-      anon_sym_break,
-      anon_sym_continue,
-      anon_sym_if,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_while,
-      anon_sym_try,
-      anon_sym_with,
-      anon_sym_match,
-      anon_sym_def,
-      anon_sym_global,
-      anon_sym_nonlocal,
-      anon_sym_exec,
-      anon_sym_type,
-      anon_sym_class,
-      anon_sym_not,
-      anon_sym_lambda,
-      anon_sym_yield,
-      sym_integer,
-      sym_identifier,
-      anon_sym_await,
-      sym_true,
-      sym_false,
-      sym_none,
-  [28238] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(842), 12,
+    ACTIONS(1256), 12,
       sym__string_start,
       ts_builtin_sym_end,
       anon_sym_LPAREN,
@@ -49547,7 +45466,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_TILDE,
       sym_ellipsis,
       sym_float,
-    ACTIONS(844), 33,
+    ACTIONS(1258), 33,
       anon_sym_import,
       anon_sym_from,
       anon_sym_STAR,
@@ -49581,157 +45500,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-  [28291] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1206), 12,
-      sym__string_start,
-      ts_builtin_sym_end,
-      anon_sym_LPAREN,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_LBRACE,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_TILDE,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(1204), 33,
-      anon_sym_import,
-      anon_sym_from,
-      anon_sym_STAR,
-      anon_sym_print,
-      anon_sym_assert,
-      anon_sym_return,
-      anon_sym_del,
-      anon_sym_raise,
-      anon_sym_pass,
-      anon_sym_break,
-      anon_sym_continue,
-      anon_sym_if,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_while,
-      anon_sym_try,
-      anon_sym_with,
-      anon_sym_match,
-      anon_sym_def,
-      anon_sym_global,
-      anon_sym_nonlocal,
-      anon_sym_exec,
-      anon_sym_type,
-      anon_sym_class,
-      anon_sym_not,
-      anon_sym_lambda,
-      anon_sym_yield,
-      sym_integer,
-      sym_identifier,
-      anon_sym_await,
-      sym_true,
-      sym_false,
-      sym_none,
-  [28344] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(860), 12,
-      sym__dedent,
-      sym__string_start,
-      anon_sym_LPAREN,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_LBRACE,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_TILDE,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(858), 33,
-      anon_sym_import,
-      anon_sym_from,
-      anon_sym_STAR,
-      anon_sym_print,
-      anon_sym_assert,
-      anon_sym_return,
-      anon_sym_del,
-      anon_sym_raise,
-      anon_sym_pass,
-      anon_sym_break,
-      anon_sym_continue,
-      anon_sym_if,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_while,
-      anon_sym_try,
-      anon_sym_with,
-      anon_sym_match,
-      anon_sym_def,
-      anon_sym_global,
-      anon_sym_nonlocal,
-      anon_sym_exec,
-      anon_sym_type,
-      anon_sym_class,
-      anon_sym_not,
-      anon_sym_lambda,
-      anon_sym_yield,
-      sym_integer,
-      sym_identifier,
-      anon_sym_await,
-      sym_true,
-      sym_false,
-      sym_none,
-  [28397] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1258), 12,
-      sym__dedent,
-      sym__string_start,
-      anon_sym_LPAREN,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_LBRACE,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_TILDE,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(1256), 33,
-      anon_sym_import,
-      anon_sym_from,
-      anon_sym_STAR,
-      anon_sym_print,
-      anon_sym_assert,
-      anon_sym_return,
-      anon_sym_del,
-      anon_sym_raise,
-      anon_sym_pass,
-      anon_sym_break,
-      anon_sym_continue,
-      anon_sym_if,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_while,
-      anon_sym_try,
-      anon_sym_with,
-      anon_sym_match,
-      anon_sym_def,
-      anon_sym_global,
-      anon_sym_nonlocal,
-      anon_sym_exec,
-      anon_sym_type,
-      anon_sym_class,
-      anon_sym_not,
-      anon_sym_lambda,
-      anon_sym_yield,
-      sym_integer,
-      sym_identifier,
-      anon_sym_await,
-      sym_true,
-      sym_false,
-      sym_none,
-  [28450] = 3,
+  [27718] = 3,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(1260), 12,
@@ -49781,3922 +45550,59 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-  [28503] = 3,
+  [27771] = 20,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1264), 12,
-      sym__string_start,
-      ts_builtin_sym_end,
-      anon_sym_LPAREN,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_LBRACE,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_TILDE,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(1266), 33,
-      anon_sym_import,
-      anon_sym_from,
-      anon_sym_STAR,
-      anon_sym_print,
-      anon_sym_assert,
-      anon_sym_return,
-      anon_sym_del,
-      anon_sym_raise,
-      anon_sym_pass,
-      anon_sym_break,
-      anon_sym_continue,
-      anon_sym_if,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_while,
-      anon_sym_try,
-      anon_sym_with,
-      anon_sym_match,
-      anon_sym_def,
-      anon_sym_global,
-      anon_sym_nonlocal,
-      anon_sym_exec,
-      anon_sym_type,
-      anon_sym_class,
-      anon_sym_not,
-      anon_sym_lambda,
-      anon_sym_yield,
-      sym_integer,
-      sym_identifier,
-      anon_sym_await,
-      sym_true,
-      sym_false,
-      sym_none,
-  [28556] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1132), 12,
-      sym__dedent,
-      sym__string_start,
-      anon_sym_LPAREN,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_LBRACE,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_TILDE,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(1130), 33,
-      anon_sym_import,
-      anon_sym_from,
-      anon_sym_STAR,
-      anon_sym_print,
-      anon_sym_assert,
-      anon_sym_return,
-      anon_sym_del,
-      anon_sym_raise,
-      anon_sym_pass,
-      anon_sym_break,
-      anon_sym_continue,
-      anon_sym_if,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_while,
-      anon_sym_try,
-      anon_sym_with,
-      anon_sym_match,
-      anon_sym_def,
-      anon_sym_global,
-      anon_sym_nonlocal,
-      anon_sym_exec,
-      anon_sym_type,
-      anon_sym_class,
-      anon_sym_not,
-      anon_sym_lambda,
-      anon_sym_yield,
-      sym_integer,
-      sym_identifier,
-      anon_sym_await,
-      sym_true,
-      sym_false,
-      sym_none,
-  [28609] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1268), 12,
-      sym__string_start,
-      ts_builtin_sym_end,
-      anon_sym_LPAREN,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_LBRACE,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_TILDE,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(1270), 33,
-      anon_sym_import,
-      anon_sym_from,
-      anon_sym_STAR,
-      anon_sym_print,
-      anon_sym_assert,
-      anon_sym_return,
-      anon_sym_del,
-      anon_sym_raise,
-      anon_sym_pass,
-      anon_sym_break,
-      anon_sym_continue,
-      anon_sym_if,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_while,
-      anon_sym_try,
-      anon_sym_with,
-      anon_sym_match,
-      anon_sym_def,
-      anon_sym_global,
-      anon_sym_nonlocal,
-      anon_sym_exec,
-      anon_sym_type,
-      anon_sym_class,
-      anon_sym_not,
-      anon_sym_lambda,
-      anon_sym_yield,
-      sym_integer,
-      sym_identifier,
-      anon_sym_await,
-      sym_true,
-      sym_false,
-      sym_none,
-  [28662] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1274), 12,
-      sym__dedent,
-      sym__string_start,
-      anon_sym_LPAREN,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_LBRACE,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_TILDE,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(1272), 33,
-      anon_sym_import,
-      anon_sym_from,
-      anon_sym_STAR,
-      anon_sym_print,
-      anon_sym_assert,
-      anon_sym_return,
-      anon_sym_del,
-      anon_sym_raise,
-      anon_sym_pass,
-      anon_sym_break,
-      anon_sym_continue,
-      anon_sym_if,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_while,
-      anon_sym_try,
-      anon_sym_with,
-      anon_sym_match,
-      anon_sym_def,
-      anon_sym_global,
-      anon_sym_nonlocal,
-      anon_sym_exec,
-      anon_sym_type,
-      anon_sym_class,
-      anon_sym_not,
-      anon_sym_lambda,
-      anon_sym_yield,
-      sym_integer,
-      sym_identifier,
-      anon_sym_await,
-      sym_true,
-      sym_false,
-      sym_none,
-  [28715] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1159), 12,
-      sym__string_start,
-      ts_builtin_sym_end,
-      anon_sym_LPAREN,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_LBRACE,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_TILDE,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(1157), 33,
-      anon_sym_import,
-      anon_sym_from,
-      anon_sym_STAR,
-      anon_sym_print,
-      anon_sym_assert,
-      anon_sym_return,
-      anon_sym_del,
-      anon_sym_raise,
-      anon_sym_pass,
-      anon_sym_break,
-      anon_sym_continue,
-      anon_sym_if,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_while,
-      anon_sym_try,
-      anon_sym_with,
-      anon_sym_match,
-      anon_sym_def,
-      anon_sym_global,
-      anon_sym_nonlocal,
-      anon_sym_exec,
-      anon_sym_type,
-      anon_sym_class,
-      anon_sym_not,
-      anon_sym_lambda,
-      anon_sym_yield,
-      sym_integer,
-      sym_identifier,
-      anon_sym_await,
-      sym_true,
-      sym_false,
-      sym_none,
-  [28768] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1276), 12,
-      sym__string_start,
-      ts_builtin_sym_end,
-      anon_sym_LPAREN,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_LBRACE,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_TILDE,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(1278), 33,
-      anon_sym_import,
-      anon_sym_from,
-      anon_sym_STAR,
-      anon_sym_print,
-      anon_sym_assert,
-      anon_sym_return,
-      anon_sym_del,
-      anon_sym_raise,
-      anon_sym_pass,
-      anon_sym_break,
-      anon_sym_continue,
-      anon_sym_if,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_while,
-      anon_sym_try,
-      anon_sym_with,
-      anon_sym_match,
-      anon_sym_def,
-      anon_sym_global,
-      anon_sym_nonlocal,
-      anon_sym_exec,
-      anon_sym_type,
-      anon_sym_class,
-      anon_sym_not,
-      anon_sym_lambda,
-      anon_sym_yield,
-      sym_integer,
-      sym_identifier,
-      anon_sym_await,
-      sym_true,
-      sym_false,
-      sym_none,
-  [28821] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1212), 12,
-      sym__dedent,
-      sym__string_start,
-      anon_sym_LPAREN,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_LBRACE,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_TILDE,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(1214), 33,
-      anon_sym_import,
-      anon_sym_from,
-      anon_sym_STAR,
-      anon_sym_print,
-      anon_sym_assert,
-      anon_sym_return,
-      anon_sym_del,
-      anon_sym_raise,
-      anon_sym_pass,
-      anon_sym_break,
-      anon_sym_continue,
-      anon_sym_if,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_while,
-      anon_sym_try,
-      anon_sym_with,
-      anon_sym_match,
-      anon_sym_def,
-      anon_sym_global,
-      anon_sym_nonlocal,
-      anon_sym_exec,
-      anon_sym_type,
-      anon_sym_class,
-      anon_sym_not,
-      anon_sym_lambda,
-      anon_sym_yield,
-      sym_integer,
-      sym_identifier,
-      anon_sym_await,
-      sym_true,
-      sym_false,
-      sym_none,
-  [28874] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1276), 12,
-      sym__dedent,
-      sym__string_start,
-      anon_sym_LPAREN,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_LBRACE,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_TILDE,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(1278), 33,
-      anon_sym_import,
-      anon_sym_from,
-      anon_sym_STAR,
-      anon_sym_print,
-      anon_sym_assert,
-      anon_sym_return,
-      anon_sym_del,
-      anon_sym_raise,
-      anon_sym_pass,
-      anon_sym_break,
-      anon_sym_continue,
-      anon_sym_if,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_while,
-      anon_sym_try,
-      anon_sym_with,
-      anon_sym_match,
-      anon_sym_def,
-      anon_sym_global,
-      anon_sym_nonlocal,
-      anon_sym_exec,
-      anon_sym_type,
-      anon_sym_class,
-      anon_sym_not,
-      anon_sym_lambda,
-      anon_sym_yield,
-      sym_integer,
-      sym_identifier,
-      anon_sym_await,
-      sym_true,
-      sym_false,
-      sym_none,
-  [28927] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1282), 12,
-      sym__dedent,
-      sym__string_start,
-      anon_sym_LPAREN,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_LBRACE,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_TILDE,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(1280), 33,
-      anon_sym_import,
-      anon_sym_from,
-      anon_sym_STAR,
-      anon_sym_print,
-      anon_sym_assert,
-      anon_sym_return,
-      anon_sym_del,
-      anon_sym_raise,
-      anon_sym_pass,
-      anon_sym_break,
-      anon_sym_continue,
-      anon_sym_if,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_while,
-      anon_sym_try,
-      anon_sym_with,
-      anon_sym_match,
-      anon_sym_def,
-      anon_sym_global,
-      anon_sym_nonlocal,
-      anon_sym_exec,
-      anon_sym_type,
-      anon_sym_class,
-      anon_sym_not,
-      anon_sym_lambda,
-      anon_sym_yield,
-      sym_integer,
-      sym_identifier,
-      anon_sym_await,
-      sym_true,
-      sym_false,
-      sym_none,
-  [28980] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1284), 12,
-      sym__string_start,
-      ts_builtin_sym_end,
-      anon_sym_LPAREN,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_LBRACE,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_TILDE,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(1286), 33,
-      anon_sym_import,
-      anon_sym_from,
-      anon_sym_STAR,
-      anon_sym_print,
-      anon_sym_assert,
-      anon_sym_return,
-      anon_sym_del,
-      anon_sym_raise,
-      anon_sym_pass,
-      anon_sym_break,
-      anon_sym_continue,
-      anon_sym_if,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_while,
-      anon_sym_try,
-      anon_sym_with,
-      anon_sym_match,
-      anon_sym_def,
-      anon_sym_global,
-      anon_sym_nonlocal,
-      anon_sym_exec,
-      anon_sym_type,
-      anon_sym_class,
-      anon_sym_not,
-      anon_sym_lambda,
-      anon_sym_yield,
-      sym_integer,
-      sym_identifier,
-      anon_sym_await,
-      sym_true,
-      sym_false,
-      sym_none,
-  [29033] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1290), 12,
-      sym__dedent,
-      sym__string_start,
-      anon_sym_LPAREN,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_LBRACE,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_TILDE,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(1288), 33,
-      anon_sym_import,
-      anon_sym_from,
-      anon_sym_STAR,
-      anon_sym_print,
-      anon_sym_assert,
-      anon_sym_return,
-      anon_sym_del,
-      anon_sym_raise,
-      anon_sym_pass,
-      anon_sym_break,
-      anon_sym_continue,
-      anon_sym_if,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_while,
-      anon_sym_try,
-      anon_sym_with,
-      anon_sym_match,
-      anon_sym_def,
-      anon_sym_global,
-      anon_sym_nonlocal,
-      anon_sym_exec,
-      anon_sym_type,
-      anon_sym_class,
-      anon_sym_not,
-      anon_sym_lambda,
-      anon_sym_yield,
-      sym_integer,
-      sym_identifier,
-      anon_sym_await,
-      sym_true,
-      sym_false,
-      sym_none,
-  [29086] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1294), 12,
-      sym__dedent,
-      sym__string_start,
-      anon_sym_LPAREN,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_LBRACE,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_TILDE,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(1292), 33,
-      anon_sym_import,
-      anon_sym_from,
-      anon_sym_STAR,
-      anon_sym_print,
-      anon_sym_assert,
-      anon_sym_return,
-      anon_sym_del,
-      anon_sym_raise,
-      anon_sym_pass,
-      anon_sym_break,
-      anon_sym_continue,
-      anon_sym_if,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_while,
-      anon_sym_try,
-      anon_sym_with,
-      anon_sym_match,
-      anon_sym_def,
-      anon_sym_global,
-      anon_sym_nonlocal,
-      anon_sym_exec,
-      anon_sym_type,
-      anon_sym_class,
-      anon_sym_not,
-      anon_sym_lambda,
-      anon_sym_yield,
-      sym_integer,
-      sym_identifier,
-      anon_sym_await,
-      sym_true,
-      sym_false,
-      sym_none,
-  [29139] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1298), 12,
-      sym__dedent,
-      sym__string_start,
-      anon_sym_LPAREN,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_LBRACE,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_TILDE,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(1296), 33,
-      anon_sym_import,
-      anon_sym_from,
-      anon_sym_STAR,
-      anon_sym_print,
-      anon_sym_assert,
-      anon_sym_return,
-      anon_sym_del,
-      anon_sym_raise,
-      anon_sym_pass,
-      anon_sym_break,
-      anon_sym_continue,
-      anon_sym_if,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_while,
-      anon_sym_try,
-      anon_sym_with,
-      anon_sym_match,
-      anon_sym_def,
-      anon_sym_global,
-      anon_sym_nonlocal,
-      anon_sym_exec,
-      anon_sym_type,
-      anon_sym_class,
-      anon_sym_not,
-      anon_sym_lambda,
-      anon_sym_yield,
-      sym_integer,
-      sym_identifier,
-      anon_sym_await,
-      sym_true,
-      sym_false,
-      sym_none,
-  [29192] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1300), 12,
-      sym__string_start,
-      ts_builtin_sym_end,
-      anon_sym_LPAREN,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_LBRACE,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_TILDE,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(1302), 33,
-      anon_sym_import,
-      anon_sym_from,
-      anon_sym_STAR,
-      anon_sym_print,
-      anon_sym_assert,
-      anon_sym_return,
-      anon_sym_del,
-      anon_sym_raise,
-      anon_sym_pass,
-      anon_sym_break,
-      anon_sym_continue,
-      anon_sym_if,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_while,
-      anon_sym_try,
-      anon_sym_with,
-      anon_sym_match,
-      anon_sym_def,
-      anon_sym_global,
-      anon_sym_nonlocal,
-      anon_sym_exec,
-      anon_sym_type,
-      anon_sym_class,
-      anon_sym_not,
-      anon_sym_lambda,
-      anon_sym_yield,
-      sym_integer,
-      sym_identifier,
-      anon_sym_await,
-      sym_true,
-      sym_false,
-      sym_none,
-  [29245] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1304), 12,
-      sym__string_start,
-      ts_builtin_sym_end,
-      anon_sym_LPAREN,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_LBRACE,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_TILDE,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(1306), 33,
-      anon_sym_import,
-      anon_sym_from,
-      anon_sym_STAR,
-      anon_sym_print,
-      anon_sym_assert,
-      anon_sym_return,
-      anon_sym_del,
-      anon_sym_raise,
-      anon_sym_pass,
-      anon_sym_break,
-      anon_sym_continue,
-      anon_sym_if,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_while,
-      anon_sym_try,
-      anon_sym_with,
-      anon_sym_match,
-      anon_sym_def,
-      anon_sym_global,
-      anon_sym_nonlocal,
-      anon_sym_exec,
-      anon_sym_type,
-      anon_sym_class,
-      anon_sym_not,
-      anon_sym_lambda,
-      anon_sym_yield,
-      sym_integer,
-      sym_identifier,
-      anon_sym_await,
-      sym_true,
-      sym_false,
-      sym_none,
-  [29298] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1310), 12,
-      sym__dedent,
-      sym__string_start,
-      anon_sym_LPAREN,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_LBRACE,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_TILDE,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(1308), 33,
-      anon_sym_import,
-      anon_sym_from,
-      anon_sym_STAR,
-      anon_sym_print,
-      anon_sym_assert,
-      anon_sym_return,
-      anon_sym_del,
-      anon_sym_raise,
-      anon_sym_pass,
-      anon_sym_break,
-      anon_sym_continue,
-      anon_sym_if,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_while,
-      anon_sym_try,
-      anon_sym_with,
-      anon_sym_match,
-      anon_sym_def,
-      anon_sym_global,
-      anon_sym_nonlocal,
-      anon_sym_exec,
-      anon_sym_type,
-      anon_sym_class,
-      anon_sym_not,
-      anon_sym_lambda,
-      anon_sym_yield,
-      sym_integer,
-      sym_identifier,
-      anon_sym_await,
-      sym_true,
-      sym_false,
-      sym_none,
-  [29351] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1312), 12,
-      sym__string_start,
-      ts_builtin_sym_end,
-      anon_sym_LPAREN,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_LBRACE,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_TILDE,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(1314), 33,
-      anon_sym_import,
-      anon_sym_from,
-      anon_sym_STAR,
-      anon_sym_print,
-      anon_sym_assert,
-      anon_sym_return,
-      anon_sym_del,
-      anon_sym_raise,
-      anon_sym_pass,
-      anon_sym_break,
-      anon_sym_continue,
-      anon_sym_if,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_while,
-      anon_sym_try,
-      anon_sym_with,
-      anon_sym_match,
-      anon_sym_def,
-      anon_sym_global,
-      anon_sym_nonlocal,
-      anon_sym_exec,
-      anon_sym_type,
-      anon_sym_class,
-      anon_sym_not,
-      anon_sym_lambda,
-      anon_sym_yield,
-      sym_integer,
-      sym_identifier,
-      anon_sym_await,
-      sym_true,
-      sym_false,
-      sym_none,
-  [29404] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1310), 12,
-      sym__string_start,
-      ts_builtin_sym_end,
-      anon_sym_LPAREN,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_LBRACE,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_TILDE,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(1308), 33,
-      anon_sym_import,
-      anon_sym_from,
-      anon_sym_STAR,
-      anon_sym_print,
-      anon_sym_assert,
-      anon_sym_return,
-      anon_sym_del,
-      anon_sym_raise,
-      anon_sym_pass,
-      anon_sym_break,
-      anon_sym_continue,
-      anon_sym_if,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_while,
-      anon_sym_try,
-      anon_sym_with,
-      anon_sym_match,
-      anon_sym_def,
-      anon_sym_global,
-      anon_sym_nonlocal,
-      anon_sym_exec,
-      anon_sym_type,
-      anon_sym_class,
-      anon_sym_not,
-      anon_sym_lambda,
-      anon_sym_yield,
-      sym_integer,
-      sym_identifier,
-      anon_sym_await,
-      sym_true,
-      sym_false,
-      sym_none,
-  [29457] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1290), 12,
-      sym__string_start,
-      ts_builtin_sym_end,
-      anon_sym_LPAREN,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_LBRACE,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_TILDE,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(1288), 33,
-      anon_sym_import,
-      anon_sym_from,
-      anon_sym_STAR,
-      anon_sym_print,
-      anon_sym_assert,
-      anon_sym_return,
-      anon_sym_del,
-      anon_sym_raise,
-      anon_sym_pass,
-      anon_sym_break,
-      anon_sym_continue,
-      anon_sym_if,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_while,
-      anon_sym_try,
-      anon_sym_with,
-      anon_sym_match,
-      anon_sym_def,
-      anon_sym_global,
-      anon_sym_nonlocal,
-      anon_sym_exec,
-      anon_sym_type,
-      anon_sym_class,
-      anon_sym_not,
-      anon_sym_lambda,
-      anon_sym_yield,
-      sym_integer,
-      sym_identifier,
-      anon_sym_await,
-      sym_true,
-      sym_false,
-      sym_none,
-  [29510] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1294), 12,
-      sym__string_start,
-      ts_builtin_sym_end,
-      anon_sym_LPAREN,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_LBRACE,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_TILDE,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(1292), 33,
-      anon_sym_import,
-      anon_sym_from,
-      anon_sym_STAR,
-      anon_sym_print,
-      anon_sym_assert,
-      anon_sym_return,
-      anon_sym_del,
-      anon_sym_raise,
-      anon_sym_pass,
-      anon_sym_break,
-      anon_sym_continue,
-      anon_sym_if,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_while,
-      anon_sym_try,
-      anon_sym_with,
-      anon_sym_match,
-      anon_sym_def,
-      anon_sym_global,
-      anon_sym_nonlocal,
-      anon_sym_exec,
-      anon_sym_type,
-      anon_sym_class,
-      anon_sym_not,
-      anon_sym_lambda,
-      anon_sym_yield,
-      sym_integer,
-      sym_identifier,
-      anon_sym_await,
-      sym_true,
-      sym_false,
-      sym_none,
-  [29563] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1248), 12,
-      sym__dedent,
-      sym__string_start,
-      anon_sym_LPAREN,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_LBRACE,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_TILDE,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(1250), 33,
-      anon_sym_import,
-      anon_sym_from,
-      anon_sym_STAR,
-      anon_sym_print,
-      anon_sym_assert,
-      anon_sym_return,
-      anon_sym_del,
-      anon_sym_raise,
-      anon_sym_pass,
-      anon_sym_break,
-      anon_sym_continue,
-      anon_sym_if,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_while,
-      anon_sym_try,
-      anon_sym_with,
-      anon_sym_match,
-      anon_sym_def,
-      anon_sym_global,
-      anon_sym_nonlocal,
-      anon_sym_exec,
-      anon_sym_type,
-      anon_sym_class,
-      anon_sym_not,
-      anon_sym_lambda,
-      anon_sym_yield,
-      sym_integer,
-      sym_identifier,
-      anon_sym_await,
-      sym_true,
-      sym_false,
-      sym_none,
-  [29616] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1304), 12,
-      sym__dedent,
-      sym__string_start,
-      anon_sym_LPAREN,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_LBRACE,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_TILDE,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(1306), 33,
-      anon_sym_import,
-      anon_sym_from,
-      anon_sym_STAR,
-      anon_sym_print,
-      anon_sym_assert,
-      anon_sym_return,
-      anon_sym_del,
-      anon_sym_raise,
-      anon_sym_pass,
-      anon_sym_break,
-      anon_sym_continue,
-      anon_sym_if,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_while,
-      anon_sym_try,
-      anon_sym_with,
-      anon_sym_match,
-      anon_sym_def,
-      anon_sym_global,
-      anon_sym_nonlocal,
-      anon_sym_exec,
-      anon_sym_type,
-      anon_sym_class,
-      anon_sym_not,
-      anon_sym_lambda,
-      anon_sym_yield,
-      sym_integer,
-      sym_identifier,
-      anon_sym_await,
-      sym_true,
-      sym_false,
-      sym_none,
-  [29669] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1316), 12,
-      sym__string_start,
-      ts_builtin_sym_end,
-      anon_sym_LPAREN,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_LBRACE,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_TILDE,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(1318), 33,
-      anon_sym_import,
-      anon_sym_from,
-      anon_sym_STAR,
-      anon_sym_print,
-      anon_sym_assert,
-      anon_sym_return,
-      anon_sym_del,
-      anon_sym_raise,
-      anon_sym_pass,
-      anon_sym_break,
-      anon_sym_continue,
-      anon_sym_if,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_while,
-      anon_sym_try,
-      anon_sym_with,
-      anon_sym_match,
-      anon_sym_def,
-      anon_sym_global,
-      anon_sym_nonlocal,
-      anon_sym_exec,
-      anon_sym_type,
-      anon_sym_class,
-      anon_sym_not,
-      anon_sym_lambda,
-      anon_sym_yield,
-      sym_integer,
-      sym_identifier,
-      anon_sym_await,
-      sym_true,
-      sym_false,
-      sym_none,
-  [29722] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1222), 12,
-      sym__string_start,
-      ts_builtin_sym_end,
-      anon_sym_LPAREN,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_LBRACE,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_TILDE,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(1220), 33,
-      anon_sym_import,
-      anon_sym_from,
-      anon_sym_STAR,
-      anon_sym_print,
-      anon_sym_assert,
-      anon_sym_return,
-      anon_sym_del,
-      anon_sym_raise,
-      anon_sym_pass,
-      anon_sym_break,
-      anon_sym_continue,
-      anon_sym_if,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_while,
-      anon_sym_try,
-      anon_sym_with,
-      anon_sym_match,
-      anon_sym_def,
-      anon_sym_global,
-      anon_sym_nonlocal,
-      anon_sym_exec,
-      anon_sym_type,
-      anon_sym_class,
-      anon_sym_not,
-      anon_sym_lambda,
-      anon_sym_yield,
-      sym_integer,
-      sym_identifier,
-      anon_sym_await,
-      sym_true,
-      sym_false,
-      sym_none,
-  [29775] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1320), 12,
-      sym__string_start,
-      ts_builtin_sym_end,
-      anon_sym_LPAREN,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_LBRACE,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_TILDE,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(1322), 33,
-      anon_sym_import,
-      anon_sym_from,
-      anon_sym_STAR,
-      anon_sym_print,
-      anon_sym_assert,
-      anon_sym_return,
-      anon_sym_del,
-      anon_sym_raise,
-      anon_sym_pass,
-      anon_sym_break,
-      anon_sym_continue,
-      anon_sym_if,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_while,
-      anon_sym_try,
-      anon_sym_with,
-      anon_sym_match,
-      anon_sym_def,
-      anon_sym_global,
-      anon_sym_nonlocal,
-      anon_sym_exec,
-      anon_sym_type,
-      anon_sym_class,
-      anon_sym_not,
-      anon_sym_lambda,
-      anon_sym_yield,
-      sym_integer,
-      sym_identifier,
-      anon_sym_await,
-      sym_true,
-      sym_false,
-      sym_none,
-  [29828] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1326), 12,
-      sym__dedent,
-      sym__string_start,
-      anon_sym_LPAREN,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_LBRACE,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_TILDE,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(1324), 33,
-      anon_sym_import,
-      anon_sym_from,
-      anon_sym_STAR,
-      anon_sym_print,
-      anon_sym_assert,
-      anon_sym_return,
-      anon_sym_del,
-      anon_sym_raise,
-      anon_sym_pass,
-      anon_sym_break,
-      anon_sym_continue,
-      anon_sym_if,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_while,
-      anon_sym_try,
-      anon_sym_with,
-      anon_sym_match,
-      anon_sym_def,
-      anon_sym_global,
-      anon_sym_nonlocal,
-      anon_sym_exec,
-      anon_sym_type,
-      anon_sym_class,
-      anon_sym_not,
-      anon_sym_lambda,
-      anon_sym_yield,
-      sym_integer,
-      sym_identifier,
-      anon_sym_await,
-      sym_true,
-      sym_false,
-      sym_none,
-  [29881] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1246), 12,
-      sym__string_start,
-      ts_builtin_sym_end,
-      anon_sym_LPAREN,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_LBRACE,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_TILDE,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(1244), 33,
-      anon_sym_import,
-      anon_sym_from,
-      anon_sym_STAR,
-      anon_sym_print,
-      anon_sym_assert,
-      anon_sym_return,
-      anon_sym_del,
-      anon_sym_raise,
-      anon_sym_pass,
-      anon_sym_break,
-      anon_sym_continue,
-      anon_sym_if,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_while,
-      anon_sym_try,
-      anon_sym_with,
-      anon_sym_match,
-      anon_sym_def,
-      anon_sym_global,
-      anon_sym_nonlocal,
-      anon_sym_exec,
-      anon_sym_type,
-      anon_sym_class,
-      anon_sym_not,
-      anon_sym_lambda,
-      anon_sym_yield,
-      sym_integer,
-      sym_identifier,
-      anon_sym_await,
-      sym_true,
-      sym_false,
-      sym_none,
-  [29934] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1242), 12,
-      sym__string_start,
-      ts_builtin_sym_end,
-      anon_sym_LPAREN,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_LBRACE,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_TILDE,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(1240), 33,
-      anon_sym_import,
-      anon_sym_from,
-      anon_sym_STAR,
-      anon_sym_print,
-      anon_sym_assert,
-      anon_sym_return,
-      anon_sym_del,
-      anon_sym_raise,
-      anon_sym_pass,
-      anon_sym_break,
-      anon_sym_continue,
-      anon_sym_if,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_while,
-      anon_sym_try,
-      anon_sym_with,
-      anon_sym_match,
-      anon_sym_def,
-      anon_sym_global,
-      anon_sym_nonlocal,
-      anon_sym_exec,
-      anon_sym_type,
-      anon_sym_class,
-      anon_sym_not,
-      anon_sym_lambda,
-      anon_sym_yield,
-      sym_integer,
-      sym_identifier,
-      anon_sym_await,
-      sym_true,
-      sym_false,
-      sym_none,
-  [29987] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1238), 12,
-      sym__string_start,
-      ts_builtin_sym_end,
-      anon_sym_LPAREN,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_LBRACE,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_TILDE,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(1236), 33,
-      anon_sym_import,
-      anon_sym_from,
-      anon_sym_STAR,
-      anon_sym_print,
-      anon_sym_assert,
-      anon_sym_return,
-      anon_sym_del,
-      anon_sym_raise,
-      anon_sym_pass,
-      anon_sym_break,
-      anon_sym_continue,
-      anon_sym_if,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_while,
-      anon_sym_try,
-      anon_sym_with,
-      anon_sym_match,
-      anon_sym_def,
-      anon_sym_global,
-      anon_sym_nonlocal,
-      anon_sym_exec,
-      anon_sym_type,
-      anon_sym_class,
-      anon_sym_not,
-      anon_sym_lambda,
-      anon_sym_yield,
-      sym_integer,
-      sym_identifier,
-      anon_sym_await,
-      sym_true,
-      sym_false,
-      sym_none,
-  [30040] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1216), 12,
-      sym__dedent,
-      sym__string_start,
-      anon_sym_LPAREN,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_LBRACE,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_TILDE,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(1218), 33,
-      anon_sym_import,
-      anon_sym_from,
-      anon_sym_STAR,
-      anon_sym_print,
-      anon_sym_assert,
-      anon_sym_return,
-      anon_sym_del,
-      anon_sym_raise,
-      anon_sym_pass,
-      anon_sym_break,
-      anon_sym_continue,
-      anon_sym_if,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_while,
-      anon_sym_try,
-      anon_sym_with,
-      anon_sym_match,
-      anon_sym_def,
-      anon_sym_global,
-      anon_sym_nonlocal,
-      anon_sym_exec,
-      anon_sym_type,
-      anon_sym_class,
-      anon_sym_not,
-      anon_sym_lambda,
-      anon_sym_yield,
-      sym_integer,
-      sym_identifier,
-      anon_sym_await,
-      sym_true,
-      sym_false,
-      sym_none,
-  [30093] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1328), 12,
-      sym__string_start,
-      ts_builtin_sym_end,
-      anon_sym_LPAREN,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_LBRACE,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_TILDE,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(1330), 33,
-      anon_sym_import,
-      anon_sym_from,
-      anon_sym_STAR,
-      anon_sym_print,
-      anon_sym_assert,
-      anon_sym_return,
-      anon_sym_del,
-      anon_sym_raise,
-      anon_sym_pass,
-      anon_sym_break,
-      anon_sym_continue,
-      anon_sym_if,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_while,
-      anon_sym_try,
-      anon_sym_with,
-      anon_sym_match,
-      anon_sym_def,
-      anon_sym_global,
-      anon_sym_nonlocal,
-      anon_sym_exec,
-      anon_sym_type,
-      anon_sym_class,
-      anon_sym_not,
-      anon_sym_lambda,
-      anon_sym_yield,
-      sym_integer,
-      sym_identifier,
-      anon_sym_await,
-      sym_true,
-      sym_false,
-      sym_none,
-  [30146] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1282), 12,
-      sym__string_start,
-      ts_builtin_sym_end,
-      anon_sym_LPAREN,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_LBRACE,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_TILDE,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(1280), 33,
-      anon_sym_import,
-      anon_sym_from,
-      anon_sym_STAR,
-      anon_sym_print,
-      anon_sym_assert,
-      anon_sym_return,
-      anon_sym_del,
-      anon_sym_raise,
-      anon_sym_pass,
-      anon_sym_break,
-      anon_sym_continue,
-      anon_sym_if,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_while,
-      anon_sym_try,
-      anon_sym_with,
-      anon_sym_match,
-      anon_sym_def,
-      anon_sym_global,
-      anon_sym_nonlocal,
-      anon_sym_exec,
-      anon_sym_type,
-      anon_sym_class,
-      anon_sym_not,
-      anon_sym_lambda,
-      anon_sym_yield,
-      sym_integer,
-      sym_identifier,
-      anon_sym_await,
-      sym_true,
-      sym_false,
-      sym_none,
-  [30199] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1224), 12,
-      sym__dedent,
-      sym__string_start,
-      anon_sym_LPAREN,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_LBRACE,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_TILDE,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(1226), 33,
-      anon_sym_import,
-      anon_sym_from,
-      anon_sym_STAR,
-      anon_sym_print,
-      anon_sym_assert,
-      anon_sym_return,
-      anon_sym_del,
-      anon_sym_raise,
-      anon_sym_pass,
-      anon_sym_break,
-      anon_sym_continue,
-      anon_sym_if,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_while,
-      anon_sym_try,
-      anon_sym_with,
-      anon_sym_match,
-      anon_sym_def,
-      anon_sym_global,
-      anon_sym_nonlocal,
-      anon_sym_exec,
-      anon_sym_type,
-      anon_sym_class,
-      anon_sym_not,
-      anon_sym_lambda,
-      anon_sym_yield,
-      sym_integer,
-      sym_identifier,
-      anon_sym_await,
-      sym_true,
-      sym_false,
-      sym_none,
-  [30252] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1332), 12,
-      sym__string_start,
-      ts_builtin_sym_end,
-      anon_sym_LPAREN,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_LBRACE,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_TILDE,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(1334), 33,
-      anon_sym_import,
-      anon_sym_from,
-      anon_sym_STAR,
-      anon_sym_print,
-      anon_sym_assert,
-      anon_sym_return,
-      anon_sym_del,
-      anon_sym_raise,
-      anon_sym_pass,
-      anon_sym_break,
-      anon_sym_continue,
-      anon_sym_if,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_while,
-      anon_sym_try,
-      anon_sym_with,
-      anon_sym_match,
-      anon_sym_def,
-      anon_sym_global,
-      anon_sym_nonlocal,
-      anon_sym_exec,
-      anon_sym_type,
-      anon_sym_class,
-      anon_sym_not,
-      anon_sym_lambda,
-      anon_sym_yield,
-      sym_integer,
-      sym_identifier,
-      anon_sym_await,
-      sym_true,
-      sym_false,
-      sym_none,
-  [30305] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1298), 12,
-      sym__string_start,
-      ts_builtin_sym_end,
-      anon_sym_LPAREN,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_LBRACE,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_TILDE,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(1296), 33,
-      anon_sym_import,
-      anon_sym_from,
-      anon_sym_STAR,
-      anon_sym_print,
-      anon_sym_assert,
-      anon_sym_return,
-      anon_sym_del,
-      anon_sym_raise,
-      anon_sym_pass,
-      anon_sym_break,
-      anon_sym_continue,
-      anon_sym_if,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_while,
-      anon_sym_try,
-      anon_sym_with,
-      anon_sym_match,
-      anon_sym_def,
-      anon_sym_global,
-      anon_sym_nonlocal,
-      anon_sym_exec,
-      anon_sym_type,
-      anon_sym_class,
-      anon_sym_not,
-      anon_sym_lambda,
-      anon_sym_yield,
-      sym_integer,
-      sym_identifier,
-      anon_sym_await,
-      sym_true,
-      sym_false,
-      sym_none,
-  [30358] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1328), 12,
-      sym__dedent,
-      sym__string_start,
-      anon_sym_LPAREN,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_LBRACE,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_TILDE,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(1330), 33,
-      anon_sym_import,
-      anon_sym_from,
-      anon_sym_STAR,
-      anon_sym_print,
-      anon_sym_assert,
-      anon_sym_return,
-      anon_sym_del,
-      anon_sym_raise,
-      anon_sym_pass,
-      anon_sym_break,
-      anon_sym_continue,
-      anon_sym_if,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_while,
-      anon_sym_try,
-      anon_sym_with,
-      anon_sym_match,
-      anon_sym_def,
-      anon_sym_global,
-      anon_sym_nonlocal,
-      anon_sym_exec,
-      anon_sym_type,
-      anon_sym_class,
-      anon_sym_not,
-      anon_sym_lambda,
-      anon_sym_yield,
-      sym_integer,
-      sym_identifier,
-      anon_sym_await,
-      sym_true,
-      sym_false,
-      sym_none,
-  [30411] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1284), 12,
-      sym__dedent,
-      sym__string_start,
-      anon_sym_LPAREN,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_LBRACE,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_TILDE,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(1286), 33,
-      anon_sym_import,
-      anon_sym_from,
-      anon_sym_STAR,
-      anon_sym_print,
-      anon_sym_assert,
-      anon_sym_return,
-      anon_sym_del,
-      anon_sym_raise,
-      anon_sym_pass,
-      anon_sym_break,
-      anon_sym_continue,
-      anon_sym_if,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_while,
-      anon_sym_try,
-      anon_sym_with,
-      anon_sym_match,
-      anon_sym_def,
-      anon_sym_global,
-      anon_sym_nonlocal,
-      anon_sym_exec,
-      anon_sym_type,
-      anon_sym_class,
-      anon_sym_not,
-      anon_sym_lambda,
-      anon_sym_yield,
-      sym_integer,
-      sym_identifier,
-      anon_sym_await,
-      sym_true,
-      sym_false,
-      sym_none,
-  [30464] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1234), 12,
-      sym__string_start,
-      ts_builtin_sym_end,
-      anon_sym_LPAREN,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_LBRACE,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_TILDE,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(1232), 33,
-      anon_sym_import,
-      anon_sym_from,
-      anon_sym_STAR,
-      anon_sym_print,
-      anon_sym_assert,
-      anon_sym_return,
-      anon_sym_del,
-      anon_sym_raise,
-      anon_sym_pass,
-      anon_sym_break,
-      anon_sym_continue,
-      anon_sym_if,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_while,
-      anon_sym_try,
-      anon_sym_with,
-      anon_sym_match,
-      anon_sym_def,
-      anon_sym_global,
-      anon_sym_nonlocal,
-      anon_sym_exec,
-      anon_sym_type,
-      anon_sym_class,
-      anon_sym_not,
-      anon_sym_lambda,
-      anon_sym_yield,
-      sym_integer,
-      sym_identifier,
-      anon_sym_await,
-      sym_true,
-      sym_false,
-      sym_none,
-  [30517] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1230), 12,
-      sym__string_start,
-      ts_builtin_sym_end,
-      anon_sym_LPAREN,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_LBRACE,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_TILDE,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(1228), 33,
-      anon_sym_import,
-      anon_sym_from,
-      anon_sym_STAR,
-      anon_sym_print,
-      anon_sym_assert,
-      anon_sym_return,
-      anon_sym_del,
-      anon_sym_raise,
-      anon_sym_pass,
-      anon_sym_break,
-      anon_sym_continue,
-      anon_sym_if,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_while,
-      anon_sym_try,
-      anon_sym_with,
-      anon_sym_match,
-      anon_sym_def,
-      anon_sym_global,
-      anon_sym_nonlocal,
-      anon_sym_exec,
-      anon_sym_type,
-      anon_sym_class,
-      anon_sym_not,
-      anon_sym_lambda,
-      anon_sym_yield,
-      sym_integer,
-      sym_identifier,
-      anon_sym_await,
-      sym_true,
-      sym_false,
-      sym_none,
-  [30570] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1300), 12,
-      sym__dedent,
-      sym__string_start,
-      anon_sym_LPAREN,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_LBRACE,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_TILDE,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(1302), 33,
-      anon_sym_import,
-      anon_sym_from,
-      anon_sym_STAR,
-      anon_sym_print,
-      anon_sym_assert,
-      anon_sym_return,
-      anon_sym_del,
-      anon_sym_raise,
-      anon_sym_pass,
-      anon_sym_break,
-      anon_sym_continue,
-      anon_sym_if,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_while,
-      anon_sym_try,
-      anon_sym_with,
-      anon_sym_match,
-      anon_sym_def,
-      anon_sym_global,
-      anon_sym_nonlocal,
-      anon_sym_exec,
-      anon_sym_type,
-      anon_sym_class,
-      anon_sym_not,
-      anon_sym_lambda,
-      anon_sym_yield,
-      sym_integer,
-      sym_identifier,
-      anon_sym_await,
-      sym_true,
-      sym_false,
-      sym_none,
-  [30623] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1336), 12,
-      sym__string_start,
-      ts_builtin_sym_end,
-      anon_sym_LPAREN,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_LBRACE,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_TILDE,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(1338), 33,
-      anon_sym_import,
-      anon_sym_from,
-      anon_sym_STAR,
-      anon_sym_print,
-      anon_sym_assert,
-      anon_sym_return,
-      anon_sym_del,
-      anon_sym_raise,
-      anon_sym_pass,
-      anon_sym_break,
-      anon_sym_continue,
-      anon_sym_if,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_while,
-      anon_sym_try,
-      anon_sym_with,
-      anon_sym_match,
-      anon_sym_def,
-      anon_sym_global,
-      anon_sym_nonlocal,
-      anon_sym_exec,
-      anon_sym_type,
-      anon_sym_class,
-      anon_sym_not,
-      anon_sym_lambda,
-      anon_sym_yield,
-      sym_integer,
-      sym_identifier,
-      anon_sym_await,
-      sym_true,
-      sym_false,
-      sym_none,
-  [30676] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1320), 12,
-      sym__dedent,
-      sym__string_start,
-      anon_sym_LPAREN,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_LBRACE,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_TILDE,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(1322), 33,
-      anon_sym_import,
-      anon_sym_from,
-      anon_sym_STAR,
-      anon_sym_print,
-      anon_sym_assert,
-      anon_sym_return,
-      anon_sym_del,
-      anon_sym_raise,
-      anon_sym_pass,
-      anon_sym_break,
-      anon_sym_continue,
-      anon_sym_if,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_while,
-      anon_sym_try,
-      anon_sym_with,
-      anon_sym_match,
-      anon_sym_def,
-      anon_sym_global,
-      anon_sym_nonlocal,
-      anon_sym_exec,
-      anon_sym_type,
-      anon_sym_class,
-      anon_sym_not,
-      anon_sym_lambda,
-      anon_sym_yield,
-      sym_integer,
-      sym_identifier,
-      anon_sym_await,
-      sym_true,
-      sym_false,
-      sym_none,
-  [30729] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1340), 12,
-      sym__string_start,
-      ts_builtin_sym_end,
-      anon_sym_LPAREN,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_LBRACE,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_TILDE,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(1342), 33,
-      anon_sym_import,
-      anon_sym_from,
-      anon_sym_STAR,
-      anon_sym_print,
-      anon_sym_assert,
-      anon_sym_return,
-      anon_sym_del,
-      anon_sym_raise,
-      anon_sym_pass,
-      anon_sym_break,
-      anon_sym_continue,
-      anon_sym_if,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_while,
-      anon_sym_try,
-      anon_sym_with,
-      anon_sym_match,
-      anon_sym_def,
-      anon_sym_global,
-      anon_sym_nonlocal,
-      anon_sym_exec,
-      anon_sym_type,
-      anon_sym_class,
-      anon_sym_not,
-      anon_sym_lambda,
-      anon_sym_yield,
-      sym_integer,
-      sym_identifier,
-      anon_sym_await,
-      sym_true,
-      sym_false,
-      sym_none,
-  [30782] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1316), 12,
-      sym__dedent,
-      sym__string_start,
-      anon_sym_LPAREN,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_LBRACE,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_TILDE,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(1318), 33,
-      anon_sym_import,
-      anon_sym_from,
-      anon_sym_STAR,
-      anon_sym_print,
-      anon_sym_assert,
-      anon_sym_return,
-      anon_sym_del,
-      anon_sym_raise,
-      anon_sym_pass,
-      anon_sym_break,
-      anon_sym_continue,
-      anon_sym_if,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_while,
-      anon_sym_try,
-      anon_sym_with,
-      anon_sym_match,
-      anon_sym_def,
-      anon_sym_global,
-      anon_sym_nonlocal,
-      anon_sym_exec,
-      anon_sym_type,
-      anon_sym_class,
-      anon_sym_not,
-      anon_sym_lambda,
-      anon_sym_yield,
-      sym_integer,
-      sym_identifier,
-      anon_sym_await,
-      sym_true,
-      sym_false,
-      sym_none,
-  [30835] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1312), 12,
-      sym__dedent,
-      sym__string_start,
-      anon_sym_LPAREN,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_LBRACE,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_TILDE,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(1314), 33,
-      anon_sym_import,
-      anon_sym_from,
-      anon_sym_STAR,
-      anon_sym_print,
-      anon_sym_assert,
-      anon_sym_return,
-      anon_sym_del,
-      anon_sym_raise,
-      anon_sym_pass,
-      anon_sym_break,
-      anon_sym_continue,
-      anon_sym_if,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_while,
-      anon_sym_try,
-      anon_sym_with,
-      anon_sym_match,
-      anon_sym_def,
-      anon_sym_global,
-      anon_sym_nonlocal,
-      anon_sym_exec,
-      anon_sym_type,
-      anon_sym_class,
-      anon_sym_not,
-      anon_sym_lambda,
-      anon_sym_yield,
-      sym_integer,
-      sym_identifier,
-      anon_sym_await,
-      sym_true,
-      sym_false,
-      sym_none,
-  [30888] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1336), 12,
-      sym__dedent,
-      sym__string_start,
-      anon_sym_LPAREN,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_LBRACE,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_TILDE,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(1338), 33,
-      anon_sym_import,
-      anon_sym_from,
-      anon_sym_STAR,
-      anon_sym_print,
-      anon_sym_assert,
-      anon_sym_return,
-      anon_sym_del,
-      anon_sym_raise,
-      anon_sym_pass,
-      anon_sym_break,
-      anon_sym_continue,
-      anon_sym_if,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_while,
-      anon_sym_try,
-      anon_sym_with,
-      anon_sym_match,
-      anon_sym_def,
-      anon_sym_global,
-      anon_sym_nonlocal,
-      anon_sym_exec,
-      anon_sym_type,
-      anon_sym_class,
-      anon_sym_not,
-      anon_sym_lambda,
-      anon_sym_yield,
-      sym_integer,
-      sym_identifier,
-      anon_sym_await,
-      sym_true,
-      sym_false,
-      sym_none,
-  [30941] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1340), 12,
-      sym__dedent,
-      sym__string_start,
-      anon_sym_LPAREN,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_LBRACE,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_TILDE,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(1342), 33,
-      anon_sym_import,
-      anon_sym_from,
-      anon_sym_STAR,
-      anon_sym_print,
-      anon_sym_assert,
-      anon_sym_return,
-      anon_sym_del,
-      anon_sym_raise,
-      anon_sym_pass,
-      anon_sym_break,
-      anon_sym_continue,
-      anon_sym_if,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_while,
-      anon_sym_try,
-      anon_sym_with,
-      anon_sym_match,
-      anon_sym_def,
-      anon_sym_global,
-      anon_sym_nonlocal,
-      anon_sym_exec,
-      anon_sym_type,
-      anon_sym_class,
-      anon_sym_not,
-      anon_sym_lambda,
-      anon_sym_yield,
-      sym_integer,
-      sym_identifier,
-      anon_sym_await,
-      sym_true,
-      sym_false,
-      sym_none,
-  [30994] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1258), 12,
-      sym__string_start,
-      ts_builtin_sym_end,
-      anon_sym_LPAREN,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_LBRACE,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_TILDE,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(1256), 33,
-      anon_sym_import,
-      anon_sym_from,
-      anon_sym_STAR,
-      anon_sym_print,
-      anon_sym_assert,
-      anon_sym_return,
-      anon_sym_del,
-      anon_sym_raise,
-      anon_sym_pass,
-      anon_sym_break,
-      anon_sym_continue,
-      anon_sym_if,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_while,
-      anon_sym_try,
-      anon_sym_with,
-      anon_sym_match,
-      anon_sym_def,
-      anon_sym_global,
-      anon_sym_nonlocal,
-      anon_sym_exec,
-      anon_sym_type,
-      anon_sym_class,
-      anon_sym_not,
-      anon_sym_lambda,
-      anon_sym_yield,
-      sym_integer,
-      sym_identifier,
-      anon_sym_await,
-      sym_true,
-      sym_false,
-      sym_none,
-  [31047] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1346), 12,
-      sym__dedent,
-      sym__string_start,
-      anon_sym_LPAREN,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_LBRACE,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_TILDE,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(1344), 33,
-      anon_sym_import,
-      anon_sym_from,
-      anon_sym_STAR,
-      anon_sym_print,
-      anon_sym_assert,
-      anon_sym_return,
-      anon_sym_del,
-      anon_sym_raise,
-      anon_sym_pass,
-      anon_sym_break,
-      anon_sym_continue,
-      anon_sym_if,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_while,
-      anon_sym_try,
-      anon_sym_with,
-      anon_sym_match,
-      anon_sym_def,
-      anon_sym_global,
-      anon_sym_nonlocal,
-      anon_sym_exec,
-      anon_sym_type,
-      anon_sym_class,
-      anon_sym_not,
-      anon_sym_lambda,
-      anon_sym_yield,
-      sym_integer,
-      sym_identifier,
-      anon_sym_await,
-      sym_true,
-      sym_false,
-      sym_none,
-  [31100] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(842), 12,
-      sym__dedent,
-      sym__string_start,
-      anon_sym_LPAREN,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_LBRACE,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_TILDE,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(844), 33,
-      anon_sym_import,
-      anon_sym_from,
-      anon_sym_STAR,
-      anon_sym_print,
-      anon_sym_assert,
-      anon_sym_return,
-      anon_sym_del,
-      anon_sym_raise,
-      anon_sym_pass,
-      anon_sym_break,
-      anon_sym_continue,
-      anon_sym_if,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_while,
-      anon_sym_try,
-      anon_sym_with,
-      anon_sym_match,
-      anon_sym_def,
-      anon_sym_global,
-      anon_sym_nonlocal,
-      anon_sym_exec,
-      anon_sym_type,
-      anon_sym_class,
-      anon_sym_not,
-      anon_sym_lambda,
-      anon_sym_yield,
-      sym_integer,
-      sym_identifier,
-      anon_sym_await,
-      sym_true,
-      sym_false,
-      sym_none,
-  [31153] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1346), 12,
-      sym__string_start,
-      ts_builtin_sym_end,
-      anon_sym_LPAREN,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_LBRACE,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_TILDE,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(1344), 33,
-      anon_sym_import,
-      anon_sym_from,
-      anon_sym_STAR,
-      anon_sym_print,
-      anon_sym_assert,
-      anon_sym_return,
-      anon_sym_del,
-      anon_sym_raise,
-      anon_sym_pass,
-      anon_sym_break,
-      anon_sym_continue,
-      anon_sym_if,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_while,
-      anon_sym_try,
-      anon_sym_with,
-      anon_sym_match,
-      anon_sym_def,
-      anon_sym_global,
-      anon_sym_nonlocal,
-      anon_sym_exec,
-      anon_sym_type,
-      anon_sym_class,
-      anon_sym_not,
-      anon_sym_lambda,
-      anon_sym_yield,
-      sym_integer,
-      sym_identifier,
-      anon_sym_await,
-      sym_true,
-      sym_false,
-      sym_none,
-  [31206] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1350), 12,
-      sym__dedent,
-      sym__string_start,
-      anon_sym_LPAREN,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_LBRACE,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_TILDE,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(1348), 33,
-      anon_sym_import,
-      anon_sym_from,
-      anon_sym_STAR,
-      anon_sym_print,
-      anon_sym_assert,
-      anon_sym_return,
-      anon_sym_del,
-      anon_sym_raise,
-      anon_sym_pass,
-      anon_sym_break,
-      anon_sym_continue,
-      anon_sym_if,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_while,
-      anon_sym_try,
-      anon_sym_with,
-      anon_sym_match,
-      anon_sym_def,
-      anon_sym_global,
-      anon_sym_nonlocal,
-      anon_sym_exec,
-      anon_sym_type,
-      anon_sym_class,
-      anon_sym_not,
-      anon_sym_lambda,
-      anon_sym_yield,
-      sym_integer,
-      sym_identifier,
-      anon_sym_await,
-      sym_true,
-      sym_false,
-      sym_none,
-  [31259] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1354), 12,
-      sym__dedent,
-      sym__string_start,
-      anon_sym_LPAREN,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_LBRACE,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_TILDE,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(1352), 33,
-      anon_sym_import,
-      anon_sym_from,
-      anon_sym_STAR,
-      anon_sym_print,
-      anon_sym_assert,
-      anon_sym_return,
-      anon_sym_del,
-      anon_sym_raise,
-      anon_sym_pass,
-      anon_sym_break,
-      anon_sym_continue,
-      anon_sym_if,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_while,
-      anon_sym_try,
-      anon_sym_with,
-      anon_sym_match,
-      anon_sym_def,
-      anon_sym_global,
-      anon_sym_nonlocal,
-      anon_sym_exec,
-      anon_sym_type,
-      anon_sym_class,
-      anon_sym_not,
-      anon_sym_lambda,
-      anon_sym_yield,
-      sym_integer,
-      sym_identifier,
-      anon_sym_await,
-      sym_true,
-      sym_false,
-      sym_none,
-  [31312] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1354), 12,
-      sym__string_start,
-      ts_builtin_sym_end,
-      anon_sym_LPAREN,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_LBRACE,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_TILDE,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(1352), 33,
-      anon_sym_import,
-      anon_sym_from,
-      anon_sym_STAR,
-      anon_sym_print,
-      anon_sym_assert,
-      anon_sym_return,
-      anon_sym_del,
-      anon_sym_raise,
-      anon_sym_pass,
-      anon_sym_break,
-      anon_sym_continue,
-      anon_sym_if,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_while,
-      anon_sym_try,
-      anon_sym_with,
-      anon_sym_match,
-      anon_sym_def,
-      anon_sym_global,
-      anon_sym_nonlocal,
-      anon_sym_exec,
-      anon_sym_type,
-      anon_sym_class,
-      anon_sym_not,
-      anon_sym_lambda,
-      anon_sym_yield,
-      sym_integer,
-      sym_identifier,
-      anon_sym_await,
-      sym_true,
-      sym_false,
-      sym_none,
-  [31365] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1356), 12,
-      sym__string_start,
-      ts_builtin_sym_end,
-      anon_sym_LPAREN,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_LBRACE,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_TILDE,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(1358), 33,
-      anon_sym_import,
-      anon_sym_from,
-      anon_sym_STAR,
-      anon_sym_print,
-      anon_sym_assert,
-      anon_sym_return,
-      anon_sym_del,
-      anon_sym_raise,
-      anon_sym_pass,
-      anon_sym_break,
-      anon_sym_continue,
-      anon_sym_if,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_while,
-      anon_sym_try,
-      anon_sym_with,
-      anon_sym_match,
-      anon_sym_def,
-      anon_sym_global,
-      anon_sym_nonlocal,
-      anon_sym_exec,
-      anon_sym_type,
-      anon_sym_class,
-      anon_sym_not,
-      anon_sym_lambda,
-      anon_sym_yield,
-      sym_integer,
-      sym_identifier,
-      anon_sym_await,
-      sym_true,
-      sym_false,
-      sym_none,
-  [31418] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1356), 12,
-      sym__dedent,
-      sym__string_start,
-      anon_sym_LPAREN,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_LBRACE,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_TILDE,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(1358), 33,
-      anon_sym_import,
-      anon_sym_from,
-      anon_sym_STAR,
-      anon_sym_print,
-      anon_sym_assert,
-      anon_sym_return,
-      anon_sym_del,
-      anon_sym_raise,
-      anon_sym_pass,
-      anon_sym_break,
-      anon_sym_continue,
-      anon_sym_if,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_while,
-      anon_sym_try,
-      anon_sym_with,
-      anon_sym_match,
-      anon_sym_def,
-      anon_sym_global,
-      anon_sym_nonlocal,
-      anon_sym_exec,
-      anon_sym_type,
-      anon_sym_class,
-      anon_sym_not,
-      anon_sym_lambda,
-      anon_sym_yield,
-      sym_integer,
-      sym_identifier,
-      anon_sym_await,
-      sym_true,
-      sym_false,
-      sym_none,
-  [31471] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1360), 12,
-      sym__string_start,
-      ts_builtin_sym_end,
-      anon_sym_LPAREN,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_LBRACE,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_TILDE,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(1362), 33,
-      anon_sym_import,
-      anon_sym_from,
-      anon_sym_STAR,
-      anon_sym_print,
-      anon_sym_assert,
-      anon_sym_return,
-      anon_sym_del,
-      anon_sym_raise,
-      anon_sym_pass,
-      anon_sym_break,
-      anon_sym_continue,
-      anon_sym_if,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_while,
-      anon_sym_try,
-      anon_sym_with,
-      anon_sym_match,
-      anon_sym_def,
-      anon_sym_global,
-      anon_sym_nonlocal,
-      anon_sym_exec,
-      anon_sym_type,
-      anon_sym_class,
-      anon_sym_not,
-      anon_sym_lambda,
-      anon_sym_yield,
-      sym_integer,
-      sym_identifier,
-      anon_sym_await,
-      sym_true,
-      sym_false,
-      sym_none,
-  [31524] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1274), 12,
-      sym__string_start,
-      ts_builtin_sym_end,
-      anon_sym_LPAREN,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_LBRACE,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_TILDE,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(1272), 33,
-      anon_sym_import,
-      anon_sym_from,
-      anon_sym_STAR,
-      anon_sym_print,
-      anon_sym_assert,
-      anon_sym_return,
-      anon_sym_del,
-      anon_sym_raise,
-      anon_sym_pass,
-      anon_sym_break,
-      anon_sym_continue,
-      anon_sym_if,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_while,
-      anon_sym_try,
-      anon_sym_with,
-      anon_sym_match,
-      anon_sym_def,
-      anon_sym_global,
-      anon_sym_nonlocal,
-      anon_sym_exec,
-      anon_sym_type,
-      anon_sym_class,
-      anon_sym_not,
-      anon_sym_lambda,
-      anon_sym_yield,
-      sym_integer,
-      sym_identifier,
-      anon_sym_await,
-      sym_true,
-      sym_false,
-      sym_none,
-  [31577] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1360), 12,
-      sym__dedent,
-      sym__string_start,
-      anon_sym_LPAREN,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_LBRACE,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_TILDE,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(1362), 33,
-      anon_sym_import,
-      anon_sym_from,
-      anon_sym_STAR,
-      anon_sym_print,
-      anon_sym_assert,
-      anon_sym_return,
-      anon_sym_del,
-      anon_sym_raise,
-      anon_sym_pass,
-      anon_sym_break,
-      anon_sym_continue,
-      anon_sym_if,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_while,
-      anon_sym_try,
-      anon_sym_with,
-      anon_sym_match,
-      anon_sym_def,
-      anon_sym_global,
-      anon_sym_nonlocal,
-      anon_sym_exec,
-      anon_sym_type,
-      anon_sym_class,
-      anon_sym_not,
-      anon_sym_lambda,
-      anon_sym_yield,
-      sym_integer,
-      sym_identifier,
-      anon_sym_await,
-      sym_true,
-      sym_false,
-      sym_none,
-  [31630] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1326), 12,
-      sym__string_start,
-      ts_builtin_sym_end,
-      anon_sym_LPAREN,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_LBRACE,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_TILDE,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(1324), 33,
-      anon_sym_import,
-      anon_sym_from,
-      anon_sym_STAR,
-      anon_sym_print,
-      anon_sym_assert,
-      anon_sym_return,
-      anon_sym_del,
-      anon_sym_raise,
-      anon_sym_pass,
-      anon_sym_break,
-      anon_sym_continue,
-      anon_sym_if,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_while,
-      anon_sym_try,
-      anon_sym_with,
-      anon_sym_match,
-      anon_sym_def,
-      anon_sym_global,
-      anon_sym_nonlocal,
-      anon_sym_exec,
-      anon_sym_type,
-      anon_sym_class,
-      anon_sym_not,
-      anon_sym_lambda,
-      anon_sym_yield,
-      sym_integer,
-      sym_identifier,
-      anon_sym_await,
-      sym_true,
-      sym_false,
-      sym_none,
-  [31683] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1366), 12,
-      sym__dedent,
-      sym__string_start,
-      anon_sym_LPAREN,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_LBRACE,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_TILDE,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(1364), 33,
-      anon_sym_import,
-      anon_sym_from,
-      anon_sym_STAR,
-      anon_sym_print,
-      anon_sym_assert,
-      anon_sym_return,
-      anon_sym_del,
-      anon_sym_raise,
-      anon_sym_pass,
-      anon_sym_break,
-      anon_sym_continue,
-      anon_sym_if,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_while,
-      anon_sym_try,
-      anon_sym_with,
-      anon_sym_match,
-      anon_sym_def,
-      anon_sym_global,
-      anon_sym_nonlocal,
-      anon_sym_exec,
-      anon_sym_type,
-      anon_sym_class,
-      anon_sym_not,
-      anon_sym_lambda,
-      anon_sym_yield,
-      sym_integer,
-      sym_identifier,
-      anon_sym_await,
-      sym_true,
-      sym_false,
-      sym_none,
-  [31736] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1200), 12,
-      sym__dedent,
-      sym__string_start,
-      anon_sym_LPAREN,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_LBRACE,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_TILDE,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(1202), 33,
-      anon_sym_import,
-      anon_sym_from,
-      anon_sym_STAR,
-      anon_sym_print,
-      anon_sym_assert,
-      anon_sym_return,
-      anon_sym_del,
-      anon_sym_raise,
-      anon_sym_pass,
-      anon_sym_break,
-      anon_sym_continue,
-      anon_sym_if,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_while,
-      anon_sym_try,
-      anon_sym_with,
-      anon_sym_match,
-      anon_sym_def,
-      anon_sym_global,
-      anon_sym_nonlocal,
-      anon_sym_exec,
-      anon_sym_type,
-      anon_sym_class,
-      anon_sym_not,
-      anon_sym_lambda,
-      anon_sym_yield,
-      sym_integer,
-      sym_identifier,
-      anon_sym_await,
-      sym_true,
-      sym_false,
-      sym_none,
-  [31789] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1370), 12,
-      sym__dedent,
-      sym__string_start,
-      anon_sym_LPAREN,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_LBRACE,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_TILDE,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(1368), 33,
-      anon_sym_import,
-      anon_sym_from,
-      anon_sym_STAR,
-      anon_sym_print,
-      anon_sym_assert,
-      anon_sym_return,
-      anon_sym_del,
-      anon_sym_raise,
-      anon_sym_pass,
-      anon_sym_break,
-      anon_sym_continue,
-      anon_sym_if,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_while,
-      anon_sym_try,
-      anon_sym_with,
-      anon_sym_match,
-      anon_sym_def,
-      anon_sym_global,
-      anon_sym_nonlocal,
-      anon_sym_exec,
-      anon_sym_type,
-      anon_sym_class,
-      anon_sym_not,
-      anon_sym_lambda,
-      anon_sym_yield,
-      sym_integer,
-      sym_identifier,
-      anon_sym_await,
-      sym_true,
-      sym_false,
-      sym_none,
-  [31842] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1374), 12,
-      sym__dedent,
-      sym__string_start,
-      anon_sym_LPAREN,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_LBRACE,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_TILDE,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(1372), 33,
-      anon_sym_import,
-      anon_sym_from,
-      anon_sym_STAR,
-      anon_sym_print,
-      anon_sym_assert,
-      anon_sym_return,
-      anon_sym_del,
-      anon_sym_raise,
-      anon_sym_pass,
-      anon_sym_break,
-      anon_sym_continue,
-      anon_sym_if,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_while,
-      anon_sym_try,
-      anon_sym_with,
-      anon_sym_match,
-      anon_sym_def,
-      anon_sym_global,
-      anon_sym_nonlocal,
-      anon_sym_exec,
-      anon_sym_type,
-      anon_sym_class,
-      anon_sym_not,
-      anon_sym_lambda,
-      anon_sym_yield,
-      sym_integer,
-      sym_identifier,
-      anon_sym_await,
-      sym_true,
-      sym_false,
-      sym_none,
-  [31895] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1366), 12,
-      sym__string_start,
-      ts_builtin_sym_end,
-      anon_sym_LPAREN,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_LBRACE,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_TILDE,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(1364), 33,
-      anon_sym_import,
-      anon_sym_from,
-      anon_sym_STAR,
-      anon_sym_print,
-      anon_sym_assert,
-      anon_sym_return,
-      anon_sym_del,
-      anon_sym_raise,
-      anon_sym_pass,
-      anon_sym_break,
-      anon_sym_continue,
-      anon_sym_if,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_while,
-      anon_sym_try,
-      anon_sym_with,
-      anon_sym_match,
-      anon_sym_def,
-      anon_sym_global,
-      anon_sym_nonlocal,
-      anon_sym_exec,
-      anon_sym_type,
-      anon_sym_class,
-      anon_sym_not,
-      anon_sym_lambda,
-      anon_sym_yield,
-      sym_integer,
-      sym_identifier,
-      anon_sym_await,
-      sym_true,
-      sym_false,
-      sym_none,
-  [31948] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1208), 12,
-      sym__dedent,
-      sym__string_start,
-      anon_sym_LPAREN,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_LBRACE,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_TILDE,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(1210), 33,
-      anon_sym_import,
-      anon_sym_from,
-      anon_sym_STAR,
-      anon_sym_print,
-      anon_sym_assert,
-      anon_sym_return,
-      anon_sym_del,
-      anon_sym_raise,
-      anon_sym_pass,
-      anon_sym_break,
-      anon_sym_continue,
-      anon_sym_if,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_while,
-      anon_sym_try,
-      anon_sym_with,
-      anon_sym_match,
-      anon_sym_def,
-      anon_sym_global,
-      anon_sym_nonlocal,
-      anon_sym_exec,
-      anon_sym_type,
-      anon_sym_class,
-      anon_sym_not,
-      anon_sym_lambda,
-      anon_sym_yield,
-      sym_integer,
-      sym_identifier,
-      anon_sym_await,
-      sym_true,
-      sym_false,
-      sym_none,
-  [32001] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1350), 12,
-      sym__string_start,
-      ts_builtin_sym_end,
-      anon_sym_LPAREN,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_LBRACE,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_TILDE,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(1348), 33,
-      anon_sym_import,
-      anon_sym_from,
-      anon_sym_STAR,
-      anon_sym_print,
-      anon_sym_assert,
-      anon_sym_return,
-      anon_sym_del,
-      anon_sym_raise,
-      anon_sym_pass,
-      anon_sym_break,
-      anon_sym_continue,
-      anon_sym_if,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_while,
-      anon_sym_try,
-      anon_sym_with,
-      anon_sym_match,
-      anon_sym_def,
-      anon_sym_global,
-      anon_sym_nonlocal,
-      anon_sym_exec,
-      anon_sym_type,
-      anon_sym_class,
-      anon_sym_not,
-      anon_sym_lambda,
-      anon_sym_yield,
-      sym_integer,
-      sym_identifier,
-      anon_sym_await,
-      sym_true,
-      sym_false,
-      sym_none,
-  [32054] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1370), 12,
-      sym__string_start,
-      ts_builtin_sym_end,
-      anon_sym_LPAREN,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_LBRACE,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_TILDE,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(1368), 33,
-      anon_sym_import,
-      anon_sym_from,
-      anon_sym_STAR,
-      anon_sym_print,
-      anon_sym_assert,
-      anon_sym_return,
-      anon_sym_del,
-      anon_sym_raise,
-      anon_sym_pass,
-      anon_sym_break,
-      anon_sym_continue,
-      anon_sym_if,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_while,
-      anon_sym_try,
-      anon_sym_with,
-      anon_sym_match,
-      anon_sym_def,
-      anon_sym_global,
-      anon_sym_nonlocal,
-      anon_sym_exec,
-      anon_sym_type,
-      anon_sym_class,
-      anon_sym_not,
-      anon_sym_lambda,
-      anon_sym_yield,
-      sym_integer,
-      sym_identifier,
-      anon_sym_await,
-      sym_true,
-      sym_false,
-      sym_none,
-  [32107] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1378), 12,
-      sym__dedent,
-      sym__string_start,
-      anon_sym_LPAREN,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_LBRACE,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_TILDE,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(1376), 33,
-      anon_sym_import,
-      anon_sym_from,
-      anon_sym_STAR,
-      anon_sym_print,
-      anon_sym_assert,
-      anon_sym_return,
-      anon_sym_del,
-      anon_sym_raise,
-      anon_sym_pass,
-      anon_sym_break,
-      anon_sym_continue,
-      anon_sym_if,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_while,
-      anon_sym_try,
-      anon_sym_with,
-      anon_sym_match,
-      anon_sym_def,
-      anon_sym_global,
-      anon_sym_nonlocal,
-      anon_sym_exec,
-      anon_sym_type,
-      anon_sym_class,
-      anon_sym_not,
-      anon_sym_lambda,
-      anon_sym_yield,
-      sym_integer,
-      sym_identifier,
-      anon_sym_await,
-      sym_true,
-      sym_false,
-      sym_none,
-  [32160] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1159), 12,
-      sym__dedent,
-      sym__string_start,
-      anon_sym_LPAREN,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_LBRACE,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_TILDE,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(1157), 33,
-      anon_sym_import,
-      anon_sym_from,
-      anon_sym_STAR,
-      anon_sym_print,
-      anon_sym_assert,
-      anon_sym_return,
-      anon_sym_del,
-      anon_sym_raise,
-      anon_sym_pass,
-      anon_sym_break,
-      anon_sym_continue,
-      anon_sym_if,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_while,
-      anon_sym_try,
-      anon_sym_with,
-      anon_sym_match,
-      anon_sym_def,
-      anon_sym_global,
-      anon_sym_nonlocal,
-      anon_sym_exec,
-      anon_sym_type,
-      anon_sym_class,
-      anon_sym_not,
-      anon_sym_lambda,
-      anon_sym_yield,
-      sym_integer,
-      sym_identifier,
-      anon_sym_await,
-      sym_true,
-      sym_false,
-      sym_none,
-  [32213] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1374), 12,
-      sym__string_start,
-      ts_builtin_sym_end,
-      anon_sym_LPAREN,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_LBRACE,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_TILDE,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(1372), 33,
-      anon_sym_import,
-      anon_sym_from,
-      anon_sym_STAR,
-      anon_sym_print,
-      anon_sym_assert,
-      anon_sym_return,
-      anon_sym_del,
-      anon_sym_raise,
-      anon_sym_pass,
-      anon_sym_break,
-      anon_sym_continue,
-      anon_sym_if,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_while,
-      anon_sym_try,
-      anon_sym_with,
-      anon_sym_match,
-      anon_sym_def,
-      anon_sym_global,
-      anon_sym_nonlocal,
-      anon_sym_exec,
-      anon_sym_type,
-      anon_sym_class,
-      anon_sym_not,
-      anon_sym_lambda,
-      anon_sym_yield,
-      sym_integer,
-      sym_identifier,
-      anon_sym_await,
-      sym_true,
-      sym_false,
-      sym_none,
-  [32266] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1378), 12,
-      sym__string_start,
-      ts_builtin_sym_end,
-      anon_sym_LPAREN,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_LBRACE,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_TILDE,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(1376), 33,
-      anon_sym_import,
-      anon_sym_from,
-      anon_sym_STAR,
-      anon_sym_print,
-      anon_sym_assert,
-      anon_sym_return,
-      anon_sym_del,
-      anon_sym_raise,
-      anon_sym_pass,
-      anon_sym_break,
-      anon_sym_continue,
-      anon_sym_if,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_while,
-      anon_sym_try,
-      anon_sym_with,
-      anon_sym_match,
-      anon_sym_def,
-      anon_sym_global,
-      anon_sym_nonlocal,
-      anon_sym_exec,
-      anon_sym_type,
-      anon_sym_class,
-      anon_sym_not,
-      anon_sym_lambda,
-      anon_sym_yield,
-      sym_integer,
-      sym_identifier,
-      anon_sym_await,
-      sym_true,
-      sym_false,
-      sym_none,
-  [32319] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1260), 12,
-      sym__dedent,
-      sym__string_start,
-      anon_sym_LPAREN,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_LBRACE,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_TILDE,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(1262), 33,
-      anon_sym_import,
-      anon_sym_from,
-      anon_sym_STAR,
-      anon_sym_print,
-      anon_sym_assert,
-      anon_sym_return,
-      anon_sym_del,
-      anon_sym_raise,
-      anon_sym_pass,
-      anon_sym_break,
-      anon_sym_continue,
-      anon_sym_if,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_while,
-      anon_sym_try,
-      anon_sym_with,
-      anon_sym_match,
-      anon_sym_def,
-      anon_sym_global,
-      anon_sym_nonlocal,
-      anon_sym_exec,
-      anon_sym_type,
-      anon_sym_class,
-      anon_sym_not,
-      anon_sym_lambda,
-      anon_sym_yield,
-      sym_integer,
-      sym_identifier,
-      anon_sym_await,
-      sym_true,
-      sym_false,
-      sym_none,
-  [32372] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1268), 12,
-      sym__dedent,
-      sym__string_start,
-      anon_sym_LPAREN,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
+    ACTIONS(279), 1,
       anon_sym_LBRACE,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_TILDE,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(1270), 33,
-      anon_sym_import,
-      anon_sym_from,
-      anon_sym_STAR,
-      anon_sym_print,
-      anon_sym_assert,
-      anon_sym_return,
-      anon_sym_del,
-      anon_sym_raise,
-      anon_sym_pass,
-      anon_sym_break,
-      anon_sym_continue,
-      anon_sym_if,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_while,
-      anon_sym_try,
-      anon_sym_with,
-      anon_sym_match,
-      anon_sym_def,
-      anon_sym_global,
-      anon_sym_nonlocal,
-      anon_sym_exec,
-      anon_sym_type,
-      anon_sym_class,
-      anon_sym_not,
-      anon_sym_lambda,
-      anon_sym_yield,
-      sym_integer,
-      sym_identifier,
-      anon_sym_await,
-      sym_true,
-      sym_false,
-      sym_none,
-  [32425] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1264), 12,
-      sym__dedent,
+    ACTIONS(299), 1,
       sym__string_start,
-      anon_sym_LPAREN,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_LBRACE,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_TILDE,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(1266), 33,
-      anon_sym_import,
-      anon_sym_from,
-      anon_sym_STAR,
-      anon_sym_print,
-      anon_sym_assert,
-      anon_sym_return,
-      anon_sym_del,
-      anon_sym_raise,
-      anon_sym_pass,
-      anon_sym_break,
-      anon_sym_continue,
-      anon_sym_if,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_while,
-      anon_sym_try,
-      anon_sym_with,
-      anon_sym_match,
-      anon_sym_def,
-      anon_sym_global,
-      anon_sym_nonlocal,
-      anon_sym_exec,
-      anon_sym_type,
-      anon_sym_class,
-      anon_sym_not,
-      anon_sym_lambda,
-      anon_sym_yield,
-      sym_integer,
+    ACTIONS(642), 1,
       sym_identifier,
-      anon_sym_await,
-      sym_true,
-      sym_false,
-      sym_none,
-  [32478] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1332), 12,
-      sym__dedent,
-      sym__string_start,
+    ACTIONS(644), 1,
       anon_sym_LPAREN,
-      anon_sym_DASH,
-      anon_sym_PLUS,
+    ACTIONS(654), 1,
       anon_sym_LBRACK,
-      anon_sym_LBRACE,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_TILDE,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(1334), 33,
-      anon_sym_import,
-      anon_sym_from,
-      anon_sym_STAR,
-      anon_sym_print,
-      anon_sym_assert,
-      anon_sym_return,
-      anon_sym_del,
-      anon_sym_raise,
-      anon_sym_pass,
-      anon_sym_break,
-      anon_sym_continue,
-      anon_sym_if,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_while,
-      anon_sym_try,
-      anon_sym_with,
-      anon_sym_match,
-      anon_sym_def,
-      anon_sym_global,
-      anon_sym_nonlocal,
-      anon_sym_exec,
-      anon_sym_type,
-      anon_sym_class,
-      anon_sym_not,
-      anon_sym_lambda,
-      anon_sym_yield,
-      sym_integer,
-      sym_identifier,
+    ACTIONS(656), 1,
       anon_sym_await,
-      sym_true,
-      sym_false,
-      sym_none,
-  [32531] = 18,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(295), 1,
-      anon_sym_LBRACE,
-    ACTIONS(315), 1,
-      sym__string_start,
-    ACTIONS(678), 1,
-      sym_identifier,
-    ACTIONS(680), 1,
-      anon_sym_LPAREN,
-    ACTIONS(690), 1,
-      anon_sym_LBRACK,
-    ACTIONS(1382), 1,
-      anon_sym_STAR,
-    STATE(600), 1,
-      sym_string,
-    STATE(876), 1,
-      sym_pattern,
-    STATE(882), 1,
-      sym_primary_expression,
-    ACTIONS(309), 2,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(1380), 2,
+    ACTIONS(1264), 1,
       anon_sym_RPAREN,
-      anon_sym_RBRACK,
-    STATE(770), 2,
-      sym_attribute,
-      sym_subscript,
-    ACTIONS(301), 3,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_TILDE,
-    STATE(875), 3,
-      sym_tuple_pattern,
-      sym_list_pattern,
-      sym_list_splat_pattern,
-    ACTIONS(311), 4,
-      sym_integer,
-      sym_true,
-      sym_false,
-      sym_none,
-    ACTIONS(684), 6,
-      anon_sym_print,
-      anon_sym_async,
-      anon_sym_match,
-      anon_sym_exec,
-      anon_sym_type,
-      anon_sym_await,
-    STATE(642), 13,
-      sym_binary_operator,
-      sym_unary_operator,
-      sym_call,
-      sym_list,
-      sym_set,
-      sym_tuple,
-      sym_dictionary,
-      sym_list_comprehension,
-      sym_dictionary_comprehension,
-      sym_set_comprehension,
-      sym_generator_expression,
-      sym_parenthesized_expression,
-      sym_concatenated_string,
-  [32613] = 19,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(295), 1,
-      anon_sym_LBRACE,
-    ACTIONS(315), 1,
-      sym__string_start,
-    ACTIONS(678), 1,
-      sym_identifier,
-    ACTIONS(680), 1,
-      anon_sym_LPAREN,
-    ACTIONS(690), 1,
-      anon_sym_LBRACK,
-    ACTIONS(1382), 1,
+    ACTIONS(1266), 1,
       anon_sym_STAR,
-    ACTIONS(1384), 1,
-      anon_sym_RPAREN,
-    STATE(600), 1,
+    STATE(586), 1,
       sym_string,
-    STATE(882), 1,
+    STATE(865), 1,
       sym_primary_expression,
-    STATE(1146), 1,
+    STATE(1134), 1,
       sym_pattern,
-    STATE(1434), 1,
+    STATE(1426), 1,
       sym__patterns,
-    ACTIONS(309), 2,
+    ACTIONS(293), 2,
       sym_ellipsis,
       sym_float,
-    STATE(770), 2,
+    STATE(729), 2,
       sym_attribute,
       sym_subscript,
-    ACTIONS(301), 3,
+    ACTIONS(285), 3,
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
-    STATE(875), 3,
+    STATE(860), 3,
       sym_tuple_pattern,
       sym_list_pattern,
       sym_list_splat_pattern,
-    ACTIONS(311), 4,
+    ACTIONS(295), 4,
       sym_integer,
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(684), 6,
+    ACTIONS(648), 5,
       anon_sym_print,
       anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-      anon_sym_await,
-    STATE(642), 13,
+    STATE(605), 14,
       sym_binary_operator,
       sym_unary_operator,
       sym_call,
@@ -53710,57 +45616,1309 @@ static const uint16_t ts_small_parse_table[] = {
       sym_generator_expression,
       sym_parenthesized_expression,
       sym_concatenated_string,
-  [32697] = 18,
+      sym_await,
+  [27858] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(295), 1,
-      anon_sym_LBRACE,
-    ACTIONS(315), 1,
+    ACTIONS(1268), 12,
       sym__string_start,
-    ACTIONS(678), 1,
-      sym_identifier,
-    ACTIONS(680), 1,
+      ts_builtin_sym_end,
       anon_sym_LPAREN,
-    ACTIONS(690), 1,
+      anon_sym_DASH,
+      anon_sym_PLUS,
       anon_sym_LBRACK,
-    ACTIONS(1382), 1,
-      anon_sym_STAR,
-    STATE(600), 1,
-      sym_string,
-    STATE(876), 1,
-      sym_pattern,
-    STATE(882), 1,
-      sym_primary_expression,
-    ACTIONS(309), 2,
+      anon_sym_LBRACE,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_TILDE,
       sym_ellipsis,
       sym_float,
-    ACTIONS(1386), 2,
+    ACTIONS(1270), 33,
+      anon_sym_import,
+      anon_sym_from,
+      anon_sym_STAR,
+      anon_sym_print,
+      anon_sym_assert,
+      anon_sym_return,
+      anon_sym_del,
+      anon_sym_raise,
+      anon_sym_pass,
+      anon_sym_break,
+      anon_sym_continue,
+      anon_sym_if,
+      anon_sym_async,
+      anon_sym_for,
+      anon_sym_while,
+      anon_sym_try,
+      anon_sym_with,
+      anon_sym_match,
+      anon_sym_def,
+      anon_sym_global,
+      anon_sym_nonlocal,
+      anon_sym_exec,
+      anon_sym_type,
+      anon_sym_class,
+      anon_sym_not,
+      anon_sym_lambda,
+      anon_sym_yield,
+      sym_integer,
+      sym_identifier,
+      anon_sym_await,
+      sym_true,
+      sym_false,
+      sym_none,
+  [27911] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1274), 12,
+      sym__dedent,
+      sym__string_start,
+      anon_sym_LPAREN,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_LBRACE,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_TILDE,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(1272), 33,
+      anon_sym_import,
+      anon_sym_from,
+      anon_sym_STAR,
+      anon_sym_print,
+      anon_sym_assert,
+      anon_sym_return,
+      anon_sym_del,
+      anon_sym_raise,
+      anon_sym_pass,
+      anon_sym_break,
+      anon_sym_continue,
+      anon_sym_if,
+      anon_sym_async,
+      anon_sym_for,
+      anon_sym_while,
+      anon_sym_try,
+      anon_sym_with,
+      anon_sym_match,
+      anon_sym_def,
+      anon_sym_global,
+      anon_sym_nonlocal,
+      anon_sym_exec,
+      anon_sym_type,
+      anon_sym_class,
+      anon_sym_not,
+      anon_sym_lambda,
+      anon_sym_yield,
+      sym_integer,
+      sym_identifier,
+      anon_sym_await,
+      sym_true,
+      sym_false,
+      sym_none,
+  [27964] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1276), 12,
+      sym__string_start,
+      ts_builtin_sym_end,
+      anon_sym_LPAREN,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_LBRACE,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_TILDE,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(1278), 33,
+      anon_sym_import,
+      anon_sym_from,
+      anon_sym_STAR,
+      anon_sym_print,
+      anon_sym_assert,
+      anon_sym_return,
+      anon_sym_del,
+      anon_sym_raise,
+      anon_sym_pass,
+      anon_sym_break,
+      anon_sym_continue,
+      anon_sym_if,
+      anon_sym_async,
+      anon_sym_for,
+      anon_sym_while,
+      anon_sym_try,
+      anon_sym_with,
+      anon_sym_match,
+      anon_sym_def,
+      anon_sym_global,
+      anon_sym_nonlocal,
+      anon_sym_exec,
+      anon_sym_type,
+      anon_sym_class,
+      anon_sym_not,
+      anon_sym_lambda,
+      anon_sym_yield,
+      sym_integer,
+      sym_identifier,
+      anon_sym_await,
+      sym_true,
+      sym_false,
+      sym_none,
+  [28017] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1280), 12,
+      sym__string_start,
+      ts_builtin_sym_end,
+      anon_sym_LPAREN,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_LBRACE,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_TILDE,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(1282), 33,
+      anon_sym_import,
+      anon_sym_from,
+      anon_sym_STAR,
+      anon_sym_print,
+      anon_sym_assert,
+      anon_sym_return,
+      anon_sym_del,
+      anon_sym_raise,
+      anon_sym_pass,
+      anon_sym_break,
+      anon_sym_continue,
+      anon_sym_if,
+      anon_sym_async,
+      anon_sym_for,
+      anon_sym_while,
+      anon_sym_try,
+      anon_sym_with,
+      anon_sym_match,
+      anon_sym_def,
+      anon_sym_global,
+      anon_sym_nonlocal,
+      anon_sym_exec,
+      anon_sym_type,
+      anon_sym_class,
+      anon_sym_not,
+      anon_sym_lambda,
+      anon_sym_yield,
+      sym_integer,
+      sym_identifier,
+      anon_sym_await,
+      sym_true,
+      sym_false,
+      sym_none,
+  [28070] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1192), 12,
+      sym__dedent,
+      sym__string_start,
+      anon_sym_LPAREN,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_LBRACE,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_TILDE,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(1194), 33,
+      anon_sym_import,
+      anon_sym_from,
+      anon_sym_STAR,
+      anon_sym_print,
+      anon_sym_assert,
+      anon_sym_return,
+      anon_sym_del,
+      anon_sym_raise,
+      anon_sym_pass,
+      anon_sym_break,
+      anon_sym_continue,
+      anon_sym_if,
+      anon_sym_async,
+      anon_sym_for,
+      anon_sym_while,
+      anon_sym_try,
+      anon_sym_with,
+      anon_sym_match,
+      anon_sym_def,
+      anon_sym_global,
+      anon_sym_nonlocal,
+      anon_sym_exec,
+      anon_sym_type,
+      anon_sym_class,
+      anon_sym_not,
+      anon_sym_lambda,
+      anon_sym_yield,
+      sym_integer,
+      sym_identifier,
+      anon_sym_await,
+      sym_true,
+      sym_false,
+      sym_none,
+  [28123] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1284), 12,
+      sym__string_start,
+      ts_builtin_sym_end,
+      anon_sym_LPAREN,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_LBRACE,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_TILDE,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(1286), 33,
+      anon_sym_import,
+      anon_sym_from,
+      anon_sym_STAR,
+      anon_sym_print,
+      anon_sym_assert,
+      anon_sym_return,
+      anon_sym_del,
+      anon_sym_raise,
+      anon_sym_pass,
+      anon_sym_break,
+      anon_sym_continue,
+      anon_sym_if,
+      anon_sym_async,
+      anon_sym_for,
+      anon_sym_while,
+      anon_sym_try,
+      anon_sym_with,
+      anon_sym_match,
+      anon_sym_def,
+      anon_sym_global,
+      anon_sym_nonlocal,
+      anon_sym_exec,
+      anon_sym_type,
+      anon_sym_class,
+      anon_sym_not,
+      anon_sym_lambda,
+      anon_sym_yield,
+      sym_integer,
+      sym_identifier,
+      anon_sym_await,
+      sym_true,
+      sym_false,
+      sym_none,
+  [28176] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1288), 12,
+      sym__string_start,
+      ts_builtin_sym_end,
+      anon_sym_LPAREN,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_LBRACE,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_TILDE,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(1290), 33,
+      anon_sym_import,
+      anon_sym_from,
+      anon_sym_STAR,
+      anon_sym_print,
+      anon_sym_assert,
+      anon_sym_return,
+      anon_sym_del,
+      anon_sym_raise,
+      anon_sym_pass,
+      anon_sym_break,
+      anon_sym_continue,
+      anon_sym_if,
+      anon_sym_async,
+      anon_sym_for,
+      anon_sym_while,
+      anon_sym_try,
+      anon_sym_with,
+      anon_sym_match,
+      anon_sym_def,
+      anon_sym_global,
+      anon_sym_nonlocal,
+      anon_sym_exec,
+      anon_sym_type,
+      anon_sym_class,
+      anon_sym_not,
+      anon_sym_lambda,
+      anon_sym_yield,
+      sym_integer,
+      sym_identifier,
+      anon_sym_await,
+      sym_true,
+      sym_false,
+      sym_none,
+  [28229] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1292), 12,
+      sym__string_start,
+      ts_builtin_sym_end,
+      anon_sym_LPAREN,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_LBRACE,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_TILDE,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(1294), 33,
+      anon_sym_import,
+      anon_sym_from,
+      anon_sym_STAR,
+      anon_sym_print,
+      anon_sym_assert,
+      anon_sym_return,
+      anon_sym_del,
+      anon_sym_raise,
+      anon_sym_pass,
+      anon_sym_break,
+      anon_sym_continue,
+      anon_sym_if,
+      anon_sym_async,
+      anon_sym_for,
+      anon_sym_while,
+      anon_sym_try,
+      anon_sym_with,
+      anon_sym_match,
+      anon_sym_def,
+      anon_sym_global,
+      anon_sym_nonlocal,
+      anon_sym_exec,
+      anon_sym_type,
+      anon_sym_class,
+      anon_sym_not,
+      anon_sym_lambda,
+      anon_sym_yield,
+      sym_integer,
+      sym_identifier,
+      anon_sym_await,
+      sym_true,
+      sym_false,
+      sym_none,
+  [28282] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1296), 12,
+      sym__string_start,
+      ts_builtin_sym_end,
+      anon_sym_LPAREN,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_LBRACE,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_TILDE,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(1298), 33,
+      anon_sym_import,
+      anon_sym_from,
+      anon_sym_STAR,
+      anon_sym_print,
+      anon_sym_assert,
+      anon_sym_return,
+      anon_sym_del,
+      anon_sym_raise,
+      anon_sym_pass,
+      anon_sym_break,
+      anon_sym_continue,
+      anon_sym_if,
+      anon_sym_async,
+      anon_sym_for,
+      anon_sym_while,
+      anon_sym_try,
+      anon_sym_with,
+      anon_sym_match,
+      anon_sym_def,
+      anon_sym_global,
+      anon_sym_nonlocal,
+      anon_sym_exec,
+      anon_sym_type,
+      anon_sym_class,
+      anon_sym_not,
+      anon_sym_lambda,
+      anon_sym_yield,
+      sym_integer,
+      sym_identifier,
+      anon_sym_await,
+      sym_true,
+      sym_false,
+      sym_none,
+  [28335] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1302), 12,
+      sym__dedent,
+      sym__string_start,
+      anon_sym_LPAREN,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_LBRACE,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_TILDE,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(1300), 33,
+      anon_sym_import,
+      anon_sym_from,
+      anon_sym_STAR,
+      anon_sym_print,
+      anon_sym_assert,
+      anon_sym_return,
+      anon_sym_del,
+      anon_sym_raise,
+      anon_sym_pass,
+      anon_sym_break,
+      anon_sym_continue,
+      anon_sym_if,
+      anon_sym_async,
+      anon_sym_for,
+      anon_sym_while,
+      anon_sym_try,
+      anon_sym_with,
+      anon_sym_match,
+      anon_sym_def,
+      anon_sym_global,
+      anon_sym_nonlocal,
+      anon_sym_exec,
+      anon_sym_type,
+      anon_sym_class,
+      anon_sym_not,
+      anon_sym_lambda,
+      anon_sym_yield,
+      sym_integer,
+      sym_identifier,
+      anon_sym_await,
+      sym_true,
+      sym_false,
+      sym_none,
+  [28388] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1306), 12,
+      sym__dedent,
+      sym__string_start,
+      anon_sym_LPAREN,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_LBRACE,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_TILDE,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(1304), 33,
+      anon_sym_import,
+      anon_sym_from,
+      anon_sym_STAR,
+      anon_sym_print,
+      anon_sym_assert,
+      anon_sym_return,
+      anon_sym_del,
+      anon_sym_raise,
+      anon_sym_pass,
+      anon_sym_break,
+      anon_sym_continue,
+      anon_sym_if,
+      anon_sym_async,
+      anon_sym_for,
+      anon_sym_while,
+      anon_sym_try,
+      anon_sym_with,
+      anon_sym_match,
+      anon_sym_def,
+      anon_sym_global,
+      anon_sym_nonlocal,
+      anon_sym_exec,
+      anon_sym_type,
+      anon_sym_class,
+      anon_sym_not,
+      anon_sym_lambda,
+      anon_sym_yield,
+      sym_integer,
+      sym_identifier,
+      anon_sym_await,
+      sym_true,
+      sym_false,
+      sym_none,
+  [28441] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1310), 12,
+      sym__dedent,
+      sym__string_start,
+      anon_sym_LPAREN,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_LBRACE,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_TILDE,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(1308), 33,
+      anon_sym_import,
+      anon_sym_from,
+      anon_sym_STAR,
+      anon_sym_print,
+      anon_sym_assert,
+      anon_sym_return,
+      anon_sym_del,
+      anon_sym_raise,
+      anon_sym_pass,
+      anon_sym_break,
+      anon_sym_continue,
+      anon_sym_if,
+      anon_sym_async,
+      anon_sym_for,
+      anon_sym_while,
+      anon_sym_try,
+      anon_sym_with,
+      anon_sym_match,
+      anon_sym_def,
+      anon_sym_global,
+      anon_sym_nonlocal,
+      anon_sym_exec,
+      anon_sym_type,
+      anon_sym_class,
+      anon_sym_not,
+      anon_sym_lambda,
+      anon_sym_yield,
+      sym_integer,
+      sym_identifier,
+      anon_sym_await,
+      sym_true,
+      sym_false,
+      sym_none,
+  [28494] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1312), 12,
+      sym__string_start,
+      ts_builtin_sym_end,
+      anon_sym_LPAREN,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_LBRACE,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_TILDE,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(1314), 33,
+      anon_sym_import,
+      anon_sym_from,
+      anon_sym_STAR,
+      anon_sym_print,
+      anon_sym_assert,
+      anon_sym_return,
+      anon_sym_del,
+      anon_sym_raise,
+      anon_sym_pass,
+      anon_sym_break,
+      anon_sym_continue,
+      anon_sym_if,
+      anon_sym_async,
+      anon_sym_for,
+      anon_sym_while,
+      anon_sym_try,
+      anon_sym_with,
+      anon_sym_match,
+      anon_sym_def,
+      anon_sym_global,
+      anon_sym_nonlocal,
+      anon_sym_exec,
+      anon_sym_type,
+      anon_sym_class,
+      anon_sym_not,
+      anon_sym_lambda,
+      anon_sym_yield,
+      sym_integer,
+      sym_identifier,
+      anon_sym_await,
+      sym_true,
+      sym_false,
+      sym_none,
+  [28547] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1316), 12,
+      sym__string_start,
+      ts_builtin_sym_end,
+      anon_sym_LPAREN,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_LBRACE,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_TILDE,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(1318), 33,
+      anon_sym_import,
+      anon_sym_from,
+      anon_sym_STAR,
+      anon_sym_print,
+      anon_sym_assert,
+      anon_sym_return,
+      anon_sym_del,
+      anon_sym_raise,
+      anon_sym_pass,
+      anon_sym_break,
+      anon_sym_continue,
+      anon_sym_if,
+      anon_sym_async,
+      anon_sym_for,
+      anon_sym_while,
+      anon_sym_try,
+      anon_sym_with,
+      anon_sym_match,
+      anon_sym_def,
+      anon_sym_global,
+      anon_sym_nonlocal,
+      anon_sym_exec,
+      anon_sym_type,
+      anon_sym_class,
+      anon_sym_not,
+      anon_sym_lambda,
+      anon_sym_yield,
+      sym_integer,
+      sym_identifier,
+      anon_sym_await,
+      sym_true,
+      sym_false,
+      sym_none,
+  [28600] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1156), 12,
+      sym__string_start,
+      ts_builtin_sym_end,
+      anon_sym_LPAREN,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_LBRACE,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_TILDE,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(1154), 33,
+      anon_sym_import,
+      anon_sym_from,
+      anon_sym_STAR,
+      anon_sym_print,
+      anon_sym_assert,
+      anon_sym_return,
+      anon_sym_del,
+      anon_sym_raise,
+      anon_sym_pass,
+      anon_sym_break,
+      anon_sym_continue,
+      anon_sym_if,
+      anon_sym_async,
+      anon_sym_for,
+      anon_sym_while,
+      anon_sym_try,
+      anon_sym_with,
+      anon_sym_match,
+      anon_sym_def,
+      anon_sym_global,
+      anon_sym_nonlocal,
+      anon_sym_exec,
+      anon_sym_type,
+      anon_sym_class,
+      anon_sym_not,
+      anon_sym_lambda,
+      anon_sym_yield,
+      sym_integer,
+      sym_identifier,
+      anon_sym_await,
+      sym_true,
+      sym_false,
+      sym_none,
+  [28653] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1320), 12,
+      sym__string_start,
+      ts_builtin_sym_end,
+      anon_sym_LPAREN,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_LBRACE,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_TILDE,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(1322), 33,
+      anon_sym_import,
+      anon_sym_from,
+      anon_sym_STAR,
+      anon_sym_print,
+      anon_sym_assert,
+      anon_sym_return,
+      anon_sym_del,
+      anon_sym_raise,
+      anon_sym_pass,
+      anon_sym_break,
+      anon_sym_continue,
+      anon_sym_if,
+      anon_sym_async,
+      anon_sym_for,
+      anon_sym_while,
+      anon_sym_try,
+      anon_sym_with,
+      anon_sym_match,
+      anon_sym_def,
+      anon_sym_global,
+      anon_sym_nonlocal,
+      anon_sym_exec,
+      anon_sym_type,
+      anon_sym_class,
+      anon_sym_not,
+      anon_sym_lambda,
+      anon_sym_yield,
+      sym_integer,
+      sym_identifier,
+      anon_sym_await,
+      sym_true,
+      sym_false,
+      sym_none,
+  [28706] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1274), 12,
+      sym__string_start,
+      ts_builtin_sym_end,
+      anon_sym_LPAREN,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_LBRACE,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_TILDE,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(1272), 33,
+      anon_sym_import,
+      anon_sym_from,
+      anon_sym_STAR,
+      anon_sym_print,
+      anon_sym_assert,
+      anon_sym_return,
+      anon_sym_del,
+      anon_sym_raise,
+      anon_sym_pass,
+      anon_sym_break,
+      anon_sym_continue,
+      anon_sym_if,
+      anon_sym_async,
+      anon_sym_for,
+      anon_sym_while,
+      anon_sym_try,
+      anon_sym_with,
+      anon_sym_match,
+      anon_sym_def,
+      anon_sym_global,
+      anon_sym_nonlocal,
+      anon_sym_exec,
+      anon_sym_type,
+      anon_sym_class,
+      anon_sym_not,
+      anon_sym_lambda,
+      anon_sym_yield,
+      sym_integer,
+      sym_identifier,
+      anon_sym_await,
+      sym_true,
+      sym_false,
+      sym_none,
+  [28759] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1326), 12,
+      sym__dedent,
+      sym__string_start,
+      anon_sym_LPAREN,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_LBRACE,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_TILDE,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(1324), 33,
+      anon_sym_import,
+      anon_sym_from,
+      anon_sym_STAR,
+      anon_sym_print,
+      anon_sym_assert,
+      anon_sym_return,
+      anon_sym_del,
+      anon_sym_raise,
+      anon_sym_pass,
+      anon_sym_break,
+      anon_sym_continue,
+      anon_sym_if,
+      anon_sym_async,
+      anon_sym_for,
+      anon_sym_while,
+      anon_sym_try,
+      anon_sym_with,
+      anon_sym_match,
+      anon_sym_def,
+      anon_sym_global,
+      anon_sym_nonlocal,
+      anon_sym_exec,
+      anon_sym_type,
+      anon_sym_class,
+      anon_sym_not,
+      anon_sym_lambda,
+      anon_sym_yield,
+      sym_integer,
+      sym_identifier,
+      anon_sym_await,
+      sym_true,
+      sym_false,
+      sym_none,
+  [28812] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(838), 12,
+      sym__string_start,
+      ts_builtin_sym_end,
+      anon_sym_LPAREN,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_LBRACE,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_TILDE,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(840), 33,
+      anon_sym_import,
+      anon_sym_from,
+      anon_sym_STAR,
+      anon_sym_print,
+      anon_sym_assert,
+      anon_sym_return,
+      anon_sym_del,
+      anon_sym_raise,
+      anon_sym_pass,
+      anon_sym_break,
+      anon_sym_continue,
+      anon_sym_if,
+      anon_sym_async,
+      anon_sym_for,
+      anon_sym_while,
+      anon_sym_try,
+      anon_sym_with,
+      anon_sym_match,
+      anon_sym_def,
+      anon_sym_global,
+      anon_sym_nonlocal,
+      anon_sym_exec,
+      anon_sym_type,
+      anon_sym_class,
+      anon_sym_not,
+      anon_sym_lambda,
+      anon_sym_yield,
+      sym_integer,
+      sym_identifier,
+      anon_sym_await,
+      sym_true,
+      sym_false,
+      sym_none,
+  [28865] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1330), 12,
+      sym__dedent,
+      sym__string_start,
+      anon_sym_LPAREN,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_LBRACE,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_TILDE,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(1328), 33,
+      anon_sym_import,
+      anon_sym_from,
+      anon_sym_STAR,
+      anon_sym_print,
+      anon_sym_assert,
+      anon_sym_return,
+      anon_sym_del,
+      anon_sym_raise,
+      anon_sym_pass,
+      anon_sym_break,
+      anon_sym_continue,
+      anon_sym_if,
+      anon_sym_async,
+      anon_sym_for,
+      anon_sym_while,
+      anon_sym_try,
+      anon_sym_with,
+      anon_sym_match,
+      anon_sym_def,
+      anon_sym_global,
+      anon_sym_nonlocal,
+      anon_sym_exec,
+      anon_sym_type,
+      anon_sym_class,
+      anon_sym_not,
+      anon_sym_lambda,
+      anon_sym_yield,
+      sym_integer,
+      sym_identifier,
+      anon_sym_await,
+      sym_true,
+      sym_false,
+      sym_none,
+  [28918] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1252), 12,
+      sym__dedent,
+      sym__string_start,
+      anon_sym_LPAREN,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_LBRACE,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_TILDE,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(1254), 33,
+      anon_sym_import,
+      anon_sym_from,
+      anon_sym_STAR,
+      anon_sym_print,
+      anon_sym_assert,
+      anon_sym_return,
+      anon_sym_del,
+      anon_sym_raise,
+      anon_sym_pass,
+      anon_sym_break,
+      anon_sym_continue,
+      anon_sym_if,
+      anon_sym_async,
+      anon_sym_for,
+      anon_sym_while,
+      anon_sym_try,
+      anon_sym_with,
+      anon_sym_match,
+      anon_sym_def,
+      anon_sym_global,
+      anon_sym_nonlocal,
+      anon_sym_exec,
+      anon_sym_type,
+      anon_sym_class,
+      anon_sym_not,
+      anon_sym_lambda,
+      anon_sym_yield,
+      sym_integer,
+      sym_identifier,
+      anon_sym_await,
+      sym_true,
+      sym_false,
+      sym_none,
+  [28971] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1268), 12,
+      sym__dedent,
+      sym__string_start,
+      anon_sym_LPAREN,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_LBRACE,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_TILDE,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(1270), 33,
+      anon_sym_import,
+      anon_sym_from,
+      anon_sym_STAR,
+      anon_sym_print,
+      anon_sym_assert,
+      anon_sym_return,
+      anon_sym_del,
+      anon_sym_raise,
+      anon_sym_pass,
+      anon_sym_break,
+      anon_sym_continue,
+      anon_sym_if,
+      anon_sym_async,
+      anon_sym_for,
+      anon_sym_while,
+      anon_sym_try,
+      anon_sym_with,
+      anon_sym_match,
+      anon_sym_def,
+      anon_sym_global,
+      anon_sym_nonlocal,
+      anon_sym_exec,
+      anon_sym_type,
+      anon_sym_class,
+      anon_sym_not,
+      anon_sym_lambda,
+      anon_sym_yield,
+      sym_integer,
+      sym_identifier,
+      anon_sym_await,
+      sym_true,
+      sym_false,
+      sym_none,
+  [29024] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1288), 12,
+      sym__dedent,
+      sym__string_start,
+      anon_sym_LPAREN,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_LBRACE,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_TILDE,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(1290), 33,
+      anon_sym_import,
+      anon_sym_from,
+      anon_sym_STAR,
+      anon_sym_print,
+      anon_sym_assert,
+      anon_sym_return,
+      anon_sym_del,
+      anon_sym_raise,
+      anon_sym_pass,
+      anon_sym_break,
+      anon_sym_continue,
+      anon_sym_if,
+      anon_sym_async,
+      anon_sym_for,
+      anon_sym_while,
+      anon_sym_try,
+      anon_sym_with,
+      anon_sym_match,
+      anon_sym_def,
+      anon_sym_global,
+      anon_sym_nonlocal,
+      anon_sym_exec,
+      anon_sym_type,
+      anon_sym_class,
+      anon_sym_not,
+      anon_sym_lambda,
+      anon_sym_yield,
+      sym_integer,
+      sym_identifier,
+      anon_sym_await,
+      sym_true,
+      sym_false,
+      sym_none,
+  [29077] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1156), 12,
+      sym__dedent,
+      sym__string_start,
+      anon_sym_LPAREN,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_LBRACE,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_TILDE,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(1154), 33,
+      anon_sym_import,
+      anon_sym_from,
+      anon_sym_STAR,
+      anon_sym_print,
+      anon_sym_assert,
+      anon_sym_return,
+      anon_sym_del,
+      anon_sym_raise,
+      anon_sym_pass,
+      anon_sym_break,
+      anon_sym_continue,
+      anon_sym_if,
+      anon_sym_async,
+      anon_sym_for,
+      anon_sym_while,
+      anon_sym_try,
+      anon_sym_with,
+      anon_sym_match,
+      anon_sym_def,
+      anon_sym_global,
+      anon_sym_nonlocal,
+      anon_sym_exec,
+      anon_sym_type,
+      anon_sym_class,
+      anon_sym_not,
+      anon_sym_lambda,
+      anon_sym_yield,
+      sym_integer,
+      sym_identifier,
+      anon_sym_await,
+      sym_true,
+      sym_false,
+      sym_none,
+  [29130] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1332), 12,
+      sym__string_start,
+      ts_builtin_sym_end,
+      anon_sym_LPAREN,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_LBRACE,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_TILDE,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(1334), 33,
+      anon_sym_import,
+      anon_sym_from,
+      anon_sym_STAR,
+      anon_sym_print,
+      anon_sym_assert,
+      anon_sym_return,
+      anon_sym_del,
+      anon_sym_raise,
+      anon_sym_pass,
+      anon_sym_break,
+      anon_sym_continue,
+      anon_sym_if,
+      anon_sym_async,
+      anon_sym_for,
+      anon_sym_while,
+      anon_sym_try,
+      anon_sym_with,
+      anon_sym_match,
+      anon_sym_def,
+      anon_sym_global,
+      anon_sym_nonlocal,
+      anon_sym_exec,
+      anon_sym_type,
+      anon_sym_class,
+      anon_sym_not,
+      anon_sym_lambda,
+      anon_sym_yield,
+      sym_integer,
+      sym_identifier,
+      anon_sym_await,
+      sym_true,
+      sym_false,
+      sym_none,
+  [29183] = 19,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(279), 1,
+      anon_sym_LBRACE,
+    ACTIONS(299), 1,
+      sym__string_start,
+    ACTIONS(642), 1,
+      sym_identifier,
+    ACTIONS(644), 1,
+      anon_sym_LPAREN,
+    ACTIONS(654), 1,
+      anon_sym_LBRACK,
+    ACTIONS(656), 1,
+      anon_sym_await,
+    ACTIONS(1266), 1,
+      anon_sym_STAR,
+    STATE(586), 1,
+      sym_string,
+    STATE(856), 1,
+      sym_pattern,
+    STATE(865), 1,
+      sym_primary_expression,
+    ACTIONS(293), 2,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(1336), 2,
       anon_sym_RPAREN,
       anon_sym_RBRACK,
-    STATE(770), 2,
+    STATE(729), 2,
       sym_attribute,
       sym_subscript,
-    ACTIONS(301), 3,
+    ACTIONS(285), 3,
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
-    STATE(875), 3,
+    STATE(860), 3,
       sym_tuple_pattern,
       sym_list_pattern,
       sym_list_splat_pattern,
-    ACTIONS(311), 4,
+    ACTIONS(295), 4,
       sym_integer,
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(684), 6,
+    ACTIONS(648), 5,
       anon_sym_print,
       anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-      anon_sym_await,
-    STATE(642), 13,
+    STATE(605), 14,
       sym_binary_operator,
       sym_unary_operator,
       sym_call,
@@ -53774,22 +46932,3129 @@ static const uint16_t ts_small_parse_table[] = {
       sym_generator_expression,
       sym_parenthesized_expression,
       sym_concatenated_string,
-  [32779] = 5,
+      sym_await,
+  [29268] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(315), 1,
+    ACTIONS(838), 12,
+      sym__dedent,
       sym__string_start,
-    STATE(599), 2,
+      anon_sym_LPAREN,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_LBRACE,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_TILDE,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(840), 33,
+      anon_sym_import,
+      anon_sym_from,
+      anon_sym_STAR,
+      anon_sym_print,
+      anon_sym_assert,
+      anon_sym_return,
+      anon_sym_del,
+      anon_sym_raise,
+      anon_sym_pass,
+      anon_sym_break,
+      anon_sym_continue,
+      anon_sym_if,
+      anon_sym_async,
+      anon_sym_for,
+      anon_sym_while,
+      anon_sym_try,
+      anon_sym_with,
+      anon_sym_match,
+      anon_sym_def,
+      anon_sym_global,
+      anon_sym_nonlocal,
+      anon_sym_exec,
+      anon_sym_type,
+      anon_sym_class,
+      anon_sym_not,
+      anon_sym_lambda,
+      anon_sym_yield,
+      sym_integer,
+      sym_identifier,
+      anon_sym_await,
+      sym_true,
+      sym_false,
+      sym_none,
+  [29321] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1340), 12,
+      sym__dedent,
+      sym__string_start,
+      anon_sym_LPAREN,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_LBRACE,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_TILDE,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(1338), 33,
+      anon_sym_import,
+      anon_sym_from,
+      anon_sym_STAR,
+      anon_sym_print,
+      anon_sym_assert,
+      anon_sym_return,
+      anon_sym_del,
+      anon_sym_raise,
+      anon_sym_pass,
+      anon_sym_break,
+      anon_sym_continue,
+      anon_sym_if,
+      anon_sym_async,
+      anon_sym_for,
+      anon_sym_while,
+      anon_sym_try,
+      anon_sym_with,
+      anon_sym_match,
+      anon_sym_def,
+      anon_sym_global,
+      anon_sym_nonlocal,
+      anon_sym_exec,
+      anon_sym_type,
+      anon_sym_class,
+      anon_sym_not,
+      anon_sym_lambda,
+      anon_sym_yield,
+      sym_integer,
+      sym_identifier,
+      anon_sym_await,
+      sym_true,
+      sym_false,
+      sym_none,
+  [29374] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1344), 12,
+      sym__dedent,
+      sym__string_start,
+      anon_sym_LPAREN,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_LBRACE,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_TILDE,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(1342), 33,
+      anon_sym_import,
+      anon_sym_from,
+      anon_sym_STAR,
+      anon_sym_print,
+      anon_sym_assert,
+      anon_sym_return,
+      anon_sym_del,
+      anon_sym_raise,
+      anon_sym_pass,
+      anon_sym_break,
+      anon_sym_continue,
+      anon_sym_if,
+      anon_sym_async,
+      anon_sym_for,
+      anon_sym_while,
+      anon_sym_try,
+      anon_sym_with,
+      anon_sym_match,
+      anon_sym_def,
+      anon_sym_global,
+      anon_sym_nonlocal,
+      anon_sym_exec,
+      anon_sym_type,
+      anon_sym_class,
+      anon_sym_not,
+      anon_sym_lambda,
+      anon_sym_yield,
+      sym_integer,
+      sym_identifier,
+      anon_sym_await,
+      sym_true,
+      sym_false,
+      sym_none,
+  [29427] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1346), 12,
+      sym__string_start,
+      ts_builtin_sym_end,
+      anon_sym_LPAREN,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_LBRACE,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_TILDE,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(1348), 33,
+      anon_sym_import,
+      anon_sym_from,
+      anon_sym_STAR,
+      anon_sym_print,
+      anon_sym_assert,
+      anon_sym_return,
+      anon_sym_del,
+      anon_sym_raise,
+      anon_sym_pass,
+      anon_sym_break,
+      anon_sym_continue,
+      anon_sym_if,
+      anon_sym_async,
+      anon_sym_for,
+      anon_sym_while,
+      anon_sym_try,
+      anon_sym_with,
+      anon_sym_match,
+      anon_sym_def,
+      anon_sym_global,
+      anon_sym_nonlocal,
+      anon_sym_exec,
+      anon_sym_type,
+      anon_sym_class,
+      anon_sym_not,
+      anon_sym_lambda,
+      anon_sym_yield,
+      sym_integer,
+      sym_identifier,
+      anon_sym_await,
+      sym_true,
+      sym_false,
+      sym_none,
+  [29480] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1332), 12,
+      sym__dedent,
+      sym__string_start,
+      anon_sym_LPAREN,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_LBRACE,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_TILDE,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(1334), 33,
+      anon_sym_import,
+      anon_sym_from,
+      anon_sym_STAR,
+      anon_sym_print,
+      anon_sym_assert,
+      anon_sym_return,
+      anon_sym_del,
+      anon_sym_raise,
+      anon_sym_pass,
+      anon_sym_break,
+      anon_sym_continue,
+      anon_sym_if,
+      anon_sym_async,
+      anon_sym_for,
+      anon_sym_while,
+      anon_sym_try,
+      anon_sym_with,
+      anon_sym_match,
+      anon_sym_def,
+      anon_sym_global,
+      anon_sym_nonlocal,
+      anon_sym_exec,
+      anon_sym_type,
+      anon_sym_class,
+      anon_sym_not,
+      anon_sym_lambda,
+      anon_sym_yield,
+      sym_integer,
+      sym_identifier,
+      anon_sym_await,
+      sym_true,
+      sym_false,
+      sym_none,
+  [29533] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1352), 12,
+      sym__dedent,
+      sym__string_start,
+      anon_sym_LPAREN,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_LBRACE,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_TILDE,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(1350), 33,
+      anon_sym_import,
+      anon_sym_from,
+      anon_sym_STAR,
+      anon_sym_print,
+      anon_sym_assert,
+      anon_sym_return,
+      anon_sym_del,
+      anon_sym_raise,
+      anon_sym_pass,
+      anon_sym_break,
+      anon_sym_continue,
+      anon_sym_if,
+      anon_sym_async,
+      anon_sym_for,
+      anon_sym_while,
+      anon_sym_try,
+      anon_sym_with,
+      anon_sym_match,
+      anon_sym_def,
+      anon_sym_global,
+      anon_sym_nonlocal,
+      anon_sym_exec,
+      anon_sym_type,
+      anon_sym_class,
+      anon_sym_not,
+      anon_sym_lambda,
+      anon_sym_yield,
+      sym_integer,
+      sym_identifier,
+      anon_sym_await,
+      sym_true,
+      sym_false,
+      sym_none,
+  [29586] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1344), 12,
+      sym__string_start,
+      ts_builtin_sym_end,
+      anon_sym_LPAREN,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_LBRACE,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_TILDE,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(1342), 33,
+      anon_sym_import,
+      anon_sym_from,
+      anon_sym_STAR,
+      anon_sym_print,
+      anon_sym_assert,
+      anon_sym_return,
+      anon_sym_del,
+      anon_sym_raise,
+      anon_sym_pass,
+      anon_sym_break,
+      anon_sym_continue,
+      anon_sym_if,
+      anon_sym_async,
+      anon_sym_for,
+      anon_sym_while,
+      anon_sym_try,
+      anon_sym_with,
+      anon_sym_match,
+      anon_sym_def,
+      anon_sym_global,
+      anon_sym_nonlocal,
+      anon_sym_exec,
+      anon_sym_type,
+      anon_sym_class,
+      anon_sym_not,
+      anon_sym_lambda,
+      anon_sym_yield,
+      sym_integer,
+      sym_identifier,
+      anon_sym_await,
+      sym_true,
+      sym_false,
+      sym_none,
+  [29639] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1340), 12,
+      sym__string_start,
+      ts_builtin_sym_end,
+      anon_sym_LPAREN,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_LBRACE,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_TILDE,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(1338), 33,
+      anon_sym_import,
+      anon_sym_from,
+      anon_sym_STAR,
+      anon_sym_print,
+      anon_sym_assert,
+      anon_sym_return,
+      anon_sym_del,
+      anon_sym_raise,
+      anon_sym_pass,
+      anon_sym_break,
+      anon_sym_continue,
+      anon_sym_if,
+      anon_sym_async,
+      anon_sym_for,
+      anon_sym_while,
+      anon_sym_try,
+      anon_sym_with,
+      anon_sym_match,
+      anon_sym_def,
+      anon_sym_global,
+      anon_sym_nonlocal,
+      anon_sym_exec,
+      anon_sym_type,
+      anon_sym_class,
+      anon_sym_not,
+      anon_sym_lambda,
+      anon_sym_yield,
+      sym_integer,
+      sym_identifier,
+      anon_sym_await,
+      sym_true,
+      sym_false,
+      sym_none,
+  [29692] = 19,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(279), 1,
+      anon_sym_LBRACE,
+    ACTIONS(299), 1,
+      sym__string_start,
+    ACTIONS(642), 1,
+      sym_identifier,
+    ACTIONS(644), 1,
+      anon_sym_LPAREN,
+    ACTIONS(654), 1,
+      anon_sym_LBRACK,
+    ACTIONS(656), 1,
+      anon_sym_await,
+    ACTIONS(1266), 1,
+      anon_sym_STAR,
+    STATE(586), 1,
+      sym_string,
+    STATE(856), 1,
+      sym_pattern,
+    STATE(865), 1,
+      sym_primary_expression,
+    ACTIONS(293), 2,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(1354), 2,
+      anon_sym_RPAREN,
+      anon_sym_RBRACK,
+    STATE(729), 2,
+      sym_attribute,
+      sym_subscript,
+    ACTIONS(285), 3,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_TILDE,
+    STATE(860), 3,
+      sym_tuple_pattern,
+      sym_list_pattern,
+      sym_list_splat_pattern,
+    ACTIONS(295), 4,
+      sym_integer,
+      sym_true,
+      sym_false,
+      sym_none,
+    ACTIONS(648), 5,
+      anon_sym_print,
+      anon_sym_async,
+      anon_sym_match,
+      anon_sym_exec,
+      anon_sym_type,
+    STATE(605), 14,
+      sym_binary_operator,
+      sym_unary_operator,
+      sym_call,
+      sym_list,
+      sym_set,
+      sym_tuple,
+      sym_dictionary,
+      sym_list_comprehension,
+      sym_dictionary_comprehension,
+      sym_set_comprehension,
+      sym_generator_expression,
+      sym_parenthesized_expression,
+      sym_concatenated_string,
+      sym_await,
+  [29777] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1158), 12,
+      sym__dedent,
+      sym__string_start,
+      anon_sym_LPAREN,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_LBRACE,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_TILDE,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(1160), 33,
+      anon_sym_import,
+      anon_sym_from,
+      anon_sym_STAR,
+      anon_sym_print,
+      anon_sym_assert,
+      anon_sym_return,
+      anon_sym_del,
+      anon_sym_raise,
+      anon_sym_pass,
+      anon_sym_break,
+      anon_sym_continue,
+      anon_sym_if,
+      anon_sym_async,
+      anon_sym_for,
+      anon_sym_while,
+      anon_sym_try,
+      anon_sym_with,
+      anon_sym_match,
+      anon_sym_def,
+      anon_sym_global,
+      anon_sym_nonlocal,
+      anon_sym_exec,
+      anon_sym_type,
+      anon_sym_class,
+      anon_sym_not,
+      anon_sym_lambda,
+      anon_sym_yield,
+      sym_integer,
+      sym_identifier,
+      anon_sym_await,
+      sym_true,
+      sym_false,
+      sym_none,
+  [29830] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1212), 12,
+      sym__dedent,
+      sym__string_start,
+      anon_sym_LPAREN,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_LBRACE,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_TILDE,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(1214), 33,
+      anon_sym_import,
+      anon_sym_from,
+      anon_sym_STAR,
+      anon_sym_print,
+      anon_sym_assert,
+      anon_sym_return,
+      anon_sym_del,
+      anon_sym_raise,
+      anon_sym_pass,
+      anon_sym_break,
+      anon_sym_continue,
+      anon_sym_if,
+      anon_sym_async,
+      anon_sym_for,
+      anon_sym_while,
+      anon_sym_try,
+      anon_sym_with,
+      anon_sym_match,
+      anon_sym_def,
+      anon_sym_global,
+      anon_sym_nonlocal,
+      anon_sym_exec,
+      anon_sym_type,
+      anon_sym_class,
+      anon_sym_not,
+      anon_sym_lambda,
+      anon_sym_yield,
+      sym_integer,
+      sym_identifier,
+      anon_sym_await,
+      sym_true,
+      sym_false,
+      sym_none,
+  [29883] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1310), 12,
+      sym__string_start,
+      ts_builtin_sym_end,
+      anon_sym_LPAREN,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_LBRACE,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_TILDE,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(1308), 33,
+      anon_sym_import,
+      anon_sym_from,
+      anon_sym_STAR,
+      anon_sym_print,
+      anon_sym_assert,
+      anon_sym_return,
+      anon_sym_del,
+      anon_sym_raise,
+      anon_sym_pass,
+      anon_sym_break,
+      anon_sym_continue,
+      anon_sym_if,
+      anon_sym_async,
+      anon_sym_for,
+      anon_sym_while,
+      anon_sym_try,
+      anon_sym_with,
+      anon_sym_match,
+      anon_sym_def,
+      anon_sym_global,
+      anon_sym_nonlocal,
+      anon_sym_exec,
+      anon_sym_type,
+      anon_sym_class,
+      anon_sym_not,
+      anon_sym_lambda,
+      anon_sym_yield,
+      sym_integer,
+      sym_identifier,
+      anon_sym_await,
+      sym_true,
+      sym_false,
+      sym_none,
+  [29936] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1358), 12,
+      sym__dedent,
+      sym__string_start,
+      anon_sym_LPAREN,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_LBRACE,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_TILDE,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(1356), 33,
+      anon_sym_import,
+      anon_sym_from,
+      anon_sym_STAR,
+      anon_sym_print,
+      anon_sym_assert,
+      anon_sym_return,
+      anon_sym_del,
+      anon_sym_raise,
+      anon_sym_pass,
+      anon_sym_break,
+      anon_sym_continue,
+      anon_sym_if,
+      anon_sym_async,
+      anon_sym_for,
+      anon_sym_while,
+      anon_sym_try,
+      anon_sym_with,
+      anon_sym_match,
+      anon_sym_def,
+      anon_sym_global,
+      anon_sym_nonlocal,
+      anon_sym_exec,
+      anon_sym_type,
+      anon_sym_class,
+      anon_sym_not,
+      anon_sym_lambda,
+      anon_sym_yield,
+      sym_integer,
+      sym_identifier,
+      anon_sym_await,
+      sym_true,
+      sym_false,
+      sym_none,
+  [29989] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1196), 12,
+      sym__dedent,
+      sym__string_start,
+      anon_sym_LPAREN,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_LBRACE,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_TILDE,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(1198), 33,
+      anon_sym_import,
+      anon_sym_from,
+      anon_sym_STAR,
+      anon_sym_print,
+      anon_sym_assert,
+      anon_sym_return,
+      anon_sym_del,
+      anon_sym_raise,
+      anon_sym_pass,
+      anon_sym_break,
+      anon_sym_continue,
+      anon_sym_if,
+      anon_sym_async,
+      anon_sym_for,
+      anon_sym_while,
+      anon_sym_try,
+      anon_sym_with,
+      anon_sym_match,
+      anon_sym_def,
+      anon_sym_global,
+      anon_sym_nonlocal,
+      anon_sym_exec,
+      anon_sym_type,
+      anon_sym_class,
+      anon_sym_not,
+      anon_sym_lambda,
+      anon_sym_yield,
+      sym_integer,
+      sym_identifier,
+      anon_sym_await,
+      sym_true,
+      sym_false,
+      sym_none,
+  [30042] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1362), 12,
+      sym__dedent,
+      sym__string_start,
+      anon_sym_LPAREN,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_LBRACE,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_TILDE,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(1360), 33,
+      anon_sym_import,
+      anon_sym_from,
+      anon_sym_STAR,
+      anon_sym_print,
+      anon_sym_assert,
+      anon_sym_return,
+      anon_sym_del,
+      anon_sym_raise,
+      anon_sym_pass,
+      anon_sym_break,
+      anon_sym_continue,
+      anon_sym_if,
+      anon_sym_async,
+      anon_sym_for,
+      anon_sym_while,
+      anon_sym_try,
+      anon_sym_with,
+      anon_sym_match,
+      anon_sym_def,
+      anon_sym_global,
+      anon_sym_nonlocal,
+      anon_sym_exec,
+      anon_sym_type,
+      anon_sym_class,
+      anon_sym_not,
+      anon_sym_lambda,
+      anon_sym_yield,
+      sym_integer,
+      sym_identifier,
+      anon_sym_await,
+      sym_true,
+      sym_false,
+      sym_none,
+  [30095] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1306), 12,
+      sym__string_start,
+      ts_builtin_sym_end,
+      anon_sym_LPAREN,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_LBRACE,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_TILDE,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(1304), 33,
+      anon_sym_import,
+      anon_sym_from,
+      anon_sym_STAR,
+      anon_sym_print,
+      anon_sym_assert,
+      anon_sym_return,
+      anon_sym_del,
+      anon_sym_raise,
+      anon_sym_pass,
+      anon_sym_break,
+      anon_sym_continue,
+      anon_sym_if,
+      anon_sym_async,
+      anon_sym_for,
+      anon_sym_while,
+      anon_sym_try,
+      anon_sym_with,
+      anon_sym_match,
+      anon_sym_def,
+      anon_sym_global,
+      anon_sym_nonlocal,
+      anon_sym_exec,
+      anon_sym_type,
+      anon_sym_class,
+      anon_sym_not,
+      anon_sym_lambda,
+      anon_sym_yield,
+      sym_integer,
+      sym_identifier,
+      anon_sym_await,
+      sym_true,
+      sym_false,
+      sym_none,
+  [30148] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1302), 12,
+      sym__string_start,
+      ts_builtin_sym_end,
+      anon_sym_LPAREN,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_LBRACE,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_TILDE,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(1300), 33,
+      anon_sym_import,
+      anon_sym_from,
+      anon_sym_STAR,
+      anon_sym_print,
+      anon_sym_assert,
+      anon_sym_return,
+      anon_sym_del,
+      anon_sym_raise,
+      anon_sym_pass,
+      anon_sym_break,
+      anon_sym_continue,
+      anon_sym_if,
+      anon_sym_async,
+      anon_sym_for,
+      anon_sym_while,
+      anon_sym_try,
+      anon_sym_with,
+      anon_sym_match,
+      anon_sym_def,
+      anon_sym_global,
+      anon_sym_nonlocal,
+      anon_sym_exec,
+      anon_sym_type,
+      anon_sym_class,
+      anon_sym_not,
+      anon_sym_lambda,
+      anon_sym_yield,
+      sym_integer,
+      sym_identifier,
+      anon_sym_await,
+      sym_true,
+      sym_false,
+      sym_none,
+  [30201] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1320), 12,
+      sym__dedent,
+      sym__string_start,
+      anon_sym_LPAREN,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_LBRACE,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_TILDE,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(1322), 33,
+      anon_sym_import,
+      anon_sym_from,
+      anon_sym_STAR,
+      anon_sym_print,
+      anon_sym_assert,
+      anon_sym_return,
+      anon_sym_del,
+      anon_sym_raise,
+      anon_sym_pass,
+      anon_sym_break,
+      anon_sym_continue,
+      anon_sym_if,
+      anon_sym_async,
+      anon_sym_for,
+      anon_sym_while,
+      anon_sym_try,
+      anon_sym_with,
+      anon_sym_match,
+      anon_sym_def,
+      anon_sym_global,
+      anon_sym_nonlocal,
+      anon_sym_exec,
+      anon_sym_type,
+      anon_sym_class,
+      anon_sym_not,
+      anon_sym_lambda,
+      anon_sym_yield,
+      sym_integer,
+      sym_identifier,
+      anon_sym_await,
+      sym_true,
+      sym_false,
+      sym_none,
+  [30254] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1242), 12,
+      sym__string_start,
+      ts_builtin_sym_end,
+      anon_sym_LPAREN,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_LBRACE,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_TILDE,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(1240), 33,
+      anon_sym_import,
+      anon_sym_from,
+      anon_sym_STAR,
+      anon_sym_print,
+      anon_sym_assert,
+      anon_sym_return,
+      anon_sym_del,
+      anon_sym_raise,
+      anon_sym_pass,
+      anon_sym_break,
+      anon_sym_continue,
+      anon_sym_if,
+      anon_sym_async,
+      anon_sym_for,
+      anon_sym_while,
+      anon_sym_try,
+      anon_sym_with,
+      anon_sym_match,
+      anon_sym_def,
+      anon_sym_global,
+      anon_sym_nonlocal,
+      anon_sym_exec,
+      anon_sym_type,
+      anon_sym_class,
+      anon_sym_not,
+      anon_sym_lambda,
+      anon_sym_yield,
+      sym_integer,
+      sym_identifier,
+      anon_sym_await,
+      sym_true,
+      sym_false,
+      sym_none,
+  [30307] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1366), 12,
+      sym__dedent,
+      sym__string_start,
+      anon_sym_LPAREN,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_LBRACE,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_TILDE,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(1364), 33,
+      anon_sym_import,
+      anon_sym_from,
+      anon_sym_STAR,
+      anon_sym_print,
+      anon_sym_assert,
+      anon_sym_return,
+      anon_sym_del,
+      anon_sym_raise,
+      anon_sym_pass,
+      anon_sym_break,
+      anon_sym_continue,
+      anon_sym_if,
+      anon_sym_async,
+      anon_sym_for,
+      anon_sym_while,
+      anon_sym_try,
+      anon_sym_with,
+      anon_sym_match,
+      anon_sym_def,
+      anon_sym_global,
+      anon_sym_nonlocal,
+      anon_sym_exec,
+      anon_sym_type,
+      anon_sym_class,
+      anon_sym_not,
+      anon_sym_lambda,
+      anon_sym_yield,
+      sym_integer,
+      sym_identifier,
+      anon_sym_await,
+      sym_true,
+      sym_false,
+      sym_none,
+  [30360] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1370), 12,
+      sym__dedent,
+      sym__string_start,
+      anon_sym_LPAREN,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_LBRACE,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_TILDE,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(1368), 33,
+      anon_sym_import,
+      anon_sym_from,
+      anon_sym_STAR,
+      anon_sym_print,
+      anon_sym_assert,
+      anon_sym_return,
+      anon_sym_del,
+      anon_sym_raise,
+      anon_sym_pass,
+      anon_sym_break,
+      anon_sym_continue,
+      anon_sym_if,
+      anon_sym_async,
+      anon_sym_for,
+      anon_sym_while,
+      anon_sym_try,
+      anon_sym_with,
+      anon_sym_match,
+      anon_sym_def,
+      anon_sym_global,
+      anon_sym_nonlocal,
+      anon_sym_exec,
+      anon_sym_type,
+      anon_sym_class,
+      anon_sym_not,
+      anon_sym_lambda,
+      anon_sym_yield,
+      sym_integer,
+      sym_identifier,
+      anon_sym_await,
+      sym_true,
+      sym_false,
+      sym_none,
+  [30413] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1374), 12,
+      sym__dedent,
+      sym__string_start,
+      anon_sym_LPAREN,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_LBRACE,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_TILDE,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(1372), 33,
+      anon_sym_import,
+      anon_sym_from,
+      anon_sym_STAR,
+      anon_sym_print,
+      anon_sym_assert,
+      anon_sym_return,
+      anon_sym_del,
+      anon_sym_raise,
+      anon_sym_pass,
+      anon_sym_break,
+      anon_sym_continue,
+      anon_sym_if,
+      anon_sym_async,
+      anon_sym_for,
+      anon_sym_while,
+      anon_sym_try,
+      anon_sym_with,
+      anon_sym_match,
+      anon_sym_def,
+      anon_sym_global,
+      anon_sym_nonlocal,
+      anon_sym_exec,
+      anon_sym_type,
+      anon_sym_class,
+      anon_sym_not,
+      anon_sym_lambda,
+      anon_sym_yield,
+      sym_integer,
+      sym_identifier,
+      anon_sym_await,
+      sym_true,
+      sym_false,
+      sym_none,
+  [30466] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1316), 12,
+      sym__dedent,
+      sym__string_start,
+      anon_sym_LPAREN,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_LBRACE,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_TILDE,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(1318), 33,
+      anon_sym_import,
+      anon_sym_from,
+      anon_sym_STAR,
+      anon_sym_print,
+      anon_sym_assert,
+      anon_sym_return,
+      anon_sym_del,
+      anon_sym_raise,
+      anon_sym_pass,
+      anon_sym_break,
+      anon_sym_continue,
+      anon_sym_if,
+      anon_sym_async,
+      anon_sym_for,
+      anon_sym_while,
+      anon_sym_try,
+      anon_sym_with,
+      anon_sym_match,
+      anon_sym_def,
+      anon_sym_global,
+      anon_sym_nonlocal,
+      anon_sym_exec,
+      anon_sym_type,
+      anon_sym_class,
+      anon_sym_not,
+      anon_sym_lambda,
+      anon_sym_yield,
+      sym_integer,
+      sym_identifier,
+      anon_sym_await,
+      sym_true,
+      sym_false,
+      sym_none,
+  [30519] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1200), 12,
+      sym__dedent,
+      sym__string_start,
+      anon_sym_LPAREN,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_LBRACE,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_TILDE,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(1202), 33,
+      anon_sym_import,
+      anon_sym_from,
+      anon_sym_STAR,
+      anon_sym_print,
+      anon_sym_assert,
+      anon_sym_return,
+      anon_sym_del,
+      anon_sym_raise,
+      anon_sym_pass,
+      anon_sym_break,
+      anon_sym_continue,
+      anon_sym_if,
+      anon_sym_async,
+      anon_sym_for,
+      anon_sym_while,
+      anon_sym_try,
+      anon_sym_with,
+      anon_sym_match,
+      anon_sym_def,
+      anon_sym_global,
+      anon_sym_nonlocal,
+      anon_sym_exec,
+      anon_sym_type,
+      anon_sym_class,
+      anon_sym_not,
+      anon_sym_lambda,
+      anon_sym_yield,
+      sym_integer,
+      sym_identifier,
+      anon_sym_await,
+      sym_true,
+      sym_false,
+      sym_none,
+  [30572] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1204), 12,
+      sym__dedent,
+      sym__string_start,
+      anon_sym_LPAREN,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_LBRACE,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_TILDE,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(1206), 33,
+      anon_sym_import,
+      anon_sym_from,
+      anon_sym_STAR,
+      anon_sym_print,
+      anon_sym_assert,
+      anon_sym_return,
+      anon_sym_del,
+      anon_sym_raise,
+      anon_sym_pass,
+      anon_sym_break,
+      anon_sym_continue,
+      anon_sym_if,
+      anon_sym_async,
+      anon_sym_for,
+      anon_sym_while,
+      anon_sym_try,
+      anon_sym_with,
+      anon_sym_match,
+      anon_sym_def,
+      anon_sym_global,
+      anon_sym_nonlocal,
+      anon_sym_exec,
+      anon_sym_type,
+      anon_sym_class,
+      anon_sym_not,
+      anon_sym_lambda,
+      anon_sym_yield,
+      sym_integer,
+      sym_identifier,
+      anon_sym_await,
+      sym_true,
+      sym_false,
+      sym_none,
+  [30625] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1208), 12,
+      sym__dedent,
+      sym__string_start,
+      anon_sym_LPAREN,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_LBRACE,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_TILDE,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(1210), 33,
+      anon_sym_import,
+      anon_sym_from,
+      anon_sym_STAR,
+      anon_sym_print,
+      anon_sym_assert,
+      anon_sym_return,
+      anon_sym_del,
+      anon_sym_raise,
+      anon_sym_pass,
+      anon_sym_break,
+      anon_sym_continue,
+      anon_sym_if,
+      anon_sym_async,
+      anon_sym_for,
+      anon_sym_while,
+      anon_sym_try,
+      anon_sym_with,
+      anon_sym_match,
+      anon_sym_def,
+      anon_sym_global,
+      anon_sym_nonlocal,
+      anon_sym_exec,
+      anon_sym_type,
+      anon_sym_class,
+      anon_sym_not,
+      anon_sym_lambda,
+      anon_sym_yield,
+      sym_integer,
+      sym_identifier,
+      anon_sym_await,
+      sym_true,
+      sym_false,
+      sym_none,
+  [30678] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1378), 12,
+      sym__dedent,
+      sym__string_start,
+      anon_sym_LPAREN,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_LBRACE,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_TILDE,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(1376), 33,
+      anon_sym_import,
+      anon_sym_from,
+      anon_sym_STAR,
+      anon_sym_print,
+      anon_sym_assert,
+      anon_sym_return,
+      anon_sym_del,
+      anon_sym_raise,
+      anon_sym_pass,
+      anon_sym_break,
+      anon_sym_continue,
+      anon_sym_if,
+      anon_sym_async,
+      anon_sym_for,
+      anon_sym_while,
+      anon_sym_try,
+      anon_sym_with,
+      anon_sym_match,
+      anon_sym_def,
+      anon_sym_global,
+      anon_sym_nonlocal,
+      anon_sym_exec,
+      anon_sym_type,
+      anon_sym_class,
+      anon_sym_not,
+      anon_sym_lambda,
+      anon_sym_yield,
+      sym_integer,
+      sym_identifier,
+      anon_sym_await,
+      sym_true,
+      sym_false,
+      sym_none,
+  [30731] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1216), 12,
+      sym__dedent,
+      sym__string_start,
+      anon_sym_LPAREN,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_LBRACE,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_TILDE,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(1218), 33,
+      anon_sym_import,
+      anon_sym_from,
+      anon_sym_STAR,
+      anon_sym_print,
+      anon_sym_assert,
+      anon_sym_return,
+      anon_sym_del,
+      anon_sym_raise,
+      anon_sym_pass,
+      anon_sym_break,
+      anon_sym_continue,
+      anon_sym_if,
+      anon_sym_async,
+      anon_sym_for,
+      anon_sym_while,
+      anon_sym_try,
+      anon_sym_with,
+      anon_sym_match,
+      anon_sym_def,
+      anon_sym_global,
+      anon_sym_nonlocal,
+      anon_sym_exec,
+      anon_sym_type,
+      anon_sym_class,
+      anon_sym_not,
+      anon_sym_lambda,
+      anon_sym_yield,
+      sym_integer,
+      sym_identifier,
+      anon_sym_await,
+      sym_true,
+      sym_false,
+      sym_none,
+  [30784] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1362), 12,
+      sym__string_start,
+      ts_builtin_sym_end,
+      anon_sym_LPAREN,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_LBRACE,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_TILDE,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(1360), 33,
+      anon_sym_import,
+      anon_sym_from,
+      anon_sym_STAR,
+      anon_sym_print,
+      anon_sym_assert,
+      anon_sym_return,
+      anon_sym_del,
+      anon_sym_raise,
+      anon_sym_pass,
+      anon_sym_break,
+      anon_sym_continue,
+      anon_sym_if,
+      anon_sym_async,
+      anon_sym_for,
+      anon_sym_while,
+      anon_sym_try,
+      anon_sym_with,
+      anon_sym_match,
+      anon_sym_def,
+      anon_sym_global,
+      anon_sym_nonlocal,
+      anon_sym_exec,
+      anon_sym_type,
+      anon_sym_class,
+      anon_sym_not,
+      anon_sym_lambda,
+      anon_sym_yield,
+      sym_integer,
+      sym_identifier,
+      anon_sym_await,
+      sym_true,
+      sym_false,
+      sym_none,
+  [30837] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1312), 12,
+      sym__dedent,
+      sym__string_start,
+      anon_sym_LPAREN,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_LBRACE,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_TILDE,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(1314), 33,
+      anon_sym_import,
+      anon_sym_from,
+      anon_sym_STAR,
+      anon_sym_print,
+      anon_sym_assert,
+      anon_sym_return,
+      anon_sym_del,
+      anon_sym_raise,
+      anon_sym_pass,
+      anon_sym_break,
+      anon_sym_continue,
+      anon_sym_if,
+      anon_sym_async,
+      anon_sym_for,
+      anon_sym_while,
+      anon_sym_try,
+      anon_sym_with,
+      anon_sym_match,
+      anon_sym_def,
+      anon_sym_global,
+      anon_sym_nonlocal,
+      anon_sym_exec,
+      anon_sym_type,
+      anon_sym_class,
+      anon_sym_not,
+      anon_sym_lambda,
+      anon_sym_yield,
+      sym_integer,
+      sym_identifier,
+      anon_sym_await,
+      sym_true,
+      sym_false,
+      sym_none,
+  [30890] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1220), 12,
+      sym__dedent,
+      sym__string_start,
+      anon_sym_LPAREN,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_LBRACE,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_TILDE,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(1222), 33,
+      anon_sym_import,
+      anon_sym_from,
+      anon_sym_STAR,
+      anon_sym_print,
+      anon_sym_assert,
+      anon_sym_return,
+      anon_sym_del,
+      anon_sym_raise,
+      anon_sym_pass,
+      anon_sym_break,
+      anon_sym_continue,
+      anon_sym_if,
+      anon_sym_async,
+      anon_sym_for,
+      anon_sym_while,
+      anon_sym_try,
+      anon_sym_with,
+      anon_sym_match,
+      anon_sym_def,
+      anon_sym_global,
+      anon_sym_nonlocal,
+      anon_sym_exec,
+      anon_sym_type,
+      anon_sym_class,
+      anon_sym_not,
+      anon_sym_lambda,
+      anon_sym_yield,
+      sym_integer,
+      sym_identifier,
+      anon_sym_await,
+      sym_true,
+      sym_false,
+      sym_none,
+  [30943] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1358), 12,
+      sym__string_start,
+      ts_builtin_sym_end,
+      anon_sym_LPAREN,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_LBRACE,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_TILDE,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(1356), 33,
+      anon_sym_import,
+      anon_sym_from,
+      anon_sym_STAR,
+      anon_sym_print,
+      anon_sym_assert,
+      anon_sym_return,
+      anon_sym_del,
+      anon_sym_raise,
+      anon_sym_pass,
+      anon_sym_break,
+      anon_sym_continue,
+      anon_sym_if,
+      anon_sym_async,
+      anon_sym_for,
+      anon_sym_while,
+      anon_sym_try,
+      anon_sym_with,
+      anon_sym_match,
+      anon_sym_def,
+      anon_sym_global,
+      anon_sym_nonlocal,
+      anon_sym_exec,
+      anon_sym_type,
+      anon_sym_class,
+      anon_sym_not,
+      anon_sym_lambda,
+      anon_sym_yield,
+      sym_integer,
+      sym_identifier,
+      anon_sym_await,
+      sym_true,
+      sym_false,
+      sym_none,
+  [30996] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1346), 12,
+      sym__dedent,
+      sym__string_start,
+      anon_sym_LPAREN,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_LBRACE,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_TILDE,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(1348), 33,
+      anon_sym_import,
+      anon_sym_from,
+      anon_sym_STAR,
+      anon_sym_print,
+      anon_sym_assert,
+      anon_sym_return,
+      anon_sym_del,
+      anon_sym_raise,
+      anon_sym_pass,
+      anon_sym_break,
+      anon_sym_continue,
+      anon_sym_if,
+      anon_sym_async,
+      anon_sym_for,
+      anon_sym_while,
+      anon_sym_try,
+      anon_sym_with,
+      anon_sym_match,
+      anon_sym_def,
+      anon_sym_global,
+      anon_sym_nonlocal,
+      anon_sym_exec,
+      anon_sym_type,
+      anon_sym_class,
+      anon_sym_not,
+      anon_sym_lambda,
+      anon_sym_yield,
+      sym_integer,
+      sym_identifier,
+      anon_sym_await,
+      sym_true,
+      sym_false,
+      sym_none,
+  [31049] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1234), 12,
+      sym__string_start,
+      ts_builtin_sym_end,
+      anon_sym_LPAREN,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_LBRACE,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_TILDE,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(1232), 33,
+      anon_sym_import,
+      anon_sym_from,
+      anon_sym_STAR,
+      anon_sym_print,
+      anon_sym_assert,
+      anon_sym_return,
+      anon_sym_del,
+      anon_sym_raise,
+      anon_sym_pass,
+      anon_sym_break,
+      anon_sym_continue,
+      anon_sym_if,
+      anon_sym_async,
+      anon_sym_for,
+      anon_sym_while,
+      anon_sym_try,
+      anon_sym_with,
+      anon_sym_match,
+      anon_sym_def,
+      anon_sym_global,
+      anon_sym_nonlocal,
+      anon_sym_exec,
+      anon_sym_type,
+      anon_sym_class,
+      anon_sym_not,
+      anon_sym_lambda,
+      anon_sym_yield,
+      sym_integer,
+      sym_identifier,
+      anon_sym_await,
+      sym_true,
+      sym_false,
+      sym_none,
+  [31102] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1230), 12,
+      sym__string_start,
+      ts_builtin_sym_end,
+      anon_sym_LPAREN,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_LBRACE,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_TILDE,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(1228), 33,
+      anon_sym_import,
+      anon_sym_from,
+      anon_sym_STAR,
+      anon_sym_print,
+      anon_sym_assert,
+      anon_sym_return,
+      anon_sym_del,
+      anon_sym_raise,
+      anon_sym_pass,
+      anon_sym_break,
+      anon_sym_continue,
+      anon_sym_if,
+      anon_sym_async,
+      anon_sym_for,
+      anon_sym_while,
+      anon_sym_try,
+      anon_sym_with,
+      anon_sym_match,
+      anon_sym_def,
+      anon_sym_global,
+      anon_sym_nonlocal,
+      anon_sym_exec,
+      anon_sym_type,
+      anon_sym_class,
+      anon_sym_not,
+      anon_sym_lambda,
+      anon_sym_yield,
+      sym_integer,
+      sym_identifier,
+      anon_sym_await,
+      sym_true,
+      sym_false,
+      sym_none,
+  [31155] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1366), 12,
+      sym__string_start,
+      ts_builtin_sym_end,
+      anon_sym_LPAREN,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_LBRACE,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_TILDE,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(1364), 33,
+      anon_sym_import,
+      anon_sym_from,
+      anon_sym_STAR,
+      anon_sym_print,
+      anon_sym_assert,
+      anon_sym_return,
+      anon_sym_del,
+      anon_sym_raise,
+      anon_sym_pass,
+      anon_sym_break,
+      anon_sym_continue,
+      anon_sym_if,
+      anon_sym_async,
+      anon_sym_for,
+      anon_sym_while,
+      anon_sym_try,
+      anon_sym_with,
+      anon_sym_match,
+      anon_sym_def,
+      anon_sym_global,
+      anon_sym_nonlocal,
+      anon_sym_exec,
+      anon_sym_type,
+      anon_sym_class,
+      anon_sym_not,
+      anon_sym_lambda,
+      anon_sym_yield,
+      sym_integer,
+      sym_identifier,
+      anon_sym_await,
+      sym_true,
+      sym_false,
+      sym_none,
+  [31208] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1370), 12,
+      sym__string_start,
+      ts_builtin_sym_end,
+      anon_sym_LPAREN,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_LBRACE,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_TILDE,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(1368), 33,
+      anon_sym_import,
+      anon_sym_from,
+      anon_sym_STAR,
+      anon_sym_print,
+      anon_sym_assert,
+      anon_sym_return,
+      anon_sym_del,
+      anon_sym_raise,
+      anon_sym_pass,
+      anon_sym_break,
+      anon_sym_continue,
+      anon_sym_if,
+      anon_sym_async,
+      anon_sym_for,
+      anon_sym_while,
+      anon_sym_try,
+      anon_sym_with,
+      anon_sym_match,
+      anon_sym_def,
+      anon_sym_global,
+      anon_sym_nonlocal,
+      anon_sym_exec,
+      anon_sym_type,
+      anon_sym_class,
+      anon_sym_not,
+      anon_sym_lambda,
+      anon_sym_yield,
+      sym_integer,
+      sym_identifier,
+      anon_sym_await,
+      sym_true,
+      sym_false,
+      sym_none,
+  [31261] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1236), 12,
+      sym__dedent,
+      sym__string_start,
+      anon_sym_LPAREN,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_LBRACE,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_TILDE,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(1238), 33,
+      anon_sym_import,
+      anon_sym_from,
+      anon_sym_STAR,
+      anon_sym_print,
+      anon_sym_assert,
+      anon_sym_return,
+      anon_sym_del,
+      anon_sym_raise,
+      anon_sym_pass,
+      anon_sym_break,
+      anon_sym_continue,
+      anon_sym_if,
+      anon_sym_async,
+      anon_sym_for,
+      anon_sym_while,
+      anon_sym_try,
+      anon_sym_with,
+      anon_sym_match,
+      anon_sym_def,
+      anon_sym_global,
+      anon_sym_nonlocal,
+      anon_sym_exec,
+      anon_sym_type,
+      anon_sym_class,
+      anon_sym_not,
+      anon_sym_lambda,
+      anon_sym_yield,
+      sym_integer,
+      sym_identifier,
+      anon_sym_await,
+      sym_true,
+      sym_false,
+      sym_none,
+  [31314] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1378), 12,
+      sym__string_start,
+      ts_builtin_sym_end,
+      anon_sym_LPAREN,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_LBRACE,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_TILDE,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(1376), 33,
+      anon_sym_import,
+      anon_sym_from,
+      anon_sym_STAR,
+      anon_sym_print,
+      anon_sym_assert,
+      anon_sym_return,
+      anon_sym_del,
+      anon_sym_raise,
+      anon_sym_pass,
+      anon_sym_break,
+      anon_sym_continue,
+      anon_sym_if,
+      anon_sym_async,
+      anon_sym_for,
+      anon_sym_while,
+      anon_sym_try,
+      anon_sym_with,
+      anon_sym_match,
+      anon_sym_def,
+      anon_sym_global,
+      anon_sym_nonlocal,
+      anon_sym_exec,
+      anon_sym_type,
+      anon_sym_class,
+      anon_sym_not,
+      anon_sym_lambda,
+      anon_sym_yield,
+      sym_integer,
+      sym_identifier,
+      anon_sym_await,
+      sym_true,
+      sym_false,
+      sym_none,
+  [31367] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1374), 12,
+      sym__string_start,
+      ts_builtin_sym_end,
+      anon_sym_LPAREN,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_LBRACE,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_TILDE,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(1372), 33,
+      anon_sym_import,
+      anon_sym_from,
+      anon_sym_STAR,
+      anon_sym_print,
+      anon_sym_assert,
+      anon_sym_return,
+      anon_sym_del,
+      anon_sym_raise,
+      anon_sym_pass,
+      anon_sym_break,
+      anon_sym_continue,
+      anon_sym_if,
+      anon_sym_async,
+      anon_sym_for,
+      anon_sym_while,
+      anon_sym_try,
+      anon_sym_with,
+      anon_sym_match,
+      anon_sym_def,
+      anon_sym_global,
+      anon_sym_nonlocal,
+      anon_sym_exec,
+      anon_sym_type,
+      anon_sym_class,
+      anon_sym_not,
+      anon_sym_lambda,
+      anon_sym_yield,
+      sym_integer,
+      sym_identifier,
+      anon_sym_await,
+      sym_true,
+      sym_false,
+      sym_none,
+  [31420] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1244), 12,
+      sym__dedent,
+      sym__string_start,
+      anon_sym_LPAREN,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_LBRACE,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_TILDE,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(1246), 33,
+      anon_sym_import,
+      anon_sym_from,
+      anon_sym_STAR,
+      anon_sym_print,
+      anon_sym_assert,
+      anon_sym_return,
+      anon_sym_del,
+      anon_sym_raise,
+      anon_sym_pass,
+      anon_sym_break,
+      anon_sym_continue,
+      anon_sym_if,
+      anon_sym_async,
+      anon_sym_for,
+      anon_sym_while,
+      anon_sym_try,
+      anon_sym_with,
+      anon_sym_match,
+      anon_sym_def,
+      anon_sym_global,
+      anon_sym_nonlocal,
+      anon_sym_exec,
+      anon_sym_type,
+      anon_sym_class,
+      anon_sym_not,
+      anon_sym_lambda,
+      anon_sym_yield,
+      sym_integer,
+      sym_identifier,
+      anon_sym_await,
+      sym_true,
+      sym_false,
+      sym_none,
+  [31473] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1326), 12,
+      sym__string_start,
+      ts_builtin_sym_end,
+      anon_sym_LPAREN,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_LBRACE,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_TILDE,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(1324), 33,
+      anon_sym_import,
+      anon_sym_from,
+      anon_sym_STAR,
+      anon_sym_print,
+      anon_sym_assert,
+      anon_sym_return,
+      anon_sym_del,
+      anon_sym_raise,
+      anon_sym_pass,
+      anon_sym_break,
+      anon_sym_continue,
+      anon_sym_if,
+      anon_sym_async,
+      anon_sym_for,
+      anon_sym_while,
+      anon_sym_try,
+      anon_sym_with,
+      anon_sym_match,
+      anon_sym_def,
+      anon_sym_global,
+      anon_sym_nonlocal,
+      anon_sym_exec,
+      anon_sym_type,
+      anon_sym_class,
+      anon_sym_not,
+      anon_sym_lambda,
+      anon_sym_yield,
+      sym_integer,
+      sym_identifier,
+      anon_sym_await,
+      sym_true,
+      sym_false,
+      sym_none,
+  [31526] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1248), 12,
+      sym__dedent,
+      sym__string_start,
+      anon_sym_LPAREN,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_LBRACE,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_TILDE,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(1250), 33,
+      anon_sym_import,
+      anon_sym_from,
+      anon_sym_STAR,
+      anon_sym_print,
+      anon_sym_assert,
+      anon_sym_return,
+      anon_sym_del,
+      anon_sym_raise,
+      anon_sym_pass,
+      anon_sym_break,
+      anon_sym_continue,
+      anon_sym_if,
+      anon_sym_async,
+      anon_sym_for,
+      anon_sym_while,
+      anon_sym_try,
+      anon_sym_with,
+      anon_sym_match,
+      anon_sym_def,
+      anon_sym_global,
+      anon_sym_nonlocal,
+      anon_sym_exec,
+      anon_sym_type,
+      anon_sym_class,
+      anon_sym_not,
+      anon_sym_lambda,
+      anon_sym_yield,
+      sym_integer,
+      sym_identifier,
+      anon_sym_await,
+      sym_true,
+      sym_false,
+      sym_none,
+  [31579] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1226), 12,
+      sym__string_start,
+      ts_builtin_sym_end,
+      anon_sym_LPAREN,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_LBRACE,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_TILDE,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(1224), 33,
+      anon_sym_import,
+      anon_sym_from,
+      anon_sym_STAR,
+      anon_sym_print,
+      anon_sym_assert,
+      anon_sym_return,
+      anon_sym_del,
+      anon_sym_raise,
+      anon_sym_pass,
+      anon_sym_break,
+      anon_sym_continue,
+      anon_sym_if,
+      anon_sym_async,
+      anon_sym_for,
+      anon_sym_while,
+      anon_sym_try,
+      anon_sym_with,
+      anon_sym_match,
+      anon_sym_def,
+      anon_sym_global,
+      anon_sym_nonlocal,
+      anon_sym_exec,
+      anon_sym_type,
+      anon_sym_class,
+      anon_sym_not,
+      anon_sym_lambda,
+      anon_sym_yield,
+      sym_integer,
+      sym_identifier,
+      anon_sym_await,
+      sym_true,
+      sym_false,
+      sym_none,
+  [31632] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1256), 12,
+      sym__dedent,
+      sym__string_start,
+      anon_sym_LPAREN,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_LBRACE,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_TILDE,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(1258), 33,
+      anon_sym_import,
+      anon_sym_from,
+      anon_sym_STAR,
+      anon_sym_print,
+      anon_sym_assert,
+      anon_sym_return,
+      anon_sym_del,
+      anon_sym_raise,
+      anon_sym_pass,
+      anon_sym_break,
+      anon_sym_continue,
+      anon_sym_if,
+      anon_sym_async,
+      anon_sym_for,
+      anon_sym_while,
+      anon_sym_try,
+      anon_sym_with,
+      anon_sym_match,
+      anon_sym_def,
+      anon_sym_global,
+      anon_sym_nonlocal,
+      anon_sym_exec,
+      anon_sym_type,
+      anon_sym_class,
+      anon_sym_not,
+      anon_sym_lambda,
+      anon_sym_yield,
+      sym_integer,
+      sym_identifier,
+      anon_sym_await,
+      sym_true,
+      sym_false,
+      sym_none,
+  [31685] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1276), 12,
+      sym__dedent,
+      sym__string_start,
+      anon_sym_LPAREN,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_LBRACE,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_TILDE,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(1278), 33,
+      anon_sym_import,
+      anon_sym_from,
+      anon_sym_STAR,
+      anon_sym_print,
+      anon_sym_assert,
+      anon_sym_return,
+      anon_sym_del,
+      anon_sym_raise,
+      anon_sym_pass,
+      anon_sym_break,
+      anon_sym_continue,
+      anon_sym_if,
+      anon_sym_async,
+      anon_sym_for,
+      anon_sym_while,
+      anon_sym_try,
+      anon_sym_with,
+      anon_sym_match,
+      anon_sym_def,
+      anon_sym_global,
+      anon_sym_nonlocal,
+      anon_sym_exec,
+      anon_sym_type,
+      anon_sym_class,
+      anon_sym_not,
+      anon_sym_lambda,
+      anon_sym_yield,
+      sym_integer,
+      sym_identifier,
+      anon_sym_await,
+      sym_true,
+      sym_false,
+      sym_none,
+  [31738] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1284), 12,
+      sym__dedent,
+      sym__string_start,
+      anon_sym_LPAREN,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_LBRACE,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_TILDE,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(1286), 33,
+      anon_sym_import,
+      anon_sym_from,
+      anon_sym_STAR,
+      anon_sym_print,
+      anon_sym_assert,
+      anon_sym_return,
+      anon_sym_del,
+      anon_sym_raise,
+      anon_sym_pass,
+      anon_sym_break,
+      anon_sym_continue,
+      anon_sym_if,
+      anon_sym_async,
+      anon_sym_for,
+      anon_sym_while,
+      anon_sym_try,
+      anon_sym_with,
+      anon_sym_match,
+      anon_sym_def,
+      anon_sym_global,
+      anon_sym_nonlocal,
+      anon_sym_exec,
+      anon_sym_type,
+      anon_sym_class,
+      anon_sym_not,
+      anon_sym_lambda,
+      anon_sym_yield,
+      sym_integer,
+      sym_identifier,
+      anon_sym_await,
+      sym_true,
+      sym_false,
+      sym_none,
+  [31791] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1330), 12,
+      sym__string_start,
+      ts_builtin_sym_end,
+      anon_sym_LPAREN,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_LBRACE,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_TILDE,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(1328), 33,
+      anon_sym_import,
+      anon_sym_from,
+      anon_sym_STAR,
+      anon_sym_print,
+      anon_sym_assert,
+      anon_sym_return,
+      anon_sym_del,
+      anon_sym_raise,
+      anon_sym_pass,
+      anon_sym_break,
+      anon_sym_continue,
+      anon_sym_if,
+      anon_sym_async,
+      anon_sym_for,
+      anon_sym_while,
+      anon_sym_try,
+      anon_sym_with,
+      anon_sym_match,
+      anon_sym_def,
+      anon_sym_global,
+      anon_sym_nonlocal,
+      anon_sym_exec,
+      anon_sym_type,
+      anon_sym_class,
+      anon_sym_not,
+      anon_sym_lambda,
+      anon_sym_yield,
+      sym_integer,
+      sym_identifier,
+      anon_sym_await,
+      sym_true,
+      sym_false,
+      sym_none,
+  [31844] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1292), 12,
+      sym__dedent,
+      sym__string_start,
+      anon_sym_LPAREN,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_LBRACE,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_TILDE,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(1294), 33,
+      anon_sym_import,
+      anon_sym_from,
+      anon_sym_STAR,
+      anon_sym_print,
+      anon_sym_assert,
+      anon_sym_return,
+      anon_sym_del,
+      anon_sym_raise,
+      anon_sym_pass,
+      anon_sym_break,
+      anon_sym_continue,
+      anon_sym_if,
+      anon_sym_async,
+      anon_sym_for,
+      anon_sym_while,
+      anon_sym_try,
+      anon_sym_with,
+      anon_sym_match,
+      anon_sym_def,
+      anon_sym_global,
+      anon_sym_nonlocal,
+      anon_sym_exec,
+      anon_sym_type,
+      anon_sym_class,
+      anon_sym_not,
+      anon_sym_lambda,
+      anon_sym_yield,
+      sym_integer,
+      sym_identifier,
+      anon_sym_await,
+      sym_true,
+      sym_false,
+      sym_none,
+  [31897] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1352), 12,
+      sym__string_start,
+      ts_builtin_sym_end,
+      anon_sym_LPAREN,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_LBRACE,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_TILDE,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(1350), 33,
+      anon_sym_import,
+      anon_sym_from,
+      anon_sym_STAR,
+      anon_sym_print,
+      anon_sym_assert,
+      anon_sym_return,
+      anon_sym_del,
+      anon_sym_raise,
+      anon_sym_pass,
+      anon_sym_break,
+      anon_sym_continue,
+      anon_sym_if,
+      anon_sym_async,
+      anon_sym_for,
+      anon_sym_while,
+      anon_sym_try,
+      anon_sym_with,
+      anon_sym_match,
+      anon_sym_def,
+      anon_sym_global,
+      anon_sym_nonlocal,
+      anon_sym_exec,
+      anon_sym_type,
+      anon_sym_class,
+      anon_sym_not,
+      anon_sym_lambda,
+      anon_sym_yield,
+      sym_integer,
+      sym_identifier,
+      anon_sym_await,
+      sym_true,
+      sym_false,
+      sym_none,
+  [31950] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1296), 12,
+      sym__dedent,
+      sym__string_start,
+      anon_sym_LPAREN,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_LBRACE,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_TILDE,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(1298), 33,
+      anon_sym_import,
+      anon_sym_from,
+      anon_sym_STAR,
+      anon_sym_print,
+      anon_sym_assert,
+      anon_sym_return,
+      anon_sym_del,
+      anon_sym_raise,
+      anon_sym_pass,
+      anon_sym_break,
+      anon_sym_continue,
+      anon_sym_if,
+      anon_sym_async,
+      anon_sym_for,
+      anon_sym_while,
+      anon_sym_try,
+      anon_sym_with,
+      anon_sym_match,
+      anon_sym_def,
+      anon_sym_global,
+      anon_sym_nonlocal,
+      anon_sym_exec,
+      anon_sym_type,
+      anon_sym_class,
+      anon_sym_not,
+      anon_sym_lambda,
+      anon_sym_yield,
+      sym_integer,
+      sym_identifier,
+      anon_sym_await,
+      sym_true,
+      sym_false,
+      sym_none,
+  [32003] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1260), 12,
+      sym__dedent,
+      sym__string_start,
+      anon_sym_LPAREN,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_LBRACE,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_TILDE,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(1262), 33,
+      anon_sym_import,
+      anon_sym_from,
+      anon_sym_STAR,
+      anon_sym_print,
+      anon_sym_assert,
+      anon_sym_return,
+      anon_sym_del,
+      anon_sym_raise,
+      anon_sym_pass,
+      anon_sym_break,
+      anon_sym_continue,
+      anon_sym_if,
+      anon_sym_async,
+      anon_sym_for,
+      anon_sym_while,
+      anon_sym_try,
+      anon_sym_with,
+      anon_sym_match,
+      anon_sym_def,
+      anon_sym_global,
+      anon_sym_nonlocal,
+      anon_sym_exec,
+      anon_sym_type,
+      anon_sym_class,
+      anon_sym_not,
+      anon_sym_lambda,
+      anon_sym_yield,
+      sym_integer,
+      sym_identifier,
+      anon_sym_await,
+      sym_true,
+      sym_false,
+      sym_none,
+  [32056] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1280), 12,
+      sym__dedent,
+      sym__string_start,
+      anon_sym_LPAREN,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_LBRACE,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_TILDE,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(1282), 33,
+      anon_sym_import,
+      anon_sym_from,
+      anon_sym_STAR,
+      anon_sym_print,
+      anon_sym_assert,
+      anon_sym_return,
+      anon_sym_del,
+      anon_sym_raise,
+      anon_sym_pass,
+      anon_sym_break,
+      anon_sym_continue,
+      anon_sym_if,
+      anon_sym_async,
+      anon_sym_for,
+      anon_sym_while,
+      anon_sym_try,
+      anon_sym_with,
+      anon_sym_match,
+      anon_sym_def,
+      anon_sym_global,
+      anon_sym_nonlocal,
+      anon_sym_exec,
+      anon_sym_type,
+      anon_sym_class,
+      anon_sym_not,
+      anon_sym_lambda,
+      anon_sym_yield,
+      sym_integer,
+      sym_identifier,
+      anon_sym_await,
+      sym_true,
+      sym_false,
+      sym_none,
+  [32109] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(820), 12,
+      sym__string_start,
+      ts_builtin_sym_end,
+      anon_sym_LPAREN,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_LBRACE,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_TILDE,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(818), 33,
+      anon_sym_import,
+      anon_sym_from,
+      anon_sym_STAR,
+      anon_sym_print,
+      anon_sym_assert,
+      anon_sym_return,
+      anon_sym_del,
+      anon_sym_raise,
+      anon_sym_pass,
+      anon_sym_break,
+      anon_sym_continue,
+      anon_sym_if,
+      anon_sym_async,
+      anon_sym_for,
+      anon_sym_while,
+      anon_sym_try,
+      anon_sym_with,
+      anon_sym_match,
+      anon_sym_def,
+      anon_sym_global,
+      anon_sym_nonlocal,
+      anon_sym_exec,
+      anon_sym_type,
+      anon_sym_class,
+      anon_sym_not,
+      anon_sym_lambda,
+      anon_sym_yield,
+      sym_integer,
+      sym_identifier,
+      anon_sym_await,
+      sym_true,
+      sym_false,
+      sym_none,
+  [32162] = 19,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(279), 1,
+      anon_sym_LBRACE,
+    ACTIONS(299), 1,
+      sym__string_start,
+    ACTIONS(642), 1,
+      sym_identifier,
+    ACTIONS(644), 1,
+      anon_sym_LPAREN,
+    ACTIONS(654), 1,
+      anon_sym_LBRACK,
+    ACTIONS(656), 1,
+      anon_sym_await,
+    ACTIONS(1266), 1,
+      anon_sym_STAR,
+    STATE(586), 1,
+      sym_string,
+    STATE(865), 1,
+      sym_primary_expression,
+    STATE(1186), 1,
+      sym_pattern,
+    STATE(1479), 1,
+      sym_pattern_list,
+    ACTIONS(293), 2,
+      sym_ellipsis,
+      sym_float,
+    STATE(729), 2,
+      sym_attribute,
+      sym_subscript,
+    ACTIONS(285), 3,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_TILDE,
+    STATE(860), 3,
+      sym_tuple_pattern,
+      sym_list_pattern,
+      sym_list_splat_pattern,
+    ACTIONS(295), 4,
+      sym_integer,
+      sym_true,
+      sym_false,
+      sym_none,
+    ACTIONS(648), 5,
+      anon_sym_print,
+      anon_sym_async,
+      anon_sym_match,
+      anon_sym_exec,
+      anon_sym_type,
+    STATE(605), 14,
+      sym_binary_operator,
+      sym_unary_operator,
+      sym_call,
+      sym_list,
+      sym_set,
+      sym_tuple,
+      sym_dictionary,
+      sym_list_comprehension,
+      sym_dictionary_comprehension,
+      sym_set_comprehension,
+      sym_generator_expression,
+      sym_parenthesized_expression,
+      sym_concatenated_string,
+      sym_await,
+  [32246] = 19,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(279), 1,
+      anon_sym_LBRACE,
+    ACTIONS(299), 1,
+      sym__string_start,
+    ACTIONS(642), 1,
+      sym_identifier,
+    ACTIONS(644), 1,
+      anon_sym_LPAREN,
+    ACTIONS(654), 1,
+      anon_sym_LBRACK,
+    ACTIONS(656), 1,
+      anon_sym_await,
+    ACTIONS(1266), 1,
+      anon_sym_STAR,
+    STATE(586), 1,
+      sym_string,
+    STATE(865), 1,
+      sym_primary_expression,
+    STATE(1301), 1,
+      sym_pattern,
+    STATE(1425), 1,
+      sym_pattern_list,
+    ACTIONS(293), 2,
+      sym_ellipsis,
+      sym_float,
+    STATE(729), 2,
+      sym_attribute,
+      sym_subscript,
+    ACTIONS(285), 3,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_TILDE,
+    STATE(860), 3,
+      sym_tuple_pattern,
+      sym_list_pattern,
+      sym_list_splat_pattern,
+    ACTIONS(295), 4,
+      sym_integer,
+      sym_true,
+      sym_false,
+      sym_none,
+    ACTIONS(648), 5,
+      anon_sym_print,
+      anon_sym_async,
+      anon_sym_match,
+      anon_sym_exec,
+      anon_sym_type,
+    STATE(605), 14,
+      sym_binary_operator,
+      sym_unary_operator,
+      sym_call,
+      sym_list,
+      sym_set,
+      sym_tuple,
+      sym_dictionary,
+      sym_list_comprehension,
+      sym_dictionary_comprehension,
+      sym_set_comprehension,
+      sym_generator_expression,
+      sym_parenthesized_expression,
+      sym_concatenated_string,
+      sym_await,
+  [32330] = 19,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(279), 1,
+      anon_sym_LBRACE,
+    ACTIONS(299), 1,
+      sym__string_start,
+    ACTIONS(642), 1,
+      sym_identifier,
+    ACTIONS(644), 1,
+      anon_sym_LPAREN,
+    ACTIONS(654), 1,
+      anon_sym_LBRACK,
+    ACTIONS(656), 1,
+      anon_sym_await,
+    ACTIONS(1266), 1,
+      anon_sym_STAR,
+    STATE(586), 1,
+      sym_string,
+    STATE(865), 1,
+      sym_primary_expression,
+    STATE(1190), 1,
+      sym_pattern,
+    STATE(1503), 1,
+      sym_pattern_list,
+    ACTIONS(293), 2,
+      sym_ellipsis,
+      sym_float,
+    STATE(729), 2,
+      sym_attribute,
+      sym_subscript,
+    ACTIONS(285), 3,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_TILDE,
+    STATE(860), 3,
+      sym_tuple_pattern,
+      sym_list_pattern,
+      sym_list_splat_pattern,
+    ACTIONS(295), 4,
+      sym_integer,
+      sym_true,
+      sym_false,
+      sym_none,
+    ACTIONS(648), 5,
+      anon_sym_print,
+      anon_sym_async,
+      anon_sym_match,
+      anon_sym_exec,
+      anon_sym_type,
+    STATE(605), 14,
+      sym_binary_operator,
+      sym_unary_operator,
+      sym_call,
+      sym_list,
+      sym_set,
+      sym_tuple,
+      sym_dictionary,
+      sym_list_comprehension,
+      sym_dictionary_comprehension,
+      sym_set_comprehension,
+      sym_generator_expression,
+      sym_parenthesized_expression,
+      sym_concatenated_string,
+      sym_await,
+  [32414] = 19,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(279), 1,
+      anon_sym_LBRACE,
+    ACTIONS(299), 1,
+      sym__string_start,
+    ACTIONS(642), 1,
+      sym_identifier,
+    ACTIONS(644), 1,
+      anon_sym_LPAREN,
+    ACTIONS(654), 1,
+      anon_sym_LBRACK,
+    ACTIONS(656), 1,
+      anon_sym_await,
+    ACTIONS(1266), 1,
+      anon_sym_STAR,
+    STATE(586), 1,
+      sym_string,
+    STATE(865), 1,
+      sym_primary_expression,
+    STATE(1191), 1,
+      sym_pattern,
+    STATE(1500), 1,
+      sym_pattern_list,
+    ACTIONS(293), 2,
+      sym_ellipsis,
+      sym_float,
+    STATE(729), 2,
+      sym_attribute,
+      sym_subscript,
+    ACTIONS(285), 3,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_TILDE,
+    STATE(860), 3,
+      sym_tuple_pattern,
+      sym_list_pattern,
+      sym_list_splat_pattern,
+    ACTIONS(295), 4,
+      sym_integer,
+      sym_true,
+      sym_false,
+      sym_none,
+    ACTIONS(648), 5,
+      anon_sym_print,
+      anon_sym_async,
+      anon_sym_match,
+      anon_sym_exec,
+      anon_sym_type,
+    STATE(605), 14,
+      sym_binary_operator,
+      sym_unary_operator,
+      sym_call,
+      sym_list,
+      sym_set,
+      sym_tuple,
+      sym_dictionary,
+      sym_list_comprehension,
+      sym_dictionary_comprehension,
+      sym_set_comprehension,
+      sym_generator_expression,
+      sym_parenthesized_expression,
+      sym_concatenated_string,
+      sym_await,
+  [32498] = 19,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(279), 1,
+      anon_sym_LBRACE,
+    ACTIONS(299), 1,
+      sym__string_start,
+    ACTIONS(642), 1,
+      sym_identifier,
+    ACTIONS(644), 1,
+      anon_sym_LPAREN,
+    ACTIONS(654), 1,
+      anon_sym_LBRACK,
+    ACTIONS(656), 1,
+      anon_sym_await,
+    ACTIONS(1266), 1,
+      anon_sym_STAR,
+    STATE(586), 1,
+      sym_string,
+    STATE(865), 1,
+      sym_primary_expression,
+    STATE(1224), 1,
+      sym_pattern,
+    STATE(1502), 1,
+      sym_pattern_list,
+    ACTIONS(293), 2,
+      sym_ellipsis,
+      sym_float,
+    STATE(729), 2,
+      sym_attribute,
+      sym_subscript,
+    ACTIONS(285), 3,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_TILDE,
+    STATE(860), 3,
+      sym_tuple_pattern,
+      sym_list_pattern,
+      sym_list_splat_pattern,
+    ACTIONS(295), 4,
+      sym_integer,
+      sym_true,
+      sym_false,
+      sym_none,
+    ACTIONS(648), 5,
+      anon_sym_print,
+      anon_sym_async,
+      anon_sym_match,
+      anon_sym_exec,
+      anon_sym_type,
+    STATE(605), 14,
+      sym_binary_operator,
+      sym_unary_operator,
+      sym_call,
+      sym_list,
+      sym_set,
+      sym_tuple,
+      sym_dictionary,
+      sym_list_comprehension,
+      sym_dictionary_comprehension,
+      sym_set_comprehension,
+      sym_generator_expression,
+      sym_parenthesized_expression,
+      sym_concatenated_string,
+      sym_await,
+  [32582] = 19,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(279), 1,
+      anon_sym_LBRACE,
+    ACTIONS(299), 1,
+      sym__string_start,
+    ACTIONS(642), 1,
+      sym_identifier,
+    ACTIONS(644), 1,
+      anon_sym_LPAREN,
+    ACTIONS(654), 1,
+      anon_sym_LBRACK,
+    ACTIONS(656), 1,
+      anon_sym_await,
+    ACTIONS(1266), 1,
+      anon_sym_STAR,
+    STATE(586), 1,
+      sym_string,
+    STATE(865), 1,
+      sym_primary_expression,
+    STATE(1180), 1,
+      sym_pattern,
+    STATE(1387), 1,
+      sym_pattern_list,
+    ACTIONS(293), 2,
+      sym_ellipsis,
+      sym_float,
+    STATE(729), 2,
+      sym_attribute,
+      sym_subscript,
+    ACTIONS(285), 3,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_TILDE,
+    STATE(860), 3,
+      sym_tuple_pattern,
+      sym_list_pattern,
+      sym_list_splat_pattern,
+    ACTIONS(295), 4,
+      sym_integer,
+      sym_true,
+      sym_false,
+      sym_none,
+    ACTIONS(648), 5,
+      anon_sym_print,
+      anon_sym_async,
+      anon_sym_match,
+      anon_sym_exec,
+      anon_sym_type,
+    STATE(605), 14,
+      sym_binary_operator,
+      sym_unary_operator,
+      sym_call,
+      sym_list,
+      sym_set,
+      sym_tuple,
+      sym_dictionary,
+      sym_list_comprehension,
+      sym_dictionary_comprehension,
+      sym_set_comprehension,
+      sym_generator_expression,
+      sym_parenthesized_expression,
+      sym_concatenated_string,
+      sym_await,
+  [32666] = 5,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(299), 1,
+      sym__string_start,
+    STATE(584), 2,
       sym_string,
       aux_sym_concatenated_string_repeat1,
-    ACTIONS(1390), 6,
+    ACTIONS(1382), 6,
       anon_sym_as,
       anon_sym_STAR,
       anon_sym_EQ,
       anon_sym_SLASH,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1388), 34,
+    ACTIONS(1380), 34,
       anon_sym_DOT,
       anon_sym_LPAREN,
       anon_sym_RPAREN,
@@ -53824,22 +50089,85 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_LT_GT,
       anon_sym_is,
       sym_type_conversion,
-  [32834] = 5,
+  [32721] = 18,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1396), 1,
+    ACTIONS(279), 1,
+      anon_sym_LBRACE,
+    ACTIONS(299), 1,
       sym__string_start,
-    STATE(599), 2,
+    ACTIONS(642), 1,
+      sym_identifier,
+    ACTIONS(644), 1,
+      anon_sym_LPAREN,
+    ACTIONS(654), 1,
+      anon_sym_LBRACK,
+    ACTIONS(656), 1,
+      anon_sym_await,
+    ACTIONS(1266), 1,
+      anon_sym_STAR,
+    STATE(586), 1,
+      sym_string,
+    STATE(856), 1,
+      sym_pattern,
+    STATE(865), 1,
+      sym_primary_expression,
+    ACTIONS(293), 2,
+      sym_ellipsis,
+      sym_float,
+    STATE(729), 2,
+      sym_attribute,
+      sym_subscript,
+    ACTIONS(285), 3,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_TILDE,
+    STATE(860), 3,
+      sym_tuple_pattern,
+      sym_list_pattern,
+      sym_list_splat_pattern,
+    ACTIONS(295), 4,
+      sym_integer,
+      sym_true,
+      sym_false,
+      sym_none,
+    ACTIONS(648), 5,
+      anon_sym_print,
+      anon_sym_async,
+      anon_sym_match,
+      anon_sym_exec,
+      anon_sym_type,
+    STATE(605), 14,
+      sym_binary_operator,
+      sym_unary_operator,
+      sym_call,
+      sym_list,
+      sym_set,
+      sym_tuple,
+      sym_dictionary,
+      sym_list_comprehension,
+      sym_dictionary_comprehension,
+      sym_set_comprehension,
+      sym_generator_expression,
+      sym_parenthesized_expression,
+      sym_concatenated_string,
+      sym_await,
+  [32802] = 5,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1388), 1,
+      sym__string_start,
+    STATE(584), 2,
       sym_string,
       aux_sym_concatenated_string_repeat1,
-    ACTIONS(1394), 6,
+    ACTIONS(1386), 6,
       anon_sym_as,
       anon_sym_STAR,
       anon_sym_EQ,
       anon_sym_SLASH,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1392), 34,
+    ACTIONS(1384), 34,
       anon_sym_DOT,
       anon_sym_LPAREN,
       anon_sym_RPAREN,
@@ -53874,22 +50202,85 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_LT_GT,
       anon_sym_is,
       sym_type_conversion,
-  [32889] = 5,
+  [32857] = 18,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(315), 1,
+    ACTIONS(279), 1,
+      anon_sym_LBRACE,
+    ACTIONS(299), 1,
       sym__string_start,
-    STATE(598), 2,
+    ACTIONS(642), 1,
+      sym_identifier,
+    ACTIONS(644), 1,
+      anon_sym_LPAREN,
+    ACTIONS(654), 1,
+      anon_sym_LBRACK,
+    ACTIONS(656), 1,
+      anon_sym_await,
+    ACTIONS(1266), 1,
+      anon_sym_STAR,
+    STATE(586), 1,
+      sym_string,
+    STATE(865), 1,
+      sym_primary_expression,
+    STATE(1271), 1,
+      sym_pattern,
+    ACTIONS(293), 2,
+      sym_ellipsis,
+      sym_float,
+    STATE(729), 2,
+      sym_attribute,
+      sym_subscript,
+    ACTIONS(285), 3,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_TILDE,
+    STATE(860), 3,
+      sym_tuple_pattern,
+      sym_list_pattern,
+      sym_list_splat_pattern,
+    ACTIONS(295), 4,
+      sym_integer,
+      sym_true,
+      sym_false,
+      sym_none,
+    ACTIONS(648), 5,
+      anon_sym_print,
+      anon_sym_async,
+      anon_sym_match,
+      anon_sym_exec,
+      anon_sym_type,
+    STATE(605), 14,
+      sym_binary_operator,
+      sym_unary_operator,
+      sym_call,
+      sym_list,
+      sym_set,
+      sym_tuple,
+      sym_dictionary,
+      sym_list_comprehension,
+      sym_dictionary_comprehension,
+      sym_set_comprehension,
+      sym_generator_expression,
+      sym_parenthesized_expression,
+      sym_concatenated_string,
+      sym_await,
+  [32938] = 5,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(299), 1,
+      sym__string_start,
+    STATE(582), 2,
       sym_string,
       aux_sym_concatenated_string_repeat1,
-    ACTIONS(1053), 6,
+    ACTIONS(1079), 6,
       anon_sym_as,
       anon_sym_STAR,
       anon_sym_EQ,
       anon_sym_SLASH,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1048), 34,
+    ACTIONS(1074), 34,
       anon_sym_DOT,
       anon_sym_LPAREN,
       anon_sym_RPAREN,
@@ -53924,56 +50315,51 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_LT_GT,
       anon_sym_is,
       sym_type_conversion,
-  [32944] = 18,
+  [32993] = 16,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(295), 1,
-      anon_sym_LBRACE,
-    ACTIONS(315), 1,
-      sym__string_start,
-    ACTIONS(678), 1,
-      sym_identifier,
-    ACTIONS(680), 1,
+    ACTIONS(262), 1,
       anon_sym_LPAREN,
-    ACTIONS(690), 1,
+    ACTIONS(277), 1,
       anon_sym_LBRACK,
-    ACTIONS(1382), 1,
-      anon_sym_STAR,
-    STATE(600), 1,
+    ACTIONS(279), 1,
+      anon_sym_LBRACE,
+    ACTIONS(299), 1,
+      sym__string_start,
+    ACTIONS(1391), 1,
+      sym_identifier,
+    ACTIONS(1397), 1,
+      anon_sym_await,
+    STATE(586), 1,
       sym_string,
-    STATE(882), 1,
+    STATE(865), 1,
       sym_primary_expression,
-    STATE(1305), 1,
-      sym_pattern,
-    STATE(1466), 1,
-      sym_pattern_list,
-    ACTIONS(309), 2,
+    ACTIONS(293), 2,
       sym_ellipsis,
       sym_float,
-    STATE(770), 2,
+    STATE(749), 2,
       sym_attribute,
       sym_subscript,
-    ACTIONS(301), 3,
+    ACTIONS(285), 3,
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
-    STATE(875), 3,
-      sym_tuple_pattern,
-      sym_list_pattern,
-      sym_list_splat_pattern,
-    ACTIONS(311), 4,
+    ACTIONS(1393), 3,
+      anon_sym_RPAREN,
+      anon_sym_COMMA,
+      anon_sym_COLON,
+    ACTIONS(295), 4,
       sym_integer,
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(684), 6,
+    ACTIONS(1395), 5,
       anon_sym_print,
       anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-      anon_sym_await,
-    STATE(642), 13,
+    STATE(605), 14,
       sym_binary_operator,
       sym_unary_operator,
       sym_call,
@@ -53987,444 +50373,8 @@ static const uint16_t ts_small_parse_table[] = {
       sym_generator_expression,
       sym_parenthesized_expression,
       sym_concatenated_string,
-  [33025] = 18,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(295), 1,
-      anon_sym_LBRACE,
-    ACTIONS(315), 1,
-      sym__string_start,
-    ACTIONS(678), 1,
-      sym_identifier,
-    ACTIONS(680), 1,
-      anon_sym_LPAREN,
-    ACTIONS(690), 1,
-      anon_sym_LBRACK,
-    ACTIONS(1382), 1,
-      anon_sym_STAR,
-    STATE(600), 1,
-      sym_string,
-    STATE(882), 1,
-      sym_primary_expression,
-    STATE(1306), 1,
-      sym_pattern,
-    STATE(1454), 1,
-      sym_pattern_list,
-    ACTIONS(309), 2,
-      sym_ellipsis,
-      sym_float,
-    STATE(770), 2,
-      sym_attribute,
-      sym_subscript,
-    ACTIONS(301), 3,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_TILDE,
-    STATE(875), 3,
-      sym_tuple_pattern,
-      sym_list_pattern,
-      sym_list_splat_pattern,
-    ACTIONS(311), 4,
-      sym_integer,
-      sym_true,
-      sym_false,
-      sym_none,
-    ACTIONS(684), 6,
-      anon_sym_print,
-      anon_sym_async,
-      anon_sym_match,
-      anon_sym_exec,
-      anon_sym_type,
-      anon_sym_await,
-    STATE(642), 13,
-      sym_binary_operator,
-      sym_unary_operator,
-      sym_call,
-      sym_list,
-      sym_set,
-      sym_tuple,
-      sym_dictionary,
-      sym_list_comprehension,
-      sym_dictionary_comprehension,
-      sym_set_comprehension,
-      sym_generator_expression,
-      sym_parenthesized_expression,
-      sym_concatenated_string,
-  [33106] = 18,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(295), 1,
-      anon_sym_LBRACE,
-    ACTIONS(315), 1,
-      sym__string_start,
-    ACTIONS(678), 1,
-      sym_identifier,
-    ACTIONS(680), 1,
-      anon_sym_LPAREN,
-    ACTIONS(690), 1,
-      anon_sym_LBRACK,
-    ACTIONS(1382), 1,
-      anon_sym_STAR,
-    STATE(600), 1,
-      sym_string,
-    STATE(882), 1,
-      sym_primary_expression,
-    STATE(1197), 1,
-      sym_pattern,
-    STATE(1522), 1,
-      sym_pattern_list,
-    ACTIONS(309), 2,
-      sym_ellipsis,
-      sym_float,
-    STATE(770), 2,
-      sym_attribute,
-      sym_subscript,
-    ACTIONS(301), 3,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_TILDE,
-    STATE(875), 3,
-      sym_tuple_pattern,
-      sym_list_pattern,
-      sym_list_splat_pattern,
-    ACTIONS(311), 4,
-      sym_integer,
-      sym_true,
-      sym_false,
-      sym_none,
-    ACTIONS(684), 6,
-      anon_sym_print,
-      anon_sym_async,
-      anon_sym_match,
-      anon_sym_exec,
-      anon_sym_type,
-      anon_sym_await,
-    STATE(642), 13,
-      sym_binary_operator,
-      sym_unary_operator,
-      sym_call,
-      sym_list,
-      sym_set,
-      sym_tuple,
-      sym_dictionary,
-      sym_list_comprehension,
-      sym_dictionary_comprehension,
-      sym_set_comprehension,
-      sym_generator_expression,
-      sym_parenthesized_expression,
-      sym_concatenated_string,
-  [33187] = 18,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(295), 1,
-      anon_sym_LBRACE,
-    ACTIONS(315), 1,
-      sym__string_start,
-    ACTIONS(678), 1,
-      sym_identifier,
-    ACTIONS(680), 1,
-      anon_sym_LPAREN,
-    ACTIONS(690), 1,
-      anon_sym_LBRACK,
-    ACTIONS(1382), 1,
-      anon_sym_STAR,
-    STATE(600), 1,
-      sym_string,
-    STATE(882), 1,
-      sym_primary_expression,
-    STATE(1199), 1,
-      sym_pattern,
-    STATE(1519), 1,
-      sym_pattern_list,
-    ACTIONS(309), 2,
-      sym_ellipsis,
-      sym_float,
-    STATE(770), 2,
-      sym_attribute,
-      sym_subscript,
-    ACTIONS(301), 3,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_TILDE,
-    STATE(875), 3,
-      sym_tuple_pattern,
-      sym_list_pattern,
-      sym_list_splat_pattern,
-    ACTIONS(311), 4,
-      sym_integer,
-      sym_true,
-      sym_false,
-      sym_none,
-    ACTIONS(684), 6,
-      anon_sym_print,
-      anon_sym_async,
-      anon_sym_match,
-      anon_sym_exec,
-      anon_sym_type,
-      anon_sym_await,
-    STATE(642), 13,
-      sym_binary_operator,
-      sym_unary_operator,
-      sym_call,
-      sym_list,
-      sym_set,
-      sym_tuple,
-      sym_dictionary,
-      sym_list_comprehension,
-      sym_dictionary_comprehension,
-      sym_set_comprehension,
-      sym_generator_expression,
-      sym_parenthesized_expression,
-      sym_concatenated_string,
-  [33268] = 18,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(295), 1,
-      anon_sym_LBRACE,
-    ACTIONS(315), 1,
-      sym__string_start,
-    ACTIONS(678), 1,
-      sym_identifier,
-    ACTIONS(680), 1,
-      anon_sym_LPAREN,
-    ACTIONS(690), 1,
-      anon_sym_LBRACK,
-    ACTIONS(1382), 1,
-      anon_sym_STAR,
-    STATE(600), 1,
-      sym_string,
-    STATE(882), 1,
-      sym_primary_expression,
-    STATE(1276), 1,
-      sym_pattern,
-    STATE(1421), 1,
-      sym_pattern_list,
-    ACTIONS(309), 2,
-      sym_ellipsis,
-      sym_float,
-    STATE(770), 2,
-      sym_attribute,
-      sym_subscript,
-    ACTIONS(301), 3,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_TILDE,
-    STATE(875), 3,
-      sym_tuple_pattern,
-      sym_list_pattern,
-      sym_list_splat_pattern,
-    ACTIONS(311), 4,
-      sym_integer,
-      sym_true,
-      sym_false,
-      sym_none,
-    ACTIONS(684), 6,
-      anon_sym_print,
-      anon_sym_async,
-      anon_sym_match,
-      anon_sym_exec,
-      anon_sym_type,
-      anon_sym_await,
-    STATE(642), 13,
-      sym_binary_operator,
-      sym_unary_operator,
-      sym_call,
-      sym_list,
-      sym_set,
-      sym_tuple,
-      sym_dictionary,
-      sym_list_comprehension,
-      sym_dictionary_comprehension,
-      sym_set_comprehension,
-      sym_generator_expression,
-      sym_parenthesized_expression,
-      sym_concatenated_string,
-  [33349] = 18,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(295), 1,
-      anon_sym_LBRACE,
-    ACTIONS(315), 1,
-      sym__string_start,
-    ACTIONS(678), 1,
-      sym_identifier,
-    ACTIONS(680), 1,
-      anon_sym_LPAREN,
-    ACTIONS(690), 1,
-      anon_sym_LBRACK,
-    ACTIONS(1382), 1,
-      anon_sym_STAR,
-    STATE(600), 1,
-      sym_string,
-    STATE(882), 1,
-      sym_primary_expression,
-    STATE(1293), 1,
-      sym_pattern,
-    STATE(1419), 1,
-      sym_pattern_list,
-    ACTIONS(309), 2,
-      sym_ellipsis,
-      sym_float,
-    STATE(770), 2,
-      sym_attribute,
-      sym_subscript,
-    ACTIONS(301), 3,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_TILDE,
-    STATE(875), 3,
-      sym_tuple_pattern,
-      sym_list_pattern,
-      sym_list_splat_pattern,
-    ACTIONS(311), 4,
-      sym_integer,
-      sym_true,
-      sym_false,
-      sym_none,
-    ACTIONS(684), 6,
-      anon_sym_print,
-      anon_sym_async,
-      anon_sym_match,
-      anon_sym_exec,
-      anon_sym_type,
-      anon_sym_await,
-    STATE(642), 13,
-      sym_binary_operator,
-      sym_unary_operator,
-      sym_call,
-      sym_list,
-      sym_set,
-      sym_tuple,
-      sym_dictionary,
-      sym_list_comprehension,
-      sym_dictionary_comprehension,
-      sym_set_comprehension,
-      sym_generator_expression,
-      sym_parenthesized_expression,
-      sym_concatenated_string,
-  [33430] = 17,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(295), 1,
-      anon_sym_LBRACE,
-    ACTIONS(315), 1,
-      sym__string_start,
-    ACTIONS(678), 1,
-      sym_identifier,
-    ACTIONS(680), 1,
-      anon_sym_LPAREN,
-    ACTIONS(690), 1,
-      anon_sym_LBRACK,
-    ACTIONS(1382), 1,
-      anon_sym_STAR,
-    STATE(600), 1,
-      sym_string,
-    STATE(876), 1,
-      sym_pattern,
-    STATE(882), 1,
-      sym_primary_expression,
-    ACTIONS(309), 2,
-      sym_ellipsis,
-      sym_float,
-    STATE(770), 2,
-      sym_attribute,
-      sym_subscript,
-    ACTIONS(301), 3,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_TILDE,
-    STATE(875), 3,
-      sym_tuple_pattern,
-      sym_list_pattern,
-      sym_list_splat_pattern,
-    ACTIONS(311), 4,
-      sym_integer,
-      sym_true,
-      sym_false,
-      sym_none,
-    ACTIONS(684), 6,
-      anon_sym_print,
-      anon_sym_async,
-      anon_sym_match,
-      anon_sym_exec,
-      anon_sym_type,
-      anon_sym_await,
-    STATE(642), 13,
-      sym_binary_operator,
-      sym_unary_operator,
-      sym_call,
-      sym_list,
-      sym_set,
-      sym_tuple,
-      sym_dictionary,
-      sym_list_comprehension,
-      sym_dictionary_comprehension,
-      sym_set_comprehension,
-      sym_generator_expression,
-      sym_parenthesized_expression,
-      sym_concatenated_string,
-  [33508] = 17,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(295), 1,
-      anon_sym_LBRACE,
-    ACTIONS(315), 1,
-      sym__string_start,
-    ACTIONS(678), 1,
-      sym_identifier,
-    ACTIONS(680), 1,
-      anon_sym_LPAREN,
-    ACTIONS(690), 1,
-      anon_sym_LBRACK,
-    ACTIONS(1382), 1,
-      anon_sym_STAR,
-    STATE(600), 1,
-      sym_string,
-    STATE(882), 1,
-      sym_primary_expression,
-    STATE(1281), 1,
-      sym_pattern,
-    ACTIONS(309), 2,
-      sym_ellipsis,
-      sym_float,
-    STATE(770), 2,
-      sym_attribute,
-      sym_subscript,
-    ACTIONS(301), 3,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_TILDE,
-    STATE(875), 3,
-      sym_tuple_pattern,
-      sym_list_pattern,
-      sym_list_splat_pattern,
-    ACTIONS(311), 4,
-      sym_integer,
-      sym_true,
-      sym_false,
-      sym_none,
-    ACTIONS(684), 6,
-      anon_sym_print,
-      anon_sym_async,
-      anon_sym_match,
-      anon_sym_exec,
-      anon_sym_type,
-      anon_sym_await,
-    STATE(642), 13,
-      sym_binary_operator,
-      sym_unary_operator,
-      sym_call,
-      sym_list,
-      sym_set,
-      sym_tuple,
-      sym_dictionary,
-      sym_list_comprehension,
-      sym_dictionary_comprehension,
-      sym_set_comprehension,
-      sym_generator_expression,
-      sym_parenthesized_expression,
-      sym_concatenated_string,
-  [33586] = 3,
+      sym_await,
+  [33068] = 3,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(1401), 6,
@@ -54470,7 +50420,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_LT_GT,
       anon_sym_is,
       sym_type_conversion,
-  [33635] = 3,
+  [33117] = 3,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(1405), 6,
@@ -54516,924 +50466,1014 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_LT_GT,
       anon_sym_is,
       sym_type_conversion,
-  [33684] = 3,
+  [33166] = 20,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1409), 6,
+    ACTIONS(1407), 1,
+      anon_sym_DOT,
+    ACTIONS(1409), 1,
+      anon_sym_LPAREN,
+    ACTIONS(1413), 1,
       anon_sym_as,
-      anon_sym_STAR,
-      anon_sym_EQ,
-      anon_sym_SLASH,
-      anon_sym_LT,
-      anon_sym_GT,
-    ACTIONS(1407), 34,
-      anon_sym_DOT,
-      anon_sym_LPAREN,
-      anon_sym_RPAREN,
-      anon_sym_COMMA,
-      anon_sym_GT_GT,
-      anon_sym_if,
-      anon_sym_COLON,
-      anon_sym_else,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_in,
+    ACTIONS(1421), 1,
       anon_sym_PIPE,
-      anon_sym_DASH,
-      anon_sym_PLUS,
+    ACTIONS(1425), 1,
       anon_sym_LBRACK,
-      anon_sym_RBRACK,
-      anon_sym_RBRACE,
+    ACTIONS(1427), 1,
       anon_sym_STAR_STAR,
-      anon_sym_AT,
+    ACTIONS(1431), 1,
       anon_sym_not,
-      anon_sym_and,
-      anon_sym_or,
-      anon_sym_PERCENT,
-      anon_sym_SLASH_SLASH,
+    ACTIONS(1433), 1,
       anon_sym_AMP,
+    ACTIONS(1435), 1,
       anon_sym_CARET,
-      anon_sym_LT_LT,
-      anon_sym_LT_EQ,
-      anon_sym_EQ_EQ,
-      anon_sym_BANG_EQ,
-      anon_sym_GT_EQ,
-      anon_sym_LT_GT,
+    ACTIONS(1439), 1,
       anon_sym_is,
-      sym_type_conversion,
-  [33732] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1413), 6,
-      anon_sym_as,
-      anon_sym_STAR,
-      anon_sym_EQ,
-      anon_sym_SLASH,
-      anon_sym_LT,
-      anon_sym_GT,
-    ACTIONS(1411), 34,
-      anon_sym_DOT,
-      anon_sym_LPAREN,
-      anon_sym_RPAREN,
-      anon_sym_COMMA,
-      anon_sym_GT_GT,
-      anon_sym_if,
-      anon_sym_COLON,
-      anon_sym_else,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_in,
-      anon_sym_PIPE,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_RBRACK,
-      anon_sym_RBRACE,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_not,
-      anon_sym_and,
-      anon_sym_or,
-      anon_sym_PERCENT,
-      anon_sym_SLASH_SLASH,
-      anon_sym_AMP,
-      anon_sym_CARET,
-      anon_sym_LT_LT,
-      anon_sym_LT_EQ,
-      anon_sym_EQ_EQ,
-      anon_sym_BANG_EQ,
-      anon_sym_GT_EQ,
-      anon_sym_LT_GT,
-      anon_sym_is,
-      sym_type_conversion,
-  [33780] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1417), 6,
-      anon_sym_as,
-      anon_sym_STAR,
-      anon_sym_EQ,
-      anon_sym_SLASH,
-      anon_sym_LT,
-      anon_sym_GT,
-    ACTIONS(1415), 34,
-      anon_sym_DOT,
-      anon_sym_LPAREN,
-      anon_sym_RPAREN,
-      anon_sym_COMMA,
-      anon_sym_GT_GT,
-      anon_sym_if,
-      anon_sym_COLON,
-      anon_sym_else,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_in,
-      anon_sym_PIPE,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_RBRACK,
-      anon_sym_RBRACE,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_not,
-      anon_sym_and,
-      anon_sym_or,
-      anon_sym_PERCENT,
-      anon_sym_SLASH_SLASH,
-      anon_sym_AMP,
-      anon_sym_CARET,
-      anon_sym_LT_LT,
-      anon_sym_LT_EQ,
-      anon_sym_EQ_EQ,
-      anon_sym_BANG_EQ,
-      anon_sym_GT_EQ,
-      anon_sym_LT_GT,
-      anon_sym_is,
-      sym_type_conversion,
-  [33828] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1421), 6,
-      anon_sym_as,
-      anon_sym_STAR,
-      anon_sym_EQ,
-      anon_sym_SLASH,
-      anon_sym_LT,
-      anon_sym_GT,
-    ACTIONS(1419), 34,
-      anon_sym_DOT,
-      anon_sym_LPAREN,
-      anon_sym_RPAREN,
-      anon_sym_COMMA,
-      anon_sym_GT_GT,
-      anon_sym_if,
-      anon_sym_COLON,
-      anon_sym_else,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_in,
-      anon_sym_PIPE,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_RBRACK,
-      anon_sym_RBRACE,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_not,
-      anon_sym_and,
-      anon_sym_or,
-      anon_sym_PERCENT,
-      anon_sym_SLASH_SLASH,
-      anon_sym_AMP,
-      anon_sym_CARET,
-      anon_sym_LT_LT,
-      anon_sym_LT_EQ,
-      anon_sym_EQ_EQ,
-      anon_sym_BANG_EQ,
-      anon_sym_GT_EQ,
-      anon_sym_LT_GT,
-      anon_sym_is,
-      sym_type_conversion,
-  [33876] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1425), 6,
-      anon_sym_as,
-      anon_sym_STAR,
-      anon_sym_EQ,
-      anon_sym_SLASH,
-      anon_sym_LT,
-      anon_sym_GT,
-    ACTIONS(1423), 34,
-      anon_sym_DOT,
-      anon_sym_LPAREN,
-      anon_sym_RPAREN,
-      anon_sym_COMMA,
-      anon_sym_GT_GT,
-      anon_sym_if,
-      anon_sym_COLON,
-      anon_sym_else,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_in,
-      anon_sym_PIPE,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_RBRACK,
-      anon_sym_RBRACE,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_not,
-      anon_sym_and,
-      anon_sym_or,
-      anon_sym_PERCENT,
-      anon_sym_SLASH_SLASH,
-      anon_sym_AMP,
-      anon_sym_CARET,
-      anon_sym_LT_LT,
-      anon_sym_LT_EQ,
-      anon_sym_EQ_EQ,
-      anon_sym_BANG_EQ,
-      anon_sym_GT_EQ,
-      anon_sym_LT_GT,
-      anon_sym_is,
-      sym_type_conversion,
-  [33924] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1421), 6,
-      anon_sym_as,
-      anon_sym_STAR,
-      anon_sym_EQ,
-      anon_sym_SLASH,
-      anon_sym_LT,
-      anon_sym_GT,
-    ACTIONS(1419), 34,
-      anon_sym_DOT,
-      anon_sym_LPAREN,
-      anon_sym_RPAREN,
-      anon_sym_COMMA,
-      anon_sym_GT_GT,
-      anon_sym_if,
-      anon_sym_COLON,
-      anon_sym_else,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_in,
-      anon_sym_PIPE,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_RBRACK,
-      anon_sym_RBRACE,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_not,
-      anon_sym_and,
-      anon_sym_or,
-      anon_sym_PERCENT,
-      anon_sym_SLASH_SLASH,
-      anon_sym_AMP,
-      anon_sym_CARET,
-      anon_sym_LT_LT,
-      anon_sym_LT_EQ,
-      anon_sym_EQ_EQ,
-      anon_sym_BANG_EQ,
-      anon_sym_GT_EQ,
-      anon_sym_LT_GT,
-      anon_sym_is,
-      sym_type_conversion,
-  [33972] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1429), 6,
-      anon_sym_as,
-      anon_sym_STAR,
-      anon_sym_EQ,
-      anon_sym_SLASH,
-      anon_sym_LT,
-      anon_sym_GT,
-    ACTIONS(1427), 34,
-      anon_sym_DOT,
-      anon_sym_LPAREN,
-      anon_sym_RPAREN,
-      anon_sym_COMMA,
-      anon_sym_GT_GT,
-      anon_sym_if,
-      anon_sym_COLON,
-      anon_sym_else,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_in,
-      anon_sym_PIPE,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_RBRACK,
-      anon_sym_RBRACE,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_not,
-      anon_sym_and,
-      anon_sym_or,
-      anon_sym_PERCENT,
-      anon_sym_SLASH_SLASH,
-      anon_sym_AMP,
-      anon_sym_CARET,
-      anon_sym_LT_LT,
-      anon_sym_LT_EQ,
-      anon_sym_EQ_EQ,
-      anon_sym_BANG_EQ,
-      anon_sym_GT_EQ,
-      anon_sym_LT_GT,
-      anon_sym_is,
-      sym_type_conversion,
-  [34020] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(276), 6,
-      anon_sym_as,
-      anon_sym_STAR,
-      anon_sym_EQ,
-      anon_sym_SLASH,
-      anon_sym_LT,
-      anon_sym_GT,
-    ACTIONS(303), 34,
-      anon_sym_DOT,
-      anon_sym_LPAREN,
-      anon_sym_RPAREN,
-      anon_sym_COMMA,
-      anon_sym_GT_GT,
-      anon_sym_if,
-      anon_sym_COLON,
-      anon_sym_else,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_in,
-      anon_sym_PIPE,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_RBRACK,
-      anon_sym_RBRACE,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_not,
-      anon_sym_and,
-      anon_sym_or,
-      anon_sym_PERCENT,
-      anon_sym_SLASH_SLASH,
-      anon_sym_AMP,
-      anon_sym_CARET,
-      anon_sym_LT_LT,
-      anon_sym_LT_EQ,
-      anon_sym_EQ_EQ,
-      anon_sym_BANG_EQ,
-      anon_sym_GT_EQ,
-      anon_sym_LT_GT,
-      anon_sym_is,
-      sym_type_conversion,
-  [34068] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1433), 6,
-      anon_sym_as,
-      anon_sym_STAR,
-      anon_sym_EQ,
-      anon_sym_SLASH,
-      anon_sym_LT,
-      anon_sym_GT,
-    ACTIONS(1431), 34,
-      anon_sym_DOT,
-      anon_sym_LPAREN,
-      anon_sym_RPAREN,
-      anon_sym_COMMA,
-      anon_sym_GT_GT,
-      anon_sym_if,
-      anon_sym_COLON,
-      anon_sym_else,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_in,
-      anon_sym_PIPE,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_RBRACK,
-      anon_sym_RBRACE,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_not,
-      anon_sym_and,
-      anon_sym_or,
-      anon_sym_PERCENT,
-      anon_sym_SLASH_SLASH,
-      anon_sym_AMP,
-      anon_sym_CARET,
-      anon_sym_LT_LT,
-      anon_sym_LT_EQ,
-      anon_sym_EQ_EQ,
-      anon_sym_BANG_EQ,
-      anon_sym_GT_EQ,
-      anon_sym_LT_GT,
-      anon_sym_is,
-      sym_type_conversion,
-  [34116] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1437), 6,
-      anon_sym_as,
-      anon_sym_STAR,
-      anon_sym_EQ,
-      anon_sym_SLASH,
-      anon_sym_LT,
-      anon_sym_GT,
-    ACTIONS(1435), 34,
-      anon_sym_DOT,
-      anon_sym_LPAREN,
-      anon_sym_RPAREN,
-      anon_sym_COMMA,
-      anon_sym_GT_GT,
-      anon_sym_if,
-      anon_sym_COLON,
-      anon_sym_else,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_in,
-      anon_sym_PIPE,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_RBRACK,
-      anon_sym_RBRACE,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_not,
-      anon_sym_and,
-      anon_sym_or,
-      anon_sym_PERCENT,
-      anon_sym_SLASH_SLASH,
-      anon_sym_AMP,
-      anon_sym_CARET,
-      anon_sym_LT_LT,
-      anon_sym_LT_EQ,
-      anon_sym_EQ_EQ,
-      anon_sym_BANG_EQ,
-      anon_sym_GT_EQ,
-      anon_sym_LT_GT,
-      anon_sym_is,
-      sym_type_conversion,
-  [34164] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1441), 6,
-      anon_sym_as,
-      anon_sym_STAR,
-      anon_sym_EQ,
-      anon_sym_SLASH,
-      anon_sym_LT,
-      anon_sym_GT,
-    ACTIONS(1439), 34,
-      anon_sym_DOT,
-      anon_sym_LPAREN,
-      anon_sym_RPAREN,
-      anon_sym_COMMA,
-      anon_sym_GT_GT,
-      anon_sym_if,
-      anon_sym_COLON,
-      anon_sym_else,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_in,
-      anon_sym_PIPE,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_RBRACK,
-      anon_sym_RBRACE,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_not,
-      anon_sym_and,
-      anon_sym_or,
-      anon_sym_PERCENT,
-      anon_sym_SLASH_SLASH,
-      anon_sym_AMP,
-      anon_sym_CARET,
-      anon_sym_LT_LT,
-      anon_sym_LT_EQ,
-      anon_sym_EQ_EQ,
-      anon_sym_BANG_EQ,
-      anon_sym_GT_EQ,
-      anon_sym_LT_GT,
-      anon_sym_is,
-      sym_type_conversion,
-  [34212] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1445), 6,
-      anon_sym_as,
-      anon_sym_STAR,
-      anon_sym_EQ,
-      anon_sym_SLASH,
-      anon_sym_LT,
-      anon_sym_GT,
-    ACTIONS(1443), 34,
-      anon_sym_DOT,
-      anon_sym_LPAREN,
-      anon_sym_RPAREN,
-      anon_sym_COMMA,
-      anon_sym_GT_GT,
-      anon_sym_if,
-      anon_sym_COLON,
-      anon_sym_else,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_in,
-      anon_sym_PIPE,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_RBRACK,
-      anon_sym_RBRACE,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_not,
-      anon_sym_and,
-      anon_sym_or,
-      anon_sym_PERCENT,
-      anon_sym_SLASH_SLASH,
-      anon_sym_AMP,
-      anon_sym_CARET,
-      anon_sym_LT_LT,
-      anon_sym_LT_EQ,
-      anon_sym_EQ_EQ,
-      anon_sym_BANG_EQ,
-      anon_sym_GT_EQ,
-      anon_sym_LT_GT,
-      anon_sym_is,
-      sym_type_conversion,
-  [34260] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1449), 6,
-      anon_sym_as,
-      anon_sym_STAR,
-      anon_sym_EQ,
-      anon_sym_SLASH,
-      anon_sym_LT,
-      anon_sym_GT,
-    ACTIONS(1447), 34,
-      anon_sym_DOT,
-      anon_sym_LPAREN,
-      anon_sym_RPAREN,
-      anon_sym_COMMA,
-      anon_sym_GT_GT,
-      anon_sym_if,
-      anon_sym_COLON,
-      anon_sym_else,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_in,
-      anon_sym_PIPE,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_RBRACK,
-      anon_sym_RBRACE,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_not,
-      anon_sym_and,
-      anon_sym_or,
-      anon_sym_PERCENT,
-      anon_sym_SLASH_SLASH,
-      anon_sym_AMP,
-      anon_sym_CARET,
-      anon_sym_LT_LT,
-      anon_sym_LT_EQ,
-      anon_sym_EQ_EQ,
-      anon_sym_BANG_EQ,
-      anon_sym_GT_EQ,
-      anon_sym_LT_GT,
-      anon_sym_is,
-      sym_type_conversion,
-  [34308] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1453), 6,
-      anon_sym_as,
-      anon_sym_STAR,
-      anon_sym_EQ,
-      anon_sym_SLASH,
-      anon_sym_LT,
-      anon_sym_GT,
-    ACTIONS(1451), 34,
-      anon_sym_DOT,
-      anon_sym_LPAREN,
-      anon_sym_RPAREN,
-      anon_sym_COMMA,
-      anon_sym_GT_GT,
-      anon_sym_if,
-      anon_sym_COLON,
-      anon_sym_else,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_in,
-      anon_sym_PIPE,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_RBRACK,
-      anon_sym_RBRACE,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_not,
-      anon_sym_and,
-      anon_sym_or,
-      anon_sym_PERCENT,
-      anon_sym_SLASH_SLASH,
-      anon_sym_AMP,
-      anon_sym_CARET,
-      anon_sym_LT_LT,
-      anon_sym_LT_EQ,
-      anon_sym_EQ_EQ,
-      anon_sym_BANG_EQ,
-      anon_sym_GT_EQ,
-      anon_sym_LT_GT,
-      anon_sym_is,
-      sym_type_conversion,
-  [34356] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1457), 6,
-      anon_sym_as,
-      anon_sym_STAR,
-      anon_sym_EQ,
-      anon_sym_SLASH,
-      anon_sym_LT,
-      anon_sym_GT,
-    ACTIONS(1455), 34,
-      anon_sym_DOT,
-      anon_sym_LPAREN,
-      anon_sym_RPAREN,
-      anon_sym_COMMA,
-      anon_sym_GT_GT,
-      anon_sym_if,
-      anon_sym_COLON,
-      anon_sym_else,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_in,
-      anon_sym_PIPE,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_RBRACK,
-      anon_sym_RBRACE,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_not,
-      anon_sym_and,
-      anon_sym_or,
-      anon_sym_PERCENT,
-      anon_sym_SLASH_SLASH,
-      anon_sym_AMP,
-      anon_sym_CARET,
-      anon_sym_LT_LT,
-      anon_sym_LT_EQ,
-      anon_sym_EQ_EQ,
-      anon_sym_BANG_EQ,
-      anon_sym_GT_EQ,
-      anon_sym_LT_GT,
-      anon_sym_is,
-      sym_type_conversion,
-  [34404] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1461), 6,
-      anon_sym_as,
-      anon_sym_STAR,
-      anon_sym_EQ,
-      anon_sym_SLASH,
-      anon_sym_LT,
-      anon_sym_GT,
-    ACTIONS(1459), 34,
-      anon_sym_DOT,
-      anon_sym_LPAREN,
-      anon_sym_RPAREN,
-      anon_sym_COMMA,
-      anon_sym_GT_GT,
-      anon_sym_if,
-      anon_sym_COLON,
-      anon_sym_else,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_in,
-      anon_sym_PIPE,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_RBRACK,
-      anon_sym_RBRACE,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_not,
-      anon_sym_and,
-      anon_sym_or,
-      anon_sym_PERCENT,
-      anon_sym_SLASH_SLASH,
-      anon_sym_AMP,
-      anon_sym_CARET,
-      anon_sym_LT_LT,
-      anon_sym_LT_EQ,
-      anon_sym_EQ_EQ,
-      anon_sym_BANG_EQ,
-      anon_sym_GT_EQ,
-      anon_sym_LT_GT,
-      anon_sym_is,
-      sym_type_conversion,
-  [34452] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1465), 6,
-      anon_sym_as,
-      anon_sym_STAR,
-      anon_sym_EQ,
-      anon_sym_SLASH,
-      anon_sym_LT,
-      anon_sym_GT,
-    ACTIONS(1463), 34,
-      anon_sym_DOT,
-      anon_sym_LPAREN,
-      anon_sym_RPAREN,
-      anon_sym_COMMA,
-      anon_sym_GT_GT,
-      anon_sym_if,
-      anon_sym_COLON,
-      anon_sym_else,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_in,
-      anon_sym_PIPE,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_RBRACK,
-      anon_sym_RBRACE,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_not,
-      anon_sym_and,
-      anon_sym_or,
-      anon_sym_PERCENT,
-      anon_sym_SLASH_SLASH,
-      anon_sym_AMP,
-      anon_sym_CARET,
-      anon_sym_LT_LT,
-      anon_sym_LT_EQ,
-      anon_sym_EQ_EQ,
-      anon_sym_BANG_EQ,
-      anon_sym_GT_EQ,
-      anon_sym_LT_GT,
-      anon_sym_is,
-      sym_type_conversion,
-  [34500] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1469), 6,
-      anon_sym_as,
-      anon_sym_STAR,
-      anon_sym_EQ,
-      anon_sym_SLASH,
-      anon_sym_LT,
-      anon_sym_GT,
-    ACTIONS(1467), 34,
-      anon_sym_DOT,
-      anon_sym_LPAREN,
-      anon_sym_RPAREN,
-      anon_sym_COMMA,
-      anon_sym_GT_GT,
-      anon_sym_if,
-      anon_sym_COLON,
-      anon_sym_else,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_in,
-      anon_sym_PIPE,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_RBRACK,
-      anon_sym_RBRACE,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_not,
-      anon_sym_and,
-      anon_sym_or,
-      anon_sym_PERCENT,
-      anon_sym_SLASH_SLASH,
-      anon_sym_AMP,
-      anon_sym_CARET,
-      anon_sym_LT_LT,
-      anon_sym_LT_EQ,
-      anon_sym_EQ_EQ,
-      anon_sym_BANG_EQ,
-      anon_sym_GT_EQ,
-      anon_sym_LT_GT,
-      anon_sym_is,
-      sym_type_conversion,
-  [34548] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1473), 6,
-      anon_sym_as,
-      anon_sym_STAR,
-      anon_sym_EQ,
-      anon_sym_SLASH,
-      anon_sym_LT,
-      anon_sym_GT,
-    ACTIONS(1471), 34,
-      anon_sym_DOT,
-      anon_sym_LPAREN,
-      anon_sym_RPAREN,
-      anon_sym_COMMA,
-      anon_sym_GT_GT,
-      anon_sym_if,
-      anon_sym_COLON,
-      anon_sym_else,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_in,
-      anon_sym_PIPE,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_RBRACK,
-      anon_sym_RBRACE,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_not,
-      anon_sym_and,
-      anon_sym_or,
-      anon_sym_PERCENT,
-      anon_sym_SLASH_SLASH,
-      anon_sym_AMP,
-      anon_sym_CARET,
-      anon_sym_LT_LT,
-      anon_sym_LT_EQ,
-      anon_sym_EQ_EQ,
-      anon_sym_BANG_EQ,
-      anon_sym_GT_EQ,
-      anon_sym_LT_GT,
-      anon_sym_is,
-      sym_type_conversion,
-  [34596] = 20,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1475), 1,
-      anon_sym_DOT,
-    ACTIONS(1477), 1,
-      anon_sym_LPAREN,
-    ACTIONS(1487), 1,
-      anon_sym_PIPE,
-    ACTIONS(1491), 1,
-      anon_sym_LBRACK,
-    ACTIONS(1493), 1,
-      anon_sym_STAR_STAR,
-    ACTIONS(1495), 1,
-      anon_sym_EQ,
-    ACTIONS(1499), 1,
-      anon_sym_not,
-    ACTIONS(1501), 1,
-      anon_sym_AMP,
-    ACTIONS(1503), 1,
-      anon_sym_CARET,
-    ACTIONS(1507), 1,
-      anon_sym_is,
-    STATE(870), 1,
+    STATE(852), 1,
       aux_sym_comparison_operator_repeat1,
-    ACTIONS(1481), 2,
+    ACTIONS(1415), 2,
       anon_sym_STAR,
       anon_sym_SLASH,
-    ACTIONS(1483), 2,
+    ACTIONS(1417), 2,
       anon_sym_GT_GT,
       anon_sym_LT_LT,
-    ACTIONS(1489), 2,
+    ACTIONS(1423), 2,
       anon_sym_DASH,
       anon_sym_PLUS,
-    ACTIONS(1505), 2,
+    ACTIONS(1437), 2,
       anon_sym_LT,
       anon_sym_GT,
-    STATE(633), 2,
+    STATE(619), 2,
       sym_argument_list,
       sym_generator_expression,
-    ACTIONS(1497), 3,
+    ACTIONS(1429), 3,
       anon_sym_AT,
       anon_sym_PERCENT,
       anon_sym_SLASH_SLASH,
-    ACTIONS(1485), 6,
+    ACTIONS(1419), 6,
       anon_sym_in,
       anon_sym_LT_EQ,
       anon_sym_EQ_EQ,
       anon_sym_BANG_EQ,
       anon_sym_GT_EQ,
       anon_sym_LT_GT,
-    ACTIONS(1479), 10,
+    ACTIONS(1411), 10,
       anon_sym_RPAREN,
       anon_sym_COMMA,
       anon_sym_if,
       anon_sym_COLON,
-      anon_sym_else,
+      anon_sym_async,
+      anon_sym_for,
       anon_sym_RBRACK,
       anon_sym_RBRACE,
       anon_sym_and,
       anon_sym_or,
+  [33248] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1443), 6,
+      anon_sym_as,
+      anon_sym_STAR,
+      anon_sym_EQ,
+      anon_sym_SLASH,
+      anon_sym_LT,
+      anon_sym_GT,
+    ACTIONS(1441), 34,
+      anon_sym_DOT,
+      anon_sym_LPAREN,
+      anon_sym_RPAREN,
+      anon_sym_COMMA,
+      anon_sym_GT_GT,
+      anon_sym_if,
+      anon_sym_COLON,
+      anon_sym_else,
+      anon_sym_async,
+      anon_sym_for,
+      anon_sym_in,
+      anon_sym_PIPE,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_RBRACK,
+      anon_sym_RBRACE,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_not,
+      anon_sym_and,
+      anon_sym_or,
+      anon_sym_PERCENT,
+      anon_sym_SLASH_SLASH,
+      anon_sym_AMP,
+      anon_sym_CARET,
+      anon_sym_LT_LT,
+      anon_sym_LT_EQ,
+      anon_sym_EQ_EQ,
+      anon_sym_BANG_EQ,
+      anon_sym_GT_EQ,
+      anon_sym_LT_GT,
+      anon_sym_is,
       sym_type_conversion,
-  [34678] = 3,
+  [33296] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1447), 6,
+      anon_sym_as,
+      anon_sym_STAR,
+      anon_sym_EQ,
+      anon_sym_SLASH,
+      anon_sym_LT,
+      anon_sym_GT,
+    ACTIONS(1445), 34,
+      anon_sym_DOT,
+      anon_sym_LPAREN,
+      anon_sym_RPAREN,
+      anon_sym_COMMA,
+      anon_sym_GT_GT,
+      anon_sym_if,
+      anon_sym_COLON,
+      anon_sym_else,
+      anon_sym_async,
+      anon_sym_for,
+      anon_sym_in,
+      anon_sym_PIPE,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_RBRACK,
+      anon_sym_RBRACE,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_not,
+      anon_sym_and,
+      anon_sym_or,
+      anon_sym_PERCENT,
+      anon_sym_SLASH_SLASH,
+      anon_sym_AMP,
+      anon_sym_CARET,
+      anon_sym_LT_LT,
+      anon_sym_LT_EQ,
+      anon_sym_EQ_EQ,
+      anon_sym_BANG_EQ,
+      anon_sym_GT_EQ,
+      anon_sym_LT_GT,
+      anon_sym_is,
+      sym_type_conversion,
+  [33344] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1451), 6,
+      anon_sym_as,
+      anon_sym_STAR,
+      anon_sym_EQ,
+      anon_sym_SLASH,
+      anon_sym_LT,
+      anon_sym_GT,
+    ACTIONS(1449), 34,
+      anon_sym_DOT,
+      anon_sym_LPAREN,
+      anon_sym_RPAREN,
+      anon_sym_COMMA,
+      anon_sym_GT_GT,
+      anon_sym_if,
+      anon_sym_COLON,
+      anon_sym_else,
+      anon_sym_async,
+      anon_sym_for,
+      anon_sym_in,
+      anon_sym_PIPE,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_RBRACK,
+      anon_sym_RBRACE,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_not,
+      anon_sym_and,
+      anon_sym_or,
+      anon_sym_PERCENT,
+      anon_sym_SLASH_SLASH,
+      anon_sym_AMP,
+      anon_sym_CARET,
+      anon_sym_LT_LT,
+      anon_sym_LT_EQ,
+      anon_sym_EQ_EQ,
+      anon_sym_BANG_EQ,
+      anon_sym_GT_EQ,
+      anon_sym_LT_GT,
+      anon_sym_is,
+      sym_type_conversion,
+  [33392] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1455), 6,
+      anon_sym_as,
+      anon_sym_STAR,
+      anon_sym_EQ,
+      anon_sym_SLASH,
+      anon_sym_LT,
+      anon_sym_GT,
+    ACTIONS(1453), 34,
+      anon_sym_DOT,
+      anon_sym_LPAREN,
+      anon_sym_RPAREN,
+      anon_sym_COMMA,
+      anon_sym_GT_GT,
+      anon_sym_if,
+      anon_sym_COLON,
+      anon_sym_else,
+      anon_sym_async,
+      anon_sym_for,
+      anon_sym_in,
+      anon_sym_PIPE,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_RBRACK,
+      anon_sym_RBRACE,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_not,
+      anon_sym_and,
+      anon_sym_or,
+      anon_sym_PERCENT,
+      anon_sym_SLASH_SLASH,
+      anon_sym_AMP,
+      anon_sym_CARET,
+      anon_sym_LT_LT,
+      anon_sym_LT_EQ,
+      anon_sym_EQ_EQ,
+      anon_sym_BANG_EQ,
+      anon_sym_GT_EQ,
+      anon_sym_LT_GT,
+      anon_sym_is,
+      sym_type_conversion,
+  [33440] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1455), 6,
+      anon_sym_as,
+      anon_sym_STAR,
+      anon_sym_EQ,
+      anon_sym_SLASH,
+      anon_sym_LT,
+      anon_sym_GT,
+    ACTIONS(1453), 34,
+      anon_sym_DOT,
+      anon_sym_LPAREN,
+      anon_sym_RPAREN,
+      anon_sym_COMMA,
+      anon_sym_GT_GT,
+      anon_sym_if,
+      anon_sym_COLON,
+      anon_sym_else,
+      anon_sym_async,
+      anon_sym_for,
+      anon_sym_in,
+      anon_sym_PIPE,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_RBRACK,
+      anon_sym_RBRACE,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_not,
+      anon_sym_and,
+      anon_sym_or,
+      anon_sym_PERCENT,
+      anon_sym_SLASH_SLASH,
+      anon_sym_AMP,
+      anon_sym_CARET,
+      anon_sym_LT_LT,
+      anon_sym_LT_EQ,
+      anon_sym_EQ_EQ,
+      anon_sym_BANG_EQ,
+      anon_sym_GT_EQ,
+      anon_sym_LT_GT,
+      anon_sym_is,
+      sym_type_conversion,
+  [33488] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1459), 6,
+      anon_sym_as,
+      anon_sym_STAR,
+      anon_sym_EQ,
+      anon_sym_SLASH,
+      anon_sym_LT,
+      anon_sym_GT,
+    ACTIONS(1457), 34,
+      anon_sym_DOT,
+      anon_sym_LPAREN,
+      anon_sym_RPAREN,
+      anon_sym_COMMA,
+      anon_sym_GT_GT,
+      anon_sym_if,
+      anon_sym_COLON,
+      anon_sym_else,
+      anon_sym_async,
+      anon_sym_for,
+      anon_sym_in,
+      anon_sym_PIPE,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_RBRACK,
+      anon_sym_RBRACE,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_not,
+      anon_sym_and,
+      anon_sym_or,
+      anon_sym_PERCENT,
+      anon_sym_SLASH_SLASH,
+      anon_sym_AMP,
+      anon_sym_CARET,
+      anon_sym_LT_LT,
+      anon_sym_LT_EQ,
+      anon_sym_EQ_EQ,
+      anon_sym_BANG_EQ,
+      anon_sym_GT_EQ,
+      anon_sym_LT_GT,
+      anon_sym_is,
+      sym_type_conversion,
+  [33536] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1463), 6,
+      anon_sym_as,
+      anon_sym_STAR,
+      anon_sym_EQ,
+      anon_sym_SLASH,
+      anon_sym_LT,
+      anon_sym_GT,
+    ACTIONS(1461), 34,
+      anon_sym_DOT,
+      anon_sym_LPAREN,
+      anon_sym_RPAREN,
+      anon_sym_COMMA,
+      anon_sym_GT_GT,
+      anon_sym_if,
+      anon_sym_COLON,
+      anon_sym_else,
+      anon_sym_async,
+      anon_sym_for,
+      anon_sym_in,
+      anon_sym_PIPE,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_RBRACK,
+      anon_sym_RBRACE,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_not,
+      anon_sym_and,
+      anon_sym_or,
+      anon_sym_PERCENT,
+      anon_sym_SLASH_SLASH,
+      anon_sym_AMP,
+      anon_sym_CARET,
+      anon_sym_LT_LT,
+      anon_sym_LT_EQ,
+      anon_sym_EQ_EQ,
+      anon_sym_BANG_EQ,
+      anon_sym_GT_EQ,
+      anon_sym_LT_GT,
+      anon_sym_is,
+      sym_type_conversion,
+  [33584] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1467), 6,
+      anon_sym_as,
+      anon_sym_STAR,
+      anon_sym_EQ,
+      anon_sym_SLASH,
+      anon_sym_LT,
+      anon_sym_GT,
+    ACTIONS(1465), 34,
+      anon_sym_DOT,
+      anon_sym_LPAREN,
+      anon_sym_RPAREN,
+      anon_sym_COMMA,
+      anon_sym_GT_GT,
+      anon_sym_if,
+      anon_sym_COLON,
+      anon_sym_else,
+      anon_sym_async,
+      anon_sym_for,
+      anon_sym_in,
+      anon_sym_PIPE,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_RBRACK,
+      anon_sym_RBRACE,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_not,
+      anon_sym_and,
+      anon_sym_or,
+      anon_sym_PERCENT,
+      anon_sym_SLASH_SLASH,
+      anon_sym_AMP,
+      anon_sym_CARET,
+      anon_sym_LT_LT,
+      anon_sym_LT_EQ,
+      anon_sym_EQ_EQ,
+      anon_sym_BANG_EQ,
+      anon_sym_GT_EQ,
+      anon_sym_LT_GT,
+      anon_sym_is,
+      sym_type_conversion,
+  [33632] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1471), 6,
+      anon_sym_as,
+      anon_sym_STAR,
+      anon_sym_EQ,
+      anon_sym_SLASH,
+      anon_sym_LT,
+      anon_sym_GT,
+    ACTIONS(1469), 34,
+      anon_sym_DOT,
+      anon_sym_LPAREN,
+      anon_sym_RPAREN,
+      anon_sym_COMMA,
+      anon_sym_GT_GT,
+      anon_sym_if,
+      anon_sym_COLON,
+      anon_sym_else,
+      anon_sym_async,
+      anon_sym_for,
+      anon_sym_in,
+      anon_sym_PIPE,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_RBRACK,
+      anon_sym_RBRACE,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_not,
+      anon_sym_and,
+      anon_sym_or,
+      anon_sym_PERCENT,
+      anon_sym_SLASH_SLASH,
+      anon_sym_AMP,
+      anon_sym_CARET,
+      anon_sym_LT_LT,
+      anon_sym_LT_EQ,
+      anon_sym_EQ_EQ,
+      anon_sym_BANG_EQ,
+      anon_sym_GT_EQ,
+      anon_sym_LT_GT,
+      anon_sym_is,
+      sym_type_conversion,
+  [33680] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1475), 6,
+      anon_sym_as,
+      anon_sym_STAR,
+      anon_sym_EQ,
+      anon_sym_SLASH,
+      anon_sym_LT,
+      anon_sym_GT,
+    ACTIONS(1473), 34,
+      anon_sym_DOT,
+      anon_sym_LPAREN,
+      anon_sym_RPAREN,
+      anon_sym_COMMA,
+      anon_sym_GT_GT,
+      anon_sym_if,
+      anon_sym_COLON,
+      anon_sym_else,
+      anon_sym_async,
+      anon_sym_for,
+      anon_sym_in,
+      anon_sym_PIPE,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_RBRACK,
+      anon_sym_RBRACE,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_not,
+      anon_sym_and,
+      anon_sym_or,
+      anon_sym_PERCENT,
+      anon_sym_SLASH_SLASH,
+      anon_sym_AMP,
+      anon_sym_CARET,
+      anon_sym_LT_LT,
+      anon_sym_LT_EQ,
+      anon_sym_EQ_EQ,
+      anon_sym_BANG_EQ,
+      anon_sym_GT_EQ,
+      anon_sym_LT_GT,
+      anon_sym_is,
+      sym_type_conversion,
+  [33728] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1479), 6,
+      anon_sym_as,
+      anon_sym_STAR,
+      anon_sym_EQ,
+      anon_sym_SLASH,
+      anon_sym_LT,
+      anon_sym_GT,
+    ACTIONS(1477), 34,
+      anon_sym_DOT,
+      anon_sym_LPAREN,
+      anon_sym_RPAREN,
+      anon_sym_COMMA,
+      anon_sym_GT_GT,
+      anon_sym_if,
+      anon_sym_COLON,
+      anon_sym_else,
+      anon_sym_async,
+      anon_sym_for,
+      anon_sym_in,
+      anon_sym_PIPE,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_RBRACK,
+      anon_sym_RBRACE,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_not,
+      anon_sym_and,
+      anon_sym_or,
+      anon_sym_PERCENT,
+      anon_sym_SLASH_SLASH,
+      anon_sym_AMP,
+      anon_sym_CARET,
+      anon_sym_LT_LT,
+      anon_sym_LT_EQ,
+      anon_sym_EQ_EQ,
+      anon_sym_BANG_EQ,
+      anon_sym_GT_EQ,
+      anon_sym_LT_GT,
+      anon_sym_is,
+      sym_type_conversion,
+  [33776] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1483), 6,
+      anon_sym_as,
+      anon_sym_STAR,
+      anon_sym_EQ,
+      anon_sym_SLASH,
+      anon_sym_LT,
+      anon_sym_GT,
+    ACTIONS(1481), 34,
+      anon_sym_DOT,
+      anon_sym_LPAREN,
+      anon_sym_RPAREN,
+      anon_sym_COMMA,
+      anon_sym_GT_GT,
+      anon_sym_if,
+      anon_sym_COLON,
+      anon_sym_else,
+      anon_sym_async,
+      anon_sym_for,
+      anon_sym_in,
+      anon_sym_PIPE,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_RBRACK,
+      anon_sym_RBRACE,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_not,
+      anon_sym_and,
+      anon_sym_or,
+      anon_sym_PERCENT,
+      anon_sym_SLASH_SLASH,
+      anon_sym_AMP,
+      anon_sym_CARET,
+      anon_sym_LT_LT,
+      anon_sym_LT_EQ,
+      anon_sym_EQ_EQ,
+      anon_sym_BANG_EQ,
+      anon_sym_GT_EQ,
+      anon_sym_LT_GT,
+      anon_sym_is,
+      sym_type_conversion,
+  [33824] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1487), 6,
+      anon_sym_as,
+      anon_sym_STAR,
+      anon_sym_EQ,
+      anon_sym_SLASH,
+      anon_sym_LT,
+      anon_sym_GT,
+    ACTIONS(1485), 34,
+      anon_sym_DOT,
+      anon_sym_LPAREN,
+      anon_sym_RPAREN,
+      anon_sym_COMMA,
+      anon_sym_GT_GT,
+      anon_sym_if,
+      anon_sym_COLON,
+      anon_sym_else,
+      anon_sym_async,
+      anon_sym_for,
+      anon_sym_in,
+      anon_sym_PIPE,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_RBRACK,
+      anon_sym_RBRACE,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_not,
+      anon_sym_and,
+      anon_sym_or,
+      anon_sym_PERCENT,
+      anon_sym_SLASH_SLASH,
+      anon_sym_AMP,
+      anon_sym_CARET,
+      anon_sym_LT_LT,
+      anon_sym_LT_EQ,
+      anon_sym_EQ_EQ,
+      anon_sym_BANG_EQ,
+      anon_sym_GT_EQ,
+      anon_sym_LT_GT,
+      anon_sym_is,
+      sym_type_conversion,
+  [33872] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(260), 6,
+      anon_sym_as,
+      anon_sym_STAR,
+      anon_sym_EQ,
+      anon_sym_SLASH,
+      anon_sym_LT,
+      anon_sym_GT,
+    ACTIONS(287), 34,
+      anon_sym_DOT,
+      anon_sym_LPAREN,
+      anon_sym_RPAREN,
+      anon_sym_COMMA,
+      anon_sym_GT_GT,
+      anon_sym_if,
+      anon_sym_COLON,
+      anon_sym_else,
+      anon_sym_async,
+      anon_sym_for,
+      anon_sym_in,
+      anon_sym_PIPE,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_RBRACK,
+      anon_sym_RBRACE,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_not,
+      anon_sym_and,
+      anon_sym_or,
+      anon_sym_PERCENT,
+      anon_sym_SLASH_SLASH,
+      anon_sym_AMP,
+      anon_sym_CARET,
+      anon_sym_LT_LT,
+      anon_sym_LT_EQ,
+      anon_sym_EQ_EQ,
+      anon_sym_BANG_EQ,
+      anon_sym_GT_EQ,
+      anon_sym_LT_GT,
+      anon_sym_is,
+      sym_type_conversion,
+  [33920] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1079), 6,
+      anon_sym_as,
+      anon_sym_STAR,
+      anon_sym_EQ,
+      anon_sym_SLASH,
+      anon_sym_LT,
+      anon_sym_GT,
+    ACTIONS(1074), 34,
+      anon_sym_DOT,
+      anon_sym_LPAREN,
+      anon_sym_RPAREN,
+      anon_sym_COMMA,
+      anon_sym_GT_GT,
+      anon_sym_if,
+      anon_sym_COLON,
+      anon_sym_else,
+      anon_sym_async,
+      anon_sym_for,
+      anon_sym_in,
+      anon_sym_PIPE,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_RBRACK,
+      anon_sym_RBRACE,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_not,
+      anon_sym_and,
+      anon_sym_or,
+      anon_sym_PERCENT,
+      anon_sym_SLASH_SLASH,
+      anon_sym_AMP,
+      anon_sym_CARET,
+      anon_sym_LT_LT,
+      anon_sym_LT_EQ,
+      anon_sym_EQ_EQ,
+      anon_sym_BANG_EQ,
+      anon_sym_GT_EQ,
+      anon_sym_LT_GT,
+      anon_sym_is,
+      sym_type_conversion,
+  [33968] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1491), 6,
+      anon_sym_as,
+      anon_sym_STAR,
+      anon_sym_EQ,
+      anon_sym_SLASH,
+      anon_sym_LT,
+      anon_sym_GT,
+    ACTIONS(1489), 34,
+      anon_sym_DOT,
+      anon_sym_LPAREN,
+      anon_sym_RPAREN,
+      anon_sym_COMMA,
+      anon_sym_GT_GT,
+      anon_sym_if,
+      anon_sym_COLON,
+      anon_sym_else,
+      anon_sym_async,
+      anon_sym_for,
+      anon_sym_in,
+      anon_sym_PIPE,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_RBRACK,
+      anon_sym_RBRACE,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_not,
+      anon_sym_and,
+      anon_sym_or,
+      anon_sym_PERCENT,
+      anon_sym_SLASH_SLASH,
+      anon_sym_AMP,
+      anon_sym_CARET,
+      anon_sym_LT_LT,
+      anon_sym_LT_EQ,
+      anon_sym_EQ_EQ,
+      anon_sym_BANG_EQ,
+      anon_sym_GT_EQ,
+      anon_sym_LT_GT,
+      anon_sym_is,
+      sym_type_conversion,
+  [34016] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1467), 6,
+      anon_sym_as,
+      anon_sym_STAR,
+      anon_sym_EQ,
+      anon_sym_SLASH,
+      anon_sym_LT,
+      anon_sym_GT,
+    ACTIONS(1465), 34,
+      anon_sym_DOT,
+      anon_sym_LPAREN,
+      anon_sym_RPAREN,
+      anon_sym_COMMA,
+      anon_sym_GT_GT,
+      anon_sym_if,
+      anon_sym_COLON,
+      anon_sym_else,
+      anon_sym_async,
+      anon_sym_for,
+      anon_sym_in,
+      anon_sym_PIPE,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_RBRACK,
+      anon_sym_RBRACE,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_not,
+      anon_sym_and,
+      anon_sym_or,
+      anon_sym_PERCENT,
+      anon_sym_SLASH_SLASH,
+      anon_sym_AMP,
+      anon_sym_CARET,
+      anon_sym_LT_LT,
+      anon_sym_LT_EQ,
+      anon_sym_EQ_EQ,
+      anon_sym_BANG_EQ,
+      anon_sym_GT_EQ,
+      anon_sym_LT_GT,
+      anon_sym_is,
+      sym_type_conversion,
+  [34064] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1495), 6,
+      anon_sym_as,
+      anon_sym_STAR,
+      anon_sym_EQ,
+      anon_sym_SLASH,
+      anon_sym_LT,
+      anon_sym_GT,
+    ACTIONS(1493), 34,
+      anon_sym_DOT,
+      anon_sym_LPAREN,
+      anon_sym_RPAREN,
+      anon_sym_COMMA,
+      anon_sym_GT_GT,
+      anon_sym_if,
+      anon_sym_COLON,
+      anon_sym_else,
+      anon_sym_async,
+      anon_sym_for,
+      anon_sym_in,
+      anon_sym_PIPE,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_RBRACK,
+      anon_sym_RBRACE,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_not,
+      anon_sym_and,
+      anon_sym_or,
+      anon_sym_PERCENT,
+      anon_sym_SLASH_SLASH,
+      anon_sym_AMP,
+      anon_sym_CARET,
+      anon_sym_LT_LT,
+      anon_sym_LT_EQ,
+      anon_sym_EQ_EQ,
+      anon_sym_BANG_EQ,
+      anon_sym_GT_EQ,
+      anon_sym_LT_GT,
+      anon_sym_is,
+      sym_type_conversion,
+  [34112] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1499), 6,
+      anon_sym_as,
+      anon_sym_STAR,
+      anon_sym_EQ,
+      anon_sym_SLASH,
+      anon_sym_LT,
+      anon_sym_GT,
+    ACTIONS(1497), 34,
+      anon_sym_DOT,
+      anon_sym_LPAREN,
+      anon_sym_RPAREN,
+      anon_sym_COMMA,
+      anon_sym_GT_GT,
+      anon_sym_if,
+      anon_sym_COLON,
+      anon_sym_else,
+      anon_sym_async,
+      anon_sym_for,
+      anon_sym_in,
+      anon_sym_PIPE,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_RBRACK,
+      anon_sym_RBRACE,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_not,
+      anon_sym_and,
+      anon_sym_or,
+      anon_sym_PERCENT,
+      anon_sym_SLASH_SLASH,
+      anon_sym_AMP,
+      anon_sym_CARET,
+      anon_sym_LT_LT,
+      anon_sym_LT_EQ,
+      anon_sym_EQ_EQ,
+      anon_sym_BANG_EQ,
+      anon_sym_GT_EQ,
+      anon_sym_LT_GT,
+      anon_sym_is,
+      sym_type_conversion,
+  [34160] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1503), 6,
+      anon_sym_as,
+      anon_sym_STAR,
+      anon_sym_EQ,
+      anon_sym_SLASH,
+      anon_sym_LT,
+      anon_sym_GT,
+    ACTIONS(1501), 34,
+      anon_sym_DOT,
+      anon_sym_LPAREN,
+      anon_sym_RPAREN,
+      anon_sym_COMMA,
+      anon_sym_GT_GT,
+      anon_sym_if,
+      anon_sym_COLON,
+      anon_sym_else,
+      anon_sym_async,
+      anon_sym_for,
+      anon_sym_in,
+      anon_sym_PIPE,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_RBRACK,
+      anon_sym_RBRACE,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_not,
+      anon_sym_and,
+      anon_sym_or,
+      anon_sym_PERCENT,
+      anon_sym_SLASH_SLASH,
+      anon_sym_AMP,
+      anon_sym_CARET,
+      anon_sym_LT_LT,
+      anon_sym_LT_EQ,
+      anon_sym_EQ_EQ,
+      anon_sym_BANG_EQ,
+      anon_sym_GT_EQ,
+      anon_sym_LT_GT,
+      anon_sym_is,
+      sym_type_conversion,
+  [34208] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1507), 6,
+      anon_sym_as,
+      anon_sym_STAR,
+      anon_sym_EQ,
+      anon_sym_SLASH,
+      anon_sym_LT,
+      anon_sym_GT,
+    ACTIONS(1505), 34,
+      anon_sym_DOT,
+      anon_sym_LPAREN,
+      anon_sym_RPAREN,
+      anon_sym_COMMA,
+      anon_sym_GT_GT,
+      anon_sym_if,
+      anon_sym_COLON,
+      anon_sym_else,
+      anon_sym_async,
+      anon_sym_for,
+      anon_sym_in,
+      anon_sym_PIPE,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_RBRACK,
+      anon_sym_RBRACE,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_not,
+      anon_sym_and,
+      anon_sym_or,
+      anon_sym_PERCENT,
+      anon_sym_SLASH_SLASH,
+      anon_sym_AMP,
+      anon_sym_CARET,
+      anon_sym_LT_LT,
+      anon_sym_LT_EQ,
+      anon_sym_EQ_EQ,
+      anon_sym_BANG_EQ,
+      anon_sym_GT_EQ,
+      anon_sym_LT_GT,
+      anon_sym_is,
+      sym_type_conversion,
+  [34256] = 3,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(1511), 6,
@@ -55478,52 +51518,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_LT_GT,
       anon_sym_is,
       sym_type_conversion,
-  [34726] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1417), 6,
-      anon_sym_as,
-      anon_sym_STAR,
-      anon_sym_EQ,
-      anon_sym_SLASH,
-      anon_sym_LT,
-      anon_sym_GT,
-    ACTIONS(1415), 34,
-      anon_sym_DOT,
-      anon_sym_LPAREN,
-      anon_sym_RPAREN,
-      anon_sym_COMMA,
-      anon_sym_GT_GT,
-      anon_sym_if,
-      anon_sym_COLON,
-      anon_sym_else,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_in,
-      anon_sym_PIPE,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_RBRACK,
-      anon_sym_RBRACE,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_not,
-      anon_sym_and,
-      anon_sym_or,
-      anon_sym_PERCENT,
-      anon_sym_SLASH_SLASH,
-      anon_sym_AMP,
-      anon_sym_CARET,
-      anon_sym_LT_LT,
-      anon_sym_LT_EQ,
-      anon_sym_EQ_EQ,
-      anon_sym_BANG_EQ,
-      anon_sym_GT_EQ,
-      anon_sym_LT_GT,
-      anon_sym_is,
-      sym_type_conversion,
-  [34774] = 3,
+  [34304] = 3,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(1515), 6,
@@ -55568,7 +51563,52 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_LT_GT,
       anon_sym_is,
       sym_type_conversion,
-  [34822] = 3,
+  [34352] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1491), 6,
+      anon_sym_as,
+      anon_sym_STAR,
+      anon_sym_EQ,
+      anon_sym_SLASH,
+      anon_sym_LT,
+      anon_sym_GT,
+    ACTIONS(1489), 34,
+      anon_sym_DOT,
+      anon_sym_LPAREN,
+      anon_sym_RPAREN,
+      anon_sym_COMMA,
+      anon_sym_GT_GT,
+      anon_sym_if,
+      anon_sym_COLON,
+      anon_sym_else,
+      anon_sym_async,
+      anon_sym_for,
+      anon_sym_in,
+      anon_sym_PIPE,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_RBRACK,
+      anon_sym_RBRACE,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_not,
+      anon_sym_and,
+      anon_sym_or,
+      anon_sym_PERCENT,
+      anon_sym_SLASH_SLASH,
+      anon_sym_AMP,
+      anon_sym_CARET,
+      anon_sym_LT_LT,
+      anon_sym_LT_EQ,
+      anon_sym_EQ_EQ,
+      anon_sym_BANG_EQ,
+      anon_sym_GT_EQ,
+      anon_sym_LT_GT,
+      anon_sym_is,
+      sym_type_conversion,
+  [34400] = 3,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(1519), 6,
@@ -55613,451 +51653,79 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_LT_GT,
       anon_sym_is,
       sym_type_conversion,
-  [34870] = 3,
+  [34448] = 20,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1523), 6,
-      anon_sym_as,
-      anon_sym_STAR,
+    ACTIONS(1407), 1,
+      anon_sym_DOT,
+    ACTIONS(1409), 1,
+      anon_sym_LPAREN,
+    ACTIONS(1413), 1,
       anon_sym_EQ,
-      anon_sym_SLASH,
-      anon_sym_LT,
-      anon_sym_GT,
-    ACTIONS(1521), 34,
-      anon_sym_DOT,
-      anon_sym_LPAREN,
-      anon_sym_RPAREN,
-      anon_sym_COMMA,
-      anon_sym_GT_GT,
-      anon_sym_if,
-      anon_sym_COLON,
-      anon_sym_else,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_in,
+    ACTIONS(1425), 1,
+      anon_sym_LBRACK,
+    ACTIONS(1527), 1,
       anon_sym_PIPE,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_RBRACK,
-      anon_sym_RBRACE,
+    ACTIONS(1531), 1,
       anon_sym_STAR_STAR,
-      anon_sym_AT,
+    ACTIONS(1535), 1,
       anon_sym_not,
-      anon_sym_and,
-      anon_sym_or,
-      anon_sym_PERCENT,
-      anon_sym_SLASH_SLASH,
+    ACTIONS(1537), 1,
       anon_sym_AMP,
+    ACTIONS(1539), 1,
       anon_sym_CARET,
-      anon_sym_LT_LT,
-      anon_sym_LT_EQ,
-      anon_sym_EQ_EQ,
-      anon_sym_BANG_EQ,
-      anon_sym_GT_EQ,
-      anon_sym_LT_GT,
+    ACTIONS(1543), 1,
       anon_sym_is,
-      sym_type_conversion,
-  [34918] = 15,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(278), 1,
-      anon_sym_LPAREN,
-    ACTIONS(293), 1,
-      anon_sym_LBRACK,
-    ACTIONS(295), 1,
-      anon_sym_LBRACE,
-    ACTIONS(315), 1,
-      sym__string_start,
-    ACTIONS(1525), 1,
-      sym_identifier,
-    STATE(600), 1,
-      sym_string,
-    STATE(882), 1,
-      sym_primary_expression,
-    ACTIONS(309), 2,
-      sym_ellipsis,
-      sym_float,
-    STATE(762), 2,
-      sym_attribute,
-      sym_subscript,
-    ACTIONS(301), 3,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_TILDE,
-    ACTIONS(1527), 3,
-      anon_sym_RPAREN,
-      anon_sym_COMMA,
-      anon_sym_COLON,
-    ACTIONS(311), 4,
-      sym_integer,
-      sym_true,
-      sym_false,
-      sym_none,
-    ACTIONS(1529), 6,
-      anon_sym_print,
-      anon_sym_async,
-      anon_sym_match,
-      anon_sym_exec,
-      anon_sym_type,
-      anon_sym_await,
-    STATE(642), 13,
-      sym_binary_operator,
-      sym_unary_operator,
-      sym_call,
-      sym_list,
-      sym_set,
-      sym_tuple,
-      sym_dictionary,
-      sym_list_comprehension,
-      sym_dictionary_comprehension,
-      sym_set_comprehension,
-      sym_generator_expression,
-      sym_parenthesized_expression,
-      sym_concatenated_string,
-  [34990] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1533), 6,
-      anon_sym_as,
-      anon_sym_STAR,
-      anon_sym_EQ,
-      anon_sym_SLASH,
-      anon_sym_LT,
-      anon_sym_GT,
-    ACTIONS(1531), 34,
-      anon_sym_DOT,
-      anon_sym_LPAREN,
-      anon_sym_RPAREN,
-      anon_sym_COMMA,
-      anon_sym_GT_GT,
-      anon_sym_if,
-      anon_sym_COLON,
-      anon_sym_else,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_in,
-      anon_sym_PIPE,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_RBRACK,
-      anon_sym_RBRACE,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_not,
-      anon_sym_and,
-      anon_sym_or,
-      anon_sym_PERCENT,
-      anon_sym_SLASH_SLASH,
-      anon_sym_AMP,
-      anon_sym_CARET,
-      anon_sym_LT_LT,
-      anon_sym_LT_EQ,
-      anon_sym_EQ_EQ,
-      anon_sym_BANG_EQ,
-      anon_sym_GT_EQ,
-      anon_sym_LT_GT,
-      anon_sym_is,
-      sym_type_conversion,
-  [35038] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1537), 6,
-      anon_sym_as,
-      anon_sym_STAR,
-      anon_sym_EQ,
-      anon_sym_SLASH,
-      anon_sym_LT,
-      anon_sym_GT,
-    ACTIONS(1535), 34,
-      anon_sym_DOT,
-      anon_sym_LPAREN,
-      anon_sym_RPAREN,
-      anon_sym_COMMA,
-      anon_sym_GT_GT,
-      anon_sym_if,
-      anon_sym_COLON,
-      anon_sym_else,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_in,
-      anon_sym_PIPE,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_RBRACK,
-      anon_sym_RBRACE,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_not,
-      anon_sym_and,
-      anon_sym_or,
-      anon_sym_PERCENT,
-      anon_sym_SLASH_SLASH,
-      anon_sym_AMP,
-      anon_sym_CARET,
-      anon_sym_LT_LT,
-      anon_sym_LT_EQ,
-      anon_sym_EQ_EQ,
-      anon_sym_BANG_EQ,
-      anon_sym_GT_EQ,
-      anon_sym_LT_GT,
-      anon_sym_is,
-      sym_type_conversion,
-  [35086] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1425), 6,
-      anon_sym_as,
-      anon_sym_STAR,
-      anon_sym_EQ,
-      anon_sym_SLASH,
-      anon_sym_LT,
-      anon_sym_GT,
-    ACTIONS(1423), 34,
-      anon_sym_DOT,
-      anon_sym_LPAREN,
-      anon_sym_RPAREN,
-      anon_sym_COMMA,
-      anon_sym_GT_GT,
-      anon_sym_if,
-      anon_sym_COLON,
-      anon_sym_else,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_in,
-      anon_sym_PIPE,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_RBRACK,
-      anon_sym_RBRACE,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_not,
-      anon_sym_and,
-      anon_sym_or,
-      anon_sym_PERCENT,
-      anon_sym_SLASH_SLASH,
-      anon_sym_AMP,
-      anon_sym_CARET,
-      anon_sym_LT_LT,
-      anon_sym_LT_EQ,
-      anon_sym_EQ_EQ,
-      anon_sym_BANG_EQ,
-      anon_sym_GT_EQ,
-      anon_sym_LT_GT,
-      anon_sym_is,
-      sym_type_conversion,
-  [35134] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1519), 6,
-      anon_sym_as,
-      anon_sym_STAR,
-      anon_sym_EQ,
-      anon_sym_SLASH,
-      anon_sym_LT,
-      anon_sym_GT,
-    ACTIONS(1517), 34,
-      anon_sym_DOT,
-      anon_sym_LPAREN,
-      anon_sym_RPAREN,
-      anon_sym_COMMA,
-      anon_sym_GT_GT,
-      anon_sym_if,
-      anon_sym_COLON,
-      anon_sym_else,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_in,
-      anon_sym_PIPE,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_RBRACK,
-      anon_sym_RBRACE,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_not,
-      anon_sym_and,
-      anon_sym_or,
-      anon_sym_PERCENT,
-      anon_sym_SLASH_SLASH,
-      anon_sym_AMP,
-      anon_sym_CARET,
-      anon_sym_LT_LT,
-      anon_sym_LT_EQ,
-      anon_sym_EQ_EQ,
-      anon_sym_BANG_EQ,
-      anon_sym_GT_EQ,
-      anon_sym_LT_GT,
-      anon_sym_is,
-      sym_type_conversion,
-  [35182] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1541), 6,
-      anon_sym_as,
-      anon_sym_STAR,
-      anon_sym_EQ,
-      anon_sym_SLASH,
-      anon_sym_LT,
-      anon_sym_GT,
-    ACTIONS(1539), 34,
-      anon_sym_DOT,
-      anon_sym_LPAREN,
-      anon_sym_RPAREN,
-      anon_sym_COMMA,
-      anon_sym_GT_GT,
-      anon_sym_if,
-      anon_sym_COLON,
-      anon_sym_else,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_in,
-      anon_sym_PIPE,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_RBRACK,
-      anon_sym_RBRACE,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_not,
-      anon_sym_and,
-      anon_sym_or,
-      anon_sym_PERCENT,
-      anon_sym_SLASH_SLASH,
-      anon_sym_AMP,
-      anon_sym_CARET,
-      anon_sym_LT_LT,
-      anon_sym_LT_EQ,
-      anon_sym_EQ_EQ,
-      anon_sym_BANG_EQ,
-      anon_sym_GT_EQ,
-      anon_sym_LT_GT,
-      anon_sym_is,
-      sym_type_conversion,
-  [35230] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1053), 6,
-      anon_sym_as,
-      anon_sym_STAR,
-      anon_sym_EQ,
-      anon_sym_SLASH,
-      anon_sym_LT,
-      anon_sym_GT,
-    ACTIONS(1048), 34,
-      anon_sym_DOT,
-      anon_sym_LPAREN,
-      anon_sym_RPAREN,
-      anon_sym_COMMA,
-      anon_sym_GT_GT,
-      anon_sym_if,
-      anon_sym_COLON,
-      anon_sym_else,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_in,
-      anon_sym_PIPE,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_RBRACK,
-      anon_sym_RBRACE,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_not,
-      anon_sym_and,
-      anon_sym_or,
-      anon_sym_PERCENT,
-      anon_sym_SLASH_SLASH,
-      anon_sym_AMP,
-      anon_sym_CARET,
-      anon_sym_LT_LT,
-      anon_sym_LT_EQ,
-      anon_sym_EQ_EQ,
-      anon_sym_BANG_EQ,
-      anon_sym_GT_EQ,
-      anon_sym_LT_GT,
-      anon_sym_is,
-      sym_type_conversion,
-  [35278] = 20,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1475), 1,
-      anon_sym_DOT,
-    ACTIONS(1477), 1,
-      anon_sym_LPAREN,
-    ACTIONS(1491), 1,
-      anon_sym_LBRACK,
-    ACTIONS(1495), 1,
-      anon_sym_as,
-    ACTIONS(1549), 1,
-      anon_sym_PIPE,
-    ACTIONS(1553), 1,
-      anon_sym_STAR_STAR,
-    ACTIONS(1557), 1,
-      anon_sym_not,
-    ACTIONS(1559), 1,
-      anon_sym_AMP,
-    ACTIONS(1561), 1,
-      anon_sym_CARET,
-    ACTIONS(1565), 1,
-      anon_sym_is,
-    STATE(871), 1,
+    STATE(851), 1,
       aux_sym_comparison_operator_repeat1,
-    ACTIONS(1543), 2,
+    ACTIONS(1521), 2,
       anon_sym_STAR,
       anon_sym_SLASH,
-    ACTIONS(1545), 2,
+    ACTIONS(1523), 2,
       anon_sym_GT_GT,
       anon_sym_LT_LT,
-    ACTIONS(1551), 2,
+    ACTIONS(1529), 2,
       anon_sym_DASH,
       anon_sym_PLUS,
-    ACTIONS(1563), 2,
+    ACTIONS(1541), 2,
       anon_sym_LT,
       anon_sym_GT,
-    STATE(633), 2,
+    STATE(619), 2,
       sym_argument_list,
       sym_generator_expression,
-    ACTIONS(1555), 3,
+    ACTIONS(1533), 3,
       anon_sym_AT,
       anon_sym_PERCENT,
       anon_sym_SLASH_SLASH,
+    ACTIONS(1525), 6,
+      anon_sym_in,
+      anon_sym_LT_EQ,
+      anon_sym_EQ_EQ,
+      anon_sym_BANG_EQ,
+      anon_sym_GT_EQ,
+      anon_sym_LT_GT,
+    ACTIONS(1411), 10,
+      anon_sym_RPAREN,
+      anon_sym_COMMA,
+      anon_sym_if,
+      anon_sym_COLON,
+      anon_sym_else,
+      anon_sym_RBRACK,
+      anon_sym_RBRACE,
+      anon_sym_and,
+      anon_sym_or,
+      sym_type_conversion,
+  [34530] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
     ACTIONS(1547), 6,
-      anon_sym_in,
-      anon_sym_LT_EQ,
-      anon_sym_EQ_EQ,
-      anon_sym_BANG_EQ,
-      anon_sym_GT_EQ,
-      anon_sym_LT_GT,
-    ACTIONS(1479), 10,
-      anon_sym_RPAREN,
-      anon_sym_COMMA,
-      anon_sym_if,
-      anon_sym_COLON,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_RBRACK,
-      anon_sym_RBRACE,
-      anon_sym_and,
-      anon_sym_or,
-  [35360] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1569), 6,
       anon_sym_as,
       anon_sym_STAR,
       anon_sym_EQ,
       anon_sym_SLASH,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1567), 34,
+    ACTIONS(1545), 34,
       anon_sym_DOT,
       anon_sym_LPAREN,
       anon_sym_RPAREN,
@@ -56092,39 +51760,35 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_LT_GT,
       anon_sym_is,
       sym_type_conversion,
-  [35408] = 8,
+  [34578] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1475), 1,
-      anon_sym_DOT,
-    ACTIONS(1477), 1,
-      anon_sym_LPAREN,
-    ACTIONS(1491), 1,
-      anon_sym_LBRACK,
-    ACTIONS(1493), 1,
-      anon_sym_STAR_STAR,
-    STATE(633), 2,
-      sym_argument_list,
-      sym_generator_expression,
-    ACTIONS(1573), 5,
+    ACTIONS(1551), 6,
+      anon_sym_as,
       anon_sym_STAR,
       anon_sym_EQ,
       anon_sym_SLASH,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1571), 28,
+    ACTIONS(1549), 34,
+      anon_sym_DOT,
+      anon_sym_LPAREN,
       anon_sym_RPAREN,
       anon_sym_COMMA,
       anon_sym_GT_GT,
       anon_sym_if,
       anon_sym_COLON,
       anon_sym_else,
+      anon_sym_async,
+      anon_sym_for,
       anon_sym_in,
       anon_sym_PIPE,
       anon_sym_DASH,
       anon_sym_PLUS,
+      anon_sym_LBRACK,
       anon_sym_RBRACK,
       anon_sym_RBRACE,
+      anon_sym_STAR_STAR,
       anon_sym_AT,
       anon_sym_not,
       anon_sym_and,
@@ -56141,142 +51805,35 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_LT_GT,
       anon_sym_is,
       sym_type_conversion,
-  [35465] = 13,
+  [34626] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1475), 1,
-      anon_sym_DOT,
-    ACTIONS(1477), 1,
-      anon_sym_LPAREN,
-    ACTIONS(1491), 1,
-      anon_sym_LBRACK,
-    ACTIONS(1493), 1,
-      anon_sym_STAR_STAR,
-    ACTIONS(1503), 1,
-      anon_sym_CARET,
-    ACTIONS(1481), 2,
+    ACTIONS(1555), 6,
+      anon_sym_as,
       anon_sym_STAR,
-      anon_sym_SLASH,
-    ACTIONS(1483), 2,
-      anon_sym_GT_GT,
-      anon_sym_LT_LT,
-    ACTIONS(1489), 2,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-    STATE(633), 2,
-      sym_argument_list,
-      sym_generator_expression,
-    ACTIONS(1497), 3,
-      anon_sym_AT,
-      anon_sym_PERCENT,
-      anon_sym_SLASH_SLASH,
-    ACTIONS(1573), 3,
       anon_sym_EQ,
+      anon_sym_SLASH,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1571), 20,
+    ACTIONS(1553), 34,
+      anon_sym_DOT,
+      anon_sym_LPAREN,
       anon_sym_RPAREN,
       anon_sym_COMMA,
+      anon_sym_GT_GT,
       anon_sym_if,
       anon_sym_COLON,
       anon_sym_else,
-      anon_sym_in,
-      anon_sym_PIPE,
-      anon_sym_RBRACK,
-      anon_sym_RBRACE,
-      anon_sym_not,
-      anon_sym_and,
-      anon_sym_or,
-      anon_sym_AMP,
-      anon_sym_LT_EQ,
-      anon_sym_EQ_EQ,
-      anon_sym_BANG_EQ,
-      anon_sym_GT_EQ,
-      anon_sym_LT_GT,
-      anon_sym_is,
-      sym_type_conversion,
-  [35532] = 8,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1475), 1,
-      anon_sym_DOT,
-    ACTIONS(1477), 1,
-      anon_sym_LPAREN,
-    ACTIONS(1491), 1,
-      anon_sym_LBRACK,
-    ACTIONS(1553), 1,
-      anon_sym_STAR_STAR,
-    STATE(633), 2,
-      sym_argument_list,
-      sym_generator_expression,
-    ACTIONS(1573), 5,
-      anon_sym_as,
-      anon_sym_STAR,
-      anon_sym_SLASH,
-      anon_sym_LT,
-      anon_sym_GT,
-    ACTIONS(1571), 28,
-      anon_sym_RPAREN,
-      anon_sym_COMMA,
-      anon_sym_GT_GT,
-      anon_sym_if,
-      anon_sym_COLON,
       anon_sym_async,
       anon_sym_for,
       anon_sym_in,
       anon_sym_PIPE,
       anon_sym_DASH,
       anon_sym_PLUS,
-      anon_sym_RBRACK,
-      anon_sym_RBRACE,
-      anon_sym_AT,
-      anon_sym_not,
-      anon_sym_and,
-      anon_sym_or,
-      anon_sym_PERCENT,
-      anon_sym_SLASH_SLASH,
-      anon_sym_AMP,
-      anon_sym_CARET,
-      anon_sym_LT_LT,
-      anon_sym_LT_EQ,
-      anon_sym_EQ_EQ,
-      anon_sym_BANG_EQ,
-      anon_sym_GT_EQ,
-      anon_sym_LT_GT,
-      anon_sym_is,
-  [35589] = 8,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1475), 1,
-      anon_sym_DOT,
-    ACTIONS(1477), 1,
-      anon_sym_LPAREN,
-    ACTIONS(1491), 1,
       anon_sym_LBRACK,
-    ACTIONS(1493), 1,
-      anon_sym_STAR_STAR,
-    STATE(633), 2,
-      sym_argument_list,
-      sym_generator_expression,
-    ACTIONS(1573), 5,
-      anon_sym_STAR,
-      anon_sym_EQ,
-      anon_sym_SLASH,
-      anon_sym_LT,
-      anon_sym_GT,
-    ACTIONS(1571), 28,
-      anon_sym_RPAREN,
-      anon_sym_COMMA,
-      anon_sym_GT_GT,
-      anon_sym_if,
-      anon_sym_COLON,
-      anon_sym_else,
-      anon_sym_in,
-      anon_sym_PIPE,
-      anon_sym_DASH,
-      anon_sym_PLUS,
       anon_sym_RBRACK,
       anon_sym_RBRACE,
+      anon_sym_STAR_STAR,
       anon_sym_AT,
       anon_sym_not,
       anon_sym_and,
@@ -56293,91 +51850,35 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_LT_GT,
       anon_sym_is,
       sym_type_conversion,
-  [35646] = 11,
+  [34674] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1475), 1,
-      anon_sym_DOT,
-    ACTIONS(1477), 1,
-      anon_sym_LPAREN,
-    ACTIONS(1491), 1,
-      anon_sym_LBRACK,
-    ACTIONS(1553), 1,
-      anon_sym_STAR_STAR,
-    ACTIONS(1543), 2,
-      anon_sym_STAR,
-      anon_sym_SLASH,
-    ACTIONS(1551), 2,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-    STATE(633), 2,
-      sym_argument_list,
-      sym_generator_expression,
-    ACTIONS(1555), 3,
-      anon_sym_AT,
-      anon_sym_PERCENT,
-      anon_sym_SLASH_SLASH,
-    ACTIONS(1573), 3,
+    ACTIONS(1559), 6,
       anon_sym_as,
-      anon_sym_LT,
-      anon_sym_GT,
-    ACTIONS(1571), 23,
-      anon_sym_RPAREN,
-      anon_sym_COMMA,
-      anon_sym_GT_GT,
-      anon_sym_if,
-      anon_sym_COLON,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_in,
-      anon_sym_PIPE,
-      anon_sym_RBRACK,
-      anon_sym_RBRACE,
-      anon_sym_not,
-      anon_sym_and,
-      anon_sym_or,
-      anon_sym_AMP,
-      anon_sym_CARET,
-      anon_sym_LT_LT,
-      anon_sym_LT_EQ,
-      anon_sym_EQ_EQ,
-      anon_sym_BANG_EQ,
-      anon_sym_GT_EQ,
-      anon_sym_LT_GT,
-      anon_sym_is,
-  [35709] = 8,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1475), 1,
-      anon_sym_DOT,
-    ACTIONS(1477), 1,
-      anon_sym_LPAREN,
-    ACTIONS(1491), 1,
-      anon_sym_LBRACK,
-    ACTIONS(1493), 1,
-      anon_sym_STAR_STAR,
-    STATE(633), 2,
-      sym_argument_list,
-      sym_generator_expression,
-    ACTIONS(1577), 5,
       anon_sym_STAR,
       anon_sym_EQ,
       anon_sym_SLASH,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1575), 28,
+    ACTIONS(1557), 34,
+      anon_sym_DOT,
+      anon_sym_LPAREN,
       anon_sym_RPAREN,
       anon_sym_COMMA,
       anon_sym_GT_GT,
       anon_sym_if,
       anon_sym_COLON,
       anon_sym_else,
+      anon_sym_async,
+      anon_sym_for,
       anon_sym_in,
       anon_sym_PIPE,
       anon_sym_DASH,
       anon_sym_PLUS,
+      anon_sym_LBRACK,
       anon_sym_RBRACK,
       anon_sym_RBRACE,
+      anon_sym_STAR_STAR,
       anon_sym_AT,
       anon_sym_not,
       anon_sym_and,
@@ -56394,47 +51895,41 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_LT_GT,
       anon_sym_is,
       sym_type_conversion,
-  [35766] = 10,
+  [34722] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1475), 1,
-      anon_sym_DOT,
-    ACTIONS(1477), 1,
-      anon_sym_LPAREN,
-    ACTIONS(1491), 1,
-      anon_sym_LBRACK,
-    ACTIONS(1493), 1,
-      anon_sym_STAR_STAR,
-    ACTIONS(1481), 2,
+    ACTIONS(1563), 6,
+      anon_sym_as,
       anon_sym_STAR,
-      anon_sym_SLASH,
-    STATE(633), 2,
-      sym_argument_list,
-      sym_generator_expression,
-    ACTIONS(1497), 3,
-      anon_sym_AT,
-      anon_sym_PERCENT,
-      anon_sym_SLASH_SLASH,
-    ACTIONS(1573), 3,
       anon_sym_EQ,
+      anon_sym_SLASH,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1571), 25,
+    ACTIONS(1561), 34,
+      anon_sym_DOT,
+      anon_sym_LPAREN,
       anon_sym_RPAREN,
       anon_sym_COMMA,
       anon_sym_GT_GT,
       anon_sym_if,
       anon_sym_COLON,
       anon_sym_else,
+      anon_sym_async,
+      anon_sym_for,
       anon_sym_in,
       anon_sym_PIPE,
       anon_sym_DASH,
       anon_sym_PLUS,
+      anon_sym_LBRACK,
       anon_sym_RBRACK,
       anon_sym_RBRACE,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
       anon_sym_not,
       anon_sym_and,
       anon_sym_or,
+      anon_sym_PERCENT,
+      anon_sym_SLASH_SLASH,
       anon_sym_AMP,
       anon_sym_CARET,
       anon_sym_LT_LT,
@@ -56445,263 +51940,44 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_LT_GT,
       anon_sym_is,
       sym_type_conversion,
-  [35827] = 15,
+  [34770] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1475), 1,
-      anon_sym_DOT,
-    ACTIONS(1477), 1,
-      anon_sym_LPAREN,
-    ACTIONS(1491), 1,
-      anon_sym_LBRACK,
-    ACTIONS(1549), 1,
-      anon_sym_PIPE,
-    ACTIONS(1553), 1,
-      anon_sym_STAR_STAR,
-    ACTIONS(1559), 1,
-      anon_sym_AMP,
-    ACTIONS(1561), 1,
-      anon_sym_CARET,
-    ACTIONS(1543), 2,
-      anon_sym_STAR,
-      anon_sym_SLASH,
-    ACTIONS(1545), 2,
-      anon_sym_GT_GT,
-      anon_sym_LT_LT,
-    ACTIONS(1551), 2,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-    STATE(633), 2,
-      sym_argument_list,
-      sym_generator_expression,
-    ACTIONS(1555), 3,
-      anon_sym_AT,
-      anon_sym_PERCENT,
-      anon_sym_SLASH_SLASH,
-    ACTIONS(1581), 3,
-      anon_sym_as,
-      anon_sym_LT,
-      anon_sym_GT,
-    ACTIONS(1579), 18,
-      anon_sym_RPAREN,
-      anon_sym_COMMA,
-      anon_sym_if,
-      anon_sym_COLON,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_in,
-      anon_sym_RBRACK,
-      anon_sym_RBRACE,
-      anon_sym_not,
-      anon_sym_and,
-      anon_sym_or,
-      anon_sym_LT_EQ,
-      anon_sym_EQ_EQ,
-      anon_sym_BANG_EQ,
-      anon_sym_GT_EQ,
-      anon_sym_LT_GT,
-      anon_sym_is,
-  [35898] = 14,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1475), 1,
-      anon_sym_DOT,
-    ACTIONS(1477), 1,
-      anon_sym_LPAREN,
-    ACTIONS(1491), 1,
-      anon_sym_LBRACK,
-    ACTIONS(1553), 1,
-      anon_sym_STAR_STAR,
-    ACTIONS(1559), 1,
-      anon_sym_AMP,
-    ACTIONS(1561), 1,
-      anon_sym_CARET,
-    ACTIONS(1543), 2,
-      anon_sym_STAR,
-      anon_sym_SLASH,
-    ACTIONS(1545), 2,
-      anon_sym_GT_GT,
-      anon_sym_LT_LT,
-    ACTIONS(1551), 2,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-    STATE(633), 2,
-      sym_argument_list,
-      sym_generator_expression,
-    ACTIONS(1555), 3,
-      anon_sym_AT,
-      anon_sym_PERCENT,
-      anon_sym_SLASH_SLASH,
-    ACTIONS(1573), 3,
-      anon_sym_as,
-      anon_sym_LT,
-      anon_sym_GT,
-    ACTIONS(1571), 19,
-      anon_sym_RPAREN,
-      anon_sym_COMMA,
-      anon_sym_if,
-      anon_sym_COLON,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_in,
-      anon_sym_PIPE,
-      anon_sym_RBRACK,
-      anon_sym_RBRACE,
-      anon_sym_not,
-      anon_sym_and,
-      anon_sym_or,
-      anon_sym_LT_EQ,
-      anon_sym_EQ_EQ,
-      anon_sym_BANG_EQ,
-      anon_sym_GT_EQ,
-      anon_sym_LT_GT,
-      anon_sym_is,
-  [35967] = 10,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1475), 1,
-      anon_sym_DOT,
-    ACTIONS(1477), 1,
-      anon_sym_LPAREN,
-    ACTIONS(1491), 1,
-      anon_sym_LBRACK,
-    ACTIONS(1553), 1,
-      anon_sym_STAR_STAR,
-    ACTIONS(1543), 2,
-      anon_sym_STAR,
-      anon_sym_SLASH,
-    STATE(633), 2,
-      sym_argument_list,
-      sym_generator_expression,
-    ACTIONS(1555), 3,
-      anon_sym_AT,
-      anon_sym_PERCENT,
-      anon_sym_SLASH_SLASH,
-    ACTIONS(1573), 3,
-      anon_sym_as,
-      anon_sym_LT,
-      anon_sym_GT,
-    ACTIONS(1571), 25,
-      anon_sym_RPAREN,
-      anon_sym_COMMA,
-      anon_sym_GT_GT,
-      anon_sym_if,
-      anon_sym_COLON,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_in,
-      anon_sym_PIPE,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_RBRACK,
-      anon_sym_RBRACE,
-      anon_sym_not,
-      anon_sym_and,
-      anon_sym_or,
-      anon_sym_AMP,
-      anon_sym_CARET,
-      anon_sym_LT_LT,
-      anon_sym_LT_EQ,
-      anon_sym_EQ_EQ,
-      anon_sym_BANG_EQ,
-      anon_sym_GT_EQ,
-      anon_sym_LT_GT,
-      anon_sym_is,
-  [36028] = 8,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1475), 1,
-      anon_sym_DOT,
-    ACTIONS(1477), 1,
-      anon_sym_LPAREN,
-    ACTIONS(1491), 1,
-      anon_sym_LBRACK,
-    ACTIONS(1553), 1,
-      anon_sym_STAR_STAR,
-    STATE(633), 2,
-      sym_argument_list,
-      sym_generator_expression,
-    ACTIONS(1573), 5,
+    ACTIONS(1559), 6,
       anon_sym_as,
       anon_sym_STAR,
-      anon_sym_SLASH,
-      anon_sym_LT,
-      anon_sym_GT,
-    ACTIONS(1571), 28,
-      anon_sym_RPAREN,
-      anon_sym_COMMA,
-      anon_sym_GT_GT,
-      anon_sym_if,
-      anon_sym_COLON,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_in,
-      anon_sym_PIPE,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_RBRACK,
-      anon_sym_RBRACE,
-      anon_sym_AT,
-      anon_sym_not,
-      anon_sym_and,
-      anon_sym_or,
-      anon_sym_PERCENT,
-      anon_sym_SLASH_SLASH,
-      anon_sym_AMP,
-      anon_sym_CARET,
-      anon_sym_LT_LT,
-      anon_sym_LT_EQ,
-      anon_sym_EQ_EQ,
-      anon_sym_BANG_EQ,
-      anon_sym_GT_EQ,
-      anon_sym_LT_GT,
-      anon_sym_is,
-  [36085] = 12,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1475), 1,
-      anon_sym_DOT,
-    ACTIONS(1477), 1,
-      anon_sym_LPAREN,
-    ACTIONS(1491), 1,
-      anon_sym_LBRACK,
-    ACTIONS(1493), 1,
-      anon_sym_STAR_STAR,
-    ACTIONS(1481), 2,
-      anon_sym_STAR,
-      anon_sym_SLASH,
-    ACTIONS(1483), 2,
-      anon_sym_GT_GT,
-      anon_sym_LT_LT,
-    ACTIONS(1489), 2,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-    STATE(633), 2,
-      sym_argument_list,
-      sym_generator_expression,
-    ACTIONS(1497), 3,
-      anon_sym_AT,
-      anon_sym_PERCENT,
-      anon_sym_SLASH_SLASH,
-    ACTIONS(1573), 3,
       anon_sym_EQ,
+      anon_sym_SLASH,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1571), 21,
+    ACTIONS(1557), 34,
+      anon_sym_DOT,
+      anon_sym_LPAREN,
       anon_sym_RPAREN,
       anon_sym_COMMA,
+      anon_sym_GT_GT,
       anon_sym_if,
       anon_sym_COLON,
       anon_sym_else,
+      anon_sym_async,
+      anon_sym_for,
       anon_sym_in,
       anon_sym_PIPE,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_LBRACK,
       anon_sym_RBRACK,
       anon_sym_RBRACE,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
       anon_sym_not,
       anon_sym_and,
       anon_sym_or,
+      anon_sym_PERCENT,
+      anon_sym_SLASH_SLASH,
       anon_sym_AMP,
       anon_sym_CARET,
+      anon_sym_LT_LT,
       anon_sym_LT_EQ,
       anon_sym_EQ_EQ,
       anon_sym_BANG_EQ,
@@ -56709,38 +51985,38 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_LT_GT,
       anon_sym_is,
       sym_type_conversion,
-  [36150] = 12,
+  [34818] = 12,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1475), 1,
+    ACTIONS(1407), 1,
       anon_sym_DOT,
-    ACTIONS(1477), 1,
+    ACTIONS(1409), 1,
       anon_sym_LPAREN,
-    ACTIONS(1491), 1,
+    ACTIONS(1425), 1,
       anon_sym_LBRACK,
-    ACTIONS(1553), 1,
+    ACTIONS(1427), 1,
       anon_sym_STAR_STAR,
-    ACTIONS(1543), 2,
+    ACTIONS(1415), 2,
       anon_sym_STAR,
       anon_sym_SLASH,
-    ACTIONS(1545), 2,
+    ACTIONS(1417), 2,
       anon_sym_GT_GT,
       anon_sym_LT_LT,
-    ACTIONS(1551), 2,
+    ACTIONS(1423), 2,
       anon_sym_DASH,
       anon_sym_PLUS,
-    STATE(633), 2,
+    STATE(619), 2,
       sym_argument_list,
       sym_generator_expression,
-    ACTIONS(1555), 3,
+    ACTIONS(1429), 3,
       anon_sym_AT,
       anon_sym_PERCENT,
       anon_sym_SLASH_SLASH,
-    ACTIONS(1573), 3,
+    ACTIONS(1567), 3,
       anon_sym_as,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1571), 21,
+    ACTIONS(1565), 21,
       anon_sym_RPAREN,
       anon_sym_COMMA,
       anon_sym_if,
@@ -56762,314 +52038,93 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_GT_EQ,
       anon_sym_LT_GT,
       anon_sym_is,
-  [36215] = 14,
+  [34883] = 8,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1475), 1,
+    ACTIONS(1407), 1,
       anon_sym_DOT,
-    ACTIONS(1477), 1,
+    ACTIONS(1409), 1,
       anon_sym_LPAREN,
-    ACTIONS(1491), 1,
+    ACTIONS(1425), 1,
       anon_sym_LBRACK,
-    ACTIONS(1493), 1,
+    ACTIONS(1427), 1,
       anon_sym_STAR_STAR,
-    ACTIONS(1501), 1,
-      anon_sym_AMP,
-    ACTIONS(1503), 1,
-      anon_sym_CARET,
-    ACTIONS(1481), 2,
-      anon_sym_STAR,
-      anon_sym_SLASH,
-    ACTIONS(1483), 2,
-      anon_sym_GT_GT,
-      anon_sym_LT_LT,
-    ACTIONS(1489), 2,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-    STATE(633), 2,
+    STATE(619), 2,
       sym_argument_list,
       sym_generator_expression,
-    ACTIONS(1497), 3,
+    ACTIONS(1567), 5,
+      anon_sym_as,
+      anon_sym_STAR,
+      anon_sym_SLASH,
+      anon_sym_LT,
+      anon_sym_GT,
+    ACTIONS(1565), 28,
+      anon_sym_RPAREN,
+      anon_sym_COMMA,
+      anon_sym_GT_GT,
+      anon_sym_if,
+      anon_sym_COLON,
+      anon_sym_async,
+      anon_sym_for,
+      anon_sym_in,
+      anon_sym_PIPE,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_RBRACK,
+      anon_sym_RBRACE,
+      anon_sym_AT,
+      anon_sym_not,
+      anon_sym_and,
+      anon_sym_or,
+      anon_sym_PERCENT,
+      anon_sym_SLASH_SLASH,
+      anon_sym_AMP,
+      anon_sym_CARET,
+      anon_sym_LT_LT,
+      anon_sym_LT_EQ,
+      anon_sym_EQ_EQ,
+      anon_sym_BANG_EQ,
+      anon_sym_GT_EQ,
+      anon_sym_LT_GT,
+      anon_sym_is,
+  [34940] = 15,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1407), 1,
+      anon_sym_DOT,
+    ACTIONS(1409), 1,
+      anon_sym_LPAREN,
+    ACTIONS(1425), 1,
+      anon_sym_LBRACK,
+    ACTIONS(1527), 1,
+      anon_sym_PIPE,
+    ACTIONS(1531), 1,
+      anon_sym_STAR_STAR,
+    ACTIONS(1537), 1,
+      anon_sym_AMP,
+    ACTIONS(1539), 1,
+      anon_sym_CARET,
+    ACTIONS(1521), 2,
+      anon_sym_STAR,
+      anon_sym_SLASH,
+    ACTIONS(1523), 2,
+      anon_sym_GT_GT,
+      anon_sym_LT_LT,
+    ACTIONS(1529), 2,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+    STATE(619), 2,
+      sym_argument_list,
+      sym_generator_expression,
+    ACTIONS(1533), 3,
       anon_sym_AT,
       anon_sym_PERCENT,
       anon_sym_SLASH_SLASH,
-    ACTIONS(1573), 3,
+    ACTIONS(1571), 3,
       anon_sym_EQ,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1571), 19,
-      anon_sym_RPAREN,
-      anon_sym_COMMA,
-      anon_sym_if,
-      anon_sym_COLON,
-      anon_sym_else,
-      anon_sym_in,
-      anon_sym_PIPE,
-      anon_sym_RBRACK,
-      anon_sym_RBRACE,
-      anon_sym_not,
-      anon_sym_and,
-      anon_sym_or,
-      anon_sym_LT_EQ,
-      anon_sym_EQ_EQ,
-      anon_sym_BANG_EQ,
-      anon_sym_GT_EQ,
-      anon_sym_LT_GT,
-      anon_sym_is,
-      sym_type_conversion,
-  [36284] = 15,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1475), 1,
-      anon_sym_DOT,
-    ACTIONS(1477), 1,
-      anon_sym_LPAREN,
-    ACTIONS(1491), 1,
-      anon_sym_LBRACK,
-    ACTIONS(1549), 1,
-      anon_sym_PIPE,
-    ACTIONS(1553), 1,
-      anon_sym_STAR_STAR,
-    ACTIONS(1559), 1,
-      anon_sym_AMP,
-    ACTIONS(1561), 1,
-      anon_sym_CARET,
-    ACTIONS(1543), 2,
-      anon_sym_STAR,
-      anon_sym_SLASH,
-    ACTIONS(1545), 2,
-      anon_sym_GT_GT,
-      anon_sym_LT_LT,
-    ACTIONS(1551), 2,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-    STATE(633), 2,
-      sym_argument_list,
-      sym_generator_expression,
-    ACTIONS(1555), 3,
-      anon_sym_AT,
-      anon_sym_PERCENT,
-      anon_sym_SLASH_SLASH,
-    ACTIONS(1585), 3,
-      anon_sym_as,
-      anon_sym_LT,
-      anon_sym_GT,
-    ACTIONS(1583), 18,
-      anon_sym_RPAREN,
-      anon_sym_COMMA,
-      anon_sym_if,
-      anon_sym_COLON,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_in,
-      anon_sym_RBRACK,
-      anon_sym_RBRACE,
-      anon_sym_not,
-      anon_sym_and,
-      anon_sym_or,
-      anon_sym_LT_EQ,
-      anon_sym_EQ_EQ,
-      anon_sym_BANG_EQ,
-      anon_sym_GT_EQ,
-      anon_sym_LT_GT,
-      anon_sym_is,
-  [36355] = 13,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1475), 1,
-      anon_sym_DOT,
-    ACTIONS(1477), 1,
-      anon_sym_LPAREN,
-    ACTIONS(1491), 1,
-      anon_sym_LBRACK,
-    ACTIONS(1553), 1,
-      anon_sym_STAR_STAR,
-    ACTIONS(1561), 1,
-      anon_sym_CARET,
-    ACTIONS(1543), 2,
-      anon_sym_STAR,
-      anon_sym_SLASH,
-    ACTIONS(1545), 2,
-      anon_sym_GT_GT,
-      anon_sym_LT_LT,
-    ACTIONS(1551), 2,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-    STATE(633), 2,
-      sym_argument_list,
-      sym_generator_expression,
-    ACTIONS(1555), 3,
-      anon_sym_AT,
-      anon_sym_PERCENT,
-      anon_sym_SLASH_SLASH,
-    ACTIONS(1573), 3,
-      anon_sym_as,
-      anon_sym_LT,
-      anon_sym_GT,
-    ACTIONS(1571), 20,
-      anon_sym_RPAREN,
-      anon_sym_COMMA,
-      anon_sym_if,
-      anon_sym_COLON,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_in,
-      anon_sym_PIPE,
-      anon_sym_RBRACK,
-      anon_sym_RBRACE,
-      anon_sym_not,
-      anon_sym_and,
-      anon_sym_or,
-      anon_sym_AMP,
-      anon_sym_LT_EQ,
-      anon_sym_EQ_EQ,
-      anon_sym_BANG_EQ,
-      anon_sym_GT_EQ,
-      anon_sym_LT_GT,
-      anon_sym_is,
-  [36422] = 8,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1475), 1,
-      anon_sym_DOT,
-    ACTIONS(1477), 1,
-      anon_sym_LPAREN,
-    ACTIONS(1491), 1,
-      anon_sym_LBRACK,
-    ACTIONS(1553), 1,
-      anon_sym_STAR_STAR,
-    STATE(633), 2,
-      sym_argument_list,
-      sym_generator_expression,
-    ACTIONS(1577), 5,
-      anon_sym_as,
-      anon_sym_STAR,
-      anon_sym_SLASH,
-      anon_sym_LT,
-      anon_sym_GT,
-    ACTIONS(1575), 28,
-      anon_sym_RPAREN,
-      anon_sym_COMMA,
-      anon_sym_GT_GT,
-      anon_sym_if,
-      anon_sym_COLON,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_in,
-      anon_sym_PIPE,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_RBRACK,
-      anon_sym_RBRACE,
-      anon_sym_AT,
-      anon_sym_not,
-      anon_sym_and,
-      anon_sym_or,
-      anon_sym_PERCENT,
-      anon_sym_SLASH_SLASH,
-      anon_sym_AMP,
-      anon_sym_CARET,
-      anon_sym_LT_LT,
-      anon_sym_LT_EQ,
-      anon_sym_EQ_EQ,
-      anon_sym_BANG_EQ,
-      anon_sym_GT_EQ,
-      anon_sym_LT_GT,
-      anon_sym_is,
-  [36479] = 15,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1475), 1,
-      anon_sym_DOT,
-    ACTIONS(1477), 1,
-      anon_sym_LPAREN,
-    ACTIONS(1491), 1,
-      anon_sym_LBRACK,
-    ACTIONS(1549), 1,
-      anon_sym_PIPE,
-    ACTIONS(1553), 1,
-      anon_sym_STAR_STAR,
-    ACTIONS(1559), 1,
-      anon_sym_AMP,
-    ACTIONS(1561), 1,
-      anon_sym_CARET,
-    ACTIONS(1543), 2,
-      anon_sym_STAR,
-      anon_sym_SLASH,
-    ACTIONS(1545), 2,
-      anon_sym_GT_GT,
-      anon_sym_LT_LT,
-    ACTIONS(1551), 2,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-    STATE(633), 2,
-      sym_argument_list,
-      sym_generator_expression,
-    ACTIONS(1555), 3,
-      anon_sym_AT,
-      anon_sym_PERCENT,
-      anon_sym_SLASH_SLASH,
-    ACTIONS(1589), 3,
-      anon_sym_as,
-      anon_sym_LT,
-      anon_sym_GT,
-    ACTIONS(1587), 18,
-      anon_sym_RPAREN,
-      anon_sym_COMMA,
-      anon_sym_if,
-      anon_sym_COLON,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_in,
-      anon_sym_RBRACK,
-      anon_sym_RBRACE,
-      anon_sym_not,
-      anon_sym_and,
-      anon_sym_or,
-      anon_sym_LT_EQ,
-      anon_sym_EQ_EQ,
-      anon_sym_BANG_EQ,
-      anon_sym_GT_EQ,
-      anon_sym_LT_GT,
-      anon_sym_is,
-  [36550] = 15,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1475), 1,
-      anon_sym_DOT,
-    ACTIONS(1477), 1,
-      anon_sym_LPAREN,
-    ACTIONS(1487), 1,
-      anon_sym_PIPE,
-    ACTIONS(1491), 1,
-      anon_sym_LBRACK,
-    ACTIONS(1493), 1,
-      anon_sym_STAR_STAR,
-    ACTIONS(1501), 1,
-      anon_sym_AMP,
-    ACTIONS(1503), 1,
-      anon_sym_CARET,
-    ACTIONS(1481), 2,
-      anon_sym_STAR,
-      anon_sym_SLASH,
-    ACTIONS(1483), 2,
-      anon_sym_GT_GT,
-      anon_sym_LT_LT,
-    ACTIONS(1489), 2,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-    STATE(633), 2,
-      sym_argument_list,
-      sym_generator_expression,
-    ACTIONS(1497), 3,
-      anon_sym_AT,
-      anon_sym_PERCENT,
-      anon_sym_SLASH_SLASH,
-    ACTIONS(1589), 3,
-      anon_sym_EQ,
-      anon_sym_LT,
-      anon_sym_GT,
-    ACTIONS(1587), 18,
+    ACTIONS(1569), 18,
       anon_sym_RPAREN,
       anon_sym_COMMA,
       anon_sym_if,
@@ -57088,1844 +52143,45 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_LT_GT,
       anon_sym_is,
       sym_type_conversion,
-  [36621] = 15,
+  [35011] = 14,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1475), 1,
-      anon_sym_DOT,
-    ACTIONS(1477), 1,
+    ACTIONS(592), 1,
       anon_sym_LPAREN,
-    ACTIONS(1487), 1,
-      anon_sym_PIPE,
-    ACTIONS(1491), 1,
+    ACTIONS(600), 1,
       anon_sym_LBRACK,
-    ACTIONS(1493), 1,
-      anon_sym_STAR_STAR,
-    ACTIONS(1501), 1,
-      anon_sym_AMP,
-    ACTIONS(1503), 1,
-      anon_sym_CARET,
-    ACTIONS(1481), 2,
-      anon_sym_STAR,
-      anon_sym_SLASH,
-    ACTIONS(1483), 2,
-      anon_sym_GT_GT,
-      anon_sym_LT_LT,
-    ACTIONS(1489), 2,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-    STATE(633), 2,
-      sym_argument_list,
-      sym_generator_expression,
-    ACTIONS(1497), 3,
-      anon_sym_AT,
-      anon_sym_PERCENT,
-      anon_sym_SLASH_SLASH,
-    ACTIONS(1585), 3,
-      anon_sym_EQ,
-      anon_sym_LT,
-      anon_sym_GT,
-    ACTIONS(1583), 18,
-      anon_sym_RPAREN,
-      anon_sym_COMMA,
-      anon_sym_if,
-      anon_sym_COLON,
-      anon_sym_else,
-      anon_sym_in,
-      anon_sym_RBRACK,
-      anon_sym_RBRACE,
-      anon_sym_not,
-      anon_sym_and,
-      anon_sym_or,
-      anon_sym_LT_EQ,
-      anon_sym_EQ_EQ,
-      anon_sym_BANG_EQ,
-      anon_sym_GT_EQ,
-      anon_sym_LT_GT,
-      anon_sym_is,
-      sym_type_conversion,
-  [36692] = 15,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1475), 1,
-      anon_sym_DOT,
-    ACTIONS(1477), 1,
-      anon_sym_LPAREN,
-    ACTIONS(1487), 1,
-      anon_sym_PIPE,
-    ACTIONS(1491), 1,
-      anon_sym_LBRACK,
-    ACTIONS(1493), 1,
-      anon_sym_STAR_STAR,
-    ACTIONS(1501), 1,
-      anon_sym_AMP,
-    ACTIONS(1503), 1,
-      anon_sym_CARET,
-    ACTIONS(1481), 2,
-      anon_sym_STAR,
-      anon_sym_SLASH,
-    ACTIONS(1483), 2,
-      anon_sym_GT_GT,
-      anon_sym_LT_LT,
-    ACTIONS(1489), 2,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-    STATE(633), 2,
-      sym_argument_list,
-      sym_generator_expression,
-    ACTIONS(1497), 3,
-      anon_sym_AT,
-      anon_sym_PERCENT,
-      anon_sym_SLASH_SLASH,
-    ACTIONS(1581), 3,
-      anon_sym_EQ,
-      anon_sym_LT,
-      anon_sym_GT,
-    ACTIONS(1579), 18,
-      anon_sym_RPAREN,
-      anon_sym_COMMA,
-      anon_sym_if,
-      anon_sym_COLON,
-      anon_sym_else,
-      anon_sym_in,
-      anon_sym_RBRACK,
-      anon_sym_RBRACE,
-      anon_sym_not,
-      anon_sym_and,
-      anon_sym_or,
-      anon_sym_LT_EQ,
-      anon_sym_EQ_EQ,
-      anon_sym_BANG_EQ,
-      anon_sym_GT_EQ,
-      anon_sym_LT_GT,
-      anon_sym_is,
-      sym_type_conversion,
-  [36763] = 11,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1475), 1,
-      anon_sym_DOT,
-    ACTIONS(1477), 1,
-      anon_sym_LPAREN,
-    ACTIONS(1491), 1,
-      anon_sym_LBRACK,
-    ACTIONS(1493), 1,
-      anon_sym_STAR_STAR,
-    ACTIONS(1481), 2,
-      anon_sym_STAR,
-      anon_sym_SLASH,
-    ACTIONS(1489), 2,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-    STATE(633), 2,
-      sym_argument_list,
-      sym_generator_expression,
-    ACTIONS(1497), 3,
-      anon_sym_AT,
-      anon_sym_PERCENT,
-      anon_sym_SLASH_SLASH,
-    ACTIONS(1573), 3,
-      anon_sym_EQ,
-      anon_sym_LT,
-      anon_sym_GT,
-    ACTIONS(1571), 23,
-      anon_sym_RPAREN,
-      anon_sym_COMMA,
-      anon_sym_GT_GT,
-      anon_sym_if,
-      anon_sym_COLON,
-      anon_sym_else,
-      anon_sym_in,
-      anon_sym_PIPE,
-      anon_sym_RBRACK,
-      anon_sym_RBRACE,
-      anon_sym_not,
-      anon_sym_and,
-      anon_sym_or,
-      anon_sym_AMP,
-      anon_sym_CARET,
-      anon_sym_LT_LT,
-      anon_sym_LT_EQ,
-      anon_sym_EQ_EQ,
-      anon_sym_BANG_EQ,
-      anon_sym_GT_EQ,
-      anon_sym_LT_GT,
-      anon_sym_is,
-      sym_type_conversion,
-  [36826] = 4,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1591), 1,
-      anon_sym_COLON_EQ,
-    ACTIONS(1053), 6,
-      anon_sym_as,
-      anon_sym_STAR,
-      anon_sym_COLON,
-      anon_sym_SLASH,
-      anon_sym_LT,
-      anon_sym_GT,
-    ACTIONS(1048), 31,
-      anon_sym_DOT,
-      anon_sym_LPAREN,
-      anon_sym_RPAREN,
-      anon_sym_COMMA,
-      anon_sym_GT_GT,
-      anon_sym_if,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_in,
-      anon_sym_PIPE,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_RBRACK,
-      anon_sym_RBRACE,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_not,
-      anon_sym_and,
-      anon_sym_or,
-      anon_sym_PERCENT,
-      anon_sym_SLASH_SLASH,
-      anon_sym_AMP,
-      anon_sym_CARET,
-      anon_sym_LT_LT,
-      anon_sym_LT_EQ,
-      anon_sym_EQ_EQ,
-      anon_sym_BANG_EQ,
-      anon_sym_GT_EQ,
-      anon_sym_LT_GT,
-      anon_sym_is,
-  [36874] = 4,
-    ACTIONS(3), 1,
-      sym_comment,
+    ACTIONS(602), 1,
+      anon_sym_LBRACE,
+    ACTIONS(606), 1,
+      anon_sym_await,
     ACTIONS(608), 1,
-      anon_sym_COLON_EQ,
-    ACTIONS(276), 6,
-      anon_sym_as,
-      anon_sym_STAR,
-      anon_sym_COLON,
-      anon_sym_SLASH,
-      anon_sym_LT,
-      anon_sym_GT,
-    ACTIONS(303), 31,
-      anon_sym_DOT,
-      anon_sym_LPAREN,
-      anon_sym_RPAREN,
-      anon_sym_COMMA,
-      anon_sym_GT_GT,
-      anon_sym_if,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_in,
-      anon_sym_PIPE,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_RBRACK,
-      anon_sym_RBRACE,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
+      sym__string_start,
+    ACTIONS(1573), 1,
       anon_sym_not,
-      anon_sym_and,
-      anon_sym_or,
-      anon_sym_PERCENT,
-      anon_sym_SLASH_SLASH,
-      anon_sym_AMP,
-      anon_sym_CARET,
-      anon_sym_LT_LT,
-      anon_sym_LT_EQ,
-      anon_sym_EQ_EQ,
-      anon_sym_BANG_EQ,
-      anon_sym_GT_EQ,
-      anon_sym_LT_GT,
-      anon_sym_is,
-  [36922] = 13,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(51), 1,
-      anon_sym_LBRACE,
-    ACTIONS(81), 1,
-      sym__string_start,
-    ACTIONS(559), 1,
-      anon_sym_LPAREN,
-    ACTIONS(563), 1,
-      anon_sym_LBRACK,
-    ACTIONS(1595), 1,
-      anon_sym_not,
-    STATE(713), 1,
-      sym_string,
-    STATE(733), 1,
-      sym_primary_expression,
-    ACTIONS(75), 2,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(47), 3,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_TILDE,
-    ACTIONS(77), 5,
-      sym_integer,
-      sym_identifier,
-      sym_true,
-      sym_false,
-      sym_none,
-    ACTIONS(1593), 6,
-      anon_sym_print,
-      anon_sym_async,
-      anon_sym_match,
-      anon_sym_exec,
-      anon_sym_type,
-      anon_sym_await,
-    STATE(797), 15,
-      sym_binary_operator,
-      sym_unary_operator,
-      sym_attribute,
-      sym_subscript,
-      sym_call,
-      sym_list,
-      sym_set,
-      sym_tuple,
-      sym_dictionary,
-      sym_list_comprehension,
-      sym_dictionary_comprehension,
-      sym_set_comprehension,
-      sym_generator_expression,
-      sym_parenthesized_expression,
-      sym_concatenated_string,
-  [36988] = 13,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(624), 1,
-      anon_sym_LPAREN,
-    ACTIONS(632), 1,
-      anon_sym_LBRACK,
-    ACTIONS(634), 1,
-      anon_sym_LBRACE,
-    ACTIONS(646), 1,
-      sym__string_start,
-    ACTIONS(1599), 1,
-      anon_sym_not,
-    STATE(742), 1,
-      sym_string,
-    STATE(751), 1,
-      sym_primary_expression,
-    ACTIONS(640), 2,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(630), 3,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_TILDE,
-    ACTIONS(642), 5,
-      sym_integer,
-      sym_identifier,
-      sym_true,
-      sym_false,
-      sym_none,
-    ACTIONS(1597), 6,
-      anon_sym_print,
-      anon_sym_async,
-      anon_sym_match,
-      anon_sym_exec,
-      anon_sym_type,
-      anon_sym_await,
-    STATE(811), 15,
-      sym_binary_operator,
-      sym_unary_operator,
-      sym_attribute,
-      sym_subscript,
-      sym_call,
-      sym_list,
-      sym_set,
-      sym_tuple,
-      sym_dictionary,
-      sym_list_comprehension,
-      sym_dictionary_comprehension,
-      sym_set_comprehension,
-      sym_generator_expression,
-      sym_parenthesized_expression,
-      sym_concatenated_string,
-  [37054] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1151), 5,
-      anon_sym_STAR,
-      anon_sym_EQ,
-      anon_sym_SLASH,
-      anon_sym_LT,
-      anon_sym_GT,
-    ACTIONS(1146), 33,
-      anon_sym_DOT,
-      anon_sym_LPAREN,
-      anon_sym_RPAREN,
-      anon_sym_COMMA,
-      anon_sym_as,
-      anon_sym_GT_GT,
-      anon_sym_if,
-      anon_sym_COLON,
-      anon_sym_else,
-      anon_sym_in,
-      anon_sym_PIPE,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_RBRACK,
-      anon_sym_RBRACE,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_not,
-      anon_sym_and,
-      anon_sym_or,
-      anon_sym_PERCENT,
-      anon_sym_SLASH_SLASH,
-      anon_sym_AMP,
-      anon_sym_CARET,
-      anon_sym_LT_LT,
-      anon_sym_LT_EQ,
-      anon_sym_EQ_EQ,
-      anon_sym_BANG_EQ,
-      anon_sym_GT_EQ,
-      anon_sym_LT_GT,
-      anon_sym_is,
-      sym_type_conversion,
-  [37100] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1170), 5,
-      anon_sym_STAR,
-      anon_sym_EQ,
-      anon_sym_SLASH,
-      anon_sym_LT,
-      anon_sym_GT,
-    ACTIONS(1165), 33,
-      anon_sym_DOT,
-      anon_sym_LPAREN,
-      anon_sym_RPAREN,
-      anon_sym_COMMA,
-      anon_sym_as,
-      anon_sym_GT_GT,
-      anon_sym_if,
-      anon_sym_COLON,
-      anon_sym_else,
-      anon_sym_in,
-      anon_sym_PIPE,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_RBRACK,
-      anon_sym_RBRACE,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_not,
-      anon_sym_and,
-      anon_sym_or,
-      anon_sym_PERCENT,
-      anon_sym_SLASH_SLASH,
-      anon_sym_AMP,
-      anon_sym_CARET,
-      anon_sym_LT_LT,
-      anon_sym_LT_EQ,
-      anon_sym_EQ_EQ,
-      anon_sym_BANG_EQ,
-      anon_sym_GT_EQ,
-      anon_sym_LT_GT,
-      anon_sym_is,
-      sym_type_conversion,
-  [37146] = 13,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(278), 1,
-      anon_sym_LPAREN,
-    ACTIONS(293), 1,
-      anon_sym_LBRACK,
-    ACTIONS(295), 1,
-      anon_sym_LBRACE,
-    ACTIONS(315), 1,
-      sym__string_start,
-    ACTIONS(1603), 1,
-      anon_sym_not,
-    STATE(600), 1,
-      sym_string,
-    STATE(665), 1,
-      sym_primary_expression,
-    ACTIONS(309), 2,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(301), 3,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_TILDE,
-    ACTIONS(311), 5,
-      sym_integer,
-      sym_identifier,
-      sym_true,
-      sym_false,
-      sym_none,
-    ACTIONS(1601), 6,
-      anon_sym_print,
-      anon_sym_async,
-      anon_sym_match,
-      anon_sym_exec,
-      anon_sym_type,
-      anon_sym_await,
-    STATE(642), 15,
-      sym_binary_operator,
-      sym_unary_operator,
-      sym_attribute,
-      sym_subscript,
-      sym_call,
-      sym_list,
-      sym_set,
-      sym_tuple,
-      sym_dictionary,
-      sym_list_comprehension,
-      sym_dictionary_comprehension,
-      sym_set_comprehension,
-      sym_generator_expression,
-      sym_parenthesized_expression,
-      sym_concatenated_string,
-  [37212] = 4,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1074), 1,
-      anon_sym_COLON_EQ,
-    ACTIONS(1053), 6,
-      anon_sym_STAR,
-      anon_sym_COLON,
-      anon_sym_EQ,
-      anon_sym_SLASH,
-      anon_sym_LT,
-      anon_sym_GT,
-    ACTIONS(1048), 31,
-      anon_sym_DOT,
-      anon_sym_LPAREN,
-      anon_sym_RPAREN,
-      anon_sym_COMMA,
-      anon_sym_GT_GT,
-      anon_sym_if,
-      anon_sym_else,
-      anon_sym_in,
-      anon_sym_PIPE,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_RBRACK,
-      anon_sym_RBRACE,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_not,
-      anon_sym_and,
-      anon_sym_or,
-      anon_sym_PERCENT,
-      anon_sym_SLASH_SLASH,
-      anon_sym_AMP,
-      anon_sym_CARET,
-      anon_sym_LT_LT,
-      anon_sym_LT_EQ,
-      anon_sym_EQ_EQ,
-      anon_sym_BANG_EQ,
-      anon_sym_GT_EQ,
-      anon_sym_LT_GT,
-      anon_sym_is,
-      sym_type_conversion,
-  [37260] = 4,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(568), 1,
-      anon_sym_COLON_EQ,
-    ACTIONS(276), 6,
-      anon_sym_STAR,
-      anon_sym_COLON,
-      anon_sym_EQ,
-      anon_sym_SLASH,
-      anon_sym_LT,
-      anon_sym_GT,
-    ACTIONS(303), 31,
-      anon_sym_DOT,
-      anon_sym_LPAREN,
-      anon_sym_RPAREN,
-      anon_sym_COMMA,
-      anon_sym_GT_GT,
-      anon_sym_if,
-      anon_sym_else,
-      anon_sym_in,
-      anon_sym_PIPE,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_RBRACK,
-      anon_sym_RBRACE,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_not,
-      anon_sym_and,
-      anon_sym_or,
-      anon_sym_PERCENT,
-      anon_sym_SLASH_SLASH,
-      anon_sym_AMP,
-      anon_sym_CARET,
-      anon_sym_LT_LT,
-      anon_sym_LT_EQ,
-      anon_sym_EQ_EQ,
-      anon_sym_BANG_EQ,
-      anon_sym_GT_EQ,
-      anon_sym_LT_GT,
-      anon_sym_is,
-      sym_type_conversion,
-  [37308] = 13,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(295), 1,
-      anon_sym_LBRACE,
-    ACTIONS(315), 1,
-      sym__string_start,
-    ACTIONS(604), 1,
-      anon_sym_LPAREN,
-    ACTIONS(612), 1,
-      anon_sym_LBRACK,
-    ACTIONS(1605), 1,
-      anon_sym_not,
-    STATE(600), 1,
-      sym_string,
-    STATE(652), 1,
-      sym_primary_expression,
-    ACTIONS(309), 2,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(610), 3,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_TILDE,
-    ACTIONS(311), 5,
-      sym_integer,
-      sym_identifier,
-      sym_true,
-      sym_false,
-      sym_none,
-    ACTIONS(1601), 6,
-      anon_sym_print,
-      anon_sym_async,
-      anon_sym_match,
-      anon_sym_exec,
-      anon_sym_type,
-      anon_sym_await,
-    STATE(642), 15,
-      sym_binary_operator,
-      sym_unary_operator,
-      sym_attribute,
-      sym_subscript,
-      sym_call,
-      sym_list,
-      sym_set,
-      sym_tuple,
-      sym_dictionary,
-      sym_list_comprehension,
-      sym_dictionary_comprehension,
-      sym_set_comprehension,
-      sym_generator_expression,
-      sym_parenthesized_expression,
-      sym_concatenated_string,
-  [37374] = 5,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1607), 1,
-      sym__string_start,
-    STATE(677), 2,
-      sym_string,
-      aux_sym_concatenated_string_repeat1,
-    ACTIONS(1394), 4,
-      anon_sym_STAR,
-      anon_sym_SLASH,
-      anon_sym_LT,
-      anon_sym_GT,
-    ACTIONS(1392), 31,
-      anon_sym_DOT,
-      anon_sym_LPAREN,
-      anon_sym_RPAREN,
-      anon_sym_COMMA,
-      anon_sym_as,
-      anon_sym_GT_GT,
-      anon_sym_if,
-      anon_sym_COLON,
-      anon_sym_in,
-      anon_sym_PIPE,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_RBRACK,
-      anon_sym_RBRACE,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_not,
-      anon_sym_and,
-      anon_sym_or,
-      anon_sym_PERCENT,
-      anon_sym_SLASH_SLASH,
-      anon_sym_AMP,
-      anon_sym_CARET,
-      anon_sym_LT_LT,
-      anon_sym_LT_EQ,
-      anon_sym_EQ_EQ,
-      anon_sym_BANG_EQ,
-      anon_sym_GT_EQ,
-      anon_sym_LT_GT,
-      anon_sym_is,
-  [37424] = 5,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(646), 1,
-      sym__string_start,
-    STATE(677), 2,
-      sym_string,
-      aux_sym_concatenated_string_repeat1,
-    ACTIONS(1390), 4,
-      anon_sym_STAR,
-      anon_sym_SLASH,
-      anon_sym_LT,
-      anon_sym_GT,
-    ACTIONS(1388), 31,
-      anon_sym_DOT,
-      anon_sym_LPAREN,
-      anon_sym_RPAREN,
-      anon_sym_COMMA,
-      anon_sym_as,
-      anon_sym_GT_GT,
-      anon_sym_if,
-      anon_sym_COLON,
-      anon_sym_in,
-      anon_sym_PIPE,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_RBRACK,
-      anon_sym_RBRACE,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_not,
-      anon_sym_and,
-      anon_sym_or,
-      anon_sym_PERCENT,
-      anon_sym_SLASH_SLASH,
-      anon_sym_AMP,
-      anon_sym_CARET,
-      anon_sym_LT_LT,
-      anon_sym_LT_EQ,
-      anon_sym_EQ_EQ,
-      anon_sym_BANG_EQ,
-      anon_sym_GT_EQ,
-      anon_sym_LT_GT,
-      anon_sym_is,
-  [37474] = 12,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(278), 1,
-      anon_sym_LPAREN,
-    ACTIONS(293), 1,
-      anon_sym_LBRACK,
-    ACTIONS(295), 1,
-      anon_sym_LBRACE,
-    ACTIONS(315), 1,
-      sym__string_start,
-    STATE(600), 1,
-      sym_string,
-    STATE(663), 1,
-      sym_primary_expression,
-    ACTIONS(309), 2,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(301), 3,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_TILDE,
-    ACTIONS(311), 5,
-      sym_integer,
-      sym_identifier,
-      sym_true,
-      sym_false,
-      sym_none,
-    ACTIONS(1601), 6,
-      anon_sym_print,
-      anon_sym_async,
-      anon_sym_match,
-      anon_sym_exec,
-      anon_sym_type,
-      anon_sym_await,
-    STATE(642), 15,
-      sym_binary_operator,
-      sym_unary_operator,
-      sym_attribute,
-      sym_subscript,
-      sym_call,
-      sym_list,
-      sym_set,
-      sym_tuple,
-      sym_dictionary,
-      sym_list_comprehension,
-      sym_dictionary_comprehension,
-      sym_set_comprehension,
-      sym_generator_expression,
-      sym_parenthesized_expression,
-      sym_concatenated_string,
-  [37537] = 12,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(624), 1,
-      anon_sym_LPAREN,
-    ACTIONS(632), 1,
-      anon_sym_LBRACK,
-    ACTIONS(634), 1,
-      anon_sym_LBRACE,
-    ACTIONS(646), 1,
-      sym__string_start,
-    STATE(742), 1,
-      sym_string,
-    STATE(751), 1,
-      sym_primary_expression,
-    ACTIONS(640), 2,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(630), 3,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_TILDE,
-    ACTIONS(642), 5,
-      sym_integer,
-      sym_identifier,
-      sym_true,
-      sym_false,
-      sym_none,
-    ACTIONS(1597), 6,
-      anon_sym_print,
-      anon_sym_async,
-      anon_sym_match,
-      anon_sym_exec,
-      anon_sym_type,
-      anon_sym_await,
-    STATE(811), 15,
-      sym_binary_operator,
-      sym_unary_operator,
-      sym_attribute,
-      sym_subscript,
-      sym_call,
-      sym_list,
-      sym_set,
-      sym_tuple,
-      sym_dictionary,
-      sym_list_comprehension,
-      sym_dictionary_comprehension,
-      sym_set_comprehension,
-      sym_generator_expression,
-      sym_parenthesized_expression,
-      sym_concatenated_string,
-  [37600] = 12,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(624), 1,
-      anon_sym_LPAREN,
-    ACTIONS(632), 1,
-      anon_sym_LBRACK,
-    ACTIONS(634), 1,
-      anon_sym_LBRACE,
-    ACTIONS(646), 1,
-      sym__string_start,
-    STATE(742), 1,
-      sym_string,
-    STATE(747), 1,
-      sym_primary_expression,
-    ACTIONS(640), 2,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(630), 3,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_TILDE,
-    ACTIONS(642), 5,
-      sym_integer,
-      sym_identifier,
-      sym_true,
-      sym_false,
-      sym_none,
-    ACTIONS(1597), 6,
-      anon_sym_print,
-      anon_sym_async,
-      anon_sym_match,
-      anon_sym_exec,
-      anon_sym_type,
-      anon_sym_await,
-    STATE(811), 15,
-      sym_binary_operator,
-      sym_unary_operator,
-      sym_attribute,
-      sym_subscript,
-      sym_call,
-      sym_list,
-      sym_set,
-      sym_tuple,
-      sym_dictionary,
-      sym_list_comprehension,
-      sym_dictionary_comprehension,
-      sym_set_comprehension,
-      sym_generator_expression,
-      sym_parenthesized_expression,
-      sym_concatenated_string,
-  [37663] = 12,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(624), 1,
-      anon_sym_LPAREN,
-    ACTIONS(632), 1,
-      anon_sym_LBRACK,
-    ACTIONS(634), 1,
-      anon_sym_LBRACE,
-    ACTIONS(646), 1,
-      sym__string_start,
-    STATE(742), 1,
-      sym_string,
-    STATE(763), 1,
-      sym_primary_expression,
-    ACTIONS(640), 2,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(630), 3,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_TILDE,
-    ACTIONS(642), 5,
-      sym_integer,
-      sym_identifier,
-      sym_true,
-      sym_false,
-      sym_none,
-    ACTIONS(1597), 6,
-      anon_sym_print,
-      anon_sym_async,
-      anon_sym_match,
-      anon_sym_exec,
-      anon_sym_type,
-      anon_sym_await,
-    STATE(811), 15,
-      sym_binary_operator,
-      sym_unary_operator,
-      sym_attribute,
-      sym_subscript,
-      sym_call,
-      sym_list,
-      sym_set,
-      sym_tuple,
-      sym_dictionary,
-      sym_list_comprehension,
-      sym_dictionary_comprehension,
-      sym_set_comprehension,
-      sym_generator_expression,
-      sym_parenthesized_expression,
-      sym_concatenated_string,
-  [37726] = 12,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(624), 1,
-      anon_sym_LPAREN,
-    ACTIONS(632), 1,
-      anon_sym_LBRACK,
-    ACTIONS(634), 1,
-      anon_sym_LBRACE,
-    ACTIONS(646), 1,
-      sym__string_start,
-    STATE(742), 1,
-      sym_string,
-    STATE(766), 1,
-      sym_primary_expression,
-    ACTIONS(640), 2,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(630), 3,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_TILDE,
-    ACTIONS(642), 5,
-      sym_integer,
-      sym_identifier,
-      sym_true,
-      sym_false,
-      sym_none,
-    ACTIONS(1597), 6,
-      anon_sym_print,
-      anon_sym_async,
-      anon_sym_match,
-      anon_sym_exec,
-      anon_sym_type,
-      anon_sym_await,
-    STATE(811), 15,
-      sym_binary_operator,
-      sym_unary_operator,
-      sym_attribute,
-      sym_subscript,
-      sym_call,
-      sym_list,
-      sym_set,
-      sym_tuple,
-      sym_dictionary,
-      sym_list_comprehension,
-      sym_dictionary_comprehension,
-      sym_set_comprehension,
-      sym_generator_expression,
-      sym_parenthesized_expression,
-      sym_concatenated_string,
-  [37789] = 20,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1495), 1,
-      anon_sym_EQ,
-    ACTIONS(1610), 1,
-      anon_sym_DOT,
-    ACTIONS(1612), 1,
-      anon_sym_LPAREN,
-    ACTIONS(1620), 1,
-      anon_sym_PIPE,
-    ACTIONS(1624), 1,
-      anon_sym_LBRACK,
-    ACTIONS(1626), 1,
-      anon_sym_STAR_STAR,
-    ACTIONS(1630), 1,
-      anon_sym_not,
-    ACTIONS(1632), 1,
-      anon_sym_AMP,
-    ACTIONS(1634), 1,
-      anon_sym_CARET,
-    ACTIONS(1638), 1,
-      anon_sym_is,
-    STATE(878), 1,
-      aux_sym_comparison_operator_repeat1,
-    ACTIONS(1614), 2,
-      anon_sym_STAR,
-      anon_sym_SLASH,
-    ACTIONS(1616), 2,
-      anon_sym_GT_GT,
-      anon_sym_LT_LT,
-    ACTIONS(1622), 2,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-    ACTIONS(1636), 2,
-      anon_sym_LT,
-      anon_sym_GT,
-    STATE(792), 2,
-      sym_argument_list,
-      sym_generator_expression,
-    ACTIONS(1628), 3,
-      anon_sym_AT,
-      anon_sym_PERCENT,
-      anon_sym_SLASH_SLASH,
-    ACTIONS(1618), 6,
-      anon_sym_in,
-      anon_sym_LT_EQ,
-      anon_sym_EQ_EQ,
-      anon_sym_BANG_EQ,
-      anon_sym_GT_EQ,
-      anon_sym_LT_GT,
-    ACTIONS(1479), 7,
-      sym__newline,
-      anon_sym_from,
-      anon_sym_COMMA,
-      anon_sym_if,
-      anon_sym_and,
-      anon_sym_or,
-      sym__semicolon,
-  [37868] = 14,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(278), 1,
-      anon_sym_LPAREN,
-    ACTIONS(293), 1,
-      anon_sym_LBRACK,
-    ACTIONS(295), 1,
-      anon_sym_LBRACE,
-    ACTIONS(315), 1,
-      sym__string_start,
-    ACTIONS(1525), 1,
-      sym_identifier,
-    STATE(600), 1,
-      sym_string,
-    STATE(882), 1,
-      sym_primary_expression,
-    ACTIONS(309), 2,
-      sym_ellipsis,
-      sym_float,
-    STATE(762), 2,
-      sym_attribute,
-      sym_subscript,
-    ACTIONS(301), 3,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_TILDE,
-    ACTIONS(311), 4,
-      sym_integer,
-      sym_true,
-      sym_false,
-      sym_none,
-    ACTIONS(1529), 6,
-      anon_sym_print,
-      anon_sym_async,
-      anon_sym_match,
-      anon_sym_exec,
-      anon_sym_type,
-      anon_sym_await,
-    STATE(642), 13,
-      sym_binary_operator,
-      sym_unary_operator,
-      sym_call,
-      sym_list,
-      sym_set,
-      sym_tuple,
-      sym_dictionary,
-      sym_list_comprehension,
-      sym_dictionary_comprehension,
-      sym_set_comprehension,
-      sym_generator_expression,
-      sym_parenthesized_expression,
-      sym_concatenated_string,
-  [37935] = 12,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(278), 1,
-      anon_sym_LPAREN,
-    ACTIONS(293), 1,
-      anon_sym_LBRACK,
-    ACTIONS(295), 1,
-      anon_sym_LBRACE,
-    ACTIONS(315), 1,
-      sym__string_start,
-    STATE(600), 1,
-      sym_string,
-    STATE(656), 1,
-      sym_primary_expression,
-    ACTIONS(309), 2,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(301), 3,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_TILDE,
-    ACTIONS(311), 5,
-      sym_integer,
-      sym_identifier,
-      sym_true,
-      sym_false,
-      sym_none,
-    ACTIONS(1601), 6,
-      anon_sym_print,
-      anon_sym_async,
-      anon_sym_match,
-      anon_sym_exec,
-      anon_sym_type,
-      anon_sym_await,
-    STATE(642), 15,
-      sym_binary_operator,
-      sym_unary_operator,
-      sym_attribute,
-      sym_subscript,
-      sym_call,
-      sym_list,
-      sym_set,
-      sym_tuple,
-      sym_dictionary,
-      sym_list_comprehension,
-      sym_dictionary_comprehension,
-      sym_set_comprehension,
-      sym_generator_expression,
-      sym_parenthesized_expression,
-      sym_concatenated_string,
-  [37998] = 12,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(278), 1,
-      anon_sym_LPAREN,
-    ACTIONS(293), 1,
-      anon_sym_LBRACK,
-    ACTIONS(295), 1,
-      anon_sym_LBRACE,
-    ACTIONS(315), 1,
-      sym__string_start,
-    STATE(600), 1,
-      sym_string,
-    STATE(646), 1,
-      sym_primary_expression,
-    ACTIONS(309), 2,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(301), 3,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_TILDE,
-    ACTIONS(311), 5,
-      sym_integer,
-      sym_identifier,
-      sym_true,
-      sym_false,
-      sym_none,
-    ACTIONS(1601), 6,
-      anon_sym_print,
-      anon_sym_async,
-      anon_sym_match,
-      anon_sym_exec,
-      anon_sym_type,
-      anon_sym_await,
-    STATE(642), 15,
-      sym_binary_operator,
-      sym_unary_operator,
-      sym_attribute,
-      sym_subscript,
-      sym_call,
-      sym_list,
-      sym_set,
-      sym_tuple,
-      sym_dictionary,
-      sym_list_comprehension,
-      sym_dictionary_comprehension,
-      sym_set_comprehension,
-      sym_generator_expression,
-      sym_parenthesized_expression,
-      sym_concatenated_string,
-  [38061] = 12,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(295), 1,
-      anon_sym_LBRACE,
-    ACTIONS(315), 1,
-      sym__string_start,
-    ACTIONS(604), 1,
-      anon_sym_LPAREN,
-    ACTIONS(612), 1,
-      anon_sym_LBRACK,
-    STATE(600), 1,
-      sym_string,
-    STATE(659), 1,
-      sym_primary_expression,
-    ACTIONS(309), 2,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(610), 3,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_TILDE,
-    ACTIONS(311), 5,
-      sym_integer,
-      sym_identifier,
-      sym_true,
-      sym_false,
-      sym_none,
-    ACTIONS(1601), 6,
-      anon_sym_print,
-      anon_sym_async,
-      anon_sym_match,
-      anon_sym_exec,
-      anon_sym_type,
-      anon_sym_await,
-    STATE(642), 15,
-      sym_binary_operator,
-      sym_unary_operator,
-      sym_attribute,
-      sym_subscript,
-      sym_call,
-      sym_list,
-      sym_set,
-      sym_tuple,
-      sym_dictionary,
-      sym_list_comprehension,
-      sym_dictionary_comprehension,
-      sym_set_comprehension,
-      sym_generator_expression,
-      sym_parenthesized_expression,
-      sym_concatenated_string,
-  [38124] = 5,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1640), 1,
-      sym__string_start,
-    STATE(689), 2,
-      sym_string,
-      aux_sym_concatenated_string_repeat1,
-    ACTIONS(1394), 5,
-      anon_sym_STAR,
-      anon_sym_EQ,
-      anon_sym_SLASH,
-      anon_sym_LT,
-      anon_sym_GT,
-    ACTIONS(1392), 29,
-      sym__newline,
-      anon_sym_DOT,
-      anon_sym_from,
-      anon_sym_LPAREN,
-      anon_sym_COMMA,
-      anon_sym_GT_GT,
-      anon_sym_if,
-      anon_sym_in,
-      anon_sym_PIPE,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_not,
-      anon_sym_and,
-      anon_sym_or,
-      anon_sym_PERCENT,
-      anon_sym_SLASH_SLASH,
-      anon_sym_AMP,
-      anon_sym_CARET,
-      anon_sym_LT_LT,
-      anon_sym_LT_EQ,
-      anon_sym_EQ_EQ,
-      anon_sym_BANG_EQ,
-      anon_sym_GT_EQ,
-      anon_sym_LT_GT,
-      anon_sym_is,
-      sym__semicolon,
-  [38173] = 12,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(278), 1,
-      anon_sym_LPAREN,
-    ACTIONS(293), 1,
-      anon_sym_LBRACK,
-    ACTIONS(295), 1,
-      anon_sym_LBRACE,
-    ACTIONS(315), 1,
-      sym__string_start,
-    STATE(600), 1,
-      sym_string,
-    STATE(645), 1,
-      sym_primary_expression,
-    ACTIONS(309), 2,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(301), 3,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_TILDE,
-    ACTIONS(311), 5,
-      sym_integer,
-      sym_identifier,
-      sym_true,
-      sym_false,
-      sym_none,
-    ACTIONS(1601), 6,
-      anon_sym_print,
-      anon_sym_async,
-      anon_sym_match,
-      anon_sym_exec,
-      anon_sym_type,
-      anon_sym_await,
-    STATE(642), 15,
-      sym_binary_operator,
-      sym_unary_operator,
-      sym_attribute,
-      sym_subscript,
-      sym_call,
-      sym_list,
-      sym_set,
-      sym_tuple,
-      sym_dictionary,
-      sym_list_comprehension,
-      sym_dictionary_comprehension,
-      sym_set_comprehension,
-      sym_generator_expression,
-      sym_parenthesized_expression,
-      sym_concatenated_string,
-  [38236] = 12,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(624), 1,
-      anon_sym_LPAREN,
-    ACTIONS(632), 1,
-      anon_sym_LBRACK,
-    ACTIONS(634), 1,
-      anon_sym_LBRACE,
-    ACTIONS(646), 1,
-      sym__string_start,
-    STATE(742), 1,
-      sym_string,
-    STATE(746), 1,
-      sym_primary_expression,
-    ACTIONS(640), 2,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(630), 3,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_TILDE,
-    ACTIONS(642), 5,
-      sym_integer,
-      sym_identifier,
-      sym_true,
-      sym_false,
-      sym_none,
-    ACTIONS(1597), 6,
-      anon_sym_print,
-      anon_sym_async,
-      anon_sym_match,
-      anon_sym_exec,
-      anon_sym_type,
-      anon_sym_await,
-    STATE(811), 15,
-      sym_binary_operator,
-      sym_unary_operator,
-      sym_attribute,
-      sym_subscript,
-      sym_call,
-      sym_list,
-      sym_set,
-      sym_tuple,
-      sym_dictionary,
-      sym_list_comprehension,
-      sym_dictionary_comprehension,
-      sym_set_comprehension,
-      sym_generator_expression,
-      sym_parenthesized_expression,
-      sym_concatenated_string,
-  [38299] = 12,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(278), 1,
-      anon_sym_LPAREN,
-    ACTIONS(293), 1,
-      anon_sym_LBRACK,
-    ACTIONS(295), 1,
-      anon_sym_LBRACE,
-    ACTIONS(315), 1,
-      sym__string_start,
-    STATE(600), 1,
-      sym_string,
-    STATE(651), 1,
-      sym_primary_expression,
-    ACTIONS(309), 2,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(301), 3,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_TILDE,
-    ACTIONS(311), 5,
-      sym_integer,
-      sym_identifier,
-      sym_true,
-      sym_false,
-      sym_none,
-    ACTIONS(1601), 6,
-      anon_sym_print,
-      anon_sym_async,
-      anon_sym_match,
-      anon_sym_exec,
-      anon_sym_type,
-      anon_sym_await,
-    STATE(642), 15,
-      sym_binary_operator,
-      sym_unary_operator,
-      sym_attribute,
-      sym_subscript,
-      sym_call,
-      sym_list,
-      sym_set,
-      sym_tuple,
-      sym_dictionary,
-      sym_list_comprehension,
-      sym_dictionary_comprehension,
-      sym_set_comprehension,
-      sym_generator_expression,
-      sym_parenthesized_expression,
-      sym_concatenated_string,
-  [38362] = 12,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(295), 1,
-      anon_sym_LBRACE,
-    ACTIONS(315), 1,
-      sym__string_start,
-    ACTIONS(604), 1,
-      anon_sym_LPAREN,
-    ACTIONS(612), 1,
-      anon_sym_LBRACK,
-    STATE(600), 1,
-      sym_string,
-    STATE(647), 1,
-      sym_primary_expression,
-    ACTIONS(309), 2,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(610), 3,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_TILDE,
-    ACTIONS(311), 5,
-      sym_integer,
-      sym_identifier,
-      sym_true,
-      sym_false,
-      sym_none,
-    ACTIONS(1601), 6,
-      anon_sym_print,
-      anon_sym_async,
-      anon_sym_match,
-      anon_sym_exec,
-      anon_sym_type,
-      anon_sym_await,
-    STATE(642), 15,
-      sym_binary_operator,
-      sym_unary_operator,
-      sym_attribute,
-      sym_subscript,
-      sym_call,
-      sym_list,
-      sym_set,
-      sym_tuple,
-      sym_dictionary,
-      sym_list_comprehension,
-      sym_dictionary_comprehension,
-      sym_set_comprehension,
-      sym_generator_expression,
-      sym_parenthesized_expression,
-      sym_concatenated_string,
-  [38425] = 12,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(51), 1,
-      anon_sym_LBRACE,
-    ACTIONS(81), 1,
-      sym__string_start,
-    ACTIONS(559), 1,
-      anon_sym_LPAREN,
-    ACTIONS(563), 1,
-      anon_sym_LBRACK,
-    STATE(713), 1,
-      sym_string,
-    STATE(731), 1,
-      sym_primary_expression,
-    ACTIONS(75), 2,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(47), 3,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_TILDE,
-    ACTIONS(77), 5,
-      sym_integer,
-      sym_identifier,
-      sym_true,
-      sym_false,
-      sym_none,
-    ACTIONS(1593), 6,
-      anon_sym_print,
-      anon_sym_async,
-      anon_sym_match,
-      anon_sym_exec,
-      anon_sym_type,
-      anon_sym_await,
-    STATE(797), 15,
-      sym_binary_operator,
-      sym_unary_operator,
-      sym_attribute,
-      sym_subscript,
-      sym_call,
-      sym_list,
-      sym_set,
-      sym_tuple,
-      sym_dictionary,
-      sym_list_comprehension,
-      sym_dictionary_comprehension,
-      sym_set_comprehension,
-      sym_generator_expression,
-      sym_parenthesized_expression,
-      sym_concatenated_string,
-  [38488] = 12,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(278), 1,
-      anon_sym_LPAREN,
-    ACTIONS(293), 1,
-      anon_sym_LBRACK,
-    ACTIONS(295), 1,
-      anon_sym_LBRACE,
-    ACTIONS(315), 1,
-      sym__string_start,
-    STATE(600), 1,
-      sym_string,
-    STATE(658), 1,
-      sym_primary_expression,
-    ACTIONS(309), 2,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(301), 3,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_TILDE,
-    ACTIONS(311), 5,
-      sym_integer,
-      sym_identifier,
-      sym_true,
-      sym_false,
-      sym_none,
-    ACTIONS(1601), 6,
-      anon_sym_print,
-      anon_sym_async,
-      anon_sym_match,
-      anon_sym_exec,
-      anon_sym_type,
-      anon_sym_await,
-    STATE(642), 15,
-      sym_binary_operator,
-      sym_unary_operator,
-      sym_attribute,
-      sym_subscript,
-      sym_call,
-      sym_list,
-      sym_set,
-      sym_tuple,
-      sym_dictionary,
-      sym_list_comprehension,
-      sym_dictionary_comprehension,
-      sym_set_comprehension,
-      sym_generator_expression,
-      sym_parenthesized_expression,
-      sym_concatenated_string,
-  [38551] = 12,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(278), 1,
-      anon_sym_LPAREN,
-    ACTIONS(293), 1,
-      anon_sym_LBRACK,
-    ACTIONS(295), 1,
-      anon_sym_LBRACE,
-    ACTIONS(315), 1,
-      sym__string_start,
-    STATE(600), 1,
-      sym_string,
-    STATE(665), 1,
-      sym_primary_expression,
-    ACTIONS(309), 2,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(301), 3,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_TILDE,
-    ACTIONS(311), 5,
-      sym_integer,
-      sym_identifier,
-      sym_true,
-      sym_false,
-      sym_none,
-    ACTIONS(1601), 6,
-      anon_sym_print,
-      anon_sym_async,
-      anon_sym_match,
-      anon_sym_exec,
-      anon_sym_type,
-      anon_sym_await,
-    STATE(642), 15,
-      sym_binary_operator,
-      sym_unary_operator,
-      sym_attribute,
-      sym_subscript,
-      sym_call,
-      sym_list,
-      sym_set,
-      sym_tuple,
-      sym_dictionary,
-      sym_list_comprehension,
-      sym_dictionary_comprehension,
-      sym_set_comprehension,
-      sym_generator_expression,
-      sym_parenthesized_expression,
-      sym_concatenated_string,
-  [38614] = 12,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(624), 1,
-      anon_sym_LPAREN,
-    ACTIONS(632), 1,
-      anon_sym_LBRACK,
-    ACTIONS(634), 1,
-      anon_sym_LBRACE,
-    ACTIONS(646), 1,
-      sym__string_start,
-    STATE(742), 1,
-      sym_string,
-    STATE(750), 1,
-      sym_primary_expression,
-    ACTIONS(640), 2,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(630), 3,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_TILDE,
-    ACTIONS(642), 5,
-      sym_integer,
-      sym_identifier,
-      sym_true,
-      sym_false,
-      sym_none,
-    ACTIONS(1597), 6,
-      anon_sym_print,
-      anon_sym_async,
-      anon_sym_match,
-      anon_sym_exec,
-      anon_sym_type,
-      anon_sym_await,
-    STATE(811), 15,
-      sym_binary_operator,
-      sym_unary_operator,
-      sym_attribute,
-      sym_subscript,
-      sym_call,
-      sym_list,
-      sym_set,
-      sym_tuple,
-      sym_dictionary,
-      sym_list_comprehension,
-      sym_dictionary_comprehension,
-      sym_set_comprehension,
-      sym_generator_expression,
-      sym_parenthesized_expression,
-      sym_concatenated_string,
-  [38677] = 12,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(295), 1,
-      anon_sym_LBRACE,
-    ACTIONS(315), 1,
-      sym__string_start,
-    ACTIONS(604), 1,
-      anon_sym_LPAREN,
-    ACTIONS(612), 1,
-      anon_sym_LBRACK,
-    STATE(600), 1,
-      sym_string,
-    STATE(649), 1,
-      sym_primary_expression,
-    ACTIONS(309), 2,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(610), 3,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_TILDE,
-    ACTIONS(311), 5,
-      sym_integer,
-      sym_identifier,
-      sym_true,
-      sym_false,
-      sym_none,
-    ACTIONS(1601), 6,
-      anon_sym_print,
-      anon_sym_async,
-      anon_sym_match,
-      anon_sym_exec,
-      anon_sym_type,
-      anon_sym_await,
-    STATE(642), 15,
-      sym_binary_operator,
-      sym_unary_operator,
-      sym_attribute,
-      sym_subscript,
-      sym_call,
-      sym_list,
-      sym_set,
-      sym_tuple,
-      sym_dictionary,
-      sym_list_comprehension,
-      sym_dictionary_comprehension,
-      sym_set_comprehension,
-      sym_generator_expression,
-      sym_parenthesized_expression,
-      sym_concatenated_string,
-  [38740] = 12,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(624), 1,
-      anon_sym_LPAREN,
-    ACTIONS(632), 1,
-      anon_sym_LBRACK,
-    ACTIONS(634), 1,
-      anon_sym_LBRACE,
-    ACTIONS(646), 1,
-      sym__string_start,
-    STATE(742), 1,
-      sym_string,
-    STATE(756), 1,
-      sym_primary_expression,
-    ACTIONS(640), 2,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(630), 3,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_TILDE,
-    ACTIONS(642), 5,
-      sym_integer,
-      sym_identifier,
-      sym_true,
-      sym_false,
-      sym_none,
-    ACTIONS(1597), 6,
-      anon_sym_print,
-      anon_sym_async,
-      anon_sym_match,
-      anon_sym_exec,
-      anon_sym_type,
-      anon_sym_await,
-    STATE(811), 15,
-      sym_binary_operator,
-      sym_unary_operator,
-      sym_attribute,
-      sym_subscript,
-      sym_call,
-      sym_list,
-      sym_set,
-      sym_tuple,
-      sym_dictionary,
-      sym_list_comprehension,
-      sym_dictionary_comprehension,
-      sym_set_comprehension,
-      sym_generator_expression,
-      sym_parenthesized_expression,
-      sym_concatenated_string,
-  [38803] = 12,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(51), 1,
-      anon_sym_LBRACE,
-    ACTIONS(81), 1,
-      sym__string_start,
-    ACTIONS(559), 1,
-      anon_sym_LPAREN,
-    ACTIONS(563), 1,
-      anon_sym_LBRACK,
     STATE(713), 1,
       sym_string,
     STATE(743), 1,
       sym_primary_expression,
-    ACTIONS(75), 2,
+    ACTIONS(604), 2,
       sym_ellipsis,
       sym_float,
-    ACTIONS(47), 3,
+    ACTIONS(598), 3,
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
-    ACTIONS(77), 5,
+    ACTIONS(590), 5,
       sym_integer,
       sym_identifier,
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(1593), 6,
+    ACTIONS(594), 5,
       anon_sym_print,
       anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-      anon_sym_await,
-    STATE(797), 15,
+    STATE(827), 16,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -58941,1245 +52197,40 @@ static const uint16_t ts_small_parse_table[] = {
       sym_generator_expression,
       sym_parenthesized_expression,
       sym_concatenated_string,
-  [38866] = 12,
+      sym_await,
+  [35080] = 8,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(51), 1,
-      anon_sym_LBRACE,
-    ACTIONS(81), 1,
-      sym__string_start,
-    ACTIONS(559), 1,
+    ACTIONS(1407), 1,
+      anon_sym_DOT,
+    ACTIONS(1409), 1,
       anon_sym_LPAREN,
-    ACTIONS(563), 1,
+    ACTIONS(1425), 1,
       anon_sym_LBRACK,
-    STATE(713), 1,
-      sym_string,
-    STATE(734), 1,
-      sym_primary_expression,
-    ACTIONS(75), 2,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(47), 3,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_TILDE,
-    ACTIONS(77), 5,
-      sym_integer,
-      sym_identifier,
-      sym_true,
-      sym_false,
-      sym_none,
-    ACTIONS(1593), 6,
-      anon_sym_print,
-      anon_sym_async,
-      anon_sym_match,
-      anon_sym_exec,
-      anon_sym_type,
-      anon_sym_await,
-    STATE(797), 15,
-      sym_binary_operator,
-      sym_unary_operator,
-      sym_attribute,
-      sym_subscript,
-      sym_call,
-      sym_list,
-      sym_set,
-      sym_tuple,
-      sym_dictionary,
-      sym_list_comprehension,
-      sym_dictionary_comprehension,
-      sym_set_comprehension,
+    ACTIONS(1531), 1,
+      anon_sym_STAR_STAR,
+    STATE(619), 2,
+      sym_argument_list,
       sym_generator_expression,
-      sym_parenthesized_expression,
-      sym_concatenated_string,
-  [38929] = 12,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(295), 1,
-      anon_sym_LBRACE,
-    ACTIONS(315), 1,
-      sym__string_start,
-    ACTIONS(604), 1,
-      anon_sym_LPAREN,
-    ACTIONS(612), 1,
-      anon_sym_LBRACK,
-    STATE(600), 1,
-      sym_string,
-    STATE(652), 1,
-      sym_primary_expression,
-    ACTIONS(309), 2,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(610), 3,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_TILDE,
-    ACTIONS(311), 5,
-      sym_integer,
-      sym_identifier,
-      sym_true,
-      sym_false,
-      sym_none,
-    ACTIONS(1601), 6,
-      anon_sym_print,
-      anon_sym_async,
-      anon_sym_match,
-      anon_sym_exec,
-      anon_sym_type,
-      anon_sym_await,
-    STATE(642), 15,
-      sym_binary_operator,
-      sym_unary_operator,
-      sym_attribute,
-      sym_subscript,
-      sym_call,
-      sym_list,
-      sym_set,
-      sym_tuple,
-      sym_dictionary,
-      sym_list_comprehension,
-      sym_dictionary_comprehension,
-      sym_set_comprehension,
-      sym_generator_expression,
-      sym_parenthesized_expression,
-      sym_concatenated_string,
-  [38992] = 12,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(295), 1,
-      anon_sym_LBRACE,
-    ACTIONS(315), 1,
-      sym__string_start,
-    ACTIONS(604), 1,
-      anon_sym_LPAREN,
-    ACTIONS(612), 1,
-      anon_sym_LBRACK,
-    STATE(600), 1,
-      sym_string,
-    STATE(653), 1,
-      sym_primary_expression,
-    ACTIONS(309), 2,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(610), 3,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_TILDE,
-    ACTIONS(311), 5,
-      sym_integer,
-      sym_identifier,
-      sym_true,
-      sym_false,
-      sym_none,
-    ACTIONS(1601), 6,
-      anon_sym_print,
-      anon_sym_async,
-      anon_sym_match,
-      anon_sym_exec,
-      anon_sym_type,
-      anon_sym_await,
-    STATE(642), 15,
-      sym_binary_operator,
-      sym_unary_operator,
-      sym_attribute,
-      sym_subscript,
-      sym_call,
-      sym_list,
-      sym_set,
-      sym_tuple,
-      sym_dictionary,
-      sym_list_comprehension,
-      sym_dictionary_comprehension,
-      sym_set_comprehension,
-      sym_generator_expression,
-      sym_parenthesized_expression,
-      sym_concatenated_string,
-  [39055] = 12,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(295), 1,
-      anon_sym_LBRACE,
-    ACTIONS(315), 1,
-      sym__string_start,
-    ACTIONS(604), 1,
-      anon_sym_LPAREN,
-    ACTIONS(612), 1,
-      anon_sym_LBRACK,
-    STATE(600), 1,
-      sym_string,
-    STATE(654), 1,
-      sym_primary_expression,
-    ACTIONS(309), 2,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(610), 3,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_TILDE,
-    ACTIONS(311), 5,
-      sym_integer,
-      sym_identifier,
-      sym_true,
-      sym_false,
-      sym_none,
-    ACTIONS(1601), 6,
-      anon_sym_print,
-      anon_sym_async,
-      anon_sym_match,
-      anon_sym_exec,
-      anon_sym_type,
-      anon_sym_await,
-    STATE(642), 15,
-      sym_binary_operator,
-      sym_unary_operator,
-      sym_attribute,
-      sym_subscript,
-      sym_call,
-      sym_list,
-      sym_set,
-      sym_tuple,
-      sym_dictionary,
-      sym_list_comprehension,
-      sym_dictionary_comprehension,
-      sym_set_comprehension,
-      sym_generator_expression,
-      sym_parenthesized_expression,
-      sym_concatenated_string,
-  [39118] = 12,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(295), 1,
-      anon_sym_LBRACE,
-    ACTIONS(315), 1,
-      sym__string_start,
-    ACTIONS(604), 1,
-      anon_sym_LPAREN,
-    ACTIONS(612), 1,
-      anon_sym_LBRACK,
-    STATE(600), 1,
-      sym_string,
-    STATE(655), 1,
-      sym_primary_expression,
-    ACTIONS(309), 2,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(610), 3,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_TILDE,
-    ACTIONS(311), 5,
-      sym_integer,
-      sym_identifier,
-      sym_true,
-      sym_false,
-      sym_none,
-    ACTIONS(1601), 6,
-      anon_sym_print,
-      anon_sym_async,
-      anon_sym_match,
-      anon_sym_exec,
-      anon_sym_type,
-      anon_sym_await,
-    STATE(642), 15,
-      sym_binary_operator,
-      sym_unary_operator,
-      sym_attribute,
-      sym_subscript,
-      sym_call,
-      sym_list,
-      sym_set,
-      sym_tuple,
-      sym_dictionary,
-      sym_list_comprehension,
-      sym_dictionary_comprehension,
-      sym_set_comprehension,
-      sym_generator_expression,
-      sym_parenthesized_expression,
-      sym_concatenated_string,
-  [39181] = 12,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(51), 1,
-      anon_sym_LBRACE,
-    ACTIONS(81), 1,
-      sym__string_start,
-    ACTIONS(559), 1,
-      anon_sym_LPAREN,
-    ACTIONS(563), 1,
-      anon_sym_LBRACK,
-    STATE(713), 1,
-      sym_string,
-    STATE(741), 1,
-      sym_primary_expression,
-    ACTIONS(75), 2,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(47), 3,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_TILDE,
-    ACTIONS(77), 5,
-      sym_integer,
-      sym_identifier,
-      sym_true,
-      sym_false,
-      sym_none,
-    ACTIONS(1593), 6,
-      anon_sym_print,
-      anon_sym_async,
-      anon_sym_match,
-      anon_sym_exec,
-      anon_sym_type,
-      anon_sym_await,
-    STATE(797), 15,
-      sym_binary_operator,
-      sym_unary_operator,
-      sym_attribute,
-      sym_subscript,
-      sym_call,
-      sym_list,
-      sym_set,
-      sym_tuple,
-      sym_dictionary,
-      sym_list_comprehension,
-      sym_dictionary_comprehension,
-      sym_set_comprehension,
-      sym_generator_expression,
-      sym_parenthesized_expression,
-      sym_concatenated_string,
-  [39244] = 12,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(278), 1,
-      anon_sym_LPAREN,
-    ACTIONS(293), 1,
-      anon_sym_LBRACK,
-    ACTIONS(295), 1,
-      anon_sym_LBRACE,
-    ACTIONS(315), 1,
-      sym__string_start,
-    STATE(600), 1,
-      sym_string,
-    STATE(666), 1,
-      sym_primary_expression,
-    ACTIONS(309), 2,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(301), 3,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_TILDE,
-    ACTIONS(311), 5,
-      sym_integer,
-      sym_identifier,
-      sym_true,
-      sym_false,
-      sym_none,
-    ACTIONS(1601), 6,
-      anon_sym_print,
-      anon_sym_async,
-      anon_sym_match,
-      anon_sym_exec,
-      anon_sym_type,
-      anon_sym_await,
-    STATE(642), 15,
-      sym_binary_operator,
-      sym_unary_operator,
-      sym_attribute,
-      sym_subscript,
-      sym_call,
-      sym_list,
-      sym_set,
-      sym_tuple,
-      sym_dictionary,
-      sym_list_comprehension,
-      sym_dictionary_comprehension,
-      sym_set_comprehension,
-      sym_generator_expression,
-      sym_parenthesized_expression,
-      sym_concatenated_string,
-  [39307] = 12,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(624), 1,
-      anon_sym_LPAREN,
-    ACTIONS(632), 1,
-      anon_sym_LBRACK,
-    ACTIONS(634), 1,
-      anon_sym_LBRACE,
-    ACTIONS(646), 1,
-      sym__string_start,
-    STATE(742), 1,
-      sym_string,
-    STATE(761), 1,
-      sym_primary_expression,
-    ACTIONS(640), 2,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(630), 3,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_TILDE,
-    ACTIONS(642), 5,
-      sym_integer,
-      sym_identifier,
-      sym_true,
-      sym_false,
-      sym_none,
-    ACTIONS(1597), 6,
-      anon_sym_print,
-      anon_sym_async,
-      anon_sym_match,
-      anon_sym_exec,
-      anon_sym_type,
-      anon_sym_await,
-    STATE(811), 15,
-      sym_binary_operator,
-      sym_unary_operator,
-      sym_attribute,
-      sym_subscript,
-      sym_call,
-      sym_list,
-      sym_set,
-      sym_tuple,
-      sym_dictionary,
-      sym_list_comprehension,
-      sym_dictionary_comprehension,
-      sym_set_comprehension,
-      sym_generator_expression,
-      sym_parenthesized_expression,
-      sym_concatenated_string,
-  [39370] = 12,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(295), 1,
-      anon_sym_LBRACE,
-    ACTIONS(315), 1,
-      sym__string_start,
-    ACTIONS(604), 1,
-      anon_sym_LPAREN,
-    ACTIONS(612), 1,
-      anon_sym_LBRACK,
-    STATE(600), 1,
-      sym_string,
-    STATE(661), 1,
-      sym_primary_expression,
-    ACTIONS(309), 2,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(610), 3,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_TILDE,
-    ACTIONS(311), 5,
-      sym_integer,
-      sym_identifier,
-      sym_true,
-      sym_false,
-      sym_none,
-    ACTIONS(1601), 6,
-      anon_sym_print,
-      anon_sym_async,
-      anon_sym_match,
-      anon_sym_exec,
-      anon_sym_type,
-      anon_sym_await,
-    STATE(642), 15,
-      sym_binary_operator,
-      sym_unary_operator,
-      sym_attribute,
-      sym_subscript,
-      sym_call,
-      sym_list,
-      sym_set,
-      sym_tuple,
-      sym_dictionary,
-      sym_list_comprehension,
-      sym_dictionary_comprehension,
-      sym_set_comprehension,
-      sym_generator_expression,
-      sym_parenthesized_expression,
-      sym_concatenated_string,
-  [39433] = 12,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(295), 1,
-      anon_sym_LBRACE,
-    ACTIONS(315), 1,
-      sym__string_start,
-    ACTIONS(604), 1,
-      anon_sym_LPAREN,
-    ACTIONS(612), 1,
-      anon_sym_LBRACK,
-    STATE(600), 1,
-      sym_string,
-    STATE(660), 1,
-      sym_primary_expression,
-    ACTIONS(309), 2,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(610), 3,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_TILDE,
-    ACTIONS(311), 5,
-      sym_integer,
-      sym_identifier,
-      sym_true,
-      sym_false,
-      sym_none,
-    ACTIONS(1601), 6,
-      anon_sym_print,
-      anon_sym_async,
-      anon_sym_match,
-      anon_sym_exec,
-      anon_sym_type,
-      anon_sym_await,
-    STATE(642), 15,
-      sym_binary_operator,
-      sym_unary_operator,
-      sym_attribute,
-      sym_subscript,
-      sym_call,
-      sym_list,
-      sym_set,
-      sym_tuple,
-      sym_dictionary,
-      sym_list_comprehension,
-      sym_dictionary_comprehension,
-      sym_set_comprehension,
-      sym_generator_expression,
-      sym_parenthesized_expression,
-      sym_concatenated_string,
-  [39496] = 12,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(295), 1,
-      anon_sym_LBRACE,
-    ACTIONS(315), 1,
-      sym__string_start,
-    ACTIONS(604), 1,
-      anon_sym_LPAREN,
-    ACTIONS(612), 1,
-      anon_sym_LBRACK,
-    STATE(600), 1,
-      sym_string,
-    STATE(657), 1,
-      sym_primary_expression,
-    ACTIONS(309), 2,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(610), 3,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_TILDE,
-    ACTIONS(311), 5,
-      sym_integer,
-      sym_identifier,
-      sym_true,
-      sym_false,
-      sym_none,
-    ACTIONS(1601), 6,
-      anon_sym_print,
-      anon_sym_async,
-      anon_sym_match,
-      anon_sym_exec,
-      anon_sym_type,
-      anon_sym_await,
-    STATE(642), 15,
-      sym_binary_operator,
-      sym_unary_operator,
-      sym_attribute,
-      sym_subscript,
-      sym_call,
-      sym_list,
-      sym_set,
-      sym_tuple,
-      sym_dictionary,
-      sym_list_comprehension,
-      sym_dictionary_comprehension,
-      sym_set_comprehension,
-      sym_generator_expression,
-      sym_parenthesized_expression,
-      sym_concatenated_string,
-  [39559] = 12,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(295), 1,
-      anon_sym_LBRACE,
-    ACTIONS(315), 1,
-      sym__string_start,
-    ACTIONS(604), 1,
-      anon_sym_LPAREN,
-    ACTIONS(612), 1,
-      anon_sym_LBRACK,
-    STATE(600), 1,
-      sym_string,
-    STATE(662), 1,
-      sym_primary_expression,
-    ACTIONS(309), 2,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(610), 3,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_TILDE,
-    ACTIONS(311), 5,
-      sym_integer,
-      sym_identifier,
-      sym_true,
-      sym_false,
-      sym_none,
-    ACTIONS(1601), 6,
-      anon_sym_print,
-      anon_sym_async,
-      anon_sym_match,
-      anon_sym_exec,
-      anon_sym_type,
-      anon_sym_await,
-    STATE(642), 15,
-      sym_binary_operator,
-      sym_unary_operator,
-      sym_attribute,
-      sym_subscript,
-      sym_call,
-      sym_list,
-      sym_set,
-      sym_tuple,
-      sym_dictionary,
-      sym_list_comprehension,
-      sym_dictionary_comprehension,
-      sym_set_comprehension,
-      sym_generator_expression,
-      sym_parenthesized_expression,
-      sym_concatenated_string,
-  [39622] = 5,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(81), 1,
-      sym__string_start,
-    STATE(720), 2,
-      sym_string,
-      aux_sym_concatenated_string_repeat1,
-    ACTIONS(1053), 5,
+    ACTIONS(1577), 5,
       anon_sym_STAR,
       anon_sym_EQ,
       anon_sym_SLASH,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1048), 29,
-      sym__newline,
-      anon_sym_DOT,
-      anon_sym_from,
-      anon_sym_LPAREN,
-      anon_sym_COMMA,
-      anon_sym_GT_GT,
-      anon_sym_if,
-      anon_sym_in,
-      anon_sym_PIPE,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_not,
-      anon_sym_and,
-      anon_sym_or,
-      anon_sym_PERCENT,
-      anon_sym_SLASH_SLASH,
-      anon_sym_AMP,
-      anon_sym_CARET,
-      anon_sym_LT_LT,
-      anon_sym_LT_EQ,
-      anon_sym_EQ_EQ,
-      anon_sym_BANG_EQ,
-      anon_sym_GT_EQ,
-      anon_sym_LT_GT,
-      anon_sym_is,
-      sym__semicolon,
-  [39671] = 12,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(51), 1,
-      anon_sym_LBRACE,
-    ACTIONS(81), 1,
-      sym__string_start,
-    ACTIONS(559), 1,
-      anon_sym_LPAREN,
-    ACTIONS(563), 1,
-      anon_sym_LBRACK,
-    STATE(713), 1,
-      sym_string,
-    STATE(739), 1,
-      sym_primary_expression,
-    ACTIONS(75), 2,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(47), 3,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_TILDE,
-    ACTIONS(77), 5,
-      sym_integer,
-      sym_identifier,
-      sym_true,
-      sym_false,
-      sym_none,
-    ACTIONS(1593), 6,
-      anon_sym_print,
-      anon_sym_async,
-      anon_sym_match,
-      anon_sym_exec,
-      anon_sym_type,
-      anon_sym_await,
-    STATE(797), 15,
-      sym_binary_operator,
-      sym_unary_operator,
-      sym_attribute,
-      sym_subscript,
-      sym_call,
-      sym_list,
-      sym_set,
-      sym_tuple,
-      sym_dictionary,
-      sym_list_comprehension,
-      sym_dictionary_comprehension,
-      sym_set_comprehension,
-      sym_generator_expression,
-      sym_parenthesized_expression,
-      sym_concatenated_string,
-  [39734] = 14,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(278), 1,
-      anon_sym_LPAREN,
-    ACTIONS(293), 1,
-      anon_sym_LBRACK,
-    ACTIONS(295), 1,
-      anon_sym_LBRACE,
-    ACTIONS(315), 1,
-      sym__string_start,
-    ACTIONS(1643), 1,
-      sym_identifier,
-    STATE(600), 1,
-      sym_string,
-    STATE(882), 1,
-      sym_primary_expression,
-    ACTIONS(309), 2,
-      sym_ellipsis,
-      sym_float,
-    STATE(879), 2,
-      sym_attribute,
-      sym_subscript,
-    ACTIONS(301), 3,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_TILDE,
-    ACTIONS(311), 4,
-      sym_integer,
-      sym_true,
-      sym_false,
-      sym_none,
-    ACTIONS(1645), 6,
-      anon_sym_print,
-      anon_sym_async,
-      anon_sym_match,
-      anon_sym_exec,
-      anon_sym_type,
-      anon_sym_await,
-    STATE(642), 13,
-      sym_binary_operator,
-      sym_unary_operator,
-      sym_call,
-      sym_list,
-      sym_set,
-      sym_tuple,
-      sym_dictionary,
-      sym_list_comprehension,
-      sym_dictionary_comprehension,
-      sym_set_comprehension,
-      sym_generator_expression,
-      sym_parenthesized_expression,
-      sym_concatenated_string,
-  [39801] = 12,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(278), 1,
-      anon_sym_LPAREN,
-    ACTIONS(293), 1,
-      anon_sym_LBRACK,
-    ACTIONS(295), 1,
-      anon_sym_LBRACE,
-    ACTIONS(315), 1,
-      sym__string_start,
-    STATE(600), 1,
-      sym_string,
-    STATE(648), 1,
-      sym_primary_expression,
-    ACTIONS(309), 2,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(301), 3,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_TILDE,
-    ACTIONS(311), 5,
-      sym_integer,
-      sym_identifier,
-      sym_true,
-      sym_false,
-      sym_none,
-    ACTIONS(1601), 6,
-      anon_sym_print,
-      anon_sym_async,
-      anon_sym_match,
-      anon_sym_exec,
-      anon_sym_type,
-      anon_sym_await,
-    STATE(642), 15,
-      sym_binary_operator,
-      sym_unary_operator,
-      sym_attribute,
-      sym_subscript,
-      sym_call,
-      sym_list,
-      sym_set,
-      sym_tuple,
-      sym_dictionary,
-      sym_list_comprehension,
-      sym_dictionary_comprehension,
-      sym_set_comprehension,
-      sym_generator_expression,
-      sym_parenthesized_expression,
-      sym_concatenated_string,
-  [39864] = 12,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(51), 1,
-      anon_sym_LBRACE,
-    ACTIONS(81), 1,
-      sym__string_start,
-    ACTIONS(559), 1,
-      anon_sym_LPAREN,
-    ACTIONS(563), 1,
-      anon_sym_LBRACK,
-    STATE(713), 1,
-      sym_string,
-    STATE(738), 1,
-      sym_primary_expression,
-    ACTIONS(75), 2,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(47), 3,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_TILDE,
-    ACTIONS(77), 5,
-      sym_integer,
-      sym_identifier,
-      sym_true,
-      sym_false,
-      sym_none,
-    ACTIONS(1593), 6,
-      anon_sym_print,
-      anon_sym_async,
-      anon_sym_match,
-      anon_sym_exec,
-      anon_sym_type,
-      anon_sym_await,
-    STATE(797), 15,
-      sym_binary_operator,
-      sym_unary_operator,
-      sym_attribute,
-      sym_subscript,
-      sym_call,
-      sym_list,
-      sym_set,
-      sym_tuple,
-      sym_dictionary,
-      sym_list_comprehension,
-      sym_dictionary_comprehension,
-      sym_set_comprehension,
-      sym_generator_expression,
-      sym_parenthesized_expression,
-      sym_concatenated_string,
-  [39927] = 12,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(278), 1,
-      anon_sym_LPAREN,
-    ACTIONS(293), 1,
-      anon_sym_LBRACK,
-    ACTIONS(295), 1,
-      anon_sym_LBRACE,
-    ACTIONS(315), 1,
-      sym__string_start,
-    STATE(600), 1,
-      sym_string,
-    STATE(664), 1,
-      sym_primary_expression,
-    ACTIONS(309), 2,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(301), 3,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_TILDE,
-    ACTIONS(311), 5,
-      sym_integer,
-      sym_identifier,
-      sym_true,
-      sym_false,
-      sym_none,
-    ACTIONS(1601), 6,
-      anon_sym_print,
-      anon_sym_async,
-      anon_sym_match,
-      anon_sym_exec,
-      anon_sym_type,
-      anon_sym_await,
-    STATE(642), 15,
-      sym_binary_operator,
-      sym_unary_operator,
-      sym_attribute,
-      sym_subscript,
-      sym_call,
-      sym_list,
-      sym_set,
-      sym_tuple,
-      sym_dictionary,
-      sym_list_comprehension,
-      sym_dictionary_comprehension,
-      sym_set_comprehension,
-      sym_generator_expression,
-      sym_parenthesized_expression,
-      sym_concatenated_string,
-  [39990] = 12,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(51), 1,
-      anon_sym_LBRACE,
-    ACTIONS(81), 1,
-      sym__string_start,
-    ACTIONS(559), 1,
-      anon_sym_LPAREN,
-    ACTIONS(563), 1,
-      anon_sym_LBRACK,
-    STATE(713), 1,
-      sym_string,
-    STATE(745), 1,
-      sym_primary_expression,
-    ACTIONS(75), 2,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(47), 3,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_TILDE,
-    ACTIONS(77), 5,
-      sym_integer,
-      sym_identifier,
-      sym_true,
-      sym_false,
-      sym_none,
-    ACTIONS(1593), 6,
-      anon_sym_print,
-      anon_sym_async,
-      anon_sym_match,
-      anon_sym_exec,
-      anon_sym_type,
-      anon_sym_await,
-    STATE(797), 15,
-      sym_binary_operator,
-      sym_unary_operator,
-      sym_attribute,
-      sym_subscript,
-      sym_call,
-      sym_list,
-      sym_set,
-      sym_tuple,
-      sym_dictionary,
-      sym_list_comprehension,
-      sym_dictionary_comprehension,
-      sym_set_comprehension,
-      sym_generator_expression,
-      sym_parenthesized_expression,
-      sym_concatenated_string,
-  [40053] = 5,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(81), 1,
-      sym__string_start,
-    STATE(689), 2,
-      sym_string,
-      aux_sym_concatenated_string_repeat1,
-    ACTIONS(1390), 5,
-      anon_sym_STAR,
-      anon_sym_EQ,
-      anon_sym_SLASH,
-      anon_sym_LT,
-      anon_sym_GT,
-    ACTIONS(1388), 29,
-      sym__newline,
-      anon_sym_DOT,
-      anon_sym_from,
-      anon_sym_LPAREN,
-      anon_sym_COMMA,
-      anon_sym_GT_GT,
-      anon_sym_if,
-      anon_sym_in,
-      anon_sym_PIPE,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_not,
-      anon_sym_and,
-      anon_sym_or,
-      anon_sym_PERCENT,
-      anon_sym_SLASH_SLASH,
-      anon_sym_AMP,
-      anon_sym_CARET,
-      anon_sym_LT_LT,
-      anon_sym_LT_EQ,
-      anon_sym_EQ_EQ,
-      anon_sym_BANG_EQ,
-      anon_sym_GT_EQ,
-      anon_sym_LT_GT,
-      anon_sym_is,
-      sym__semicolon,
-  [40102] = 12,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(51), 1,
-      anon_sym_LBRACE,
-    ACTIONS(81), 1,
-      sym__string_start,
-    ACTIONS(559), 1,
-      anon_sym_LPAREN,
-    ACTIONS(563), 1,
-      anon_sym_LBRACK,
-    STATE(713), 1,
-      sym_string,
-    STATE(737), 1,
-      sym_primary_expression,
-    ACTIONS(75), 2,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(47), 3,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_TILDE,
-    ACTIONS(77), 5,
-      sym_integer,
-      sym_identifier,
-      sym_true,
-      sym_false,
-      sym_none,
-    ACTIONS(1593), 6,
-      anon_sym_print,
-      anon_sym_async,
-      anon_sym_match,
-      anon_sym_exec,
-      anon_sym_type,
-      anon_sym_await,
-    STATE(797), 15,
-      sym_binary_operator,
-      sym_unary_operator,
-      sym_attribute,
-      sym_subscript,
-      sym_call,
-      sym_list,
-      sym_set,
-      sym_tuple,
-      sym_dictionary,
-      sym_list_comprehension,
-      sym_dictionary_comprehension,
-      sym_set_comprehension,
-      sym_generator_expression,
-      sym_parenthesized_expression,
-      sym_concatenated_string,
-  [40165] = 12,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(51), 1,
-      anon_sym_LBRACE,
-    ACTIONS(81), 1,
-      sym__string_start,
-    ACTIONS(559), 1,
-      anon_sym_LPAREN,
-    ACTIONS(563), 1,
-      anon_sym_LBRACK,
-    STATE(713), 1,
-      sym_string,
-    STATE(733), 1,
-      sym_primary_expression,
-    ACTIONS(75), 2,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(47), 3,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_TILDE,
-    ACTIONS(77), 5,
-      sym_integer,
-      sym_identifier,
-      sym_true,
-      sym_false,
-      sym_none,
-    ACTIONS(1593), 6,
-      anon_sym_print,
-      anon_sym_async,
-      anon_sym_match,
-      anon_sym_exec,
-      anon_sym_type,
-      anon_sym_await,
-    STATE(797), 15,
-      sym_binary_operator,
-      sym_unary_operator,
-      sym_attribute,
-      sym_subscript,
-      sym_call,
-      sym_list,
-      sym_set,
-      sym_tuple,
-      sym_dictionary,
-      sym_list_comprehension,
-      sym_dictionary_comprehension,
-      sym_set_comprehension,
-      sym_generator_expression,
-      sym_parenthesized_expression,
-      sym_concatenated_string,
-  [40228] = 12,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(51), 1,
-      anon_sym_LBRACE,
-    ACTIONS(81), 1,
-      sym__string_start,
-    ACTIONS(559), 1,
-      anon_sym_LPAREN,
-    ACTIONS(563), 1,
-      anon_sym_LBRACK,
-    STATE(713), 1,
-      sym_string,
-    STATE(732), 1,
-      sym_primary_expression,
-    ACTIONS(75), 2,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(47), 3,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_TILDE,
-    ACTIONS(77), 5,
-      sym_integer,
-      sym_identifier,
-      sym_true,
-      sym_false,
-      sym_none,
-    ACTIONS(1593), 6,
-      anon_sym_print,
-      anon_sym_async,
-      anon_sym_match,
-      anon_sym_exec,
-      anon_sym_type,
-      anon_sym_await,
-    STATE(797), 15,
-      sym_binary_operator,
-      sym_unary_operator,
-      sym_attribute,
-      sym_subscript,
-      sym_call,
-      sym_list,
-      sym_set,
-      sym_tuple,
-      sym_dictionary,
-      sym_list_comprehension,
-      sym_dictionary_comprehension,
-      sym_set_comprehension,
-      sym_generator_expression,
-      sym_parenthesized_expression,
-      sym_concatenated_string,
-  [40291] = 12,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(624), 1,
-      anon_sym_LPAREN,
-    ACTIONS(632), 1,
-      anon_sym_LBRACK,
-    ACTIONS(634), 1,
-      anon_sym_LBRACE,
-    ACTIONS(646), 1,
-      sym__string_start,
-    STATE(742), 1,
-      sym_string,
-    STATE(757), 1,
-      sym_primary_expression,
-    ACTIONS(640), 2,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(630), 3,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_TILDE,
-    ACTIONS(642), 5,
-      sym_integer,
-      sym_identifier,
-      sym_true,
-      sym_false,
-      sym_none,
-    ACTIONS(1597), 6,
-      anon_sym_print,
-      anon_sym_async,
-      anon_sym_match,
-      anon_sym_exec,
-      anon_sym_type,
-      anon_sym_await,
-    STATE(811), 15,
-      sym_binary_operator,
-      sym_unary_operator,
-      sym_attribute,
-      sym_subscript,
-      sym_call,
-      sym_list,
-      sym_set,
-      sym_tuple,
-      sym_dictionary,
-      sym_list_comprehension,
-      sym_dictionary_comprehension,
-      sym_set_comprehension,
-      sym_generator_expression,
-      sym_parenthesized_expression,
-      sym_concatenated_string,
-  [40354] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1170), 5,
-      anon_sym_as,
-      anon_sym_STAR,
-      anon_sym_SLASH,
-      anon_sym_LT,
-      anon_sym_GT,
-    ACTIONS(1165), 32,
-      anon_sym_DOT,
-      anon_sym_LPAREN,
+    ACTIONS(1575), 28,
       anon_sym_RPAREN,
       anon_sym_COMMA,
       anon_sym_GT_GT,
       anon_sym_if,
       anon_sym_COLON,
-      anon_sym_async,
-      anon_sym_for,
+      anon_sym_else,
       anon_sym_in,
       anon_sym_PIPE,
       anon_sym_DASH,
       anon_sym_PLUS,
-      anon_sym_LBRACK,
       anon_sym_RBRACK,
       anon_sym_RBRACE,
-      anon_sym_STAR_STAR,
       anon_sym_AT,
       anon_sym_not,
       anon_sym_and,
@@ -60195,84 +52246,93 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_GT_EQ,
       anon_sym_LT_GT,
       anon_sym_is,
-  [40399] = 12,
+      sym_type_conversion,
+  [35137] = 12,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(278), 1,
+    ACTIONS(1407), 1,
+      anon_sym_DOT,
+    ACTIONS(1409), 1,
       anon_sym_LPAREN,
-    ACTIONS(293), 1,
+    ACTIONS(1425), 1,
       anon_sym_LBRACK,
-    ACTIONS(295), 1,
-      anon_sym_LBRACE,
-    ACTIONS(315), 1,
-      sym__string_start,
-    STATE(600), 1,
-      sym_string,
-    STATE(650), 1,
-      sym_primary_expression,
-    ACTIONS(309), 2,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(301), 3,
+    ACTIONS(1531), 1,
+      anon_sym_STAR_STAR,
+    ACTIONS(1521), 2,
+      anon_sym_STAR,
+      anon_sym_SLASH,
+    ACTIONS(1523), 2,
+      anon_sym_GT_GT,
+      anon_sym_LT_LT,
+    ACTIONS(1529), 2,
       anon_sym_DASH,
       anon_sym_PLUS,
-      anon_sym_TILDE,
-    ACTIONS(311), 5,
-      sym_integer,
-      sym_identifier,
-      sym_true,
-      sym_false,
-      sym_none,
-    ACTIONS(1601), 6,
-      anon_sym_print,
-      anon_sym_async,
-      anon_sym_match,
-      anon_sym_exec,
-      anon_sym_type,
-      anon_sym_await,
-    STATE(642), 15,
-      sym_binary_operator,
-      sym_unary_operator,
-      sym_attribute,
-      sym_subscript,
-      sym_call,
-      sym_list,
-      sym_set,
-      sym_tuple,
-      sym_dictionary,
-      sym_list_comprehension,
-      sym_dictionary_comprehension,
-      sym_set_comprehension,
+    STATE(619), 2,
+      sym_argument_list,
       sym_generator_expression,
-      sym_parenthesized_expression,
-      sym_concatenated_string,
-  [40462] = 3,
+    ACTIONS(1533), 3,
+      anon_sym_AT,
+      anon_sym_PERCENT,
+      anon_sym_SLASH_SLASH,
+    ACTIONS(1567), 3,
+      anon_sym_EQ,
+      anon_sym_LT,
+      anon_sym_GT,
+    ACTIONS(1565), 21,
+      anon_sym_RPAREN,
+      anon_sym_COMMA,
+      anon_sym_if,
+      anon_sym_COLON,
+      anon_sym_else,
+      anon_sym_in,
+      anon_sym_PIPE,
+      anon_sym_RBRACK,
+      anon_sym_RBRACE,
+      anon_sym_not,
+      anon_sym_and,
+      anon_sym_or,
+      anon_sym_AMP,
+      anon_sym_CARET,
+      anon_sym_LT_EQ,
+      anon_sym_EQ_EQ,
+      anon_sym_BANG_EQ,
+      anon_sym_GT_EQ,
+      anon_sym_LT_GT,
+      anon_sym_is,
+      sym_type_conversion,
+  [35202] = 8,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1151), 5,
-      anon_sym_as,
+    ACTIONS(1407), 1,
+      anon_sym_DOT,
+    ACTIONS(1409), 1,
+      anon_sym_LPAREN,
+    ACTIONS(1425), 1,
+      anon_sym_LBRACK,
+    ACTIONS(1531), 1,
+      anon_sym_STAR_STAR,
+    STATE(619), 2,
+      sym_argument_list,
+      sym_generator_expression,
+    ACTIONS(1567), 5,
       anon_sym_STAR,
+      anon_sym_EQ,
       anon_sym_SLASH,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1146), 32,
-      anon_sym_DOT,
-      anon_sym_LPAREN,
+    ACTIONS(1565), 28,
       anon_sym_RPAREN,
       anon_sym_COMMA,
       anon_sym_GT_GT,
       anon_sym_if,
       anon_sym_COLON,
-      anon_sym_async,
-      anon_sym_for,
+      anon_sym_else,
       anon_sym_in,
       anon_sym_PIPE,
       anon_sym_DASH,
       anon_sym_PLUS,
-      anon_sym_LBRACK,
       anon_sym_RBRACK,
       anon_sym_RBRACE,
-      anon_sym_STAR_STAR,
       anon_sym_AT,
       anon_sym_not,
       anon_sym_and,
@@ -60288,304 +52348,159 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_GT_EQ,
       anon_sym_LT_GT,
       anon_sym_is,
-  [40507] = 12,
+      sym_type_conversion,
+  [35259] = 10,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(624), 1,
-      anon_sym_LPAREN,
-    ACTIONS(632), 1,
-      anon_sym_LBRACK,
-    ACTIONS(634), 1,
-      anon_sym_LBRACE,
-    ACTIONS(646), 1,
-      sym__string_start,
-    STATE(742), 1,
-      sym_string,
-    STATE(752), 1,
-      sym_primary_expression,
-    ACTIONS(640), 2,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(630), 3,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_TILDE,
-    ACTIONS(642), 5,
-      sym_integer,
-      sym_identifier,
-      sym_true,
-      sym_false,
-      sym_none,
-    ACTIONS(1597), 6,
-      anon_sym_print,
-      anon_sym_async,
-      anon_sym_match,
-      anon_sym_exec,
-      anon_sym_type,
-      anon_sym_await,
-    STATE(811), 15,
-      sym_binary_operator,
-      sym_unary_operator,
-      sym_attribute,
-      sym_subscript,
-      sym_call,
-      sym_list,
-      sym_set,
-      sym_tuple,
-      sym_dictionary,
-      sym_list_comprehension,
-      sym_dictionary_comprehension,
-      sym_set_comprehension,
-      sym_generator_expression,
-      sym_parenthesized_expression,
-      sym_concatenated_string,
-  [40570] = 12,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(624), 1,
-      anon_sym_LPAREN,
-    ACTIONS(632), 1,
-      anon_sym_LBRACK,
-    ACTIONS(634), 1,
-      anon_sym_LBRACE,
-    ACTIONS(646), 1,
-      sym__string_start,
-    STATE(742), 1,
-      sym_string,
-    STATE(753), 1,
-      sym_primary_expression,
-    ACTIONS(640), 2,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(630), 3,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_TILDE,
-    ACTIONS(642), 5,
-      sym_integer,
-      sym_identifier,
-      sym_true,
-      sym_false,
-      sym_none,
-    ACTIONS(1597), 6,
-      anon_sym_print,
-      anon_sym_async,
-      anon_sym_match,
-      anon_sym_exec,
-      anon_sym_type,
-      anon_sym_await,
-    STATE(811), 15,
-      sym_binary_operator,
-      sym_unary_operator,
-      sym_attribute,
-      sym_subscript,
-      sym_call,
-      sym_list,
-      sym_set,
-      sym_tuple,
-      sym_dictionary,
-      sym_list_comprehension,
-      sym_dictionary_comprehension,
-      sym_set_comprehension,
-      sym_generator_expression,
-      sym_parenthesized_expression,
-      sym_concatenated_string,
-  [40633] = 12,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(51), 1,
-      anon_sym_LBRACE,
-    ACTIONS(81), 1,
-      sym__string_start,
-    ACTIONS(559), 1,
-      anon_sym_LPAREN,
-    ACTIONS(563), 1,
-      anon_sym_LBRACK,
-    STATE(713), 1,
-      sym_string,
-    STATE(735), 1,
-      sym_primary_expression,
-    ACTIONS(75), 2,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(47), 3,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_TILDE,
-    ACTIONS(77), 5,
-      sym_integer,
-      sym_identifier,
-      sym_true,
-      sym_false,
-      sym_none,
-    ACTIONS(1593), 6,
-      anon_sym_print,
-      anon_sym_async,
-      anon_sym_match,
-      anon_sym_exec,
-      anon_sym_type,
-      anon_sym_await,
-    STATE(797), 15,
-      sym_binary_operator,
-      sym_unary_operator,
-      sym_attribute,
-      sym_subscript,
-      sym_call,
-      sym_list,
-      sym_set,
-      sym_tuple,
-      sym_dictionary,
-      sym_list_comprehension,
-      sym_dictionary_comprehension,
-      sym_set_comprehension,
-      sym_generator_expression,
-      sym_parenthesized_expression,
-      sym_concatenated_string,
-  [40696] = 15,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1610), 1,
+    ACTIONS(1407), 1,
       anon_sym_DOT,
-    ACTIONS(1612), 1,
+    ACTIONS(1409), 1,
       anon_sym_LPAREN,
-    ACTIONS(1620), 1,
-      anon_sym_PIPE,
-    ACTIONS(1624), 1,
+    ACTIONS(1425), 1,
       anon_sym_LBRACK,
-    ACTIONS(1626), 1,
+    ACTIONS(1531), 1,
       anon_sym_STAR_STAR,
-    ACTIONS(1632), 1,
-      anon_sym_AMP,
-    ACTIONS(1634), 1,
-      anon_sym_CARET,
-    ACTIONS(1614), 2,
+    ACTIONS(1521), 2,
       anon_sym_STAR,
       anon_sym_SLASH,
-    ACTIONS(1616), 2,
-      anon_sym_GT_GT,
-      anon_sym_LT_LT,
-    ACTIONS(1622), 2,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-    STATE(792), 2,
+    STATE(619), 2,
       sym_argument_list,
       sym_generator_expression,
-    ACTIONS(1589), 3,
+    ACTIONS(1533), 3,
+      anon_sym_AT,
+      anon_sym_PERCENT,
+      anon_sym_SLASH_SLASH,
+    ACTIONS(1567), 3,
       anon_sym_EQ,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1628), 3,
-      anon_sym_AT,
-      anon_sym_PERCENT,
-      anon_sym_SLASH_SLASH,
-    ACTIONS(1587), 15,
-      sym__newline,
-      anon_sym_from,
+    ACTIONS(1565), 25,
+      anon_sym_RPAREN,
       anon_sym_COMMA,
+      anon_sym_GT_GT,
       anon_sym_if,
+      anon_sym_COLON,
+      anon_sym_else,
       anon_sym_in,
+      anon_sym_PIPE,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_RBRACK,
+      anon_sym_RBRACE,
       anon_sym_not,
       anon_sym_and,
       anon_sym_or,
+      anon_sym_AMP,
+      anon_sym_CARET,
+      anon_sym_LT_LT,
       anon_sym_LT_EQ,
       anon_sym_EQ_EQ,
       anon_sym_BANG_EQ,
       anon_sym_GT_EQ,
       anon_sym_LT_GT,
       anon_sym_is,
-      sym__semicolon,
-  [40764] = 11,
+      sym_type_conversion,
+  [35320] = 14,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1610), 1,
+    ACTIONS(1407), 1,
       anon_sym_DOT,
-    ACTIONS(1612), 1,
+    ACTIONS(1409), 1,
       anon_sym_LPAREN,
-    ACTIONS(1624), 1,
+    ACTIONS(1425), 1,
       anon_sym_LBRACK,
-    ACTIONS(1626), 1,
+    ACTIONS(1531), 1,
       anon_sym_STAR_STAR,
-    ACTIONS(1614), 2,
+    ACTIONS(1537), 1,
+      anon_sym_AMP,
+    ACTIONS(1539), 1,
+      anon_sym_CARET,
+    ACTIONS(1521), 2,
       anon_sym_STAR,
       anon_sym_SLASH,
-    ACTIONS(1622), 2,
+    ACTIONS(1523), 2,
+      anon_sym_GT_GT,
+      anon_sym_LT_LT,
+    ACTIONS(1529), 2,
       anon_sym_DASH,
       anon_sym_PLUS,
-    STATE(792), 2,
+    STATE(619), 2,
       sym_argument_list,
       sym_generator_expression,
-    ACTIONS(1573), 3,
+    ACTIONS(1533), 3,
+      anon_sym_AT,
+      anon_sym_PERCENT,
+      anon_sym_SLASH_SLASH,
+    ACTIONS(1567), 3,
       anon_sym_EQ,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1628), 3,
-      anon_sym_AT,
-      anon_sym_PERCENT,
-      anon_sym_SLASH_SLASH,
-    ACTIONS(1571), 20,
-      sym__newline,
-      anon_sym_from,
+    ACTIONS(1565), 19,
+      anon_sym_RPAREN,
       anon_sym_COMMA,
-      anon_sym_GT_GT,
       anon_sym_if,
+      anon_sym_COLON,
+      anon_sym_else,
       anon_sym_in,
       anon_sym_PIPE,
+      anon_sym_RBRACK,
+      anon_sym_RBRACE,
       anon_sym_not,
       anon_sym_and,
       anon_sym_or,
-      anon_sym_AMP,
-      anon_sym_CARET,
-      anon_sym_LT_LT,
       anon_sym_LT_EQ,
       anon_sym_EQ_EQ,
       anon_sym_BANG_EQ,
       anon_sym_GT_EQ,
       anon_sym_LT_GT,
       anon_sym_is,
-      sym__semicolon,
-  [40824] = 15,
+      sym_type_conversion,
+  [35389] = 15,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1610), 1,
+    ACTIONS(1407), 1,
       anon_sym_DOT,
-    ACTIONS(1612), 1,
+    ACTIONS(1409), 1,
       anon_sym_LPAREN,
-    ACTIONS(1620), 1,
-      anon_sym_PIPE,
-    ACTIONS(1624), 1,
+    ACTIONS(1425), 1,
       anon_sym_LBRACK,
-    ACTIONS(1626), 1,
+    ACTIONS(1527), 1,
+      anon_sym_PIPE,
+    ACTIONS(1531), 1,
       anon_sym_STAR_STAR,
-    ACTIONS(1632), 1,
+    ACTIONS(1537), 1,
       anon_sym_AMP,
-    ACTIONS(1634), 1,
+    ACTIONS(1539), 1,
       anon_sym_CARET,
-    ACTIONS(1614), 2,
+    ACTIONS(1521), 2,
       anon_sym_STAR,
       anon_sym_SLASH,
-    ACTIONS(1616), 2,
+    ACTIONS(1523), 2,
       anon_sym_GT_GT,
       anon_sym_LT_LT,
-    ACTIONS(1622), 2,
+    ACTIONS(1529), 2,
       anon_sym_DASH,
       anon_sym_PLUS,
-    STATE(792), 2,
+    STATE(619), 2,
       sym_argument_list,
       sym_generator_expression,
+    ACTIONS(1533), 3,
+      anon_sym_AT,
+      anon_sym_PERCENT,
+      anon_sym_SLASH_SLASH,
     ACTIONS(1581), 3,
       anon_sym_EQ,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1628), 3,
-      anon_sym_AT,
-      anon_sym_PERCENT,
-      anon_sym_SLASH_SLASH,
-    ACTIONS(1579), 15,
-      sym__newline,
-      anon_sym_from,
+    ACTIONS(1579), 18,
+      anon_sym_RPAREN,
       anon_sym_COMMA,
       anon_sym_if,
+      anon_sym_COLON,
+      anon_sym_else,
       anon_sym_in,
+      anon_sym_RBRACK,
+      anon_sym_RBRACE,
       anon_sym_not,
       anon_sym_and,
       anon_sym_or,
@@ -60595,90 +52510,92 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_GT_EQ,
       anon_sym_LT_GT,
       anon_sym_is,
-      sym__semicolon,
-  [40892] = 15,
+      sym_type_conversion,
+  [35460] = 11,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1610), 1,
+    ACTIONS(1407), 1,
       anon_sym_DOT,
-    ACTIONS(1612), 1,
+    ACTIONS(1409), 1,
       anon_sym_LPAREN,
-    ACTIONS(1620), 1,
-      anon_sym_PIPE,
-    ACTIONS(1624), 1,
+    ACTIONS(1425), 1,
       anon_sym_LBRACK,
-    ACTIONS(1626), 1,
+    ACTIONS(1531), 1,
       anon_sym_STAR_STAR,
-    ACTIONS(1632), 1,
+    ACTIONS(1521), 2,
+      anon_sym_STAR,
+      anon_sym_SLASH,
+    ACTIONS(1529), 2,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+    STATE(619), 2,
+      sym_argument_list,
+      sym_generator_expression,
+    ACTIONS(1533), 3,
+      anon_sym_AT,
+      anon_sym_PERCENT,
+      anon_sym_SLASH_SLASH,
+    ACTIONS(1567), 3,
+      anon_sym_EQ,
+      anon_sym_LT,
+      anon_sym_GT,
+    ACTIONS(1565), 23,
+      anon_sym_RPAREN,
+      anon_sym_COMMA,
+      anon_sym_GT_GT,
+      anon_sym_if,
+      anon_sym_COLON,
+      anon_sym_else,
+      anon_sym_in,
+      anon_sym_PIPE,
+      anon_sym_RBRACK,
+      anon_sym_RBRACE,
+      anon_sym_not,
+      anon_sym_and,
+      anon_sym_or,
       anon_sym_AMP,
-    ACTIONS(1634), 1,
       anon_sym_CARET,
-    ACTIONS(1614), 2,
-      anon_sym_STAR,
-      anon_sym_SLASH,
-    ACTIONS(1616), 2,
-      anon_sym_GT_GT,
       anon_sym_LT_LT,
-    ACTIONS(1622), 2,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-    STATE(792), 2,
-      sym_argument_list,
-      sym_generator_expression,
-    ACTIONS(1585), 3,
-      anon_sym_EQ,
-      anon_sym_LT,
-      anon_sym_GT,
-    ACTIONS(1628), 3,
-      anon_sym_AT,
-      anon_sym_PERCENT,
-      anon_sym_SLASH_SLASH,
-    ACTIONS(1583), 15,
-      sym__newline,
-      anon_sym_from,
-      anon_sym_COMMA,
-      anon_sym_if,
-      anon_sym_in,
-      anon_sym_not,
-      anon_sym_and,
-      anon_sym_or,
       anon_sym_LT_EQ,
       anon_sym_EQ_EQ,
       anon_sym_BANG_EQ,
       anon_sym_GT_EQ,
       anon_sym_LT_GT,
       anon_sym_is,
-      sym__semicolon,
-  [40960] = 8,
+      sym_type_conversion,
+  [35523] = 8,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1610), 1,
+    ACTIONS(1407), 1,
       anon_sym_DOT,
-    ACTIONS(1612), 1,
+    ACTIONS(1409), 1,
       anon_sym_LPAREN,
-    ACTIONS(1624), 1,
+    ACTIONS(1425), 1,
       anon_sym_LBRACK,
-    ACTIONS(1626), 1,
+    ACTIONS(1531), 1,
       anon_sym_STAR_STAR,
-    STATE(792), 2,
+    STATE(619), 2,
       sym_argument_list,
       sym_generator_expression,
-    ACTIONS(1573), 5,
+    ACTIONS(1567), 5,
       anon_sym_STAR,
       anon_sym_EQ,
       anon_sym_SLASH,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1571), 25,
-      sym__newline,
-      anon_sym_from,
+    ACTIONS(1565), 28,
+      anon_sym_RPAREN,
       anon_sym_COMMA,
       anon_sym_GT_GT,
       anon_sym_if,
+      anon_sym_COLON,
+      anon_sym_else,
       anon_sym_in,
       anon_sym_PIPE,
       anon_sym_DASH,
       anon_sym_PLUS,
+      anon_sym_RBRACK,
+      anon_sym_RBRACE,
       anon_sym_AT,
       anon_sym_not,
       anon_sym_and,
@@ -60694,17 +52611,1764 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_GT_EQ,
       anon_sym_LT_GT,
       anon_sym_is,
-      sym__semicolon,
-  [41014] = 3,
+      sym_type_conversion,
+  [35580] = 14,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1401), 4,
-      anon_sym_STAR,
-      anon_sym_SLASH,
-      anon_sym_LT,
-      anon_sym_GT,
-    ACTIONS(1399), 32,
+    ACTIONS(262), 1,
+      anon_sym_LPAREN,
+    ACTIONS(277), 1,
+      anon_sym_LBRACK,
+    ACTIONS(279), 1,
+      anon_sym_LBRACE,
+    ACTIONS(299), 1,
       sym__string_start,
+    ACTIONS(566), 1,
+      anon_sym_await,
+    ACTIONS(1583), 1,
+      anon_sym_not,
+    STATE(586), 1,
+      sym_string,
+    STATE(632), 1,
+      sym_primary_expression,
+    ACTIONS(293), 2,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(285), 3,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_TILDE,
+    ACTIONS(295), 5,
+      sym_integer,
+      sym_identifier,
+      sym_true,
+      sym_false,
+      sym_none,
+    ACTIONS(558), 5,
+      anon_sym_print,
+      anon_sym_async,
+      anon_sym_match,
+      anon_sym_exec,
+      anon_sym_type,
+    STATE(605), 16,
+      sym_binary_operator,
+      sym_unary_operator,
+      sym_attribute,
+      sym_subscript,
+      sym_call,
+      sym_list,
+      sym_set,
+      sym_tuple,
+      sym_dictionary,
+      sym_list_comprehension,
+      sym_dictionary_comprehension,
+      sym_set_comprehension,
+      sym_generator_expression,
+      sym_parenthesized_expression,
+      sym_concatenated_string,
+      sym_await,
+  [35649] = 13,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1407), 1,
+      anon_sym_DOT,
+    ACTIONS(1409), 1,
+      anon_sym_LPAREN,
+    ACTIONS(1425), 1,
+      anon_sym_LBRACK,
+    ACTIONS(1531), 1,
+      anon_sym_STAR_STAR,
+    ACTIONS(1539), 1,
+      anon_sym_CARET,
+    ACTIONS(1521), 2,
+      anon_sym_STAR,
+      anon_sym_SLASH,
+    ACTIONS(1523), 2,
+      anon_sym_GT_GT,
+      anon_sym_LT_LT,
+    ACTIONS(1529), 2,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+    STATE(619), 2,
+      sym_argument_list,
+      sym_generator_expression,
+    ACTIONS(1533), 3,
+      anon_sym_AT,
+      anon_sym_PERCENT,
+      anon_sym_SLASH_SLASH,
+    ACTIONS(1567), 3,
+      anon_sym_EQ,
+      anon_sym_LT,
+      anon_sym_GT,
+    ACTIONS(1565), 20,
+      anon_sym_RPAREN,
+      anon_sym_COMMA,
+      anon_sym_if,
+      anon_sym_COLON,
+      anon_sym_else,
+      anon_sym_in,
+      anon_sym_PIPE,
+      anon_sym_RBRACK,
+      anon_sym_RBRACE,
+      anon_sym_not,
+      anon_sym_and,
+      anon_sym_or,
+      anon_sym_AMP,
+      anon_sym_LT_EQ,
+      anon_sym_EQ_EQ,
+      anon_sym_BANG_EQ,
+      anon_sym_GT_EQ,
+      anon_sym_LT_GT,
+      anon_sym_is,
+      sym_type_conversion,
+  [35716] = 8,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1407), 1,
+      anon_sym_DOT,
+    ACTIONS(1409), 1,
+      anon_sym_LPAREN,
+    ACTIONS(1425), 1,
+      anon_sym_LBRACK,
+    ACTIONS(1531), 1,
+      anon_sym_STAR_STAR,
+    STATE(619), 2,
+      sym_argument_list,
+      sym_generator_expression,
+    ACTIONS(1587), 5,
+      anon_sym_STAR,
+      anon_sym_EQ,
+      anon_sym_SLASH,
+      anon_sym_LT,
+      anon_sym_GT,
+    ACTIONS(1585), 28,
+      anon_sym_RPAREN,
+      anon_sym_COMMA,
+      anon_sym_GT_GT,
+      anon_sym_if,
+      anon_sym_COLON,
+      anon_sym_else,
+      anon_sym_in,
+      anon_sym_PIPE,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_RBRACK,
+      anon_sym_RBRACE,
+      anon_sym_AT,
+      anon_sym_not,
+      anon_sym_and,
+      anon_sym_or,
+      anon_sym_PERCENT,
+      anon_sym_SLASH_SLASH,
+      anon_sym_AMP,
+      anon_sym_CARET,
+      anon_sym_LT_LT,
+      anon_sym_LT_EQ,
+      anon_sym_EQ_EQ,
+      anon_sym_BANG_EQ,
+      anon_sym_GT_EQ,
+      anon_sym_LT_GT,
+      anon_sym_is,
+      sym_type_conversion,
+  [35773] = 15,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1407), 1,
+      anon_sym_DOT,
+    ACTIONS(1409), 1,
+      anon_sym_LPAREN,
+    ACTIONS(1421), 1,
+      anon_sym_PIPE,
+    ACTIONS(1425), 1,
+      anon_sym_LBRACK,
+    ACTIONS(1427), 1,
+      anon_sym_STAR_STAR,
+    ACTIONS(1433), 1,
+      anon_sym_AMP,
+    ACTIONS(1435), 1,
+      anon_sym_CARET,
+    ACTIONS(1415), 2,
+      anon_sym_STAR,
+      anon_sym_SLASH,
+    ACTIONS(1417), 2,
+      anon_sym_GT_GT,
+      anon_sym_LT_LT,
+    ACTIONS(1423), 2,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+    STATE(619), 2,
+      sym_argument_list,
+      sym_generator_expression,
+    ACTIONS(1429), 3,
+      anon_sym_AT,
+      anon_sym_PERCENT,
+      anon_sym_SLASH_SLASH,
+    ACTIONS(1571), 3,
+      anon_sym_as,
+      anon_sym_LT,
+      anon_sym_GT,
+    ACTIONS(1569), 18,
+      anon_sym_RPAREN,
+      anon_sym_COMMA,
+      anon_sym_if,
+      anon_sym_COLON,
+      anon_sym_async,
+      anon_sym_for,
+      anon_sym_in,
+      anon_sym_RBRACK,
+      anon_sym_RBRACE,
+      anon_sym_not,
+      anon_sym_and,
+      anon_sym_or,
+      anon_sym_LT_EQ,
+      anon_sym_EQ_EQ,
+      anon_sym_BANG_EQ,
+      anon_sym_GT_EQ,
+      anon_sym_LT_GT,
+      anon_sym_is,
+  [35844] = 15,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1407), 1,
+      anon_sym_DOT,
+    ACTIONS(1409), 1,
+      anon_sym_LPAREN,
+    ACTIONS(1421), 1,
+      anon_sym_PIPE,
+    ACTIONS(1425), 1,
+      anon_sym_LBRACK,
+    ACTIONS(1427), 1,
+      anon_sym_STAR_STAR,
+    ACTIONS(1433), 1,
+      anon_sym_AMP,
+    ACTIONS(1435), 1,
+      anon_sym_CARET,
+    ACTIONS(1415), 2,
+      anon_sym_STAR,
+      anon_sym_SLASH,
+    ACTIONS(1417), 2,
+      anon_sym_GT_GT,
+      anon_sym_LT_LT,
+    ACTIONS(1423), 2,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+    STATE(619), 2,
+      sym_argument_list,
+      sym_generator_expression,
+    ACTIONS(1429), 3,
+      anon_sym_AT,
+      anon_sym_PERCENT,
+      anon_sym_SLASH_SLASH,
+    ACTIONS(1591), 3,
+      anon_sym_as,
+      anon_sym_LT,
+      anon_sym_GT,
+    ACTIONS(1589), 18,
+      anon_sym_RPAREN,
+      anon_sym_COMMA,
+      anon_sym_if,
+      anon_sym_COLON,
+      anon_sym_async,
+      anon_sym_for,
+      anon_sym_in,
+      anon_sym_RBRACK,
+      anon_sym_RBRACE,
+      anon_sym_not,
+      anon_sym_and,
+      anon_sym_or,
+      anon_sym_LT_EQ,
+      anon_sym_EQ_EQ,
+      anon_sym_BANG_EQ,
+      anon_sym_GT_EQ,
+      anon_sym_LT_GT,
+      anon_sym_is,
+  [35915] = 8,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1407), 1,
+      anon_sym_DOT,
+    ACTIONS(1409), 1,
+      anon_sym_LPAREN,
+    ACTIONS(1425), 1,
+      anon_sym_LBRACK,
+    ACTIONS(1427), 1,
+      anon_sym_STAR_STAR,
+    STATE(619), 2,
+      sym_argument_list,
+      sym_generator_expression,
+    ACTIONS(1587), 5,
+      anon_sym_as,
+      anon_sym_STAR,
+      anon_sym_SLASH,
+      anon_sym_LT,
+      anon_sym_GT,
+    ACTIONS(1585), 28,
+      anon_sym_RPAREN,
+      anon_sym_COMMA,
+      anon_sym_GT_GT,
+      anon_sym_if,
+      anon_sym_COLON,
+      anon_sym_async,
+      anon_sym_for,
+      anon_sym_in,
+      anon_sym_PIPE,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_RBRACK,
+      anon_sym_RBRACE,
+      anon_sym_AT,
+      anon_sym_not,
+      anon_sym_and,
+      anon_sym_or,
+      anon_sym_PERCENT,
+      anon_sym_SLASH_SLASH,
+      anon_sym_AMP,
+      anon_sym_CARET,
+      anon_sym_LT_LT,
+      anon_sym_LT_EQ,
+      anon_sym_EQ_EQ,
+      anon_sym_BANG_EQ,
+      anon_sym_GT_EQ,
+      anon_sym_LT_GT,
+      anon_sym_is,
+  [35972] = 14,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(51), 1,
+      anon_sym_LBRACE,
+    ACTIONS(81), 1,
+      sym__string_start,
+    ACTIONS(568), 1,
+      anon_sym_LPAREN,
+    ACTIONS(574), 1,
+      anon_sym_LBRACK,
+    ACTIONS(576), 1,
+      anon_sym_await,
+    ACTIONS(1593), 1,
+      anon_sym_not,
+    STATE(709), 1,
+      sym_string,
+    STATE(721), 1,
+      sym_primary_expression,
+    ACTIONS(75), 2,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(47), 3,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_TILDE,
+    ACTIONS(77), 5,
+      sym_integer,
+      sym_identifier,
+      sym_true,
+      sym_false,
+      sym_none,
+    ACTIONS(570), 5,
+      anon_sym_print,
+      anon_sym_async,
+      anon_sym_match,
+      anon_sym_exec,
+      anon_sym_type,
+    STATE(759), 16,
+      sym_binary_operator,
+      sym_unary_operator,
+      sym_attribute,
+      sym_subscript,
+      sym_call,
+      sym_list,
+      sym_set,
+      sym_tuple,
+      sym_dictionary,
+      sym_list_comprehension,
+      sym_dictionary_comprehension,
+      sym_set_comprehension,
+      sym_generator_expression,
+      sym_parenthesized_expression,
+      sym_concatenated_string,
+      sym_await,
+  [36041] = 15,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1407), 1,
+      anon_sym_DOT,
+    ACTIONS(1409), 1,
+      anon_sym_LPAREN,
+    ACTIONS(1425), 1,
+      anon_sym_LBRACK,
+    ACTIONS(1527), 1,
+      anon_sym_PIPE,
+    ACTIONS(1531), 1,
+      anon_sym_STAR_STAR,
+    ACTIONS(1537), 1,
+      anon_sym_AMP,
+    ACTIONS(1539), 1,
+      anon_sym_CARET,
+    ACTIONS(1521), 2,
+      anon_sym_STAR,
+      anon_sym_SLASH,
+    ACTIONS(1523), 2,
+      anon_sym_GT_GT,
+      anon_sym_LT_LT,
+    ACTIONS(1529), 2,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+    STATE(619), 2,
+      sym_argument_list,
+      sym_generator_expression,
+    ACTIONS(1533), 3,
+      anon_sym_AT,
+      anon_sym_PERCENT,
+      anon_sym_SLASH_SLASH,
+    ACTIONS(1591), 3,
+      anon_sym_EQ,
+      anon_sym_LT,
+      anon_sym_GT,
+    ACTIONS(1589), 18,
+      anon_sym_RPAREN,
+      anon_sym_COMMA,
+      anon_sym_if,
+      anon_sym_COLON,
+      anon_sym_else,
+      anon_sym_in,
+      anon_sym_RBRACK,
+      anon_sym_RBRACE,
+      anon_sym_not,
+      anon_sym_and,
+      anon_sym_or,
+      anon_sym_LT_EQ,
+      anon_sym_EQ_EQ,
+      anon_sym_BANG_EQ,
+      anon_sym_GT_EQ,
+      anon_sym_LT_GT,
+      anon_sym_is,
+      sym_type_conversion,
+  [36112] = 13,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1407), 1,
+      anon_sym_DOT,
+    ACTIONS(1409), 1,
+      anon_sym_LPAREN,
+    ACTIONS(1425), 1,
+      anon_sym_LBRACK,
+    ACTIONS(1427), 1,
+      anon_sym_STAR_STAR,
+    ACTIONS(1435), 1,
+      anon_sym_CARET,
+    ACTIONS(1415), 2,
+      anon_sym_STAR,
+      anon_sym_SLASH,
+    ACTIONS(1417), 2,
+      anon_sym_GT_GT,
+      anon_sym_LT_LT,
+    ACTIONS(1423), 2,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+    STATE(619), 2,
+      sym_argument_list,
+      sym_generator_expression,
+    ACTIONS(1429), 3,
+      anon_sym_AT,
+      anon_sym_PERCENT,
+      anon_sym_SLASH_SLASH,
+    ACTIONS(1567), 3,
+      anon_sym_as,
+      anon_sym_LT,
+      anon_sym_GT,
+    ACTIONS(1565), 20,
+      anon_sym_RPAREN,
+      anon_sym_COMMA,
+      anon_sym_if,
+      anon_sym_COLON,
+      anon_sym_async,
+      anon_sym_for,
+      anon_sym_in,
+      anon_sym_PIPE,
+      anon_sym_RBRACK,
+      anon_sym_RBRACE,
+      anon_sym_not,
+      anon_sym_and,
+      anon_sym_or,
+      anon_sym_AMP,
+      anon_sym_LT_EQ,
+      anon_sym_EQ_EQ,
+      anon_sym_BANG_EQ,
+      anon_sym_GT_EQ,
+      anon_sym_LT_GT,
+      anon_sym_is,
+  [36179] = 8,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1407), 1,
+      anon_sym_DOT,
+    ACTIONS(1409), 1,
+      anon_sym_LPAREN,
+    ACTIONS(1425), 1,
+      anon_sym_LBRACK,
+    ACTIONS(1427), 1,
+      anon_sym_STAR_STAR,
+    STATE(619), 2,
+      sym_argument_list,
+      sym_generator_expression,
+    ACTIONS(1567), 5,
+      anon_sym_as,
+      anon_sym_STAR,
+      anon_sym_SLASH,
+      anon_sym_LT,
+      anon_sym_GT,
+    ACTIONS(1565), 28,
+      anon_sym_RPAREN,
+      anon_sym_COMMA,
+      anon_sym_GT_GT,
+      anon_sym_if,
+      anon_sym_COLON,
+      anon_sym_async,
+      anon_sym_for,
+      anon_sym_in,
+      anon_sym_PIPE,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_RBRACK,
+      anon_sym_RBRACE,
+      anon_sym_AT,
+      anon_sym_not,
+      anon_sym_and,
+      anon_sym_or,
+      anon_sym_PERCENT,
+      anon_sym_SLASH_SLASH,
+      anon_sym_AMP,
+      anon_sym_CARET,
+      anon_sym_LT_LT,
+      anon_sym_LT_EQ,
+      anon_sym_EQ_EQ,
+      anon_sym_BANG_EQ,
+      anon_sym_GT_EQ,
+      anon_sym_LT_GT,
+      anon_sym_is,
+  [36236] = 11,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1407), 1,
+      anon_sym_DOT,
+    ACTIONS(1409), 1,
+      anon_sym_LPAREN,
+    ACTIONS(1425), 1,
+      anon_sym_LBRACK,
+    ACTIONS(1427), 1,
+      anon_sym_STAR_STAR,
+    ACTIONS(1415), 2,
+      anon_sym_STAR,
+      anon_sym_SLASH,
+    ACTIONS(1423), 2,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+    STATE(619), 2,
+      sym_argument_list,
+      sym_generator_expression,
+    ACTIONS(1429), 3,
+      anon_sym_AT,
+      anon_sym_PERCENT,
+      anon_sym_SLASH_SLASH,
+    ACTIONS(1567), 3,
+      anon_sym_as,
+      anon_sym_LT,
+      anon_sym_GT,
+    ACTIONS(1565), 23,
+      anon_sym_RPAREN,
+      anon_sym_COMMA,
+      anon_sym_GT_GT,
+      anon_sym_if,
+      anon_sym_COLON,
+      anon_sym_async,
+      anon_sym_for,
+      anon_sym_in,
+      anon_sym_PIPE,
+      anon_sym_RBRACK,
+      anon_sym_RBRACE,
+      anon_sym_not,
+      anon_sym_and,
+      anon_sym_or,
+      anon_sym_AMP,
+      anon_sym_CARET,
+      anon_sym_LT_LT,
+      anon_sym_LT_EQ,
+      anon_sym_EQ_EQ,
+      anon_sym_BANG_EQ,
+      anon_sym_GT_EQ,
+      anon_sym_LT_GT,
+      anon_sym_is,
+  [36299] = 14,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(279), 1,
+      anon_sym_LBRACE,
+    ACTIONS(299), 1,
+      sym__string_start,
+    ACTIONS(578), 1,
+      anon_sym_LPAREN,
+    ACTIONS(584), 1,
+      anon_sym_LBRACK,
+    ACTIONS(586), 1,
+      anon_sym_await,
+    ACTIONS(1595), 1,
+      anon_sym_not,
+    STATE(586), 1,
+      sym_string,
+    STATE(648), 1,
+      sym_primary_expression,
+    ACTIONS(293), 2,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(582), 3,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_TILDE,
+    ACTIONS(295), 5,
+      sym_integer,
+      sym_identifier,
+      sym_true,
+      sym_false,
+      sym_none,
+    ACTIONS(558), 5,
+      anon_sym_print,
+      anon_sym_async,
+      anon_sym_match,
+      anon_sym_exec,
+      anon_sym_type,
+    STATE(605), 16,
+      sym_binary_operator,
+      sym_unary_operator,
+      sym_attribute,
+      sym_subscript,
+      sym_call,
+      sym_list,
+      sym_set,
+      sym_tuple,
+      sym_dictionary,
+      sym_list_comprehension,
+      sym_dictionary_comprehension,
+      sym_set_comprehension,
+      sym_generator_expression,
+      sym_parenthesized_expression,
+      sym_concatenated_string,
+      sym_await,
+  [36368] = 8,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1407), 1,
+      anon_sym_DOT,
+    ACTIONS(1409), 1,
+      anon_sym_LPAREN,
+    ACTIONS(1425), 1,
+      anon_sym_LBRACK,
+    ACTIONS(1427), 1,
+      anon_sym_STAR_STAR,
+    STATE(619), 2,
+      sym_argument_list,
+      sym_generator_expression,
+    ACTIONS(1577), 5,
+      anon_sym_as,
+      anon_sym_STAR,
+      anon_sym_SLASH,
+      anon_sym_LT,
+      anon_sym_GT,
+    ACTIONS(1575), 28,
+      anon_sym_RPAREN,
+      anon_sym_COMMA,
+      anon_sym_GT_GT,
+      anon_sym_if,
+      anon_sym_COLON,
+      anon_sym_async,
+      anon_sym_for,
+      anon_sym_in,
+      anon_sym_PIPE,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_RBRACK,
+      anon_sym_RBRACE,
+      anon_sym_AT,
+      anon_sym_not,
+      anon_sym_and,
+      anon_sym_or,
+      anon_sym_PERCENT,
+      anon_sym_SLASH_SLASH,
+      anon_sym_AMP,
+      anon_sym_CARET,
+      anon_sym_LT_LT,
+      anon_sym_LT_EQ,
+      anon_sym_EQ_EQ,
+      anon_sym_BANG_EQ,
+      anon_sym_GT_EQ,
+      anon_sym_LT_GT,
+      anon_sym_is,
+  [36425] = 15,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1407), 1,
+      anon_sym_DOT,
+    ACTIONS(1409), 1,
+      anon_sym_LPAREN,
+    ACTIONS(1421), 1,
+      anon_sym_PIPE,
+    ACTIONS(1425), 1,
+      anon_sym_LBRACK,
+    ACTIONS(1427), 1,
+      anon_sym_STAR_STAR,
+    ACTIONS(1433), 1,
+      anon_sym_AMP,
+    ACTIONS(1435), 1,
+      anon_sym_CARET,
+    ACTIONS(1415), 2,
+      anon_sym_STAR,
+      anon_sym_SLASH,
+    ACTIONS(1417), 2,
+      anon_sym_GT_GT,
+      anon_sym_LT_LT,
+    ACTIONS(1423), 2,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+    STATE(619), 2,
+      sym_argument_list,
+      sym_generator_expression,
+    ACTIONS(1429), 3,
+      anon_sym_AT,
+      anon_sym_PERCENT,
+      anon_sym_SLASH_SLASH,
+    ACTIONS(1581), 3,
+      anon_sym_as,
+      anon_sym_LT,
+      anon_sym_GT,
+    ACTIONS(1579), 18,
+      anon_sym_RPAREN,
+      anon_sym_COMMA,
+      anon_sym_if,
+      anon_sym_COLON,
+      anon_sym_async,
+      anon_sym_for,
+      anon_sym_in,
+      anon_sym_RBRACK,
+      anon_sym_RBRACE,
+      anon_sym_not,
+      anon_sym_and,
+      anon_sym_or,
+      anon_sym_LT_EQ,
+      anon_sym_EQ_EQ,
+      anon_sym_BANG_EQ,
+      anon_sym_GT_EQ,
+      anon_sym_LT_GT,
+      anon_sym_is,
+  [36496] = 14,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1407), 1,
+      anon_sym_DOT,
+    ACTIONS(1409), 1,
+      anon_sym_LPAREN,
+    ACTIONS(1425), 1,
+      anon_sym_LBRACK,
+    ACTIONS(1427), 1,
+      anon_sym_STAR_STAR,
+    ACTIONS(1433), 1,
+      anon_sym_AMP,
+    ACTIONS(1435), 1,
+      anon_sym_CARET,
+    ACTIONS(1415), 2,
+      anon_sym_STAR,
+      anon_sym_SLASH,
+    ACTIONS(1417), 2,
+      anon_sym_GT_GT,
+      anon_sym_LT_LT,
+    ACTIONS(1423), 2,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+    STATE(619), 2,
+      sym_argument_list,
+      sym_generator_expression,
+    ACTIONS(1429), 3,
+      anon_sym_AT,
+      anon_sym_PERCENT,
+      anon_sym_SLASH_SLASH,
+    ACTIONS(1567), 3,
+      anon_sym_as,
+      anon_sym_LT,
+      anon_sym_GT,
+    ACTIONS(1565), 19,
+      anon_sym_RPAREN,
+      anon_sym_COMMA,
+      anon_sym_if,
+      anon_sym_COLON,
+      anon_sym_async,
+      anon_sym_for,
+      anon_sym_in,
+      anon_sym_PIPE,
+      anon_sym_RBRACK,
+      anon_sym_RBRACE,
+      anon_sym_not,
+      anon_sym_and,
+      anon_sym_or,
+      anon_sym_LT_EQ,
+      anon_sym_EQ_EQ,
+      anon_sym_BANG_EQ,
+      anon_sym_GT_EQ,
+      anon_sym_LT_GT,
+      anon_sym_is,
+  [36565] = 10,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1407), 1,
+      anon_sym_DOT,
+    ACTIONS(1409), 1,
+      anon_sym_LPAREN,
+    ACTIONS(1425), 1,
+      anon_sym_LBRACK,
+    ACTIONS(1427), 1,
+      anon_sym_STAR_STAR,
+    ACTIONS(1415), 2,
+      anon_sym_STAR,
+      anon_sym_SLASH,
+    STATE(619), 2,
+      sym_argument_list,
+      sym_generator_expression,
+    ACTIONS(1429), 3,
+      anon_sym_AT,
+      anon_sym_PERCENT,
+      anon_sym_SLASH_SLASH,
+    ACTIONS(1567), 3,
+      anon_sym_as,
+      anon_sym_LT,
+      anon_sym_GT,
+    ACTIONS(1565), 25,
+      anon_sym_RPAREN,
+      anon_sym_COMMA,
+      anon_sym_GT_GT,
+      anon_sym_if,
+      anon_sym_COLON,
+      anon_sym_async,
+      anon_sym_for,
+      anon_sym_in,
+      anon_sym_PIPE,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_RBRACK,
+      anon_sym_RBRACE,
+      anon_sym_not,
+      anon_sym_and,
+      anon_sym_or,
+      anon_sym_AMP,
+      anon_sym_CARET,
+      anon_sym_LT_LT,
+      anon_sym_LT_EQ,
+      anon_sym_EQ_EQ,
+      anon_sym_BANG_EQ,
+      anon_sym_GT_EQ,
+      anon_sym_LT_GT,
+      anon_sym_is,
+  [36626] = 4,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1090), 1,
+      anon_sym_COLON_EQ,
+    ACTIONS(1079), 6,
+      anon_sym_STAR,
+      anon_sym_COLON,
+      anon_sym_EQ,
+      anon_sym_SLASH,
+      anon_sym_LT,
+      anon_sym_GT,
+    ACTIONS(1074), 31,
+      anon_sym_DOT,
+      anon_sym_LPAREN,
+      anon_sym_RPAREN,
+      anon_sym_COMMA,
+      anon_sym_GT_GT,
+      anon_sym_if,
+      anon_sym_else,
+      anon_sym_in,
+      anon_sym_PIPE,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_RBRACK,
+      anon_sym_RBRACE,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_not,
+      anon_sym_and,
+      anon_sym_or,
+      anon_sym_PERCENT,
+      anon_sym_SLASH_SLASH,
+      anon_sym_AMP,
+      anon_sym_CARET,
+      anon_sym_LT_LT,
+      anon_sym_LT_EQ,
+      anon_sym_EQ_EQ,
+      anon_sym_BANG_EQ,
+      anon_sym_GT_EQ,
+      anon_sym_LT_GT,
+      anon_sym_is,
+      sym_type_conversion,
+  [36674] = 13,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(279), 1,
+      anon_sym_LBRACE,
+    ACTIONS(299), 1,
+      sym__string_start,
+    ACTIONS(578), 1,
+      anon_sym_LPAREN,
+    ACTIONS(584), 1,
+      anon_sym_LBRACK,
+    ACTIONS(586), 1,
+      anon_sym_await,
+    STATE(586), 1,
+      sym_string,
+    STATE(649), 1,
+      sym_primary_expression,
+    ACTIONS(293), 2,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(582), 3,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_TILDE,
+    ACTIONS(295), 5,
+      sym_integer,
+      sym_identifier,
+      sym_true,
+      sym_false,
+      sym_none,
+    ACTIONS(558), 5,
+      anon_sym_print,
+      anon_sym_async,
+      anon_sym_match,
+      anon_sym_exec,
+      anon_sym_type,
+    STATE(605), 16,
+      sym_binary_operator,
+      sym_unary_operator,
+      sym_attribute,
+      sym_subscript,
+      sym_call,
+      sym_list,
+      sym_set,
+      sym_tuple,
+      sym_dictionary,
+      sym_list_comprehension,
+      sym_dictionary_comprehension,
+      sym_set_comprehension,
+      sym_generator_expression,
+      sym_parenthesized_expression,
+      sym_concatenated_string,
+      sym_await,
+  [36740] = 13,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(592), 1,
+      anon_sym_LPAREN,
+    ACTIONS(600), 1,
+      anon_sym_LBRACK,
+    ACTIONS(602), 1,
+      anon_sym_LBRACE,
+    ACTIONS(606), 1,
+      anon_sym_await,
+    ACTIONS(608), 1,
+      sym__string_start,
+    STATE(713), 1,
+      sym_string,
+    STATE(748), 1,
+      sym_primary_expression,
+    ACTIONS(604), 2,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(598), 3,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_TILDE,
+    ACTIONS(590), 5,
+      sym_integer,
+      sym_identifier,
+      sym_true,
+      sym_false,
+      sym_none,
+    ACTIONS(594), 5,
+      anon_sym_print,
+      anon_sym_async,
+      anon_sym_match,
+      anon_sym_exec,
+      anon_sym_type,
+    STATE(827), 16,
+      sym_binary_operator,
+      sym_unary_operator,
+      sym_attribute,
+      sym_subscript,
+      sym_call,
+      sym_list,
+      sym_set,
+      sym_tuple,
+      sym_dictionary,
+      sym_list_comprehension,
+      sym_dictionary_comprehension,
+      sym_set_comprehension,
+      sym_generator_expression,
+      sym_parenthesized_expression,
+      sym_concatenated_string,
+      sym_await,
+  [36806] = 13,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(51), 1,
+      anon_sym_LBRACE,
+    ACTIONS(81), 1,
+      sym__string_start,
+    ACTIONS(568), 1,
+      anon_sym_LPAREN,
+    ACTIONS(574), 1,
+      anon_sym_LBRACK,
+    ACTIONS(576), 1,
+      anon_sym_await,
+    STATE(709), 1,
+      sym_string,
+    STATE(711), 1,
+      sym_primary_expression,
+    ACTIONS(75), 2,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(47), 3,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_TILDE,
+    ACTIONS(77), 5,
+      sym_integer,
+      sym_identifier,
+      sym_true,
+      sym_false,
+      sym_none,
+    ACTIONS(570), 5,
+      anon_sym_print,
+      anon_sym_async,
+      anon_sym_match,
+      anon_sym_exec,
+      anon_sym_type,
+    STATE(759), 16,
+      sym_binary_operator,
+      sym_unary_operator,
+      sym_attribute,
+      sym_subscript,
+      sym_call,
+      sym_list,
+      sym_set,
+      sym_tuple,
+      sym_dictionary,
+      sym_list_comprehension,
+      sym_dictionary_comprehension,
+      sym_set_comprehension,
+      sym_generator_expression,
+      sym_parenthesized_expression,
+      sym_concatenated_string,
+      sym_await,
+  [36872] = 13,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(592), 1,
+      anon_sym_LPAREN,
+    ACTIONS(600), 1,
+      anon_sym_LBRACK,
+    ACTIONS(602), 1,
+      anon_sym_LBRACE,
+    ACTIONS(606), 1,
+      anon_sym_await,
+    ACTIONS(608), 1,
+      sym__string_start,
+    STATE(713), 1,
+      sym_string,
+    STATE(746), 1,
+      sym_primary_expression,
+    ACTIONS(604), 2,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(598), 3,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_TILDE,
+    ACTIONS(590), 5,
+      sym_integer,
+      sym_identifier,
+      sym_true,
+      sym_false,
+      sym_none,
+    ACTIONS(594), 5,
+      anon_sym_print,
+      anon_sym_async,
+      anon_sym_match,
+      anon_sym_exec,
+      anon_sym_type,
+    STATE(827), 16,
+      sym_binary_operator,
+      sym_unary_operator,
+      sym_attribute,
+      sym_subscript,
+      sym_call,
+      sym_list,
+      sym_set,
+      sym_tuple,
+      sym_dictionary,
+      sym_list_comprehension,
+      sym_dictionary_comprehension,
+      sym_set_comprehension,
+      sym_generator_expression,
+      sym_parenthesized_expression,
+      sym_concatenated_string,
+      sym_await,
+  [36938] = 13,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(592), 1,
+      anon_sym_LPAREN,
+    ACTIONS(600), 1,
+      anon_sym_LBRACK,
+    ACTIONS(602), 1,
+      anon_sym_LBRACE,
+    ACTIONS(606), 1,
+      anon_sym_await,
+    ACTIONS(608), 1,
+      sym__string_start,
+    STATE(713), 1,
+      sym_string,
+    STATE(745), 1,
+      sym_primary_expression,
+    ACTIONS(604), 2,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(598), 3,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_TILDE,
+    ACTIONS(590), 5,
+      sym_integer,
+      sym_identifier,
+      sym_true,
+      sym_false,
+      sym_none,
+    ACTIONS(594), 5,
+      anon_sym_print,
+      anon_sym_async,
+      anon_sym_match,
+      anon_sym_exec,
+      anon_sym_type,
+    STATE(827), 16,
+      sym_binary_operator,
+      sym_unary_operator,
+      sym_attribute,
+      sym_subscript,
+      sym_call,
+      sym_list,
+      sym_set,
+      sym_tuple,
+      sym_dictionary,
+      sym_list_comprehension,
+      sym_dictionary_comprehension,
+      sym_set_comprehension,
+      sym_generator_expression,
+      sym_parenthesized_expression,
+      sym_concatenated_string,
+      sym_await,
+  [37004] = 13,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(262), 1,
+      anon_sym_LPAREN,
+    ACTIONS(277), 1,
+      anon_sym_LBRACK,
+    ACTIONS(279), 1,
+      anon_sym_LBRACE,
+    ACTIONS(299), 1,
+      sym__string_start,
+    ACTIONS(566), 1,
+      anon_sym_await,
+    STATE(586), 1,
+      sym_string,
+    STATE(642), 1,
+      sym_primary_expression,
+    ACTIONS(293), 2,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(285), 3,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_TILDE,
+    ACTIONS(295), 5,
+      sym_integer,
+      sym_identifier,
+      sym_true,
+      sym_false,
+      sym_none,
+    ACTIONS(558), 5,
+      anon_sym_print,
+      anon_sym_async,
+      anon_sym_match,
+      anon_sym_exec,
+      anon_sym_type,
+    STATE(605), 16,
+      sym_binary_operator,
+      sym_unary_operator,
+      sym_attribute,
+      sym_subscript,
+      sym_call,
+      sym_list,
+      sym_set,
+      sym_tuple,
+      sym_dictionary,
+      sym_list_comprehension,
+      sym_dictionary_comprehension,
+      sym_set_comprehension,
+      sym_generator_expression,
+      sym_parenthesized_expression,
+      sym_concatenated_string,
+      sym_await,
+  [37070] = 13,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(592), 1,
+      anon_sym_LPAREN,
+    ACTIONS(600), 1,
+      anon_sym_LBRACK,
+    ACTIONS(602), 1,
+      anon_sym_LBRACE,
+    ACTIONS(606), 1,
+      anon_sym_await,
+    ACTIONS(608), 1,
+      sym__string_start,
+    STATE(713), 1,
+      sym_string,
+    STATE(742), 1,
+      sym_primary_expression,
+    ACTIONS(604), 2,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(598), 3,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_TILDE,
+    ACTIONS(590), 5,
+      sym_integer,
+      sym_identifier,
+      sym_true,
+      sym_false,
+      sym_none,
+    ACTIONS(594), 5,
+      anon_sym_print,
+      anon_sym_async,
+      anon_sym_match,
+      anon_sym_exec,
+      anon_sym_type,
+    STATE(827), 16,
+      sym_binary_operator,
+      sym_unary_operator,
+      sym_attribute,
+      sym_subscript,
+      sym_call,
+      sym_list,
+      sym_set,
+      sym_tuple,
+      sym_dictionary,
+      sym_list_comprehension,
+      sym_dictionary_comprehension,
+      sym_set_comprehension,
+      sym_generator_expression,
+      sym_parenthesized_expression,
+      sym_concatenated_string,
+      sym_await,
+  [37136] = 13,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(592), 1,
+      anon_sym_LPAREN,
+    ACTIONS(600), 1,
+      anon_sym_LBRACK,
+    ACTIONS(602), 1,
+      anon_sym_LBRACE,
+    ACTIONS(606), 1,
+      anon_sym_await,
+    ACTIONS(608), 1,
+      sym__string_start,
+    STATE(713), 1,
+      sym_string,
+    STATE(752), 1,
+      sym_primary_expression,
+    ACTIONS(604), 2,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(598), 3,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_TILDE,
+    ACTIONS(590), 5,
+      sym_integer,
+      sym_identifier,
+      sym_true,
+      sym_false,
+      sym_none,
+    ACTIONS(594), 5,
+      anon_sym_print,
+      anon_sym_async,
+      anon_sym_match,
+      anon_sym_exec,
+      anon_sym_type,
+    STATE(827), 16,
+      sym_binary_operator,
+      sym_unary_operator,
+      sym_attribute,
+      sym_subscript,
+      sym_call,
+      sym_list,
+      sym_set,
+      sym_tuple,
+      sym_dictionary,
+      sym_list_comprehension,
+      sym_dictionary_comprehension,
+      sym_set_comprehension,
+      sym_generator_expression,
+      sym_parenthesized_expression,
+      sym_concatenated_string,
+      sym_await,
+  [37202] = 13,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(262), 1,
+      anon_sym_LPAREN,
+    ACTIONS(277), 1,
+      anon_sym_LBRACK,
+    ACTIONS(279), 1,
+      anon_sym_LBRACE,
+    ACTIONS(299), 1,
+      sym__string_start,
+    ACTIONS(566), 1,
+      anon_sym_await,
+    STATE(586), 1,
+      sym_string,
+    STATE(625), 1,
+      sym_primary_expression,
+    ACTIONS(293), 2,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(285), 3,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_TILDE,
+    ACTIONS(295), 5,
+      sym_integer,
+      sym_identifier,
+      sym_true,
+      sym_false,
+      sym_none,
+    ACTIONS(558), 5,
+      anon_sym_print,
+      anon_sym_async,
+      anon_sym_match,
+      anon_sym_exec,
+      anon_sym_type,
+    STATE(605), 16,
+      sym_binary_operator,
+      sym_unary_operator,
+      sym_attribute,
+      sym_subscript,
+      sym_call,
+      sym_list,
+      sym_set,
+      sym_tuple,
+      sym_dictionary,
+      sym_list_comprehension,
+      sym_dictionary_comprehension,
+      sym_set_comprehension,
+      sym_generator_expression,
+      sym_parenthesized_expression,
+      sym_concatenated_string,
+      sym_await,
+  [37268] = 13,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(592), 1,
+      anon_sym_LPAREN,
+    ACTIONS(600), 1,
+      anon_sym_LBRACK,
+    ACTIONS(602), 1,
+      anon_sym_LBRACE,
+    ACTIONS(606), 1,
+      anon_sym_await,
+    ACTIONS(608), 1,
+      sym__string_start,
+    STATE(713), 1,
+      sym_string,
+    STATE(751), 1,
+      sym_primary_expression,
+    ACTIONS(604), 2,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(598), 3,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_TILDE,
+    ACTIONS(590), 5,
+      sym_integer,
+      sym_identifier,
+      sym_true,
+      sym_false,
+      sym_none,
+    ACTIONS(594), 5,
+      anon_sym_print,
+      anon_sym_async,
+      anon_sym_match,
+      anon_sym_exec,
+      anon_sym_type,
+    STATE(827), 16,
+      sym_binary_operator,
+      sym_unary_operator,
+      sym_attribute,
+      sym_subscript,
+      sym_call,
+      sym_list,
+      sym_set,
+      sym_tuple,
+      sym_dictionary,
+      sym_list_comprehension,
+      sym_dictionary_comprehension,
+      sym_set_comprehension,
+      sym_generator_expression,
+      sym_parenthesized_expression,
+      sym_concatenated_string,
+      sym_await,
+  [37334] = 13,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(592), 1,
+      anon_sym_LPAREN,
+    ACTIONS(600), 1,
+      anon_sym_LBRACK,
+    ACTIONS(602), 1,
+      anon_sym_LBRACE,
+    ACTIONS(606), 1,
+      anon_sym_await,
+    ACTIONS(608), 1,
+      sym__string_start,
+    STATE(713), 1,
+      sym_string,
+    STATE(743), 1,
+      sym_primary_expression,
+    ACTIONS(604), 2,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(598), 3,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_TILDE,
+    ACTIONS(590), 5,
+      sym_integer,
+      sym_identifier,
+      sym_true,
+      sym_false,
+      sym_none,
+    ACTIONS(594), 5,
+      anon_sym_print,
+      anon_sym_async,
+      anon_sym_match,
+      anon_sym_exec,
+      anon_sym_type,
+    STATE(827), 16,
+      sym_binary_operator,
+      sym_unary_operator,
+      sym_attribute,
+      sym_subscript,
+      sym_call,
+      sym_list,
+      sym_set,
+      sym_tuple,
+      sym_dictionary,
+      sym_list_comprehension,
+      sym_dictionary_comprehension,
+      sym_set_comprehension,
+      sym_generator_expression,
+      sym_parenthesized_expression,
+      sym_concatenated_string,
+      sym_await,
+  [37400] = 13,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(279), 1,
+      anon_sym_LBRACE,
+    ACTIONS(299), 1,
+      sym__string_start,
+    ACTIONS(578), 1,
+      anon_sym_LPAREN,
+    ACTIONS(584), 1,
+      anon_sym_LBRACK,
+    ACTIONS(586), 1,
+      anon_sym_await,
+    STATE(586), 1,
+      sym_string,
+    STATE(647), 1,
+      sym_primary_expression,
+    ACTIONS(293), 2,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(582), 3,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_TILDE,
+    ACTIONS(295), 5,
+      sym_integer,
+      sym_identifier,
+      sym_true,
+      sym_false,
+      sym_none,
+    ACTIONS(558), 5,
+      anon_sym_print,
+      anon_sym_async,
+      anon_sym_match,
+      anon_sym_exec,
+      anon_sym_type,
+    STATE(605), 16,
+      sym_binary_operator,
+      sym_unary_operator,
+      sym_attribute,
+      sym_subscript,
+      sym_call,
+      sym_list,
+      sym_set,
+      sym_tuple,
+      sym_dictionary,
+      sym_list_comprehension,
+      sym_dictionary_comprehension,
+      sym_set_comprehension,
+      sym_generator_expression,
+      sym_parenthesized_expression,
+      sym_concatenated_string,
+      sym_await,
+  [37466] = 13,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(592), 1,
+      anon_sym_LPAREN,
+    ACTIONS(600), 1,
+      anon_sym_LBRACK,
+    ACTIONS(602), 1,
+      anon_sym_LBRACE,
+    ACTIONS(606), 1,
+      anon_sym_await,
+    ACTIONS(608), 1,
+      sym__string_start,
+    STATE(713), 1,
+      sym_string,
+    STATE(728), 1,
+      sym_primary_expression,
+    ACTIONS(604), 2,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(598), 3,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_TILDE,
+    ACTIONS(590), 5,
+      sym_integer,
+      sym_identifier,
+      sym_true,
+      sym_false,
+      sym_none,
+    ACTIONS(594), 5,
+      anon_sym_print,
+      anon_sym_async,
+      anon_sym_match,
+      anon_sym_exec,
+      anon_sym_type,
+    STATE(827), 16,
+      sym_binary_operator,
+      sym_unary_operator,
+      sym_attribute,
+      sym_subscript,
+      sym_call,
+      sym_list,
+      sym_set,
+      sym_tuple,
+      sym_dictionary,
+      sym_list_comprehension,
+      sym_dictionary_comprehension,
+      sym_set_comprehension,
+      sym_generator_expression,
+      sym_parenthesized_expression,
+      sym_concatenated_string,
+      sym_await,
+  [37532] = 13,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(592), 1,
+      anon_sym_LPAREN,
+    ACTIONS(600), 1,
+      anon_sym_LBRACK,
+    ACTIONS(602), 1,
+      anon_sym_LBRACE,
+    ACTIONS(606), 1,
+      anon_sym_await,
+    ACTIONS(608), 1,
+      sym__string_start,
+    STATE(713), 1,
+      sym_string,
+    STATE(731), 1,
+      sym_primary_expression,
+    ACTIONS(604), 2,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(598), 3,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_TILDE,
+    ACTIONS(590), 5,
+      sym_integer,
+      sym_identifier,
+      sym_true,
+      sym_false,
+      sym_none,
+    ACTIONS(594), 5,
+      anon_sym_print,
+      anon_sym_async,
+      anon_sym_match,
+      anon_sym_exec,
+      anon_sym_type,
+    STATE(827), 16,
+      sym_binary_operator,
+      sym_unary_operator,
+      sym_attribute,
+      sym_subscript,
+      sym_call,
+      sym_list,
+      sym_set,
+      sym_tuple,
+      sym_dictionary,
+      sym_list_comprehension,
+      sym_dictionary_comprehension,
+      sym_set_comprehension,
+      sym_generator_expression,
+      sym_parenthesized_expression,
+      sym_concatenated_string,
+      sym_await,
+  [37598] = 13,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(279), 1,
+      anon_sym_LBRACE,
+    ACTIONS(299), 1,
+      sym__string_start,
+    ACTIONS(578), 1,
+      anon_sym_LPAREN,
+    ACTIONS(584), 1,
+      anon_sym_LBRACK,
+    ACTIONS(586), 1,
+      anon_sym_await,
+    STATE(586), 1,
+      sym_string,
+    STATE(623), 1,
+      sym_primary_expression,
+    ACTIONS(293), 2,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(582), 3,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_TILDE,
+    ACTIONS(295), 5,
+      sym_integer,
+      sym_identifier,
+      sym_true,
+      sym_false,
+      sym_none,
+    ACTIONS(558), 5,
+      anon_sym_print,
+      anon_sym_async,
+      anon_sym_match,
+      anon_sym_exec,
+      anon_sym_type,
+    STATE(605), 16,
+      sym_binary_operator,
+      sym_unary_operator,
+      sym_attribute,
+      sym_subscript,
+      sym_call,
+      sym_list,
+      sym_set,
+      sym_tuple,
+      sym_dictionary,
+      sym_list_comprehension,
+      sym_dictionary_comprehension,
+      sym_set_comprehension,
+      sym_generator_expression,
+      sym_parenthesized_expression,
+      sym_concatenated_string,
+      sym_await,
+  [37664] = 13,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(279), 1,
+      anon_sym_LBRACE,
+    ACTIONS(299), 1,
+      sym__string_start,
+    ACTIONS(578), 1,
+      anon_sym_LPAREN,
+    ACTIONS(584), 1,
+      anon_sym_LBRACK,
+    ACTIONS(586), 1,
+      anon_sym_await,
+    STATE(586), 1,
+      sym_string,
+    STATE(643), 1,
+      sym_primary_expression,
+    ACTIONS(293), 2,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(582), 3,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_TILDE,
+    ACTIONS(295), 5,
+      sym_integer,
+      sym_identifier,
+      sym_true,
+      sym_false,
+      sym_none,
+    ACTIONS(558), 5,
+      anon_sym_print,
+      anon_sym_async,
+      anon_sym_match,
+      anon_sym_exec,
+      anon_sym_type,
+    STATE(605), 16,
+      sym_binary_operator,
+      sym_unary_operator,
+      sym_attribute,
+      sym_subscript,
+      sym_call,
+      sym_list,
+      sym_set,
+      sym_tuple,
+      sym_dictionary,
+      sym_list_comprehension,
+      sym_dictionary_comprehension,
+      sym_set_comprehension,
+      sym_generator_expression,
+      sym_parenthesized_expression,
+      sym_concatenated_string,
+      sym_await,
+  [37730] = 5,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(608), 1,
+      sym__string_start,
+    STATE(674), 2,
+      sym_string,
+      aux_sym_concatenated_string_repeat1,
+    ACTIONS(1382), 4,
+      anon_sym_STAR,
+      anon_sym_SLASH,
+      anon_sym_LT,
+      anon_sym_GT,
+    ACTIONS(1380), 31,
       anon_sym_DOT,
       anon_sym_LPAREN,
       anon_sym_RPAREN,
@@ -60736,274 +54400,2258 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_GT_EQ,
       anon_sym_LT_GT,
       anon_sym_is,
-  [41058] = 14,
+  [37780] = 13,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1610), 1,
-      anon_sym_DOT,
-    ACTIONS(1612), 1,
+    ACTIONS(279), 1,
+      anon_sym_LBRACE,
+    ACTIONS(299), 1,
+      sym__string_start,
+    ACTIONS(578), 1,
       anon_sym_LPAREN,
-    ACTIONS(1624), 1,
+    ACTIONS(584), 1,
       anon_sym_LBRACK,
-    ACTIONS(1626), 1,
-      anon_sym_STAR_STAR,
-    ACTIONS(1632), 1,
-      anon_sym_AMP,
-    ACTIONS(1634), 1,
-      anon_sym_CARET,
-    ACTIONS(1614), 2,
-      anon_sym_STAR,
-      anon_sym_SLASH,
-    ACTIONS(1616), 2,
-      anon_sym_GT_GT,
-      anon_sym_LT_LT,
-    ACTIONS(1622), 2,
+    ACTIONS(586), 1,
+      anon_sym_await,
+    STATE(586), 1,
+      sym_string,
+    STATE(644), 1,
+      sym_primary_expression,
+    ACTIONS(293), 2,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(582), 3,
       anon_sym_DASH,
       anon_sym_PLUS,
-    STATE(792), 2,
-      sym_argument_list,
+      anon_sym_TILDE,
+    ACTIONS(295), 5,
+      sym_integer,
+      sym_identifier,
+      sym_true,
+      sym_false,
+      sym_none,
+    ACTIONS(558), 5,
+      anon_sym_print,
+      anon_sym_async,
+      anon_sym_match,
+      anon_sym_exec,
+      anon_sym_type,
+    STATE(605), 16,
+      sym_binary_operator,
+      sym_unary_operator,
+      sym_attribute,
+      sym_subscript,
+      sym_call,
+      sym_list,
+      sym_set,
+      sym_tuple,
+      sym_dictionary,
+      sym_list_comprehension,
+      sym_dictionary_comprehension,
+      sym_set_comprehension,
       sym_generator_expression,
-    ACTIONS(1573), 3,
-      anon_sym_EQ,
-      anon_sym_LT,
-      anon_sym_GT,
-    ACTIONS(1628), 3,
-      anon_sym_AT,
-      anon_sym_PERCENT,
-      anon_sym_SLASH_SLASH,
-    ACTIONS(1571), 16,
-      sym__newline,
-      anon_sym_from,
-      anon_sym_COMMA,
-      anon_sym_if,
-      anon_sym_in,
-      anon_sym_PIPE,
-      anon_sym_not,
-      anon_sym_and,
-      anon_sym_or,
-      anon_sym_LT_EQ,
-      anon_sym_EQ_EQ,
-      anon_sym_BANG_EQ,
-      anon_sym_GT_EQ,
-      anon_sym_LT_GT,
-      anon_sym_is,
-      sym__semicolon,
-  [41124] = 10,
+      sym_parenthesized_expression,
+      sym_concatenated_string,
+      sym_await,
+  [37846] = 15,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1610), 1,
-      anon_sym_DOT,
-    ACTIONS(1612), 1,
+    ACTIONS(262), 1,
       anon_sym_LPAREN,
-    ACTIONS(1624), 1,
+    ACTIONS(277), 1,
       anon_sym_LBRACK,
-    ACTIONS(1626), 1,
-      anon_sym_STAR_STAR,
-    ACTIONS(1614), 2,
-      anon_sym_STAR,
-      anon_sym_SLASH,
-    STATE(792), 2,
-      sym_argument_list,
-      sym_generator_expression,
-    ACTIONS(1573), 3,
-      anon_sym_EQ,
-      anon_sym_LT,
-      anon_sym_GT,
-    ACTIONS(1628), 3,
-      anon_sym_AT,
-      anon_sym_PERCENT,
-      anon_sym_SLASH_SLASH,
-    ACTIONS(1571), 22,
-      sym__newline,
-      anon_sym_from,
-      anon_sym_COMMA,
-      anon_sym_GT_GT,
-      anon_sym_if,
-      anon_sym_in,
-      anon_sym_PIPE,
+    ACTIONS(279), 1,
+      anon_sym_LBRACE,
+    ACTIONS(299), 1,
+      sym__string_start,
+    ACTIONS(1597), 1,
+      sym_identifier,
+    ACTIONS(1601), 1,
+      anon_sym_await,
+    STATE(586), 1,
+      sym_string,
+    STATE(865), 1,
+      sym_primary_expression,
+    ACTIONS(293), 2,
+      sym_ellipsis,
+      sym_float,
+    STATE(862), 2,
+      sym_attribute,
+      sym_subscript,
+    ACTIONS(285), 3,
       anon_sym_DASH,
       anon_sym_PLUS,
-      anon_sym_not,
-      anon_sym_and,
-      anon_sym_or,
-      anon_sym_AMP,
-      anon_sym_CARET,
-      anon_sym_LT_LT,
-      anon_sym_LT_EQ,
-      anon_sym_EQ_EQ,
-      anon_sym_BANG_EQ,
-      anon_sym_GT_EQ,
-      anon_sym_LT_GT,
-      anon_sym_is,
-      sym__semicolon,
-  [41182] = 8,
+      anon_sym_TILDE,
+    ACTIONS(295), 4,
+      sym_integer,
+      sym_true,
+      sym_false,
+      sym_none,
+    ACTIONS(1599), 5,
+      anon_sym_print,
+      anon_sym_async,
+      anon_sym_match,
+      anon_sym_exec,
+      anon_sym_type,
+    STATE(605), 14,
+      sym_binary_operator,
+      sym_unary_operator,
+      sym_call,
+      sym_list,
+      sym_set,
+      sym_tuple,
+      sym_dictionary,
+      sym_list_comprehension,
+      sym_dictionary_comprehension,
+      sym_set_comprehension,
+      sym_generator_expression,
+      sym_parenthesized_expression,
+      sym_concatenated_string,
+      sym_await,
+  [37916] = 13,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1610), 1,
-      anon_sym_DOT,
-    ACTIONS(1612), 1,
+    ACTIONS(279), 1,
+      anon_sym_LBRACE,
+    ACTIONS(299), 1,
+      sym__string_start,
+    ACTIONS(578), 1,
       anon_sym_LPAREN,
-    ACTIONS(1624), 1,
+    ACTIONS(584), 1,
       anon_sym_LBRACK,
-    ACTIONS(1626), 1,
-      anon_sym_STAR_STAR,
-    STATE(792), 2,
-      sym_argument_list,
+    ACTIONS(586), 1,
+      anon_sym_await,
+    STATE(586), 1,
+      sym_string,
+    STATE(650), 1,
+      sym_primary_expression,
+    ACTIONS(293), 2,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(582), 3,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_TILDE,
+    ACTIONS(295), 5,
+      sym_integer,
+      sym_identifier,
+      sym_true,
+      sym_false,
+      sym_none,
+    ACTIONS(558), 5,
+      anon_sym_print,
+      anon_sym_async,
+      anon_sym_match,
+      anon_sym_exec,
+      anon_sym_type,
+    STATE(605), 16,
+      sym_binary_operator,
+      sym_unary_operator,
+      sym_attribute,
+      sym_subscript,
+      sym_call,
+      sym_list,
+      sym_set,
+      sym_tuple,
+      sym_dictionary,
+      sym_list_comprehension,
+      sym_dictionary_comprehension,
+      sym_set_comprehension,
       sym_generator_expression,
-    ACTIONS(1573), 5,
+      sym_parenthesized_expression,
+      sym_concatenated_string,
+      sym_await,
+  [37982] = 4,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(560), 1,
+      anon_sym_COLON_EQ,
+    ACTIONS(260), 6,
       anon_sym_STAR,
+      anon_sym_COLON,
       anon_sym_EQ,
       anon_sym_SLASH,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1571), 25,
-      sym__newline,
-      anon_sym_from,
-      anon_sym_COMMA,
-      anon_sym_GT_GT,
-      anon_sym_if,
-      anon_sym_in,
-      anon_sym_PIPE,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_AT,
-      anon_sym_not,
-      anon_sym_and,
-      anon_sym_or,
-      anon_sym_PERCENT,
-      anon_sym_SLASH_SLASH,
-      anon_sym_AMP,
-      anon_sym_CARET,
-      anon_sym_LT_LT,
-      anon_sym_LT_EQ,
-      anon_sym_EQ_EQ,
-      anon_sym_BANG_EQ,
-      anon_sym_GT_EQ,
-      anon_sym_LT_GT,
-      anon_sym_is,
-      sym__semicolon,
-  [41236] = 19,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1647), 1,
+    ACTIONS(287), 31,
       anon_sym_DOT,
-    ACTIONS(1649), 1,
       anon_sym_LPAREN,
-    ACTIONS(1657), 1,
-      anon_sym_PIPE,
-    ACTIONS(1661), 1,
-      anon_sym_LBRACK,
-    ACTIONS(1663), 1,
-      anon_sym_STAR_STAR,
-    ACTIONS(1667), 1,
-      anon_sym_not,
-    ACTIONS(1669), 1,
-      anon_sym_AMP,
-    ACTIONS(1671), 1,
-      anon_sym_CARET,
-    ACTIONS(1675), 1,
-      anon_sym_is,
-    STATE(881), 1,
-      aux_sym_comparison_operator_repeat1,
-    ACTIONS(1651), 2,
-      anon_sym_STAR,
-      anon_sym_SLASH,
-    ACTIONS(1653), 2,
-      anon_sym_GT_GT,
-      anon_sym_LT_LT,
-    ACTIONS(1659), 2,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-    ACTIONS(1673), 2,
-      anon_sym_LT,
-      anon_sym_GT,
-    STATE(847), 2,
-      sym_argument_list,
-      sym_generator_expression,
-    ACTIONS(1665), 3,
-      anon_sym_AT,
-      anon_sym_PERCENT,
-      anon_sym_SLASH_SLASH,
-    ACTIONS(1655), 6,
-      anon_sym_in,
-      anon_sym_LT_EQ,
-      anon_sym_EQ_EQ,
-      anon_sym_BANG_EQ,
-      anon_sym_GT_EQ,
-      anon_sym_LT_GT,
-    ACTIONS(1479), 7,
       anon_sym_RPAREN,
       anon_sym_COMMA,
-      anon_sym_as,
-      anon_sym_if,
-      anon_sym_COLON,
-      anon_sym_and,
-      anon_sym_or,
-  [41312] = 13,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1610), 1,
-      anon_sym_DOT,
-    ACTIONS(1612), 1,
-      anon_sym_LPAREN,
-    ACTIONS(1624), 1,
-      anon_sym_LBRACK,
-    ACTIONS(1626), 1,
-      anon_sym_STAR_STAR,
-    ACTIONS(1634), 1,
-      anon_sym_CARET,
-    ACTIONS(1614), 2,
-      anon_sym_STAR,
-      anon_sym_SLASH,
-    ACTIONS(1616), 2,
       anon_sym_GT_GT,
-      anon_sym_LT_LT,
-    ACTIONS(1622), 2,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-    STATE(792), 2,
-      sym_argument_list,
-      sym_generator_expression,
-    ACTIONS(1573), 3,
-      anon_sym_EQ,
-      anon_sym_LT,
-      anon_sym_GT,
-    ACTIONS(1628), 3,
-      anon_sym_AT,
-      anon_sym_PERCENT,
-      anon_sym_SLASH_SLASH,
-    ACTIONS(1571), 17,
-      sym__newline,
-      anon_sym_from,
-      anon_sym_COMMA,
       anon_sym_if,
+      anon_sym_else,
       anon_sym_in,
       anon_sym_PIPE,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_RBRACK,
+      anon_sym_RBRACE,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
       anon_sym_not,
       anon_sym_and,
       anon_sym_or,
+      anon_sym_PERCENT,
+      anon_sym_SLASH_SLASH,
       anon_sym_AMP,
+      anon_sym_CARET,
+      anon_sym_LT_LT,
       anon_sym_LT_EQ,
       anon_sym_EQ_EQ,
       anon_sym_BANG_EQ,
       anon_sym_GT_EQ,
       anon_sym_LT_GT,
       anon_sym_is,
-      sym__semicolon,
-  [41376] = 5,
+      sym_type_conversion,
+  [38030] = 13,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(646), 1,
+    ACTIONS(262), 1,
+      anon_sym_LPAREN,
+    ACTIONS(277), 1,
+      anon_sym_LBRACK,
+    ACTIONS(279), 1,
+      anon_sym_LBRACE,
+    ACTIONS(299), 1,
       sym__string_start,
-    STATE(678), 2,
+    ACTIONS(566), 1,
+      anon_sym_await,
+    STATE(586), 1,
+      sym_string,
+    STATE(628), 1,
+      sym_primary_expression,
+    ACTIONS(293), 2,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(285), 3,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_TILDE,
+    ACTIONS(295), 5,
+      sym_integer,
+      sym_identifier,
+      sym_true,
+      sym_false,
+      sym_none,
+    ACTIONS(558), 5,
+      anon_sym_print,
+      anon_sym_async,
+      anon_sym_match,
+      anon_sym_exec,
+      anon_sym_type,
+    STATE(605), 16,
+      sym_binary_operator,
+      sym_unary_operator,
+      sym_attribute,
+      sym_subscript,
+      sym_call,
+      sym_list,
+      sym_set,
+      sym_tuple,
+      sym_dictionary,
+      sym_list_comprehension,
+      sym_dictionary_comprehension,
+      sym_set_comprehension,
+      sym_generator_expression,
+      sym_parenthesized_expression,
+      sym_concatenated_string,
+      sym_await,
+  [38096] = 5,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1603), 1,
+      sym__string_start,
+    STATE(674), 2,
       sym_string,
       aux_sym_concatenated_string_repeat1,
-    ACTIONS(1053), 4,
+    ACTIONS(1386), 4,
       anon_sym_STAR,
       anon_sym_SLASH,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1048), 29,
+    ACTIONS(1384), 31,
+      anon_sym_DOT,
+      anon_sym_LPAREN,
+      anon_sym_RPAREN,
+      anon_sym_COMMA,
+      anon_sym_as,
+      anon_sym_GT_GT,
+      anon_sym_if,
+      anon_sym_COLON,
+      anon_sym_in,
+      anon_sym_PIPE,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_RBRACK,
+      anon_sym_RBRACE,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_not,
+      anon_sym_and,
+      anon_sym_or,
+      anon_sym_PERCENT,
+      anon_sym_SLASH_SLASH,
+      anon_sym_AMP,
+      anon_sym_CARET,
+      anon_sym_LT_LT,
+      anon_sym_LT_EQ,
+      anon_sym_EQ_EQ,
+      anon_sym_BANG_EQ,
+      anon_sym_GT_EQ,
+      anon_sym_LT_GT,
+      anon_sym_is,
+  [38146] = 15,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(262), 1,
+      anon_sym_LPAREN,
+    ACTIONS(277), 1,
+      anon_sym_LBRACK,
+    ACTIONS(279), 1,
+      anon_sym_LBRACE,
+    ACTIONS(299), 1,
+      sym__string_start,
+    ACTIONS(1391), 1,
+      sym_identifier,
+    ACTIONS(1397), 1,
+      anon_sym_await,
+    STATE(586), 1,
+      sym_string,
+    STATE(865), 1,
+      sym_primary_expression,
+    ACTIONS(293), 2,
+      sym_ellipsis,
+      sym_float,
+    STATE(749), 2,
+      sym_attribute,
+      sym_subscript,
+    ACTIONS(285), 3,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_TILDE,
+    ACTIONS(295), 4,
+      sym_integer,
+      sym_true,
+      sym_false,
+      sym_none,
+    ACTIONS(1395), 5,
+      anon_sym_print,
+      anon_sym_async,
+      anon_sym_match,
+      anon_sym_exec,
+      anon_sym_type,
+    STATE(605), 14,
+      sym_binary_operator,
+      sym_unary_operator,
+      sym_call,
+      sym_list,
+      sym_set,
+      sym_tuple,
+      sym_dictionary,
+      sym_list_comprehension,
+      sym_dictionary_comprehension,
+      sym_set_comprehension,
+      sym_generator_expression,
+      sym_parenthesized_expression,
+      sym_concatenated_string,
+      sym_await,
+  [38216] = 13,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(262), 1,
+      anon_sym_LPAREN,
+    ACTIONS(277), 1,
+      anon_sym_LBRACK,
+    ACTIONS(279), 1,
+      anon_sym_LBRACE,
+    ACTIONS(299), 1,
+      sym__string_start,
+    ACTIONS(566), 1,
+      anon_sym_await,
+    STATE(586), 1,
+      sym_string,
+    STATE(636), 1,
+      sym_primary_expression,
+    ACTIONS(293), 2,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(285), 3,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_TILDE,
+    ACTIONS(295), 5,
+      sym_integer,
+      sym_identifier,
+      sym_true,
+      sym_false,
+      sym_none,
+    ACTIONS(558), 5,
+      anon_sym_print,
+      anon_sym_async,
+      anon_sym_match,
+      anon_sym_exec,
+      anon_sym_type,
+    STATE(605), 16,
+      sym_binary_operator,
+      sym_unary_operator,
+      sym_attribute,
+      sym_subscript,
+      sym_call,
+      sym_list,
+      sym_set,
+      sym_tuple,
+      sym_dictionary,
+      sym_list_comprehension,
+      sym_dictionary_comprehension,
+      sym_set_comprehension,
+      sym_generator_expression,
+      sym_parenthesized_expression,
+      sym_concatenated_string,
+      sym_await,
+  [38282] = 13,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(592), 1,
+      anon_sym_LPAREN,
+    ACTIONS(600), 1,
+      anon_sym_LBRACK,
+    ACTIONS(602), 1,
+      anon_sym_LBRACE,
+    ACTIONS(606), 1,
+      anon_sym_await,
+    ACTIONS(608), 1,
+      sym__string_start,
+    STATE(713), 1,
+      sym_string,
+    STATE(739), 1,
+      sym_primary_expression,
+    ACTIONS(604), 2,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(598), 3,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_TILDE,
+    ACTIONS(590), 5,
+      sym_integer,
+      sym_identifier,
+      sym_true,
+      sym_false,
+      sym_none,
+    ACTIONS(594), 5,
+      anon_sym_print,
+      anon_sym_async,
+      anon_sym_match,
+      anon_sym_exec,
+      anon_sym_type,
+    STATE(827), 16,
+      sym_binary_operator,
+      sym_unary_operator,
+      sym_attribute,
+      sym_subscript,
+      sym_call,
+      sym_list,
+      sym_set,
+      sym_tuple,
+      sym_dictionary,
+      sym_list_comprehension,
+      sym_dictionary_comprehension,
+      sym_set_comprehension,
+      sym_generator_expression,
+      sym_parenthesized_expression,
+      sym_concatenated_string,
+      sym_await,
+  [38348] = 13,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(262), 1,
+      anon_sym_LPAREN,
+    ACTIONS(277), 1,
+      anon_sym_LBRACK,
+    ACTIONS(279), 1,
+      anon_sym_LBRACE,
+    ACTIONS(299), 1,
+      sym__string_start,
+    ACTIONS(566), 1,
+      anon_sym_await,
+    STATE(586), 1,
+      sym_string,
+    STATE(629), 1,
+      sym_primary_expression,
+    ACTIONS(293), 2,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(285), 3,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_TILDE,
+    ACTIONS(295), 5,
+      sym_integer,
+      sym_identifier,
+      sym_true,
+      sym_false,
+      sym_none,
+    ACTIONS(558), 5,
+      anon_sym_print,
+      anon_sym_async,
+      anon_sym_match,
+      anon_sym_exec,
+      anon_sym_type,
+    STATE(605), 16,
+      sym_binary_operator,
+      sym_unary_operator,
+      sym_attribute,
+      sym_subscript,
+      sym_call,
+      sym_list,
+      sym_set,
+      sym_tuple,
+      sym_dictionary,
+      sym_list_comprehension,
+      sym_dictionary_comprehension,
+      sym_set_comprehension,
+      sym_generator_expression,
+      sym_parenthesized_expression,
+      sym_concatenated_string,
+      sym_await,
+  [38414] = 13,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(262), 1,
+      anon_sym_LPAREN,
+    ACTIONS(277), 1,
+      anon_sym_LBRACK,
+    ACTIONS(279), 1,
+      anon_sym_LBRACE,
+    ACTIONS(299), 1,
+      sym__string_start,
+    ACTIONS(566), 1,
+      anon_sym_await,
+    STATE(586), 1,
+      sym_string,
+    STATE(630), 1,
+      sym_primary_expression,
+    ACTIONS(293), 2,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(285), 3,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_TILDE,
+    ACTIONS(295), 5,
+      sym_integer,
+      sym_identifier,
+      sym_true,
+      sym_false,
+      sym_none,
+    ACTIONS(558), 5,
+      anon_sym_print,
+      anon_sym_async,
+      anon_sym_match,
+      anon_sym_exec,
+      anon_sym_type,
+    STATE(605), 16,
+      sym_binary_operator,
+      sym_unary_operator,
+      sym_attribute,
+      sym_subscript,
+      sym_call,
+      sym_list,
+      sym_set,
+      sym_tuple,
+      sym_dictionary,
+      sym_list_comprehension,
+      sym_dictionary_comprehension,
+      sym_set_comprehension,
+      sym_generator_expression,
+      sym_parenthesized_expression,
+      sym_concatenated_string,
+      sym_await,
+  [38480] = 13,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(262), 1,
+      anon_sym_LPAREN,
+    ACTIONS(277), 1,
+      anon_sym_LBRACK,
+    ACTIONS(279), 1,
+      anon_sym_LBRACE,
+    ACTIONS(299), 1,
+      sym__string_start,
+    ACTIONS(566), 1,
+      anon_sym_await,
+    STATE(586), 1,
+      sym_string,
+    STATE(627), 1,
+      sym_primary_expression,
+    ACTIONS(293), 2,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(285), 3,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_TILDE,
+    ACTIONS(295), 5,
+      sym_integer,
+      sym_identifier,
+      sym_true,
+      sym_false,
+      sym_none,
+    ACTIONS(558), 5,
+      anon_sym_print,
+      anon_sym_async,
+      anon_sym_match,
+      anon_sym_exec,
+      anon_sym_type,
+    STATE(605), 16,
+      sym_binary_operator,
+      sym_unary_operator,
+      sym_attribute,
+      sym_subscript,
+      sym_call,
+      sym_list,
+      sym_set,
+      sym_tuple,
+      sym_dictionary,
+      sym_list_comprehension,
+      sym_dictionary_comprehension,
+      sym_set_comprehension,
+      sym_generator_expression,
+      sym_parenthesized_expression,
+      sym_concatenated_string,
+      sym_await,
+  [38546] = 13,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(262), 1,
+      anon_sym_LPAREN,
+    ACTIONS(277), 1,
+      anon_sym_LBRACK,
+    ACTIONS(279), 1,
+      anon_sym_LBRACE,
+    ACTIONS(299), 1,
+      sym__string_start,
+    ACTIONS(566), 1,
+      anon_sym_await,
+    STATE(586), 1,
+      sym_string,
+    STATE(632), 1,
+      sym_primary_expression,
+    ACTIONS(293), 2,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(285), 3,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_TILDE,
+    ACTIONS(295), 5,
+      sym_integer,
+      sym_identifier,
+      sym_true,
+      sym_false,
+      sym_none,
+    ACTIONS(558), 5,
+      anon_sym_print,
+      anon_sym_async,
+      anon_sym_match,
+      anon_sym_exec,
+      anon_sym_type,
+    STATE(605), 16,
+      sym_binary_operator,
+      sym_unary_operator,
+      sym_attribute,
+      sym_subscript,
+      sym_call,
+      sym_list,
+      sym_set,
+      sym_tuple,
+      sym_dictionary,
+      sym_list_comprehension,
+      sym_dictionary_comprehension,
+      sym_set_comprehension,
+      sym_generator_expression,
+      sym_parenthesized_expression,
+      sym_concatenated_string,
+      sym_await,
+  [38612] = 13,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(262), 1,
+      anon_sym_LPAREN,
+    ACTIONS(277), 1,
+      anon_sym_LBRACK,
+    ACTIONS(279), 1,
+      anon_sym_LBRACE,
+    ACTIONS(299), 1,
+      sym__string_start,
+    ACTIONS(566), 1,
+      anon_sym_await,
+    STATE(586), 1,
+      sym_string,
+    STATE(633), 1,
+      sym_primary_expression,
+    ACTIONS(293), 2,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(285), 3,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_TILDE,
+    ACTIONS(295), 5,
+      sym_integer,
+      sym_identifier,
+      sym_true,
+      sym_false,
+      sym_none,
+    ACTIONS(558), 5,
+      anon_sym_print,
+      anon_sym_async,
+      anon_sym_match,
+      anon_sym_exec,
+      anon_sym_type,
+    STATE(605), 16,
+      sym_binary_operator,
+      sym_unary_operator,
+      sym_attribute,
+      sym_subscript,
+      sym_call,
+      sym_list,
+      sym_set,
+      sym_tuple,
+      sym_dictionary,
+      sym_list_comprehension,
+      sym_dictionary_comprehension,
+      sym_set_comprehension,
+      sym_generator_expression,
+      sym_parenthesized_expression,
+      sym_concatenated_string,
+      sym_await,
+  [38678] = 13,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(262), 1,
+      anon_sym_LPAREN,
+    ACTIONS(277), 1,
+      anon_sym_LBRACK,
+    ACTIONS(279), 1,
+      anon_sym_LBRACE,
+    ACTIONS(299), 1,
+      sym__string_start,
+    ACTIONS(566), 1,
+      anon_sym_await,
+    STATE(586), 1,
+      sym_string,
+    STATE(634), 1,
+      sym_primary_expression,
+    ACTIONS(293), 2,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(285), 3,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_TILDE,
+    ACTIONS(295), 5,
+      sym_integer,
+      sym_identifier,
+      sym_true,
+      sym_false,
+      sym_none,
+    ACTIONS(558), 5,
+      anon_sym_print,
+      anon_sym_async,
+      anon_sym_match,
+      anon_sym_exec,
+      anon_sym_type,
+    STATE(605), 16,
+      sym_binary_operator,
+      sym_unary_operator,
+      sym_attribute,
+      sym_subscript,
+      sym_call,
+      sym_list,
+      sym_set,
+      sym_tuple,
+      sym_dictionary,
+      sym_list_comprehension,
+      sym_dictionary_comprehension,
+      sym_set_comprehension,
+      sym_generator_expression,
+      sym_parenthesized_expression,
+      sym_concatenated_string,
+      sym_await,
+  [38744] = 13,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(279), 1,
+      anon_sym_LBRACE,
+    ACTIONS(299), 1,
+      sym__string_start,
+    ACTIONS(578), 1,
+      anon_sym_LPAREN,
+    ACTIONS(584), 1,
+      anon_sym_LBRACK,
+    ACTIONS(586), 1,
+      anon_sym_await,
+    STATE(586), 1,
+      sym_string,
+    STATE(648), 1,
+      sym_primary_expression,
+    ACTIONS(293), 2,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(582), 3,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_TILDE,
+    ACTIONS(295), 5,
+      sym_integer,
+      sym_identifier,
+      sym_true,
+      sym_false,
+      sym_none,
+    ACTIONS(558), 5,
+      anon_sym_print,
+      anon_sym_async,
+      anon_sym_match,
+      anon_sym_exec,
+      anon_sym_type,
+    STATE(605), 16,
+      sym_binary_operator,
+      sym_unary_operator,
+      sym_attribute,
+      sym_subscript,
+      sym_call,
+      sym_list,
+      sym_set,
+      sym_tuple,
+      sym_dictionary,
+      sym_list_comprehension,
+      sym_dictionary_comprehension,
+      sym_set_comprehension,
+      sym_generator_expression,
+      sym_parenthesized_expression,
+      sym_concatenated_string,
+      sym_await,
+  [38810] = 13,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(279), 1,
+      anon_sym_LBRACE,
+    ACTIONS(299), 1,
+      sym__string_start,
+    ACTIONS(578), 1,
+      anon_sym_LPAREN,
+    ACTIONS(584), 1,
+      anon_sym_LBRACK,
+    ACTIONS(586), 1,
+      anon_sym_await,
+    STATE(586), 1,
+      sym_string,
+    STATE(645), 1,
+      sym_primary_expression,
+    ACTIONS(293), 2,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(582), 3,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_TILDE,
+    ACTIONS(295), 5,
+      sym_integer,
+      sym_identifier,
+      sym_true,
+      sym_false,
+      sym_none,
+    ACTIONS(558), 5,
+      anon_sym_print,
+      anon_sym_async,
+      anon_sym_match,
+      anon_sym_exec,
+      anon_sym_type,
+    STATE(605), 16,
+      sym_binary_operator,
+      sym_unary_operator,
+      sym_attribute,
+      sym_subscript,
+      sym_call,
+      sym_list,
+      sym_set,
+      sym_tuple,
+      sym_dictionary,
+      sym_list_comprehension,
+      sym_dictionary_comprehension,
+      sym_set_comprehension,
+      sym_generator_expression,
+      sym_parenthesized_expression,
+      sym_concatenated_string,
+      sym_await,
+  [38876] = 13,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(592), 1,
+      anon_sym_LPAREN,
+    ACTIONS(600), 1,
+      anon_sym_LBRACK,
+    ACTIONS(602), 1,
+      anon_sym_LBRACE,
+    ACTIONS(606), 1,
+      anon_sym_await,
+    ACTIONS(608), 1,
+      sym__string_start,
+    STATE(713), 1,
+      sym_string,
+    STATE(738), 1,
+      sym_primary_expression,
+    ACTIONS(604), 2,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(598), 3,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_TILDE,
+    ACTIONS(590), 5,
+      sym_integer,
+      sym_identifier,
+      sym_true,
+      sym_false,
+      sym_none,
+    ACTIONS(594), 5,
+      anon_sym_print,
+      anon_sym_async,
+      anon_sym_match,
+      anon_sym_exec,
+      anon_sym_type,
+    STATE(827), 16,
+      sym_binary_operator,
+      sym_unary_operator,
+      sym_attribute,
+      sym_subscript,
+      sym_call,
+      sym_list,
+      sym_set,
+      sym_tuple,
+      sym_dictionary,
+      sym_list_comprehension,
+      sym_dictionary_comprehension,
+      sym_set_comprehension,
+      sym_generator_expression,
+      sym_parenthesized_expression,
+      sym_concatenated_string,
+      sym_await,
+  [38942] = 13,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(262), 1,
+      anon_sym_LPAREN,
+    ACTIONS(277), 1,
+      anon_sym_LBRACK,
+    ACTIONS(279), 1,
+      anon_sym_LBRACE,
+    ACTIONS(299), 1,
+      sym__string_start,
+    ACTIONS(566), 1,
+      anon_sym_await,
+    STATE(586), 1,
+      sym_string,
+    STATE(631), 1,
+      sym_primary_expression,
+    ACTIONS(293), 2,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(285), 3,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_TILDE,
+    ACTIONS(295), 5,
+      sym_integer,
+      sym_identifier,
+      sym_true,
+      sym_false,
+      sym_none,
+    ACTIONS(558), 5,
+      anon_sym_print,
+      anon_sym_async,
+      anon_sym_match,
+      anon_sym_exec,
+      anon_sym_type,
+    STATE(605), 16,
+      sym_binary_operator,
+      sym_unary_operator,
+      sym_attribute,
+      sym_subscript,
+      sym_call,
+      sym_list,
+      sym_set,
+      sym_tuple,
+      sym_dictionary,
+      sym_list_comprehension,
+      sym_dictionary_comprehension,
+      sym_set_comprehension,
+      sym_generator_expression,
+      sym_parenthesized_expression,
+      sym_concatenated_string,
+      sym_await,
+  [39008] = 13,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(279), 1,
+      anon_sym_LBRACE,
+    ACTIONS(299), 1,
+      sym__string_start,
+    ACTIONS(578), 1,
+      anon_sym_LPAREN,
+    ACTIONS(584), 1,
+      anon_sym_LBRACK,
+    ACTIONS(586), 1,
+      anon_sym_await,
+    STATE(586), 1,
+      sym_string,
+    STATE(624), 1,
+      sym_primary_expression,
+    ACTIONS(293), 2,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(582), 3,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_TILDE,
+    ACTIONS(295), 5,
+      sym_integer,
+      sym_identifier,
+      sym_true,
+      sym_false,
+      sym_none,
+    ACTIONS(558), 5,
+      anon_sym_print,
+      anon_sym_async,
+      anon_sym_match,
+      anon_sym_exec,
+      anon_sym_type,
+    STATE(605), 16,
+      sym_binary_operator,
+      sym_unary_operator,
+      sym_attribute,
+      sym_subscript,
+      sym_call,
+      sym_list,
+      sym_set,
+      sym_tuple,
+      sym_dictionary,
+      sym_list_comprehension,
+      sym_dictionary_comprehension,
+      sym_set_comprehension,
+      sym_generator_expression,
+      sym_parenthesized_expression,
+      sym_concatenated_string,
+      sym_await,
+  [39074] = 13,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(51), 1,
+      anon_sym_LBRACE,
+    ACTIONS(81), 1,
+      sym__string_start,
+    ACTIONS(568), 1,
+      anon_sym_LPAREN,
+    ACTIONS(574), 1,
+      anon_sym_LBRACK,
+    ACTIONS(576), 1,
+      anon_sym_await,
+    STATE(709), 1,
+      sym_string,
+    STATE(724), 1,
+      sym_primary_expression,
+    ACTIONS(75), 2,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(47), 3,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_TILDE,
+    ACTIONS(77), 5,
+      sym_integer,
+      sym_identifier,
+      sym_true,
+      sym_false,
+      sym_none,
+    ACTIONS(570), 5,
+      anon_sym_print,
+      anon_sym_async,
+      anon_sym_match,
+      anon_sym_exec,
+      anon_sym_type,
+    STATE(759), 16,
+      sym_binary_operator,
+      sym_unary_operator,
+      sym_attribute,
+      sym_subscript,
+      sym_call,
+      sym_list,
+      sym_set,
+      sym_tuple,
+      sym_dictionary,
+      sym_list_comprehension,
+      sym_dictionary_comprehension,
+      sym_set_comprehension,
+      sym_generator_expression,
+      sym_parenthesized_expression,
+      sym_concatenated_string,
+      sym_await,
+  [39140] = 13,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(51), 1,
+      anon_sym_LBRACE,
+    ACTIONS(81), 1,
+      sym__string_start,
+    ACTIONS(568), 1,
+      anon_sym_LPAREN,
+    ACTIONS(574), 1,
+      anon_sym_LBRACK,
+    ACTIONS(576), 1,
+      anon_sym_await,
+    STATE(709), 1,
+      sym_string,
+    STATE(712), 1,
+      sym_primary_expression,
+    ACTIONS(75), 2,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(47), 3,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_TILDE,
+    ACTIONS(77), 5,
+      sym_integer,
+      sym_identifier,
+      sym_true,
+      sym_false,
+      sym_none,
+    ACTIONS(570), 5,
+      anon_sym_print,
+      anon_sym_async,
+      anon_sym_match,
+      anon_sym_exec,
+      anon_sym_type,
+    STATE(759), 16,
+      sym_binary_operator,
+      sym_unary_operator,
+      sym_attribute,
+      sym_subscript,
+      sym_call,
+      sym_list,
+      sym_set,
+      sym_tuple,
+      sym_dictionary,
+      sym_list_comprehension,
+      sym_dictionary_comprehension,
+      sym_set_comprehension,
+      sym_generator_expression,
+      sym_parenthesized_expression,
+      sym_concatenated_string,
+      sym_await,
+  [39206] = 13,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(51), 1,
+      anon_sym_LBRACE,
+    ACTIONS(81), 1,
+      sym__string_start,
+    ACTIONS(568), 1,
+      anon_sym_LPAREN,
+    ACTIONS(574), 1,
+      anon_sym_LBRACK,
+    ACTIONS(576), 1,
+      anon_sym_await,
+    STATE(709), 1,
+      sym_string,
+    STATE(718), 1,
+      sym_primary_expression,
+    ACTIONS(75), 2,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(47), 3,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_TILDE,
+    ACTIONS(77), 5,
+      sym_integer,
+      sym_identifier,
+      sym_true,
+      sym_false,
+      sym_none,
+    ACTIONS(570), 5,
+      anon_sym_print,
+      anon_sym_async,
+      anon_sym_match,
+      anon_sym_exec,
+      anon_sym_type,
+    STATE(759), 16,
+      sym_binary_operator,
+      sym_unary_operator,
+      sym_attribute,
+      sym_subscript,
+      sym_call,
+      sym_list,
+      sym_set,
+      sym_tuple,
+      sym_dictionary,
+      sym_list_comprehension,
+      sym_dictionary_comprehension,
+      sym_set_comprehension,
+      sym_generator_expression,
+      sym_parenthesized_expression,
+      sym_concatenated_string,
+      sym_await,
+  [39272] = 4,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1606), 1,
+      anon_sym_COLON_EQ,
+    ACTIONS(1079), 6,
+      anon_sym_as,
+      anon_sym_STAR,
+      anon_sym_COLON,
+      anon_sym_SLASH,
+      anon_sym_LT,
+      anon_sym_GT,
+    ACTIONS(1074), 31,
+      anon_sym_DOT,
+      anon_sym_LPAREN,
+      anon_sym_RPAREN,
+      anon_sym_COMMA,
+      anon_sym_GT_GT,
+      anon_sym_if,
+      anon_sym_async,
+      anon_sym_for,
+      anon_sym_in,
+      anon_sym_PIPE,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_RBRACK,
+      anon_sym_RBRACE,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_not,
+      anon_sym_and,
+      anon_sym_or,
+      anon_sym_PERCENT,
+      anon_sym_SLASH_SLASH,
+      anon_sym_AMP,
+      anon_sym_CARET,
+      anon_sym_LT_LT,
+      anon_sym_LT_EQ,
+      anon_sym_EQ_EQ,
+      anon_sym_BANG_EQ,
+      anon_sym_GT_EQ,
+      anon_sym_LT_GT,
+      anon_sym_is,
+  [39320] = 13,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(279), 1,
+      anon_sym_LBRACE,
+    ACTIONS(299), 1,
+      sym__string_start,
+    ACTIONS(578), 1,
+      anon_sym_LPAREN,
+    ACTIONS(584), 1,
+      anon_sym_LBRACK,
+    ACTIONS(586), 1,
+      anon_sym_await,
+    STATE(586), 1,
+      sym_string,
+    STATE(638), 1,
+      sym_primary_expression,
+    ACTIONS(293), 2,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(582), 3,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_TILDE,
+    ACTIONS(295), 5,
+      sym_integer,
+      sym_identifier,
+      sym_true,
+      sym_false,
+      sym_none,
+    ACTIONS(558), 5,
+      anon_sym_print,
+      anon_sym_async,
+      anon_sym_match,
+      anon_sym_exec,
+      anon_sym_type,
+    STATE(605), 16,
+      sym_binary_operator,
+      sym_unary_operator,
+      sym_attribute,
+      sym_subscript,
+      sym_call,
+      sym_list,
+      sym_set,
+      sym_tuple,
+      sym_dictionary,
+      sym_list_comprehension,
+      sym_dictionary_comprehension,
+      sym_set_comprehension,
+      sym_generator_expression,
+      sym_parenthesized_expression,
+      sym_concatenated_string,
+      sym_await,
+  [39386] = 13,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(51), 1,
+      anon_sym_LBRACE,
+    ACTIONS(81), 1,
+      sym__string_start,
+    ACTIONS(568), 1,
+      anon_sym_LPAREN,
+    ACTIONS(574), 1,
+      anon_sym_LBRACK,
+    ACTIONS(576), 1,
+      anon_sym_await,
+    STATE(709), 1,
+      sym_string,
+    STATE(717), 1,
+      sym_primary_expression,
+    ACTIONS(75), 2,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(47), 3,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_TILDE,
+    ACTIONS(77), 5,
+      sym_integer,
+      sym_identifier,
+      sym_true,
+      sym_false,
+      sym_none,
+    ACTIONS(570), 5,
+      anon_sym_print,
+      anon_sym_async,
+      anon_sym_match,
+      anon_sym_exec,
+      anon_sym_type,
+    STATE(759), 16,
+      sym_binary_operator,
+      sym_unary_operator,
+      sym_attribute,
+      sym_subscript,
+      sym_call,
+      sym_list,
+      sym_set,
+      sym_tuple,
+      sym_dictionary,
+      sym_list_comprehension,
+      sym_dictionary_comprehension,
+      sym_set_comprehension,
+      sym_generator_expression,
+      sym_parenthesized_expression,
+      sym_concatenated_string,
+      sym_await,
+  [39452] = 13,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(51), 1,
+      anon_sym_LBRACE,
+    ACTIONS(81), 1,
+      sym__string_start,
+    ACTIONS(568), 1,
+      anon_sym_LPAREN,
+    ACTIONS(574), 1,
+      anon_sym_LBRACK,
+    ACTIONS(576), 1,
+      anon_sym_await,
+    STATE(709), 1,
+      sym_string,
+    STATE(721), 1,
+      sym_primary_expression,
+    ACTIONS(75), 2,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(47), 3,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_TILDE,
+    ACTIONS(77), 5,
+      sym_integer,
+      sym_identifier,
+      sym_true,
+      sym_false,
+      sym_none,
+    ACTIONS(570), 5,
+      anon_sym_print,
+      anon_sym_async,
+      anon_sym_match,
+      anon_sym_exec,
+      anon_sym_type,
+    STATE(759), 16,
+      sym_binary_operator,
+      sym_unary_operator,
+      sym_attribute,
+      sym_subscript,
+      sym_call,
+      sym_list,
+      sym_set,
+      sym_tuple,
+      sym_dictionary,
+      sym_list_comprehension,
+      sym_dictionary_comprehension,
+      sym_set_comprehension,
+      sym_generator_expression,
+      sym_parenthesized_expression,
+      sym_concatenated_string,
+      sym_await,
+  [39518] = 13,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(51), 1,
+      anon_sym_LBRACE,
+    ACTIONS(81), 1,
+      sym__string_start,
+    ACTIONS(568), 1,
+      anon_sym_LPAREN,
+    ACTIONS(574), 1,
+      anon_sym_LBRACK,
+    ACTIONS(576), 1,
+      anon_sym_await,
+    STATE(709), 1,
+      sym_string,
+    STATE(723), 1,
+      sym_primary_expression,
+    ACTIONS(75), 2,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(47), 3,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_TILDE,
+    ACTIONS(77), 5,
+      sym_integer,
+      sym_identifier,
+      sym_true,
+      sym_false,
+      sym_none,
+    ACTIONS(570), 5,
+      anon_sym_print,
+      anon_sym_async,
+      anon_sym_match,
+      anon_sym_exec,
+      anon_sym_type,
+    STATE(759), 16,
+      sym_binary_operator,
+      sym_unary_operator,
+      sym_attribute,
+      sym_subscript,
+      sym_call,
+      sym_list,
+      sym_set,
+      sym_tuple,
+      sym_dictionary,
+      sym_list_comprehension,
+      sym_dictionary_comprehension,
+      sym_set_comprehension,
+      sym_generator_expression,
+      sym_parenthesized_expression,
+      sym_concatenated_string,
+      sym_await,
+  [39584] = 13,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(51), 1,
+      anon_sym_LBRACE,
+    ACTIONS(81), 1,
+      sym__string_start,
+    ACTIONS(568), 1,
+      anon_sym_LPAREN,
+    ACTIONS(574), 1,
+      anon_sym_LBRACK,
+    ACTIONS(576), 1,
+      anon_sym_await,
+    STATE(709), 1,
+      sym_string,
+    STATE(719), 1,
+      sym_primary_expression,
+    ACTIONS(75), 2,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(47), 3,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_TILDE,
+    ACTIONS(77), 5,
+      sym_integer,
+      sym_identifier,
+      sym_true,
+      sym_false,
+      sym_none,
+    ACTIONS(570), 5,
+      anon_sym_print,
+      anon_sym_async,
+      anon_sym_match,
+      anon_sym_exec,
+      anon_sym_type,
+    STATE(759), 16,
+      sym_binary_operator,
+      sym_unary_operator,
+      sym_attribute,
+      sym_subscript,
+      sym_call,
+      sym_list,
+      sym_set,
+      sym_tuple,
+      sym_dictionary,
+      sym_list_comprehension,
+      sym_dictionary_comprehension,
+      sym_set_comprehension,
+      sym_generator_expression,
+      sym_parenthesized_expression,
+      sym_concatenated_string,
+      sym_await,
+  [39650] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1148), 5,
+      anon_sym_STAR,
+      anon_sym_EQ,
+      anon_sym_SLASH,
+      anon_sym_LT,
+      anon_sym_GT,
+    ACTIONS(1143), 33,
+      anon_sym_DOT,
+      anon_sym_LPAREN,
+      anon_sym_RPAREN,
+      anon_sym_COMMA,
+      anon_sym_as,
+      anon_sym_GT_GT,
+      anon_sym_if,
+      anon_sym_COLON,
+      anon_sym_else,
+      anon_sym_in,
+      anon_sym_PIPE,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_RBRACK,
+      anon_sym_RBRACE,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_not,
+      anon_sym_and,
+      anon_sym_or,
+      anon_sym_PERCENT,
+      anon_sym_SLASH_SLASH,
+      anon_sym_AMP,
+      anon_sym_CARET,
+      anon_sym_LT_LT,
+      anon_sym_LT_EQ,
+      anon_sym_EQ_EQ,
+      anon_sym_BANG_EQ,
+      anon_sym_GT_EQ,
+      anon_sym_LT_GT,
+      anon_sym_is,
+      sym_type_conversion,
+  [39696] = 13,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(51), 1,
+      anon_sym_LBRACE,
+    ACTIONS(81), 1,
+      sym__string_start,
+    ACTIONS(568), 1,
+      anon_sym_LPAREN,
+    ACTIONS(574), 1,
+      anon_sym_LBRACK,
+    ACTIONS(576), 1,
+      anon_sym_await,
+    STATE(709), 1,
+      sym_string,
+    STATE(722), 1,
+      sym_primary_expression,
+    ACTIONS(75), 2,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(47), 3,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_TILDE,
+    ACTIONS(77), 5,
+      sym_integer,
+      sym_identifier,
+      sym_true,
+      sym_false,
+      sym_none,
+    ACTIONS(570), 5,
+      anon_sym_print,
+      anon_sym_async,
+      anon_sym_match,
+      anon_sym_exec,
+      anon_sym_type,
+    STATE(759), 16,
+      sym_binary_operator,
+      sym_unary_operator,
+      sym_attribute,
+      sym_subscript,
+      sym_call,
+      sym_list,
+      sym_set,
+      sym_tuple,
+      sym_dictionary,
+      sym_list_comprehension,
+      sym_dictionary_comprehension,
+      sym_set_comprehension,
+      sym_generator_expression,
+      sym_parenthesized_expression,
+      sym_concatenated_string,
+      sym_await,
+  [39762] = 13,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(51), 1,
+      anon_sym_LBRACE,
+    ACTIONS(81), 1,
+      sym__string_start,
+    ACTIONS(568), 1,
+      anon_sym_LPAREN,
+    ACTIONS(574), 1,
+      anon_sym_LBRACK,
+    ACTIONS(576), 1,
+      anon_sym_await,
+    STATE(709), 1,
+      sym_string,
+    STATE(716), 1,
+      sym_primary_expression,
+    ACTIONS(75), 2,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(47), 3,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_TILDE,
+    ACTIONS(77), 5,
+      sym_integer,
+      sym_identifier,
+      sym_true,
+      sym_false,
+      sym_none,
+    ACTIONS(570), 5,
+      anon_sym_print,
+      anon_sym_async,
+      anon_sym_match,
+      anon_sym_exec,
+      anon_sym_type,
+    STATE(759), 16,
+      sym_binary_operator,
+      sym_unary_operator,
+      sym_attribute,
+      sym_subscript,
+      sym_call,
+      sym_list,
+      sym_set,
+      sym_tuple,
+      sym_dictionary,
+      sym_list_comprehension,
+      sym_dictionary_comprehension,
+      sym_set_comprehension,
+      sym_generator_expression,
+      sym_parenthesized_expression,
+      sym_concatenated_string,
+      sym_await,
+  [39828] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1113), 5,
+      anon_sym_STAR,
+      anon_sym_EQ,
+      anon_sym_SLASH,
+      anon_sym_LT,
+      anon_sym_GT,
+    ACTIONS(1108), 33,
+      anon_sym_DOT,
+      anon_sym_LPAREN,
+      anon_sym_RPAREN,
+      anon_sym_COMMA,
+      anon_sym_as,
+      anon_sym_GT_GT,
+      anon_sym_if,
+      anon_sym_COLON,
+      anon_sym_else,
+      anon_sym_in,
+      anon_sym_PIPE,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_RBRACK,
+      anon_sym_RBRACE,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_not,
+      anon_sym_and,
+      anon_sym_or,
+      anon_sym_PERCENT,
+      anon_sym_SLASH_SLASH,
+      anon_sym_AMP,
+      anon_sym_CARET,
+      anon_sym_LT_LT,
+      anon_sym_LT_EQ,
+      anon_sym_EQ_EQ,
+      anon_sym_BANG_EQ,
+      anon_sym_GT_EQ,
+      anon_sym_LT_GT,
+      anon_sym_is,
+      sym_type_conversion,
+  [39874] = 13,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(51), 1,
+      anon_sym_LBRACE,
+    ACTIONS(81), 1,
+      sym__string_start,
+    ACTIONS(568), 1,
+      anon_sym_LPAREN,
+    ACTIONS(574), 1,
+      anon_sym_LBRACK,
+    ACTIONS(576), 1,
+      anon_sym_await,
+    STATE(709), 1,
+      sym_string,
+    STATE(714), 1,
+      sym_primary_expression,
+    ACTIONS(75), 2,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(47), 3,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_TILDE,
+    ACTIONS(77), 5,
+      sym_integer,
+      sym_identifier,
+      sym_true,
+      sym_false,
+      sym_none,
+    ACTIONS(570), 5,
+      anon_sym_print,
+      anon_sym_async,
+      anon_sym_match,
+      anon_sym_exec,
+      anon_sym_type,
+    STATE(759), 16,
+      sym_binary_operator,
+      sym_unary_operator,
+      sym_attribute,
+      sym_subscript,
+      sym_call,
+      sym_list,
+      sym_set,
+      sym_tuple,
+      sym_dictionary,
+      sym_list_comprehension,
+      sym_dictionary_comprehension,
+      sym_set_comprehension,
+      sym_generator_expression,
+      sym_parenthesized_expression,
+      sym_concatenated_string,
+      sym_await,
+  [39940] = 4,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(580), 1,
+      anon_sym_COLON_EQ,
+    ACTIONS(260), 6,
+      anon_sym_as,
+      anon_sym_STAR,
+      anon_sym_COLON,
+      anon_sym_SLASH,
+      anon_sym_LT,
+      anon_sym_GT,
+    ACTIONS(287), 31,
+      anon_sym_DOT,
+      anon_sym_LPAREN,
+      anon_sym_RPAREN,
+      anon_sym_COMMA,
+      anon_sym_GT_GT,
+      anon_sym_if,
+      anon_sym_async,
+      anon_sym_for,
+      anon_sym_in,
+      anon_sym_PIPE,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_RBRACK,
+      anon_sym_RBRACE,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_not,
+      anon_sym_and,
+      anon_sym_or,
+      anon_sym_PERCENT,
+      anon_sym_SLASH_SLASH,
+      anon_sym_AMP,
+      anon_sym_CARET,
+      anon_sym_LT_LT,
+      anon_sym_LT_EQ,
+      anon_sym_EQ_EQ,
+      anon_sym_BANG_EQ,
+      anon_sym_GT_EQ,
+      anon_sym_LT_GT,
+      anon_sym_is,
+  [39988] = 13,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(279), 1,
+      anon_sym_LBRACE,
+    ACTIONS(299), 1,
+      sym__string_start,
+    ACTIONS(578), 1,
+      anon_sym_LPAREN,
+    ACTIONS(584), 1,
+      anon_sym_LBRACK,
+    ACTIONS(586), 1,
+      anon_sym_await,
+    STATE(586), 1,
+      sym_string,
+    STATE(639), 1,
+      sym_primary_expression,
+    ACTIONS(293), 2,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(582), 3,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_TILDE,
+    ACTIONS(295), 5,
+      sym_integer,
+      sym_identifier,
+      sym_true,
+      sym_false,
+      sym_none,
+    ACTIONS(558), 5,
+      anon_sym_print,
+      anon_sym_async,
+      anon_sym_match,
+      anon_sym_exec,
+      anon_sym_type,
+    STATE(605), 16,
+      sym_binary_operator,
+      sym_unary_operator,
+      sym_attribute,
+      sym_subscript,
+      sym_call,
+      sym_list,
+      sym_set,
+      sym_tuple,
+      sym_dictionary,
+      sym_list_comprehension,
+      sym_dictionary_comprehension,
+      sym_set_comprehension,
+      sym_generator_expression,
+      sym_parenthesized_expression,
+      sym_concatenated_string,
+      sym_await,
+  [40054] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1148), 5,
+      anon_sym_as,
+      anon_sym_STAR,
+      anon_sym_SLASH,
+      anon_sym_LT,
+      anon_sym_GT,
+    ACTIONS(1143), 32,
+      anon_sym_DOT,
+      anon_sym_LPAREN,
+      anon_sym_RPAREN,
+      anon_sym_COMMA,
+      anon_sym_GT_GT,
+      anon_sym_if,
+      anon_sym_COLON,
+      anon_sym_async,
+      anon_sym_for,
+      anon_sym_in,
+      anon_sym_PIPE,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_RBRACK,
+      anon_sym_RBRACE,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_not,
+      anon_sym_and,
+      anon_sym_or,
+      anon_sym_PERCENT,
+      anon_sym_SLASH_SLASH,
+      anon_sym_AMP,
+      anon_sym_CARET,
+      anon_sym_LT_LT,
+      anon_sym_LT_EQ,
+      anon_sym_EQ_EQ,
+      anon_sym_BANG_EQ,
+      anon_sym_GT_EQ,
+      anon_sym_LT_GT,
+      anon_sym_is,
+  [40099] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1113), 5,
+      anon_sym_as,
+      anon_sym_STAR,
+      anon_sym_SLASH,
+      anon_sym_LT,
+      anon_sym_GT,
+    ACTIONS(1108), 32,
+      anon_sym_DOT,
+      anon_sym_LPAREN,
+      anon_sym_RPAREN,
+      anon_sym_COMMA,
+      anon_sym_GT_GT,
+      anon_sym_if,
+      anon_sym_COLON,
+      anon_sym_async,
+      anon_sym_for,
+      anon_sym_in,
+      anon_sym_PIPE,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_RBRACK,
+      anon_sym_RBRACE,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_not,
+      anon_sym_and,
+      anon_sym_or,
+      anon_sym_PERCENT,
+      anon_sym_SLASH_SLASH,
+      anon_sym_AMP,
+      anon_sym_CARET,
+      anon_sym_LT_LT,
+      anon_sym_LT_EQ,
+      anon_sym_EQ_EQ,
+      anon_sym_BANG_EQ,
+      anon_sym_GT_EQ,
+      anon_sym_LT_GT,
+      anon_sym_is,
+  [40144] = 20,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1413), 1,
+      anon_sym_EQ,
+    ACTIONS(1608), 1,
+      anon_sym_DOT,
+    ACTIONS(1610), 1,
+      anon_sym_LPAREN,
+    ACTIONS(1618), 1,
+      anon_sym_PIPE,
+    ACTIONS(1622), 1,
+      anon_sym_LBRACK,
+    ACTIONS(1624), 1,
+      anon_sym_STAR_STAR,
+    ACTIONS(1628), 1,
+      anon_sym_not,
+    ACTIONS(1630), 1,
+      anon_sym_AMP,
+    ACTIONS(1632), 1,
+      anon_sym_CARET,
+    ACTIONS(1636), 1,
+      anon_sym_is,
+    STATE(857), 1,
+      aux_sym_comparison_operator_repeat1,
+    ACTIONS(1612), 2,
+      anon_sym_STAR,
+      anon_sym_SLASH,
+    ACTIONS(1614), 2,
+      anon_sym_GT_GT,
+      anon_sym_LT_LT,
+    ACTIONS(1620), 2,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+    ACTIONS(1634), 2,
+      anon_sym_LT,
+      anon_sym_GT,
+    STATE(777), 2,
+      sym_argument_list,
+      sym_generator_expression,
+    ACTIONS(1626), 3,
+      anon_sym_AT,
+      anon_sym_PERCENT,
+      anon_sym_SLASH_SLASH,
+    ACTIONS(1616), 6,
+      anon_sym_in,
+      anon_sym_LT_EQ,
+      anon_sym_EQ_EQ,
+      anon_sym_BANG_EQ,
+      anon_sym_GT_EQ,
+      anon_sym_LT_GT,
+    ACTIONS(1411), 7,
+      sym__newline,
+      anon_sym_from,
+      anon_sym_COMMA,
+      anon_sym_if,
+      anon_sym_and,
+      anon_sym_or,
+      sym__semicolon,
+  [40223] = 5,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1638), 1,
+      sym__string_start,
+    STATE(708), 2,
+      sym_string,
+      aux_sym_concatenated_string_repeat1,
+    ACTIONS(1386), 5,
+      anon_sym_STAR,
+      anon_sym_EQ,
+      anon_sym_SLASH,
+      anon_sym_LT,
+      anon_sym_GT,
+    ACTIONS(1384), 29,
+      sym__newline,
+      anon_sym_DOT,
+      anon_sym_from,
+      anon_sym_LPAREN,
+      anon_sym_COMMA,
+      anon_sym_GT_GT,
+      anon_sym_if,
+      anon_sym_in,
+      anon_sym_PIPE,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_not,
+      anon_sym_and,
+      anon_sym_or,
+      anon_sym_PERCENT,
+      anon_sym_SLASH_SLASH,
+      anon_sym_AMP,
+      anon_sym_CARET,
+      anon_sym_LT_LT,
+      anon_sym_LT_EQ,
+      anon_sym_EQ_EQ,
+      anon_sym_BANG_EQ,
+      anon_sym_GT_EQ,
+      anon_sym_LT_GT,
+      anon_sym_is,
+      sym__semicolon,
+  [40272] = 5,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(81), 1,
+      sym__string_start,
+    STATE(710), 2,
+      sym_string,
+      aux_sym_concatenated_string_repeat1,
+    ACTIONS(1079), 5,
+      anon_sym_STAR,
+      anon_sym_EQ,
+      anon_sym_SLASH,
+      anon_sym_LT,
+      anon_sym_GT,
+    ACTIONS(1074), 29,
+      sym__newline,
+      anon_sym_DOT,
+      anon_sym_from,
+      anon_sym_LPAREN,
+      anon_sym_COMMA,
+      anon_sym_GT_GT,
+      anon_sym_if,
+      anon_sym_in,
+      anon_sym_PIPE,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_not,
+      anon_sym_and,
+      anon_sym_or,
+      anon_sym_PERCENT,
+      anon_sym_SLASH_SLASH,
+      anon_sym_AMP,
+      anon_sym_CARET,
+      anon_sym_LT_LT,
+      anon_sym_LT_EQ,
+      anon_sym_EQ_EQ,
+      anon_sym_BANG_EQ,
+      anon_sym_GT_EQ,
+      anon_sym_LT_GT,
+      anon_sym_is,
+      sym__semicolon,
+  [40321] = 5,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(81), 1,
+      sym__string_start,
+    STATE(708), 2,
+      sym_string,
+      aux_sym_concatenated_string_repeat1,
+    ACTIONS(1382), 5,
+      anon_sym_STAR,
+      anon_sym_EQ,
+      anon_sym_SLASH,
+      anon_sym_LT,
+      anon_sym_GT,
+    ACTIONS(1380), 29,
+      sym__newline,
+      anon_sym_DOT,
+      anon_sym_from,
+      anon_sym_LPAREN,
+      anon_sym_COMMA,
+      anon_sym_GT_GT,
+      anon_sym_if,
+      anon_sym_in,
+      anon_sym_PIPE,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_not,
+      anon_sym_and,
+      anon_sym_or,
+      anon_sym_PERCENT,
+      anon_sym_SLASH_SLASH,
+      anon_sym_AMP,
+      anon_sym_CARET,
+      anon_sym_LT_LT,
+      anon_sym_LT_EQ,
+      anon_sym_EQ_EQ,
+      anon_sym_BANG_EQ,
+      anon_sym_GT_EQ,
+      anon_sym_LT_GT,
+      anon_sym_is,
+      sym__semicolon,
+  [40370] = 15,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1608), 1,
+      anon_sym_DOT,
+    ACTIONS(1610), 1,
+      anon_sym_LPAREN,
+    ACTIONS(1618), 1,
+      anon_sym_PIPE,
+    ACTIONS(1622), 1,
+      anon_sym_LBRACK,
+    ACTIONS(1624), 1,
+      anon_sym_STAR_STAR,
+    ACTIONS(1630), 1,
+      anon_sym_AMP,
+    ACTIONS(1632), 1,
+      anon_sym_CARET,
+    ACTIONS(1612), 2,
+      anon_sym_STAR,
+      anon_sym_SLASH,
+    ACTIONS(1614), 2,
+      anon_sym_GT_GT,
+      anon_sym_LT_LT,
+    ACTIONS(1620), 2,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+    STATE(777), 2,
+      sym_argument_list,
+      sym_generator_expression,
+    ACTIONS(1591), 3,
+      anon_sym_EQ,
+      anon_sym_LT,
+      anon_sym_GT,
+    ACTIONS(1626), 3,
+      anon_sym_AT,
+      anon_sym_PERCENT,
+      anon_sym_SLASH_SLASH,
+    ACTIONS(1589), 15,
+      sym__newline,
+      anon_sym_from,
+      anon_sym_COMMA,
+      anon_sym_if,
+      anon_sym_in,
+      anon_sym_not,
+      anon_sym_and,
+      anon_sym_or,
+      anon_sym_LT_EQ,
+      anon_sym_EQ_EQ,
+      anon_sym_BANG_EQ,
+      anon_sym_GT_EQ,
+      anon_sym_LT_GT,
+      anon_sym_is,
+      sym__semicolon,
+  [40438] = 15,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1608), 1,
+      anon_sym_DOT,
+    ACTIONS(1610), 1,
+      anon_sym_LPAREN,
+    ACTIONS(1618), 1,
+      anon_sym_PIPE,
+    ACTIONS(1622), 1,
+      anon_sym_LBRACK,
+    ACTIONS(1624), 1,
+      anon_sym_STAR_STAR,
+    ACTIONS(1630), 1,
+      anon_sym_AMP,
+    ACTIONS(1632), 1,
+      anon_sym_CARET,
+    ACTIONS(1612), 2,
+      anon_sym_STAR,
+      anon_sym_SLASH,
+    ACTIONS(1614), 2,
+      anon_sym_GT_GT,
+      anon_sym_LT_LT,
+    ACTIONS(1620), 2,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+    STATE(777), 2,
+      sym_argument_list,
+      sym_generator_expression,
+    ACTIONS(1571), 3,
+      anon_sym_EQ,
+      anon_sym_LT,
+      anon_sym_GT,
+    ACTIONS(1626), 3,
+      anon_sym_AT,
+      anon_sym_PERCENT,
+      anon_sym_SLASH_SLASH,
+    ACTIONS(1569), 15,
+      sym__newline,
+      anon_sym_from,
+      anon_sym_COMMA,
+      anon_sym_if,
+      anon_sym_in,
+      anon_sym_not,
+      anon_sym_and,
+      anon_sym_or,
+      anon_sym_LT_EQ,
+      anon_sym_EQ_EQ,
+      anon_sym_BANG_EQ,
+      anon_sym_GT_EQ,
+      anon_sym_LT_GT,
+      anon_sym_is,
+      sym__semicolon,
+  [40506] = 5,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(608), 1,
+      sym__string_start,
+    STATE(668), 2,
+      sym_string,
+      aux_sym_concatenated_string_repeat1,
+    ACTIONS(1079), 4,
+      anon_sym_STAR,
+      anon_sym_SLASH,
+      anon_sym_LT,
+      anon_sym_GT,
+    ACTIONS(1074), 29,
       anon_sym_DOT,
       anon_sym_LPAREN,
       anon_sym_RPAREN,
@@ -61033,38 +56681,38 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_GT_EQ,
       anon_sym_LT_GT,
       anon_sym_is,
-  [41424] = 12,
+  [40554] = 12,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1610), 1,
+    ACTIONS(1608), 1,
       anon_sym_DOT,
-    ACTIONS(1612), 1,
+    ACTIONS(1610), 1,
       anon_sym_LPAREN,
-    ACTIONS(1624), 1,
+    ACTIONS(1622), 1,
       anon_sym_LBRACK,
-    ACTIONS(1626), 1,
+    ACTIONS(1624), 1,
       anon_sym_STAR_STAR,
-    ACTIONS(1614), 2,
+    ACTIONS(1612), 2,
       anon_sym_STAR,
       anon_sym_SLASH,
-    ACTIONS(1616), 2,
+    ACTIONS(1614), 2,
       anon_sym_GT_GT,
       anon_sym_LT_LT,
-    ACTIONS(1622), 2,
+    ACTIONS(1620), 2,
       anon_sym_DASH,
       anon_sym_PLUS,
-    STATE(792), 2,
+    STATE(777), 2,
       sym_argument_list,
       sym_generator_expression,
-    ACTIONS(1573), 3,
+    ACTIONS(1567), 3,
       anon_sym_EQ,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1628), 3,
+    ACTIONS(1626), 3,
       anon_sym_AT,
       anon_sym_PERCENT,
       anon_sym_SLASH_SLASH,
-    ACTIONS(1571), 18,
+    ACTIONS(1565), 18,
       sym__newline,
       anon_sym_from,
       anon_sym_COMMA,
@@ -61083,7 +56731,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_LT_GT,
       anon_sym_is,
       sym__semicolon,
-  [41486] = 3,
+  [40616] = 3,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(1405), 4,
@@ -61124,18 +56772,404 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_GT_EQ,
       anon_sym_LT_GT,
       anon_sym_is,
-  [41530] = 8,
+  [40660] = 13,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1610), 1,
+    ACTIONS(1608), 1,
       anon_sym_DOT,
-    ACTIONS(1612), 1,
+    ACTIONS(1610), 1,
       anon_sym_LPAREN,
-    ACTIONS(1624), 1,
+    ACTIONS(1622), 1,
       anon_sym_LBRACK,
-    ACTIONS(1626), 1,
+    ACTIONS(1624), 1,
       anon_sym_STAR_STAR,
-    STATE(792), 2,
+    ACTIONS(1632), 1,
+      anon_sym_CARET,
+    ACTIONS(1612), 2,
+      anon_sym_STAR,
+      anon_sym_SLASH,
+    ACTIONS(1614), 2,
+      anon_sym_GT_GT,
+      anon_sym_LT_LT,
+    ACTIONS(1620), 2,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+    STATE(777), 2,
+      sym_argument_list,
+      sym_generator_expression,
+    ACTIONS(1567), 3,
+      anon_sym_EQ,
+      anon_sym_LT,
+      anon_sym_GT,
+    ACTIONS(1626), 3,
+      anon_sym_AT,
+      anon_sym_PERCENT,
+      anon_sym_SLASH_SLASH,
+    ACTIONS(1565), 17,
+      sym__newline,
+      anon_sym_from,
+      anon_sym_COMMA,
+      anon_sym_if,
+      anon_sym_in,
+      anon_sym_PIPE,
+      anon_sym_not,
+      anon_sym_and,
+      anon_sym_or,
+      anon_sym_AMP,
+      anon_sym_LT_EQ,
+      anon_sym_EQ_EQ,
+      anon_sym_BANG_EQ,
+      anon_sym_GT_EQ,
+      anon_sym_LT_GT,
+      anon_sym_is,
+      sym__semicolon,
+  [40724] = 11,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1608), 1,
+      anon_sym_DOT,
+    ACTIONS(1610), 1,
+      anon_sym_LPAREN,
+    ACTIONS(1622), 1,
+      anon_sym_LBRACK,
+    ACTIONS(1624), 1,
+      anon_sym_STAR_STAR,
+    ACTIONS(1612), 2,
+      anon_sym_STAR,
+      anon_sym_SLASH,
+    ACTIONS(1620), 2,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+    STATE(777), 2,
+      sym_argument_list,
+      sym_generator_expression,
+    ACTIONS(1567), 3,
+      anon_sym_EQ,
+      anon_sym_LT,
+      anon_sym_GT,
+    ACTIONS(1626), 3,
+      anon_sym_AT,
+      anon_sym_PERCENT,
+      anon_sym_SLASH_SLASH,
+    ACTIONS(1565), 20,
+      sym__newline,
+      anon_sym_from,
+      anon_sym_COMMA,
+      anon_sym_GT_GT,
+      anon_sym_if,
+      anon_sym_in,
+      anon_sym_PIPE,
+      anon_sym_not,
+      anon_sym_and,
+      anon_sym_or,
+      anon_sym_AMP,
+      anon_sym_CARET,
+      anon_sym_LT_LT,
+      anon_sym_LT_EQ,
+      anon_sym_EQ_EQ,
+      anon_sym_BANG_EQ,
+      anon_sym_GT_EQ,
+      anon_sym_LT_GT,
+      anon_sym_is,
+      sym__semicolon,
+  [40784] = 8,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1608), 1,
+      anon_sym_DOT,
+    ACTIONS(1610), 1,
+      anon_sym_LPAREN,
+    ACTIONS(1622), 1,
+      anon_sym_LBRACK,
+    ACTIONS(1624), 1,
+      anon_sym_STAR_STAR,
+    STATE(777), 2,
+      sym_argument_list,
+      sym_generator_expression,
+    ACTIONS(1567), 5,
+      anon_sym_STAR,
+      anon_sym_EQ,
+      anon_sym_SLASH,
+      anon_sym_LT,
+      anon_sym_GT,
+    ACTIONS(1565), 25,
+      sym__newline,
+      anon_sym_from,
+      anon_sym_COMMA,
+      anon_sym_GT_GT,
+      anon_sym_if,
+      anon_sym_in,
+      anon_sym_PIPE,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_AT,
+      anon_sym_not,
+      anon_sym_and,
+      anon_sym_or,
+      anon_sym_PERCENT,
+      anon_sym_SLASH_SLASH,
+      anon_sym_AMP,
+      anon_sym_CARET,
+      anon_sym_LT_LT,
+      anon_sym_LT_EQ,
+      anon_sym_EQ_EQ,
+      anon_sym_BANG_EQ,
+      anon_sym_GT_EQ,
+      anon_sym_LT_GT,
+      anon_sym_is,
+      sym__semicolon,
+  [40838] = 10,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1608), 1,
+      anon_sym_DOT,
+    ACTIONS(1610), 1,
+      anon_sym_LPAREN,
+    ACTIONS(1622), 1,
+      anon_sym_LBRACK,
+    ACTIONS(1624), 1,
+      anon_sym_STAR_STAR,
+    ACTIONS(1612), 2,
+      anon_sym_STAR,
+      anon_sym_SLASH,
+    STATE(777), 2,
+      sym_argument_list,
+      sym_generator_expression,
+    ACTIONS(1567), 3,
+      anon_sym_EQ,
+      anon_sym_LT,
+      anon_sym_GT,
+    ACTIONS(1626), 3,
+      anon_sym_AT,
+      anon_sym_PERCENT,
+      anon_sym_SLASH_SLASH,
+    ACTIONS(1565), 22,
+      sym__newline,
+      anon_sym_from,
+      anon_sym_COMMA,
+      anon_sym_GT_GT,
+      anon_sym_if,
+      anon_sym_in,
+      anon_sym_PIPE,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_not,
+      anon_sym_and,
+      anon_sym_or,
+      anon_sym_AMP,
+      anon_sym_CARET,
+      anon_sym_LT_LT,
+      anon_sym_LT_EQ,
+      anon_sym_EQ_EQ,
+      anon_sym_BANG_EQ,
+      anon_sym_GT_EQ,
+      anon_sym_LT_GT,
+      anon_sym_is,
+      sym__semicolon,
+  [40896] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1401), 4,
+      anon_sym_STAR,
+      anon_sym_SLASH,
+      anon_sym_LT,
+      anon_sym_GT,
+    ACTIONS(1399), 32,
+      sym__string_start,
+      anon_sym_DOT,
+      anon_sym_LPAREN,
+      anon_sym_RPAREN,
+      anon_sym_COMMA,
+      anon_sym_as,
+      anon_sym_GT_GT,
+      anon_sym_if,
+      anon_sym_COLON,
+      anon_sym_in,
+      anon_sym_PIPE,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_RBRACK,
+      anon_sym_RBRACE,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_not,
+      anon_sym_and,
+      anon_sym_or,
+      anon_sym_PERCENT,
+      anon_sym_SLASH_SLASH,
+      anon_sym_AMP,
+      anon_sym_CARET,
+      anon_sym_LT_LT,
+      anon_sym_LT_EQ,
+      anon_sym_EQ_EQ,
+      anon_sym_BANG_EQ,
+      anon_sym_GT_EQ,
+      anon_sym_LT_GT,
+      anon_sym_is,
+  [40940] = 15,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1608), 1,
+      anon_sym_DOT,
+    ACTIONS(1610), 1,
+      anon_sym_LPAREN,
+    ACTIONS(1618), 1,
+      anon_sym_PIPE,
+    ACTIONS(1622), 1,
+      anon_sym_LBRACK,
+    ACTIONS(1624), 1,
+      anon_sym_STAR_STAR,
+    ACTIONS(1630), 1,
+      anon_sym_AMP,
+    ACTIONS(1632), 1,
+      anon_sym_CARET,
+    ACTIONS(1612), 2,
+      anon_sym_STAR,
+      anon_sym_SLASH,
+    ACTIONS(1614), 2,
+      anon_sym_GT_GT,
+      anon_sym_LT_LT,
+    ACTIONS(1620), 2,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+    STATE(777), 2,
+      sym_argument_list,
+      sym_generator_expression,
+    ACTIONS(1581), 3,
+      anon_sym_EQ,
+      anon_sym_LT,
+      anon_sym_GT,
+    ACTIONS(1626), 3,
+      anon_sym_AT,
+      anon_sym_PERCENT,
+      anon_sym_SLASH_SLASH,
+    ACTIONS(1579), 15,
+      sym__newline,
+      anon_sym_from,
+      anon_sym_COMMA,
+      anon_sym_if,
+      anon_sym_in,
+      anon_sym_not,
+      anon_sym_and,
+      anon_sym_or,
+      anon_sym_LT_EQ,
+      anon_sym_EQ_EQ,
+      anon_sym_BANG_EQ,
+      anon_sym_GT_EQ,
+      anon_sym_LT_GT,
+      anon_sym_is,
+      sym__semicolon,
+  [41008] = 8,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1608), 1,
+      anon_sym_DOT,
+    ACTIONS(1610), 1,
+      anon_sym_LPAREN,
+    ACTIONS(1622), 1,
+      anon_sym_LBRACK,
+    ACTIONS(1624), 1,
+      anon_sym_STAR_STAR,
+    STATE(777), 2,
+      sym_argument_list,
+      sym_generator_expression,
+    ACTIONS(1567), 5,
+      anon_sym_STAR,
+      anon_sym_EQ,
+      anon_sym_SLASH,
+      anon_sym_LT,
+      anon_sym_GT,
+    ACTIONS(1565), 25,
+      sym__newline,
+      anon_sym_from,
+      anon_sym_COMMA,
+      anon_sym_GT_GT,
+      anon_sym_if,
+      anon_sym_in,
+      anon_sym_PIPE,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_AT,
+      anon_sym_not,
+      anon_sym_and,
+      anon_sym_or,
+      anon_sym_PERCENT,
+      anon_sym_SLASH_SLASH,
+      anon_sym_AMP,
+      anon_sym_CARET,
+      anon_sym_LT_LT,
+      anon_sym_LT_EQ,
+      anon_sym_EQ_EQ,
+      anon_sym_BANG_EQ,
+      anon_sym_GT_EQ,
+      anon_sym_LT_GT,
+      anon_sym_is,
+      sym__semicolon,
+  [41062] = 14,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1608), 1,
+      anon_sym_DOT,
+    ACTIONS(1610), 1,
+      anon_sym_LPAREN,
+    ACTIONS(1622), 1,
+      anon_sym_LBRACK,
+    ACTIONS(1624), 1,
+      anon_sym_STAR_STAR,
+    ACTIONS(1630), 1,
+      anon_sym_AMP,
+    ACTIONS(1632), 1,
+      anon_sym_CARET,
+    ACTIONS(1612), 2,
+      anon_sym_STAR,
+      anon_sym_SLASH,
+    ACTIONS(1614), 2,
+      anon_sym_GT_GT,
+      anon_sym_LT_LT,
+    ACTIONS(1620), 2,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+    STATE(777), 2,
+      sym_argument_list,
+      sym_generator_expression,
+    ACTIONS(1567), 3,
+      anon_sym_EQ,
+      anon_sym_LT,
+      anon_sym_GT,
+    ACTIONS(1626), 3,
+      anon_sym_AT,
+      anon_sym_PERCENT,
+      anon_sym_SLASH_SLASH,
+    ACTIONS(1565), 16,
+      sym__newline,
+      anon_sym_from,
+      anon_sym_COMMA,
+      anon_sym_if,
+      anon_sym_in,
+      anon_sym_PIPE,
+      anon_sym_not,
+      anon_sym_and,
+      anon_sym_or,
+      anon_sym_LT_EQ,
+      anon_sym_EQ_EQ,
+      anon_sym_BANG_EQ,
+      anon_sym_GT_EQ,
+      anon_sym_LT_GT,
+      anon_sym_is,
+      sym__semicolon,
+  [41128] = 8,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1608), 1,
+      anon_sym_DOT,
+    ACTIONS(1610), 1,
+      anon_sym_LPAREN,
+    ACTIONS(1622), 1,
+      anon_sym_LBRACK,
+    ACTIONS(1624), 1,
+      anon_sym_STAR_STAR,
+    STATE(777), 2,
       sym_argument_list,
       sym_generator_expression,
     ACTIONS(1577), 5,
@@ -61170,163 +57204,126 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_LT_GT,
       anon_sym_is,
       sym__semicolon,
-  [41584] = 15,
+  [41182] = 8,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1647), 1,
+    ACTIONS(1608), 1,
       anon_sym_DOT,
-    ACTIONS(1649), 1,
+    ACTIONS(1610), 1,
       anon_sym_LPAREN,
-    ACTIONS(1657), 1,
-      anon_sym_PIPE,
-    ACTIONS(1661), 1,
+    ACTIONS(1622), 1,
       anon_sym_LBRACK,
-    ACTIONS(1663), 1,
+    ACTIONS(1624), 1,
       anon_sym_STAR_STAR,
-    ACTIONS(1669), 1,
-      anon_sym_AMP,
-    ACTIONS(1671), 1,
-      anon_sym_CARET,
-    ACTIONS(1589), 2,
-      anon_sym_LT,
-      anon_sym_GT,
-    ACTIONS(1651), 2,
-      anon_sym_STAR,
-      anon_sym_SLASH,
-    ACTIONS(1653), 2,
-      anon_sym_GT_GT,
-      anon_sym_LT_LT,
-    ACTIONS(1659), 2,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-    STATE(847), 2,
+    STATE(777), 2,
       sym_argument_list,
       sym_generator_expression,
-    ACTIONS(1665), 3,
-      anon_sym_AT,
-      anon_sym_PERCENT,
-      anon_sym_SLASH_SLASH,
-    ACTIONS(1587), 15,
-      anon_sym_RPAREN,
-      anon_sym_COMMA,
-      anon_sym_as,
-      anon_sym_if,
-      anon_sym_COLON,
-      anon_sym_in,
-      anon_sym_not,
-      anon_sym_and,
-      anon_sym_or,
-      anon_sym_LT_EQ,
-      anon_sym_EQ_EQ,
-      anon_sym_BANG_EQ,
-      anon_sym_GT_EQ,
-      anon_sym_LT_GT,
-      anon_sym_is,
-  [41651] = 10,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1647), 1,
-      anon_sym_DOT,
-    ACTIONS(1649), 1,
-      anon_sym_LPAREN,
-    ACTIONS(1661), 1,
-      anon_sym_LBRACK,
-    ACTIONS(1663), 1,
-      anon_sym_STAR_STAR,
-    ACTIONS(1573), 2,
-      anon_sym_LT,
-      anon_sym_GT,
-    ACTIONS(1651), 2,
+    ACTIONS(1587), 5,
       anon_sym_STAR,
-      anon_sym_SLASH,
-    STATE(847), 2,
-      sym_argument_list,
-      sym_generator_expression,
-    ACTIONS(1665), 3,
-      anon_sym_AT,
-      anon_sym_PERCENT,
-      anon_sym_SLASH_SLASH,
-    ACTIONS(1571), 22,
-      anon_sym_RPAREN,
-      anon_sym_COMMA,
-      anon_sym_as,
-      anon_sym_GT_GT,
-      anon_sym_if,
-      anon_sym_COLON,
-      anon_sym_in,
-      anon_sym_PIPE,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_not,
-      anon_sym_and,
-      anon_sym_or,
-      anon_sym_AMP,
-      anon_sym_CARET,
-      anon_sym_LT_LT,
-      anon_sym_LT_EQ,
-      anon_sym_EQ_EQ,
-      anon_sym_BANG_EQ,
-      anon_sym_GT_EQ,
-      anon_sym_LT_GT,
-      anon_sym_is,
-  [41708] = 4,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(303), 3,
-      anon_sym_DOT,
-      anon_sym_LPAREN,
-      anon_sym_LBRACK,
-    ACTIONS(276), 13,
-      anon_sym_STAR,
-      anon_sym_GT_GT,
-      anon_sym_PIPE,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_SLASH,
-      anon_sym_PERCENT,
-      anon_sym_SLASH_SLASH,
-      anon_sym_AMP,
-      anon_sym_CARET,
-      anon_sym_LT_LT,
-    ACTIONS(307), 19,
-      anon_sym_RPAREN,
-      anon_sym_COMMA,
-      anon_sym_COLON,
-      anon_sym_in,
-      anon_sym_RBRACK,
       anon_sym_EQ,
-      anon_sym_PLUS_EQ,
-      anon_sym_DASH_EQ,
-      anon_sym_STAR_EQ,
-      anon_sym_SLASH_EQ,
-      anon_sym_AT_EQ,
-      anon_sym_SLASH_SLASH_EQ,
-      anon_sym_PERCENT_EQ,
-      anon_sym_STAR_STAR_EQ,
-      anon_sym_GT_GT_EQ,
-      anon_sym_LT_LT_EQ,
-      anon_sym_AMP_EQ,
-      anon_sym_CARET_EQ,
-      anon_sym_PIPE_EQ,
-  [41753] = 5,
+      anon_sym_SLASH,
+      anon_sym_LT,
+      anon_sym_GT,
+    ACTIONS(1585), 25,
+      sym__newline,
+      anon_sym_from,
+      anon_sym_COMMA,
+      anon_sym_GT_GT,
+      anon_sym_if,
+      anon_sym_in,
+      anon_sym_PIPE,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_AT,
+      anon_sym_not,
+      anon_sym_and,
+      anon_sym_or,
+      anon_sym_PERCENT,
+      anon_sym_SLASH_SLASH,
+      anon_sym_AMP,
+      anon_sym_CARET,
+      anon_sym_LT_LT,
+      anon_sym_LT_EQ,
+      anon_sym_EQ_EQ,
+      anon_sym_BANG_EQ,
+      anon_sym_GT_EQ,
+      anon_sym_LT_GT,
+      anon_sym_is,
+      sym__semicolon,
+  [41236] = 19,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1591), 1,
-      anon_sym_COLON_EQ,
-    ACTIONS(1050), 3,
+    ACTIONS(1641), 1,
+      anon_sym_DOT,
+    ACTIONS(1643), 1,
+      anon_sym_LPAREN,
+    ACTIONS(1651), 1,
+      anon_sym_PIPE,
+    ACTIONS(1655), 1,
+      anon_sym_LBRACK,
+    ACTIONS(1657), 1,
+      anon_sym_STAR_STAR,
+    ACTIONS(1661), 1,
+      anon_sym_not,
+    ACTIONS(1663), 1,
+      anon_sym_AMP,
+    ACTIONS(1665), 1,
+      anon_sym_CARET,
+    ACTIONS(1669), 1,
+      anon_sym_is,
+    STATE(864), 1,
+      aux_sym_comparison_operator_repeat1,
+    ACTIONS(1645), 2,
+      anon_sym_STAR,
+      anon_sym_SLASH,
+    ACTIONS(1647), 2,
+      anon_sym_GT_GT,
+      anon_sym_LT_LT,
+    ACTIONS(1653), 2,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+    ACTIONS(1667), 2,
+      anon_sym_LT,
+      anon_sym_GT,
+    STATE(801), 2,
+      sym_argument_list,
+      sym_generator_expression,
+    ACTIONS(1659), 3,
+      anon_sym_AT,
+      anon_sym_PERCENT,
+      anon_sym_SLASH_SLASH,
+    ACTIONS(1649), 6,
+      anon_sym_in,
+      anon_sym_LT_EQ,
+      anon_sym_EQ_EQ,
+      anon_sym_BANG_EQ,
+      anon_sym_GT_EQ,
+      anon_sym_LT_GT,
+    ACTIONS(1411), 7,
       anon_sym_RPAREN,
       anon_sym_COMMA,
-      anon_sym_RBRACK,
-    ACTIONS(1053), 4,
+      anon_sym_as,
+      anon_sym_if,
+      anon_sym_COLON,
+      anon_sym_and,
+      anon_sym_or,
+  [41312] = 5,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1606), 1,
+      anon_sym_COLON_EQ,
+    ACTIONS(1671), 1,
+      anon_sym_EQ,
+    ACTIONS(1079), 4,
       anon_sym_STAR,
       anon_sym_SLASH,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1048), 27,
+    ACTIONS(1074), 29,
       anon_sym_DOT,
       anon_sym_LPAREN,
+      anon_sym_RPAREN,
+      anon_sym_COMMA,
       anon_sym_GT_GT,
       anon_sym_if,
       anon_sym_async,
@@ -61352,137 +57349,34 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_GT_EQ,
       anon_sym_LT_GT,
       anon_sym_is,
-  [41800] = 14,
+  [41359] = 11,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1647), 1,
+    ACTIONS(1641), 1,
       anon_sym_DOT,
-    ACTIONS(1649), 1,
+    ACTIONS(1643), 1,
       anon_sym_LPAREN,
-    ACTIONS(1661), 1,
+    ACTIONS(1655), 1,
       anon_sym_LBRACK,
-    ACTIONS(1663), 1,
-      anon_sym_STAR_STAR,
-    ACTIONS(1669), 1,
-      anon_sym_AMP,
-    ACTIONS(1671), 1,
-      anon_sym_CARET,
-    ACTIONS(1573), 2,
-      anon_sym_LT,
-      anon_sym_GT,
-    ACTIONS(1651), 2,
-      anon_sym_STAR,
-      anon_sym_SLASH,
-    ACTIONS(1653), 2,
-      anon_sym_GT_GT,
-      anon_sym_LT_LT,
-    ACTIONS(1659), 2,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-    STATE(847), 2,
-      sym_argument_list,
-      sym_generator_expression,
-    ACTIONS(1665), 3,
-      anon_sym_AT,
-      anon_sym_PERCENT,
-      anon_sym_SLASH_SLASH,
-    ACTIONS(1571), 16,
-      anon_sym_RPAREN,
-      anon_sym_COMMA,
-      anon_sym_as,
-      anon_sym_if,
-      anon_sym_COLON,
-      anon_sym_in,
-      anon_sym_PIPE,
-      anon_sym_not,
-      anon_sym_and,
-      anon_sym_or,
-      anon_sym_LT_EQ,
-      anon_sym_EQ_EQ,
-      anon_sym_BANG_EQ,
-      anon_sym_GT_EQ,
-      anon_sym_LT_GT,
-      anon_sym_is,
-  [41865] = 15,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1647), 1,
-      anon_sym_DOT,
-    ACTIONS(1649), 1,
-      anon_sym_LPAREN,
     ACTIONS(1657), 1,
-      anon_sym_PIPE,
-    ACTIONS(1661), 1,
-      anon_sym_LBRACK,
-    ACTIONS(1663), 1,
       anon_sym_STAR_STAR,
-    ACTIONS(1669), 1,
-      anon_sym_AMP,
-    ACTIONS(1671), 1,
-      anon_sym_CARET,
-    ACTIONS(1581), 2,
+    ACTIONS(1567), 2,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1651), 2,
+    ACTIONS(1645), 2,
       anon_sym_STAR,
       anon_sym_SLASH,
     ACTIONS(1653), 2,
-      anon_sym_GT_GT,
-      anon_sym_LT_LT,
-    ACTIONS(1659), 2,
       anon_sym_DASH,
       anon_sym_PLUS,
-    STATE(847), 2,
+    STATE(801), 2,
       sym_argument_list,
       sym_generator_expression,
-    ACTIONS(1665), 3,
+    ACTIONS(1659), 3,
       anon_sym_AT,
       anon_sym_PERCENT,
       anon_sym_SLASH_SLASH,
-    ACTIONS(1579), 15,
-      anon_sym_RPAREN,
-      anon_sym_COMMA,
-      anon_sym_as,
-      anon_sym_if,
-      anon_sym_COLON,
-      anon_sym_in,
-      anon_sym_not,
-      anon_sym_and,
-      anon_sym_or,
-      anon_sym_LT_EQ,
-      anon_sym_EQ_EQ,
-      anon_sym_BANG_EQ,
-      anon_sym_GT_EQ,
-      anon_sym_LT_GT,
-      anon_sym_is,
-  [41932] = 11,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1647), 1,
-      anon_sym_DOT,
-    ACTIONS(1649), 1,
-      anon_sym_LPAREN,
-    ACTIONS(1661), 1,
-      anon_sym_LBRACK,
-    ACTIONS(1663), 1,
-      anon_sym_STAR_STAR,
-    ACTIONS(1573), 2,
-      anon_sym_LT,
-      anon_sym_GT,
-    ACTIONS(1651), 2,
-      anon_sym_STAR,
-      anon_sym_SLASH,
-    ACTIONS(1659), 2,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-    STATE(847), 2,
-      sym_argument_list,
-      sym_generator_expression,
-    ACTIONS(1665), 3,
-      anon_sym_AT,
-      anon_sym_PERCENT,
-      anon_sym_SLASH_SLASH,
-    ACTIONS(1571), 20,
+    ACTIONS(1565), 20,
       anon_sym_RPAREN,
       anon_sym_COMMA,
       anon_sym_as,
@@ -61503,231 +57397,134 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_GT_EQ,
       anon_sym_LT_GT,
       anon_sym_is,
-  [41991] = 8,
+  [41418] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1647), 1,
+    ACTIONS(1074), 3,
       anon_sym_DOT,
-    ACTIONS(1649), 1,
       anon_sym_LPAREN,
-    ACTIONS(1661), 1,
       anon_sym_LBRACK,
-    ACTIONS(1663), 1,
-      anon_sym_STAR_STAR,
-    STATE(847), 2,
-      sym_argument_list,
-      sym_generator_expression,
-    ACTIONS(1573), 4,
+    ACTIONS(1079), 13,
       anon_sym_STAR,
-      anon_sym_SLASH,
-      anon_sym_LT,
-      anon_sym_GT,
-    ACTIONS(1571), 25,
-      anon_sym_RPAREN,
-      anon_sym_COMMA,
-      anon_sym_as,
       anon_sym_GT_GT,
-      anon_sym_if,
-      anon_sym_COLON,
-      anon_sym_in,
       anon_sym_PIPE,
       anon_sym_DASH,
       anon_sym_PLUS,
+      anon_sym_STAR_STAR,
       anon_sym_AT,
-      anon_sym_not,
-      anon_sym_and,
-      anon_sym_or,
+      anon_sym_SLASH,
       anon_sym_PERCENT,
       anon_sym_SLASH_SLASH,
       anon_sym_AMP,
       anon_sym_CARET,
       anon_sym_LT_LT,
-      anon_sym_LT_EQ,
-      anon_sym_EQ_EQ,
-      anon_sym_BANG_EQ,
-      anon_sym_GT_EQ,
-      anon_sym_LT_GT,
-      anon_sym_is,
-  [42044] = 4,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1055), 1,
-      anon_sym_COLON_EQ,
-    ACTIONS(1053), 5,
-      anon_sym_STAR,
+    ACTIONS(1085), 19,
+      anon_sym_RPAREN,
+      anon_sym_COMMA,
+      anon_sym_COLON,
+      anon_sym_in,
+      anon_sym_RBRACK,
       anon_sym_EQ,
-      anon_sym_SLASH,
-      anon_sym_LT,
-      anon_sym_GT,
-    ACTIONS(1048), 29,
-      sym__newline,
+      anon_sym_PLUS_EQ,
+      anon_sym_DASH_EQ,
+      anon_sym_STAR_EQ,
+      anon_sym_SLASH_EQ,
+      anon_sym_AT_EQ,
+      anon_sym_SLASH_SLASH_EQ,
+      anon_sym_PERCENT_EQ,
+      anon_sym_STAR_STAR_EQ,
+      anon_sym_GT_GT_EQ,
+      anon_sym_LT_LT_EQ,
+      anon_sym_AMP_EQ,
+      anon_sym_CARET_EQ,
+      anon_sym_PIPE_EQ,
+  [41463] = 4,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(287), 3,
       anon_sym_DOT,
-      anon_sym_from,
       anon_sym_LPAREN,
-      anon_sym_COMMA,
+      anon_sym_LBRACK,
+    ACTIONS(260), 13,
+      anon_sym_STAR,
       anon_sym_GT_GT,
-      anon_sym_if,
-      anon_sym_in,
       anon_sym_PIPE,
       anon_sym_DASH,
       anon_sym_PLUS,
-      anon_sym_LBRACK,
       anon_sym_STAR_STAR,
       anon_sym_AT,
-      anon_sym_not,
-      anon_sym_and,
-      anon_sym_or,
+      anon_sym_SLASH,
       anon_sym_PERCENT,
       anon_sym_SLASH_SLASH,
       anon_sym_AMP,
       anon_sym_CARET,
       anon_sym_LT_LT,
-      anon_sym_LT_EQ,
-      anon_sym_EQ_EQ,
-      anon_sym_BANG_EQ,
-      anon_sym_GT_EQ,
-      anon_sym_LT_GT,
-      anon_sym_is,
-      sym__semicolon,
-  [42089] = 4,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(287), 1,
-      anon_sym_COLON_EQ,
-    ACTIONS(276), 5,
-      anon_sym_STAR,
-      anon_sym_EQ,
-      anon_sym_SLASH,
-      anon_sym_LT,
-      anon_sym_GT,
-    ACTIONS(303), 29,
-      sym__newline,
-      anon_sym_DOT,
-      anon_sym_from,
-      anon_sym_LPAREN,
-      anon_sym_COMMA,
-      anon_sym_GT_GT,
-      anon_sym_if,
-      anon_sym_in,
-      anon_sym_PIPE,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_not,
-      anon_sym_and,
-      anon_sym_or,
-      anon_sym_PERCENT,
-      anon_sym_SLASH_SLASH,
-      anon_sym_AMP,
-      anon_sym_CARET,
-      anon_sym_LT_LT,
-      anon_sym_LT_EQ,
-      anon_sym_EQ_EQ,
-      anon_sym_BANG_EQ,
-      anon_sym_GT_EQ,
-      anon_sym_LT_GT,
-      anon_sym_is,
-      sym__semicolon,
-  [42134] = 8,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1647), 1,
-      anon_sym_DOT,
-    ACTIONS(1649), 1,
-      anon_sym_LPAREN,
-    ACTIONS(1661), 1,
-      anon_sym_LBRACK,
-    ACTIONS(1663), 1,
-      anon_sym_STAR_STAR,
-    STATE(847), 2,
-      sym_argument_list,
-      sym_generator_expression,
-    ACTIONS(1573), 4,
-      anon_sym_STAR,
-      anon_sym_SLASH,
-      anon_sym_LT,
-      anon_sym_GT,
-    ACTIONS(1571), 25,
+    ACTIONS(564), 19,
       anon_sym_RPAREN,
       anon_sym_COMMA,
-      anon_sym_as,
-      anon_sym_GT_GT,
-      anon_sym_if,
       anon_sym_COLON,
       anon_sym_in,
-      anon_sym_PIPE,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_AT,
-      anon_sym_not,
-      anon_sym_and,
-      anon_sym_or,
-      anon_sym_PERCENT,
-      anon_sym_SLASH_SLASH,
-      anon_sym_AMP,
-      anon_sym_CARET,
-      anon_sym_LT_LT,
-      anon_sym_LT_EQ,
-      anon_sym_EQ_EQ,
-      anon_sym_BANG_EQ,
-      anon_sym_GT_EQ,
-      anon_sym_LT_GT,
-      anon_sym_is,
-  [42187] = 15,
+      anon_sym_RBRACK,
+      anon_sym_EQ,
+      anon_sym_PLUS_EQ,
+      anon_sym_DASH_EQ,
+      anon_sym_STAR_EQ,
+      anon_sym_SLASH_EQ,
+      anon_sym_AT_EQ,
+      anon_sym_SLASH_SLASH_EQ,
+      anon_sym_PERCENT_EQ,
+      anon_sym_STAR_STAR_EQ,
+      anon_sym_GT_GT_EQ,
+      anon_sym_LT_LT_EQ,
+      anon_sym_AMP_EQ,
+      anon_sym_CARET_EQ,
+      anon_sym_PIPE_EQ,
+  [41508] = 8,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1647), 1,
+    ACTIONS(1641), 1,
       anon_sym_DOT,
-    ACTIONS(1649), 1,
+    ACTIONS(1643), 1,
       anon_sym_LPAREN,
+    ACTIONS(1655), 1,
+      anon_sym_LBRACK,
     ACTIONS(1657), 1,
-      anon_sym_PIPE,
-    ACTIONS(1661), 1,
-      anon_sym_LBRACK,
-    ACTIONS(1663), 1,
       anon_sym_STAR_STAR,
-    ACTIONS(1669), 1,
-      anon_sym_AMP,
-    ACTIONS(1671), 1,
-      anon_sym_CARET,
-    ACTIONS(1585), 2,
-      anon_sym_LT,
-      anon_sym_GT,
-    ACTIONS(1651), 2,
-      anon_sym_STAR,
-      anon_sym_SLASH,
-    ACTIONS(1653), 2,
-      anon_sym_GT_GT,
-      anon_sym_LT_LT,
-    ACTIONS(1659), 2,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-    STATE(847), 2,
+    STATE(801), 2,
       sym_argument_list,
       sym_generator_expression,
-    ACTIONS(1665), 3,
-      anon_sym_AT,
-      anon_sym_PERCENT,
-      anon_sym_SLASH_SLASH,
-    ACTIONS(1583), 15,
+    ACTIONS(1567), 4,
+      anon_sym_STAR,
+      anon_sym_SLASH,
+      anon_sym_LT,
+      anon_sym_GT,
+    ACTIONS(1565), 25,
       anon_sym_RPAREN,
       anon_sym_COMMA,
       anon_sym_as,
+      anon_sym_GT_GT,
       anon_sym_if,
       anon_sym_COLON,
       anon_sym_in,
+      anon_sym_PIPE,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_AT,
       anon_sym_not,
       anon_sym_and,
       anon_sym_or,
+      anon_sym_PERCENT,
+      anon_sym_SLASH_SLASH,
+      anon_sym_AMP,
+      anon_sym_CARET,
+      anon_sym_LT_LT,
       anon_sym_LT_EQ,
       anon_sym_EQ_EQ,
       anon_sym_BANG_EQ,
       anon_sym_GT_EQ,
       anon_sym_LT_GT,
       anon_sym_is,
-  [42254] = 3,
+  [41561] = 3,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(1401), 5,
@@ -61767,27 +57564,25 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_LT_GT,
       anon_sym_is,
       sym__semicolon,
-  [42297] = 5,
+  [41604] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1591), 1,
+    ACTIONS(271), 1,
       anon_sym_COLON_EQ,
-    ACTIONS(1677), 1,
+    ACTIONS(260), 5,
+      anon_sym_STAR,
       anon_sym_EQ,
-    ACTIONS(1053), 4,
-      anon_sym_STAR,
       anon_sym_SLASH,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1048), 29,
+    ACTIONS(287), 29,
+      sym__newline,
       anon_sym_DOT,
+      anon_sym_from,
       anon_sym_LPAREN,
-      anon_sym_RPAREN,
       anon_sym_COMMA,
       anon_sym_GT_GT,
       anon_sym_if,
-      anon_sym_async,
-      anon_sym_for,
       anon_sym_in,
       anon_sym_PIPE,
       anon_sym_DASH,
@@ -61809,106 +57604,15 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_GT_EQ,
       anon_sym_LT_GT,
       anon_sym_is,
-  [42344] = 5,
+      sym__semicolon,
+  [41649] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(608), 1,
-      anon_sym_COLON_EQ,
-    ACTIONS(620), 1,
-      anon_sym_EQ,
-    ACTIONS(276), 4,
-      anon_sym_STAR,
-      anon_sym_SLASH,
-      anon_sym_LT,
-      anon_sym_GT,
-    ACTIONS(303), 29,
-      anon_sym_DOT,
-      anon_sym_LPAREN,
-      anon_sym_RPAREN,
-      anon_sym_COMMA,
-      anon_sym_GT_GT,
-      anon_sym_if,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_in,
-      anon_sym_PIPE,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_not,
-      anon_sym_and,
-      anon_sym_or,
-      anon_sym_PERCENT,
-      anon_sym_SLASH_SLASH,
-      anon_sym_AMP,
-      anon_sym_CARET,
-      anon_sym_LT_LT,
-      anon_sym_LT_EQ,
-      anon_sym_EQ_EQ,
-      anon_sym_BANG_EQ,
-      anon_sym_GT_EQ,
-      anon_sym_LT_GT,
-      anon_sym_is,
-  [42391] = 13,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1647), 1,
-      anon_sym_DOT,
-    ACTIONS(1649), 1,
-      anon_sym_LPAREN,
-    ACTIONS(1661), 1,
-      anon_sym_LBRACK,
-    ACTIONS(1663), 1,
-      anon_sym_STAR_STAR,
-    ACTIONS(1671), 1,
-      anon_sym_CARET,
-    ACTIONS(1573), 2,
-      anon_sym_LT,
-      anon_sym_GT,
-    ACTIONS(1651), 2,
-      anon_sym_STAR,
-      anon_sym_SLASH,
-    ACTIONS(1653), 2,
-      anon_sym_GT_GT,
-      anon_sym_LT_LT,
-    ACTIONS(1659), 2,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-    STATE(847), 2,
-      sym_argument_list,
-      sym_generator_expression,
-    ACTIONS(1665), 3,
-      anon_sym_AT,
-      anon_sym_PERCENT,
-      anon_sym_SLASH_SLASH,
-    ACTIONS(1571), 17,
-      anon_sym_RPAREN,
-      anon_sym_COMMA,
-      anon_sym_as,
-      anon_sym_if,
-      anon_sym_COLON,
-      anon_sym_in,
-      anon_sym_PIPE,
-      anon_sym_not,
-      anon_sym_and,
-      anon_sym_or,
-      anon_sym_AMP,
-      anon_sym_LT_EQ,
-      anon_sym_EQ_EQ,
-      anon_sym_BANG_EQ,
-      anon_sym_GT_EQ,
-      anon_sym_LT_GT,
-      anon_sym_is,
-  [42454] = 4,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1048), 3,
+    ACTIONS(1108), 3,
       anon_sym_DOT,
       anon_sym_LPAREN,
       anon_sym_LBRACK,
-    ACTIONS(1053), 13,
+    ACTIONS(1113), 13,
       anon_sym_STAR,
       anon_sym_GT_GT,
       anon_sym_PIPE,
@@ -61922,7 +57626,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_AMP,
       anon_sym_CARET,
       anon_sym_LT_LT,
-    ACTIONS(1078), 19,
+    ACTIONS(1115), 19,
       anon_sym_RPAREN,
       anon_sym_COMMA,
       anon_sym_COLON,
@@ -61942,266 +57646,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_AMP_EQ,
       anon_sym_CARET_EQ,
       anon_sym_PIPE_EQ,
-  [42499] = 12,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1647), 1,
-      anon_sym_DOT,
-    ACTIONS(1649), 1,
-      anon_sym_LPAREN,
-    ACTIONS(1661), 1,
-      anon_sym_LBRACK,
-    ACTIONS(1663), 1,
-      anon_sym_STAR_STAR,
-    ACTIONS(1573), 2,
-      anon_sym_LT,
-      anon_sym_GT,
-    ACTIONS(1651), 2,
-      anon_sym_STAR,
-      anon_sym_SLASH,
-    ACTIONS(1653), 2,
-      anon_sym_GT_GT,
-      anon_sym_LT_LT,
-    ACTIONS(1659), 2,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-    STATE(847), 2,
-      sym_argument_list,
-      sym_generator_expression,
-    ACTIONS(1665), 3,
-      anon_sym_AT,
-      anon_sym_PERCENT,
-      anon_sym_SLASH_SLASH,
-    ACTIONS(1571), 18,
-      anon_sym_RPAREN,
-      anon_sym_COMMA,
-      anon_sym_as,
-      anon_sym_if,
-      anon_sym_COLON,
-      anon_sym_in,
-      anon_sym_PIPE,
-      anon_sym_not,
-      anon_sym_and,
-      anon_sym_or,
-      anon_sym_AMP,
-      anon_sym_CARET,
-      anon_sym_LT_EQ,
-      anon_sym_EQ_EQ,
-      anon_sym_BANG_EQ,
-      anon_sym_GT_EQ,
-      anon_sym_LT_GT,
-      anon_sym_is,
-  [42560] = 5,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(608), 1,
-      anon_sym_COLON_EQ,
-    ACTIONS(280), 3,
-      anon_sym_RPAREN,
-      anon_sym_COMMA,
-      anon_sym_RBRACK,
-    ACTIONS(276), 4,
-      anon_sym_STAR,
-      anon_sym_SLASH,
-      anon_sym_LT,
-      anon_sym_GT,
-    ACTIONS(303), 27,
-      anon_sym_DOT,
-      anon_sym_LPAREN,
-      anon_sym_GT_GT,
-      anon_sym_if,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_in,
-      anon_sym_PIPE,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_not,
-      anon_sym_and,
-      anon_sym_or,
-      anon_sym_PERCENT,
-      anon_sym_SLASH_SLASH,
-      anon_sym_AMP,
-      anon_sym_CARET,
-      anon_sym_LT_LT,
-      anon_sym_LT_EQ,
-      anon_sym_EQ_EQ,
-      anon_sym_BANG_EQ,
-      anon_sym_GT_EQ,
-      anon_sym_LT_GT,
-      anon_sym_is,
-  [42607] = 4,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1165), 3,
-      anon_sym_DOT,
-      anon_sym_LPAREN,
-      anon_sym_LBRACK,
-    ACTIONS(1170), 13,
-      anon_sym_STAR,
-      anon_sym_GT_GT,
-      anon_sym_PIPE,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_SLASH,
-      anon_sym_PERCENT,
-      anon_sym_SLASH_SLASH,
-      anon_sym_AMP,
-      anon_sym_CARET,
-      anon_sym_LT_LT,
-    ACTIONS(1172), 19,
-      anon_sym_RPAREN,
-      anon_sym_COMMA,
-      anon_sym_COLON,
-      anon_sym_in,
-      anon_sym_RBRACK,
-      anon_sym_EQ,
-      anon_sym_PLUS_EQ,
-      anon_sym_DASH_EQ,
-      anon_sym_STAR_EQ,
-      anon_sym_SLASH_EQ,
-      anon_sym_AT_EQ,
-      anon_sym_SLASH_SLASH_EQ,
-      anon_sym_PERCENT_EQ,
-      anon_sym_STAR_STAR_EQ,
-      anon_sym_GT_GT_EQ,
-      anon_sym_LT_LT_EQ,
-      anon_sym_AMP_EQ,
-      anon_sym_CARET_EQ,
-      anon_sym_PIPE_EQ,
-  [42652] = 8,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1647), 1,
-      anon_sym_DOT,
-    ACTIONS(1649), 1,
-      anon_sym_LPAREN,
-    ACTIONS(1661), 1,
-      anon_sym_LBRACK,
-    ACTIONS(1663), 1,
-      anon_sym_STAR_STAR,
-    STATE(847), 2,
-      sym_argument_list,
-      sym_generator_expression,
-    ACTIONS(1577), 4,
-      anon_sym_STAR,
-      anon_sym_SLASH,
-      anon_sym_LT,
-      anon_sym_GT,
-    ACTIONS(1575), 25,
-      anon_sym_RPAREN,
-      anon_sym_COMMA,
-      anon_sym_as,
-      anon_sym_GT_GT,
-      anon_sym_if,
-      anon_sym_COLON,
-      anon_sym_in,
-      anon_sym_PIPE,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_AT,
-      anon_sym_not,
-      anon_sym_and,
-      anon_sym_or,
-      anon_sym_PERCENT,
-      anon_sym_SLASH_SLASH,
-      anon_sym_AMP,
-      anon_sym_CARET,
-      anon_sym_LT_LT,
-      anon_sym_LT_EQ,
-      anon_sym_EQ_EQ,
-      anon_sym_BANG_EQ,
-      anon_sym_GT_EQ,
-      anon_sym_LT_GT,
-      anon_sym_is,
-  [42705] = 4,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(303), 3,
-      anon_sym_DOT,
-      anon_sym_LPAREN,
-      anon_sym_LBRACK,
-    ACTIONS(276), 13,
-      anon_sym_STAR,
-      anon_sym_GT_GT,
-      anon_sym_PIPE,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_SLASH,
-      anon_sym_PERCENT,
-      anon_sym_SLASH_SLASH,
-      anon_sym_AMP,
-      anon_sym_CARET,
-      anon_sym_LT_LT,
-    ACTIONS(572), 19,
-      anon_sym_RPAREN,
-      anon_sym_COMMA,
-      anon_sym_COLON,
-      anon_sym_in,
-      anon_sym_RBRACK,
-      anon_sym_EQ,
-      anon_sym_PLUS_EQ,
-      anon_sym_DASH_EQ,
-      anon_sym_STAR_EQ,
-      anon_sym_SLASH_EQ,
-      anon_sym_AT_EQ,
-      anon_sym_SLASH_SLASH_EQ,
-      anon_sym_PERCENT_EQ,
-      anon_sym_STAR_STAR_EQ,
-      anon_sym_GT_GT_EQ,
-      anon_sym_LT_LT_EQ,
-      anon_sym_AMP_EQ,
-      anon_sym_CARET_EQ,
-      anon_sym_PIPE_EQ,
-  [42750] = 4,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1146), 3,
-      anon_sym_DOT,
-      anon_sym_LPAREN,
-      anon_sym_LBRACK,
-    ACTIONS(1151), 13,
-      anon_sym_STAR,
-      anon_sym_GT_GT,
-      anon_sym_PIPE,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_SLASH,
-      anon_sym_PERCENT,
-      anon_sym_SLASH_SLASH,
-      anon_sym_AMP,
-      anon_sym_CARET,
-      anon_sym_LT_LT,
-    ACTIONS(1153), 19,
-      anon_sym_RPAREN,
-      anon_sym_COMMA,
-      anon_sym_COLON,
-      anon_sym_in,
-      anon_sym_RBRACK,
-      anon_sym_EQ,
-      anon_sym_PLUS_EQ,
-      anon_sym_DASH_EQ,
-      anon_sym_STAR_EQ,
-      anon_sym_SLASH_EQ,
-      anon_sym_AT_EQ,
-      anon_sym_SLASH_SLASH_EQ,
-      anon_sym_PERCENT_EQ,
-      anon_sym_STAR_STAR_EQ,
-      anon_sym_GT_GT_EQ,
-      anon_sym_LT_LT_EQ,
-      anon_sym_AMP_EQ,
-      anon_sym_CARET_EQ,
-      anon_sym_PIPE_EQ,
-  [42795] = 3,
+  [41694] = 3,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(1405), 5,
@@ -62241,14 +57686,14 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_LT_GT,
       anon_sym_is,
       sym__semicolon,
-  [42838] = 4,
+  [41737] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1048), 3,
+    ACTIONS(287), 3,
       anon_sym_DOT,
       anon_sym_LPAREN,
       anon_sym_LBRACK,
-    ACTIONS(1053), 13,
+    ACTIONS(260), 13,
       anon_sym_STAR,
       anon_sym_GT_GT,
       anon_sym_PIPE,
@@ -62262,7 +57707,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_AMP,
       anon_sym_CARET,
       anon_sym_LT_LT,
-    ACTIONS(1059), 19,
+    ACTIONS(291), 19,
       anon_sym_RPAREN,
       anon_sym_COMMA,
       anon_sym_COLON,
@@ -62282,331 +57727,21 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_AMP_EQ,
       anon_sym_CARET_EQ,
       anon_sym_PIPE_EQ,
-  [42883] = 3,
+  [41782] = 5,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1461), 5,
-      anon_sym_STAR,
-      anon_sym_EQ,
-      anon_sym_SLASH,
-      anon_sym_LT,
-      anon_sym_GT,
-    ACTIONS(1459), 29,
-      sym__newline,
-      anon_sym_DOT,
-      anon_sym_from,
-      anon_sym_LPAREN,
-      anon_sym_COMMA,
-      anon_sym_GT_GT,
-      anon_sym_if,
-      anon_sym_in,
-      anon_sym_PIPE,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_not,
-      anon_sym_and,
-      anon_sym_or,
-      anon_sym_PERCENT,
-      anon_sym_SLASH_SLASH,
-      anon_sym_AMP,
-      anon_sym_CARET,
-      anon_sym_LT_LT,
-      anon_sym_LT_EQ,
-      anon_sym_EQ_EQ,
-      anon_sym_BANG_EQ,
-      anon_sym_GT_EQ,
-      anon_sym_LT_GT,
-      anon_sym_is,
-      sym__semicolon,
-  [42925] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1425), 5,
-      anon_sym_STAR,
-      anon_sym_EQ,
-      anon_sym_SLASH,
-      anon_sym_LT,
-      anon_sym_GT,
-    ACTIONS(1423), 29,
-      sym__newline,
-      anon_sym_DOT,
-      anon_sym_from,
-      anon_sym_LPAREN,
-      anon_sym_COMMA,
-      anon_sym_GT_GT,
-      anon_sym_if,
-      anon_sym_in,
-      anon_sym_PIPE,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_not,
-      anon_sym_and,
-      anon_sym_or,
-      anon_sym_PERCENT,
-      anon_sym_SLASH_SLASH,
-      anon_sym_AMP,
-      anon_sym_CARET,
-      anon_sym_LT_LT,
-      anon_sym_LT_EQ,
-      anon_sym_EQ_EQ,
-      anon_sym_BANG_EQ,
-      anon_sym_GT_EQ,
-      anon_sym_LT_GT,
-      anon_sym_is,
-      sym__semicolon,
-  [42967] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1457), 5,
-      anon_sym_STAR,
-      anon_sym_EQ,
-      anon_sym_SLASH,
-      anon_sym_LT,
-      anon_sym_GT,
-    ACTIONS(1455), 29,
-      sym__newline,
-      anon_sym_DOT,
-      anon_sym_from,
-      anon_sym_LPAREN,
-      anon_sym_COMMA,
-      anon_sym_GT_GT,
-      anon_sym_if,
-      anon_sym_in,
-      anon_sym_PIPE,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_not,
-      anon_sym_and,
-      anon_sym_or,
-      anon_sym_PERCENT,
-      anon_sym_SLASH_SLASH,
-      anon_sym_AMP,
-      anon_sym_CARET,
-      anon_sym_LT_LT,
-      anon_sym_LT_EQ,
-      anon_sym_EQ_EQ,
-      anon_sym_BANG_EQ,
-      anon_sym_GT_EQ,
-      anon_sym_LT_GT,
-      anon_sym_is,
-      sym__semicolon,
-  [43009] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1453), 5,
-      anon_sym_STAR,
-      anon_sym_EQ,
-      anon_sym_SLASH,
-      anon_sym_LT,
-      anon_sym_GT,
-    ACTIONS(1451), 29,
-      sym__newline,
-      anon_sym_DOT,
-      anon_sym_from,
-      anon_sym_LPAREN,
-      anon_sym_COMMA,
-      anon_sym_GT_GT,
-      anon_sym_if,
-      anon_sym_in,
-      anon_sym_PIPE,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_not,
-      anon_sym_and,
-      anon_sym_or,
-      anon_sym_PERCENT,
-      anon_sym_SLASH_SLASH,
-      anon_sym_AMP,
-      anon_sym_CARET,
-      anon_sym_LT_LT,
-      anon_sym_LT_EQ,
-      anon_sym_EQ_EQ,
-      anon_sym_BANG_EQ,
-      anon_sym_GT_EQ,
-      anon_sym_LT_GT,
-      anon_sym_is,
-      sym__semicolon,
-  [43051] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1533), 5,
-      anon_sym_STAR,
-      anon_sym_EQ,
-      anon_sym_SLASH,
-      anon_sym_LT,
-      anon_sym_GT,
-    ACTIONS(1531), 29,
-      sym__newline,
-      anon_sym_DOT,
-      anon_sym_from,
-      anon_sym_LPAREN,
-      anon_sym_COMMA,
-      anon_sym_GT_GT,
-      anon_sym_if,
-      anon_sym_in,
-      anon_sym_PIPE,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_not,
-      anon_sym_and,
-      anon_sym_or,
-      anon_sym_PERCENT,
-      anon_sym_SLASH_SLASH,
-      anon_sym_AMP,
-      anon_sym_CARET,
-      anon_sym_LT_LT,
-      anon_sym_LT_EQ,
-      anon_sym_EQ_EQ,
-      anon_sym_BANG_EQ,
-      anon_sym_GT_EQ,
-      anon_sym_LT_GT,
-      anon_sym_is,
-      sym__semicolon,
-  [43093] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1437), 5,
-      anon_sym_STAR,
-      anon_sym_EQ,
-      anon_sym_SLASH,
-      anon_sym_LT,
-      anon_sym_GT,
-    ACTIONS(1435), 29,
-      sym__newline,
-      anon_sym_DOT,
-      anon_sym_from,
-      anon_sym_LPAREN,
-      anon_sym_COMMA,
-      anon_sym_GT_GT,
-      anon_sym_if,
-      anon_sym_in,
-      anon_sym_PIPE,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_not,
-      anon_sym_and,
-      anon_sym_or,
-      anon_sym_PERCENT,
-      anon_sym_SLASH_SLASH,
-      anon_sym_AMP,
-      anon_sym_CARET,
-      anon_sym_LT_LT,
-      anon_sym_LT_EQ,
-      anon_sym_EQ_EQ,
-      anon_sym_BANG_EQ,
-      anon_sym_GT_EQ,
-      anon_sym_LT_GT,
-      anon_sym_is,
-      sym__semicolon,
-  [43135] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1449), 5,
-      anon_sym_STAR,
-      anon_sym_EQ,
-      anon_sym_SLASH,
-      anon_sym_LT,
-      anon_sym_GT,
-    ACTIONS(1447), 29,
-      sym__newline,
-      anon_sym_DOT,
-      anon_sym_from,
-      anon_sym_LPAREN,
-      anon_sym_COMMA,
-      anon_sym_GT_GT,
-      anon_sym_if,
-      anon_sym_in,
-      anon_sym_PIPE,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_not,
-      anon_sym_and,
-      anon_sym_or,
-      anon_sym_PERCENT,
-      anon_sym_SLASH_SLASH,
-      anon_sym_AMP,
-      anon_sym_CARET,
-      anon_sym_LT_LT,
-      anon_sym_LT_EQ,
-      anon_sym_EQ_EQ,
-      anon_sym_BANG_EQ,
-      anon_sym_GT_EQ,
-      anon_sym_LT_GT,
-      anon_sym_is,
-      sym__semicolon,
-  [43177] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1429), 5,
-      anon_sym_STAR,
-      anon_sym_EQ,
-      anon_sym_SLASH,
-      anon_sym_LT,
-      anon_sym_GT,
-    ACTIONS(1427), 29,
-      sym__newline,
-      anon_sym_DOT,
-      anon_sym_from,
-      anon_sym_LPAREN,
-      anon_sym_COMMA,
-      anon_sym_GT_GT,
-      anon_sym_if,
-      anon_sym_in,
-      anon_sym_PIPE,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_not,
-      anon_sym_and,
-      anon_sym_or,
-      anon_sym_PERCENT,
-      anon_sym_SLASH_SLASH,
-      anon_sym_AMP,
-      anon_sym_CARET,
-      anon_sym_LT_LT,
-      anon_sym_LT_EQ,
-      anon_sym_EQ_EQ,
-      anon_sym_BANG_EQ,
-      anon_sym_GT_EQ,
-      anon_sym_LT_GT,
-      anon_sym_is,
-      sym__semicolon,
-  [43219] = 4,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1167), 3,
+    ACTIONS(580), 1,
+      anon_sym_COLON_EQ,
+    ACTIONS(264), 3,
       anon_sym_RPAREN,
       anon_sym_COMMA,
       anon_sym_RBRACK,
-    ACTIONS(1170), 4,
+    ACTIONS(260), 4,
       anon_sym_STAR,
       anon_sym_SLASH,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1165), 27,
+    ACTIONS(287), 27,
       anon_sym_DOT,
       anon_sym_LPAREN,
       anon_sym_GT_GT,
@@ -62634,16 +57769,122 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_GT_EQ,
       anon_sym_LT_GT,
       anon_sym_is,
-  [43263] = 3,
+  [41829] = 15,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1445), 5,
+    ACTIONS(1641), 1,
+      anon_sym_DOT,
+    ACTIONS(1643), 1,
+      anon_sym_LPAREN,
+    ACTIONS(1651), 1,
+      anon_sym_PIPE,
+    ACTIONS(1655), 1,
+      anon_sym_LBRACK,
+    ACTIONS(1657), 1,
+      anon_sym_STAR_STAR,
+    ACTIONS(1663), 1,
+      anon_sym_AMP,
+    ACTIONS(1665), 1,
+      anon_sym_CARET,
+    ACTIONS(1571), 2,
+      anon_sym_LT,
+      anon_sym_GT,
+    ACTIONS(1645), 2,
+      anon_sym_STAR,
+      anon_sym_SLASH,
+    ACTIONS(1647), 2,
+      anon_sym_GT_GT,
+      anon_sym_LT_LT,
+    ACTIONS(1653), 2,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+    STATE(801), 2,
+      sym_argument_list,
+      sym_generator_expression,
+    ACTIONS(1659), 3,
+      anon_sym_AT,
+      anon_sym_PERCENT,
+      anon_sym_SLASH_SLASH,
+    ACTIONS(1569), 15,
+      anon_sym_RPAREN,
+      anon_sym_COMMA,
+      anon_sym_as,
+      anon_sym_if,
+      anon_sym_COLON,
+      anon_sym_in,
+      anon_sym_not,
+      anon_sym_and,
+      anon_sym_or,
+      anon_sym_LT_EQ,
+      anon_sym_EQ_EQ,
+      anon_sym_BANG_EQ,
+      anon_sym_GT_EQ,
+      anon_sym_LT_GT,
+      anon_sym_is,
+  [41896] = 15,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1641), 1,
+      anon_sym_DOT,
+    ACTIONS(1643), 1,
+      anon_sym_LPAREN,
+    ACTIONS(1651), 1,
+      anon_sym_PIPE,
+    ACTIONS(1655), 1,
+      anon_sym_LBRACK,
+    ACTIONS(1657), 1,
+      anon_sym_STAR_STAR,
+    ACTIONS(1663), 1,
+      anon_sym_AMP,
+    ACTIONS(1665), 1,
+      anon_sym_CARET,
+    ACTIONS(1591), 2,
+      anon_sym_LT,
+      anon_sym_GT,
+    ACTIONS(1645), 2,
+      anon_sym_STAR,
+      anon_sym_SLASH,
+    ACTIONS(1647), 2,
+      anon_sym_GT_GT,
+      anon_sym_LT_LT,
+    ACTIONS(1653), 2,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+    STATE(801), 2,
+      sym_argument_list,
+      sym_generator_expression,
+    ACTIONS(1659), 3,
+      anon_sym_AT,
+      anon_sym_PERCENT,
+      anon_sym_SLASH_SLASH,
+    ACTIONS(1589), 15,
+      anon_sym_RPAREN,
+      anon_sym_COMMA,
+      anon_sym_as,
+      anon_sym_if,
+      anon_sym_COLON,
+      anon_sym_in,
+      anon_sym_not,
+      anon_sym_and,
+      anon_sym_or,
+      anon_sym_LT_EQ,
+      anon_sym_EQ_EQ,
+      anon_sym_BANG_EQ,
+      anon_sym_GT_EQ,
+      anon_sym_LT_GT,
+      anon_sym_is,
+  [41963] = 4,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1081), 1,
+      anon_sym_COLON_EQ,
+    ACTIONS(1079), 5,
       anon_sym_STAR,
       anon_sym_EQ,
       anon_sym_SLASH,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1443), 29,
+    ACTIONS(1074), 29,
       sym__newline,
       anon_sym_DOT,
       anon_sym_from,
@@ -62673,16 +57914,566 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_LT_GT,
       anon_sym_is,
       sym__semicolon,
-  [43305] = 3,
+  [42008] = 8,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1473), 5,
+    ACTIONS(1641), 1,
+      anon_sym_DOT,
+    ACTIONS(1643), 1,
+      anon_sym_LPAREN,
+    ACTIONS(1655), 1,
+      anon_sym_LBRACK,
+    ACTIONS(1657), 1,
+      anon_sym_STAR_STAR,
+    STATE(801), 2,
+      sym_argument_list,
+      sym_generator_expression,
+    ACTIONS(1587), 4,
+      anon_sym_STAR,
+      anon_sym_SLASH,
+      anon_sym_LT,
+      anon_sym_GT,
+    ACTIONS(1585), 25,
+      anon_sym_RPAREN,
+      anon_sym_COMMA,
+      anon_sym_as,
+      anon_sym_GT_GT,
+      anon_sym_if,
+      anon_sym_COLON,
+      anon_sym_in,
+      anon_sym_PIPE,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_AT,
+      anon_sym_not,
+      anon_sym_and,
+      anon_sym_or,
+      anon_sym_PERCENT,
+      anon_sym_SLASH_SLASH,
+      anon_sym_AMP,
+      anon_sym_CARET,
+      anon_sym_LT_LT,
+      anon_sym_LT_EQ,
+      anon_sym_EQ_EQ,
+      anon_sym_BANG_EQ,
+      anon_sym_GT_EQ,
+      anon_sym_LT_GT,
+      anon_sym_is,
+  [42061] = 8,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1641), 1,
+      anon_sym_DOT,
+    ACTIONS(1643), 1,
+      anon_sym_LPAREN,
+    ACTIONS(1655), 1,
+      anon_sym_LBRACK,
+    ACTIONS(1657), 1,
+      anon_sym_STAR_STAR,
+    STATE(801), 2,
+      sym_argument_list,
+      sym_generator_expression,
+    ACTIONS(1567), 4,
+      anon_sym_STAR,
+      anon_sym_SLASH,
+      anon_sym_LT,
+      anon_sym_GT,
+    ACTIONS(1565), 25,
+      anon_sym_RPAREN,
+      anon_sym_COMMA,
+      anon_sym_as,
+      anon_sym_GT_GT,
+      anon_sym_if,
+      anon_sym_COLON,
+      anon_sym_in,
+      anon_sym_PIPE,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_AT,
+      anon_sym_not,
+      anon_sym_and,
+      anon_sym_or,
+      anon_sym_PERCENT,
+      anon_sym_SLASH_SLASH,
+      anon_sym_AMP,
+      anon_sym_CARET,
+      anon_sym_LT_LT,
+      anon_sym_LT_EQ,
+      anon_sym_EQ_EQ,
+      anon_sym_BANG_EQ,
+      anon_sym_GT_EQ,
+      anon_sym_LT_GT,
+      anon_sym_is,
+  [42114] = 15,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1641), 1,
+      anon_sym_DOT,
+    ACTIONS(1643), 1,
+      anon_sym_LPAREN,
+    ACTIONS(1651), 1,
+      anon_sym_PIPE,
+    ACTIONS(1655), 1,
+      anon_sym_LBRACK,
+    ACTIONS(1657), 1,
+      anon_sym_STAR_STAR,
+    ACTIONS(1663), 1,
+      anon_sym_AMP,
+    ACTIONS(1665), 1,
+      anon_sym_CARET,
+    ACTIONS(1581), 2,
+      anon_sym_LT,
+      anon_sym_GT,
+    ACTIONS(1645), 2,
+      anon_sym_STAR,
+      anon_sym_SLASH,
+    ACTIONS(1647), 2,
+      anon_sym_GT_GT,
+      anon_sym_LT_LT,
+    ACTIONS(1653), 2,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+    STATE(801), 2,
+      sym_argument_list,
+      sym_generator_expression,
+    ACTIONS(1659), 3,
+      anon_sym_AT,
+      anon_sym_PERCENT,
+      anon_sym_SLASH_SLASH,
+    ACTIONS(1579), 15,
+      anon_sym_RPAREN,
+      anon_sym_COMMA,
+      anon_sym_as,
+      anon_sym_if,
+      anon_sym_COLON,
+      anon_sym_in,
+      anon_sym_not,
+      anon_sym_and,
+      anon_sym_or,
+      anon_sym_LT_EQ,
+      anon_sym_EQ_EQ,
+      anon_sym_BANG_EQ,
+      anon_sym_GT_EQ,
+      anon_sym_LT_GT,
+      anon_sym_is,
+  [42181] = 5,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(580), 1,
+      anon_sym_COLON_EQ,
+    ACTIONS(588), 1,
+      anon_sym_EQ,
+    ACTIONS(260), 4,
+      anon_sym_STAR,
+      anon_sym_SLASH,
+      anon_sym_LT,
+      anon_sym_GT,
+    ACTIONS(287), 29,
+      anon_sym_DOT,
+      anon_sym_LPAREN,
+      anon_sym_RPAREN,
+      anon_sym_COMMA,
+      anon_sym_GT_GT,
+      anon_sym_if,
+      anon_sym_async,
+      anon_sym_for,
+      anon_sym_in,
+      anon_sym_PIPE,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_not,
+      anon_sym_and,
+      anon_sym_or,
+      anon_sym_PERCENT,
+      anon_sym_SLASH_SLASH,
+      anon_sym_AMP,
+      anon_sym_CARET,
+      anon_sym_LT_LT,
+      anon_sym_LT_EQ,
+      anon_sym_EQ_EQ,
+      anon_sym_BANG_EQ,
+      anon_sym_GT_EQ,
+      anon_sym_LT_GT,
+      anon_sym_is,
+  [42228] = 13,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1641), 1,
+      anon_sym_DOT,
+    ACTIONS(1643), 1,
+      anon_sym_LPAREN,
+    ACTIONS(1655), 1,
+      anon_sym_LBRACK,
+    ACTIONS(1657), 1,
+      anon_sym_STAR_STAR,
+    ACTIONS(1665), 1,
+      anon_sym_CARET,
+    ACTIONS(1567), 2,
+      anon_sym_LT,
+      anon_sym_GT,
+    ACTIONS(1645), 2,
+      anon_sym_STAR,
+      anon_sym_SLASH,
+    ACTIONS(1647), 2,
+      anon_sym_GT_GT,
+      anon_sym_LT_LT,
+    ACTIONS(1653), 2,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+    STATE(801), 2,
+      sym_argument_list,
+      sym_generator_expression,
+    ACTIONS(1659), 3,
+      anon_sym_AT,
+      anon_sym_PERCENT,
+      anon_sym_SLASH_SLASH,
+    ACTIONS(1565), 17,
+      anon_sym_RPAREN,
+      anon_sym_COMMA,
+      anon_sym_as,
+      anon_sym_if,
+      anon_sym_COLON,
+      anon_sym_in,
+      anon_sym_PIPE,
+      anon_sym_not,
+      anon_sym_and,
+      anon_sym_or,
+      anon_sym_AMP,
+      anon_sym_LT_EQ,
+      anon_sym_EQ_EQ,
+      anon_sym_BANG_EQ,
+      anon_sym_GT_EQ,
+      anon_sym_LT_GT,
+      anon_sym_is,
+  [42291] = 12,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1641), 1,
+      anon_sym_DOT,
+    ACTIONS(1643), 1,
+      anon_sym_LPAREN,
+    ACTIONS(1655), 1,
+      anon_sym_LBRACK,
+    ACTIONS(1657), 1,
+      anon_sym_STAR_STAR,
+    ACTIONS(1567), 2,
+      anon_sym_LT,
+      anon_sym_GT,
+    ACTIONS(1645), 2,
+      anon_sym_STAR,
+      anon_sym_SLASH,
+    ACTIONS(1647), 2,
+      anon_sym_GT_GT,
+      anon_sym_LT_LT,
+    ACTIONS(1653), 2,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+    STATE(801), 2,
+      sym_argument_list,
+      sym_generator_expression,
+    ACTIONS(1659), 3,
+      anon_sym_AT,
+      anon_sym_PERCENT,
+      anon_sym_SLASH_SLASH,
+    ACTIONS(1565), 18,
+      anon_sym_RPAREN,
+      anon_sym_COMMA,
+      anon_sym_as,
+      anon_sym_if,
+      anon_sym_COLON,
+      anon_sym_in,
+      anon_sym_PIPE,
+      anon_sym_not,
+      anon_sym_and,
+      anon_sym_or,
+      anon_sym_AMP,
+      anon_sym_CARET,
+      anon_sym_LT_EQ,
+      anon_sym_EQ_EQ,
+      anon_sym_BANG_EQ,
+      anon_sym_GT_EQ,
+      anon_sym_LT_GT,
+      anon_sym_is,
+  [42352] = 4,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1143), 3,
+      anon_sym_DOT,
+      anon_sym_LPAREN,
+      anon_sym_LBRACK,
+    ACTIONS(1148), 13,
+      anon_sym_STAR,
+      anon_sym_GT_GT,
+      anon_sym_PIPE,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_SLASH,
+      anon_sym_PERCENT,
+      anon_sym_SLASH_SLASH,
+      anon_sym_AMP,
+      anon_sym_CARET,
+      anon_sym_LT_LT,
+    ACTIONS(1150), 19,
+      anon_sym_RPAREN,
+      anon_sym_COMMA,
+      anon_sym_COLON,
+      anon_sym_in,
+      anon_sym_RBRACK,
+      anon_sym_EQ,
+      anon_sym_PLUS_EQ,
+      anon_sym_DASH_EQ,
+      anon_sym_STAR_EQ,
+      anon_sym_SLASH_EQ,
+      anon_sym_AT_EQ,
+      anon_sym_SLASH_SLASH_EQ,
+      anon_sym_PERCENT_EQ,
+      anon_sym_STAR_STAR_EQ,
+      anon_sym_GT_GT_EQ,
+      anon_sym_LT_LT_EQ,
+      anon_sym_AMP_EQ,
+      anon_sym_CARET_EQ,
+      anon_sym_PIPE_EQ,
+  [42397] = 8,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1641), 1,
+      anon_sym_DOT,
+    ACTIONS(1643), 1,
+      anon_sym_LPAREN,
+    ACTIONS(1655), 1,
+      anon_sym_LBRACK,
+    ACTIONS(1657), 1,
+      anon_sym_STAR_STAR,
+    STATE(801), 2,
+      sym_argument_list,
+      sym_generator_expression,
+    ACTIONS(1577), 4,
+      anon_sym_STAR,
+      anon_sym_SLASH,
+      anon_sym_LT,
+      anon_sym_GT,
+    ACTIONS(1575), 25,
+      anon_sym_RPAREN,
+      anon_sym_COMMA,
+      anon_sym_as,
+      anon_sym_GT_GT,
+      anon_sym_if,
+      anon_sym_COLON,
+      anon_sym_in,
+      anon_sym_PIPE,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_AT,
+      anon_sym_not,
+      anon_sym_and,
+      anon_sym_or,
+      anon_sym_PERCENT,
+      anon_sym_SLASH_SLASH,
+      anon_sym_AMP,
+      anon_sym_CARET,
+      anon_sym_LT_LT,
+      anon_sym_LT_EQ,
+      anon_sym_EQ_EQ,
+      anon_sym_BANG_EQ,
+      anon_sym_GT_EQ,
+      anon_sym_LT_GT,
+      anon_sym_is,
+  [42450] = 4,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1074), 3,
+      anon_sym_DOT,
+      anon_sym_LPAREN,
+      anon_sym_LBRACK,
+    ACTIONS(1079), 13,
+      anon_sym_STAR,
+      anon_sym_GT_GT,
+      anon_sym_PIPE,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_SLASH,
+      anon_sym_PERCENT,
+      anon_sym_SLASH_SLASH,
+      anon_sym_AMP,
+      anon_sym_CARET,
+      anon_sym_LT_LT,
+    ACTIONS(1094), 19,
+      anon_sym_RPAREN,
+      anon_sym_COMMA,
+      anon_sym_COLON,
+      anon_sym_in,
+      anon_sym_RBRACK,
+      anon_sym_EQ,
+      anon_sym_PLUS_EQ,
+      anon_sym_DASH_EQ,
+      anon_sym_STAR_EQ,
+      anon_sym_SLASH_EQ,
+      anon_sym_AT_EQ,
+      anon_sym_SLASH_SLASH_EQ,
+      anon_sym_PERCENT_EQ,
+      anon_sym_STAR_STAR_EQ,
+      anon_sym_GT_GT_EQ,
+      anon_sym_LT_LT_EQ,
+      anon_sym_AMP_EQ,
+      anon_sym_CARET_EQ,
+      anon_sym_PIPE_EQ,
+  [42495] = 5,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1606), 1,
+      anon_sym_COLON_EQ,
+    ACTIONS(1076), 3,
+      anon_sym_RPAREN,
+      anon_sym_COMMA,
+      anon_sym_RBRACK,
+    ACTIONS(1079), 4,
+      anon_sym_STAR,
+      anon_sym_SLASH,
+      anon_sym_LT,
+      anon_sym_GT,
+    ACTIONS(1074), 27,
+      anon_sym_DOT,
+      anon_sym_LPAREN,
+      anon_sym_GT_GT,
+      anon_sym_if,
+      anon_sym_async,
+      anon_sym_for,
+      anon_sym_in,
+      anon_sym_PIPE,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_not,
+      anon_sym_and,
+      anon_sym_or,
+      anon_sym_PERCENT,
+      anon_sym_SLASH_SLASH,
+      anon_sym_AMP,
+      anon_sym_CARET,
+      anon_sym_LT_LT,
+      anon_sym_LT_EQ,
+      anon_sym_EQ_EQ,
+      anon_sym_BANG_EQ,
+      anon_sym_GT_EQ,
+      anon_sym_LT_GT,
+      anon_sym_is,
+  [42542] = 14,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1641), 1,
+      anon_sym_DOT,
+    ACTIONS(1643), 1,
+      anon_sym_LPAREN,
+    ACTIONS(1655), 1,
+      anon_sym_LBRACK,
+    ACTIONS(1657), 1,
+      anon_sym_STAR_STAR,
+    ACTIONS(1663), 1,
+      anon_sym_AMP,
+    ACTIONS(1665), 1,
+      anon_sym_CARET,
+    ACTIONS(1567), 2,
+      anon_sym_LT,
+      anon_sym_GT,
+    ACTIONS(1645), 2,
+      anon_sym_STAR,
+      anon_sym_SLASH,
+    ACTIONS(1647), 2,
+      anon_sym_GT_GT,
+      anon_sym_LT_LT,
+    ACTIONS(1653), 2,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+    STATE(801), 2,
+      sym_argument_list,
+      sym_generator_expression,
+    ACTIONS(1659), 3,
+      anon_sym_AT,
+      anon_sym_PERCENT,
+      anon_sym_SLASH_SLASH,
+    ACTIONS(1565), 16,
+      anon_sym_RPAREN,
+      anon_sym_COMMA,
+      anon_sym_as,
+      anon_sym_if,
+      anon_sym_COLON,
+      anon_sym_in,
+      anon_sym_PIPE,
+      anon_sym_not,
+      anon_sym_and,
+      anon_sym_or,
+      anon_sym_LT_EQ,
+      anon_sym_EQ_EQ,
+      anon_sym_BANG_EQ,
+      anon_sym_GT_EQ,
+      anon_sym_LT_GT,
+      anon_sym_is,
+  [42607] = 10,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1641), 1,
+      anon_sym_DOT,
+    ACTIONS(1643), 1,
+      anon_sym_LPAREN,
+    ACTIONS(1655), 1,
+      anon_sym_LBRACK,
+    ACTIONS(1657), 1,
+      anon_sym_STAR_STAR,
+    ACTIONS(1567), 2,
+      anon_sym_LT,
+      anon_sym_GT,
+    ACTIONS(1645), 2,
+      anon_sym_STAR,
+      anon_sym_SLASH,
+    STATE(801), 2,
+      sym_argument_list,
+      sym_generator_expression,
+    ACTIONS(1659), 3,
+      anon_sym_AT,
+      anon_sym_PERCENT,
+      anon_sym_SLASH_SLASH,
+    ACTIONS(1565), 22,
+      anon_sym_RPAREN,
+      anon_sym_COMMA,
+      anon_sym_as,
+      anon_sym_GT_GT,
+      anon_sym_if,
+      anon_sym_COLON,
+      anon_sym_in,
+      anon_sym_PIPE,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_not,
+      anon_sym_and,
+      anon_sym_or,
+      anon_sym_AMP,
+      anon_sym_CARET,
+      anon_sym_LT_LT,
+      anon_sym_LT_EQ,
+      anon_sym_EQ_EQ,
+      anon_sym_BANG_EQ,
+      anon_sym_GT_EQ,
+      anon_sym_LT_GT,
+      anon_sym_is,
+  [42664] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1467), 5,
       anon_sym_STAR,
       anon_sym_EQ,
       anon_sym_SLASH,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1471), 29,
+    ACTIONS(1465), 29,
       sym__newline,
       anon_sym_DOT,
       anon_sym_from,
@@ -62712,16 +58503,16 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_LT_GT,
       anon_sym_is,
       sym__semicolon,
-  [43347] = 3,
+  [42706] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1417), 5,
+    ACTIONS(1113), 5,
       anon_sym_STAR,
       anon_sym_EQ,
       anon_sym_SLASH,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1415), 29,
+    ACTIONS(1108), 29,
       sym__newline,
       anon_sym_DOT,
       anon_sym_from,
@@ -62751,16 +58542,16 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_LT_GT,
       anon_sym_is,
       sym__semicolon,
-  [43389] = 3,
+  [42748] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1425), 5,
+    ACTIONS(1443), 5,
       anon_sym_STAR,
       anon_sym_EQ,
       anon_sym_SLASH,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1423), 29,
+    ACTIONS(1441), 29,
       sym__newline,
       anon_sym_DOT,
       anon_sym_from,
@@ -62790,16 +58581,16 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_LT_GT,
       anon_sym_is,
       sym__semicolon,
-  [43431] = 3,
+  [42790] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1465), 5,
+    ACTIONS(1447), 5,
       anon_sym_STAR,
       anon_sym_EQ,
       anon_sym_SLASH,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1463), 29,
+    ACTIONS(1445), 29,
       sym__newline,
       anon_sym_DOT,
       anon_sym_from,
@@ -62829,16 +58620,16 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_LT_GT,
       anon_sym_is,
       sym__semicolon,
-  [43473] = 3,
+  [42832] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1469), 5,
+    ACTIONS(1551), 5,
       anon_sym_STAR,
       anon_sym_EQ,
       anon_sym_SLASH,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1467), 29,
+    ACTIONS(1549), 29,
       sym__newline,
       anon_sym_DOT,
       anon_sym_from,
@@ -62868,16 +58659,16 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_LT_GT,
       anon_sym_is,
       sym__semicolon,
-  [43515] = 3,
+  [42874] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1151), 5,
+    ACTIONS(1455), 5,
       anon_sym_STAR,
       anon_sym_EQ,
       anon_sym_SLASH,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1146), 29,
+    ACTIONS(1453), 29,
       sym__newline,
       anon_sym_DOT,
       anon_sym_from,
@@ -62907,16 +58698,16 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_LT_GT,
       anon_sym_is,
       sym__semicolon,
-  [43557] = 3,
+  [42916] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1170), 5,
+    ACTIONS(1079), 5,
       anon_sym_STAR,
       anon_sym_EQ,
       anon_sym_SLASH,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1165), 29,
+    ACTIONS(1074), 29,
       sym__newline,
       anon_sym_DOT,
       anon_sym_from,
@@ -62946,7 +58737,517 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_LT_GT,
       anon_sym_is,
       sym__semicolon,
-  [43599] = 3,
+  [42958] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1483), 5,
+      anon_sym_STAR,
+      anon_sym_EQ,
+      anon_sym_SLASH,
+      anon_sym_LT,
+      anon_sym_GT,
+    ACTIONS(1481), 29,
+      sym__newline,
+      anon_sym_DOT,
+      anon_sym_from,
+      anon_sym_LPAREN,
+      anon_sym_COMMA,
+      anon_sym_GT_GT,
+      anon_sym_if,
+      anon_sym_in,
+      anon_sym_PIPE,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_not,
+      anon_sym_and,
+      anon_sym_or,
+      anon_sym_PERCENT,
+      anon_sym_SLASH_SLASH,
+      anon_sym_AMP,
+      anon_sym_CARET,
+      anon_sym_LT_LT,
+      anon_sym_LT_EQ,
+      anon_sym_EQ_EQ,
+      anon_sym_BANG_EQ,
+      anon_sym_GT_EQ,
+      anon_sym_LT_GT,
+      anon_sym_is,
+      sym__semicolon,
+  [43000] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1479), 5,
+      anon_sym_STAR,
+      anon_sym_EQ,
+      anon_sym_SLASH,
+      anon_sym_LT,
+      anon_sym_GT,
+    ACTIONS(1477), 29,
+      sym__newline,
+      anon_sym_DOT,
+      anon_sym_from,
+      anon_sym_LPAREN,
+      anon_sym_COMMA,
+      anon_sym_GT_GT,
+      anon_sym_if,
+      anon_sym_in,
+      anon_sym_PIPE,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_not,
+      anon_sym_and,
+      anon_sym_or,
+      anon_sym_PERCENT,
+      anon_sym_SLASH_SLASH,
+      anon_sym_AMP,
+      anon_sym_CARET,
+      anon_sym_LT_LT,
+      anon_sym_LT_EQ,
+      anon_sym_EQ_EQ,
+      anon_sym_BANG_EQ,
+      anon_sym_GT_EQ,
+      anon_sym_LT_GT,
+      anon_sym_is,
+      sym__semicolon,
+  [43042] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1491), 5,
+      anon_sym_STAR,
+      anon_sym_EQ,
+      anon_sym_SLASH,
+      anon_sym_LT,
+      anon_sym_GT,
+    ACTIONS(1489), 29,
+      sym__newline,
+      anon_sym_DOT,
+      anon_sym_from,
+      anon_sym_LPAREN,
+      anon_sym_COMMA,
+      anon_sym_GT_GT,
+      anon_sym_if,
+      anon_sym_in,
+      anon_sym_PIPE,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_not,
+      anon_sym_and,
+      anon_sym_or,
+      anon_sym_PERCENT,
+      anon_sym_SLASH_SLASH,
+      anon_sym_AMP,
+      anon_sym_CARET,
+      anon_sym_LT_LT,
+      anon_sym_LT_EQ,
+      anon_sym_EQ_EQ,
+      anon_sym_BANG_EQ,
+      anon_sym_GT_EQ,
+      anon_sym_LT_GT,
+      anon_sym_is,
+      sym__semicolon,
+  [43084] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1547), 5,
+      anon_sym_STAR,
+      anon_sym_EQ,
+      anon_sym_SLASH,
+      anon_sym_LT,
+      anon_sym_GT,
+    ACTIONS(1545), 29,
+      sym__newline,
+      anon_sym_DOT,
+      anon_sym_from,
+      anon_sym_LPAREN,
+      anon_sym_COMMA,
+      anon_sym_GT_GT,
+      anon_sym_if,
+      anon_sym_in,
+      anon_sym_PIPE,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_not,
+      anon_sym_and,
+      anon_sym_or,
+      anon_sym_PERCENT,
+      anon_sym_SLASH_SLASH,
+      anon_sym_AMP,
+      anon_sym_CARET,
+      anon_sym_LT_LT,
+      anon_sym_LT_EQ,
+      anon_sym_EQ_EQ,
+      anon_sym_BANG_EQ,
+      anon_sym_GT_EQ,
+      anon_sym_LT_GT,
+      anon_sym_is,
+      sym__semicolon,
+  [43126] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1563), 5,
+      anon_sym_STAR,
+      anon_sym_EQ,
+      anon_sym_SLASH,
+      anon_sym_LT,
+      anon_sym_GT,
+    ACTIONS(1561), 29,
+      sym__newline,
+      anon_sym_DOT,
+      anon_sym_from,
+      anon_sym_LPAREN,
+      anon_sym_COMMA,
+      anon_sym_GT_GT,
+      anon_sym_if,
+      anon_sym_in,
+      anon_sym_PIPE,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_not,
+      anon_sym_and,
+      anon_sym_or,
+      anon_sym_PERCENT,
+      anon_sym_SLASH_SLASH,
+      anon_sym_AMP,
+      anon_sym_CARET,
+      anon_sym_LT_LT,
+      anon_sym_LT_EQ,
+      anon_sym_EQ_EQ,
+      anon_sym_BANG_EQ,
+      anon_sym_GT_EQ,
+      anon_sym_LT_GT,
+      anon_sym_is,
+      sym__semicolon,
+  [43168] = 4,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1076), 3,
+      anon_sym_RPAREN,
+      anon_sym_COMMA,
+      anon_sym_RBRACK,
+    ACTIONS(1079), 4,
+      anon_sym_STAR,
+      anon_sym_SLASH,
+      anon_sym_LT,
+      anon_sym_GT,
+    ACTIONS(1074), 27,
+      anon_sym_DOT,
+      anon_sym_LPAREN,
+      anon_sym_GT_GT,
+      anon_sym_if,
+      anon_sym_async,
+      anon_sym_for,
+      anon_sym_in,
+      anon_sym_PIPE,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_not,
+      anon_sym_and,
+      anon_sym_or,
+      anon_sym_PERCENT,
+      anon_sym_SLASH_SLASH,
+      anon_sym_AMP,
+      anon_sym_CARET,
+      anon_sym_LT_LT,
+      anon_sym_LT_EQ,
+      anon_sym_EQ_EQ,
+      anon_sym_BANG_EQ,
+      anon_sym_GT_EQ,
+      anon_sym_LT_GT,
+      anon_sym_is,
+  [43212] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1559), 5,
+      anon_sym_STAR,
+      anon_sym_EQ,
+      anon_sym_SLASH,
+      anon_sym_LT,
+      anon_sym_GT,
+    ACTIONS(1557), 29,
+      sym__newline,
+      anon_sym_DOT,
+      anon_sym_from,
+      anon_sym_LPAREN,
+      anon_sym_COMMA,
+      anon_sym_GT_GT,
+      anon_sym_if,
+      anon_sym_in,
+      anon_sym_PIPE,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_not,
+      anon_sym_and,
+      anon_sym_or,
+      anon_sym_PERCENT,
+      anon_sym_SLASH_SLASH,
+      anon_sym_AMP,
+      anon_sym_CARET,
+      anon_sym_LT_LT,
+      anon_sym_LT_EQ,
+      anon_sym_EQ_EQ,
+      anon_sym_BANG_EQ,
+      anon_sym_GT_EQ,
+      anon_sym_LT_GT,
+      anon_sym_is,
+      sym__semicolon,
+  [43254] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1519), 5,
+      anon_sym_STAR,
+      anon_sym_EQ,
+      anon_sym_SLASH,
+      anon_sym_LT,
+      anon_sym_GT,
+    ACTIONS(1517), 29,
+      sym__newline,
+      anon_sym_DOT,
+      anon_sym_from,
+      anon_sym_LPAREN,
+      anon_sym_COMMA,
+      anon_sym_GT_GT,
+      anon_sym_if,
+      anon_sym_in,
+      anon_sym_PIPE,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_not,
+      anon_sym_and,
+      anon_sym_or,
+      anon_sym_PERCENT,
+      anon_sym_SLASH_SLASH,
+      anon_sym_AMP,
+      anon_sym_CARET,
+      anon_sym_LT_LT,
+      anon_sym_LT_EQ,
+      anon_sym_EQ_EQ,
+      anon_sym_BANG_EQ,
+      anon_sym_GT_EQ,
+      anon_sym_LT_GT,
+      anon_sym_is,
+      sym__semicolon,
+  [43296] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1491), 5,
+      anon_sym_STAR,
+      anon_sym_EQ,
+      anon_sym_SLASH,
+      anon_sym_LT,
+      anon_sym_GT,
+    ACTIONS(1489), 29,
+      sym__newline,
+      anon_sym_DOT,
+      anon_sym_from,
+      anon_sym_LPAREN,
+      anon_sym_COMMA,
+      anon_sym_GT_GT,
+      anon_sym_if,
+      anon_sym_in,
+      anon_sym_PIPE,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_not,
+      anon_sym_and,
+      anon_sym_or,
+      anon_sym_PERCENT,
+      anon_sym_SLASH_SLASH,
+      anon_sym_AMP,
+      anon_sym_CARET,
+      anon_sym_LT_LT,
+      anon_sym_LT_EQ,
+      anon_sym_EQ_EQ,
+      anon_sym_BANG_EQ,
+      anon_sym_GT_EQ,
+      anon_sym_LT_GT,
+      anon_sym_is,
+      sym__semicolon,
+  [43338] = 4,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1673), 1,
+      anon_sym_COLON_EQ,
+    ACTIONS(1079), 5,
+      anon_sym_STAR,
+      anon_sym_COLON,
+      anon_sym_SLASH,
+      anon_sym_LT,
+      anon_sym_GT,
+    ACTIONS(1074), 28,
+      anon_sym_DOT,
+      anon_sym_LPAREN,
+      anon_sym_RPAREN,
+      anon_sym_COMMA,
+      anon_sym_as,
+      anon_sym_GT_GT,
+      anon_sym_if,
+      anon_sym_in,
+      anon_sym_PIPE,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_not,
+      anon_sym_and,
+      anon_sym_or,
+      anon_sym_PERCENT,
+      anon_sym_SLASH_SLASH,
+      anon_sym_AMP,
+      anon_sym_CARET,
+      anon_sym_LT_LT,
+      anon_sym_LT_EQ,
+      anon_sym_EQ_EQ,
+      anon_sym_BANG_EQ,
+      anon_sym_GT_EQ,
+      anon_sym_LT_GT,
+      anon_sym_is,
+  [43382] = 4,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(596), 1,
+      anon_sym_COLON_EQ,
+    ACTIONS(260), 5,
+      anon_sym_STAR,
+      anon_sym_COLON,
+      anon_sym_SLASH,
+      anon_sym_LT,
+      anon_sym_GT,
+    ACTIONS(287), 28,
+      anon_sym_DOT,
+      anon_sym_LPAREN,
+      anon_sym_RPAREN,
+      anon_sym_COMMA,
+      anon_sym_as,
+      anon_sym_GT_GT,
+      anon_sym_if,
+      anon_sym_in,
+      anon_sym_PIPE,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_not,
+      anon_sym_and,
+      anon_sym_or,
+      anon_sym_PERCENT,
+      anon_sym_SLASH_SLASH,
+      anon_sym_AMP,
+      anon_sym_CARET,
+      anon_sym_LT_LT,
+      anon_sym_LT_EQ,
+      anon_sym_EQ_EQ,
+      anon_sym_BANG_EQ,
+      anon_sym_GT_EQ,
+      anon_sym_LT_GT,
+      anon_sym_is,
+  [43426] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1487), 5,
+      anon_sym_STAR,
+      anon_sym_EQ,
+      anon_sym_SLASH,
+      anon_sym_LT,
+      anon_sym_GT,
+    ACTIONS(1485), 29,
+      sym__newline,
+      anon_sym_DOT,
+      anon_sym_from,
+      anon_sym_LPAREN,
+      anon_sym_COMMA,
+      anon_sym_GT_GT,
+      anon_sym_if,
+      anon_sym_in,
+      anon_sym_PIPE,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_not,
+      anon_sym_and,
+      anon_sym_or,
+      anon_sym_PERCENT,
+      anon_sym_SLASH_SLASH,
+      anon_sym_AMP,
+      anon_sym_CARET,
+      anon_sym_LT_LT,
+      anon_sym_LT_EQ,
+      anon_sym_EQ_EQ,
+      anon_sym_BANG_EQ,
+      anon_sym_GT_EQ,
+      anon_sym_LT_GT,
+      anon_sym_is,
+      sym__semicolon,
+  [43468] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1559), 5,
+      anon_sym_STAR,
+      anon_sym_EQ,
+      anon_sym_SLASH,
+      anon_sym_LT,
+      anon_sym_GT,
+    ACTIONS(1557), 29,
+      sym__newline,
+      anon_sym_DOT,
+      anon_sym_from,
+      anon_sym_LPAREN,
+      anon_sym_COMMA,
+      anon_sym_GT_GT,
+      anon_sym_if,
+      anon_sym_in,
+      anon_sym_PIPE,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_not,
+      anon_sym_and,
+      anon_sym_or,
+      anon_sym_PERCENT,
+      anon_sym_SLASH_SLASH,
+      anon_sym_AMP,
+      anon_sym_CARET,
+      anon_sym_LT_LT,
+      anon_sym_LT_EQ,
+      anon_sym_EQ_EQ,
+      anon_sym_BANG_EQ,
+      anon_sym_GT_EQ,
+      anon_sym_LT_GT,
+      anon_sym_is,
+      sym__semicolon,
+  [43510] = 3,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(1511), 5,
@@ -62985,125 +59286,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_LT_GT,
       anon_sym_is,
       sym__semicolon,
-  [43641] = 4,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1148), 3,
-      anon_sym_RPAREN,
-      anon_sym_COMMA,
-      anon_sym_RBRACK,
-    ACTIONS(1151), 4,
-      anon_sym_STAR,
-      anon_sym_SLASH,
-      anon_sym_LT,
-      anon_sym_GT,
-    ACTIONS(1146), 27,
-      anon_sym_DOT,
-      anon_sym_LPAREN,
-      anon_sym_GT_GT,
-      anon_sym_if,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_in,
-      anon_sym_PIPE,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_not,
-      anon_sym_and,
-      anon_sym_or,
-      anon_sym_PERCENT,
-      anon_sym_SLASH_SLASH,
-      anon_sym_AMP,
-      anon_sym_CARET,
-      anon_sym_LT_LT,
-      anon_sym_LT_EQ,
-      anon_sym_EQ_EQ,
-      anon_sym_BANG_EQ,
-      anon_sym_GT_EQ,
-      anon_sym_LT_GT,
-      anon_sym_is,
-  [43685] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1519), 5,
-      anon_sym_STAR,
-      anon_sym_EQ,
-      anon_sym_SLASH,
-      anon_sym_LT,
-      anon_sym_GT,
-    ACTIONS(1517), 29,
-      sym__newline,
-      anon_sym_DOT,
-      anon_sym_from,
-      anon_sym_LPAREN,
-      anon_sym_COMMA,
-      anon_sym_GT_GT,
-      anon_sym_if,
-      anon_sym_in,
-      anon_sym_PIPE,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_not,
-      anon_sym_and,
-      anon_sym_or,
-      anon_sym_PERCENT,
-      anon_sym_SLASH_SLASH,
-      anon_sym_AMP,
-      anon_sym_CARET,
-      anon_sym_LT_LT,
-      anon_sym_LT_EQ,
-      anon_sym_EQ_EQ,
-      anon_sym_BANG_EQ,
-      anon_sym_GT_EQ,
-      anon_sym_LT_GT,
-      anon_sym_is,
-      sym__semicolon,
-  [43727] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1523), 5,
-      anon_sym_STAR,
-      anon_sym_EQ,
-      anon_sym_SLASH,
-      anon_sym_LT,
-      anon_sym_GT,
-    ACTIONS(1521), 29,
-      sym__newline,
-      anon_sym_DOT,
-      anon_sym_from,
-      anon_sym_LPAREN,
-      anon_sym_COMMA,
-      anon_sym_GT_GT,
-      anon_sym_if,
-      anon_sym_in,
-      anon_sym_PIPE,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_not,
-      anon_sym_and,
-      anon_sym_or,
-      anon_sym_PERCENT,
-      anon_sym_SLASH_SLASH,
-      anon_sym_AMP,
-      anon_sym_CARET,
-      anon_sym_LT_LT,
-      anon_sym_LT_EQ,
-      anon_sym_EQ_EQ,
-      anon_sym_BANG_EQ,
-      anon_sym_GT_EQ,
-      anon_sym_LT_GT,
-      anon_sym_is,
-      sym__semicolon,
-  [43769] = 3,
+  [43552] = 3,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(1515), 5,
@@ -63142,16 +59325,16 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_LT_GT,
       anon_sym_is,
       sym__semicolon,
-  [43811] = 3,
+  [43594] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1417), 5,
+    ACTIONS(1507), 5,
       anon_sym_STAR,
       anon_sym_EQ,
       anon_sym_SLASH,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1415), 29,
+    ACTIONS(1505), 29,
       sym__newline,
       anon_sym_DOT,
       anon_sym_from,
@@ -63181,16 +59364,16 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_LT_GT,
       anon_sym_is,
       sym__semicolon,
-  [43853] = 3,
+  [43636] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(276), 5,
+    ACTIONS(1471), 5,
       anon_sym_STAR,
       anon_sym_EQ,
       anon_sym_SLASH,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(303), 29,
+    ACTIONS(1469), 29,
       sym__newline,
       anon_sym_DOT,
       anon_sym_from,
@@ -63220,16 +59403,16 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_LT_GT,
       anon_sym_is,
       sym__semicolon,
-  [43895] = 3,
+  [43678] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1413), 5,
+    ACTIONS(1555), 5,
       anon_sym_STAR,
       anon_sym_EQ,
       anon_sym_SLASH,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1411), 29,
+    ACTIONS(1553), 29,
       sym__newline,
       anon_sym_DOT,
       anon_sym_from,
@@ -63259,16 +59442,16 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_LT_GT,
       anon_sym_is,
       sym__semicolon,
-  [43937] = 3,
+  [43720] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1519), 5,
+    ACTIONS(1503), 5,
       anon_sym_STAR,
       anon_sym_EQ,
       anon_sym_SLASH,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1517), 29,
+    ACTIONS(1501), 29,
       sym__newline,
       anon_sym_DOT,
       anon_sym_from,
@@ -63298,16 +59481,16 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_LT_GT,
       anon_sym_is,
       sym__semicolon,
-  [43979] = 3,
+  [43762] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1053), 5,
+    ACTIONS(1475), 5,
       anon_sym_STAR,
       anon_sym_EQ,
       anon_sym_SLASH,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1048), 29,
+    ACTIONS(1473), 29,
       sym__newline,
       anon_sym_DOT,
       anon_sym_from,
@@ -63337,56 +59520,16 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_LT_GT,
       anon_sym_is,
       sym__semicolon,
-  [44021] = 4,
+  [43804] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1679), 1,
-      anon_sym_COLON_EQ,
-    ACTIONS(1053), 5,
-      anon_sym_STAR,
-      anon_sym_COLON,
-      anon_sym_SLASH,
-      anon_sym_LT,
-      anon_sym_GT,
-    ACTIONS(1048), 28,
-      anon_sym_DOT,
-      anon_sym_LPAREN,
-      anon_sym_RPAREN,
-      anon_sym_COMMA,
-      anon_sym_as,
-      anon_sym_GT_GT,
-      anon_sym_if,
-      anon_sym_in,
-      anon_sym_PIPE,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_not,
-      anon_sym_and,
-      anon_sym_or,
-      anon_sym_PERCENT,
-      anon_sym_SLASH_SLASH,
-      anon_sym_AMP,
-      anon_sym_CARET,
-      anon_sym_LT_LT,
-      anon_sym_LT_EQ,
-      anon_sym_EQ_EQ,
-      anon_sym_BANG_EQ,
-      anon_sym_GT_EQ,
-      anon_sym_LT_GT,
-      anon_sym_is,
-  [44065] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1441), 5,
+    ACTIONS(1467), 5,
       anon_sym_STAR,
       anon_sym_EQ,
       anon_sym_SLASH,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1439), 29,
+    ACTIONS(1465), 29,
       sym__newline,
       anon_sym_DOT,
       anon_sym_from,
@@ -63416,16 +59559,16 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_LT_GT,
       anon_sym_is,
       sym__semicolon,
-  [44107] = 3,
+  [43846] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1541), 5,
+    ACTIONS(1499), 5,
       anon_sym_STAR,
       anon_sym_EQ,
       anon_sym_SLASH,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1539), 29,
+    ACTIONS(1497), 29,
       sym__newline,
       anon_sym_DOT,
       anon_sym_from,
@@ -63455,56 +59598,16 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_LT_GT,
       anon_sym_is,
       sym__semicolon,
-  [44149] = 4,
+  [43888] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(628), 1,
-      anon_sym_COLON_EQ,
-    ACTIONS(276), 5,
-      anon_sym_STAR,
-      anon_sym_COLON,
-      anon_sym_SLASH,
-      anon_sym_LT,
-      anon_sym_GT,
-    ACTIONS(303), 28,
-      anon_sym_DOT,
-      anon_sym_LPAREN,
-      anon_sym_RPAREN,
-      anon_sym_COMMA,
-      anon_sym_as,
-      anon_sym_GT_GT,
-      anon_sym_if,
-      anon_sym_in,
-      anon_sym_PIPE,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_not,
-      anon_sym_and,
-      anon_sym_or,
-      anon_sym_PERCENT,
-      anon_sym_SLASH_SLASH,
-      anon_sym_AMP,
-      anon_sym_CARET,
-      anon_sym_LT_LT,
-      anon_sym_LT_EQ,
-      anon_sym_EQ_EQ,
-      anon_sym_BANG_EQ,
-      anon_sym_GT_EQ,
-      anon_sym_LT_GT,
-      anon_sym_is,
-  [44193] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1569), 5,
+    ACTIONS(1495), 5,
       anon_sym_STAR,
       anon_sym_EQ,
       anon_sym_SLASH,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1567), 29,
+    ACTIONS(1493), 29,
       sym__newline,
       anon_sym_DOT,
       anon_sym_from,
@@ -63534,136 +59637,19 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_LT_GT,
       anon_sym_is,
       sym__semicolon,
-  [44235] = 3,
+  [43930] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1433), 5,
-      anon_sym_STAR,
-      anon_sym_EQ,
-      anon_sym_SLASH,
-      anon_sym_LT,
-      anon_sym_GT,
-    ACTIONS(1431), 29,
-      sym__newline,
-      anon_sym_DOT,
-      anon_sym_from,
-      anon_sym_LPAREN,
-      anon_sym_COMMA,
-      anon_sym_GT_GT,
-      anon_sym_if,
-      anon_sym_in,
-      anon_sym_PIPE,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_not,
-      anon_sym_and,
-      anon_sym_or,
-      anon_sym_PERCENT,
-      anon_sym_SLASH_SLASH,
-      anon_sym_AMP,
-      anon_sym_CARET,
-      anon_sym_LT_LT,
-      anon_sym_LT_EQ,
-      anon_sym_EQ_EQ,
-      anon_sym_BANG_EQ,
-      anon_sym_GT_EQ,
-      anon_sym_LT_GT,
-      anon_sym_is,
-      sym__semicolon,
-  [44277] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1409), 5,
-      anon_sym_STAR,
-      anon_sym_EQ,
-      anon_sym_SLASH,
-      anon_sym_LT,
-      anon_sym_GT,
-    ACTIONS(1407), 29,
-      sym__newline,
-      anon_sym_DOT,
-      anon_sym_from,
-      anon_sym_LPAREN,
-      anon_sym_COMMA,
-      anon_sym_GT_GT,
-      anon_sym_if,
-      anon_sym_in,
-      anon_sym_PIPE,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_not,
-      anon_sym_and,
-      anon_sym_or,
-      anon_sym_PERCENT,
-      anon_sym_SLASH_SLASH,
-      anon_sym_AMP,
-      anon_sym_CARET,
-      anon_sym_LT_LT,
-      anon_sym_LT_EQ,
-      anon_sym_EQ_EQ,
-      anon_sym_BANG_EQ,
-      anon_sym_GT_EQ,
-      anon_sym_LT_GT,
-      anon_sym_is,
-      sym__semicolon,
-  [44319] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1537), 5,
-      anon_sym_STAR,
-      anon_sym_EQ,
-      anon_sym_SLASH,
-      anon_sym_LT,
-      anon_sym_GT,
-    ACTIONS(1535), 29,
-      sym__newline,
-      anon_sym_DOT,
-      anon_sym_from,
-      anon_sym_LPAREN,
-      anon_sym_COMMA,
-      anon_sym_GT_GT,
-      anon_sym_if,
-      anon_sym_in,
-      anon_sym_PIPE,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_not,
-      anon_sym_and,
-      anon_sym_or,
-      anon_sym_PERCENT,
-      anon_sym_SLASH_SLASH,
-      anon_sym_AMP,
-      anon_sym_CARET,
-      anon_sym_LT_LT,
-      anon_sym_LT_EQ,
-      anon_sym_EQ_EQ,
-      anon_sym_BANG_EQ,
-      anon_sym_GT_EQ,
-      anon_sym_LT_GT,
-      anon_sym_is,
-      sym__semicolon,
-  [44361] = 4,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1050), 3,
+    ACTIONS(1145), 3,
       anon_sym_RPAREN,
       anon_sym_COMMA,
       anon_sym_RBRACK,
-    ACTIONS(1053), 4,
+    ACTIONS(1148), 4,
       anon_sym_STAR,
       anon_sym_SLASH,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1048), 27,
+    ACTIONS(1143), 27,
       anon_sym_DOT,
       anon_sym_LPAREN,
       anon_sym_GT_GT,
@@ -63691,16 +59677,16 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_GT_EQ,
       anon_sym_LT_GT,
       anon_sym_is,
-  [44405] = 3,
+  [43974] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1421), 5,
+    ACTIONS(260), 5,
       anon_sym_STAR,
       anon_sym_EQ,
       anon_sym_SLASH,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1419), 29,
+    ACTIONS(287), 29,
       sym__newline,
       anon_sym_DOT,
       anon_sym_from,
@@ -63730,16 +59716,16 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_LT_GT,
       anon_sym_is,
       sym__semicolon,
-  [44447] = 3,
+  [44016] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1421), 5,
+    ACTIONS(1451), 5,
       anon_sym_STAR,
       anon_sym_EQ,
       anon_sym_SLASH,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1419), 29,
+    ACTIONS(1449), 29,
       sym__newline,
       anon_sym_DOT,
       anon_sym_from,
@@ -63769,136 +59755,20 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_LT_GT,
       anon_sym_is,
       sym__semicolon,
-  [44489] = 3,
+  [44058] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1519), 4,
+    ACTIONS(1459), 5,
       anon_sym_STAR,
-      anon_sym_SLASH,
-      anon_sym_LT,
-      anon_sym_GT,
-    ACTIONS(1517), 29,
-      anon_sym_DOT,
-      anon_sym_LPAREN,
-      anon_sym_RPAREN,
-      anon_sym_COMMA,
-      anon_sym_as,
-      anon_sym_GT_GT,
-      anon_sym_if,
-      anon_sym_COLON,
-      anon_sym_in,
-      anon_sym_PIPE,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_not,
-      anon_sym_and,
-      anon_sym_or,
-      anon_sym_PERCENT,
-      anon_sym_SLASH_SLASH,
-      anon_sym_AMP,
-      anon_sym_CARET,
-      anon_sym_LT_LT,
-      anon_sym_LT_EQ,
-      anon_sym_EQ_EQ,
-      anon_sym_BANG_EQ,
-      anon_sym_GT_EQ,
-      anon_sym_LT_GT,
-      anon_sym_is,
-  [44530] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(832), 4,
-      anon_sym_STAR,
-      anon_sym_SLASH,
-      anon_sym_LT,
-      anon_sym_GT,
-    ACTIONS(830), 29,
-      anon_sym_DOT,
-      anon_sym_LPAREN,
-      anon_sym_RPAREN,
-      anon_sym_COMMA,
-      anon_sym_as,
-      anon_sym_GT_GT,
-      anon_sym_if,
-      anon_sym_COLON,
-      anon_sym_in,
-      anon_sym_PIPE,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_not,
-      anon_sym_and,
-      anon_sym_or,
-      anon_sym_PERCENT,
-      anon_sym_SLASH_SLASH,
-      anon_sym_AMP,
-      anon_sym_CARET,
-      anon_sym_LT_LT,
-      anon_sym_LT_EQ,
-      anon_sym_EQ_EQ,
-      anon_sym_BANG_EQ,
-      anon_sym_GT_EQ,
-      anon_sym_LT_GT,
-      anon_sym_is,
-  [44571] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1053), 4,
-      anon_sym_STAR,
-      anon_sym_SLASH,
-      anon_sym_LT,
-      anon_sym_GT,
-    ACTIONS(1048), 29,
-      anon_sym_DOT,
-      anon_sym_LPAREN,
-      anon_sym_RPAREN,
-      anon_sym_COMMA,
-      anon_sym_as,
-      anon_sym_GT_GT,
-      anon_sym_if,
-      anon_sym_COLON,
-      anon_sym_in,
-      anon_sym_PIPE,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_not,
-      anon_sym_and,
-      anon_sym_or,
-      anon_sym_PERCENT,
-      anon_sym_SLASH_SLASH,
-      anon_sym_AMP,
-      anon_sym_CARET,
-      anon_sym_LT_LT,
-      anon_sym_LT_EQ,
-      anon_sym_EQ_EQ,
-      anon_sym_BANG_EQ,
-      anon_sym_GT_EQ,
-      anon_sym_LT_GT,
-      anon_sym_is,
-  [44612] = 5,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1074), 1,
-      anon_sym_COLON_EQ,
-    ACTIONS(1677), 1,
       anon_sym_EQ,
-    ACTIONS(1053), 4,
-      anon_sym_STAR,
       anon_sym_SLASH,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1048), 27,
+    ACTIONS(1457), 29,
+      sym__newline,
       anon_sym_DOT,
+      anon_sym_from,
       anon_sym_LPAREN,
-      anon_sym_RPAREN,
       anon_sym_COMMA,
       anon_sym_GT_GT,
       anon_sym_if,
@@ -63923,15 +59793,173 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_GT_EQ,
       anon_sym_LT_GT,
       anon_sym_is,
-  [44657] = 3,
+      sym__semicolon,
+  [44100] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1461), 4,
+    ACTIONS(1455), 5,
+      anon_sym_STAR,
+      anon_sym_EQ,
+      anon_sym_SLASH,
+      anon_sym_LT,
+      anon_sym_GT,
+    ACTIONS(1453), 29,
+      sym__newline,
+      anon_sym_DOT,
+      anon_sym_from,
+      anon_sym_LPAREN,
+      anon_sym_COMMA,
+      anon_sym_GT_GT,
+      anon_sym_if,
+      anon_sym_in,
+      anon_sym_PIPE,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_not,
+      anon_sym_and,
+      anon_sym_or,
+      anon_sym_PERCENT,
+      anon_sym_SLASH_SLASH,
+      anon_sym_AMP,
+      anon_sym_CARET,
+      anon_sym_LT_LT,
+      anon_sym_LT_EQ,
+      anon_sym_EQ_EQ,
+      anon_sym_BANG_EQ,
+      anon_sym_GT_EQ,
+      anon_sym_LT_GT,
+      anon_sym_is,
+      sym__semicolon,
+  [44142] = 4,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1110), 3,
+      anon_sym_RPAREN,
+      anon_sym_COMMA,
+      anon_sym_RBRACK,
+    ACTIONS(1113), 4,
       anon_sym_STAR,
       anon_sym_SLASH,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1459), 29,
+    ACTIONS(1108), 27,
+      anon_sym_DOT,
+      anon_sym_LPAREN,
+      anon_sym_GT_GT,
+      anon_sym_if,
+      anon_sym_async,
+      anon_sym_for,
+      anon_sym_in,
+      anon_sym_PIPE,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_not,
+      anon_sym_and,
+      anon_sym_or,
+      anon_sym_PERCENT,
+      anon_sym_SLASH_SLASH,
+      anon_sym_AMP,
+      anon_sym_CARET,
+      anon_sym_LT_LT,
+      anon_sym_LT_EQ,
+      anon_sym_EQ_EQ,
+      anon_sym_BANG_EQ,
+      anon_sym_GT_EQ,
+      anon_sym_LT_GT,
+      anon_sym_is,
+  [44186] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1148), 5,
+      anon_sym_STAR,
+      anon_sym_EQ,
+      anon_sym_SLASH,
+      anon_sym_LT,
+      anon_sym_GT,
+    ACTIONS(1143), 29,
+      sym__newline,
+      anon_sym_DOT,
+      anon_sym_from,
+      anon_sym_LPAREN,
+      anon_sym_COMMA,
+      anon_sym_GT_GT,
+      anon_sym_if,
+      anon_sym_in,
+      anon_sym_PIPE,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_not,
+      anon_sym_and,
+      anon_sym_or,
+      anon_sym_PERCENT,
+      anon_sym_SLASH_SLASH,
+      anon_sym_AMP,
+      anon_sym_CARET,
+      anon_sym_LT_LT,
+      anon_sym_LT_EQ,
+      anon_sym_EQ_EQ,
+      anon_sym_BANG_EQ,
+      anon_sym_GT_EQ,
+      anon_sym_LT_GT,
+      anon_sym_is,
+      sym__semicolon,
+  [44228] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1463), 5,
+      anon_sym_STAR,
+      anon_sym_EQ,
+      anon_sym_SLASH,
+      anon_sym_LT,
+      anon_sym_GT,
+    ACTIONS(1461), 29,
+      sym__newline,
+      anon_sym_DOT,
+      anon_sym_from,
+      anon_sym_LPAREN,
+      anon_sym_COMMA,
+      anon_sym_GT_GT,
+      anon_sym_if,
+      anon_sym_in,
+      anon_sym_PIPE,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_not,
+      anon_sym_and,
+      anon_sym_or,
+      anon_sym_PERCENT,
+      anon_sym_SLASH_SLASH,
+      anon_sym_AMP,
+      anon_sym_CARET,
+      anon_sym_LT_LT,
+      anon_sym_LT_EQ,
+      anon_sym_EQ_EQ,
+      anon_sym_BANG_EQ,
+      anon_sym_GT_EQ,
+      anon_sym_LT_GT,
+      anon_sym_is,
+      sym__semicolon,
+  [44270] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(798), 4,
+      anon_sym_STAR,
+      anon_sym_SLASH,
+      anon_sym_LT,
+      anon_sym_GT,
+    ACTIONS(796), 29,
       anon_sym_DOT,
       anon_sym_LPAREN,
       anon_sym_RPAREN,
@@ -63961,15 +59989,15 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_GT_EQ,
       anon_sym_LT_GT,
       anon_sym_is,
-  [44698] = 3,
+  [44311] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1457), 4,
+    ACTIONS(1563), 4,
       anon_sym_STAR,
       anon_sym_SLASH,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1455), 29,
+    ACTIONS(1561), 29,
       anon_sym_DOT,
       anon_sym_LPAREN,
       anon_sym_RPAREN,
@@ -63999,15 +60027,15 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_GT_EQ,
       anon_sym_LT_GT,
       anon_sym_is,
-  [44739] = 3,
+  [44352] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1453), 4,
+    ACTIONS(1499), 4,
       anon_sym_STAR,
       anon_sym_SLASH,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1451), 29,
+    ACTIONS(1497), 29,
       anon_sym_DOT,
       anon_sym_LPAREN,
       anon_sym_RPAREN,
@@ -64037,15 +60065,15 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_GT_EQ,
       anon_sym_LT_GT,
       anon_sym_is,
-  [44780] = 3,
+  [44393] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1449), 4,
+    ACTIONS(1495), 4,
       anon_sym_STAR,
       anon_sym_SLASH,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1447), 29,
+    ACTIONS(1493), 29,
       anon_sym_DOT,
       anon_sym_LPAREN,
       anon_sym_RPAREN,
@@ -64075,15 +60103,15 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_GT_EQ,
       anon_sym_LT_GT,
       anon_sym_is,
-  [44821] = 3,
+  [44434] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1409), 4,
+    ACTIONS(1491), 4,
       anon_sym_STAR,
       anon_sym_SLASH,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1407), 29,
+    ACTIONS(1489), 29,
       anon_sym_DOT,
       anon_sym_LPAREN,
       anon_sym_RPAREN,
@@ -64113,15 +60141,15 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_GT_EQ,
       anon_sym_LT_GT,
       anon_sym_is,
-  [44862] = 3,
+  [44475] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1445), 4,
+    ACTIONS(1483), 4,
       anon_sym_STAR,
       anon_sym_SLASH,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1443), 29,
+    ACTIONS(1481), 29,
       anon_sym_DOT,
       anon_sym_LPAREN,
       anon_sym_RPAREN,
@@ -64151,15 +60179,15 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_GT_EQ,
       anon_sym_LT_GT,
       anon_sym_is,
-  [44903] = 3,
+  [44516] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1533), 4,
+    ACTIONS(1479), 4,
       anon_sym_STAR,
       anon_sym_SLASH,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1531), 29,
+    ACTIONS(1477), 29,
       anon_sym_DOT,
       anon_sym_LPAREN,
       anon_sym_RPAREN,
@@ -64189,15 +60217,15 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_GT_EQ,
       anon_sym_LT_GT,
       anon_sym_is,
-  [44944] = 3,
+  [44557] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1441), 4,
+    ACTIONS(1475), 4,
       anon_sym_STAR,
       anon_sym_SLASH,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1439), 29,
+    ACTIONS(1473), 29,
       anon_sym_DOT,
       anon_sym_LPAREN,
       anon_sym_RPAREN,
@@ -64227,15 +60255,15 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_GT_EQ,
       anon_sym_LT_GT,
       anon_sym_is,
-  [44985] = 3,
+  [44598] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1437), 4,
+    ACTIONS(814), 4,
       anon_sym_STAR,
       anon_sym_SLASH,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1435), 29,
+    ACTIONS(812), 29,
       anon_sym_DOT,
       anon_sym_LPAREN,
       anon_sym_RPAREN,
@@ -64265,15 +60293,15 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_GT_EQ,
       anon_sym_LT_GT,
       anon_sym_is,
-  [45026] = 3,
+  [44639] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(828), 4,
+    ACTIONS(1455), 4,
       anon_sym_STAR,
       anon_sym_SLASH,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(826), 29,
+    ACTIONS(1453), 29,
       anon_sym_DOT,
       anon_sym_LPAREN,
       anon_sym_RPAREN,
@@ -64303,15 +60331,15 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_GT_EQ,
       anon_sym_LT_GT,
       anon_sym_is,
-  [45067] = 3,
+  [44680] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1421), 4,
+    ACTIONS(1555), 4,
       anon_sym_STAR,
       anon_sym_SLASH,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1419), 29,
+    ACTIONS(1553), 29,
       anon_sym_DOT,
       anon_sym_LPAREN,
       anon_sym_RPAREN,
@@ -64341,15 +60369,15 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_GT_EQ,
       anon_sym_LT_GT,
       anon_sym_is,
-  [45108] = 3,
+  [44721] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1421), 4,
+    ACTIONS(1459), 4,
       anon_sym_STAR,
       anon_sym_SLASH,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1419), 29,
+    ACTIONS(1457), 29,
       anon_sym_DOT,
       anon_sym_LPAREN,
       anon_sym_RPAREN,
@@ -64379,15 +60407,15 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_GT_EQ,
       anon_sym_LT_GT,
       anon_sym_is,
-  [45149] = 3,
+  [44762] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1473), 4,
+    ACTIONS(1467), 4,
       anon_sym_STAR,
       anon_sym_SLASH,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1471), 29,
+    ACTIONS(1465), 29,
       anon_sym_DOT,
       anon_sym_LPAREN,
       anon_sym_RPAREN,
@@ -64417,15 +60445,15 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_GT_EQ,
       anon_sym_LT_GT,
       anon_sym_is,
-  [45190] = 3,
+  [44803] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1541), 4,
+    ACTIONS(1491), 4,
       anon_sym_STAR,
       anon_sym_SLASH,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1539), 29,
+    ACTIONS(1489), 29,
       anon_sym_DOT,
       anon_sym_LPAREN,
       anon_sym_RPAREN,
@@ -64455,15 +60483,15 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_GT_EQ,
       anon_sym_LT_GT,
       anon_sym_is,
-  [45231] = 3,
+  [44844] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1417), 4,
+    ACTIONS(1451), 4,
       anon_sym_STAR,
       anon_sym_SLASH,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1415), 29,
+    ACTIONS(1449), 29,
       anon_sym_DOT,
       anon_sym_LPAREN,
       anon_sym_RPAREN,
@@ -64493,15 +60521,15 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_GT_EQ,
       anon_sym_LT_GT,
       anon_sym_is,
-  [45272] = 3,
+  [44885] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1537), 4,
+    ACTIONS(1455), 4,
       anon_sym_STAR,
       anon_sym_SLASH,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1535), 29,
+    ACTIONS(1453), 29,
       anon_sym_DOT,
       anon_sym_LPAREN,
       anon_sym_RPAREN,
@@ -64531,15 +60559,15 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_GT_EQ,
       anon_sym_LT_GT,
       anon_sym_is,
-  [45313] = 3,
+  [44926] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(840), 4,
+    ACTIONS(1443), 4,
       anon_sym_STAR,
       anon_sym_SLASH,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(838), 29,
+    ACTIONS(1441), 29,
       anon_sym_DOT,
       anon_sym_LPAREN,
       anon_sym_RPAREN,
@@ -64569,15 +60597,15 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_GT_EQ,
       anon_sym_LT_GT,
       anon_sym_is,
-  [45354] = 3,
+  [44967] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1569), 4,
+    ACTIONS(260), 4,
       anon_sym_STAR,
       anon_sym_SLASH,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1567), 29,
+    ACTIONS(287), 29,
       anon_sym_DOT,
       anon_sym_LPAREN,
       anon_sym_RPAREN,
@@ -64607,15 +60635,15 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_GT_EQ,
       anon_sym_LT_GT,
       anon_sym_is,
-  [45395] = 3,
+  [45008] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1417), 4,
+    ACTIONS(1503), 4,
       anon_sym_STAR,
       anon_sym_SLASH,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1415), 29,
+    ACTIONS(1501), 29,
       anon_sym_DOT,
       anon_sym_LPAREN,
       anon_sym_RPAREN,
@@ -64645,15 +60673,15 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_GT_EQ,
       anon_sym_LT_GT,
       anon_sym_is,
-  [45436] = 3,
+  [45049] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(276), 4,
+    ACTIONS(1447), 4,
       anon_sym_STAR,
       anon_sym_SLASH,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(303), 29,
+    ACTIONS(1445), 29,
       anon_sym_DOT,
       anon_sym_LPAREN,
       anon_sym_RPAREN,
@@ -64683,7 +60711,235 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_GT_EQ,
       anon_sym_LT_GT,
       anon_sym_is,
-  [45477] = 3,
+  [45090] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1487), 4,
+      anon_sym_STAR,
+      anon_sym_SLASH,
+      anon_sym_LT,
+      anon_sym_GT,
+    ACTIONS(1485), 29,
+      anon_sym_DOT,
+      anon_sym_LPAREN,
+      anon_sym_RPAREN,
+      anon_sym_COMMA,
+      anon_sym_as,
+      anon_sym_GT_GT,
+      anon_sym_if,
+      anon_sym_COLON,
+      anon_sym_in,
+      anon_sym_PIPE,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_not,
+      anon_sym_and,
+      anon_sym_or,
+      anon_sym_PERCENT,
+      anon_sym_SLASH_SLASH,
+      anon_sym_AMP,
+      anon_sym_CARET,
+      anon_sym_LT_LT,
+      anon_sym_LT_EQ,
+      anon_sym_EQ_EQ,
+      anon_sym_BANG_EQ,
+      anon_sym_GT_EQ,
+      anon_sym_LT_GT,
+      anon_sym_is,
+  [45131] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1507), 4,
+      anon_sym_STAR,
+      anon_sym_SLASH,
+      anon_sym_LT,
+      anon_sym_GT,
+    ACTIONS(1505), 29,
+      anon_sym_DOT,
+      anon_sym_LPAREN,
+      anon_sym_RPAREN,
+      anon_sym_COMMA,
+      anon_sym_as,
+      anon_sym_GT_GT,
+      anon_sym_if,
+      anon_sym_COLON,
+      anon_sym_in,
+      anon_sym_PIPE,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_not,
+      anon_sym_and,
+      anon_sym_or,
+      anon_sym_PERCENT,
+      anon_sym_SLASH_SLASH,
+      anon_sym_AMP,
+      anon_sym_CARET,
+      anon_sym_LT_LT,
+      anon_sym_LT_EQ,
+      anon_sym_EQ_EQ,
+      anon_sym_BANG_EQ,
+      anon_sym_GT_EQ,
+      anon_sym_LT_GT,
+      anon_sym_is,
+  [45172] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1471), 4,
+      anon_sym_STAR,
+      anon_sym_SLASH,
+      anon_sym_LT,
+      anon_sym_GT,
+    ACTIONS(1469), 29,
+      anon_sym_DOT,
+      anon_sym_LPAREN,
+      anon_sym_RPAREN,
+      anon_sym_COMMA,
+      anon_sym_as,
+      anon_sym_GT_GT,
+      anon_sym_if,
+      anon_sym_COLON,
+      anon_sym_in,
+      anon_sym_PIPE,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_not,
+      anon_sym_and,
+      anon_sym_or,
+      anon_sym_PERCENT,
+      anon_sym_SLASH_SLASH,
+      anon_sym_AMP,
+      anon_sym_CARET,
+      anon_sym_LT_LT,
+      anon_sym_LT_EQ,
+      anon_sym_EQ_EQ,
+      anon_sym_BANG_EQ,
+      anon_sym_GT_EQ,
+      anon_sym_LT_GT,
+      anon_sym_is,
+  [45213] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1467), 4,
+      anon_sym_STAR,
+      anon_sym_SLASH,
+      anon_sym_LT,
+      anon_sym_GT,
+    ACTIONS(1465), 29,
+      anon_sym_DOT,
+      anon_sym_LPAREN,
+      anon_sym_RPAREN,
+      anon_sym_COMMA,
+      anon_sym_as,
+      anon_sym_GT_GT,
+      anon_sym_if,
+      anon_sym_COLON,
+      anon_sym_in,
+      anon_sym_PIPE,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_not,
+      anon_sym_and,
+      anon_sym_or,
+      anon_sym_PERCENT,
+      anon_sym_SLASH_SLASH,
+      anon_sym_AMP,
+      anon_sym_CARET,
+      anon_sym_LT_LT,
+      anon_sym_LT_EQ,
+      anon_sym_EQ_EQ,
+      anon_sym_BANG_EQ,
+      anon_sym_GT_EQ,
+      anon_sym_LT_GT,
+      anon_sym_is,
+  [45254] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(802), 4,
+      anon_sym_STAR,
+      anon_sym_SLASH,
+      anon_sym_LT,
+      anon_sym_GT,
+    ACTIONS(800), 29,
+      anon_sym_DOT,
+      anon_sym_LPAREN,
+      anon_sym_RPAREN,
+      anon_sym_COMMA,
+      anon_sym_as,
+      anon_sym_GT_GT,
+      anon_sym_if,
+      anon_sym_COLON,
+      anon_sym_in,
+      anon_sym_PIPE,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_not,
+      anon_sym_and,
+      anon_sym_or,
+      anon_sym_PERCENT,
+      anon_sym_SLASH_SLASH,
+      anon_sym_AMP,
+      anon_sym_CARET,
+      anon_sym_LT_LT,
+      anon_sym_LT_EQ,
+      anon_sym_EQ_EQ,
+      anon_sym_BANG_EQ,
+      anon_sym_GT_EQ,
+      anon_sym_LT_GT,
+      anon_sym_is,
+  [45295] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(806), 4,
+      anon_sym_STAR,
+      anon_sym_SLASH,
+      anon_sym_LT,
+      anon_sym_GT,
+    ACTIONS(804), 29,
+      anon_sym_DOT,
+      anon_sym_LPAREN,
+      anon_sym_RPAREN,
+      anon_sym_COMMA,
+      anon_sym_as,
+      anon_sym_GT_GT,
+      anon_sym_if,
+      anon_sym_COLON,
+      anon_sym_in,
+      anon_sym_PIPE,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_not,
+      anon_sym_and,
+      anon_sym_or,
+      anon_sym_PERCENT,
+      anon_sym_SLASH_SLASH,
+      anon_sym_AMP,
+      anon_sym_CARET,
+      anon_sym_LT_LT,
+      anon_sym_LT_EQ,
+      anon_sym_EQ_EQ,
+      anon_sym_BANG_EQ,
+      anon_sym_GT_EQ,
+      anon_sym_LT_GT,
+      anon_sym_is,
+  [45336] = 3,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(1511), 4,
@@ -64721,503 +60977,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_GT_EQ,
       anon_sym_LT_GT,
       anon_sym_is,
-  [45518] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(836), 4,
-      anon_sym_STAR,
-      anon_sym_SLASH,
-      anon_sym_LT,
-      anon_sym_GT,
-    ACTIONS(834), 29,
-      anon_sym_DOT,
-      anon_sym_LPAREN,
-      anon_sym_RPAREN,
-      anon_sym_COMMA,
-      anon_sym_as,
-      anon_sym_GT_GT,
-      anon_sym_if,
-      anon_sym_COLON,
-      anon_sym_in,
-      anon_sym_PIPE,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_not,
-      anon_sym_and,
-      anon_sym_or,
-      anon_sym_PERCENT,
-      anon_sym_SLASH_SLASH,
-      anon_sym_AMP,
-      anon_sym_CARET,
-      anon_sym_LT_LT,
-      anon_sym_LT_EQ,
-      anon_sym_EQ_EQ,
-      anon_sym_BANG_EQ,
-      anon_sym_GT_EQ,
-      anon_sym_LT_GT,
-      anon_sym_is,
-  [45559] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1519), 4,
-      anon_sym_STAR,
-      anon_sym_SLASH,
-      anon_sym_LT,
-      anon_sym_GT,
-    ACTIONS(1517), 29,
-      anon_sym_DOT,
-      anon_sym_LPAREN,
-      anon_sym_RPAREN,
-      anon_sym_COMMA,
-      anon_sym_as,
-      anon_sym_GT_GT,
-      anon_sym_if,
-      anon_sym_COLON,
-      anon_sym_in,
-      anon_sym_PIPE,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_not,
-      anon_sym_and,
-      anon_sym_or,
-      anon_sym_PERCENT,
-      anon_sym_SLASH_SLASH,
-      anon_sym_AMP,
-      anon_sym_CARET,
-      anon_sym_LT_LT,
-      anon_sym_LT_EQ,
-      anon_sym_EQ_EQ,
-      anon_sym_BANG_EQ,
-      anon_sym_GT_EQ,
-      anon_sym_LT_GT,
-      anon_sym_is,
-  [45600] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(832), 4,
-      anon_sym_STAR,
-      anon_sym_SLASH,
-      anon_sym_LT,
-      anon_sym_GT,
-    ACTIONS(830), 29,
-      anon_sym_DOT,
-      anon_sym_LPAREN,
-      anon_sym_RPAREN,
-      anon_sym_COMMA,
-      anon_sym_as,
-      anon_sym_GT_GT,
-      anon_sym_if,
-      anon_sym_COLON,
-      anon_sym_in,
-      anon_sym_PIPE,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_not,
-      anon_sym_and,
-      anon_sym_or,
-      anon_sym_PERCENT,
-      anon_sym_SLASH_SLASH,
-      anon_sym_AMP,
-      anon_sym_CARET,
-      anon_sym_LT_LT,
-      anon_sym_LT_EQ,
-      anon_sym_EQ_EQ,
-      anon_sym_BANG_EQ,
-      anon_sym_GT_EQ,
-      anon_sym_LT_GT,
-      anon_sym_is,
-  [45641] = 5,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(568), 1,
-      anon_sym_COLON_EQ,
-    ACTIONS(620), 1,
-      anon_sym_EQ,
-    ACTIONS(276), 4,
-      anon_sym_STAR,
-      anon_sym_SLASH,
-      anon_sym_LT,
-      anon_sym_GT,
-    ACTIONS(303), 27,
-      anon_sym_DOT,
-      anon_sym_LPAREN,
-      anon_sym_RPAREN,
-      anon_sym_COMMA,
-      anon_sym_GT_GT,
-      anon_sym_if,
-      anon_sym_in,
-      anon_sym_PIPE,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_not,
-      anon_sym_and,
-      anon_sym_or,
-      anon_sym_PERCENT,
-      anon_sym_SLASH_SLASH,
-      anon_sym_AMP,
-      anon_sym_CARET,
-      anon_sym_LT_LT,
-      anon_sym_LT_EQ,
-      anon_sym_EQ_EQ,
-      anon_sym_BANG_EQ,
-      anon_sym_GT_EQ,
-      anon_sym_LT_GT,
-      anon_sym_is,
-  [45686] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1425), 4,
-      anon_sym_STAR,
-      anon_sym_SLASH,
-      anon_sym_LT,
-      anon_sym_GT,
-    ACTIONS(1423), 29,
-      anon_sym_DOT,
-      anon_sym_LPAREN,
-      anon_sym_RPAREN,
-      anon_sym_COMMA,
-      anon_sym_as,
-      anon_sym_GT_GT,
-      anon_sym_if,
-      anon_sym_COLON,
-      anon_sym_in,
-      anon_sym_PIPE,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_not,
-      anon_sym_and,
-      anon_sym_or,
-      anon_sym_PERCENT,
-      anon_sym_SLASH_SLASH,
-      anon_sym_AMP,
-      anon_sym_CARET,
-      anon_sym_LT_LT,
-      anon_sym_LT_EQ,
-      anon_sym_EQ_EQ,
-      anon_sym_BANG_EQ,
-      anon_sym_GT_EQ,
-      anon_sym_LT_GT,
-      anon_sym_is,
-  [45727] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1413), 4,
-      anon_sym_STAR,
-      anon_sym_SLASH,
-      anon_sym_LT,
-      anon_sym_GT,
-    ACTIONS(1411), 29,
-      anon_sym_DOT,
-      anon_sym_LPAREN,
-      anon_sym_RPAREN,
-      anon_sym_COMMA,
-      anon_sym_as,
-      anon_sym_GT_GT,
-      anon_sym_if,
-      anon_sym_COLON,
-      anon_sym_in,
-      anon_sym_PIPE,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_not,
-      anon_sym_and,
-      anon_sym_or,
-      anon_sym_PERCENT,
-      anon_sym_SLASH_SLASH,
-      anon_sym_AMP,
-      anon_sym_CARET,
-      anon_sym_LT_LT,
-      anon_sym_LT_EQ,
-      anon_sym_EQ_EQ,
-      anon_sym_BANG_EQ,
-      anon_sym_GT_EQ,
-      anon_sym_LT_GT,
-      anon_sym_is,
-  [45768] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1465), 4,
-      anon_sym_STAR,
-      anon_sym_SLASH,
-      anon_sym_LT,
-      anon_sym_GT,
-    ACTIONS(1463), 29,
-      anon_sym_DOT,
-      anon_sym_LPAREN,
-      anon_sym_RPAREN,
-      anon_sym_COMMA,
-      anon_sym_as,
-      anon_sym_GT_GT,
-      anon_sym_if,
-      anon_sym_COLON,
-      anon_sym_in,
-      anon_sym_PIPE,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_not,
-      anon_sym_and,
-      anon_sym_or,
-      anon_sym_PERCENT,
-      anon_sym_SLASH_SLASH,
-      anon_sym_AMP,
-      anon_sym_CARET,
-      anon_sym_LT_LT,
-      anon_sym_LT_EQ,
-      anon_sym_EQ_EQ,
-      anon_sym_BANG_EQ,
-      anon_sym_GT_EQ,
-      anon_sym_LT_GT,
-      anon_sym_is,
-  [45809] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1429), 4,
-      anon_sym_STAR,
-      anon_sym_SLASH,
-      anon_sym_LT,
-      anon_sym_GT,
-    ACTIONS(1427), 29,
-      anon_sym_DOT,
-      anon_sym_LPAREN,
-      anon_sym_RPAREN,
-      anon_sym_COMMA,
-      anon_sym_as,
-      anon_sym_GT_GT,
-      anon_sym_if,
-      anon_sym_COLON,
-      anon_sym_in,
-      anon_sym_PIPE,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_not,
-      anon_sym_and,
-      anon_sym_or,
-      anon_sym_PERCENT,
-      anon_sym_SLASH_SLASH,
-      anon_sym_AMP,
-      anon_sym_CARET,
-      anon_sym_LT_LT,
-      anon_sym_LT_EQ,
-      anon_sym_EQ_EQ,
-      anon_sym_BANG_EQ,
-      anon_sym_GT_EQ,
-      anon_sym_LT_GT,
-      anon_sym_is,
-  [45850] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1469), 4,
-      anon_sym_STAR,
-      anon_sym_SLASH,
-      anon_sym_LT,
-      anon_sym_GT,
-    ACTIONS(1467), 29,
-      anon_sym_DOT,
-      anon_sym_LPAREN,
-      anon_sym_RPAREN,
-      anon_sym_COMMA,
-      anon_sym_as,
-      anon_sym_GT_GT,
-      anon_sym_if,
-      anon_sym_COLON,
-      anon_sym_in,
-      anon_sym_PIPE,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_not,
-      anon_sym_and,
-      anon_sym_or,
-      anon_sym_PERCENT,
-      anon_sym_SLASH_SLASH,
-      anon_sym_AMP,
-      anon_sym_CARET,
-      anon_sym_LT_LT,
-      anon_sym_LT_EQ,
-      anon_sym_EQ_EQ,
-      anon_sym_BANG_EQ,
-      anon_sym_GT_EQ,
-      anon_sym_LT_GT,
-      anon_sym_is,
-  [45891] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1425), 4,
-      anon_sym_STAR,
-      anon_sym_SLASH,
-      anon_sym_LT,
-      anon_sym_GT,
-    ACTIONS(1423), 29,
-      anon_sym_DOT,
-      anon_sym_LPAREN,
-      anon_sym_RPAREN,
-      anon_sym_COMMA,
-      anon_sym_as,
-      anon_sym_GT_GT,
-      anon_sym_if,
-      anon_sym_COLON,
-      anon_sym_in,
-      anon_sym_PIPE,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_not,
-      anon_sym_and,
-      anon_sym_or,
-      anon_sym_PERCENT,
-      anon_sym_SLASH_SLASH,
-      anon_sym_AMP,
-      anon_sym_CARET,
-      anon_sym_LT_LT,
-      anon_sym_LT_EQ,
-      anon_sym_EQ_EQ,
-      anon_sym_BANG_EQ,
-      anon_sym_GT_EQ,
-      anon_sym_LT_GT,
-      anon_sym_is,
-  [45932] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(824), 4,
-      anon_sym_STAR,
-      anon_sym_SLASH,
-      anon_sym_LT,
-      anon_sym_GT,
-    ACTIONS(822), 29,
-      anon_sym_DOT,
-      anon_sym_LPAREN,
-      anon_sym_RPAREN,
-      anon_sym_COMMA,
-      anon_sym_as,
-      anon_sym_GT_GT,
-      anon_sym_if,
-      anon_sym_COLON,
-      anon_sym_in,
-      anon_sym_PIPE,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_not,
-      anon_sym_and,
-      anon_sym_or,
-      anon_sym_PERCENT,
-      anon_sym_SLASH_SLASH,
-      anon_sym_AMP,
-      anon_sym_CARET,
-      anon_sym_LT_LT,
-      anon_sym_LT_EQ,
-      anon_sym_EQ_EQ,
-      anon_sym_BANG_EQ,
-      anon_sym_GT_EQ,
-      anon_sym_LT_GT,
-      anon_sym_is,
-  [45973] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(824), 4,
-      anon_sym_STAR,
-      anon_sym_SLASH,
-      anon_sym_LT,
-      anon_sym_GT,
-    ACTIONS(822), 29,
-      anon_sym_DOT,
-      anon_sym_LPAREN,
-      anon_sym_RPAREN,
-      anon_sym_COMMA,
-      anon_sym_as,
-      anon_sym_GT_GT,
-      anon_sym_if,
-      anon_sym_COLON,
-      anon_sym_in,
-      anon_sym_PIPE,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_not,
-      anon_sym_and,
-      anon_sym_or,
-      anon_sym_PERCENT,
-      anon_sym_SLASH_SLASH,
-      anon_sym_AMP,
-      anon_sym_CARET,
-      anon_sym_LT_LT,
-      anon_sym_LT_EQ,
-      anon_sym_EQ_EQ,
-      anon_sym_BANG_EQ,
-      anon_sym_GT_EQ,
-      anon_sym_LT_GT,
-      anon_sym_is,
-  [46014] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1433), 4,
-      anon_sym_STAR,
-      anon_sym_SLASH,
-      anon_sym_LT,
-      anon_sym_GT,
-    ACTIONS(1431), 29,
-      anon_sym_DOT,
-      anon_sym_LPAREN,
-      anon_sym_RPAREN,
-      anon_sym_COMMA,
-      anon_sym_as,
-      anon_sym_GT_GT,
-      anon_sym_if,
-      anon_sym_COLON,
-      anon_sym_in,
-      anon_sym_PIPE,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_not,
-      anon_sym_and,
-      anon_sym_or,
-      anon_sym_PERCENT,
-      anon_sym_SLASH_SLASH,
-      anon_sym_AMP,
-      anon_sym_CARET,
-      anon_sym_LT_LT,
-      anon_sym_LT_EQ,
-      anon_sym_EQ_EQ,
-      anon_sym_BANG_EQ,
-      anon_sym_GT_EQ,
-      anon_sym_LT_GT,
-      anon_sym_is,
-  [46055] = 3,
+  [45377] = 3,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(1515), 4,
@@ -65255,15 +61015,15 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_GT_EQ,
       anon_sym_LT_GT,
       anon_sym_is,
-  [46096] = 3,
+  [45418] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1523), 4,
+    ACTIONS(810), 4,
       anon_sym_STAR,
       anon_sym_SLASH,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1521), 29,
+    ACTIONS(808), 29,
       anon_sym_DOT,
       anon_sym_LPAREN,
       anon_sym_RPAREN,
@@ -65293,52 +61053,474 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_GT_EQ,
       anon_sym_LT_GT,
       anon_sym_is,
-  [46137] = 20,
+  [45459] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(646), 1,
-      sym__string_start,
-    ACTIONS(1681), 1,
-      sym_identifier,
-    ACTIONS(1683), 1,
-      anon_sym_LPAREN,
-    ACTIONS(1685), 1,
+    ACTIONS(1551), 4,
       anon_sym_STAR,
-    ACTIONS(1687), 1,
+      anon_sym_SLASH,
+      anon_sym_LT,
+      anon_sym_GT,
+    ACTIONS(1549), 29,
+      anon_sym_DOT,
+      anon_sym_LPAREN,
+      anon_sym_RPAREN,
+      anon_sym_COMMA,
+      anon_sym_as,
+      anon_sym_GT_GT,
+      anon_sym_if,
+      anon_sym_COLON,
+      anon_sym_in,
+      anon_sym_PIPE,
       anon_sym_DASH,
-    ACTIONS(1689), 1,
-      sym_match_wildcard_pattern,
-    ACTIONS(1691), 1,
+      anon_sym_PLUS,
       anon_sym_LBRACK,
-    ACTIONS(1693), 1,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_not,
+      anon_sym_and,
+      anon_sym_or,
+      anon_sym_PERCENT,
+      anon_sym_SLASH_SLASH,
+      anon_sym_AMP,
+      anon_sym_CARET,
+      anon_sym_LT_LT,
+      anon_sym_LT_EQ,
+      anon_sym_EQ_EQ,
+      anon_sym_BANG_EQ,
+      anon_sym_GT_EQ,
+      anon_sym_LT_GT,
+      anon_sym_is,
+  [45500] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(806), 4,
+      anon_sym_STAR,
+      anon_sym_SLASH,
+      anon_sym_LT,
+      anon_sym_GT,
+    ACTIONS(804), 29,
+      anon_sym_DOT,
+      anon_sym_LPAREN,
+      anon_sym_RPAREN,
+      anon_sym_COMMA,
+      anon_sym_as,
+      anon_sym_GT_GT,
+      anon_sym_if,
+      anon_sym_COLON,
+      anon_sym_in,
+      anon_sym_PIPE,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_not,
+      anon_sym_and,
+      anon_sym_or,
+      anon_sym_PERCENT,
+      anon_sym_SLASH_SLASH,
+      anon_sym_AMP,
+      anon_sym_CARET,
+      anon_sym_LT_LT,
+      anon_sym_LT_EQ,
+      anon_sym_EQ_EQ,
+      anon_sym_BANG_EQ,
+      anon_sym_GT_EQ,
+      anon_sym_LT_GT,
+      anon_sym_is,
+  [45541] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1559), 4,
+      anon_sym_STAR,
+      anon_sym_SLASH,
+      anon_sym_LT,
+      anon_sym_GT,
+    ACTIONS(1557), 29,
+      anon_sym_DOT,
+      anon_sym_LPAREN,
+      anon_sym_RPAREN,
+      anon_sym_COMMA,
+      anon_sym_as,
+      anon_sym_GT_GT,
+      anon_sym_if,
+      anon_sym_COLON,
+      anon_sym_in,
+      anon_sym_PIPE,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_not,
+      anon_sym_and,
+      anon_sym_or,
+      anon_sym_PERCENT,
+      anon_sym_SLASH_SLASH,
+      anon_sym_AMP,
+      anon_sym_CARET,
+      anon_sym_LT_LT,
+      anon_sym_LT_EQ,
+      anon_sym_EQ_EQ,
+      anon_sym_BANG_EQ,
+      anon_sym_GT_EQ,
+      anon_sym_LT_GT,
+      anon_sym_is,
+  [45582] = 5,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1090), 1,
+      anon_sym_COLON_EQ,
+    ACTIONS(1671), 1,
+      anon_sym_EQ,
+    ACTIONS(1079), 4,
+      anon_sym_STAR,
+      anon_sym_SLASH,
+      anon_sym_LT,
+      anon_sym_GT,
+    ACTIONS(1074), 27,
+      anon_sym_DOT,
+      anon_sym_LPAREN,
+      anon_sym_RPAREN,
+      anon_sym_COMMA,
+      anon_sym_GT_GT,
+      anon_sym_if,
+      anon_sym_in,
+      anon_sym_PIPE,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_not,
+      anon_sym_and,
+      anon_sym_or,
+      anon_sym_PERCENT,
+      anon_sym_SLASH_SLASH,
+      anon_sym_AMP,
+      anon_sym_CARET,
+      anon_sym_LT_LT,
+      anon_sym_LT_EQ,
+      anon_sym_EQ_EQ,
+      anon_sym_BANG_EQ,
+      anon_sym_GT_EQ,
+      anon_sym_LT_GT,
+      anon_sym_is,
+  [45627] = 5,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(560), 1,
+      anon_sym_COLON_EQ,
+    ACTIONS(588), 1,
+      anon_sym_EQ,
+    ACTIONS(260), 4,
+      anon_sym_STAR,
+      anon_sym_SLASH,
+      anon_sym_LT,
+      anon_sym_GT,
+    ACTIONS(287), 27,
+      anon_sym_DOT,
+      anon_sym_LPAREN,
+      anon_sym_RPAREN,
+      anon_sym_COMMA,
+      anon_sym_GT_GT,
+      anon_sym_if,
+      anon_sym_in,
+      anon_sym_PIPE,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_not,
+      anon_sym_and,
+      anon_sym_or,
+      anon_sym_PERCENT,
+      anon_sym_SLASH_SLASH,
+      anon_sym_AMP,
+      anon_sym_CARET,
+      anon_sym_LT_LT,
+      anon_sym_LT_EQ,
+      anon_sym_EQ_EQ,
+      anon_sym_BANG_EQ,
+      anon_sym_GT_EQ,
+      anon_sym_LT_GT,
+      anon_sym_is,
+  [45672] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1519), 4,
+      anon_sym_STAR,
+      anon_sym_SLASH,
+      anon_sym_LT,
+      anon_sym_GT,
+    ACTIONS(1517), 29,
+      anon_sym_DOT,
+      anon_sym_LPAREN,
+      anon_sym_RPAREN,
+      anon_sym_COMMA,
+      anon_sym_as,
+      anon_sym_GT_GT,
+      anon_sym_if,
+      anon_sym_COLON,
+      anon_sym_in,
+      anon_sym_PIPE,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_not,
+      anon_sym_and,
+      anon_sym_or,
+      anon_sym_PERCENT,
+      anon_sym_SLASH_SLASH,
+      anon_sym_AMP,
+      anon_sym_CARET,
+      anon_sym_LT_LT,
+      anon_sym_LT_EQ,
+      anon_sym_EQ_EQ,
+      anon_sym_BANG_EQ,
+      anon_sym_GT_EQ,
+      anon_sym_LT_GT,
+      anon_sym_is,
+  [45713] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1559), 4,
+      anon_sym_STAR,
+      anon_sym_SLASH,
+      anon_sym_LT,
+      anon_sym_GT,
+    ACTIONS(1557), 29,
+      anon_sym_DOT,
+      anon_sym_LPAREN,
+      anon_sym_RPAREN,
+      anon_sym_COMMA,
+      anon_sym_as,
+      anon_sym_GT_GT,
+      anon_sym_if,
+      anon_sym_COLON,
+      anon_sym_in,
+      anon_sym_PIPE,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_not,
+      anon_sym_and,
+      anon_sym_or,
+      anon_sym_PERCENT,
+      anon_sym_SLASH_SLASH,
+      anon_sym_AMP,
+      anon_sym_CARET,
+      anon_sym_LT_LT,
+      anon_sym_LT_EQ,
+      anon_sym_EQ_EQ,
+      anon_sym_BANG_EQ,
+      anon_sym_GT_EQ,
+      anon_sym_LT_GT,
+      anon_sym_is,
+  [45754] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1079), 4,
+      anon_sym_STAR,
+      anon_sym_SLASH,
+      anon_sym_LT,
+      anon_sym_GT,
+    ACTIONS(1074), 29,
+      anon_sym_DOT,
+      anon_sym_LPAREN,
+      anon_sym_RPAREN,
+      anon_sym_COMMA,
+      anon_sym_as,
+      anon_sym_GT_GT,
+      anon_sym_if,
+      anon_sym_COLON,
+      anon_sym_in,
+      anon_sym_PIPE,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_not,
+      anon_sym_and,
+      anon_sym_or,
+      anon_sym_PERCENT,
+      anon_sym_SLASH_SLASH,
+      anon_sym_AMP,
+      anon_sym_CARET,
+      anon_sym_LT_LT,
+      anon_sym_LT_EQ,
+      anon_sym_EQ_EQ,
+      anon_sym_BANG_EQ,
+      anon_sym_GT_EQ,
+      anon_sym_LT_GT,
+      anon_sym_is,
+  [45795] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(798), 4,
+      anon_sym_STAR,
+      anon_sym_SLASH,
+      anon_sym_LT,
+      anon_sym_GT,
+    ACTIONS(796), 29,
+      anon_sym_DOT,
+      anon_sym_LPAREN,
+      anon_sym_RPAREN,
+      anon_sym_COMMA,
+      anon_sym_as,
+      anon_sym_GT_GT,
+      anon_sym_if,
+      anon_sym_COLON,
+      anon_sym_in,
+      anon_sym_PIPE,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_not,
+      anon_sym_and,
+      anon_sym_or,
+      anon_sym_PERCENT,
+      anon_sym_SLASH_SLASH,
+      anon_sym_AMP,
+      anon_sym_CARET,
+      anon_sym_LT_LT,
+      anon_sym_LT_EQ,
+      anon_sym_EQ_EQ,
+      anon_sym_BANG_EQ,
+      anon_sym_GT_EQ,
+      anon_sym_LT_GT,
+      anon_sym_is,
+  [45836] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1547), 4,
+      anon_sym_STAR,
+      anon_sym_SLASH,
+      anon_sym_LT,
+      anon_sym_GT,
+    ACTIONS(1545), 29,
+      anon_sym_DOT,
+      anon_sym_LPAREN,
+      anon_sym_RPAREN,
+      anon_sym_COMMA,
+      anon_sym_as,
+      anon_sym_GT_GT,
+      anon_sym_if,
+      anon_sym_COLON,
+      anon_sym_in,
+      anon_sym_PIPE,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_not,
+      anon_sym_and,
+      anon_sym_or,
+      anon_sym_PERCENT,
+      anon_sym_SLASH_SLASH,
+      anon_sym_AMP,
+      anon_sym_CARET,
+      anon_sym_LT_LT,
+      anon_sym_LT_EQ,
+      anon_sym_EQ_EQ,
+      anon_sym_BANG_EQ,
+      anon_sym_GT_EQ,
+      anon_sym_LT_GT,
+      anon_sym_is,
+  [45877] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1463), 4,
+      anon_sym_STAR,
+      anon_sym_SLASH,
+      anon_sym_LT,
+      anon_sym_GT,
+    ACTIONS(1461), 29,
+      anon_sym_DOT,
+      anon_sym_LPAREN,
+      anon_sym_RPAREN,
+      anon_sym_COMMA,
+      anon_sym_as,
+      anon_sym_GT_GT,
+      anon_sym_if,
+      anon_sym_COLON,
+      anon_sym_in,
+      anon_sym_PIPE,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_not,
+      anon_sym_and,
+      anon_sym_or,
+      anon_sym_PERCENT,
+      anon_sym_SLASH_SLASH,
+      anon_sym_AMP,
+      anon_sym_CARET,
+      anon_sym_LT_LT,
+      anon_sym_LT_EQ,
+      anon_sym_EQ_EQ,
+      anon_sym_BANG_EQ,
+      anon_sym_GT_EQ,
+      anon_sym_LT_GT,
+      anon_sym_is,
+  [45918] = 20,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(608), 1,
+      sym__string_start,
+    ACTIONS(1675), 1,
+      sym_identifier,
+    ACTIONS(1677), 1,
+      anon_sym_LPAREN,
+    ACTIONS(1679), 1,
+      anon_sym_STAR,
+    ACTIONS(1681), 1,
+      anon_sym_DASH,
+    ACTIONS(1683), 1,
+      sym_match_wildcard_pattern,
+    ACTIONS(1685), 1,
+      anon_sym_LBRACK,
+    ACTIONS(1687), 1,
       anon_sym_LBRACE,
-    ACTIONS(1695), 1,
+    ACTIONS(1689), 1,
       sym_integer,
-    ACTIONS(1697), 1,
+    ACTIONS(1691), 1,
       sym_float,
-    STATE(913), 1,
+    STATE(902), 1,
       sym_string,
-    STATE(975), 1,
+    STATE(969), 1,
       sym_concatenated_string,
-    STATE(1406), 1,
+    STATE(1477), 1,
       sym_pattern_class_name,
-    STATE(1024), 2,
+    STATE(992), 2,
       sym__match_or_pattern,
       sym_match_or_pattern,
-    STATE(1286), 2,
+    STATE(1184), 2,
+      sym__match_pattern,
+      sym_match_as_pattern,
+    STATE(1231), 2,
       sym__match_patterns,
       sym_open_sequence_match_pattern,
-    STATE(1287), 2,
-      sym__match_pattern,
-      sym_match_as_pattern,
-    STATE(1404), 2,
+    STATE(1380), 2,
       sym__match_maybe_star_pattern,
       sym_match_star_pattern,
-    ACTIONS(1699), 3,
+    ACTIONS(1693), 3,
       sym_true,
       sym_false,
       sym_none,
-    STATE(971), 8,
+    STATE(964), 8,
       sym__closed_pattern,
       sym_match_literal_pattern,
       sym_match_capture_pattern,
@@ -65347,52 +61529,52 @@ static const uint16_t ts_small_parse_table[] = {
       sym_match_sequence_pattern,
       sym_match_mapping_pattern,
       sym_match_class_pattern,
-  [46211] = 20,
+  [45992] = 20,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(646), 1,
+    ACTIONS(608), 1,
       sym__string_start,
-    ACTIONS(1681), 1,
+    ACTIONS(1675), 1,
       sym_identifier,
-    ACTIONS(1683), 1,
+    ACTIONS(1677), 1,
       anon_sym_LPAREN,
-    ACTIONS(1685), 1,
+    ACTIONS(1679), 1,
       anon_sym_STAR,
-    ACTIONS(1687), 1,
+    ACTIONS(1681), 1,
       anon_sym_DASH,
-    ACTIONS(1689), 1,
+    ACTIONS(1683), 1,
       sym_match_wildcard_pattern,
-    ACTIONS(1691), 1,
+    ACTIONS(1685), 1,
       anon_sym_LBRACK,
-    ACTIONS(1693), 1,
+    ACTIONS(1687), 1,
       anon_sym_LBRACE,
-    ACTIONS(1695), 1,
+    ACTIONS(1689), 1,
       sym_integer,
-    ACTIONS(1697), 1,
+    ACTIONS(1691), 1,
       sym_float,
-    ACTIONS(1701), 1,
+    ACTIONS(1695), 1,
       anon_sym_if,
-    ACTIONS(1703), 1,
+    ACTIONS(1697), 1,
       anon_sym_COLON,
-    STATE(913), 1,
+    STATE(902), 1,
       sym_string,
-    STATE(975), 1,
+    STATE(969), 1,
       sym_concatenated_string,
-    STATE(1406), 1,
+    STATE(1477), 1,
       sym_pattern_class_name,
-    STATE(1024), 2,
+    STATE(992), 2,
       sym__match_or_pattern,
       sym_match_or_pattern,
-    ACTIONS(1699), 3,
+    ACTIONS(1693), 3,
       sym_true,
       sym_false,
       sym_none,
-    STATE(1106), 4,
+    STATE(1095), 4,
       sym__match_pattern,
       sym_match_as_pattern,
       sym__match_maybe_star_pattern,
       sym_match_star_pattern,
-    STATE(971), 8,
+    STATE(964), 8,
       sym__closed_pattern,
       sym_match_literal_pattern,
       sym_match_capture_pattern,
@@ -65401,52 +61583,210 @@ static const uint16_t ts_small_parse_table[] = {
       sym_match_sequence_pattern,
       sym_match_mapping_pattern,
       sym_match_class_pattern,
-  [46285] = 20,
+  [46066] = 20,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(646), 1,
+    ACTIONS(608), 1,
       sym__string_start,
-    ACTIONS(1681), 1,
+    ACTIONS(1675), 1,
       sym_identifier,
-    ACTIONS(1683), 1,
+    ACTIONS(1677), 1,
       anon_sym_LPAREN,
-    ACTIONS(1685), 1,
+    ACTIONS(1679), 1,
       anon_sym_STAR,
-    ACTIONS(1687), 1,
+    ACTIONS(1681), 1,
       anon_sym_DASH,
-    ACTIONS(1689), 1,
+    ACTIONS(1683), 1,
       sym_match_wildcard_pattern,
-    ACTIONS(1691), 1,
+    ACTIONS(1685), 1,
       anon_sym_LBRACK,
-    ACTIONS(1693), 1,
+    ACTIONS(1687), 1,
       anon_sym_LBRACE,
-    ACTIONS(1695), 1,
+    ACTIONS(1689), 1,
       sym_integer,
-    ACTIONS(1697), 1,
+    ACTIONS(1691), 1,
+      sym_float,
+    STATE(902), 1,
+      sym_string,
+    STATE(969), 1,
+      sym_concatenated_string,
+    STATE(1477), 1,
+      sym_pattern_class_name,
+    STATE(992), 2,
+      sym__match_or_pattern,
+      sym_match_or_pattern,
+    STATE(1183), 2,
+      sym__match_patterns,
+      sym_open_sequence_match_pattern,
+    STATE(1184), 2,
+      sym__match_pattern,
+      sym_match_as_pattern,
+    STATE(1380), 2,
+      sym__match_maybe_star_pattern,
+      sym_match_star_pattern,
+    ACTIONS(1693), 3,
+      sym_true,
+      sym_false,
+      sym_none,
+    STATE(964), 8,
+      sym__closed_pattern,
+      sym_match_literal_pattern,
+      sym_match_capture_pattern,
+      sym_match_value_pattern,
+      sym_match_group_pattern,
+      sym_match_sequence_pattern,
+      sym_match_mapping_pattern,
+      sym_match_class_pattern,
+  [46140] = 20,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(608), 1,
+      sym__string_start,
+    ACTIONS(1675), 1,
+      sym_identifier,
+    ACTIONS(1677), 1,
+      anon_sym_LPAREN,
+    ACTIONS(1679), 1,
+      anon_sym_STAR,
+    ACTIONS(1681), 1,
+      anon_sym_DASH,
+    ACTIONS(1683), 1,
+      sym_match_wildcard_pattern,
+    ACTIONS(1685), 1,
+      anon_sym_LBRACK,
+    ACTIONS(1687), 1,
+      anon_sym_LBRACE,
+    ACTIONS(1689), 1,
+      sym_integer,
+    ACTIONS(1691), 1,
+      sym_float,
+    ACTIONS(1699), 1,
+      anon_sym_if,
+    ACTIONS(1701), 1,
+      anon_sym_COLON,
+    STATE(902), 1,
+      sym_string,
+    STATE(969), 1,
+      sym_concatenated_string,
+    STATE(1477), 1,
+      sym_pattern_class_name,
+    STATE(992), 2,
+      sym__match_or_pattern,
+      sym_match_or_pattern,
+    ACTIONS(1693), 3,
+      sym_true,
+      sym_false,
+      sym_none,
+    STATE(1095), 4,
+      sym__match_pattern,
+      sym_match_as_pattern,
+      sym__match_maybe_star_pattern,
+      sym_match_star_pattern,
+    STATE(964), 8,
+      sym__closed_pattern,
+      sym_match_literal_pattern,
+      sym_match_capture_pattern,
+      sym_match_value_pattern,
+      sym_match_group_pattern,
+      sym_match_sequence_pattern,
+      sym_match_mapping_pattern,
+      sym_match_class_pattern,
+  [46214] = 19,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(608), 1,
+      sym__string_start,
+    ACTIONS(1675), 1,
+      sym_identifier,
+    ACTIONS(1677), 1,
+      anon_sym_LPAREN,
+    ACTIONS(1679), 1,
+      anon_sym_STAR,
+    ACTIONS(1681), 1,
+      anon_sym_DASH,
+    ACTIONS(1683), 1,
+      sym_match_wildcard_pattern,
+    ACTIONS(1685), 1,
+      anon_sym_LBRACK,
+    ACTIONS(1687), 1,
+      anon_sym_LBRACE,
+    ACTIONS(1689), 1,
+      sym_integer,
+    ACTIONS(1691), 1,
+      sym_float,
+    ACTIONS(1703), 1,
+      anon_sym_RBRACK,
+    STATE(902), 1,
+      sym_string,
+    STATE(969), 1,
+      sym_concatenated_string,
+    STATE(1477), 1,
+      sym_pattern_class_name,
+    STATE(992), 2,
+      sym__match_or_pattern,
+      sym_match_or_pattern,
+    ACTIONS(1693), 3,
+      sym_true,
+      sym_false,
+      sym_none,
+    STATE(1095), 4,
+      sym__match_pattern,
+      sym_match_as_pattern,
+      sym__match_maybe_star_pattern,
+      sym_match_star_pattern,
+    STATE(964), 8,
+      sym__closed_pattern,
+      sym_match_literal_pattern,
+      sym_match_capture_pattern,
+      sym_match_value_pattern,
+      sym_match_group_pattern,
+      sym_match_sequence_pattern,
+      sym_match_mapping_pattern,
+      sym_match_class_pattern,
+  [46285] = 19,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(608), 1,
+      sym__string_start,
+    ACTIONS(1675), 1,
+      sym_identifier,
+    ACTIONS(1677), 1,
+      anon_sym_LPAREN,
+    ACTIONS(1679), 1,
+      anon_sym_STAR,
+    ACTIONS(1681), 1,
+      anon_sym_DASH,
+    ACTIONS(1683), 1,
+      sym_match_wildcard_pattern,
+    ACTIONS(1685), 1,
+      anon_sym_LBRACK,
+    ACTIONS(1687), 1,
+      anon_sym_LBRACE,
+    ACTIONS(1689), 1,
+      sym_integer,
+    ACTIONS(1691), 1,
       sym_float,
     ACTIONS(1705), 1,
-      anon_sym_if,
-    ACTIONS(1707), 1,
-      anon_sym_COLON,
-    STATE(913), 1,
+      anon_sym_RBRACK,
+    STATE(902), 1,
       sym_string,
-    STATE(975), 1,
+    STATE(969), 1,
       sym_concatenated_string,
-    STATE(1406), 1,
+    STATE(1477), 1,
       sym_pattern_class_name,
-    STATE(1024), 2,
+    STATE(992), 2,
       sym__match_or_pattern,
       sym_match_or_pattern,
-    ACTIONS(1699), 3,
+    ACTIONS(1693), 3,
       sym_true,
       sym_false,
       sym_none,
-    STATE(1106), 4,
+    STATE(1229), 4,
       sym__match_pattern,
       sym_match_as_pattern,
       sym__match_maybe_star_pattern,
       sym_match_star_pattern,
-    STATE(971), 8,
+    STATE(964), 8,
       sym__closed_pattern,
       sym_match_literal_pattern,
       sym_match_capture_pattern,
@@ -65455,1173 +61795,1039 @@ static const uint16_t ts_small_parse_table[] = {
       sym_match_sequence_pattern,
       sym_match_mapping_pattern,
       sym_match_class_pattern,
-  [46359] = 20,
+  [46356] = 20,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(646), 1,
+    ACTIONS(608), 1,
       sym__string_start,
-    ACTIONS(1681), 1,
-      sym_identifier,
-    ACTIONS(1683), 1,
-      anon_sym_LPAREN,
-    ACTIONS(1685), 1,
-      anon_sym_STAR,
-    ACTIONS(1687), 1,
-      anon_sym_DASH,
-    ACTIONS(1689), 1,
-      sym_match_wildcard_pattern,
-    ACTIONS(1691), 1,
-      anon_sym_LBRACK,
-    ACTIONS(1693), 1,
-      anon_sym_LBRACE,
-    ACTIONS(1695), 1,
-      sym_integer,
-    ACTIONS(1697), 1,
-      sym_float,
-    STATE(913), 1,
-      sym_string,
-    STATE(975), 1,
-      sym_concatenated_string,
-    STATE(1406), 1,
-      sym_pattern_class_name,
-    STATE(1024), 2,
-      sym__match_or_pattern,
-      sym_match_or_pattern,
-    STATE(1221), 2,
-      sym__match_patterns,
-      sym_open_sequence_match_pattern,
-    STATE(1287), 2,
-      sym__match_pattern,
-      sym_match_as_pattern,
-    STATE(1404), 2,
-      sym__match_maybe_star_pattern,
-      sym_match_star_pattern,
-    ACTIONS(1699), 3,
-      sym_true,
-      sym_false,
-      sym_none,
-    STATE(971), 8,
-      sym__closed_pattern,
-      sym_match_literal_pattern,
-      sym_match_capture_pattern,
-      sym_match_value_pattern,
-      sym_match_group_pattern,
-      sym_match_sequence_pattern,
-      sym_match_mapping_pattern,
-      sym_match_class_pattern,
-  [46433] = 20,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(646), 1,
-      sym__string_start,
-    ACTIONS(1681), 1,
-      sym_identifier,
-    ACTIONS(1683), 1,
-      anon_sym_LPAREN,
-    ACTIONS(1685), 1,
-      anon_sym_STAR,
-    ACTIONS(1687), 1,
-      anon_sym_DASH,
-    ACTIONS(1689), 1,
-      sym_match_wildcard_pattern,
-    ACTIONS(1691), 1,
-      anon_sym_LBRACK,
-    ACTIONS(1693), 1,
-      anon_sym_LBRACE,
-    ACTIONS(1695), 1,
-      sym_integer,
-    ACTIONS(1697), 1,
-      sym_float,
-    ACTIONS(1709), 1,
-      anon_sym_RPAREN,
-    STATE(913), 1,
-      sym_string,
-    STATE(975), 1,
-      sym_concatenated_string,
-    STATE(1406), 1,
-      sym_pattern_class_name,
-    STATE(1024), 2,
-      sym__match_or_pattern,
-      sym_match_or_pattern,
-    STATE(1392), 2,
-      sym__match_pattern,
-      sym_match_as_pattern,
-    STATE(1396), 2,
-      sym__match_maybe_star_pattern,
-      sym_match_star_pattern,
-    ACTIONS(1699), 3,
-      sym_true,
-      sym_false,
-      sym_none,
-    STATE(971), 8,
-      sym__closed_pattern,
-      sym_match_literal_pattern,
-      sym_match_capture_pattern,
-      sym_match_value_pattern,
-      sym_match_group_pattern,
-      sym_match_sequence_pattern,
-      sym_match_mapping_pattern,
-      sym_match_class_pattern,
-  [46506] = 19,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(646), 1,
-      sym__string_start,
-    ACTIONS(1681), 1,
-      sym_identifier,
-    ACTIONS(1683), 1,
-      anon_sym_LPAREN,
-    ACTIONS(1685), 1,
-      anon_sym_STAR,
-    ACTIONS(1687), 1,
-      anon_sym_DASH,
-    ACTIONS(1689), 1,
-      sym_match_wildcard_pattern,
-    ACTIONS(1691), 1,
-      anon_sym_LBRACK,
-    ACTIONS(1693), 1,
-      anon_sym_LBRACE,
-    ACTIONS(1695), 1,
-      sym_integer,
-    ACTIONS(1697), 1,
-      sym_float,
-    ACTIONS(1711), 1,
-      anon_sym_RPAREN,
-    STATE(913), 1,
-      sym_string,
-    STATE(975), 1,
-      sym_concatenated_string,
-    STATE(1406), 1,
-      sym_pattern_class_name,
-    STATE(1024), 2,
-      sym__match_or_pattern,
-      sym_match_or_pattern,
-    ACTIONS(1699), 3,
-      sym_true,
-      sym_false,
-      sym_none,
-    STATE(1106), 4,
-      sym__match_pattern,
-      sym_match_as_pattern,
-      sym__match_maybe_star_pattern,
-      sym_match_star_pattern,
-    STATE(971), 8,
-      sym__closed_pattern,
-      sym_match_literal_pattern,
-      sym_match_capture_pattern,
-      sym_match_value_pattern,
-      sym_match_group_pattern,
-      sym_match_sequence_pattern,
-      sym_match_mapping_pattern,
-      sym_match_class_pattern,
-  [46577] = 19,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(646), 1,
-      sym__string_start,
-    ACTIONS(1681), 1,
-      sym_identifier,
-    ACTIONS(1683), 1,
-      anon_sym_LPAREN,
-    ACTIONS(1685), 1,
-      anon_sym_STAR,
-    ACTIONS(1687), 1,
-      anon_sym_DASH,
-    ACTIONS(1689), 1,
-      sym_match_wildcard_pattern,
-    ACTIONS(1691), 1,
-      anon_sym_LBRACK,
-    ACTIONS(1693), 1,
-      anon_sym_LBRACE,
-    ACTIONS(1695), 1,
-      sym_integer,
-    ACTIONS(1697), 1,
-      sym_float,
-    ACTIONS(1711), 1,
-      anon_sym_RBRACK,
-    STATE(913), 1,
-      sym_string,
-    STATE(975), 1,
-      sym_concatenated_string,
-    STATE(1406), 1,
-      sym_pattern_class_name,
-    STATE(1024), 2,
-      sym__match_or_pattern,
-      sym_match_or_pattern,
-    ACTIONS(1699), 3,
-      sym_true,
-      sym_false,
-      sym_none,
-    STATE(1106), 4,
-      sym__match_pattern,
-      sym_match_as_pattern,
-      sym__match_maybe_star_pattern,
-      sym_match_star_pattern,
-    STATE(971), 8,
-      sym__closed_pattern,
-      sym_match_literal_pattern,
-      sym_match_capture_pattern,
-      sym_match_value_pattern,
-      sym_match_group_pattern,
-      sym_match_sequence_pattern,
-      sym_match_mapping_pattern,
-      sym_match_class_pattern,
-  [46648] = 19,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(646), 1,
-      sym__string_start,
-    ACTIONS(1681), 1,
-      sym_identifier,
-    ACTIONS(1683), 1,
-      anon_sym_LPAREN,
-    ACTIONS(1685), 1,
-      anon_sym_STAR,
-    ACTIONS(1687), 1,
-      anon_sym_DASH,
-    ACTIONS(1689), 1,
-      sym_match_wildcard_pattern,
-    ACTIONS(1691), 1,
-      anon_sym_LBRACK,
-    ACTIONS(1693), 1,
-      anon_sym_LBRACE,
-    ACTIONS(1695), 1,
-      sym_integer,
-    ACTIONS(1697), 1,
-      sym_float,
-    ACTIONS(1709), 1,
-      anon_sym_RBRACK,
-    STATE(913), 1,
-      sym_string,
-    STATE(975), 1,
-      sym_concatenated_string,
-    STATE(1406), 1,
-      sym_pattern_class_name,
-    STATE(1024), 2,
-      sym__match_or_pattern,
-      sym_match_or_pattern,
-    ACTIONS(1699), 3,
-      sym_true,
-      sym_false,
-      sym_none,
-    STATE(1202), 4,
-      sym__match_pattern,
-      sym_match_as_pattern,
-      sym__match_maybe_star_pattern,
-      sym_match_star_pattern,
-    STATE(971), 8,
-      sym__closed_pattern,
-      sym_match_literal_pattern,
-      sym_match_capture_pattern,
-      sym_match_value_pattern,
-      sym_match_group_pattern,
-      sym_match_sequence_pattern,
-      sym_match_mapping_pattern,
-      sym_match_class_pattern,
-  [46719] = 19,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(646), 1,
-      sym__string_start,
-    ACTIONS(1681), 1,
-      sym_identifier,
-    ACTIONS(1683), 1,
-      anon_sym_LPAREN,
-    ACTIONS(1685), 1,
-      anon_sym_STAR,
-    ACTIONS(1687), 1,
-      anon_sym_DASH,
-    ACTIONS(1689), 1,
-      sym_match_wildcard_pattern,
-    ACTIONS(1691), 1,
-      anon_sym_LBRACK,
-    ACTIONS(1693), 1,
-      anon_sym_LBRACE,
-    ACTIONS(1695), 1,
-      sym_integer,
-    ACTIONS(1697), 1,
-      sym_float,
-    ACTIONS(1713), 1,
-      anon_sym_RBRACK,
-    STATE(913), 1,
-      sym_string,
-    STATE(975), 1,
-      sym_concatenated_string,
-    STATE(1406), 1,
-      sym_pattern_class_name,
-    STATE(1024), 2,
-      sym__match_or_pattern,
-      sym_match_or_pattern,
-    ACTIONS(1699), 3,
-      sym_true,
-      sym_false,
-      sym_none,
-    STATE(1106), 4,
-      sym__match_pattern,
-      sym_match_as_pattern,
-      sym__match_maybe_star_pattern,
-      sym_match_star_pattern,
-    STATE(971), 8,
-      sym__closed_pattern,
-      sym_match_literal_pattern,
-      sym_match_capture_pattern,
-      sym_match_value_pattern,
-      sym_match_group_pattern,
-      sym_match_sequence_pattern,
-      sym_match_mapping_pattern,
-      sym_match_class_pattern,
-  [46790] = 19,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(646), 1,
-      sym__string_start,
-    ACTIONS(1681), 1,
-      sym_identifier,
-    ACTIONS(1683), 1,
-      anon_sym_LPAREN,
-    ACTIONS(1685), 1,
-      anon_sym_STAR,
-    ACTIONS(1687), 1,
-      anon_sym_DASH,
-    ACTIONS(1689), 1,
-      sym_match_wildcard_pattern,
-    ACTIONS(1691), 1,
-      anon_sym_LBRACK,
-    ACTIONS(1693), 1,
-      anon_sym_LBRACE,
-    ACTIONS(1695), 1,
-      sym_integer,
-    ACTIONS(1697), 1,
-      sym_float,
-    ACTIONS(1713), 1,
-      anon_sym_RPAREN,
-    STATE(913), 1,
-      sym_string,
-    STATE(975), 1,
-      sym_concatenated_string,
-    STATE(1406), 1,
-      sym_pattern_class_name,
-    STATE(1024), 2,
-      sym__match_or_pattern,
-      sym_match_or_pattern,
-    ACTIONS(1699), 3,
-      sym_true,
-      sym_false,
-      sym_none,
-    STATE(1106), 4,
-      sym__match_pattern,
-      sym_match_as_pattern,
-      sym__match_maybe_star_pattern,
-      sym_match_star_pattern,
-    STATE(971), 8,
-      sym__closed_pattern,
-      sym_match_literal_pattern,
-      sym_match_capture_pattern,
-      sym_match_value_pattern,
-      sym_match_group_pattern,
-      sym_match_sequence_pattern,
-      sym_match_mapping_pattern,
-      sym_match_class_pattern,
-  [46861] = 18,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(646), 1,
-      sym__string_start,
-    ACTIONS(1681), 1,
-      sym_identifier,
-    ACTIONS(1683), 1,
-      anon_sym_LPAREN,
-    ACTIONS(1685), 1,
-      anon_sym_STAR,
-    ACTIONS(1687), 1,
-      anon_sym_DASH,
-    ACTIONS(1689), 1,
-      sym_match_wildcard_pattern,
-    ACTIONS(1691), 1,
-      anon_sym_LBRACK,
-    ACTIONS(1693), 1,
-      anon_sym_LBRACE,
-    ACTIONS(1695), 1,
-      sym_integer,
-    ACTIONS(1697), 1,
-      sym_float,
-    STATE(913), 1,
-      sym_string,
-    STATE(975), 1,
-      sym_concatenated_string,
-    STATE(1406), 1,
-      sym_pattern_class_name,
-    STATE(1024), 2,
-      sym__match_or_pattern,
-      sym_match_or_pattern,
-    ACTIONS(1699), 3,
-      sym_true,
-      sym_false,
-      sym_none,
-    STATE(1106), 4,
-      sym__match_pattern,
-      sym_match_as_pattern,
-      sym__match_maybe_star_pattern,
-      sym_match_star_pattern,
-    STATE(971), 8,
-      sym__closed_pattern,
-      sym_match_literal_pattern,
-      sym_match_capture_pattern,
-      sym_match_value_pattern,
-      sym_match_group_pattern,
-      sym_match_sequence_pattern,
-      sym_match_mapping_pattern,
-      sym_match_class_pattern,
-  [46929] = 20,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(646), 1,
-      sym__string_start,
-    ACTIONS(1683), 1,
-      anon_sym_LPAREN,
-    ACTIONS(1687), 1,
-      anon_sym_DASH,
-    ACTIONS(1689), 1,
-      sym_match_wildcard_pattern,
-    ACTIONS(1691), 1,
-      anon_sym_LBRACK,
-    ACTIONS(1693), 1,
-      anon_sym_LBRACE,
-    ACTIONS(1695), 1,
-      sym_integer,
-    ACTIONS(1697), 1,
-      sym_float,
-    ACTIONS(1715), 1,
-      sym_identifier,
-    ACTIONS(1717), 1,
-      anon_sym_RPAREN,
-    STATE(913), 1,
-      sym_string,
-    STATE(975), 1,
-      sym_concatenated_string,
-    STATE(1212), 1,
-      sym_match_positional_pattern,
-    STATE(1330), 1,
-      sym_match_keyword_pattern,
-    STATE(1406), 1,
-      sym_pattern_class_name,
-    STATE(1024), 2,
-      sym__match_or_pattern,
-      sym_match_or_pattern,
-    STATE(1364), 2,
-      sym__match_pattern,
-      sym_match_as_pattern,
-    ACTIONS(1699), 3,
-      sym_true,
-      sym_false,
-      sym_none,
-    STATE(971), 8,
-      sym__closed_pattern,
-      sym_match_literal_pattern,
-      sym_match_capture_pattern,
-      sym_match_value_pattern,
-      sym_match_group_pattern,
-      sym_match_sequence_pattern,
-      sym_match_mapping_pattern,
-      sym_match_class_pattern,
-  [47001] = 20,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(646), 1,
-      sym__string_start,
-    ACTIONS(1683), 1,
-      anon_sym_LPAREN,
-    ACTIONS(1687), 1,
-      anon_sym_DASH,
-    ACTIONS(1689), 1,
-      sym_match_wildcard_pattern,
-    ACTIONS(1691), 1,
-      anon_sym_LBRACK,
-    ACTIONS(1693), 1,
-      anon_sym_LBRACE,
-    ACTIONS(1695), 1,
-      sym_integer,
-    ACTIONS(1697), 1,
-      sym_float,
-    ACTIONS(1715), 1,
-      sym_identifier,
-    ACTIONS(1719), 1,
-      anon_sym_RPAREN,
-    STATE(913), 1,
-      sym_string,
-    STATE(975), 1,
-      sym_concatenated_string,
-    STATE(1290), 1,
-      sym_match_keyword_pattern,
-    STATE(1403), 1,
-      sym_match_positional_pattern,
-    STATE(1406), 1,
-      sym_pattern_class_name,
-    STATE(1024), 2,
-      sym__match_or_pattern,
-      sym_match_or_pattern,
-    STATE(1364), 2,
-      sym__match_pattern,
-      sym_match_as_pattern,
-    ACTIONS(1699), 3,
-      sym_true,
-      sym_false,
-      sym_none,
-    STATE(971), 8,
-      sym__closed_pattern,
-      sym_match_literal_pattern,
-      sym_match_capture_pattern,
-      sym_match_value_pattern,
-      sym_match_group_pattern,
-      sym_match_sequence_pattern,
-      sym_match_mapping_pattern,
-      sym_match_class_pattern,
-  [47073] = 20,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(646), 1,
-      sym__string_start,
-    ACTIONS(1683), 1,
-      anon_sym_LPAREN,
-    ACTIONS(1687), 1,
-      anon_sym_DASH,
-    ACTIONS(1689), 1,
-      sym_match_wildcard_pattern,
-    ACTIONS(1691), 1,
-      anon_sym_LBRACK,
-    ACTIONS(1693), 1,
-      anon_sym_LBRACE,
-    ACTIONS(1695), 1,
-      sym_integer,
-    ACTIONS(1697), 1,
-      sym_float,
-    ACTIONS(1715), 1,
-      sym_identifier,
-    ACTIONS(1721), 1,
-      anon_sym_RPAREN,
-    STATE(913), 1,
-      sym_string,
-    STATE(975), 1,
-      sym_concatenated_string,
-    STATE(1326), 1,
-      sym_match_keyword_pattern,
-    STATE(1403), 1,
-      sym_match_positional_pattern,
-    STATE(1406), 1,
-      sym_pattern_class_name,
-    STATE(1024), 2,
-      sym__match_or_pattern,
-      sym_match_or_pattern,
-    STATE(1364), 2,
-      sym__match_pattern,
-      sym_match_as_pattern,
-    ACTIONS(1699), 3,
-      sym_true,
-      sym_false,
-      sym_none,
-    STATE(971), 8,
-      sym__closed_pattern,
-      sym_match_literal_pattern,
-      sym_match_capture_pattern,
-      sym_match_value_pattern,
-      sym_match_group_pattern,
-      sym_match_sequence_pattern,
-      sym_match_mapping_pattern,
-      sym_match_class_pattern,
-  [47145] = 18,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(646), 1,
-      sym__string_start,
-    ACTIONS(1681), 1,
-      sym_identifier,
-    ACTIONS(1683), 1,
-      anon_sym_LPAREN,
-    ACTIONS(1687), 1,
-      anon_sym_DASH,
-    ACTIONS(1689), 1,
-      sym_match_wildcard_pattern,
-    ACTIONS(1691), 1,
-      anon_sym_LBRACK,
-    ACTIONS(1693), 1,
-      anon_sym_LBRACE,
-    ACTIONS(1695), 1,
-      sym_integer,
-    ACTIONS(1697), 1,
-      sym_float,
-    STATE(913), 1,
-      sym_string,
-    STATE(975), 1,
-      sym_concatenated_string,
-    STATE(1403), 1,
-      sym_match_positional_pattern,
-    STATE(1406), 1,
-      sym_pattern_class_name,
-    STATE(1024), 2,
-      sym__match_or_pattern,
-      sym_match_or_pattern,
-    STATE(1364), 2,
-      sym__match_pattern,
-      sym_match_as_pattern,
-    ACTIONS(1699), 3,
-      sym_true,
-      sym_false,
-      sym_none,
-    STATE(971), 8,
-      sym__closed_pattern,
-      sym_match_literal_pattern,
-      sym_match_capture_pattern,
-      sym_match_value_pattern,
-      sym_match_group_pattern,
-      sym_match_sequence_pattern,
-      sym_match_mapping_pattern,
-      sym_match_class_pattern,
-  [47211] = 17,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(646), 1,
-      sym__string_start,
-    ACTIONS(1681), 1,
-      sym_identifier,
-    ACTIONS(1683), 1,
-      anon_sym_LPAREN,
-    ACTIONS(1687), 1,
-      anon_sym_DASH,
-    ACTIONS(1689), 1,
-      sym_match_wildcard_pattern,
-    ACTIONS(1691), 1,
-      anon_sym_LBRACK,
-    ACTIONS(1693), 1,
-      anon_sym_LBRACE,
-    ACTIONS(1695), 1,
-      sym_integer,
-    ACTIONS(1697), 1,
-      sym_float,
-    STATE(913), 1,
-      sym_string,
-    STATE(975), 1,
-      sym_concatenated_string,
-    STATE(1406), 1,
-      sym_pattern_class_name,
-    STATE(1024), 2,
-      sym__match_or_pattern,
-      sym_match_or_pattern,
-    STATE(1355), 2,
-      sym__match_pattern,
-      sym_match_as_pattern,
-    ACTIONS(1699), 3,
-      sym_true,
-      sym_false,
-      sym_none,
-    STATE(971), 8,
-      sym__closed_pattern,
-      sym_match_literal_pattern,
-      sym_match_capture_pattern,
-      sym_match_value_pattern,
-      sym_match_group_pattern,
-      sym_match_sequence_pattern,
-      sym_match_mapping_pattern,
-      sym_match_class_pattern,
-  [47274] = 17,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(646), 1,
-      sym__string_start,
-    ACTIONS(1681), 1,
-      sym_identifier,
-    ACTIONS(1683), 1,
-      anon_sym_LPAREN,
-    ACTIONS(1687), 1,
-      anon_sym_DASH,
-    ACTIONS(1689), 1,
-      sym_match_wildcard_pattern,
-    ACTIONS(1691), 1,
-      anon_sym_LBRACK,
-    ACTIONS(1693), 1,
-      anon_sym_LBRACE,
-    ACTIONS(1695), 1,
-      sym_integer,
-    ACTIONS(1697), 1,
-      sym_float,
-    STATE(913), 1,
-      sym_string,
-    STATE(975), 1,
-      sym_concatenated_string,
-    STATE(1406), 1,
-      sym_pattern_class_name,
-    STATE(1024), 2,
-      sym__match_or_pattern,
-      sym_match_or_pattern,
-    STATE(1399), 2,
-      sym__match_pattern,
-      sym_match_as_pattern,
-    ACTIONS(1699), 3,
-      sym_true,
-      sym_false,
-      sym_none,
-    STATE(971), 8,
-      sym__closed_pattern,
-      sym_match_literal_pattern,
-      sym_match_capture_pattern,
-      sym_match_value_pattern,
-      sym_match_group_pattern,
-      sym_match_sequence_pattern,
-      sym_match_mapping_pattern,
-      sym_match_class_pattern,
-  [47337] = 15,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(646), 1,
-      sym__string_start,
-    ACTIONS(1681), 1,
-      sym_identifier,
-    ACTIONS(1683), 1,
-      anon_sym_LPAREN,
-    ACTIONS(1687), 1,
-      anon_sym_DASH,
-    ACTIONS(1691), 1,
-      anon_sym_LBRACK,
-    ACTIONS(1693), 1,
-      anon_sym_LBRACE,
-    ACTIONS(1695), 1,
-      sym_integer,
-    ACTIONS(1697), 1,
-      sym_float,
-    ACTIONS(1723), 1,
-      sym_match_wildcard_pattern,
-    STATE(913), 1,
-      sym_string,
-    STATE(975), 1,
-      sym_concatenated_string,
-    STATE(1406), 1,
-      sym_pattern_class_name,
-    ACTIONS(1699), 3,
-      sym_true,
-      sym_false,
-      sym_none,
-    STATE(984), 8,
-      sym__closed_pattern,
-      sym_match_literal_pattern,
-      sym_match_capture_pattern,
-      sym_match_value_pattern,
-      sym_match_group_pattern,
-      sym_match_sequence_pattern,
-      sym_match_mapping_pattern,
-      sym_match_class_pattern,
-  [47392] = 15,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(646), 1,
-      sym__string_start,
-    ACTIONS(1681), 1,
-      sym_identifier,
-    ACTIONS(1683), 1,
-      anon_sym_LPAREN,
-    ACTIONS(1687), 1,
-      anon_sym_DASH,
-    ACTIONS(1691), 1,
-      anon_sym_LBRACK,
-    ACTIONS(1693), 1,
-      anon_sym_LBRACE,
-    ACTIONS(1695), 1,
-      sym_integer,
-    ACTIONS(1697), 1,
-      sym_float,
-    ACTIONS(1725), 1,
-      sym_match_wildcard_pattern,
-    STATE(913), 1,
-      sym_string,
-    STATE(975), 1,
-      sym_concatenated_string,
-    STATE(1406), 1,
-      sym_pattern_class_name,
-    ACTIONS(1699), 3,
-      sym_true,
-      sym_false,
-      sym_none,
-    STATE(957), 8,
-      sym__closed_pattern,
-      sym_match_literal_pattern,
-      sym_match_capture_pattern,
-      sym_match_value_pattern,
-      sym_match_group_pattern,
-      sym_match_sequence_pattern,
-      sym_match_mapping_pattern,
-      sym_match_class_pattern,
-  [47447] = 8,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1729), 1,
-      anon_sym_as,
-    ACTIONS(1734), 1,
-      anon_sym_not,
-    ACTIONS(1740), 1,
-      anon_sym_is,
-    STATE(868), 1,
-      aux_sym_comparison_operator_repeat1,
-    ACTIONS(1737), 2,
-      anon_sym_LT,
-      anon_sym_GT,
-    ACTIONS(1731), 6,
-      anon_sym_in,
-      anon_sym_LT_EQ,
-      anon_sym_EQ_EQ,
-      anon_sym_BANG_EQ,
-      anon_sym_GT_EQ,
-      anon_sym_LT_GT,
-    ACTIONS(1727), 10,
-      anon_sym_RPAREN,
-      anon_sym_COMMA,
-      anon_sym_if,
-      anon_sym_COLON,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_RBRACK,
-      anon_sym_RBRACE,
-      anon_sym_and,
-      anon_sym_or,
-  [47487] = 8,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1729), 1,
-      anon_sym_EQ,
-    ACTIONS(1746), 1,
-      anon_sym_not,
-    ACTIONS(1752), 1,
-      anon_sym_is,
-    STATE(869), 1,
-      aux_sym_comparison_operator_repeat1,
-    ACTIONS(1749), 2,
-      anon_sym_LT,
-      anon_sym_GT,
-    ACTIONS(1743), 6,
-      anon_sym_in,
-      anon_sym_LT_EQ,
-      anon_sym_EQ_EQ,
-      anon_sym_BANG_EQ,
-      anon_sym_GT_EQ,
-      anon_sym_LT_GT,
-    ACTIONS(1727), 10,
-      anon_sym_RPAREN,
-      anon_sym_COMMA,
-      anon_sym_if,
-      anon_sym_COLON,
-      anon_sym_else,
-      anon_sym_RBRACK,
-      anon_sym_RBRACE,
-      anon_sym_and,
-      anon_sym_or,
-      sym_type_conversion,
-  [47527] = 8,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1499), 1,
-      anon_sym_not,
-    ACTIONS(1507), 1,
-      anon_sym_is,
-    ACTIONS(1757), 1,
-      anon_sym_EQ,
-    STATE(869), 1,
-      aux_sym_comparison_operator_repeat1,
-    ACTIONS(1505), 2,
-      anon_sym_LT,
-      anon_sym_GT,
-    ACTIONS(1485), 6,
-      anon_sym_in,
-      anon_sym_LT_EQ,
-      anon_sym_EQ_EQ,
-      anon_sym_BANG_EQ,
-      anon_sym_GT_EQ,
-      anon_sym_LT_GT,
-    ACTIONS(1755), 10,
-      anon_sym_RPAREN,
-      anon_sym_COMMA,
-      anon_sym_if,
-      anon_sym_COLON,
-      anon_sym_else,
-      anon_sym_RBRACK,
-      anon_sym_RBRACE,
-      anon_sym_and,
-      anon_sym_or,
-      sym_type_conversion,
-  [47567] = 8,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1557), 1,
-      anon_sym_not,
-    ACTIONS(1565), 1,
-      anon_sym_is,
-    ACTIONS(1757), 1,
-      anon_sym_as,
-    STATE(868), 1,
-      aux_sym_comparison_operator_repeat1,
-    ACTIONS(1563), 2,
-      anon_sym_LT,
-      anon_sym_GT,
-    ACTIONS(1547), 6,
-      anon_sym_in,
-      anon_sym_LT_EQ,
-      anon_sym_EQ_EQ,
-      anon_sym_BANG_EQ,
-      anon_sym_GT_EQ,
-      anon_sym_LT_GT,
-    ACTIONS(1755), 10,
-      anon_sym_RPAREN,
-      anon_sym_COMMA,
-      anon_sym_if,
-      anon_sym_COLON,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_RBRACK,
-      anon_sym_RBRACE,
-      anon_sym_and,
-      anon_sym_or,
-  [47607] = 4,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1761), 1,
-      anon_sym_COMMA,
-    STATE(872), 1,
-      aux_sym__patterns_repeat1,
-    ACTIONS(1759), 18,
-      anon_sym_RPAREN,
-      anon_sym_COLON,
-      anon_sym_in,
-      anon_sym_RBRACK,
-      anon_sym_EQ,
-      anon_sym_PLUS_EQ,
-      anon_sym_DASH_EQ,
-      anon_sym_STAR_EQ,
-      anon_sym_SLASH_EQ,
-      anon_sym_AT_EQ,
-      anon_sym_SLASH_SLASH_EQ,
-      anon_sym_PERCENT_EQ,
-      anon_sym_STAR_STAR_EQ,
-      anon_sym_GT_GT_EQ,
-      anon_sym_LT_LT_EQ,
-      anon_sym_AMP_EQ,
-      anon_sym_CARET_EQ,
-      anon_sym_PIPE_EQ,
-  [47637] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1764), 19,
-      anon_sym_RPAREN,
-      anon_sym_COMMA,
-      anon_sym_COLON,
-      anon_sym_in,
-      anon_sym_RBRACK,
-      anon_sym_EQ,
-      anon_sym_PLUS_EQ,
-      anon_sym_DASH_EQ,
-      anon_sym_STAR_EQ,
-      anon_sym_SLASH_EQ,
-      anon_sym_AT_EQ,
-      anon_sym_SLASH_SLASH_EQ,
-      anon_sym_PERCENT_EQ,
-      anon_sym_STAR_STAR_EQ,
-      anon_sym_GT_GT_EQ,
-      anon_sym_LT_LT_EQ,
-      anon_sym_AMP_EQ,
-      anon_sym_CARET_EQ,
-      anon_sym_PIPE_EQ,
-  [47662] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1766), 19,
-      anon_sym_RPAREN,
-      anon_sym_COMMA,
-      anon_sym_COLON,
-      anon_sym_in,
-      anon_sym_RBRACK,
-      anon_sym_EQ,
-      anon_sym_PLUS_EQ,
-      anon_sym_DASH_EQ,
-      anon_sym_STAR_EQ,
-      anon_sym_SLASH_EQ,
-      anon_sym_AT_EQ,
-      anon_sym_SLASH_SLASH_EQ,
-      anon_sym_PERCENT_EQ,
-      anon_sym_STAR_STAR_EQ,
-      anon_sym_GT_GT_EQ,
-      anon_sym_LT_LT_EQ,
-      anon_sym_AMP_EQ,
-      anon_sym_CARET_EQ,
-      anon_sym_PIPE_EQ,
-  [47687] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1059), 19,
-      anon_sym_RPAREN,
-      anon_sym_COMMA,
-      anon_sym_COLON,
-      anon_sym_in,
-      anon_sym_RBRACK,
-      anon_sym_EQ,
-      anon_sym_PLUS_EQ,
-      anon_sym_DASH_EQ,
-      anon_sym_STAR_EQ,
-      anon_sym_SLASH_EQ,
-      anon_sym_AT_EQ,
-      anon_sym_SLASH_SLASH_EQ,
-      anon_sym_PERCENT_EQ,
-      anon_sym_STAR_STAR_EQ,
-      anon_sym_GT_GT_EQ,
-      anon_sym_LT_LT_EQ,
-      anon_sym_AMP_EQ,
-      anon_sym_CARET_EQ,
-      anon_sym_PIPE_EQ,
-  [47712] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1768), 19,
-      anon_sym_RPAREN,
-      anon_sym_COMMA,
-      anon_sym_COLON,
-      anon_sym_in,
-      anon_sym_RBRACK,
-      anon_sym_EQ,
-      anon_sym_PLUS_EQ,
-      anon_sym_DASH_EQ,
-      anon_sym_STAR_EQ,
-      anon_sym_SLASH_EQ,
-      anon_sym_AT_EQ,
-      anon_sym_SLASH_SLASH_EQ,
-      anon_sym_PERCENT_EQ,
-      anon_sym_STAR_STAR_EQ,
-      anon_sym_GT_GT_EQ,
-      anon_sym_LT_LT_EQ,
-      anon_sym_AMP_EQ,
-      anon_sym_CARET_EQ,
-      anon_sym_PIPE_EQ,
-  [47737] = 8,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1729), 1,
-      anon_sym_EQ,
-    ACTIONS(1773), 1,
-      anon_sym_not,
-    ACTIONS(1779), 1,
-      anon_sym_is,
-    STATE(877), 1,
-      aux_sym_comparison_operator_repeat1,
-    ACTIONS(1776), 2,
-      anon_sym_LT,
-      anon_sym_GT,
-    ACTIONS(1770), 6,
-      anon_sym_in,
-      anon_sym_LT_EQ,
-      anon_sym_EQ_EQ,
-      anon_sym_BANG_EQ,
-      anon_sym_GT_EQ,
-      anon_sym_LT_GT,
-    ACTIONS(1727), 7,
-      sym__newline,
-      anon_sym_from,
-      anon_sym_COMMA,
-      anon_sym_if,
-      anon_sym_and,
-      anon_sym_or,
-      sym__semicolon,
-  [47774] = 8,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1630), 1,
-      anon_sym_not,
-    ACTIONS(1638), 1,
-      anon_sym_is,
-    ACTIONS(1757), 1,
-      anon_sym_EQ,
-    STATE(877), 1,
-      aux_sym_comparison_operator_repeat1,
-    ACTIONS(1636), 2,
-      anon_sym_LT,
-      anon_sym_GT,
-    ACTIONS(1618), 6,
-      anon_sym_in,
-      anon_sym_LT_EQ,
-      anon_sym_EQ_EQ,
-      anon_sym_BANG_EQ,
-      anon_sym_GT_EQ,
-      anon_sym_LT_GT,
-    ACTIONS(1755), 7,
-      sym__newline,
-      anon_sym_from,
-      anon_sym_COMMA,
-      anon_sym_if,
-      anon_sym_and,
-      anon_sym_or,
-      sym__semicolon,
-  [47811] = 4,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1053), 2,
-      anon_sym_STAR,
-      anon_sym_SLASH,
-    ACTIONS(1782), 3,
-      anon_sym_RPAREN,
-      anon_sym_COMMA,
-      anon_sym_COLON,
-    ACTIONS(1048), 14,
-      anon_sym_DOT,
-      anon_sym_LPAREN,
-      anon_sym_GT_GT,
-      anon_sym_PIPE,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_PERCENT,
-      anon_sym_SLASH_SLASH,
-      anon_sym_AMP,
-      anon_sym_CARET,
-      anon_sym_LT_LT,
-  [47840] = 4,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(276), 2,
-      anon_sym_STAR,
-      anon_sym_SLASH,
-    ACTIONS(1784), 3,
-      anon_sym_RPAREN,
-      anon_sym_COMMA,
-      anon_sym_COLON,
-    ACTIONS(303), 14,
-      anon_sym_DOT,
-      anon_sym_LPAREN,
-      anon_sym_GT_GT,
-      anon_sym_PIPE,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_PERCENT,
-      anon_sym_SLASH_SLASH,
-      anon_sym_AMP,
-      anon_sym_CARET,
-      anon_sym_LT_LT,
-  [47869] = 7,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1667), 1,
-      anon_sym_not,
     ACTIONS(1675), 1,
+      sym_identifier,
+    ACTIONS(1677), 1,
+      anon_sym_LPAREN,
+    ACTIONS(1679), 1,
+      anon_sym_STAR,
+    ACTIONS(1681), 1,
+      anon_sym_DASH,
+    ACTIONS(1683), 1,
+      sym_match_wildcard_pattern,
+    ACTIONS(1685), 1,
+      anon_sym_LBRACK,
+    ACTIONS(1687), 1,
+      anon_sym_LBRACE,
+    ACTIONS(1689), 1,
+      sym_integer,
+    ACTIONS(1691), 1,
+      sym_float,
+    ACTIONS(1705), 1,
+      anon_sym_RPAREN,
+    STATE(902), 1,
+      sym_string,
+    STATE(969), 1,
+      sym_concatenated_string,
+    STATE(1477), 1,
+      sym_pattern_class_name,
+    STATE(992), 2,
+      sym__match_or_pattern,
+      sym_match_or_pattern,
+    STATE(1360), 2,
+      sym__match_maybe_star_pattern,
+      sym_match_star_pattern,
+    STATE(1364), 2,
+      sym__match_pattern,
+      sym_match_as_pattern,
+    ACTIONS(1693), 3,
+      sym_true,
+      sym_false,
+      sym_none,
+    STATE(964), 8,
+      sym__closed_pattern,
+      sym_match_literal_pattern,
+      sym_match_capture_pattern,
+      sym_match_value_pattern,
+      sym_match_group_pattern,
+      sym_match_sequence_pattern,
+      sym_match_mapping_pattern,
+      sym_match_class_pattern,
+  [46429] = 19,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(608), 1,
+      sym__string_start,
+    ACTIONS(1675), 1,
+      sym_identifier,
+    ACTIONS(1677), 1,
+      anon_sym_LPAREN,
+    ACTIONS(1679), 1,
+      anon_sym_STAR,
+    ACTIONS(1681), 1,
+      anon_sym_DASH,
+    ACTIONS(1683), 1,
+      sym_match_wildcard_pattern,
+    ACTIONS(1685), 1,
+      anon_sym_LBRACK,
+    ACTIONS(1687), 1,
+      anon_sym_LBRACE,
+    ACTIONS(1689), 1,
+      sym_integer,
+    ACTIONS(1691), 1,
+      sym_float,
+    ACTIONS(1703), 1,
+      anon_sym_RPAREN,
+    STATE(902), 1,
+      sym_string,
+    STATE(969), 1,
+      sym_concatenated_string,
+    STATE(1477), 1,
+      sym_pattern_class_name,
+    STATE(992), 2,
+      sym__match_or_pattern,
+      sym_match_or_pattern,
+    ACTIONS(1693), 3,
+      sym_true,
+      sym_false,
+      sym_none,
+    STATE(1095), 4,
+      sym__match_pattern,
+      sym_match_as_pattern,
+      sym__match_maybe_star_pattern,
+      sym_match_star_pattern,
+    STATE(964), 8,
+      sym__closed_pattern,
+      sym_match_literal_pattern,
+      sym_match_capture_pattern,
+      sym_match_value_pattern,
+      sym_match_group_pattern,
+      sym_match_sequence_pattern,
+      sym_match_mapping_pattern,
+      sym_match_class_pattern,
+  [46500] = 19,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(608), 1,
+      sym__string_start,
+    ACTIONS(1675), 1,
+      sym_identifier,
+    ACTIONS(1677), 1,
+      anon_sym_LPAREN,
+    ACTIONS(1679), 1,
+      anon_sym_STAR,
+    ACTIONS(1681), 1,
+      anon_sym_DASH,
+    ACTIONS(1683), 1,
+      sym_match_wildcard_pattern,
+    ACTIONS(1685), 1,
+      anon_sym_LBRACK,
+    ACTIONS(1687), 1,
+      anon_sym_LBRACE,
+    ACTIONS(1689), 1,
+      sym_integer,
+    ACTIONS(1691), 1,
+      sym_float,
+    ACTIONS(1707), 1,
+      anon_sym_RBRACK,
+    STATE(902), 1,
+      sym_string,
+    STATE(969), 1,
+      sym_concatenated_string,
+    STATE(1477), 1,
+      sym_pattern_class_name,
+    STATE(992), 2,
+      sym__match_or_pattern,
+      sym_match_or_pattern,
+    ACTIONS(1693), 3,
+      sym_true,
+      sym_false,
+      sym_none,
+    STATE(1095), 4,
+      sym__match_pattern,
+      sym_match_as_pattern,
+      sym__match_maybe_star_pattern,
+      sym_match_star_pattern,
+    STATE(964), 8,
+      sym__closed_pattern,
+      sym_match_literal_pattern,
+      sym_match_capture_pattern,
+      sym_match_value_pattern,
+      sym_match_group_pattern,
+      sym_match_sequence_pattern,
+      sym_match_mapping_pattern,
+      sym_match_class_pattern,
+  [46571] = 19,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(608), 1,
+      sym__string_start,
+    ACTIONS(1675), 1,
+      sym_identifier,
+    ACTIONS(1677), 1,
+      anon_sym_LPAREN,
+    ACTIONS(1679), 1,
+      anon_sym_STAR,
+    ACTIONS(1681), 1,
+      anon_sym_DASH,
+    ACTIONS(1683), 1,
+      sym_match_wildcard_pattern,
+    ACTIONS(1685), 1,
+      anon_sym_LBRACK,
+    ACTIONS(1687), 1,
+      anon_sym_LBRACE,
+    ACTIONS(1689), 1,
+      sym_integer,
+    ACTIONS(1691), 1,
+      sym_float,
+    ACTIONS(1707), 1,
+      anon_sym_RPAREN,
+    STATE(902), 1,
+      sym_string,
+    STATE(969), 1,
+      sym_concatenated_string,
+    STATE(1477), 1,
+      sym_pattern_class_name,
+    STATE(992), 2,
+      sym__match_or_pattern,
+      sym_match_or_pattern,
+    ACTIONS(1693), 3,
+      sym_true,
+      sym_false,
+      sym_none,
+    STATE(1095), 4,
+      sym__match_pattern,
+      sym_match_as_pattern,
+      sym__match_maybe_star_pattern,
+      sym_match_star_pattern,
+    STATE(964), 8,
+      sym__closed_pattern,
+      sym_match_literal_pattern,
+      sym_match_capture_pattern,
+      sym_match_value_pattern,
+      sym_match_group_pattern,
+      sym_match_sequence_pattern,
+      sym_match_mapping_pattern,
+      sym_match_class_pattern,
+  [46642] = 20,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(608), 1,
+      sym__string_start,
+    ACTIONS(1677), 1,
+      anon_sym_LPAREN,
+    ACTIONS(1681), 1,
+      anon_sym_DASH,
+    ACTIONS(1683), 1,
+      sym_match_wildcard_pattern,
+    ACTIONS(1685), 1,
+      anon_sym_LBRACK,
+    ACTIONS(1687), 1,
+      anon_sym_LBRACE,
+    ACTIONS(1689), 1,
+      sym_integer,
+    ACTIONS(1691), 1,
+      sym_float,
+    ACTIONS(1709), 1,
+      sym_identifier,
+    ACTIONS(1711), 1,
+      anon_sym_RPAREN,
+    STATE(902), 1,
+      sym_string,
+    STATE(969), 1,
+      sym_concatenated_string,
+    STATE(1246), 1,
+      sym_match_keyword_pattern,
+    STATE(1261), 1,
+      sym_match_positional_pattern,
+    STATE(1477), 1,
+      sym_pattern_class_name,
+    STATE(992), 2,
+      sym__match_or_pattern,
+      sym_match_or_pattern,
+    STATE(1331), 2,
+      sym__match_pattern,
+      sym_match_as_pattern,
+    ACTIONS(1693), 3,
+      sym_true,
+      sym_false,
+      sym_none,
+    STATE(964), 8,
+      sym__closed_pattern,
+      sym_match_literal_pattern,
+      sym_match_capture_pattern,
+      sym_match_value_pattern,
+      sym_match_group_pattern,
+      sym_match_sequence_pattern,
+      sym_match_mapping_pattern,
+      sym_match_class_pattern,
+  [46714] = 20,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(608), 1,
+      sym__string_start,
+    ACTIONS(1677), 1,
+      anon_sym_LPAREN,
+    ACTIONS(1681), 1,
+      anon_sym_DASH,
+    ACTIONS(1683), 1,
+      sym_match_wildcard_pattern,
+    ACTIONS(1685), 1,
+      anon_sym_LBRACK,
+    ACTIONS(1687), 1,
+      anon_sym_LBRACE,
+    ACTIONS(1689), 1,
+      sym_integer,
+    ACTIONS(1691), 1,
+      sym_float,
+    ACTIONS(1709), 1,
+      sym_identifier,
+    ACTIONS(1713), 1,
+      anon_sym_RPAREN,
+    STATE(902), 1,
+      sym_string,
+    STATE(969), 1,
+      sym_concatenated_string,
+    STATE(1236), 1,
+      sym_match_keyword_pattern,
+    STATE(1349), 1,
+      sym_match_positional_pattern,
+    STATE(1477), 1,
+      sym_pattern_class_name,
+    STATE(992), 2,
+      sym__match_or_pattern,
+      sym_match_or_pattern,
+    STATE(1331), 2,
+      sym__match_pattern,
+      sym_match_as_pattern,
+    ACTIONS(1693), 3,
+      sym_true,
+      sym_false,
+      sym_none,
+    STATE(964), 8,
+      sym__closed_pattern,
+      sym_match_literal_pattern,
+      sym_match_capture_pattern,
+      sym_match_value_pattern,
+      sym_match_group_pattern,
+      sym_match_sequence_pattern,
+      sym_match_mapping_pattern,
+      sym_match_class_pattern,
+  [46786] = 20,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(608), 1,
+      sym__string_start,
+    ACTIONS(1677), 1,
+      anon_sym_LPAREN,
+    ACTIONS(1681), 1,
+      anon_sym_DASH,
+    ACTIONS(1683), 1,
+      sym_match_wildcard_pattern,
+    ACTIONS(1685), 1,
+      anon_sym_LBRACK,
+    ACTIONS(1687), 1,
+      anon_sym_LBRACE,
+    ACTIONS(1689), 1,
+      sym_integer,
+    ACTIONS(1691), 1,
+      sym_float,
+    ACTIONS(1709), 1,
+      sym_identifier,
+    ACTIONS(1715), 1,
+      anon_sym_RPAREN,
+    STATE(902), 1,
+      sym_string,
+    STATE(969), 1,
+      sym_concatenated_string,
+    STATE(1309), 1,
+      sym_match_keyword_pattern,
+    STATE(1349), 1,
+      sym_match_positional_pattern,
+    STATE(1477), 1,
+      sym_pattern_class_name,
+    STATE(992), 2,
+      sym__match_or_pattern,
+      sym_match_or_pattern,
+    STATE(1331), 2,
+      sym__match_pattern,
+      sym_match_as_pattern,
+    ACTIONS(1693), 3,
+      sym_true,
+      sym_false,
+      sym_none,
+    STATE(964), 8,
+      sym__closed_pattern,
+      sym_match_literal_pattern,
+      sym_match_capture_pattern,
+      sym_match_value_pattern,
+      sym_match_group_pattern,
+      sym_match_sequence_pattern,
+      sym_match_mapping_pattern,
+      sym_match_class_pattern,
+  [46858] = 18,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(608), 1,
+      sym__string_start,
+    ACTIONS(1675), 1,
+      sym_identifier,
+    ACTIONS(1677), 1,
+      anon_sym_LPAREN,
+    ACTIONS(1679), 1,
+      anon_sym_STAR,
+    ACTIONS(1681), 1,
+      anon_sym_DASH,
+    ACTIONS(1683), 1,
+      sym_match_wildcard_pattern,
+    ACTIONS(1685), 1,
+      anon_sym_LBRACK,
+    ACTIONS(1687), 1,
+      anon_sym_LBRACE,
+    ACTIONS(1689), 1,
+      sym_integer,
+    ACTIONS(1691), 1,
+      sym_float,
+    STATE(902), 1,
+      sym_string,
+    STATE(969), 1,
+      sym_concatenated_string,
+    STATE(1477), 1,
+      sym_pattern_class_name,
+    STATE(992), 2,
+      sym__match_or_pattern,
+      sym_match_or_pattern,
+    ACTIONS(1693), 3,
+      sym_true,
+      sym_false,
+      sym_none,
+    STATE(1095), 4,
+      sym__match_pattern,
+      sym_match_as_pattern,
+      sym__match_maybe_star_pattern,
+      sym_match_star_pattern,
+    STATE(964), 8,
+      sym__closed_pattern,
+      sym_match_literal_pattern,
+      sym_match_capture_pattern,
+      sym_match_value_pattern,
+      sym_match_group_pattern,
+      sym_match_sequence_pattern,
+      sym_match_mapping_pattern,
+      sym_match_class_pattern,
+  [46926] = 18,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(608), 1,
+      sym__string_start,
+    ACTIONS(1675), 1,
+      sym_identifier,
+    ACTIONS(1677), 1,
+      anon_sym_LPAREN,
+    ACTIONS(1681), 1,
+      anon_sym_DASH,
+    ACTIONS(1683), 1,
+      sym_match_wildcard_pattern,
+    ACTIONS(1685), 1,
+      anon_sym_LBRACK,
+    ACTIONS(1687), 1,
+      anon_sym_LBRACE,
+    ACTIONS(1689), 1,
+      sym_integer,
+    ACTIONS(1691), 1,
+      sym_float,
+    STATE(902), 1,
+      sym_string,
+    STATE(969), 1,
+      sym_concatenated_string,
+    STATE(1349), 1,
+      sym_match_positional_pattern,
+    STATE(1477), 1,
+      sym_pattern_class_name,
+    STATE(992), 2,
+      sym__match_or_pattern,
+      sym_match_or_pattern,
+    STATE(1331), 2,
+      sym__match_pattern,
+      sym_match_as_pattern,
+    ACTIONS(1693), 3,
+      sym_true,
+      sym_false,
+      sym_none,
+    STATE(964), 8,
+      sym__closed_pattern,
+      sym_match_literal_pattern,
+      sym_match_capture_pattern,
+      sym_match_value_pattern,
+      sym_match_group_pattern,
+      sym_match_sequence_pattern,
+      sym_match_mapping_pattern,
+      sym_match_class_pattern,
+  [46992] = 17,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(608), 1,
+      sym__string_start,
+    ACTIONS(1675), 1,
+      sym_identifier,
+    ACTIONS(1677), 1,
+      anon_sym_LPAREN,
+    ACTIONS(1681), 1,
+      anon_sym_DASH,
+    ACTIONS(1683), 1,
+      sym_match_wildcard_pattern,
+    ACTIONS(1685), 1,
+      anon_sym_LBRACK,
+    ACTIONS(1687), 1,
+      anon_sym_LBRACE,
+    ACTIONS(1689), 1,
+      sym_integer,
+    ACTIONS(1691), 1,
+      sym_float,
+    STATE(902), 1,
+      sym_string,
+    STATE(969), 1,
+      sym_concatenated_string,
+    STATE(1477), 1,
+      sym_pattern_class_name,
+    STATE(992), 2,
+      sym__match_or_pattern,
+      sym_match_or_pattern,
+    STATE(1314), 2,
+      sym__match_pattern,
+      sym_match_as_pattern,
+    ACTIONS(1693), 3,
+      sym_true,
+      sym_false,
+      sym_none,
+    STATE(964), 8,
+      sym__closed_pattern,
+      sym_match_literal_pattern,
+      sym_match_capture_pattern,
+      sym_match_value_pattern,
+      sym_match_group_pattern,
+      sym_match_sequence_pattern,
+      sym_match_mapping_pattern,
+      sym_match_class_pattern,
+  [47055] = 17,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(608), 1,
+      sym__string_start,
+    ACTIONS(1675), 1,
+      sym_identifier,
+    ACTIONS(1677), 1,
+      anon_sym_LPAREN,
+    ACTIONS(1681), 1,
+      anon_sym_DASH,
+    ACTIONS(1683), 1,
+      sym_match_wildcard_pattern,
+    ACTIONS(1685), 1,
+      anon_sym_LBRACK,
+    ACTIONS(1687), 1,
+      anon_sym_LBRACE,
+    ACTIONS(1689), 1,
+      sym_integer,
+    ACTIONS(1691), 1,
+      sym_float,
+    STATE(902), 1,
+      sym_string,
+    STATE(969), 1,
+      sym_concatenated_string,
+    STATE(1477), 1,
+      sym_pattern_class_name,
+    STATE(992), 2,
+      sym__match_or_pattern,
+      sym_match_or_pattern,
+    STATE(1318), 2,
+      sym__match_pattern,
+      sym_match_as_pattern,
+    ACTIONS(1693), 3,
+      sym_true,
+      sym_false,
+      sym_none,
+    STATE(964), 8,
+      sym__closed_pattern,
+      sym_match_literal_pattern,
+      sym_match_capture_pattern,
+      sym_match_value_pattern,
+      sym_match_group_pattern,
+      sym_match_sequence_pattern,
+      sym_match_mapping_pattern,
+      sym_match_class_pattern,
+  [47118] = 15,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(608), 1,
+      sym__string_start,
+    ACTIONS(1675), 1,
+      sym_identifier,
+    ACTIONS(1677), 1,
+      anon_sym_LPAREN,
+    ACTIONS(1681), 1,
+      anon_sym_DASH,
+    ACTIONS(1685), 1,
+      anon_sym_LBRACK,
+    ACTIONS(1687), 1,
+      anon_sym_LBRACE,
+    ACTIONS(1689), 1,
+      sym_integer,
+    ACTIONS(1691), 1,
+      sym_float,
+    ACTIONS(1717), 1,
+      sym_match_wildcard_pattern,
+    STATE(902), 1,
+      sym_string,
+    STATE(969), 1,
+      sym_concatenated_string,
+    STATE(1477), 1,
+      sym_pattern_class_name,
+    ACTIONS(1693), 3,
+      sym_true,
+      sym_false,
+      sym_none,
+    STATE(944), 8,
+      sym__closed_pattern,
+      sym_match_literal_pattern,
+      sym_match_capture_pattern,
+      sym_match_value_pattern,
+      sym_match_group_pattern,
+      sym_match_sequence_pattern,
+      sym_match_mapping_pattern,
+      sym_match_class_pattern,
+  [47173] = 15,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(608), 1,
+      sym__string_start,
+    ACTIONS(1675), 1,
+      sym_identifier,
+    ACTIONS(1677), 1,
+      anon_sym_LPAREN,
+    ACTIONS(1681), 1,
+      anon_sym_DASH,
+    ACTIONS(1685), 1,
+      anon_sym_LBRACK,
+    ACTIONS(1687), 1,
+      anon_sym_LBRACE,
+    ACTIONS(1689), 1,
+      sym_integer,
+    ACTIONS(1691), 1,
+      sym_float,
+    ACTIONS(1719), 1,
+      sym_match_wildcard_pattern,
+    STATE(902), 1,
+      sym_string,
+    STATE(969), 1,
+      sym_concatenated_string,
+    STATE(1477), 1,
+      sym_pattern_class_name,
+    ACTIONS(1693), 3,
+      sym_true,
+      sym_false,
+      sym_none,
+    STATE(948), 8,
+      sym__closed_pattern,
+      sym_match_literal_pattern,
+      sym_match_capture_pattern,
+      sym_match_value_pattern,
+      sym_match_group_pattern,
+      sym_match_sequence_pattern,
+      sym_match_mapping_pattern,
+      sym_match_class_pattern,
+  [47228] = 8,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1723), 1,
+      anon_sym_as,
+    ACTIONS(1728), 1,
+      anon_sym_not,
+    ACTIONS(1734), 1,
       anon_sym_is,
-    STATE(883), 1,
+    STATE(850), 1,
       aux_sym_comparison_operator_repeat1,
-    ACTIONS(1673), 2,
+    ACTIONS(1731), 2,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1655), 6,
+    ACTIONS(1725), 6,
       anon_sym_in,
       anon_sym_LT_EQ,
       anon_sym_EQ_EQ,
       anon_sym_BANG_EQ,
       anon_sym_GT_EQ,
       anon_sym_LT_GT,
-    ACTIONS(1755), 7,
+    ACTIONS(1721), 10,
+      anon_sym_RPAREN,
+      anon_sym_COMMA,
+      anon_sym_if,
+      anon_sym_COLON,
+      anon_sym_async,
+      anon_sym_for,
+      anon_sym_RBRACK,
+      anon_sym_RBRACE,
+      anon_sym_and,
+      anon_sym_or,
+  [47268] = 8,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1535), 1,
+      anon_sym_not,
+    ACTIONS(1543), 1,
+      anon_sym_is,
+    ACTIONS(1739), 1,
+      anon_sym_EQ,
+    STATE(853), 1,
+      aux_sym_comparison_operator_repeat1,
+    ACTIONS(1541), 2,
+      anon_sym_LT,
+      anon_sym_GT,
+    ACTIONS(1525), 6,
+      anon_sym_in,
+      anon_sym_LT_EQ,
+      anon_sym_EQ_EQ,
+      anon_sym_BANG_EQ,
+      anon_sym_GT_EQ,
+      anon_sym_LT_GT,
+    ACTIONS(1737), 10,
+      anon_sym_RPAREN,
+      anon_sym_COMMA,
+      anon_sym_if,
+      anon_sym_COLON,
+      anon_sym_else,
+      anon_sym_RBRACK,
+      anon_sym_RBRACE,
+      anon_sym_and,
+      anon_sym_or,
+      sym_type_conversion,
+  [47308] = 8,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1431), 1,
+      anon_sym_not,
+    ACTIONS(1439), 1,
+      anon_sym_is,
+    ACTIONS(1739), 1,
+      anon_sym_as,
+    STATE(850), 1,
+      aux_sym_comparison_operator_repeat1,
+    ACTIONS(1437), 2,
+      anon_sym_LT,
+      anon_sym_GT,
+    ACTIONS(1419), 6,
+      anon_sym_in,
+      anon_sym_LT_EQ,
+      anon_sym_EQ_EQ,
+      anon_sym_BANG_EQ,
+      anon_sym_GT_EQ,
+      anon_sym_LT_GT,
+    ACTIONS(1737), 10,
+      anon_sym_RPAREN,
+      anon_sym_COMMA,
+      anon_sym_if,
+      anon_sym_COLON,
+      anon_sym_async,
+      anon_sym_for,
+      anon_sym_RBRACK,
+      anon_sym_RBRACE,
+      anon_sym_and,
+      anon_sym_or,
+  [47348] = 8,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1723), 1,
+      anon_sym_EQ,
+    ACTIONS(1744), 1,
+      anon_sym_not,
+    ACTIONS(1750), 1,
+      anon_sym_is,
+    STATE(853), 1,
+      aux_sym_comparison_operator_repeat1,
+    ACTIONS(1747), 2,
+      anon_sym_LT,
+      anon_sym_GT,
+    ACTIONS(1741), 6,
+      anon_sym_in,
+      anon_sym_LT_EQ,
+      anon_sym_EQ_EQ,
+      anon_sym_BANG_EQ,
+      anon_sym_GT_EQ,
+      anon_sym_LT_GT,
+    ACTIONS(1721), 10,
+      anon_sym_RPAREN,
+      anon_sym_COMMA,
+      anon_sym_if,
+      anon_sym_COLON,
+      anon_sym_else,
+      anon_sym_RBRACK,
+      anon_sym_RBRACE,
+      anon_sym_and,
+      anon_sym_or,
+      sym_type_conversion,
+  [47388] = 4,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1755), 1,
+      anon_sym_COMMA,
+    STATE(854), 1,
+      aux_sym__patterns_repeat1,
+    ACTIONS(1753), 18,
+      anon_sym_RPAREN,
+      anon_sym_COLON,
+      anon_sym_in,
+      anon_sym_RBRACK,
+      anon_sym_EQ,
+      anon_sym_PLUS_EQ,
+      anon_sym_DASH_EQ,
+      anon_sym_STAR_EQ,
+      anon_sym_SLASH_EQ,
+      anon_sym_AT_EQ,
+      anon_sym_SLASH_SLASH_EQ,
+      anon_sym_PERCENT_EQ,
+      anon_sym_STAR_STAR_EQ,
+      anon_sym_GT_GT_EQ,
+      anon_sym_LT_LT_EQ,
+      anon_sym_AMP_EQ,
+      anon_sym_CARET_EQ,
+      anon_sym_PIPE_EQ,
+  [47418] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1758), 19,
+      anon_sym_RPAREN,
+      anon_sym_COMMA,
+      anon_sym_COLON,
+      anon_sym_in,
+      anon_sym_RBRACK,
+      anon_sym_EQ,
+      anon_sym_PLUS_EQ,
+      anon_sym_DASH_EQ,
+      anon_sym_STAR_EQ,
+      anon_sym_SLASH_EQ,
+      anon_sym_AT_EQ,
+      anon_sym_SLASH_SLASH_EQ,
+      anon_sym_PERCENT_EQ,
+      anon_sym_STAR_STAR_EQ,
+      anon_sym_GT_GT_EQ,
+      anon_sym_LT_LT_EQ,
+      anon_sym_AMP_EQ,
+      anon_sym_CARET_EQ,
+      anon_sym_PIPE_EQ,
+  [47443] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1760), 19,
+      anon_sym_RPAREN,
+      anon_sym_COMMA,
+      anon_sym_COLON,
+      anon_sym_in,
+      anon_sym_RBRACK,
+      anon_sym_EQ,
+      anon_sym_PLUS_EQ,
+      anon_sym_DASH_EQ,
+      anon_sym_STAR_EQ,
+      anon_sym_SLASH_EQ,
+      anon_sym_AT_EQ,
+      anon_sym_SLASH_SLASH_EQ,
+      anon_sym_PERCENT_EQ,
+      anon_sym_STAR_STAR_EQ,
+      anon_sym_GT_GT_EQ,
+      anon_sym_LT_LT_EQ,
+      anon_sym_AMP_EQ,
+      anon_sym_CARET_EQ,
+      anon_sym_PIPE_EQ,
+  [47468] = 8,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1628), 1,
+      anon_sym_not,
+    ACTIONS(1636), 1,
+      anon_sym_is,
+    ACTIONS(1739), 1,
+      anon_sym_EQ,
+    STATE(858), 1,
+      aux_sym_comparison_operator_repeat1,
+    ACTIONS(1634), 2,
+      anon_sym_LT,
+      anon_sym_GT,
+    ACTIONS(1616), 6,
+      anon_sym_in,
+      anon_sym_LT_EQ,
+      anon_sym_EQ_EQ,
+      anon_sym_BANG_EQ,
+      anon_sym_GT_EQ,
+      anon_sym_LT_GT,
+    ACTIONS(1737), 7,
+      sym__newline,
+      anon_sym_from,
+      anon_sym_COMMA,
+      anon_sym_if,
+      anon_sym_and,
+      anon_sym_or,
+      sym__semicolon,
+  [47505] = 8,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1723), 1,
+      anon_sym_EQ,
+    ACTIONS(1765), 1,
+      anon_sym_not,
+    ACTIONS(1771), 1,
+      anon_sym_is,
+    STATE(858), 1,
+      aux_sym_comparison_operator_repeat1,
+    ACTIONS(1768), 2,
+      anon_sym_LT,
+      anon_sym_GT,
+    ACTIONS(1762), 6,
+      anon_sym_in,
+      anon_sym_LT_EQ,
+      anon_sym_EQ_EQ,
+      anon_sym_BANG_EQ,
+      anon_sym_GT_EQ,
+      anon_sym_LT_GT,
+    ACTIONS(1721), 7,
+      sym__newline,
+      anon_sym_from,
+      anon_sym_COMMA,
+      anon_sym_if,
+      anon_sym_and,
+      anon_sym_or,
+      sym__semicolon,
+  [47542] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1774), 19,
+      anon_sym_RPAREN,
+      anon_sym_COMMA,
+      anon_sym_COLON,
+      anon_sym_in,
+      anon_sym_RBRACK,
+      anon_sym_EQ,
+      anon_sym_PLUS_EQ,
+      anon_sym_DASH_EQ,
+      anon_sym_STAR_EQ,
+      anon_sym_SLASH_EQ,
+      anon_sym_AT_EQ,
+      anon_sym_SLASH_SLASH_EQ,
+      anon_sym_PERCENT_EQ,
+      anon_sym_STAR_STAR_EQ,
+      anon_sym_GT_GT_EQ,
+      anon_sym_LT_LT_EQ,
+      anon_sym_AMP_EQ,
+      anon_sym_CARET_EQ,
+      anon_sym_PIPE_EQ,
+  [47567] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1085), 19,
+      anon_sym_RPAREN,
+      anon_sym_COMMA,
+      anon_sym_COLON,
+      anon_sym_in,
+      anon_sym_RBRACK,
+      anon_sym_EQ,
+      anon_sym_PLUS_EQ,
+      anon_sym_DASH_EQ,
+      anon_sym_STAR_EQ,
+      anon_sym_SLASH_EQ,
+      anon_sym_AT_EQ,
+      anon_sym_SLASH_SLASH_EQ,
+      anon_sym_PERCENT_EQ,
+      anon_sym_STAR_STAR_EQ,
+      anon_sym_GT_GT_EQ,
+      anon_sym_LT_LT_EQ,
+      anon_sym_AMP_EQ,
+      anon_sym_CARET_EQ,
+      anon_sym_PIPE_EQ,
+  [47592] = 4,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(260), 2,
+      anon_sym_STAR,
+      anon_sym_SLASH,
+    ACTIONS(816), 3,
+      anon_sym_RPAREN,
+      anon_sym_COMMA,
+      anon_sym_COLON,
+    ACTIONS(287), 14,
+      anon_sym_DOT,
+      anon_sym_LPAREN,
+      anon_sym_GT_GT,
+      anon_sym_PIPE,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_PERCENT,
+      anon_sym_SLASH_SLASH,
+      anon_sym_AMP,
+      anon_sym_CARET,
+      anon_sym_LT_LT,
+  [47621] = 4,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1079), 2,
+      anon_sym_STAR,
+      anon_sym_SLASH,
+    ACTIONS(1776), 3,
+      anon_sym_RPAREN,
+      anon_sym_COMMA,
+      anon_sym_COLON,
+    ACTIONS(1074), 14,
+      anon_sym_DOT,
+      anon_sym_LPAREN,
+      anon_sym_GT_GT,
+      anon_sym_PIPE,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_PERCENT,
+      anon_sym_SLASH_SLASH,
+      anon_sym_AMP,
+      anon_sym_CARET,
+      anon_sym_LT_LT,
+  [47650] = 4,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1778), 1,
+      anon_sym_COMMA,
+    STATE(854), 1,
+      aux_sym__patterns_repeat1,
+    ACTIONS(1780), 16,
+      anon_sym_COLON,
+      anon_sym_in,
+      anon_sym_EQ,
+      anon_sym_PLUS_EQ,
+      anon_sym_DASH_EQ,
+      anon_sym_STAR_EQ,
+      anon_sym_SLASH_EQ,
+      anon_sym_AT_EQ,
+      anon_sym_SLASH_SLASH_EQ,
+      anon_sym_PERCENT_EQ,
+      anon_sym_STAR_STAR_EQ,
+      anon_sym_GT_GT_EQ,
+      anon_sym_LT_LT_EQ,
+      anon_sym_AMP_EQ,
+      anon_sym_CARET_EQ,
+      anon_sym_PIPE_EQ,
+  [47678] = 7,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1661), 1,
+      anon_sym_not,
+    ACTIONS(1669), 1,
+      anon_sym_is,
+    STATE(866), 1,
+      aux_sym_comparison_operator_repeat1,
+    ACTIONS(1667), 2,
+      anon_sym_LT,
+      anon_sym_GT,
+    ACTIONS(1649), 6,
+      anon_sym_in,
+      anon_sym_LT_EQ,
+      anon_sym_EQ_EQ,
+      anon_sym_BANG_EQ,
+      anon_sym_GT_EQ,
+      anon_sym_LT_GT,
+    ACTIONS(1737), 7,
       anon_sym_RPAREN,
       anon_sym_COMMA,
       anon_sym_as,
@@ -66629,59 +62835,59 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_COLON,
       anon_sym_and,
       anon_sym_or,
-  [47903] = 13,
+  [47712] = 13,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1475), 1,
+    ACTIONS(1407), 1,
       anon_sym_DOT,
-    ACTIONS(1477), 1,
+    ACTIONS(1409), 1,
       anon_sym_LPAREN,
-    ACTIONS(1487), 1,
-      anon_sym_PIPE,
-    ACTIONS(1491), 1,
+    ACTIONS(1425), 1,
       anon_sym_LBRACK,
-    ACTIONS(1493), 1,
+    ACTIONS(1527), 1,
+      anon_sym_PIPE,
+    ACTIONS(1531), 1,
       anon_sym_STAR_STAR,
-    ACTIONS(1501), 1,
+    ACTIONS(1537), 1,
       anon_sym_AMP,
-    ACTIONS(1503), 1,
+    ACTIONS(1539), 1,
       anon_sym_CARET,
-    ACTIONS(1481), 2,
+    ACTIONS(1521), 2,
       anon_sym_STAR,
       anon_sym_SLASH,
-    ACTIONS(1483), 2,
+    ACTIONS(1523), 2,
       anon_sym_GT_GT,
       anon_sym_LT_LT,
-    ACTIONS(1489), 2,
+    ACTIONS(1529), 2,
       anon_sym_DASH,
       anon_sym_PLUS,
-    STATE(633), 2,
+    STATE(619), 2,
       sym_argument_list,
       sym_generator_expression,
-    ACTIONS(1497), 3,
+    ACTIONS(1533), 3,
       anon_sym_AT,
       anon_sym_PERCENT,
       anon_sym_SLASH_SLASH,
-  [47949] = 7,
+  [47758] = 7,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1789), 1,
+    ACTIONS(1785), 1,
       anon_sym_not,
-    ACTIONS(1795), 1,
+    ACTIONS(1791), 1,
       anon_sym_is,
-    STATE(883), 1,
+    STATE(866), 1,
       aux_sym_comparison_operator_repeat1,
-    ACTIONS(1792), 2,
+    ACTIONS(1788), 2,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1786), 6,
+    ACTIONS(1782), 6,
       anon_sym_in,
       anon_sym_LT_EQ,
       anon_sym_EQ_EQ,
       anon_sym_BANG_EQ,
       anon_sym_GT_EQ,
       anon_sym_LT_GT,
-    ACTIONS(1727), 7,
+    ACTIONS(1721), 7,
       anon_sym_RPAREN,
       anon_sym_COMMA,
       anon_sym_as,
@@ -66689,166 +62895,142 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_COLON,
       anon_sym_and,
       anon_sym_or,
-  [47983] = 4,
+  [47792] = 12,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1798), 1,
-      anon_sym_COMMA,
-    STATE(872), 1,
-      aux_sym__patterns_repeat1,
-    ACTIONS(1800), 16,
-      anon_sym_COLON,
-      anon_sym_in,
-      anon_sym_EQ,
-      anon_sym_PLUS_EQ,
-      anon_sym_DASH_EQ,
-      anon_sym_STAR_EQ,
-      anon_sym_SLASH_EQ,
-      anon_sym_AT_EQ,
-      anon_sym_SLASH_SLASH_EQ,
-      anon_sym_PERCENT_EQ,
-      anon_sym_STAR_STAR_EQ,
-      anon_sym_GT_GT_EQ,
-      anon_sym_LT_LT_EQ,
-      anon_sym_AMP_EQ,
-      anon_sym_CARET_EQ,
-      anon_sym_PIPE_EQ,
-  [48011] = 12,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1802), 1,
+    ACTIONS(1794), 1,
       sym_identifier,
-    ACTIONS(1804), 1,
+    ACTIONS(1796), 1,
       anon_sym_LPAREN,
-    ACTIONS(1806), 1,
+    ACTIONS(1798), 1,
       anon_sym_STAR,
+    ACTIONS(1800), 1,
+      anon_sym_COLON,
+    ACTIONS(1802), 1,
+      anon_sym_STAR_STAR,
+    ACTIONS(1804), 1,
+      anon_sym_SLASH,
+    STATE(1258), 1,
+      sym_parameter,
+    STATE(1406), 1,
+      sym_lambda_parameters,
+    STATE(1407), 1,
+      sym__parameters,
+    STATE(1340), 2,
+      sym_list_splat_pattern,
+      sym_dictionary_splat_pattern,
+    STATE(1259), 6,
+      sym_tuple_pattern,
+      sym_default_parameter,
+      sym_typed_default_parameter,
+      sym_typed_parameter,
+      sym_positional_separator,
+      sym_keyword_separator,
+  [47835] = 12,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1794), 1,
+      sym_identifier,
+    ACTIONS(1796), 1,
+      anon_sym_LPAREN,
+    ACTIONS(1798), 1,
+      anon_sym_STAR,
+    ACTIONS(1802), 1,
+      anon_sym_STAR_STAR,
+    ACTIONS(1804), 1,
+      anon_sym_SLASH,
+    ACTIONS(1806), 1,
+      anon_sym_COLON,
+    STATE(1258), 1,
+      sym_parameter,
+    STATE(1407), 1,
+      sym__parameters,
+    STATE(1421), 1,
+      sym_lambda_parameters,
+    STATE(1340), 2,
+      sym_list_splat_pattern,
+      sym_dictionary_splat_pattern,
+    STATE(1259), 6,
+      sym_tuple_pattern,
+      sym_default_parameter,
+      sym_typed_default_parameter,
+      sym_typed_parameter,
+      sym_positional_separator,
+      sym_keyword_separator,
+  [47878] = 12,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1794), 1,
+      sym_identifier,
+    ACTIONS(1796), 1,
+      anon_sym_LPAREN,
+    ACTIONS(1798), 1,
+      anon_sym_STAR,
+    ACTIONS(1802), 1,
+      anon_sym_STAR_STAR,
+    ACTIONS(1804), 1,
+      anon_sym_SLASH,
     ACTIONS(1808), 1,
       anon_sym_COLON,
-    ACTIONS(1810), 1,
-      anon_sym_STAR_STAR,
-    ACTIONS(1812), 1,
-      anon_sym_SLASH,
-    STATE(1334), 1,
+    STATE(1258), 1,
       sym_parameter,
-    STATE(1453), 1,
-      sym_lambda_parameters,
-    STATE(1521), 1,
+    STATE(1407), 1,
       sym__parameters,
-    STATE(1347), 2,
+    STATE(1466), 1,
+      sym_lambda_parameters,
+    STATE(1340), 2,
       sym_list_splat_pattern,
       sym_dictionary_splat_pattern,
-    STATE(1333), 6,
+    STATE(1259), 6,
       sym_tuple_pattern,
       sym_default_parameter,
       sym_typed_default_parameter,
       sym_typed_parameter,
       sym_positional_separator,
       sym_keyword_separator,
-  [48054] = 12,
+  [47921] = 12,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1802), 1,
+    ACTIONS(1794), 1,
       sym_identifier,
-    ACTIONS(1804), 1,
+    ACTIONS(1796), 1,
       anon_sym_LPAREN,
-    ACTIONS(1806), 1,
+    ACTIONS(1798), 1,
       anon_sym_STAR,
-    ACTIONS(1810), 1,
+    ACTIONS(1802), 1,
       anon_sym_STAR_STAR,
-    ACTIONS(1812), 1,
+    ACTIONS(1804), 1,
       anon_sym_SLASH,
+    ACTIONS(1810), 1,
+      anon_sym_COLON,
+    STATE(1258), 1,
+      sym_parameter,
+    STATE(1407), 1,
+      sym__parameters,
+    STATE(1419), 1,
+      sym_lambda_parameters,
+    STATE(1340), 2,
+      sym_list_splat_pattern,
+      sym_dictionary_splat_pattern,
+    STATE(1259), 6,
+      sym_tuple_pattern,
+      sym_default_parameter,
+      sym_typed_default_parameter,
+      sym_typed_parameter,
+      sym_positional_separator,
+      sym_keyword_separator,
+  [47964] = 6,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1812), 1,
+      anon_sym_COMMA,
     ACTIONS(1814), 1,
       anon_sym_COLON,
-    STATE(1334), 1,
-      sym_parameter,
-    STATE(1458), 1,
-      sym_lambda_parameters,
-    STATE(1521), 1,
-      sym__parameters,
-    STATE(1347), 2,
-      sym_list_splat_pattern,
-      sym_dictionary_splat_pattern,
-    STATE(1333), 6,
-      sym_tuple_pattern,
-      sym_default_parameter,
-      sym_typed_default_parameter,
-      sym_typed_parameter,
-      sym_positional_separator,
-      sym_keyword_separator,
-  [48097] = 12,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1802), 1,
-      sym_identifier,
-    ACTIONS(1804), 1,
-      anon_sym_LPAREN,
-    ACTIONS(1806), 1,
-      anon_sym_STAR,
-    ACTIONS(1810), 1,
-      anon_sym_STAR_STAR,
-    ACTIONS(1812), 1,
-      anon_sym_SLASH,
     ACTIONS(1816), 1,
-      anon_sym_COLON,
-    STATE(1334), 1,
-      sym_parameter,
-    STATE(1413), 1,
-      sym_lambda_parameters,
-    STATE(1521), 1,
-      sym__parameters,
-    STATE(1347), 2,
-      sym_list_splat_pattern,
-      sym_dictionary_splat_pattern,
-    STATE(1333), 6,
-      sym_tuple_pattern,
-      sym_default_parameter,
-      sym_typed_default_parameter,
-      sym_typed_parameter,
-      sym_positional_separator,
-      sym_keyword_separator,
-  [48140] = 12,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1802), 1,
-      sym_identifier,
-    ACTIONS(1804), 1,
-      anon_sym_LPAREN,
-    ACTIONS(1806), 1,
-      anon_sym_STAR,
-    ACTIONS(1810), 1,
-      anon_sym_STAR_STAR,
-    ACTIONS(1812), 1,
-      anon_sym_SLASH,
-    ACTIONS(1818), 1,
-      anon_sym_COLON,
-    STATE(1334), 1,
-      sym_parameter,
-    STATE(1427), 1,
-      sym_lambda_parameters,
-    STATE(1521), 1,
-      sym__parameters,
-    STATE(1347), 2,
-      sym_list_splat_pattern,
-      sym_dictionary_splat_pattern,
-    STATE(1333), 6,
-      sym_tuple_pattern,
-      sym_default_parameter,
-      sym_typed_default_parameter,
-      sym_typed_parameter,
-      sym_positional_separator,
-      sym_keyword_separator,
-  [48183] = 6,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1820), 1,
-      anon_sym_COMMA,
-    ACTIONS(1822), 1,
-      anon_sym_COLON,
-    ACTIONS(1824), 1,
       anon_sym_EQ,
-    STATE(884), 1,
+    STATE(863), 1,
       aux_sym__patterns_repeat1,
-    ACTIONS(1826), 13,
+    ACTIONS(1818), 13,
       anon_sym_PLUS_EQ,
       anon_sym_DASH_EQ,
       anon_sym_STAR_EQ,
@@ -66862,224 +63044,251 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_AMP_EQ,
       anon_sym_CARET_EQ,
       anon_sym_PIPE_EQ,
-  [48214] = 12,
+  [47995] = 12,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1802), 1,
+    ACTIONS(1794), 1,
       sym_identifier,
-    ACTIONS(1804), 1,
+    ACTIONS(1796), 1,
       anon_sym_LPAREN,
-    ACTIONS(1806), 1,
+    ACTIONS(1798), 1,
       anon_sym_STAR,
-    ACTIONS(1810), 1,
+    ACTIONS(1802), 1,
       anon_sym_STAR_STAR,
-    ACTIONS(1812), 1,
+    ACTIONS(1804), 1,
+      anon_sym_SLASH,
+    ACTIONS(1820), 1,
+      anon_sym_COLON,
+    STATE(1258), 1,
+      sym_parameter,
+    STATE(1388), 1,
+      sym_lambda_parameters,
+    STATE(1407), 1,
+      sym__parameters,
+    STATE(1340), 2,
+      sym_list_splat_pattern,
+      sym_dictionary_splat_pattern,
+    STATE(1259), 6,
+      sym_tuple_pattern,
+      sym_default_parameter,
+      sym_typed_default_parameter,
+      sym_typed_parameter,
+      sym_positional_separator,
+      sym_keyword_separator,
+  [48038] = 14,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(299), 1,
+      sym__string_start,
+    ACTIONS(1681), 1,
+      anon_sym_DASH,
+    ACTIONS(1689), 1,
+      sym_integer,
+    ACTIONS(1691), 1,
+      sym_float,
+    ACTIONS(1822), 1,
+      sym_identifier,
+    ACTIONS(1824), 1,
+      anon_sym_RBRACE,
+    ACTIONS(1826), 1,
+      anon_sym_STAR_STAR,
+    STATE(969), 1,
+      sym_concatenated_string,
+    STATE(1139), 1,
+      sym_string,
+    STATE(1248), 1,
+      sym_match_key_value_pattern,
+    STATE(1381), 1,
+      sym_match_double_star_pattern,
+    STATE(1399), 2,
+      sym_match_literal_pattern,
+      sym_match_value_pattern,
+    ACTIONS(1693), 3,
+      sym_true,
+      sym_false,
+      sym_none,
+  [48084] = 11,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1796), 1,
+      anon_sym_LPAREN,
+    ACTIONS(1798), 1,
+      anon_sym_STAR,
+    ACTIONS(1802), 1,
+      anon_sym_STAR_STAR,
+    ACTIONS(1804), 1,
       anon_sym_SLASH,
     ACTIONS(1828), 1,
-      anon_sym_COLON,
-    STATE(1334), 1,
+      sym_identifier,
+    ACTIONS(1830), 1,
+      anon_sym_RPAREN,
+    STATE(1226), 1,
       sym_parameter,
-    STATE(1521), 1,
+    STATE(1483), 1,
       sym__parameters,
-    STATE(1524), 1,
-      sym_lambda_parameters,
-    STATE(1347), 2,
+    STATE(1187), 2,
       sym_list_splat_pattern,
       sym_dictionary_splat_pattern,
-    STATE(1333), 6,
+    STATE(1259), 6,
       sym_tuple_pattern,
       sym_default_parameter,
       sym_typed_default_parameter,
       sym_typed_parameter,
       sym_positional_separator,
       sym_keyword_separator,
-  [48257] = 14,
+  [48124] = 14,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(315), 1,
+    ACTIONS(299), 1,
       sym__string_start,
-    ACTIONS(1687), 1,
+    ACTIONS(1681), 1,
       anon_sym_DASH,
-    ACTIONS(1695), 1,
+    ACTIONS(1689), 1,
       sym_integer,
-    ACTIONS(1697), 1,
+    ACTIONS(1691), 1,
       sym_float,
-    ACTIONS(1830), 1,
+    ACTIONS(1822), 1,
       sym_identifier,
+    ACTIONS(1826), 1,
+      anon_sym_STAR_STAR,
     ACTIONS(1832), 1,
       anon_sym_RBRACE,
-    ACTIONS(1834), 1,
-      anon_sym_STAR_STAR,
-    STATE(975), 1,
+    STATE(969), 1,
       sym_concatenated_string,
-    STATE(1168), 1,
+    STATE(1139), 1,
       sym_string,
-    STATE(1359), 1,
+    STATE(1358), 1,
       sym_match_double_star_pattern,
-    STATE(1362), 1,
+    STATE(1361), 1,
       sym_match_key_value_pattern,
-    STATE(1486), 2,
+    STATE(1399), 2,
       sym_match_literal_pattern,
       sym_match_value_pattern,
-    ACTIONS(1699), 3,
+    ACTIONS(1693), 3,
       sym_true,
       sym_false,
       sym_none,
-  [48303] = 14,
+  [48170] = 14,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(315), 1,
+    ACTIONS(299), 1,
       sym__string_start,
-    ACTIONS(1687), 1,
+    ACTIONS(1681), 1,
       anon_sym_DASH,
-    ACTIONS(1695), 1,
+    ACTIONS(1689), 1,
       sym_integer,
-    ACTIONS(1697), 1,
+    ACTIONS(1691), 1,
       sym_float,
-    ACTIONS(1830), 1,
-      sym_identifier,
-    ACTIONS(1834), 1,
-      anon_sym_STAR_STAR,
-    ACTIONS(1836), 1,
-      anon_sym_RBRACE,
-    STATE(975), 1,
-      sym_concatenated_string,
-    STATE(1168), 1,
-      sym_string,
-    STATE(1218), 1,
-      sym_match_key_value_pattern,
-    STATE(1368), 1,
-      sym_match_double_star_pattern,
-    STATE(1486), 2,
-      sym_match_literal_pattern,
-      sym_match_value_pattern,
-    ACTIONS(1699), 3,
-      sym_true,
-      sym_false,
-      sym_none,
-  [48349] = 11,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1804), 1,
-      anon_sym_LPAREN,
-    ACTIONS(1806), 1,
-      anon_sym_STAR,
-    ACTIONS(1810), 1,
-      anon_sym_STAR_STAR,
-    ACTIONS(1812), 1,
-      anon_sym_SLASH,
-    ACTIONS(1838), 1,
-      sym_identifier,
-    ACTIONS(1840), 1,
-      anon_sym_RPAREN,
-    STATE(1229), 1,
-      sym_parameter,
-    STATE(1455), 1,
-      sym__parameters,
-    STATE(1267), 2,
-      sym_list_splat_pattern,
-      sym_dictionary_splat_pattern,
-    STATE(1333), 6,
-      sym_tuple_pattern,
-      sym_default_parameter,
-      sym_typed_default_parameter,
-      sym_typed_parameter,
-      sym_positional_separator,
-      sym_keyword_separator,
-  [48389] = 14,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(315), 1,
-      sym__string_start,
-    ACTIONS(1687), 1,
-      anon_sym_DASH,
-    ACTIONS(1695), 1,
-      sym_integer,
-    ACTIONS(1697), 1,
-      sym_float,
-    ACTIONS(1830), 1,
-      sym_identifier,
-    ACTIONS(1834), 1,
-      anon_sym_STAR_STAR,
-    ACTIONS(1842), 1,
-      anon_sym_RBRACE,
-    STATE(975), 1,
-      sym_concatenated_string,
-    STATE(1168), 1,
-      sym_string,
-    STATE(1362), 1,
-      sym_match_key_value_pattern,
-    STATE(1401), 1,
-      sym_match_double_star_pattern,
-    STATE(1486), 2,
-      sym_match_literal_pattern,
-      sym_match_value_pattern,
-    ACTIONS(1699), 3,
-      sym_true,
-      sym_false,
-      sym_none,
-  [48435] = 10,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1804), 1,
-      anon_sym_LPAREN,
-    ACTIONS(1806), 1,
-      anon_sym_STAR,
-    ACTIONS(1810), 1,
-      anon_sym_STAR_STAR,
-    ACTIONS(1812), 1,
-      anon_sym_SLASH,
-    ACTIONS(1838), 1,
-      sym_identifier,
-    ACTIONS(1844), 1,
-      anon_sym_RPAREN,
-    STATE(1201), 1,
-      sym_parameter,
-    STATE(1267), 2,
-      sym_list_splat_pattern,
-      sym_dictionary_splat_pattern,
-    STATE(1333), 6,
-      sym_tuple_pattern,
-      sym_default_parameter,
-      sym_typed_default_parameter,
-      sym_typed_parameter,
-      sym_positional_separator,
-      sym_keyword_separator,
-  [48472] = 10,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1802), 1,
-      sym_identifier,
-    ACTIONS(1804), 1,
-      anon_sym_LPAREN,
-    ACTIONS(1806), 1,
-      anon_sym_STAR,
-    ACTIONS(1810), 1,
-      anon_sym_STAR_STAR,
-    ACTIONS(1812), 1,
-      anon_sym_SLASH,
-    ACTIONS(1846), 1,
-      anon_sym_COLON,
-    STATE(1201), 1,
-      sym_parameter,
-    STATE(1347), 2,
-      sym_list_splat_pattern,
-      sym_dictionary_splat_pattern,
-    STATE(1333), 6,
-      sym_tuple_pattern,
-      sym_default_parameter,
-      sym_typed_default_parameter,
-      sym_typed_parameter,
-      sym_positional_separator,
-      sym_keyword_separator,
-  [48509] = 4,
-    ACTIONS(3), 1,
-      sym_comment,
     ACTIONS(1822), 1,
+      sym_identifier,
+    ACTIONS(1826), 1,
+      anon_sym_STAR_STAR,
+    ACTIONS(1834), 1,
+      anon_sym_RBRACE,
+    STATE(969), 1,
+      sym_concatenated_string,
+    STATE(1139), 1,
+      sym_string,
+    STATE(1337), 1,
+      sym_match_double_star_pattern,
+    STATE(1361), 1,
+      sym_match_key_value_pattern,
+    STATE(1399), 2,
+      sym_match_literal_pattern,
+      sym_match_value_pattern,
+    ACTIONS(1693), 3,
+      sym_true,
+      sym_false,
+      sym_none,
+  [48216] = 10,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1794), 1,
+      sym_identifier,
+    ACTIONS(1796), 1,
+      anon_sym_LPAREN,
+    ACTIONS(1798), 1,
+      anon_sym_STAR,
+    ACTIONS(1802), 1,
+      anon_sym_STAR_STAR,
+    ACTIONS(1804), 1,
+      anon_sym_SLASH,
+    ACTIONS(1836), 1,
       anon_sym_COLON,
-    ACTIONS(1824), 1,
+    STATE(1305), 1,
+      sym_parameter,
+    STATE(1340), 2,
+      sym_list_splat_pattern,
+      sym_dictionary_splat_pattern,
+    STATE(1259), 6,
+      sym_tuple_pattern,
+      sym_default_parameter,
+      sym_typed_default_parameter,
+      sym_typed_parameter,
+      sym_positional_separator,
+      sym_keyword_separator,
+  [48253] = 10,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1796), 1,
+      anon_sym_LPAREN,
+    ACTIONS(1798), 1,
+      anon_sym_STAR,
+    ACTIONS(1802), 1,
+      anon_sym_STAR_STAR,
+    ACTIONS(1804), 1,
+      anon_sym_SLASH,
+    ACTIONS(1828), 1,
+      sym_identifier,
+    ACTIONS(1836), 1,
+      anon_sym_RPAREN,
+    STATE(1305), 1,
+      sym_parameter,
+    STATE(1187), 2,
+      sym_list_splat_pattern,
+      sym_dictionary_splat_pattern,
+    STATE(1259), 6,
+      sym_tuple_pattern,
+      sym_default_parameter,
+      sym_typed_default_parameter,
+      sym_typed_parameter,
+      sym_positional_separator,
+      sym_keyword_separator,
+  [48290] = 10,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1794), 1,
+      sym_identifier,
+    ACTIONS(1796), 1,
+      anon_sym_LPAREN,
+    ACTIONS(1798), 1,
+      anon_sym_STAR,
+    ACTIONS(1802), 1,
+      anon_sym_STAR_STAR,
+    ACTIONS(1804), 1,
+      anon_sym_SLASH,
+    ACTIONS(1838), 1,
+      anon_sym_COLON,
+    STATE(1305), 1,
+      sym_parameter,
+    STATE(1340), 2,
+      sym_list_splat_pattern,
+      sym_dictionary_splat_pattern,
+    STATE(1259), 6,
+      sym_tuple_pattern,
+      sym_default_parameter,
+      sym_typed_default_parameter,
+      sym_typed_parameter,
+      sym_positional_separator,
+      sym_keyword_separator,
+  [48327] = 4,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1814), 1,
+      anon_sym_COLON,
+    ACTIONS(1816), 1,
       anon_sym_EQ,
-    ACTIONS(1826), 13,
+    ACTIONS(1818), 13,
       anon_sym_PLUS_EQ,
       anon_sym_DASH_EQ,
       anon_sym_STAR_EQ,
@@ -67093,66 +63302,39 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_AMP_EQ,
       anon_sym_CARET_EQ,
       anon_sym_PIPE_EQ,
-  [48534] = 10,
+  [48352] = 10,
     ACTIONS(3), 1,
       sym_comment,
+    ACTIONS(1796), 1,
+      anon_sym_LPAREN,
+    ACTIONS(1798), 1,
+      anon_sym_STAR,
     ACTIONS(1802), 1,
+      anon_sym_STAR_STAR,
+    ACTIONS(1804), 1,
+      anon_sym_SLASH,
+    ACTIONS(1828), 1,
       sym_identifier,
-    ACTIONS(1804), 1,
-      anon_sym_LPAREN,
-    ACTIONS(1806), 1,
-      anon_sym_STAR,
-    ACTIONS(1810), 1,
-      anon_sym_STAR_STAR,
-    ACTIONS(1812), 1,
-      anon_sym_SLASH,
-    ACTIONS(1844), 1,
-      anon_sym_COLON,
-    STATE(1201), 1,
-      sym_parameter,
-    STATE(1347), 2,
-      sym_list_splat_pattern,
-      sym_dictionary_splat_pattern,
-    STATE(1333), 6,
-      sym_tuple_pattern,
-      sym_default_parameter,
-      sym_typed_default_parameter,
-      sym_typed_parameter,
-      sym_positional_separator,
-      sym_keyword_separator,
-  [48571] = 10,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1804), 1,
-      anon_sym_LPAREN,
-    ACTIONS(1806), 1,
-      anon_sym_STAR,
-    ACTIONS(1810), 1,
-      anon_sym_STAR_STAR,
-    ACTIONS(1812), 1,
-      anon_sym_SLASH,
     ACTIONS(1838), 1,
-      sym_identifier,
-    ACTIONS(1846), 1,
       anon_sym_RPAREN,
-    STATE(1201), 1,
+    STATE(1305), 1,
       sym_parameter,
-    STATE(1267), 2,
+    STATE(1187), 2,
       sym_list_splat_pattern,
       sym_dictionary_splat_pattern,
-    STATE(1333), 6,
+    STATE(1259), 6,
       sym_tuple_pattern,
       sym_default_parameter,
       sym_typed_default_parameter,
       sym_typed_parameter,
       sym_positional_separator,
       sym_keyword_separator,
-  [48608] = 3,
+  [48389] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1495), 1,
+    ACTIONS(1842), 1,
       anon_sym_as,
-    ACTIONS(1479), 13,
+    ACTIONS(1840), 13,
       anon_sym_RPAREN,
       anon_sym_COMMA,
       anon_sym_if,
@@ -67166,12 +63348,12 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_and,
       anon_sym_or,
       sym_type_conversion,
-  [48630] = 3,
+  [48411] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1850), 1,
+    ACTIONS(1413), 1,
       anon_sym_as,
-    ACTIONS(1848), 13,
+    ACTIONS(1411), 13,
       anon_sym_RPAREN,
       anon_sym_COMMA,
       anon_sym_if,
@@ -67185,109 +63367,90 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_and,
       anon_sym_or,
       sym_type_conversion,
-  [48652] = 9,
+  [48433] = 9,
     ACTIONS(3), 1,
       sym_comment,
+    ACTIONS(1796), 1,
+      anon_sym_LPAREN,
+    ACTIONS(1798), 1,
+      anon_sym_STAR,
     ACTIONS(1802), 1,
-      sym_identifier,
-    ACTIONS(1804), 1,
-      anon_sym_LPAREN,
-    ACTIONS(1806), 1,
-      anon_sym_STAR,
-    ACTIONS(1810), 1,
       anon_sym_STAR_STAR,
-    ACTIONS(1812), 1,
+    ACTIONS(1804), 1,
       anon_sym_SLASH,
-    STATE(1201), 1,
+    ACTIONS(1828), 1,
+      sym_identifier,
+    STATE(1305), 1,
       sym_parameter,
-    STATE(1347), 2,
+    STATE(1187), 2,
       sym_list_splat_pattern,
       sym_dictionary_splat_pattern,
-    STATE(1333), 6,
+    STATE(1259), 6,
       sym_tuple_pattern,
       sym_default_parameter,
       sym_typed_default_parameter,
       sym_typed_parameter,
       sym_positional_separator,
       sym_keyword_separator,
-  [48686] = 9,
+  [48467] = 9,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1804), 1,
-      anon_sym_LPAREN,
-    ACTIONS(1806), 1,
-      anon_sym_STAR,
-    ACTIONS(1810), 1,
-      anon_sym_STAR_STAR,
-    ACTIONS(1812), 1,
-      anon_sym_SLASH,
-    ACTIONS(1838), 1,
+    ACTIONS(1794), 1,
       sym_identifier,
-    STATE(1201), 1,
+    ACTIONS(1796), 1,
+      anon_sym_LPAREN,
+    ACTIONS(1798), 1,
+      anon_sym_STAR,
+    ACTIONS(1802), 1,
+      anon_sym_STAR_STAR,
+    ACTIONS(1804), 1,
+      anon_sym_SLASH,
+    STATE(1305), 1,
       sym_parameter,
-    STATE(1267), 2,
+    STATE(1340), 2,
       sym_list_splat_pattern,
       sym_dictionary_splat_pattern,
-    STATE(1333), 6,
+    STATE(1259), 6,
       sym_tuple_pattern,
       sym_default_parameter,
       sym_typed_default_parameter,
       sym_typed_parameter,
       sym_positional_separator,
       sym_keyword_separator,
-  [48720] = 3,
+  [48501] = 11,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1854), 1,
-      anon_sym_as,
-    ACTIONS(1852), 13,
-      anon_sym_RPAREN,
-      anon_sym_COMMA,
-      anon_sym_if,
-      anon_sym_COLON,
-      anon_sym_else,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_RBRACK,
-      anon_sym_RBRACE,
-      anon_sym_EQ,
-      anon_sym_and,
-      anon_sym_or,
-      sym_type_conversion,
-  [48742] = 11,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(315), 1,
+    ACTIONS(299), 1,
       sym__string_start,
-    ACTIONS(1687), 1,
+    ACTIONS(1681), 1,
       anon_sym_DASH,
-    ACTIONS(1695), 1,
+    ACTIONS(1689), 1,
       sym_integer,
-    ACTIONS(1697), 1,
+    ACTIONS(1691), 1,
       sym_float,
-    ACTIONS(1830), 1,
+    ACTIONS(1822), 1,
       sym_identifier,
-    STATE(975), 1,
+    STATE(969), 1,
       sym_concatenated_string,
-    STATE(1168), 1,
+    STATE(1139), 1,
       sym_string,
-    STATE(1362), 1,
+    STATE(1361), 1,
       sym_match_key_value_pattern,
-    STATE(1486), 2,
+    STATE(1399), 2,
       sym_match_literal_pattern,
       sym_match_value_pattern,
-    ACTIONS(1699), 3,
+    ACTIONS(1693), 3,
       sym_true,
       sym_false,
       sym_none,
-  [48779] = 4,
+  [48538] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1858), 1,
+    ACTIONS(1846), 1,
       anon_sym_DOT,
-    STATE(906), 1,
+    STATE(887), 1,
       aux_sym_match_value_pattern_repeat1,
-    ACTIONS(1856), 10,
+    ACTIONS(1844), 10,
       anon_sym_import,
       anon_sym_LPAREN,
       anon_sym_RPAREN,
@@ -67298,78 +63461,336 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_PIPE,
       anon_sym_RBRACK,
       anon_sym_RBRACE,
-  [48801] = 12,
+  [48560] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1861), 1,
-      anon_sym_COMMA,
-    ACTIONS(1863), 1,
-      anon_sym_if,
-    ACTIONS(1865), 1,
-      anon_sym_COLON,
-    ACTIONS(1867), 1,
-      anon_sym_async,
-    ACTIONS(1869), 1,
-      anon_sym_for,
-    ACTIONS(1871), 1,
-      anon_sym_RBRACE,
-    ACTIONS(1873), 1,
+    ACTIONS(1851), 1,
       anon_sym_and,
-    ACTIONS(1875), 1,
+    ACTIONS(1853), 1,
       anon_sym_or,
-    STATE(956), 1,
-      sym_for_in_clause,
-    STATE(1111), 1,
-      aux_sym__collection_elements_repeat1,
-    STATE(1438), 1,
-      sym__comprehension_clauses,
-  [48838] = 5,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1879), 1,
-      anon_sym_if,
-    ACTIONS(1881), 1,
-      anon_sym_and,
-    ACTIONS(1883), 1,
-      anon_sym_or,
-    ACTIONS(1877), 8,
+    ACTIONS(1849), 9,
       anon_sym_RPAREN,
       anon_sym_COMMA,
+      anon_sym_if,
       anon_sym_COLON,
       anon_sym_else,
       anon_sym_RBRACK,
       anon_sym_RBRACE,
       anon_sym_EQ,
       sym_type_conversion,
-  [48861] = 6,
+  [48581] = 12,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1863), 1,
+    ACTIONS(1855), 1,
+      anon_sym_COMMA,
+    ACTIONS(1857), 1,
       anon_sym_if,
-    ACTIONS(1873), 1,
+    ACTIONS(1859), 1,
+      anon_sym_COLON,
+    ACTIONS(1861), 1,
+      anon_sym_async,
+    ACTIONS(1863), 1,
+      anon_sym_for,
+    ACTIONS(1865), 1,
+      anon_sym_RBRACE,
+    ACTIONS(1867), 1,
       anon_sym_and,
+    ACTIONS(1869), 1,
+      anon_sym_or,
+    STATE(942), 1,
+      sym_for_in_clause,
+    STATE(1072), 1,
+      aux_sym__collection_elements_repeat1,
+    STATE(1445), 1,
+      sym__comprehension_clauses,
+  [48618] = 4,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1851), 1,
+      anon_sym_and,
+    ACTIONS(1853), 1,
+      anon_sym_or,
+    ACTIONS(1871), 9,
+      anon_sym_RPAREN,
+      anon_sym_COMMA,
+      anon_sym_if,
+      anon_sym_COLON,
+      anon_sym_else,
+      anon_sym_RBRACK,
+      anon_sym_RBRACE,
+      anon_sym_EQ,
+      sym_type_conversion,
+  [48639] = 7,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1851), 1,
+      anon_sym_and,
+    ACTIONS(1853), 1,
+      anon_sym_or,
     ACTIONS(1875), 1,
+      anon_sym_COMMA,
+    ACTIONS(1877), 1,
+      anon_sym_if,
+    STATE(951), 1,
+      aux_sym_expression_list_repeat1,
+    ACTIONS(1873), 6,
+      anon_sym_RPAREN,
+      anon_sym_COLON,
+      anon_sym_RBRACK,
+      anon_sym_RBRACE,
+      anon_sym_EQ,
+      sym_type_conversion,
+  [48666] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1844), 11,
+      anon_sym_import,
+      anon_sym_DOT,
+      anon_sym_LPAREN,
+      anon_sym_RPAREN,
+      anon_sym_COMMA,
+      anon_sym_as,
+      anon_sym_if,
+      anon_sym_COLON,
+      anon_sym_PIPE,
+      anon_sym_RBRACK,
+      anon_sym_RBRACE,
+  [48683] = 12,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1855), 1,
+      anon_sym_COMMA,
+    ACTIONS(1857), 1,
+      anon_sym_if,
+    ACTIONS(1859), 1,
+      anon_sym_COLON,
+    ACTIONS(1861), 1,
+      anon_sym_async,
+    ACTIONS(1863), 1,
+      anon_sym_for,
+    ACTIONS(1865), 1,
+      anon_sym_RBRACE,
+    ACTIONS(1867), 1,
+      anon_sym_and,
+    ACTIONS(1869), 1,
+      anon_sym_or,
+    STATE(942), 1,
+      sym_for_in_clause,
+    STATE(1072), 1,
+      aux_sym__collection_elements_repeat1,
+    STATE(1453), 1,
+      sym__comprehension_clauses,
+  [48720] = 5,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1867), 1,
+      anon_sym_and,
+    ACTIONS(1869), 1,
+      anon_sym_or,
+    ACTIONS(1881), 1,
+      anon_sym_as,
+    ACTIONS(1879), 8,
+      anon_sym_RPAREN,
+      anon_sym_COMMA,
+      anon_sym_if,
+      anon_sym_COLON,
+      anon_sym_async,
+      anon_sym_for,
+      anon_sym_RBRACK,
+      anon_sym_RBRACE,
+  [48743] = 4,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1851), 1,
+      anon_sym_and,
+    ACTIONS(1853), 1,
+      anon_sym_or,
+    ACTIONS(1879), 9,
+      anon_sym_RPAREN,
+      anon_sym_COMMA,
+      anon_sym_if,
+      anon_sym_COLON,
+      anon_sym_else,
+      anon_sym_RBRACK,
+      anon_sym_RBRACE,
+      anon_sym_EQ,
+      sym_type_conversion,
+  [48764] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1851), 1,
+      anon_sym_and,
+    ACTIONS(1879), 10,
+      anon_sym_RPAREN,
+      anon_sym_COMMA,
+      anon_sym_if,
+      anon_sym_COLON,
+      anon_sym_else,
+      anon_sym_RBRACK,
+      anon_sym_RBRACE,
+      anon_sym_EQ,
+      anon_sym_or,
+      sym_type_conversion,
+  [48783] = 6,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1857), 1,
+      anon_sym_if,
+    ACTIONS(1867), 1,
+      anon_sym_and,
+    ACTIONS(1869), 1,
+      anon_sym_or,
+    ACTIONS(1885), 1,
+      anon_sym_as,
+    ACTIONS(1883), 7,
+      anon_sym_RPAREN,
+      anon_sym_COMMA,
+      anon_sym_COLON,
+      anon_sym_async,
+      anon_sym_for,
+      anon_sym_RBRACK,
+      anon_sym_RBRACE,
+  [48808] = 12,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1857), 1,
+      anon_sym_if,
+    ACTIONS(1861), 1,
+      anon_sym_async,
+    ACTIONS(1863), 1,
+      anon_sym_for,
+    ACTIONS(1867), 1,
+      anon_sym_and,
+    ACTIONS(1869), 1,
       anon_sym_or,
     ACTIONS(1887), 1,
+      anon_sym_RPAREN,
+    ACTIONS(1889), 1,
+      anon_sym_COMMA,
+    ACTIONS(1892), 1,
       anon_sym_as,
-    ACTIONS(1885), 7,
+    STATE(942), 1,
+      sym_for_in_clause,
+    STATE(1072), 1,
+      aux_sym__collection_elements_repeat1,
+    STATE(1385), 1,
+      sym__comprehension_clauses,
+  [48845] = 4,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1867), 1,
+      anon_sym_and,
+    ACTIONS(1881), 1,
+      anon_sym_as,
+    ACTIONS(1879), 9,
       anon_sym_RPAREN,
       anon_sym_COMMA,
+      anon_sym_if,
       anon_sym_COLON,
       anon_sym_async,
       anon_sym_for,
       anon_sym_RBRACK,
       anon_sym_RBRACE,
-  [48886] = 5,
+      anon_sym_or,
+  [48866] = 5,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1889), 1,
+    ACTIONS(1851), 1,
+      anon_sym_and,
+    ACTIONS(1853), 1,
+      anon_sym_or,
+    ACTIONS(1877), 1,
+      anon_sym_if,
+    ACTIONS(1883), 8,
+      anon_sym_RPAREN,
+      anon_sym_COMMA,
+      anon_sym_COLON,
+      anon_sym_else,
+      anon_sym_RBRACK,
+      anon_sym_RBRACE,
+      anon_sym_EQ,
+      sym_type_conversion,
+  [48889] = 5,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1851), 1,
+      anon_sym_and,
+    ACTIONS(1853), 1,
+      anon_sym_or,
+    ACTIONS(1877), 1,
+      anon_sym_if,
+    ACTIONS(1894), 8,
+      anon_sym_RPAREN,
+      anon_sym_COMMA,
+      anon_sym_COLON,
+      anon_sym_else,
+      anon_sym_RBRACK,
+      anon_sym_RBRACE,
+      anon_sym_EQ,
+      sym_type_conversion,
+  [48912] = 4,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(608), 1,
+      sym__string_start,
+    STATE(668), 2,
+      sym_string,
+      aux_sym_concatenated_string_repeat1,
+    ACTIONS(1896), 8,
+      anon_sym_RPAREN,
+      anon_sym_COMMA,
+      anon_sym_as,
+      anon_sym_if,
+      anon_sym_COLON,
+      anon_sym_PIPE,
+      anon_sym_RBRACK,
+      anon_sym_RBRACE,
+  [48933] = 5,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1851), 1,
+      anon_sym_and,
+    ACTIONS(1853), 1,
+      anon_sym_or,
+    ACTIONS(1877), 1,
+      anon_sym_if,
+    ACTIONS(1898), 8,
+      anon_sym_RPAREN,
+      anon_sym_COMMA,
+      anon_sym_COLON,
+      anon_sym_else,
+      anon_sym_RBRACK,
+      anon_sym_RBRACE,
+      anon_sym_EQ,
+      sym_type_conversion,
+  [48956] = 5,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1867), 1,
+      anon_sym_and,
+    ACTIONS(1869), 1,
+      anon_sym_or,
+    ACTIONS(1900), 1,
+      anon_sym_as,
+    ACTIONS(1849), 8,
+      anon_sym_RPAREN,
+      anon_sym_COMMA,
+      anon_sym_if,
+      anon_sym_COLON,
+      anon_sym_async,
+      anon_sym_for,
+      anon_sym_RBRACK,
+      anon_sym_RBRACE,
+  [48979] = 5,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1902), 1,
       anon_sym_DOT,
-    ACTIONS(1891), 1,
+    ACTIONS(1904), 1,
       anon_sym_LPAREN,
     STATE(906), 1,
       aux_sym_match_value_pattern_repeat1,
-    ACTIONS(1893), 8,
+    ACTIONS(1906), 8,
       anon_sym_RPAREN,
       anon_sym_COMMA,
       anon_sym_as,
@@ -67378,134 +63799,16 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_PIPE,
       anon_sym_RBRACK,
       anon_sym_RBRACE,
-  [48909] = 12,
+  [49002] = 5,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1861), 1,
-      anon_sym_COMMA,
-    ACTIONS(1863), 1,
-      anon_sym_if,
-    ACTIONS(1865), 1,
-      anon_sym_COLON,
-    ACTIONS(1867), 1,
-      anon_sym_async,
-    ACTIONS(1869), 1,
-      anon_sym_for,
-    ACTIONS(1871), 1,
-      anon_sym_RBRACE,
-    ACTIONS(1873), 1,
-      anon_sym_and,
-    ACTIONS(1875), 1,
-      anon_sym_or,
-    STATE(956), 1,
-      sym_for_in_clause,
-    STATE(1111), 1,
-      aux_sym__collection_elements_repeat1,
-    STATE(1405), 1,
-      sym__comprehension_clauses,
-  [48946] = 6,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1863), 1,
-      anon_sym_if,
-    ACTIONS(1873), 1,
-      anon_sym_and,
-    ACTIONS(1875), 1,
-      anon_sym_or,
-    ACTIONS(1897), 1,
-      anon_sym_as,
-    ACTIONS(1895), 7,
-      anon_sym_RPAREN,
-      anon_sym_COMMA,
-      anon_sym_COLON,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_RBRACK,
-      anon_sym_RBRACE,
-  [48971] = 4,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(646), 1,
-      sym__string_start,
-    STATE(678), 2,
-      sym_string,
-      aux_sym_concatenated_string_repeat1,
-    ACTIONS(1899), 8,
-      anon_sym_RPAREN,
-      anon_sym_COMMA,
-      anon_sym_as,
-      anon_sym_if,
-      anon_sym_COLON,
-      anon_sym_PIPE,
-      anon_sym_RBRACK,
-      anon_sym_RBRACE,
-  [48992] = 5,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1873), 1,
-      anon_sym_and,
-    ACTIONS(1875), 1,
-      anon_sym_or,
-    ACTIONS(1903), 1,
-      anon_sym_as,
-    ACTIONS(1901), 8,
-      anon_sym_RPAREN,
-      anon_sym_COMMA,
-      anon_sym_if,
-      anon_sym_COLON,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_RBRACK,
-      anon_sym_RBRACE,
-  [49015] = 12,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1863), 1,
-      anon_sym_if,
-    ACTIONS(1867), 1,
-      anon_sym_async,
-    ACTIONS(1869), 1,
-      anon_sym_for,
-    ACTIONS(1873), 1,
-      anon_sym_and,
-    ACTIONS(1875), 1,
-      anon_sym_or,
-    ACTIONS(1905), 1,
-      anon_sym_RPAREN,
-    ACTIONS(1907), 1,
-      anon_sym_COMMA,
-    ACTIONS(1910), 1,
-      anon_sym_as,
-    STATE(956), 1,
-      sym_for_in_clause,
-    STATE(1111), 1,
-      aux_sym__collection_elements_repeat1,
-    STATE(1464), 1,
-      sym__comprehension_clauses,
-  [49052] = 4,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1881), 1,
-      anon_sym_and,
-    ACTIONS(1883), 1,
-      anon_sym_or,
-    ACTIONS(1912), 9,
-      anon_sym_RPAREN,
-      anon_sym_COMMA,
-      anon_sym_if,
-      anon_sym_COLON,
-      anon_sym_else,
-      anon_sym_RBRACK,
-      anon_sym_RBRACE,
-      anon_sym_EQ,
-      sym_type_conversion,
-  [49073] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1856), 11,
-      anon_sym_import,
+    ACTIONS(1902), 1,
       anon_sym_DOT,
+    ACTIONS(1908), 1,
       anon_sym_LPAREN,
+    STATE(887), 1,
+      aux_sym_match_value_pattern_repeat1,
+    ACTIONS(1910), 8,
       anon_sym_RPAREN,
       anon_sym_COMMA,
       anon_sym_as,
@@ -67514,112 +63817,80 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_PIPE,
       anon_sym_RBRACK,
       anon_sym_RBRACE,
-  [49090] = 12,
+  [49025] = 12,
     ACTIONS(3), 1,
       sym_comment,
+    ACTIONS(1855), 1,
+      anon_sym_COMMA,
+    ACTIONS(1857), 1,
+      anon_sym_if,
+    ACTIONS(1859), 1,
+      anon_sym_COLON,
     ACTIONS(1861), 1,
-      anon_sym_COMMA,
-    ACTIONS(1863), 1,
-      anon_sym_if,
-    ACTIONS(1865), 1,
-      anon_sym_COLON,
-    ACTIONS(1867), 1,
       anon_sym_async,
-    ACTIONS(1869), 1,
+    ACTIONS(1863), 1,
       anon_sym_for,
-    ACTIONS(1871), 1,
+    ACTIONS(1865), 1,
       anon_sym_RBRACE,
-    ACTIONS(1873), 1,
+    ACTIONS(1867), 1,
       anon_sym_and,
-    ACTIONS(1875), 1,
+    ACTIONS(1869), 1,
       anon_sym_or,
-    STATE(956), 1,
+    STATE(942), 1,
       sym_for_in_clause,
-    STATE(1111), 1,
+    STATE(1072), 1,
       aux_sym__collection_elements_repeat1,
-    STATE(1410), 1,
+    STATE(1389), 1,
       sym__comprehension_clauses,
-  [49127] = 5,
+  [49062] = 5,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1879), 1,
-      anon_sym_if,
-    ACTIONS(1881), 1,
+    ACTIONS(1867), 1,
       anon_sym_and,
-    ACTIONS(1883), 1,
+    ACTIONS(1869), 1,
       anon_sym_or,
-    ACTIONS(1885), 8,
-      anon_sym_RPAREN,
-      anon_sym_COMMA,
-      anon_sym_COLON,
-      anon_sym_else,
-      anon_sym_RBRACK,
-      anon_sym_RBRACE,
-      anon_sym_EQ,
-      sym_type_conversion,
-  [49150] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1881), 1,
-      anon_sym_and,
-    ACTIONS(1912), 10,
+    ACTIONS(1912), 1,
+      anon_sym_as,
+    ACTIONS(1871), 8,
       anon_sym_RPAREN,
       anon_sym_COMMA,
       anon_sym_if,
       anon_sym_COLON,
-      anon_sym_else,
+      anon_sym_async,
+      anon_sym_for,
       anon_sym_RBRACK,
       anon_sym_RBRACE,
-      anon_sym_EQ,
-      anon_sym_or,
-      sym_type_conversion,
-  [49169] = 4,
+  [49085] = 6,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1881), 1,
-      anon_sym_and,
-    ACTIONS(1883), 1,
-      anon_sym_or,
-    ACTIONS(1901), 9,
-      anon_sym_RPAREN,
-      anon_sym_COMMA,
+    ACTIONS(1857), 1,
       anon_sym_if,
-      anon_sym_COLON,
-      anon_sym_else,
-      anon_sym_RBRACK,
-      anon_sym_RBRACE,
-      anon_sym_EQ,
-      sym_type_conversion,
-  [49190] = 5,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1873), 1,
+    ACTIONS(1867), 1,
       anon_sym_and,
-    ACTIONS(1875), 1,
+    ACTIONS(1869), 1,
       anon_sym_or,
     ACTIONS(1914), 1,
       anon_sym_as,
-    ACTIONS(1912), 8,
+    ACTIONS(1898), 7,
       anon_sym_RPAREN,
       anon_sym_COMMA,
-      anon_sym_if,
       anon_sym_COLON,
       anon_sym_async,
       anon_sym_for,
       anon_sym_RBRACK,
       anon_sym_RBRACE,
-  [49213] = 6,
+  [49110] = 6,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1863), 1,
+    ACTIONS(1857), 1,
       anon_sym_if,
-    ACTIONS(1873), 1,
+    ACTIONS(1867), 1,
       anon_sym_and,
-    ACTIONS(1875), 1,
+    ACTIONS(1869), 1,
       anon_sym_or,
     ACTIONS(1916), 1,
       anon_sym_as,
-    ACTIONS(1877), 7,
+    ACTIONS(1894), 7,
       anon_sym_RPAREN,
       anon_sym_COMMA,
       anon_sym_COLON,
@@ -67627,193 +63898,16 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_for,
       anon_sym_RBRACK,
       anon_sym_RBRACE,
-  [49238] = 5,
+  [49135] = 5,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1879), 1,
-      anon_sym_if,
-    ACTIONS(1881), 1,
+    ACTIONS(1851), 1,
       anon_sym_and,
-    ACTIONS(1883), 1,
+    ACTIONS(1853), 1,
       anon_sym_or,
-    ACTIONS(1895), 8,
-      anon_sym_RPAREN,
-      anon_sym_COMMA,
-      anon_sym_COLON,
-      anon_sym_else,
-      anon_sym_RBRACK,
-      anon_sym_RBRACE,
-      anon_sym_EQ,
-      sym_type_conversion,
-  [49261] = 5,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1889), 1,
-      anon_sym_DOT,
-    ACTIONS(1918), 1,
-      anon_sym_LPAREN,
-    STATE(910), 1,
-      aux_sym_match_value_pattern_repeat1,
-    ACTIONS(1920), 8,
-      anon_sym_RPAREN,
-      anon_sym_COMMA,
-      anon_sym_as,
+    ACTIONS(1877), 1,
       anon_sym_if,
-      anon_sym_COLON,
-      anon_sym_PIPE,
-      anon_sym_RBRACK,
-      anon_sym_RBRACE,
-  [49284] = 4,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1881), 1,
-      anon_sym_and,
-    ACTIONS(1883), 1,
-      anon_sym_or,
-    ACTIONS(1922), 9,
-      anon_sym_RPAREN,
-      anon_sym_COMMA,
-      anon_sym_if,
-      anon_sym_COLON,
-      anon_sym_else,
-      anon_sym_RBRACK,
-      anon_sym_RBRACE,
-      anon_sym_EQ,
-      sym_type_conversion,
-  [49305] = 4,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1873), 1,
-      anon_sym_and,
-    ACTIONS(1914), 1,
-      anon_sym_as,
-    ACTIONS(1912), 9,
-      anon_sym_RPAREN,
-      anon_sym_COMMA,
-      anon_sym_if,
-      anon_sym_COLON,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_RBRACK,
-      anon_sym_RBRACE,
-      anon_sym_or,
-  [49326] = 5,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1873), 1,
-      anon_sym_and,
-    ACTIONS(1875), 1,
-      anon_sym_or,
-    ACTIONS(1924), 1,
-      anon_sym_as,
-    ACTIONS(1922), 8,
-      anon_sym_RPAREN,
-      anon_sym_COMMA,
-      anon_sym_if,
-      anon_sym_COLON,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_RBRACK,
-      anon_sym_RBRACE,
-  [49349] = 7,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1879), 1,
-      anon_sym_if,
-    ACTIONS(1881), 1,
-      anon_sym_and,
-    ACTIONS(1883), 1,
-      anon_sym_or,
-    ACTIONS(1928), 1,
-      anon_sym_COMMA,
-    STATE(964), 1,
-      aux_sym_expression_list_repeat1,
-    ACTIONS(1926), 6,
-      anon_sym_RPAREN,
-      anon_sym_COLON,
-      anon_sym_RBRACK,
-      anon_sym_RBRACE,
-      anon_sym_EQ,
-      sym_type_conversion,
-  [49376] = 11,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1861), 1,
-      anon_sym_COMMA,
-    ACTIONS(1863), 1,
-      anon_sym_if,
-    ACTIONS(1867), 1,
-      anon_sym_async,
-    ACTIONS(1869), 1,
-      anon_sym_for,
-    ACTIONS(1873), 1,
-      anon_sym_and,
-    ACTIONS(1875), 1,
-      anon_sym_or,
-    ACTIONS(1930), 1,
-      anon_sym_RPAREN,
-    STATE(956), 1,
-      sym_for_in_clause,
-    STATE(1111), 1,
-      aux_sym__collection_elements_repeat1,
-    STATE(1442), 1,
-      sym__comprehension_clauses,
-  [49410] = 11,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1861), 1,
-      anon_sym_COMMA,
-    ACTIONS(1863), 1,
-      anon_sym_if,
-    ACTIONS(1867), 1,
-      anon_sym_async,
-    ACTIONS(1869), 1,
-      anon_sym_for,
-    ACTIONS(1873), 1,
-      anon_sym_and,
-    ACTIONS(1875), 1,
-      anon_sym_or,
-    ACTIONS(1932), 1,
-      anon_sym_RPAREN,
-    STATE(956), 1,
-      sym_for_in_clause,
-    STATE(1111), 1,
-      aux_sym__collection_elements_repeat1,
-    STATE(1417), 1,
-      sym__comprehension_clauses,
-  [49444] = 11,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1861), 1,
-      anon_sym_COMMA,
-    ACTIONS(1863), 1,
-      anon_sym_if,
-    ACTIONS(1867), 1,
-      anon_sym_async,
-    ACTIONS(1869), 1,
-      anon_sym_for,
-    ACTIONS(1871), 1,
-      anon_sym_RBRACK,
-    ACTIONS(1873), 1,
-      anon_sym_and,
-    ACTIONS(1875), 1,
-      anon_sym_or,
-    STATE(956), 1,
-      sym_for_in_clause,
-    STATE(1111), 1,
-      aux_sym__collection_elements_repeat1,
-    STATE(1429), 1,
-      sym__comprehension_clauses,
-  [49478] = 5,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1879), 1,
-      anon_sym_if,
-    ACTIONS(1881), 1,
-      anon_sym_and,
-    ACTIONS(1883), 1,
-      anon_sym_or,
-    ACTIONS(1934), 7,
+    ACTIONS(1918), 7,
       anon_sym_RPAREN,
       anon_sym_COMMA,
       anon_sym_COLON,
@@ -67821,123 +63915,16 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_RBRACE,
       anon_sym_EQ,
       sym_type_conversion,
-  [49500] = 9,
-    ACTIONS(1936), 1,
-      anon_sym_LBRACE2,
-    ACTIONS(1940), 1,
-      sym__not_escape_sequence,
-    ACTIONS(1942), 1,
-      sym_comment,
-    ACTIONS(1944), 1,
-      sym__string_end,
-    STATE(936), 1,
-      aux_sym_string_repeat1,
-    STATE(1031), 1,
-      aux_sym_string_content_repeat1,
-    STATE(1072), 1,
-      sym_string_content,
-    STATE(1076), 1,
-      sym_interpolation,
-    ACTIONS(1938), 3,
-      sym__string_content,
-      sym__escape_interpolation,
-      sym_escape_sequence,
-  [49530] = 11,
+  [49157] = 5,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1861), 1,
-      anon_sym_COMMA,
-    ACTIONS(1863), 1,
-      anon_sym_if,
-    ACTIONS(1867), 1,
-      anon_sym_async,
-    ACTIONS(1869), 1,
-      anon_sym_for,
-    ACTIONS(1871), 1,
-      anon_sym_RBRACK,
-    ACTIONS(1873), 1,
+    ACTIONS(1851), 1,
       anon_sym_and,
-    ACTIONS(1875), 1,
+    ACTIONS(1853), 1,
       anon_sym_or,
-    STATE(956), 1,
-      sym_for_in_clause,
-    STATE(1111), 1,
-      aux_sym__collection_elements_repeat1,
-    STATE(1407), 1,
-      sym__comprehension_clauses,
-  [49564] = 9,
-    ACTIONS(1936), 1,
-      anon_sym_LBRACE2,
-    ACTIONS(1940), 1,
-      sym__not_escape_sequence,
-    ACTIONS(1942), 1,
-      sym_comment,
-    ACTIONS(1946), 1,
-      sym__string_end,
-    STATE(937), 1,
-      aux_sym_string_repeat1,
-    STATE(1031), 1,
-      aux_sym_string_content_repeat1,
-    STATE(1072), 1,
-      sym_string_content,
-    STATE(1076), 1,
-      sym_interpolation,
-    ACTIONS(1938), 3,
-      sym__string_content,
-      sym__escape_interpolation,
-      sym_escape_sequence,
-  [49594] = 9,
-    ACTIONS(1942), 1,
-      sym_comment,
-    ACTIONS(1948), 1,
-      anon_sym_LBRACE2,
-    ACTIONS(1954), 1,
-      sym__not_escape_sequence,
-    ACTIONS(1957), 1,
-      sym__string_end,
-    STATE(937), 1,
-      aux_sym_string_repeat1,
-    STATE(1031), 1,
-      aux_sym_string_content_repeat1,
-    STATE(1072), 1,
-      sym_string_content,
-    STATE(1076), 1,
-      sym_interpolation,
-    ACTIONS(1951), 3,
-      sym__string_content,
-      sym__escape_interpolation,
-      sym_escape_sequence,
-  [49624] = 9,
-    ACTIONS(1936), 1,
-      anon_sym_LBRACE2,
-    ACTIONS(1940), 1,
-      sym__not_escape_sequence,
-    ACTIONS(1942), 1,
-      sym_comment,
-    ACTIONS(1959), 1,
-      sym__string_end,
-    STATE(937), 1,
-      aux_sym_string_repeat1,
-    STATE(1031), 1,
-      aux_sym_string_content_repeat1,
-    STATE(1072), 1,
-      sym_string_content,
-    STATE(1076), 1,
-      sym_interpolation,
-    ACTIONS(1938), 3,
-      sym__string_content,
-      sym__escape_interpolation,
-      sym_escape_sequence,
-  [49654] = 5,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1879), 1,
+    ACTIONS(1877), 1,
       anon_sym_if,
-    ACTIONS(1881), 1,
-      anon_sym_and,
-    ACTIONS(1883), 1,
-      anon_sym_or,
-    ACTIONS(1961), 7,
+    ACTIONS(1920), 7,
       anon_sym_RPAREN,
       anon_sym_COMMA,
       anon_sym_COLON,
@@ -67945,238 +63932,141 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_RBRACE,
       anon_sym_EQ,
       sym_type_conversion,
-  [49676] = 11,
+  [49179] = 11,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1863), 1,
-      anon_sym_if,
-    ACTIONS(1867), 1,
-      anon_sym_async,
-    ACTIONS(1869), 1,
-      anon_sym_for,
-    ACTIONS(1873), 1,
-      anon_sym_and,
-    ACTIONS(1875), 1,
-      anon_sym_or,
-    ACTIONS(1963), 1,
-      anon_sym_RPAREN,
-    ACTIONS(1965), 1,
+    ACTIONS(1855), 1,
       anon_sym_COMMA,
-    STATE(956), 1,
-      sym_for_in_clause,
-    STATE(1228), 1,
-      aux_sym_argument_list_repeat1,
-    STATE(1417), 1,
-      sym__comprehension_clauses,
-  [49710] = 11,
-    ACTIONS(3), 1,
-      sym_comment,
+    ACTIONS(1857), 1,
+      anon_sym_if,
     ACTIONS(1861), 1,
-      anon_sym_COMMA,
-    ACTIONS(1863), 1,
-      anon_sym_if,
-    ACTIONS(1867), 1,
       anon_sym_async,
-    ACTIONS(1869), 1,
+    ACTIONS(1863), 1,
       anon_sym_for,
-    ACTIONS(1871), 1,
+    ACTIONS(1865), 1,
       anon_sym_RBRACK,
-    ACTIONS(1873), 1,
+    ACTIONS(1867), 1,
       anon_sym_and,
-    ACTIONS(1875), 1,
+    ACTIONS(1869), 1,
       anon_sym_or,
-    STATE(956), 1,
-      sym_for_in_clause,
-    STATE(1111), 1,
-      aux_sym__collection_elements_repeat1,
-    STATE(1437), 1,
-      sym__comprehension_clauses,
-  [49744] = 9,
-    ACTIONS(1936), 1,
-      anon_sym_LBRACE2,
-    ACTIONS(1940), 1,
-      sym__not_escape_sequence,
-    ACTIONS(1942), 1,
-      sym_comment,
-    ACTIONS(1967), 1,
-      sym__string_end,
-    STATE(937), 1,
-      aux_sym_string_repeat1,
-    STATE(1031), 1,
-      aux_sym_string_content_repeat1,
-    STATE(1072), 1,
-      sym_string_content,
-    STATE(1076), 1,
-      sym_interpolation,
-    ACTIONS(1938), 3,
-      sym__string_content,
-      sym__escape_interpolation,
-      sym_escape_sequence,
-  [49774] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1971), 2,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-    ACTIONS(1969), 8,
-      anon_sym_RPAREN,
-      anon_sym_COMMA,
-      anon_sym_as,
-      anon_sym_if,
-      anon_sym_COLON,
-      anon_sym_PIPE,
-      anon_sym_RBRACK,
-      anon_sym_RBRACE,
-  [49792] = 9,
-    ACTIONS(1936), 1,
-      anon_sym_LBRACE2,
-    ACTIONS(1940), 1,
-      sym__not_escape_sequence,
-    ACTIONS(1942), 1,
-      sym_comment,
-    ACTIONS(1973), 1,
-      sym__string_end,
     STATE(942), 1,
-      aux_sym_string_repeat1,
-    STATE(1031), 1,
-      aux_sym_string_content_repeat1,
+      sym_for_in_clause,
     STATE(1072), 1,
+      aux_sym__collection_elements_repeat1,
+    STATE(1386), 1,
+      sym__comprehension_clauses,
+  [49213] = 5,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1851), 1,
+      anon_sym_and,
+    ACTIONS(1853), 1,
+      anon_sym_or,
+    ACTIONS(1877), 1,
+      anon_sym_if,
+    ACTIONS(1922), 7,
+      anon_sym_RPAREN,
+      anon_sym_COMMA,
+      anon_sym_COLON,
+      anon_sym_RBRACK,
+      anon_sym_RBRACE,
+      anon_sym_EQ,
+      sym_type_conversion,
+  [49235] = 9,
+    ACTIONS(1924), 1,
+      anon_sym_LBRACE2,
+    ACTIONS(1930), 1,
+      sym__not_escape_sequence,
+    ACTIONS(1933), 1,
+      sym_comment,
+    ACTIONS(1935), 1,
+      sym__string_end,
+    STATE(915), 1,
+      aux_sym_string_repeat1,
+    STATE(1001), 1,
+      aux_sym_string_content_repeat1,
+    STATE(1043), 1,
       sym_string_content,
-    STATE(1076), 1,
+    STATE(1048), 1,
       sym_interpolation,
-    ACTIONS(1938), 3,
+    ACTIONS(1927), 3,
       sym__string_content,
       sym__escape_interpolation,
       sym_escape_sequence,
-  [49822] = 11,
+  [49265] = 9,
+    ACTIONS(1933), 1,
+      sym_comment,
+    ACTIONS(1937), 1,
+      anon_sym_LBRACE2,
+    ACTIONS(1941), 1,
+      sym__not_escape_sequence,
+    ACTIONS(1943), 1,
+      sym__string_end,
+    STATE(921), 1,
+      aux_sym_string_repeat1,
+    STATE(1001), 1,
+      aux_sym_string_content_repeat1,
+    STATE(1043), 1,
+      sym_string_content,
+    STATE(1048), 1,
+      sym_interpolation,
+    ACTIONS(1939), 3,
+      sym__string_content,
+      sym__escape_interpolation,
+      sym_escape_sequence,
+  [49295] = 11,
     ACTIONS(3), 1,
       sym_comment,
+    ACTIONS(1857), 1,
+      anon_sym_if,
     ACTIONS(1861), 1,
-      anon_sym_COMMA,
-    ACTIONS(1863), 1,
-      anon_sym_if,
-    ACTIONS(1867), 1,
       anon_sym_async,
-    ACTIONS(1869), 1,
-      anon_sym_for,
-    ACTIONS(1873), 1,
-      anon_sym_and,
-    ACTIONS(1875), 1,
-      anon_sym_or,
-    ACTIONS(1905), 1,
-      anon_sym_RPAREN,
-    STATE(956), 1,
-      sym_for_in_clause,
-    STATE(1111), 1,
-      aux_sym__collection_elements_repeat1,
-    STATE(1464), 1,
-      sym__comprehension_clauses,
-  [49856] = 11,
-    ACTIONS(3), 1,
-      sym_comment,
     ACTIONS(1863), 1,
-      anon_sym_if,
-    ACTIONS(1867), 1,
-      anon_sym_async,
-    ACTIONS(1869), 1,
       anon_sym_for,
-    ACTIONS(1873), 1,
+    ACTIONS(1867), 1,
       anon_sym_and,
-    ACTIONS(1875), 1,
+    ACTIONS(1869), 1,
       anon_sym_or,
-    ACTIONS(1975), 1,
+    ACTIONS(1945), 1,
       anon_sym_RPAREN,
-    ACTIONS(1977), 1,
+    ACTIONS(1947), 1,
       anon_sym_COMMA,
-    STATE(956), 1,
+    STATE(942), 1,
       sym_for_in_clause,
     STATE(1273), 1,
       aux_sym_argument_list_repeat1,
-    STATE(1464), 1,
+    STATE(1385), 1,
       sym__comprehension_clauses,
-  [49890] = 5,
+  [49329] = 11,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1879), 1,
-      anon_sym_if,
-    ACTIONS(1881), 1,
-      anon_sym_and,
-    ACTIONS(1883), 1,
-      anon_sym_or,
-    ACTIONS(1979), 7,
-      anon_sym_RPAREN,
+    ACTIONS(1855), 1,
       anon_sym_COMMA,
-      anon_sym_COLON,
-      anon_sym_RBRACK,
-      anon_sym_RBRACE,
-      anon_sym_EQ,
-      sym_type_conversion,
-  [49912] = 5,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1879), 1,
+    ACTIONS(1857), 1,
       anon_sym_if,
-    ACTIONS(1881), 1,
+    ACTIONS(1861), 1,
+      anon_sym_async,
+    ACTIONS(1863), 1,
+      anon_sym_for,
+    ACTIONS(1867), 1,
       anon_sym_and,
-    ACTIONS(1883), 1,
+    ACTIONS(1869), 1,
       anon_sym_or,
-    ACTIONS(1981), 7,
+    ACTIONS(1949), 1,
       anon_sym_RPAREN,
-      anon_sym_COMMA,
-      anon_sym_COLON,
-      anon_sym_RBRACK,
-      anon_sym_RBRACE,
-      anon_sym_EQ,
-      sym_type_conversion,
-  [49934] = 9,
-    ACTIONS(1936), 1,
-      anon_sym_LBRACE2,
-    ACTIONS(1940), 1,
-      sym__not_escape_sequence,
-    ACTIONS(1942), 1,
-      sym_comment,
-    ACTIONS(1983), 1,
-      sym__string_end,
-    STATE(937), 1,
-      aux_sym_string_repeat1,
-    STATE(1031), 1,
-      aux_sym_string_content_repeat1,
+    STATE(942), 1,
+      sym_for_in_clause,
     STATE(1072), 1,
-      sym_string_content,
-    STATE(1076), 1,
-      sym_interpolation,
-    ACTIONS(1938), 3,
-      sym__string_content,
-      sym__escape_interpolation,
-      sym_escape_sequence,
-  [49964] = 9,
-    ACTIONS(1936), 1,
-      anon_sym_LBRACE2,
-    ACTIONS(1940), 1,
-      sym__not_escape_sequence,
-    ACTIONS(1942), 1,
-      sym_comment,
-    ACTIONS(1985), 1,
-      sym__string_end,
-    STATE(949), 1,
-      aux_sym_string_repeat1,
-    STATE(1031), 1,
-      aux_sym_string_content_repeat1,
-    STATE(1072), 1,
-      sym_string_content,
-    STATE(1076), 1,
-      sym_interpolation,
-    ACTIONS(1938), 3,
-      sym__string_content,
-      sym__escape_interpolation,
-      sym_escape_sequence,
-  [49994] = 3,
+      aux_sym__collection_elements_repeat1,
+    STATE(1457), 1,
+      sym__comprehension_clauses,
+  [49363] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1989), 2,
+    ACTIONS(1953), 2,
       anon_sym_DASH,
       anon_sym_PLUS,
-    ACTIONS(1987), 8,
+    ACTIONS(1951), 8,
       anon_sym_RPAREN,
       anon_sym_COMMA,
       anon_sym_as,
@@ -68185,265 +64075,542 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_PIPE,
       anon_sym_RBRACK,
       anon_sym_RBRACE,
-  [50012] = 9,
-    ACTIONS(1936), 1,
-      anon_sym_LBRACE2,
-    ACTIONS(1940), 1,
-      sym__not_escape_sequence,
-    ACTIONS(1942), 1,
+  [49381] = 5,
+    ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1991), 1,
+    ACTIONS(1851), 1,
+      anon_sym_and,
+    ACTIONS(1853), 1,
+      anon_sym_or,
+    ACTIONS(1877), 1,
+      anon_sym_if,
+    ACTIONS(1955), 7,
+      anon_sym_RPAREN,
+      anon_sym_COMMA,
+      anon_sym_COLON,
+      anon_sym_RBRACK,
+      anon_sym_RBRACE,
+      anon_sym_EQ,
+      sym_type_conversion,
+  [49403] = 9,
+    ACTIONS(1933), 1,
+      sym_comment,
+    ACTIONS(1937), 1,
+      anon_sym_LBRACE2,
+    ACTIONS(1941), 1,
+      sym__not_escape_sequence,
+    ACTIONS(1957), 1,
       sym__string_end,
-    STATE(938), 1,
+    STATE(915), 1,
       aux_sym_string_repeat1,
-    STATE(1031), 1,
+    STATE(1001), 1,
       aux_sym_string_content_repeat1,
-    STATE(1072), 1,
+    STATE(1043), 1,
       sym_string_content,
-    STATE(1076), 1,
+    STATE(1048), 1,
       sym_interpolation,
-    ACTIONS(1938), 3,
+    ACTIONS(1939), 3,
       sym__string_content,
       sym__escape_interpolation,
       sym_escape_sequence,
-  [50042] = 11,
+  [49433] = 9,
+    ACTIONS(1933), 1,
+      sym_comment,
+    ACTIONS(1937), 1,
+      anon_sym_LBRACE2,
+    ACTIONS(1941), 1,
+      sym__not_escape_sequence,
+    ACTIONS(1959), 1,
+      sym__string_end,
+    STATE(931), 1,
+      aux_sym_string_repeat1,
+    STATE(1001), 1,
+      aux_sym_string_content_repeat1,
+    STATE(1043), 1,
+      sym_string_content,
+    STATE(1048), 1,
+      sym_interpolation,
+    ACTIONS(1939), 3,
+      sym__string_content,
+      sym__escape_interpolation,
+      sym_escape_sequence,
+  [49463] = 9,
+    ACTIONS(1933), 1,
+      sym_comment,
+    ACTIONS(1937), 1,
+      anon_sym_LBRACE2,
+    ACTIONS(1941), 1,
+      sym__not_escape_sequence,
+    ACTIONS(1961), 1,
+      sym__string_end,
+    STATE(915), 1,
+      aux_sym_string_repeat1,
+    STATE(1001), 1,
+      aux_sym_string_content_repeat1,
+    STATE(1043), 1,
+      sym_string_content,
+    STATE(1048), 1,
+      sym_interpolation,
+    ACTIONS(1939), 3,
+      sym__string_content,
+      sym__escape_interpolation,
+      sym_escape_sequence,
+  [49493] = 9,
+    ACTIONS(1933), 1,
+      sym_comment,
+    ACTIONS(1937), 1,
+      anon_sym_LBRACE2,
+    ACTIONS(1941), 1,
+      sym__not_escape_sequence,
+    ACTIONS(1963), 1,
+      sym__string_end,
+    STATE(923), 1,
+      aux_sym_string_repeat1,
+    STATE(1001), 1,
+      aux_sym_string_content_repeat1,
+    STATE(1043), 1,
+      sym_string_content,
+    STATE(1048), 1,
+      sym_interpolation,
+    ACTIONS(1939), 3,
+      sym__string_content,
+      sym__escape_interpolation,
+      sym_escape_sequence,
+  [49523] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1863), 1,
-      anon_sym_if,
-    ACTIONS(1867), 1,
-      anon_sym_async,
-    ACTIONS(1869), 1,
-      anon_sym_for,
-    ACTIONS(1873), 1,
-      anon_sym_and,
-    ACTIONS(1875), 1,
-      anon_sym_or,
-    ACTIONS(1993), 1,
-      anon_sym_RPAREN,
-    ACTIONS(1995), 1,
-      anon_sym_COMMA,
-    STATE(956), 1,
-      sym_for_in_clause,
-    STATE(1280), 1,
-      aux_sym_argument_list_repeat1,
-    STATE(1442), 1,
-      sym__comprehension_clauses,
-  [50076] = 4,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1999), 1,
-      anon_sym_PIPE,
-    STATE(954), 1,
-      aux_sym_match_or_pattern_repeat1,
-    ACTIONS(1997), 7,
+    ACTIONS(1967), 2,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+    ACTIONS(1965), 8,
       anon_sym_RPAREN,
       anon_sym_COMMA,
       anon_sym_as,
       anon_sym_if,
       anon_sym_COLON,
+      anon_sym_PIPE,
       anon_sym_RBRACK,
       anon_sym_RBRACE,
-  [50095] = 6,
+  [49541] = 11,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2004), 1,
+    ACTIONS(1855), 1,
+      anon_sym_COMMA,
+    ACTIONS(1857), 1,
       anon_sym_if,
-    ACTIONS(2007), 1,
+    ACTIONS(1861), 1,
       anon_sym_async,
-    ACTIONS(2010), 1,
+    ACTIONS(1863), 1,
       anon_sym_for,
-    ACTIONS(2002), 3,
+    ACTIONS(1867), 1,
+      anon_sym_and,
+    ACTIONS(1869), 1,
+      anon_sym_or,
+    ACTIONS(1887), 1,
+      anon_sym_RPAREN,
+    STATE(942), 1,
+      sym_for_in_clause,
+    STATE(1072), 1,
+      aux_sym__collection_elements_repeat1,
+    STATE(1385), 1,
+      sym__comprehension_clauses,
+  [49575] = 11,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1857), 1,
+      anon_sym_if,
+    ACTIONS(1861), 1,
+      anon_sym_async,
+    ACTIONS(1863), 1,
+      anon_sym_for,
+    ACTIONS(1867), 1,
+      anon_sym_and,
+    ACTIONS(1869), 1,
+      anon_sym_or,
+    ACTIONS(1969), 1,
+      anon_sym_RPAREN,
+    ACTIONS(1971), 1,
+      anon_sym_COMMA,
+    STATE(942), 1,
+      sym_for_in_clause,
+    STATE(1290), 1,
+      aux_sym_argument_list_repeat1,
+    STATE(1416), 1,
+      sym__comprehension_clauses,
+  [49609] = 9,
+    ACTIONS(1933), 1,
+      sym_comment,
+    ACTIONS(1937), 1,
+      anon_sym_LBRACE2,
+    ACTIONS(1941), 1,
+      sym__not_escape_sequence,
+    ACTIONS(1973), 1,
+      sym__string_end,
+    STATE(933), 1,
+      aux_sym_string_repeat1,
+    STATE(1001), 1,
+      aux_sym_string_content_repeat1,
+    STATE(1043), 1,
+      sym_string_content,
+    STATE(1048), 1,
+      sym_interpolation,
+    ACTIONS(1939), 3,
+      sym__string_content,
+      sym__escape_interpolation,
+      sym_escape_sequence,
+  [49639] = 11,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1855), 1,
+      anon_sym_COMMA,
+    ACTIONS(1857), 1,
+      anon_sym_if,
+    ACTIONS(1861), 1,
+      anon_sym_async,
+    ACTIONS(1863), 1,
+      anon_sym_for,
+    ACTIONS(1865), 1,
+      anon_sym_RBRACK,
+    ACTIONS(1867), 1,
+      anon_sym_and,
+    ACTIONS(1869), 1,
+      anon_sym_or,
+    STATE(942), 1,
+      sym_for_in_clause,
+    STATE(1072), 1,
+      aux_sym__collection_elements_repeat1,
+    STATE(1428), 1,
+      sym__comprehension_clauses,
+  [49673] = 11,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1855), 1,
+      anon_sym_COMMA,
+    ACTIONS(1857), 1,
+      anon_sym_if,
+    ACTIONS(1861), 1,
+      anon_sym_async,
+    ACTIONS(1863), 1,
+      anon_sym_for,
+    ACTIONS(1865), 1,
+      anon_sym_RBRACK,
+    ACTIONS(1867), 1,
+      anon_sym_and,
+    ACTIONS(1869), 1,
+      anon_sym_or,
+    STATE(942), 1,
+      sym_for_in_clause,
+    STATE(1072), 1,
+      aux_sym__collection_elements_repeat1,
+    STATE(1455), 1,
+      sym__comprehension_clauses,
+  [49707] = 9,
+    ACTIONS(1933), 1,
+      sym_comment,
+    ACTIONS(1937), 1,
+      anon_sym_LBRACE2,
+    ACTIONS(1941), 1,
+      sym__not_escape_sequence,
+    ACTIONS(1975), 1,
+      sym__string_end,
+    STATE(915), 1,
+      aux_sym_string_repeat1,
+    STATE(1001), 1,
+      aux_sym_string_content_repeat1,
+    STATE(1043), 1,
+      sym_string_content,
+    STATE(1048), 1,
+      sym_interpolation,
+    ACTIONS(1939), 3,
+      sym__string_content,
+      sym__escape_interpolation,
+      sym_escape_sequence,
+  [49737] = 11,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1857), 1,
+      anon_sym_if,
+    ACTIONS(1861), 1,
+      anon_sym_async,
+    ACTIONS(1863), 1,
+      anon_sym_for,
+    ACTIONS(1867), 1,
+      anon_sym_and,
+    ACTIONS(1869), 1,
+      anon_sym_or,
+    ACTIONS(1977), 1,
+      anon_sym_RPAREN,
+    ACTIONS(1979), 1,
+      anon_sym_COMMA,
+    STATE(942), 1,
+      sym_for_in_clause,
+    STATE(1277), 1,
+      aux_sym_argument_list_repeat1,
+    STATE(1457), 1,
+      sym__comprehension_clauses,
+  [49771] = 9,
+    ACTIONS(1933), 1,
+      sym_comment,
+    ACTIONS(1937), 1,
+      anon_sym_LBRACE2,
+    ACTIONS(1941), 1,
+      sym__not_escape_sequence,
+    ACTIONS(1981), 1,
+      sym__string_end,
+    STATE(915), 1,
+      aux_sym_string_repeat1,
+    STATE(1001), 1,
+      aux_sym_string_content_repeat1,
+    STATE(1043), 1,
+      sym_string_content,
+    STATE(1048), 1,
+      sym_interpolation,
+    ACTIONS(1939), 3,
+      sym__string_content,
+      sym__escape_interpolation,
+      sym_escape_sequence,
+  [49801] = 11,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1855), 1,
+      anon_sym_COMMA,
+    ACTIONS(1857), 1,
+      anon_sym_if,
+    ACTIONS(1861), 1,
+      anon_sym_async,
+    ACTIONS(1863), 1,
+      anon_sym_for,
+    ACTIONS(1867), 1,
+      anon_sym_and,
+    ACTIONS(1869), 1,
+      anon_sym_or,
+    ACTIONS(1983), 1,
+      anon_sym_RPAREN,
+    STATE(942), 1,
+      sym_for_in_clause,
+    STATE(1072), 1,
+      aux_sym__collection_elements_repeat1,
+    STATE(1416), 1,
+      sym__comprehension_clauses,
+  [49835] = 4,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1867), 1,
+      anon_sym_and,
+    ACTIONS(1869), 1,
+      anon_sym_or,
+    ACTIONS(1985), 7,
+      anon_sym_RPAREN,
+      anon_sym_COMMA,
+      anon_sym_if,
+      anon_sym_async,
+      anon_sym_for,
+      anon_sym_RBRACK,
+      anon_sym_RBRACE,
+  [49854] = 4,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1867), 1,
+      anon_sym_and,
+    ACTIONS(1869), 1,
+      anon_sym_or,
+    ACTIONS(1985), 7,
+      anon_sym_RPAREN,
+      anon_sym_COMMA,
+      anon_sym_if,
+      anon_sym_async,
+      anon_sym_for,
+      anon_sym_RBRACK,
+      anon_sym_RBRACE,
+  [49873] = 7,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1851), 1,
+      anon_sym_and,
+    ACTIONS(1853), 1,
+      anon_sym_or,
+    ACTIONS(1875), 1,
+      anon_sym_COMMA,
+    ACTIONS(1877), 1,
+      anon_sym_if,
+    STATE(951), 1,
+      aux_sym_expression_list_repeat1,
+    ACTIONS(1987), 4,
+      anon_sym_COLON,
+      anon_sym_RBRACE,
+      anon_sym_EQ,
+      sym_type_conversion,
+  [49898] = 4,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1867), 1,
+      anon_sym_and,
+    ACTIONS(1869), 1,
+      anon_sym_or,
+    ACTIONS(1985), 7,
+      anon_sym_RPAREN,
+      anon_sym_COMMA,
+      anon_sym_if,
+      anon_sym_async,
+      anon_sym_for,
+      anon_sym_RBRACK,
+      anon_sym_RBRACE,
+  [49917] = 6,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1991), 1,
+      anon_sym_if,
+    ACTIONS(1994), 1,
+      anon_sym_async,
+    ACTIONS(1997), 1,
+      anon_sym_for,
+    ACTIONS(1989), 3,
       anon_sym_RPAREN,
       anon_sym_RBRACK,
       anon_sym_RBRACE,
-    STATE(955), 3,
+    STATE(939), 3,
       sym_for_in_clause,
       sym_if_clause,
       aux_sym__comprehension_clauses_repeat1,
-  [50118] = 6,
+  [49940] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1867), 1,
+    ACTIONS(2002), 1,
+      anon_sym_PIPE,
+    STATE(940), 1,
+      aux_sym_match_or_pattern_repeat1,
+    ACTIONS(2000), 7,
+      anon_sym_RPAREN,
+      anon_sym_COMMA,
+      anon_sym_as,
+      anon_sym_if,
+      anon_sym_COLON,
+      anon_sym_RBRACK,
+      anon_sym_RBRACE,
+  [49959] = 4,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2007), 1,
+      anon_sym_PIPE,
+    STATE(940), 1,
+      aux_sym_match_or_pattern_repeat1,
+    ACTIONS(2005), 7,
+      anon_sym_RPAREN,
+      anon_sym_COMMA,
+      anon_sym_as,
+      anon_sym_if,
+      anon_sym_COLON,
+      anon_sym_RBRACK,
+      anon_sym_RBRACE,
+  [49978] = 6,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1861), 1,
       anon_sym_async,
-    ACTIONS(1869), 1,
+    ACTIONS(1863), 1,
       anon_sym_for,
-    ACTIONS(2015), 1,
+    ACTIONS(2011), 1,
+      anon_sym_if,
+    ACTIONS(2009), 3,
+      anon_sym_RPAREN,
+      anon_sym_RBRACK,
+      anon_sym_RBRACE,
+    STATE(943), 3,
+      sym_for_in_clause,
+      sym_if_clause,
+      aux_sym__comprehension_clauses_repeat1,
+  [50001] = 6,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1861), 1,
+      anon_sym_async,
+    ACTIONS(1863), 1,
+      anon_sym_for,
+    ACTIONS(2011), 1,
       anon_sym_if,
     ACTIONS(2013), 3,
       anon_sym_RPAREN,
       anon_sym_RBRACK,
       anon_sym_RBRACE,
-    STATE(959), 3,
+    STATE(939), 3,
       sym_for_in_clause,
       sym_if_clause,
       aux_sym__comprehension_clauses_repeat1,
-  [50141] = 4,
+  [50024] = 4,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2007), 1,
+      anon_sym_PIPE,
+    STATE(941), 1,
+      aux_sym_match_or_pattern_repeat1,
+    ACTIONS(2015), 7,
+      anon_sym_RPAREN,
+      anon_sym_COMMA,
+      anon_sym_as,
+      anon_sym_if,
+      anon_sym_COLON,
+      anon_sym_RBRACK,
+      anon_sym_RBRACE,
+  [50043] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2017), 8,
+      anon_sym_RPAREN,
+      anon_sym_COMMA,
+      anon_sym_as,
+      anon_sym_if,
+      anon_sym_COLON,
+      anon_sym_PIPE,
+      anon_sym_RBRACK,
+      anon_sym_RBRACE,
+  [50057] = 8,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(2019), 1,
-      anon_sym_PIPE,
-    STATE(961), 1,
-      aux_sym_match_or_pattern_repeat1,
-    ACTIONS(2017), 7,
-      anon_sym_RPAREN,
-      anon_sym_COMMA,
-      anon_sym_as,
-      anon_sym_if,
-      anon_sym_COLON,
-      anon_sym_RBRACK,
-      anon_sym_RBRACE,
-  [50160] = 4,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1873), 1,
-      anon_sym_and,
-    ACTIONS(1875), 1,
-      anon_sym_or,
-    ACTIONS(2021), 7,
-      anon_sym_RPAREN,
-      anon_sym_COMMA,
-      anon_sym_if,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_RBRACK,
-      anon_sym_RBRACE,
-  [50179] = 6,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1867), 1,
-      anon_sym_async,
-    ACTIONS(1869), 1,
-      anon_sym_for,
-    ACTIONS(2015), 1,
-      anon_sym_if,
-    ACTIONS(2023), 3,
-      anon_sym_RPAREN,
-      anon_sym_RBRACK,
-      anon_sym_RBRACE,
-    STATE(955), 3,
-      sym_for_in_clause,
-      sym_if_clause,
-      aux_sym__comprehension_clauses_repeat1,
-  [50202] = 7,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1879), 1,
-      anon_sym_if,
-    ACTIONS(1881), 1,
-      anon_sym_and,
-    ACTIONS(1883), 1,
-      anon_sym_or,
-    ACTIONS(1928), 1,
-      anon_sym_COMMA,
-    STATE(964), 1,
-      aux_sym_expression_list_repeat1,
-    ACTIONS(2025), 4,
-      anon_sym_COLON,
-      anon_sym_RBRACE,
-      anon_sym_EQ,
-      sym_type_conversion,
-  [50227] = 4,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2019), 1,
-      anon_sym_PIPE,
-    STATE(954), 1,
-      aux_sym_match_or_pattern_repeat1,
-    ACTIONS(2027), 7,
-      anon_sym_RPAREN,
-      anon_sym_COMMA,
-      anon_sym_as,
-      anon_sym_if,
-      anon_sym_COLON,
-      anon_sym_RBRACK,
-      anon_sym_RBRACE,
-  [50246] = 4,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1873), 1,
-      anon_sym_and,
-    ACTIONS(1875), 1,
-      anon_sym_or,
-    ACTIONS(2021), 7,
-      anon_sym_RPAREN,
-      anon_sym_COMMA,
-      anon_sym_if,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_RBRACK,
-      anon_sym_RBRACE,
-  [50265] = 4,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1873), 1,
-      anon_sym_and,
-    ACTIONS(1875), 1,
-      anon_sym_or,
-    ACTIONS(2021), 7,
-      anon_sym_RPAREN,
-      anon_sym_COMMA,
-      anon_sym_if,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_RBRACK,
-      anon_sym_RBRACE,
-  [50284] = 4,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2031), 1,
-      anon_sym_COMMA,
-    STATE(1005), 1,
-      aux_sym_expression_list_repeat1,
-    ACTIONS(2029), 6,
-      anon_sym_RPAREN,
-      anon_sym_COLON,
-      anon_sym_RBRACK,
-      anon_sym_RBRACE,
-      anon_sym_EQ,
-      sym_type_conversion,
-  [50302] = 7,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(854), 1,
-      anon_sym_except_STAR,
-    ACTIONS(862), 1,
-      anon_sym_except,
-    ACTIONS(2033), 1,
-      anon_sym_finally,
-    STATE(568), 1,
-      sym_finally_clause,
-    STATE(229), 2,
-      sym_except_group_clause,
-      aux_sym_try_statement_repeat2,
-    STATE(241), 2,
-      sym_except_clause,
-      aux_sym_try_statement_repeat1,
-  [50326] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2035), 8,
-      anon_sym_RPAREN,
-      anon_sym_COMMA,
-      anon_sym_as,
-      anon_sym_if,
-      anon_sym_COLON,
-      anon_sym_PIPE,
-      anon_sym_RBRACK,
-      anon_sym_RBRACE,
-  [50340] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1852), 8,
-      sym__newline,
       anon_sym_from,
+    ACTIONS(2021), 1,
       anon_sym_COMMA,
+    ACTIONS(2023), 1,
       anon_sym_if,
-      anon_sym_EQ,
+    ACTIONS(2025), 1,
       anon_sym_and,
+    ACTIONS(2027), 1,
       anon_sym_or,
+    STATE(1074), 1,
+      aux_sym_expression_list_repeat1,
+    ACTIONS(2029), 2,
+      sym__newline,
       sym__semicolon,
-  [50354] = 2,
+  [50083] = 7,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(67), 1,
+      anon_sym_AT,
+    ACTIONS(2031), 1,
+      anon_sym_async,
+    ACTIONS(2033), 1,
+      anon_sym_def,
+    ACTIONS(2035), 1,
+      anon_sym_class,
+    STATE(554), 2,
+      sym_function_definition,
+      sym_class_definition,
+    STATE(1055), 2,
+      sym_decorator,
+      aux_sym_decorated_definition_repeat1,
+  [50107] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2000), 8,
+      anon_sym_RPAREN,
+      anon_sym_COMMA,
+      anon_sym_as,
+      anon_sym_if,
+      anon_sym_COLON,
+      anon_sym_PIPE,
+      anon_sym_RBRACK,
+      anon_sym_RBRACE,
+  [50121] = 2,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(2037), 8,
@@ -68455,10 +64622,38 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_PIPE,
       anon_sym_RBRACK,
       anon_sym_RBRACE,
-  [50368] = 2,
+  [50135] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2039), 8,
+    ACTIONS(2025), 1,
+      anon_sym_and,
+    ACTIONS(2027), 1,
+      anon_sym_or,
+    ACTIONS(1879), 6,
+      sym__newline,
+      anon_sym_from,
+      anon_sym_COMMA,
+      anon_sym_if,
+      anon_sym_EQ,
+      sym__semicolon,
+  [50153] = 4,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2041), 1,
+      anon_sym_COMMA,
+    STATE(963), 1,
+      aux_sym_expression_list_repeat1,
+    ACTIONS(2039), 6,
+      anon_sym_RPAREN,
+      anon_sym_COLON,
+      anon_sym_RBRACK,
+      anon_sym_RBRACE,
+      anon_sym_EQ,
+      sym_type_conversion,
+  [50171] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2043), 8,
       anon_sym_RPAREN,
       anon_sym_COMMA,
       anon_sym_as,
@@ -68467,10 +64662,10 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_PIPE,
       anon_sym_RBRACK,
       anon_sym_RBRACE,
-  [50382] = 2,
+  [50185] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2041), 8,
+    ACTIONS(2045), 8,
       anon_sym_RPAREN,
       anon_sym_COMMA,
       anon_sym_as,
@@ -68479,20 +64674,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_PIPE,
       anon_sym_RBRACK,
       anon_sym_RBRACE,
-  [50396] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2045), 1,
-      anon_sym_PIPE,
-    ACTIONS(2043), 7,
-      anon_sym_RPAREN,
-      anon_sym_COMMA,
-      anon_sym_as,
-      anon_sym_if,
-      anon_sym_COLON,
-      anon_sym_RBRACK,
-      anon_sym_RBRACE,
-  [50412] = 2,
+  [50199] = 2,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(2047), 8,
@@ -68504,57 +64686,48 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_PIPE,
       anon_sym_RBRACK,
       anon_sym_RBRACE,
-  [50426] = 2,
+  [50213] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2049), 8,
-      anon_sym_RPAREN,
+    ACTIONS(2049), 1,
       anon_sym_COMMA,
-      anon_sym_as,
-      anon_sym_if,
+    STATE(963), 1,
+      aux_sym_expression_list_repeat1,
+    ACTIONS(2039), 6,
+      anon_sym_RPAREN,
       anon_sym_COLON,
-      anon_sym_PIPE,
       anon_sym_RBRACK,
       anon_sym_RBRACE,
-  [50440] = 4,
+      anon_sym_EQ,
+      sym_type_conversion,
+  [50231] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2051), 1,
+    ACTIONS(2025), 1,
       anon_sym_and,
+    ACTIONS(1879), 7,
+      sym__newline,
+      anon_sym_from,
+      anon_sym_COMMA,
+      anon_sym_if,
+      anon_sym_EQ,
+      anon_sym_or,
+      sym__semicolon,
+  [50247] = 4,
+    ACTIONS(3), 1,
+      sym_comment,
     ACTIONS(2053), 1,
-      anon_sym_or,
-    ACTIONS(1901), 6,
-      sym__newline,
-      anon_sym_from,
       anon_sym_COMMA,
-      anon_sym_if,
-      anon_sym_EQ,
-      sym__semicolon,
-  [50458] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1899), 8,
+    STATE(981), 1,
+      aux_sym_for_in_clause_repeat1,
+    ACTIONS(2051), 6,
       anon_sym_RPAREN,
-      anon_sym_COMMA,
-      anon_sym_as,
       anon_sym_if,
-      anon_sym_COLON,
-      anon_sym_PIPE,
+      anon_sym_async,
+      anon_sym_for,
       anon_sym_RBRACK,
       anon_sym_RBRACE,
-  [50472] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1848), 8,
-      sym__newline,
-      anon_sym_from,
-      anon_sym_COMMA,
-      anon_sym_if,
-      anon_sym_EQ,
-      anon_sym_and,
-      anon_sym_or,
-      sym__semicolon,
-  [50486] = 2,
+  [50265] = 2,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(2055), 8,
@@ -68566,125 +64739,88 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_PIPE,
       anon_sym_RBRACK,
       anon_sym_RBRACE,
-  [50500] = 4,
+  [50279] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2059), 1,
-      anon_sym_COMMA,
-    STATE(1012), 1,
-      aux_sym_for_in_clause_repeat1,
-    ACTIONS(2057), 6,
+    ACTIONS(2057), 8,
       anon_sym_RPAREN,
+      anon_sym_COMMA,
+      anon_sym_as,
       anon_sym_if,
-      anon_sym_async,
-      anon_sym_for,
+      anon_sym_COLON,
+      anon_sym_PIPE,
       anon_sym_RBRACK,
       anon_sym_RBRACE,
-  [50518] = 4,
+  [50293] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2063), 1,
-      anon_sym_COMMA,
-    STATE(995), 1,
-      aux_sym_for_in_clause_repeat1,
-    ACTIONS(2061), 6,
+    ACTIONS(2059), 8,
       anon_sym_RPAREN,
+      anon_sym_COMMA,
+      anon_sym_as,
       anon_sym_if,
-      anon_sym_async,
-      anon_sym_for,
+      anon_sym_COLON,
+      anon_sym_PIPE,
       anon_sym_RBRACK,
       anon_sym_RBRACE,
-  [50536] = 4,
+  [50307] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2051), 1,
+    ACTIONS(2061), 8,
+      anon_sym_RPAREN,
+      anon_sym_COMMA,
+      anon_sym_as,
+      anon_sym_if,
+      anon_sym_COLON,
+      anon_sym_PIPE,
+      anon_sym_RBRACK,
+      anon_sym_RBRACE,
+  [50321] = 5,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2023), 1,
+      anon_sym_if,
+    ACTIONS(2025), 1,
       anon_sym_and,
-    ACTIONS(2053), 1,
+    ACTIONS(2027), 1,
       anon_sym_or,
-    ACTIONS(1922), 6,
+    ACTIONS(1883), 5,
       sym__newline,
       anon_sym_from,
       anon_sym_COMMA,
-      anon_sym_if,
       anon_sym_EQ,
       sym__semicolon,
-  [50554] = 2,
+  [50341] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2065), 8,
-      anon_sym_RPAREN,
+    ACTIONS(2065), 1,
       anon_sym_COMMA,
-      anon_sym_as,
-      anon_sym_if,
-      anon_sym_COLON,
-      anon_sym_PIPE,
-      anon_sym_RBRACK,
-      anon_sym_RBRACE,
-  [50568] = 8,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2051), 1,
-      anon_sym_and,
-    ACTIONS(2053), 1,
-      anon_sym_or,
-    ACTIONS(2067), 1,
-      anon_sym_from,
-    ACTIONS(2069), 1,
-      anon_sym_COMMA,
-    ACTIONS(2071), 1,
-      anon_sym_if,
-    STATE(1092), 1,
+    STATE(963), 1,
       aux_sym_expression_list_repeat1,
-    ACTIONS(2073), 2,
-      sym__newline,
-      sym__semicolon,
-  [50594] = 7,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(854), 1,
-      anon_sym_except_STAR,
-    ACTIONS(862), 1,
-      anon_sym_except,
-    ACTIONS(2033), 1,
-      anon_sym_finally,
-    STATE(516), 1,
-      sym_finally_clause,
-    STATE(232), 2,
-      sym_except_clause,
-      aux_sym_try_statement_repeat1,
-    STATE(234), 2,
-      sym_except_group_clause,
-      aux_sym_try_statement_repeat2,
-  [50618] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1997), 8,
-      anon_sym_RPAREN,
-      anon_sym_COMMA,
-      anon_sym_as,
-      anon_sym_if,
-      anon_sym_COLON,
-      anon_sym_PIPE,
-      anon_sym_RBRACK,
-      anon_sym_RBRACE,
-  [50632] = 4,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2075), 1,
-      anon_sym_COMMA,
-    STATE(1005), 1,
-      aux_sym_expression_list_repeat1,
-    ACTIONS(2029), 6,
+    ACTIONS(2063), 6,
       anon_sym_RPAREN,
       anon_sym_COLON,
       anon_sym_RBRACK,
       anon_sym_RBRACE,
       anon_sym_EQ,
       sym_type_conversion,
-  [50650] = 2,
+  [50359] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2077), 8,
+    ACTIONS(2070), 1,
+      anon_sym_PIPE,
+    ACTIONS(2068), 7,
+      anon_sym_RPAREN,
+      anon_sym_COMMA,
+      anon_sym_as,
+      anon_sym_if,
+      anon_sym_COLON,
+      anon_sym_RBRACK,
+      anon_sym_RBRACE,
+  [50375] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2072), 8,
       anon_sym_RPAREN,
       anon_sym_COMMA,
       anon_sym_as,
@@ -68693,10 +64829,10 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_PIPE,
       anon_sym_RBRACK,
       anon_sym_RBRACE,
-  [50664] = 2,
+  [50389] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2079), 8,
+    ACTIONS(2074), 8,
       anon_sym_RPAREN,
       anon_sym_COMMA,
       anon_sym_as,
@@ -68705,10 +64841,10 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_PIPE,
       anon_sym_RBRACK,
       anon_sym_RBRACE,
-  [50678] = 2,
+  [50403] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2081), 8,
+    ACTIONS(2076), 8,
       anon_sym_RPAREN,
       anon_sym_COMMA,
       anon_sym_as,
@@ -68717,10 +64853,10 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_PIPE,
       anon_sym_RBRACK,
       anon_sym_RBRACE,
-  [50692] = 2,
+  [50417] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2083), 8,
+    ACTIONS(2078), 8,
       anon_sym_RPAREN,
       anon_sym_COMMA,
       anon_sym_as,
@@ -68729,10 +64865,10 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_PIPE,
       anon_sym_RBRACK,
       anon_sym_RBRACE,
-  [50706] = 2,
+  [50431] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2085), 8,
+    ACTIONS(1896), 8,
       anon_sym_RPAREN,
       anon_sym_COMMA,
       anon_sym_as,
@@ -68741,71 +64877,106 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_PIPE,
       anon_sym_RBRACK,
       anon_sym_RBRACE,
-  [50720] = 7,
+  [50445] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(848), 1,
-      anon_sym_except,
-    ACTIONS(864), 1,
-      anon_sym_except_STAR,
-    ACTIONS(2087), 1,
-      anon_sym_finally,
-    STATE(514), 1,
-      sym_finally_clause,
-    STATE(228), 2,
-      sym_except_clause,
-      aux_sym_try_statement_repeat1,
-    STATE(240), 2,
-      sym_except_group_clause,
-      aux_sym_try_statement_repeat2,
-  [50744] = 5,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2051), 1,
-      anon_sym_and,
-    ACTIONS(2053), 1,
-      anon_sym_or,
-    ACTIONS(2071), 1,
+    ACTIONS(2080), 8,
+      anon_sym_RPAREN,
+      anon_sym_COMMA,
+      anon_sym_as,
       anon_sym_if,
-    ACTIONS(1885), 5,
+      anon_sym_COLON,
+      anon_sym_PIPE,
+      anon_sym_RBRACK,
+      anon_sym_RBRACE,
+  [50459] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1840), 8,
       sym__newline,
       anon_sym_from,
       anon_sym_COMMA,
-      anon_sym_EQ,
-      sym__semicolon,
-  [50764] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2089), 8,
-      anon_sym_RPAREN,
-      anon_sym_COMMA,
-      anon_sym_as,
       anon_sym_if,
-      anon_sym_COLON,
-      anon_sym_PIPE,
-      anon_sym_RBRACK,
-      anon_sym_RBRACE,
-  [50778] = 4,
+      anon_sym_EQ,
+      anon_sym_and,
+      anon_sym_or,
+      sym__semicolon,
+  [50473] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1873), 1,
-      anon_sym_and,
-    ACTIONS(1875), 1,
-      anon_sym_or,
-    ACTIONS(2091), 6,
+    ACTIONS(2084), 1,
+      anon_sym_COMMA,
+    STATE(972), 1,
+      aux_sym_for_in_clause_repeat1,
+    ACTIONS(2082), 6,
       anon_sym_RPAREN,
       anon_sym_if,
       anon_sym_async,
       anon_sym_for,
       anon_sym_RBRACK,
       anon_sym_RBRACE,
-  [50796] = 4,
+  [50491] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2095), 1,
+    ACTIONS(2025), 1,
+      anon_sym_and,
+    ACTIONS(2027), 1,
+      anon_sym_or,
+    ACTIONS(1849), 6,
+      sym__newline,
+      anon_sym_from,
       anon_sym_COMMA,
-    STATE(1012), 1,
+      anon_sym_if,
+      anon_sym_EQ,
+      sym__semicolon,
+  [50509] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2087), 8,
+      anon_sym_RPAREN,
+      anon_sym_COMMA,
+      anon_sym_as,
+      anon_sym_if,
+      anon_sym_COLON,
+      anon_sym_PIPE,
+      anon_sym_RBRACK,
+      anon_sym_RBRACE,
+  [50523] = 5,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2023), 1,
+      anon_sym_if,
+    ACTIONS(2025), 1,
+      anon_sym_and,
+    ACTIONS(2027), 1,
+      anon_sym_or,
+    ACTIONS(1894), 5,
+      sym__newline,
+      anon_sym_from,
+      anon_sym_COMMA,
+      anon_sym_EQ,
+      sym__semicolon,
+  [50543] = 4,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2091), 1,
+      anon_sym_COMMA,
+    STATE(972), 1,
       aux_sym_for_in_clause_repeat1,
+    ACTIONS(2089), 6,
+      anon_sym_RPAREN,
+      anon_sym_if,
+      anon_sym_async,
+      anon_sym_for,
+      anon_sym_RBRACK,
+      anon_sym_RBRACE,
+  [50561] = 4,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1867), 1,
+      anon_sym_and,
+    ACTIONS(1869), 1,
+      anon_sym_or,
     ACTIONS(2093), 6,
       anon_sym_RPAREN,
       anon_sym_if,
@@ -68813,42 +64984,100 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_for,
       anon_sym_RBRACK,
       anon_sym_RBRACE,
-  [50814] = 7,
+  [50579] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(67), 1,
-      anon_sym_AT,
-    ACTIONS(2097), 1,
-      anon_sym_async,
-    ACTIONS(2099), 1,
-      anon_sym_def,
-    ACTIONS(2101), 1,
-      anon_sym_class,
-    STATE(584), 2,
-      sym_function_definition,
-      sym_class_definition,
-    STATE(1062), 2,
-      sym_decorator,
-      aux_sym_decorated_definition_repeat1,
-  [50838] = 5,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2051), 1,
+    ACTIONS(2025), 1,
       anon_sym_and,
-    ACTIONS(2053), 1,
+    ACTIONS(2027), 1,
       anon_sym_or,
-    ACTIONS(2071), 1,
+    ACTIONS(1871), 6,
+      sym__newline,
+      anon_sym_from,
+      anon_sym_COMMA,
       anon_sym_if,
-    ACTIONS(1895), 5,
+      anon_sym_EQ,
+      sym__semicolon,
+  [50597] = 5,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2023), 1,
+      anon_sym_if,
+    ACTIONS(2025), 1,
+      anon_sym_and,
+    ACTIONS(2027), 1,
+      anon_sym_or,
+    ACTIONS(1920), 5,
       sym__newline,
       anon_sym_from,
       anon_sym_COMMA,
       anon_sym_EQ,
       sym__semicolon,
-  [50858] = 2,
+  [50617] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2103), 8,
+    ACTIONS(2097), 1,
+      anon_sym_COMMA,
+    STATE(976), 1,
+      aux_sym_for_in_clause_repeat1,
+    ACTIONS(2095), 6,
+      anon_sym_RPAREN,
+      anon_sym_if,
+      anon_sym_async,
+      anon_sym_for,
+      anon_sym_RBRACK,
+      anon_sym_RBRACE,
+  [50635] = 4,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2101), 1,
+      anon_sym_COMMA,
+    STATE(972), 1,
+      aux_sym_for_in_clause_repeat1,
+    ACTIONS(2099), 6,
+      anon_sym_RPAREN,
+      anon_sym_if,
+      anon_sym_async,
+      anon_sym_for,
+      anon_sym_RBRACK,
+      anon_sym_RBRACE,
+  [50653] = 7,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(67), 1,
+      anon_sym_AT,
+    ACTIONS(2103), 1,
+      anon_sym_async,
+    ACTIONS(2105), 1,
+      anon_sym_def,
+    ACTIONS(2107), 1,
+      anon_sym_class,
+    STATE(525), 2,
+      sym_function_definition,
+      sym_class_definition,
+    STATE(1055), 2,
+      sym_decorator,
+      aux_sym_decorated_definition_repeat1,
+  [50677] = 6,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1902), 1,
+      anon_sym_DOT,
+    ACTIONS(1904), 1,
+      anon_sym_LPAREN,
+    ACTIONS(2109), 1,
+      anon_sym_EQ,
+    STATE(906), 1,
+      aux_sym_match_value_pattern_repeat1,
+    ACTIONS(1906), 4,
+      anon_sym_RPAREN,
+      anon_sym_COMMA,
+      anon_sym_as,
+      anon_sym_PIPE,
+  [50699] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2111), 8,
       anon_sym_RPAREN,
       anon_sym_COMMA,
       anon_sym_as,
@@ -68857,84 +65086,19 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_PIPE,
       anon_sym_RBRACK,
       anon_sym_RBRACE,
-  [50872] = 6,
+  [50713] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1889), 1,
-      anon_sym_DOT,
-    ACTIONS(1918), 1,
-      anon_sym_LPAREN,
-    ACTIONS(2105), 1,
-      anon_sym_EQ,
-    STATE(910), 1,
-      aux_sym_match_value_pattern_repeat1,
-    ACTIONS(1920), 4,
-      anon_sym_RPAREN,
-      anon_sym_COMMA,
-      anon_sym_as,
-      anon_sym_PIPE,
-  [50894] = 4,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2051), 1,
-      anon_sym_and,
-    ACTIONS(2053), 1,
-      anon_sym_or,
-    ACTIONS(1912), 6,
+    ACTIONS(1411), 8,
       sym__newline,
       anon_sym_from,
       anon_sym_COMMA,
       anon_sym_if,
       anon_sym_EQ,
-      sym__semicolon,
-  [50912] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2051), 1,
       anon_sym_and,
-    ACTIONS(1912), 7,
-      sym__newline,
-      anon_sym_from,
-      anon_sym_COMMA,
-      anon_sym_if,
-      anon_sym_EQ,
       anon_sym_or,
       sym__semicolon,
-  [50928] = 7,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(67), 1,
-      anon_sym_AT,
-    ACTIONS(2107), 1,
-      anon_sym_async,
-    ACTIONS(2109), 1,
-      anon_sym_def,
-    ACTIONS(2111), 1,
-      anon_sym_class,
-    STATE(499), 2,
-      sym_function_definition,
-      sym_class_definition,
-    STATE(1062), 2,
-      sym_decorator,
-      aux_sym_decorated_definition_repeat1,
-  [50952] = 7,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(848), 1,
-      anon_sym_except,
-    ACTIONS(864), 1,
-      anon_sym_except_STAR,
-    ACTIONS(2087), 1,
-      anon_sym_finally,
-    STATE(507), 1,
-      sym_finally_clause,
-    STATE(237), 2,
-      sym_except_group_clause,
-      aux_sym_try_statement_repeat2,
-    STATE(238), 2,
-      sym_except_clause,
-      aux_sym_try_statement_repeat1,
-  [50976] = 2,
+  [50727] = 2,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(2113), 8,
@@ -68946,51 +65110,25 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_PIPE,
       anon_sym_RBRACK,
       anon_sym_RBRACE,
-  [50990] = 4,
+  [50741] = 5,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2117), 1,
-      anon_sym_COMMA,
-    STATE(1005), 1,
-      aux_sym_expression_list_repeat1,
-    ACTIONS(2115), 6,
-      anon_sym_RPAREN,
-      anon_sym_COLON,
-      anon_sym_RBRACK,
-      anon_sym_RBRACE,
-      anon_sym_EQ,
-      sym_type_conversion,
-  [51008] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2120), 8,
-      anon_sym_RPAREN,
-      anon_sym_COMMA,
-      anon_sym_as,
+    ACTIONS(2023), 1,
       anon_sym_if,
-      anon_sym_COLON,
-      anon_sym_PIPE,
-      anon_sym_RBRACK,
-      anon_sym_RBRACE,
-  [51022] = 5,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2051), 1,
+    ACTIONS(2025), 1,
       anon_sym_and,
-    ACTIONS(2053), 1,
+    ACTIONS(2027), 1,
       anon_sym_or,
-    ACTIONS(2071), 1,
-      anon_sym_if,
-    ACTIONS(1877), 5,
+    ACTIONS(1898), 5,
       sym__newline,
       anon_sym_from,
       anon_sym_COMMA,
       anon_sym_EQ,
       sym__semicolon,
-  [51042] = 2,
+  [50761] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2122), 8,
+    ACTIONS(2115), 8,
       anon_sym_RPAREN,
       anon_sym_COMMA,
       anon_sym_as,
@@ -68999,22 +65137,10 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_PIPE,
       anon_sym_RBRACK,
       anon_sym_RBRACE,
-  [51056] = 2,
+  [50775] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1479), 8,
-      sym__newline,
-      anon_sym_from,
-      anon_sym_COMMA,
-      anon_sym_if,
-      anon_sym_EQ,
-      anon_sym_and,
-      anon_sym_or,
-      sym__semicolon,
-  [51070] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2124), 8,
+    ACTIONS(2117), 8,
       anon_sym_RPAREN,
       anon_sym_COMMA,
       anon_sym_as,
@@ -69023,10 +65149,10 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_PIPE,
       anon_sym_RBRACK,
       anon_sym_RBRACE,
-  [51084] = 2,
+  [50789] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2126), 8,
+    ACTIONS(2119), 8,
       anon_sym_RPAREN,
       anon_sym_COMMA,
       anon_sym_as,
@@ -69035,425 +65161,131 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_PIPE,
       anon_sym_RBRACK,
       anon_sym_RBRACE,
-  [51098] = 4,
+  [50803] = 8,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2130), 1,
-      anon_sym_COMMA,
-    STATE(1012), 1,
-      aux_sym_for_in_clause_repeat1,
-    ACTIONS(2128), 6,
-      anon_sym_RPAREN,
-      anon_sym_if,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_RBRACK,
-      anon_sym_RBRACE,
-  [51116] = 4,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2135), 1,
-      anon_sym_COMMA,
-    STATE(978), 1,
-      aux_sym_for_in_clause_repeat1,
-    ACTIONS(2133), 6,
-      anon_sym_RPAREN,
-      anon_sym_if,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_RBRACK,
-      anon_sym_RBRACE,
-  [51134] = 7,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2051), 1,
-      anon_sym_and,
-    ACTIONS(2053), 1,
-      anon_sym_or,
-    ACTIONS(2069), 1,
-      anon_sym_COMMA,
-    ACTIONS(2071), 1,
-      anon_sym_if,
-    STATE(1092), 1,
-      aux_sym_expression_list_repeat1,
-    ACTIONS(1926), 2,
-      sym__newline,
-      sym__semicolon,
-  [51157] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1479), 7,
-      anon_sym_RPAREN,
-      anon_sym_COMMA,
-      anon_sym_as,
-      anon_sym_if,
-      anon_sym_COLON,
-      anon_sym_and,
-      anon_sym_or,
-  [51170] = 7,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2137), 1,
+    ACTIONS(2121), 1,
       sym_identifier,
-    ACTIONS(2139), 1,
+    ACTIONS(2123), 1,
+      anon_sym_LPAREN,
+    ACTIONS(2125), 1,
+      anon_sym_STAR,
+    STATE(1085), 1,
+      sym_dotted_name,
+    STATE(1154), 1,
+      sym_aliased_import,
+    STATE(1377), 1,
+      sym__import_list,
+    STATE(1378), 1,
+      sym_wildcard_import,
+  [50828] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2129), 1,
+      anon_sym_as,
+    ACTIONS(2127), 6,
+      anon_sym_RPAREN,
+      anon_sym_COMMA,
+      anon_sym_if,
+      anon_sym_COLON,
+      anon_sym_RBRACK,
+      anon_sym_RBRACE,
+  [50843] = 7,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2131), 1,
+      sym_identifier,
+    ACTIONS(2133), 1,
       anon_sym_DOT,
-    ACTIONS(2141), 1,
+    ACTIONS(2135), 1,
       anon_sym___future__,
     STATE(1144), 1,
       aux_sym_import_prefix_repeat1,
-    STATE(1236), 1,
+    STATE(1260), 1,
       sym_import_prefix,
-    STATE(1441), 2,
+    STATE(1437), 2,
       sym_relative_import,
       sym_dotted_name,
-  [51193] = 2,
-    ACTIONS(3), 1,
+  [50866] = 6,
+    ACTIONS(1933), 1,
       sym_comment,
-    ACTIONS(2143), 7,
-      anon_sym_RPAREN,
-      anon_sym_COMMA,
-      anon_sym_if,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_RBRACK,
-      anon_sym_RBRACE,
-  [51206] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2128), 7,
-      anon_sym_RPAREN,
-      anon_sym_COMMA,
-      anon_sym_if,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_RBRACK,
-      anon_sym_RBRACE,
-  [51219] = 7,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2051), 1,
-      anon_sym_and,
-    ACTIONS(2053), 1,
-      anon_sym_or,
-    ACTIONS(2069), 1,
-      anon_sym_COMMA,
-    ACTIONS(2071), 1,
-      anon_sym_if,
-    STATE(1092), 1,
-      aux_sym_expression_list_repeat1,
-    ACTIONS(2145), 2,
-      sym__newline,
-      sym__semicolon,
-  [51242] = 5,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2147), 1,
-      sym_identifier,
-    ACTIONS(2149), 1,
-      anon_sym_STAR,
-    ACTIONS(2151), 1,
-      anon_sym_STAR_STAR,
-    STATE(1388), 4,
-      sym_typevar_parameter,
-      sym_typevartuple_parameter,
-      sym_paramspec_parameter,
-      sym__type_parameter,
-  [51261] = 8,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1879), 1,
-      anon_sym_if,
-    ACTIONS(1881), 1,
-      anon_sym_and,
-    ACTIONS(1883), 1,
-      anon_sym_or,
-    ACTIONS(2153), 1,
-      anon_sym_COMMA,
-    ACTIONS(2155), 1,
-      anon_sym_COLON,
-    ACTIONS(2157), 1,
-      anon_sym_RBRACK,
-    STATE(1203), 1,
-      aux_sym_subscript_repeat1,
-  [51286] = 5,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1879), 1,
-      anon_sym_if,
-    ACTIONS(1881), 1,
-      anon_sym_and,
-    ACTIONS(1883), 1,
-      anon_sym_or,
-    ACTIONS(2159), 4,
-      anon_sym_RPAREN,
-      anon_sym_COMMA,
-      anon_sym_COLON,
-      anon_sym_EQ,
-  [51305] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1934), 7,
-      anon_sym_RPAREN,
-      anon_sym_COMMA,
-      anon_sym_COLON,
-      anon_sym_RBRACK,
-      anon_sym_RBRACE,
-      anon_sym_EQ,
-      sym_type_conversion,
-  [51318] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2163), 1,
-      anon_sym_as,
-    ACTIONS(2161), 6,
-      anon_sym_RPAREN,
-      anon_sym_COMMA,
-      anon_sym_if,
-      anon_sym_COLON,
-      anon_sym_RBRACK,
-      anon_sym_RBRACE,
-  [51333] = 4,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2165), 1,
-      anon_sym_and,
-    ACTIONS(2167), 1,
-      anon_sym_or,
-    ACTIONS(1922), 5,
-      anon_sym_RPAREN,
-      anon_sym_COMMA,
-      anon_sym_as,
-      anon_sym_if,
-      anon_sym_COLON,
-  [51350] = 7,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2051), 1,
-      anon_sym_and,
-    ACTIONS(2053), 1,
-      anon_sym_or,
-    ACTIONS(2071), 1,
-      anon_sym_if,
-    ACTIONS(2169), 1,
-      anon_sym_COMMA,
-    STATE(1137), 1,
-      aux_sym_assert_statement_repeat1,
-    ACTIONS(2171), 2,
-      sym__newline,
-      sym__semicolon,
-  [51373] = 5,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2165), 1,
-      anon_sym_and,
-    ACTIONS(2167), 1,
-      anon_sym_or,
-    ACTIONS(2173), 1,
-      anon_sym_if,
-    ACTIONS(1895), 4,
-      anon_sym_RPAREN,
-      anon_sym_COMMA,
-      anon_sym_as,
-      anon_sym_COLON,
-  [51392] = 4,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2165), 1,
-      anon_sym_and,
-    ACTIONS(2167), 1,
-      anon_sym_or,
-    ACTIONS(1901), 5,
-      anon_sym_RPAREN,
-      anon_sym_COMMA,
-      anon_sym_as,
-      anon_sym_if,
-      anon_sym_COLON,
-  [51409] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2165), 1,
-      anon_sym_and,
-    ACTIONS(1912), 6,
-      anon_sym_RPAREN,
-      anon_sym_COMMA,
-      anon_sym_as,
-      anon_sym_if,
-      anon_sym_COLON,
-      anon_sym_or,
-  [51424] = 4,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2165), 1,
-      anon_sym_and,
-    ACTIONS(2167), 1,
-      anon_sym_or,
-    ACTIONS(1912), 5,
-      anon_sym_RPAREN,
-      anon_sym_COMMA,
-      anon_sym_as,
-      anon_sym_if,
-      anon_sym_COLON,
-  [51441] = 6,
-    ACTIONS(1942), 1,
-      sym_comment,
-    ACTIONS(2175), 1,
+    ACTIONS(2137), 1,
       anon_sym_LBRACE2,
-    ACTIONS(2179), 1,
+    ACTIONS(2142), 1,
       sym__not_escape_sequence,
-    ACTIONS(2181), 1,
+    ACTIONS(2145), 1,
       sym__string_end,
-    STATE(1055), 1,
+    STATE(994), 1,
       aux_sym_string_content_repeat1,
-    ACTIONS(2177), 3,
+    ACTIONS(2139), 3,
       sym__string_content,
       sym__escape_interpolation,
       sym_escape_sequence,
-  [51462] = 5,
+  [50887] = 7,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2165), 1,
+    ACTIONS(2021), 1,
+      anon_sym_COMMA,
+    ACTIONS(2023), 1,
+      anon_sym_if,
+    ACTIONS(2025), 1,
       anon_sym_and,
-    ACTIONS(2167), 1,
+    ACTIONS(2027), 1,
       anon_sym_or,
-    ACTIONS(2173), 1,
-      anon_sym_if,
-    ACTIONS(1877), 4,
-      anon_sym_RPAREN,
-      anon_sym_COMMA,
-      anon_sym_as,
-      anon_sym_COLON,
-  [51481] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2183), 7,
-      anon_sym_RPAREN,
-      anon_sym_COMMA,
-      anon_sym_if,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_RBRACK,
-      anon_sym_RBRACE,
-  [51494] = 7,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2051), 1,
-      anon_sym_and,
-    ACTIONS(2053), 1,
-      anon_sym_or,
-    ACTIONS(2069), 1,
-      anon_sym_COMMA,
-    ACTIONS(2071), 1,
-      anon_sym_if,
-    STATE(1092), 1,
+    STATE(1074), 1,
       aux_sym_expression_list_repeat1,
-    ACTIONS(2185), 2,
+    ACTIONS(2147), 2,
       sym__newline,
       sym__semicolon,
-  [51517] = 5,
+  [50910] = 5,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2165), 1,
-      anon_sym_and,
-    ACTIONS(2167), 1,
-      anon_sym_or,
-    ACTIONS(2173), 1,
+    ACTIONS(2023), 1,
       anon_sym_if,
-    ACTIONS(1885), 4,
-      anon_sym_RPAREN,
-      anon_sym_COMMA,
-      anon_sym_as,
-      anon_sym_COLON,
-  [51536] = 5,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2051), 1,
+    ACTIONS(2025), 1,
       anon_sym_and,
-    ACTIONS(2053), 1,
+    ACTIONS(2027), 1,
       anon_sym_or,
-    ACTIONS(2071), 1,
-      anon_sym_if,
-    ACTIONS(1934), 4,
+    ACTIONS(1922), 4,
       sym__newline,
       anon_sym_from,
       anon_sym_COMMA,
       sym__semicolon,
-  [51555] = 5,
+  [50929] = 6,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2147), 1,
-      sym_identifier,
     ACTIONS(2149), 1,
-      anon_sym_STAR,
+      anon_sym_except,
     ACTIONS(2151), 1,
-      anon_sym_STAR_STAR,
-    STATE(1227), 4,
-      sym_typevar_parameter,
-      sym_typevartuple_parameter,
-      sym_paramspec_parameter,
-      sym__type_parameter,
-  [51574] = 8,
+      anon_sym_finally,
+    STATE(514), 1,
+      sym_finally_clause,
+    STATE(230), 2,
+      sym_except_clause,
+      aux_sym_try_statement_repeat1,
+    STATE(231), 2,
+      sym_except_group_clause,
+      aux_sym_try_statement_repeat2,
+  [50950] = 7,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1867), 1,
-      anon_sym_async,
-    ACTIONS(1869), 1,
-      anon_sym_for,
-    ACTIONS(2187), 1,
-      anon_sym_COMMA,
-    ACTIONS(2189), 1,
-      anon_sym_RBRACE,
-    STATE(956), 1,
-      sym_for_in_clause,
-    STATE(1247), 1,
-      aux_sym_dictionary_repeat1,
-    STATE(1433), 1,
-      sym__comprehension_clauses,
-  [51599] = 5,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1863), 1,
+    ACTIONS(2023), 1,
       anon_sym_if,
-    ACTIONS(1873), 1,
+    ACTIONS(2025), 1,
       anon_sym_and,
-    ACTIONS(1875), 1,
+    ACTIONS(2027), 1,
       anon_sym_or,
-    ACTIONS(2191), 4,
+    ACTIONS(2153), 1,
       anon_sym_COMMA,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_RBRACE,
-  [51618] = 8,
+    STATE(1172), 1,
+      aux_sym_assert_statement_repeat1,
+    ACTIONS(2155), 2,
+      sym__newline,
+      sym__semicolon,
+  [50973] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1879), 1,
-      anon_sym_if,
-    ACTIONS(1881), 1,
-      anon_sym_and,
-    ACTIONS(1883), 1,
-      anon_sym_or,
-    ACTIONS(2155), 1,
-      anon_sym_COLON,
-    ACTIONS(2193), 1,
-      anon_sym_COMMA,
-    ACTIONS(2195), 1,
-      anon_sym_RBRACK,
-    STATE(1282), 1,
-      aux_sym_subscript_repeat1,
-  [51643] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1926), 7,
-      anon_sym_RPAREN,
-      anon_sym_COMMA,
-      anon_sym_COLON,
-      anon_sym_RBRACK,
-      anon_sym_RBRACE,
-      anon_sym_EQ,
-      sym_type_conversion,
-  [51656] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1848), 7,
+    ACTIONS(1840), 7,
       anon_sym_RPAREN,
       anon_sym_COMMA,
       anon_sym_as,
@@ -69461,262 +65293,615 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_COLON,
       anon_sym_and,
       anon_sym_or,
-  [51669] = 7,
+  [50986] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2051), 1,
-      anon_sym_and,
-    ACTIONS(2053), 1,
-      anon_sym_or,
-    ACTIONS(2071), 1,
-      anon_sym_if,
-    ACTIONS(2197), 1,
+    ACTIONS(1873), 7,
+      anon_sym_RPAREN,
       anon_sym_COMMA,
-    STATE(1172), 1,
-      aux_sym_print_statement_repeat1,
-    ACTIONS(2199), 2,
-      sym__newline,
-      sym__semicolon,
-  [51692] = 7,
+      anon_sym_COLON,
+      anon_sym_RBRACK,
+      anon_sym_RBRACE,
+      anon_sym_EQ,
+      sym_type_conversion,
+  [50999] = 6,
+    ACTIONS(1933), 1,
+      sym_comment,
+    ACTIONS(2157), 1,
+      anon_sym_LBRACE2,
+    ACTIONS(2161), 1,
+      sym__not_escape_sequence,
+    ACTIONS(2163), 1,
+      sym__string_end,
+    STATE(994), 1,
+      aux_sym_string_content_repeat1,
+    ACTIONS(2159), 3,
+      sym__string_content,
+      sym__escape_interpolation,
+      sym_escape_sequence,
+  [51020] = 5,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2051), 1,
-      anon_sym_and,
-    ACTIONS(2053), 1,
-      anon_sym_or,
-    ACTIONS(2071), 1,
+    ACTIONS(1857), 1,
       anon_sym_if,
+    ACTIONS(1867), 1,
+      anon_sym_and,
+    ACTIONS(1869), 1,
+      anon_sym_or,
+    ACTIONS(2165), 4,
+      anon_sym_COMMA,
+      anon_sym_async,
+      anon_sym_for,
+      anon_sym_RBRACE,
+  [51039] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1411), 7,
+      anon_sym_RPAREN,
+      anon_sym_COMMA,
+      anon_sym_as,
+      anon_sym_if,
+      anon_sym_COLON,
+      anon_sym_and,
+      anon_sym_or,
+  [51052] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1955), 7,
+      anon_sym_RPAREN,
+      anon_sym_COMMA,
+      anon_sym_COLON,
+      anon_sym_RBRACK,
+      anon_sym_RBRACE,
+      anon_sym_EQ,
+      sym_type_conversion,
+  [51065] = 5,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1851), 1,
+      anon_sym_and,
+    ACTIONS(1853), 1,
+      anon_sym_or,
+    ACTIONS(1877), 1,
+      anon_sym_if,
+    ACTIONS(2167), 4,
+      anon_sym_RPAREN,
+      anon_sym_COMMA,
+      anon_sym_RBRACK,
+      anon_sym_RBRACE,
+  [51084] = 5,
+    ACTIONS(3), 1,
+      sym_comment,
     ACTIONS(2169), 1,
-      anon_sym_COMMA,
-    STATE(1174), 1,
-      aux_sym_assert_statement_repeat1,
-    ACTIONS(2201), 2,
-      sym__newline,
-      sym__semicolon,
-  [51715] = 7,
+      sym_identifier,
+    ACTIONS(2171), 1,
+      anon_sym_STAR,
+    ACTIONS(2173), 1,
+      anon_sym_STAR_STAR,
+    STATE(1317), 4,
+      sym_typevar_parameter,
+      sym_typevartuple_parameter,
+      sym_paramspec_parameter,
+      sym__type_parameter,
+  [51103] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2051), 1,
+    ACTIONS(2175), 1,
       anon_sym_and,
-    ACTIONS(2053), 1,
+    ACTIONS(2177), 1,
       anon_sym_or,
-    ACTIONS(2069), 1,
+    ACTIONS(1871), 5,
+      anon_sym_RPAREN,
       anon_sym_COMMA,
-    ACTIONS(2071), 1,
+      anon_sym_as,
       anon_sym_if,
-    STATE(1092), 1,
+      anon_sym_COLON,
+  [51120] = 5,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2175), 1,
+      anon_sym_and,
+    ACTIONS(2177), 1,
+      anon_sym_or,
+    ACTIONS(2179), 1,
+      anon_sym_if,
+    ACTIONS(1894), 4,
+      anon_sym_RPAREN,
+      anon_sym_COMMA,
+      anon_sym_as,
+      anon_sym_COLON,
+  [51139] = 4,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2175), 1,
+      anon_sym_and,
+    ACTIONS(2177), 1,
+      anon_sym_or,
+    ACTIONS(1849), 5,
+      anon_sym_RPAREN,
+      anon_sym_COMMA,
+      anon_sym_as,
+      anon_sym_if,
+      anon_sym_COLON,
+  [51156] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2175), 1,
+      anon_sym_and,
+    ACTIONS(1879), 6,
+      anon_sym_RPAREN,
+      anon_sym_COMMA,
+      anon_sym_as,
+      anon_sym_if,
+      anon_sym_COLON,
+      anon_sym_or,
+  [51171] = 5,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1851), 1,
+      anon_sym_and,
+    ACTIONS(1853), 1,
+      anon_sym_or,
+    ACTIONS(1877), 1,
+      anon_sym_if,
+    ACTIONS(2181), 4,
+      anon_sym_RPAREN,
+      anon_sym_COMMA,
+      anon_sym_COLON,
+      anon_sym_EQ,
+  [51190] = 4,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2175), 1,
+      anon_sym_and,
+    ACTIONS(2177), 1,
+      anon_sym_or,
+    ACTIONS(1879), 5,
+      anon_sym_RPAREN,
+      anon_sym_COMMA,
+      anon_sym_as,
+      anon_sym_if,
+      anon_sym_COLON,
+  [51207] = 6,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2149), 1,
+      anon_sym_except,
+    ACTIONS(2151), 1,
+      anon_sym_finally,
+    STATE(575), 1,
+      sym_finally_clause,
+    STATE(235), 2,
+      sym_except_clause,
+      aux_sym_try_statement_repeat1,
+    STATE(237), 2,
+      sym_except_group_clause,
+      aux_sym_try_statement_repeat2,
+  [51228] = 7,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2021), 1,
+      anon_sym_COMMA,
+    ACTIONS(2023), 1,
+      anon_sym_if,
+    ACTIONS(2025), 1,
+      anon_sym_and,
+    ACTIONS(2027), 1,
+      anon_sym_or,
+    STATE(1074), 1,
       aux_sym_expression_list_repeat1,
-    ACTIONS(2203), 2,
+    ACTIONS(1873), 2,
       sym__newline,
       sym__semicolon,
-  [51738] = 7,
+  [51251] = 5,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2051), 1,
+    ACTIONS(2169), 1,
+      sym_identifier,
+    ACTIONS(2171), 1,
+      anon_sym_STAR,
+    ACTIONS(2173), 1,
+      anon_sym_STAR_STAR,
+    STATE(1297), 4,
+      sym_typevar_parameter,
+      sym_typevartuple_parameter,
+      sym_paramspec_parameter,
+      sym__type_parameter,
+  [51270] = 5,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2175), 1,
       anon_sym_and,
-    ACTIONS(2053), 1,
+    ACTIONS(2177), 1,
       anon_sym_or,
-    ACTIONS(2069), 1,
-      anon_sym_COMMA,
-    ACTIONS(2071), 1,
+    ACTIONS(2179), 1,
       anon_sym_if,
-    STATE(1092), 1,
+    ACTIONS(1898), 4,
+      anon_sym_RPAREN,
+      anon_sym_COMMA,
+      anon_sym_as,
+      anon_sym_COLON,
+  [51289] = 5,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2175), 1,
+      anon_sym_and,
+    ACTIONS(2177), 1,
+      anon_sym_or,
+    ACTIONS(2179), 1,
+      anon_sym_if,
+    ACTIONS(1883), 4,
+      anon_sym_RPAREN,
+      anon_sym_COMMA,
+      anon_sym_as,
+      anon_sym_COLON,
+  [51308] = 8,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1851), 1,
+      anon_sym_and,
+    ACTIONS(1853), 1,
+      anon_sym_or,
+    ACTIONS(1877), 1,
+      anon_sym_if,
+    ACTIONS(2183), 1,
+      anon_sym_COMMA,
+    ACTIONS(2185), 1,
+      anon_sym_COLON,
+    ACTIONS(2187), 1,
+      anon_sym_RBRACK,
+    STATE(1281), 1,
+      aux_sym_subscript_repeat1,
+  [51333] = 7,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2023), 1,
+      anon_sym_if,
+    ACTIONS(2025), 1,
+      anon_sym_and,
+    ACTIONS(2027), 1,
+      anon_sym_or,
+    ACTIONS(2189), 1,
+      anon_sym_COMMA,
+    STATE(1130), 1,
+      aux_sym_print_statement_repeat1,
+    ACTIONS(2191), 2,
+      sym__newline,
+      sym__semicolon,
+  [51356] = 6,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2193), 1,
+      anon_sym_except,
+    ACTIONS(2195), 1,
+      anon_sym_finally,
+    STATE(522), 1,
+      sym_finally_clause,
+    STATE(238), 2,
+      sym_except_clause,
+      aux_sym_try_statement_repeat1,
+    STATE(243), 2,
+      sym_except_group_clause,
+      aux_sym_try_statement_repeat2,
+  [51377] = 7,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2023), 1,
+      anon_sym_if,
+    ACTIONS(2025), 1,
+      anon_sym_and,
+    ACTIONS(2027), 1,
+      anon_sym_or,
+    ACTIONS(2153), 1,
+      anon_sym_COMMA,
+    STATE(1131), 1,
+      aux_sym_assert_statement_repeat1,
+    ACTIONS(2197), 2,
+      sym__newline,
+      sym__semicolon,
+  [51400] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2199), 7,
+      anon_sym_RPAREN,
+      anon_sym_COMMA,
+      anon_sym_if,
+      anon_sym_async,
+      anon_sym_for,
+      anon_sym_RBRACK,
+      anon_sym_RBRACE,
+  [51413] = 8,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1851), 1,
+      anon_sym_and,
+    ACTIONS(1853), 1,
+      anon_sym_or,
+    ACTIONS(1877), 1,
+      anon_sym_if,
+    ACTIONS(2185), 1,
+      anon_sym_COLON,
+    ACTIONS(2201), 1,
+      anon_sym_COMMA,
+    ACTIONS(2203), 1,
+      anon_sym_RBRACK,
+    STATE(1280), 1,
+      aux_sym_subscript_repeat1,
+  [51438] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2082), 7,
+      anon_sym_RPAREN,
+      anon_sym_COMMA,
+      anon_sym_if,
+      anon_sym_async,
+      anon_sym_for,
+      anon_sym_RBRACK,
+      anon_sym_RBRACE,
+  [51451] = 7,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2021), 1,
+      anon_sym_COMMA,
+    ACTIONS(2023), 1,
+      anon_sym_if,
+    ACTIONS(2025), 1,
+      anon_sym_and,
+    ACTIONS(2027), 1,
+      anon_sym_or,
+    STATE(1074), 1,
       aux_sym_expression_list_repeat1,
     ACTIONS(2205), 2,
       sym__newline,
       sym__semicolon,
-  [51761] = 8,
+  [51474] = 5,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1879), 1,
+    ACTIONS(2023), 1,
       anon_sym_if,
-    ACTIONS(1881), 1,
+    ACTIONS(2025), 1,
       anon_sym_and,
-    ACTIONS(1883), 1,
+    ACTIONS(2027), 1,
       anon_sym_or,
-    ACTIONS(2155), 1,
-      anon_sym_COLON,
-    ACTIONS(2207), 1,
-      anon_sym_COMMA,
-    ACTIONS(2209), 1,
-      anon_sym_RBRACK,
-    STATE(1272), 1,
-      aux_sym_subscript_repeat1,
-  [51786] = 5,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2051), 1,
-      anon_sym_and,
-    ACTIONS(2053), 1,
-      anon_sym_or,
-    ACTIONS(2071), 1,
-      anon_sym_if,
-    ACTIONS(1979), 4,
+    ACTIONS(1955), 4,
       sym__newline,
       anon_sym_from,
       anon_sym_COMMA,
       sym__semicolon,
-  [51805] = 8,
+  [51493] = 7,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1867), 1,
-      anon_sym_async,
-    ACTIONS(1869), 1,
-      anon_sym_for,
+    ACTIONS(2021), 1,
+      anon_sym_COMMA,
+    ACTIONS(2023), 1,
+      anon_sym_if,
+    ACTIONS(2025), 1,
+      anon_sym_and,
+    ACTIONS(2027), 1,
+      anon_sym_or,
+    STATE(1074), 1,
+      aux_sym_expression_list_repeat1,
+    ACTIONS(2207), 2,
+      sym__newline,
+      sym__semicolon,
+  [51516] = 8,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1851), 1,
+      anon_sym_and,
+    ACTIONS(1853), 1,
+      anon_sym_or,
+    ACTIONS(1877), 1,
+      anon_sym_if,
+    ACTIONS(2185), 1,
+      anon_sym_COLON,
+    ACTIONS(2209), 1,
+      anon_sym_COMMA,
     ACTIONS(2211), 1,
-      anon_sym_COMMA,
-    ACTIONS(2213), 1,
-      anon_sym_RBRACE,
-    STATE(956), 1,
-      sym_for_in_clause,
-    STATE(1300), 1,
-      aux_sym_dictionary_repeat1,
-    STATE(1411), 1,
-      sym__comprehension_clauses,
-  [51830] = 6,
+      anon_sym_RBRACK,
+    STATE(1284), 1,
+      aux_sym_subscript_repeat1,
+  [51541] = 7,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2165), 1,
-      anon_sym_and,
-    ACTIONS(2167), 1,
-      anon_sym_or,
-    ACTIONS(2173), 1,
+    ACTIONS(2021), 1,
+      anon_sym_COMMA,
+    ACTIONS(2023), 1,
       anon_sym_if,
-    ACTIONS(2217), 1,
-      anon_sym_as,
-    ACTIONS(2215), 3,
-      anon_sym_RPAREN,
-      anon_sym_COMMA,
-      anon_sym_COLON,
-  [51851] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1852), 7,
-      anon_sym_RPAREN,
-      anon_sym_COMMA,
-      anon_sym_as,
-      anon_sym_if,
-      anon_sym_COLON,
+    ACTIONS(2025), 1,
       anon_sym_and,
+    ACTIONS(2027), 1,
       anon_sym_or,
-  [51864] = 8,
+    STATE(1074), 1,
+      aux_sym_expression_list_repeat1,
+    ACTIONS(2213), 2,
+      sym__newline,
+      sym__semicolon,
+  [51564] = 6,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1867), 1,
+    ACTIONS(2193), 1,
+      anon_sym_except,
+    ACTIONS(2195), 1,
+      anon_sym_finally,
+    STATE(481), 1,
+      sym_finally_clause,
+    STATE(223), 2,
+      sym_except_group_clause,
+      aux_sym_try_statement_repeat2,
+    STATE(225), 2,
+      sym_except_clause,
+      aux_sym_try_statement_repeat1,
+  [51585] = 8,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1861), 1,
       anon_sym_async,
-    ACTIONS(1869), 1,
+    ACTIONS(1863), 1,
+      anon_sym_for,
+    ACTIONS(2215), 1,
+      anon_sym_COMMA,
+    ACTIONS(2217), 1,
+      anon_sym_RBRACE,
+    STATE(942), 1,
+      sym_for_in_clause,
+    STATE(1182), 1,
+      aux_sym_dictionary_repeat1,
+    STATE(1390), 1,
+      sym__comprehension_clauses,
+  [51610] = 8,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1861), 1,
+      anon_sym_async,
+    ACTIONS(1863), 1,
       anon_sym_for,
     ACTIONS(2219), 1,
       anon_sym_COMMA,
     ACTIONS(2221), 1,
       anon_sym_RBRACE,
-    STATE(956), 1,
+    STATE(942), 1,
       sym_for_in_clause,
-    STATE(1234), 1,
+    STATE(1285), 1,
       aux_sym_dictionary_repeat1,
-    STATE(1439), 1,
+    STATE(1432), 1,
       sym__comprehension_clauses,
-  [51889] = 5,
+  [51635] = 6,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1879), 1,
-      anon_sym_if,
-    ACTIONS(1881), 1,
+    ACTIONS(2175), 1,
       anon_sym_and,
-    ACTIONS(1883), 1,
+    ACTIONS(2177), 1,
       anon_sym_or,
-    ACTIONS(2223), 4,
+    ACTIONS(2179), 1,
+      anon_sym_if,
+    ACTIONS(2225), 1,
+      anon_sym_as,
+    ACTIONS(2223), 3,
       anon_sym_RPAREN,
       anon_sym_COMMA,
+      anon_sym_COLON,
+  [51656] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2227), 7,
+      anon_sym_RPAREN,
+      anon_sym_COMMA,
+      anon_sym_if,
+      anon_sym_async,
+      anon_sym_for,
       anon_sym_RBRACK,
       anon_sym_RBRACE,
-  [51908] = 5,
+  [51669] = 8,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2051), 1,
-      anon_sym_and,
-    ACTIONS(2053), 1,
-      anon_sym_or,
-    ACTIONS(2071), 1,
-      anon_sym_if,
-    ACTIONS(1981), 4,
-      sym__newline,
-      anon_sym_from,
+    ACTIONS(1861), 1,
+      anon_sym_async,
+    ACTIONS(1863), 1,
+      anon_sym_for,
+    ACTIONS(2229), 1,
       anon_sym_COMMA,
-      sym__semicolon,
-  [51927] = 6,
-    ACTIONS(1942), 1,
+    ACTIONS(2231), 1,
+      anon_sym_RBRACE,
+    STATE(942), 1,
+      sym_for_in_clause,
+    STATE(1242), 1,
+      aux_sym_dictionary_repeat1,
+    STATE(1452), 1,
+      sym__comprehension_clauses,
+  [51694] = 7,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1851), 1,
+      anon_sym_and,
+    ACTIONS(1853), 1,
+      anon_sym_or,
+    ACTIONS(1877), 1,
+      anon_sym_if,
+    ACTIONS(1977), 1,
+      anon_sym_RPAREN,
+    ACTIONS(1979), 1,
+      anon_sym_COMMA,
+    STATE(1277), 1,
+      aux_sym_argument_list_repeat1,
+  [51716] = 4,
+    ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2225), 1,
-      anon_sym_LBRACE2,
-    ACTIONS(2230), 1,
-      sym__not_escape_sequence,
     ACTIONS(2233), 1,
-      sym__string_end,
-    STATE(1055), 1,
-      aux_sym_string_content_repeat1,
-    ACTIONS(2227), 3,
+      anon_sym_DOT,
+    STATE(1037), 1,
+      aux_sym_match_value_pattern_repeat1,
+    ACTIONS(1844), 4,
+      sym__newline,
+      anon_sym_COMMA,
+      anon_sym_as,
+      sym__semicolon,
+  [51732] = 7,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1851), 1,
+      anon_sym_and,
+    ACTIONS(1853), 1,
+      anon_sym_or,
+    ACTIONS(1875), 1,
+      anon_sym_COMMA,
+    ACTIONS(1877), 1,
+      anon_sym_if,
+    ACTIONS(2236), 1,
+      anon_sym_COLON,
+    STATE(951), 1,
+      aux_sym_expression_list_repeat1,
+  [51754] = 3,
+    ACTIONS(1933), 1,
+      sym_comment,
+    ACTIONS(2238), 2,
+      anon_sym_LBRACE2,
+      sym__not_escape_sequence,
+    ACTIONS(2240), 4,
       sym__string_content,
+      sym__string_end,
       sym__escape_interpolation,
       sym_escape_sequence,
-  [51948] = 8,
+  [51768] = 5,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2235), 1,
-      sym_identifier,
-    ACTIONS(2237), 1,
-      anon_sym_LPAREN,
-    ACTIONS(2239), 1,
-      anon_sym_STAR,
-    STATE(1109), 1,
-      sym_dotted_name,
-    STATE(1143), 1,
-      sym_aliased_import,
-    STATE(1393), 1,
-      sym_wildcard_import,
-    STATE(1395), 1,
-      sym__import_list,
-  [51973] = 4,
+    ACTIONS(2023), 1,
+      anon_sym_if,
+    ACTIONS(2025), 1,
+      anon_sym_and,
+    ACTIONS(2027), 1,
+      anon_sym_or,
+    ACTIONS(2181), 3,
+      sym__newline,
+      anon_sym_EQ,
+      sym__semicolon,
+  [51786] = 5,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2241), 1,
+    ACTIONS(1851), 1,
+      anon_sym_and,
+    ACTIONS(1853), 1,
+      anon_sym_or,
+    ACTIONS(1877), 1,
+      anon_sym_if,
+    ACTIONS(2242), 3,
+      anon_sym_RPAREN,
+      anon_sym_COMMA,
+      anon_sym_COLON,
+  [51804] = 4,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2244), 1,
       anon_sym_DOT,
-    STATE(1057), 1,
+    STATE(1037), 1,
       aux_sym_match_value_pattern_repeat1,
-    ACTIONS(1856), 4,
+    ACTIONS(2246), 4,
       sym__newline,
       anon_sym_COMMA,
       anon_sym_as,
       sym__semicolon,
-  [51989] = 4,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1889), 1,
-      anon_sym_DOT,
-    STATE(906), 1,
-      aux_sym_match_value_pattern_repeat1,
-    ACTIONS(2244), 4,
-      anon_sym_import,
-      anon_sym_RPAREN,
-      anon_sym_COMMA,
-      anon_sym_as,
-  [52005] = 7,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1879), 1,
-      anon_sym_if,
-    ACTIONS(1881), 1,
-      anon_sym_and,
-    ACTIONS(1883), 1,
-      anon_sym_or,
-    ACTIONS(1928), 1,
-      anon_sym_COMMA,
-    ACTIONS(2246), 1,
-      anon_sym_COLON,
-    STATE(964), 1,
-      aux_sym_expression_list_repeat1,
-  [52027] = 3,
-    ACTIONS(1942), 1,
+  [51820] = 3,
+    ACTIONS(1933), 1,
       sym_comment,
     ACTIONS(2248), 2,
       anon_sym_LBRACE2,
@@ -69726,5168 +65911,5105 @@ static const uint16_t ts_small_parse_table[] = {
       sym__string_end,
       sym__escape_interpolation,
       sym_escape_sequence,
-  [52041] = 4,
+  [51834] = 6,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1889), 1,
+    ACTIONS(2254), 1,
+      anon_sym_COLON,
+    ACTIONS(2256), 1,
+      anon_sym_EQ,
+    STATE(1161), 1,
+      sym__type_bound,
+    STATE(1374), 1,
+      sym__type_param_default,
+    ACTIONS(2252), 2,
+      anon_sym_COMMA,
+      anon_sym_RBRACK,
+  [51854] = 5,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1851), 1,
+      anon_sym_and,
+    ACTIONS(1853), 1,
+      anon_sym_or,
+    ACTIONS(1877), 1,
+      anon_sym_if,
+    ACTIONS(2258), 3,
+      anon_sym_COMMA,
+      anon_sym_RBRACK,
+      anon_sym_EQ,
+  [51872] = 4,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1902), 1,
       anon_sym_DOT,
-    STATE(1058), 1,
+    STATE(887), 1,
       aux_sym_match_value_pattern_repeat1,
-    ACTIONS(2252), 4,
+    ACTIONS(2246), 4,
       anon_sym_import,
       anon_sym_RPAREN,
       anon_sym_COMMA,
       anon_sym_as,
-  [52057] = 4,
+  [51888] = 7,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2256), 1,
+    ACTIONS(1851), 1,
+      anon_sym_and,
+    ACTIONS(1853), 1,
+      anon_sym_or,
+    ACTIONS(1875), 1,
+      anon_sym_COMMA,
+    ACTIONS(1877), 1,
+      anon_sym_if,
+    ACTIONS(2260), 1,
+      anon_sym_COLON,
+    STATE(951), 1,
+      aux_sym_expression_list_repeat1,
+  [51910] = 3,
+    ACTIONS(1933), 1,
+      sym_comment,
+    ACTIONS(2262), 2,
+      anon_sym_LBRACE2,
+      sym__not_escape_sequence,
+    ACTIONS(2264), 4,
+      sym__string_content,
+      sym__string_end,
+      sym__escape_interpolation,
+      sym_escape_sequence,
+  [51924] = 7,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1851), 1,
+      anon_sym_and,
+    ACTIONS(1853), 1,
+      anon_sym_or,
+    ACTIONS(1875), 1,
+      anon_sym_COMMA,
+    ACTIONS(1877), 1,
+      anon_sym_if,
+    ACTIONS(2266), 1,
+      anon_sym_COLON,
+    STATE(951), 1,
+      aux_sym_expression_list_repeat1,
+  [51946] = 3,
+    ACTIONS(1933), 1,
+      sym_comment,
+    ACTIONS(2268), 2,
+      anon_sym_LBRACE2,
+      sym__not_escape_sequence,
+    ACTIONS(2270), 4,
+      sym__string_content,
+      sym__string_end,
+      sym__escape_interpolation,
+      sym_escape_sequence,
+  [51960] = 6,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1851), 1,
+      anon_sym_and,
+    ACTIONS(1853), 1,
+      anon_sym_or,
+    ACTIONS(1877), 1,
+      anon_sym_if,
+    ACTIONS(2274), 1,
+      anon_sym_COLON,
+    ACTIONS(2272), 2,
+      anon_sym_COMMA,
+      anon_sym_RBRACK,
+  [51980] = 6,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1851), 1,
+      anon_sym_and,
+    ACTIONS(1853), 1,
+      anon_sym_or,
+    ACTIONS(1877), 1,
+      anon_sym_if,
+    ACTIONS(2278), 1,
+      anon_sym_COLON,
+    ACTIONS(2276), 2,
+      anon_sym_COMMA,
+      anon_sym_RBRACK,
+  [52000] = 3,
+    ACTIONS(1933), 1,
+      sym_comment,
+    ACTIONS(2280), 2,
+      anon_sym_LBRACE2,
+      sym__not_escape_sequence,
+    ACTIONS(2282), 4,
+      sym__string_content,
+      sym__string_end,
+      sym__escape_interpolation,
+      sym_escape_sequence,
+  [52014] = 6,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1851), 1,
+      anon_sym_and,
+    ACTIONS(1853), 1,
+      anon_sym_or,
+    ACTIONS(1877), 1,
+      anon_sym_if,
+    ACTIONS(2185), 1,
+      anon_sym_COLON,
+    ACTIONS(2284), 2,
+      anon_sym_COMMA,
+      anon_sym_RBRACK,
+  [52034] = 4,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2288), 1,
       anon_sym_AT,
-    STATE(1062), 2,
+    STATE(1055), 2,
       sym_decorator,
       aux_sym_decorated_definition_repeat1,
-    ACTIONS(2254), 3,
+    ACTIONS(2286), 3,
       anon_sym_async,
       anon_sym_def,
       anon_sym_class,
-  [52073] = 6,
+  [52050] = 6,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2165), 1,
+    ACTIONS(2175), 1,
       anon_sym_and,
-    ACTIONS(2167), 1,
+    ACTIONS(2177), 1,
       anon_sym_or,
-    ACTIONS(2173), 1,
+    ACTIONS(2179), 1,
       anon_sym_if,
-    ACTIONS(2261), 1,
-      anon_sym_COLON,
-    ACTIONS(2259), 2,
-      anon_sym_COMMA,
-      anon_sym_as,
-  [52093] = 6,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1879), 1,
-      anon_sym_if,
-    ACTIONS(1881), 1,
-      anon_sym_and,
-    ACTIONS(1883), 1,
-      anon_sym_or,
-    ACTIONS(2265), 1,
-      anon_sym_COLON,
-    ACTIONS(2263), 2,
-      anon_sym_COMMA,
-      anon_sym_RBRACK,
-  [52113] = 5,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2051), 1,
-      anon_sym_and,
-    ACTIONS(2053), 1,
-      anon_sym_or,
-    ACTIONS(2071), 1,
-      anon_sym_if,
-    ACTIONS(2267), 3,
-      sym__newline,
-      anon_sym_COMMA,
-      sym__semicolon,
-  [52131] = 5,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2051), 1,
-      anon_sym_and,
-    ACTIONS(2053), 1,
-      anon_sym_or,
-    ACTIONS(2071), 1,
-      anon_sym_if,
-    ACTIONS(2269), 3,
-      sym__newline,
-      anon_sym_COMMA,
-      sym__semicolon,
-  [52149] = 3,
-    ACTIONS(1942), 1,
-      sym_comment,
-    ACTIONS(2271), 2,
-      anon_sym_LBRACE2,
-      sym__not_escape_sequence,
-    ACTIONS(2273), 4,
-      sym__string_content,
-      sym__string_end,
-      sym__escape_interpolation,
-      sym_escape_sequence,
-  [52163] = 4,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2275), 1,
-      anon_sym_DOT,
-    STATE(1057), 1,
-      aux_sym_match_value_pattern_repeat1,
-    ACTIONS(2244), 4,
-      sym__newline,
-      anon_sym_COMMA,
-      anon_sym_as,
-      sym__semicolon,
-  [52179] = 3,
-    ACTIONS(1942), 1,
-      sym_comment,
-    ACTIONS(2277), 2,
-      anon_sym_LBRACE2,
-      sym__not_escape_sequence,
-    ACTIONS(2279), 4,
-      sym__string_content,
-      sym__string_end,
-      sym__escape_interpolation,
-      sym_escape_sequence,
-  [52193] = 7,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1879), 1,
-      anon_sym_if,
-    ACTIONS(1881), 1,
-      anon_sym_and,
-    ACTIONS(1883), 1,
-      anon_sym_or,
-    ACTIONS(1928), 1,
-      anon_sym_COMMA,
-    ACTIONS(2281), 1,
-      anon_sym_COLON,
-    STATE(964), 1,
-      aux_sym_expression_list_repeat1,
-  [52215] = 7,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1879), 1,
-      anon_sym_if,
-    ACTIONS(1881), 1,
-      anon_sym_and,
-    ACTIONS(1883), 1,
-      anon_sym_or,
-    ACTIONS(1993), 1,
-      anon_sym_RPAREN,
-    ACTIONS(1995), 1,
-      anon_sym_COMMA,
-    STATE(1280), 1,
-      aux_sym_argument_list_repeat1,
-  [52237] = 3,
-    ACTIONS(1942), 1,
-      sym_comment,
-    ACTIONS(2283), 2,
-      anon_sym_LBRACE2,
-      sym__not_escape_sequence,
-    ACTIONS(2285), 4,
-      sym__string_content,
-      sym__string_end,
-      sym__escape_interpolation,
-      sym_escape_sequence,
-  [52251] = 5,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1879), 1,
-      anon_sym_if,
-    ACTIONS(1881), 1,
-      anon_sym_and,
-    ACTIONS(1883), 1,
-      anon_sym_or,
-    ACTIONS(2287), 3,
-      anon_sym_RPAREN,
-      anon_sym_COMMA,
-      anon_sym_COLON,
-  [52269] = 3,
-    ACTIONS(1942), 1,
-      sym_comment,
-    ACTIONS(2289), 2,
-      anon_sym_LBRACE2,
-      sym__not_escape_sequence,
-    ACTIONS(2291), 4,
-      sym__string_content,
-      sym__string_end,
-      sym__escape_interpolation,
-      sym_escape_sequence,
-  [52283] = 7,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1879), 1,
-      anon_sym_if,
-    ACTIONS(1881), 1,
-      anon_sym_and,
-    ACTIONS(1883), 1,
-      anon_sym_or,
-    ACTIONS(1928), 1,
-      anon_sym_COMMA,
     ACTIONS(2293), 1,
       anon_sym_COLON,
-    STATE(964), 1,
-      aux_sym_expression_list_repeat1,
-  [52305] = 3,
-    ACTIONS(1942), 1,
-      sym_comment,
-    ACTIONS(2295), 2,
-      anon_sym_LBRACE2,
-      sym__not_escape_sequence,
-    ACTIONS(2297), 4,
-      sym__string_content,
-      sym__string_end,
-      sym__escape_interpolation,
-      sym_escape_sequence,
-  [52319] = 4,
+    ACTIONS(2291), 2,
+      anon_sym_COMMA,
+      anon_sym_as,
+  [52070] = 7,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2301), 1,
+    ACTIONS(1851), 1,
+      anon_sym_and,
+    ACTIONS(1853), 1,
+      anon_sym_or,
+    ACTIONS(1875), 1,
       anon_sym_COMMA,
-    STATE(1077), 1,
+    ACTIONS(1877), 1,
+      anon_sym_if,
+    ACTIONS(2295), 1,
+      anon_sym_COLON,
+    STATE(951), 1,
+      aux_sym_expression_list_repeat1,
+  [52092] = 4,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1902), 1,
+      anon_sym_DOT,
+    STATE(1046), 1,
+      aux_sym_match_value_pattern_repeat1,
+    ACTIONS(2297), 4,
+      anon_sym_import,
+      anon_sym_RPAREN,
+      anon_sym_COMMA,
+      anon_sym_as,
+  [52108] = 5,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2023), 1,
+      anon_sym_if,
+    ACTIONS(2025), 1,
+      anon_sym_and,
+    ACTIONS(2027), 1,
+      anon_sym_or,
+    ACTIONS(2299), 3,
+      sym__newline,
+      anon_sym_COMMA,
+      sym__semicolon,
+  [52126] = 5,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2023), 1,
+      anon_sym_if,
+    ACTIONS(2025), 1,
+      anon_sym_and,
+    ACTIONS(2027), 1,
+      anon_sym_or,
+    ACTIONS(2301), 3,
+      sym__newline,
+      anon_sym_COMMA,
+      sym__semicolon,
+  [52144] = 4,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2305), 1,
+      anon_sym_COMMA,
+    STATE(1061), 1,
       aux_sym_open_sequence_match_pattern_repeat1,
-    ACTIONS(2299), 4,
+    ACTIONS(2303), 4,
       anon_sym_RPAREN,
       anon_sym_if,
       anon_sym_COLON,
       anon_sym_RBRACK,
-  [52335] = 5,
+  [52160] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2051), 1,
-      anon_sym_and,
-    ACTIONS(2053), 1,
-      anon_sym_or,
-    ACTIONS(2071), 1,
-      anon_sym_if,
-    ACTIONS(2304), 3,
-      sym__newline,
+    ACTIONS(2308), 6,
+      anon_sym_RPAREN,
       anon_sym_COMMA,
-      sym__semicolon,
-  [52353] = 7,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1879), 1,
       anon_sym_if,
-    ACTIONS(1881), 1,
-      anon_sym_and,
-    ACTIONS(1883), 1,
-      anon_sym_or,
-    ACTIONS(1928), 1,
-      anon_sym_COMMA,
-    ACTIONS(2306), 1,
       anon_sym_COLON,
-    STATE(964), 1,
-      aux_sym_expression_list_repeat1,
-  [52375] = 7,
+      anon_sym_RBRACK,
+      anon_sym_RBRACE,
+  [52172] = 6,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1879), 1,
-      anon_sym_if,
-    ACTIONS(1881), 1,
+    ACTIONS(2175), 1,
       anon_sym_and,
-    ACTIONS(1883), 1,
+    ACTIONS(2177), 1,
       anon_sym_or,
-    ACTIONS(1928), 1,
-      anon_sym_COMMA,
-    ACTIONS(2308), 1,
-      anon_sym_COLON,
-    STATE(964), 1,
-      aux_sym_expression_list_repeat1,
-  [52397] = 6,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2165), 1,
-      anon_sym_and,
-    ACTIONS(2167), 1,
-      anon_sym_or,
-    ACTIONS(2173), 1,
+    ACTIONS(2179), 1,
       anon_sym_if,
     ACTIONS(2312), 1,
       anon_sym_COLON,
     ACTIONS(2310), 2,
       anon_sym_COMMA,
       anon_sym_as,
-  [52417] = 5,
+  [52192] = 5,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2051), 1,
+    ACTIONS(1851), 1,
       anon_sym_and,
-    ACTIONS(2053), 1,
+    ACTIONS(1853), 1,
       anon_sym_or,
-    ACTIONS(2071), 1,
+    ACTIONS(1877), 1,
       anon_sym_if,
-    ACTIONS(2159), 3,
-      sym__newline,
-      anon_sym_EQ,
-      sym__semicolon,
-  [52435] = 6,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1879), 1,
-      anon_sym_if,
-    ACTIONS(1881), 1,
-      anon_sym_and,
-    ACTIONS(1883), 1,
-      anon_sym_or,
-    ACTIONS(2316), 1,
-      anon_sym_COLON,
-    ACTIONS(2314), 2,
-      anon_sym_COMMA,
-      anon_sym_RBRACK,
-  [52455] = 5,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1879), 1,
-      anon_sym_if,
-    ACTIONS(1881), 1,
-      anon_sym_and,
-    ACTIONS(1883), 1,
-      anon_sym_or,
-    ACTIONS(2318), 3,
+    ACTIONS(2314), 3,
       anon_sym_RPAREN,
       anon_sym_COMMA,
       anon_sym_COLON,
-  [52473] = 7,
+  [52210] = 5,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1879), 1,
+    ACTIONS(2023), 1,
       anon_sym_if,
-    ACTIONS(1881), 1,
+    ACTIONS(2025), 1,
       anon_sym_and,
-    ACTIONS(1883), 1,
+    ACTIONS(2027), 1,
       anon_sym_or,
-    ACTIONS(1928), 1,
+    ACTIONS(2316), 3,
+      sym__newline,
       anon_sym_COMMA,
+      sym__semicolon,
+  [52228] = 7,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1851), 1,
+      anon_sym_and,
+    ACTIONS(1853), 1,
+      anon_sym_or,
+    ACTIONS(1875), 1,
+      anon_sym_COMMA,
+    ACTIONS(1877), 1,
+      anon_sym_if,
+    ACTIONS(2318), 1,
+      anon_sym_COLON,
+    STATE(951), 1,
+      aux_sym_expression_list_repeat1,
+  [52250] = 7,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1851), 1,
+      anon_sym_and,
+    ACTIONS(1853), 1,
+      anon_sym_or,
+    ACTIONS(1875), 1,
+      anon_sym_COMMA,
+    ACTIONS(1877), 1,
+      anon_sym_if,
     ACTIONS(2320), 1,
       anon_sym_COLON,
-    STATE(964), 1,
+    STATE(951), 1,
       aux_sym_expression_list_repeat1,
-  [52495] = 6,
-    ACTIONS(3), 1,
+  [52272] = 3,
+    ACTIONS(1933), 1,
       sym_comment,
-    ACTIONS(1879), 1,
-      anon_sym_if,
-    ACTIONS(1881), 1,
-      anon_sym_and,
-    ACTIONS(1883), 1,
-      anon_sym_or,
-    ACTIONS(2155), 1,
-      anon_sym_COLON,
     ACTIONS(2322), 2,
-      anon_sym_COMMA,
-      anon_sym_RBRACK,
-  [52515] = 2,
+      anon_sym_LBRACE2,
+      sym__not_escape_sequence,
+    ACTIONS(2324), 4,
+      sym__string_content,
+      sym__string_end,
+      sym__escape_interpolation,
+      sym_escape_sequence,
+  [52286] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1920), 6,
+    ACTIONS(1906), 6,
       anon_sym_RPAREN,
       anon_sym_COMMA,
       anon_sym_if,
       anon_sym_COLON,
       anon_sym_RBRACK,
       anon_sym_RBRACE,
-  [52527] = 4,
+  [52298] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2275), 1,
+    ACTIONS(2244), 1,
       anon_sym_DOT,
-    STATE(1068), 1,
+    STATE(1042), 1,
       aux_sym_match_value_pattern_repeat1,
-    ACTIONS(2252), 4,
+    ACTIONS(2297), 4,
       sym__newline,
       anon_sym_COMMA,
       anon_sym_as,
       sym__semicolon,
-  [52543] = 2,
+  [52314] = 6,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2324), 6,
-      anon_sym_RPAREN,
-      anon_sym_COMMA,
-      anon_sym_if,
+    ACTIONS(2326), 1,
+      anon_sym_LPAREN,
+    ACTIONS(2328), 1,
       anon_sym_COLON,
-      anon_sym_RBRACK,
-      anon_sym_RBRACE,
-  [52555] = 5,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1879), 1,
-      anon_sym_if,
-    ACTIONS(1881), 1,
-      anon_sym_and,
-    ACTIONS(1883), 1,
-      anon_sym_or,
-    ACTIONS(2326), 2,
-      anon_sym_COMMA,
-      anon_sym_RBRACK,
-  [52572] = 5,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1879), 1,
-      anon_sym_if,
-    ACTIONS(1881), 1,
-      anon_sym_and,
-    ACTIONS(1883), 1,
-      anon_sym_or,
-    ACTIONS(2328), 2,
-      anon_sym_COMMA,
-      anon_sym_RBRACK,
-  [52589] = 4,
-    ACTIONS(3), 1,
-      sym_comment,
     ACTIONS(2330), 1,
-      anon_sym_COMMA,
-    STATE(1096), 1,
-      aux_sym_expression_list_repeat1,
-    ACTIONS(2029), 3,
-      sym__newline,
-      anon_sym_from,
-      sym__semicolon,
-  [52604] = 5,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2235), 1,
-      sym_identifier,
-    STATE(1183), 1,
-      sym_dotted_name,
-    STATE(1198), 1,
-      sym_aliased_import,
-    ACTIONS(2332), 2,
-      sym__newline,
-      sym__semicolon,
-  [52621] = 5,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2051), 1,
-      anon_sym_and,
-    ACTIONS(2053), 1,
-      anon_sym_or,
-    ACTIONS(2071), 1,
-      anon_sym_if,
-    ACTIONS(1961), 2,
-      sym__newline,
-      sym__semicolon,
-  [52638] = 5,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2235), 1,
-      sym_identifier,
-    STATE(1183), 1,
-      sym_dotted_name,
-    STATE(1198), 1,
-      sym_aliased_import,
-    ACTIONS(2332), 2,
-      sym__newline,
-      sym__semicolon,
-  [52655] = 4,
+      anon_sym_LBRACK,
+    STATE(1255), 1,
+      sym_type_parameters,
+    STATE(1442), 1,
+      sym_argument_list,
+  [52333] = 4,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(2334), 1,
       anon_sym_COMMA,
-    STATE(1096), 1,
-      aux_sym_expression_list_repeat1,
-    ACTIONS(2115), 3,
-      sym__newline,
-      anon_sym_from,
-      sym__semicolon,
-  [52670] = 6,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2337), 1,
-      anon_sym_COLON,
-    ACTIONS(2339), 1,
-      anon_sym_RBRACE,
-    ACTIONS(2341), 1,
-      anon_sym_EQ,
-    ACTIONS(2343), 1,
-      sym_type_conversion,
-    STATE(1425), 1,
-      sym_format_specifier,
-  [52689] = 5,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1879), 1,
-      anon_sym_if,
-    ACTIONS(1881), 1,
-      anon_sym_and,
-    ACTIONS(1883), 1,
-      anon_sym_or,
-    ACTIONS(2345), 2,
-      anon_sym_COMMA,
-      anon_sym_RBRACK,
-  [52706] = 6,
-    ACTIONS(1942), 1,
-      sym_comment,
-    ACTIONS(2347), 1,
-      anon_sym_RBRACE,
-    ACTIONS(2349), 1,
-      anon_sym_LBRACE2,
-    ACTIONS(2351), 1,
-      aux_sym_format_specifier_token1,
-    STATE(1117), 1,
-      aux_sym_format_specifier_repeat1,
-    STATE(1269), 1,
-      sym_interpolation,
-  [52725] = 4,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1861), 1,
-      anon_sym_COMMA,
-    STATE(1115), 1,
+    STATE(1077), 1,
       aux_sym__collection_elements_repeat1,
-    ACTIONS(1871), 3,
+    ACTIONS(2332), 3,
       anon_sym_RPAREN,
       anon_sym_RBRACK,
       anon_sym_RBRACE,
-  [52740] = 2,
+  [52348] = 6,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1856), 5,
+    ACTIONS(2336), 1,
+      anon_sym_COLON,
+    ACTIONS(2338), 1,
+      anon_sym_RBRACE,
+    ACTIONS(2340), 1,
+      anon_sym_EQ,
+    ACTIONS(2342), 1,
+      sym_type_conversion,
+    STATE(1441), 1,
+      sym_format_specifier,
+  [52367] = 4,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2344), 1,
+      anon_sym_COMMA,
+    STATE(1107), 1,
+      aux_sym_expression_list_repeat1,
+    ACTIONS(2039), 3,
+      sym__newline,
+      anon_sym_from,
+      sym__semicolon,
+  [52382] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1844), 5,
       sym__newline,
       anon_sym_DOT,
       anon_sym_COMMA,
       anon_sym_as,
       sym__semicolon,
-  [52751] = 5,
+  [52393] = 5,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1879), 1,
-      anon_sym_if,
-    ACTIONS(1881), 1,
+    ACTIONS(1851), 1,
       anon_sym_and,
-    ACTIONS(1883), 1,
+    ACTIONS(1853), 1,
       anon_sym_or,
-    ACTIONS(2191), 2,
+    ACTIONS(1877), 1,
+      anon_sym_if,
+    ACTIONS(2346), 2,
       anon_sym_COMMA,
-      anon_sym_RBRACE,
-  [52768] = 5,
+      anon_sym_RBRACK,
+  [52410] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1879), 1,
-      anon_sym_if,
-    ACTIONS(1881), 1,
+    ACTIONS(2350), 1,
+      anon_sym_COMMA,
+    STATE(1077), 1,
+      aux_sym__collection_elements_repeat1,
+    ACTIONS(2348), 3,
+      anon_sym_RPAREN,
+      anon_sym_RBRACK,
+      anon_sym_RBRACE,
+  [52425] = 5,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1851), 1,
       anon_sym_and,
-    ACTIONS(1883), 1,
+    ACTIONS(1853), 1,
       anon_sym_or,
+    ACTIONS(1877), 1,
+      anon_sym_if,
     ACTIONS(2353), 2,
       anon_sym_COMMA,
       anon_sym_RBRACK,
-  [52785] = 6,
+  [52442] = 5,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2165), 1,
-      anon_sym_and,
-    ACTIONS(2167), 1,
-      anon_sym_or,
-    ACTIONS(2173), 1,
+    ACTIONS(2023), 1,
       anon_sym_if,
-    ACTIONS(2355), 1,
-      anon_sym_as,
-    ACTIONS(2357), 1,
-      anon_sym_COLON,
-  [52804] = 5,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2051), 1,
+    ACTIONS(2025), 1,
       anon_sym_and,
-    ACTIONS(2053), 1,
+    ACTIONS(2027), 1,
       anon_sym_or,
-    ACTIONS(2071), 1,
-      anon_sym_if,
-    ACTIONS(2359), 2,
+    ACTIONS(2355), 2,
       sym__newline,
       sym__semicolon,
-  [52821] = 2,
+  [52459] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2299), 5,
+    ACTIONS(2357), 1,
+      anon_sym_COMMA,
+    STATE(1107), 1,
+      aux_sym_expression_list_repeat1,
+    ACTIONS(2039), 3,
+      sym__newline,
+      anon_sym_from,
+      sym__semicolon,
+  [52474] = 5,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1851), 1,
+      anon_sym_and,
+    ACTIONS(1853), 1,
+      anon_sym_or,
+    ACTIONS(1877), 1,
+      anon_sym_if,
+    ACTIONS(2359), 2,
       anon_sym_RPAREN,
       anon_sym_COMMA,
+  [52491] = 5,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1851), 1,
+      anon_sym_and,
+    ACTIONS(1853), 1,
+      anon_sym_or,
+    ACTIONS(1877), 1,
       anon_sym_if,
-      anon_sym_COLON,
-      anon_sym_RBRACK,
-  [52832] = 6,
+    ACTIONS(2361), 2,
+      anon_sym_RPAREN,
+      anon_sym_COMMA,
+  [52508] = 5,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2361), 1,
-      anon_sym_LPAREN,
-    ACTIONS(2363), 1,
-      anon_sym_COLON,
-    ACTIONS(2365), 1,
-      anon_sym_LBRACK,
-    STATE(1224), 1,
-      sym_type_parameters,
-    STATE(1463), 1,
-      sym_argument_list,
-  [52851] = 6,
+    ACTIONS(2023), 1,
+      anon_sym_if,
+    ACTIONS(2025), 1,
+      anon_sym_and,
+    ACTIONS(2027), 1,
+      anon_sym_or,
+    ACTIONS(2363), 2,
+      sym__newline,
+      sym__semicolon,
+  [52525] = 6,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2361), 1,
-      anon_sym_LPAREN,
+    ACTIONS(2175), 1,
+      anon_sym_and,
+    ACTIONS(2177), 1,
+      anon_sym_or,
+    ACTIONS(2179), 1,
+      anon_sym_if,
     ACTIONS(2365), 1,
-      anon_sym_LBRACK,
+      anon_sym_as,
     ACTIONS(2367), 1,
       anon_sym_COLON,
-    STATE(1210), 1,
-      sym_type_parameters,
-    STATE(1499), 1,
-      sym_argument_list,
-  [52870] = 5,
+  [52544] = 5,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(2369), 1,
       anon_sym_COMMA,
     ACTIONS(2371), 1,
       anon_sym_as,
-    STATE(1164), 1,
+    STATE(1124), 1,
       aux_sym__import_list_repeat1,
     ACTIONS(2373), 2,
       sym__newline,
       sym__semicolon,
-  [52887] = 2,
+  [52561] = 5,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2375), 5,
+    ACTIONS(1851), 1,
+      anon_sym_and,
+    ACTIONS(1853), 1,
+      anon_sym_or,
+    ACTIONS(1877), 1,
+      anon_sym_if,
+    ACTIONS(2165), 2,
+      anon_sym_COMMA,
+      anon_sym_RBRACE,
+  [52578] = 5,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2023), 1,
+      anon_sym_if,
+    ACTIONS(2025), 1,
+      anon_sym_and,
+    ACTIONS(2027), 1,
+      anon_sym_or,
+    ACTIONS(2375), 2,
+      sym__newline,
+      sym__semicolon,
+  [52595] = 5,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2121), 1,
+      sym_identifier,
+    STATE(1158), 1,
+      sym_dotted_name,
+    STATE(1195), 1,
+      sym_aliased_import,
+    ACTIONS(2377), 2,
+      sym__newline,
+      sym__semicolon,
+  [52612] = 5,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1851), 1,
+      anon_sym_and,
+    ACTIONS(1853), 1,
+      anon_sym_or,
+    ACTIONS(1877), 1,
+      anon_sym_if,
+    ACTIONS(2379), 2,
+      anon_sym_RPAREN,
+      anon_sym_COMMA,
+  [52629] = 6,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2336), 1,
+      anon_sym_COLON,
+    ACTIONS(2381), 1,
+      anon_sym_RBRACE,
+    ACTIONS(2383), 1,
+      anon_sym_EQ,
+    ACTIONS(2385), 1,
+      sym_type_conversion,
+    STATE(1476), 1,
+      sym_format_specifier,
+  [52648] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2387), 5,
       anon_sym_RPAREN,
       anon_sym_COMMA,
       anon_sym_if,
       anon_sym_COLON,
       anon_sym_RBRACK,
-  [52898] = 4,
+  [52659] = 5,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2379), 1,
+    ACTIONS(1851), 1,
+      anon_sym_and,
+    ACTIONS(1853), 1,
+      anon_sym_or,
+    ACTIONS(1877), 1,
+      anon_sym_if,
+    ACTIONS(2389), 2,
       anon_sym_COMMA,
-    STATE(1114), 1,
+      anon_sym_RBRACK,
+  [52676] = 5,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1851), 1,
+      anon_sym_and,
+    ACTIONS(1853), 1,
+      anon_sym_or,
+    ACTIONS(1877), 1,
+      anon_sym_if,
+    ACTIONS(2391), 2,
+      anon_sym_COMMA,
+      anon_sym_RBRACK,
+  [52693] = 6,
+    ACTIONS(1933), 1,
+      sym_comment,
+    ACTIONS(2393), 1,
+      anon_sym_RBRACE,
+    ACTIONS(2395), 1,
+      anon_sym_LBRACE2,
+    ACTIONS(2398), 1,
+      aux_sym_format_specifier_token1,
+    STATE(1094), 1,
+      aux_sym_format_specifier_repeat1,
+    STATE(1245), 1,
+      sym_interpolation,
+  [52712] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2303), 5,
+      anon_sym_RPAREN,
+      anon_sym_COMMA,
+      anon_sym_if,
+      anon_sym_COLON,
+      anon_sym_RBRACK,
+  [52723] = 4,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2401), 1,
+      anon_sym_COMMA,
+    STATE(1077), 1,
       aux_sym__collection_elements_repeat1,
-    ACTIONS(2377), 3,
+    ACTIONS(2332), 3,
       anon_sym_RPAREN,
       anon_sym_RBRACK,
       anon_sym_RBRACE,
-  [52913] = 4,
+  [52738] = 5,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2381), 1,
+    ACTIONS(2023), 1,
+      anon_sym_if,
+    ACTIONS(2025), 1,
+      anon_sym_and,
+    ACTIONS(2027), 1,
+      anon_sym_or,
+    ACTIONS(2403), 2,
+      sym__newline,
+      sym__semicolon,
+  [52755] = 6,
+    ACTIONS(1933), 1,
+      sym_comment,
+    ACTIONS(2405), 1,
+      anon_sym_RBRACE,
+    ACTIONS(2407), 1,
+      anon_sym_LBRACE2,
+    ACTIONS(2409), 1,
+      aux_sym_format_specifier_token1,
+    STATE(1108), 1,
+      aux_sym_format_specifier_repeat1,
+    STATE(1245), 1,
+      sym_interpolation,
+  [52774] = 5,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1851), 1,
+      anon_sym_and,
+    ACTIONS(1853), 1,
+      anon_sym_or,
+    ACTIONS(1877), 1,
+      anon_sym_if,
+    ACTIONS(2411), 2,
+      anon_sym_COMMA,
+      anon_sym_RBRACK,
+  [52791] = 4,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1855), 1,
       anon_sym_COMMA,
     STATE(1096), 1,
+      aux_sym__collection_elements_repeat1,
+    ACTIONS(1865), 3,
+      anon_sym_RPAREN,
+      anon_sym_RBRACK,
+      anon_sym_RBRACE,
+  [52806] = 6,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2121), 1,
+      sym_identifier,
+    ACTIONS(2413), 1,
+      anon_sym_LPAREN,
+    STATE(1085), 1,
+      sym_dotted_name,
+    STATE(1154), 1,
+      sym_aliased_import,
+    STATE(1375), 1,
+      sym__import_list,
+  [52825] = 5,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2023), 1,
+      anon_sym_if,
+    ACTIONS(2025), 1,
+      anon_sym_and,
+    ACTIONS(2027), 1,
+      anon_sym_or,
+    ACTIONS(1918), 2,
+      sym__newline,
+      sym__semicolon,
+  [52842] = 5,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2121), 1,
+      sym_identifier,
+    STATE(1158), 1,
+      sym_dotted_name,
+    STATE(1195), 1,
+      sym_aliased_import,
+    ACTIONS(2415), 2,
+      sym__newline,
+      sym__semicolon,
+  [52859] = 6,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2326), 1,
+      anon_sym_LPAREN,
+    ACTIONS(2330), 1,
+      anon_sym_LBRACK,
+    ACTIONS(2417), 1,
+      anon_sym_COLON,
+    STATE(1269), 1,
+      sym_type_parameters,
+    STATE(1439), 1,
+      sym_argument_list,
+  [52878] = 5,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2121), 1,
+      sym_identifier,
+    STATE(1158), 1,
+      sym_dotted_name,
+    STATE(1195), 1,
+      sym_aliased_import,
+    ACTIONS(2377), 2,
+      sym__newline,
+      sym__semicolon,
+  [52895] = 6,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2175), 1,
+      anon_sym_and,
+    ACTIONS(2177), 1,
+      anon_sym_or,
+    ACTIONS(2179), 1,
+      anon_sym_if,
+    ACTIONS(2419), 1,
+      anon_sym_as,
+    ACTIONS(2421), 1,
+      anon_sym_COLON,
+  [52914] = 4,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2423), 1,
+      anon_sym_COMMA,
+    STATE(1107), 1,
       aux_sym_expression_list_repeat1,
-    ACTIONS(2029), 3,
+    ACTIONS(2063), 3,
       sym__newline,
       anon_sym_from,
       sym__semicolon,
-  [52928] = 5,
-    ACTIONS(3), 1,
+  [52929] = 6,
+    ACTIONS(1933), 1,
       sym_comment,
-    ACTIONS(2051), 1,
-      anon_sym_and,
-    ACTIONS(2053), 1,
-      anon_sym_or,
-    ACTIONS(2071), 1,
-      anon_sym_if,
-    ACTIONS(2383), 2,
-      sym__newline,
-      sym__semicolon,
-  [52945] = 4,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2387), 1,
-      anon_sym_COMMA,
-    STATE(1114), 1,
-      aux_sym__collection_elements_repeat1,
-    ACTIONS(2385), 3,
-      anon_sym_RPAREN,
-      anon_sym_RBRACK,
-      anon_sym_RBRACE,
-  [52960] = 4,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2390), 1,
-      anon_sym_COMMA,
-    STATE(1114), 1,
-      aux_sym__collection_elements_repeat1,
-    ACTIONS(2377), 3,
-      anon_sym_RPAREN,
-      anon_sym_RBRACK,
-      anon_sym_RBRACE,
-  [52975] = 6,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2235), 1,
-      sym_identifier,
-    ACTIONS(2392), 1,
-      anon_sym_LPAREN,
-    STATE(1109), 1,
-      sym_dotted_name,
-    STATE(1143), 1,
-      sym_aliased_import,
-    STATE(1385), 1,
-      sym__import_list,
-  [52994] = 6,
-    ACTIONS(1942), 1,
-      sym_comment,
-    ACTIONS(2394), 1,
-      anon_sym_RBRACE,
-    ACTIONS(2396), 1,
+    ACTIONS(2407), 1,
       anon_sym_LBRACE2,
-    ACTIONS(2399), 1,
-      aux_sym_format_specifier_token1,
-    STATE(1117), 1,
-      aux_sym_format_specifier_repeat1,
-    STATE(1269), 1,
-      sym_interpolation,
-  [53013] = 5,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2235), 1,
-      sym_identifier,
-    STATE(1183), 1,
-      sym_dotted_name,
-    STATE(1198), 1,
-      sym_aliased_import,
-    ACTIONS(2402), 2,
-      sym__newline,
-      sym__semicolon,
-  [53030] = 5,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1879), 1,
-      anon_sym_if,
-    ACTIONS(1881), 1,
-      anon_sym_and,
-    ACTIONS(1883), 1,
-      anon_sym_or,
-    ACTIONS(2404), 2,
-      anon_sym_COMMA,
-      anon_sym_RBRACK,
-  [53047] = 6,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2337), 1,
-      anon_sym_COLON,
-    ACTIONS(2406), 1,
+    ACTIONS(2426), 1,
       anon_sym_RBRACE,
-    ACTIONS(2408), 1,
-      anon_sym_EQ,
-    ACTIONS(2410), 1,
-      sym_type_conversion,
-    STATE(1523), 1,
-      sym_format_specifier,
-  [53066] = 5,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2051), 1,
-      anon_sym_and,
-    ACTIONS(2053), 1,
-      anon_sym_or,
-    ACTIONS(2071), 1,
-      anon_sym_if,
-    ACTIONS(2412), 2,
-      sym__newline,
-      sym__semicolon,
-  [53083] = 5,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2051), 1,
-      anon_sym_and,
-    ACTIONS(2053), 1,
-      anon_sym_or,
-    ACTIONS(2071), 1,
-      anon_sym_if,
-    ACTIONS(2414), 2,
-      sym__newline,
-      sym__semicolon,
-  [53100] = 6,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2165), 1,
-      anon_sym_and,
-    ACTIONS(2167), 1,
-      anon_sym_or,
-    ACTIONS(2173), 1,
-      anon_sym_if,
-    ACTIONS(2416), 1,
-      anon_sym_as,
-    ACTIONS(2418), 1,
-      anon_sym_COLON,
-  [53119] = 5,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1879), 1,
-      anon_sym_if,
-    ACTIONS(1881), 1,
-      anon_sym_and,
-    ACTIONS(1883), 1,
-      anon_sym_or,
-    ACTIONS(2420), 2,
-      anon_sym_RPAREN,
-      anon_sym_COMMA,
-  [53136] = 6,
-    ACTIONS(1942), 1,
-      sym_comment,
-    ACTIONS(2349), 1,
-      anon_sym_LBRACE2,
-    ACTIONS(2422), 1,
-      anon_sym_RBRACE,
-    ACTIONS(2424), 1,
+    ACTIONS(2428), 1,
       aux_sym_format_specifier_token1,
-    STATE(1099), 1,
+    STATE(1094), 1,
       aux_sym_format_specifier_repeat1,
-    STATE(1269), 1,
+    STATE(1245), 1,
       sym_interpolation,
-  [53155] = 5,
+  [52948] = 5,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1879), 1,
-      anon_sym_if,
-    ACTIONS(1881), 1,
+    ACTIONS(1851), 1,
       anon_sym_and,
-    ACTIONS(1883), 1,
+    ACTIONS(1853), 1,
       anon_sym_or,
-    ACTIONS(2426), 2,
-      anon_sym_RPAREN,
-      anon_sym_COMMA,
-  [53172] = 5,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1879), 1,
+    ACTIONS(1877), 1,
       anon_sym_if,
-    ACTIONS(1881), 1,
-      anon_sym_and,
-    ACTIONS(1883), 1,
-      anon_sym_or,
-    ACTIONS(2428), 2,
-      anon_sym_RPAREN,
-      anon_sym_COMMA,
-  [53189] = 5,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2365), 1,
-      anon_sym_LBRACK,
     ACTIONS(2430), 1,
-      anon_sym_LPAREN,
-    STATE(1370), 1,
-      sym_type_parameters,
-    STATE(1371), 1,
-      sym_parameters,
-  [53205] = 4,
+      anon_sym_COLON,
+  [52964] = 5,
     ACTIONS(3), 1,
       sym_comment,
+    ACTIONS(1851), 1,
+      anon_sym_and,
+    ACTIONS(1853), 1,
+      anon_sym_or,
+    ACTIONS(1877), 1,
+      anon_sym_if,
     ACTIONS(2432), 1,
-      anon_sym_case,
-    STATE(562), 1,
-      sym_cases,
-    STATE(345), 2,
-      sym_case_block,
-      aux_sym_cases_repeat1,
-  [53219] = 5,
+      anon_sym_else,
+  [52980] = 5,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2235), 1,
+    ACTIONS(2121), 1,
       sym_identifier,
-    STATE(1109), 1,
+    STATE(1085), 1,
       sym_dotted_name,
-    STATE(1143), 1,
+    STATE(1154), 1,
       sym_aliased_import,
-    STATE(1383), 1,
+    STATE(1365), 1,
       sym__import_list,
-  [53235] = 5,
+  [52996] = 5,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2365), 1,
-      anon_sym_LBRACK,
-    ACTIONS(2430), 1,
-      anon_sym_LPAREN,
-    STATE(1354), 1,
-      sym_type_parameters,
-    STATE(1377), 1,
-      sym_parameters,
-  [53251] = 5,
+    ACTIONS(1851), 1,
+      anon_sym_and,
+    ACTIONS(1853), 1,
+      anon_sym_or,
+    ACTIONS(1877), 1,
+      anon_sym_if,
+    ACTIONS(2434), 1,
+      anon_sym_COLON,
+  [53012] = 5,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2365), 1,
-      anon_sym_LBRACK,
-    ACTIONS(2430), 1,
-      anon_sym_LPAREN,
-    STATE(1356), 1,
-      sym_type_parameters,
-    STATE(1378), 1,
-      sym_parameters,
-  [53267] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2436), 1,
-      anon_sym_EQ,
-    ACTIONS(2434), 3,
+    ACTIONS(2377), 1,
       anon_sym_RPAREN,
-      anon_sym_COMMA,
-      anon_sym_COLON,
-  [53279] = 5,
+    ACTIONS(2436), 1,
+      sym_identifier,
+    STATE(1253), 1,
+      sym_dotted_name,
+    STATE(1326), 1,
+      sym_aliased_import,
+  [53028] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1879), 1,
-      anon_sym_if,
-    ACTIONS(1881), 1,
-      anon_sym_and,
-    ACTIONS(1883), 1,
-      anon_sym_or,
-    ACTIONS(2438), 1,
-      anon_sym_COLON,
-  [53295] = 5,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1879), 1,
-      anon_sym_if,
-    ACTIONS(1881), 1,
-      anon_sym_and,
-    ACTIONS(1883), 1,
-      anon_sym_or,
     ACTIONS(2440), 1,
       anon_sym_COLON,
-  [53311] = 5,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1879), 1,
-      anon_sym_if,
-    ACTIONS(1881), 1,
-      anon_sym_and,
-    ACTIONS(1883), 1,
-      anon_sym_or,
     ACTIONS(2442), 1,
-      anon_sym_COLON,
-  [53327] = 4,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2169), 1,
-      anon_sym_COMMA,
-    STATE(1160), 1,
-      aux_sym_assert_statement_repeat1,
-    ACTIONS(2444), 2,
-      sym__newline,
-      sym__semicolon,
-  [53341] = 4,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2446), 1,
-      anon_sym_COMMA,
-    STATE(1138), 1,
-      aux_sym_global_statement_repeat1,
-    ACTIONS(2449), 2,
-      sym__newline,
-      sym__semicolon,
-  [53355] = 4,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2453), 1,
-      anon_sym_COLON,
-    STATE(1343), 1,
-      sym__type_bound,
-    ACTIONS(2451), 2,
-      anon_sym_COMMA,
-      anon_sym_RBRACK,
-  [53369] = 5,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1879), 1,
-      anon_sym_if,
-    ACTIONS(1881), 1,
-      anon_sym_and,
-    ACTIONS(1883), 1,
-      anon_sym_or,
-    ACTIONS(2455), 1,
-      anon_sym_COLON,
-  [53385] = 5,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1879), 1,
-      anon_sym_if,
-    ACTIONS(1881), 1,
-      anon_sym_and,
-    ACTIONS(1883), 1,
-      anon_sym_or,
-    ACTIONS(2457), 1,
-      anon_sym_COLON,
-  [53401] = 5,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2332), 1,
+      anon_sym_EQ,
+    ACTIONS(2438), 2,
       anon_sym_RPAREN,
-    ACTIONS(2459), 1,
-      sym_identifier,
-    STATE(1245), 1,
-      sym_dotted_name,
-    STATE(1397), 1,
-      sym_aliased_import,
-  [53417] = 4,
+      anon_sym_COMMA,
+  [53042] = 5,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2369), 1,
+    ACTIONS(1851), 1,
+      anon_sym_and,
+    ACTIONS(1853), 1,
+      anon_sym_or,
+    ACTIONS(1877), 1,
+      anon_sym_if,
+    ACTIONS(2444), 1,
+      anon_sym_COLON,
+  [53058] = 5,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2377), 1,
+      anon_sym_RPAREN,
+    ACTIONS(2436), 1,
+      sym_identifier,
+    STATE(1253), 1,
+      sym_dotted_name,
+    STATE(1326), 1,
+      sym_aliased_import,
+  [53074] = 5,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1851), 1,
+      anon_sym_and,
+    ACTIONS(1853), 1,
+      anon_sym_or,
+    ACTIONS(1877), 1,
+      anon_sym_if,
+    ACTIONS(2446), 1,
+      anon_sym_COLON,
+  [53090] = 5,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2330), 1,
+      anon_sym_LBRACK,
+    ACTIONS(2448), 1,
+      anon_sym_LPAREN,
+    STATE(1329), 1,
+      sym_parameters,
+    STATE(1332), 1,
+      sym_type_parameters,
+  [53106] = 4,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2450), 1,
       anon_sym_COMMA,
-    STATE(1163), 1,
-      aux_sym__import_list_repeat1,
-    ACTIONS(2373), 2,
+    STATE(1141), 1,
+      aux_sym_global_statement_repeat1,
+    ACTIONS(2452), 2,
       sym__newline,
       sym__semicolon,
-  [53431] = 4,
+  [53120] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2463), 1,
+    ACTIONS(2450), 1,
+      anon_sym_COMMA,
+    STATE(1143), 1,
+      aux_sym_global_statement_repeat1,
+    ACTIONS(2454), 2,
+      sym__newline,
+      sym__semicolon,
+  [53134] = 5,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2023), 1,
+      anon_sym_if,
+    ACTIONS(2025), 1,
+      anon_sym_and,
+    ACTIONS(2027), 1,
+      anon_sym_or,
+    ACTIONS(2456), 1,
+      sym__newline,
+  [53150] = 5,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1851), 1,
+      anon_sym_and,
+    ACTIONS(1853), 1,
+      anon_sym_or,
+    ACTIONS(1877), 1,
+      anon_sym_if,
+    ACTIONS(2458), 1,
+      anon_sym_COLON,
+  [53166] = 4,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2460), 1,
+      anon_sym_COMMA,
+    STATE(1155), 1,
+      aux_sym__import_list_repeat1,
+    ACTIONS(2462), 2,
+      sym__newline,
+      sym__semicolon,
+  [53180] = 4,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2464), 1,
+      anon_sym_COMMA,
+    STATE(1155), 1,
+      aux_sym__import_list_repeat1,
+    ACTIONS(2462), 2,
+      sym__newline,
+      sym__semicolon,
+  [53194] = 4,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2468), 1,
       anon_sym_DOT,
-    STATE(1165), 1,
+    STATE(1125), 1,
       aux_sym_import_prefix_repeat1,
-    ACTIONS(2461), 2,
+    ACTIONS(2466), 2,
       anon_sym_import,
       sym_identifier,
-  [53445] = 5,
+  [53208] = 5,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1879), 1,
-      anon_sym_if,
-    ACTIONS(1881), 1,
+    ACTIONS(1851), 1,
       anon_sym_and,
-    ACTIONS(1883), 1,
+    ACTIONS(1853), 1,
       anon_sym_or,
-    ACTIONS(2465), 1,
-      anon_sym_COLON,
-  [53461] = 4,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2469), 1,
-      anon_sym_COMMA,
-    STATE(1167), 1,
-      aux_sym__patterns_repeat1,
-    ACTIONS(2467), 2,
-      anon_sym_RPAREN,
-      anon_sym_RBRACK,
-  [53475] = 5,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2332), 1,
-      anon_sym_RPAREN,
-    ACTIONS(2459), 1,
-      sym_identifier,
-    STATE(1245), 1,
-      sym_dotted_name,
-    STATE(1397), 1,
-      sym_aliased_import,
-  [53491] = 5,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1879), 1,
+    ACTIONS(1877), 1,
       anon_sym_if,
-    ACTIONS(1881), 1,
-      anon_sym_and,
-    ACTIONS(1883), 1,
-      anon_sym_or,
     ACTIONS(2471), 1,
       anon_sym_COLON,
-  [53507] = 5,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1879), 1,
-      anon_sym_if,
-    ACTIONS(1881), 1,
-      anon_sym_and,
-    ACTIONS(1883), 1,
-      anon_sym_or,
-    ACTIONS(2473), 1,
-      anon_sym_else,
-  [53523] = 4,
+  [53224] = 4,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(2475), 1,
       anon_sym_COMMA,
-    STATE(1171), 1,
+    STATE(854), 1,
+      aux_sym__patterns_repeat1,
+    ACTIONS(2473), 2,
+      anon_sym_RPAREN,
+      anon_sym_RBRACK,
+  [53238] = 4,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2477), 1,
+      anon_sym_COMMA,
+    STATE(1129), 1,
       aux_sym_print_statement_repeat1,
-    ACTIONS(2477), 2,
+    ACTIONS(2479), 2,
       sym__newline,
       sym__semicolon,
-  [53537] = 5,
+  [53252] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1879), 1,
-      anon_sym_if,
-    ACTIONS(1881), 1,
-      anon_sym_and,
-    ACTIONS(1883), 1,
-      anon_sym_or,
-    ACTIONS(2479), 1,
-      anon_sym_COLON,
-  [53553] = 5,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1879), 1,
-      anon_sym_if,
-    ACTIONS(1881), 1,
-      anon_sym_and,
-    ACTIONS(1883), 1,
-      anon_sym_or,
     ACTIONS(2481), 1,
-      anon_sym_else,
-  [53569] = 5,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1879), 1,
-      anon_sym_if,
-    ACTIONS(1881), 1,
-      anon_sym_and,
-    ACTIONS(1883), 1,
-      anon_sym_or,
-    ACTIONS(2483), 1,
-      anon_sym_COLON,
-  [53585] = 4,
+      anon_sym_COMMA,
+    STATE(1159), 1,
+      aux_sym_print_statement_repeat1,
+    ACTIONS(2483), 2,
+      sym__newline,
+      sym__semicolon,
+  [53266] = 4,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(2485), 1,
       anon_sym_COMMA,
-    STATE(1192), 1,
-      aux_sym_global_statement_repeat1,
+    STATE(1159), 1,
+      aux_sym_print_statement_repeat1,
     ACTIONS(2487), 2,
       sym__newline,
       sym__semicolon,
-  [53599] = 4,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2485), 1,
-      anon_sym_COMMA,
-    STATE(1191), 1,
-      aux_sym_global_statement_repeat1,
-    ACTIONS(2489), 2,
-      sym__newline,
-      sym__semicolon,
-  [53613] = 5,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2051), 1,
-      anon_sym_and,
-    ACTIONS(2053), 1,
-      anon_sym_or,
-    ACTIONS(2071), 1,
-      anon_sym_if,
-    ACTIONS(2491), 1,
-      sym__newline,
-  [53629] = 5,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1879), 1,
-      anon_sym_if,
-    ACTIONS(1881), 1,
-      anon_sym_and,
-    ACTIONS(1883), 1,
-      anon_sym_or,
-    ACTIONS(2493), 1,
-      anon_sym_COLON,
-  [53645] = 5,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1879), 1,
-      anon_sym_if,
-    ACTIONS(1881), 1,
-      anon_sym_and,
-    ACTIONS(1883), 1,
-      anon_sym_or,
-    ACTIONS(2495), 1,
-      anon_sym_COLON,
-  [53661] = 5,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1879), 1,
-      anon_sym_if,
-    ACTIONS(1881), 1,
-      anon_sym_and,
-    ACTIONS(1883), 1,
-      anon_sym_or,
-    ACTIONS(2497), 1,
-      anon_sym_COLON,
-  [53677] = 4,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2499), 1,
-      anon_sym_COMMA,
-    STATE(1160), 1,
-      aux_sym_assert_statement_repeat1,
-    ACTIONS(2267), 2,
-      sym__newline,
-      sym__semicolon,
-  [53691] = 5,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2373), 1,
-      anon_sym_RPAREN,
-    ACTIONS(2502), 1,
-      anon_sym_COMMA,
-    ACTIONS(2504), 1,
-      anon_sym_as,
-    STATE(1205), 1,
-      aux_sym__import_list_repeat1,
-  [53707] = 4,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2506), 1,
-      anon_sym_COMMA,
-    STATE(1162), 1,
-      aux_sym_print_statement_repeat1,
-    ACTIONS(2509), 2,
-      sym__newline,
-      sym__semicolon,
-  [53721] = 4,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2511), 1,
-      anon_sym_COMMA,
-    STATE(1189), 1,
-      aux_sym__import_list_repeat1,
-    ACTIONS(2513), 2,
-      sym__newline,
-      sym__semicolon,
-  [53735] = 4,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2515), 1,
-      anon_sym_COMMA,
-    STATE(1189), 1,
-      aux_sym__import_list_repeat1,
-    ACTIONS(2513), 2,
-      sym__newline,
-      sym__semicolon,
-  [53749] = 4,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2519), 1,
-      anon_sym_DOT,
-    STATE(1165), 1,
-      aux_sym_import_prefix_repeat1,
-    ACTIONS(2517), 2,
-      anon_sym_import,
-      sym_identifier,
-  [53763] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2223), 4,
-      anon_sym_RPAREN,
-      anon_sym_COMMA,
-      anon_sym_RBRACK,
-      anon_sym_RBRACE,
-  [53773] = 4,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2524), 1,
-      anon_sym_COMMA,
-    STATE(872), 1,
-      aux_sym__patterns_repeat1,
-    ACTIONS(2522), 2,
-      anon_sym_RPAREN,
-      anon_sym_RBRACK,
-  [53787] = 4,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(315), 1,
-      sym__string_start,
-    ACTIONS(1899), 1,
-      anon_sym_COLON,
-    STATE(598), 2,
-      sym_string,
-      aux_sym_concatenated_string_repeat1,
-  [53801] = 5,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1879), 1,
-      anon_sym_if,
-    ACTIONS(1881), 1,
-      anon_sym_and,
-    ACTIONS(1883), 1,
-      anon_sym_or,
-    ACTIONS(2526), 1,
-      anon_sym_else,
-  [53817] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2528), 4,
-      anon_sym_RPAREN,
-      anon_sym_COMMA,
-      anon_sym_RBRACK,
-      anon_sym_RBRACE,
-  [53827] = 4,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2530), 1,
-      anon_sym_COMMA,
-    STATE(1162), 1,
-      aux_sym_print_statement_repeat1,
-    ACTIONS(2532), 2,
-      sym__newline,
-      sym__semicolon,
-  [53841] = 4,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2534), 1,
-      anon_sym_COMMA,
-    STATE(1162), 1,
-      aux_sym_print_statement_repeat1,
-    ACTIONS(2536), 2,
-      sym__newline,
-      sym__semicolon,
-  [53855] = 5,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2337), 1,
-      anon_sym_COLON,
-    ACTIONS(2538), 1,
-      anon_sym_RBRACE,
-    ACTIONS(2540), 1,
-      sym_type_conversion,
-    STATE(1479), 1,
-      sym_format_specifier,
-  [53871] = 4,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2169), 1,
-      anon_sym_COMMA,
-    STATE(1160), 1,
-      aux_sym_assert_statement_repeat1,
-    ACTIONS(2542), 2,
-      sym__newline,
-      sym__semicolon,
-  [53885] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2544), 4,
-      anon_sym_RPAREN,
-      anon_sym_COMMA,
-      anon_sym_RBRACK,
-      anon_sym_RBRACE,
-  [53895] = 5,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2365), 1,
-      anon_sym_LBRACK,
-    ACTIONS(2430), 1,
-      anon_sym_LPAREN,
-    STATE(1358), 1,
-      sym_type_parameters,
-    STATE(1363), 1,
-      sym_parameters,
-  [53911] = 4,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2548), 1,
-      anon_sym_COLON,
-    ACTIONS(2550), 1,
-      anon_sym_EQ,
-    ACTIONS(2546), 2,
-      anon_sym_RPAREN,
-      anon_sym_COMMA,
-  [53925] = 4,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2554), 1,
-      anon_sym_COMMA,
-    STATE(1178), 1,
-      aux_sym_with_clause_repeat1,
-    ACTIONS(2552), 2,
-      anon_sym_RPAREN,
-      anon_sym_COLON,
-  [53939] = 4,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2557), 1,
-      anon_sym_case,
-    STATE(541), 1,
-      sym_cases,
-    STATE(380), 2,
-      sym_case_block,
-      aux_sym_cases_repeat1,
-  [53953] = 4,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2557), 1,
-      anon_sym_case,
-    STATE(543), 1,
-      sym_cases,
-    STATE(380), 2,
-      sym_case_block,
-      aux_sym_cases_repeat1,
-  [53967] = 5,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2337), 1,
-      anon_sym_COLON,
-    ACTIONS(2559), 1,
-      anon_sym_RBRACE,
-    ACTIONS(2561), 1,
-      sym_type_conversion,
-    STATE(1420), 1,
-      sym_format_specifier,
-  [53983] = 5,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2402), 1,
-      anon_sym_RPAREN,
-    ACTIONS(2459), 1,
-      sym_identifier,
-    STATE(1245), 1,
-      sym_dotted_name,
-    STATE(1397), 1,
-      sym_aliased_import,
-  [53999] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2371), 1,
-      anon_sym_as,
-    ACTIONS(2563), 3,
-      sym__newline,
-      anon_sym_COMMA,
-      sym__semicolon,
-  [54011] = 4,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2432), 1,
-      anon_sym_case,
-    STATE(560), 1,
-      sym_cases,
-    STATE(345), 2,
-      sym_case_block,
-      aux_sym_cases_repeat1,
-  [54025] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2565), 4,
-      anon_sym_async,
-      anon_sym_def,
-      anon_sym_class,
-      anon_sym_AT,
-  [54035] = 5,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1879), 1,
-      anon_sym_if,
-    ACTIONS(1881), 1,
-      anon_sym_and,
-    ACTIONS(1883), 1,
-      anon_sym_or,
-    ACTIONS(2567), 1,
-      anon_sym_else,
-  [54051] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1934), 4,
-      sym__newline,
-      anon_sym_from,
-      anon_sym_COMMA,
-      sym__semicolon,
-  [54061] = 5,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2459), 1,
-      sym_identifier,
-    STATE(1161), 1,
-      sym_dotted_name,
-    STATE(1321), 1,
-      sym_aliased_import,
-    STATE(1415), 1,
-      sym__import_list,
-  [54077] = 4,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2569), 1,
-      anon_sym_COMMA,
-    STATE(1189), 1,
-      aux_sym__import_list_repeat1,
-    ACTIONS(2572), 2,
-      sym__newline,
-      sym__semicolon,
-  [54091] = 4,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2574), 1,
-      anon_sym_COMMA,
-    STATE(1077), 1,
-      aux_sym_open_sequence_match_pattern_repeat1,
-    ACTIONS(1703), 2,
-      anon_sym_if,
-      anon_sym_COLON,
-  [54105] = 4,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2485), 1,
-      anon_sym_COMMA,
-    STATE(1138), 1,
-      aux_sym_global_statement_repeat1,
-    ACTIONS(2576), 2,
-      sym__newline,
-      sym__semicolon,
-  [54119] = 4,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2485), 1,
-      anon_sym_COMMA,
-    STATE(1138), 1,
-      aux_sym_global_statement_repeat1,
-    ACTIONS(2578), 2,
-      sym__newline,
-      sym__semicolon,
-  [54133] = 5,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2459), 1,
-      sym_identifier,
-    STATE(1161), 1,
-      sym_dotted_name,
-    STATE(1321), 1,
-      sym_aliased_import,
-    STATE(1418), 1,
-      sym__import_list,
-  [54149] = 4,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(584), 1,
-      sym__newline,
-    ACTIONS(2580), 1,
-      sym__semicolon,
-    STATE(1200), 1,
-      aux_sym__simple_statements_repeat1,
-  [54162] = 4,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2582), 1,
-      sym_identifier,
-    ACTIONS(2584), 1,
-      anon_sym_RPAREN,
-    STATE(1341), 1,
-      sym_match_keyword_pattern,
-  [54175] = 4,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2586), 1,
-      anon_sym_COMMA,
-    ACTIONS(2588), 1,
-      anon_sym_RBRACK,
-    STATE(1299), 1,
-      aux_sym_subscript_repeat1,
-  [54188] = 4,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1820), 1,
-      anon_sym_COMMA,
-    ACTIONS(2590), 1,
-      anon_sym_in,
-    STATE(884), 1,
-      aux_sym__patterns_repeat1,
-  [54201] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2563), 3,
-      sym__newline,
-      anon_sym_COMMA,
-      sym__semicolon,
-  [54210] = 4,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1820), 1,
-      anon_sym_COMMA,
-    ACTIONS(2592), 1,
-      anon_sym_in,
-    STATE(884), 1,
-      aux_sym__patterns_repeat1,
-  [54223] = 4,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2594), 1,
-      sym__semicolon,
-    ACTIONS(2597), 1,
-      sym__newline,
-    STATE(1200), 1,
-      aux_sym__simple_statements_repeat1,
-  [54236] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2599), 3,
-      anon_sym_RPAREN,
-      anon_sym_COMMA,
-      anon_sym_COLON,
-  [54245] = 4,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2601), 1,
-      anon_sym_COMMA,
-    ACTIONS(2603), 1,
-      anon_sym_RBRACK,
-    STATE(1323), 1,
-      aux_sym_open_sequence_match_pattern_repeat1,
-  [54258] = 4,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2605), 1,
-      anon_sym_COMMA,
-    ACTIONS(2607), 1,
-      anon_sym_RBRACK,
-    STATE(1299), 1,
-      aux_sym_subscript_repeat1,
-  [54271] = 4,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1844), 1,
-      anon_sym_COLON,
-    ACTIONS(2609), 1,
-      anon_sym_COMMA,
-    STATE(1295), 1,
-      aux_sym__parameters_repeat1,
-  [54284] = 4,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2513), 1,
-      anon_sym_RPAREN,
-    ACTIONS(2611), 1,
-      anon_sym_COMMA,
-    STATE(1240), 1,
-      aux_sym__import_list_repeat1,
-  [54297] = 4,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2513), 1,
-      anon_sym_RPAREN,
-    ACTIONS(2613), 1,
-      anon_sym_COMMA,
-    STATE(1240), 1,
-      aux_sym__import_list_repeat1,
-  [54310] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1153), 3,
-      anon_sym_RPAREN,
-      anon_sym_COMMA,
-      anon_sym_COLON,
-  [54319] = 4,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2615), 1,
-      anon_sym_COMMA,
-    ACTIONS(2617), 1,
-      anon_sym_RBRACK,
-    STATE(1252), 1,
-      aux_sym_type_parameters_repeat1,
-  [54332] = 4,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2619), 1,
-      sym__semicolon,
-    ACTIONS(2621), 1,
-      sym__newline,
-    STATE(1194), 1,
-      aux_sym__simple_statements_repeat1,
-  [54345] = 4,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2361), 1,
-      anon_sym_LPAREN,
-    ACTIONS(2623), 1,
-      anon_sym_COLON,
-    STATE(1476), 1,
-      sym_argument_list,
-  [54358] = 4,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2625), 1,
-      anon_sym_COMMA,
-    ACTIONS(2628), 1,
-      anon_sym_RBRACE,
-    STATE(1211), 1,
-      aux_sym_match_mapping_pattern_repeat1,
-  [54371] = 4,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2630), 1,
-      anon_sym_RPAREN,
-    ACTIONS(2632), 1,
-      anon_sym_COMMA,
-    STATE(1213), 1,
-      aux_sym_match_class_pattern_repeat1,
-  [54384] = 4,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1719), 1,
-      anon_sym_RPAREN,
-    ACTIONS(2634), 1,
-      anon_sym_COMMA,
-    STATE(1296), 1,
-      aux_sym_match_class_pattern_repeat1,
-  [54397] = 4,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2636), 1,
-      sym__semicolon,
-    ACTIONS(2638), 1,
-      sym__newline,
-    STATE(1231), 1,
-      aux_sym__simple_statements_repeat1,
-  [54410] = 4,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1719), 1,
-      anon_sym_RPAREN,
-    ACTIONS(2582), 1,
-      sym_identifier,
-    STATE(1341), 1,
-      sym_match_keyword_pattern,
-  [54423] = 4,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1719), 1,
-      anon_sym_RPAREN,
-    ACTIONS(2640), 1,
-      anon_sym_COMMA,
-    STATE(1316), 1,
-      aux_sym_match_class_pattern_repeat2,
-  [54436] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(972), 1,
-      anon_sym_except,
-    ACTIONS(970), 2,
-      anon_sym_except_STAR,
-      anon_sym_finally,
-  [54447] = 4,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2642), 1,
-      anon_sym_COMMA,
-    ACTIONS(2644), 1,
-      anon_sym_RBRACE,
-    STATE(1257), 1,
-      aux_sym_match_mapping_pattern_repeat1,
-  [54460] = 4,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1861), 1,
-      anon_sym_COMMA,
-    ACTIONS(1930), 1,
-      anon_sym_RPAREN,
-    STATE(1292), 1,
-      aux_sym__collection_elements_repeat1,
-  [54473] = 4,
+  [53280] = 4,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(2153), 1,
       anon_sym_COMMA,
-    ACTIONS(2157), 1,
-      anon_sym_RBRACK,
-    STATE(1196), 1,
-      aux_sym_subscript_repeat1,
-  [54486] = 4,
+    STATE(1157), 1,
+      aux_sym_assert_statement_repeat1,
+    ACTIONS(2489), 2,
+      sym__newline,
+      sym__semicolon,
+  [53294] = 5,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2646), 1,
+    ACTIONS(1851), 1,
+      anon_sym_and,
+    ACTIONS(1853), 1,
+      anon_sym_or,
+    ACTIONS(1877), 1,
       anon_sym_if,
-    ACTIONS(2648), 1,
-      anon_sym_COLON,
-    STATE(1481), 1,
-      sym_guard,
-  [54499] = 3,
-    ACTIONS(1942), 1,
-      sym_comment,
-    ACTIONS(2289), 1,
-      anon_sym_RBRACE,
-    ACTIONS(2291), 2,
-      anon_sym_LBRACE2,
-      aux_sym_format_specifier_token1,
-  [54510] = 2,
+    ACTIONS(2491), 1,
+      anon_sym_else,
+  [53310] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2449), 3,
+    ACTIONS(2493), 1,
+      anon_sym_COMMA,
+    STATE(1133), 1,
+      aux_sym_global_statement_repeat1,
+    ACTIONS(2496), 2,
       sym__newline,
-      anon_sym_COMMA,
       sym__semicolon,
-  [54519] = 4,
+  [53324] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2361), 1,
-      anon_sym_LPAREN,
-    ACTIONS(2650), 1,
-      anon_sym_COLON,
-    STATE(1470), 1,
-      sym_argument_list,
-  [54532] = 4,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2187), 1,
+    ACTIONS(2500), 1,
       anon_sym_COMMA,
-    ACTIONS(2189), 1,
-      anon_sym_RBRACE,
-    STATE(1243), 1,
-      aux_sym_dictionary_repeat1,
-  [54545] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2652), 3,
-      sym__newline,
-      anon_sym_COMMA,
-      sym__semicolon,
-  [54554] = 4,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2615), 1,
-      anon_sym_COMMA,
-    ACTIONS(2654), 1,
+    STATE(1127), 1,
+      aux_sym__patterns_repeat1,
+    ACTIONS(2498), 2,
+      anon_sym_RPAREN,
       anon_sym_RBRACK,
-    STATE(1208), 1,
-      aux_sym_type_parameters_repeat1,
-  [54567] = 4,
+  [53338] = 5,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2656), 1,
-      anon_sym_RPAREN,
-    ACTIONS(2658), 1,
+    ACTIONS(2330), 1,
+      anon_sym_LBRACK,
+    ACTIONS(2448), 1,
+      anon_sym_LPAREN,
+    STATE(1330), 1,
+      sym_type_parameters,
+    STATE(1383), 1,
+      sym_parameters,
+  [53354] = 4,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2502), 1,
+      anon_sym_case,
+    STATE(556), 1,
+      sym_cases,
+    STATE(345), 2,
+      sym_case_block,
+      aux_sym_cases_repeat1,
+  [53368] = 4,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2502), 1,
+      anon_sym_case,
+    STATE(555), 1,
+      sym_cases,
+    STATE(345), 2,
+      sym_case_block,
+      aux_sym_cases_repeat1,
+  [53382] = 5,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1851), 1,
+      anon_sym_and,
+    ACTIONS(1853), 1,
+      anon_sym_or,
+    ACTIONS(1877), 1,
+      anon_sym_if,
+    ACTIONS(2504), 1,
+      anon_sym_COLON,
+  [53398] = 4,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(299), 1,
+      sym__string_start,
+    ACTIONS(1896), 1,
+      anon_sym_COLON,
+    STATE(582), 2,
+      sym_string,
+      aux_sym_concatenated_string_repeat1,
+  [53412] = 5,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1851), 1,
+      anon_sym_and,
+    ACTIONS(1853), 1,
+      anon_sym_or,
+    ACTIONS(1877), 1,
+      anon_sym_if,
+    ACTIONS(2506), 1,
+      anon_sym_COLON,
+  [53428] = 4,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2450), 1,
       anon_sym_COMMA,
-    STATE(1232), 1,
-      aux_sym_argument_list_repeat1,
-  [54580] = 4,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2660), 1,
-      anon_sym_RPAREN,
-    ACTIONS(2662), 1,
-      anon_sym_COMMA,
-    STATE(1249), 1,
-      aux_sym__parameters_repeat1,
-  [54593] = 4,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2664), 1,
-      anon_sym_RPAREN,
-    ACTIONS(2666), 1,
-      anon_sym_COMMA,
-    STATE(1232), 1,
-      aux_sym_argument_list_repeat1,
-  [54606] = 4,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(586), 1,
+    STATE(1133), 1,
+      aux_sym_global_statement_repeat1,
+    ACTIONS(2508), 2,
       sym__newline,
-    ACTIONS(2668), 1,
       sym__semicolon,
-    STATE(1200), 1,
-      aux_sym__simple_statements_repeat1,
-  [54619] = 4,
+  [53442] = 5,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2670), 1,
-      anon_sym_RPAREN,
-    ACTIONS(2672), 1,
+    ACTIONS(1851), 1,
+      anon_sym_and,
+    ACTIONS(1853), 1,
+      anon_sym_or,
+    ACTIONS(1877), 1,
+      anon_sym_if,
+    ACTIONS(2510), 1,
+      anon_sym_COLON,
+  [53458] = 4,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2450), 1,
       anon_sym_COMMA,
-    STATE(1232), 1,
-      aux_sym_argument_list_repeat1,
-  [54632] = 3,
+    STATE(1133), 1,
+      aux_sym_global_statement_repeat1,
+    ACTIONS(2512), 2,
+      sym__newline,
+      sym__semicolon,
+  [53472] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1016), 1,
-      anon_sym_except,
-    ACTIONS(1018), 2,
-      anon_sym_except_STAR,
-      anon_sym_finally,
-  [54643] = 4,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2675), 1,
-      anon_sym_COMMA,
-    ACTIONS(2677), 1,
-      anon_sym_RBRACE,
-    STATE(1235), 1,
-      aux_sym_dictionary_repeat1,
-  [54656] = 4,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2679), 1,
-      anon_sym_COMMA,
-    ACTIONS(2682), 1,
-      anon_sym_RBRACE,
-    STATE(1235), 1,
-      aux_sym_dictionary_repeat1,
-  [54669] = 4,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2137), 1,
-      sym_identifier,
-    ACTIONS(2684), 1,
+    ACTIONS(2516), 1,
+      anon_sym_DOT,
+    STATE(1125), 1,
+      aux_sym_import_prefix_repeat1,
+    ACTIONS(2514), 2,
       anon_sym_import,
-    STATE(1408), 1,
-      sym_dotted_name,
-  [54682] = 4,
+      sym_identifier,
+  [53486] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(598), 1,
-      sym__newline,
-    ACTIONS(2686), 1,
-      sym__semicolon,
-    STATE(1200), 1,
-      aux_sym__simple_statements_repeat1,
-  [54695] = 4,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2688), 1,
-      sym__semicolon,
-    ACTIONS(2690), 1,
-      sym__newline,
-    STATE(1237), 1,
-      aux_sym__simple_statements_repeat1,
-  [54708] = 4,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1963), 1,
-      anon_sym_RPAREN,
-    ACTIONS(1965), 1,
+    ACTIONS(2520), 1,
       anon_sym_COMMA,
-    STATE(1264), 1,
-      aux_sym_argument_list_repeat1,
-  [54721] = 4,
+    STATE(1145), 1,
+      aux_sym_with_clause_repeat1,
+    ACTIONS(2518), 2,
+      anon_sym_RPAREN,
+      anon_sym_COLON,
+  [53500] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2523), 4,
+      anon_sym_async,
+      anon_sym_def,
+      anon_sym_class,
+      anon_sym_AT,
+  [53510] = 4,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2525), 1,
+      anon_sym_COMMA,
+    STATE(1061), 1,
+      aux_sym_open_sequence_match_pattern_repeat1,
+    ACTIONS(1701), 2,
+      anon_sym_if,
+      anon_sym_COLON,
+  [53524] = 5,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2330), 1,
+      anon_sym_LBRACK,
+    ACTIONS(2448), 1,
+      anon_sym_LPAREN,
+    STATE(1315), 1,
+      sym_type_parameters,
+    STATE(1345), 1,
+      sym_parameters,
+  [53540] = 5,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2336), 1,
+      anon_sym_COLON,
+    ACTIONS(2527), 1,
+      anon_sym_RBRACE,
+    ACTIONS(2529), 1,
+      sym_type_conversion,
+    STATE(1433), 1,
+      sym_format_specifier,
+  [53556] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1955), 4,
+      sym__newline,
+      anon_sym_from,
+      anon_sym_COMMA,
+      sym__semicolon,
+  [53566] = 5,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1851), 1,
+      anon_sym_and,
+    ACTIONS(1853), 1,
+      anon_sym_or,
+    ACTIONS(1877), 1,
+      anon_sym_if,
+    ACTIONS(2531), 1,
+      anon_sym_else,
+  [53582] = 5,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2330), 1,
+      anon_sym_LBRACK,
+    ACTIONS(2448), 1,
+      anon_sym_LPAREN,
+    STATE(1319), 1,
+      sym_type_parameters,
+    STATE(1342), 1,
+      sym_parameters,
+  [53598] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2181), 4,
+      anon_sym_RPAREN,
+      anon_sym_COMMA,
+      anon_sym_COLON,
+      anon_sym_EQ,
+  [53608] = 4,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2369), 1,
+      anon_sym_COMMA,
+    STATE(1123), 1,
+      aux_sym__import_list_repeat1,
+    ACTIONS(2373), 2,
+      sym__newline,
+      sym__semicolon,
+  [53622] = 4,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2533), 1,
+      anon_sym_COMMA,
+    STATE(1155), 1,
+      aux_sym__import_list_repeat1,
+    ACTIONS(2536), 2,
+      sym__newline,
+      sym__semicolon,
+  [53636] = 4,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2256), 1,
+      anon_sym_EQ,
+    STATE(1336), 1,
+      sym__type_param_default,
+    ACTIONS(2538), 2,
+      anon_sym_COMMA,
+      anon_sym_RBRACK,
+  [53650] = 4,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2540), 1,
+      anon_sym_COMMA,
+    STATE(1157), 1,
+      aux_sym_assert_statement_repeat1,
+    ACTIONS(2299), 2,
+      sym__newline,
+      sym__semicolon,
+  [53664] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2371), 1,
+      anon_sym_as,
+    ACTIONS(2543), 3,
+      sym__newline,
+      anon_sym_COMMA,
+      sym__semicolon,
+  [53676] = 4,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2545), 1,
+      anon_sym_COMMA,
+    STATE(1159), 1,
+      aux_sym_print_statement_repeat1,
+    ACTIONS(2548), 2,
+      sym__newline,
+      sym__semicolon,
+  [53690] = 5,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1851), 1,
+      anon_sym_and,
+    ACTIONS(1853), 1,
+      anon_sym_or,
+    ACTIONS(1877), 1,
+      anon_sym_if,
+    ACTIONS(2550), 1,
+      anon_sym_COLON,
+  [53706] = 4,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2256), 1,
+      anon_sym_EQ,
+    STATE(1328), 1,
+      sym__type_param_default,
+    ACTIONS(2552), 2,
+      anon_sym_COMMA,
+      anon_sym_RBRACK,
+  [53720] = 4,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2554), 1,
+      anon_sym_case,
+    STATE(487), 1,
+      sym_cases,
+    STATE(334), 2,
+      sym_case_block,
+      aux_sym_cases_repeat1,
+  [53734] = 5,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2336), 1,
+      anon_sym_COLON,
+    ACTIONS(2556), 1,
+      anon_sym_RBRACE,
+    ACTIONS(2558), 1,
+      sym_type_conversion,
+    STATE(1495), 1,
+      sym_format_specifier,
+  [53750] = 4,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2554), 1,
+      anon_sym_case,
+    STATE(486), 1,
+      sym_cases,
+    STATE(334), 2,
+      sym_case_block,
+      aux_sym_cases_repeat1,
+  [53764] = 5,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2373), 1,
+      anon_sym_RPAREN,
+    ACTIONS(2560), 1,
+      anon_sym_COMMA,
+    ACTIONS(2562), 1,
+      anon_sym_as,
+    STATE(1208), 1,
+      aux_sym__import_list_repeat1,
+  [53780] = 5,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1851), 1,
+      anon_sym_and,
+    ACTIONS(1853), 1,
+      anon_sym_or,
+    ACTIONS(1877), 1,
+      anon_sym_if,
+    ACTIONS(2564), 1,
+      anon_sym_COLON,
+  [53796] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2167), 4,
+      anon_sym_RPAREN,
+      anon_sym_COMMA,
+      anon_sym_RBRACK,
+      anon_sym_RBRACE,
+  [53806] = 5,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2415), 1,
+      anon_sym_RPAREN,
+    ACTIONS(2436), 1,
+      sym_identifier,
+    STATE(1253), 1,
+      sym_dotted_name,
+    STATE(1326), 1,
+      sym_aliased_import,
+  [53822] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2566), 4,
+      anon_sym_RPAREN,
+      anon_sym_COMMA,
+      anon_sym_RBRACK,
+      anon_sym_RBRACE,
+  [53832] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2568), 4,
+      anon_sym_RPAREN,
+      anon_sym_COMMA,
+      anon_sym_RBRACK,
+      anon_sym_RBRACE,
+  [53842] = 3,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(2572), 1,
-      anon_sym_RPAREN,
-    ACTIONS(2692), 1,
-      anon_sym_COMMA,
-    STATE(1240), 1,
-      aux_sym__import_list_repeat1,
-  [54734] = 4,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(576), 1,
-      sym__newline,
-    ACTIONS(2695), 1,
-      sym__semicolon,
-    STATE(1200), 1,
-      aux_sym__simple_statements_repeat1,
-  [54747] = 4,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2697), 1,
-      anon_sym_COMMA,
-    ACTIONS(2699), 1,
-      anon_sym_RBRACE,
-    STATE(1235), 1,
-      aux_sym_dictionary_repeat1,
-  [54760] = 4,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2701), 1,
-      anon_sym_COMMA,
-    ACTIONS(2703), 1,
-      anon_sym_RBRACE,
-    STATE(1235), 1,
-      aux_sym_dictionary_repeat1,
-  [54773] = 4,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2705), 1,
-      sym__semicolon,
-    ACTIONS(2707), 1,
-      sym__newline,
-    STATE(1241), 1,
-      aux_sym__simple_statements_repeat1,
-  [54786] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2504), 1,
-      anon_sym_as,
-    ACTIONS(2563), 2,
-      anon_sym_RPAREN,
-      anon_sym_COMMA,
-  [54797] = 4,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(582), 1,
-      sym__newline,
-    ACTIONS(2709), 1,
-      sym__semicolon,
-    STATE(1200), 1,
-      aux_sym__simple_statements_repeat1,
-  [54810] = 4,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2711), 1,
-      anon_sym_COMMA,
-    ACTIONS(2713), 1,
-      anon_sym_RBRACE,
-    STATE(1235), 1,
-      aux_sym_dictionary_repeat1,
-  [54823] = 4,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2715), 1,
-      sym__semicolon,
-    ACTIONS(2717), 1,
-      sym__newline,
-    STATE(1246), 1,
-      aux_sym__simple_statements_repeat1,
-  [54836] = 4,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1844), 1,
-      anon_sym_RPAREN,
-    ACTIONS(2719), 1,
-      anon_sym_COMMA,
-    STATE(1275), 1,
-      aux_sym__parameters_repeat1,
-  [54849] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2721), 3,
-      anon_sym_LPAREN,
-      anon_sym_COLON,
       anon_sym_EQ,
-  [54858] = 4,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1861), 1,
-      anon_sym_COMMA,
-    ACTIONS(1932), 1,
+    ACTIONS(2570), 3,
       anon_sym_RPAREN,
-    STATE(1292), 1,
-      aux_sym__collection_elements_repeat1,
-  [54871] = 4,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2723), 1,
       anon_sym_COMMA,
-    ACTIONS(2726), 1,
-      anon_sym_RBRACK,
-    STATE(1252), 1,
-      aux_sym_type_parameters_repeat1,
-  [54884] = 3,
-    ACTIONS(1942), 1,
-      sym_comment,
-    ACTIONS(2248), 1,
-      anon_sym_RBRACE,
-    ACTIONS(2250), 2,
-      anon_sym_LBRACE2,
-      aux_sym_format_specifier_token1,
-  [54895] = 4,
+      anon_sym_COLON,
+  [53854] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(574), 1,
+    ACTIONS(2153), 1,
+      anon_sym_COMMA,
+    STATE(1157), 1,
+      aux_sym_assert_statement_repeat1,
+    ACTIONS(2574), 2,
       sym__newline,
-    ACTIONS(2728), 1,
       sym__semicolon,
-    STATE(1200), 1,
-      aux_sym__simple_statements_repeat1,
-  [54908] = 4,
+  [53868] = 5,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1993), 1,
-      anon_sym_RPAREN,
-    ACTIONS(1995), 1,
-      anon_sym_COMMA,
-    STATE(1277), 1,
-      aux_sym_argument_list_repeat1,
-  [54921] = 4,
+    ACTIONS(1851), 1,
+      anon_sym_and,
+    ACTIONS(1853), 1,
+      anon_sym_or,
+    ACTIONS(1877), 1,
+      anon_sym_if,
+    ACTIONS(2576), 1,
+      anon_sym_COLON,
+  [53884] = 5,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2730), 1,
-      anon_sym_RPAREN,
-    ACTIONS(2732), 1,
-      anon_sym_COMMA,
-    STATE(1279), 1,
-      aux_sym_argument_list_repeat1,
-  [54934] = 4,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1832), 1,
-      anon_sym_RBRACE,
-    ACTIONS(2734), 1,
-      anon_sym_COMMA,
-    STATE(1211), 1,
-      aux_sym_match_mapping_pattern_repeat1,
-  [54947] = 4,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2193), 1,
-      anon_sym_COMMA,
-    ACTIONS(2195), 1,
-      anon_sym_RBRACK,
-    STATE(1283), 1,
-      aux_sym_subscript_repeat1,
-  [54960] = 4,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2736), 1,
+    ACTIONS(2436), 1,
       sym_identifier,
-    ACTIONS(2738), 1,
+    STATE(1165), 1,
+      sym_dotted_name,
+    STATE(1215), 1,
+      sym_aliased_import,
+    STATE(1499), 1,
+      sym__import_list,
+  [53900] = 5,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1851), 1,
+      anon_sym_and,
+    ACTIONS(1853), 1,
+      anon_sym_or,
+    ACTIONS(1877), 1,
+      anon_sym_if,
+    ACTIONS(2578), 1,
+      anon_sym_else,
+  [53916] = 5,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2436), 1,
+      sym_identifier,
+    STATE(1165), 1,
+      sym_dotted_name,
+    STATE(1215), 1,
+      sym_aliased_import,
+    STATE(1496), 1,
+      sym__import_list,
+  [53932] = 4,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2256), 1,
+      anon_sym_EQ,
+    STATE(1344), 1,
+      sym__type_param_default,
+    ACTIONS(2580), 2,
+      anon_sym_COMMA,
+      anon_sym_RBRACK,
+  [53946] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2582), 3,
+      sym__newline,
+      anon_sym_COMMA,
+      sym__semicolon,
+  [53955] = 4,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2336), 1,
+      anon_sym_COLON,
+    ACTIONS(2584), 1,
+      anon_sym_RBRACE,
+    STATE(1423), 1,
+      sym_format_specifier,
+  [53968] = 4,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1812), 1,
+      anon_sym_COMMA,
+    ACTIONS(2586), 1,
+      anon_sym_in,
+    STATE(863), 1,
+      aux_sym__patterns_repeat1,
+  [53981] = 4,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2588), 1,
+      sym_identifier,
+    ACTIONS(2590), 1,
       sym_match_wildcard_pattern,
-    STATE(1110), 1,
+    STATE(1091), 1,
       sym_match_capture_pattern,
-  [54973] = 4,
+  [53994] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2337), 1,
-      anon_sym_COLON,
-    ACTIONS(2559), 1,
+    ACTIONS(2592), 1,
+      anon_sym_COMMA,
+    ACTIONS(2594), 1,
       anon_sym_RBRACE,
-    STATE(1420), 1,
-      sym_format_specifier,
-  [54986] = 4,
+    STATE(1287), 1,
+      aux_sym_dictionary_repeat1,
+  [54007] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2740), 1,
-      sym__semicolon,
-    ACTIONS(2742), 1,
-      sym__newline,
-    STATE(1254), 1,
-      aux_sym__simple_statements_repeat1,
-  [54999] = 4,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1889), 1,
-      anon_sym_DOT,
-    ACTIONS(1893), 1,
-      anon_sym_COLON,
-    STATE(906), 1,
-      aux_sym_match_value_pattern_repeat1,
-  [55012] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2744), 1,
-      anon_sym_EQ,
-    ACTIONS(2746), 2,
-      sym__newline,
-      sym__semicolon,
-  [55023] = 4,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2748), 1,
-      anon_sym_RPAREN,
-    ACTIONS(2750), 1,
-      anon_sym_COMMA,
-    STATE(1232), 1,
-      aux_sym_argument_list_repeat1,
-  [55036] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(968), 1,
-      anon_sym_except,
-    ACTIONS(966), 2,
-      anon_sym_except_STAR,
-      anon_sym_finally,
-  [55047] = 4,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2752), 1,
-      anon_sym_COMMA,
-    ACTIONS(2754), 1,
-      anon_sym_COLON,
-    STATE(1178), 1,
-      aux_sym_with_clause_repeat1,
-  [55060] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2756), 1,
-      anon_sym_COLON,
-    ACTIONS(2546), 2,
-      anon_sym_RPAREN,
-      anon_sym_COMMA,
-  [55071] = 4,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2758), 1,
-      anon_sym_RPAREN,
-    ACTIONS(2760), 1,
-      anon_sym_COMMA,
-    STATE(1310), 1,
-      aux_sym_with_clause_repeat1,
-  [55084] = 3,
-    ACTIONS(1942), 1,
-      sym_comment,
-    ACTIONS(2762), 1,
-      anon_sym_RBRACE,
-    ACTIONS(2764), 2,
-      anon_sym_LBRACE2,
-      aux_sym_format_specifier_token1,
-  [55095] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2434), 3,
-      anon_sym_RPAREN,
-      anon_sym_COMMA,
-      anon_sym_COLON,
-  [55104] = 4,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2766), 1,
-      anon_sym_COMMA,
-    ACTIONS(2768), 1,
-      anon_sym_RBRACK,
-    STATE(1299), 1,
-      aux_sym_subscript_repeat1,
-  [55117] = 4,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2770), 1,
-      anon_sym_COMMA,
-    ACTIONS(2772), 1,
-      anon_sym_RBRACK,
-    STATE(1299), 1,
-      aux_sym_subscript_repeat1,
-  [55130] = 4,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2774), 1,
-      anon_sym_RPAREN,
-    ACTIONS(2776), 1,
-      anon_sym_COMMA,
-    STATE(1232), 1,
-      aux_sym_argument_list_repeat1,
-  [55143] = 4,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2778), 1,
-      anon_sym_RPAREN,
-    ACTIONS(2780), 1,
-      anon_sym_COMMA,
-    STATE(1232), 1,
-      aux_sym_argument_list_repeat1,
-  [55156] = 4,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2599), 1,
-      anon_sym_RPAREN,
-    ACTIONS(2782), 1,
-      anon_sym_COMMA,
-    STATE(1275), 1,
-      aux_sym__parameters_repeat1,
-  [55169] = 4,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1820), 1,
-      anon_sym_COMMA,
-    ACTIONS(2785), 1,
-      anon_sym_in,
-    STATE(884), 1,
-      aux_sym__patterns_repeat1,
-  [55182] = 4,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2787), 1,
-      anon_sym_RPAREN,
-    ACTIONS(2789), 1,
-      anon_sym_COMMA,
-    STATE(1232), 1,
-      aux_sym_argument_list_repeat1,
-  [55195] = 4,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2337), 1,
-      anon_sym_COLON,
-    ACTIONS(2538), 1,
-      anon_sym_RBRACE,
-    STATE(1479), 1,
-      sym_format_specifier,
-  [55208] = 4,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2791), 1,
-      anon_sym_RPAREN,
-    ACTIONS(2793), 1,
-      anon_sym_COMMA,
-    STATE(1232), 1,
-      aux_sym_argument_list_repeat1,
-  [55221] = 4,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2795), 1,
-      anon_sym_RPAREN,
-    ACTIONS(2797), 1,
-      anon_sym_COMMA,
-    STATE(1232), 1,
-      aux_sym_argument_list_repeat1,
-  [55234] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2799), 3,
-      anon_sym_RPAREN,
-      anon_sym_COMMA,
-      anon_sym_COLON,
-  [55243] = 4,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2801), 1,
-      anon_sym_COMMA,
-    ACTIONS(2803), 1,
-      anon_sym_RBRACK,
-    STATE(1299), 1,
-      aux_sym_subscript_repeat1,
-  [55256] = 4,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2805), 1,
-      anon_sym_COMMA,
-    ACTIONS(2807), 1,
-      anon_sym_RBRACK,
-    STATE(1299), 1,
-      aux_sym_subscript_repeat1,
-  [55269] = 4,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2337), 1,
-      anon_sym_COLON,
-    ACTIONS(2809), 1,
-      anon_sym_RBRACE,
-    STATE(1409), 1,
-      sym_format_specifier,
-  [55282] = 4,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2811), 1,
-      anon_sym_RPAREN,
-    ACTIONS(2813), 1,
-      anon_sym_COMMA,
-    STATE(1232), 1,
-      aux_sym_argument_list_repeat1,
-  [55295] = 4,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2646), 1,
+    ACTIONS(2596), 1,
       anon_sym_if,
-    ACTIONS(2815), 1,
+    ACTIONS(2598), 1,
       anon_sym_COLON,
-    STATE(1501), 1,
+    STATE(1443), 1,
       sym_guard,
-  [55308] = 3,
+  [54020] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2817), 1,
+    ACTIONS(2600), 1,
       anon_sym_COMMA,
-    ACTIONS(2819), 2,
+    ACTIONS(2602), 2,
       anon_sym_if,
       anon_sym_COLON,
-  [55319] = 3,
+  [54031] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2067), 1,
-      anon_sym_from,
-    ACTIONS(2073), 2,
-      sym__newline,
-      sym__semicolon,
-  [55330] = 4,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2377), 1,
-      anon_sym_RPAREN,
-    ACTIONS(2821), 1,
+    ACTIONS(2604), 1,
       anon_sym_COMMA,
-    STATE(1114), 1,
-      aux_sym__collection_elements_repeat1,
-  [55343] = 4,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1721), 1,
-      anon_sym_RPAREN,
-    ACTIONS(2823), 1,
-      anon_sym_COMMA,
-    STATE(1325), 1,
-      aux_sym_match_class_pattern_repeat2,
-  [55356] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1399), 3,
-      sym__newline,
-      anon_sym_in,
-      sym__semicolon,
-  [55365] = 4,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2377), 1,
-      anon_sym_RPAREN,
-    ACTIONS(2825), 1,
-      anon_sym_COMMA,
-    STATE(1114), 1,
-      aux_sym__collection_elements_repeat1,
-  [55378] = 4,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1820), 1,
-      anon_sym_COMMA,
-    ACTIONS(2827), 1,
-      anon_sym_in,
-    STATE(884), 1,
-      aux_sym__patterns_repeat1,
-  [55391] = 4,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2207), 1,
-      anon_sym_COMMA,
-    ACTIONS(2209), 1,
-      anon_sym_RBRACK,
-    STATE(1271), 1,
-      aux_sym_subscript_repeat1,
-  [55404] = 4,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2599), 1,
-      anon_sym_COLON,
-    ACTIONS(2829), 1,
-      anon_sym_COMMA,
-    STATE(1295), 1,
-      aux_sym__parameters_repeat1,
-  [55417] = 4,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2832), 1,
-      anon_sym_RPAREN,
-    ACTIONS(2834), 1,
-      anon_sym_COMMA,
-    STATE(1296), 1,
-      aux_sym_match_class_pattern_repeat1,
-  [55430] = 4,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2837), 1,
-      anon_sym_RPAREN,
-    ACTIONS(2839), 1,
-      anon_sym_COMMA,
-    STATE(1274), 1,
-      aux_sym_argument_list_repeat1,
-  [55443] = 4,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1975), 1,
-      anon_sym_RPAREN,
-    ACTIONS(1977), 1,
-      anon_sym_COMMA,
-    STATE(1285), 1,
-      aux_sym_argument_list_repeat1,
-  [55456] = 4,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2841), 1,
-      anon_sym_COMMA,
-    ACTIONS(2844), 1,
-      anon_sym_RBRACK,
-    STATE(1299), 1,
-      aux_sym_subscript_repeat1,
-  [55469] = 4,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2846), 1,
-      anon_sym_COMMA,
-    ACTIONS(2848), 1,
+    ACTIONS(2606), 1,
       anon_sym_RBRACE,
-    STATE(1235), 1,
+    STATE(1287), 1,
       aux_sym_dictionary_repeat1,
-  [55482] = 4,
+  [54044] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1861), 1,
+    ACTIONS(1812), 1,
       anon_sym_COMMA,
-    ACTIONS(2850), 1,
-      anon_sym_RPAREN,
-    STATE(1289), 1,
-      aux_sym__collection_elements_repeat1,
-  [55495] = 4,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2852), 1,
-      anon_sym_COMMA,
-    ACTIONS(2854), 1,
-      anon_sym_RBRACE,
-    STATE(1235), 1,
-      aux_sym_dictionary_repeat1,
-  [55508] = 4,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1861), 1,
-      anon_sym_COMMA,
-    ACTIONS(2856), 1,
-      anon_sym_RPAREN,
-    STATE(1115), 1,
-      aux_sym__collection_elements_repeat1,
-  [55521] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(987), 1,
-      anon_sym_except,
-    ACTIONS(985), 2,
-      anon_sym_except_STAR,
-      anon_sym_finally,
-  [55532] = 4,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1820), 1,
-      anon_sym_COMMA,
-    ACTIONS(2858), 1,
+    ACTIONS(2608), 1,
       anon_sym_in,
-    STATE(884), 1,
+    STATE(863), 1,
       aux_sym__patterns_repeat1,
-  [55545] = 4,
+  [54057] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1820), 1,
-      anon_sym_COMMA,
-    ACTIONS(2860), 1,
-      anon_sym_in,
-    STATE(884), 1,
-      aux_sym__patterns_repeat1,
-  [55558] = 3,
-    ACTIONS(1942), 1,
-      sym_comment,
-    ACTIONS(2277), 1,
-      anon_sym_RBRACE,
-    ACTIONS(2279), 2,
-      anon_sym_LBRACE2,
-      aux_sym_format_specifier_token1,
-  [55569] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2552), 3,
-      anon_sym_RPAREN,
-      anon_sym_COMMA,
+    ACTIONS(2610), 1,
       anon_sym_COLON,
-  [55578] = 4,
+    ACTIONS(2438), 2,
+      anon_sym_RPAREN,
+      anon_sym_COMMA,
+  [54068] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(588), 1,
+    ACTIONS(551), 1,
       sym__newline,
-    ACTIONS(2862), 1,
+    ACTIONS(2612), 1,
       sym__semicolon,
-    STATE(1200), 1,
+    STATE(1240), 1,
       aux_sym__simple_statements_repeat1,
-  [55591] = 4,
+  [54081] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(995), 1,
+    ACTIONS(2332), 1,
       anon_sym_RPAREN,
-    ACTIONS(2864), 1,
+    ACTIONS(2614), 1,
       anon_sym_COMMA,
-    STATE(1178), 1,
-      aux_sym_with_clause_repeat1,
-  [55604] = 4,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2211), 1,
-      anon_sym_COMMA,
-    ACTIONS(2213), 1,
-      anon_sym_RBRACE,
-    STATE(1302), 1,
-      aux_sym_dictionary_repeat1,
-  [55617] = 4,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2235), 1,
-      sym_identifier,
-    STATE(1183), 1,
-      sym_dotted_name,
-    STATE(1198), 1,
-      sym_aliased_import,
-  [55630] = 4,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1861), 1,
-      anon_sym_COMMA,
-    ACTIONS(1905), 1,
-      anon_sym_RPAREN,
-    STATE(1292), 1,
+    STATE(1077), 1,
       aux_sym__collection_elements_repeat1,
-  [55643] = 4,
+  [54094] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1721), 1,
-      anon_sym_RPAREN,
-    ACTIONS(2582), 1,
-      sym_identifier,
-    STATE(1341), 1,
-      sym_match_keyword_pattern,
-  [55656] = 4,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2337), 1,
-      anon_sym_COLON,
-    ACTIONS(2866), 1,
-      anon_sym_RBRACE,
-    STATE(1515), 1,
-      sym_format_specifier,
-  [55669] = 4,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2868), 1,
-      anon_sym_RPAREN,
-    ACTIONS(2870), 1,
+    ACTIONS(1812), 1,
       anon_sym_COMMA,
-    STATE(1316), 1,
-      aux_sym_match_class_pattern_repeat2,
-  [55682] = 4,
+    ACTIONS(2616), 1,
+      anon_sym_in,
+    STATE(863), 1,
+      aux_sym__patterns_repeat1,
+  [54107] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2459), 1,
-      sym_identifier,
-    STATE(1245), 1,
-      sym_dotted_name,
-    STATE(1397), 1,
-      sym_aliased_import,
-  [55695] = 2,
+    ACTIONS(1812), 1,
+      anon_sym_COMMA,
+    ACTIONS(2618), 1,
+      anon_sym_in,
+    STATE(863), 1,
+      aux_sym__patterns_repeat1,
+  [54120] = 4,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2215), 1,
+      anon_sym_COMMA,
+    ACTIONS(2217), 1,
+      anon_sym_RBRACE,
+    STATE(1185), 1,
+      aux_sym_dictionary_repeat1,
+  [54133] = 4,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1945), 1,
+      anon_sym_RPAREN,
+    ACTIONS(1947), 1,
+      anon_sym_COMMA,
+    STATE(1233), 1,
+      aux_sym_argument_list_repeat1,
+  [54146] = 2,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(1403), 3,
       sym__newline,
       anon_sym_in,
       sym__semicolon,
-  [55704] = 4,
+  [54155] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2873), 1,
-      sym__semicolon,
-    ACTIONS(2875), 1,
+    ACTIONS(2543), 3,
       sym__newline,
-    STATE(1309), 1,
-      aux_sym__simple_statements_repeat1,
-  [55717] = 4,
+      anon_sym_COMMA,
+      sym__semicolon,
+  [54164] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2752), 1,
+    ACTIONS(2620), 1,
+      anon_sym_RPAREN,
+    ACTIONS(2622), 1,
       anon_sym_COMMA,
-    ACTIONS(2877), 1,
+    STATE(1256), 1,
+      aux_sym_argument_list_repeat1,
+  [54177] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1399), 3,
+      sym__newline,
+      anon_sym_in,
+      sym__semicolon,
+  [54186] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2624), 3,
+      anon_sym_LPAREN,
       anon_sym_COLON,
-    STATE(1266), 1,
+      anon_sym_EQ,
+  [54195] = 4,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2626), 1,
+      anon_sym_COMMA,
+    ACTIONS(2628), 1,
+      anon_sym_RBRACK,
+    STATE(1306), 1,
+      aux_sym_type_parameters_repeat1,
+  [54208] = 4,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2462), 1,
+      anon_sym_RPAREN,
+    ACTIONS(2630), 1,
+      anon_sym_COMMA,
+    STATE(1214), 1,
+      aux_sym__import_list_repeat1,
+  [54221] = 4,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2632), 1,
+      anon_sym_COMMA,
+    ACTIONS(2634), 1,
+      anon_sym_COLON,
+    STATE(1293), 1,
       aux_sym_with_clause_repeat1,
-  [55730] = 4,
+  [54234] = 4,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2209), 1,
+      anon_sym_COMMA,
+    ACTIONS(2211), 1,
+      anon_sym_RBRACK,
+    STATE(1278), 1,
+      aux_sym_subscript_repeat1,
+  [54247] = 4,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2336), 1,
+      anon_sym_COLON,
+    ACTIONS(2556), 1,
+      anon_sym_RBRACE,
+    STATE(1495), 1,
+      sym_format_specifier,
+  [54260] = 4,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1855), 1,
+      anon_sym_COMMA,
+    ACTIONS(1887), 1,
+      anon_sym_RPAREN,
+    STATE(1308), 1,
+      aux_sym__collection_elements_repeat1,
+  [54273] = 4,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2636), 1,
+      anon_sym_RPAREN,
+    ACTIONS(2638), 1,
+      anon_sym_COMMA,
+    STATE(1205), 1,
+      aux_sym_argument_list_repeat1,
+  [54286] = 4,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1715), 1,
+      anon_sym_RPAREN,
+    ACTIONS(2641), 1,
+      anon_sym_COMMA,
+    STATE(1275), 1,
+      aux_sym_match_class_pattern_repeat2,
+  [54299] = 4,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2643), 1,
+      anon_sym_COMMA,
+    ACTIONS(2646), 1,
+      anon_sym_RBRACK,
+    STATE(1207), 1,
+      aux_sym_subscript_repeat1,
+  [54312] = 4,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2462), 1,
+      anon_sym_RPAREN,
+    ACTIONS(2648), 1,
+      anon_sym_COMMA,
+    STATE(1214), 1,
+      aux_sym__import_list_repeat1,
+  [54325] = 4,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2183), 1,
+      anon_sym_COMMA,
+    ACTIONS(2187), 1,
+      anon_sym_RBRACK,
+    STATE(1289), 1,
+      aux_sym_subscript_repeat1,
+  [54338] = 4,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1715), 1,
+      anon_sym_RPAREN,
+    ACTIONS(2650), 1,
+      sym_identifier,
+    STATE(1324), 1,
+      sym_match_keyword_pattern,
+  [54351] = 4,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2652), 1,
+      anon_sym_RPAREN,
+    ACTIONS(2654), 1,
+      anon_sym_COMMA,
+    STATE(1296), 1,
+      aux_sym_argument_list_repeat1,
+  [54364] = 4,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2656), 1,
+      sym__semicolon,
+    ACTIONS(2658), 1,
+      sym__newline,
+    STATE(1228), 1,
+      aux_sym__simple_statements_repeat1,
+  [54377] = 4,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2660), 1,
+      sym__semicolon,
+    ACTIONS(2662), 1,
+      sym__newline,
+    STATE(1188), 1,
+      aux_sym__simple_statements_repeat1,
+  [54390] = 4,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2536), 1,
+      anon_sym_RPAREN,
+    ACTIONS(2664), 1,
+      anon_sym_COMMA,
+    STATE(1214), 1,
+      aux_sym__import_list_repeat1,
+  [54403] = 4,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(2373), 1,
       anon_sym_RPAREN,
-    ACTIONS(2502), 1,
+    ACTIONS(2560), 1,
       anon_sym_COMMA,
-    STATE(1206), 1,
+    STATE(1200), 1,
       aux_sym__import_list_repeat1,
-  [55743] = 2,
+  [54416] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2879), 3,
-      anon_sym_LPAREN,
-      anon_sym_COLON,
-      anon_sym_EQ,
-  [55752] = 4,
+    ACTIONS(1855), 1,
+      anon_sym_COMMA,
+    ACTIONS(1949), 1,
+      anon_sym_RPAREN,
+    STATE(1308), 1,
+      aux_sym__collection_elements_repeat1,
+  [54429] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1711), 1,
+    ACTIONS(2650), 1,
+      sym_identifier,
+    ACTIONS(2667), 1,
+      anon_sym_RPAREN,
+    STATE(1324), 1,
+      sym_match_keyword_pattern,
+  [54442] = 4,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1969), 1,
+      anon_sym_RPAREN,
+    ACTIONS(1971), 1,
+      anon_sym_COMMA,
+    STATE(1310), 1,
+      aux_sym_argument_list_repeat1,
+  [54455] = 4,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2669), 1,
+      anon_sym_RPAREN,
+    ACTIONS(2671), 1,
+      anon_sym_COMMA,
+    STATE(1275), 1,
+      aux_sym_match_class_pattern_repeat2,
+  [54468] = 4,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2650), 1,
+      sym_identifier,
+    ACTIONS(2669), 1,
+      anon_sym_RPAREN,
+    STATE(1324), 1,
+      sym_match_keyword_pattern,
+  [54481] = 3,
+    ACTIONS(1933), 1,
+      sym_comment,
+    ACTIONS(2322), 1,
+      anon_sym_RBRACE,
+    ACTIONS(2324), 2,
+      anon_sym_LBRACE2,
+      aux_sym_format_specifier_token1,
+  [54492] = 4,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1715), 1,
+      anon_sym_RPAREN,
+    ACTIONS(2673), 1,
+      anon_sym_COMMA,
+    STATE(1300), 1,
+      aux_sym_match_class_pattern_repeat1,
+  [54505] = 4,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2229), 1,
+      anon_sym_COMMA,
+    ACTIONS(2231), 1,
+      anon_sym_RBRACE,
+    STATE(1238), 1,
+      aux_sym_dictionary_repeat1,
+  [54518] = 4,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1812), 1,
+      anon_sym_COMMA,
+    ACTIONS(2675), 1,
+      anon_sym_in,
+    STATE(863), 1,
+      aux_sym__patterns_repeat1,
+  [54531] = 4,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2677), 1,
+      anon_sym_COMMA,
+    ACTIONS(2680), 1,
+      anon_sym_RBRACE,
+    STATE(1225), 1,
+      aux_sym_match_mapping_pattern_repeat1,
+  [54544] = 4,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2682), 1,
+      anon_sym_RPAREN,
+    ACTIONS(2684), 1,
+      anon_sym_COMMA,
+    STATE(1244), 1,
+      aux_sym__parameters_repeat1,
+  [54557] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2019), 1,
+      anon_sym_from,
+    ACTIONS(2029), 2,
+      sym__newline,
+      sym__semicolon,
+  [54568] = 4,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(545), 1,
+      sym__newline,
+    ACTIONS(2686), 1,
+      sym__semicolon,
+    STATE(1240), 1,
+      aux_sym__simple_statements_repeat1,
+  [54581] = 4,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2688), 1,
+      anon_sym_COMMA,
+    ACTIONS(2690), 1,
       anon_sym_RBRACK,
-    ACTIONS(2881), 1,
-      anon_sym_COMMA,
-    STATE(1077), 1,
+    STATE(1286), 1,
       aux_sym_open_sequence_match_pattern_repeat1,
-  [55765] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(989), 1,
-      anon_sym_except,
-    ACTIONS(991), 2,
-      anon_sym_except_STAR,
-      anon_sym_finally,
-  [55776] = 4,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2584), 1,
-      anon_sym_RPAREN,
-    ACTIONS(2883), 1,
-      anon_sym_COMMA,
-    STATE(1316), 1,
-      aux_sym_match_class_pattern_repeat2,
-  [55789] = 4,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2584), 1,
-      anon_sym_RPAREN,
-    ACTIONS(2883), 1,
-      anon_sym_COMMA,
-    STATE(1331), 1,
-      aux_sym_match_class_pattern_repeat2,
-  [55802] = 4,
+  [54594] = 4,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(2219), 1,
       anon_sym_COMMA,
     ACTIONS(2221), 1,
       anon_sym_RBRACE,
-    STATE(1242), 1,
+    STATE(1288), 1,
       aux_sym_dictionary_repeat1,
-  [55815] = 4,
+  [54607] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2885), 1,
+    ACTIONS(2596), 1,
+      anon_sym_if,
+    ACTIONS(2692), 1,
+      anon_sym_COLON,
+    STATE(1460), 1,
+      sym_guard,
+  [54620] = 4,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1902), 1,
+      anon_sym_DOT,
+    ACTIONS(1910), 1,
+      anon_sym_COLON,
+    STATE(887), 1,
+      aux_sym_match_value_pattern_repeat1,
+  [54633] = 4,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2694), 1,
       anon_sym_RPAREN,
-    ACTIONS(2887), 1,
+    ACTIONS(2696), 1,
       anon_sym_COMMA,
-    STATE(1230), 1,
+    STATE(1205), 1,
       aux_sym_argument_list_repeat1,
-  [55828] = 4,
+  [54646] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2582), 1,
+    ACTIONS(2121), 1,
       sym_identifier,
-    ACTIONS(2889), 1,
-      anon_sym_RPAREN,
-    STATE(1341), 1,
-      sym_match_keyword_pattern,
-  [55841] = 4,
+    STATE(1158), 1,
+      sym_dotted_name,
+    STATE(1195), 1,
+      sym_aliased_import,
+  [54659] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2630), 1,
-      anon_sym_RPAREN,
-    ACTIONS(2891), 1,
-      anon_sym_COMMA,
-    STATE(1216), 1,
-      aux_sym_match_class_pattern_repeat2,
-  [55854] = 4,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2889), 1,
-      anon_sym_RPAREN,
-    ACTIONS(2893), 1,
-      anon_sym_COMMA,
-    STATE(1316), 1,
-      aux_sym_match_class_pattern_repeat2,
-  [55867] = 3,
-    ACTIONS(1942), 1,
-      sym_comment,
-    ACTIONS(2271), 1,
+    ACTIONS(2336), 1,
+      anon_sym_COLON,
+    ACTIONS(2698), 1,
       anon_sym_RBRACE,
-    ACTIONS(2273), 2,
+    STATE(1473), 1,
+      sym_format_specifier,
+  [54672] = 4,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2700), 1,
+      anon_sym_RPAREN,
+    ACTIONS(2702), 1,
+      anon_sym_COMMA,
+    STATE(1219), 1,
+      aux_sym_match_class_pattern_repeat2,
+  [54685] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2704), 1,
+      anon_sym_EQ,
+    ACTIONS(2706), 2,
+      sym__newline,
+      sym__semicolon,
+  [54696] = 4,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2708), 1,
+      anon_sym_COMMA,
+    ACTIONS(2710), 1,
+      anon_sym_RBRACE,
+    STATE(1287), 1,
+      aux_sym_dictionary_repeat1,
+  [54709] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2712), 1,
+      anon_sym_in,
+    ACTIONS(2714), 2,
+      sym__newline,
+      sym__semicolon,
+  [54720] = 4,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2716), 1,
+      sym__semicolon,
+    ACTIONS(2719), 1,
+      sym__newline,
+    STATE(1240), 1,
+      aux_sym__simple_statements_repeat1,
+  [54733] = 4,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2330), 1,
+      anon_sym_LBRACK,
+    ACTIONS(2721), 1,
+      anon_sym_EQ,
+    STATE(1436), 1,
+      sym_type_parameters,
+  [54746] = 4,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2723), 1,
+      anon_sym_COMMA,
+    ACTIONS(2725), 1,
+      anon_sym_RBRACE,
+    STATE(1287), 1,
+      aux_sym_dictionary_repeat1,
+  [54759] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2181), 3,
+      sym__newline,
+      anon_sym_EQ,
+      sym__semicolon,
+  [54768] = 4,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1836), 1,
+      anon_sym_RPAREN,
+    ACTIONS(2727), 1,
+      anon_sym_COMMA,
+    STATE(1272), 1,
+      aux_sym__parameters_repeat1,
+  [54781] = 3,
+    ACTIONS(1933), 1,
+      sym_comment,
+    ACTIONS(2729), 1,
+      anon_sym_RBRACE,
+    ACTIONS(2731), 2,
       anon_sym_LBRACE2,
       aux_sym_format_specifier_token1,
-  [55878] = 2,
+  [54792] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2546), 3,
+    ACTIONS(2733), 1,
+      anon_sym_RPAREN,
+    ACTIONS(2735), 1,
+      anon_sym_COMMA,
+    STATE(1206), 1,
+      aux_sym_match_class_pattern_repeat2,
+  [54805] = 4,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2700), 1,
+      anon_sym_RPAREN,
+    ACTIONS(2702), 1,
+      anon_sym_COMMA,
+    STATE(1275), 1,
+      aux_sym_match_class_pattern_repeat2,
+  [54818] = 4,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2737), 1,
+      anon_sym_COMMA,
+    ACTIONS(2739), 1,
+      anon_sym_RBRACE,
+    STATE(1283), 1,
+      aux_sym_match_mapping_pattern_repeat1,
+  [54831] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2741), 3,
       anon_sym_RPAREN,
       anon_sym_COMMA,
       anon_sym_COLON,
-  [55887] = 4,
+  [54840] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2660), 1,
-      anon_sym_COLON,
-    ACTIONS(2895), 1,
+    ACTIONS(2442), 1,
+      anon_sym_EQ,
+    ACTIONS(2438), 2,
       anon_sym_COMMA,
-    STATE(1204), 1,
+      anon_sym_COLON,
+  [54851] = 4,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1977), 1,
+      anon_sym_RPAREN,
+    ACTIONS(1979), 1,
+      anon_sym_COMMA,
+    STATE(1274), 1,
+      aux_sym_argument_list_repeat1,
+  [54864] = 4,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2743), 1,
+      anon_sym_RPAREN,
+    ACTIONS(2745), 1,
+      anon_sym_COMMA,
+    STATE(1276), 1,
+      aux_sym_argument_list_repeat1,
+  [54877] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2562), 1,
+      anon_sym_as,
+    ACTIONS(2543), 2,
+      anon_sym_RPAREN,
+      anon_sym_COMMA,
+  [54888] = 4,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2201), 1,
+      anon_sym_COMMA,
+    ACTIONS(2203), 1,
+      anon_sym_RBRACK,
+    STATE(1279), 1,
+      aux_sym_subscript_repeat1,
+  [54901] = 4,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2326), 1,
+      anon_sym_LPAREN,
+    ACTIONS(2747), 1,
+      anon_sym_COLON,
+    STATE(1449), 1,
+      sym_argument_list,
+  [54914] = 4,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2749), 1,
+      anon_sym_RPAREN,
+    ACTIONS(2751), 1,
+      anon_sym_COMMA,
+    STATE(1205), 1,
+      aux_sym_argument_list_repeat1,
+  [54927] = 4,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2336), 1,
+      anon_sym_COLON,
+    ACTIONS(2527), 1,
+      anon_sym_RBRACE,
+    STATE(1433), 1,
+      sym_format_specifier,
+  [54940] = 4,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2682), 1,
+      anon_sym_COLON,
+    ACTIONS(2753), 1,
+      anon_sym_COMMA,
+    STATE(1263), 1,
       aux_sym__parameters_repeat1,
-  [55900] = 3,
+  [54953] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2438), 3,
+      anon_sym_RPAREN,
+      anon_sym_COMMA,
+      anon_sym_COLON,
+  [54962] = 4,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2131), 1,
+      sym_identifier,
+    ACTIONS(2755), 1,
+      anon_sym_import,
+    STATE(1414), 1,
+      sym_dotted_name,
+  [54975] = 4,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2733), 1,
+      anon_sym_RPAREN,
+    ACTIONS(2757), 1,
+      anon_sym_COMMA,
+    STATE(1222), 1,
+      aux_sym_match_class_pattern_repeat1,
+  [54988] = 4,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(543), 1,
+      sym__newline,
+    ACTIONS(2759), 1,
+      sym__semicolon,
+    STATE(1240), 1,
+      aux_sym__simple_statements_repeat1,
+  [55001] = 4,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1836), 1,
+      anon_sym_COLON,
+    ACTIONS(2761), 1,
+      anon_sym_COMMA,
+    STATE(1311), 1,
+      aux_sym__parameters_repeat1,
+  [55014] = 3,
+    ACTIONS(1933), 1,
+      sym_comment,
+    ACTIONS(2238), 1,
+      anon_sym_RBRACE,
+    ACTIONS(2240), 2,
+      anon_sym_LBRACE2,
+      aux_sym_format_specifier_token1,
+  [55025] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1115), 3,
+      anon_sym_RPAREN,
+      anon_sym_COMMA,
+      anon_sym_COLON,
+  [55034] = 4,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2436), 1,
+      sym_identifier,
+    STATE(1253), 1,
+      sym_dotted_name,
+    STATE(1326), 1,
+      sym_aliased_import,
+  [55047] = 4,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1008), 1,
+      anon_sym_RPAREN,
+    ACTIONS(2763), 1,
+      anon_sym_COMMA,
+    STATE(1145), 1,
+      aux_sym_with_clause_repeat1,
+  [55060] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2518), 3,
+      anon_sym_RPAREN,
+      anon_sym_COMMA,
+      anon_sym_COLON,
+  [55069] = 4,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2326), 1,
+      anon_sym_LPAREN,
+    ACTIONS(2765), 1,
+      anon_sym_COLON,
+    STATE(1486), 1,
+      sym_argument_list,
+  [55082] = 4,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2650), 1,
+      sym_identifier,
+    ACTIONS(2700), 1,
+      anon_sym_RPAREN,
+    STATE(1324), 1,
+      sym_match_keyword_pattern,
+  [55095] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2767), 3,
+      anon_sym_RPAREN,
+      anon_sym_COMMA,
+      anon_sym_COLON,
+  [55104] = 4,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2769), 1,
+      anon_sym_RPAREN,
+    ACTIONS(2771), 1,
+      anon_sym_COMMA,
+    STATE(1272), 1,
+      aux_sym__parameters_repeat1,
+  [55117] = 4,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2774), 1,
+      anon_sym_RPAREN,
+    ACTIONS(2776), 1,
+      anon_sym_COMMA,
+    STATE(1205), 1,
+      aux_sym_argument_list_repeat1,
+  [55130] = 4,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2778), 1,
+      anon_sym_RPAREN,
+    ACTIONS(2780), 1,
+      anon_sym_COMMA,
+    STATE(1205), 1,
+      aux_sym_argument_list_repeat1,
+  [55143] = 4,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2782), 1,
+      anon_sym_RPAREN,
+    ACTIONS(2784), 1,
+      anon_sym_COMMA,
+    STATE(1275), 1,
+      aux_sym_match_class_pattern_repeat2,
+  [55156] = 4,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2787), 1,
+      anon_sym_RPAREN,
+    ACTIONS(2789), 1,
+      anon_sym_COMMA,
+    STATE(1205), 1,
+      aux_sym_argument_list_repeat1,
+  [55169] = 4,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2791), 1,
+      anon_sym_RPAREN,
+    ACTIONS(2793), 1,
+      anon_sym_COMMA,
+    STATE(1205), 1,
+      aux_sym_argument_list_repeat1,
+  [55182] = 4,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2795), 1,
+      anon_sym_COMMA,
+    ACTIONS(2797), 1,
+      anon_sym_RBRACK,
+    STATE(1207), 1,
+      aux_sym_subscript_repeat1,
+  [55195] = 4,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2799), 1,
+      anon_sym_COMMA,
+    ACTIONS(2801), 1,
+      anon_sym_RBRACK,
+    STATE(1207), 1,
+      aux_sym_subscript_repeat1,
+  [55208] = 4,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2803), 1,
+      anon_sym_COMMA,
+    ACTIONS(2805), 1,
+      anon_sym_RBRACK,
+    STATE(1207), 1,
+      aux_sym_subscript_repeat1,
+  [55221] = 4,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2807), 1,
+      anon_sym_COMMA,
+    ACTIONS(2809), 1,
+      anon_sym_RBRACK,
+    STATE(1207), 1,
+      aux_sym_subscript_repeat1,
+  [55234] = 4,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1713), 1,
+      anon_sym_RPAREN,
+    ACTIONS(2650), 1,
+      sym_identifier,
+    STATE(1324), 1,
+      sym_match_keyword_pattern,
+  [55247] = 4,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1832), 1,
+      anon_sym_RBRACE,
+    ACTIONS(2811), 1,
+      anon_sym_COMMA,
+    STATE(1225), 1,
+      aux_sym_match_mapping_pattern_repeat1,
+  [55260] = 4,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2813), 1,
+      anon_sym_COMMA,
+    ACTIONS(2815), 1,
+      anon_sym_RBRACK,
+    STATE(1207), 1,
+      aux_sym_subscript_repeat1,
+  [55273] = 4,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2817), 1,
+      anon_sym_COMMA,
+    ACTIONS(2819), 1,
+      anon_sym_RBRACE,
+    STATE(1287), 1,
+      aux_sym_dictionary_repeat1,
+  [55286] = 4,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1703), 1,
+      anon_sym_RBRACK,
+    ACTIONS(2821), 1,
+      anon_sym_COMMA,
+    STATE(1061), 1,
+      aux_sym_open_sequence_match_pattern_repeat1,
+  [55299] = 4,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2823), 1,
+      anon_sym_COMMA,
+    ACTIONS(2826), 1,
+      anon_sym_RBRACE,
+    STATE(1287), 1,
+      aux_sym_dictionary_repeat1,
+  [55312] = 4,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2828), 1,
+      anon_sym_COMMA,
+    ACTIONS(2830), 1,
+      anon_sym_RBRACE,
+    STATE(1287), 1,
+      aux_sym_dictionary_repeat1,
+  [55325] = 4,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2832), 1,
+      anon_sym_COMMA,
+    ACTIONS(2834), 1,
+      anon_sym_RBRACK,
+    STATE(1207), 1,
+      aux_sym_subscript_repeat1,
+  [55338] = 4,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2836), 1,
+      anon_sym_RPAREN,
+    ACTIONS(2838), 1,
+      anon_sym_COMMA,
+    STATE(1205), 1,
+      aux_sym_argument_list_repeat1,
+  [55351] = 3,
+    ACTIONS(1933), 1,
+      sym_comment,
+    ACTIONS(2280), 1,
+      anon_sym_RBRACE,
+    ACTIONS(2282), 2,
+      anon_sym_LBRACE2,
+      aux_sym_format_specifier_token1,
+  [55362] = 4,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1703), 1,
+      anon_sym_RPAREN,
+    ACTIONS(2840), 1,
+      anon_sym_COMMA,
+    STATE(1061), 1,
+      aux_sym_open_sequence_match_pattern_repeat1,
+  [55375] = 4,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2632), 1,
+      anon_sym_COMMA,
+    ACTIONS(2842), 1,
+      anon_sym_COLON,
+    STATE(1145), 1,
+      aux_sym_with_clause_repeat1,
+  [55388] = 3,
+    ACTIONS(1933), 1,
+      sym_comment,
+    ACTIONS(2268), 1,
+      anon_sym_RBRACE,
+    ACTIONS(2270), 2,
+      anon_sym_LBRACE2,
+      aux_sym_format_specifier_token1,
+  [55399] = 4,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2844), 1,
+      anon_sym_RPAREN,
+    ACTIONS(2846), 1,
+      anon_sym_COMMA,
+    STATE(1267), 1,
+      aux_sym_with_clause_repeat1,
+  [55412] = 4,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2848), 1,
+      anon_sym_RPAREN,
+    ACTIONS(2850), 1,
+      anon_sym_COMMA,
+    STATE(1205), 1,
+      aux_sym_argument_list_repeat1,
+  [55425] = 4,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2626), 1,
+      anon_sym_COMMA,
+    ACTIONS(2852), 1,
+      anon_sym_RBRACK,
+    STATE(1199), 1,
+      aux_sym_type_parameters_repeat1,
+  [55438] = 4,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1855), 1,
+      anon_sym_COMMA,
+    ACTIONS(2854), 1,
+      anon_sym_RPAREN,
+    STATE(1096), 1,
+      aux_sym__collection_elements_repeat1,
+  [55451] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2496), 3,
+      sym__newline,
+      anon_sym_COMMA,
+      sym__semicolon,
+  [55460] = 4,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2856), 1,
+      anon_sym_RPAREN,
+    ACTIONS(2858), 1,
+      anon_sym_COMMA,
+    STATE(1300), 1,
+      aux_sym_match_class_pattern_repeat1,
+  [55473] = 4,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1812), 1,
+      anon_sym_COMMA,
+    ACTIONS(2861), 1,
+      anon_sym_in,
+    STATE(863), 1,
+      aux_sym__patterns_repeat1,
+  [55486] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2863), 3,
+      anon_sym_LPAREN,
+      anon_sym_COLON,
+      anon_sym_EQ,
+  [55495] = 4,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1855), 1,
+      anon_sym_COMMA,
+    ACTIONS(2865), 1,
+      anon_sym_RPAREN,
+    STATE(1189), 1,
+      aux_sym__collection_elements_repeat1,
+  [55508] = 4,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2867), 1,
+      sym__semicolon,
+    ACTIONS(2869), 1,
+      sym__newline,
+    STATE(1262), 1,
+      aux_sym__simple_statements_repeat1,
+  [55521] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2769), 3,
+      anon_sym_RPAREN,
+      anon_sym_COMMA,
+      anon_sym_COLON,
+  [55530] = 4,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2871), 1,
+      anon_sym_COMMA,
+    ACTIONS(2874), 1,
+      anon_sym_RBRACK,
+    STATE(1306), 1,
+      aux_sym_type_parameters_repeat1,
+  [55543] = 4,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1855), 1,
+      anon_sym_COMMA,
+    ACTIONS(1983), 1,
+      anon_sym_RPAREN,
+    STATE(1308), 1,
+      aux_sym__collection_elements_repeat1,
+  [55556] = 4,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2332), 1,
+      anon_sym_RPAREN,
+    ACTIONS(2876), 1,
+      anon_sym_COMMA,
+    STATE(1077), 1,
+      aux_sym__collection_elements_repeat1,
+  [55569] = 4,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1713), 1,
+      anon_sym_RPAREN,
+    ACTIONS(2878), 1,
+      anon_sym_COMMA,
+    STATE(1247), 1,
+      aux_sym_match_class_pattern_repeat2,
+  [55582] = 4,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2880), 1,
+      anon_sym_RPAREN,
+    ACTIONS(2882), 1,
+      anon_sym_COMMA,
+    STATE(1205), 1,
+      aux_sym_argument_list_repeat1,
+  [55595] = 4,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2769), 1,
+      anon_sym_COLON,
+    ACTIONS(2884), 1,
+      anon_sym_COMMA,
+    STATE(1311), 1,
+      aux_sym__parameters_repeat1,
+  [55608] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2570), 3,
+      anon_sym_RPAREN,
+      anon_sym_COMMA,
+      anon_sym_COLON,
+  [55617] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2147), 2,
+      sym__newline,
+      sym__semicolon,
+  [55625] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2887), 2,
+      anon_sym_COMMA,
+      anon_sym_RBRACE,
+  [55633] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2448), 1,
+      anon_sym_LPAREN,
+    STATE(1351), 1,
+      sym_parameters,
+  [55643] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2889), 1,
+      anon_sym_COLON,
+    ACTIONS(2891), 1,
+      anon_sym_DASH_GT,
+  [55653] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2893), 2,
+      anon_sym_COMMA,
+      anon_sym_RBRACK,
+  [55661] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2895), 2,
+      anon_sym_RPAREN,
+      anon_sym_COMMA,
+  [55669] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2448), 1,
+      anon_sym_LPAREN,
+    STATE(1350), 1,
+      sym_parameters,
+  [55679] = 3,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(2897), 1,
-      anon_sym_in,
-    ACTIONS(2899), 2,
-      sym__newline,
-      sym__semicolon,
-  [55911] = 4,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2365), 1,
-      anon_sym_LBRACK,
-    ACTIONS(2901), 1,
-      anon_sym_EQ,
-    STATE(1492), 1,
-      sym_type_parameters,
-  [55924] = 4,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1711), 1,
-      anon_sym_RPAREN,
-    ACTIONS(2903), 1,
-      anon_sym_COMMA,
-    STATE(1077), 1,
-      aux_sym_open_sequence_match_pattern_repeat1,
-  [55937] = 4,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2582), 1,
-      sym_identifier,
-    ACTIONS(2905), 1,
-      anon_sym_RPAREN,
-    STATE(1341), 1,
-      sym_match_keyword_pattern,
-  [55950] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2550), 1,
-      anon_sym_EQ,
-    ACTIONS(2546), 2,
-      anon_sym_COMMA,
-      anon_sym_COLON,
-  [55961] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2907), 3,
-      anon_sym_RPAREN,
-      anon_sym_COMMA,
-      anon_sym_COLON,
-  [55970] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2868), 2,
-      anon_sym_RPAREN,
-      anon_sym_COMMA,
-  [55978] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2909), 2,
-      sym__newline,
-      sym__semicolon,
-  [55986] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2911), 2,
-      anon_sym_COMMA,
-      anon_sym_RBRACK,
-  [55994] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2913), 1,
-      anon_sym_COLON,
-    ACTIONS(2915), 1,
-      anon_sym_DASH_GT,
-  [56004] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2917), 2,
-      sym__newline,
-      sym__semicolon,
-  [56012] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2919), 2,
-      sym__newline,
-      sym__semicolon,
-  [56020] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2546), 2,
-      anon_sym_COMMA,
-      anon_sym_COLON,
-  [56028] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1926), 2,
-      sym__newline,
-      sym__semicolon,
-  [56036] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2921), 2,
-      sym__newline,
-      sym__semicolon,
-  [56044] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2923), 2,
-      sym__newline,
-      sym__semicolon,
-  [56052] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2597), 2,
-      sym__newline,
-      sym__semicolon,
-  [56060] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2925), 2,
-      anon_sym_COMMA,
-      anon_sym_RBRACK,
-  [56068] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2582), 1,
-      sym_identifier,
-    STATE(1341), 1,
-      sym_match_keyword_pattern,
-  [56078] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2430), 1,
-      anon_sym_LPAREN,
-    STATE(1372), 1,
-      sym_parameters,
-  [56088] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2927), 2,
-      anon_sym_COMMA,
-      anon_sym_RBRACE,
-  [56096] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2430), 1,
-      anon_sym_LPAREN,
-    STATE(1375), 1,
-      sym_parameters,
-  [56106] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2929), 1,
-      sym_identifier,
-    STATE(1367), 1,
-      sym_match_capture_pattern,
-  [56116] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2430), 1,
-      anon_sym_LPAREN,
-    STATE(1344), 1,
-      sym_parameters,
-  [56126] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1842), 1,
-      anon_sym_RBRACE,
-    ACTIONS(2931), 1,
-      anon_sym_COMMA,
-  [56136] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2069), 1,
-      anon_sym_COMMA,
-    STATE(1112), 1,
-      aux_sym_expression_list_repeat1,
-  [56146] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2145), 2,
-      sym__newline,
-      sym__semicolon,
-  [56154] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2628), 2,
-      anon_sym_COMMA,
-      anon_sym_RBRACE,
-  [56162] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2933), 1,
-      anon_sym_COLON,
-    ACTIONS(2935), 1,
-      anon_sym_DASH_GT,
-  [56172] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2937), 2,
-      anon_sym_RPAREN,
-      anon_sym_COMMA,
-  [56180] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1889), 1,
-      anon_sym_DOT,
-    STATE(1262), 1,
-      aux_sym_match_value_pattern_repeat1,
-  [56190] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1928), 1,
-      anon_sym_COMMA,
-    STATE(985), 1,
-      aux_sym_expression_list_repeat1,
-  [56200] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2939), 2,
-      anon_sym_COMMA,
-      anon_sym_RBRACE,
-  [56208] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2644), 1,
-      anon_sym_RBRACE,
-    ACTIONS(2941), 1,
-      anon_sym_COMMA,
-  [56218] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2943), 2,
-      sym__newline,
-      sym__semicolon,
-  [56226] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2430), 1,
-      anon_sym_LPAREN,
-    STATE(1376), 1,
-      sym_parameters,
-  [56236] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2945), 1,
-      anon_sym_COLON,
-    ACTIONS(2947), 1,
-      anon_sym_DASH_GT,
-  [56246] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2949), 1,
-      anon_sym_COLON,
-    ACTIONS(2951), 1,
-      anon_sym_DASH_GT,
-  [56256] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2420), 2,
-      anon_sym_RPAREN,
-      anon_sym_COMMA,
-  [56264] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2953), 2,
-      anon_sym_COLON,
-      anon_sym_DASH_GT,
-  [56272] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2955), 1,
-      anon_sym_COLON,
-    ACTIONS(2957), 1,
-      anon_sym_DASH_GT,
-  [56282] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2959), 1,
-      anon_sym_COLON,
-    ACTIONS(2961), 1,
-      anon_sym_DASH_GT,
-  [56292] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2963), 1,
-      anon_sym_COLON,
-    ACTIONS(2965), 1,
-      anon_sym_DASH_GT,
-  [56302] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2967), 1,
-      anon_sym_COLON,
-    ACTIONS(2969), 1,
-      anon_sym_DASH_GT,
-  [56312] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2971), 2,
-      anon_sym_RPAREN,
-      anon_sym_COMMA,
-  [56320] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2973), 2,
-      anon_sym_COLON,
-      anon_sym_DASH_GT,
-  [56328] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2975), 1,
       sym_integer,
-    ACTIONS(2977), 1,
+    ACTIONS(2899), 1,
       sym_float,
-  [56338] = 2,
+  [55689] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2652), 2,
-      anon_sym_RPAREN,
+    ACTIONS(2021), 1,
       anon_sym_COMMA,
-  [56346] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2979), 2,
-      sym__newline,
-      sym__semicolon,
-  [56354] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2981), 2,
-      anon_sym_COMMA,
-      anon_sym_RBRACE,
-  [56362] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2983), 2,
-      sym__newline,
-      sym__semicolon,
-  [56370] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2985), 2,
-      sym__newline,
-      sym__semicolon,
-  [56378] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2987), 1,
-      sym_integer,
-    ACTIONS(2989), 1,
-      sym_float,
-  [56388] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2991), 2,
-      anon_sym_COMMA,
-      anon_sym_RBRACK,
-  [56396] = 2,
+    STATE(1080), 1,
+      aux_sym_expression_list_repeat1,
+  [55699] = 2,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(2205), 2,
       sym__newline,
       sym__semicolon,
-  [56404] = 3,
+  [55707] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2993), 1,
-      sym_integer,
-    ACTIONS(2995), 1,
-      sym_float,
-  [56414] = 2,
+    ACTIONS(2901), 2,
+      anon_sym_COLON,
+      anon_sym_DASH_GT,
+  [55715] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2997), 2,
-      sym__newline,
-      sym__semicolon,
-  [56422] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2817), 1,
-      anon_sym_COMMA,
-    ACTIONS(2999), 1,
+    ACTIONS(2782), 2,
       anon_sym_RPAREN,
-  [56432] = 2,
+      anon_sym_COMMA,
+  [55723] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(3001), 2,
-      sym__newline,
-      sym__semicolon,
-  [56440] = 2,
+    ACTIONS(2903), 2,
+      anon_sym_COMMA,
+      anon_sym_RBRACE,
+  [55731] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2203), 2,
-      sym__newline,
-      sym__semicolon,
-  [56448] = 2,
+    ACTIONS(2543), 2,
+      anon_sym_RPAREN,
+      anon_sym_COMMA,
+  [55739] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(3003), 2,
+    ACTIONS(2905), 1,
+      sym_integer,
+    ACTIONS(2907), 1,
+      sym_float,
+  [55749] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2909), 2,
+      anon_sym_COMMA,
+      anon_sym_RBRACK,
+  [55757] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2911), 1,
+      anon_sym_COLON,
+    ACTIONS(2913), 1,
+      anon_sym_DASH_GT,
+  [55767] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2448), 1,
+      anon_sym_LPAREN,
+    STATE(1343), 1,
+      sym_parameters,
+  [55777] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2915), 2,
+      anon_sym_RPAREN,
+      anon_sym_COMMA,
+  [55785] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2448), 1,
+      anon_sym_LPAREN,
+    STATE(1316), 1,
+      sym_parameters,
+  [55795] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2207), 2,
       sym__newline,
       sym__semicolon,
-  [56456] = 3,
+  [55803] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2917), 2,
+      anon_sym_COMMA,
+      anon_sym_RBRACE,
+  [55811] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2389), 2,
+      anon_sym_COMMA,
+      anon_sym_RBRACK,
+  [55819] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2919), 2,
+      anon_sym_COMMA,
+      anon_sym_RBRACK,
+  [55827] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2921), 1,
+      anon_sym_COMMA,
+    ACTIONS(2923), 1,
+      anon_sym_RBRACE,
+  [55837] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(894), 2,
+      anon_sym_except,
+      anon_sym_finally,
+  [55845] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1873), 2,
+      sym__newline,
+      sym__semicolon,
+  [55853] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2438), 2,
+      anon_sym_COMMA,
+      anon_sym_COLON,
+  [55861] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2719), 2,
+      sym__newline,
+      sym__semicolon,
+  [55869] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2925), 1,
+      anon_sym_COLON,
+    ACTIONS(2927), 1,
+      anon_sym_DASH_GT,
+  [55879] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2929), 1,
+      anon_sym_COLON,
+    ACTIONS(2931), 1,
+      anon_sym_DASH_GT,
+  [55889] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2933), 2,
+      anon_sym_COMMA,
+      anon_sym_RBRACK,
+  [55897] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2935), 1,
+      anon_sym_COLON,
+    ACTIONS(2937), 1,
+      anon_sym_DASH_GT,
+  [55907] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(896), 2,
+      anon_sym_except,
+      anon_sym_finally,
+  [55915] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(902), 2,
+      anon_sym_except,
+      anon_sym_finally,
+  [55923] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(924), 2,
+      anon_sym_except,
+      anon_sym_finally,
+  [55931] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2856), 2,
+      anon_sym_RPAREN,
+      anon_sym_COMMA,
+  [55939] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2939), 1,
+      anon_sym_COLON,
+    ACTIONS(2941), 1,
+      anon_sym_DASH_GT,
+  [55949] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2943), 1,
+      anon_sym_COLON,
+    ACTIONS(2945), 1,
+      anon_sym_DASH_GT,
+  [55959] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1902), 1,
+      anon_sym_DOT,
+    STATE(1232), 1,
+      aux_sym_match_value_pattern_repeat1,
+  [55969] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2947), 2,
+      sym__newline,
+      sym__semicolon,
+  [55977] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2949), 1,
+      sym_identifier,
+    STATE(1325), 1,
+      sym_match_capture_pattern,
+  [55987] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2951), 2,
+      sym__newline,
+      sym__semicolon,
+  [55995] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2953), 2,
+      sym__newline,
+      sym__semicolon,
+  [56003] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2955), 2,
+      sym__newline,
+      sym__semicolon,
+  [56011] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1834), 1,
+      anon_sym_RBRACE,
+    ACTIONS(2957), 1,
+      anon_sym_COMMA,
+  [56021] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(954), 2,
+      anon_sym_except,
+      anon_sym_finally,
+  [56029] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2959), 1,
+      anon_sym_COMMA,
+    STATE(1292), 1,
+      aux_sym_open_sequence_match_pattern_repeat1,
+  [56039] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2680), 2,
+      anon_sym_COMMA,
+      anon_sym_RBRACE,
+  [56047] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2961), 2,
+      sym__newline,
+      sym__semicolon,
+  [56055] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2650), 1,
+      sym_identifier,
+    STATE(1324), 1,
+      sym_match_keyword_pattern,
+  [56065] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2600), 1,
+      anon_sym_COMMA,
+    ACTIONS(2963), 1,
+      anon_sym_RPAREN,
+  [56075] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2965), 2,
+      sym__newline,
+      sym__semicolon,
+  [56083] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2967), 2,
+      sym__newline,
+      sym__semicolon,
+  [56091] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1875), 1,
+      anon_sym_COMMA,
+    STATE(955), 1,
+      aux_sym_expression_list_repeat1,
+  [56101] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2969), 2,
+      sym__newline,
+      sym__semicolon,
+  [56109] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2284), 2,
+      anon_sym_COMMA,
+      anon_sym_RBRACK,
+  [56117] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2971), 2,
+      anon_sym_RPAREN,
+      anon_sym_COMMA,
+  [56125] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2379), 2,
+      anon_sym_RPAREN,
+      anon_sym_COMMA,
+  [56133] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2582), 2,
+      anon_sym_RPAREN,
+      anon_sym_COMMA,
+  [56141] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2973), 2,
+      sym__newline,
+      sym__semicolon,
+  [56149] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2975), 2,
+      anon_sym_COMMA,
+      anon_sym_RBRACK,
+  [56157] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2977), 2,
+      sym__newline,
+      sym__semicolon,
+  [56165] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2979), 2,
+      sym__newline,
+      sym__semicolon,
+  [56173] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2981), 2,
+      sym__newline,
+      sym__semicolon,
+  [56181] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2983), 2,
+      sym__newline,
+      sym__semicolon,
+  [56189] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2985), 2,
+      anon_sym_COLON,
+      anon_sym_DASH_GT,
+  [56197] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2987), 1,
+      anon_sym_COMMA,
+    STATE(1147), 1,
+      aux_sym_open_sequence_match_pattern_repeat1,
+  [56207] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2739), 1,
+      anon_sym_RBRACE,
+    ACTIONS(2989), 1,
+      anon_sym_COMMA,
+  [56217] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2991), 1,
+      sym_integer,
+    ACTIONS(2993), 1,
+      sym_float,
+  [56227] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2995), 1,
+      anon_sym_COLON,
+    ACTIONS(2997), 1,
+      anon_sym_DASH_GT,
+  [56237] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2999), 1,
+      anon_sym_COLON,
+  [56244] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(3001), 1,
+      anon_sym_RPAREN,
+  [56251] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(3003), 1,
+      anon_sym_RBRACK,
+  [56258] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2586), 1,
+      anon_sym_in,
+  [56265] = 2,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(3005), 1,
-      anon_sym_COMMA,
-    STATE(1337), 1,
-      aux_sym_open_sequence_match_pattern_repeat1,
-  [56466] = 2,
+      anon_sym_COLON,
+  [56272] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2563), 2,
-      anon_sym_RPAREN,
-      anon_sym_COMMA,
-  [56474] = 2,
+    ACTIONS(3007), 1,
+      anon_sym_RBRACE,
+  [56279] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2322), 2,
-      anon_sym_COMMA,
-      anon_sym_RBRACK,
-  [56482] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(3007), 2,
-      anon_sym_RPAREN,
-      anon_sym_COMMA,
-  [56490] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(3009), 2,
-      sym__newline,
-      sym__semicolon,
-  [56498] = 3,
+    ACTIONS(3009), 1,
+      anon_sym_RBRACE,
+  [56286] = 2,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(3011), 1,
-      anon_sym_COMMA,
+      sym_identifier,
+  [56293] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
     ACTIONS(3013), 1,
       anon_sym_RBRACE,
-  [56508] = 2,
+  [56300] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(3015), 2,
-      anon_sym_COMMA,
-      anon_sym_RBRACK,
-  [56516] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2832), 2,
-      anon_sym_RPAREN,
-      anon_sym_COMMA,
-  [56524] = 3,
+    ACTIONS(3015), 1,
+      anon_sym_in,
+  [56307] = 2,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(3017), 1,
-      anon_sym_COMMA,
-    STATE(1190), 1,
-      aux_sym_open_sequence_match_pattern_repeat1,
-  [56534] = 2,
+      anon_sym_RPAREN,
+  [56314] = 2,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(3019), 1,
-      anon_sym_RBRACE,
-  [56541] = 2,
+      anon_sym_RPAREN,
+  [56321] = 2,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(3021), 1,
-      anon_sym_LPAREN,
-  [56548] = 2,
+      anon_sym_RBRACE,
+  [56328] = 2,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(3023), 1,
       anon_sym_RBRACK,
-  [56555] = 2,
+  [56335] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2923), 1,
+      anon_sym_RBRACE,
+  [56342] = 2,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(3025), 1,
-      anon_sym_import,
-  [56562] = 2,
+      anon_sym_COLON,
+  [56349] = 2,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(3027), 1,
-      anon_sym_RBRACE,
-  [56569] = 2,
+      sym_identifier,
+  [56356] = 2,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(3029), 1,
-      anon_sym_RBRACE,
-  [56576] = 2,
+      anon_sym_COLON,
+  [56363] = 2,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(3031), 1,
-      anon_sym_RBRACE,
-  [56583] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2105), 1,
-      anon_sym_EQ,
-  [56590] = 2,
+      anon_sym_RBRACK,
+  [56370] = 2,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(3033), 1,
-      anon_sym_COLON,
-  [56597] = 2,
+      anon_sym_RBRACK,
+  [56377] = 2,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(3035), 1,
-      anon_sym_RPAREN,
-  [56604] = 2,
+      anon_sym_RBRACE,
+  [56384] = 2,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(3037), 1,
-      anon_sym_RPAREN,
-  [56611] = 2,
+      anon_sym_COLON,
+  [56391] = 2,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(3039), 1,
-      anon_sym_for,
-  [56618] = 2,
+      anon_sym_COLON,
+  [56398] = 2,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(3041), 1,
-      anon_sym_RPAREN,
-  [56625] = 2,
+      anon_sym_COLON,
+  [56405] = 2,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(3043), 1,
-      anon_sym_RPAREN,
-  [56632] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2827), 1,
-      anon_sym_in,
-  [56639] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2809), 1,
-      anon_sym_RBRACE,
-  [56646] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2785), 1,
-      anon_sym_in,
-  [56653] = 2,
+      sym_identifier,
+  [56412] = 2,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(3045), 1,
-      anon_sym_COLON,
-  [56660] = 2,
+      anon_sym_in,
+  [56419] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(3047), 1,
-      anon_sym_COLON,
-  [56667] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(3013), 1,
-      anon_sym_RBRACE,
-  [56674] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2559), 1,
-      anon_sym_RBRACE,
-  [56681] = 2,
+    ACTIONS(884), 1,
+      anon_sym_def,
+  [56426] = 2,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(1832), 1,
       anon_sym_RBRACE,
-  [56688] = 2,
+  [56433] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(3047), 1,
+      sym_identifier,
+  [56440] = 2,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(3049), 1,
-      anon_sym_COLON,
-  [56695] = 2,
+      sym_identifier,
+  [56447] = 2,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(3051), 1,
-      anon_sym_COLON,
-  [56702] = 2,
+      anon_sym_import,
+  [56454] = 2,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(3053), 1,
-      anon_sym_RBRACK,
-  [56709] = 2,
+      anon_sym_for,
+  [56461] = 2,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(3055), 1,
-      anon_sym_in,
-  [56716] = 2,
+      anon_sym_RPAREN,
+  [56468] = 2,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(3057), 1,
-      anon_sym_RPAREN,
-  [56723] = 2,
+      anon_sym_COLON,
+  [56475] = 2,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(3059), 1,
       anon_sym_RPAREN,
-  [56730] = 2,
+  [56482] = 2,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(3061), 1,
-      anon_sym_RBRACE,
-  [56737] = 2,
+      anon_sym_COLON,
+  [56489] = 2,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(3063), 1,
-      anon_sym_RPAREN,
-  [56744] = 2,
+      anon_sym_COLON,
+  [56496] = 2,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(3065), 1,
       anon_sym_COLON,
-  [56751] = 2,
+  [56503] = 2,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(3067), 1,
       anon_sym_in,
-  [56758] = 2,
+  [56510] = 2,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(3069), 1,
-      anon_sym_RBRACK,
-  [56765] = 2,
+      anon_sym_RBRACE,
+  [56517] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2109), 1,
+      anon_sym_EQ,
+  [56524] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2861), 1,
+      anon_sym_in,
+  [56531] = 2,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(3071), 1,
-      anon_sym_RBRACE,
-  [56772] = 2,
+      anon_sym_RPAREN,
+  [56538] = 2,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(3073), 1,
-      anon_sym_RBRACE,
-  [56779] = 2,
+      anon_sym_COLON,
+  [56545] = 2,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(3075), 1,
-      sym_identifier,
-  [56786] = 2,
+      anon_sym_RBRACK,
+  [56552] = 2,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(3077), 1,
-      anon_sym_import,
-  [56793] = 2,
+      anon_sym_RBRACE,
+  [56559] = 2,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(3079), 1,
-      anon_sym_RPAREN,
-  [56800] = 2,
+      anon_sym_COLON,
+  [56566] = 2,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(3081), 1,
-      sym_identifier,
-  [56807] = 2,
+      anon_sym_COLON,
+  [56573] = 2,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(3083), 1,
-      anon_sym_import,
-  [56814] = 2,
+      anon_sym_RBRACE,
+  [56580] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2584), 1,
+      anon_sym_RBRACE,
+  [56587] = 2,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(3085), 1,
-      sym_identifier,
-  [56821] = 2,
+      anon_sym_RBRACE,
+  [56594] = 2,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(3087), 1,
-      anon_sym_in,
-  [56828] = 2,
+      sym_identifier,
+  [56601] = 2,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(3089), 1,
-      anon_sym_RPAREN,
-  [56835] = 2,
+      anon_sym_EQ,
+  [56608] = 2,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(3091), 1,
-      sym_identifier,
-  [56842] = 2,
+      anon_sym_import,
+  [56615] = 2,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(3093), 1,
-      sym_identifier,
-  [56849] = 2,
+      anon_sym_COLON,
+  [56622] = 2,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(3095), 1,
-      sym_identifier,
-  [56856] = 2,
+      anon_sym_COLON,
+  [56629] = 2,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(3097), 1,
-      anon_sym_COLON,
-  [56863] = 2,
+      sym_identifier,
+  [56636] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2527), 1,
+      anon_sym_RBRACE,
+  [56643] = 2,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(3099), 1,
       anon_sym_COLON,
-  [56870] = 2,
+  [56650] = 2,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(3101), 1,
       anon_sym_COLON,
-  [56877] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2860), 1,
-      anon_sym_in,
-  [56884] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(3103), 1,
-      anon_sym_RPAREN,
-  [56891] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(3105), 1,
-      sym_identifier,
-  [56898] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(3107), 1,
-      sym_identifier,
-  [56905] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(3109), 1,
-      anon_sym_COLON,
-  [56912] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(3111), 1,
-      anon_sym_COLON,
-  [56919] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(3113), 1,
-      anon_sym_RBRACE,
-  [56926] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(3115), 1,
-      anon_sym_RBRACE,
-  [56933] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(3117), 1,
-      anon_sym_RBRACE,
-  [56940] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(3119), 1,
-      anon_sym_COLON,
-  [56947] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(3121), 1,
-      anon_sym_RPAREN,
-  [56954] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2293), 1,
-      anon_sym_COLON,
-  [56961] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2858), 1,
-      anon_sym_in,
-  [56968] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(3123), 1,
-      anon_sym_RBRACK,
-  [56975] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(3125), 1,
-      anon_sym_COLON,
-  [56982] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(3127), 1,
-      anon_sym_RBRACE,
-  [56989] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(3129), 1,
-      anon_sym_COLON,
-  [56996] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(3131), 1,
-      anon_sym_COLON,
-  [57003] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2281), 1,
-      anon_sym_COLON,
-  [57010] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(3133), 1,
-      anon_sym_RBRACK,
-  [57017] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(3135), 1,
-      anon_sym_COLON,
-  [57024] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(3137), 1,
-      anon_sym_RPAREN,
-  [57031] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(3139), 1,
-      anon_sym_COLON,
-  [57038] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(3141), 1,
-      sym_identifier,
-  [57045] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(3143), 1,
-      anon_sym_COLON,
-  [57052] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2866), 1,
-      anon_sym_RBRACE,
-  [57059] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(3145), 1,
-      anon_sym_COLON,
-  [57066] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(3147), 1,
-      anon_sym_COLON,
-  [57073] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(3149), 1,
-      anon_sym_COLON,
-  [57080] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(3151), 1,
-      anon_sym_COLON,
-  [57087] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(3153), 1,
-      anon_sym_RPAREN,
-  [57094] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(3155), 1,
-      anon_sym_COLON,
-  [57101] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(3157), 1,
-      anon_sym_COLON,
-  [57108] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(3159), 1,
-      anon_sym_COLON,
-  [57115] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(876), 1,
-      anon_sym_def,
-  [57122] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(3161), 1,
-      anon_sym_COLON,
-  [57129] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(3163), 1,
-      sym_identifier,
-  [57136] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(3165), 1,
-      anon_sym_COLON,
-  [57143] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(3167), 1,
-      anon_sym_EQ,
-  [57150] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(3169), 1,
-      anon_sym_COLON,
-  [57157] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(3171), 1,
-      anon_sym_in,
-  [57164] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(3173), 1,
-      anon_sym_COLON,
-  [57171] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(3175), 1,
-      anon_sym_RBRACE,
-  [57178] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(3177), 1,
-      anon_sym_RBRACK,
-  [57185] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(3179), 1,
-      sym_identifier,
-  [57192] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(3181), 1,
-      anon_sym_COLON,
-  [57199] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(3183), 1,
-      sym_identifier,
-  [57206] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(3185), 1,
-      anon_sym_COLON,
-  [57213] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(3187), 1,
-      ts_builtin_sym_end,
-  [57220] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(3189), 1,
-      anon_sym_RBRACK,
-  [57227] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(3191), 1,
-      anon_sym_RBRACE,
-  [57234] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(3193), 1,
-      anon_sym_COLON,
-  [57241] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(3195), 1,
-      anon_sym_COLON,
-  [57248] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2246), 1,
-      anon_sym_COLON,
-  [57255] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(3197), 1,
-      sym_identifier,
-  [57262] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(3199), 1,
-      sym_identifier,
-  [57269] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(3201), 1,
-      sym_identifier,
-  [57276] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(3203), 1,
-      sym_identifier,
-  [57283] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(3205), 1,
-      anon_sym_COLON,
-  [57290] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(3207), 1,
-      anon_sym_RBRACE,
-  [57297] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(3209), 1,
-      sym_identifier,
-  [57304] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(3211), 1,
-      anon_sym_RBRACE,
-  [57311] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(3213), 1,
-      sym_identifier,
-  [57318] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(3215), 1,
-      sym_identifier,
-  [57325] = 2,
+  [56657] = 2,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(2320), 1,
       anon_sym_COLON,
-  [57332] = 2,
+  [56664] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2592), 1,
-      anon_sym_in,
-  [57339] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(894), 1,
-      anon_sym_def,
-  [57346] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(3217), 1,
-      anon_sym_COLON,
-  [57353] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2590), 1,
-      anon_sym_in,
-  [57360] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2538), 1,
+    ACTIONS(3103), 1,
       anon_sym_RBRACE,
-  [57367] = 2,
+  [56671] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(3219), 1,
+    ACTIONS(3105), 1,
+      anon_sym_import,
+  [56678] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(3107), 1,
+      anon_sym_COLON,
+  [56685] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(3109), 1,
+      anon_sym_RPAREN,
+  [56692] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(3111), 1,
+      anon_sym_COLON,
+  [56699] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(3113), 1,
+      anon_sym_COLON,
+  [56706] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2318), 1,
+      anon_sym_COLON,
+  [56713] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(3115), 1,
+      anon_sym_RBRACE,
+  [56720] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(3117), 1,
+      anon_sym_RBRACE,
+  [56727] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1012), 1,
+      anon_sym_STAR,
+  [56734] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(3119), 1,
+      anon_sym_RBRACK,
+  [56741] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(3121), 1,
+      anon_sym_COLON,
+  [56748] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(3123), 1,
+      anon_sym_RPAREN,
+  [56755] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(3125), 1,
+      anon_sym_COLON,
+  [56762] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(3127), 1,
+      sym_identifier,
+  [56769] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(3129), 1,
+      anon_sym_COLON,
+  [56776] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(3131), 1,
+      anon_sym_COLON,
+  [56783] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(3133), 1,
+      anon_sym_COLON,
+  [56790] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(3135), 1,
+      sym_identifier,
+  [56797] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(3137), 1,
+      anon_sym_in,
+  [56804] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(3139), 1,
+      sym_identifier,
+  [56811] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(3141), 1,
+      anon_sym_COLON,
+  [56818] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(3143), 1,
+      anon_sym_RBRACE,
+  [56825] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(3145), 1,
+      anon_sym_RBRACE,
+  [56832] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(3147), 1,
+      anon_sym_RBRACK,
+  [56839] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(3149), 1,
+      anon_sym_RPAREN,
+  [56846] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(3151), 1,
+      anon_sym_RPAREN,
+  [56853] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(3153), 1,
+      anon_sym_COLON,
+  [56860] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(3155), 1,
+      anon_sym_RBRACE,
+  [56867] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(3157), 1,
+      anon_sym_COLON,
+  [56874] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(3159), 1,
+      anon_sym_COLON,
+  [56881] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2556), 1,
+      anon_sym_RBRACE,
+  [56888] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(3161), 1,
+      anon_sym_LPAREN,
+  [56895] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(3163), 1,
+      sym_identifier,
+  [56902] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2608), 1,
+      anon_sym_in,
+  [56909] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(3165), 1,
+      anon_sym_COLON,
+  [56916] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2295), 1,
+      anon_sym_COLON,
+  [56923] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(3167), 1,
+      anon_sym_COLON,
+  [56930] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(3169), 1,
+      anon_sym_RPAREN,
+  [56937] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(3171), 1,
+      sym_identifier,
+  [56944] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(3173), 1,
+      sym_identifier,
+  [56951] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(3175), 1,
+      anon_sym_COLON,
+  [56958] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(3177), 1,
+      ts_builtin_sym_end,
+  [56965] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(3179), 1,
+      sym_identifier,
+  [56972] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(3181), 1,
+      sym_identifier,
+  [56979] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(3183), 1,
+      sym_identifier,
+  [56986] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(979), 1,
+      anon_sym_STAR,
+  [56993] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(3185), 1,
+      sym_identifier,
+  [57000] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(3187), 1,
+      anon_sym_COLON,
+  [57007] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(3189), 1,
+      anon_sym_COLON,
+  [57014] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2698), 1,
+      anon_sym_RBRACE,
+  [57021] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(3191), 1,
+      anon_sym_RPAREN,
+  [57028] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(3193), 1,
+      sym_identifier,
+  [57035] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(3195), 1,
+      sym_identifier,
+  [57042] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(3197), 1,
+      anon_sym_RPAREN,
+  [57049] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2618), 1,
+      anon_sym_in,
+  [57056] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(870), 1,
+      anon_sym_def,
+  [57063] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2675), 1,
+      anon_sym_in,
+  [57070] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2616), 1,
+      anon_sym_in,
+  [57077] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(3199), 1,
+      anon_sym_COLON,
+  [57084] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2266), 1,
       anon_sym_COLON,
 };
 
 static const uint32_t ts_small_parse_table_map[] = {
-  [SMALL_STATE(155)] = 0,
-  [SMALL_STATE(156)] = 118,
-  [SMALL_STATE(157)] = 236,
-  [SMALL_STATE(158)] = 354,
-  [SMALL_STATE(159)] = 464,
-  [SMALL_STATE(160)] = 579,
-  [SMALL_STATE(161)] = 694,
-  [SMALL_STATE(162)] = 809,
-  [SMALL_STATE(163)] = 926,
-  [SMALL_STATE(164)] = 1045,
-  [SMALL_STATE(165)] = 1162,
-  [SMALL_STATE(166)] = 1262,
-  [SMALL_STATE(167)] = 1376,
-  [SMALL_STATE(168)] = 1480,
-  [SMALL_STATE(169)] = 1584,
-  [SMALL_STATE(170)] = 1698,
-  [SMALL_STATE(171)] = 1812,
-  [SMALL_STATE(172)] = 1916,
-  [SMALL_STATE(173)] = 2016,
-  [SMALL_STATE(174)] = 2123,
-  [SMALL_STATE(175)] = 2224,
-  [SMALL_STATE(176)] = 2325,
-  [SMALL_STATE(177)] = 2430,
-  [SMALL_STATE(178)] = 2535,
-  [SMALL_STATE(179)] = 2638,
-  [SMALL_STATE(180)] = 2743,
-  [SMALL_STATE(181)] = 2848,
-  [SMALL_STATE(182)] = 2953,
-  [SMALL_STATE(183)] = 3054,
-  [SMALL_STATE(184)] = 3157,
-  [SMALL_STATE(185)] = 3262,
-  [SMALL_STATE(186)] = 3360,
-  [SMALL_STATE(187)] = 3462,
-  [SMALL_STATE(188)] = 3564,
-  [SMALL_STATE(189)] = 3668,
-  [SMALL_STATE(190)] = 3770,
-  [SMALL_STATE(191)] = 3872,
-  [SMALL_STATE(192)] = 3974,
-  [SMALL_STATE(193)] = 4072,
-  [SMALL_STATE(194)] = 4176,
-  [SMALL_STATE(195)] = 4278,
-  [SMALL_STATE(196)] = 4380,
-  [SMALL_STATE(197)] = 4482,
-  [SMALL_STATE(198)] = 4584,
-  [SMALL_STATE(199)] = 4686,
-  [SMALL_STATE(200)] = 4788,
-  [SMALL_STATE(201)] = 4894,
-  [SMALL_STATE(202)] = 4996,
-  [SMALL_STATE(203)] = 5094,
-  [SMALL_STATE(204)] = 5196,
-  [SMALL_STATE(205)] = 5300,
-  [SMALL_STATE(206)] = 5402,
-  [SMALL_STATE(207)] = 5504,
-  [SMALL_STATE(208)] = 5606,
-  [SMALL_STATE(209)] = 5708,
-  [SMALL_STATE(210)] = 5810,
-  [SMALL_STATE(211)] = 5912,
-  [SMALL_STATE(212)] = 6018,
-  [SMALL_STATE(213)] = 6122,
-  [SMALL_STATE(214)] = 6220,
-  [SMALL_STATE(215)] = 6322,
-  [SMALL_STATE(216)] = 6424,
-  [SMALL_STATE(217)] = 6526,
-  [SMALL_STATE(218)] = 6628,
-  [SMALL_STATE(219)] = 6689,
-  [SMALL_STATE(220)] = 6750,
-  [SMALL_STATE(221)] = 6811,
-  [SMALL_STATE(222)] = 6872,
-  [SMALL_STATE(223)] = 6971,
-  [SMALL_STATE(224)] = 7032,
-  [SMALL_STATE(225)] = 7131,
-  [SMALL_STATE(226)] = 7230,
-  [SMALL_STATE(227)] = 7291,
-  [SMALL_STATE(228)] = 7352,
-  [SMALL_STATE(229)] = 7424,
-  [SMALL_STATE(230)] = 7496,
-  [SMALL_STATE(231)] = 7592,
-  [SMALL_STATE(232)] = 7690,
-  [SMALL_STATE(233)] = 7762,
-  [SMALL_STATE(234)] = 7860,
-  [SMALL_STATE(235)] = 7932,
-  [SMALL_STATE(236)] = 8030,
-  [SMALL_STATE(237)] = 8128,
-  [SMALL_STATE(238)] = 8200,
-  [SMALL_STATE(239)] = 8272,
-  [SMALL_STATE(240)] = 8370,
-  [SMALL_STATE(241)] = 8442,
-  [SMALL_STATE(242)] = 8514,
-  [SMALL_STATE(243)] = 8609,
-  [SMALL_STATE(244)] = 8704,
-  [SMALL_STATE(245)] = 8799,
-  [SMALL_STATE(246)] = 8894,
-  [SMALL_STATE(247)] = 8989,
-  [SMALL_STATE(248)] = 9062,
-  [SMALL_STATE(249)] = 9157,
-  [SMALL_STATE(250)] = 9252,
-  [SMALL_STATE(251)] = 9347,
-  [SMALL_STATE(252)] = 9442,
-  [SMALL_STATE(253)] = 9537,
-  [SMALL_STATE(254)] = 9632,
-  [SMALL_STATE(255)] = 9705,
-  [SMALL_STATE(256)] = 9799,
-  [SMALL_STATE(257)] = 9893,
-  [SMALL_STATE(258)] = 9987,
-  [SMALL_STATE(259)] = 10055,
-  [SMALL_STATE(260)] = 10147,
-  [SMALL_STATE(261)] = 10241,
-  [SMALL_STATE(262)] = 10335,
-  [SMALL_STATE(263)] = 10429,
-  [SMALL_STATE(264)] = 10497,
-  [SMALL_STATE(265)] = 10589,
-  [SMALL_STATE(266)] = 10657,
-  [SMALL_STATE(267)] = 10719,
-  [SMALL_STATE(268)] = 10781,
-  [SMALL_STATE(269)] = 10849,
-  [SMALL_STATE(270)] = 10943,
-  [SMALL_STATE(271)] = 11005,
-  [SMALL_STATE(272)] = 11067,
-  [SMALL_STATE(273)] = 11135,
-  [SMALL_STATE(274)] = 11229,
-  [SMALL_STATE(275)] = 11323,
-  [SMALL_STATE(276)] = 11415,
-  [SMALL_STATE(277)] = 11483,
-  [SMALL_STATE(278)] = 11551,
-  [SMALL_STATE(279)] = 11621,
-  [SMALL_STATE(280)] = 11689,
-  [SMALL_STATE(281)] = 11778,
-  [SMALL_STATE(282)] = 11835,
-  [SMALL_STATE(283)] = 11892,
-  [SMALL_STATE(284)] = 11983,
-  [SMALL_STATE(285)] = 12050,
-  [SMALL_STATE(286)] = 12113,
-  [SMALL_STATE(287)] = 12202,
-  [SMALL_STATE(288)] = 12259,
-  [SMALL_STATE(289)] = 12316,
-  [SMALL_STATE(290)] = 12405,
-  [SMALL_STATE(291)] = 12496,
-  [SMALL_STATE(292)] = 12553,
-  [SMALL_STATE(293)] = 12644,
-  [SMALL_STATE(294)] = 12733,
-  [SMALL_STATE(295)] = 12822,
-  [SMALL_STATE(296)] = 12911,
-  [SMALL_STATE(297)] = 13002,
-  [SMALL_STATE(298)] = 13091,
-  [SMALL_STATE(299)] = 13182,
-  [SMALL_STATE(300)] = 13273,
-  [SMALL_STATE(301)] = 13362,
-  [SMALL_STATE(302)] = 13453,
-  [SMALL_STATE(303)] = 13544,
-  [SMALL_STATE(304)] = 13633,
-  [SMALL_STATE(305)] = 13722,
-  [SMALL_STATE(306)] = 13779,
-  [SMALL_STATE(307)] = 13868,
-  [SMALL_STATE(308)] = 13931,
-  [SMALL_STATE(309)] = 13988,
-  [SMALL_STATE(310)] = 14077,
-  [SMALL_STATE(311)] = 14168,
-  [SMALL_STATE(312)] = 14225,
-  [SMALL_STATE(313)] = 14314,
-  [SMALL_STATE(314)] = 14371,
-  [SMALL_STATE(315)] = 14462,
-  [SMALL_STATE(316)] = 14519,
-  [SMALL_STATE(317)] = 14575,
-  [SMALL_STATE(318)] = 14631,
-  [SMALL_STATE(319)] = 14687,
-  [SMALL_STATE(320)] = 14743,
-  [SMALL_STATE(321)] = 14799,
-  [SMALL_STATE(322)] = 14887,
-  [SMALL_STATE(323)] = 14975,
-  [SMALL_STATE(324)] = 15063,
-  [SMALL_STATE(325)] = 15151,
-  [SMALL_STATE(326)] = 15207,
-  [SMALL_STATE(327)] = 15263,
-  [SMALL_STATE(328)] = 15319,
-  [SMALL_STATE(329)] = 15375,
-  [SMALL_STATE(330)] = 15431,
-  [SMALL_STATE(331)] = 15495,
-  [SMALL_STATE(332)] = 15551,
-  [SMALL_STATE(333)] = 15607,
-  [SMALL_STATE(334)] = 15663,
-  [SMALL_STATE(335)] = 15727,
-  [SMALL_STATE(336)] = 15815,
-  [SMALL_STATE(337)] = 15871,
-  [SMALL_STATE(338)] = 15927,
-  [SMALL_STATE(339)] = 15991,
-  [SMALL_STATE(340)] = 16055,
-  [SMALL_STATE(341)] = 16111,
-  [SMALL_STATE(342)] = 16199,
-  [SMALL_STATE(343)] = 16255,
-  [SMALL_STATE(344)] = 16311,
-  [SMALL_STATE(345)] = 16367,
-  [SMALL_STATE(346)] = 16427,
-  [SMALL_STATE(347)] = 16515,
-  [SMALL_STATE(348)] = 16575,
-  [SMALL_STATE(349)] = 16663,
-  [SMALL_STATE(350)] = 16723,
-  [SMALL_STATE(351)] = 16811,
-  [SMALL_STATE(352)] = 16899,
-  [SMALL_STATE(353)] = 16955,
-  [SMALL_STATE(354)] = 17011,
-  [SMALL_STATE(355)] = 17067,
-  [SMALL_STATE(356)] = 17123,
-  [SMALL_STATE(357)] = 17179,
-  [SMALL_STATE(358)] = 17235,
-  [SMALL_STATE(359)] = 17291,
-  [SMALL_STATE(360)] = 17347,
-  [SMALL_STATE(361)] = 17403,
-  [SMALL_STATE(362)] = 17491,
-  [SMALL_STATE(363)] = 17547,
-  [SMALL_STATE(364)] = 17603,
-  [SMALL_STATE(365)] = 17691,
-  [SMALL_STATE(366)] = 17747,
-  [SMALL_STATE(367)] = 17803,
-  [SMALL_STATE(368)] = 17859,
-  [SMALL_STATE(369)] = 17947,
-  [SMALL_STATE(370)] = 18003,
-  [SMALL_STATE(371)] = 18059,
-  [SMALL_STATE(372)] = 18115,
-  [SMALL_STATE(373)] = 18171,
-  [SMALL_STATE(374)] = 18227,
-  [SMALL_STATE(375)] = 18283,
-  [SMALL_STATE(376)] = 18339,
-  [SMALL_STATE(377)] = 18395,
-  [SMALL_STATE(378)] = 18451,
-  [SMALL_STATE(379)] = 18507,
-  [SMALL_STATE(380)] = 18563,
-  [SMALL_STATE(381)] = 18623,
-  [SMALL_STATE(382)] = 18679,
-  [SMALL_STATE(383)] = 18735,
-  [SMALL_STATE(384)] = 18823,
-  [SMALL_STATE(385)] = 18879,
-  [SMALL_STATE(386)] = 18964,
-  [SMALL_STATE(387)] = 19049,
-  [SMALL_STATE(388)] = 19108,
-  [SMALL_STATE(389)] = 19163,
-  [SMALL_STATE(390)] = 19248,
-  [SMALL_STATE(391)] = 19333,
-  [SMALL_STATE(392)] = 19418,
-  [SMALL_STATE(393)] = 19503,
-  [SMALL_STATE(394)] = 19590,
-  [SMALL_STATE(395)] = 19675,
-  [SMALL_STATE(396)] = 19760,
-  [SMALL_STATE(397)] = 19845,
-  [SMALL_STATE(398)] = 19930,
-  [SMALL_STATE(399)] = 20015,
-  [SMALL_STATE(400)] = 20100,
-  [SMALL_STATE(401)] = 20185,
-  [SMALL_STATE(402)] = 20244,
-  [SMALL_STATE(403)] = 20329,
-  [SMALL_STATE(404)] = 20384,
-  [SMALL_STATE(405)] = 20469,
-  [SMALL_STATE(406)] = 20554,
-  [SMALL_STATE(407)] = 20639,
-  [SMALL_STATE(408)] = 20694,
-  [SMALL_STATE(409)] = 20753,
-  [SMALL_STATE(410)] = 20838,
-  [SMALL_STATE(411)] = 20923,
-  [SMALL_STATE(412)] = 21008,
-  [SMALL_STATE(413)] = 21093,
-  [SMALL_STATE(414)] = 21152,
-  [SMALL_STATE(415)] = 21211,
-  [SMALL_STATE(416)] = 21296,
-  [SMALL_STATE(417)] = 21381,
-  [SMALL_STATE(418)] = 21466,
-  [SMALL_STATE(419)] = 21525,
-  [SMALL_STATE(420)] = 21610,
-  [SMALL_STATE(421)] = 21665,
-  [SMALL_STATE(422)] = 21720,
-  [SMALL_STATE(423)] = 21805,
-  [SMALL_STATE(424)] = 21890,
-  [SMALL_STATE(425)] = 21975,
-  [SMALL_STATE(426)] = 22060,
-  [SMALL_STATE(427)] = 22145,
-  [SMALL_STATE(428)] = 22204,
-  [SMALL_STATE(429)] = 22263,
-  [SMALL_STATE(430)] = 22348,
-  [SMALL_STATE(431)] = 22407,
-  [SMALL_STATE(432)] = 22468,
-  [SMALL_STATE(433)] = 22527,
-  [SMALL_STATE(434)] = 22582,
-  [SMALL_STATE(435)] = 22667,
-  [SMALL_STATE(436)] = 22752,
-  [SMALL_STATE(437)] = 22837,
-  [SMALL_STATE(438)] = 22922,
-  [SMALL_STATE(439)] = 23007,
-  [SMALL_STATE(440)] = 23092,
-  [SMALL_STATE(441)] = 23151,
-  [SMALL_STATE(442)] = 23212,
-  [SMALL_STATE(443)] = 23297,
-  [SMALL_STATE(444)] = 23382,
-  [SMALL_STATE(445)] = 23467,
-  [SMALL_STATE(446)] = 23552,
-  [SMALL_STATE(447)] = 23637,
-  [SMALL_STATE(448)] = 23722,
-  [SMALL_STATE(449)] = 23807,
-  [SMALL_STATE(450)] = 23868,
-  [SMALL_STATE(451)] = 23953,
-  [SMALL_STATE(452)] = 24038,
-  [SMALL_STATE(453)] = 24123,
-  [SMALL_STATE(454)] = 24208,
-  [SMALL_STATE(455)] = 24267,
-  [SMALL_STATE(456)] = 24352,
-  [SMALL_STATE(457)] = 24437,
-  [SMALL_STATE(458)] = 24522,
-  [SMALL_STATE(459)] = 24607,
-  [SMALL_STATE(460)] = 24692,
-  [SMALL_STATE(461)] = 24777,
-  [SMALL_STATE(462)] = 24862,
-  [SMALL_STATE(463)] = 24947,
-  [SMALL_STATE(464)] = 25032,
-  [SMALL_STATE(465)] = 25091,
-  [SMALL_STATE(466)] = 25176,
-  [SMALL_STATE(467)] = 25261,
-  [SMALL_STATE(468)] = 25320,
-  [SMALL_STATE(469)] = 25405,
-  [SMALL_STATE(470)] = 25490,
-  [SMALL_STATE(471)] = 25575,
-  [SMALL_STATE(472)] = 25660,
-  [SMALL_STATE(473)] = 25719,
-  [SMALL_STATE(474)] = 25804,
-  [SMALL_STATE(475)] = 25889,
-  [SMALL_STATE(476)] = 25950,
-  [SMALL_STATE(477)] = 26035,
-  [SMALL_STATE(478)] = 26120,
-  [SMALL_STATE(479)] = 26179,
-  [SMALL_STATE(480)] = 26264,
-  [SMALL_STATE(481)] = 26349,
-  [SMALL_STATE(482)] = 26434,
-  [SMALL_STATE(483)] = 26519,
-  [SMALL_STATE(484)] = 26604,
-  [SMALL_STATE(485)] = 26689,
-  [SMALL_STATE(486)] = 26743,
-  [SMALL_STATE(487)] = 26797,
-  [SMALL_STATE(488)] = 26851,
-  [SMALL_STATE(489)] = 26905,
-  [SMALL_STATE(490)] = 26959,
-  [SMALL_STATE(491)] = 27013,
-  [SMALL_STATE(492)] = 27067,
-  [SMALL_STATE(493)] = 27121,
-  [SMALL_STATE(494)] = 27175,
-  [SMALL_STATE(495)] = 27229,
-  [SMALL_STATE(496)] = 27283,
-  [SMALL_STATE(497)] = 27337,
-  [SMALL_STATE(498)] = 27390,
-  [SMALL_STATE(499)] = 27443,
-  [SMALL_STATE(500)] = 27496,
-  [SMALL_STATE(501)] = 27549,
-  [SMALL_STATE(502)] = 27602,
-  [SMALL_STATE(503)] = 27655,
-  [SMALL_STATE(504)] = 27708,
-  [SMALL_STATE(505)] = 27761,
-  [SMALL_STATE(506)] = 27814,
-  [SMALL_STATE(507)] = 27867,
-  [SMALL_STATE(508)] = 27920,
-  [SMALL_STATE(509)] = 27973,
-  [SMALL_STATE(510)] = 28026,
-  [SMALL_STATE(511)] = 28079,
-  [SMALL_STATE(512)] = 28132,
-  [SMALL_STATE(513)] = 28185,
-  [SMALL_STATE(514)] = 28238,
-  [SMALL_STATE(515)] = 28291,
-  [SMALL_STATE(516)] = 28344,
-  [SMALL_STATE(517)] = 28397,
-  [SMALL_STATE(518)] = 28450,
-  [SMALL_STATE(519)] = 28503,
-  [SMALL_STATE(520)] = 28556,
-  [SMALL_STATE(521)] = 28609,
-  [SMALL_STATE(522)] = 28662,
-  [SMALL_STATE(523)] = 28715,
-  [SMALL_STATE(524)] = 28768,
-  [SMALL_STATE(525)] = 28821,
-  [SMALL_STATE(526)] = 28874,
-  [SMALL_STATE(527)] = 28927,
-  [SMALL_STATE(528)] = 28980,
-  [SMALL_STATE(529)] = 29033,
-  [SMALL_STATE(530)] = 29086,
-  [SMALL_STATE(531)] = 29139,
-  [SMALL_STATE(532)] = 29192,
-  [SMALL_STATE(533)] = 29245,
-  [SMALL_STATE(534)] = 29298,
-  [SMALL_STATE(535)] = 29351,
-  [SMALL_STATE(536)] = 29404,
-  [SMALL_STATE(537)] = 29457,
-  [SMALL_STATE(538)] = 29510,
-  [SMALL_STATE(539)] = 29563,
-  [SMALL_STATE(540)] = 29616,
-  [SMALL_STATE(541)] = 29669,
-  [SMALL_STATE(542)] = 29722,
-  [SMALL_STATE(543)] = 29775,
-  [SMALL_STATE(544)] = 29828,
-  [SMALL_STATE(545)] = 29881,
-  [SMALL_STATE(546)] = 29934,
-  [SMALL_STATE(547)] = 29987,
-  [SMALL_STATE(548)] = 30040,
-  [SMALL_STATE(549)] = 30093,
-  [SMALL_STATE(550)] = 30146,
-  [SMALL_STATE(551)] = 30199,
-  [SMALL_STATE(552)] = 30252,
-  [SMALL_STATE(553)] = 30305,
-  [SMALL_STATE(554)] = 30358,
-  [SMALL_STATE(555)] = 30411,
-  [SMALL_STATE(556)] = 30464,
-  [SMALL_STATE(557)] = 30517,
-  [SMALL_STATE(558)] = 30570,
-  [SMALL_STATE(559)] = 30623,
-  [SMALL_STATE(560)] = 30676,
-  [SMALL_STATE(561)] = 30729,
-  [SMALL_STATE(562)] = 30782,
-  [SMALL_STATE(563)] = 30835,
-  [SMALL_STATE(564)] = 30888,
-  [SMALL_STATE(565)] = 30941,
-  [SMALL_STATE(566)] = 30994,
-  [SMALL_STATE(567)] = 31047,
-  [SMALL_STATE(568)] = 31100,
-  [SMALL_STATE(569)] = 31153,
-  [SMALL_STATE(570)] = 31206,
-  [SMALL_STATE(571)] = 31259,
-  [SMALL_STATE(572)] = 31312,
-  [SMALL_STATE(573)] = 31365,
-  [SMALL_STATE(574)] = 31418,
-  [SMALL_STATE(575)] = 31471,
-  [SMALL_STATE(576)] = 31524,
-  [SMALL_STATE(577)] = 31577,
-  [SMALL_STATE(578)] = 31630,
-  [SMALL_STATE(579)] = 31683,
-  [SMALL_STATE(580)] = 31736,
-  [SMALL_STATE(581)] = 31789,
-  [SMALL_STATE(582)] = 31842,
-  [SMALL_STATE(583)] = 31895,
-  [SMALL_STATE(584)] = 31948,
-  [SMALL_STATE(585)] = 32001,
-  [SMALL_STATE(586)] = 32054,
-  [SMALL_STATE(587)] = 32107,
-  [SMALL_STATE(588)] = 32160,
-  [SMALL_STATE(589)] = 32213,
-  [SMALL_STATE(590)] = 32266,
-  [SMALL_STATE(591)] = 32319,
-  [SMALL_STATE(592)] = 32372,
-  [SMALL_STATE(593)] = 32425,
-  [SMALL_STATE(594)] = 32478,
-  [SMALL_STATE(595)] = 32531,
-  [SMALL_STATE(596)] = 32613,
-  [SMALL_STATE(597)] = 32697,
-  [SMALL_STATE(598)] = 32779,
-  [SMALL_STATE(599)] = 32834,
-  [SMALL_STATE(600)] = 32889,
-  [SMALL_STATE(601)] = 32944,
-  [SMALL_STATE(602)] = 33025,
-  [SMALL_STATE(603)] = 33106,
-  [SMALL_STATE(604)] = 33187,
-  [SMALL_STATE(605)] = 33268,
-  [SMALL_STATE(606)] = 33349,
-  [SMALL_STATE(607)] = 33430,
-  [SMALL_STATE(608)] = 33508,
-  [SMALL_STATE(609)] = 33586,
-  [SMALL_STATE(610)] = 33635,
-  [SMALL_STATE(611)] = 33684,
-  [SMALL_STATE(612)] = 33732,
-  [SMALL_STATE(613)] = 33780,
-  [SMALL_STATE(614)] = 33828,
-  [SMALL_STATE(615)] = 33876,
-  [SMALL_STATE(616)] = 33924,
-  [SMALL_STATE(617)] = 33972,
-  [SMALL_STATE(618)] = 34020,
-  [SMALL_STATE(619)] = 34068,
-  [SMALL_STATE(620)] = 34116,
-  [SMALL_STATE(621)] = 34164,
-  [SMALL_STATE(622)] = 34212,
-  [SMALL_STATE(623)] = 34260,
-  [SMALL_STATE(624)] = 34308,
-  [SMALL_STATE(625)] = 34356,
-  [SMALL_STATE(626)] = 34404,
-  [SMALL_STATE(627)] = 34452,
-  [SMALL_STATE(628)] = 34500,
-  [SMALL_STATE(629)] = 34548,
-  [SMALL_STATE(630)] = 34596,
-  [SMALL_STATE(631)] = 34678,
-  [SMALL_STATE(632)] = 34726,
-  [SMALL_STATE(633)] = 34774,
-  [SMALL_STATE(634)] = 34822,
-  [SMALL_STATE(635)] = 34870,
-  [SMALL_STATE(636)] = 34918,
-  [SMALL_STATE(637)] = 34990,
-  [SMALL_STATE(638)] = 35038,
-  [SMALL_STATE(639)] = 35086,
-  [SMALL_STATE(640)] = 35134,
-  [SMALL_STATE(641)] = 35182,
-  [SMALL_STATE(642)] = 35230,
-  [SMALL_STATE(643)] = 35278,
-  [SMALL_STATE(644)] = 35360,
-  [SMALL_STATE(645)] = 35408,
-  [SMALL_STATE(646)] = 35465,
-  [SMALL_STATE(647)] = 35532,
-  [SMALL_STATE(648)] = 35589,
-  [SMALL_STATE(649)] = 35646,
-  [SMALL_STATE(650)] = 35709,
-  [SMALL_STATE(651)] = 35766,
-  [SMALL_STATE(652)] = 35827,
-  [SMALL_STATE(653)] = 35898,
-  [SMALL_STATE(654)] = 35967,
-  [SMALL_STATE(655)] = 36028,
-  [SMALL_STATE(656)] = 36085,
-  [SMALL_STATE(657)] = 36150,
-  [SMALL_STATE(658)] = 36215,
-  [SMALL_STATE(659)] = 36284,
-  [SMALL_STATE(660)] = 36355,
-  [SMALL_STATE(661)] = 36422,
-  [SMALL_STATE(662)] = 36479,
-  [SMALL_STATE(663)] = 36550,
-  [SMALL_STATE(664)] = 36621,
-  [SMALL_STATE(665)] = 36692,
-  [SMALL_STATE(666)] = 36763,
-  [SMALL_STATE(667)] = 36826,
-  [SMALL_STATE(668)] = 36874,
-  [SMALL_STATE(669)] = 36922,
-  [SMALL_STATE(670)] = 36988,
-  [SMALL_STATE(671)] = 37054,
-  [SMALL_STATE(672)] = 37100,
-  [SMALL_STATE(673)] = 37146,
-  [SMALL_STATE(674)] = 37212,
-  [SMALL_STATE(675)] = 37260,
-  [SMALL_STATE(676)] = 37308,
-  [SMALL_STATE(677)] = 37374,
-  [SMALL_STATE(678)] = 37424,
-  [SMALL_STATE(679)] = 37474,
-  [SMALL_STATE(680)] = 37537,
-  [SMALL_STATE(681)] = 37600,
-  [SMALL_STATE(682)] = 37663,
-  [SMALL_STATE(683)] = 37726,
-  [SMALL_STATE(684)] = 37789,
-  [SMALL_STATE(685)] = 37868,
-  [SMALL_STATE(686)] = 37935,
-  [SMALL_STATE(687)] = 37998,
-  [SMALL_STATE(688)] = 38061,
-  [SMALL_STATE(689)] = 38124,
-  [SMALL_STATE(690)] = 38173,
-  [SMALL_STATE(691)] = 38236,
-  [SMALL_STATE(692)] = 38299,
-  [SMALL_STATE(693)] = 38362,
-  [SMALL_STATE(694)] = 38425,
-  [SMALL_STATE(695)] = 38488,
-  [SMALL_STATE(696)] = 38551,
-  [SMALL_STATE(697)] = 38614,
-  [SMALL_STATE(698)] = 38677,
-  [SMALL_STATE(699)] = 38740,
-  [SMALL_STATE(700)] = 38803,
-  [SMALL_STATE(701)] = 38866,
-  [SMALL_STATE(702)] = 38929,
-  [SMALL_STATE(703)] = 38992,
-  [SMALL_STATE(704)] = 39055,
-  [SMALL_STATE(705)] = 39118,
-  [SMALL_STATE(706)] = 39181,
-  [SMALL_STATE(707)] = 39244,
-  [SMALL_STATE(708)] = 39307,
-  [SMALL_STATE(709)] = 39370,
-  [SMALL_STATE(710)] = 39433,
-  [SMALL_STATE(711)] = 39496,
-  [SMALL_STATE(712)] = 39559,
-  [SMALL_STATE(713)] = 39622,
-  [SMALL_STATE(714)] = 39671,
-  [SMALL_STATE(715)] = 39734,
-  [SMALL_STATE(716)] = 39801,
-  [SMALL_STATE(717)] = 39864,
-  [SMALL_STATE(718)] = 39927,
-  [SMALL_STATE(719)] = 39990,
-  [SMALL_STATE(720)] = 40053,
-  [SMALL_STATE(721)] = 40102,
-  [SMALL_STATE(722)] = 40165,
-  [SMALL_STATE(723)] = 40228,
-  [SMALL_STATE(724)] = 40291,
-  [SMALL_STATE(725)] = 40354,
-  [SMALL_STATE(726)] = 40399,
-  [SMALL_STATE(727)] = 40462,
-  [SMALL_STATE(728)] = 40507,
-  [SMALL_STATE(729)] = 40570,
-  [SMALL_STATE(730)] = 40633,
-  [SMALL_STATE(731)] = 40696,
-  [SMALL_STATE(732)] = 40764,
-  [SMALL_STATE(733)] = 40824,
-  [SMALL_STATE(734)] = 40892,
-  [SMALL_STATE(735)] = 40960,
-  [SMALL_STATE(736)] = 41014,
-  [SMALL_STATE(737)] = 41058,
-  [SMALL_STATE(738)] = 41124,
-  [SMALL_STATE(739)] = 41182,
-  [SMALL_STATE(740)] = 41236,
-  [SMALL_STATE(741)] = 41312,
-  [SMALL_STATE(742)] = 41376,
-  [SMALL_STATE(743)] = 41424,
-  [SMALL_STATE(744)] = 41486,
-  [SMALL_STATE(745)] = 41530,
-  [SMALL_STATE(746)] = 41584,
-  [SMALL_STATE(747)] = 41651,
-  [SMALL_STATE(748)] = 41708,
-  [SMALL_STATE(749)] = 41753,
-  [SMALL_STATE(750)] = 41800,
-  [SMALL_STATE(751)] = 41865,
-  [SMALL_STATE(752)] = 41932,
-  [SMALL_STATE(753)] = 41991,
-  [SMALL_STATE(754)] = 42044,
-  [SMALL_STATE(755)] = 42089,
-  [SMALL_STATE(756)] = 42134,
-  [SMALL_STATE(757)] = 42187,
-  [SMALL_STATE(758)] = 42254,
-  [SMALL_STATE(759)] = 42297,
-  [SMALL_STATE(760)] = 42344,
-  [SMALL_STATE(761)] = 42391,
-  [SMALL_STATE(762)] = 42454,
-  [SMALL_STATE(763)] = 42499,
-  [SMALL_STATE(764)] = 42560,
-  [SMALL_STATE(765)] = 42607,
-  [SMALL_STATE(766)] = 42652,
-  [SMALL_STATE(767)] = 42705,
-  [SMALL_STATE(768)] = 42750,
-  [SMALL_STATE(769)] = 42795,
-  [SMALL_STATE(770)] = 42838,
-  [SMALL_STATE(771)] = 42883,
-  [SMALL_STATE(772)] = 42925,
-  [SMALL_STATE(773)] = 42967,
-  [SMALL_STATE(774)] = 43009,
-  [SMALL_STATE(775)] = 43051,
-  [SMALL_STATE(776)] = 43093,
-  [SMALL_STATE(777)] = 43135,
-  [SMALL_STATE(778)] = 43177,
-  [SMALL_STATE(779)] = 43219,
-  [SMALL_STATE(780)] = 43263,
-  [SMALL_STATE(781)] = 43305,
-  [SMALL_STATE(782)] = 43347,
-  [SMALL_STATE(783)] = 43389,
-  [SMALL_STATE(784)] = 43431,
-  [SMALL_STATE(785)] = 43473,
-  [SMALL_STATE(786)] = 43515,
-  [SMALL_STATE(787)] = 43557,
-  [SMALL_STATE(788)] = 43599,
-  [SMALL_STATE(789)] = 43641,
-  [SMALL_STATE(790)] = 43685,
-  [SMALL_STATE(791)] = 43727,
-  [SMALL_STATE(792)] = 43769,
-  [SMALL_STATE(793)] = 43811,
-  [SMALL_STATE(794)] = 43853,
-  [SMALL_STATE(795)] = 43895,
-  [SMALL_STATE(796)] = 43937,
-  [SMALL_STATE(797)] = 43979,
-  [SMALL_STATE(798)] = 44021,
-  [SMALL_STATE(799)] = 44065,
-  [SMALL_STATE(800)] = 44107,
-  [SMALL_STATE(801)] = 44149,
-  [SMALL_STATE(802)] = 44193,
-  [SMALL_STATE(803)] = 44235,
-  [SMALL_STATE(804)] = 44277,
-  [SMALL_STATE(805)] = 44319,
-  [SMALL_STATE(806)] = 44361,
-  [SMALL_STATE(807)] = 44405,
-  [SMALL_STATE(808)] = 44447,
-  [SMALL_STATE(809)] = 44489,
-  [SMALL_STATE(810)] = 44530,
-  [SMALL_STATE(811)] = 44571,
-  [SMALL_STATE(812)] = 44612,
-  [SMALL_STATE(813)] = 44657,
-  [SMALL_STATE(814)] = 44698,
-  [SMALL_STATE(815)] = 44739,
-  [SMALL_STATE(816)] = 44780,
-  [SMALL_STATE(817)] = 44821,
-  [SMALL_STATE(818)] = 44862,
-  [SMALL_STATE(819)] = 44903,
-  [SMALL_STATE(820)] = 44944,
-  [SMALL_STATE(821)] = 44985,
-  [SMALL_STATE(822)] = 45026,
-  [SMALL_STATE(823)] = 45067,
-  [SMALL_STATE(824)] = 45108,
-  [SMALL_STATE(825)] = 45149,
-  [SMALL_STATE(826)] = 45190,
-  [SMALL_STATE(827)] = 45231,
-  [SMALL_STATE(828)] = 45272,
-  [SMALL_STATE(829)] = 45313,
-  [SMALL_STATE(830)] = 45354,
-  [SMALL_STATE(831)] = 45395,
-  [SMALL_STATE(832)] = 45436,
-  [SMALL_STATE(833)] = 45477,
-  [SMALL_STATE(834)] = 45518,
-  [SMALL_STATE(835)] = 45559,
-  [SMALL_STATE(836)] = 45600,
-  [SMALL_STATE(837)] = 45641,
-  [SMALL_STATE(838)] = 45686,
-  [SMALL_STATE(839)] = 45727,
-  [SMALL_STATE(840)] = 45768,
-  [SMALL_STATE(841)] = 45809,
-  [SMALL_STATE(842)] = 45850,
-  [SMALL_STATE(843)] = 45891,
-  [SMALL_STATE(844)] = 45932,
-  [SMALL_STATE(845)] = 45973,
-  [SMALL_STATE(846)] = 46014,
-  [SMALL_STATE(847)] = 46055,
-  [SMALL_STATE(848)] = 46096,
-  [SMALL_STATE(849)] = 46137,
-  [SMALL_STATE(850)] = 46211,
-  [SMALL_STATE(851)] = 46285,
-  [SMALL_STATE(852)] = 46359,
-  [SMALL_STATE(853)] = 46433,
-  [SMALL_STATE(854)] = 46506,
-  [SMALL_STATE(855)] = 46577,
-  [SMALL_STATE(856)] = 46648,
-  [SMALL_STATE(857)] = 46719,
-  [SMALL_STATE(858)] = 46790,
-  [SMALL_STATE(859)] = 46861,
-  [SMALL_STATE(860)] = 46929,
-  [SMALL_STATE(861)] = 47001,
-  [SMALL_STATE(862)] = 47073,
-  [SMALL_STATE(863)] = 47145,
-  [SMALL_STATE(864)] = 47211,
-  [SMALL_STATE(865)] = 47274,
-  [SMALL_STATE(866)] = 47337,
-  [SMALL_STATE(867)] = 47392,
-  [SMALL_STATE(868)] = 47447,
-  [SMALL_STATE(869)] = 47487,
-  [SMALL_STATE(870)] = 47527,
-  [SMALL_STATE(871)] = 47567,
-  [SMALL_STATE(872)] = 47607,
-  [SMALL_STATE(873)] = 47637,
-  [SMALL_STATE(874)] = 47662,
-  [SMALL_STATE(875)] = 47687,
-  [SMALL_STATE(876)] = 47712,
-  [SMALL_STATE(877)] = 47737,
-  [SMALL_STATE(878)] = 47774,
-  [SMALL_STATE(879)] = 47811,
-  [SMALL_STATE(880)] = 47840,
-  [SMALL_STATE(881)] = 47869,
-  [SMALL_STATE(882)] = 47903,
-  [SMALL_STATE(883)] = 47949,
-  [SMALL_STATE(884)] = 47983,
-  [SMALL_STATE(885)] = 48011,
-  [SMALL_STATE(886)] = 48054,
-  [SMALL_STATE(887)] = 48097,
-  [SMALL_STATE(888)] = 48140,
-  [SMALL_STATE(889)] = 48183,
-  [SMALL_STATE(890)] = 48214,
-  [SMALL_STATE(891)] = 48257,
-  [SMALL_STATE(892)] = 48303,
-  [SMALL_STATE(893)] = 48349,
-  [SMALL_STATE(894)] = 48389,
-  [SMALL_STATE(895)] = 48435,
-  [SMALL_STATE(896)] = 48472,
-  [SMALL_STATE(897)] = 48509,
-  [SMALL_STATE(898)] = 48534,
-  [SMALL_STATE(899)] = 48571,
-  [SMALL_STATE(900)] = 48608,
-  [SMALL_STATE(901)] = 48630,
-  [SMALL_STATE(902)] = 48652,
-  [SMALL_STATE(903)] = 48686,
-  [SMALL_STATE(904)] = 48720,
-  [SMALL_STATE(905)] = 48742,
-  [SMALL_STATE(906)] = 48779,
-  [SMALL_STATE(907)] = 48801,
-  [SMALL_STATE(908)] = 48838,
-  [SMALL_STATE(909)] = 48861,
-  [SMALL_STATE(910)] = 48886,
-  [SMALL_STATE(911)] = 48909,
-  [SMALL_STATE(912)] = 48946,
-  [SMALL_STATE(913)] = 48971,
-  [SMALL_STATE(914)] = 48992,
-  [SMALL_STATE(915)] = 49015,
-  [SMALL_STATE(916)] = 49052,
-  [SMALL_STATE(917)] = 49073,
-  [SMALL_STATE(918)] = 49090,
-  [SMALL_STATE(919)] = 49127,
-  [SMALL_STATE(920)] = 49150,
-  [SMALL_STATE(921)] = 49169,
-  [SMALL_STATE(922)] = 49190,
-  [SMALL_STATE(923)] = 49213,
-  [SMALL_STATE(924)] = 49238,
-  [SMALL_STATE(925)] = 49261,
-  [SMALL_STATE(926)] = 49284,
-  [SMALL_STATE(927)] = 49305,
-  [SMALL_STATE(928)] = 49326,
-  [SMALL_STATE(929)] = 49349,
-  [SMALL_STATE(930)] = 49376,
-  [SMALL_STATE(931)] = 49410,
-  [SMALL_STATE(932)] = 49444,
-  [SMALL_STATE(933)] = 49478,
-  [SMALL_STATE(934)] = 49500,
-  [SMALL_STATE(935)] = 49530,
-  [SMALL_STATE(936)] = 49564,
-  [SMALL_STATE(937)] = 49594,
-  [SMALL_STATE(938)] = 49624,
-  [SMALL_STATE(939)] = 49654,
-  [SMALL_STATE(940)] = 49676,
-  [SMALL_STATE(941)] = 49710,
-  [SMALL_STATE(942)] = 49744,
-  [SMALL_STATE(943)] = 49774,
-  [SMALL_STATE(944)] = 49792,
-  [SMALL_STATE(945)] = 49822,
-  [SMALL_STATE(946)] = 49856,
-  [SMALL_STATE(947)] = 49890,
-  [SMALL_STATE(948)] = 49912,
-  [SMALL_STATE(949)] = 49934,
-  [SMALL_STATE(950)] = 49964,
-  [SMALL_STATE(951)] = 49994,
-  [SMALL_STATE(952)] = 50012,
-  [SMALL_STATE(953)] = 50042,
-  [SMALL_STATE(954)] = 50076,
-  [SMALL_STATE(955)] = 50095,
-  [SMALL_STATE(956)] = 50118,
-  [SMALL_STATE(957)] = 50141,
-  [SMALL_STATE(958)] = 50160,
-  [SMALL_STATE(959)] = 50179,
-  [SMALL_STATE(960)] = 50202,
-  [SMALL_STATE(961)] = 50227,
-  [SMALL_STATE(962)] = 50246,
-  [SMALL_STATE(963)] = 50265,
-  [SMALL_STATE(964)] = 50284,
-  [SMALL_STATE(965)] = 50302,
-  [SMALL_STATE(966)] = 50326,
-  [SMALL_STATE(967)] = 50340,
-  [SMALL_STATE(968)] = 50354,
-  [SMALL_STATE(969)] = 50368,
-  [SMALL_STATE(970)] = 50382,
-  [SMALL_STATE(971)] = 50396,
-  [SMALL_STATE(972)] = 50412,
-  [SMALL_STATE(973)] = 50426,
-  [SMALL_STATE(974)] = 50440,
-  [SMALL_STATE(975)] = 50458,
-  [SMALL_STATE(976)] = 50472,
-  [SMALL_STATE(977)] = 50486,
-  [SMALL_STATE(978)] = 50500,
-  [SMALL_STATE(979)] = 50518,
-  [SMALL_STATE(980)] = 50536,
-  [SMALL_STATE(981)] = 50554,
-  [SMALL_STATE(982)] = 50568,
-  [SMALL_STATE(983)] = 50594,
-  [SMALL_STATE(984)] = 50618,
-  [SMALL_STATE(985)] = 50632,
-  [SMALL_STATE(986)] = 50650,
-  [SMALL_STATE(987)] = 50664,
-  [SMALL_STATE(988)] = 50678,
-  [SMALL_STATE(989)] = 50692,
-  [SMALL_STATE(990)] = 50706,
-  [SMALL_STATE(991)] = 50720,
-  [SMALL_STATE(992)] = 50744,
-  [SMALL_STATE(993)] = 50764,
-  [SMALL_STATE(994)] = 50778,
-  [SMALL_STATE(995)] = 50796,
-  [SMALL_STATE(996)] = 50814,
-  [SMALL_STATE(997)] = 50838,
-  [SMALL_STATE(998)] = 50858,
-  [SMALL_STATE(999)] = 50872,
-  [SMALL_STATE(1000)] = 50894,
-  [SMALL_STATE(1001)] = 50912,
-  [SMALL_STATE(1002)] = 50928,
-  [SMALL_STATE(1003)] = 50952,
-  [SMALL_STATE(1004)] = 50976,
-  [SMALL_STATE(1005)] = 50990,
-  [SMALL_STATE(1006)] = 51008,
-  [SMALL_STATE(1007)] = 51022,
-  [SMALL_STATE(1008)] = 51042,
-  [SMALL_STATE(1009)] = 51056,
-  [SMALL_STATE(1010)] = 51070,
-  [SMALL_STATE(1011)] = 51084,
-  [SMALL_STATE(1012)] = 51098,
-  [SMALL_STATE(1013)] = 51116,
-  [SMALL_STATE(1014)] = 51134,
-  [SMALL_STATE(1015)] = 51157,
-  [SMALL_STATE(1016)] = 51170,
-  [SMALL_STATE(1017)] = 51193,
-  [SMALL_STATE(1018)] = 51206,
-  [SMALL_STATE(1019)] = 51219,
-  [SMALL_STATE(1020)] = 51242,
-  [SMALL_STATE(1021)] = 51261,
-  [SMALL_STATE(1022)] = 51286,
-  [SMALL_STATE(1023)] = 51305,
-  [SMALL_STATE(1024)] = 51318,
-  [SMALL_STATE(1025)] = 51333,
-  [SMALL_STATE(1026)] = 51350,
-  [SMALL_STATE(1027)] = 51373,
-  [SMALL_STATE(1028)] = 51392,
-  [SMALL_STATE(1029)] = 51409,
-  [SMALL_STATE(1030)] = 51424,
-  [SMALL_STATE(1031)] = 51441,
-  [SMALL_STATE(1032)] = 51462,
-  [SMALL_STATE(1033)] = 51481,
-  [SMALL_STATE(1034)] = 51494,
-  [SMALL_STATE(1035)] = 51517,
-  [SMALL_STATE(1036)] = 51536,
-  [SMALL_STATE(1037)] = 51555,
-  [SMALL_STATE(1038)] = 51574,
-  [SMALL_STATE(1039)] = 51599,
-  [SMALL_STATE(1040)] = 51618,
-  [SMALL_STATE(1041)] = 51643,
-  [SMALL_STATE(1042)] = 51656,
-  [SMALL_STATE(1043)] = 51669,
-  [SMALL_STATE(1044)] = 51692,
-  [SMALL_STATE(1045)] = 51715,
-  [SMALL_STATE(1046)] = 51738,
-  [SMALL_STATE(1047)] = 51761,
-  [SMALL_STATE(1048)] = 51786,
-  [SMALL_STATE(1049)] = 51805,
-  [SMALL_STATE(1050)] = 51830,
-  [SMALL_STATE(1051)] = 51851,
-  [SMALL_STATE(1052)] = 51864,
-  [SMALL_STATE(1053)] = 51889,
-  [SMALL_STATE(1054)] = 51908,
-  [SMALL_STATE(1055)] = 51927,
-  [SMALL_STATE(1056)] = 51948,
-  [SMALL_STATE(1057)] = 51973,
-  [SMALL_STATE(1058)] = 51989,
-  [SMALL_STATE(1059)] = 52005,
-  [SMALL_STATE(1060)] = 52027,
-  [SMALL_STATE(1061)] = 52041,
-  [SMALL_STATE(1062)] = 52057,
-  [SMALL_STATE(1063)] = 52073,
-  [SMALL_STATE(1064)] = 52093,
-  [SMALL_STATE(1065)] = 52113,
-  [SMALL_STATE(1066)] = 52131,
-  [SMALL_STATE(1067)] = 52149,
-  [SMALL_STATE(1068)] = 52163,
-  [SMALL_STATE(1069)] = 52179,
-  [SMALL_STATE(1070)] = 52193,
-  [SMALL_STATE(1071)] = 52215,
-  [SMALL_STATE(1072)] = 52237,
-  [SMALL_STATE(1073)] = 52251,
-  [SMALL_STATE(1074)] = 52269,
-  [SMALL_STATE(1075)] = 52283,
-  [SMALL_STATE(1076)] = 52305,
-  [SMALL_STATE(1077)] = 52319,
-  [SMALL_STATE(1078)] = 52335,
-  [SMALL_STATE(1079)] = 52353,
-  [SMALL_STATE(1080)] = 52375,
-  [SMALL_STATE(1081)] = 52397,
-  [SMALL_STATE(1082)] = 52417,
-  [SMALL_STATE(1083)] = 52435,
-  [SMALL_STATE(1084)] = 52455,
-  [SMALL_STATE(1085)] = 52473,
-  [SMALL_STATE(1086)] = 52495,
-  [SMALL_STATE(1087)] = 52515,
-  [SMALL_STATE(1088)] = 52527,
-  [SMALL_STATE(1089)] = 52543,
-  [SMALL_STATE(1090)] = 52555,
-  [SMALL_STATE(1091)] = 52572,
-  [SMALL_STATE(1092)] = 52589,
-  [SMALL_STATE(1093)] = 52604,
-  [SMALL_STATE(1094)] = 52621,
-  [SMALL_STATE(1095)] = 52638,
-  [SMALL_STATE(1096)] = 52655,
-  [SMALL_STATE(1097)] = 52670,
-  [SMALL_STATE(1098)] = 52689,
-  [SMALL_STATE(1099)] = 52706,
-  [SMALL_STATE(1100)] = 52725,
-  [SMALL_STATE(1101)] = 52740,
-  [SMALL_STATE(1102)] = 52751,
-  [SMALL_STATE(1103)] = 52768,
-  [SMALL_STATE(1104)] = 52785,
-  [SMALL_STATE(1105)] = 52804,
-  [SMALL_STATE(1106)] = 52821,
-  [SMALL_STATE(1107)] = 52832,
-  [SMALL_STATE(1108)] = 52851,
-  [SMALL_STATE(1109)] = 52870,
-  [SMALL_STATE(1110)] = 52887,
-  [SMALL_STATE(1111)] = 52898,
-  [SMALL_STATE(1112)] = 52913,
-  [SMALL_STATE(1113)] = 52928,
-  [SMALL_STATE(1114)] = 52945,
-  [SMALL_STATE(1115)] = 52960,
-  [SMALL_STATE(1116)] = 52975,
-  [SMALL_STATE(1117)] = 52994,
-  [SMALL_STATE(1118)] = 53013,
-  [SMALL_STATE(1119)] = 53030,
-  [SMALL_STATE(1120)] = 53047,
-  [SMALL_STATE(1121)] = 53066,
-  [SMALL_STATE(1122)] = 53083,
-  [SMALL_STATE(1123)] = 53100,
-  [SMALL_STATE(1124)] = 53119,
-  [SMALL_STATE(1125)] = 53136,
-  [SMALL_STATE(1126)] = 53155,
-  [SMALL_STATE(1127)] = 53172,
-  [SMALL_STATE(1128)] = 53189,
-  [SMALL_STATE(1129)] = 53205,
-  [SMALL_STATE(1130)] = 53219,
-  [SMALL_STATE(1131)] = 53235,
-  [SMALL_STATE(1132)] = 53251,
-  [SMALL_STATE(1133)] = 53267,
-  [SMALL_STATE(1134)] = 53279,
-  [SMALL_STATE(1135)] = 53295,
-  [SMALL_STATE(1136)] = 53311,
-  [SMALL_STATE(1137)] = 53327,
-  [SMALL_STATE(1138)] = 53341,
-  [SMALL_STATE(1139)] = 53355,
-  [SMALL_STATE(1140)] = 53369,
-  [SMALL_STATE(1141)] = 53385,
-  [SMALL_STATE(1142)] = 53401,
-  [SMALL_STATE(1143)] = 53417,
-  [SMALL_STATE(1144)] = 53431,
-  [SMALL_STATE(1145)] = 53445,
-  [SMALL_STATE(1146)] = 53461,
-  [SMALL_STATE(1147)] = 53475,
-  [SMALL_STATE(1148)] = 53491,
-  [SMALL_STATE(1149)] = 53507,
-  [SMALL_STATE(1150)] = 53523,
-  [SMALL_STATE(1151)] = 53537,
-  [SMALL_STATE(1152)] = 53553,
-  [SMALL_STATE(1153)] = 53569,
-  [SMALL_STATE(1154)] = 53585,
-  [SMALL_STATE(1155)] = 53599,
-  [SMALL_STATE(1156)] = 53613,
-  [SMALL_STATE(1157)] = 53629,
-  [SMALL_STATE(1158)] = 53645,
-  [SMALL_STATE(1159)] = 53661,
-  [SMALL_STATE(1160)] = 53677,
-  [SMALL_STATE(1161)] = 53691,
-  [SMALL_STATE(1162)] = 53707,
-  [SMALL_STATE(1163)] = 53721,
-  [SMALL_STATE(1164)] = 53735,
-  [SMALL_STATE(1165)] = 53749,
-  [SMALL_STATE(1166)] = 53763,
-  [SMALL_STATE(1167)] = 53773,
-  [SMALL_STATE(1168)] = 53787,
-  [SMALL_STATE(1169)] = 53801,
-  [SMALL_STATE(1170)] = 53817,
-  [SMALL_STATE(1171)] = 53827,
-  [SMALL_STATE(1172)] = 53841,
-  [SMALL_STATE(1173)] = 53855,
-  [SMALL_STATE(1174)] = 53871,
-  [SMALL_STATE(1175)] = 53885,
-  [SMALL_STATE(1176)] = 53895,
-  [SMALL_STATE(1177)] = 53911,
-  [SMALL_STATE(1178)] = 53925,
-  [SMALL_STATE(1179)] = 53939,
-  [SMALL_STATE(1180)] = 53953,
-  [SMALL_STATE(1181)] = 53967,
-  [SMALL_STATE(1182)] = 53983,
-  [SMALL_STATE(1183)] = 53999,
-  [SMALL_STATE(1184)] = 54011,
-  [SMALL_STATE(1185)] = 54025,
-  [SMALL_STATE(1186)] = 54035,
-  [SMALL_STATE(1187)] = 54051,
-  [SMALL_STATE(1188)] = 54061,
-  [SMALL_STATE(1189)] = 54077,
-  [SMALL_STATE(1190)] = 54091,
-  [SMALL_STATE(1191)] = 54105,
-  [SMALL_STATE(1192)] = 54119,
+  [SMALL_STATE(149)] = 0,
+  [SMALL_STATE(150)] = 118,
+  [SMALL_STATE(151)] = 236,
+  [SMALL_STATE(152)] = 354,
+  [SMALL_STATE(153)] = 464,
+  [SMALL_STATE(154)] = 579,
+  [SMALL_STATE(155)] = 698,
+  [SMALL_STATE(156)] = 815,
+  [SMALL_STATE(157)] = 930,
+  [SMALL_STATE(158)] = 1045,
+  [SMALL_STATE(159)] = 1148,
+  [SMALL_STATE(160)] = 1265,
+  [SMALL_STATE(161)] = 1368,
+  [SMALL_STATE(162)] = 1472,
+  [SMALL_STATE(163)] = 1576,
+  [SMALL_STATE(164)] = 1690,
+  [SMALL_STATE(165)] = 1794,
+  [SMALL_STATE(166)] = 1908,
+  [SMALL_STATE(167)] = 2022,
+  [SMALL_STATE(168)] = 2127,
+  [SMALL_STATE(169)] = 2230,
+  [SMALL_STATE(170)] = 2335,
+  [SMALL_STATE(171)] = 2436,
+  [SMALL_STATE(172)] = 2541,
+  [SMALL_STATE(173)] = 2644,
+  [SMALL_STATE(174)] = 2745,
+  [SMALL_STATE(175)] = 2850,
+  [SMALL_STATE(176)] = 2955,
+  [SMALL_STATE(177)] = 3056,
+  [SMALL_STATE(178)] = 3161,
+  [SMALL_STATE(179)] = 3268,
+  [SMALL_STATE(180)] = 3370,
+  [SMALL_STATE(181)] = 3472,
+  [SMALL_STATE(182)] = 3574,
+  [SMALL_STATE(183)] = 3676,
+  [SMALL_STATE(184)] = 3780,
+  [SMALL_STATE(185)] = 3882,
+  [SMALL_STATE(186)] = 3988,
+  [SMALL_STATE(187)] = 4090,
+  [SMALL_STATE(188)] = 4192,
+  [SMALL_STATE(189)] = 4296,
+  [SMALL_STATE(190)] = 4398,
+  [SMALL_STATE(191)] = 4500,
+  [SMALL_STATE(192)] = 4602,
+  [SMALL_STATE(193)] = 4700,
+  [SMALL_STATE(194)] = 4802,
+  [SMALL_STATE(195)] = 4904,
+  [SMALL_STATE(196)] = 5006,
+  [SMALL_STATE(197)] = 5112,
+  [SMALL_STATE(198)] = 5214,
+  [SMALL_STATE(199)] = 5316,
+  [SMALL_STATE(200)] = 5418,
+  [SMALL_STATE(201)] = 5516,
+  [SMALL_STATE(202)] = 5618,
+  [SMALL_STATE(203)] = 5716,
+  [SMALL_STATE(204)] = 5818,
+  [SMALL_STATE(205)] = 5920,
+  [SMALL_STATE(206)] = 6022,
+  [SMALL_STATE(207)] = 6124,
+  [SMALL_STATE(208)] = 6222,
+  [SMALL_STATE(209)] = 6324,
+  [SMALL_STATE(210)] = 6426,
+  [SMALL_STATE(211)] = 6530,
+  [SMALL_STATE(212)] = 6634,
+  [SMALL_STATE(213)] = 6695,
+  [SMALL_STATE(214)] = 6794,
+  [SMALL_STATE(215)] = 6855,
+  [SMALL_STATE(216)] = 6916,
+  [SMALL_STATE(217)] = 6977,
+  [SMALL_STATE(218)] = 7038,
+  [SMALL_STATE(219)] = 7099,
+  [SMALL_STATE(220)] = 7198,
+  [SMALL_STATE(221)] = 7259,
+  [SMALL_STATE(222)] = 7358,
+  [SMALL_STATE(223)] = 7445,
+  [SMALL_STATE(224)] = 7517,
+  [SMALL_STATE(225)] = 7615,
+  [SMALL_STATE(226)] = 7687,
+  [SMALL_STATE(227)] = 7785,
+  [SMALL_STATE(228)] = 7883,
+  [SMALL_STATE(229)] = 7979,
+  [SMALL_STATE(230)] = 8077,
+  [SMALL_STATE(231)] = 8149,
+  [SMALL_STATE(232)] = 8221,
+  [SMALL_STATE(233)] = 8319,
+  [SMALL_STATE(234)] = 8417,
+  [SMALL_STATE(235)] = 8515,
+  [SMALL_STATE(236)] = 8587,
+  [SMALL_STATE(237)] = 8685,
+  [SMALL_STATE(238)] = 8757,
+  [SMALL_STATE(239)] = 8829,
+  [SMALL_STATE(240)] = 8927,
+  [SMALL_STATE(241)] = 9025,
+  [SMALL_STATE(242)] = 9123,
+  [SMALL_STATE(243)] = 9221,
+  [SMALL_STATE(244)] = 9293,
+  [SMALL_STATE(245)] = 9391,
+  [SMALL_STATE(246)] = 9489,
+  [SMALL_STATE(247)] = 9584,
+  [SMALL_STATE(248)] = 9679,
+  [SMALL_STATE(249)] = 9774,
+  [SMALL_STATE(250)] = 9869,
+  [SMALL_STATE(251)] = 9942,
+  [SMALL_STATE(252)] = 10037,
+  [SMALL_STATE(253)] = 10132,
+  [SMALL_STATE(254)] = 10227,
+  [SMALL_STATE(255)] = 10322,
+  [SMALL_STATE(256)] = 10417,
+  [SMALL_STATE(257)] = 10490,
+  [SMALL_STATE(258)] = 10585,
+  [SMALL_STATE(259)] = 10680,
+  [SMALL_STATE(260)] = 10775,
+  [SMALL_STATE(261)] = 10870,
+  [SMALL_STATE(262)] = 10965,
+  [SMALL_STATE(263)] = 11060,
+  [SMALL_STATE(264)] = 11118,
+  [SMALL_STATE(265)] = 11176,
+  [SMALL_STATE(266)] = 11270,
+  [SMALL_STATE(267)] = 11328,
+  [SMALL_STATE(268)] = 11420,
+  [SMALL_STATE(269)] = 11488,
+  [SMALL_STATE(270)] = 11582,
+  [SMALL_STATE(271)] = 11676,
+  [SMALL_STATE(272)] = 11746,
+  [SMALL_STATE(273)] = 11814,
+  [SMALL_STATE(274)] = 11908,
+  [SMALL_STATE(275)] = 12002,
+  [SMALL_STATE(276)] = 12060,
+  [SMALL_STATE(277)] = 12118,
+  [SMALL_STATE(278)] = 12210,
+  [SMALL_STATE(279)] = 12302,
+  [SMALL_STATE(280)] = 12370,
+  [SMALL_STATE(281)] = 12438,
+  [SMALL_STATE(282)] = 12506,
+  [SMALL_STATE(283)] = 12600,
+  [SMALL_STATE(284)] = 12694,
+  [SMALL_STATE(285)] = 12756,
+  [SMALL_STATE(286)] = 12818,
+  [SMALL_STATE(287)] = 12886,
+  [SMALL_STATE(288)] = 12954,
+  [SMALL_STATE(289)] = 13048,
+  [SMALL_STATE(290)] = 13116,
+  [SMALL_STATE(291)] = 13210,
+  [SMALL_STATE(292)] = 13268,
+  [SMALL_STATE(293)] = 13326,
+  [SMALL_STATE(294)] = 13384,
+  [SMALL_STATE(295)] = 13442,
+  [SMALL_STATE(296)] = 13536,
+  [SMALL_STATE(297)] = 13598,
+  [SMALL_STATE(298)] = 13660,
+  [SMALL_STATE(299)] = 13754,
+  [SMALL_STATE(300)] = 13812,
+  [SMALL_STATE(301)] = 13901,
+  [SMALL_STATE(302)] = 13990,
+  [SMALL_STATE(303)] = 14079,
+  [SMALL_STATE(304)] = 14168,
+  [SMALL_STATE(305)] = 14231,
+  [SMALL_STATE(306)] = 14320,
+  [SMALL_STATE(307)] = 14411,
+  [SMALL_STATE(308)] = 14500,
+  [SMALL_STATE(309)] = 14589,
+  [SMALL_STATE(310)] = 14678,
+  [SMALL_STATE(311)] = 14767,
+  [SMALL_STATE(312)] = 14856,
+  [SMALL_STATE(313)] = 14945,
+  [SMALL_STATE(314)] = 15036,
+  [SMALL_STATE(315)] = 15125,
+  [SMALL_STATE(316)] = 15216,
+  [SMALL_STATE(317)] = 15307,
+  [SMALL_STATE(318)] = 15398,
+  [SMALL_STATE(319)] = 15461,
+  [SMALL_STATE(320)] = 15552,
+  [SMALL_STATE(321)] = 15643,
+  [SMALL_STATE(322)] = 15734,
+  [SMALL_STATE(323)] = 15801,
+  [SMALL_STATE(324)] = 15890,
+  [SMALL_STATE(325)] = 15981,
+  [SMALL_STATE(326)] = 16037,
+  [SMALL_STATE(327)] = 16093,
+  [SMALL_STATE(328)] = 16149,
+  [SMALL_STATE(329)] = 16209,
+  [SMALL_STATE(330)] = 16265,
+  [SMALL_STATE(331)] = 16321,
+  [SMALL_STATE(332)] = 16377,
+  [SMALL_STATE(333)] = 16465,
+  [SMALL_STATE(334)] = 16521,
+  [SMALL_STATE(335)] = 16581,
+  [SMALL_STATE(336)] = 16645,
+  [SMALL_STATE(337)] = 16701,
+  [SMALL_STATE(338)] = 16757,
+  [SMALL_STATE(339)] = 16813,
+  [SMALL_STATE(340)] = 16873,
+  [SMALL_STATE(341)] = 16929,
+  [SMALL_STATE(342)] = 16985,
+  [SMALL_STATE(343)] = 17041,
+  [SMALL_STATE(344)] = 17097,
+  [SMALL_STATE(345)] = 17185,
+  [SMALL_STATE(346)] = 17245,
+  [SMALL_STATE(347)] = 17301,
+  [SMALL_STATE(348)] = 17357,
+  [SMALL_STATE(349)] = 17413,
+  [SMALL_STATE(350)] = 17469,
+  [SMALL_STATE(351)] = 17525,
+  [SMALL_STATE(352)] = 17581,
+  [SMALL_STATE(353)] = 17637,
+  [SMALL_STATE(354)] = 17693,
+  [SMALL_STATE(355)] = 17749,
+  [SMALL_STATE(356)] = 17805,
+  [SMALL_STATE(357)] = 17893,
+  [SMALL_STATE(358)] = 17957,
+  [SMALL_STATE(359)] = 18021,
+  [SMALL_STATE(360)] = 18077,
+  [SMALL_STATE(361)] = 18141,
+  [SMALL_STATE(362)] = 18197,
+  [SMALL_STATE(363)] = 18253,
+  [SMALL_STATE(364)] = 18338,
+  [SMALL_STATE(365)] = 18423,
+  [SMALL_STATE(366)] = 18508,
+  [SMALL_STATE(367)] = 18593,
+  [SMALL_STATE(368)] = 18652,
+  [SMALL_STATE(369)] = 18707,
+  [SMALL_STATE(370)] = 18792,
+  [SMALL_STATE(371)] = 18877,
+  [SMALL_STATE(372)] = 18936,
+  [SMALL_STATE(373)] = 19021,
+  [SMALL_STATE(374)] = 19082,
+  [SMALL_STATE(375)] = 19167,
+  [SMALL_STATE(376)] = 19252,
+  [SMALL_STATE(377)] = 19337,
+  [SMALL_STATE(378)] = 19422,
+  [SMALL_STATE(379)] = 19507,
+  [SMALL_STATE(380)] = 19568,
+  [SMALL_STATE(381)] = 19653,
+  [SMALL_STATE(382)] = 19738,
+  [SMALL_STATE(383)] = 19823,
+  [SMALL_STATE(384)] = 19908,
+  [SMALL_STATE(385)] = 19993,
+  [SMALL_STATE(386)] = 20078,
+  [SMALL_STATE(387)] = 20133,
+  [SMALL_STATE(388)] = 20218,
+  [SMALL_STATE(389)] = 20303,
+  [SMALL_STATE(390)] = 20362,
+  [SMALL_STATE(391)] = 20447,
+  [SMALL_STATE(392)] = 20532,
+  [SMALL_STATE(393)] = 20617,
+  [SMALL_STATE(394)] = 20702,
+  [SMALL_STATE(395)] = 20787,
+  [SMALL_STATE(396)] = 20846,
+  [SMALL_STATE(397)] = 20931,
+  [SMALL_STATE(398)] = 21016,
+  [SMALL_STATE(399)] = 21101,
+  [SMALL_STATE(400)] = 21186,
+  [SMALL_STATE(401)] = 21241,
+  [SMALL_STATE(402)] = 21300,
+  [SMALL_STATE(403)] = 21359,
+  [SMALL_STATE(404)] = 21444,
+  [SMALL_STATE(405)] = 21529,
+  [SMALL_STATE(406)] = 21614,
+  [SMALL_STATE(407)] = 21699,
+  [SMALL_STATE(408)] = 21784,
+  [SMALL_STATE(409)] = 21869,
+  [SMALL_STATE(410)] = 21954,
+  [SMALL_STATE(411)] = 22009,
+  [SMALL_STATE(412)] = 22068,
+  [SMALL_STATE(413)] = 22153,
+  [SMALL_STATE(414)] = 22238,
+  [SMALL_STATE(415)] = 22323,
+  [SMALL_STATE(416)] = 22408,
+  [SMALL_STATE(417)] = 22467,
+  [SMALL_STATE(418)] = 22552,
+  [SMALL_STATE(419)] = 22611,
+  [SMALL_STATE(420)] = 22696,
+  [SMALL_STATE(421)] = 22781,
+  [SMALL_STATE(422)] = 22866,
+  [SMALL_STATE(423)] = 22927,
+  [SMALL_STATE(424)] = 23012,
+  [SMALL_STATE(425)] = 23097,
+  [SMALL_STATE(426)] = 23158,
+  [SMALL_STATE(427)] = 23243,
+  [SMALL_STATE(428)] = 23298,
+  [SMALL_STATE(429)] = 23383,
+  [SMALL_STATE(430)] = 23468,
+  [SMALL_STATE(431)] = 23553,
+  [SMALL_STATE(432)] = 23638,
+  [SMALL_STATE(433)] = 23697,
+  [SMALL_STATE(434)] = 23782,
+  [SMALL_STATE(435)] = 23867,
+  [SMALL_STATE(436)] = 23952,
+  [SMALL_STATE(437)] = 24011,
+  [SMALL_STATE(438)] = 24096,
+  [SMALL_STATE(439)] = 24155,
+  [SMALL_STATE(440)] = 24240,
+  [SMALL_STATE(441)] = 24299,
+  [SMALL_STATE(442)] = 24384,
+  [SMALL_STATE(443)] = 24469,
+  [SMALL_STATE(444)] = 24554,
+  [SMALL_STATE(445)] = 24613,
+  [SMALL_STATE(446)] = 24698,
+  [SMALL_STATE(447)] = 24783,
+  [SMALL_STATE(448)] = 24868,
+  [SMALL_STATE(449)] = 24953,
+  [SMALL_STATE(450)] = 25012,
+  [SMALL_STATE(451)] = 25099,
+  [SMALL_STATE(452)] = 25184,
+  [SMALL_STATE(453)] = 25269,
+  [SMALL_STATE(454)] = 25328,
+  [SMALL_STATE(455)] = 25413,
+  [SMALL_STATE(456)] = 25498,
+  [SMALL_STATE(457)] = 25583,
+  [SMALL_STATE(458)] = 25668,
+  [SMALL_STATE(459)] = 25723,
+  [SMALL_STATE(460)] = 25808,
+  [SMALL_STATE(461)] = 25893,
+  [SMALL_STATE(462)] = 25978,
+  [SMALL_STATE(463)] = 26063,
+  [SMALL_STATE(464)] = 26117,
+  [SMALL_STATE(465)] = 26171,
+  [SMALL_STATE(466)] = 26225,
+  [SMALL_STATE(467)] = 26279,
+  [SMALL_STATE(468)] = 26333,
+  [SMALL_STATE(469)] = 26387,
+  [SMALL_STATE(470)] = 26441,
+  [SMALL_STATE(471)] = 26495,
+  [SMALL_STATE(472)] = 26549,
+  [SMALL_STATE(473)] = 26603,
+  [SMALL_STATE(474)] = 26657,
+  [SMALL_STATE(475)] = 26711,
+  [SMALL_STATE(476)] = 26764,
+  [SMALL_STATE(477)] = 26817,
+  [SMALL_STATE(478)] = 26870,
+  [SMALL_STATE(479)] = 26923,
+  [SMALL_STATE(480)] = 26976,
+  [SMALL_STATE(481)] = 27029,
+  [SMALL_STATE(482)] = 27082,
+  [SMALL_STATE(483)] = 27135,
+  [SMALL_STATE(484)] = 27188,
+  [SMALL_STATE(485)] = 27241,
+  [SMALL_STATE(486)] = 27294,
+  [SMALL_STATE(487)] = 27347,
+  [SMALL_STATE(488)] = 27400,
+  [SMALL_STATE(489)] = 27453,
+  [SMALL_STATE(490)] = 27506,
+  [SMALL_STATE(491)] = 27559,
+  [SMALL_STATE(492)] = 27612,
+  [SMALL_STATE(493)] = 27665,
+  [SMALL_STATE(494)] = 27718,
+  [SMALL_STATE(495)] = 27771,
+  [SMALL_STATE(496)] = 27858,
+  [SMALL_STATE(497)] = 27911,
+  [SMALL_STATE(498)] = 27964,
+  [SMALL_STATE(499)] = 28017,
+  [SMALL_STATE(500)] = 28070,
+  [SMALL_STATE(501)] = 28123,
+  [SMALL_STATE(502)] = 28176,
+  [SMALL_STATE(503)] = 28229,
+  [SMALL_STATE(504)] = 28282,
+  [SMALL_STATE(505)] = 28335,
+  [SMALL_STATE(506)] = 28388,
+  [SMALL_STATE(507)] = 28441,
+  [SMALL_STATE(508)] = 28494,
+  [SMALL_STATE(509)] = 28547,
+  [SMALL_STATE(510)] = 28600,
+  [SMALL_STATE(511)] = 28653,
+  [SMALL_STATE(512)] = 28706,
+  [SMALL_STATE(513)] = 28759,
+  [SMALL_STATE(514)] = 28812,
+  [SMALL_STATE(515)] = 28865,
+  [SMALL_STATE(516)] = 28918,
+  [SMALL_STATE(517)] = 28971,
+  [SMALL_STATE(518)] = 29024,
+  [SMALL_STATE(519)] = 29077,
+  [SMALL_STATE(520)] = 29130,
+  [SMALL_STATE(521)] = 29183,
+  [SMALL_STATE(522)] = 29268,
+  [SMALL_STATE(523)] = 29321,
+  [SMALL_STATE(524)] = 29374,
+  [SMALL_STATE(525)] = 29427,
+  [SMALL_STATE(526)] = 29480,
+  [SMALL_STATE(527)] = 29533,
+  [SMALL_STATE(528)] = 29586,
+  [SMALL_STATE(529)] = 29639,
+  [SMALL_STATE(530)] = 29692,
+  [SMALL_STATE(531)] = 29777,
+  [SMALL_STATE(532)] = 29830,
+  [SMALL_STATE(533)] = 29883,
+  [SMALL_STATE(534)] = 29936,
+  [SMALL_STATE(535)] = 29989,
+  [SMALL_STATE(536)] = 30042,
+  [SMALL_STATE(537)] = 30095,
+  [SMALL_STATE(538)] = 30148,
+  [SMALL_STATE(539)] = 30201,
+  [SMALL_STATE(540)] = 30254,
+  [SMALL_STATE(541)] = 30307,
+  [SMALL_STATE(542)] = 30360,
+  [SMALL_STATE(543)] = 30413,
+  [SMALL_STATE(544)] = 30466,
+  [SMALL_STATE(545)] = 30519,
+  [SMALL_STATE(546)] = 30572,
+  [SMALL_STATE(547)] = 30625,
+  [SMALL_STATE(548)] = 30678,
+  [SMALL_STATE(549)] = 30731,
+  [SMALL_STATE(550)] = 30784,
+  [SMALL_STATE(551)] = 30837,
+  [SMALL_STATE(552)] = 30890,
+  [SMALL_STATE(553)] = 30943,
+  [SMALL_STATE(554)] = 30996,
+  [SMALL_STATE(555)] = 31049,
+  [SMALL_STATE(556)] = 31102,
+  [SMALL_STATE(557)] = 31155,
+  [SMALL_STATE(558)] = 31208,
+  [SMALL_STATE(559)] = 31261,
+  [SMALL_STATE(560)] = 31314,
+  [SMALL_STATE(561)] = 31367,
+  [SMALL_STATE(562)] = 31420,
+  [SMALL_STATE(563)] = 31473,
+  [SMALL_STATE(564)] = 31526,
+  [SMALL_STATE(565)] = 31579,
+  [SMALL_STATE(566)] = 31632,
+  [SMALL_STATE(567)] = 31685,
+  [SMALL_STATE(568)] = 31738,
+  [SMALL_STATE(569)] = 31791,
+  [SMALL_STATE(570)] = 31844,
+  [SMALL_STATE(571)] = 31897,
+  [SMALL_STATE(572)] = 31950,
+  [SMALL_STATE(573)] = 32003,
+  [SMALL_STATE(574)] = 32056,
+  [SMALL_STATE(575)] = 32109,
+  [SMALL_STATE(576)] = 32162,
+  [SMALL_STATE(577)] = 32246,
+  [SMALL_STATE(578)] = 32330,
+  [SMALL_STATE(579)] = 32414,
+  [SMALL_STATE(580)] = 32498,
+  [SMALL_STATE(581)] = 32582,
+  [SMALL_STATE(582)] = 32666,
+  [SMALL_STATE(583)] = 32721,
+  [SMALL_STATE(584)] = 32802,
+  [SMALL_STATE(585)] = 32857,
+  [SMALL_STATE(586)] = 32938,
+  [SMALL_STATE(587)] = 32993,
+  [SMALL_STATE(588)] = 33068,
+  [SMALL_STATE(589)] = 33117,
+  [SMALL_STATE(590)] = 33166,
+  [SMALL_STATE(591)] = 33248,
+  [SMALL_STATE(592)] = 33296,
+  [SMALL_STATE(593)] = 33344,
+  [SMALL_STATE(594)] = 33392,
+  [SMALL_STATE(595)] = 33440,
+  [SMALL_STATE(596)] = 33488,
+  [SMALL_STATE(597)] = 33536,
+  [SMALL_STATE(598)] = 33584,
+  [SMALL_STATE(599)] = 33632,
+  [SMALL_STATE(600)] = 33680,
+  [SMALL_STATE(601)] = 33728,
+  [SMALL_STATE(602)] = 33776,
+  [SMALL_STATE(603)] = 33824,
+  [SMALL_STATE(604)] = 33872,
+  [SMALL_STATE(605)] = 33920,
+  [SMALL_STATE(606)] = 33968,
+  [SMALL_STATE(607)] = 34016,
+  [SMALL_STATE(608)] = 34064,
+  [SMALL_STATE(609)] = 34112,
+  [SMALL_STATE(610)] = 34160,
+  [SMALL_STATE(611)] = 34208,
+  [SMALL_STATE(612)] = 34256,
+  [SMALL_STATE(613)] = 34304,
+  [SMALL_STATE(614)] = 34352,
+  [SMALL_STATE(615)] = 34400,
+  [SMALL_STATE(616)] = 34448,
+  [SMALL_STATE(617)] = 34530,
+  [SMALL_STATE(618)] = 34578,
+  [SMALL_STATE(619)] = 34626,
+  [SMALL_STATE(620)] = 34674,
+  [SMALL_STATE(621)] = 34722,
+  [SMALL_STATE(622)] = 34770,
+  [SMALL_STATE(623)] = 34818,
+  [SMALL_STATE(624)] = 34883,
+  [SMALL_STATE(625)] = 34940,
+  [SMALL_STATE(626)] = 35011,
+  [SMALL_STATE(627)] = 35080,
+  [SMALL_STATE(628)] = 35137,
+  [SMALL_STATE(629)] = 35202,
+  [SMALL_STATE(630)] = 35259,
+  [SMALL_STATE(631)] = 35320,
+  [SMALL_STATE(632)] = 35389,
+  [SMALL_STATE(633)] = 35460,
+  [SMALL_STATE(634)] = 35523,
+  [SMALL_STATE(635)] = 35580,
+  [SMALL_STATE(636)] = 35649,
+  [SMALL_STATE(637)] = 35716,
+  [SMALL_STATE(638)] = 35773,
+  [SMALL_STATE(639)] = 35844,
+  [SMALL_STATE(640)] = 35915,
+  [SMALL_STATE(641)] = 35972,
+  [SMALL_STATE(642)] = 36041,
+  [SMALL_STATE(643)] = 36112,
+  [SMALL_STATE(644)] = 36179,
+  [SMALL_STATE(645)] = 36236,
+  [SMALL_STATE(646)] = 36299,
+  [SMALL_STATE(647)] = 36368,
+  [SMALL_STATE(648)] = 36425,
+  [SMALL_STATE(649)] = 36496,
+  [SMALL_STATE(650)] = 36565,
+  [SMALL_STATE(651)] = 36626,
+  [SMALL_STATE(652)] = 36674,
+  [SMALL_STATE(653)] = 36740,
+  [SMALL_STATE(654)] = 36806,
+  [SMALL_STATE(655)] = 36872,
+  [SMALL_STATE(656)] = 36938,
+  [SMALL_STATE(657)] = 37004,
+  [SMALL_STATE(658)] = 37070,
+  [SMALL_STATE(659)] = 37136,
+  [SMALL_STATE(660)] = 37202,
+  [SMALL_STATE(661)] = 37268,
+  [SMALL_STATE(662)] = 37334,
+  [SMALL_STATE(663)] = 37400,
+  [SMALL_STATE(664)] = 37466,
+  [SMALL_STATE(665)] = 37532,
+  [SMALL_STATE(666)] = 37598,
+  [SMALL_STATE(667)] = 37664,
+  [SMALL_STATE(668)] = 37730,
+  [SMALL_STATE(669)] = 37780,
+  [SMALL_STATE(670)] = 37846,
+  [SMALL_STATE(671)] = 37916,
+  [SMALL_STATE(672)] = 37982,
+  [SMALL_STATE(673)] = 38030,
+  [SMALL_STATE(674)] = 38096,
+  [SMALL_STATE(675)] = 38146,
+  [SMALL_STATE(676)] = 38216,
+  [SMALL_STATE(677)] = 38282,
+  [SMALL_STATE(678)] = 38348,
+  [SMALL_STATE(679)] = 38414,
+  [SMALL_STATE(680)] = 38480,
+  [SMALL_STATE(681)] = 38546,
+  [SMALL_STATE(682)] = 38612,
+  [SMALL_STATE(683)] = 38678,
+  [SMALL_STATE(684)] = 38744,
+  [SMALL_STATE(685)] = 38810,
+  [SMALL_STATE(686)] = 38876,
+  [SMALL_STATE(687)] = 38942,
+  [SMALL_STATE(688)] = 39008,
+  [SMALL_STATE(689)] = 39074,
+  [SMALL_STATE(690)] = 39140,
+  [SMALL_STATE(691)] = 39206,
+  [SMALL_STATE(692)] = 39272,
+  [SMALL_STATE(693)] = 39320,
+  [SMALL_STATE(694)] = 39386,
+  [SMALL_STATE(695)] = 39452,
+  [SMALL_STATE(696)] = 39518,
+  [SMALL_STATE(697)] = 39584,
+  [SMALL_STATE(698)] = 39650,
+  [SMALL_STATE(699)] = 39696,
+  [SMALL_STATE(700)] = 39762,
+  [SMALL_STATE(701)] = 39828,
+  [SMALL_STATE(702)] = 39874,
+  [SMALL_STATE(703)] = 39940,
+  [SMALL_STATE(704)] = 39988,
+  [SMALL_STATE(705)] = 40054,
+  [SMALL_STATE(706)] = 40099,
+  [SMALL_STATE(707)] = 40144,
+  [SMALL_STATE(708)] = 40223,
+  [SMALL_STATE(709)] = 40272,
+  [SMALL_STATE(710)] = 40321,
+  [SMALL_STATE(711)] = 40370,
+  [SMALL_STATE(712)] = 40438,
+  [SMALL_STATE(713)] = 40506,
+  [SMALL_STATE(714)] = 40554,
+  [SMALL_STATE(715)] = 40616,
+  [SMALL_STATE(716)] = 40660,
+  [SMALL_STATE(717)] = 40724,
+  [SMALL_STATE(718)] = 40784,
+  [SMALL_STATE(719)] = 40838,
+  [SMALL_STATE(720)] = 40896,
+  [SMALL_STATE(721)] = 40940,
+  [SMALL_STATE(722)] = 41008,
+  [SMALL_STATE(723)] = 41062,
+  [SMALL_STATE(724)] = 41128,
+  [SMALL_STATE(725)] = 41182,
+  [SMALL_STATE(726)] = 41236,
+  [SMALL_STATE(727)] = 41312,
+  [SMALL_STATE(728)] = 41359,
+  [SMALL_STATE(729)] = 41418,
+  [SMALL_STATE(730)] = 41463,
+  [SMALL_STATE(731)] = 41508,
+  [SMALL_STATE(732)] = 41561,
+  [SMALL_STATE(733)] = 41604,
+  [SMALL_STATE(734)] = 41649,
+  [SMALL_STATE(735)] = 41694,
+  [SMALL_STATE(736)] = 41737,
+  [SMALL_STATE(737)] = 41782,
+  [SMALL_STATE(738)] = 41829,
+  [SMALL_STATE(739)] = 41896,
+  [SMALL_STATE(740)] = 41963,
+  [SMALL_STATE(741)] = 42008,
+  [SMALL_STATE(742)] = 42061,
+  [SMALL_STATE(743)] = 42114,
+  [SMALL_STATE(744)] = 42181,
+  [SMALL_STATE(745)] = 42228,
+  [SMALL_STATE(746)] = 42291,
+  [SMALL_STATE(747)] = 42352,
+  [SMALL_STATE(748)] = 42397,
+  [SMALL_STATE(749)] = 42450,
+  [SMALL_STATE(750)] = 42495,
+  [SMALL_STATE(751)] = 42542,
+  [SMALL_STATE(752)] = 42607,
+  [SMALL_STATE(753)] = 42664,
+  [SMALL_STATE(754)] = 42706,
+  [SMALL_STATE(755)] = 42748,
+  [SMALL_STATE(756)] = 42790,
+  [SMALL_STATE(757)] = 42832,
+  [SMALL_STATE(758)] = 42874,
+  [SMALL_STATE(759)] = 42916,
+  [SMALL_STATE(760)] = 42958,
+  [SMALL_STATE(761)] = 43000,
+  [SMALL_STATE(762)] = 43042,
+  [SMALL_STATE(763)] = 43084,
+  [SMALL_STATE(764)] = 43126,
+  [SMALL_STATE(765)] = 43168,
+  [SMALL_STATE(766)] = 43212,
+  [SMALL_STATE(767)] = 43254,
+  [SMALL_STATE(768)] = 43296,
+  [SMALL_STATE(769)] = 43338,
+  [SMALL_STATE(770)] = 43382,
+  [SMALL_STATE(771)] = 43426,
+  [SMALL_STATE(772)] = 43468,
+  [SMALL_STATE(773)] = 43510,
+  [SMALL_STATE(774)] = 43552,
+  [SMALL_STATE(775)] = 43594,
+  [SMALL_STATE(776)] = 43636,
+  [SMALL_STATE(777)] = 43678,
+  [SMALL_STATE(778)] = 43720,
+  [SMALL_STATE(779)] = 43762,
+  [SMALL_STATE(780)] = 43804,
+  [SMALL_STATE(781)] = 43846,
+  [SMALL_STATE(782)] = 43888,
+  [SMALL_STATE(783)] = 43930,
+  [SMALL_STATE(784)] = 43974,
+  [SMALL_STATE(785)] = 44016,
+  [SMALL_STATE(786)] = 44058,
+  [SMALL_STATE(787)] = 44100,
+  [SMALL_STATE(788)] = 44142,
+  [SMALL_STATE(789)] = 44186,
+  [SMALL_STATE(790)] = 44228,
+  [SMALL_STATE(791)] = 44270,
+  [SMALL_STATE(792)] = 44311,
+  [SMALL_STATE(793)] = 44352,
+  [SMALL_STATE(794)] = 44393,
+  [SMALL_STATE(795)] = 44434,
+  [SMALL_STATE(796)] = 44475,
+  [SMALL_STATE(797)] = 44516,
+  [SMALL_STATE(798)] = 44557,
+  [SMALL_STATE(799)] = 44598,
+  [SMALL_STATE(800)] = 44639,
+  [SMALL_STATE(801)] = 44680,
+  [SMALL_STATE(802)] = 44721,
+  [SMALL_STATE(803)] = 44762,
+  [SMALL_STATE(804)] = 44803,
+  [SMALL_STATE(805)] = 44844,
+  [SMALL_STATE(806)] = 44885,
+  [SMALL_STATE(807)] = 44926,
+  [SMALL_STATE(808)] = 44967,
+  [SMALL_STATE(809)] = 45008,
+  [SMALL_STATE(810)] = 45049,
+  [SMALL_STATE(811)] = 45090,
+  [SMALL_STATE(812)] = 45131,
+  [SMALL_STATE(813)] = 45172,
+  [SMALL_STATE(814)] = 45213,
+  [SMALL_STATE(815)] = 45254,
+  [SMALL_STATE(816)] = 45295,
+  [SMALL_STATE(817)] = 45336,
+  [SMALL_STATE(818)] = 45377,
+  [SMALL_STATE(819)] = 45418,
+  [SMALL_STATE(820)] = 45459,
+  [SMALL_STATE(821)] = 45500,
+  [SMALL_STATE(822)] = 45541,
+  [SMALL_STATE(823)] = 45582,
+  [SMALL_STATE(824)] = 45627,
+  [SMALL_STATE(825)] = 45672,
+  [SMALL_STATE(826)] = 45713,
+  [SMALL_STATE(827)] = 45754,
+  [SMALL_STATE(828)] = 45795,
+  [SMALL_STATE(829)] = 45836,
+  [SMALL_STATE(830)] = 45877,
+  [SMALL_STATE(831)] = 45918,
+  [SMALL_STATE(832)] = 45992,
+  [SMALL_STATE(833)] = 46066,
+  [SMALL_STATE(834)] = 46140,
+  [SMALL_STATE(835)] = 46214,
+  [SMALL_STATE(836)] = 46285,
+  [SMALL_STATE(837)] = 46356,
+  [SMALL_STATE(838)] = 46429,
+  [SMALL_STATE(839)] = 46500,
+  [SMALL_STATE(840)] = 46571,
+  [SMALL_STATE(841)] = 46642,
+  [SMALL_STATE(842)] = 46714,
+  [SMALL_STATE(843)] = 46786,
+  [SMALL_STATE(844)] = 46858,
+  [SMALL_STATE(845)] = 46926,
+  [SMALL_STATE(846)] = 46992,
+  [SMALL_STATE(847)] = 47055,
+  [SMALL_STATE(848)] = 47118,
+  [SMALL_STATE(849)] = 47173,
+  [SMALL_STATE(850)] = 47228,
+  [SMALL_STATE(851)] = 47268,
+  [SMALL_STATE(852)] = 47308,
+  [SMALL_STATE(853)] = 47348,
+  [SMALL_STATE(854)] = 47388,
+  [SMALL_STATE(855)] = 47418,
+  [SMALL_STATE(856)] = 47443,
+  [SMALL_STATE(857)] = 47468,
+  [SMALL_STATE(858)] = 47505,
+  [SMALL_STATE(859)] = 47542,
+  [SMALL_STATE(860)] = 47567,
+  [SMALL_STATE(861)] = 47592,
+  [SMALL_STATE(862)] = 47621,
+  [SMALL_STATE(863)] = 47650,
+  [SMALL_STATE(864)] = 47678,
+  [SMALL_STATE(865)] = 47712,
+  [SMALL_STATE(866)] = 47758,
+  [SMALL_STATE(867)] = 47792,
+  [SMALL_STATE(868)] = 47835,
+  [SMALL_STATE(869)] = 47878,
+  [SMALL_STATE(870)] = 47921,
+  [SMALL_STATE(871)] = 47964,
+  [SMALL_STATE(872)] = 47995,
+  [SMALL_STATE(873)] = 48038,
+  [SMALL_STATE(874)] = 48084,
+  [SMALL_STATE(875)] = 48124,
+  [SMALL_STATE(876)] = 48170,
+  [SMALL_STATE(877)] = 48216,
+  [SMALL_STATE(878)] = 48253,
+  [SMALL_STATE(879)] = 48290,
+  [SMALL_STATE(880)] = 48327,
+  [SMALL_STATE(881)] = 48352,
+  [SMALL_STATE(882)] = 48389,
+  [SMALL_STATE(883)] = 48411,
+  [SMALL_STATE(884)] = 48433,
+  [SMALL_STATE(885)] = 48467,
+  [SMALL_STATE(886)] = 48501,
+  [SMALL_STATE(887)] = 48538,
+  [SMALL_STATE(888)] = 48560,
+  [SMALL_STATE(889)] = 48581,
+  [SMALL_STATE(890)] = 48618,
+  [SMALL_STATE(891)] = 48639,
+  [SMALL_STATE(892)] = 48666,
+  [SMALL_STATE(893)] = 48683,
+  [SMALL_STATE(894)] = 48720,
+  [SMALL_STATE(895)] = 48743,
+  [SMALL_STATE(896)] = 48764,
+  [SMALL_STATE(897)] = 48783,
+  [SMALL_STATE(898)] = 48808,
+  [SMALL_STATE(899)] = 48845,
+  [SMALL_STATE(900)] = 48866,
+  [SMALL_STATE(901)] = 48889,
+  [SMALL_STATE(902)] = 48912,
+  [SMALL_STATE(903)] = 48933,
+  [SMALL_STATE(904)] = 48956,
+  [SMALL_STATE(905)] = 48979,
+  [SMALL_STATE(906)] = 49002,
+  [SMALL_STATE(907)] = 49025,
+  [SMALL_STATE(908)] = 49062,
+  [SMALL_STATE(909)] = 49085,
+  [SMALL_STATE(910)] = 49110,
+  [SMALL_STATE(911)] = 49135,
+  [SMALL_STATE(912)] = 49157,
+  [SMALL_STATE(913)] = 49179,
+  [SMALL_STATE(914)] = 49213,
+  [SMALL_STATE(915)] = 49235,
+  [SMALL_STATE(916)] = 49265,
+  [SMALL_STATE(917)] = 49295,
+  [SMALL_STATE(918)] = 49329,
+  [SMALL_STATE(919)] = 49363,
+  [SMALL_STATE(920)] = 49381,
+  [SMALL_STATE(921)] = 49403,
+  [SMALL_STATE(922)] = 49433,
+  [SMALL_STATE(923)] = 49463,
+  [SMALL_STATE(924)] = 49493,
+  [SMALL_STATE(925)] = 49523,
+  [SMALL_STATE(926)] = 49541,
+  [SMALL_STATE(927)] = 49575,
+  [SMALL_STATE(928)] = 49609,
+  [SMALL_STATE(929)] = 49639,
+  [SMALL_STATE(930)] = 49673,
+  [SMALL_STATE(931)] = 49707,
+  [SMALL_STATE(932)] = 49737,
+  [SMALL_STATE(933)] = 49771,
+  [SMALL_STATE(934)] = 49801,
+  [SMALL_STATE(935)] = 49835,
+  [SMALL_STATE(936)] = 49854,
+  [SMALL_STATE(937)] = 49873,
+  [SMALL_STATE(938)] = 49898,
+  [SMALL_STATE(939)] = 49917,
+  [SMALL_STATE(940)] = 49940,
+  [SMALL_STATE(941)] = 49959,
+  [SMALL_STATE(942)] = 49978,
+  [SMALL_STATE(943)] = 50001,
+  [SMALL_STATE(944)] = 50024,
+  [SMALL_STATE(945)] = 50043,
+  [SMALL_STATE(946)] = 50057,
+  [SMALL_STATE(947)] = 50083,
+  [SMALL_STATE(948)] = 50107,
+  [SMALL_STATE(949)] = 50121,
+  [SMALL_STATE(950)] = 50135,
+  [SMALL_STATE(951)] = 50153,
+  [SMALL_STATE(952)] = 50171,
+  [SMALL_STATE(953)] = 50185,
+  [SMALL_STATE(954)] = 50199,
+  [SMALL_STATE(955)] = 50213,
+  [SMALL_STATE(956)] = 50231,
+  [SMALL_STATE(957)] = 50247,
+  [SMALL_STATE(958)] = 50265,
+  [SMALL_STATE(959)] = 50279,
+  [SMALL_STATE(960)] = 50293,
+  [SMALL_STATE(961)] = 50307,
+  [SMALL_STATE(962)] = 50321,
+  [SMALL_STATE(963)] = 50341,
+  [SMALL_STATE(964)] = 50359,
+  [SMALL_STATE(965)] = 50375,
+  [SMALL_STATE(966)] = 50389,
+  [SMALL_STATE(967)] = 50403,
+  [SMALL_STATE(968)] = 50417,
+  [SMALL_STATE(969)] = 50431,
+  [SMALL_STATE(970)] = 50445,
+  [SMALL_STATE(971)] = 50459,
+  [SMALL_STATE(972)] = 50473,
+  [SMALL_STATE(973)] = 50491,
+  [SMALL_STATE(974)] = 50509,
+  [SMALL_STATE(975)] = 50523,
+  [SMALL_STATE(976)] = 50543,
+  [SMALL_STATE(977)] = 50561,
+  [SMALL_STATE(978)] = 50579,
+  [SMALL_STATE(979)] = 50597,
+  [SMALL_STATE(980)] = 50617,
+  [SMALL_STATE(981)] = 50635,
+  [SMALL_STATE(982)] = 50653,
+  [SMALL_STATE(983)] = 50677,
+  [SMALL_STATE(984)] = 50699,
+  [SMALL_STATE(985)] = 50713,
+  [SMALL_STATE(986)] = 50727,
+  [SMALL_STATE(987)] = 50741,
+  [SMALL_STATE(988)] = 50761,
+  [SMALL_STATE(989)] = 50775,
+  [SMALL_STATE(990)] = 50789,
+  [SMALL_STATE(991)] = 50803,
+  [SMALL_STATE(992)] = 50828,
+  [SMALL_STATE(993)] = 50843,
+  [SMALL_STATE(994)] = 50866,
+  [SMALL_STATE(995)] = 50887,
+  [SMALL_STATE(996)] = 50910,
+  [SMALL_STATE(997)] = 50929,
+  [SMALL_STATE(998)] = 50950,
+  [SMALL_STATE(999)] = 50973,
+  [SMALL_STATE(1000)] = 50986,
+  [SMALL_STATE(1001)] = 50999,
+  [SMALL_STATE(1002)] = 51020,
+  [SMALL_STATE(1003)] = 51039,
+  [SMALL_STATE(1004)] = 51052,
+  [SMALL_STATE(1005)] = 51065,
+  [SMALL_STATE(1006)] = 51084,
+  [SMALL_STATE(1007)] = 51103,
+  [SMALL_STATE(1008)] = 51120,
+  [SMALL_STATE(1009)] = 51139,
+  [SMALL_STATE(1010)] = 51156,
+  [SMALL_STATE(1011)] = 51171,
+  [SMALL_STATE(1012)] = 51190,
+  [SMALL_STATE(1013)] = 51207,
+  [SMALL_STATE(1014)] = 51228,
+  [SMALL_STATE(1015)] = 51251,
+  [SMALL_STATE(1016)] = 51270,
+  [SMALL_STATE(1017)] = 51289,
+  [SMALL_STATE(1018)] = 51308,
+  [SMALL_STATE(1019)] = 51333,
+  [SMALL_STATE(1020)] = 51356,
+  [SMALL_STATE(1021)] = 51377,
+  [SMALL_STATE(1022)] = 51400,
+  [SMALL_STATE(1023)] = 51413,
+  [SMALL_STATE(1024)] = 51438,
+  [SMALL_STATE(1025)] = 51451,
+  [SMALL_STATE(1026)] = 51474,
+  [SMALL_STATE(1027)] = 51493,
+  [SMALL_STATE(1028)] = 51516,
+  [SMALL_STATE(1029)] = 51541,
+  [SMALL_STATE(1030)] = 51564,
+  [SMALL_STATE(1031)] = 51585,
+  [SMALL_STATE(1032)] = 51610,
+  [SMALL_STATE(1033)] = 51635,
+  [SMALL_STATE(1034)] = 51656,
+  [SMALL_STATE(1035)] = 51669,
+  [SMALL_STATE(1036)] = 51694,
+  [SMALL_STATE(1037)] = 51716,
+  [SMALL_STATE(1038)] = 51732,
+  [SMALL_STATE(1039)] = 51754,
+  [SMALL_STATE(1040)] = 51768,
+  [SMALL_STATE(1041)] = 51786,
+  [SMALL_STATE(1042)] = 51804,
+  [SMALL_STATE(1043)] = 51820,
+  [SMALL_STATE(1044)] = 51834,
+  [SMALL_STATE(1045)] = 51854,
+  [SMALL_STATE(1046)] = 51872,
+  [SMALL_STATE(1047)] = 51888,
+  [SMALL_STATE(1048)] = 51910,
+  [SMALL_STATE(1049)] = 51924,
+  [SMALL_STATE(1050)] = 51946,
+  [SMALL_STATE(1051)] = 51960,
+  [SMALL_STATE(1052)] = 51980,
+  [SMALL_STATE(1053)] = 52000,
+  [SMALL_STATE(1054)] = 52014,
+  [SMALL_STATE(1055)] = 52034,
+  [SMALL_STATE(1056)] = 52050,
+  [SMALL_STATE(1057)] = 52070,
+  [SMALL_STATE(1058)] = 52092,
+  [SMALL_STATE(1059)] = 52108,
+  [SMALL_STATE(1060)] = 52126,
+  [SMALL_STATE(1061)] = 52144,
+  [SMALL_STATE(1062)] = 52160,
+  [SMALL_STATE(1063)] = 52172,
+  [SMALL_STATE(1064)] = 52192,
+  [SMALL_STATE(1065)] = 52210,
+  [SMALL_STATE(1066)] = 52228,
+  [SMALL_STATE(1067)] = 52250,
+  [SMALL_STATE(1068)] = 52272,
+  [SMALL_STATE(1069)] = 52286,
+  [SMALL_STATE(1070)] = 52298,
+  [SMALL_STATE(1071)] = 52314,
+  [SMALL_STATE(1072)] = 52333,
+  [SMALL_STATE(1073)] = 52348,
+  [SMALL_STATE(1074)] = 52367,
+  [SMALL_STATE(1075)] = 52382,
+  [SMALL_STATE(1076)] = 52393,
+  [SMALL_STATE(1077)] = 52410,
+  [SMALL_STATE(1078)] = 52425,
+  [SMALL_STATE(1079)] = 52442,
+  [SMALL_STATE(1080)] = 52459,
+  [SMALL_STATE(1081)] = 52474,
+  [SMALL_STATE(1082)] = 52491,
+  [SMALL_STATE(1083)] = 52508,
+  [SMALL_STATE(1084)] = 52525,
+  [SMALL_STATE(1085)] = 52544,
+  [SMALL_STATE(1086)] = 52561,
+  [SMALL_STATE(1087)] = 52578,
+  [SMALL_STATE(1088)] = 52595,
+  [SMALL_STATE(1089)] = 52612,
+  [SMALL_STATE(1090)] = 52629,
+  [SMALL_STATE(1091)] = 52648,
+  [SMALL_STATE(1092)] = 52659,
+  [SMALL_STATE(1093)] = 52676,
+  [SMALL_STATE(1094)] = 52693,
+  [SMALL_STATE(1095)] = 52712,
+  [SMALL_STATE(1096)] = 52723,
+  [SMALL_STATE(1097)] = 52738,
+  [SMALL_STATE(1098)] = 52755,
+  [SMALL_STATE(1099)] = 52774,
+  [SMALL_STATE(1100)] = 52791,
+  [SMALL_STATE(1101)] = 52806,
+  [SMALL_STATE(1102)] = 52825,
+  [SMALL_STATE(1103)] = 52842,
+  [SMALL_STATE(1104)] = 52859,
+  [SMALL_STATE(1105)] = 52878,
+  [SMALL_STATE(1106)] = 52895,
+  [SMALL_STATE(1107)] = 52914,
+  [SMALL_STATE(1108)] = 52929,
+  [SMALL_STATE(1109)] = 52948,
+  [SMALL_STATE(1110)] = 52964,
+  [SMALL_STATE(1111)] = 52980,
+  [SMALL_STATE(1112)] = 52996,
+  [SMALL_STATE(1113)] = 53012,
+  [SMALL_STATE(1114)] = 53028,
+  [SMALL_STATE(1115)] = 53042,
+  [SMALL_STATE(1116)] = 53058,
+  [SMALL_STATE(1117)] = 53074,
+  [SMALL_STATE(1118)] = 53090,
+  [SMALL_STATE(1119)] = 53106,
+  [SMALL_STATE(1120)] = 53120,
+  [SMALL_STATE(1121)] = 53134,
+  [SMALL_STATE(1122)] = 53150,
+  [SMALL_STATE(1123)] = 53166,
+  [SMALL_STATE(1124)] = 53180,
+  [SMALL_STATE(1125)] = 53194,
+  [SMALL_STATE(1126)] = 53208,
+  [SMALL_STATE(1127)] = 53224,
+  [SMALL_STATE(1128)] = 53238,
+  [SMALL_STATE(1129)] = 53252,
+  [SMALL_STATE(1130)] = 53266,
+  [SMALL_STATE(1131)] = 53280,
+  [SMALL_STATE(1132)] = 53294,
+  [SMALL_STATE(1133)] = 53310,
+  [SMALL_STATE(1134)] = 53324,
+  [SMALL_STATE(1135)] = 53338,
+  [SMALL_STATE(1136)] = 53354,
+  [SMALL_STATE(1137)] = 53368,
+  [SMALL_STATE(1138)] = 53382,
+  [SMALL_STATE(1139)] = 53398,
+  [SMALL_STATE(1140)] = 53412,
+  [SMALL_STATE(1141)] = 53428,
+  [SMALL_STATE(1142)] = 53442,
+  [SMALL_STATE(1143)] = 53458,
+  [SMALL_STATE(1144)] = 53472,
+  [SMALL_STATE(1145)] = 53486,
+  [SMALL_STATE(1146)] = 53500,
+  [SMALL_STATE(1147)] = 53510,
+  [SMALL_STATE(1148)] = 53524,
+  [SMALL_STATE(1149)] = 53540,
+  [SMALL_STATE(1150)] = 53556,
+  [SMALL_STATE(1151)] = 53566,
+  [SMALL_STATE(1152)] = 53582,
+  [SMALL_STATE(1153)] = 53598,
+  [SMALL_STATE(1154)] = 53608,
+  [SMALL_STATE(1155)] = 53622,
+  [SMALL_STATE(1156)] = 53636,
+  [SMALL_STATE(1157)] = 53650,
+  [SMALL_STATE(1158)] = 53664,
+  [SMALL_STATE(1159)] = 53676,
+  [SMALL_STATE(1160)] = 53690,
+  [SMALL_STATE(1161)] = 53706,
+  [SMALL_STATE(1162)] = 53720,
+  [SMALL_STATE(1163)] = 53734,
+  [SMALL_STATE(1164)] = 53750,
+  [SMALL_STATE(1165)] = 53764,
+  [SMALL_STATE(1166)] = 53780,
+  [SMALL_STATE(1167)] = 53796,
+  [SMALL_STATE(1168)] = 53806,
+  [SMALL_STATE(1169)] = 53822,
+  [SMALL_STATE(1170)] = 53832,
+  [SMALL_STATE(1171)] = 53842,
+  [SMALL_STATE(1172)] = 53854,
+  [SMALL_STATE(1173)] = 53868,
+  [SMALL_STATE(1174)] = 53884,
+  [SMALL_STATE(1175)] = 53900,
+  [SMALL_STATE(1176)] = 53916,
+  [SMALL_STATE(1177)] = 53932,
+  [SMALL_STATE(1178)] = 53946,
+  [SMALL_STATE(1179)] = 53955,
+  [SMALL_STATE(1180)] = 53968,
+  [SMALL_STATE(1181)] = 53981,
+  [SMALL_STATE(1182)] = 53994,
+  [SMALL_STATE(1183)] = 54007,
+  [SMALL_STATE(1184)] = 54020,
+  [SMALL_STATE(1185)] = 54031,
+  [SMALL_STATE(1186)] = 54044,
+  [SMALL_STATE(1187)] = 54057,
+  [SMALL_STATE(1188)] = 54068,
+  [SMALL_STATE(1189)] = 54081,
+  [SMALL_STATE(1190)] = 54094,
+  [SMALL_STATE(1191)] = 54107,
+  [SMALL_STATE(1192)] = 54120,
   [SMALL_STATE(1193)] = 54133,
-  [SMALL_STATE(1194)] = 54149,
-  [SMALL_STATE(1195)] = 54162,
-  [SMALL_STATE(1196)] = 54175,
-  [SMALL_STATE(1197)] = 54188,
-  [SMALL_STATE(1198)] = 54201,
-  [SMALL_STATE(1199)] = 54210,
-  [SMALL_STATE(1200)] = 54223,
-  [SMALL_STATE(1201)] = 54236,
-  [SMALL_STATE(1202)] = 54245,
-  [SMALL_STATE(1203)] = 54258,
-  [SMALL_STATE(1204)] = 54271,
-  [SMALL_STATE(1205)] = 54284,
-  [SMALL_STATE(1206)] = 54297,
-  [SMALL_STATE(1207)] = 54310,
-  [SMALL_STATE(1208)] = 54319,
-  [SMALL_STATE(1209)] = 54332,
-  [SMALL_STATE(1210)] = 54345,
-  [SMALL_STATE(1211)] = 54358,
-  [SMALL_STATE(1212)] = 54371,
-  [SMALL_STATE(1213)] = 54384,
-  [SMALL_STATE(1214)] = 54397,
-  [SMALL_STATE(1215)] = 54410,
-  [SMALL_STATE(1216)] = 54423,
-  [SMALL_STATE(1217)] = 54436,
-  [SMALL_STATE(1218)] = 54447,
-  [SMALL_STATE(1219)] = 54460,
-  [SMALL_STATE(1220)] = 54473,
-  [SMALL_STATE(1221)] = 54486,
-  [SMALL_STATE(1222)] = 54499,
-  [SMALL_STATE(1223)] = 54510,
-  [SMALL_STATE(1224)] = 54519,
-  [SMALL_STATE(1225)] = 54532,
-  [SMALL_STATE(1226)] = 54545,
-  [SMALL_STATE(1227)] = 54554,
-  [SMALL_STATE(1228)] = 54567,
-  [SMALL_STATE(1229)] = 54580,
-  [SMALL_STATE(1230)] = 54593,
-  [SMALL_STATE(1231)] = 54606,
-  [SMALL_STATE(1232)] = 54619,
-  [SMALL_STATE(1233)] = 54632,
-  [SMALL_STATE(1234)] = 54643,
-  [SMALL_STATE(1235)] = 54656,
-  [SMALL_STATE(1236)] = 54669,
-  [SMALL_STATE(1237)] = 54682,
-  [SMALL_STATE(1238)] = 54695,
-  [SMALL_STATE(1239)] = 54708,
-  [SMALL_STATE(1240)] = 54721,
-  [SMALL_STATE(1241)] = 54734,
-  [SMALL_STATE(1242)] = 54747,
-  [SMALL_STATE(1243)] = 54760,
-  [SMALL_STATE(1244)] = 54773,
-  [SMALL_STATE(1245)] = 54786,
-  [SMALL_STATE(1246)] = 54797,
-  [SMALL_STATE(1247)] = 54810,
-  [SMALL_STATE(1248)] = 54823,
-  [SMALL_STATE(1249)] = 54836,
-  [SMALL_STATE(1250)] = 54849,
-  [SMALL_STATE(1251)] = 54858,
-  [SMALL_STATE(1252)] = 54871,
-  [SMALL_STATE(1253)] = 54884,
-  [SMALL_STATE(1254)] = 54895,
-  [SMALL_STATE(1255)] = 54908,
-  [SMALL_STATE(1256)] = 54921,
-  [SMALL_STATE(1257)] = 54934,
-  [SMALL_STATE(1258)] = 54947,
-  [SMALL_STATE(1259)] = 54960,
-  [SMALL_STATE(1260)] = 54973,
-  [SMALL_STATE(1261)] = 54986,
-  [SMALL_STATE(1262)] = 54999,
-  [SMALL_STATE(1263)] = 55012,
-  [SMALL_STATE(1264)] = 55023,
-  [SMALL_STATE(1265)] = 55036,
-  [SMALL_STATE(1266)] = 55047,
-  [SMALL_STATE(1267)] = 55060,
-  [SMALL_STATE(1268)] = 55071,
-  [SMALL_STATE(1269)] = 55084,
-  [SMALL_STATE(1270)] = 55095,
-  [SMALL_STATE(1271)] = 55104,
-  [SMALL_STATE(1272)] = 55117,
-  [SMALL_STATE(1273)] = 55130,
-  [SMALL_STATE(1274)] = 55143,
-  [SMALL_STATE(1275)] = 55156,
-  [SMALL_STATE(1276)] = 55169,
-  [SMALL_STATE(1277)] = 55182,
-  [SMALL_STATE(1278)] = 55195,
-  [SMALL_STATE(1279)] = 55208,
-  [SMALL_STATE(1280)] = 55221,
-  [SMALL_STATE(1281)] = 55234,
-  [SMALL_STATE(1282)] = 55243,
-  [SMALL_STATE(1283)] = 55256,
-  [SMALL_STATE(1284)] = 55269,
-  [SMALL_STATE(1285)] = 55282,
-  [SMALL_STATE(1286)] = 55295,
-  [SMALL_STATE(1287)] = 55308,
-  [SMALL_STATE(1288)] = 55319,
-  [SMALL_STATE(1289)] = 55330,
-  [SMALL_STATE(1290)] = 55343,
-  [SMALL_STATE(1291)] = 55356,
-  [SMALL_STATE(1292)] = 55365,
-  [SMALL_STATE(1293)] = 55378,
-  [SMALL_STATE(1294)] = 55391,
-  [SMALL_STATE(1295)] = 55404,
-  [SMALL_STATE(1296)] = 55417,
-  [SMALL_STATE(1297)] = 55430,
-  [SMALL_STATE(1298)] = 55443,
-  [SMALL_STATE(1299)] = 55456,
-  [SMALL_STATE(1300)] = 55469,
-  [SMALL_STATE(1301)] = 55482,
-  [SMALL_STATE(1302)] = 55495,
-  [SMALL_STATE(1303)] = 55508,
-  [SMALL_STATE(1304)] = 55521,
-  [SMALL_STATE(1305)] = 55532,
-  [SMALL_STATE(1306)] = 55545,
-  [SMALL_STATE(1307)] = 55558,
-  [SMALL_STATE(1308)] = 55569,
-  [SMALL_STATE(1309)] = 55578,
-  [SMALL_STATE(1310)] = 55591,
-  [SMALL_STATE(1311)] = 55604,
-  [SMALL_STATE(1312)] = 55617,
-  [SMALL_STATE(1313)] = 55630,
-  [SMALL_STATE(1314)] = 55643,
-  [SMALL_STATE(1315)] = 55656,
-  [SMALL_STATE(1316)] = 55669,
-  [SMALL_STATE(1317)] = 55682,
-  [SMALL_STATE(1318)] = 55695,
-  [SMALL_STATE(1319)] = 55704,
-  [SMALL_STATE(1320)] = 55717,
-  [SMALL_STATE(1321)] = 55730,
-  [SMALL_STATE(1322)] = 55743,
-  [SMALL_STATE(1323)] = 55752,
-  [SMALL_STATE(1324)] = 55765,
-  [SMALL_STATE(1325)] = 55776,
-  [SMALL_STATE(1326)] = 55789,
-  [SMALL_STATE(1327)] = 55802,
-  [SMALL_STATE(1328)] = 55815,
-  [SMALL_STATE(1329)] = 55828,
-  [SMALL_STATE(1330)] = 55841,
-  [SMALL_STATE(1331)] = 55854,
-  [SMALL_STATE(1332)] = 55867,
-  [SMALL_STATE(1333)] = 55878,
-  [SMALL_STATE(1334)] = 55887,
-  [SMALL_STATE(1335)] = 55900,
-  [SMALL_STATE(1336)] = 55911,
-  [SMALL_STATE(1337)] = 55924,
-  [SMALL_STATE(1338)] = 55937,
-  [SMALL_STATE(1339)] = 55950,
-  [SMALL_STATE(1340)] = 55961,
-  [SMALL_STATE(1341)] = 55970,
-  [SMALL_STATE(1342)] = 55978,
-  [SMALL_STATE(1343)] = 55986,
-  [SMALL_STATE(1344)] = 55994,
-  [SMALL_STATE(1345)] = 56004,
-  [SMALL_STATE(1346)] = 56012,
-  [SMALL_STATE(1347)] = 56020,
-  [SMALL_STATE(1348)] = 56028,
-  [SMALL_STATE(1349)] = 56036,
-  [SMALL_STATE(1350)] = 56044,
-  [SMALL_STATE(1351)] = 56052,
-  [SMALL_STATE(1352)] = 56060,
-  [SMALL_STATE(1353)] = 56068,
-  [SMALL_STATE(1354)] = 56078,
-  [SMALL_STATE(1355)] = 56088,
-  [SMALL_STATE(1356)] = 56096,
-  [SMALL_STATE(1357)] = 56106,
-  [SMALL_STATE(1358)] = 56116,
-  [SMALL_STATE(1359)] = 56126,
-  [SMALL_STATE(1360)] = 56136,
-  [SMALL_STATE(1361)] = 56146,
-  [SMALL_STATE(1362)] = 56154,
-  [SMALL_STATE(1363)] = 56162,
-  [SMALL_STATE(1364)] = 56172,
-  [SMALL_STATE(1365)] = 56180,
-  [SMALL_STATE(1366)] = 56190,
-  [SMALL_STATE(1367)] = 56200,
-  [SMALL_STATE(1368)] = 56208,
-  [SMALL_STATE(1369)] = 56218,
-  [SMALL_STATE(1370)] = 56226,
-  [SMALL_STATE(1371)] = 56236,
-  [SMALL_STATE(1372)] = 56246,
-  [SMALL_STATE(1373)] = 56256,
-  [SMALL_STATE(1374)] = 56264,
-  [SMALL_STATE(1375)] = 56272,
-  [SMALL_STATE(1376)] = 56282,
-  [SMALL_STATE(1377)] = 56292,
-  [SMALL_STATE(1378)] = 56302,
-  [SMALL_STATE(1379)] = 56312,
-  [SMALL_STATE(1380)] = 56320,
-  [SMALL_STATE(1381)] = 56328,
-  [SMALL_STATE(1382)] = 56338,
-  [SMALL_STATE(1383)] = 56346,
-  [SMALL_STATE(1384)] = 56354,
-  [SMALL_STATE(1385)] = 56362,
-  [SMALL_STATE(1386)] = 56370,
-  [SMALL_STATE(1387)] = 56378,
-  [SMALL_STATE(1388)] = 56388,
-  [SMALL_STATE(1389)] = 56396,
-  [SMALL_STATE(1390)] = 56404,
-  [SMALL_STATE(1391)] = 56414,
-  [SMALL_STATE(1392)] = 56422,
-  [SMALL_STATE(1393)] = 56432,
-  [SMALL_STATE(1394)] = 56440,
-  [SMALL_STATE(1395)] = 56448,
-  [SMALL_STATE(1396)] = 56456,
-  [SMALL_STATE(1397)] = 56466,
-  [SMALL_STATE(1398)] = 56474,
-  [SMALL_STATE(1399)] = 56482,
-  [SMALL_STATE(1400)] = 56490,
-  [SMALL_STATE(1401)] = 56498,
-  [SMALL_STATE(1402)] = 56508,
-  [SMALL_STATE(1403)] = 56516,
-  [SMALL_STATE(1404)] = 56524,
-  [SMALL_STATE(1405)] = 56534,
-  [SMALL_STATE(1406)] = 56541,
-  [SMALL_STATE(1407)] = 56548,
-  [SMALL_STATE(1408)] = 56555,
-  [SMALL_STATE(1409)] = 56562,
-  [SMALL_STATE(1410)] = 56569,
-  [SMALL_STATE(1411)] = 56576,
-  [SMALL_STATE(1412)] = 56583,
-  [SMALL_STATE(1413)] = 56590,
-  [SMALL_STATE(1414)] = 56597,
-  [SMALL_STATE(1415)] = 56604,
-  [SMALL_STATE(1416)] = 56611,
-  [SMALL_STATE(1417)] = 56618,
-  [SMALL_STATE(1418)] = 56625,
-  [SMALL_STATE(1419)] = 56632,
-  [SMALL_STATE(1420)] = 56639,
-  [SMALL_STATE(1421)] = 56646,
-  [SMALL_STATE(1422)] = 56653,
-  [SMALL_STATE(1423)] = 56660,
-  [SMALL_STATE(1424)] = 56667,
-  [SMALL_STATE(1425)] = 56674,
-  [SMALL_STATE(1426)] = 56681,
-  [SMALL_STATE(1427)] = 56688,
-  [SMALL_STATE(1428)] = 56695,
-  [SMALL_STATE(1429)] = 56702,
-  [SMALL_STATE(1430)] = 56709,
-  [SMALL_STATE(1431)] = 56716,
-  [SMALL_STATE(1432)] = 56723,
-  [SMALL_STATE(1433)] = 56730,
-  [SMALL_STATE(1434)] = 56737,
-  [SMALL_STATE(1435)] = 56744,
-  [SMALL_STATE(1436)] = 56751,
-  [SMALL_STATE(1437)] = 56758,
-  [SMALL_STATE(1438)] = 56765,
-  [SMALL_STATE(1439)] = 56772,
-  [SMALL_STATE(1440)] = 56779,
-  [SMALL_STATE(1441)] = 56786,
-  [SMALL_STATE(1442)] = 56793,
-  [SMALL_STATE(1443)] = 56800,
-  [SMALL_STATE(1444)] = 56807,
-  [SMALL_STATE(1445)] = 56814,
-  [SMALL_STATE(1446)] = 56821,
-  [SMALL_STATE(1447)] = 56828,
-  [SMALL_STATE(1448)] = 56835,
-  [SMALL_STATE(1449)] = 56842,
-  [SMALL_STATE(1450)] = 56849,
-  [SMALL_STATE(1451)] = 56856,
-  [SMALL_STATE(1452)] = 56863,
-  [SMALL_STATE(1453)] = 56870,
-  [SMALL_STATE(1454)] = 56877,
-  [SMALL_STATE(1455)] = 56884,
-  [SMALL_STATE(1456)] = 56891,
-  [SMALL_STATE(1457)] = 56898,
-  [SMALL_STATE(1458)] = 56905,
-  [SMALL_STATE(1459)] = 56912,
-  [SMALL_STATE(1460)] = 56919,
-  [SMALL_STATE(1461)] = 56926,
-  [SMALL_STATE(1462)] = 56933,
-  [SMALL_STATE(1463)] = 56940,
-  [SMALL_STATE(1464)] = 56947,
-  [SMALL_STATE(1465)] = 56954,
-  [SMALL_STATE(1466)] = 56961,
-  [SMALL_STATE(1467)] = 56968,
-  [SMALL_STATE(1468)] = 56975,
-  [SMALL_STATE(1469)] = 56982,
-  [SMALL_STATE(1470)] = 56989,
-  [SMALL_STATE(1471)] = 56996,
-  [SMALL_STATE(1472)] = 57003,
-  [SMALL_STATE(1473)] = 57010,
-  [SMALL_STATE(1474)] = 57017,
-  [SMALL_STATE(1475)] = 57024,
-  [SMALL_STATE(1476)] = 57031,
-  [SMALL_STATE(1477)] = 57038,
-  [SMALL_STATE(1478)] = 57045,
-  [SMALL_STATE(1479)] = 57052,
-  [SMALL_STATE(1480)] = 57059,
-  [SMALL_STATE(1481)] = 57066,
-  [SMALL_STATE(1482)] = 57073,
-  [SMALL_STATE(1483)] = 57080,
-  [SMALL_STATE(1484)] = 57087,
-  [SMALL_STATE(1485)] = 57094,
-  [SMALL_STATE(1486)] = 57101,
-  [SMALL_STATE(1487)] = 57108,
-  [SMALL_STATE(1488)] = 57115,
-  [SMALL_STATE(1489)] = 57122,
-  [SMALL_STATE(1490)] = 57129,
-  [SMALL_STATE(1491)] = 57136,
-  [SMALL_STATE(1492)] = 57143,
-  [SMALL_STATE(1493)] = 57150,
-  [SMALL_STATE(1494)] = 57157,
-  [SMALL_STATE(1495)] = 57164,
-  [SMALL_STATE(1496)] = 57171,
-  [SMALL_STATE(1497)] = 57178,
-  [SMALL_STATE(1498)] = 57185,
-  [SMALL_STATE(1499)] = 57192,
-  [SMALL_STATE(1500)] = 57199,
-  [SMALL_STATE(1501)] = 57206,
-  [SMALL_STATE(1502)] = 57213,
-  [SMALL_STATE(1503)] = 57220,
-  [SMALL_STATE(1504)] = 57227,
-  [SMALL_STATE(1505)] = 57234,
-  [SMALL_STATE(1506)] = 57241,
-  [SMALL_STATE(1507)] = 57248,
-  [SMALL_STATE(1508)] = 57255,
-  [SMALL_STATE(1509)] = 57262,
-  [SMALL_STATE(1510)] = 57269,
-  [SMALL_STATE(1511)] = 57276,
-  [SMALL_STATE(1512)] = 57283,
-  [SMALL_STATE(1513)] = 57290,
-  [SMALL_STATE(1514)] = 57297,
-  [SMALL_STATE(1515)] = 57304,
-  [SMALL_STATE(1516)] = 57311,
-  [SMALL_STATE(1517)] = 57318,
-  [SMALL_STATE(1518)] = 57325,
-  [SMALL_STATE(1519)] = 57332,
-  [SMALL_STATE(1520)] = 57339,
-  [SMALL_STATE(1521)] = 57346,
-  [SMALL_STATE(1522)] = 57353,
-  [SMALL_STATE(1523)] = 57360,
-  [SMALL_STATE(1524)] = 57367,
+  [SMALL_STATE(1194)] = 54146,
+  [SMALL_STATE(1195)] = 54155,
+  [SMALL_STATE(1196)] = 54164,
+  [SMALL_STATE(1197)] = 54177,
+  [SMALL_STATE(1198)] = 54186,
+  [SMALL_STATE(1199)] = 54195,
+  [SMALL_STATE(1200)] = 54208,
+  [SMALL_STATE(1201)] = 54221,
+  [SMALL_STATE(1202)] = 54234,
+  [SMALL_STATE(1203)] = 54247,
+  [SMALL_STATE(1204)] = 54260,
+  [SMALL_STATE(1205)] = 54273,
+  [SMALL_STATE(1206)] = 54286,
+  [SMALL_STATE(1207)] = 54299,
+  [SMALL_STATE(1208)] = 54312,
+  [SMALL_STATE(1209)] = 54325,
+  [SMALL_STATE(1210)] = 54338,
+  [SMALL_STATE(1211)] = 54351,
+  [SMALL_STATE(1212)] = 54364,
+  [SMALL_STATE(1213)] = 54377,
+  [SMALL_STATE(1214)] = 54390,
+  [SMALL_STATE(1215)] = 54403,
+  [SMALL_STATE(1216)] = 54416,
+  [SMALL_STATE(1217)] = 54429,
+  [SMALL_STATE(1218)] = 54442,
+  [SMALL_STATE(1219)] = 54455,
+  [SMALL_STATE(1220)] = 54468,
+  [SMALL_STATE(1221)] = 54481,
+  [SMALL_STATE(1222)] = 54492,
+  [SMALL_STATE(1223)] = 54505,
+  [SMALL_STATE(1224)] = 54518,
+  [SMALL_STATE(1225)] = 54531,
+  [SMALL_STATE(1226)] = 54544,
+  [SMALL_STATE(1227)] = 54557,
+  [SMALL_STATE(1228)] = 54568,
+  [SMALL_STATE(1229)] = 54581,
+  [SMALL_STATE(1230)] = 54594,
+  [SMALL_STATE(1231)] = 54607,
+  [SMALL_STATE(1232)] = 54620,
+  [SMALL_STATE(1233)] = 54633,
+  [SMALL_STATE(1234)] = 54646,
+  [SMALL_STATE(1235)] = 54659,
+  [SMALL_STATE(1236)] = 54672,
+  [SMALL_STATE(1237)] = 54685,
+  [SMALL_STATE(1238)] = 54696,
+  [SMALL_STATE(1239)] = 54709,
+  [SMALL_STATE(1240)] = 54720,
+  [SMALL_STATE(1241)] = 54733,
+  [SMALL_STATE(1242)] = 54746,
+  [SMALL_STATE(1243)] = 54759,
+  [SMALL_STATE(1244)] = 54768,
+  [SMALL_STATE(1245)] = 54781,
+  [SMALL_STATE(1246)] = 54792,
+  [SMALL_STATE(1247)] = 54805,
+  [SMALL_STATE(1248)] = 54818,
+  [SMALL_STATE(1249)] = 54831,
+  [SMALL_STATE(1250)] = 54840,
+  [SMALL_STATE(1251)] = 54851,
+  [SMALL_STATE(1252)] = 54864,
+  [SMALL_STATE(1253)] = 54877,
+  [SMALL_STATE(1254)] = 54888,
+  [SMALL_STATE(1255)] = 54901,
+  [SMALL_STATE(1256)] = 54914,
+  [SMALL_STATE(1257)] = 54927,
+  [SMALL_STATE(1258)] = 54940,
+  [SMALL_STATE(1259)] = 54953,
+  [SMALL_STATE(1260)] = 54962,
+  [SMALL_STATE(1261)] = 54975,
+  [SMALL_STATE(1262)] = 54988,
+  [SMALL_STATE(1263)] = 55001,
+  [SMALL_STATE(1264)] = 55014,
+  [SMALL_STATE(1265)] = 55025,
+  [SMALL_STATE(1266)] = 55034,
+  [SMALL_STATE(1267)] = 55047,
+  [SMALL_STATE(1268)] = 55060,
+  [SMALL_STATE(1269)] = 55069,
+  [SMALL_STATE(1270)] = 55082,
+  [SMALL_STATE(1271)] = 55095,
+  [SMALL_STATE(1272)] = 55104,
+  [SMALL_STATE(1273)] = 55117,
+  [SMALL_STATE(1274)] = 55130,
+  [SMALL_STATE(1275)] = 55143,
+  [SMALL_STATE(1276)] = 55156,
+  [SMALL_STATE(1277)] = 55169,
+  [SMALL_STATE(1278)] = 55182,
+  [SMALL_STATE(1279)] = 55195,
+  [SMALL_STATE(1280)] = 55208,
+  [SMALL_STATE(1281)] = 55221,
+  [SMALL_STATE(1282)] = 55234,
+  [SMALL_STATE(1283)] = 55247,
+  [SMALL_STATE(1284)] = 55260,
+  [SMALL_STATE(1285)] = 55273,
+  [SMALL_STATE(1286)] = 55286,
+  [SMALL_STATE(1287)] = 55299,
+  [SMALL_STATE(1288)] = 55312,
+  [SMALL_STATE(1289)] = 55325,
+  [SMALL_STATE(1290)] = 55338,
+  [SMALL_STATE(1291)] = 55351,
+  [SMALL_STATE(1292)] = 55362,
+  [SMALL_STATE(1293)] = 55375,
+  [SMALL_STATE(1294)] = 55388,
+  [SMALL_STATE(1295)] = 55399,
+  [SMALL_STATE(1296)] = 55412,
+  [SMALL_STATE(1297)] = 55425,
+  [SMALL_STATE(1298)] = 55438,
+  [SMALL_STATE(1299)] = 55451,
+  [SMALL_STATE(1300)] = 55460,
+  [SMALL_STATE(1301)] = 55473,
+  [SMALL_STATE(1302)] = 55486,
+  [SMALL_STATE(1303)] = 55495,
+  [SMALL_STATE(1304)] = 55508,
+  [SMALL_STATE(1305)] = 55521,
+  [SMALL_STATE(1306)] = 55530,
+  [SMALL_STATE(1307)] = 55543,
+  [SMALL_STATE(1308)] = 55556,
+  [SMALL_STATE(1309)] = 55569,
+  [SMALL_STATE(1310)] = 55582,
+  [SMALL_STATE(1311)] = 55595,
+  [SMALL_STATE(1312)] = 55608,
+  [SMALL_STATE(1313)] = 55617,
+  [SMALL_STATE(1314)] = 55625,
+  [SMALL_STATE(1315)] = 55633,
+  [SMALL_STATE(1316)] = 55643,
+  [SMALL_STATE(1317)] = 55653,
+  [SMALL_STATE(1318)] = 55661,
+  [SMALL_STATE(1319)] = 55669,
+  [SMALL_STATE(1320)] = 55679,
+  [SMALL_STATE(1321)] = 55689,
+  [SMALL_STATE(1322)] = 55699,
+  [SMALL_STATE(1323)] = 55707,
+  [SMALL_STATE(1324)] = 55715,
+  [SMALL_STATE(1325)] = 55723,
+  [SMALL_STATE(1326)] = 55731,
+  [SMALL_STATE(1327)] = 55739,
+  [SMALL_STATE(1328)] = 55749,
+  [SMALL_STATE(1329)] = 55757,
+  [SMALL_STATE(1330)] = 55767,
+  [SMALL_STATE(1331)] = 55777,
+  [SMALL_STATE(1332)] = 55785,
+  [SMALL_STATE(1333)] = 55795,
+  [SMALL_STATE(1334)] = 55803,
+  [SMALL_STATE(1335)] = 55811,
+  [SMALL_STATE(1336)] = 55819,
+  [SMALL_STATE(1337)] = 55827,
+  [SMALL_STATE(1338)] = 55837,
+  [SMALL_STATE(1339)] = 55845,
+  [SMALL_STATE(1340)] = 55853,
+  [SMALL_STATE(1341)] = 55861,
+  [SMALL_STATE(1342)] = 55869,
+  [SMALL_STATE(1343)] = 55879,
+  [SMALL_STATE(1344)] = 55889,
+  [SMALL_STATE(1345)] = 55897,
+  [SMALL_STATE(1346)] = 55907,
+  [SMALL_STATE(1347)] = 55915,
+  [SMALL_STATE(1348)] = 55923,
+  [SMALL_STATE(1349)] = 55931,
+  [SMALL_STATE(1350)] = 55939,
+  [SMALL_STATE(1351)] = 55949,
+  [SMALL_STATE(1352)] = 55959,
+  [SMALL_STATE(1353)] = 55969,
+  [SMALL_STATE(1354)] = 55977,
+  [SMALL_STATE(1355)] = 55987,
+  [SMALL_STATE(1356)] = 55995,
+  [SMALL_STATE(1357)] = 56003,
+  [SMALL_STATE(1358)] = 56011,
+  [SMALL_STATE(1359)] = 56021,
+  [SMALL_STATE(1360)] = 56029,
+  [SMALL_STATE(1361)] = 56039,
+  [SMALL_STATE(1362)] = 56047,
+  [SMALL_STATE(1363)] = 56055,
+  [SMALL_STATE(1364)] = 56065,
+  [SMALL_STATE(1365)] = 56075,
+  [SMALL_STATE(1366)] = 56083,
+  [SMALL_STATE(1367)] = 56091,
+  [SMALL_STATE(1368)] = 56101,
+  [SMALL_STATE(1369)] = 56109,
+  [SMALL_STATE(1370)] = 56117,
+  [SMALL_STATE(1371)] = 56125,
+  [SMALL_STATE(1372)] = 56133,
+  [SMALL_STATE(1373)] = 56141,
+  [SMALL_STATE(1374)] = 56149,
+  [SMALL_STATE(1375)] = 56157,
+  [SMALL_STATE(1376)] = 56165,
+  [SMALL_STATE(1377)] = 56173,
+  [SMALL_STATE(1378)] = 56181,
+  [SMALL_STATE(1379)] = 56189,
+  [SMALL_STATE(1380)] = 56197,
+  [SMALL_STATE(1381)] = 56207,
+  [SMALL_STATE(1382)] = 56217,
+  [SMALL_STATE(1383)] = 56227,
+  [SMALL_STATE(1384)] = 56237,
+  [SMALL_STATE(1385)] = 56244,
+  [SMALL_STATE(1386)] = 56251,
+  [SMALL_STATE(1387)] = 56258,
+  [SMALL_STATE(1388)] = 56265,
+  [SMALL_STATE(1389)] = 56272,
+  [SMALL_STATE(1390)] = 56279,
+  [SMALL_STATE(1391)] = 56286,
+  [SMALL_STATE(1392)] = 56293,
+  [SMALL_STATE(1393)] = 56300,
+  [SMALL_STATE(1394)] = 56307,
+  [SMALL_STATE(1395)] = 56314,
+  [SMALL_STATE(1396)] = 56321,
+  [SMALL_STATE(1397)] = 56328,
+  [SMALL_STATE(1398)] = 56335,
+  [SMALL_STATE(1399)] = 56342,
+  [SMALL_STATE(1400)] = 56349,
+  [SMALL_STATE(1401)] = 56356,
+  [SMALL_STATE(1402)] = 56363,
+  [SMALL_STATE(1403)] = 56370,
+  [SMALL_STATE(1404)] = 56377,
+  [SMALL_STATE(1405)] = 56384,
+  [SMALL_STATE(1406)] = 56391,
+  [SMALL_STATE(1407)] = 56398,
+  [SMALL_STATE(1408)] = 56405,
+  [SMALL_STATE(1409)] = 56412,
+  [SMALL_STATE(1410)] = 56419,
+  [SMALL_STATE(1411)] = 56426,
+  [SMALL_STATE(1412)] = 56433,
+  [SMALL_STATE(1413)] = 56440,
+  [SMALL_STATE(1414)] = 56447,
+  [SMALL_STATE(1415)] = 56454,
+  [SMALL_STATE(1416)] = 56461,
+  [SMALL_STATE(1417)] = 56468,
+  [SMALL_STATE(1418)] = 56475,
+  [SMALL_STATE(1419)] = 56482,
+  [SMALL_STATE(1420)] = 56489,
+  [SMALL_STATE(1421)] = 56496,
+  [SMALL_STATE(1422)] = 56503,
+  [SMALL_STATE(1423)] = 56510,
+  [SMALL_STATE(1424)] = 56517,
+  [SMALL_STATE(1425)] = 56524,
+  [SMALL_STATE(1426)] = 56531,
+  [SMALL_STATE(1427)] = 56538,
+  [SMALL_STATE(1428)] = 56545,
+  [SMALL_STATE(1429)] = 56552,
+  [SMALL_STATE(1430)] = 56559,
+  [SMALL_STATE(1431)] = 56566,
+  [SMALL_STATE(1432)] = 56573,
+  [SMALL_STATE(1433)] = 56580,
+  [SMALL_STATE(1434)] = 56587,
+  [SMALL_STATE(1435)] = 56594,
+  [SMALL_STATE(1436)] = 56601,
+  [SMALL_STATE(1437)] = 56608,
+  [SMALL_STATE(1438)] = 56615,
+  [SMALL_STATE(1439)] = 56622,
+  [SMALL_STATE(1440)] = 56629,
+  [SMALL_STATE(1441)] = 56636,
+  [SMALL_STATE(1442)] = 56643,
+  [SMALL_STATE(1443)] = 56650,
+  [SMALL_STATE(1444)] = 56657,
+  [SMALL_STATE(1445)] = 56664,
+  [SMALL_STATE(1446)] = 56671,
+  [SMALL_STATE(1447)] = 56678,
+  [SMALL_STATE(1448)] = 56685,
+  [SMALL_STATE(1449)] = 56692,
+  [SMALL_STATE(1450)] = 56699,
+  [SMALL_STATE(1451)] = 56706,
+  [SMALL_STATE(1452)] = 56713,
+  [SMALL_STATE(1453)] = 56720,
+  [SMALL_STATE(1454)] = 56727,
+  [SMALL_STATE(1455)] = 56734,
+  [SMALL_STATE(1456)] = 56741,
+  [SMALL_STATE(1457)] = 56748,
+  [SMALL_STATE(1458)] = 56755,
+  [SMALL_STATE(1459)] = 56762,
+  [SMALL_STATE(1460)] = 56769,
+  [SMALL_STATE(1461)] = 56776,
+  [SMALL_STATE(1462)] = 56783,
+  [SMALL_STATE(1463)] = 56790,
+  [SMALL_STATE(1464)] = 56797,
+  [SMALL_STATE(1465)] = 56804,
+  [SMALL_STATE(1466)] = 56811,
+  [SMALL_STATE(1467)] = 56818,
+  [SMALL_STATE(1468)] = 56825,
+  [SMALL_STATE(1469)] = 56832,
+  [SMALL_STATE(1470)] = 56839,
+  [SMALL_STATE(1471)] = 56846,
+  [SMALL_STATE(1472)] = 56853,
+  [SMALL_STATE(1473)] = 56860,
+  [SMALL_STATE(1474)] = 56867,
+  [SMALL_STATE(1475)] = 56874,
+  [SMALL_STATE(1476)] = 56881,
+  [SMALL_STATE(1477)] = 56888,
+  [SMALL_STATE(1478)] = 56895,
+  [SMALL_STATE(1479)] = 56902,
+  [SMALL_STATE(1480)] = 56909,
+  [SMALL_STATE(1481)] = 56916,
+  [SMALL_STATE(1482)] = 56923,
+  [SMALL_STATE(1483)] = 56930,
+  [SMALL_STATE(1484)] = 56937,
+  [SMALL_STATE(1485)] = 56944,
+  [SMALL_STATE(1486)] = 56951,
+  [SMALL_STATE(1487)] = 56958,
+  [SMALL_STATE(1488)] = 56965,
+  [SMALL_STATE(1489)] = 56972,
+  [SMALL_STATE(1490)] = 56979,
+  [SMALL_STATE(1491)] = 56986,
+  [SMALL_STATE(1492)] = 56993,
+  [SMALL_STATE(1493)] = 57000,
+  [SMALL_STATE(1494)] = 57007,
+  [SMALL_STATE(1495)] = 57014,
+  [SMALL_STATE(1496)] = 57021,
+  [SMALL_STATE(1497)] = 57028,
+  [SMALL_STATE(1498)] = 57035,
+  [SMALL_STATE(1499)] = 57042,
+  [SMALL_STATE(1500)] = 57049,
+  [SMALL_STATE(1501)] = 57056,
+  [SMALL_STATE(1502)] = 57063,
+  [SMALL_STATE(1503)] = 57070,
+  [SMALL_STATE(1504)] = 57077,
+  [SMALL_STATE(1505)] = 57084,
 };
 
 static const TSParseActionEntry ts_parse_actions[] = {
@@ -74895,1554 +71017,1544 @@ static const TSParseActionEntry ts_parse_actions[] = {
   [1] = {.entry = {.count = 1, .reusable = false}}, RECOVER(),
   [3] = {.entry = {.count = 1, .reusable = true}}, SHIFT_EXTRA(),
   [5] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_module, 0),
-  [7] = {.entry = {.count = 1, .reusable = false}}, SHIFT(330),
-  [9] = {.entry = {.count = 1, .reusable = false}}, SHIFT(1130),
-  [11] = {.entry = {.count = 1, .reusable = false}}, SHIFT(1016),
-  [13] = {.entry = {.count = 1, .reusable = true}}, SHIFT(164),
-  [15] = {.entry = {.count = 1, .reusable = false}}, SHIFT(393),
-  [17] = {.entry = {.count = 1, .reusable = false}}, SHIFT(75),
-  [19] = {.entry = {.count = 1, .reusable = false}}, SHIFT(394),
-  [21] = {.entry = {.count = 1, .reusable = false}}, SHIFT(201),
-  [23] = {.entry = {.count = 1, .reusable = false}}, SHIFT(231),
-  [25] = {.entry = {.count = 1, .reusable = false}}, SHIFT(181),
-  [27] = {.entry = {.count = 1, .reusable = false}}, SHIFT(1345),
-  [29] = {.entry = {.count = 1, .reusable = false}}, SHIFT(1346),
-  [31] = {.entry = {.count = 1, .reusable = false}}, SHIFT(1349),
-  [33] = {.entry = {.count = 1, .reusable = false}}, SHIFT(400),
-  [35] = {.entry = {.count = 1, .reusable = false}}, SHIFT(247),
-  [37] = {.entry = {.count = 1, .reusable = false}}, SHIFT(602),
-  [39] = {.entry = {.count = 1, .reusable = false}}, SHIFT(404),
-  [41] = {.entry = {.count = 1, .reusable = false}}, SHIFT(1512),
-  [43] = {.entry = {.count = 1, .reusable = false}}, SHIFT(296),
-  [45] = {.entry = {.count = 1, .reusable = false}}, SHIFT(71),
-  [47] = {.entry = {.count = 1, .reusable = true}}, SHIFT(719),
-  [49] = {.entry = {.count = 1, .reusable = true}}, SHIFT(159),
+  [7] = {.entry = {.count = 1, .reusable = false}}, SHIFT(357),
+  [9] = {.entry = {.count = 1, .reusable = false}}, SHIFT(1111),
+  [11] = {.entry = {.count = 1, .reusable = false}}, SHIFT(993),
+  [13] = {.entry = {.count = 1, .reusable = true}}, SHIFT(155),
+  [15] = {.entry = {.count = 1, .reusable = false}}, SHIFT(450),
+  [17] = {.entry = {.count = 1, .reusable = false}}, SHIFT(74),
+  [19] = {.entry = {.count = 1, .reusable = false}}, SHIFT(448),
+  [21] = {.entry = {.count = 1, .reusable = false}}, SHIFT(191),
+  [23] = {.entry = {.count = 1, .reusable = false}}, SHIFT(241),
+  [25] = {.entry = {.count = 1, .reusable = false}}, SHIFT(169),
+  [27] = {.entry = {.count = 1, .reusable = false}}, SHIFT(1362),
+  [29] = {.entry = {.count = 1, .reusable = false}}, SHIFT(1355),
+  [31] = {.entry = {.count = 1, .reusable = false}}, SHIFT(1353),
+  [33] = {.entry = {.count = 1, .reusable = false}}, SHIFT(437),
+  [35] = {.entry = {.count = 1, .reusable = false}}, SHIFT(256),
+  [37] = {.entry = {.count = 1, .reusable = false}}, SHIFT(581),
+  [39] = {.entry = {.count = 1, .reusable = false}}, SHIFT(434),
+  [41] = {.entry = {.count = 1, .reusable = false}}, SHIFT(1493),
+  [43] = {.entry = {.count = 1, .reusable = false}}, SHIFT(313),
+  [45] = {.entry = {.count = 1, .reusable = false}}, SHIFT(67),
+  [47] = {.entry = {.count = 1, .reusable = true}}, SHIFT(689),
+  [49] = {.entry = {.count = 1, .reusable = true}}, SHIFT(157),
   [51] = {.entry = {.count = 1, .reusable = true}}, SHIFT(166),
-  [53] = {.entry = {.count = 1, .reusable = true}}, SHIFT(406),
-  [55] = {.entry = {.count = 1, .reusable = false}}, SHIFT(1511),
-  [57] = {.entry = {.count = 1, .reusable = false}}, SHIFT(1510),
-  [59] = {.entry = {.count = 1, .reusable = false}}, SHIFT(1509),
-  [61] = {.entry = {.count = 1, .reusable = false}}, SHIFT(278),
-  [63] = {.entry = {.count = 1, .reusable = false}}, SHIFT(284),
-  [65] = {.entry = {.count = 1, .reusable = false}}, SHIFT(1508),
-  [67] = {.entry = {.count = 1, .reusable = true}}, SHIFT(417),
-  [69] = {.entry = {.count = 1, .reusable = false}}, SHIFT(419),
-  [71] = {.entry = {.count = 1, .reusable = false}}, SHIFT(890),
-  [73] = {.entry = {.count = 1, .reusable = false}}, SHIFT(180),
-  [75] = {.entry = {.count = 1, .reusable = true}}, SHIFT(797),
-  [77] = {.entry = {.count = 1, .reusable = false}}, SHIFT(797),
-  [79] = {.entry = {.count = 1, .reusable = false}}, SHIFT(131),
-  [81] = {.entry = {.count = 1, .reusable = true}}, SHIFT(952),
-  [83] = {.entry = {.count = 1, .reusable = false}}, SHIFT(424),
-  [85] = {.entry = {.count = 1, .reusable = false}}, SHIFT(254),
-  [87] = {.entry = {.count = 1, .reusable = false}}, SHIFT(604),
-  [89] = {.entry = {.count = 1, .reusable = false}}, SHIFT(423),
-  [91] = {.entry = {.count = 1, .reusable = false}}, SHIFT(1495),
-  [93] = {.entry = {.count = 1, .reusable = false}}, SHIFT(298),
-  [95] = {.entry = {.count = 1, .reusable = false}}, SHIFT(70),
-  [97] = {.entry = {.count = 1, .reusable = false}}, SHIFT(1516),
-  [99] = {.entry = {.count = 1, .reusable = false}}, SHIFT(1498),
-  [101] = {.entry = {.count = 1, .reusable = true}}, SHIFT(370),
-  [103] = {.entry = {.count = 1, .reusable = true}}, SHIFT(291),
-  [105] = {.entry = {.count = 1, .reusable = true}}, SHIFT(356),
-  [107] = {.entry = {.count = 1, .reusable = true}}, SHIFT(281),
-  [109] = {.entry = {.count = 1, .reusable = true}}, SHIFT(326),
-  [111] = {.entry = {.count = 1, .reusable = true}}, SHIFT(376),
-  [113] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1265),
-  [115] = {.entry = {.count = 1, .reusable = true}}, SHIFT(319),
-  [117] = {.entry = {.count = 1, .reusable = true}}, SHIFT(305),
-  [119] = {.entry = {.count = 1, .reusable = true}}, SHIFT(354),
-  [121] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_module_repeat1, 2), SHIFT_REPEAT(330),
-  [124] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_module_repeat1, 2), SHIFT_REPEAT(1130),
-  [127] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_module_repeat1, 2), SHIFT_REPEAT(1016),
-  [130] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_module_repeat1, 2), SHIFT_REPEAT(164),
-  [133] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_module_repeat1, 2), SHIFT_REPEAT(393),
-  [136] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_module_repeat1, 2), SHIFT_REPEAT(75),
-  [139] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_module_repeat1, 2), SHIFT_REPEAT(394),
-  [142] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_module_repeat1, 2), SHIFT_REPEAT(201),
-  [145] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_module_repeat1, 2), SHIFT_REPEAT(231),
-  [148] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_module_repeat1, 2), SHIFT_REPEAT(181),
-  [151] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_module_repeat1, 2), SHIFT_REPEAT(1345),
-  [154] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_module_repeat1, 2), SHIFT_REPEAT(1346),
-  [157] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_module_repeat1, 2), SHIFT_REPEAT(1349),
-  [160] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_module_repeat1, 2), SHIFT_REPEAT(424),
-  [163] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_module_repeat1, 2), SHIFT_REPEAT(254),
-  [166] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_module_repeat1, 2), SHIFT_REPEAT(604),
-  [169] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_module_repeat1, 2), SHIFT_REPEAT(423),
-  [172] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_module_repeat1, 2), SHIFT_REPEAT(1495),
-  [175] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_module_repeat1, 2), SHIFT_REPEAT(298),
-  [178] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_module_repeat1, 2), SHIFT_REPEAT(70),
-  [181] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_module_repeat1, 2), SHIFT_REPEAT(719),
-  [184] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_module_repeat1, 2), SHIFT_REPEAT(159),
-  [187] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_module_repeat1, 2), SHIFT_REPEAT(166),
-  [190] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_module_repeat1, 2), SHIFT_REPEAT(406),
-  [193] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_module_repeat1, 2), SHIFT_REPEAT(1516),
-  [196] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_module_repeat1, 2), SHIFT_REPEAT(1510),
-  [199] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_module_repeat1, 2), SHIFT_REPEAT(1509),
-  [202] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_module_repeat1, 2), SHIFT_REPEAT(278),
-  [205] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_module_repeat1, 2), SHIFT_REPEAT(284),
-  [208] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_module_repeat1, 2), SHIFT_REPEAT(1498),
-  [211] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_module_repeat1, 2), SHIFT_REPEAT(417),
-  [214] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_module_repeat1, 2), SHIFT_REPEAT(419),
-  [217] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_module_repeat1, 2), SHIFT_REPEAT(890),
-  [220] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_module_repeat1, 2), SHIFT_REPEAT(180),
-  [223] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_module_repeat1, 2), SHIFT_REPEAT(797),
-  [226] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_module_repeat1, 2), SHIFT_REPEAT(797),
-  [229] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_module_repeat1, 2), SHIFT_REPEAT(131),
-  [232] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_module_repeat1, 2),
-  [234] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_module_repeat1, 2), SHIFT_REPEAT(952),
-  [237] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_module, 1),
-  [239] = {.entry = {.count = 1, .reusable = true}}, SHIFT(381),
-  [241] = {.entry = {.count = 1, .reusable = true}}, SHIFT(359),
-  [243] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_module_repeat1, 2), SHIFT_REPEAT(400),
-  [246] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_module_repeat1, 2), SHIFT_REPEAT(247),
-  [249] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_module_repeat1, 2), SHIFT_REPEAT(602),
-  [252] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_module_repeat1, 2), SHIFT_REPEAT(404),
-  [255] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_module_repeat1, 2), SHIFT_REPEAT(1512),
-  [258] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_module_repeat1, 2), SHIFT_REPEAT(296),
-  [261] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_module_repeat1, 2), SHIFT_REPEAT(71),
-  [264] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_module_repeat1, 2), SHIFT_REPEAT(1511),
-  [267] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_module_repeat1, 2), SHIFT_REPEAT(1508),
-  [270] = {.entry = {.count = 1, .reusable = true}}, SHIFT(288),
-  [272] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1324),
-  [274] = {.entry = {.count = 1, .reusable = false}}, SHIFT(674),
-  [276] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_primary_expression, 1, .production_id = 1),
-  [278] = {.entry = {.count = 1, .reusable = true}}, SHIFT(188),
-  [280] = {.entry = {.count = 2, .reusable = true}}, REDUCE(sym_pattern, 1, .production_id = 1), REDUCE(sym_primary_expression, 1, .production_id = 1),
-  [283] = {.entry = {.count = 1, .reusable = false}}, SHIFT(460),
-  [285] = {.entry = {.count = 1, .reusable = false}}, SHIFT(675),
-  [287] = {.entry = {.count = 1, .reusable = true}}, SHIFT(385),
-  [289] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_pattern, 1, .production_id = 1),
-  [291] = {.entry = {.count = 1, .reusable = false}}, SHIFT(726),
-  [293] = {.entry = {.count = 1, .reusable = true}}, SHIFT(190),
-  [295] = {.entry = {.count = 1, .reusable = true}}, SHIFT(169),
-  [297] = {.entry = {.count = 1, .reusable = false}}, SHIFT(406),
-  [299] = {.entry = {.count = 1, .reusable = false}}, SHIFT(470),
-  [301] = {.entry = {.count = 1, .reusable = true}}, SHIFT(726),
-  [303] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_primary_expression, 1, .production_id = 1),
-  [305] = {.entry = {.count = 1, .reusable = false}}, SHIFT(886),
-  [307] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_pattern, 1, .production_id = 1),
-  [309] = {.entry = {.count = 1, .reusable = true}}, SHIFT(642),
-  [311] = {.entry = {.count = 1, .reusable = false}}, SHIFT(642),
-  [313] = {.entry = {.count = 1, .reusable = false}}, SHIFT(148),
-  [315] = {.entry = {.count = 1, .reusable = true}}, SHIFT(944),
-  [317] = {.entry = {.count = 1, .reusable = false}}, SHIFT(334),
-  [319] = {.entry = {.count = 1, .reusable = true}}, SHIFT(550),
-  [321] = {.entry = {.count = 1, .reusable = true}}, SHIFT(30),
-  [323] = {.entry = {.count = 1, .reusable = true}}, SHIFT(432),
-  [325] = {.entry = {.count = 1, .reusable = true}}, SHIFT(34),
-  [327] = {.entry = {.count = 1, .reusable = true}}, SHIFT(327),
-  [329] = {.entry = {.count = 1, .reusable = true}}, SHIFT(32),
-  [331] = {.entry = {.count = 1, .reusable = false}}, SHIFT(754),
-  [333] = {.entry = {.count = 1, .reusable = false}}, SHIFT(755),
-  [335] = {.entry = {.count = 1, .reusable = false}}, SHIFT(453),
-  [337] = {.entry = {.count = 1, .reusable = false}}, SHIFT(150),
-  [339] = {.entry = {.count = 1, .reusable = true}}, SHIFT(340),
-  [341] = {.entry = {.count = 1, .reusable = true}}, SHIFT(50),
-  [343] = {.entry = {.count = 1, .reusable = true}}, SHIFT(530),
-  [345] = {.entry = {.count = 1, .reusable = true}}, SHIFT(14),
-  [347] = {.entry = {.count = 1, .reusable = true}}, SHIFT(521),
-  [349] = {.entry = {.count = 1, .reusable = true}}, SHIFT(57),
-  [351] = {.entry = {.count = 1, .reusable = true}}, SHIFT(548),
-  [353] = {.entry = {.count = 1, .reusable = true}}, SHIFT(8),
-  [355] = {.entry = {.count = 1, .reusable = true}}, SHIFT(325),
-  [357] = {.entry = {.count = 1, .reusable = true}}, SHIFT(31),
-  [359] = {.entry = {.count = 1, .reusable = true}}, SHIFT(535),
-  [361] = {.entry = {.count = 1, .reusable = true}}, SHIFT(24),
-  [363] = {.entry = {.count = 1, .reusable = true}}, SHIFT(508),
-  [365] = {.entry = {.count = 1, .reusable = true}}, SHIFT(15),
-  [367] = {.entry = {.count = 1, .reusable = true}}, SHIFT(377),
-  [369] = {.entry = {.count = 1, .reusable = true}}, SHIFT(22),
-  [371] = {.entry = {.count = 1, .reusable = true}}, SHIFT(524),
-  [373] = {.entry = {.count = 1, .reusable = true}}, SHIFT(49),
-  [375] = {.entry = {.count = 1, .reusable = true}}, SHIFT(316),
-  [377] = {.entry = {.count = 1, .reusable = true}}, SHIFT(23),
-  [379] = {.entry = {.count = 1, .reusable = true}}, SHIFT(532),
-  [381] = {.entry = {.count = 1, .reusable = true}}, SHIFT(17),
-  [383] = {.entry = {.count = 1, .reusable = true}}, SHIFT(547),
-  [385] = {.entry = {.count = 1, .reusable = true}}, SHIFT(28),
-  [387] = {.entry = {.count = 1, .reusable = true}}, SHIFT(401),
-  [389] = {.entry = {.count = 1, .reusable = true}}, SHIFT(16),
-  [391] = {.entry = {.count = 1, .reusable = true}}, SHIFT(502),
-  [393] = {.entry = {.count = 1, .reusable = true}}, SHIFT(3),
-  [395] = {.entry = {.count = 1, .reusable = true}}, SHIFT(526),
-  [397] = {.entry = {.count = 1, .reusable = true}}, SHIFT(58),
-  [399] = {.entry = {.count = 1, .reusable = true}}, SHIFT(527),
-  [401] = {.entry = {.count = 1, .reusable = true}}, SHIFT(53),
-  [403] = {.entry = {.count = 1, .reusable = true}}, SHIFT(531),
-  [405] = {.entry = {.count = 1, .reusable = true}}, SHIFT(52),
-  [407] = {.entry = {.count = 1, .reusable = true}}, SHIFT(268),
-  [409] = {.entry = {.count = 1, .reusable = true}}, SHIFT(11),
-  [411] = {.entry = {.count = 1, .reusable = true}}, SHIFT(538),
-  [413] = {.entry = {.count = 1, .reusable = true}}, SHIFT(19),
-  [415] = {.entry = {.count = 1, .reusable = true}}, SHIFT(594),
-  [417] = {.entry = {.count = 1, .reusable = true}}, SHIFT(41),
-  [419] = {.entry = {.count = 1, .reusable = true}}, SHIFT(965),
-  [421] = {.entry = {.count = 1, .reusable = true}}, SHIFT(55),
-  [423] = {.entry = {.count = 1, .reusable = true}}, SHIFT(464),
-  [425] = {.entry = {.count = 1, .reusable = true}}, SHIFT(39),
-  [427] = {.entry = {.count = 1, .reusable = true}}, SHIFT(353),
-  [429] = {.entry = {.count = 1, .reusable = true}}, SHIFT(2),
-  [431] = {.entry = {.count = 1, .reusable = true}}, SHIFT(542),
-  [433] = {.entry = {.count = 1, .reusable = true}}, SHIFT(26),
-  [435] = {.entry = {.count = 1, .reusable = true}}, SHIFT(331),
-  [437] = {.entry = {.count = 1, .reusable = true}}, SHIFT(42),
-  [439] = {.entry = {.count = 1, .reusable = true}}, SHIFT(592),
-  [441] = {.entry = {.count = 1, .reusable = true}}, SHIFT(38),
-  [443] = {.entry = {.count = 1, .reusable = true}}, SHIFT(492),
-  [445] = {.entry = {.count = 1, .reusable = true}}, SHIFT(13),
-  [447] = {.entry = {.count = 1, .reusable = true}}, SHIFT(332),
-  [449] = {.entry = {.count = 1, .reusable = true}}, SHIFT(25),
-  [451] = {.entry = {.count = 1, .reusable = true}}, SHIFT(544),
-  [453] = {.entry = {.count = 1, .reusable = true}}, SHIFT(59),
-  [455] = {.entry = {.count = 1, .reusable = true}}, SHIFT(582),
-  [457] = {.entry = {.count = 1, .reusable = true}}, SHIFT(37),
-  [459] = {.entry = {.count = 1, .reusable = true}}, SHIFT(493),
-  [461] = {.entry = {.count = 1, .reusable = true}}, SHIFT(18),
-  [463] = {.entry = {.count = 1, .reusable = true}}, SHIFT(563),
-  [465] = {.entry = {.count = 1, .reusable = true}}, SHIFT(43),
-  [467] = {.entry = {.count = 1, .reusable = true}}, SHIFT(580),
-  [469] = {.entry = {.count = 1, .reusable = true}}, SHIFT(36),
-  [471] = {.entry = {.count = 1, .reusable = true}}, SHIFT(991),
-  [473] = {.entry = {.count = 1, .reusable = true}}, SHIFT(54),
-  [475] = {.entry = {.count = 1, .reusable = true}}, SHIFT(478),
-  [477] = {.entry = {.count = 1, .reusable = true}}, SHIFT(21),
-  [479] = {.entry = {.count = 1, .reusable = true}}, SHIFT(272),
-  [481] = {.entry = {.count = 1, .reusable = true}}, SHIFT(56),
-  [483] = {.entry = {.count = 1, .reusable = true}}, SHIFT(490),
-  [485] = {.entry = {.count = 1, .reusable = true}}, SHIFT(27),
-  [487] = {.entry = {.count = 1, .reusable = true}}, SHIFT(589),
-  [489] = {.entry = {.count = 1, .reusable = true}}, SHIFT(20),
-  [491] = {.entry = {.count = 1, .reusable = true}}, SHIFT(388),
-  [493] = {.entry = {.count = 1, .reusable = true}}, SHIFT(51),
-  [495] = {.entry = {.count = 1, .reusable = true}}, SHIFT(572),
-  [497] = {.entry = {.count = 1, .reusable = true}}, SHIFT(44),
-  [499] = {.entry = {.count = 1, .reusable = true}}, SHIFT(485),
-  [501] = {.entry = {.count = 1, .reusable = true}}, SHIFT(35),
-  [503] = {.entry = {.count = 1, .reusable = true}}, SHIFT(501),
-  [505] = {.entry = {.count = 1, .reusable = true}}, SHIFT(10),
-  [507] = {.entry = {.count = 1, .reusable = true}}, SHIFT(430),
-  [509] = {.entry = {.count = 1, .reusable = true}}, SHIFT(47),
-  [511] = {.entry = {.count = 1, .reusable = true}}, SHIFT(497),
-  [513] = {.entry = {.count = 1, .reusable = true}}, SHIFT(40),
-  [515] = {.entry = {.count = 1, .reusable = true}}, SHIFT(553),
-  [517] = {.entry = {.count = 1, .reusable = true}}, SHIFT(33),
-  [519] = {.entry = {.count = 1, .reusable = true}}, SHIFT(486),
-  [521] = {.entry = {.count = 1, .reusable = true}}, SHIFT(48),
-  [523] = {.entry = {.count = 1, .reusable = true}}, SHIFT(571),
-  [525] = {.entry = {.count = 1, .reusable = true}}, SHIFT(4),
-  [527] = {.entry = {.count = 1, .reusable = true}}, SHIFT(578),
-  [529] = {.entry = {.count = 1, .reusable = true}}, SHIFT(29),
-  [531] = {.entry = {.count = 1, .reusable = true}}, SHIFT(472),
-  [533] = {.entry = {.count = 1, .reusable = true}}, SHIFT(46),
-  [535] = {.entry = {.count = 1, .reusable = true}}, SHIFT(317),
-  [537] = {.entry = {.count = 1, .reusable = true}}, SHIFT(6),
-  [539] = {.entry = {.count = 1, .reusable = true}}, SHIFT(384),
-  [541] = {.entry = {.count = 1, .reusable = true}}, SHIFT(9),
-  [543] = {.entry = {.count = 1, .reusable = true}}, SHIFT(552),
-  [545] = {.entry = {.count = 1, .reusable = true}}, SHIFT(45),
-  [547] = {.entry = {.count = 1, .reusable = true}}, SHIFT(487),
-  [549] = {.entry = {.count = 1, .reusable = true}}, SHIFT(12),
-  [551] = {.entry = {.count = 1, .reusable = true}}, SHIFT(558),
-  [553] = {.entry = {.count = 1, .reusable = true}}, SHIFT(5),
-  [555] = {.entry = {.count = 1, .reusable = true}}, SHIFT(421),
-  [557] = {.entry = {.count = 1, .reusable = true}}, SHIFT(7),
-  [559] = {.entry = {.count = 1, .reusable = true}}, SHIFT(193),
-  [561] = {.entry = {.count = 1, .reusable = false}}, SHIFT(719),
-  [563] = {.entry = {.count = 1, .reusable = true}}, SHIFT(191),
-  [565] = {.entry = {.count = 2, .reusable = true}}, REDUCE(sym_primary_expression, 1, .production_id = 1), REDUCE(sym_list_splat_pattern, 2, .production_id = 8),
-  [568] = {.entry = {.count = 1, .reusable = true}}, SHIFT(456),
-  [570] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_list_splat_pattern, 2, .production_id = 8),
-  [572] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_list_splat_pattern, 2, .production_id = 8),
-  [574] = {.entry = {.count = 1, .reusable = true}}, SHIFT(375),
-  [576] = {.entry = {.count = 1, .reusable = true}}, SHIFT(378),
-  [578] = {.entry = {.count = 1, .reusable = true}}, SHIFT(371),
-  [580] = {.entry = {.count = 1, .reusable = true}}, SHIFT(379),
-  [582] = {.entry = {.count = 1, .reusable = true}}, SHIFT(367),
-  [584] = {.entry = {.count = 1, .reusable = true}}, SHIFT(287),
-  [586] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1304),
-  [588] = {.entry = {.count = 1, .reusable = true}}, SHIFT(311),
-  [590] = {.entry = {.count = 1, .reusable = true}}, SHIFT(315),
-  [592] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1217),
-  [594] = {.entry = {.count = 1, .reusable = true}}, SHIFT(382),
-  [596] = {.entry = {.count = 1, .reusable = true}}, SHIFT(282),
-  [598] = {.entry = {.count = 1, .reusable = true}}, SHIFT(374),
-  [600] = {.entry = {.count = 1, .reusable = true}}, SHIFT(355),
-  [602] = {.entry = {.count = 1, .reusable = false}}, SHIFT(667),
-  [604] = {.entry = {.count = 1, .reusable = true}}, SHIFT(204),
-  [606] = {.entry = {.count = 1, .reusable = false}}, SHIFT(668),
-  [608] = {.entry = {.count = 1, .reusable = true}}, SHIFT(439),
-  [610] = {.entry = {.count = 1, .reusable = true}}, SHIFT(709),
-  [612] = {.entry = {.count = 1, .reusable = true}}, SHIFT(187),
-  [614] = {.entry = {.count = 1, .reusable = false}}, SHIFT(391),
-  [616] = {.entry = {.count = 1, .reusable = false}}, SHIFT(885),
-  [618] = {.entry = {.count = 1, .reusable = false}}, SHIFT(149),
-  [620] = {.entry = {.count = 1, .reusable = false}}, SHIFT(450),
-  [622] = {.entry = {.count = 1, .reusable = false}}, SHIFT(798),
-  [624] = {.entry = {.count = 1, .reusable = true}}, SHIFT(212),
-  [626] = {.entry = {.count = 1, .reusable = false}}, SHIFT(801),
-  [628] = {.entry = {.count = 1, .reusable = true}}, SHIFT(443),
-  [630] = {.entry = {.count = 1, .reusable = true}}, SHIFT(683),
-  [632] = {.entry = {.count = 1, .reusable = true}}, SHIFT(217),
-  [634] = {.entry = {.count = 1, .reusable = true}}, SHIFT(170),
-  [636] = {.entry = {.count = 1, .reusable = false}}, SHIFT(445),
-  [638] = {.entry = {.count = 1, .reusable = false}}, SHIFT(888),
-  [640] = {.entry = {.count = 1, .reusable = true}}, SHIFT(811),
-  [642] = {.entry = {.count = 1, .reusable = false}}, SHIFT(811),
-  [644] = {.entry = {.count = 1, .reusable = false}}, SHIFT(153),
-  [646] = {.entry = {.count = 1, .reusable = true}}, SHIFT(934),
-  [648] = {.entry = {.count = 1, .reusable = false}}, SHIFT(447),
-  [650] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_yield, 1),
-  [652] = {.entry = {.count = 1, .reusable = false}}, SHIFT(749),
-  [654] = {.entry = {.count = 1, .reusable = true}}, SHIFT(163),
-  [656] = {.entry = {.count = 1, .reusable = true}}, SHIFT(393),
-  [658] = {.entry = {.count = 1, .reusable = false}}, SHIFT(764),
-  [660] = {.entry = {.count = 1, .reusable = true}}, SHIFT(161),
-  [662] = {.entry = {.count = 1, .reusable = true}}, SHIFT(475),
-  [664] = {.entry = {.count = 1, .reusable = false}}, SHIFT(158),
-  [666] = {.entry = {.count = 1, .reusable = false}}, SHIFT(152),
-  [668] = {.entry = {.count = 1, .reusable = true}}, SHIFT(765),
-  [670] = {.entry = {.count = 1, .reusable = true}}, SHIFT(779),
-  [672] = {.entry = {.count = 1, .reusable = true}}, SHIFT(768),
-  [674] = {.entry = {.count = 1, .reusable = true}}, SHIFT(789),
-  [676] = {.entry = {.count = 1, .reusable = true}}, SHIFT(441),
-  [678] = {.entry = {.count = 1, .reusable = false}}, SHIFT(770),
-  [680] = {.entry = {.count = 1, .reusable = true}}, SHIFT(162),
-  [682] = {.entry = {.count = 1, .reusable = false}}, SHIFT(685),
-  [684] = {.entry = {.count = 1, .reusable = false}}, SHIFT(748),
-  [686] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_pattern_list, 2, .production_id = 7),
-  [688] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_pattern_list, 2, .production_id = 7),
-  [690] = {.entry = {.count = 1, .reusable = true}}, SHIFT(160),
-  [692] = {.entry = {.count = 1, .reusable = true}}, SHIFT(200),
-  [694] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1504),
-  [696] = {.entry = {.count = 1, .reusable = true}}, SHIFT(803),
-  [698] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_expression_list, 2, .production_id = 7),
-  [700] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_expression_list, 3, .production_id = 16),
-  [702] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1462),
-  [704] = {.entry = {.count = 1, .reusable = true}}, SHIFT(619),
-  [706] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1469),
-  [708] = {.entry = {.count = 1, .reusable = true}}, SHIFT(846),
-  [710] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_pattern_list, 3, .production_id = 16),
-  [712] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_pattern_list, 3, .production_id = 16),
-  [714] = {.entry = {.count = 1, .reusable = true}}, SHIFT(671),
-  [716] = {.entry = {.count = 1, .reusable = true}}, SHIFT(460),
-  [718] = {.entry = {.count = 1, .reusable = true}}, SHIFT(211),
-  [720] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__collection_elements, 3, .production_id = 50),
-  [722] = {.entry = {.count = 1, .reusable = false}}, SHIFT(812),
-  [724] = {.entry = {.count = 1, .reusable = true}}, SHIFT(631),
-  [726] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1432),
-  [728] = {.entry = {.count = 1, .reusable = false}}, SHIFT(837),
-  [730] = {.entry = {.count = 1, .reusable = false}}, SHIFT(154),
-  [732] = {.entry = {.count = 1, .reusable = false}}, SHIFT(759),
-  [734] = {.entry = {.count = 1, .reusable = false}}, SHIFT(760),
-  [736] = {.entry = {.count = 1, .reusable = false}}, SHIFT(151),
-  [738] = {.entry = {.count = 1, .reusable = true}}, SHIFT(788),
-  [740] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1447),
-  [742] = {.entry = {.count = 1, .reusable = false}}, SHIFT(425),
-  [744] = {.entry = {.count = 1, .reusable = false}}, SHIFT(466),
-  [746] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_raise_statement, 1),
-  [748] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__collection_elements, 2, .production_id = 24),
-  [750] = {.entry = {.count = 1, .reusable = true}}, SHIFT(833),
-  [752] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1414),
-  [754] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_for_in_clause, 7, .production_id = 140),
-  [756] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_for_in_clause, 7, .production_id = 140),
-  [758] = {.entry = {.count = 1, .reusable = false}}, SHIFT(887),
-  [760] = {.entry = {.count = 1, .reusable = true}}, SHIFT(828),
-  [762] = {.entry = {.count = 1, .reusable = true}}, SHIFT(725),
-  [764] = {.entry = {.count = 1, .reusable = true}}, SHIFT(778),
-  [766] = {.entry = {.count = 1, .reusable = true}}, SHIFT(672),
-  [768] = {.entry = {.count = 1, .reusable = true}}, SHIFT(787),
-  [770] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_for_in_clause, 6, .production_id = 122),
-  [772] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_for_in_clause, 6, .production_id = 122),
-  [774] = {.entry = {.count = 1, .reusable = true}}, SHIFT(786),
-  [776] = {.entry = {.count = 1, .reusable = true}}, SHIFT(783),
-  [778] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_expression_list, 3, .production_id = 16),
-  [780] = {.entry = {.count = 1, .reusable = false}}, SHIFT(442),
-  [782] = {.entry = {.count = 1, .reusable = true}}, SHIFT(469),
-  [784] = {.entry = {.count = 1, .reusable = true}}, SHIFT(825),
-  [786] = {.entry = {.count = 1, .reusable = true}}, SHIFT(843),
-  [788] = {.entry = {.count = 1, .reusable = true}}, SHIFT(841),
-  [790] = {.entry = {.count = 1, .reusable = true}}, SHIFT(838),
-  [792] = {.entry = {.count = 1, .reusable = true}}, SHIFT(727),
-  [794] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_return_statement, 1),
-  [796] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_for_in_clause, 6, .production_id = 121),
-  [798] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_for_in_clause, 6, .production_id = 121),
-  [800] = {.entry = {.count = 1, .reusable = true}}, SHIFT(629),
-  [802] = {.entry = {.count = 1, .reusable = true}}, SHIFT(615),
-  [804] = {.entry = {.count = 1, .reusable = true}}, SHIFT(617),
-  [806] = {.entry = {.count = 1, .reusable = true}}, SHIFT(638),
-  [808] = {.entry = {.count = 1, .reusable = true}}, SHIFT(639),
-  [810] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_expression_list, 2, .production_id = 7),
-  [812] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_for_in_clause, 5, .production_id = 100),
-  [814] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_for_in_clause, 5, .production_id = 100),
-  [816] = {.entry = {.count = 1, .reusable = true}}, SHIFT(805),
-  [818] = {.entry = {.count = 1, .reusable = true}}, SHIFT(772),
-  [820] = {.entry = {.count = 1, .reusable = true}}, SHIFT(781),
-  [822] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_subscript, 6, .production_id = 96),
-  [824] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_subscript, 6, .production_id = 96),
-  [826] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_subscript, 4, .production_id = 70),
-  [828] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_subscript, 4, .production_id = 70),
-  [830] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_subscript, 5, .production_id = 96),
-  [832] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_subscript, 5, .production_id = 96),
-  [834] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_subscript, 5, .production_id = 70),
-  [836] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_subscript, 5, .production_id = 70),
-  [838] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_attribute, 3, .production_id = 40),
-  [840] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_attribute, 3, .production_id = 40),
-  [842] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_try_statement, 4, .production_id = 56),
-  [844] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_try_statement, 4, .production_id = 56),
-  [846] = {.entry = {.count = 1, .reusable = false}}, SHIFT(1506),
-  [848] = {.entry = {.count = 1, .reusable = false}}, SHIFT(383),
-  [850] = {.entry = {.count = 1, .reusable = false}}, SHIFT(1435),
-  [852] = {.entry = {.count = 1, .reusable = false}}, SHIFT(1471),
-  [854] = {.entry = {.count = 1, .reusable = true}}, SHIFT(416),
-  [856] = {.entry = {.count = 1, .reusable = false}}, SHIFT(1468),
-  [858] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_try_statement, 5, .production_id = 81),
-  [860] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_try_statement, 5, .production_id = 81),
-  [862] = {.entry = {.count = 1, .reusable = false}}, SHIFT(335),
-  [864] = {.entry = {.count = 1, .reusable = true}}, SHIFT(402),
-  [866] = {.entry = {.count = 1, .reusable = true}}, SHIFT(614),
-  [868] = {.entry = {.count = 1, .reusable = true}}, SHIFT(823),
-  [870] = {.entry = {.count = 1, .reusable = true}}, SHIFT(826),
-  [872] = {.entry = {.count = 1, .reusable = true}}, SHIFT(605),
-  [874] = {.entry = {.count = 1, .reusable = true}}, SHIFT(283),
-  [876] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1514),
-  [878] = {.entry = {.count = 1, .reusable = true}}, SHIFT(807),
-  [880] = {.entry = {.count = 1, .reusable = true}}, SHIFT(616),
-  [882] = {.entry = {.count = 1, .reusable = true}}, SHIFT(824),
-  [884] = {.entry = {.count = 1, .reusable = true}}, SHIFT(800),
-  [886] = {.entry = {.count = 1, .reusable = true}}, SHIFT(641),
-  [888] = {.entry = {.count = 1, .reusable = true}}, SHIFT(808),
-  [890] = {.entry = {.count = 1, .reusable = true}}, SHIFT(603),
-  [892] = {.entry = {.count = 1, .reusable = true}}, SHIFT(292),
-  [894] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1517),
-  [896] = {.entry = {.count = 1, .reusable = true}}, SHIFT(264),
-  [898] = {.entry = {.count = 1, .reusable = true}}, SHIFT(226),
-  [900] = {.entry = {.count = 1, .reusable = true}}, SHIFT(218),
-  [902] = {.entry = {.count = 1, .reusable = true}}, SHIFT(845),
-  [904] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_if_statement, 6, .production_id = 104),
-  [906] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_if_statement, 6, .production_id = 104),
-  [908] = {.entry = {.count = 1, .reusable = false}}, SHIFT(412),
-  [910] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_slice, 2, .production_id = 69),
-  [912] = {.entry = {.count = 1, .reusable = true}}, SHIFT(293),
-  [914] = {.entry = {.count = 1, .reusable = true}}, SHIFT(844),
-  [916] = {.entry = {.count = 1, .reusable = true}}, SHIFT(834),
-  [918] = {.entry = {.count = 1, .reusable = true}}, SHIFT(344),
-  [920] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_if_statement, 5, .production_id = 76),
-  [922] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_if_statement, 5, .production_id = 76),
-  [924] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_slice, 1),
-  [926] = {.entry = {.count = 1, .reusable = true}}, SHIFT(306),
-  [928] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_if_statement, 5, .production_id = 77),
-  [930] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_if_statement, 5, .production_id = 77),
-  [932] = {.entry = {.count = 1, .reusable = false}}, REDUCE(aux_sym_try_statement_repeat1, 2),
-  [934] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_try_statement_repeat1, 2),
-  [936] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_try_statement_repeat1, 2), SHIFT_REPEAT(335),
-  [939] = {.entry = {.count = 1, .reusable = false}}, REDUCE(aux_sym_try_statement_repeat2, 2),
-  [941] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_try_statement_repeat2, 2),
-  [943] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_try_statement_repeat2, 2), SHIFT_REPEAT(416),
-  [946] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_if_statement, 4, .production_id = 54),
-  [948] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_if_statement, 4, .production_id = 54),
-  [950] = {.entry = {.count = 1, .reusable = false}}, SHIFT(484),
-  [952] = {.entry = {.count = 1, .reusable = true}}, SHIFT(223),
-  [954] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_try_statement_repeat2, 2), SHIFT_REPEAT(402),
-  [957] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_try_statement_repeat1, 2), SHIFT_REPEAT(383),
-  [960] = {.entry = {.count = 1, .reusable = true}}, SHIFT(337),
-  [962] = {.entry = {.count = 1, .reusable = true}}, SHIFT(336),
-  [964] = {.entry = {.count = 1, .reusable = true}}, SHIFT(950),
-  [966] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_block, 1),
-  [968] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_block, 1),
-  [970] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__simple_statements, 4),
-  [972] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym__simple_statements, 4),
-  [974] = {.entry = {.count = 1, .reusable = true}}, SHIFT(173),
-  [976] = {.entry = {.count = 1, .reusable = false}}, SHIFT(1336),
-  [978] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_if_statement_repeat1, 2, .production_id = 102),
-  [980] = {.entry = {.count = 1, .reusable = false}}, REDUCE(aux_sym_if_statement_repeat1, 2, .production_id = 102),
-  [982] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_if_statement_repeat1, 2, .production_id = 102), SHIFT_REPEAT(484),
-  [985] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__simple_statements, 3),
-  [987] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym__simple_statements, 3),
-  [989] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_block, 2),
-  [991] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_block, 2),
-  [993] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_slice, 4, .production_id = 95),
-  [995] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1423),
-  [997] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_slice, 3, .production_id = 69),
-  [999] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_slice, 3, .production_id = 68),
-  [1001] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_print_statement, 3),
-  [1003] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_print_statement, 3, .production_id = 10),
-  [1005] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1487),
-  [1007] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_print_statement, 4, .production_id = 29),
-  [1009] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_print_statement, 4, .production_id = 28),
-  [1011] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_slice, 2),
-  [1013] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_if_statement_repeat1, 2, .production_id = 102), SHIFT_REPEAT(412),
-  [1016] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym__simple_statements, 2),
-  [1018] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__simple_statements, 2),
-  [1020] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_except_group_clause, 6, .production_id = 155),
-  [1022] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_except_group_clause, 6, .production_id = 155),
-  [1024] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_except_clause, 4, .production_id = 129),
-  [1026] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_except_clause, 4, .production_id = 129),
-  [1028] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_except_group_clause, 5, .production_id = 146),
-  [1030] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_except_group_clause, 5, .production_id = 146),
-  [1032] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_except_clause, 5, .production_id = 146),
-  [1034] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_except_clause, 5, .production_id = 146),
-  [1036] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_except_clause, 6, .production_id = 155),
-  [1038] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_except_clause, 6, .production_id = 155),
-  [1040] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_except_clause, 7, .production_id = 160),
-  [1042] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_except_clause, 7, .production_id = 160),
-  [1044] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_except_group_clause, 7, .production_id = 160),
-  [1046] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_except_group_clause, 7, .production_id = 160),
-  [1048] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_primary_expression, 1),
-  [1050] = {.entry = {.count = 2, .reusable = true}}, REDUCE(sym_pattern, 1), REDUCE(sym_primary_expression, 1),
-  [1053] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_primary_expression, 1),
-  [1055] = {.entry = {.count = 1, .reusable = true}}, SHIFT(422),
-  [1057] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_pattern, 1),
-  [1059] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_pattern, 1),
-  [1061] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_except_group_clause, 4, .production_id = 129),
-  [1063] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_except_group_clause, 4, .production_id = 129),
-  [1065] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_except_clause, 4, .production_id = 81),
-  [1067] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_except_clause, 4, .production_id = 81),
-  [1069] = {.entry = {.count = 1, .reusable = true}}, SHIFT(98),
-  [1071] = {.entry = {.count = 2, .reusable = true}}, REDUCE(sym_primary_expression, 1), REDUCE(sym_list_splat_pattern, 2, .production_id = 9),
-  [1074] = {.entry = {.count = 1, .reusable = true}}, SHIFT(476),
-  [1076] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_list_splat_pattern, 2, .production_id = 9),
-  [1078] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_list_splat_pattern, 2, .production_id = 9),
-  [1080] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_except_clause, 3, .production_id = 56),
-  [1082] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_except_clause, 3, .production_id = 56),
-  [1084] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_cases, 1),
-  [1086] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_cases, 1),
-  [1088] = {.entry = {.count = 1, .reusable = false}}, SHIFT(852),
-  [1090] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_cases_repeat1, 2),
-  [1092] = {.entry = {.count = 1, .reusable = false}}, REDUCE(aux_sym_cases_repeat1, 2),
-  [1094] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_cases_repeat1, 2), SHIFT_REPEAT(849),
-  [1097] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_cases_repeat1, 2), SHIFT_REPEAT(852),
-  [1100] = {.entry = {.count = 1, .reusable = false}}, SHIFT(849),
-  [1102] = {.entry = {.count = 1, .reusable = true}}, SHIFT(76),
-  [1104] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_for_statement, 8, .production_id = 142),
-  [1106] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_for_statement, 8, .production_id = 142),
-  [1108] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_elif_clause, 4, .production_id = 54),
-  [1110] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_elif_clause, 4, .production_id = 54),
-  [1112] = {.entry = {.count = 1, .reusable = false}}, SHIFT(339),
-  [1114] = {.entry = {.count = 1, .reusable = false}}, SHIFT(338),
-  [1116] = {.entry = {.count = 1, .reusable = false}}, SHIFT(132),
-  [1118] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_while_statement, 4, .production_id = 55),
-  [1120] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_while_statement, 4, .production_id = 55),
-  [1122] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_elif_clause, 5, .production_id = 77),
-  [1124] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_elif_clause, 5, .production_id = 77),
-  [1126] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_while_statement, 5, .production_id = 80),
-  [1128] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_while_statement, 5, .production_id = 80),
-  [1130] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_try_statement, 5, .production_id = 56),
-  [1132] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_try_statement, 5, .production_id = 56),
-  [1134] = {.entry = {.count = 1, .reusable = false}}, REDUCE(aux_sym_if_statement_repeat1, 1, .production_id = 74),
-  [1136] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_if_statement_repeat1, 1, .production_id = 74),
-  [1138] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_for_statement, 7, .production_id = 128),
-  [1140] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_for_statement, 7, .production_id = 128),
-  [1142] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_for_statement, 7, .production_id = 124),
-  [1144] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_for_statement, 7, .production_id = 124),
-  [1146] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_tuple, 2),
-  [1148] = {.entry = {.count = 2, .reusable = true}}, REDUCE(sym_tuple_pattern, 2), REDUCE(sym_tuple, 2),
-  [1151] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_tuple, 2),
-  [1153] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_tuple_pattern, 2),
-  [1155] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_tuple_pattern, 2),
-  [1157] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_try_statement, 6, .production_id = 81),
-  [1159] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_try_statement, 6, .production_id = 81),
-  [1161] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_for_statement, 6, .production_id = 107),
-  [1163] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_for_statement, 6, .production_id = 107),
-  [1165] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_list, 2),
-  [1167] = {.entry = {.count = 2, .reusable = true}}, REDUCE(sym_list_pattern, 2), REDUCE(sym_list, 2),
-  [1170] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_list, 2),
-  [1172] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_list_pattern, 2),
-  [1174] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_list_pattern, 2),
-  [1176] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_else_clause, 3, .production_id = 56),
-  [1178] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_else_clause, 3, .production_id = 56),
-  [1180] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_case_block, 4, .production_id = 133),
-  [1182] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_case_block, 4, .production_id = 133),
-  [1184] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_case_block, 6, .production_id = 156),
-  [1186] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_case_block, 6, .production_id = 156),
-  [1188] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_else_clause, 4, .production_id = 81),
-  [1190] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_else_clause, 4, .production_id = 81),
-  [1192] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_case_block, 5, .production_id = 148),
-  [1194] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_case_block, 5, .production_id = 148),
-  [1196] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_case_block, 5, .production_id = 149),
-  [1198] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_case_block, 5, .production_id = 149),
-  [1200] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_class_definition, 6, .production_id = 116),
-  [1202] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_class_definition, 6, .production_id = 116),
-  [1204] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_class_definition, 7, .production_id = 138),
-  [1206] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_class_definition, 7, .production_id = 138),
-  [1208] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_decorated_definition, 2, .production_id = 19),
-  [1210] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_decorated_definition, 2, .production_id = 19),
-  [1212] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_while_statement, 5, .production_id = 79),
-  [1214] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_while_statement, 5, .production_id = 79),
-  [1216] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_function_definition, 8, .production_id = 143),
-  [1218] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_function_definition, 8, .production_id = 143),
-  [1220] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_function_definition, 5, .production_id = 86),
-  [1222] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_function_definition, 5, .production_id = 86),
-  [1224] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_for_statement, 8, .production_id = 141),
-  [1226] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_for_statement, 8, .production_id = 141),
-  [1228] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_function_definition, 10, .production_id = 159),
-  [1230] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_function_definition, 10, .production_id = 159),
-  [1232] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_function_definition, 9, .production_id = 158),
-  [1234] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_function_definition, 9, .production_id = 158),
-  [1236] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_function_definition, 9, .production_id = 154),
-  [1238] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_function_definition, 9, .production_id = 154),
-  [1240] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_function_definition, 9, .production_id = 153),
-  [1242] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_function_definition, 9, .production_id = 153),
-  [1244] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_for_statement, 9, .production_id = 152),
-  [1246] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_for_statement, 9, .production_id = 152),
-  [1248] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_for_statement, 8, .production_id = 145),
-  [1250] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_for_statement, 8, .production_id = 145),
-  [1252] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_with_statement, 5, .production_id = 82),
-  [1254] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_with_statement, 5, .production_id = 82),
-  [1256] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_with_statement, 6, .production_id = 105),
-  [1258] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_with_statement, 6, .production_id = 105),
-  [1260] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_try_statement, 6, .production_id = 56),
-  [1262] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_try_statement, 6, .production_id = 56),
-  [1264] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_while_statement, 6, .production_id = 108),
-  [1266] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_while_statement, 6, .production_id = 108),
-  [1268] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_finally_clause, 3, .production_id = 56),
-  [1270] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_finally_clause, 3, .production_id = 56),
-  [1272] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_if_statement, 6, .production_id = 103),
-  [1274] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_if_statement, 6, .production_id = 103),
-  [1276] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_with_statement, 5, .production_id = 78),
-  [1278] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_with_statement, 5, .production_id = 78),
-  [1280] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_class_definition, 5, .production_id = 89),
-  [1282] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_class_definition, 5, .production_id = 89),
-  [1284] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_function_definition, 7, .production_id = 137),
-  [1286] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_function_definition, 7, .production_id = 137),
-  [1288] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_if_statement, 5, .production_id = 75),
-  [1290] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_if_statement, 5, .production_id = 75),
-  [1292] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_function_definition, 8, .production_id = 151),
-  [1294] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_function_definition, 8, .production_id = 151),
-  [1296] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_class_definition, 5, .production_id = 90),
-  [1298] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_class_definition, 5, .production_id = 90),
-  [1300] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_function_definition, 7, .production_id = 136),
-  [1302] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_function_definition, 7, .production_id = 136),
-  [1304] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_function_definition, 8, .production_id = 144),
-  [1306] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_function_definition, 8, .production_id = 144),
-  [1308] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_function_definition, 8, .production_id = 150),
-  [1310] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_function_definition, 8, .production_id = 150),
-  [1312] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_with_statement, 4, .production_id = 57),
-  [1314] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_with_statement, 4, .production_id = 57),
-  [1316] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_match_statement, 4, .production_id = 59),
-  [1318] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_match_statement, 4, .production_id = 59),
-  [1320] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_match_statement, 4, .production_id = 60),
-  [1322] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_match_statement, 4, .production_id = 60),
-  [1324] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_class_definition, 4, .production_id = 64),
-  [1326] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_class_definition, 4, .production_id = 64),
-  [1328] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_class_definition, 5, .production_id = 88),
-  [1330] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_class_definition, 5, .production_id = 88),
-  [1332] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_function_definition, 6, .production_id = 106),
-  [1334] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_function_definition, 6, .production_id = 106),
-  [1336] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_try_statement, 7, .production_id = 81),
-  [1338] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_try_statement, 7, .production_id = 81),
+  [53] = {.entry = {.count = 1, .reusable = true}}, SHIFT(408),
+  [55] = {.entry = {.count = 1, .reusable = false}}, SHIFT(1492),
+  [57] = {.entry = {.count = 1, .reusable = false}}, SHIFT(1490),
+  [59] = {.entry = {.count = 1, .reusable = false}}, SHIFT(1489),
+  [61] = {.entry = {.count = 1, .reusable = false}}, SHIFT(271),
+  [63] = {.entry = {.count = 1, .reusable = false}}, SHIFT(322),
+  [65] = {.entry = {.count = 1, .reusable = false}}, SHIFT(1488),
+  [67] = {.entry = {.count = 1, .reusable = true}}, SHIFT(384),
+  [69] = {.entry = {.count = 1, .reusable = false}}, SHIFT(383),
+  [71] = {.entry = {.count = 1, .reusable = false}}, SHIFT(867),
+  [73] = {.entry = {.count = 1, .reusable = false}}, SHIFT(177),
+  [75] = {.entry = {.count = 1, .reusable = true}}, SHIFT(759),
+  [77] = {.entry = {.count = 1, .reusable = false}}, SHIFT(759),
+  [79] = {.entry = {.count = 1, .reusable = false}}, SHIFT(135),
+  [81] = {.entry = {.count = 1, .reusable = true}}, SHIFT(916),
+  [83] = {.entry = {.count = 1, .reusable = false}}, SHIFT(457),
+  [85] = {.entry = {.count = 1, .reusable = false}}, SHIFT(250),
+  [87] = {.entry = {.count = 1, .reusable = false}}, SHIFT(579),
+  [89] = {.entry = {.count = 1, .reusable = false}}, SHIFT(429),
+  [91] = {.entry = {.count = 1, .reusable = false}}, SHIFT(1475),
+  [93] = {.entry = {.count = 1, .reusable = false}}, SHIFT(320),
+  [95] = {.entry = {.count = 1, .reusable = false}}, SHIFT(66),
+  [97] = {.entry = {.count = 1, .reusable = false}}, SHIFT(1497),
+  [99] = {.entry = {.count = 1, .reusable = false}}, SHIFT(1478),
+  [101] = {.entry = {.count = 1, .reusable = true}}, SHIFT(292),
+  [103] = {.entry = {.count = 1, .reusable = true}}, SHIFT(263),
+  [105] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1338),
+  [107] = {.entry = {.count = 1, .reusable = true}}, SHIFT(264),
+  [109] = {.entry = {.count = 1, .reusable = true}}, SHIFT(293),
+  [111] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_module, 1),
+  [113] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_module_repeat1, 2), SHIFT_REPEAT(357),
+  [116] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_module_repeat1, 2), SHIFT_REPEAT(1111),
+  [119] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_module_repeat1, 2), SHIFT_REPEAT(993),
+  [122] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_module_repeat1, 2), SHIFT_REPEAT(155),
+  [125] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_module_repeat1, 2), SHIFT_REPEAT(450),
+  [128] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_module_repeat1, 2), SHIFT_REPEAT(74),
+  [131] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_module_repeat1, 2), SHIFT_REPEAT(448),
+  [134] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_module_repeat1, 2), SHIFT_REPEAT(191),
+  [137] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_module_repeat1, 2), SHIFT_REPEAT(241),
+  [140] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_module_repeat1, 2), SHIFT_REPEAT(169),
+  [143] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_module_repeat1, 2), SHIFT_REPEAT(1362),
+  [146] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_module_repeat1, 2), SHIFT_REPEAT(1355),
+  [149] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_module_repeat1, 2), SHIFT_REPEAT(1353),
+  [152] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_module_repeat1, 2), SHIFT_REPEAT(457),
+  [155] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_module_repeat1, 2), SHIFT_REPEAT(250),
+  [158] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_module_repeat1, 2), SHIFT_REPEAT(579),
+  [161] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_module_repeat1, 2), SHIFT_REPEAT(429),
+  [164] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_module_repeat1, 2), SHIFT_REPEAT(1475),
+  [167] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_module_repeat1, 2), SHIFT_REPEAT(320),
+  [170] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_module_repeat1, 2), SHIFT_REPEAT(66),
+  [173] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_module_repeat1, 2), SHIFT_REPEAT(689),
+  [176] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_module_repeat1, 2), SHIFT_REPEAT(157),
+  [179] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_module_repeat1, 2), SHIFT_REPEAT(166),
+  [182] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_module_repeat1, 2), SHIFT_REPEAT(408),
+  [185] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_module_repeat1, 2), SHIFT_REPEAT(1497),
+  [188] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_module_repeat1, 2), SHIFT_REPEAT(1490),
+  [191] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_module_repeat1, 2), SHIFT_REPEAT(1489),
+  [194] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_module_repeat1, 2), SHIFT_REPEAT(271),
+  [197] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_module_repeat1, 2), SHIFT_REPEAT(322),
+  [200] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_module_repeat1, 2), SHIFT_REPEAT(1478),
+  [203] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_module_repeat1, 2), SHIFT_REPEAT(384),
+  [206] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_module_repeat1, 2), SHIFT_REPEAT(383),
+  [209] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_module_repeat1, 2), SHIFT_REPEAT(867),
+  [212] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_module_repeat1, 2), SHIFT_REPEAT(177),
+  [215] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_module_repeat1, 2), SHIFT_REPEAT(759),
+  [218] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_module_repeat1, 2), SHIFT_REPEAT(759),
+  [221] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_module_repeat1, 2), SHIFT_REPEAT(135),
+  [224] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_module_repeat1, 2),
+  [226] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_module_repeat1, 2), SHIFT_REPEAT(916),
+  [229] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1346),
+  [231] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_module_repeat1, 2), SHIFT_REPEAT(437),
+  [234] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_module_repeat1, 2), SHIFT_REPEAT(256),
+  [237] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_module_repeat1, 2), SHIFT_REPEAT(581),
+  [240] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_module_repeat1, 2), SHIFT_REPEAT(434),
+  [243] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_module_repeat1, 2), SHIFT_REPEAT(1493),
+  [246] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_module_repeat1, 2), SHIFT_REPEAT(313),
+  [249] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_module_repeat1, 2), SHIFT_REPEAT(67),
+  [252] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_module_repeat1, 2), SHIFT_REPEAT(1492),
+  [255] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_module_repeat1, 2), SHIFT_REPEAT(1488),
+  [258] = {.entry = {.count = 1, .reusable = false}}, SHIFT(651),
+  [260] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_primary_expression, 1, .production_id = 1),
+  [262] = {.entry = {.count = 1, .reusable = true}}, SHIFT(183),
+  [264] = {.entry = {.count = 2, .reusable = true}}, REDUCE(sym_pattern, 1, .production_id = 1), REDUCE(sym_primary_expression, 1, .production_id = 1),
+  [267] = {.entry = {.count = 1, .reusable = false}}, SHIFT(391),
+  [269] = {.entry = {.count = 1, .reusable = false}}, SHIFT(672),
+  [271] = {.entry = {.count = 1, .reusable = true}}, SHIFT(387),
+  [273] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_pattern, 1, .production_id = 1),
+  [275] = {.entry = {.count = 1, .reusable = false}}, SHIFT(680),
+  [277] = {.entry = {.count = 1, .reusable = true}}, SHIFT(181),
+  [279] = {.entry = {.count = 1, .reusable = true}}, SHIFT(165),
+  [281] = {.entry = {.count = 1, .reusable = false}}, SHIFT(408),
+  [283] = {.entry = {.count = 1, .reusable = false}}, SHIFT(412),
+  [285] = {.entry = {.count = 1, .reusable = true}}, SHIFT(680),
+  [287] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_primary_expression, 1, .production_id = 1),
+  [289] = {.entry = {.count = 1, .reusable = false}}, SHIFT(872),
+  [291] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_pattern, 1, .production_id = 1),
+  [293] = {.entry = {.count = 1, .reusable = true}}, SHIFT(605),
+  [295] = {.entry = {.count = 1, .reusable = false}}, SHIFT(605),
+  [297] = {.entry = {.count = 1, .reusable = false}}, SHIFT(136),
+  [299] = {.entry = {.count = 1, .reusable = true}}, SHIFT(924),
+  [301] = {.entry = {.count = 1, .reusable = false}}, SHIFT(335),
+  [303] = {.entry = {.count = 1, .reusable = true}}, SHIFT(367),
+  [305] = {.entry = {.count = 1, .reusable = true}}, SHIFT(22),
+  [307] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1030),
+  [309] = {.entry = {.count = 1, .reusable = true}}, SHIFT(48),
+  [311] = {.entry = {.count = 1, .reusable = true}}, SHIFT(342),
+  [313] = {.entry = {.count = 1, .reusable = true}}, SHIFT(34),
+  [315] = {.entry = {.count = 1, .reusable = true}}, SHIFT(466),
+  [317] = {.entry = {.count = 1, .reusable = true}}, SHIFT(36),
+  [319] = {.entry = {.count = 1, .reusable = true}}, SHIFT(272),
+  [321] = {.entry = {.count = 1, .reusable = true}}, SHIFT(51),
+  [323] = {.entry = {.count = 1, .reusable = true}}, SHIFT(411),
+  [325] = {.entry = {.count = 1, .reusable = true}}, SHIFT(55),
+  [327] = {.entry = {.count = 1, .reusable = false}}, SHIFT(740),
+  [329] = {.entry = {.count = 1, .reusable = false}}, SHIFT(733),
+  [331] = {.entry = {.count = 1, .reusable = false}}, SHIFT(385),
+  [333] = {.entry = {.count = 1, .reusable = false}}, SHIFT(142),
+  [335] = {.entry = {.count = 1, .reusable = true}}, SHIFT(418),
+  [337] = {.entry = {.count = 1, .reusable = true}}, SHIFT(42),
+  [339] = {.entry = {.count = 1, .reusable = true}}, SHIFT(485),
+  [341] = {.entry = {.count = 1, .reusable = true}}, SHIFT(59),
+  [343] = {.entry = {.count = 1, .reusable = true}}, SHIFT(348),
+  [345] = {.entry = {.count = 1, .reusable = true}}, SHIFT(29),
+  [347] = {.entry = {.count = 1, .reusable = true}}, SHIFT(497),
+  [349] = {.entry = {.count = 1, .reusable = true}}, SHIFT(12),
+  [351] = {.entry = {.count = 1, .reusable = true}}, SHIFT(488),
+  [353] = {.entry = {.count = 1, .reusable = true}}, SHIFT(50),
+  [355] = {.entry = {.count = 1, .reusable = true}}, SHIFT(561),
+  [357] = {.entry = {.count = 1, .reusable = true}}, SHIFT(27),
+  [359] = {.entry = {.count = 1, .reusable = true}}, SHIFT(469),
+  [361] = {.entry = {.count = 1, .reusable = true}}, SHIFT(6),
+  [363] = {.entry = {.count = 1, .reusable = true}}, SHIFT(558),
+  [365] = {.entry = {.count = 1, .reusable = true}}, SHIFT(25),
+  [367] = {.entry = {.count = 1, .reusable = true}}, SHIFT(549),
+  [369] = {.entry = {.count = 1, .reusable = true}}, SHIFT(7),
+  [371] = {.entry = {.count = 1, .reusable = true}}, SHIFT(517),
+  [373] = {.entry = {.count = 1, .reusable = true}}, SHIFT(57),
+  [375] = {.entry = {.count = 1, .reusable = true}}, SHIFT(550),
+  [377] = {.entry = {.count = 1, .reusable = true}}, SHIFT(20),
+  [379] = {.entry = {.count = 1, .reusable = true}}, SHIFT(536),
+  [381] = {.entry = {.count = 1, .reusable = true}}, SHIFT(54),
+  [383] = {.entry = {.count = 1, .reusable = true}}, SHIFT(512),
+  [385] = {.entry = {.count = 1, .reusable = true}}, SHIFT(15),
+  [387] = {.entry = {.count = 1, .reusable = true}}, SHIFT(483),
+  [389] = {.entry = {.count = 1, .reusable = true}}, SHIFT(38),
+  [391] = {.entry = {.count = 1, .reusable = true}}, SHIFT(545),
+  [393] = {.entry = {.count = 1, .reusable = true}}, SHIFT(11),
+  [395] = {.entry = {.count = 1, .reusable = true}}, SHIFT(349),
+  [397] = {.entry = {.count = 1, .reusable = true}}, SHIFT(33),
+  [399] = {.entry = {.count = 1, .reusable = true}}, SHIFT(543),
+  [401] = {.entry = {.count = 1, .reusable = true}}, SHIFT(52),
+  [403] = {.entry = {.count = 1, .reusable = true}}, SHIFT(491),
+  [405] = {.entry = {.count = 1, .reusable = true}}, SHIFT(40),
+  [407] = {.entry = {.count = 1, .reusable = true}}, SHIFT(564),
+  [409] = {.entry = {.count = 1, .reusable = true}}, SHIFT(43),
+  [411] = {.entry = {.count = 1, .reusable = true}}, SHIFT(401),
+  [413] = {.entry = {.count = 1, .reusable = true}}, SHIFT(41),
+  [415] = {.entry = {.count = 1, .reusable = true}}, SHIFT(325),
+  [417] = {.entry = {.count = 1, .reusable = true}}, SHIFT(39),
+  [419] = {.entry = {.count = 1, .reusable = true}}, SHIFT(559),
+  [421] = {.entry = {.count = 1, .reusable = true}}, SHIFT(35),
+  [423] = {.entry = {.count = 1, .reusable = true}}, SHIFT(458),
+  [425] = {.entry = {.count = 1, .reusable = true}}, SHIFT(24),
+  [427] = {.entry = {.count = 1, .reusable = true}}, SHIFT(569),
+  [429] = {.entry = {.count = 1, .reusable = true}}, SHIFT(32),
+  [431] = {.entry = {.count = 1, .reusable = true}}, SHIFT(468),
+  [433] = {.entry = {.count = 1, .reusable = true}}, SHIFT(5),
+  [435] = {.entry = {.count = 1, .reusable = true}}, SHIFT(570),
+  [437] = {.entry = {.count = 1, .reusable = true}}, SHIFT(17),
+  [439] = {.entry = {.count = 1, .reusable = true}}, SHIFT(515),
+  [441] = {.entry = {.count = 1, .reusable = true}}, SHIFT(28),
+  [443] = {.entry = {.count = 1, .reusable = true}}, SHIFT(475),
+  [445] = {.entry = {.count = 1, .reusable = true}}, SHIFT(58),
+  [447] = {.entry = {.count = 1, .reusable = true}}, SHIFT(386),
+  [449] = {.entry = {.count = 1, .reusable = true}}, SHIFT(14),
+  [451] = {.entry = {.count = 1, .reusable = true}}, SHIFT(565),
+  [453] = {.entry = {.count = 1, .reusable = true}}, SHIFT(3),
+  [455] = {.entry = {.count = 1, .reusable = true}}, SHIFT(496),
+  [457] = {.entry = {.count = 1, .reusable = true}}, SHIFT(18),
+  [459] = {.entry = {.count = 1, .reusable = true}}, SHIFT(500),
+  [461] = {.entry = {.count = 1, .reusable = true}}, SHIFT(26),
+  [463] = {.entry = {.count = 1, .reusable = true}}, SHIFT(331),
+  [465] = {.entry = {.count = 1, .reusable = true}}, SHIFT(8),
+  [467] = {.entry = {.count = 1, .reusable = true}}, SHIFT(478),
+  [469] = {.entry = {.count = 1, .reusable = true}}, SHIFT(45),
+  [471] = {.entry = {.count = 1, .reusable = true}}, SHIFT(341),
+  [473] = {.entry = {.count = 1, .reusable = true}}, SHIFT(47),
+  [475] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1013),
+  [477] = {.entry = {.count = 1, .reusable = true}}, SHIFT(49),
+  [479] = {.entry = {.count = 1, .reusable = true}}, SHIFT(539),
+  [481] = {.entry = {.count = 1, .reusable = true}}, SHIFT(13),
+  [483] = {.entry = {.count = 1, .reusable = true}}, SHIFT(474),
+  [485] = {.entry = {.count = 1, .reusable = true}}, SHIFT(10),
+  [487] = {.entry = {.count = 1, .reusable = true}}, SHIFT(389),
+  [489] = {.entry = {.count = 1, .reusable = true}}, SHIFT(30),
+  [491] = {.entry = {.count = 1, .reusable = true}}, SHIFT(329),
+  [493] = {.entry = {.count = 1, .reusable = true}}, SHIFT(4),
+  [495] = {.entry = {.count = 1, .reusable = true}}, SHIFT(472),
+  [497] = {.entry = {.count = 1, .reusable = true}}, SHIFT(56),
+  [499] = {.entry = {.count = 1, .reusable = true}}, SHIFT(402),
+  [501] = {.entry = {.count = 1, .reusable = true}}, SHIFT(46),
+  [503] = {.entry = {.count = 1, .reusable = true}}, SHIFT(362),
+  [505] = {.entry = {.count = 1, .reusable = true}}, SHIFT(19),
+  [507] = {.entry = {.count = 1, .reusable = true}}, SHIFT(503),
+  [509] = {.entry = {.count = 1, .reusable = true}}, SHIFT(31),
+  [511] = {.entry = {.count = 1, .reusable = true}}, SHIFT(279),
+  [513] = {.entry = {.count = 1, .reusable = true}}, SHIFT(2),
+  [515] = {.entry = {.count = 1, .reusable = true}}, SHIFT(464),
+  [517] = {.entry = {.count = 1, .reusable = true}}, SHIFT(23),
+  [519] = {.entry = {.count = 1, .reusable = true}}, SHIFT(537),
+  [521] = {.entry = {.count = 1, .reusable = true}}, SHIFT(37),
+  [523] = {.entry = {.count = 1, .reusable = true}}, SHIFT(347),
+  [525] = {.entry = {.count = 1, .reusable = true}}, SHIFT(44),
+  [527] = {.entry = {.count = 1, .reusable = true}}, SHIFT(511),
+  [529] = {.entry = {.count = 1, .reusable = true}}, SHIFT(16),
+  [531] = {.entry = {.count = 1, .reusable = true}}, SHIFT(542),
+  [533] = {.entry = {.count = 1, .reusable = true}}, SHIFT(53),
+  [535] = {.entry = {.count = 1, .reusable = true}}, SHIFT(338),
+  [537] = {.entry = {.count = 1, .reusable = true}}, SHIFT(9),
+  [539] = {.entry = {.count = 1, .reusable = true}}, SHIFT(506),
+  [541] = {.entry = {.count = 1, .reusable = true}}, SHIFT(21),
+  [543] = {.entry = {.count = 1, .reusable = true}}, SHIFT(291),
+  [545] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1359),
+  [547] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1348),
+  [549] = {.entry = {.count = 1, .reusable = true}}, SHIFT(275),
+  [551] = {.entry = {.count = 1, .reusable = true}}, SHIFT(294),
+  [553] = {.entry = {.count = 1, .reusable = true}}, SHIFT(299),
+  [555] = {.entry = {.count = 2, .reusable = true}}, REDUCE(sym_primary_expression, 1, .production_id = 1), REDUCE(sym_list_splat_pattern, 2, .production_id = 8),
+  [558] = {.entry = {.count = 1, .reusable = false}}, SHIFT(604),
+  [560] = {.entry = {.count = 1, .reusable = true}}, SHIFT(424),
+  [562] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_list_splat_pattern, 2, .production_id = 8),
+  [564] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_list_splat_pattern, 2, .production_id = 8),
+  [566] = {.entry = {.count = 1, .reusable = false}}, SHIFT(138),
+  [568] = {.entry = {.count = 1, .reusable = true}}, SHIFT(188),
+  [570] = {.entry = {.count = 1, .reusable = false}}, SHIFT(784),
+  [572] = {.entry = {.count = 1, .reusable = false}}, SHIFT(689),
+  [574] = {.entry = {.count = 1, .reusable = true}}, SHIFT(195),
+  [576] = {.entry = {.count = 1, .reusable = false}}, SHIFT(145),
+  [578] = {.entry = {.count = 1, .reusable = true}}, SHIFT(211),
+  [580] = {.entry = {.count = 1, .reusable = true}}, SHIFT(414),
+  [582] = {.entry = {.count = 1, .reusable = true}}, SHIFT(663),
+  [584] = {.entry = {.count = 1, .reusable = true}}, SHIFT(209),
+  [586] = {.entry = {.count = 1, .reusable = false}}, SHIFT(139),
+  [588] = {.entry = {.count = 1, .reusable = false}}, SHIFT(454),
+  [590] = {.entry = {.count = 1, .reusable = false}}, SHIFT(827),
+  [592] = {.entry = {.count = 1, .reusable = true}}, SHIFT(210),
+  [594] = {.entry = {.count = 1, .reusable = false}}, SHIFT(808),
+  [596] = {.entry = {.count = 1, .reusable = true}}, SHIFT(407),
+  [598] = {.entry = {.count = 1, .reusable = true}}, SHIFT(653),
+  [600] = {.entry = {.count = 1, .reusable = true}}, SHIFT(204),
+  [602] = {.entry = {.count = 1, .reusable = true}}, SHIFT(163),
+  [604] = {.entry = {.count = 1, .reusable = true}}, SHIFT(827),
+  [606] = {.entry = {.count = 1, .reusable = false}}, SHIFT(147),
+  [608] = {.entry = {.count = 1, .reusable = true}}, SHIFT(922),
+  [610] = {.entry = {.count = 1, .reusable = false}}, SHIFT(378),
+  [612] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_yield, 1),
+  [614] = {.entry = {.count = 1, .reusable = false}}, SHIFT(750),
+  [616] = {.entry = {.count = 1, .reusable = true}}, SHIFT(154),
+  [618] = {.entry = {.count = 1, .reusable = true}}, SHIFT(450),
+  [620] = {.entry = {.count = 1, .reusable = false}}, SHIFT(737),
+  [622] = {.entry = {.count = 1, .reusable = true}}, SHIFT(156),
+  [624] = {.entry = {.count = 1, .reusable = true}}, SHIFT(747),
+  [626] = {.entry = {.count = 1, .reusable = false}}, SHIFT(366),
+  [628] = {.entry = {.count = 1, .reusable = false}}, SHIFT(869),
+  [630] = {.entry = {.count = 1, .reusable = false}}, SHIFT(152),
+  [632] = {.entry = {.count = 1, .reusable = false}}, SHIFT(143),
+  [634] = {.entry = {.count = 1, .reusable = true}}, SHIFT(788),
+  [636] = {.entry = {.count = 1, .reusable = true}}, SHIFT(373),
+  [638] = {.entry = {.count = 1, .reusable = true}}, SHIFT(783),
+  [640] = {.entry = {.count = 1, .reusable = true}}, SHIFT(425),
+  [642] = {.entry = {.count = 1, .reusable = false}}, SHIFT(729),
+  [644] = {.entry = {.count = 1, .reusable = true}}, SHIFT(159),
+  [646] = {.entry = {.count = 1, .reusable = false}}, SHIFT(675),
+  [648] = {.entry = {.count = 1, .reusable = false}}, SHIFT(736),
+  [650] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_pattern_list, 3, .production_id = 16),
+  [652] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_pattern_list, 3, .production_id = 16),
+  [654] = {.entry = {.count = 1, .reusable = true}}, SHIFT(153),
+  [656] = {.entry = {.count = 1, .reusable = false}}, SHIFT(140),
+  [658] = {.entry = {.count = 1, .reusable = true}}, SHIFT(734),
+  [660] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_pattern_list, 2, .production_id = 7),
+  [662] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_pattern_list, 2, .production_id = 7),
+  [664] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_expression_list, 3, .production_id = 16),
+  [666] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_expression_list, 2, .production_id = 7),
+  [668] = {.entry = {.count = 1, .reusable = false}}, SHIFT(692),
+  [670] = {.entry = {.count = 1, .reusable = true}}, SHIFT(185),
+  [672] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1396),
+  [674] = {.entry = {.count = 1, .reusable = false}}, SHIFT(703),
+  [676] = {.entry = {.count = 1, .reusable = true}}, SHIFT(802),
+  [678] = {.entry = {.count = 1, .reusable = false}}, SHIFT(137),
+  [680] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1468),
+  [682] = {.entry = {.count = 1, .reusable = true}}, SHIFT(596),
+  [684] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1404),
+  [686] = {.entry = {.count = 1, .reusable = true}}, SHIFT(786),
+  [688] = {.entry = {.count = 1, .reusable = false}}, SHIFT(823),
+  [690] = {.entry = {.count = 1, .reusable = true}}, SHIFT(196),
+  [692] = {.entry = {.count = 1, .reusable = true}}, SHIFT(618),
+  [694] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1448),
+  [696] = {.entry = {.count = 1, .reusable = false}}, SHIFT(824),
+  [698] = {.entry = {.count = 1, .reusable = false}}, SHIFT(148),
+  [700] = {.entry = {.count = 1, .reusable = false}}, SHIFT(393),
+  [702] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_raise_statement, 1),
+  [704] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__collection_elements, 2, .production_id = 24),
+  [706] = {.entry = {.count = 1, .reusable = true}}, SHIFT(391),
+  [708] = {.entry = {.count = 1, .reusable = false}}, SHIFT(727),
+  [710] = {.entry = {.count = 1, .reusable = true}}, SHIFT(757),
+  [712] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1470),
+  [714] = {.entry = {.count = 1, .reusable = false}}, SHIFT(744),
+  [716] = {.entry = {.count = 1, .reusable = false}}, SHIFT(144),
+  [718] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__collection_elements, 3, .production_id = 50),
+  [720] = {.entry = {.count = 1, .reusable = true}}, SHIFT(820),
+  [722] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1394),
+  [724] = {.entry = {.count = 1, .reusable = false}}, SHIFT(461),
+  [726] = {.entry = {.count = 1, .reusable = true}}, SHIFT(701),
+  [728] = {.entry = {.count = 1, .reusable = true}}, SHIFT(620),
+  [730] = {.entry = {.count = 1, .reusable = true}}, SHIFT(764),
+  [732] = {.entry = {.count = 1, .reusable = true}}, SHIFT(698),
+  [734] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_expression_list, 2, .production_id = 7),
+  [736] = {.entry = {.count = 1, .reusable = false}}, SHIFT(398),
+  [738] = {.entry = {.count = 1, .reusable = true}}, SHIFT(365),
+  [740] = {.entry = {.count = 1, .reusable = true}}, SHIFT(811),
+  [742] = {.entry = {.count = 1, .reusable = true}}, SHIFT(706),
+  [744] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_expression_list, 3, .production_id = 16),
+  [746] = {.entry = {.count = 1, .reusable = true}}, SHIFT(810),
+  [748] = {.entry = {.count = 1, .reusable = true}}, SHIFT(754),
+  [750] = {.entry = {.count = 1, .reusable = true}}, SHIFT(621),
+  [752] = {.entry = {.count = 1, .reusable = true}}, SHIFT(772),
+  [754] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_return_statement, 1),
+  [756] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_for_in_clause, 5, .production_id = 101),
+  [758] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_for_in_clause, 5, .production_id = 101),
+  [760] = {.entry = {.count = 1, .reusable = false}}, SHIFT(870),
+  [762] = {.entry = {.count = 1, .reusable = true}}, SHIFT(603),
+  [764] = {.entry = {.count = 1, .reusable = true}}, SHIFT(789),
+  [766] = {.entry = {.count = 1, .reusable = true}}, SHIFT(622),
+  [768] = {.entry = {.count = 1, .reusable = true}}, SHIFT(592),
+  [770] = {.entry = {.count = 1, .reusable = true}}, SHIFT(822),
+  [772] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_for_in_clause, 7, .production_id = 144),
+  [774] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_for_in_clause, 7, .production_id = 144),
+  [776] = {.entry = {.count = 1, .reusable = true}}, SHIFT(766),
+  [778] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_for_in_clause, 6, .production_id = 125),
+  [780] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_for_in_clause, 6, .production_id = 125),
+  [782] = {.entry = {.count = 1, .reusable = true}}, SHIFT(771),
+  [784] = {.entry = {.count = 1, .reusable = true}}, SHIFT(792),
+  [786] = {.entry = {.count = 1, .reusable = true}}, SHIFT(826),
+  [788] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_for_in_clause, 6, .production_id = 126),
+  [790] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_for_in_clause, 6, .production_id = 126),
+  [792] = {.entry = {.count = 1, .reusable = true}}, SHIFT(756),
+  [794] = {.entry = {.count = 1, .reusable = true}}, SHIFT(705),
+  [796] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_subscript, 6, .production_id = 96),
+  [798] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_subscript, 6, .production_id = 96),
+  [800] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_subscript, 5, .production_id = 69),
+  [802] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_subscript, 5, .production_id = 69),
+  [804] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_subscript, 5, .production_id = 96),
+  [806] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_subscript, 5, .production_id = 96),
+  [808] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_attribute, 3, .production_id = 40),
+  [810] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_attribute, 3, .production_id = 40),
+  [812] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_subscript, 4, .production_id = 69),
+  [814] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_subscript, 4, .production_id = 69),
+  [816] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_dictionary_splat_pattern, 2, .production_id = 33),
+  [818] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_try_statement, 4, .production_id = 56),
+  [820] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_try_statement, 4, .production_id = 56),
+  [822] = {.entry = {.count = 1, .reusable = false}}, SHIFT(1450),
+  [824] = {.entry = {.count = 1, .reusable = false}}, SHIFT(1491),
+  [826] = {.entry = {.count = 1, .reusable = false}}, SHIFT(1447),
+  [828] = {.entry = {.count = 1, .reusable = true}}, SHIFT(267),
+  [830] = {.entry = {.count = 1, .reusable = true}}, SHIFT(353),
+  [832] = {.entry = {.count = 1, .reusable = false}}, SHIFT(356),
+  [834] = {.entry = {.count = 1, .reusable = true}}, SHIFT(350),
+  [836] = {.entry = {.count = 1, .reusable = true}}, SHIFT(815),
+  [838] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_try_statement, 5, .production_id = 81),
+  [840] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_try_statement, 5, .production_id = 81),
+  [842] = {.entry = {.count = 1, .reusable = false}}, SHIFT(1504),
+  [844] = {.entry = {.count = 1, .reusable = false}}, SHIFT(332),
+  [846] = {.entry = {.count = 1, .reusable = false}}, SHIFT(1494),
+  [848] = {.entry = {.count = 1, .reusable = false}}, SHIFT(1454),
+  [850] = {.entry = {.count = 1, .reusable = true}}, SHIFT(220),
+  [852] = {.entry = {.count = 1, .reusable = true}}, SHIFT(212),
+  [854] = {.entry = {.count = 1, .reusable = true}}, SHIFT(351),
+  [856] = {.entry = {.count = 1, .reusable = true}}, SHIFT(828),
+  [858] = {.entry = {.count = 1, .reusable = true}}, SHIFT(791),
+  [860] = {.entry = {.count = 1, .reusable = true}}, SHIFT(214),
+  [862] = {.entry = {.count = 1, .reusable = true}}, SHIFT(615),
+  [864] = {.entry = {.count = 1, .reusable = true}}, SHIFT(825),
+  [866] = {.entry = {.count = 1, .reusable = true}}, SHIFT(578),
+  [868] = {.entry = {.count = 1, .reusable = true}}, SHIFT(317),
+  [870] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1498),
+  [872] = {.entry = {.count = 1, .reusable = true}}, SHIFT(758),
+  [874] = {.entry = {.count = 1, .reusable = true}}, SHIFT(594),
+  [876] = {.entry = {.count = 1, .reusable = true}}, SHIFT(800),
+  [878] = {.entry = {.count = 1, .reusable = true}}, SHIFT(767),
+  [880] = {.entry = {.count = 1, .reusable = true}}, SHIFT(577),
+  [882] = {.entry = {.count = 1, .reusable = true}}, SHIFT(321),
+  [884] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1400),
+  [886] = {.entry = {.count = 1, .reusable = true}}, SHIFT(806),
+  [888] = {.entry = {.count = 1, .reusable = true}}, SHIFT(787),
+  [890] = {.entry = {.count = 1, .reusable = true}}, SHIFT(595),
+  [892] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_block, 1),
+  [894] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_block, 1),
+  [896] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_block, 2),
+  [898] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_block, 2),
+  [900] = {.entry = {.count = 1, .reusable = true}}, SHIFT(398),
+  [902] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__simple_statements, 2),
+  [904] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym__simple_statements, 2),
+  [906] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_slice, 1),
+  [908] = {.entry = {.count = 1, .reusable = true}}, SHIFT(312),
+  [910] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_if_statement, 6, .production_id = 105),
+  [912] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_if_statement, 6, .production_id = 105),
+  [914] = {.entry = {.count = 1, .reusable = false}}, SHIFT(363),
+  [916] = {.entry = {.count = 1, .reusable = true}}, SHIFT(928),
+  [918] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_if_statement, 4, .production_id = 54),
+  [920] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_if_statement, 4, .production_id = 54),
+  [922] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym__simple_statements, 4),
+  [924] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__simple_statements, 4),
+  [926] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_slice, 2, .production_id = 70),
+  [928] = {.entry = {.count = 1, .reusable = true}}, SHIFT(300),
+  [930] = {.entry = {.count = 1, .reusable = false}}, SHIFT(459),
+  [932] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_if_statement, 5, .production_id = 76),
+  [934] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_if_statement, 5, .production_id = 76),
+  [936] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_if_statement, 5, .production_id = 77),
+  [938] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_if_statement, 5, .production_id = 77),
+  [940] = {.entry = {.count = 1, .reusable = false}}, REDUCE(aux_sym_try_statement_repeat1, 2),
+  [942] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_try_statement_repeat1, 2),
+  [944] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_try_statement_repeat1, 2), SHIFT_REPEAT(356),
+  [947] = {.entry = {.count = 1, .reusable = false}}, REDUCE(aux_sym_try_statement_repeat2, 2),
+  [949] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_try_statement_repeat2, 2),
+  [951] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_try_statement_repeat2, 2), SHIFT_REPEAT(1491),
+  [954] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__simple_statements, 3),
+  [956] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym__simple_statements, 3),
+  [958] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_try_statement_repeat2, 2), SHIFT_REPEAT(1454),
+  [961] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_try_statement_repeat1, 2), SHIFT_REPEAT(332),
+  [964] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_slice, 3, .production_id = 70),
+  [966] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_print_statement, 3),
+  [968] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_if_statement_repeat1, 2, .production_id = 103),
+  [970] = {.entry = {.count = 1, .reusable = false}}, REDUCE(aux_sym_if_statement_repeat1, 2, .production_id = 103),
+  [972] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_if_statement_repeat1, 2, .production_id = 103), SHIFT_REPEAT(459),
+  [975] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_print_statement, 3, .production_id = 10),
+  [977] = {.entry = {.count = 1, .reusable = false}}, SHIFT(769),
+  [979] = {.entry = {.count = 1, .reusable = true}}, SHIFT(403),
+  [981] = {.entry = {.count = 1, .reusable = false}}, SHIFT(770),
+  [983] = {.entry = {.count = 1, .reusable = true}}, SHIFT(95),
+  [985] = {.entry = {.count = 1, .reusable = false}}, SHIFT(377),
+  [987] = {.entry = {.count = 1, .reusable = false}}, SHIFT(868),
+  [989] = {.entry = {.count = 1, .reusable = false}}, SHIFT(146),
+  [991] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_print_statement, 4, .production_id = 28),
+  [993] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_print_statement, 4, .production_id = 29),
+  [995] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_slice, 3, .production_id = 68),
+  [997] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_slice, 2),
+  [999] = {.entry = {.count = 1, .reusable = true}}, SHIFT(178),
+  [1001] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_slice, 4, .production_id = 98),
+  [1003] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1384),
+  [1005] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_if_statement_repeat1, 2, .production_id = 103), SHIFT_REPEAT(363),
+  [1008] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1480),
+  [1010] = {.entry = {.count = 1, .reusable = false}}, SHIFT(1241),
+  [1012] = {.entry = {.count = 1, .reusable = true}}, SHIFT(443),
+  [1014] = {.entry = {.count = 1, .reusable = true}}, SHIFT(122),
+  [1016] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_except_clause, 3, .production_id = 56),
+  [1018] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_except_clause, 3, .production_id = 56),
+  [1020] = {.entry = {.count = 1, .reusable = false}}, REDUCE(aux_sym_cases_repeat1, 2),
+  [1022] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_cases_repeat1, 2),
+  [1024] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_cases_repeat1, 2), SHIFT_REPEAT(831),
+  [1027] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_except_clause, 4, .production_id = 133),
+  [1029] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_except_clause, 4, .production_id = 133),
+  [1031] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_except_clause, 4, .production_id = 81),
+  [1033] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_except_clause, 4, .production_id = 81),
+  [1035] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_except_group_clause, 5, .production_id = 150),
+  [1037] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_except_group_clause, 5, .production_id = 150),
+  [1039] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_except_clause, 5, .production_id = 151),
+  [1041] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_except_clause, 5, .production_id = 151),
+  [1043] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_cases, 1),
+  [1045] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_cases, 1),
+  [1047] = {.entry = {.count = 1, .reusable = false}}, SHIFT(831),
+  [1049] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_except_group_clause, 8, .production_id = 168),
+  [1051] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_except_group_clause, 8, .production_id = 168),
+  [1053] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_except_clause, 7, .production_id = 167),
+  [1055] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_except_clause, 7, .production_id = 167),
+  [1057] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_except_group_clause, 7, .production_id = 166),
+  [1059] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_except_group_clause, 7, .production_id = 166),
+  [1061] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_cases_repeat1, 2), SHIFT_REPEAT(833),
+  [1064] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_except_group_clause, 6, .production_id = 160),
+  [1066] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_except_group_clause, 6, .production_id = 160),
+  [1068] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_except_clause, 6, .production_id = 161),
+  [1070] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_except_clause, 6, .production_id = 161),
+  [1072] = {.entry = {.count = 1, .reusable = false}}, SHIFT(833),
+  [1074] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_primary_expression, 1),
+  [1076] = {.entry = {.count = 2, .reusable = true}}, REDUCE(sym_pattern, 1), REDUCE(sym_primary_expression, 1),
+  [1079] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_primary_expression, 1),
+  [1081] = {.entry = {.count = 1, .reusable = true}}, SHIFT(435),
+  [1083] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_pattern, 1),
+  [1085] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_pattern, 1),
+  [1087] = {.entry = {.count = 2, .reusable = true}}, REDUCE(sym_primary_expression, 1), REDUCE(sym_list_splat_pattern, 2, .production_id = 9),
+  [1090] = {.entry = {.count = 1, .reusable = true}}, SHIFT(392),
+  [1092] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_list_splat_pattern, 2, .production_id = 9),
+  [1094] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_list_splat_pattern, 2, .production_id = 9),
+  [1096] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_for_statement, 7, .production_id = 128),
+  [1098] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_for_statement, 7, .production_id = 128),
+  [1100] = {.entry = {.count = 1, .reusable = false}}, REDUCE(aux_sym_if_statement_repeat1, 1, .production_id = 74),
+  [1102] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_if_statement_repeat1, 1, .production_id = 74),
+  [1104] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_for_statement, 7, .production_id = 132),
+  [1106] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_for_statement, 7, .production_id = 132),
+  [1108] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_tuple, 2),
+  [1110] = {.entry = {.count = 2, .reusable = true}}, REDUCE(sym_tuple_pattern, 2), REDUCE(sym_tuple, 2),
+  [1113] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_tuple, 2),
+  [1115] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_tuple_pattern, 2),
+  [1117] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_tuple_pattern, 2),
+  [1119] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_elif_clause, 4, .production_id = 54),
+  [1121] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_elif_clause, 4, .production_id = 54),
+  [1123] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_while_statement, 4, .production_id = 55),
+  [1125] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_while_statement, 4, .production_id = 55),
+  [1127] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_for_statement, 8, .production_id = 146),
+  [1129] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_for_statement, 8, .production_id = 146),
+  [1131] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_for_statement, 6, .production_id = 108),
+  [1133] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_for_statement, 6, .production_id = 108),
+  [1135] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_elif_clause, 5, .production_id = 77),
+  [1137] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_elif_clause, 5, .production_id = 77),
+  [1139] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_while_statement, 5, .production_id = 80),
+  [1141] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_while_statement, 5, .production_id = 80),
+  [1143] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_list, 2),
+  [1145] = {.entry = {.count = 2, .reusable = true}}, REDUCE(sym_list_pattern, 2), REDUCE(sym_list, 2),
+  [1148] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_list, 2),
+  [1150] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_list_pattern, 2),
+  [1152] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_list_pattern, 2),
+  [1154] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_try_statement, 5, .production_id = 56),
+  [1156] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_try_statement, 5, .production_id = 56),
+  [1158] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_try_statement, 6, .production_id = 81),
+  [1160] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_try_statement, 6, .production_id = 81),
+  [1162] = {.entry = {.count = 1, .reusable = false}}, SHIFT(360),
+  [1164] = {.entry = {.count = 1, .reusable = false}}, SHIFT(358),
+  [1166] = {.entry = {.count = 1, .reusable = false}}, SHIFT(134),
+  [1168] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_else_clause, 4, .production_id = 81),
+  [1170] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_else_clause, 4, .production_id = 81),
+  [1172] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_else_clause, 3, .production_id = 56),
+  [1174] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_else_clause, 3, .production_id = 56),
+  [1176] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_case_block, 5, .production_id = 153),
+  [1178] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_case_block, 5, .production_id = 153),
+  [1180] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_case_block, 5, .production_id = 154),
+  [1182] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_case_block, 5, .production_id = 154),
+  [1184] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_case_block, 6, .production_id = 162),
+  [1186] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_case_block, 6, .production_id = 162),
+  [1188] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_case_block, 4, .production_id = 137),
+  [1190] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_case_block, 4, .production_id = 137),
+  [1192] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_class_definition, 6, .production_id = 120),
+  [1194] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_class_definition, 6, .production_id = 120),
+  [1196] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_function_definition, 9, .production_id = 164),
+  [1198] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_function_definition, 9, .production_id = 164),
+  [1200] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_function_definition, 9, .production_id = 159),
+  [1202] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_function_definition, 9, .production_id = 159),
+  [1204] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_function_definition, 9, .production_id = 158),
+  [1206] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_function_definition, 9, .production_id = 158),
+  [1208] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_for_statement, 9, .production_id = 157),
+  [1210] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_for_statement, 9, .production_id = 157),
+  [1212] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_try_statement, 6, .production_id = 56),
+  [1214] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_try_statement, 6, .production_id = 56),
+  [1216] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_function_definition, 8, .production_id = 156),
+  [1218] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_function_definition, 8, .production_id = 156),
+  [1220] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_function_definition, 8, .production_id = 155),
+  [1222] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_function_definition, 8, .production_id = 155),
+  [1224] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_with_statement, 4, .production_id = 57),
+  [1226] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_with_statement, 4, .production_id = 57),
+  [1228] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_match_statement, 4, .production_id = 59),
+  [1230] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_match_statement, 4, .production_id = 59),
+  [1232] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_match_statement, 4, .production_id = 60),
+  [1234] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_match_statement, 4, .production_id = 60),
+  [1236] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_finally_clause, 3, .production_id = 56),
+  [1238] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_finally_clause, 3, .production_id = 56),
+  [1240] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_if_statement, 7, .production_id = 127),
+  [1242] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_if_statement, 7, .production_id = 127),
+  [1244] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_while_statement, 6, .production_id = 109),
+  [1246] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_while_statement, 6, .production_id = 109),
+  [1248] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_function_definition, 6, .production_id = 107),
+  [1250] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_function_definition, 6, .production_id = 107),
+  [1252] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_if_statement, 5, .production_id = 75),
+  [1254] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_if_statement, 5, .production_id = 75),
+  [1256] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_with_statement, 6, .production_id = 106),
+  [1258] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_with_statement, 6, .production_id = 106),
+  [1260] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_if_statement, 6, .production_id = 104),
+  [1262] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_if_statement, 6, .production_id = 104),
+  [1264] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1265),
+  [1266] = {.entry = {.count = 1, .reusable = true}}, SHIFT(675),
+  [1268] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_with_statement, 5, .production_id = 78),
+  [1270] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_with_statement, 5, .production_id = 78),
+  [1272] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_class_definition, 4, .production_id = 64),
+  [1274] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_class_definition, 4, .production_id = 64),
+  [1276] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_for_statement, 8, .production_id = 149),
+  [1278] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_for_statement, 8, .production_id = 149),
+  [1280] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_if_statement, 6, .production_id = 102),
+  [1282] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_if_statement, 6, .production_id = 102),
+  [1284] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_function_definition, 8, .production_id = 148),
+  [1286] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_function_definition, 8, .production_id = 148),
+  [1288] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_while_statement, 5, .production_id = 79),
+  [1290] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_while_statement, 5, .production_id = 79),
+  [1292] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_function_definition, 8, .production_id = 147),
+  [1294] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_function_definition, 8, .production_id = 147),
+  [1296] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_for_statement, 8, .production_id = 145),
+  [1298] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_for_statement, 8, .production_id = 145),
+  [1300] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_function_definition, 7, .production_id = 129),
+  [1302] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_function_definition, 7, .production_id = 129),
+  [1304] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_function_definition, 7, .production_id = 130),
+  [1306] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_function_definition, 7, .production_id = 130),
+  [1308] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_for_statement, 7, .production_id = 131),
+  [1310] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_for_statement, 7, .production_id = 131),
+  [1312] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_class_definition, 7, .production_id = 142),
+  [1314] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_class_definition, 7, .production_id = 142),
+  [1316] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_function_definition, 7, .production_id = 141),
+  [1318] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_function_definition, 7, .production_id = 141),
+  [1320] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_function_definition, 7, .production_id = 140),
+  [1322] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_function_definition, 7, .production_id = 140),
+  [1324] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_class_definition, 6, .production_id = 119),
+  [1326] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_class_definition, 6, .production_id = 119),
+  [1328] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_function_definition, 6, .production_id = 118),
+  [1330] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_function_definition, 6, .production_id = 118),
+  [1332] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_with_statement, 5, .production_id = 82),
+  [1334] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_with_statement, 5, .production_id = 82),
+  [1336] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__patterns, 3, .production_id = 50),
+  [1338] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_finally_clause, 4, .production_id = 81),
   [1340] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_finally_clause, 4, .production_id = 81),
-  [1342] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_finally_clause, 4, .production_id = 81),
-  [1344] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_for_statement, 7, .production_id = 127),
-  [1346] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_for_statement, 7, .production_id = 127),
-  [1348] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_if_statement, 6, .production_id = 101),
-  [1350] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_if_statement, 6, .production_id = 101),
-  [1352] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_function_definition, 7, .production_id = 126),
-  [1354] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_function_definition, 7, .production_id = 126),
-  [1356] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_function_definition, 7, .production_id = 125),
-  [1358] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_function_definition, 7, .production_id = 125),
-  [1360] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_if_statement, 7, .production_id = 123),
-  [1362] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_if_statement, 7, .production_id = 123),
-  [1364] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_class_definition, 6, .production_id = 117),
-  [1366] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_class_definition, 6, .production_id = 117),
-  [1368] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_class_definition, 6, .production_id = 115),
-  [1370] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_class_definition, 6, .production_id = 115),
-  [1372] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_function_definition, 6, .production_id = 114),
-  [1374] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_function_definition, 6, .production_id = 114),
-  [1376] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_function_definition, 6, .production_id = 113),
-  [1378] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_function_definition, 6, .production_id = 113),
-  [1380] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__patterns, 3, .production_id = 50),
-  [1382] = {.entry = {.count = 1, .reusable = true}}, SHIFT(685),
-  [1384] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1207),
-  [1386] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__patterns, 2, .production_id = 24),
-  [1388] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_concatenated_string, 2),
-  [1390] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_concatenated_string, 2),
-  [1392] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_concatenated_string_repeat1, 2),
-  [1394] = {.entry = {.count = 1, .reusable = false}}, REDUCE(aux_sym_concatenated_string_repeat1, 2),
-  [1396] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_concatenated_string_repeat1, 2), SHIFT_REPEAT(944),
+  [1342] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_try_statement, 7, .production_id = 81),
+  [1344] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_try_statement, 7, .production_id = 81),
+  [1346] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_decorated_definition, 2, .production_id = 19),
+  [1348] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_decorated_definition, 2, .production_id = 19),
+  [1350] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_function_definition, 6, .production_id = 117),
+  [1352] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_function_definition, 6, .production_id = 117),
+  [1354] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__patterns, 2, .production_id = 24),
+  [1356] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_function_definition, 10, .production_id = 165),
+  [1358] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_function_definition, 10, .production_id = 165),
+  [1360] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_function_definition, 5, .production_id = 87),
+  [1362] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_function_definition, 5, .production_id = 87),
+  [1364] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_class_definition, 5, .production_id = 89),
+  [1366] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_class_definition, 5, .production_id = 89),
+  [1368] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_class_definition, 5, .production_id = 90),
+  [1370] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_class_definition, 5, .production_id = 90),
+  [1372] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_class_definition, 5, .production_id = 91),
+  [1374] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_class_definition, 5, .production_id = 91),
+  [1376] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_class_definition, 6, .production_id = 121),
+  [1378] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_class_definition, 6, .production_id = 121),
+  [1380] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_concatenated_string, 2),
+  [1382] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_concatenated_string, 2),
+  [1384] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_concatenated_string_repeat1, 2),
+  [1386] = {.entry = {.count = 1, .reusable = false}}, REDUCE(aux_sym_concatenated_string_repeat1, 2),
+  [1388] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_concatenated_string_repeat1, 2), SHIFT_REPEAT(924),
+  [1391] = {.entry = {.count = 1, .reusable = false}}, SHIFT(749),
+  [1393] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_keyword_separator, 1),
+  [1395] = {.entry = {.count = 1, .reusable = false}}, SHIFT(730),
+  [1397] = {.entry = {.count = 1, .reusable = false}}, SHIFT(141),
   [1399] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_string, 3, .production_id = 20),
   [1401] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_string, 3, .production_id = 20),
   [1403] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_string, 2, .production_id = 2),
   [1405] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_string, 2, .production_id = 2),
-  [1407] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_list_comprehension, 4, .production_id = 51),
-  [1409] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_list_comprehension, 4, .production_id = 51),
-  [1411] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_set_comprehension, 4, .production_id = 51),
-  [1413] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_set_comprehension, 4, .production_id = 51),
-  [1415] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_argument_list, 4, .production_id = 61),
-  [1417] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_argument_list, 4, .production_id = 61),
-  [1419] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_dictionary, 5, .production_id = 61),
-  [1421] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_dictionary, 5, .production_id = 61),
-  [1423] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_argument_list, 5, .production_id = 61),
-  [1425] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_argument_list, 5, .production_id = 61),
-  [1427] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_argument_list, 5, .production_id = 92),
-  [1429] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_argument_list, 5, .production_id = 92),
-  [1431] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_dictionary, 2),
-  [1433] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_dictionary, 2),
-  [1435] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_argument_list, 3, .production_id = 67),
-  [1437] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_argument_list, 3, .production_id = 67),
-  [1439] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_argument_list, 3, .production_id = 31),
-  [1441] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_argument_list, 3, .production_id = 31),
-  [1443] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_argument_list, 3),
-  [1445] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_argument_list, 3),
-  [1447] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_set, 3, .production_id = 25),
-  [1449] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_set, 3, .production_id = 25),
-  [1451] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_dictionary, 3, .production_id = 31),
-  [1453] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_dictionary, 3, .production_id = 31),
-  [1455] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_dictionary, 3),
-  [1457] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_dictionary, 3),
-  [1459] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_list, 3, .production_id = 25),
-  [1461] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_list, 3, .production_id = 25),
-  [1463] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_tuple, 3, .production_id = 25),
-  [1465] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_tuple, 3, .production_id = 25),
-  [1467] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_parenthesized_expression, 3, .production_id = 26),
-  [1469] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_parenthesized_expression, 3, .production_id = 26),
-  [1471] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_argument_list, 4, .production_id = 31),
-  [1473] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_argument_list, 4, .production_id = 31),
-  [1475] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1449),
-  [1477] = {.entry = {.count = 1, .reusable = true}}, SHIFT(177),
-  [1479] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_expression, 1),
-  [1481] = {.entry = {.count = 1, .reusable = false}}, SHIFT(716),
-  [1483] = {.entry = {.count = 1, .reusable = true}}, SHIFT(707),
-  [1485] = {.entry = {.count = 1, .reusable = true}}, SHIFT(696),
-  [1487] = {.entry = {.count = 1, .reusable = true}}, SHIFT(695),
-  [1489] = {.entry = {.count = 1, .reusable = true}}, SHIFT(692),
-  [1491] = {.entry = {.count = 1, .reusable = true}}, SHIFT(310),
-  [1493] = {.entry = {.count = 1, .reusable = true}}, SHIFT(690),
-  [1495] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_expression, 1),
-  [1497] = {.entry = {.count = 1, .reusable = true}}, SHIFT(716),
-  [1499] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1436),
-  [1501] = {.entry = {.count = 1, .reusable = true}}, SHIFT(687),
-  [1503] = {.entry = {.count = 1, .reusable = true}}, SHIFT(686),
-  [1505] = {.entry = {.count = 1, .reusable = false}}, SHIFT(696),
-  [1507] = {.entry = {.count = 1, .reusable = true}}, SHIFT(673),
-  [1509] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_argument_list, 2),
-  [1511] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_argument_list, 2),
-  [1513] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_call, 2, .production_id = 17),
-  [1515] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_call, 2, .production_id = 17),
-  [1517] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_dictionary, 4, .production_id = 61),
-  [1519] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_dictionary, 4, .production_id = 61),
-  [1521] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_dictionary_comprehension, 4, .production_id = 51),
-  [1523] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_dictionary_comprehension, 4, .production_id = 51),
-  [1525] = {.entry = {.count = 1, .reusable = false}}, SHIFT(762),
-  [1527] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_keyword_separator, 1),
-  [1529] = {.entry = {.count = 1, .reusable = false}}, SHIFT(767),
-  [1531] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_generator_expression, 4, .production_id = 51),
-  [1533] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_generator_expression, 4, .production_id = 51),
-  [1535] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_argument_list, 4, .production_id = 67),
-  [1537] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_argument_list, 4, .production_id = 67),
-  [1539] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_dictionary, 4, .production_id = 31),
-  [1541] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_dictionary, 4, .production_id = 31),
-  [1543] = {.entry = {.count = 1, .reusable = false}}, SHIFT(693),
-  [1545] = {.entry = {.count = 1, .reusable = true}}, SHIFT(698),
-  [1547] = {.entry = {.count = 1, .reusable = true}}, SHIFT(702),
-  [1549] = {.entry = {.count = 1, .reusable = true}}, SHIFT(703),
-  [1551] = {.entry = {.count = 1, .reusable = true}}, SHIFT(704),
-  [1553] = {.entry = {.count = 1, .reusable = true}}, SHIFT(705),
-  [1555] = {.entry = {.count = 1, .reusable = true}}, SHIFT(693),
-  [1557] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1446),
-  [1559] = {.entry = {.count = 1, .reusable = true}}, SHIFT(710),
-  [1561] = {.entry = {.count = 1, .reusable = true}}, SHIFT(711),
-  [1563] = {.entry = {.count = 1, .reusable = false}}, SHIFT(702),
-  [1565] = {.entry = {.count = 1, .reusable = true}}, SHIFT(676),
-  [1567] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_argument_list, 4, .production_id = 92),
-  [1569] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_argument_list, 4, .production_id = 92),
-  [1571] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_binary_operator, 3, .production_id = 39),
-  [1573] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_binary_operator, 3, .production_id = 39),
+  [1407] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1465),
+  [1409] = {.entry = {.count = 1, .reusable = true}}, SHIFT(174),
+  [1411] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_expression, 1),
+  [1413] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_expression, 1),
+  [1415] = {.entry = {.count = 1, .reusable = false}}, SHIFT(688),
+  [1417] = {.entry = {.count = 1, .reusable = true}}, SHIFT(685),
+  [1419] = {.entry = {.count = 1, .reusable = true}}, SHIFT(684),
+  [1421] = {.entry = {.count = 1, .reusable = true}}, SHIFT(652),
+  [1423] = {.entry = {.count = 1, .reusable = true}}, SHIFT(671),
+  [1425] = {.entry = {.count = 1, .reusable = true}}, SHIFT(249),
+  [1427] = {.entry = {.count = 1, .reusable = true}}, SHIFT(669),
+  [1429] = {.entry = {.count = 1, .reusable = true}}, SHIFT(688),
+  [1431] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1464),
+  [1433] = {.entry = {.count = 1, .reusable = true}}, SHIFT(667),
+  [1435] = {.entry = {.count = 1, .reusable = true}}, SHIFT(666),
+  [1437] = {.entry = {.count = 1, .reusable = false}}, SHIFT(684),
+  [1439] = {.entry = {.count = 1, .reusable = true}}, SHIFT(646),
+  [1441] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_tuple, 3, .production_id = 25),
+  [1443] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_tuple, 3, .production_id = 25),
+  [1445] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_argument_list, 4, .production_id = 31),
+  [1447] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_argument_list, 4, .production_id = 31),
+  [1449] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_parenthesized_expression, 3, .production_id = 26),
+  [1451] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_parenthesized_expression, 3, .production_id = 26),
+  [1453] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_dictionary, 5, .production_id = 61),
+  [1455] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_dictionary, 5, .production_id = 61),
+  [1457] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_dictionary, 2),
+  [1459] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_dictionary, 2),
+  [1461] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_generator_expression, 4, .production_id = 51),
+  [1463] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_generator_expression, 4, .production_id = 51),
+  [1465] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_argument_list, 4, .production_id = 61),
+  [1467] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_argument_list, 4, .production_id = 61),
+  [1469] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_argument_list, 4, .production_id = 93),
+  [1471] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_argument_list, 4, .production_id = 93),
+  [1473] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_argument_list, 3, .production_id = 67),
+  [1475] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_argument_list, 3, .production_id = 67),
+  [1477] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_argument_list, 3, .production_id = 31),
+  [1479] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_argument_list, 3, .production_id = 31),
+  [1481] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_argument_list, 3),
+  [1483] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_argument_list, 3),
+  [1485] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_argument_list, 4, .production_id = 67),
+  [1487] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_argument_list, 4, .production_id = 67),
+  [1489] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_dictionary, 4, .production_id = 61),
+  [1491] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_dictionary, 4, .production_id = 61),
+  [1493] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_dictionary_comprehension, 4, .production_id = 51),
+  [1495] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_dictionary_comprehension, 4, .production_id = 51),
+  [1497] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_set_comprehension, 4, .production_id = 51),
+  [1499] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_set_comprehension, 4, .production_id = 51),
+  [1501] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_list, 3, .production_id = 25),
+  [1503] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_list, 3, .production_id = 25),
+  [1505] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_dictionary, 3),
+  [1507] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_dictionary, 3),
+  [1509] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_dictionary, 3, .production_id = 31),
+  [1511] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_dictionary, 3, .production_id = 31),
+  [1513] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_set, 3, .production_id = 25),
+  [1515] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_set, 3, .production_id = 25),
+  [1517] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_dictionary, 4, .production_id = 31),
+  [1519] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_dictionary, 4, .production_id = 31),
+  [1521] = {.entry = {.count = 1, .reusable = false}}, SHIFT(683),
+  [1523] = {.entry = {.count = 1, .reusable = true}}, SHIFT(682),
+  [1525] = {.entry = {.count = 1, .reusable = true}}, SHIFT(681),
+  [1527] = {.entry = {.count = 1, .reusable = true}}, SHIFT(687),
+  [1529] = {.entry = {.count = 1, .reusable = true}}, SHIFT(679),
+  [1531] = {.entry = {.count = 1, .reusable = true}}, SHIFT(678),
+  [1533] = {.entry = {.count = 1, .reusable = true}}, SHIFT(683),
+  [1535] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1393),
+  [1537] = {.entry = {.count = 1, .reusable = true}}, SHIFT(676),
+  [1539] = {.entry = {.count = 1, .reusable = true}}, SHIFT(673),
+  [1541] = {.entry = {.count = 1, .reusable = false}}, SHIFT(681),
+  [1543] = {.entry = {.count = 1, .reusable = true}}, SHIFT(635),
+  [1545] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_list_comprehension, 4, .production_id = 51),
+  [1547] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_list_comprehension, 4, .production_id = 51),
+  [1549] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_argument_list, 2),
+  [1551] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_argument_list, 2),
+  [1553] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_call, 2, .production_id = 17),
+  [1555] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_call, 2, .production_id = 17),
+  [1557] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_argument_list, 5, .production_id = 61),
+  [1559] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_argument_list, 5, .production_id = 61),
+  [1561] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_argument_list, 5, .production_id = 93),
+  [1563] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_argument_list, 5, .production_id = 93),
+  [1565] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_binary_operator, 3, .production_id = 39),
+  [1567] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_binary_operator, 3, .production_id = 39),
+  [1569] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_comparison_operator_repeat1, 3, .production_id = 71),
+  [1571] = {.entry = {.count = 1, .reusable = false}}, REDUCE(aux_sym_comparison_operator_repeat1, 3, .production_id = 71),
+  [1573] = {.entry = {.count = 1, .reusable = false}}, SHIFT(677),
   [1575] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_unary_operator, 2, .production_id = 13),
   [1577] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_unary_operator, 2, .production_id = 13),
   [1579] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_comparison_operator_repeat1, 2, .production_id = 41),
   [1581] = {.entry = {.count = 1, .reusable = false}}, REDUCE(aux_sym_comparison_operator_repeat1, 2, .production_id = 41),
-  [1583] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_comparison_operator_repeat1, 3, .production_id = 71),
-  [1585] = {.entry = {.count = 1, .reusable = false}}, REDUCE(aux_sym_comparison_operator_repeat1, 3, .production_id = 71),
-  [1587] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_comparison_operator_repeat1, 3, .production_id = 72),
-  [1589] = {.entry = {.count = 1, .reusable = false}}, REDUCE(aux_sym_comparison_operator_repeat1, 3, .production_id = 72),
-  [1591] = {.entry = {.count = 1, .reusable = true}}, SHIFT(452),
-  [1593] = {.entry = {.count = 1, .reusable = false}}, SHIFT(794),
-  [1595] = {.entry = {.count = 1, .reusable = false}}, SHIFT(694),
-  [1597] = {.entry = {.count = 1, .reusable = false}}, SHIFT(832),
-  [1599] = {.entry = {.count = 1, .reusable = false}}, SHIFT(691),
-  [1601] = {.entry = {.count = 1, .reusable = false}}, SHIFT(618),
-  [1603] = {.entry = {.count = 1, .reusable = false}}, SHIFT(679),
-  [1605] = {.entry = {.count = 1, .reusable = false}}, SHIFT(712),
-  [1607] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_concatenated_string_repeat1, 2), SHIFT_REPEAT(934),
-  [1610] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1500),
-  [1612] = {.entry = {.count = 1, .reusable = true}}, SHIFT(179),
-  [1614] = {.entry = {.count = 1, .reusable = false}}, SHIFT(730),
-  [1616] = {.entry = {.count = 1, .reusable = true}}, SHIFT(723),
-  [1618] = {.entry = {.count = 1, .reusable = true}}, SHIFT(722),
-  [1620] = {.entry = {.count = 1, .reusable = true}}, SHIFT(721),
-  [1622] = {.entry = {.count = 1, .reusable = true}}, SHIFT(717),
-  [1624] = {.entry = {.count = 1, .reusable = true}}, SHIFT(301),
-  [1626] = {.entry = {.count = 1, .reusable = true}}, SHIFT(714),
-  [1628] = {.entry = {.count = 1, .reusable = true}}, SHIFT(730),
-  [1630] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1494),
-  [1632] = {.entry = {.count = 1, .reusable = true}}, SHIFT(706),
-  [1634] = {.entry = {.count = 1, .reusable = true}}, SHIFT(700),
-  [1636] = {.entry = {.count = 1, .reusable = false}}, SHIFT(722),
-  [1638] = {.entry = {.count = 1, .reusable = true}}, SHIFT(669),
-  [1640] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_concatenated_string_repeat1, 2), SHIFT_REPEAT(952),
-  [1643] = {.entry = {.count = 1, .reusable = false}}, SHIFT(879),
-  [1645] = {.entry = {.count = 1, .reusable = false}}, SHIFT(880),
-  [1647] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1448),
-  [1649] = {.entry = {.count = 1, .reusable = true}}, SHIFT(184),
-  [1651] = {.entry = {.count = 1, .reusable = false}}, SHIFT(729),
-  [1653] = {.entry = {.count = 1, .reusable = true}}, SHIFT(728),
-  [1655] = {.entry = {.count = 1, .reusable = true}}, SHIFT(680),
-  [1657] = {.entry = {.count = 1, .reusable = true}}, SHIFT(697),
-  [1659] = {.entry = {.count = 1, .reusable = true}}, SHIFT(681),
-  [1661] = {.entry = {.count = 1, .reusable = true}}, SHIFT(299),
-  [1663] = {.entry = {.count = 1, .reusable = true}}, SHIFT(699),
-  [1665] = {.entry = {.count = 1, .reusable = true}}, SHIFT(729),
-  [1667] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1430),
-  [1669] = {.entry = {.count = 1, .reusable = true}}, SHIFT(708),
-  [1671] = {.entry = {.count = 1, .reusable = true}}, SHIFT(682),
-  [1673] = {.entry = {.count = 1, .reusable = false}}, SHIFT(680),
-  [1675] = {.entry = {.count = 1, .reusable = true}}, SHIFT(670),
-  [1677] = {.entry = {.count = 1, .reusable = false}}, SHIFT(451),
-  [1679] = {.entry = {.count = 1, .reusable = true}}, SHIFT(392),
-  [1681] = {.entry = {.count = 1, .reusable = false}}, SHIFT(925),
-  [1683] = {.entry = {.count = 1, .reusable = true}}, SHIFT(853),
-  [1685] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1259),
-  [1687] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1390),
-  [1689] = {.entry = {.count = 1, .reusable = false}}, SHIFT(971),
-  [1691] = {.entry = {.count = 1, .reusable = true}}, SHIFT(856),
-  [1693] = {.entry = {.count = 1, .reusable = true}}, SHIFT(892),
-  [1695] = {.entry = {.count = 1, .reusable = false}}, SHIFT(943),
-  [1697] = {.entry = {.count = 1, .reusable = true}}, SHIFT(943),
-  [1699] = {.entry = {.count = 1, .reusable = false}}, SHIFT(975),
-  [1701] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_open_sequence_match_pattern, 2),
-  [1703] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_open_sequence_match_pattern, 2),
-  [1705] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_open_sequence_match_pattern, 3),
-  [1707] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_open_sequence_match_pattern, 3),
-  [1709] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1006),
-  [1711] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1011),
-  [1713] = {.entry = {.count = 1, .reusable = true}}, SHIFT(987),
-  [1715] = {.entry = {.count = 1, .reusable = false}}, SHIFT(999),
-  [1717] = {.entry = {.count = 1, .reusable = true}}, SHIFT(998),
-  [1719] = {.entry = {.count = 1, .reusable = true}}, SHIFT(981),
-  [1721] = {.entry = {.count = 1, .reusable = true}}, SHIFT(970),
-  [1723] = {.entry = {.count = 1, .reusable = false}}, SHIFT(984),
-  [1725] = {.entry = {.count = 1, .reusable = false}}, SHIFT(957),
-  [1727] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_comparison_operator_repeat1, 2, .production_id = 42),
-  [1729] = {.entry = {.count = 1, .reusable = false}}, REDUCE(aux_sym_comparison_operator_repeat1, 2, .production_id = 42),
-  [1731] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_comparison_operator_repeat1, 2, .production_id = 42), SHIFT_REPEAT(702),
-  [1734] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_comparison_operator_repeat1, 2, .production_id = 42), SHIFT_REPEAT(1446),
-  [1737] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_comparison_operator_repeat1, 2, .production_id = 42), SHIFT_REPEAT(702),
-  [1740] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_comparison_operator_repeat1, 2, .production_id = 42), SHIFT_REPEAT(676),
-  [1743] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_comparison_operator_repeat1, 2, .production_id = 42), SHIFT_REPEAT(696),
-  [1746] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_comparison_operator_repeat1, 2, .production_id = 42), SHIFT_REPEAT(1436),
-  [1749] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_comparison_operator_repeat1, 2, .production_id = 42), SHIFT_REPEAT(696),
-  [1752] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_comparison_operator_repeat1, 2, .production_id = 42), SHIFT_REPEAT(673),
-  [1755] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_comparison_operator, 2, .production_id = 18),
-  [1757] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_comparison_operator, 2, .production_id = 18),
-  [1759] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym__patterns_repeat1, 2, .production_id = 36),
-  [1761] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym__patterns_repeat1, 2, .production_id = 36), SHIFT_REPEAT(607),
-  [1764] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_tuple_pattern, 3, .production_id = 25),
-  [1766] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_list_pattern, 3, .production_id = 25),
-  [1768] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym__patterns_repeat1, 2, .production_id = 31),
-  [1770] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_comparison_operator_repeat1, 2, .production_id = 42), SHIFT_REPEAT(722),
-  [1773] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_comparison_operator_repeat1, 2, .production_id = 42), SHIFT_REPEAT(1494),
-  [1776] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_comparison_operator_repeat1, 2, .production_id = 42), SHIFT_REPEAT(722),
-  [1779] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_comparison_operator_repeat1, 2, .production_id = 42), SHIFT_REPEAT(669),
-  [1782] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_dictionary_splat_pattern, 2, .production_id = 34),
-  [1784] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_dictionary_splat_pattern, 2, .production_id = 33),
-  [1786] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_comparison_operator_repeat1, 2, .production_id = 42), SHIFT_REPEAT(680),
-  [1789] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_comparison_operator_repeat1, 2, .production_id = 42), SHIFT_REPEAT(1430),
-  [1792] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_comparison_operator_repeat1, 2, .production_id = 42), SHIFT_REPEAT(680),
-  [1795] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_comparison_operator_repeat1, 2, .production_id = 42), SHIFT_REPEAT(670),
-  [1798] = {.entry = {.count = 1, .reusable = true}}, SHIFT(172),
-  [1800] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_pattern_list, 2, .production_id = 16),
-  [1802] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1339),
-  [1804] = {.entry = {.count = 1, .reusable = true}}, SHIFT(596),
-  [1806] = {.entry = {.count = 1, .reusable = false}}, SHIFT(636),
-  [1808] = {.entry = {.count = 1, .reusable = true}}, SHIFT(444),
-  [1810] = {.entry = {.count = 1, .reusable = true}}, SHIFT(715),
-  [1812] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1340),
-  [1814] = {.entry = {.count = 1, .reusable = true}}, SHIFT(463),
-  [1816] = {.entry = {.count = 1, .reusable = true}}, SHIFT(309),
-  [1818] = {.entry = {.count = 1, .reusable = true}}, SHIFT(458),
-  [1820] = {.entry = {.count = 1, .reusable = true}}, SHIFT(165),
-  [1822] = {.entry = {.count = 1, .reusable = true}}, SHIFT(348),
-  [1824] = {.entry = {.count = 1, .reusable = true}}, SHIFT(156),
-  [1826] = {.entry = {.count = 1, .reusable = true}}, SHIFT(157),
-  [1828] = {.entry = {.count = 1, .reusable = true}}, SHIFT(481),
-  [1830] = {.entry = {.count = 1, .reusable = false}}, SHIFT(1365),
-  [1832] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1008),
-  [1834] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1357),
-  [1836] = {.entry = {.count = 1, .reusable = true}}, SHIFT(993),
-  [1838] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1177),
-  [1840] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1380),
-  [1842] = {.entry = {.count = 1, .reusable = true}}, SHIFT(986),
-  [1844] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__parameters, 2),
-  [1846] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__parameters, 3),
-  [1848] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_await, 2),
-  [1850] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_await, 2),
-  [1852] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_not_operator, 2, .production_id = 10),
-  [1854] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_not_operator, 2, .production_id = 10),
-  [1856] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_match_value_pattern_repeat1, 2),
-  [1858] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_match_value_pattern_repeat1, 2), SHIFT_REPEAT(1445),
-  [1861] = {.entry = {.count = 1, .reusable = true}}, SHIFT(182),
-  [1863] = {.entry = {.count = 1, .reusable = true}}, SHIFT(386),
-  [1865] = {.entry = {.count = 1, .reusable = true}}, SHIFT(473),
-  [1867] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1416),
-  [1869] = {.entry = {.count = 1, .reusable = true}}, SHIFT(601),
-  [1871] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__collection_elements, 1, .production_id = 7),
-  [1873] = {.entry = {.count = 1, .reusable = true}}, SHIFT(455),
-  [1875] = {.entry = {.count = 1, .reusable = true}}, SHIFT(457),
-  [1877] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_lambda, 4, .production_id = 66),
-  [1879] = {.entry = {.count = 1, .reusable = true}}, SHIFT(429),
-  [1881] = {.entry = {.count = 1, .reusable = true}}, SHIFT(446),
-  [1883] = {.entry = {.count = 1, .reusable = true}}, SHIFT(409),
-  [1885] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_conditional_expression, 5),
-  [1887] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_conditional_expression, 5),
-  [1889] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1445),
-  [1891] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_pattern_class_name, 2),
-  [1893] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_match_value_pattern, 2),
-  [1895] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_lambda, 3, .production_id = 32),
-  [1897] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_lambda, 3, .production_id = 32),
-  [1899] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_match_literal_pattern, 1),
-  [1901] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_named_expression, 3, .production_id = 35),
-  [1903] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_named_expression, 3, .production_id = 35),
-  [1905] = {.entry = {.count = 1, .reusable = true}}, SHIFT(842),
-  [1907] = {.entry = {.count = 2, .reusable = true}}, REDUCE(sym_with_item, 1, .dynamic_precedence = -1, .production_id = 12), SHIFT(182),
-  [1910] = {.entry = {.count = 1, .reusable = false}}, SHIFT(608),
-  [1912] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_boolean_operator, 3, .production_id = 39),
-  [1914] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_boolean_operator, 3, .production_id = 39),
-  [1916] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_lambda, 4, .production_id = 66),
-  [1918] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_pattern_class_name, 1),
-  [1920] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_match_capture_pattern, 1),
-  [1922] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_named_expression, 3, .production_id = 27),
-  [1924] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_named_expression, 3, .production_id = 27),
-  [1926] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_yield, 2),
-  [1928] = {.entry = {.count = 1, .reusable = true}}, SHIFT(167),
-  [1930] = {.entry = {.count = 1, .reusable = true}}, SHIFT(628),
-  [1932] = {.entry = {.count = 1, .reusable = true}}, SHIFT(785),
-  [1934] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_expression_list_repeat1, 2, .production_id = 31),
-  [1936] = {.entry = {.count = 1, .reusable = false}}, SHIFT(178),
-  [1938] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1031),
-  [1940] = {.entry = {.count = 1, .reusable = false}}, SHIFT(1031),
-  [1942] = {.entry = {.count = 1, .reusable = false}}, SHIFT_EXTRA(),
-  [1944] = {.entry = {.count = 1, .reusable = true}}, SHIFT(744),
-  [1946] = {.entry = {.count = 1, .reusable = true}}, SHIFT(736),
-  [1948] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_string_repeat1, 2, .production_id = 21), SHIFT_REPEAT(178),
-  [1951] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_string_repeat1, 2, .production_id = 21), SHIFT_REPEAT(1031),
-  [1954] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_string_repeat1, 2, .production_id = 21), SHIFT_REPEAT(1031),
-  [1957] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_string_repeat1, 2, .production_id = 21),
-  [1959] = {.entry = {.count = 1, .reusable = true}}, SHIFT(758),
-  [1961] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_yield, 3),
-  [1963] = {.entry = {.count = 1, .reusable = true}}, SHIFT(799),
-  [1965] = {.entry = {.count = 1, .reusable = true}}, SHIFT(216),
-  [1967] = {.entry = {.count = 1, .reusable = true}}, SHIFT(609),
-  [1969] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_match_literal_pattern, 1, .production_id = 83),
-  [1971] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1381),
-  [1973] = {.entry = {.count = 1, .reusable = true}}, SHIFT(610),
-  [1975] = {.entry = {.count = 1, .reusable = true}}, SHIFT(820),
-  [1977] = {.entry = {.count = 1, .reusable = true}}, SHIFT(196),
-  [1979] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_dictionary_splat, 2, .production_id = 14),
-  [1981] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_list_splat, 2),
-  [1983] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1291),
-  [1985] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1318),
-  [1987] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_match_literal_pattern, 2, .production_id = 109),
-  [1989] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1387),
-  [1991] = {.entry = {.count = 1, .reusable = true}}, SHIFT(769),
-  [1993] = {.entry = {.count = 1, .reusable = true}}, SHIFT(621),
-  [1995] = {.entry = {.count = 1, .reusable = true}}, SHIFT(203),
-  [1997] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_match_or_pattern_repeat1, 2),
-  [1999] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_match_or_pattern_repeat1, 2), SHIFT_REPEAT(866),
-  [2002] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym__comprehension_clauses_repeat1, 2),
-  [2004] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym__comprehension_clauses_repeat1, 2), SHIFT_REPEAT(390),
-  [2007] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym__comprehension_clauses_repeat1, 2), SHIFT_REPEAT(1416),
-  [2010] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym__comprehension_clauses_repeat1, 2), SHIFT_REPEAT(601),
-  [2013] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__comprehension_clauses, 1),
-  [2015] = {.entry = {.count = 1, .reusable = true}}, SHIFT(390),
-  [2017] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_match_or_pattern, 3),
-  [2019] = {.entry = {.count = 1, .reusable = true}}, SHIFT(866),
-  [2021] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__expression_within_for_in_clause, 1),
-  [2023] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__comprehension_clauses, 2),
-  [2025] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__f_expression, 1),
-  [2027] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_match_or_pattern, 4),
-  [2029] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_expression_list, 2, .production_id = 16),
-  [2031] = {.entry = {.count = 1, .reusable = true}}, SHIFT(171),
-  [2033] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1468),
-  [2035] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_match_class_pattern, 8, .production_id = 135),
-  [2037] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_match_class_pattern, 7, .production_id = 135),
-  [2039] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_match_mapping_pattern, 7),
-  [2041] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_match_class_pattern, 6, .production_id = 135),
-  [2043] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__match_or_pattern, 1),
-  [2045] = {.entry = {.count = 1, .reusable = true}}, SHIFT(867),
-  [2047] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_match_mapping_pattern, 6),
-  [2049] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_match_sequence_pattern, 3),
-  [2051] = {.entry = {.count = 1, .reusable = true}}, SHIFT(411),
-  [2053] = {.entry = {.count = 1, .reusable = true}}, SHIFT(410),
-  [2055] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_match_group_pattern, 3, .production_id = 130),
-  [2057] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_for_in_clause, 5, .production_id = 122),
-  [2059] = {.entry = {.count = 1, .reusable = true}}, SHIFT(192),
-  [2061] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_for_in_clause, 5, .production_id = 121),
-  [2063] = {.entry = {.count = 1, .reusable = true}}, SHIFT(202),
-  [2065] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_match_class_pattern, 5, .production_id = 135),
-  [2067] = {.entry = {.count = 1, .reusable = true}}, SHIFT(477),
-  [2069] = {.entry = {.count = 1, .reusable = true}}, SHIFT(210),
-  [2071] = {.entry = {.count = 1, .reusable = true}}, SHIFT(415),
-  [2073] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_raise_statement, 2),
-  [2075] = {.entry = {.count = 1, .reusable = true}}, SHIFT(168),
-  [2077] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_match_mapping_pattern, 5),
-  [2079] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_match_sequence_pattern, 5),
-  [2081] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_match_mapping_pattern, 3),
-  [2083] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_match_class_pattern, 9, .production_id = 135),
-  [2085] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_match_literal_pattern, 3, .production_id = 131),
-  [2087] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1435),
-  [2089] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_match_mapping_pattern, 2),
-  [2091] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_if_clause, 2),
-  [2093] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_for_in_clause, 6, .production_id = 140),
-  [2095] = {.entry = {.count = 1, .reusable = true}}, SHIFT(185),
-  [2097] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1520),
-  [2099] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1516),
-  [2101] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1498),
-  [2103] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_match_class_pattern, 3, .production_id = 135),
-  [2105] = {.entry = {.count = 1, .reusable = true}}, SHIFT(865),
+  [1583] = {.entry = {.count = 1, .reusable = false}}, SHIFT(657),
+  [1585] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_await, 2),
+  [1587] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_await, 2),
+  [1589] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_comparison_operator_repeat1, 3, .production_id = 72),
+  [1591] = {.entry = {.count = 1, .reusable = false}}, REDUCE(aux_sym_comparison_operator_repeat1, 3, .production_id = 72),
+  [1593] = {.entry = {.count = 1, .reusable = false}}, SHIFT(654),
+  [1595] = {.entry = {.count = 1, .reusable = false}}, SHIFT(704),
+  [1597] = {.entry = {.count = 1, .reusable = false}}, SHIFT(862),
+  [1599] = {.entry = {.count = 1, .reusable = false}}, SHIFT(861),
+  [1601] = {.entry = {.count = 1, .reusable = false}}, SHIFT(222),
+  [1603] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_concatenated_string_repeat1, 2), SHIFT_REPEAT(922),
+  [1606] = {.entry = {.count = 1, .reusable = true}}, SHIFT(409),
+  [1608] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1408),
+  [1610] = {.entry = {.count = 1, .reusable = true}}, SHIFT(171),
+  [1612] = {.entry = {.count = 1, .reusable = false}}, SHIFT(691),
+  [1614] = {.entry = {.count = 1, .reusable = true}}, SHIFT(694),
+  [1616] = {.entry = {.count = 1, .reusable = true}}, SHIFT(695),
+  [1618] = {.entry = {.count = 1, .reusable = true}}, SHIFT(696),
+  [1620] = {.entry = {.count = 1, .reusable = true}}, SHIFT(697),
+  [1622] = {.entry = {.count = 1, .reusable = true}}, SHIFT(259),
+  [1624] = {.entry = {.count = 1, .reusable = true}}, SHIFT(699),
+  [1626] = {.entry = {.count = 1, .reusable = true}}, SHIFT(691),
+  [1628] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1409),
+  [1630] = {.entry = {.count = 1, .reusable = true}}, SHIFT(700),
+  [1632] = {.entry = {.count = 1, .reusable = true}}, SHIFT(702),
+  [1634] = {.entry = {.count = 1, .reusable = false}}, SHIFT(695),
+  [1636] = {.entry = {.count = 1, .reusable = true}}, SHIFT(641),
+  [1638] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_concatenated_string_repeat1, 2), SHIFT_REPEAT(916),
+  [1641] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1391),
+  [1643] = {.entry = {.count = 1, .reusable = true}}, SHIFT(175),
+  [1645] = {.entry = {.count = 1, .reusable = false}}, SHIFT(665),
+  [1647] = {.entry = {.count = 1, .reusable = true}}, SHIFT(664),
+  [1649] = {.entry = {.count = 1, .reusable = true}}, SHIFT(662),
+  [1651] = {.entry = {.count = 1, .reusable = true}}, SHIFT(661),
+  [1653] = {.entry = {.count = 1, .reusable = true}}, SHIFT(659),
+  [1655] = {.entry = {.count = 1, .reusable = true}}, SHIFT(262),
+  [1657] = {.entry = {.count = 1, .reusable = true}}, SHIFT(658),
+  [1659] = {.entry = {.count = 1, .reusable = true}}, SHIFT(665),
+  [1661] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1422),
+  [1663] = {.entry = {.count = 1, .reusable = true}}, SHIFT(656),
+  [1665] = {.entry = {.count = 1, .reusable = true}}, SHIFT(655),
+  [1667] = {.entry = {.count = 1, .reusable = false}}, SHIFT(662),
+  [1669] = {.entry = {.count = 1, .reusable = true}}, SHIFT(626),
+  [1671] = {.entry = {.count = 1, .reusable = false}}, SHIFT(455),
+  [1673] = {.entry = {.count = 1, .reusable = true}}, SHIFT(417),
+  [1675] = {.entry = {.count = 1, .reusable = false}}, SHIFT(905),
+  [1677] = {.entry = {.count = 1, .reusable = true}}, SHIFT(837),
+  [1679] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1181),
+  [1681] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1382),
+  [1683] = {.entry = {.count = 1, .reusable = false}}, SHIFT(964),
+  [1685] = {.entry = {.count = 1, .reusable = true}}, SHIFT(836),
+  [1687] = {.entry = {.count = 1, .reusable = true}}, SHIFT(873),
+  [1689] = {.entry = {.count = 1, .reusable = false}}, SHIFT(919),
+  [1691] = {.entry = {.count = 1, .reusable = true}}, SHIFT(919),
+  [1693] = {.entry = {.count = 1, .reusable = false}}, SHIFT(969),
+  [1695] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_open_sequence_match_pattern, 3),
+  [1697] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_open_sequence_match_pattern, 3),
+  [1699] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_open_sequence_match_pattern, 2),
+  [1701] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_open_sequence_match_pattern, 2),
+  [1703] = {.entry = {.count = 1, .reusable = true}}, SHIFT(968),
+  [1705] = {.entry = {.count = 1, .reusable = true}}, SHIFT(949),
+  [1707] = {.entry = {.count = 1, .reusable = true}}, SHIFT(954),
+  [1709] = {.entry = {.count = 1, .reusable = false}}, SHIFT(983),
+  [1711] = {.entry = {.count = 1, .reusable = true}}, SHIFT(984),
+  [1713] = {.entry = {.count = 1, .reusable = true}}, SHIFT(961),
+  [1715] = {.entry = {.count = 1, .reusable = true}}, SHIFT(953),
+  [1717] = {.entry = {.count = 1, .reusable = false}}, SHIFT(944),
+  [1719] = {.entry = {.count = 1, .reusable = false}}, SHIFT(948),
+  [1721] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_comparison_operator_repeat1, 2, .production_id = 42),
+  [1723] = {.entry = {.count = 1, .reusable = false}}, REDUCE(aux_sym_comparison_operator_repeat1, 2, .production_id = 42),
+  [1725] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_comparison_operator_repeat1, 2, .production_id = 42), SHIFT_REPEAT(684),
+  [1728] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_comparison_operator_repeat1, 2, .production_id = 42), SHIFT_REPEAT(1464),
+  [1731] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_comparison_operator_repeat1, 2, .production_id = 42), SHIFT_REPEAT(684),
+  [1734] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_comparison_operator_repeat1, 2, .production_id = 42), SHIFT_REPEAT(646),
+  [1737] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_comparison_operator, 2, .production_id = 18),
+  [1739] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_comparison_operator, 2, .production_id = 18),
+  [1741] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_comparison_operator_repeat1, 2, .production_id = 42), SHIFT_REPEAT(681),
+  [1744] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_comparison_operator_repeat1, 2, .production_id = 42), SHIFT_REPEAT(1393),
+  [1747] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_comparison_operator_repeat1, 2, .production_id = 42), SHIFT_REPEAT(681),
+  [1750] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_comparison_operator_repeat1, 2, .production_id = 42), SHIFT_REPEAT(635),
+  [1753] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym__patterns_repeat1, 2, .production_id = 36),
+  [1755] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym__patterns_repeat1, 2, .production_id = 36), SHIFT_REPEAT(583),
+  [1758] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_tuple_pattern, 3, .production_id = 25),
+  [1760] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym__patterns_repeat1, 2, .production_id = 31),
+  [1762] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_comparison_operator_repeat1, 2, .production_id = 42), SHIFT_REPEAT(695),
+  [1765] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_comparison_operator_repeat1, 2, .production_id = 42), SHIFT_REPEAT(1409),
+  [1768] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_comparison_operator_repeat1, 2, .production_id = 42), SHIFT_REPEAT(695),
+  [1771] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_comparison_operator_repeat1, 2, .production_id = 42), SHIFT_REPEAT(641),
+  [1774] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_list_pattern, 3, .production_id = 25),
+  [1776] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_dictionary_splat_pattern, 2, .production_id = 34),
+  [1778] = {.entry = {.count = 1, .reusable = true}}, SHIFT(158),
+  [1780] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_pattern_list, 2, .production_id = 16),
+  [1782] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_comparison_operator_repeat1, 2, .production_id = 42), SHIFT_REPEAT(662),
+  [1785] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_comparison_operator_repeat1, 2, .production_id = 42), SHIFT_REPEAT(1422),
+  [1788] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_comparison_operator_repeat1, 2, .production_id = 42), SHIFT_REPEAT(662),
+  [1791] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_comparison_operator_repeat1, 2, .production_id = 42), SHIFT_REPEAT(626),
+  [1794] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1250),
+  [1796] = {.entry = {.count = 1, .reusable = true}}, SHIFT(495),
+  [1798] = {.entry = {.count = 1, .reusable = false}}, SHIFT(587),
+  [1800] = {.entry = {.count = 1, .reusable = true}}, SHIFT(447),
+  [1802] = {.entry = {.count = 1, .reusable = true}}, SHIFT(670),
+  [1804] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1249),
+  [1806] = {.entry = {.count = 1, .reusable = true}}, SHIFT(415),
+  [1808] = {.entry = {.count = 1, .reusable = true}}, SHIFT(372),
+  [1810] = {.entry = {.count = 1, .reusable = true}}, SHIFT(309),
+  [1812] = {.entry = {.count = 1, .reusable = true}}, SHIFT(160),
+  [1814] = {.entry = {.count = 1, .reusable = true}}, SHIFT(265),
+  [1816] = {.entry = {.count = 1, .reusable = true}}, SHIFT(151),
+  [1818] = {.entry = {.count = 1, .reusable = true}}, SHIFT(150),
+  [1820] = {.entry = {.count = 1, .reusable = true}}, SHIFT(375),
+  [1822] = {.entry = {.count = 1, .reusable = false}}, SHIFT(1352),
+  [1824] = {.entry = {.count = 1, .reusable = true}}, SHIFT(958),
+  [1826] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1354),
+  [1828] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1114),
+  [1830] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1323),
+  [1832] = {.entry = {.count = 1, .reusable = true}}, SHIFT(965),
+  [1834] = {.entry = {.count = 1, .reusable = true}}, SHIFT(952),
+  [1836] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__parameters, 2),
+  [1838] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__parameters, 3),
+  [1840] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_not_operator, 2, .production_id = 10),
+  [1842] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_not_operator, 2, .production_id = 10),
+  [1844] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_match_value_pattern_repeat1, 2),
+  [1846] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_match_value_pattern_repeat1, 2), SHIFT_REPEAT(1463),
+  [1849] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_named_expression, 3, .production_id = 35),
+  [1851] = {.entry = {.count = 1, .reusable = true}}, SHIFT(445),
+  [1853] = {.entry = {.count = 1, .reusable = true}}, SHIFT(462),
+  [1855] = {.entry = {.count = 1, .reusable = true}}, SHIFT(170),
+  [1857] = {.entry = {.count = 1, .reusable = true}}, SHIFT(370),
+  [1859] = {.entry = {.count = 1, .reusable = true}}, SHIFT(394),
+  [1861] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1415),
+  [1863] = {.entry = {.count = 1, .reusable = true}}, SHIFT(576),
+  [1865] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__collection_elements, 1, .production_id = 7),
+  [1867] = {.entry = {.count = 1, .reusable = true}}, SHIFT(456),
+  [1869] = {.entry = {.count = 1, .reusable = true}}, SHIFT(439),
+  [1871] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_named_expression, 3, .production_id = 27),
+  [1873] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_yield, 2),
+  [1875] = {.entry = {.count = 1, .reusable = true}}, SHIFT(162),
+  [1877] = {.entry = {.count = 1, .reusable = true}}, SHIFT(406),
+  [1879] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_boolean_operator, 3, .production_id = 39),
+  [1881] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_boolean_operator, 3, .production_id = 39),
+  [1883] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_conditional_expression, 5),
+  [1885] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_conditional_expression, 5),
+  [1887] = {.entry = {.count = 1, .reusable = true}}, SHIFT(805),
+  [1889] = {.entry = {.count = 2, .reusable = true}}, REDUCE(sym_with_item, 1, .dynamic_precedence = -1, .production_id = 12), SHIFT(170),
+  [1892] = {.entry = {.count = 1, .reusable = false}}, SHIFT(585),
+  [1894] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_lambda, 3, .production_id = 32),
+  [1896] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_match_literal_pattern, 1),
+  [1898] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_lambda, 4, .production_id = 66),
+  [1900] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_named_expression, 3, .production_id = 35),
+  [1902] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1463),
+  [1904] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_pattern_class_name, 1),
+  [1906] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_match_capture_pattern, 1),
+  [1908] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_pattern_class_name, 2),
+  [1910] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_match_value_pattern, 2),
+  [1912] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_named_expression, 3, .production_id = 27),
+  [1914] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_lambda, 4, .production_id = 66),
+  [1916] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_lambda, 3, .production_id = 32),
+  [1918] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_yield, 3),
+  [1920] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_list_splat, 2),
+  [1922] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_dictionary_splat, 2, .production_id = 14),
+  [1924] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_string_repeat1, 2, .production_id = 21), SHIFT_REPEAT(172),
+  [1927] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_string_repeat1, 2, .production_id = 21), SHIFT_REPEAT(1001),
+  [1930] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_string_repeat1, 2, .production_id = 21), SHIFT_REPEAT(1001),
+  [1933] = {.entry = {.count = 1, .reusable = false}}, SHIFT_EXTRA(),
+  [1935] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_string_repeat1, 2, .production_id = 21),
+  [1937] = {.entry = {.count = 1, .reusable = false}}, SHIFT(172),
+  [1939] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1001),
+  [1941] = {.entry = {.count = 1, .reusable = false}}, SHIFT(1001),
+  [1943] = {.entry = {.count = 1, .reusable = true}}, SHIFT(735),
+  [1945] = {.entry = {.count = 1, .reusable = true}}, SHIFT(797),
+  [1947] = {.entry = {.count = 1, .reusable = true}}, SHIFT(187),
+  [1949] = {.entry = {.count = 1, .reusable = true}}, SHIFT(593),
+  [1951] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_match_literal_pattern, 1, .production_id = 83),
+  [1953] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1327),
+  [1955] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_expression_list_repeat1, 2, .production_id = 31),
+  [1957] = {.entry = {.count = 1, .reusable = true}}, SHIFT(732),
+  [1959] = {.entry = {.count = 1, .reusable = true}}, SHIFT(715),
+  [1961] = {.entry = {.count = 1, .reusable = true}}, SHIFT(588),
+  [1963] = {.entry = {.count = 1, .reusable = true}}, SHIFT(589),
+  [1965] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_match_literal_pattern, 2, .production_id = 110),
+  [1967] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1320),
+  [1969] = {.entry = {.count = 1, .reusable = true}}, SHIFT(761),
+  [1971] = {.entry = {.count = 1, .reusable = true}}, SHIFT(208),
+  [1973] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1194),
+  [1975] = {.entry = {.count = 1, .reusable = true}}, SHIFT(720),
+  [1977] = {.entry = {.count = 1, .reusable = true}}, SHIFT(601),
+  [1979] = {.entry = {.count = 1, .reusable = true}}, SHIFT(198),
+  [1981] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1197),
+  [1983] = {.entry = {.count = 1, .reusable = true}}, SHIFT(785),
+  [1985] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__expression_within_for_in_clause, 1),
+  [1987] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__f_expression, 1),
+  [1989] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym__comprehension_clauses_repeat1, 2),
+  [1991] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym__comprehension_clauses_repeat1, 2), SHIFT_REPEAT(376),
+  [1994] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym__comprehension_clauses_repeat1, 2), SHIFT_REPEAT(1415),
+  [1997] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym__comprehension_clauses_repeat1, 2), SHIFT_REPEAT(576),
+  [2000] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_match_or_pattern_repeat1, 2),
+  [2002] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_match_or_pattern_repeat1, 2), SHIFT_REPEAT(849),
+  [2005] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_match_or_pattern, 4),
+  [2007] = {.entry = {.count = 1, .reusable = true}}, SHIFT(849),
+  [2009] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__comprehension_clauses, 1),
+  [2011] = {.entry = {.count = 1, .reusable = true}}, SHIFT(376),
+  [2013] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__comprehension_clauses, 2),
+  [2015] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_match_or_pattern, 3),
+  [2017] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_match_mapping_pattern, 7),
+  [2019] = {.entry = {.count = 1, .reusable = true}}, SHIFT(426),
+  [2021] = {.entry = {.count = 1, .reusable = true}}, SHIFT(182),
+  [2023] = {.entry = {.count = 1, .reusable = true}}, SHIFT(396),
+  [2025] = {.entry = {.count = 1, .reusable = true}}, SHIFT(404),
+  [2027] = {.entry = {.count = 1, .reusable = true}}, SHIFT(405),
+  [2029] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_raise_statement, 2),
+  [2031] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1501),
+  [2033] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1497),
+  [2035] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1478),
+  [2037] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_match_sequence_pattern, 2),
+  [2039] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_expression_list, 2, .production_id = 16),
+  [2041] = {.entry = {.count = 1, .reusable = true}}, SHIFT(161),
+  [2043] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_match_mapping_pattern, 5),
+  [2045] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_match_class_pattern, 5, .production_id = 139),
+  [2047] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_match_sequence_pattern, 5),
+  [2049] = {.entry = {.count = 1, .reusable = true}}, SHIFT(164),
+  [2051] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_for_in_clause, 4, .production_id = 101),
+  [2053] = {.entry = {.count = 1, .reusable = true}}, SHIFT(192),
+  [2055] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_match_mapping_pattern, 2),
+  [2057] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_match_mapping_pattern, 6),
+  [2059] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_match_class_pattern, 4, .production_id = 139),
+  [2061] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_match_class_pattern, 6, .production_id = 139),
+  [2063] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_expression_list_repeat1, 2, .production_id = 36),
+  [2065] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_expression_list_repeat1, 2, .production_id = 36), SHIFT_REPEAT(246),
+  [2068] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__match_or_pattern, 1),
+  [2070] = {.entry = {.count = 1, .reusable = true}}, SHIFT(848),
+  [2072] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_match_mapping_pattern, 4),
+  [2074] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_match_class_pattern, 7, .production_id = 139),
+  [2076] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_match_literal_pattern, 4, .production_id = 152),
+  [2078] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_match_sequence_pattern, 4),
+  [2080] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_match_class_pattern, 8, .production_id = 139),
+  [2082] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_for_in_clause_repeat1, 2),
+  [2084] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_for_in_clause_repeat1, 2), SHIFT_REPEAT(308),
+  [2087] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_match_class_pattern, 9, .production_id = 139),
+  [2089] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_for_in_clause, 6, .production_id = 144),
+  [2091] = {.entry = {.count = 1, .reusable = true}}, SHIFT(200),
+  [2093] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_if_clause, 2),
+  [2095] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_for_in_clause, 5, .production_id = 125),
+  [2097] = {.entry = {.count = 1, .reusable = true}}, SHIFT(202),
+  [2099] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_for_in_clause, 5, .production_id = 126),
+  [2101] = {.entry = {.count = 1, .reusable = true}}, SHIFT(207),
+  [2103] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1410),
+  [2105] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1492),
   [2107] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1488),
-  [2109] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1511),
-  [2111] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1508),
-  [2113] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_match_class_pattern, 4, .production_id = 135),
-  [2115] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_expression_list_repeat1, 2, .production_id = 36),
-  [2117] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_expression_list_repeat1, 2, .production_id = 36), SHIFT_REPEAT(245),
-  [2120] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_match_sequence_pattern, 2),
-  [2122] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_match_mapping_pattern, 4),
-  [2124] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_match_literal_pattern, 4, .production_id = 147),
-  [2126] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_match_sequence_pattern, 4),
-  [2128] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_for_in_clause_repeat1, 2),
-  [2130] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_for_in_clause_repeat1, 2), SHIFT_REPEAT(280),
-  [2133] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_for_in_clause, 4, .production_id = 100),
-  [2135] = {.entry = {.count = 1, .reusable = true}}, SHIFT(213),
-  [2137] = {.entry = {.count = 1, .reusable = false}}, SHIFT(1061),
-  [2139] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1144),
-  [2141] = {.entry = {.count = 1, .reusable = false}}, SHIFT(1444),
-  [2143] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_lambda_within_for_in_clause, 3, .production_id = 32),
-  [2145] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_expression_statement, 1),
-  [2147] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1139),
-  [2149] = {.entry = {.count = 1, .reusable = false}}, SHIFT(1456),
-  [2151] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1457),
-  [2153] = {.entry = {.count = 1, .reusable = true}}, SHIFT(262),
-  [2155] = {.entry = {.count = 1, .reusable = true}}, SHIFT(259),
-  [2157] = {.entry = {.count = 1, .reusable = true}}, SHIFT(352),
-  [2159] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_type, 1),
-  [2161] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__match_pattern, 1),
-  [2163] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1440),
-  [2165] = {.entry = {.count = 1, .reusable = true}}, SHIFT(395),
-  [2167] = {.entry = {.count = 1, .reusable = true}}, SHIFT(396),
-  [2169] = {.entry = {.count = 1, .reusable = true}}, SHIFT(480),
-  [2171] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_exec_statement, 4, .production_id = 15),
-  [2173] = {.entry = {.count = 1, .reusable = true}}, SHIFT(426),
-  [2175] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_string_content, 1),
-  [2177] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1055),
-  [2179] = {.entry = {.count = 1, .reusable = false}}, SHIFT(1055),
-  [2181] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_string_content, 1),
-  [2183] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_lambda_within_for_in_clause, 4, .production_id = 66),
-  [2185] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__right_hand_side, 1),
-  [2187] = {.entry = {.count = 1, .reusable = true}}, SHIFT(252),
-  [2189] = {.entry = {.count = 1, .reusable = true}}, SHIFT(624),
-  [2191] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_pair, 3, .production_id = 62),
-  [2193] = {.entry = {.count = 1, .reusable = true}}, SHIFT(269),
-  [2195] = {.entry = {.count = 1, .reusable = true}}, SHIFT(219),
-  [2197] = {.entry = {.count = 1, .reusable = true}}, SHIFT(300),
-  [2199] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_print_statement, 2, .production_id = 10),
-  [2201] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_assert_statement, 2),
-  [2203] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_return_statement, 2),
-  [2205] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_delete_statement, 2, .production_id = 11),
-  [2207] = {.entry = {.count = 1, .reusable = true}}, SHIFT(261),
-  [2209] = {.entry = {.count = 1, .reusable = true}}, SHIFT(822),
-  [2211] = {.entry = {.count = 1, .reusable = true}}, SHIFT(246),
-  [2213] = {.entry = {.count = 1, .reusable = true}}, SHIFT(815),
-  [2215] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_with_item, 1, .dynamic_precedence = -1, .production_id = 12),
-  [2217] = {.entry = {.count = 1, .reusable = true}}, SHIFT(608),
-  [2219] = {.entry = {.count = 1, .reusable = true}}, SHIFT(251),
-  [2221] = {.entry = {.count = 1, .reusable = true}}, SHIFT(774),
-  [2223] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym__collection_elements_repeat1, 2, .production_id = 31),
-  [2225] = {.entry = {.count = 1, .reusable = false}}, REDUCE(aux_sym_string_content_repeat1, 2),
-  [2227] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_string_content_repeat1, 2), SHIFT_REPEAT(1055),
-  [2230] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_string_content_repeat1, 2), SHIFT_REPEAT(1055),
-  [2233] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_string_content_repeat1, 2),
-  [2235] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1088),
-  [2237] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1193),
-  [2239] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1400),
-  [2241] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_match_value_pattern_repeat1, 2), SHIFT_REPEAT(1477),
-  [2244] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_dotted_name, 2),
-  [2246] = {.entry = {.count = 1, .reusable = true}}, SHIFT(124),
-  [2248] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_interpolation, 3, .production_id = 43),
-  [2250] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_interpolation, 3, .production_id = 43),
-  [2252] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_dotted_name, 1),
-  [2254] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_decorated_definition_repeat1, 2),
-  [2256] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_decorated_definition_repeat1, 2), SHIFT_REPEAT(417),
-  [2259] = {.entry = {.count = 1, .reusable = true}}, SHIFT(399),
-  [2261] = {.entry = {.count = 1, .reusable = true}}, SHIFT(125),
-  [2263] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_slice, 3, .production_id = 95),
-  [2265] = {.entry = {.count = 1, .reusable = true}}, SHIFT(289),
-  [2267] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_assert_statement_repeat1, 2),
-  [2269] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_print_statement_repeat1, 2, .production_id = 10),
-  [2271] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_interpolation, 4, .production_id = 43),
-  [2273] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_interpolation, 4, .production_id = 43),
-  [2275] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1477),
-  [2277] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_interpolation, 5, .production_id = 43),
-  [2279] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_interpolation, 5, .production_id = 43),
-  [2281] = {.entry = {.count = 1, .reusable = true}}, SHIFT(73),
-  [2283] = {.entry = {.count = 1, .reusable = false}}, REDUCE(aux_sym_string_repeat1, 1, .production_id = 3),
-  [2285] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_string_repeat1, 1, .production_id = 3),
-  [2287] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_default_parameter, 3, .production_id = 35),
-  [2289] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_interpolation, 6, .production_id = 43),
-  [2291] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_interpolation, 6, .production_id = 43),
-  [2293] = {.entry = {.count = 1, .reusable = true}}, SHIFT(97),
-  [2295] = {.entry = {.count = 1, .reusable = false}}, REDUCE(aux_sym_string_repeat1, 1, .production_id = 4),
-  [2297] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_string_repeat1, 1, .production_id = 4),
-  [2299] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_open_sequence_match_pattern_repeat1, 2),
-  [2301] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_open_sequence_match_pattern_repeat1, 2), SHIFT_REPEAT(859),
-  [2304] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_chevron, 2),
-  [2306] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1184),
-  [2308] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1180),
-  [2310] = {.entry = {.count = 1, .reusable = true}}, SHIFT(471),
-  [2312] = {.entry = {.count = 1, .reusable = true}}, SHIFT(103),
-  [2314] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_slice, 2, .production_id = 68),
-  [2316] = {.entry = {.count = 1, .reusable = true}}, SHIFT(294),
-  [2318] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_typed_default_parameter, 5, .production_id = 118),
-  [2320] = {.entry = {.count = 1, .reusable = true}}, SHIFT(118),
-  [2322] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_subscript_repeat1, 2, .production_id = 94),
-  [2324] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_match_as_pattern, 3, .production_id = 134),
-  [2326] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_slice, 4, .production_id = 120),
-  [2328] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_slice, 4, .production_id = 119),
-  [2330] = {.entry = {.count = 1, .reusable = true}}, SHIFT(205),
-  [2332] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__import_list, 3, .production_id = 22),
-  [2334] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_expression_list_repeat1, 2, .production_id = 36), SHIFT_REPEAT(244),
-  [2337] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1125),
-  [2339] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1253),
-  [2341] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1181),
-  [2343] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1260),
-  [2345] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__type_bound, 2, .production_id = 110),
-  [2347] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_format_specifier, 2),
-  [2349] = {.entry = {.count = 1, .reusable = true}}, SHIFT(183),
-  [2351] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1117),
-  [2353] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_slice, 5, .production_id = 139),
-  [2355] = {.entry = {.count = 1, .reusable = true}}, SHIFT(468),
-  [2357] = {.entry = {.count = 1, .reusable = true}}, SHIFT(100),
-  [2359] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_raise_statement, 3, .production_id = 30),
-  [2361] = {.entry = {.count = 1, .reusable = true}}, SHIFT(176),
-  [2363] = {.entry = {.count = 1, .reusable = true}}, SHIFT(104),
-  [2365] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1037),
-  [2367] = {.entry = {.count = 1, .reusable = true}}, SHIFT(123),
-  [2369] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1118),
-  [2371] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1450),
+  [2109] = {.entry = {.count = 1, .reusable = true}}, SHIFT(847),
+  [2111] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_match_class_pattern, 3, .production_id = 139),
+  [2113] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_match_group_pattern, 3, .production_id = 134),
+  [2115] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_match_mapping_pattern, 3),
+  [2117] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_match_sequence_pattern, 3),
+  [2119] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_match_literal_pattern, 3, .production_id = 135),
+  [2121] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1070),
+  [2123] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1174),
+  [2125] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1376),
+  [2127] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__match_pattern, 1),
+  [2129] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1440),
+  [2131] = {.entry = {.count = 1, .reusable = false}}, SHIFT(1058),
+  [2133] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1144),
+  [2135] = {.entry = {.count = 1, .reusable = false}}, SHIFT(1446),
+  [2137] = {.entry = {.count = 1, .reusable = false}}, REDUCE(aux_sym_string_content_repeat1, 2),
+  [2139] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_string_content_repeat1, 2), SHIFT_REPEAT(994),
+  [2142] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_string_content_repeat1, 2), SHIFT_REPEAT(994),
+  [2145] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_string_content_repeat1, 2),
+  [2147] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_expression_statement, 1),
+  [2149] = {.entry = {.count = 1, .reusable = true}}, SHIFT(324),
+  [2151] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1494),
+  [2153] = {.entry = {.count = 1, .reusable = true}}, SHIFT(428),
+  [2155] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_exec_statement, 4, .production_id = 15),
+  [2157] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_string_content, 1),
+  [2159] = {.entry = {.count = 1, .reusable = true}}, SHIFT(994),
+  [2161] = {.entry = {.count = 1, .reusable = false}}, SHIFT(994),
+  [2163] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_string_content, 1),
+  [2165] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_pair, 3, .production_id = 62),
+  [2167] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym__collection_elements_repeat1, 2, .production_id = 31),
+  [2169] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1044),
+  [2171] = {.entry = {.count = 1, .reusable = false}}, SHIFT(1484),
+  [2173] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1485),
+  [2175] = {.entry = {.count = 1, .reusable = true}}, SHIFT(364),
+  [2177] = {.entry = {.count = 1, .reusable = true}}, SHIFT(419),
+  [2179] = {.entry = {.count = 1, .reusable = true}}, SHIFT(451),
+  [2181] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_type, 1),
+  [2183] = {.entry = {.count = 1, .reusable = true}}, SHIFT(236),
+  [2185] = {.entry = {.count = 1, .reusable = true}}, SHIFT(278),
+  [2187] = {.entry = {.count = 1, .reusable = true}}, SHIFT(327),
+  [2189] = {.entry = {.count = 1, .reusable = true}}, SHIFT(305),
+  [2191] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_print_statement, 2, .production_id = 10),
+  [2193] = {.entry = {.count = 1, .reusable = true}}, SHIFT(306),
+  [2195] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1447),
+  [2197] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_assert_statement, 2),
+  [2199] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_lambda_within_for_in_clause, 3, .production_id = 32),
+  [2201] = {.entry = {.count = 1, .reusable = true}}, SHIFT(245),
+  [2203] = {.entry = {.count = 1, .reusable = true}}, SHIFT(218),
+  [2205] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_return_statement, 2),
+  [2207] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_delete_statement, 2, .production_id = 11),
+  [2209] = {.entry = {.count = 1, .reusable = true}}, SHIFT(227),
+  [2211] = {.entry = {.count = 1, .reusable = true}}, SHIFT(799),
+  [2213] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__right_hand_side, 1),
+  [2215] = {.entry = {.count = 1, .reusable = true}}, SHIFT(248),
+  [2217] = {.entry = {.count = 1, .reusable = true}}, SHIFT(817),
+  [2219] = {.entry = {.count = 1, .reusable = true}}, SHIFT(255),
+  [2221] = {.entry = {.count = 1, .reusable = true}}, SHIFT(773),
+  [2223] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_with_item, 1, .dynamic_precedence = -1, .production_id = 12),
+  [2225] = {.entry = {.count = 1, .reusable = true}}, SHIFT(585),
+  [2227] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_lambda_within_for_in_clause, 4, .production_id = 66),
+  [2229] = {.entry = {.count = 1, .reusable = true}}, SHIFT(247),
+  [2231] = {.entry = {.count = 1, .reusable = true}}, SHIFT(612),
+  [2233] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_match_value_pattern_repeat1, 2), SHIFT_REPEAT(1412),
+  [2236] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1137),
+  [2238] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_interpolation, 4, .production_id = 43),
+  [2240] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_interpolation, 4, .production_id = 43),
+  [2242] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_default_parameter, 3, .production_id = 35),
+  [2244] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1412),
+  [2246] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_dotted_name, 2),
+  [2248] = {.entry = {.count = 1, .reusable = false}}, REDUCE(aux_sym_string_repeat1, 1, .production_id = 3),
+  [2250] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_string_repeat1, 1, .production_id = 3),
+  [2252] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_typevar_parameter, 1, .production_id = 6),
+  [2254] = {.entry = {.count = 1, .reusable = true}}, SHIFT(413),
+  [2256] = {.entry = {.count = 1, .reusable = true}}, SHIFT(316),
+  [2258] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__type_bound, 2, .production_id = 112),
+  [2260] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1162),
+  [2262] = {.entry = {.count = 1, .reusable = false}}, REDUCE(aux_sym_string_repeat1, 1, .production_id = 4),
+  [2264] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_string_repeat1, 1, .production_id = 4),
+  [2266] = {.entry = {.count = 1, .reusable = true}}, SHIFT(116),
+  [2268] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_interpolation, 5, .production_id = 43),
+  [2270] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_interpolation, 5, .production_id = 43),
+  [2272] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_slice, 2, .production_id = 68),
+  [2274] = {.entry = {.count = 1, .reusable = true}}, SHIFT(311),
+  [2276] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_slice, 3, .production_id = 98),
+  [2278] = {.entry = {.count = 1, .reusable = true}}, SHIFT(314),
+  [2280] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_interpolation, 3, .production_id = 43),
+  [2282] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_interpolation, 3, .production_id = 43),
+  [2284] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_subscript_repeat1, 2, .production_id = 95),
+  [2286] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_decorated_definition_repeat1, 2),
+  [2288] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_decorated_definition_repeat1, 2), SHIFT_REPEAT(384),
+  [2291] = {.entry = {.count = 1, .reusable = true}}, SHIFT(430),
+  [2293] = {.entry = {.count = 1, .reusable = true}}, SHIFT(114),
+  [2295] = {.entry = {.count = 1, .reusable = true}}, SHIFT(75),
+  [2297] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_dotted_name, 1),
+  [2299] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_assert_statement_repeat1, 2),
+  [2301] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_print_statement_repeat1, 2, .production_id = 10),
+  [2303] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_open_sequence_match_pattern_repeat1, 2),
+  [2305] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_open_sequence_match_pattern_repeat1, 2), SHIFT_REPEAT(844),
+  [2308] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_match_as_pattern, 3, .production_id = 138),
+  [2310] = {.entry = {.count = 1, .reusable = true}}, SHIFT(441),
+  [2312] = {.entry = {.count = 1, .reusable = true}}, SHIFT(117),
+  [2314] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_typed_default_parameter, 5, .production_id = 122),
+  [2316] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_chevron, 2),
+  [2318] = {.entry = {.count = 1, .reusable = true}}, SHIFT(68),
+  [2320] = {.entry = {.count = 1, .reusable = true}}, SHIFT(94),
+  [2322] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_interpolation, 6, .production_id = 43),
+  [2324] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_interpolation, 6, .production_id = 43),
+  [2326] = {.entry = {.count = 1, .reusable = true}}, SHIFT(167),
+  [2328] = {.entry = {.count = 1, .reusable = true}}, SHIFT(78),
+  [2330] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1015),
+  [2332] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__collection_elements, 2, .production_id = 16),
+  [2334] = {.entry = {.count = 1, .reusable = true}}, SHIFT(173),
+  [2336] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1098),
+  [2338] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1291),
+  [2340] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1149),
+  [2342] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1257),
+  [2344] = {.entry = {.count = 1, .reusable = true}}, SHIFT(194),
+  [2346] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_slice, 4, .production_id = 124),
+  [2348] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym__collection_elements_repeat1, 2, .production_id = 36),
+  [2350] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym__collection_elements_repeat1, 2, .production_id = 36), SHIFT_REPEAT(228),
+  [2353] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_slice, 4, .production_id = 123),
+  [2355] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_type_alias_statement, 5, .production_id = 88),
+  [2357] = {.entry = {.count = 1, .reusable = true}}, SHIFT(186),
+  [2359] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_keyword_argument, 3, .production_id = 27),
+  [2361] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_keyword_argument, 3, .production_id = 35),
+  [2363] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_raise_statement, 3, .production_id = 30),
+  [2365] = {.entry = {.count = 1, .reusable = true}}, SHIFT(442),
+  [2367] = {.entry = {.count = 1, .reusable = true}}, SHIFT(90),
+  [2369] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1103),
+  [2371] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1413),
   [2373] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__import_list, 1, .production_id = 6),
-  [2375] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_match_star_pattern, 2, .production_id = 11),
-  [2377] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__collection_elements, 2, .production_id = 16),
-  [2379] = {.entry = {.count = 1, .reusable = true}}, SHIFT(175),
-  [2381] = {.entry = {.count = 1, .reusable = true}}, SHIFT(195),
-  [2383] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_type_alias_statement, 4, .production_id = 63),
-  [2385] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym__collection_elements_repeat1, 2, .production_id = 36),
-  [2387] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym__collection_elements_repeat1, 2, .production_id = 36), SHIFT_REPEAT(230),
-  [2390] = {.entry = {.count = 1, .reusable = true}}, SHIFT(174),
-  [2392] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1188),
-  [2394] = {.entry = {.count = 1, .reusable = false}}, REDUCE(aux_sym_format_specifier_repeat1, 2),
-  [2396] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_format_specifier_repeat1, 2), SHIFT_REPEAT(183),
-  [2399] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_format_specifier_repeat1, 2), SHIFT_REPEAT(1117),
-  [2402] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__import_list, 2, .production_id = 6),
-  [2404] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_slice, 3, .production_id = 93),
-  [2406] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1060),
-  [2408] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1173),
-  [2410] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1278),
-  [2412] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_type_alias_statement, 5, .production_id = 87),
-  [2414] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_raise_statement, 4, .production_id = 53),
-  [2416] = {.entry = {.count = 1, .reusable = true}}, SHIFT(398),
-  [2418] = {.entry = {.count = 1, .reusable = true}}, SHIFT(126),
-  [2420] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_argument_list_repeat1, 2, .production_id = 31),
-  [2422] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_format_specifier, 1),
-  [2424] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1099),
-  [2426] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_keyword_argument, 3, .production_id = 27),
-  [2428] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_keyword_argument, 3, .production_id = 35),
-  [2430] = {.entry = {.count = 1, .reusable = true}}, SHIFT(893),
-  [2432] = {.entry = {.count = 1, .reusable = true}}, SHIFT(852),
-  [2434] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_typed_parameter, 3, .production_id = 65),
-  [2436] = {.entry = {.count = 1, .reusable = true}}, SHIFT(479),
-  [2438] = {.entry = {.count = 1, .reusable = true}}, SHIFT(85),
-  [2440] = {.entry = {.count = 1, .reusable = true}}, SHIFT(83),
-  [2442] = {.entry = {.count = 1, .reusable = true}}, SHIFT(130),
-  [2444] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_exec_statement, 5, .production_id = 15),
-  [2446] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_global_statement_repeat1, 2), SHIFT_REPEAT(1490),
-  [2449] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_global_statement_repeat1, 2),
-  [2451] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_typevar_parameter, 1, .production_id = 6),
-  [2453] = {.entry = {.count = 1, .reusable = true}}, SHIFT(434),
-  [2455] = {.entry = {.count = 1, .reusable = true}}, SHIFT(110),
-  [2457] = {.entry = {.count = 1, .reusable = true}}, SHIFT(111),
-  [2459] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1061),
-  [2461] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_import_prefix, 1),
-  [2463] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1165),
-  [2465] = {.entry = {.count = 1, .reusable = true}}, SHIFT(474),
-  [2467] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__patterns, 1, .production_id = 7),
-  [2469] = {.entry = {.count = 1, .reusable = true}}, SHIFT(597),
-  [2471] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_guard, 2, .production_id = 132),
-  [2473] = {.entry = {.count = 1, .reusable = true}}, SHIFT(405),
-  [2475] = {.entry = {.count = 1, .reusable = true}}, SHIFT(295),
-  [2477] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_print_statement, 2),
-  [2479] = {.entry = {.count = 1, .reusable = true}}, SHIFT(93),
-  [2481] = {.entry = {.count = 1, .reusable = true}}, SHIFT(389),
-  [2483] = {.entry = {.count = 1, .reusable = true}}, SHIFT(88),
-  [2485] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1490),
-  [2487] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_global_statement, 2),
-  [2489] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_nonlocal_statement, 2),
-  [2491] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1185),
-  [2493] = {.entry = {.count = 1, .reusable = true}}, SHIFT(74),
-  [2495] = {.entry = {.count = 1, .reusable = true}}, SHIFT(80),
-  [2497] = {.entry = {.count = 1, .reusable = true}}, SHIFT(114),
-  [2499] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_assert_statement_repeat1, 2), SHIFT_REPEAT(480),
-  [2502] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1182),
-  [2504] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1443),
-  [2506] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_print_statement_repeat1, 2, .production_id = 52), SHIFT_REPEAT(483),
-  [2509] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_print_statement_repeat1, 2, .production_id = 52),
-  [2511] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1093),
-  [2513] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__import_list, 2, .production_id = 22),
-  [2515] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1095),
-  [2517] = {.entry = {.count = 1, .reusable = false}}, REDUCE(aux_sym_import_prefix_repeat1, 2),
-  [2519] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_import_prefix_repeat1, 2), SHIFT_REPEAT(1165),
-  [2522] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__patterns, 2, .production_id = 16),
-  [2524] = {.entry = {.count = 1, .reusable = true}}, SHIFT(595),
-  [2526] = {.entry = {.count = 1, .reusable = true}}, SHIFT(448),
-  [2528] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_parenthesized_list_splat, 3, .production_id = 49),
-  [2530] = {.entry = {.count = 1, .reusable = true}}, SHIFT(304),
-  [2532] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_print_statement, 3, .production_id = 28),
-  [2534] = {.entry = {.count = 1, .reusable = true}}, SHIFT(303),
-  [2536] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_print_statement, 3, .production_id = 29),
-  [2538] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1067),
-  [2540] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1315),
-  [2542] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_assert_statement, 3),
-  [2544] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_parenthesized_list_splat, 3),
-  [2546] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_parameter, 1),
-  [2548] = {.entry = {.count = 1, .reusable = true}}, SHIFT(361),
-  [2550] = {.entry = {.count = 1, .reusable = true}}, SHIFT(438),
-  [2552] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_with_clause_repeat1, 2),
-  [2554] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_with_clause_repeat1, 2), SHIFT_REPEAT(351),
-  [2557] = {.entry = {.count = 1, .reusable = true}}, SHIFT(849),
-  [2559] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1332),
-  [2561] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1284),
-  [2563] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym__import_list_repeat1, 2, .production_id = 23),
-  [2565] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_decorator, 3),
-  [2567] = {.entry = {.count = 1, .reusable = true}}, SHIFT(482),
-  [2569] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym__import_list_repeat1, 2, .production_id = 44), SHIFT_REPEAT(1312),
-  [2572] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym__import_list_repeat1, 2, .production_id = 44),
-  [2574] = {.entry = {.count = 1, .reusable = true}}, SHIFT(851),
-  [2576] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_nonlocal_statement, 3),
-  [2578] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_global_statement, 3),
-  [2580] = {.entry = {.count = 1, .reusable = true}}, SHIFT(144),
-  [2582] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1412),
-  [2584] = {.entry = {.count = 1, .reusable = true}}, SHIFT(968),
-  [2586] = {.entry = {.count = 1, .reusable = true}}, SHIFT(274),
-  [2588] = {.entry = {.count = 1, .reusable = true}}, SHIFT(342),
-  [2590] = {.entry = {.count = 1, .reusable = true}}, SHIFT(233),
-  [2592] = {.entry = {.count = 1, .reusable = true}}, SHIFT(239),
-  [2594] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym__simple_statements_repeat1, 2), SHIFT_REPEAT(147),
-  [2597] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym__simple_statements_repeat1, 2),
-  [2599] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym__parameters_repeat1, 2),
-  [2601] = {.entry = {.count = 1, .reusable = true}}, SHIFT(855),
-  [2603] = {.entry = {.count = 1, .reusable = true}}, SHIFT(973),
-  [2605] = {.entry = {.count = 1, .reusable = true}}, SHIFT(273),
-  [2607] = {.entry = {.count = 1, .reusable = true}}, SHIFT(343),
-  [2609] = {.entry = {.count = 1, .reusable = true}}, SHIFT(896),
-  [2611] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1142),
-  [2613] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1147),
-  [2615] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1020),
-  [2617] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1250),
-  [2619] = {.entry = {.count = 1, .reusable = true}}, SHIFT(138),
-  [2621] = {.entry = {.count = 1, .reusable = true}}, SHIFT(313),
-  [2623] = {.entry = {.count = 1, .reusable = true}}, SHIFT(72),
-  [2625] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_match_mapping_pattern_repeat1, 2), SHIFT_REPEAT(905),
-  [2628] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_match_mapping_pattern_repeat1, 2),
-  [2630] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1004),
-  [2632] = {.entry = {.count = 1, .reusable = true}}, SHIFT(861),
-  [2634] = {.entry = {.count = 1, .reusable = true}}, SHIFT(862),
-  [2636] = {.entry = {.count = 1, .reusable = true}}, SHIFT(139),
-  [2638] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1233),
-  [2640] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1314),
-  [2642] = {.entry = {.count = 1, .reusable = true}}, SHIFT(891),
-  [2644] = {.entry = {.count = 1, .reusable = true}}, SHIFT(988),
-  [2646] = {.entry = {.count = 1, .reusable = true}}, SHIFT(459),
-  [2648] = {.entry = {.count = 1, .reusable = true}}, SHIFT(128),
-  [2650] = {.entry = {.count = 1, .reusable = true}}, SHIFT(91),
-  [2652] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_aliased_import, 3, .production_id = 45),
-  [2654] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1322),
-  [2656] = {.entry = {.count = 1, .reusable = true}}, SHIFT(793),
-  [2658] = {.entry = {.count = 1, .reusable = true}}, SHIFT(194),
-  [2660] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__parameters, 1),
-  [2662] = {.entry = {.count = 1, .reusable = true}}, SHIFT(895),
-  [2664] = {.entry = {.count = 1, .reusable = true}}, SHIFT(802),
-  [2666] = {.entry = {.count = 1, .reusable = true}}, SHIFT(189),
-  [2668] = {.entry = {.count = 1, .reusable = true}}, SHIFT(142),
-  [2670] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_argument_list_repeat1, 2, .production_id = 36),
-  [2672] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_argument_list_repeat1, 2, .production_id = 36), SHIFT_REPEAT(222),
-  [2675] = {.entry = {.count = 1, .reusable = true}}, SHIFT(253),
-  [2677] = {.entry = {.count = 1, .reusable = true}}, SHIFT(790),
-  [2679] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_dictionary_repeat1, 2, .production_id = 36), SHIFT_REPEAT(275),
-  [2682] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_dictionary_repeat1, 2, .production_id = 36),
-  [2684] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_relative_import, 1),
-  [2686] = {.entry = {.count = 1, .reusable = true}}, SHIFT(146),
-  [2688] = {.entry = {.count = 1, .reusable = true}}, SHIFT(145),
-  [2690] = {.entry = {.count = 1, .reusable = true}}, SHIFT(358),
-  [2692] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym__import_list_repeat1, 2, .production_id = 44), SHIFT_REPEAT(1317),
-  [2695] = {.entry = {.count = 1, .reusable = true}}, SHIFT(136),
-  [2697] = {.entry = {.count = 1, .reusable = true}}, SHIFT(248),
-  [2699] = {.entry = {.count = 1, .reusable = true}}, SHIFT(796),
-  [2701] = {.entry = {.count = 1, .reusable = true}}, SHIFT(249),
-  [2703] = {.entry = {.count = 1, .reusable = true}}, SHIFT(640),
-  [2705] = {.entry = {.count = 1, .reusable = true}}, SHIFT(134),
-  [2707] = {.entry = {.count = 1, .reusable = true}}, SHIFT(360),
-  [2709] = {.entry = {.count = 1, .reusable = true}}, SHIFT(135),
-  [2711] = {.entry = {.count = 1, .reusable = true}}, SHIFT(242),
-  [2713] = {.entry = {.count = 1, .reusable = true}}, SHIFT(634),
-  [2715] = {.entry = {.count = 1, .reusable = true}}, SHIFT(137),
-  [2717] = {.entry = {.count = 1, .reusable = true}}, SHIFT(362),
-  [2719] = {.entry = {.count = 1, .reusable = true}}, SHIFT(899),
-  [2721] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_type_parameters, 4, .production_id = 111),
-  [2723] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_type_parameters_repeat1, 2, .production_id = 112), SHIFT_REPEAT(1020),
-  [2726] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_type_parameters_repeat1, 2, .production_id = 112),
-  [2728] = {.entry = {.count = 1, .reusable = true}}, SHIFT(143),
-  [2730] = {.entry = {.count = 1, .reusable = true}}, SHIFT(620),
-  [2732] = {.entry = {.count = 1, .reusable = true}}, SHIFT(208),
-  [2734] = {.entry = {.count = 1, .reusable = true}}, SHIFT(894),
-  [2736] = {.entry = {.count = 1, .reusable = false}}, SHIFT(1087),
-  [2738] = {.entry = {.count = 1, .reusable = false}}, SHIFT(1110),
-  [2740] = {.entry = {.count = 1, .reusable = true}}, SHIFT(133),
-  [2742] = {.entry = {.count = 1, .reusable = true}}, SHIFT(369),
-  [2744] = {.entry = {.count = 1, .reusable = true}}, SHIFT(155),
-  [2746] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_assignment, 3, .production_id = 37),
-  [2748] = {.entry = {.count = 1, .reusable = true}}, SHIFT(782),
-  [2750] = {.entry = {.count = 1, .reusable = true}}, SHIFT(215),
-  [2752] = {.entry = {.count = 1, .reusable = true}}, SHIFT(351),
-  [2754] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_with_clause, 2),
-  [2756] = {.entry = {.count = 1, .reusable = true}}, SHIFT(364),
-  [2758] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1489),
-  [2760] = {.entry = {.count = 1, .reusable = true}}, SHIFT(290),
-  [2762] = {.entry = {.count = 1, .reusable = false}}, REDUCE(aux_sym_format_specifier_repeat1, 1, .production_id = 73),
-  [2764] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_format_specifier_repeat1, 1, .production_id = 73),
-  [2766] = {.entry = {.count = 1, .reusable = true}}, SHIFT(257),
-  [2768] = {.entry = {.count = 1, .reusable = true}}, SHIFT(810),
-  [2770] = {.entry = {.count = 1, .reusable = true}}, SHIFT(260),
-  [2772] = {.entry = {.count = 1, .reusable = true}}, SHIFT(836),
-  [2774] = {.entry = {.count = 1, .reusable = true}}, SHIFT(831),
-  [2776] = {.entry = {.count = 1, .reusable = true}}, SHIFT(197),
-  [2778] = {.entry = {.count = 1, .reusable = true}}, SHIFT(830),
-  [2780] = {.entry = {.count = 1, .reusable = true}}, SHIFT(198),
-  [2782] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym__parameters_repeat1, 2), SHIFT_REPEAT(903),
-  [2785] = {.entry = {.count = 1, .reusable = true}}, SHIFT(235),
-  [2787] = {.entry = {.count = 1, .reusable = true}}, SHIFT(632),
-  [2789] = {.entry = {.count = 1, .reusable = true}}, SHIFT(209),
-  [2791] = {.entry = {.count = 1, .reusable = true}}, SHIFT(644),
-  [2793] = {.entry = {.count = 1, .reusable = true}}, SHIFT(207),
-  [2795] = {.entry = {.count = 1, .reusable = true}}, SHIFT(613),
-  [2797] = {.entry = {.count = 1, .reusable = true}}, SHIFT(206),
-  [2799] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_with_item, 3, .dynamic_precedence = -1, .production_id = 58),
-  [2801] = {.entry = {.count = 1, .reusable = true}}, SHIFT(256),
-  [2803] = {.entry = {.count = 1, .reusable = true}}, SHIFT(221),
-  [2805] = {.entry = {.count = 1, .reusable = true}}, SHIFT(255),
-  [2807] = {.entry = {.count = 1, .reusable = true}}, SHIFT(220),
-  [2809] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1307),
-  [2811] = {.entry = {.count = 1, .reusable = true}}, SHIFT(827),
-  [2813] = {.entry = {.count = 1, .reusable = true}}, SHIFT(199),
-  [2815] = {.entry = {.count = 1, .reusable = true}}, SHIFT(112),
-  [2817] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__match_maybe_star_pattern, 1),
-  [2819] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__match_patterns, 1),
-  [2821] = {.entry = {.count = 1, .reusable = true}}, SHIFT(225),
-  [2823] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1195),
-  [2825] = {.entry = {.count = 1, .reusable = true}}, SHIFT(224),
-  [2827] = {.entry = {.count = 1, .reusable = true}}, SHIFT(286),
-  [2829] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym__parameters_repeat1, 2), SHIFT_REPEAT(902),
-  [2832] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_match_class_pattern_repeat1, 2),
-  [2834] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_match_class_pattern_repeat1, 2), SHIFT_REPEAT(863),
-  [2837] = {.entry = {.count = 1, .reusable = true}}, SHIFT(821),
-  [2839] = {.entry = {.count = 1, .reusable = true}}, SHIFT(186),
-  [2841] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_subscript_repeat1, 2, .production_id = 97), SHIFT_REPEAT(314),
-  [2844] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_subscript_repeat1, 2, .production_id = 97),
-  [2846] = {.entry = {.count = 1, .reusable = true}}, SHIFT(250),
-  [2848] = {.entry = {.count = 1, .reusable = true}}, SHIFT(809),
-  [2850] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1170),
-  [2852] = {.entry = {.count = 1, .reusable = true}}, SHIFT(243),
-  [2854] = {.entry = {.count = 1, .reusable = true}}, SHIFT(835),
-  [2856] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1175),
-  [2858] = {.entry = {.count = 1, .reusable = true}}, SHIFT(297),
-  [2860] = {.entry = {.count = 1, .reusable = true}}, SHIFT(236),
-  [2862] = {.entry = {.count = 1, .reusable = true}}, SHIFT(141),
-  [2864] = {.entry = {.count = 1, .reusable = true}}, SHIFT(302),
-  [2866] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1069),
-  [2868] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_match_class_pattern_repeat2, 2),
-  [2870] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_match_class_pattern_repeat2, 2), SHIFT_REPEAT(1353),
-  [2873] = {.entry = {.count = 1, .reusable = true}}, SHIFT(140),
-  [2875] = {.entry = {.count = 1, .reusable = true}}, SHIFT(308),
-  [2877] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_with_clause, 1),
-  [2879] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_type_parameters, 3, .production_id = 85),
-  [2881] = {.entry = {.count = 1, .reusable = true}}, SHIFT(857),
-  [2883] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1329),
-  [2885] = {.entry = {.count = 1, .reusable = true}}, SHIFT(776),
-  [2887] = {.entry = {.count = 1, .reusable = true}}, SHIFT(214),
-  [2889] = {.entry = {.count = 1, .reusable = true}}, SHIFT(966),
-  [2891] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1215),
-  [2893] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1338),
-  [2895] = {.entry = {.count = 1, .reusable = true}}, SHIFT(898),
-  [2897] = {.entry = {.count = 1, .reusable = true}}, SHIFT(462),
-  [2899] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_exec_statement, 2, .production_id = 15),
-  [2901] = {.entry = {.count = 1, .reusable = true}}, SHIFT(461),
-  [2903] = {.entry = {.count = 1, .reusable = true}}, SHIFT(858),
-  [2905] = {.entry = {.count = 1, .reusable = true}}, SHIFT(989),
-  [2907] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_positional_separator, 1),
-  [2909] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_future_import_statement, 6, .production_id = 98),
-  [2911] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_typevar_parameter, 2, .production_id = 84),
-  [2913] = {.entry = {.count = 1, .reusable = true}}, SHIFT(115),
-  [2915] = {.entry = {.count = 1, .reusable = true}}, SHIFT(341),
-  [2917] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_pass_statement, 1),
-  [2919] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_break_statement, 1),
-  [2921] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_continue_statement, 1),
-  [2923] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_import_from_statement, 6, .production_id = 99),
-  [2925] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_typevartuple_parameter, 2, .production_id = 23),
-  [2927] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_match_key_value_pattern, 3, .production_id = 62),
-  [2929] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1087),
-  [2931] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1424),
-  [2933] = {.entry = {.count = 1, .reusable = true}}, SHIFT(127),
-  [2935] = {.entry = {.count = 1, .reusable = true}}, SHIFT(350),
-  [2937] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_match_positional_pattern, 1),
-  [2939] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_match_double_star_pattern, 2, .production_id = 11),
-  [2941] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1426),
-  [2943] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_assignment, 5, .production_id = 91),
-  [2945] = {.entry = {.count = 1, .reusable = true}}, SHIFT(99),
-  [2947] = {.entry = {.count = 1, .reusable = true}}, SHIFT(368),
-  [2949] = {.entry = {.count = 1, .reusable = true}}, SHIFT(122),
-  [2951] = {.entry = {.count = 1, .reusable = true}}, SHIFT(321),
-  [2953] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_parameters, 3),
-  [2955] = {.entry = {.count = 1, .reusable = true}}, SHIFT(105),
-  [2957] = {.entry = {.count = 1, .reusable = true}}, SHIFT(322),
-  [2959] = {.entry = {.count = 1, .reusable = true}}, SHIFT(113),
-  [2961] = {.entry = {.count = 1, .reusable = true}}, SHIFT(346),
-  [2963] = {.entry = {.count = 1, .reusable = true}}, SHIFT(95),
-  [2965] = {.entry = {.count = 1, .reusable = true}}, SHIFT(323),
-  [2967] = {.entry = {.count = 1, .reusable = true}}, SHIFT(89),
-  [2969] = {.entry = {.count = 1, .reusable = true}}, SHIFT(324),
+  [2375] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_raise_statement, 4, .production_id = 53),
+  [2377] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__import_list, 3, .production_id = 22),
+  [2379] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_argument_list_repeat1, 2, .production_id = 31),
+  [2381] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1053),
+  [2383] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1163),
+  [2385] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1203),
+  [2387] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_match_star_pattern, 2, .production_id = 11),
+  [2389] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__type_param_default, 2, .production_id = 113),
+  [2391] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_slice, 3, .production_id = 94),
+  [2393] = {.entry = {.count = 1, .reusable = false}}, REDUCE(aux_sym_format_specifier_repeat1, 2),
+  [2395] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_format_specifier_repeat1, 2), SHIFT_REPEAT(168),
+  [2398] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_format_specifier_repeat1, 2), SHIFT_REPEAT(1094),
+  [2401] = {.entry = {.count = 1, .reusable = true}}, SHIFT(176),
+  [2403] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_type_alias_statement, 4, .production_id = 63),
+  [2405] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_format_specifier, 1),
+  [2407] = {.entry = {.count = 1, .reusable = true}}, SHIFT(168),
+  [2409] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1108),
+  [2411] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_slice, 5, .production_id = 143),
+  [2413] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1176),
+  [2415] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__import_list, 2, .production_id = 6),
+  [2417] = {.entry = {.count = 1, .reusable = true}}, SHIFT(87),
+  [2419] = {.entry = {.count = 1, .reusable = true}}, SHIFT(446),
+  [2421] = {.entry = {.count = 1, .reusable = true}}, SHIFT(107),
+  [2423] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_expression_list_repeat1, 2, .production_id = 36), SHIFT_REPEAT(251),
+  [2426] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_format_specifier, 2),
+  [2428] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1094),
+  [2430] = {.entry = {.count = 1, .reusable = true}}, SHIFT(97),
+  [2432] = {.entry = {.count = 1, .reusable = true}}, SHIFT(381),
+  [2434] = {.entry = {.count = 1, .reusable = true}}, SHIFT(113),
+  [2436] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1058),
+  [2438] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_parameter, 1),
+  [2440] = {.entry = {.count = 1, .reusable = true}}, SHIFT(283),
+  [2442] = {.entry = {.count = 1, .reusable = true}}, SHIFT(382),
+  [2444] = {.entry = {.count = 1, .reusable = true}}, SHIFT(119),
+  [2446] = {.entry = {.count = 1, .reusable = true}}, SHIFT(77),
+  [2448] = {.entry = {.count = 1, .reusable = true}}, SHIFT(874),
+  [2450] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1435),
+  [2452] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_global_statement, 2),
+  [2454] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_nonlocal_statement, 2),
+  [2456] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1146),
+  [2458] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_guard, 2, .production_id = 136),
+  [2460] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1105),
+  [2462] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__import_list, 2, .production_id = 22),
+  [2464] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1088),
+  [2466] = {.entry = {.count = 1, .reusable = false}}, REDUCE(aux_sym_import_prefix_repeat1, 2),
+  [2468] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_import_prefix_repeat1, 2), SHIFT_REPEAT(1125),
+  [2471] = {.entry = {.count = 1, .reusable = true}}, SHIFT(109),
+  [2473] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__patterns, 2, .production_id = 16),
+  [2475] = {.entry = {.count = 1, .reusable = true}}, SHIFT(521),
+  [2477] = {.entry = {.count = 1, .reusable = true}}, SHIFT(301),
+  [2479] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_print_statement, 2),
+  [2481] = {.entry = {.count = 1, .reusable = true}}, SHIFT(307),
+  [2483] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_print_statement, 3, .production_id = 28),
+  [2485] = {.entry = {.count = 1, .reusable = true}}, SHIFT(310),
+  [2487] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_print_statement, 3, .production_id = 29),
+  [2489] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_assert_statement, 3),
+  [2491] = {.entry = {.count = 1, .reusable = true}}, SHIFT(421),
+  [2493] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_global_statement_repeat1, 2), SHIFT_REPEAT(1435),
+  [2496] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_global_statement_repeat1, 2),
+  [2498] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__patterns, 1, .production_id = 7),
+  [2500] = {.entry = {.count = 1, .reusable = true}}, SHIFT(530),
+  [2502] = {.entry = {.count = 1, .reusable = true}}, SHIFT(833),
+  [2504] = {.entry = {.count = 1, .reusable = true}}, SHIFT(72),
+  [2506] = {.entry = {.count = 1, .reusable = true}}, SHIFT(73),
+  [2508] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_global_statement, 3),
+  [2510] = {.entry = {.count = 1, .reusable = true}}, SHIFT(374),
+  [2512] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_nonlocal_statement, 3),
+  [2514] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_import_prefix, 1),
+  [2516] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1125),
+  [2518] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_with_clause_repeat1, 2),
+  [2520] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_with_clause_repeat1, 2), SHIFT_REPEAT(344),
+  [2523] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_decorator, 3),
+  [2525] = {.entry = {.count = 1, .reusable = true}}, SHIFT(832),
+  [2527] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1264),
+  [2529] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1179),
+  [2531] = {.entry = {.count = 1, .reusable = true}}, SHIFT(460),
+  [2533] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym__import_list_repeat1, 2, .production_id = 44), SHIFT_REPEAT(1234),
+  [2536] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym__import_list_repeat1, 2, .production_id = 44),
+  [2538] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_paramspec_parameter, 2, .production_id = 23),
+  [2540] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_assert_statement_repeat1, 2), SHIFT_REPEAT(428),
+  [2543] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym__import_list_repeat1, 2, .production_id = 23),
+  [2545] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_print_statement_repeat1, 2, .production_id = 52), SHIFT_REPEAT(423),
+  [2548] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_print_statement_repeat1, 2, .production_id = 52),
+  [2550] = {.entry = {.count = 1, .reusable = true}}, SHIFT(70),
+  [2552] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_typevar_parameter, 2, .production_id = 84),
+  [2554] = {.entry = {.count = 1, .reusable = true}}, SHIFT(831),
+  [2556] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1039),
+  [2558] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1235),
+  [2560] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1168),
+  [2562] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1459),
+  [2564] = {.entry = {.count = 1, .reusable = true}}, SHIFT(103),
+  [2566] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_parenthesized_list_splat, 3, .production_id = 49),
+  [2568] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_parenthesized_list_splat, 3),
+  [2570] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_typed_parameter, 3, .production_id = 65),
+  [2572] = {.entry = {.count = 1, .reusable = true}}, SHIFT(399),
+  [2574] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_exec_statement, 5, .production_id = 15),
+  [2576] = {.entry = {.count = 1, .reusable = true}}, SHIFT(125),
+  [2578] = {.entry = {.count = 1, .reusable = true}}, SHIFT(452),
+  [2580] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_typevartuple_parameter, 2, .production_id = 23),
+  [2582] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_aliased_import, 3, .production_id = 45),
+  [2584] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1294),
+  [2586] = {.entry = {.count = 1, .reusable = true}}, SHIFT(239),
+  [2588] = {.entry = {.count = 1, .reusable = false}}, SHIFT(1069),
+  [2590] = {.entry = {.count = 1, .reusable = false}}, SHIFT(1091),
+  [2592] = {.entry = {.count = 1, .reusable = true}}, SHIFT(257),
+  [2594] = {.entry = {.count = 1, .reusable = true}}, SHIFT(795),
+  [2596] = {.entry = {.count = 1, .reusable = true}}, SHIFT(397),
+  [2598] = {.entry = {.count = 1, .reusable = true}}, SHIFT(99),
+  [2600] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__match_maybe_star_pattern, 1),
+  [2602] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__match_patterns, 1),
+  [2604] = {.entry = {.count = 1, .reusable = true}}, SHIFT(254),
+  [2606] = {.entry = {.count = 1, .reusable = true}}, SHIFT(804),
+  [2608] = {.entry = {.count = 1, .reusable = true}}, SHIFT(323),
+  [2610] = {.entry = {.count = 1, .reusable = true}}, SHIFT(288),
+  [2612] = {.entry = {.count = 1, .reusable = true}}, SHIFT(130),
+  [2614] = {.entry = {.count = 1, .reusable = true}}, SHIFT(213),
+  [2616] = {.entry = {.count = 1, .reusable = true}}, SHIFT(244),
+  [2618] = {.entry = {.count = 1, .reusable = true}}, SHIFT(232),
+  [2620] = {.entry = {.count = 1, .reusable = true}}, SHIFT(798),
+  [2622] = {.entry = {.count = 1, .reusable = true}}, SHIFT(184),
+  [2624] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_type_parameters, 3, .production_id = 86),
+  [2626] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1006),
+  [2628] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1302),
+  [2630] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1116),
+  [2632] = {.entry = {.count = 1, .reusable = true}}, SHIFT(344),
+  [2634] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_with_clause, 1),
+  [2636] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_argument_list_repeat1, 2, .production_id = 36),
+  [2638] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_argument_list_repeat1, 2, .production_id = 36), SHIFT_REPEAT(219),
+  [2641] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1282),
+  [2643] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_subscript_repeat1, 2, .production_id = 97), SHIFT_REPEAT(261),
+  [2646] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_subscript_repeat1, 2, .production_id = 97),
+  [2648] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1113),
+  [2650] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1424),
+  [2652] = {.entry = {.count = 1, .reusable = true}}, SHIFT(779),
+  [2654] = {.entry = {.count = 1, .reusable = true}}, SHIFT(203),
+  [2656] = {.entry = {.count = 1, .reusable = true}}, SHIFT(128),
+  [2658] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1347),
+  [2660] = {.entry = {.count = 1, .reusable = true}}, SHIFT(131),
+  [2662] = {.entry = {.count = 1, .reusable = true}}, SHIFT(276),
+  [2664] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym__import_list_repeat1, 2, .production_id = 44), SHIFT_REPEAT(1266),
+  [2667] = {.entry = {.count = 1, .reusable = true}}, SHIFT(974),
+  [2669] = {.entry = {.count = 1, .reusable = true}}, SHIFT(970),
+  [2671] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1217),
+  [2673] = {.entry = {.count = 1, .reusable = true}}, SHIFT(842),
+  [2675] = {.entry = {.count = 1, .reusable = true}}, SHIFT(303),
+  [2677] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_match_mapping_pattern_repeat1, 2), SHIFT_REPEAT(886),
+  [2680] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_match_mapping_pattern_repeat1, 2),
+  [2682] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__parameters, 1),
+  [2684] = {.entry = {.count = 1, .reusable = true}}, SHIFT(878),
+  [2686] = {.entry = {.count = 1, .reusable = true}}, SHIFT(129),
+  [2688] = {.entry = {.count = 1, .reusable = true}}, SHIFT(835),
+  [2690] = {.entry = {.count = 1, .reusable = true}}, SHIFT(989),
+  [2692] = {.entry = {.count = 1, .reusable = true}}, SHIFT(112),
+  [2694] = {.entry = {.count = 1, .reusable = true}}, SHIFT(803),
+  [2696] = {.entry = {.count = 1, .reusable = true}}, SHIFT(199),
+  [2698] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1050),
+  [2700] = {.entry = {.count = 1, .reusable = true}}, SHIFT(966),
+  [2702] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1220),
+  [2704] = {.entry = {.count = 1, .reusable = true}}, SHIFT(149),
+  [2706] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_assignment, 3, .production_id = 37),
+  [2708] = {.entry = {.count = 1, .reusable = true}}, SHIFT(260),
+  [2710] = {.entry = {.count = 1, .reusable = true}}, SHIFT(614),
+  [2712] = {.entry = {.count = 1, .reusable = true}}, SHIFT(390),
+  [2714] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_exec_statement, 2, .production_id = 15),
+  [2716] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym__simple_statements_repeat1, 2), SHIFT_REPEAT(133),
+  [2719] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym__simple_statements_repeat1, 2),
+  [2721] = {.entry = {.count = 1, .reusable = true}}, SHIFT(388),
+  [2723] = {.entry = {.count = 1, .reusable = true}}, SHIFT(253),
+  [2725] = {.entry = {.count = 1, .reusable = true}}, SHIFT(606),
+  [2727] = {.entry = {.count = 1, .reusable = true}}, SHIFT(881),
+  [2729] = {.entry = {.count = 1, .reusable = false}}, REDUCE(aux_sym_format_specifier_repeat1, 1, .production_id = 73),
+  [2731] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_format_specifier_repeat1, 1, .production_id = 73),
+  [2733] = {.entry = {.count = 1, .reusable = true}}, SHIFT(960),
+  [2735] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1210),
+  [2737] = {.entry = {.count = 1, .reusable = true}}, SHIFT(875),
+  [2739] = {.entry = {.count = 1, .reusable = true}}, SHIFT(988),
+  [2741] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_positional_separator, 1),
+  [2743] = {.entry = {.count = 1, .reusable = true}}, SHIFT(600),
+  [2745] = {.entry = {.count = 1, .reusable = true}}, SHIFT(193),
+  [2747] = {.entry = {.count = 1, .reusable = true}}, SHIFT(124),
+  [2749] = {.entry = {.count = 1, .reusable = true}}, SHIFT(813),
+  [2751] = {.entry = {.count = 1, .reusable = true}}, SHIFT(205),
+  [2753] = {.entry = {.count = 1, .reusable = true}}, SHIFT(877),
+  [2755] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_relative_import, 1),
+  [2757] = {.entry = {.count = 1, .reusable = true}}, SHIFT(843),
+  [2759] = {.entry = {.count = 1, .reusable = true}}, SHIFT(132),
+  [2761] = {.entry = {.count = 1, .reusable = true}}, SHIFT(879),
+  [2763] = {.entry = {.count = 1, .reusable = true}}, SHIFT(315),
+  [2765] = {.entry = {.count = 1, .reusable = true}}, SHIFT(82),
+  [2767] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_with_item, 3, .dynamic_precedence = -1, .production_id = 58),
+  [2769] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym__parameters_repeat1, 2),
+  [2771] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym__parameters_repeat1, 2), SHIFT_REPEAT(884),
+  [2774] = {.entry = {.count = 1, .reusable = true}}, SHIFT(814),
+  [2776] = {.entry = {.count = 1, .reusable = true}}, SHIFT(206),
+  [2778] = {.entry = {.count = 1, .reusable = true}}, SHIFT(607),
+  [2780] = {.entry = {.count = 1, .reusable = true}}, SHIFT(197),
+  [2782] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_match_class_pattern_repeat2, 2),
+  [2784] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_match_class_pattern_repeat2, 2), SHIFT_REPEAT(1363),
+  [2787] = {.entry = {.count = 1, .reusable = true}}, SHIFT(599),
+  [2789] = {.entry = {.count = 1, .reusable = true}}, SHIFT(189),
+  [2791] = {.entry = {.count = 1, .reusable = true}}, SHIFT(598),
+  [2793] = {.entry = {.count = 1, .reusable = true}}, SHIFT(179),
+  [2795] = {.entry = {.count = 1, .reusable = true}}, SHIFT(240),
+  [2797] = {.entry = {.count = 1, .reusable = true}}, SHIFT(816),
+  [2799] = {.entry = {.count = 1, .reusable = true}}, SHIFT(234),
+  [2801] = {.entry = {.count = 1, .reusable = true}}, SHIFT(215),
+  [2803] = {.entry = {.count = 1, .reusable = true}}, SHIFT(233),
+  [2805] = {.entry = {.count = 1, .reusable = true}}, SHIFT(216),
+  [2807] = {.entry = {.count = 1, .reusable = true}}, SHIFT(224),
+  [2809] = {.entry = {.count = 1, .reusable = true}}, SHIFT(326),
+  [2811] = {.entry = {.count = 1, .reusable = true}}, SHIFT(876),
+  [2813] = {.entry = {.count = 1, .reusable = true}}, SHIFT(242),
+  [2815] = {.entry = {.count = 1, .reusable = true}}, SHIFT(821),
+  [2817] = {.entry = {.count = 1, .reusable = true}}, SHIFT(258),
+  [2819] = {.entry = {.count = 1, .reusable = true}}, SHIFT(762),
+  [2821] = {.entry = {.count = 1, .reusable = true}}, SHIFT(839),
+  [2823] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_dictionary_repeat1, 2, .production_id = 36), SHIFT_REPEAT(277),
+  [2826] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_dictionary_repeat1, 2, .production_id = 36),
+  [2828] = {.entry = {.count = 1, .reusable = true}}, SHIFT(252),
+  [2830] = {.entry = {.count = 1, .reusable = true}}, SHIFT(768),
+  [2832] = {.entry = {.count = 1, .reusable = true}}, SHIFT(226),
+  [2834] = {.entry = {.count = 1, .reusable = true}}, SHIFT(359),
+  [2836] = {.entry = {.count = 1, .reusable = true}}, SHIFT(780),
+  [2838] = {.entry = {.count = 1, .reusable = true}}, SHIFT(201),
+  [2840] = {.entry = {.count = 1, .reusable = true}}, SHIFT(840),
+  [2842] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_with_clause, 2),
+  [2844] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1482),
+  [2846] = {.entry = {.count = 1, .reusable = true}}, SHIFT(319),
+  [2848] = {.entry = {.count = 1, .reusable = true}}, SHIFT(776),
+  [2850] = {.entry = {.count = 1, .reusable = true}}, SHIFT(180),
+  [2852] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1198),
+  [2854] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1170),
+  [2856] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_match_class_pattern_repeat1, 2),
+  [2858] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_match_class_pattern_repeat1, 2), SHIFT_REPEAT(845),
+  [2861] = {.entry = {.count = 1, .reusable = true}}, SHIFT(229),
+  [2863] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_type_parameters, 4, .production_id = 115),
+  [2865] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1169),
+  [2867] = {.entry = {.count = 1, .reusable = true}}, SHIFT(127),
+  [2869] = {.entry = {.count = 1, .reusable = true}}, SHIFT(266),
+  [2871] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_type_parameters_repeat1, 2, .production_id = 116), SHIFT_REPEAT(1006),
+  [2874] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_type_parameters_repeat1, 2, .production_id = 116),
+  [2876] = {.entry = {.count = 1, .reusable = true}}, SHIFT(221),
+  [2878] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1270),
+  [2880] = {.entry = {.count = 1, .reusable = true}}, SHIFT(753),
+  [2882] = {.entry = {.count = 1, .reusable = true}}, SHIFT(190),
+  [2884] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym__parameters_repeat1, 2), SHIFT_REPEAT(885),
+  [2887] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_match_key_value_pattern, 3, .production_id = 62),
+  [2889] = {.entry = {.count = 1, .reusable = true}}, SHIFT(98),
+  [2891] = {.entry = {.count = 1, .reusable = true}}, SHIFT(274),
+  [2893] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_type_parameters_repeat1, 2, .production_id = 86),
+  [2895] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_match_keyword_pattern, 3, .production_id = 163),
+  [2897] = {.entry = {.count = 1, .reusable = false}}, SHIFT(967),
+  [2899] = {.entry = {.count = 1, .reusable = true}}, SHIFT(967),
+  [2901] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_parameters, 2),
+  [2903] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_match_double_star_pattern, 2, .production_id = 11),
+  [2905] = {.entry = {.count = 1, .reusable = false}}, SHIFT(990),
+  [2907] = {.entry = {.count = 1, .reusable = true}}, SHIFT(990),
+  [2909] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_typevar_parameter, 3, .production_id = 114),
+  [2911] = {.entry = {.count = 1, .reusable = true}}, SHIFT(85),
+  [2913] = {.entry = {.count = 1, .reusable = true}}, SHIFT(282),
+  [2915] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_match_positional_pattern, 1),
+  [2917] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_dictionary_repeat1, 2, .production_id = 31),
+  [2919] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_paramspec_parameter, 3, .production_id = 111),
+  [2921] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1434),
+  [2923] = {.entry = {.count = 1, .reusable = true}}, SHIFT(959),
+  [2925] = {.entry = {.count = 1, .reusable = true}}, SHIFT(86),
+  [2927] = {.entry = {.count = 1, .reusable = true}}, SHIFT(269),
+  [2929] = {.entry = {.count = 1, .reusable = true}}, SHIFT(121),
+  [2931] = {.entry = {.count = 1, .reusable = true}}, SHIFT(270),
+  [2933] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_typevartuple_parameter, 3, .production_id = 111),
+  [2935] = {.entry = {.count = 1, .reusable = true}}, SHIFT(93),
+  [2937] = {.entry = {.count = 1, .reusable = true}}, SHIFT(273),
+  [2939] = {.entry = {.count = 1, .reusable = true}}, SHIFT(101),
+  [2941] = {.entry = {.count = 1, .reusable = true}}, SHIFT(295),
+  [2943] = {.entry = {.count = 1, .reusable = true}}, SHIFT(126),
+  [2945] = {.entry = {.count = 1, .reusable = true}}, SHIFT(298),
+  [2947] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_continue_statement, 1),
+  [2949] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1069),
+  [2951] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_break_statement, 1),
+  [2953] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_assignment, 3, .production_id = 38),
+  [2955] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_augmented_assignment, 3, .production_id = 39),
+  [2957] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1398),
+  [2959] = {.entry = {.count = 1, .reusable = true}}, SHIFT(838),
+  [2961] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_pass_statement, 1),
+  [2963] = {.entry = {.count = 1, .reusable = true}}, SHIFT(986),
+  [2965] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_import_statement, 2, .production_id = 5),
+  [2967] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_import_from_statement, 6, .production_id = 100),
+  [2969] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_future_import_statement, 6, .production_id = 99),
   [2971] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_argument_list_repeat1, 2, .production_id = 67),
-  [2973] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_parameters, 2),
-  [2975] = {.entry = {.count = 1, .reusable = false}}, SHIFT(990),
-  [2977] = {.entry = {.count = 1, .reusable = true}}, SHIFT(990),
-  [2979] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_import_statement, 2, .production_id = 5),
-  [2981] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_dictionary_repeat1, 2, .production_id = 31),
-  [2983] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_future_import_statement, 4, .production_id = 46),
-  [2985] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_augmented_assignment, 3, .production_id = 39),
-  [2987] = {.entry = {.count = 1, .reusable = false}}, SHIFT(1010),
-  [2989] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1010),
-  [2991] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_type_parameters_repeat1, 2, .production_id = 85),
-  [2993] = {.entry = {.count = 1, .reusable = false}}, SHIFT(951),
-  [2995] = {.entry = {.count = 1, .reusable = true}}, SHIFT(951),
-  [2997] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_assignment, 3, .production_id = 38),
-  [2999] = {.entry = {.count = 1, .reusable = true}}, SHIFT(977),
-  [3001] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_import_from_statement, 4, .production_id = 48),
-  [3003] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_import_from_statement, 4, .production_id = 47),
-  [3005] = {.entry = {.count = 1, .reusable = true}}, SHIFT(854),
-  [3007] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_match_keyword_pattern, 3, .production_id = 157),
-  [3009] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_wildcard_import, 1),
-  [3011] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1496),
-  [3013] = {.entry = {.count = 1, .reusable = true}}, SHIFT(972),
-  [3015] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_paramspec_parameter, 2, .production_id = 23),
-  [3017] = {.entry = {.count = 1, .reusable = true}}, SHIFT(850),
-  [3019] = {.entry = {.count = 1, .reusable = true}}, SHIFT(612),
-  [3021] = {.entry = {.count = 1, .reusable = true}}, SHIFT(860),
-  [3023] = {.entry = {.count = 1, .reusable = true}}, SHIFT(817),
-  [3025] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_relative_import, 2, .production_id = 23),
-  [3027] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1222),
-  [3029] = {.entry = {.count = 1, .reusable = true}}, SHIFT(839),
-  [3031] = {.entry = {.count = 1, .reusable = true}}, SHIFT(848),
-  [3033] = {.entry = {.count = 1, .reusable = true}}, SHIFT(312),
-  [3035] = {.entry = {.count = 1, .reusable = true}}, SHIFT(818),
-  [3037] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1342),
-  [3039] = {.entry = {.count = 1, .reusable = true}}, SHIFT(606),
-  [3041] = {.entry = {.count = 1, .reusable = true}}, SHIFT(775),
-  [3043] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1350),
-  [3045] = {.entry = {.count = 1, .reusable = true}}, SHIFT(84),
-  [3047] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_with_clause, 4),
-  [3049] = {.entry = {.count = 1, .reusable = true}}, SHIFT(397),
-  [3051] = {.entry = {.count = 1, .reusable = true}}, SHIFT(94),
-  [3053] = {.entry = {.count = 1, .reusable = true}}, SHIFT(804),
-  [3055] = {.entry = {.count = 1, .reusable = true}}, SHIFT(724),
-  [3057] = {.entry = {.count = 1, .reusable = true}}, SHIFT(784),
-  [3059] = {.entry = {.count = 1, .reusable = true}}, SHIFT(622),
-  [3061] = {.entry = {.count = 1, .reusable = true}}, SHIFT(635),
-  [3063] = {.entry = {.count = 1, .reusable = true}}, SHIFT(873),
-  [3065] = {.entry = {.count = 1, .reusable = true}}, SHIFT(78),
-  [3067] = {.entry = {.count = 1, .reusable = true}}, SHIFT(718),
-  [3069] = {.entry = {.count = 1, .reusable = true}}, SHIFT(611),
-  [3071] = {.entry = {.count = 1, .reusable = true}}, SHIFT(795),
-  [3073] = {.entry = {.count = 1, .reusable = true}}, SHIFT(791),
-  [3075] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1089),
-  [3077] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1056),
-  [3079] = {.entry = {.count = 1, .reusable = true}}, SHIFT(637),
-  [3081] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1382),
-  [3083] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1116),
-  [3085] = {.entry = {.count = 1, .reusable = true}}, SHIFT(917),
-  [3087] = {.entry = {.count = 1, .reusable = true}}, SHIFT(688),
-  [3089] = {.entry = {.count = 1, .reusable = true}}, SHIFT(780),
-  [3091] = {.entry = {.count = 1, .reusable = true}}, SHIFT(829),
-  [3093] = {.entry = {.count = 1, .reusable = true}}, SHIFT(227),
-  [3095] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1226),
-  [3097] = {.entry = {.count = 1, .reusable = true}}, SHIFT(107),
-  [3099] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1129),
-  [3101] = {.entry = {.count = 1, .reusable = true}}, SHIFT(465),
-  [3103] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1374),
-  [3105] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1352),
-  [3107] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1402),
-  [3109] = {.entry = {.count = 1, .reusable = true}}, SHIFT(436),
-  [3111] = {.entry = {.count = 1, .reusable = true}}, SHIFT(90),
-  [3113] = {.entry = {.count = 1, .reusable = true}}, SHIFT(623),
-  [3115] = {.entry = {.count = 1, .reusable = true}}, SHIFT(816),
-  [3117] = {.entry = {.count = 1, .reusable = true}}, SHIFT(625),
-  [3119] = {.entry = {.count = 1, .reusable = true}}, SHIFT(92),
-  [3121] = {.entry = {.count = 1, .reusable = true}}, SHIFT(819),
-  [3123] = {.entry = {.count = 1, .reusable = true}}, SHIFT(626),
-  [3125] = {.entry = {.count = 1, .reusable = true}}, SHIFT(101),
-  [3127] = {.entry = {.count = 1, .reusable = true}}, SHIFT(814),
-  [3129] = {.entry = {.count = 1, .reusable = true}}, SHIFT(108),
-  [3131] = {.entry = {.count = 1, .reusable = true}}, SHIFT(116),
-  [3133] = {.entry = {.count = 1, .reusable = true}}, SHIFT(813),
-  [3135] = {.entry = {.count = 1, .reusable = true}}, SHIFT(81),
-  [3137] = {.entry = {.count = 1, .reusable = true}}, SHIFT(840),
-  [3139] = {.entry = {.count = 1, .reusable = true}}, SHIFT(119),
-  [3141] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1101),
-  [3143] = {.entry = {.count = 1, .reusable = true}}, SHIFT(129),
-  [3145] = {.entry = {.count = 1, .reusable = true}}, SHIFT(79),
-  [3147] = {.entry = {.count = 1, .reusable = true}}, SHIFT(102),
-  [3149] = {.entry = {.count = 1, .reusable = true}}, SHIFT(77),
-  [3151] = {.entry = {.count = 1, .reusable = true}}, SHIFT(82),
-  [3153] = {.entry = {.count = 1, .reusable = true}}, SHIFT(627),
-  [3155] = {.entry = {.count = 1, .reusable = true}}, SHIFT(87),
-  [3157] = {.entry = {.count = 1, .reusable = true}}, SHIFT(864),
-  [3159] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_with_clause, 5),
-  [3161] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_with_clause, 3),
-  [3163] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1223),
-  [3165] = {.entry = {.count = 1, .reusable = true}}, SHIFT(86),
-  [3167] = {.entry = {.count = 1, .reusable = true}}, SHIFT(435),
-  [3169] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1179),
-  [3171] = {.entry = {.count = 1, .reusable = true}}, SHIFT(701),
-  [3173] = {.entry = {.count = 1, .reusable = true}}, SHIFT(96),
-  [3175] = {.entry = {.count = 1, .reusable = true}}, SHIFT(969),
-  [3177] = {.entry = {.count = 1, .reusable = true}}, SHIFT(874),
-  [3179] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1107),
-  [3181] = {.entry = {.count = 1, .reusable = true}}, SHIFT(120),
-  [3183] = {.entry = {.count = 1, .reusable = true}}, SHIFT(365),
-  [3185] = {.entry = {.count = 1, .reusable = true}}, SHIFT(106),
-  [3187] = {.entry = {.count = 1, .reusable = true}},  ACCEPT_INPUT(),
-  [3189] = {.entry = {.count = 1, .reusable = true}}, SHIFT(771),
-  [3191] = {.entry = {.count = 1, .reusable = true}}, SHIFT(773),
-  [3193] = {.entry = {.count = 1, .reusable = true}}, SHIFT(117),
-  [3195] = {.entry = {.count = 1, .reusable = true}}, SHIFT(121),
-  [3197] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1108),
-  [3199] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1155),
-  [3201] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1154),
-  [3203] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1128),
-  [3205] = {.entry = {.count = 1, .reusable = true}}, SHIFT(109),
-  [3207] = {.entry = {.count = 1, .reusable = true}}, SHIFT(777),
-  [3209] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1176),
-  [3211] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1074),
-  [3213] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1132),
-  [3215] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1131),
-  [3217] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_lambda_parameters, 1),
-  [3219] = {.entry = {.count = 1, .reusable = true}}, SHIFT(437),
+  [2973] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_assignment, 5, .production_id = 92),
+  [2975] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_typevar_parameter, 2, .production_id = 85),
+  [2977] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_future_import_statement, 4, .production_id = 46),
+  [2979] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_wildcard_import, 1),
+  [2981] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_import_from_statement, 4, .production_id = 47),
+  [2983] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_import_from_statement, 4, .production_id = 48),
+  [2985] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_parameters, 3),
+  [2987] = {.entry = {.count = 1, .reusable = true}}, SHIFT(834),
+  [2989] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1411),
+  [2991] = {.entry = {.count = 1, .reusable = false}}, SHIFT(925),
+  [2993] = {.entry = {.count = 1, .reusable = true}}, SHIFT(925),
+  [2995] = {.entry = {.count = 1, .reusable = true}}, SHIFT(92),
+  [2997] = {.entry = {.count = 1, .reusable = true}}, SHIFT(290),
+  [2999] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_with_clause, 5),
+  [3001] = {.entry = {.count = 1, .reusable = true}}, SHIFT(830),
+  [3003] = {.entry = {.count = 1, .reusable = true}}, SHIFT(829),
+  [3005] = {.entry = {.count = 1, .reusable = true}}, SHIFT(431),
+  [3007] = {.entry = {.count = 1, .reusable = true}}, SHIFT(793),
+  [3009] = {.entry = {.count = 1, .reusable = true}}, SHIFT(794),
+  [3011] = {.entry = {.count = 1, .reusable = true}}, SHIFT(819),
+  [3013] = {.entry = {.count = 1, .reusable = true}}, SHIFT(818),
+  [3015] = {.entry = {.count = 1, .reusable = true}}, SHIFT(660),
+  [3017] = {.entry = {.count = 1, .reusable = true}}, SHIFT(796),
+  [3019] = {.entry = {.count = 1, .reusable = true}}, SHIFT(807),
+  [3021] = {.entry = {.count = 1, .reusable = true}}, SHIFT(812),
+  [3023] = {.entry = {.count = 1, .reusable = true}}, SHIFT(809),
+  [3025] = {.entry = {.count = 1, .reusable = true}}, SHIFT(846),
+  [3027] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1135),
+  [3029] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1136),
+  [3031] = {.entry = {.count = 1, .reusable = true}}, SHIFT(859),
+  [3033] = {.entry = {.count = 1, .reusable = true}}, SHIFT(778),
+  [3035] = {.entry = {.count = 1, .reusable = true}}, SHIFT(775),
+  [3037] = {.entry = {.count = 1, .reusable = true}}, SHIFT(104),
+  [3039] = {.entry = {.count = 1, .reusable = true}}, SHIFT(380),
+  [3041] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_lambda_parameters, 1),
+  [3043] = {.entry = {.count = 1, .reusable = true}}, SHIFT(354),
+  [3045] = {.entry = {.count = 1, .reusable = true}}, SHIFT(690),
+  [3047] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1075),
+  [3049] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1178),
+  [3051] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_relative_import, 2, .production_id = 23),
+  [3053] = {.entry = {.count = 1, .reusable = true}}, SHIFT(580),
+  [3055] = {.entry = {.count = 1, .reusable = true}}, SHIFT(790),
+  [3057] = {.entry = {.count = 1, .reusable = true}}, SHIFT(108),
+  [3059] = {.entry = {.count = 1, .reusable = true}}, SHIFT(755),
+  [3061] = {.entry = {.count = 1, .reusable = true}}, SHIFT(302),
+  [3063] = {.entry = {.count = 1, .reusable = true}}, SHIFT(88),
+  [3065] = {.entry = {.count = 1, .reusable = true}}, SHIFT(420),
+  [3067] = {.entry = {.count = 1, .reusable = true}}, SHIFT(686),
+  [3069] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1221),
+  [3071] = {.entry = {.count = 1, .reusable = true}}, SHIFT(855),
+  [3073] = {.entry = {.count = 1, .reusable = true}}, SHIFT(105),
+  [3075] = {.entry = {.count = 1, .reusable = true}}, SHIFT(763),
+  [3077] = {.entry = {.count = 1, .reusable = true}}, SHIFT(774),
+  [3079] = {.entry = {.count = 1, .reusable = true}}, SHIFT(76),
+  [3081] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1164),
+  [3083] = {.entry = {.count = 1, .reusable = true}}, SHIFT(782),
+  [3085] = {.entry = {.count = 1, .reusable = true}}, SHIFT(945),
+  [3087] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1299),
+  [3089] = {.entry = {.count = 1, .reusable = true}}, SHIFT(433),
+  [3091] = {.entry = {.count = 1, .reusable = true}}, SHIFT(991),
+  [3093] = {.entry = {.count = 1, .reusable = true}}, SHIFT(84),
+  [3095] = {.entry = {.count = 1, .reusable = true}}, SHIFT(80),
+  [3097] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1062),
+  [3099] = {.entry = {.count = 1, .reusable = true}}, SHIFT(91),
+  [3101] = {.entry = {.count = 1, .reusable = true}}, SHIFT(71),
+  [3103] = {.entry = {.count = 1, .reusable = true}}, SHIFT(781),
+  [3105] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1101),
+  [3107] = {.entry = {.count = 1, .reusable = true}}, SHIFT(96),
+  [3109] = {.entry = {.count = 1, .reusable = true}}, SHIFT(602),
+  [3111] = {.entry = {.count = 1, .reusable = true}}, SHIFT(106),
+  [3113] = {.entry = {.count = 1, .reusable = true}}, SHIFT(120),
+  [3115] = {.entry = {.count = 1, .reusable = true}}, SHIFT(608),
+  [3117] = {.entry = {.count = 1, .reusable = true}}, SHIFT(609),
+  [3119] = {.entry = {.count = 1, .reusable = true}}, SHIFT(617),
+  [3121] = {.entry = {.count = 1, .reusable = true}}, SHIFT(111),
+  [3123] = {.entry = {.count = 1, .reusable = true}}, SHIFT(597),
+  [3125] = {.entry = {.count = 1, .reusable = true}}, SHIFT(100),
+  [3127] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1372),
+  [3129] = {.entry = {.count = 1, .reusable = true}}, SHIFT(81),
+  [3131] = {.entry = {.count = 1, .reusable = true}}, SHIFT(83),
+  [3133] = {.entry = {.count = 1, .reusable = true}}, SHIFT(89),
+  [3135] = {.entry = {.count = 1, .reusable = true}}, SHIFT(892),
+  [3137] = {.entry = {.count = 1, .reusable = true}}, SHIFT(693),
+  [3139] = {.entry = {.count = 1, .reusable = true}}, SHIFT(217),
+  [3141] = {.entry = {.count = 1, .reusable = true}}, SHIFT(369),
+  [3143] = {.entry = {.count = 1, .reusable = true}}, SHIFT(613),
+  [3145] = {.entry = {.count = 1, .reusable = true}}, SHIFT(611),
+  [3147] = {.entry = {.count = 1, .reusable = true}}, SHIFT(610),
+  [3149] = {.entry = {.count = 1, .reusable = true}}, SHIFT(760),
+  [3151] = {.entry = {.count = 1, .reusable = true}}, SHIFT(591),
+  [3153] = {.entry = {.count = 1, .reusable = true}}, SHIFT(118),
+  [3155] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1068),
+  [3157] = {.entry = {.count = 1, .reusable = true}}, SHIFT(123),
+  [3159] = {.entry = {.count = 1, .reusable = true}}, SHIFT(69),
+  [3161] = {.entry = {.count = 1, .reusable = true}}, SHIFT(841),
+  [3163] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1071),
+  [3165] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_with_clause, 4),
+  [3167] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_with_clause, 3),
+  [3169] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1379),
+  [3171] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1177),
+  [3173] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1156),
+  [3175] = {.entry = {.count = 1, .reusable = true}}, SHIFT(102),
+  [3177] = {.entry = {.count = 1, .reusable = true}},  ACCEPT_INPUT(),
+  [3179] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1104),
+  [3181] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1120),
+  [3183] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1119),
+  [3185] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1118),
+  [3187] = {.entry = {.count = 1, .reusable = true}}, SHIFT(110),
+  [3189] = {.entry = {.count = 1, .reusable = true}}, SHIFT(79),
+  [3191] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1368),
+  [3193] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1152),
+  [3195] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1148),
+  [3197] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1366),
+  [3199] = {.entry = {.count = 1, .reusable = true}}, SHIFT(115),
 };
 
 #ifdef __cplusplus
@@ -76495,7 +72607,6 @@ extern const TSLanguage *tree_sitter_python(void) {
       tree_sitter_python_external_scanner_serialize,
       tree_sitter_python_external_scanner_deserialize,
     },
-    .primary_state_ids = ts_primary_state_ids,
   };
   return &language;
 }
diff --git a/python/extractor/tsg-python/tsp/src/scanner.cc b/python/extractor/tsg-python/tsp/src/scanner.cc
index 140bb65b1cf..3b253919c66 100644
--- a/python/extractor/tsg-python/tsp/src/scanner.cc
+++ b/python/extractor/tsg-python/tsp/src/scanner.cc
@@ -161,6 +161,22 @@ struct Scanner {
         } else if (lexer->lookahead == '\\') {
           if (delimiter.is_raw()) {
             lexer->advance(lexer, false);
+            // In raw strings, backslashes _can_ escape the same kind of quotes as the outer
+            // string, so we must take care to traverse any such escaped quotes now. If we don't do
+            // this, we will mistakenly consider the string to end at that escaped quote.
+            // Likewise, this also extends to escaped backslashes.
+            if (lexer->lookahead == end_character || lexer->lookahead == '\\') {
+              lexer->advance(lexer, false);
+            }
+            // Newlines after backslashes also cause issues, so we explicitly step over them here.
+            if (lexer->lookahead == '\r') {
+                lexer->advance(lexer, false);
+                if (lexer->lookahead == '\n') {
+                    lexer->advance(lexer, false);
+                }
+            } else if (lexer->lookahead == '\n') {
+                lexer->advance(lexer, false);
+            }
             continue;
           } else if (delimiter.is_bytes()) {
               lexer->mark_end(lexer);
diff --git a/python/extractor/tsg-python/tsp/src/tree_sitter/alloc.h b/python/extractor/tsg-python/tsp/src/tree_sitter/alloc.h
new file mode 100644
index 00000000000..1abdd120157
--- /dev/null
+++ b/python/extractor/tsg-python/tsp/src/tree_sitter/alloc.h
@@ -0,0 +1,54 @@
+#ifndef TREE_SITTER_ALLOC_H_
+#define TREE_SITTER_ALLOC_H_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <stdbool.h>
+#include <stdio.h>
+#include <stdlib.h>
+
+// Allow clients to override allocation functions
+#ifdef TREE_SITTER_REUSE_ALLOCATOR
+
+extern void *(*ts_current_malloc)(size_t size);
+extern void *(*ts_current_calloc)(size_t count, size_t size);
+extern void *(*ts_current_realloc)(void *ptr, size_t size);
+extern void (*ts_current_free)(void *ptr);
+
+#ifndef ts_malloc
+#define ts_malloc  ts_current_malloc
+#endif
+#ifndef ts_calloc
+#define ts_calloc  ts_current_calloc
+#endif
+#ifndef ts_realloc
+#define ts_realloc ts_current_realloc
+#endif
+#ifndef ts_free
+#define ts_free    ts_current_free
+#endif
+
+#else
+
+#ifndef ts_malloc
+#define ts_malloc  malloc
+#endif
+#ifndef ts_calloc
+#define ts_calloc  calloc
+#endif
+#ifndef ts_realloc
+#define ts_realloc realloc
+#endif
+#ifndef ts_free
+#define ts_free    free
+#endif
+
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif // TREE_SITTER_ALLOC_H_
diff --git a/python/extractor/tsg-python/tsp/src/tree_sitter/array.h b/python/extractor/tsg-python/tsp/src/tree_sitter/array.h
new file mode 100644
index 00000000000..15a3b233bbb
--- /dev/null
+++ b/python/extractor/tsg-python/tsp/src/tree_sitter/array.h
@@ -0,0 +1,290 @@
+#ifndef TREE_SITTER_ARRAY_H_
+#define TREE_SITTER_ARRAY_H_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include "./alloc.h"
+
+#include <assert.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+#include <string.h>
+
+#ifdef _MSC_VER
+#pragma warning(disable : 4101)
+#elif defined(__GNUC__) || defined(__clang__)
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunused-variable"
+#endif
+
+#define Array(T)       \
+  struct {             \
+    T *contents;       \
+    uint32_t size;     \
+    uint32_t capacity; \
+  }
+
+/// Initialize an array.
+#define array_init(self) \
+  ((self)->size = 0, (self)->capacity = 0, (self)->contents = NULL)
+
+/// Create an empty array.
+#define array_new() \
+  { NULL, 0, 0 }
+
+/// Get a pointer to the element at a given `index` in the array.
+#define array_get(self, _index) \
+  (assert((uint32_t)(_index) < (self)->size), &(self)->contents[_index])
+
+/// Get a pointer to the first element in the array.
+#define array_front(self) array_get(self, 0)
+
+/// Get a pointer to the last element in the array.
+#define array_back(self) array_get(self, (self)->size - 1)
+
+/// Clear the array, setting its size to zero. Note that this does not free any
+/// memory allocated for the array's contents.
+#define array_clear(self) ((self)->size = 0)
+
+/// Reserve `new_capacity` elements of space in the array. If `new_capacity` is
+/// less than the array's current capacity, this function has no effect.
+#define array_reserve(self, new_capacity) \
+  _array__reserve((Array *)(self), array_elem_size(self), new_capacity)
+
+/// Free any memory allocated for this array. Note that this does not free any
+/// memory allocated for the array's contents.
+#define array_delete(self) _array__delete((Array *)(self))
+
+/// Push a new `element` onto the end of the array.
+#define array_push(self, element)                            \
+  (_array__grow((Array *)(self), 1, array_elem_size(self)), \
+   (self)->contents[(self)->size++] = (element))
+
+/// Increase the array's size by `count` elements.
+/// New elements are zero-initialized.
+#define array_grow_by(self, count) \
+  do { \
+    if ((count) == 0) break; \
+    _array__grow((Array *)(self), count, array_elem_size(self)); \
+    memset((self)->contents + (self)->size, 0, (count) * array_elem_size(self)); \
+    (self)->size += (count); \
+  } while (0)
+
+/// Append all elements from one array to the end of another.
+#define array_push_all(self, other)                                       \
+  array_extend((self), (other)->size, (other)->contents)
+
+/// Append `count` elements to the end of the array, reading their values from the
+/// `contents` pointer.
+#define array_extend(self, count, contents)                    \
+  _array__splice(                                               \
+    (Array *)(self), array_elem_size(self), (self)->size, \
+    0, count,  contents                                        \
+  )
+
+/// Remove `old_count` elements from the array starting at the given `index`. At
+/// the same index, insert `new_count` new elements, reading their values from the
+/// `new_contents` pointer.
+#define array_splice(self, _index, old_count, new_count, new_contents)  \
+  _array__splice(                                                       \
+    (Array *)(self), array_elem_size(self), _index,                \
+    old_count, new_count, new_contents                                 \
+  )
+
+/// Insert one `element` into the array at the given `index`.
+#define array_insert(self, _index, element) \
+  _array__splice((Array *)(self), array_elem_size(self), _index, 0, 1, &(element))
+
+/// Remove one element from the array at the given `index`.
+#define array_erase(self, _index) \
+  _array__erase((Array *)(self), array_elem_size(self), _index)
+
+/// Pop the last element off the array, returning the element by value.
+#define array_pop(self) ((self)->contents[--(self)->size])
+
+/// Assign the contents of one array to another, reallocating if necessary.
+#define array_assign(self, other) \
+  _array__assign((Array *)(self), (const Array *)(other), array_elem_size(self))
+
+/// Swap one array with another
+#define array_swap(self, other) \
+  _array__swap((Array *)(self), (Array *)(other))
+
+/// Get the size of the array contents
+#define array_elem_size(self) (sizeof *(self)->contents)
+
+/// Search a sorted array for a given `needle` value, using the given `compare`
+/// callback to determine the order.
+///
+/// If an existing element is found to be equal to `needle`, then the `index`
+/// out-parameter is set to the existing value's index, and the `exists`
+/// out-parameter is set to true. Otherwise, `index` is set to an index where
+/// `needle` should be inserted in order to preserve the sorting, and `exists`
+/// is set to false.
+#define array_search_sorted_with(self, compare, needle, _index, _exists) \
+  _array__search_sorted(self, 0, compare, , needle, _index, _exists)
+
+/// Search a sorted array for a given `needle` value, using integer comparisons
+/// of a given struct field (specified with a leading dot) to determine the order.
+///
+/// See also `array_search_sorted_with`.
+#define array_search_sorted_by(self, field, needle, _index, _exists) \
+  _array__search_sorted(self, 0, _compare_int, field, needle, _index, _exists)
+
+/// Insert a given `value` into a sorted array, using the given `compare`
+/// callback to determine the order.
+#define array_insert_sorted_with(self, compare, value) \
+  do { \
+    unsigned _index, _exists; \
+    array_search_sorted_with(self, compare, &(value), &_index, &_exists); \
+    if (!_exists) array_insert(self, _index, value); \
+  } while (0)
+
+/// Insert a given `value` into a sorted array, using integer comparisons of
+/// a given struct field (specified with a leading dot) to determine the order.
+///
+/// See also `array_search_sorted_by`.
+#define array_insert_sorted_by(self, field, value) \
+  do { \
+    unsigned _index, _exists; \
+    array_search_sorted_by(self, field, (value) field, &_index, &_exists); \
+    if (!_exists) array_insert(self, _index, value); \
+  } while (0)
+
+// Private
+
+typedef Array(void) Array;
+
+/// This is not what you're looking for, see `array_delete`.
+static inline void _array__delete(Array *self) {
+  if (self->contents) {
+    ts_free(self->contents);
+    self->contents = NULL;
+    self->size = 0;
+    self->capacity = 0;
+  }
+}
+
+/// This is not what you're looking for, see `array_erase`.
+static inline void _array__erase(Array *self, size_t element_size,
+                                uint32_t index) {
+  assert(index < self->size);
+  char *contents = (char *)self->contents;
+  memmove(contents + index * element_size, contents + (index + 1) * element_size,
+          (self->size - index - 1) * element_size);
+  self->size--;
+}
+
+/// This is not what you're looking for, see `array_reserve`.
+static inline void _array__reserve(Array *self, size_t element_size, uint32_t new_capacity) {
+  if (new_capacity > self->capacity) {
+    if (self->contents) {
+      self->contents = ts_realloc(self->contents, new_capacity * element_size);
+    } else {
+      self->contents = ts_malloc(new_capacity * element_size);
+    }
+    self->capacity = new_capacity;
+  }
+}
+
+/// This is not what you're looking for, see `array_assign`.
+static inline void _array__assign(Array *self, const Array *other, size_t element_size) {
+  _array__reserve(self, element_size, other->size);
+  self->size = other->size;
+  memcpy(self->contents, other->contents, self->size * element_size);
+}
+
+/// This is not what you're looking for, see `array_swap`.
+static inline void _array__swap(Array *self, Array *other) {
+  Array swap = *other;
+  *other = *self;
+  *self = swap;
+}
+
+/// This is not what you're looking for, see `array_push` or `array_grow_by`.
+static inline void _array__grow(Array *self, uint32_t count, size_t element_size) {
+  uint32_t new_size = self->size + count;
+  if (new_size > self->capacity) {
+    uint32_t new_capacity = self->capacity * 2;
+    if (new_capacity < 8) new_capacity = 8;
+    if (new_capacity < new_size) new_capacity = new_size;
+    _array__reserve(self, element_size, new_capacity);
+  }
+}
+
+/// This is not what you're looking for, see `array_splice`.
+static inline void _array__splice(Array *self, size_t element_size,
+                                 uint32_t index, uint32_t old_count,
+                                 uint32_t new_count, const void *elements) {
+  uint32_t new_size = self->size + new_count - old_count;
+  uint32_t old_end = index + old_count;
+  uint32_t new_end = index + new_count;
+  assert(old_end <= self->size);
+
+  _array__reserve(self, element_size, new_size);
+
+  char *contents = (char *)self->contents;
+  if (self->size > old_end) {
+    memmove(
+      contents + new_end * element_size,
+      contents + old_end * element_size,
+      (self->size - old_end) * element_size
+    );
+  }
+  if (new_count > 0) {
+    if (elements) {
+      memcpy(
+        (contents + index * element_size),
+        elements,
+        new_count * element_size
+      );
+    } else {
+      memset(
+        (contents + index * element_size),
+        0,
+        new_count * element_size
+      );
+    }
+  }
+  self->size += new_count - old_count;
+}
+
+/// A binary search routine, based on Rust's `std::slice::binary_search_by`.
+/// This is not what you're looking for, see `array_search_sorted_with` or `array_search_sorted_by`.
+#define _array__search_sorted(self, start, compare, suffix, needle, _index, _exists) \
+  do { \
+    *(_index) = start; \
+    *(_exists) = false; \
+    uint32_t size = (self)->size - *(_index); \
+    if (size == 0) break; \
+    int comparison; \
+    while (size > 1) { \
+      uint32_t half_size = size / 2; \
+      uint32_t mid_index = *(_index) + half_size; \
+      comparison = compare(&((self)->contents[mid_index] suffix), (needle)); \
+      if (comparison <= 0) *(_index) = mid_index; \
+      size -= half_size; \
+    } \
+    comparison = compare(&((self)->contents[*(_index)] suffix), (needle)); \
+    if (comparison == 0) *(_exists) = true; \
+    else if (comparison < 0) *(_index) += 1; \
+  } while (0)
+
+/// Helper macro for the `_sorted_by` routines below. This takes the left (existing)
+/// parameter by reference in order to work with the generic sorting function above.
+#define _compare_int(a, b) ((int)*(a) - (int)(b))
+
+#ifdef _MSC_VER
+#pragma warning(default : 4101)
+#elif defined(__GNUC__) || defined(__clang__)
+#pragma GCC diagnostic pop
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif  // TREE_SITTER_ARRAY_H_
diff --git a/python/extractor/tsg-python/tsp/src/tree_sitter/parser.h b/python/extractor/tsg-python/tsp/src/tree_sitter/parser.h
index 2b14ac1046b..cbbc7b4ee3c 100644
--- a/python/extractor/tsg-python/tsp/src/tree_sitter/parser.h
+++ b/python/extractor/tsg-python/tsp/src/tree_sitter/parser.h
@@ -123,7 +123,6 @@ struct TSLanguage {
     unsigned (*serialize)(void *, char *);
     void (*deserialize)(void *, const char *, unsigned);
   } external_scanner;
-  const TSStateId *primary_state_ids;
 };
 
 /*
diff --git a/python/ql/lib/CHANGELOG.md b/python/ql/lib/CHANGELOG.md
index bd673aa9edc..1e05822734d 100644
--- a/python/ql/lib/CHANGELOG.md
+++ b/python/ql/lib/CHANGELOG.md
@@ -1,3 +1,30 @@
+## 2.1.2
+
+### Minor Analysis Improvements
+
+- Added partial support for the `copy.replace` method, [added](https://docs.python.org/3.13/library/copy.html#copy.replace) in Python 3.13.
+- Added support for type parameter defaults, as specified in [PEP-696](https://peps.python.org/pep-0696/).
+
+## 2.1.1
+
+### Minor Analysis Improvements
+
+* Modelled that `re.finditer` returns an iterable of `re.Match` objects. This is now understood by the API graph in many cases.
+* Type tracking, and hence the API graph, is now able to correctly trace through comprehensions.
+* More precise modelling of the dataflow through comprehensions. In particular, captured variables are now handled correctly.
+* Dataflow out of yield is added, allowing proper tracing through generators.
+* Added several models of standard library functions and classes, in anticipation of no longer extracting the standard library in a future release.
+
+## 2.1.0
+
+### New Features
+
+* Added support for custom threat-models, which can be used in most of our taint-tracking queries, see our [documentation](https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/customizing-your-advanced-setup-for-code-scanning#extending-codeql-coverage-with-threat-models) for more details.
+
+### Minor Analysis Improvements
+
+* The common sanitizer guard `StringConstCompareBarrier` has been renamed to `ConstCompareBarrier` and expanded to cover comparisons with other constant values such as `None`. This may result in fewer false positive results for several queries. 
+
 ## 2.0.0
 
 ### Breaking Changes
diff --git a/python/ql/lib/change-notes/2024-08-30-bottle.md b/python/ql/lib/change-notes/2024-08-30-bottle.md
new file mode 100644
index 00000000000..b3a07f41f59
--- /dev/null
+++ b/python/ql/lib/change-notes/2024-08-30-bottle.md
@@ -0,0 +1,4 @@
+---
+category: majorAnalysis
+---
+* Added modeling of the `bottle` framework, leading to new remote flow sources and header writes
\ No newline at end of file
diff --git a/python/ql/lib/change-notes/released/2.1.0.md b/python/ql/lib/change-notes/released/2.1.0.md
new file mode 100644
index 00000000000..e399bad5119
--- /dev/null
+++ b/python/ql/lib/change-notes/released/2.1.0.md
@@ -0,0 +1,9 @@
+## 2.1.0
+
+### New Features
+
+* Added support for custom threat-models, which can be used in most of our taint-tracking queries, see our [documentation](https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/customizing-your-advanced-setup-for-code-scanning#extending-codeql-coverage-with-threat-models) for more details.
+
+### Minor Analysis Improvements
+
+* The common sanitizer guard `StringConstCompareBarrier` has been renamed to `ConstCompareBarrier` and expanded to cover comparisons with other constant values such as `None`. This may result in fewer false positive results for several queries. 
diff --git a/python/ql/lib/change-notes/released/2.1.1.md b/python/ql/lib/change-notes/released/2.1.1.md
new file mode 100644
index 00000000000..bd2b31a218d
--- /dev/null
+++ b/python/ql/lib/change-notes/released/2.1.1.md
@@ -0,0 +1,9 @@
+## 2.1.1
+
+### Minor Analysis Improvements
+
+* Modelled that `re.finditer` returns an iterable of `re.Match` objects. This is now understood by the API graph in many cases.
+* Type tracking, and hence the API graph, is now able to correctly trace through comprehensions.
+* More precise modelling of the dataflow through comprehensions. In particular, captured variables are now handled correctly.
+* Dataflow out of yield is added, allowing proper tracing through generators.
+* Added several models of standard library functions and classes, in anticipation of no longer extracting the standard library in a future release.
diff --git a/python/ql/lib/change-notes/released/2.1.2.md b/python/ql/lib/change-notes/released/2.1.2.md
new file mode 100644
index 00000000000..0bbb51fe284
--- /dev/null
+++ b/python/ql/lib/change-notes/released/2.1.2.md
@@ -0,0 +1,6 @@
+## 2.1.2
+
+### Minor Analysis Improvements
+
+- Added partial support for the `copy.replace` method, [added](https://docs.python.org/3.13/library/copy.html#copy.replace) in Python 3.13.
+- Added support for type parameter defaults, as specified in [PEP-696](https://peps.python.org/pep-0696/).
diff --git a/python/ql/lib/codeql-pack.release.yml b/python/ql/lib/codeql-pack.release.yml
index 0abe6ccede0..1a4e53e8772 100644
--- a/python/ql/lib/codeql-pack.release.yml
+++ b/python/ql/lib/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 2.0.0
+lastReleaseVersion: 2.1.2
diff --git a/python/ql/lib/ext/default-threat-models-fixup.model.yml b/python/ql/lib/ext/default-threat-models-fixup.model.yml
new file mode 100644
index 00000000000..cc1cb20517e
--- /dev/null
+++ b/python/ql/lib/ext/default-threat-models-fixup.model.yml
@@ -0,0 +1,8 @@
+extensions:
+  - addsTo:
+      pack: codeql/threat-models
+      extensible: threatModelConfiguration
+    data:
+    # Since responses are enabled by default in the shared threat-models configuration,
+    # we need to disable it here to keep existing behavior for the python analysis.
+      - ["response", false, -2147483647]
diff --git a/python/ql/lib/qlpack.yml b/python/ql/lib/qlpack.yml
index b3a199bce2e..5b9b9b8f67e 100644
--- a/python/ql/lib/qlpack.yml
+++ b/python/ql/lib/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/python-all
-version: 2.0.1-dev
+version: 2.1.3-dev
 groups: python
 dbscheme: semmlecode.python.dbscheme
 extractor: python
@@ -9,10 +9,12 @@ dependencies:
   codeql/dataflow: ${workspace}
   codeql/mad: ${workspace}
   codeql/regex: ${workspace}
+  codeql/threat-models: ${workspace}
   codeql/tutorial: ${workspace}
   codeql/util: ${workspace}
   codeql/xml: ${workspace}
   codeql/yaml: ${workspace}
 dataExtensions:
   - semmle/python/frameworks/**/*.model.yml
+  - ext/*.model.yml
 warnOnImplicitThis: true
diff --git a/python/ql/lib/semmle/python/ApiGraphs.qll b/python/ql/lib/semmle/python/ApiGraphs.qll
index 1ce04852f3a..4385259ca9b 100644
--- a/python/ql/lib/semmle/python/ApiGraphs.qll
+++ b/python/ql/lib/semmle/python/ApiGraphs.qll
@@ -843,6 +843,13 @@ module API {
         ref = pred.getSubscript(_) and
         ref.asCfgNode().isLoad()
         or
+        // Subscript via comprehension
+        lbl = Label::subscript() and
+        exists(PY::Comp comp |
+          pred.asExpr() = comp.getIterable() and
+          ref.asExpr() = comp.getNthInnerLoop(0).getTarget()
+        )
+        or
         // Subclassing a node
         lbl = Label::subclass() and
         exists(PY::ClassExpr clsExpr, DataFlow::Node superclass | pred.flowsTo(superclass) |
diff --git a/python/ql/lib/semmle/python/AstGenerated.qll b/python/ql/lib/semmle/python/AstGenerated.qll
index 1550095b395..e672cda001d 100644
--- a/python/ql/lib/semmle/python/AstGenerated.qll
+++ b/python/ql/lib/semmle/python/AstGenerated.qll
@@ -1126,6 +1126,9 @@ class ParamSpec_ extends @py_ParamSpec, TypeParameter {
   /** Gets the name of this parameter spec. */
   Expr getName() { py_exprs(result, _, this, 1) }
 
+  /** Gets the default of this parameter spec. */
+  Expr getDefault() { py_exprs(result, _, this, 2) }
+
   override string toString() { result = "ParamSpec" }
 }
 
@@ -1466,6 +1469,9 @@ class TypeVar_ extends @py_TypeVar, TypeParameter {
   /** Gets the bound of this type variable. */
   Expr getBound() { py_exprs(result, _, this, 2) }
 
+  /** Gets the default of this type variable. */
+  Expr getDefault() { py_exprs(result, _, this, 3) }
+
   override string toString() { result = "TypeVar" }
 }
 
@@ -1474,6 +1480,9 @@ class TypeVarTuple_ extends @py_TypeVarTuple, TypeParameter {
   /** Gets the name of this type variable tuple. */
   Expr getName() { py_exprs(result, _, this, 1) }
 
+  /** Gets the default of this type variable tuple. */
+  Expr getDefault() { py_exprs(result, _, this, 2) }
+
   override string toString() { result = "TypeVarTuple" }
 }
 
diff --git a/python/ql/lib/semmle/python/Concepts.qll b/python/ql/lib/semmle/python/Concepts.qll
index 75b884a9dd4..cc0712d181b 100644
--- a/python/ql/lib/semmle/python/Concepts.qll
+++ b/python/ql/lib/semmle/python/Concepts.qll
@@ -10,6 +10,62 @@ private import semmle.python.dataflow.new.RemoteFlowSources
 private import semmle.python.dataflow.new.TaintTracking
 private import semmle.python.Frameworks
 private import semmle.python.security.internal.EncryptionKeySizes
+private import codeql.threatmodels.ThreatModels
+
+/**
+ * A data flow source, for a specific threat-model.
+ *
+ * Extend this class to refine existing API models. If you want to model new APIs,
+ * extend `ThreatModelSource::Range` instead.
+ */
+class ThreatModelSource extends DataFlow::Node instanceof ThreatModelSource::Range {
+  /**
+   * Gets a string that represents the source kind with respect to threat modeling.
+   *
+   * See
+   * - https://github.com/github/codeql/blob/main/docs/codeql/reusables/threat-model-description.rst
+   * - https://github.com/github/codeql/blob/main/shared/threat-models/ext/threat-model-grouping.model.yml
+   */
+  string getThreatModel() { result = super.getThreatModel() }
+
+  /** Gets a string that describes the type of this threat-model source. */
+  string getSourceType() { result = super.getSourceType() }
+}
+
+/** Provides a class for modeling new sources for specific threat-models. */
+module ThreatModelSource {
+  /**
+   * A data flow source, for a specific threat-model.
+   *
+   * Extend this class to model new APIs. If you want to refine existing API models,
+   * extend `ThreatModelSource` instead.
+   */
+  abstract class Range extends DataFlow::Node {
+    /**
+     * Gets a string that represents the source kind with respect to threat modeling.
+     *
+     * See
+     * - https://github.com/github/codeql/blob/main/docs/codeql/reusables/threat-model-description.rst
+     * - https://github.com/github/codeql/blob/main/shared/threat-models/ext/threat-model-grouping.model.yml
+     */
+    abstract string getThreatModel();
+
+    /** Gets a string that describes the type of this threat-model source. */
+    abstract string getSourceType();
+  }
+}
+
+/**
+ * A data flow source that is enabled in the current threat model configuration.
+ */
+class ActiveThreatModelSource extends ThreatModelSource {
+  ActiveThreatModelSource() {
+    exists(string kind |
+      currentThreatModel(kind) and
+      this.getThreatModel() = kind
+    )
+  }
+}
 
 /**
  * A data-flow node that executes an operating system command,
@@ -1411,6 +1467,59 @@ module Http {
       override DataFlow::Node getValueArg() { none() }
     }
 
+    /**
+     * A data-flow node that enables or disables CORS
+     * in a global manner.
+     *
+     * Extend this class to refine existing API models. If you want to model new APIs,
+     * extend `CorsMiddleware::Range` instead.
+     */
+    class CorsMiddleware extends DataFlow::Node instanceof CorsMiddleware::Range {
+      /**
+       * Gets the string corresponding to the middleware
+       */
+      string getMiddlewareName() { result = super.getMiddlewareName() }
+
+      /**
+       * Gets the dataflow node corresponding to the allowed CORS origins
+       */
+      DataFlow::Node getOrigins() { result = super.getOrigins() }
+
+      /**
+       * Gets the boolean value corresponding to if CORS credentials is enabled
+       * (`true`) or disabled (`false`) by this node.
+       */
+      DataFlow::Node getCredentialsAllowed() { result = super.getCredentialsAllowed() }
+    }
+
+    /** Provides a class for modeling new CORS middleware APIs. */
+    module CorsMiddleware {
+      /**
+       * A data-flow node that enables or disables Cross-site request forgery protection
+       * in a global manner.
+       *
+       * Extend this class to model new APIs. If you want to refine existing API models,
+       * extend `CorsMiddleware` instead.
+       */
+      abstract class Range extends DataFlow::Node {
+        /**
+         * Gets the name corresponding to the middleware
+         */
+        abstract string getMiddlewareName();
+
+        /**
+         * Gets the strings corresponding to the origins allowed by the cors policy
+         */
+        abstract DataFlow::Node getOrigins();
+
+        /**
+         * Gets the boolean value corresponding to if CORS credentials is enabled
+         * (`true`) or disabled (`false`) by this node.
+         */
+        abstract DataFlow::Node getCredentialsAllowed();
+      }
+    }
+
     /**
      * A data-flow node that enables or disables Cross-site request forgery protection
      * in a global manner.
diff --git a/python/ql/lib/semmle/python/Frameworks.qll b/python/ql/lib/semmle/python/Frameworks.qll
index 74d4dedd00c..da35994b955 100644
--- a/python/ql/lib/semmle/python/Frameworks.qll
+++ b/python/ql/lib/semmle/python/Frameworks.qll
@@ -15,6 +15,7 @@ private import semmle.python.frameworks.Anyio
 private import semmle.python.frameworks.Asyncpg
 private import semmle.python.frameworks.Baize
 private import semmle.python.frameworks.BSon
+private import semmle.python.frameworks.Bottle
 private import semmle.python.frameworks.CassandraDriver
 private import semmle.python.frameworks.Cherrypy
 private import semmle.python.frameworks.ClickhouseDriver
diff --git a/python/ql/lib/semmle/python/dataflow/new/BarrierGuards.qll b/python/ql/lib/semmle/python/dataflow/new/BarrierGuards.qll
index ad8b668a94a..fefa30965ce 100644
--- a/python/ql/lib/semmle/python/dataflow/new/BarrierGuards.qll
+++ b/python/ql/lib/semmle/python/dataflow/new/BarrierGuards.qll
@@ -3,34 +3,45 @@
 private import python
 private import semmle.python.dataflow.new.DataFlow
 
-private predicate stringConstCompare(DataFlow::GuardNode g, ControlFlowNode node, boolean branch) {
+private predicate constCompare(DataFlow::GuardNode g, ControlFlowNode node, boolean branch) {
   exists(CompareNode cn | cn = g |
-    exists(StringLiteral str_const, Cmpop op |
+    exists(ImmutableLiteral const, Cmpop op |
       op = any(Eq eq) and branch = true
       or
       op = any(NotEq ne) and branch = false
     |
-      cn.operands(str_const.getAFlowNode(), op, node)
+      cn.operands(const.getAFlowNode(), op, node)
       or
-      cn.operands(node, op, str_const.getAFlowNode())
+      cn.operands(node, op, const.getAFlowNode())
     )
     or
-    exists(IterableNode str_const_iterable, Cmpop op |
+    exists(NameConstant const, Cmpop op |
+      op = any(Is is_) and branch = true
+      or
+      op = any(IsNot isn) and branch = false
+    |
+      cn.operands(const.getAFlowNode(), op, node)
+      or
+      cn.operands(node, op, const.getAFlowNode())
+    )
+    or
+    exists(IterableNode const_iterable, Cmpop op |
       op = any(In in_) and branch = true
       or
       op = any(NotIn ni) and branch = false
     |
-      forall(ControlFlowNode elem | elem = str_const_iterable.getAnElement() |
-        elem.getNode() instanceof StringLiteral
+      forall(ControlFlowNode elem | elem = const_iterable.getAnElement() |
+        elem.getNode() instanceof ImmutableLiteral
       ) and
-      cn.operands(node, op, str_const_iterable)
+      cn.operands(node, op, const_iterable)
     )
   )
 }
 
-/** A validation of unknown node by comparing with a constant string value. */
-class StringConstCompareBarrier extends DataFlow::Node {
-  StringConstCompareBarrier() {
-    this = DataFlow::BarrierGuard<stringConstCompare/3>::getABarrierNode()
-  }
+/** A validation of unknown node by comparing with a constant value. */
+class ConstCompareBarrier extends DataFlow::Node {
+  ConstCompareBarrier() { this = DataFlow::BarrierGuard<constCompare/3>::getABarrierNode() }
 }
+
+/** DEPRECATED: Use ConstCompareBarrier instead. */
+deprecated class StringConstCompareBarrier = ConstCompareBarrier;
diff --git a/python/ql/lib/semmle/python/dataflow/new/RemoteFlowSources.qll b/python/ql/lib/semmle/python/dataflow/new/RemoteFlowSources.qll
index 4ad0aee1f31..8975b967c81 100644
--- a/python/ql/lib/semmle/python/dataflow/new/RemoteFlowSources.qll
+++ b/python/ql/lib/semmle/python/dataflow/new/RemoteFlowSources.qll
@@ -15,10 +15,7 @@ private import semmle.python.Concepts
  * Extend this class to refine existing API models. If you want to model new APIs,
  * extend `RemoteFlowSource::Range` instead.
  */
-class RemoteFlowSource extends DataFlow::Node instanceof RemoteFlowSource::Range {
-  /** Gets a string that describes the type of this remote flow source. */
-  string getSourceType() { result = super.getSourceType() }
-}
+class RemoteFlowSource extends ThreatModelSource instanceof RemoteFlowSource::Range { }
 
 /** Provides a class for modeling new sources of remote user input. */
 module RemoteFlowSource {
@@ -28,8 +25,7 @@ module RemoteFlowSource {
    * Extend this class to model new APIs. If you want to refine existing API models,
    * extend `RemoteFlowSource` instead.
    */
-  abstract class Range extends DataFlow::Node {
-    /** Gets a string that describes the type of this remote flow source. */
-    abstract string getSourceType();
+  abstract class Range extends ThreatModelSource::Range {
+    override string getThreatModel() { result = "remote" }
   }
 }
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 28c1c652df4..1a38593bce4 100644
--- a/python/ql/lib/semmle/python/dataflow/new/internal/DataFlowDispatch.qll
+++ b/python/ql/lib/semmle/python/dataflow/new/internal/DataFlowDispatch.qll
@@ -163,6 +163,10 @@ newtype TArgumentPosition =
     // position, we need to ensure we make these available (these are specified as
     // parameters in the flow-summary spec)
     FlowSummaryImpl::ParsePositions::isParsedPositionalParameterPosition(_, index)
+    or
+    // the generated function inside a comprehension has a positional argument at index 0
+    exists(Comp c) and
+    index = 0
   } or
   TKeywordArgumentPosition(string name) {
     exists(any(CallNode c).getArgByName(name))
@@ -314,12 +318,11 @@ newtype TDataFlowCallable =
    * class instantiations, and (in the future) special methods.
    */
   TFunction(Function func) {
-    // For generators/list-comprehensions we create a synthetic function. In the
-    // points-to call-graph these were not considered callable, and instead we added
-    // data-flow steps (read/write) for these. As an easy solution for now, we do the
-    // same to keep things easy to reason about (and therefore exclude things that do
-    // not have a definition)
+    // Functions with an explicit definition
     exists(func.getDefinition())
+    or
+    // For generators/list-comprehensions we create a synthetic function.
+    exists(Comp c | c.getFunction() = func)
   } or
   /** see QLDoc for `DataFlowModuleScope` for why we need this. */
   TModule(Module m) or
@@ -368,14 +371,13 @@ abstract class DataFlowFunction extends DataFlowCallable, TFunction {
   int positionalOffset() { result = 0 }
 
   override ParameterNode getParameter(ParameterPosition ppos) {
+    // Do not handle lower bound positions (such as `[1..]`) here
+    // they are handled by parameter matching and would create
+    // inconsistencies here as multiple parameters could match such a position.
     exists(int index | ppos.isPositional(index) |
       result.getParameter() = func.getArg(index + this.positionalOffset())
     )
     or
-    exists(int index1, int index2 | ppos.isPositionalLowerBound(index1) and index2 >= index1 |
-      result.getParameter() = func.getArg(index2 + this.positionalOffset())
-    )
-    or
     exists(string name | ppos.isKeyword(name) | result.getParameter() = func.getArgByName(name))
     or
     // `*args`
@@ -1382,6 +1384,8 @@ private predicate sameEnclosingCallable(Node node1, Node node2) {
 // =============================================================================
 newtype TDataFlowCall =
   TNormalCall(CallNode call, Function target, CallType type) { resolveCall(call, target, type) } or
+  /** A call to the generated function inside a comprehension */
+  TComprehensionCall(Comp c) or
   TPotentialLibraryCall(CallNode call) or
   /** A synthesized call inside a summarized callable */
   TSummaryCall(
@@ -1468,6 +1472,34 @@ class NormalCall extends ExtractedDataFlowCall, TNormalCall {
   CallType getCallType() { result = type }
 }
 
+/** A call to the generated function inside a comprhension */
+class ComprehensionCall extends ExtractedDataFlowCall, TComprehensionCall {
+  Comp c;
+  Function target;
+
+  ComprehensionCall() {
+    this = TComprehensionCall(c) and
+    target = c.getFunction()
+  }
+
+  Comp getComprehension() { result = c }
+
+  override string toString() { result = "comprehension call" }
+
+  override ControlFlowNode getNode() { result.getNode() = c }
+
+  override Scope getScope() { result = c.getScope() }
+
+  override DataFlowCallable getCallable() { result.(DataFlowFunction).getScope() = target }
+
+  override ArgumentNode getArgument(ArgumentPosition apos) {
+    result.asExpr() = c.getIterable() and
+    apos.isPositional(0)
+  }
+
+  override Location getLocation() { result = c.getLocation() }
+}
+
 /**
  * A potential call to a summarized callable, a `LibraryCallable`.
  *
@@ -1698,6 +1730,47 @@ class CapturedVariablesArgumentNode extends CfgNode, ArgumentNode {
   }
 }
 
+/** A synthetic node representing the values of variables captured by a comprehension. */
+class SynthCompCapturedVariablesArgumentNode extends Node, TSynthCompCapturedVariablesArgumentNode,
+  ArgumentNode
+{
+  Comp comp;
+
+  SynthCompCapturedVariablesArgumentNode() { this = TSynthCompCapturedVariablesArgumentNode(comp) }
+
+  override string toString() { result = "Capturing closure argument (comp)" }
+
+  override Scope getScope() { result = comp.getScope() }
+
+  override Location getLocation() { result = comp.getLocation() }
+
+  Comp getComprehension() { result = comp }
+
+  override predicate argumentOf(DataFlowCall call, ArgumentPosition pos) {
+    call.(ComprehensionCall).getComprehension() = comp and
+    pos.isLambdaSelf()
+  }
+}
+
+/** A synthetic node representing the values of variables captured by a comprehension after the output has been computed. */
+class SynthCompCapturedVariablesArgumentPostUpdateNode extends PostUpdateNodeImpl,
+  TSynthCompCapturedVariablesArgumentPostUpdateNode
+{
+  Comp comp;
+
+  SynthCompCapturedVariablesArgumentPostUpdateNode() {
+    this = TSynthCompCapturedVariablesArgumentPostUpdateNode(comp)
+  }
+
+  override string toString() { result = "[post] Capturing closure argument (comp)" }
+
+  override Scope getScope() { result = comp.getScope() }
+
+  override Location getLocation() { result = comp.getLocation() }
+
+  override Node getPreUpdateNode() { result = TSynthCompCapturedVariablesArgumentNode(comp) }
+}
+
 /** Gets a viable run-time target for the call `call`. */
 DataFlowCallable viableCallable(DataFlowCall call) {
   call instanceof ExtractedDataFlowCall and
@@ -1737,7 +1810,10 @@ abstract class ReturnNode extends Node {
 /** A data flow node that represents a value returned by a callable. */
 class ExtractedReturnNode extends ReturnNode, CfgNode {
   // See `TaintTrackingImplementation::returnFlowStep`
-  ExtractedReturnNode() { node = any(Return ret).getValue().getAFlowNode() }
+  ExtractedReturnNode() {
+    node = any(Return ret).getValue().getAFlowNode() or
+    node = any(Yield yield).getAFlowNode()
+  }
 
   override ReturnKind getKind() { any() }
 }
diff --git a/python/ql/lib/semmle/python/dataflow/new/internal/DataFlowImpl1.qll b/python/ql/lib/semmle/python/dataflow/new/internal/DataFlowImpl1.qll
index 359fa71744b..17def0c431d 100644
--- a/python/ql/lib/semmle/python/dataflow/new/internal/DataFlowImpl1.qll
+++ b/python/ql/lib/semmle/python/dataflow/new/internal/DataFlowImpl1.qll
@@ -261,13 +261,17 @@ deprecated private module Config implements FullStateConfigSig {
     model = ""
   }
 
-  predicate isAdditionalFlowStep(Node node1, FlowState state1, Node node2, FlowState state2) {
+  predicate isAdditionalFlowStep(
+    Node node1, FlowState state1, Node node2, FlowState state2, string model
+  ) {
     getConfig(state1).isAdditionalFlowStep(node1, getState(state1), node2, getState(state2)) and
-    getConfig(state2) = getConfig(state1)
+    getConfig(state2) = getConfig(state1) and
+    model = ""
     or
     not singleConfiguration() and
     getConfig(state1).isAdditionalFlowStep(node1, node2) and
-    state2 = state1
+    state2 = state1 and
+    model = ""
   }
 
   predicate allowImplicitRead(Node node, ContentSet c) {
@@ -283,6 +287,8 @@ deprecated private module Config implements FullStateConfigSig {
   FlowFeature getAFeature() { result = any(Configuration config).getAFeature() }
 
   predicate includeHiddenNodes() { any(Configuration config).includeHiddenNodes() }
+
+  predicate observeDiffInformedIncrementalMode() { none() }
 }
 
 deprecated private import Impl<Config> as I
diff --git a/python/ql/lib/semmle/python/dataflow/new/internal/DataFlowImpl2.qll b/python/ql/lib/semmle/python/dataflow/new/internal/DataFlowImpl2.qll
index 359fa71744b..17def0c431d 100644
--- a/python/ql/lib/semmle/python/dataflow/new/internal/DataFlowImpl2.qll
+++ b/python/ql/lib/semmle/python/dataflow/new/internal/DataFlowImpl2.qll
@@ -261,13 +261,17 @@ deprecated private module Config implements FullStateConfigSig {
     model = ""
   }
 
-  predicate isAdditionalFlowStep(Node node1, FlowState state1, Node node2, FlowState state2) {
+  predicate isAdditionalFlowStep(
+    Node node1, FlowState state1, Node node2, FlowState state2, string model
+  ) {
     getConfig(state1).isAdditionalFlowStep(node1, getState(state1), node2, getState(state2)) and
-    getConfig(state2) = getConfig(state1)
+    getConfig(state2) = getConfig(state1) and
+    model = ""
     or
     not singleConfiguration() and
     getConfig(state1).isAdditionalFlowStep(node1, node2) and
-    state2 = state1
+    state2 = state1 and
+    model = ""
   }
 
   predicate allowImplicitRead(Node node, ContentSet c) {
@@ -283,6 +287,8 @@ deprecated private module Config implements FullStateConfigSig {
   FlowFeature getAFeature() { result = any(Configuration config).getAFeature() }
 
   predicate includeHiddenNodes() { any(Configuration config).includeHiddenNodes() }
+
+  predicate observeDiffInformedIncrementalMode() { none() }
 }
 
 deprecated private import Impl<Config> as I
diff --git a/python/ql/lib/semmle/python/dataflow/new/internal/DataFlowImpl3.qll b/python/ql/lib/semmle/python/dataflow/new/internal/DataFlowImpl3.qll
index 359fa71744b..17def0c431d 100644
--- a/python/ql/lib/semmle/python/dataflow/new/internal/DataFlowImpl3.qll
+++ b/python/ql/lib/semmle/python/dataflow/new/internal/DataFlowImpl3.qll
@@ -261,13 +261,17 @@ deprecated private module Config implements FullStateConfigSig {
     model = ""
   }
 
-  predicate isAdditionalFlowStep(Node node1, FlowState state1, Node node2, FlowState state2) {
+  predicate isAdditionalFlowStep(
+    Node node1, FlowState state1, Node node2, FlowState state2, string model
+  ) {
     getConfig(state1).isAdditionalFlowStep(node1, getState(state1), node2, getState(state2)) and
-    getConfig(state2) = getConfig(state1)
+    getConfig(state2) = getConfig(state1) and
+    model = ""
     or
     not singleConfiguration() and
     getConfig(state1).isAdditionalFlowStep(node1, node2) and
-    state2 = state1
+    state2 = state1 and
+    model = ""
   }
 
   predicate allowImplicitRead(Node node, ContentSet c) {
@@ -283,6 +287,8 @@ deprecated private module Config implements FullStateConfigSig {
   FlowFeature getAFeature() { result = any(Configuration config).getAFeature() }
 
   predicate includeHiddenNodes() { any(Configuration config).includeHiddenNodes() }
+
+  predicate observeDiffInformedIncrementalMode() { none() }
 }
 
 deprecated private import Impl<Config> as I
diff --git a/python/ql/lib/semmle/python/dataflow/new/internal/DataFlowImpl4.qll b/python/ql/lib/semmle/python/dataflow/new/internal/DataFlowImpl4.qll
index 359fa71744b..17def0c431d 100644
--- a/python/ql/lib/semmle/python/dataflow/new/internal/DataFlowImpl4.qll
+++ b/python/ql/lib/semmle/python/dataflow/new/internal/DataFlowImpl4.qll
@@ -261,13 +261,17 @@ deprecated private module Config implements FullStateConfigSig {
     model = ""
   }
 
-  predicate isAdditionalFlowStep(Node node1, FlowState state1, Node node2, FlowState state2) {
+  predicate isAdditionalFlowStep(
+    Node node1, FlowState state1, Node node2, FlowState state2, string model
+  ) {
     getConfig(state1).isAdditionalFlowStep(node1, getState(state1), node2, getState(state2)) and
-    getConfig(state2) = getConfig(state1)
+    getConfig(state2) = getConfig(state1) and
+    model = ""
     or
     not singleConfiguration() and
     getConfig(state1).isAdditionalFlowStep(node1, node2) and
-    state2 = state1
+    state2 = state1 and
+    model = ""
   }
 
   predicate allowImplicitRead(Node node, ContentSet c) {
@@ -283,6 +287,8 @@ deprecated private module Config implements FullStateConfigSig {
   FlowFeature getAFeature() { result = any(Configuration config).getAFeature() }
 
   predicate includeHiddenNodes() { any(Configuration config).includeHiddenNodes() }
+
+  predicate observeDiffInformedIncrementalMode() { none() }
 }
 
 deprecated private import Impl<Config> as I
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 218dbdae302..b29be706c4f 100644
--- a/python/ql/lib/semmle/python/dataflow/new/internal/DataFlowPrivate.qll
+++ b/python/ql/lib/semmle/python/dataflow/new/internal/DataFlowPrivate.qll
@@ -168,6 +168,26 @@ private predicate synthDictSplatArgumentNodeStoreStep(
   )
 }
 
+/**
+ * Holds if `nodeFrom` is the value yielded by the `yield` found at `nodeTo`.
+ *
+ * For example, in
+ * ```python
+ * for x in l:
+ *   yield x.name
+ * ```
+ * data from `x.name` is stored into the `yield` (and can subsequently be read out of the iterable).
+ */
+predicate yieldStoreStep(Node nodeFrom, Content c, Node nodeTo) {
+  exists(Yield yield |
+    nodeTo.asCfgNode() = yield.getAFlowNode() and
+    nodeFrom.asCfgNode() = yield.getValue().getAFlowNode() and
+    // TODO: Consider if this will also need to transfer dictionary content
+    // once dictionary comprehensions are supported.
+    c instanceof ListElementContent
+  )
+}
+
 /**
  * Ensures that the a `**kwargs` parameter will not contain elements with names of
  * keyword parameters.
@@ -256,6 +276,12 @@ abstract class PostUpdateNodeImpl extends Node {
   abstract Node getPreUpdateNode();
 }
 
+/**
+ * A post-update node synthesised for an existing control flow node.
+ * Add to `TSyntheticPostUpdateNode` to get the synthetic post-update node synthesised.
+ *
+ * Synthetic post-update nodes for synthetic nodes need to be listed one by one.
+ */
 class SyntheticPostUpdateNode extends PostUpdateNodeImpl, TSyntheticPostUpdateNode {
   ControlFlowNode node;
 
@@ -270,6 +296,11 @@ class SyntheticPostUpdateNode extends PostUpdateNodeImpl, TSyntheticPostUpdateNo
   override Location getLocation() { result = node.getLocation() }
 }
 
+/**
+ * An existsing control flow node being the post-update node of a synthetic pre-update node.
+ *
+ * Synthetic post-update nodes for synthetic nodes need to be listed one by one.
+ */
 class NonSyntheticPostUpdateNode extends PostUpdateNodeImpl, CfgNode {
   SyntheticPreUpdateNode pre;
 
@@ -668,8 +699,6 @@ predicate storeStep(Node nodeFrom, ContentSet c, Node nodeTo) {
   or
   setStoreStep(nodeFrom, c, nodeTo)
   or
-  comprehensionStoreStep(nodeFrom, c, nodeTo)
-  or
   attributeStoreStep(nodeFrom, c, nodeTo)
   or
   matchStoreStep(nodeFrom, c, nodeTo)
@@ -683,6 +712,8 @@ predicate storeStep(Node nodeFrom, ContentSet c, Node nodeTo) {
   or
   synthDictSplatArgumentNodeStoreStep(nodeFrom, c, nodeTo)
   or
+  yieldStoreStep(nodeFrom, c, nodeTo)
+  or
   VariableCapture::storeStep(nodeFrom, c, nodeTo)
 }
 
@@ -843,31 +874,6 @@ predicate dictClearStep(Node node, DictionaryElementContent c) {
   )
 }
 
-/** Data flows from an element expression in a comprehension to the comprehension. */
-predicate comprehensionStoreStep(CfgNode nodeFrom, Content c, CfgNode nodeTo) {
-  // Comprehension
-  //   `[x+1 for x in l]`
-  //   nodeFrom is `x+1`, cfg node
-  //   nodeTo is `[x+1 for x in l]`, cfg node
-  //   c denotes list or set or dictionary without index
-  //
-  // List
-  nodeTo.getNode().getNode().(ListComp).getElt() = nodeFrom.getNode().getNode() and
-  c instanceof ListElementContent
-  or
-  // Set
-  nodeTo.getNode().getNode().(SetComp).getElt() = nodeFrom.getNode().getNode() and
-  c instanceof SetElementContent
-  or
-  // Dictionary
-  nodeTo.getNode().getNode().(DictComp).getElt() = nodeFrom.getNode().getNode() and
-  c instanceof DictionaryElementAnyContent
-  or
-  // Generator
-  nodeTo.getNode().getNode().(GeneratorExp).getElt() = nodeFrom.getNode().getNode() and
-  c instanceof ListElementContent
-}
-
 /**
  * Holds if `nodeFrom` flows into the attribute `c` of `nodeTo` via an attribute assignment.
  *
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 cb05f3887a3..ffecbcba57a 100644
--- a/python/ql/lib/semmle/python/dataflow/new/internal/DataFlowPublic.qll
+++ b/python/ql/lib/semmle/python/dataflow/new/internal/DataFlowPublic.qll
@@ -71,6 +71,9 @@ newtype TNode =
       def.getDefiningNode() = node and
       def.getParameter() = func.getArg(0)
     )
+    or
+    // the iterable argument to the implicit comprehension function
+    node.getNode() = any(Comp c).getIterable()
   } or
   /** A node representing a global (module-level) variable in a specific module. */
   TModuleVariableNode(Module m, GlobalVariable v) {
@@ -124,9 +127,16 @@ newtype TNode =
   /** A synthetic node representing the heap of a function. Used for variable capture. */
   TSynthCapturedVariablesParameterNode(Function f) {
     f = any(VariableCapture::CapturedVariable v).getACapturingScope() and
-    // TODO: Remove this restriction when adding proper support for captured variables in the body of the function we generate for comprehensions
     exists(TFunction(f))
   } or
+  /** A synthetic node representing the values of variables captured by a comprehension. */
+  TSynthCompCapturedVariablesArgumentNode(Comp comp) {
+    comp.getFunction() = any(VariableCapture::CapturedVariable v).getACapturingScope()
+  } or
+  /** A synthetic node representing the values of variables captured by a comprehension after the output has been computed. */
+  TSynthCompCapturedVariablesArgumentPostUpdateNode(Comp comp) {
+    comp.getFunction() = any(VariableCapture::CapturedVariable v).getACapturingScope()
+  } or
   /** An empty, unused node type that exists to prevent unwanted dependencies on data flow nodes. */
   TForbiddenRecursionGuard() {
     none() and
@@ -350,6 +360,9 @@ class ExtractedArgumentNode extends ArgumentNode {
     or
     // and self arguments
     this.asCfgNode() = any(CallNode c).getFunction().(AttrNode).getObject()
+    or
+    // for comprehensions, we allow the synthetic `iterable` argument
+    this.asExpr() = any(Comp c).getIterable()
   }
 
   final override predicate argumentOf(DataFlowCall call, ArgumentPosition pos) {
@@ -674,16 +687,23 @@ newtype TContent =
 class Content extends TContent {
   /** Gets a textual representation of this element. */
   string toString() { result = "Content" }
+
+  /** Gets the Models-as-Data representation of this content (if any). */
+  string getMaDRepresentation() { none() }
 }
 
 /** An element of a list. */
 class ListElementContent extends TListElementContent, Content {
   override string toString() { result = "List element" }
+
+  override string getMaDRepresentation() { result = "ListElement" }
 }
 
 /** An element of a set. */
 class SetElementContent extends TSetElementContent, Content {
   override string toString() { result = "Set element" }
+
+  override string getMaDRepresentation() { result = "SetElement" }
 }
 
 /** An element of a tuple at a specific index. */
@@ -696,6 +716,8 @@ class TupleElementContent extends TTupleElementContent, Content {
   int getIndex() { result = index }
 
   override string toString() { result = "Tuple element at index " + index.toString() }
+
+  override string getMaDRepresentation() { result = "TupleElement[" + index + "]" }
 }
 
 /** An element of a dictionary under a specific key. */
@@ -708,11 +730,15 @@ class DictionaryElementContent extends TDictionaryElementContent, Content {
   string getKey() { result = key }
 
   override string toString() { result = "Dictionary element at key " + key }
+
+  override string getMaDRepresentation() { result = "DictionaryElement[" + key + "]" }
 }
 
 /** An element of a dictionary under any key. */
 class DictionaryElementAnyContent extends TDictionaryElementAnyContent, Content {
   override string toString() { result = "Any dictionary element" }
+
+  override string getMaDRepresentation() { result = "DictionaryElementAny" }
 }
 
 /** An object attribute. */
@@ -725,6 +751,8 @@ class AttributeContent extends TAttributeContent, Content {
   string getAttribute() { result = attr }
 
   override string toString() { result = "Attribute " + attr }
+
+  override string getMaDRepresentation() { result = "Attribute[" + attr + "]" }
 }
 
 /** A captured variable. */
@@ -737,6 +765,8 @@ class CapturedVariableContent extends Content, TCapturedVariableContent {
   VariableCapture::CapturedVariable getVariable() { result = v }
 
   override string toString() { result = "captured " + v }
+
+  override string getMaDRepresentation() { none() }
 }
 
 /**
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 05b08467252..e83e789c2fb 100644
--- a/python/ql/lib/semmle/python/dataflow/new/internal/IterableUnpacking.qll
+++ b/python/ql/lib/semmle/python/dataflow/new/internal/IterableUnpacking.qll
@@ -187,7 +187,7 @@ class ForTarget extends ControlFlowNode {
     )
     or
     exists(Comp comp |
-      source = comp.getIterable() and
+      source = comp.getFunction().getArg(0) and
       this.getNode() = comp.getNthInnerLoop(0).getTarget()
     )
   }
diff --git a/python/ql/lib/semmle/python/dataflow/new/internal/TaintTrackingPrivate.qll b/python/ql/lib/semmle/python/dataflow/new/internal/TaintTrackingPrivate.qll
index 572e67c28a9..62f5a76309b 100644
--- a/python/ql/lib/semmle/python/dataflow/new/internal/TaintTrackingPrivate.qll
+++ b/python/ql/lib/semmle/python/dataflow/new/internal/TaintTrackingPrivate.qll
@@ -46,8 +46,6 @@ private module Cached {
       or
       containerStep(nodeFrom, nodeTo)
       or
-      copyStep(nodeFrom, nodeTo)
-      or
       DataFlowPrivate::forReadStep(nodeFrom, _, nodeTo)
       or
       DataFlowPrivate::iterableUnpackingReadStep(nodeFrom, _, nodeTo)
@@ -188,19 +186,7 @@ predicate containerStep(DataFlow::Node nodeFrom, DataFlow::Node nodeTo) {
   // TODO: once we have proper flow-summary modeling, we might not need this step any
   // longer -- but there needs to be a matching read-step for the store-step, and we
   // don't provide that right now.
-  DataFlowPrivate::comprehensionStoreStep(nodeFrom, _, nodeTo)
-}
-
-/**
- * Holds if taint can flow from `nodeFrom` to `nodeTo` with a step related to copying.
- */
-predicate copyStep(DataFlow::CfgNode nodeFrom, DataFlow::CfgNode nodeTo) {
-  exists(DataFlow::CallCfgNode call | call = nodeTo |
-    call = API::moduleImport("copy").getMember(["copy", "deepcopy"]).getACall() and
-    call.getArg(0) = nodeFrom
-  )
-  or
-  nodeTo.(DataFlow::MethodCallNode).calls(nodeFrom, "copy")
+  DataFlowPrivate::yieldStoreStep(nodeFrom, _, nodeTo)
 }
 
 /**
@@ -233,3 +219,36 @@ predicate asyncWithStep(DataFlow::Node nodeFrom, DataFlow::Node nodeTo) {
     contextManager.strictlyDominates(var)
   )
 }
+
+import SpeculativeTaintFlow
+
+private module SpeculativeTaintFlow {
+  private import semmle.python.dataflow.new.internal.DataFlowDispatch as DataFlowDispatch
+  private import semmle.python.dataflow.new.internal.DataFlowPublic as DataFlowPublic
+
+  /**
+   * Holds if the additional step from `src` to `sink` should be considered in
+   * speculative taint flow exploration.
+   */
+  predicate speculativeTaintStep(DataFlow::Node src, DataFlow::Node sink) {
+    exists(DataFlowDispatch::DataFlowCall call, DataFlowDispatch::ArgumentPosition argpos |
+      // TODO: exclude neutrals and anything that has QL modeling.
+      not exists(DataFlowDispatch::DataFlowCall call0 |
+        // Workaround for the fact that python currently associates several
+        // DataFlowCalls with a single call.
+        src.(DataFlowPublic::ArgumentNode).argumentOf(call0, _) and
+        exists(DataFlowDispatch::viableCallable(call0))
+      ) and
+      call instanceof DataFlowDispatch::PotentialLibraryCall and
+      src.(DataFlowPublic::ArgumentNode).argumentOf(call, argpos)
+    |
+      not argpos.isSelf() and
+      sink.(DataFlowPublic::PostUpdateNode)
+          .getPreUpdateNode()
+          .(DataFlowPublic::ArgumentNode)
+          .argumentOf(call, any(DataFlowDispatch::ArgumentPosition qualpos | qualpos.isSelf()))
+      or
+      sink.(DataFlowDispatch::OutNode).getCall(_) = call
+    )
+  }
+}
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 f3e4ff40800..415028ad827 100644
--- a/python/ql/lib/semmle/python/dataflow/new/internal/TypeTrackingImpl.qll
+++ b/python/ql/lib/semmle/python/dataflow/new/internal/TypeTrackingImpl.qll
@@ -304,7 +304,7 @@ module TypeTrackingInput implements Shared::TypeTrackingInput {
       var.hasDefiningNode(def)
     |
       nodeTo.(DataFlowPublic::ScopeEntryDefinitionNode).getDefinition() = e and
-      nodeFrom.asCfgNode() = def.getValue() and
+      nodeFrom.asCfgNode() = def and
       var.getScope().getScope*() = nodeFrom.getScope()
     )
   }
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 86dcee2bfe3..6cb80881e2a 100644
--- a/python/ql/lib/semmle/python/dataflow/new/internal/VariableCapture.qll
+++ b/python/ql/lib/semmle/python/dataflow/new/internal/VariableCapture.qll
@@ -127,6 +127,11 @@ module Flow = Shared::Flow<Location, CaptureInput>;
 private Flow::ClosureNode asClosureNode(Node n) {
   result = n.(SynthCaptureNode).getSynthesizedCaptureNode()
   or
+  exists(Comp comp | n = TSynthCompCapturedVariablesArgumentNode(comp) |
+    result.(Flow::ExprNode).getExpr().getNode() = comp
+  )
+  or
+  // TODO: Should the `Comp`s above be excluded here?
   result.(Flow::ExprNode).getExpr() = n.(CfgNode).getNode()
   or
   result.(Flow::VariableWriteSourceNode).getVariableWrite() = n.(CfgNode).getNode()
diff --git a/python/ql/lib/semmle/python/frameworks/Bottle.qll b/python/ql/lib/semmle/python/frameworks/Bottle.qll
new file mode 100644
index 00000000000..ce2a41dbaf4
--- /dev/null
+++ b/python/ql/lib/semmle/python/frameworks/Bottle.qll
@@ -0,0 +1,175 @@
+/**
+ * Provides classes modeling security-relevant aspects of the `bottle` PyPI package.
+ * See https://bottlepy.org/docs/dev/.
+ */
+
+private import python
+private import semmle.python.Concepts
+private import semmle.python.ApiGraphs
+private import semmle.python.dataflow.new.RemoteFlowSources
+private import semmle.python.frameworks.internal.InstanceTaintStepsHelper
+private import semmle.python.frameworks.Stdlib
+
+/**
+ * INTERNAL: Do not use.
+ *
+ * Provides models for the `bottle` PyPI package.
+ * See https://bottlepy.org/docs/dev/.
+ */
+module Bottle {
+  /** Gets a reference to the `bottle` module. */
+  API::Node bottle() { result = API::moduleImport("bottle") }
+
+  /** Provides models for the `bottle` module. */
+  module BottleModule {
+    /**
+     * Provides models for Bottle applications.
+     */
+    module App {
+      /** Gets a reference to a Bottle application (an instance of `bottle.Bottle`) */
+      API::Node app() { result = bottle().getMember(["Bottle", "app"]).getReturn() }
+    }
+
+    /** Provides models for functions that are possible "views" */
+    module View {
+      /**
+       * A Bottle view callable, that handles incoming requests.
+       */
+      class ViewCallable extends Function {
+        ViewCallable() { this = any(BottleRouteSetup rs).getARequestHandler() }
+      }
+
+      /** Get methods that reprsent a route in Bottle */
+      string routeMethods() { result = ["route", "get", "post", "put", "delete", "patch"] }
+
+      private class BottleRouteSetup extends Http::Server::RouteSetup::Range, DataFlow::CallCfgNode {
+        BottleRouteSetup() {
+          this =
+            [
+              App::app().getMember(routeMethods()).getACall(),
+              bottle().getMember(routeMethods()).getACall()
+            ]
+        }
+
+        override DataFlow::Node getUrlPatternArg() {
+          result in [this.getArg(0), this.getArgByName("route")]
+        }
+
+        override string getFramework() { result = "Bottle" }
+
+        override Parameter getARoutedParameter() { none() }
+
+        override Function getARequestHandler() { result.getADecorator().getAFlowNode() = node }
+      }
+    }
+
+    /** Provides models for the `bottle.response` module */
+    module Response {
+      /** Gets a reference to the `bottle.response` module or instantiation of Bottle Response class. */
+      API::Node response() {
+        result = [bottle().getMember("response"), bottle().getMember("Response").getReturn()]
+      }
+
+      /** A response returned by a view callable. */
+      class BottleReturnResponse extends Http::Server::HttpResponse::Range {
+        BottleReturnResponse() {
+          this.asCfgNode() = any(View::ViewCallable vc).getAReturnValueFlowNode()
+        }
+
+        override DataFlow::Node getBody() { result = this }
+
+        override DataFlow::Node getMimetypeOrContentTypeArg() { none() }
+
+        override string getMimetypeDefault() { result = "text/html" }
+      }
+
+      /**
+       * A call to the `bottle.BaseResponse.set_header` or `bottle.BaseResponse.add_header` method.
+       *
+       * See https://bottlepy.org/docs/dev/api.html#bottle.BaseResponse.set_header
+       */
+      class BottleResponseHandlerSetHeaderCall extends Http::Server::ResponseHeaderWrite::Range,
+        DataFlow::MethodCallNode
+      {
+        BottleResponseHandlerSetHeaderCall() {
+          this = response().getMember(["set_header", "add_header"]).getACall()
+        }
+
+        override DataFlow::Node getNameArg() {
+          result in [this.getArg(0), this.getArgByName("name")]
+        }
+
+        override DataFlow::Node getValueArg() {
+          result in [this.getArg(1), this.getArgByName("value")]
+        }
+
+        override predicate nameAllowsNewline() { none() }
+
+        override predicate valueAllowsNewline() { none() }
+      }
+    }
+
+    /** Provides models for the `bottle.request` module */
+    module Request {
+      /** Gets a reference to the `bottle.request` module. */
+      API::Node request() { result = bottle().getMember("request") }
+
+      private class Request extends RemoteFlowSource::Range {
+        Request() { this = request().asSource() }
+
+        override string getSourceType() { result = "bottle.request" }
+      }
+
+      /**
+       * Taint propagation for `bottle.request`.
+       *
+       * See https://bottlepy.org/docs/dev/api.html#bottle.request
+       */
+      private class InstanceTaintSteps extends InstanceTaintStepsHelper {
+        InstanceTaintSteps() { this = "bottle.request" }
+
+        override DataFlow::Node getInstance() { result = request().getAValueReachableFromSource() }
+
+        override string getAttributeName() {
+          result in [
+              "headers", "query", "forms", "params", "json", "url", "body", "fullpath",
+              "query_string"
+            ]
+        }
+
+        override string getMethodName() { none() }
+
+        override string getAsyncMethodName() { none() }
+      }
+    }
+
+    /** Provides models for the `bottle.headers` module */
+    module Headers {
+      /** Gets a reference to the `bottle.headers` module. */
+      API::Node headers() { result = bottle().getMember("response").getMember("headers") }
+
+      /** A dict-like write to a response header. */
+      class HeaderWriteSubscript extends Http::Server::ResponseHeaderWrite::Range, DataFlow::Node {
+        DataFlow::Node name;
+        DataFlow::Node value;
+
+        HeaderWriteSubscript() {
+          exists(SubscriptNode subscript |
+            this.asCfgNode() = subscript and
+            value.asCfgNode() = subscript.(DefinitionNode).getValue() and
+            name.asCfgNode() = subscript.getIndex() and
+            subscript.getObject() = headers().asSource().asCfgNode()
+          )
+        }
+
+        override DataFlow::Node getNameArg() { result = name }
+
+        override DataFlow::Node getValueArg() { result = value }
+
+        override predicate nameAllowsNewline() { none() }
+
+        override predicate valueAllowsNewline() { none() }
+      }
+    }
+  }
+}
diff --git a/python/ql/lib/semmle/python/frameworks/FastApi.qll b/python/ql/lib/semmle/python/frameworks/FastApi.qll
index 3a15ca6fbcc..ed28f18a85a 100644
--- a/python/ql/lib/semmle/python/frameworks/FastApi.qll
+++ b/python/ql/lib/semmle/python/frameworks/FastApi.qll
@@ -30,6 +30,51 @@ module FastApi {
     API::Node instance() { result = cls().getReturn() }
   }
 
+  /**
+   * A call to `app.add_middleware` adding a generic middleware.
+   */
+  private class AddMiddlewareCall extends DataFlow::CallCfgNode {
+    AddMiddlewareCall() { this = App::instance().getMember("add_middleware").getACall() }
+
+    /**
+     * Gets the string corresponding to the middleware
+     */
+    string getMiddlewareName() { result = this.getArg(0).asExpr().(Name).getId() }
+  }
+
+  /**
+   * A call to `app.add_middleware` adding CORSMiddleware.
+   */
+  class AddCorsMiddlewareCall extends Http::Server::CorsMiddleware::Range, AddMiddlewareCall {
+    /**
+     * Gets the string corresponding to the middleware
+     */
+    override string getMiddlewareName() { result = this.getArg(0).asExpr().(Name).getId() }
+
+    /**
+     * Gets the dataflow node corresponding to the allowed CORS origins
+     */
+    override DataFlow::Node getOrigins() { result = this.getArgByName("allow_origins") }
+
+    /**
+     * Gets the boolean value corresponding to if CORS credentials is enabled
+     * (`true`) or disabled (`false`) by this node.
+     */
+    override DataFlow::Node getCredentialsAllowed() {
+      result = this.getArgByName("allow_credentials")
+    }
+
+    /**
+     * Gets the dataflow node corresponding to the allowed CORS methods
+     */
+    DataFlow::Node getMethods() { result = this.getArgByName("allow_methods") }
+
+    /**
+     * Gets the dataflow node corresponding to the allowed CORS headers
+     */
+    DataFlow::Node getHeaders() { result = this.getArgByName("allow_headers") }
+  }
+
   /**
    * Provides models for the `fastapi.APIRouter` class
    *
diff --git a/python/ql/lib/semmle/python/frameworks/PEP249.qll b/python/ql/lib/semmle/python/frameworks/PEP249.qll
index 2425f4514f8..1eecc12b3d1 100644
--- a/python/ql/lib/semmle/python/frameworks/PEP249.qll
+++ b/python/ql/lib/semmle/python/frameworks/PEP249.qll
@@ -81,6 +81,24 @@ module PEP249 {
     }
   }
 
+  /** A call to a method that fetches rows from a previous execution. */
+  private class FetchMethodCall extends ThreatModelSource::Range, API::CallNode {
+    FetchMethodCall() {
+      exists(API::Node start |
+        start instanceof DatabaseCursor or start instanceof DatabaseConnection
+      |
+        // note: since we can't currently provide accesspaths for sources, these are all
+        // lumped together, although clearly the fetchmany/fetchall returns a
+        // list/iterable with rows.
+        this = start.getMember(["fetchone", "fetchmany", "fetchall"]).getACall()
+      )
+    }
+
+    override string getThreatModel() { result = "database" }
+
+    override string getSourceType() { result = "cursor.fetch*()" }
+  }
+
   // ---------------------------------------------------------------------------
   // asyncio implementations
   // ---------------------------------------------------------------------------
diff --git a/python/ql/lib/semmle/python/frameworks/Pycurl.qll b/python/ql/lib/semmle/python/frameworks/Pycurl.qll
index 10e534821b6..9ce97388662 100644
--- a/python/ql/lib/semmle/python/frameworks/Pycurl.qll
+++ b/python/ql/lib/semmle/python/frameworks/Pycurl.qll
@@ -37,6 +37,15 @@ module Pycurl {
     /** Gets a reference to an instance of `pycurl.Curl`. */
     private API::Node instance() { result = classRef().getReturn() }
 
+    /** Gets a reference to `pycurl.Curl.setopt`. */
+    private API::Node setopt() { result = instance().getMember("setopt") }
+
+    /** Gets a reference to the constant `pycurl.Curl.SSL_VERIFYPEER`. */
+    private API::Node sslverifypeer() {
+      result = API::moduleImport("pycurl").getMember("SSL_VERIFYPEER") or
+      result = instance().getMember("SSL_VERIFYPEER")
+    }
+
     /**
      * When the first parameter value of the `setopt` function is set to `pycurl.URL`,
      * the second parameter value is the request resource link.
@@ -45,7 +54,7 @@ module Pycurl {
      */
     private class OutgoingRequestCall extends Http::Client::Request::Range, DataFlow::CallCfgNode {
       OutgoingRequestCall() {
-        this = instance().getMember("setopt").getACall() and
+        this = setopt().getACall() and
         this.getArg(0).asCfgNode().(AttrNode).getName() = "URL"
       }
 
@@ -58,9 +67,37 @@ module Pycurl {
       override predicate disablesCertificateValidation(
         DataFlow::Node disablingNode, DataFlow::Node argumentOrigin
       ) {
-        // TODO: Look into disabling certificate validation
         none()
       }
     }
+
+    /**
+     * When the first parameter value of the `setopt` function is set to `SSL_VERIFYPEER` or `SSL_VERIFYHOST`,
+     * the second parameter value disables or enable SSL certifiacte verification.
+     *
+     * See http://pycurl.io/docs/latest/curlobject.html#pycurl.Curl.setopt.
+     */
+    private class CurlSslCall extends Http::Client::Request::Range, DataFlow::CallCfgNode {
+      CurlSslCall() {
+        this = setopt().getACall() and
+        this.getArg(0).asCfgNode().(AttrNode).getName() = ["SSL_VERIFYPEER", "SSL_VERIFYHOST"]
+      }
+
+      override DataFlow::Node getAUrlPart() { none() }
+
+      override string getFramework() { result = "pycurl.Curl" }
+
+      override predicate disablesCertificateValidation(
+        DataFlow::Node disablingNode, DataFlow::Node argumentOrigin
+      ) {
+        sslverifypeer().getAValueReachableFromSource() = this.getArg(0) and
+        (
+          this.getArg(1).asExpr().(IntegerLiteral).getValue() = 0
+          or
+          this.getArg(1).asExpr().(BooleanLiteral).booleanValue() = false
+        ) and
+        (disablingNode = this and argumentOrigin = this.getArg(1))
+      }
+    }
   }
 }
diff --git a/python/ql/lib/semmle/python/frameworks/Starlette.qll b/python/ql/lib/semmle/python/frameworks/Starlette.qll
index ec62888ecb0..7ced137fcfc 100644
--- a/python/ql/lib/semmle/python/frameworks/Starlette.qll
+++ b/python/ql/lib/semmle/python/frameworks/Starlette.qll
@@ -25,6 +25,74 @@ private import semmle.python.frameworks.data.ModelsAsData
  * - https://www.starlette.io/
  */
 module Starlette {
+  /**
+   * Provides models for the `starlette.app` class
+   */
+  module App {
+    /** Gets import of `starlette.app`. */
+    API::Node cls() { result = API::moduleImport("starlette").getMember("app") }
+
+    /** Gets a reference to a Starlette application (an instance of `starlette.app`). */
+    API::Node instance() { result = cls().getAnInstance() }
+  }
+
+  /**
+   * A call to any of the execute methods on a `app.add_middleware`.
+   */
+  class AddMiddlewareCall extends DataFlow::CallCfgNode {
+    AddMiddlewareCall() {
+      this = [App::instance().getMember("add_middleware").getACall(), Middleware::instance()]
+    }
+
+    /**
+     * Gets the string corresponding to the middleware
+     */
+    string getMiddlewareName() { result = this.getArg(0).asExpr().(Name).getId() }
+  }
+
+  /**
+   * A call to any of the execute methods on a `app.add_middleware` with CORSMiddleware.
+   */
+  class AddCorsMiddlewareCall extends AddMiddlewareCall, Http::Server::CorsMiddleware::Range {
+    /**
+     * Gets the string corresponding to the middleware
+     */
+    override string getMiddlewareName() { result = this.getArg(0).asExpr().(Name).getId() }
+
+    override DataFlow::Node getOrigins() { result = this.getArgByName("allow_origins") }
+
+    override DataFlow::Node getCredentialsAllowed() {
+      result = this.getArgByName("allow_credentials")
+    }
+
+    /**
+     * Gets the dataflow node corresponding to the allowed CORS methods
+     */
+    DataFlow::Node getMethods() { result = this.getArgByName("allow_methods") }
+
+    /**
+     * Gets the dataflow node corresponding to the allowed CORS headers
+     */
+    DataFlow::Node getHeaders() { result = this.getArgByName("allow_headers") }
+  }
+
+  /**
+   * Provides models for the `starlette.middleware.Middleware` class
+   *
+   * See https://www.starlette.io/.
+   */
+  module Middleware {
+    /** Gets a reference to the `starlette.middleware.Middleware` class. */
+    API::Node classRef() {
+      result = API::moduleImport("starlette").getMember("middleware").getMember("Middleware")
+      or
+      result = ModelOutput::getATypeNode("starlette.middleware.Middleware~Subclass").getASubclass*()
+    }
+
+    /** Gets a reference to an instance of `starlette.middleware.Middleware`. */
+    DataFlow::Node instance() { result = classRef().getACall() }
+  }
+
   /**
    * Provides models for the `starlette.websockets.WebSocket` class
    *
diff --git a/python/ql/lib/semmle/python/frameworks/Stdlib.model.yml b/python/ql/lib/semmle/python/frameworks/Stdlib.model.yml
new file mode 100644
index 00000000000..cdbb451b673
--- /dev/null
+++ b/python/ql/lib/semmle/python/frameworks/Stdlib.model.yml
@@ -0,0 +1,189 @@
+extensions:
+  - addsTo:
+      pack: codeql/python-all
+      extensible: sourceModel
+    data:
+      - ['os', 'Member[getenv].ReturnValue', 'environment']
+      - ['os', 'Member[getenvb].ReturnValue', 'environment']
+      - ['os', 'Member[environ]', 'environment']
+      - ['os', 'Member[environb]', 'environment']
+      - ['posix', 'Member[environ]', 'environment']
+
+      - ['sys', 'Member[argv]', 'commandargs']
+      - ['sys', 'Member[orig_argv]', 'commandargs']
+
+      - ['sys', 'Member[stdin]', 'stdin']
+      - ['builtins', 'Member[input].ReturnValue', 'stdin']
+      - ['builtins', 'Member[raw_input].ReturnValue', 'stdin'] # python 2 only
+
+
+      # if no argument is given, the default is to use sys.argv[1:]
+      - ['argparse.ArgumentParser', 'Member[parse_args,parse_known_args].WithArity[0].ReturnValue', 'commandargs']
+
+      - ['os', 'Member[read].ReturnValue', 'file']
+
+  - addsTo:
+      pack: codeql/python-all
+      extensible: sinkModel
+    data:
+      - ["zipfile.ZipFile","Member[extractall].Argument[0,path:]", "path-injection"]
+
+  - addsTo:
+      pack: codeql/python-all
+      extensible: summaryModel
+    data:
+      # See https://docs.python.org/3/library/argparse.html#argparse.ArgumentParser
+      # note: taint flow for attribute lookups on `argparse.ArgumentParser` is handled in QL
+      - ["argparse.ArgumentParser", "Member[_parse_known_args,_read_args_from_files]", "Argument[0,arg_strings:]", "ReturnValue", "taint"]
+      - ["argparse.ArgumentParser", "Member[parse_args,parse_known_args]", "Argument[0,args:]", "ReturnValue", "taint"]
+      # See https://docs.python.org/3/library/cgi.html#higher-level-interface
+      - ["cgi.FieldStorage", "Member[getfirst,getlist,getvalue]", "Argument[self]", "ReturnValue", "taint"]
+      # See
+      #  - https://docs.python.org/3/glossary.html#term-mapping 
+      #  - https://docs.python.org/3/library/stdtypes.html#dict.get
+      - ["collections.abc.Mapping", "Member[get]", "Argument[1,default:]", "ReturnValue", "taint"]
+      # See https://docs.python.org/3/library/contextlib.html#contextlib.ExitStack
+      - ["contextlib.ExitStack", "Member[enter_context]", "Argument[0,cm:]", "ReturnValue", "taint"]
+      # See https://docs.python.org/3/library/copy.html#copy.deepcopy
+      - ["copy", "Member[copy,deepcopy,replace]", "Argument[0,x:]", "ReturnValue", "value"]
+      # See
+      #  - https://docs.python.org/3/library/ctypes.html#ctypes.create_string_buffer
+      #  - https://docs.python.org/3/library/ctypes.html#ctypes.create_unicode_buffer
+      - ["ctypes", "Member[create_string_buffer,create_unicode_buffer]", "Argument[0,init:,init_or_size:]", "ReturnValue", "taint"]
+      # See https://docs.python.org/3.11/distutils/apiref.html#distutils.util.change_root
+      - ["distutils", "Member[util].Member[change_root]", "Argument[0,new_root:,1,pathname:]", "ReturnValue", "taint"]
+      # See https://docs.python.org/3/library/email.header.html#email.header.Header
+      - ["email.header.Header!", "Subclass.Call", "Argument[0,s:]", "ReturnValue", "taint"]
+      # See https://docs.python.org/3/library/email.utils.html#email.utils.parseaddr
+      - ["email", "Member[utils].Member[parseaddr]", "Argument[0,addr:]", "ReturnValue", "taint"]
+      - ["email", "Member[utils].Member[parseaddr]", "Argument[0,addr:]", "ReturnValue.TupleElement[0,1]", "taint"]
+      # See See https://docs.python.org/3/library/fnmatch.html#fnmatch.filter
+      - ["fnmatch", "Member[filter]", "Argument[0,names:].ListElement", "ReturnValue.ListElement", "value"]
+      - ["fnmatch", "Member[filter]", "Argument[0,names:]", "ReturnValue", "taint"]
+      # See https://docs.python.org/3/library/getopt.html#getopt.getopt
+      - ["getopt", "Member[getopt]", "Argument[0,args:]", "ReturnValue.TupleElement[1]", "taint"]
+      - ["getopt", "Member[getopt]", "Argument[1,shortopts:,2,longopts:]", "ReturnValue.TupleElement[0].ListElement.TupleElement[0]", "taint"]
+      # See https://docs.python.org/3/library/gettext.html#gettext.gettext
+      - ["gettext", "Member[gettext]", "Argument[0,message:]", "ReturnValue", "taint"]
+      # See 
+      #  - https://docs.python.org/3/library/glob.html#glob.glob
+      #  - https://docs.python.org/3/library/glob.html#glob.iglob
+      - ["glob", "Member[glob,iglob]", "Argument[0,pathname:]", "ReturnValue", "taint"]
+      # See https://docs.python.org/3/library/gzip.html#gzip.GzipFile
+      - ["gzip.GzipFile!", "Subclass.Call", "Argument[0,filename:]", "ReturnValue", "taint"]
+      # See
+      #  - https://docs.python.org/3/library/html.html#html.escape
+      #  - https://docs.python.org/3/library/html.html#html.unescape
+      - ["html", "Member[escape,unescape]", "Argument[0,s:]", "ReturnValue", "taint"]
+      # See https://docs.python.org/3/library/html.parser.html#html.parser.HTMLParser.feed
+      - ["html.parser.HTMLParser", "Member[feed]", "Argument[0,data:]", "Argument[self]", "taint"]
+      # See https://docs.python.org/3.11/library/imp.html#imp.find_module
+      - ["imp", "Member[find_module]", "Argument[0,name:,1,path:]", "ReturnValue", "taint"]
+      # See https://docs.python.org/3/library/logging.html#logging.getLevelName
+      #   specifically the no matching case 
+      - ["logging", "Member[getLevelName]", "Argument[0,level:]", "ReturnValue", "taint"]
+      # See https://docs.python.org/3/library/logging.html#logging.LogRecord.getMessage
+      - ["logging.LogRecord", "Member[getMessage]", "Argument[self]", "ReturnValue", "taint"]
+      # See https://docs.python.org/3/library/mimetypes.html#mimetypes.guess_type
+      - ["mimetypes", "Member[guess_type]", "Argument[0,url:]", "ReturnValue", "taint"]
+      # See https://github.com/python/cpython/blob/main/Lib/nturl2path.py
+      #   No user-facing documentation, unfortunately.
+      - ["nturl2path", "Member[pathname2url]", "Argument[0,p:]", "ReturnValue", "taint"]
+      - ["nturl2path", "Member[url2pathname]", "Argument[0,url:]", "ReturnValue", "taint"]
+      # See https://docs.python.org/3/library/optparse.html#optparse.OptionParser.parse_args
+      - ["optparse.OptionParser", "Member[parse_args]", "Argument[0,args:,1,values:]", "ReturnValue.TupleElement[0,1]", "taint"]
+      # See https://docs.python.org/3/library/os.html#os.walk
+      - ["os", "Member[walk]", "Argument[0,top:]", "ReturnValue", "taint"]
+      # See https://github.com/python/cpython/blob/3.10/Lib/pathlib.py#L972-L973
+      - ["pathlib.Path", ".Member[__enter__]", "Argument[self]", "ReturnValue", "taint"]
+      # See https://docs.python.org/3/library/os.html#os.PathLike.__fspath__
+      - ["pathlib.PurePath", "Member[__fspath__]", "Argument[self]", "ReturnValue", "taint"]
+      # See
+      #  - https://docs.python.org/3/library/asyncio-queue.html#asyncio.Queue.get
+      #  - https://docs.python.org/3/library/asyncio-queue.html#asyncio.Queue.get_nowait
+      - ["queue.Queue", "Member[get,get_nowait]", "Argument[self].ListElement", "ReturnValue", "value"]
+      - ["queue.Queue", "Member[get,get_nowait]", "Argument[self]", "ReturnValue", "taint"]
+      # See
+      #  - https://docs.python.org/3/library/asyncio-queue.html#asyncio.Queue.put
+      #  - https://docs.python.org/3/library/asyncio-queue.html#asyncio.Queue.put_nowait
+      - ["queue.Queue", "Member[put,put_nowait]", "Argument[0,item:]", "Argument[self].ListElement", "value"]
+      - ["queue.Queue", "Member[put,put_nowait]", "Argument[0,item:]", "Argument[self]", "taint"]
+      # See 
+      #  - https://docs.python.org/3/library/random.html#random.choice
+      #  - https://docs.python.org/3/library/random.html#module-random
+      - ["random", "Member[choice]", "Argument[0,seq:].ListElement", "ReturnValue", "value"]
+      - ["random", "Member[choice]", "Argument[0,seq:].SetElement", "ReturnValue", "value"]
+      - ["random", "Member[choice]", "Argument[0,seq:]", "ReturnValue", "taint"]
+      - ["random.Random", "Member[choice]", "Argument[0,seq:].ListElement", "ReturnValue", "value"]
+      - ["random.Random", "Member[choice]", "Argument[0,seq:].SetElement", "ReturnValue", "value"]
+      - ["random.Random", "Member[choice]", "Argument[0,seq:]", "ReturnValue", "taint"]
+      # See https://docs.python.org/3/library/shlex.html#shlex.quote
+      - ["shlex", "Member[quote]", "Argument[0,s:]", "ReturnValue", "taint"]
+      # See https://docs.python.org/3/library/shutil.html#shutil.rmtree
+      - ["shutil", "Member[rmtree]", "Argument[0,path:]", "Argument[2,onerror:,onexc:].Parameter[1]", "taint"]
+      # See https://docs.python.org/3/library/shutil.html#shutil.which
+      - ["shutil", "Member[which]", "Argument[0,cmd:,2,path:]", "ReturnValue", "taint"]
+      # See https://docs.python.org/3/library/subprocess.html#subprocess.Popen
+      - ["subprocess.Popen!", "Subclass.Call", "Argument[0,args:]", "ReturnValue", "taint"]
+      # See
+      #  - https://docs.python.org/3/library/tarfile.html#tarfile.open
+      #  - https://docs.python.org/3/library/tarfile.html#tarfile.TarFile.open
+      - ["tarfile", "Member[open]", "Argument[0,name:,2,fileobj:]", "ReturnValue", "taint"]
+      - ["tarfile.TarFile", "Member[open]", "Argument[0,name:,2,fileobj:]", "ReturnValue", "taint"]
+      # See https://docs.python.org/3/library/tempfile.html#tempfile.mkdtemp
+      - ["tempfile", "Member[mkdtemp]", "Argument[0,suffix:,1,prefix:,2,dir:]", "ReturnValue", "taint"]
+      # See https://docs.python.org/3/library/tempfile.html#tempfile.mkstemp
+      - ["tempfile", "Member[mkstemp]", "Argument[0,suffix:,1,prefix:,2,dir:]", "ReturnValue.TupleElement[0,1]", "taint"]
+      # See https://docs.python.org/3/library/textwrap.html#textwrap.dedent
+      - ["textwrap", "Member[dedent]", "Argument[0,text:]", "ReturnValue", "taint"]
+      # See https://docs.python.org/3/library/traceback.html#traceback.StackSummary.from_list
+      - ["traceback.StackSummary", "Member[from_list]", "Argument[0,a_list:]", "ReturnValue", "taint"]
+      # See https://docs.python.org/3/library/typing.html#typing.cast
+      - ["typing", "Member[cast]", "Argument[1,val:]", "ReturnValue", "value"]
+      # See https://docs.python.org/3/library/urllib.parse.html#urllib.parse.parse_qs
+      - ["urllib", "Member[parse].Member[parse_qs]", "Argument[0,qs:]", "ReturnValue", "taint"]
+      # See https://docs.python.org/3/library/urllib.parse.html#urllib.parse.quote
+      - ["urllib", "Member[parse].Member[quote]", "Argument[0,string:]", "ReturnValue", "taint"]
+      # See https://docs.python.org/3/library/urllib.parse.html#urllib.parse.quote_plus
+      - ["urllib", "Member[parse].Member[quote_plus]", "Argument[0,string:]", "ReturnValue", "taint"]
+      # See https://epydoc.sourceforge.net/stdlib/urllib-module.html
+      - ["urllib", "Member[parse].Member[splitquery]", "Argument[0,url:]", "ReturnValue.TupleElement[0,1]", "taint"]
+      # See https://docs.python.org/3/library/urllib.parse.html#urllib.parse.unquote
+      - ["urllib", "Member[parse].Member[unquote]", "Argument[0,string:]", "ReturnValue", "taint"]
+      # See https://docs.python.org/3/library/urllib.parse.html#urllib.parse.unquote_plus
+      - ["urllib", "Member[parse].Member[unquote_plus]", "Argument[0,string:]", "ReturnValue", "taint"]
+      # We could consider a more precise source than the first argument, namely tuple or dict content.
+      # See https://docs.python.org/3/library/urllib.parse.html#urllib.parse.urlencode
+      - ["urllib", "Member[parse].Member[urlencode]", "Argument[0,query:]", "ReturnValue", "taint"]
+      # See https://docs.python.org/3/library/urllib.parse.html#urllib.parse.urljoin
+      - ["urllib", "Member[parse].Member[urljoin]", "Argument[0,base:,1,url:]", "ReturnValue", "taint"]
+      # See the internal documentation
+      #   https://github.com/python/cpython/blob/3.12/Lib/zipfile/_path/__init__.py#L103-L105
+      - ["zipfile.CompleteDirs", "Member[namelist]", "Argument[self]", "ReturnValue", "taint"]
+      # See https://docs.python.org/3/library/zipfile.html#zipfile.ZipFile
+      #   it may be necessary to read the code to understand the taint propagation
+      #   Constructor: https://github.com/python/cpython/blob/3.12/Lib/zipfile/__init__.py#L1266
+      - ["zipfile.ZipFile!", "Subclass.Call", "Argument[0,file:]", "ReturnValue", "taint"]
+      - ["zipfile.ZipFile!", "Subclass.Call", "Argument[0,file:]", "ReturnValue.Attribute[filelist].ListElement.Attribute[filename]", "value"]
+      #   _extract_member: https://github.com/python/cpython/blob/3.12/Lib/zipfile/__init__.py#L1761
+      - ["zipfile.ZipFile", "Member[_extract_member]", "Argument[1,targetpath:]", "ReturnValue", "taint"]
+      #   infolist: https://github.com/python/cpython/blob/3.12/Lib/zipfile/__init__.py#L1498-L1501
+      - ["zipfile.ZipFile", "Member[infolist]", "Argument[self]", "ReturnValue", "taint"]
+      - ["zipfile.ZipFile", "Member[infolist]", "Argument[self].Attribute[filelist]", "ReturnValue", "value"]
+      #   namelist: https://github.com/python/cpython/blob/3.12/Lib/zipfile/__init__.py#L1494-L1496
+      - ["zipfile.ZipFile", "Member[namelist]", "Argument[self]", "ReturnValue", "taint"]
+
+  - addsTo:
+      pack: codeql/python-all
+      extensible: neutralModel
+    data: []
+
+  - addsTo:
+      pack: codeql/python-all
+      extensible: typeModel
+    data: []
+
+  - addsTo:
+      pack: codeql/python-all
+      extensible: typeVariableModel
+    data: []
\ No newline at end of file
diff --git a/python/ql/lib/semmle/python/frameworks/Stdlib.qll b/python/ql/lib/semmle/python/frameworks/Stdlib.qll
index 3c23b392991..45878c8160b 100644
--- a/python/ql/lib/semmle/python/frameworks/Stdlib.qll
+++ b/python/ql/lib/semmle/python/frameworks/Stdlib.qll
@@ -254,10 +254,14 @@ module Stdlib {
    * See https://docs.python.org/3.9/library/logging.html#logging.Logger.
    */
   module Logger {
+    private import semmle.python.dataflow.new.internal.DataFlowDispatch as DD
+
     /** Gets a reference to the `logging.Logger` class or any subclass. */
     API::Node subclassRef() {
       result = API::moduleImport("logging").getMember("Logger").getASubclass*()
       or
+      result = API::moduleImport("logging").getMember("getLoggerClass").getReturn().getASubclass*()
+      or
       result = ModelOutput::getATypeNode("logging.Logger~Subclass").getASubclass*()
     }
 
@@ -277,6 +281,13 @@ module Stdlib {
       ClassInstantiation() {
         this = subclassRef().getACall()
         or
+        this =
+          DD::selfTracker(subclassRef()
+                .getAValueReachableFromSource()
+                .asExpr()
+                .(ClassExpr)
+                .getInnerScope())
+        or
         this = API::moduleImport("logging").getMember("root").asSource()
         or
         this = API::moduleImport("logging").getMember("getLogger").getACall()
@@ -338,7 +349,7 @@ module StdlibPrivate {
    * Modeling of path related functions in the `os` module.
    * Wrapped in QL module to make it easy to fold/unfold.
    */
-  private module OsFileSystemAccessModeling {
+  module OsFileSystemAccessModeling {
     /**
      * A call to the `os.fsencode` function.
      *
@@ -395,7 +406,7 @@ module StdlibPrivate {
      *
      * See https://docs.python.org/3/library/os.html#os.open
      */
-    private class OsOpenCall extends FileSystemAccess::Range, DataFlow::CallCfgNode {
+    class OsOpenCall extends FileSystemAccess::Range, DataFlow::CallCfgNode {
       OsOpenCall() { this = os().getMember("open").getACall() }
 
       override DataFlow::Node getAPathArgument() {
@@ -1492,6 +1503,9 @@ module StdlibPrivate {
     or
     // io.open is a special case, since it is an alias for the builtin `open`
     result = API::moduleImport("io").getMember("open")
+    or
+    // similarly, coecs.open calls the builtin `open`: https://github.com/python/cpython/blob/3.12/Lib/codecs.py#L918
+    result = API::moduleImport("codecs").getMember("open")
   }
 
   /**
@@ -1499,13 +1513,22 @@ module StdlibPrivate {
    * See https://docs.python.org/3/library/functions.html#open
    */
   private class OpenCall extends FileSystemAccess::Range, Stdlib::FileLikeObject::InstanceSource,
-    DataFlow::CallCfgNode
+    ThreatModelSource::Range, DataFlow::CallCfgNode
   {
-    OpenCall() { this = getOpenFunctionRef().getACall() }
+    OpenCall() {
+      this = getOpenFunctionRef().getACall() and
+      // when analyzing stdlib code for os.py we wrongly assume that `os.open` is an
+      // alias of the builtins `open` function
+      not this instanceof OsFileSystemAccessModeling::OsOpenCall
+    }
 
     override DataFlow::Node getAPathArgument() {
       result in [this.getArg(0), this.getArgByName("file")]
     }
+
+    override string getThreatModel() { result = "file" }
+
+    override string getSourceType() { result = "open()" }
   }
 
   /**
@@ -3251,11 +3274,28 @@ module StdlibPrivate {
 
     override predicate propagatesFlow(string input, string output, boolean preservesValue) {
       input in ["Argument[0]", "Argument[pattern:]"] and
-      output = "ReturnValue.Attribute[pattern]" and
-      preservesValue = true
+      (
+        output = "ReturnValue.Attribute[pattern]" and
+        preservesValue = true
+        or
+        output = "ReturnValue" and
+        preservesValue = false
+      )
     }
   }
 
+  /**
+   * A base API node for regular expression functions.
+   * Either the `re` module or a compiled regular expression.
+   */
+  private API::Node re(boolean compiled) {
+    result = API::moduleImport("re") and
+    compiled = false
+    or
+    result = any(RePatternSummary c).getACall().(API::CallNode).getReturn() and
+    compiled = true
+  }
+
   /**
    * A flow summary for methods returning a `re.Match` object
    *
@@ -3265,17 +3305,18 @@ module StdlibPrivate {
     ReMatchSummary() { this = ["re.Match", "compiled re.Match"] }
 
     override DataFlow::CallCfgNode getACall() {
-      this = "re.Match" and
-      result = API::moduleImport("re").getMember(["match", "search", "fullmatch"]).getACall()
-      or
-      this = "compiled re.Match" and
-      result =
-        any(RePatternSummary c)
-            .getACall()
-            .(API::CallNode)
-            .getReturn()
-            .getMember(["match", "search", "fullmatch"])
-            .getACall()
+      exists(API::Node re, boolean compiled |
+        re = re(compiled) and
+        (
+          compiled = false and
+          this = "re.Match"
+          or
+          compiled = true and
+          this = "compiled re.Match"
+        )
+      |
+        result = re.getMember(["match", "search", "fullmatch"]).getACall()
+      )
     }
 
     override DataFlow::ArgumentNode getACallback() { none() }
@@ -3312,6 +3353,13 @@ module StdlibPrivate {
     }
   }
 
+  /** An API node for a `re.Match` object */
+  private API::Node match() {
+    result = any(ReMatchSummary c).getACall().(API::CallNode).getReturn()
+    or
+    result = re(_).getMember("finditer").getReturn().getASubscript()
+  }
+
   /**
    * A flow summary for methods on a `re.Match` object
    *
@@ -3325,15 +3373,7 @@ module StdlibPrivate {
       methodName in ["expand", "group", "groups", "groupdict"]
     }
 
-    override DataFlow::CallCfgNode getACall() {
-      result =
-        any(ReMatchSummary c)
-            .getACall()
-            .(API::CallNode)
-            .getReturn()
-            .getMember(methodName)
-            .getACall()
-    }
+    override DataFlow::CallCfgNode getACall() { result = match().getMember(methodName).getACall() }
 
     override DataFlow::ArgumentNode getACallback() { none() }
 
@@ -3435,6 +3475,14 @@ module StdlibPrivate {
           ) and
           preservesValue = false
         )
+        or
+        // flow from input string to attribute on match object
+        exists(int arg | arg = methodName.(RegexExecutionMethod).getStringArgIndex() - offset |
+          input in ["Argument[" + arg + "]", "Argument[string:]"] and
+          methodName = "finditer" and
+          output = "ReturnValue.ListElement.Attribute[string]" and
+          preservesValue = true
+        )
       )
     }
   }
@@ -4207,7 +4255,11 @@ module StdlibPrivate {
   // ---------------------------------------------------------------------------
   // Flow summaries for functions contructing containers
   // ---------------------------------------------------------------------------
-  /** A flow summary for `dict`. */
+  /**
+   * A flow summary for `dict`.
+   *
+   * see https://docs.python.org/3/library/stdtypes.html#dict
+   */
   class DictSummary extends SummarizedCallable {
     DictSummary() { this = "builtins.dict" }
 
@@ -4218,18 +4270,28 @@ module StdlibPrivate {
     }
 
     override predicate propagatesFlow(string input, string output, boolean preservesValue) {
+      // The positional argument contains a mapping.
+      // TODO: these values can be overwritten by keyword arguments
+      //  - dict mapping
       exists(DataFlow::DictionaryElementContent dc, string key | key = dc.getKey() |
         input = "Argument[0].DictionaryElement[" + key + "]" and
         output = "ReturnValue.DictionaryElement[" + key + "]" and
         preservesValue = true
       )
       or
+      //  - list-of-pairs mapping
+      input = "Argument[0].ListElement.TupleElement[1]" and
+      output = "ReturnValue.DictionaryElementAny" and
+      preservesValue = true
+      or
+      // The keyword arguments are added to the dictionary.
       exists(DataFlow::DictionaryElementContent dc, string key | key = dc.getKey() |
         input = "Argument[" + key + ":]" and
         output = "ReturnValue.DictionaryElement[" + key + "]" and
         preservesValue = true
       )
       or
+      // Imprecise content in the first argument ends up on the container itself.
       input = "Argument[0]" and
       output = "ReturnValue" and
       preservesValue = false
@@ -4475,21 +4537,9 @@ module StdlibPrivate {
     override DataFlow::ArgumentNode getACallback() { none() }
 
     override predicate propagatesFlow(string input, string output, boolean preservesValue) {
-      exists(string content |
-        content = "ListElement"
-        or
-        content = "SetElement"
-        or
-        exists(DataFlow::TupleElementContent tc, int i | i = tc.getIndex() |
-          content = "TupleElement[" + i.toString() + "]"
-        )
-        or
-        exists(DataFlow::DictionaryElementContent dc, string key | key = dc.getKey() |
-          content = "DictionaryElement[" + key + "]"
-        )
-      |
-        input = "Argument[self]." + content and
-        output = "ReturnValue." + content and
+      exists(DataFlow::Content c |
+        input = "Argument[self]." + c.getMaDRepresentation() and
+        output = "ReturnValue." + c.getMaDRepresentation() and
         preservesValue = true
       )
       or
@@ -4499,6 +4549,32 @@ module StdlibPrivate {
     }
   }
 
+  /** A flow summary for `copy.replace`. */
+  class ReplaceSummary extends SummarizedCallable {
+    ReplaceSummary() { this = "copy.replace" }
+
+    override DataFlow::CallCfgNode getACall() {
+      result = API::moduleImport("copy").getMember("replace").getACall()
+    }
+
+    override DataFlow::ArgumentNode getACallback() {
+      result = API::moduleImport("copy").getMember("replace").getAValueReachableFromSource()
+    }
+
+    override predicate propagatesFlow(string input, string output, boolean preservesValue) {
+      exists(CallNode c, string name, ControlFlowNode n, DataFlow::AttributeContent ac |
+        c.getFunction().(NameNode).getId() = "replace" or
+        c.getFunction().(AttrNode).getName() = "replace"
+      |
+        n = c.getArgByName(name) and
+        ac.getAttribute() = name and
+        input = "Argument[" + name + ":]" and
+        output = "ReturnValue." + ac.getMaDRepresentation() and
+        preservesValue = true
+      )
+    }
+  }
+
   /**
    * A flow summary for `pop` either for list or set.
    * This ignores the index if given, since content is
@@ -4989,6 +5065,39 @@ module StdlibPrivate {
 
     override string getKind() { result = Escaping::getHtmlKind() }
   }
+
+  // ---------------------------------------------------------------------------
+  // argparse
+  // ---------------------------------------------------------------------------
+  /**
+   * if result of `parse_args` is tainted (because it uses command-line arguments),
+   *    then the parsed values accesssed on any attribute lookup is also tainted.
+   */
+  private class ArgumentParserAnyAttributeStep extends TaintTracking::AdditionalTaintStep {
+    override predicate step(DataFlow::Node nodeFrom, DataFlow::Node nodeTo) {
+      nodeFrom =
+        API::moduleImport("argparse")
+            .getMember("ArgumentParser")
+            .getReturn()
+            .getMember("parse_args")
+            .getReturn()
+            .getAValueReachableFromSource() and
+      nodeTo.(DataFlow::AttrRead).getObject() = nodeFrom
+    }
+  }
+
+  // ---------------------------------------------------------------------------
+  // sys
+  // ---------------------------------------------------------------------------
+  /**
+   * An access of `sys.stdin`/`sys.stdout`/`sys.stderr`, to get additional FileLike
+   * modeling.
+   */
+  private class SysStandardStreams extends Stdlib::FileLikeObject::InstanceSource, DataFlow::Node {
+    SysStandardStreams() {
+      this = API::moduleImport("sys").getMember(["stdin", "stdout", "stderr"]).asSource()
+    }
+  }
 }
 
 // ---------------------------------------------------------------------------
diff --git a/python/ql/lib/semmle/python/frameworks/data/ModelsAsData.qll b/python/ql/lib/semmle/python/frameworks/data/ModelsAsData.qll
index c2176c0644b..11c6b285f2a 100644
--- a/python/ql/lib/semmle/python/frameworks/data/ModelsAsData.qll
+++ b/python/ql/lib/semmle/python/frameworks/data/ModelsAsData.qll
@@ -18,14 +18,19 @@ private import semmle.python.dataflow.new.RemoteFlowSources
 private import semmle.python.dataflow.new.DataFlow
 private import semmle.python.ApiGraphs
 private import semmle.python.dataflow.new.FlowSummary
+private import semmle.python.Concepts
 
 /**
- * A remote flow source originating from a CSV source row.
+ * A threat-model flow source originating from a data extension.
  */
-private class RemoteFlowSourceFromCsv extends RemoteFlowSource::Range {
-  RemoteFlowSourceFromCsv() { this = ModelOutput::getASourceNode("remote").asSource() }
+private class ThreatModelSourceFromDataExtension extends ThreatModelSource::Range {
+  ThreatModelSourceFromDataExtension() { this = ModelOutput::getASourceNode(_).asSource() }
 
-  override string getSourceType() { result = "Remote flow (from model)" }
+  override string getThreatModel() { this = ModelOutput::getASourceNode(result).asSource() }
+
+  override string getSourceType() {
+    result = "Source node (" + this.getThreatModel() + ") [from data-extension]"
+  }
 }
 
 private class SummarizedCallableFromModel extends SummarizedCallable {
diff --git a/python/ql/lib/semmle/python/security/dataflow/CodeInjectionCustomizations.qll b/python/ql/lib/semmle/python/security/dataflow/CodeInjectionCustomizations.qll
index 294b3c63fda..a7c2ad90a35 100644
--- a/python/ql/lib/semmle/python/security/dataflow/CodeInjectionCustomizations.qll
+++ b/python/ql/lib/semmle/python/security/dataflow/CodeInjectionCustomizations.qll
@@ -33,9 +33,14 @@ module CodeInjection {
   abstract class Sanitizer extends DataFlow::Node { }
 
   /**
-   * A source of remote user input, considered as a flow source.
+   * DEPRECATED: Use `ActiveThreatModelSource` from Concepts instead!
    */
-  class RemoteFlowSourceAsSource extends Source, RemoteFlowSource { }
+  deprecated class RemoteFlowSourceAsSource = ActiveThreatModelSourceAsSource;
+
+  /**
+   * An active threat-model source, considered as a flow source.
+   */
+  private class ActiveThreatModelSourceAsSource extends Source, ActiveThreatModelSource { }
 
   /**
    * A code execution, considered as a flow sink.
@@ -49,7 +54,10 @@ module CodeInjection {
   }
 
   /**
-   * A comparison with a constant string, considered as a sanitizer-guard.
+   * A comparison with a constant, considered as a sanitizer-guard.
    */
-  class StringConstCompareAsSanitizer extends Sanitizer, StringConstCompareBarrier { }
+  class ConstCompareAsSanitizerGuard extends Sanitizer, ConstCompareBarrier { }
+
+  /** DEPRECATED: Use ConstCompareAsSanitizerGuard instead. */
+  deprecated class StringConstCompareAsSanitizerGuard = ConstCompareAsSanitizerGuard;
 }
diff --git a/python/ql/lib/semmle/python/security/dataflow/CommandInjectionCustomizations.qll b/python/ql/lib/semmle/python/security/dataflow/CommandInjectionCustomizations.qll
index a8d17026e40..83f6ccff0a5 100644
--- a/python/ql/lib/semmle/python/security/dataflow/CommandInjectionCustomizations.qll
+++ b/python/ql/lib/semmle/python/security/dataflow/CommandInjectionCustomizations.qll
@@ -33,9 +33,14 @@ module CommandInjection {
   abstract class Sanitizer extends DataFlow::Node { }
 
   /**
-   * A source of remote user input, considered as a flow source.
+   * DEPRECATED: Use `ActiveThreatModelSource` from Concepts instead!
    */
-  class RemoteFlowSourceAsSource extends Source, RemoteFlowSource { }
+  deprecated class RemoteFlowSourceAsSource = ActiveThreatModelSourceAsSource;
+
+  /**
+   * An active threat-model source, considered as a flow source.
+   */
+  private class ActiveThreatModelSourceAsSource extends Source, ActiveThreatModelSource { }
 
   /**
    * A command execution, considered as a flow sink.
@@ -84,7 +89,10 @@ module CommandInjection {
   }
 
   /**
-   * A comparison with a constant string, considered as a sanitizer-guard.
+   * A comparison with a constant, considered as a sanitizer-guard.
    */
-  class StringConstCompareAsSanitizerGuard extends Sanitizer, StringConstCompareBarrier { }
+  class ConstCompareAsSanitizerGuard extends Sanitizer, ConstCompareBarrier { }
+
+  /** DEPRECATED: Use ConstCompareAsSanitizerGuard instead. */
+  deprecated class StringConstCompareAsSanitizerGuard = ConstCompareAsSanitizerGuard;
 }
diff --git a/python/ql/lib/semmle/python/security/dataflow/CookieInjectionCustomizations.qll b/python/ql/lib/semmle/python/security/dataflow/CookieInjectionCustomizations.qll
index dd3792182de..cee2b7b98e7 100644
--- a/python/ql/lib/semmle/python/security/dataflow/CookieInjectionCustomizations.qll
+++ b/python/ql/lib/semmle/python/security/dataflow/CookieInjectionCustomizations.qll
@@ -31,9 +31,14 @@ module CookieInjection {
   abstract class Sanitizer extends DataFlow::Node { }
 
   /**
-   * A source of remote user input, considered as a flow source.
+   * DEPRECATED: Use `ActiveThreatModelSource` from Concepts instead!
    */
-  class RemoteFlowSourceAsSource extends Source, RemoteFlowSource { }
+  deprecated class RemoteFlowSourceAsSource = ActiveThreatModelSourceAsSource;
+
+  /**
+   * An active threat-model source, considered as a flow source.
+   */
+  private class ActiveThreatModelSourceAsSource extends Source, ActiveThreatModelSource { }
 
   /**
    * A write to a cookie, considered as a sink.
diff --git a/python/ql/lib/semmle/python/security/dataflow/HttpHeaderInjectionCustomizations.qll b/python/ql/lib/semmle/python/security/dataflow/HttpHeaderInjectionCustomizations.qll
index e529d3f29e0..92cd46a3408 100644
--- a/python/ql/lib/semmle/python/security/dataflow/HttpHeaderInjectionCustomizations.qll
+++ b/python/ql/lib/semmle/python/security/dataflow/HttpHeaderInjectionCustomizations.qll
@@ -32,9 +32,14 @@ module HttpHeaderInjection {
   abstract class Sanitizer extends DataFlow::Node { }
 
   /**
-   * A source of remote user input, considered as a flow source.
+   * DEPRECATED: Use `ActiveThreatModelSource` from Concepts instead!
    */
-  class RemoteFlowSourceAsSource extends Source, RemoteFlowSource { }
+  deprecated class RemoteFlowSourceAsSource = ActiveThreatModelSourceAsSource;
+
+  /**
+   * An active threat-model source, considered as a flow source.
+   */
+  private class ActiveThreatModelSourceAsSource extends Source, ActiveThreatModelSource { }
 
   /**
    * A HTTP header write, considered as a flow sink.
diff --git a/python/ql/lib/semmle/python/security/dataflow/LdapInjectionCustomizations.qll b/python/ql/lib/semmle/python/security/dataflow/LdapInjectionCustomizations.qll
index 6c2b664bd96..e67d02dc67e 100644
--- a/python/ql/lib/semmle/python/security/dataflow/LdapInjectionCustomizations.qll
+++ b/python/ql/lib/semmle/python/security/dataflow/LdapInjectionCustomizations.qll
@@ -42,9 +42,14 @@ module LdapInjection {
   abstract class FilterSanitizer extends DataFlow::Node { }
 
   /**
-   * A source of remote user input, considered as a flow source.
+   * DEPRECATED: Use `ActiveThreatModelSource` from Concepts instead!
    */
-  class RemoteFlowSourceAsSource extends Source, RemoteFlowSource { }
+  deprecated class RemoteFlowSourceAsSource = ActiveThreatModelSourceAsSource;
+
+  /**
+   * An active threat-model source, considered as a flow source.
+   */
+  private class ActiveThreatModelSourceAsSource extends Source, ActiveThreatModelSource { }
 
   /**
    * A logging operation, considered as a flow sink.
@@ -61,15 +66,20 @@ module LdapInjection {
   }
 
   /**
-   * A comparison with a constant string, considered as a sanitizer-guard.
+   * A comparison with a constant, considered as a sanitizer-guard.
    */
-  class StringConstCompareAsDnSanitizerGuard extends DnSanitizer, StringConstCompareBarrier { }
+  class ConstCompareAsDnSanitizerGuard extends DnSanitizer, ConstCompareBarrier { }
+
+  /** DEPRECATED: Use ConstCompareAsDnSanitizerGuard instead. */
+  deprecated class StringConstCompareAsSanitizerGuard = ConstCompareAsDnSanitizerGuard;
 
   /**
-   * A comparison with a constant string, considered as a sanitizer-guard.
+   * A comparison with a constant, considered as a sanitizer-guard.
    */
-  class StringConstCompareAsFilterSanitizerGuard extends FilterSanitizer, StringConstCompareBarrier {
-  }
+  class ConstCompareAsFilterSanitizerGuard extends FilterSanitizer, ConstCompareBarrier { }
+
+  /** DEPRECATED: Use ConstCompareAsFilterSanitizerGuard instead. */
+  deprecated class StringConstCompareAsFilterSanitizerGuard = ConstCompareAsFilterSanitizerGuard;
 
   /**
    * A call to replace line breaks functions as a sanitizer.
diff --git a/python/ql/lib/semmle/python/security/dataflow/LogInjectionCustomizations.qll b/python/ql/lib/semmle/python/security/dataflow/LogInjectionCustomizations.qll
index f92b87c73fa..40aa83e1744 100644
--- a/python/ql/lib/semmle/python/security/dataflow/LogInjectionCustomizations.qll
+++ b/python/ql/lib/semmle/python/security/dataflow/LogInjectionCustomizations.qll
@@ -33,9 +33,14 @@ module LogInjection {
   abstract class Sanitizer extends DataFlow::Node { }
 
   /**
-   * A source of remote user input, considered as a flow source.
+   * DEPRECATED: Use `ActiveThreatModelSource` from Concepts instead!
    */
-  class RemoteFlowSourceAsSource extends Source, RemoteFlowSource { }
+  deprecated class RemoteFlowSourceAsSource = ActiveThreatModelSourceAsSource;
+
+  /**
+   * An active threat-model source, considered as a flow source.
+   */
+  private class ActiveThreatModelSourceAsSource extends Source, ActiveThreatModelSource { }
 
   /**
    * A logging operation, considered as a flow sink.
@@ -77,9 +82,12 @@ module LogInjection {
   }
 
   /**
-   * A comparison with a constant string, considered as a sanitizer-guard.
+   * A comparison with a constant, considered as a sanitizer-guard.
    */
-  class StringConstCompareAsSanitizerGuard extends Sanitizer, StringConstCompareBarrier { }
+  class ConstCompareAsSanitizerGuard extends Sanitizer, ConstCompareBarrier { }
+
+  /** DEPRECATED: Use ConstCompareAsSanitizerGuard instead. */
+  deprecated class StringConstCompareAsSanitizerGuard = ConstCompareAsSanitizerGuard;
 
   /**
    * A call to replace line breaks, considered as a sanitizer.
diff --git a/python/ql/lib/semmle/python/security/dataflow/PamAuthorizationCustomizations.qll b/python/ql/lib/semmle/python/security/dataflow/PamAuthorizationCustomizations.qll
index afba208e0e4..eb858be8f95 100644
--- a/python/ql/lib/semmle/python/security/dataflow/PamAuthorizationCustomizations.qll
+++ b/python/ql/lib/semmle/python/security/dataflow/PamAuthorizationCustomizations.qll
@@ -7,6 +7,7 @@ import python
 import semmle.python.ApiGraphs
 import semmle.python.dataflow.new.TaintTracking
 import semmle.python.dataflow.new.RemoteFlowSources
+import semmle.python.Concepts
 
 /**
  * Provides default sources, sinks and sanitizers for detecting
@@ -39,9 +40,14 @@ module PamAuthorizationCustomizations {
   abstract class Sink extends DataFlow::Node { }
 
   /**
-   * A source of remote user input, considered as a flow source.
+   * DEPRECATED: Use `ActiveThreatModelSource` from Concepts instead!
    */
-  class RemoteFlowSourceAsSource extends Source, RemoteFlowSource { }
+  deprecated class RemoteFlowSourceAsSource = ActiveThreatModelSourceAsSource;
+
+  /**
+   * An active threat-model source, considered as a flow source.
+   */
+  private class ActiveThreatModelSourceAsSource extends Source, ActiveThreatModelSource { }
 
   /**
    * A vulnerable `pam_authenticate` call considered as a flow sink.
diff --git a/python/ql/lib/semmle/python/security/dataflow/PathInjectionCustomizations.qll b/python/ql/lib/semmle/python/security/dataflow/PathInjectionCustomizations.qll
index cda71df2f90..8b8e2f69673 100644
--- a/python/ql/lib/semmle/python/security/dataflow/PathInjectionCustomizations.qll
+++ b/python/ql/lib/semmle/python/security/dataflow/PathInjectionCustomizations.qll
@@ -43,9 +43,14 @@ module PathInjection {
   abstract class Sanitizer extends DataFlow::Node { }
 
   /**
-   * A source of remote user input, considered as a flow source.
+   * DEPRECATED: Use `ActiveThreatModelSource` from Concepts instead!
    */
-  class RemoteFlowSourceAsSource extends Source, RemoteFlowSource { }
+  deprecated class RemoteFlowSourceAsSource = ActiveThreatModelSourceAsSource;
+
+  /**
+   * An active threat-model source, considered as a flow source.
+   */
+  private class ActiveThreatModelSourceAsSource extends Source, ActiveThreatModelSource { }
 
   /**
    * A file system access, considered as a flow sink.
@@ -87,7 +92,10 @@ module PathInjection {
   }
 
   /**
-   * A comparison with a constant string, considered as a sanitizer-guard.
+   * A comparison with a constant, considered as a sanitizer-guard.
    */
-  class StringConstCompareAsSanitizerGuard extends Sanitizer, StringConstCompareBarrier { }
+  class ConstCompareAsSanitizerGuard extends Sanitizer, ConstCompareBarrier { }
+
+  /** DEPRECATED: Use ConstCompareAsSanitizerGuard instead. */
+  deprecated class StringConstCompareAsSanitizerGuard = ConstCompareAsSanitizerGuard;
 }
diff --git a/python/ql/lib/semmle/python/security/dataflow/PolynomialReDoSCustomizations.qll b/python/ql/lib/semmle/python/security/dataflow/PolynomialReDoSCustomizations.qll
index 23cd4531230..4cc464ca4ca 100644
--- a/python/ql/lib/semmle/python/security/dataflow/PolynomialReDoSCustomizations.qll
+++ b/python/ql/lib/semmle/python/security/dataflow/PolynomialReDoSCustomizations.qll
@@ -47,9 +47,14 @@ module PolynomialReDoS {
   abstract class Sanitizer extends DataFlow::Node { }
 
   /**
-   * A source of remote user input, considered as a flow source.
+   * DEPRECATED: Use `ActiveThreatModelSource` from Concepts instead!
    */
-  class RemoteFlowSourceAsSource extends Source, RemoteFlowSource { }
+  deprecated class RemoteFlowSourceAsSource = ActiveThreatModelSourceAsSource;
+
+  /**
+   * An active threat-model source, considered as a flow source.
+   */
+  private class ActiveThreatModelSourceAsSource extends Source, ActiveThreatModelSource { }
 
   /**
    * A regex execution, considered as a flow sink.
@@ -70,7 +75,10 @@ module PolynomialReDoS {
   }
 
   /**
-   * A comparison with a constant string, considered as a sanitizer-guard.
+   * A comparison with a constant, considered as a sanitizer-guard.
    */
-  class StringConstCompareAsSanitizerGuard extends Sanitizer, StringConstCompareBarrier { }
+  class ConstCompareAsSanitizerGuard extends Sanitizer, ConstCompareBarrier { }
+
+  /** DEPRECATED: Use ConstCompareAsSanitizerGuard instead. */
+  deprecated class StringConstCompareAsSanitizerGuard = ConstCompareAsSanitizerGuard;
 }
diff --git a/python/ql/lib/semmle/python/security/dataflow/ReflectedXSSCustomizations.qll b/python/ql/lib/semmle/python/security/dataflow/ReflectedXSSCustomizations.qll
index ee2dec407d1..14db509df2f 100644
--- a/python/ql/lib/semmle/python/security/dataflow/ReflectedXSSCustomizations.qll
+++ b/python/ql/lib/semmle/python/security/dataflow/ReflectedXSSCustomizations.qll
@@ -33,9 +33,14 @@ module ReflectedXss {
   abstract class Sanitizer extends DataFlow::Node { }
 
   /**
-   * A source of remote user input, considered as a flow source.
+   * DEPRECATED: Use `ActiveThreatModelSource` from Concepts instead!
    */
-  class RemoteFlowSourceAsSource extends Source, RemoteFlowSource { }
+  deprecated class RemoteFlowSourceAsSource = ActiveThreatModelSourceAsSource;
+
+  /**
+   * An active threat-model source, considered as a flow source.
+   */
+  private class ActiveThreatModelSourceAsSource extends Source, ActiveThreatModelSource { }
 
   /**
    * A data flow sink for "reflected cross-site scripting" vulnerabilities.
@@ -75,7 +80,10 @@ module ReflectedXss {
   }
 
   /**
-   * A comparison with a constant string, considered as a sanitizer-guard.
+   * A comparison with a constant, considered as a sanitizer-guard.
    */
-  class StringConstCompareAsSanitizerGuard extends Sanitizer, StringConstCompareBarrier { }
+  class ConstCompareAsSanitizerGuard extends Sanitizer, ConstCompareBarrier { }
+
+  /** DEPRECATED: Use ConstCompareAsSanitizerGuard instead. */
+  deprecated class StringConstCompareAsSanitizerGuard = ConstCompareAsSanitizerGuard;
 }
diff --git a/python/ql/lib/semmle/python/security/dataflow/RegexInjectionCustomizations.qll b/python/ql/lib/semmle/python/security/dataflow/RegexInjectionCustomizations.qll
index 72dc66430b6..559b1f66e7e 100644
--- a/python/ql/lib/semmle/python/security/dataflow/RegexInjectionCustomizations.qll
+++ b/python/ql/lib/semmle/python/security/dataflow/RegexInjectionCustomizations.qll
@@ -40,9 +40,14 @@ module RegexInjection {
   abstract class Sanitizer extends DataFlow::Node { }
 
   /**
-   * A source of remote user input, considered as a flow source.
+   * DEPRECATED: Use `ActiveThreatModelSource` from Concepts instead!
    */
-  class RemoteFlowSourceAsSource extends Source, RemoteFlowSource { }
+  deprecated class RemoteFlowSourceAsSource = ActiveThreatModelSourceAsSource;
+
+  /**
+   * An active threat-model source, considered as a flow source.
+   */
+  private class ActiveThreatModelSourceAsSource extends Source, ActiveThreatModelSource { }
 
   /**
    * A regex escaping, considered as a sanitizer.
diff --git a/python/ql/lib/semmle/python/security/dataflow/ServerSideRequestForgeryCustomizations.qll b/python/ql/lib/semmle/python/security/dataflow/ServerSideRequestForgeryCustomizations.qll
index a4e3ecc9ee1..274e7ee57ad 100644
--- a/python/ql/lib/semmle/python/security/dataflow/ServerSideRequestForgeryCustomizations.qll
+++ b/python/ql/lib/semmle/python/security/dataflow/ServerSideRequestForgeryCustomizations.qll
@@ -45,9 +45,14 @@ module ServerSideRequestForgery {
   abstract class FullUrlControlSanitizer extends DataFlow::Node { }
 
   /**
-   * A source of remote user input, considered as a flow source.
+   * DEPRECATED: Use `ActiveThreatModelSource` from Concepts instead!
    */
-  class RemoteFlowSourceAsSource extends Source, RemoteFlowSource { }
+  deprecated class RemoteFlowSourceAsSource = ActiveThreatModelSourceAsSource;
+
+  /**
+   * An active threat-model source, considered as a flow source.
+   */
+  private class ActiveThreatModelSourceAsSource extends Source, ActiveThreatModelSource { }
 
   /** The URL of an HTTP request, considered as a sink. */
   class HttpRequestUrlAsSink extends Sink {
@@ -72,9 +77,12 @@ module ServerSideRequestForgery {
   }
 
   /**
-   * A comparison with a constant string, considered as a sanitizer-guard.
+   * A comparison with a constant, considered as a sanitizer-guard.
    */
-  class StringConstCompareAsSanitizerGuard extends Sanitizer, StringConstCompareBarrier { }
+  class ConstCompareAsSanitizerGuard extends Sanitizer, ConstCompareBarrier { }
+
+  /** DEPRECATED: Use ConstCompareAsSanitizerGuard instead. */
+  deprecated class StringConstCompareAsSanitizerGuard = ConstCompareAsSanitizerGuard;
 
   /**
    * A string construction (concat, format, f-string) where the left side is not
diff --git a/python/ql/lib/semmle/python/security/dataflow/SqlInjectionCustomizations.qll b/python/ql/lib/semmle/python/security/dataflow/SqlInjectionCustomizations.qll
index 7e0969d854f..b614eaeebec 100644
--- a/python/ql/lib/semmle/python/security/dataflow/SqlInjectionCustomizations.qll
+++ b/python/ql/lib/semmle/python/security/dataflow/SqlInjectionCustomizations.qll
@@ -32,9 +32,14 @@ module SqlInjection {
   abstract class Sanitizer extends DataFlow::Node { }
 
   /**
-   * A source of remote user input, considered as a flow source.
+   * DEPRECATED: Use `ActiveThreatModelSource` from Concepts instead!
    */
-  class RemoteFlowSourceAsSource extends Source, RemoteFlowSource { }
+  deprecated class RemoteFlowSourceAsSource = ActiveThreatModelSourceAsSource;
+
+  /**
+   * An active threat-model source, considered as a flow source.
+   */
+  private class ActiveThreatModelSourceAsSource extends Source, ActiveThreatModelSource { }
 
   /**
    * A SQL statement of a SQL construction, considered as a flow sink.
@@ -51,9 +56,12 @@ module SqlInjection {
   }
 
   /**
-   * A comparison with a constant string, considered as a sanitizer-guard.
+   * A comparison with a constant, considered as a sanitizer-guard.
    */
-  class StringConstCompareAsSanitizerGuard extends Sanitizer, StringConstCompareBarrier { }
+  class ConstCompareAsSanitizerGuard extends Sanitizer, ConstCompareBarrier { }
+
+  /** DEPRECATED: Use ConstCompareAsSanitizerGuard instead. */
+  deprecated class StringConstCompareAsSanitizerGuard = ConstCompareAsSanitizerGuard;
 
   private import semmle.python.frameworks.data.ModelsAsData
 
diff --git a/python/ql/lib/semmle/python/security/dataflow/UnsafeDeserializationCustomizations.qll b/python/ql/lib/semmle/python/security/dataflow/UnsafeDeserializationCustomizations.qll
index 27b6a44580d..d71d36279b5 100644
--- a/python/ql/lib/semmle/python/security/dataflow/UnsafeDeserializationCustomizations.qll
+++ b/python/ql/lib/semmle/python/security/dataflow/UnsafeDeserializationCustomizations.qll
@@ -33,9 +33,14 @@ module UnsafeDeserialization {
   abstract class Sanitizer extends DataFlow::Node { }
 
   /**
-   * A source of remote user input, considered as a flow source.
+   * DEPRECATED: Use `ActiveThreatModelSource` from Concepts instead!
    */
-  class RemoteFlowSourceAsSource extends Source, RemoteFlowSource { }
+  deprecated class RemoteFlowSourceAsSource = ActiveThreatModelSourceAsSource;
+
+  /**
+   * An active threat-model source, considered as a flow source.
+   */
+  private class ActiveThreatModelSourceAsSource extends Source, ActiveThreatModelSource { }
 
   /**
    * An insecure decoding, considered as a flow sink.
@@ -54,7 +59,10 @@ module UnsafeDeserialization {
   }
 
   /**
-   * A comparison with a constant string, considered as a sanitizer-guard.
+   * A comparison with a constant, considered as a sanitizer-guard.
    */
-  class StringConstCompareAsSanitizerGuard extends Sanitizer, StringConstCompareBarrier { }
+  class ConstCompareAsSanitizerGuard extends Sanitizer, ConstCompareBarrier { }
+
+  /** DEPRECATED: Use ConstCompareAsSanitizerGuard instead. */
+  deprecated class StringConstCompareAsSanitizerGuard = ConstCompareAsSanitizerGuard;
 }
diff --git a/python/ql/lib/semmle/python/security/dataflow/UnsafeShellCommandConstructionQuery.qll b/python/ql/lib/semmle/python/security/dataflow/UnsafeShellCommandConstructionQuery.qll
index 73205fdeb28..6d292a88b6c 100644
--- a/python/ql/lib/semmle/python/security/dataflow/UnsafeShellCommandConstructionQuery.qll
+++ b/python/ql/lib/semmle/python/security/dataflow/UnsafeShellCommandConstructionQuery.qll
@@ -45,6 +45,7 @@ module UnsafeShellCommandConstructionConfig implements DataFlow::ConfigSig {
   predicate isSink(DataFlow::Node sink) { sink instanceof Sink }
 
   predicate isBarrier(DataFlow::Node node) {
+    node instanceof Sanitizer or
     node instanceof CommandInjection::Sanitizer // using all sanitizers from `py/command-injection`
   }
 
diff --git a/python/ql/lib/semmle/python/security/dataflow/UrlRedirectCustomizations.qll b/python/ql/lib/semmle/python/security/dataflow/UrlRedirectCustomizations.qll
index fa913b28fbd..f5810944f8d 100644
--- a/python/ql/lib/semmle/python/security/dataflow/UrlRedirectCustomizations.qll
+++ b/python/ql/lib/semmle/python/security/dataflow/UrlRedirectCustomizations.qll
@@ -77,9 +77,14 @@ module UrlRedirect {
   }
 
   /**
-   * A source of remote user input, considered as a flow source.
+   * DEPRECATED: Use `ActiveThreatModelSource` from Concepts instead!
    */
-  class RemoteFlowSourceAsSource extends Source, RemoteFlowSource { }
+  deprecated class RemoteFlowSourceAsSource = ActiveThreatModelSourceAsSource;
+
+  /**
+   * An active threat-model source, considered as a flow source.
+   */
+  private class ActiveThreatModelSourceAsSource extends Source, ActiveThreatModelSource { }
 
   /**
    * A HTTP redirect response, considered as a flow sink.
@@ -140,12 +145,15 @@ module UrlRedirect {
   }
 
   /**
-   * A comparison with a constant string, considered as a sanitizer-guard.
+   * A comparison with a constant, considered as a sanitizer-guard.
    */
-  class StringConstCompareAsSanitizerGuard extends Sanitizer, StringConstCompareBarrier {
+  class ConstCompareAsSanitizerGuard extends Sanitizer, ConstCompareBarrier {
     override predicate sanitizes(FlowState state) {
       // sanitize all flow states
       any()
     }
   }
+
+  /** DEPRECATED: Use ConstCompareAsSanitizerGuard instead. */
+  deprecated class StringConstCompareAsSanitizerGuard = ConstCompareAsSanitizerGuard;
 }
diff --git a/python/ql/lib/semmle/python/security/dataflow/XpathInjectionCustomizations.qll b/python/ql/lib/semmle/python/security/dataflow/XpathInjectionCustomizations.qll
index ef30b3f81ce..10b47f17439 100644
--- a/python/ql/lib/semmle/python/security/dataflow/XpathInjectionCustomizations.qll
+++ b/python/ql/lib/semmle/python/security/dataflow/XpathInjectionCustomizations.qll
@@ -30,9 +30,14 @@ module XpathInjection {
   abstract class Sanitizer extends DataFlow::Node { }
 
   /**
-   * A source of remote user input, considered as a flow source.
+   * DEPRECATED: Use `ActiveThreatModelSource` from Concepts instead!
    */
-  class RemoteFlowSourceAsSource extends Source, RemoteFlowSource { }
+  deprecated class RemoteFlowSourceAsSource = ActiveThreatModelSourceAsSource;
+
+  /**
+   * An active threat-model source, considered as a flow source.
+   */
+  private class ActiveThreatModelSourceAsSource extends Source, ActiveThreatModelSource { }
 
   /**
    * A construction of an XPath expression, considered as a sink.
diff --git a/python/ql/lib/semmlecode.python.dbscheme b/python/ql/lib/semmlecode.python.dbscheme
index 728c6d65e61..5af903da088 100644
--- a/python/ql/lib/semmlecode.python.dbscheme
+++ b/python/ql/lib/semmlecode.python.dbscheme
@@ -617,6 +617,7 @@ py_extracted_version(int module : @py_Module ref,
 
 /* <Field> ParamSpec.location = 0, location */
 /* <Field> ParamSpec.name = 1, expr */
+/* <Field> ParamSpec.default = 2, expr */
 
 /* <Field> Pass.location = 0, location */
 
@@ -715,9 +716,11 @@ py_extracted_version(int module : @py_Module ref,
 /* <Field> TypeVar.location = 0, location */
 /* <Field> TypeVar.name = 1, expr */
 /* <Field> TypeVar.bound = 2, expr */
+/* <Field> TypeVar.default = 3, expr */
 
 /* <Field> TypeVarTuple.location = 0, location */
 /* <Field> TypeVarTuple.name = 1, expr */
+/* <Field> TypeVarTuple.default = 2, expr */
 
 /* <Field> UnaryExpr.location = 0, location */
 /* <Field> UnaryExpr.parenthesised = 1, bool */
diff --git a/python/ql/lib/upgrades/728c6d65e61d808ae276013ebc15abc3a97aaef1/old.dbscheme b/python/ql/lib/upgrades/728c6d65e61d808ae276013ebc15abc3a97aaef1/old.dbscheme
new file mode 100644
index 00000000000..728c6d65e61
--- /dev/null
+++ b/python/ql/lib/upgrades/728c6d65e61d808ae276013ebc15abc3a97aaef1/old.dbscheme
@@ -0,0 +1,1233 @@
+/*
+ *      This dbscheme is auto-generated by 'semmle/dbscheme_gen.py'.
+ *      WARNING: Any modifications to this file will be lost.
+ *      Relations can be changed by modifying master.py or
+ *      by adding rules to dbscheme.template
+ */
+
+/* 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.
+ *
+ * 2020-07-02
+ *
+ * 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.
+ */
+
+/*- DEPRECATED: External defects and metrics -*/
+
+externalDefects(
+  unique int id : @externalDefect,
+  varchar(900) queryPath : string ref,
+  int location : @location ref,
+  varchar(900) message : string ref,
+  float severity : float ref
+);
+
+externalMetrics(
+  unique int id : @externalMetric,
+  varchar(900) queryPath : string ref,
+  int location : @location ref,
+  float value : 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
+);
+
+/*- DEPRECATED: Snapshot date -*/
+
+snapshotDate(unique date snapshotDate : date ref);
+
+/*- Source location prefix -*/
+
+/**
+ * The source location of the snapshot.
+ */
+sourceLocationPrefix(string prefix : string ref);
+
+/*- DEPRECATED: Duplicate code -*/
+
+duplicateCode(
+  unique int id : @duplication,
+  string relativePath : string ref,
+  int equivClass : int ref
+);
+
+similarCode(
+  unique int id : @similarity,
+  string relativePath : string ref,
+  int equivClass : int ref
+);
+
+@duplication_or_similarity = @duplication | @similarity
+
+tokens(
+  int id : @duplication_or_similarity ref,
+  int offset : int ref,
+  int beginLine : int ref,
+  int beginColumn : int ref,
+  int endLine : int ref,
+  int endColumn : int ref
+);
+
+/*- DEPRECATED: Version control data -*/
+
+svnentries(
+  unique int id : @svnentry,
+  string revision : string ref,
+  string author : string ref,
+  date revisionDate : date ref,
+  int changeSize : int ref
+)
+
+svnaffectedfiles(
+  int id : @svnentry ref,
+  int file : @file ref,
+  string action : string ref
+)
+
+svnentrymsg(
+  unique int id : @svnentry ref,
+  string message : string ref
+)
+
+svnchurn(
+  int commit : @svnentry ref,
+  int file : @file ref,
+  int addedLines : int ref,
+  int deletedLines : int ref
+)
+
+/*- Lines of code -*/
+
+numlines(
+  int element_id: @sourceline ref,
+  int num_lines: int ref,
+  int num_code: int ref,
+  int num_comment: int 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
+);
+
+/*- 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;
+
+/*- 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;
+
+/*- Python dbscheme -*/
+
+/*
+ * Line metrics
+ */
+py_codelines(int id : @py_scope ref,
+             int count : int ref);
+
+py_commentlines(int id : @py_scope ref,
+                int count : int ref);
+
+py_docstringlines(int id : @py_scope ref,
+                int count : int ref);
+
+py_alllines(int id : @py_scope ref,
+                int count : int ref);
+
+/****************************
+        Python dbscheme
+****************************/
+
+@sourceline = @file | @py_Module | @xmllocatable;
+
+@location = @location_ast | @location_default ;
+
+locations_ast(unique int id: @location_ast,
+          int module: @py_Module ref,
+          int beginLine: int ref,
+          int beginColumn: int ref,
+          int endLine: int ref,
+          int endColumn: int ref);
+
+file_contents(unique int file: @file ref, string contents: string ref);
+
+py_module_path(int module: @py_Module ref, int file: @container ref);
+
+variable(unique int id : @py_variable,
+         int scope : @py_scope ref,
+         varchar(1) name : string ref);
+
+py_line_lengths(unique int id : @py_line,
+                int file: @py_Module ref,
+                int line : int ref,
+                int length : int ref);
+
+py_extracted_version(int module : @py_Module ref,
+                     varchar(1) version : string ref);
+
+/* AUTO GENERATED PART STARTS HERE */
+
+
+/* <Field> AnnAssign.location = 0, location */
+/* <Field> AnnAssign.value = 1, expr */
+/* <Field> AnnAssign.annotation = 2, expr */
+/* <Field> AnnAssign.target = 3, expr */
+
+/* <Field> Assert.location = 0, location */
+/* <Field> Assert.test = 1, expr */
+/* <Field> Assert.msg = 2, expr */
+
+/* <Field> Assign.location = 0, location */
+/* <Field> Assign.value = 1, expr */
+/* <Field> Assign.targets = 2, expr_list */
+
+/* <Field> AssignExpr.location = 0, location */
+/* <Field> AssignExpr.parenthesised = 1, bool */
+/* <Field> AssignExpr.value = 2, expr */
+/* <Field> AssignExpr.target = 3, expr */
+
+/* <Field> Attribute.location = 0, location */
+/* <Field> Attribute.parenthesised = 1, bool */
+/* <Field> Attribute.value = 2, expr */
+/* <Field> Attribute.attr = 3, str */
+/* <Field> Attribute.ctx = 4, expr_context */
+
+/* <Field> AugAssign.location = 0, location */
+/* <Field> AugAssign.operation = 1, BinOp */
+
+/* <Field> Await.location = 0, location */
+/* <Field> Await.parenthesised = 1, bool */
+/* <Field> Await.value = 2, expr */
+
+/* <Field> BinaryExpr.location = 0, location */
+/* <Field> BinaryExpr.parenthesised = 1, bool */
+/* <Field> BinaryExpr.left = 2, expr */
+/* <Field> BinaryExpr.op = 3, operator */
+/* <Field> BinaryExpr.right = 4, expr */
+/* <Parent> BinaryExpr = AugAssign  */
+
+/* <Field> BoolExpr.location = 0, location */
+/* <Field> BoolExpr.parenthesised = 1, bool */
+/* <Field> BoolExpr.op = 2, boolop */
+/* <Field> BoolExpr.values = 3, expr_list */
+
+/* <Field> Break.location = 0, location */
+
+/* <Field> Bytes.location = 0, location */
+/* <Field> Bytes.parenthesised = 1, bool */
+/* <Field> Bytes.s = 2, bytes */
+/* <Field> Bytes.prefix = 3, bytes */
+/* <Field> Bytes.implicitly_concatenated_parts = 4, StringPart_list */
+
+/* <Field> Call.location = 0, location */
+/* <Field> Call.parenthesised = 1, bool */
+/* <Field> Call.func = 2, expr */
+/* <Field> Call.positional_args = 3, expr_list */
+/* <Field> Call.named_args = 4, dict_item_list */
+
+/* <Field> Case.location = 0, location */
+/* <Field> Case.pattern = 1, pattern */
+/* <Field> Case.guard = 2, expr */
+/* <Field> Case.body = 3, stmt_list */
+
+/* <Field> Class.name = 0, str */
+/* <Field> Class.body = 1, stmt_list */
+/* <Parent> Class = ClassExpr  */
+
+/* <Field> ClassExpr.location = 0, location */
+/* <Field> ClassExpr.parenthesised = 1, bool */
+/* <Field> ClassExpr.name = 2, str */
+/* <Field> ClassExpr.bases = 3, expr_list */
+/* <Field> ClassExpr.keywords = 4, dict_item_list */
+/* <Field> ClassExpr.inner_scope = 5, Class */
+/* <Field> ClassExpr.type_parameters = 6, type_parameter_list */
+
+/* <Field> Compare.location = 0, location */
+/* <Field> Compare.parenthesised = 1, bool */
+/* <Field> Compare.left = 2, expr */
+/* <Field> Compare.ops = 3, cmpop_list */
+/* <Field> Compare.comparators = 4, expr_list */
+
+/* <Field> Continue.location = 0, location */
+
+/* <Field> Delete.location = 0, location */
+/* <Field> Delete.targets = 1, expr_list */
+
+/* <Field> Dict.location = 0, location */
+/* <Field> Dict.parenthesised = 1, bool */
+/* <Field> Dict.items = 2, dict_item_list */
+
+/* <Field> DictComp.location = 0, location */
+/* <Field> DictComp.parenthesised = 1, bool */
+/* <Field> DictComp.function = 2, Function */
+/* <Field> DictComp.iterable = 3, expr */
+
+/* <Field> DictUnpacking.location = 0, location */
+/* <Field> DictUnpacking.value = 1, expr */
+
+/* <Field> Ellipsis.location = 0, location */
+/* <Field> Ellipsis.parenthesised = 1, bool */
+
+/* <Field> ExceptGroupStmt.location = 0, location */
+/* <Field> ExceptGroupStmt.type = 1, expr */
+/* <Field> ExceptGroupStmt.name = 2, expr */
+/* <Field> ExceptGroupStmt.body = 3, stmt_list */
+
+/* <Field> ExceptStmt.location = 0, location */
+/* <Field> ExceptStmt.type = 1, expr */
+/* <Field> ExceptStmt.name = 2, expr */
+/* <Field> ExceptStmt.body = 3, stmt_list */
+
+/* <Field> Exec.location = 0, location */
+/* <Field> Exec.body = 1, expr */
+/* <Field> Exec.globals = 2, expr */
+/* <Field> Exec.locals = 3, expr */
+
+/* <Field> ExprStmt.location = 0, location */
+/* <Field> ExprStmt.value = 1, expr */
+
+/* <Field> Filter.location = 0, location */
+/* <Field> Filter.parenthesised = 1, bool */
+/* <Field> Filter.value = 2, expr */
+/* <Field> Filter.filter = 3, expr */
+
+/* <Field> For.location = 0, location */
+/* <Field> For.target = 1, expr */
+/* <Field> For.iter = 2, expr */
+/* <Field> For.body = 3, stmt_list */
+/* <Field> For.orelse = 4, stmt_list */
+/* <Field> For.is_async = 5, bool */
+
+/* <Field> FormattedValue.location = 0, location */
+/* <Field> FormattedValue.parenthesised = 1, bool */
+/* <Field> FormattedValue.value = 2, expr */
+/* <Field> FormattedValue.conversion = 3, str */
+/* <Field> FormattedValue.format_spec = 4, JoinedStr */
+
+/* <Field> Function.name = 0, str */
+/* <Field> Function.args = 1, parameter_list */
+/* <Field> Function.vararg = 2, expr */
+/* <Field> Function.kwonlyargs = 3, expr_list */
+/* <Field> Function.kwarg = 4, expr */
+/* <Field> Function.body = 5, stmt_list */
+/* <Field> Function.is_async = 6, bool */
+/* <Field> Function.type_parameters = 7, type_parameter_list */
+/* <Parent> Function = FunctionParent  */
+
+/* <Field> FunctionExpr.location = 0, location */
+/* <Field> FunctionExpr.parenthesised = 1, bool */
+/* <Field> FunctionExpr.name = 2, str */
+/* <Field> FunctionExpr.args = 3, arguments */
+/* <Field> FunctionExpr.returns = 4, expr */
+/* <Field> FunctionExpr.inner_scope = 5, Function */
+
+/* <Field> GeneratorExp.location = 0, location */
+/* <Field> GeneratorExp.parenthesised = 1, bool */
+/* <Field> GeneratorExp.function = 2, Function */
+/* <Field> GeneratorExp.iterable = 3, expr */
+
+/* <Field> Global.location = 0, location */
+/* <Field> Global.names = 1, str_list */
+
+/* <Field> Guard.location = 0, location */
+/* <Field> Guard.parenthesised = 1, bool */
+/* <Field> Guard.test = 2, expr */
+
+/* <Field> If.location = 0, location */
+/* <Field> If.test = 1, expr */
+/* <Field> If.body = 2, stmt_list */
+/* <Field> If.orelse = 3, stmt_list */
+
+/* <Field> IfExp.location = 0, location */
+/* <Field> IfExp.parenthesised = 1, bool */
+/* <Field> IfExp.test = 2, expr */
+/* <Field> IfExp.body = 3, expr */
+/* <Field> IfExp.orelse = 4, expr */
+
+/* <Field> Import.location = 0, location */
+/* <Field> Import.names = 1, alias_list */
+
+/* <Field> ImportExpr.location = 0, location */
+/* <Field> ImportExpr.parenthesised = 1, bool */
+/* <Field> ImportExpr.level = 2, int */
+/* <Field> ImportExpr.name = 3, str */
+/* <Field> ImportExpr.top = 4, bool */
+
+/* <Field> ImportStar.location = 0, location */
+/* <Field> ImportStar.module = 1, expr */
+
+/* <Field> ImportMember.location = 0, location */
+/* <Field> ImportMember.parenthesised = 1, bool */
+/* <Field> ImportMember.module = 2, expr */
+/* <Field> ImportMember.name = 3, str */
+
+/* <Field> Fstring.location = 0, location */
+/* <Field> Fstring.parenthesised = 1, bool */
+/* <Field> Fstring.values = 2, expr_list */
+/* <Parent> Fstring = FormattedValue  */
+
+/* <Field> KeyValuePair.location = 0, location */
+/* <Field> KeyValuePair.value = 1, expr */
+/* <Field> KeyValuePair.key = 2, expr */
+
+/* <Field> Lambda.location = 0, location */
+/* <Field> Lambda.parenthesised = 1, bool */
+/* <Field> Lambda.args = 2, arguments */
+/* <Field> Lambda.inner_scope = 3, Function */
+
+/* <Field> List.location = 0, location */
+/* <Field> List.parenthesised = 1, bool */
+/* <Field> List.elts = 2, expr_list */
+/* <Field> List.ctx = 3, expr_context */
+
+/* <Field> ListComp.location = 0, location */
+/* <Field> ListComp.parenthesised = 1, bool */
+/* <Field> ListComp.function = 2, Function */
+/* <Field> ListComp.iterable = 3, expr */
+/* <Field> ListComp.generators = 4, comprehension_list */
+/* <Field> ListComp.elt = 5, expr */
+
+/* <Field> MatchStmt.location = 0, location */
+/* <Field> MatchStmt.subject = 1, expr */
+/* <Field> MatchStmt.cases = 2, stmt_list */
+
+/* <Field> MatchAsPattern.location = 0, location */
+/* <Field> MatchAsPattern.parenthesised = 1, bool */
+/* <Field> MatchAsPattern.pattern = 2, pattern */
+/* <Field> MatchAsPattern.alias = 3, expr */
+
+/* <Field> MatchCapturePattern.location = 0, location */
+/* <Field> MatchCapturePattern.parenthesised = 1, bool */
+/* <Field> MatchCapturePattern.variable = 2, expr */
+
+/* <Field> MatchClassPattern.location = 0, location */
+/* <Field> MatchClassPattern.parenthesised = 1, bool */
+/* <Field> MatchClassPattern.class = 2, expr */
+/* <Field> MatchClassPattern.class_name = 3, expr */
+/* <Field> MatchClassPattern.positional = 4, pattern_list */
+/* <Field> MatchClassPattern.keyword = 5, pattern_list */
+
+/* <Field> MatchDoubleStarPattern.location = 0, location */
+/* <Field> MatchDoubleStarPattern.parenthesised = 1, bool */
+/* <Field> MatchDoubleStarPattern.target = 2, pattern */
+
+/* <Field> MatchKeyValuePattern.location = 0, location */
+/* <Field> MatchKeyValuePattern.parenthesised = 1, bool */
+/* <Field> MatchKeyValuePattern.key = 2, pattern */
+/* <Field> MatchKeyValuePattern.value = 3, pattern */
+
+/* <Field> MatchKeywordPattern.location = 0, location */
+/* <Field> MatchKeywordPattern.parenthesised = 1, bool */
+/* <Field> MatchKeywordPattern.attribute = 2, expr */
+/* <Field> MatchKeywordPattern.value = 3, pattern */
+
+/* <Field> MatchLiteralPattern.location = 0, location */
+/* <Field> MatchLiteralPattern.parenthesised = 1, bool */
+/* <Field> MatchLiteralPattern.literal = 2, expr */
+
+/* <Field> MatchMappingPattern.location = 0, location */
+/* <Field> MatchMappingPattern.parenthesised = 1, bool */
+/* <Field> MatchMappingPattern.mappings = 2, pattern_list */
+
+/* <Field> MatchOrPattern.location = 0, location */
+/* <Field> MatchOrPattern.parenthesised = 1, bool */
+/* <Field> MatchOrPattern.patterns = 2, pattern_list */
+
+/* <Field> MatchSequencePattern.location = 0, location */
+/* <Field> MatchSequencePattern.parenthesised = 1, bool */
+/* <Field> MatchSequencePattern.patterns = 2, pattern_list */
+
+/* <Field> MatchStarPattern.location = 0, location */
+/* <Field> MatchStarPattern.parenthesised = 1, bool */
+/* <Field> MatchStarPattern.target = 2, pattern */
+
+/* <Field> MatchValuePattern.location = 0, location */
+/* <Field> MatchValuePattern.parenthesised = 1, bool */
+/* <Field> MatchValuePattern.value = 2, expr */
+
+/* <Field> MatchWildcardPattern.location = 0, location */
+/* <Field> MatchWildcardPattern.parenthesised = 1, bool */
+
+/* <Field> Module.name = 0, str */
+/* <Field> Module.hash = 1, str */
+/* <Field> Module.body = 2, stmt_list */
+/* <Field> Module.kind = 3, str */
+
+/* <Field> Name.location = 0, location */
+/* <Field> Name.parenthesised = 1, bool */
+/* <Field> Name.variable = 2, variable */
+/* <Field> Name.ctx = 3, expr_context */
+/* <Parent> Name = ParameterList  */
+
+/* <Field> Nonlocal.location = 0, location */
+/* <Field> Nonlocal.names = 1, str_list */
+
+/* <Field> Num.location = 0, location */
+/* <Field> Num.parenthesised = 1, bool */
+/* <Field> Num.n = 2, number */
+/* <Field> Num.text = 3, number */
+
+/* <Field> ParamSpec.location = 0, location */
+/* <Field> ParamSpec.name = 1, expr */
+
+/* <Field> Pass.location = 0, location */
+
+/* <Field> PlaceHolder.location = 0, location */
+/* <Field> PlaceHolder.parenthesised = 1, bool */
+/* <Field> PlaceHolder.variable = 2, variable */
+/* <Field> PlaceHolder.ctx = 3, expr_context */
+
+/* <Field> Print.location = 0, location */
+/* <Field> Print.dest = 1, expr */
+/* <Field> Print.values = 2, expr_list */
+/* <Field> Print.nl = 3, bool */
+
+/* <Field> Raise.location = 0, location */
+/* <Field> Raise.exc = 1, expr */
+/* <Field> Raise.cause = 2, expr */
+/* <Field> Raise.type = 3, expr */
+/* <Field> Raise.inst = 4, expr */
+/* <Field> Raise.tback = 5, expr */
+
+/* <Field> Repr.location = 0, location */
+/* <Field> Repr.parenthesised = 1, bool */
+/* <Field> Repr.value = 2, expr */
+
+/* <Field> Return.location = 0, location */
+/* <Field> Return.value = 1, expr */
+
+/* <Field> Set.location = 0, location */
+/* <Field> Set.parenthesised = 1, bool */
+/* <Field> Set.elts = 2, expr_list */
+
+/* <Field> SetComp.location = 0, location */
+/* <Field> SetComp.parenthesised = 1, bool */
+/* <Field> SetComp.function = 2, Function */
+/* <Field> SetComp.iterable = 3, expr */
+
+/* <Field> Slice.location = 0, location */
+/* <Field> Slice.parenthesised = 1, bool */
+/* <Field> Slice.start = 2, expr */
+/* <Field> Slice.stop = 3, expr */
+/* <Field> Slice.step = 4, expr */
+
+/* <Field> SpecialOperation.location = 0, location */
+/* <Field> SpecialOperation.parenthesised = 1, bool */
+/* <Field> SpecialOperation.name = 2, str */
+/* <Field> SpecialOperation.arguments = 3, expr_list */
+
+/* <Field> Starred.location = 0, location */
+/* <Field> Starred.parenthesised = 1, bool */
+/* <Field> Starred.value = 2, expr */
+/* <Field> Starred.ctx = 3, expr_context */
+
+/* <Field> Str.location = 0, location */
+/* <Field> Str.parenthesised = 1, bool */
+/* <Field> Str.s = 2, str */
+/* <Field> Str.prefix = 3, str */
+/* <Field> Str.implicitly_concatenated_parts = 4, StringPart_list */
+
+/* <Field> StringPart.text = 0, str */
+/* <Field> StringPart.location = 1, location */
+/* <Parent> StringPart = StringPartList  */
+/* <Parent> StringPartList = BytesOrStr  */
+
+/* <Field> Subscript.location = 0, location */
+/* <Field> Subscript.parenthesised = 1, bool */
+/* <Field> Subscript.value = 2, expr */
+/* <Field> Subscript.index = 3, expr */
+/* <Field> Subscript.ctx = 4, expr_context */
+
+/* <Field> TemplateDottedNotation.location = 0, location */
+/* <Field> TemplateDottedNotation.parenthesised = 1, bool */
+/* <Field> TemplateDottedNotation.value = 2, expr */
+/* <Field> TemplateDottedNotation.attr = 3, str */
+/* <Field> TemplateDottedNotation.ctx = 4, expr_context */
+
+/* <Field> TemplateWrite.location = 0, location */
+/* <Field> TemplateWrite.value = 1, expr */
+
+/* <Field> Try.location = 0, location */
+/* <Field> Try.body = 1, stmt_list */
+/* <Field> Try.orelse = 2, stmt_list */
+/* <Field> Try.handlers = 3, stmt_list */
+/* <Field> Try.finalbody = 4, stmt_list */
+
+/* <Field> Tuple.location = 0, location */
+/* <Field> Tuple.parenthesised = 1, bool */
+/* <Field> Tuple.elts = 2, expr_list */
+/* <Field> Tuple.ctx = 3, expr_context */
+/* <Parent> Tuple = ParameterList  */
+
+/* <Field> TypeAlias.location = 0, location */
+/* <Field> TypeAlias.name = 1, expr */
+/* <Field> TypeAlias.type_parameters = 2, type_parameter_list */
+/* <Field> TypeAlias.value = 3, expr */
+
+/* <Field> TypeVar.location = 0, location */
+/* <Field> TypeVar.name = 1, expr */
+/* <Field> TypeVar.bound = 2, expr */
+
+/* <Field> TypeVarTuple.location = 0, location */
+/* <Field> TypeVarTuple.name = 1, expr */
+
+/* <Field> UnaryExpr.location = 0, location */
+/* <Field> UnaryExpr.parenthesised = 1, bool */
+/* <Field> UnaryExpr.op = 2, unaryop */
+/* <Field> UnaryExpr.operand = 3, expr */
+
+/* <Field> While.location = 0, location */
+/* <Field> While.test = 1, expr */
+/* <Field> While.body = 2, stmt_list */
+/* <Field> While.orelse = 3, stmt_list */
+
+/* <Field> With.location = 0, location */
+/* <Field> With.context_expr = 1, expr */
+/* <Field> With.optional_vars = 2, expr */
+/* <Field> With.body = 3, stmt_list */
+/* <Field> With.is_async = 4, bool */
+
+/* <Field> Yield.location = 0, location */
+/* <Field> Yield.parenthesised = 1, bool */
+/* <Field> Yield.value = 2, expr */
+
+/* <Field> YieldFrom.location = 0, location */
+/* <Field> YieldFrom.parenthesised = 1, bool */
+/* <Field> YieldFrom.value = 2, expr */
+
+/* <Field> Alias.value = 0, expr */
+/* <Field> Alias.asname = 1, expr */
+/* <Parent> Alias = AliasList  */
+/* <Parent> AliasList = Import  */
+
+/* <Field> Arguments.kw_defaults = 0, expr_list */
+/* <Field> Arguments.defaults = 1, expr_list */
+/* <Field> Arguments.annotations = 2, expr_list */
+/* <Field> Arguments.varargannotation = 3, expr */
+/* <Field> Arguments.kwargannotation = 4, expr */
+/* <Field> Arguments.kw_annotations = 5, expr_list */
+/* <Parent> Arguments = ArgumentsParent  */
+/* <Parent> boolean = BoolParent  */
+/* <Parent> Boolop = BoolExpr  */
+/* <Parent> string = Bytes  */
+/* <Parent> Cmpop = CmpopList  */
+/* <Parent> CmpopList = Compare  */
+
+/* <Field> Comprehension.location = 0, location */
+/* <Field> Comprehension.iter = 1, expr */
+/* <Field> Comprehension.target = 2, expr */
+/* <Field> Comprehension.ifs = 3, expr_list */
+/* <Parent> Comprehension = ComprehensionList  */
+/* <Parent> ComprehensionList = ListComp  */
+/* <Parent> DictItem = DictItemList  */
+/* <Parent> DictItemList = DictItemListParent  */
+
+/* <Field> Expr.location = 0, location */
+/* <Field> Expr.parenthesised = 1, bool */
+/* <Parent> Expr = ExprParent  */
+/* <Parent> ExprContext = ExprContextParent  */
+/* <Parent> ExprList = ExprListParent  */
+/* <Parent> int = ImportExpr  */
+
+/* <Field> Keyword.location = 0, location */
+/* <Field> Keyword.value = 1, expr */
+/* <Field> Keyword.arg = 2, str */
+/* <Parent> Location = LocationParent  */
+/* <Parent> string = Num  */
+/* <Parent> Operator = BinaryExpr  */
+/* <Parent> ParameterList = Function  */
+
+/* <Field> Pattern.location = 0, location */
+/* <Field> Pattern.parenthesised = 1, bool */
+/* <Parent> Pattern = PatternParent  */
+/* <Parent> PatternList = PatternListParent  */
+
+/* <Field> Stmt.location = 0, location */
+/* <Parent> Stmt = StmtList  */
+/* <Parent> StmtList = StmtListParent  */
+/* <Parent> string = StrParent  */
+/* <Parent> StringList = StrListParent  */
+
+/* <Field> TypeParameter.location = 0, location */
+/* <Parent> TypeParameter = TypeParameterList  */
+/* <Parent> TypeParameterList = TypeParameterListParent  */
+/* <Parent> Unaryop = UnaryExpr  */
+/* <Parent> Variable = VariableParent  */
+py_Classes(unique int id : @py_Class,
+    unique int parent : @py_ClassExpr ref);
+
+py_Functions(unique int id : @py_Function,
+    unique int parent : @py_Function_parent ref);
+
+py_Modules(unique int id : @py_Module);
+
+py_StringParts(unique int id : @py_StringPart,
+    int parent : @py_StringPart_list ref,
+    int idx : int ref);
+
+py_StringPart_lists(unique int id : @py_StringPart_list,
+    unique int parent : @py_Bytes_or_Str ref);
+
+py_aliases(unique int id : @py_alias,
+    int parent : @py_alias_list ref,
+    int idx : int ref);
+
+py_alias_lists(unique int id : @py_alias_list,
+    unique int parent : @py_Import ref);
+
+py_arguments(unique int id : @py_arguments,
+    unique int parent : @py_arguments_parent ref);
+
+py_bools(int parent : @py_bool_parent ref,
+    int idx : int ref);
+
+py_boolops(unique int id : @py_boolop,
+    int kind: int ref,
+    unique int parent : @py_BoolExpr ref);
+
+py_bytes(varchar(1) id : string ref,
+    int parent : @py_Bytes ref,
+    int idx : int ref);
+
+py_cmpops(unique int id : @py_cmpop,
+    int kind: int ref,
+    int parent : @py_cmpop_list ref,
+    int idx : int ref);
+
+py_cmpop_lists(unique int id : @py_cmpop_list,
+    unique int parent : @py_Compare ref);
+
+py_comprehensions(unique int id : @py_comprehension,
+    int parent : @py_comprehension_list ref,
+    int idx : int ref);
+
+py_comprehension_lists(unique int id : @py_comprehension_list,
+    unique int parent : @py_ListComp ref);
+
+py_dict_items(unique int id : @py_dict_item,
+    int kind: int ref,
+    int parent : @py_dict_item_list ref,
+    int idx : int ref);
+
+py_dict_item_lists(unique int id : @py_dict_item_list,
+    unique int parent : @py_dict_item_list_parent ref);
+
+py_exprs(unique int id : @py_expr,
+    int kind: int ref,
+    int parent : @py_expr_parent ref,
+    int idx : int ref);
+
+py_expr_contexts(unique int id : @py_expr_context,
+    int kind: int ref,
+    unique int parent : @py_expr_context_parent ref);
+
+py_expr_lists(unique int id : @py_expr_list,
+    int parent : @py_expr_list_parent ref,
+    int idx : int ref);
+
+py_ints(int id : int ref,
+    unique int parent : @py_ImportExpr ref);
+
+py_locations(unique int id : @location ref,
+    unique int parent : @py_location_parent ref);
+
+py_numbers(varchar(1) id : string ref,
+    int parent : @py_Num ref,
+    int idx : int ref);
+
+py_operators(unique int id : @py_operator,
+    int kind: int ref,
+    unique int parent : @py_BinaryExpr ref);
+
+py_parameter_lists(unique int id : @py_parameter_list,
+    unique int parent : @py_Function ref);
+
+py_patterns(unique int id : @py_pattern,
+    int kind: int ref,
+    int parent : @py_pattern_parent ref,
+    int idx : int ref);
+
+py_pattern_lists(unique int id : @py_pattern_list,
+    int parent : @py_pattern_list_parent ref,
+    int idx : int ref);
+
+py_stmts(unique int id : @py_stmt,
+    int kind: int ref,
+    int parent : @py_stmt_list ref,
+    int idx : int ref);
+
+py_stmt_lists(unique int id : @py_stmt_list,
+    int parent : @py_stmt_list_parent ref,
+    int idx : int ref);
+
+py_strs(varchar(1) id : string ref,
+    int parent : @py_str_parent ref,
+    int idx : int ref);
+
+py_str_lists(unique int id : @py_str_list,
+    unique int parent : @py_str_list_parent ref);
+
+py_type_parameters(unique int id : @py_type_parameter,
+    int kind: int ref,
+    int parent : @py_type_parameter_list ref,
+    int idx : int ref);
+
+py_type_parameter_lists(unique int id : @py_type_parameter_list,
+    unique int parent : @py_type_parameter_list_parent ref);
+
+py_unaryops(unique int id : @py_unaryop,
+    int kind: int ref,
+    unique int parent : @py_UnaryExpr ref);
+
+py_variables(int id : @py_variable ref,
+    unique int parent : @py_variable_parent ref);
+
+case @py_boolop.kind of
+    0 = @py_And
+|   1 = @py_Or;
+
+case @py_cmpop.kind of
+    0 = @py_Eq
+|   1 = @py_Gt
+|   2 = @py_GtE
+|   3 = @py_In
+|   4 = @py_Is
+|   5 = @py_IsNot
+|   6 = @py_Lt
+|   7 = @py_LtE
+|   8 = @py_NotEq
+|   9 = @py_NotIn;
+
+case @py_dict_item.kind of
+    0 = @py_DictUnpacking
+|   1 = @py_KeyValuePair
+|   2 = @py_keyword;
+
+case @py_expr.kind of
+    0 = @py_Attribute
+|   1 = @py_BinaryExpr
+|   2 = @py_BoolExpr
+|   3 = @py_Bytes
+|   4 = @py_Call
+|   5 = @py_ClassExpr
+|   6 = @py_Compare
+|   7 = @py_Dict
+|   8 = @py_DictComp
+|   9 = @py_Ellipsis
+|   10 = @py_FunctionExpr
+|   11 = @py_GeneratorExp
+|   12 = @py_IfExp
+|   13 = @py_ImportExpr
+|   14 = @py_ImportMember
+|   15 = @py_Lambda
+|   16 = @py_List
+|   17 = @py_ListComp
+|   18 = @py_Guard
+|   19 = @py_Name
+|   20 = @py_Num
+|   21 = @py_Repr
+|   22 = @py_Set
+|   23 = @py_SetComp
+|   24 = @py_Slice
+|   25 = @py_Starred
+|   26 = @py_Str
+|   27 = @py_Subscript
+|   28 = @py_Tuple
+|   29 = @py_UnaryExpr
+|   30 = @py_Yield
+|   31 = @py_YieldFrom
+|   32 = @py_TemplateDottedNotation
+|   33 = @py_Filter
+|   34 = @py_PlaceHolder
+|   35 = @py_Await
+|   36 = @py_Fstring
+|   37 = @py_FormattedValue
+|   38 = @py_AssignExpr
+|   39 = @py_SpecialOperation;
+
+case @py_expr_context.kind of
+    0 = @py_AugLoad
+|   1 = @py_AugStore
+|   2 = @py_Del
+|   3 = @py_Load
+|   4 = @py_Param
+|   5 = @py_Store;
+
+case @py_operator.kind of
+    0 = @py_Add
+|   1 = @py_BitAnd
+|   2 = @py_BitOr
+|   3 = @py_BitXor
+|   4 = @py_Div
+|   5 = @py_FloorDiv
+|   6 = @py_LShift
+|   7 = @py_Mod
+|   8 = @py_Mult
+|   9 = @py_Pow
+|   10 = @py_RShift
+|   11 = @py_Sub
+|   12 = @py_MatMult;
+
+case @py_pattern.kind of
+    0 = @py_MatchAsPattern
+|   1 = @py_MatchOrPattern
+|   2 = @py_MatchLiteralPattern
+|   3 = @py_MatchCapturePattern
+|   4 = @py_MatchWildcardPattern
+|   5 = @py_MatchValuePattern
+|   6 = @py_MatchSequencePattern
+|   7 = @py_MatchStarPattern
+|   8 = @py_MatchMappingPattern
+|   9 = @py_MatchDoubleStarPattern
+|   10 = @py_MatchKeyValuePattern
+|   11 = @py_MatchClassPattern
+|   12 = @py_MatchKeywordPattern;
+
+case @py_stmt.kind of
+    0 = @py_Assert
+|   1 = @py_Assign
+|   2 = @py_AugAssign
+|   3 = @py_Break
+|   4 = @py_Continue
+|   5 = @py_Delete
+|   6 = @py_ExceptStmt
+|   7 = @py_ExceptGroupStmt
+|   8 = @py_Exec
+|   9 = @py_Expr_stmt
+|   10 = @py_For
+|   11 = @py_Global
+|   12 = @py_If
+|   13 = @py_Import
+|   14 = @py_ImportStar
+|   15 = @py_MatchStmt
+|   16 = @py_Case
+|   17 = @py_Nonlocal
+|   18 = @py_Pass
+|   19 = @py_Print
+|   20 = @py_Raise
+|   21 = @py_Return
+|   22 = @py_Try
+|   23 = @py_While
+|   24 = @py_With
+|   25 = @py_TemplateWrite
+|   26 = @py_AnnAssign
+|   27 = @py_TypeAlias;
+
+case @py_type_parameter.kind of
+    0 = @py_ParamSpec
+|   1 = @py_TypeVar
+|   2 = @py_TypeVarTuple;
+
+case @py_unaryop.kind of
+    0 = @py_Invert
+|   1 = @py_Not
+|   2 = @py_UAdd
+|   3 = @py_USub;
+
+@py_Bytes_or_Str = @py_Bytes | @py_Str;
+
+@py_Function_parent = @py_DictComp | @py_FunctionExpr | @py_GeneratorExp | @py_Lambda | @py_ListComp | @py_SetComp;
+
+@py_arguments_parent = @py_FunctionExpr | @py_Lambda;
+
+@py_ast_node = @py_Class | @py_Function | @py_Module | @py_StringPart | @py_comprehension | @py_dict_item | @py_expr | @py_pattern | @py_stmt | @py_type_parameter;
+
+@py_bool_parent = @py_For | @py_Function | @py_Print | @py_With | @py_expr | @py_pattern;
+
+@py_dict_item_list_parent = @py_Call | @py_ClassExpr | @py_Dict;
+
+@py_expr_context_parent = @py_Attribute | @py_List | @py_Name | @py_PlaceHolder | @py_Starred | @py_Subscript | @py_TemplateDottedNotation | @py_Tuple;
+
+@py_expr_list_parent = @py_Assign | @py_BoolExpr | @py_Call | @py_ClassExpr | @py_Compare | @py_Delete | @py_Fstring | @py_Function | @py_List | @py_Print | @py_Set | @py_SpecialOperation | @py_Tuple | @py_arguments | @py_comprehension;
+
+@py_expr_or_stmt = @py_expr | @py_stmt;
+
+@py_expr_parent = @py_AnnAssign | @py_Assert | @py_Assign | @py_AssignExpr | @py_Attribute | @py_AugAssign | @py_Await | @py_BinaryExpr | @py_Call | @py_Case | @py_Compare | @py_DictComp | @py_DictUnpacking | @py_ExceptGroupStmt | @py_ExceptStmt | @py_Exec | @py_Expr_stmt | @py_Filter | @py_For | @py_FormattedValue | @py_Function | @py_FunctionExpr | @py_GeneratorExp | @py_Guard | @py_If | @py_IfExp | @py_ImportMember | @py_ImportStar | @py_KeyValuePair | @py_ListComp | @py_MatchAsPattern | @py_MatchCapturePattern | @py_MatchClassPattern | @py_MatchKeywordPattern | @py_MatchLiteralPattern | @py_MatchStmt | @py_MatchValuePattern | @py_ParamSpec | @py_Print | @py_Raise | @py_Repr | @py_Return | @py_SetComp | @py_Slice | @py_Starred | @py_Subscript | @py_TemplateDottedNotation | @py_TemplateWrite | @py_TypeAlias | @py_TypeVar | @py_TypeVarTuple | @py_UnaryExpr | @py_While | @py_With | @py_Yield | @py_YieldFrom | @py_alias | @py_arguments | @py_comprehension | @py_expr_list | @py_keyword | @py_parameter_list;
+
+@py_location_parent = @py_DictUnpacking | @py_KeyValuePair | @py_StringPart | @py_comprehension | @py_expr | @py_keyword | @py_pattern | @py_stmt | @py_type_parameter;
+
+@py_parameter = @py_Name | @py_Tuple;
+
+@py_pattern_list_parent = @py_MatchClassPattern | @py_MatchMappingPattern | @py_MatchOrPattern | @py_MatchSequencePattern;
+
+@py_pattern_parent = @py_Case | @py_MatchAsPattern | @py_MatchDoubleStarPattern | @py_MatchKeyValuePattern | @py_MatchKeywordPattern | @py_MatchStarPattern | @py_pattern_list;
+
+@py_scope = @py_Class | @py_Function | @py_Module;
+
+@py_stmt_list_parent = @py_Case | @py_Class | @py_ExceptGroupStmt | @py_ExceptStmt | @py_For | @py_Function | @py_If | @py_MatchStmt | @py_Module | @py_Try | @py_While | @py_With;
+
+@py_str_list_parent = @py_Global | @py_Nonlocal;
+
+@py_str_parent = @py_Attribute | @py_Class | @py_ClassExpr | @py_FormattedValue | @py_Function | @py_FunctionExpr | @py_ImportExpr | @py_ImportMember | @py_Module | @py_SpecialOperation | @py_Str | @py_StringPart | @py_TemplateDottedNotation | @py_keyword | @py_str_list;
+
+@py_type_parameter_list_parent = @py_ClassExpr | @py_Function | @py_TypeAlias;
+
+@py_variable_parent = @py_Name | @py_PlaceHolder;
+
+
+/*
+ * End of auto-generated part
+ */
+
+
+
+/* Map relative names to absolute names for imports */
+py_absolute_names(int module : @py_Module ref,
+                  varchar(1) relname : string ref,
+                  varchar(1) absname : string ref);
+
+py_exports(int id : @py_Module ref,
+           varchar(1) name : string ref);
+
+/* Successor information */
+py_successors(int predecessor : @py_flow_node ref,
+              int successor : @py_flow_node ref);
+
+py_true_successors(int predecessor : @py_flow_node ref,
+              int successor : @py_flow_node ref);
+
+py_exception_successors(int predecessor : @py_flow_node ref,
+              int successor : @py_flow_node ref);
+
+py_false_successors(int predecessor : @py_flow_node ref,
+              int successor : @py_flow_node ref);
+
+py_flow_bb_node(unique int flownode : @py_flow_node,
+             int realnode : @py_ast_node ref,
+             int basicblock : @py_flow_node ref,
+             int index : int ref);
+
+py_scope_flow(int flow : @py_flow_node ref,
+              int scope : @py_scope ref,
+              int kind : int ref);
+
+py_idoms(unique int node : @py_flow_node ref,
+         int immediate_dominator : @py_flow_node ref);
+
+py_ssa_phi(int phi : @py_ssa_var ref,
+           int arg: @py_ssa_var ref);
+
+py_ssa_var(unique int id : @py_ssa_var,
+            int var : @py_variable ref);
+
+py_ssa_use(int node: @py_flow_node ref,
+           int var : @py_ssa_var ref);
+
+py_ssa_defn(unique int id : @py_ssa_var ref,
+                  int node: @py_flow_node ref);
+
+@py_base_var = @py_variable | @py_ssa_var;
+
+py_scopes(unique int node : @py_expr_or_stmt ref,
+         int scope : @py_scope ref);
+
+py_scope_location(unique int id : @location ref,
+                   unique int scope : @py_scope ref);
+
+py_flags_versioned(varchar(1) name : string ref,
+                   varchar(1) value : string ref,
+                   varchar(1) version : string ref);
+
+py_syntax_error_versioned(unique int id : @location ref,
+                varchar(1) message : string ref,
+                varchar(1) version : string ref);
+
+py_comments(unique int id : @py_comment,
+           varchar(1) text : string ref,
+           unique int location : @location ref);
+
+/* Type information support */
+
+py_cobjects(unique int obj : @py_cobject);
+
+py_cobjecttypes(unique int obj : @py_cobject ref,
+                int typeof : @py_cobject ref);
+
+py_cobjectnames(unique int obj : @py_cobject ref,
+                varchar(1) name : string ref);
+
+/* Kind should be 0 for introspection, > 0 from source, as follows:
+   1 from C extension source
+ */
+py_cobject_sources(int obj : @py_cobject ref,
+                  int kind : int ref);
+
+py_cmembers_versioned(int object : @py_cobject ref,
+                      varchar(1) name : string ref,
+                      int member : @py_cobject ref,
+                      varchar(1) version : string ref);
+
+py_citems(int object : @py_cobject ref,
+            int index : int ref,
+            int member : @py_cobject ref);
+
+ext_argtype(int funcid : @py_object ref,
+            int arg : int ref,
+            int typeid : @py_object ref);
+
+ext_rettype(int funcid : @py_object ref,
+            int typeid : @py_object ref);
+
+ext_proptype(int propid : @py_object ref,
+             int typeid : @py_object ref);
+
+ext_argreturn(int funcid : @py_object ref,
+              int arg : int ref);
+
+py_special_objects(unique int obj : @py_cobject ref,
+                   unique varchar(1) name : string ref);
+
+py_decorated_object(int object : @py_object ref,
+                    int level: int ref);
+
+@py_object = @py_cobject | @py_flow_node;
+
+@py_source_element = @py_ast_node | @container;
diff --git a/python/ql/lib/upgrades/728c6d65e61d808ae276013ebc15abc3a97aaef1/semmlecode.python.dbscheme b/python/ql/lib/upgrades/728c6d65e61d808ae276013ebc15abc3a97aaef1/semmlecode.python.dbscheme
new file mode 100644
index 00000000000..5af903da088
--- /dev/null
+++ b/python/ql/lib/upgrades/728c6d65e61d808ae276013ebc15abc3a97aaef1/semmlecode.python.dbscheme
@@ -0,0 +1,1236 @@
+/*
+ *      This dbscheme is auto-generated by 'semmle/dbscheme_gen.py'.
+ *      WARNING: Any modifications to this file will be lost.
+ *      Relations can be changed by modifying master.py or
+ *      by adding rules to dbscheme.template
+ */
+
+/* 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.
+ *
+ * 2020-07-02
+ *
+ * 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.
+ */
+
+/*- DEPRECATED: External defects and metrics -*/
+
+externalDefects(
+  unique int id : @externalDefect,
+  varchar(900) queryPath : string ref,
+  int location : @location ref,
+  varchar(900) message : string ref,
+  float severity : float ref
+);
+
+externalMetrics(
+  unique int id : @externalMetric,
+  varchar(900) queryPath : string ref,
+  int location : @location ref,
+  float value : 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
+);
+
+/*- DEPRECATED: Snapshot date -*/
+
+snapshotDate(unique date snapshotDate : date ref);
+
+/*- Source location prefix -*/
+
+/**
+ * The source location of the snapshot.
+ */
+sourceLocationPrefix(string prefix : string ref);
+
+/*- DEPRECATED: Duplicate code -*/
+
+duplicateCode(
+  unique int id : @duplication,
+  string relativePath : string ref,
+  int equivClass : int ref
+);
+
+similarCode(
+  unique int id : @similarity,
+  string relativePath : string ref,
+  int equivClass : int ref
+);
+
+@duplication_or_similarity = @duplication | @similarity
+
+tokens(
+  int id : @duplication_or_similarity ref,
+  int offset : int ref,
+  int beginLine : int ref,
+  int beginColumn : int ref,
+  int endLine : int ref,
+  int endColumn : int ref
+);
+
+/*- DEPRECATED: Version control data -*/
+
+svnentries(
+  unique int id : @svnentry,
+  string revision : string ref,
+  string author : string ref,
+  date revisionDate : date ref,
+  int changeSize : int ref
+)
+
+svnaffectedfiles(
+  int id : @svnentry ref,
+  int file : @file ref,
+  string action : string ref
+)
+
+svnentrymsg(
+  unique int id : @svnentry ref,
+  string message : string ref
+)
+
+svnchurn(
+  int commit : @svnentry ref,
+  int file : @file ref,
+  int addedLines : int ref,
+  int deletedLines : int ref
+)
+
+/*- Lines of code -*/
+
+numlines(
+  int element_id: @sourceline ref,
+  int num_lines: int ref,
+  int num_code: int ref,
+  int num_comment: int 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
+);
+
+/*- 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;
+
+/*- 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;
+
+/*- Python dbscheme -*/
+
+/*
+ * Line metrics
+ */
+py_codelines(int id : @py_scope ref,
+             int count : int ref);
+
+py_commentlines(int id : @py_scope ref,
+                int count : int ref);
+
+py_docstringlines(int id : @py_scope ref,
+                int count : int ref);
+
+py_alllines(int id : @py_scope ref,
+                int count : int ref);
+
+/****************************
+        Python dbscheme
+****************************/
+
+@sourceline = @file | @py_Module | @xmllocatable;
+
+@location = @location_ast | @location_default ;
+
+locations_ast(unique int id: @location_ast,
+          int module: @py_Module ref,
+          int beginLine: int ref,
+          int beginColumn: int ref,
+          int endLine: int ref,
+          int endColumn: int ref);
+
+file_contents(unique int file: @file ref, string contents: string ref);
+
+py_module_path(int module: @py_Module ref, int file: @container ref);
+
+variable(unique int id : @py_variable,
+         int scope : @py_scope ref,
+         varchar(1) name : string ref);
+
+py_line_lengths(unique int id : @py_line,
+                int file: @py_Module ref,
+                int line : int ref,
+                int length : int ref);
+
+py_extracted_version(int module : @py_Module ref,
+                     varchar(1) version : string ref);
+
+/* AUTO GENERATED PART STARTS HERE */
+
+
+/* <Field> AnnAssign.location = 0, location */
+/* <Field> AnnAssign.value = 1, expr */
+/* <Field> AnnAssign.annotation = 2, expr */
+/* <Field> AnnAssign.target = 3, expr */
+
+/* <Field> Assert.location = 0, location */
+/* <Field> Assert.test = 1, expr */
+/* <Field> Assert.msg = 2, expr */
+
+/* <Field> Assign.location = 0, location */
+/* <Field> Assign.value = 1, expr */
+/* <Field> Assign.targets = 2, expr_list */
+
+/* <Field> AssignExpr.location = 0, location */
+/* <Field> AssignExpr.parenthesised = 1, bool */
+/* <Field> AssignExpr.value = 2, expr */
+/* <Field> AssignExpr.target = 3, expr */
+
+/* <Field> Attribute.location = 0, location */
+/* <Field> Attribute.parenthesised = 1, bool */
+/* <Field> Attribute.value = 2, expr */
+/* <Field> Attribute.attr = 3, str */
+/* <Field> Attribute.ctx = 4, expr_context */
+
+/* <Field> AugAssign.location = 0, location */
+/* <Field> AugAssign.operation = 1, BinOp */
+
+/* <Field> Await.location = 0, location */
+/* <Field> Await.parenthesised = 1, bool */
+/* <Field> Await.value = 2, expr */
+
+/* <Field> BinaryExpr.location = 0, location */
+/* <Field> BinaryExpr.parenthesised = 1, bool */
+/* <Field> BinaryExpr.left = 2, expr */
+/* <Field> BinaryExpr.op = 3, operator */
+/* <Field> BinaryExpr.right = 4, expr */
+/* <Parent> BinaryExpr = AugAssign  */
+
+/* <Field> BoolExpr.location = 0, location */
+/* <Field> BoolExpr.parenthesised = 1, bool */
+/* <Field> BoolExpr.op = 2, boolop */
+/* <Field> BoolExpr.values = 3, expr_list */
+
+/* <Field> Break.location = 0, location */
+
+/* <Field> Bytes.location = 0, location */
+/* <Field> Bytes.parenthesised = 1, bool */
+/* <Field> Bytes.s = 2, bytes */
+/* <Field> Bytes.prefix = 3, bytes */
+/* <Field> Bytes.implicitly_concatenated_parts = 4, StringPart_list */
+
+/* <Field> Call.location = 0, location */
+/* <Field> Call.parenthesised = 1, bool */
+/* <Field> Call.func = 2, expr */
+/* <Field> Call.positional_args = 3, expr_list */
+/* <Field> Call.named_args = 4, dict_item_list */
+
+/* <Field> Case.location = 0, location */
+/* <Field> Case.pattern = 1, pattern */
+/* <Field> Case.guard = 2, expr */
+/* <Field> Case.body = 3, stmt_list */
+
+/* <Field> Class.name = 0, str */
+/* <Field> Class.body = 1, stmt_list */
+/* <Parent> Class = ClassExpr  */
+
+/* <Field> ClassExpr.location = 0, location */
+/* <Field> ClassExpr.parenthesised = 1, bool */
+/* <Field> ClassExpr.name = 2, str */
+/* <Field> ClassExpr.bases = 3, expr_list */
+/* <Field> ClassExpr.keywords = 4, dict_item_list */
+/* <Field> ClassExpr.inner_scope = 5, Class */
+/* <Field> ClassExpr.type_parameters = 6, type_parameter_list */
+
+/* <Field> Compare.location = 0, location */
+/* <Field> Compare.parenthesised = 1, bool */
+/* <Field> Compare.left = 2, expr */
+/* <Field> Compare.ops = 3, cmpop_list */
+/* <Field> Compare.comparators = 4, expr_list */
+
+/* <Field> Continue.location = 0, location */
+
+/* <Field> Delete.location = 0, location */
+/* <Field> Delete.targets = 1, expr_list */
+
+/* <Field> Dict.location = 0, location */
+/* <Field> Dict.parenthesised = 1, bool */
+/* <Field> Dict.items = 2, dict_item_list */
+
+/* <Field> DictComp.location = 0, location */
+/* <Field> DictComp.parenthesised = 1, bool */
+/* <Field> DictComp.function = 2, Function */
+/* <Field> DictComp.iterable = 3, expr */
+
+/* <Field> DictUnpacking.location = 0, location */
+/* <Field> DictUnpacking.value = 1, expr */
+
+/* <Field> Ellipsis.location = 0, location */
+/* <Field> Ellipsis.parenthesised = 1, bool */
+
+/* <Field> ExceptGroupStmt.location = 0, location */
+/* <Field> ExceptGroupStmt.type = 1, expr */
+/* <Field> ExceptGroupStmt.name = 2, expr */
+/* <Field> ExceptGroupStmt.body = 3, stmt_list */
+
+/* <Field> ExceptStmt.location = 0, location */
+/* <Field> ExceptStmt.type = 1, expr */
+/* <Field> ExceptStmt.name = 2, expr */
+/* <Field> ExceptStmt.body = 3, stmt_list */
+
+/* <Field> Exec.location = 0, location */
+/* <Field> Exec.body = 1, expr */
+/* <Field> Exec.globals = 2, expr */
+/* <Field> Exec.locals = 3, expr */
+
+/* <Field> ExprStmt.location = 0, location */
+/* <Field> ExprStmt.value = 1, expr */
+
+/* <Field> Filter.location = 0, location */
+/* <Field> Filter.parenthesised = 1, bool */
+/* <Field> Filter.value = 2, expr */
+/* <Field> Filter.filter = 3, expr */
+
+/* <Field> For.location = 0, location */
+/* <Field> For.target = 1, expr */
+/* <Field> For.iter = 2, expr */
+/* <Field> For.body = 3, stmt_list */
+/* <Field> For.orelse = 4, stmt_list */
+/* <Field> For.is_async = 5, bool */
+
+/* <Field> FormattedValue.location = 0, location */
+/* <Field> FormattedValue.parenthesised = 1, bool */
+/* <Field> FormattedValue.value = 2, expr */
+/* <Field> FormattedValue.conversion = 3, str */
+/* <Field> FormattedValue.format_spec = 4, JoinedStr */
+
+/* <Field> Function.name = 0, str */
+/* <Field> Function.args = 1, parameter_list */
+/* <Field> Function.vararg = 2, expr */
+/* <Field> Function.kwonlyargs = 3, expr_list */
+/* <Field> Function.kwarg = 4, expr */
+/* <Field> Function.body = 5, stmt_list */
+/* <Field> Function.is_async = 6, bool */
+/* <Field> Function.type_parameters = 7, type_parameter_list */
+/* <Parent> Function = FunctionParent  */
+
+/* <Field> FunctionExpr.location = 0, location */
+/* <Field> FunctionExpr.parenthesised = 1, bool */
+/* <Field> FunctionExpr.name = 2, str */
+/* <Field> FunctionExpr.args = 3, arguments */
+/* <Field> FunctionExpr.returns = 4, expr */
+/* <Field> FunctionExpr.inner_scope = 5, Function */
+
+/* <Field> GeneratorExp.location = 0, location */
+/* <Field> GeneratorExp.parenthesised = 1, bool */
+/* <Field> GeneratorExp.function = 2, Function */
+/* <Field> GeneratorExp.iterable = 3, expr */
+
+/* <Field> Global.location = 0, location */
+/* <Field> Global.names = 1, str_list */
+
+/* <Field> Guard.location = 0, location */
+/* <Field> Guard.parenthesised = 1, bool */
+/* <Field> Guard.test = 2, expr */
+
+/* <Field> If.location = 0, location */
+/* <Field> If.test = 1, expr */
+/* <Field> If.body = 2, stmt_list */
+/* <Field> If.orelse = 3, stmt_list */
+
+/* <Field> IfExp.location = 0, location */
+/* <Field> IfExp.parenthesised = 1, bool */
+/* <Field> IfExp.test = 2, expr */
+/* <Field> IfExp.body = 3, expr */
+/* <Field> IfExp.orelse = 4, expr */
+
+/* <Field> Import.location = 0, location */
+/* <Field> Import.names = 1, alias_list */
+
+/* <Field> ImportExpr.location = 0, location */
+/* <Field> ImportExpr.parenthesised = 1, bool */
+/* <Field> ImportExpr.level = 2, int */
+/* <Field> ImportExpr.name = 3, str */
+/* <Field> ImportExpr.top = 4, bool */
+
+/* <Field> ImportStar.location = 0, location */
+/* <Field> ImportStar.module = 1, expr */
+
+/* <Field> ImportMember.location = 0, location */
+/* <Field> ImportMember.parenthesised = 1, bool */
+/* <Field> ImportMember.module = 2, expr */
+/* <Field> ImportMember.name = 3, str */
+
+/* <Field> Fstring.location = 0, location */
+/* <Field> Fstring.parenthesised = 1, bool */
+/* <Field> Fstring.values = 2, expr_list */
+/* <Parent> Fstring = FormattedValue  */
+
+/* <Field> KeyValuePair.location = 0, location */
+/* <Field> KeyValuePair.value = 1, expr */
+/* <Field> KeyValuePair.key = 2, expr */
+
+/* <Field> Lambda.location = 0, location */
+/* <Field> Lambda.parenthesised = 1, bool */
+/* <Field> Lambda.args = 2, arguments */
+/* <Field> Lambda.inner_scope = 3, Function */
+
+/* <Field> List.location = 0, location */
+/* <Field> List.parenthesised = 1, bool */
+/* <Field> List.elts = 2, expr_list */
+/* <Field> List.ctx = 3, expr_context */
+
+/* <Field> ListComp.location = 0, location */
+/* <Field> ListComp.parenthesised = 1, bool */
+/* <Field> ListComp.function = 2, Function */
+/* <Field> ListComp.iterable = 3, expr */
+/* <Field> ListComp.generators = 4, comprehension_list */
+/* <Field> ListComp.elt = 5, expr */
+
+/* <Field> MatchStmt.location = 0, location */
+/* <Field> MatchStmt.subject = 1, expr */
+/* <Field> MatchStmt.cases = 2, stmt_list */
+
+/* <Field> MatchAsPattern.location = 0, location */
+/* <Field> MatchAsPattern.parenthesised = 1, bool */
+/* <Field> MatchAsPattern.pattern = 2, pattern */
+/* <Field> MatchAsPattern.alias = 3, expr */
+
+/* <Field> MatchCapturePattern.location = 0, location */
+/* <Field> MatchCapturePattern.parenthesised = 1, bool */
+/* <Field> MatchCapturePattern.variable = 2, expr */
+
+/* <Field> MatchClassPattern.location = 0, location */
+/* <Field> MatchClassPattern.parenthesised = 1, bool */
+/* <Field> MatchClassPattern.class = 2, expr */
+/* <Field> MatchClassPattern.class_name = 3, expr */
+/* <Field> MatchClassPattern.positional = 4, pattern_list */
+/* <Field> MatchClassPattern.keyword = 5, pattern_list */
+
+/* <Field> MatchDoubleStarPattern.location = 0, location */
+/* <Field> MatchDoubleStarPattern.parenthesised = 1, bool */
+/* <Field> MatchDoubleStarPattern.target = 2, pattern */
+
+/* <Field> MatchKeyValuePattern.location = 0, location */
+/* <Field> MatchKeyValuePattern.parenthesised = 1, bool */
+/* <Field> MatchKeyValuePattern.key = 2, pattern */
+/* <Field> MatchKeyValuePattern.value = 3, pattern */
+
+/* <Field> MatchKeywordPattern.location = 0, location */
+/* <Field> MatchKeywordPattern.parenthesised = 1, bool */
+/* <Field> MatchKeywordPattern.attribute = 2, expr */
+/* <Field> MatchKeywordPattern.value = 3, pattern */
+
+/* <Field> MatchLiteralPattern.location = 0, location */
+/* <Field> MatchLiteralPattern.parenthesised = 1, bool */
+/* <Field> MatchLiteralPattern.literal = 2, expr */
+
+/* <Field> MatchMappingPattern.location = 0, location */
+/* <Field> MatchMappingPattern.parenthesised = 1, bool */
+/* <Field> MatchMappingPattern.mappings = 2, pattern_list */
+
+/* <Field> MatchOrPattern.location = 0, location */
+/* <Field> MatchOrPattern.parenthesised = 1, bool */
+/* <Field> MatchOrPattern.patterns = 2, pattern_list */
+
+/* <Field> MatchSequencePattern.location = 0, location */
+/* <Field> MatchSequencePattern.parenthesised = 1, bool */
+/* <Field> MatchSequencePattern.patterns = 2, pattern_list */
+
+/* <Field> MatchStarPattern.location = 0, location */
+/* <Field> MatchStarPattern.parenthesised = 1, bool */
+/* <Field> MatchStarPattern.target = 2, pattern */
+
+/* <Field> MatchValuePattern.location = 0, location */
+/* <Field> MatchValuePattern.parenthesised = 1, bool */
+/* <Field> MatchValuePattern.value = 2, expr */
+
+/* <Field> MatchWildcardPattern.location = 0, location */
+/* <Field> MatchWildcardPattern.parenthesised = 1, bool */
+
+/* <Field> Module.name = 0, str */
+/* <Field> Module.hash = 1, str */
+/* <Field> Module.body = 2, stmt_list */
+/* <Field> Module.kind = 3, str */
+
+/* <Field> Name.location = 0, location */
+/* <Field> Name.parenthesised = 1, bool */
+/* <Field> Name.variable = 2, variable */
+/* <Field> Name.ctx = 3, expr_context */
+/* <Parent> Name = ParameterList  */
+
+/* <Field> Nonlocal.location = 0, location */
+/* <Field> Nonlocal.names = 1, str_list */
+
+/* <Field> Num.location = 0, location */
+/* <Field> Num.parenthesised = 1, bool */
+/* <Field> Num.n = 2, number */
+/* <Field> Num.text = 3, number */
+
+/* <Field> ParamSpec.location = 0, location */
+/* <Field> ParamSpec.name = 1, expr */
+/* <Field> ParamSpec.default = 2, expr */
+
+/* <Field> Pass.location = 0, location */
+
+/* <Field> PlaceHolder.location = 0, location */
+/* <Field> PlaceHolder.parenthesised = 1, bool */
+/* <Field> PlaceHolder.variable = 2, variable */
+/* <Field> PlaceHolder.ctx = 3, expr_context */
+
+/* <Field> Print.location = 0, location */
+/* <Field> Print.dest = 1, expr */
+/* <Field> Print.values = 2, expr_list */
+/* <Field> Print.nl = 3, bool */
+
+/* <Field> Raise.location = 0, location */
+/* <Field> Raise.exc = 1, expr */
+/* <Field> Raise.cause = 2, expr */
+/* <Field> Raise.type = 3, expr */
+/* <Field> Raise.inst = 4, expr */
+/* <Field> Raise.tback = 5, expr */
+
+/* <Field> Repr.location = 0, location */
+/* <Field> Repr.parenthesised = 1, bool */
+/* <Field> Repr.value = 2, expr */
+
+/* <Field> Return.location = 0, location */
+/* <Field> Return.value = 1, expr */
+
+/* <Field> Set.location = 0, location */
+/* <Field> Set.parenthesised = 1, bool */
+/* <Field> Set.elts = 2, expr_list */
+
+/* <Field> SetComp.location = 0, location */
+/* <Field> SetComp.parenthesised = 1, bool */
+/* <Field> SetComp.function = 2, Function */
+/* <Field> SetComp.iterable = 3, expr */
+
+/* <Field> Slice.location = 0, location */
+/* <Field> Slice.parenthesised = 1, bool */
+/* <Field> Slice.start = 2, expr */
+/* <Field> Slice.stop = 3, expr */
+/* <Field> Slice.step = 4, expr */
+
+/* <Field> SpecialOperation.location = 0, location */
+/* <Field> SpecialOperation.parenthesised = 1, bool */
+/* <Field> SpecialOperation.name = 2, str */
+/* <Field> SpecialOperation.arguments = 3, expr_list */
+
+/* <Field> Starred.location = 0, location */
+/* <Field> Starred.parenthesised = 1, bool */
+/* <Field> Starred.value = 2, expr */
+/* <Field> Starred.ctx = 3, expr_context */
+
+/* <Field> Str.location = 0, location */
+/* <Field> Str.parenthesised = 1, bool */
+/* <Field> Str.s = 2, str */
+/* <Field> Str.prefix = 3, str */
+/* <Field> Str.implicitly_concatenated_parts = 4, StringPart_list */
+
+/* <Field> StringPart.text = 0, str */
+/* <Field> StringPart.location = 1, location */
+/* <Parent> StringPart = StringPartList  */
+/* <Parent> StringPartList = BytesOrStr  */
+
+/* <Field> Subscript.location = 0, location */
+/* <Field> Subscript.parenthesised = 1, bool */
+/* <Field> Subscript.value = 2, expr */
+/* <Field> Subscript.index = 3, expr */
+/* <Field> Subscript.ctx = 4, expr_context */
+
+/* <Field> TemplateDottedNotation.location = 0, location */
+/* <Field> TemplateDottedNotation.parenthesised = 1, bool */
+/* <Field> TemplateDottedNotation.value = 2, expr */
+/* <Field> TemplateDottedNotation.attr = 3, str */
+/* <Field> TemplateDottedNotation.ctx = 4, expr_context */
+
+/* <Field> TemplateWrite.location = 0, location */
+/* <Field> TemplateWrite.value = 1, expr */
+
+/* <Field> Try.location = 0, location */
+/* <Field> Try.body = 1, stmt_list */
+/* <Field> Try.orelse = 2, stmt_list */
+/* <Field> Try.handlers = 3, stmt_list */
+/* <Field> Try.finalbody = 4, stmt_list */
+
+/* <Field> Tuple.location = 0, location */
+/* <Field> Tuple.parenthesised = 1, bool */
+/* <Field> Tuple.elts = 2, expr_list */
+/* <Field> Tuple.ctx = 3, expr_context */
+/* <Parent> Tuple = ParameterList  */
+
+/* <Field> TypeAlias.location = 0, location */
+/* <Field> TypeAlias.name = 1, expr */
+/* <Field> TypeAlias.type_parameters = 2, type_parameter_list */
+/* <Field> TypeAlias.value = 3, expr */
+
+/* <Field> TypeVar.location = 0, location */
+/* <Field> TypeVar.name = 1, expr */
+/* <Field> TypeVar.bound = 2, expr */
+/* <Field> TypeVar.default = 3, expr */
+
+/* <Field> TypeVarTuple.location = 0, location */
+/* <Field> TypeVarTuple.name = 1, expr */
+/* <Field> TypeVarTuple.default = 2, expr */
+
+/* <Field> UnaryExpr.location = 0, location */
+/* <Field> UnaryExpr.parenthesised = 1, bool */
+/* <Field> UnaryExpr.op = 2, unaryop */
+/* <Field> UnaryExpr.operand = 3, expr */
+
+/* <Field> While.location = 0, location */
+/* <Field> While.test = 1, expr */
+/* <Field> While.body = 2, stmt_list */
+/* <Field> While.orelse = 3, stmt_list */
+
+/* <Field> With.location = 0, location */
+/* <Field> With.context_expr = 1, expr */
+/* <Field> With.optional_vars = 2, expr */
+/* <Field> With.body = 3, stmt_list */
+/* <Field> With.is_async = 4, bool */
+
+/* <Field> Yield.location = 0, location */
+/* <Field> Yield.parenthesised = 1, bool */
+/* <Field> Yield.value = 2, expr */
+
+/* <Field> YieldFrom.location = 0, location */
+/* <Field> YieldFrom.parenthesised = 1, bool */
+/* <Field> YieldFrom.value = 2, expr */
+
+/* <Field> Alias.value = 0, expr */
+/* <Field> Alias.asname = 1, expr */
+/* <Parent> Alias = AliasList  */
+/* <Parent> AliasList = Import  */
+
+/* <Field> Arguments.kw_defaults = 0, expr_list */
+/* <Field> Arguments.defaults = 1, expr_list */
+/* <Field> Arguments.annotations = 2, expr_list */
+/* <Field> Arguments.varargannotation = 3, expr */
+/* <Field> Arguments.kwargannotation = 4, expr */
+/* <Field> Arguments.kw_annotations = 5, expr_list */
+/* <Parent> Arguments = ArgumentsParent  */
+/* <Parent> boolean = BoolParent  */
+/* <Parent> Boolop = BoolExpr  */
+/* <Parent> string = Bytes  */
+/* <Parent> Cmpop = CmpopList  */
+/* <Parent> CmpopList = Compare  */
+
+/* <Field> Comprehension.location = 0, location */
+/* <Field> Comprehension.iter = 1, expr */
+/* <Field> Comprehension.target = 2, expr */
+/* <Field> Comprehension.ifs = 3, expr_list */
+/* <Parent> Comprehension = ComprehensionList  */
+/* <Parent> ComprehensionList = ListComp  */
+/* <Parent> DictItem = DictItemList  */
+/* <Parent> DictItemList = DictItemListParent  */
+
+/* <Field> Expr.location = 0, location */
+/* <Field> Expr.parenthesised = 1, bool */
+/* <Parent> Expr = ExprParent  */
+/* <Parent> ExprContext = ExprContextParent  */
+/* <Parent> ExprList = ExprListParent  */
+/* <Parent> int = ImportExpr  */
+
+/* <Field> Keyword.location = 0, location */
+/* <Field> Keyword.value = 1, expr */
+/* <Field> Keyword.arg = 2, str */
+/* <Parent> Location = LocationParent  */
+/* <Parent> string = Num  */
+/* <Parent> Operator = BinaryExpr  */
+/* <Parent> ParameterList = Function  */
+
+/* <Field> Pattern.location = 0, location */
+/* <Field> Pattern.parenthesised = 1, bool */
+/* <Parent> Pattern = PatternParent  */
+/* <Parent> PatternList = PatternListParent  */
+
+/* <Field> Stmt.location = 0, location */
+/* <Parent> Stmt = StmtList  */
+/* <Parent> StmtList = StmtListParent  */
+/* <Parent> string = StrParent  */
+/* <Parent> StringList = StrListParent  */
+
+/* <Field> TypeParameter.location = 0, location */
+/* <Parent> TypeParameter = TypeParameterList  */
+/* <Parent> TypeParameterList = TypeParameterListParent  */
+/* <Parent> Unaryop = UnaryExpr  */
+/* <Parent> Variable = VariableParent  */
+py_Classes(unique int id : @py_Class,
+    unique int parent : @py_ClassExpr ref);
+
+py_Functions(unique int id : @py_Function,
+    unique int parent : @py_Function_parent ref);
+
+py_Modules(unique int id : @py_Module);
+
+py_StringParts(unique int id : @py_StringPart,
+    int parent : @py_StringPart_list ref,
+    int idx : int ref);
+
+py_StringPart_lists(unique int id : @py_StringPart_list,
+    unique int parent : @py_Bytes_or_Str ref);
+
+py_aliases(unique int id : @py_alias,
+    int parent : @py_alias_list ref,
+    int idx : int ref);
+
+py_alias_lists(unique int id : @py_alias_list,
+    unique int parent : @py_Import ref);
+
+py_arguments(unique int id : @py_arguments,
+    unique int parent : @py_arguments_parent ref);
+
+py_bools(int parent : @py_bool_parent ref,
+    int idx : int ref);
+
+py_boolops(unique int id : @py_boolop,
+    int kind: int ref,
+    unique int parent : @py_BoolExpr ref);
+
+py_bytes(varchar(1) id : string ref,
+    int parent : @py_Bytes ref,
+    int idx : int ref);
+
+py_cmpops(unique int id : @py_cmpop,
+    int kind: int ref,
+    int parent : @py_cmpop_list ref,
+    int idx : int ref);
+
+py_cmpop_lists(unique int id : @py_cmpop_list,
+    unique int parent : @py_Compare ref);
+
+py_comprehensions(unique int id : @py_comprehension,
+    int parent : @py_comprehension_list ref,
+    int idx : int ref);
+
+py_comprehension_lists(unique int id : @py_comprehension_list,
+    unique int parent : @py_ListComp ref);
+
+py_dict_items(unique int id : @py_dict_item,
+    int kind: int ref,
+    int parent : @py_dict_item_list ref,
+    int idx : int ref);
+
+py_dict_item_lists(unique int id : @py_dict_item_list,
+    unique int parent : @py_dict_item_list_parent ref);
+
+py_exprs(unique int id : @py_expr,
+    int kind: int ref,
+    int parent : @py_expr_parent ref,
+    int idx : int ref);
+
+py_expr_contexts(unique int id : @py_expr_context,
+    int kind: int ref,
+    unique int parent : @py_expr_context_parent ref);
+
+py_expr_lists(unique int id : @py_expr_list,
+    int parent : @py_expr_list_parent ref,
+    int idx : int ref);
+
+py_ints(int id : int ref,
+    unique int parent : @py_ImportExpr ref);
+
+py_locations(unique int id : @location ref,
+    unique int parent : @py_location_parent ref);
+
+py_numbers(varchar(1) id : string ref,
+    int parent : @py_Num ref,
+    int idx : int ref);
+
+py_operators(unique int id : @py_operator,
+    int kind: int ref,
+    unique int parent : @py_BinaryExpr ref);
+
+py_parameter_lists(unique int id : @py_parameter_list,
+    unique int parent : @py_Function ref);
+
+py_patterns(unique int id : @py_pattern,
+    int kind: int ref,
+    int parent : @py_pattern_parent ref,
+    int idx : int ref);
+
+py_pattern_lists(unique int id : @py_pattern_list,
+    int parent : @py_pattern_list_parent ref,
+    int idx : int ref);
+
+py_stmts(unique int id : @py_stmt,
+    int kind: int ref,
+    int parent : @py_stmt_list ref,
+    int idx : int ref);
+
+py_stmt_lists(unique int id : @py_stmt_list,
+    int parent : @py_stmt_list_parent ref,
+    int idx : int ref);
+
+py_strs(varchar(1) id : string ref,
+    int parent : @py_str_parent ref,
+    int idx : int ref);
+
+py_str_lists(unique int id : @py_str_list,
+    unique int parent : @py_str_list_parent ref);
+
+py_type_parameters(unique int id : @py_type_parameter,
+    int kind: int ref,
+    int parent : @py_type_parameter_list ref,
+    int idx : int ref);
+
+py_type_parameter_lists(unique int id : @py_type_parameter_list,
+    unique int parent : @py_type_parameter_list_parent ref);
+
+py_unaryops(unique int id : @py_unaryop,
+    int kind: int ref,
+    unique int parent : @py_UnaryExpr ref);
+
+py_variables(int id : @py_variable ref,
+    unique int parent : @py_variable_parent ref);
+
+case @py_boolop.kind of
+    0 = @py_And
+|   1 = @py_Or;
+
+case @py_cmpop.kind of
+    0 = @py_Eq
+|   1 = @py_Gt
+|   2 = @py_GtE
+|   3 = @py_In
+|   4 = @py_Is
+|   5 = @py_IsNot
+|   6 = @py_Lt
+|   7 = @py_LtE
+|   8 = @py_NotEq
+|   9 = @py_NotIn;
+
+case @py_dict_item.kind of
+    0 = @py_DictUnpacking
+|   1 = @py_KeyValuePair
+|   2 = @py_keyword;
+
+case @py_expr.kind of
+    0 = @py_Attribute
+|   1 = @py_BinaryExpr
+|   2 = @py_BoolExpr
+|   3 = @py_Bytes
+|   4 = @py_Call
+|   5 = @py_ClassExpr
+|   6 = @py_Compare
+|   7 = @py_Dict
+|   8 = @py_DictComp
+|   9 = @py_Ellipsis
+|   10 = @py_FunctionExpr
+|   11 = @py_GeneratorExp
+|   12 = @py_IfExp
+|   13 = @py_ImportExpr
+|   14 = @py_ImportMember
+|   15 = @py_Lambda
+|   16 = @py_List
+|   17 = @py_ListComp
+|   18 = @py_Guard
+|   19 = @py_Name
+|   20 = @py_Num
+|   21 = @py_Repr
+|   22 = @py_Set
+|   23 = @py_SetComp
+|   24 = @py_Slice
+|   25 = @py_Starred
+|   26 = @py_Str
+|   27 = @py_Subscript
+|   28 = @py_Tuple
+|   29 = @py_UnaryExpr
+|   30 = @py_Yield
+|   31 = @py_YieldFrom
+|   32 = @py_TemplateDottedNotation
+|   33 = @py_Filter
+|   34 = @py_PlaceHolder
+|   35 = @py_Await
+|   36 = @py_Fstring
+|   37 = @py_FormattedValue
+|   38 = @py_AssignExpr
+|   39 = @py_SpecialOperation;
+
+case @py_expr_context.kind of
+    0 = @py_AugLoad
+|   1 = @py_AugStore
+|   2 = @py_Del
+|   3 = @py_Load
+|   4 = @py_Param
+|   5 = @py_Store;
+
+case @py_operator.kind of
+    0 = @py_Add
+|   1 = @py_BitAnd
+|   2 = @py_BitOr
+|   3 = @py_BitXor
+|   4 = @py_Div
+|   5 = @py_FloorDiv
+|   6 = @py_LShift
+|   7 = @py_Mod
+|   8 = @py_Mult
+|   9 = @py_Pow
+|   10 = @py_RShift
+|   11 = @py_Sub
+|   12 = @py_MatMult;
+
+case @py_pattern.kind of
+    0 = @py_MatchAsPattern
+|   1 = @py_MatchOrPattern
+|   2 = @py_MatchLiteralPattern
+|   3 = @py_MatchCapturePattern
+|   4 = @py_MatchWildcardPattern
+|   5 = @py_MatchValuePattern
+|   6 = @py_MatchSequencePattern
+|   7 = @py_MatchStarPattern
+|   8 = @py_MatchMappingPattern
+|   9 = @py_MatchDoubleStarPattern
+|   10 = @py_MatchKeyValuePattern
+|   11 = @py_MatchClassPattern
+|   12 = @py_MatchKeywordPattern;
+
+case @py_stmt.kind of
+    0 = @py_Assert
+|   1 = @py_Assign
+|   2 = @py_AugAssign
+|   3 = @py_Break
+|   4 = @py_Continue
+|   5 = @py_Delete
+|   6 = @py_ExceptStmt
+|   7 = @py_ExceptGroupStmt
+|   8 = @py_Exec
+|   9 = @py_Expr_stmt
+|   10 = @py_For
+|   11 = @py_Global
+|   12 = @py_If
+|   13 = @py_Import
+|   14 = @py_ImportStar
+|   15 = @py_MatchStmt
+|   16 = @py_Case
+|   17 = @py_Nonlocal
+|   18 = @py_Pass
+|   19 = @py_Print
+|   20 = @py_Raise
+|   21 = @py_Return
+|   22 = @py_Try
+|   23 = @py_While
+|   24 = @py_With
+|   25 = @py_TemplateWrite
+|   26 = @py_AnnAssign
+|   27 = @py_TypeAlias;
+
+case @py_type_parameter.kind of
+    0 = @py_ParamSpec
+|   1 = @py_TypeVar
+|   2 = @py_TypeVarTuple;
+
+case @py_unaryop.kind of
+    0 = @py_Invert
+|   1 = @py_Not
+|   2 = @py_UAdd
+|   3 = @py_USub;
+
+@py_Bytes_or_Str = @py_Bytes | @py_Str;
+
+@py_Function_parent = @py_DictComp | @py_FunctionExpr | @py_GeneratorExp | @py_Lambda | @py_ListComp | @py_SetComp;
+
+@py_arguments_parent = @py_FunctionExpr | @py_Lambda;
+
+@py_ast_node = @py_Class | @py_Function | @py_Module | @py_StringPart | @py_comprehension | @py_dict_item | @py_expr | @py_pattern | @py_stmt | @py_type_parameter;
+
+@py_bool_parent = @py_For | @py_Function | @py_Print | @py_With | @py_expr | @py_pattern;
+
+@py_dict_item_list_parent = @py_Call | @py_ClassExpr | @py_Dict;
+
+@py_expr_context_parent = @py_Attribute | @py_List | @py_Name | @py_PlaceHolder | @py_Starred | @py_Subscript | @py_TemplateDottedNotation | @py_Tuple;
+
+@py_expr_list_parent = @py_Assign | @py_BoolExpr | @py_Call | @py_ClassExpr | @py_Compare | @py_Delete | @py_Fstring | @py_Function | @py_List | @py_Print | @py_Set | @py_SpecialOperation | @py_Tuple | @py_arguments | @py_comprehension;
+
+@py_expr_or_stmt = @py_expr | @py_stmt;
+
+@py_expr_parent = @py_AnnAssign | @py_Assert | @py_Assign | @py_AssignExpr | @py_Attribute | @py_AugAssign | @py_Await | @py_BinaryExpr | @py_Call | @py_Case | @py_Compare | @py_DictComp | @py_DictUnpacking | @py_ExceptGroupStmt | @py_ExceptStmt | @py_Exec | @py_Expr_stmt | @py_Filter | @py_For | @py_FormattedValue | @py_Function | @py_FunctionExpr | @py_GeneratorExp | @py_Guard | @py_If | @py_IfExp | @py_ImportMember | @py_ImportStar | @py_KeyValuePair | @py_ListComp | @py_MatchAsPattern | @py_MatchCapturePattern | @py_MatchClassPattern | @py_MatchKeywordPattern | @py_MatchLiteralPattern | @py_MatchStmt | @py_MatchValuePattern | @py_ParamSpec | @py_Print | @py_Raise | @py_Repr | @py_Return | @py_SetComp | @py_Slice | @py_Starred | @py_Subscript | @py_TemplateDottedNotation | @py_TemplateWrite | @py_TypeAlias | @py_TypeVar | @py_TypeVarTuple | @py_UnaryExpr | @py_While | @py_With | @py_Yield | @py_YieldFrom | @py_alias | @py_arguments | @py_comprehension | @py_expr_list | @py_keyword | @py_parameter_list;
+
+@py_location_parent = @py_DictUnpacking | @py_KeyValuePair | @py_StringPart | @py_comprehension | @py_expr | @py_keyword | @py_pattern | @py_stmt | @py_type_parameter;
+
+@py_parameter = @py_Name | @py_Tuple;
+
+@py_pattern_list_parent = @py_MatchClassPattern | @py_MatchMappingPattern | @py_MatchOrPattern | @py_MatchSequencePattern;
+
+@py_pattern_parent = @py_Case | @py_MatchAsPattern | @py_MatchDoubleStarPattern | @py_MatchKeyValuePattern | @py_MatchKeywordPattern | @py_MatchStarPattern | @py_pattern_list;
+
+@py_scope = @py_Class | @py_Function | @py_Module;
+
+@py_stmt_list_parent = @py_Case | @py_Class | @py_ExceptGroupStmt | @py_ExceptStmt | @py_For | @py_Function | @py_If | @py_MatchStmt | @py_Module | @py_Try | @py_While | @py_With;
+
+@py_str_list_parent = @py_Global | @py_Nonlocal;
+
+@py_str_parent = @py_Attribute | @py_Class | @py_ClassExpr | @py_FormattedValue | @py_Function | @py_FunctionExpr | @py_ImportExpr | @py_ImportMember | @py_Module | @py_SpecialOperation | @py_Str | @py_StringPart | @py_TemplateDottedNotation | @py_keyword | @py_str_list;
+
+@py_type_parameter_list_parent = @py_ClassExpr | @py_Function | @py_TypeAlias;
+
+@py_variable_parent = @py_Name | @py_PlaceHolder;
+
+
+/*
+ * End of auto-generated part
+ */
+
+
+
+/* Map relative names to absolute names for imports */
+py_absolute_names(int module : @py_Module ref,
+                  varchar(1) relname : string ref,
+                  varchar(1) absname : string ref);
+
+py_exports(int id : @py_Module ref,
+           varchar(1) name : string ref);
+
+/* Successor information */
+py_successors(int predecessor : @py_flow_node ref,
+              int successor : @py_flow_node ref);
+
+py_true_successors(int predecessor : @py_flow_node ref,
+              int successor : @py_flow_node ref);
+
+py_exception_successors(int predecessor : @py_flow_node ref,
+              int successor : @py_flow_node ref);
+
+py_false_successors(int predecessor : @py_flow_node ref,
+              int successor : @py_flow_node ref);
+
+py_flow_bb_node(unique int flownode : @py_flow_node,
+             int realnode : @py_ast_node ref,
+             int basicblock : @py_flow_node ref,
+             int index : int ref);
+
+py_scope_flow(int flow : @py_flow_node ref,
+              int scope : @py_scope ref,
+              int kind : int ref);
+
+py_idoms(unique int node : @py_flow_node ref,
+         int immediate_dominator : @py_flow_node ref);
+
+py_ssa_phi(int phi : @py_ssa_var ref,
+           int arg: @py_ssa_var ref);
+
+py_ssa_var(unique int id : @py_ssa_var,
+            int var : @py_variable ref);
+
+py_ssa_use(int node: @py_flow_node ref,
+           int var : @py_ssa_var ref);
+
+py_ssa_defn(unique int id : @py_ssa_var ref,
+                  int node: @py_flow_node ref);
+
+@py_base_var = @py_variable | @py_ssa_var;
+
+py_scopes(unique int node : @py_expr_or_stmt ref,
+         int scope : @py_scope ref);
+
+py_scope_location(unique int id : @location ref,
+                   unique int scope : @py_scope ref);
+
+py_flags_versioned(varchar(1) name : string ref,
+                   varchar(1) value : string ref,
+                   varchar(1) version : string ref);
+
+py_syntax_error_versioned(unique int id : @location ref,
+                varchar(1) message : string ref,
+                varchar(1) version : string ref);
+
+py_comments(unique int id : @py_comment,
+           varchar(1) text : string ref,
+           unique int location : @location ref);
+
+/* Type information support */
+
+py_cobjects(unique int obj : @py_cobject);
+
+py_cobjecttypes(unique int obj : @py_cobject ref,
+                int typeof : @py_cobject ref);
+
+py_cobjectnames(unique int obj : @py_cobject ref,
+                varchar(1) name : string ref);
+
+/* Kind should be 0 for introspection, > 0 from source, as follows:
+   1 from C extension source
+ */
+py_cobject_sources(int obj : @py_cobject ref,
+                  int kind : int ref);
+
+py_cmembers_versioned(int object : @py_cobject ref,
+                      varchar(1) name : string ref,
+                      int member : @py_cobject ref,
+                      varchar(1) version : string ref);
+
+py_citems(int object : @py_cobject ref,
+            int index : int ref,
+            int member : @py_cobject ref);
+
+ext_argtype(int funcid : @py_object ref,
+            int arg : int ref,
+            int typeid : @py_object ref);
+
+ext_rettype(int funcid : @py_object ref,
+            int typeid : @py_object ref);
+
+ext_proptype(int propid : @py_object ref,
+             int typeid : @py_object ref);
+
+ext_argreturn(int funcid : @py_object ref,
+              int arg : int ref);
+
+py_special_objects(unique int obj : @py_cobject ref,
+                   unique varchar(1) name : string ref);
+
+py_decorated_object(int object : @py_object ref,
+                    int level: int ref);
+
+@py_object = @py_cobject | @py_flow_node;
+
+@py_source_element = @py_ast_node | @container;
diff --git a/python/ql/lib/upgrades/728c6d65e61d808ae276013ebc15abc3a97aaef1/upgrade.properties b/python/ql/lib/upgrades/728c6d65e61d808ae276013ebc15abc3a97aaef1/upgrade.properties
new file mode 100644
index 00000000000..7c5cd59e1c4
--- /dev/null
+++ b/python/ql/lib/upgrades/728c6d65e61d808ae276013ebc15abc3a97aaef1/upgrade.properties
@@ -0,0 +1,2 @@
+description: Add support for type parameter defaults.
+compatibility: backwards
diff --git a/python/ql/src/CHANGELOG.md b/python/ql/src/CHANGELOG.md
index 045938a0cde..64a33ed30ca 100644
--- a/python/ql/src/CHANGELOG.md
+++ b/python/ql/src/CHANGELOG.md
@@ -1,3 +1,19 @@
+## 1.3.2
+
+### Minor Analysis Improvements
+
+* Improved modelling for the `pycurl` framework.
+
+## 1.3.1
+
+No user-facing changes.
+
+## 1.3.0
+
+### New Queries
+
+* The experimental `py/cors-misconfiguration-with-credentials` query, which finds insecure CORS middleware configurations.
+
 ## 1.2.2
 
 ### Minor Analysis Improvements
diff --git a/python/ql/src/Security/CWE-614/InsecureCookie.qhelp b/python/ql/src/Security/CWE-614/InsecureCookie.qhelp
index fd8e9aee4df..5b36c9cc59d 100644
--- a/python/ql/src/Security/CWE-614/InsecureCookie.qhelp
+++ b/python/ql/src/Security/CWE-614/InsecureCookie.qhelp
@@ -4,7 +4,7 @@
 <qhelp>
 
 <overview>
-<p>Cookies without the <code>Secure</code> flag set may be transmittd using HTTP instead of HTTPS, which leaves it vulnerable to being read by a third party.</p>
+<p>Cookies without the <code>Secure</code> flag set may be transmitted using HTTP instead of HTTPS, which leaves them vulnerable to reading by a third party.</p>
 <p>Cookies without the <code>HttpOnly</code> flag set are accessible to JavaScript running in the same origin. In case of a Cross-Site Scripting (XSS) vulnerability, the cookie can be stolen by a malicious script.</p>
 <p>Cookies with the <code>SameSite</code> attribute set to <code>'None'</code> will be sent with cross-origin requests, which can be controlled by third-party JavaScript code and allow for Cross-Site Request Forgery (CSRF) attacks.</p>
 </overview>
diff --git a/python/ql/src/change-notes/released/1.3.0.md b/python/ql/src/change-notes/released/1.3.0.md
new file mode 100644
index 00000000000..eee07453dee
--- /dev/null
+++ b/python/ql/src/change-notes/released/1.3.0.md
@@ -0,0 +1,5 @@
+## 1.3.0
+
+### New Queries
+
+* The experimental `py/cors-misconfiguration-with-credentials` query, which finds insecure CORS middleware configurations.
diff --git a/python/ql/src/change-notes/released/1.3.1.md b/python/ql/src/change-notes/released/1.3.1.md
new file mode 100644
index 00000000000..8dd9964197c
--- /dev/null
+++ b/python/ql/src/change-notes/released/1.3.1.md
@@ -0,0 +1,3 @@
+## 1.3.1
+
+No user-facing changes.
diff --git a/python/ql/src/change-notes/released/1.3.2.md b/python/ql/src/change-notes/released/1.3.2.md
new file mode 100644
index 00000000000..721f4f9d4e6
--- /dev/null
+++ b/python/ql/src/change-notes/released/1.3.2.md
@@ -0,0 +1,5 @@
+## 1.3.2
+
+### Minor Analysis Improvements
+
+* Improved modelling for the `pycurl` framework.
diff --git a/python/ql/src/codeql-pack.release.yml b/python/ql/src/codeql-pack.release.yml
index 0a70a9a01a7..86a9cb32d86 100644
--- a/python/ql/src/codeql-pack.release.yml
+++ b/python/ql/src/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.2.2
+lastReleaseVersion: 1.3.2
diff --git a/python/ql/src/experimental/Security/CWE-074/TemplateInjectionCustomizations.qll b/python/ql/src/experimental/Security/CWE-074/TemplateInjectionCustomizations.qll
index dcd6c184861..593ca9fee4c 100644
--- a/python/ql/src/experimental/Security/CWE-074/TemplateInjectionCustomizations.qll
+++ b/python/ql/src/experimental/Security/CWE-074/TemplateInjectionCustomizations.qll
@@ -33,9 +33,14 @@ module TemplateInjection {
   abstract class Sanitizer extends DataFlow::Node { }
 
   /**
-   * A source of remote user input, considered as a flow source.
+   * DEPRECATED: Use `ActiveThreatModelSource` from Concepts instead!
    */
-  class RemoteFlowSourceAsSource extends Source, RemoteFlowSource { }
+  deprecated class RemoteFlowSourceAsSource = ActiveThreatModelSourceAsSource;
+
+  /**
+   * An active threat-model source, considered as a flow source.
+   */
+  private class ActiveThreatModelSourceAsSource extends Source, ActiveThreatModelSource { }
 
   /**
    * A SQL statement of a SQL construction, considered as a flow sink.
@@ -45,7 +50,10 @@ module TemplateInjection {
   }
 
   /**
-   * A comparison with a constant string, considered as a sanitizer-guard.
+   * A comparison with a constant, considered as a sanitizer-guard.
    */
-  class StringConstCompareAsSanitizerGuard extends Sanitizer, StringConstCompareBarrier { }
+  class ConstCompareAsSanitizerGuard extends Sanitizer, ConstCompareBarrier { }
+
+  /** DEPRECATED: Use ConstCompareAsSanitizerGuard instead. */
+  deprecated class StringConstCompareAsSanitizerGuard = ConstCompareAsSanitizerGuard;
 }
diff --git a/python/ql/src/experimental/Security/CWE-091/XsltInjectionCustomizations.qll b/python/ql/src/experimental/Security/CWE-091/XsltInjectionCustomizations.qll
index bda2fe646c9..6e6abea97f9 100644
--- a/python/ql/src/experimental/Security/CWE-091/XsltInjectionCustomizations.qll
+++ b/python/ql/src/experimental/Security/CWE-091/XsltInjectionCustomizations.qll
@@ -33,9 +33,14 @@ module XsltInjection {
   abstract class Sanitizer extends DataFlow::Node { }
 
   /**
-   * A source of remote user input, considered as a flow source.
+   * DEPRECATED: Use `ActiveThreatModelSource` from Concepts instead!
    */
-  class RemoteFlowSourceAsSource extends Source, RemoteFlowSource { }
+  deprecated class RemoteFlowSourceAsSource = ActiveThreatModelSourceAsSource;
+
+  /**
+   * An active threat-model source, considered as a flow source.
+   */
+  private class ActiveThreatModelSourceAsSource extends Source, ActiveThreatModelSource { }
 
   /**
    * An XSLT construction, considered as a flow sink.
@@ -52,7 +57,10 @@ module XsltInjection {
   }
 
   /**
-   * A comparison with a constant string, considered as a sanitizer-guard.
+   * A comparison with a constant, considered as a sanitizer-guard.
    */
-  class StringConstCompareAsSanitizerGuard extends Sanitizer, StringConstCompareBarrier { }
+  class ConstCompareAsSanitizerGuard extends Sanitizer, ConstCompareBarrier { }
+
+  /** DEPRECATED: Use ConstCompareAsSanitizerGuard instead. */
+  deprecated class StringConstCompareAsSanitizerGuard = ConstCompareAsSanitizerGuard;
 }
diff --git a/python/ql/src/experimental/Security/CWE-094/Js2Py.ql b/python/ql/src/experimental/Security/CWE-094/Js2Py.ql
index 5dc16007787..f5d6e3a6c10 100644
--- a/python/ql/src/experimental/Security/CWE-094/Js2Py.ql
+++ b/python/ql/src/experimental/Security/CWE-094/Js2Py.ql
@@ -18,7 +18,7 @@ import semmle.python.dataflow.new.RemoteFlowSources
 import semmle.python.Concepts
 
 module Js2PyFlowConfig implements DataFlow::ConfigSig {
-  predicate isSource(DataFlow::Node node) { node instanceof RemoteFlowSource }
+  predicate isSource(DataFlow::Node node) { node instanceof ActiveThreatModelSource }
 
   predicate isSink(DataFlow::Node node) {
     API::moduleImport("js2py").getMember(["eval_js", "eval_js6", "EvalJs"]).getACall().getArg(_) =
diff --git a/python/ql/src/experimental/Security/CWE-942/CorsMisconfigurationMiddleware.qhelp b/python/ql/src/experimental/Security/CWE-942/CorsMisconfigurationMiddleware.qhelp
new file mode 100644
index 00000000000..21a670019c3
--- /dev/null
+++ b/python/ql/src/experimental/Security/CWE-942/CorsMisconfigurationMiddleware.qhelp
@@ -0,0 +1,64 @@
+<!DOCTYPE qhelp PUBLIC
+"-//Semmle//qhelp//EN"
+"qhelp.dtd">
+<qhelp>
+<overview>
+<p>
+	Web browsers, by default, disallow cross-origin resource sharing via direct HTTP requests.
+	Still, to satisfy some needs that arose with the growth of the web, an expedient was created to make exceptions possible.
+	CORS (Cross-origin resource sharing) is a mechanism that allows resources of a web endpoint (let's call it "Peer A")
+	to be accessed from another web page belonging to a different domain ("Peer B").
+</p>
+<p>
+	For that to happen, Peer A needs to make available its CORS configuration via special headers on the desired endpoint
+	via the OPTIONS method.
+</p>
+<p>
+	This configuration can also allow the inclusion of cookies on the cross-origin request,
+	(i.e. when the <code>Access-Control-Allow-Credentials</code> header is set to true) 
+	meaning that Peer B can send a request to Peer A that will include the cookies as if the request was executed by the user.
+</p>
+<p>
+	That can have dangerous effects if the origin of Peer B is not restricted correctly. 
+	An example of a dangerous scenario is when <code>Access-Control-Allow-Origin</code> header is set to a value obtained from the request made by Peer B 
+	(and not correctly validated), or is set to special values such as <code>*</code> or <code>null</code>. 
+	The above values can allow any Peer B to send requests to the misconfigured Peer A on behalf of the user.
+</p>
+<p>
+	Example scenario:
+	User is client of a bank that has its API misconfigured to accept CORS requests from any domain.
+	When the user loads an evil page, the evil page sends a request to the bank's API to transfer all funds
+	to evil party's account.
+	Given that the user was already logged in to the bank website, and had its session cookies set,
+	the evil party's request succeeds.
+</p>
+</overview>
+<recommendation>
+<p>
+	When configuring CORS that allow credentials passing,
+	it's best not to use user-provided values for the allowed origins response header,
+	especially if the cookies grant session permissions on the user's account.
+</p>
+<p>
+	It also can be very dangerous to set the allowed origins to <code>null</code> (which can be bypassed).
+</p>
+</recommendation>
+<example>
+<p>
+	The first example shows a possible CORS misconfiguration case:
+</p>
+<sample src="CorsMisconfigurationMiddlewareBad.py"/>
+<p>
+	The second example shows a better configuration:
+</p>
+<sample src="CorsMisconfigurationMiddlewareGood.py"/>
+</example>
+<references>
+<li>
+	Reference 1: <a href="https://portswigger.net/web-security/cors">PortSwigger Web Security Academy on CORS</a>.
+</li>
+<li>
+	Reference 2: <a href="https://www.youtube.com/watch?v=wgkj4ZgxI4c">AppSec EU 2017 Exploiting CORS Misconfigurations For Bitcoins And Bounties by James Kettle</a>.
+</li>
+</references>
+</qhelp>
\ No newline at end of file
diff --git a/python/ql/src/experimental/Security/CWE-942/CorsMisconfigurationMiddleware.ql b/python/ql/src/experimental/Security/CWE-942/CorsMisconfigurationMiddleware.ql
new file mode 100644
index 00000000000..af92800ba00
--- /dev/null
+++ b/python/ql/src/experimental/Security/CWE-942/CorsMisconfigurationMiddleware.ql
@@ -0,0 +1,40 @@
+/**
+ * @name Cors misconfiguration with credentials
+ * @description Disabling or weakening SOP protection may make the application
+ *              vulnerable to a CORS attack.
+ * @kind problem
+ * @problem.severity warning
+ * @security-severity 8.8
+ * @precision high
+ * @id py/cors-misconfiguration-with-credentials
+ * @tags security
+ *       experimental
+ *       external/cwe/cwe-942
+ */
+
+import python
+import semmle.python.Concepts
+private import semmle.python.dataflow.new.DataFlow
+
+predicate containsStar(DataFlow::Node array) {
+  array.asExpr() instanceof List and
+  array.asExpr().getASubExpression().(StringLiteral).getText() in ["*", "null"]
+  or
+  array.asExpr().(StringLiteral).getText() in ["*", "null"]
+}
+
+predicate isCorsMiddleware(Http::Server::CorsMiddleware middleware) {
+  middleware.getMiddlewareName() = "CORSMiddleware"
+}
+
+predicate credentialsAllowed(Http::Server::CorsMiddleware middleware) {
+  middleware.getCredentialsAllowed().asExpr() instanceof True
+}
+
+from Http::Server::CorsMiddleware a
+where
+  credentialsAllowed(a) and
+  containsStar(a.getOrigins().getALocalSource()) and
+  isCorsMiddleware(a)
+select a,
+  "This CORS middleware uses a vulnerable configuration that allows arbitrary websites to make authenticated cross-site requests"
diff --git a/python/ql/src/experimental/Security/CWE-942/CorsMisconfigurationMiddlewareBad.py b/python/ql/src/experimental/Security/CWE-942/CorsMisconfigurationMiddlewareBad.py
new file mode 100644
index 00000000000..2b1c3c58a7e
--- /dev/null
+++ b/python/ql/src/experimental/Security/CWE-942/CorsMisconfigurationMiddlewareBad.py
@@ -0,0 +1,21 @@
+from fastapi import FastAPI
+from fastapi.middleware.cors import CORSMiddleware
+
+app = FastAPI()
+
+origins = [
+    "*"
+]
+
+app.add_middleware(
+    CORSMiddleware,
+    allow_origins=origins,
+    allow_credentials=True,
+    allow_methods=["*"],
+    allow_headers=["*"],
+)
+
+
+@app.get("/")
+async def main():
+    return {"message": "Hello World"}
\ No newline at end of file
diff --git a/python/ql/src/experimental/Security/CWE-942/CorsMisconfigurationMiddlewareGood.py b/python/ql/src/experimental/Security/CWE-942/CorsMisconfigurationMiddlewareGood.py
new file mode 100644
index 00000000000..bfcb559feb2
--- /dev/null
+++ b/python/ql/src/experimental/Security/CWE-942/CorsMisconfigurationMiddlewareGood.py
@@ -0,0 +1,24 @@
+from fastapi import FastAPI
+from fastapi.middleware.cors import CORSMiddleware
+
+app = FastAPI()
+
+origins = [
+    "http://localhost.tiangolo.com",
+    "https://localhost.tiangolo.com",
+    "http://localhost",
+    "http://localhost:8080",
+]
+
+app.add_middleware(
+    CORSMiddleware,
+    allow_origins=origins,
+    allow_credentials=True,
+    allow_methods=["*"],
+    allow_headers=["*"],
+)
+
+
+@app.get("/")
+async def main():
+    return {"message": "Hello World"}
\ No newline at end of file
diff --git a/python/ql/src/experimental/semmle/python/security/dataflow/EmailXss.qll b/python/ql/src/experimental/semmle/python/security/dataflow/EmailXss.qll
index 88e9af89ba6..c08a0e6b258 100644
--- a/python/ql/src/experimental/semmle/python/security/dataflow/EmailXss.qll
+++ b/python/ql/src/experimental/semmle/python/security/dataflow/EmailXss.qll
@@ -19,7 +19,7 @@ private module EmailXssConfig implements DataFlow::ConfigSig {
   predicate isBarrier(DataFlow::Node sanitizer) {
     sanitizer = any(HtmlEscaping esc).getOutput()
     or
-    sanitizer instanceof StringConstCompareBarrier
+    sanitizer instanceof ConstCompareBarrier
   }
 
   predicate isAdditionalFlowStep(DataFlow::Node nodeFrom, DataFlow::Node nodeTo) {
diff --git a/python/ql/src/experimental/semmle/python/security/injection/CsvInjection.qll b/python/ql/src/experimental/semmle/python/security/injection/CsvInjection.qll
index 316dd4d2603..d08e9b090a6 100644
--- a/python/ql/src/experimental/semmle/python/security/injection/CsvInjection.qll
+++ b/python/ql/src/experimental/semmle/python/security/injection/CsvInjection.qll
@@ -15,7 +15,7 @@ private module CsvInjectionConfig implements DataFlow::ConfigSig {
 
   predicate isBarrier(DataFlow::Node node) {
     node = DataFlow::BarrierGuard<startsWithCheck/3>::getABarrierNode() or
-    node instanceof StringConstCompareBarrier
+    node instanceof ConstCompareBarrier
   }
 }
 
diff --git a/python/ql/src/meta/analysis-quality/CallGraphQuality.qll b/python/ql/src/meta/analysis-quality/CallGraphQuality.qll
index b1f29b52cc7..a8e7a3b340a 100644
--- a/python/ql/src/meta/analysis-quality/CallGraphQuality.qll
+++ b/python/ql/src/meta/analysis-quality/CallGraphQuality.qll
@@ -103,20 +103,20 @@ module TypeTrackingBasedCallGraph {
   /** A call that can be resolved by type-tracking. */
   class ResolvableCall extends RelevantCall {
     ResolvableCall() {
-      exists(TT::TNormalCall(this, _, _))
+      TT::resolveCall(this, _, _)
       or
       TT::resolveClassCall(this, _)
     }
 
     /** Gets a resolved target of this call. */
     Target getTarget() {
-      exists(TT::DataFlowCall call, TT::CallType ct, Function targetFunc |
-        call = TT::TNormalCall(this, targetFunc, ct) and
+      exists(TT::CallType ct, Function targetFunc |
+        TT::resolveCall(this, targetFunc, ct) and
         not ct instanceof TT::CallTypeClass and
         targetFunc = result.(TargetFunction).getFunction()
       )
       or
-      // a TT::TNormalCall only exists when the call can be resolved to a function.
+      // TT::resolveCall only holds when the call can be resolved to a function.
       // Since points-to just says the call goes directly to the class itself, and
       // type-tracking based wants to resolve this to the constructor, which might not
       // exist. So to do a proper comparison, we don't require the call to be resolve to
diff --git a/python/ql/src/qlpack.yml b/python/ql/src/qlpack.yml
index 17a8639b416..d279b5225c8 100644
--- a/python/ql/src/qlpack.yml
+++ b/python/ql/src/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/python-queries
-version: 1.2.3-dev
+version: 1.3.3-dev
 groups:
   - python
   - queries
diff --git a/python/ql/src/semmle/python/functions/ModificationOfParameterWithDefault.qll b/python/ql/src/semmle/python/functions/ModificationOfParameterWithDefault.qll
index 77dc4ccafcc..68194309e1d 100644
--- a/python/ql/src/semmle/python/functions/ModificationOfParameterWithDefault.qll
+++ b/python/ql/src/semmle/python/functions/ModificationOfParameterWithDefault.qll
@@ -8,7 +8,7 @@
 
 private import python
 import semmle.python.dataflow.new.DataFlow
-private import semmle.python.dataflow.new.internal.TaintTrackingPrivate as TTP
+private import semmle.python.ApiGraphs
 
 /**
  * Provides a data-flow configuration for detecting modifications of a parameters default value.
@@ -73,7 +73,13 @@ module ModificationOfParameterWithDefault {
       or
       // the target of a copy step is (presumably) a different object, and hence modifications of
       // this object no longer matter for the purposes of this query.
-      TTP::copyStep(_, node) and state in [true, false]
+      copyTarget(node) and state in [true, false]
+    }
+
+    private predicate copyTarget(DataFlow::Node node) {
+      node = API::moduleImport("copy").getMember(["copy", "deepcopy"]).getACall()
+      or
+      node.(DataFlow::MethodCallNode).calls(_, "copy")
     }
   }
 
diff --git a/python/ql/test/2/library-tests/PointsTo/class_properties/ClassValues.expected b/python/ql/test/2/library-tests/PointsTo/class_properties/ClassValues.expected
index 9835b2573b1..56d3bde865f 100644
--- a/python/ql/test/2/library-tests/PointsTo/class_properties/ClassValues.expected
+++ b/python/ql/test/2/library-tests/PointsTo/class_properties/ClassValues.expected
@@ -1,12 +1,10 @@
-| mapping | builtin-class collections.defaultdict |
 | mapping | builtin-class dict |
 | mapping | class MyDictSubclass |
-| mapping | class MyMappingABC |
-| mapping | class OrderedDict |
 | neither sequence nor mapping | builtin-class set |
+| neither sequence nor mapping | class MyMappingABC |
+| neither sequence nor mapping | class MySequenceABC |
 | sequence | builtin-class list |
 | sequence | builtin-class str |
 | sequence | builtin-class tuple |
 | sequence | builtin-class unicode |
-| sequence | class MySequenceABC |
 | sequence | class MySequenceImpl |
diff --git a/python/ql/test/2/library-tests/PointsTo/imports2/Runtime.expected b/python/ql/test/2/library-tests/PointsTo/imports2/Runtime.expected
index 345f112dccb..fe825523ca2 100644
--- a/python/ql/test/2/library-tests/PointsTo/imports2/Runtime.expected
+++ b/python/ql/test/2/library-tests/PointsTo/imports2/Runtime.expected
@@ -44,14 +44,10 @@
 | test.py | 15 | ControlFlowNode for moduleX | Module package.moduleX | Entry node for Module package.moduleX |
 | test.py | 16 | ControlFlowNode for Attribute | class Y | ControlFlowNode for ClassExpr |
 | test.py | 16 | ControlFlowNode for moduleX | Module package.moduleX | Entry node for Module package.moduleX |
-| test.py | 19 | ControlFlowNode for ImportExpr | Module tty | ControlFlowNode for ImportExpr |
-| test.py | 19 | ControlFlowNode for tty | Module tty | ControlFlowNode for ImportExpr |
 | test.py | 22 | ControlFlowNode for Attribute | Builtin-function exc_info | ControlFlowNode for from sys import * |
 | test.py | 22 | ControlFlowNode for x | Module package.x | Entry node for Module package.x |
 | test.py | 24 | ControlFlowNode for IntegerLiteral | int 0 | ControlFlowNode for IntegerLiteral |
 | test.py | 24 | ControlFlowNode for argv | int 0 | ControlFlowNode for IntegerLiteral |
 | test.py | 27 | ControlFlowNode for ImportExpr | Module sys | ControlFlowNode for ImportExpr |
 | test.py | 31 | ControlFlowNode for argv | list object | ControlFlowNode for from sys import * |
-| test.py | 33 | ControlFlowNode for ImportExpr | Module socket | ControlFlowNode for ImportExpr |
-| test.py | 34 | ControlFlowNode for timeout | builtin-class socket.timeout | ControlFlowNode for from _socket import * |
 | x.py | 2 | ControlFlowNode for ImportExpr | Module sys | ControlFlowNode for ImportExpr |
diff --git a/python/ql/test/2/library-tests/PointsTo/imports2/RuntimeWithType.expected b/python/ql/test/2/library-tests/PointsTo/imports2/RuntimeWithType.expected
index 7082c15e410..e55d70d073d 100644
--- a/python/ql/test/2/library-tests/PointsTo/imports2/RuntimeWithType.expected
+++ b/python/ql/test/2/library-tests/PointsTo/imports2/RuntimeWithType.expected
@@ -44,14 +44,10 @@
 | test.py | 15 | ControlFlowNode for moduleX | Module package.moduleX | builtin-class module | Entry node for Module package.moduleX |
 | test.py | 16 | ControlFlowNode for Attribute | class Y | builtin-class type | ControlFlowNode for ClassExpr |
 | test.py | 16 | ControlFlowNode for moduleX | Module package.moduleX | builtin-class module | Entry node for Module package.moduleX |
-| test.py | 19 | ControlFlowNode for ImportExpr | Module tty | builtin-class module | ControlFlowNode for ImportExpr |
-| test.py | 19 | ControlFlowNode for tty | Module tty | builtin-class module | ControlFlowNode for ImportExpr |
 | test.py | 22 | ControlFlowNode for Attribute | Builtin-function exc_info | builtin-class builtin_function_or_method | ControlFlowNode for from sys import * |
 | test.py | 22 | ControlFlowNode for x | Module package.x | builtin-class module | Entry node for Module package.x |
 | test.py | 24 | ControlFlowNode for IntegerLiteral | int 0 | builtin-class int | ControlFlowNode for IntegerLiteral |
 | test.py | 24 | ControlFlowNode for argv | int 0 | builtin-class int | ControlFlowNode for IntegerLiteral |
 | test.py | 27 | ControlFlowNode for ImportExpr | Module sys | builtin-class module | ControlFlowNode for ImportExpr |
 | test.py | 31 | ControlFlowNode for argv | list object | builtin-class list | ControlFlowNode for from sys import * |
-| test.py | 33 | ControlFlowNode for ImportExpr | Module socket | builtin-class module | ControlFlowNode for ImportExpr |
-| test.py | 34 | ControlFlowNode for timeout | builtin-class socket.timeout | builtin-class type | ControlFlowNode for from _socket import * |
 | x.py | 2 | ControlFlowNode for ImportExpr | Module sys | builtin-class module | ControlFlowNode for ImportExpr |
diff --git a/python/ql/test/2/library-tests/six/pointsto.expected b/python/ql/test/2/library-tests/six/pointsto.expected
index ca063a000e3..1d2e4e7f74e 100644
--- a/python/ql/test/2/library-tests/six/pointsto.expected
+++ b/python/ql/test/2/library-tests/six/pointsto.expected
@@ -1,7 +1,7 @@
 | six | Package six |
 | six.moves | Package six.moves |
-| six.moves.http_client | Module httplib |
-| six.moves.http_client.HTTPConnection | class HTTPConnection |
+| six.moves.http_client | Missing module httplib |
+| six.moves.http_client.HTTPConnection | Missing module attribute httplib.HTTPConnection |
 | six.moves.range | builtin-class xrange |
 | six.moves.urllib | Package six.moves.urllib |
 | six.moves.urllib.parse | Module six.moves.urllib_parse |
diff --git a/python/ql/test/2/query-tests/Summary/LinesOfCode.expected b/python/ql/test/2/query-tests/Summary/LinesOfCode.expected
index 5aa95ec1ce5..74c7709367a 100644
--- a/python/ql/test/2/query-tests/Summary/LinesOfCode.expected
+++ b/python/ql/test/2/query-tests/Summary/LinesOfCode.expected
@@ -1 +1 @@
-| 38 |
+| 11 |
diff --git a/python/ql/test/3/library-tests/PointsTo/class_properties/ClassValues.expected b/python/ql/test/3/library-tests/PointsTo/class_properties/ClassValues.expected
index 537882af86f..2c6a1590964 100644
--- a/python/ql/test/3/library-tests/PointsTo/class_properties/ClassValues.expected
+++ b/python/ql/test/3/library-tests/PointsTo/class_properties/ClassValues.expected
@@ -1,9 +1,6 @@
-| mapping | builtin-class collections.OrderedDict |
-| mapping | builtin-class collections.defaultdict |
 | mapping | builtin-class dict |
 | mapping | class MyDictSubclass |
 | mapping | class MyMappingABC |
-| mapping | class OrderedDict |
 | neither sequence nor mapping | builtin-class set |
 | sequence | builtin-class bytes |
 | sequence | builtin-class list |
diff --git a/python/ql/test/3/library-tests/PointsTo/imports/Runtime.expected b/python/ql/test/3/library-tests/PointsTo/imports/Runtime.expected
index f1dcc270a3e..fe825523ca2 100644
--- a/python/ql/test/3/library-tests/PointsTo/imports/Runtime.expected
+++ b/python/ql/test/3/library-tests/PointsTo/imports/Runtime.expected
@@ -44,14 +44,10 @@
 | test.py | 15 | ControlFlowNode for moduleX | Module package.moduleX | Entry node for Module package.moduleX |
 | test.py | 16 | ControlFlowNode for Attribute | class Y | ControlFlowNode for ClassExpr |
 | test.py | 16 | ControlFlowNode for moduleX | Module package.moduleX | Entry node for Module package.moduleX |
-| test.py | 19 | ControlFlowNode for ImportExpr | Module tty | ControlFlowNode for ImportExpr |
-| test.py | 19 | ControlFlowNode for tty | Module tty | ControlFlowNode for ImportExpr |
 | test.py | 22 | ControlFlowNode for Attribute | Builtin-function exc_info | ControlFlowNode for from sys import * |
 | test.py | 22 | ControlFlowNode for x | Module package.x | Entry node for Module package.x |
 | test.py | 24 | ControlFlowNode for IntegerLiteral | int 0 | ControlFlowNode for IntegerLiteral |
 | test.py | 24 | ControlFlowNode for argv | int 0 | ControlFlowNode for IntegerLiteral |
 | test.py | 27 | ControlFlowNode for ImportExpr | Module sys | ControlFlowNode for ImportExpr |
 | test.py | 31 | ControlFlowNode for argv | list object | ControlFlowNode for from sys import * |
-| test.py | 33 | ControlFlowNode for ImportExpr | Module socket | ControlFlowNode for ImportExpr |
-| test.py | 34 | ControlFlowNode for timeout | builtin-class TimeoutError | ControlFlowNode for from _socket import * |
 | x.py | 2 | ControlFlowNode for ImportExpr | Module sys | ControlFlowNode for ImportExpr |
diff --git a/python/ql/test/3/library-tests/PointsTo/imports/RuntimeWithType.expected b/python/ql/test/3/library-tests/PointsTo/imports/RuntimeWithType.expected
index 60cc3c6b52d..e55d70d073d 100644
--- a/python/ql/test/3/library-tests/PointsTo/imports/RuntimeWithType.expected
+++ b/python/ql/test/3/library-tests/PointsTo/imports/RuntimeWithType.expected
@@ -44,14 +44,10 @@
 | test.py | 15 | ControlFlowNode for moduleX | Module package.moduleX | builtin-class module | Entry node for Module package.moduleX |
 | test.py | 16 | ControlFlowNode for Attribute | class Y | builtin-class type | ControlFlowNode for ClassExpr |
 | test.py | 16 | ControlFlowNode for moduleX | Module package.moduleX | builtin-class module | Entry node for Module package.moduleX |
-| test.py | 19 | ControlFlowNode for ImportExpr | Module tty | builtin-class module | ControlFlowNode for ImportExpr |
-| test.py | 19 | ControlFlowNode for tty | Module tty | builtin-class module | ControlFlowNode for ImportExpr |
 | test.py | 22 | ControlFlowNode for Attribute | Builtin-function exc_info | builtin-class builtin_function_or_method | ControlFlowNode for from sys import * |
 | test.py | 22 | ControlFlowNode for x | Module package.x | builtin-class module | Entry node for Module package.x |
 | test.py | 24 | ControlFlowNode for IntegerLiteral | int 0 | builtin-class int | ControlFlowNode for IntegerLiteral |
 | test.py | 24 | ControlFlowNode for argv | int 0 | builtin-class int | ControlFlowNode for IntegerLiteral |
 | test.py | 27 | ControlFlowNode for ImportExpr | Module sys | builtin-class module | ControlFlowNode for ImportExpr |
 | test.py | 31 | ControlFlowNode for argv | list object | builtin-class list | ControlFlowNode for from sys import * |
-| test.py | 33 | ControlFlowNode for ImportExpr | Module socket | builtin-class module | ControlFlowNode for ImportExpr |
-| test.py | 34 | ControlFlowNode for timeout | builtin-class TimeoutError | builtin-class type | ControlFlowNode for from _socket import * |
 | x.py | 2 | ControlFlowNode for ImportExpr | Module sys | builtin-class module | ControlFlowNode for ImportExpr |
diff --git a/python/ql/test/3/library-tests/PointsTo/regressions/subprocess-assert/ClassValue.expected b/python/ql/test/3/library-tests/PointsTo/regressions/subprocess-assert/ClassValue.expected
index 1c02b5ee6c6..ef899d04d79 100644
--- a/python/ql/test/3/library-tests/PointsTo/regressions/subprocess-assert/ClassValue.expected
+++ b/python/ql/test/3/library-tests/PointsTo/regressions/subprocess-assert/ClassValue.expected
@@ -1,3 +1,3 @@
-| mwe_failure.py:7:1:7:23 | class MyTest | <MISSING BASE TYPE> |
-| mwe_failure_2.py:7:1:7:23 | class MyTest | <MISSING BASE TYPE> |
+| mwe_failure.py:7:1:7:23 | class MyTest | class TestCase |
+| mwe_failure_2.py:7:1:7:23 | class MyTest | class TestCase |
 | mwe_success.py:7:1:7:23 | class MyTest | class TestCase |
diff --git a/python/ql/test/3/library-tests/modules/general/moduleobject_test.expected b/python/ql/test/3/library-tests/modules/general/moduleobject_test.expected
index eed40d8d932..53f645c9a9e 100644
--- a/python/ql/test/3/library-tests/modules/general/moduleobject_test.expected
+++ b/python/ql/test/3/library-tests/modules/general/moduleobject_test.expected
@@ -37,7 +37,6 @@
 | Module package.assistant | e | Wrong() |
 | Module package.assistant | f | int 1 |
 | Module package.helper | __name__ | str u'package.helper' |
-| Module package.helper | absolute_import | _Feature() |
 | Module package.helper | assistant | Module package.assistant |
 | Module package.helper | d | int 4 |
 | Module package.helper | e | int 5 |
diff --git a/python/ql/test/3/library-tests/six/pointsto.expected b/python/ql/test/3/library-tests/six/pointsto.expected
index 83f61848b7c..85a50cad808 100644
--- a/python/ql/test/3/library-tests/six/pointsto.expected
+++ b/python/ql/test/3/library-tests/six/pointsto.expected
@@ -1,7 +1,7 @@
 | six | Package six |
 | six.moves | Package six.moves |
-| six.moves.http_client | Module http.client |
-| six.moves.http_client.HTTPConnection | class HTTPConnection |
+| six.moves.http_client | Missing module http.client |
+| six.moves.http_client.HTTPConnection | Missing module attribute http.client.HTTPConnection |
 | six.moves.range | builtin-class range |
 | six.moves.urllib | Package six.moves.urllib |
 | six.moves.urllib.parse | Module six.moves.urllib_parse |
diff --git a/python/ql/test/3/query-tests/Summary/LinesOfCode.expected b/python/ql/test/3/query-tests/Summary/LinesOfCode.expected
index 183d68cab22..74c7709367a 100644
--- a/python/ql/test/3/query-tests/Summary/LinesOfCode.expected
+++ b/python/ql/test/3/query-tests/Summary/LinesOfCode.expected
@@ -1 +1 @@
-| 51 |
+| 11 |
diff --git a/python/ql/test/3/query-tests/Variables/undefined/UndefinedExport.expected b/python/ql/test/3/query-tests/Variables/undefined/UndefinedExport.expected
index 2b1ef223673..6bd8188ed3d 100644
--- a/python/ql/test/3/query-tests/Variables/undefined/UndefinedExport.expected
+++ b/python/ql/test/3/query-tests/Variables/undefined/UndefinedExport.expected
@@ -1,4 +1,6 @@
 | UndefinedExport.py:3:18:3:20 | StringLiteral | The name 'y' is exported by __all__ but is not defined. |
 | UndefinedExport.py:3:23:3:25 | StringLiteral | The name 'z' is exported by __all__ but is not defined. |
 | UndefinedExport.py:3:28:3:35 | StringLiteral | The name 'module' is exported by __all__ but is not defined. |
+| enum_convert.py:8:13:8:19 | StringLiteral | The name 'Maybe' is exported by __all__ but is not defined. |
+| enum_convert.py:8:22:8:32 | StringLiteral | The name 'Maybe_not' is exported by __all__ but is not defined. |
 | package/__init__.py:1:23:1:34 | StringLiteral | The name 'not_exists' is exported by __all__ but is not defined. |
diff --git a/python/ql/test/TestUtilities/InlineExpectationsTest.qll b/python/ql/test/TestUtilities/InlineExpectationsTest.qll
index 40ed5d47efb..ad671cbef39 100644
--- a/python/ql/test/TestUtilities/InlineExpectationsTest.qll
+++ b/python/ql/test/TestUtilities/InlineExpectationsTest.qll
@@ -5,15 +5,5 @@
 
 private import python as PY
 private import codeql.util.test.InlineExpectationsTest
-
-private module Impl implements InlineExpectationsTestSig {
-  /**
-   * A class representing line comments in Python. As this is the only form of comment Python
-   * permits, we simply reuse the `Comment` class.
-   */
-  class ExpectationComment = PY::Comment;
-
-  class Location = PY::Location;
-}
-
+private import internal.InlineExpectationsTestImpl
 import Make<Impl>
diff --git a/python/ql/test/TestUtilities/InlineExpectationsTestQuery.ql b/python/ql/test/TestUtilities/InlineExpectationsTestQuery.ql
new file mode 100644
index 00000000000..9ce5fdf326c
--- /dev/null
+++ b/python/ql/test/TestUtilities/InlineExpectationsTestQuery.ql
@@ -0,0 +1,21 @@
+/**
+ * @kind test-postprocess
+ */
+
+private import python
+private import codeql.util.test.InlineExpectationsTest as T
+private import internal.InlineExpectationsTestImpl
+import T::TestPostProcessing
+import T::TestPostProcessing::Make<Impl, Input>
+
+private module Input implements T::TestPostProcessing::InputSig<Impl> {
+  string getRelativeUrl(Location location) {
+    exists(File f, int startline, int startcolumn, int endline, int endcolumn |
+      location.hasLocationInfo(_, startline, startcolumn, endline, endcolumn) and
+      f = location.getFile()
+    |
+      result =
+        f.getRelativePath() + ":" + startline + ":" + startcolumn + ":" + endline + ":" + endcolumn
+    )
+  }
+}
diff --git a/python/ql/test/TestUtilities/internal/InlineExpectationsTestImpl.qll b/python/ql/test/TestUtilities/internal/InlineExpectationsTestImpl.qll
new file mode 100644
index 00000000000..ea8faaeeae3
--- /dev/null
+++ b/python/ql/test/TestUtilities/internal/InlineExpectationsTestImpl.qll
@@ -0,0 +1,12 @@
+private import python as PY
+private import codeql.util.test.InlineExpectationsTest
+
+module Impl implements InlineExpectationsTestSig {
+  /**
+   * A class representing line comments in Python. As this is the only form of comment Python
+   * permits, we simply reuse the `Comment` class.
+   */
+  class ExpectationComment = PY::Comment;
+
+  class Location = PY::Location;
+}
diff --git a/python/ql/test/experimental/library-tests/CallGraph/InlineCallGraphTest.ql b/python/ql/test/experimental/library-tests/CallGraph/InlineCallGraphTest.ql
index 1f2b37168b7..8c47bacfb88 100644
--- a/python/ql/test/experimental/library-tests/CallGraph/InlineCallGraphTest.ql
+++ b/python/ql/test/experimental/library-tests/CallGraph/InlineCallGraphTest.ql
@@ -31,10 +31,7 @@ predicate typeTrackerCallEdge(CallNode call, Function callable) {
 predicate typeTrackerClassCall(CallNode call, Function callable) {
   exists(call.getLocation().getFile().getRelativePath()) and
   exists(callable.getLocation().getFile().getRelativePath()) and
-  exists(TT::NormalCall cc |
-    cc = TT::TNormalCall(call, _, any(TT::TCallType t | t instanceof TT::CallTypeClass)) and
-    TT::TFunction(callable) = TT::viableCallable(cc)
-  )
+  TT::resolveCall(call, callable, any(TT::TCallType t | t instanceof TT::CallTypeClass))
 }
 
 module CallGraphTest implements TestSig {
@@ -65,7 +62,7 @@ string getCallEdgeValue(CallNode call, Function target) {
   else
     exists(string fixedRelativePath |
       fixedRelativePath =
-        target.getLocation().getFile().getRelativePath().regexpCapture(".*/CallGraph[^/]*/(.*)", 1)
+        target.getLocation().getFile().getAbsolutePath().regexpCapture(".*/CallGraph[^/]*/(.*)", 1)
     |
       // the value needs to be enclosed in quotes to allow special characters
       result = "\"" + fixedRelativePath + ":" + betterQualName(target) + "\""
diff --git a/python/ql/test/experimental/meta/ConceptsTest.qll b/python/ql/test/experimental/meta/ConceptsTest.qll
index a53171de88a..8ab87e56d1c 100644
--- a/python/ql/test/experimental/meta/ConceptsTest.qll
+++ b/python/ql/test/experimental/meta/ConceptsTest.qll
@@ -3,6 +3,7 @@ import semmle.python.dataflow.new.DataFlow
 import semmle.python.Concepts
 import TestUtilities.InlineExpectationsTest
 private import semmle.python.dataflow.new.internal.PrintNode
+private import codeql.threatmodels.ThreatModels
 
 module SystemCommandExecutionTest implements TestSig {
   string getARelevantTag() { result = "getCommand" }
@@ -632,14 +633,44 @@ module XmlParsingTest implements TestSig {
   }
 }
 
+module ThreatModelSourceTest implements TestSig {
+  string getARelevantTag() {
+    exists(string kind | knownThreatModel(kind) | result = "threatModelSource" + "[" + kind + "]")
+  }
+
+  predicate hasActualResult(Location location, string element, string tag, string value) {
+    exists(location.getFile().getRelativePath()) and
+    exists(ThreatModelSource src | not src.getThreatModel() = "remote" |
+      location = src.getLocation() and
+      element = src.toString() and
+      value = prettyNodeForInlineTest(src) and
+      tag = "threatModelSource[" + src.getThreatModel() + "]"
+    )
+  }
+}
+
+module CorsMiddlewareTest implements TestSig {
+  string getARelevantTag() { result = "CorsMiddleware" }
+
+  predicate hasActualResult(Location location, string element, string tag, string value) {
+    exists(location.getFile().getRelativePath()) and
+    exists(Http::Server::CorsMiddleware cm |
+      location = cm.getLocation() and
+      element = cm.toString() and
+      value = cm.getMiddlewareName().toString() and
+      tag = "CorsMiddleware"
+    )
+  }
+}
+
 import MakeTest<MergeTests5<MergeTests5<SystemCommandExecutionTest, DecodingTest, EncodingTest, LoggingTest,
     CodeExecutionTest>,
   MergeTests5<SqlConstructionTest, SqlExecutionTest, XPathConstructionTest, XPathExecutionTest,
     EscapingTest>,
   MergeTests5<HttpServerRouteSetupTest, HttpServerRequestHandlerTest, HttpServerHttpResponseTest,
     HttpServerHttpRedirectResponseTest,
-    MergeTests<HttpServerCookieWriteTest, HttpResponseHeaderWriteTest>>,
+    MergeTests3<HttpServerCookieWriteTest, HttpResponseHeaderWriteTest, CorsMiddlewareTest>>,
   MergeTests5<FileSystemAccessTest, FileSystemWriteAccessTest, PathNormalizationTest,
     SafeAccessCheckTest, PublicKeyGenerationTest>,
   MergeTests5<CryptographicOperationTest, HttpClientRequestTest, CsrfProtectionSettingTest,
-    CsrfLocalProtectionSettingTest, XmlParsingTest>>>
+    CsrfLocalProtectionSettingTest, MergeTests<XmlParsingTest, ThreatModelSourceTest>>>>
diff --git a/python/ql/test/experimental/meta/InlineTaintTest.qll b/python/ql/test/experimental/meta/InlineTaintTest.qll
index 24f67bcf2a4..a09cc9aabc1 100644
--- a/python/ql/test/experimental/meta/InlineTaintTest.qll
+++ b/python/ql/test/experimental/meta/InlineTaintTest.qll
@@ -15,6 +15,7 @@ import semmle.python.dataflow.new.TaintTracking
 import semmle.python.dataflow.new.RemoteFlowSources
 import TestUtilities.InlineExpectationsTest
 private import semmle.python.dataflow.new.internal.PrintNode
+private import semmle.python.Concepts
 
 DataFlow::Node shouldBeTainted() {
   exists(DataFlow::CallCfgNode call |
@@ -45,7 +46,7 @@ module Conf {
         source.(DataFlow::CfgNode).getNode() = call.getAnArg()
       )
       or
-      source instanceof RemoteFlowSource
+      source instanceof ThreatModelSource
     }
 
     predicate isSink(DataFlow::Node sink) {
diff --git a/python/ql/test/experimental/meta/inline-taint-test-demo/InlineTaintTest.expected b/python/ql/test/experimental/meta/inline-taint-test-demo/InlineTaintTest.expected
index b4d2d9c606e..e0ad49ff807 100644
--- a/python/ql/test/experimental/meta/inline-taint-test-demo/InlineTaintTest.expected
+++ b/python/ql/test/experimental/meta/inline-taint-test-demo/InlineTaintTest.expected
@@ -4,5 +4,5 @@ untaintedArgumentToEnsureTaintedNotMarkedAsMissing
 | taint_test.py:32:9:32:25 | taint_test.py:32 | ERROR, you should add `# $ MISSING: tainted` annotation | should_be_tainted |
 | taint_test.py:37:24:37:40 | taint_test.py:37 | ERROR, you should add `# $ MISSING: tainted` annotation | should_be_tainted |
 testFailures
-| taint_test.py:41:20:41:21 | ts | Fixed missing result:tainted= |
+| taint_test.py:41:20:41:21 | ts | Fixed missing result: tainted |
 failures
diff --git a/python/ql/test/experimental/query-tests/Security/CWE-022-TarSlip/TarSlip.expected b/python/ql/test/experimental/query-tests/Security/CWE-022-TarSlip/TarSlip.expected
index 664807d623d..97527c300db 100644
--- a/python/ql/test/experimental/query-tests/Security/CWE-022-TarSlip/TarSlip.expected
+++ b/python/ql/test/experimental/query-tests/Security/CWE-022-TarSlip/TarSlip.expected
@@ -34,7 +34,9 @@ edges
 | TarSlipImprov.py:142:9:142:13 | ControlFlowNode for entry | TarSlipImprov.py:143:36:143:40 | ControlFlowNode for entry | provenance |  |
 | TarSlipImprov.py:151:14:151:50 | ControlFlowNode for closing() | TarSlipImprov.py:151:55:151:56 | ControlFlowNode for tf | provenance |  |
 | TarSlipImprov.py:151:22:151:49 | ControlFlowNode for Attribute() | TarSlipImprov.py:151:14:151:50 | ControlFlowNode for closing() | provenance | Config |
+| TarSlipImprov.py:151:55:151:56 | ControlFlowNode for tf | TarSlipImprov.py:152:13:152:20 | ControlFlowNode for Yield | provenance |  |
 | TarSlipImprov.py:151:55:151:56 | ControlFlowNode for tf | TarSlipImprov.py:152:19:152:20 | ControlFlowNode for tf | provenance |  |
+| TarSlipImprov.py:152:13:152:20 | ControlFlowNode for Yield | TarSlipImprov.py:157:18:157:40 | ControlFlowNode for py2_tarxz() | provenance |  |
 | TarSlipImprov.py:152:19:152:20 | ControlFlowNode for tf | TarSlipImprov.py:157:18:157:40 | ControlFlowNode for py2_tarxz() | provenance |  |
 | TarSlipImprov.py:157:9:157:14 | ControlFlowNode for tar_cm | TarSlipImprov.py:162:20:162:23 | ControlFlowNode for tarc | provenance |  |
 | TarSlipImprov.py:157:18:157:40 | ControlFlowNode for py2_tarxz() | TarSlipImprov.py:157:9:157:14 | ControlFlowNode for tar_cm | provenance |  |
@@ -131,6 +133,7 @@ nodes
 | TarSlipImprov.py:151:14:151:50 | ControlFlowNode for closing() | semmle.label | ControlFlowNode for closing() |
 | TarSlipImprov.py:151:22:151:49 | ControlFlowNode for Attribute() | semmle.label | ControlFlowNode for Attribute() |
 | TarSlipImprov.py:151:55:151:56 | ControlFlowNode for tf | semmle.label | ControlFlowNode for tf |
+| TarSlipImprov.py:152:13:152:20 | ControlFlowNode for Yield | semmle.label | ControlFlowNode for Yield |
 | TarSlipImprov.py:152:19:152:20 | ControlFlowNode for tf | semmle.label | ControlFlowNode for tf |
 | TarSlipImprov.py:157:9:157:14 | ControlFlowNode for tar_cm | semmle.label | ControlFlowNode for tar_cm |
 | TarSlipImprov.py:157:18:157:40 | ControlFlowNode for py2_tarxz() | semmle.label | ControlFlowNode for py2_tarxz() |
diff --git a/python/ql/test/experimental/query-tests/Security/CWE-022-UnsafeUnpacking/UnsafeUnpack.expected b/python/ql/test/experimental/query-tests/Security/CWE-022-UnsafeUnpacking/UnsafeUnpack.expected
index ca4d7ebafff..0f334d45ea8 100644
--- a/python/ql/test/experimental/query-tests/Security/CWE-022-UnsafeUnpacking/UnsafeUnpack.expected
+++ b/python/ql/test/experimental/query-tests/Security/CWE-022-UnsafeUnpacking/UnsafeUnpack.expected
@@ -75,6 +75,7 @@ edges
 | UnsafeUnpack.py:161:19:161:21 | ControlFlowNode for tar | UnsafeUnpack.py:163:33:163:35 | ControlFlowNode for tar | provenance |  |
 | UnsafeUnpack.py:161:25:161:46 | ControlFlowNode for Attribute() | UnsafeUnpack.py:161:19:161:21 | ControlFlowNode for tar | provenance |  |
 | UnsafeUnpack.py:161:38:161:45 | ControlFlowNode for savepath | UnsafeUnpack.py:161:25:161:46 | ControlFlowNode for Attribute() | provenance | Config |
+| UnsafeUnpack.py:161:38:161:45 | ControlFlowNode for savepath | UnsafeUnpack.py:161:25:161:46 | ControlFlowNode for Attribute() | provenance | MaD:69 |
 | UnsafeUnpack.py:163:23:163:28 | ControlFlowNode for member | UnsafeUnpack.py:166:37:166:42 | ControlFlowNode for member | provenance |  |
 | UnsafeUnpack.py:163:33:163:35 | ControlFlowNode for tar | UnsafeUnpack.py:163:23:163:28 | ControlFlowNode for member | provenance |  |
 | UnsafeUnpack.py:166:23:166:28 | [post] ControlFlowNode for result | UnsafeUnpack.py:167:67:167:72 | ControlFlowNode for result | provenance |  |
diff --git a/python/ql/test/experimental/query-tests/Security/CWE-409/DecompressionBombs.expected b/python/ql/test/experimental/query-tests/Security/CWE-409/DecompressionBombs.expected
index 5689deb01a0..12d1b8282c7 100644
--- a/python/ql/test/experimental/query-tests/Security/CWE-409/DecompressionBombs.expected
+++ b/python/ql/test/experimental/query-tests/Security/CWE-409/DecompressionBombs.expected
@@ -1,13 +1,23 @@
 edges
 | test.py:10:16:10:24 | ControlFlowNode for file_path | test.py:11:21:11:29 | ControlFlowNode for file_path | provenance |  |
+| test.py:11:5:11:35 | ControlFlowNode for Attribute() | test.py:11:5:11:52 | ControlFlowNode for Attribute() | provenance | Config |
+| test.py:11:21:11:29 | ControlFlowNode for file_path | test.py:11:5:11:35 | ControlFlowNode for Attribute() | provenance | MaD:85 |
 | test.py:11:21:11:29 | ControlFlowNode for file_path | test.py:11:5:11:52 | ControlFlowNode for Attribute() | provenance | Config |
 | test.py:11:21:11:29 | ControlFlowNode for file_path | test.py:12:21:12:29 | ControlFlowNode for file_path | provenance |  |
+| test.py:12:5:12:35 | ControlFlowNode for Attribute() | test.py:12:5:12:48 | ControlFlowNode for Attribute() | provenance | Config |
+| test.py:12:21:12:29 | ControlFlowNode for file_path | test.py:12:5:12:35 | ControlFlowNode for Attribute() | provenance | MaD:85 |
 | test.py:12:21:12:29 | ControlFlowNode for file_path | test.py:12:5:12:48 | ControlFlowNode for Attribute() | provenance | Config |
 | test.py:12:21:12:29 | ControlFlowNode for file_path | test.py:14:26:14:34 | ControlFlowNode for file_path | provenance |  |
+| test.py:14:10:14:35 | ControlFlowNode for Attribute() | test.py:15:14:15:29 | ControlFlowNode for Attribute() | provenance | Config |
+| test.py:14:26:14:34 | ControlFlowNode for file_path | test.py:14:10:14:35 | ControlFlowNode for Attribute() | provenance | MaD:85 |
 | test.py:14:26:14:34 | ControlFlowNode for file_path | test.py:15:14:15:29 | ControlFlowNode for Attribute() | provenance | Config |
 | test.py:14:26:14:34 | ControlFlowNode for file_path | test.py:18:26:18:34 | ControlFlowNode for file_path | provenance |  |
+| test.py:18:10:18:35 | ControlFlowNode for Attribute() | test.py:19:14:19:39 | ControlFlowNode for Attribute() | provenance | Config |
+| test.py:18:26:18:34 | ControlFlowNode for file_path | test.py:18:10:18:35 | ControlFlowNode for Attribute() | provenance | MaD:85 |
 | test.py:18:26:18:34 | ControlFlowNode for file_path | test.py:19:14:19:39 | ControlFlowNode for Attribute() | provenance | Config |
 | test.py:18:26:18:34 | ControlFlowNode for file_path | test.py:22:21:22:29 | ControlFlowNode for file_path | provenance |  |
+| test.py:22:5:22:30 | ControlFlowNode for Attribute() | test.py:22:5:22:60 | ControlFlowNode for Attribute() | provenance | Config |
+| test.py:22:21:22:29 | ControlFlowNode for file_path | test.py:22:5:22:30 | ControlFlowNode for Attribute() | provenance | MaD:85 |
 | test.py:22:21:22:29 | ControlFlowNode for file_path | test.py:22:5:22:60 | ControlFlowNode for Attribute() | provenance | Config |
 | test.py:22:21:22:29 | ControlFlowNode for file_path | test.py:24:18:24:26 | ControlFlowNode for file_path | provenance |  |
 | test.py:24:18:24:26 | ControlFlowNode for file_path | test.py:24:5:24:52 | ControlFlowNode for Attribute() | provenance | Config |
@@ -37,14 +47,19 @@ edges
 | test.py:28:26:28:34 | ControlFlowNode for file_path | test.py:64:36:64:44 | ControlFlowNode for file_path | provenance |  |
 nodes
 | test.py:10:16:10:24 | ControlFlowNode for file_path | semmle.label | ControlFlowNode for file_path |
+| test.py:11:5:11:35 | ControlFlowNode for Attribute() | semmle.label | ControlFlowNode for Attribute() |
 | test.py:11:5:11:52 | ControlFlowNode for Attribute() | semmle.label | ControlFlowNode for Attribute() |
 | test.py:11:21:11:29 | ControlFlowNode for file_path | semmle.label | ControlFlowNode for file_path |
+| test.py:12:5:12:35 | ControlFlowNode for Attribute() | semmle.label | ControlFlowNode for Attribute() |
 | test.py:12:5:12:48 | ControlFlowNode for Attribute() | semmle.label | ControlFlowNode for Attribute() |
 | test.py:12:21:12:29 | ControlFlowNode for file_path | semmle.label | ControlFlowNode for file_path |
+| test.py:14:10:14:35 | ControlFlowNode for Attribute() | semmle.label | ControlFlowNode for Attribute() |
 | test.py:14:26:14:34 | ControlFlowNode for file_path | semmle.label | ControlFlowNode for file_path |
 | test.py:15:14:15:29 | ControlFlowNode for Attribute() | semmle.label | ControlFlowNode for Attribute() |
+| test.py:18:10:18:35 | ControlFlowNode for Attribute() | semmle.label | ControlFlowNode for Attribute() |
 | test.py:18:26:18:34 | ControlFlowNode for file_path | semmle.label | ControlFlowNode for file_path |
 | test.py:19:14:19:39 | ControlFlowNode for Attribute() | semmle.label | ControlFlowNode for Attribute() |
+| test.py:22:5:22:30 | ControlFlowNode for Attribute() | semmle.label | ControlFlowNode for Attribute() |
 | test.py:22:5:22:60 | ControlFlowNode for Attribute() | semmle.label | ControlFlowNode for Attribute() |
 | test.py:22:21:22:29 | ControlFlowNode for file_path | semmle.label | ControlFlowNode for file_path |
 | test.py:24:5:24:52 | ControlFlowNode for Attribute() | semmle.label | ControlFlowNode for Attribute() |
diff --git a/python/ql/test/extractor-tests/flags/Flags.expected b/python/ql/test/extractor-tests/flags/Flags.expected
index 380cf9a0824..eeb4db916e7 100644
--- a/python/ql/test/extractor-tests/flags/Flags.expected
+++ b/python/ql/test/extractor-tests/flags/Flags.expected
@@ -1,7 +1,7 @@
 | options.all | False |
 | options.colorize | True |
 | options.context_cost | 11 |
-| options.extract_stdlib | True |
+| options.extract_stdlib | False |
 | options.guess | False |
 | options.help | False |
 | options.ignore_missing_modules | False |
diff --git a/python/ql/test/library-tests/PointsTo/decorators/Test.expected b/python/ql/test/library-tests/PointsTo/decorators/Test.expected
index 4352b429ca0..4e465134ef6 100644
--- a/python/ql/test/library-tests/PointsTo/decorators/Test.expected
+++ b/python/ql/test/library-tests/PointsTo/decorators/Test.expected
@@ -1,4 +1,3 @@
-| 1 | ControlFlowNode for functools | Module functools | test.py:1 |
 | 3 | ControlFlowNode for annotate | Function annotate | test.py:3 |
 | 4 | ControlFlowNode for inner | Function inner | test.py:4 |
 | 5 | ControlFlowNode for func | Function func1 | test.py:23 |
@@ -11,7 +10,6 @@
 | 13 | ControlFlowNode for wrapper | Function wrapper | test.py:10 |
 | 15 | ControlFlowNode for wraps2 | Function wraps2 | test.py:15 |
 | 16 | ControlFlowNode for func | Function func3 | test.py:31 |
-| 16 | ControlFlowNode for functools | Module functools | test.py:1 |
 | 17 | ControlFlowNode for args | args | test.py:17 |
 | 17 | ControlFlowNode for wrapper | Attribute()() | test.py:16 |
 | 18 | ControlFlowNode for args | args | test.py:17 |
diff --git a/python/ql/test/library-tests/PointsTo/decorators/Values.expected b/python/ql/test/library-tests/PointsTo/decorators/Values.expected
index d9887d944f1..c63ec2d22cc 100644
--- a/python/ql/test/library-tests/PointsTo/decorators/Values.expected
+++ b/python/ql/test/library-tests/PointsTo/decorators/Values.expected
@@ -7,8 +7,8 @@
 | test.py:11:21:11:24 | ControlFlowNode for args | runtime | instance of tuple |
 | test.py:13:12:13:18 | ControlFlowNode for wrapper | runtime | Function wraps1.wrapper |
 | test.py:13:12:13:18 | ControlFlowNode for wrapper | test.py:26 from import | Function wraps1.wrapper |
-| test.py:16:6:16:14 | ControlFlowNode for functools | runtime | Module functools |
-| test.py:16:6:16:14 | ControlFlowNode for functools | test.py:30 from import | Module functools |
+| test.py:16:6:16:14 | ControlFlowNode for functools | runtime | Missing module functools |
+| test.py:16:6:16:14 | ControlFlowNode for functools | test.py:30 from import | Missing module functools |
 | test.py:16:22:16:25 | ControlFlowNode for func | runtime | Unknown value |
 | test.py:16:22:16:25 | ControlFlowNode for func | test.py:30 from import | Function func3 |
 | test.py:18:21:18:24 | ControlFlowNode for args | runtime | instance of tuple |
diff --git a/python/ql/test/library-tests/PointsTo/general/GlobalPointsTo.expected b/python/ql/test/library-tests/PointsTo/general/GlobalPointsTo.expected
index 9040788529a..85c8304b58a 100644
--- a/python/ql/test/library-tests/PointsTo/general/GlobalPointsTo.expected
+++ b/python/ql/test/library-tests/PointsTo/general/GlobalPointsTo.expected
@@ -87,10 +87,6 @@
 | Module pointsto_test | 69 | ControlFlowNode for X | class X |
 | Module pointsto_test | 70 | ControlFlowNode for Attribute | deco() |
 | Module pointsto_test | 70 | ControlFlowNode for X | class X |
-| Module pointsto_test | 72 | ControlFlowNode for ImportExpr | Module abc |
-| Module pointsto_test | 72 | ControlFlowNode for ImportMember | Function abstractmethod |
-| Module pointsto_test | 72 | ControlFlowNode for abstractmethod | Function abstractmethod |
-| Module pointsto_test | 73 | ControlFlowNode for abstractmethod | Function abstractmethod |
 | Module pointsto_test | 75 | ControlFlowNode for C | class C |
 | Module pointsto_test | 75 | ControlFlowNode for C() | C() |
 | Module pointsto_test | 75 | ControlFlowNode for type | builtin-class type |
diff --git a/python/ql/test/library-tests/PointsTo/general/LocalPointsTo.expected b/python/ql/test/library-tests/PointsTo/general/LocalPointsTo.expected
index b9494250615..fc4970a8c0c 100644
--- a/python/ql/test/library-tests/PointsTo/general/LocalPointsTo.expected
+++ b/python/ql/test/library-tests/PointsTo/general/LocalPointsTo.expected
@@ -95,10 +95,6 @@
 | 69 | ControlFlowNode for X | class X |
 | 70 | ControlFlowNode for Attribute | deco() |
 | 70 | ControlFlowNode for X | class X |
-| 72 | ControlFlowNode for ImportExpr | Module abc |
-| 72 | ControlFlowNode for ImportMember | Function abstractmethod |
-| 72 | ControlFlowNode for abstractmethod | Function abstractmethod |
-| 73 | ControlFlowNode for abstractmethod | Function abstractmethod |
 | 75 | ControlFlowNode for C | class C |
 | 75 | ControlFlowNode for C() | C() |
 | 75 | ControlFlowNode for type | builtin-class type |
diff --git a/python/ql/test/library-tests/PointsTo/general/LocalPointsToType.expected b/python/ql/test/library-tests/PointsTo/general/LocalPointsToType.expected
index 15f283ac4b9..92dde139cde 100644
--- a/python/ql/test/library-tests/PointsTo/general/LocalPointsToType.expected
+++ b/python/ql/test/library-tests/PointsTo/general/LocalPointsToType.expected
@@ -95,10 +95,6 @@
 | 69 | ControlFlowNode for Attribute | Attribute | builtin-class method |
 | 69 | ControlFlowNode for X | class X | builtin-class type |
 | 70 | ControlFlowNode for X | class X | builtin-class type |
-| 72 | ControlFlowNode for ImportExpr | Module abc | builtin-class module |
-| 72 | ControlFlowNode for ImportMember | Function abstractmethod | builtin-class function |
-| 72 | ControlFlowNode for abstractmethod | Function abstractmethod | builtin-class function |
-| 73 | ControlFlowNode for abstractmethod | Function abstractmethod | builtin-class function |
 | 75 | ControlFlowNode for C | class C | builtin-class type |
 | 75 | ControlFlowNode for C() | C() | class C |
 | 75 | ControlFlowNode for type | builtin-class type | builtin-class type |
diff --git a/python/ql/test/library-tests/PointsTo/guarded/PointsTo.expected b/python/ql/test/library-tests/PointsTo/guarded/PointsTo.expected
index b6872c3a4e6..8c83b21f782 100644
--- a/python/ql/test/library-tests/PointsTo/guarded/PointsTo.expected
+++ b/python/ql/test/library-tests/PointsTo/guarded/PointsTo.expected
@@ -70,7 +70,3 @@
 | type_test.py | 55 | ControlFlowNode for arg | class E | 29 |
 | type_test.py | 67 | ControlFlowNode for x | float 1.0 | 62 |
 | type_test.py | 67 | ControlFlowNode for x | int 0 | 62 |
-| type_test.py | 77 | ControlFlowNode for IntegerLiteral | int 0 | 77 |
-| type_test.py | 83 | ControlFlowNode for IntegerLiteral | int 0 | 83 |
-| type_test.py | 89 | ControlFlowNode for IntegerLiteral | int 0 | 89 |
-| type_test.py | 95 | ControlFlowNode for IntegerLiteral | int 0 | 95 |
diff --git a/python/ql/test/library-tests/PointsTo/guarded/PointsToWithType.expected b/python/ql/test/library-tests/PointsTo/guarded/PointsToWithType.expected
index 2f71fc6107b..9993b96d18a 100644
--- a/python/ql/test/library-tests/PointsTo/guarded/PointsToWithType.expected
+++ b/python/ql/test/library-tests/PointsTo/guarded/PointsToWithType.expected
@@ -70,7 +70,3 @@
 | type_test.py | 55 | ControlFlowNode for arg | class E | builtin-class type | 29 |
 | type_test.py | 67 | ControlFlowNode for x | float 1.0 | builtin-class float | 62 |
 | type_test.py | 67 | ControlFlowNode for x | int 0 | builtin-class int | 62 |
-| type_test.py | 77 | ControlFlowNode for IntegerLiteral | int 0 | builtin-class int | 77 |
-| type_test.py | 83 | ControlFlowNode for IntegerLiteral | int 0 | builtin-class int | 83 |
-| type_test.py | 89 | ControlFlowNode for IntegerLiteral | int 0 | builtin-class int | 89 |
-| type_test.py | 95 | ControlFlowNode for IntegerLiteral | int 0 | builtin-class int | 95 |
diff --git a/python/ql/test/library-tests/PointsTo/new/NameSpace.expected b/python/ql/test/library-tests/PointsTo/new/NameSpace.expected
index 6508ef5b13f..43f4158ba7f 100644
--- a/python/ql/test/library-tests/PointsTo/new/NameSpace.expected
+++ b/python/ql/test/library-tests/PointsTo/new/NameSpace.expected
@@ -85,15 +85,12 @@
 | h_classes.py:23 | Class Base | __init__ | Function __init__ |
 | h_classes.py:48 | Class D | m | Function f |
 | h_classes.py:48 | Class D | n | Function n |
-| i_imports.py:0 | Module code.i_imports | BytesIO | builtin-class _io.BytesIO |
-| i_imports.py:0 | Module code.i_imports | StringIO | builtin-class _io.StringIO |
 | i_imports.py:0 | Module code.i_imports | _io | Module _io |
 | i_imports.py:0 | Module code.i_imports | a | int 1 |
 | i_imports.py:0 | Module code.i_imports | argv | list object |
 | i_imports.py:0 | Module code.i_imports | b | int 2 |
 | i_imports.py:0 | Module code.i_imports | c | int 3 |
 | i_imports.py:0 | Module code.i_imports | code | Module code |
-| i_imports.py:0 | Module code.i_imports | io | Module io |
 | i_imports.py:0 | Module code.i_imports | module1 | Module code.test_package.module1 |
 | i_imports.py:0 | Module code.i_imports | module2 | Module code.test_package.module2 |
 | i_imports.py:0 | Module code.i_imports | p | int 1 |
diff --git a/python/ql/test/library-tests/PointsTo/new/PointsToWithContext.expected b/python/ql/test/library-tests/PointsTo/new/PointsToWithContext.expected
index cd1a08a4dac..04c794f49ad 100644
--- a/python/ql/test/library-tests/PointsTo/new/PointsToWithContext.expected
+++ b/python/ql/test/library-tests/PointsTo/new/PointsToWithContext.expected
@@ -475,14 +475,6 @@
 | i_imports.py:31 | ControlFlowNode for Attribute | builtin-class _io.BytesIO | builtin-class type | 31 | import |
 | i_imports.py:31 | ControlFlowNode for BytesIO | builtin-class _io.BytesIO | builtin-class type | 31 | import |
 | i_imports.py:31 | ControlFlowNode for _io | Module _io | builtin-class module | 29 | import |
-| i_imports.py:33 | ControlFlowNode for ImportExpr | Module io | builtin-class module | 33 | import |
-| i_imports.py:33 | ControlFlowNode for io | Module io | builtin-class module | 33 | import |
-| i_imports.py:34 | ControlFlowNode for Attribute | builtin-class _io.StringIO | builtin-class type | 55 | import |
-| i_imports.py:34 | ControlFlowNode for StringIO | builtin-class _io.StringIO | builtin-class type | 55 | import |
-| i_imports.py:34 | ControlFlowNode for io | Module io | builtin-class module | 33 | import |
-| i_imports.py:35 | ControlFlowNode for Attribute | builtin-class _io.BytesIO | builtin-class type | 55 | import |
-| i_imports.py:35 | ControlFlowNode for BytesIO | builtin-class _io.BytesIO | builtin-class type | 55 | import |
-| i_imports.py:35 | ControlFlowNode for io | Module io | builtin-class module | 33 | import |
 | i_imports.py:37 | ControlFlowNode for ImportExpr | Module code | builtin-class module | 37 | import |
 | i_imports.py:37 | ControlFlowNode for code | Module code | builtin-class module | 37 | import |
 | i_imports.py:38 | ControlFlowNode for Attribute | Function f2 | builtin-class function | 24 | import |
diff --git a/python/ql/test/library-tests/PointsTo/new/PointsToWithType.expected b/python/ql/test/library-tests/PointsTo/new/PointsToWithType.expected
index 783237edc9d..15e9081dd20 100644
--- a/python/ql/test/library-tests/PointsTo/new/PointsToWithType.expected
+++ b/python/ql/test/library-tests/PointsTo/new/PointsToWithType.expected
@@ -572,14 +572,6 @@
 | i_imports.py:31 | ControlFlowNode for Attribute | builtin-class _io.BytesIO | builtin-class type | 31 |
 | i_imports.py:31 | ControlFlowNode for BytesIO | builtin-class _io.BytesIO | builtin-class type | 31 |
 | i_imports.py:31 | ControlFlowNode for _io | Module _io | builtin-class module | 29 |
-| i_imports.py:33 | ControlFlowNode for ImportExpr | Module io | builtin-class module | 33 |
-| i_imports.py:33 | ControlFlowNode for io | Module io | builtin-class module | 33 |
-| i_imports.py:34 | ControlFlowNode for Attribute | builtin-class _io.StringIO | builtin-class type | 55 |
-| i_imports.py:34 | ControlFlowNode for StringIO | builtin-class _io.StringIO | builtin-class type | 55 |
-| i_imports.py:34 | ControlFlowNode for io | Module io | builtin-class module | 33 |
-| i_imports.py:35 | ControlFlowNode for Attribute | builtin-class _io.BytesIO | builtin-class type | 55 |
-| i_imports.py:35 | ControlFlowNode for BytesIO | builtin-class _io.BytesIO | builtin-class type | 55 |
-| i_imports.py:35 | ControlFlowNode for io | Module io | builtin-class module | 33 |
 | i_imports.py:37 | ControlFlowNode for ImportExpr | Module code | builtin-class module | 37 |
 | i_imports.py:37 | ControlFlowNode for code | Module code | builtin-class module | 37 |
 | i_imports.py:38 | ControlFlowNode for Attribute | Function f2 | builtin-class function | 24 |
diff --git a/python/ql/test/library-tests/PointsTo/new/Values.expected b/python/ql/test/library-tests/PointsTo/new/Values.expected
index 5466ca85445..396249f9b94 100644
--- a/python/ql/test/library-tests/PointsTo/new/Values.expected
+++ b/python/ql/test/library-tests/PointsTo/new/Values.expected
@@ -373,11 +373,9 @@
 | i_imports.py:30 | ControlFlowNode for _io | import | Module _io | builtin-class module |
 | i_imports.py:31 | ControlFlowNode for Attribute | import | builtin-class _io.BytesIO | builtin-class type |
 | i_imports.py:31 | ControlFlowNode for _io | import | Module _io | builtin-class module |
-| i_imports.py:33 | ControlFlowNode for ImportExpr | import | Module io | builtin-class module |
-| i_imports.py:34 | ControlFlowNode for Attribute | import | builtin-class _io.StringIO | builtin-class type |
-| i_imports.py:34 | ControlFlowNode for io | import | Module io | builtin-class module |
-| i_imports.py:35 | ControlFlowNode for Attribute | import | builtin-class _io.BytesIO | builtin-class type |
-| i_imports.py:35 | ControlFlowNode for io | import | Module io | builtin-class module |
+| i_imports.py:33 | ControlFlowNode for ImportExpr | import | Missing module io | builtin-class module |
+| i_imports.py:34 | ControlFlowNode for io | import | Missing module io | builtin-class module |
+| i_imports.py:35 | ControlFlowNode for io | import | Missing module io | builtin-class module |
 | i_imports.py:37 | ControlFlowNode for ImportExpr | import | Package code | builtin-class module |
 | i_imports.py:38 | ControlFlowNode for Attribute | import | Function f2 | builtin-class function |
 | i_imports.py:38 | ControlFlowNode for Attribute | import | Module code.n_nesting | builtin-class module |
diff --git a/python/ql/test/library-tests/PointsTo/regressions/wrong/module-imports/conflict-stdlib/LocalModuleWithRef.expected b/python/ql/test/library-tests/PointsTo/regressions/wrong/module-imports/conflict-stdlib/LocalModuleWithRef.expected
index 92e569f09e6..f79649b8a1a 100644
--- a/python/ql/test/library-tests/PointsTo/regressions/wrong/module-imports/conflict-stdlib/LocalModuleWithRef.expected
+++ b/python/ql/test/library-tests/PointsTo/regressions/wrong/module-imports/conflict-stdlib/LocalModuleWithRef.expected
@@ -1,3 +1,2 @@
-| Local module | code-invalid-package-name/cmd.py:0:0:0:0 | Module cmd | referenced in external file called | pdb.py |
 | Local module | code-invalid-package-name/cmd.py:0:0:0:0 | Module cmd | referenced in local file called | test_ok.py |
 | Local module | code-invalid-package-name/unique_name.py:0:0:0:0 | Module unique_name | referenced in local file called | unique_name_use.py |
diff --git a/python/ql/test/library-tests/PointsTo/regressions/wrong/module-imports/conflict-stdlib/ModuleWithLocalRef.expected b/python/ql/test/library-tests/PointsTo/regressions/wrong/module-imports/conflict-stdlib/ModuleWithLocalRef.expected
index cf5d7560b9a..4c08caeec0b 100644
--- a/python/ql/test/library-tests/PointsTo/regressions/wrong/module-imports/conflict-stdlib/ModuleWithLocalRef.expected
+++ b/python/ql/test/library-tests/PointsTo/regressions/wrong/module-imports/conflict-stdlib/ModuleWithLocalRef.expected
@@ -1,3 +1,3 @@
 | Module 'cmd' (local, not in stdlib, not missing) referenced in local file | code-invalid-package-name/test_ok.py:1 |
-| Module 'pdb' (external, in stdlib, not missing) referenced in local file | code-invalid-package-name/test_fail.py:3 |
+| Module 'pdb' (external, not in stdlib, missing) referenced in local file | code-invalid-package-name/test_fail.py:3 |
 | Module 'unique_name' (local, not in stdlib, not missing) referenced in local file | code-invalid-package-name/unique_name_use.py:1 |
diff --git a/python/ql/test/library-tests/dataflow/calls/DataFlowCallTest.ql b/python/ql/test/library-tests/dataflow/calls/DataFlowCallTest.ql
index 6e992d6e035..c49511d9cdd 100644
--- a/python/ql/test/library-tests/dataflow/calls/DataFlowCallTest.ql
+++ b/python/ql/test/library-tests/dataflow/calls/DataFlowCallTest.ql
@@ -21,8 +21,11 @@ module DataFlowCallTest implements TestSig {
       value = prettyExpr(call.getNode().getNode()) and
       tag = "call"
       or
-      value = call.(DataFlowDispatch::NormalCall).getCallType().toString() and
-      tag = "callType"
+      exists(DataFlowDispatch::CallType callType |
+        DataFlowDispatch::resolveCall(call.getNode(), _, callType) and
+        value = callType.toString() and
+        tag = "callType"
+      )
       or
       exists(DataFlowDispatch::ArgumentPosition pos, DataFlow::Node arg |
         arg = call.getArgument(pos)
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 8ec8033d086..f7763cc9c1e 100644
--- a/python/ql/test/library-tests/dataflow/coverage-py3/argumentRoutingTest.expected
+++ b/python/ql/test/library-tests/dataflow/coverage-py3/argumentRoutingTest.expected
@@ -1,2 +1,6 @@
 testFailures
+| classes.py:54:44:54:107 | Comment #$ arg1="with_length_hint" func=With_length_hint.__length_hint__ | Missing result: arg1="with_length_hint" |
+| classes.py:54:44:54:107 | Comment #$ arg1="with_length_hint" func=With_length_hint.__length_hint__ | Missing result: func=With_length_hint.__length_hint__ |
+| classes.py:71:32:71:77 | Comment #$ arg1="with_index" func=With_index.__index__ | Missing result: arg1="with_index" |
+| classes.py:71:32:71:77 | Comment #$ arg1="with_index" func=With_index.__index__ | Missing result: func=With_index.__index__ |
 failures
diff --git a/python/ql/test/library-tests/dataflow/coverage/localFlow.expected b/python/ql/test/library-tests/dataflow/coverage/localFlow.expected
index 1cb2cab49fa..665fb1aa12b 100644
--- a/python/ql/test/library-tests/dataflow/coverage/localFlow.expected
+++ b/python/ql/test/library-tests/dataflow/coverage/localFlow.expected
@@ -8,9 +8,4 @@
 | test.py:208:1:208:53 | Entry definition for SsaSourceVariable SINK | test.py:210:5:210:8 | ControlFlowNode for SINK |
 | test.py:208:1:208:53 | Entry definition for SsaSourceVariable SOURCE | test.py:209:25:209:30 | ControlFlowNode for SOURCE |
 | test.py:209:5:209:5 | ControlFlowNode for x | test.py:210:10:210:10 | ControlFlowNode for x |
-| test.py:209:9:209:68 | ControlFlowNode for .0 | test.py:209:9:209:68 | ControlFlowNode for .0 |
 | test.py:209:9:209:68 | ControlFlowNode for ListComp | test.py:209:5:209:5 | ControlFlowNode for x |
-| test.py:209:16:209:16 | ControlFlowNode for v | test.py:209:45:209:45 | ControlFlowNode for v |
-| test.py:209:40:209:40 | ControlFlowNode for u | test.py:209:56:209:56 | ControlFlowNode for u |
-| test.py:209:51:209:51 | ControlFlowNode for z | test.py:209:67:209:67 | ControlFlowNode for z |
-| test.py:209:62:209:62 | ControlFlowNode for y | test.py:209:10:209:10 | ControlFlowNode for y |
diff --git a/python/ql/test/library-tests/dataflow/coverage/test.py b/python/ql/test/library-tests/dataflow/coverage/test.py
index a2ea9cccd67..64c500b5b69 100644
--- a/python/ql/test/library-tests/dataflow/coverage/test.py
+++ b/python/ql/test/library-tests/dataflow/coverage/test.py
@@ -137,7 +137,7 @@ def test_list_comprehension_with_tuple_result():
     s = SOURCE
     ns = NONSOURCE
     l3 = [(s, ns) for _ in [1]]
-    SINK(l3[0][0]) # $ MISSING: flow="SOURCE, l:-3 -> l3[0][0]"
+    SINK(l3[0][0]) # $ flow="SOURCE, l:-3 -> l3[0][0]"
     SINK_F(l3[0][1])
 
 
@@ -245,7 +245,7 @@ def gen(x):
 
 def test_yield():
     g = gen(SOURCE)
-    SINK(next(g)) #$ MISSING:flow="SOURCE, l:-1 -> next()"
+    SINK(next(g)) #$ flow="SOURCE, l:-1 -> next(..)"
 
 
 def gen_from(x):
@@ -260,7 +260,7 @@ def test_yield_from():
 # a statement rather than an expression, but related to generators
 def test_for():
     for x in gen(SOURCE):
-        SINK(x) #$ MISSING:flow="SOURCE, l:-1 -> x"
+        SINK(x) #$ flow="SOURCE, l:-1 -> x"
 
 
 # 6.2.9.1. Generator-iterator methods
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 24592337076..3195e9b5f6d 100644
--- a/python/ql/test/library-tests/dataflow/coverage/test_builtins.py
+++ b/python/ql/test/library-tests/dataflow/coverage/test_builtins.py
@@ -132,8 +132,8 @@ def test_dict_from_keyword():
 @expects(2)
 def test_dict_from_list():
     d = dict([("k", SOURCE), ("k1", NONSOURCE)])
-    SINK(d["k"]) #$ MISSING: flow="SOURCE, l:-1 -> d[k]"
-    SINK_F(d["k1"])
+    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():
@@ -142,6 +142,14 @@ def test_dict_from_dict():
     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
+
 ## Container methods
 
 ### List
diff --git a/python/ql/test/library-tests/dataflow/enclosing-callable/EnclosingCallable.expected b/python/ql/test/library-tests/dataflow/enclosing-callable/EnclosingCallable.expected
index 0a26a2f2cb3..c168ea8c391 100644
--- a/python/ql/test/library-tests/dataflow/enclosing-callable/EnclosingCallable.expected
+++ b/python/ql/test/library-tests/dataflow/enclosing-callable/EnclosingCallable.expected
@@ -15,10 +15,10 @@
 | generator.py:0:0:0:0 | Module generator | generator.py:1:1:1:23 | ControlFlowNode for FunctionExpr |
 | generator.py:0:0:0:0 | Module generator | generator.py:1:5:1:18 | ControlFlowNode for generator_func |
 | generator.py:1:1:1:23 | Function generator_func | generator.py:1:20:1:21 | ControlFlowNode for xs |
-| generator.py:1:1:1:23 | Function generator_func | generator.py:2:12:2:26 | ControlFlowNode for .0 |
-| generator.py:1:1:1:23 | Function generator_func | generator.py:2:12:2:26 | ControlFlowNode for .0 |
 | generator.py:1:1:1:23 | Function generator_func | generator.py:2:12:2:26 | ControlFlowNode for ListComp |
-| generator.py:1:1:1:23 | Function generator_func | generator.py:2:13:2:13 | ControlFlowNode for Yield |
-| generator.py:1:1:1:23 | Function generator_func | generator.py:2:13:2:13 | ControlFlowNode for x |
-| generator.py:1:1:1:23 | Function generator_func | generator.py:2:19:2:19 | ControlFlowNode for x |
 | generator.py:1:1:1:23 | Function generator_func | generator.py:2:24:2:25 | ControlFlowNode for xs |
+| generator.py:2:12:2:26 | Function listcomp | generator.py:2:12:2:26 | ControlFlowNode for .0 |
+| generator.py:2:12:2:26 | Function listcomp | generator.py:2:12:2:26 | ControlFlowNode for .0 |
+| generator.py:2:12:2:26 | Function listcomp | generator.py:2:13:2:13 | ControlFlowNode for Yield |
+| generator.py:2:12:2:26 | Function listcomp | generator.py:2:13:2:13 | ControlFlowNode for x |
+| generator.py:2:12:2:26 | Function listcomp | generator.py:2:19:2:19 | ControlFlowNode for x |
diff --git a/python/ql/test/library-tests/dataflow/fieldflow/UnresolvedCalls.expected b/python/ql/test/library-tests/dataflow/fieldflow/UnresolvedCalls.expected
index 8ec8033d086..96182702074 100644
--- a/python/ql/test/library-tests/dataflow/fieldflow/UnresolvedCalls.expected
+++ b/python/ql/test/library-tests/dataflow/fieldflow/UnresolvedCalls.expected
@@ -1,2 +1,6 @@
 testFailures
+| test.py:4:17:4:60 | ControlFlowNode for Attribute() | Unexpected result: unresolved_call=os.path.dirname(..) |
+| test.py:4:33:4:59 | ControlFlowNode for Attribute() | Unexpected result: unresolved_call=os.path.dirname(..) |
+| test_dict.py:4:17:4:60 | ControlFlowNode for Attribute() | Unexpected result: unresolved_call=os.path.dirname(..) |
+| test_dict.py:4:33:4:59 | ControlFlowNode for Attribute() | Unexpected result: unresolved_call=os.path.dirname(..) |
 failures
diff --git a/python/ql/test/library-tests/dataflow/regression/dataflow.expected b/python/ql/test/library-tests/dataflow/regression/dataflow.expected
index dfce2c72737..c8ffed51446 100644
--- a/python/ql/test/library-tests/dataflow/regression/dataflow.expected
+++ b/python/ql/test/library-tests/dataflow/regression/dataflow.expected
@@ -23,3 +23,4 @@
 | test.py:195:9:195:14 | ControlFlowNode for SOURCE | test.py:199:14:199:14 | ControlFlowNode for t |
 | test.py:202:10:202:15 | ControlFlowNode for SOURCE | test.py:204:14:204:14 | ControlFlowNode for i |
 | test.py:202:10:202:15 | ControlFlowNode for SOURCE | test.py:205:10:205:10 | ControlFlowNode for i |
+| test.py:208:12:208:17 | ControlFlowNode for SOURCE | test.py:214:14:214:14 | ControlFlowNode for x |
diff --git a/python/ql/test/library-tests/dataflow/regression/test.py b/python/ql/test/library-tests/dataflow/regression/test.py
index 80c9c7e5e34..869993a5b64 100644
--- a/python/ql/test/library-tests/dataflow/regression/test.py
+++ b/python/ql/test/library-tests/dataflow/regression/test.py
@@ -211,4 +211,4 @@ def flow_in_generator():
 
 def flow_from_generator():
     for x in flow_in_generator():
-        SINK(x)  # Flow not found
+        SINK(x)
diff --git a/python/ql/test/library-tests/dataflow/tainttracking/commonSanitizer/InlineTaintTest.ql b/python/ql/test/library-tests/dataflow/tainttracking/commonSanitizer/InlineTaintTest.ql
index 46263250a9b..a71520eb1d3 100644
--- a/python/ql/test/library-tests/dataflow/tainttracking/commonSanitizer/InlineTaintTest.ql
+++ b/python/ql/test/library-tests/dataflow/tainttracking/commonSanitizer/InlineTaintTest.ql
@@ -6,7 +6,7 @@ module CustomSanitizerOverridesConfig implements DataFlow::ConfigSig {
 
   predicate isSink = TestTaintTrackingConfig::isSink/1;
 
-  predicate isBarrier(DataFlow::Node node) { node instanceof StringConstCompareBarrier }
+  predicate isBarrier(DataFlow::Node node) { node instanceof ConstCompareBarrier }
 }
 
 import MakeInlineTaintTest<CustomSanitizerOverridesConfig>
diff --git a/python/ql/test/library-tests/dataflow/tainttracking/commonSanitizer/test_string_const_compare.py b/python/ql/test/library-tests/dataflow/tainttracking/commonSanitizer/test_const_compare.py
similarity index 86%
rename from python/ql/test/library-tests/dataflow/tainttracking/commonSanitizer/test_string_const_compare.py
rename to python/ql/test/library-tests/dataflow/tainttracking/commonSanitizer/test_const_compare.py
index f1b01f4f84a..2e7fff62c0d 100644
--- a/python/ql/test/library-tests/dataflow/tainttracking/commonSanitizer/test_string_const_compare.py
+++ b/python/ql/test/library-tests/dataflow/tainttracking/commonSanitizer/test_const_compare.py
@@ -85,6 +85,32 @@ def test_in_local_variable():
     else:
         ensure_tainted(ts) # $ tainted
 
+def test_is_none():
+    ts = TAINTED_STRING
+    if ts is None:
+        ensure_not_tainted(ts)
+    else:
+        ensure_tainted(ts) # $ tainted
+
+def test_is_not_none():
+    ts = TAINTED_STRING
+    if ts is not None:
+        ensure_tainted(ts)  # $ tainted
+    else:
+        ensure_not_tainted(ts)
+
+def test_in_list_with_constants():
+    ts = TAINTED_STRING
+    if ts in ["safe", None, 3, False]:
+        ensure_not_tainted(ts) 
+    else:
+        ensure_tainted(ts) # $ tainted
+
+    if ts in ["safe", not_constant(), None]:
+        ensure_tainted(ts)  # $ tainted
+
+def not_constant():
+    return "x"
 
 SAFE = ["safe", "also_safe"]
 
@@ -184,6 +210,9 @@ test_in_tuple()
 test_in_set()
 test_in_local_variable()
 test_in_global_variable()
+test_is_none()
+test_is_not_none()
+test_in_list_with_constants()
 make_modification("unsafe")
 test_in_modified_global_variable()
 test_in_unsafe1(["unsafe", "foo"])
diff --git a/python/ql/test/library-tests/dataflow/tainttracking/defaultAdditionalTaintStep/test_collections.py b/python/ql/test/library-tests/dataflow/tainttracking/defaultAdditionalTaintStep/test_collections.py
index 0e2aae93554..6c86d1c75d5 100644
--- a/python/ql/test/library-tests/dataflow/tainttracking/defaultAdditionalTaintStep/test_collections.py
+++ b/python/ql/test/library-tests/dataflow/tainttracking/defaultAdditionalTaintStep/test_collections.py
@@ -61,7 +61,7 @@ def test_access(x, y, z):
         iter(tainted_list), # $ tainted
         next(iter(tainted_list)), # $ MISSING: tainted
         [i for i in tainted_list], # $ tainted
-        [tainted_list for _i in [1,2,3]], # $ MISSING: tainted
+        [tainted_list for _i in [1,2,3]], # $ tainted
     )
 
     a, b, c = tainted_list[0:3]
@@ -85,7 +85,7 @@ def test_access_explicit(x, y, z):
         iter(tainted_list), # $ tainted
         next(iter(tainted_list)), # $ tainted
         [i for i in tainted_list], # $ tainted
-        [tainted_list for i in [1,2,3]], # $ MISSING: tainted
+        [tainted_list for i in [1,2,3]], # $ tainted
         [TAINTED_STRING for i in [1,2,3]], # $ tainted
         [tainted_list], # $ tainted
     )
@@ -166,6 +166,34 @@ def test_copy_2():
         copy.deepcopy(TAINTED_LIST), # $ tainted
     )
 
+def test_replace():
+    from copy import replace
+
+    class C:
+        def __init__(self, always_tainted, tainted_to_safe, safe_to_tainted, always_safe):
+            self.always_tainted = always_tainted
+            self.tainted_to_safe = tainted_to_safe
+            self.safe_to_tainted = safe_to_tainted
+            self.always_safe = always_safe
+
+    c = C(always_tainted=TAINTED_STRING,
+          tainted_to_safe=TAINTED_STRING,
+          safe_to_tainted=NOT_TAINTED,
+          always_safe=NOT_TAINTED)
+
+    d = replace(c, tainted_to_safe=NOT_TAINTED, safe_to_tainted=TAINTED_STRING)
+
+    ensure_tainted(d.always_tainted) # $ tainted
+    ensure_tainted(d.safe_to_tainted) # $ tainted
+    ensure_not_tainted(d.always_safe)
+
+    # Currently, we have no way of stopping the value in the tainted_to_safe field (which gets
+    # overwritten) from flowing through the replace call, which means we get a spurious result.
+
+    ensure_not_tainted(d.tainted_to_safe) # $ SPURIOUS: tainted
+
+
+
 
 def list_index_assign():
     tainted_string = TAINTED_STRING
@@ -274,6 +302,7 @@ test_named_tuple()
 test_defaultdict("key", "key")
 test_copy_1()
 test_copy_2()
+test_replace()
 
 list_index_assign()
 list_index_aug_assign()
diff --git a/python/ql/test/library-tests/frameworks/bottle/ConceptsTest.expected b/python/ql/test/library-tests/frameworks/bottle/ConceptsTest.expected
new file mode 100644
index 00000000000..a74f2c23cda
--- /dev/null
+++ b/python/ql/test/library-tests/frameworks/bottle/ConceptsTest.expected
@@ -0,0 +1,2 @@
+testFailures
+failures
\ No newline at end of file
diff --git a/python/ql/test/library-tests/frameworks/bottle/ConceptsTest.ql b/python/ql/test/library-tests/frameworks/bottle/ConceptsTest.ql
new file mode 100644
index 00000000000..b557a0bccb6
--- /dev/null
+++ b/python/ql/test/library-tests/frameworks/bottle/ConceptsTest.ql
@@ -0,0 +1,2 @@
+import python
+import experimental.meta.ConceptsTest
diff --git a/python/ql/test/library-tests/frameworks/bottle/InlineTaintTest.expected b/python/ql/test/library-tests/frameworks/bottle/InlineTaintTest.expected
new file mode 100644
index 00000000000..a1a78355397
--- /dev/null
+++ b/python/ql/test/library-tests/frameworks/bottle/InlineTaintTest.expected
@@ -0,0 +1,4 @@
+argumentToEnsureNotTaintedNotMarkedAsSpurious
+untaintedArgumentToEnsureTaintedNotMarkedAsMissing
+testFailures
+failures
\ No newline at end of file
diff --git a/python/ql/test/library-tests/frameworks/bottle/InlineTaintTest.ql b/python/ql/test/library-tests/frameworks/bottle/InlineTaintTest.ql
new file mode 100644
index 00000000000..8524da5fe7d
--- /dev/null
+++ b/python/ql/test/library-tests/frameworks/bottle/InlineTaintTest.ql
@@ -0,0 +1,2 @@
+import experimental.meta.InlineTaintTest
+import MakeInlineTaintTest<TestTaintTrackingConfig>
diff --git a/python/ql/test/library-tests/frameworks/bottle/basic_test.py b/python/ql/test/library-tests/frameworks/bottle/basic_test.py
new file mode 100644
index 00000000000..03bc15a027b
--- /dev/null
+++ b/python/ql/test/library-tests/frameworks/bottle/basic_test.py
@@ -0,0 +1,11 @@
+# Source: https://bottlepy.org/docs/dev/tutorial.html#the-application-object
+from bottle import Bottle, run
+
+app = Bottle()
+
+@app.route('/hello') # $ routeSetup="/hello"
+def hello(): # $ requestHandler
+    return "Hello World!" # $ HttpResponse responseBody="Hello World!" mimetype=text/html
+
+if __name__ == '__main__':
+    app.run(host='localhost', port=8080)
\ No newline at end of file
diff --git a/python/ql/test/library-tests/frameworks/bottle/header_test.py b/python/ql/test/library-tests/frameworks/bottle/header_test.py
new file mode 100644
index 00000000000..ab7b9dc856a
--- /dev/null
+++ b/python/ql/test/library-tests/frameworks/bottle/header_test.py
@@ -0,0 +1,11 @@
+import bottle
+from bottle import Bottle, response, request
+
+app = Bottle()
+@app.route('/test', method=['OPTIONS', 'GET']) # $ routeSetup="/test"
+def test1():  # $ requestHandler
+    response.headers['Content-type'] = 'application/json' # $ headerWriteName='Content-type' headerWriteValue='application/json'
+    response.set_header('Content-type', 'application/json') # $ headerWriteName='Content-type' headerWriteValue='application/json'
+    return '[1]' # $ HttpResponse responseBody='[1]' mimetype=text/html
+
+app.run()
\ No newline at end of file
diff --git a/python/ql/test/library-tests/frameworks/bottle/taint_test.py b/python/ql/test/library-tests/frameworks/bottle/taint_test.py
new file mode 100644
index 00000000000..3e092178ae4
--- /dev/null
+++ b/python/ql/test/library-tests/frameworks/bottle/taint_test.py
@@ -0,0 +1,21 @@
+import bottle
+from bottle import response, request
+
+
+app = bottle.app()
+@app.route('/test', method=['OPTIONS', 'GET']) # $ routeSetup="/test"
+def test1():   # $ requestHandler
+
+    ensure_tainted(
+        request.headers,  # $ tainted
+        request.headers,  # $ tainted
+        request.forms,  # $ tainted
+        request.params, # $ tainted
+        request.url,  # $ tainted
+        request.body, # $ tainted
+        request.fullpath, # $ tainted
+        request.query_string # $ tainted
+    )
+    return '[1]' # $ HttpResponse mimetype=text/html responseBody='[1]'
+
+app.run()
\ No newline at end of file
diff --git a/python/ql/test/library-tests/frameworks/django-v2-v3/manage.py b/python/ql/test/library-tests/frameworks/django-v2-v3/manage.py
index 0e1a0b64a6e..9fa5846c955 100755
--- a/python/ql/test/library-tests/frameworks/django-v2-v3/manage.py
+++ b/python/ql/test/library-tests/frameworks/django-v2-v3/manage.py
@@ -6,7 +6,7 @@ import sys
 
 def main():
     """Run administrative tasks."""
-    os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'testproj.settings')
+    os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'testproj.settings') # $ threatModelSource[environment]=os.environ
     try:
         from django.core.management import execute_from_command_line
     except ImportError as exc:
@@ -15,7 +15,7 @@ def main():
             "available on your PYTHONPATH environment variable? Did you "
             "forget to activate a virtual environment?"
         ) from exc
-    execute_from_command_line(sys.argv)
+    execute_from_command_line(sys.argv) # $ threatModelSource[commandargs]=sys.argv
 
 
 if __name__ == '__main__':
diff --git a/python/ql/test/library-tests/frameworks/django-v2-v3/testproj/asgi.py b/python/ql/test/library-tests/frameworks/django-v2-v3/testproj/asgi.py
index 33b113ce911..4906268e416 100644
--- a/python/ql/test/library-tests/frameworks/django-v2-v3/testproj/asgi.py
+++ b/python/ql/test/library-tests/frameworks/django-v2-v3/testproj/asgi.py
@@ -11,6 +11,6 @@ import os
 
 from django.core.asgi import get_asgi_application
 
-os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'testproj.settings')
+os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'testproj.settings') # $ threatModelSource[environment]=os.environ
 
 application = get_asgi_application()
diff --git a/python/ql/test/library-tests/frameworks/django-v2-v3/testproj/wsgi.py b/python/ql/test/library-tests/frameworks/django-v2-v3/testproj/wsgi.py
index b466637895b..a3f803658ab 100644
--- a/python/ql/test/library-tests/frameworks/django-v2-v3/testproj/wsgi.py
+++ b/python/ql/test/library-tests/frameworks/django-v2-v3/testproj/wsgi.py
@@ -11,6 +11,6 @@ import os
 
 from django.core.wsgi import get_wsgi_application
 
-os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'testproj.settings')
+os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'testproj.settings') # $ threatModelSource[environment]=os.environ
 
 application = get_wsgi_application()
diff --git a/python/ql/test/library-tests/frameworks/fastapi/middleware.py b/python/ql/test/library-tests/frameworks/fastapi/middleware.py
new file mode 100644
index 00000000000..0829fccf7be
--- /dev/null
+++ b/python/ql/test/library-tests/frameworks/fastapi/middleware.py
@@ -0,0 +1,10 @@
+from fastapi import FastAPI
+from fastapi.middleware.cors import CORSMiddleware
+
+app = FastAPI()
+
+origins = [
+    "*"
+]
+
+app.add_middleware(CORSMiddleware, allow_origins=origins, allow_credentials=True, allow_methods=["*"], allow_headers=["*"]) # $ CorsMiddleware=CORSMiddleware               
\ No newline at end of file
diff --git a/python/ql/test/library-tests/frameworks/psycopg/pep249.py b/python/ql/test/library-tests/frameworks/psycopg/pep249.py
index 0336facb079..e61700d16ed 100644
--- a/python/ql/test/library-tests/frameworks/psycopg/pep249.py
+++ b/python/ql/test/library-tests/frameworks/psycopg/pep249.py
@@ -12,3 +12,24 @@ with psycopg.connect(...) as conn:
     with conn.cursor() as cursor:
         cursor.execute("some sql", (42,))  # $ getSql="some sql"
         cursor.executemany("some sql", [(42,)])  # $ getSql="some sql"
+
+
+        ### test of threat-model sources
+        row = cursor.fetchone() # $ threatModelSource[database]=cursor.fetchone()
+        rows_many = cursor.fetchmany(10) # $ threatModelSource[database]=cursor.fetchmany(..)
+        rows_all = cursor.fetchall() # $ threatModelSource[database]=cursor.fetchall()
+
+        ensure_tainted(
+            row[0],  # $ tainted
+            rows_many[0][0],  # $ tainted
+            rows_all[0][0],  # $ tainted
+
+            # pretending we created cursor to return dictionary results
+            row["column"],  # $ tainted
+            rows_many[0]["column"],  # $ tainted
+            rows_all[0]["column"],  # $ tainted
+        )
+        for row in rows_many:
+            ensure_tainted(row[0], row["column"]) # $ tainted
+        for row in rows_all:
+            ensure_tainted(row[0], row["column"]) # tainted
diff --git a/python/ql/test/library-tests/frameworks/rest_framework/manage.py b/python/ql/test/library-tests/frameworks/rest_framework/manage.py
index 0e1a0b64a6e..9fa5846c955 100755
--- a/python/ql/test/library-tests/frameworks/rest_framework/manage.py
+++ b/python/ql/test/library-tests/frameworks/rest_framework/manage.py
@@ -6,7 +6,7 @@ import sys
 
 def main():
     """Run administrative tasks."""
-    os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'testproj.settings')
+    os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'testproj.settings') # $ threatModelSource[environment]=os.environ
     try:
         from django.core.management import execute_from_command_line
     except ImportError as exc:
@@ -15,7 +15,7 @@ def main():
             "available on your PYTHONPATH environment variable? Did you "
             "forget to activate a virtual environment?"
         ) from exc
-    execute_from_command_line(sys.argv)
+    execute_from_command_line(sys.argv) # $ threatModelSource[commandargs]=sys.argv
 
 
 if __name__ == '__main__':
diff --git a/python/ql/test/library-tests/frameworks/starlette/Middleware.py b/python/ql/test/library-tests/frameworks/starlette/Middleware.py
new file mode 100644
index 00000000000..1225327df82
--- /dev/null
+++ b/python/ql/test/library-tests/frameworks/starlette/Middleware.py
@@ -0,0 +1,11 @@
+from starlette.applications import Starlette
+from starlette.middleware import Middleware
+from starlette.middleware.cors import CORSMiddleware
+
+routes = ...
+
+middleware = [
+    Middleware(CORSMiddleware, allow_origins=['*'], allow_credentials=True)  # $ CorsMiddleware=CORSMiddleware
+]
+
+app = Starlette(routes=routes, middleware=middleware)
\ No newline at end of file
diff --git a/python/ql/test/library-tests/frameworks/stdlib-py3/FileSystemAccess.py b/python/ql/test/library-tests/frameworks/stdlib-py3/FileSystemAccess.py
index 4de7f3a3c32..45eff39d82c 100644
--- a/python/ql/test/library-tests/frameworks/stdlib-py3/FileSystemAccess.py
+++ b/python/ql/test/library-tests/frameworks/stdlib-py3/FileSystemAccess.py
@@ -17,7 +17,7 @@ p.open("wt").write("hello")  # $ getAPathArgument=p fileWriteData="hello"
 
 name = windows.parent.name
 o = open
-o(name)  # $ getAPathArgument=name
+o(name)  # $ getAPathArgument=name threatModelSource[file]=o(..)
 
 wb = p.write_bytes
 wb(b"hello")  # $ getAPathArgument=p fileWriteData=b"hello"
diff --git a/python/ql/test/library-tests/frameworks/stdlib/FileSystemAccess.py b/python/ql/test/library-tests/frameworks/stdlib/FileSystemAccess.py
index 197ccd8eb91..7d52f53858c 100644
--- a/python/ql/test/library-tests/frameworks/stdlib/FileSystemAccess.py
+++ b/python/ql/test/library-tests/frameworks/stdlib/FileSystemAccess.py
@@ -5,25 +5,25 @@ import stat
 import tempfile
 import shutil
 
-open("file")  # $ getAPathArgument="file"
-open(file="file")  # $ getAPathArgument="file"
+open("file")  # $ getAPathArgument="file" threatModelSource[file]=open(..)
+open(file="file")  # $ getAPathArgument="file" threatModelSource[file]=open(..)
 
 o = open
 
-o("file")  # $ getAPathArgument="file"
-o(file="file")  # $ getAPathArgument="file"
+o("file")  # $ getAPathArgument="file" threatModelSource[file]=o(..)
+o(file="file")  # $ getAPathArgument="file" threatModelSource[file]=o(..)
 
 
-builtins.open("file")  # $ getAPathArgument="file"
-builtins.open(file="file")  # $ getAPathArgument="file"
+builtins.open("file")  # $ getAPathArgument="file" threatModelSource[file]=builtins.open(..)
+builtins.open(file="file")  # $ getAPathArgument="file" threatModelSource[file]=builtins.open(..)
 
 
-io.open("file")  # $ getAPathArgument="file"
-io.open(file="file")  # $ getAPathArgument="file"
+io.open("file")  # $ getAPathArgument="file" threatModelSource[file]=io.open(..)
+io.open(file="file")  # $ getAPathArgument="file" threatModelSource[file]=io.open(..)
 io.open_code("file")  # $ getAPathArgument="file"
 io.FileIO("file")  # $ getAPathArgument="file"
 
-f = open("path") # $ getAPathArgument="path"
+f = open("path") # $ getAPathArgument="path" threatModelSource[file]=open(..)
 f.write("foo") # $ getAPathArgument="path" fileWriteData="foo"
 lines = ["foo"]
 f.writelines(lines) # $ getAPathArgument="path" fileWriteData=lines
diff --git a/python/ql/test/library-tests/frameworks/stdlib/Logging.py b/python/ql/test/library-tests/frameworks/stdlib/Logging.py
index cb2e3fddc90..72a5175fef8 100644
--- a/python/ql/test/library-tests/frameworks/stdlib/Logging.py
+++ b/python/ql/test/library-tests/frameworks/stdlib/Logging.py
@@ -43,3 +43,12 @@ class MyLogger(logging.Logger):
     pass
 
 MyLogger("bar").info("hello") # $ loggingInput="hello"
+
+class CustomLogger(logging.getLoggerClass()):
+    pass
+
+CustomLogger("baz").info("hello") # $ loggingInput="hello"
+
+class LoggerSubClassUsingSelf(logging.Logger):
+    def foo(self):
+        self.info("hello") # $ loggingInput="hello"
\ No newline at end of file
diff --git a/python/ql/test/library-tests/frameworks/stdlib/http_server.py b/python/ql/test/library-tests/frameworks/stdlib/http_server.py
index 27ec2211f4b..9110aa6a26a 100644
--- a/python/ql/test/library-tests/frameworks/stdlib/http_server.py
+++ b/python/ql/test/library-tests/frameworks/stdlib/http_server.py
@@ -30,7 +30,7 @@ def test_cgi_FieldStorage_taint():
         form['key'][0].value, # $ tainted
         form['key'][0].file, # $ tainted
         form['key'][0].filename, # $ tainted
-        [field.value for field in form['key']], # $ MISSING: tainted
+        [field.value for field in form['key']], # $ tainted
 
         # `form.getvalue('key')` will be a list, if multiple fields named "key" are provided
         form.getvalue('key'), # $ tainted
@@ -40,7 +40,7 @@ def test_cgi_FieldStorage_taint():
 
         form.getlist('key'), # $ tainted
         form.getlist('key')[0], # $ tainted
-        [field.value for field in form.getlist('key')], # $ MISSING: tainted
+        [field.value for field in form.getlist('key')], # $ tainted
     )
 
 
diff --git a/python/ql/test/library-tests/frameworks/stdlib/test_re.py b/python/ql/test/library-tests/frameworks/stdlib/test_re.py
index e45a3fe2576..4cfe5d972b7 100644
--- a/python/ql/test/library-tests/frameworks/stdlib/test_re.py
+++ b/python/ql/test/library-tests/frameworks/stdlib/test_re.py
@@ -38,6 +38,12 @@ ensure_tainted(
 
     compiled_pat.match(ts).string, # $ tainted
     re.compile(ts).match("safe").re.pattern, # $ tainted
+
+    list(re.finditer(pat, ts))[0].string, # $ tainted
+    [m.string for m in re.finditer(pat, ts)], # $ tainted
+
+    list(re.finditer(pat, ts))[0].groups()[0], # $ MISSING: tainted  // this requires list content in type tracking
+    [m.groups()[0] for m in re.finditer(pat, ts)], # $ tainted
 )
 ensure_not_tainted(
     safe_match.expand("Hello \1"),
diff --git a/python/ql/test/library-tests/frameworks/stdlib/threat_models.py b/python/ql/test/library-tests/frameworks/stdlib/threat_models.py
new file mode 100644
index 00000000000..4b6a1a066e7
--- /dev/null
+++ b/python/ql/test/library-tests/frameworks/stdlib/threat_models.py
@@ -0,0 +1,71 @@
+import os
+import sys
+import posix
+
+ensure_tainted(
+    os.getenv("foo"), # $ tainted threatModelSource[environment]=os.getenv(..)
+    os.getenvb("bar"), # $ tainted threatModelSource[environment]=os.getenvb(..)
+
+    os.environ["foo"], # $ tainted threatModelSource[environment]=os.environ
+    os.environ.get("foo"), # $ tainted threatModelSource[environment]=os.environ
+
+    os.environb["bar"], # $ tainted threatModelSource[environment]=os.environb
+    posix.environ[b"foo"], # $ tainted threatModelSource[environment]=posix.environ
+
+
+    sys.argv[1], # $ tainted threatModelSource[commandargs]=sys.argv
+    sys.orig_argv[1], # $ tainted threatModelSource[commandargs]=sys.orig_argv
+)
+
+for k,v in os.environ.items(): # $ threatModelSource[environment]=os.environ
+    ensure_tainted(k) # $ tainted
+    ensure_tainted(v) # $ tainted
+
+
+########################################
+# argparse
+########################################
+
+import argparse
+parser = argparse.ArgumentParser()
+parser.add_argument("foo")
+
+args = parser.parse_args() # $ threatModelSource[commandargs]=parser.parse_args()
+ensure_tainted(args.foo) # $ tainted
+
+explicit_argv_parsing = parser.parse_args(sys.argv) # $ threatModelSource[commandargs]=sys.argv
+ensure_tainted(explicit_argv_parsing.foo) # $ tainted
+
+fake_args = parser.parse_args(["<foo>"])
+ensure_not_tainted(fake_args.foo)
+
+########################################
+# reading input from stdin
+########################################
+
+ensure_tainted(
+    sys.stdin.readline(), # $ tainted threatModelSource[stdin]=sys.stdin
+    input(), # $ tainted threatModelSource[stdin]=input()
+)
+
+########################################
+# reading data from files
+########################################
+
+ensure_tainted(
+    open("foo"), # $ tainted threatModelSource[file]=open(..) getAPathArgument="foo"
+    open("foo").read(), # $ tainted threatModelSource[file]=open(..) getAPathArgument="foo"
+    open("foo").readline(), # $ tainted threatModelSource[file]=open(..) getAPathArgument="foo"
+    open("foo").readlines(), # $ tainted threatModelSource[file]=open(..) getAPathArgument="foo"
+
+    os.read(os.open("foo"), 1024), # $ tainted threatModelSource[file]=os.read(..) getAPathArgument="foo"
+)
+
+########################################
+# socket
+########################################
+
+import socket
+s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+s.connect(("example.com", 1234))
+ensure_tainted(s.recv(1024)) # $ MISSING: tainted threatModelSource[socket]
diff --git a/python/ql/test/library-tests/frameworks/stdlib/wsgiref_simple_server_test.py b/python/ql/test/library-tests/frameworks/stdlib/wsgiref_simple_server_test.py
index 7327385c064..fd852337aba 100644
--- a/python/ql/test/library-tests/frameworks/stdlib/wsgiref_simple_server_test.py
+++ b/python/ql/test/library-tests/frameworks/stdlib/wsgiref_simple_server_test.py
@@ -45,7 +45,7 @@ def func2(environ, start_response): # $ requestHandler
     start_response(status, headers) # $ headerWriteBulk=headers headerWriteBulkUnsanitized=name,value
     return [b"Hello"] # $ HttpResponse responseBody=List
 
-case = sys.argv[1]
+case = sys.argv[1] # $ threatModelSource[commandargs]=sys.argv
 if case == "1":
     server = wsgiref.simple_server.WSGIServer(ADDRESS, wsgiref.simple_server.WSGIRequestHandler)
     server.set_app(func)
diff --git a/python/ql/test/library-tests/frameworks/urllib/InlineTaintTest.expected b/python/ql/test/library-tests/frameworks/urllib/InlineTaintTest.expected
new file mode 100644
index 00000000000..366de37b867
--- /dev/null
+++ b/python/ql/test/library-tests/frameworks/urllib/InlineTaintTest.expected
@@ -0,0 +1,4 @@
+argumentToEnsureNotTaintedNotMarkedAsSpurious
+untaintedArgumentToEnsureTaintedNotMarkedAsMissing
+testFailures
+failures
diff --git a/python/ql/test/library-tests/frameworks/urllib/InlineTaintTest.ql b/python/ql/test/library-tests/frameworks/urllib/InlineTaintTest.ql
new file mode 100644
index 00000000000..8524da5fe7d
--- /dev/null
+++ b/python/ql/test/library-tests/frameworks/urllib/InlineTaintTest.ql
@@ -0,0 +1,2 @@
+import experimental.meta.InlineTaintTest
+import MakeInlineTaintTest<TestTaintTrackingConfig>
diff --git a/python/ql/test/library-tests/frameworks/urllib/taint_test.py b/python/ql/test/library-tests/frameworks/urllib/taint_test.py
new file mode 100644
index 00000000000..b24c31be14c
--- /dev/null
+++ b/python/ql/test/library-tests/frameworks/urllib/taint_test.py
@@ -0,0 +1,10 @@
+import urllib.parse
+
+def test():
+    ts = TAINTED_STRING
+
+    params = urllib.parse.parse_qs(ts)
+
+    ensure_tainted(
+        params, # $ tainted
+    )
diff --git a/python/ql/test/library-tests/modules/duplicate_name/Modules.expected b/python/ql/test/library-tests/modules/duplicate_name/Modules.expected
index 45bd0378c22..bd3437af650 100644
--- a/python/ql/test/library-tests/modules/duplicate_name/Modules.expected
+++ b/python/ql/test/library-tests/modules/duplicate_name/Modules.expected
@@ -1,3 +1 @@
 | sqlite3 | 2 | 1 |
-| sqlite3.__init__ | 2 | 1 |
-| sqlite3.dump | 2 | 1 |
diff --git a/python/ql/test/library-tests/threat-models/default/ActiveKinds.expected b/python/ql/test/library-tests/threat-models/default/ActiveKinds.expected
new file mode 100644
index 00000000000..892f0fa5f6c
--- /dev/null
+++ b/python/ql/test/library-tests/threat-models/default/ActiveKinds.expected
@@ -0,0 +1,3 @@
+| default |
+| remote |
+| request |
diff --git a/python/ql/test/library-tests/threat-models/default/ActiveKinds.ql b/python/ql/test/library-tests/threat-models/default/ActiveKinds.ql
new file mode 100644
index 00000000000..93a1354b7af
--- /dev/null
+++ b/python/ql/test/library-tests/threat-models/default/ActiveKinds.ql
@@ -0,0 +1,7 @@
+private import codeql.threatmodels.ThreatModels
+
+from string kind
+where
+  knownThreatModel(kind) and
+  currentThreatModel(kind)
+select kind
diff --git a/python/ql/test/query-tests/Functions/return_values/ConsistentReturns.expected b/python/ql/test/query-tests/Functions/return_values/ConsistentReturns.expected
index 7c0bad373b3..62289acfe3f 100644
--- a/python/ql/test/query-tests/Functions/return_values/ConsistentReturns.expected
+++ b/python/ql/test/query-tests/Functions/return_values/ConsistentReturns.expected
@@ -1,2 +1,3 @@
 | functions_test.py:18:1:18:11 | Function cr1 | Mixing implicit and explicit returns may indicate an error as implicit returns always return None. |
 | functions_test.py:22:1:22:11 | Function cr2 | Mixing implicit and explicit returns may indicate an error as implicit returns always return None. |
+| functions_test.py:336:1:336:16 | Function ok_match | Mixing implicit and explicit returns may indicate an error as implicit returns always return None. |
diff --git a/python/ql/test/query-tests/Functions/return_values/functions_test.py b/python/ql/test/query-tests/Functions/return_values/functions_test.py
index c8a7cf37734..409cbb30fd9 100644
--- a/python/ql/test/query-tests/Functions/return_values/functions_test.py
+++ b/python/ql/test/query-tests/Functions/return_values/functions_test.py
@@ -330,4 +330,12 @@ def indirectly_returning_different_tuple_sizes(x):
 
 def mismatched_multi_assign(x):
     a,b = returning_different_tuple_sizes(x)
-    return a,b
\ No newline at end of file
+    return a,b
+
+
+def ok_match(x):  # FP
+    match x:
+        case True | 'true':
+            return 0
+        case _:
+            raise ValueError(x)
diff --git a/python/ql/test/query-tests/Numerics/Pythagorean.qlref b/python/ql/test/query-tests/Numerics/Pythagorean.qlref
index bc7326b415a..541bd35ac62 100644
--- a/python/ql/test/query-tests/Numerics/Pythagorean.qlref
+++ b/python/ql/test/query-tests/Numerics/Pythagorean.qlref
@@ -1 +1,2 @@
-Numerics/Pythagorean.ql
\ No newline at end of file
+query: Numerics/Pythagorean.ql
+postprocess: TestUtilities/InlineExpectationsTestQuery.ql
\ No newline at end of file
diff --git a/python/ql/test/query-tests/Numerics/pythagorean_test.py b/python/ql/test/query-tests/Numerics/pythagorean_test.py
index 2503a1d6c22..6dd005b55b3 100644
--- a/python/ql/test/query-tests/Numerics/pythagorean_test.py
+++ b/python/ql/test/query-tests/Numerics/pythagorean_test.py
@@ -3,12 +3,12 @@
 from math import sqrt
 
 def withPow(a, b):
-    return sqrt(a**2 + b**2)
+    return sqrt(a**2 + b**2) # $ Alert
 
 def withMul(a, b):
-    return sqrt(a*a + b*b)
+    return sqrt(a*a + b*b) # $ Alert
 
 def withRef(a, b):
     a2 = a**2
     b2 = b*b
-    return sqrt(a2 + b2)
\ No newline at end of file
+    return sqrt(a2 + b2) # $ Alert
\ No newline at end of file
diff --git a/python/ql/test/query-tests/Security/CWE-022-TarSlip/tarslip.py b/python/ql/test/query-tests/Security/CWE-022-TarSlip/tarslip.py
index b9ca0e8e944..2c06d01adfd 100644
--- a/python/ql/test/query-tests/Security/CWE-022-TarSlip/tarslip.py
+++ b/python/ql/test/query-tests/Security/CWE-022-TarSlip/tarslip.py
@@ -46,7 +46,7 @@ tar.extractall(members=tar)
 #Sanitize members
 def safemembers(members):
     for info in members:
-        if badpath(info):
+        if os.path.isabs(info.name) or ".." in info.name:
             raise
         yield info
 
diff --git a/python/ql/test/query-tests/Security/CWE-089-SqlInjection-local-threat-model/SqlInjection.expected b/python/ql/test/query-tests/Security/CWE-089-SqlInjection-local-threat-model/SqlInjection.expected
new file mode 100644
index 00000000000..1e4ba8b9530
--- /dev/null
+++ b/python/ql/test/query-tests/Security/CWE-089-SqlInjection-local-threat-model/SqlInjection.expected
@@ -0,0 +1,8 @@
+edges
+| test.py:6:14:6:21 | ControlFlowNode for Attribute | test.py:6:14:6:24 | ControlFlowNode for Subscript | provenance | Src:MaD:17  |
+nodes
+| test.py:6:14:6:21 | ControlFlowNode for Attribute | semmle.label | ControlFlowNode for Attribute |
+| test.py:6:14:6:24 | ControlFlowNode for Subscript | semmle.label | ControlFlowNode for Subscript |
+subpaths
+#select
+| test.py:6:14:6:24 | ControlFlowNode for Subscript | test.py:6:14:6:21 | ControlFlowNode for Attribute | test.py:6:14:6:24 | ControlFlowNode for Subscript | This SQL query depends on a $@. | test.py:6:14:6:21 | ControlFlowNode for Attribute | user-provided value |
diff --git a/python/ql/test/query-tests/Security/CWE-089-SqlInjection-local-threat-model/SqlInjection.ext.yml b/python/ql/test/query-tests/Security/CWE-089-SqlInjection-local-threat-model/SqlInjection.ext.yml
new file mode 100644
index 00000000000..63507f47738
--- /dev/null
+++ b/python/ql/test/query-tests/Security/CWE-089-SqlInjection-local-threat-model/SqlInjection.ext.yml
@@ -0,0 +1,6 @@
+extensions:
+  - addsTo:
+      pack: codeql/threat-models
+      extensible: threatModelConfiguration
+    data:
+      - ["local", true, 0]
diff --git a/python/ql/test/query-tests/Security/CWE-089-SqlInjection-local-threat-model/SqlInjection.qlref b/python/ql/test/query-tests/Security/CWE-089-SqlInjection-local-threat-model/SqlInjection.qlref
new file mode 100644
index 00000000000..d1d02cbe8d3
--- /dev/null
+++ b/python/ql/test/query-tests/Security/CWE-089-SqlInjection-local-threat-model/SqlInjection.qlref
@@ -0,0 +1 @@
+Security/CWE-089/SqlInjection.ql
diff --git a/python/ql/test/query-tests/Security/CWE-089-SqlInjection-local-threat-model/test.py b/python/ql/test/query-tests/Security/CWE-089-SqlInjection-local-threat-model/test.py
new file mode 100644
index 00000000000..97bfa393ced
--- /dev/null
+++ b/python/ql/test/query-tests/Security/CWE-089-SqlInjection-local-threat-model/test.py
@@ -0,0 +1,6 @@
+# test that enabling local threat-model works end-to-end
+import sys
+import psycopg
+
+conn = psycopg.connect(...)
+conn.execute(sys.argv[1])
diff --git a/python/ql/test/query-tests/Security/CWE-094-CodeInjection/CodeInjection.qlref b/python/ql/test/query-tests/Security/CWE-094-CodeInjection/CodeInjection.qlref
index fe9adbf3b64..0135c6787d4 100644
--- a/python/ql/test/query-tests/Security/CWE-094-CodeInjection/CodeInjection.qlref
+++ b/python/ql/test/query-tests/Security/CWE-094-CodeInjection/CodeInjection.qlref
@@ -1 +1,2 @@
-Security/CWE-094/CodeInjection.ql
+query: Security/CWE-094/CodeInjection.ql
+postprocess: TestUtilities/InlineExpectationsTestQuery.ql
diff --git a/python/ql/test/query-tests/Security/CWE-094-CodeInjection/code_injection.py b/python/ql/test/query-tests/Security/CWE-094-CodeInjection/code_injection.py
index 05dabe166cf..c775d01250c 100644
--- a/python/ql/test/query-tests/Security/CWE-094-CodeInjection/code_injection.py
+++ b/python/ql/test/query-tests/Security/CWE-094-CodeInjection/code_injection.py
@@ -1,13 +1,13 @@
-from flask import Flask, request
+from flask import Flask, request # $ Source=flask
 app = Flask(__name__)
 
 @app.route("/code-execution")
 def code_execution():
     code = request.args.get("code")
-    exec(code) # NOT OK
-    eval(code) # NOT OK
+    exec(code) # $ Alert=flask
+    eval(code) # $ Alert=flask
     cmd = compile(code, "<filename>", "exec")
-    exec(cmd) # NOT OK
+    exec(cmd) # $ Alert=flask
 
 
 @app.route("/safe-code-execution")
@@ -18,5 +18,5 @@ def code_execution():
     obj_name = request.args.get("obj")
     if obj_name == "foo" or obj_name == "bar":
         # TODO: Should not alert on this
-        obj = eval(obj_name) # OK
+        obj = eval(obj_name) # $ SPURIOUS: Alert=flask
         print(obj, obj*10)
diff --git a/python/ql/test/query-tests/Security/CWE-732-WeakFilePermissions/WeakFilePermissions.expected b/python/ql/test/query-tests/Security/CWE-732-WeakFilePermissions/WeakFilePermissions.expected
index 3bfb6fe4f88..762d2599c2d 100644
--- a/python/ql/test/query-tests/Security/CWE-732-WeakFilePermissions/WeakFilePermissions.expected
+++ b/python/ql/test/query-tests/Security/CWE-732-WeakFilePermissions/WeakFilePermissions.expected
@@ -2,6 +2,5 @@
 | test.py:8:1:8:20 | ControlFlowNode for Attribute() | Overly permissive mask in chmod sets file to world writable. |
 | test.py:9:1:9:21 | ControlFlowNode for Attribute() | Overly permissive mask in chmod sets file to world writable. |
 | test.py:11:1:11:21 | ControlFlowNode for Attribute() | Overly permissive mask in chmod sets file to group readable. |
-| test.py:13:1:13:28 | ControlFlowNode for Attribute() | Overly permissive mask in chmod sets file to group writable. |
 | test.py:14:1:14:19 | ControlFlowNode for Attribute() | Overly permissive mask in chmod sets file to group writable. |
 | test.py:16:1:16:25 | ControlFlowNode for Attribute() | Overly permissive mask in open sets file to world readable. |
diff --git a/python/ql/test/query-tests/Security/CWE-942-CorsMisconfigurationMiddleware/CorsMisconfigurationMiddleware.expected b/python/ql/test/query-tests/Security/CWE-942-CorsMisconfigurationMiddleware/CorsMisconfigurationMiddleware.expected
new file mode 100644
index 00000000000..520cf9ab0d2
--- /dev/null
+++ b/python/ql/test/query-tests/Security/CWE-942-CorsMisconfigurationMiddleware/CorsMisconfigurationMiddleware.expected
@@ -0,0 +1,2 @@
+| fastapi.py:10:1:16:1 | ControlFlowNode for Attribute() | This CORS middleware uses a vulnerable configuration that allows arbitrary websites to make authenticated cross-site requests |
+| starlette.py:8:5:8:75 | ControlFlowNode for Middleware() | This CORS middleware uses a vulnerable configuration that allows arbitrary websites to make authenticated cross-site requests |
diff --git a/python/ql/test/query-tests/Security/CWE-942-CorsMisconfigurationMiddleware/CorsMisconfigurationMiddleware.qlref b/python/ql/test/query-tests/Security/CWE-942-CorsMisconfigurationMiddleware/CorsMisconfigurationMiddleware.qlref
new file mode 100644
index 00000000000..f7017ada0d8
--- /dev/null
+++ b/python/ql/test/query-tests/Security/CWE-942-CorsMisconfigurationMiddleware/CorsMisconfigurationMiddleware.qlref
@@ -0,0 +1 @@
+experimental/Security/CWE-942/CorsMisconfigurationMiddleware.ql
\ No newline at end of file
diff --git a/python/ql/test/query-tests/Security/CWE-942-CorsMisconfigurationMiddleware/fastapi.py b/python/ql/test/query-tests/Security/CWE-942-CorsMisconfigurationMiddleware/fastapi.py
new file mode 100644
index 00000000000..2b1c3c58a7e
--- /dev/null
+++ b/python/ql/test/query-tests/Security/CWE-942-CorsMisconfigurationMiddleware/fastapi.py
@@ -0,0 +1,21 @@
+from fastapi import FastAPI
+from fastapi.middleware.cors import CORSMiddleware
+
+app = FastAPI()
+
+origins = [
+    "*"
+]
+
+app.add_middleware(
+    CORSMiddleware,
+    allow_origins=origins,
+    allow_credentials=True,
+    allow_methods=["*"],
+    allow_headers=["*"],
+)
+
+
+@app.get("/")
+async def main():
+    return {"message": "Hello World"}
\ No newline at end of file
diff --git a/python/ql/test/query-tests/Security/CWE-942-CorsMisconfigurationMiddleware/starlette.py b/python/ql/test/query-tests/Security/CWE-942-CorsMisconfigurationMiddleware/starlette.py
new file mode 100644
index 00000000000..1d6e7705369
--- /dev/null
+++ b/python/ql/test/query-tests/Security/CWE-942-CorsMisconfigurationMiddleware/starlette.py
@@ -0,0 +1,11 @@
+from starlette.applications import Starlette
+from starlette.middleware import Middleware
+from starlette.middleware.cors import CORSMiddleware
+
+routes = ...
+
+middleware = [
+    Middleware(CORSMiddleware, allow_origins=['*'], allow_credentials=True)
+]
+
+app = Starlette(routes=routes, middleware=middleware)
\ No newline at end of file
diff --git a/python/ql/test/query-tests/Statements/no_effect/StatementNoEffect.expected b/python/ql/test/query-tests/Statements/no_effect/StatementNoEffect.expected
index 5b1626128a4..9b534e55d7f 100644
--- a/python/ql/test/query-tests/Statements/no_effect/StatementNoEffect.expected
+++ b/python/ql/test/query-tests/Statements/no_effect/StatementNoEffect.expected
@@ -1,3 +1,5 @@
+| assert_raises.py:9:13:9:19 | ExprStmt | This statement has no effect. |
+| assert_raises.py:11:13:11:16 | ExprStmt | This statement has no effect. |
 | test.py:24:1:24:3 | ExprStmt | This statement has no effect. |
 | test.py:25:1:25:13 | ExprStmt | This statement has no effect. |
 | test.py:26:1:26:6 | ExprStmt | This statement has no effect. |
diff --git a/python/ql/test/query-tests/Statements/unreachable/test.py b/python/ql/test/query-tests/Statements/unreachable/test.py
index 493dcc24dd1..a58f4172b1b 100755
--- a/python/ql/test/query-tests/Statements/unreachable/test.py
+++ b/python/ql/test/query-tests/Statements/unreachable/test.py
@@ -137,3 +137,12 @@ def unreachable_catch_all_raise(x):
         pass
     else:
         raise ValueError(x)
+
+def ok_match(x):
+    match x:
+        case False:
+            pass  # FP
+        case True:
+            pass
+        case _:  # FP
+            pass
diff --git a/ql/.gitignore b/ql/.gitignore
index b8df693e827..2e6fbbf1cc6 100644
--- a/ql/.gitignore
+++ b/ql/.gitignore
@@ -3,5 +3,4 @@ target
 .cache
 ql/test/**/*.testproj
 ql/test/**/*.actual
-ql/test/**/CONSISTENCY
 work
diff --git a/ql/Cargo.lock b/ql/Cargo.lock
index 67a3f78fb41..853271e24e6 100644
Binary files a/ql/Cargo.lock and b/ql/Cargo.lock differ
diff --git a/ruby/.gitignore b/ruby/.gitignore
index f0b40d44e7a..2ad57b36315 100644
--- a/ruby/.gitignore
+++ b/ruby/.gitignore
@@ -3,5 +3,4 @@ extractor/target
 .cache
 ql/test/**/*.testproj
 ql/test/**/*.actual
-ql/test/**/CONSISTENCY
 .codeql
diff --git a/ruby/extractor/BUILD.bazel b/ruby/extractor/BUILD.bazel
index 158f1c91e4c..8c22b4775f2 100644
--- a/ruby/extractor/BUILD.bazel
+++ b/ruby/extractor/BUILD.bazel
@@ -1,5 +1,7 @@
-load("@tree_sitter_extractors_deps//:defs.bzl", "aliases", "all_crate_deps")
 load("//misc/bazel:rust.bzl", "codeql_rust_binary")
+load("//misc/bazel/3rdparty/tree_sitter_extractors_deps:defs.bzl", "aliases", "all_crate_deps")
+
+exports_files(["Cargo.toml"])
 
 codeql_rust_binary(
     name = "extractor",
diff --git a/ruby/extractor/Cargo.toml b/ruby/extractor/Cargo.toml
index bd0cde9bb02..1e9166413a6 100644
--- a/ruby/extractor/Cargo.toml
+++ b/ruby/extractor/Cargo.toml
@@ -5,10 +5,11 @@ version = "0.1.0"
 authors = ["GitHub"]
 edition = "2021"
 
+# When updating these dependencies, run `misc/bazel/3rdparty/update_cargo_deps.sh`
 [dependencies]
 tree-sitter = ">= 0.23.0"
-tree-sitter-embedded-template = { git = "https://github.com/tree-sitter/tree-sitter-embedded-template.git", rev = "62b0a6e45900a7dff7c37da95fec20a09968ba52" }
-tree-sitter-ruby = { git = "https://github.com/tree-sitter/tree-sitter-ruby.git", rev = "a66579f70d6f50ffd81a16fc3d3358e2ac173c88" }
+tree-sitter-embedded-template = "0.23.2"
+tree-sitter-ruby = "0.23.1"
 clap = { version = "4.2", features = ["derive"] }
 tracing = "0.1"
 tracing-subscriber = { version = "0.3.3", features = ["env-filter"] }
diff --git a/ruby/ql/consistency-queries/AstConsistency.ql b/ruby/ql/consistency-queries/AstConsistency.ql
index 2a9fea8fea9..d7792a8ae4d 100644
--- a/ruby/ql/consistency-queries/AstConsistency.ql
+++ b/ruby/ql/consistency-queries/AstConsistency.ql
@@ -31,3 +31,5 @@ query predicate multipleToString(AstNode n, string s) {
 }
 
 query predicate extractionError(ExtractionError error) { any() }
+
+query predicate extractionWarning(ExtractionWarning error) { any() }
diff --git a/ruby/ql/consistency-queries/CfgConsistency.ql b/ruby/ql/consistency-queries/CfgConsistency.ql
index d7d5b84a402..c8d797b71f4 100644
--- a/ruby/ql/consistency-queries/CfgConsistency.ql
+++ b/ruby/ql/consistency-queries/CfgConsistency.ql
@@ -1,4 +1,5 @@
-import codeql.ruby.controlflow.internal.ControlFlowGraphImpl::Consistency
+import codeql.ruby.controlflow.internal.ControlFlowGraphImpl::Consistency as Consistency
+import Consistency
 import codeql.ruby.AST
 import codeql.ruby.CFG
 import codeql.ruby.controlflow.internal.Completion
@@ -20,7 +21,13 @@ query predicate nonPostOrderExpr(Expr e, string cls) {
   )
 }
 
-query predicate multipleToString(CfgNode n, string s) {
-  s = strictconcat(n.toString(), ",") and
-  strictcount(n.toString()) > 1
+query predicate scopeNoFirst(CfgScope scope) {
+  Consistency::scopeNoFirst(scope) and
+  not scope = any(StmtSequence seq | not exists(seq.getAStmt())) and
+  not scope =
+    any(Callable c |
+      not exists(c.getAParameter()) and
+      not c.(BodyStmt).hasEnsure() and
+      not exists(c.(BodyStmt).getARescue())
+    )
 }
diff --git a/ruby/ql/lib/CHANGELOG.md b/ruby/ql/lib/CHANGELOG.md
index 160b3b2b6e7..230f81c621b 100644
--- a/ruby/ql/lib/CHANGELOG.md
+++ b/ruby/ql/lib/CHANGELOG.md
@@ -1,3 +1,17 @@
+## 2.0.3
+
+No user-facing changes.
+
+## 2.0.2
+
+### Minor Analysis Improvements
+
+* The `ExtractionError` class has been split into `ExtractionError` and `ExtractionWarning`, reporting extraction errors and warnings respectively.
+
+## 2.0.1
+
+No user-facing changes.
+
 ## 2.0.0
 
 ### Breaking Changes
diff --git a/ruby/ql/lib/change-notes/released/2.0.1.md b/ruby/ql/lib/change-notes/released/2.0.1.md
new file mode 100644
index 00000000000..b5b6d0dee91
--- /dev/null
+++ b/ruby/ql/lib/change-notes/released/2.0.1.md
@@ -0,0 +1,3 @@
+## 2.0.1
+
+No user-facing changes.
diff --git a/ruby/ql/lib/change-notes/released/2.0.2.md b/ruby/ql/lib/change-notes/released/2.0.2.md
new file mode 100644
index 00000000000..9d7757a2e03
--- /dev/null
+++ b/ruby/ql/lib/change-notes/released/2.0.2.md
@@ -0,0 +1,5 @@
+## 2.0.2
+
+### Minor Analysis Improvements
+
+* The `ExtractionError` class has been split into `ExtractionError` and `ExtractionWarning`, reporting extraction errors and warnings respectively.
diff --git a/ruby/ql/lib/change-notes/released/2.0.3.md b/ruby/ql/lib/change-notes/released/2.0.3.md
new file mode 100644
index 00000000000..7bd669821d5
--- /dev/null
+++ b/ruby/ql/lib/change-notes/released/2.0.3.md
@@ -0,0 +1,3 @@
+## 2.0.3
+
+No user-facing changes.
diff --git a/ruby/ql/lib/codeql-pack.release.yml b/ruby/ql/lib/codeql-pack.release.yml
index 0abe6ccede0..fabf1e86596 100644
--- a/ruby/ql/lib/codeql-pack.release.yml
+++ b/ruby/ql/lib/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 2.0.0
+lastReleaseVersion: 2.0.3
diff --git a/ruby/ql/lib/codeql/ruby/AST.qll b/ruby/ql/lib/codeql/ruby/AST.qll
index e8dc28692c0..bd42696a8db 100644
--- a/ruby/ql/lib/codeql/ruby/AST.qll
+++ b/ruby/ql/lib/codeql/ruby/AST.qll
@@ -18,6 +18,7 @@ private import ast.internal.Scope
 private import ast.internal.Synthesis
 private import ast.internal.TreeSitter
 private import Customizations
+private import Diagnostics
 
 cached
 private module Cached {
@@ -166,3 +167,20 @@ class RubyFile extends File {
   /** Gets the number of lines of comments in this file. */
   int getNumberOfLinesOfComments() { result = count(int line | this.line(line, true)) }
 }
+
+/**
+ * A successfully extracted file, that is, a file that was extracted and
+ * contains no extraction errors or warnings.
+ */
+class SuccessfullyExtractedFile extends File {
+  SuccessfullyExtractedFile() {
+    not exists(Diagnostic d |
+      d.getLocation().getFile() = this and
+      (
+        d instanceof ExtractionError
+        or
+        d instanceof ExtractionWarning
+      )
+    )
+  }
+}
diff --git a/ruby/ql/lib/codeql/ruby/Diagnostics.qll b/ruby/ql/lib/codeql/ruby/Diagnostics.qll
index faf7b8420a0..58de14b8fcf 100644
--- a/ruby/ql/lib/codeql/ruby/Diagnostics.qll
+++ b/ruby/ql/lib/codeql/ruby/Diagnostics.qll
@@ -1,3 +1,5 @@
+/** Provides classes relating to extraction diagnostics. */
+
 private import codeql.Locations
 
 /** A diagnostic emitted during extraction, such as a parse error */
@@ -46,7 +48,8 @@ class Diagnostic extends @diagnostic {
   string toString() { result = this.getMessage() }
 }
 
-/** A diagnostic relating to a particular error in extracting a file. */
-class ExtractionError extends Diagnostic {
-  ExtractionError() { this.getTag() = "parse_error" }
-}
+/** A diagnostic that is error severity. */
+class ExtractionError extends Diagnostic, @diagnostic_error { }
+
+/** A diagnostic that is warning severity. */
+class ExtractionWarning extends Diagnostic, @diagnostic_warning { }
diff --git a/ruby/ql/lib/codeql/ruby/controlflow/internal/ControlFlowGraphImpl.qll b/ruby/ql/lib/codeql/ruby/controlflow/internal/ControlFlowGraphImpl.qll
index 0aa93e573eb..643decb560b 100644
--- a/ruby/ql/lib/codeql/ruby/controlflow/internal/ControlFlowGraphImpl.qll
+++ b/ruby/ql/lib/codeql/ruby/controlflow/internal/ControlFlowGraphImpl.qll
@@ -22,7 +22,6 @@ class AstNode extends Ast::AstNode {
 private module CfgInput implements CfgShared::InputSig<Location> {
   private import ControlFlowGraphImpl as Impl
   private import Completion as Comp
-  private import Splitting as Splitting
   private import codeql.ruby.CFG as Cfg
 
   class AstNode = Impl::AstNode;
@@ -45,10 +44,6 @@ private module CfgInput implements CfgShared::InputSig<Location> {
     scope.(Impl::CfgScopeImpl).exit(last, c)
   }
 
-  class SplitKindBase = Splitting::TSplitKind;
-
-  class Split = Splitting::Split;
-
   class SuccessorType = Cfg::SuccessorType;
 
   SuccessorType getAMatchingSuccessorType(Completion c) { result = c.getAMatchingSuccessorType() }
@@ -67,7 +62,21 @@ private module CfgInput implements CfgShared::InputSig<Location> {
   }
 }
 
-import CfgShared::Make<Location, CfgInput>
+private module CfgSplittingInput implements CfgShared::SplittingInputSig<Location, CfgInput> {
+  private import Splitting as S
+
+  class SplitKindBase = S::TSplitKind;
+
+  class Split = S::Split;
+}
+
+private module ConditionalCompletionSplittingInput implements
+  CfgShared::ConditionalCompletionSplittingInputSig<Location, CfgInput, CfgSplittingInput>
+{
+  import Splitting::ConditionalCompletionSplitting::ConditionalCompletionSplittingInput
+}
+
+import CfgShared::MakeWithSplitting<Location, CfgInput, CfgSplittingInput, ConditionalCompletionSplittingInput>
 
 abstract class CfgScopeImpl extends AstNode {
   abstract predicate entry(AstNode first);
diff --git a/ruby/ql/lib/codeql/ruby/controlflow/internal/Splitting.qll b/ruby/ql/lib/codeql/ruby/controlflow/internal/Splitting.qll
index d8cfb9230d8..5331a3d26b6 100644
--- a/ruby/ql/lib/codeql/ruby/controlflow/internal/Splitting.qll
+++ b/ruby/ql/lib/codeql/ruby/controlflow/internal/Splitting.qll
@@ -3,7 +3,8 @@
  */
 
 private import codeql.ruby.AST as Ast
-private import Completion
+private import Completion as Comp
+private import Comp
 private import ControlFlowGraphImpl
 private import SuccessorTypes
 private import codeql.ruby.controlflow.ControlFlowGraph
@@ -31,7 +32,7 @@ class Split extends TSplit {
   string toString() { none() }
 }
 
-private module ConditionalCompletionSplitting {
+module ConditionalCompletionSplitting {
   /**
    * A split for conditional completions. For example, in
    *
@@ -51,10 +52,12 @@ private module ConditionalCompletionSplitting {
 
     ConditionalCompletionSplit() { this = TConditionalCompletionSplit(completion) }
 
+    ConditionalCompletion getCompletion() { result = completion }
+
     override string toString() { result = completion.toString() }
   }
 
-  private class ConditionalCompletionSplitKind extends SplitKind, TConditionalCompletionSplitKind {
+  private class ConditionalCompletionSplitKind_ extends SplitKind, TConditionalCompletionSplitKind {
     override int getListOrder() { result = 0 }
 
     override predicate isEnabled(AstNode n) { this.appliesTo(n) }
@@ -62,56 +65,48 @@ private module ConditionalCompletionSplitting {
     override string toString() { result = "ConditionalCompletion" }
   }
 
+  module ConditionalCompletionSplittingInput {
+    private import Completion as Comp
+
+    class ConditionalCompletion = Comp::ConditionalCompletion;
+
+    class ConditionalCompletionSplitKind extends ConditionalCompletionSplitKind_, TSplitKind { }
+
+    class ConditionalCompletionSplit = ConditionalCompletionSplitting::ConditionalCompletionSplit;
+
+    bindingset[parent, parentCompletion]
+    predicate condPropagateExpr(
+      AstNode parent, ConditionalCompletion parentCompletion, AstNode child,
+      ConditionalCompletion childCompletion
+    ) {
+      child = parent.(Ast::NotExpr).getOperand() and
+      childCompletion.(BooleanCompletion).getDual() = parentCompletion
+      or
+      childCompletion = parentCompletion and
+      (
+        child = parent.(Ast::LogicalAndExpr).getAnOperand()
+        or
+        child = parent.(Ast::LogicalOrExpr).getAnOperand()
+        or
+        child = parent.(Ast::StmtSequence).getLastStmt()
+        or
+        child = parent.(Ast::ConditionalExpr).getBranch(_)
+      )
+    }
+  }
+
   int getNextListOrder() { result = 1 }
 
-  private class ConditionalCompletionSplitImpl extends SplitImpl instanceof ConditionalCompletionSplit
+  private class ConditionalCompletionSplitImpl extends SplitImplementations::ConditionalCompletionSplitting::ConditionalCompletionSplitImpl
   {
-    ConditionalCompletion completion;
-
-    ConditionalCompletionSplitImpl() { this = TConditionalCompletionSplit(completion) }
-
-    override ConditionalCompletionSplitKind getKind() { any() }
-
     override predicate hasEntry(AstNode pred, AstNode succ, Completion c) {
-      succ(pred, succ, c) and
-      last(succ, _, completion) and
-      (
-        last(succ.(Ast::NotExpr).getOperand(), pred, c) and
-        completion.(BooleanCompletion).getDual() = c
-        or
-        last(succ.(Ast::LogicalAndExpr).getAnOperand(), pred, c) and
-        completion = c
-        or
-        last(succ.(Ast::LogicalOrExpr).getAnOperand(), pred, c) and
-        completion = c
-        or
-        last(succ.(Ast::StmtSequence).getLastStmt(), pred, c) and
-        completion = c
-        or
-        last(succ.(Ast::ConditionalExpr).getBranch(_), pred, c) and
-        completion = c
-      )
+      super.hasEntry(pred, succ, c)
       or
+      // a non-standard case is needed for `when` clauses
       succ(pred, succ, c) and
       succ instanceof Ast::WhenClause and
-      completion = c
+      c = this.getCompletion()
     }
-
-    override predicate hasEntryScope(CfgScope scope, AstNode succ) { none() }
-
-    override predicate hasExit(AstNode pred, AstNode succ, Completion c) {
-      this.appliesTo(pred) and
-      succ(pred, succ, c) and
-      if c instanceof ConditionalCompletion then completion = c else any()
-    }
-
-    override predicate hasExitScope(CfgScope scope, AstNode last, Completion c) {
-      this.appliesTo(last) and
-      succExit(scope, last, c) and
-      if c instanceof ConditionalCompletion then completion = c else any()
-    }
-
-    override predicate hasSuccessor(AstNode pred, AstNode succ, Completion c) { none() }
   }
 }
 
diff --git a/ruby/ql/lib/codeql/ruby/dataflow/internal/DataFlowImpl1.qll b/ruby/ql/lib/codeql/ruby/dataflow/internal/DataFlowImpl1.qll
index 359fa71744b..17def0c431d 100644
--- a/ruby/ql/lib/codeql/ruby/dataflow/internal/DataFlowImpl1.qll
+++ b/ruby/ql/lib/codeql/ruby/dataflow/internal/DataFlowImpl1.qll
@@ -261,13 +261,17 @@ deprecated private module Config implements FullStateConfigSig {
     model = ""
   }
 
-  predicate isAdditionalFlowStep(Node node1, FlowState state1, Node node2, FlowState state2) {
+  predicate isAdditionalFlowStep(
+    Node node1, FlowState state1, Node node2, FlowState state2, string model
+  ) {
     getConfig(state1).isAdditionalFlowStep(node1, getState(state1), node2, getState(state2)) and
-    getConfig(state2) = getConfig(state1)
+    getConfig(state2) = getConfig(state1) and
+    model = ""
     or
     not singleConfiguration() and
     getConfig(state1).isAdditionalFlowStep(node1, node2) and
-    state2 = state1
+    state2 = state1 and
+    model = ""
   }
 
   predicate allowImplicitRead(Node node, ContentSet c) {
@@ -283,6 +287,8 @@ deprecated private module Config implements FullStateConfigSig {
   FlowFeature getAFeature() { result = any(Configuration config).getAFeature() }
 
   predicate includeHiddenNodes() { any(Configuration config).includeHiddenNodes() }
+
+  predicate observeDiffInformedIncrementalMode() { none() }
 }
 
 deprecated private import Impl<Config> as I
diff --git a/ruby/ql/lib/codeql/ruby/dataflow/internal/DataFlowImpl2.qll b/ruby/ql/lib/codeql/ruby/dataflow/internal/DataFlowImpl2.qll
index 359fa71744b..17def0c431d 100644
--- a/ruby/ql/lib/codeql/ruby/dataflow/internal/DataFlowImpl2.qll
+++ b/ruby/ql/lib/codeql/ruby/dataflow/internal/DataFlowImpl2.qll
@@ -261,13 +261,17 @@ deprecated private module Config implements FullStateConfigSig {
     model = ""
   }
 
-  predicate isAdditionalFlowStep(Node node1, FlowState state1, Node node2, FlowState state2) {
+  predicate isAdditionalFlowStep(
+    Node node1, FlowState state1, Node node2, FlowState state2, string model
+  ) {
     getConfig(state1).isAdditionalFlowStep(node1, getState(state1), node2, getState(state2)) and
-    getConfig(state2) = getConfig(state1)
+    getConfig(state2) = getConfig(state1) and
+    model = ""
     or
     not singleConfiguration() and
     getConfig(state1).isAdditionalFlowStep(node1, node2) and
-    state2 = state1
+    state2 = state1 and
+    model = ""
   }
 
   predicate allowImplicitRead(Node node, ContentSet c) {
@@ -283,6 +287,8 @@ deprecated private module Config implements FullStateConfigSig {
   FlowFeature getAFeature() { result = any(Configuration config).getAFeature() }
 
   predicate includeHiddenNodes() { any(Configuration config).includeHiddenNodes() }
+
+  predicate observeDiffInformedIncrementalMode() { none() }
 }
 
 deprecated private import Impl<Config> as I
diff --git a/ruby/ql/lib/codeql/ruby/dataflow/internal/DataFlowPublic.qll b/ruby/ql/lib/codeql/ruby/dataflow/internal/DataFlowPublic.qll
index c56501bad3e..4daa5fc3011 100644
--- a/ruby/ql/lib/codeql/ruby/dataflow/internal/DataFlowPublic.qll
+++ b/ruby/ql/lib/codeql/ruby/dataflow/internal/DataFlowPublic.qll
@@ -829,7 +829,28 @@ class ContentSet extends TContentSet {
     this.isAny() and
     exists(result)
     or
-    result = this.getAnElementReadContent()
+    exists(Content elementContent | elementContent = this.getAnElementReadContent() |
+      result = elementContent
+      or
+      // Do not distinguish symbol keys from string keys. This allows us to
+      // give more precise summaries for something like `with_indifferent_access`,
+      // and the amount of false-positive flow arising from this should be very
+      // limited.
+      elementContent =
+        any(Content::KnownElementContent known, ConstantValue cv |
+          cv = known.getIndex() and
+          result.(Content::KnownElementContent).getIndex() =
+            any(ConstantValue cv2 |
+              cv2.(ConstantValue::ConstantSymbolValue).getStringlikeValue() =
+                cv.(ConstantValue::ConstantStringValue).getStringlikeValue()
+              or
+              cv2.(ConstantValue::ConstantStringValue).getStringlikeValue() =
+                cv.(ConstantValue::ConstantSymbolValue).getStringlikeValue()
+            )
+        |
+          known
+        )
+    )
   }
 }
 
diff --git a/ruby/ql/lib/codeql/ruby/dataflow/internal/TaintTrackingPrivate.qll b/ruby/ql/lib/codeql/ruby/dataflow/internal/TaintTrackingPrivate.qll
index 565fea34dbc..3a3eddea63f 100644
--- a/ruby/ql/lib/codeql/ruby/dataflow/internal/TaintTrackingPrivate.qll
+++ b/ruby/ql/lib/codeql/ruby/dataflow/internal/TaintTrackingPrivate.qll
@@ -149,3 +149,37 @@ private module Cached {
 }
 
 import Cached
+import SpeculativeTaintFlow
+
+private module SpeculativeTaintFlow {
+  private import codeql.ruby.dataflow.internal.DataFlowDispatch as DataFlowDispatch
+  private import codeql.ruby.dataflow.internal.DataFlowPublic as DataFlowPublic
+
+  /**
+   * Holds if the additional step from `src` to `sink` should be considered in
+   * speculative taint flow exploration.
+   */
+  predicate speculativeTaintStep(DataFlow::Node src, DataFlow::Node sink) {
+    exists(
+      DataFlowDispatch::DataFlowCall call, MethodCall srcCall,
+      DataFlowDispatch::ArgumentPosition argpos, MethodCall mc
+    |
+      // TODO: exclude neutrals and anything that has QL modeling.
+      not exists(DataFlowDispatch::viableCallable(call)) and
+      call.asCall().getExpr() = srcCall and
+      src.(ArgumentNode).argumentOf(call, argpos) and
+      call.asCall().getExpr() = mc and
+      not mc instanceof Operation and
+      not mc instanceof SetterMethodCall and
+      not mc instanceof ElementReference
+    |
+      not argpos.isSelf() and
+      sink.(DataFlowPublic::PostUpdateNode)
+          .getPreUpdateNode()
+          .(ArgumentNode)
+          .argumentOf(call, any(DataFlowDispatch::ArgumentPosition qualpos | qualpos.isSelf()))
+      or
+      sink.(OutNode).getCall(_) = call
+    )
+  }
+}
diff --git a/ruby/ql/lib/codeql/ruby/frameworks/ActiveSupport.qll b/ruby/ql/lib/codeql/ruby/frameworks/ActiveSupport.qll
index baa6a028679..349a17bbeac 100644
--- a/ruby/ql/lib/codeql/ruby/frameworks/ActiveSupport.qll
+++ b/ruby/ql/lib/codeql/ruby/frameworks/ActiveSupport.qll
@@ -121,16 +121,6 @@ module ActiveSupport {
      * Extensions to the `Hash` class.
      */
     module Hash {
-      private class WithIndifferentAccessSummary extends SimpleSummarizedCallable {
-        WithIndifferentAccessSummary() { this = "with_indifferent_access" }
-
-        override predicate propagatesFlow(string input, string output, boolean preservesValue) {
-          input = "Argument[self].Element[any]" and
-          output = "ReturnValue.Element[any]" and
-          preservesValue = true
-        }
-      }
-
       /**
        * Flow summary for `reverse_merge`, and its alias `with_defaults`.
        */
@@ -167,8 +157,9 @@ module ActiveSupport {
         }
 
         override predicate propagatesFlow(string input, string output, boolean preservesValue) {
-          input = "Argument[self].Element[any]" and
-          output = "ReturnValue.Element[?]" and
+          // keys are considered equal modulo string/symbol in our implementation
+          input = "Argument[self].WithElement[any]" and
+          output = "ReturnValue" and
           preservesValue = true
         }
       }
diff --git a/ruby/ql/lib/qlpack.yml b/ruby/ql/lib/qlpack.yml
index aa67854634a..155d495d7d8 100644
--- a/ruby/ql/lib/qlpack.yml
+++ b/ruby/ql/lib/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/ruby-all
-version: 2.0.1-dev
+version: 2.0.4-dev
 groups: ruby
 extractor: ruby
 dbscheme: ruby.dbscheme
diff --git a/ruby/ql/src/CHANGELOG.md b/ruby/ql/src/CHANGELOG.md
index 2598b88aa0b..3dfaa623d60 100644
--- a/ruby/ql/src/CHANGELOG.md
+++ b/ruby/ql/src/CHANGELOG.md
@@ -1,3 +1,17 @@
+## 1.1.6
+
+No user-facing changes.
+
+## 1.1.5
+
+### Minor Analysis Improvements
+
+* The `rb/diagnostics/extraction-errors` diagnostic query has been split into `rb/diagnostics/extraction-errors` and `rb/diagnostics/extraction-warnings`, counting extraction errors and warnings respectively.
+
+## 1.1.4
+
+No user-facing changes.
+
 ## 1.1.3
 
 No user-facing changes.
diff --git a/ruby/ql/src/change-notes/released/1.1.4.md b/ruby/ql/src/change-notes/released/1.1.4.md
new file mode 100644
index 00000000000..b95051903c5
--- /dev/null
+++ b/ruby/ql/src/change-notes/released/1.1.4.md
@@ -0,0 +1,3 @@
+## 1.1.4
+
+No user-facing changes.
diff --git a/ruby/ql/src/change-notes/released/1.1.5.md b/ruby/ql/src/change-notes/released/1.1.5.md
new file mode 100644
index 00000000000..fd55457a718
--- /dev/null
+++ b/ruby/ql/src/change-notes/released/1.1.5.md
@@ -0,0 +1,5 @@
+## 1.1.5
+
+### Minor Analysis Improvements
+
+* The `rb/diagnostics/extraction-errors` diagnostic query has been split into `rb/diagnostics/extraction-errors` and `rb/diagnostics/extraction-warnings`, counting extraction errors and warnings respectively.
diff --git a/ruby/ql/src/change-notes/released/1.1.6.md b/ruby/ql/src/change-notes/released/1.1.6.md
new file mode 100644
index 00000000000..553350f40af
--- /dev/null
+++ b/ruby/ql/src/change-notes/released/1.1.6.md
@@ -0,0 +1,3 @@
+## 1.1.6
+
+No user-facing changes.
diff --git a/ruby/ql/src/codeql-pack.release.yml b/ruby/ql/src/codeql-pack.release.yml
index 35e710ab1bf..9e712a00a21 100644
--- a/ruby/ql/src/codeql-pack.release.yml
+++ b/ruby/ql/src/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.1.3
+lastReleaseVersion: 1.1.6
diff --git a/ruby/ql/src/qlpack.yml b/ruby/ql/src/qlpack.yml
index 6fe83794b89..2f270249906 100644
--- a/ruby/ql/src/qlpack.yml
+++ b/ruby/ql/src/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/ruby-queries
-version: 1.1.4-dev
+version: 1.1.7-dev
 groups:
   - ruby
   - queries
diff --git a/ruby/ql/src/queries/diagnostics/ExtractionWarnings.ql b/ruby/ql/src/queries/diagnostics/ExtractionWarnings.ql
new file mode 100644
index 00000000000..74f00739056
--- /dev/null
+++ b/ruby/ql/src/queries/diagnostics/ExtractionWarnings.ql
@@ -0,0 +1,19 @@
+/**
+ * @name Extraction warnings
+ * @description List all extraction warnings for files in the source code directory.
+ * @kind diagnostic
+ * @id rb/diagnostics/extraction-warnings
+ */
+
+import codeql.ruby.AST
+import codeql.ruby.Diagnostics
+
+/** Gets the SARIF severity to associate with a warning. */
+int getSeverity() { result = 1 }
+
+from ExtractionWarning warning, File f
+where
+  f = warning.getLocation().getFile() and
+  exists(f.getRelativePath())
+select warning, "Extraction warning in " + f + " with message " + warning.getMessage(),
+  getSeverity()
diff --git a/ruby/ql/src/queries/summary/NumberOfFilesExtractedWithErrors.ql b/ruby/ql/src/queries/summary/NumberOfFilesExtractedWithErrors.ql
index 8623ed911d5..1cbc28b6cc6 100644
--- a/ruby/ql/src/queries/summary/NumberOfFilesExtractedWithErrors.ql
+++ b/ruby/ql/src/queries/summary/NumberOfFilesExtractedWithErrors.ql
@@ -2,14 +2,15 @@
  * @id rb/summary/number-of-files-extracted-with-errors
  * @name Total number of Ruby files that were extracted with errors
  * @description The total number of Ruby code files that we extracted, but where
- *  at least one extraction error occurred in the process.
+ *  at least one extraction error (or warning) occurred in the process.
  * @kind metric
  * @tags summary
  */
 
 import codeql.ruby.AST
-import codeql.ruby.Diagnostics
+import codeql.files.FileSystem
 
 select count(File f |
-    exists(ExtractionError e | e.getLocation().getFile() = f) and exists(f.getRelativePath())
+    exists(f.getRelativePath()) and
+    not f instanceof SuccessfullyExtractedFile
   )
diff --git a/ruby/ql/src/queries/summary/NumberOfSuccessfullyExtractedFiles.ql b/ruby/ql/src/queries/summary/NumberOfSuccessfullyExtractedFiles.ql
index 236374ff226..afd667cf58c 100644
--- a/ruby/ql/src/queries/summary/NumberOfSuccessfullyExtractedFiles.ql
+++ b/ruby/ql/src/queries/summary/NumberOfSuccessfullyExtractedFiles.ql
@@ -2,14 +2,12 @@
  * @id rb/summary/number-of-successfully-extracted-files
  * @name Total number of Ruby files that were extracted without error
  * @description The total number of Ruby code files that we extracted without
- *   encountering any extraction errors
+ *   encountering any extraction errors (or warnings).
  * @kind metric
  * @tags summary
  */
 
 import codeql.ruby.AST
-import codeql.ruby.Diagnostics
+import codeql.files.FileSystem
 
-select count(File f |
-    not exists(ExtractionError e | e.getLocation().getFile() = f) and exists(f.getRelativePath())
-  )
+select count(SuccessfullyExtractedFile f | exists(f.getRelativePath()))
diff --git a/ruby/ql/test/TestUtilities/InlineExpectationsTestQuery.ql b/ruby/ql/test/TestUtilities/InlineExpectationsTestQuery.ql
new file mode 100644
index 00000000000..1cbc37a7fe8
--- /dev/null
+++ b/ruby/ql/test/TestUtilities/InlineExpectationsTestQuery.ql
@@ -0,0 +1,21 @@
+/**
+ * @kind test-postprocess
+ */
+
+private import ruby
+private import codeql.util.test.InlineExpectationsTest as T
+private import internal.InlineExpectationsTestImpl
+import T::TestPostProcessing
+import T::TestPostProcessing::Make<Impl, Input>
+
+private module Input implements T::TestPostProcessing::InputSig<Impl> {
+  string getRelativeUrl(Location location) {
+    exists(File f, int startline, int startcolumn, int endline, int endcolumn |
+      location.hasLocationInfo(_, startline, startcolumn, endline, endcolumn) and
+      f = location.getFile()
+    |
+      result =
+        f.getRelativePath() + ":" + startline + ":" + startcolumn + ":" + endline + ":" + endcolumn
+    )
+  }
+}
diff --git a/ruby/ql/test/library-tests/controlflow/graph/Cfg.expected b/ruby/ql/test/library-tests/controlflow/graph/Cfg.expected
index dfb5c8dfee4..243e107906a 100644
--- a/ruby/ql/test/library-tests/controlflow/graph/Cfg.expected
+++ b/ruby/ql/test/library-tests/controlflow/graph/Cfg.expected
@@ -1,6995 +1,2391 @@
-break_ensure.rb:
-#    1| enter m1
-#-----|  -> x
-
-#    1| exit m1
-
-#    1| exit m1 (abnormal)
-#-----|  -> exit m1
-
-#    1| exit m1 (normal)
-#-----|  -> exit m1
-
-#    1| m1
-#-----|  -> m2
-
-#    1| enter break_ensure.rb
-#-----|  -> m1
-
-#    1| exit break_ensure.rb
-
-#    1| exit break_ensure.rb (normal)
-#-----|  -> exit break_ensure.rb
-
-#    1| x
-#-----|  -> x
-
-#    2| while ...
-#-----|  -> self
-
-#    2| x
-#-----|  -> 0
-
-#    2| ... < ...
-#-----| false -> while ...
-#-----| true -> x
-#-----| raise -> [ensure: raise] self
-
-#    2| 0
-#-----|  -> ... < ...
-
-#    2| do ...
-#-----|  -> x
-
-#    3| if ...
-#-----|  -> do ...
-
-#    3| x
-#-----|  -> 0
-
-#    3| ... > ...
-#-----| raise -> while ...
-#-----| false -> if ...
-#-----| true -> break
-
-#    3| 0
-#-----|  -> ... > ...
-
-#    4| break
-#-----| break -> while ...
-
-#    7| [ensure: raise] ensure ...
-#-----| raise -> exit m1 (abnormal)
-
-#    7| ensure ...
-#-----|  -> exit m1 (normal)
-
-#    8| [ensure: raise] if ...
-#-----|  -> [ensure: raise] ensure ...
-
-#    8| if ...
-#-----|  -> ensure ...
-
-#    8| [ensure: raise] call to elements
-#-----|  -> [ensure: raise] call to nil?
-
-#    8| [ensure: raise] self
-#-----|  -> [ensure: raise] call to elements
-
-#    8| call to elements
-#-----|  -> call to nil?
-
-#    8| self
-#-----|  -> call to elements
-
-#    8| [ensure: raise] call to nil?
-#-----| false -> [ensure: raise] if ...
-#-----| true -> [ensure: raise] self
-
-#    8| call to nil?
-#-----| false -> if ...
-#-----| true -> self
-
-#    8| [ensure: raise] then ...
-#-----|  -> [ensure: raise] if ...
-
-#    8| then ...
-#-----|  -> if ...
-
-#    9| [ensure: raise] call to puts
-#-----|  -> [ensure: raise] then ...
-
-#    9| [ensure: raise] self
-#-----|  -> [ensure: raise] elements nil
-
-#    9| call to puts
-#-----|  -> then ...
-
-#    9| self
-#-----|  -> elements nil
-
-#    9| "elements nil"
-#-----|  -> call to puts
-
-#    9| [ensure: raise] "elements nil"
-#-----|  -> [ensure: raise] call to puts
-
-#    9| [ensure: raise] elements nil
-#-----|  -> [ensure: raise] "elements nil"
-
-#    9| elements nil
-#-----|  -> "elements nil"
-
-#   13| enter m2
-#-----|  -> x
-
-#   13| exit m2
-
-#   13| exit m2 (normal)
-#-----|  -> exit m2
-
-#   13| m2
-#-----|  -> m3
-
-#   13| x
-#-----|  -> y
-
-#   13| y
-#-----|  -> x
-
-#   14| while ...
-#-----|  -> exit m2 (normal)
-
-#   14| x
-#-----|  -> 0
-
-#   14| ... < ...
-#-----| false -> while ...
-#-----| true -> x
-
-#   14| 0
-#-----|  -> ... < ...
-
-#   14| do ...
-#-----|  -> x
-
-#   16| if ...
-#-----|  -> y
-
-#   16| x
-#-----|  -> 0
-
-#   16| ... > ...
-#-----| false -> if ...
-#-----| true -> break
-#-----| raise -> [ensure: raise] y
-
-#   16| 0
-#-----|  -> ... > ...
-
-#   17| break
-#-----| break -> [ensure: break] y
-
-#   19| [ensure: break] ensure ...
-#-----| break -> while ...
-
-#   19| [ensure: raise] ensure ...
-#-----| raise -> while ...
-
-#   19| ensure ...
-#-----|  -> do ...
-
-#   20| [ensure: break] if ...
-#-----|  -> [ensure: break] ensure ...
-
-#   20| [ensure: raise] if ...
-#-----|  -> [ensure: raise] ensure ...
-
-#   20| if ...
-#-----|  -> ensure ...
-
-#   20| [ensure: break] y
-#-----|  -> [ensure: break] call to nil?
-
-#   20| [ensure: raise] y
-#-----|  -> [ensure: raise] call to nil?
-
-#   20| y
-#-----|  -> call to nil?
-
-#   20| [ensure: break] call to nil?
-#-----| false -> [ensure: break] if ...
-#-----| true -> [ensure: break] self
-
-#   20| [ensure: raise] call to nil?
-#-----| false -> [ensure: raise] if ...
-#-----| true -> [ensure: raise] self
-
-#   20| call to nil?
-#-----| false -> if ...
-#-----| true -> self
-
-#   20| [ensure: break] then ...
-#-----|  -> [ensure: break] if ...
-
-#   20| [ensure: raise] then ...
-#-----|  -> [ensure: raise] if ...
-
-#   20| then ...
-#-----|  -> if ...
-
-#   21| [ensure: break] call to puts
-#-----|  -> [ensure: break] then ...
-
-#   21| [ensure: break] self
-#-----|  -> [ensure: break] y nil
-
-#   21| [ensure: raise] call to puts
-#-----|  -> [ensure: raise] then ...
-
-#   21| [ensure: raise] self
-#-----|  -> [ensure: raise] y nil
-
-#   21| call to puts
-#-----|  -> then ...
-
-#   21| self
-#-----|  -> y nil
-
-#   21| "y nil"
-#-----|  -> call to puts
-
-#   21| [ensure: break] "y nil"
-#-----|  -> [ensure: break] call to puts
-
-#   21| [ensure: raise] "y nil"
-#-----|  -> [ensure: raise] call to puts
-
-#   21| [ensure: break] y nil
-#-----|  -> [ensure: break] "y nil"
-
-#   21| [ensure: raise] y nil
-#-----|  -> [ensure: raise] "y nil"
-
-#   21| y nil
-#-----|  -> "y nil"
-
-#   27| enter m3
-#-----|  -> x
-
-#   27| exit m3
-
-#   27| exit m3 (abnormal)
-#-----|  -> exit m3
-
-#   27| exit m3 (normal)
-#-----|  -> exit m3
-
-#   27| m3
-#-----|  -> m4
-
-#   27| x
-#-----|  -> y
-
-#   27| y
-#-----|  -> x
-
-#   29| if ...
-#-----|  -> y
-
-#   29| x
-#-----|  -> call to nil?
-
-#   29| call to nil?
-#-----| false -> if ...
-#-----| true -> return
-#-----| raise -> [ensure: raise] y
-
-#   30| return
-#-----| return -> [ensure: return] y
-
-#   32| [ensure: raise] ensure ...
-#-----| raise -> exit m3 (abnormal)
-
-#   32| [ensure: return] ensure ...
-#-----| return -> exit m3 (normal)
-
-#   32| ensure ...
-#-----|  -> self
-
-#   33| [ensure: raise] while ...
-#-----|  -> [ensure: raise] ensure ...
-
-#   33| [ensure: return] while ...
-#-----|  -> [ensure: return] ensure ...
-
-#   33| while ...
-#-----|  -> ensure ...
-
-#   33| [ensure: raise] y
-#-----|  -> [ensure: raise] 0
-
-#   33| [ensure: return] y
-#-----|  -> [ensure: return] 0
-
-#   33| y
-#-----|  -> 0
-
-#   33| ... < ...
-#-----| false -> while ...
-#-----| true -> x
-
-#   33| [ensure: raise] ... < ...
-#-----| false -> [ensure: raise] while ...
-#-----| true -> [ensure: raise] x
-
-#   33| [ensure: return] ... < ...
-#-----| false -> [ensure: return] while ...
-#-----| true -> [ensure: return] x
-
-#   33| 0
-#-----|  -> ... < ...
-
-#   33| [ensure: raise] 0
-#-----|  -> [ensure: raise] ... < ...
-
-#   33| [ensure: return] 0
-#-----|  -> [ensure: return] ... < ...
-
-#   33| [ensure: raise] do ...
-#-----|  -> [ensure: raise] y
-
-#   33| [ensure: return] do ...
-#-----|  -> [ensure: return] y
-
-#   33| do ...
-#-----|  -> y
-
-#   35| [ensure: raise] if ...
-#-----|  -> [ensure: raise] do ...
-
-#   35| [ensure: return] if ...
-#-----|  -> [ensure: return] do ...
-
-#   35| if ...
-#-----|  -> do ...
-
-#   35| [ensure: raise] x
-#-----|  -> [ensure: raise] 0
-
-#   35| [ensure: return] x
-#-----|  -> [ensure: return] 0
-
-#   35| x
-#-----|  -> 0
-
-#   35| ... > ...
-#-----| false -> if ...
-#-----| true -> break
-
-#   35| [ensure: raise] ... > ...
-#-----| false -> [ensure: raise] if ...
-#-----| true -> [ensure: raise] break
-
-#   35| [ensure: return] ... > ...
-#-----| false -> [ensure: return] if ...
-#-----| true -> [ensure: return] break
-
-#   35| 0
-#-----|  -> ... > ...
-
-#   35| [ensure: raise] 0
-#-----|  -> [ensure: raise] ... > ...
-
-#   35| [ensure: return] 0
-#-----|  -> [ensure: return] ... > ...
-
-#   36| [ensure: raise] break
-#-----| break -> [ensure: raise] while ...
-
-#   36| [ensure: return] break
-#-----| break -> [ensure: return] while ...
-
-#   36| break
-#-----| break -> while ...
-
-#   41| call to puts
-#-----|  -> exit m3 (normal)
-
-#   41| self
-#-----|  -> Done
-
-#   41| "Done"
-#-----|  -> call to puts
-
-#   41| Done
-#-----|  -> "Done"
-
-#   44| enter m4
-#-----|  -> x
-
-#   44| exit m4
-
-#   44| exit m4 (normal)
-#-----|  -> exit m4
-
-#   44| m4
-#-----|  -> exit break_ensure.rb (normal)
-
-#   44| x
-#-----|  -> x
-
-#   45| while ...
-#-----|  -> exit m4 (normal)
-
-#   45| x
-#-----|  -> 0
-
-#   45| ... < ...
-#-----| false -> while ...
-#-----| true -> x
-
-#   45| 0
-#-----|  -> ... < ...
-
-#   45| do ...
-#-----|  -> x
-
-#   47| if ...
-#-----|  -> x
-
-#   47| x
-#-----|  -> 1
-
-#   47| ... > ...
-#-----| false -> if ...
-#-----| true -> self
-#-----| raise -> [ensure: raise] x
-
-#   47| 1
-#-----|  -> ... > ...
-
-#   48| call to raise
-#-----| raise -> [ensure: raise] x
-
-#   48| self
-#-----|  -> ""
-
-#   48| ""
-#-----|  -> call to raise
-
-#   50| [ensure: raise] ensure ...
-#-----| raise -> while ...
-
-#   50| ensure ...
-#-----|  -> do ...
-
-#   51| [ensure: raise] if ...
-#-----|  -> [ensure: raise] ensure ...
-
-#   51| if ...
-#-----|  -> ensure ...
-
-#   51| [ensure: raise] x
-#-----|  -> [ensure: raise] 0
-
-#   51| x
-#-----|  -> 0
-
-#   51| ... > ...
-#-----| false -> if ...
-#-----| true -> 10
-
-#   51| [ensure: raise] ... > ...
-#-----| false -> [ensure: raise] if ...
-#-----| true -> [ensure: raise] 10
-
-#   51| 0
-#-----|  -> ... > ...
-
-#   51| [ensure: raise] 0
-#-----|  -> [ensure: raise] ... > ...
-
-#   52| [ensure: raise] break
-#-----| break -> while ...
-
-#   52| break
-#-----| break -> while ...
-
-#   52| 10
-#-----|  -> break
-
-#   52| [ensure: raise] 10
-#-----|  -> [ensure: raise] break
-
-case.rb:
-#    1| enter if_in_case
-#-----|  -> self
-
-#    1| exit if_in_case
-
-#    1| exit if_in_case (normal)
-#-----|  -> exit if_in_case
-
-#    1| if_in_case
-#-----|  -> case_match
-
-#    1| enter case.rb
-#-----|  -> if_in_case
-
-#    1| exit case.rb
-
-#    1| exit case.rb (normal)
-#-----|  -> exit case.rb
-
-#    2| case ...
-#-----|  -> exit if_in_case (normal)
-
-#    2| call to x1
-#-----|  -> 1
-
-#    2| self
-#-----|  -> call to x1
-
-#    3| [match] when ...
-#-----| match -> self
-
-#    3| [no-match] when ...
-#-----| no-match -> 2
-
-#    3| 1
-#-----| match -> [match] when ...
-#-----| no-match -> [no-match] when ...
-
-#    3| then ...
-#-----|  -> case ...
-
-#    3| ( ... )
-#-----|  -> then ...
-
-#    3| if ...
-#-----|  -> ( ... )
-
-#    3| call to x2
-#-----| false -> if ...
-#-----| true -> self
-
-#    3| self
-#-----|  -> call to x2
-
-#    3| then ...
-#-----|  -> if ...
-
-#    3| call to puts
-#-----|  -> then ...
-
-#    3| self
-#-----|  -> x2
-
-#    3| "x2"
-#-----|  -> call to puts
-
-#    3| x2
-#-----|  -> "x2"
-
-#    4| [match] when ...
-#-----| match -> self
-
-#    4| [no-match] when ...
-#-----| no-match -> case ...
-
-#    4| 2
-#-----| match -> [match] when ...
-#-----| no-match -> [no-match] when ...
-
-#    4| then ...
-#-----|  -> case ...
-
-#    4| call to puts
-#-----|  -> then ...
-
-#    4| self
-#-----|  -> 2
-
-#    4| "2"
-#-----|  -> call to puts
-
-#    4| 2
-#-----|  -> "2"
-
-#    8| case_match
-#-----|  -> case_match_no_match
-
-#    8| enter case_match
-#-----|  -> value
-
-#    8| exit case_match
-
-#    8| exit case_match (normal)
-#-----|  -> exit case_match
-
-#    8| value
-#-----|  -> value
-
-#    9| case ...
-#-----|  -> exit case_match (normal)
-
-#    9| value
-#-----|  -> in ... then ...
-
-#   10| in ... then ...
-#-----|  -> 0
-
-#   10| 0
-#-----| match -> case ...
-#-----| no-match -> in ... then ...
-
-#   11| in ... then ...
-#-----|  -> 1
-
-#   11| 1
-#-----| match -> 3
-#-----| no-match -> in ... then ...
-
-#   11| then ...
-#-----|  -> case ...
-
-#   11| 3
-#-----|  -> then ...
-
-#   12| in ... then ...
-#-----|  -> 2
-
-#   12| 2
-#-----| match -> 4
-#-----| no-match -> in ... then ...
-
-#   12| then ...
-#-----|  -> case ...
-
-#   13| 4
-#-----|  -> then ...
-
-#   14| in ... then ...
-#-----|  -> x
-
-#   14| x
-#-----| match -> x
-
-#   14| x
-#-----|  -> 5
-
-#   14| ... == ...
-#-----| true -> 6
-#-----| false -> in ... then ...
-
-#   14| 5
-#-----|  -> ... == ...
-
-#   14| then ...
-#-----|  -> case ...
-
-#   14| 6
-#-----|  -> then ...
-
-#   15| in ... then ...
-#-----|  -> x
-
-#   15| x
-#-----| match -> x
-
-#   15| x
-#-----|  -> 0
-
-#   15| ... < ...
-#-----| false -> 7
-#-----| true -> 8
-
-#   15| 0
-#-----|  -> ... < ...
-
-#   15| then ...
-#-----|  -> case ...
-
-#   15| 7
-#-----|  -> then ...
-
-#   16| else ...
-#-----|  -> case ...
-
-#   16| 8
-#-----|  -> else ...
-
-#   20| case_match_no_match
-#-----|  -> case_match_raise
-
-#   20| enter case_match_no_match
-#-----|  -> value
-
-#   20| exit case_match_no_match
-
-#   20| exit case_match_no_match (abnormal)
-#-----|  -> exit case_match_no_match
-
-#   20| exit case_match_no_match (normal)
-#-----|  -> exit case_match_no_match
-
-#   20| value
-#-----|  -> value
-
-#   21| case ...
-#-----|  -> exit case_match_no_match (normal)
-
-#   21| value
-#-----|  -> in ... then ...
-
-#   22| in ... then ...
-#-----|  -> 1
-
-#   22| 1
-#-----| raise -> exit case_match_no_match (abnormal)
-#-----| match -> case ...
-
-#   26| case_match_raise
-#-----|  -> case_match_array
-
-#   26| enter case_match_raise
-#-----|  -> value
-
-#   26| exit case_match_raise
-
-#   26| exit case_match_raise (abnormal)
-#-----|  -> exit case_match_raise
-
-#   26| exit case_match_raise (normal)
-#-----|  -> exit case_match_raise
-
-#   26| value
-#-----|  -> value
-
-#   27| case ...
-#-----|  -> exit case_match_raise (normal)
-
-#   27| value
-#-----|  -> in ... then ...
-
-#   28| in ... then ...
-#-----|  -> -> { ... }
-
-#   28| -> { ... }
-#-----| raise -> exit case_match_raise (abnormal)
-#-----| match -> case ...
-
-#   28| enter -> { ... }
-#-----|  -> x
-
-#   28| exit -> { ... }
-
-#   28| exit -> { ... } (abnormal)
-#-----|  -> exit -> { ... }
-
-#   28| x
-#-----|  -> self
-
-#   28| call to raise
-#-----| raise -> exit -> { ... } (abnormal)
-
-#   28| self
-#-----|  -> oops
-
-#   28| "oops"
-#-----|  -> call to raise
-
-#   28| oops
-#-----|  -> "oops"
-
-#   32| case_match_array
-#-----|  -> case_match_find
-
-#   32| enter case_match_array
-#-----|  -> value
-
-#   32| exit case_match_array
-
-#   32| exit case_match_array (abnormal)
-#-----|  -> exit case_match_array
-
-#   32| exit case_match_array (normal)
-#-----|  -> exit case_match_array
-
-#   32| value
-#-----|  -> value
-
-#   33| case ...
-#-----|  -> exit case_match_array (normal)
-
-#   33| value
-#-----|  -> in ... then ...
-
-#   34| in ... then ...
-#-----|  -> [ ..., * ]
-
-#   34| [ ..., * ]
-#-----| match -> case ...
-#-----| no-match -> in ... then ...
-
-#   35| in ... then ...
-#-----|  -> [ ..., * ]
-
-#   35| [ ..., * ]
-#-----| false, match, true -> x
-#-----| no-match -> in ... then ...
-
-#   35| x
-#-----| match -> case ...
-
-#   36| in ... then ...
-#-----|  -> [ ..., * ]
-
-#   36| [ ..., * ]
-#-----| false, match, true -> x
-#-----| no-match -> in ... then ...
-
-#   36| x
-#-----| match -> case ...
-
-#   37| in ... then ...
-#-----|  -> Bar
-
-#   37| Bar
-#-----| raise -> exit case_match_array (abnormal)
-#-----| match -> [ ..., * ]
-
-#   37| [ ..., * ]
-#-----| raise -> exit case_match_array (abnormal)
-#-----| false, match, true -> a
-
-#   37| a
-#-----| match -> b
-
-#   37| b
-#-----| match -> c
-
-#   37| c
-#-----|  -> d
-
-#   37| d
-#-----| match -> e
-
-#   37| e
-#-----| match -> case ...
-
-#   41| case_match_find
-#-----|  -> case_match_hash
-
-#   41| enter case_match_find
-#-----|  -> value
-
-#   41| exit case_match_find
-
-#   41| exit case_match_find (abnormal)
-#-----|  -> exit case_match_find
-
-#   41| exit case_match_find (normal)
-#-----|  -> exit case_match_find
-
-#   41| value
-#-----|  -> value
-
-#   42| case ...
-#-----|  -> exit case_match_find (normal)
-
-#   42| value
-#-----|  -> in ... then ...
-
-#   43| in ... then ...
-#-----|  -> [ *,...,* ]
-
-#   43| [ *,...,* ]
-#-----| raise -> exit case_match_find (abnormal)
-#-----| false, match, true -> x
-
-#   43| x
-#-----|  -> 1
-
-#   43| 1
-#-----| raise -> exit case_match_find (abnormal)
-#-----| match -> 2
-
-#   43| 2
-#-----| raise -> exit case_match_find (abnormal)
-#-----| match -> y
-
-#   43| y
-#-----|  -> case ...
-
-#   47| case_match_hash
-#-----|  -> case_match_variable
-
-#   47| enter case_match_hash
-#-----|  -> value
-
-#   47| exit case_match_hash
-
-#   47| exit case_match_hash (abnormal)
-#-----|  -> exit case_match_hash
-
-#   47| exit case_match_hash (normal)
-#-----|  -> exit case_match_hash
-
-#   47| value
-#-----|  -> value
-
-#   48| case ...
-#-----|  -> exit case_match_hash (normal)
-
-#   48| value
-#-----|  -> in ... then ...
-
-#   49| in ... then ...
-#-----|  -> Foo
-
-#   49| Foo
-#-----|  -> Bar
-
-#   49| Bar
-#-----| match -> { ..., ** }
-#-----| no-match -> in ... then ...
-
-#   49| { ..., ** }
-#-----| false, match, true -> 1
-#-----| no-match -> in ... then ...
-
-#   49| 1
-#-----| match -> a
-#-----| no-match -> in ... then ...
-
-#   49| a
-#-----| match -> rest
-
-#   49| rest
-#-----|  -> case ...
-
-#   50| in ... then ...
-#-----|  -> Bar
-
-#   50| Bar
-#-----| match -> { ..., ** }
-#-----| no-match -> in ... then ...
-
-#   50| { ..., ** }
-#-----| false, match, true -> 1
-#-----| no-match -> in ... then ...
-
-#   50| 1
-#-----| match -> case ...
-#-----| no-match -> in ... then ...
-
-#   51| in ... then ...
-#-----|  -> Bar
-
-#   51| Bar
-#-----| raise -> exit case_match_hash (abnormal)
-#-----| match -> { ..., ** }
-
-#   51| { ..., ** }
-#-----| raise -> exit case_match_hash (abnormal)
-#-----| false, match, true -> case ...
-
-#   55| case_match_variable
-#-----|  -> case_match_underscore
-
-#   55| enter case_match_variable
-#-----|  -> value
-
-#   55| exit case_match_variable
-
-#   55| exit case_match_variable (normal)
-#-----|  -> exit case_match_variable
-
-#   55| value
-#-----|  -> value
-
-#   56| case ...
-#-----|  -> exit case_match_variable (normal)
-
-#   56| value
-#-----|  -> in ... then ...
-
-#   57| in ... then ...
-#-----|  -> 5
-
-#   57| 5
-#-----| match -> case ...
-#-----| no-match -> in ... then ...
-
-#   58| in ... then ...
-#-----|  -> var
-
-#   58| var
-#-----| match -> case ...
-
-#   63| case_match_underscore
-#-----|  -> case_match_various
-
-#   63| enter case_match_underscore
-#-----|  -> value
-
-#   63| exit case_match_underscore
-
-#   63| exit case_match_underscore (normal)
-#-----|  -> exit case_match_underscore
-
-#   63| value
-#-----|  -> value
-
-#   64| case ...
-#-----|  -> exit case_match_underscore (normal)
-
-#   64| value
-#-----|  -> in ... then ...
-
-#   65| in ... then ...
-#-----|  -> ... | ...
-
-#   65| 5
-#-----| match -> case ...
-#-----| no-match -> _
-
-#   65| ... | ...
-#-----|  -> 5
-
-#   65| _
-#-----| match -> case ...
-
-#   69| case_match_various
-#-----|  -> case_match_guard_no_else
-
-#   69| enter case_match_various
-#-----|  -> value
-
-#   69| exit case_match_various
-
-#   69| exit case_match_various (abnormal)
-#-----|  -> exit case_match_various
-
-#   69| exit case_match_various (normal)
-#-----|  -> exit case_match_various
-
-#   69| value
-#-----|  -> foo
-
-#   70| foo
-#-----|  -> 42
-
-#   70| ... = ...
-#-----|  -> value
-
-#   70| 42
-#-----|  -> ... = ...
-
-#   72| case ...
-#-----|  -> exit case_match_various (normal)
-
-#   72| value
-#-----|  -> in ... then ...
-
-#   73| in ... then ...
-#-----|  -> 5
-
-#   73| 5
-#-----| match -> case ...
-#-----| no-match -> in ... then ...
-
-#   74| in ... then ...
-#-----|  -> ^...
-
-#   74| ^...
-#-----|  -> foo
-
-#   74| foo
-#-----| match -> case ...
-#-----| no-match -> in ... then ...
-
-#   75| in ... then ...
-#-----|  -> string
-
-#   75| "string"
-#-----| match -> case ...
-#-----| no-match -> in ... then ...
-
-#   75| string
-#-----|  -> "string"
-
-#   76| in ... then ...
-#-----|  -> Array
-
-#   76| Array
-#-----|  -> foo
-
-#   76| call to []
-#-----| match -> case ...
-#-----| no-match -> in ... then ...
-
-#   76| "foo"
-#-----|  -> bar
-
-#   76| foo
-#-----|  -> "foo"
-
-#   76| "bar"
-#-----|  -> call to []
-
-#   76| bar
-#-----|  -> "bar"
-
-#   77| in ... then ...
-#-----|  -> Array
-
-#   77| Array
-#-----|  -> foo
-
-#   77| call to []
-#-----| match -> case ...
-#-----| no-match -> in ... then ...
-
-#   77| :"foo"
-#-----|  -> bar
-
-#   77| foo
-#-----|  -> :"foo"
-
-#   77| :"bar"
-#-----|  -> call to []
-
-#   77| bar
-#-----|  -> :"bar"
-
-#   78| in ... then ...
-#-----|  -> .*abc[0-9]
-
-#   78| /.*abc[0-9]/
-#-----| match -> case ...
-#-----| no-match -> in ... then ...
-
-#   78| .*abc[0-9]
-#-----|  -> /.*abc[0-9]/
-
-#   79| in ... then ...
-#-----|  -> 5
-
-#   79| 5
-#-----|  -> 10
-
-#   79| _ .. _
-#-----| match -> case ...
-#-----| no-match -> in ... then ...
-
-#   79| 10
-#-----|  -> _ .. _
-
-#   80| in ... then ...
-#-----|  -> 10
-
-#   80| _ .. _
-#-----| match -> case ...
-#-----| no-match -> in ... then ...
-
-#   80| 10
-#-----|  -> _ .. _
-
-#   81| in ... then ...
-#-----|  -> 5
-
-#   81| 5
-#-----|  -> _ .. _
-
-#   81| _ .. _
-#-----| match -> case ...
-#-----| no-match -> in ... then ...
-
-#   82| in ... then ...
-#-----|  -> ... => ...
-
-#   82| 5
-#-----| match -> x
-#-----| no-match -> in ... then ...
-
-#   82| ... => ...
-#-----|  -> 5
-
-#   82| x
-#-----| match -> 1
-
-#   82| then ...
-#-----|  -> case ...
-
-#   82| 1
-#-----|  -> then ...
-
-#   83| in ... then ...
-#-----|  -> ... | ...
-
-#   83| 5
-#-----| match -> case ...
-#-----| no-match -> ^...
-
-#   83| ... | ...
-#-----|  -> 5
-
-#   83| ^...
-#-----|  -> foo
-
-#   83| foo
-#-----| match -> case ...
-#-----| no-match -> string
-
-#   83| "string"
-#-----| match -> case ...
-#-----| no-match -> in ... then ...
-
-#   83| string
-#-----|  -> "string"
-
-#   84| in ... then ...
-#-----|  -> Foo
-
-#   84| Foo
-#-----|  -> Bar
-
-#   84| Bar
-#-----| match -> case ...
-#-----| no-match -> in ... then ...
-
-#   85| in ... then ...
-#-----|  -> -> { ... }
-
-#   85| -> { ... }
-#-----| match -> case ...
-#-----| no-match -> in ... then ...
-
-#   85| enter -> { ... }
-#-----|  -> x
-
-#   85| exit -> { ... }
-
-#   85| exit -> { ... } (normal)
-#-----|  -> exit -> { ... }
-
-#   85| x
-#-----|  -> x
-
-#   85| x
-#-----|  -> 10
-
-#   85| ... == ...
-#-----|  -> exit -> { ... } (normal)
-
-#   85| 10
-#-----|  -> ... == ...
-
-#   86| in ... then ...
-#-----|  -> foo
-
-#   86| :foo
-#-----| match -> case ...
-#-----| no-match -> in ... then ...
-
-#   86| foo
-#-----|  -> :foo
-
-#   87| in ... then ...
-#-----|  -> foo bar
-
-#   87| :"foo bar"
-#-----| match -> case ...
-#-----| no-match -> in ... then ...
-
-#   87| foo bar
-#-----|  -> :"foo bar"
-
-#   88| in ... then ...
-#-----|  -> ... | ...
-
-#   88| - ...
-#-----| match -> case ...
-#-----| no-match -> 10
-
-#   88| ... | ...
-#-----|  -> 5
-
-#   88| 5
-#-----|  -> - ...
-
-#   88| + ...
-#-----| match -> case ...
-#-----| no-match -> in ... then ...
-
-#   88| 10
-#-----|  -> + ...
-
-#   89| in ... then ...
-#-----|  -> ... | ...
-
-#   89| nil
-#-----| match -> case ...
-#-----| no-match -> self
-
-#   89| ... | ...
-#-----|  -> nil
-
-#   89| self
-#-----| match -> case ...
-#-----| no-match -> true
-
-#   89| true
-#-----| match -> case ...
-#-----| no-match -> false
-
-#   89| false
-#-----| match -> case ...
-#-----| no-match -> __LINE__
-
-#   89| __LINE__
-#-----| match -> case ...
-#-----| no-match -> __FILE__
-
-#   89| __FILE__
-#-----| match -> case ...
-#-----| no-match -> __ENCODING__
-
-#   89| __ENCODING__
-#-----| match -> case ...
-#-----| no-match -> in ... then ...
-
-#   90| in ... then ...
-#-----|  -> ( ... )
-
-#   90| ( ... )
-#-----|  -> 1
-
-#   90| 1
-#-----|  -> _ .. _
-
-#   90| _ .. _
-#-----| match -> case ...
-#-----| no-match -> in ... then ...
-
-#   91| in ... then ...
-#-----|  -> ( ... )
-
-#   91| ( ... )
-#-----|  -> ... | ...
-
-#   91| 0
-#-----| match -> case ...
-#-----| no-match -> ""
-
-#   91| ... | ...
-#-----|  -> 0
-
-#   91| ""
-#-----| match -> case ...
-#-----| no-match -> [ ..., * ]
-
-#   91| [ ..., * ]
-#-----| match -> case ...
-#-----| no-match -> { ..., ** }
-
-#   91| { ..., ** }
-#-----| raise -> exit case_match_various (abnormal)
-#-----| false, match, true -> case ...
-
-#   95| case_match_guard_no_else
-#-----|  -> exit case.rb (normal)
-
-#   95| enter case_match_guard_no_else
-#-----|  -> value
-
-#   95| exit case_match_guard_no_else
-
-#   95| exit case_match_guard_no_else (abnormal)
-#-----|  -> exit case_match_guard_no_else
-
-#   95| exit case_match_guard_no_else (normal)
-#-----|  -> exit case_match_guard_no_else
-
-#   95| value
-#-----|  -> value
-
-#   96| case ...
-#-----|  -> exit case_match_guard_no_else (normal)
-
-#   96| value
-#-----|  -> in ... then ...
-
-#   97| in ... then ...
-#-----|  -> x
-
-#   97| x
-#-----| match -> x
-
-#   97| x
-#-----|  -> 5
-
-#   97| ... == ...
-#-----| raise -> exit case_match_guard_no_else (abnormal)
-#-----| true -> 6
-
-#   97| 5
-#-----|  -> ... == ...
-
-#   97| then ...
-#-----|  -> case ...
-
-#   97| 6
-#-----|  -> then ...
-
-cfg.html.erb:
-#    5| @title
-#-----|  -> self
-
-#    5| self
-#-----|  -> @title
-
-#    5| enter cfg.html.erb
-#-----|  -> self
-
-#    5| exit cfg.html.erb
-
-#    5| exit cfg.html.erb (normal)
-#-----|  -> exit cfg.html.erb
-
-#    6| call to stylesheet_link_tag
-#-----|  -> self
-
-#    6| self
-#-----|  -> application
-
-#    6| "application"
-#-----|  -> media
-
-#    6| application
-#-----|  -> "application"
-
-#    6| :media
-#-----|  -> all
-
-#    6| media
-#-----|  -> :media
-
-#    6| Pair
-#-----|  -> call to stylesheet_link_tag
-
-#    6| "all"
-#-----|  -> Pair
-
-#    6| all
-#-----|  -> "all"
-
-#   12| call to link_to
-#-----|  -> self
-
-#   12| self
-#-----|  -> A
-
-#   12| "A"
-#-----|  -> self
-
-#   12| A
-#-----|  -> "A"
-
-#   12| call to a
-#-----|  -> id
-
-#   12| self
-#-----|  -> call to a
-
-#   12| :id
-#-----|  -> a
-
-#   12| id
-#-----|  -> :id
-
-#   12| Pair
-#-----|  -> call to link_to
-
-#   12| "a"
-#-----|  -> Pair
-
-#   12| a
-#-----|  -> "a"
-
-#   15| call to link_to
-#-----|  -> self
-
-#   15| self
-#-----|  -> B
-
-#   15| "B"
-#-----|  -> self
-
-#   15| B
-#-----|  -> "B"
-
-#   15| call to a
-#-----|  -> call to link_to
-
-#   15| self
-#-----|  -> call to a
-
-#   16| call to link_to
-#-----|  -> self
-
-#   16| self
-#-----|  -> C
-
-#   16| "C"
-#-----|  -> self
-
-#   16| C
-#-----|  -> "C"
-
-#   16| call to b
-#-----|  -> call to link_to
-
-#   16| self
-#-----|  -> call to b
-
-#   18| if ...
-#-----|  -> self
-
-#   18| call to admin?
-#-----| true -> self
-#-----| false -> self
-
-#   18| self
-#-----|  -> call to admin?
-
-#   18| then ...
-#-----|  -> if ...
-
-#   19| call to link_to
-#-----|  -> then ...
-
-#   19| self
-#-----|  -> D
-
-#   19| "D"
-#-----|  -> self
-
-#   19| D
-#-----|  -> "D"
-
-#   19| call to d
-#-----|  -> call to link_to
-
-#   19| self
-#-----|  -> call to d
-
-#   20| else ...
-#-----|  -> if ...
-
-#   21| call to link_to
-#-----|  -> else ...
-
-#   21| self
-#-----|  -> E
-
-#   21| "E"
-#-----|  -> self
-
-#   21| E
-#-----|  -> "E"
-
-#   21| call to e
-#-----|  -> call to link_to
-
-#   21| self
-#-----|  -> call to e
-
-#   29| call to collection
-#-----|  -> do ... end
-
-#   29| self
-#-----|  -> call to collection
-
-#   29| call to each
-#-----|  -> exit cfg.html.erb (normal)
-
-#   29| do ... end
-#-----|  -> call to each
-
-#   29| enter do ... end
-#-----|  -> key
-
-#   29| exit do ... end
-
-#   29| exit do ... end (normal)
-#-----|  -> exit do ... end
-
-#   29| key
-#-----|  -> value
-
-#   29| value
-#-----|  -> key
-
-#   30| key
-#-----|  -> value
-
-#   30| value
-#-----|  -> exit do ... end (normal)
-
-cfg.rb:
-#    1| bar
-#-----|  -> alias ...
-
-#    1| enter cfg.rb
-#-----|  -> self
-
-#    1| exit cfg.rb
-
-#    1| exit cfg.rb (normal)
-#-----|  -> exit cfg.rb
-
-#    3| alias ...
-#-----|  -> foo
-
-#    3| foo
-#-----|  -> bar
-
-#    3| bar
-#-----|  -> b
-
-#    5| b
-#-----|  -> 42
-
-#    5| ... = ...
-#-----|  -> Array
-
-#    5| 42
-#-----|  -> ... = ...
-
-#    7| Array
-#-----|  -> one
-
-#    7| call to []
-#-----|  -> Array
-
-#    7| one
-#-----|  -> b
-
-#    7| :"one#{...}"
-#-----|  -> another
-
-#    7| #{...}
-#-----|  -> :"one#{...}"
-
-#    7| b
-#-----|  -> #{...}
-
-#    7| :"another"
-#-----|  -> call to []
-
-#    7| another
-#-----|  -> :"another"
-
-#    9| Array
-#-----|  -> one
-
-#    9| call to []
-#-----|  -> self
-
-#    9| one
-#-----|  -> b
-
-#    9| "one#{...}"
-#-----|  -> another
-
-#    9| #{...}
-#-----|  -> "one#{...}"
-
-#    9| b
-#-----|  -> #{...}
-
-#    9| "another"
-#-----|  -> call to []
-
-#    9| another
-#-----|  -> "another"
-
-#   12| call to puts
-#-----|  -> END { ... }
-
-#   12| self
-#-----|  -> 4
-
-#   12| 4
-#-----|  -> call to puts
-
-#   15| BEGIN { ... }
-#-----|  -> bar
-
-#   16| call to puts
-#-----|  -> BEGIN { ... }
-
-#   16| self
-#-----|  -> hello
-
-#   16| "hello"
-#-----|  -> call to puts
-
-#   16| hello
-#-----|  -> "hello"
-
-#   19| END { ... }
-#-----|  -> 41
-
-#   23| 41
-#-----|  -> 1
-
-#   23| ... + ...
-#-----|  -> 2
-
-#   23| 1
-#-----|  -> ... + ...
-
-#   25| 2
-#-----|  -> { ... }
-
-#   25| call to times
-#-----|  -> self
-
-#   25| enter { ... }
-#-----|  -> x
-
-#   25| exit { ... }
-
-#   25| exit { ... } (normal)
-#-----|  -> exit { ... }
-
-#   25| { ... }
-#-----|  -> call to times
-
-#   25| x
-#-----|  -> self
-
-#   25| call to puts
-#-----|  -> exit { ... } (normal)
-
-#   25| self
-#-----|  -> x
-
-#   25| x
-#-----|  -> call to puts
-
-#   27| call to puts
-#-----|  -> Proc
-
-#   27| self
-#-----|  -> puts
-
-#   27| &...
-#-----|  -> call to puts
-
-#   27| :puts
-#-----|  -> &...
-
-#   27| puts
-#-----|  -> :puts
-
-#   29| Proc
-#-----|  -> { ... }
-
-#   29| call to new
-#-----|  -> true
-
-#   29| enter { ... }
-#-----|  -> x
-
-#   29| exit { ... }
-
-#   29| exit { ... } (normal)
-#-----|  -> exit { ... }
-
-#   29| { ... }
-#-----|  -> call to new
-
-#   29| x
-#-----|  -> x
-
-#   29| x
-#-----|  -> call to call
-
-#   29| call to call
-#-----|  -> exit { ... } (normal)
-
-#   31| while ...
-#-----|  -> false
-
-#   31| true
-#-----| true -> 1
-
-#   32| break
-#-----| break -> while ...
-
-#   32| 1
-#-----|  -> break
-
-#   35| if ...
-#-----|  -> self
-
-#   35| false
-#-----| false -> if ...
-
-#   39| self
-#-----|  -> 42
-
-#   39| call to puts
-#-----|  -> 10
-
-#   39| 42
-#-----|  -> call to puts
-
-#   41| case ...
-#-----|  -> b
-
-#   41| 10
-#-----|  -> 1
-
-#   42| [match] when ...
-#-----| match -> self
-
-#   42| [no-match] when ...
-#-----| no-match -> 2
-
-#   42| 1
-#-----| match -> [match] when ...
-#-----| no-match -> [no-match] when ...
-
-#   42| then ...
-#-----|  -> case ...
-
-#   42| call to puts
-#-----|  -> then ...
-
-#   42| self
-#-----|  -> one
-
-#   42| "one"
-#-----|  -> call to puts
-
-#   42| one
-#-----|  -> "one"
-
-#   43| [match] when ...
-#-----| match -> self
-
-#   43| [no-match] when ...
-#-----| no-match -> self
-
-#   43| 2
-#-----| match -> [match] when ...
-#-----| no-match -> 3
-
-#   43| 3
-#-----| match -> [match] when ...
-#-----| no-match -> 4
-
-#   43| 4
-#-----| match -> [match] when ...
-#-----| no-match -> [no-match] when ...
-
-#   43| then ...
-#-----|  -> case ...
-
-#   43| call to puts
-#-----|  -> then ...
-
-#   43| self
-#-----|  -> some
-
-#   43| "some"
-#-----|  -> call to puts
-
-#   43| some
-#-----|  -> "some"
-
-#   44| else ...
-#-----|  -> case ...
-
-#   44| call to puts
-#-----|  -> else ...
-
-#   44| self
-#-----|  -> many
-
-#   44| "many"
-#-----|  -> call to puts
-
-#   44| many
-#-----|  -> "many"
-
-#   47| case ...
-#-----|  -> chained
-
-#   48| [false] when ...
-#-----| false -> b
-
-#   48| [true] when ...
-#-----| true -> self
-
-#   48| b
-#-----|  -> 1
-
-#   48| ... == ...
-#-----| false -> [false] when ...
-#-----| true -> [true] when ...
-
-#   48| 1
-#-----|  -> ... == ...
-
-#   48| then ...
-#-----|  -> case ...
-
-#   48| call to puts
-#-----|  -> then ...
-
-#   48| self
-#-----|  -> one
-
-#   48| "one"
-#-----|  -> call to puts
-
-#   48| one
-#-----|  -> "one"
-
-#   49| [false] when ...
-#-----| false -> case ...
-
-#   49| [true] when ...
-#-----| true -> self
-
-#   49| b
-#-----|  -> 0
-
-#   49| ... == ...
-#-----| true -> [true] when ...
-#-----| false -> b
-
-#   49| 0
-#-----|  -> ... == ...
-
-#   49| b
-#-----|  -> 1
-
-#   49| ... > ...
-#-----| false -> [false] when ...
-#-----| true -> [true] when ...
-
-#   49| 1
-#-----|  -> ... > ...
-
-#   49| then ...
-#-----|  -> case ...
-
-#   49| call to puts
-#-----|  -> then ...
-
-#   49| self
-#-----|  -> some
-
-#   49| "some"
-#-----|  -> call to puts
-
-#   49| some
-#-----|  -> "some"
-
-#   52| chained
-#-----|  -> a
-
-#   52| ... = ...
-#-----|  -> character
-
-#   52| "a"
-#-----|  -> chained
-
-#   52| "..." "..."
-#-----|  -> ... = ...
-
-#   52| a
-#-----|  -> "a"
-
-#   52| "#{...}"
-#-----|  -> string
-
-#   52| #{...}
-#-----|  -> "#{...}"
-
-#   52| chained
-#-----|  -> #{...}
-
-#   52| "string"
-#-----|  -> "..." "..."
-
-#   52| string
-#-----|  -> "string"
-
-#   54| character
-#-----|  -> ?\x40
-
-#   54| ... = ...
-#-----|  -> Silly
-
-#   54| ?\x40
-#-----|  -> ... = ...
-
-#   58| Silly
-#-----|  -> Object
-
-#   58| Object
-#-----|  -> complex
-
-#   59| complex
-#-----|  -> 10
-
-#   59| ... = ...
-#-----|  -> conditional
-
-#   59| 10
-#-----|  -> 2i
-
-#   59| ... - ...
-#-----|  -> ... = ...
-
-#   59| 2i
-#-----|  -> ... - ...
-
-#   60| conditional
-#-----|  -> self
-
-#   60| ... = ...
-#-----|  -> C
-
-#   60| call to b
-#-----|  -> 10
-
-#   60| self
-#-----|  -> call to b
-
-#   60| ... < ...
-#-----| true -> hello
-#-----| false -> bye
-
-#   60| ... ? ... : ...
-#-----|  -> ... = ...
-
-#   60| 10
-#-----|  -> ... < ...
-
-#   60| "hello"
-#-----|  -> ... ? ... : ...
-
-#   60| hello
-#-----|  -> "hello"
-
-#   60| "bye"
-#-----|  -> ... ? ... : ...
-
-#   60| bye
-#-----|  -> "bye"
-
-#   61| C
-#-----|  -> constant
-
-#   61| ... = ...
-#-----|  -> __synth__2
-
-#   61| "constant"
-#-----|  -> ... = ...
-
-#   61| constant
-#-----|  -> "constant"
-
-#   62| ...
-#-----|  -> pattern
-
-#   62| ... = ...
-#-----|  -> __synth__2__1
-
-#   62| 0
-#-----|  -> call to []
-
-#   62| __synth__2
-#-----|  -> 0
-
-#   62| call to []
-#-----|  -> ... = ...
-
-#   62| x
-#-----|  -> __synth__2
-
-#   62| * ...
-#-----|  -> ... = ...
-
-#   62| ...
-#-----|  -> ...
-
-#   62| ... = ...
-#-----|  -> y
-
-#   62| 1
-#-----|  -> call to []
-
-#   62| __synth__2
-#-----|  -> 1
-
-#   62| __synth__2__1
-#-----|  -> __synth__2
-
-#   62| call to []
-#-----|  -> * ...
-
-#   62| ... = ...
-#-----|  -> z
-
-#   62| 0
-#-----|  -> call to []
-
-#   62| __synth__2__1
-#-----|  -> 0
-
-#   62| call to []
-#-----|  -> ... = ...
-
-#   62| y
-#-----|  -> __synth__2__1
-
-#   62| ... = ...
-#-----|  -> ...
-
-#   62| 1
-#-----|  -> call to []
-
-#   62| __synth__2__1
-#-----|  -> 1
-
-#   62| call to []
-#-----|  -> ... = ...
-
-#   62| z
-#-----|  -> __synth__2__1
-
-#   62| * ...
-#-----|  -> ... = ...
-
-#   62| ... = ...
-#-----|  -> x
-
-#   62| Array
-#-----|  -> 1
-
-#   62| __synth__2
-#-----|  -> Array
-
-#   62| call to []
-#-----|  -> * ...
-
-#   62| 1
-#-----|  -> Array
-
-#   62| Array
-#-----|  -> 2
-
-#   62| call to []
-#-----|  -> call to []
-
-#   62| 2
-#-----|  -> 3
-
-#   62| 3
-#-----|  -> call to []
-
-#   63| enter pattern
-#-----|  -> a
-
-#   63| exit pattern
-
-#   63| exit pattern (normal)
-#-----|  -> exit pattern
-
-#   63| pattern
-#-----|  -> items
-
-#   63| (..., ...)
-#-----|  -> self
-
-#   63| a
-#-----|  -> b
-
-#   63| b
-#-----|  -> (..., ...)
-
-#   64| call to puts
-#-----|  -> self
-
-#   64| self
-#-----|  -> a
-
-#   64| a
-#-----|  -> call to puts
-
-#   65| call to puts
-#-----|  -> exit pattern (normal)
-
-#   65| self
-#-----|  -> b
-
-#   65| b
-#-----|  -> call to puts
-
-#   67| items
-#-----|  -> Array
-
-#   67| ... = ...
-#-----|  -> self
-
-#   67| Array
-#-----|  -> 1
-
-#   67| call to []
-#-----|  -> ... = ...
-
-#   67| 1
-#-----|  -> 2
-
-#   67| 2
-#-----|  -> 3
-
-#   67| 3
-#-----|  -> call to []
-
-#   68| call to puts
-#-----|  -> print
-
-#   68| self
-#-----|  -> items
-
-#   68| items
-#-----|  -> 2
-
-#   68| ...[...]
-#-----|  -> call to puts
-
-#   68| 2
-#-----|  -> ...[...]
-
-#   69| enter print
-#-----|  -> self
-
-#   69| exit print
-
-#   69| exit print (normal)
-#-----|  -> exit print
-
-#   69| print
-#-----|  -> x
-
-#   70| call to puts
-#-----|  -> exit print (normal)
-
-#   70| self
-#-----|  -> silly
-
-#   70| "silly"
-#-----|  -> call to puts
-
-#   70| silly
-#-----|  -> "silly"
-
-#   74| x
-#-----|  -> 42
-
-#   74| ... = ...
-#-----|  -> x
-
-#   74| 42
-#-----|  -> ... = ...
-
-#   75| if ...
-#-----|  -> ;
-
-#   75| x
-#-----|  -> 0
-
-#   75| ... < ...
-#-----| true -> 0
-#-----| false -> x
-
-#   75| 0
-#-----|  -> ... < ...
-
-#   75| then ...
-#-----|  -> if ...
-
-#   75| 0
-#-----|  -> then ...
-
-#   75| elsif ...
-#-----|  -> if ...
-
-#   75| x
-#-----|  -> 10
-
-#   75| ... > ...
-#-----| true -> 10
-#-----| false -> x
-
-#   75| 10
-#-----|  -> ... > ...
-
-#   75| then ...
-#-----|  -> elsif ...
-
-#   75| 10
-#-----|  -> then ...
-
-#   75| else ...
-#-----|  -> elsif ...
-
-#   75| x
-#-----|  -> else ...
-
-#   78| ;
-#-----|  -> self
-
-#   82| else ...
-#-----|  -> self
-
-#   83| call to puts
-#-----|  -> else ...
-
-#   83| self
-#-----|  -> ok
-
-#   83| "ok"
-#-----|  -> call to puts
-
-#   83| ok
-#-----|  -> "ok"
-
-#   84| ensure ...
-#-----|  -> escape
-
-#   85| call to puts
-#-----|  -> ensure ...
-
-#   85| self
-#-----|  -> end
-
-#   85| "end"
-#-----|  -> call to puts
-
-#   85| end
-#-----|  -> "end"
-
-#   88| escape
-#-----|  -> \u1234
-
-#   88| ... = ...
-#-----|  -> x
-
-#   88| "\u1234#{...}\n"
-#-----|  -> ... = ...
-
-#   88| \u1234
-#-----|  -> x
-
-#   88| #{...}
-#-----|  -> \n
-
-#   88| x
-#-----|  -> #{...}
-
-#   88| \n
-#-----|  -> "\u1234#{...}\n"
-
-#   90| ...
-#-----|  -> $global
-
-#   90| ... = ...
-#-----|  -> x
-
-#   90| __synth__0__1
-#-----|  -> x
-
-#   90| __synth__0__1
-#-----|  -> ... = ...
-
-#   90| call to each
-#-----|  -> ...
-
-#   90| enter { ... }
-#-----|  -> __synth__0__1
-
-#   90| exit { ... }
-
-#   90| exit { ... } (normal)
-#-----|  -> exit { ... }
-
-#   90| { ... }
-#-----|  -> call to each
-
-#   90| ... = ...
-#-----|  -> if ...
-
-#   90| [false] ! ...
-#-----| false -> if ...
-
-#   90| [true] ! ...
-#-----| true -> x
-
-#   90| defined? ...
-#-----| false -> [true] ! ...
-#-----| true -> [false] ! ...
-
-#   90| if ...
-#-----|  -> Array
-
-#   90| nil
-#-----|  -> ... = ...
-
-#   90| x
-#-----|  -> nil
-
-#   90| x
-#-----|  -> defined? ...
-
-#   90| x
-#-----|  -> __synth__0__1
-
-#   90| Array
-#-----|  -> 1.4
-
-#   90| call to []
-#-----|  -> { ... }
-
-#   90| 1.4
-#-----|  -> 2.5
-
-#   90| 2.5
-#-----|  -> 3.4e5
-
-#   90| 3.4e5
-#-----|  -> call to []
-
-#   91| if ...
-#-----|  -> self
-
-#   91| x
-#-----|  -> 3
-
-#   91| ... > ...
-#-----| false -> if ...
-#-----| true -> next
-
-#   91| 3
-#-----|  -> ... > ...
-
-#   91| next
-#-----| next -> exit { ... } (normal)
-
-#   92| call to puts
-#-----|  -> exit { ... } (normal)
-
-#   92| self
-#-----|  -> x
-
-#   92| x
-#-----|  -> call to puts
-
-#   95| $global
-#-----|  -> 42
-
-#   95| ... = ...
-#-----|  -> map1
-
-#   95| 42
-#-----|  -> ... = ...
-
-#   97| map1
-#-----|  -> Hash
-
-#   97| ... = ...
-#-----|  -> map2
-
-#   97| Hash
-#-----|  -> a
-
-#   97| call to []
-#-----|  -> ... = ...
-
-#   97| "a"
-#-----|  -> b
-
-#   97| Pair
-#-----|  -> c
-
-#   97| a
-#-----|  -> "a"
-
-#   97| "b"
-#-----|  -> Pair
-
-#   97| b
-#-----|  -> "b"
-
-#   97| "c"
-#-----|  -> d
-
-#   97| Pair
-#-----|  -> e
-
-#   97| c
-#-----|  -> "c"
-
-#   97| "d"
-#-----|  -> Pair
-
-#   97| d
-#-----|  -> "d"
-
-#   97| :e
-#-----|  -> f
-
-#   97| e
-#-----|  -> :e
-
-#   97| Pair
-#-----|  -> call to []
-
-#   97| "f"
-#-----|  -> Pair
-
-#   97| f
-#-----|  -> "f"
-
-#   98| map2
-#-----|  -> Hash
-
-#   98| ... = ...
-#-----|  -> parameters
-
-#   98| Hash
-#-----|  -> map1
-
-#   98| call to []
-#-----|  -> ... = ...
-
-#   98| ** ...
-#-----|  -> x
-
-#   98| map1
-#-----|  -> ** ...
-
-#   98| "x"
-#-----|  -> y
-
-#   98| Pair
-#-----|  -> map1
-
-#   98| x
-#-----|  -> "x"
-
-#   98| "y"
-#-----|  -> Pair
-
-#   98| y
-#-----|  -> "y"
-
-#   98| ** ...
-#-----|  -> call to []
-
-#   98| map1
-#-----|  -> ** ...
-
-#  101| enter parameters
-#-----|  -> value
-
-#  101| exit parameters
-
-#  101| exit parameters (normal)
-#-----|  -> exit parameters
-
-#  101| parameters
-#-----|  -> type
-
-#  101| value
-#-----| false, no-match, true -> 42
-#-----| match -> key
-
-#  101| 42
-#-----|  -> key
-
-#  101| key
-#-----|  -> kwargs
-
-#  101| kwargs
-#-----|  -> self
-
-#  102| call to puts
-#-----|  -> kwargs
-
-#  102| self
-#-----|  -> value
-
-#  102| value
-#-----|  -> call to puts
-
-#  103| return
-#-----| return -> exit parameters (normal)
-
-#  103| kwargs
-#-----|  -> key
-
-#  103| ...[...]
-#-----|  -> return
-
-#  103| key
-#-----|  -> ...[...]
-
-#  106| type
-#-----|  -> healthy
-
-#  106| ... = ...
-#-----|  -> table
-
-#  106| "healthy"
-#-----|  -> ... = ...
-
-#  106| healthy
-#-----|  -> "healthy"
-
-#  107| table
-#-----|  -> food
-
-#  107| ... = ...
-#-----|  -> self
-
-#  107| "food"
-#-----|  -> ... = ...
-
-#  107| food
-#-----|  -> "food"
-
-#  108| call to puts
-#-----|  -> b
-
-#  108| self
-#-----|  -> 
-#-----| SELECT * FROM 
-
-#  108| ( ... )
-#-----|  -> call to puts
-
-#  108| <<SQL
-#-----|  -> ( ... )
-
-#  108| 
-#  108| SELECT * FROM 
-#-----|  -> table
-
-#  109| #{...}
-#-----|  ->  
-
-#  109| table
-#-----|  -> #{...}
-
-#  109|  
-#-----|  -> \n
-
-#  109| \n
-#-----|  -> 
-#-----| WHERE 
-
-#  109| 
-#  109| WHERE 
-#-----|  -> type
-
-#  110| #{...}
-#-----|  ->  = true 
-
-#  110| type
-#-----|  -> #{...}
-
-#  110|  = true 
-#-----|  -> \n
-
-#  110| \n
-#-----|  -> 
-#-----| 
-
-#  110| 
-#  110| 
-#-----|  -> <<SQL
-
-#  113| call to puts
-#-----|  -> ... if ...
-
-#  113| self
-#-----|  -> hi
-
-#  113| ... if ...
-#-----|  -> C
-
-#  113| "hi"
-#-----|  -> call to puts
-
-#  113| hi
-#-----|  -> "hi"
-
-#  113| b
-#-----|  -> 10
-
-#  113| ... > ...
-#-----| true -> self
-#-----| false -> ... if ...
-
-#  113| 10
-#-----|  -> ... > ...
-
-#  115| C
-#-----|  -> self
-
-#  116| @field
-#-----|  -> 42
-
-#  116| self
-#-----|  -> @field
-
-#  116| ... = ...
-#-----|  -> @@static_field
-
-#  116| 42
-#-----|  -> ... = ...
-
-#  117| @@static_field
-#-----|  -> 10
-
-#  117| ... = ...
-#-----|  -> swap
-
-#  117| 10
-#-----|  -> ... = ...
-
-#  120| swap
-#-----|  -> -> { ... }
-
-#  120| ... = ...
-#-----|  -> M
-
-#  120| -> { ... }
-#-----|  -> ... = ...
-
-#  120| enter -> { ... }
-#-----|  -> x
-
-#  120| exit -> { ... }
-
-#  120| exit -> { ... } (normal)
-#-----|  -> exit -> { ... }
-
-#  120| (..., ...)
-#-----|  -> Array
-
-#  120| x
-#-----|  -> y
-
-#  120| y
-#-----|  -> (..., ...)
-
-#  120| Array
-#-----|  -> y
-
-#  120| call to []
-#-----|  -> exit -> { ... } (normal)
-
-#  120| y
-#-----|  -> x
-
-#  120| x
-#-----|  -> call to []
-
-#  122| M
-#-----|  -> nothing
-
-#  123| nothing
-#-----|  -> nil
-
-#  123| ... = ...
-#-----|  -> some
-
-#  123| nil
-#-----|  -> ... = ...
-
-#  124| some
-#-----|  -> 2
-
-#  124| ... = ...
-#-----|  -> some
-
-#  124| 2
-#-----|  -> ... = ...
-
-#  125| some
-#-----|  -> some
-
-#  125| some
-#-----|  -> 10
-
-#  125| ... = ...
-#-----|  -> last
-
-#  125| ... + ...
-#-----|  -> ... = ...
-
-#  125| 10
-#-----|  -> ... + ...
-
-#  126| last
-#-----|  -> 2
-
-#  126| ... = ...
-#-----|  -> range
-
-#  126| ( ... )
-#-----|  -> ... = ...
-
-#  126| 2
-#-----|  -> 4
-
-#  126| 4
-#-----|  -> 7
-
-#  126| 7
-#-----|  -> ( ... )
-
-#  127| range
-#-----|  -> 0
-
-#  127| ... = ...
-#-----|  -> half
-
-#  127| 0
-#-----|  -> 9
-
-#  127| _ .. _
-#-----|  -> ... = ...
-
-#  127| 9
-#-----|  -> _ .. _
-
-#  128| half
-#-----|  -> 1
-
-#  128| ... = ...
-#-----|  -> regex
-
-#  128| 1
-#-----|  -> 3r
-
-#  128| ... / ...
-#-----|  -> 1
-
-#  128| ... + ...
-#-----|  -> ... = ...
-
-#  128| 3r
-#-----|  -> ... / ...
-
-#  128| 1
-#-----|  -> 6r
-
-#  128| ... / ...
-#-----|  -> ... + ...
-
-#  128| 6r
-#-----|  -> ... / ...
-
-#  129| regex
-#-----|  -> hello
-
-#  129| ... = ...
-#-----|  -> Constant
-
-#  129| /hello\s+[#{...}]/
-#-----|  -> ... = ...
-
-#  129| hello
-#-----|  -> \s
-
-#  129| \s
-#-----|  -> +[
-
-#  129| +[
-#-----|  -> range
-
-#  129| #{...}
-#-----|  -> ]
-
-#  129| range
-#-----|  -> #{...}
-
-#  129| ]
-#-----|  -> /hello\s+[#{...}]/
-
-#  130| Constant
-#-----|  -> 5
-
-#  130| ... = ...
-#-----|  -> EmptyClass
-
-#  130| 5
-#-----|  -> ... = ...
-
-#  133| EmptyClass
-#-----|  -> EmptyModule
-
-#  134| EmptyModule
-#-----|  -> 1
-
-#  136| 1
-#-----|  -> 0
-
-#  136| ... / ...
-#-----|  -> ... rescue ...
-#-----| raise -> self
-
-#  136| ... rescue ...
-#-----|  -> __synth__2
-
-#  136| 0
-#-----|  -> ... / ...
-
-#  136| call to puts
-#-----|  -> ... rescue ...
-
-#  136| self
-#-----|  -> div by zero
-
-#  136| "div by zero"
-#-----|  -> call to puts
-
-#  136| div by zero
-#-----|  -> "div by zero"
-
-#  138| ...
-#-----|  -> M
-
-#  138| -2
-#-----|  -> _ .. _
-
-#  138| ... = ...
-#-----|  -> last
-
-#  138| 0
-#-----|  -> -2
-
-#  138| _ .. _
-#-----|  -> call to []
-
-#  138| __synth__2
-#-----|  -> 0
-
-#  138| call to []
-#-----|  -> ... = ...
-
-#  138| init
-#-----|  -> __synth__2
-
-#  138| -1
-#-----|  -> call to []
-
-#  138| ... = ...
-#-----|  -> ...
-
-#  138| __synth__2
-#-----|  -> -1
-
-#  138| call to []
-#-----|  -> ... = ...
-
-#  138| last
-#-----|  -> __synth__2
-
-#  138| 1
-#-----|  -> 2
-
-#  138| * ...
-#-----|  -> ... = ...
-
-#  138| ... = ...
-#-----|  -> init
-
-#  138| ..., ...
-#-----|  -> * ...
-
-#  138| __synth__2
-#-----|  -> 1
-
-#  138| 2
-#-----|  -> 3
-
-#  138| 3
-#-----|  -> ..., ...
-
-#  140| M
-#-----|  -> Constant
-
-#  140| Constant
-#-----|  -> M
-
-#  141| M
-#-----|  -> call to itself
-
-#  141| call to itself
-#-----|  -> Constant
-
-#  141| Constant
-#-----|  -> Silly
-
-#  143| class << ...
-#-----|  -> silly
-
-#  143| Silly
-#-----|  -> call to itself
-
-#  143| call to itself
-#-----|  -> setter=
-
-#  144| setter=
-#-----|  -> print
-
-#  145| enter print
-#-----|  -> self
-
-#  145| exit print
-
-#  145| exit print (normal)
-#-----|  -> exit print
-
-#  145| print
-#-----|  -> class << ...
-
-#  146| call to puts
-#-----|  -> self
-
-#  146| self
-#-----|  -> singleton
-
-#  146| "singleton"
-#-----|  -> call to puts
-
-#  146| singleton
-#-----|  -> "singleton"
-
-#  147| call to puts
-#-----|  -> exit print (normal)
-
-#  147| self
-#-----|  -> super call to print
-
-#  147| super call to print
-#-----|  -> call to print
-
-#  147| call to print
-#-----|  -> call to puts
-
-#  151| silly
-#-----|  -> Silly
-
-#  151| ... = ...
-#-----|  -> silly
-
-#  151| Silly
-#-----|  -> call to new
-
-#  151| call to new
-#-----|  -> ... = ...
-
-#  152| enter method
-#-----|  -> x
-
-#  152| exit method
-
-#  152| exit method (normal)
-#-----|  -> exit method
-
-#  152| method
-#-----|  -> two_parameters
-
-#  152| silly
-#-----|  -> method
-
-#  152| x
-#-----|  -> self
-
-#  153| call to puts
-#-----|  -> exit method (normal)
-
-#  153| self
-#-----|  -> x
-
-#  153| x
-#-----|  -> call to puts
-
-#  156| enter two_parameters
-#-----|  -> a
-
-#  156| exit two_parameters
-
-#  156| exit two_parameters (normal)
-#-----|  -> exit two_parameters
-
-#  156| two_parameters
-#-----|  -> self
-
-#  156| a
-#-----|  -> b
-
-#  156| b
-#-----|  -> exit two_parameters (normal)
-
-#  158| call to two_parameters
-#-----|  -> scriptfile
-
-#  158| self
-#-----|  -> Array
-
-#  158| * ...
-#-----|  -> call to two_parameters
-
-#  158| Array
-#-----|  -> 1
-
-#  158| call to []
-#-----|  -> * ...
-
-#  158| 1
-#-----|  -> 2
-
-#  158| 2
-#-----|  -> call to []
-
-#  160| scriptfile
-#-----|  -> cat "
-
-#  160| ... = ...
-#-----|  -> symbol
-
-#  160| `cat "#{...}"`
-#-----|  -> ... = ...
-
-#  160| cat "
-#-----|  -> self
-
-#  160| #{...}
-#-----|  -> "
-
-#  160| call to __FILE__
-#-----|  -> #{...}
-
-#  160| self
-#-----|  -> call to __FILE__
-
-#  160| "
-#-----|  -> `cat "#{...}"`
-
-#  162| symbol
-#-----|  -> hello
-
-#  162| ... = ...
-#-----|  -> delimited_symbol
-
-#  162| :hello
-#-----|  -> ... = ...
-
-#  162| hello
-#-----|  -> :hello
-
-#  164| delimited_symbol
-#-----|  -> goodbye-
-
-#  164| ... = ...
-#-----|  -> x
-
-#  164| :"goodbye-#{...}"
-#-----|  -> ... = ...
-
-#  164| goodbye-
-#-----|  -> 12
-
-#  164| #{...}
-#-----|  -> :"goodbye-#{...}"
-
-#  164| 12
-#-----|  -> 13
-
-#  164| ... + ...
-#-----|  -> #{...}
-
-#  164| 13
-#-----|  -> ... + ...
-
-#  166| x
-#-----|  -> true
-
-#  166| ... = ...
-#-----|  -> x
-
-#  166| true
-#-----|  -> ... = ...
-
-#  167| x
-#-----|  -> true
-
-#  167| ... = ...
-#-----|  -> x
-
-#  167| ! ...
-#-----|  -> ... = ...
-
-#  167| true
-#-----|  -> ! ...
-
-#  168| x
-#-----|  -> 42
-
-#  168| ... = ...
-#-----|  -> undef ...
-
-#  168| - ...
-#-----|  -> ... = ...
-
-#  168| 42
-#-----|  -> - ...
-
-#  170| undef ...
-#-----|  -> two_parameters
-
-#  170| two_parameters
-#-----|  -> x
-
-#  172| unless ...
-#-----|  -> x
-
-#  172| x
-#-----|  -> 10
-
-#  172| ... == ...
-#-----| false -> self
-#-----| true -> self
-
-#  172| 10
-#-----|  -> ... == ...
-
-#  172| then ...
-#-----|  -> unless ...
-
-#  172| call to puts
-#-----|  -> then ...
-
-#  172| self
-#-----|  -> hi
-
-#  172| "hi"
-#-----|  -> call to puts
-
-#  172| hi
-#-----|  -> "hi"
-
-#  172| else ...
-#-----|  -> unless ...
-
-#  172| call to puts
-#-----|  -> else ...
-
-#  172| self
-#-----|  -> bye
-
-#  172| "bye"
-#-----|  -> call to puts
-
-#  172| bye
-#-----|  -> "bye"
-
-#  174| call to puts
-#-----|  -> ... unless ...
-
-#  174| self
-#-----|  -> hi
-
-#  174| ... unless ...
-#-----|  -> x
-
-#  174| "hi"
-#-----|  -> call to puts
-
-#  174| hi
-#-----|  -> "hi"
-
-#  174| x
-#-----|  -> 0
-
-#  174| ... == ...
-#-----| false -> self
-#-----| true -> ... unless ...
-
-#  174| 0
-#-----|  -> ... == ...
-
-#  176| until ...
-#-----|  -> i
-
-#  176| x
-#-----|  -> 10
-
-#  176| ... > ...
-#-----| true -> until ...
-#-----| false -> x
-
-#  176| 10
-#-----|  -> ... > ...
-
-#  176| do ...
-#-----|  -> x
-
-#  176| x
-#-----|  -> x
-
-#  176| x
-#-----|  -> 10
-
-#  176| ... = ...
-#-----|  -> self
-
-#  176| ... + ...
-#-----|  -> ... = ...
-
-#  176| 10
-#-----|  -> ... + ...
-
-#  176| call to puts
-#-----|  -> do ...
-
-#  176| self
-#-----|  -> hello
-
-#  176| "hello"
-#-----|  -> call to puts
-
-#  176| hello
-#-----|  -> "hello"
-
-#  178| i
-#-----|  -> 0
-
-#  178| ... = ...
-#-----|  -> i
-
-#  178| 0
-#-----|  -> ... = ...
-
-#  179| ( ... )
-#-----|  -> i
-
-#  179| ... until ...
-#-----|  -> x
-
-#  179| call to puts
-#-----|  -> i
-
-#  179| self
-#-----|  -> hello
-
-#  179| "hello"
-#-----|  -> call to puts
-
-#  179| hello
-#-----|  -> "hello"
-
-#  179| i
-#-----|  -> i
-
-#  179| i
-#-----|  -> 1
-
-#  179| ... = ...
-#-----|  -> ( ... )
-
-#  179| ... + ...
-#-----|  -> ... = ...
-
-#  179| 1
-#-----|  -> ... + ...
-
-#  179| i
-#-----|  -> 10
-
-#  179| ... == ...
-#-----| true -> ... until ...
-#-----| false -> self
-
-#  179| 10
-#-----|  -> ... == ...
-
-#  181| x
-#-----|  -> 0
-
-#  181| ... = ...
-#-----|  -> x
-
-#  181| 0
-#-----|  -> ... = ...
-
-#  182| while ...
-#-----|  -> i
-
-#  182| x
-#-----|  -> 10
-
-#  182| ... < ...
-#-----| false -> while ...
-#-----| true -> x
-
-#  182| 10
-#-----|  -> ... < ...
-
-#  182| do ...
-#-----|  -> x
-
-#  183| x
-#-----|  -> x
-
-#  183| x
-#-----|  -> 1
-
-#  183| ... = ...
-#-----|  -> x
-
-#  183| ... + ...
-#-----|  -> ... = ...
-
-#  183| 1
-#-----|  -> ... + ...
-
-#  184| if ...
-#-----|  -> self
-
-#  184| x
-#-----|  -> 5
-
-#  184| ... == ...
-#-----| false -> if ...
-#-----| true -> redo
-
-#  184| 5
-#-----|  -> ... == ...
-
-#  184| redo
-#-----| redo -> x
-
-#  185| call to puts
-#-----|  -> do ...
-
-#  185| self
-#-----|  -> x
-
-#  185| x
-#-----|  -> call to puts
-
-#  188| ( ... )
-#-----|  -> i
-
-#  188| ... while ...
-#-----|  -> run_block
-
-#  188| call to puts
-#-----|  -> i
-
-#  188| self
-#-----|  -> hello
-
-#  188| "hello"
-#-----|  -> call to puts
-
-#  188| hello
-#-----|  -> "hello"
-
-#  188| i
-#-----|  -> i
-
-#  188| i
-#-----|  -> 1
-
-#  188| ... = ...
-#-----|  -> ( ... )
-
-#  188| ... - ...
-#-----|  -> ... = ...
-
-#  188| 1
-#-----|  -> ... - ...
-
-#  188| i
-#-----|  -> 0
-
-#  188| ... != ...
-#-----| false -> ... while ...
-#-----| true -> self
-
-#  188| 0
-#-----|  -> ... != ...
-
-#  190| enter run_block
-#-----|  -> 42
-
-#  190| exit run_block
-
-#  190| exit run_block (normal)
-#-----|  -> exit run_block
-
-#  190| run_block
-#-----|  -> self
-
-#  191| yield ...
-#-----|  -> exit run_block (normal)
-
-#  191| 42
-#-----|  -> yield ...
-
-#  194| call to run_block
-#-----|  -> forward_param
-
-#  194| self
-#-----|  -> { ... }
-
-#  194| enter { ... }
-#-----|  -> x
-
-#  194| exit { ... }
-
-#  194| exit { ... } (normal)
-#-----|  -> exit { ... }
-
-#  194| { ... }
-#-----|  -> call to run_block
-
-#  194| x
-#-----|  -> self
-
-#  194| call to puts
-#-----|  -> exit { ... } (normal)
-
-#  194| self
-#-----|  -> x
-
-#  194| x
-#-----|  -> call to puts
-
-#  196| enter forward_param
-#-----|  -> a
-
-#  196| exit forward_param
-
-#  196| exit forward_param (normal)
-#-----|  -> exit forward_param
-
-#  196| forward_param
-#-----|  -> 1
-
-#  196| a
-#-----|  -> b
-
-#  196| b
-#-----|  -> ...
-
-#  196| ...
-#-----|  -> self
-
-#  197| call to bar
-#-----|  -> exit forward_param (normal)
-
-#  197| self
-#-----|  -> b
-
-#  197| b
-#-----|  -> ...
-
-#  197| ...
-#-----|  -> call to bar
-
-#  200| 1
-#-----|  -> { ... }
-
-#  200| call to times
-#-----|  -> 2
-
-#  200| enter { ... }
-#-----|  -> a
-
-#  200| exit { ... }
-
-#  200| exit { ... } (normal)
-#-----|  -> exit { ... }
-
-#  200| { ... }
-#-----|  -> call to times
-
-#  200| a
-#-----|  -> b
-
-#  200| b
-#-----|  -> Kernel
-
-#  200| Kernel
-#-----|  -> a
-
-#  200| call to puts
-#-----|  -> exit { ... } (normal)
-
-#  200| a
-#-----|  -> call to puts
-
-#  202| 2
-#-----|  -> do ... end
-
-#  202| call to times
-#-----|  -> __synth__0__1
-
-#  202| do ... end
-#-----|  -> call to times
-
-#  202| enter do ... end
-#-----|  -> c
-
-#  202| exit do ... end
-
-#  202| exit do ... end (normal)
-#-----|  -> exit do ... end
-
-#  202| c
-#-----|  -> d
-
-#  202| d
-#-----|  -> Kernel
-
-#  202| Kernel
-#-----|  -> c
-
-#  202| call to puts
-#-----|  -> exit do ... end (normal)
-
-#  202| c
-#-----|  -> call to puts
-
-#  205| ... = ...
-#-----|  -> nil
-
-#  205| __synth__0__1
-#-----|  -> self
-
-#  205| __synth__0__1
-#-----|  -> call to ==
-
-#  205| __synth__0__1
-#-----|  -> 1
-
-#  205| call to foo
-#-----|  -> ... = ...
-
-#  205| nil
-#-----|  -> if ...
-
-#  205| self
-#-----|  -> call to foo
-
-#  205| ...
-#-----|  -> filter_nil
-
-#  205| call to bar
-#-----|  -> if ...
-
-#  205| call to ==
-#-----| false -> __synth__0__1
-#-----| true -> nil
-
-#  205| if ...
-#-----|  -> ...
-
-#  205| nil
-#-----|  -> __synth__0__1
-
-#  205| 1
-#-----|  -> 2
-
-#  205| 2
-#-----|  -> { ... }
-
-#  205| enter { ... }
-#-----|  -> x
-
-#  205| exit { ... }
-
-#  205| exit { ... } (normal)
-#-----|  -> exit { ... }
-
-#  205| { ... }
-#-----|  -> call to bar
-
-#  205| x
-#-----|  -> x
-
-#  205| x
-#-----|  -> exit { ... } (normal)
-
-#  207| enter filter_nil
-#-----|  -> list
-
-#  207| exit filter_nil
-
-#  207| exit filter_nil (normal)
-#-----|  -> exit filter_nil
-
-#  207| filter_nil
-#-----|  -> self
-
-#  207| list
-#-----|  -> list
-
-#  208| list
-#-----|  -> do ... end
-
-#  208| call to reject
-#-----|  -> exit filter_nil (normal)
-
-#  208| do ... end
-#-----|  -> call to reject
-
-#  208| enter do ... end
-#-----|  -> elem
-
-#  208| exit do ... end
-
-#  208| exit do ... end (normal)
-#-----|  -> exit do ... end
-
-#  208| elem
-#-----|  -> __synth__0
-
-#  208| __synth__0
-#-----|  -> __synth__0
-
-#  208| __synth__0
-#-----|  -> elem
-
-#  209| elem
-#-----|  -> call to nil?
-
-#  209| call to nil?
-#-----|  -> exit do ... end (normal)
-
-#  213| call to do_something
-#-----|  -> exit cfg.rb (normal)
-
-#  213| self
-#-----|  -> do ... end
-
-#  213| do ... end
-#-----|  -> call to do_something
-
-#  213| enter do ... end
-#-----|  -> self
-
-#  213| exit do ... end
-
-#  213| exit do ... end (normal)
-#-----|  -> exit do ... end
-
-#  214| self
-#-----|  -> call to something
-
-#  214| call to something
-#-----|  -> self
-
-#  215| call to something_else
-#-----|  -> exit do ... end (normal)
-
-#  215| self
-#-----|  -> call to something_else
-
-constant_compound_assign.rb:
-#    1| Foo
-#-----|  -> foo_before
-
-#    1| enter constant_compound_assign.rb
-#-----|  -> Foo
-
-#    1| exit constant_compound_assign.rb
-
-#    1| exit constant_compound_assign.rb (normal)
-#-----|  -> exit constant_compound_assign.rb
-
-#    2| foo_before
-#-----|  -> FOO_CONSTANT
-
-#    5| FOO_CONSTANT
-#-----|  -> FOO_CONSTANT
-
-#    5| FOO_CONSTANT
-#-----| true -> ... || ...
-#-----| false -> 123
-
-#    5| ... = ...
-#-----|  -> foo_after
-
-#    5| ... || ...
-#-----|  -> ... = ...
-
-#    5| 123
-#-----|  -> ... || ...
-
-#    7| foo_after
-#-----|  -> top_before
-
-#   11| top_before
-#-----|  -> TOP_CONSTANT
-
-#   14| TOP_CONSTANT
-#-----|  -> TOP_CONSTANT
-
-#   14| TOP_CONSTANT
-#-----| true -> ... || ...
-#-----| false -> 123
-
-#   14| ... = ...
-#-----|  -> top_after
-
-#   14| ... || ...
-#-----|  -> ... = ...
-
-#   14| 123
-#-----|  -> ... || ...
-
-#   16| top_after
-#-----|  -> TOP_CONSTANT2
-
-#   19| TOP_CONSTANT2
-#-----|  -> TOP_CONSTANT2
-
-#   19| TOP_CONSTANT2
-#-----| true -> ... || ...
-#-----| false -> 123
-
-#   19| ... = ...
-#-----|  -> top_after2
-
-#   19| ... || ...
-#-----|  -> ... = ...
-
-#   19| 123
-#-----|  -> ... || ...
-
-#   21| top_after2
-#-----|  -> exit constant_compound_assign.rb (normal)
-
-desugar.rb:
-#    1| enter m1
-#-----|  -> x
-
-#    1| exit m1
-
-#    1| exit m1 (normal)
-#-----|  -> exit m1
-
-#    1| m1
-#-----|  -> m2
-
-#    1| enter desugar.rb
-#-----|  -> m1
-
-#    1| exit desugar.rb
-
-#    1| exit desugar.rb (normal)
-#-----|  -> exit desugar.rb
-
-#    1| x
-#-----|  -> x
-
-#    2| x
-#-----|  -> x
-
-#    2| x
-#-----|  -> 1
-
-#    2| ... = ...
-#-----|  -> exit m1 (normal)
-
-#    2| ... + ...
-#-----|  -> ... = ...
-
-#    2| 1
-#-----|  -> ... + ...
-
-#    5| enter m2
-#-----|  -> x
-
-#    5| exit m2
-
-#    5| exit m2 (normal)
-#-----|  -> exit m2
-
-#    5| m2
-#-----|  -> m3
-
-#    5| x
-#-----|  -> x
-
-#    6| x
-#-----|  -> call to foo
-
-#    6| call to foo
-#-----|  -> __synth__0
-
-#    6| __synth__0
-#-----|  -> ...
-
-#    6| call to count=
-#-----|  -> __synth__0
-
-#    6| ...
-#-----|  -> exit m2 (normal)
-
-#    6| ... = ...
-#-----|  -> call to count=
-
-#    6| 1
-#-----|  -> ... = ...
-
-#    6| __synth__0
-#-----|  -> 1
-
-#    9| enter m3
-#-----|  -> x
-
-#    9| exit m3
-
-#    9| exit m3 (normal)
-#-----|  -> exit m3
-
-#    9| m3
-#-----|  -> m4
-
-#    9| x
-#-----|  -> x
-
-#   10| x
-#-----|  -> call to foo
-
-#   10| call to foo
-#-----|  -> 0
-
-#   10| __synth__0
-#-----|  -> ...
-
-#   10| call to []=
-#-----|  -> __synth__0
-
-#   10| ...
-#-----|  -> exit m3 (normal)
-
-#   10| 0
-#-----|  -> __synth__0
-
-#   10| ... = ...
-#-----|  -> call to []=
-
-#   10| 1
-#-----|  -> ... = ...
-
-#   10| __synth__0
-#-----|  -> 1
-
-#   13| enter m4
-#-----|  -> x
-
-#   13| exit m4
-
-#   13| exit m4 (normal)
-#-----|  -> exit m4
-
-#   13| m4
-#-----|  -> m5
-
-#   13| x
-#-----|  -> __synth__0
-
-#   14| x
-#-----|  -> call to foo
-
-#   14| ... = ...
-#-----|  -> __synth__1
-
-#   14| __synth__0
-#-----|  -> x
-
-#   14| __synth__0
-#-----|  -> __synth__1
-
-#   14| __synth__0
-#-----|  -> call to count
-
-#   14| call to foo
-#-----|  -> ... = ...
-
-#   14| __synth__1
-#-----|  -> call to count=
-
-#   14| call to count
-#-----|  -> 1
-
-#   14| call to count=
-#-----|  -> __synth__1
-
-#   14| ...
-#-----|  -> exit m4 (normal)
-
-#   14| ... + ...
-#-----|  -> ... = ...
-
-#   14| ... = ...
-#-----|  -> __synth__0
-
-#   14| __synth__1
-#-----|  -> ...
-
-#   14| __synth__1
-#-----|  -> __synth__0
-
-#   14| 1
-#-----|  -> ... + ...
-
-#   17| enter m5
-#-----|  -> x
-
-#   17| exit m5
-
-#   17| exit m5 (normal)
-#-----|  -> exit m5
-
-#   17| m5
-#-----|  -> m6
-
-#   17| x
-#-----|  -> y
-
-#   17| y
-#-----|  -> __synth__0
-
-#   18| x
-#-----|  -> call to foo
-
-#   18| ... = ...
-#-----|  -> __synth__1
-
-#   18| __synth__0
-#-----|  -> x
-
-#   18| __synth__0
-#-----|  -> __synth__1
-
-#   18| __synth__0
-#-----|  -> __synth__1
-
-#   18| call to foo
-#-----|  -> ... = ...
-
-#   18| __synth__4
-#-----|  -> call to []=
-
-#   18| call to []
-#-----|  -> 1
-
-#   18| call to []=
-#-----|  -> __synth__4
-
-#   18| ...
-#-----|  -> exit m5 (normal)
-
-#   18| ... = ...
-#-----|  -> __synth__2
-
-#   18| 0
-#-----|  -> ... = ...
-
-#   18| __synth__1
-#-----|  -> 0
-
-#   18| __synth__1
-#-----|  -> __synth__2
-
-#   18| __synth__1
-#-----|  -> __synth__2
-
-#   18| y
-#-----|  -> call to bar
-
-#   18| ... = ...
-#-----|  -> __synth__3
-
-#   18| __synth__2
-#-----|  -> y
-
-#   18| __synth__2
-#-----|  -> __synth__3
-
-#   18| __synth__2
-#-----|  -> __synth__3
-
-#   18| call to bar
-#-----|  -> ... = ...
-
-#   18| x
-#-----|  -> call to baz
-
-#   18| call to baz
-#-----|  -> 3
-
-#   18| ... + ...
-#-----|  -> ... = ...
-
-#   18| ... = ...
-#-----|  -> __synth__4
-
-#   18| __synth__3
-#-----|  -> x
-
-#   18| __synth__3
-#-----|  -> __synth__4
-
-#   18| __synth__3
-#-----|  -> call to []
-
-#   18| 3
-#-----|  -> ... + ...
-
-#   18| ... + ...
-#-----|  -> ... = ...
-
-#   18| ... = ...
-#-----|  -> __synth__0
-
-#   18| __synth__4
-#-----|  -> ...
-
-#   18| __synth__4
-#-----|  -> __synth__0
-
-#   18| 1
-#-----|  -> ... + ...
-
-#   21| enter m6
-#-----|  -> __synth__2
-
-#   21| exit m6
-
-#   21| exit m6 (normal)
-#-----|  -> exit m6
-
-#   21| m6
-#-----|  -> m7
-
-#   22| ... = ...
-#-----|  -> y
-
-#   22| 0
-#-----|  -> call to []
-
-#   22| __synth__3
-#-----|  -> 0
-
-#   22| call to []
-#-----|  -> ... = ...
-
-#   22| x
-#-----|  -> __synth__3
-
-#   22| ...
-#-----|  -> exit m6 (normal)
-
-#   22| -2
-#-----|  -> _ .. _
-
-#   22| ... = ...
-#-----|  -> __synth__2
-
-#   22| 1
-#-----|  -> -2
-
-#   22| _ .. _
-#-----|  -> call to []
-
-#   22| __synth__3
-#-----|  -> 1
-
-#   22| call to []
-#-----|  -> ... = ...
-
-#   22| y
-#-----|  -> __synth__3
-
-#   22| ... = ...
-#-----|  -> __synth__3
-
-#   22| __synth__2
-#-----|  -> self
-
-#   22| call to z
-#-----|  -> ... = ...
-
-#   22| self
-#-----|  -> call to z
-
-#   22| -1
-#-----|  -> call to []
-
-#   22| ...
-#-----|  -> ...
-
-#   22| ... = ...
-#-----|  -> call to bar=
-
-#   22| __synth__0__1
-#-----|  -> ...
-
-#   22| __synth__0__1
-#-----|  -> __synth__3
-
-#   22| __synth__2
-#-----|  -> __synth__0__1
-
-#   22| __synth__3
-#-----|  -> -1
-
-#   22| call to []
-#-----|  -> ... = ...
-
-#   22| call to bar=
-#-----|  -> __synth__0__1
-
-#   22| * ...
-#-----|  -> ... = ...
-
-#   22| ... = ...
-#-----|  -> x
-
-#   22| Array
-#-----|  -> 1
-
-#   22| __synth__3
-#-----|  -> Array
-
-#   22| call to []
-#-----|  -> * ...
-
-#   22| 1
-#-----|  -> 2
-
-#   22| 2
-#-----|  -> 3
-
-#   22| 3
-#-----|  -> 4
-
-#   22| 4
-#-----|  -> call to []
-
-#   25| enter m7
-#-----|  -> __synth__2
-
-#   25| exit m7
-
-#   25| exit m7 (normal)
-#-----|  -> exit m7
-
-#   25| m7
-#-----|  -> X
-
-#   26| ... = ...
-#-----|  -> __synth__2__1
-
-#   26| 0
-#-----|  -> call to []
-
-#   26| __synth__2
-#-----|  -> 0
-
-#   26| call to []
-#-----|  -> ... = ...
-
-#   26| x
-#-----|  -> __synth__2
-
-#   26| ...
-#-----|  -> exit m7 (normal)
-
-#   26| * ...
-#-----|  -> ... = ...
-
-#   26| ...
-#-----|  -> ...
-
-#   26| ... = ...
-#-----|  -> y
-
-#   26| 1
-#-----|  -> call to []
-
-#   26| __synth__2
-#-----|  -> 1
-
-#   26| __synth__2__1
-#-----|  -> __synth__2
-
-#   26| call to []
-#-----|  -> * ...
-
-#   26| ... = ...
-#-----|  -> z
-
-#   26| 0
-#-----|  -> call to []
-
-#   26| __synth__2__1
-#-----|  -> 0
-
-#   26| call to []
-#-----|  -> ... = ...
-
-#   26| y
-#-----|  -> __synth__2__1
-
-#   26| ... = ...
-#-----|  -> ...
-
-#   26| 1
-#-----|  -> call to []
-
-#   26| __synth__2__1
-#-----|  -> 1
-
-#   26| call to []
-#-----|  -> ... = ...
-
-#   26| z
-#-----|  -> __synth__2__1
-
-#   26| * ...
-#-----|  -> ... = ...
-
-#   26| ... = ...
-#-----|  -> x
-
-#   26| Array
-#-----|  -> 1
-
-#   26| __synth__2
-#-----|  -> Array
-
-#   26| call to []
-#-----|  -> * ...
-
-#   26| 1
-#-----|  -> Array
-
-#   26| Array
-#-----|  -> 2
-
-#   26| call to []
-#-----|  -> call to []
-
-#   26| 2
-#-----|  -> 3
-
-#   26| 3
-#-----|  -> call to []
-
-#   29| X
-#-----|  -> self
-
-#   30| @x
-#-----|  -> 1
-
-#   30| self
-#-----|  -> @x
-
-#   30| ... = ...
-#-----|  -> self
-
-#   30| 1
-#-----|  -> ... = ...
-
-#   31| @x
-#-----|  -> self
-
-#   31| @x
-#-----|  -> 2
-
-#   31| self
-#-----|  -> @x
-
-#   31| self
-#-----|  -> @x
-
-#   31| ... = ...
-#-----|  -> @@y
-
-#   31| ... + ...
-#-----|  -> ... = ...
-
-#   31| 2
-#-----|  -> ... + ...
-
-#   33| @@y
-#-----|  -> 3
-
-#   33| ... = ...
-#-----|  -> @@y
-
-#   33| 3
-#-----|  -> ... = ...
-
-#   34| @@y
-#-----|  -> @@y
-
-#   34| @@y
-#-----|  -> 4
-
-#   34| ... = ...
-#-----|  -> $global_var
-
-#   34| ... / ...
-#-----|  -> ... = ...
-
-#   34| 4
-#-----|  -> ... / ...
-
-#   37| $global_var
-#-----|  -> 5
-
-#   37| ... = ...
-#-----|  -> $global_var
-
-#   37| 5
-#-----|  -> ... = ...
-
-#   38| $global_var
-#-----|  -> $global_var
-
-#   38| $global_var
-#-----|  -> 6
-
-#   38| ... = ...
-#-----|  -> exit desugar.rb (normal)
-
-#   38| ... * ...
-#-----|  -> ... = ...
-
-#   38| 6
-#-----|  -> ... * ...
-
-exit.rb:
-#    1| enter m1
-#-----|  -> x
-
-#    1| exit m1
-
-#    1| exit m1 (abnormal)
-#-----|  -> exit m1
-
-#    1| exit m1 (normal)
-#-----|  -> exit m1
-
-#    1| m1
-#-----|  -> m2
-
-#    1| enter exit.rb
-#-----|  -> m1
-
-#    1| exit exit.rb
-
-#    1| exit exit.rb (normal)
-#-----|  -> exit exit.rb
-
-#    1| x
-#-----|  -> x
-
-#    2| if ...
-#-----|  -> self
-
-#    2| x
-#-----|  -> 2
-
-#    2| ... > ...
-#-----| false -> if ...
-#-----| true -> self
-
-#    2| 2
-#-----|  -> ... > ...
-
-#    3| call to exit
-#-----| exit -> exit m1 (abnormal)
-
-#    3| self
-#-----|  -> 1
-
-#    3| 1
-#-----|  -> call to exit
-
-#    5| call to puts
-#-----|  -> exit m1 (normal)
-
-#    5| self
-#-----|  -> x <= 2
-
-#    5| "x <= 2"
-#-----|  -> call to puts
-
-#    5| x <= 2
-#-----|  -> "x <= 2"
-
-#    8| enter m2
-#-----|  -> x
-
-#    8| exit m2
-
-#    8| exit m2 (abnormal)
-#-----|  -> exit m2
-
-#    8| exit m2 (normal)
-#-----|  -> exit m2
-
-#    8| m2
-#-----|  -> exit exit.rb (normal)
-
-#    8| x
-#-----|  -> x
-
-#    9| if ...
-#-----|  -> self
-
-#    9| x
-#-----|  -> 2
-
-#    9| ... > ...
-#-----| false -> if ...
-#-----| true -> self
-
-#    9| 2
-#-----|  -> ... > ...
-
-#   10| call to abort
-#-----| exit -> exit m2 (abnormal)
-
-#   10| self
-#-----|  -> abort!
-
-#   10| "abort!"
-#-----|  -> call to abort
-
-#   10| abort!
-#-----|  -> "abort!"
-
-#   12| call to puts
-#-----|  -> exit m2 (normal)
-
-#   12| self
-#-----|  -> x <= 2
-
-#   12| "x <= 2"
-#-----|  -> call to puts
-
-#   12| x <= 2
-#-----|  -> "x <= 2"
-
-heredoc.rb:
-#    1| double_heredoc
-#-----|  -> exit heredoc.rb (normal)
-
-#    1| enter double_heredoc
-#-----|  -> self
-
-#    1| exit double_heredoc
-
-#    1| exit double_heredoc (normal)
-#-----|  -> exit double_heredoc
-
-#    1| enter heredoc.rb
-#-----|  -> double_heredoc
-
-#    1| exit heredoc.rb
-
-#    1| exit heredoc.rb (normal)
-#-----|  -> exit heredoc.rb
-
-#    2| call to puts
-#-----|  -> exit double_heredoc (normal)
-
-#    2| self
-#-----|  -> 
-#-----|     hello
-#-----| 
-
-#    2| <<A
-#-----|  -> 
-#-----|    world
-#-----| 
-
-#    2| <<A
-#-----|  -> call to puts
-
-#    2| 
-#    2|     hello
-#    2| 
-#-----|  -> <<A
-
-#    4| 
-#    4|    world
-#    4| 
-#-----|  -> <<A
-
-ifs.rb:
-#    1| enter m1
-#-----|  -> x
-
-#    1| exit m1
-
-#    1| exit m1 (normal)
-#-----|  -> exit m1
-
-#    1| m1
-#-----|  -> m2
-
-#    1| enter ifs.rb
-#-----|  -> m1
-
-#    1| exit ifs.rb
-
-#    1| exit ifs.rb (normal)
-#-----|  -> exit ifs.rb
-
-#    1| x
-#-----|  -> x
-
-#    2| if ...
-#-----|  -> exit m1 (normal)
-
-#    2| x
-#-----|  -> 2
-
-#    2| ... > ...
-#-----| true -> self
-#-----| false -> x
-
-#    2| 2
-#-----|  -> ... > ...
-
-#    2| then ...
-#-----|  -> if ...
-
-#    3| call to puts
-#-----|  -> then ...
-
-#    3| self
-#-----|  -> x is greater than 2
-
-#    3| "x is greater than 2"
-#-----|  -> call to puts
-
-#    3| x is greater than 2
-#-----|  -> "x is greater than 2"
-
-#    4| elsif ...
-#-----|  -> if ...
-
-#    4| x
-#-----|  -> 2
-
-#    4| ... <= ...
-#-----| false -> [false] ... and ...
-#-----| true -> x
-
-#    4| [false] ... and ...
-#-----| false -> [false] ... and ...
-
-#    4| [true] ... and ...
-#-----| true -> x
-
-#    4| [false] ... and ...
-#-----| false -> self
-
-#    4| [true] ... and ...
-#-----| true -> self
-
-#    4| 2
-#-----|  -> ... <= ...
-
-#    4| x
-#-----|  -> 0
-
-#    4| ... > ...
-#-----| false -> [false] ... and ...
-#-----| true -> [true] ... and ...
-
-#    4| 0
-#-----|  -> ... > ...
-
-#    4| [false] ! ...
-#-----| false -> [false] ... and ...
-
-#    4| [true] ! ...
-#-----| true -> [true] ... and ...
-
-#    4| [false] ( ... )
-#-----| false -> [true] ! ...
-
-#    4| [true] ( ... )
-#-----| true -> [false] ! ...
-
-#    4| x
-#-----|  -> 5
-
-#    4| ... == ...
-#-----| false -> [false] ( ... )
-#-----| true -> [true] ( ... )
-
-#    4| 5
-#-----|  -> ... == ...
-
-#    4| then ...
-#-----|  -> elsif ...
-
-#    5| call to puts
-#-----|  -> then ...
-
-#    5| self
-#-----|  -> x is 1
-
-#    5| "x is 1"
-#-----|  -> call to puts
-
-#    5| x is 1
-#-----|  -> "x is 1"
-
-#    6| else ...
-#-----|  -> elsif ...
-
-#    7| call to puts
-#-----|  -> else ...
-
-#    7| self
-#-----|  -> I can't guess the number
-
-#    7| "I can't guess the number"
-#-----|  -> call to puts
-
-#    7| I can't guess the number
-#-----|  -> "I can't guess the number"
-
-#   11| enter m2
-#-----|  -> b
-
-#   11| exit m2
-
-#   11| exit m2 (normal)
-#-----|  -> exit m2
-
-#   11| m2
-#-----|  -> m3
-
-#   11| b
-#-----|  -> b
-
-#   12| if ...
-#-----|  -> 1
-
-#   12| b
-#-----| false -> if ...
-#-----| true -> 0
-
-#   13| return
-#-----| return -> exit m2 (normal)
-
-#   13| 0
-#-----|  -> return
-
-#   15| return
-#-----| return -> exit m2 (normal)
-
-#   15| 1
-#-----|  -> return
-
-#   18| enter m3
-#-----|  -> x
-
-#   18| exit m3
-
-#   18| exit m3 (normal)
-#-----|  -> exit m3
-
-#   18| m3
-#-----|  -> m4
-
-#   18| x
-#-----|  -> x
-
-#   19| if ...
-#-----|  -> self
-
-#   19| x
-#-----|  -> 0
-
-#   19| ... < ...
-#-----| false -> if ...
-#-----| true -> x
-
-#   19| 0
-#-----|  -> ... < ...
-
-#   19| then ...
-#-----|  -> if ...
-
-#   20| x
-#-----|  -> x
-
-#   20| ... = ...
-#-----|  -> x
-
-#   20| - ...
-#-----|  -> ... = ...
-
-#   20| x
-#-----|  -> - ...
-
-#   21| if ...
-#-----|  -> then ...
-
-#   21| x
-#-----|  -> 10
-
-#   21| ... > ...
-#-----| false -> if ...
-#-----| true -> x
-
-#   21| 10
-#-----|  -> ... > ...
-
-#   21| then ...
-#-----|  -> if ...
-
-#   22| x
-#-----|  -> x
-
-#   22| ... = ...
-#-----|  -> then ...
-
-#   22| x
-#-----|  -> 1
-
-#   22| ... - ...
-#-----|  -> ... = ...
-
-#   22| 1
-#-----|  -> ... - ...
-
-#   25| call to puts
-#-----|  -> exit m3 (normal)
-
-#   25| self
-#-----|  -> x
-
-#   25| x
-#-----|  -> call to puts
-
-#   28| enter m4
-#-----|  -> b1
-
-#   28| exit m4
-
-#   28| exit m4 (normal)
-#-----|  -> exit m4
-
-#   28| m4
-#-----|  -> m5
-
-#   28| b1
-#-----|  -> b2
-
-#   28| b2
-#-----|  -> b3
-
-#   28| b3
-#-----|  -> b1
-
-#   29| return
-#-----| return -> exit m4 (normal)
-
-#   29| [false] ( ... )
-#-----| false -> !b2 || !b3
-
-#   29| [true] ( ... )
-#-----| true -> b2 || b3
-
-#   29| ... ? ... : ...
-#-----|  -> return
-
-#   29| b1
-#-----| true -> b2
-#-----| false -> b3
-
-#   29| [false] ... ? ... : ...
-#-----| false -> [false] ( ... )
-
-#   29| [true] ... ? ... : ...
-#-----| true -> [true] ( ... )
-
-#   29| b2
-#-----| false -> [false] ... ? ... : ...
-#-----| true -> [true] ... ? ... : ...
-
-#   29| b3
-#-----| false -> [false] ... ? ... : ...
-#-----| true -> [true] ... ? ... : ...
-
-#   29| "b2 || b3"
-#-----|  -> ... ? ... : ...
-
-#   29| b2 || b3
-#-----|  -> "b2 || b3"
-
-#   29| "!b2 || !b3"
-#-----|  -> ... ? ... : ...
-
-#   29| !b2 || !b3
-#-----|  -> "!b2 || !b3"
-
-#   32| enter m5
-#-----|  -> b1
-
-#   32| exit m5
-
-#   32| exit m5 (normal)
-#-----|  -> exit m5
-
-#   32| m5
-#-----|  -> 1
-
-#   32| b1
-#-----|  -> b2
-
-#   32| b2
-#-----|  -> b3
-
-#   32| b3
-#-----|  -> b4
-
-#   32| b4
-#-----|  -> b5
-
-#   32| b5
-#-----|  -> b1
-
-#   33| if ...
-#-----|  -> exit m5 (normal)
-
-#   33| [false] ( ... )
-#-----| false -> !b2 || !b4 || !b5
-
-#   33| [true] ( ... )
-#-----| true -> b2 || b4 || b5
-
-#   33| [false] if ...
-#-----| false -> [false] ( ... )
-
-#   33| [true] if ...
-#-----| true -> [true] ( ... )
-
-#   33| b1
-#-----| true -> b2
-#-----| false -> b3
-
-#   33| [false] then ...
-#-----| false -> [false] if ...
-
-#   33| [true] then ...
-#-----| true -> [true] if ...
-
-#   33| b2
-#-----| false -> [false] then ...
-#-----| true -> [true] then ...
-
-#   33| [false] elsif ...
-#-----| false -> [false] if ...
-
-#   33| [true] elsif ...
-#-----| true -> [true] if ...
-
-#   33| b3
-#-----| true -> b4
-#-----| false -> b5
-
-#   33| [false] then ...
-#-----| false -> [false] elsif ...
-
-#   33| [true] then ...
-#-----| true -> [true] elsif ...
-
-#   33| b4
-#-----| false -> [false] then ...
-#-----| true -> [true] then ...
-
-#   33| [false] else ...
-#-----| false -> [false] elsif ...
-
-#   33| [true] else ...
-#-----| true -> [true] elsif ...
-
-#   33| b5
-#-----| false -> [false] else ...
-#-----| true -> [true] else ...
-
-#   33| then ...
-#-----|  -> if ...
-
-#   33| "b2 || b4 || b5"
-#-----|  -> then ...
-
-#   33| b2 || b4 || b5
-#-----|  -> "b2 || b4 || b5"
-
-#   33| else ...
-#-----|  -> if ...
-
-#   33| "!b2 || !b4 || !b5"
-#-----|  -> else ...
-
-#   33| !b2 || !b4 || !b5
-#-----|  -> "!b2 || !b4 || !b5"
-
-#   36| conditional_method_def
-#-----|  -> ... unless ...
-
-#   36| enter conditional_method_def
-#-----|  -> self
-
-#   36| exit conditional_method_def
-
-#   36| exit conditional_method_def (normal)
-#-----|  -> exit conditional_method_def
-
-#   36| ... unless ...
-#-----|  -> constant_condition
-
-#   37| call to puts
-#-----|  -> exit conditional_method_def (normal)
-
-#   37| self
-#-----|  -> bla
-
-#   37| "bla"
-#-----|  -> call to puts
-
-#   37| bla
-#-----|  -> "bla"
-
-#   38| 1
-#-----|  -> 2
-
-#   38| ... == ...
-#-----| false -> conditional_method_def
-#-----| true -> ... unless ...
-
-#   38| 2
-#-----|  -> ... == ...
-
-#   40| constant_condition
-#-----|  -> empty_else
-
-#   40| enter constant_condition
-#-----|  -> true
-
-#   40| exit constant_condition
-
-#   40| exit constant_condition (normal)
-#-----|  -> exit constant_condition
-
-#   41| if ...
-#-----|  -> exit constant_condition (normal)
-
-#   41| [false] ! ...
-#-----| false -> if ...
-
-#   41| true
-#-----| true -> [false] ! ...
-
-#   46| empty_else
-#-----|  -> disjunct
-
-#   46| enter empty_else
-#-----|  -> b
-
-#   46| exit empty_else
-
-#   46| exit empty_else (normal)
-#-----|  -> exit empty_else
-
-#   46| b
-#-----|  -> b
-
-#   47| if ...
-#-----|  -> self
-
-#   47| b
-#-----| true -> self
-#-----| false -> else ...
-
-#   47| then ...
-#-----|  -> if ...
-
-#   48| call to puts
-#-----|  -> then ...
-
-#   48| self
-#-----|  -> true
-
-#   48| "true"
-#-----|  -> call to puts
-
-#   48| true
-#-----|  -> "true"
-
-#   49| else ...
-#-----|  -> if ...
-
-#   51| call to puts
-#-----|  -> exit empty_else (normal)
-
-#   51| self
-#-----|  -> done
-
-#   51| "done"
-#-----|  -> call to puts
-
-#   51| done
-#-----|  -> "done"
-
-#   54| disjunct
-#-----|  -> exit ifs.rb (normal)
-
-#   54| enter disjunct
-#-----|  -> b1
-
-#   54| exit disjunct
-
-#   54| exit disjunct (normal)
-#-----|  -> exit disjunct
-
-#   54| b1
-#-----|  -> b2
-
-#   54| b2
-#-----|  -> b1
-
-#   55| if ...
-#-----|  -> exit disjunct (normal)
-
-#   55| [false] ( ... )
-#-----| false -> if ...
-
-#   55| [true] ( ... )
-#-----| true -> self
-
-#   55| b1
-#-----| true -> [true] ... || ...
-#-----| false -> b2
-
-#   55| [false] ... || ...
-#-----| false -> [false] ( ... )
-
-#   55| [true] ... || ...
-#-----| true -> [true] ( ... )
-
-#   55| b2
-#-----| false -> [false] ... || ...
-#-----| true -> [true] ... || ...
-
-#   55| then ...
-#-----|  -> if ...
-
-#   56| call to puts
-#-----|  -> then ...
-
-#   56| self
-#-----|  -> b1 or b2
-
-#   56| "b1 or b2"
-#-----|  -> call to puts
-
-#   56| b1 or b2
-#-----|  -> "b1 or b2"
-
-loops.rb:
-#    1| enter m1
-#-----|  -> x
-
-#    1| exit m1
-
-#    1| exit m1 (normal)
-#-----|  -> exit m1
-
-#    1| m1
-#-----|  -> m2
-
-#    1| enter loops.rb
-#-----|  -> m1
-
-#    1| exit loops.rb
-
-#    1| exit loops.rb (normal)
-#-----|  -> exit loops.rb
-
-#    1| x
-#-----|  -> x
-
-#    2| while ...
-#-----|  -> exit m1 (normal)
-
-#    2| x
-#-----|  -> 0
-
-#    2| ... >= ...
-#-----| false -> while ...
-#-----| true -> self
-
-#    2| 0
-#-----|  -> ... >= ...
-
-#    2| do ...
-#-----|  -> x
-
-#    3| call to puts
-#-----|  -> x
-
-#    3| self
-#-----|  -> x
-
-#    3| x
-#-----|  -> call to puts
-
-#    4| x
-#-----|  -> x
-
-#    4| x
-#-----|  -> 1
-
-#    4| ... = ...
-#-----|  -> do ...
-
-#    4| ... - ...
-#-----|  -> ... = ...
-
-#    4| 1
-#-----|  -> ... - ...
-
-#    8| enter m2
-#-----|  -> x
-
-#    8| exit m2
-
-#    8| exit m2 (normal)
-#-----|  -> exit m2
-
-#    8| m2
-#-----|  -> m3
-
-#    8| x
-#-----|  -> x
-
-#    9| while ...
-#-----|  -> self
-
-#    9| x
-#-----|  -> 0
-
-#    9| ... >= ...
-#-----| false -> while ...
-#-----| true -> self
-
-#    9| 0
-#-----|  -> ... >= ...
-
-#    9| do ...
-#-----|  -> x
-
-#   10| call to puts
-#-----|  -> x
-
-#   10| self
-#-----|  -> x
-
-#   10| x
-#-----|  -> call to puts
-
-#   11| x
-#-----|  -> x
-
-#   11| x
-#-----|  -> 1
-
-#   11| ... = ...
-#-----|  -> x
-
-#   11| ... - ...
-#-----|  -> ... = ...
-
-#   11| 1
-#-----|  -> ... - ...
-
-#   12| if ...
-#-----|  -> self
-
-#   12| x
-#-----|  -> 100
-
-#   12| ... > ...
-#-----| true -> break
-#-----| false -> x
-
-#   12| 100
-#-----|  -> ... > ...
-
-#   13| break
-#-----| break -> while ...
-
-#   14| elsif ...
-#-----|  -> if ...
-
-#   14| x
-#-----|  -> 50
-
-#   14| ... > ...
-#-----| true -> next
-#-----| false -> x
-
-#   14| 50
-#-----|  -> ... > ...
-
-#   15| next
-#-----| next -> x
-
-#   16| elsif ...
-#-----|  -> elsif ...
-
-#   16| x
-#-----|  -> 10
-
-#   16| ... > ...
-#-----| false -> elsif ...
-#-----| true -> redo
-
-#   16| 10
-#-----|  -> ... > ...
-
-#   17| redo
-#-----| redo -> self
-
-#   19| call to puts
-#-----|  -> do ...
-
-#   19| self
-#-----|  -> Iter
-
-#   19| "Iter"
-#-----|  -> call to puts
-
-#   19| Iter
-#-----|  -> "Iter"
-
-#   21| call to puts
-#-----|  -> exit m2 (normal)
-
-#   21| self
-#-----|  -> Done
-
-#   21| "Done"
-#-----|  -> call to puts
-
-#   21| Done
-#-----|  -> "Done"
-
-#   24| enter m3
-#-----|  -> Array
-
-#   24| exit m3
-
-#   24| exit m3 (normal)
-#-----|  -> exit m3
-
-#   24| m3
-#-----|  -> m4
-
-#   25| Array
-#-----|  -> 1
-
-#   25| call to []
-#-----|  -> do ... end
-
-#   25| call to each
-#-----|  -> exit m3 (normal)
-
-#   25| 1
-#-----|  -> 2
-
-#   25| 2
-#-----|  -> 3
-
-#   25| 3
-#-----|  -> call to []
-
-#   25| do ... end
-#-----|  -> call to each
-
-#   25| enter do ... end
-#-----|  -> x
-
-#   25| exit do ... end
-
-#   25| exit do ... end (normal)
-#-----|  -> exit do ... end
-
-#   25| x
-#-----|  -> self
-
-#   26| call to puts
-#-----|  -> exit do ... end (normal)
-
-#   26| self
-#-----|  -> x
-
-#   26| x
-#-----|  -> call to puts
-
-#   30| enter m4
-#-----|  -> x
-
-#   30| exit m4
-
-#   30| exit m4 (normal)
-#-----|  -> exit m4
-
-#   30| m4
-#-----|  -> exit loops.rb (normal)
-
-#   30| x
-#-----|  -> y
-
-#   30| y
-#-----|  -> x
-
-#   31| while ...
-#-----|  -> exit m4 (normal)
-
-#   31| x
-#-----|  -> y
-
-#   31| ... < ...
-#-----| false -> while ...
-#-----| true -> do ...
-
-#   31| y
-#-----|  -> ... < ...
-
-#   31| do ...
-#-----|  -> x
-
-raise.rb:
-#    1| ExceptionA
-#-----|  -> Exception
-
-#    1| enter raise.rb
-#-----|  -> ExceptionA
-
-#    1| exit raise.rb
-
-#    1| exit raise.rb (normal)
-#-----|  -> exit raise.rb
-
-#    1| Exception
-#-----|  -> ExceptionB
-
-#    4| ExceptionB
-#-----|  -> Exception
-
-#    4| Exception
-#-----|  -> m1
-
-#    7| enter m1
-#-----|  -> x
-
-#    7| exit m1
-
-#    7| exit m1 (abnormal)
-#-----|  -> exit m1
-
-#    7| exit m1 (normal)
-#-----|  -> exit m1
-
-#    7| m1
-#-----|  -> m2
-
-#    7| x
-#-----|  -> x
-
-#    8| if ...
-#-----|  -> self
-
-#    8| x
-#-----|  -> 2
-
-#    8| ... > ...
-#-----| false -> if ...
-#-----| true -> self
-
-#    8| 2
-#-----|  -> ... > ...
-
-#    9| call to raise
-#-----| raise -> exit m1 (abnormal)
-
-#    9| self
-#-----|  -> x > 2
-
-#    9| "x > 2"
-#-----|  -> call to raise
-
-#    9| x > 2
-#-----|  -> "x > 2"
-
-#   11| call to puts
-#-----|  -> exit m1 (normal)
-
-#   11| self
-#-----|  -> x <= 2
-
-#   11| "x <= 2"
-#-----|  -> call to puts
-
-#   11| x <= 2
-#-----|  -> "x <= 2"
-
-#   14| enter m2
-#-----|  -> b
-
-#   14| exit m2
-
-#   14| exit m2 (abnormal)
-#-----|  -> exit m2
-
-#   14| exit m2 (normal)
-#-----|  -> exit m2
-
-#   14| m2
-#-----|  -> m3
-
-#   14| b
-#-----|  -> b
-
-#   16| if ...
-#-----|  -> self
-
-#   16| b
-#-----| false -> if ...
-#-----| true -> self
-
-#   17| call to raise
-#-----| raise -> ExceptionA
-
-#   17| self
-#-----|  -> ExceptionA
-
-#   17| ExceptionA
-#-----|  -> call to raise
-
-#   19| rescue ...
-#-----|  -> self
-
-#   19| ExceptionA
-#-----| raise -> exit m2 (abnormal)
-#-----| match -> self
-
-#   19| then ...
-#-----|  -> rescue ...
-
-#   20| call to puts
-#-----|  -> then ...
-
-#   20| self
-#-----|  -> Rescued
-
-#   20| "Rescued"
-#-----|  -> call to puts
-
-#   20| Rescued
-#-----|  -> "Rescued"
-
-#   22| call to puts
-#-----|  -> exit m2 (normal)
-
-#   22| self
-#-----|  -> End m2
-
-#   22| "End m2"
-#-----|  -> call to puts
-
-#   22| End m2
-#-----|  -> "End m2"
-
-#   25| enter m3
-#-----|  -> b
-
-#   25| exit m3
-
-#   25| exit m3 (normal)
-#-----|  -> exit m3
-
-#   25| m3
-#-----|  -> m4
-
-#   25| b
-#-----|  -> b
-
-#   27| if ...
-#-----|  -> self
-
-#   27| b
-#-----| false -> if ...
-#-----| true -> self
-
-#   28| call to raise
-#-----| raise -> self
-
-#   28| self
-#-----|  -> ExceptionA
-
-#   28| ExceptionA
-#-----|  -> call to raise
-
-#   30| rescue ...
-#-----|  -> self
-
-#   30| then ...
-#-----|  -> rescue ...
-
-#   31| call to puts
-#-----|  -> then ...
-
-#   31| self
-#-----|  -> Rescued
-
-#   31| "Rescued"
-#-----|  -> call to puts
-
-#   31| Rescued
-#-----|  -> "Rescued"
-
-#   33| call to puts
-#-----|  -> exit m3 (normal)
-
-#   33| self
-#-----|  -> End m3
-
-#   33| "End m3"
-#-----|  -> call to puts
-
-#   33| End m3
-#-----|  -> "End m3"
-
-#   36| enter m4
-#-----|  -> b
-
-#   36| exit m4
-
-#   36| exit m4 (normal)
-#-----|  -> exit m4
-
-#   36| m4
-#-----|  -> m5
-
-#   36| b
-#-----|  -> b
-
-#   38| if ...
-#-----|  -> self
-
-#   38| b
-#-----| false -> if ...
-#-----| true -> self
-
-#   39| call to raise
-#-----| raise -> e
-
-#   39| self
-#-----|  -> ExceptionA
-
-#   39| ExceptionA
-#-----|  -> call to raise
-
-#   41| rescue ...
-#-----|  -> self
-
-#   41| e
-#-----|  -> self
-
-#   41| then ...
-#-----|  -> rescue ...
-
-#   42| call to puts
-#-----|  -> then ...
-
-#   42| self
-#-----|  -> Rescued {e}
-
-#   42| "Rescued {e}"
-#-----|  -> call to puts
-
-#   42| Rescued {e}
-#-----|  -> "Rescued {e}"
-
-#   44| call to puts
-#-----|  -> exit m4 (normal)
-
-#   44| self
-#-----|  -> End m4
-
-#   44| "End m4"
-#-----|  -> call to puts
-
-#   44| End m4
-#-----|  -> "End m4"
-
-#   47| enter m5
-#-----|  -> b
-
-#   47| exit m5
-
-#   47| exit m5 (normal)
-#-----|  -> exit m5
-
-#   47| m5
-#-----|  -> m6
-
-#   47| b
-#-----|  -> b
-
-#   49| if ...
-#-----|  -> self
-
-#   49| b
-#-----| false -> if ...
-#-----| true -> self
-
-#   50| call to raise
-#-----| raise -> e
-
-#   50| self
-#-----|  -> ExceptionA
-
-#   50| ExceptionA
-#-----|  -> call to raise
-
-#   52| rescue ...
-#-----|  -> self
-
-#   52| e
-#-----|  -> rescue ...
-
-#   54| call to puts
-#-----|  -> exit m5 (normal)
-
-#   54| self
-#-----|  -> End m5
-
-#   54| "End m5"
-#-----|  -> call to puts
-
-#   54| End m5
-#-----|  -> "End m5"
-
-#   57| enter m6
-#-----|  -> b
-
-#   57| exit m6
-
-#   57| exit m6 (abnormal)
-#-----|  -> exit m6
-
-#   57| exit m6 (normal)
-#-----|  -> exit m6
-
-#   57| m6
-#-----|  -> m7
-
-#   57| b
-#-----|  -> b
-
-#   59| if ...
-#-----|  -> self
-
-#   59| b
-#-----| false -> if ...
-#-----| true -> self
-
-#   60| call to raise
-#-----| raise -> ExceptionA
-
-#   60| self
-#-----|  -> ExceptionA
-
-#   60| ExceptionA
-#-----|  -> call to raise
-
-#   62| rescue ...
-#-----|  -> self
-
-#   62| ExceptionA
-#-----| no-match -> ExceptionB
-#-----| match -> e
-
-#   62| ExceptionB
-#-----| raise -> exit m6 (abnormal)
-#-----| match -> e
-
-#   62| e
-#-----|  -> self
-
-#   62| then ...
-#-----|  -> rescue ...
-
-#   63| call to puts
-#-----|  -> then ...
-
-#   63| self
-#-----|  -> Rescued {e}
-
-#   63| "Rescued {e}"
-#-----|  -> call to puts
-
-#   63| Rescued {e}
-#-----|  -> "Rescued {e}"
-
-#   65| call to puts
-#-----|  -> exit m6 (normal)
-
-#   65| self
-#-----|  -> End m6
-
-#   65| "End m6"
-#-----|  -> call to puts
-
-#   65| End m6
-#-----|  -> "End m6"
-
-#   68| enter m7
-#-----|  -> x
-
-#   68| exit m7
-
-#   68| exit m7 (abnormal)
-#-----|  -> exit m7
-
-#   68| exit m7 (normal)
-#-----|  -> exit m7
-
-#   68| m7
-#-----|  -> m8
-
-#   68| x
-#-----|  -> x
-
-#   69| if ...
-#-----|  -> self
-
-#   69| x
-#-----|  -> 2
-
-#   69| ... > ...
-#-----| true -> self
-#-----| false -> x
-#-----| raise -> [ensure: raise] self
-
-#   69| 2
-#-----|  -> ... > ...
-
-#   70| call to raise
-#-----| raise -> [ensure: raise] self
-
-#   70| self
-#-----|  -> x > 2
-
-#   70| "x > 2"
-#-----|  -> call to raise
-
-#   70| x > 2
-#-----|  -> "x > 2"
-
-#   71| elsif ...
-#-----|  -> if ...
-
-#   71| x
-#-----|  -> 0
-
-#   71| ... < ...
-#-----| false -> elsif ...
-#-----| true -> x < 0
-#-----| raise -> [ensure: raise] self
-
-#   71| 0
-#-----|  -> ... < ...
-
-#   72| return
-#-----| return -> [ensure: return] self
-
-#   72| "x < 0"
-#-----|  -> return
-
-#   72| x < 0
-#-----|  -> "x < 0"
-
-#   74| call to puts
-#-----| raise -> [ensure: raise] self
-#-----|  -> self
-
-#   74| self
-#-----|  -> 0 <= x <= 2
-
-#   74| "0 <= x <= 2"
-#-----|  -> call to puts
-
-#   74| 0 <= x <= 2
-#-----|  -> "0 <= x <= 2"
-
-#   75| [ensure: raise] ensure ...
-#-----| raise -> exit m7 (abnormal)
-
-#   75| [ensure: return] ensure ...
-#-----| return -> exit m7 (normal)
-
-#   75| ensure ...
-#-----|  -> exit m7 (normal)
-
-#   76| [ensure: raise] call to puts
-#-----|  -> [ensure: raise] ensure ...
-
-#   76| [ensure: raise] self
-#-----|  -> [ensure: raise] ensure
-
-#   76| [ensure: return] call to puts
-#-----|  -> [ensure: return] ensure ...
-
-#   76| [ensure: return] self
-#-----|  -> [ensure: return] ensure
-
-#   76| call to puts
-#-----|  -> ensure ...
-
-#   76| self
-#-----|  -> ensure
-
-#   76| "ensure"
-#-----|  -> call to puts
-
-#   76| [ensure: raise] "ensure"
-#-----|  -> [ensure: raise] call to puts
-
-#   76| [ensure: return] "ensure"
-#-----|  -> [ensure: return] call to puts
-
-#   76| [ensure: raise] ensure
-#-----|  -> [ensure: raise] "ensure"
-
-#   76| [ensure: return] ensure
-#-----|  -> [ensure: return] "ensure"
-
-#   76| ensure
-#-----|  -> "ensure"
-
-#   79| enter m8
-#-----|  -> x
-
-#   79| exit m8
-
-#   79| exit m8 (abnormal)
-#-----|  -> exit m8
-
-#   79| exit m8 (normal)
-#-----|  -> exit m8
-
-#   79| m8
-#-----|  -> m9
-
-#   79| x
-#-----|  -> self
-
-#   80| call to puts
-#-----|  -> x
-
-#   80| self
-#-----|  -> Begin m8
-
-#   80| "Begin m8"
-#-----|  -> call to puts
-
-#   80| Begin m8
-#-----|  -> "Begin m8"
-
-#   82| if ...
-#-----|  -> self
-
-#   82| x
-#-----|  -> 2
-
-#   82| ... > ...
-#-----| true -> self
-#-----| false -> x
-#-----| raise -> [ensure: raise] self
-
-#   82| 2
-#-----|  -> ... > ...
-
-#   83| call to raise
-#-----| raise -> [ensure: raise] self
-
-#   83| self
-#-----|  -> x > 2
-
-#   83| "x > 2"
-#-----|  -> call to raise
-
-#   83| x > 2
-#-----|  -> "x > 2"
-
-#   84| elsif ...
-#-----|  -> if ...
-
-#   84| x
-#-----|  -> 0
-
-#   84| ... < ...
-#-----| false -> elsif ...
-#-----| true -> x < 0
-#-----| raise -> [ensure: raise] self
-
-#   84| 0
-#-----|  -> ... < ...
-
-#   85| return
-#-----| return -> [ensure: return] self
-
-#   85| "x < 0"
-#-----|  -> return
-
-#   85| x < 0
-#-----|  -> "x < 0"
-
-#   87| call to puts
-#-----| raise -> [ensure: raise] self
-#-----|  -> self
-
-#   87| self
-#-----|  -> 0 <= x <= 2
-
-#   87| "0 <= x <= 2"
-#-----|  -> call to puts
-
-#   87| 0 <= x <= 2
-#-----|  -> "0 <= x <= 2"
-
-#   88| [ensure: raise] ensure ...
-#-----| raise -> exit m8 (abnormal)
-
-#   88| [ensure: return] ensure ...
-#-----| return -> exit m8 (normal)
-
-#   88| ensure ...
-#-----|  -> self
-
-#   89| [ensure: raise] call to puts
-#-----|  -> [ensure: raise] ensure ...
-
-#   89| [ensure: raise] self
-#-----|  -> [ensure: raise] ensure
-
-#   89| [ensure: return] call to puts
-#-----|  -> [ensure: return] ensure ...
-
-#   89| [ensure: return] self
-#-----|  -> [ensure: return] ensure
-
-#   89| call to puts
-#-----|  -> ensure ...
-
-#   89| self
-#-----|  -> ensure
-
-#   89| "ensure"
-#-----|  -> call to puts
-
-#   89| [ensure: raise] "ensure"
-#-----|  -> [ensure: raise] call to puts
-
-#   89| [ensure: return] "ensure"
-#-----|  -> [ensure: return] call to puts
-
-#   89| [ensure: raise] ensure
-#-----|  -> [ensure: raise] "ensure"
-
-#   89| [ensure: return] ensure
-#-----|  -> [ensure: return] "ensure"
-
-#   89| ensure
-#-----|  -> "ensure"
-
-#   91| call to puts
-#-----|  -> exit m8 (normal)
-
-#   91| self
-#-----|  -> End m8
-
-#   91| "End m8"
-#-----|  -> call to puts
-
-#   91| End m8
-#-----|  -> "End m8"
-
-#   94| enter m9
-#-----|  -> x
-
-#   94| exit m9
-
-#   94| exit m9 (abnormal)
-#-----|  -> exit m9
-
-#   94| exit m9 (normal)
-#-----|  -> exit m9
-
-#   94| m9
-#-----|  -> m10
-
-#   94| x
-#-----|  -> b1
-
-#   94| b1
-#-----|  -> b2
-
-#   94| b2
-#-----|  -> self
-
-#   95| call to puts
-#-----|  -> x
-#-----| raise -> [ensure: raise] self
-
-#   95| self
-#-----|  -> Begin m9
-
-#   95| "Begin m9"
-#-----|  -> call to puts
-
-#   95| Begin m9
-#-----|  -> "Begin m9"
-
-#   97| if ...
-#-----|  -> self
-
-#   97| x
-#-----|  -> 2
-
-#   97| ... > ...
-#-----| true -> self
-#-----| false -> x
-#-----| raise -> [ensure: raise] self
-
-#   97| 2
-#-----|  -> ... > ...
-
-#   98| call to raise
-#-----| raise -> [ensure: raise] self
-
-#   98| self
-#-----|  -> x > 2
-
-#   98| "x > 2"
-#-----|  -> call to raise
-
-#   98| x > 2
-#-----|  -> "x > 2"
-
-#   99| elsif ...
-#-----|  -> if ...
-
-#   99| x
-#-----|  -> 0
-
-#   99| ... < ...
-#-----| false -> elsif ...
-#-----| true -> x < 0
-#-----| raise -> [ensure: raise] self
-
-#   99| 0
-#-----|  -> ... < ...
-
-#  100| return
-#-----| return -> [ensure: return] self
-
-#  100| "x < 0"
-#-----|  -> return
-
-#  100| x < 0
-#-----|  -> "x < 0"
-
-#  102| call to puts
-#-----| raise -> [ensure: raise] self
-#-----|  -> self
-
-#  102| self
-#-----|  -> 0 <= x <= 2
-
-#  102| "0 <= x <= 2"
-#-----|  -> call to puts
-
-#  102| 0 <= x <= 2
-#-----|  -> "0 <= x <= 2"
-
-#  103| [ensure: raise] ensure ...
-#-----| raise -> [ensure: raise] self
-
-#  103| [ensure: return] ensure ...
-#-----| return -> [ensure: return] self
-
-#  103| ensure ...
-#-----|  -> self
-
-#  104| [ensure: raise] call to puts
-#-----|  -> [ensure: raise] b1
-#-----| raise -> [ensure: raise] self
-
-#  104| [ensure: raise] self
-#-----|  -> [ensure: raise] outer ensure
-
-#  104| [ensure: return] call to puts
-#-----|  -> [ensure: return] b1
-#-----| raise -> [ensure: raise] self
-
-#  104| [ensure: return] self
-#-----|  -> [ensure: return] outer ensure
-
-#  104| call to puts
-#-----|  -> b1
-#-----| raise -> [ensure: raise] self
-
-#  104| self
-#-----|  -> outer ensure
-
-#  104| "outer ensure"
-#-----|  -> call to puts
-
-#  104| [ensure: raise] "outer ensure"
-#-----|  -> [ensure: raise] call to puts
-
-#  104| [ensure: return] "outer ensure"
-#-----|  -> [ensure: return] call to puts
-
-#  104| [ensure: raise] outer ensure
-#-----|  -> [ensure: raise] "outer ensure"
-
-#  104| [ensure: return] outer ensure
-#-----|  -> [ensure: return] "outer ensure"
-
-#  104| outer ensure
-#-----|  -> "outer ensure"
-
-#  106| [ensure: raise] if ...
-#-----|  -> [ensure: raise] self
-
-#  106| [ensure: return] if ...
-#-----|  -> [ensure: return] self
-
-#  106| if ...
-#-----|  -> self
-
-#  106| [ensure: raise] b1
-#-----| false -> [ensure: raise] if ...
-#-----| true -> [ensure: raise] self
-
-#  106| [ensure: return] b1
-#-----| false -> [ensure: return] if ...
-#-----| true -> [ensure: return] self
-
-#  106| b1
-#-----| false -> if ...
-#-----| true -> self
-
-#  107| [ensure: raise] call to raise
-#-----| raise -> [ensure: raise, ensure(1): raise] self
-
-#  107| [ensure: raise] self
-#-----|  -> [ensure: raise] b1 is true
-
-#  107| [ensure: return] call to raise
-#-----| raise -> [ensure: return, ensure(1): raise] self
-
-#  107| [ensure: return] self
-#-----|  -> [ensure: return] b1 is true
-
-#  107| call to raise
-#-----| raise -> [ensure(1): raise] self
-
-#  107| self
-#-----|  -> b1 is true
-
-#  107| "b1 is true"
-#-----|  -> call to raise
-
-#  107| [ensure: raise] "b1 is true"
-#-----|  -> [ensure: raise] call to raise
-
-#  107| [ensure: return] "b1 is true"
-#-----|  -> [ensure: return] call to raise
-
-#  107| [ensure: raise] b1 is true
-#-----|  -> [ensure: raise] "b1 is true"
-
-#  107| [ensure: return] b1 is true
-#-----|  -> [ensure: return] "b1 is true"
-
-#  107| b1 is true
-#-----|  -> "b1 is true"
-
-#  109| [ensure(1): raise] ensure ...
-#-----| raise -> [ensure: raise] self
-
-#  109| [ensure: raise, ensure(1): raise] ensure ...
-#-----| raise -> [ensure: raise] self
-
-#  109| [ensure: raise] ensure ...
-#-----|  -> [ensure: raise] ensure ...
-
-#  109| [ensure: return, ensure(1): raise] ensure ...
-#-----| raise -> [ensure: raise] self
-
-#  109| [ensure: return] ensure ...
-#-----|  -> [ensure: return] ensure ...
-
-#  109| ensure ...
-#-----|  -> ensure ...
-
-#  110| [ensure(1): raise] call to puts
-#-----|  -> [ensure(1): raise] ensure ...
-#-----| raise -> [ensure: raise] self
-
-#  110| [ensure(1): raise] self
-#-----|  -> [ensure(1): raise] inner ensure
-
-#  110| [ensure: raise, ensure(1): raise] call to puts
-#-----|  -> [ensure: raise, ensure(1): raise] ensure ...
-#-----| raise -> [ensure: raise] self
-
-#  110| [ensure: raise, ensure(1): raise] self
-#-----|  -> [ensure: raise, ensure(1): raise] inner ensure
-
-#  110| [ensure: raise] call to puts
-#-----|  -> [ensure: raise] ensure ...
-#-----| raise -> [ensure: raise] self
-
-#  110| [ensure: raise] self
-#-----|  -> [ensure: raise] inner ensure
-
-#  110| [ensure: return, ensure(1): raise] call to puts
-#-----|  -> [ensure: return, ensure(1): raise] ensure ...
-#-----| raise -> [ensure: raise] self
-
-#  110| [ensure: return, ensure(1): raise] self
-#-----|  -> [ensure: return, ensure(1): raise] inner ensure
-
-#  110| [ensure: return] call to puts
-#-----|  -> [ensure: return] ensure ...
-#-----| raise -> [ensure: raise] self
-
-#  110| [ensure: return] self
-#-----|  -> [ensure: return] inner ensure
-
-#  110| call to puts
-#-----|  -> ensure ...
-#-----| raise -> [ensure: raise] self
-
-#  110| self
-#-----|  -> inner ensure
-
-#  110| "inner ensure"
-#-----|  -> call to puts
-
-#  110| [ensure(1): raise] "inner ensure"
-#-----|  -> [ensure(1): raise] call to puts
-
-#  110| [ensure: raise, ensure(1): raise] "inner ensure"
-#-----|  -> [ensure: raise, ensure(1): raise] call to puts
-
-#  110| [ensure: raise] "inner ensure"
-#-----|  -> [ensure: raise] call to puts
-
-#  110| [ensure: return, ensure(1): raise] "inner ensure"
-#-----|  -> [ensure: return, ensure(1): raise] call to puts
-
-#  110| [ensure: return] "inner ensure"
-#-----|  -> [ensure: return] call to puts
-
-#  110| [ensure(1): raise] inner ensure
-#-----|  -> [ensure(1): raise] "inner ensure"
-
-#  110| [ensure: raise, ensure(1): raise] inner ensure
-#-----|  -> [ensure: raise, ensure(1): raise] "inner ensure"
-
-#  110| [ensure: raise] inner ensure
-#-----|  -> [ensure: raise] "inner ensure"
-
-#  110| [ensure: return, ensure(1): raise] inner ensure
-#-----|  -> [ensure: return, ensure(1): raise] "inner ensure"
-
-#  110| [ensure: return] inner ensure
-#-----|  -> [ensure: return] "inner ensure"
-
-#  110| inner ensure
-#-----|  -> "inner ensure"
-
-#  113| call to puts
-#-----| raise -> [ensure: raise] self
-#-----|  -> self
-
-#  113| self
-#-----|  -> End m9
-
-#  113| "End m9"
-#-----|  -> call to puts
-
-#  113| End m9
-#-----|  -> "End m9"
-
-#  114| [ensure: raise] ensure ...
-#-----| raise -> exit m9 (abnormal)
-
-#  114| [ensure: return] ensure ...
-#-----| return -> exit m9 (normal)
-
-#  114| ensure ...
-#-----|  -> exit m9 (normal)
-
-#  115| [ensure: raise] call to puts
-#-----|  -> [ensure: raise] b2
-
-#  115| [ensure: raise] self
-#-----|  -> [ensure: raise] method ensure
-
-#  115| [ensure: return] call to puts
-#-----|  -> [ensure: return] b2
-
-#  115| [ensure: return] self
-#-----|  -> [ensure: return] method ensure
-
-#  115| call to puts
-#-----|  -> b2
-
-#  115| self
-#-----|  -> method ensure
-
-#  115| "method ensure"
-#-----|  -> call to puts
-
-#  115| [ensure: raise] "method ensure"
-#-----|  -> [ensure: raise] call to puts
-
-#  115| [ensure: return] "method ensure"
-#-----|  -> [ensure: return] call to puts
-
-#  115| [ensure: raise] method ensure
-#-----|  -> [ensure: raise] "method ensure"
-
-#  115| [ensure: return] method ensure
-#-----|  -> [ensure: return] "method ensure"
-
-#  115| method ensure
-#-----|  -> "method ensure"
-
-#  116| [ensure: raise] if ...
-#-----|  -> [ensure: raise] ensure ...
-
-#  116| [ensure: return] if ...
-#-----|  -> [ensure: return] ensure ...
-
-#  116| if ...
-#-----|  -> ensure ...
-
-#  116| [ensure: raise] b2
-#-----| false -> [ensure: raise] if ...
-#-----| true -> [ensure: raise] self
-
-#  116| [ensure: return] b2
-#-----| false -> [ensure: return] if ...
-#-----| true -> [ensure: return] self
-
-#  116| b2
-#-----| false -> if ...
-#-----| true -> self
-
-#  117| [ensure: raise] call to raise
-#-----| raise -> exit m9 (abnormal)
-
-#  117| [ensure: raise] self
-#-----|  -> [ensure: raise] b2 is true
-
-#  117| [ensure: return] call to raise
-#-----| raise -> exit m9 (abnormal)
-
-#  117| [ensure: return] self
-#-----|  -> [ensure: return] b2 is true
-
-#  117| call to raise
-#-----| raise -> exit m9 (abnormal)
-
-#  117| self
-#-----|  -> b2 is true
-
-#  117| "b2 is true"
-#-----|  -> call to raise
-
-#  117| [ensure: raise] "b2 is true"
-#-----|  -> [ensure: raise] call to raise
-
-#  117| [ensure: return] "b2 is true"
-#-----|  -> [ensure: return] call to raise
-
-#  117| [ensure: raise] b2 is true
-#-----|  -> [ensure: raise] "b2 is true"
-
-#  117| [ensure: return] b2 is true
-#-----|  -> [ensure: return] "b2 is true"
-
-#  117| b2 is true
-#-----|  -> "b2 is true"
-
-#  121| enter m10
-#-----|  -> p
-
-#  121| exit m10
-
-#  121| exit m10 (abnormal)
-#-----|  -> exit m10
-
-#  121| exit m10 (normal)
-#-----|  -> exit m10
-
-#  121| m10
-#-----|  -> m11
-
-#  121| p
-#-----| false, no-match, true -> self
-#-----| match -> self
-
-#  121| call to raise
-#-----| raise -> exit m10 (abnormal)
-
-#  121| self
-#-----|  -> Exception
-
-#  121| "Exception"
-#-----|  -> call to raise
-
-#  121| Exception
-#-----|  -> "Exception"
-
-#  124| ensure ...
-#-----|  -> exit m10 (normal)
-
-#  125| call to puts
-#-----|  -> ensure ...
-
-#  125| self
-#-----|  -> Will not get executed if p is not supplied
-
-#  125| "Will not get executed if p is..."
-#-----|  -> call to puts
-
-#  125| Will not get executed if p is not supplied
-#-----|  -> "Will not get executed if p is..."
-
-#  128| enter m11
-#-----|  -> b
-
-#  128| exit m11
-
-#  128| exit m11 (abnormal)
-#-----|  -> exit m11
-
-#  128| exit m11 (normal)
-#-----|  -> exit m11
-
-#  128| m11
-#-----|  -> m12
-
-#  128| b
-#-----|  -> b
-
-#  130| if ...
-#-----|  -> self
-
-#  130| b
-#-----| false -> if ...
-#-----| true -> self
-
-#  131| call to raise
-#-----| raise -> ExceptionA
-
-#  131| self
-#-----|  -> ExceptionA
-
-#  131| ExceptionA
-#-----|  -> call to raise
-
-#  133| rescue ...
-#-----|  -> self
-
-#  133| ExceptionA
-#-----| match -> rescue ...
-#-----| no-match -> ExceptionB
-
-#  134| rescue ...
-#-----|  -> self
-
-#  134| ExceptionB
-#-----| match -> self
-#-----| raise -> [ensure: raise] self
-
-#  134| then ...
-#-----|  -> rescue ...
-
-#  135| call to puts
-#-----|  -> then ...
-
-#  135| self
-#-----|  -> ExceptionB
-
-#  135| "ExceptionB"
-#-----|  -> call to puts
-
-#  135| ExceptionB
-#-----|  -> "ExceptionB"
-
-#  136| [ensure: raise] ensure ...
-#-----| raise -> exit m11 (abnormal)
-
-#  136| ensure ...
-#-----|  -> self
-
-#  137| [ensure: raise] call to puts
-#-----|  -> [ensure: raise] ensure ...
-
-#  137| [ensure: raise] self
-#-----|  -> [ensure: raise] Ensure
-
-#  137| call to puts
-#-----|  -> ensure ...
-
-#  137| self
-#-----|  -> Ensure
-
-#  137| "Ensure"
-#-----|  -> call to puts
-
-#  137| [ensure: raise] "Ensure"
-#-----|  -> [ensure: raise] call to puts
-
-#  137| Ensure
-#-----|  -> "Ensure"
-
-#  137| [ensure: raise] Ensure
-#-----|  -> [ensure: raise] "Ensure"
-
-#  139| call to puts
-#-----|  -> exit m11 (normal)
-
-#  139| self
-#-----|  -> End m11
-
-#  139| "End m11"
-#-----|  -> call to puts
-
-#  139| End m11
-#-----|  -> "End m11"
-
-#  142| enter m12
-#-----|  -> b
-
-#  142| exit m12
-
-#  142| exit m12 (normal)
-#-----|  -> exit m12
-
-#  142| m12
-#-----|  -> m13
-
-#  142| b
-#-----|  -> b
-
-#  143| if ...
-#-----|  -> 3
-
-#  143| b
-#-----| false -> if ...
-#-----| true -> self
-
-#  144| call to raise
-#-----| raise -> [ensure: raise] 3
-
-#  144| self
-#-----|  -> ""
-
-#  144| ""
-#-----|  -> call to raise
-
-#  147| [ensure: raise] return
-#-----| return -> exit m12 (normal)
-
-#  147| return
-#-----| return -> exit m12 (normal)
-
-#  147| 3
-#-----|  -> return
-
-#  147| [ensure: raise] 3
-#-----|  -> [ensure: raise] return
-
-#  150| enter m13
-#-----|  -> ensure ...
-
-#  150| exit m13
-
-#  150| exit m13 (normal)
-#-----|  -> exit m13
-
-#  150| m13
-#-----|  -> m14
-
-#  151| ensure ...
-#-----|  -> exit m13 (normal)
-
-#  154| enter m14
-#-----|  -> element
-
-#  154| exit m14
-
-#  154| exit m14 (normal)
-#-----|  -> exit m14
-
-#  154| m14
-#-----|  -> m15
-
-#  154| element
-#-----|  -> element
-
-#  155| element
-#-----|  -> { ... }
-
-#  155| call to each
-#-----|  -> exit m14 (normal)
-
-#  155| enter { ... }
-#-----|  -> elem
-
-#  155| exit { ... }
-
-#  155| exit { ... } (abnormal)
-#-----|  -> exit { ... }
-
-#  155| exit { ... } (normal)
-#-----|  -> exit { ... }
-
-#  155| { ... }
-#-----|  -> call to each
-
-#  155| elem
-#-----|  -> element
-
-#  155| call to raise
-#-----| raise -> exit { ... } (abnormal)
-
-#  155| self
-#-----|  -> ""
-
-#  155| ... if ...
-#-----|  -> exit { ... } (normal)
-
-#  155| ""
-#-----|  -> call to raise
-
-#  155| element
-#-----|  -> call to nil?
-
-#  155| call to nil?
-#-----| true -> self
-#-----| false -> ... if ...
-
-#  158| enter m15
-#-----|  -> self
-
-#  158| exit m15
-
-#  158| exit m15 (normal)
-#-----|  -> exit m15
-
-#  158| m15
-#-----|  -> C
-
-#  159| call to foo
-#-----|  -> exit m15 (normal)
-
-#  159| self
-#-----|  -> do ... end
-
-#  159| do ... end
-#-----|  -> call to foo
-
-#  159| enter do ... end
-#-----|  -> self
-
-#  159| exit do ... end
-
-#  159| exit do ... end (normal)
-#-----|  -> exit do ... end
-
-#  160| call to bar
-#-----|  -> exit do ... end (normal)
-
-#  160| self
-#-----|  -> -> { ... }
-
-#  160| -> { ... }
-#-----|  -> call to bar
-
-#  160| enter -> { ... }
-#-----|  -> x
-
-#  160| exit -> { ... }
-
-#  160| exit -> { ... } (abnormal)
-#-----|  -> exit -> { ... }
-
-#  160| exit -> { ... } (normal)
-#-----|  -> exit -> { ... }
-
-#  160| x
-#-----|  -> x
-
-#  161| call to raise
-#-----| raise -> exit -> { ... } (abnormal)
-
-#  161| self
-#-----|  -> ""
-
-#  161| ... unless ...
-#-----|  -> exit -> { ... } (normal)
-
-#  161| ""
-#-----|  -> call to raise
-
-#  161| x
-#-----| false -> self
-#-----| true -> ... unless ...
-
-#  166| C
-#-----|  -> self
-
-#  167| enter m
-#-----|  -> self
-
-#  167| exit m
-
-#  167| exit m (abnormal)
-#-----|  -> exit m
-
-#  167| m
-#-----|  -> m16
-
-#  167| self
-#-----|  -> m
-
-#  168| call to raise
-#-----| raise -> exit m (abnormal)
-
-#  168| self
-#-----|  -> ""
-
-#  168| ""
-#-----|  -> call to raise
-
-#  172| enter m16
-#-----|  -> b1
-
-#  172| exit m16
-
-#  172| exit m16 (abnormal)
-#-----|  -> exit m16
-
-#  172| exit m16 (normal)
-#-----|  -> exit m16
-
-#  172| m16
-#-----|  -> exit raise.rb (normal)
-
-#  172| b1
-#-----|  -> b2
-
-#  172| b2
-#-----|  -> b1
-
-#  174| b1
-#-----| true -> [true] ... || ...
-#-----| false -> b2
-
-#  174| [false] ... || ...
-#-----| false -> 2
-#-----| raise -> ExceptionA
-
-#  174| [true] ... || ...
-#-----| true -> 1
-#-----| raise -> ExceptionA
-
-#  174| b2
-#-----|  -> true
-
-#  174| ... == ...
-#-----| false -> [false] ... || ...
-#-----| true -> [true] ... || ...
-#-----| raise -> ExceptionA
-
-#  174| true
-#-----|  -> ... == ...
-
-#  175| return
-#-----| return -> exit m16 (normal)
-
-#  175| 1
-#-----|  -> return
-
-#  177| return
-#-----| return -> exit m16 (normal)
-
-#  177| 2
-#-----|  -> return
-
-#  179| ExceptionA
-#-----| raise -> exit m16 (abnormal)
-#-----| match -> 3
-
-#  180| return
-#-----| return -> exit m16 (normal)
-
-#  180| 3
-#-----|  -> return
+| break_ensure.rb:1:1:11:3 | enter m1 | break_ensure.rb:1:8:1:8 | x |  |
+| break_ensure.rb:1:1:11:3 | exit m1 (abnormal) | break_ensure.rb:1:1:11:3 | exit m1 |  |
+| break_ensure.rb:1:1:11:3 | exit m1 (normal) | break_ensure.rb:1:1:11:3 | exit m1 |  |
+| break_ensure.rb:1:1:11:3 | m1 | break_ensure.rb:13:1:25:3 | m2 |  |
+| break_ensure.rb:1:1:56:4 | enter break_ensure.rb | break_ensure.rb:1:1:11:3 | m1 |  |
+| break_ensure.rb:1:1:56:4 | exit break_ensure.rb (normal) | break_ensure.rb:1:1:56:4 | exit break_ensure.rb |  |
+| break_ensure.rb:1:8:1:8 | x | break_ensure.rb:2:9:2:9 | x |  |
+| break_ensure.rb:2:3:6:5 | while ... | break_ensure.rb:8:6:8:13 | self |  |
+| break_ensure.rb:2:9:2:9 | x | break_ensure.rb:2:13:2:13 | 0 |  |
+| break_ensure.rb:2:9:2:13 | ... < ... | break_ensure.rb:2:3:6:5 | while ... | false |
+| break_ensure.rb:2:9:2:13 | ... < ... | break_ensure.rb:3:8:3:8 | x | true |
+| break_ensure.rb:2:9:2:13 | ... < ... | break_ensure.rb:8:6:8:13 | [ensure: raise] self | raise |
+| break_ensure.rb:2:13:2:13 | 0 | break_ensure.rb:2:9:2:13 | ... < ... |  |
+| break_ensure.rb:2:14:6:5 | do ... | break_ensure.rb:2:9:2:9 | x |  |
+| break_ensure.rb:3:5:5:7 | if ... | break_ensure.rb:2:14:6:5 | do ... |  |
+| break_ensure.rb:3:8:3:8 | x | break_ensure.rb:3:12:3:12 | 0 |  |
+| break_ensure.rb:3:8:3:12 | ... > ... | break_ensure.rb:2:3:6:5 | while ... | raise |
+| break_ensure.rb:3:8:3:12 | ... > ... | break_ensure.rb:3:5:5:7 | if ... | false |
+| break_ensure.rb:3:8:3:12 | ... > ... | break_ensure.rb:4:7:4:11 | break | true |
+| break_ensure.rb:3:12:3:12 | 0 | break_ensure.rb:3:8:3:12 | ... > ... |  |
+| break_ensure.rb:4:7:4:11 | break | break_ensure.rb:2:3:6:5 | while ... | break |
+| break_ensure.rb:7:1:10:5 | [ensure: raise] ensure ... | break_ensure.rb:1:1:11:3 | exit m1 (abnormal) | raise |
+| break_ensure.rb:7:1:10:5 | ensure ... | break_ensure.rb:1:1:11:3 | exit m1 (normal) |  |
+| break_ensure.rb:8:3:10:5 | [ensure: raise] if ... | break_ensure.rb:7:1:10:5 | [ensure: raise] ensure ... |  |
+| break_ensure.rb:8:3:10:5 | if ... | break_ensure.rb:7:1:10:5 | ensure ... |  |
+| break_ensure.rb:8:6:8:13 | [ensure: raise] call to elements | break_ensure.rb:8:6:8:18 | [ensure: raise] call to nil? |  |
+| break_ensure.rb:8:6:8:13 | [ensure: raise] self | break_ensure.rb:8:6:8:13 | [ensure: raise] call to elements |  |
+| break_ensure.rb:8:6:8:13 | call to elements | break_ensure.rb:8:6:8:18 | call to nil? |  |
+| break_ensure.rb:8:6:8:13 | self | break_ensure.rb:8:6:8:13 | call to elements |  |
+| break_ensure.rb:8:6:8:18 | [ensure: raise] call to nil? | break_ensure.rb:8:3:10:5 | [ensure: raise] if ... | false |
+| break_ensure.rb:8:6:8:18 | [ensure: raise] call to nil? | break_ensure.rb:9:5:9:23 | [ensure: raise] self | true |
+| break_ensure.rb:8:6:8:18 | call to nil? | break_ensure.rb:8:3:10:5 | if ... | false |
+| break_ensure.rb:8:6:8:18 | call to nil? | break_ensure.rb:9:5:9:23 | self | true |
+| break_ensure.rb:8:20:9:23 | [ensure: raise] then ... | break_ensure.rb:8:3:10:5 | [ensure: raise] if ... |  |
+| break_ensure.rb:8:20:9:23 | then ... | break_ensure.rb:8:3:10:5 | if ... |  |
+| break_ensure.rb:9:5:9:23 | [ensure: raise] call to puts | break_ensure.rb:8:20:9:23 | [ensure: raise] then ... |  |
+| break_ensure.rb:9:5:9:23 | [ensure: raise] self | break_ensure.rb:9:11:9:22 | [ensure: raise] elements nil |  |
+| break_ensure.rb:9:5:9:23 | call to puts | break_ensure.rb:8:20:9:23 | then ... |  |
+| break_ensure.rb:9:5:9:23 | self | break_ensure.rb:9:11:9:22 | elements nil |  |
+| break_ensure.rb:9:10:9:23 | "elements nil" | break_ensure.rb:9:5:9:23 | call to puts |  |
+| break_ensure.rb:9:10:9:23 | [ensure: raise] "elements nil" | break_ensure.rb:9:5:9:23 | [ensure: raise] call to puts |  |
+| break_ensure.rb:9:11:9:22 | [ensure: raise] elements nil | break_ensure.rb:9:10:9:23 | [ensure: raise] "elements nil" |  |
+| break_ensure.rb:9:11:9:22 | elements nil | break_ensure.rb:9:10:9:23 | "elements nil" |  |
+| break_ensure.rb:13:1:25:3 | enter m2 | break_ensure.rb:13:8:13:8 | x |  |
+| break_ensure.rb:13:1:25:3 | exit m2 (normal) | break_ensure.rb:13:1:25:3 | exit m2 |  |
+| break_ensure.rb:13:1:25:3 | m2 | break_ensure.rb:27:1:42:3 | m3 |  |
+| break_ensure.rb:13:8:13:8 | x | break_ensure.rb:13:11:13:11 | y |  |
+| break_ensure.rb:13:11:13:11 | y | break_ensure.rb:14:9:14:9 | x |  |
+| break_ensure.rb:14:3:24:5 | while ... | break_ensure.rb:13:1:25:3 | exit m2 (normal) |  |
+| break_ensure.rb:14:9:14:9 | x | break_ensure.rb:14:13:14:13 | 0 |  |
+| break_ensure.rb:14:9:14:13 | ... < ... | break_ensure.rb:14:3:24:5 | while ... | false |
+| break_ensure.rb:14:9:14:13 | ... < ... | break_ensure.rb:16:10:16:10 | x | true |
+| break_ensure.rb:14:13:14:13 | 0 | break_ensure.rb:14:9:14:13 | ... < ... |  |
+| break_ensure.rb:14:14:24:5 | do ... | break_ensure.rb:14:9:14:9 | x |  |
+| break_ensure.rb:16:7:18:9 | if ... | break_ensure.rb:20:10:20:10 | y |  |
+| break_ensure.rb:16:10:16:10 | x | break_ensure.rb:16:14:16:14 | 0 |  |
+| break_ensure.rb:16:10:16:14 | ... > ... | break_ensure.rb:16:7:18:9 | if ... | false |
+| break_ensure.rb:16:10:16:14 | ... > ... | break_ensure.rb:17:9:17:13 | break | true |
+| break_ensure.rb:16:10:16:14 | ... > ... | break_ensure.rb:20:10:20:10 | [ensure: raise] y | raise |
+| break_ensure.rb:16:14:16:14 | 0 | break_ensure.rb:16:10:16:14 | ... > ... |  |
+| break_ensure.rb:17:9:17:13 | break | break_ensure.rb:20:10:20:10 | [ensure: break] y | break |
+| break_ensure.rb:19:5:22:9 | [ensure: break] ensure ... | break_ensure.rb:14:3:24:5 | while ... | break |
+| break_ensure.rb:19:5:22:9 | [ensure: raise] ensure ... | break_ensure.rb:14:3:24:5 | while ... | raise |
+| break_ensure.rb:19:5:22:9 | ensure ... | break_ensure.rb:14:14:24:5 | do ... |  |
+| break_ensure.rb:20:7:22:9 | [ensure: break] if ... | break_ensure.rb:19:5:22:9 | [ensure: break] ensure ... |  |
+| break_ensure.rb:20:7:22:9 | [ensure: raise] if ... | break_ensure.rb:19:5:22:9 | [ensure: raise] ensure ... |  |
+| break_ensure.rb:20:7:22:9 | if ... | break_ensure.rb:19:5:22:9 | ensure ... |  |
+| break_ensure.rb:20:10:20:10 | [ensure: break] y | break_ensure.rb:20:10:20:15 | [ensure: break] call to nil? |  |
+| break_ensure.rb:20:10:20:10 | [ensure: raise] y | break_ensure.rb:20:10:20:15 | [ensure: raise] call to nil? |  |
+| break_ensure.rb:20:10:20:10 | y | break_ensure.rb:20:10:20:15 | call to nil? |  |
+| break_ensure.rb:20:10:20:15 | [ensure: break] call to nil? | break_ensure.rb:20:7:22:9 | [ensure: break] if ... | false |
+| break_ensure.rb:20:10:20:15 | [ensure: break] call to nil? | break_ensure.rb:21:9:21:20 | [ensure: break] self | true |
+| break_ensure.rb:20:10:20:15 | [ensure: raise] call to nil? | break_ensure.rb:20:7:22:9 | [ensure: raise] if ... | false |
+| break_ensure.rb:20:10:20:15 | [ensure: raise] call to nil? | break_ensure.rb:21:9:21:20 | [ensure: raise] self | true |
+| break_ensure.rb:20:10:20:15 | call to nil? | break_ensure.rb:20:7:22:9 | if ... | false |
+| break_ensure.rb:20:10:20:15 | call to nil? | break_ensure.rb:21:9:21:20 | self | true |
+| break_ensure.rb:20:17:21:20 | [ensure: break] then ... | break_ensure.rb:20:7:22:9 | [ensure: break] if ... |  |
+| break_ensure.rb:20:17:21:20 | [ensure: raise] then ... | break_ensure.rb:20:7:22:9 | [ensure: raise] if ... |  |
+| break_ensure.rb:20:17:21:20 | then ... | break_ensure.rb:20:7:22:9 | if ... |  |
+| break_ensure.rb:21:9:21:20 | [ensure: break] call to puts | break_ensure.rb:20:17:21:20 | [ensure: break] then ... |  |
+| break_ensure.rb:21:9:21:20 | [ensure: break] self | break_ensure.rb:21:15:21:19 | [ensure: break] y nil |  |
+| break_ensure.rb:21:9:21:20 | [ensure: raise] call to puts | break_ensure.rb:20:17:21:20 | [ensure: raise] then ... |  |
+| break_ensure.rb:21:9:21:20 | [ensure: raise] self | break_ensure.rb:21:15:21:19 | [ensure: raise] y nil |  |
+| break_ensure.rb:21:9:21:20 | call to puts | break_ensure.rb:20:17:21:20 | then ... |  |
+| break_ensure.rb:21:9:21:20 | self | break_ensure.rb:21:15:21:19 | y nil |  |
+| break_ensure.rb:21:14:21:20 | "y nil" | break_ensure.rb:21:9:21:20 | call to puts |  |
+| break_ensure.rb:21:14:21:20 | [ensure: break] "y nil" | break_ensure.rb:21:9:21:20 | [ensure: break] call to puts |  |
+| break_ensure.rb:21:14:21:20 | [ensure: raise] "y nil" | break_ensure.rb:21:9:21:20 | [ensure: raise] call to puts |  |
+| break_ensure.rb:21:15:21:19 | [ensure: break] y nil | break_ensure.rb:21:14:21:20 | [ensure: break] "y nil" |  |
+| break_ensure.rb:21:15:21:19 | [ensure: raise] y nil | break_ensure.rb:21:14:21:20 | [ensure: raise] "y nil" |  |
+| break_ensure.rb:21:15:21:19 | y nil | break_ensure.rb:21:14:21:20 | "y nil" |  |
+| break_ensure.rb:27:1:42:3 | enter m3 | break_ensure.rb:27:8:27:8 | x |  |
+| break_ensure.rb:27:1:42:3 | exit m3 (abnormal) | break_ensure.rb:27:1:42:3 | exit m3 |  |
+| break_ensure.rb:27:1:42:3 | exit m3 (normal) | break_ensure.rb:27:1:42:3 | exit m3 |  |
+| break_ensure.rb:27:1:42:3 | m3 | break_ensure.rb:44:1:56:3 | m4 |  |
+| break_ensure.rb:27:8:27:8 | x | break_ensure.rb:27:10:27:10 | y |  |
+| break_ensure.rb:27:10:27:10 | y | break_ensure.rb:29:8:29:8 | x |  |
+| break_ensure.rb:29:5:31:7 | if ... | break_ensure.rb:33:11:33:11 | y |  |
+| break_ensure.rb:29:8:29:8 | x | break_ensure.rb:29:8:29:13 | call to nil? |  |
+| break_ensure.rb:29:8:29:13 | call to nil? | break_ensure.rb:29:5:31:7 | if ... | false |
+| break_ensure.rb:29:8:29:13 | call to nil? | break_ensure.rb:30:7:30:12 | return | true |
+| break_ensure.rb:29:8:29:13 | call to nil? | break_ensure.rb:33:11:33:11 | [ensure: raise] y | raise |
+| break_ensure.rb:30:7:30:12 | return | break_ensure.rb:33:11:33:11 | [ensure: return] y | return |
+| break_ensure.rb:32:3:39:7 | [ensure: raise] ensure ... | break_ensure.rb:27:1:42:3 | exit m3 (abnormal) | raise |
+| break_ensure.rb:32:3:39:7 | [ensure: return] ensure ... | break_ensure.rb:27:1:42:3 | exit m3 (normal) | return |
+| break_ensure.rb:32:3:39:7 | ensure ... | break_ensure.rb:41:3:41:13 | self |  |
+| break_ensure.rb:33:5:39:7 | [ensure: raise] while ... | break_ensure.rb:32:3:39:7 | [ensure: raise] ensure ... |  |
+| break_ensure.rb:33:5:39:7 | [ensure: return] while ... | break_ensure.rb:32:3:39:7 | [ensure: return] ensure ... |  |
+| break_ensure.rb:33:5:39:7 | while ... | break_ensure.rb:32:3:39:7 | ensure ... |  |
+| break_ensure.rb:33:11:33:11 | [ensure: raise] y | break_ensure.rb:33:15:33:15 | [ensure: raise] 0 |  |
+| break_ensure.rb:33:11:33:11 | [ensure: return] y | break_ensure.rb:33:15:33:15 | [ensure: return] 0 |  |
+| break_ensure.rb:33:11:33:11 | y | break_ensure.rb:33:15:33:15 | 0 |  |
+| break_ensure.rb:33:11:33:15 | ... < ... | break_ensure.rb:33:5:39:7 | while ... | false |
+| break_ensure.rb:33:11:33:15 | ... < ... | break_ensure.rb:35:12:35:12 | x | true |
+| break_ensure.rb:33:11:33:15 | [ensure: raise] ... < ... | break_ensure.rb:33:5:39:7 | [ensure: raise] while ... | false |
+| break_ensure.rb:33:11:33:15 | [ensure: raise] ... < ... | break_ensure.rb:35:12:35:12 | [ensure: raise] x | true |
+| break_ensure.rb:33:11:33:15 | [ensure: return] ... < ... | break_ensure.rb:33:5:39:7 | [ensure: return] while ... | false |
+| break_ensure.rb:33:11:33:15 | [ensure: return] ... < ... | break_ensure.rb:35:12:35:12 | [ensure: return] x | true |
+| break_ensure.rb:33:15:33:15 | 0 | break_ensure.rb:33:11:33:15 | ... < ... |  |
+| break_ensure.rb:33:15:33:15 | [ensure: raise] 0 | break_ensure.rb:33:11:33:15 | [ensure: raise] ... < ... |  |
+| break_ensure.rb:33:15:33:15 | [ensure: return] 0 | break_ensure.rb:33:11:33:15 | [ensure: return] ... < ... |  |
+| break_ensure.rb:33:16:39:7 | [ensure: raise] do ... | break_ensure.rb:33:11:33:11 | [ensure: raise] y |  |
+| break_ensure.rb:33:16:39:7 | [ensure: return] do ... | break_ensure.rb:33:11:33:11 | [ensure: return] y |  |
+| break_ensure.rb:33:16:39:7 | do ... | break_ensure.rb:33:11:33:11 | y |  |
+| break_ensure.rb:35:9:37:11 | [ensure: raise] if ... | break_ensure.rb:33:16:39:7 | [ensure: raise] do ... |  |
+| break_ensure.rb:35:9:37:11 | [ensure: return] if ... | break_ensure.rb:33:16:39:7 | [ensure: return] do ... |  |
+| break_ensure.rb:35:9:37:11 | if ... | break_ensure.rb:33:16:39:7 | do ... |  |
+| break_ensure.rb:35:12:35:12 | [ensure: raise] x | break_ensure.rb:35:16:35:16 | [ensure: raise] 0 |  |
+| break_ensure.rb:35:12:35:12 | [ensure: return] x | break_ensure.rb:35:16:35:16 | [ensure: return] 0 |  |
+| break_ensure.rb:35:12:35:12 | x | break_ensure.rb:35:16:35:16 | 0 |  |
+| break_ensure.rb:35:12:35:16 | ... > ... | break_ensure.rb:35:9:37:11 | if ... | false |
+| break_ensure.rb:35:12:35:16 | ... > ... | break_ensure.rb:36:11:36:15 | break | true |
+| break_ensure.rb:35:12:35:16 | [ensure: raise] ... > ... | break_ensure.rb:35:9:37:11 | [ensure: raise] if ... | false |
+| break_ensure.rb:35:12:35:16 | [ensure: raise] ... > ... | break_ensure.rb:36:11:36:15 | [ensure: raise] break | true |
+| break_ensure.rb:35:12:35:16 | [ensure: return] ... > ... | break_ensure.rb:35:9:37:11 | [ensure: return] if ... | false |
+| break_ensure.rb:35:12:35:16 | [ensure: return] ... > ... | break_ensure.rb:36:11:36:15 | [ensure: return] break | true |
+| break_ensure.rb:35:16:35:16 | 0 | break_ensure.rb:35:12:35:16 | ... > ... |  |
+| break_ensure.rb:35:16:35:16 | [ensure: raise] 0 | break_ensure.rb:35:12:35:16 | [ensure: raise] ... > ... |  |
+| break_ensure.rb:35:16:35:16 | [ensure: return] 0 | break_ensure.rb:35:12:35:16 | [ensure: return] ... > ... |  |
+| break_ensure.rb:36:11:36:15 | [ensure: raise] break | break_ensure.rb:33:5:39:7 | [ensure: raise] while ... | break |
+| break_ensure.rb:36:11:36:15 | [ensure: return] break | break_ensure.rb:33:5:39:7 | [ensure: return] while ... | break |
+| break_ensure.rb:36:11:36:15 | break | break_ensure.rb:33:5:39:7 | while ... | break |
+| break_ensure.rb:41:3:41:13 | call to puts | break_ensure.rb:27:1:42:3 | exit m3 (normal) |  |
+| break_ensure.rb:41:3:41:13 | self | break_ensure.rb:41:9:41:12 | Done |  |
+| break_ensure.rb:41:8:41:13 | "Done" | break_ensure.rb:41:3:41:13 | call to puts |  |
+| break_ensure.rb:41:9:41:12 | Done | break_ensure.rb:41:8:41:13 | "Done" |  |
+| break_ensure.rb:44:1:56:3 | enter m4 | break_ensure.rb:44:8:44:8 | x |  |
+| break_ensure.rb:44:1:56:3 | exit m4 (normal) | break_ensure.rb:44:1:56:3 | exit m4 |  |
+| break_ensure.rb:44:1:56:3 | m4 | break_ensure.rb:1:1:56:4 | exit break_ensure.rb (normal) |  |
+| break_ensure.rb:44:8:44:8 | x | break_ensure.rb:45:9:45:9 | x |  |
+| break_ensure.rb:45:3:55:5 | while ... | break_ensure.rb:44:1:56:3 | exit m4 (normal) |  |
+| break_ensure.rb:45:9:45:9 | x | break_ensure.rb:45:13:45:13 | 0 |  |
+| break_ensure.rb:45:9:45:13 | ... < ... | break_ensure.rb:45:3:55:5 | while ... | false |
+| break_ensure.rb:45:9:45:13 | ... < ... | break_ensure.rb:47:10:47:10 | x | true |
+| break_ensure.rb:45:13:45:13 | 0 | break_ensure.rb:45:9:45:13 | ... < ... |  |
+| break_ensure.rb:45:14:55:5 | do ... | break_ensure.rb:45:9:45:9 | x |  |
+| break_ensure.rb:47:7:49:9 | if ... | break_ensure.rb:51:10:51:10 | x |  |
+| break_ensure.rb:47:10:47:10 | x | break_ensure.rb:47:14:47:14 | 1 |  |
+| break_ensure.rb:47:10:47:14 | ... > ... | break_ensure.rb:47:7:49:9 | if ... | false |
+| break_ensure.rb:47:10:47:14 | ... > ... | break_ensure.rb:48:9:48:16 | self | true |
+| break_ensure.rb:47:10:47:14 | ... > ... | break_ensure.rb:51:10:51:10 | [ensure: raise] x | raise |
+| break_ensure.rb:47:14:47:14 | 1 | break_ensure.rb:47:10:47:14 | ... > ... |  |
+| break_ensure.rb:48:9:48:16 | call to raise | break_ensure.rb:51:10:51:10 | [ensure: raise] x | raise |
+| break_ensure.rb:48:9:48:16 | self | break_ensure.rb:48:15:48:16 | "" |  |
+| break_ensure.rb:48:15:48:16 | "" | break_ensure.rb:48:9:48:16 | call to raise |  |
+| break_ensure.rb:50:5:53:9 | [ensure: raise] ensure ... | break_ensure.rb:45:3:55:5 | while ... | raise |
+| break_ensure.rb:50:5:53:9 | ensure ... | break_ensure.rb:45:14:55:5 | do ... |  |
+| break_ensure.rb:51:7:53:9 | [ensure: raise] if ... | break_ensure.rb:50:5:53:9 | [ensure: raise] ensure ... |  |
+| break_ensure.rb:51:7:53:9 | if ... | break_ensure.rb:50:5:53:9 | ensure ... |  |
+| break_ensure.rb:51:10:51:10 | [ensure: raise] x | break_ensure.rb:51:14:51:14 | [ensure: raise] 0 |  |
+| break_ensure.rb:51:10:51:10 | x | break_ensure.rb:51:14:51:14 | 0 |  |
+| break_ensure.rb:51:10:51:14 | ... > ... | break_ensure.rb:51:7:53:9 | if ... | false |
+| break_ensure.rb:51:10:51:14 | ... > ... | break_ensure.rb:52:15:52:16 | 10 | true |
+| break_ensure.rb:51:10:51:14 | [ensure: raise] ... > ... | break_ensure.rb:51:7:53:9 | [ensure: raise] if ... | false |
+| break_ensure.rb:51:10:51:14 | [ensure: raise] ... > ... | break_ensure.rb:52:15:52:16 | [ensure: raise] 10 | true |
+| break_ensure.rb:51:14:51:14 | 0 | break_ensure.rb:51:10:51:14 | ... > ... |  |
+| break_ensure.rb:51:14:51:14 | [ensure: raise] 0 | break_ensure.rb:51:10:51:14 | [ensure: raise] ... > ... |  |
+| break_ensure.rb:52:9:52:16 | [ensure: raise] break | break_ensure.rb:45:3:55:5 | while ... | break |
+| break_ensure.rb:52:9:52:16 | break | break_ensure.rb:45:3:55:5 | while ... | break |
+| break_ensure.rb:52:15:52:16 | 10 | break_ensure.rb:52:9:52:16 | break |  |
+| break_ensure.rb:52:15:52:16 | [ensure: raise] 10 | break_ensure.rb:52:9:52:16 | [ensure: raise] break |  |
+| case.rb:1:1:6:3 | enter if_in_case | case.rb:2:8:2:9 | self |  |
+| case.rb:1:1:6:3 | exit if_in_case (normal) | case.rb:1:1:6:3 | exit if_in_case |  |
+| case.rb:1:1:6:3 | if_in_case | case.rb:8:1:18:3 | case_match |  |
+| case.rb:1:1:99:4 | enter case.rb | case.rb:1:1:6:3 | if_in_case |  |
+| case.rb:1:1:99:4 | exit case.rb (normal) | case.rb:1:1:99:4 | exit case.rb |  |
+| case.rb:2:3:5:5 | case ... | case.rb:1:1:6:3 | exit if_in_case (normal) |  |
+| case.rb:2:8:2:9 | call to x1 | case.rb:3:10:3:10 | 1 |  |
+| case.rb:2:8:2:9 | self | case.rb:2:8:2:9 | call to x1 |  |
+| case.rb:3:5:3:42 | [match] when ... | case.rb:3:21:3:22 | self | match |
+| case.rb:3:5:3:42 | [no-match] when ... | case.rb:4:10:4:10 | 2 | no-match |
+| case.rb:3:10:3:10 | 1 | case.rb:3:5:3:42 | [match] when ... | match |
+| case.rb:3:10:3:10 | 1 | case.rb:3:5:3:42 | [no-match] when ... | no-match |
+| case.rb:3:12:3:42 | then ... | case.rb:2:3:5:5 | case ... |  |
+| case.rb:3:17:3:42 | ( ... ) | case.rb:3:12:3:42 | then ... |  |
+| case.rb:3:18:3:41 | if ... | case.rb:3:17:3:42 | ( ... ) |  |
+| case.rb:3:21:3:22 | call to x2 | case.rb:3:18:3:41 | if ... | false |
+| case.rb:3:21:3:22 | call to x2 | case.rb:3:29:3:37 | self | true |
+| case.rb:3:21:3:22 | self | case.rb:3:21:3:22 | call to x2 |  |
+| case.rb:3:24:3:37 | then ... | case.rb:3:18:3:41 | if ... |  |
+| case.rb:3:29:3:37 | call to puts | case.rb:3:24:3:37 | then ... |  |
+| case.rb:3:29:3:37 | self | case.rb:3:35:3:36 | x2 |  |
+| case.rb:3:34:3:37 | "x2" | case.rb:3:29:3:37 | call to puts |  |
+| case.rb:3:35:3:36 | x2 | case.rb:3:34:3:37 | "x2" |  |
+| case.rb:4:5:4:24 | [match] when ... | case.rb:4:17:4:24 | self | match |
+| case.rb:4:5:4:24 | [no-match] when ... | case.rb:2:3:5:5 | case ... | no-match |
+| case.rb:4:10:4:10 | 2 | case.rb:4:5:4:24 | [match] when ... | match |
+| case.rb:4:10:4:10 | 2 | case.rb:4:5:4:24 | [no-match] when ... | no-match |
+| case.rb:4:12:4:24 | then ... | case.rb:2:3:5:5 | case ... |  |
+| case.rb:4:17:4:24 | call to puts | case.rb:4:12:4:24 | then ... |  |
+| case.rb:4:17:4:24 | self | case.rb:4:23:4:23 | 2 |  |
+| case.rb:4:22:4:24 | "2" | case.rb:4:17:4:24 | call to puts |  |
+| case.rb:4:23:4:23 | 2 | case.rb:4:22:4:24 | "2" |  |
+| case.rb:8:1:18:3 | case_match | case.rb:20:1:24:3 | case_match_no_match |  |
+| case.rb:8:1:18:3 | enter case_match | case.rb:8:16:8:20 | value |  |
+| case.rb:8:1:18:3 | exit case_match (normal) | case.rb:8:1:18:3 | exit case_match |  |
+| case.rb:8:16:8:20 | value | case.rb:9:8:9:12 | value |  |
+| case.rb:9:3:17:5 | case ... | case.rb:8:1:18:3 | exit case_match (normal) |  |
+| case.rb:9:8:9:12 | value | case.rb:10:5:10:9 | in ... then ... |  |
+| case.rb:10:5:10:9 | in ... then ... | case.rb:10:8:10:8 | 0 |  |
+| case.rb:10:8:10:8 | 0 | case.rb:9:3:17:5 | case ... | match |
+| case.rb:10:8:10:8 | 0 | case.rb:11:5:11:15 | in ... then ... | no-match |
+| case.rb:11:5:11:15 | in ... then ... | case.rb:11:8:11:8 | 1 |  |
+| case.rb:11:8:11:8 | 1 | case.rb:11:15:11:15 | 3 | match |
+| case.rb:11:8:11:8 | 1 | case.rb:12:5:13:7 | in ... then ... | no-match |
+| case.rb:11:10:11:15 | then ... | case.rb:9:3:17:5 | case ... |  |
+| case.rb:11:15:11:15 | 3 | case.rb:11:10:11:15 | then ... |  |
+| case.rb:12:5:13:7 | in ... then ... | case.rb:12:8:12:8 | 2 |  |
+| case.rb:12:8:12:8 | 2 | case.rb:13:7:13:7 | 4 | match |
+| case.rb:12:8:12:8 | 2 | case.rb:14:5:14:25 | in ... then ... | no-match |
+| case.rb:12:9:13:7 | then ... | case.rb:9:3:17:5 | case ... |  |
+| case.rb:13:7:13:7 | 4 | case.rb:12:9:13:7 | then ... |  |
+| case.rb:14:5:14:25 | in ... then ... | case.rb:14:8:14:8 | x |  |
+| case.rb:14:8:14:8 | x | case.rb:14:13:14:13 | x | match |
+| case.rb:14:13:14:13 | x | case.rb:14:18:14:18 | 5 |  |
+| case.rb:14:13:14:18 | ... == ... | case.rb:14:25:14:25 | 6 | true |
+| case.rb:14:13:14:18 | ... == ... | case.rb:15:5:15:28 | in ... then ... | false |
+| case.rb:14:18:14:18 | 5 | case.rb:14:13:14:18 | ... == ... |  |
+| case.rb:14:20:14:25 | then ... | case.rb:9:3:17:5 | case ... |  |
+| case.rb:14:25:14:25 | 6 | case.rb:14:20:14:25 | then ... |  |
+| case.rb:15:5:15:28 | in ... then ... | case.rb:15:8:15:8 | x |  |
+| case.rb:15:8:15:8 | x | case.rb:15:17:15:17 | x | match |
+| case.rb:15:17:15:17 | x | case.rb:15:21:15:21 | 0 |  |
+| case.rb:15:17:15:21 | ... < ... | case.rb:15:28:15:28 | 7 | false |
+| case.rb:15:17:15:21 | ... < ... | case.rb:16:10:16:10 | 8 | true |
+| case.rb:15:21:15:21 | 0 | case.rb:15:17:15:21 | ... < ... |  |
+| case.rb:15:23:15:28 | then ... | case.rb:9:3:17:5 | case ... |  |
+| case.rb:15:28:15:28 | 7 | case.rb:15:23:15:28 | then ... |  |
+| case.rb:16:5:16:10 | else ... | case.rb:9:3:17:5 | case ... |  |
+| case.rb:16:10:16:10 | 8 | case.rb:16:5:16:10 | else ... |  |
+| case.rb:20:1:24:3 | case_match_no_match | case.rb:26:1:30:3 | case_match_raise |  |
+| case.rb:20:1:24:3 | enter case_match_no_match | case.rb:20:25:20:29 | value |  |
+| case.rb:20:1:24:3 | exit case_match_no_match (abnormal) | case.rb:20:1:24:3 | exit case_match_no_match |  |
+| case.rb:20:1:24:3 | exit case_match_no_match (normal) | case.rb:20:1:24:3 | exit case_match_no_match |  |
+| case.rb:20:25:20:29 | value | case.rb:21:8:21:12 | value |  |
+| case.rb:21:3:23:5 | case ... | case.rb:20:1:24:3 | exit case_match_no_match (normal) |  |
+| case.rb:21:8:21:12 | value | case.rb:22:5:22:8 | in ... then ... |  |
+| case.rb:22:5:22:8 | in ... then ... | case.rb:22:8:22:8 | 1 |  |
+| case.rb:22:8:22:8 | 1 | case.rb:20:1:24:3 | exit case_match_no_match (abnormal) | raise |
+| case.rb:22:8:22:8 | 1 | case.rb:21:3:23:5 | case ... | match |
+| case.rb:26:1:30:3 | case_match_raise | case.rb:32:1:39:3 | case_match_array |  |
+| case.rb:26:1:30:3 | enter case_match_raise | case.rb:26:22:26:26 | value |  |
+| case.rb:26:1:30:3 | exit case_match_raise (abnormal) | case.rb:26:1:30:3 | exit case_match_raise |  |
+| case.rb:26:1:30:3 | exit case_match_raise (normal) | case.rb:26:1:30:3 | exit case_match_raise |  |
+| case.rb:26:22:26:26 | value | case.rb:27:8:27:12 | value |  |
+| case.rb:27:3:29:5 | case ... | case.rb:26:1:30:3 | exit case_match_raise (normal) |  |
+| case.rb:27:8:27:12 | value | case.rb:28:4:28:28 | in ... then ... |  |
+| case.rb:28:4:28:28 | in ... then ... | case.rb:28:7:28:28 | -> { ... } |  |
+| case.rb:28:7:28:28 | -> { ... } | case.rb:26:1:30:3 | exit case_match_raise (abnormal) | raise |
+| case.rb:28:7:28:28 | -> { ... } | case.rb:27:3:29:5 | case ... | match |
+| case.rb:28:7:28:28 | enter -> { ... } | case.rb:28:10:28:10 | x |  |
+| case.rb:28:7:28:28 | exit -> { ... } (abnormal) | case.rb:28:7:28:28 | exit -> { ... } |  |
+| case.rb:28:10:28:10 | x | case.rb:28:14:28:25 | self |  |
+| case.rb:28:14:28:25 | call to raise | case.rb:28:7:28:28 | exit -> { ... } (abnormal) | raise |
+| case.rb:28:14:28:25 | self | case.rb:28:21:28:24 | oops |  |
+| case.rb:28:20:28:25 | "oops" | case.rb:28:14:28:25 | call to raise |  |
+| case.rb:28:21:28:24 | oops | case.rb:28:20:28:25 | "oops" |  |
+| case.rb:32:1:39:3 | case_match_array | case.rb:41:1:45:3 | case_match_find |  |
+| case.rb:32:1:39:3 | enter case_match_array | case.rb:32:22:32:26 | value |  |
+| case.rb:32:1:39:3 | exit case_match_array (abnormal) | case.rb:32:1:39:3 | exit case_match_array |  |
+| case.rb:32:1:39:3 | exit case_match_array (normal) | case.rb:32:1:39:3 | exit case_match_array |  |
+| case.rb:32:22:32:26 | value | case.rb:33:8:33:12 | value |  |
+| case.rb:33:3:38:5 | case ... | case.rb:32:1:39:3 | exit case_match_array (normal) |  |
+| case.rb:33:8:33:12 | value | case.rb:34:5:34:10 | in ... then ... |  |
+| case.rb:34:5:34:10 | in ... then ... | case.rb:34:8:34:9 | [ ..., * ] |  |
+| case.rb:34:8:34:9 | [ ..., * ] | case.rb:33:3:38:5 | case ... | match |
+| case.rb:34:8:34:9 | [ ..., * ] | case.rb:35:5:35:11 | in ... then ... | no-match |
+| case.rb:35:5:35:11 | in ... then ... | case.rb:35:8:35:10 | [ ..., * ] |  |
+| case.rb:35:8:35:10 | [ ..., * ] | case.rb:35:9:35:9 | x | false, match, true |
+| case.rb:35:8:35:10 | [ ..., * ] | case.rb:36:5:36:13 | in ... then ... | no-match |
+| case.rb:35:9:35:9 | x | case.rb:33:3:38:5 | case ... | match |
+| case.rb:36:5:36:13 | in ... then ... | case.rb:36:8:36:12 | [ ..., * ] |  |
+| case.rb:36:8:36:12 | [ ..., * ] | case.rb:36:9:36:9 | x | false, match, true |
+| case.rb:36:8:36:12 | [ ..., * ] | case.rb:37:5:37:27 | in ... then ... | no-match |
+| case.rb:36:9:36:9 | x | case.rb:33:3:38:5 | case ... | match |
+| case.rb:37:5:37:27 | in ... then ... | case.rb:37:8:37:10 | Bar |  |
+| case.rb:37:8:37:10 | Bar | case.rb:32:1:39:3 | exit case_match_array (abnormal) | raise |
+| case.rb:37:8:37:10 | Bar | case.rb:37:8:37:26 | [ ..., * ] | match |
+| case.rb:37:8:37:26 | [ ..., * ] | case.rb:32:1:39:3 | exit case_match_array (abnormal) | raise |
+| case.rb:37:8:37:26 | [ ..., * ] | case.rb:37:12:37:12 | a | false, match, true |
+| case.rb:37:12:37:12 | a | case.rb:37:15:37:15 | b | match |
+| case.rb:37:15:37:15 | b | case.rb:37:19:37:19 | c | match |
+| case.rb:37:19:37:19 | c | case.rb:37:22:37:22 | d |  |
+| case.rb:37:22:37:22 | d | case.rb:37:25:37:25 | e | match |
+| case.rb:37:25:37:25 | e | case.rb:33:3:38:5 | case ... | match |
+| case.rb:41:1:45:3 | case_match_find | case.rb:47:1:53:3 | case_match_hash |  |
+| case.rb:41:1:45:3 | enter case_match_find | case.rb:41:21:41:25 | value |  |
+| case.rb:41:1:45:3 | exit case_match_find (abnormal) | case.rb:41:1:45:3 | exit case_match_find |  |
+| case.rb:41:1:45:3 | exit case_match_find (normal) | case.rb:41:1:45:3 | exit case_match_find |  |
+| case.rb:41:21:41:25 | value | case.rb:42:8:42:12 | value |  |
+| case.rb:42:3:44:5 | case ... | case.rb:41:1:45:3 | exit case_match_find (normal) |  |
+| case.rb:42:8:42:12 | value | case.rb:43:5:43:22 | in ... then ... |  |
+| case.rb:43:5:43:22 | in ... then ... | case.rb:43:8:43:21 | [ *,...,* ] |  |
+| case.rb:43:8:43:21 | [ *,...,* ] | case.rb:41:1:45:3 | exit case_match_find (abnormal) | raise |
+| case.rb:43:8:43:21 | [ *,...,* ] | case.rb:43:10:43:10 | x | false, match, true |
+| case.rb:43:10:43:10 | x | case.rb:43:13:43:13 | 1 |  |
+| case.rb:43:13:43:13 | 1 | case.rb:41:1:45:3 | exit case_match_find (abnormal) | raise |
+| case.rb:43:13:43:13 | 1 | case.rb:43:16:43:16 | 2 | match |
+| case.rb:43:16:43:16 | 2 | case.rb:41:1:45:3 | exit case_match_find (abnormal) | raise |
+| case.rb:43:16:43:16 | 2 | case.rb:43:20:43:20 | y | match |
+| case.rb:43:20:43:20 | y | case.rb:42:3:44:5 | case ... |  |
+| case.rb:47:1:53:3 | case_match_hash | case.rb:55:1:61:3 | case_match_variable |  |
+| case.rb:47:1:53:3 | enter case_match_hash | case.rb:47:21:47:25 | value |  |
+| case.rb:47:1:53:3 | exit case_match_hash (abnormal) | case.rb:47:1:53:3 | exit case_match_hash |  |
+| case.rb:47:1:53:3 | exit case_match_hash (normal) | case.rb:47:1:53:3 | exit case_match_hash |  |
+| case.rb:47:21:47:25 | value | case.rb:48:8:48:12 | value |  |
+| case.rb:48:3:52:5 | case ... | case.rb:47:1:53:3 | exit case_match_hash (normal) |  |
+| case.rb:48:8:48:12 | value | case.rb:49:5:49:35 | in ... then ... |  |
+| case.rb:49:5:49:35 | in ... then ... | case.rb:49:8:49:10 | Foo |  |
+| case.rb:49:8:49:10 | Foo | case.rb:49:8:49:15 | Bar |  |
+| case.rb:49:8:49:15 | Bar | case.rb:49:8:49:34 | { ..., ** } | match |
+| case.rb:49:8:49:15 | Bar | case.rb:50:5:50:25 | in ... then ... | no-match |
+| case.rb:49:8:49:34 | { ..., ** } | case.rb:49:20:49:20 | 1 | false, match, true |
+| case.rb:49:8:49:34 | { ..., ** } | case.rb:50:5:50:25 | in ... then ... | no-match |
+| case.rb:49:20:49:20 | 1 | case.rb:49:23:49:23 | a | match |
+| case.rb:49:20:49:20 | 1 | case.rb:50:5:50:25 | in ... then ... | no-match |
+| case.rb:49:23:49:23 | a | case.rb:49:29:49:32 | rest | match |
+| case.rb:49:29:49:32 | rest | case.rb:48:3:52:5 | case ... |  |
+| case.rb:50:5:50:25 | in ... then ... | case.rb:50:8:50:10 | Bar |  |
+| case.rb:50:8:50:10 | Bar | case.rb:50:8:50:24 | { ..., ** } | match |
+| case.rb:50:8:50:10 | Bar | case.rb:51:5:51:17 | in ... then ... | no-match |
+| case.rb:50:8:50:24 | { ..., ** } | case.rb:50:16:50:16 | 1 | false, match, true |
+| case.rb:50:8:50:24 | { ..., ** } | case.rb:51:5:51:17 | in ... then ... | no-match |
+| case.rb:50:16:50:16 | 1 | case.rb:48:3:52:5 | case ... | match |
+| case.rb:50:16:50:16 | 1 | case.rb:51:5:51:17 | in ... then ... | no-match |
+| case.rb:51:5:51:17 | in ... then ... | case.rb:51:8:51:10 | Bar |  |
+| case.rb:51:8:51:10 | Bar | case.rb:47:1:53:3 | exit case_match_hash (abnormal) | raise |
+| case.rb:51:8:51:10 | Bar | case.rb:51:8:51:16 | { ..., ** } | match |
+| case.rb:51:8:51:16 | { ..., ** } | case.rb:47:1:53:3 | exit case_match_hash (abnormal) | raise |
+| case.rb:51:8:51:16 | { ..., ** } | case.rb:48:3:52:5 | case ... | false, match, true |
+| case.rb:55:1:61:3 | case_match_variable | case.rb:63:1:67:3 | case_match_underscore |  |
+| case.rb:55:1:61:3 | enter case_match_variable | case.rb:55:25:55:29 | value |  |
+| case.rb:55:1:61:3 | exit case_match_variable (normal) | case.rb:55:1:61:3 | exit case_match_variable |  |
+| case.rb:55:25:55:29 | value | case.rb:56:8:56:12 | value |  |
+| case.rb:56:3:60:5 | case ... | case.rb:55:1:61:3 | exit case_match_variable (normal) |  |
+| case.rb:56:8:56:12 | value | case.rb:57:5:57:8 | in ... then ... |  |
+| case.rb:57:5:57:8 | in ... then ... | case.rb:57:8:57:8 | 5 |  |
+| case.rb:57:8:57:8 | 5 | case.rb:56:3:60:5 | case ... | match |
+| case.rb:57:8:57:8 | 5 | case.rb:58:5:58:10 | in ... then ... | no-match |
+| case.rb:58:5:58:10 | in ... then ... | case.rb:58:8:58:10 | var |  |
+| case.rb:58:8:58:10 | var | case.rb:56:3:60:5 | case ... | match |
+| case.rb:63:1:67:3 | case_match_underscore | case.rb:69:1:93:3 | case_match_various |  |
+| case.rb:63:1:67:3 | enter case_match_underscore | case.rb:63:27:63:31 | value |  |
+| case.rb:63:1:67:3 | exit case_match_underscore (normal) | case.rb:63:1:67:3 | exit case_match_underscore |  |
+| case.rb:63:27:63:31 | value | case.rb:64:8:64:12 | value |  |
+| case.rb:64:3:66:5 | case ... | case.rb:63:1:67:3 | exit case_match_underscore (normal) |  |
+| case.rb:64:8:64:12 | value | case.rb:65:5:65:28 | in ... then ... |  |
+| case.rb:65:5:65:28 | in ... then ... | case.rb:65:8:65:28 | ... \| ... |  |
+| case.rb:65:8:65:8 | 5 | case.rb:64:3:66:5 | case ... | match |
+| case.rb:65:8:65:8 | 5 | case.rb:65:12:65:12 | _ | no-match |
+| case.rb:65:8:65:28 | ... \| ... | case.rb:65:8:65:8 | 5 |  |
+| case.rb:65:12:65:12 | _ | case.rb:64:3:66:5 | case ... | match |
+| case.rb:69:1:93:3 | case_match_various | case.rb:95:1:99:3 | case_match_guard_no_else |  |
+| case.rb:69:1:93:3 | enter case_match_various | case.rb:69:24:69:28 | value |  |
+| case.rb:69:1:93:3 | exit case_match_various (abnormal) | case.rb:69:1:93:3 | exit case_match_various |  |
+| case.rb:69:1:93:3 | exit case_match_various (normal) | case.rb:69:1:93:3 | exit case_match_various |  |
+| case.rb:69:24:69:28 | value | case.rb:70:3:70:5 | foo |  |
+| case.rb:70:3:70:5 | foo | case.rb:70:9:70:10 | 42 |  |
+| case.rb:70:3:70:10 | ... = ... | case.rb:72:8:72:12 | value |  |
+| case.rb:70:9:70:10 | 42 | case.rb:70:3:70:10 | ... = ... |  |
+| case.rb:72:3:92:5 | case ... | case.rb:69:1:93:3 | exit case_match_various (normal) |  |
+| case.rb:72:8:72:12 | value | case.rb:73:5:73:8 | in ... then ... |  |
+| case.rb:73:5:73:8 | in ... then ... | case.rb:73:8:73:8 | 5 |  |
+| case.rb:73:8:73:8 | 5 | case.rb:72:3:92:5 | case ... | match |
+| case.rb:73:8:73:8 | 5 | case.rb:74:5:74:11 | in ... then ... | no-match |
+| case.rb:74:5:74:11 | in ... then ... | case.rb:74:8:74:11 | ^... |  |
+| case.rb:74:8:74:11 | ^... | case.rb:74:9:74:11 | foo |  |
+| case.rb:74:9:74:11 | foo | case.rb:72:3:92:5 | case ... | match |
+| case.rb:74:9:74:11 | foo | case.rb:75:5:75:15 | in ... then ... | no-match |
+| case.rb:75:5:75:15 | in ... then ... | case.rb:75:9:75:14 | string |  |
+| case.rb:75:8:75:15 | "string" | case.rb:72:3:92:5 | case ... | match |
+| case.rb:75:8:75:15 | "string" | case.rb:76:5:76:18 | in ... then ... | no-match |
+| case.rb:75:9:75:14 | string | case.rb:75:8:75:15 | "string" |  |
+| case.rb:76:5:76:18 | in ... then ... | case.rb:76:8:76:18 | Array |  |
+| case.rb:76:8:76:18 | Array | case.rb:76:11:76:13 | foo |  |
+| case.rb:76:8:76:18 | call to [] | case.rb:72:3:92:5 | case ... | match |
+| case.rb:76:8:76:18 | call to [] | case.rb:77:5:77:18 | in ... then ... | no-match |
+| case.rb:76:11:76:13 | "foo" | case.rb:76:15:76:17 | bar |  |
+| case.rb:76:11:76:13 | foo | case.rb:76:11:76:13 | "foo" |  |
+| case.rb:76:15:76:17 | "bar" | case.rb:76:8:76:18 | call to [] |  |
+| case.rb:76:15:76:17 | bar | case.rb:76:15:76:17 | "bar" |  |
+| case.rb:77:5:77:18 | in ... then ... | case.rb:77:8:77:18 | Array |  |
+| case.rb:77:8:77:18 | Array | case.rb:77:11:77:13 | foo |  |
+| case.rb:77:8:77:18 | call to [] | case.rb:72:3:92:5 | case ... | match |
+| case.rb:77:8:77:18 | call to [] | case.rb:78:5:78:19 | in ... then ... | no-match |
+| case.rb:77:11:77:13 | :"foo" | case.rb:77:15:77:17 | bar |  |
+| case.rb:77:11:77:13 | foo | case.rb:77:11:77:13 | :"foo" |  |
+| case.rb:77:15:77:17 | :"bar" | case.rb:77:8:77:18 | call to [] |  |
+| case.rb:77:15:77:17 | bar | case.rb:77:15:77:17 | :"bar" |  |
+| case.rb:78:5:78:19 | in ... then ... | case.rb:78:9:78:18 | .*abc[0-9] |  |
+| case.rb:78:8:78:19 | /.*abc[0-9]/ | case.rb:72:3:92:5 | case ... | match |
+| case.rb:78:8:78:19 | /.*abc[0-9]/ | case.rb:79:5:79:14 | in ... then ... | no-match |
+| case.rb:78:9:78:18 | .*abc[0-9] | case.rb:78:8:78:19 | /.*abc[0-9]/ |  |
+| case.rb:79:5:79:14 | in ... then ... | case.rb:79:8:79:8 | 5 |  |
+| case.rb:79:8:79:8 | 5 | case.rb:79:13:79:14 | 10 |  |
+| case.rb:79:8:79:14 | _ .. _ | case.rb:72:3:92:5 | case ... | match |
+| case.rb:79:8:79:14 | _ .. _ | case.rb:80:5:80:12 | in ... then ... | no-match |
+| case.rb:79:13:79:14 | 10 | case.rb:79:8:79:14 | _ .. _ |  |
+| case.rb:80:5:80:12 | in ... then ... | case.rb:80:11:80:12 | 10 |  |
+| case.rb:80:8:80:12 | _ .. _ | case.rb:72:3:92:5 | case ... | match |
+| case.rb:80:8:80:12 | _ .. _ | case.rb:81:5:81:11 | in ... then ... | no-match |
+| case.rb:80:11:80:12 | 10 | case.rb:80:8:80:12 | _ .. _ |  |
+| case.rb:81:5:81:11 | in ... then ... | case.rb:81:8:81:8 | 5 |  |
+| case.rb:81:8:81:8 | 5 | case.rb:81:8:81:11 | _ .. _ |  |
+| case.rb:81:8:81:11 | _ .. _ | case.rb:72:3:92:5 | case ... | match |
+| case.rb:81:8:81:11 | _ .. _ | case.rb:82:5:82:20 | in ... then ... | no-match |
+| case.rb:82:5:82:20 | in ... then ... | case.rb:82:8:82:13 | ... => ... |  |
+| case.rb:82:8:82:8 | 5 | case.rb:82:13:82:13 | x | match |
+| case.rb:82:8:82:8 | 5 | case.rb:83:5:83:26 | in ... then ... | no-match |
+| case.rb:82:8:82:13 | ... => ... | case.rb:82:8:82:8 | 5 |  |
+| case.rb:82:13:82:13 | x | case.rb:82:20:82:20 | 1 | match |
+| case.rb:82:15:82:20 | then ... | case.rb:72:3:92:5 | case ... |  |
+| case.rb:82:20:82:20 | 1 | case.rb:82:15:82:20 | then ... |  |
+| case.rb:83:5:83:26 | in ... then ... | case.rb:83:8:83:26 | ... \| ... |  |
+| case.rb:83:8:83:8 | 5 | case.rb:72:3:92:5 | case ... | match |
+| case.rb:83:8:83:8 | 5 | case.rb:83:12:83:15 | ^... | no-match |
+| case.rb:83:8:83:26 | ... \| ... | case.rb:83:8:83:8 | 5 |  |
+| case.rb:83:12:83:15 | ^... | case.rb:83:13:83:15 | foo |  |
+| case.rb:83:13:83:15 | foo | case.rb:72:3:92:5 | case ... | match |
+| case.rb:83:13:83:15 | foo | case.rb:83:20:83:25 | string | no-match |
+| case.rb:83:19:83:26 | "string" | case.rb:72:3:92:5 | case ... | match |
+| case.rb:83:19:83:26 | "string" | case.rb:84:5:84:17 | in ... then ... | no-match |
+| case.rb:83:20:83:25 | string | case.rb:83:19:83:26 | "string" |  |
+| case.rb:84:5:84:17 | in ... then ... | case.rb:84:8:84:12 | Foo |  |
+| case.rb:84:8:84:12 | Foo | case.rb:84:8:84:17 | Bar |  |
+| case.rb:84:8:84:17 | Bar | case.rb:72:3:92:5 | case ... | match |
+| case.rb:84:8:84:17 | Bar | case.rb:85:5:85:23 | in ... then ... | no-match |
+| case.rb:85:5:85:23 | in ... then ... | case.rb:85:8:85:23 | -> { ... } |  |
+| case.rb:85:8:85:23 | -> { ... } | case.rb:72:3:92:5 | case ... | match |
+| case.rb:85:8:85:23 | -> { ... } | case.rb:86:5:86:11 | in ... then ... | no-match |
+| case.rb:85:8:85:23 | enter -> { ... } | case.rb:85:11:85:11 | x |  |
+| case.rb:85:8:85:23 | exit -> { ... } (normal) | case.rb:85:8:85:23 | exit -> { ... } |  |
+| case.rb:85:11:85:11 | x | case.rb:85:15:85:15 | x |  |
+| case.rb:85:15:85:15 | x | case.rb:85:20:85:21 | 10 |  |
+| case.rb:85:15:85:21 | ... == ... | case.rb:85:8:85:23 | exit -> { ... } (normal) |  |
+| case.rb:85:20:85:21 | 10 | case.rb:85:15:85:21 | ... == ... |  |
+| case.rb:86:5:86:11 | in ... then ... | case.rb:86:8:86:11 | foo |  |
+| case.rb:86:8:86:11 | :foo | case.rb:72:3:92:5 | case ... | match |
+| case.rb:86:8:86:11 | :foo | case.rb:87:5:87:17 | in ... then ... | no-match |
+| case.rb:86:8:86:11 | foo | case.rb:86:8:86:11 | :foo |  |
+| case.rb:87:5:87:17 | in ... then ... | case.rb:87:10:87:16 | foo bar |  |
+| case.rb:87:8:87:17 | :"foo bar" | case.rb:72:3:92:5 | case ... | match |
+| case.rb:87:8:87:17 | :"foo bar" | case.rb:88:5:88:15 | in ... then ... | no-match |
+| case.rb:87:10:87:16 | foo bar | case.rb:87:8:87:17 | :"foo bar" |  |
+| case.rb:88:5:88:15 | in ... then ... | case.rb:88:8:88:15 | ... \| ... |  |
+| case.rb:88:8:88:9 | - ... | case.rb:72:3:92:5 | case ... | match |
+| case.rb:88:8:88:9 | - ... | case.rb:88:14:88:15 | 10 | no-match |
+| case.rb:88:8:88:15 | ... \| ... | case.rb:88:9:88:9 | 5 |  |
+| case.rb:88:9:88:9 | 5 | case.rb:88:8:88:9 | - ... |  |
+| case.rb:88:13:88:15 | + ... | case.rb:72:3:92:5 | case ... | match |
+| case.rb:88:13:88:15 | + ... | case.rb:89:5:89:69 | in ... then ... | no-match |
+| case.rb:88:14:88:15 | 10 | case.rb:88:13:88:15 | + ... |  |
+| case.rb:89:5:89:69 | in ... then ... | case.rb:89:8:89:69 | ... \| ... |  |
+| case.rb:89:8:89:10 | nil | case.rb:72:3:92:5 | case ... | match |
+| case.rb:89:8:89:10 | nil | case.rb:89:14:89:17 | self | no-match |
+| case.rb:89:8:89:69 | ... \| ... | case.rb:89:8:89:10 | nil |  |
+| case.rb:89:14:89:17 | self | case.rb:72:3:92:5 | case ... | match |
+| case.rb:89:14:89:17 | self | case.rb:89:21:89:24 | true | no-match |
+| case.rb:89:21:89:24 | true | case.rb:72:3:92:5 | case ... | match |
+| case.rb:89:21:89:24 | true | case.rb:89:28:89:32 | false | no-match |
+| case.rb:89:28:89:32 | false | case.rb:72:3:92:5 | case ... | match |
+| case.rb:89:28:89:32 | false | case.rb:89:36:89:43 | __LINE__ | no-match |
+| case.rb:89:36:89:43 | __LINE__ | case.rb:72:3:92:5 | case ... | match |
+| case.rb:89:36:89:43 | __LINE__ | case.rb:89:47:89:54 | __FILE__ | no-match |
+| case.rb:89:47:89:54 | __FILE__ | case.rb:72:3:92:5 | case ... | match |
+| case.rb:89:47:89:54 | __FILE__ | case.rb:89:58:89:69 | __ENCODING__ | no-match |
+| case.rb:89:58:89:69 | __ENCODING__ | case.rb:72:3:92:5 | case ... | match |
+| case.rb:89:58:89:69 | __ENCODING__ | case.rb:90:5:90:13 | in ... then ... | no-match |
+| case.rb:90:5:90:13 | in ... then ... | case.rb:90:8:90:13 | ( ... ) |  |
+| case.rb:90:8:90:13 | ( ... ) | case.rb:90:9:90:9 | 1 |  |
+| case.rb:90:9:90:9 | 1 | case.rb:90:9:90:12 | _ .. _ |  |
+| case.rb:90:9:90:12 | _ .. _ | case.rb:72:3:92:5 | case ... | match |
+| case.rb:90:9:90:12 | _ .. _ | case.rb:91:5:91:25 | in ... then ... | no-match |
+| case.rb:91:5:91:25 | in ... then ... | case.rb:91:8:91:25 | ( ... ) |  |
+| case.rb:91:8:91:25 | ( ... ) | case.rb:91:9:91:24 | ... \| ... |  |
+| case.rb:91:9:91:9 | 0 | case.rb:72:3:92:5 | case ... | match |
+| case.rb:91:9:91:9 | 0 | case.rb:91:13:91:14 | "" | no-match |
+| case.rb:91:9:91:24 | ... \| ... | case.rb:91:9:91:9 | 0 |  |
+| case.rb:91:13:91:14 | "" | case.rb:72:3:92:5 | case ... | match |
+| case.rb:91:13:91:14 | "" | case.rb:91:18:91:19 | [ ..., * ] | no-match |
+| case.rb:91:18:91:19 | [ ..., * ] | case.rb:72:3:92:5 | case ... | match |
+| case.rb:91:18:91:19 | [ ..., * ] | case.rb:91:23:91:24 | { ..., ** } | no-match |
+| case.rb:91:23:91:24 | { ..., ** } | case.rb:69:1:93:3 | exit case_match_various (abnormal) | raise |
+| case.rb:91:23:91:24 | { ..., ** } | case.rb:72:3:92:5 | case ... | false, match, true |
+| case.rb:95:1:99:3 | case_match_guard_no_else | case.rb:1:1:99:4 | exit case.rb (normal) |  |
+| case.rb:95:1:99:3 | enter case_match_guard_no_else | case.rb:95:30:95:34 | value |  |
+| case.rb:95:1:99:3 | exit case_match_guard_no_else (abnormal) | case.rb:95:1:99:3 | exit case_match_guard_no_else |  |
+| case.rb:95:1:99:3 | exit case_match_guard_no_else (normal) | case.rb:95:1:99:3 | exit case_match_guard_no_else |  |
+| case.rb:95:30:95:34 | value | case.rb:96:8:96:12 | value |  |
+| case.rb:96:3:98:5 | case ... | case.rb:95:1:99:3 | exit case_match_guard_no_else (normal) |  |
+| case.rb:96:8:96:12 | value | case.rb:97:5:97:25 | in ... then ... |  |
+| case.rb:97:5:97:25 | in ... then ... | case.rb:97:8:97:8 | x |  |
+| case.rb:97:8:97:8 | x | case.rb:97:13:97:13 | x | match |
+| case.rb:97:13:97:13 | x | case.rb:97:18:97:18 | 5 |  |
+| case.rb:97:13:97:18 | ... == ... | case.rb:95:1:99:3 | exit case_match_guard_no_else (abnormal) | raise |
+| case.rb:97:13:97:18 | ... == ... | case.rb:97:25:97:25 | 6 | true |
+| case.rb:97:18:97:18 | 5 | case.rb:97:13:97:18 | ... == ... |  |
+| case.rb:97:20:97:25 | then ... | case.rb:96:3:98:5 | case ... |  |
+| case.rb:97:25:97:25 | 6 | case.rb:97:20:97:25 | then ... |  |
+| cfg.html.erb:5:16:5:21 | @title | cfg.html.erb:6:9:6:58 | self |  |
+| cfg.html.erb:5:16:5:21 | self | cfg.html.erb:5:16:5:21 | @title |  |
+| cfg.html.erb:5:16:31:12 | enter cfg.html.erb | cfg.html.erb:5:16:5:21 | self |  |
+| cfg.html.erb:5:16:31:12 | exit cfg.html.erb (normal) | cfg.html.erb:5:16:31:12 | exit cfg.html.erb |  |
+| cfg.html.erb:6:9:6:58 | call to stylesheet_link_tag | cfg.html.erb:12:11:12:33 | self |  |
+| cfg.html.erb:6:9:6:58 | self | cfg.html.erb:6:30:6:40 | application |  |
+| cfg.html.erb:6:29:6:41 | "application" | cfg.html.erb:6:44:6:49 | media |  |
+| cfg.html.erb:6:30:6:40 | application | cfg.html.erb:6:29:6:41 | "application" |  |
+| cfg.html.erb:6:44:6:49 | :media | cfg.html.erb:6:55:6:57 | all |  |
+| cfg.html.erb:6:44:6:49 | media | cfg.html.erb:6:44:6:49 | :media |  |
+| cfg.html.erb:6:44:6:58 | Pair | cfg.html.erb:6:9:6:58 | call to stylesheet_link_tag |  |
+| cfg.html.erb:6:54:6:58 | "all" | cfg.html.erb:6:44:6:58 | Pair |  |
+| cfg.html.erb:6:55:6:57 | all | cfg.html.erb:6:54:6:58 | "all" |  |
+| cfg.html.erb:12:11:12:33 | call to link_to | cfg.html.erb:15:19:15:32 | self |  |
+| cfg.html.erb:12:11:12:33 | self | cfg.html.erb:12:20:12:20 | A |  |
+| cfg.html.erb:12:19:12:21 | "A" | cfg.html.erb:12:24:12:24 | self |  |
+| cfg.html.erb:12:20:12:20 | A | cfg.html.erb:12:19:12:21 | "A" |  |
+| cfg.html.erb:12:24:12:24 | call to a | cfg.html.erb:12:27:12:28 | id |  |
+| cfg.html.erb:12:24:12:24 | self | cfg.html.erb:12:24:12:24 | call to a |  |
+| cfg.html.erb:12:27:12:28 | :id | cfg.html.erb:12:32:12:32 | a |  |
+| cfg.html.erb:12:27:12:28 | id | cfg.html.erb:12:27:12:28 | :id |  |
+| cfg.html.erb:12:27:12:33 | Pair | cfg.html.erb:12:11:12:33 | call to link_to |  |
+| cfg.html.erb:12:31:12:33 | "a" | cfg.html.erb:12:27:12:33 | Pair |  |
+| cfg.html.erb:12:32:12:32 | a | cfg.html.erb:12:31:12:33 | "a" |  |
+| cfg.html.erb:15:19:15:32 | call to link_to | cfg.html.erb:16:19:16:32 | self |  |
+| cfg.html.erb:15:19:15:32 | self | cfg.html.erb:15:28:15:28 | B |  |
+| cfg.html.erb:15:27:15:29 | "B" | cfg.html.erb:15:32:15:32 | self |  |
+| cfg.html.erb:15:28:15:28 | B | cfg.html.erb:15:27:15:29 | "B" |  |
+| cfg.html.erb:15:32:15:32 | call to a | cfg.html.erb:15:19:15:32 | call to link_to |  |
+| cfg.html.erb:15:32:15:32 | self | cfg.html.erb:15:32:15:32 | call to a |  |
+| cfg.html.erb:16:19:16:32 | call to link_to | cfg.html.erb:18:17:18:22 | self |  |
+| cfg.html.erb:16:19:16:32 | self | cfg.html.erb:16:28:16:28 | C |  |
+| cfg.html.erb:16:27:16:29 | "C" | cfg.html.erb:16:32:16:32 | self |  |
+| cfg.html.erb:16:28:16:28 | C | cfg.html.erb:16:27:16:29 | "C" |  |
+| cfg.html.erb:16:32:16:32 | call to b | cfg.html.erb:16:19:16:32 | call to link_to |  |
+| cfg.html.erb:16:32:16:32 | self | cfg.html.erb:16:32:16:32 | call to b |  |
+| cfg.html.erb:18:14:22:16 | if ... | cfg.html.erb:29:8:29:17 | self |  |
+| cfg.html.erb:18:17:18:22 | call to admin? | cfg.html.erb:19:19:19:32 | self | true |
+| cfg.html.erb:18:17:18:22 | call to admin? | cfg.html.erb:21:19:21:32 | self | false |
+| cfg.html.erb:18:17:18:22 | self | cfg.html.erb:18:17:18:22 | call to admin? |  |
+| cfg.html.erb:18:24:19:34 | then ... | cfg.html.erb:18:14:22:16 | if ... |  |
+| cfg.html.erb:19:19:19:32 | call to link_to | cfg.html.erb:18:24:19:34 | then ... |  |
+| cfg.html.erb:19:19:19:32 | self | cfg.html.erb:19:28:19:28 | D |  |
+| cfg.html.erb:19:27:19:29 | "D" | cfg.html.erb:19:32:19:32 | self |  |
+| cfg.html.erb:19:28:19:28 | D | cfg.html.erb:19:27:19:29 | "D" |  |
+| cfg.html.erb:19:32:19:32 | call to d | cfg.html.erb:19:19:19:32 | call to link_to |  |
+| cfg.html.erb:19:32:19:32 | self | cfg.html.erb:19:32:19:32 | call to d |  |
+| cfg.html.erb:20:14:21:34 | else ... | cfg.html.erb:18:14:22:16 | if ... |  |
+| cfg.html.erb:21:19:21:32 | call to link_to | cfg.html.erb:20:14:21:34 | else ... |  |
+| cfg.html.erb:21:19:21:32 | self | cfg.html.erb:21:28:21:28 | E |  |
+| cfg.html.erb:21:27:21:29 | "E" | cfg.html.erb:21:32:21:32 | self |  |
+| cfg.html.erb:21:28:21:28 | E | cfg.html.erb:21:27:21:29 | "E" |  |
+| cfg.html.erb:21:32:21:32 | call to e | cfg.html.erb:21:19:21:32 | call to link_to |  |
+| cfg.html.erb:21:32:21:32 | self | cfg.html.erb:21:32:21:32 | call to e |  |
+| cfg.html.erb:29:8:29:17 | call to collection | cfg.html.erb:29:24:31:10 | do ... end |  |
+| cfg.html.erb:29:8:29:17 | self | cfg.html.erb:29:8:29:17 | call to collection |  |
+| cfg.html.erb:29:8:31:10 | call to each | cfg.html.erb:5:16:31:12 | exit cfg.html.erb (normal) |  |
+| cfg.html.erb:29:24:31:10 | do ... end | cfg.html.erb:29:8:31:10 | call to each |  |
+| cfg.html.erb:29:24:31:10 | enter do ... end | cfg.html.erb:29:28:29:30 | key |  |
+| cfg.html.erb:29:24:31:10 | exit do ... end (normal) | cfg.html.erb:29:24:31:10 | exit do ... end |  |
+| cfg.html.erb:29:28:29:30 | key | cfg.html.erb:29:33:29:37 | value |  |
+| cfg.html.erb:29:33:29:37 | value | cfg.html.erb:30:23:30:25 | key |  |
+| cfg.html.erb:30:23:30:25 | key | cfg.html.erb:30:35:30:39 | value |  |
+| cfg.html.erb:30:35:30:39 | value | cfg.html.erb:29:24:31:10 | exit do ... end (normal) |  |
+| cfg.rb:1:1:1:12 | bar | cfg.rb:3:1:3:13 | alias ... |  |
+| cfg.rb:1:1:221:1 | enter cfg.rb | cfg.rb:16:3:16:14 | self |  |
+| cfg.rb:1:1:221:1 | exit cfg.rb (normal) | cfg.rb:1:1:221:1 | exit cfg.rb |  |
+| cfg.rb:3:1:3:13 | alias ... | cfg.rb:3:7:3:9 | foo |  |
+| cfg.rb:3:7:3:9 | foo | cfg.rb:3:11:3:13 | bar |  |
+| cfg.rb:3:11:3:13 | bar | cfg.rb:5:1:5:1 | b |  |
+| cfg.rb:5:1:5:1 | b | cfg.rb:5:5:5:6 | 42 |  |
+| cfg.rb:5:1:5:6 | ... = ... | cfg.rb:7:1:7:21 | Array |  |
+| cfg.rb:5:5:5:6 | 42 | cfg.rb:5:1:5:6 | ... = ... |  |
+| cfg.rb:7:1:7:21 | Array | cfg.rb:7:4:7:6 | one |  |
+| cfg.rb:7:1:7:21 | call to [] | cfg.rb:9:1:9:21 | Array |  |
+| cfg.rb:7:4:7:6 | one | cfg.rb:7:10:7:10 | b |  |
+| cfg.rb:7:4:7:12 | :"one#{...}" | cfg.rb:7:14:7:20 | another |  |
+| cfg.rb:7:7:7:12 | #{...} | cfg.rb:7:4:7:12 | :"one#{...}" |  |
+| cfg.rb:7:10:7:10 | b | cfg.rb:7:7:7:12 | #{...} |  |
+| cfg.rb:7:14:7:20 | :"another" | cfg.rb:7:1:7:21 | call to [] |  |
+| cfg.rb:7:14:7:20 | another | cfg.rb:7:14:7:20 | :"another" |  |
+| cfg.rb:9:1:9:21 | Array | cfg.rb:9:4:9:6 | one |  |
+| cfg.rb:9:1:9:21 | call to [] | cfg.rb:12:3:12:8 | self |  |
+| cfg.rb:9:4:9:6 | one | cfg.rb:9:10:9:10 | b |  |
+| cfg.rb:9:4:9:12 | "one#{...}" | cfg.rb:9:14:9:20 | another |  |
+| cfg.rb:9:7:9:12 | #{...} | cfg.rb:9:4:9:12 | "one#{...}" |  |
+| cfg.rb:9:10:9:10 | b | cfg.rb:9:7:9:12 | #{...} |  |
+| cfg.rb:9:14:9:20 | "another" | cfg.rb:9:1:9:21 | call to [] |  |
+| cfg.rb:9:14:9:20 | another | cfg.rb:9:14:9:20 | "another" |  |
+| cfg.rb:12:3:12:8 | call to puts | cfg.rb:19:1:21:1 | END { ... } |  |
+| cfg.rb:12:3:12:8 | self | cfg.rb:12:8:12:8 | 4 |  |
+| cfg.rb:12:8:12:8 | 4 | cfg.rb:12:3:12:8 | call to puts |  |
+| cfg.rb:15:1:17:1 | BEGIN { ... } | cfg.rb:1:1:1:12 | bar |  |
+| cfg.rb:16:3:16:14 | call to puts | cfg.rb:15:1:17:1 | BEGIN { ... } |  |
+| cfg.rb:16:3:16:14 | self | cfg.rb:16:9:16:13 | hello |  |
+| cfg.rb:16:8:16:14 | "hello" | cfg.rb:16:3:16:14 | call to puts |  |
+| cfg.rb:16:9:16:13 | hello | cfg.rb:16:8:16:14 | "hello" |  |
+| cfg.rb:19:1:21:1 | END { ... } | cfg.rb:23:1:23:2 | 41 |  |
+| cfg.rb:23:1:23:2 | 41 | cfg.rb:23:6:23:6 | 1 |  |
+| cfg.rb:23:1:23:6 | ... + ... | cfg.rb:25:1:25:1 | 2 |  |
+| cfg.rb:23:6:23:6 | 1 | cfg.rb:23:1:23:6 | ... + ... |  |
+| cfg.rb:25:1:25:1 | 2 | cfg.rb:25:9:25:22 | { ... } |  |
+| cfg.rb:25:1:25:22 | call to times | cfg.rb:27:1:27:11 | self |  |
+| cfg.rb:25:9:25:22 | enter { ... } | cfg.rb:25:12:25:12 | x |  |
+| cfg.rb:25:9:25:22 | exit { ... } (normal) | cfg.rb:25:9:25:22 | exit { ... } |  |
+| cfg.rb:25:9:25:22 | { ... } | cfg.rb:25:1:25:22 | call to times |  |
+| cfg.rb:25:12:25:12 | x | cfg.rb:25:15:25:20 | self |  |
+| cfg.rb:25:15:25:20 | call to puts | cfg.rb:25:9:25:22 | exit { ... } (normal) |  |
+| cfg.rb:25:15:25:20 | self | cfg.rb:25:20:25:20 | x |  |
+| cfg.rb:25:20:25:20 | x | cfg.rb:25:15:25:20 | call to puts |  |
+| cfg.rb:27:1:27:11 | call to puts | cfg.rb:29:1:29:4 | Proc |  |
+| cfg.rb:27:1:27:11 | self | cfg.rb:27:7:27:11 | puts |  |
+| cfg.rb:27:6:27:11 | &... | cfg.rb:27:1:27:11 | call to puts |  |
+| cfg.rb:27:7:27:11 | :puts | cfg.rb:27:6:27:11 | &... |  |
+| cfg.rb:27:7:27:11 | puts | cfg.rb:27:7:27:11 | :puts |  |
+| cfg.rb:29:1:29:4 | Proc | cfg.rb:29:10:29:24 | { ... } |  |
+| cfg.rb:29:1:29:24 | call to new | cfg.rb:31:7:31:10 | true |  |
+| cfg.rb:29:10:29:24 | enter { ... } | cfg.rb:29:14:29:14 | x |  |
+| cfg.rb:29:10:29:24 | exit { ... } (normal) | cfg.rb:29:10:29:24 | exit { ... } |  |
+| cfg.rb:29:10:29:24 | { ... } | cfg.rb:29:1:29:24 | call to new |  |
+| cfg.rb:29:14:29:14 | x | cfg.rb:29:17:29:17 | x |  |
+| cfg.rb:29:17:29:17 | x | cfg.rb:29:17:29:22 | call to call |  |
+| cfg.rb:29:17:29:22 | call to call | cfg.rb:29:10:29:24 | exit { ... } (normal) |  |
+| cfg.rb:31:1:33:3 | while ... | cfg.rb:35:4:35:8 | false |  |
+| cfg.rb:31:7:31:10 | true | cfg.rb:32:9:32:9 | 1 | true |
+| cfg.rb:32:3:32:9 | break | cfg.rb:31:1:33:3 | while ... | break |
+| cfg.rb:32:9:32:9 | 1 | cfg.rb:32:3:32:9 | break |  |
+| cfg.rb:35:1:37:3 | if ... | cfg.rb:39:1:39:4 | self |  |
+| cfg.rb:35:4:35:8 | false | cfg.rb:35:1:37:3 | if ... | false |
+| cfg.rb:39:1:39:4 | self | cfg.rb:39:11:39:12 | 42 |  |
+| cfg.rb:39:1:39:12 | call to puts | cfg.rb:41:6:41:7 | 10 |  |
+| cfg.rb:39:11:39:12 | 42 | cfg.rb:39:1:39:12 | call to puts |  |
+| cfg.rb:41:1:45:3 | case ... | cfg.rb:48:8:48:8 | b |  |
+| cfg.rb:41:6:41:7 | 10 | cfg.rb:42:8:42:8 | 1 |  |
+| cfg.rb:42:3:42:24 | [match] when ... | cfg.rb:42:15:42:24 | self | match |
+| cfg.rb:42:3:42:24 | [no-match] when ... | cfg.rb:43:8:43:8 | 2 | no-match |
+| cfg.rb:42:8:42:8 | 1 | cfg.rb:42:3:42:24 | [match] when ... | match |
+| cfg.rb:42:8:42:8 | 1 | cfg.rb:42:3:42:24 | [no-match] when ... | no-match |
+| cfg.rb:42:10:42:24 | then ... | cfg.rb:41:1:45:3 | case ... |  |
+| cfg.rb:42:15:42:24 | call to puts | cfg.rb:42:10:42:24 | then ... |  |
+| cfg.rb:42:15:42:24 | self | cfg.rb:42:21:42:23 | one |  |
+| cfg.rb:42:20:42:24 | "one" | cfg.rb:42:15:42:24 | call to puts |  |
+| cfg.rb:42:21:42:23 | one | cfg.rb:42:20:42:24 | "one" |  |
+| cfg.rb:43:3:43:31 | [match] when ... | cfg.rb:43:21:43:31 | self | match |
+| cfg.rb:43:3:43:31 | [no-match] when ... | cfg.rb:44:8:44:18 | self | no-match |
+| cfg.rb:43:8:43:8 | 2 | cfg.rb:43:3:43:31 | [match] when ... | match |
+| cfg.rb:43:8:43:8 | 2 | cfg.rb:43:11:43:11 | 3 | no-match |
+| cfg.rb:43:11:43:11 | 3 | cfg.rb:43:3:43:31 | [match] when ... | match |
+| cfg.rb:43:11:43:11 | 3 | cfg.rb:43:14:43:14 | 4 | no-match |
+| cfg.rb:43:14:43:14 | 4 | cfg.rb:43:3:43:31 | [match] when ... | match |
+| cfg.rb:43:14:43:14 | 4 | cfg.rb:43:3:43:31 | [no-match] when ... | no-match |
+| cfg.rb:43:16:43:31 | then ... | cfg.rb:41:1:45:3 | case ... |  |
+| cfg.rb:43:21:43:31 | call to puts | cfg.rb:43:16:43:31 | then ... |  |
+| cfg.rb:43:21:43:31 | self | cfg.rb:43:27:43:30 | some |  |
+| cfg.rb:43:26:43:31 | "some" | cfg.rb:43:21:43:31 | call to puts |  |
+| cfg.rb:43:27:43:30 | some | cfg.rb:43:26:43:31 | "some" |  |
+| cfg.rb:44:3:44:18 | else ... | cfg.rb:41:1:45:3 | case ... |  |
+| cfg.rb:44:8:44:18 | call to puts | cfg.rb:44:3:44:18 | else ... |  |
+| cfg.rb:44:8:44:18 | self | cfg.rb:44:14:44:17 | many |  |
+| cfg.rb:44:13:44:18 | "many" | cfg.rb:44:8:44:18 | call to puts |  |
+| cfg.rb:44:14:44:17 | many | cfg.rb:44:13:44:18 | "many" |  |
+| cfg.rb:47:1:50:3 | case ... | cfg.rb:52:1:52:7 | chained |  |
+| cfg.rb:48:3:48:29 | [false] when ... | cfg.rb:49:8:49:8 | b | false |
+| cfg.rb:48:3:48:29 | [true] when ... | cfg.rb:48:20:48:29 | self | true |
+| cfg.rb:48:8:48:8 | b | cfg.rb:48:13:48:13 | 1 |  |
+| cfg.rb:48:8:48:13 | ... == ... | cfg.rb:48:3:48:29 | [false] when ... | false |
+| cfg.rb:48:8:48:13 | ... == ... | cfg.rb:48:3:48:29 | [true] when ... | true |
+| cfg.rb:48:13:48:13 | 1 | cfg.rb:48:8:48:13 | ... == ... |  |
+| cfg.rb:48:15:48:29 | then ... | cfg.rb:47:1:50:3 | case ... |  |
+| cfg.rb:48:20:48:29 | call to puts | cfg.rb:48:15:48:29 | then ... |  |
+| cfg.rb:48:20:48:29 | self | cfg.rb:48:26:48:28 | one |  |
+| cfg.rb:48:25:48:29 | "one" | cfg.rb:48:20:48:29 | call to puts |  |
+| cfg.rb:48:26:48:28 | one | cfg.rb:48:25:48:29 | "one" |  |
+| cfg.rb:49:3:49:37 | [false] when ... | cfg.rb:47:1:50:3 | case ... | false |
+| cfg.rb:49:3:49:37 | [true] when ... | cfg.rb:49:27:49:37 | self | true |
+| cfg.rb:49:8:49:8 | b | cfg.rb:49:13:49:13 | 0 |  |
+| cfg.rb:49:8:49:13 | ... == ... | cfg.rb:49:3:49:37 | [true] when ... | true |
+| cfg.rb:49:8:49:13 | ... == ... | cfg.rb:49:16:49:16 | b | false |
+| cfg.rb:49:13:49:13 | 0 | cfg.rb:49:8:49:13 | ... == ... |  |
+| cfg.rb:49:16:49:16 | b | cfg.rb:49:20:49:20 | 1 |  |
+| cfg.rb:49:16:49:20 | ... > ... | cfg.rb:49:3:49:37 | [false] when ... | false |
+| cfg.rb:49:16:49:20 | ... > ... | cfg.rb:49:3:49:37 | [true] when ... | true |
+| cfg.rb:49:20:49:20 | 1 | cfg.rb:49:16:49:20 | ... > ... |  |
+| cfg.rb:49:22:49:37 | then ... | cfg.rb:47:1:50:3 | case ... |  |
+| cfg.rb:49:27:49:37 | call to puts | cfg.rb:49:22:49:37 | then ... |  |
+| cfg.rb:49:27:49:37 | self | cfg.rb:49:33:49:36 | some |  |
+| cfg.rb:49:32:49:37 | "some" | cfg.rb:49:27:49:37 | call to puts |  |
+| cfg.rb:49:33:49:36 | some | cfg.rb:49:32:49:37 | "some" |  |
+| cfg.rb:52:1:52:7 | chained | cfg.rb:52:12:52:12 | a |  |
+| cfg.rb:52:1:52:35 | ... = ... | cfg.rb:54:1:54:9 | character |  |
+| cfg.rb:52:11:52:13 | "a" | cfg.rb:52:18:52:24 | chained |  |
+| cfg.rb:52:11:52:35 | "..." "..." | cfg.rb:52:1:52:35 | ... = ... |  |
+| cfg.rb:52:12:52:12 | a | cfg.rb:52:11:52:13 | "a" |  |
+| cfg.rb:52:15:52:26 | "#{...}" | cfg.rb:52:29:52:34 | string |  |
+| cfg.rb:52:16:52:25 | #{...} | cfg.rb:52:15:52:26 | "#{...}" |  |
+| cfg.rb:52:18:52:24 | chained | cfg.rb:52:16:52:25 | #{...} |  |
+| cfg.rb:52:28:52:35 | "string" | cfg.rb:52:11:52:35 | "..." "..." |  |
+| cfg.rb:52:29:52:34 | string | cfg.rb:52:28:52:35 | "string" |  |
+| cfg.rb:54:1:54:9 | character | cfg.rb:54:13:54:17 | ?\\x40 |  |
+| cfg.rb:54:1:54:17 | ... = ... | cfg.rb:58:1:72:3 | Silly |  |
+| cfg.rb:54:13:54:17 | ?\\x40 | cfg.rb:54:1:54:17 | ... = ... |  |
+| cfg.rb:58:1:72:3 | Silly | cfg.rb:58:15:58:20 | Object |  |
+| cfg.rb:58:15:58:20 | Object | cfg.rb:59:3:59:9 | complex |  |
+| cfg.rb:59:3:59:9 | complex | cfg.rb:59:13:59:14 | 10 |  |
+| cfg.rb:59:3:59:17 | ... = ... | cfg.rb:60:3:60:13 | conditional |  |
+| cfg.rb:59:13:59:14 | 10 | cfg.rb:59:16:59:17 | 2i |  |
+| cfg.rb:59:13:59:17 | ... - ... | cfg.rb:59:3:59:17 | ... = ... |  |
+| cfg.rb:59:16:59:17 | 2i | cfg.rb:59:13:59:17 | ... - ... |  |
+| cfg.rb:60:3:60:13 | conditional | cfg.rb:60:17:60:17 | self |  |
+| cfg.rb:60:3:60:40 | ... = ... | cfg.rb:61:3:61:3 | C |  |
+| cfg.rb:60:17:60:17 | call to b | cfg.rb:60:21:60:22 | 10 |  |
+| cfg.rb:60:17:60:17 | self | cfg.rb:60:17:60:17 | call to b |  |
+| cfg.rb:60:17:60:22 | ... < ... | cfg.rb:60:27:60:31 | hello | true |
+| cfg.rb:60:17:60:22 | ... < ... | cfg.rb:60:37:60:39 | bye | false |
+| cfg.rb:60:17:60:40 | ... ? ... : ... | cfg.rb:60:3:60:40 | ... = ... |  |
+| cfg.rb:60:21:60:22 | 10 | cfg.rb:60:17:60:22 | ... < ... |  |
+| cfg.rb:60:26:60:32 | "hello" | cfg.rb:60:17:60:40 | ... ? ... : ... |  |
+| cfg.rb:60:27:60:31 | hello | cfg.rb:60:26:60:32 | "hello" |  |
+| cfg.rb:60:36:60:40 | "bye" | cfg.rb:60:17:60:40 | ... ? ... : ... |  |
+| cfg.rb:60:37:60:39 | bye | cfg.rb:60:36:60:40 | "bye" |  |
+| cfg.rb:61:3:61:3 | C | cfg.rb:61:8:61:15 | constant |  |
+| cfg.rb:61:3:61:16 | ... = ... | cfg.rb:62:17:62:27 | __synth__2 |  |
+| cfg.rb:61:7:61:16 | "constant" | cfg.rb:61:3:61:16 | ... = ... |  |
+| cfg.rb:61:8:61:15 | constant | cfg.rb:61:7:61:16 | "constant" |  |
+| cfg.rb:62:3:62:27 | ... | cfg.rb:63:3:66:5 | pattern |  |
+| cfg.rb:62:4:62:4 | 0 | cfg.rb:62:4:62:4 | call to [] |  |
+| cfg.rb:62:4:62:4 | ... = ... | cfg.rb:62:7:62:12 | __synth__2__1 |  |
+| cfg.rb:62:4:62:4 | __synth__2 | cfg.rb:62:4:62:4 | 0 |  |
+| cfg.rb:62:4:62:4 | call to [] | cfg.rb:62:4:62:4 | ... = ... |  |
+| cfg.rb:62:4:62:4 | x | cfg.rb:62:4:62:4 | __synth__2 |  |
+| cfg.rb:62:7:62:12 | 1 | cfg.rb:62:7:62:12 | call to [] |  |
+| cfg.rb:62:7:62:12 | * ... | cfg.rb:62:7:62:12 | ... = ... |  |
+| cfg.rb:62:7:62:12 | ... | cfg.rb:62:3:62:27 | ... |  |
+| cfg.rb:62:7:62:12 | ... = ... | cfg.rb:62:8:62:8 | y |  |
+| cfg.rb:62:7:62:12 | __synth__2 | cfg.rb:62:7:62:12 | 1 |  |
+| cfg.rb:62:7:62:12 | __synth__2__1 | cfg.rb:62:7:62:12 | __synth__2 |  |
+| cfg.rb:62:7:62:12 | call to [] | cfg.rb:62:7:62:12 | * ... |  |
+| cfg.rb:62:8:62:8 | 0 | cfg.rb:62:8:62:8 | call to [] |  |
+| cfg.rb:62:8:62:8 | ... = ... | cfg.rb:62:11:62:11 | z |  |
+| cfg.rb:62:8:62:8 | __synth__2__1 | cfg.rb:62:8:62:8 | 0 |  |
+| cfg.rb:62:8:62:8 | call to [] | cfg.rb:62:8:62:8 | ... = ... |  |
+| cfg.rb:62:8:62:8 | y | cfg.rb:62:8:62:8 | __synth__2__1 |  |
+| cfg.rb:62:11:62:11 | 1 | cfg.rb:62:11:62:11 | call to [] |  |
+| cfg.rb:62:11:62:11 | ... = ... | cfg.rb:62:7:62:12 | ... |  |
+| cfg.rb:62:11:62:11 | __synth__2__1 | cfg.rb:62:11:62:11 | 1 |  |
+| cfg.rb:62:11:62:11 | call to [] | cfg.rb:62:11:62:11 | ... = ... |  |
+| cfg.rb:62:11:62:11 | z | cfg.rb:62:11:62:11 | __synth__2__1 |  |
+| cfg.rb:62:17:62:27 | * ... | cfg.rb:62:17:62:27 | ... = ... |  |
+| cfg.rb:62:17:62:27 | ... = ... | cfg.rb:62:4:62:4 | x |  |
+| cfg.rb:62:17:62:27 | Array | cfg.rb:62:18:62:18 | 1 |  |
+| cfg.rb:62:17:62:27 | __synth__2 | cfg.rb:62:17:62:27 | Array |  |
+| cfg.rb:62:17:62:27 | call to [] | cfg.rb:62:17:62:27 | * ... |  |
+| cfg.rb:62:18:62:18 | 1 | cfg.rb:62:21:62:26 | Array |  |
+| cfg.rb:62:21:62:26 | Array | cfg.rb:62:22:62:22 | 2 |  |
+| cfg.rb:62:21:62:26 | call to [] | cfg.rb:62:17:62:27 | call to [] |  |
+| cfg.rb:62:22:62:22 | 2 | cfg.rb:62:25:62:25 | 3 |  |
+| cfg.rb:62:25:62:25 | 3 | cfg.rb:62:21:62:26 | call to [] |  |
+| cfg.rb:63:3:66:5 | enter pattern | cfg.rb:63:17:63:17 | a |  |
+| cfg.rb:63:3:66:5 | exit pattern (normal) | cfg.rb:63:3:66:5 | exit pattern |  |
+| cfg.rb:63:3:66:5 | pattern | cfg.rb:67:3:67:7 | items |  |
+| cfg.rb:63:16:63:20 | (..., ...) | cfg.rb:64:5:64:10 | self |  |
+| cfg.rb:63:17:63:17 | a | cfg.rb:63:19:63:19 | b |  |
+| cfg.rb:63:19:63:19 | b | cfg.rb:63:16:63:20 | (..., ...) |  |
+| cfg.rb:64:5:64:10 | call to puts | cfg.rb:65:5:65:10 | self |  |
+| cfg.rb:64:5:64:10 | self | cfg.rb:64:10:64:10 | a |  |
+| cfg.rb:64:10:64:10 | a | cfg.rb:64:5:64:10 | call to puts |  |
+| cfg.rb:65:5:65:10 | call to puts | cfg.rb:63:3:66:5 | exit pattern (normal) |  |
+| cfg.rb:65:5:65:10 | self | cfg.rb:65:10:65:10 | b |  |
+| cfg.rb:65:10:65:10 | b | cfg.rb:65:5:65:10 | call to puts |  |
+| cfg.rb:67:3:67:7 | items | cfg.rb:67:11:67:19 | Array |  |
+| cfg.rb:67:3:67:19 | ... = ... | cfg.rb:68:3:68:15 | self |  |
+| cfg.rb:67:11:67:19 | Array | cfg.rb:67:12:67:12 | 1 |  |
+| cfg.rb:67:11:67:19 | call to [] | cfg.rb:67:3:67:19 | ... = ... |  |
+| cfg.rb:67:12:67:12 | 1 | cfg.rb:67:15:67:15 | 2 |  |
+| cfg.rb:67:15:67:15 | 2 | cfg.rb:67:18:67:18 | 3 |  |
+| cfg.rb:67:18:67:18 | 3 | cfg.rb:67:11:67:19 | call to [] |  |
+| cfg.rb:68:3:68:15 | call to puts | cfg.rb:69:3:71:5 | print |  |
+| cfg.rb:68:3:68:15 | self | cfg.rb:68:8:68:12 | items |  |
+| cfg.rb:68:8:68:12 | items | cfg.rb:68:14:68:14 | 2 |  |
+| cfg.rb:68:8:68:15 | ...[...] | cfg.rb:68:3:68:15 | call to puts |  |
+| cfg.rb:68:14:68:14 | 2 | cfg.rb:68:8:68:15 | ...[...] |  |
+| cfg.rb:69:3:71:5 | enter print | cfg.rb:70:5:70:16 | self |  |
+| cfg.rb:69:3:71:5 | exit print (normal) | cfg.rb:69:3:71:5 | exit print |  |
+| cfg.rb:69:3:71:5 | print | cfg.rb:74:1:74:1 | x |  |
+| cfg.rb:70:5:70:16 | call to puts | cfg.rb:69:3:71:5 | exit print (normal) |  |
+| cfg.rb:70:5:70:16 | self | cfg.rb:70:11:70:15 | silly |  |
+| cfg.rb:70:10:70:16 | "silly" | cfg.rb:70:5:70:16 | call to puts |  |
+| cfg.rb:70:11:70:15 | silly | cfg.rb:70:10:70:16 | "silly" |  |
+| cfg.rb:74:1:74:1 | x | cfg.rb:74:5:74:6 | 42 |  |
+| cfg.rb:74:1:74:6 | ... = ... | cfg.rb:75:4:75:4 | x |  |
+| cfg.rb:74:5:74:6 | 42 | cfg.rb:74:1:74:6 | ... = ... |  |
+| cfg.rb:75:1:75:47 | if ... | cfg.rb:78:3:78:3 | ; |  |
+| cfg.rb:75:4:75:4 | x | cfg.rb:75:8:75:8 | 0 |  |
+| cfg.rb:75:4:75:8 | ... < ... | cfg.rb:75:15:75:15 | 0 | true |
+| cfg.rb:75:4:75:8 | ... < ... | cfg.rb:75:23:75:23 | x | false |
+| cfg.rb:75:8:75:8 | 0 | cfg.rb:75:4:75:8 | ... < ... |  |
+| cfg.rb:75:10:75:15 | then ... | cfg.rb:75:1:75:47 | if ... |  |
+| cfg.rb:75:15:75:15 | 0 | cfg.rb:75:10:75:15 | then ... |  |
+| cfg.rb:75:17:75:43 | elsif ... | cfg.rb:75:1:75:47 | if ... |  |
+| cfg.rb:75:23:75:23 | x | cfg.rb:75:27:75:28 | 10 |  |
+| cfg.rb:75:23:75:28 | ... > ... | cfg.rb:75:35:75:36 | 10 | true |
+| cfg.rb:75:23:75:28 | ... > ... | cfg.rb:75:43:75:43 | x | false |
+| cfg.rb:75:27:75:28 | 10 | cfg.rb:75:23:75:28 | ... > ... |  |
+| cfg.rb:75:30:75:36 | then ... | cfg.rb:75:17:75:43 | elsif ... |  |
+| cfg.rb:75:35:75:36 | 10 | cfg.rb:75:30:75:36 | then ... |  |
+| cfg.rb:75:38:75:43 | else ... | cfg.rb:75:17:75:43 | elsif ... |  |
+| cfg.rb:75:43:75:43 | x | cfg.rb:75:38:75:43 | else ... |  |
+| cfg.rb:78:3:78:3 | ; | cfg.rb:83:3:83:11 | self |  |
+| cfg.rb:82:1:83:11 | else ... | cfg.rb:85:3:85:12 | self |  |
+| cfg.rb:83:3:83:11 | call to puts | cfg.rb:82:1:83:11 | else ... |  |
+| cfg.rb:83:3:83:11 | self | cfg.rb:83:9:83:10 | ok |  |
+| cfg.rb:83:8:83:11 | "ok" | cfg.rb:83:3:83:11 | call to puts |  |
+| cfg.rb:83:9:83:10 | ok | cfg.rb:83:8:83:11 | "ok" |  |
+| cfg.rb:84:1:85:12 | ensure ... | cfg.rb:88:1:88:6 | escape |  |
+| cfg.rb:85:3:85:12 | call to puts | cfg.rb:84:1:85:12 | ensure ... |  |
+| cfg.rb:85:3:85:12 | self | cfg.rb:85:9:85:11 | end |  |
+| cfg.rb:85:8:85:12 | "end" | cfg.rb:85:3:85:12 | call to puts |  |
+| cfg.rb:85:9:85:11 | end | cfg.rb:85:8:85:12 | "end" |  |
+| cfg.rb:88:1:88:6 | escape | cfg.rb:88:11:88:16 | \\u1234 |  |
+| cfg.rb:88:1:88:23 | ... = ... | cfg.rb:90:5:90:5 | x |  |
+| cfg.rb:88:10:88:23 | "\\u1234#{...}\\n" | cfg.rb:88:1:88:23 | ... = ... |  |
+| cfg.rb:88:11:88:16 | \\u1234 | cfg.rb:88:19:88:19 | x |  |
+| cfg.rb:88:17:88:20 | #{...} | cfg.rb:88:21:88:22 | \\n |  |
+| cfg.rb:88:19:88:19 | x | cfg.rb:88:17:88:20 | #{...} |  |
+| cfg.rb:88:21:88:22 | \\n | cfg.rb:88:10:88:23 | "\\u1234#{...}\\n" |  |
+| cfg.rb:90:1:93:3 | ... | cfg.rb:95:1:95:7 | $global |  |
+| cfg.rb:90:1:93:3 | ... = ... | cfg.rb:91:6:91:6 | x |  |
+| cfg.rb:90:1:93:3 | __synth__0__1 | cfg.rb:90:1:93:3 | ... = ... |  |
+| cfg.rb:90:1:93:3 | __synth__0__1 | cfg.rb:90:5:90:5 | x |  |
+| cfg.rb:90:1:93:3 | call to each | cfg.rb:90:1:93:3 | ... |  |
+| cfg.rb:90:1:93:3 | enter { ... } | cfg.rb:90:1:93:3 | __synth__0__1 |  |
+| cfg.rb:90:1:93:3 | exit { ... } (normal) | cfg.rb:90:1:93:3 | exit { ... } |  |
+| cfg.rb:90:1:93:3 | { ... } | cfg.rb:90:1:93:3 | call to each |  |
+| cfg.rb:90:5:90:5 | ... = ... | cfg.rb:90:5:90:5 | if ... |  |
+| cfg.rb:90:5:90:5 | [false] ! ... | cfg.rb:90:5:90:5 | if ... | false |
+| cfg.rb:90:5:90:5 | [true] ! ... | cfg.rb:90:5:90:5 | x | true |
+| cfg.rb:90:5:90:5 | defined? ... | cfg.rb:90:5:90:5 | [false] ! ... | true |
+| cfg.rb:90:5:90:5 | defined? ... | cfg.rb:90:5:90:5 | [true] ! ... | false |
+| cfg.rb:90:5:90:5 | if ... | cfg.rb:90:10:90:26 | Array |  |
+| cfg.rb:90:5:90:5 | nil | cfg.rb:90:5:90:5 | ... = ... |  |
+| cfg.rb:90:5:90:5 | x | cfg.rb:90:1:93:3 | __synth__0__1 |  |
+| cfg.rb:90:5:90:5 | x | cfg.rb:90:5:90:5 | defined? ... |  |
+| cfg.rb:90:5:90:5 | x | cfg.rb:90:5:90:5 | nil |  |
+| cfg.rb:90:10:90:26 | Array | cfg.rb:90:11:90:13 | 1.4 |  |
+| cfg.rb:90:10:90:26 | call to [] | cfg.rb:90:1:93:3 | { ... } |  |
+| cfg.rb:90:11:90:13 | 1.4 | cfg.rb:90:16:90:18 | 2.5 |  |
+| cfg.rb:90:16:90:18 | 2.5 | cfg.rb:90:21:90:25 | 3.4e5 |  |
+| cfg.rb:90:21:90:25 | 3.4e5 | cfg.rb:90:10:90:26 | call to [] |  |
+| cfg.rb:91:3:91:24 | if ... | cfg.rb:92:3:92:8 | self |  |
+| cfg.rb:91:6:91:6 | x | cfg.rb:91:10:91:10 | 3 |  |
+| cfg.rb:91:6:91:10 | ... > ... | cfg.rb:91:3:91:24 | if ... | false |
+| cfg.rb:91:6:91:10 | ... > ... | cfg.rb:91:17:91:20 | next | true |
+| cfg.rb:91:10:91:10 | 3 | cfg.rb:91:6:91:10 | ... > ... |  |
+| cfg.rb:91:17:91:20 | next | cfg.rb:90:1:93:3 | exit { ... } (normal) | next |
+| cfg.rb:92:3:92:8 | call to puts | cfg.rb:90:1:93:3 | exit { ... } (normal) |  |
+| cfg.rb:92:3:92:8 | self | cfg.rb:92:8:92:8 | x |  |
+| cfg.rb:92:8:92:8 | x | cfg.rb:92:3:92:8 | call to puts |  |
+| cfg.rb:95:1:95:7 | $global | cfg.rb:95:11:95:12 | 42 |  |
+| cfg.rb:95:1:95:12 | ... = ... | cfg.rb:97:1:97:4 | map1 |  |
+| cfg.rb:95:11:95:12 | 42 | cfg.rb:95:1:95:12 | ... = ... |  |
+| cfg.rb:97:1:97:4 | map1 | cfg.rb:97:8:97:39 | Hash |  |
+| cfg.rb:97:1:97:39 | ... = ... | cfg.rb:98:1:98:4 | map2 |  |
+| cfg.rb:97:8:97:39 | Hash | cfg.rb:97:11:97:11 | a |  |
+| cfg.rb:97:8:97:39 | call to [] | cfg.rb:97:1:97:39 | ... = ... |  |
+| cfg.rb:97:10:97:12 | "a" | cfg.rb:97:18:97:18 | b |  |
+| cfg.rb:97:10:97:19 | Pair | cfg.rb:97:23:97:23 | c |  |
+| cfg.rb:97:11:97:11 | a | cfg.rb:97:10:97:12 | "a" |  |
+| cfg.rb:97:17:97:19 | "b" | cfg.rb:97:10:97:19 | Pair |  |
+| cfg.rb:97:18:97:18 | b | cfg.rb:97:17:97:19 | "b" |  |
+| cfg.rb:97:22:97:24 | "c" | cfg.rb:97:28:97:28 | d |  |
+| cfg.rb:97:22:97:29 | Pair | cfg.rb:97:32:97:32 | e |  |
+| cfg.rb:97:23:97:23 | c | cfg.rb:97:22:97:24 | "c" |  |
+| cfg.rb:97:27:97:29 | "d" | cfg.rb:97:22:97:29 | Pair |  |
+| cfg.rb:97:28:97:28 | d | cfg.rb:97:27:97:29 | "d" |  |
+| cfg.rb:97:32:97:32 | :e | cfg.rb:97:36:97:36 | f |  |
+| cfg.rb:97:32:97:32 | e | cfg.rb:97:32:97:32 | :e |  |
+| cfg.rb:97:32:97:37 | Pair | cfg.rb:97:8:97:39 | call to [] |  |
+| cfg.rb:97:35:97:37 | "f" | cfg.rb:97:32:97:37 | Pair |  |
+| cfg.rb:97:36:97:36 | f | cfg.rb:97:35:97:37 | "f" |  |
+| cfg.rb:98:1:98:4 | map2 | cfg.rb:98:8:98:36 | Hash |  |
+| cfg.rb:98:1:98:36 | ... = ... | cfg.rb:101:1:104:3 | parameters |  |
+| cfg.rb:98:8:98:36 | Hash | cfg.rb:98:12:98:15 | map1 |  |
+| cfg.rb:98:8:98:36 | call to [] | cfg.rb:98:1:98:36 | ... = ... |  |
+| cfg.rb:98:10:98:15 | ** ... | cfg.rb:98:19:98:19 | x |  |
+| cfg.rb:98:12:98:15 | map1 | cfg.rb:98:10:98:15 | ** ... |  |
+| cfg.rb:98:18:98:20 | "x" | cfg.rb:98:26:98:26 | y |  |
+| cfg.rb:98:18:98:27 | Pair | cfg.rb:98:32:98:35 | map1 |  |
+| cfg.rb:98:19:98:19 | x | cfg.rb:98:18:98:20 | "x" |  |
+| cfg.rb:98:25:98:27 | "y" | cfg.rb:98:18:98:27 | Pair |  |
+| cfg.rb:98:26:98:26 | y | cfg.rb:98:25:98:27 | "y" |  |
+| cfg.rb:98:30:98:35 | ** ... | cfg.rb:98:8:98:36 | call to [] |  |
+| cfg.rb:98:32:98:35 | map1 | cfg.rb:98:30:98:35 | ** ... |  |
+| cfg.rb:101:1:104:3 | enter parameters | cfg.rb:101:16:101:20 | value |  |
+| cfg.rb:101:1:104:3 | exit parameters (normal) | cfg.rb:101:1:104:3 | exit parameters |  |
+| cfg.rb:101:1:104:3 | parameters | cfg.rb:106:1:106:4 | type |  |
+| cfg.rb:101:16:101:20 | value | cfg.rb:101:24:101:25 | 42 | false, no-match, true |
+| cfg.rb:101:16:101:20 | value | cfg.rb:101:28:101:30 | key | match |
+| cfg.rb:101:24:101:25 | 42 | cfg.rb:101:28:101:30 | key |  |
+| cfg.rb:101:28:101:30 | key | cfg.rb:101:36:101:41 | kwargs |  |
+| cfg.rb:101:36:101:41 | kwargs | cfg.rb:102:3:102:12 | self |  |
+| cfg.rb:102:3:102:12 | call to puts | cfg.rb:103:10:103:15 | kwargs |  |
+| cfg.rb:102:3:102:12 | self | cfg.rb:102:8:102:12 | value |  |
+| cfg.rb:102:8:102:12 | value | cfg.rb:102:3:102:12 | call to puts |  |
+| cfg.rb:103:3:103:20 | return | cfg.rb:101:1:104:3 | exit parameters (normal) | return |
+| cfg.rb:103:10:103:15 | kwargs | cfg.rb:103:17:103:19 | key |  |
+| cfg.rb:103:10:103:20 | ...[...] | cfg.rb:103:3:103:20 | return |  |
+| cfg.rb:103:17:103:19 | key | cfg.rb:103:10:103:20 | ...[...] |  |
+| cfg.rb:106:1:106:4 | type | cfg.rb:106:10:106:16 | healthy |  |
+| cfg.rb:106:1:106:17 | ... = ... | cfg.rb:107:1:107:5 | table |  |
+| cfg.rb:106:9:106:17 | "healthy" | cfg.rb:106:1:106:17 | ... = ... |  |
+| cfg.rb:106:10:106:16 | healthy | cfg.rb:106:9:106:17 | "healthy" |  |
+| cfg.rb:107:1:107:5 | table | cfg.rb:107:10:107:13 | food |  |
+| cfg.rb:107:1:107:14 | ... = ... | cfg.rb:108:1:108:12 | self |  |
+| cfg.rb:107:9:107:14 | "food" | cfg.rb:107:1:107:14 | ... = ... |  |
+| cfg.rb:107:10:107:13 | food | cfg.rb:107:9:107:14 | "food" |  |
+| cfg.rb:108:1:108:12 | call to puts | cfg.rb:113:14:113:14 | b |  |
+| cfg.rb:108:1:108:12 | self | cfg.rb:108:13:109:14 | \nSELECT * FROM  |  |
+| cfg.rb:108:6:108:12 | ( ... ) | cfg.rb:108:1:108:12 | call to puts |  |
+| cfg.rb:108:7:108:11 | <<SQL | cfg.rb:108:6:108:12 | ( ... ) |  |
+| cfg.rb:108:13:109:14 | \nSELECT * FROM  | cfg.rb:109:17:109:21 | table |  |
+| cfg.rb:109:15:109:22 | #{...} | cfg.rb:109:23:109:23 |   |  |
+| cfg.rb:109:17:109:21 | table | cfg.rb:109:15:109:22 | #{...} |  |
+| cfg.rb:109:23:109:23 |   | cfg.rb:109:24:109:25 | \\n |  |
+| cfg.rb:109:24:109:25 | \\n | cfg.rb:109:26:110:6 | \nWHERE  |  |
+| cfg.rb:109:26:110:6 | \nWHERE  | cfg.rb:110:9:110:12 | type |  |
+| cfg.rb:110:7:110:13 | #{...} | cfg.rb:110:14:110:21 |  = true  |  |
+| cfg.rb:110:9:110:12 | type | cfg.rb:110:7:110:13 | #{...} |  |
+| cfg.rb:110:14:110:21 |  = true  | cfg.rb:110:22:110:23 | \\n |  |
+| cfg.rb:110:22:110:23 | \\n | cfg.rb:110:24:110:24 | \n |  |
+| cfg.rb:110:24:110:24 | \n | cfg.rb:108:7:108:11 | <<SQL |  |
+| cfg.rb:113:1:113:9 | call to puts | cfg.rb:113:1:113:19 | ... if ... |  |
+| cfg.rb:113:1:113:9 | self | cfg.rb:113:7:113:8 | hi |  |
+| cfg.rb:113:1:113:19 | ... if ... | cfg.rb:115:1:118:3 | C |  |
+| cfg.rb:113:6:113:9 | "hi" | cfg.rb:113:1:113:9 | call to puts |  |
+| cfg.rb:113:7:113:8 | hi | cfg.rb:113:6:113:9 | "hi" |  |
+| cfg.rb:113:14:113:14 | b | cfg.rb:113:18:113:19 | 10 |  |
+| cfg.rb:113:14:113:19 | ... > ... | cfg.rb:113:1:113:9 | self | true |
+| cfg.rb:113:14:113:19 | ... > ... | cfg.rb:113:1:113:19 | ... if ... | false |
+| cfg.rb:113:18:113:19 | 10 | cfg.rb:113:14:113:19 | ... > ... |  |
+| cfg.rb:115:1:118:3 | C | cfg.rb:116:3:116:8 | self |  |
+| cfg.rb:116:3:116:8 | @field | cfg.rb:116:12:116:13 | 42 |  |
+| cfg.rb:116:3:116:8 | self | cfg.rb:116:3:116:8 | @field |  |
+| cfg.rb:116:3:116:13 | ... = ... | cfg.rb:117:3:117:16 | @@static_field |  |
+| cfg.rb:116:12:116:13 | 42 | cfg.rb:116:3:116:13 | ... = ... |  |
+| cfg.rb:117:3:117:16 | @@static_field | cfg.rb:117:20:117:21 | 10 |  |
+| cfg.rb:117:3:117:21 | ... = ... | cfg.rb:120:1:120:4 | swap |  |
+| cfg.rb:117:20:117:21 | 10 | cfg.rb:117:3:117:21 | ... = ... |  |
+| cfg.rb:120:1:120:4 | swap | cfg.rb:120:8:120:28 | -> { ... } |  |
+| cfg.rb:120:1:120:28 | ... = ... | cfg.rb:122:1:131:3 | M |  |
+| cfg.rb:120:8:120:28 | -> { ... } | cfg.rb:120:1:120:28 | ... = ... |  |
+| cfg.rb:120:8:120:28 | enter -> { ... } | cfg.rb:120:12:120:12 | x |  |
+| cfg.rb:120:8:120:28 | exit -> { ... } (normal) | cfg.rb:120:8:120:28 | exit -> { ... } |  |
+| cfg.rb:120:11:120:16 | (..., ...) | cfg.rb:120:21:120:26 | Array |  |
+| cfg.rb:120:12:120:12 | x | cfg.rb:120:15:120:15 | y |  |
+| cfg.rb:120:15:120:15 | y | cfg.rb:120:11:120:16 | (..., ...) |  |
+| cfg.rb:120:21:120:26 | Array | cfg.rb:120:22:120:22 | y |  |
+| cfg.rb:120:21:120:26 | call to [] | cfg.rb:120:8:120:28 | exit -> { ... } (normal) |  |
+| cfg.rb:120:22:120:22 | y | cfg.rb:120:25:120:25 | x |  |
+| cfg.rb:120:25:120:25 | x | cfg.rb:120:21:120:26 | call to [] |  |
+| cfg.rb:122:1:131:3 | M | cfg.rb:123:2:123:8 | nothing |  |
+| cfg.rb:123:2:123:8 | nothing | cfg.rb:123:12:123:14 | nil |  |
+| cfg.rb:123:2:123:14 | ... = ... | cfg.rb:124:2:124:5 | some |  |
+| cfg.rb:123:12:123:14 | nil | cfg.rb:123:2:123:14 | ... = ... |  |
+| cfg.rb:124:2:124:5 | some | cfg.rb:124:9:124:9 | 2 |  |
+| cfg.rb:124:2:124:9 | ... = ... | cfg.rb:125:2:125:5 | some |  |
+| cfg.rb:124:9:124:9 | 2 | cfg.rb:124:2:124:9 | ... = ... |  |
+| cfg.rb:125:2:125:5 | some | cfg.rb:125:2:125:5 | some |  |
+| cfg.rb:125:2:125:5 | some | cfg.rb:125:10:125:11 | 10 |  |
+| cfg.rb:125:2:125:11 | ... = ... | cfg.rb:126:2:126:5 | last |  |
+| cfg.rb:125:7:125:8 | ... + ... | cfg.rb:125:2:125:11 | ... = ... |  |
+| cfg.rb:125:10:125:11 | 10 | cfg.rb:125:7:125:8 | ... + ... |  |
+| cfg.rb:126:2:126:5 | last | cfg.rb:126:10:126:10 | 2 |  |
+| cfg.rb:126:2:126:17 | ... = ... | cfg.rb:127:2:127:6 | range |  |
+| cfg.rb:126:9:126:17 | ( ... ) | cfg.rb:126:2:126:17 | ... = ... |  |
+| cfg.rb:126:10:126:10 | 2 | cfg.rb:126:13:126:13 | 4 |  |
+| cfg.rb:126:13:126:13 | 4 | cfg.rb:126:16:126:16 | 7 |  |
+| cfg.rb:126:16:126:16 | 7 | cfg.rb:126:9:126:17 | ( ... ) |  |
+| cfg.rb:127:2:127:6 | range | cfg.rb:127:10:127:10 | 0 |  |
+| cfg.rb:127:2:127:13 | ... = ... | cfg.rb:128:2:128:5 | half |  |
+| cfg.rb:127:10:127:10 | 0 | cfg.rb:127:13:127:13 | 9 |  |
+| cfg.rb:127:10:127:13 | _ .. _ | cfg.rb:127:2:127:13 | ... = ... |  |
+| cfg.rb:127:13:127:13 | 9 | cfg.rb:127:10:127:13 | _ .. _ |  |
+| cfg.rb:128:2:128:5 | half | cfg.rb:128:9:128:9 | 1 |  |
+| cfg.rb:128:2:128:19 | ... = ... | cfg.rb:129:2:129:6 | regex |  |
+| cfg.rb:128:9:128:9 | 1 | cfg.rb:128:11:128:12 | 3r |  |
+| cfg.rb:128:9:128:12 | ... / ... | cfg.rb:128:16:128:16 | 1 |  |
+| cfg.rb:128:9:128:19 | ... + ... | cfg.rb:128:2:128:19 | ... = ... |  |
+| cfg.rb:128:11:128:12 | 3r | cfg.rb:128:9:128:12 | ... / ... |  |
+| cfg.rb:128:16:128:16 | 1 | cfg.rb:128:18:128:19 | 6r |  |
+| cfg.rb:128:16:128:19 | ... / ... | cfg.rb:128:9:128:19 | ... + ... |  |
+| cfg.rb:128:18:128:19 | 6r | cfg.rb:128:16:128:19 | ... / ... |  |
+| cfg.rb:129:2:129:6 | regex | cfg.rb:129:11:129:15 | hello |  |
+| cfg.rb:129:2:129:29 | ... = ... | cfg.rb:130:2:130:9 | Constant |  |
+| cfg.rb:129:10:129:29 | /hello\\s+[#{...}]/ | cfg.rb:129:2:129:29 | ... = ... |  |
+| cfg.rb:129:11:129:15 | hello | cfg.rb:129:16:129:17 | \\s |  |
+| cfg.rb:129:16:129:17 | \\s | cfg.rb:129:18:129:19 | +[ |  |
+| cfg.rb:129:18:129:19 | +[ | cfg.rb:129:22:129:26 | range |  |
+| cfg.rb:129:20:129:27 | #{...} | cfg.rb:129:28:129:28 | ] |  |
+| cfg.rb:129:22:129:26 | range | cfg.rb:129:20:129:27 | #{...} |  |
+| cfg.rb:129:28:129:28 | ] | cfg.rb:129:10:129:29 | /hello\\s+[#{...}]/ |  |
+| cfg.rb:130:2:130:9 | Constant | cfg.rb:130:13:130:13 | 5 |  |
+| cfg.rb:130:2:130:13 | ... = ... | cfg.rb:133:1:133:21 | EmptyClass |  |
+| cfg.rb:130:13:130:13 | 5 | cfg.rb:130:2:130:13 | ... = ... |  |
+| cfg.rb:133:1:133:21 | EmptyClass | cfg.rb:134:1:134:23 | EmptyModule |  |
+| cfg.rb:134:1:134:23 | EmptyModule | cfg.rb:136:1:136:1 | 1 |  |
+| cfg.rb:136:1:136:1 | 1 | cfg.rb:136:3:136:3 | 0 |  |
+| cfg.rb:136:1:136:3 | ... / ... | cfg.rb:136:1:136:29 | ... rescue ... |  |
+| cfg.rb:136:1:136:3 | ... / ... | cfg.rb:136:12:136:29 | self | raise |
+| cfg.rb:136:1:136:29 | ... rescue ... | cfg.rb:138:17:138:23 | __synth__2 |  |
+| cfg.rb:136:3:136:3 | 0 | cfg.rb:136:1:136:3 | ... / ... |  |
+| cfg.rb:136:12:136:29 | call to puts | cfg.rb:136:1:136:29 | ... rescue ... |  |
+| cfg.rb:136:12:136:29 | self | cfg.rb:136:18:136:28 | div by zero |  |
+| cfg.rb:136:17:136:29 | "div by zero" | cfg.rb:136:12:136:29 | call to puts |  |
+| cfg.rb:136:18:136:28 | div by zero | cfg.rb:136:17:136:29 | "div by zero" |  |
+| cfg.rb:138:1:138:23 | ... | cfg.rb:140:1:140:1 | M |  |
+| cfg.rb:138:3:138:6 | 0 | cfg.rb:138:3:138:6 | -2 |  |
+| cfg.rb:138:3:138:6 | -2 | cfg.rb:138:3:138:6 | _ .. _ |  |
+| cfg.rb:138:3:138:6 | ... = ... | cfg.rb:138:9:138:12 | last |  |
+| cfg.rb:138:3:138:6 | _ .. _ | cfg.rb:138:3:138:6 | call to [] |  |
+| cfg.rb:138:3:138:6 | __synth__2 | cfg.rb:138:3:138:6 | 0 |  |
+| cfg.rb:138:3:138:6 | call to [] | cfg.rb:138:3:138:6 | ... = ... |  |
+| cfg.rb:138:3:138:6 | init | cfg.rb:138:3:138:6 | __synth__2 |  |
+| cfg.rb:138:9:138:12 | -1 | cfg.rb:138:9:138:12 | call to [] |  |
+| cfg.rb:138:9:138:12 | ... = ... | cfg.rb:138:1:138:23 | ... |  |
+| cfg.rb:138:9:138:12 | __synth__2 | cfg.rb:138:9:138:12 | -1 |  |
+| cfg.rb:138:9:138:12 | call to [] | cfg.rb:138:9:138:12 | ... = ... |  |
+| cfg.rb:138:9:138:12 | last | cfg.rb:138:9:138:12 | __synth__2 |  |
+| cfg.rb:138:17:138:17 | 1 | cfg.rb:138:20:138:20 | 2 |  |
+| cfg.rb:138:17:138:23 | * ... | cfg.rb:138:17:138:23 | ... = ... |  |
+| cfg.rb:138:17:138:23 | ... = ... | cfg.rb:138:3:138:6 | init |  |
+| cfg.rb:138:17:138:23 | ..., ... | cfg.rb:138:17:138:23 | * ... |  |
+| cfg.rb:138:17:138:23 | __synth__2 | cfg.rb:138:17:138:17 | 1 |  |
+| cfg.rb:138:20:138:20 | 2 | cfg.rb:138:23:138:23 | 3 |  |
+| cfg.rb:138:23:138:23 | 3 | cfg.rb:138:17:138:23 | ..., ... |  |
+| cfg.rb:140:1:140:1 | M | cfg.rb:140:1:140:11 | Constant |  |
+| cfg.rb:140:1:140:11 | Constant | cfg.rb:141:1:141:1 | M |  |
+| cfg.rb:141:1:141:1 | M | cfg.rb:141:1:141:8 | call to itself |  |
+| cfg.rb:141:1:141:8 | call to itself | cfg.rb:141:1:141:18 | Constant |  |
+| cfg.rb:141:1:141:18 | Constant | cfg.rb:143:10:143:14 | Silly |  |
+| cfg.rb:143:1:149:3 | class << ... | cfg.rb:151:1:151:5 | silly |  |
+| cfg.rb:143:10:143:14 | Silly | cfg.rb:143:10:143:21 | call to itself |  |
+| cfg.rb:143:10:143:21 | call to itself | cfg.rb:144:3:144:19 | setter= |  |
+| cfg.rb:144:3:144:19 | setter= | cfg.rb:145:3:148:5 | print |  |
+| cfg.rb:145:3:148:5 | enter print | cfg.rb:146:5:146:20 | self |  |
+| cfg.rb:145:3:148:5 | exit print (normal) | cfg.rb:145:3:148:5 | exit print |  |
+| cfg.rb:145:3:148:5 | print | cfg.rb:143:1:149:3 | class << ... |  |
+| cfg.rb:146:5:146:20 | call to puts | cfg.rb:147:5:147:22 | self |  |
+| cfg.rb:146:5:146:20 | self | cfg.rb:146:11:146:19 | singleton |  |
+| cfg.rb:146:10:146:20 | "singleton" | cfg.rb:146:5:146:20 | call to puts |  |
+| cfg.rb:146:11:146:19 | singleton | cfg.rb:146:10:146:20 | "singleton" |  |
+| cfg.rb:147:5:147:22 | call to puts | cfg.rb:145:3:148:5 | exit print (normal) |  |
+| cfg.rb:147:5:147:22 | self | cfg.rb:147:10:147:14 | super call to print |  |
+| cfg.rb:147:10:147:14 | super call to print | cfg.rb:147:10:147:22 | call to print |  |
+| cfg.rb:147:10:147:22 | call to print | cfg.rb:147:5:147:22 | call to puts |  |
+| cfg.rb:151:1:151:5 | silly | cfg.rb:151:9:151:13 | Silly |  |
+| cfg.rb:151:1:151:17 | ... = ... | cfg.rb:152:5:152:9 | silly |  |
+| cfg.rb:151:9:151:13 | Silly | cfg.rb:151:9:151:17 | call to new |  |
+| cfg.rb:151:9:151:17 | call to new | cfg.rb:151:1:151:17 | ... = ... |  |
+| cfg.rb:152:1:154:3 | enter method | cfg.rb:152:19:152:19 | x |  |
+| cfg.rb:152:1:154:3 | exit method (normal) | cfg.rb:152:1:154:3 | exit method |  |
+| cfg.rb:152:1:154:3 | method | cfg.rb:156:1:156:28 | two_parameters |  |
+| cfg.rb:152:5:152:9 | silly | cfg.rb:152:1:154:3 | method |  |
+| cfg.rb:152:19:152:19 | x | cfg.rb:153:3:153:8 | self |  |
+| cfg.rb:153:3:153:8 | call to puts | cfg.rb:152:1:154:3 | exit method (normal) |  |
+| cfg.rb:153:3:153:8 | self | cfg.rb:153:8:153:8 | x |  |
+| cfg.rb:153:8:153:8 | x | cfg.rb:153:3:153:8 | call to puts |  |
+| cfg.rb:156:1:156:28 | enter two_parameters | cfg.rb:156:21:156:21 | a |  |
+| cfg.rb:156:1:156:28 | exit two_parameters (normal) | cfg.rb:156:1:156:28 | exit two_parameters |  |
+| cfg.rb:156:1:156:28 | two_parameters | cfg.rb:158:1:158:22 | self |  |
+| cfg.rb:156:21:156:21 | a | cfg.rb:156:23:156:23 | b |  |
+| cfg.rb:156:23:156:23 | b | cfg.rb:156:1:156:28 | exit two_parameters (normal) |  |
+| cfg.rb:158:1:158:22 | call to two_parameters | cfg.rb:160:1:160:10 | scriptfile |  |
+| cfg.rb:158:1:158:22 | self | cfg.rb:158:17:158:21 | Array |  |
+| cfg.rb:158:16:158:21 | * ... | cfg.rb:158:1:158:22 | call to two_parameters |  |
+| cfg.rb:158:17:158:21 | Array | cfg.rb:158:18:158:18 | 1 |  |
+| cfg.rb:158:17:158:21 | call to [] | cfg.rb:158:16:158:21 | * ... |  |
+| cfg.rb:158:18:158:18 | 1 | cfg.rb:158:20:158:20 | 2 |  |
+| cfg.rb:158:20:158:20 | 2 | cfg.rb:158:17:158:21 | call to [] |  |
+| cfg.rb:160:1:160:10 | scriptfile | cfg.rb:160:15:160:19 | cat " |  |
+| cfg.rb:160:1:160:32 | ... = ... | cfg.rb:162:1:162:6 | symbol |  |
+| cfg.rb:160:14:160:32 | `cat "#{...}"` | cfg.rb:160:1:160:32 | ... = ... |  |
+| cfg.rb:160:15:160:19 | cat " | cfg.rb:160:22:160:29 | self |  |
+| cfg.rb:160:20:160:30 | #{...} | cfg.rb:160:31:160:31 | " |  |
+| cfg.rb:160:22:160:29 | call to __FILE__ | cfg.rb:160:20:160:30 | #{...} |  |
+| cfg.rb:160:22:160:29 | self | cfg.rb:160:22:160:29 | call to __FILE__ |  |
+| cfg.rb:160:31:160:31 | " | cfg.rb:160:14:160:32 | `cat "#{...}"` |  |
+| cfg.rb:162:1:162:6 | symbol | cfg.rb:162:10:162:15 | hello |  |
+| cfg.rb:162:1:162:15 | ... = ... | cfg.rb:164:1:164:16 | delimited_symbol |  |
+| cfg.rb:162:10:162:15 | :hello | cfg.rb:162:1:162:15 | ... = ... |  |
+| cfg.rb:162:10:162:15 | hello | cfg.rb:162:10:162:15 | :hello |  |
+| cfg.rb:164:1:164:16 | delimited_symbol | cfg.rb:164:22:164:29 | goodbye- |  |
+| cfg.rb:164:1:164:42 | ... = ... | cfg.rb:166:1:166:1 | x |  |
+| cfg.rb:164:20:164:42 | :"goodbye-#{...}" | cfg.rb:164:1:164:42 | ... = ... |  |
+| cfg.rb:164:22:164:29 | goodbye- | cfg.rb:164:33:164:34 | 12 |  |
+| cfg.rb:164:30:164:41 | #{...} | cfg.rb:164:20:164:42 | :"goodbye-#{...}" |  |
+| cfg.rb:164:33:164:34 | 12 | cfg.rb:164:38:164:39 | 13 |  |
+| cfg.rb:164:33:164:39 | ... + ... | cfg.rb:164:30:164:41 | #{...} |  |
+| cfg.rb:164:38:164:39 | 13 | cfg.rb:164:33:164:39 | ... + ... |  |
+| cfg.rb:166:1:166:1 | x | cfg.rb:166:5:166:8 | true |  |
+| cfg.rb:166:1:166:8 | ... = ... | cfg.rb:167:1:167:1 | x |  |
+| cfg.rb:166:5:166:8 | true | cfg.rb:166:1:166:8 | ... = ... |  |
+| cfg.rb:167:1:167:1 | x | cfg.rb:167:7:167:10 | true |  |
+| cfg.rb:167:1:167:10 | ... = ... | cfg.rb:168:1:168:1 | x |  |
+| cfg.rb:167:5:167:10 | ! ... | cfg.rb:167:1:167:10 | ... = ... |  |
+| cfg.rb:167:7:167:10 | true | cfg.rb:167:5:167:10 | ! ... |  |
+| cfg.rb:168:1:168:1 | x | cfg.rb:168:7:168:8 | 42 |  |
+| cfg.rb:168:1:168:8 | ... = ... | cfg.rb:170:1:170:20 | undef ... |  |
+| cfg.rb:168:5:168:8 | - ... | cfg.rb:168:1:168:8 | ... = ... |  |
+| cfg.rb:168:7:168:8 | 42 | cfg.rb:168:5:168:8 | - ... |  |
+| cfg.rb:170:1:170:20 | undef ... | cfg.rb:170:7:170:20 | two_parameters |  |
+| cfg.rb:170:7:170:20 | two_parameters | cfg.rb:172:8:172:8 | x |  |
+| cfg.rb:172:1:172:49 | unless ... | cfg.rb:174:18:174:18 | x |  |
+| cfg.rb:172:8:172:8 | x | cfg.rb:172:13:172:14 | 10 |  |
+| cfg.rb:172:8:172:14 | ... == ... | cfg.rb:172:21:172:29 | self | false |
+| cfg.rb:172:8:172:14 | ... == ... | cfg.rb:172:36:172:45 | self | true |
+| cfg.rb:172:13:172:14 | 10 | cfg.rb:172:8:172:14 | ... == ... |  |
+| cfg.rb:172:16:172:29 | then ... | cfg.rb:172:1:172:49 | unless ... |  |
+| cfg.rb:172:21:172:29 | call to puts | cfg.rb:172:16:172:29 | then ... |  |
+| cfg.rb:172:21:172:29 | self | cfg.rb:172:27:172:28 | hi |  |
+| cfg.rb:172:26:172:29 | "hi" | cfg.rb:172:21:172:29 | call to puts |  |
+| cfg.rb:172:27:172:28 | hi | cfg.rb:172:26:172:29 | "hi" |  |
+| cfg.rb:172:31:172:45 | else ... | cfg.rb:172:1:172:49 | unless ... |  |
+| cfg.rb:172:36:172:45 | call to puts | cfg.rb:172:31:172:45 | else ... |  |
+| cfg.rb:172:36:172:45 | self | cfg.rb:172:42:172:44 | bye |  |
+| cfg.rb:172:41:172:45 | "bye" | cfg.rb:172:36:172:45 | call to puts |  |
+| cfg.rb:172:42:172:44 | bye | cfg.rb:172:41:172:45 | "bye" |  |
+| cfg.rb:174:1:174:9 | call to puts | cfg.rb:174:1:174:23 | ... unless ... |  |
+| cfg.rb:174:1:174:9 | self | cfg.rb:174:7:174:8 | hi |  |
+| cfg.rb:174:1:174:23 | ... unless ... | cfg.rb:176:7:176:7 | x |  |
+| cfg.rb:174:6:174:9 | "hi" | cfg.rb:174:1:174:9 | call to puts |  |
+| cfg.rb:174:7:174:8 | hi | cfg.rb:174:6:174:9 | "hi" |  |
+| cfg.rb:174:18:174:18 | x | cfg.rb:174:23:174:23 | 0 |  |
+| cfg.rb:174:18:174:23 | ... == ... | cfg.rb:174:1:174:9 | self | false |
+| cfg.rb:174:18:174:23 | ... == ... | cfg.rb:174:1:174:23 | ... unless ... | true |
+| cfg.rb:174:23:174:23 | 0 | cfg.rb:174:18:174:23 | ... == ... |  |
+| cfg.rb:176:1:176:41 | until ... | cfg.rb:178:1:178:1 | i |  |
+| cfg.rb:176:7:176:7 | x | cfg.rb:176:11:176:12 | 10 |  |
+| cfg.rb:176:7:176:12 | ... > ... | cfg.rb:176:1:176:41 | until ... | true |
+| cfg.rb:176:7:176:12 | ... > ... | cfg.rb:176:17:176:17 | x | false |
+| cfg.rb:176:11:176:12 | 10 | cfg.rb:176:7:176:12 | ... > ... |  |
+| cfg.rb:176:14:176:41 | do ... | cfg.rb:176:7:176:7 | x |  |
+| cfg.rb:176:17:176:17 | x | cfg.rb:176:17:176:17 | x |  |
+| cfg.rb:176:17:176:17 | x | cfg.rb:176:22:176:23 | 10 |  |
+| cfg.rb:176:17:176:23 | ... = ... | cfg.rb:176:26:176:37 | self |  |
+| cfg.rb:176:19:176:20 | ... + ... | cfg.rb:176:17:176:23 | ... = ... |  |
+| cfg.rb:176:22:176:23 | 10 | cfg.rb:176:19:176:20 | ... + ... |  |
+| cfg.rb:176:26:176:37 | call to puts | cfg.rb:176:14:176:41 | do ... |  |
+| cfg.rb:176:26:176:37 | self | cfg.rb:176:32:176:36 | hello |  |
+| cfg.rb:176:31:176:37 | "hello" | cfg.rb:176:26:176:37 | call to puts |  |
+| cfg.rb:176:32:176:36 | hello | cfg.rb:176:31:176:37 | "hello" |  |
+| cfg.rb:178:1:178:1 | i | cfg.rb:178:5:178:5 | 0 |  |
+| cfg.rb:178:1:178:5 | ... = ... | cfg.rb:179:30:179:30 | i |  |
+| cfg.rb:178:5:178:5 | 0 | cfg.rb:178:1:178:5 | ... = ... |  |
+| cfg.rb:179:1:179:22 | ( ... ) | cfg.rb:179:30:179:30 | i |  |
+| cfg.rb:179:1:179:36 | ... until ... | cfg.rb:181:1:181:1 | x |  |
+| cfg.rb:179:2:179:13 | call to puts | cfg.rb:179:16:179:16 | i |  |
+| cfg.rb:179:2:179:13 | self | cfg.rb:179:8:179:12 | hello |  |
+| cfg.rb:179:7:179:13 | "hello" | cfg.rb:179:2:179:13 | call to puts |  |
+| cfg.rb:179:8:179:12 | hello | cfg.rb:179:7:179:13 | "hello" |  |
+| cfg.rb:179:16:179:16 | i | cfg.rb:179:16:179:16 | i |  |
+| cfg.rb:179:16:179:16 | i | cfg.rb:179:21:179:21 | 1 |  |
+| cfg.rb:179:16:179:21 | ... = ... | cfg.rb:179:1:179:22 | ( ... ) |  |
+| cfg.rb:179:18:179:19 | ... + ... | cfg.rb:179:16:179:21 | ... = ... |  |
+| cfg.rb:179:21:179:21 | 1 | cfg.rb:179:18:179:19 | ... + ... |  |
+| cfg.rb:179:30:179:30 | i | cfg.rb:179:35:179:36 | 10 |  |
+| cfg.rb:179:30:179:36 | ... == ... | cfg.rb:179:1:179:36 | ... until ... | true |
+| cfg.rb:179:30:179:36 | ... == ... | cfg.rb:179:2:179:13 | self | false |
+| cfg.rb:179:35:179:36 | 10 | cfg.rb:179:30:179:36 | ... == ... |  |
+| cfg.rb:181:1:181:1 | x | cfg.rb:181:5:181:5 | 0 |  |
+| cfg.rb:181:1:181:5 | ... = ... | cfg.rb:182:7:182:7 | x |  |
+| cfg.rb:181:5:181:5 | 0 | cfg.rb:181:1:181:5 | ... = ... |  |
+| cfg.rb:182:1:186:3 | while ... | cfg.rb:188:30:188:30 | i |  |
+| cfg.rb:182:7:182:7 | x | cfg.rb:182:11:182:12 | 10 |  |
+| cfg.rb:182:7:182:12 | ... < ... | cfg.rb:182:1:186:3 | while ... | false |
+| cfg.rb:182:7:182:12 | ... < ... | cfg.rb:183:3:183:3 | x | true |
+| cfg.rb:182:11:182:12 | 10 | cfg.rb:182:7:182:12 | ... < ... |  |
+| cfg.rb:182:14:186:3 | do ... | cfg.rb:182:7:182:7 | x |  |
+| cfg.rb:183:3:183:3 | x | cfg.rb:183:3:183:3 | x |  |
+| cfg.rb:183:3:183:3 | x | cfg.rb:183:8:183:8 | 1 |  |
+| cfg.rb:183:3:183:8 | ... = ... | cfg.rb:184:6:184:6 | x |  |
+| cfg.rb:183:5:183:6 | ... + ... | cfg.rb:183:3:183:8 | ... = ... |  |
+| cfg.rb:183:8:183:8 | 1 | cfg.rb:183:5:183:6 | ... + ... |  |
+| cfg.rb:184:3:184:25 | if ... | cfg.rb:185:3:185:8 | self |  |
+| cfg.rb:184:6:184:6 | x | cfg.rb:184:11:184:11 | 5 |  |
+| cfg.rb:184:6:184:11 | ... == ... | cfg.rb:184:3:184:25 | if ... | false |
+| cfg.rb:184:6:184:11 | ... == ... | cfg.rb:184:18:184:21 | redo | true |
+| cfg.rb:184:11:184:11 | 5 | cfg.rb:184:6:184:11 | ... == ... |  |
+| cfg.rb:184:18:184:21 | redo | cfg.rb:183:3:183:3 | x | redo |
+| cfg.rb:185:3:185:8 | call to puts | cfg.rb:182:14:186:3 | do ... |  |
+| cfg.rb:185:3:185:8 | self | cfg.rb:185:8:185:8 | x |  |
+| cfg.rb:185:8:185:8 | x | cfg.rb:185:3:185:8 | call to puts |  |
+| cfg.rb:188:1:188:22 | ( ... ) | cfg.rb:188:30:188:30 | i |  |
+| cfg.rb:188:1:188:35 | ... while ... | cfg.rb:190:1:192:3 | run_block |  |
+| cfg.rb:188:2:188:13 | call to puts | cfg.rb:188:16:188:16 | i |  |
+| cfg.rb:188:2:188:13 | self | cfg.rb:188:8:188:12 | hello |  |
+| cfg.rb:188:7:188:13 | "hello" | cfg.rb:188:2:188:13 | call to puts |  |
+| cfg.rb:188:8:188:12 | hello | cfg.rb:188:7:188:13 | "hello" |  |
+| cfg.rb:188:16:188:16 | i | cfg.rb:188:16:188:16 | i |  |
+| cfg.rb:188:16:188:16 | i | cfg.rb:188:21:188:21 | 1 |  |
+| cfg.rb:188:16:188:21 | ... = ... | cfg.rb:188:1:188:22 | ( ... ) |  |
+| cfg.rb:188:18:188:19 | ... - ... | cfg.rb:188:16:188:21 | ... = ... |  |
+| cfg.rb:188:21:188:21 | 1 | cfg.rb:188:18:188:19 | ... - ... |  |
+| cfg.rb:188:30:188:30 | i | cfg.rb:188:35:188:35 | 0 |  |
+| cfg.rb:188:30:188:35 | ... != ... | cfg.rb:188:1:188:35 | ... while ... | false |
+| cfg.rb:188:30:188:35 | ... != ... | cfg.rb:188:2:188:13 | self | true |
+| cfg.rb:188:35:188:35 | 0 | cfg.rb:188:30:188:35 | ... != ... |  |
+| cfg.rb:190:1:192:3 | enter run_block | cfg.rb:191:9:191:10 | 42 |  |
+| cfg.rb:190:1:192:3 | exit run_block (normal) | cfg.rb:190:1:192:3 | exit run_block |  |
+| cfg.rb:190:1:192:3 | run_block | cfg.rb:194:1:194:23 | self |  |
+| cfg.rb:191:3:191:10 | yield ... | cfg.rb:190:1:192:3 | exit run_block (normal) |  |
+| cfg.rb:191:9:191:10 | 42 | cfg.rb:191:3:191:10 | yield ... |  |
+| cfg.rb:194:1:194:23 | call to run_block | cfg.rb:196:1:198:3 | forward_param |  |
+| cfg.rb:194:1:194:23 | self | cfg.rb:194:11:194:23 | { ... } |  |
+| cfg.rb:194:11:194:23 | enter { ... } | cfg.rb:194:14:194:14 | x |  |
+| cfg.rb:194:11:194:23 | exit { ... } (normal) | cfg.rb:194:11:194:23 | exit { ... } |  |
+| cfg.rb:194:11:194:23 | { ... } | cfg.rb:194:1:194:23 | call to run_block |  |
+| cfg.rb:194:14:194:14 | x | cfg.rb:194:16:194:21 | self |  |
+| cfg.rb:194:16:194:21 | call to puts | cfg.rb:194:11:194:23 | exit { ... } (normal) |  |
+| cfg.rb:194:16:194:21 | self | cfg.rb:194:21:194:21 | x |  |
+| cfg.rb:194:21:194:21 | x | cfg.rb:194:16:194:21 | call to puts |  |
+| cfg.rb:196:1:198:3 | enter forward_param | cfg.rb:196:19:196:19 | a |  |
+| cfg.rb:196:1:198:3 | exit forward_param (normal) | cfg.rb:196:1:198:3 | exit forward_param |  |
+| cfg.rb:196:1:198:3 | forward_param | cfg.rb:200:1:200:1 | 1 |  |
+| cfg.rb:196:19:196:19 | a | cfg.rb:196:22:196:22 | b |  |
+| cfg.rb:196:22:196:22 | b | cfg.rb:196:25:196:27 | ... |  |
+| cfg.rb:196:25:196:27 | ... | cfg.rb:197:3:197:13 | self |  |
+| cfg.rb:197:3:197:13 | call to bar | cfg.rb:196:1:198:3 | exit forward_param (normal) |  |
+| cfg.rb:197:3:197:13 | self | cfg.rb:197:7:197:7 | b |  |
+| cfg.rb:197:7:197:7 | b | cfg.rb:197:10:197:12 | ... |  |
+| cfg.rb:197:10:197:12 | ... | cfg.rb:197:3:197:13 | call to bar |  |
+| cfg.rb:200:1:200:1 | 1 | cfg.rb:200:9:200:32 | { ... } |  |
+| cfg.rb:200:1:200:32 | call to times | cfg.rb:202:1:202:1 | 2 |  |
+| cfg.rb:200:9:200:32 | enter { ... } | cfg.rb:200:12:200:12 | a |  |
+| cfg.rb:200:9:200:32 | exit { ... } (normal) | cfg.rb:200:9:200:32 | exit { ... } |  |
+| cfg.rb:200:9:200:32 | { ... } | cfg.rb:200:1:200:32 | call to times |  |
+| cfg.rb:200:12:200:12 | a | cfg.rb:200:15:200:15 | b |  |
+| cfg.rb:200:15:200:15 | b | cfg.rb:200:18:200:23 | Kernel |  |
+| cfg.rb:200:18:200:23 | Kernel | cfg.rb:200:30:200:30 | a |  |
+| cfg.rb:200:18:200:30 | call to puts | cfg.rb:200:9:200:32 | exit { ... } (normal) |  |
+| cfg.rb:200:30:200:30 | a | cfg.rb:200:18:200:30 | call to puts |  |
+| cfg.rb:202:1:202:1 | 2 | cfg.rb:202:9:202:35 | do ... end |  |
+| cfg.rb:202:1:202:35 | call to times | cfg.rb:205:1:205:3 | __synth__0__1 |  |
+| cfg.rb:202:9:202:35 | do ... end | cfg.rb:202:1:202:35 | call to times |  |
+| cfg.rb:202:9:202:35 | enter do ... end | cfg.rb:202:13:202:13 | c |  |
+| cfg.rb:202:9:202:35 | exit do ... end (normal) | cfg.rb:202:9:202:35 | exit do ... end |  |
+| cfg.rb:202:13:202:13 | c | cfg.rb:202:16:202:16 | d |  |
+| cfg.rb:202:16:202:16 | d | cfg.rb:202:19:202:24 | Kernel |  |
+| cfg.rb:202:19:202:24 | Kernel | cfg.rb:202:31:202:31 | c |  |
+| cfg.rb:202:19:202:31 | call to puts | cfg.rb:202:9:202:35 | exit do ... end (normal) |  |
+| cfg.rb:202:31:202:31 | c | cfg.rb:202:19:202:31 | call to puts |  |
+| cfg.rb:205:1:205:3 | ... = ... | cfg.rb:205:4:205:5 | nil |  |
+| cfg.rb:205:1:205:3 | __synth__0__1 | cfg.rb:205:1:205:3 | self |  |
+| cfg.rb:205:1:205:3 | __synth__0__1 | cfg.rb:205:4:205:5 | call to == |  |
+| cfg.rb:205:1:205:3 | __synth__0__1 | cfg.rb:205:10:205:10 | 1 |  |
+| cfg.rb:205:1:205:3 | call to foo | cfg.rb:205:1:205:3 | ... = ... |  |
+| cfg.rb:205:1:205:3 | nil | cfg.rb:205:4:205:5 | if ... |  |
+| cfg.rb:205:1:205:3 | self | cfg.rb:205:1:205:3 | call to foo |  |
+| cfg.rb:205:1:205:23 | ... | cfg.rb:207:1:211:3 | filter_nil |  |
+| cfg.rb:205:1:205:23 | call to bar | cfg.rb:205:4:205:5 | if ... |  |
+| cfg.rb:205:4:205:5 | call to == | cfg.rb:205:1:205:3 | __synth__0__1 | false |
+| cfg.rb:205:4:205:5 | call to == | cfg.rb:205:1:205:3 | nil | true |
+| cfg.rb:205:4:205:5 | if ... | cfg.rb:205:1:205:23 | ... |  |
+| cfg.rb:205:4:205:5 | nil | cfg.rb:205:1:205:3 | __synth__0__1 |  |
+| cfg.rb:205:10:205:10 | 1 | cfg.rb:205:12:205:12 | 2 |  |
+| cfg.rb:205:12:205:12 | 2 | cfg.rb:205:15:205:23 | { ... } |  |
+| cfg.rb:205:15:205:23 | enter { ... } | cfg.rb:205:18:205:18 | x |  |
+| cfg.rb:205:15:205:23 | exit { ... } (normal) | cfg.rb:205:15:205:23 | exit { ... } |  |
+| cfg.rb:205:15:205:23 | { ... } | cfg.rb:205:1:205:23 | call to bar |  |
+| cfg.rb:205:18:205:18 | x | cfg.rb:205:21:205:21 | x |  |
+| cfg.rb:205:21:205:21 | x | cfg.rb:205:15:205:23 | exit { ... } (normal) |  |
+| cfg.rb:207:1:211:3 | enter filter_nil | cfg.rb:207:16:207:19 | list |  |
+| cfg.rb:207:1:211:3 | exit filter_nil (normal) | cfg.rb:207:1:211:3 | exit filter_nil |  |
+| cfg.rb:207:1:211:3 | filter_nil | cfg.rb:213:1:216:3 | self |  |
+| cfg.rb:207:16:207:19 | list | cfg.rb:208:3:208:6 | list |  |
+| cfg.rb:208:3:208:6 | list | cfg.rb:208:15:210:5 | do ... end |  |
+| cfg.rb:208:3:210:5 | call to reject | cfg.rb:207:1:211:3 | exit filter_nil (normal) |  |
+| cfg.rb:208:15:210:5 | do ... end | cfg.rb:208:3:210:5 | call to reject |  |
+| cfg.rb:208:15:210:5 | enter do ... end | cfg.rb:208:19:208:22 | elem |  |
+| cfg.rb:208:15:210:5 | exit do ... end (normal) | cfg.rb:208:15:210:5 | exit do ... end |  |
+| cfg.rb:208:19:208:22 | elem | cfg.rb:208:25:208:25 | __synth__0 |  |
+| cfg.rb:208:25:208:25 | __synth__0 | cfg.rb:208:28:208:29 | __synth__0 |  |
+| cfg.rb:208:28:208:29 | __synth__0 | cfg.rb:209:5:209:8 | elem |  |
+| cfg.rb:209:5:209:8 | elem | cfg.rb:209:5:209:13 | call to nil? |  |
+| cfg.rb:209:5:209:13 | call to nil? | cfg.rb:208:15:210:5 | exit do ... end (normal) |  |
+| cfg.rb:213:1:216:3 | call to do_something | cfg.rb:1:1:221:1 | exit cfg.rb (normal) |  |
+| cfg.rb:213:1:216:3 | self | cfg.rb:213:14:216:3 | do ... end |  |
+| cfg.rb:213:14:216:3 | do ... end | cfg.rb:213:1:216:3 | call to do_something |  |
+| cfg.rb:213:14:216:3 | enter do ... end | cfg.rb:214:3:214:6 | self |  |
+| cfg.rb:213:14:216:3 | exit do ... end (normal) | cfg.rb:213:14:216:3 | exit do ... end |  |
+| cfg.rb:214:3:214:6 | self | cfg.rb:214:3:214:16 | call to something |  |
+| cfg.rb:214:3:214:16 | call to something | cfg.rb:215:3:215:16 | self |  |
+| cfg.rb:215:3:215:16 | call to something_else | cfg.rb:213:14:216:3 | exit do ... end (normal) |  |
+| cfg.rb:215:3:215:16 | self | cfg.rb:215:3:215:16 | call to something_else |  |
+| constant_compound_assign.rb:1:1:9:3 | Foo | constant_compound_assign.rb:2:5:3:7 | foo_before |  |
+| constant_compound_assign.rb:1:1:22:4 | enter constant_compound_assign.rb | constant_compound_assign.rb:1:1:9:3 | Foo |  |
+| constant_compound_assign.rb:1:1:22:4 | exit constant_compound_assign.rb (normal) | constant_compound_assign.rb:1:1:22:4 | exit constant_compound_assign.rb |  |
+| constant_compound_assign.rb:2:5:3:7 | foo_before | constant_compound_assign.rb:5:5:5:16 | FOO_CONSTANT |  |
+| constant_compound_assign.rb:5:5:5:16 | FOO_CONSTANT | constant_compound_assign.rb:5:5:5:16 | FOO_CONSTANT |  |
+| constant_compound_assign.rb:5:5:5:16 | FOO_CONSTANT | constant_compound_assign.rb:5:18:5:20 | ... \|\| ... | true |
+| constant_compound_assign.rb:5:5:5:16 | FOO_CONSTANT | constant_compound_assign.rb:5:22:5:24 | 123 | false |
+| constant_compound_assign.rb:5:5:5:24 | ... = ... | constant_compound_assign.rb:7:5:8:7 | foo_after |  |
+| constant_compound_assign.rb:5:18:5:20 | ... \|\| ... | constant_compound_assign.rb:5:5:5:24 | ... = ... |  |
+| constant_compound_assign.rb:5:22:5:24 | 123 | constant_compound_assign.rb:5:18:5:20 | ... \|\| ... |  |
+| constant_compound_assign.rb:7:5:8:7 | foo_after | constant_compound_assign.rb:11:1:12:3 | top_before |  |
+| constant_compound_assign.rb:11:1:12:3 | top_before | constant_compound_assign.rb:14:1:14:12 | TOP_CONSTANT |  |
+| constant_compound_assign.rb:14:1:14:12 | TOP_CONSTANT | constant_compound_assign.rb:14:1:14:12 | TOP_CONSTANT |  |
+| constant_compound_assign.rb:14:1:14:12 | TOP_CONSTANT | constant_compound_assign.rb:14:14:14:16 | ... \|\| ... | true |
+| constant_compound_assign.rb:14:1:14:12 | TOP_CONSTANT | constant_compound_assign.rb:14:18:14:20 | 123 | false |
+| constant_compound_assign.rb:14:1:14:20 | ... = ... | constant_compound_assign.rb:16:1:17:3 | top_after |  |
+| constant_compound_assign.rb:14:14:14:16 | ... \|\| ... | constant_compound_assign.rb:14:1:14:20 | ... = ... |  |
+| constant_compound_assign.rb:14:18:14:20 | 123 | constant_compound_assign.rb:14:14:14:16 | ... \|\| ... |  |
+| constant_compound_assign.rb:16:1:17:3 | top_after | constant_compound_assign.rb:19:1:19:15 | TOP_CONSTANT2 |  |
+| constant_compound_assign.rb:19:1:19:15 | TOP_CONSTANT2 | constant_compound_assign.rb:19:1:19:15 | TOP_CONSTANT2 |  |
+| constant_compound_assign.rb:19:1:19:15 | TOP_CONSTANT2 | constant_compound_assign.rb:19:17:19:19 | ... \|\| ... | true |
+| constant_compound_assign.rb:19:1:19:15 | TOP_CONSTANT2 | constant_compound_assign.rb:19:21:19:23 | 123 | false |
+| constant_compound_assign.rb:19:1:19:23 | ... = ... | constant_compound_assign.rb:21:1:22:3 | top_after2 |  |
+| constant_compound_assign.rb:19:17:19:19 | ... \|\| ... | constant_compound_assign.rb:19:1:19:23 | ... = ... |  |
+| constant_compound_assign.rb:19:21:19:23 | 123 | constant_compound_assign.rb:19:17:19:19 | ... \|\| ... |  |
+| constant_compound_assign.rb:21:1:22:3 | top_after2 | constant_compound_assign.rb:1:1:22:4 | exit constant_compound_assign.rb (normal) |  |
+| desugar.rb:1:1:3:3 | enter m1 | desugar.rb:1:8:1:8 | x |  |
+| desugar.rb:1:1:3:3 | exit m1 (normal) | desugar.rb:1:1:3:3 | exit m1 |  |
+| desugar.rb:1:1:3:3 | m1 | desugar.rb:5:1:7:3 | m2 |  |
+| desugar.rb:1:1:38:17 | enter desugar.rb | desugar.rb:1:1:3:3 | m1 |  |
+| desugar.rb:1:1:38:17 | exit desugar.rb (normal) | desugar.rb:1:1:38:17 | exit desugar.rb |  |
+| desugar.rb:1:8:1:8 | x | desugar.rb:2:3:2:3 | x |  |
+| desugar.rb:2:3:2:3 | x | desugar.rb:2:3:2:3 | x |  |
+| desugar.rb:2:3:2:3 | x | desugar.rb:2:8:2:8 | 1 |  |
+| desugar.rb:2:3:2:8 | ... = ... | desugar.rb:1:1:3:3 | exit m1 (normal) |  |
+| desugar.rb:2:5:2:6 | ... + ... | desugar.rb:2:3:2:8 | ... = ... |  |
+| desugar.rb:2:8:2:8 | 1 | desugar.rb:2:5:2:6 | ... + ... |  |
+| desugar.rb:5:1:7:3 | enter m2 | desugar.rb:5:8:5:8 | x |  |
+| desugar.rb:5:1:7:3 | exit m2 (normal) | desugar.rb:5:1:7:3 | exit m2 |  |
+| desugar.rb:5:1:7:3 | m2 | desugar.rb:9:1:11:3 | m3 |  |
+| desugar.rb:5:8:5:8 | x | desugar.rb:6:3:6:3 | x |  |
+| desugar.rb:6:3:6:3 | x | desugar.rb:6:3:6:7 | call to foo |  |
+| desugar.rb:6:3:6:7 | call to foo | desugar.rb:6:17:6:17 | __synth__0 |  |
+| desugar.rb:6:3:6:13 | __synth__0 | desugar.rb:6:3:6:17 | ... |  |
+| desugar.rb:6:3:6:13 | call to count= | desugar.rb:6:3:6:13 | __synth__0 |  |
+| desugar.rb:6:3:6:17 | ... | desugar.rb:5:1:7:3 | exit m2 (normal) |  |
+| desugar.rb:6:17:6:17 | 1 | desugar.rb:6:17:6:17 | ... = ... |  |
+| desugar.rb:6:17:6:17 | ... = ... | desugar.rb:6:3:6:13 | call to count= |  |
+| desugar.rb:6:17:6:17 | __synth__0 | desugar.rb:6:17:6:17 | 1 |  |
+| desugar.rb:9:1:11:3 | enter m3 | desugar.rb:9:8:9:8 | x |  |
+| desugar.rb:9:1:11:3 | exit m3 (normal) | desugar.rb:9:1:11:3 | exit m3 |  |
+| desugar.rb:9:1:11:3 | m3 | desugar.rb:13:1:15:3 | m4 |  |
+| desugar.rb:9:8:9:8 | x | desugar.rb:10:3:10:3 | x |  |
+| desugar.rb:10:3:10:3 | x | desugar.rb:10:3:10:7 | call to foo |  |
+| desugar.rb:10:3:10:7 | call to foo | desugar.rb:10:9:10:9 | 0 |  |
+| desugar.rb:10:3:10:10 | __synth__0 | desugar.rb:10:3:10:14 | ... |  |
+| desugar.rb:10:3:10:10 | call to []= | desugar.rb:10:3:10:10 | __synth__0 |  |
+| desugar.rb:10:3:10:14 | ... | desugar.rb:9:1:11:3 | exit m3 (normal) |  |
+| desugar.rb:10:9:10:9 | 0 | desugar.rb:10:14:10:14 | __synth__0 |  |
+| desugar.rb:10:14:10:14 | 1 | desugar.rb:10:14:10:14 | ... = ... |  |
+| desugar.rb:10:14:10:14 | ... = ... | desugar.rb:10:3:10:10 | call to []= |  |
+| desugar.rb:10:14:10:14 | __synth__0 | desugar.rb:10:14:10:14 | 1 |  |
+| desugar.rb:13:1:15:3 | enter m4 | desugar.rb:13:8:13:8 | x |  |
+| desugar.rb:13:1:15:3 | exit m4 (normal) | desugar.rb:13:1:15:3 | exit m4 |  |
+| desugar.rb:13:1:15:3 | m4 | desugar.rb:17:1:19:3 | m5 |  |
+| desugar.rb:13:8:13:8 | x | desugar.rb:14:3:14:7 | __synth__0 |  |
+| desugar.rb:14:3:14:3 | x | desugar.rb:14:3:14:7 | call to foo |  |
+| desugar.rb:14:3:14:7 | ... = ... | desugar.rb:14:15:14:16 | __synth__1 |  |
+| desugar.rb:14:3:14:7 | __synth__0 | desugar.rb:14:3:14:3 | x |  |
+| desugar.rb:14:3:14:7 | __synth__0 | desugar.rb:14:3:14:13 | __synth__1 |  |
+| desugar.rb:14:3:14:7 | __synth__0 | desugar.rb:14:3:14:13 | call to count |  |
+| desugar.rb:14:3:14:7 | call to foo | desugar.rb:14:3:14:7 | ... = ... |  |
+| desugar.rb:14:3:14:13 | __synth__1 | desugar.rb:14:3:14:13 | call to count= |  |
+| desugar.rb:14:3:14:13 | call to count | desugar.rb:14:18:14:18 | 1 |  |
+| desugar.rb:14:3:14:13 | call to count= | desugar.rb:14:15:14:16 | __synth__1 |  |
+| desugar.rb:14:3:14:18 | ... | desugar.rb:13:1:15:3 | exit m4 (normal) |  |
+| desugar.rb:14:15:14:16 | ... + ... | desugar.rb:14:15:14:16 | ... = ... |  |
+| desugar.rb:14:15:14:16 | ... = ... | desugar.rb:14:3:14:7 | __synth__0 |  |
+| desugar.rb:14:15:14:16 | __synth__1 | desugar.rb:14:3:14:7 | __synth__0 |  |
+| desugar.rb:14:15:14:16 | __synth__1 | desugar.rb:14:3:14:18 | ... |  |
+| desugar.rb:14:18:14:18 | 1 | desugar.rb:14:15:14:16 | ... + ... |  |
+| desugar.rb:17:1:19:3 | enter m5 | desugar.rb:17:8:17:8 | x |  |
+| desugar.rb:17:1:19:3 | exit m5 (normal) | desugar.rb:17:1:19:3 | exit m5 |  |
+| desugar.rb:17:1:19:3 | m5 | desugar.rb:21:1:23:3 | m6 |  |
+| desugar.rb:17:8:17:8 | x | desugar.rb:17:11:17:11 | y |  |
+| desugar.rb:17:11:17:11 | y | desugar.rb:18:3:18:7 | __synth__0 |  |
+| desugar.rb:18:3:18:3 | x | desugar.rb:18:3:18:7 | call to foo |  |
+| desugar.rb:18:3:18:7 | ... = ... | desugar.rb:18:9:18:9 | __synth__1 |  |
+| desugar.rb:18:3:18:7 | __synth__0 | desugar.rb:18:3:18:3 | x |  |
+| desugar.rb:18:3:18:7 | __synth__0 | desugar.rb:18:9:18:9 | __synth__1 |  |
+| desugar.rb:18:3:18:7 | __synth__0 | desugar.rb:18:9:18:9 | __synth__1 |  |
+| desugar.rb:18:3:18:7 | call to foo | desugar.rb:18:3:18:7 | ... = ... |  |
+| desugar.rb:18:3:18:28 | __synth__4 | desugar.rb:18:3:18:28 | call to []= |  |
+| desugar.rb:18:3:18:28 | call to [] | desugar.rb:18:33:18:33 | 1 |  |
+| desugar.rb:18:3:18:28 | call to []= | desugar.rb:18:30:18:31 | __synth__4 |  |
+| desugar.rb:18:3:18:33 | ... | desugar.rb:17:1:19:3 | exit m5 (normal) |  |
+| desugar.rb:18:9:18:9 | 0 | desugar.rb:18:9:18:9 | ... = ... |  |
+| desugar.rb:18:9:18:9 | ... = ... | desugar.rb:18:12:18:16 | __synth__2 |  |
+| desugar.rb:18:9:18:9 | __synth__1 | desugar.rb:18:9:18:9 | 0 |  |
+| desugar.rb:18:9:18:9 | __synth__1 | desugar.rb:18:12:18:16 | __synth__2 |  |
+| desugar.rb:18:9:18:9 | __synth__1 | desugar.rb:18:12:18:16 | __synth__2 |  |
+| desugar.rb:18:12:18:12 | y | desugar.rb:18:12:18:16 | call to bar |  |
+| desugar.rb:18:12:18:16 | ... = ... | desugar.rb:18:19:18:27 | __synth__3 |  |
+| desugar.rb:18:12:18:16 | __synth__2 | desugar.rb:18:12:18:12 | y |  |
+| desugar.rb:18:12:18:16 | __synth__2 | desugar.rb:18:19:18:27 | __synth__3 |  |
+| desugar.rb:18:12:18:16 | __synth__2 | desugar.rb:18:19:18:27 | __synth__3 |  |
+| desugar.rb:18:12:18:16 | call to bar | desugar.rb:18:12:18:16 | ... = ... |  |
+| desugar.rb:18:19:18:19 | x | desugar.rb:18:19:18:23 | call to baz |  |
+| desugar.rb:18:19:18:23 | call to baz | desugar.rb:18:27:18:27 | 3 |  |
+| desugar.rb:18:19:18:27 | ... + ... | desugar.rb:18:19:18:27 | ... = ... |  |
+| desugar.rb:18:19:18:27 | ... = ... | desugar.rb:18:30:18:31 | __synth__4 |  |
+| desugar.rb:18:19:18:27 | __synth__3 | desugar.rb:18:3:18:28 | __synth__4 |  |
+| desugar.rb:18:19:18:27 | __synth__3 | desugar.rb:18:3:18:28 | call to [] |  |
+| desugar.rb:18:19:18:27 | __synth__3 | desugar.rb:18:19:18:19 | x |  |
+| desugar.rb:18:27:18:27 | 3 | desugar.rb:18:19:18:27 | ... + ... |  |
+| desugar.rb:18:30:18:31 | ... + ... | desugar.rb:18:30:18:31 | ... = ... |  |
+| desugar.rb:18:30:18:31 | ... = ... | desugar.rb:18:3:18:7 | __synth__0 |  |
+| desugar.rb:18:30:18:31 | __synth__4 | desugar.rb:18:3:18:7 | __synth__0 |  |
+| desugar.rb:18:30:18:31 | __synth__4 | desugar.rb:18:3:18:33 | ... |  |
+| desugar.rb:18:33:18:33 | 1 | desugar.rb:18:30:18:31 | ... + ... |  |
+| desugar.rb:21:1:23:3 | enter m6 | desugar.rb:22:10:22:10 | __synth__2 |  |
+| desugar.rb:21:1:23:3 | exit m6 (normal) | desugar.rb:21:1:23:3 | exit m6 |  |
+| desugar.rb:21:1:23:3 | m6 | desugar.rb:25:1:27:3 | m7 |  |
+| desugar.rb:22:3:22:3 | 0 | desugar.rb:22:3:22:3 | call to [] |  |
+| desugar.rb:22:3:22:3 | ... = ... | desugar.rb:22:7:22:7 | y |  |
+| desugar.rb:22:3:22:3 | __synth__3 | desugar.rb:22:3:22:3 | 0 |  |
+| desugar.rb:22:3:22:3 | call to [] | desugar.rb:22:3:22:3 | ... = ... |  |
+| desugar.rb:22:3:22:3 | x | desugar.rb:22:3:22:3 | __synth__3 |  |
+| desugar.rb:22:3:22:29 | ... | desugar.rb:21:1:23:3 | exit m6 (normal) |  |
+| desugar.rb:22:7:22:7 | 1 | desugar.rb:22:7:22:7 | -2 |  |
+| desugar.rb:22:7:22:7 | -2 | desugar.rb:22:7:22:7 | _ .. _ |  |
+| desugar.rb:22:7:22:7 | ... = ... | desugar.rb:22:10:22:14 | __synth__2 |  |
+| desugar.rb:22:7:22:7 | _ .. _ | desugar.rb:22:7:22:7 | call to [] |  |
+| desugar.rb:22:7:22:7 | __synth__3 | desugar.rb:22:7:22:7 | 1 |  |
+| desugar.rb:22:7:22:7 | call to [] | desugar.rb:22:7:22:7 | ... = ... |  |
+| desugar.rb:22:7:22:7 | y | desugar.rb:22:7:22:7 | __synth__3 |  |
+| desugar.rb:22:10:22:10 | ... = ... | desugar.rb:22:18:22:29 | __synth__3 |  |
+| desugar.rb:22:10:22:10 | __synth__2 | desugar.rb:22:10:22:10 | self |  |
+| desugar.rb:22:10:22:10 | call to z | desugar.rb:22:10:22:10 | ... = ... |  |
+| desugar.rb:22:10:22:10 | self | desugar.rb:22:10:22:10 | call to z |  |
+| desugar.rb:22:10:22:14 | -1 | desugar.rb:22:10:22:14 | call to [] |  |
+| desugar.rb:22:10:22:14 | ... | desugar.rb:22:3:22:29 | ... |  |
+| desugar.rb:22:10:22:14 | ... = ... | desugar.rb:22:10:22:14 | call to bar= |  |
+| desugar.rb:22:10:22:14 | __synth__0__1 | desugar.rb:22:10:22:14 | ... |  |
+| desugar.rb:22:10:22:14 | __synth__0__1 | desugar.rb:22:10:22:14 | __synth__3 |  |
+| desugar.rb:22:10:22:14 | __synth__2 | desugar.rb:22:10:22:14 | __synth__0__1 |  |
+| desugar.rb:22:10:22:14 | __synth__3 | desugar.rb:22:10:22:14 | -1 |  |
+| desugar.rb:22:10:22:14 | call to [] | desugar.rb:22:10:22:14 | ... = ... |  |
+| desugar.rb:22:10:22:14 | call to bar= | desugar.rb:22:10:22:14 | __synth__0__1 |  |
+| desugar.rb:22:18:22:29 | * ... | desugar.rb:22:18:22:29 | ... = ... |  |
+| desugar.rb:22:18:22:29 | ... = ... | desugar.rb:22:3:22:3 | x |  |
+| desugar.rb:22:18:22:29 | Array | desugar.rb:22:19:22:19 | 1 |  |
+| desugar.rb:22:18:22:29 | __synth__3 | desugar.rb:22:18:22:29 | Array |  |
+| desugar.rb:22:18:22:29 | call to [] | desugar.rb:22:18:22:29 | * ... |  |
+| desugar.rb:22:19:22:19 | 1 | desugar.rb:22:22:22:22 | 2 |  |
+| desugar.rb:22:22:22:22 | 2 | desugar.rb:22:25:22:25 | 3 |  |
+| desugar.rb:22:25:22:25 | 3 | desugar.rb:22:28:22:28 | 4 |  |
+| desugar.rb:22:28:22:28 | 4 | desugar.rb:22:18:22:29 | call to [] |  |
+| desugar.rb:25:1:27:3 | enter m7 | desugar.rb:26:15:26:25 | __synth__2 |  |
+| desugar.rb:25:1:27:3 | exit m7 (normal) | desugar.rb:25:1:27:3 | exit m7 |  |
+| desugar.rb:25:1:27:3 | m7 | desugar.rb:29:1:35:3 | X |  |
+| desugar.rb:26:3:26:3 | 0 | desugar.rb:26:3:26:3 | call to [] |  |
+| desugar.rb:26:3:26:3 | ... = ... | desugar.rb:26:6:26:11 | __synth__2__1 |  |
+| desugar.rb:26:3:26:3 | __synth__2 | desugar.rb:26:3:26:3 | 0 |  |
+| desugar.rb:26:3:26:3 | call to [] | desugar.rb:26:3:26:3 | ... = ... |  |
+| desugar.rb:26:3:26:3 | x | desugar.rb:26:3:26:3 | __synth__2 |  |
+| desugar.rb:26:3:26:25 | ... | desugar.rb:25:1:27:3 | exit m7 (normal) |  |
+| desugar.rb:26:6:26:11 | 1 | desugar.rb:26:6:26:11 | call to [] |  |
+| desugar.rb:26:6:26:11 | * ... | desugar.rb:26:6:26:11 | ... = ... |  |
+| desugar.rb:26:6:26:11 | ... | desugar.rb:26:3:26:25 | ... |  |
+| desugar.rb:26:6:26:11 | ... = ... | desugar.rb:26:7:26:7 | y |  |
+| desugar.rb:26:6:26:11 | __synth__2 | desugar.rb:26:6:26:11 | 1 |  |
+| desugar.rb:26:6:26:11 | __synth__2__1 | desugar.rb:26:6:26:11 | __synth__2 |  |
+| desugar.rb:26:6:26:11 | call to [] | desugar.rb:26:6:26:11 | * ... |  |
+| desugar.rb:26:7:26:7 | 0 | desugar.rb:26:7:26:7 | call to [] |  |
+| desugar.rb:26:7:26:7 | ... = ... | desugar.rb:26:10:26:10 | z |  |
+| desugar.rb:26:7:26:7 | __synth__2__1 | desugar.rb:26:7:26:7 | 0 |  |
+| desugar.rb:26:7:26:7 | call to [] | desugar.rb:26:7:26:7 | ... = ... |  |
+| desugar.rb:26:7:26:7 | y | desugar.rb:26:7:26:7 | __synth__2__1 |  |
+| desugar.rb:26:10:26:10 | 1 | desugar.rb:26:10:26:10 | call to [] |  |
+| desugar.rb:26:10:26:10 | ... = ... | desugar.rb:26:6:26:11 | ... |  |
+| desugar.rb:26:10:26:10 | __synth__2__1 | desugar.rb:26:10:26:10 | 1 |  |
+| desugar.rb:26:10:26:10 | call to [] | desugar.rb:26:10:26:10 | ... = ... |  |
+| desugar.rb:26:10:26:10 | z | desugar.rb:26:10:26:10 | __synth__2__1 |  |
+| desugar.rb:26:15:26:25 | * ... | desugar.rb:26:15:26:25 | ... = ... |  |
+| desugar.rb:26:15:26:25 | ... = ... | desugar.rb:26:3:26:3 | x |  |
+| desugar.rb:26:15:26:25 | Array | desugar.rb:26:16:26:16 | 1 |  |
+| desugar.rb:26:15:26:25 | __synth__2 | desugar.rb:26:15:26:25 | Array |  |
+| desugar.rb:26:15:26:25 | call to [] | desugar.rb:26:15:26:25 | * ... |  |
+| desugar.rb:26:16:26:16 | 1 | desugar.rb:26:19:26:24 | Array |  |
+| desugar.rb:26:19:26:24 | Array | desugar.rb:26:20:26:20 | 2 |  |
+| desugar.rb:26:19:26:24 | call to [] | desugar.rb:26:15:26:25 | call to [] |  |
+| desugar.rb:26:20:26:20 | 2 | desugar.rb:26:23:26:23 | 3 |  |
+| desugar.rb:26:23:26:23 | 3 | desugar.rb:26:19:26:24 | call to [] |  |
+| desugar.rb:29:1:35:3 | X | desugar.rb:30:3:30:4 | self |  |
+| desugar.rb:30:3:30:4 | @x | desugar.rb:30:8:30:8 | 1 |  |
+| desugar.rb:30:3:30:4 | self | desugar.rb:30:3:30:4 | @x |  |
+| desugar.rb:30:3:30:8 | ... = ... | desugar.rb:31:3:31:4 | self |  |
+| desugar.rb:30:8:30:8 | 1 | desugar.rb:30:3:30:8 | ... = ... |  |
+| desugar.rb:31:3:31:4 | @x | desugar.rb:31:3:31:4 | self |  |
+| desugar.rb:31:3:31:4 | @x | desugar.rb:31:9:31:9 | 2 |  |
+| desugar.rb:31:3:31:4 | self | desugar.rb:31:3:31:4 | @x |  |
+| desugar.rb:31:3:31:4 | self | desugar.rb:31:3:31:4 | @x |  |
+| desugar.rb:31:3:31:9 | ... = ... | desugar.rb:33:3:33:5 | @@y |  |
+| desugar.rb:31:6:31:7 | ... + ... | desugar.rb:31:3:31:9 | ... = ... |  |
+| desugar.rb:31:9:31:9 | 2 | desugar.rb:31:6:31:7 | ... + ... |  |
+| desugar.rb:33:3:33:5 | @@y | desugar.rb:33:9:33:9 | 3 |  |
+| desugar.rb:33:3:33:9 | ... = ... | desugar.rb:34:3:34:5 | @@y |  |
+| desugar.rb:33:9:33:9 | 3 | desugar.rb:33:3:33:9 | ... = ... |  |
+| desugar.rb:34:3:34:5 | @@y | desugar.rb:34:3:34:5 | @@y |  |
+| desugar.rb:34:3:34:5 | @@y | desugar.rb:34:10:34:10 | 4 |  |
+| desugar.rb:34:3:34:10 | ... = ... | desugar.rb:37:1:37:11 | $global_var |  |
+| desugar.rb:34:7:34:8 | ... / ... | desugar.rb:34:3:34:10 | ... = ... |  |
+| desugar.rb:34:10:34:10 | 4 | desugar.rb:34:7:34:8 | ... / ... |  |
+| desugar.rb:37:1:37:11 | $global_var | desugar.rb:37:15:37:15 | 5 |  |
+| desugar.rb:37:1:37:15 | ... = ... | desugar.rb:38:1:38:11 | $global_var |  |
+| desugar.rb:37:15:37:15 | 5 | desugar.rb:37:1:37:15 | ... = ... |  |
+| desugar.rb:38:1:38:11 | $global_var | desugar.rb:38:1:38:11 | $global_var |  |
+| desugar.rb:38:1:38:11 | $global_var | desugar.rb:38:16:38:16 | 6 |  |
+| desugar.rb:38:1:38:16 | ... = ... | desugar.rb:1:1:38:17 | exit desugar.rb (normal) |  |
+| desugar.rb:38:13:38:14 | ... * ... | desugar.rb:38:1:38:16 | ... = ... |  |
+| desugar.rb:38:16:38:16 | 6 | desugar.rb:38:13:38:14 | ... * ... |  |
+| exit.rb:1:1:6:3 | enter m1 | exit.rb:1:8:1:8 | x |  |
+| exit.rb:1:1:6:3 | exit m1 (abnormal) | exit.rb:1:1:6:3 | exit m1 |  |
+| exit.rb:1:1:6:3 | exit m1 (normal) | exit.rb:1:1:6:3 | exit m1 |  |
+| exit.rb:1:1:6:3 | m1 | exit.rb:8:1:13:3 | m2 |  |
+| exit.rb:1:1:13:4 | enter exit.rb | exit.rb:1:1:6:3 | m1 |  |
+| exit.rb:1:1:13:4 | exit exit.rb (normal) | exit.rb:1:1:13:4 | exit exit.rb |  |
+| exit.rb:1:8:1:8 | x | exit.rb:2:6:2:6 | x |  |
+| exit.rb:2:3:4:5 | if ... | exit.rb:5:3:5:15 | self |  |
+| exit.rb:2:6:2:6 | x | exit.rb:2:10:2:10 | 2 |  |
+| exit.rb:2:6:2:10 | ... > ... | exit.rb:2:3:4:5 | if ... | false |
+| exit.rb:2:6:2:10 | ... > ... | exit.rb:3:5:3:10 | self | true |
+| exit.rb:2:10:2:10 | 2 | exit.rb:2:6:2:10 | ... > ... |  |
+| exit.rb:3:5:3:10 | call to exit | exit.rb:1:1:6:3 | exit m1 (abnormal) | exit |
+| exit.rb:3:5:3:10 | self | exit.rb:3:10:3:10 | 1 |  |
+| exit.rb:3:10:3:10 | 1 | exit.rb:3:5:3:10 | call to exit |  |
+| exit.rb:5:3:5:15 | call to puts | exit.rb:1:1:6:3 | exit m1 (normal) |  |
+| exit.rb:5:3:5:15 | self | exit.rb:5:9:5:14 | x <= 2 |  |
+| exit.rb:5:8:5:15 | "x <= 2" | exit.rb:5:3:5:15 | call to puts |  |
+| exit.rb:5:9:5:14 | x <= 2 | exit.rb:5:8:5:15 | "x <= 2" |  |
+| exit.rb:8:1:13:3 | enter m2 | exit.rb:8:8:8:8 | x |  |
+| exit.rb:8:1:13:3 | exit m2 (abnormal) | exit.rb:8:1:13:3 | exit m2 |  |
+| exit.rb:8:1:13:3 | exit m2 (normal) | exit.rb:8:1:13:3 | exit m2 |  |
+| exit.rb:8:1:13:3 | m2 | exit.rb:1:1:13:4 | exit exit.rb (normal) |  |
+| exit.rb:8:8:8:8 | x | exit.rb:9:6:9:6 | x |  |
+| exit.rb:9:3:11:5 | if ... | exit.rb:12:3:12:15 | self |  |
+| exit.rb:9:6:9:6 | x | exit.rb:9:10:9:10 | 2 |  |
+| exit.rb:9:6:9:10 | ... > ... | exit.rb:9:3:11:5 | if ... | false |
+| exit.rb:9:6:9:10 | ... > ... | exit.rb:10:5:10:18 | self | true |
+| exit.rb:9:10:9:10 | 2 | exit.rb:9:6:9:10 | ... > ... |  |
+| exit.rb:10:5:10:18 | call to abort | exit.rb:8:1:13:3 | exit m2 (abnormal) | exit |
+| exit.rb:10:5:10:18 | self | exit.rb:10:12:10:17 | abort! |  |
+| exit.rb:10:11:10:18 | "abort!" | exit.rb:10:5:10:18 | call to abort |  |
+| exit.rb:10:12:10:17 | abort! | exit.rb:10:11:10:18 | "abort!" |  |
+| exit.rb:12:3:12:15 | call to puts | exit.rb:8:1:13:3 | exit m2 (normal) |  |
+| exit.rb:12:3:12:15 | self | exit.rb:12:9:12:14 | x <= 2 |  |
+| exit.rb:12:8:12:15 | "x <= 2" | exit.rb:12:3:12:15 | call to puts |  |
+| exit.rb:12:9:12:14 | x <= 2 | exit.rb:12:8:12:15 | "x <= 2" |  |
+| heredoc.rb:1:1:7:3 | double_heredoc | heredoc.rb:1:1:7:4 | exit heredoc.rb (normal) |  |
+| heredoc.rb:1:1:7:3 | enter double_heredoc | heredoc.rb:2:3:2:16 | self |  |
+| heredoc.rb:1:1:7:3 | exit double_heredoc (normal) | heredoc.rb:1:1:7:3 | exit double_heredoc |  |
+| heredoc.rb:1:1:7:4 | enter heredoc.rb | heredoc.rb:1:1:7:3 | double_heredoc |  |
+| heredoc.rb:1:1:7:4 | exit heredoc.rb (normal) | heredoc.rb:1:1:7:4 | exit heredoc.rb |  |
+| heredoc.rb:2:3:2:16 | call to puts | heredoc.rb:1:1:7:3 | exit double_heredoc (normal) |  |
+| heredoc.rb:2:3:2:16 | self | heredoc.rb:2:17:3:10 | \n    hello\n |  |
+| heredoc.rb:2:8:2:10 | <<A | heredoc.rb:4:2:5:9 | \n   world\n |  |
+| heredoc.rb:2:13:2:15 | <<A | heredoc.rb:2:3:2:16 | call to puts |  |
+| heredoc.rb:2:17:3:10 | \n    hello\n | heredoc.rb:2:8:2:10 | <<A |  |
+| heredoc.rb:4:2:5:9 | \n   world\n | heredoc.rb:2:13:2:15 | <<A |  |
+| ifs.rb:1:1:9:3 | enter m1 | ifs.rb:1:8:1:8 | x |  |
+| ifs.rb:1:1:9:3 | exit m1 (normal) | ifs.rb:1:1:9:3 | exit m1 |  |
+| ifs.rb:1:1:9:3 | m1 | ifs.rb:11:1:16:3 | m2 |  |
+| ifs.rb:1:1:58:4 | enter ifs.rb | ifs.rb:1:1:9:3 | m1 |  |
+| ifs.rb:1:1:58:4 | exit ifs.rb (normal) | ifs.rb:1:1:58:4 | exit ifs.rb |  |
+| ifs.rb:1:8:1:8 | x | ifs.rb:2:6:2:6 | x |  |
+| ifs.rb:2:3:8:5 | if ... | ifs.rb:1:1:9:3 | exit m1 (normal) |  |
+| ifs.rb:2:6:2:6 | x | ifs.rb:2:10:2:10 | 2 |  |
+| ifs.rb:2:6:2:10 | ... > ... | ifs.rb:3:5:3:30 | self | true |
+| ifs.rb:2:6:2:10 | ... > ... | ifs.rb:4:9:4:9 | x | false |
+| ifs.rb:2:10:2:10 | 2 | ifs.rb:2:6:2:10 | ... > ... |  |
+| ifs.rb:2:11:3:30 | then ... | ifs.rb:2:3:8:5 | if ... |  |
+| ifs.rb:3:5:3:30 | call to puts | ifs.rb:2:11:3:30 | then ... |  |
+| ifs.rb:3:5:3:30 | self | ifs.rb:3:11:3:29 | x is greater than 2 |  |
+| ifs.rb:3:10:3:30 | "x is greater than 2" | ifs.rb:3:5:3:30 | call to puts |  |
+| ifs.rb:3:11:3:29 | x is greater than 2 | ifs.rb:3:10:3:30 | "x is greater than 2" |  |
+| ifs.rb:4:3:7:35 | elsif ... | ifs.rb:2:3:8:5 | if ... |  |
+| ifs.rb:4:9:4:9 | x | ifs.rb:4:14:4:14 | 2 |  |
+| ifs.rb:4:9:4:14 | ... <= ... | ifs.rb:4:9:4:24 | [false] ... and ... | false |
+| ifs.rb:4:9:4:14 | ... <= ... | ifs.rb:4:20:4:20 | x | true |
+| ifs.rb:4:9:4:24 | [false] ... and ... | ifs.rb:4:9:4:38 | [false] ... and ... | false |
+| ifs.rb:4:9:4:24 | [true] ... and ... | ifs.rb:4:32:4:32 | x | true |
+| ifs.rb:4:9:4:38 | [false] ... and ... | ifs.rb:7:5:7:35 | self | false |
+| ifs.rb:4:9:4:38 | [true] ... and ... | ifs.rb:5:5:5:17 | self | true |
+| ifs.rb:4:14:4:14 | 2 | ifs.rb:4:9:4:14 | ... <= ... |  |
+| ifs.rb:4:20:4:20 | x | ifs.rb:4:24:4:24 | 0 |  |
+| ifs.rb:4:20:4:24 | ... > ... | ifs.rb:4:9:4:24 | [false] ... and ... | false |
+| ifs.rb:4:20:4:24 | ... > ... | ifs.rb:4:9:4:24 | [true] ... and ... | true |
+| ifs.rb:4:24:4:24 | 0 | ifs.rb:4:20:4:24 | ... > ... |  |
+| ifs.rb:4:30:4:38 | [false] ! ... | ifs.rb:4:9:4:38 | [false] ... and ... | false |
+| ifs.rb:4:30:4:38 | [true] ! ... | ifs.rb:4:9:4:38 | [true] ... and ... | true |
+| ifs.rb:4:31:4:38 | [false] ( ... ) | ifs.rb:4:30:4:38 | [true] ! ... | false |
+| ifs.rb:4:31:4:38 | [true] ( ... ) | ifs.rb:4:30:4:38 | [false] ! ... | true |
+| ifs.rb:4:32:4:32 | x | ifs.rb:4:37:4:37 | 5 |  |
+| ifs.rb:4:32:4:37 | ... == ... | ifs.rb:4:31:4:38 | [false] ( ... ) | false |
+| ifs.rb:4:32:4:37 | ... == ... | ifs.rb:4:31:4:38 | [true] ( ... ) | true |
+| ifs.rb:4:37:4:37 | 5 | ifs.rb:4:32:4:37 | ... == ... |  |
+| ifs.rb:4:39:5:17 | then ... | ifs.rb:4:3:7:35 | elsif ... |  |
+| ifs.rb:5:5:5:17 | call to puts | ifs.rb:4:39:5:17 | then ... |  |
+| ifs.rb:5:5:5:17 | self | ifs.rb:5:11:5:16 | x is 1 |  |
+| ifs.rb:5:10:5:17 | "x is 1" | ifs.rb:5:5:5:17 | call to puts |  |
+| ifs.rb:5:11:5:16 | x is 1 | ifs.rb:5:10:5:17 | "x is 1" |  |
+| ifs.rb:6:3:7:35 | else ... | ifs.rb:4:3:7:35 | elsif ... |  |
+| ifs.rb:7:5:7:35 | call to puts | ifs.rb:6:3:7:35 | else ... |  |
+| ifs.rb:7:5:7:35 | self | ifs.rb:7:11:7:34 | I can't guess the number |  |
+| ifs.rb:7:10:7:35 | "I can't guess the number" | ifs.rb:7:5:7:35 | call to puts |  |
+| ifs.rb:7:11:7:34 | I can't guess the number | ifs.rb:7:10:7:35 | "I can't guess the number" |  |
+| ifs.rb:11:1:16:3 | enter m2 | ifs.rb:11:8:11:8 | b |  |
+| ifs.rb:11:1:16:3 | exit m2 (normal) | ifs.rb:11:1:16:3 | exit m2 |  |
+| ifs.rb:11:1:16:3 | m2 | ifs.rb:18:1:26:3 | m3 |  |
+| ifs.rb:11:8:11:8 | b | ifs.rb:12:6:12:6 | b |  |
+| ifs.rb:12:3:14:5 | if ... | ifs.rb:15:10:15:10 | 1 |  |
+| ifs.rb:12:6:12:6 | b | ifs.rb:12:3:14:5 | if ... | false |
+| ifs.rb:12:6:12:6 | b | ifs.rb:13:12:13:12 | 0 | true |
+| ifs.rb:13:5:13:12 | return | ifs.rb:11:1:16:3 | exit m2 (normal) | return |
+| ifs.rb:13:12:13:12 | 0 | ifs.rb:13:5:13:12 | return |  |
+| ifs.rb:15:3:15:10 | return | ifs.rb:11:1:16:3 | exit m2 (normal) | return |
+| ifs.rb:15:10:15:10 | 1 | ifs.rb:15:3:15:10 | return |  |
+| ifs.rb:18:1:26:3 | enter m3 | ifs.rb:18:8:18:8 | x |  |
+| ifs.rb:18:1:26:3 | exit m3 (normal) | ifs.rb:18:1:26:3 | exit m3 |  |
+| ifs.rb:18:1:26:3 | m3 | ifs.rb:28:1:30:3 | m4 |  |
+| ifs.rb:18:8:18:8 | x | ifs.rb:19:6:19:6 | x |  |
+| ifs.rb:19:3:24:5 | if ... | ifs.rb:25:3:25:8 | self |  |
+| ifs.rb:19:6:19:6 | x | ifs.rb:19:10:19:10 | 0 |  |
+| ifs.rb:19:6:19:10 | ... < ... | ifs.rb:19:3:24:5 | if ... | false |
+| ifs.rb:19:6:19:10 | ... < ... | ifs.rb:20:5:20:5 | x | true |
+| ifs.rb:19:10:19:10 | 0 | ifs.rb:19:6:19:10 | ... < ... |  |
+| ifs.rb:19:11:23:7 | then ... | ifs.rb:19:3:24:5 | if ... |  |
+| ifs.rb:20:5:20:5 | x | ifs.rb:20:10:20:10 | x |  |
+| ifs.rb:20:5:20:10 | ... = ... | ifs.rb:21:8:21:8 | x |  |
+| ifs.rb:20:9:20:10 | - ... | ifs.rb:20:5:20:10 | ... = ... |  |
+| ifs.rb:20:10:20:10 | x | ifs.rb:20:9:20:10 | - ... |  |
+| ifs.rb:21:5:23:7 | if ... | ifs.rb:19:11:23:7 | then ... |  |
+| ifs.rb:21:8:21:8 | x | ifs.rb:21:12:21:13 | 10 |  |
+| ifs.rb:21:8:21:13 | ... > ... | ifs.rb:21:5:23:7 | if ... | false |
+| ifs.rb:21:8:21:13 | ... > ... | ifs.rb:22:7:22:7 | x | true |
+| ifs.rb:21:12:21:13 | 10 | ifs.rb:21:8:21:13 | ... > ... |  |
+| ifs.rb:21:14:22:15 | then ... | ifs.rb:21:5:23:7 | if ... |  |
+| ifs.rb:22:7:22:7 | x | ifs.rb:22:11:22:11 | x |  |
+| ifs.rb:22:7:22:15 | ... = ... | ifs.rb:21:14:22:15 | then ... |  |
+| ifs.rb:22:11:22:11 | x | ifs.rb:22:15:22:15 | 1 |  |
+| ifs.rb:22:11:22:15 | ... - ... | ifs.rb:22:7:22:15 | ... = ... |  |
+| ifs.rb:22:15:22:15 | 1 | ifs.rb:22:11:22:15 | ... - ... |  |
+| ifs.rb:25:3:25:8 | call to puts | ifs.rb:18:1:26:3 | exit m3 (normal) |  |
+| ifs.rb:25:3:25:8 | self | ifs.rb:25:8:25:8 | x |  |
+| ifs.rb:25:8:25:8 | x | ifs.rb:25:3:25:8 | call to puts |  |
+| ifs.rb:28:1:30:3 | enter m4 | ifs.rb:28:9:28:10 | b1 |  |
+| ifs.rb:28:1:30:3 | exit m4 (normal) | ifs.rb:28:1:30:3 | exit m4 |  |
+| ifs.rb:28:1:30:3 | m4 | ifs.rb:32:1:34:3 | m5 |  |
+| ifs.rb:28:9:28:10 | b1 | ifs.rb:28:13:28:14 | b2 |  |
+| ifs.rb:28:13:28:14 | b2 | ifs.rb:28:17:28:18 | b3 |  |
+| ifs.rb:28:17:28:18 | b3 | ifs.rb:29:11:29:12 | b1 |  |
+| ifs.rb:29:3:29:51 | return | ifs.rb:28:1:30:3 | exit m4 (normal) | return |
+| ifs.rb:29:10:29:23 | [false] ( ... ) | ifs.rb:29:41:29:50 | !b2 \|\| !b3 | false |
+| ifs.rb:29:10:29:23 | [true] ( ... ) | ifs.rb:29:28:29:35 | b2 \|\| b3 | true |
+| ifs.rb:29:10:29:51 | ... ? ... : ... | ifs.rb:29:3:29:51 | return |  |
+| ifs.rb:29:11:29:12 | b1 | ifs.rb:29:16:29:17 | b2 | true |
+| ifs.rb:29:11:29:12 | b1 | ifs.rb:29:21:29:22 | b3 | false |
+| ifs.rb:29:11:29:22 | [false] ... ? ... : ... | ifs.rb:29:10:29:23 | [false] ( ... ) | false |
+| ifs.rb:29:11:29:22 | [true] ... ? ... : ... | ifs.rb:29:10:29:23 | [true] ( ... ) | true |
+| ifs.rb:29:16:29:17 | b2 | ifs.rb:29:11:29:22 | [false] ... ? ... : ... | false |
+| ifs.rb:29:16:29:17 | b2 | ifs.rb:29:11:29:22 | [true] ... ? ... : ... | true |
+| ifs.rb:29:21:29:22 | b3 | ifs.rb:29:11:29:22 | [false] ... ? ... : ... | false |
+| ifs.rb:29:21:29:22 | b3 | ifs.rb:29:11:29:22 | [true] ... ? ... : ... | true |
+| ifs.rb:29:27:29:36 | "b2 \|\| b3" | ifs.rb:29:10:29:51 | ... ? ... : ... |  |
+| ifs.rb:29:28:29:35 | b2 \|\| b3 | ifs.rb:29:27:29:36 | "b2 \|\| b3" |  |
+| ifs.rb:29:40:29:51 | "!b2 \|\| !b3" | ifs.rb:29:10:29:51 | ... ? ... : ... |  |
+| ifs.rb:29:41:29:50 | !b2 \|\| !b3 | ifs.rb:29:40:29:51 | "!b2 \|\| !b3" |  |
+| ifs.rb:32:1:34:3 | enter m5 | ifs.rb:32:9:32:10 | b1 |  |
+| ifs.rb:32:1:34:3 | exit m5 (normal) | ifs.rb:32:1:34:3 | exit m5 |  |
+| ifs.rb:32:1:34:3 | m5 | ifs.rb:38:12:38:12 | 1 |  |
+| ifs.rb:32:9:32:10 | b1 | ifs.rb:32:13:32:14 | b2 |  |
+| ifs.rb:32:13:32:14 | b2 | ifs.rb:32:17:32:18 | b3 |  |
+| ifs.rb:32:17:32:18 | b3 | ifs.rb:32:21:32:22 | b4 |  |
+| ifs.rb:32:21:32:22 | b4 | ifs.rb:32:25:32:26 | b5 |  |
+| ifs.rb:32:25:32:26 | b5 | ifs.rb:33:10:33:11 | b1 |  |
+| ifs.rb:33:3:33:100 | if ... | ifs.rb:32:1:34:3 | exit m5 (normal) |  |
+| ifs.rb:33:6:33:49 | [false] ( ... ) | ifs.rb:33:79:33:95 | !b2 \|\| !b4 \|\| !b5 | false |
+| ifs.rb:33:6:33:49 | [true] ( ... ) | ifs.rb:33:57:33:70 | b2 \|\| b4 \|\| b5 | true |
+| ifs.rb:33:7:33:48 | [false] if ... | ifs.rb:33:6:33:49 | [false] ( ... ) | false |
+| ifs.rb:33:7:33:48 | [true] if ... | ifs.rb:33:6:33:49 | [true] ( ... ) | true |
+| ifs.rb:33:10:33:11 | b1 | ifs.rb:33:18:33:19 | b2 | true |
+| ifs.rb:33:10:33:11 | b1 | ifs.rb:33:27:33:28 | b3 | false |
+| ifs.rb:33:13:33:19 | [false] then ... | ifs.rb:33:7:33:48 | [false] if ... | false |
+| ifs.rb:33:13:33:19 | [true] then ... | ifs.rb:33:7:33:48 | [true] if ... | true |
+| ifs.rb:33:18:33:19 | b2 | ifs.rb:33:13:33:19 | [false] then ... | false |
+| ifs.rb:33:18:33:19 | b2 | ifs.rb:33:13:33:19 | [true] then ... | true |
+| ifs.rb:33:21:33:44 | [false] elsif ... | ifs.rb:33:7:33:48 | [false] if ... | false |
+| ifs.rb:33:21:33:44 | [true] elsif ... | ifs.rb:33:7:33:48 | [true] if ... | true |
+| ifs.rb:33:27:33:28 | b3 | ifs.rb:33:35:33:36 | b4 | true |
+| ifs.rb:33:27:33:28 | b3 | ifs.rb:33:43:33:44 | b5 | false |
+| ifs.rb:33:30:33:36 | [false] then ... | ifs.rb:33:21:33:44 | [false] elsif ... | false |
+| ifs.rb:33:30:33:36 | [true] then ... | ifs.rb:33:21:33:44 | [true] elsif ... | true |
+| ifs.rb:33:35:33:36 | b4 | ifs.rb:33:30:33:36 | [false] then ... | false |
+| ifs.rb:33:35:33:36 | b4 | ifs.rb:33:30:33:36 | [true] then ... | true |
+| ifs.rb:33:38:33:44 | [false] else ... | ifs.rb:33:21:33:44 | [false] elsif ... | false |
+| ifs.rb:33:38:33:44 | [true] else ... | ifs.rb:33:21:33:44 | [true] elsif ... | true |
+| ifs.rb:33:43:33:44 | b5 | ifs.rb:33:38:33:44 | [false] else ... | false |
+| ifs.rb:33:43:33:44 | b5 | ifs.rb:33:38:33:44 | [true] else ... | true |
+| ifs.rb:33:51:33:71 | then ... | ifs.rb:33:3:33:100 | if ... |  |
+| ifs.rb:33:56:33:71 | "b2 \|\| b4 \|\| b5" | ifs.rb:33:51:33:71 | then ... |  |
+| ifs.rb:33:57:33:70 | b2 \|\| b4 \|\| b5 | ifs.rb:33:56:33:71 | "b2 \|\| b4 \|\| b5" |  |
+| ifs.rb:33:73:33:96 | else ... | ifs.rb:33:3:33:100 | if ... |  |
+| ifs.rb:33:78:33:96 | "!b2 \|\| !b4 \|\| !b5" | ifs.rb:33:73:33:96 | else ... |  |
+| ifs.rb:33:79:33:95 | !b2 \|\| !b4 \|\| !b5 | ifs.rb:33:78:33:96 | "!b2 \|\| !b4 \|\| !b5" |  |
+| ifs.rb:36:1:38:3 | conditional_method_def | ifs.rb:36:1:38:17 | ... unless ... |  |
+| ifs.rb:36:1:38:3 | enter conditional_method_def | ifs.rb:37:3:37:12 | self |  |
+| ifs.rb:36:1:38:3 | exit conditional_method_def (normal) | ifs.rb:36:1:38:3 | exit conditional_method_def |  |
+| ifs.rb:36:1:38:17 | ... unless ... | ifs.rb:40:1:44:3 | constant_condition |  |
+| ifs.rb:37:3:37:12 | call to puts | ifs.rb:36:1:38:3 | exit conditional_method_def (normal) |  |
+| ifs.rb:37:3:37:12 | self | ifs.rb:37:9:37:11 | bla |  |
+| ifs.rb:37:8:37:12 | "bla" | ifs.rb:37:3:37:12 | call to puts |  |
+| ifs.rb:37:9:37:11 | bla | ifs.rb:37:8:37:12 | "bla" |  |
+| ifs.rb:38:12:38:12 | 1 | ifs.rb:38:17:38:17 | 2 |  |
+| ifs.rb:38:12:38:17 | ... == ... | ifs.rb:36:1:38:3 | conditional_method_def | false |
+| ifs.rb:38:12:38:17 | ... == ... | ifs.rb:36:1:38:17 | ... unless ... | true |
+| ifs.rb:38:17:38:17 | 2 | ifs.rb:38:12:38:17 | ... == ... |  |
+| ifs.rb:40:1:44:3 | constant_condition | ifs.rb:46:1:52:3 | empty_else |  |
+| ifs.rb:40:1:44:3 | enter constant_condition | ifs.rb:41:7:41:10 | true |  |
+| ifs.rb:40:1:44:3 | exit constant_condition (normal) | ifs.rb:40:1:44:3 | exit constant_condition |  |
+| ifs.rb:41:3:43:5 | if ... | ifs.rb:40:1:44:3 | exit constant_condition (normal) |  |
+| ifs.rb:41:6:41:10 | [false] ! ... | ifs.rb:41:3:43:5 | if ... | false |
+| ifs.rb:41:7:41:10 | true | ifs.rb:41:6:41:10 | [false] ! ... | true |
+| ifs.rb:46:1:52:3 | empty_else | ifs.rb:54:1:58:3 | disjunct |  |
+| ifs.rb:46:1:52:3 | enter empty_else | ifs.rb:46:16:46:16 | b |  |
+| ifs.rb:46:1:52:3 | exit empty_else (normal) | ifs.rb:46:1:52:3 | exit empty_else |  |
+| ifs.rb:46:16:46:16 | b | ifs.rb:47:6:47:6 | b |  |
+| ifs.rb:47:3:50:5 | if ... | ifs.rb:51:3:51:13 | self |  |
+| ifs.rb:47:6:47:6 | b | ifs.rb:48:5:48:15 | self | true |
+| ifs.rb:47:6:47:6 | b | ifs.rb:49:3:49:6 | else ... | false |
+| ifs.rb:47:8:48:15 | then ... | ifs.rb:47:3:50:5 | if ... |  |
+| ifs.rb:48:5:48:15 | call to puts | ifs.rb:47:8:48:15 | then ... |  |
+| ifs.rb:48:5:48:15 | self | ifs.rb:48:11:48:14 | true |  |
+| ifs.rb:48:10:48:15 | "true" | ifs.rb:48:5:48:15 | call to puts |  |
+| ifs.rb:48:11:48:14 | true | ifs.rb:48:10:48:15 | "true" |  |
+| ifs.rb:49:3:49:6 | else ... | ifs.rb:47:3:50:5 | if ... |  |
+| ifs.rb:51:3:51:13 | call to puts | ifs.rb:46:1:52:3 | exit empty_else (normal) |  |
+| ifs.rb:51:3:51:13 | self | ifs.rb:51:9:51:12 | done |  |
+| ifs.rb:51:8:51:13 | "done" | ifs.rb:51:3:51:13 | call to puts |  |
+| ifs.rb:51:9:51:12 | done | ifs.rb:51:8:51:13 | "done" |  |
+| ifs.rb:54:1:58:3 | disjunct | ifs.rb:1:1:58:4 | exit ifs.rb (normal) |  |
+| ifs.rb:54:1:58:3 | enter disjunct | ifs.rb:54:15:54:16 | b1 |  |
+| ifs.rb:54:1:58:3 | exit disjunct (normal) | ifs.rb:54:1:58:3 | exit disjunct |  |
+| ifs.rb:54:15:54:16 | b1 | ifs.rb:54:19:54:20 | b2 |  |
+| ifs.rb:54:19:54:20 | b2 | ifs.rb:55:7:55:8 | b1 |  |
+| ifs.rb:55:3:57:5 | if ... | ifs.rb:54:1:58:3 | exit disjunct (normal) |  |
+| ifs.rb:55:6:55:15 | [false] ( ... ) | ifs.rb:55:3:57:5 | if ... | false |
+| ifs.rb:55:6:55:15 | [true] ( ... ) | ifs.rb:56:5:56:19 | self | true |
+| ifs.rb:55:7:55:8 | b1 | ifs.rb:55:7:55:14 | [true] ... \|\| ... | true |
+| ifs.rb:55:7:55:8 | b1 | ifs.rb:55:13:55:14 | b2 | false |
+| ifs.rb:55:7:55:14 | [false] ... \|\| ... | ifs.rb:55:6:55:15 | [false] ( ... ) | false |
+| ifs.rb:55:7:55:14 | [true] ... \|\| ... | ifs.rb:55:6:55:15 | [true] ( ... ) | true |
+| ifs.rb:55:13:55:14 | b2 | ifs.rb:55:7:55:14 | [false] ... \|\| ... | false |
+| ifs.rb:55:13:55:14 | b2 | ifs.rb:55:7:55:14 | [true] ... \|\| ... | true |
+| ifs.rb:55:17:56:19 | then ... | ifs.rb:55:3:57:5 | if ... |  |
+| ifs.rb:56:5:56:19 | call to puts | ifs.rb:55:17:56:19 | then ... |  |
+| ifs.rb:56:5:56:19 | self | ifs.rb:56:11:56:18 | b1 or b2 |  |
+| ifs.rb:56:10:56:19 | "b1 or b2" | ifs.rb:56:5:56:19 | call to puts |  |
+| ifs.rb:56:11:56:18 | b1 or b2 | ifs.rb:56:10:56:19 | "b1 or b2" |  |
+| loops.rb:1:1:6:3 | enter m1 | loops.rb:1:8:1:8 | x |  |
+| loops.rb:1:1:6:3 | exit m1 (normal) | loops.rb:1:1:6:3 | exit m1 |  |
+| loops.rb:1:1:6:3 | m1 | loops.rb:8:1:22:3 | m2 |  |
+| loops.rb:1:1:33:4 | enter loops.rb | loops.rb:1:1:6:3 | m1 |  |
+| loops.rb:1:1:33:4 | exit loops.rb (normal) | loops.rb:1:1:33:4 | exit loops.rb |  |
+| loops.rb:1:8:1:8 | x | loops.rb:2:9:2:9 | x |  |
+| loops.rb:2:3:5:5 | while ... | loops.rb:1:1:6:3 | exit m1 (normal) |  |
+| loops.rb:2:9:2:9 | x | loops.rb:2:14:2:14 | 0 |  |
+| loops.rb:2:9:2:14 | ... >= ... | loops.rb:2:3:5:5 | while ... | false |
+| loops.rb:2:9:2:14 | ... >= ... | loops.rb:3:5:3:10 | self | true |
+| loops.rb:2:14:2:14 | 0 | loops.rb:2:9:2:14 | ... >= ... |  |
+| loops.rb:2:15:5:5 | do ... | loops.rb:2:9:2:9 | x |  |
+| loops.rb:3:5:3:10 | call to puts | loops.rb:4:5:4:5 | x |  |
+| loops.rb:3:5:3:10 | self | loops.rb:3:10:3:10 | x |  |
+| loops.rb:3:10:3:10 | x | loops.rb:3:5:3:10 | call to puts |  |
+| loops.rb:4:5:4:5 | x | loops.rb:4:5:4:5 | x |  |
+| loops.rb:4:5:4:5 | x | loops.rb:4:10:4:10 | 1 |  |
+| loops.rb:4:5:4:10 | ... = ... | loops.rb:2:15:5:5 | do ... |  |
+| loops.rb:4:7:4:8 | ... - ... | loops.rb:4:5:4:10 | ... = ... |  |
+| loops.rb:4:10:4:10 | 1 | loops.rb:4:7:4:8 | ... - ... |  |
+| loops.rb:8:1:22:3 | enter m2 | loops.rb:8:8:8:8 | x |  |
+| loops.rb:8:1:22:3 | exit m2 (normal) | loops.rb:8:1:22:3 | exit m2 |  |
+| loops.rb:8:1:22:3 | m2 | loops.rb:24:1:28:3 | m3 |  |
+| loops.rb:8:8:8:8 | x | loops.rb:9:9:9:9 | x |  |
+| loops.rb:9:3:20:5 | while ... | loops.rb:21:3:21:13 | self |  |
+| loops.rb:9:9:9:9 | x | loops.rb:9:14:9:14 | 0 |  |
+| loops.rb:9:9:9:14 | ... >= ... | loops.rb:9:3:20:5 | while ... | false |
+| loops.rb:9:9:9:14 | ... >= ... | loops.rb:10:5:10:10 | self | true |
+| loops.rb:9:14:9:14 | 0 | loops.rb:9:9:9:14 | ... >= ... |  |
+| loops.rb:9:15:20:5 | do ... | loops.rb:9:9:9:9 | x |  |
+| loops.rb:10:5:10:10 | call to puts | loops.rb:11:5:11:5 | x |  |
+| loops.rb:10:5:10:10 | self | loops.rb:10:10:10:10 | x |  |
+| loops.rb:10:10:10:10 | x | loops.rb:10:5:10:10 | call to puts |  |
+| loops.rb:11:5:11:5 | x | loops.rb:11:5:11:5 | x |  |
+| loops.rb:11:5:11:5 | x | loops.rb:11:10:11:10 | 1 |  |
+| loops.rb:11:5:11:10 | ... = ... | loops.rb:12:8:12:8 | x |  |
+| loops.rb:11:7:11:8 | ... - ... | loops.rb:11:5:11:10 | ... = ... |  |
+| loops.rb:11:10:11:10 | 1 | loops.rb:11:7:11:8 | ... - ... |  |
+| loops.rb:12:5:18:7 | if ... | loops.rb:19:5:19:15 | self |  |
+| loops.rb:12:8:12:8 | x | loops.rb:12:12:12:14 | 100 |  |
+| loops.rb:12:8:12:14 | ... > ... | loops.rb:13:7:13:11 | break | true |
+| loops.rb:12:8:12:14 | ... > ... | loops.rb:14:11:14:11 | x | false |
+| loops.rb:12:12:12:14 | 100 | loops.rb:12:8:12:14 | ... > ... |  |
+| loops.rb:13:7:13:11 | break | loops.rb:9:3:20:5 | while ... | break |
+| loops.rb:14:5:17:10 | elsif ... | loops.rb:12:5:18:7 | if ... |  |
+| loops.rb:14:11:14:11 | x | loops.rb:14:15:14:16 | 50 |  |
+| loops.rb:14:11:14:16 | ... > ... | loops.rb:15:7:15:10 | next | true |
+| loops.rb:14:11:14:16 | ... > ... | loops.rb:16:11:16:11 | x | false |
+| loops.rb:14:15:14:16 | 50 | loops.rb:14:11:14:16 | ... > ... |  |
+| loops.rb:15:7:15:10 | next | loops.rb:9:9:9:9 | x | next |
+| loops.rb:16:5:17:10 | elsif ... | loops.rb:14:5:17:10 | elsif ... |  |
+| loops.rb:16:11:16:11 | x | loops.rb:16:15:16:16 | 10 |  |
+| loops.rb:16:11:16:16 | ... > ... | loops.rb:16:5:17:10 | elsif ... | false |
+| loops.rb:16:11:16:16 | ... > ... | loops.rb:17:7:17:10 | redo | true |
+| loops.rb:16:15:16:16 | 10 | loops.rb:16:11:16:16 | ... > ... |  |
+| loops.rb:17:7:17:10 | redo | loops.rb:10:5:10:10 | self | redo |
+| loops.rb:19:5:19:15 | call to puts | loops.rb:9:15:20:5 | do ... |  |
+| loops.rb:19:5:19:15 | self | loops.rb:19:11:19:14 | Iter |  |
+| loops.rb:19:10:19:15 | "Iter" | loops.rb:19:5:19:15 | call to puts |  |
+| loops.rb:19:11:19:14 | Iter | loops.rb:19:10:19:15 | "Iter" |  |
+| loops.rb:21:3:21:13 | call to puts | loops.rb:8:1:22:3 | exit m2 (normal) |  |
+| loops.rb:21:3:21:13 | self | loops.rb:21:9:21:12 | Done |  |
+| loops.rb:21:8:21:13 | "Done" | loops.rb:21:3:21:13 | call to puts |  |
+| loops.rb:21:9:21:12 | Done | loops.rb:21:8:21:13 | "Done" |  |
+| loops.rb:24:1:28:3 | enter m3 | loops.rb:25:3:25:9 | Array |  |
+| loops.rb:24:1:28:3 | exit m3 (normal) | loops.rb:24:1:28:3 | exit m3 |  |
+| loops.rb:24:1:28:3 | m3 | loops.rb:30:1:33:3 | m4 |  |
+| loops.rb:25:3:25:9 | Array | loops.rb:25:4:25:4 | 1 |  |
+| loops.rb:25:3:25:9 | call to [] | loops.rb:25:16:27:5 | do ... end |  |
+| loops.rb:25:3:27:5 | call to each | loops.rb:24:1:28:3 | exit m3 (normal) |  |
+| loops.rb:25:4:25:4 | 1 | loops.rb:25:6:25:6 | 2 |  |
+| loops.rb:25:6:25:6 | 2 | loops.rb:25:8:25:8 | 3 |  |
+| loops.rb:25:8:25:8 | 3 | loops.rb:25:3:25:9 | call to [] |  |
+| loops.rb:25:16:27:5 | do ... end | loops.rb:25:3:27:5 | call to each |  |
+| loops.rb:25:16:27:5 | enter do ... end | loops.rb:25:20:25:20 | x |  |
+| loops.rb:25:16:27:5 | exit do ... end (normal) | loops.rb:25:16:27:5 | exit do ... end |  |
+| loops.rb:25:20:25:20 | x | loops.rb:26:5:26:10 | self |  |
+| loops.rb:26:5:26:10 | call to puts | loops.rb:25:16:27:5 | exit do ... end (normal) |  |
+| loops.rb:26:5:26:10 | self | loops.rb:26:10:26:10 | x |  |
+| loops.rb:26:10:26:10 | x | loops.rb:26:5:26:10 | call to puts |  |
+| loops.rb:30:1:33:3 | enter m4 | loops.rb:30:8:30:8 | x |  |
+| loops.rb:30:1:33:3 | exit m4 (normal) | loops.rb:30:1:33:3 | exit m4 |  |
+| loops.rb:30:1:33:3 | m4 | loops.rb:1:1:33:4 | exit loops.rb (normal) |  |
+| loops.rb:30:8:30:8 | x | loops.rb:30:11:30:11 | y |  |
+| loops.rb:30:11:30:11 | y | loops.rb:31:9:31:9 | x |  |
+| loops.rb:31:3:32:5 | while ... | loops.rb:30:1:33:3 | exit m4 (normal) |  |
+| loops.rb:31:9:31:9 | x | loops.rb:31:13:31:13 | y |  |
+| loops.rb:31:9:31:13 | ... < ... | loops.rb:31:3:32:5 | while ... | false |
+| loops.rb:31:9:31:13 | ... < ... | loops.rb:31:15:32:5 | do ... | true |
+| loops.rb:31:13:31:13 | y | loops.rb:31:9:31:13 | ... < ... |  |
+| loops.rb:31:15:32:5 | do ... | loops.rb:31:9:31:9 | x |  |
+| raise.rb:1:1:2:3 | ExceptionA | raise.rb:1:20:1:28 | Exception |  |
+| raise.rb:1:1:182:4 | enter raise.rb | raise.rb:1:1:2:3 | ExceptionA |  |
+| raise.rb:1:1:182:4 | exit raise.rb (normal) | raise.rb:1:1:182:4 | exit raise.rb |  |
+| raise.rb:1:20:1:28 | Exception | raise.rb:4:1:5:3 | ExceptionB |  |
+| raise.rb:4:1:5:3 | ExceptionB | raise.rb:4:20:4:28 | Exception |  |
+| raise.rb:4:20:4:28 | Exception | raise.rb:7:1:12:3 | m1 |  |
+| raise.rb:7:1:12:3 | enter m1 | raise.rb:7:8:7:8 | x |  |
+| raise.rb:7:1:12:3 | exit m1 (abnormal) | raise.rb:7:1:12:3 | exit m1 |  |
+| raise.rb:7:1:12:3 | exit m1 (normal) | raise.rb:7:1:12:3 | exit m1 |  |
+| raise.rb:7:1:12:3 | m1 | raise.rb:14:1:23:3 | m2 |  |
+| raise.rb:7:8:7:8 | x | raise.rb:8:6:8:6 | x |  |
+| raise.rb:8:3:10:5 | if ... | raise.rb:11:3:11:15 | self |  |
+| raise.rb:8:6:8:6 | x | raise.rb:8:10:8:10 | 2 |  |
+| raise.rb:8:6:8:10 | ... > ... | raise.rb:8:3:10:5 | if ... | false |
+| raise.rb:8:6:8:10 | ... > ... | raise.rb:9:5:9:17 | self | true |
+| raise.rb:8:10:8:10 | 2 | raise.rb:8:6:8:10 | ... > ... |  |
+| raise.rb:9:5:9:17 | call to raise | raise.rb:7:1:12:3 | exit m1 (abnormal) | raise |
+| raise.rb:9:5:9:17 | self | raise.rb:9:12:9:16 | x > 2 |  |
+| raise.rb:9:11:9:17 | "x > 2" | raise.rb:9:5:9:17 | call to raise |  |
+| raise.rb:9:12:9:16 | x > 2 | raise.rb:9:11:9:17 | "x > 2" |  |
+| raise.rb:11:3:11:15 | call to puts | raise.rb:7:1:12:3 | exit m1 (normal) |  |
+| raise.rb:11:3:11:15 | self | raise.rb:11:9:11:14 | x <= 2 |  |
+| raise.rb:11:8:11:15 | "x <= 2" | raise.rb:11:3:11:15 | call to puts |  |
+| raise.rb:11:9:11:14 | x <= 2 | raise.rb:11:8:11:15 | "x <= 2" |  |
+| raise.rb:14:1:23:3 | enter m2 | raise.rb:14:8:14:8 | b |  |
+| raise.rb:14:1:23:3 | exit m2 (abnormal) | raise.rb:14:1:23:3 | exit m2 |  |
+| raise.rb:14:1:23:3 | exit m2 (normal) | raise.rb:14:1:23:3 | exit m2 |  |
+| raise.rb:14:1:23:3 | m2 | raise.rb:25:1:34:3 | m3 |  |
+| raise.rb:14:8:14:8 | b | raise.rb:16:8:16:8 | b |  |
+| raise.rb:16:5:18:7 | if ... | raise.rb:22:3:22:15 | self |  |
+| raise.rb:16:8:16:8 | b | raise.rb:16:5:18:7 | if ... | false |
+| raise.rb:16:8:16:8 | b | raise.rb:17:7:17:22 | self | true |
+| raise.rb:17:7:17:22 | call to raise | raise.rb:19:10:19:19 | ExceptionA | raise |
+| raise.rb:17:7:17:22 | self | raise.rb:17:13:17:22 | ExceptionA |  |
+| raise.rb:17:13:17:22 | ExceptionA | raise.rb:17:7:17:22 | call to raise |  |
+| raise.rb:19:3:20:18 | rescue ... | raise.rb:22:3:22:15 | self |  |
+| raise.rb:19:10:19:19 | ExceptionA | raise.rb:14:1:23:3 | exit m2 (abnormal) | raise |
+| raise.rb:19:10:19:19 | ExceptionA | raise.rb:20:5:20:18 | self | match |
+| raise.rb:19:20:20:18 | then ... | raise.rb:19:3:20:18 | rescue ... |  |
+| raise.rb:20:5:20:18 | call to puts | raise.rb:19:20:20:18 | then ... |  |
+| raise.rb:20:5:20:18 | self | raise.rb:20:11:20:17 | Rescued |  |
+| raise.rb:20:10:20:18 | "Rescued" | raise.rb:20:5:20:18 | call to puts |  |
+| raise.rb:20:11:20:17 | Rescued | raise.rb:20:10:20:18 | "Rescued" |  |
+| raise.rb:22:3:22:15 | call to puts | raise.rb:14:1:23:3 | exit m2 (normal) |  |
+| raise.rb:22:3:22:15 | self | raise.rb:22:9:22:14 | End m2 |  |
+| raise.rb:22:8:22:15 | "End m2" | raise.rb:22:3:22:15 | call to puts |  |
+| raise.rb:22:9:22:14 | End m2 | raise.rb:22:8:22:15 | "End m2" |  |
+| raise.rb:25:1:34:3 | enter m3 | raise.rb:25:8:25:8 | b |  |
+| raise.rb:25:1:34:3 | exit m3 (normal) | raise.rb:25:1:34:3 | exit m3 |  |
+| raise.rb:25:1:34:3 | m3 | raise.rb:36:1:45:3 | m4 |  |
+| raise.rb:25:8:25:8 | b | raise.rb:27:8:27:8 | b |  |
+| raise.rb:27:5:29:7 | if ... | raise.rb:33:3:33:15 | self |  |
+| raise.rb:27:8:27:8 | b | raise.rb:27:5:29:7 | if ... | false |
+| raise.rb:27:8:27:8 | b | raise.rb:28:7:28:22 | self | true |
+| raise.rb:28:7:28:22 | call to raise | raise.rb:31:5:31:18 | self | raise |
+| raise.rb:28:7:28:22 | self | raise.rb:28:13:28:22 | ExceptionA |  |
+| raise.rb:28:13:28:22 | ExceptionA | raise.rb:28:7:28:22 | call to raise |  |
+| raise.rb:30:3:31:18 | rescue ... | raise.rb:33:3:33:15 | self |  |
+| raise.rb:30:9:31:18 | then ... | raise.rb:30:3:31:18 | rescue ... |  |
+| raise.rb:31:5:31:18 | call to puts | raise.rb:30:9:31:18 | then ... |  |
+| raise.rb:31:5:31:18 | self | raise.rb:31:11:31:17 | Rescued |  |
+| raise.rb:31:10:31:18 | "Rescued" | raise.rb:31:5:31:18 | call to puts |  |
+| raise.rb:31:11:31:17 | Rescued | raise.rb:31:10:31:18 | "Rescued" |  |
+| raise.rb:33:3:33:15 | call to puts | raise.rb:25:1:34:3 | exit m3 (normal) |  |
+| raise.rb:33:3:33:15 | self | raise.rb:33:9:33:14 | End m3 |  |
+| raise.rb:33:8:33:15 | "End m3" | raise.rb:33:3:33:15 | call to puts |  |
+| raise.rb:33:9:33:14 | End m3 | raise.rb:33:8:33:15 | "End m3" |  |
+| raise.rb:36:1:45:3 | enter m4 | raise.rb:36:8:36:8 | b |  |
+| raise.rb:36:1:45:3 | exit m4 (normal) | raise.rb:36:1:45:3 | exit m4 |  |
+| raise.rb:36:1:45:3 | m4 | raise.rb:47:1:55:3 | m5 |  |
+| raise.rb:36:8:36:8 | b | raise.rb:38:8:38:8 | b |  |
+| raise.rb:38:5:40:7 | if ... | raise.rb:44:3:44:15 | self |  |
+| raise.rb:38:8:38:8 | b | raise.rb:38:5:40:7 | if ... | false |
+| raise.rb:38:8:38:8 | b | raise.rb:39:7:39:22 | self | true |
+| raise.rb:39:7:39:22 | call to raise | raise.rb:41:13:41:13 | e | raise |
+| raise.rb:39:7:39:22 | self | raise.rb:39:13:39:22 | ExceptionA |  |
+| raise.rb:39:13:39:22 | ExceptionA | raise.rb:39:7:39:22 | call to raise |  |
+| raise.rb:41:3:42:22 | rescue ... | raise.rb:44:3:44:15 | self |  |
+| raise.rb:41:13:41:13 | e | raise.rb:42:5:42:22 | self |  |
+| raise.rb:41:14:42:22 | then ... | raise.rb:41:3:42:22 | rescue ... |  |
+| raise.rb:42:5:42:22 | call to puts | raise.rb:41:14:42:22 | then ... |  |
+| raise.rb:42:5:42:22 | self | raise.rb:42:11:42:21 | Rescued {e} |  |
+| raise.rb:42:10:42:22 | "Rescued {e}" | raise.rb:42:5:42:22 | call to puts |  |
+| raise.rb:42:11:42:21 | Rescued {e} | raise.rb:42:10:42:22 | "Rescued {e}" |  |
+| raise.rb:44:3:44:15 | call to puts | raise.rb:36:1:45:3 | exit m4 (normal) |  |
+| raise.rb:44:3:44:15 | self | raise.rb:44:9:44:14 | End m4 |  |
+| raise.rb:44:8:44:15 | "End m4" | raise.rb:44:3:44:15 | call to puts |  |
+| raise.rb:44:9:44:14 | End m4 | raise.rb:44:8:44:15 | "End m4" |  |
+| raise.rb:47:1:55:3 | enter m5 | raise.rb:47:8:47:8 | b |  |
+| raise.rb:47:1:55:3 | exit m5 (normal) | raise.rb:47:1:55:3 | exit m5 |  |
+| raise.rb:47:1:55:3 | m5 | raise.rb:57:1:66:3 | m6 |  |
+| raise.rb:47:8:47:8 | b | raise.rb:49:8:49:8 | b |  |
+| raise.rb:49:5:51:7 | if ... | raise.rb:54:3:54:15 | self |  |
+| raise.rb:49:8:49:8 | b | raise.rb:49:5:51:7 | if ... | false |
+| raise.rb:49:8:49:8 | b | raise.rb:50:7:50:22 | self | true |
+| raise.rb:50:7:50:22 | call to raise | raise.rb:52:13:52:13 | e | raise |
+| raise.rb:50:7:50:22 | self | raise.rb:50:13:50:22 | ExceptionA |  |
+| raise.rb:50:13:50:22 | ExceptionA | raise.rb:50:7:50:22 | call to raise |  |
+| raise.rb:52:3:52:13 | rescue ... | raise.rb:54:3:54:15 | self |  |
+| raise.rb:52:13:52:13 | e | raise.rb:52:3:52:13 | rescue ... |  |
+| raise.rb:54:3:54:15 | call to puts | raise.rb:47:1:55:3 | exit m5 (normal) |  |
+| raise.rb:54:3:54:15 | self | raise.rb:54:9:54:14 | End m5 |  |
+| raise.rb:54:8:54:15 | "End m5" | raise.rb:54:3:54:15 | call to puts |  |
+| raise.rb:54:9:54:14 | End m5 | raise.rb:54:8:54:15 | "End m5" |  |
+| raise.rb:57:1:66:3 | enter m6 | raise.rb:57:8:57:8 | b |  |
+| raise.rb:57:1:66:3 | exit m6 (abnormal) | raise.rb:57:1:66:3 | exit m6 |  |
+| raise.rb:57:1:66:3 | exit m6 (normal) | raise.rb:57:1:66:3 | exit m6 |  |
+| raise.rb:57:1:66:3 | m6 | raise.rb:68:1:77:3 | m7 |  |
+| raise.rb:57:8:57:8 | b | raise.rb:59:8:59:8 | b |  |
+| raise.rb:59:5:61:7 | if ... | raise.rb:65:3:65:15 | self |  |
+| raise.rb:59:8:59:8 | b | raise.rb:59:5:61:7 | if ... | false |
+| raise.rb:59:8:59:8 | b | raise.rb:60:7:60:22 | self | true |
+| raise.rb:60:7:60:22 | call to raise | raise.rb:62:10:62:19 | ExceptionA | raise |
+| raise.rb:60:7:60:22 | self | raise.rb:60:13:60:22 | ExceptionA |  |
+| raise.rb:60:13:60:22 | ExceptionA | raise.rb:60:7:60:22 | call to raise |  |
+| raise.rb:62:3:63:22 | rescue ... | raise.rb:65:3:65:15 | self |  |
+| raise.rb:62:10:62:19 | ExceptionA | raise.rb:62:22:62:31 | ExceptionB | no-match |
+| raise.rb:62:10:62:19 | ExceptionA | raise.rb:62:36:62:36 | e | match |
+| raise.rb:62:22:62:31 | ExceptionB | raise.rb:57:1:66:3 | exit m6 (abnormal) | raise |
+| raise.rb:62:22:62:31 | ExceptionB | raise.rb:62:36:62:36 | e | match |
+| raise.rb:62:36:62:36 | e | raise.rb:63:5:63:22 | self |  |
+| raise.rb:62:37:63:22 | then ... | raise.rb:62:3:63:22 | rescue ... |  |
+| raise.rb:63:5:63:22 | call to puts | raise.rb:62:37:63:22 | then ... |  |
+| raise.rb:63:5:63:22 | self | raise.rb:63:11:63:21 | Rescued {e} |  |
+| raise.rb:63:10:63:22 | "Rescued {e}" | raise.rb:63:5:63:22 | call to puts |  |
+| raise.rb:63:11:63:21 | Rescued {e} | raise.rb:63:10:63:22 | "Rescued {e}" |  |
+| raise.rb:65:3:65:15 | call to puts | raise.rb:57:1:66:3 | exit m6 (normal) |  |
+| raise.rb:65:3:65:15 | self | raise.rb:65:9:65:14 | End m6 |  |
+| raise.rb:65:8:65:15 | "End m6" | raise.rb:65:3:65:15 | call to puts |  |
+| raise.rb:65:9:65:14 | End m6 | raise.rb:65:8:65:15 | "End m6" |  |
+| raise.rb:68:1:77:3 | enter m7 | raise.rb:68:8:68:8 | x |  |
+| raise.rb:68:1:77:3 | exit m7 (abnormal) | raise.rb:68:1:77:3 | exit m7 |  |
+| raise.rb:68:1:77:3 | exit m7 (normal) | raise.rb:68:1:77:3 | exit m7 |  |
+| raise.rb:68:1:77:3 | m7 | raise.rb:79:1:92:3 | m8 |  |
+| raise.rb:68:8:68:8 | x | raise.rb:69:6:69:6 | x |  |
+| raise.rb:69:3:73:5 | if ... | raise.rb:74:3:74:20 | self |  |
+| raise.rb:69:6:69:6 | x | raise.rb:69:10:69:10 | 2 |  |
+| raise.rb:69:6:69:10 | ... > ... | raise.rb:70:5:70:17 | self | true |
+| raise.rb:69:6:69:10 | ... > ... | raise.rb:71:9:71:9 | x | false |
+| raise.rb:69:6:69:10 | ... > ... | raise.rb:76:3:76:15 | [ensure: raise] self | raise |
+| raise.rb:69:10:69:10 | 2 | raise.rb:69:6:69:10 | ... > ... |  |
+| raise.rb:70:5:70:17 | call to raise | raise.rb:76:3:76:15 | [ensure: raise] self | raise |
+| raise.rb:70:5:70:17 | self | raise.rb:70:12:70:16 | x > 2 |  |
+| raise.rb:70:11:70:17 | "x > 2" | raise.rb:70:5:70:17 | call to raise |  |
+| raise.rb:70:12:70:16 | x > 2 | raise.rb:70:11:70:17 | "x > 2" |  |
+| raise.rb:71:3:72:18 | elsif ... | raise.rb:69:3:73:5 | if ... |  |
+| raise.rb:71:9:71:9 | x | raise.rb:71:13:71:13 | 0 |  |
+| raise.rb:71:9:71:13 | ... < ... | raise.rb:71:3:72:18 | elsif ... | false |
+| raise.rb:71:9:71:13 | ... < ... | raise.rb:72:13:72:17 | x < 0 | true |
+| raise.rb:71:9:71:13 | ... < ... | raise.rb:76:3:76:15 | [ensure: raise] self | raise |
+| raise.rb:71:13:71:13 | 0 | raise.rb:71:9:71:13 | ... < ... |  |
+| raise.rb:72:5:72:18 | return | raise.rb:76:3:76:15 | [ensure: return] self | return |
+| raise.rb:72:12:72:18 | "x < 0" | raise.rb:72:5:72:18 | return |  |
+| raise.rb:72:13:72:17 | x < 0 | raise.rb:72:12:72:18 | "x < 0" |  |
+| raise.rb:74:3:74:20 | call to puts | raise.rb:76:3:76:15 | [ensure: raise] self | raise |
+| raise.rb:74:3:74:20 | call to puts | raise.rb:76:3:76:15 | self |  |
+| raise.rb:74:3:74:20 | self | raise.rb:74:9:74:19 | 0 <= x <= 2 |  |
+| raise.rb:74:8:74:20 | "0 <= x <= 2" | raise.rb:74:3:74:20 | call to puts |  |
+| raise.rb:74:9:74:19 | 0 <= x <= 2 | raise.rb:74:8:74:20 | "0 <= x <= 2" |  |
+| raise.rb:75:1:76:15 | [ensure: raise] ensure ... | raise.rb:68:1:77:3 | exit m7 (abnormal) | raise |
+| raise.rb:75:1:76:15 | [ensure: return] ensure ... | raise.rb:68:1:77:3 | exit m7 (normal) | return |
+| raise.rb:75:1:76:15 | ensure ... | raise.rb:68:1:77:3 | exit m7 (normal) |  |
+| raise.rb:76:3:76:15 | [ensure: raise] call to puts | raise.rb:75:1:76:15 | [ensure: raise] ensure ... |  |
+| raise.rb:76:3:76:15 | [ensure: raise] self | raise.rb:76:9:76:14 | [ensure: raise] ensure |  |
+| raise.rb:76:3:76:15 | [ensure: return] call to puts | raise.rb:75:1:76:15 | [ensure: return] ensure ... |  |
+| raise.rb:76:3:76:15 | [ensure: return] self | raise.rb:76:9:76:14 | [ensure: return] ensure |  |
+| raise.rb:76:3:76:15 | call to puts | raise.rb:75:1:76:15 | ensure ... |  |
+| raise.rb:76:3:76:15 | self | raise.rb:76:9:76:14 | ensure |  |
+| raise.rb:76:8:76:15 | "ensure" | raise.rb:76:3:76:15 | call to puts |  |
+| raise.rb:76:8:76:15 | [ensure: raise] "ensure" | raise.rb:76:3:76:15 | [ensure: raise] call to puts |  |
+| raise.rb:76:8:76:15 | [ensure: return] "ensure" | raise.rb:76:3:76:15 | [ensure: return] call to puts |  |
+| raise.rb:76:9:76:14 | [ensure: raise] ensure | raise.rb:76:8:76:15 | [ensure: raise] "ensure" |  |
+| raise.rb:76:9:76:14 | [ensure: return] ensure | raise.rb:76:8:76:15 | [ensure: return] "ensure" |  |
+| raise.rb:76:9:76:14 | ensure | raise.rb:76:8:76:15 | "ensure" |  |
+| raise.rb:79:1:92:3 | enter m8 | raise.rb:79:8:79:8 | x |  |
+| raise.rb:79:1:92:3 | exit m8 (abnormal) | raise.rb:79:1:92:3 | exit m8 |  |
+| raise.rb:79:1:92:3 | exit m8 (normal) | raise.rb:79:1:92:3 | exit m8 |  |
+| raise.rb:79:1:92:3 | m8 | raise.rb:94:1:119:3 | m9 |  |
+| raise.rb:79:8:79:8 | x | raise.rb:80:3:80:17 | self |  |
+| raise.rb:80:3:80:17 | call to puts | raise.rb:82:8:82:8 | x |  |
+| raise.rb:80:3:80:17 | self | raise.rb:80:9:80:16 | Begin m8 |  |
+| raise.rb:80:8:80:17 | "Begin m8" | raise.rb:80:3:80:17 | call to puts |  |
+| raise.rb:80:9:80:16 | Begin m8 | raise.rb:80:8:80:17 | "Begin m8" |  |
+| raise.rb:82:5:86:7 | if ... | raise.rb:87:5:87:22 | self |  |
+| raise.rb:82:8:82:8 | x | raise.rb:82:12:82:12 | 2 |  |
+| raise.rb:82:8:82:12 | ... > ... | raise.rb:83:7:83:19 | self | true |
+| raise.rb:82:8:82:12 | ... > ... | raise.rb:84:11:84:11 | x | false |
+| raise.rb:82:8:82:12 | ... > ... | raise.rb:89:5:89:17 | [ensure: raise] self | raise |
+| raise.rb:82:12:82:12 | 2 | raise.rb:82:8:82:12 | ... > ... |  |
+| raise.rb:83:7:83:19 | call to raise | raise.rb:89:5:89:17 | [ensure: raise] self | raise |
+| raise.rb:83:7:83:19 | self | raise.rb:83:14:83:18 | x > 2 |  |
+| raise.rb:83:13:83:19 | "x > 2" | raise.rb:83:7:83:19 | call to raise |  |
+| raise.rb:83:14:83:18 | x > 2 | raise.rb:83:13:83:19 | "x > 2" |  |
+| raise.rb:84:5:85:20 | elsif ... | raise.rb:82:5:86:7 | if ... |  |
+| raise.rb:84:11:84:11 | x | raise.rb:84:15:84:15 | 0 |  |
+| raise.rb:84:11:84:15 | ... < ... | raise.rb:84:5:85:20 | elsif ... | false |
+| raise.rb:84:11:84:15 | ... < ... | raise.rb:85:15:85:19 | x < 0 | true |
+| raise.rb:84:11:84:15 | ... < ... | raise.rb:89:5:89:17 | [ensure: raise] self | raise |
+| raise.rb:84:15:84:15 | 0 | raise.rb:84:11:84:15 | ... < ... |  |
+| raise.rb:85:7:85:20 | return | raise.rb:89:5:89:17 | [ensure: return] self | return |
+| raise.rb:85:14:85:20 | "x < 0" | raise.rb:85:7:85:20 | return |  |
+| raise.rb:85:15:85:19 | x < 0 | raise.rb:85:14:85:20 | "x < 0" |  |
+| raise.rb:87:5:87:22 | call to puts | raise.rb:89:5:89:17 | [ensure: raise] self | raise |
+| raise.rb:87:5:87:22 | call to puts | raise.rb:89:5:89:17 | self |  |
+| raise.rb:87:5:87:22 | self | raise.rb:87:11:87:21 | 0 <= x <= 2 |  |
+| raise.rb:87:10:87:22 | "0 <= x <= 2" | raise.rb:87:5:87:22 | call to puts |  |
+| raise.rb:87:11:87:21 | 0 <= x <= 2 | raise.rb:87:10:87:22 | "0 <= x <= 2" |  |
+| raise.rb:88:3:89:17 | [ensure: raise] ensure ... | raise.rb:79:1:92:3 | exit m8 (abnormal) | raise |
+| raise.rb:88:3:89:17 | [ensure: return] ensure ... | raise.rb:79:1:92:3 | exit m8 (normal) | return |
+| raise.rb:88:3:89:17 | ensure ... | raise.rb:91:3:91:15 | self |  |
+| raise.rb:89:5:89:17 | [ensure: raise] call to puts | raise.rb:88:3:89:17 | [ensure: raise] ensure ... |  |
+| raise.rb:89:5:89:17 | [ensure: raise] self | raise.rb:89:11:89:16 | [ensure: raise] ensure |  |
+| raise.rb:89:5:89:17 | [ensure: return] call to puts | raise.rb:88:3:89:17 | [ensure: return] ensure ... |  |
+| raise.rb:89:5:89:17 | [ensure: return] self | raise.rb:89:11:89:16 | [ensure: return] ensure |  |
+| raise.rb:89:5:89:17 | call to puts | raise.rb:88:3:89:17 | ensure ... |  |
+| raise.rb:89:5:89:17 | self | raise.rb:89:11:89:16 | ensure |  |
+| raise.rb:89:10:89:17 | "ensure" | raise.rb:89:5:89:17 | call to puts |  |
+| raise.rb:89:10:89:17 | [ensure: raise] "ensure" | raise.rb:89:5:89:17 | [ensure: raise] call to puts |  |
+| raise.rb:89:10:89:17 | [ensure: return] "ensure" | raise.rb:89:5:89:17 | [ensure: return] call to puts |  |
+| raise.rb:89:11:89:16 | [ensure: raise] ensure | raise.rb:89:10:89:17 | [ensure: raise] "ensure" |  |
+| raise.rb:89:11:89:16 | [ensure: return] ensure | raise.rb:89:10:89:17 | [ensure: return] "ensure" |  |
+| raise.rb:89:11:89:16 | ensure | raise.rb:89:10:89:17 | "ensure" |  |
+| raise.rb:91:3:91:15 | call to puts | raise.rb:79:1:92:3 | exit m8 (normal) |  |
+| raise.rb:91:3:91:15 | self | raise.rb:91:9:91:14 | End m8 |  |
+| raise.rb:91:8:91:15 | "End m8" | raise.rb:91:3:91:15 | call to puts |  |
+| raise.rb:91:9:91:14 | End m8 | raise.rb:91:8:91:15 | "End m8" |  |
+| raise.rb:94:1:119:3 | enter m9 | raise.rb:94:8:94:8 | x |  |
+| raise.rb:94:1:119:3 | exit m9 (abnormal) | raise.rb:94:1:119:3 | exit m9 |  |
+| raise.rb:94:1:119:3 | exit m9 (normal) | raise.rb:94:1:119:3 | exit m9 |  |
+| raise.rb:94:1:119:3 | m9 | raise.rb:121:1:126:3 | m10 |  |
+| raise.rb:94:8:94:8 | x | raise.rb:94:11:94:12 | b1 |  |
+| raise.rb:94:11:94:12 | b1 | raise.rb:94:15:94:16 | b2 |  |
+| raise.rb:94:15:94:16 | b2 | raise.rb:95:3:95:17 | self |  |
+| raise.rb:95:3:95:17 | call to puts | raise.rb:97:8:97:8 | x |  |
+| raise.rb:95:3:95:17 | call to puts | raise.rb:115:3:115:22 | [ensure: raise] self | raise |
+| raise.rb:95:3:95:17 | self | raise.rb:95:9:95:16 | Begin m9 |  |
+| raise.rb:95:8:95:17 | "Begin m9" | raise.rb:95:3:95:17 | call to puts |  |
+| raise.rb:95:9:95:16 | Begin m9 | raise.rb:95:8:95:17 | "Begin m9" |  |
+| raise.rb:97:5:101:7 | if ... | raise.rb:102:5:102:22 | self |  |
+| raise.rb:97:8:97:8 | x | raise.rb:97:12:97:12 | 2 |  |
+| raise.rb:97:8:97:12 | ... > ... | raise.rb:98:7:98:19 | self | true |
+| raise.rb:97:8:97:12 | ... > ... | raise.rb:99:11:99:11 | x | false |
+| raise.rb:97:8:97:12 | ... > ... | raise.rb:104:5:104:23 | [ensure: raise] self | raise |
+| raise.rb:97:12:97:12 | 2 | raise.rb:97:8:97:12 | ... > ... |  |
+| raise.rb:98:7:98:19 | call to raise | raise.rb:104:5:104:23 | [ensure: raise] self | raise |
+| raise.rb:98:7:98:19 | self | raise.rb:98:14:98:18 | x > 2 |  |
+| raise.rb:98:13:98:19 | "x > 2" | raise.rb:98:7:98:19 | call to raise |  |
+| raise.rb:98:14:98:18 | x > 2 | raise.rb:98:13:98:19 | "x > 2" |  |
+| raise.rb:99:5:100:20 | elsif ... | raise.rb:97:5:101:7 | if ... |  |
+| raise.rb:99:11:99:11 | x | raise.rb:99:15:99:15 | 0 |  |
+| raise.rb:99:11:99:15 | ... < ... | raise.rb:99:5:100:20 | elsif ... | false |
+| raise.rb:99:11:99:15 | ... < ... | raise.rb:100:15:100:19 | x < 0 | true |
+| raise.rb:99:11:99:15 | ... < ... | raise.rb:104:5:104:23 | [ensure: raise] self | raise |
+| raise.rb:99:15:99:15 | 0 | raise.rb:99:11:99:15 | ... < ... |  |
+| raise.rb:100:7:100:20 | return | raise.rb:104:5:104:23 | [ensure: return] self | return |
+| raise.rb:100:14:100:20 | "x < 0" | raise.rb:100:7:100:20 | return |  |
+| raise.rb:100:15:100:19 | x < 0 | raise.rb:100:14:100:20 | "x < 0" |  |
+| raise.rb:102:5:102:22 | call to puts | raise.rb:104:5:104:23 | [ensure: raise] self | raise |
+| raise.rb:102:5:102:22 | call to puts | raise.rb:104:5:104:23 | self |  |
+| raise.rb:102:5:102:22 | self | raise.rb:102:11:102:21 | 0 <= x <= 2 |  |
+| raise.rb:102:10:102:22 | "0 <= x <= 2" | raise.rb:102:5:102:22 | call to puts |  |
+| raise.rb:102:11:102:21 | 0 <= x <= 2 | raise.rb:102:10:102:22 | "0 <= x <= 2" |  |
+| raise.rb:103:3:111:7 | [ensure: raise] ensure ... | raise.rb:115:3:115:22 | [ensure: raise] self | raise |
+| raise.rb:103:3:111:7 | [ensure: return] ensure ... | raise.rb:115:3:115:22 | [ensure: return] self | return |
+| raise.rb:103:3:111:7 | ensure ... | raise.rb:113:3:113:15 | self |  |
+| raise.rb:104:5:104:23 | [ensure: raise] call to puts | raise.rb:106:10:106:11 | [ensure: raise] b1 |  |
+| raise.rb:104:5:104:23 | [ensure: raise] call to puts | raise.rb:115:3:115:22 | [ensure: raise] self | raise |
+| raise.rb:104:5:104:23 | [ensure: raise] self | raise.rb:104:11:104:22 | [ensure: raise] outer ensure |  |
+| raise.rb:104:5:104:23 | [ensure: return] call to puts | raise.rb:106:10:106:11 | [ensure: return] b1 |  |
+| raise.rb:104:5:104:23 | [ensure: return] call to puts | raise.rb:115:3:115:22 | [ensure: raise] self | raise |
+| raise.rb:104:5:104:23 | [ensure: return] self | raise.rb:104:11:104:22 | [ensure: return] outer ensure |  |
+| raise.rb:104:5:104:23 | call to puts | raise.rb:106:10:106:11 | b1 |  |
+| raise.rb:104:5:104:23 | call to puts | raise.rb:115:3:115:22 | [ensure: raise] self | raise |
+| raise.rb:104:5:104:23 | self | raise.rb:104:11:104:22 | outer ensure |  |
+| raise.rb:104:10:104:23 | "outer ensure" | raise.rb:104:5:104:23 | call to puts |  |
+| raise.rb:104:10:104:23 | [ensure: raise] "outer ensure" | raise.rb:104:5:104:23 | [ensure: raise] call to puts |  |
+| raise.rb:104:10:104:23 | [ensure: return] "outer ensure" | raise.rb:104:5:104:23 | [ensure: return] call to puts |  |
+| raise.rb:104:11:104:22 | [ensure: raise] outer ensure | raise.rb:104:10:104:23 | [ensure: raise] "outer ensure" |  |
+| raise.rb:104:11:104:22 | [ensure: return] outer ensure | raise.rb:104:10:104:23 | [ensure: return] "outer ensure" |  |
+| raise.rb:104:11:104:22 | outer ensure | raise.rb:104:10:104:23 | "outer ensure" |  |
+| raise.rb:106:7:108:9 | [ensure: raise] if ... | raise.rb:110:7:110:25 | [ensure: raise] self |  |
+| raise.rb:106:7:108:9 | [ensure: return] if ... | raise.rb:110:7:110:25 | [ensure: return] self |  |
+| raise.rb:106:7:108:9 | if ... | raise.rb:110:7:110:25 | self |  |
+| raise.rb:106:10:106:11 | [ensure: raise] b1 | raise.rb:106:7:108:9 | [ensure: raise] if ... | false |
+| raise.rb:106:10:106:11 | [ensure: raise] b1 | raise.rb:107:9:107:26 | [ensure: raise] self | true |
+| raise.rb:106:10:106:11 | [ensure: return] b1 | raise.rb:106:7:108:9 | [ensure: return] if ... | false |
+| raise.rb:106:10:106:11 | [ensure: return] b1 | raise.rb:107:9:107:26 | [ensure: return] self | true |
+| raise.rb:106:10:106:11 | b1 | raise.rb:106:7:108:9 | if ... | false |
+| raise.rb:106:10:106:11 | b1 | raise.rb:107:9:107:26 | self | true |
+| raise.rb:107:9:107:26 | [ensure: raise] call to raise | raise.rb:110:7:110:25 | [ensure: raise, ensure(1): raise] self | raise |
+| raise.rb:107:9:107:26 | [ensure: raise] self | raise.rb:107:16:107:25 | [ensure: raise] b1 is true |  |
+| raise.rb:107:9:107:26 | [ensure: return] call to raise | raise.rb:110:7:110:25 | [ensure: return, ensure(1): raise] self | raise |
+| raise.rb:107:9:107:26 | [ensure: return] self | raise.rb:107:16:107:25 | [ensure: return] b1 is true |  |
+| raise.rb:107:9:107:26 | call to raise | raise.rb:110:7:110:25 | [ensure(1): raise] self | raise |
+| raise.rb:107:9:107:26 | self | raise.rb:107:16:107:25 | b1 is true |  |
+| raise.rb:107:15:107:26 | "b1 is true" | raise.rb:107:9:107:26 | call to raise |  |
+| raise.rb:107:15:107:26 | [ensure: raise] "b1 is true" | raise.rb:107:9:107:26 | [ensure: raise] call to raise |  |
+| raise.rb:107:15:107:26 | [ensure: return] "b1 is true" | raise.rb:107:9:107:26 | [ensure: return] call to raise |  |
+| raise.rb:107:16:107:25 | [ensure: raise] b1 is true | raise.rb:107:15:107:26 | [ensure: raise] "b1 is true" |  |
+| raise.rb:107:16:107:25 | [ensure: return] b1 is true | raise.rb:107:15:107:26 | [ensure: return] "b1 is true" |  |
+| raise.rb:107:16:107:25 | b1 is true | raise.rb:107:15:107:26 | "b1 is true" |  |
+| raise.rb:109:5:110:25 | [ensure(1): raise] ensure ... | raise.rb:115:3:115:22 | [ensure: raise] self | raise |
+| raise.rb:109:5:110:25 | [ensure: raise, ensure(1): raise] ensure ... | raise.rb:115:3:115:22 | [ensure: raise] self | raise |
+| raise.rb:109:5:110:25 | [ensure: raise] ensure ... | raise.rb:103:3:111:7 | [ensure: raise] ensure ... |  |
+| raise.rb:109:5:110:25 | [ensure: return, ensure(1): raise] ensure ... | raise.rb:115:3:115:22 | [ensure: raise] self | raise |
+| raise.rb:109:5:110:25 | [ensure: return] ensure ... | raise.rb:103:3:111:7 | [ensure: return] ensure ... |  |
+| raise.rb:109:5:110:25 | ensure ... | raise.rb:103:3:111:7 | ensure ... |  |
+| raise.rb:110:7:110:25 | [ensure(1): raise] call to puts | raise.rb:109:5:110:25 | [ensure(1): raise] ensure ... |  |
+| raise.rb:110:7:110:25 | [ensure(1): raise] call to puts | raise.rb:115:3:115:22 | [ensure: raise] self | raise |
+| raise.rb:110:7:110:25 | [ensure(1): raise] self | raise.rb:110:13:110:24 | [ensure(1): raise] inner ensure |  |
+| raise.rb:110:7:110:25 | [ensure: raise, ensure(1): raise] call to puts | raise.rb:109:5:110:25 | [ensure: raise, ensure(1): raise] ensure ... |  |
+| raise.rb:110:7:110:25 | [ensure: raise, ensure(1): raise] call to puts | raise.rb:115:3:115:22 | [ensure: raise] self | raise |
+| raise.rb:110:7:110:25 | [ensure: raise, ensure(1): raise] self | raise.rb:110:13:110:24 | [ensure: raise, ensure(1): raise] inner ensure |  |
+| raise.rb:110:7:110:25 | [ensure: raise] call to puts | raise.rb:109:5:110:25 | [ensure: raise] ensure ... |  |
+| raise.rb:110:7:110:25 | [ensure: raise] call to puts | raise.rb:115:3:115:22 | [ensure: raise] self | raise |
+| raise.rb:110:7:110:25 | [ensure: raise] self | raise.rb:110:13:110:24 | [ensure: raise] inner ensure |  |
+| raise.rb:110:7:110:25 | [ensure: return, ensure(1): raise] call to puts | raise.rb:109:5:110:25 | [ensure: return, ensure(1): raise] ensure ... |  |
+| raise.rb:110:7:110:25 | [ensure: return, ensure(1): raise] call to puts | raise.rb:115:3:115:22 | [ensure: raise] self | raise |
+| raise.rb:110:7:110:25 | [ensure: return, ensure(1): raise] self | raise.rb:110:13:110:24 | [ensure: return, ensure(1): raise] inner ensure |  |
+| raise.rb:110:7:110:25 | [ensure: return] call to puts | raise.rb:109:5:110:25 | [ensure: return] ensure ... |  |
+| raise.rb:110:7:110:25 | [ensure: return] call to puts | raise.rb:115:3:115:22 | [ensure: raise] self | raise |
+| raise.rb:110:7:110:25 | [ensure: return] self | raise.rb:110:13:110:24 | [ensure: return] inner ensure |  |
+| raise.rb:110:7:110:25 | call to puts | raise.rb:109:5:110:25 | ensure ... |  |
+| raise.rb:110:7:110:25 | call to puts | raise.rb:115:3:115:22 | [ensure: raise] self | raise |
+| raise.rb:110:7:110:25 | self | raise.rb:110:13:110:24 | inner ensure |  |
+| raise.rb:110:12:110:25 | "inner ensure" | raise.rb:110:7:110:25 | call to puts |  |
+| raise.rb:110:12:110:25 | [ensure(1): raise] "inner ensure" | raise.rb:110:7:110:25 | [ensure(1): raise] call to puts |  |
+| raise.rb:110:12:110:25 | [ensure: raise, ensure(1): raise] "inner ensure" | raise.rb:110:7:110:25 | [ensure: raise, ensure(1): raise] call to puts |  |
+| raise.rb:110:12:110:25 | [ensure: raise] "inner ensure" | raise.rb:110:7:110:25 | [ensure: raise] call to puts |  |
+| raise.rb:110:12:110:25 | [ensure: return, ensure(1): raise] "inner ensure" | raise.rb:110:7:110:25 | [ensure: return, ensure(1): raise] call to puts |  |
+| raise.rb:110:12:110:25 | [ensure: return] "inner ensure" | raise.rb:110:7:110:25 | [ensure: return] call to puts |  |
+| raise.rb:110:13:110:24 | [ensure(1): raise] inner ensure | raise.rb:110:12:110:25 | [ensure(1): raise] "inner ensure" |  |
+| raise.rb:110:13:110:24 | [ensure: raise, ensure(1): raise] inner ensure | raise.rb:110:12:110:25 | [ensure: raise, ensure(1): raise] "inner ensure" |  |
+| raise.rb:110:13:110:24 | [ensure: raise] inner ensure | raise.rb:110:12:110:25 | [ensure: raise] "inner ensure" |  |
+| raise.rb:110:13:110:24 | [ensure: return, ensure(1): raise] inner ensure | raise.rb:110:12:110:25 | [ensure: return, ensure(1): raise] "inner ensure" |  |
+| raise.rb:110:13:110:24 | [ensure: return] inner ensure | raise.rb:110:12:110:25 | [ensure: return] "inner ensure" |  |
+| raise.rb:110:13:110:24 | inner ensure | raise.rb:110:12:110:25 | "inner ensure" |  |
+| raise.rb:113:3:113:15 | call to puts | raise.rb:115:3:115:22 | [ensure: raise] self | raise |
+| raise.rb:113:3:113:15 | call to puts | raise.rb:115:3:115:22 | self |  |
+| raise.rb:113:3:113:15 | self | raise.rb:113:9:113:14 | End m9 |  |
+| raise.rb:113:8:113:15 | "End m9" | raise.rb:113:3:113:15 | call to puts |  |
+| raise.rb:113:9:113:14 | End m9 | raise.rb:113:8:113:15 | "End m9" |  |
+| raise.rb:114:1:118:5 | [ensure: raise] ensure ... | raise.rb:94:1:119:3 | exit m9 (abnormal) | raise |
+| raise.rb:114:1:118:5 | [ensure: return] ensure ... | raise.rb:94:1:119:3 | exit m9 (normal) | return |
+| raise.rb:114:1:118:5 | ensure ... | raise.rb:94:1:119:3 | exit m9 (normal) |  |
+| raise.rb:115:3:115:22 | [ensure: raise] call to puts | raise.rb:116:6:116:7 | [ensure: raise] b2 |  |
+| raise.rb:115:3:115:22 | [ensure: raise] self | raise.rb:115:9:115:21 | [ensure: raise] method ensure |  |
+| raise.rb:115:3:115:22 | [ensure: return] call to puts | raise.rb:116:6:116:7 | [ensure: return] b2 |  |
+| raise.rb:115:3:115:22 | [ensure: return] self | raise.rb:115:9:115:21 | [ensure: return] method ensure |  |
+| raise.rb:115:3:115:22 | call to puts | raise.rb:116:6:116:7 | b2 |  |
+| raise.rb:115:3:115:22 | self | raise.rb:115:9:115:21 | method ensure |  |
+| raise.rb:115:8:115:22 | "method ensure" | raise.rb:115:3:115:22 | call to puts |  |
+| raise.rb:115:8:115:22 | [ensure: raise] "method ensure" | raise.rb:115:3:115:22 | [ensure: raise] call to puts |  |
+| raise.rb:115:8:115:22 | [ensure: return] "method ensure" | raise.rb:115:3:115:22 | [ensure: return] call to puts |  |
+| raise.rb:115:9:115:21 | [ensure: raise] method ensure | raise.rb:115:8:115:22 | [ensure: raise] "method ensure" |  |
+| raise.rb:115:9:115:21 | [ensure: return] method ensure | raise.rb:115:8:115:22 | [ensure: return] "method ensure" |  |
+| raise.rb:115:9:115:21 | method ensure | raise.rb:115:8:115:22 | "method ensure" |  |
+| raise.rb:116:3:118:5 | [ensure: raise] if ... | raise.rb:114:1:118:5 | [ensure: raise] ensure ... |  |
+| raise.rb:116:3:118:5 | [ensure: return] if ... | raise.rb:114:1:118:5 | [ensure: return] ensure ... |  |
+| raise.rb:116:3:118:5 | if ... | raise.rb:114:1:118:5 | ensure ... |  |
+| raise.rb:116:6:116:7 | [ensure: raise] b2 | raise.rb:116:3:118:5 | [ensure: raise] if ... | false |
+| raise.rb:116:6:116:7 | [ensure: raise] b2 | raise.rb:117:5:117:22 | [ensure: raise] self | true |
+| raise.rb:116:6:116:7 | [ensure: return] b2 | raise.rb:116:3:118:5 | [ensure: return] if ... | false |
+| raise.rb:116:6:116:7 | [ensure: return] b2 | raise.rb:117:5:117:22 | [ensure: return] self | true |
+| raise.rb:116:6:116:7 | b2 | raise.rb:116:3:118:5 | if ... | false |
+| raise.rb:116:6:116:7 | b2 | raise.rb:117:5:117:22 | self | true |
+| raise.rb:117:5:117:22 | [ensure: raise] call to raise | raise.rb:94:1:119:3 | exit m9 (abnormal) | raise |
+| raise.rb:117:5:117:22 | [ensure: raise] self | raise.rb:117:12:117:21 | [ensure: raise] b2 is true |  |
+| raise.rb:117:5:117:22 | [ensure: return] call to raise | raise.rb:94:1:119:3 | exit m9 (abnormal) | raise |
+| raise.rb:117:5:117:22 | [ensure: return] self | raise.rb:117:12:117:21 | [ensure: return] b2 is true |  |
+| raise.rb:117:5:117:22 | call to raise | raise.rb:94:1:119:3 | exit m9 (abnormal) | raise |
+| raise.rb:117:5:117:22 | self | raise.rb:117:12:117:21 | b2 is true |  |
+| raise.rb:117:11:117:22 | "b2 is true" | raise.rb:117:5:117:22 | call to raise |  |
+| raise.rb:117:11:117:22 | [ensure: raise] "b2 is true" | raise.rb:117:5:117:22 | [ensure: raise] call to raise |  |
+| raise.rb:117:11:117:22 | [ensure: return] "b2 is true" | raise.rb:117:5:117:22 | [ensure: return] call to raise |  |
+| raise.rb:117:12:117:21 | [ensure: raise] b2 is true | raise.rb:117:11:117:22 | [ensure: raise] "b2 is true" |  |
+| raise.rb:117:12:117:21 | [ensure: return] b2 is true | raise.rb:117:11:117:22 | [ensure: return] "b2 is true" |  |
+| raise.rb:117:12:117:21 | b2 is true | raise.rb:117:11:117:22 | "b2 is true" |  |
+| raise.rb:121:1:126:3 | enter m10 | raise.rb:121:9:121:9 | p |  |
+| raise.rb:121:1:126:3 | exit m10 (abnormal) | raise.rb:121:1:126:3 | exit m10 |  |
+| raise.rb:121:1:126:3 | exit m10 (normal) | raise.rb:121:1:126:3 | exit m10 |  |
+| raise.rb:121:1:126:3 | m10 | raise.rb:128:1:140:3 | m11 |  |
+| raise.rb:121:9:121:9 | p | raise.rb:121:14:121:30 | self | false, no-match, true |
+| raise.rb:121:9:121:9 | p | raise.rb:125:3:125:51 | self | match |
+| raise.rb:121:14:121:30 | call to raise | raise.rb:121:1:126:3 | exit m10 (abnormal) | raise |
+| raise.rb:121:14:121:30 | self | raise.rb:121:21:121:29 | Exception |  |
+| raise.rb:121:20:121:30 | "Exception" | raise.rb:121:14:121:30 | call to raise |  |
+| raise.rb:121:21:121:29 | Exception | raise.rb:121:20:121:30 | "Exception" |  |
+| raise.rb:124:1:125:51 | ensure ... | raise.rb:121:1:126:3 | exit m10 (normal) |  |
+| raise.rb:125:3:125:51 | call to puts | raise.rb:124:1:125:51 | ensure ... |  |
+| raise.rb:125:3:125:51 | self | raise.rb:125:9:125:50 | Will not get executed if p is not supplied |  |
+| raise.rb:125:8:125:51 | "Will not get executed if p is..." | raise.rb:125:3:125:51 | call to puts |  |
+| raise.rb:125:9:125:50 | Will not get executed if p is not supplied | raise.rb:125:8:125:51 | "Will not get executed if p is..." |  |
+| raise.rb:128:1:140:3 | enter m11 | raise.rb:128:9:128:9 | b |  |
+| raise.rb:128:1:140:3 | exit m11 (abnormal) | raise.rb:128:1:140:3 | exit m11 |  |
+| raise.rb:128:1:140:3 | exit m11 (normal) | raise.rb:128:1:140:3 | exit m11 |  |
+| raise.rb:128:1:140:3 | m11 | raise.rb:142:1:148:3 | m12 |  |
+| raise.rb:128:9:128:9 | b | raise.rb:130:8:130:8 | b |  |
+| raise.rb:130:5:132:7 | if ... | raise.rb:137:5:137:17 | self |  |
+| raise.rb:130:8:130:8 | b | raise.rb:130:5:132:7 | if ... | false |
+| raise.rb:130:8:130:8 | b | raise.rb:131:7:131:22 | self | true |
+| raise.rb:131:7:131:22 | call to raise | raise.rb:133:10:133:19 | ExceptionA | raise |
+| raise.rb:131:7:131:22 | self | raise.rb:131:13:131:22 | ExceptionA |  |
+| raise.rb:131:13:131:22 | ExceptionA | raise.rb:131:7:131:22 | call to raise |  |
+| raise.rb:133:3:133:19 | rescue ... | raise.rb:137:5:137:17 | self |  |
+| raise.rb:133:10:133:19 | ExceptionA | raise.rb:133:3:133:19 | rescue ... | match |
+| raise.rb:133:10:133:19 | ExceptionA | raise.rb:134:10:134:19 | ExceptionB | no-match |
+| raise.rb:134:3:135:21 | rescue ... | raise.rb:137:5:137:17 | self |  |
+| raise.rb:134:10:134:19 | ExceptionB | raise.rb:135:5:135:21 | self | match |
+| raise.rb:134:10:134:19 | ExceptionB | raise.rb:137:5:137:17 | [ensure: raise] self | raise |
+| raise.rb:134:20:135:21 | then ... | raise.rb:134:3:135:21 | rescue ... |  |
+| raise.rb:135:5:135:21 | call to puts | raise.rb:134:20:135:21 | then ... |  |
+| raise.rb:135:5:135:21 | self | raise.rb:135:11:135:20 | ExceptionB |  |
+| raise.rb:135:10:135:21 | "ExceptionB" | raise.rb:135:5:135:21 | call to puts |  |
+| raise.rb:135:11:135:20 | ExceptionB | raise.rb:135:10:135:21 | "ExceptionB" |  |
+| raise.rb:136:3:137:17 | [ensure: raise] ensure ... | raise.rb:128:1:140:3 | exit m11 (abnormal) | raise |
+| raise.rb:136:3:137:17 | ensure ... | raise.rb:139:3:139:16 | self |  |
+| raise.rb:137:5:137:17 | [ensure: raise] call to puts | raise.rb:136:3:137:17 | [ensure: raise] ensure ... |  |
+| raise.rb:137:5:137:17 | [ensure: raise] self | raise.rb:137:11:137:16 | [ensure: raise] Ensure |  |
+| raise.rb:137:5:137:17 | call to puts | raise.rb:136:3:137:17 | ensure ... |  |
+| raise.rb:137:5:137:17 | self | raise.rb:137:11:137:16 | Ensure |  |
+| raise.rb:137:10:137:17 | "Ensure" | raise.rb:137:5:137:17 | call to puts |  |
+| raise.rb:137:10:137:17 | [ensure: raise] "Ensure" | raise.rb:137:5:137:17 | [ensure: raise] call to puts |  |
+| raise.rb:137:11:137:16 | Ensure | raise.rb:137:10:137:17 | "Ensure" |  |
+| raise.rb:137:11:137:16 | [ensure: raise] Ensure | raise.rb:137:10:137:17 | [ensure: raise] "Ensure" |  |
+| raise.rb:139:3:139:16 | call to puts | raise.rb:128:1:140:3 | exit m11 (normal) |  |
+| raise.rb:139:3:139:16 | self | raise.rb:139:9:139:15 | End m11 |  |
+| raise.rb:139:8:139:16 | "End m11" | raise.rb:139:3:139:16 | call to puts |  |
+| raise.rb:139:9:139:15 | End m11 | raise.rb:139:8:139:16 | "End m11" |  |
+| raise.rb:142:1:148:3 | enter m12 | raise.rb:142:9:142:9 | b |  |
+| raise.rb:142:1:148:3 | exit m12 (normal) | raise.rb:142:1:148:3 | exit m12 |  |
+| raise.rb:142:1:148:3 | m12 | raise.rb:150:1:152:3 | m13 |  |
+| raise.rb:142:9:142:9 | b | raise.rb:143:6:143:6 | b |  |
+| raise.rb:143:3:145:5 | if ... | raise.rb:147:10:147:10 | 3 |  |
+| raise.rb:143:6:143:6 | b | raise.rb:143:3:145:5 | if ... | false |
+| raise.rb:143:6:143:6 | b | raise.rb:144:5:144:12 | self | true |
+| raise.rb:144:5:144:12 | call to raise | raise.rb:147:10:147:10 | [ensure: raise] 3 | raise |
+| raise.rb:144:5:144:12 | self | raise.rb:144:11:144:12 | "" |  |
+| raise.rb:144:11:144:12 | "" | raise.rb:144:5:144:12 | call to raise |  |
+| raise.rb:147:3:147:10 | [ensure: raise] return | raise.rb:142:1:148:3 | exit m12 (normal) | return |
+| raise.rb:147:3:147:10 | return | raise.rb:142:1:148:3 | exit m12 (normal) | return |
+| raise.rb:147:10:147:10 | 3 | raise.rb:147:3:147:10 | return |  |
+| raise.rb:147:10:147:10 | [ensure: raise] 3 | raise.rb:147:3:147:10 | [ensure: raise] return |  |
+| raise.rb:150:1:152:3 | enter m13 | raise.rb:151:1:151:6 | ensure ... |  |
+| raise.rb:150:1:152:3 | exit m13 (normal) | raise.rb:150:1:152:3 | exit m13 |  |
+| raise.rb:150:1:152:3 | m13 | raise.rb:154:1:156:3 | m14 |  |
+| raise.rb:151:1:151:6 | ensure ... | raise.rb:150:1:152:3 | exit m13 (normal) |  |
+| raise.rb:154:1:156:3 | enter m14 | raise.rb:154:9:154:15 | element |  |
+| raise.rb:154:1:156:3 | exit m14 (normal) | raise.rb:154:1:156:3 | exit m14 |  |
+| raise.rb:154:1:156:3 | m14 | raise.rb:158:1:164:3 | m15 |  |
+| raise.rb:154:9:154:15 | element | raise.rb:155:3:155:9 | element |  |
+| raise.rb:155:3:155:9 | element | raise.rb:155:16:155:50 | { ... } |  |
+| raise.rb:155:3:155:50 | call to each | raise.rb:154:1:156:3 | exit m14 (normal) |  |
+| raise.rb:155:16:155:50 | enter { ... } | raise.rb:155:19:155:22 | elem |  |
+| raise.rb:155:16:155:50 | exit { ... } (abnormal) | raise.rb:155:16:155:50 | exit { ... } |  |
+| raise.rb:155:16:155:50 | exit { ... } (normal) | raise.rb:155:16:155:50 | exit { ... } |  |
+| raise.rb:155:16:155:50 | { ... } | raise.rb:155:3:155:50 | call to each |  |
+| raise.rb:155:19:155:22 | elem | raise.rb:155:37:155:43 | element |  |
+| raise.rb:155:25:155:32 | call to raise | raise.rb:155:16:155:50 | exit { ... } (abnormal) | raise |
+| raise.rb:155:25:155:32 | self | raise.rb:155:31:155:32 | "" |  |
+| raise.rb:155:25:155:48 | ... if ... | raise.rb:155:16:155:50 | exit { ... } (normal) |  |
+| raise.rb:155:31:155:32 | "" | raise.rb:155:25:155:32 | call to raise |  |
+| raise.rb:155:37:155:43 | element | raise.rb:155:37:155:48 | call to nil? |  |
+| raise.rb:155:37:155:48 | call to nil? | raise.rb:155:25:155:32 | self | true |
+| raise.rb:155:37:155:48 | call to nil? | raise.rb:155:25:155:48 | ... if ... | false |
+| raise.rb:158:1:164:3 | enter m15 | raise.rb:159:3:163:5 | self |  |
+| raise.rb:158:1:164:3 | exit m15 (normal) | raise.rb:158:1:164:3 | exit m15 |  |
+| raise.rb:158:1:164:3 | m15 | raise.rb:166:1:170:3 | C |  |
+| raise.rb:159:3:163:5 | call to foo | raise.rb:158:1:164:3 | exit m15 (normal) |  |
+| raise.rb:159:3:163:5 | self | raise.rb:159:7:163:5 | do ... end |  |
+| raise.rb:159:7:163:5 | do ... end | raise.rb:159:3:163:5 | call to foo |  |
+| raise.rb:159:7:163:5 | enter do ... end | raise.rb:160:5:162:7 | self |  |
+| raise.rb:159:7:163:5 | exit do ... end (normal) | raise.rb:159:7:163:5 | exit do ... end |  |
+| raise.rb:160:5:162:7 | call to bar | raise.rb:159:7:163:5 | exit do ... end (normal) |  |
+| raise.rb:160:5:162:7 | self | raise.rb:160:9:162:7 | -> { ... } |  |
+| raise.rb:160:9:162:7 | -> { ... } | raise.rb:160:5:162:7 | call to bar |  |
+| raise.rb:160:9:162:7 | enter -> { ... } | raise.rb:160:12:160:12 | x |  |
+| raise.rb:160:9:162:7 | exit -> { ... } (abnormal) | raise.rb:160:9:162:7 | exit -> { ... } |  |
+| raise.rb:160:9:162:7 | exit -> { ... } (normal) | raise.rb:160:9:162:7 | exit -> { ... } |  |
+| raise.rb:160:12:160:12 | x | raise.rb:161:23:161:23 | x |  |
+| raise.rb:161:7:161:14 | call to raise | raise.rb:160:9:162:7 | exit -> { ... } (abnormal) | raise |
+| raise.rb:161:7:161:14 | self | raise.rb:161:13:161:14 | "" |  |
+| raise.rb:161:7:161:23 | ... unless ... | raise.rb:160:9:162:7 | exit -> { ... } (normal) |  |
+| raise.rb:161:13:161:14 | "" | raise.rb:161:7:161:14 | call to raise |  |
+| raise.rb:161:23:161:23 | x | raise.rb:161:7:161:14 | self | false |
+| raise.rb:161:23:161:23 | x | raise.rb:161:7:161:23 | ... unless ... | true |
+| raise.rb:166:1:170:3 | C | raise.rb:167:7:167:10 | self |  |
+| raise.rb:167:3:169:5 | enter m | raise.rb:168:5:168:12 | self |  |
+| raise.rb:167:3:169:5 | exit m (abnormal) | raise.rb:167:3:169:5 | exit m |  |
+| raise.rb:167:3:169:5 | m | raise.rb:172:1:182:3 | m16 |  |
+| raise.rb:167:7:167:10 | self | raise.rb:167:3:169:5 | m |  |
+| raise.rb:168:5:168:12 | call to raise | raise.rb:167:3:169:5 | exit m (abnormal) | raise |
+| raise.rb:168:5:168:12 | self | raise.rb:168:11:168:12 | "" |  |
+| raise.rb:168:11:168:12 | "" | raise.rb:168:5:168:12 | call to raise |  |
+| raise.rb:172:1:182:3 | enter m16 | raise.rb:172:9:172:10 | b1 |  |
+| raise.rb:172:1:182:3 | exit m16 (abnormal) | raise.rb:172:1:182:3 | exit m16 |  |
+| raise.rb:172:1:182:3 | exit m16 (normal) | raise.rb:172:1:182:3 | exit m16 |  |
+| raise.rb:172:1:182:3 | m16 | raise.rb:1:1:182:4 | exit raise.rb (normal) |  |
+| raise.rb:172:9:172:10 | b1 | raise.rb:172:13:172:14 | b2 |  |
+| raise.rb:172:13:172:14 | b2 | raise.rb:174:8:174:9 | b1 |  |
+| raise.rb:174:8:174:9 | b1 | raise.rb:174:8:174:23 | [true] ... \|\| ... | true |
+| raise.rb:174:8:174:9 | b1 | raise.rb:174:14:174:15 | b2 | false |
+| raise.rb:174:8:174:23 | [false] ... \|\| ... | raise.rb:177:14:177:14 | 2 | false |
+| raise.rb:174:8:174:23 | [false] ... \|\| ... | raise.rb:179:10:179:19 | ExceptionA | raise |
+| raise.rb:174:8:174:23 | [true] ... \|\| ... | raise.rb:175:14:175:14 | 1 | true |
+| raise.rb:174:8:174:23 | [true] ... \|\| ... | raise.rb:179:10:179:19 | ExceptionA | raise |
+| raise.rb:174:14:174:15 | b2 | raise.rb:174:20:174:23 | true |  |
+| raise.rb:174:14:174:23 | ... == ... | raise.rb:174:8:174:23 | [false] ... \|\| ... | false |
+| raise.rb:174:14:174:23 | ... == ... | raise.rb:174:8:174:23 | [true] ... \|\| ... | true |
+| raise.rb:174:14:174:23 | ... == ... | raise.rb:179:10:179:19 | ExceptionA | raise |
+| raise.rb:174:20:174:23 | true | raise.rb:174:14:174:23 | ... == ... |  |
+| raise.rb:175:7:175:14 | return | raise.rb:172:1:182:3 | exit m16 (normal) | return |
+| raise.rb:175:14:175:14 | 1 | raise.rb:175:7:175:14 | return |  |
+| raise.rb:177:7:177:14 | return | raise.rb:172:1:182:3 | exit m16 (normal) | return |
+| raise.rb:177:14:177:14 | 2 | raise.rb:177:7:177:14 | return |  |
+| raise.rb:179:10:179:19 | ExceptionA | raise.rb:172:1:182:3 | exit m16 (abnormal) | raise |
+| raise.rb:179:10:179:19 | ExceptionA | raise.rb:180:12:180:12 | 3 | match |
+| raise.rb:180:5:180:12 | return | raise.rb:172:1:182:3 | exit m16 (normal) | return |
+| raise.rb:180:12:180:12 | 3 | raise.rb:180:5:180:12 | return |  |
diff --git a/ruby/ql/test/library-tests/controlflow/graph/Cfg.ql b/ruby/ql/test/library-tests/controlflow/graph/Cfg.ql
index 5e7dfe69d87..39d0627613e 100644
--- a/ruby/ql/test/library-tests/controlflow/graph/Cfg.ql
+++ b/ruby/ql/test/library-tests/controlflow/graph/Cfg.ql
@@ -1,11 +1,2 @@
-/**
- * @kind graph
- */
-
 import codeql.ruby.CFG
-
-class MyRelevantNode extends CfgNode {
-  string getOrderDisambiguation() { result = "" }
-}
-
-import codeql.ruby.controlflow.internal.ControlFlowGraphImpl::TestOutput<MyRelevantNode>
+import codeql.ruby.controlflow.internal.ControlFlowGraphImpl::TestOutput<CfgNode>
diff --git a/ruby/ql/test/library-tests/dataflow/array-flow/type-tracking-array-flow.expected b/ruby/ql/test/library-tests/dataflow/array-flow/type-tracking-array-flow.expected
index 9750c7a94b2..08bd543b2cd 100644
--- a/ruby/ql/test/library-tests/dataflow/array-flow/type-tracking-array-flow.expected
+++ b/ruby/ql/test/library-tests/dataflow/array-flow/type-tracking-array-flow.expected
@@ -1,37 +1,37 @@
 testFailures
 | array_flow.rb:107:10:107:13 | ...[...] | Unexpected result: hasValueFlow=11.2 |
-| array_flow.rb:179:28:179:46 | # $ hasValueFlow=19 | Missing result:hasValueFlow=19 |
-| array_flow.rb:180:28:180:46 | # $ hasValueFlow=19 | Missing result:hasValueFlow=19 |
+| array_flow.rb:179:28:179:46 | # $ hasValueFlow=19 | Missing result: hasValueFlow=19 |
+| array_flow.rb:180:28:180:46 | # $ hasValueFlow=19 | Missing result: hasValueFlow=19 |
 | array_flow.rb:226:10:226:13 | ...[...] | Unexpected result: hasValueFlow=25 |
 | array_flow.rb:319:10:319:13 | ...[...] | Unexpected result: hasValueFlow=36.1 |
 | array_flow.rb:320:10:320:13 | ...[...] | Unexpected result: hasValueFlow=36.1 |
 | array_flow.rb:321:10:321:13 | ...[...] | Unexpected result: hasValueFlow=36.1 |
 | array_flow.rb:328:10:328:13 | ...[...] | Unexpected result: hasValueFlow=37.1 |
-| array_flow.rb:360:22:360:42 | # $ hasValueFlow=40.2 | Missing result:hasValueFlow=40.2 |
+| array_flow.rb:360:22:360:42 | # $ hasValueFlow=40.2 | Missing result: hasValueFlow=40.2 |
 | array_flow.rb:486:10:486:13 | ...[...] | Unexpected result: hasValueFlow=54.2 |
 | array_flow.rb:490:10:490:13 | ...[...] | Unexpected result: hasValueFlow=54.2 |
 | array_flow.rb:490:10:490:13 | ...[...] | Unexpected result: hasValueFlow=54.3 |
 | array_flow.rb:494:10:494:13 | ...[...] | Unexpected result: hasValueFlow=54.2 |
 | array_flow.rb:494:10:494:13 | ...[...] | Unexpected result: hasValueFlow=54.3 |
-| array_flow.rb:586:16:586:34 | # $ hasValueFlow=63 | Missing result:hasValueFlow=63 |
-| array_flow.rb:591:19:591:37 | # $ hasValueFlow=64 | Missing result:hasValueFlow=64 |
-| array_flow.rb:593:16:593:34 | # $ hasValueFlow=64 | Missing result:hasValueFlow=64 |
-| array_flow.rb:594:19:594:47 | # $ SPURIOUS: hasValueFlow=64 | Fixed spurious result:hasValueFlow=64 |
-| array_flow.rb:595:16:595:34 | # $ hasValueFlow=64 | Missing result:hasValueFlow=64 |
-| array_flow.rb:596:19:596:47 | # $ SPURIOUS: hasValueFlow=64 | Fixed spurious result:hasValueFlow=64 |
+| array_flow.rb:586:16:586:34 | # $ hasValueFlow=63 | Missing result: hasValueFlow=63 |
+| array_flow.rb:591:19:591:37 | # $ hasValueFlow=64 | Missing result: hasValueFlow=64 |
+| array_flow.rb:593:16:593:34 | # $ hasValueFlow=64 | Missing result: hasValueFlow=64 |
+| array_flow.rb:594:19:594:47 | # $ SPURIOUS: hasValueFlow=64 | Fixed spurious result: hasValueFlow=64 |
+| array_flow.rb:595:16:595:34 | # $ hasValueFlow=64 | Missing result: hasValueFlow=64 |
+| array_flow.rb:596:19:596:47 | # $ SPURIOUS: hasValueFlow=64 | Fixed spurious result: hasValueFlow=64 |
 | array_flow.rb:659:10:659:13 | ...[...] | Unexpected result: hasValueFlow=70.1 |
 | array_flow.rb:664:10:664:13 | ...[...] | Unexpected result: hasValueFlow=70.1 |
-| array_flow.rb:871:18:871:36 | # $ hasValueFlow=87 | Missing result:hasValueFlow=87 |
-| array_flow.rb:872:18:872:36 | # $ hasValueFlow=87 | Missing result:hasValueFlow=87 |
+| array_flow.rb:871:18:871:36 | # $ hasValueFlow=87 | Missing result: hasValueFlow=87 |
+| array_flow.rb:872:18:872:36 | # $ hasValueFlow=87 | Missing result: hasValueFlow=87 |
 | array_flow.rb:928:10:928:13 | ...[...] | Unexpected result: hasValueFlow=90.1 |
-| array_flow.rb:939:18:939:78 | # $ hasValueFlow=91.1 $ hasValueFlow=91.2 $ hasValueFlow=91.3 | Missing result:hasValueFlow=91.1 |
-| array_flow.rb:939:18:939:78 | # $ hasValueFlow=91.1 $ hasValueFlow=91.2 $ hasValueFlow=91.3 | Missing result:hasValueFlow=91.2 |
-| array_flow.rb:939:18:939:78 | # $ hasValueFlow=91.1 $ hasValueFlow=91.2 $ hasValueFlow=91.3 | Missing result:hasValueFlow=91.3 |
-| array_flow.rb:940:18:940:78 | # $ hasValueFlow=91.1 $ hasValueFlow=91.2 $ hasValueFlow=91.3 | Missing result:hasValueFlow=91.1 |
-| array_flow.rb:940:18:940:78 | # $ hasValueFlow=91.1 $ hasValueFlow=91.2 $ hasValueFlow=91.3 | Missing result:hasValueFlow=91.2 |
-| array_flow.rb:940:18:940:78 | # $ hasValueFlow=91.1 $ hasValueFlow=91.2 $ hasValueFlow=91.3 | Missing result:hasValueFlow=91.3 |
-| array_flow.rb:957:28:957:46 | # $ hasValueFlow=93 | Missing result:hasValueFlow=93 |
-| array_flow.rb:958:28:958:46 | # $ hasValueFlow=93 | Missing result:hasValueFlow=93 |
+| array_flow.rb:939:18:939:78 | # $ hasValueFlow=91.1 $ hasValueFlow=91.2 $ hasValueFlow=91.3 | Missing result: hasValueFlow=91.1 |
+| array_flow.rb:939:18:939:78 | # $ hasValueFlow=91.1 $ hasValueFlow=91.2 $ hasValueFlow=91.3 | Missing result: hasValueFlow=91.2 |
+| array_flow.rb:939:18:939:78 | # $ hasValueFlow=91.1 $ hasValueFlow=91.2 $ hasValueFlow=91.3 | Missing result: hasValueFlow=91.3 |
+| array_flow.rb:940:18:940:78 | # $ hasValueFlow=91.1 $ hasValueFlow=91.2 $ hasValueFlow=91.3 | Missing result: hasValueFlow=91.1 |
+| array_flow.rb:940:18:940:78 | # $ hasValueFlow=91.1 $ hasValueFlow=91.2 $ hasValueFlow=91.3 | Missing result: hasValueFlow=91.2 |
+| array_flow.rb:940:18:940:78 | # $ hasValueFlow=91.1 $ hasValueFlow=91.2 $ hasValueFlow=91.3 | Missing result: hasValueFlow=91.3 |
+| array_flow.rb:957:28:957:46 | # $ hasValueFlow=93 | Missing result: hasValueFlow=93 |
+| array_flow.rb:958:28:958:46 | # $ hasValueFlow=93 | Missing result: hasValueFlow=93 |
 | array_flow.rb:1099:10:1099:13 | ...[...] | Unexpected result: hasValueFlow=105.2 |
 | array_flow.rb:1100:10:1100:13 | ...[...] | Unexpected result: hasValueFlow=105.3 |
 | array_flow.rb:1110:10:1110:13 | ...[...] | Unexpected result: hasValueFlow=105.2 |
@@ -53,16 +53,16 @@ testFailures
 | array_flow.rb:1346:10:1346:13 | ...[...] | Unexpected result: hasValueFlow=112.1 |
 | array_flow.rb:1457:10:1457:13 | ...[...] | Unexpected result: hasValueFlow=121.2 |
 | array_flow.rb:1458:10:1458:13 | ...[...] | Unexpected result: hasValueFlow=121.2 |
-| array_flow.rb:1512:18:1512:39 | # $ hasValueFlow=128.1 | Missing result:hasValueFlow=128.1 |
-| array_flow.rb:1513:18:1513:39 | # $ hasValueFlow=128.2 | Missing result:hasValueFlow=128.2 |
-| array_flow.rb:1514:18:1514:39 | # $ hasValueFlow=128.3 | Missing result:hasValueFlow=128.3 |
+| array_flow.rb:1512:18:1512:39 | # $ hasValueFlow=128.1 | Missing result: hasValueFlow=128.1 |
+| array_flow.rb:1513:18:1513:39 | # $ hasValueFlow=128.2 | Missing result: hasValueFlow=128.2 |
+| array_flow.rb:1514:18:1514:39 | # $ hasValueFlow=128.3 | Missing result: hasValueFlow=128.3 |
 | array_flow.rb:1565:10:1565:13 | ...[...] | Unexpected result: hasValueFlow=132.1 |
-| array_flow.rb:1601:18:1601:39 | # $ hasValueFlow=134.3 | Missing result:hasValueFlow=134.3 |
-| array_flow.rb:1602:18:1602:39 | # $ hasValueFlow=134.2 | Missing result:hasValueFlow=134.2 |
-| array_flow.rb:1603:18:1603:39 | # $ hasValueFlow=134.1 | Missing result:hasValueFlow=134.1 |
-| array_flow.rb:1623:19:1623:40 | # $ hasValueFlow=136.1 | Missing result:hasValueFlow=136.1 |
-| array_flow.rb:1626:19:1626:70 | # $ hasValueFlow=136.2 $ SPURIOUS hasValueFlow=136.1 | Missing result:hasValueFlow=136.1 |
-| array_flow.rb:1626:19:1626:70 | # $ hasValueFlow=136.2 $ SPURIOUS hasValueFlow=136.1 | Missing result:hasValueFlow=136.2 |
-| array_flow.rb:1627:19:1627:40 | # $ hasValueFlow=136.1 | Missing result:hasValueFlow=136.1 |
-| array_flow.rb:1699:13:1699:32 | # $ hasValueFlow=143 | Missing result:hasValueFlow=143 |
+| array_flow.rb:1601:18:1601:39 | # $ hasValueFlow=134.3 | Missing result: hasValueFlow=134.3 |
+| array_flow.rb:1602:18:1602:39 | # $ hasValueFlow=134.2 | Missing result: hasValueFlow=134.2 |
+| array_flow.rb:1603:18:1603:39 | # $ hasValueFlow=134.1 | Missing result: hasValueFlow=134.1 |
+| array_flow.rb:1623:19:1623:40 | # $ hasValueFlow=136.1 | Missing result: hasValueFlow=136.1 |
+| array_flow.rb:1626:19:1626:70 | # $ hasValueFlow=136.2 $ SPURIOUS hasValueFlow=136.1 | Missing result: hasValueFlow=136.1 |
+| array_flow.rb:1626:19:1626:70 | # $ hasValueFlow=136.2 $ SPURIOUS hasValueFlow=136.1 | Missing result: hasValueFlow=136.2 |
+| array_flow.rb:1627:19:1627:40 | # $ hasValueFlow=136.1 | Missing result: hasValueFlow=136.1 |
+| array_flow.rb:1699:13:1699:32 | # $ hasValueFlow=143 | Missing result: hasValueFlow=143 |
 failures
diff --git a/ruby/ql/test/library-tests/dataflow/flow-summaries/semantics.expected b/ruby/ql/test/library-tests/dataflow/flow-summaries/semantics.expected
index 63f33ab5b55..95bac1978fb 100644
--- a/ruby/ql/test/library-tests/dataflow/flow-summaries/semantics.expected
+++ b/ruby/ql/test/library-tests/dataflow/flow-summaries/semantics.expected
@@ -78,14 +78,10 @@ edges
 | semantics.rb:60:5:60:5 | a | semantics.rb:66:14:66:15 | &... | provenance |  |
 | semantics.rb:60:9:60:18 | call to source | semantics.rb:60:5:60:5 | a | provenance |  |
 | semantics.rb:60:9:60:18 | call to source | semantics.rb:60:5:60:5 | a | provenance |  |
-| semantics.rb:61:10:61:15 | call to s10 [element 0] | semantics.rb:61:10:61:15 | call to s10 | provenance |  |
 | semantics.rb:61:14:61:14 | a | semantics.rb:61:10:61:15 | call to s10 | provenance |  |
 | semantics.rb:61:14:61:14 | a | semantics.rb:61:10:61:15 | call to s10 | provenance |  |
-| semantics.rb:61:14:61:14 | a | semantics.rb:61:10:61:15 | call to s10 [element 0] | provenance |  |
-| semantics.rb:62:10:62:18 | call to s10 [element 1] | semantics.rb:62:10:62:18 | call to s10 | provenance |  |
 | semantics.rb:62:17:62:17 | a | semantics.rb:62:10:62:18 | call to s10 | provenance |  |
 | semantics.rb:62:17:62:17 | a | semantics.rb:62:10:62:18 | call to s10 | provenance |  |
-| semantics.rb:62:17:62:17 | a | semantics.rb:62:10:62:18 | call to s10 [element 1] | provenance |  |
 | semantics.rb:63:19:63:19 | a | semantics.rb:63:10:63:20 | call to s10 | provenance |  |
 | semantics.rb:63:19:63:19 | a | semantics.rb:63:10:63:20 | call to s10 | provenance |  |
 | semantics.rb:64:27:64:27 | a | semantics.rb:64:10:64:28 | call to s10 | provenance |  |
@@ -192,10 +188,8 @@ edges
 | semantics.rb:126:5:126:5 | b | semantics.rb:129:17:129:17 | b | provenance |  |
 | semantics.rb:126:9:126:18 | call to source | semantics.rb:126:5:126:5 | b | provenance |  |
 | semantics.rb:126:9:126:18 | call to source | semantics.rb:126:5:126:5 | b | provenance |  |
-| semantics.rb:127:10:127:18 | call to s17 [element 0] | semantics.rb:127:10:127:18 | call to s17 | provenance |  |
-| semantics.rb:127:10:127:18 | call to s17 [element 1] | semantics.rb:127:10:127:18 | call to s17 | provenance |  |
-| semantics.rb:127:14:127:14 | a | semantics.rb:127:10:127:18 | call to s17 [element 0] | provenance |  |
-| semantics.rb:127:17:127:17 | b | semantics.rb:127:10:127:18 | call to s17 [element 1] | provenance |  |
+| semantics.rb:127:14:127:14 | a | semantics.rb:127:10:127:18 | call to s17 | provenance |  |
+| semantics.rb:127:17:127:17 | b | semantics.rb:127:10:127:18 | call to s17 | provenance |  |
 | semantics.rb:128:10:128:18 | call to s17 [element 0] | semantics.rb:128:10:128:21 | ...[...] | provenance |  |
 | semantics.rb:128:10:128:18 | call to s17 [element 0] | semantics.rb:128:10:128:21 | ...[...] | provenance |  |
 | semantics.rb:128:14:128:14 | a | semantics.rb:128:10:128:18 | call to s17 [element 0] | provenance |  |
@@ -464,22 +458,40 @@ edges
 | semantics.rb:263:14:263:14 | h [element :foo] | semantics.rb:263:10:263:15 | call to s31 | provenance |  |
 | semantics.rb:263:14:263:14 | h [element] | semantics.rb:263:10:263:15 | call to s31 | provenance |  |
 | semantics.rb:263:14:263:14 | h [element] | semantics.rb:263:10:263:15 | call to s31 | provenance |  |
+| semantics.rb:267:5:267:5 | [post] h [element :foo] | semantics.rb:268:5:268:5 | h [element :foo] | provenance |  |
+| semantics.rb:267:5:267:5 | [post] h [element :foo] | semantics.rb:268:5:268:5 | h [element :foo] | provenance |  |
+| semantics.rb:267:15:267:25 | call to source | semantics.rb:267:5:267:5 | [post] h [element :foo] | provenance |  |
+| semantics.rb:267:15:267:25 | call to source | semantics.rb:267:5:267:5 | [post] h [element :foo] | provenance |  |
+| semantics.rb:268:5:268:5 | [post] h [element :foo] | semantics.rb:269:5:269:5 | h [element :foo] | provenance |  |
+| semantics.rb:268:5:268:5 | [post] h [element :foo] | semantics.rb:269:5:269:5 | h [element :foo] | provenance |  |
 | semantics.rb:268:5:268:5 | [post] h [element foo] | semantics.rb:269:5:269:5 | h [element foo] | provenance |  |
 | semantics.rb:268:5:268:5 | [post] h [element foo] | semantics.rb:269:5:269:5 | h [element foo] | provenance |  |
+| semantics.rb:268:5:268:5 | h [element :foo] | semantics.rb:268:5:268:5 | [post] h [element :foo] | provenance |  |
+| semantics.rb:268:5:268:5 | h [element :foo] | semantics.rb:268:5:268:5 | [post] h [element :foo] | provenance |  |
 | semantics.rb:268:16:268:26 | call to source | semantics.rb:268:5:268:5 | [post] h [element foo] | provenance |  |
 | semantics.rb:268:16:268:26 | call to source | semantics.rb:268:5:268:5 | [post] h [element foo] | provenance |  |
+| semantics.rb:269:5:269:5 | [post] h [element :foo] | semantics.rb:270:5:270:5 | h [element :foo] | provenance |  |
+| semantics.rb:269:5:269:5 | [post] h [element :foo] | semantics.rb:270:5:270:5 | h [element :foo] | provenance |  |
 | semantics.rb:269:5:269:5 | [post] h [element foo] | semantics.rb:270:5:270:5 | h [element foo] | provenance |  |
 | semantics.rb:269:5:269:5 | [post] h [element foo] | semantics.rb:270:5:270:5 | h [element foo] | provenance |  |
+| semantics.rb:269:5:269:5 | h [element :foo] | semantics.rb:269:5:269:5 | [post] h [element :foo] | provenance |  |
+| semantics.rb:269:5:269:5 | h [element :foo] | semantics.rb:269:5:269:5 | [post] h [element :foo] | provenance |  |
 | semantics.rb:269:5:269:5 | h [element foo] | semantics.rb:269:5:269:5 | [post] h [element foo] | provenance |  |
 | semantics.rb:269:5:269:5 | h [element foo] | semantics.rb:269:5:269:5 | [post] h [element foo] | provenance |  |
+| semantics.rb:270:5:270:5 | [post] h [element :foo] | semantics.rb:273:14:273:14 | h [element :foo] | provenance |  |
+| semantics.rb:270:5:270:5 | [post] h [element :foo] | semantics.rb:273:14:273:14 | h [element :foo] | provenance |  |
 | semantics.rb:270:5:270:5 | [post] h [element foo] | semantics.rb:273:14:273:14 | h [element foo] | provenance |  |
 | semantics.rb:270:5:270:5 | [post] h [element foo] | semantics.rb:273:14:273:14 | h [element foo] | provenance |  |
+| semantics.rb:270:5:270:5 | h [element :foo] | semantics.rb:270:5:270:5 | [post] h [element :foo] | provenance |  |
+| semantics.rb:270:5:270:5 | h [element :foo] | semantics.rb:270:5:270:5 | [post] h [element :foo] | provenance |  |
 | semantics.rb:270:5:270:5 | h [element foo] | semantics.rb:270:5:270:5 | [post] h [element foo] | provenance |  |
 | semantics.rb:270:5:270:5 | h [element foo] | semantics.rb:270:5:270:5 | [post] h [element foo] | provenance |  |
 | semantics.rb:271:5:271:5 | [post] h [element] | semantics.rb:273:14:273:14 | h [element] | provenance |  |
 | semantics.rb:271:5:271:5 | [post] h [element] | semantics.rb:273:14:273:14 | h [element] | provenance |  |
 | semantics.rb:271:12:271:22 | call to source | semantics.rb:271:5:271:5 | [post] h [element] | provenance |  |
 | semantics.rb:271:12:271:22 | call to source | semantics.rb:271:5:271:5 | [post] h [element] | provenance |  |
+| semantics.rb:273:14:273:14 | h [element :foo] | semantics.rb:273:10:273:15 | call to s32 | provenance |  |
+| semantics.rb:273:14:273:14 | h [element :foo] | semantics.rb:273:10:273:15 | call to s32 | provenance |  |
 | semantics.rb:273:14:273:14 | h [element foo] | semantics.rb:273:10:273:15 | call to s32 | provenance |  |
 | semantics.rb:273:14:273:14 | h [element foo] | semantics.rb:273:10:273:15 | call to s32 | provenance |  |
 | semantics.rb:273:14:273:14 | h [element] | semantics.rb:273:10:273:15 | call to s32 | provenance |  |
@@ -544,6 +556,8 @@ edges
 | semantics.rb:291:10:291:10 | x [element :foo] | semantics.rb:291:10:291:16 | ...[...] | provenance |  |
 | semantics.rb:293:10:293:10 | x [element :foo] | semantics.rb:293:10:293:13 | ...[...] | provenance |  |
 | semantics.rb:293:10:293:10 | x [element :foo] | semantics.rb:293:10:293:13 | ...[...] | provenance |  |
+| semantics.rb:297:5:297:5 | x [element foo] | semantics.rb:298:10:298:10 | x [element foo] | provenance |  |
+| semantics.rb:297:5:297:5 | x [element foo] | semantics.rb:298:10:298:10 | x [element foo] | provenance |  |
 | semantics.rb:297:5:297:5 | x [element foo] | semantics.rb:299:10:299:10 | x [element foo] | provenance |  |
 | semantics.rb:297:5:297:5 | x [element foo] | semantics.rb:299:10:299:10 | x [element foo] | provenance |  |
 | semantics.rb:297:5:297:5 | x [element foo] | semantics.rb:301:10:301:10 | x [element foo] | provenance |  |
@@ -552,6 +566,8 @@ edges
 | semantics.rb:297:9:297:24 | call to s36 [element foo] | semantics.rb:297:5:297:5 | x [element foo] | provenance |  |
 | semantics.rb:297:13:297:23 | call to source | semantics.rb:297:9:297:24 | call to s36 [element foo] | provenance |  |
 | semantics.rb:297:13:297:23 | call to source | semantics.rb:297:9:297:24 | call to s36 [element foo] | provenance |  |
+| semantics.rb:298:10:298:10 | x [element foo] | semantics.rb:298:10:298:16 | ...[...] | provenance |  |
+| semantics.rb:298:10:298:10 | x [element foo] | semantics.rb:298:10:298:16 | ...[...] | provenance |  |
 | semantics.rb:299:10:299:10 | x [element foo] | semantics.rb:299:10:299:17 | ...[...] | provenance |  |
 | semantics.rb:299:10:299:10 | x [element foo] | semantics.rb:299:10:299:17 | ...[...] | provenance |  |
 | semantics.rb:301:10:301:10 | x [element foo] | semantics.rb:301:10:301:13 | ...[...] | provenance |  |
@@ -1191,12 +1207,10 @@ nodes
 | semantics.rb:60:9:60:18 | call to source | semmle.label | call to source |
 | semantics.rb:61:10:61:15 | call to s10 | semmle.label | call to s10 |
 | semantics.rb:61:10:61:15 | call to s10 | semmle.label | call to s10 |
-| semantics.rb:61:10:61:15 | call to s10 [element 0] | semmle.label | call to s10 [element 0] |
 | semantics.rb:61:14:61:14 | a | semmle.label | a |
 | semantics.rb:61:14:61:14 | a | semmle.label | a |
 | semantics.rb:62:10:62:18 | call to s10 | semmle.label | call to s10 |
 | semantics.rb:62:10:62:18 | call to s10 | semmle.label | call to s10 |
-| semantics.rb:62:10:62:18 | call to s10 [element 1] | semmle.label | call to s10 [element 1] |
 | semantics.rb:62:17:62:17 | a | semmle.label | a |
 | semantics.rb:62:17:62:17 | a | semmle.label | a |
 | semantics.rb:63:10:63:20 | call to s10 | semmle.label | call to s10 |
@@ -1322,8 +1336,6 @@ nodes
 | semantics.rb:126:9:126:18 | call to source | semmle.label | call to source |
 | semantics.rb:126:9:126:18 | call to source | semmle.label | call to source |
 | semantics.rb:127:10:127:18 | call to s17 | semmle.label | call to s17 |
-| semantics.rb:127:10:127:18 | call to s17 [element 0] | semmle.label | call to s17 [element 0] |
-| semantics.rb:127:10:127:18 | call to s17 [element 1] | semmle.label | call to s17 [element 1] |
 | semantics.rb:127:14:127:14 | a | semmle.label | a |
 | semantics.rb:127:17:127:17 | b | semmle.label | b |
 | semantics.rb:128:10:128:18 | call to s17 [element 0] | semmle.label | call to s17 [element 0] |
@@ -1626,16 +1638,32 @@ nodes
 | semantics.rb:263:14:263:14 | h [element :foo] | semmle.label | h [element :foo] |
 | semantics.rb:263:14:263:14 | h [element] | semmle.label | h [element] |
 | semantics.rb:263:14:263:14 | h [element] | semmle.label | h [element] |
+| semantics.rb:267:5:267:5 | [post] h [element :foo] | semmle.label | [post] h [element :foo] |
+| semantics.rb:267:5:267:5 | [post] h [element :foo] | semmle.label | [post] h [element :foo] |
+| semantics.rb:267:15:267:25 | call to source | semmle.label | call to source |
+| semantics.rb:267:15:267:25 | call to source | semmle.label | call to source |
+| semantics.rb:268:5:268:5 | [post] h [element :foo] | semmle.label | [post] h [element :foo] |
+| semantics.rb:268:5:268:5 | [post] h [element :foo] | semmle.label | [post] h [element :foo] |
 | semantics.rb:268:5:268:5 | [post] h [element foo] | semmle.label | [post] h [element foo] |
 | semantics.rb:268:5:268:5 | [post] h [element foo] | semmle.label | [post] h [element foo] |
+| semantics.rb:268:5:268:5 | h [element :foo] | semmle.label | h [element :foo] |
+| semantics.rb:268:5:268:5 | h [element :foo] | semmle.label | h [element :foo] |
 | semantics.rb:268:16:268:26 | call to source | semmle.label | call to source |
 | semantics.rb:268:16:268:26 | call to source | semmle.label | call to source |
+| semantics.rb:269:5:269:5 | [post] h [element :foo] | semmle.label | [post] h [element :foo] |
+| semantics.rb:269:5:269:5 | [post] h [element :foo] | semmle.label | [post] h [element :foo] |
 | semantics.rb:269:5:269:5 | [post] h [element foo] | semmle.label | [post] h [element foo] |
 | semantics.rb:269:5:269:5 | [post] h [element foo] | semmle.label | [post] h [element foo] |
+| semantics.rb:269:5:269:5 | h [element :foo] | semmle.label | h [element :foo] |
+| semantics.rb:269:5:269:5 | h [element :foo] | semmle.label | h [element :foo] |
 | semantics.rb:269:5:269:5 | h [element foo] | semmle.label | h [element foo] |
 | semantics.rb:269:5:269:5 | h [element foo] | semmle.label | h [element foo] |
+| semantics.rb:270:5:270:5 | [post] h [element :foo] | semmle.label | [post] h [element :foo] |
+| semantics.rb:270:5:270:5 | [post] h [element :foo] | semmle.label | [post] h [element :foo] |
 | semantics.rb:270:5:270:5 | [post] h [element foo] | semmle.label | [post] h [element foo] |
 | semantics.rb:270:5:270:5 | [post] h [element foo] | semmle.label | [post] h [element foo] |
+| semantics.rb:270:5:270:5 | h [element :foo] | semmle.label | h [element :foo] |
+| semantics.rb:270:5:270:5 | h [element :foo] | semmle.label | h [element :foo] |
 | semantics.rb:270:5:270:5 | h [element foo] | semmle.label | h [element foo] |
 | semantics.rb:270:5:270:5 | h [element foo] | semmle.label | h [element foo] |
 | semantics.rb:271:5:271:5 | [post] h [element] | semmle.label | [post] h [element] |
@@ -1644,6 +1672,8 @@ nodes
 | semantics.rb:271:12:271:22 | call to source | semmle.label | call to source |
 | semantics.rb:273:10:273:15 | call to s32 | semmle.label | call to s32 |
 | semantics.rb:273:10:273:15 | call to s32 | semmle.label | call to s32 |
+| semantics.rb:273:14:273:14 | h [element :foo] | semmle.label | h [element :foo] |
+| semantics.rb:273:14:273:14 | h [element :foo] | semmle.label | h [element :foo] |
 | semantics.rb:273:14:273:14 | h [element foo] | semmle.label | h [element foo] |
 | semantics.rb:273:14:273:14 | h [element foo] | semmle.label | h [element foo] |
 | semantics.rb:273:14:273:14 | h [element] | semmle.label | h [element] |
@@ -1718,6 +1748,10 @@ nodes
 | semantics.rb:297:9:297:24 | call to s36 [element foo] | semmle.label | call to s36 [element foo] |
 | semantics.rb:297:13:297:23 | call to source | semmle.label | call to source |
 | semantics.rb:297:13:297:23 | call to source | semmle.label | call to source |
+| semantics.rb:298:10:298:10 | x [element foo] | semmle.label | x [element foo] |
+| semantics.rb:298:10:298:10 | x [element foo] | semmle.label | x [element foo] |
+| semantics.rb:298:10:298:16 | ...[...] | semmle.label | ...[...] |
+| semantics.rb:298:10:298:16 | ...[...] | semmle.label | ...[...] |
 | semantics.rb:299:10:299:10 | x [element foo] | semmle.label | x [element foo] |
 | semantics.rb:299:10:299:10 | x [element foo] | semmle.label | x [element foo] |
 | semantics.rb:299:10:299:17 | ...[...] | semmle.label | ...[...] |
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 1a05a0be128..710c949e49e 100644
--- a/ruby/ql/test/library-tests/dataflow/flow-summaries/semantics.rb
+++ b/ruby/ql/test/library-tests/dataflow/flow-summaries/semantics.rb
@@ -270,7 +270,7 @@ def m32(h, i)
     h[1] = source("d")
     h[i] = source("e")
     
-    sink s32(h) # $ hasValueFlow=b hasValueFlow=e
+    sink s32(h) # $ hasValueFlow=b $ hasValueFlow=e $ SPURIOUS: hasValueFlow=a
 end
 
 def m33(h, i)
@@ -295,7 +295,7 @@ end
 
 def m36(h, i)
     x = s36(source("a"))
-    sink x[:foo]
+    sink x[:foo] # $ SPURIOUS: hasValueFlow=a
     sink x["foo"] # $ hasValueFlow=a
     sink x[:bar]
     sink x[i] # $ hasValueFlow=a
diff --git a/ruby/ql/test/library-tests/dataflow/global/TypeTrackingInlineTest.expected b/ruby/ql/test/library-tests/dataflow/global/TypeTrackingInlineTest.expected
index 972f21e5a3f..0f65c470b9c 100644
--- a/ruby/ql/test/library-tests/dataflow/global/TypeTrackingInlineTest.expected
+++ b/ruby/ql/test/library-tests/dataflow/global/TypeTrackingInlineTest.expected
@@ -1,33 +1,33 @@
 testFailures
-| blocks.rb:4:10:4:10 | r | Fixed missing result:hasValueFlow=1 |
-| captured_variables.rb:50:10:50:10 | x | Fixed missing result:hasValueFlow=2 |
-| captured_variables.rb:68:25:68:68 | # $ hasValueFlow=3 $ MISSING: hasValueFlow=4 | Missing result:hasValueFlow=3 |
-| captured_variables.rb:72:21:72:66 | # $ hasValueFlow=4 $ SPURIOUS: hasValueFlow=3  | Fixed spurious result:hasValueFlow=3 |
-| captured_variables.rb:72:21:72:66 | # $ hasValueFlow=4 $ SPURIOUS: hasValueFlow=3  | Missing result:hasValueFlow=4 |
-| captured_variables.rb:83:21:83:38 | # $ hasValueFlow=5 | Missing result:hasValueFlow=5 |
+| blocks.rb:4:10:4:10 | r | Fixed missing result: hasValueFlow=1 |
+| captured_variables.rb:50:10:50:10 | x | Fixed missing result: hasValueFlow=2 |
+| captured_variables.rb:68:25:68:68 | # $ hasValueFlow=3 $ MISSING: hasValueFlow=4 | Missing result: hasValueFlow=3 |
+| captured_variables.rb:72:21:72:66 | # $ hasValueFlow=4 $ SPURIOUS: hasValueFlow=3  | Fixed spurious result: hasValueFlow=3 |
+| captured_variables.rb:72:21:72:66 | # $ hasValueFlow=4 $ SPURIOUS: hasValueFlow=3  | Missing result: hasValueFlow=4 |
+| captured_variables.rb:83:21:83:38 | # $ hasValueFlow=5 | Missing result: hasValueFlow=5 |
 | captured_variables.rb:87:10:87:10 | y | Unexpected result: hasValueFlow=7 |
 | captured_variables.rb:112:18:112:18 | x | Unexpected result: hasValueFlow=11 |
-| captured_variables.rb:126:14:126:14 | x | Fixed missing result:hasValueFlow=12 |
-| captured_variables.rb:154:17:154:35 | # $ hasValueFlow=13 | Missing result:hasValueFlow=13 |
-| instance_variables.rb:20:16:20:33 | # $ hasValueFlow=7 | Missing result:hasValueFlow=7 |
-| instance_variables.rb:36:36:36:54 | # $ hasValueFlow=34 | Missing result:hasValueFlow=34 |
-| instance_variables.rb:39:36:39:54 | # $ hasValueFlow=35 | Missing result:hasValueFlow=35 |
+| captured_variables.rb:126:14:126:14 | x | Fixed missing result: hasValueFlow=12 |
+| captured_variables.rb:154:17:154:35 | # $ hasValueFlow=13 | Missing result: hasValueFlow=13 |
+| instance_variables.rb:20:16:20:33 | # $ hasValueFlow=7 | Missing result: hasValueFlow=7 |
+| instance_variables.rb:36:36:36:54 | # $ hasValueFlow=34 | Missing result: hasValueFlow=34 |
+| instance_variables.rb:39:36:39:54 | # $ hasValueFlow=35 | Missing result: hasValueFlow=35 |
 | instance_variables.rb:49:14:49:14 | x | Unexpected result: hasValueFlow=30 |
 | instance_variables.rb:49:14:49:14 | x | Unexpected result: hasValueFlow=35 |
-| instance_variables.rb:55:21:55:39 | # $ hasValueFlow=42 | Missing result:hasValueFlow=42 |
-| instance_variables.rb:67:22:67:40 | # $ hasValueFlow=21 | Missing result:hasValueFlow=21 |
-| instance_variables.rb:71:18:71:36 | # $ hasValueFlow=22 | Missing result:hasValueFlow=22 |
-| instance_variables.rb:79:22:79:40 | # $ hasValueFlow=24 | Missing result:hasValueFlow=24 |
-| instance_variables.rb:83:22:83:40 | # $ hasValueFlow=22 | Missing result:hasValueFlow=22 |
-| instance_variables.rb:84:22:84:40 | # $ hasValueFlow=24 | Missing result:hasValueFlow=24 |
-| instance_variables.rb:85:22:85:40 | # $ hasValueFlow=25 | Missing result:hasValueFlow=25 |
-| instance_variables.rb:90:22:90:40 | # $ hasValueFlow=26 | Missing result:hasValueFlow=26 |
-| instance_variables.rb:91:22:91:40 | # $ hasValueFlow=26 | Missing result:hasValueFlow=26 |
-| instance_variables.rb:96:22:96:40 | # $ hasValueFlow=27 | Missing result:hasValueFlow=27 |
-| instance_variables.rb:97:23:97:41 | # $ hasValueFlow=27 | Missing result:hasValueFlow=27 |
-| instance_variables.rb:105:23:105:41 | # $ hasValueFlow=28 | Missing result:hasValueFlow=28 |
-| instance_variables.rb:109:23:109:41 | # $ hasValueFlow=28 | Missing result:hasValueFlow=28 |
-| instance_variables.rb:114:23:114:41 | # $ hasValueFlow=28 | Missing result:hasValueFlow=28 |
-| instance_variables.rb:117:23:117:41 | # $ hasValueFlow=29 | Missing result:hasValueFlow=29 |
-| instance_variables.rb:120:23:120:41 | # $ hasValueFlow=30 | Missing result:hasValueFlow=30 |
+| instance_variables.rb:55:21:55:39 | # $ hasValueFlow=42 | Missing result: hasValueFlow=42 |
+| instance_variables.rb:67:22:67:40 | # $ hasValueFlow=21 | Missing result: hasValueFlow=21 |
+| instance_variables.rb:71:18:71:36 | # $ hasValueFlow=22 | Missing result: hasValueFlow=22 |
+| instance_variables.rb:79:22:79:40 | # $ hasValueFlow=24 | Missing result: hasValueFlow=24 |
+| instance_variables.rb:83:22:83:40 | # $ hasValueFlow=22 | Missing result: hasValueFlow=22 |
+| instance_variables.rb:84:22:84:40 | # $ hasValueFlow=24 | Missing result: hasValueFlow=24 |
+| instance_variables.rb:85:22:85:40 | # $ hasValueFlow=25 | Missing result: hasValueFlow=25 |
+| instance_variables.rb:90:22:90:40 | # $ hasValueFlow=26 | Missing result: hasValueFlow=26 |
+| instance_variables.rb:91:22:91:40 | # $ hasValueFlow=26 | Missing result: hasValueFlow=26 |
+| instance_variables.rb:96:22:96:40 | # $ hasValueFlow=27 | Missing result: hasValueFlow=27 |
+| instance_variables.rb:97:23:97:41 | # $ hasValueFlow=27 | Missing result: hasValueFlow=27 |
+| instance_variables.rb:105:23:105:41 | # $ hasValueFlow=28 | Missing result: hasValueFlow=28 |
+| instance_variables.rb:109:23:109:41 | # $ hasValueFlow=28 | Missing result: hasValueFlow=28 |
+| instance_variables.rb:114:23:114:41 | # $ hasValueFlow=28 | Missing result: hasValueFlow=28 |
+| instance_variables.rb:117:23:117:41 | # $ hasValueFlow=29 | Missing result: hasValueFlow=29 |
+| instance_variables.rb:120:23:120:41 | # $ hasValueFlow=30 | Missing result: hasValueFlow=30 |
 failures
diff --git a/ruby/ql/test/library-tests/dataflow/hash-flow/hash-flow.expected b/ruby/ql/test/library-tests/dataflow/hash-flow/hash-flow.expected
index a186efcf69b..638fab35152 100644
--- a/ruby/ql/test/library-tests/dataflow/hash-flow/hash-flow.expected
+++ b/ruby/ql/test/library-tests/dataflow/hash-flow/hash-flow.expected
@@ -40,12 +40,16 @@ edges
 | hash_flow.rb:42:17:42:26 | call to taint | hash_flow.rb:42:5:42:8 | [post] hash [element a] | provenance |  |
 | hash_flow.rb:43:5:43:8 | [post] hash [element 0] | hash_flow.rb:44:10:44:13 | hash [element 0] | provenance |  |
 | hash_flow.rb:43:5:43:8 | [post] hash [element :a] | hash_flow.rb:46:10:46:13 | hash [element :a] | provenance |  |
+| hash_flow.rb:43:5:43:8 | [post] hash [element :a] | hash_flow.rb:48:10:48:13 | hash [element :a] | provenance |  |
+| hash_flow.rb:43:5:43:8 | [post] hash [element a] | hash_flow.rb:46:10:46:13 | hash [element a] | provenance |  |
 | hash_flow.rb:43:5:43:8 | [post] hash [element a] | hash_flow.rb:48:10:48:13 | hash [element a] | provenance |  |
 | hash_flow.rb:43:5:43:8 | hash [element 0] | hash_flow.rb:43:5:43:8 | [post] hash [element 0] | provenance |  |
 | hash_flow.rb:43:5:43:8 | hash [element :a] | hash_flow.rb:43:5:43:8 | [post] hash [element :a] | provenance |  |
 | hash_flow.rb:43:5:43:8 | hash [element a] | hash_flow.rb:43:5:43:8 | [post] hash [element a] | provenance |  |
 | hash_flow.rb:44:10:44:13 | hash [element 0] | hash_flow.rb:44:10:44:16 | ...[...] | provenance |  |
 | hash_flow.rb:46:10:46:13 | hash [element :a] | hash_flow.rb:46:10:46:17 | ...[...] | provenance |  |
+| hash_flow.rb:46:10:46:13 | hash [element a] | hash_flow.rb:46:10:46:17 | ...[...] | provenance |  |
+| hash_flow.rb:48:10:48:13 | hash [element :a] | hash_flow.rb:48:10:48:18 | ...[...] | provenance |  |
 | hash_flow.rb:48:10:48:13 | hash [element a] | hash_flow.rb:48:10:48:18 | ...[...] | provenance |  |
 | hash_flow.rb:55:5:55:9 | hash1 [element :a] | hash_flow.rb:56:10:56:14 | hash1 [element :a] | provenance |  |
 | hash_flow.rb:55:13:55:37 | ...[...] [element :a] | hash_flow.rb:55:5:55:9 | hash1 [element :a] | provenance |  |
@@ -583,7 +587,9 @@ edges
 | hash_flow.rb:626:11:626:11 | a [element] | hash_flow.rb:626:11:626:16 | ...[...] | provenance |  |
 | hash_flow.rb:626:11:626:16 | ...[...] | hash_flow.rb:626:10:626:17 | ( ... ) | provenance |  |
 | hash_flow.rb:632:5:632:8 | hash [element :a] | hash_flow.rb:639:5:639:8 | hash [element :a] | provenance |  |
+| hash_flow.rb:632:5:632:8 | hash [element :a] | hash_flow.rb:640:11:640:14 | hash [element :a] | provenance |  |
 | hash_flow.rb:632:5:632:8 | hash [element :c] | hash_flow.rb:639:5:639:8 | hash [element :c] | provenance |  |
+| hash_flow.rb:632:5:632:8 | hash [element :c] | hash_flow.rb:642:11:642:14 | hash [element :c] | provenance |  |
 | hash_flow.rb:632:12:636:5 | call to [] [element :a] | hash_flow.rb:632:5:632:8 | hash [element :a] | provenance |  |
 | hash_flow.rb:632:12:636:5 | call to [] [element :c] | hash_flow.rb:632:5:632:8 | hash [element :c] | provenance |  |
 | hash_flow.rb:633:15:633:25 | call to taint | hash_flow.rb:632:12:636:5 | call to [] [element :a] | provenance |  |
@@ -599,10 +605,12 @@ edges
 | hash_flow.rb:639:5:639:8 | hash [element :a] | hash_flow.rb:639:5:639:8 | [post] hash [element] | provenance |  |
 | hash_flow.rb:639:5:639:8 | hash [element :c] | hash_flow.rb:639:5:639:8 | [post] hash [element] | provenance |  |
 | hash_flow.rb:639:5:639:8 | hash [element] | hash_flow.rb:639:5:639:8 | [post] hash [element] | provenance |  |
+| hash_flow.rb:640:11:640:14 | hash [element :a] | hash_flow.rb:640:11:640:19 | ...[...] | provenance |  |
 | hash_flow.rb:640:11:640:14 | hash [element] | hash_flow.rb:640:11:640:19 | ...[...] | provenance |  |
 | hash_flow.rb:640:11:640:19 | ...[...] | hash_flow.rb:640:10:640:20 | ( ... ) | provenance |  |
 | hash_flow.rb:641:11:641:14 | hash [element] | hash_flow.rb:641:11:641:19 | ...[...] | provenance |  |
 | hash_flow.rb:641:11:641:19 | ...[...] | hash_flow.rb:641:10:641:20 | ( ... ) | provenance |  |
+| hash_flow.rb:642:11:642:14 | hash [element :c] | hash_flow.rb:642:11:642:19 | ...[...] | provenance |  |
 | hash_flow.rb:642:11:642:14 | hash [element] | hash_flow.rb:642:11:642:19 | ...[...] | provenance |  |
 | hash_flow.rb:642:11:642:19 | ...[...] | hash_flow.rb:642:10:642:20 | ( ... ) | provenance |  |
 | hash_flow.rb:648:5:648:8 | hash [element :a] | hash_flow.rb:653:9:653:12 | hash [element :a] | provenance |  |
@@ -1149,7 +1157,9 @@ nodes
 | hash_flow.rb:44:10:44:13 | hash [element 0] | semmle.label | hash [element 0] |
 | hash_flow.rb:44:10:44:16 | ...[...] | semmle.label | ...[...] |
 | hash_flow.rb:46:10:46:13 | hash [element :a] | semmle.label | hash [element :a] |
+| hash_flow.rb:46:10:46:13 | hash [element a] | semmle.label | hash [element a] |
 | hash_flow.rb:46:10:46:17 | ...[...] | semmle.label | ...[...] |
+| hash_flow.rb:48:10:48:13 | hash [element :a] | semmle.label | hash [element :a] |
 | hash_flow.rb:48:10:48:13 | hash [element a] | semmle.label | hash [element a] |
 | hash_flow.rb:48:10:48:18 | ...[...] | semmle.label | ...[...] |
 | hash_flow.rb:55:5:55:9 | hash1 [element :a] | semmle.label | hash1 [element :a] |
@@ -1740,12 +1750,14 @@ nodes
 | hash_flow.rb:639:5:639:8 | hash [element :c] | semmle.label | hash [element :c] |
 | hash_flow.rb:639:5:639:8 | hash [element] | semmle.label | hash [element] |
 | hash_flow.rb:640:10:640:20 | ( ... ) | semmle.label | ( ... ) |
+| hash_flow.rb:640:11:640:14 | hash [element :a] | semmle.label | hash [element :a] |
 | hash_flow.rb:640:11:640:14 | hash [element] | semmle.label | hash [element] |
 | hash_flow.rb:640:11:640:19 | ...[...] | semmle.label | ...[...] |
 | hash_flow.rb:641:10:641:20 | ( ... ) | semmle.label | ( ... ) |
 | hash_flow.rb:641:11:641:14 | hash [element] | semmle.label | hash [element] |
 | hash_flow.rb:641:11:641:19 | ...[...] | semmle.label | ...[...] |
 | hash_flow.rb:642:10:642:20 | ( ... ) | semmle.label | ( ... ) |
+| hash_flow.rb:642:11:642:14 | hash [element :c] | semmle.label | hash [element :c] |
 | hash_flow.rb:642:11:642:14 | hash [element] | semmle.label | hash [element] |
 | hash_flow.rb:642:11:642:19 | ...[...] | semmle.label | ...[...] |
 | hash_flow.rb:648:5:648:8 | hash [element :a] | semmle.label | hash [element :a] |
@@ -2349,6 +2361,8 @@ hashLiteral
 | hash_flow.rb:30:10:30:16 | ...[...] | hash_flow.rb:19:14:19:23 | call to taint | hash_flow.rb:30:10:30:16 | ...[...] | $@ | hash_flow.rb:19:14:19:23 | call to taint | call to taint |
 | hash_flow.rb:44:10:44:16 | ...[...] | hash_flow.rb:38:15:38:24 | call to taint | hash_flow.rb:44:10:44:16 | ...[...] | $@ | hash_flow.rb:38:15:38:24 | call to taint | call to taint |
 | hash_flow.rb:46:10:46:17 | ...[...] | hash_flow.rb:40:16:40:25 | call to taint | hash_flow.rb:46:10:46:17 | ...[...] | $@ | hash_flow.rb:40:16:40:25 | call to taint | call to taint |
+| hash_flow.rb:46:10:46:17 | ...[...] | hash_flow.rb:42:17:42:26 | call to taint | hash_flow.rb:46:10:46:17 | ...[...] | $@ | hash_flow.rb:42:17:42:26 | call to taint | call to taint |
+| hash_flow.rb:48:10:48:18 | ...[...] | hash_flow.rb:40:16:40:25 | call to taint | hash_flow.rb:48:10:48:18 | ...[...] | $@ | hash_flow.rb:40:16:40:25 | call to taint | call to taint |
 | hash_flow.rb:48:10:48:18 | ...[...] | hash_flow.rb:42:17:42:26 | call to taint | hash_flow.rb:48:10:48:18 | ...[...] | $@ | hash_flow.rb:42:17:42:26 | call to taint | call to taint |
 | hash_flow.rb:56:10:56:18 | ...[...] | hash_flow.rb:55:21:55:30 | call to taint | hash_flow.rb:56:10:56:18 | ...[...] | $@ | hash_flow.rb:55:21:55:30 | call to taint | call to taint |
 | hash_flow.rb:61:10:61:18 | ...[...] | hash_flow.rb:59:13:59:22 | call to taint | hash_flow.rb:61:10:61:18 | ...[...] | $@ | hash_flow.rb:59:13:59:22 | call to taint | call to taint |
diff --git a/ruby/ql/test/library-tests/dataflow/hash-flow/hash_flow.rb b/ruby/ql/test/library-tests/dataflow/hash-flow/hash_flow.rb
index edc1e325b09..d5d7ce4801e 100644
--- a/ruby/ql/test/library-tests/dataflow/hash-flow/hash_flow.rb
+++ b/ruby/ql/test/library-tests/dataflow/hash-flow/hash_flow.rb
@@ -43,9 +43,9 @@ def m2()
     hash['b'] = 3
     sink(hash[0]) # $ hasValueFlow=2.1
     sink(hash[1])
-    sink(hash[:a]) # $ hasValueFlow=2.2
+    sink(hash[:a]) # $ hasValueFlow=2.2 $ SPURIOUS hasValueFlow=2.3
     sink(hash[:b])
-    sink(hash['a']) # $ hasValueFlow=2.3
+    sink(hash['a']) # $ hasValueFlow=2.3 $ SPURIOUS hasValueFlow=2.2
     sink(hash['b'])
 end
 
diff --git a/ruby/ql/test/library-tests/dataflow/hash-flow/type-tracking-hash-flow.expected b/ruby/ql/test/library-tests/dataflow/hash-flow/type-tracking-hash-flow.expected
index f7a5c7cc160..c3d0d531ffa 100644
--- a/ruby/ql/test/library-tests/dataflow/hash-flow/type-tracking-hash-flow.expected
+++ b/ruby/ql/test/library-tests/dataflow/hash-flow/type-tracking-hash-flow.expected
@@ -1,21 +1,21 @@
 testFailures
-| hash_flow.rb:65:21:65:40 | # $ hasValueFlow=3.3 | Missing result:hasValueFlow=3.3 |
-| hash_flow.rb:66:21:66:49 | # $ SPURIOUS hasValueFlow=3.3 | Missing result:hasValueFlow=3.3 |
+| hash_flow.rb:65:21:65:40 | # $ hasValueFlow=3.3 | Missing result: hasValueFlow=3.3 |
+| hash_flow.rb:66:21:66:49 | # $ SPURIOUS hasValueFlow=3.3 | Missing result: hasValueFlow=3.3 |
 | hash_flow.rb:117:10:117:17 | ...[...] | Unexpected result: hasValueFlow=7.1 |
 | hash_flow.rb:119:10:119:17 | ...[...] | Unexpected result: hasValueFlow=7.1 |
-| hash_flow.rb:152:16:152:36 | # $ hasValueFlow=10.1 | Missing result:hasValueFlow=10.1 |
+| hash_flow.rb:152:16:152:36 | # $ hasValueFlow=10.1 | Missing result: hasValueFlow=10.1 |
 | hash_flow.rb:163:10:163:17 | ...[...] | Unexpected result: hasValueFlow=9.1 |
 | hash_flow.rb:187:10:187:17 | ...[...] | Unexpected result: hasValueFlow=12.1 |
-| hash_flow.rb:219:27:219:47 | # $ hasValueFlow=14.2 | Missing result:hasValueFlow=14.2 |
+| hash_flow.rb:219:27:219:47 | # $ hasValueFlow=14.2 | Missing result: hasValueFlow=14.2 |
 | hash_flow.rb:291:10:291:14 | ...[...] | Unexpected result: hasValueFlow=19.1 |
 | hash_flow.rb:294:10:294:14 | ...[...] | Unexpected result: hasValueFlow=19.3 |
-| hash_flow.rb:467:16:467:36 | # $ hasValueFlow=28.1 | Missing result:hasValueFlow=28.1 |
+| hash_flow.rb:467:16:467:36 | # $ hasValueFlow=28.1 | Missing result: hasValueFlow=28.1 |
 | hash_flow.rb:515:10:515:20 | ( ... ) | Unexpected result: hasValueFlow=31.3 |
-| hash_flow.rb:559:17:559:57 | # $ hasValueFlow=34.1 $ hasValueFlow=34.2 | Missing result:hasValueFlow=34.1 |
-| hash_flow.rb:559:17:559:57 | # $ hasValueFlow=34.1 $ hasValueFlow=34.2 | Missing result:hasValueFlow=34.2 |
-| hash_flow.rb:571:18:571:38 | # $ hasValueFlow=35.1 | Missing result:hasValueFlow=35.1 |
-| hash_flow.rb:591:20:591:60 | # $ hasValueFlow=36.1 $ hasValueFlow=36.2 | Missing result:hasValueFlow=36.1 |
-| hash_flow.rb:591:20:591:60 | # $ hasValueFlow=36.1 $ hasValueFlow=36.2 | Missing result:hasValueFlow=36.2 |
+| hash_flow.rb:559:17:559:57 | # $ hasValueFlow=34.1 $ hasValueFlow=34.2 | Missing result: hasValueFlow=34.1 |
+| hash_flow.rb:559:17:559:57 | # $ hasValueFlow=34.1 $ hasValueFlow=34.2 | Missing result: hasValueFlow=34.2 |
+| hash_flow.rb:571:18:571:38 | # $ hasValueFlow=35.1 | Missing result: hasValueFlow=35.1 |
+| hash_flow.rb:591:20:591:60 | # $ hasValueFlow=36.1 $ hasValueFlow=36.2 | Missing result: hasValueFlow=36.1 |
+| hash_flow.rb:591:20:591:60 | # $ hasValueFlow=36.1 $ hasValueFlow=36.2 | Missing result: hasValueFlow=36.2 |
 | hash_flow.rb:673:10:673:19 | ( ... ) | Unexpected result: hasValueFlow=41.1 |
 | hash_flow.rb:776:10:776:14 | ...[...] | Unexpected result: hasValueFlow=46.1 |
 | hash_flow.rb:779:10:779:14 | ...[...] | Unexpected result: hasValueFlow=46.3 |
diff --git a/ruby/ql/test/library-tests/dataflow/summaries/Summaries.expected b/ruby/ql/test/library-tests/dataflow/summaries/Summaries.expected
index 14bd76e4ccf..ce89d3f549f 100644
--- a/ruby/ql/test/library-tests/dataflow/summaries/Summaries.expected
+++ b/ruby/ql/test/library-tests/dataflow/summaries/Summaries.expected
@@ -42,14 +42,14 @@ edges
 | summaries.rb:1:11:1:36 | call to identity | summaries.rb:26:31:26:37 | tainted | provenance |  |
 | summaries.rb:1:11:1:36 | call to identity | summaries.rb:30:24:30:30 | tainted | provenance |  |
 | summaries.rb:1:11:1:36 | call to identity | summaries.rb:31:27:31:33 | tainted | provenance |  |
-| summaries.rb:1:11:1:36 | call to identity | summaries.rb:34:16:34:22 | tainted | provenance |  Sink:MaD:7 |
-| summaries.rb:1:11:1:36 | call to identity | summaries.rb:34:16:34:22 | tainted | provenance |  Sink:MaD:7 |
-| summaries.rb:1:11:1:36 | call to identity | summaries.rb:35:16:35:22 | tainted | provenance |  Sink:MaD:7 |
-| summaries.rb:1:11:1:36 | call to identity | summaries.rb:35:16:35:22 | tainted | provenance |  Sink:MaD:7 |
-| summaries.rb:1:11:1:36 | call to identity | summaries.rb:36:21:36:27 | tainted | provenance |  Sink:MaD:7 |
-| summaries.rb:1:11:1:36 | call to identity | summaries.rb:36:21:36:27 | tainted | provenance |  Sink:MaD:7 |
-| summaries.rb:1:11:1:36 | call to identity | summaries.rb:37:36:37:42 | tainted | provenance |  Sink:MaD:7 |
-| summaries.rb:1:11:1:36 | call to identity | summaries.rb:37:36:37:42 | tainted | provenance |  Sink:MaD:7 |
+| summaries.rb:1:11:1:36 | call to identity | summaries.rb:34:16:34:22 | tainted | provenance | Sink:MaD:7 |
+| summaries.rb:1:11:1:36 | call to identity | summaries.rb:34:16:34:22 | tainted | provenance | Sink:MaD:7 |
+| summaries.rb:1:11:1:36 | call to identity | summaries.rb:35:16:35:22 | tainted | provenance | Sink:MaD:7 |
+| summaries.rb:1:11:1:36 | call to identity | summaries.rb:35:16:35:22 | tainted | provenance | Sink:MaD:7 |
+| summaries.rb:1:11:1:36 | call to identity | summaries.rb:36:21:36:27 | tainted | provenance | Sink:MaD:7 |
+| summaries.rb:1:11:1:36 | call to identity | summaries.rb:36:21:36:27 | tainted | provenance | Sink:MaD:7 |
+| summaries.rb:1:11:1:36 | call to identity | summaries.rb:37:36:37:42 | tainted | provenance | Sink:MaD:7 |
+| summaries.rb:1:11:1:36 | call to identity | summaries.rb:37:36:37:42 | tainted | provenance | Sink:MaD:7 |
 | summaries.rb:1:11:1:36 | call to identity | summaries.rb:51:24:51:30 | tainted | provenance |  |
 | summaries.rb:1:11:1:36 | call to identity | summaries.rb:56:22:56:28 | tainted | provenance |  |
 | summaries.rb:1:11:1:36 | call to identity | summaries.rb:57:17:57:23 | tainted | provenance |  |
@@ -59,30 +59,30 @@ edges
 | summaries.rb:1:11:1:36 | call to identity | summaries.rb:122:16:122:22 | tainted | provenance |  |
 | summaries.rb:1:11:1:36 | call to identity | summaries.rb:128:14:128:20 | tainted | provenance |  |
 | summaries.rb:1:11:1:36 | call to identity | summaries.rb:131:16:131:22 | tainted | provenance |  |
-| summaries.rb:1:11:1:36 | call to identity | summaries.rb:131:16:131:22 | tainted | provenance |  Sink:MaD:4 |
-| summaries.rb:1:11:1:36 | call to identity | summaries.rb:131:16:131:22 | tainted | provenance |  Sink:MaD:4 |
-| summaries.rb:1:11:1:36 | call to identity | summaries.rb:132:21:132:27 | tainted | provenance |  Sink:MaD:4 |
-| summaries.rb:1:11:1:36 | call to identity | summaries.rb:132:21:132:27 | tainted | provenance |  Sink:MaD:4 |
-| summaries.rb:1:11:1:36 | call to identity | summaries.rb:135:26:135:32 | tainted | provenance |  Sink:MaD:5 |
-| summaries.rb:1:11:1:36 | call to identity | summaries.rb:135:26:135:32 | tainted | provenance |  Sink:MaD:5 |
-| summaries.rb:1:11:1:36 | call to identity | summaries.rb:137:23:137:29 | tainted | provenance |  Sink:MaD:7 |
-| summaries.rb:1:11:1:36 | call to identity | summaries.rb:137:23:137:29 | tainted | provenance |  Sink:MaD:7 |
-| summaries.rb:1:11:1:36 | call to identity | summaries.rb:140:19:140:25 | tainted | provenance |  Sink:MaD:7 |
-| summaries.rb:1:11:1:36 | call to identity | summaries.rb:140:19:140:25 | tainted | provenance |  Sink:MaD:7 |
-| summaries.rb:1:11:1:36 | call to identity | summaries.rb:141:19:141:25 | tainted | provenance |  Sink:MaD:7 |
-| summaries.rb:1:11:1:36 | call to identity | summaries.rb:141:19:141:25 | tainted | provenance |  Sink:MaD:7 |
-| summaries.rb:1:11:1:36 | call to identity | summaries.rb:145:26:145:32 | tainted | provenance |  Sink:MaD:2 |
-| summaries.rb:1:11:1:36 | call to identity | summaries.rb:145:26:145:32 | tainted | provenance |  Sink:MaD:2 |
-| summaries.rb:1:11:1:36 | call to identity | summaries.rb:147:16:147:22 | tainted | provenance |  Sink:MaD:1 |
-| summaries.rb:1:11:1:36 | call to identity | summaries.rb:147:16:147:22 | tainted | provenance |  Sink:MaD:1 |
-| summaries.rb:1:11:1:36 | call to identity | summaries.rb:150:39:150:45 | tainted | provenance |  Sink:MaD:3 |
-| summaries.rb:1:11:1:36 | call to identity | summaries.rb:150:39:150:45 | tainted | provenance |  Sink:MaD:3 |
-| summaries.rb:1:11:1:36 | call to identity | summaries.rb:154:20:154:26 | tainted | provenance |  Sink:MaD:6 |
-| summaries.rb:1:11:1:36 | call to identity | summaries.rb:154:20:154:26 | tainted | provenance |  Sink:MaD:6 |
-| summaries.rb:1:11:1:36 | call to identity | summaries.rb:155:28:155:34 | tainted | provenance |  Sink:MaD:6 |
-| summaries.rb:1:11:1:36 | call to identity | summaries.rb:155:28:155:34 | tainted | provenance |  Sink:MaD:6 |
-| summaries.rb:1:11:1:36 | call to identity | summaries.rb:156:27:156:33 | tainted | provenance |  Sink:MaD:6 |
-| summaries.rb:1:11:1:36 | call to identity | summaries.rb:156:27:156:33 | tainted | provenance |  Sink:MaD:6 |
+| summaries.rb:1:11:1:36 | call to identity | summaries.rb:131:16:131:22 | tainted | provenance | Sink:MaD:4 |
+| summaries.rb:1:11:1:36 | call to identity | summaries.rb:131:16:131:22 | tainted | provenance | Sink:MaD:4 |
+| summaries.rb:1:11:1:36 | call to identity | summaries.rb:132:21:132:27 | tainted | provenance | Sink:MaD:4 |
+| summaries.rb:1:11:1:36 | call to identity | summaries.rb:132:21:132:27 | tainted | provenance | Sink:MaD:4 |
+| summaries.rb:1:11:1:36 | call to identity | summaries.rb:135:26:135:32 | tainted | provenance | Sink:MaD:5 |
+| summaries.rb:1:11:1:36 | call to identity | summaries.rb:135:26:135:32 | tainted | provenance | Sink:MaD:5 |
+| summaries.rb:1:11:1:36 | call to identity | summaries.rb:137:23:137:29 | tainted | provenance | Sink:MaD:7 |
+| summaries.rb:1:11:1:36 | call to identity | summaries.rb:137:23:137:29 | tainted | provenance | Sink:MaD:7 |
+| summaries.rb:1:11:1:36 | call to identity | summaries.rb:140:19:140:25 | tainted | provenance | Sink:MaD:7 |
+| summaries.rb:1:11:1:36 | call to identity | summaries.rb:140:19:140:25 | tainted | provenance | Sink:MaD:7 |
+| summaries.rb:1:11:1:36 | call to identity | summaries.rb:141:19:141:25 | tainted | provenance | Sink:MaD:7 |
+| summaries.rb:1:11:1:36 | call to identity | summaries.rb:141:19:141:25 | tainted | provenance | Sink:MaD:7 |
+| summaries.rb:1:11:1:36 | call to identity | summaries.rb:145:26:145:32 | tainted | provenance | Sink:MaD:2 |
+| summaries.rb:1:11:1:36 | call to identity | summaries.rb:145:26:145:32 | tainted | provenance | Sink:MaD:2 |
+| summaries.rb:1:11:1:36 | call to identity | summaries.rb:147:16:147:22 | tainted | provenance | Sink:MaD:1 |
+| summaries.rb:1:11:1:36 | call to identity | summaries.rb:147:16:147:22 | tainted | provenance | Sink:MaD:1 |
+| summaries.rb:1:11:1:36 | call to identity | summaries.rb:150:39:150:45 | tainted | provenance | Sink:MaD:3 |
+| summaries.rb:1:11:1:36 | call to identity | summaries.rb:150:39:150:45 | tainted | provenance | Sink:MaD:3 |
+| summaries.rb:1:11:1:36 | call to identity | summaries.rb:154:20:154:26 | tainted | provenance | Sink:MaD:6 |
+| summaries.rb:1:11:1:36 | call to identity | summaries.rb:154:20:154:26 | tainted | provenance | Sink:MaD:6 |
+| summaries.rb:1:11:1:36 | call to identity | summaries.rb:155:28:155:34 | tainted | provenance | Sink:MaD:6 |
+| summaries.rb:1:11:1:36 | call to identity | summaries.rb:155:28:155:34 | tainted | provenance | Sink:MaD:6 |
+| summaries.rb:1:11:1:36 | call to identity | summaries.rb:156:27:156:33 | tainted | provenance | Sink:MaD:6 |
+| summaries.rb:1:11:1:36 | call to identity | summaries.rb:156:27:156:33 | tainted | provenance | Sink:MaD:6 |
 | summaries.rb:1:11:1:36 | call to identity | summaries.rb:157:14:160:3 | do ... end [captured tainted] | provenance |  |
 | summaries.rb:1:11:1:36 | call to identity | summaries.rb:157:14:160:3 | do ... end [captured tainted] | provenance |  |
 | summaries.rb:1:20:1:36 | call to source | summaries.rb:1:11:1:36 | call to identity | provenance |  |
@@ -271,18 +271,18 @@ edges
 | summaries.rb:112:6:112:6 | x [@value] | summaries.rb:112:6:112:16 | call to get_value | provenance | MaD:22 |
 | summaries.rb:122:16:122:22 | [post] tainted | summaries.rb:128:14:128:20 | tainted | provenance |  |
 | summaries.rb:122:16:122:22 | [post] tainted | summaries.rb:131:16:131:22 | tainted | provenance |  |
-| summaries.rb:122:16:122:22 | [post] tainted | summaries.rb:131:16:131:22 | tainted | provenance |  Sink:MaD:4 |
-| summaries.rb:122:16:122:22 | [post] tainted | summaries.rb:132:21:132:27 | tainted | provenance |  Sink:MaD:4 |
-| summaries.rb:122:16:122:22 | [post] tainted | summaries.rb:135:26:135:32 | tainted | provenance |  Sink:MaD:5 |
-| summaries.rb:122:16:122:22 | [post] tainted | summaries.rb:137:23:137:29 | tainted | provenance |  Sink:MaD:7 |
-| summaries.rb:122:16:122:22 | [post] tainted | summaries.rb:140:19:140:25 | tainted | provenance |  Sink:MaD:7 |
-| summaries.rb:122:16:122:22 | [post] tainted | summaries.rb:141:19:141:25 | tainted | provenance |  Sink:MaD:7 |
-| summaries.rb:122:16:122:22 | [post] tainted | summaries.rb:145:26:145:32 | tainted | provenance |  Sink:MaD:2 |
-| summaries.rb:122:16:122:22 | [post] tainted | summaries.rb:147:16:147:22 | tainted | provenance |  Sink:MaD:1 |
-| summaries.rb:122:16:122:22 | [post] tainted | summaries.rb:150:39:150:45 | tainted | provenance |  Sink:MaD:3 |
-| summaries.rb:122:16:122:22 | [post] tainted | summaries.rb:154:20:154:26 | tainted | provenance |  Sink:MaD:6 |
-| summaries.rb:122:16:122:22 | [post] tainted | summaries.rb:155:28:155:34 | tainted | provenance |  Sink:MaD:6 |
-| summaries.rb:122:16:122:22 | [post] tainted | summaries.rb:156:27:156:33 | tainted | provenance |  Sink:MaD:6 |
+| summaries.rb:122:16:122:22 | [post] tainted | summaries.rb:131:16:131:22 | tainted | provenance | Sink:MaD:4 |
+| summaries.rb:122:16:122:22 | [post] tainted | summaries.rb:132:21:132:27 | tainted | provenance | Sink:MaD:4 |
+| summaries.rb:122:16:122:22 | [post] tainted | summaries.rb:135:26:135:32 | tainted | provenance | Sink:MaD:5 |
+| summaries.rb:122:16:122:22 | [post] tainted | summaries.rb:137:23:137:29 | tainted | provenance | Sink:MaD:7 |
+| summaries.rb:122:16:122:22 | [post] tainted | summaries.rb:140:19:140:25 | tainted | provenance | Sink:MaD:7 |
+| summaries.rb:122:16:122:22 | [post] tainted | summaries.rb:141:19:141:25 | tainted | provenance | Sink:MaD:7 |
+| summaries.rb:122:16:122:22 | [post] tainted | summaries.rb:145:26:145:32 | tainted | provenance | Sink:MaD:2 |
+| summaries.rb:122:16:122:22 | [post] tainted | summaries.rb:147:16:147:22 | tainted | provenance | Sink:MaD:1 |
+| summaries.rb:122:16:122:22 | [post] tainted | summaries.rb:150:39:150:45 | tainted | provenance | Sink:MaD:3 |
+| summaries.rb:122:16:122:22 | [post] tainted | summaries.rb:154:20:154:26 | tainted | provenance | Sink:MaD:6 |
+| summaries.rb:122:16:122:22 | [post] tainted | summaries.rb:155:28:155:34 | tainted | provenance | Sink:MaD:6 |
+| summaries.rb:122:16:122:22 | [post] tainted | summaries.rb:156:27:156:33 | tainted | provenance | Sink:MaD:6 |
 | summaries.rb:122:16:122:22 | [post] tainted | summaries.rb:157:14:160:3 | do ... end [captured tainted] | provenance |  |
 | summaries.rb:122:16:122:22 | tainted | summaries.rb:122:16:122:22 | [post] tainted | provenance | MaD:20 |
 | summaries.rb:122:16:122:22 | tainted | summaries.rb:122:25:122:25 | [post] y | provenance | MaD:20 |
@@ -291,9 +291,9 @@ edges
 | summaries.rb:122:33:122:33 | [post] z | summaries.rb:125:6:125:6 | z | provenance |  |
 | summaries.rb:128:1:128:1 | [post] x | summaries.rb:129:6:129:6 | x | provenance |  |
 | summaries.rb:128:14:128:20 | tainted | summaries.rb:128:1:128:1 | [post] x | provenance | MaD:21 |
-| summaries.rb:131:16:131:22 | tainted | summaries.rb:131:1:131:23 | synthetic splat argument | provenance |  Sink:MaD:4 |
-| summaries.rb:157:14:160:3 | do ... end [captured tainted] | summaries.rb:158:15:158:21 | tainted | provenance | heuristic-callback |
-| summaries.rb:157:14:160:3 | do ... end [captured tainted] | summaries.rb:158:15:158:21 | tainted | provenance | heuristic-callback |
+| summaries.rb:131:16:131:22 | tainted | summaries.rb:131:1:131:23 | synthetic splat argument | provenance | Sink:MaD:4 |
+| summaries.rb:157:14:160:3 | do ... end [captured tainted] | summaries.rb:158:15:158:21 | tainted | provenance | heuristic-callback Sink:MaD:6 |
+| summaries.rb:157:14:160:3 | do ... end [captured tainted] | summaries.rb:158:15:158:21 | tainted | provenance | heuristic-callback Sink:MaD:6 |
 nodes
 | summaries.rb:1:11:1:36 | call to identity | semmle.label | call to identity |
 | summaries.rb:1:11:1:36 | call to identity | semmle.label | call to identity |
diff --git a/ruby/ql/test/library-tests/frameworks/action_controller/params-flow.expected b/ruby/ql/test/library-tests/frameworks/action_controller/params-flow.expected
index f443f766986..b207b729941 100644
--- a/ruby/ql/test/library-tests/frameworks/action_controller/params-flow.expected
+++ b/ruby/ql/test/library-tests/frameworks/action_controller/params-flow.expected
@@ -56,28 +56,18 @@ edges
 | params_flow.rb:83:10:83:15 | call to params | params_flow.rb:83:10:83:27 | call to to_unsafe_h | provenance |  |
 | params_flow.rb:87:10:87:15 | call to params | params_flow.rb:87:10:87:30 | call to to_unsafe_hash | provenance |  |
 | params_flow.rb:91:10:91:15 | call to params | params_flow.rb:91:10:91:40 | call to transform_keys | provenance |  |
-| params_flow.rb:91:10:91:15 | call to params | params_flow.rb:91:10:91:40 | call to transform_keys [element] | provenance |  |
-| params_flow.rb:91:10:91:40 | call to transform_keys [element] | params_flow.rb:91:10:91:40 | call to transform_keys | provenance |  |
 | params_flow.rb:95:10:95:15 | call to params | params_flow.rb:95:10:95:41 | call to transform_keys! | provenance |  |
 | params_flow.rb:99:10:99:15 | call to params | params_flow.rb:99:10:99:42 | call to transform_values | provenance |  |
 | params_flow.rb:103:10:103:15 | call to params | params_flow.rb:103:10:103:43 | call to transform_values! | provenance |  |
 | params_flow.rb:107:10:107:15 | call to params | params_flow.rb:107:10:107:33 | call to values_at | provenance |  |
-| params_flow.rb:107:10:107:15 | call to params | params_flow.rb:107:10:107:33 | call to values_at [element 0] | provenance |  |
-| params_flow.rb:107:10:107:15 | call to params | params_flow.rb:107:10:107:33 | call to values_at [element 1] | provenance |  |
-| params_flow.rb:107:10:107:33 | call to values_at [element 0] | params_flow.rb:107:10:107:33 | call to values_at | provenance |  |
-| params_flow.rb:107:10:107:33 | call to values_at [element 1] | params_flow.rb:107:10:107:33 | call to values_at | provenance |  |
 | params_flow.rb:111:10:111:15 | call to params | params_flow.rb:111:10:111:29 | call to merge | provenance |  |
-| params_flow.rb:112:10:112:29 | call to merge [element 0] | params_flow.rb:112:10:112:29 | call to merge | provenance |  |
 | params_flow.rb:112:23:112:28 | call to params | params_flow.rb:112:10:112:29 | call to merge | provenance |  |
-| params_flow.rb:112:23:112:28 | call to params | params_flow.rb:112:10:112:29 | call to merge [element 0] | provenance |  |
 | params_flow.rb:116:10:116:15 | call to params | params_flow.rb:116:10:116:37 | call to reverse_merge | provenance |  |
 | params_flow.rb:117:31:117:36 | call to params | params_flow.rb:117:10:117:37 | call to reverse_merge | provenance |  |
 | params_flow.rb:121:10:121:15 | call to params | params_flow.rb:121:10:121:43 | call to with_defaults | provenance |  |
 | params_flow.rb:122:31:122:36 | call to params | params_flow.rb:122:10:122:37 | call to with_defaults | provenance |  |
 | params_flow.rb:126:10:126:15 | call to params | params_flow.rb:126:10:126:30 | call to merge! | provenance |  |
-| params_flow.rb:127:10:127:30 | call to merge! [element 0] | params_flow.rb:127:10:127:30 | call to merge! | provenance |  |
 | params_flow.rb:127:24:127:29 | call to params | params_flow.rb:127:10:127:30 | call to merge! | provenance |  |
-| params_flow.rb:127:24:127:29 | call to params | params_flow.rb:127:10:127:30 | call to merge! [element 0] | provenance |  |
 | params_flow.rb:130:5:130:5 | [post] p | params_flow.rb:131:10:131:10 | p | provenance |  |
 | params_flow.rb:130:5:130:5 | [post] p [element 0] | params_flow.rb:131:10:131:10 | p | provenance |  |
 | params_flow.rb:130:14:130:19 | call to params | params_flow.rb:130:5:130:5 | [post] p | provenance |  |
@@ -199,7 +189,6 @@ nodes
 | params_flow.rb:87:10:87:30 | call to to_unsafe_hash | semmle.label | call to to_unsafe_hash |
 | params_flow.rb:91:10:91:15 | call to params | semmle.label | call to params |
 | params_flow.rb:91:10:91:40 | call to transform_keys | semmle.label | call to transform_keys |
-| params_flow.rb:91:10:91:40 | call to transform_keys [element] | semmle.label | call to transform_keys [element] |
 | params_flow.rb:95:10:95:15 | call to params | semmle.label | call to params |
 | params_flow.rb:95:10:95:41 | call to transform_keys! | semmle.label | call to transform_keys! |
 | params_flow.rb:99:10:99:15 | call to params | semmle.label | call to params |
@@ -208,12 +197,9 @@ nodes
 | params_flow.rb:103:10:103:43 | call to transform_values! | semmle.label | call to transform_values! |
 | params_flow.rb:107:10:107:15 | call to params | semmle.label | call to params |
 | params_flow.rb:107:10:107:33 | call to values_at | semmle.label | call to values_at |
-| params_flow.rb:107:10:107:33 | call to values_at [element 0] | semmle.label | call to values_at [element 0] |
-| params_flow.rb:107:10:107:33 | call to values_at [element 1] | semmle.label | call to values_at [element 1] |
 | params_flow.rb:111:10:111:15 | call to params | semmle.label | call to params |
 | params_flow.rb:111:10:111:29 | call to merge | semmle.label | call to merge |
 | params_flow.rb:112:10:112:29 | call to merge | semmle.label | call to merge |
-| params_flow.rb:112:10:112:29 | call to merge [element 0] | semmle.label | call to merge [element 0] |
 | params_flow.rb:112:23:112:28 | call to params | semmle.label | call to params |
 | params_flow.rb:116:10:116:15 | call to params | semmle.label | call to params |
 | params_flow.rb:116:10:116:37 | call to reverse_merge | semmle.label | call to reverse_merge |
@@ -226,7 +212,6 @@ nodes
 | params_flow.rb:126:10:126:15 | call to params | semmle.label | call to params |
 | params_flow.rb:126:10:126:30 | call to merge! | semmle.label | call to merge! |
 | params_flow.rb:127:10:127:30 | call to merge! | semmle.label | call to merge! |
-| params_flow.rb:127:10:127:30 | call to merge! [element 0] | semmle.label | call to merge! [element 0] |
 | params_flow.rb:127:24:127:29 | call to params | semmle.label | call to params |
 | params_flow.rb:130:5:130:5 | [post] p | semmle.label | [post] p |
 | params_flow.rb:130:5:130:5 | [post] p [element 0] | semmle.label | [post] p [element 0] |
@@ -285,11 +270,11 @@ nodes
 | params_flow.rb:205:10:205:10 | a | semmle.label | a |
 subpaths
 testFailures
-| filter_flow.rb:21:10:21:13 | @foo | Unexpected result: hasTaintFlow= |
-| filter_flow.rb:38:10:38:13 | @foo | Unexpected result: hasTaintFlow= |
-| filter_flow.rb:55:10:55:13 | @foo | Unexpected result: hasTaintFlow= |
-| filter_flow.rb:71:10:71:17 | call to bar | Unexpected result: hasTaintFlow= |
-| filter_flow.rb:87:11:87:14 | @foo | Unexpected result: hasTaintFlow= |
+| filter_flow.rb:21:10:21:13 | @foo | Unexpected result: hasTaintFlow |
+| filter_flow.rb:38:10:38:13 | @foo | Unexpected result: hasTaintFlow |
+| filter_flow.rb:55:10:55:13 | @foo | Unexpected result: hasTaintFlow |
+| filter_flow.rb:71:10:71:17 | call to bar | Unexpected result: hasTaintFlow |
+| filter_flow.rb:87:11:87:14 | @foo | Unexpected result: hasTaintFlow |
 #select
 | filter_flow.rb:21:10:21:13 | @foo | filter_flow.rb:14:12:14:17 | call to params | filter_flow.rb:21:10:21:13 | @foo | $@ | filter_flow.rb:14:12:14:17 | call to params | call to params |
 | filter_flow.rb:38:10:38:13 | @foo | filter_flow.rb:30:12:30:17 | call to params | filter_flow.rb:38:10:38:13 | @foo | $@ | filter_flow.rb:30:12:30:17 | call to params | call to params |
diff --git a/ruby/ql/test/library-tests/frameworks/active_support/ActiveSupportDataFlow.expected b/ruby/ql/test/library-tests/frameworks/active_support/ActiveSupportDataFlow.expected
index b2e219d1e50..bdca6b359ac 100644
--- a/ruby/ql/test/library-tests/frameworks/active_support/ActiveSupportDataFlow.expected
+++ b/ruby/ql/test/library-tests/frameworks/active_support/ActiveSupportDataFlow.expected
@@ -60,45 +60,45 @@ edges
 | hash_extensions.rb:2:5:2:5 | h [element :a] | hash_extensions.rb:3:9:3:9 | h [element :a] | provenance |  |
 | hash_extensions.rb:2:9:2:26 | call to [] [element :a] | hash_extensions.rb:2:5:2:5 | h [element :a] | provenance |  |
 | hash_extensions.rb:2:14:2:24 | call to source | hash_extensions.rb:2:9:2:26 | call to [] [element :a] | provenance |  |
-| hash_extensions.rb:3:5:3:5 | x [element] | hash_extensions.rb:4:10:4:10 | x [element] | provenance |  |
-| hash_extensions.rb:3:9:3:9 | h [element :a] | hash_extensions.rb:3:9:3:24 | call to stringify_keys [element] | provenance |  |
-| hash_extensions.rb:3:9:3:24 | call to stringify_keys [element] | hash_extensions.rb:3:5:3:5 | x [element] | provenance |  |
-| hash_extensions.rb:4:10:4:10 | x [element] | hash_extensions.rb:4:10:4:14 | ...[...] | provenance |  |
-| hash_extensions.rb:10:5:10:5 | h [element :a] | hash_extensions.rb:11:9:11:9 | h [element :a] | provenance |  |
-| hash_extensions.rb:10:9:10:26 | call to [] [element :a] | hash_extensions.rb:10:5:10:5 | h [element :a] | provenance |  |
-| hash_extensions.rb:10:14:10:24 | call to source | hash_extensions.rb:10:9:10:26 | call to [] [element :a] | provenance |  |
-| hash_extensions.rb:11:5:11:5 | x [element] | hash_extensions.rb:12:10:12:10 | x [element] | provenance |  |
-| hash_extensions.rb:11:9:11:9 | h [element :a] | hash_extensions.rb:11:9:11:20 | call to to_options [element] | provenance |  |
-| hash_extensions.rb:11:9:11:20 | call to to_options [element] | hash_extensions.rb:11:5:11:5 | x [element] | provenance |  |
-| hash_extensions.rb:12:10:12:10 | x [element] | hash_extensions.rb:12:10:12:14 | ...[...] | provenance |  |
-| hash_extensions.rb:18:5:18:5 | h [element :a] | hash_extensions.rb:19:9:19:9 | h [element :a] | provenance |  |
-| hash_extensions.rb:18:9:18:26 | call to [] [element :a] | hash_extensions.rb:18:5:18:5 | h [element :a] | provenance |  |
-| hash_extensions.rb:18:14:18:24 | call to source | hash_extensions.rb:18:9:18:26 | call to [] [element :a] | provenance |  |
-| hash_extensions.rb:19:5:19:5 | x [element] | hash_extensions.rb:20:10:20:10 | x [element] | provenance |  |
-| hash_extensions.rb:19:9:19:9 | h [element :a] | hash_extensions.rb:19:9:19:24 | call to symbolize_keys [element] | provenance |  |
-| hash_extensions.rb:19:9:19:24 | call to symbolize_keys [element] | hash_extensions.rb:19:5:19:5 | x [element] | provenance |  |
-| hash_extensions.rb:20:10:20:10 | x [element] | hash_extensions.rb:20:10:20:14 | ...[...] | provenance |  |
+| hash_extensions.rb:3:5:3:5 | x [element :a] | hash_extensions.rb:4:10:4:10 | x [element :a] | provenance |  |
+| hash_extensions.rb:3:9:3:9 | h [element :a] | hash_extensions.rb:3:9:3:24 | call to stringify_keys [element :a] | provenance |  |
+| hash_extensions.rb:3:9:3:24 | call to stringify_keys [element :a] | hash_extensions.rb:3:5:3:5 | x [element :a] | provenance |  |
+| hash_extensions.rb:4:10:4:10 | x [element :a] | hash_extensions.rb:4:10:4:15 | ...[...] | provenance |  |
+| hash_extensions.rb:10:5:10:5 | h [element a] | hash_extensions.rb:11:9:11:9 | h [element a] | provenance |  |
+| hash_extensions.rb:10:9:10:30 | call to [] [element a] | hash_extensions.rb:10:5:10:5 | h [element a] | provenance |  |
+| hash_extensions.rb:10:18:10:28 | call to source | hash_extensions.rb:10:9:10:30 | call to [] [element a] | provenance |  |
+| hash_extensions.rb:11:5:11:5 | x [element a] | hash_extensions.rb:12:10:12:10 | x [element a] | provenance |  |
+| hash_extensions.rb:11:9:11:9 | h [element a] | hash_extensions.rb:11:9:11:20 | call to to_options [element a] | provenance |  |
+| hash_extensions.rb:11:9:11:20 | call to to_options [element a] | hash_extensions.rb:11:5:11:5 | x [element a] | provenance |  |
+| hash_extensions.rb:12:10:12:10 | x [element a] | hash_extensions.rb:12:10:12:14 | ...[...] | provenance |  |
+| hash_extensions.rb:18:5:18:5 | h [element a] | hash_extensions.rb:19:9:19:9 | h [element a] | provenance |  |
+| hash_extensions.rb:18:9:18:30 | call to [] [element a] | hash_extensions.rb:18:5:18:5 | h [element a] | provenance |  |
+| hash_extensions.rb:18:18:18:28 | call to source | hash_extensions.rb:18:9:18:30 | call to [] [element a] | provenance |  |
+| hash_extensions.rb:19:5:19:5 | x [element a] | hash_extensions.rb:20:10:20:10 | x [element a] | provenance |  |
+| hash_extensions.rb:19:9:19:9 | h [element a] | hash_extensions.rb:19:9:19:24 | call to symbolize_keys [element a] | provenance |  |
+| hash_extensions.rb:19:9:19:24 | call to symbolize_keys [element a] | hash_extensions.rb:19:5:19:5 | x [element a] | provenance |  |
+| hash_extensions.rb:20:10:20:10 | x [element a] | hash_extensions.rb:20:10:20:14 | ...[...] | provenance |  |
 | hash_extensions.rb:26:5:26:5 | h [element :a] | hash_extensions.rb:27:9:27:9 | h [element :a] | provenance |  |
 | hash_extensions.rb:26:9:26:26 | call to [] [element :a] | hash_extensions.rb:26:5:26:5 | h [element :a] | provenance |  |
 | hash_extensions.rb:26:14:26:24 | call to source | hash_extensions.rb:26:9:26:26 | call to [] [element :a] | provenance |  |
-| hash_extensions.rb:27:5:27:5 | x [element] | hash_extensions.rb:28:10:28:10 | x [element] | provenance |  |
-| hash_extensions.rb:27:9:27:9 | h [element :a] | hash_extensions.rb:27:9:27:29 | call to deep_stringify_keys [element] | provenance |  |
-| hash_extensions.rb:27:9:27:29 | call to deep_stringify_keys [element] | hash_extensions.rb:27:5:27:5 | x [element] | provenance |  |
-| hash_extensions.rb:28:10:28:10 | x [element] | hash_extensions.rb:28:10:28:14 | ...[...] | provenance |  |
-| hash_extensions.rb:34:5:34:5 | h [element :a] | hash_extensions.rb:35:9:35:9 | h [element :a] | provenance |  |
-| hash_extensions.rb:34:9:34:26 | call to [] [element :a] | hash_extensions.rb:34:5:34:5 | h [element :a] | provenance |  |
-| hash_extensions.rb:34:14:34:24 | call to source | hash_extensions.rb:34:9:34:26 | call to [] [element :a] | provenance |  |
-| hash_extensions.rb:35:5:35:5 | x [element] | hash_extensions.rb:36:10:36:10 | x [element] | provenance |  |
-| hash_extensions.rb:35:9:35:9 | h [element :a] | hash_extensions.rb:35:9:35:29 | call to deep_symbolize_keys [element] | provenance |  |
-| hash_extensions.rb:35:9:35:29 | call to deep_symbolize_keys [element] | hash_extensions.rb:35:5:35:5 | x [element] | provenance |  |
-| hash_extensions.rb:36:10:36:10 | x [element] | hash_extensions.rb:36:10:36:14 | ...[...] | provenance |  |
+| hash_extensions.rb:27:5:27:5 | x [element :a] | hash_extensions.rb:28:10:28:10 | x [element :a] | provenance |  |
+| hash_extensions.rb:27:9:27:9 | h [element :a] | hash_extensions.rb:27:9:27:29 | call to deep_stringify_keys [element :a] | provenance |  |
+| hash_extensions.rb:27:9:27:29 | call to deep_stringify_keys [element :a] | hash_extensions.rb:27:5:27:5 | x [element :a] | provenance |  |
+| hash_extensions.rb:28:10:28:10 | x [element :a] | hash_extensions.rb:28:10:28:15 | ...[...] | provenance |  |
+| hash_extensions.rb:34:5:34:5 | h [element a] | hash_extensions.rb:35:9:35:9 | h [element a] | provenance |  |
+| hash_extensions.rb:34:9:34:30 | call to [] [element a] | hash_extensions.rb:34:5:34:5 | h [element a] | provenance |  |
+| hash_extensions.rb:34:18:34:28 | call to source | hash_extensions.rb:34:9:34:30 | call to [] [element a] | provenance |  |
+| hash_extensions.rb:35:5:35:5 | x [element a] | hash_extensions.rb:36:10:36:10 | x [element a] | provenance |  |
+| hash_extensions.rb:35:9:35:9 | h [element a] | hash_extensions.rb:35:9:35:29 | call to deep_symbolize_keys [element a] | provenance |  |
+| hash_extensions.rb:35:9:35:29 | call to deep_symbolize_keys [element a] | hash_extensions.rb:35:5:35:5 | x [element a] | provenance |  |
+| hash_extensions.rb:36:10:36:10 | x [element a] | hash_extensions.rb:36:10:36:14 | ...[...] | provenance |  |
 | hash_extensions.rb:42:5:42:5 | h [element :a] | hash_extensions.rb:43:9:43:9 | h [element :a] | provenance |  |
 | hash_extensions.rb:42:9:42:26 | call to [] [element :a] | hash_extensions.rb:42:5:42:5 | h [element :a] | provenance |  |
 | hash_extensions.rb:42:14:42:24 | call to source | hash_extensions.rb:42:9:42:26 | call to [] [element :a] | provenance |  |
-| hash_extensions.rb:43:5:43:5 | x [element] | hash_extensions.rb:44:10:44:10 | x [element] | provenance |  |
-| hash_extensions.rb:43:9:43:9 | h [element :a] | hash_extensions.rb:43:9:43:33 | call to with_indifferent_access [element] | provenance |  |
-| hash_extensions.rb:43:9:43:33 | call to with_indifferent_access [element] | hash_extensions.rb:43:5:43:5 | x [element] | provenance |  |
-| hash_extensions.rb:44:10:44:10 | x [element] | hash_extensions.rb:44:10:44:14 | ...[...] | provenance |  |
+| hash_extensions.rb:43:5:43:5 | x [element :a] | hash_extensions.rb:44:10:44:10 | x [element :a] | provenance |  |
+| hash_extensions.rb:43:9:43:9 | h [element :a] | hash_extensions.rb:43:9:43:33 | call to with_indifferent_access [element :a] | provenance |  |
+| hash_extensions.rb:43:9:43:33 | call to with_indifferent_access [element :a] | hash_extensions.rb:43:5:43:5 | x [element :a] | provenance |  |
+| hash_extensions.rb:44:10:44:10 | x [element :a] | hash_extensions.rb:44:10:44:15 | ...[...] | provenance |  |
 | hash_extensions.rb:50:5:50:5 | h [element :a] | hash_extensions.rb:51:9:51:9 | h [element :a] | provenance |  |
 | hash_extensions.rb:50:5:50:5 | h [element :b] | hash_extensions.rb:51:9:51:9 | h [element :b] | provenance |  |
 | hash_extensions.rb:50:5:50:5 | h [element :d] | hash_extensions.rb:51:9:51:9 | h [element :d] | provenance |  |
@@ -305,51 +305,51 @@ nodes
 | hash_extensions.rb:2:5:2:5 | h [element :a] | semmle.label | h [element :a] |
 | hash_extensions.rb:2:9:2:26 | call to [] [element :a] | semmle.label | call to [] [element :a] |
 | hash_extensions.rb:2:14:2:24 | call to source | semmle.label | call to source |
-| hash_extensions.rb:3:5:3:5 | x [element] | semmle.label | x [element] |
+| hash_extensions.rb:3:5:3:5 | x [element :a] | semmle.label | x [element :a] |
 | hash_extensions.rb:3:9:3:9 | h [element :a] | semmle.label | h [element :a] |
-| hash_extensions.rb:3:9:3:24 | call to stringify_keys [element] | semmle.label | call to stringify_keys [element] |
-| hash_extensions.rb:4:10:4:10 | x [element] | semmle.label | x [element] |
-| hash_extensions.rb:4:10:4:14 | ...[...] | semmle.label | ...[...] |
-| hash_extensions.rb:10:5:10:5 | h [element :a] | semmle.label | h [element :a] |
-| hash_extensions.rb:10:9:10:26 | call to [] [element :a] | semmle.label | call to [] [element :a] |
-| hash_extensions.rb:10:14:10:24 | call to source | semmle.label | call to source |
-| hash_extensions.rb:11:5:11:5 | x [element] | semmle.label | x [element] |
-| hash_extensions.rb:11:9:11:9 | h [element :a] | semmle.label | h [element :a] |
-| hash_extensions.rb:11:9:11:20 | call to to_options [element] | semmle.label | call to to_options [element] |
-| hash_extensions.rb:12:10:12:10 | x [element] | semmle.label | x [element] |
+| hash_extensions.rb:3:9:3:24 | call to stringify_keys [element :a] | semmle.label | call to stringify_keys [element :a] |
+| hash_extensions.rb:4:10:4:10 | x [element :a] | semmle.label | x [element :a] |
+| hash_extensions.rb:4:10:4:15 | ...[...] | semmle.label | ...[...] |
+| hash_extensions.rb:10:5:10:5 | h [element a] | semmle.label | h [element a] |
+| hash_extensions.rb:10:9:10:30 | call to [] [element a] | semmle.label | call to [] [element a] |
+| hash_extensions.rb:10:18:10:28 | call to source | semmle.label | call to source |
+| hash_extensions.rb:11:5:11:5 | x [element a] | semmle.label | x [element a] |
+| hash_extensions.rb:11:9:11:9 | h [element a] | semmle.label | h [element a] |
+| hash_extensions.rb:11:9:11:20 | call to to_options [element a] | semmle.label | call to to_options [element a] |
+| hash_extensions.rb:12:10:12:10 | x [element a] | semmle.label | x [element a] |
 | hash_extensions.rb:12:10:12:14 | ...[...] | semmle.label | ...[...] |
-| hash_extensions.rb:18:5:18:5 | h [element :a] | semmle.label | h [element :a] |
-| hash_extensions.rb:18:9:18:26 | call to [] [element :a] | semmle.label | call to [] [element :a] |
-| hash_extensions.rb:18:14:18:24 | call to source | semmle.label | call to source |
-| hash_extensions.rb:19:5:19:5 | x [element] | semmle.label | x [element] |
-| hash_extensions.rb:19:9:19:9 | h [element :a] | semmle.label | h [element :a] |
-| hash_extensions.rb:19:9:19:24 | call to symbolize_keys [element] | semmle.label | call to symbolize_keys [element] |
-| hash_extensions.rb:20:10:20:10 | x [element] | semmle.label | x [element] |
+| hash_extensions.rb:18:5:18:5 | h [element a] | semmle.label | h [element a] |
+| hash_extensions.rb:18:9:18:30 | call to [] [element a] | semmle.label | call to [] [element a] |
+| hash_extensions.rb:18:18:18:28 | call to source | semmle.label | call to source |
+| hash_extensions.rb:19:5:19:5 | x [element a] | semmle.label | x [element a] |
+| hash_extensions.rb:19:9:19:9 | h [element a] | semmle.label | h [element a] |
+| hash_extensions.rb:19:9:19:24 | call to symbolize_keys [element a] | semmle.label | call to symbolize_keys [element a] |
+| hash_extensions.rb:20:10:20:10 | x [element a] | semmle.label | x [element a] |
 | hash_extensions.rb:20:10:20:14 | ...[...] | semmle.label | ...[...] |
 | hash_extensions.rb:26:5:26:5 | h [element :a] | semmle.label | h [element :a] |
 | hash_extensions.rb:26:9:26:26 | call to [] [element :a] | semmle.label | call to [] [element :a] |
 | hash_extensions.rb:26:14:26:24 | call to source | semmle.label | call to source |
-| hash_extensions.rb:27:5:27:5 | x [element] | semmle.label | x [element] |
+| hash_extensions.rb:27:5:27:5 | x [element :a] | semmle.label | x [element :a] |
 | hash_extensions.rb:27:9:27:9 | h [element :a] | semmle.label | h [element :a] |
-| hash_extensions.rb:27:9:27:29 | call to deep_stringify_keys [element] | semmle.label | call to deep_stringify_keys [element] |
-| hash_extensions.rb:28:10:28:10 | x [element] | semmle.label | x [element] |
-| hash_extensions.rb:28:10:28:14 | ...[...] | semmle.label | ...[...] |
-| hash_extensions.rb:34:5:34:5 | h [element :a] | semmle.label | h [element :a] |
-| hash_extensions.rb:34:9:34:26 | call to [] [element :a] | semmle.label | call to [] [element :a] |
-| hash_extensions.rb:34:14:34:24 | call to source | semmle.label | call to source |
-| hash_extensions.rb:35:5:35:5 | x [element] | semmle.label | x [element] |
-| hash_extensions.rb:35:9:35:9 | h [element :a] | semmle.label | h [element :a] |
-| hash_extensions.rb:35:9:35:29 | call to deep_symbolize_keys [element] | semmle.label | call to deep_symbolize_keys [element] |
-| hash_extensions.rb:36:10:36:10 | x [element] | semmle.label | x [element] |
+| hash_extensions.rb:27:9:27:29 | call to deep_stringify_keys [element :a] | semmle.label | call to deep_stringify_keys [element :a] |
+| hash_extensions.rb:28:10:28:10 | x [element :a] | semmle.label | x [element :a] |
+| hash_extensions.rb:28:10:28:15 | ...[...] | semmle.label | ...[...] |
+| hash_extensions.rb:34:5:34:5 | h [element a] | semmle.label | h [element a] |
+| hash_extensions.rb:34:9:34:30 | call to [] [element a] | semmle.label | call to [] [element a] |
+| hash_extensions.rb:34:18:34:28 | call to source | semmle.label | call to source |
+| hash_extensions.rb:35:5:35:5 | x [element a] | semmle.label | x [element a] |
+| hash_extensions.rb:35:9:35:9 | h [element a] | semmle.label | h [element a] |
+| hash_extensions.rb:35:9:35:29 | call to deep_symbolize_keys [element a] | semmle.label | call to deep_symbolize_keys [element a] |
+| hash_extensions.rb:36:10:36:10 | x [element a] | semmle.label | x [element a] |
 | hash_extensions.rb:36:10:36:14 | ...[...] | semmle.label | ...[...] |
 | hash_extensions.rb:42:5:42:5 | h [element :a] | semmle.label | h [element :a] |
 | hash_extensions.rb:42:9:42:26 | call to [] [element :a] | semmle.label | call to [] [element :a] |
 | hash_extensions.rb:42:14:42:24 | call to source | semmle.label | call to source |
-| hash_extensions.rb:43:5:43:5 | x [element] | semmle.label | x [element] |
+| hash_extensions.rb:43:5:43:5 | x [element :a] | semmle.label | x [element :a] |
 | hash_extensions.rb:43:9:43:9 | h [element :a] | semmle.label | h [element :a] |
-| hash_extensions.rb:43:9:43:33 | call to with_indifferent_access [element] | semmle.label | call to with_indifferent_access [element] |
-| hash_extensions.rb:44:10:44:10 | x [element] | semmle.label | x [element] |
-| hash_extensions.rb:44:10:44:14 | ...[...] | semmle.label | ...[...] |
+| hash_extensions.rb:43:9:43:33 | call to with_indifferent_access [element :a] | semmle.label | call to with_indifferent_access [element :a] |
+| hash_extensions.rb:44:10:44:10 | x [element :a] | semmle.label | x [element :a] |
+| hash_extensions.rb:44:10:44:15 | ...[...] | semmle.label | ...[...] |
 | hash_extensions.rb:50:5:50:5 | h [element :a] | semmle.label | h [element :a] |
 | hash_extensions.rb:50:5:50:5 | h [element :b] | semmle.label | h [element :b] |
 | hash_extensions.rb:50:5:50:5 | h [element :d] | semmle.label | h [element :d] |
@@ -516,12 +516,12 @@ testFailures
 | active_support.rb:283:8:283:17 | call to presence | active_support.rb:282:7:282:16 | call to source | active_support.rb:283:8:283:17 | call to presence | $@ | active_support.rb:282:7:282:16 | call to source | call to source |
 | active_support.rb:286:8:286:17 | call to presence | active_support.rb:285:7:285:16 | call to source | active_support.rb:286:8:286:17 | call to presence | $@ | active_support.rb:285:7:285:16 | call to source | call to source |
 | active_support.rb:291:8:291:17 | call to deep_dup | active_support.rb:290:7:290:16 | call to source | active_support.rb:291:8:291:17 | call to deep_dup | $@ | active_support.rb:290:7:290:16 | call to source | call to source |
-| hash_extensions.rb:4:10:4:14 | ...[...] | hash_extensions.rb:2:14:2:24 | call to source | hash_extensions.rb:4:10:4:14 | ...[...] | $@ | hash_extensions.rb:2:14:2:24 | call to source | call to source |
-| hash_extensions.rb:12:10:12:14 | ...[...] | hash_extensions.rb:10:14:10:24 | call to source | hash_extensions.rb:12:10:12:14 | ...[...] | $@ | hash_extensions.rb:10:14:10:24 | call to source | call to source |
-| hash_extensions.rb:20:10:20:14 | ...[...] | hash_extensions.rb:18:14:18:24 | call to source | hash_extensions.rb:20:10:20:14 | ...[...] | $@ | hash_extensions.rb:18:14:18:24 | call to source | call to source |
-| hash_extensions.rb:28:10:28:14 | ...[...] | hash_extensions.rb:26:14:26:24 | call to source | hash_extensions.rb:28:10:28:14 | ...[...] | $@ | hash_extensions.rb:26:14:26:24 | call to source | call to source |
-| hash_extensions.rb:36:10:36:14 | ...[...] | hash_extensions.rb:34:14:34:24 | call to source | hash_extensions.rb:36:10:36:14 | ...[...] | $@ | hash_extensions.rb:34:14:34:24 | call to source | call to source |
-| hash_extensions.rb:44:10:44:14 | ...[...] | hash_extensions.rb:42:14:42:24 | call to source | hash_extensions.rb:44:10:44:14 | ...[...] | $@ | hash_extensions.rb:42:14:42:24 | call to source | call to source |
+| hash_extensions.rb:4:10:4:15 | ...[...] | hash_extensions.rb:2:14:2:24 | call to source | hash_extensions.rb:4:10:4:15 | ...[...] | $@ | hash_extensions.rb:2:14:2:24 | call to source | call to source |
+| hash_extensions.rb:12:10:12:14 | ...[...] | hash_extensions.rb:10:18:10:28 | call to source | hash_extensions.rb:12:10:12:14 | ...[...] | $@ | hash_extensions.rb:10:18:10:28 | call to source | call to source |
+| hash_extensions.rb:20:10:20:14 | ...[...] | hash_extensions.rb:18:18:18:28 | call to source | hash_extensions.rb:20:10:20:14 | ...[...] | $@ | hash_extensions.rb:18:18:18:28 | call to source | call to source |
+| hash_extensions.rb:28:10:28:15 | ...[...] | hash_extensions.rb:26:14:26:24 | call to source | hash_extensions.rb:28:10:28:15 | ...[...] | $@ | hash_extensions.rb:26:14:26:24 | call to source | call to source |
+| hash_extensions.rb:36:10:36:14 | ...[...] | hash_extensions.rb:34:18:34:28 | call to source | hash_extensions.rb:36:10:36:14 | ...[...] | $@ | hash_extensions.rb:34:18:34:28 | call to source | call to source |
+| hash_extensions.rb:44:10:44:15 | ...[...] | hash_extensions.rb:42:14:42:24 | call to source | hash_extensions.rb:44:10:44:15 | ...[...] | $@ | hash_extensions.rb:42:14:42:24 | call to source | call to source |
 | hash_extensions.rb:56:10:56:14 | ...[...] | hash_extensions.rb:50:52:50:61 | call to taint | hash_extensions.rb:56:10:56:14 | ...[...] | $@ | hash_extensions.rb:50:52:50:61 | call to taint | call to taint |
 | hash_extensions.rb:58:10:58:14 | ...[...] | hash_extensions.rb:50:14:50:23 | call to taint | hash_extensions.rb:58:10:58:14 | ...[...] | $@ | hash_extensions.rb:50:14:50:23 | call to taint | call to taint |
 | hash_extensions.rb:59:10:59:14 | ...[...] | hash_extensions.rb:50:29:50:38 | call to taint | hash_extensions.rb:59:10:59:14 | ...[...] | $@ | hash_extensions.rb:50:29:50:38 | call to taint | call to taint |
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 63d4e7a588d..9222620fef4 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,13 +1,13 @@
 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()
 
 def m_to_options
-    h = { a: source("a") }
+    h = { "a" => source("a") }
     x = h.to_options
     sink x[:a] # $hasValueFlow=a
 end
@@ -15,7 +15,7 @@ end
 m_to_options()
 
 def m_symbolize_keys
-    h = { a: source("a") }
+    h = { "a" => source("a") }
     x = h.symbolize_keys
     sink x[:a] # $hasValueFlow=a
 end
@@ -25,13 +25,13 @@ 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()
 
 def m_deep_symbolize_keys
-    h = { a: source("a") }
+    h = { "a" => source("a") }
     x = h.deep_symbolize_keys
     sink x[:a] # $hasValueFlow=a
 end
@@ -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/sinatra/Flow.expected b/ruby/ql/test/library-tests/frameworks/sinatra/Flow.expected
index a2bd996af99..a321bd2cfdf 100644
--- a/ruby/ql/test/library-tests/frameworks/sinatra/Flow.expected
+++ b/ruby/ql/test/library-tests/frameworks/sinatra/Flow.expected
@@ -23,7 +23,7 @@ nodes
 | views/index.erb:2:10:2:12 | call to foo | semmle.label | call to foo |
 subpaths
 testFailures
-| views/index.erb:2:10:2:12 | call to foo | Unexpected result: hasTaintFlow= |
+| views/index.erb:2:10:2:12 | call to foo | Unexpected result: hasTaintFlow |
 #select
 | app.rb:95:10:95:14 | @user | app.rb:103:13:103:22 | call to source | app.rb:95:10:95:14 | @user | $@ | app.rb:103:13:103:22 | call to source | call to source |
 | views/index.erb:2:10:2:12 | call to foo | app.rb:75:12:75:17 | call to params | views/index.erb:2:10:2:12 | call to foo | $@ | app.rb:75:12:75:17 | call to params | call to params |
diff --git a/ruby/ql/test/library-tests/frameworks/sinatra/Sinatra.expected b/ruby/ql/test/library-tests/frameworks/sinatra/Sinatra.expected
index 71adfaf8478..e8d50ed8ba3 100644
--- a/ruby/ql/test/library-tests/frameworks/sinatra/Sinatra.expected
+++ b/ruby/ql/test/library-tests/frameworks/sinatra/Sinatra.expected
@@ -32,7 +32,7 @@ params
 erbCalls
 | app.rb:76:5:76:36 | call to erb | views/index.erb:0:0:0:0 | views/index.erb |
 erbSyntheticGlobals
-| SinatraErbLocalsHash(library-tests/frameworks/sinatra/views/index.erb,library-tests/frameworks/sinatra/app.rb@76:5:76:36) | views/index.erb:0:0:0:0 | views/index.erb |
+| SinatraErbLocalsHash(views/index.erb,app.rb@76:5:76:36) | views/index.erb:0:0:0:0 | views/index.erb |
 filters
 | app.rb:84:3:87:5 | call to before | before |
 | app.rb:98:3:100:5 | call to after | after |
diff --git a/ruby/ql/test/query-tests/diagnostics/CONSISTENCY/AstConsistency.expected b/ruby/ql/test/query-tests/diagnostics/CONSISTENCY/AstConsistency.expected
index 5dc14116b91..93df75151a7 100644
--- a/ruby/ql/test/query-tests/diagnostics/CONSISTENCY/AstConsistency.expected
+++ b/ruby/ql/test/query-tests/diagnostics/CONSISTENCY/AstConsistency.expected
@@ -1,2 +1,2 @@
-extractionError
+extractionWarning
 | src/not_ruby.rb:5:25:5:26 | A parse error occurred. Check the syntax of the file. If the file is invalid, correct the error or exclude the file from analysis. |
diff --git a/ruby/ql/test/query-tests/diagnostics/ExtractionErrors.expected b/ruby/ql/test/query-tests/diagnostics/ExtractionErrors.expected
index dc37ca3642b..e69de29bb2d 100644
--- a/ruby/ql/test/query-tests/diagnostics/ExtractionErrors.expected
+++ b/ruby/ql/test/query-tests/diagnostics/ExtractionErrors.expected
@@ -1 +0,0 @@
-| src/not_ruby.rb:5:25:5:26 | A parse error occurred. Check the syntax of the file. If the file is invalid, correct the error or exclude the file from analysis. | Extraction failed in src/not_ruby.rb with error A parse error occurred. Check the syntax of the file. If the file is invalid, correct the error or exclude the file from analysis. | 2 |
diff --git a/ruby/ql/test/query-tests/diagnostics/ExtractionWarnings.expected b/ruby/ql/test/query-tests/diagnostics/ExtractionWarnings.expected
new file mode 100644
index 00000000000..c47ec9c5d36
--- /dev/null
+++ b/ruby/ql/test/query-tests/diagnostics/ExtractionWarnings.expected
@@ -0,0 +1 @@
+| src/not_ruby.rb:5:25:5:26 | A parse error occurred. Check the syntax of the file. If the file is invalid, correct the error or exclude the file from analysis. | Extraction warning in src/not_ruby.rb with message A parse error occurred. Check the syntax of the file. If the file is invalid, correct the error or exclude the file from analysis. | 1 |
diff --git a/ruby/ql/test/query-tests/diagnostics/ExtractionWarnings.qlref b/ruby/ql/test/query-tests/diagnostics/ExtractionWarnings.qlref
new file mode 100644
index 00000000000..ff6e566d20a
--- /dev/null
+++ b/ruby/ql/test/query-tests/diagnostics/ExtractionWarnings.qlref
@@ -0,0 +1 @@
+queries/diagnostics/ExtractionWarnings.ql
diff --git a/ruby/ql/test/query-tests/experimental/LdapInjection/Ldapinjection.expected b/ruby/ql/test/query-tests/experimental/LdapInjection/Ldapinjection.expected
index a69064a3d09..1eec0daa4c4 100644
--- a/ruby/ql/test/query-tests/experimental/LdapInjection/Ldapinjection.expected
+++ b/ruby/ql/test/query-tests/experimental/LdapInjection/Ldapinjection.expected
@@ -6,9 +6,8 @@ edges
 | LdapInjection.rb:9:5:9:8 | name | LdapInjection.rb:33:88:33:91 | name | provenance |  |
 | LdapInjection.rb:9:12:9:17 | call to params | LdapInjection.rb:9:12:9:29 | ...[...] | provenance |  |
 | LdapInjection.rb:9:12:9:29 | ...[...] | LdapInjection.rb:9:5:9:8 | name | provenance |  |
-| LdapInjection.rb:33:87:33:92 | call to [] [element 0] | LdapInjection.rb:33:87:33:92 | call to [] | provenance |  |
+| LdapInjection.rb:33:88:33:91 | name | LdapInjection.rb:33:87:33:92 | call to [] | provenance |  |
 | LdapInjection.rb:33:88:33:91 | name | LdapInjection.rb:33:87:33:92 | call to [] | provenance | Config |
-| LdapInjection.rb:33:88:33:91 | name | LdapInjection.rb:33:87:33:92 | call to [] [element 0] | provenance |  |
 | LdapInjection.rb:33:88:33:91 | name | LdapInjection.rb:37:41:37:44 | name | provenance |  |
 | LdapInjection.rb:37:5:37:10 | filter | LdapInjection.rb:38:62:38:67 | filter | provenance |  |
 | LdapInjection.rb:37:14:37:45 | call to eq | LdapInjection.rb:37:5:37:10 | filter | provenance |  |
@@ -23,7 +22,6 @@ nodes
 | LdapInjection.rb:25:23:25:49 | "ou=people,dc=#{...},dc=com" | semmle.label | "ou=people,dc=#{...},dc=com" |
 | LdapInjection.rb:29:62:29:73 | "cn=#{...}" | semmle.label | "cn=#{...}" |
 | LdapInjection.rb:33:87:33:92 | call to [] | semmle.label | call to [] |
-| LdapInjection.rb:33:87:33:92 | call to [] [element 0] | semmle.label | call to [] [element 0] |
 | LdapInjection.rb:33:88:33:91 | name | semmle.label | name |
 | LdapInjection.rb:37:5:37:10 | filter | semmle.label | filter |
 | LdapInjection.rb:37:14:37:45 | call to eq | semmle.label | call to eq |
diff --git a/ruby/ql/test/query-tests/security/cwe-022/ArchiveApiPathTraversal.rb b/ruby/ql/test/query-tests/security/cwe-022/ArchiveApiPathTraversal.rb
index 9708d3770bc..046322fdbc8 100644
--- a/ruby/ql/test/query-tests/security/cwe-022/ArchiveApiPathTraversal.rb
+++ b/ruby/ql/test/query-tests/security/cwe-022/ArchiveApiPathTraversal.rb
@@ -2,17 +2,17 @@ class TestContoller < ActionController::Base
   
   # this is vulnerable
   def upload
-    untar params[:file], params[:filename]
+    untar params[:file], params[:filename] # $ Source=upload
   end
 
   # this is vulnerable
   def unpload_zip
-    unzip params[:file]
+    unzip params[:file] # $ Source=upload_zip
   end
 
   # this is vulnerable
   def create_new_zip
-    zip params[:filename], files
+    zip params[:filename], files # $ Source=create_new_zip
   end
 
   # these are not vulnerable because of the string compare sanitizer
@@ -56,7 +56,7 @@ class TestContoller < ActionController::Base
         else
           destination_directory = File.dirname(destination_file)
           FileUtils.mkdir_p destination_directory unless File.directory?(destination_directory)
-          File.open destination_file, "wb" do |f|
+          File.open destination_file, "wb" do |f| # $ Alert=upload
             f.print tarfile.read
           end
         end
@@ -65,7 +65,7 @@ class TestContoller < ActionController::Base
   end
 
   def unzip(file)
-    Zip::File.open(file) do |zip_file|
+    Zip::File.open(file) do |zip_file| # $ Alert=upload_zip
       zip_file.each do |entry|
         entry.extract
       end
@@ -73,7 +73,7 @@ class TestContoller < ActionController::Base
   end
 
   def zip(filename, files = [])
-    Zip::File.new(filename) do |zf|
+    Zip::File.new(filename) do |zf| # $ Alert=create_new_zip
       files.each do |f|
         zf.add f
       end
diff --git a/ruby/ql/test/query-tests/security/cwe-022/PathInjection.expected b/ruby/ql/test/query-tests/security/cwe-022/PathInjection.expected
index cf65d245723..af3a962886b 100644
--- a/ruby/ql/test/query-tests/security/cwe-022/PathInjection.expected
+++ b/ruby/ql/test/query-tests/security/cwe-022/PathInjection.expected
@@ -1,3 +1,22 @@
+#select
+| ArchiveApiPathTraversal.rb:59:21:59:36 | destination_file | ArchiveApiPathTraversal.rb:5:26:5:31 | call to params | ArchiveApiPathTraversal.rb:59:21:59:36 | destination_file | This path depends on a $@. | ArchiveApiPathTraversal.rb:5:26:5:31 | call to params | user-provided value |
+| ArchiveApiPathTraversal.rb:68:20:68:23 | file | ArchiveApiPathTraversal.rb:10:11:10:16 | call to params | ArchiveApiPathTraversal.rb:68:20:68:23 | file | This path depends on a $@. | ArchiveApiPathTraversal.rb:10:11:10:16 | call to params | user-provided value |
+| ArchiveApiPathTraversal.rb:76:19:76:26 | filename | ArchiveApiPathTraversal.rb:15:9:15:14 | call to params | ArchiveApiPathTraversal.rb:76:19:76:26 | filename | This path depends on a $@. | ArchiveApiPathTraversal.rb:15:9:15:14 | call to params | user-provided value |
+| tainted_path.rb:5:26:5:29 | path | tainted_path.rb:4:12:4:17 | call to params | tainted_path.rb:5:26:5:29 | path | This path depends on a $@. | tainted_path.rb:4:12:4:17 | call to params | user-provided value |
+| tainted_path.rb:11:26:11:29 | path | tainted_path.rb:10:31:10:36 | call to params | tainted_path.rb:11:26:11:29 | path | This path depends on a $@. | tainted_path.rb:10:31:10:36 | call to params | user-provided value |
+| tainted_path.rb:17:26:17:29 | path | tainted_path.rb:16:28:16:33 | call to params | tainted_path.rb:17:26:17:29 | path | This path depends on a $@. | tainted_path.rb:16:28:16:33 | call to params | user-provided value |
+| tainted_path.rb:23:26:23:29 | path | tainted_path.rb:22:29:22:34 | call to params | tainted_path.rb:23:26:23:29 | path | This path depends on a $@. | tainted_path.rb:22:29:22:34 | call to params | user-provided value |
+| tainted_path.rb:29:26:29:29 | path | tainted_path.rb:28:22:28:27 | call to params | tainted_path.rb:29:26:29:29 | path | This path depends on a $@. | tainted_path.rb:28:22:28:27 | call to params | user-provided value |
+| tainted_path.rb:35:26:35:29 | path | tainted_path.rb:34:29:34:34 | call to params | tainted_path.rb:35:26:35:29 | path | This path depends on a $@. | tainted_path.rb:34:29:34:34 | call to params | user-provided value |
+| tainted_path.rb:41:26:41:29 | path | tainted_path.rb:40:26:40:31 | call to params | tainted_path.rb:41:26:41:29 | path | This path depends on a $@. | tainted_path.rb:40:26:40:31 | call to params | user-provided value |
+| tainted_path.rb:48:26:48:29 | path | tainted_path.rb:47:43:47:48 | call to params | tainted_path.rb:48:26:48:29 | path | This path depends on a $@. | tainted_path.rb:47:43:47:48 | call to params | user-provided value |
+| tainted_path.rb:60:26:60:29 | path | tainted_path.rb:59:40:59:45 | call to params | tainted_path.rb:60:26:60:29 | path | This path depends on a $@. | tainted_path.rb:59:40:59:45 | call to params | user-provided value |
+| tainted_path.rb:72:15:72:18 | path | tainted_path.rb:71:40:71:45 | call to params | tainted_path.rb:72:15:72:18 | path | This path depends on a $@. | tainted_path.rb:71:40:71:45 | call to params | user-provided value |
+| tainted_path.rb:78:19:78:22 | path | tainted_path.rb:77:40:77:45 | call to params | tainted_path.rb:78:19:78:22 | path | This path depends on a $@. | tainted_path.rb:77:40:77:45 | call to params | user-provided value |
+| tainted_path.rb:79:14:79:17 | path | tainted_path.rb:77:40:77:45 | call to params | tainted_path.rb:79:14:79:17 | path | This path depends on a $@. | tainted_path.rb:77:40:77:45 | call to params | user-provided value |
+| tainted_path.rb:85:10:85:13 | path | tainted_path.rb:84:40:84:45 | call to params | tainted_path.rb:85:10:85:13 | path | This path depends on a $@. | tainted_path.rb:84:40:84:45 | call to params | user-provided value |
+| tainted_path.rb:86:25:86:28 | path | tainted_path.rb:84:40:84:45 | call to params | tainted_path.rb:86:25:86:28 | path | This path depends on a $@. | tainted_path.rb:84:40:84:45 | call to params | user-provided value |
+| tainted_path.rb:92:11:92:14 | path | tainted_path.rb:90:40:90:45 | call to params | tainted_path.rb:92:11:92:14 | path | This path depends on a $@. | tainted_path.rb:90:40:90:45 | call to params | user-provided value |
 edges
 | ArchiveApiPathTraversal.rb:5:26:5:31 | call to params | ArchiveApiPathTraversal.rb:5:26:5:42 | ...[...] | provenance |  |
 | ArchiveApiPathTraversal.rb:5:26:5:42 | ...[...] | ArchiveApiPathTraversal.rb:49:17:49:27 | destination | provenance |  |
@@ -152,22 +171,3 @@ nodes
 | tainted_path.rb:90:40:90:52 | ...[...] | semmle.label | ...[...] |
 | tainted_path.rb:92:11:92:14 | path | semmle.label | path |
 subpaths
-#select
-| ArchiveApiPathTraversal.rb:59:21:59:36 | destination_file | ArchiveApiPathTraversal.rb:5:26:5:31 | call to params | ArchiveApiPathTraversal.rb:59:21:59:36 | destination_file | This path depends on a $@. | ArchiveApiPathTraversal.rb:5:26:5:31 | call to params | user-provided value |
-| ArchiveApiPathTraversal.rb:68:20:68:23 | file | ArchiveApiPathTraversal.rb:10:11:10:16 | call to params | ArchiveApiPathTraversal.rb:68:20:68:23 | file | This path depends on a $@. | ArchiveApiPathTraversal.rb:10:11:10:16 | call to params | user-provided value |
-| ArchiveApiPathTraversal.rb:76:19:76:26 | filename | ArchiveApiPathTraversal.rb:15:9:15:14 | call to params | ArchiveApiPathTraversal.rb:76:19:76:26 | filename | This path depends on a $@. | ArchiveApiPathTraversal.rb:15:9:15:14 | call to params | user-provided value |
-| tainted_path.rb:5:26:5:29 | path | tainted_path.rb:4:12:4:17 | call to params | tainted_path.rb:5:26:5:29 | path | This path depends on a $@. | tainted_path.rb:4:12:4:17 | call to params | user-provided value |
-| tainted_path.rb:11:26:11:29 | path | tainted_path.rb:10:31:10:36 | call to params | tainted_path.rb:11:26:11:29 | path | This path depends on a $@. | tainted_path.rb:10:31:10:36 | call to params | user-provided value |
-| tainted_path.rb:17:26:17:29 | path | tainted_path.rb:16:28:16:33 | call to params | tainted_path.rb:17:26:17:29 | path | This path depends on a $@. | tainted_path.rb:16:28:16:33 | call to params | user-provided value |
-| tainted_path.rb:23:26:23:29 | path | tainted_path.rb:22:29:22:34 | call to params | tainted_path.rb:23:26:23:29 | path | This path depends on a $@. | tainted_path.rb:22:29:22:34 | call to params | user-provided value |
-| tainted_path.rb:29:26:29:29 | path | tainted_path.rb:28:22:28:27 | call to params | tainted_path.rb:29:26:29:29 | path | This path depends on a $@. | tainted_path.rb:28:22:28:27 | call to params | user-provided value |
-| tainted_path.rb:35:26:35:29 | path | tainted_path.rb:34:29:34:34 | call to params | tainted_path.rb:35:26:35:29 | path | This path depends on a $@. | tainted_path.rb:34:29:34:34 | call to params | user-provided value |
-| tainted_path.rb:41:26:41:29 | path | tainted_path.rb:40:26:40:31 | call to params | tainted_path.rb:41:26:41:29 | path | This path depends on a $@. | tainted_path.rb:40:26:40:31 | call to params | user-provided value |
-| tainted_path.rb:48:26:48:29 | path | tainted_path.rb:47:43:47:48 | call to params | tainted_path.rb:48:26:48:29 | path | This path depends on a $@. | tainted_path.rb:47:43:47:48 | call to params | user-provided value |
-| tainted_path.rb:60:26:60:29 | path | tainted_path.rb:59:40:59:45 | call to params | tainted_path.rb:60:26:60:29 | path | This path depends on a $@. | tainted_path.rb:59:40:59:45 | call to params | user-provided value |
-| tainted_path.rb:72:15:72:18 | path | tainted_path.rb:71:40:71:45 | call to params | tainted_path.rb:72:15:72:18 | path | This path depends on a $@. | tainted_path.rb:71:40:71:45 | call to params | user-provided value |
-| tainted_path.rb:78:19:78:22 | path | tainted_path.rb:77:40:77:45 | call to params | tainted_path.rb:78:19:78:22 | path | This path depends on a $@. | tainted_path.rb:77:40:77:45 | call to params | user-provided value |
-| tainted_path.rb:79:14:79:17 | path | tainted_path.rb:77:40:77:45 | call to params | tainted_path.rb:79:14:79:17 | path | This path depends on a $@. | tainted_path.rb:77:40:77:45 | call to params | user-provided value |
-| tainted_path.rb:85:10:85:13 | path | tainted_path.rb:84:40:84:45 | call to params | tainted_path.rb:85:10:85:13 | path | This path depends on a $@. | tainted_path.rb:84:40:84:45 | call to params | user-provided value |
-| tainted_path.rb:86:25:86:28 | path | tainted_path.rb:84:40:84:45 | call to params | tainted_path.rb:86:25:86:28 | path | This path depends on a $@. | tainted_path.rb:84:40:84:45 | call to params | user-provided value |
-| tainted_path.rb:92:11:92:14 | path | tainted_path.rb:90:40:90:45 | call to params | tainted_path.rb:92:11:92:14 | path | This path depends on a $@. | tainted_path.rb:90:40:90:45 | call to params | user-provided value |
diff --git a/ruby/ql/test/query-tests/security/cwe-022/PathInjection.qlref b/ruby/ql/test/query-tests/security/cwe-022/PathInjection.qlref
index 7b98278f7a7..07015c90435 100644
--- a/ruby/ql/test/query-tests/security/cwe-022/PathInjection.qlref
+++ b/ruby/ql/test/query-tests/security/cwe-022/PathInjection.qlref
@@ -1 +1,2 @@
-queries/security/cwe-022/PathInjection.ql
+query: queries/security/cwe-022/PathInjection.ql
+postprocess: TestUtilities/InlineExpectationsTestQuery.ql
diff --git a/ruby/ql/test/query-tests/security/cwe-022/tainted_path.rb b/ruby/ql/test/query-tests/security/cwe-022/tainted_path.rb
index d47607e6734..b7e89442c52 100644
--- a/ruby/ql/test/query-tests/security/cwe-022/tainted_path.rb
+++ b/ruby/ql/test/query-tests/security/cwe-022/tainted_path.rb
@@ -1,51 +1,51 @@
 class FooController < ActionController::Base
   # BAD
   def route0
-    path = params[:path]
-    @content = File.read path
+    path = params[:path] # $ Source=path1
+    @content = File.read path # $ Alert=path1
   end
 
   # BAD - File.absolute_path preserves taint
   def route1
-    path = File.absolute_path params[:path]
-    @content = File.read path
+    path = File.absolute_path params[:path] # $ Source=path2
+    @content = File.read path # $ Alert=path2
   end
 
   # BAD - File.dirname preserves taint
   def route2
-    path = "#{File.dirname(params[:path])}/foo"
-    @content = File.read path
+    path = "#{File.dirname(params[:path])}/foo" # $ Source=path3
+    @content = File.read path # $ Alert=path3
   end
 
   # BAD - File.expand_path preserves taint
   def route3
-    path = File.expand_path params[:path]
-    @content = File.read path
+    path = File.expand_path params[:path] # $ Source=path4
+    @content = File.read path # $ Alert=path4
   end
 
   # BAD - File.path preserves taint
   def route4
-    path = File.path params[:path]
-    @content = File.read path
+    path = File.path params[:path] # $ Source=path5
+    @content = File.read path # $ Alert=path5
   end
 
   # BAD - File.realdirpath preserves taint
   def route5
-    path = File.realdirpath params[:path]
-    @content = File.read path
+    path = File.realdirpath params[:path] # $ Source=path6
+    @content = File.read path # $ Alert=path6
   end
 
   # BAD - File.realpath preserves taint
   def route6
-    path = File.realpath params[:path]
-    @content = File.read path
+    path = File.realpath params[:path] # $ Source=path7
+    @content = File.read path # $ Alert=path7
   end
 
   # BAD - tainted arguments in any position propagate to the return value of
   # File.join
   def route7
-    path = File.join("foo", "bar", "baz", params[:path], "qux")
-    @content = File.read path
+    path = File.join("foo", "bar", "baz", params[:path], "qux") # $ Source=path8
+    @content = File.read path # $ Alert=path8
   end
 
   # GOOD - File.basename does not preserve taint
@@ -56,8 +56,8 @@ class FooController < ActionController::Base
 
   # BAD
   def route9
-    path = ActiveStorage::Filename.new(params[:path])
-    @content = File.read path
+    path = ActiveStorage::Filename.new(params[:path]) # $ Source=path9
+    @content = File.read path # $ Alert=path9
   end
 
   # GOOD - explicitly sanitized
@@ -68,27 +68,27 @@ class FooController < ActionController::Base
 
   # BAD
   def route11
-    path = ActiveStorage::Filename.new(params[:path])
-    send_file path
+    path = ActiveStorage::Filename.new(params[:path]) # $ Source=path10
+    send_file path # $ Alert=path10
   end
 
   # BAD
   def route12
-    path = ActiveStorage::Filename.new(params[:path])
-    bla (Dir.glob path)
-    bla (Dir[path])
+    path = ActiveStorage::Filename.new(params[:path]) # $ Source=path11
+    bla (Dir.glob path) # $ Alert=path11
+    bla (Dir[path]) # $ Alert=path11
   end
 
   # BAD
   def route13
-    path = ActiveStorage::Filename.new(params[:path])
-    load(path)
-    autoload(:MyModule, path)
+    path = ActiveStorage::Filename.new(params[:path]) # $ Source=path12
+    load(path) # $ Alert=path12
+    autoload(:MyModule, path) # $ Alert=path12
   end
 
   def require_relative()
-    path = ActiveStorage::Filename.new(params[:path])
+    path = ActiveStorage::Filename.new(params[:path]) # $ Source=path13
     puts "Debug: require_relative(#{path})"
-    super(path)
+    super(path) # $ Alert=path13
   end
 end
diff --git a/ruby/ql/test/query-tests/security/cwe-078/CommandInjection/CommandInjection.expected b/ruby/ql/test/query-tests/security/cwe-078/CommandInjection/CommandInjection.expected
index 125320dc4c1..049edf75ace 100644
--- a/ruby/ql/test/query-tests/security/cwe-078/CommandInjection/CommandInjection.expected
+++ b/ruby/ql/test/query-tests/security/cwe-078/CommandInjection/CommandInjection.expected
@@ -24,7 +24,7 @@ edges
 | CommandInjection.rb:103:9:103:12 | file | CommandInjection.rb:104:16:104:28 | "cat #{...}" | provenance | AdditionalTaintStep |
 | CommandInjection.rb:103:16:103:21 | call to params | CommandInjection.rb:103:16:103:28 | ...[...] | provenance |  |
 | CommandInjection.rb:103:16:103:28 | ...[...] | CommandInjection.rb:103:9:103:12 | file | provenance |  |
-| CommandInjection.rb:111:33:111:38 | call to params | CommandInjection.rb:111:33:111:44 | ...[...] | provenance |  Sink:MaD:1 |
+| CommandInjection.rb:111:33:111:38 | call to params | CommandInjection.rb:111:33:111:44 | ...[...] | provenance | Sink:MaD:1 |
 | CommandInjection.rb:113:44:113:49 | call to params | CommandInjection.rb:113:44:113:54 | ...[...] | provenance |  |
 | CommandInjection.rb:113:44:113:54 | ...[...] | CommandInjection.rb:113:41:113:56 | "#{...}" | provenance | AdditionalTaintStep Sink:MaD:2 |
 nodes
diff --git a/ruby/ql/test/query-tests/security/cwe-079/ReflectedXSS.expected b/ruby/ql/test/query-tests/security/cwe-079/ReflectedXSS.expected
index 067a0933e53..8434b2761e0 100644
--- a/ruby/ql/test/query-tests/security/cwe-079/ReflectedXSS.expected
+++ b/ruby/ql/test/query-tests/security/cwe-079/ReflectedXSS.expected
@@ -36,14 +36,12 @@ edges
 | app/controllers/foo/bars_controller.rb:36:34:36:51 | ...[...] | app/controllers/foo/bars_controller.rb:36:5:36:52 | call to t | provenance |  |
 | app/controllers/foo/bars_controller.rb:37:42:37:47 | call to params | app/controllers/foo/bars_controller.rb:37:42:37:59 | ...[...] | provenance |  |
 | app/controllers/foo/bars_controller.rb:37:42:37:59 | ...[...] | app/controllers/foo/bars_controller.rb:37:5:37:60 | call to translate | provenance |  |
-| app/views/foo/bars/_widget.html.erb:5:9:5:20 | call to display_text [element] | app/views/foo/bars/_widget.html.erb:5:9:5:20 | call to display_text | provenance |  |
-| app/views/foo/bars/_widget.html.erb:8:9:8:21 | call to local_assigns [element :display_text, element] | app/views/foo/bars/_widget.html.erb:8:9:8:36 | ...[...] [element] | provenance |  |
+| app/views/foo/bars/_widget.html.erb:8:9:8:21 | call to local_assigns [element :display_text, element] | app/views/foo/bars/_widget.html.erb:8:9:8:36 | ...[...] | provenance |  |
 | app/views/foo/bars/_widget.html.erb:8:9:8:21 | call to local_assigns [element :display_text] | app/views/foo/bars/_widget.html.erb:8:9:8:36 | ...[...] | provenance |  |
-| app/views/foo/bars/_widget.html.erb:8:9:8:36 | ...[...] [element] | app/views/foo/bars/_widget.html.erb:8:9:8:36 | ...[...] | provenance |  |
 | app/views/foo/bars/show.html.erb:8:9:8:21 | call to local_assigns [element :display_text] | app/views/foo/bars/show.html.erb:8:9:8:36 | ...[...] | provenance |  |
 | app/views/foo/bars/show.html.erb:12:9:12:21 | call to local_assigns [element :display_text] | app/views/foo/bars/show.html.erb:12:9:12:26 | ...[...] | provenance |  |
 | app/views/foo/bars/show.html.erb:17:15:17:27 | call to local_assigns [element :display_text] | app/views/foo/bars/show.html.erb:17:15:17:32 | ...[...] | provenance |  |
-| app/views/foo/bars/show.html.erb:43:48:43:89 | call to [] [element :display_text, element] | app/views/foo/bars/_widget.html.erb:5:9:5:20 | call to display_text [element] | provenance |  |
+| app/views/foo/bars/show.html.erb:43:48:43:89 | call to [] [element :display_text, element] | app/views/foo/bars/_widget.html.erb:5:9:5:20 | call to display_text | provenance |  |
 | app/views/foo/bars/show.html.erb:43:48:43:89 | call to [] [element :display_text, element] | app/views/foo/bars/_widget.html.erb:8:9:8:21 | call to local_assigns [element :display_text, element] | provenance |  |
 | app/views/foo/bars/show.html.erb:43:48:43:89 | call to [] [element :display_text] | app/views/foo/bars/_widget.html.erb:5:9:5:20 | call to display_text | provenance |  |
 | app/views/foo/bars/show.html.erb:43:48:43:89 | call to [] [element :display_text] | app/views/foo/bars/_widget.html.erb:8:9:8:21 | call to local_assigns [element :display_text] | provenance |  |
@@ -91,11 +89,9 @@ nodes
 | app/controllers/foo/bars_controller.rb:37:42:37:47 | call to params | semmle.label | call to params |
 | app/controllers/foo/bars_controller.rb:37:42:37:59 | ...[...] | semmle.label | ...[...] |
 | app/views/foo/bars/_widget.html.erb:5:9:5:20 | call to display_text | semmle.label | call to display_text |
-| app/views/foo/bars/_widget.html.erb:5:9:5:20 | call to display_text [element] | semmle.label | call to display_text [element] |
 | app/views/foo/bars/_widget.html.erb:8:9:8:21 | call to local_assigns [element :display_text, element] | semmle.label | call to local_assigns [element :display_text, element] |
 | app/views/foo/bars/_widget.html.erb:8:9:8:21 | call to local_assigns [element :display_text] | semmle.label | call to local_assigns [element :display_text] |
 | app/views/foo/bars/_widget.html.erb:8:9:8:36 | ...[...] | semmle.label | ...[...] |
-| app/views/foo/bars/_widget.html.erb:8:9:8:36 | ...[...] [element] | semmle.label | ...[...] [element] |
 | app/views/foo/bars/show.html.erb:2:18:2:30 | @user_website | semmle.label | @user_website |
 | app/views/foo/bars/show.html.erb:5:9:5:20 | call to display_text | semmle.label | call to display_text |
 | app/views/foo/bars/show.html.erb:8:9:8:21 | call to local_assigns [element :display_text] | semmle.label | call to local_assigns [element :display_text] |
diff --git a/ruby/ql/test/query-tests/security/cwe-079/StoredXSS.expected b/ruby/ql/test/query-tests/security/cwe-079/StoredXSS.expected
index d778dadc91b..ac33b45f06f 100644
--- a/ruby/ql/test/query-tests/security/cwe-079/StoredXSS.expected
+++ b/ruby/ql/test/query-tests/security/cwe-079/StoredXSS.expected
@@ -10,14 +10,12 @@ edges
 | app/controllers/foo/stores_controller.rb:13:39:13:78 | call to [] [element :display_text] | app/views/foo/stores/show.html.erb:32:3:32:14 | call to display_text | provenance |  |
 | app/controllers/foo/stores_controller.rb:13:39:13:78 | call to [] [element :display_text] | app/views/foo/stores/show.html.erb:40:76:40:87 | call to display_text | provenance |  |
 | app/controllers/foo/stores_controller.rb:13:55:13:56 | dt | app/controllers/foo/stores_controller.rb:13:39:13:78 | call to [] [element :display_text] | provenance |  |
-| app/views/foo/bars/_widget.html.erb:5:9:5:20 | call to display_text [element] | app/views/foo/bars/_widget.html.erb:5:9:5:20 | call to display_text | provenance |  |
-| app/views/foo/bars/_widget.html.erb:8:9:8:21 | call to local_assigns [element :display_text, element] | app/views/foo/bars/_widget.html.erb:8:9:8:36 | ...[...] [element] | provenance |  |
+| app/views/foo/bars/_widget.html.erb:8:9:8:21 | call to local_assigns [element :display_text, element] | app/views/foo/bars/_widget.html.erb:8:9:8:36 | ...[...] | provenance |  |
 | app/views/foo/bars/_widget.html.erb:8:9:8:21 | call to local_assigns [element :display_text] | app/views/foo/bars/_widget.html.erb:8:9:8:36 | ...[...] | provenance |  |
-| app/views/foo/bars/_widget.html.erb:8:9:8:36 | ...[...] [element] | app/views/foo/bars/_widget.html.erb:8:9:8:36 | ...[...] | provenance |  |
 | app/views/foo/stores/show.html.erb:5:9:5:21 | call to local_assigns [element :display_text] | app/views/foo/stores/show.html.erb:5:9:5:36 | ...[...] | provenance |  |
 | app/views/foo/stores/show.html.erb:9:9:9:21 | call to local_assigns [element :display_text] | app/views/foo/stores/show.html.erb:9:9:9:26 | ...[...] | provenance |  |
 | app/views/foo/stores/show.html.erb:14:15:14:27 | call to local_assigns [element :display_text] | app/views/foo/stores/show.html.erb:14:15:14:32 | ...[...] | provenance |  |
-| app/views/foo/stores/show.html.erb:40:48:40:89 | call to [] [element :display_text, element] | app/views/foo/bars/_widget.html.erb:5:9:5:20 | call to display_text [element] | provenance |  |
+| app/views/foo/stores/show.html.erb:40:48:40:89 | call to [] [element :display_text, element] | app/views/foo/bars/_widget.html.erb:5:9:5:20 | call to display_text | provenance |  |
 | app/views/foo/stores/show.html.erb:40:48:40:89 | call to [] [element :display_text, element] | app/views/foo/bars/_widget.html.erb:8:9:8:21 | call to local_assigns [element :display_text, element] | provenance |  |
 | app/views/foo/stores/show.html.erb:40:48:40:89 | call to [] [element :display_text] | app/views/foo/bars/_widget.html.erb:5:9:5:20 | call to display_text | provenance |  |
 | app/views/foo/stores/show.html.erb:40:48:40:89 | call to [] [element :display_text] | app/views/foo/bars/_widget.html.erb:8:9:8:21 | call to local_assigns [element :display_text] | provenance |  |
@@ -33,11 +31,9 @@ nodes
 | app/controllers/foo/stores_controller.rb:13:39:13:78 | call to [] [element :display_text] | semmle.label | call to [] [element :display_text] |
 | app/controllers/foo/stores_controller.rb:13:55:13:56 | dt | semmle.label | dt |
 | app/views/foo/bars/_widget.html.erb:5:9:5:20 | call to display_text | semmle.label | call to display_text |
-| app/views/foo/bars/_widget.html.erb:5:9:5:20 | call to display_text [element] | semmle.label | call to display_text [element] |
 | app/views/foo/bars/_widget.html.erb:8:9:8:21 | call to local_assigns [element :display_text, element] | semmle.label | call to local_assigns [element :display_text, element] |
 | app/views/foo/bars/_widget.html.erb:8:9:8:21 | call to local_assigns [element :display_text] | semmle.label | call to local_assigns [element :display_text] |
 | app/views/foo/bars/_widget.html.erb:8:9:8:36 | ...[...] | semmle.label | ...[...] |
-| app/views/foo/bars/_widget.html.erb:8:9:8:36 | ...[...] [element] | semmle.label | ...[...] [element] |
 | app/views/foo/stores/show.html.erb:2:9:2:20 | call to display_text | semmle.label | call to display_text |
 | app/views/foo/stores/show.html.erb:5:9:5:21 | call to local_assigns [element :display_text] | semmle.label | call to local_assigns [element :display_text] |
 | app/views/foo/stores/show.html.erb:5:9:5:36 | ...[...] | semmle.label | ...[...] |
diff --git a/ruby/ql/test/query-tests/security/cwe-089/SqlInjection.expected b/ruby/ql/test/query-tests/security/cwe-089/SqlInjection.expected
index 38b5e8f7e12..a4a254806aa 100644
--- a/ruby/ql/test/query-tests/security/cwe-089/SqlInjection.expected
+++ b/ruby/ql/test/query-tests/security/cwe-089/SqlInjection.expected
@@ -11,12 +11,10 @@ edges
 | ActiveRecordInjection.rb:50:29:50:39 | ...[...] | ActiveRecordInjection.rb:50:20:50:42 | "id = '#{...}'" | provenance | AdditionalTaintStep |
 | ActiveRecordInjection.rb:55:30:55:35 | call to params | ActiveRecordInjection.rb:55:30:55:40 | ...[...] | provenance |  |
 | ActiveRecordInjection.rb:55:30:55:40 | ...[...] | ActiveRecordInjection.rb:55:21:55:43 | "id = '#{...}'" | provenance | AdditionalTaintStep |
-| ActiveRecordInjection.rb:59:21:59:45 | call to [] [element 0] | ActiveRecordInjection.rb:59:21:59:45 | call to [] | provenance |  |
-| ActiveRecordInjection.rb:59:22:59:44 | "id = '#{...}'" | ActiveRecordInjection.rb:59:21:59:45 | call to [] [element 0] | provenance |  |
+| ActiveRecordInjection.rb:59:22:59:44 | "id = '#{...}'" | ActiveRecordInjection.rb:59:21:59:45 | call to [] | provenance |  |
 | ActiveRecordInjection.rb:59:31:59:36 | call to params | ActiveRecordInjection.rb:59:31:59:41 | ...[...] | provenance |  |
 | ActiveRecordInjection.rb:59:31:59:41 | ...[...] | ActiveRecordInjection.rb:59:22:59:44 | "id = '#{...}'" | provenance | AdditionalTaintStep |
-| ActiveRecordInjection.rb:64:22:64:46 | call to [] [element 0] | ActiveRecordInjection.rb:64:22:64:46 | call to [] | provenance |  |
-| ActiveRecordInjection.rb:64:23:64:45 | "id = '#{...}'" | ActiveRecordInjection.rb:64:22:64:46 | call to [] [element 0] | provenance |  |
+| ActiveRecordInjection.rb:64:23:64:45 | "id = '#{...}'" | ActiveRecordInjection.rb:64:22:64:46 | call to [] | provenance |  |
 | ActiveRecordInjection.rb:64:32:64:37 | call to params | ActiveRecordInjection.rb:64:32:64:42 | ...[...] | provenance |  |
 | ActiveRecordInjection.rb:64:32:64:42 | ...[...] | ActiveRecordInjection.rb:64:23:64:45 | "id = '#{...}'" | provenance | AdditionalTaintStep |
 | ActiveRecordInjection.rb:69:21:69:26 | call to params | ActiveRecordInjection.rb:69:21:69:35 | ...[...] | provenance |  |
@@ -58,8 +56,7 @@ edges
 | ActiveRecordInjection.rb:136:11:136:17 | ...[...] | ActiveRecordInjection.rb:136:5:136:7 | uid | provenance |  |
 | ActiveRecordInjection.rb:137:5:137:9 | uidEq | ActiveRecordInjection.rb:141:20:141:32 | ... + ... | provenance |  |
 | ActiveRecordInjection.rb:137:5:137:9 | uidEq | ActiveRecordInjection.rb:141:28:141:32 | uidEq | provenance |  |
-| ActiveRecordInjection.rb:141:20:141:32 | ... + ... [element] | ActiveRecordInjection.rb:141:20:141:32 | ... + ... | provenance |  |
-| ActiveRecordInjection.rb:141:28:141:32 | uidEq | ActiveRecordInjection.rb:141:20:141:32 | ... + ... [element] | provenance |  |
+| ActiveRecordInjection.rb:141:28:141:32 | uidEq | ActiveRecordInjection.rb:141:20:141:32 | ... + ... | provenance |  |
 | ActiveRecordInjection.rb:174:21:174:26 | call to params | ActiveRecordInjection.rb:174:21:174:44 | ...[...] | provenance |  |
 | ActiveRecordInjection.rb:174:21:174:26 | call to params | ActiveRecordInjection.rb:174:21:174:44 | ...[...] | provenance |  |
 | ActiveRecordInjection.rb:174:21:174:44 | ...[...] | ActiveRecordInjection.rb:27:22:27:30 | condition | provenance |  |
@@ -117,12 +114,10 @@ nodes
 | ActiveRecordInjection.rb:55:30:55:35 | call to params | semmle.label | call to params |
 | ActiveRecordInjection.rb:55:30:55:40 | ...[...] | semmle.label | ...[...] |
 | ActiveRecordInjection.rb:59:21:59:45 | call to [] | semmle.label | call to [] |
-| ActiveRecordInjection.rb:59:21:59:45 | call to [] [element 0] | semmle.label | call to [] [element 0] |
 | ActiveRecordInjection.rb:59:22:59:44 | "id = '#{...}'" | semmle.label | "id = '#{...}'" |
 | ActiveRecordInjection.rb:59:31:59:36 | call to params | semmle.label | call to params |
 | ActiveRecordInjection.rb:59:31:59:41 | ...[...] | semmle.label | ...[...] |
 | ActiveRecordInjection.rb:64:22:64:46 | call to [] | semmle.label | call to [] |
-| ActiveRecordInjection.rb:64:22:64:46 | call to [] [element 0] | semmle.label | call to [] [element 0] |
 | ActiveRecordInjection.rb:64:23:64:45 | "id = '#{...}'" | semmle.label | "id = '#{...}'" |
 | ActiveRecordInjection.rb:64:32:64:37 | call to params | semmle.label | call to params |
 | ActiveRecordInjection.rb:64:32:64:42 | ...[...] | semmle.label | ...[...] |
@@ -186,7 +181,6 @@ nodes
 | ActiveRecordInjection.rb:136:11:136:17 | ...[...] | semmle.label | ...[...] |
 | ActiveRecordInjection.rb:137:5:137:9 | uidEq | semmle.label | uidEq |
 | ActiveRecordInjection.rb:141:20:141:32 | ... + ... | semmle.label | ... + ... |
-| ActiveRecordInjection.rb:141:20:141:32 | ... + ... [element] | semmle.label | ... + ... [element] |
 | ActiveRecordInjection.rb:141:28:141:32 | uidEq | semmle.label | uidEq |
 | ActiveRecordInjection.rb:174:21:174:26 | call to params | semmle.label | call to params |
 | ActiveRecordInjection.rb:174:21:174:44 | ...[...] | semmle.label | ...[...] |
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 ca8345d92ee..bc709a0e469 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
@@ -26,8 +26,7 @@ edges
 | 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:78:12:78:24 | ...[...] | CodeInjection.rb:78:5:78:8 | code | provenance |  |
-| CodeInjection.rb:86:10:86:25 | ... + ... [element] | CodeInjection.rb:86:10:86:37 | ... + ... [element] | provenance |  |
-| CodeInjection.rb:86:10:86:37 | ... + ... [element] | CodeInjection.rb:86:10:86:37 | ... + ... | provenance |  |
+| CodeInjection.rb:86:10:86:25 | ... + ... [element] | CodeInjection.rb:86:10:86:37 | ... + ... | provenance |  |
 | CodeInjection.rb:86:22:86:25 | code | CodeInjection.rb:86:10:86:25 | ... + ... [element] | provenance |  |
 | CodeInjection.rb:101:3:102:5 | self in index [@foo] | CodeInjection.rb:111:3:113:5 | self in baz [@foo] | provenance |  |
 | CodeInjection.rb:101:3:102:5 | self in index [@foo] | CodeInjection.rb:111:3:113:5 | self in baz [@foo] | provenance |  |
@@ -74,7 +73,6 @@ nodes
 | CodeInjection.rb:80:16:80:19 | code | semmle.label | code |
 | CodeInjection.rb:86:10:86:25 | ... + ... [element] | semmle.label | ... + ... [element] |
 | CodeInjection.rb:86:10:86:37 | ... + ... | semmle.label | ... + ... |
-| CodeInjection.rb:86:10:86:37 | ... + ... [element] | semmle.label | ... + ... [element] |
 | 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 |
diff --git a/ruby/ql/test/query-tests/security/cwe-117/LogInjection.expected b/ruby/ql/test/query-tests/security/cwe-117/LogInjection.expected
index 573ec810a60..4dbd42ac6c6 100644
--- a/ruby/ql/test/query-tests/security/cwe-117/LogInjection.expected
+++ b/ruby/ql/test/query-tests/security/cwe-117/LogInjection.expected
@@ -5,23 +5,19 @@ edges
 | app/controllers/users_controller.rb:15:5:15:15 | unsanitized | app/controllers/users_controller.rb:23:20:23:30 | unsanitized | provenance |  |
 | app/controllers/users_controller.rb:15:19:15:24 | call to params | app/controllers/users_controller.rb:15:19:15:30 | ...[...] | provenance |  |
 | app/controllers/users_controller.rb:15:19:15:30 | ...[...] | app/controllers/users_controller.rb:15:5:15:15 | unsanitized | provenance |  |
-| app/controllers/users_controller.rb:17:19:17:41 | ... + ... [element] | app/controllers/users_controller.rb:17:19:17:41 | ... + ... | provenance |  |
-| app/controllers/users_controller.rb:17:31:17:41 | unsanitized | app/controllers/users_controller.rb:17:19:17:41 | ... + ... [element] | provenance |  |
+| app/controllers/users_controller.rb:17:31:17:41 | unsanitized | app/controllers/users_controller.rb:17:19:17:41 | ... + ... | provenance |  |
 | app/controllers/users_controller.rb:23:20:23:30 | unsanitized | app/controllers/users_controller.rb:23:20:23:44 | call to sub | provenance |  |
 | app/controllers/users_controller.rb:23:20:23:44 | call to sub | app/controllers/users_controller.rb:24:18:26:7 | do ... end [captured unsanitized2] | provenance |  |
 | app/controllers/users_controller.rb:23:20:23:44 | call to sub | app/controllers/users_controller.rb:27:16:27:39 | ... + ... | provenance |  |
 | app/controllers/users_controller.rb:23:20:23:44 | call to sub | app/controllers/users_controller.rb:27:28:27:39 | unsanitized2 | provenance |  |
 | app/controllers/users_controller.rb:24:18:26:7 | do ... end [captured unsanitized2] | app/controllers/users_controller.rb:25:7:25:18 | unsanitized2 | provenance | heuristic-callback |
-| app/controllers/users_controller.rb:27:16:27:39 | ... + ... [element] | app/controllers/users_controller.rb:27:16:27:39 | ... + ... | provenance |  |
-| app/controllers/users_controller.rb:27:28:27:39 | unsanitized2 | app/controllers/users_controller.rb:27:16:27:39 | ... + ... [element] | provenance |  |
+| app/controllers/users_controller.rb:27:28:27:39 | unsanitized2 | app/controllers/users_controller.rb:27:16:27:39 | ... + ... | provenance |  |
 | app/controllers/users_controller.rb:33:19:33:25 | call to cookies | app/controllers/users_controller.rb:33:19:33:31 | ...[...] | provenance |  |
 | app/controllers/users_controller.rb:33:19:33:31 | ...[...] | app/controllers/users_controller.rb:34:31:34:45 | { ... } [captured unsanitized] | provenance |  |
 | app/controllers/users_controller.rb:33:19:33:31 | ...[...] | app/controllers/users_controller.rb:35:31:35:57 | { ... } [captured unsanitized] | provenance |  |
 | app/controllers/users_controller.rb:34:31:34:45 | { ... } [captured unsanitized] | app/controllers/users_controller.rb:34:33:34:43 | unsanitized | provenance | heuristic-callback |
 | app/controllers/users_controller.rb:35:31:35:57 | { ... } [captured unsanitized] | app/controllers/users_controller.rb:35:45:35:55 | unsanitized | provenance | heuristic-callback |
-| app/controllers/users_controller.rb:35:33:35:55 | ... + ... [element] | app/controllers/users_controller.rb:35:33:35:55 | ... + ... | provenance |  |
 | app/controllers/users_controller.rb:35:45:35:55 | unsanitized | app/controllers/users_controller.rb:35:33:35:55 | ... + ... | provenance |  |
-| app/controllers/users_controller.rb:35:45:35:55 | unsanitized | app/controllers/users_controller.rb:35:33:35:55 | ... + ... [element] | provenance |  |
 | app/controllers/users_controller.rb:49:19:49:24 | call to params | app/controllers/users_controller.rb:49:19:49:30 | ...[...] | provenance |  |
 nodes
 | app/controllers/users_controller.rb:15:5:15:15 | unsanitized | semmle.label | unsanitized |
@@ -29,14 +25,12 @@ nodes
 | app/controllers/users_controller.rb:15:19:15:30 | ...[...] | semmle.label | ...[...] |
 | app/controllers/users_controller.rb:16:19:16:29 | unsanitized | semmle.label | unsanitized |
 | app/controllers/users_controller.rb:17:19:17:41 | ... + ... | semmle.label | ... + ... |
-| app/controllers/users_controller.rb:17:19:17:41 | ... + ... [element] | semmle.label | ... + ... [element] |
 | app/controllers/users_controller.rb:17:31:17:41 | unsanitized | semmle.label | unsanitized |
 | app/controllers/users_controller.rb:23:20:23:30 | unsanitized | semmle.label | unsanitized |
 | app/controllers/users_controller.rb:23:20:23:44 | call to sub | semmle.label | call to sub |
 | app/controllers/users_controller.rb:24:18:26:7 | do ... end [captured unsanitized2] | semmle.label | do ... end [captured unsanitized2] |
 | app/controllers/users_controller.rb:25:7:25:18 | unsanitized2 | semmle.label | unsanitized2 |
 | app/controllers/users_controller.rb:27:16:27:39 | ... + ... | semmle.label | ... + ... |
-| app/controllers/users_controller.rb:27:16:27:39 | ... + ... [element] | semmle.label | ... + ... [element] |
 | app/controllers/users_controller.rb:27:28:27:39 | unsanitized2 | semmle.label | unsanitized2 |
 | app/controllers/users_controller.rb:33:19:33:25 | call to cookies | semmle.label | call to cookies |
 | app/controllers/users_controller.rb:33:19:33:31 | ...[...] | semmle.label | ...[...] |
@@ -44,7 +38,6 @@ nodes
 | app/controllers/users_controller.rb:34:33:34:43 | unsanitized | semmle.label | unsanitized |
 | app/controllers/users_controller.rb:35:31:35:57 | { ... } [captured unsanitized] | semmle.label | { ... } [captured unsanitized] |
 | app/controllers/users_controller.rb:35:33:35:55 | ... + ... | semmle.label | ... + ... |
-| app/controllers/users_controller.rb:35:33:35:55 | ... + ... [element] | semmle.label | ... + ... [element] |
 | app/controllers/users_controller.rb:35:45:35:55 | unsanitized | semmle.label | unsanitized |
 | app/controllers/users_controller.rb:49:19:49:24 | call to params | semmle.label | call to params |
 | app/controllers/users_controller.rb:49:19:49:30 | ...[...] | semmle.label | ...[...] |
diff --git a/ruby/ql/test/query-tests/security/cwe-1333-regexp-injection/RegExpInjection.expected b/ruby/ql/test/query-tests/security/cwe-1333-regexp-injection/RegExpInjection.expected
index a6c8636a5cf..13643e2c07e 100644
--- a/ruby/ql/test/query-tests/security/cwe-1333-regexp-injection/RegExpInjection.expected
+++ b/ruby/ql/test/query-tests/security/cwe-1333-regexp-injection/RegExpInjection.expected
@@ -12,14 +12,12 @@ edges
 | RegExpInjection.rb:22:5:22:8 | name | RegExpInjection.rb:23:30:23:33 | name | provenance |  |
 | RegExpInjection.rb:22:12:22:17 | call to params | RegExpInjection.rb:22:12:22:24 | ...[...] | provenance |  |
 | RegExpInjection.rb:22:12:22:24 | ...[...] | RegExpInjection.rb:22:5:22:8 | name | provenance |  |
-| RegExpInjection.rb:23:24:23:33 | ... + ... [element] | RegExpInjection.rb:23:24:23:33 | ... + ... | provenance |  |
-| RegExpInjection.rb:23:30:23:33 | name | RegExpInjection.rb:23:24:23:33 | ... + ... [element] | provenance |  |
+| RegExpInjection.rb:23:30:23:33 | name | RegExpInjection.rb:23:24:23:33 | ... + ... | provenance |  |
 | RegExpInjection.rb:54:5:54:8 | name | RegExpInjection.rb:55:28:55:37 | ... + ... | provenance |  |
 | RegExpInjection.rb:54:5:54:8 | name | RegExpInjection.rb:55:34:55:37 | name | provenance |  |
 | RegExpInjection.rb:54:12:54:17 | call to params | RegExpInjection.rb:54:12:54:24 | ...[...] | provenance |  |
 | RegExpInjection.rb:54:12:54:24 | ...[...] | RegExpInjection.rb:54:5:54:8 | name | provenance |  |
-| RegExpInjection.rb:55:28:55:37 | ... + ... [element] | RegExpInjection.rb:55:28:55:37 | ... + ... | provenance |  |
-| RegExpInjection.rb:55:34:55:37 | name | RegExpInjection.rb:55:28:55:37 | ... + ... [element] | provenance |  |
+| RegExpInjection.rb:55:34:55:37 | name | RegExpInjection.rb:55:28:55:37 | ... + ... | provenance |  |
 nodes
 | RegExpInjection.rb:4:5:4:8 | name | semmle.label | name |
 | RegExpInjection.rb:4:12:4:17 | call to params | semmle.label | call to params |
@@ -37,13 +35,11 @@ nodes
 | RegExpInjection.rb:22:12:22:17 | call to params | semmle.label | call to params |
 | RegExpInjection.rb:22:12:22:24 | ...[...] | semmle.label | ...[...] |
 | RegExpInjection.rb:23:24:23:33 | ... + ... | semmle.label | ... + ... |
-| RegExpInjection.rb:23:24:23:33 | ... + ... [element] | semmle.label | ... + ... [element] |
 | RegExpInjection.rb:23:30:23:33 | name | semmle.label | name |
 | RegExpInjection.rb:54:5:54:8 | name | semmle.label | name |
 | RegExpInjection.rb:54:12:54:17 | call to params | semmle.label | call to params |
 | RegExpInjection.rb:54:12:54:24 | ...[...] | semmle.label | ...[...] |
 | RegExpInjection.rb:55:28:55:37 | ... + ... | semmle.label | ... + ... |
-| RegExpInjection.rb:55:28:55:37 | ... + ... [element] | semmle.label | ... + ... [element] |
 | RegExpInjection.rb:55:34:55:37 | name | semmle.label | name |
 subpaths
 #select
diff --git a/ruby/ql/test/query-tests/security/cwe-134/TaintedFormatString.expected b/ruby/ql/test/query-tests/security/cwe-134/TaintedFormatString.expected
index 635dfaf82c0..104b9d3ada0 100644
--- a/ruby/ql/test/query-tests/security/cwe-134/TaintedFormatString.expected
+++ b/ruby/ql/test/query-tests/security/cwe-134/TaintedFormatString.expected
@@ -8,10 +8,8 @@ edges
 | tainted_format_string.rb:21:27:21:32 | call to params | tainted_format_string.rb:21:27:21:41 | ...[...] | provenance |  |
 | tainted_format_string.rb:22:20:22:25 | call to params | tainted_format_string.rb:22:20:22:34 | ...[...] | provenance |  |
 | tainted_format_string.rb:28:19:28:24 | call to params | tainted_format_string.rb:28:19:28:33 | ...[...] | provenance |  |
-| tainted_format_string.rb:33:12:33:46 | ... + ... [element] | tainted_format_string.rb:33:12:33:46 | ... + ... | provenance |  |
 | tainted_format_string.rb:33:32:33:37 | call to params | tainted_format_string.rb:33:32:33:46 | ...[...] | provenance |  |
 | tainted_format_string.rb:33:32:33:46 | ...[...] | tainted_format_string.rb:33:12:33:46 | ... + ... | provenance |  |
-| tainted_format_string.rb:33:32:33:46 | ...[...] | tainted_format_string.rb:33:12:33:46 | ... + ... [element] | provenance |  |
 | tainted_format_string.rb:36:30:36:35 | call to params | tainted_format_string.rb:36:30:36:44 | ...[...] | provenance |  |
 | tainted_format_string.rb:36:30:36:44 | ...[...] | tainted_format_string.rb:36:12:36:46 | "A log message: #{...}" | provenance | AdditionalTaintStep |
 | tainted_format_string.rb:39:22:39:27 | call to params | tainted_format_string.rb:39:22:39:36 | ...[...] | provenance |  |
@@ -38,7 +36,6 @@ nodes
 | tainted_format_string.rb:28:19:28:24 | call to params | semmle.label | call to params |
 | tainted_format_string.rb:28:19:28:33 | ...[...] | semmle.label | ...[...] |
 | tainted_format_string.rb:33:12:33:46 | ... + ... | semmle.label | ... + ... |
-| tainted_format_string.rb:33:12:33:46 | ... + ... [element] | semmle.label | ... + ... [element] |
 | tainted_format_string.rb:33:32:33:37 | call to params | semmle.label | call to params |
 | tainted_format_string.rb:33:32:33:46 | ...[...] | semmle.label | ...[...] |
 | tainted_format_string.rb:36:12:36:46 | "A log message: #{...}" | semmle.label | "A log message: #{...}" |
diff --git a/rust/BUILD.bazel b/rust/BUILD.bazel
index fff7c807ffb..aee5d77aa64 100644
--- a/rust/BUILD.bazel
+++ b/rust/BUILD.bazel
@@ -9,7 +9,7 @@ package(default_visibility = ["//rust:__subpackages__"])
 
 filegroup(
     name = "schema",
-    srcs = ["schema.py"],
+    srcs = glob(["schema/*.py"]),
 )
 
 filegroup(
@@ -46,20 +46,11 @@ codeql_pkg_files(
     ],
 )
 
-[
-    codeql_pack(
-        name = "-".join(parts),
-        srcs = [
-            ":root-files",
-            ":tools",
-        ],
-        pack_prefix = "/".join(parts),
-    )
-    for parts in (
-        [
-            "experimental",
-            "rust",
-        ],
-        ["rust"],
-    )
-]
+codeql_pack(
+    name = "rust",
+    srcs = [
+        ":root-files",
+        ":tools",
+    ],
+    experimental = True,
+)
diff --git a/rust/README.md b/rust/README.md
index 87c7072c675..2f9a7503abb 100644
--- a/rust/README.md
+++ b/rust/README.md
@@ -13,7 +13,7 @@ If you don't have the `semmle-code` repo you may need to install Bazel manually,
 
 This approach uses a released `codeql` version and is simpler to use for QL development. From your `semmle-code` directory run:
 ```bash
-bazel run @codeql//rust:rust-installer
+bazel run @codeql//rust:install
 ```
 You now need to create a [per-user CodeQL configuration file](https://docs.github.com/en/code-security/codeql-cli/using-the-advanced-functionality-of-the-codeql-cli/specifying-command-options-in-a-codeql-configuration-file#using-a-codeql-configuration-file) and specify the option:
 ```
diff --git a/rust/ast-generator/.gitignore b/rust/ast-generator/.gitignore
new file mode 100644
index 00000000000..d81f12ed1b1
--- /dev/null
+++ b/rust/ast-generator/.gitignore
@@ -0,0 +1,2 @@
+/target
+/.idea
diff --git a/rust/ast-generator/BUILD.bazel b/rust/ast-generator/BUILD.bazel
new file mode 100644
index 00000000000..63724e4fe72
--- /dev/null
+++ b/rust/ast-generator/BUILD.bazel
@@ -0,0 +1,17 @@
+load("//misc/bazel:rust.bzl", "codeql_rust_binary")
+load("//misc/bazel/3rdparty/tree_sitter_extractors_deps:defs.bzl", "aliases", "all_crate_deps")
+
+codeql_rust_binary(
+    name = "ast-generator",
+    srcs = glob(["src/**/*.rs"]),
+    aliases = aliases(),
+    proc_macro_deps = all_crate_deps(
+        proc_macro = True,
+    ),
+    visibility = ["//rust:__subpackages__"],
+    deps = all_crate_deps(
+        normal = True,
+    ),
+)
+
+exports_files(["Cargo.toml"])
diff --git a/rust/ast-generator/Cargo.toml b/rust/ast-generator/Cargo.toml
new file mode 100644
index 00000000000..5eaff201b20
--- /dev/null
+++ b/rust/ast-generator/Cargo.toml
@@ -0,0 +1,11 @@
+[package]
+name = "ast-generator"
+version = "0.1.0"
+edition = "2021"
+
+# When updating these dependencies, run `rust/update_cargo_deps.sh`
+[dependencies]
+ungrammar = "1.16.1"
+proc-macro2 = "1.0.33"
+quote = "1.0.12"
+itertools = "0.10.1"
diff --git a/rust/ast-generator/rust.ungram b/rust/ast-generator/rust.ungram
new file mode 100644
index 00000000000..43375ce6ae0
--- /dev/null
+++ b/rust/ast-generator/rust.ungram
@@ -0,0 +1,718 @@
+// Rust Un-Grammar.
+//
+// This grammar specifies the structure of Rust's concrete syntax tree.
+// It does not specify parsing rules (ambiguities, precedence, etc are out of scope).
+// Tokens are processed -- contextual keywords are recognised, compound operators glued.
+//
+// Legend:
+//
+//   //          -- comment
+//   Name =      -- non-terminal definition
+//   'ident'     -- keyword or punct token (terminal)
+//   '#ident'    -- generic token (terminal)
+//   '@ident'    -- literal token (terminal)
+//   A B         -- sequence
+//   A | B       -- alternation
+//   A*          -- zero or more repetition
+//   A?          -- zero or one repetition
+//   (A)         -- same as A
+//   label:A     -- suggested name for field of AST node
+
+//*************************//
+//         Paths           //
+//*************************//
+
+Name =
+  '#ident' | 'self'
+
+NameRef =
+  '#ident' | '@int_number' | 'self' | 'super' | 'crate' | 'Self'
+
+Lifetime =
+  '#lifetime_ident'
+
+Path =
+  (qualifier:Path '::')? segment:PathSegment
+
+PathSegment =
+  '::'? NameRef
+| NameRef GenericArgList?
+| NameRef ParamList RetType?
+| NameRef ReturnTypeSyntax
+| '<' Type ('as' PathType)? '>'
+
+ReturnTypeSyntax =
+  '(' '..' ')'
+
+
+//*************************//
+//        Generics         //
+//*************************//
+
+GenericArgList =
+  '::'? '<' (GenericArg (',' GenericArg)* ','?)? '>'
+
+GenericArg =
+  TypeArg
+| AssocTypeArg
+| LifetimeArg
+| ConstArg
+
+TypeArg =
+  Type
+
+AssocTypeArg =
+  NameRef
+  (GenericArgList | ParamList RetType? | ReturnTypeSyntax)?
+  (':' TypeBoundList | ('=' Type | ConstArg))
+
+LifetimeArg =
+  Lifetime
+
+ConstArg =
+  Expr
+
+GenericParamList =
+  '<' (GenericParam (',' GenericParam)* ','?)? '>'
+
+GenericParam =
+  ConstParam
+| LifetimeParam
+| TypeParam
+
+TypeParam =
+  Attr* Name (':' TypeBoundList?)?
+  ('=' default_type:Type)?
+
+ConstParam =
+  Attr* 'const' Name ':' Type
+  ('=' default_val:ConstArg)?
+
+LifetimeParam =
+  Attr* Lifetime (':' TypeBoundList?)?
+
+WhereClause =
+  'where' predicates:(WherePred (',' WherePred)* ','?)
+
+WherePred =
+  ('for' GenericParamList)?  (Lifetime | Type) ':' TypeBoundList?
+
+
+//*************************//
+//          Macro          //
+//*************************//
+
+MacroCall =
+  Attr* Path '!' TokenTree ';'?
+
+TokenTree =
+  '(' ')'
+| '{' '}'
+| '[' ']'
+
+MacroItems =
+  Item*
+
+MacroStmts =
+  statements:Stmt*
+  Expr?
+
+Attr =
+  '#' '!'? '[' Meta ']'
+
+Meta =
+  'unsafe' '(' Path ('=' Expr | TokenTree)? ')'
+| Path ('=' Expr | TokenTree)?
+
+//*************************//
+//          Items          //
+//*************************//
+
+SourceFile =
+  '#shebang'?
+  Attr*
+  Item*
+
+Item =
+  Const
+| Enum
+| ExternBlock
+| ExternCrate
+| Fn
+| Impl
+| MacroCall
+| MacroRules
+| MacroDef
+| Module
+| Static
+| Struct
+| Trait
+| TraitAlias
+| TypeAlias
+| Union
+| Use
+
+MacroRules =
+  Attr* Visibility?
+  'macro_rules' '!' Name
+  TokenTree
+
+MacroDef =
+  Attr* Visibility?
+  'macro' Name args:TokenTree?
+  body:TokenTree
+
+Module =
+  Attr* Visibility?
+  'mod' Name
+  (ItemList | ';')
+
+ItemList =
+  '{' Attr* Item* '}'
+
+ExternCrate =
+  Attr* Visibility?
+  'extern' 'crate' NameRef Rename? ';'
+
+Rename =
+  'as' (Name | '_')
+
+Use =
+  Attr* Visibility?
+  'use' UseTree ';'
+
+UseTree =
+  (Path? '::')? ('*' | UseTreeList)
+| Path Rename?
+
+UseTreeList =
+  '{' (UseTree (',' UseTree)* ','?)? '}'
+
+Fn =
+ Attr* Visibility?
+ 'default'? 'const'? 'async'? 'gen'? 'unsafe'? Abi?
+ 'fn' Name GenericParamList? ParamList RetType? WhereClause?
+ (body:BlockExpr | ';')
+
+Abi =
+  'extern' '@string'?
+
+ParamList =
+  '('(
+    SelfParam
+  | (SelfParam ',')? (Param (',' Param)* ','?)?
+  )')'
+| '|' (Param (',' Param)* ','?)? '|'
+
+SelfParam =
+  Attr* (
+    ('&' Lifetime?)? 'mut'? Name
+  | 'mut'? Name ':' Type
+  )
+
+Param =
+  Attr* (
+    Pat (':' Type)?
+  | Type
+  | '...'
+  )
+
+RetType =
+  '->' Type
+
+TypeAlias =
+  Attr* Visibility?
+  'default'?
+  'type' Name GenericParamList? (':' TypeBoundList?)? WhereClause?
+  ('=' Type)? ';'
+
+Struct =
+  Attr* Visibility?
+  'struct' Name GenericParamList? (
+    WhereClause? (RecordFieldList | ';')
+  | TupleFieldList WhereClause? ';'
+  )
+
+RecordFieldList =
+ '{' fields:(RecordField (',' RecordField)* ','?)? '}'
+
+RecordField =
+  Attr* Visibility?
+  Name ':' Type
+
+TupleFieldList =
+  '(' fields:(TupleField (',' TupleField)* ','?)? ')'
+
+TupleField =
+  Attr* Visibility?
+  Type
+
+FieldList =
+  RecordFieldList
+| TupleFieldList
+
+Enum =
+  Attr* Visibility?
+  'enum' Name GenericParamList? WhereClause?
+  VariantList
+
+VariantList =
+ '{' (Variant (',' Variant)* ','?)? '}'
+
+Variant =
+  Attr* Visibility?
+  Name FieldList? ('=' Expr)?
+
+Union =
+  Attr* Visibility?
+  'union' Name GenericParamList? WhereClause?
+  RecordFieldList
+
+// A Data Type.
+//
+// Not used directly in the grammar, but handy to have anyway.
+Adt =
+  Enum
+| Struct
+| Union
+
+Const =
+  Attr* Visibility?
+  'default'?
+  'const' (Name | '_') ':' Type
+  ('=' body:Expr)? ';'
+
+Static =
+  Attr* Visibility?
+  'static' 'mut'? Name ':' Type
+  ('=' body:Expr)? ';'
+
+Trait =
+  Attr* Visibility?
+  'unsafe'? 'auto'?
+  'trait' Name GenericParamList?
+  (':' TypeBoundList?)? WhereClause? AssocItemList
+
+TraitAlias =
+  Attr* Visibility?
+  'trait' Name GenericParamList? '=' TypeBoundList? WhereClause? ';'
+
+AssocItemList =
+  '{' Attr* AssocItem* '}'
+
+AssocItem =
+  Const
+| Fn
+| MacroCall
+| TypeAlias
+
+Impl =
+  Attr* Visibility?
+  'default'? 'unsafe'?
+  'impl' GenericParamList? ('const'? '!'? trait:Type 'for')? self_ty:Type WhereClause?
+  AssocItemList
+
+ExternBlock =
+  Attr* 'unsafe'? Abi ExternItemList
+
+ExternItemList =
+  '{' Attr* ExternItem* '}'
+
+ExternItem =
+  Fn
+| MacroCall
+| Static
+| TypeAlias
+
+Visibility =
+  'pub' ('(' 'in'? Path ')')?
+
+
+//****************************//
+// Statements and Expressions //
+//****************************//
+
+Stmt =
+  ';'
+| ExprStmt
+| Item
+| LetStmt
+
+LetStmt =
+  Attr* 'let' Pat (':' Type)?
+  '=' initializer:Expr
+  LetElse?
+  ';'
+
+LetElse =
+  'else' BlockExpr
+
+ExprStmt =
+  Expr ';'?
+
+Expr =
+  ArrayExpr
+| AsmExpr
+| AwaitExpr
+| BinExpr
+| BlockExpr
+| BreakExpr
+| CallExpr
+| CastExpr
+| ClosureExpr
+| ContinueExpr
+| FieldExpr
+| ForExpr
+| FormatArgsExpr
+| IfExpr
+| IndexExpr
+| Literal
+| LoopExpr
+| MacroExpr
+| MatchExpr
+| MethodCallExpr
+| OffsetOfExpr
+| ParenExpr
+| PathExpr
+| PrefixExpr
+| RangeExpr
+| RecordExpr
+| RefExpr
+| ReturnExpr
+| BecomeExpr
+| TryExpr
+| TupleExpr
+| WhileExpr
+| YieldExpr
+| YeetExpr
+| LetExpr
+| UnderscoreExpr
+
+OffsetOfExpr =
+  Attr* 'builtin' '#' 'offset_of' '(' Type ',' fields:(NameRef ('.' NameRef)* ) ')'
+
+AsmExpr =
+  Attr* 'builtin' '#' 'asm' '(' Expr ')'
+
+FormatArgsExpr =
+  Attr* 'builtin' '#' 'format_args' '('
+  template:Expr
+  (',' args:(FormatArgsArg (',' FormatArgsArg)* ','?)? )?
+  ')'
+
+FormatArgsArg =
+  (Name '=')? Expr
+
+MacroExpr =
+  MacroCall
+
+Literal =
+  Attr* value:(
+    '@int_number' | '@float_number'
+  | '@string' | '@raw_string'
+  | '@byte_string' | '@raw_byte_string'
+  | '@c_string' | '@raw_c_string'
+  | '@char' | '@byte'
+  | 'true' | 'false'
+  )
+
+PathExpr =
+  Attr* Path
+
+StmtList =
+  '{'
+    Attr*
+    statements:Stmt*
+    tail_expr:Expr?
+  '}'
+
+RefExpr =
+  Attr* '&' (('raw' 'const'?)| ('raw'? 'mut') ) Expr
+
+TryExpr =
+  Attr* Expr '?'
+
+BlockExpr =
+  Attr* Label? ('try' | 'unsafe' | ('async' 'move'?) | ('gen' 'move'?) | 'const') StmtList
+
+PrefixExpr =
+  Attr* op:('-' | '!' | '*') Expr
+
+BinExpr =
+  Attr*
+  lhs:Expr
+  op:(
+    '||' | '&&'
+  | '==' | '!=' | '<=' | '>=' | '<' | '>'
+  | '+' | '*' | '-' | '/' | '%' | '<<' | '>>' | '^' | '|' | '&'
+  | '=' | '+=' | '/=' | '*=' | '%=' | '>>=' | '<<=' | '-=' | '|=' | '&=' | '^='
+  )
+  rhs:Expr
+
+CastExpr =
+  Attr* Expr 'as' Type
+
+ParenExpr =
+  Attr* '(' Attr* Expr ')'
+
+ArrayExpr =
+  Attr* '[' Attr* (
+    (Expr (',' Expr)* ','?)?
+  | Expr ';' Expr
+  ) ']'
+
+IndexExpr =
+  Attr* base:Expr '[' index:Expr ']'
+
+TupleExpr =
+  Attr* '(' Attr* fields:(Expr (',' Expr)* ','?)? ')'
+
+RecordExpr =
+  Path RecordExprFieldList
+
+RecordExprFieldList =
+  '{'
+    Attr*
+    fields:(RecordExprField (',' RecordExprField)* ','?)?
+    ('..' spread:Expr?)?
+  '}'
+
+RecordExprField =
+  Attr* (NameRef ':')? Expr
+
+CallExpr =
+  Attr* Expr ArgList
+
+ArgList =
+  '(' args:(Expr (',' Expr)* ','?)? ')'
+
+MethodCallExpr =
+  Attr* receiver:Expr '.' NameRef GenericArgList? ArgList
+
+FieldExpr =
+  Attr* Expr '.' NameRef
+
+ClosureExpr =
+  Attr* ClosureBinder? 'const'? 'static'? 'async'? 'gen'? 'move'?  ParamList RetType?
+  body:Expr
+
+ClosureBinder =
+  'for' GenericParamList
+
+IfExpr =
+  Attr* 'if' condition:Expr then_branch:BlockExpr
+  ('else' else_branch:(IfExpr | BlockExpr))?
+
+LoopExpr =
+  Attr* Label? 'loop'
+  loop_body:BlockExpr
+
+ForExpr =
+  Attr* Label? 'for' Pat 'in' iterable:Expr
+  loop_body:BlockExpr
+
+WhileExpr =
+  Attr* Label? 'while' condition:Expr
+  loop_body:BlockExpr
+
+Label =
+  Lifetime ':'
+
+BreakExpr =
+  Attr* 'break' Lifetime? Expr?
+
+ContinueExpr =
+  Attr* 'continue' Lifetime?
+
+RangeExpr =
+  Attr* start:Expr? op:('..' | '..=') end:Expr?
+
+MatchExpr =
+  Attr* 'match' Expr MatchArmList
+
+MatchArmList =
+  '{'
+    Attr*
+    arms:MatchArm*
+  '}'
+
+MatchArm =
+  Attr* Pat guard:MatchGuard? '=>' Expr ','?
+
+MatchGuard =
+  'if' condition:Expr
+
+ReturnExpr =
+  Attr* 'return' Expr?
+
+BecomeExpr =
+  Attr* 'become' Expr
+
+YieldExpr =
+  Attr* 'yield' Expr?
+
+YeetExpr =
+  Attr* 'do' 'yeet' Expr?
+
+LetExpr =
+  Attr* 'let' Pat '=' Expr
+
+UnderscoreExpr =
+  Attr* '_'
+
+AwaitExpr =
+  Attr* Expr '.' 'await'
+
+//*************************//
+//          Types          //
+//*************************//
+
+Type =
+  ArrayType
+| DynTraitType
+| FnPtrType
+| ForType
+| ImplTraitType
+| InferType
+| MacroType
+| NeverType
+| ParenType
+| PathType
+| PtrType
+| RefType
+| SliceType
+| TupleType
+
+ParenType =
+  '(' Type ')'
+
+NeverType =
+  '!'
+
+MacroType =
+  MacroCall
+
+PathType =
+  Path
+
+TupleType =
+  '(' fields:(Type (',' Type)* ','?)? ')'
+
+PtrType =
+  '*' ('const' | 'mut') Type
+
+RefType =
+  '&' Lifetime? 'mut'? Type
+
+ArrayType =
+  '[' Type ';' ConstArg ']'
+
+SliceType =
+  '[' Type ']'
+
+InferType =
+  '_'
+
+FnPtrType =
+  'const'? 'async'? 'unsafe'? Abi? 'fn' ParamList RetType?
+
+ForType =
+  'for' GenericParamList Type
+
+ImplTraitType =
+  'impl' TypeBoundList
+
+DynTraitType =
+  'dyn'? TypeBoundList
+
+TypeBoundList =
+  bounds:(TypeBound ('+' TypeBound)* '+'?)
+
+TypeBound =
+  Lifetime
+| ('~' 'const' | 'const')? 'async'? '?'? Type
+| 'use' GenericParamList
+
+//************************//
+//        Patterns        //
+//************************//
+
+Pat =
+  IdentPat
+| BoxPat
+| RestPat
+| LiteralPat
+| MacroPat
+| OrPat
+| ParenPat
+| PathPat
+| WildcardPat
+| RangePat
+| RecordPat
+| RefPat
+| SlicePat
+| TuplePat
+| TupleStructPat
+| ConstBlockPat
+
+LiteralPat =
+  '-'? Literal
+
+IdentPat =
+  Attr* 'ref'? 'mut'? Name ('@' Pat)?
+
+WildcardPat =
+  '_'
+
+RangePat =
+  // 1..
+  start:Pat op:('..' | '..=')
+  // 1..2
+  | start:Pat op:('..' | '..=') end:Pat
+  // ..2
+  | op:('..' | '..=') end:Pat
+
+RefPat =
+  '&' 'mut'? Pat
+
+RecordPat =
+  Path RecordPatFieldList
+
+RecordPatFieldList =
+  '{'
+    fields:(RecordPatField (',' RecordPatField)* ','?)?
+    RestPat?
+  '}'
+
+RecordPatField =
+  Attr* (NameRef ':')? Pat
+
+TupleStructPat =
+   Path '(' fields:(Pat (',' Pat)* ','?)? ')'
+
+TuplePat =
+   '(' fields:(Pat (',' Pat)* ','?)? ')'
+
+ParenPat =
+  '(' Pat ')'
+
+SlicePat =
+  '[' (Pat (',' Pat)* ','?)? ']'
+
+PathPat =
+  Path
+
+OrPat =
+  (Pat ('|' Pat)* '|'?)
+
+BoxPat =
+  'box' Pat
+
+RestPat =
+  Attr* '..'
+
+MacroPat =
+  MacroCall
+
+ConstBlockPat =
+  'const' BlockExpr
diff --git a/rust/ast-generator/src/codegen.rs b/rust/ast-generator/src/codegen.rs
new file mode 100644
index 00000000000..6d66eeab5fe
--- /dev/null
+++ b/rust/ast-generator/src/codegen.rs
@@ -0,0 +1,16 @@
+pub mod grammar;
+pub fn reformat(x: String) -> String {
+    x
+}
+
+pub fn add_preamble(_x: crate::flags::CodegenType, y: String) -> String {
+    y
+}
+pub fn ensure_file_contents(
+    _x: crate::flags::CodegenType,
+    path: &std::path::Path,
+    contents: &String,
+    _check: bool,
+) {
+    std::fs::write(path, contents).unwrap_or_else(|_| panic!("Unable to write {}", path.display()));
+}
diff --git a/rust/ast-generator/src/codegen/grammar.rs b/rust/ast-generator/src/codegen/grammar.rs
new file mode 100644
index 00000000000..69875866ba5
--- /dev/null
+++ b/rust/ast-generator/src/codegen/grammar.rs
@@ -0,0 +1,1077 @@
+//! This module generates AST datatype used by rust-analyzer.
+//!
+//! Specifically, it generates the `SyntaxKind` enum and a number of newtype
+//! wrappers around `SyntaxNode` which implement `syntax::AstNode`.
+
+#![allow(clippy::disallowed_types)]
+
+use std::{
+    collections::{BTreeSet, HashSet},
+    fmt::Write,
+    fs,
+};
+
+use itertools::Itertools;
+use proc_macro2::{Punct, Spacing};
+use quote::{format_ident, quote};
+use ungrammar::{Grammar, Rule};
+
+use crate::{
+    codegen::{add_preamble, ensure_file_contents, grammar::ast_src::generate_kind_src, reformat},
+    project_root,
+};
+
+pub mod ast_src;
+use self::ast_src::{AstEnumSrc, AstNodeSrc, AstSrc, Cardinality, Field, KindsSrc};
+
+pub(crate) fn generate(check: bool) {
+    let grammar = fs::read_to_string(project_root().join("crates/syntax/rust.ungram"))
+        .unwrap()
+        .parse()
+        .unwrap();
+    let ast = lower(&grammar);
+    let kinds_src = generate_kind_src(&ast.nodes, &ast.enums, &grammar);
+
+    let syntax_kinds = generate_syntax_kinds(kinds_src);
+    let syntax_kinds_file = project_root().join("crates/parser/src/syntax_kind/generated.rs");
+    ensure_file_contents(
+        crate::flags::CodegenType::Grammar,
+        syntax_kinds_file.as_path(),
+        &syntax_kinds,
+        check,
+    );
+
+    let ast_tokens = generate_tokens(&ast);
+    let ast_tokens_file = project_root().join("crates/syntax/src/ast/generated/tokens.rs");
+    ensure_file_contents(
+        crate::flags::CodegenType::Grammar,
+        ast_tokens_file.as_path(),
+        &ast_tokens,
+        check,
+    );
+
+    let ast_nodes = generate_nodes(kinds_src, &ast);
+    let ast_nodes_file = project_root().join("crates/syntax/src/ast/generated/nodes.rs");
+    ensure_file_contents(
+        crate::flags::CodegenType::Grammar,
+        ast_nodes_file.as_path(),
+        &ast_nodes,
+        check,
+    );
+}
+
+fn generate_tokens(grammar: &AstSrc) -> String {
+    let tokens = grammar.tokens.iter().map(|token| {
+        let name = format_ident!("{}", token);
+        let kind = format_ident!("{}", to_upper_snake_case(token));
+        quote! {
+            #[derive(Debug, Clone, PartialEq, Eq, Hash)]
+            pub struct #name {
+                pub(crate) syntax: SyntaxToken,
+            }
+            impl std::fmt::Display for #name {
+                fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+                    std::fmt::Display::fmt(&self.syntax, f)
+                }
+            }
+            impl AstToken for #name {
+                fn can_cast(kind: SyntaxKind) -> bool { kind == #kind }
+                fn cast(syntax: SyntaxToken) -> Option<Self> {
+                    if Self::can_cast(syntax.kind()) { Some(Self { syntax }) } else { None }
+                }
+                fn syntax(&self) -> &SyntaxToken { &self.syntax }
+            }
+        }
+    });
+
+    add_preamble(
+        crate::flags::CodegenType::Grammar,
+        reformat(
+            quote! {
+                use crate::{SyntaxKind::{self, *}, SyntaxToken, ast::AstToken};
+                #(#tokens)*
+            }
+            .to_string(),
+        ),
+    )
+    .replace("#[derive", "\n#[derive")
+}
+
+fn generate_nodes(kinds: KindsSrc, grammar: &AstSrc) -> String {
+    let (node_defs, node_boilerplate_impls): (Vec<_>, Vec<_>) = grammar
+        .nodes
+        .iter()
+        .map(|node| {
+            let name = format_ident!("{}", node.name);
+            let kind = format_ident!("{}", to_upper_snake_case(&node.name));
+            let traits = node
+                .traits
+                .iter()
+                .filter(|trait_name| {
+                    // Loops have two expressions so this might collide, therefore manual impl it
+                    node.name != "ForExpr" && node.name != "WhileExpr"
+                        || trait_name.as_str() != "HasLoopBody"
+                })
+                .map(|trait_name| {
+                    let trait_name = format_ident!("{}", trait_name);
+                    quote!(impl ast::#trait_name for #name {})
+                });
+
+            let methods = node.fields.iter().map(|field| {
+                let method_name = format_ident!("{}", field.method_name());
+                let ty = field.ty();
+
+                if field.is_many() {
+                    quote! {
+                        #[inline]
+                        pub fn #method_name(&self) -> AstChildren<#ty> {
+                            support::children(&self.syntax)
+                        }
+                    }
+                } else if let Some(token_kind) = field.token_kind() {
+                    quote! {
+                        #[inline]
+                        pub fn #method_name(&self) -> Option<#ty> {
+                            support::token(&self.syntax, #token_kind)
+                        }
+                    }
+                } else {
+                    quote! {
+                        #[inline]
+                        pub fn #method_name(&self) -> Option<#ty> {
+                            support::child(&self.syntax)
+                        }
+                    }
+                }
+            });
+            (
+                quote! {
+                    #[pretty_doc_comment_placeholder_workaround]
+                    #[derive(Debug, Clone, PartialEq, Eq, Hash)]
+                    pub struct #name {
+                        pub(crate) syntax: SyntaxNode,
+                    }
+
+                    #(#traits)*
+
+                    impl #name {
+                        #(#methods)*
+                    }
+                },
+                quote! {
+                    impl AstNode for #name {
+                        #[inline]
+                        fn can_cast(kind: SyntaxKind) -> bool {
+                            kind == #kind
+                        }
+                        #[inline]
+                        fn cast(syntax: SyntaxNode) -> Option<Self> {
+                            if Self::can_cast(syntax.kind()) { Some(Self { syntax }) } else { None }
+                        }
+                        #[inline]
+                        fn syntax(&self) -> &SyntaxNode { &self.syntax }
+                    }
+                },
+            )
+        })
+        .unzip();
+
+    let (enum_defs, enum_boilerplate_impls): (Vec<_>, Vec<_>) = grammar
+        .enums
+        .iter()
+        .map(|en| {
+            let variants: Vec<_> = en
+                .variants
+                .iter()
+                .map(|var| format_ident!("{}", var))
+                .sorted()
+                .collect();
+            let name = format_ident!("{}", en.name);
+            let kinds: Vec<_> = variants
+                .iter()
+                .map(|name| format_ident!("{}", to_upper_snake_case(&name.to_string())))
+                .collect();
+            let traits = en.traits.iter().sorted().map(|trait_name| {
+                let trait_name = format_ident!("{}", trait_name);
+                quote!(impl ast::#trait_name for #name {})
+            });
+
+            let ast_node = if en.name == "Stmt" {
+                quote! {}
+            } else {
+                quote! {
+                    impl AstNode for #name {
+                        #[inline]
+                        fn can_cast(kind: SyntaxKind) -> bool {
+                            matches!(kind, #(#kinds)|*)
+                        }
+                        #[inline]
+                        fn cast(syntax: SyntaxNode) -> Option<Self> {
+                            let res = match syntax.kind() {
+                                #(
+                                #kinds => #name::#variants(#variants { syntax }),
+                                )*
+                                _ => return None,
+                            };
+                            Some(res)
+                        }
+                        #[inline]
+                        fn syntax(&self) -> &SyntaxNode {
+                            match self {
+                                #(
+                                #name::#variants(it) => &it.syntax,
+                                )*
+                            }
+                        }
+                    }
+                }
+            };
+
+            (
+                quote! {
+                    #[pretty_doc_comment_placeholder_workaround]
+                    #[derive(Debug, Clone, PartialEq, Eq, Hash)]
+                    pub enum #name {
+                        #(#variants(#variants),)*
+                    }
+
+                    #(#traits)*
+                },
+                quote! {
+                    #(
+                        impl From<#variants> for #name {
+                            #[inline]
+                            fn from(node: #variants) -> #name {
+                                #name::#variants(node)
+                            }
+                        }
+                    )*
+                    #ast_node
+                },
+            )
+        })
+        .unzip();
+    let (any_node_defs, any_node_boilerplate_impls): (Vec<_>, Vec<_>) = grammar
+        .nodes
+        .iter()
+        .flat_map(|node| node.traits.iter().map(move |t| (t, node)))
+        .into_group_map()
+        .into_iter()
+        .sorted_by_key(|(name, _)| *name)
+        .map(|(trait_name, nodes)| {
+            let name = format_ident!("Any{}", trait_name);
+            let trait_name = format_ident!("{}", trait_name);
+            let kinds: Vec<_> = nodes
+                .iter()
+                .map(|name| format_ident!("{}", to_upper_snake_case(&name.name.to_string())))
+                .collect();
+            let nodes = nodes.iter().map(|node| format_ident!("{}", node.name));
+            (
+                quote! {
+                    #[pretty_doc_comment_placeholder_workaround]
+                    #[derive(Debug, Clone, PartialEq, Eq, Hash)]
+                    pub struct #name {
+                        pub(crate) syntax: SyntaxNode,
+                    }
+                    impl ast::#trait_name for #name {}
+                },
+                quote! {
+                    impl #name {
+                        #[inline]
+                        pub fn new<T: ast::#trait_name>(node: T) -> #name {
+                            #name {
+                                syntax: node.syntax().clone()
+                            }
+                        }
+                    }
+                    impl AstNode for #name {
+                        #[inline]
+                        fn can_cast(kind: SyntaxKind) -> bool {
+                            matches!(kind, #(#kinds)|*)
+                        }
+                        #[inline]
+                        fn cast(syntax: SyntaxNode) -> Option<Self> {
+                            Self::can_cast(syntax.kind()).then_some(#name { syntax })
+                        }
+                        #[inline]
+                        fn syntax(&self) -> &SyntaxNode {
+                            &self.syntax
+                        }
+                    }
+
+                    #(
+                        impl From<#nodes> for #name {
+                            #[inline]
+                            fn from(node: #nodes) -> #name {
+                                #name { syntax: node.syntax }
+                            }
+                        }
+                    )*
+                },
+            )
+        })
+        .unzip();
+
+    let enum_names = grammar.enums.iter().map(|it| &it.name);
+    let node_names = grammar.nodes.iter().map(|it| &it.name);
+
+    let display_impls = enum_names
+        .chain(node_names.clone())
+        .map(|it| format_ident!("{}", it))
+        .map(|name| {
+            quote! {
+                impl std::fmt::Display for #name {
+                    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+                        std::fmt::Display::fmt(self.syntax(), f)
+                    }
+                }
+            }
+        });
+
+    let defined_nodes: HashSet<_> = node_names.collect();
+
+    for node in kinds
+        .nodes
+        .iter()
+        .map(|kind| to_pascal_case(kind))
+        .filter(|name| !defined_nodes.iter().any(|&it| it == name))
+    {
+        drop(node)
+        // FIXME: restore this
+        // eprintln!("Warning: node {} not defined in ast source", node);
+    }
+
+    let ast = quote! {
+        #![allow(non_snake_case)]
+        use crate::{
+            SyntaxNode, SyntaxToken, SyntaxKind::{self, *},
+            ast::{self, AstNode, AstChildren, support},
+            T,
+        };
+
+        #(#node_defs)*
+        #(#enum_defs)*
+        #(#any_node_defs)*
+        #(#node_boilerplate_impls)*
+        #(#enum_boilerplate_impls)*
+        #(#any_node_boilerplate_impls)*
+        #(#display_impls)*
+    };
+
+    let ast = ast.to_string().replace("T ! [", "T![");
+
+    let mut res = String::with_capacity(ast.len() * 2);
+
+    let mut docs = grammar
+        .nodes
+        .iter()
+        .map(|it| &it.doc)
+        .chain(grammar.enums.iter().map(|it| &it.doc));
+
+    for chunk in ast.split("# [pretty_doc_comment_placeholder_workaround] ") {
+        res.push_str(chunk);
+        if let Some(doc) = docs.next() {
+            write_doc_comment(doc, &mut res);
+        }
+    }
+
+    let res = add_preamble(crate::flags::CodegenType::Grammar, reformat(res));
+    res.replace("#[derive", "\n#[derive")
+}
+
+fn write_doc_comment(contents: &[String], dest: &mut String) {
+    for line in contents {
+        writeln!(dest, "///{line}").unwrap();
+    }
+}
+
+fn generate_syntax_kinds(grammar: KindsSrc) -> String {
+    let (single_byte_tokens_values, single_byte_tokens): (Vec<_>, Vec<_>) = grammar
+        .punct
+        .iter()
+        .filter(|(token, _name)| token.len() == 1)
+        .map(|(token, name)| (token.chars().next().unwrap(), format_ident!("{}", name)))
+        .unzip();
+
+    let punctuation_values = grammar.punct.iter().map(|(token, _name)| {
+        if "{}[]()".contains(token) {
+            let c = token.chars().next().unwrap();
+            quote! { #c }
+        } else {
+            let cs = token.chars().map(|c| Punct::new(c, Spacing::Joint));
+            quote! { #(#cs)* }
+        }
+    });
+    let punctuation = grammar
+        .punct
+        .iter()
+        .map(|(_token, name)| format_ident!("{}", name))
+        .collect::<Vec<_>>();
+
+    let fmt_kw_as_variant = |&name| match name {
+        "Self" => format_ident!("SELF_TYPE_KW"),
+        name => format_ident!("{}_KW", to_upper_snake_case(name)),
+    };
+    let strict_keywords = grammar.keywords;
+    let strict_keywords_variants = strict_keywords
+        .iter()
+        .map(fmt_kw_as_variant)
+        .collect::<Vec<_>>();
+    let strict_keywords_tokens = strict_keywords.iter().map(|it| format_ident!("{it}"));
+
+    let edition_dependent_keywords_variants_match_arm = grammar
+        .edition_dependent_keywords
+        .iter()
+        .map(|(kw, ed)| {
+            let kw = fmt_kw_as_variant(kw);
+            quote! { #kw if #ed <= edition }
+        })
+        .collect::<Vec<_>>();
+    let edition_dependent_keywords_str_match_arm = grammar
+        .edition_dependent_keywords
+        .iter()
+        .map(|(kw, ed)| {
+            quote! { #kw if #ed <= edition }
+        })
+        .collect::<Vec<_>>();
+    let edition_dependent_keywords_variants = grammar
+        .edition_dependent_keywords
+        .iter()
+        .map(|(kw, _)| fmt_kw_as_variant(kw))
+        .collect::<Vec<_>>();
+    let edition_dependent_keywords_tokens = grammar
+        .edition_dependent_keywords
+        .iter()
+        .map(|(it, _)| format_ident!("{it}"));
+
+    let contextual_keywords = grammar.contextual_keywords;
+    let contextual_keywords_variants = contextual_keywords
+        .iter()
+        .map(fmt_kw_as_variant)
+        .collect::<Vec<_>>();
+    let contextual_keywords_tokens = contextual_keywords.iter().map(|it| format_ident!("{it}"));
+    let contextual_keywords_str_match_arm = grammar.contextual_keywords.iter().map(|kw| {
+        match grammar
+            .edition_dependent_keywords
+            .iter()
+            .find(|(ed_kw, _)| ed_kw == kw)
+        {
+            Some((_, ed)) => quote! { #kw if edition < #ed },
+            None => quote! { #kw },
+        }
+    });
+    let contextual_keywords_variants_match_arm = grammar
+        .contextual_keywords
+        .iter()
+        .map(|kw_s| {
+            let kw = fmt_kw_as_variant(kw_s);
+            match grammar
+                .edition_dependent_keywords
+                .iter()
+                .find(|(ed_kw, _)| ed_kw == kw_s)
+            {
+                Some((_, ed)) => quote! { #kw if edition < #ed },
+                None => quote! { #kw },
+            }
+        })
+        .collect::<Vec<_>>();
+
+    let non_strict_keyword_variants = contextual_keywords_variants
+        .iter()
+        .chain(edition_dependent_keywords_variants.iter())
+        .sorted()
+        .dedup()
+        .collect::<Vec<_>>();
+
+    let literals = grammar
+        .literals
+        .iter()
+        .map(|name| format_ident!("{}", name))
+        .collect::<Vec<_>>();
+
+    let tokens = grammar
+        .tokens
+        .iter()
+        .map(|name| format_ident!("{}", name))
+        .collect::<Vec<_>>();
+
+    let nodes = grammar
+        .nodes
+        .iter()
+        .map(|name| format_ident!("{}", name))
+        .collect::<Vec<_>>();
+
+    let ast = quote! {
+        #![allow(bad_style, missing_docs, unreachable_pub)]
+        use crate::Edition;
+
+        /// The kind of syntax node, e.g. `IDENT`, `USE_KW`, or `STRUCT`.
+        #[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash, Debug)]
+        #[repr(u16)]
+        pub enum SyntaxKind {
+            // Technical SyntaxKinds: they appear temporally during parsing,
+            // but never end up in the final tree
+            #[doc(hidden)]
+            TOMBSTONE,
+            #[doc(hidden)]
+            EOF,
+            #(#punctuation,)*
+            #(#strict_keywords_variants,)*
+            #(#non_strict_keyword_variants,)*
+            #(#literals,)*
+            #(#tokens,)*
+            #(#nodes,)*
+
+            // Technical kind so that we can cast from u16 safely
+            #[doc(hidden)]
+            __LAST,
+        }
+        use self::SyntaxKind::*;
+
+        impl SyntaxKind {
+            /// Checks whether this syntax kind is a strict keyword for the given edition.
+            /// Strict keywords are identifiers that are always considered keywords.
+            pub fn is_strict_keyword(self, edition: Edition) -> bool {
+                matches!(self, #(#strict_keywords_variants)|*)
+                || match self {
+                    #(#edition_dependent_keywords_variants_match_arm => true,)*
+                    _ => false,
+                }
+            }
+
+            /// Checks whether this syntax kind is a weak keyword for the given edition.
+            /// Weak keywords are identifiers that are considered keywords only in certain contexts.
+            pub fn is_contextual_keyword(self, edition: Edition) -> bool {
+                match self {
+                    #(#contextual_keywords_variants_match_arm => true,)*
+                    _ => false,
+                }
+            }
+
+            /// Checks whether this syntax kind is a strict or weak keyword for the given edition.
+            pub fn is_keyword(self, edition: Edition) -> bool {
+                matches!(self, #(#strict_keywords_variants)|*)
+                || match self {
+                    #(#edition_dependent_keywords_variants_match_arm => true,)*
+                    #(#contextual_keywords_variants_match_arm => true,)*
+                    _ => false,
+                }
+            }
+
+            pub fn is_punct(self) -> bool {
+                matches!(self, #(#punctuation)|*)
+            }
+
+            pub fn is_literal(self) -> bool {
+                matches!(self, #(#literals)|*)
+            }
+
+            pub fn from_keyword(ident: &str, edition: Edition) -> Option<SyntaxKind> {
+                let kw = match ident {
+                    #(#strict_keywords => #strict_keywords_variants,)*
+                    #(#edition_dependent_keywords_str_match_arm => #edition_dependent_keywords_variants,)*
+                    _ => return None,
+                };
+                Some(kw)
+            }
+
+            pub fn from_contextual_keyword(ident: &str, edition: Edition) -> Option<SyntaxKind> {
+                let kw = match ident {
+                    #(#contextual_keywords_str_match_arm => #contextual_keywords_variants,)*
+                    _ => return None,
+                };
+                Some(kw)
+            }
+
+            pub fn from_char(c: char) -> Option<SyntaxKind> {
+                let tok = match c {
+                    #(#single_byte_tokens_values => #single_byte_tokens,)*
+                    _ => return None,
+                };
+                Some(tok)
+            }
+        }
+
+        #[macro_export]
+        macro_rules! T {
+            #([#punctuation_values] => { $crate::SyntaxKind::#punctuation };)*
+            #([#strict_keywords_tokens] => { $crate::SyntaxKind::#strict_keywords_variants };)*
+            #([#contextual_keywords_tokens] => { $crate::SyntaxKind::#contextual_keywords_variants };)*
+            #([#edition_dependent_keywords_tokens] => { $crate::SyntaxKind::#edition_dependent_keywords_variants };)*
+            [lifetime_ident] => { $crate::SyntaxKind::LIFETIME_IDENT };
+            [int_number] => { $crate::SyntaxKind::INT_NUMBER };
+            [ident] => { $crate::SyntaxKind::IDENT };
+            [string] => { $crate::SyntaxKind::STRING };
+            [shebang] => { $crate::SyntaxKind::SHEBANG };
+        }
+    };
+
+    add_preamble(
+        crate::flags::CodegenType::Grammar,
+        reformat(ast.to_string()),
+    )
+}
+
+fn to_upper_snake_case(s: &str) -> String {
+    let mut buf = String::with_capacity(s.len());
+    let mut prev = false;
+    for c in s.chars() {
+        if c.is_ascii_uppercase() && prev {
+            buf.push('_')
+        }
+        prev = true;
+
+        buf.push(c.to_ascii_uppercase());
+    }
+    buf
+}
+
+fn to_lower_snake_case(s: &str) -> String {
+    let mut buf = String::with_capacity(s.len());
+    let mut prev = false;
+    for c in s.chars() {
+        if c.is_ascii_uppercase() && prev {
+            buf.push('_')
+        }
+        prev = true;
+
+        buf.push(c.to_ascii_lowercase());
+    }
+    buf
+}
+
+fn to_pascal_case(s: &str) -> String {
+    let mut buf = String::with_capacity(s.len());
+    let mut prev_is_underscore = true;
+    for c in s.chars() {
+        if c == '_' {
+            prev_is_underscore = true;
+        } else if prev_is_underscore {
+            buf.push(c.to_ascii_uppercase());
+            prev_is_underscore = false;
+        } else {
+            buf.push(c.to_ascii_lowercase());
+        }
+    }
+    buf
+}
+
+fn pluralize(s: &str) -> String {
+    format!("{s}s")
+}
+
+impl Field {
+    pub fn is_many(&self) -> bool {
+        matches!(
+            self,
+            Field::Node {
+                cardinality: Cardinality::Many,
+                ..
+            }
+        )
+    }
+    pub fn token_kind(&self) -> Option<proc_macro2::TokenStream> {
+        match self {
+            Field::Token(token) => {
+                let token: proc_macro2::TokenStream = token.parse().unwrap();
+                Some(quote! { T![#token] })
+            }
+            _ => None,
+        }
+    }
+    pub fn method_name(&self) -> String {
+        match self {
+            Field::Token(name) => {
+                let name = match name.as_str() {
+                    ";" => "semicolon",
+                    "->" => "thin_arrow",
+                    "'{'" => "l_curly",
+                    "'}'" => "r_curly",
+                    "'('" => "l_paren",
+                    "')'" => "r_paren",
+                    "'['" => "l_brack",
+                    "']'" => "r_brack",
+                    "<" => "l_angle",
+                    ">" => "r_angle",
+                    "=" => "eq",
+                    "!" => "excl",
+                    "*" => "star",
+                    "&" => "amp",
+                    "-" => "minus",
+                    "_" => "underscore",
+                    "." => "dot",
+                    ".." => "dotdot",
+                    "..." => "dotdotdot",
+                    "..=" => "dotdoteq",
+                    "=>" => "fat_arrow",
+                    "@" => "at",
+                    ":" => "colon",
+                    "::" => "coloncolon",
+                    "#" => "pound",
+                    "?" => "question_mark",
+                    "," => "comma",
+                    "|" => "pipe",
+                    "~" => "tilde",
+                    _ => name,
+                };
+                format!("{name}_token",)
+            }
+            Field::Node { name, .. } => {
+                if name == "type" {
+                    String::from("ty")
+                } else {
+                    name.to_owned()
+                }
+            }
+        }
+    }
+    pub fn ty(&self) -> proc_macro2::Ident {
+        match self {
+            Field::Token(_) => format_ident!("SyntaxToken"),
+            Field::Node { ty, .. } => format_ident!("{}", ty),
+        }
+    }
+}
+
+fn clean_token_name(name: &str) -> String {
+    let cleaned = name.trim_start_matches(['@', '#', '?']);
+    if cleaned.is_empty() {
+        name.to_owned()
+    } else {
+        cleaned.to_owned()
+    }
+}
+
+pub(crate) fn lower(grammar: &Grammar) -> AstSrc {
+    let mut res = AstSrc {
+        tokens:
+            "Whitespace Comment String ByteString CString IntNumber FloatNumber Char Byte Ident"
+                .split_ascii_whitespace()
+                .map(|it| it.to_owned())
+                .collect::<Vec<_>>(),
+        ..Default::default()
+    };
+
+    let nodes = grammar.iter().collect::<Vec<_>>();
+
+    for &node in &nodes {
+        let name = grammar[node].name.clone();
+        let rule = &grammar[node].rule;
+        match lower_enum(grammar, rule) {
+            Some(variants) => {
+                let enum_src = AstEnumSrc {
+                    doc: Vec::new(),
+                    name,
+                    traits: Vec::new(),
+                    variants,
+                };
+                res.enums.push(enum_src);
+            }
+            None => {
+                let mut fields = Vec::new();
+                lower_rule(&mut fields, grammar, None, rule);
+                res.nodes.push(AstNodeSrc {
+                    doc: Vec::new(),
+                    name,
+                    traits: Vec::new(),
+                    fields,
+                });
+            }
+        }
+    }
+
+    deduplicate_fields(&mut res);
+    extract_enums(&mut res);
+    extract_struct_traits(&mut res);
+    extract_enum_traits(&mut res);
+    res.nodes.sort_by_key(|it| it.name.clone());
+    res.enums.sort_by_key(|it| it.name.clone());
+    res.tokens.sort();
+    res.nodes.iter_mut().for_each(|it| {
+        it.traits.sort();
+        it.fields.sort_by_key(|it| match it {
+            Field::Token(name) => (true, name.clone()),
+            Field::Node { name, .. } => (false, name.clone()),
+        });
+    });
+    res.enums.iter_mut().for_each(|it| {
+        it.traits.sort();
+        it.variants.sort();
+    });
+    res
+}
+
+fn lower_enum(grammar: &Grammar, rule: &Rule) -> Option<Vec<String>> {
+    let alternatives = match rule {
+        Rule::Alt(it) => it,
+        _ => return None,
+    };
+    let mut variants = Vec::new();
+    for alternative in alternatives {
+        match alternative {
+            Rule::Node(it) => variants.push(grammar[*it].name.clone()),
+            Rule::Token(it) if grammar[*it].name == ";" => (),
+            _ => return None,
+        }
+    }
+    Some(variants)
+}
+
+fn lower_rule(acc: &mut Vec<Field>, grammar: &Grammar, label: Option<&String>, rule: &Rule) {
+    if lower_separated_list(acc, grammar, label, rule) {
+        return;
+    }
+
+    match rule {
+        Rule::Node(node) => {
+            let ty = grammar[*node].name.clone();
+            let name = label.cloned().unwrap_or_else(|| to_lower_snake_case(&ty));
+            let field = Field::Node {
+                name,
+                ty,
+                cardinality: Cardinality::Optional,
+            };
+            acc.push(field);
+        }
+        Rule::Token(token) => {
+            assert!(label.is_none());
+            let mut name = clean_token_name(&grammar[*token].name);
+            if "[]{}()".contains(&name) {
+                name = format!("'{name}'");
+            }
+            let field = Field::Token(name);
+            acc.push(field);
+        }
+        Rule::Rep(inner) => {
+            if let Rule::Node(node) = &**inner {
+                let ty = grammar[*node].name.clone();
+                let name = label
+                    .cloned()
+                    .unwrap_or_else(|| pluralize(&to_lower_snake_case(&ty)));
+                let field = Field::Node {
+                    name,
+                    ty,
+                    cardinality: Cardinality::Many,
+                };
+                acc.push(field);
+                return;
+            }
+            panic!("unhandled rule: {rule:?}")
+        }
+        Rule::Labeled { label: l, rule } => {
+            assert!(label.is_none());
+            let manually_implemented = matches!(
+                l.as_str(),
+                "lhs"
+                    | "rhs"
+                    | "then_branch"
+                    | "else_branch"
+                    | "start"
+                    | "end"
+                    | "op"
+                    | "index"
+                    | "base"
+                    | "value"
+                    | "trait"
+                    | "self_ty"
+                    | "iterable"
+                    | "condition"
+                    | "args"
+                    | "body"
+            );
+            if manually_implemented {
+                return;
+            }
+            lower_rule(acc, grammar, Some(l), rule);
+        }
+        Rule::Seq(rules) | Rule::Alt(rules) => {
+            for rule in rules {
+                lower_rule(acc, grammar, label, rule)
+            }
+        }
+        Rule::Opt(rule) => lower_rule(acc, grammar, label, rule),
+    }
+}
+
+// (T (',' T)* ','?)
+fn lower_separated_list(
+    acc: &mut Vec<Field>,
+    grammar: &Grammar,
+    label: Option<&String>,
+    rule: &Rule,
+) -> bool {
+    let rule = match rule {
+        Rule::Seq(it) => it,
+        _ => return false,
+    };
+    let (node, repeat, trailing_sep) = match rule.as_slice() {
+        [Rule::Node(node), Rule::Rep(repeat), Rule::Opt(trailing_sep)] => {
+            (node, repeat, Some(trailing_sep))
+        }
+        [Rule::Node(node), Rule::Rep(repeat)] => (node, repeat, None),
+        _ => return false,
+    };
+    let repeat = match &**repeat {
+        Rule::Seq(it) => it,
+        _ => return false,
+    };
+    if !matches!(
+        repeat.as_slice(),
+        [comma, Rule::Node(n)]
+            if trailing_sep.map_or(true, |it| comma == &**it) && n == node
+    ) {
+        return false;
+    }
+    let ty = grammar[*node].name.clone();
+    let name = label
+        .cloned()
+        .unwrap_or_else(|| pluralize(&to_lower_snake_case(&ty)));
+    let field = Field::Node {
+        name,
+        ty,
+        cardinality: Cardinality::Many,
+    };
+    acc.push(field);
+    true
+}
+
+fn deduplicate_fields(ast: &mut AstSrc) {
+    for node in &mut ast.nodes {
+        let mut i = 0;
+        'outer: while i < node.fields.len() {
+            for j in 0..i {
+                let f1 = &node.fields[i];
+                let f2 = &node.fields[j];
+                if f1 == f2 {
+                    node.fields.remove(i);
+                    continue 'outer;
+                }
+            }
+            i += 1;
+        }
+    }
+}
+
+fn extract_enums(ast: &mut AstSrc) {
+    for node in &mut ast.nodes {
+        for enm in &ast.enums {
+            let mut to_remove = Vec::new();
+            for (i, field) in node.fields.iter().enumerate() {
+                let ty = field.ty().to_string();
+                if enm.variants.iter().any(|it| it == &ty) {
+                    to_remove.push(i);
+                }
+            }
+            if to_remove.len() == enm.variants.len() {
+                node.remove_field(to_remove);
+                let ty = enm.name.clone();
+                let name = to_lower_snake_case(&ty);
+                node.fields.push(Field::Node {
+                    name,
+                    ty,
+                    cardinality: Cardinality::Optional,
+                });
+            }
+        }
+    }
+}
+
+const TRAITS: &[(&str, &[&str])] = &[
+    ("HasAttrs", &["attrs"]),
+    ("HasName", &["name"]),
+    ("HasVisibility", &["visibility"]),
+    ("HasGenericParams", &["generic_param_list", "where_clause"]),
+    ("HasGenericArgs", &["generic_arg_list"]),
+    ("HasTypeBounds", &["type_bound_list", "colon_token"]),
+    ("HasModuleItem", &["items"]),
+    ("HasLoopBody", &["label", "loop_body"]),
+    ("HasArgList", &["arg_list"]),
+];
+
+fn extract_struct_traits(ast: &mut AstSrc) {
+    for node in &mut ast.nodes {
+        for (name, methods) in TRAITS {
+            extract_struct_trait(node, name, methods);
+        }
+    }
+
+    let nodes_with_doc_comments = [
+        "SourceFile",
+        "Fn",
+        "Struct",
+        "Union",
+        "RecordField",
+        "TupleField",
+        "Enum",
+        "Variant",
+        "Trait",
+        "TraitAlias",
+        "Module",
+        "Static",
+        "Const",
+        "TypeAlias",
+        "Impl",
+        "ExternBlock",
+        "ExternCrate",
+        "MacroCall",
+        "MacroRules",
+        "MacroDef",
+        "Use",
+    ];
+
+    for node in &mut ast.nodes {
+        if nodes_with_doc_comments.contains(&&*node.name) {
+            node.traits.push("HasDocComments".into());
+        }
+    }
+}
+
+fn extract_struct_trait(node: &mut AstNodeSrc, trait_name: &str, methods: &[&str]) {
+    let mut to_remove = Vec::new();
+    for (i, field) in node.fields.iter().enumerate() {
+        let method_name = field.method_name();
+        if methods.iter().any(|&it| it == method_name) {
+            to_remove.push(i);
+        }
+    }
+    if to_remove.len() == methods.len() {
+        node.traits.push(trait_name.to_owned());
+        node.remove_field(to_remove);
+    }
+}
+
+fn extract_enum_traits(ast: &mut AstSrc) {
+    for enm in &mut ast.enums {
+        if enm.name == "Stmt" {
+            continue;
+        }
+        let nodes = &ast.nodes;
+        let mut variant_traits = enm
+            .variants
+            .iter()
+            .map(|var| nodes.iter().find(|it| &it.name == var).unwrap())
+            .map(|node| node.traits.iter().cloned().collect::<BTreeSet<_>>());
+
+        let mut enum_traits = match variant_traits.next() {
+            Some(it) => it,
+            None => continue,
+        };
+        for traits in variant_traits {
+            enum_traits = enum_traits.intersection(&traits).cloned().collect();
+        }
+        enm.traits = enum_traits.into_iter().collect();
+    }
+}
+
+impl AstNodeSrc {
+    fn remove_field(&mut self, to_remove: Vec<usize>) {
+        to_remove.into_iter().rev().for_each(|idx| {
+            self.fields.remove(idx);
+        });
+    }
+}
+
+#[test]
+fn test() {
+    generate(true);
+}
diff --git a/rust/ast-generator/src/codegen/grammar/ast_src.rs b/rust/ast-generator/src/codegen/grammar/ast_src.rs
new file mode 100644
index 00000000000..606a51b499c
--- /dev/null
+++ b/rust/ast-generator/src/codegen/grammar/ast_src.rs
@@ -0,0 +1,262 @@
+//! Defines input for code generation process.
+
+use quote::ToTokens;
+
+use crate::codegen::grammar::to_upper_snake_case;
+
+#[derive(Copy, Clone, Debug)]
+pub(crate) struct KindsSrc {
+    pub(crate) punct: &'static [(&'static str, &'static str)],
+    pub(crate) keywords: &'static [&'static str],
+    pub(crate) contextual_keywords: &'static [&'static str],
+    pub(crate) literals: &'static [&'static str],
+    pub(crate) tokens: &'static [&'static str],
+    pub(crate) nodes: &'static [&'static str],
+    pub(crate) edition_dependent_keywords: &'static [(&'static str, Edition)],
+}
+
+#[allow(dead_code)]
+#[derive(Copy, Clone, Debug, PartialEq, Eq, PartialOrd, Ord)]
+pub(super) enum Edition {
+    Edition2015,
+    Edition2018,
+    Edition2021,
+    Edition2024,
+}
+
+impl ToTokens for Edition {
+    fn to_tokens(&self, tokens: &mut proc_macro2::TokenStream) {
+        match self {
+            Edition::Edition2015 => {
+                tokens.extend(quote::quote! { Edition::Edition2015 });
+            }
+            Edition::Edition2018 => {
+                tokens.extend(quote::quote! { Edition::Edition2018 });
+            }
+            Edition::Edition2021 => {
+                tokens.extend(quote::quote! { Edition::Edition2021 });
+            }
+            Edition::Edition2024 => {
+                tokens.extend(quote::quote! { Edition::Edition2024 });
+            }
+        }
+    }
+}
+
+/// The punctuations of the language.
+const PUNCT: &[(&str, &str)] = &[
+    // KEEP THE DOLLAR AT THE TOP ITS SPECIAL
+    ("$", "DOLLAR"),
+    (";", "SEMICOLON"),
+    (",", "COMMA"),
+    ("(", "L_PAREN"),
+    (")", "R_PAREN"),
+    ("{", "L_CURLY"),
+    ("}", "R_CURLY"),
+    ("[", "L_BRACK"),
+    ("]", "R_BRACK"),
+    ("<", "L_ANGLE"),
+    (">", "R_ANGLE"),
+    ("@", "AT"),
+    ("#", "POUND"),
+    ("~", "TILDE"),
+    ("?", "QUESTION"),
+    ("&", "AMP"),
+    ("|", "PIPE"),
+    ("+", "PLUS"),
+    ("*", "STAR"),
+    ("/", "SLASH"),
+    ("^", "CARET"),
+    ("%", "PERCENT"),
+    ("_", "UNDERSCORE"),
+    (".", "DOT"),
+    ("..", "DOT2"),
+    ("...", "DOT3"),
+    ("..=", "DOT2EQ"),
+    (":", "COLON"),
+    ("::", "COLON2"),
+    ("=", "EQ"),
+    ("==", "EQ2"),
+    ("=>", "FAT_ARROW"),
+    ("!", "BANG"),
+    ("!=", "NEQ"),
+    ("-", "MINUS"),
+    ("->", "THIN_ARROW"),
+    ("<=", "LTEQ"),
+    (">=", "GTEQ"),
+    ("+=", "PLUSEQ"),
+    ("-=", "MINUSEQ"),
+    ("|=", "PIPEEQ"),
+    ("&=", "AMPEQ"),
+    ("^=", "CARETEQ"),
+    ("/=", "SLASHEQ"),
+    ("*=", "STAREQ"),
+    ("%=", "PERCENTEQ"),
+    ("&&", "AMP2"),
+    ("||", "PIPE2"),
+    ("<<", "SHL"),
+    (">>", "SHR"),
+    ("<<=", "SHLEQ"),
+    (">>=", "SHREQ"),
+];
+const TOKENS: &[&str] = &["ERROR", "WHITESPACE", "NEWLINE", "COMMENT"];
+// &["ERROR", "IDENT", "WHITESPACE", "LIFETIME_IDENT", "COMMENT", "SHEBANG"],;
+
+const EOF: &str = "EOF";
+
+const RESERVED: &[&str] = &[
+    "abstract", "become", "box", "do", "final", "macro", "override", "priv", "typeof", "unsized",
+    "virtual", "yield",
+];
+// keywords that are keywords only in specific parse contexts
+#[doc(alias = "WEAK_KEYWORDS")]
+const CONTEXTUAL_KEYWORDS: &[&str] = &[
+    "macro_rules",
+    "union",
+    "default",
+    "raw",
+    "dyn",
+    "auto",
+    "yeet",
+];
+// keywords we use for special macro expansions
+const CONTEXTUAL_BUILTIN_KEYWORDS: &[&str] = &["builtin", "offset_of", "format_args", "asm"];
+// keywords that are keywords depending on the edition
+const EDITION_DEPENDENT_KEYWORDS: &[(&str, Edition)] = &[
+    ("try", Edition::Edition2018),
+    ("dyn", Edition::Edition2018),
+    ("async", Edition::Edition2018),
+    ("await", Edition::Edition2018),
+    ("gen", Edition::Edition2024),
+];
+
+pub(crate) fn generate_kind_src(
+    nodes: &[AstNodeSrc],
+    enums: &[AstEnumSrc],
+    grammar: &ungrammar::Grammar,
+) -> KindsSrc {
+    let mut contextual_keywords: Vec<&_> = CONTEXTUAL_KEYWORDS
+        .iter()
+        .chain(CONTEXTUAL_BUILTIN_KEYWORDS)
+        .copied()
+        .collect();
+
+    let mut keywords: Vec<&_> = Vec::new();
+    let mut tokens: Vec<&_> = TOKENS.to_vec();
+    let mut literals: Vec<&_> = Vec::new();
+    let mut used_puncts = vec![false; PUNCT.len()];
+    // Mark $ as used
+    used_puncts[0] = true;
+    grammar.tokens().for_each(|token| {
+        let name = &*grammar[token].name;
+        if name == EOF {
+            return;
+        }
+        match name.split_at(1) {
+            ("@", lit) if !lit.is_empty() => {
+                literals.push(String::leak(to_upper_snake_case(lit)));
+            }
+            ("#", token) if !token.is_empty() => {
+                tokens.push(String::leak(to_upper_snake_case(token)));
+            }
+            _ if contextual_keywords.contains(&name) => {}
+            _ if name.chars().all(char::is_alphabetic) => {
+                keywords.push(String::leak(name.to_owned()));
+            }
+            _ => {
+                let idx = PUNCT
+                    .iter()
+                    .position(|(punct, _)| punct == &name)
+                    .unwrap_or_else(|| panic!("Grammar references unknown punctuation {name:?}"));
+                used_puncts[idx] = true;
+            }
+        }
+    });
+    PUNCT
+        .iter()
+        .zip(used_puncts)
+        .filter(|(_, used)| !used)
+        .for_each(|((punct, _), _)| {
+            panic!("Punctuation {punct:?} is not used in grammar");
+        });
+    keywords.extend(RESERVED.iter().copied());
+    keywords.sort();
+    keywords.dedup();
+    contextual_keywords.sort();
+    contextual_keywords.dedup();
+    let mut edition_dependent_keywords: Vec<(&_, _)> = EDITION_DEPENDENT_KEYWORDS.to_vec();
+    edition_dependent_keywords.sort();
+    edition_dependent_keywords.dedup();
+
+    keywords.retain(|&it| !contextual_keywords.contains(&it));
+    keywords.retain(|&it| !edition_dependent_keywords.iter().any(|&(kw, _)| kw == it));
+
+    // we leak things here for simplicity, that way we don't have to deal with lifetimes
+    // The execution is a one shot job so thats fine
+    let nodes = nodes
+        .iter()
+        .map(|it| &it.name)
+        .chain(enums.iter().map(|it| &it.name))
+        .map(|it| to_upper_snake_case(it))
+        .map(String::leak)
+        .map(|it| &*it)
+        .collect();
+    let nodes = Vec::leak(nodes);
+    nodes.sort();
+    let keywords = Vec::leak(keywords);
+    let contextual_keywords = Vec::leak(contextual_keywords);
+    let edition_dependent_keywords = Vec::leak(edition_dependent_keywords);
+    let literals = Vec::leak(literals);
+    literals.sort();
+    let tokens = Vec::leak(tokens);
+    tokens.sort();
+
+    KindsSrc {
+        punct: PUNCT,
+        nodes,
+        keywords,
+        contextual_keywords,
+        edition_dependent_keywords,
+        literals,
+        tokens,
+    }
+}
+
+#[derive(Default, Debug)]
+pub(crate) struct AstSrc {
+    pub(crate) tokens: Vec<String>,
+    pub(crate) nodes: Vec<AstNodeSrc>,
+    pub(crate) enums: Vec<AstEnumSrc>,
+}
+
+#[derive(Debug)]
+pub(crate) struct AstNodeSrc {
+    pub(crate) doc: Vec<String>,
+    pub(crate) name: String,
+    pub(crate) traits: Vec<String>,
+    pub(crate) fields: Vec<Field>,
+}
+
+#[derive(Debug, Eq, PartialEq)]
+pub(crate) enum Field {
+    Token(String),
+    Node {
+        name: String,
+        ty: String,
+        cardinality: Cardinality,
+    },
+}
+
+#[derive(Debug, Eq, PartialEq)]
+pub(crate) enum Cardinality {
+    Optional,
+    Many,
+}
+
+#[derive(Debug)]
+pub(crate) struct AstEnumSrc {
+    pub(crate) doc: Vec<String>,
+    pub(crate) name: String,
+    pub(crate) traits: Vec<String>,
+    pub(crate) variants: Vec<String>,
+}
diff --git a/rust/ast-generator/src/flags.rs b/rust/ast-generator/src/flags.rs
new file mode 100644
index 00000000000..4938ed46b45
--- /dev/null
+++ b/rust/ast-generator/src/flags.rs
@@ -0,0 +1,11 @@
+use std::fmt::Display;
+
+pub enum CodegenType {
+    Grammar,
+}
+
+impl Display for CodegenType {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        write!(f, "Grammar")
+    }
+}
diff --git a/rust/ast-generator/src/main.rs b/rust/ast-generator/src/main.rs
new file mode 100644
index 00000000000..665ffbac6c7
--- /dev/null
+++ b/rust/ast-generator/src/main.rs
@@ -0,0 +1,611 @@
+use std::io::Write;
+use std::{fs, path::PathBuf};
+
+pub mod codegen;
+mod flags;
+use codegen::grammar::ast_src::{AstNodeSrc, AstSrc, Field};
+use std::collections::{BTreeMap, BTreeSet};
+use std::env;
+use ungrammar::Grammar;
+
+fn project_root() -> PathBuf {
+    let dir =
+        env::var("CARGO_MANIFEST_DIR").unwrap_or_else(|_| env!("CARGO_MANIFEST_DIR").to_owned());
+    PathBuf::from(dir).parent().unwrap().to_owned()
+}
+
+fn class_name(type_name: &String) -> String {
+    match type_name.as_str() {
+        "BinExpr" => "BinaryExpr".to_owned(),
+        "ElseBranch" => "Expr".to_owned(),
+        "Fn" => "Function".to_owned(),
+        "Literal" => "LiteralExpr".to_owned(),
+        "Type" => "TypeRef".to_owned(),
+        _ => type_name.to_owned(),
+    }
+}
+
+fn property_name(type_name: &String, field_name: &String) -> String {
+    match (type_name.as_str(), field_name.as_str()) {
+        ("Path", "segment") => "part".to_owned(),
+        (_, "then_branch") => "then".to_owned(),
+        (_, "else_branch") => "else_".to_owned(),
+        _ => field_name.to_owned(),
+    }
+}
+
+fn to_lower_snake_case(s: &str) -> String {
+    let mut buf = String::with_capacity(s.len());
+    let mut prev = false;
+    for c in s.chars() {
+        if c.is_ascii_uppercase() && prev {
+            buf.push('_')
+        }
+        prev = true;
+
+        buf.push(c.to_ascii_lowercase());
+    }
+    buf
+}
+
+fn write_schema(
+    grammar: &AstSrc,
+    super_types: BTreeMap<String, BTreeSet<String>>,
+) -> std::io::Result<String> {
+    let mut buf: Vec<u8> = Vec::new();
+    writeln!(
+        buf,
+        "# Generated by `ast-generator`, do not edit by hand.\n"
+    )?;
+    writeln!(buf, "from .prelude import *")?;
+
+    for node in &grammar.enums {
+        let super_classses = if let Some(cls) = super_types.get(&node.name) {
+            let super_classes: Vec<String> = cls.iter().map(class_name).collect();
+            super_classes.join(",")
+        } else {
+            "AstNode".to_owned()
+        };
+        writeln!(
+            buf,
+            "\nclass {}({}):",
+            class_name(&node.name),
+            super_classses
+        )?;
+        writeln!(buf, "   pass")?;
+    }
+    for node in &grammar.nodes {
+        let super_classses = if let Some(cls) = super_types.get(&node.name) {
+            let super_classes: Vec<String> = cls.iter().map(class_name).collect();
+            super_classes.join(",")
+        } else {
+            "AstNode".to_owned()
+        };
+        writeln!(
+            buf,
+            "\nclass {}({}):",
+            class_name(&node.name),
+            super_classses
+        )?;
+        let mut empty = true;
+        for field in get_fields(node) {
+            if field.tp == "SyntaxToken" {
+                continue;
+            }
+
+            empty = false;
+            if field.tp == "predicate" {
+                writeln!(
+                    buf,
+                    "   {}: predicate",
+                    property_name(&node.name, &field.name),
+                )?;
+            } else if field.tp == "string" {
+                writeln!(
+                    buf,
+                    "   {}: optional[string]",
+                    property_name(&node.name, &field.name),
+                )?;
+            } else {
+                let list = field.is_many;
+                let (o, c) = if list {
+                    ("list[", "]")
+                } else {
+                    ("optional[", "]")
+                };
+                writeln!(
+                    buf,
+                    "   {}: {}\"{}\"{} | child",
+                    property_name(&node.name, &field.name),
+                    o,
+                    class_name(&field.tp),
+                    c
+                )?;
+            };
+        }
+        if empty {
+            writeln!(buf, "   pass")?;
+        }
+    }
+    Ok(String::from_utf8_lossy(&buf).to_string())
+}
+
+struct FieldInfo {
+    name: String,
+    tp: String,
+    is_many: bool,
+}
+fn get_fields(node: &AstNodeSrc) -> Vec<FieldInfo> {
+    let mut result = Vec::new();
+    let predicates = [
+        "async", "auto", "const", "default", "gen", "move", "mut", "raw", "ref", "static", "try",
+        "unsafe",
+    ];
+    for field in &node.fields {
+        if let Field::Token(name) = field {
+            if predicates.contains(&name.as_str()) {
+                result.push(FieldInfo {
+                    name: format!("is_{name}"),
+                    tp: "predicate".to_string(),
+                    is_many: false,
+                });
+            }
+        }
+    }
+
+    match node.name.as_str() {
+        "Name" | "NameRef" | "Lifetime" => {
+            result.push(FieldInfo {
+                name: "text".to_string(),
+                tp: "string".to_string(),
+                is_many: false,
+            });
+        }
+        "Abi" => {
+            result.push(FieldInfo {
+                name: "abi_string".to_string(),
+                tp: "string".to_string(),
+                is_many: false,
+            });
+        }
+        "Literal" => {
+            result.push(FieldInfo {
+                name: "text_value".to_string(),
+                tp: "string".to_string(),
+                is_many: false,
+            });
+        }
+        "PrefixExpr" => {
+            result.push(FieldInfo {
+                name: "operator_name".to_string(),
+                tp: "string".to_string(),
+                is_many: false,
+            });
+        }
+        "BinExpr" => {
+            result.push(FieldInfo {
+                name: "lhs".to_string(),
+                tp: "Expr".to_string(),
+                is_many: false,
+            });
+            result.push(FieldInfo {
+                name: "rhs".to_string(),
+                tp: "Expr".to_string(),
+                is_many: false,
+            });
+            result.push(FieldInfo {
+                name: "operator_name".to_string(),
+                tp: "string".to_string(),
+                is_many: false,
+            });
+        }
+        "IfExpr" => {
+            result.push(FieldInfo {
+                name: "then_branch".to_string(),
+                tp: "BlockExpr".to_string(),
+                is_many: false,
+            });
+            result.push(FieldInfo {
+                name: "else_branch".to_string(),
+                tp: "ElseBranch".to_string(),
+                is_many: false,
+            });
+            result.push(FieldInfo {
+                name: "condition".to_string(),
+                tp: "Expr".to_string(),
+                is_many: false,
+            });
+        }
+        "RangeExpr" => {
+            result.push(FieldInfo {
+                name: "start".to_string(),
+                tp: "Expr".to_string(),
+                is_many: false,
+            });
+            result.push(FieldInfo {
+                name: "end".to_string(),
+                tp: "Expr".to_string(),
+                is_many: false,
+            });
+            result.push(FieldInfo {
+                name: "operator_name".to_string(),
+                tp: "string".to_string(),
+                is_many: false,
+            });
+        }
+        "RangePat" => {
+            result.push(FieldInfo {
+                name: "start".to_string(),
+                tp: "Pat".to_string(),
+                is_many: false,
+            });
+            result.push(FieldInfo {
+                name: "end".to_string(),
+                tp: "Pat".to_string(),
+                is_many: false,
+            });
+            result.push(FieldInfo {
+                name: "operator_name".to_string(),
+                tp: "string".to_string(),
+                is_many: false,
+            });
+        }
+        "IndexExpr" => {
+            result.push(FieldInfo {
+                name: "index".to_string(),
+                tp: "Expr".to_string(),
+                is_many: false,
+            });
+            result.push(FieldInfo {
+                name: "base".to_string(),
+                tp: "Expr".to_string(),
+                is_many: false,
+            });
+        }
+        "Impl" => {
+            result.push(FieldInfo {
+                name: "trait_".to_string(),
+                tp: "Type".to_string(),
+                is_many: false,
+            });
+            result.push(FieldInfo {
+                name: "self_ty".to_string(),
+                tp: "Type".to_string(),
+                is_many: false,
+            });
+        }
+        "ForExpr" => {
+            result.push(FieldInfo {
+                name: "iterable".to_string(),
+                tp: "Expr".to_string(),
+                is_many: false,
+            });
+        }
+        "WhileExpr" => {
+            result.push(FieldInfo {
+                name: "condition".to_string(),
+                tp: "Expr".to_string(),
+                is_many: false,
+            });
+        }
+        "MatchGuard" => {
+            result.push(FieldInfo {
+                name: "condition".to_string(),
+                tp: "Expr".to_string(),
+                is_many: false,
+            });
+        }
+        "MacroDef" => {
+            result.push(FieldInfo {
+                name: "args".to_string(),
+                tp: "TokenTree".to_string(),
+                is_many: false,
+            });
+            result.push(FieldInfo {
+                name: "body".to_string(),
+                tp: "TokenTree".to_string(),
+                is_many: false,
+            });
+        }
+        "FormatArgsExpr" => {
+            result.push(FieldInfo {
+                name: "args".to_string(),
+                tp: "FormatArgsArg".to_string(),
+                is_many: true,
+            });
+        }
+        "ArgList" => {
+            result.push(FieldInfo {
+                name: "args".to_string(),
+                tp: "Expr".to_string(),
+                is_many: true,
+            });
+        }
+        "Fn" => {
+            result.push(FieldInfo {
+                name: "body".to_string(),
+                tp: "BlockExpr".to_string(),
+                is_many: false,
+            });
+        }
+        "Const" => {
+            result.push(FieldInfo {
+                name: "body".to_string(),
+                tp: "Expr".to_string(),
+                is_many: false,
+            });
+        }
+        "Static" => {
+            result.push(FieldInfo {
+                name: "body".to_string(),
+                tp: "Expr".to_string(),
+                is_many: false,
+            });
+        }
+        "ClosureExpr" => {
+            result.push(FieldInfo {
+                name: "body".to_string(),
+                tp: "Expr".to_string(),
+                is_many: false,
+            });
+        }
+        _ => {}
+    }
+
+    for field in &node.fields {
+        // The ArrayExpr type also has an 'exprs' field
+        if node.name == "ArrayExpr" && field.method_name() == "expr" {
+            continue;
+        }
+        result.push(FieldInfo {
+            name: field.method_name(),
+            tp: field.ty().to_string(),
+            is_many: field.is_many(),
+        });
+    }
+    for trait_ in &node.traits {
+        match trait_.as_str() {
+            "HasAttrs" => result.push(FieldInfo {
+                name: "attrs".to_owned(),
+                tp: "Attr".to_owned(),
+                is_many: true,
+            }),
+            "HasName" => result.push(FieldInfo {
+                name: "name".to_owned(),
+                tp: "Name".to_owned(),
+                is_many: false,
+            }),
+            "HasVisibility" => result.push(FieldInfo {
+                name: "visibility".to_owned(),
+                tp: "Visibility".to_owned(),
+                is_many: false,
+            }),
+            "HasGenericParams" => {
+                result.push(FieldInfo {
+                    name: "generic_param_list".to_owned(),
+                    tp: "GenericParamList".to_owned(),
+                    is_many: false,
+                });
+                result.push(FieldInfo {
+                    name: "where_clause".to_owned(),
+                    tp: "WhereClause".to_owned(),
+                    is_many: false,
+                })
+            }
+            "HasGenericArgs" => result.push(FieldInfo {
+                name: "generic_arg_list".to_owned(),
+                tp: "GenericArgList".to_owned(),
+                is_many: false,
+            }),
+            "HasTypeBounds" => result.push(FieldInfo {
+                name: "type_bound_list".to_owned(),
+                tp: "TypeBoundList".to_owned(),
+                is_many: false,
+            }),
+            "HasModuleItem" => result.push(FieldInfo {
+                name: "items".to_owned(),
+                tp: "Item".to_owned(),
+                is_many: true,
+            }),
+            "HasLoopBody" => {
+                result.push(FieldInfo {
+                    name: "label".to_owned(),
+                    tp: "Label".to_owned(),
+                    is_many: false,
+                });
+                result.push(FieldInfo {
+                    name: "loop_body".to_owned(),
+                    tp: "BlockExpr".to_owned(),
+                    is_many: false,
+                })
+            }
+            "HasArgList" => result.push(FieldInfo {
+                name: "arg_list".to_owned(),
+                tp: "ArgList".to_owned(),
+                is_many: false,
+            }),
+            "HasDocComments" => {}
+
+            _ => panic!("Unknown trait {}", trait_),
+        };
+    }
+    result.sort_by(|x, y| x.name.cmp(&y.name));
+    result
+}
+
+fn write_extractor(grammar: &AstSrc) -> std::io::Result<String> {
+    let mut buf: Vec<u8> = Vec::new();
+    writeln!(
+        buf,
+        "//! Generated by `ast-generator`, do not edit by hand.\n
+#![cfg_attr(any(), rustfmt::skip)]
+
+use super::base::Translator;
+use super::mappings::TextValue;
+use crate::emit_detached;
+use crate::generated;
+use crate::trap::{{Label, TrapId}};
+use ra_ap_syntax::ast::{{
+    HasArgList, HasAttrs, HasGenericArgs, HasGenericParams, HasLoopBody, HasModuleItem, HasName,
+    HasTypeBounds, HasVisibility, RangeItem,
+}};
+use ra_ap_syntax::{{ast, AstNode}};
+
+impl Translator<'_> {{
+    fn emit_else_branch(&mut self, node: ast::ElseBranch) -> Label<generated::Expr> {{
+        match node {{
+            ast::ElseBranch::IfExpr(inner) => self.emit_if_expr(inner).into(),
+            ast::ElseBranch::Block(inner) => self.emit_block_expr(inner).into(),
+        }}
+    }}\n"
+    )?;
+    for node in &grammar.enums {
+        let type_name = &node.name;
+        let class_name = class_name(&node.name);
+
+        writeln!(
+            buf,
+            "    pub(crate) fn emit_{}(&mut self, node: ast::{}) -> Label<generated::{}> {{",
+            to_lower_snake_case(type_name),
+            type_name,
+            class_name
+        )?;
+        writeln!(buf, "        match node {{")?;
+        for variant in &node.variants {
+            writeln!(
+                buf,
+                "            ast::{}::{}(inner) => self.emit_{}(inner).into(),",
+                type_name,
+                variant,
+                to_lower_snake_case(variant)
+            )?;
+        }
+        writeln!(buf, "        }}")?;
+        writeln!(buf, "    }}\n")?;
+    }
+
+    for node in &grammar.nodes {
+        let type_name = &node.name;
+        let class_name = class_name(&node.name);
+
+        writeln!(
+            buf,
+            "    pub(crate) fn emit_{}(&mut self, node: ast::{}) -> Label<generated::{}> {{",
+            to_lower_snake_case(type_name),
+            type_name,
+            class_name
+        )?;
+        for field in get_fields(node) {
+            if &field.tp == "SyntaxToken" {
+                continue;
+            }
+
+            let type_name = &field.tp;
+            let struct_field_name = &field.name;
+            let class_field_name = property_name(&node.name, &field.name);
+            if field.tp == "predicate" {
+                writeln!(
+                    buf,
+                    "        let {} = node.{}_token().is_some();",
+                    class_field_name,
+                    &struct_field_name[3..],
+                )?;
+            } else if field.tp == "string" {
+                writeln!(
+                    buf,
+                    "        let {} = node.try_get_text();",
+                    class_field_name,
+                )?;
+            } else if field.is_many {
+                writeln!(
+                    buf,
+                    "        let {} = node.{}().map(|x| self.emit_{}(x)).collect();",
+                    class_field_name,
+                    struct_field_name,
+                    to_lower_snake_case(type_name)
+                )?;
+            } else {
+                writeln!(
+                    buf,
+                    "        let {} = node.{}().map(|x| self.emit_{}(x));",
+                    class_field_name,
+                    struct_field_name,
+                    to_lower_snake_case(type_name)
+                )?;
+            }
+        }
+        writeln!(
+            buf,
+            "        let label = self.trap.emit(generated::{} {{",
+            class_name
+        )?;
+        writeln!(buf, "            id: TrapId::Star,")?;
+        for field in get_fields(node) {
+            if field.tp == "SyntaxToken" {
+                continue;
+            }
+
+            let class_field_name: String = property_name(&node.name, &field.name);
+            writeln!(buf, "            {},", class_field_name)?;
+        }
+        writeln!(buf, "        }});")?;
+        writeln!(buf, "        self.emit_location(label, &node);")?;
+        writeln!(
+            buf,
+            "        emit_detached!({}, self, node, label);",
+            class_name
+        )?;
+        writeln!(
+            buf,
+            "        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());"
+        )?;
+        writeln!(buf, "        label")?;
+
+        writeln!(buf, "    }}\n")?;
+    }
+    writeln!(buf, "}}")?;
+    Ok(String::from_utf8_lossy(&buf).into_owned())
+}
+
+fn main() -> std::io::Result<()> {
+    let grammar: Grammar = fs::read_to_string(project_root().join("ast-generator/rust.ungram"))
+        .unwrap()
+        .parse()
+        .unwrap();
+    let mut grammar = codegen::grammar::lower(&grammar);
+
+    grammar.enums.retain(|x| x.name != "Adt");
+
+    let mut super_types: BTreeMap<String, BTreeSet<String>> = BTreeMap::new();
+    for node in &grammar.enums {
+        for variant in &node.variants {
+            let set = super_types.entry(variant.to_owned()).or_default();
+            set.insert(node.name.to_owned());
+        }
+    }
+    // sort things while ensuring super clases are defined before they are used
+    grammar.enums.sort_by(|x, y| {
+        let super_class_x = super_types.get(&x.name).into_iter().flatten().max();
+        let super_class_y = super_types.get(&y.name).into_iter().flatten().max();
+        super_class_x.cmp(&super_class_y).then(x.name.cmp(&y.name))
+    });
+    let schema = write_schema(&grammar, super_types)?;
+    let schema_path = project_root().join("schema/ast.py");
+    codegen::ensure_file_contents(
+        crate::flags::CodegenType::Grammar,
+        &schema_path,
+        &schema,
+        false,
+    );
+
+    let extractor = write_extractor(&grammar)?;
+    let extractor_path = project_root().join("extractor/src/translate/generated.rs");
+    codegen::ensure_file_contents(
+        crate::flags::CodegenType::Grammar,
+        &extractor_path,
+        &extractor,
+        false,
+    );
+
+    Ok(())
+}
diff --git a/rust/codegen.conf b/rust/codegen.conf
index 0847572dafb..29b6edc8985 100644
--- a/rust/codegen.conf
+++ b/rust/codegen.conf
@@ -1,4 +1,5 @@
 # configuration file for Rust code generation default options
+--schema=schema
 --generate=dbscheme,rusttest,ql,rust
 --dbscheme=ql/lib/rust.dbscheme
 --ql-output=ql/lib/codeql/rust/elements/internal/generated
diff --git a/rust/codegen/BUILD.bazel b/rust/codegen/BUILD.bazel
index 99f737538a6..fbac3d04619 100644
--- a/rust/codegen/BUILD.bazel
+++ b/rust/codegen/BUILD.bazel
@@ -1,7 +1,25 @@
 load("@bazel_skylib//rules:native_binary.bzl", "native_binary")
 
-native_binary(
+_args = [
+    "//rust/ast-generator",
+    "//rust/ast-generator:Cargo.toml",
+    "//misc/codegen",
+    "//rust:codegen-conf",
+]
+
+sh_binary(
     name = "codegen",
+    srcs = ["codegen.sh"],
+    args = ["$(rlocationpath %s)" % a for a in _args],
+    data = _args,
+    visibility = ["//rust:__subpackages__"],
+    deps = [
+        "//misc/bazel:sh_runfiles",
+    ],
+)
+
+native_binary(
+    name = "py",
     src = "//misc/codegen",
     out = "codegen",
     args = [
@@ -9,7 +27,6 @@ native_binary(
     ],
     data = [
         "//rust:codegen-conf",
-        "//rust:schema",
     ],
     visibility = ["//rust:__subpackages__"],
 )
diff --git a/rust/codegen/codegen.sh b/rust/codegen/codegen.sh
new file mode 100755
index 00000000000..0d746eeb289
--- /dev/null
+++ b/rust/codegen/codegen.sh
@@ -0,0 +1,14 @@
+#!/bin/bash
+
+set -eu
+
+source misc/bazel/runfiles.sh 2>/dev/null || source external/ql+/misc/bazel/runfiles.sh
+
+ast_generator="$(rlocation "$1")"
+ast_generator_manifest="$(rlocation "$2")"
+codegen="$(rlocation "$3")"
+codegen_conf="$(rlocation "$4")"
+shift 4
+
+CARGO_MANIFEST_DIR="$(dirname "$ast_generator_manifest")" "$ast_generator"
+"$codegen" --configuration-file="$codegen_conf" "$@"
diff --git a/rust/codeql-extractor.yml b/rust/codeql-extractor.yml
index e33d2c0c715..2f726a10ada 100644
--- a/rust/codeql-extractor.yml
+++ b/rust/codeql-extractor.yml
@@ -23,14 +23,34 @@ options:
         title: Controls compression for the TRAP files written by the extractor.
         description: >
           This option is only intended for use in debugging the extractor. Accepted
-          values are 'gzip' (the default, to write gzip-compressed TRAP) and 'none'
-          (to write uncompressed TRAP).
+          values are 'gzip' (to write gzip-compressed TRAP) and 'none'
+          (currently the default, to write uncompressed TRAP).
         type: string
         pattern: "^(none|gzip)$"
-  extract_dependencies:
-    title: Whether to extract dependencies.
+  cargo_target_dir:
+    title: Directory to use for cargo output files.
     description: >
-      Extract the source code of dependencies and the standard libraries in addition to 
-      normal source code.
+      This value is an optional path to use as `CARGO_TARGET_DIR` for the internal
+      cargo commands the extractor uses. Pointing it to a persistent directory may
+      reduce execution time of consecutive extractor runs. By default, a new scratch
+      directory is used for each run.
     type: string
-    pattern: "^(false|true)$"
+  cargo_target:
+    title: Target architecture
+    description: >
+      Target architecture to use for analysis, analogous to `cargo --target`. By
+      default the host architecture is used.
+    type: string
+  cargo_features:
+    title: Cargo features to turn on
+    description: >
+      Comma-separated list of features to turn on. If any value is `*` all features
+      are turned on. By default only default cargo features are enabled. Can be
+      repeated.
+    type: array
+  cargo_cfg_overrides:
+    title: Cargo cfg overrides
+    description: >
+      Comma-separated list of cfg settings to enable, or disable if prefixed with `-`.
+      Can be repeated.
+    type: array
diff --git a/rust/extractor/BUILD.bazel b/rust/extractor/BUILD.bazel
index a5d99e82584..124895b149c 100644
--- a/rust/extractor/BUILD.bazel
+++ b/rust/extractor/BUILD.bazel
@@ -1,5 +1,7 @@
-load("@tree_sitter_extractors_deps//:defs.bzl", "aliases", "all_crate_deps")
 load("//misc/bazel:rust.bzl", "codeql_rust_binary")
+load("//misc/bazel/3rdparty/tree_sitter_extractors_deps:defs.bzl", "aliases", "all_crate_deps")
+
+exports_files(["Cargo.toml"])
 
 codeql_rust_binary(
     name = "extractor",
diff --git a/rust/extractor/Cargo.toml b/rust/extractor/Cargo.toml
index 3b474f90f98..8b58898d3cf 100644
--- a/rust/extractor/Cargo.toml
+++ b/rust/extractor/Cargo.toml
@@ -3,21 +3,27 @@ name = "codeql-rust"
 version = "0.1.0"
 edition = "2021"
 
+# When updating these dependencies, run `rust/update_cargo_deps.sh`
 [dependencies]
 anyhow = "1.0.86"
 clap = { version = "4.5.16", features = ["derive"] }
-figment = { version = "0.10.19", features = ["env"]}
+figment = { version = "0.10.19", features = ["env", "yaml"] }
 log = "0.4.22"
 num-traits = "0.2.19"
 ra_ap_base_db = "0.0.232"
 ra_ap_hir = "0.0.232"
 ra_ap_hir_def = "0.0.232"
 ra_ap_ide_db = "0.0.232"
+ra_ap_hir_expand = "0.0.232"
 ra_ap_load-cargo = "0.0.232"
 ra_ap_paths = "0.0.232"
 ra_ap_project_model = "0.0.232"
 ra_ap_syntax = "0.0.232"
 ra_ap_vfs = "0.0.232"
+ra_ap_parser = "0.0.232"
+ra_ap_span = "0.0.232"
+ra_ap_cfg = "0.0.232"
+ra_ap_intern = "0.0.232"
 serde = "1.0.209"
 serde_with = "3.9.0"
 stderrlog = "0.6.0"
@@ -25,3 +31,5 @@ triomphe = "0.1.13"
 argfile = "0.2.1"
 codeql-extractor = { path = "../../shared/tree-sitter-extractor" }
 rust-extractor-macros = { path = "macros" }
+itertools = "0.13.0"
+glob = "0.3.1"
diff --git a/rust/extractor/macros/BUILD.bazel b/rust/extractor/macros/BUILD.bazel
index 4ddfb14a171..73392b25765 100644
--- a/rust/extractor/macros/BUILD.bazel
+++ b/rust/extractor/macros/BUILD.bazel
@@ -1,5 +1,7 @@
 load("@rules_rust//rust:defs.bzl", "rust_proc_macro")
-load("@tree_sitter_extractors_deps//:defs.bzl", "aliases", "all_crate_deps")
+load("//misc/bazel/3rdparty/tree_sitter_extractors_deps:defs.bzl", "aliases", "all_crate_deps")
+
+exports_files(["Cargo.toml"])
 
 rust_proc_macro(
     name = "rust_extractor_macros",
diff --git a/rust/extractor/macros/Cargo.toml b/rust/extractor/macros/Cargo.toml
index d4d10bc3bde..42c0a0c6d3d 100644
--- a/rust/extractor/macros/Cargo.toml
+++ b/rust/extractor/macros/Cargo.toml
@@ -6,6 +6,7 @@ edition = "2021"
 [lib]
 proc-macro = true
 
+# When updating these dependencies, run `rust/update_cargo_deps.sh`
 [dependencies]
 quote = "1.0.37"
 syn = { version = "2.0.77", features = ["full"] }
diff --git a/rust/extractor/macros/src/lib.rs b/rust/extractor/macros/src/lib.rs
index 781d53bd851..c70856aad9f 100644
--- a/rust/extractor/macros/src/lib.rs
+++ b/rust/extractor/macros/src/lib.rs
@@ -1,55 +1,115 @@
 use proc_macro::TokenStream;
 use quote::{format_ident, quote};
+use syn::{Ident, Type};
+
+fn get_type_tip(t: &Type) -> Option<&Ident> {
+    let syn::Type::Path(path) = t else {
+        return None;
+    };
+    let segment = path.path.segments.last()?;
+    Some(&segment.ident)
+}
 
 /// Allow all fields in the extractor config to be also overrideable by extractor CLI flags
 #[proc_macro_attribute]
 pub fn extractor_cli_config(_attr: TokenStream, item: TokenStream) -> TokenStream {
     let ast = syn::parse_macro_input!(item as syn::ItemStruct);
     let name = &ast.ident;
-    let new_name = format_ident!("Cli{}", name);
-    let fields: Vec<_> = ast
+    let fields = ast
+        .fields
+        .iter()
+        .map(|f| {
+            if f.ident.as_ref().is_some_and(|i| i != "inputs")
+                && get_type_tip(&f.ty).is_some_and(|i| i == "Vec")
+            {
+                quote! {
+                    #[serde(deserialize_with="deserialize_newline_or_comma_separated")]
+                    #f
+                }
+            } else {
+                quote! { #f }
+            }
+        })
+        .collect::<Vec<_>>();
+    let cli_name = format_ident!("Cli{}", name);
+    let cli_fields = ast
         .fields
         .iter()
         .map(|f| {
             let id = f.ident.as_ref().unwrap();
             let ty = &f.ty;
-            if let syn::Type::Path(p) = ty {
-                if p.path.is_ident(&format_ident!("bool")) {
-                    return quote! {
-                        #[arg(long)]
-                        #[serde(skip_serializing_if="<&bool>::not")]
-                        #id: bool,
-                    };
+            let type_tip = get_type_tip(ty);
+            if type_tip.is_some_and(|i| i == "bool") {
+                quote! {
+                    #[arg(long)]
+                    #[serde(skip_serializing_if="<&bool>::not")]
+                    #id: bool
                 }
-            }
-            if id == &format_ident!("verbose") {
+            } else if type_tip.is_some_and(|i| i == "Option") {
+                quote! {
+                    #[arg(long)]
+                    #f
+                }
+            } else if id == &format_ident!("verbose") {
                 quote! {
                     #[arg(long, short, action=clap::ArgAction::Count)]
                     #[serde(skip_serializing_if="u8::is_zero")]
-                    #id: u8,
+                    #id: u8
                 }
             } else if id == &format_ident!("inputs") {
                 quote! {
-                    #id: #ty,
+                    #f
+                }
+            } else if type_tip.is_some_and(|i| i == "Vec") {
+                quote! {
+                    #[arg(long)]
+                    #id: Option<String>
                 }
             } else {
                 quote! {
                     #[arg(long)]
-                    #id: Option<#ty>,
+                    #id: Option<#ty>
                 }
             }
         })
-        .collect();
+        .collect::<Vec<_>>();
+    let debug_fields = ast
+        .fields
+        .iter()
+        .map(|f| {
+            let id = f.ident.as_ref().unwrap();
+            if id == &format_ident!("inputs") {
+                quote! {
+                    .field("number of inputs", &self.#id.len())
+                }
+            } else {
+                quote! {
+                    .field(stringify!(#id), &self.#id)
+                }
+            }
+        })
+        .collect::<Vec<_>>();
+
     let gen = quote! {
         #[serde_with::apply(_ => #[serde(default)])]
-        #[derive(Debug, Deserialize, Default)]
-        #ast
+        #[derive(Deserialize, Default)]
+        pub struct #name {
+            #(#fields),*
+        }
+
+        impl Debug for #name {
+            fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+                f.debug_struct("configuration:")
+                    #(#debug_fields)*
+                    .finish()
+            }
+        }
 
         #[serde_with::skip_serializing_none]
         #[derive(clap::Parser, Serialize)]
         #[command(about, long_about = None)]
-        struct #new_name {
-            #(#fields)*
+        struct #cli_name {
+            #(#cli_fields),*
         }
     };
     gen.into()
diff --git a/rust/extractor/src/archive.rs b/rust/extractor/src/archive.rs
index cc1587ca957..248c0e85d9d 100644
--- a/rust/extractor/src/archive.rs
+++ b/rust/extractor/src/archive.rs
@@ -1,4 +1,4 @@
-use crate::path;
+use codeql_extractor::file_paths;
 use log::{debug, warn};
 use std::fs;
 use std::path::{Path, PathBuf};
@@ -15,12 +15,11 @@ impl Archiver {
     }
 
     fn try_archive(&self, source: &Path) -> std::io::Result<()> {
-        let mut dest = self.root.clone();
-        dest.push(path::key(source));
-        let parent = dest.parent().unwrap();
+        let dest = file_paths::path_for(&self.root, source, "");
         if fs::metadata(&dest).is_ok() {
             return Ok(());
         }
+        let parent = dest.parent().unwrap();
         fs::create_dir_all(parent)?;
         fs::copy(source, dest)?;
         debug!("archived {}", source.display());
diff --git a/rust/extractor/src/config.rs b/rust/extractor/src/config.rs
index 0625968a4af..70c390b9949 100644
--- a/rust/extractor/src/config.rs
+++ b/rust/extractor/src/config.rs
@@ -1,13 +1,24 @@
+mod deserialize_vec;
+
 use anyhow::Context;
 use clap::Parser;
 use codeql_extractor::trap;
+use deserialize_vec::deserialize_newline_or_comma_separated;
 use figment::{
-    providers::{Env, Serialized},
+    providers::{Env, Format, Serialized, Yaml},
+    value::Value,
     Figment,
 };
+use itertools::Itertools;
+use log::warn;
 use num_traits::Zero;
+use ra_ap_cfg::{CfgAtom, CfgDiff};
+use ra_ap_intern::Symbol;
+use ra_ap_paths::Utf8PathBuf;
+use ra_ap_project_model::{CargoConfig, CargoFeatures, CfgOverrides, RustLibSource};
 use rust_extractor_macros::extractor_cli_config;
 use serde::{Deserialize, Serialize};
+use std::fmt::Debug;
 use std::ops::Not;
 use std::path::PathBuf;
 
@@ -34,10 +45,16 @@ pub struct Config {
     pub scratch_dir: PathBuf,
     pub trap_dir: PathBuf,
     pub source_archive_dir: PathBuf,
-    pub extract_dependencies: bool,
+    pub cargo_target_dir: Option<PathBuf>,
+    pub cargo_target: Option<String>,
+    pub cargo_features: Vec<String>,
+    pub cargo_cfg_overrides: Vec<String>,
     pub verbose: u8,
     pub compression: Compression,
     pub inputs: Vec<PathBuf>,
+    pub qltest: bool,
+    pub qltest_cargo_check: bool,
+    pub qltest_dependencies: Vec<String>,
 }
 
 impl Config {
@@ -45,12 +62,102 @@ impl Config {
         let args = argfile::expand_args(argfile::parse_fromfile, argfile::PREFIX)
             .context("expanding parameter files")?;
         let cli_args = CliConfig::parse_from(args);
-        Figment::new()
-            .merge(Env::prefixed("CODEQL_"))
+        let mut figment = Figment::new()
+            .merge(Env::raw().only(["CODEQL_VERBOSE"].as_slice()))
             .merge(Env::prefixed("CODEQL_EXTRACTOR_RUST_"))
             .merge(Env::prefixed("CODEQL_EXTRACTOR_RUST_OPTION_"))
-            .merge(Serialized::defaults(cli_args))
-            .extract()
-            .context("loading configuration")
+            .merge(Serialized::defaults(cli_args));
+        if let Ok(Value::Bool(_, true)) = figment.find_value("qltest") {
+            let cwd = std::env::current_dir()?;
+            let mut option_files = cwd
+                .ancestors()
+                // only travel up while we're within the test pack
+                .take_while_inclusive(|p| !p.join("qlpack.yml").exists())
+                .map(|p| p.join("options.yml"))
+                .filter(|p| p.exists())
+                .collect_vec();
+            option_files.reverse();
+            for path in option_files {
+                figment = figment.merge(Yaml::file_exact(path));
+            }
+        }
+        figment.extract().context("loading configuration")
+    }
+
+    pub fn to_cargo_config(&self) -> CargoConfig {
+        let sysroot = Some(RustLibSource::Discover);
+
+        let target_dir = self
+            .cargo_target_dir
+            .clone()
+            .unwrap_or_else(|| self.scratch_dir.join("target"));
+        let target_dir = Utf8PathBuf::from_path_buf(target_dir).ok();
+
+        let features = if self.cargo_features.is_empty() {
+            Default::default()
+        } else if self.cargo_features.contains(&"*".to_string()) {
+            CargoFeatures::All
+        } else {
+            CargoFeatures::Selected {
+                features: self.cargo_features.clone(),
+                no_default_features: false,
+            }
+        };
+
+        let target = self.cargo_target.clone();
+
+        let cfg_overrides = to_cfg_overrides(&self.cargo_cfg_overrides);
+
+        CargoConfig {
+            sysroot,
+            target_dir,
+            features,
+            target,
+            cfg_overrides,
+            ..Default::default()
+        }
+    }
+}
+
+fn to_cfg_override(spec: &str) -> CfgAtom {
+    if let Some((key, value)) = spec.split_once("=") {
+        CfgAtom::KeyValue {
+            key: Symbol::intern(key),
+            value: Symbol::intern(value),
+        }
+    } else {
+        CfgAtom::Flag(Symbol::intern(spec))
+    }
+}
+
+fn to_cfg_overrides(specs: &Vec<String>) -> CfgOverrides {
+    let mut enabled_cfgs = Vec::new();
+    let mut disabled_cfgs = Vec::new();
+    let mut has_test_explicitly_enabled = false;
+    for spec in specs {
+        if spec.starts_with("-") {
+            disabled_cfgs.push(to_cfg_override(&spec[1..]));
+        } else {
+            enabled_cfgs.push(to_cfg_override(spec));
+            if spec == "test" {
+                has_test_explicitly_enabled = true;
+            }
+        }
+    }
+    if !has_test_explicitly_enabled {
+        disabled_cfgs.push(to_cfg_override("test"));
+    }
+    if let Some(global) = CfgDiff::new(enabled_cfgs, disabled_cfgs) {
+        CfgOverrides {
+            global,
+            ..Default::default()
+        }
+    } else {
+        warn!("non-disjoint cfg overrides, ignoring: {}", specs.join(", "));
+        CfgOverrides {
+            global: CfgDiff::new(Vec::new(), vec![to_cfg_override("test")])
+                .expect("disabling one cfg should always succeed"),
+            ..Default::default()
+        }
     }
 }
diff --git a/rust/extractor/src/config/deserialize_vec.rs b/rust/extractor/src/config/deserialize_vec.rs
new file mode 100644
index 00000000000..eebe413ca29
--- /dev/null
+++ b/rust/extractor/src/config/deserialize_vec.rs
@@ -0,0 +1,49 @@
+use serde::de::Visitor;
+use serde::Deserializer;
+use std::fmt::Formatter;
+use std::marker::PhantomData;
+
+// phantom data ise required to allow parametrizing on `T` without actual `T` data
+struct VectorVisitor<T: From<String>>(PhantomData<T>);
+
+impl<T: From<String>> VectorVisitor<T> {
+    fn new() -> Self {
+        VectorVisitor(PhantomData)
+    }
+}
+
+impl<'de, T: From<String>> Visitor<'de> for VectorVisitor<T> {
+    type Value = Vec<T>;
+
+    fn expecting(&self, formatter: &mut Formatter) -> std::fmt::Result {
+        formatter.write_str("either a sequence, or a comma or newline separated string")
+    }
+
+    fn visit_str<E: serde::de::Error>(self, value: &str) -> Result<Vec<T>, E> {
+        Ok(value
+            .split(['\n', ','])
+            .map(|s| T::from(s.to_owned()))
+            .collect())
+    }
+
+    fn visit_seq<A>(self, mut seq: A) -> Result<Vec<T>, A::Error>
+    where
+        A: serde::de::SeqAccess<'de>,
+    {
+        let mut ret = Vec::new();
+        while let Some(el) = seq.next_element::<String>()? {
+            ret.push(T::from(el));
+        }
+        Ok(ret)
+    }
+}
+
+/// deserialize into a vector of `T` either of:
+/// * a sequence of elements serializable into `String`s, or
+/// * a single element serializable into `String`, then split on `,` and `\n`
+/// This is required to be in scope when the `extractor_cli_config` macro is used.
+pub(crate) fn deserialize_newline_or_comma_separated<'a, D: Deserializer<'a>, T: From<String>>(
+    deserializer: D,
+) -> Result<Vec<T>, D::Error> {
+    deserializer.deserialize_seq(VectorVisitor::new())
+}
diff --git a/rust/extractor/src/generated/.generated.list b/rust/extractor/src/generated/.generated.list
index 795e5d0a550..7335c95f7b8 100644
--- a/rust/extractor/src/generated/.generated.list
+++ b/rust/extractor/src/generated/.generated.list
@@ -1,2 +1,2 @@
 mod.rs 4bcb9def847469aae9d8649461546b7c21ec97cf6e63d3cf394e339915ce65d7 4bcb9def847469aae9d8649461546b7c21ec97cf6e63d3cf394e339915ce65d7
-top.rs ec9ec5e218af9a6b449b40f716e00bbe23c2777941d105b9ed68071aa2468ca2 ec9ec5e218af9a6b449b40f716e00bbe23c2777941d105b9ed68071aa2468ca2
+top.rs cdfb9890318d847e6db320abd8b9e9939524ecc47bcdc8491b9c8253bd3178c2 cdfb9890318d847e6db320abd8b9e9939524ecc47bcdc8491b9c8253bd3178c2
diff --git a/rust/extractor/src/generated/top.rs b/rust/extractor/src/generated/top.rs
index 39712081872..13a0adecbca 100644
--- a/rust/extractor/src/generated/top.rs
+++ b/rust/extractor/src/generated/top.rs
@@ -78,7 +78,17 @@ impl From<trap::Label<AstNode>> for trap::Label<Locatable> {
 
 #[derive(Debug)]
 pub struct Missing {
-    _unused: ()
+    pub id: trap::TrapId<Missing>,
+}
+
+impl trap::TrapEntry for Missing {
+    fn extract_id(&mut self) -> trap::TrapId<Self> {
+        std::mem::replace(&mut self.id, trap::TrapId::Star)
+    }
+
+    fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
+        out.add_tuple("missings", vec![id.into()]);
+    }
 }
 
 impl trap::TrapClass for Missing {
@@ -105,7 +115,17 @@ impl From<trap::Label<Missing>> for trap::Label<Unextracted> {
 
 #[derive(Debug)]
 pub struct Unimplemented {
-    _unused: ()
+    pub id: trap::TrapId<Unimplemented>,
+}
+
+impl trap::TrapEntry for Unimplemented {
+    fn extract_id(&mut self) -> trap::TrapId<Self> {
+        std::mem::replace(&mut self.id, trap::TrapId::Star)
+    }
+
+    fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
+        out.add_tuple("unimplementeds", vec![id.into()]);
+    }
 }
 
 impl trap::TrapClass for Unimplemented {
@@ -131,35 +151,325 @@ impl From<trap::Label<Unimplemented>> for trap::Label<Unextracted> {
 }
 
 #[derive(Debug)]
-pub struct Declaration {
+pub struct Abi {
+    pub id: trap::TrapId<Abi>,
+    pub abi_string: Option<String>,
+}
+
+impl trap::TrapEntry for Abi {
+    fn extract_id(&mut self) -> trap::TrapId<Self> {
+        std::mem::replace(&mut self.id, trap::TrapId::Star)
+    }
+
+    fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
+        out.add_tuple("abis", vec![id.into()]);
+        if let Some(v) = self.abi_string {
+            out.add_tuple("abi_abi_strings", vec![id.into(), v.into()]);
+        }
+    }
+}
+
+impl trap::TrapClass for Abi {
+    fn class_name() -> &'static str { "Abi" }
+}
+
+impl From<trap::Label<Abi>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<Abi>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Abi is a subclass of AstNode
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<Abi>> for trap::Label<Element> {
+    fn from(value: trap::Label<Abi>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Abi is a subclass of Element
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<Abi>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<Abi>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Abi is a subclass of Locatable
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+#[derive(Debug)]
+pub struct ArgList {
+    pub id: trap::TrapId<ArgList>,
+    pub args: Vec<trap::Label<Expr>>,
+}
+
+impl trap::TrapEntry for ArgList {
+    fn extract_id(&mut self) -> trap::TrapId<Self> {
+        std::mem::replace(&mut self.id, trap::TrapId::Star)
+    }
+
+    fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
+        out.add_tuple("arg_lists", vec![id.into()]);
+        for (i, v) in self.args.into_iter().enumerate() {
+            out.add_tuple("arg_list_args", vec![id.into(), i.into(), v.into()]);
+        }
+    }
+}
+
+impl trap::TrapClass for ArgList {
+    fn class_name() -> &'static str { "ArgList" }
+}
+
+impl From<trap::Label<ArgList>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<ArgList>) -> Self {
+        // SAFETY: this is safe because in the dbscheme ArgList is a subclass of AstNode
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<ArgList>> for trap::Label<Element> {
+    fn from(value: trap::Label<ArgList>) -> Self {
+        // SAFETY: this is safe because in the dbscheme ArgList is a subclass of Element
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<ArgList>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<ArgList>) -> Self {
+        // SAFETY: this is safe because in the dbscheme ArgList is a subclass of Locatable
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+#[derive(Debug)]
+pub struct AssocItem {
     _unused: ()
 }
 
-impl trap::TrapClass for Declaration {
-    fn class_name() -> &'static str { "Declaration" }
+impl trap::TrapClass for AssocItem {
+    fn class_name() -> &'static str { "AssocItem" }
 }
 
-impl From<trap::Label<Declaration>> for trap::Label<AstNode> {
-    fn from(value: trap::Label<Declaration>) -> Self {
-        // SAFETY: this is safe because in the dbscheme Declaration is a subclass of AstNode
+impl From<trap::Label<AssocItem>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<AssocItem>) -> Self {
+        // SAFETY: this is safe because in the dbscheme AssocItem is a subclass of AstNode
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<Declaration>> for trap::Label<Element> {
-    fn from(value: trap::Label<Declaration>) -> Self {
-        // SAFETY: this is safe because in the dbscheme Declaration is a subclass of Element
+impl From<trap::Label<AssocItem>> for trap::Label<Element> {
+    fn from(value: trap::Label<AssocItem>) -> Self {
+        // SAFETY: this is safe because in the dbscheme AssocItem is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<Declaration>> for trap::Label<Locatable> {
-    fn from(value: trap::Label<Declaration>) -> Self {
-        // SAFETY: this is safe because in the dbscheme Declaration is a subclass of Locatable
+impl From<trap::Label<AssocItem>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<AssocItem>) -> Self {
+        // SAFETY: this is safe because in the dbscheme AssocItem is a subclass of Locatable
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+#[derive(Debug)]
+pub struct AssocItemList {
+    pub id: trap::TrapId<AssocItemList>,
+    pub assoc_items: Vec<trap::Label<AssocItem>>,
+    pub attrs: Vec<trap::Label<Attr>>,
+}
+
+impl trap::TrapEntry for AssocItemList {
+    fn extract_id(&mut self) -> trap::TrapId<Self> {
+        std::mem::replace(&mut self.id, trap::TrapId::Star)
+    }
+
+    fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
+        out.add_tuple("assoc_item_lists", vec![id.into()]);
+        for (i, v) in self.assoc_items.into_iter().enumerate() {
+            out.add_tuple("assoc_item_list_assoc_items", vec![id.into(), i.into(), v.into()]);
+        }
+        for (i, v) in self.attrs.into_iter().enumerate() {
+            out.add_tuple("assoc_item_list_attrs", vec![id.into(), i.into(), v.into()]);
+        }
+    }
+}
+
+impl trap::TrapClass for AssocItemList {
+    fn class_name() -> &'static str { "AssocItemList" }
+}
+
+impl From<trap::Label<AssocItemList>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<AssocItemList>) -> Self {
+        // SAFETY: this is safe because in the dbscheme AssocItemList is a subclass of AstNode
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<AssocItemList>> for trap::Label<Element> {
+    fn from(value: trap::Label<AssocItemList>) -> Self {
+        // SAFETY: this is safe because in the dbscheme AssocItemList is a subclass of Element
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<AssocItemList>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<AssocItemList>) -> Self {
+        // SAFETY: this is safe because in the dbscheme AssocItemList is a subclass of Locatable
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+#[derive(Debug)]
+pub struct Attr {
+    pub id: trap::TrapId<Attr>,
+    pub meta: Option<trap::Label<Meta>>,
+}
+
+impl trap::TrapEntry for Attr {
+    fn extract_id(&mut self) -> trap::TrapId<Self> {
+        std::mem::replace(&mut self.id, trap::TrapId::Star)
+    }
+
+    fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
+        out.add_tuple("attrs", vec![id.into()]);
+        if let Some(v) = self.meta {
+            out.add_tuple("attr_meta", vec![id.into(), v.into()]);
+        }
+    }
+}
+
+impl trap::TrapClass for Attr {
+    fn class_name() -> &'static str { "Attr" }
+}
+
+impl From<trap::Label<Attr>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<Attr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Attr is a subclass of AstNode
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<Attr>> for trap::Label<Element> {
+    fn from(value: trap::Label<Attr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Attr is a subclass of Element
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<Attr>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<Attr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Attr is a subclass of Locatable
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+#[derive(Debug)]
+pub struct Callable {
+    _unused: ()
+}
+
+impl trap::TrapClass for Callable {
+    fn class_name() -> &'static str { "Callable" }
+}
+
+impl From<trap::Label<Callable>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<Callable>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Callable is a subclass of AstNode
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<Callable>> for trap::Label<Element> {
+    fn from(value: trap::Label<Callable>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Callable is a subclass of Element
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<Callable>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<Callable>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Callable is a subclass of Locatable
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+#[derive(Debug)]
+pub struct ClosureBinder {
+    pub id: trap::TrapId<ClosureBinder>,
+    pub generic_param_list: Option<trap::Label<GenericParamList>>,
+}
+
+impl trap::TrapEntry for ClosureBinder {
+    fn extract_id(&mut self) -> trap::TrapId<Self> {
+        std::mem::replace(&mut self.id, trap::TrapId::Star)
+    }
+
+    fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
+        out.add_tuple("closure_binders", vec![id.into()]);
+        if let Some(v) = self.generic_param_list {
+            out.add_tuple("closure_binder_generic_param_lists", vec![id.into(), v.into()]);
+        }
+    }
+}
+
+impl trap::TrapClass for ClosureBinder {
+    fn class_name() -> &'static str { "ClosureBinder" }
+}
+
+impl From<trap::Label<ClosureBinder>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<ClosureBinder>) -> Self {
+        // SAFETY: this is safe because in the dbscheme ClosureBinder is a subclass of AstNode
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<ClosureBinder>> for trap::Label<Element> {
+    fn from(value: trap::Label<ClosureBinder>) -> Self {
+        // SAFETY: this is safe because in the dbscheme ClosureBinder is a subclass of Element
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<ClosureBinder>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<ClosureBinder>) -> Self {
+        // SAFETY: this is safe because in the dbscheme ClosureBinder is a subclass of Locatable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -202,9 +512,226 @@ impl From<trap::Label<Expr>> for trap::Label<Locatable> {
     }
 }
 
+#[derive(Debug)]
+pub struct ExternItem {
+    _unused: ()
+}
+
+impl trap::TrapClass for ExternItem {
+    fn class_name() -> &'static str { "ExternItem" }
+}
+
+impl From<trap::Label<ExternItem>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<ExternItem>) -> Self {
+        // SAFETY: this is safe because in the dbscheme ExternItem is a subclass of AstNode
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<ExternItem>> for trap::Label<Element> {
+    fn from(value: trap::Label<ExternItem>) -> Self {
+        // SAFETY: this is safe because in the dbscheme ExternItem is a subclass of Element
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<ExternItem>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<ExternItem>) -> Self {
+        // SAFETY: this is safe because in the dbscheme ExternItem is a subclass of Locatable
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+#[derive(Debug)]
+pub struct ExternItemList {
+    pub id: trap::TrapId<ExternItemList>,
+    pub attrs: Vec<trap::Label<Attr>>,
+    pub extern_items: Vec<trap::Label<ExternItem>>,
+}
+
+impl trap::TrapEntry for ExternItemList {
+    fn extract_id(&mut self) -> trap::TrapId<Self> {
+        std::mem::replace(&mut self.id, trap::TrapId::Star)
+    }
+
+    fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
+        out.add_tuple("extern_item_lists", vec![id.into()]);
+        for (i, v) in self.attrs.into_iter().enumerate() {
+            out.add_tuple("extern_item_list_attrs", vec![id.into(), i.into(), v.into()]);
+        }
+        for (i, v) in self.extern_items.into_iter().enumerate() {
+            out.add_tuple("extern_item_list_extern_items", vec![id.into(), i.into(), v.into()]);
+        }
+    }
+}
+
+impl trap::TrapClass for ExternItemList {
+    fn class_name() -> &'static str { "ExternItemList" }
+}
+
+impl From<trap::Label<ExternItemList>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<ExternItemList>) -> Self {
+        // SAFETY: this is safe because in the dbscheme ExternItemList is a subclass of AstNode
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<ExternItemList>> for trap::Label<Element> {
+    fn from(value: trap::Label<ExternItemList>) -> Self {
+        // SAFETY: this is safe because in the dbscheme ExternItemList is a subclass of Element
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<ExternItemList>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<ExternItemList>) -> Self {
+        // SAFETY: this is safe because in the dbscheme ExternItemList is a subclass of Locatable
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+#[derive(Debug)]
+pub struct FieldList {
+    _unused: ()
+}
+
+impl trap::TrapClass for FieldList {
+    fn class_name() -> &'static str { "FieldList" }
+}
+
+impl From<trap::Label<FieldList>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<FieldList>) -> Self {
+        // SAFETY: this is safe because in the dbscheme FieldList is a subclass of AstNode
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<FieldList>> for trap::Label<Element> {
+    fn from(value: trap::Label<FieldList>) -> Self {
+        // SAFETY: this is safe because in the dbscheme FieldList is a subclass of Element
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<FieldList>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<FieldList>) -> Self {
+        // SAFETY: this is safe because in the dbscheme FieldList is a subclass of Locatable
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+#[derive(Debug)]
+pub struct FormatArgsArg {
+    pub id: trap::TrapId<FormatArgsArg>,
+    pub expr: Option<trap::Label<Expr>>,
+    pub name: Option<trap::Label<Name>>,
+}
+
+impl trap::TrapEntry for FormatArgsArg {
+    fn extract_id(&mut self) -> trap::TrapId<Self> {
+        std::mem::replace(&mut self.id, trap::TrapId::Star)
+    }
+
+    fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
+        out.add_tuple("format_args_args", vec![id.into()]);
+        if let Some(v) = self.expr {
+            out.add_tuple("format_args_arg_exprs", vec![id.into(), v.into()]);
+        }
+        if let Some(v) = self.name {
+            out.add_tuple("format_args_arg_names", vec![id.into(), v.into()]);
+        }
+    }
+}
+
+impl trap::TrapClass for FormatArgsArg {
+    fn class_name() -> &'static str { "FormatArgsArg" }
+}
+
+impl From<trap::Label<FormatArgsArg>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<FormatArgsArg>) -> Self {
+        // SAFETY: this is safe because in the dbscheme FormatArgsArg is a subclass of AstNode
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<FormatArgsArg>> for trap::Label<Element> {
+    fn from(value: trap::Label<FormatArgsArg>) -> Self {
+        // SAFETY: this is safe because in the dbscheme FormatArgsArg is a subclass of Element
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<FormatArgsArg>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<FormatArgsArg>) -> Self {
+        // SAFETY: this is safe because in the dbscheme FormatArgsArg is a subclass of Locatable
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+#[derive(Debug)]
+pub struct GenericArg {
+    _unused: ()
+}
+
+impl trap::TrapClass for GenericArg {
+    fn class_name() -> &'static str { "GenericArg" }
+}
+
+impl From<trap::Label<GenericArg>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<GenericArg>) -> Self {
+        // SAFETY: this is safe because in the dbscheme GenericArg is a subclass of AstNode
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<GenericArg>> for trap::Label<Element> {
+    fn from(value: trap::Label<GenericArg>) -> Self {
+        // SAFETY: this is safe because in the dbscheme GenericArg is a subclass of Element
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<GenericArg>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<GenericArg>) -> Self {
+        // SAFETY: this is safe because in the dbscheme GenericArg is a subclass of Locatable
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
 #[derive(Debug)]
 pub struct GenericArgList {
     pub id: trap::TrapId<GenericArgList>,
+    pub generic_args: Vec<trap::Label<GenericArg>>,
 }
 
 impl trap::TrapEntry for GenericArgList {
@@ -214,6 +741,9 @@ impl trap::TrapEntry for GenericArgList {
 
     fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
         out.add_tuple("generic_arg_lists", vec![id.into()]);
+        for (i, v) in self.generic_args.into_iter().enumerate() {
+            out.add_tuple("generic_arg_list_generic_args", vec![id.into(), i.into(), v.into()]);
+        }
     }
 }
 
@@ -248,18 +778,140 @@ impl From<trap::Label<GenericArgList>> for trap::Label<Locatable> {
     }
 }
 
-impl From<trap::Label<GenericArgList>> for trap::Label<Unextracted> {
-    fn from(value: trap::Label<GenericArgList>) -> Self {
-        // SAFETY: this is safe because in the dbscheme GenericArgList is a subclass of Unextracted
+#[derive(Debug)]
+pub struct GenericParam {
+    _unused: ()
+}
+
+impl trap::TrapClass for GenericParam {
+    fn class_name() -> &'static str { "GenericParam" }
+}
+
+impl From<trap::Label<GenericParam>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<GenericParam>) -> Self {
+        // SAFETY: this is safe because in the dbscheme GenericParam is a subclass of AstNode
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<GenericArgList>> for trap::Label<Unimplemented> {
-    fn from(value: trap::Label<GenericArgList>) -> Self {
-        // SAFETY: this is safe because in the dbscheme GenericArgList is a subclass of Unimplemented
+impl From<trap::Label<GenericParam>> for trap::Label<Element> {
+    fn from(value: trap::Label<GenericParam>) -> Self {
+        // SAFETY: this is safe because in the dbscheme GenericParam is a subclass of Element
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<GenericParam>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<GenericParam>) -> Self {
+        // SAFETY: this is safe because in the dbscheme GenericParam is a subclass of Locatable
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+#[derive(Debug)]
+pub struct GenericParamList {
+    pub id: trap::TrapId<GenericParamList>,
+    pub generic_params: Vec<trap::Label<GenericParam>>,
+}
+
+impl trap::TrapEntry for GenericParamList {
+    fn extract_id(&mut self) -> trap::TrapId<Self> {
+        std::mem::replace(&mut self.id, trap::TrapId::Star)
+    }
+
+    fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
+        out.add_tuple("generic_param_lists", vec![id.into()]);
+        for (i, v) in self.generic_params.into_iter().enumerate() {
+            out.add_tuple("generic_param_list_generic_params", vec![id.into(), i.into(), v.into()]);
+        }
+    }
+}
+
+impl trap::TrapClass for GenericParamList {
+    fn class_name() -> &'static str { "GenericParamList" }
+}
+
+impl From<trap::Label<GenericParamList>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<GenericParamList>) -> Self {
+        // SAFETY: this is safe because in the dbscheme GenericParamList is a subclass of AstNode
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<GenericParamList>> for trap::Label<Element> {
+    fn from(value: trap::Label<GenericParamList>) -> Self {
+        // SAFETY: this is safe because in the dbscheme GenericParamList is a subclass of Element
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<GenericParamList>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<GenericParamList>) -> Self {
+        // SAFETY: this is safe because in the dbscheme GenericParamList is a subclass of Locatable
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+#[derive(Debug)]
+pub struct ItemList {
+    pub id: trap::TrapId<ItemList>,
+    pub attrs: Vec<trap::Label<Attr>>,
+    pub items: Vec<trap::Label<Item>>,
+}
+
+impl trap::TrapEntry for ItemList {
+    fn extract_id(&mut self) -> trap::TrapId<Self> {
+        std::mem::replace(&mut self.id, trap::TrapId::Star)
+    }
+
+    fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
+        out.add_tuple("item_lists", vec![id.into()]);
+        for (i, v) in self.attrs.into_iter().enumerate() {
+            out.add_tuple("item_list_attrs", vec![id.into(), i.into(), v.into()]);
+        }
+        for (i, v) in self.items.into_iter().enumerate() {
+            out.add_tuple("item_list_items", vec![id.into(), i.into(), v.into()]);
+        }
+    }
+}
+
+impl trap::TrapClass for ItemList {
+    fn class_name() -> &'static str { "ItemList" }
+}
+
+impl From<trap::Label<ItemList>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<ItemList>) -> Self {
+        // SAFETY: this is safe because in the dbscheme ItemList is a subclass of AstNode
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<ItemList>> for trap::Label<Element> {
+    fn from(value: trap::Label<ItemList>) -> Self {
+        // SAFETY: this is safe because in the dbscheme ItemList is a subclass of Element
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<ItemList>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<ItemList>) -> Self {
+        // SAFETY: this is safe because in the dbscheme ItemList is a subclass of Locatable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -269,7 +921,7 @@ impl From<trap::Label<GenericArgList>> for trap::Label<Unimplemented> {
 #[derive(Debug)]
 pub struct Label {
     pub id: trap::TrapId<Label>,
-    pub name: String,
+    pub lifetime: Option<trap::Label<Lifetime>>,
 }
 
 impl trap::TrapEntry for Label {
@@ -278,7 +930,10 @@ impl trap::TrapEntry for Label {
     }
 
     fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
-        out.add_tuple("labels", vec![id.into(), self.name.into()]);
+        out.add_tuple("labels", vec![id.into()]);
+        if let Some(v) = self.lifetime {
+            out.add_tuple("label_lifetimes", vec![id.into(), v.into()]);
+        }
     }
 }
 
@@ -313,12 +968,217 @@ impl From<trap::Label<Label>> for trap::Label<Locatable> {
     }
 }
 
+#[derive(Debug)]
+pub struct LetElse {
+    pub id: trap::TrapId<LetElse>,
+    pub block_expr: Option<trap::Label<BlockExpr>>,
+}
+
+impl trap::TrapEntry for LetElse {
+    fn extract_id(&mut self) -> trap::TrapId<Self> {
+        std::mem::replace(&mut self.id, trap::TrapId::Star)
+    }
+
+    fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
+        out.add_tuple("let_elses", vec![id.into()]);
+        if let Some(v) = self.block_expr {
+            out.add_tuple("let_else_block_exprs", vec![id.into(), v.into()]);
+        }
+    }
+}
+
+impl trap::TrapClass for LetElse {
+    fn class_name() -> &'static str { "LetElse" }
+}
+
+impl From<trap::Label<LetElse>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<LetElse>) -> Self {
+        // SAFETY: this is safe because in the dbscheme LetElse is a subclass of AstNode
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<LetElse>> for trap::Label<Element> {
+    fn from(value: trap::Label<LetElse>) -> Self {
+        // SAFETY: this is safe because in the dbscheme LetElse is a subclass of Element
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<LetElse>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<LetElse>) -> Self {
+        // SAFETY: this is safe because in the dbscheme LetElse is a subclass of Locatable
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+#[derive(Debug)]
+pub struct Lifetime {
+    pub id: trap::TrapId<Lifetime>,
+    pub text: Option<String>,
+}
+
+impl trap::TrapEntry for Lifetime {
+    fn extract_id(&mut self) -> trap::TrapId<Self> {
+        std::mem::replace(&mut self.id, trap::TrapId::Star)
+    }
+
+    fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
+        out.add_tuple("lifetimes", vec![id.into()]);
+        if let Some(v) = self.text {
+            out.add_tuple("lifetime_texts", vec![id.into(), v.into()]);
+        }
+    }
+}
+
+impl trap::TrapClass for Lifetime {
+    fn class_name() -> &'static str { "Lifetime" }
+}
+
+impl From<trap::Label<Lifetime>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<Lifetime>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Lifetime is a subclass of AstNode
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<Lifetime>> for trap::Label<Element> {
+    fn from(value: trap::Label<Lifetime>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Lifetime is a subclass of Element
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<Lifetime>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<Lifetime>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Lifetime is a subclass of Locatable
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+#[derive(Debug)]
+pub struct MacroItems {
+    pub id: trap::TrapId<MacroItems>,
+    pub items: Vec<trap::Label<Item>>,
+}
+
+impl trap::TrapEntry for MacroItems {
+    fn extract_id(&mut self) -> trap::TrapId<Self> {
+        std::mem::replace(&mut self.id, trap::TrapId::Star)
+    }
+
+    fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
+        out.add_tuple("macro_items", vec![id.into()]);
+        for (i, v) in self.items.into_iter().enumerate() {
+            out.add_tuple("macro_items_items", vec![id.into(), i.into(), v.into()]);
+        }
+    }
+}
+
+impl trap::TrapClass for MacroItems {
+    fn class_name() -> &'static str { "MacroItems" }
+}
+
+impl From<trap::Label<MacroItems>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<MacroItems>) -> Self {
+        // SAFETY: this is safe because in the dbscheme MacroItems is a subclass of AstNode
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<MacroItems>> for trap::Label<Element> {
+    fn from(value: trap::Label<MacroItems>) -> Self {
+        // SAFETY: this is safe because in the dbscheme MacroItems is a subclass of Element
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<MacroItems>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<MacroItems>) -> Self {
+        // SAFETY: this is safe because in the dbscheme MacroItems is a subclass of Locatable
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+#[derive(Debug)]
+pub struct MacroStmts {
+    pub id: trap::TrapId<MacroStmts>,
+    pub expr: Option<trap::Label<Expr>>,
+    pub statements: Vec<trap::Label<Stmt>>,
+}
+
+impl trap::TrapEntry for MacroStmts {
+    fn extract_id(&mut self) -> trap::TrapId<Self> {
+        std::mem::replace(&mut self.id, trap::TrapId::Star)
+    }
+
+    fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
+        out.add_tuple("macro_stmts", vec![id.into()]);
+        if let Some(v) = self.expr {
+            out.add_tuple("macro_stmts_exprs", vec![id.into(), v.into()]);
+        }
+        for (i, v) in self.statements.into_iter().enumerate() {
+            out.add_tuple("macro_stmts_statements", vec![id.into(), i.into(), v.into()]);
+        }
+    }
+}
+
+impl trap::TrapClass for MacroStmts {
+    fn class_name() -> &'static str { "MacroStmts" }
+}
+
+impl From<trap::Label<MacroStmts>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<MacroStmts>) -> Self {
+        // SAFETY: this is safe because in the dbscheme MacroStmts is a subclass of AstNode
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<MacroStmts>> for trap::Label<Element> {
+    fn from(value: trap::Label<MacroStmts>) -> Self {
+        // SAFETY: this is safe because in the dbscheme MacroStmts is a subclass of Element
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<MacroStmts>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<MacroStmts>) -> Self {
+        // SAFETY: this is safe because in the dbscheme MacroStmts is a subclass of Locatable
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
 #[derive(Debug)]
 pub struct MatchArm {
     pub id: trap::TrapId<MatchArm>,
-    pub pat: trap::Label<Pat>,
-    pub guard: Option<trap::Label<Expr>>,
-    pub expr: trap::Label<Expr>,
+    pub attrs: Vec<trap::Label<Attr>>,
+    pub expr: Option<trap::Label<Expr>>,
+    pub guard: Option<trap::Label<MatchGuard>>,
+    pub pat: Option<trap::Label<Pat>>,
 }
 
 impl trap::TrapEntry for MatchArm {
@@ -327,10 +1187,19 @@ impl trap::TrapEntry for MatchArm {
     }
 
     fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
-        out.add_tuple("match_arms", vec![id.into(), self.pat.into(), self.expr.into()]);
+        out.add_tuple("match_arms", vec![id.into()]);
+        for (i, v) in self.attrs.into_iter().enumerate() {
+            out.add_tuple("match_arm_attrs", vec![id.into(), i.into(), v.into()]);
+        }
+        if let Some(v) = self.expr {
+            out.add_tuple("match_arm_exprs", vec![id.into(), v.into()]);
+        }
         if let Some(v) = self.guard {
             out.add_tuple("match_arm_guards", vec![id.into(), v.into()]);
         }
+        if let Some(v) = self.pat {
+            out.add_tuple("match_arm_pats", vec![id.into(), v.into()]);
+        }
     }
 }
 
@@ -365,6 +1234,384 @@ impl From<trap::Label<MatchArm>> for trap::Label<Locatable> {
     }
 }
 
+#[derive(Debug)]
+pub struct MatchArmList {
+    pub id: trap::TrapId<MatchArmList>,
+    pub arms: Vec<trap::Label<MatchArm>>,
+    pub attrs: Vec<trap::Label<Attr>>,
+}
+
+impl trap::TrapEntry for MatchArmList {
+    fn extract_id(&mut self) -> trap::TrapId<Self> {
+        std::mem::replace(&mut self.id, trap::TrapId::Star)
+    }
+
+    fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
+        out.add_tuple("match_arm_lists", vec![id.into()]);
+        for (i, v) in self.arms.into_iter().enumerate() {
+            out.add_tuple("match_arm_list_arms", vec![id.into(), i.into(), v.into()]);
+        }
+        for (i, v) in self.attrs.into_iter().enumerate() {
+            out.add_tuple("match_arm_list_attrs", vec![id.into(), i.into(), v.into()]);
+        }
+    }
+}
+
+impl trap::TrapClass for MatchArmList {
+    fn class_name() -> &'static str { "MatchArmList" }
+}
+
+impl From<trap::Label<MatchArmList>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<MatchArmList>) -> Self {
+        // SAFETY: this is safe because in the dbscheme MatchArmList is a subclass of AstNode
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<MatchArmList>> for trap::Label<Element> {
+    fn from(value: trap::Label<MatchArmList>) -> Self {
+        // SAFETY: this is safe because in the dbscheme MatchArmList is a subclass of Element
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<MatchArmList>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<MatchArmList>) -> Self {
+        // SAFETY: this is safe because in the dbscheme MatchArmList is a subclass of Locatable
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+#[derive(Debug)]
+pub struct MatchGuard {
+    pub id: trap::TrapId<MatchGuard>,
+    pub condition: Option<trap::Label<Expr>>,
+}
+
+impl trap::TrapEntry for MatchGuard {
+    fn extract_id(&mut self) -> trap::TrapId<Self> {
+        std::mem::replace(&mut self.id, trap::TrapId::Star)
+    }
+
+    fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
+        out.add_tuple("match_guards", vec![id.into()]);
+        if let Some(v) = self.condition {
+            out.add_tuple("match_guard_conditions", vec![id.into(), v.into()]);
+        }
+    }
+}
+
+impl trap::TrapClass for MatchGuard {
+    fn class_name() -> &'static str { "MatchGuard" }
+}
+
+impl From<trap::Label<MatchGuard>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<MatchGuard>) -> Self {
+        // SAFETY: this is safe because in the dbscheme MatchGuard is a subclass of AstNode
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<MatchGuard>> for trap::Label<Element> {
+    fn from(value: trap::Label<MatchGuard>) -> Self {
+        // SAFETY: this is safe because in the dbscheme MatchGuard is a subclass of Element
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<MatchGuard>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<MatchGuard>) -> Self {
+        // SAFETY: this is safe because in the dbscheme MatchGuard is a subclass of Locatable
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+#[derive(Debug)]
+pub struct Meta {
+    pub id: trap::TrapId<Meta>,
+    pub expr: Option<trap::Label<Expr>>,
+    pub is_unsafe: bool,
+    pub path: Option<trap::Label<Path>>,
+    pub token_tree: Option<trap::Label<TokenTree>>,
+}
+
+impl trap::TrapEntry for Meta {
+    fn extract_id(&mut self) -> trap::TrapId<Self> {
+        std::mem::replace(&mut self.id, trap::TrapId::Star)
+    }
+
+    fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
+        out.add_tuple("meta", vec![id.into()]);
+        if let Some(v) = self.expr {
+            out.add_tuple("meta_exprs", vec![id.into(), v.into()]);
+        }
+        if self.is_unsafe {
+            out.add_tuple("meta_is_unsafe", vec![id.into()]);
+        }
+        if let Some(v) = self.path {
+            out.add_tuple("meta_paths", vec![id.into(), v.into()]);
+        }
+        if let Some(v) = self.token_tree {
+            out.add_tuple("meta_token_trees", vec![id.into(), v.into()]);
+        }
+    }
+}
+
+impl trap::TrapClass for Meta {
+    fn class_name() -> &'static str { "Meta" }
+}
+
+impl From<trap::Label<Meta>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<Meta>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Meta is a subclass of AstNode
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<Meta>> for trap::Label<Element> {
+    fn from(value: trap::Label<Meta>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Meta is a subclass of Element
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<Meta>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<Meta>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Meta is a subclass of Locatable
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+#[derive(Debug)]
+pub struct Name {
+    pub id: trap::TrapId<Name>,
+    pub text: Option<String>,
+}
+
+impl trap::TrapEntry for Name {
+    fn extract_id(&mut self) -> trap::TrapId<Self> {
+        std::mem::replace(&mut self.id, trap::TrapId::Star)
+    }
+
+    fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
+        out.add_tuple("names", vec![id.into()]);
+        if let Some(v) = self.text {
+            out.add_tuple("name_texts", vec![id.into(), v.into()]);
+        }
+    }
+}
+
+impl trap::TrapClass for Name {
+    fn class_name() -> &'static str { "Name" }
+}
+
+impl From<trap::Label<Name>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<Name>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Name is a subclass of AstNode
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<Name>> for trap::Label<Element> {
+    fn from(value: trap::Label<Name>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Name is a subclass of Element
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<Name>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<Name>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Name is a subclass of Locatable
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+#[derive(Debug)]
+pub struct NameRef {
+    pub id: trap::TrapId<NameRef>,
+    pub text: Option<String>,
+}
+
+impl trap::TrapEntry for NameRef {
+    fn extract_id(&mut self) -> trap::TrapId<Self> {
+        std::mem::replace(&mut self.id, trap::TrapId::Star)
+    }
+
+    fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
+        out.add_tuple("name_refs", vec![id.into()]);
+        if let Some(v) = self.text {
+            out.add_tuple("name_ref_texts", vec![id.into(), v.into()]);
+        }
+    }
+}
+
+impl trap::TrapClass for NameRef {
+    fn class_name() -> &'static str { "NameRef" }
+}
+
+impl From<trap::Label<NameRef>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<NameRef>) -> Self {
+        // SAFETY: this is safe because in the dbscheme NameRef is a subclass of AstNode
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<NameRef>> for trap::Label<Element> {
+    fn from(value: trap::Label<NameRef>) -> Self {
+        // SAFETY: this is safe because in the dbscheme NameRef is a subclass of Element
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<NameRef>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<NameRef>) -> Self {
+        // SAFETY: this is safe because in the dbscheme NameRef is a subclass of Locatable
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+#[derive(Debug)]
+pub struct Param {
+    pub id: trap::TrapId<Param>,
+    pub attrs: Vec<trap::Label<Attr>>,
+    pub pat: Option<trap::Label<Pat>>,
+    pub ty: Option<trap::Label<TypeRef>>,
+}
+
+impl trap::TrapEntry for Param {
+    fn extract_id(&mut self) -> trap::TrapId<Self> {
+        std::mem::replace(&mut self.id, trap::TrapId::Star)
+    }
+
+    fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
+        out.add_tuple("params", vec![id.into()]);
+        for (i, v) in self.attrs.into_iter().enumerate() {
+            out.add_tuple("param_attrs", vec![id.into(), i.into(), v.into()]);
+        }
+        if let Some(v) = self.pat {
+            out.add_tuple("param_pats", vec![id.into(), v.into()]);
+        }
+        if let Some(v) = self.ty {
+            out.add_tuple("param_ties", vec![id.into(), v.into()]);
+        }
+    }
+}
+
+impl trap::TrapClass for Param {
+    fn class_name() -> &'static str { "Param" }
+}
+
+impl From<trap::Label<Param>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<Param>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Param is a subclass of AstNode
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<Param>> for trap::Label<Element> {
+    fn from(value: trap::Label<Param>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Param is a subclass of Element
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<Param>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<Param>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Param is a subclass of Locatable
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+#[derive(Debug)]
+pub struct ParamList {
+    pub id: trap::TrapId<ParamList>,
+    pub params: Vec<trap::Label<Param>>,
+    pub self_param: Option<trap::Label<SelfParam>>,
+}
+
+impl trap::TrapEntry for ParamList {
+    fn extract_id(&mut self) -> trap::TrapId<Self> {
+        std::mem::replace(&mut self.id, trap::TrapId::Star)
+    }
+
+    fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
+        out.add_tuple("param_lists", vec![id.into()]);
+        for (i, v) in self.params.into_iter().enumerate() {
+            out.add_tuple("param_list_params", vec![id.into(), i.into(), v.into()]);
+        }
+        if let Some(v) = self.self_param {
+            out.add_tuple("param_list_self_params", vec![id.into(), v.into()]);
+        }
+    }
+}
+
+impl trap::TrapClass for ParamList {
+    fn class_name() -> &'static str { "ParamList" }
+}
+
+impl From<trap::Label<ParamList>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<ParamList>) -> Self {
+        // SAFETY: this is safe because in the dbscheme ParamList is a subclass of AstNode
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<ParamList>> for trap::Label<Element> {
+    fn from(value: trap::Label<ParamList>) -> Self {
+        // SAFETY: this is safe because in the dbscheme ParamList is a subclass of Element
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<ParamList>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<ParamList>) -> Self {
+        // SAFETY: this is safe because in the dbscheme ParamList is a subclass of Locatable
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
 #[derive(Debug)]
 pub struct Pat {
     _unused: ()
@@ -402,63 +1649,73 @@ impl From<trap::Label<Pat>> for trap::Label<Locatable> {
 }
 
 #[derive(Debug)]
-pub struct Path {
-    pub id: trap::TrapId<Path>,
+pub struct PathSegment {
+    pub id: trap::TrapId<PathSegment>,
+    pub generic_arg_list: Option<trap::Label<GenericArgList>>,
+    pub name_ref: Option<trap::Label<NameRef>>,
+    pub param_list: Option<trap::Label<ParamList>>,
+    pub path_type: Option<trap::Label<PathType>>,
+    pub ret_type: Option<trap::Label<RetType>>,
+    pub return_type_syntax: Option<trap::Label<ReturnTypeSyntax>>,
+    pub ty: Option<trap::Label<TypeRef>>,
 }
 
-impl trap::TrapEntry for Path {
+impl trap::TrapEntry for PathSegment {
     fn extract_id(&mut self) -> trap::TrapId<Self> {
         std::mem::replace(&mut self.id, trap::TrapId::Star)
     }
 
     fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
-        out.add_tuple("paths", vec![id.into()]);
+        out.add_tuple("path_segments", vec![id.into()]);
+        if let Some(v) = self.generic_arg_list {
+            out.add_tuple("path_segment_generic_arg_lists", vec![id.into(), v.into()]);
+        }
+        if let Some(v) = self.name_ref {
+            out.add_tuple("path_segment_name_refs", vec![id.into(), v.into()]);
+        }
+        if let Some(v) = self.param_list {
+            out.add_tuple("path_segment_param_lists", vec![id.into(), v.into()]);
+        }
+        if let Some(v) = self.path_type {
+            out.add_tuple("path_segment_path_types", vec![id.into(), v.into()]);
+        }
+        if let Some(v) = self.ret_type {
+            out.add_tuple("path_segment_ret_types", vec![id.into(), v.into()]);
+        }
+        if let Some(v) = self.return_type_syntax {
+            out.add_tuple("path_segment_return_type_syntaxes", vec![id.into(), v.into()]);
+        }
+        if let Some(v) = self.ty {
+            out.add_tuple("path_segment_ties", vec![id.into(), v.into()]);
+        }
     }
 }
 
-impl trap::TrapClass for Path {
-    fn class_name() -> &'static str { "Path" }
+impl trap::TrapClass for PathSegment {
+    fn class_name() -> &'static str { "PathSegment" }
 }
 
-impl From<trap::Label<Path>> for trap::Label<AstNode> {
-    fn from(value: trap::Label<Path>) -> Self {
-        // SAFETY: this is safe because in the dbscheme Path is a subclass of AstNode
+impl From<trap::Label<PathSegment>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<PathSegment>) -> Self {
+        // SAFETY: this is safe because in the dbscheme PathSegment is a subclass of AstNode
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<Path>> for trap::Label<Element> {
-    fn from(value: trap::Label<Path>) -> Self {
-        // SAFETY: this is safe because in the dbscheme Path is a subclass of Element
+impl From<trap::Label<PathSegment>> for trap::Label<Element> {
+    fn from(value: trap::Label<PathSegment>) -> Self {
+        // SAFETY: this is safe because in the dbscheme PathSegment is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<Path>> for trap::Label<Locatable> {
-    fn from(value: trap::Label<Path>) -> Self {
-        // SAFETY: this is safe because in the dbscheme Path is a subclass of Locatable
-        unsafe {
-            Self::from_untyped(value.as_untyped())
-        }
-    }
-}
-
-impl From<trap::Label<Path>> for trap::Label<Unextracted> {
-    fn from(value: trap::Label<Path>) -> Self {
-        // SAFETY: this is safe because in the dbscheme Path is a subclass of Unextracted
-        unsafe {
-            Self::from_untyped(value.as_untyped())
-        }
-    }
-}
-
-impl From<trap::Label<Path>> for trap::Label<Unimplemented> {
-    fn from(value: trap::Label<Path>) -> Self {
-        // SAFETY: this is safe because in the dbscheme Path is a subclass of Unimplemented
+impl From<trap::Label<PathSegment>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<PathSegment>) -> Self {
+        // SAFETY: this is safe because in the dbscheme PathSegment is a subclass of Locatable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -468,8 +1725,9 @@ impl From<trap::Label<Path>> for trap::Label<Unimplemented> {
 #[derive(Debug)]
 pub struct RecordExprField {
     pub id: trap::TrapId<RecordExprField>,
-    pub name: String,
-    pub expr: trap::Label<Expr>,
+    pub attrs: Vec<trap::Label<Attr>>,
+    pub expr: Option<trap::Label<Expr>>,
+    pub name_ref: Option<trap::Label<NameRef>>,
 }
 
 impl trap::TrapEntry for RecordExprField {
@@ -478,7 +1736,16 @@ impl trap::TrapEntry for RecordExprField {
     }
 
     fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
-        out.add_tuple("record_expr_fields", vec![id.into(), self.name.into(), self.expr.into()]);
+        out.add_tuple("record_expr_fields", vec![id.into()]);
+        for (i, v) in self.attrs.into_iter().enumerate() {
+            out.add_tuple("record_expr_field_attrs", vec![id.into(), i.into(), v.into()]);
+        }
+        if let Some(v) = self.expr {
+            out.add_tuple("record_expr_field_exprs", vec![id.into(), v.into()]);
+        }
+        if let Some(v) = self.name_ref {
+            out.add_tuple("record_expr_field_name_refs", vec![id.into(), v.into()]);
+        }
     }
 }
 
@@ -513,11 +1780,132 @@ impl From<trap::Label<RecordExprField>> for trap::Label<Locatable> {
     }
 }
 
+#[derive(Debug)]
+pub struct RecordExprFieldList {
+    pub id: trap::TrapId<RecordExprFieldList>,
+    pub attrs: Vec<trap::Label<Attr>>,
+    pub fields: Vec<trap::Label<RecordExprField>>,
+    pub spread: Option<trap::Label<Expr>>,
+}
+
+impl trap::TrapEntry for RecordExprFieldList {
+    fn extract_id(&mut self) -> trap::TrapId<Self> {
+        std::mem::replace(&mut self.id, trap::TrapId::Star)
+    }
+
+    fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
+        out.add_tuple("record_expr_field_lists", vec![id.into()]);
+        for (i, v) in self.attrs.into_iter().enumerate() {
+            out.add_tuple("record_expr_field_list_attrs", vec![id.into(), i.into(), v.into()]);
+        }
+        for (i, v) in self.fields.into_iter().enumerate() {
+            out.add_tuple("record_expr_field_list_fields", vec![id.into(), i.into(), v.into()]);
+        }
+        if let Some(v) = self.spread {
+            out.add_tuple("record_expr_field_list_spreads", vec![id.into(), v.into()]);
+        }
+    }
+}
+
+impl trap::TrapClass for RecordExprFieldList {
+    fn class_name() -> &'static str { "RecordExprFieldList" }
+}
+
+impl From<trap::Label<RecordExprFieldList>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<RecordExprFieldList>) -> Self {
+        // SAFETY: this is safe because in the dbscheme RecordExprFieldList is a subclass of AstNode
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<RecordExprFieldList>> for trap::Label<Element> {
+    fn from(value: trap::Label<RecordExprFieldList>) -> Self {
+        // SAFETY: this is safe because in the dbscheme RecordExprFieldList is a subclass of Element
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<RecordExprFieldList>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<RecordExprFieldList>) -> Self {
+        // SAFETY: this is safe because in the dbscheme RecordExprFieldList is a subclass of Locatable
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+#[derive(Debug)]
+pub struct RecordField {
+    pub id: trap::TrapId<RecordField>,
+    pub attrs: Vec<trap::Label<Attr>>,
+    pub name: Option<trap::Label<Name>>,
+    pub ty: Option<trap::Label<TypeRef>>,
+    pub visibility: Option<trap::Label<Visibility>>,
+}
+
+impl trap::TrapEntry for RecordField {
+    fn extract_id(&mut self) -> trap::TrapId<Self> {
+        std::mem::replace(&mut self.id, trap::TrapId::Star)
+    }
+
+    fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
+        out.add_tuple("record_fields", vec![id.into()]);
+        for (i, v) in self.attrs.into_iter().enumerate() {
+            out.add_tuple("record_field_attrs", vec![id.into(), i.into(), v.into()]);
+        }
+        if let Some(v) = self.name {
+            out.add_tuple("record_field_names", vec![id.into(), v.into()]);
+        }
+        if let Some(v) = self.ty {
+            out.add_tuple("record_field_ties", vec![id.into(), v.into()]);
+        }
+        if let Some(v) = self.visibility {
+            out.add_tuple("record_field_visibilities", vec![id.into(), v.into()]);
+        }
+    }
+}
+
+impl trap::TrapClass for RecordField {
+    fn class_name() -> &'static str { "RecordField" }
+}
+
+impl From<trap::Label<RecordField>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<RecordField>) -> Self {
+        // SAFETY: this is safe because in the dbscheme RecordField is a subclass of AstNode
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<RecordField>> for trap::Label<Element> {
+    fn from(value: trap::Label<RecordField>) -> Self {
+        // SAFETY: this is safe because in the dbscheme RecordField is a subclass of Element
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<RecordField>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<RecordField>) -> Self {
+        // SAFETY: this is safe because in the dbscheme RecordField is a subclass of Locatable
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
 #[derive(Debug)]
 pub struct RecordPatField {
     pub id: trap::TrapId<RecordPatField>,
-    pub name: String,
-    pub pat: trap::Label<Pat>,
+    pub attrs: Vec<trap::Label<Attr>>,
+    pub name_ref: Option<trap::Label<NameRef>>,
+    pub pat: Option<trap::Label<Pat>>,
 }
 
 impl trap::TrapEntry for RecordPatField {
@@ -526,7 +1914,16 @@ impl trap::TrapEntry for RecordPatField {
     }
 
     fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
-        out.add_tuple("record_pat_fields", vec![id.into(), self.name.into(), self.pat.into()]);
+        out.add_tuple("record_pat_fields", vec![id.into()]);
+        for (i, v) in self.attrs.into_iter().enumerate() {
+            out.add_tuple("record_pat_field_attrs", vec![id.into(), i.into(), v.into()]);
+        }
+        if let Some(v) = self.name_ref {
+            out.add_tuple("record_pat_field_name_refs", vec![id.into(), v.into()]);
+        }
+        if let Some(v) = self.pat {
+            out.add_tuple("record_pat_field_pats", vec![id.into(), v.into()]);
+        }
     }
 }
 
@@ -561,6 +1958,371 @@ impl From<trap::Label<RecordPatField>> for trap::Label<Locatable> {
     }
 }
 
+#[derive(Debug)]
+pub struct RecordPatFieldList {
+    pub id: trap::TrapId<RecordPatFieldList>,
+    pub fields: Vec<trap::Label<RecordPatField>>,
+    pub rest_pat: Option<trap::Label<RestPat>>,
+}
+
+impl trap::TrapEntry for RecordPatFieldList {
+    fn extract_id(&mut self) -> trap::TrapId<Self> {
+        std::mem::replace(&mut self.id, trap::TrapId::Star)
+    }
+
+    fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
+        out.add_tuple("record_pat_field_lists", vec![id.into()]);
+        for (i, v) in self.fields.into_iter().enumerate() {
+            out.add_tuple("record_pat_field_list_fields", vec![id.into(), i.into(), v.into()]);
+        }
+        if let Some(v) = self.rest_pat {
+            out.add_tuple("record_pat_field_list_rest_pats", vec![id.into(), v.into()]);
+        }
+    }
+}
+
+impl trap::TrapClass for RecordPatFieldList {
+    fn class_name() -> &'static str { "RecordPatFieldList" }
+}
+
+impl From<trap::Label<RecordPatFieldList>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<RecordPatFieldList>) -> Self {
+        // SAFETY: this is safe because in the dbscheme RecordPatFieldList is a subclass of AstNode
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<RecordPatFieldList>> for trap::Label<Element> {
+    fn from(value: trap::Label<RecordPatFieldList>) -> Self {
+        // SAFETY: this is safe because in the dbscheme RecordPatFieldList is a subclass of Element
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<RecordPatFieldList>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<RecordPatFieldList>) -> Self {
+        // SAFETY: this is safe because in the dbscheme RecordPatFieldList is a subclass of Locatable
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+#[derive(Debug)]
+pub struct Rename {
+    pub id: trap::TrapId<Rename>,
+    pub name: Option<trap::Label<Name>>,
+}
+
+impl trap::TrapEntry for Rename {
+    fn extract_id(&mut self) -> trap::TrapId<Self> {
+        std::mem::replace(&mut self.id, trap::TrapId::Star)
+    }
+
+    fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
+        out.add_tuple("renames", vec![id.into()]);
+        if let Some(v) = self.name {
+            out.add_tuple("rename_names", vec![id.into(), v.into()]);
+        }
+    }
+}
+
+impl trap::TrapClass for Rename {
+    fn class_name() -> &'static str { "Rename" }
+}
+
+impl From<trap::Label<Rename>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<Rename>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Rename is a subclass of AstNode
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<Rename>> for trap::Label<Element> {
+    fn from(value: trap::Label<Rename>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Rename is a subclass of Element
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<Rename>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<Rename>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Rename is a subclass of Locatable
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+#[derive(Debug)]
+pub struct Resolvable {
+    _unused: ()
+}
+
+impl Resolvable {
+    pub fn emit_resolved_path(id: trap::Label<Self>, value: String, out: &mut trap::Writer) {
+        out.add_tuple("resolvable_resolved_paths", vec![id.into(), value.into()]);
+    }
+    pub fn emit_resolved_crate_origin(id: trap::Label<Self>, value: String, out: &mut trap::Writer) {
+        out.add_tuple("resolvable_resolved_crate_origins", vec![id.into(), value.into()]);
+    }
+}
+
+impl trap::TrapClass for Resolvable {
+    fn class_name() -> &'static str { "Resolvable" }
+}
+
+impl From<trap::Label<Resolvable>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<Resolvable>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Resolvable is a subclass of AstNode
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<Resolvable>> for trap::Label<Element> {
+    fn from(value: trap::Label<Resolvable>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Resolvable is a subclass of Element
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<Resolvable>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<Resolvable>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Resolvable is a subclass of Locatable
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+#[derive(Debug)]
+pub struct RetType {
+    pub id: trap::TrapId<RetType>,
+    pub ty: Option<trap::Label<TypeRef>>,
+}
+
+impl trap::TrapEntry for RetType {
+    fn extract_id(&mut self) -> trap::TrapId<Self> {
+        std::mem::replace(&mut self.id, trap::TrapId::Star)
+    }
+
+    fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
+        out.add_tuple("ret_types", vec![id.into()]);
+        if let Some(v) = self.ty {
+            out.add_tuple("ret_type_ties", vec![id.into(), v.into()]);
+        }
+    }
+}
+
+impl trap::TrapClass for RetType {
+    fn class_name() -> &'static str { "RetType" }
+}
+
+impl From<trap::Label<RetType>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<RetType>) -> Self {
+        // SAFETY: this is safe because in the dbscheme RetType is a subclass of AstNode
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<RetType>> for trap::Label<Element> {
+    fn from(value: trap::Label<RetType>) -> Self {
+        // SAFETY: this is safe because in the dbscheme RetType is a subclass of Element
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<RetType>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<RetType>) -> Self {
+        // SAFETY: this is safe because in the dbscheme RetType is a subclass of Locatable
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+#[derive(Debug)]
+pub struct ReturnTypeSyntax {
+    pub id: trap::TrapId<ReturnTypeSyntax>,
+}
+
+impl trap::TrapEntry for ReturnTypeSyntax {
+    fn extract_id(&mut self) -> trap::TrapId<Self> {
+        std::mem::replace(&mut self.id, trap::TrapId::Star)
+    }
+
+    fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
+        out.add_tuple("return_type_syntaxes", vec![id.into()]);
+    }
+}
+
+impl trap::TrapClass for ReturnTypeSyntax {
+    fn class_name() -> &'static str { "ReturnTypeSyntax" }
+}
+
+impl From<trap::Label<ReturnTypeSyntax>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<ReturnTypeSyntax>) -> Self {
+        // SAFETY: this is safe because in the dbscheme ReturnTypeSyntax is a subclass of AstNode
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<ReturnTypeSyntax>> for trap::Label<Element> {
+    fn from(value: trap::Label<ReturnTypeSyntax>) -> Self {
+        // SAFETY: this is safe because in the dbscheme ReturnTypeSyntax is a subclass of Element
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<ReturnTypeSyntax>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<ReturnTypeSyntax>) -> Self {
+        // SAFETY: this is safe because in the dbscheme ReturnTypeSyntax is a subclass of Locatable
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+#[derive(Debug)]
+pub struct SelfParam {
+    pub id: trap::TrapId<SelfParam>,
+    pub attrs: Vec<trap::Label<Attr>>,
+    pub is_mut: bool,
+    pub lifetime: Option<trap::Label<Lifetime>>,
+    pub name: Option<trap::Label<Name>>,
+    pub ty: Option<trap::Label<TypeRef>>,
+}
+
+impl trap::TrapEntry for SelfParam {
+    fn extract_id(&mut self) -> trap::TrapId<Self> {
+        std::mem::replace(&mut self.id, trap::TrapId::Star)
+    }
+
+    fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
+        out.add_tuple("self_params", vec![id.into()]);
+        for (i, v) in self.attrs.into_iter().enumerate() {
+            out.add_tuple("self_param_attrs", vec![id.into(), i.into(), v.into()]);
+        }
+        if self.is_mut {
+            out.add_tuple("self_param_is_mut", vec![id.into()]);
+        }
+        if let Some(v) = self.lifetime {
+            out.add_tuple("self_param_lifetimes", vec![id.into(), v.into()]);
+        }
+        if let Some(v) = self.name {
+            out.add_tuple("self_param_names", vec![id.into(), v.into()]);
+        }
+        if let Some(v) = self.ty {
+            out.add_tuple("self_param_ties", vec![id.into(), v.into()]);
+        }
+    }
+}
+
+impl trap::TrapClass for SelfParam {
+    fn class_name() -> &'static str { "SelfParam" }
+}
+
+impl From<trap::Label<SelfParam>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<SelfParam>) -> Self {
+        // SAFETY: this is safe because in the dbscheme SelfParam is a subclass of AstNode
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<SelfParam>> for trap::Label<Element> {
+    fn from(value: trap::Label<SelfParam>) -> Self {
+        // SAFETY: this is safe because in the dbscheme SelfParam is a subclass of Element
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<SelfParam>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<SelfParam>) -> Self {
+        // SAFETY: this is safe because in the dbscheme SelfParam is a subclass of Locatable
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+#[derive(Debug)]
+pub struct SourceFile {
+    pub id: trap::TrapId<SourceFile>,
+    pub attrs: Vec<trap::Label<Attr>>,
+    pub items: Vec<trap::Label<Item>>,
+}
+
+impl trap::TrapEntry for SourceFile {
+    fn extract_id(&mut self) -> trap::TrapId<Self> {
+        std::mem::replace(&mut self.id, trap::TrapId::Star)
+    }
+
+    fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
+        out.add_tuple("source_files", vec![id.into()]);
+        for (i, v) in self.attrs.into_iter().enumerate() {
+            out.add_tuple("source_file_attrs", vec![id.into(), i.into(), v.into()]);
+        }
+        for (i, v) in self.items.into_iter().enumerate() {
+            out.add_tuple("source_file_items", vec![id.into(), i.into(), v.into()]);
+        }
+    }
+}
+
+impl trap::TrapClass for SourceFile {
+    fn class_name() -> &'static str { "SourceFile" }
+}
+
+impl From<trap::Label<SourceFile>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<SourceFile>) -> Self {
+        // SAFETY: this is safe because in the dbscheme SourceFile is a subclass of AstNode
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<SourceFile>> for trap::Label<Element> {
+    fn from(value: trap::Label<SourceFile>) -> Self {
+        // SAFETY: this is safe because in the dbscheme SourceFile is a subclass of Element
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<SourceFile>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<SourceFile>) -> Self {
+        // SAFETY: this is safe because in the dbscheme SourceFile is a subclass of Locatable
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
 #[derive(Debug)]
 pub struct Stmt {
     _unused: ()
@@ -598,20 +2360,324 @@ impl From<trap::Label<Stmt>> for trap::Label<Locatable> {
 }
 
 #[derive(Debug)]
-pub struct TypeRef {
-    pub id: trap::TrapId<TypeRef>,
+pub struct StmtList {
+    pub id: trap::TrapId<StmtList>,
+    pub attrs: Vec<trap::Label<Attr>>,
+    pub statements: Vec<trap::Label<Stmt>>,
+    pub tail_expr: Option<trap::Label<Expr>>,
 }
 
-impl trap::TrapEntry for TypeRef {
+impl trap::TrapEntry for StmtList {
     fn extract_id(&mut self) -> trap::TrapId<Self> {
         std::mem::replace(&mut self.id, trap::TrapId::Star)
     }
 
     fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
-        out.add_tuple("type_refs", vec![id.into()]);
+        out.add_tuple("stmt_lists", vec![id.into()]);
+        for (i, v) in self.attrs.into_iter().enumerate() {
+            out.add_tuple("stmt_list_attrs", vec![id.into(), i.into(), v.into()]);
+        }
+        for (i, v) in self.statements.into_iter().enumerate() {
+            out.add_tuple("stmt_list_statements", vec![id.into(), i.into(), v.into()]);
+        }
+        if let Some(v) = self.tail_expr {
+            out.add_tuple("stmt_list_tail_exprs", vec![id.into(), v.into()]);
+        }
     }
 }
 
+impl trap::TrapClass for StmtList {
+    fn class_name() -> &'static str { "StmtList" }
+}
+
+impl From<trap::Label<StmtList>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<StmtList>) -> Self {
+        // SAFETY: this is safe because in the dbscheme StmtList is a subclass of AstNode
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<StmtList>> for trap::Label<Element> {
+    fn from(value: trap::Label<StmtList>) -> Self {
+        // SAFETY: this is safe because in the dbscheme StmtList is a subclass of Element
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<StmtList>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<StmtList>) -> Self {
+        // SAFETY: this is safe because in the dbscheme StmtList is a subclass of Locatable
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+#[derive(Debug)]
+pub struct Token {
+    _unused: ()
+}
+
+impl trap::TrapClass for Token {
+    fn class_name() -> &'static str { "Token" }
+}
+
+impl From<trap::Label<Token>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<Token>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Token is a subclass of AstNode
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<Token>> for trap::Label<Element> {
+    fn from(value: trap::Label<Token>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Token is a subclass of Element
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<Token>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<Token>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Token is a subclass of Locatable
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+#[derive(Debug)]
+pub struct TokenTree {
+    pub id: trap::TrapId<TokenTree>,
+}
+
+impl trap::TrapEntry for TokenTree {
+    fn extract_id(&mut self) -> trap::TrapId<Self> {
+        std::mem::replace(&mut self.id, trap::TrapId::Star)
+    }
+
+    fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
+        out.add_tuple("token_trees", vec![id.into()]);
+    }
+}
+
+impl trap::TrapClass for TokenTree {
+    fn class_name() -> &'static str { "TokenTree" }
+}
+
+impl From<trap::Label<TokenTree>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<TokenTree>) -> Self {
+        // SAFETY: this is safe because in the dbscheme TokenTree is a subclass of AstNode
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<TokenTree>> for trap::Label<Element> {
+    fn from(value: trap::Label<TokenTree>) -> Self {
+        // SAFETY: this is safe because in the dbscheme TokenTree is a subclass of Element
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<TokenTree>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<TokenTree>) -> Self {
+        // SAFETY: this is safe because in the dbscheme TokenTree is a subclass of Locatable
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+#[derive(Debug)]
+pub struct TupleField {
+    pub id: trap::TrapId<TupleField>,
+    pub attrs: Vec<trap::Label<Attr>>,
+    pub ty: Option<trap::Label<TypeRef>>,
+    pub visibility: Option<trap::Label<Visibility>>,
+}
+
+impl trap::TrapEntry for TupleField {
+    fn extract_id(&mut self) -> trap::TrapId<Self> {
+        std::mem::replace(&mut self.id, trap::TrapId::Star)
+    }
+
+    fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
+        out.add_tuple("tuple_fields", vec![id.into()]);
+        for (i, v) in self.attrs.into_iter().enumerate() {
+            out.add_tuple("tuple_field_attrs", vec![id.into(), i.into(), v.into()]);
+        }
+        if let Some(v) = self.ty {
+            out.add_tuple("tuple_field_ties", vec![id.into(), v.into()]);
+        }
+        if let Some(v) = self.visibility {
+            out.add_tuple("tuple_field_visibilities", vec![id.into(), v.into()]);
+        }
+    }
+}
+
+impl trap::TrapClass for TupleField {
+    fn class_name() -> &'static str { "TupleField" }
+}
+
+impl From<trap::Label<TupleField>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<TupleField>) -> Self {
+        // SAFETY: this is safe because in the dbscheme TupleField is a subclass of AstNode
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<TupleField>> for trap::Label<Element> {
+    fn from(value: trap::Label<TupleField>) -> Self {
+        // SAFETY: this is safe because in the dbscheme TupleField is a subclass of Element
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<TupleField>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<TupleField>) -> Self {
+        // SAFETY: this is safe because in the dbscheme TupleField is a subclass of Locatable
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+#[derive(Debug)]
+pub struct TypeBound {
+    pub id: trap::TrapId<TypeBound>,
+    pub generic_param_list: Option<trap::Label<GenericParamList>>,
+    pub is_async: bool,
+    pub is_const: bool,
+    pub lifetime: Option<trap::Label<Lifetime>>,
+    pub ty: Option<trap::Label<TypeRef>>,
+}
+
+impl trap::TrapEntry for TypeBound {
+    fn extract_id(&mut self) -> trap::TrapId<Self> {
+        std::mem::replace(&mut self.id, trap::TrapId::Star)
+    }
+
+    fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
+        out.add_tuple("type_bounds", vec![id.into()]);
+        if let Some(v) = self.generic_param_list {
+            out.add_tuple("type_bound_generic_param_lists", vec![id.into(), v.into()]);
+        }
+        if self.is_async {
+            out.add_tuple("type_bound_is_async", vec![id.into()]);
+        }
+        if self.is_const {
+            out.add_tuple("type_bound_is_const", vec![id.into()]);
+        }
+        if let Some(v) = self.lifetime {
+            out.add_tuple("type_bound_lifetimes", vec![id.into(), v.into()]);
+        }
+        if let Some(v) = self.ty {
+            out.add_tuple("type_bound_ties", vec![id.into(), v.into()]);
+        }
+    }
+}
+
+impl trap::TrapClass for TypeBound {
+    fn class_name() -> &'static str { "TypeBound" }
+}
+
+impl From<trap::Label<TypeBound>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<TypeBound>) -> Self {
+        // SAFETY: this is safe because in the dbscheme TypeBound is a subclass of AstNode
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<TypeBound>> for trap::Label<Element> {
+    fn from(value: trap::Label<TypeBound>) -> Self {
+        // SAFETY: this is safe because in the dbscheme TypeBound is a subclass of Element
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<TypeBound>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<TypeBound>) -> Self {
+        // SAFETY: this is safe because in the dbscheme TypeBound is a subclass of Locatable
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+#[derive(Debug)]
+pub struct TypeBoundList {
+    pub id: trap::TrapId<TypeBoundList>,
+    pub bounds: Vec<trap::Label<TypeBound>>,
+}
+
+impl trap::TrapEntry for TypeBoundList {
+    fn extract_id(&mut self) -> trap::TrapId<Self> {
+        std::mem::replace(&mut self.id, trap::TrapId::Star)
+    }
+
+    fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
+        out.add_tuple("type_bound_lists", vec![id.into()]);
+        for (i, v) in self.bounds.into_iter().enumerate() {
+            out.add_tuple("type_bound_list_bounds", vec![id.into(), i.into(), v.into()]);
+        }
+    }
+}
+
+impl trap::TrapClass for TypeBoundList {
+    fn class_name() -> &'static str { "TypeBoundList" }
+}
+
+impl From<trap::Label<TypeBoundList>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<TypeBoundList>) -> Self {
+        // SAFETY: this is safe because in the dbscheme TypeBoundList is a subclass of AstNode
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<TypeBoundList>> for trap::Label<Element> {
+    fn from(value: trap::Label<TypeBoundList>) -> Self {
+        // SAFETY: this is safe because in the dbscheme TypeBoundList is a subclass of Element
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<TypeBoundList>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<TypeBoundList>) -> Self {
+        // SAFETY: this is safe because in the dbscheme TypeBoundList is a subclass of Locatable
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+#[derive(Debug)]
+pub struct TypeRef {
+    _unused: ()
+}
+
 impl trap::TrapClass for TypeRef {
     fn class_name() -> &'static str { "TypeRef" }
 }
@@ -643,18 +2709,386 @@ impl From<trap::Label<TypeRef>> for trap::Label<Locatable> {
     }
 }
 
-impl From<trap::Label<TypeRef>> for trap::Label<Unextracted> {
-    fn from(value: trap::Label<TypeRef>) -> Self {
-        // SAFETY: this is safe because in the dbscheme TypeRef is a subclass of Unextracted
+#[derive(Debug)]
+pub struct UseTree {
+    pub id: trap::TrapId<UseTree>,
+    pub path: Option<trap::Label<Path>>,
+    pub rename: Option<trap::Label<Rename>>,
+    pub use_tree_list: Option<trap::Label<UseTreeList>>,
+}
+
+impl trap::TrapEntry for UseTree {
+    fn extract_id(&mut self) -> trap::TrapId<Self> {
+        std::mem::replace(&mut self.id, trap::TrapId::Star)
+    }
+
+    fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
+        out.add_tuple("use_trees", vec![id.into()]);
+        if let Some(v) = self.path {
+            out.add_tuple("use_tree_paths", vec![id.into(), v.into()]);
+        }
+        if let Some(v) = self.rename {
+            out.add_tuple("use_tree_renames", vec![id.into(), v.into()]);
+        }
+        if let Some(v) = self.use_tree_list {
+            out.add_tuple("use_tree_use_tree_lists", vec![id.into(), v.into()]);
+        }
+    }
+}
+
+impl trap::TrapClass for UseTree {
+    fn class_name() -> &'static str { "UseTree" }
+}
+
+impl From<trap::Label<UseTree>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<UseTree>) -> Self {
+        // SAFETY: this is safe because in the dbscheme UseTree is a subclass of AstNode
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<TypeRef>> for trap::Label<Unimplemented> {
-    fn from(value: trap::Label<TypeRef>) -> Self {
-        // SAFETY: this is safe because in the dbscheme TypeRef is a subclass of Unimplemented
+impl From<trap::Label<UseTree>> for trap::Label<Element> {
+    fn from(value: trap::Label<UseTree>) -> Self {
+        // SAFETY: this is safe because in the dbscheme UseTree is a subclass of Element
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<UseTree>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<UseTree>) -> Self {
+        // SAFETY: this is safe because in the dbscheme UseTree is a subclass of Locatable
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+#[derive(Debug)]
+pub struct UseTreeList {
+    pub id: trap::TrapId<UseTreeList>,
+    pub use_trees: Vec<trap::Label<UseTree>>,
+}
+
+impl trap::TrapEntry for UseTreeList {
+    fn extract_id(&mut self) -> trap::TrapId<Self> {
+        std::mem::replace(&mut self.id, trap::TrapId::Star)
+    }
+
+    fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
+        out.add_tuple("use_tree_lists", vec![id.into()]);
+        for (i, v) in self.use_trees.into_iter().enumerate() {
+            out.add_tuple("use_tree_list_use_trees", vec![id.into(), i.into(), v.into()]);
+        }
+    }
+}
+
+impl trap::TrapClass for UseTreeList {
+    fn class_name() -> &'static str { "UseTreeList" }
+}
+
+impl From<trap::Label<UseTreeList>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<UseTreeList>) -> Self {
+        // SAFETY: this is safe because in the dbscheme UseTreeList is a subclass of AstNode
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<UseTreeList>> for trap::Label<Element> {
+    fn from(value: trap::Label<UseTreeList>) -> Self {
+        // SAFETY: this is safe because in the dbscheme UseTreeList is a subclass of Element
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<UseTreeList>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<UseTreeList>) -> Self {
+        // SAFETY: this is safe because in the dbscheme UseTreeList is a subclass of Locatable
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+#[derive(Debug)]
+pub struct Variant {
+    pub id: trap::TrapId<Variant>,
+    pub attrs: Vec<trap::Label<Attr>>,
+    pub expr: Option<trap::Label<Expr>>,
+    pub field_list: Option<trap::Label<FieldList>>,
+    pub name: Option<trap::Label<Name>>,
+    pub visibility: Option<trap::Label<Visibility>>,
+}
+
+impl trap::TrapEntry for Variant {
+    fn extract_id(&mut self) -> trap::TrapId<Self> {
+        std::mem::replace(&mut self.id, trap::TrapId::Star)
+    }
+
+    fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
+        out.add_tuple("variants", vec![id.into()]);
+        for (i, v) in self.attrs.into_iter().enumerate() {
+            out.add_tuple("variant_attrs", vec![id.into(), i.into(), v.into()]);
+        }
+        if let Some(v) = self.expr {
+            out.add_tuple("variant_exprs", vec![id.into(), v.into()]);
+        }
+        if let Some(v) = self.field_list {
+            out.add_tuple("variant_field_lists", vec![id.into(), v.into()]);
+        }
+        if let Some(v) = self.name {
+            out.add_tuple("variant_names", vec![id.into(), v.into()]);
+        }
+        if let Some(v) = self.visibility {
+            out.add_tuple("variant_visibilities", vec![id.into(), v.into()]);
+        }
+    }
+}
+
+impl trap::TrapClass for Variant {
+    fn class_name() -> &'static str { "Variant" }
+}
+
+impl From<trap::Label<Variant>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<Variant>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Variant is a subclass of AstNode
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<Variant>> for trap::Label<Element> {
+    fn from(value: trap::Label<Variant>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Variant is a subclass of Element
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<Variant>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<Variant>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Variant is a subclass of Locatable
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+#[derive(Debug)]
+pub struct VariantList {
+    pub id: trap::TrapId<VariantList>,
+    pub variants: Vec<trap::Label<Variant>>,
+}
+
+impl trap::TrapEntry for VariantList {
+    fn extract_id(&mut self) -> trap::TrapId<Self> {
+        std::mem::replace(&mut self.id, trap::TrapId::Star)
+    }
+
+    fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
+        out.add_tuple("variant_lists", vec![id.into()]);
+        for (i, v) in self.variants.into_iter().enumerate() {
+            out.add_tuple("variant_list_variants", vec![id.into(), i.into(), v.into()]);
+        }
+    }
+}
+
+impl trap::TrapClass for VariantList {
+    fn class_name() -> &'static str { "VariantList" }
+}
+
+impl From<trap::Label<VariantList>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<VariantList>) -> Self {
+        // SAFETY: this is safe because in the dbscheme VariantList is a subclass of AstNode
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<VariantList>> for trap::Label<Element> {
+    fn from(value: trap::Label<VariantList>) -> Self {
+        // SAFETY: this is safe because in the dbscheme VariantList is a subclass of Element
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<VariantList>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<VariantList>) -> Self {
+        // SAFETY: this is safe because in the dbscheme VariantList is a subclass of Locatable
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+#[derive(Debug)]
+pub struct Visibility {
+    pub id: trap::TrapId<Visibility>,
+    pub path: Option<trap::Label<Path>>,
+}
+
+impl trap::TrapEntry for Visibility {
+    fn extract_id(&mut self) -> trap::TrapId<Self> {
+        std::mem::replace(&mut self.id, trap::TrapId::Star)
+    }
+
+    fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
+        out.add_tuple("visibilities", vec![id.into()]);
+        if let Some(v) = self.path {
+            out.add_tuple("visibility_paths", vec![id.into(), v.into()]);
+        }
+    }
+}
+
+impl trap::TrapClass for Visibility {
+    fn class_name() -> &'static str { "Visibility" }
+}
+
+impl From<trap::Label<Visibility>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<Visibility>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Visibility is a subclass of AstNode
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<Visibility>> for trap::Label<Element> {
+    fn from(value: trap::Label<Visibility>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Visibility is a subclass of Element
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<Visibility>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<Visibility>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Visibility is a subclass of Locatable
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+#[derive(Debug)]
+pub struct WhereClause {
+    pub id: trap::TrapId<WhereClause>,
+    pub predicates: Vec<trap::Label<WherePred>>,
+}
+
+impl trap::TrapEntry for WhereClause {
+    fn extract_id(&mut self) -> trap::TrapId<Self> {
+        std::mem::replace(&mut self.id, trap::TrapId::Star)
+    }
+
+    fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
+        out.add_tuple("where_clauses", vec![id.into()]);
+        for (i, v) in self.predicates.into_iter().enumerate() {
+            out.add_tuple("where_clause_predicates", vec![id.into(), i.into(), v.into()]);
+        }
+    }
+}
+
+impl trap::TrapClass for WhereClause {
+    fn class_name() -> &'static str { "WhereClause" }
+}
+
+impl From<trap::Label<WhereClause>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<WhereClause>) -> Self {
+        // SAFETY: this is safe because in the dbscheme WhereClause is a subclass of AstNode
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<WhereClause>> for trap::Label<Element> {
+    fn from(value: trap::Label<WhereClause>) -> Self {
+        // SAFETY: this is safe because in the dbscheme WhereClause is a subclass of Element
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<WhereClause>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<WhereClause>) -> Self {
+        // SAFETY: this is safe because in the dbscheme WhereClause is a subclass of Locatable
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+#[derive(Debug)]
+pub struct WherePred {
+    pub id: trap::TrapId<WherePred>,
+    pub generic_param_list: Option<trap::Label<GenericParamList>>,
+    pub lifetime: Option<trap::Label<Lifetime>>,
+    pub ty: Option<trap::Label<TypeRef>>,
+    pub type_bound_list: Option<trap::Label<TypeBoundList>>,
+}
+
+impl trap::TrapEntry for WherePred {
+    fn extract_id(&mut self) -> trap::TrapId<Self> {
+        std::mem::replace(&mut self.id, trap::TrapId::Star)
+    }
+
+    fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
+        out.add_tuple("where_preds", vec![id.into()]);
+        if let Some(v) = self.generic_param_list {
+            out.add_tuple("where_pred_generic_param_lists", vec![id.into(), v.into()]);
+        }
+        if let Some(v) = self.lifetime {
+            out.add_tuple("where_pred_lifetimes", vec![id.into(), v.into()]);
+        }
+        if let Some(v) = self.ty {
+            out.add_tuple("where_pred_ties", vec![id.into(), v.into()]);
+        }
+        if let Some(v) = self.type_bound_list {
+            out.add_tuple("where_pred_type_bound_lists", vec![id.into(), v.into()]);
+        }
+    }
+}
+
+impl trap::TrapClass for WherePred {
+    fn class_name() -> &'static str { "WherePred" }
+}
+
+impl From<trap::Label<WherePred>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<WherePred>) -> Self {
+        // SAFETY: this is safe because in the dbscheme WherePred is a subclass of AstNode
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<WherePred>> for trap::Label<Element> {
+    fn from(value: trap::Label<WherePred>) -> Self {
+        // SAFETY: this is safe because in the dbscheme WherePred is a subclass of Element
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<WherePred>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<WherePred>) -> Self {
+        // SAFETY: this is safe because in the dbscheme WherePred is a subclass of Locatable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -663,7 +3097,25 @@ impl From<trap::Label<TypeRef>> for trap::Label<Unimplemented> {
 
 #[derive(Debug)]
 pub struct ArrayExpr {
-    _unused: ()
+    pub id: trap::TrapId<ArrayExpr>,
+    pub attrs: Vec<trap::Label<Attr>>,
+    pub exprs: Vec<trap::Label<Expr>>,
+}
+
+impl trap::TrapEntry for ArrayExpr {
+    fn extract_id(&mut self) -> trap::TrapId<Self> {
+        std::mem::replace(&mut self.id, trap::TrapId::Star)
+    }
+
+    fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
+        out.add_tuple("array_exprs", vec![id.into()]);
+        for (i, v) in self.attrs.into_iter().enumerate() {
+            out.add_tuple("array_expr_attrs", vec![id.into(), i.into(), v.into()]);
+        }
+        for (i, v) in self.exprs.into_iter().enumerate() {
+            out.add_tuple("array_expr_exprs", vec![id.into(), i.into(), v.into()]);
+        }
+    }
 }
 
 impl trap::TrapClass for ArrayExpr {
@@ -706,10 +3158,74 @@ impl From<trap::Label<ArrayExpr>> for trap::Label<Locatable> {
     }
 }
 
+#[derive(Debug)]
+pub struct ArrayType {
+    pub id: trap::TrapId<ArrayType>,
+    pub const_arg: Option<trap::Label<ConstArg>>,
+    pub ty: Option<trap::Label<TypeRef>>,
+}
+
+impl trap::TrapEntry for ArrayType {
+    fn extract_id(&mut self) -> trap::TrapId<Self> {
+        std::mem::replace(&mut self.id, trap::TrapId::Star)
+    }
+
+    fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
+        out.add_tuple("array_types", vec![id.into()]);
+        if let Some(v) = self.const_arg {
+            out.add_tuple("array_type_const_args", vec![id.into(), v.into()]);
+        }
+        if let Some(v) = self.ty {
+            out.add_tuple("array_type_ties", vec![id.into(), v.into()]);
+        }
+    }
+}
+
+impl trap::TrapClass for ArrayType {
+    fn class_name() -> &'static str { "ArrayType" }
+}
+
+impl From<trap::Label<ArrayType>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<ArrayType>) -> Self {
+        // SAFETY: this is safe because in the dbscheme ArrayType is a subclass of AstNode
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<ArrayType>> for trap::Label<Element> {
+    fn from(value: trap::Label<ArrayType>) -> Self {
+        // SAFETY: this is safe because in the dbscheme ArrayType is a subclass of Element
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<ArrayType>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<ArrayType>) -> Self {
+        // SAFETY: this is safe because in the dbscheme ArrayType is a subclass of Locatable
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<ArrayType>> for trap::Label<TypeRef> {
+    fn from(value: trap::Label<ArrayType>) -> Self {
+        // SAFETY: this is safe because in the dbscheme ArrayType is a subclass of TypeRef
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
 #[derive(Debug)]
 pub struct AsmExpr {
     pub id: trap::TrapId<AsmExpr>,
-    pub expr: trap::Label<Expr>,
+    pub attrs: Vec<trap::Label<Attr>>,
+    pub expr: Option<trap::Label<Expr>>,
 }
 
 impl trap::TrapEntry for AsmExpr {
@@ -718,7 +3234,13 @@ impl trap::TrapEntry for AsmExpr {
     }
 
     fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
-        out.add_tuple("asm_exprs", vec![id.into(), self.expr.into()]);
+        out.add_tuple("asm_exprs", vec![id.into()]);
+        for (i, v) in self.attrs.into_iter().enumerate() {
+            out.add_tuple("asm_expr_attrs", vec![id.into(), i.into(), v.into()]);
+        }
+        if let Some(v) = self.expr {
+            out.add_tuple("asm_expr_exprs", vec![id.into(), v.into()]);
+        }
     }
 }
 
@@ -762,10 +3284,98 @@ impl From<trap::Label<AsmExpr>> for trap::Label<Locatable> {
     }
 }
 
+#[derive(Debug)]
+pub struct AssocTypeArg {
+    pub id: trap::TrapId<AssocTypeArg>,
+    pub const_arg: Option<trap::Label<ConstArg>>,
+    pub generic_arg_list: Option<trap::Label<GenericArgList>>,
+    pub name_ref: Option<trap::Label<NameRef>>,
+    pub param_list: Option<trap::Label<ParamList>>,
+    pub ret_type: Option<trap::Label<RetType>>,
+    pub return_type_syntax: Option<trap::Label<ReturnTypeSyntax>>,
+    pub ty: Option<trap::Label<TypeRef>>,
+    pub type_bound_list: Option<trap::Label<TypeBoundList>>,
+}
+
+impl trap::TrapEntry for AssocTypeArg {
+    fn extract_id(&mut self) -> trap::TrapId<Self> {
+        std::mem::replace(&mut self.id, trap::TrapId::Star)
+    }
+
+    fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
+        out.add_tuple("assoc_type_args", vec![id.into()]);
+        if let Some(v) = self.const_arg {
+            out.add_tuple("assoc_type_arg_const_args", vec![id.into(), v.into()]);
+        }
+        if let Some(v) = self.generic_arg_list {
+            out.add_tuple("assoc_type_arg_generic_arg_lists", vec![id.into(), v.into()]);
+        }
+        if let Some(v) = self.name_ref {
+            out.add_tuple("assoc_type_arg_name_refs", vec![id.into(), v.into()]);
+        }
+        if let Some(v) = self.param_list {
+            out.add_tuple("assoc_type_arg_param_lists", vec![id.into(), v.into()]);
+        }
+        if let Some(v) = self.ret_type {
+            out.add_tuple("assoc_type_arg_ret_types", vec![id.into(), v.into()]);
+        }
+        if let Some(v) = self.return_type_syntax {
+            out.add_tuple("assoc_type_arg_return_type_syntaxes", vec![id.into(), v.into()]);
+        }
+        if let Some(v) = self.ty {
+            out.add_tuple("assoc_type_arg_ties", vec![id.into(), v.into()]);
+        }
+        if let Some(v) = self.type_bound_list {
+            out.add_tuple("assoc_type_arg_type_bound_lists", vec![id.into(), v.into()]);
+        }
+    }
+}
+
+impl trap::TrapClass for AssocTypeArg {
+    fn class_name() -> &'static str { "AssocTypeArg" }
+}
+
+impl From<trap::Label<AssocTypeArg>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<AssocTypeArg>) -> Self {
+        // SAFETY: this is safe because in the dbscheme AssocTypeArg is a subclass of AstNode
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<AssocTypeArg>> for trap::Label<Element> {
+    fn from(value: trap::Label<AssocTypeArg>) -> Self {
+        // SAFETY: this is safe because in the dbscheme AssocTypeArg is a subclass of Element
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<AssocTypeArg>> for trap::Label<GenericArg> {
+    fn from(value: trap::Label<AssocTypeArg>) -> Self {
+        // SAFETY: this is safe because in the dbscheme AssocTypeArg is a subclass of GenericArg
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<AssocTypeArg>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<AssocTypeArg>) -> Self {
+        // SAFETY: this is safe because in the dbscheme AssocTypeArg is a subclass of Locatable
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
 #[derive(Debug)]
 pub struct AwaitExpr {
     pub id: trap::TrapId<AwaitExpr>,
-    pub expr: trap::Label<Expr>,
+    pub attrs: Vec<trap::Label<Attr>>,
+    pub expr: Option<trap::Label<Expr>>,
 }
 
 impl trap::TrapEntry for AwaitExpr {
@@ -774,7 +3384,13 @@ impl trap::TrapEntry for AwaitExpr {
     }
 
     fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
-        out.add_tuple("await_exprs", vec![id.into(), self.expr.into()]);
+        out.add_tuple("await_exprs", vec![id.into()]);
+        for (i, v) in self.attrs.into_iter().enumerate() {
+            out.add_tuple("await_expr_attrs", vec![id.into(), i.into(), v.into()]);
+        }
+        if let Some(v) = self.expr {
+            out.add_tuple("await_expr_exprs", vec![id.into(), v.into()]);
+        }
     }
 }
 
@@ -821,7 +3437,8 @@ impl From<trap::Label<AwaitExpr>> for trap::Label<Locatable> {
 #[derive(Debug)]
 pub struct BecomeExpr {
     pub id: trap::TrapId<BecomeExpr>,
-    pub expr: trap::Label<Expr>,
+    pub attrs: Vec<trap::Label<Attr>>,
+    pub expr: Option<trap::Label<Expr>>,
 }
 
 impl trap::TrapEntry for BecomeExpr {
@@ -830,7 +3447,13 @@ impl trap::TrapEntry for BecomeExpr {
     }
 
     fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
-        out.add_tuple("become_exprs", vec![id.into(), self.expr.into()]);
+        out.add_tuple("become_exprs", vec![id.into()]);
+        for (i, v) in self.attrs.into_iter().enumerate() {
+            out.add_tuple("become_expr_attrs", vec![id.into(), i.into(), v.into()]);
+        }
+        if let Some(v) = self.expr {
+            out.add_tuple("become_expr_exprs", vec![id.into(), v.into()]);
+        }
     }
 }
 
@@ -877,9 +3500,10 @@ impl From<trap::Label<BecomeExpr>> for trap::Label<Locatable> {
 #[derive(Debug)]
 pub struct BinaryExpr {
     pub id: trap::TrapId<BinaryExpr>,
-    pub lhs: trap::Label<Expr>,
-    pub rhs: trap::Label<Expr>,
-    pub op: Option<String>,
+    pub attrs: Vec<trap::Label<Attr>>,
+    pub lhs: Option<trap::Label<Expr>>,
+    pub operator_name: Option<String>,
+    pub rhs: Option<trap::Label<Expr>>,
 }
 
 impl trap::TrapEntry for BinaryExpr {
@@ -888,9 +3512,18 @@ impl trap::TrapEntry for BinaryExpr {
     }
 
     fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
-        out.add_tuple("binary_exprs", vec![id.into(), self.lhs.into(), self.rhs.into()]);
-        if let Some(v) = self.op {
-            out.add_tuple("binary_expr_ops", vec![id.into(), v.into()]);
+        out.add_tuple("binary_exprs", vec![id.into()]);
+        for (i, v) in self.attrs.into_iter().enumerate() {
+            out.add_tuple("binary_expr_attrs", vec![id.into(), i.into(), v.into()]);
+        }
+        if let Some(v) = self.lhs {
+            out.add_tuple("binary_expr_lhs", vec![id.into(), v.into()]);
+        }
+        if let Some(v) = self.operator_name {
+            out.add_tuple("binary_expr_operator_names", vec![id.into(), v.into()]);
+        }
+        if let Some(v) = self.rhs {
+            out.add_tuple("binary_expr_rhs", vec![id.into(), v.into()]);
         }
     }
 }
@@ -936,100 +3569,90 @@ impl From<trap::Label<BinaryExpr>> for trap::Label<Locatable> {
 }
 
 #[derive(Debug)]
-pub struct BlockExprBase {
-    _unused: ()
+pub struct BlockExpr {
+    pub id: trap::TrapId<BlockExpr>,
+    pub attrs: Vec<trap::Label<Attr>>,
+    pub is_async: bool,
+    pub is_const: bool,
+    pub is_gen: bool,
+    pub is_move: bool,
+    pub is_try: bool,
+    pub is_unsafe: bool,
+    pub label: Option<trap::Label<Label>>,
+    pub stmt_list: Option<trap::Label<StmtList>>,
 }
 
-impl trap::TrapClass for BlockExprBase {
-    fn class_name() -> &'static str { "BlockExprBase" }
-}
-
-impl From<trap::Label<BlockExprBase>> for trap::Label<AstNode> {
-    fn from(value: trap::Label<BlockExprBase>) -> Self {
-        // SAFETY: this is safe because in the dbscheme BlockExprBase is a subclass of AstNode
-        unsafe {
-            Self::from_untyped(value.as_untyped())
-        }
-    }
-}
-
-impl From<trap::Label<BlockExprBase>> for trap::Label<Element> {
-    fn from(value: trap::Label<BlockExprBase>) -> Self {
-        // SAFETY: this is safe because in the dbscheme BlockExprBase is a subclass of Element
-        unsafe {
-            Self::from_untyped(value.as_untyped())
-        }
-    }
-}
-
-impl From<trap::Label<BlockExprBase>> for trap::Label<Expr> {
-    fn from(value: trap::Label<BlockExprBase>) -> Self {
-        // SAFETY: this is safe because in the dbscheme BlockExprBase is a subclass of Expr
-        unsafe {
-            Self::from_untyped(value.as_untyped())
-        }
-    }
-}
-
-impl From<trap::Label<BlockExprBase>> for trap::Label<Locatable> {
-    fn from(value: trap::Label<BlockExprBase>) -> Self {
-        // SAFETY: this is safe because in the dbscheme BlockExprBase is a subclass of Locatable
-        unsafe {
-            Self::from_untyped(value.as_untyped())
-        }
-    }
-}
-
-#[derive(Debug)]
-pub struct BoxExpr {
-    pub id: trap::TrapId<BoxExpr>,
-    pub expr: trap::Label<Expr>,
-}
-
-impl trap::TrapEntry for BoxExpr {
+impl trap::TrapEntry for BlockExpr {
     fn extract_id(&mut self) -> trap::TrapId<Self> {
         std::mem::replace(&mut self.id, trap::TrapId::Star)
     }
 
     fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
-        out.add_tuple("box_exprs", vec![id.into(), self.expr.into()]);
+        out.add_tuple("block_exprs", vec![id.into()]);
+        for (i, v) in self.attrs.into_iter().enumerate() {
+            out.add_tuple("block_expr_attrs", vec![id.into(), i.into(), v.into()]);
+        }
+        if self.is_async {
+            out.add_tuple("block_expr_is_async", vec![id.into()]);
+        }
+        if self.is_const {
+            out.add_tuple("block_expr_is_const", vec![id.into()]);
+        }
+        if self.is_gen {
+            out.add_tuple("block_expr_is_gen", vec![id.into()]);
+        }
+        if self.is_move {
+            out.add_tuple("block_expr_is_move", vec![id.into()]);
+        }
+        if self.is_try {
+            out.add_tuple("block_expr_is_try", vec![id.into()]);
+        }
+        if self.is_unsafe {
+            out.add_tuple("block_expr_is_unsafe", vec![id.into()]);
+        }
+        if let Some(v) = self.label {
+            out.add_tuple("block_expr_labels", vec![id.into(), v.into()]);
+        }
+        if let Some(v) = self.stmt_list {
+            out.add_tuple("block_expr_stmt_lists", vec![id.into(), v.into()]);
+        }
     }
 }
 
-impl trap::TrapClass for BoxExpr {
-    fn class_name() -> &'static str { "BoxExpr" }
+impl trap::TrapClass for BlockExpr {
+    fn class_name() -> &'static str { "BlockExpr" }
 }
 
-impl From<trap::Label<BoxExpr>> for trap::Label<AstNode> {
-    fn from(value: trap::Label<BoxExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme BoxExpr is a subclass of AstNode
+impl From<trap::Label<BlockExpr>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<BlockExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme BlockExpr is a subclass of AstNode
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<BoxExpr>> for trap::Label<Element> {
-    fn from(value: trap::Label<BoxExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme BoxExpr is a subclass of Element
+impl From<trap::Label<BlockExpr>> for trap::Label<Element> {
+    fn from(value: trap::Label<BlockExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme BlockExpr is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<BoxExpr>> for trap::Label<Expr> {
-    fn from(value: trap::Label<BoxExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme BoxExpr is a subclass of Expr
+impl From<trap::Label<BlockExpr>> for trap::Label<Expr> {
+    fn from(value: trap::Label<BlockExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme BlockExpr is a subclass of Expr
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<BoxExpr>> for trap::Label<Locatable> {
-    fn from(value: trap::Label<BoxExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme BoxExpr is a subclass of Locatable
+impl From<trap::Label<BlockExpr>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<BlockExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme BlockExpr is a subclass of Locatable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -1039,7 +3662,7 @@ impl From<trap::Label<BoxExpr>> for trap::Label<Locatable> {
 #[derive(Debug)]
 pub struct BoxPat {
     pub id: trap::TrapId<BoxPat>,
-    pub inner: trap::Label<Pat>,
+    pub pat: Option<trap::Label<Pat>>,
 }
 
 impl trap::TrapEntry for BoxPat {
@@ -1048,7 +3671,10 @@ impl trap::TrapEntry for BoxPat {
     }
 
     fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
-        out.add_tuple("box_pats", vec![id.into(), self.inner.into()]);
+        out.add_tuple("box_pats", vec![id.into()]);
+        if let Some(v) = self.pat {
+            out.add_tuple("box_pat_pats", vec![id.into(), v.into()]);
+        }
     }
 }
 
@@ -1095,8 +3721,9 @@ impl From<trap::Label<BoxPat>> for trap::Label<Pat> {
 #[derive(Debug)]
 pub struct BreakExpr {
     pub id: trap::TrapId<BreakExpr>,
+    pub attrs: Vec<trap::Label<Attr>>,
     pub expr: Option<trap::Label<Expr>>,
-    pub label: Option<trap::Label<Label>>,
+    pub lifetime: Option<trap::Label<Lifetime>>,
 }
 
 impl trap::TrapEntry for BreakExpr {
@@ -1106,11 +3733,14 @@ impl trap::TrapEntry for BreakExpr {
 
     fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
         out.add_tuple("break_exprs", vec![id.into()]);
+        for (i, v) in self.attrs.into_iter().enumerate() {
+            out.add_tuple("break_expr_attrs", vec![id.into(), i.into(), v.into()]);
+        }
         if let Some(v) = self.expr {
             out.add_tuple("break_expr_exprs", vec![id.into(), v.into()]);
         }
-        if let Some(v) = self.label {
-            out.add_tuple("break_expr_labels", vec![id.into(), v.into()]);
+        if let Some(v) = self.lifetime {
+            out.add_tuple("break_expr_lifetimes", vec![id.into(), v.into()]);
         }
     }
 }
@@ -1156,63 +3786,44 @@ impl From<trap::Label<BreakExpr>> for trap::Label<Locatable> {
 }
 
 #[derive(Debug)]
-pub struct CallExpr {
-    pub id: trap::TrapId<CallExpr>,
-    pub callee: trap::Label<Expr>,
-    pub args: Vec<trap::Label<Expr>>,
-    pub is_assignee_expr: bool,
+pub struct CallExprBase {
+    _unused: ()
 }
 
-impl trap::TrapEntry for CallExpr {
-    fn extract_id(&mut self) -> trap::TrapId<Self> {
-        std::mem::replace(&mut self.id, trap::TrapId::Star)
-    }
-
-    fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
-        out.add_tuple("call_exprs", vec![id.into(), self.callee.into()]);
-        for (i, v) in self.args.into_iter().enumerate() {
-            out.add_tuple("call_expr_args", vec![id.into(), i.into(), v.into()]);
-        }
-        if self.is_assignee_expr {
-            out.add_tuple("call_expr_is_assignee_expr", vec![id.into()]);
-        }
-    }
+impl trap::TrapClass for CallExprBase {
+    fn class_name() -> &'static str { "CallExprBase" }
 }
 
-impl trap::TrapClass for CallExpr {
-    fn class_name() -> &'static str { "CallExpr" }
-}
-
-impl From<trap::Label<CallExpr>> for trap::Label<AstNode> {
-    fn from(value: trap::Label<CallExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme CallExpr is a subclass of AstNode
+impl From<trap::Label<CallExprBase>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<CallExprBase>) -> Self {
+        // SAFETY: this is safe because in the dbscheme CallExprBase is a subclass of AstNode
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<CallExpr>> for trap::Label<Element> {
-    fn from(value: trap::Label<CallExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme CallExpr is a subclass of Element
+impl From<trap::Label<CallExprBase>> for trap::Label<Element> {
+    fn from(value: trap::Label<CallExprBase>) -> Self {
+        // SAFETY: this is safe because in the dbscheme CallExprBase is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<CallExpr>> for trap::Label<Expr> {
-    fn from(value: trap::Label<CallExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme CallExpr is a subclass of Expr
+impl From<trap::Label<CallExprBase>> for trap::Label<Expr> {
+    fn from(value: trap::Label<CallExprBase>) -> Self {
+        // SAFETY: this is safe because in the dbscheme CallExprBase is a subclass of Expr
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<CallExpr>> for trap::Label<Locatable> {
-    fn from(value: trap::Label<CallExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme CallExpr is a subclass of Locatable
+impl From<trap::Label<CallExprBase>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<CallExprBase>) -> Self {
+        // SAFETY: this is safe because in the dbscheme CallExprBase is a subclass of Locatable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -1222,8 +3833,9 @@ impl From<trap::Label<CallExpr>> for trap::Label<Locatable> {
 #[derive(Debug)]
 pub struct CastExpr {
     pub id: trap::TrapId<CastExpr>,
-    pub expr: trap::Label<Expr>,
-    pub type_: trap::Label<TypeRef>,
+    pub attrs: Vec<trap::Label<Attr>>,
+    pub expr: Option<trap::Label<Expr>>,
+    pub ty: Option<trap::Label<TypeRef>>,
 }
 
 impl trap::TrapEntry for CastExpr {
@@ -1232,7 +3844,16 @@ impl trap::TrapEntry for CastExpr {
     }
 
     fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
-        out.add_tuple("cast_exprs", vec![id.into(), self.expr.into(), self.type_.into()]);
+        out.add_tuple("cast_exprs", vec![id.into()]);
+        for (i, v) in self.attrs.into_iter().enumerate() {
+            out.add_tuple("cast_expr_attrs", vec![id.into(), i.into(), v.into()]);
+        }
+        if let Some(v) = self.expr {
+            out.add_tuple("cast_expr_exprs", vec![id.into(), v.into()]);
+        }
+        if let Some(v) = self.ty {
+            out.add_tuple("cast_expr_ties", vec![id.into(), v.into()]);
+        }
     }
 }
 
@@ -1279,12 +3900,16 @@ impl From<trap::Label<CastExpr>> for trap::Label<Locatable> {
 #[derive(Debug)]
 pub struct ClosureExpr {
     pub id: trap::TrapId<ClosureExpr>,
-    pub args: Vec<trap::Label<Pat>>,
-    pub arg_types: Vec<Option<trap::Label<TypeRef>>>,
-    pub ret_type: Option<trap::Label<TypeRef>>,
-    pub body: trap::Label<Expr>,
-    pub closure_kind: String,
+    pub param_list: Option<trap::Label<ParamList>>,
+    pub attrs: Vec<trap::Label<Attr>>,
+    pub body: Option<trap::Label<Expr>>,
+    pub closure_binder: Option<trap::Label<ClosureBinder>>,
+    pub is_async: bool,
+    pub is_const: bool,
+    pub is_gen: bool,
     pub is_move: bool,
+    pub is_static: bool,
+    pub ret_type: Option<trap::Label<RetType>>,
 }
 
 impl trap::TrapEntry for ClosureExpr {
@@ -1293,21 +3918,37 @@ impl trap::TrapEntry for ClosureExpr {
     }
 
     fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
-        out.add_tuple("closure_exprs", vec![id.into(), self.body.into(), self.closure_kind.into()]);
-        for (i, v) in self.args.into_iter().enumerate() {
-            out.add_tuple("closure_expr_args", vec![id.into(), i.into(), v.into()]);
+        out.add_tuple("closure_exprs", vec![id.into()]);
+        if let Some(v) = self.param_list {
+            out.add_tuple("callable_param_lists", vec![id.into(), v.into()]);
         }
-        for (i, v) in self.arg_types.into_iter().enumerate() {
-            if let Some(v) = v {
-                out.add_tuple("closure_expr_arg_types", vec![id.into(), i.into(), v.into()]);
-            }
+        for (i, v) in self.attrs.into_iter().enumerate() {
+            out.add_tuple("callable_attrs", vec![id.into(), i.into(), v.into()]);
         }
-        if let Some(v) = self.ret_type {
-            out.add_tuple("closure_expr_ret_types", vec![id.into(), v.into()]);
+        if let Some(v) = self.body {
+            out.add_tuple("closure_expr_bodies", vec![id.into(), v.into()]);
+        }
+        if let Some(v) = self.closure_binder {
+            out.add_tuple("closure_expr_closure_binders", vec![id.into(), v.into()]);
+        }
+        if self.is_async {
+            out.add_tuple("closure_expr_is_async", vec![id.into()]);
+        }
+        if self.is_const {
+            out.add_tuple("closure_expr_is_const", vec![id.into()]);
+        }
+        if self.is_gen {
+            out.add_tuple("closure_expr_is_gen", vec![id.into()]);
         }
         if self.is_move {
             out.add_tuple("closure_expr_is_move", vec![id.into()]);
         }
+        if self.is_static {
+            out.add_tuple("closure_expr_is_static", vec![id.into()]);
+        }
+        if let Some(v) = self.ret_type {
+            out.add_tuple("closure_expr_ret_types", vec![id.into(), v.into()]);
+        }
     }
 }
 
@@ -1324,6 +3965,15 @@ impl From<trap::Label<ClosureExpr>> for trap::Label<AstNode> {
     }
 }
 
+impl From<trap::Label<ClosureExpr>> for trap::Label<Callable> {
+    fn from(value: trap::Label<ClosureExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme ClosureExpr is a subclass of Callable
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
 impl From<trap::Label<ClosureExpr>> for trap::Label<Element> {
     fn from(value: trap::Label<ClosureExpr>) -> Self {
         // SAFETY: this is safe because in the dbscheme ClosureExpr is a subclass of Element
@@ -1351,10 +4001,127 @@ impl From<trap::Label<ClosureExpr>> for trap::Label<Locatable> {
     }
 }
 
+#[derive(Debug)]
+pub struct Comment {
+    pub id: trap::TrapId<Comment>,
+    pub parent: trap::Label<AstNode>,
+    pub text: String,
+}
+
+impl trap::TrapEntry for Comment {
+    fn extract_id(&mut self) -> trap::TrapId<Self> {
+        std::mem::replace(&mut self.id, trap::TrapId::Star)
+    }
+
+    fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
+        out.add_tuple("comments", vec![id.into(), self.parent.into(), self.text.into()]);
+    }
+}
+
+impl trap::TrapClass for Comment {
+    fn class_name() -> &'static str { "Comment" }
+}
+
+impl From<trap::Label<Comment>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<Comment>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Comment is a subclass of AstNode
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<Comment>> for trap::Label<Element> {
+    fn from(value: trap::Label<Comment>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Comment is a subclass of Element
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<Comment>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<Comment>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Comment is a subclass of Locatable
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<Comment>> for trap::Label<Token> {
+    fn from(value: trap::Label<Comment>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Comment is a subclass of Token
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+#[derive(Debug)]
+pub struct ConstArg {
+    pub id: trap::TrapId<ConstArg>,
+    pub expr: Option<trap::Label<Expr>>,
+}
+
+impl trap::TrapEntry for ConstArg {
+    fn extract_id(&mut self) -> trap::TrapId<Self> {
+        std::mem::replace(&mut self.id, trap::TrapId::Star)
+    }
+
+    fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
+        out.add_tuple("const_args", vec![id.into()]);
+        if let Some(v) = self.expr {
+            out.add_tuple("const_arg_exprs", vec![id.into(), v.into()]);
+        }
+    }
+}
+
+impl trap::TrapClass for ConstArg {
+    fn class_name() -> &'static str { "ConstArg" }
+}
+
+impl From<trap::Label<ConstArg>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<ConstArg>) -> Self {
+        // SAFETY: this is safe because in the dbscheme ConstArg is a subclass of AstNode
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<ConstArg>> for trap::Label<Element> {
+    fn from(value: trap::Label<ConstArg>) -> Self {
+        // SAFETY: this is safe because in the dbscheme ConstArg is a subclass of Element
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<ConstArg>> for trap::Label<GenericArg> {
+    fn from(value: trap::Label<ConstArg>) -> Self {
+        // SAFETY: this is safe because in the dbscheme ConstArg is a subclass of GenericArg
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<ConstArg>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<ConstArg>) -> Self {
+        // SAFETY: this is safe because in the dbscheme ConstArg is a subclass of Locatable
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
 #[derive(Debug)]
 pub struct ConstBlockPat {
     pub id: trap::TrapId<ConstBlockPat>,
-    pub expr: trap::Label<Expr>,
+    pub block_expr: Option<trap::Label<BlockExpr>>,
+    pub is_const: bool,
 }
 
 impl trap::TrapEntry for ConstBlockPat {
@@ -1363,7 +4130,13 @@ impl trap::TrapEntry for ConstBlockPat {
     }
 
     fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
-        out.add_tuple("const_block_pats", vec![id.into(), self.expr.into()]);
+        out.add_tuple("const_block_pats", vec![id.into()]);
+        if let Some(v) = self.block_expr {
+            out.add_tuple("const_block_pat_block_exprs", vec![id.into(), v.into()]);
+        }
+        if self.is_const {
+            out.add_tuple("const_block_pat_is_const", vec![id.into()]);
+        }
     }
 }
 
@@ -1408,55 +4181,74 @@ impl From<trap::Label<ConstBlockPat>> for trap::Label<Pat> {
 }
 
 #[derive(Debug)]
-pub struct ConstExpr {
-    pub id: trap::TrapId<ConstExpr>,
-    pub expr: trap::Label<Expr>,
+pub struct ConstParam {
+    pub id: trap::TrapId<ConstParam>,
+    pub attrs: Vec<trap::Label<Attr>>,
+    pub default_val: Option<trap::Label<ConstArg>>,
+    pub is_const: bool,
+    pub name: Option<trap::Label<Name>>,
+    pub ty: Option<trap::Label<TypeRef>>,
 }
 
-impl trap::TrapEntry for ConstExpr {
+impl trap::TrapEntry for ConstParam {
     fn extract_id(&mut self) -> trap::TrapId<Self> {
         std::mem::replace(&mut self.id, trap::TrapId::Star)
     }
 
     fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
-        out.add_tuple("const_exprs", vec![id.into(), self.expr.into()]);
+        out.add_tuple("const_params", vec![id.into()]);
+        for (i, v) in self.attrs.into_iter().enumerate() {
+            out.add_tuple("const_param_attrs", vec![id.into(), i.into(), v.into()]);
+        }
+        if let Some(v) = self.default_val {
+            out.add_tuple("const_param_default_vals", vec![id.into(), v.into()]);
+        }
+        if self.is_const {
+            out.add_tuple("const_param_is_const", vec![id.into()]);
+        }
+        if let Some(v) = self.name {
+            out.add_tuple("const_param_names", vec![id.into(), v.into()]);
+        }
+        if let Some(v) = self.ty {
+            out.add_tuple("const_param_ties", vec![id.into(), v.into()]);
+        }
     }
 }
 
-impl trap::TrapClass for ConstExpr {
-    fn class_name() -> &'static str { "ConstExpr" }
+impl trap::TrapClass for ConstParam {
+    fn class_name() -> &'static str { "ConstParam" }
 }
 
-impl From<trap::Label<ConstExpr>> for trap::Label<AstNode> {
-    fn from(value: trap::Label<ConstExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme ConstExpr is a subclass of AstNode
+impl From<trap::Label<ConstParam>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<ConstParam>) -> Self {
+        // SAFETY: this is safe because in the dbscheme ConstParam is a subclass of AstNode
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<ConstExpr>> for trap::Label<Element> {
-    fn from(value: trap::Label<ConstExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme ConstExpr is a subclass of Element
+impl From<trap::Label<ConstParam>> for trap::Label<Element> {
+    fn from(value: trap::Label<ConstParam>) -> Self {
+        // SAFETY: this is safe because in the dbscheme ConstParam is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<ConstExpr>> for trap::Label<Expr> {
-    fn from(value: trap::Label<ConstExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme ConstExpr is a subclass of Expr
+impl From<trap::Label<ConstParam>> for trap::Label<GenericParam> {
+    fn from(value: trap::Label<ConstParam>) -> Self {
+        // SAFETY: this is safe because in the dbscheme ConstParam is a subclass of GenericParam
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<ConstExpr>> for trap::Label<Locatable> {
-    fn from(value: trap::Label<ConstExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme ConstExpr is a subclass of Locatable
+impl From<trap::Label<ConstParam>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<ConstParam>) -> Self {
+        // SAFETY: this is safe because in the dbscheme ConstParam is a subclass of Locatable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -1466,7 +4258,8 @@ impl From<trap::Label<ConstExpr>> for trap::Label<Locatable> {
 #[derive(Debug)]
 pub struct ContinueExpr {
     pub id: trap::TrapId<ContinueExpr>,
-    pub label: Option<trap::Label<Label>>,
+    pub attrs: Vec<trap::Label<Attr>>,
+    pub lifetime: Option<trap::Label<Lifetime>>,
 }
 
 impl trap::TrapEntry for ContinueExpr {
@@ -1476,8 +4269,11 @@ impl trap::TrapEntry for ContinueExpr {
 
     fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
         out.add_tuple("continue_exprs", vec![id.into()]);
-        if let Some(v) = self.label {
-            out.add_tuple("continue_expr_labels", vec![id.into(), v.into()]);
+        for (i, v) in self.attrs.into_iter().enumerate() {
+            out.add_tuple("continue_expr_attrs", vec![id.into(), i.into(), v.into()]);
+        }
+        if let Some(v) = self.lifetime {
+            out.add_tuple("continue_expr_lifetimes", vec![id.into(), v.into()]);
         }
     }
 }
@@ -1522,11 +4318,69 @@ impl From<trap::Label<ContinueExpr>> for trap::Label<Locatable> {
     }
 }
 
+#[derive(Debug)]
+pub struct DynTraitType {
+    pub id: trap::TrapId<DynTraitType>,
+    pub type_bound_list: Option<trap::Label<TypeBoundList>>,
+}
+
+impl trap::TrapEntry for DynTraitType {
+    fn extract_id(&mut self) -> trap::TrapId<Self> {
+        std::mem::replace(&mut self.id, trap::TrapId::Star)
+    }
+
+    fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
+        out.add_tuple("dyn_trait_types", vec![id.into()]);
+        if let Some(v) = self.type_bound_list {
+            out.add_tuple("dyn_trait_type_type_bound_lists", vec![id.into(), v.into()]);
+        }
+    }
+}
+
+impl trap::TrapClass for DynTraitType {
+    fn class_name() -> &'static str { "DynTraitType" }
+}
+
+impl From<trap::Label<DynTraitType>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<DynTraitType>) -> Self {
+        // SAFETY: this is safe because in the dbscheme DynTraitType is a subclass of AstNode
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<DynTraitType>> for trap::Label<Element> {
+    fn from(value: trap::Label<DynTraitType>) -> Self {
+        // SAFETY: this is safe because in the dbscheme DynTraitType is a subclass of Element
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<DynTraitType>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<DynTraitType>) -> Self {
+        // SAFETY: this is safe because in the dbscheme DynTraitType is a subclass of Locatable
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<DynTraitType>> for trap::Label<TypeRef> {
+    fn from(value: trap::Label<DynTraitType>) -> Self {
+        // SAFETY: this is safe because in the dbscheme DynTraitType is a subclass of TypeRef
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
 #[derive(Debug)]
 pub struct ExprStmt {
     pub id: trap::TrapId<ExprStmt>,
-    pub expr: trap::Label<Expr>,
-    pub has_semicolon: bool,
+    pub expr: Option<trap::Label<Expr>>,
 }
 
 impl trap::TrapEntry for ExprStmt {
@@ -1535,9 +4389,9 @@ impl trap::TrapEntry for ExprStmt {
     }
 
     fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
-        out.add_tuple("expr_stmts", vec![id.into(), self.expr.into()]);
-        if self.has_semicolon {
-            out.add_tuple("expr_stmt_has_semicolon", vec![id.into()]);
+        out.add_tuple("expr_stmts", vec![id.into()]);
+        if let Some(v) = self.expr {
+            out.add_tuple("expr_stmt_exprs", vec![id.into(), v.into()]);
         }
     }
 }
@@ -1585,8 +4439,9 @@ impl From<trap::Label<ExprStmt>> for trap::Label<Stmt> {
 #[derive(Debug)]
 pub struct FieldExpr {
     pub id: trap::TrapId<FieldExpr>,
-    pub expr: trap::Label<Expr>,
-    pub name: String,
+    pub attrs: Vec<trap::Label<Attr>>,
+    pub expr: Option<trap::Label<Expr>>,
+    pub name_ref: Option<trap::Label<NameRef>>,
 }
 
 impl trap::TrapEntry for FieldExpr {
@@ -1595,7 +4450,16 @@ impl trap::TrapEntry for FieldExpr {
     }
 
     fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
-        out.add_tuple("field_exprs", vec![id.into(), self.expr.into(), self.name.into()]);
+        out.add_tuple("field_exprs", vec![id.into()]);
+        for (i, v) in self.attrs.into_iter().enumerate() {
+            out.add_tuple("field_expr_attrs", vec![id.into(), i.into(), v.into()]);
+        }
+        if let Some(v) = self.expr {
+            out.add_tuple("field_expr_exprs", vec![id.into(), v.into()]);
+        }
+        if let Some(v) = self.name_ref {
+            out.add_tuple("field_expr_name_refs", vec![id.into(), v.into()]);
+        }
     }
 }
 
@@ -1640,56 +4504,283 @@ impl From<trap::Label<FieldExpr>> for trap::Label<Locatable> {
 }
 
 #[derive(Debug)]
-pub struct Function {
-    pub id: trap::TrapId<Function>,
-    pub name: String,
-    pub body: trap::Label<Expr>,
+pub struct FnPtrType {
+    pub id: trap::TrapId<FnPtrType>,
+    pub abi: Option<trap::Label<Abi>>,
+    pub is_async: bool,
+    pub is_const: bool,
+    pub is_unsafe: bool,
+    pub param_list: Option<trap::Label<ParamList>>,
+    pub ret_type: Option<trap::Label<RetType>>,
 }
 
-impl trap::TrapEntry for Function {
+impl trap::TrapEntry for FnPtrType {
     fn extract_id(&mut self) -> trap::TrapId<Self> {
         std::mem::replace(&mut self.id, trap::TrapId::Star)
     }
 
     fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
-        out.add_tuple("functions", vec![id.into(), self.name.into(), self.body.into()]);
+        out.add_tuple("fn_ptr_types", vec![id.into()]);
+        if let Some(v) = self.abi {
+            out.add_tuple("fn_ptr_type_abis", vec![id.into(), v.into()]);
+        }
+        if self.is_async {
+            out.add_tuple("fn_ptr_type_is_async", vec![id.into()]);
+        }
+        if self.is_const {
+            out.add_tuple("fn_ptr_type_is_const", vec![id.into()]);
+        }
+        if self.is_unsafe {
+            out.add_tuple("fn_ptr_type_is_unsafe", vec![id.into()]);
+        }
+        if let Some(v) = self.param_list {
+            out.add_tuple("fn_ptr_type_param_lists", vec![id.into(), v.into()]);
+        }
+        if let Some(v) = self.ret_type {
+            out.add_tuple("fn_ptr_type_ret_types", vec![id.into(), v.into()]);
+        }
     }
 }
 
-impl trap::TrapClass for Function {
-    fn class_name() -> &'static str { "Function" }
+impl trap::TrapClass for FnPtrType {
+    fn class_name() -> &'static str { "FnPtrType" }
 }
 
-impl From<trap::Label<Function>> for trap::Label<AstNode> {
-    fn from(value: trap::Label<Function>) -> Self {
-        // SAFETY: this is safe because in the dbscheme Function is a subclass of AstNode
+impl From<trap::Label<FnPtrType>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<FnPtrType>) -> Self {
+        // SAFETY: this is safe because in the dbscheme FnPtrType is a subclass of AstNode
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<Function>> for trap::Label<Declaration> {
-    fn from(value: trap::Label<Function>) -> Self {
-        // SAFETY: this is safe because in the dbscheme Function is a subclass of Declaration
+impl From<trap::Label<FnPtrType>> for trap::Label<Element> {
+    fn from(value: trap::Label<FnPtrType>) -> Self {
+        // SAFETY: this is safe because in the dbscheme FnPtrType is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<Function>> for trap::Label<Element> {
-    fn from(value: trap::Label<Function>) -> Self {
-        // SAFETY: this is safe because in the dbscheme Function is a subclass of Element
+impl From<trap::Label<FnPtrType>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<FnPtrType>) -> Self {
+        // SAFETY: this is safe because in the dbscheme FnPtrType is a subclass of Locatable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<Function>> for trap::Label<Locatable> {
-    fn from(value: trap::Label<Function>) -> Self {
-        // SAFETY: this is safe because in the dbscheme Function is a subclass of Locatable
+impl From<trap::Label<FnPtrType>> for trap::Label<TypeRef> {
+    fn from(value: trap::Label<FnPtrType>) -> Self {
+        // SAFETY: this is safe because in the dbscheme FnPtrType is a subclass of TypeRef
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+#[derive(Debug)]
+pub struct ForExpr {
+    pub id: trap::TrapId<ForExpr>,
+    pub attrs: Vec<trap::Label<Attr>>,
+    pub iterable: Option<trap::Label<Expr>>,
+    pub label: Option<trap::Label<Label>>,
+    pub loop_body: Option<trap::Label<BlockExpr>>,
+    pub pat: Option<trap::Label<Pat>>,
+}
+
+impl trap::TrapEntry for ForExpr {
+    fn extract_id(&mut self) -> trap::TrapId<Self> {
+        std::mem::replace(&mut self.id, trap::TrapId::Star)
+    }
+
+    fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
+        out.add_tuple("for_exprs", vec![id.into()]);
+        for (i, v) in self.attrs.into_iter().enumerate() {
+            out.add_tuple("for_expr_attrs", vec![id.into(), i.into(), v.into()]);
+        }
+        if let Some(v) = self.iterable {
+            out.add_tuple("for_expr_iterables", vec![id.into(), v.into()]);
+        }
+        if let Some(v) = self.label {
+            out.add_tuple("for_expr_labels", vec![id.into(), v.into()]);
+        }
+        if let Some(v) = self.loop_body {
+            out.add_tuple("for_expr_loop_bodies", vec![id.into(), v.into()]);
+        }
+        if let Some(v) = self.pat {
+            out.add_tuple("for_expr_pats", vec![id.into(), v.into()]);
+        }
+    }
+}
+
+impl trap::TrapClass for ForExpr {
+    fn class_name() -> &'static str { "ForExpr" }
+}
+
+impl From<trap::Label<ForExpr>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<ForExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme ForExpr is a subclass of AstNode
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<ForExpr>> for trap::Label<Element> {
+    fn from(value: trap::Label<ForExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme ForExpr is a subclass of Element
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<ForExpr>> for trap::Label<Expr> {
+    fn from(value: trap::Label<ForExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme ForExpr is a subclass of Expr
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<ForExpr>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<ForExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme ForExpr is a subclass of Locatable
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+#[derive(Debug)]
+pub struct ForType {
+    pub id: trap::TrapId<ForType>,
+    pub generic_param_list: Option<trap::Label<GenericParamList>>,
+    pub ty: Option<trap::Label<TypeRef>>,
+}
+
+impl trap::TrapEntry for ForType {
+    fn extract_id(&mut self) -> trap::TrapId<Self> {
+        std::mem::replace(&mut self.id, trap::TrapId::Star)
+    }
+
+    fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
+        out.add_tuple("for_types", vec![id.into()]);
+        if let Some(v) = self.generic_param_list {
+            out.add_tuple("for_type_generic_param_lists", vec![id.into(), v.into()]);
+        }
+        if let Some(v) = self.ty {
+            out.add_tuple("for_type_ties", vec![id.into(), v.into()]);
+        }
+    }
+}
+
+impl trap::TrapClass for ForType {
+    fn class_name() -> &'static str { "ForType" }
+}
+
+impl From<trap::Label<ForType>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<ForType>) -> Self {
+        // SAFETY: this is safe because in the dbscheme ForType is a subclass of AstNode
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<ForType>> for trap::Label<Element> {
+    fn from(value: trap::Label<ForType>) -> Self {
+        // SAFETY: this is safe because in the dbscheme ForType is a subclass of Element
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<ForType>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<ForType>) -> Self {
+        // SAFETY: this is safe because in the dbscheme ForType is a subclass of Locatable
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<ForType>> for trap::Label<TypeRef> {
+    fn from(value: trap::Label<ForType>) -> Self {
+        // SAFETY: this is safe because in the dbscheme ForType is a subclass of TypeRef
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+#[derive(Debug)]
+pub struct FormatArgsExpr {
+    pub id: trap::TrapId<FormatArgsExpr>,
+    pub args: Vec<trap::Label<FormatArgsArg>>,
+    pub attrs: Vec<trap::Label<Attr>>,
+    pub template: Option<trap::Label<Expr>>,
+}
+
+impl trap::TrapEntry for FormatArgsExpr {
+    fn extract_id(&mut self) -> trap::TrapId<Self> {
+        std::mem::replace(&mut self.id, trap::TrapId::Star)
+    }
+
+    fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
+        out.add_tuple("format_args_exprs", vec![id.into()]);
+        for (i, v) in self.args.into_iter().enumerate() {
+            out.add_tuple("format_args_expr_args", vec![id.into(), i.into(), v.into()]);
+        }
+        for (i, v) in self.attrs.into_iter().enumerate() {
+            out.add_tuple("format_args_expr_attrs", vec![id.into(), i.into(), v.into()]);
+        }
+        if let Some(v) = self.template {
+            out.add_tuple("format_args_expr_templates", vec![id.into(), v.into()]);
+        }
+    }
+}
+
+impl trap::TrapClass for FormatArgsExpr {
+    fn class_name() -> &'static str { "FormatArgsExpr" }
+}
+
+impl From<trap::Label<FormatArgsExpr>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<FormatArgsExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme FormatArgsExpr is a subclass of AstNode
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<FormatArgsExpr>> for trap::Label<Element> {
+    fn from(value: trap::Label<FormatArgsExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme FormatArgsExpr is a subclass of Element
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<FormatArgsExpr>> for trap::Label<Expr> {
+    fn from(value: trap::Label<FormatArgsExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme FormatArgsExpr is a subclass of Expr
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<FormatArgsExpr>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<FormatArgsExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme FormatArgsExpr is a subclass of Locatable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -1699,8 +4790,11 @@ impl From<trap::Label<Function>> for trap::Label<Locatable> {
 #[derive(Debug)]
 pub struct IdentPat {
     pub id: trap::TrapId<IdentPat>,
-    pub binding_id: String,
-    pub subpat: Option<trap::Label<Pat>>,
+    pub attrs: Vec<trap::Label<Attr>>,
+    pub is_mut: bool,
+    pub is_ref: bool,
+    pub name: Option<trap::Label<Name>>,
+    pub pat: Option<trap::Label<Pat>>,
 }
 
 impl trap::TrapEntry for IdentPat {
@@ -1709,9 +4803,21 @@ impl trap::TrapEntry for IdentPat {
     }
 
     fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
-        out.add_tuple("ident_pats", vec![id.into(), self.binding_id.into()]);
-        if let Some(v) = self.subpat {
-            out.add_tuple("ident_pat_subpats", vec![id.into(), v.into()]);
+        out.add_tuple("ident_pats", vec![id.into()]);
+        for (i, v) in self.attrs.into_iter().enumerate() {
+            out.add_tuple("ident_pat_attrs", vec![id.into(), i.into(), v.into()]);
+        }
+        if self.is_mut {
+            out.add_tuple("ident_pat_is_mut", vec![id.into()]);
+        }
+        if self.is_ref {
+            out.add_tuple("ident_pat_is_ref", vec![id.into()]);
+        }
+        if let Some(v) = self.name {
+            out.add_tuple("ident_pat_names", vec![id.into(), v.into()]);
+        }
+        if let Some(v) = self.pat {
+            out.add_tuple("ident_pat_pats", vec![id.into(), v.into()]);
         }
     }
 }
@@ -1759,9 +4865,10 @@ impl From<trap::Label<IdentPat>> for trap::Label<Pat> {
 #[derive(Debug)]
 pub struct IfExpr {
     pub id: trap::TrapId<IfExpr>,
-    pub condition: trap::Label<Expr>,
-    pub then: trap::Label<Expr>,
+    pub attrs: Vec<trap::Label<Attr>>,
+    pub condition: Option<trap::Label<Expr>>,
     pub else_: Option<trap::Label<Expr>>,
+    pub then: Option<trap::Label<BlockExpr>>,
 }
 
 impl trap::TrapEntry for IfExpr {
@@ -1770,10 +4877,19 @@ impl trap::TrapEntry for IfExpr {
     }
 
     fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
-        out.add_tuple("if_exprs", vec![id.into(), self.condition.into(), self.then.into()]);
+        out.add_tuple("if_exprs", vec![id.into()]);
+        for (i, v) in self.attrs.into_iter().enumerate() {
+            out.add_tuple("if_expr_attrs", vec![id.into(), i.into(), v.into()]);
+        }
+        if let Some(v) = self.condition {
+            out.add_tuple("if_expr_conditions", vec![id.into(), v.into()]);
+        }
         if let Some(v) = self.else_ {
             out.add_tuple("if_expr_elses", vec![id.into(), v.into()]);
         }
+        if let Some(v) = self.then {
+            out.add_tuple("if_expr_thens", vec![id.into(), v.into()]);
+        }
     }
 }
 
@@ -1817,12 +4933,71 @@ impl From<trap::Label<IfExpr>> for trap::Label<Locatable> {
     }
 }
 
+#[derive(Debug)]
+pub struct ImplTraitType {
+    pub id: trap::TrapId<ImplTraitType>,
+    pub type_bound_list: Option<trap::Label<TypeBoundList>>,
+}
+
+impl trap::TrapEntry for ImplTraitType {
+    fn extract_id(&mut self) -> trap::TrapId<Self> {
+        std::mem::replace(&mut self.id, trap::TrapId::Star)
+    }
+
+    fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
+        out.add_tuple("impl_trait_types", vec![id.into()]);
+        if let Some(v) = self.type_bound_list {
+            out.add_tuple("impl_trait_type_type_bound_lists", vec![id.into(), v.into()]);
+        }
+    }
+}
+
+impl trap::TrapClass for ImplTraitType {
+    fn class_name() -> &'static str { "ImplTraitType" }
+}
+
+impl From<trap::Label<ImplTraitType>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<ImplTraitType>) -> Self {
+        // SAFETY: this is safe because in the dbscheme ImplTraitType is a subclass of AstNode
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<ImplTraitType>> for trap::Label<Element> {
+    fn from(value: trap::Label<ImplTraitType>) -> Self {
+        // SAFETY: this is safe because in the dbscheme ImplTraitType is a subclass of Element
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<ImplTraitType>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<ImplTraitType>) -> Self {
+        // SAFETY: this is safe because in the dbscheme ImplTraitType is a subclass of Locatable
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<ImplTraitType>> for trap::Label<TypeRef> {
+    fn from(value: trap::Label<ImplTraitType>) -> Self {
+        // SAFETY: this is safe because in the dbscheme ImplTraitType is a subclass of TypeRef
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
 #[derive(Debug)]
 pub struct IndexExpr {
     pub id: trap::TrapId<IndexExpr>,
-    pub base: trap::Label<Expr>,
-    pub index: trap::Label<Expr>,
-    pub is_assignee_expr: bool,
+    pub attrs: Vec<trap::Label<Attr>>,
+    pub base: Option<trap::Label<Expr>>,
+    pub index: Option<trap::Label<Expr>>,
 }
 
 impl trap::TrapEntry for IndexExpr {
@@ -1831,9 +5006,15 @@ impl trap::TrapEntry for IndexExpr {
     }
 
     fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
-        out.add_tuple("index_exprs", vec![id.into(), self.base.into(), self.index.into()]);
-        if self.is_assignee_expr {
-            out.add_tuple("index_expr_is_assignee_expr", vec![id.into()]);
+        out.add_tuple("index_exprs", vec![id.into()]);
+        for (i, v) in self.attrs.into_iter().enumerate() {
+            out.add_tuple("index_expr_attrs", vec![id.into(), i.into(), v.into()]);
+        }
+        if let Some(v) = self.base {
+            out.add_tuple("index_expr_bases", vec![id.into(), v.into()]);
+        }
+        if let Some(v) = self.index {
+            out.add_tuple("index_expr_indices", vec![id.into(), v.into()]);
         }
     }
 }
@@ -1879,54 +5060,108 @@ impl From<trap::Label<IndexExpr>> for trap::Label<Locatable> {
 }
 
 #[derive(Debug)]
-pub struct ItemStmt {
-    pub id: trap::TrapId<ItemStmt>,
+pub struct InferType {
+    pub id: trap::TrapId<InferType>,
 }
 
-impl trap::TrapEntry for ItemStmt {
+impl trap::TrapEntry for InferType {
     fn extract_id(&mut self) -> trap::TrapId<Self> {
         std::mem::replace(&mut self.id, trap::TrapId::Star)
     }
 
     fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
-        out.add_tuple("item_stmts", vec![id.into()]);
+        out.add_tuple("infer_types", vec![id.into()]);
     }
 }
 
-impl trap::TrapClass for ItemStmt {
-    fn class_name() -> &'static str { "ItemStmt" }
+impl trap::TrapClass for InferType {
+    fn class_name() -> &'static str { "InferType" }
 }
 
-impl From<trap::Label<ItemStmt>> for trap::Label<AstNode> {
-    fn from(value: trap::Label<ItemStmt>) -> Self {
-        // SAFETY: this is safe because in the dbscheme ItemStmt is a subclass of AstNode
+impl From<trap::Label<InferType>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<InferType>) -> Self {
+        // SAFETY: this is safe because in the dbscheme InferType is a subclass of AstNode
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<ItemStmt>> for trap::Label<Element> {
-    fn from(value: trap::Label<ItemStmt>) -> Self {
-        // SAFETY: this is safe because in the dbscheme ItemStmt is a subclass of Element
+impl From<trap::Label<InferType>> for trap::Label<Element> {
+    fn from(value: trap::Label<InferType>) -> Self {
+        // SAFETY: this is safe because in the dbscheme InferType is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<ItemStmt>> for trap::Label<Locatable> {
-    fn from(value: trap::Label<ItemStmt>) -> Self {
-        // SAFETY: this is safe because in the dbscheme ItemStmt is a subclass of Locatable
+impl From<trap::Label<InferType>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<InferType>) -> Self {
+        // SAFETY: this is safe because in the dbscheme InferType is a subclass of Locatable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<ItemStmt>> for trap::Label<Stmt> {
-    fn from(value: trap::Label<ItemStmt>) -> Self {
-        // SAFETY: this is safe because in the dbscheme ItemStmt is a subclass of Stmt
+impl From<trap::Label<InferType>> for trap::Label<TypeRef> {
+    fn from(value: trap::Label<InferType>) -> Self {
+        // SAFETY: this is safe because in the dbscheme InferType is a subclass of TypeRef
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+#[derive(Debug)]
+pub struct Item {
+    _unused: ()
+}
+
+impl Item {
+    pub fn emit_extended_canonical_path(id: trap::Label<Self>, value: String, out: &mut trap::Writer) {
+        out.add_tuple("item_extended_canonical_paths", vec![id.into(), value.into()]);
+    }
+    pub fn emit_crate_origin(id: trap::Label<Self>, value: String, out: &mut trap::Writer) {
+        out.add_tuple("item_crate_origins", vec![id.into(), value.into()]);
+    }
+}
+
+impl trap::TrapClass for Item {
+    fn class_name() -> &'static str { "Item" }
+}
+
+impl From<trap::Label<Item>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<Item>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Item is a subclass of AstNode
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<Item>> for trap::Label<Element> {
+    fn from(value: trap::Label<Item>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Item is a subclass of Element
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<Item>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<Item>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Item is a subclass of Locatable
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<Item>> for trap::Label<Stmt> {
+    fn from(value: trap::Label<Item>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Item is a subclass of Stmt
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -1936,8 +5171,9 @@ impl From<trap::Label<ItemStmt>> for trap::Label<Stmt> {
 #[derive(Debug)]
 pub struct LetExpr {
     pub id: trap::TrapId<LetExpr>,
-    pub pat: trap::Label<Pat>,
-    pub expr: trap::Label<Expr>,
+    pub attrs: Vec<trap::Label<Attr>>,
+    pub expr: Option<trap::Label<Expr>>,
+    pub pat: Option<trap::Label<Pat>>,
 }
 
 impl trap::TrapEntry for LetExpr {
@@ -1946,7 +5182,16 @@ impl trap::TrapEntry for LetExpr {
     }
 
     fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
-        out.add_tuple("let_exprs", vec![id.into(), self.pat.into(), self.expr.into()]);
+        out.add_tuple("let_exprs", vec![id.into()]);
+        for (i, v) in self.attrs.into_iter().enumerate() {
+            out.add_tuple("let_expr_attrs", vec![id.into(), i.into(), v.into()]);
+        }
+        if let Some(v) = self.expr {
+            out.add_tuple("let_expr_exprs", vec![id.into(), v.into()]);
+        }
+        if let Some(v) = self.pat {
+            out.add_tuple("let_expr_pats", vec![id.into(), v.into()]);
+        }
     }
 }
 
@@ -1993,10 +5238,11 @@ impl From<trap::Label<LetExpr>> for trap::Label<Locatable> {
 #[derive(Debug)]
 pub struct LetStmt {
     pub id: trap::TrapId<LetStmt>,
-    pub pat: trap::Label<Pat>,
-    pub type_: Option<trap::Label<TypeRef>>,
+    pub attrs: Vec<trap::Label<Attr>>,
     pub initializer: Option<trap::Label<Expr>>,
-    pub else_: Option<trap::Label<Expr>>,
+    pub let_else: Option<trap::Label<LetElse>>,
+    pub pat: Option<trap::Label<Pat>>,
+    pub ty: Option<trap::Label<TypeRef>>,
 }
 
 impl trap::TrapEntry for LetStmt {
@@ -2005,15 +5251,21 @@ impl trap::TrapEntry for LetStmt {
     }
 
     fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
-        out.add_tuple("let_stmts", vec![id.into(), self.pat.into()]);
-        if let Some(v) = self.type_ {
-            out.add_tuple("let_stmt_types", vec![id.into(), v.into()]);
+        out.add_tuple("let_stmts", vec![id.into()]);
+        for (i, v) in self.attrs.into_iter().enumerate() {
+            out.add_tuple("let_stmt_attrs", vec![id.into(), i.into(), v.into()]);
         }
         if let Some(v) = self.initializer {
             out.add_tuple("let_stmt_initializers", vec![id.into(), v.into()]);
         }
-        if let Some(v) = self.else_ {
-            out.add_tuple("let_stmt_elses", vec![id.into(), v.into()]);
+        if let Some(v) = self.let_else {
+            out.add_tuple("let_stmt_let_elses", vec![id.into(), v.into()]);
+        }
+        if let Some(v) = self.pat {
+            out.add_tuple("let_stmt_pats", vec![id.into(), v.into()]);
+        }
+        if let Some(v) = self.ty {
+            out.add_tuple("let_stmt_ties", vec![id.into(), v.into()]);
         }
     }
 }
@@ -2058,9 +5310,137 @@ impl From<trap::Label<LetStmt>> for trap::Label<Stmt> {
     }
 }
 
+#[derive(Debug)]
+pub struct LifetimeArg {
+    pub id: trap::TrapId<LifetimeArg>,
+    pub lifetime: Option<trap::Label<Lifetime>>,
+}
+
+impl trap::TrapEntry for LifetimeArg {
+    fn extract_id(&mut self) -> trap::TrapId<Self> {
+        std::mem::replace(&mut self.id, trap::TrapId::Star)
+    }
+
+    fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
+        out.add_tuple("lifetime_args", vec![id.into()]);
+        if let Some(v) = self.lifetime {
+            out.add_tuple("lifetime_arg_lifetimes", vec![id.into(), v.into()]);
+        }
+    }
+}
+
+impl trap::TrapClass for LifetimeArg {
+    fn class_name() -> &'static str { "LifetimeArg" }
+}
+
+impl From<trap::Label<LifetimeArg>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<LifetimeArg>) -> Self {
+        // SAFETY: this is safe because in the dbscheme LifetimeArg is a subclass of AstNode
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<LifetimeArg>> for trap::Label<Element> {
+    fn from(value: trap::Label<LifetimeArg>) -> Self {
+        // SAFETY: this is safe because in the dbscheme LifetimeArg is a subclass of Element
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<LifetimeArg>> for trap::Label<GenericArg> {
+    fn from(value: trap::Label<LifetimeArg>) -> Self {
+        // SAFETY: this is safe because in the dbscheme LifetimeArg is a subclass of GenericArg
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<LifetimeArg>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<LifetimeArg>) -> Self {
+        // SAFETY: this is safe because in the dbscheme LifetimeArg is a subclass of Locatable
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+#[derive(Debug)]
+pub struct LifetimeParam {
+    pub id: trap::TrapId<LifetimeParam>,
+    pub attrs: Vec<trap::Label<Attr>>,
+    pub lifetime: Option<trap::Label<Lifetime>>,
+    pub type_bound_list: Option<trap::Label<TypeBoundList>>,
+}
+
+impl trap::TrapEntry for LifetimeParam {
+    fn extract_id(&mut self) -> trap::TrapId<Self> {
+        std::mem::replace(&mut self.id, trap::TrapId::Star)
+    }
+
+    fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
+        out.add_tuple("lifetime_params", vec![id.into()]);
+        for (i, v) in self.attrs.into_iter().enumerate() {
+            out.add_tuple("lifetime_param_attrs", vec![id.into(), i.into(), v.into()]);
+        }
+        if let Some(v) = self.lifetime {
+            out.add_tuple("lifetime_param_lifetimes", vec![id.into(), v.into()]);
+        }
+        if let Some(v) = self.type_bound_list {
+            out.add_tuple("lifetime_param_type_bound_lists", vec![id.into(), v.into()]);
+        }
+    }
+}
+
+impl trap::TrapClass for LifetimeParam {
+    fn class_name() -> &'static str { "LifetimeParam" }
+}
+
+impl From<trap::Label<LifetimeParam>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<LifetimeParam>) -> Self {
+        // SAFETY: this is safe because in the dbscheme LifetimeParam is a subclass of AstNode
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<LifetimeParam>> for trap::Label<Element> {
+    fn from(value: trap::Label<LifetimeParam>) -> Self {
+        // SAFETY: this is safe because in the dbscheme LifetimeParam is a subclass of Element
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<LifetimeParam>> for trap::Label<GenericParam> {
+    fn from(value: trap::Label<LifetimeParam>) -> Self {
+        // SAFETY: this is safe because in the dbscheme LifetimeParam is a subclass of GenericParam
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<LifetimeParam>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<LifetimeParam>) -> Self {
+        // SAFETY: this is safe because in the dbscheme LifetimeParam is a subclass of Locatable
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
 #[derive(Debug)]
 pub struct LiteralExpr {
     pub id: trap::TrapId<LiteralExpr>,
+    pub attrs: Vec<trap::Label<Attr>>,
+    pub text_value: Option<String>,
 }
 
 impl trap::TrapEntry for LiteralExpr {
@@ -2070,6 +5450,12 @@ impl trap::TrapEntry for LiteralExpr {
 
     fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
         out.add_tuple("literal_exprs", vec![id.into()]);
+        for (i, v) in self.attrs.into_iter().enumerate() {
+            out.add_tuple("literal_expr_attrs", vec![id.into(), i.into(), v.into()]);
+        }
+        if let Some(v) = self.text_value {
+            out.add_tuple("literal_expr_text_values", vec![id.into(), v.into()]);
+        }
     }
 }
 
@@ -2116,7 +5502,7 @@ impl From<trap::Label<LiteralExpr>> for trap::Label<Locatable> {
 #[derive(Debug)]
 pub struct LiteralPat {
     pub id: trap::TrapId<LiteralPat>,
-    pub expr: trap::Label<Expr>,
+    pub literal: Option<trap::Label<LiteralExpr>>,
 }
 
 impl trap::TrapEntry for LiteralPat {
@@ -2125,7 +5511,10 @@ impl trap::TrapEntry for LiteralPat {
     }
 
     fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
-        out.add_tuple("literal_pats", vec![id.into(), self.expr.into()]);
+        out.add_tuple("literal_pats", vec![id.into()]);
+        if let Some(v) = self.literal {
+            out.add_tuple("literal_pat_literals", vec![id.into(), v.into()]);
+        }
     }
 }
 
@@ -2172,8 +5561,9 @@ impl From<trap::Label<LiteralPat>> for trap::Label<Pat> {
 #[derive(Debug)]
 pub struct LoopExpr {
     pub id: trap::TrapId<LoopExpr>,
-    pub body: trap::Label<Expr>,
+    pub attrs: Vec<trap::Label<Attr>>,
     pub label: Option<trap::Label<Label>>,
+    pub loop_body: Option<trap::Label<BlockExpr>>,
 }
 
 impl trap::TrapEntry for LoopExpr {
@@ -2182,10 +5572,16 @@ impl trap::TrapEntry for LoopExpr {
     }
 
     fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
-        out.add_tuple("loop_exprs", vec![id.into(), self.body.into()]);
+        out.add_tuple("loop_exprs", vec![id.into()]);
+        for (i, v) in self.attrs.into_iter().enumerate() {
+            out.add_tuple("loop_expr_attrs", vec![id.into(), i.into(), v.into()]);
+        }
         if let Some(v) = self.label {
             out.add_tuple("loop_expr_labels", vec![id.into(), v.into()]);
         }
+        if let Some(v) = self.loop_body {
+            out.add_tuple("loop_expr_loop_bodies", vec![id.into(), v.into()]);
+        }
     }
 }
 
@@ -2229,11 +5625,189 @@ impl From<trap::Label<LoopExpr>> for trap::Label<Locatable> {
     }
 }
 
+#[derive(Debug)]
+pub struct MacroExpr {
+    pub id: trap::TrapId<MacroExpr>,
+    pub macro_call: Option<trap::Label<MacroCall>>,
+}
+
+impl trap::TrapEntry for MacroExpr {
+    fn extract_id(&mut self) -> trap::TrapId<Self> {
+        std::mem::replace(&mut self.id, trap::TrapId::Star)
+    }
+
+    fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
+        out.add_tuple("macro_exprs", vec![id.into()]);
+        if let Some(v) = self.macro_call {
+            out.add_tuple("macro_expr_macro_calls", vec![id.into(), v.into()]);
+        }
+    }
+}
+
+impl trap::TrapClass for MacroExpr {
+    fn class_name() -> &'static str { "MacroExpr" }
+}
+
+impl From<trap::Label<MacroExpr>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<MacroExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme MacroExpr is a subclass of AstNode
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<MacroExpr>> for trap::Label<Element> {
+    fn from(value: trap::Label<MacroExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme MacroExpr is a subclass of Element
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<MacroExpr>> for trap::Label<Expr> {
+    fn from(value: trap::Label<MacroExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme MacroExpr is a subclass of Expr
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<MacroExpr>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<MacroExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme MacroExpr is a subclass of Locatable
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+#[derive(Debug)]
+pub struct MacroPat {
+    pub id: trap::TrapId<MacroPat>,
+    pub macro_call: Option<trap::Label<MacroCall>>,
+}
+
+impl trap::TrapEntry for MacroPat {
+    fn extract_id(&mut self) -> trap::TrapId<Self> {
+        std::mem::replace(&mut self.id, trap::TrapId::Star)
+    }
+
+    fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
+        out.add_tuple("macro_pats", vec![id.into()]);
+        if let Some(v) = self.macro_call {
+            out.add_tuple("macro_pat_macro_calls", vec![id.into(), v.into()]);
+        }
+    }
+}
+
+impl trap::TrapClass for MacroPat {
+    fn class_name() -> &'static str { "MacroPat" }
+}
+
+impl From<trap::Label<MacroPat>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<MacroPat>) -> Self {
+        // SAFETY: this is safe because in the dbscheme MacroPat is a subclass of AstNode
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<MacroPat>> for trap::Label<Element> {
+    fn from(value: trap::Label<MacroPat>) -> Self {
+        // SAFETY: this is safe because in the dbscheme MacroPat is a subclass of Element
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<MacroPat>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<MacroPat>) -> Self {
+        // SAFETY: this is safe because in the dbscheme MacroPat is a subclass of Locatable
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<MacroPat>> for trap::Label<Pat> {
+    fn from(value: trap::Label<MacroPat>) -> Self {
+        // SAFETY: this is safe because in the dbscheme MacroPat is a subclass of Pat
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+#[derive(Debug)]
+pub struct MacroType {
+    pub id: trap::TrapId<MacroType>,
+    pub macro_call: Option<trap::Label<MacroCall>>,
+}
+
+impl trap::TrapEntry for MacroType {
+    fn extract_id(&mut self) -> trap::TrapId<Self> {
+        std::mem::replace(&mut self.id, trap::TrapId::Star)
+    }
+
+    fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
+        out.add_tuple("macro_types", vec![id.into()]);
+        if let Some(v) = self.macro_call {
+            out.add_tuple("macro_type_macro_calls", vec![id.into(), v.into()]);
+        }
+    }
+}
+
+impl trap::TrapClass for MacroType {
+    fn class_name() -> &'static str { "MacroType" }
+}
+
+impl From<trap::Label<MacroType>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<MacroType>) -> Self {
+        // SAFETY: this is safe because in the dbscheme MacroType is a subclass of AstNode
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<MacroType>> for trap::Label<Element> {
+    fn from(value: trap::Label<MacroType>) -> Self {
+        // SAFETY: this is safe because in the dbscheme MacroType is a subclass of Element
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<MacroType>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<MacroType>) -> Self {
+        // SAFETY: this is safe because in the dbscheme MacroType is a subclass of Locatable
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<MacroType>> for trap::Label<TypeRef> {
+    fn from(value: trap::Label<MacroType>) -> Self {
+        // SAFETY: this is safe because in the dbscheme MacroType is a subclass of TypeRef
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
 #[derive(Debug)]
 pub struct MatchExpr {
     pub id: trap::TrapId<MatchExpr>,
-    pub expr: trap::Label<Expr>,
-    pub branches: Vec<trap::Label<MatchArm>>,
+    pub attrs: Vec<trap::Label<Attr>>,
+    pub expr: Option<trap::Label<Expr>>,
+    pub match_arm_list: Option<trap::Label<MatchArmList>>,
 }
 
 impl trap::TrapEntry for MatchExpr {
@@ -2242,9 +5816,15 @@ impl trap::TrapEntry for MatchExpr {
     }
 
     fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
-        out.add_tuple("match_exprs", vec![id.into(), self.expr.into()]);
-        for (i, v) in self.branches.into_iter().enumerate() {
-            out.add_tuple("match_expr_branches", vec![id.into(), i.into(), v.into()]);
+        out.add_tuple("match_exprs", vec![id.into()]);
+        for (i, v) in self.attrs.into_iter().enumerate() {
+            out.add_tuple("match_expr_attrs", vec![id.into(), i.into(), v.into()]);
+        }
+        if let Some(v) = self.expr {
+            out.add_tuple("match_expr_exprs", vec![id.into(), v.into()]);
+        }
+        if let Some(v) = self.match_arm_list {
+            out.add_tuple("match_expr_match_arm_lists", vec![id.into(), v.into()]);
         }
     }
 }
@@ -2290,269 +5870,54 @@ impl From<trap::Label<MatchExpr>> for trap::Label<Locatable> {
 }
 
 #[derive(Debug)]
-pub struct MethodCallExpr {
-    pub id: trap::TrapId<MethodCallExpr>,
-    pub receiver: trap::Label<Expr>,
-    pub method_name: String,
-    pub args: Vec<trap::Label<Expr>>,
-    pub generic_args: Option<trap::Label<GenericArgList>>,
+pub struct NeverType {
+    pub id: trap::TrapId<NeverType>,
 }
 
-impl trap::TrapEntry for MethodCallExpr {
+impl trap::TrapEntry for NeverType {
     fn extract_id(&mut self) -> trap::TrapId<Self> {
         std::mem::replace(&mut self.id, trap::TrapId::Star)
     }
 
     fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
-        out.add_tuple("method_call_exprs", vec![id.into(), self.receiver.into(), self.method_name.into()]);
-        for (i, v) in self.args.into_iter().enumerate() {
-            out.add_tuple("method_call_expr_args", vec![id.into(), i.into(), v.into()]);
-        }
-        if let Some(v) = self.generic_args {
-            out.add_tuple("method_call_expr_generic_args", vec![id.into(), v.into()]);
-        }
+        out.add_tuple("never_types", vec![id.into()]);
     }
 }
 
-impl trap::TrapClass for MethodCallExpr {
-    fn class_name() -> &'static str { "MethodCallExpr" }
+impl trap::TrapClass for NeverType {
+    fn class_name() -> &'static str { "NeverType" }
 }
 
-impl From<trap::Label<MethodCallExpr>> for trap::Label<AstNode> {
-    fn from(value: trap::Label<MethodCallExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme MethodCallExpr is a subclass of AstNode
+impl From<trap::Label<NeverType>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<NeverType>) -> Self {
+        // SAFETY: this is safe because in the dbscheme NeverType is a subclass of AstNode
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<MethodCallExpr>> for trap::Label<Element> {
-    fn from(value: trap::Label<MethodCallExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme MethodCallExpr is a subclass of Element
+impl From<trap::Label<NeverType>> for trap::Label<Element> {
+    fn from(value: trap::Label<NeverType>) -> Self {
+        // SAFETY: this is safe because in the dbscheme NeverType is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<MethodCallExpr>> for trap::Label<Expr> {
-    fn from(value: trap::Label<MethodCallExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme MethodCallExpr is a subclass of Expr
+impl From<trap::Label<NeverType>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<NeverType>) -> Self {
+        // SAFETY: this is safe because in the dbscheme NeverType is a subclass of Locatable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<MethodCallExpr>> for trap::Label<Locatable> {
-    fn from(value: trap::Label<MethodCallExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme MethodCallExpr is a subclass of Locatable
-        unsafe {
-            Self::from_untyped(value.as_untyped())
-        }
-    }
-}
-
-#[derive(Debug)]
-pub struct MissingExpr {
-    pub id: trap::TrapId<MissingExpr>,
-}
-
-impl trap::TrapEntry for MissingExpr {
-    fn extract_id(&mut self) -> trap::TrapId<Self> {
-        std::mem::replace(&mut self.id, trap::TrapId::Star)
-    }
-
-    fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
-        out.add_tuple("missing_exprs", vec![id.into()]);
-    }
-}
-
-impl trap::TrapClass for MissingExpr {
-    fn class_name() -> &'static str { "MissingExpr" }
-}
-
-impl From<trap::Label<MissingExpr>> for trap::Label<AstNode> {
-    fn from(value: trap::Label<MissingExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme MissingExpr is a subclass of AstNode
-        unsafe {
-            Self::from_untyped(value.as_untyped())
-        }
-    }
-}
-
-impl From<trap::Label<MissingExpr>> for trap::Label<Element> {
-    fn from(value: trap::Label<MissingExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme MissingExpr is a subclass of Element
-        unsafe {
-            Self::from_untyped(value.as_untyped())
-        }
-    }
-}
-
-impl From<trap::Label<MissingExpr>> for trap::Label<Expr> {
-    fn from(value: trap::Label<MissingExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme MissingExpr is a subclass of Expr
-        unsafe {
-            Self::from_untyped(value.as_untyped())
-        }
-    }
-}
-
-impl From<trap::Label<MissingExpr>> for trap::Label<Locatable> {
-    fn from(value: trap::Label<MissingExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme MissingExpr is a subclass of Locatable
-        unsafe {
-            Self::from_untyped(value.as_untyped())
-        }
-    }
-}
-
-impl From<trap::Label<MissingExpr>> for trap::Label<Missing> {
-    fn from(value: trap::Label<MissingExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme MissingExpr is a subclass of Missing
-        unsafe {
-            Self::from_untyped(value.as_untyped())
-        }
-    }
-}
-
-impl From<trap::Label<MissingExpr>> for trap::Label<Unextracted> {
-    fn from(value: trap::Label<MissingExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme MissingExpr is a subclass of Unextracted
-        unsafe {
-            Self::from_untyped(value.as_untyped())
-        }
-    }
-}
-
-#[derive(Debug)]
-pub struct MissingPat {
-    pub id: trap::TrapId<MissingPat>,
-}
-
-impl trap::TrapEntry for MissingPat {
-    fn extract_id(&mut self) -> trap::TrapId<Self> {
-        std::mem::replace(&mut self.id, trap::TrapId::Star)
-    }
-
-    fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
-        out.add_tuple("missing_pats", vec![id.into()]);
-    }
-}
-
-impl trap::TrapClass for MissingPat {
-    fn class_name() -> &'static str { "MissingPat" }
-}
-
-impl From<trap::Label<MissingPat>> for trap::Label<AstNode> {
-    fn from(value: trap::Label<MissingPat>) -> Self {
-        // SAFETY: this is safe because in the dbscheme MissingPat is a subclass of AstNode
-        unsafe {
-            Self::from_untyped(value.as_untyped())
-        }
-    }
-}
-
-impl From<trap::Label<MissingPat>> for trap::Label<Element> {
-    fn from(value: trap::Label<MissingPat>) -> Self {
-        // SAFETY: this is safe because in the dbscheme MissingPat is a subclass of Element
-        unsafe {
-            Self::from_untyped(value.as_untyped())
-        }
-    }
-}
-
-impl From<trap::Label<MissingPat>> for trap::Label<Locatable> {
-    fn from(value: trap::Label<MissingPat>) -> Self {
-        // SAFETY: this is safe because in the dbscheme MissingPat is a subclass of Locatable
-        unsafe {
-            Self::from_untyped(value.as_untyped())
-        }
-    }
-}
-
-impl From<trap::Label<MissingPat>> for trap::Label<Missing> {
-    fn from(value: trap::Label<MissingPat>) -> Self {
-        // SAFETY: this is safe because in the dbscheme MissingPat is a subclass of Missing
-        unsafe {
-            Self::from_untyped(value.as_untyped())
-        }
-    }
-}
-
-impl From<trap::Label<MissingPat>> for trap::Label<Pat> {
-    fn from(value: trap::Label<MissingPat>) -> Self {
-        // SAFETY: this is safe because in the dbscheme MissingPat is a subclass of Pat
-        unsafe {
-            Self::from_untyped(value.as_untyped())
-        }
-    }
-}
-
-impl From<trap::Label<MissingPat>> for trap::Label<Unextracted> {
-    fn from(value: trap::Label<MissingPat>) -> Self {
-        // SAFETY: this is safe because in the dbscheme MissingPat is a subclass of Unextracted
-        unsafe {
-            Self::from_untyped(value.as_untyped())
-        }
-    }
-}
-
-#[derive(Debug)]
-pub struct Module {
-    pub id: trap::TrapId<Module>,
-    pub declarations: Vec<trap::Label<Declaration>>,
-}
-
-impl trap::TrapEntry for Module {
-    fn extract_id(&mut self) -> trap::TrapId<Self> {
-        std::mem::replace(&mut self.id, trap::TrapId::Star)
-    }
-
-    fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
-        out.add_tuple("modules", vec![id.into()]);
-        for (i, v) in self.declarations.into_iter().enumerate() {
-            out.add_tuple("module_declarations", vec![id.into(), i.into(), v.into()]);
-        }
-    }
-}
-
-impl trap::TrapClass for Module {
-    fn class_name() -> &'static str { "Module" }
-}
-
-impl From<trap::Label<Module>> for trap::Label<AstNode> {
-    fn from(value: trap::Label<Module>) -> Self {
-        // SAFETY: this is safe because in the dbscheme Module is a subclass of AstNode
-        unsafe {
-            Self::from_untyped(value.as_untyped())
-        }
-    }
-}
-
-impl From<trap::Label<Module>> for trap::Label<Declaration> {
-    fn from(value: trap::Label<Module>) -> Self {
-        // SAFETY: this is safe because in the dbscheme Module is a subclass of Declaration
-        unsafe {
-            Self::from_untyped(value.as_untyped())
-        }
-    }
-}
-
-impl From<trap::Label<Module>> for trap::Label<Element> {
-    fn from(value: trap::Label<Module>) -> Self {
-        // SAFETY: this is safe because in the dbscheme Module is a subclass of Element
-        unsafe {
-            Self::from_untyped(value.as_untyped())
-        }
-    }
-}
-
-impl From<trap::Label<Module>> for trap::Label<Locatable> {
-    fn from(value: trap::Label<Module>) -> Self {
-        // SAFETY: this is safe because in the dbscheme Module is a subclass of Locatable
+impl From<trap::Label<NeverType>> for trap::Label<TypeRef> {
+    fn from(value: trap::Label<NeverType>) -> Self {
+        // SAFETY: this is safe because in the dbscheme NeverType is a subclass of TypeRef
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -2562,8 +5927,9 @@ impl From<trap::Label<Module>> for trap::Label<Locatable> {
 #[derive(Debug)]
 pub struct OffsetOfExpr {
     pub id: trap::TrapId<OffsetOfExpr>,
-    pub container: trap::Label<TypeRef>,
-    pub fields: Vec<String>,
+    pub attrs: Vec<trap::Label<Attr>>,
+    pub fields: Vec<trap::Label<NameRef>>,
+    pub ty: Option<trap::Label<TypeRef>>,
 }
 
 impl trap::TrapEntry for OffsetOfExpr {
@@ -2572,10 +5938,16 @@ impl trap::TrapEntry for OffsetOfExpr {
     }
 
     fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
-        out.add_tuple("offset_of_exprs", vec![id.into(), self.container.into()]);
+        out.add_tuple("offset_of_exprs", vec![id.into()]);
+        for (i, v) in self.attrs.into_iter().enumerate() {
+            out.add_tuple("offset_of_expr_attrs", vec![id.into(), i.into(), v.into()]);
+        }
         for (i, v) in self.fields.into_iter().enumerate() {
             out.add_tuple("offset_of_expr_fields", vec![id.into(), i.into(), v.into()]);
         }
+        if let Some(v) = self.ty {
+            out.add_tuple("offset_of_expr_ties", vec![id.into(), v.into()]);
+        }
     }
 }
 
@@ -2622,7 +5994,7 @@ impl From<trap::Label<OffsetOfExpr>> for trap::Label<Locatable> {
 #[derive(Debug)]
 pub struct OrPat {
     pub id: trap::TrapId<OrPat>,
-    pub args: Vec<trap::Label<Pat>>,
+    pub pats: Vec<trap::Label<Pat>>,
 }
 
 impl trap::TrapEntry for OrPat {
@@ -2632,8 +6004,8 @@ impl trap::TrapEntry for OrPat {
 
     fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
         out.add_tuple("or_pats", vec![id.into()]);
-        for (i, v) in self.args.into_iter().enumerate() {
-            out.add_tuple("or_pat_args", vec![id.into(), i.into(), v.into()]);
+        for (i, v) in self.pats.into_iter().enumerate() {
+            out.add_tuple("or_pat_pats", vec![id.into(), i.into(), v.into()]);
         }
     }
 }
@@ -2679,55 +6051,288 @@ impl From<trap::Label<OrPat>> for trap::Label<Pat> {
 }
 
 #[derive(Debug)]
-pub struct PathExpr {
-    pub id: trap::TrapId<PathExpr>,
-    pub path: trap::Label<Path>,
+pub struct ParenExpr {
+    pub id: trap::TrapId<ParenExpr>,
+    pub attrs: Vec<trap::Label<Attr>>,
+    pub expr: Option<trap::Label<Expr>>,
 }
 
-impl trap::TrapEntry for PathExpr {
+impl trap::TrapEntry for ParenExpr {
     fn extract_id(&mut self) -> trap::TrapId<Self> {
         std::mem::replace(&mut self.id, trap::TrapId::Star)
     }
 
     fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
-        out.add_tuple("path_exprs", vec![id.into(), self.path.into()]);
+        out.add_tuple("paren_exprs", vec![id.into()]);
+        for (i, v) in self.attrs.into_iter().enumerate() {
+            out.add_tuple("paren_expr_attrs", vec![id.into(), i.into(), v.into()]);
+        }
+        if let Some(v) = self.expr {
+            out.add_tuple("paren_expr_exprs", vec![id.into(), v.into()]);
+        }
     }
 }
 
-impl trap::TrapClass for PathExpr {
-    fn class_name() -> &'static str { "PathExpr" }
+impl trap::TrapClass for ParenExpr {
+    fn class_name() -> &'static str { "ParenExpr" }
 }
 
-impl From<trap::Label<PathExpr>> for trap::Label<AstNode> {
-    fn from(value: trap::Label<PathExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme PathExpr is a subclass of AstNode
+impl From<trap::Label<ParenExpr>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<ParenExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme ParenExpr is a subclass of AstNode
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<PathExpr>> for trap::Label<Element> {
-    fn from(value: trap::Label<PathExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme PathExpr is a subclass of Element
+impl From<trap::Label<ParenExpr>> for trap::Label<Element> {
+    fn from(value: trap::Label<ParenExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme ParenExpr is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<PathExpr>> for trap::Label<Expr> {
-    fn from(value: trap::Label<PathExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme PathExpr is a subclass of Expr
+impl From<trap::Label<ParenExpr>> for trap::Label<Expr> {
+    fn from(value: trap::Label<ParenExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme ParenExpr is a subclass of Expr
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<PathExpr>> for trap::Label<Locatable> {
-    fn from(value: trap::Label<PathExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme PathExpr is a subclass of Locatable
+impl From<trap::Label<ParenExpr>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<ParenExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme ParenExpr is a subclass of Locatable
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+#[derive(Debug)]
+pub struct ParenPat {
+    pub id: trap::TrapId<ParenPat>,
+    pub pat: Option<trap::Label<Pat>>,
+}
+
+impl trap::TrapEntry for ParenPat {
+    fn extract_id(&mut self) -> trap::TrapId<Self> {
+        std::mem::replace(&mut self.id, trap::TrapId::Star)
+    }
+
+    fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
+        out.add_tuple("paren_pats", vec![id.into()]);
+        if let Some(v) = self.pat {
+            out.add_tuple("paren_pat_pats", vec![id.into(), v.into()]);
+        }
+    }
+}
+
+impl trap::TrapClass for ParenPat {
+    fn class_name() -> &'static str { "ParenPat" }
+}
+
+impl From<trap::Label<ParenPat>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<ParenPat>) -> Self {
+        // SAFETY: this is safe because in the dbscheme ParenPat is a subclass of AstNode
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<ParenPat>> for trap::Label<Element> {
+    fn from(value: trap::Label<ParenPat>) -> Self {
+        // SAFETY: this is safe because in the dbscheme ParenPat is a subclass of Element
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<ParenPat>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<ParenPat>) -> Self {
+        // SAFETY: this is safe because in the dbscheme ParenPat is a subclass of Locatable
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<ParenPat>> for trap::Label<Pat> {
+    fn from(value: trap::Label<ParenPat>) -> Self {
+        // SAFETY: this is safe because in the dbscheme ParenPat is a subclass of Pat
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+#[derive(Debug)]
+pub struct ParenType {
+    pub id: trap::TrapId<ParenType>,
+    pub ty: Option<trap::Label<TypeRef>>,
+}
+
+impl trap::TrapEntry for ParenType {
+    fn extract_id(&mut self) -> trap::TrapId<Self> {
+        std::mem::replace(&mut self.id, trap::TrapId::Star)
+    }
+
+    fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
+        out.add_tuple("paren_types", vec![id.into()]);
+        if let Some(v) = self.ty {
+            out.add_tuple("paren_type_ties", vec![id.into(), v.into()]);
+        }
+    }
+}
+
+impl trap::TrapClass for ParenType {
+    fn class_name() -> &'static str { "ParenType" }
+}
+
+impl From<trap::Label<ParenType>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<ParenType>) -> Self {
+        // SAFETY: this is safe because in the dbscheme ParenType is a subclass of AstNode
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<ParenType>> for trap::Label<Element> {
+    fn from(value: trap::Label<ParenType>) -> Self {
+        // SAFETY: this is safe because in the dbscheme ParenType is a subclass of Element
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<ParenType>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<ParenType>) -> Self {
+        // SAFETY: this is safe because in the dbscheme ParenType is a subclass of Locatable
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<ParenType>> for trap::Label<TypeRef> {
+    fn from(value: trap::Label<ParenType>) -> Self {
+        // SAFETY: this is safe because in the dbscheme ParenType is a subclass of TypeRef
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+#[derive(Debug)]
+pub struct Path {
+    pub id: trap::TrapId<Path>,
+    pub qualifier: Option<trap::Label<Path>>,
+    pub part: Option<trap::Label<PathSegment>>,
+}
+
+impl trap::TrapEntry for Path {
+    fn extract_id(&mut self) -> trap::TrapId<Self> {
+        std::mem::replace(&mut self.id, trap::TrapId::Star)
+    }
+
+    fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
+        out.add_tuple("paths", vec![id.into()]);
+        if let Some(v) = self.qualifier {
+            out.add_tuple("path_qualifiers", vec![id.into(), v.into()]);
+        }
+        if let Some(v) = self.part {
+            out.add_tuple("path_parts", vec![id.into(), v.into()]);
+        }
+    }
+}
+
+impl trap::TrapClass for Path {
+    fn class_name() -> &'static str { "Path" }
+}
+
+impl From<trap::Label<Path>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<Path>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Path is a subclass of AstNode
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<Path>> for trap::Label<Element> {
+    fn from(value: trap::Label<Path>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Path is a subclass of Element
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<Path>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<Path>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Path is a subclass of Locatable
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<Path>> for trap::Label<Resolvable> {
+    fn from(value: trap::Label<Path>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Path is a subclass of Resolvable
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+#[derive(Debug)]
+pub struct PathExprBase {
+    _unused: ()
+}
+
+impl trap::TrapClass for PathExprBase {
+    fn class_name() -> &'static str { "PathExprBase" }
+}
+
+impl From<trap::Label<PathExprBase>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<PathExprBase>) -> Self {
+        // SAFETY: this is safe because in the dbscheme PathExprBase is a subclass of AstNode
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<PathExprBase>> for trap::Label<Element> {
+    fn from(value: trap::Label<PathExprBase>) -> Self {
+        // SAFETY: this is safe because in the dbscheme PathExprBase is a subclass of Element
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<PathExprBase>> for trap::Label<Expr> {
+    fn from(value: trap::Label<PathExprBase>) -> Self {
+        // SAFETY: this is safe because in the dbscheme PathExprBase is a subclass of Expr
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<PathExprBase>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<PathExprBase>) -> Self {
+        // SAFETY: this is safe because in the dbscheme PathExprBase is a subclass of Locatable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -2737,7 +6342,7 @@ impl From<trap::Label<PathExpr>> for trap::Label<Locatable> {
 #[derive(Debug)]
 pub struct PathPat {
     pub id: trap::TrapId<PathPat>,
-    pub path: trap::Label<Path>,
+    pub path: Option<trap::Label<Path>>,
 }
 
 impl trap::TrapEntry for PathPat {
@@ -2746,7 +6351,10 @@ impl trap::TrapEntry for PathPat {
     }
 
     fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
-        out.add_tuple("path_pats", vec![id.into(), self.path.into()]);
+        out.add_tuple("path_pats", vec![id.into()]);
+        if let Some(v) = self.path {
+            out.add_tuple("path_pat_paths", vec![id.into(), v.into()]);
+        }
     }
 }
 
@@ -2790,11 +6398,71 @@ impl From<trap::Label<PathPat>> for trap::Label<Pat> {
     }
 }
 
+#[derive(Debug)]
+pub struct PathType {
+    pub id: trap::TrapId<PathType>,
+    pub path: Option<trap::Label<Path>>,
+}
+
+impl trap::TrapEntry for PathType {
+    fn extract_id(&mut self) -> trap::TrapId<Self> {
+        std::mem::replace(&mut self.id, trap::TrapId::Star)
+    }
+
+    fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
+        out.add_tuple("path_types", vec![id.into()]);
+        if let Some(v) = self.path {
+            out.add_tuple("path_type_paths", vec![id.into(), v.into()]);
+        }
+    }
+}
+
+impl trap::TrapClass for PathType {
+    fn class_name() -> &'static str { "PathType" }
+}
+
+impl From<trap::Label<PathType>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<PathType>) -> Self {
+        // SAFETY: this is safe because in the dbscheme PathType is a subclass of AstNode
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<PathType>> for trap::Label<Element> {
+    fn from(value: trap::Label<PathType>) -> Self {
+        // SAFETY: this is safe because in the dbscheme PathType is a subclass of Element
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<PathType>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<PathType>) -> Self {
+        // SAFETY: this is safe because in the dbscheme PathType is a subclass of Locatable
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<PathType>> for trap::Label<TypeRef> {
+    fn from(value: trap::Label<PathType>) -> Self {
+        // SAFETY: this is safe because in the dbscheme PathType is a subclass of TypeRef
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
 #[derive(Debug)]
 pub struct PrefixExpr {
     pub id: trap::TrapId<PrefixExpr>,
-    pub expr: trap::Label<Expr>,
-    pub op: String,
+    pub attrs: Vec<trap::Label<Attr>>,
+    pub expr: Option<trap::Label<Expr>>,
+    pub operator_name: Option<String>,
 }
 
 impl trap::TrapEntry for PrefixExpr {
@@ -2803,7 +6471,16 @@ impl trap::TrapEntry for PrefixExpr {
     }
 
     fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
-        out.add_tuple("prefix_exprs", vec![id.into(), self.expr.into(), self.op.into()]);
+        out.add_tuple("prefix_exprs", vec![id.into()]);
+        for (i, v) in self.attrs.into_iter().enumerate() {
+            out.add_tuple("prefix_expr_attrs", vec![id.into(), i.into(), v.into()]);
+        }
+        if let Some(v) = self.expr {
+            out.add_tuple("prefix_expr_exprs", vec![id.into(), v.into()]);
+        }
+        if let Some(v) = self.operator_name {
+            out.add_tuple("prefix_expr_operator_names", vec![id.into(), v.into()]);
+        }
     }
 }
 
@@ -2847,12 +6524,80 @@ impl From<trap::Label<PrefixExpr>> for trap::Label<Locatable> {
     }
 }
 
+#[derive(Debug)]
+pub struct PtrType {
+    pub id: trap::TrapId<PtrType>,
+    pub is_const: bool,
+    pub is_mut: bool,
+    pub ty: Option<trap::Label<TypeRef>>,
+}
+
+impl trap::TrapEntry for PtrType {
+    fn extract_id(&mut self) -> trap::TrapId<Self> {
+        std::mem::replace(&mut self.id, trap::TrapId::Star)
+    }
+
+    fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
+        out.add_tuple("ptr_types", vec![id.into()]);
+        if self.is_const {
+            out.add_tuple("ptr_type_is_const", vec![id.into()]);
+        }
+        if self.is_mut {
+            out.add_tuple("ptr_type_is_mut", vec![id.into()]);
+        }
+        if let Some(v) = self.ty {
+            out.add_tuple("ptr_type_ties", vec![id.into(), v.into()]);
+        }
+    }
+}
+
+impl trap::TrapClass for PtrType {
+    fn class_name() -> &'static str { "PtrType" }
+}
+
+impl From<trap::Label<PtrType>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<PtrType>) -> Self {
+        // SAFETY: this is safe because in the dbscheme PtrType is a subclass of AstNode
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<PtrType>> for trap::Label<Element> {
+    fn from(value: trap::Label<PtrType>) -> Self {
+        // SAFETY: this is safe because in the dbscheme PtrType is a subclass of Element
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<PtrType>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<PtrType>) -> Self {
+        // SAFETY: this is safe because in the dbscheme PtrType is a subclass of Locatable
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<PtrType>> for trap::Label<TypeRef> {
+    fn from(value: trap::Label<PtrType>) -> Self {
+        // SAFETY: this is safe because in the dbscheme PtrType is a subclass of TypeRef
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
 #[derive(Debug)]
 pub struct RangeExpr {
     pub id: trap::TrapId<RangeExpr>,
-    pub lhs: Option<trap::Label<Expr>>,
-    pub rhs: Option<trap::Label<Expr>>,
-    pub is_inclusive: bool,
+    pub attrs: Vec<trap::Label<Attr>>,
+    pub end: Option<trap::Label<Expr>>,
+    pub operator_name: Option<String>,
+    pub start: Option<trap::Label<Expr>>,
 }
 
 impl trap::TrapEntry for RangeExpr {
@@ -2862,14 +6607,17 @@ impl trap::TrapEntry for RangeExpr {
 
     fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
         out.add_tuple("range_exprs", vec![id.into()]);
-        if let Some(v) = self.lhs {
-            out.add_tuple("range_expr_lhs", vec![id.into(), v.into()]);
+        for (i, v) in self.attrs.into_iter().enumerate() {
+            out.add_tuple("range_expr_attrs", vec![id.into(), i.into(), v.into()]);
         }
-        if let Some(v) = self.rhs {
-            out.add_tuple("range_expr_rhs", vec![id.into(), v.into()]);
+        if let Some(v) = self.end {
+            out.add_tuple("range_expr_ends", vec![id.into(), v.into()]);
         }
-        if self.is_inclusive {
-            out.add_tuple("range_expr_is_inclusive", vec![id.into()]);
+        if let Some(v) = self.operator_name {
+            out.add_tuple("range_expr_operator_names", vec![id.into(), v.into()]);
+        }
+        if let Some(v) = self.start {
+            out.add_tuple("range_expr_starts", vec![id.into(), v.into()]);
         }
     }
 }
@@ -2917,8 +6665,9 @@ impl From<trap::Label<RangeExpr>> for trap::Label<Locatable> {
 #[derive(Debug)]
 pub struct RangePat {
     pub id: trap::TrapId<RangePat>,
-    pub start: Option<trap::Label<Pat>>,
     pub end: Option<trap::Label<Pat>>,
+    pub operator_name: Option<String>,
+    pub start: Option<trap::Label<Pat>>,
 }
 
 impl trap::TrapEntry for RangePat {
@@ -2928,12 +6677,15 @@ impl trap::TrapEntry for RangePat {
 
     fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
         out.add_tuple("range_pats", vec![id.into()]);
-        if let Some(v) = self.start {
-            out.add_tuple("range_pat_starts", vec![id.into(), v.into()]);
-        }
         if let Some(v) = self.end {
             out.add_tuple("range_pat_ends", vec![id.into(), v.into()]);
         }
+        if let Some(v) = self.operator_name {
+            out.add_tuple("range_pat_operator_names", vec![id.into(), v.into()]);
+        }
+        if let Some(v) = self.start {
+            out.add_tuple("range_pat_starts", vec![id.into(), v.into()]);
+        }
     }
 }
 
@@ -2981,10 +6733,7 @@ impl From<trap::Label<RangePat>> for trap::Label<Pat> {
 pub struct RecordExpr {
     pub id: trap::TrapId<RecordExpr>,
     pub path: Option<trap::Label<Path>>,
-    pub flds: Vec<trap::Label<RecordExprField>>,
-    pub spread: Option<trap::Label<Expr>>,
-    pub has_ellipsis: bool,
-    pub is_assignee_expr: bool,
+    pub record_expr_field_list: Option<trap::Label<RecordExprFieldList>>,
 }
 
 impl trap::TrapEntry for RecordExpr {
@@ -2997,17 +6746,8 @@ impl trap::TrapEntry for RecordExpr {
         if let Some(v) = self.path {
             out.add_tuple("record_expr_paths", vec![id.into(), v.into()]);
         }
-        for (i, v) in self.flds.into_iter().enumerate() {
-            out.add_tuple("record_expr_flds", vec![id.into(), i.into(), v.into()]);
-        }
-        if let Some(v) = self.spread {
-            out.add_tuple("record_expr_spreads", vec![id.into(), v.into()]);
-        }
-        if self.has_ellipsis {
-            out.add_tuple("record_expr_has_ellipsis", vec![id.into()]);
-        }
-        if self.is_assignee_expr {
-            out.add_tuple("record_expr_is_assignee_expr", vec![id.into()]);
+        if let Some(v) = self.record_expr_field_list {
+            out.add_tuple("record_expr_record_expr_field_lists", vec![id.into(), v.into()]);
         }
     }
 }
@@ -3052,12 +6792,70 @@ impl From<trap::Label<RecordExpr>> for trap::Label<Locatable> {
     }
 }
 
+#[derive(Debug)]
+pub struct RecordFieldList {
+    pub id: trap::TrapId<RecordFieldList>,
+    pub fields: Vec<trap::Label<RecordField>>,
+}
+
+impl trap::TrapEntry for RecordFieldList {
+    fn extract_id(&mut self) -> trap::TrapId<Self> {
+        std::mem::replace(&mut self.id, trap::TrapId::Star)
+    }
+
+    fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
+        out.add_tuple("record_field_lists", vec![id.into()]);
+        for (i, v) in self.fields.into_iter().enumerate() {
+            out.add_tuple("record_field_list_fields", vec![id.into(), i.into(), v.into()]);
+        }
+    }
+}
+
+impl trap::TrapClass for RecordFieldList {
+    fn class_name() -> &'static str { "RecordFieldList" }
+}
+
+impl From<trap::Label<RecordFieldList>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<RecordFieldList>) -> Self {
+        // SAFETY: this is safe because in the dbscheme RecordFieldList is a subclass of AstNode
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<RecordFieldList>> for trap::Label<Element> {
+    fn from(value: trap::Label<RecordFieldList>) -> Self {
+        // SAFETY: this is safe because in the dbscheme RecordFieldList is a subclass of Element
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<RecordFieldList>> for trap::Label<FieldList> {
+    fn from(value: trap::Label<RecordFieldList>) -> Self {
+        // SAFETY: this is safe because in the dbscheme RecordFieldList is a subclass of FieldList
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<RecordFieldList>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<RecordFieldList>) -> Self {
+        // SAFETY: this is safe because in the dbscheme RecordFieldList is a subclass of Locatable
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
 #[derive(Debug)]
 pub struct RecordPat {
     pub id: trap::TrapId<RecordPat>,
     pub path: Option<trap::Label<Path>>,
-    pub flds: Vec<trap::Label<RecordPatField>>,
-    pub has_ellipsis: bool,
+    pub record_pat_field_list: Option<trap::Label<RecordPatFieldList>>,
 }
 
 impl trap::TrapEntry for RecordPat {
@@ -3070,11 +6868,8 @@ impl trap::TrapEntry for RecordPat {
         if let Some(v) = self.path {
             out.add_tuple("record_pat_paths", vec![id.into(), v.into()]);
         }
-        for (i, v) in self.flds.into_iter().enumerate() {
-            out.add_tuple("record_pat_flds", vec![id.into(), i.into(), v.into()]);
-        }
-        if self.has_ellipsis {
-            out.add_tuple("record_pat_has_ellipsis", vec![id.into()]);
+        if let Some(v) = self.record_pat_field_list {
+            out.add_tuple("record_pat_record_pat_field_lists", vec![id.into(), v.into()]);
         }
     }
 }
@@ -3122,9 +6917,11 @@ impl From<trap::Label<RecordPat>> for trap::Label<Pat> {
 #[derive(Debug)]
 pub struct RefExpr {
     pub id: trap::TrapId<RefExpr>,
-    pub expr: trap::Label<Expr>,
-    pub is_raw: bool,
+    pub attrs: Vec<trap::Label<Attr>>,
+    pub expr: Option<trap::Label<Expr>>,
+    pub is_const: bool,
     pub is_mut: bool,
+    pub is_raw: bool,
 }
 
 impl trap::TrapEntry for RefExpr {
@@ -3133,13 +6930,22 @@ impl trap::TrapEntry for RefExpr {
     }
 
     fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
-        out.add_tuple("ref_exprs", vec![id.into(), self.expr.into()]);
-        if self.is_raw {
-            out.add_tuple("ref_expr_is_raw", vec![id.into()]);
+        out.add_tuple("ref_exprs", vec![id.into()]);
+        for (i, v) in self.attrs.into_iter().enumerate() {
+            out.add_tuple("ref_expr_attrs", vec![id.into(), i.into(), v.into()]);
+        }
+        if let Some(v) = self.expr {
+            out.add_tuple("ref_expr_exprs", vec![id.into(), v.into()]);
+        }
+        if self.is_const {
+            out.add_tuple("ref_expr_is_const", vec![id.into()]);
         }
         if self.is_mut {
             out.add_tuple("ref_expr_is_mut", vec![id.into()]);
         }
+        if self.is_raw {
+            out.add_tuple("ref_expr_is_raw", vec![id.into()]);
+        }
     }
 }
 
@@ -3186,8 +6992,8 @@ impl From<trap::Label<RefExpr>> for trap::Label<Locatable> {
 #[derive(Debug)]
 pub struct RefPat {
     pub id: trap::TrapId<RefPat>,
-    pub pat: trap::Label<Pat>,
     pub is_mut: bool,
+    pub pat: Option<trap::Label<Pat>>,
 }
 
 impl trap::TrapEntry for RefPat {
@@ -3196,10 +7002,13 @@ impl trap::TrapEntry for RefPat {
     }
 
     fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
-        out.add_tuple("ref_pats", vec![id.into(), self.pat.into()]);
+        out.add_tuple("ref_pats", vec![id.into()]);
         if self.is_mut {
             out.add_tuple("ref_pat_is_mut", vec![id.into()]);
         }
+        if let Some(v) = self.pat {
+            out.add_tuple("ref_pat_pats", vec![id.into(), v.into()]);
+        }
     }
 }
 
@@ -3243,9 +7052,136 @@ impl From<trap::Label<RefPat>> for trap::Label<Pat> {
     }
 }
 
+#[derive(Debug)]
+pub struct RefType {
+    pub id: trap::TrapId<RefType>,
+    pub is_mut: bool,
+    pub lifetime: Option<trap::Label<Lifetime>>,
+    pub ty: Option<trap::Label<TypeRef>>,
+}
+
+impl trap::TrapEntry for RefType {
+    fn extract_id(&mut self) -> trap::TrapId<Self> {
+        std::mem::replace(&mut self.id, trap::TrapId::Star)
+    }
+
+    fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
+        out.add_tuple("ref_types", vec![id.into()]);
+        if self.is_mut {
+            out.add_tuple("ref_type_is_mut", vec![id.into()]);
+        }
+        if let Some(v) = self.lifetime {
+            out.add_tuple("ref_type_lifetimes", vec![id.into(), v.into()]);
+        }
+        if let Some(v) = self.ty {
+            out.add_tuple("ref_type_ties", vec![id.into(), v.into()]);
+        }
+    }
+}
+
+impl trap::TrapClass for RefType {
+    fn class_name() -> &'static str { "RefType" }
+}
+
+impl From<trap::Label<RefType>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<RefType>) -> Self {
+        // SAFETY: this is safe because in the dbscheme RefType is a subclass of AstNode
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<RefType>> for trap::Label<Element> {
+    fn from(value: trap::Label<RefType>) -> Self {
+        // SAFETY: this is safe because in the dbscheme RefType is a subclass of Element
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<RefType>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<RefType>) -> Self {
+        // SAFETY: this is safe because in the dbscheme RefType is a subclass of Locatable
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<RefType>> for trap::Label<TypeRef> {
+    fn from(value: trap::Label<RefType>) -> Self {
+        // SAFETY: this is safe because in the dbscheme RefType is a subclass of TypeRef
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+#[derive(Debug)]
+pub struct RestPat {
+    pub id: trap::TrapId<RestPat>,
+    pub attrs: Vec<trap::Label<Attr>>,
+}
+
+impl trap::TrapEntry for RestPat {
+    fn extract_id(&mut self) -> trap::TrapId<Self> {
+        std::mem::replace(&mut self.id, trap::TrapId::Star)
+    }
+
+    fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
+        out.add_tuple("rest_pats", vec![id.into()]);
+        for (i, v) in self.attrs.into_iter().enumerate() {
+            out.add_tuple("rest_pat_attrs", vec![id.into(), i.into(), v.into()]);
+        }
+    }
+}
+
+impl trap::TrapClass for RestPat {
+    fn class_name() -> &'static str { "RestPat" }
+}
+
+impl From<trap::Label<RestPat>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<RestPat>) -> Self {
+        // SAFETY: this is safe because in the dbscheme RestPat is a subclass of AstNode
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<RestPat>> for trap::Label<Element> {
+    fn from(value: trap::Label<RestPat>) -> Self {
+        // SAFETY: this is safe because in the dbscheme RestPat is a subclass of Element
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<RestPat>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<RestPat>) -> Self {
+        // SAFETY: this is safe because in the dbscheme RestPat is a subclass of Locatable
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<RestPat>> for trap::Label<Pat> {
+    fn from(value: trap::Label<RestPat>) -> Self {
+        // SAFETY: this is safe because in the dbscheme RestPat is a subclass of Pat
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
 #[derive(Debug)]
 pub struct ReturnExpr {
     pub id: trap::TrapId<ReturnExpr>,
+    pub attrs: Vec<trap::Label<Attr>>,
     pub expr: Option<trap::Label<Expr>>,
 }
 
@@ -3256,6 +7192,9 @@ impl trap::TrapEntry for ReturnExpr {
 
     fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
         out.add_tuple("return_exprs", vec![id.into()]);
+        for (i, v) in self.attrs.into_iter().enumerate() {
+            out.add_tuple("return_expr_attrs", vec![id.into(), i.into(), v.into()]);
+        }
         if let Some(v) = self.expr {
             out.add_tuple("return_expr_exprs", vec![id.into(), v.into()]);
         }
@@ -3305,9 +7244,7 @@ impl From<trap::Label<ReturnExpr>> for trap::Label<Locatable> {
 #[derive(Debug)]
 pub struct SlicePat {
     pub id: trap::TrapId<SlicePat>,
-    pub prefix: Vec<trap::Label<Pat>>,
-    pub slice: Option<trap::Label<Pat>>,
-    pub suffix: Vec<trap::Label<Pat>>,
+    pub pats: Vec<trap::Label<Pat>>,
 }
 
 impl trap::TrapEntry for SlicePat {
@@ -3317,14 +7254,8 @@ impl trap::TrapEntry for SlicePat {
 
     fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
         out.add_tuple("slice_pats", vec![id.into()]);
-        for (i, v) in self.prefix.into_iter().enumerate() {
-            out.add_tuple("slice_pat_prefixes", vec![id.into(), i.into(), v.into()]);
-        }
-        if let Some(v) = self.slice {
-            out.add_tuple("slice_pat_slice", vec![id.into(), v.into()]);
-        }
-        for (i, v) in self.suffix.into_iter().enumerate() {
-            out.add_tuple("slice_pat_suffixes", vec![id.into(), i.into(), v.into()]);
+        for (i, v) in self.pats.into_iter().enumerate() {
+            out.add_tuple("slice_pat_pats", vec![id.into(), i.into(), v.into()]);
         }
     }
 }
@@ -3369,11 +7300,133 @@ impl From<trap::Label<SlicePat>> for trap::Label<Pat> {
     }
 }
 
+#[derive(Debug)]
+pub struct SliceType {
+    pub id: trap::TrapId<SliceType>,
+    pub ty: Option<trap::Label<TypeRef>>,
+}
+
+impl trap::TrapEntry for SliceType {
+    fn extract_id(&mut self) -> trap::TrapId<Self> {
+        std::mem::replace(&mut self.id, trap::TrapId::Star)
+    }
+
+    fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
+        out.add_tuple("slice_types", vec![id.into()]);
+        if let Some(v) = self.ty {
+            out.add_tuple("slice_type_ties", vec![id.into(), v.into()]);
+        }
+    }
+}
+
+impl trap::TrapClass for SliceType {
+    fn class_name() -> &'static str { "SliceType" }
+}
+
+impl From<trap::Label<SliceType>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<SliceType>) -> Self {
+        // SAFETY: this is safe because in the dbscheme SliceType is a subclass of AstNode
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<SliceType>> for trap::Label<Element> {
+    fn from(value: trap::Label<SliceType>) -> Self {
+        // SAFETY: this is safe because in the dbscheme SliceType is a subclass of Element
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<SliceType>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<SliceType>) -> Self {
+        // SAFETY: this is safe because in the dbscheme SliceType is a subclass of Locatable
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<SliceType>> for trap::Label<TypeRef> {
+    fn from(value: trap::Label<SliceType>) -> Self {
+        // SAFETY: this is safe because in the dbscheme SliceType is a subclass of TypeRef
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+#[derive(Debug)]
+pub struct TryExpr {
+    pub id: trap::TrapId<TryExpr>,
+    pub attrs: Vec<trap::Label<Attr>>,
+    pub expr: Option<trap::Label<Expr>>,
+}
+
+impl trap::TrapEntry for TryExpr {
+    fn extract_id(&mut self) -> trap::TrapId<Self> {
+        std::mem::replace(&mut self.id, trap::TrapId::Star)
+    }
+
+    fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
+        out.add_tuple("try_exprs", vec![id.into()]);
+        for (i, v) in self.attrs.into_iter().enumerate() {
+            out.add_tuple("try_expr_attrs", vec![id.into(), i.into(), v.into()]);
+        }
+        if let Some(v) = self.expr {
+            out.add_tuple("try_expr_exprs", vec![id.into(), v.into()]);
+        }
+    }
+}
+
+impl trap::TrapClass for TryExpr {
+    fn class_name() -> &'static str { "TryExpr" }
+}
+
+impl From<trap::Label<TryExpr>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<TryExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme TryExpr is a subclass of AstNode
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<TryExpr>> for trap::Label<Element> {
+    fn from(value: trap::Label<TryExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme TryExpr is a subclass of Element
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<TryExpr>> for trap::Label<Expr> {
+    fn from(value: trap::Label<TryExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme TryExpr is a subclass of Expr
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<TryExpr>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<TryExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme TryExpr is a subclass of Locatable
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
 #[derive(Debug)]
 pub struct TupleExpr {
     pub id: trap::TrapId<TupleExpr>,
-    pub exprs: Vec<trap::Label<Expr>>,
-    pub is_assignee_expr: bool,
+    pub attrs: Vec<trap::Label<Attr>>,
+    pub fields: Vec<trap::Label<Expr>>,
 }
 
 impl trap::TrapEntry for TupleExpr {
@@ -3383,11 +7436,11 @@ impl trap::TrapEntry for TupleExpr {
 
     fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
         out.add_tuple("tuple_exprs", vec![id.into()]);
-        for (i, v) in self.exprs.into_iter().enumerate() {
-            out.add_tuple("tuple_expr_exprs", vec![id.into(), i.into(), v.into()]);
+        for (i, v) in self.attrs.into_iter().enumerate() {
+            out.add_tuple("tuple_expr_attrs", vec![id.into(), i.into(), v.into()]);
         }
-        if self.is_assignee_expr {
-            out.add_tuple("tuple_expr_is_assignee_expr", vec![id.into()]);
+        for (i, v) in self.fields.into_iter().enumerate() {
+            out.add_tuple("tuple_expr_fields", vec![id.into(), i.into(), v.into()]);
         }
     }
 }
@@ -3432,11 +7485,69 @@ impl From<trap::Label<TupleExpr>> for trap::Label<Locatable> {
     }
 }
 
+#[derive(Debug)]
+pub struct TupleFieldList {
+    pub id: trap::TrapId<TupleFieldList>,
+    pub fields: Vec<trap::Label<TupleField>>,
+}
+
+impl trap::TrapEntry for TupleFieldList {
+    fn extract_id(&mut self) -> trap::TrapId<Self> {
+        std::mem::replace(&mut self.id, trap::TrapId::Star)
+    }
+
+    fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
+        out.add_tuple("tuple_field_lists", vec![id.into()]);
+        for (i, v) in self.fields.into_iter().enumerate() {
+            out.add_tuple("tuple_field_list_fields", vec![id.into(), i.into(), v.into()]);
+        }
+    }
+}
+
+impl trap::TrapClass for TupleFieldList {
+    fn class_name() -> &'static str { "TupleFieldList" }
+}
+
+impl From<trap::Label<TupleFieldList>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<TupleFieldList>) -> Self {
+        // SAFETY: this is safe because in the dbscheme TupleFieldList is a subclass of AstNode
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<TupleFieldList>> for trap::Label<Element> {
+    fn from(value: trap::Label<TupleFieldList>) -> Self {
+        // SAFETY: this is safe because in the dbscheme TupleFieldList is a subclass of Element
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<TupleFieldList>> for trap::Label<FieldList> {
+    fn from(value: trap::Label<TupleFieldList>) -> Self {
+        // SAFETY: this is safe because in the dbscheme TupleFieldList is a subclass of FieldList
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<TupleFieldList>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<TupleFieldList>) -> Self {
+        // SAFETY: this is safe because in the dbscheme TupleFieldList is a subclass of Locatable
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
 #[derive(Debug)]
 pub struct TuplePat {
     pub id: trap::TrapId<TuplePat>,
-    pub args: Vec<trap::Label<Pat>>,
-    pub ellipsis_index: Option<usize>,
+    pub fields: Vec<trap::Label<Pat>>,
 }
 
 impl trap::TrapEntry for TuplePat {
@@ -3446,11 +7557,8 @@ impl trap::TrapEntry for TuplePat {
 
     fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
         out.add_tuple("tuple_pats", vec![id.into()]);
-        for (i, v) in self.args.into_iter().enumerate() {
-            out.add_tuple("tuple_pat_args", vec![id.into(), i.into(), v.into()]);
-        }
-        if let Some(v) = self.ellipsis_index {
-            out.add_tuple("tuple_pat_ellipsis_indices", vec![id.into(), v.into()]);
+        for (i, v) in self.fields.into_iter().enumerate() {
+            out.add_tuple("tuple_pat_fields", vec![id.into(), i.into(), v.into()]);
         }
     }
 }
@@ -3498,9 +7606,8 @@ impl From<trap::Label<TuplePat>> for trap::Label<Pat> {
 #[derive(Debug)]
 pub struct TupleStructPat {
     pub id: trap::TrapId<TupleStructPat>,
+    pub fields: Vec<trap::Label<Pat>>,
     pub path: Option<trap::Label<Path>>,
-    pub args: Vec<trap::Label<Pat>>,
-    pub ellipsis_index: Option<usize>,
 }
 
 impl trap::TrapEntry for TupleStructPat {
@@ -3510,15 +7617,12 @@ impl trap::TrapEntry for TupleStructPat {
 
     fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
         out.add_tuple("tuple_struct_pats", vec![id.into()]);
+        for (i, v) in self.fields.into_iter().enumerate() {
+            out.add_tuple("tuple_struct_pat_fields", vec![id.into(), i.into(), v.into()]);
+        }
         if let Some(v) = self.path {
             out.add_tuple("tuple_struct_pat_paths", vec![id.into(), v.into()]);
         }
-        for (i, v) in self.args.into_iter().enumerate() {
-            out.add_tuple("tuple_struct_pat_args", vec![id.into(), i.into(), v.into()]);
-        }
-        if let Some(v) = self.ellipsis_index {
-            out.add_tuple("tuple_struct_pat_ellipsis_indices", vec![id.into(), v.into()]);
-        }
     }
 }
 
@@ -3562,9 +7666,199 @@ impl From<trap::Label<TupleStructPat>> for trap::Label<Pat> {
     }
 }
 
+#[derive(Debug)]
+pub struct TupleType {
+    pub id: trap::TrapId<TupleType>,
+    pub fields: Vec<trap::Label<TypeRef>>,
+}
+
+impl trap::TrapEntry for TupleType {
+    fn extract_id(&mut self) -> trap::TrapId<Self> {
+        std::mem::replace(&mut self.id, trap::TrapId::Star)
+    }
+
+    fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
+        out.add_tuple("tuple_types", vec![id.into()]);
+        for (i, v) in self.fields.into_iter().enumerate() {
+            out.add_tuple("tuple_type_fields", vec![id.into(), i.into(), v.into()]);
+        }
+    }
+}
+
+impl trap::TrapClass for TupleType {
+    fn class_name() -> &'static str { "TupleType" }
+}
+
+impl From<trap::Label<TupleType>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<TupleType>) -> Self {
+        // SAFETY: this is safe because in the dbscheme TupleType is a subclass of AstNode
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<TupleType>> for trap::Label<Element> {
+    fn from(value: trap::Label<TupleType>) -> Self {
+        // SAFETY: this is safe because in the dbscheme TupleType is a subclass of Element
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<TupleType>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<TupleType>) -> Self {
+        // SAFETY: this is safe because in the dbscheme TupleType is a subclass of Locatable
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<TupleType>> for trap::Label<TypeRef> {
+    fn from(value: trap::Label<TupleType>) -> Self {
+        // SAFETY: this is safe because in the dbscheme TupleType is a subclass of TypeRef
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+#[derive(Debug)]
+pub struct TypeArg {
+    pub id: trap::TrapId<TypeArg>,
+    pub ty: Option<trap::Label<TypeRef>>,
+}
+
+impl trap::TrapEntry for TypeArg {
+    fn extract_id(&mut self) -> trap::TrapId<Self> {
+        std::mem::replace(&mut self.id, trap::TrapId::Star)
+    }
+
+    fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
+        out.add_tuple("type_args", vec![id.into()]);
+        if let Some(v) = self.ty {
+            out.add_tuple("type_arg_ties", vec![id.into(), v.into()]);
+        }
+    }
+}
+
+impl trap::TrapClass for TypeArg {
+    fn class_name() -> &'static str { "TypeArg" }
+}
+
+impl From<trap::Label<TypeArg>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<TypeArg>) -> Self {
+        // SAFETY: this is safe because in the dbscheme TypeArg is a subclass of AstNode
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<TypeArg>> for trap::Label<Element> {
+    fn from(value: trap::Label<TypeArg>) -> Self {
+        // SAFETY: this is safe because in the dbscheme TypeArg is a subclass of Element
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<TypeArg>> for trap::Label<GenericArg> {
+    fn from(value: trap::Label<TypeArg>) -> Self {
+        // SAFETY: this is safe because in the dbscheme TypeArg is a subclass of GenericArg
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<TypeArg>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<TypeArg>) -> Self {
+        // SAFETY: this is safe because in the dbscheme TypeArg is a subclass of Locatable
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+#[derive(Debug)]
+pub struct TypeParam {
+    pub id: trap::TrapId<TypeParam>,
+    pub attrs: Vec<trap::Label<Attr>>,
+    pub default_type: Option<trap::Label<TypeRef>>,
+    pub name: Option<trap::Label<Name>>,
+    pub type_bound_list: Option<trap::Label<TypeBoundList>>,
+}
+
+impl trap::TrapEntry for TypeParam {
+    fn extract_id(&mut self) -> trap::TrapId<Self> {
+        std::mem::replace(&mut self.id, trap::TrapId::Star)
+    }
+
+    fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
+        out.add_tuple("type_params", vec![id.into()]);
+        for (i, v) in self.attrs.into_iter().enumerate() {
+            out.add_tuple("type_param_attrs", vec![id.into(), i.into(), v.into()]);
+        }
+        if let Some(v) = self.default_type {
+            out.add_tuple("type_param_default_types", vec![id.into(), v.into()]);
+        }
+        if let Some(v) = self.name {
+            out.add_tuple("type_param_names", vec![id.into(), v.into()]);
+        }
+        if let Some(v) = self.type_bound_list {
+            out.add_tuple("type_param_type_bound_lists", vec![id.into(), v.into()]);
+        }
+    }
+}
+
+impl trap::TrapClass for TypeParam {
+    fn class_name() -> &'static str { "TypeParam" }
+}
+
+impl From<trap::Label<TypeParam>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<TypeParam>) -> Self {
+        // SAFETY: this is safe because in the dbscheme TypeParam is a subclass of AstNode
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<TypeParam>> for trap::Label<Element> {
+    fn from(value: trap::Label<TypeParam>) -> Self {
+        // SAFETY: this is safe because in the dbscheme TypeParam is a subclass of Element
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<TypeParam>> for trap::Label<GenericParam> {
+    fn from(value: trap::Label<TypeParam>) -> Self {
+        // SAFETY: this is safe because in the dbscheme TypeParam is a subclass of GenericParam
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<TypeParam>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<TypeParam>) -> Self {
+        // SAFETY: this is safe because in the dbscheme TypeParam is a subclass of Locatable
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
 #[derive(Debug)]
 pub struct UnderscoreExpr {
     pub id: trap::TrapId<UnderscoreExpr>,
+    pub attrs: Vec<trap::Label<Attr>>,
 }
 
 impl trap::TrapEntry for UnderscoreExpr {
@@ -3574,6 +7868,9 @@ impl trap::TrapEntry for UnderscoreExpr {
 
     fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
         out.add_tuple("underscore_exprs", vec![id.into()]);
+        for (i, v) in self.attrs.into_iter().enumerate() {
+            out.add_tuple("underscore_expr_attrs", vec![id.into(), i.into(), v.into()]);
+        }
     }
 }
 
@@ -3618,72 +7915,70 @@ impl From<trap::Label<UnderscoreExpr>> for trap::Label<Locatable> {
 }
 
 #[derive(Debug)]
-pub struct UnimplementedDeclaration {
-    pub id: trap::TrapId<UnimplementedDeclaration>,
+pub struct WhileExpr {
+    pub id: trap::TrapId<WhileExpr>,
+    pub attrs: Vec<trap::Label<Attr>>,
+    pub condition: Option<trap::Label<Expr>>,
+    pub label: Option<trap::Label<Label>>,
+    pub loop_body: Option<trap::Label<BlockExpr>>,
 }
 
-impl trap::TrapEntry for UnimplementedDeclaration {
+impl trap::TrapEntry for WhileExpr {
     fn extract_id(&mut self) -> trap::TrapId<Self> {
         std::mem::replace(&mut self.id, trap::TrapId::Star)
     }
 
     fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
-        out.add_tuple("unimplemented_declarations", vec![id.into()]);
+        out.add_tuple("while_exprs", vec![id.into()]);
+        for (i, v) in self.attrs.into_iter().enumerate() {
+            out.add_tuple("while_expr_attrs", vec![id.into(), i.into(), v.into()]);
+        }
+        if let Some(v) = self.condition {
+            out.add_tuple("while_expr_conditions", vec![id.into(), v.into()]);
+        }
+        if let Some(v) = self.label {
+            out.add_tuple("while_expr_labels", vec![id.into(), v.into()]);
+        }
+        if let Some(v) = self.loop_body {
+            out.add_tuple("while_expr_loop_bodies", vec![id.into(), v.into()]);
+        }
     }
 }
 
-impl trap::TrapClass for UnimplementedDeclaration {
-    fn class_name() -> &'static str { "UnimplementedDeclaration" }
+impl trap::TrapClass for WhileExpr {
+    fn class_name() -> &'static str { "WhileExpr" }
 }
 
-impl From<trap::Label<UnimplementedDeclaration>> for trap::Label<AstNode> {
-    fn from(value: trap::Label<UnimplementedDeclaration>) -> Self {
-        // SAFETY: this is safe because in the dbscheme UnimplementedDeclaration is a subclass of AstNode
+impl From<trap::Label<WhileExpr>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<WhileExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme WhileExpr is a subclass of AstNode
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<UnimplementedDeclaration>> for trap::Label<Declaration> {
-    fn from(value: trap::Label<UnimplementedDeclaration>) -> Self {
-        // SAFETY: this is safe because in the dbscheme UnimplementedDeclaration is a subclass of Declaration
+impl From<trap::Label<WhileExpr>> for trap::Label<Element> {
+    fn from(value: trap::Label<WhileExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme WhileExpr is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<UnimplementedDeclaration>> for trap::Label<Element> {
-    fn from(value: trap::Label<UnimplementedDeclaration>) -> Self {
-        // SAFETY: this is safe because in the dbscheme UnimplementedDeclaration is a subclass of Element
+impl From<trap::Label<WhileExpr>> for trap::Label<Expr> {
+    fn from(value: trap::Label<WhileExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme WhileExpr is a subclass of Expr
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<UnimplementedDeclaration>> for trap::Label<Locatable> {
-    fn from(value: trap::Label<UnimplementedDeclaration>) -> Self {
-        // SAFETY: this is safe because in the dbscheme UnimplementedDeclaration is a subclass of Locatable
-        unsafe {
-            Self::from_untyped(value.as_untyped())
-        }
-    }
-}
-
-impl From<trap::Label<UnimplementedDeclaration>> for trap::Label<Unextracted> {
-    fn from(value: trap::Label<UnimplementedDeclaration>) -> Self {
-        // SAFETY: this is safe because in the dbscheme UnimplementedDeclaration is a subclass of Unextracted
-        unsafe {
-            Self::from_untyped(value.as_untyped())
-        }
-    }
-}
-
-impl From<trap::Label<UnimplementedDeclaration>> for trap::Label<Unimplemented> {
-    fn from(value: trap::Label<UnimplementedDeclaration>) -> Self {
-        // SAFETY: this is safe because in the dbscheme UnimplementedDeclaration is a subclass of Unimplemented
+impl From<trap::Label<WhileExpr>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<WhileExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme WhileExpr is a subclass of Locatable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -3748,6 +8043,7 @@ impl From<trap::Label<WildcardPat>> for trap::Label<Pat> {
 #[derive(Debug)]
 pub struct YeetExpr {
     pub id: trap::TrapId<YeetExpr>,
+    pub attrs: Vec<trap::Label<Attr>>,
     pub expr: Option<trap::Label<Expr>>,
 }
 
@@ -3758,6 +8054,9 @@ impl trap::TrapEntry for YeetExpr {
 
     fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
         out.add_tuple("yeet_exprs", vec![id.into()]);
+        for (i, v) in self.attrs.into_iter().enumerate() {
+            out.add_tuple("yeet_expr_attrs", vec![id.into(), i.into(), v.into()]);
+        }
         if let Some(v) = self.expr {
             out.add_tuple("yeet_expr_exprs", vec![id.into(), v.into()]);
         }
@@ -3807,6 +8106,7 @@ impl From<trap::Label<YeetExpr>> for trap::Label<Locatable> {
 #[derive(Debug)]
 pub struct YieldExpr {
     pub id: trap::TrapId<YieldExpr>,
+    pub attrs: Vec<trap::Label<Attr>>,
     pub expr: Option<trap::Label<Expr>>,
 }
 
@@ -3817,6 +8117,9 @@ impl trap::TrapEntry for YieldExpr {
 
     fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
         out.add_tuple("yield_exprs", vec![id.into()]);
+        for (i, v) in self.attrs.into_iter().enumerate() {
+            out.add_tuple("yield_expr_attrs", vec![id.into(), i.into(), v.into()]);
+        }
         if let Some(v) = self.expr {
             out.add_tuple("yield_expr_exprs", vec![id.into(), v.into()]);
         }
@@ -3864,71 +8167,75 @@ impl From<trap::Label<YieldExpr>> for trap::Label<Locatable> {
 }
 
 #[derive(Debug)]
-pub struct AsyncBlockExpr {
-    pub id: trap::TrapId<AsyncBlockExpr>,
-    pub statements: Vec<trap::Label<Stmt>>,
-    pub tail: Option<trap::Label<Expr>>,
+pub struct CallExpr {
+    pub id: trap::TrapId<CallExpr>,
+    pub arg_list: Option<trap::Label<ArgList>>,
+    pub attrs: Vec<trap::Label<Attr>>,
+    pub expr: Option<trap::Label<Expr>>,
 }
 
-impl trap::TrapEntry for AsyncBlockExpr {
+impl trap::TrapEntry for CallExpr {
     fn extract_id(&mut self) -> trap::TrapId<Self> {
         std::mem::replace(&mut self.id, trap::TrapId::Star)
     }
 
     fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
-        out.add_tuple("async_block_exprs", vec![id.into()]);
-        for (i, v) in self.statements.into_iter().enumerate() {
-            out.add_tuple("block_expr_base_statements", vec![id.into(), i.into(), v.into()]);
+        out.add_tuple("call_exprs", vec![id.into()]);
+        if let Some(v) = self.arg_list {
+            out.add_tuple("call_expr_base_arg_lists", vec![id.into(), v.into()]);
         }
-        if let Some(v) = self.tail {
-            out.add_tuple("block_expr_base_tails", vec![id.into(), v.into()]);
+        for (i, v) in self.attrs.into_iter().enumerate() {
+            out.add_tuple("call_expr_base_attrs", vec![id.into(), i.into(), v.into()]);
+        }
+        if let Some(v) = self.expr {
+            out.add_tuple("call_expr_exprs", vec![id.into(), v.into()]);
         }
     }
 }
 
-impl trap::TrapClass for AsyncBlockExpr {
-    fn class_name() -> &'static str { "AsyncBlockExpr" }
+impl trap::TrapClass for CallExpr {
+    fn class_name() -> &'static str { "CallExpr" }
 }
 
-impl From<trap::Label<AsyncBlockExpr>> for trap::Label<AstNode> {
-    fn from(value: trap::Label<AsyncBlockExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme AsyncBlockExpr is a subclass of AstNode
+impl From<trap::Label<CallExpr>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<CallExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme CallExpr is a subclass of AstNode
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<AsyncBlockExpr>> for trap::Label<BlockExprBase> {
-    fn from(value: trap::Label<AsyncBlockExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme AsyncBlockExpr is a subclass of BlockExprBase
+impl From<trap::Label<CallExpr>> for trap::Label<CallExprBase> {
+    fn from(value: trap::Label<CallExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme CallExpr is a subclass of CallExprBase
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<AsyncBlockExpr>> for trap::Label<Element> {
-    fn from(value: trap::Label<AsyncBlockExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme AsyncBlockExpr is a subclass of Element
+impl From<trap::Label<CallExpr>> for trap::Label<Element> {
+    fn from(value: trap::Label<CallExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme CallExpr is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<AsyncBlockExpr>> for trap::Label<Expr> {
-    fn from(value: trap::Label<AsyncBlockExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme AsyncBlockExpr is a subclass of Expr
+impl From<trap::Label<CallExpr>> for trap::Label<Expr> {
+    fn from(value: trap::Label<CallExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme CallExpr is a subclass of Expr
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<AsyncBlockExpr>> for trap::Label<Locatable> {
-    fn from(value: trap::Label<AsyncBlockExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme AsyncBlockExpr is a subclass of Locatable
+impl From<trap::Label<CallExpr>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<CallExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme CallExpr is a subclass of Locatable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -3936,75 +8243,100 @@ impl From<trap::Label<AsyncBlockExpr>> for trap::Label<Locatable> {
 }
 
 #[derive(Debug)]
-pub struct BlockExpr {
-    pub id: trap::TrapId<BlockExpr>,
-    pub statements: Vec<trap::Label<Stmt>>,
-    pub tail: Option<trap::Label<Expr>>,
-    pub label: Option<trap::Label<Label>>,
+pub struct Const {
+    pub id: trap::TrapId<Const>,
+    pub attrs: Vec<trap::Label<Attr>>,
+    pub body: Option<trap::Label<Expr>>,
+    pub is_const: bool,
+    pub is_default: bool,
+    pub name: Option<trap::Label<Name>>,
+    pub ty: Option<trap::Label<TypeRef>>,
+    pub visibility: Option<trap::Label<Visibility>>,
 }
 
-impl trap::TrapEntry for BlockExpr {
+impl trap::TrapEntry for Const {
     fn extract_id(&mut self) -> trap::TrapId<Self> {
         std::mem::replace(&mut self.id, trap::TrapId::Star)
     }
 
     fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
-        out.add_tuple("block_exprs", vec![id.into()]);
-        for (i, v) in self.statements.into_iter().enumerate() {
-            out.add_tuple("block_expr_base_statements", vec![id.into(), i.into(), v.into()]);
+        out.add_tuple("consts", vec![id.into()]);
+        for (i, v) in self.attrs.into_iter().enumerate() {
+            out.add_tuple("const_attrs", vec![id.into(), i.into(), v.into()]);
         }
-        if let Some(v) = self.tail {
-            out.add_tuple("block_expr_base_tails", vec![id.into(), v.into()]);
+        if let Some(v) = self.body {
+            out.add_tuple("const_bodies", vec![id.into(), v.into()]);
         }
-        if let Some(v) = self.label {
-            out.add_tuple("block_expr_labels", vec![id.into(), v.into()]);
+        if self.is_const {
+            out.add_tuple("const_is_const", vec![id.into()]);
+        }
+        if self.is_default {
+            out.add_tuple("const_is_default", vec![id.into()]);
+        }
+        if let Some(v) = self.name {
+            out.add_tuple("const_names", vec![id.into(), v.into()]);
+        }
+        if let Some(v) = self.ty {
+            out.add_tuple("const_ties", vec![id.into(), v.into()]);
+        }
+        if let Some(v) = self.visibility {
+            out.add_tuple("const_visibilities", vec![id.into(), v.into()]);
         }
     }
 }
 
-impl trap::TrapClass for BlockExpr {
-    fn class_name() -> &'static str { "BlockExpr" }
+impl trap::TrapClass for Const {
+    fn class_name() -> &'static str { "Const" }
 }
 
-impl From<trap::Label<BlockExpr>> for trap::Label<AstNode> {
-    fn from(value: trap::Label<BlockExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme BlockExpr is a subclass of AstNode
+impl From<trap::Label<Const>> for trap::Label<AssocItem> {
+    fn from(value: trap::Label<Const>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Const is a subclass of AssocItem
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<BlockExpr>> for trap::Label<BlockExprBase> {
-    fn from(value: trap::Label<BlockExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme BlockExpr is a subclass of BlockExprBase
+impl From<trap::Label<Const>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<Const>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Const is a subclass of AstNode
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<BlockExpr>> for trap::Label<Element> {
-    fn from(value: trap::Label<BlockExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme BlockExpr is a subclass of Element
+impl From<trap::Label<Const>> for trap::Label<Element> {
+    fn from(value: trap::Label<Const>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Const is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<BlockExpr>> for trap::Label<Expr> {
-    fn from(value: trap::Label<BlockExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme BlockExpr is a subclass of Expr
+impl From<trap::Label<Const>> for trap::Label<Item> {
+    fn from(value: trap::Label<Const>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Const is a subclass of Item
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<BlockExpr>> for trap::Label<Locatable> {
-    fn from(value: trap::Label<BlockExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme BlockExpr is a subclass of Locatable
+impl From<trap::Label<Const>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<Const>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Const is a subclass of Locatable
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<Const>> for trap::Label<Stmt> {
+    fn from(value: trap::Label<Const>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Const is a subclass of Stmt
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -4012,71 +8344,87 @@ impl From<trap::Label<BlockExpr>> for trap::Label<Locatable> {
 }
 
 #[derive(Debug)]
-pub struct ElementListExpr {
-    pub id: trap::TrapId<ElementListExpr>,
-    pub elements: Vec<trap::Label<Expr>>,
-    pub is_assignee_expr: bool,
+pub struct Enum {
+    pub id: trap::TrapId<Enum>,
+    pub attrs: Vec<trap::Label<Attr>>,
+    pub generic_param_list: Option<trap::Label<GenericParamList>>,
+    pub name: Option<trap::Label<Name>>,
+    pub variant_list: Option<trap::Label<VariantList>>,
+    pub visibility: Option<trap::Label<Visibility>>,
+    pub where_clause: Option<trap::Label<WhereClause>>,
 }
 
-impl trap::TrapEntry for ElementListExpr {
+impl trap::TrapEntry for Enum {
     fn extract_id(&mut self) -> trap::TrapId<Self> {
         std::mem::replace(&mut self.id, trap::TrapId::Star)
     }
 
     fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
-        out.add_tuple("element_list_exprs", vec![id.into()]);
-        for (i, v) in self.elements.into_iter().enumerate() {
-            out.add_tuple("element_list_expr_elements", vec![id.into(), i.into(), v.into()]);
+        out.add_tuple("enums", vec![id.into()]);
+        for (i, v) in self.attrs.into_iter().enumerate() {
+            out.add_tuple("enum_attrs", vec![id.into(), i.into(), v.into()]);
         }
-        if self.is_assignee_expr {
-            out.add_tuple("element_list_expr_is_assignee_expr", vec![id.into()]);
+        if let Some(v) = self.generic_param_list {
+            out.add_tuple("enum_generic_param_lists", vec![id.into(), v.into()]);
+        }
+        if let Some(v) = self.name {
+            out.add_tuple("enum_names", vec![id.into(), v.into()]);
+        }
+        if let Some(v) = self.variant_list {
+            out.add_tuple("enum_variant_lists", vec![id.into(), v.into()]);
+        }
+        if let Some(v) = self.visibility {
+            out.add_tuple("enum_visibilities", vec![id.into(), v.into()]);
+        }
+        if let Some(v) = self.where_clause {
+            out.add_tuple("enum_where_clauses", vec![id.into(), v.into()]);
         }
     }
 }
 
-impl trap::TrapClass for ElementListExpr {
-    fn class_name() -> &'static str { "ElementListExpr" }
+impl trap::TrapClass for Enum {
+    fn class_name() -> &'static str { "Enum" }
 }
 
-impl From<trap::Label<ElementListExpr>> for trap::Label<ArrayExpr> {
-    fn from(value: trap::Label<ElementListExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme ElementListExpr is a subclass of ArrayExpr
+impl From<trap::Label<Enum>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<Enum>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Enum is a subclass of AstNode
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<ElementListExpr>> for trap::Label<AstNode> {
-    fn from(value: trap::Label<ElementListExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme ElementListExpr is a subclass of AstNode
+impl From<trap::Label<Enum>> for trap::Label<Element> {
+    fn from(value: trap::Label<Enum>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Enum is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<ElementListExpr>> for trap::Label<Element> {
-    fn from(value: trap::Label<ElementListExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme ElementListExpr is a subclass of Element
+impl From<trap::Label<Enum>> for trap::Label<Item> {
+    fn from(value: trap::Label<Enum>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Enum is a subclass of Item
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<ElementListExpr>> for trap::Label<Expr> {
-    fn from(value: trap::Label<ElementListExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme ElementListExpr is a subclass of Expr
+impl From<trap::Label<Enum>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<Enum>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Enum is a subclass of Locatable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<ElementListExpr>> for trap::Label<Locatable> {
-    fn from(value: trap::Label<ElementListExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme ElementListExpr is a subclass of Locatable
+impl From<trap::Label<Enum>> for trap::Label<Stmt> {
+    fn from(value: trap::Label<Enum>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Enum is a subclass of Stmt
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -4084,65 +8432,79 @@ impl From<trap::Label<ElementListExpr>> for trap::Label<Locatable> {
 }
 
 #[derive(Debug)]
-pub struct RepeatExpr {
-    pub id: trap::TrapId<RepeatExpr>,
-    pub initializer: trap::Label<Expr>,
-    pub repeat: trap::Label<Expr>,
+pub struct ExternBlock {
+    pub id: trap::TrapId<ExternBlock>,
+    pub abi: Option<trap::Label<Abi>>,
+    pub attrs: Vec<trap::Label<Attr>>,
+    pub extern_item_list: Option<trap::Label<ExternItemList>>,
+    pub is_unsafe: bool,
 }
 
-impl trap::TrapEntry for RepeatExpr {
+impl trap::TrapEntry for ExternBlock {
     fn extract_id(&mut self) -> trap::TrapId<Self> {
         std::mem::replace(&mut self.id, trap::TrapId::Star)
     }
 
     fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
-        out.add_tuple("repeat_exprs", vec![id.into(), self.initializer.into(), self.repeat.into()]);
+        out.add_tuple("extern_blocks", vec![id.into()]);
+        if let Some(v) = self.abi {
+            out.add_tuple("extern_block_abis", vec![id.into(), v.into()]);
+        }
+        for (i, v) in self.attrs.into_iter().enumerate() {
+            out.add_tuple("extern_block_attrs", vec![id.into(), i.into(), v.into()]);
+        }
+        if let Some(v) = self.extern_item_list {
+            out.add_tuple("extern_block_extern_item_lists", vec![id.into(), v.into()]);
+        }
+        if self.is_unsafe {
+            out.add_tuple("extern_block_is_unsafe", vec![id.into()]);
+        }
     }
 }
 
-impl trap::TrapClass for RepeatExpr {
-    fn class_name() -> &'static str { "RepeatExpr" }
+impl trap::TrapClass for ExternBlock {
+    fn class_name() -> &'static str { "ExternBlock" }
 }
 
-impl From<trap::Label<RepeatExpr>> for trap::Label<ArrayExpr> {
-    fn from(value: trap::Label<RepeatExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme RepeatExpr is a subclass of ArrayExpr
+impl From<trap::Label<ExternBlock>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<ExternBlock>) -> Self {
+        // SAFETY: this is safe because in the dbscheme ExternBlock is a subclass of AstNode
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<RepeatExpr>> for trap::Label<AstNode> {
-    fn from(value: trap::Label<RepeatExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme RepeatExpr is a subclass of AstNode
+impl From<trap::Label<ExternBlock>> for trap::Label<Element> {
+    fn from(value: trap::Label<ExternBlock>) -> Self {
+        // SAFETY: this is safe because in the dbscheme ExternBlock is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<RepeatExpr>> for trap::Label<Element> {
-    fn from(value: trap::Label<RepeatExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme RepeatExpr is a subclass of Element
+impl From<trap::Label<ExternBlock>> for trap::Label<Item> {
+    fn from(value: trap::Label<ExternBlock>) -> Self {
+        // SAFETY: this is safe because in the dbscheme ExternBlock is a subclass of Item
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<RepeatExpr>> for trap::Label<Expr> {
-    fn from(value: trap::Label<RepeatExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme RepeatExpr is a subclass of Expr
+impl From<trap::Label<ExternBlock>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<ExternBlock>) -> Self {
+        // SAFETY: this is safe because in the dbscheme ExternBlock is a subclass of Locatable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<RepeatExpr>> for trap::Label<Locatable> {
-    fn from(value: trap::Label<RepeatExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme RepeatExpr is a subclass of Locatable
+impl From<trap::Label<ExternBlock>> for trap::Label<Stmt> {
+    fn from(value: trap::Label<ExternBlock>) -> Self {
+        // SAFETY: this is safe because in the dbscheme ExternBlock is a subclass of Stmt
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -4150,71 +8512,1494 @@ impl From<trap::Label<RepeatExpr>> for trap::Label<Locatable> {
 }
 
 #[derive(Debug)]
-pub struct UnsafeBlockExpr {
-    pub id: trap::TrapId<UnsafeBlockExpr>,
-    pub statements: Vec<trap::Label<Stmt>>,
-    pub tail: Option<trap::Label<Expr>>,
+pub struct ExternCrate {
+    pub id: trap::TrapId<ExternCrate>,
+    pub attrs: Vec<trap::Label<Attr>>,
+    pub name_ref: Option<trap::Label<NameRef>>,
+    pub rename: Option<trap::Label<Rename>>,
+    pub visibility: Option<trap::Label<Visibility>>,
 }
 
-impl trap::TrapEntry for UnsafeBlockExpr {
+impl trap::TrapEntry for ExternCrate {
     fn extract_id(&mut self) -> trap::TrapId<Self> {
         std::mem::replace(&mut self.id, trap::TrapId::Star)
     }
 
     fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
-        out.add_tuple("unsafe_block_exprs", vec![id.into()]);
-        for (i, v) in self.statements.into_iter().enumerate() {
-            out.add_tuple("block_expr_base_statements", vec![id.into(), i.into(), v.into()]);
+        out.add_tuple("extern_crates", vec![id.into()]);
+        for (i, v) in self.attrs.into_iter().enumerate() {
+            out.add_tuple("extern_crate_attrs", vec![id.into(), i.into(), v.into()]);
         }
-        if let Some(v) = self.tail {
-            out.add_tuple("block_expr_base_tails", vec![id.into(), v.into()]);
+        if let Some(v) = self.name_ref {
+            out.add_tuple("extern_crate_name_refs", vec![id.into(), v.into()]);
+        }
+        if let Some(v) = self.rename {
+            out.add_tuple("extern_crate_renames", vec![id.into(), v.into()]);
+        }
+        if let Some(v) = self.visibility {
+            out.add_tuple("extern_crate_visibilities", vec![id.into(), v.into()]);
         }
     }
 }
 
-impl trap::TrapClass for UnsafeBlockExpr {
-    fn class_name() -> &'static str { "UnsafeBlockExpr" }
+impl trap::TrapClass for ExternCrate {
+    fn class_name() -> &'static str { "ExternCrate" }
 }
 
-impl From<trap::Label<UnsafeBlockExpr>> for trap::Label<AstNode> {
-    fn from(value: trap::Label<UnsafeBlockExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme UnsafeBlockExpr is a subclass of AstNode
+impl From<trap::Label<ExternCrate>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<ExternCrate>) -> Self {
+        // SAFETY: this is safe because in the dbscheme ExternCrate is a subclass of AstNode
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<UnsafeBlockExpr>> for trap::Label<BlockExprBase> {
-    fn from(value: trap::Label<UnsafeBlockExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme UnsafeBlockExpr is a subclass of BlockExprBase
+impl From<trap::Label<ExternCrate>> for trap::Label<Element> {
+    fn from(value: trap::Label<ExternCrate>) -> Self {
+        // SAFETY: this is safe because in the dbscheme ExternCrate is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<UnsafeBlockExpr>> for trap::Label<Element> {
-    fn from(value: trap::Label<UnsafeBlockExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme UnsafeBlockExpr is a subclass of Element
+impl From<trap::Label<ExternCrate>> for trap::Label<Item> {
+    fn from(value: trap::Label<ExternCrate>) -> Self {
+        // SAFETY: this is safe because in the dbscheme ExternCrate is a subclass of Item
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<UnsafeBlockExpr>> for trap::Label<Expr> {
-    fn from(value: trap::Label<UnsafeBlockExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme UnsafeBlockExpr is a subclass of Expr
+impl From<trap::Label<ExternCrate>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<ExternCrate>) -> Self {
+        // SAFETY: this is safe because in the dbscheme ExternCrate is a subclass of Locatable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<UnsafeBlockExpr>> for trap::Label<Locatable> {
-    fn from(value: trap::Label<UnsafeBlockExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme UnsafeBlockExpr is a subclass of Locatable
+impl From<trap::Label<ExternCrate>> for trap::Label<Stmt> {
+    fn from(value: trap::Label<ExternCrate>) -> Self {
+        // SAFETY: this is safe because in the dbscheme ExternCrate is a subclass of Stmt
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+#[derive(Debug)]
+pub struct Function {
+    pub id: trap::TrapId<Function>,
+    pub param_list: Option<trap::Label<ParamList>>,
+    pub attrs: Vec<trap::Label<Attr>>,
+    pub abi: Option<trap::Label<Abi>>,
+    pub body: Option<trap::Label<BlockExpr>>,
+    pub generic_param_list: Option<trap::Label<GenericParamList>>,
+    pub is_async: bool,
+    pub is_const: bool,
+    pub is_default: bool,
+    pub is_gen: bool,
+    pub is_unsafe: bool,
+    pub name: Option<trap::Label<Name>>,
+    pub ret_type: Option<trap::Label<RetType>>,
+    pub visibility: Option<trap::Label<Visibility>>,
+    pub where_clause: Option<trap::Label<WhereClause>>,
+}
+
+impl trap::TrapEntry for Function {
+    fn extract_id(&mut self) -> trap::TrapId<Self> {
+        std::mem::replace(&mut self.id, trap::TrapId::Star)
+    }
+
+    fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
+        out.add_tuple("functions", vec![id.into()]);
+        if let Some(v) = self.param_list {
+            out.add_tuple("callable_param_lists", vec![id.into(), v.into()]);
+        }
+        for (i, v) in self.attrs.into_iter().enumerate() {
+            out.add_tuple("callable_attrs", vec![id.into(), i.into(), v.into()]);
+        }
+        if let Some(v) = self.abi {
+            out.add_tuple("function_abis", vec![id.into(), v.into()]);
+        }
+        if let Some(v) = self.body {
+            out.add_tuple("function_bodies", vec![id.into(), v.into()]);
+        }
+        if let Some(v) = self.generic_param_list {
+            out.add_tuple("function_generic_param_lists", vec![id.into(), v.into()]);
+        }
+        if self.is_async {
+            out.add_tuple("function_is_async", vec![id.into()]);
+        }
+        if self.is_const {
+            out.add_tuple("function_is_const", vec![id.into()]);
+        }
+        if self.is_default {
+            out.add_tuple("function_is_default", vec![id.into()]);
+        }
+        if self.is_gen {
+            out.add_tuple("function_is_gen", vec![id.into()]);
+        }
+        if self.is_unsafe {
+            out.add_tuple("function_is_unsafe", vec![id.into()]);
+        }
+        if let Some(v) = self.name {
+            out.add_tuple("function_names", vec![id.into(), v.into()]);
+        }
+        if let Some(v) = self.ret_type {
+            out.add_tuple("function_ret_types", vec![id.into(), v.into()]);
+        }
+        if let Some(v) = self.visibility {
+            out.add_tuple("function_visibilities", vec![id.into(), v.into()]);
+        }
+        if let Some(v) = self.where_clause {
+            out.add_tuple("function_where_clauses", vec![id.into(), v.into()]);
+        }
+    }
+}
+
+impl trap::TrapClass for Function {
+    fn class_name() -> &'static str { "Function" }
+}
+
+impl From<trap::Label<Function>> for trap::Label<AssocItem> {
+    fn from(value: trap::Label<Function>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Function is a subclass of AssocItem
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<Function>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<Function>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Function is a subclass of AstNode
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<Function>> for trap::Label<Callable> {
+    fn from(value: trap::Label<Function>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Function is a subclass of Callable
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<Function>> for trap::Label<Element> {
+    fn from(value: trap::Label<Function>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Function is a subclass of Element
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<Function>> for trap::Label<ExternItem> {
+    fn from(value: trap::Label<Function>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Function is a subclass of ExternItem
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<Function>> for trap::Label<Item> {
+    fn from(value: trap::Label<Function>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Function is a subclass of Item
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<Function>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<Function>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Function is a subclass of Locatable
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<Function>> for trap::Label<Stmt> {
+    fn from(value: trap::Label<Function>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Function is a subclass of Stmt
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+#[derive(Debug)]
+pub struct Impl {
+    pub id: trap::TrapId<Impl>,
+    pub assoc_item_list: Option<trap::Label<AssocItemList>>,
+    pub attrs: Vec<trap::Label<Attr>>,
+    pub generic_param_list: Option<trap::Label<GenericParamList>>,
+    pub is_const: bool,
+    pub is_default: bool,
+    pub is_unsafe: bool,
+    pub self_ty: Option<trap::Label<TypeRef>>,
+    pub trait_: Option<trap::Label<TypeRef>>,
+    pub visibility: Option<trap::Label<Visibility>>,
+    pub where_clause: Option<trap::Label<WhereClause>>,
+}
+
+impl trap::TrapEntry for Impl {
+    fn extract_id(&mut self) -> trap::TrapId<Self> {
+        std::mem::replace(&mut self.id, trap::TrapId::Star)
+    }
+
+    fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
+        out.add_tuple("impls", vec![id.into()]);
+        if let Some(v) = self.assoc_item_list {
+            out.add_tuple("impl_assoc_item_lists", vec![id.into(), v.into()]);
+        }
+        for (i, v) in self.attrs.into_iter().enumerate() {
+            out.add_tuple("impl_attrs", vec![id.into(), i.into(), v.into()]);
+        }
+        if let Some(v) = self.generic_param_list {
+            out.add_tuple("impl_generic_param_lists", vec![id.into(), v.into()]);
+        }
+        if self.is_const {
+            out.add_tuple("impl_is_const", vec![id.into()]);
+        }
+        if self.is_default {
+            out.add_tuple("impl_is_default", vec![id.into()]);
+        }
+        if self.is_unsafe {
+            out.add_tuple("impl_is_unsafe", vec![id.into()]);
+        }
+        if let Some(v) = self.self_ty {
+            out.add_tuple("impl_self_ties", vec![id.into(), v.into()]);
+        }
+        if let Some(v) = self.trait_ {
+            out.add_tuple("impl_traits", vec![id.into(), v.into()]);
+        }
+        if let Some(v) = self.visibility {
+            out.add_tuple("impl_visibilities", vec![id.into(), v.into()]);
+        }
+        if let Some(v) = self.where_clause {
+            out.add_tuple("impl_where_clauses", vec![id.into(), v.into()]);
+        }
+    }
+}
+
+impl trap::TrapClass for Impl {
+    fn class_name() -> &'static str { "Impl" }
+}
+
+impl From<trap::Label<Impl>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<Impl>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Impl is a subclass of AstNode
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<Impl>> for trap::Label<Element> {
+    fn from(value: trap::Label<Impl>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Impl is a subclass of Element
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<Impl>> for trap::Label<Item> {
+    fn from(value: trap::Label<Impl>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Impl is a subclass of Item
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<Impl>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<Impl>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Impl is a subclass of Locatable
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<Impl>> for trap::Label<Stmt> {
+    fn from(value: trap::Label<Impl>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Impl is a subclass of Stmt
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+#[derive(Debug)]
+pub struct MacroCall {
+    pub id: trap::TrapId<MacroCall>,
+    pub attrs: Vec<trap::Label<Attr>>,
+    pub path: Option<trap::Label<Path>>,
+    pub token_tree: Option<trap::Label<TokenTree>>,
+}
+
+impl trap::TrapEntry for MacroCall {
+    fn extract_id(&mut self) -> trap::TrapId<Self> {
+        std::mem::replace(&mut self.id, trap::TrapId::Star)
+    }
+
+    fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
+        out.add_tuple("macro_calls", vec![id.into()]);
+        for (i, v) in self.attrs.into_iter().enumerate() {
+            out.add_tuple("macro_call_attrs", vec![id.into(), i.into(), v.into()]);
+        }
+        if let Some(v) = self.path {
+            out.add_tuple("macro_call_paths", vec![id.into(), v.into()]);
+        }
+        if let Some(v) = self.token_tree {
+            out.add_tuple("macro_call_token_trees", vec![id.into(), v.into()]);
+        }
+    }
+}
+
+impl MacroCall {
+    pub fn emit_expanded(id: trap::Label<Self>, value: trap::Label<AstNode>, out: &mut trap::Writer) {
+        out.add_tuple("macro_call_expandeds", vec![id.into(), value.into()]);
+    }
+}
+
+impl trap::TrapClass for MacroCall {
+    fn class_name() -> &'static str { "MacroCall" }
+}
+
+impl From<trap::Label<MacroCall>> for trap::Label<AssocItem> {
+    fn from(value: trap::Label<MacroCall>) -> Self {
+        // SAFETY: this is safe because in the dbscheme MacroCall is a subclass of AssocItem
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<MacroCall>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<MacroCall>) -> Self {
+        // SAFETY: this is safe because in the dbscheme MacroCall is a subclass of AstNode
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<MacroCall>> for trap::Label<Element> {
+    fn from(value: trap::Label<MacroCall>) -> Self {
+        // SAFETY: this is safe because in the dbscheme MacroCall is a subclass of Element
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<MacroCall>> for trap::Label<ExternItem> {
+    fn from(value: trap::Label<MacroCall>) -> Self {
+        // SAFETY: this is safe because in the dbscheme MacroCall is a subclass of ExternItem
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<MacroCall>> for trap::Label<Item> {
+    fn from(value: trap::Label<MacroCall>) -> Self {
+        // SAFETY: this is safe because in the dbscheme MacroCall is a subclass of Item
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<MacroCall>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<MacroCall>) -> Self {
+        // SAFETY: this is safe because in the dbscheme MacroCall is a subclass of Locatable
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<MacroCall>> for trap::Label<Stmt> {
+    fn from(value: trap::Label<MacroCall>) -> Self {
+        // SAFETY: this is safe because in the dbscheme MacroCall is a subclass of Stmt
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+#[derive(Debug)]
+pub struct MacroDef {
+    pub id: trap::TrapId<MacroDef>,
+    pub args: Option<trap::Label<TokenTree>>,
+    pub attrs: Vec<trap::Label<Attr>>,
+    pub body: Option<trap::Label<TokenTree>>,
+    pub name: Option<trap::Label<Name>>,
+    pub visibility: Option<trap::Label<Visibility>>,
+}
+
+impl trap::TrapEntry for MacroDef {
+    fn extract_id(&mut self) -> trap::TrapId<Self> {
+        std::mem::replace(&mut self.id, trap::TrapId::Star)
+    }
+
+    fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
+        out.add_tuple("macro_defs", vec![id.into()]);
+        if let Some(v) = self.args {
+            out.add_tuple("macro_def_args", vec![id.into(), v.into()]);
+        }
+        for (i, v) in self.attrs.into_iter().enumerate() {
+            out.add_tuple("macro_def_attrs", vec![id.into(), i.into(), v.into()]);
+        }
+        if let Some(v) = self.body {
+            out.add_tuple("macro_def_bodies", vec![id.into(), v.into()]);
+        }
+        if let Some(v) = self.name {
+            out.add_tuple("macro_def_names", vec![id.into(), v.into()]);
+        }
+        if let Some(v) = self.visibility {
+            out.add_tuple("macro_def_visibilities", vec![id.into(), v.into()]);
+        }
+    }
+}
+
+impl trap::TrapClass for MacroDef {
+    fn class_name() -> &'static str { "MacroDef" }
+}
+
+impl From<trap::Label<MacroDef>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<MacroDef>) -> Self {
+        // SAFETY: this is safe because in the dbscheme MacroDef is a subclass of AstNode
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<MacroDef>> for trap::Label<Element> {
+    fn from(value: trap::Label<MacroDef>) -> Self {
+        // SAFETY: this is safe because in the dbscheme MacroDef is a subclass of Element
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<MacroDef>> for trap::Label<Item> {
+    fn from(value: trap::Label<MacroDef>) -> Self {
+        // SAFETY: this is safe because in the dbscheme MacroDef is a subclass of Item
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<MacroDef>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<MacroDef>) -> Self {
+        // SAFETY: this is safe because in the dbscheme MacroDef is a subclass of Locatable
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<MacroDef>> for trap::Label<Stmt> {
+    fn from(value: trap::Label<MacroDef>) -> Self {
+        // SAFETY: this is safe because in the dbscheme MacroDef is a subclass of Stmt
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+#[derive(Debug)]
+pub struct MacroRules {
+    pub id: trap::TrapId<MacroRules>,
+    pub attrs: Vec<trap::Label<Attr>>,
+    pub name: Option<trap::Label<Name>>,
+    pub token_tree: Option<trap::Label<TokenTree>>,
+    pub visibility: Option<trap::Label<Visibility>>,
+}
+
+impl trap::TrapEntry for MacroRules {
+    fn extract_id(&mut self) -> trap::TrapId<Self> {
+        std::mem::replace(&mut self.id, trap::TrapId::Star)
+    }
+
+    fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
+        out.add_tuple("macro_rules", vec![id.into()]);
+        for (i, v) in self.attrs.into_iter().enumerate() {
+            out.add_tuple("macro_rules_attrs", vec![id.into(), i.into(), v.into()]);
+        }
+        if let Some(v) = self.name {
+            out.add_tuple("macro_rules_names", vec![id.into(), v.into()]);
+        }
+        if let Some(v) = self.token_tree {
+            out.add_tuple("macro_rules_token_trees", vec![id.into(), v.into()]);
+        }
+        if let Some(v) = self.visibility {
+            out.add_tuple("macro_rules_visibilities", vec![id.into(), v.into()]);
+        }
+    }
+}
+
+impl trap::TrapClass for MacroRules {
+    fn class_name() -> &'static str { "MacroRules" }
+}
+
+impl From<trap::Label<MacroRules>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<MacroRules>) -> Self {
+        // SAFETY: this is safe because in the dbscheme MacroRules is a subclass of AstNode
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<MacroRules>> for trap::Label<Element> {
+    fn from(value: trap::Label<MacroRules>) -> Self {
+        // SAFETY: this is safe because in the dbscheme MacroRules is a subclass of Element
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<MacroRules>> for trap::Label<Item> {
+    fn from(value: trap::Label<MacroRules>) -> Self {
+        // SAFETY: this is safe because in the dbscheme MacroRules is a subclass of Item
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<MacroRules>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<MacroRules>) -> Self {
+        // SAFETY: this is safe because in the dbscheme MacroRules is a subclass of Locatable
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<MacroRules>> for trap::Label<Stmt> {
+    fn from(value: trap::Label<MacroRules>) -> Self {
+        // SAFETY: this is safe because in the dbscheme MacroRules is a subclass of Stmt
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+#[derive(Debug)]
+pub struct MethodCallExpr {
+    pub id: trap::TrapId<MethodCallExpr>,
+    pub arg_list: Option<trap::Label<ArgList>>,
+    pub attrs: Vec<trap::Label<Attr>>,
+    pub generic_arg_list: Option<trap::Label<GenericArgList>>,
+    pub name_ref: Option<trap::Label<NameRef>>,
+    pub receiver: Option<trap::Label<Expr>>,
+}
+
+impl trap::TrapEntry for MethodCallExpr {
+    fn extract_id(&mut self) -> trap::TrapId<Self> {
+        std::mem::replace(&mut self.id, trap::TrapId::Star)
+    }
+
+    fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
+        out.add_tuple("method_call_exprs", vec![id.into()]);
+        if let Some(v) = self.arg_list {
+            out.add_tuple("call_expr_base_arg_lists", vec![id.into(), v.into()]);
+        }
+        for (i, v) in self.attrs.into_iter().enumerate() {
+            out.add_tuple("call_expr_base_attrs", vec![id.into(), i.into(), v.into()]);
+        }
+        if let Some(v) = self.generic_arg_list {
+            out.add_tuple("method_call_expr_generic_arg_lists", vec![id.into(), v.into()]);
+        }
+        if let Some(v) = self.name_ref {
+            out.add_tuple("method_call_expr_name_refs", vec![id.into(), v.into()]);
+        }
+        if let Some(v) = self.receiver {
+            out.add_tuple("method_call_expr_receivers", vec![id.into(), v.into()]);
+        }
+    }
+}
+
+impl trap::TrapClass for MethodCallExpr {
+    fn class_name() -> &'static str { "MethodCallExpr" }
+}
+
+impl From<trap::Label<MethodCallExpr>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<MethodCallExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme MethodCallExpr is a subclass of AstNode
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<MethodCallExpr>> for trap::Label<CallExprBase> {
+    fn from(value: trap::Label<MethodCallExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme MethodCallExpr is a subclass of CallExprBase
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<MethodCallExpr>> for trap::Label<Element> {
+    fn from(value: trap::Label<MethodCallExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme MethodCallExpr is a subclass of Element
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<MethodCallExpr>> for trap::Label<Expr> {
+    fn from(value: trap::Label<MethodCallExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme MethodCallExpr is a subclass of Expr
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<MethodCallExpr>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<MethodCallExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme MethodCallExpr is a subclass of Locatable
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<MethodCallExpr>> for trap::Label<Resolvable> {
+    fn from(value: trap::Label<MethodCallExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme MethodCallExpr is a subclass of Resolvable
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+#[derive(Debug)]
+pub struct Module {
+    pub id: trap::TrapId<Module>,
+    pub attrs: Vec<trap::Label<Attr>>,
+    pub item_list: Option<trap::Label<ItemList>>,
+    pub name: Option<trap::Label<Name>>,
+    pub visibility: Option<trap::Label<Visibility>>,
+}
+
+impl trap::TrapEntry for Module {
+    fn extract_id(&mut self) -> trap::TrapId<Self> {
+        std::mem::replace(&mut self.id, trap::TrapId::Star)
+    }
+
+    fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
+        out.add_tuple("modules", vec![id.into()]);
+        for (i, v) in self.attrs.into_iter().enumerate() {
+            out.add_tuple("module_attrs", vec![id.into(), i.into(), v.into()]);
+        }
+        if let Some(v) = self.item_list {
+            out.add_tuple("module_item_lists", vec![id.into(), v.into()]);
+        }
+        if let Some(v) = self.name {
+            out.add_tuple("module_names", vec![id.into(), v.into()]);
+        }
+        if let Some(v) = self.visibility {
+            out.add_tuple("module_visibilities", vec![id.into(), v.into()]);
+        }
+    }
+}
+
+impl trap::TrapClass for Module {
+    fn class_name() -> &'static str { "Module" }
+}
+
+impl From<trap::Label<Module>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<Module>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Module is a subclass of AstNode
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<Module>> for trap::Label<Element> {
+    fn from(value: trap::Label<Module>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Module is a subclass of Element
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<Module>> for trap::Label<Item> {
+    fn from(value: trap::Label<Module>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Module is a subclass of Item
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<Module>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<Module>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Module is a subclass of Locatable
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<Module>> for trap::Label<Stmt> {
+    fn from(value: trap::Label<Module>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Module is a subclass of Stmt
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+#[derive(Debug)]
+pub struct PathExpr {
+    pub id: trap::TrapId<PathExpr>,
+    pub attrs: Vec<trap::Label<Attr>>,
+    pub path: Option<trap::Label<Path>>,
+}
+
+impl trap::TrapEntry for PathExpr {
+    fn extract_id(&mut self) -> trap::TrapId<Self> {
+        std::mem::replace(&mut self.id, trap::TrapId::Star)
+    }
+
+    fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
+        out.add_tuple("path_exprs", vec![id.into()]);
+        for (i, v) in self.attrs.into_iter().enumerate() {
+            out.add_tuple("path_expr_attrs", vec![id.into(), i.into(), v.into()]);
+        }
+        if let Some(v) = self.path {
+            out.add_tuple("path_expr_paths", vec![id.into(), v.into()]);
+        }
+    }
+}
+
+impl trap::TrapClass for PathExpr {
+    fn class_name() -> &'static str { "PathExpr" }
+}
+
+impl From<trap::Label<PathExpr>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<PathExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme PathExpr is a subclass of AstNode
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<PathExpr>> for trap::Label<Element> {
+    fn from(value: trap::Label<PathExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme PathExpr is a subclass of Element
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<PathExpr>> for trap::Label<Expr> {
+    fn from(value: trap::Label<PathExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme PathExpr is a subclass of Expr
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<PathExpr>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<PathExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme PathExpr is a subclass of Locatable
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<PathExpr>> for trap::Label<PathExprBase> {
+    fn from(value: trap::Label<PathExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme PathExpr is a subclass of PathExprBase
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+#[derive(Debug)]
+pub struct Static {
+    pub id: trap::TrapId<Static>,
+    pub attrs: Vec<trap::Label<Attr>>,
+    pub body: Option<trap::Label<Expr>>,
+    pub is_mut: bool,
+    pub is_static: bool,
+    pub name: Option<trap::Label<Name>>,
+    pub ty: Option<trap::Label<TypeRef>>,
+    pub visibility: Option<trap::Label<Visibility>>,
+}
+
+impl trap::TrapEntry for Static {
+    fn extract_id(&mut self) -> trap::TrapId<Self> {
+        std::mem::replace(&mut self.id, trap::TrapId::Star)
+    }
+
+    fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
+        out.add_tuple("statics", vec![id.into()]);
+        for (i, v) in self.attrs.into_iter().enumerate() {
+            out.add_tuple("static_attrs", vec![id.into(), i.into(), v.into()]);
+        }
+        if let Some(v) = self.body {
+            out.add_tuple("static_bodies", vec![id.into(), v.into()]);
+        }
+        if self.is_mut {
+            out.add_tuple("static_is_mut", vec![id.into()]);
+        }
+        if self.is_static {
+            out.add_tuple("static_is_static", vec![id.into()]);
+        }
+        if let Some(v) = self.name {
+            out.add_tuple("static_names", vec![id.into(), v.into()]);
+        }
+        if let Some(v) = self.ty {
+            out.add_tuple("static_ties", vec![id.into(), v.into()]);
+        }
+        if let Some(v) = self.visibility {
+            out.add_tuple("static_visibilities", vec![id.into(), v.into()]);
+        }
+    }
+}
+
+impl trap::TrapClass for Static {
+    fn class_name() -> &'static str { "Static" }
+}
+
+impl From<trap::Label<Static>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<Static>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Static is a subclass of AstNode
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<Static>> for trap::Label<Element> {
+    fn from(value: trap::Label<Static>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Static is a subclass of Element
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<Static>> for trap::Label<ExternItem> {
+    fn from(value: trap::Label<Static>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Static is a subclass of ExternItem
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<Static>> for trap::Label<Item> {
+    fn from(value: trap::Label<Static>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Static is a subclass of Item
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<Static>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<Static>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Static is a subclass of Locatable
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<Static>> for trap::Label<Stmt> {
+    fn from(value: trap::Label<Static>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Static is a subclass of Stmt
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+#[derive(Debug)]
+pub struct Struct {
+    pub id: trap::TrapId<Struct>,
+    pub attrs: Vec<trap::Label<Attr>>,
+    pub field_list: Option<trap::Label<FieldList>>,
+    pub generic_param_list: Option<trap::Label<GenericParamList>>,
+    pub name: Option<trap::Label<Name>>,
+    pub visibility: Option<trap::Label<Visibility>>,
+    pub where_clause: Option<trap::Label<WhereClause>>,
+}
+
+impl trap::TrapEntry for Struct {
+    fn extract_id(&mut self) -> trap::TrapId<Self> {
+        std::mem::replace(&mut self.id, trap::TrapId::Star)
+    }
+
+    fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
+        out.add_tuple("structs", vec![id.into()]);
+        for (i, v) in self.attrs.into_iter().enumerate() {
+            out.add_tuple("struct_attrs", vec![id.into(), i.into(), v.into()]);
+        }
+        if let Some(v) = self.field_list {
+            out.add_tuple("struct_field_lists", vec![id.into(), v.into()]);
+        }
+        if let Some(v) = self.generic_param_list {
+            out.add_tuple("struct_generic_param_lists", vec![id.into(), v.into()]);
+        }
+        if let Some(v) = self.name {
+            out.add_tuple("struct_names", vec![id.into(), v.into()]);
+        }
+        if let Some(v) = self.visibility {
+            out.add_tuple("struct_visibilities", vec![id.into(), v.into()]);
+        }
+        if let Some(v) = self.where_clause {
+            out.add_tuple("struct_where_clauses", vec![id.into(), v.into()]);
+        }
+    }
+}
+
+impl trap::TrapClass for Struct {
+    fn class_name() -> &'static str { "Struct" }
+}
+
+impl From<trap::Label<Struct>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<Struct>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Struct is a subclass of AstNode
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<Struct>> for trap::Label<Element> {
+    fn from(value: trap::Label<Struct>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Struct is a subclass of Element
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<Struct>> for trap::Label<Item> {
+    fn from(value: trap::Label<Struct>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Struct is a subclass of Item
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<Struct>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<Struct>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Struct is a subclass of Locatable
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<Struct>> for trap::Label<Stmt> {
+    fn from(value: trap::Label<Struct>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Struct is a subclass of Stmt
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+#[derive(Debug)]
+pub struct Trait {
+    pub id: trap::TrapId<Trait>,
+    pub assoc_item_list: Option<trap::Label<AssocItemList>>,
+    pub attrs: Vec<trap::Label<Attr>>,
+    pub generic_param_list: Option<trap::Label<GenericParamList>>,
+    pub is_auto: bool,
+    pub is_unsafe: bool,
+    pub name: Option<trap::Label<Name>>,
+    pub type_bound_list: Option<trap::Label<TypeBoundList>>,
+    pub visibility: Option<trap::Label<Visibility>>,
+    pub where_clause: Option<trap::Label<WhereClause>>,
+}
+
+impl trap::TrapEntry for Trait {
+    fn extract_id(&mut self) -> trap::TrapId<Self> {
+        std::mem::replace(&mut self.id, trap::TrapId::Star)
+    }
+
+    fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
+        out.add_tuple("traits", vec![id.into()]);
+        if let Some(v) = self.assoc_item_list {
+            out.add_tuple("trait_assoc_item_lists", vec![id.into(), v.into()]);
+        }
+        for (i, v) in self.attrs.into_iter().enumerate() {
+            out.add_tuple("trait_attrs", vec![id.into(), i.into(), v.into()]);
+        }
+        if let Some(v) = self.generic_param_list {
+            out.add_tuple("trait_generic_param_lists", vec![id.into(), v.into()]);
+        }
+        if self.is_auto {
+            out.add_tuple("trait_is_auto", vec![id.into()]);
+        }
+        if self.is_unsafe {
+            out.add_tuple("trait_is_unsafe", vec![id.into()]);
+        }
+        if let Some(v) = self.name {
+            out.add_tuple("trait_names", vec![id.into(), v.into()]);
+        }
+        if let Some(v) = self.type_bound_list {
+            out.add_tuple("trait_type_bound_lists", vec![id.into(), v.into()]);
+        }
+        if let Some(v) = self.visibility {
+            out.add_tuple("trait_visibilities", vec![id.into(), v.into()]);
+        }
+        if let Some(v) = self.where_clause {
+            out.add_tuple("trait_where_clauses", vec![id.into(), v.into()]);
+        }
+    }
+}
+
+impl trap::TrapClass for Trait {
+    fn class_name() -> &'static str { "Trait" }
+}
+
+impl From<trap::Label<Trait>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<Trait>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Trait is a subclass of AstNode
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<Trait>> for trap::Label<Element> {
+    fn from(value: trap::Label<Trait>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Trait is a subclass of Element
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<Trait>> for trap::Label<Item> {
+    fn from(value: trap::Label<Trait>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Trait is a subclass of Item
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<Trait>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<Trait>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Trait is a subclass of Locatable
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<Trait>> for trap::Label<Stmt> {
+    fn from(value: trap::Label<Trait>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Trait is a subclass of Stmt
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+#[derive(Debug)]
+pub struct TraitAlias {
+    pub id: trap::TrapId<TraitAlias>,
+    pub attrs: Vec<trap::Label<Attr>>,
+    pub generic_param_list: Option<trap::Label<GenericParamList>>,
+    pub name: Option<trap::Label<Name>>,
+    pub type_bound_list: Option<trap::Label<TypeBoundList>>,
+    pub visibility: Option<trap::Label<Visibility>>,
+    pub where_clause: Option<trap::Label<WhereClause>>,
+}
+
+impl trap::TrapEntry for TraitAlias {
+    fn extract_id(&mut self) -> trap::TrapId<Self> {
+        std::mem::replace(&mut self.id, trap::TrapId::Star)
+    }
+
+    fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
+        out.add_tuple("trait_aliases", vec![id.into()]);
+        for (i, v) in self.attrs.into_iter().enumerate() {
+            out.add_tuple("trait_alias_attrs", vec![id.into(), i.into(), v.into()]);
+        }
+        if let Some(v) = self.generic_param_list {
+            out.add_tuple("trait_alias_generic_param_lists", vec![id.into(), v.into()]);
+        }
+        if let Some(v) = self.name {
+            out.add_tuple("trait_alias_names", vec![id.into(), v.into()]);
+        }
+        if let Some(v) = self.type_bound_list {
+            out.add_tuple("trait_alias_type_bound_lists", vec![id.into(), v.into()]);
+        }
+        if let Some(v) = self.visibility {
+            out.add_tuple("trait_alias_visibilities", vec![id.into(), v.into()]);
+        }
+        if let Some(v) = self.where_clause {
+            out.add_tuple("trait_alias_where_clauses", vec![id.into(), v.into()]);
+        }
+    }
+}
+
+impl trap::TrapClass for TraitAlias {
+    fn class_name() -> &'static str { "TraitAlias" }
+}
+
+impl From<trap::Label<TraitAlias>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<TraitAlias>) -> Self {
+        // SAFETY: this is safe because in the dbscheme TraitAlias is a subclass of AstNode
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<TraitAlias>> for trap::Label<Element> {
+    fn from(value: trap::Label<TraitAlias>) -> Self {
+        // SAFETY: this is safe because in the dbscheme TraitAlias is a subclass of Element
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<TraitAlias>> for trap::Label<Item> {
+    fn from(value: trap::Label<TraitAlias>) -> Self {
+        // SAFETY: this is safe because in the dbscheme TraitAlias is a subclass of Item
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<TraitAlias>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<TraitAlias>) -> Self {
+        // SAFETY: this is safe because in the dbscheme TraitAlias is a subclass of Locatable
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<TraitAlias>> for trap::Label<Stmt> {
+    fn from(value: trap::Label<TraitAlias>) -> Self {
+        // SAFETY: this is safe because in the dbscheme TraitAlias is a subclass of Stmt
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+#[derive(Debug)]
+pub struct TypeAlias {
+    pub id: trap::TrapId<TypeAlias>,
+    pub attrs: Vec<trap::Label<Attr>>,
+    pub generic_param_list: Option<trap::Label<GenericParamList>>,
+    pub is_default: bool,
+    pub name: Option<trap::Label<Name>>,
+    pub ty: Option<trap::Label<TypeRef>>,
+    pub type_bound_list: Option<trap::Label<TypeBoundList>>,
+    pub visibility: Option<trap::Label<Visibility>>,
+    pub where_clause: Option<trap::Label<WhereClause>>,
+}
+
+impl trap::TrapEntry for TypeAlias {
+    fn extract_id(&mut self) -> trap::TrapId<Self> {
+        std::mem::replace(&mut self.id, trap::TrapId::Star)
+    }
+
+    fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
+        out.add_tuple("type_aliases", vec![id.into()]);
+        for (i, v) in self.attrs.into_iter().enumerate() {
+            out.add_tuple("type_alias_attrs", vec![id.into(), i.into(), v.into()]);
+        }
+        if let Some(v) = self.generic_param_list {
+            out.add_tuple("type_alias_generic_param_lists", vec![id.into(), v.into()]);
+        }
+        if self.is_default {
+            out.add_tuple("type_alias_is_default", vec![id.into()]);
+        }
+        if let Some(v) = self.name {
+            out.add_tuple("type_alias_names", vec![id.into(), v.into()]);
+        }
+        if let Some(v) = self.ty {
+            out.add_tuple("type_alias_ties", vec![id.into(), v.into()]);
+        }
+        if let Some(v) = self.type_bound_list {
+            out.add_tuple("type_alias_type_bound_lists", vec![id.into(), v.into()]);
+        }
+        if let Some(v) = self.visibility {
+            out.add_tuple("type_alias_visibilities", vec![id.into(), v.into()]);
+        }
+        if let Some(v) = self.where_clause {
+            out.add_tuple("type_alias_where_clauses", vec![id.into(), v.into()]);
+        }
+    }
+}
+
+impl trap::TrapClass for TypeAlias {
+    fn class_name() -> &'static str { "TypeAlias" }
+}
+
+impl From<trap::Label<TypeAlias>> for trap::Label<AssocItem> {
+    fn from(value: trap::Label<TypeAlias>) -> Self {
+        // SAFETY: this is safe because in the dbscheme TypeAlias is a subclass of AssocItem
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<TypeAlias>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<TypeAlias>) -> Self {
+        // SAFETY: this is safe because in the dbscheme TypeAlias is a subclass of AstNode
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<TypeAlias>> for trap::Label<Element> {
+    fn from(value: trap::Label<TypeAlias>) -> Self {
+        // SAFETY: this is safe because in the dbscheme TypeAlias is a subclass of Element
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<TypeAlias>> for trap::Label<ExternItem> {
+    fn from(value: trap::Label<TypeAlias>) -> Self {
+        // SAFETY: this is safe because in the dbscheme TypeAlias is a subclass of ExternItem
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<TypeAlias>> for trap::Label<Item> {
+    fn from(value: trap::Label<TypeAlias>) -> Self {
+        // SAFETY: this is safe because in the dbscheme TypeAlias is a subclass of Item
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<TypeAlias>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<TypeAlias>) -> Self {
+        // SAFETY: this is safe because in the dbscheme TypeAlias is a subclass of Locatable
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<TypeAlias>> for trap::Label<Stmt> {
+    fn from(value: trap::Label<TypeAlias>) -> Self {
+        // SAFETY: this is safe because in the dbscheme TypeAlias is a subclass of Stmt
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+#[derive(Debug)]
+pub struct Union {
+    pub id: trap::TrapId<Union>,
+    pub attrs: Vec<trap::Label<Attr>>,
+    pub generic_param_list: Option<trap::Label<GenericParamList>>,
+    pub name: Option<trap::Label<Name>>,
+    pub record_field_list: Option<trap::Label<RecordFieldList>>,
+    pub visibility: Option<trap::Label<Visibility>>,
+    pub where_clause: Option<trap::Label<WhereClause>>,
+}
+
+impl trap::TrapEntry for Union {
+    fn extract_id(&mut self) -> trap::TrapId<Self> {
+        std::mem::replace(&mut self.id, trap::TrapId::Star)
+    }
+
+    fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
+        out.add_tuple("unions", vec![id.into()]);
+        for (i, v) in self.attrs.into_iter().enumerate() {
+            out.add_tuple("union_attrs", vec![id.into(), i.into(), v.into()]);
+        }
+        if let Some(v) = self.generic_param_list {
+            out.add_tuple("union_generic_param_lists", vec![id.into(), v.into()]);
+        }
+        if let Some(v) = self.name {
+            out.add_tuple("union_names", vec![id.into(), v.into()]);
+        }
+        if let Some(v) = self.record_field_list {
+            out.add_tuple("union_record_field_lists", vec![id.into(), v.into()]);
+        }
+        if let Some(v) = self.visibility {
+            out.add_tuple("union_visibilities", vec![id.into(), v.into()]);
+        }
+        if let Some(v) = self.where_clause {
+            out.add_tuple("union_where_clauses", vec![id.into(), v.into()]);
+        }
+    }
+}
+
+impl trap::TrapClass for Union {
+    fn class_name() -> &'static str { "Union" }
+}
+
+impl From<trap::Label<Union>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<Union>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Union is a subclass of AstNode
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<Union>> for trap::Label<Element> {
+    fn from(value: trap::Label<Union>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Union is a subclass of Element
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<Union>> for trap::Label<Item> {
+    fn from(value: trap::Label<Union>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Union is a subclass of Item
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<Union>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<Union>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Union is a subclass of Locatable
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<Union>> for trap::Label<Stmt> {
+    fn from(value: trap::Label<Union>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Union is a subclass of Stmt
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+#[derive(Debug)]
+pub struct Use {
+    pub id: trap::TrapId<Use>,
+    pub attrs: Vec<trap::Label<Attr>>,
+    pub use_tree: Option<trap::Label<UseTree>>,
+    pub visibility: Option<trap::Label<Visibility>>,
+}
+
+impl trap::TrapEntry for Use {
+    fn extract_id(&mut self) -> trap::TrapId<Self> {
+        std::mem::replace(&mut self.id, trap::TrapId::Star)
+    }
+
+    fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
+        out.add_tuple("uses", vec![id.into()]);
+        for (i, v) in self.attrs.into_iter().enumerate() {
+            out.add_tuple("use_attrs", vec![id.into(), i.into(), v.into()]);
+        }
+        if let Some(v) = self.use_tree {
+            out.add_tuple("use_use_trees", vec![id.into(), v.into()]);
+        }
+        if let Some(v) = self.visibility {
+            out.add_tuple("use_visibilities", vec![id.into(), v.into()]);
+        }
+    }
+}
+
+impl trap::TrapClass for Use {
+    fn class_name() -> &'static str { "Use" }
+}
+
+impl From<trap::Label<Use>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<Use>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Use is a subclass of AstNode
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<Use>> for trap::Label<Element> {
+    fn from(value: trap::Label<Use>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Use is a subclass of Element
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<Use>> for trap::Label<Item> {
+    fn from(value: trap::Label<Use>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Use is a subclass of Item
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<Use>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<Use>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Use is a subclass of Locatable
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<Use>> for trap::Label<Stmt> {
+    fn from(value: trap::Label<Use>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Use is a subclass of Stmt
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
diff --git a/rust/extractor/src/main.rs b/rust/extractor/src/main.rs
index 8d1bcc98ab6..ecbdc965f8e 100644
--- a/rust/extractor/src/main.rs
+++ b/rust/extractor/src/main.rs
@@ -1,90 +1,159 @@
-use crate::trap::TrapId;
+use crate::rust_analyzer::path_to_file_id;
 use anyhow::Context;
-use ra_ap_hir::db::DefDatabase;
-use ra_ap_hir::Crate;
-use ra_ap_load_cargo::{load_workspace_at, LoadCargoConfig, ProcMacroServerChoice};
-use ra_ap_project_model::CargoConfig;
-use ra_ap_project_model::RustLibSource;
-use ra_ap_vfs::AbsPathBuf;
-use std::path::PathBuf;
+use archive::Archiver;
+use log::info;
+use ra_ap_hir::Semantics;
+use ra_ap_ide_db::line_index::{LineCol, LineIndex};
+use ra_ap_ide_db::RootDatabase;
+use ra_ap_project_model::ProjectManifest;
+use ra_ap_vfs::Vfs;
+use rust_analyzer::{ParseResult, RustAnalyzer};
+use std::{
+    collections::HashMap,
+    path::{Path, PathBuf},
+};
 
 mod archive;
 mod config;
 pub mod generated;
-pub mod path;
+mod qltest;
+mod rust_analyzer;
 mod translate;
 pub mod trap;
 
-fn find_project_manifests(
-    files: &[PathBuf],
-) -> anyhow::Result<Vec<ra_ap_project_model::ProjectManifest>> {
-    let current = std::env::current_dir()?;
-    let abs_files: Vec<_> = files
-        .iter()
-        .map(|path| AbsPathBuf::assert_utf8(current.join(path)))
-        .collect();
-    Ok(ra_ap_project_model::ProjectManifest::discover_all(
-        &abs_files,
-    ))
+struct Extractor<'a> {
+    archiver: &'a Archiver,
+    traps: &'a trap::TrapFileProvider,
+}
+
+impl Extractor<'_> {
+    fn extract(&self, rust_analyzer: &rust_analyzer::RustAnalyzer, file: &std::path::Path) {
+        self.archiver.archive(file);
+
+        let ParseResult {
+            ast,
+            text,
+            errors,
+            semantics_info,
+        } = rust_analyzer.parse(file);
+        let line_index = LineIndex::new(text.as_ref());
+        let display_path = file.to_string_lossy();
+        let mut trap = self.traps.create("source", file);
+        let label = trap.emit_file(file);
+        let mut translator = translate::Translator::new(
+            trap,
+            display_path.as_ref(),
+            label,
+            line_index,
+            semantics_info.as_ref().ok(),
+        );
+
+        for err in errors {
+            translator.emit_parse_error(&ast, &err);
+        }
+        let no_location = (LineCol { line: 0, col: 0 }, LineCol { line: 0, col: 0 });
+        if let Err(reason) = semantics_info {
+            let message = format!("semantic analyzer unavailable ({reason})");
+            let full_message = format!(
+                "{message}: macro expansion, call graph, and type inference will be skipped."
+            );
+            translator.emit_diagnostic(
+                trap::DiagnosticSeverity::Warning,
+                "semantics".to_owned(),
+                message,
+                full_message,
+                no_location,
+            );
+        }
+        translator.emit_source_file(ast);
+        translator.trap.commit().unwrap_or_else(|err| {
+            log::error!(
+                "Failed to write trap file for: {}: {}",
+                display_path,
+                err.to_string()
+            )
+        });
+    }
+
+    pub fn extract_with_semantics(
+        &self,
+        file: &Path,
+        semantics: &Semantics<'_, RootDatabase>,
+        vfs: &Vfs,
+    ) {
+        self.extract(&RustAnalyzer::new(vfs, semantics), file);
+    }
+    pub fn extract_without_semantics(&self, file: &Path, reason: &str) {
+        self.extract(&RustAnalyzer::WithoutSemantics { reason }, file);
+    }
 }
 
 fn main() -> anyhow::Result<()> {
-    let cfg = config::Config::extract().context("failed to load configuration")?;
+    let mut cfg = config::Config::extract().context("failed to load configuration")?;
     stderrlog::new()
         .module(module_path!())
         .verbosity(2 + cfg.verbose as usize)
         .init()?;
-    log::info!("{cfg:?}");
+    if cfg.qltest {
+        qltest::prepare(&mut cfg)?;
+    }
+    info!("{cfg:#?}\n");
+
     let traps = trap::TrapFileProvider::new(&cfg).context("failed to set up trap files")?;
     let archiver = archive::Archiver {
-        root: cfg.source_archive_dir,
+        root: cfg.source_archive_dir.clone(),
     };
+    let extractor = Extractor {
+        archiver: &archiver,
+        traps: &traps,
+    };
+    let files: Vec<PathBuf> = cfg
+        .inputs
+        .iter()
+        .map(|file| {
+            let file = std::path::absolute(file).unwrap_or(file.to_path_buf());
+            std::fs::canonicalize(&file).unwrap_or(file)
+        })
+        .collect();
+    let manifests = rust_analyzer::find_project_manifests(&files)?;
+    let mut map: HashMap<&Path, (&ProjectManifest, Vec<&Path>)> = manifests
+        .iter()
+        .map(|x| (x.manifest_path().parent().as_ref(), (x, Vec::new())))
+        .collect();
 
-    let config = CargoConfig {
-        sysroot: Some(RustLibSource::Discover),
-        target_dir: ra_ap_paths::Utf8PathBuf::from_path_buf(cfg.scratch_dir)
-            .map(|x| x.join("target"))
-            .ok(),
-        ..Default::default()
-    };
-    let progress = |t| (log::info!("progress: {}", t));
-    let load_config = LoadCargoConfig {
-        load_out_dirs_from_check: true,
-        with_proc_macro_server: ProcMacroServerChoice::Sysroot,
-        prefill_caches: false,
-    };
-    let projects = find_project_manifests(&cfg.inputs).context("loading inputs")?;
-    for project in projects {
-        let (db, vfs, _macro_server) = load_workspace_at(
-            project.manifest_path().as_ref(),
-            &config,
-            &load_config,
-            &progress,
-        )?;
-
-        let crates = <dyn DefDatabase>::crate_graph(&db);
-        for crate_id in crates.iter() {
-            let krate = Crate::from(crate_id);
-            if !cfg.extract_dependencies && !krate.origin(&db).is_local() {
-                continue;
+    'outer: for file in &files {
+        for ancestor in file.as_path().ancestors() {
+            if let Some((_, files)) = map.get_mut(ancestor) {
+                files.push(file);
+                continue 'outer;
+            }
+        }
+        extractor.extract_without_semantics(file, "no manifest found");
+    }
+    let cargo_config = cfg.to_cargo_config();
+    for (manifest, files) in map.values().filter(|(_, files)| !files.is_empty()) {
+        if let Some((ref db, ref vfs)) = RustAnalyzer::load_workspace(manifest, &cargo_config) {
+            let semantics = Semantics::new(db);
+            for file in files {
+                let Some(id) = path_to_file_id(file, vfs) else {
+                    extractor.extract_without_semantics(
+                        file,
+                        "not included in files loaded from manifest",
+                    );
+                    continue;
+                };
+                if semantics.file_to_module_def(id).is_none() {
+                    extractor.extract_without_semantics(file, "not included as a module");
+                    continue;
+                }
+                extractor.extract_with_semantics(file, &semantics, vfs);
+            }
+        } else {
+            for file in files {
+                extractor.extract_without_semantics(file, "unable to load manifest");
             }
-            let name = krate.display_name(&db);
-            let crate_name = name
-                .as_ref()
-                .map(|n| n.canonical_name().as_str())
-                .unwrap_or("");
-            let trap = traps.create(
-                "crates",
-                &PathBuf::from(format!(
-                    "/{}_{}",
-                    crate_name,
-                    crate_id.into_raw().into_u32()
-                )),
-            );
-            translate::CrateTranslator::new(&db, trap, &krate, &vfs, &archiver)
-                .emit_crate()
-                .context("writing trap file")?;
         }
     }
+
     Ok(())
 }
diff --git a/rust/extractor/src/path.rs b/rust/extractor/src/path.rs
deleted file mode 100644
index 0da1cb2932f..00000000000
--- a/rust/extractor/src/path.rs
+++ /dev/null
@@ -1,10 +0,0 @@
-use std::fs::canonicalize;
-use std::path::{absolute, Path, PathBuf};
-
-pub fn key(p: &Path) -> PathBuf {
-    let normalized = canonicalize(p)
-        .or_else(|_| absolute(p))
-        .unwrap_or_else(|_| p.into());
-    let root = normalized.ancestors().last().unwrap(); // ancestors always yields at least one
-    normalized.strip_prefix(root).unwrap().into() // stripping an ancestor always works
-}
diff --git a/rust/extractor/src/qltest.rs b/rust/extractor/src/qltest.rs
new file mode 100644
index 00000000000..f047271140a
--- /dev/null
+++ b/rust/extractor/src/qltest.rs
@@ -0,0 +1,79 @@
+use crate::config::Config;
+use anyhow::Context;
+use glob::glob;
+use itertools::Itertools;
+use log::info;
+use std::ffi::OsStr;
+use std::fs;
+use std::process::Command;
+
+fn dump_lib() -> anyhow::Result<()> {
+    let path_iterator = glob("*.rs").context("globbing test sources")?;
+    let paths = path_iterator
+        .collect::<Result<Vec<_>, _>>()
+        .context("fetching test sources")?;
+    let lib = paths
+        .iter()
+        .map(|p| p.file_stem().expect("results of glob must have a name"))
+        .filter(|&p| !["main", "lib"].map(OsStr::new).contains(&p))
+        .map(|p| format!("mod {};", p.to_string_lossy()))
+        .join("\n");
+    fs::write("lib.rs", lib).context("writing lib.rs")
+}
+
+fn dump_cargo_manifest(dependencies: &[String]) -> anyhow::Result<()> {
+    let mut manifest = String::from(
+        r#"[workspace]
+[package]
+name = "test"
+version="0.0.1"
+edition="2021"
+[lib]
+path="lib.rs"
+"#,
+    );
+    if fs::exists("main.rs").context("checking existence of main.rs")? {
+        manifest.push_str(
+            r#"[[bin]]
+name = "main"
+path = "main.rs"
+"#,
+        );
+    }
+    if !dependencies.is_empty() {
+        manifest.push_str("[dependencies]\n");
+        for dep in dependencies {
+            manifest.push_str(dep);
+            manifest.push('\n');
+        }
+    }
+    fs::write("Cargo.toml", manifest).context("writing Cargo.toml")
+}
+
+fn set_sources(config: &mut Config) -> anyhow::Result<()> {
+    let path_iterator = glob("*.rs").context("globbing test sources")?;
+    config.inputs = path_iterator
+        .collect::<Result<Vec<_>, _>>()
+        .context("fetching test sources")?;
+    Ok(())
+}
+
+pub(crate) fn prepare(config: &mut Config) -> anyhow::Result<()> {
+    dump_lib()?;
+    set_sources(config)?;
+    dump_cargo_manifest(&config.qltest_dependencies)?;
+    if config.qltest_cargo_check {
+        let status = Command::new("cargo")
+            .env("RUSTFLAGS", "-Awarnings")
+            .arg("check")
+            .arg("-q")
+            .status()
+            .context("spawning cargo check")?;
+        if status.success() {
+            info!("cargo check successful");
+        } else {
+            anyhow::bail!("requested cargo check failed");
+        }
+    }
+    Ok(())
+}
diff --git a/rust/extractor/src/rust_analyzer.rs b/rust/extractor/src/rust_analyzer.rs
new file mode 100644
index 00000000000..735bacb27c1
--- /dev/null
+++ b/rust/extractor/src/rust_analyzer.rs
@@ -0,0 +1,197 @@
+use itertools::Itertools;
+use log::{debug, info};
+use ra_ap_base_db::SourceDatabase;
+use ra_ap_hir::Semantics;
+use ra_ap_ide_db::RootDatabase;
+use ra_ap_load_cargo::{load_workspace_at, LoadCargoConfig, ProcMacroServerChoice};
+use ra_ap_paths::Utf8PathBuf;
+use ra_ap_project_model::CargoConfig;
+use ra_ap_project_model::ProjectManifest;
+use ra_ap_span::Edition;
+use ra_ap_span::EditionedFileId;
+use ra_ap_span::TextRange;
+use ra_ap_span::TextSize;
+use ra_ap_syntax::SourceFile;
+use ra_ap_syntax::SyntaxError;
+use ra_ap_vfs::Vfs;
+use ra_ap_vfs::VfsPath;
+use ra_ap_vfs::{AbsPathBuf, FileId};
+use std::borrow::Cow;
+use std::path::{Path, PathBuf};
+use triomphe::Arc;
+
+pub enum RustAnalyzer<'a> {
+    WithSemantics {
+        vfs: &'a Vfs,
+        semantics: &'a Semantics<'a, RootDatabase>,
+    },
+    WithoutSemantics {
+        reason: &'a str,
+    },
+}
+
+pub struct FileSemanticInformation<'a> {
+    pub file_id: EditionedFileId,
+    pub semantics: &'a Semantics<'a, RootDatabase>,
+}
+
+pub struct ParseResult<'a> {
+    pub ast: SourceFile,
+    pub text: Arc<str>,
+    pub errors: Vec<SyntaxError>,
+    pub semantics_info: Result<FileSemanticInformation<'a>, &'a str>,
+}
+
+impl<'a> RustAnalyzer<'a> {
+    pub fn load_workspace(
+        project: &ProjectManifest,
+        config: &CargoConfig,
+    ) -> Option<(RootDatabase, Vfs)> {
+        let progress = |t| (log::trace!("progress: {}", t));
+        let load_config = LoadCargoConfig {
+            load_out_dirs_from_check: true,
+            with_proc_macro_server: ProcMacroServerChoice::Sysroot,
+            prefill_caches: false,
+        };
+        let manifest = project.manifest_path();
+
+        match load_workspace_at(manifest.as_ref(), config, &load_config, &progress) {
+            Ok((db, vfs, _macro_server)) => Some((db, vfs)),
+            Err(err) => {
+                log::error!("failed to load workspace for {}: {}", manifest, err);
+                None
+            }
+        }
+    }
+    pub fn new(vfs: &'a Vfs, semantics: &'a Semantics<'a, RootDatabase>) -> Self {
+        RustAnalyzer::WithSemantics { vfs, semantics }
+    }
+    pub fn parse(&self, path: &Path) -> ParseResult {
+        let no_semantics_reason;
+        match self {
+            RustAnalyzer::WithSemantics { vfs, semantics } => {
+                if let Some(file_id) = path_to_file_id(path, vfs) {
+                    if let Ok(input) = std::panic::catch_unwind(|| semantics.db.file_text(file_id))
+                    {
+                        let file_id = EditionedFileId::current_edition(file_id);
+                        let source_file = semantics.parse(file_id);
+                        let errors = semantics
+                            .db
+                            .parse_errors(file_id)
+                            .into_iter()
+                            .flat_map(|x| x.to_vec())
+                            .collect();
+
+                        return ParseResult {
+                            ast: source_file,
+                            text: input,
+                            errors,
+                            semantics_info: Ok(FileSemanticInformation { file_id, semantics }),
+                        };
+                    }
+                    debug!(
+                        "No text available for file_id '{:?}', falling back to loading file '{}' from disk.",
+                        file_id,
+                        path.to_string_lossy()
+                    );
+                    no_semantics_reason = "no text available for the file in the project";
+                } else {
+                    no_semantics_reason = "file not found in project";
+                }
+            }
+            RustAnalyzer::WithoutSemantics { reason } => {
+                no_semantics_reason = reason;
+            }
+        }
+        let mut errors = Vec::new();
+        let input = match std::fs::read(path) {
+            Ok(data) => data,
+            Err(e) => {
+                errors.push(SyntaxError::new(
+                    format!("Could not read {}: {}", path.to_string_lossy(), e),
+                    TextRange::empty(TextSize::default()),
+                ));
+                vec![]
+            }
+        };
+        let (input, err) = from_utf8_lossy(&input);
+
+        let parse = ra_ap_syntax::ast::SourceFile::parse(&input, Edition::CURRENT);
+        errors.extend(parse.errors());
+        errors.extend(err);
+        ParseResult {
+            ast: parse.tree(),
+            text: input.as_ref().into(),
+            errors,
+            semantics_info: Err(no_semantics_reason),
+        }
+    }
+}
+
+pub fn find_project_manifests(
+    files: &[PathBuf],
+) -> anyhow::Result<Vec<ra_ap_project_model::ProjectManifest>> {
+    let current = std::env::current_dir()?;
+    let abs_files: Vec<_> = files
+        .iter()
+        .map(|path| AbsPathBuf::assert_utf8(current.join(path)))
+        .collect();
+    let ret = ra_ap_project_model::ProjectManifest::discover_all(&abs_files);
+    let iter = || ret.iter().map(|m| format!("  {m}"));
+    const LOG_LIMIT: usize = 10;
+    if ret.len() <= LOG_LIMIT {
+        info!("found manifests:\n{}", iter().join("\n"));
+    } else {
+        info!(
+            "found manifests:\n{}\nand {} more",
+            iter().take(LOG_LIMIT).join("\n"),
+            ret.len() - LOG_LIMIT
+        );
+        debug!(
+            "rest of the manifests found:\n{}",
+            iter().dropping(LOG_LIMIT).join("\n")
+        );
+    }
+    Ok(ret)
+}
+fn from_utf8_lossy(v: &[u8]) -> (Cow<'_, str>, Option<SyntaxError>) {
+    let mut iter = v.utf8_chunks();
+    let (first_valid, first_invalid) = if let Some(chunk) = iter.next() {
+        let valid = chunk.valid();
+        let invalid = chunk.invalid();
+        if invalid.is_empty() {
+            debug_assert_eq!(valid.len(), v.len());
+            return (Cow::Borrowed(valid), None);
+        }
+        (valid, invalid)
+    } else {
+        return (Cow::Borrowed(""), None);
+    };
+
+    const REPLACEMENT: &str = "\u{FFFD}";
+    let error_start = first_valid.len() as u32;
+    let error_end = error_start + first_invalid.len() as u32;
+    let error_range = TextRange::new(TextSize::new(error_start), TextSize::new(error_end));
+    let error = SyntaxError::new("invalid utf-8 sequence".to_owned(), error_range);
+    let mut res = String::with_capacity(v.len());
+    res.push_str(first_valid);
+
+    res.push_str(REPLACEMENT);
+
+    for chunk in iter {
+        res.push_str(chunk.valid());
+        if !chunk.invalid().is_empty() {
+            res.push_str(REPLACEMENT);
+        }
+    }
+
+    (Cow::Owned(res), Some(error))
+}
+
+pub(crate) fn path_to_file_id(path: &Path, vfs: &Vfs) -> Option<FileId> {
+    Utf8PathBuf::from_path_buf(path.to_path_buf())
+        .ok()
+        .and_then(|x| AbsPathBuf::try_from(x).ok())
+        .map(VfsPath::from)
+        .and_then(|x| vfs.file_id(&x))
+}
diff --git a/rust/extractor/src/translate.rs b/rust/extractor/src/translate.rs
index d67f8dcbcda..4e9cda3e2aa 100644
--- a/rust/extractor/src/translate.rs
+++ b/rust/extractor/src/translate.rs
@@ -1,1120 +1,5 @@
-use crate::archive::Archiver;
-use crate::trap::{AsTrapKeyPart, Label, TrapClass, TrapFile, TrapId};
-use crate::{generated, trap_key};
-use codeql_extractor::trap;
-use ra_ap_hir::db::{DefDatabase, InternDatabase};
-use ra_ap_hir::HasSource;
-use ra_ap_hir::TypeRef;
-use ra_ap_hir::{Crate, Module, ModuleDef};
-use ra_ap_hir_def::body::{Body, BodySourceMap};
-use ra_ap_hir_def::hir::{
-    CaptureBy, ExprId, LabelId, MatchArm, PatId, RecordFieldPat, RecordLitField, Statement,
-};
-use ra_ap_hir_def::path::Path;
-use ra_ap_ide_db::line_index::LineIndex;
-use ra_ap_ide_db::{LineIndexDatabase, RootDatabase};
-use ra_ap_syntax::ast::RangeOp;
-use ra_ap_syntax::{AstNode, Edition, TextRange, TextSize};
-use ra_ap_vfs::{FileId, Vfs};
-use std::collections::HashMap;
-use std::fs;
-use std::path::PathBuf;
-use triomphe::Arc;
+mod base;
+mod generated;
+mod mappings;
 
-#[derive(Clone)]
-struct FileData {
-    label: trap::Label,
-    line_index: Arc<LineIndex>,
-}
-pub struct CrateTranslator<'a> {
-    db: &'a RootDatabase,
-    trap: TrapFile,
-    krate: &'a Crate,
-    vfs: &'a Vfs,
-    archiver: &'a Archiver,
-    file_labels: HashMap<PathBuf, FileData>,
-}
-
-impl CrateTranslator<'_> {
-    pub fn new<'a>(
-        db: &'a RootDatabase,
-        trap: TrapFile,
-        krate: &'a Crate,
-        vfs: &'a Vfs,
-        archiver: &'a Archiver,
-    ) -> CrateTranslator<'a> {
-        CrateTranslator {
-            db,
-            trap,
-            krate,
-            vfs,
-            archiver,
-            file_labels: HashMap::new(),
-        }
-    }
-
-    fn emit_file(&mut self, file_id: FileId) -> Option<FileData> {
-        self.vfs.file_path(file_id).as_path().and_then(|abs_path| {
-            let mut canonical = PathBuf::from(abs_path.as_str());
-            if !self.file_labels.contains_key(&canonical) {
-                self.archiver.archive(&canonical);
-                canonical = fs::canonicalize(&canonical).unwrap_or(canonical);
-                let label = self.trap.emit_file(&canonical);
-                let line_index = <dyn LineIndexDatabase>::line_index(self.db, file_id);
-                self.file_labels
-                    .insert(canonical.clone(), FileData { label, line_index });
-            }
-            self.file_labels.get(&canonical).cloned()
-        })
-    }
-
-    fn emit_location_for_ast_ptr<E: TrapClass, T: AstNode>(
-        &mut self,
-        label: Label<E>,
-        source: ra_ap_hir::InFile<ra_ap_syntax::AstPtr<T>>,
-    ) {
-        if let Some(data) = source
-            .file_id
-            .file_id()
-            .map(|f| f.file_id())
-            .and_then(|file_id| self.emit_file(file_id))
-        {
-            let range = source.value.text_range();
-            self.emit_location_for_textrange(label, data, range)
-        }
-    }
-
-    fn emit_location_for_expr<E: TrapClass>(
-        &mut self,
-        label: Label<E>,
-        expr: ra_ap_hir_def::hir::ExprId,
-        source_map: &BodySourceMap,
-    ) {
-        if let Ok(source) = source_map.expr_syntax(expr) {
-            self.emit_location_for_ast_ptr(label, source);
-        }
-    }
-
-    fn emit_location_for_pat<E: TrapClass>(
-        &mut self,
-        label: Label<E>,
-        pat_id: ra_ap_hir_def::hir::PatId,
-        source_map: &BodySourceMap,
-    ) {
-        if let Ok(source) = source_map.pat_syntax(pat_id) {
-            self.emit_location_for_ast_ptr(label, source);
-        }
-    }
-
-    fn emit_literal_or_const_pat(
-        &mut self,
-        pat: &ra_ap_hir_def::hir::LiteralOrConst,
-        body: &Body,
-        source_map: &BodySourceMap,
-        emit_location: impl FnOnce(&mut CrateTranslator<'_>, Label<generated::LiteralPat>),
-    ) -> Label<generated::Pat> {
-        match pat {
-            ra_ap_hir_def::hir::LiteralOrConst::Literal(_literal) => {
-                let expr = self.trap.emit(generated::LiteralExpr { id: TrapId::Star });
-                let label = self.trap.emit(generated::LiteralPat {
-                    id: TrapId::Star,
-                    expr: expr.into(),
-                });
-                emit_location(self, label);
-                label.into()
-            }
-            ra_ap_hir_def::hir::LiteralOrConst::Const(inner) => {
-                self.emit_pat(*inner, body, source_map)
-            }
-        }
-    }
-
-    fn emit_location_for_label<E: TrapClass>(
-        &mut self,
-        label: Label<E>,
-        label_id: ra_ap_hir_def::hir::LabelId,
-        source_map: &BodySourceMap,
-    ) {
-        // 'catch' a panic if the source map is incomplete
-        let source = std::panic::catch_unwind(|| source_map.label_syntax(label_id)).ok();
-        if let Some(source) = source {
-            self.emit_location_for_ast_ptr(label, source)
-        }
-    }
-    fn emit_location<E: TrapClass, T: HasSource>(&mut self, label: Label<E>, entity: T)
-    where
-        T::Ast: AstNode,
-    {
-        if let Some((data, source)) = entity
-            .source(self.db)
-            .and_then(|source| source.file_id.file_id().map(|f| (f.file_id(), source)))
-            .and_then(|(file_id, source)| self.emit_file(file_id).map(|data| (data, source)))
-        {
-            let range = source.value.syntax().text_range();
-            self.emit_location_for_textrange(label, data, range);
-        }
-    }
-    fn emit_location_for_textrange<E: TrapClass>(
-        &mut self,
-        label: Label<E>,
-        data: FileData,
-        range: TextRange,
-    ) {
-        let start = data.line_index.line_col(range.start());
-        let end = data.line_index.line_col(
-            range
-                .end()
-                .checked_sub(TextSize::new(1))
-                .unwrap_or(range.end()),
-        );
-        self.trap.emit_location(data.label, label, start, end)
-    }
-    fn emit_label(
-        &mut self,
-        label_id: LabelId,
-        body: &Body,
-        source_map: &BodySourceMap,
-    ) -> Label<generated::Label> {
-        let label = &body.labels[label_id];
-        let ret = self.trap.emit(generated::Label {
-            id: TrapId::Star,
-            name: label.name.as_str().into(),
-        });
-        self.emit_location_for_label(ret, label_id, source_map);
-        ret
-    }
-
-    fn emit_path(&mut self, _path: &Path) -> Label<generated::Path> {
-        self.trap.emit(generated::Path { id: TrapId::Star })
-    }
-
-    fn emit_record_field_pat(
-        &mut self,
-        field_pat: &RecordFieldPat,
-        body: &Body,
-        source_map: &BodySourceMap,
-    ) -> Label<generated::RecordPatField> {
-        let RecordFieldPat { name, pat } = field_pat;
-        let pat_label = self.emit_pat(*pat, body, source_map);
-        let ret = self.trap.emit(generated::RecordPatField {
-            id: TrapId::Star,
-            name: name.as_str().into(),
-            pat: pat_label,
-        });
-        self.emit_location_for_pat(ret, *pat, source_map);
-        ret
-    }
-
-    fn emit_record_lit_field(
-        &mut self,
-        field_expr: &RecordLitField,
-        body: &Body,
-        source_map: &BodySourceMap,
-    ) -> Label<generated::RecordExprField> {
-        let RecordLitField { name, expr } = field_expr;
-        let expr_label = self.emit_expr(*expr, body, source_map);
-        let ret = self.trap.emit(generated::RecordExprField {
-            id: TrapId::Star,
-            name: name.as_str().into(),
-            expr: expr_label,
-        });
-        self.emit_location_for_expr(ret, *expr, source_map);
-        ret
-    }
-    fn emit_pat(
-        &mut self,
-        pat_id: PatId,
-        body: &Body,
-        source_map: &BodySourceMap,
-    ) -> Label<generated::Pat> {
-        let pat = &body.pats[pat_id];
-        let ret = match pat {
-            ra_ap_hir_def::hir::Pat::Missing => self
-                .trap
-                .emit(generated::MissingPat { id: TrapId::Star })
-                .into(),
-            ra_ap_hir_def::hir::Pat::Wild => self
-                .trap
-                .emit(generated::WildcardPat { id: TrapId::Star })
-                .into(),
-            ra_ap_hir_def::hir::Pat::Tuple { args, ellipsis } => {
-                let args = args
-                    .into_iter()
-                    .map(|pat| self.emit_pat(*pat, body, source_map))
-                    .collect();
-                let ellipsis_index = ellipsis.and_then(|x| x.try_into().ok());
-                self.trap
-                    .emit(generated::TuplePat {
-                        id: TrapId::Star,
-                        args,
-                        ellipsis_index,
-                    })
-                    .into()
-            }
-            ra_ap_hir_def::hir::Pat::Or(args) => {
-                let args = args
-                    .into_iter()
-                    .map(|pat| self.emit_pat(*pat, body, source_map))
-                    .collect();
-                self.trap
-                    .emit(generated::OrPat {
-                        id: TrapId::Star,
-                        args,
-                    })
-                    .into()
-            }
-            ra_ap_hir_def::hir::Pat::Record {
-                path,
-                args,
-                ellipsis,
-            } => {
-                let path = path.as_ref().map(|path| self.emit_path(path));
-                if let Some(p) = path {
-                    self.emit_location_for_pat(p, pat_id, source_map)
-                }
-                let flds = args
-                    .into_iter()
-                    .map(|arg| self.emit_record_field_pat(arg, body, source_map))
-                    .collect();
-                self.trap
-                    .emit(generated::RecordPat {
-                        id: TrapId::Star,
-                        path,
-                        flds,
-                        has_ellipsis: *ellipsis,
-                    })
-                    .into()
-            }
-            ra_ap_hir_def::hir::Pat::Range { start, end } => {
-                let emit_location_for_const =
-                    |this: &mut CrateTranslator, label: Label<generated::LiteralPat>| {
-                        this.emit_location_for_pat(label, pat_id, source_map)
-                    };
-                let start = start.as_ref().map(|x| {
-                    self.emit_literal_or_const_pat(x, body, source_map, emit_location_for_const)
-                });
-
-                let end = end.as_ref().map(|x| {
-                    self.emit_literal_or_const_pat(x, body, source_map, emit_location_for_const)
-                });
-                self.trap
-                    .emit(generated::RangePat {
-                        id: TrapId::Star,
-                        start,
-                        end,
-                    })
-                    .into()
-            }
-            ra_ap_hir_def::hir::Pat::Slice {
-                prefix,
-                slice,
-                suffix,
-            } => {
-                let prefix = prefix
-                    .into_iter()
-                    .map(|pat| self.emit_pat(*pat, body, source_map))
-                    .collect();
-                let slice = slice.map(|pat| self.emit_pat(pat, body, source_map));
-                let suffix = suffix
-                    .into_iter()
-                    .map(|pat| self.emit_pat(*pat, body, source_map))
-                    .collect();
-                self.trap
-                    .emit(generated::SlicePat {
-                        id: TrapId::Star,
-                        prefix,
-                        slice,
-                        suffix,
-                    })
-                    .into()
-            }
-            ra_ap_hir_def::hir::Pat::Path(path) => {
-                let path = self.emit_path(path);
-                self.emit_location_for_pat(path, pat_id, source_map);
-
-                self.trap
-                    .emit(generated::PathPat {
-                        id: TrapId::Star,
-                        path,
-                    })
-                    .into()
-            }
-            ra_ap_hir_def::hir::Pat::Lit(expr) => {
-                let expr = self.emit_expr(*expr, body, source_map);
-                self.trap
-                    .emit(generated::LiteralPat {
-                        id: TrapId::Star,
-                        expr,
-                    })
-                    .into()
-            }
-            ra_ap_hir_def::hir::Pat::Bind { id, subpat } => {
-                let subpat = subpat.map(|pat| self.emit_pat(pat, body, source_map));
-                self.trap
-                    .emit(generated::IdentPat {
-                        id: TrapId::Star,
-                        subpat,
-                        binding_id: body.bindings[*id].name.as_str().into(),
-                    })
-                    .into()
-            }
-            ra_ap_hir_def::hir::Pat::TupleStruct {
-                path,
-                args,
-                ellipsis,
-            } => {
-                let path = path.as_ref().map(|path| self.emit_path(path));
-                if let Some(p) = path {
-                    self.emit_location_for_pat(p, pat_id, source_map)
-                }
-
-                let args = args
-                    .into_iter()
-                    .map(|arg| self.emit_pat(*arg, body, source_map))
-                    .collect();
-                self.trap
-                    .emit(generated::TupleStructPat {
-                        id: TrapId::Star,
-                        path,
-                        args,
-                        ellipsis_index: ellipsis.map(|x| x as usize),
-                    })
-                    .into()
-            }
-            ra_ap_hir_def::hir::Pat::Ref { pat, mutability } => {
-                let pat = self.emit_pat(*pat, body, source_map);
-                self.trap
-                    .emit(generated::RefPat {
-                        id: TrapId::Star,
-                        pat,
-                        is_mut: mutability.is_mut(),
-                    })
-                    .into()
-            }
-            ra_ap_hir_def::hir::Pat::Box { inner } => {
-                let inner = self.emit_pat(*inner, body, source_map);
-                self.trap
-                    .emit(generated::BoxPat {
-                        id: TrapId::Star,
-                        inner,
-                    })
-                    .into()
-            }
-            ra_ap_hir_def::hir::Pat::ConstBlock(expr) => {
-                let expr = self.emit_expr(*expr, body, source_map);
-                self.trap
-                    .emit(generated::ConstBlockPat {
-                        id: TrapId::Star,
-                        expr,
-                    })
-                    .into()
-            }
-        };
-        self.emit_location_for_pat(ret, pat_id, source_map);
-        ret
-    }
-    fn emit_type_ref(&mut self, _type_ref: &TypeRef) -> Label<generated::TypeRef> {
-        self.trap.emit(generated::TypeRef { id: TrapId::Star })
-    }
-    fn emit_match_arm(
-        &mut self,
-        arm: &MatchArm,
-        body: &Body,
-        source_map: &BodySourceMap,
-    ) -> Label<generated::MatchArm> {
-        let pat = self.emit_pat(arm.pat, body, source_map);
-        let guard = arm.guard.map(|g| self.emit_expr(g, body, source_map));
-        let expr = self.emit_expr(arm.expr, body, source_map);
-        let ret = self.trap.emit(generated::MatchArm {
-            id: TrapId::Star,
-            pat,
-            guard,
-            expr,
-        });
-        self.emit_location_for_pat(ret, arm.pat, source_map);
-        ret
-    }
-    fn emit_stmt(
-        &mut self,
-        stmt: &Statement,
-        body: &Body,
-        source_map: &BodySourceMap,
-    ) -> Label<generated::Stmt> {
-        match stmt {
-            Statement::Let {
-                pat,
-                type_ref,
-                initializer,
-                else_branch,
-            } => {
-                let pat_label = self.emit_pat(*pat, body, source_map);
-                let type_ = type_ref
-                    .as_ref()
-                    .map(|type_ref| self.emit_type_ref(type_ref));
-                let initializer =
-                    initializer.map(|initializer| self.emit_expr(initializer, body, source_map));
-                let else_ = else_branch.map(|else_| self.emit_expr(else_, body, source_map));
-
-                let ret = self.trap.emit(generated::LetStmt {
-                    id: TrapId::Star,
-                    pat: pat_label,
-                    type_,
-                    initializer,
-                    else_,
-                });
-                // TODO: find a way to get the location of the entire statement
-                self.emit_location_for_pat(ret, *pat, source_map);
-                ret.into()
-            }
-            Statement::Expr { expr, has_semi } => {
-                let expr_label = self.emit_expr(*expr, body, source_map);
-                let ret = self.trap.emit(generated::ExprStmt {
-                    id: TrapId::Star,
-                    expr: expr_label,
-                    has_semicolon: *has_semi,
-                });
-                // TODO: find a way to get the location of the entire statement
-                self.emit_location_for_expr(ret, *expr, source_map);
-                ret.into()
-            }
-            Statement::Item => self
-                .trap
-                .emit(generated::ItemStmt { id: TrapId::Star })
-                .into(),
-        }
-    }
-    fn emit_expr(
-        &mut self,
-        expr_id: ExprId,
-        body: &Body,
-        source_map: &BodySourceMap,
-    ) -> Label<generated::Expr> {
-        let expr = &body[expr_id];
-        let ret = match expr {
-            ra_ap_hir_def::hir::Expr::Missing => self
-                .trap
-                .emit(generated::MissingExpr { id: TrapId::Star })
-                .into(),
-            ra_ap_hir_def::hir::Expr::Path(path) => {
-                let path = self.emit_path(path);
-                self.emit_location_for_expr(path, expr_id, source_map);
-
-                self.trap
-                    .emit(generated::PathExpr {
-                        id: TrapId::Star,
-                        path,
-                    })
-                    .into()
-            }
-            ra_ap_hir_def::hir::Expr::If {
-                condition,
-                then_branch,
-                else_branch,
-            } => {
-                let condition = self.emit_expr(*condition, body, source_map);
-                let then = self.emit_expr(*then_branch, body, source_map);
-                let else_ = else_branch.map(|x| self.emit_expr(x, body, source_map));
-                self.trap
-                    .emit(generated::IfExpr {
-                        id: TrapId::Star,
-                        condition,
-                        then,
-                        else_,
-                    })
-                    .into()
-            }
-            ra_ap_hir_def::hir::Expr::Let { pat, expr } => {
-                let pat = self.emit_pat(*pat, body, source_map);
-                let expr = self.emit_expr(*expr, body, source_map);
-                self.trap
-                    .emit(generated::LetExpr {
-                        id: TrapId::Star,
-                        pat,
-                        expr,
-                    })
-                    .into()
-            }
-            ra_ap_hir_def::hir::Expr::Block {
-                id: _,
-                statements,
-                tail,
-                label,
-            } => {
-                let statements = statements
-                    .into_iter()
-                    .map(|stmt| self.emit_stmt(stmt, body, source_map))
-                    .collect();
-                let tail = tail.map(|expr_id| self.emit_expr(expr_id, body, source_map));
-                let label = label.map(|l| self.emit_label(l, body, source_map));
-                self.trap
-                    .emit(generated::BlockExpr {
-                        id: TrapId::Star,
-                        statements,
-                        tail,
-                        label,
-                    })
-                    .into()
-            }
-            ra_ap_hir_def::hir::Expr::Async {
-                id: _,
-                statements,
-                tail,
-            } => {
-                let statements = statements
-                    .into_iter()
-                    .map(|stmt| self.emit_stmt(stmt, body, source_map))
-                    .collect();
-                let tail = tail.map(|expr_id| self.emit_expr(expr_id, body, source_map));
-                self.trap
-                    .emit(generated::AsyncBlockExpr {
-                        id: TrapId::Star,
-                        statements,
-                        tail,
-                    })
-                    .into()
-            }
-            ra_ap_hir_def::hir::Expr::Const(const_block) => {
-                let expr_id = self.db.lookup_intern_anonymous_const(*const_block).root;
-                let expr = self.emit_expr(expr_id, body, source_map);
-                self.trap
-                    .emit(generated::ConstExpr {
-                        id: TrapId::Star,
-                        expr,
-                    })
-                    .into()
-            }
-            ra_ap_hir_def::hir::Expr::Unsafe {
-                id: _,
-                statements,
-                tail,
-            } => {
-                let statements = statements
-                    .into_iter()
-                    .map(|stmt| self.emit_stmt(stmt, body, source_map))
-                    .collect();
-                let tail = tail.map(|expr_id| self.emit_expr(expr_id, body, source_map));
-                self.trap
-                    .emit(generated::UnsafeBlockExpr {
-                        id: TrapId::Star,
-                        statements,
-                        tail,
-                    })
-                    .into()
-            }
-            ra_ap_hir_def::hir::Expr::Loop {
-                body: loop_body,
-                label,
-            } => {
-                let loop_body = self.emit_expr(*loop_body, body, source_map);
-                let label = label.map(|l| self.emit_label(l, body, source_map));
-                self.trap
-                    .emit(generated::LoopExpr {
-                        id: TrapId::Star,
-                        body: loop_body,
-                        label,
-                    })
-                    .into()
-            }
-            ra_ap_hir_def::hir::Expr::Call {
-                callee,
-                args,
-                is_assignee_expr,
-            } => {
-                let callee = self.emit_expr(*callee, body, source_map);
-                let args = args
-                    .into_iter()
-                    .map(|e| self.emit_expr(*e, body, source_map))
-                    .collect();
-                self.trap
-                    .emit(generated::CallExpr {
-                        id: TrapId::Star,
-                        callee,
-                        args,
-                        is_assignee_expr: *is_assignee_expr,
-                    })
-                    .into()
-            }
-            ra_ap_hir_def::hir::Expr::MethodCall {
-                receiver,
-                method_name,
-                args,
-                generic_args,
-            } => {
-                let receiver = self.emit_expr(*receiver, body, source_map);
-                let args = args
-                    .into_iter()
-                    .map(|e| self.emit_expr(*e, body, source_map))
-                    .collect();
-                let generic_args = generic_args.as_ref().map(|_args| {
-                    self.trap
-                        .emit(generated::GenericArgList { id: TrapId::Star })
-                });
-                self.trap
-                    .emit(generated::MethodCallExpr {
-                        id: TrapId::Star,
-                        receiver,
-                        method_name: method_name.as_str().into(),
-                        args,
-                        generic_args,
-                    })
-                    .into()
-            }
-            ra_ap_hir_def::hir::Expr::Match { expr, arms } => {
-                let expr = self.emit_expr(*expr, body, source_map);
-                let branches = arms
-                    .into_iter()
-                    .map(|e| self.emit_match_arm(e, body, source_map))
-                    .collect();
-
-                self.trap
-                    .emit(generated::MatchExpr {
-                        id: TrapId::Star,
-                        expr,
-                        branches,
-                    })
-                    .into()
-            }
-            ra_ap_hir_def::hir::Expr::Continue { label } => {
-                let label = label.map(|l| self.emit_label(l, body, source_map));
-                self.trap
-                    .emit(generated::ContinueExpr {
-                        id: TrapId::Star,
-                        label,
-                    })
-                    .into()
-            }
-            ra_ap_hir_def::hir::Expr::Break { expr, label } => {
-                let expr = expr.map(|e| self.emit_expr(e, body, source_map));
-                let label = label.map(|l| self.emit_label(l, body, source_map));
-                self.trap
-                    .emit(generated::BreakExpr {
-                        id: TrapId::Star,
-                        expr,
-                        label,
-                    })
-                    .into()
-            }
-            ra_ap_hir_def::hir::Expr::Return { expr } => {
-                let expr = expr.map(|e| self.emit_expr(e, body, source_map));
-                self.trap
-                    .emit(generated::ReturnExpr {
-                        id: TrapId::Star,
-                        expr,
-                    })
-                    .into()
-            }
-            ra_ap_hir_def::hir::Expr::Become { expr } => {
-                let expr = self.emit_expr(*expr, body, source_map);
-                self.trap
-                    .emit(generated::BecomeExpr {
-                        id: TrapId::Star,
-                        expr,
-                    })
-                    .into()
-            }
-            ra_ap_hir_def::hir::Expr::Yield { expr } => {
-                let expr = expr.map(|e| self.emit_expr(e, body, source_map));
-                self.trap
-                    .emit(generated::YieldExpr {
-                        id: TrapId::Star,
-                        expr,
-                    })
-                    .into()
-            }
-            ra_ap_hir_def::hir::Expr::Yeet { expr } => {
-                let expr = expr.map(|e| self.emit_expr(e, body, source_map));
-                self.trap
-                    .emit(generated::YeetExpr {
-                        id: TrapId::Star,
-                        expr,
-                    })
-                    .into()
-            }
-            ra_ap_hir_def::hir::Expr::RecordLit {
-                path, //TODO
-                fields,
-                spread,
-                ellipsis,
-                is_assignee_expr,
-            } => {
-                let path = path.as_ref().map(|path| self.emit_path(path));
-                if let Some(p) = path {
-                    self.emit_location_for_expr(p, expr_id, source_map)
-                }
-
-                let flds = fields
-                    .into_iter()
-                    .map(|field| self.emit_record_lit_field(field, body, source_map))
-                    .collect();
-                let spread = spread.map(|expr_id| self.emit_expr(expr_id, body, source_map));
-                self.trap
-                    .emit(generated::RecordExpr {
-                        id: TrapId::Star,
-                        path,
-                        flds,
-                        spread,
-                        has_ellipsis: *ellipsis,
-                        is_assignee_expr: *is_assignee_expr,
-                    })
-                    .into()
-            }
-            ra_ap_hir_def::hir::Expr::Field { expr, name } => {
-                let expr = self.emit_expr(*expr, body, source_map);
-                self.trap
-                    .emit(generated::FieldExpr {
-                        id: TrapId::Star,
-                        expr,
-                        name: name.as_str().into(),
-                    })
-                    .into()
-            }
-            ra_ap_hir_def::hir::Expr::Await { expr } => {
-                let expr = self.emit_expr(*expr, body, source_map);
-                self.trap
-                    .emit(generated::AwaitExpr {
-                        id: TrapId::Star,
-                        expr,
-                    })
-                    .into()
-            }
-            ra_ap_hir_def::hir::Expr::Cast { expr, type_ref } => {
-                let expr = self.emit_expr(*expr, body, source_map);
-                let type_ = self.emit_type_ref(type_ref.as_ref());
-                self.trap
-                    .emit(generated::CastExpr {
-                        id: TrapId::Star,
-                        expr,
-                        type_,
-                    })
-                    .into()
-            }
-            ra_ap_hir_def::hir::Expr::Ref {
-                expr,
-                rawness,
-                mutability,
-            } => {
-                let expr = self.emit_expr(*expr, body, source_map);
-                self.trap
-                    .emit(generated::RefExpr {
-                        id: TrapId::Star,
-                        expr,
-                        is_mut: mutability.is_mut(),
-                        is_raw: rawness.is_raw(),
-                    })
-                    .into()
-            }
-            ra_ap_hir_def::hir::Expr::Box { expr } => {
-                let expr = self.emit_expr(*expr, body, source_map);
-                self.trap
-                    .emit(generated::BoxExpr {
-                        id: TrapId::Star,
-                        expr,
-                    })
-                    .into()
-            }
-            ra_ap_hir_def::hir::Expr::UnaryOp { expr, op } => {
-                let expr = self.emit_expr(*expr, body, source_map);
-                let op = match op {
-                    ra_ap_syntax::ast::UnaryOp::Deref => "*",
-                    ra_ap_syntax::ast::UnaryOp::Not => "!",
-                    ra_ap_syntax::ast::UnaryOp::Neg => "-",
-                };
-                self.trap
-                    .emit(generated::PrefixExpr {
-                        id: TrapId::Star,
-                        expr,
-                        op: op.into(),
-                    })
-                    .into()
-            }
-            ra_ap_hir_def::hir::Expr::BinaryOp { lhs, rhs, op } => {
-                let lhs = self.emit_expr(*lhs, body, source_map);
-                let rhs = self.emit_expr(*rhs, body, source_map);
-                let op = op.map(|op| format!("{op}"));
-                self.trap
-                    .emit(generated::BinaryExpr {
-                        id: TrapId::Star,
-                        lhs,
-                        rhs,
-                        op,
-                    })
-                    .into()
-            }
-            ra_ap_hir_def::hir::Expr::Range {
-                lhs,
-                rhs,
-                range_type,
-            } => {
-                let lhs = lhs.map(|lhs| self.emit_expr(lhs, body, source_map));
-                let rhs = rhs.map(|rhs| self.emit_expr(rhs, body, source_map));
-                self.trap
-                    .emit(generated::RangeExpr {
-                        id: TrapId::Star,
-                        lhs,
-                        rhs,
-                        is_inclusive: *range_type == RangeOp::Inclusive,
-                    })
-                    .into()
-            }
-            ra_ap_hir_def::hir::Expr::Index {
-                base,
-                index,
-                is_assignee_expr,
-            } => {
-                let base = self.emit_expr(*base, body, source_map);
-                let index = self.emit_expr(*index, body, source_map);
-                self.trap
-                    .emit(generated::IndexExpr {
-                        id: TrapId::Star,
-                        base,
-                        index,
-                        is_assignee_expr: *is_assignee_expr,
-                    })
-                    .into()
-            }
-            ra_ap_hir_def::hir::Expr::Closure {
-                args,
-                arg_types,
-                ret_type,
-                body: expr,
-                closure_kind, //TODO:
-                capture_by,
-            } => {
-                let expr = self.emit_expr(*expr, body, source_map);
-                let args = args
-                    .into_iter()
-                    .map(|arg| self.emit_pat(*arg, body, source_map))
-                    .collect();
-                let ret_type = ret_type
-                    .as_ref()
-                    .map(|ret_type| self.emit_type_ref(ret_type));
-                let arg_types = arg_types
-                    .into_iter()
-                    .map(|arg_type| {
-                        arg_type
-                            .as_ref()
-                            .map(|arg_type| self.emit_type_ref(arg_type))
-                    })
-                    .collect();
-                self.trap
-                    .emit(generated::ClosureExpr {
-                        id: TrapId::Star,
-                        args,
-                        arg_types,
-                        body: expr,
-                        ret_type,
-                        closure_kind: format!("{:?}", closure_kind),
-                        is_move: *capture_by == CaptureBy::Value,
-                    })
-                    .into()
-            }
-            ra_ap_hir_def::hir::Expr::Tuple {
-                exprs,
-                is_assignee_expr,
-            } => {
-                let exprs = exprs
-                    .into_iter()
-                    .map(|expr| self.emit_expr(*expr, body, source_map))
-                    .collect();
-                self.trap
-                    .emit(generated::TupleExpr {
-                        id: TrapId::Star,
-                        exprs,
-                        is_assignee_expr: *is_assignee_expr,
-                    })
-                    .into()
-            }
-            ra_ap_hir_def::hir::Expr::Array(ra_ap_hir_def::hir::Array::ElementList {
-                elements,
-                is_assignee_expr,
-            }) => {
-                let elements = elements
-                    .into_iter()
-                    .map(|expr| self.emit_expr(*expr, body, source_map))
-                    .collect();
-                self.trap
-                    .emit(generated::ElementListExpr {
-                        id: TrapId::Star,
-                        elements,
-                        is_assignee_expr: *is_assignee_expr,
-                    })
-                    .into()
-            }
-            ra_ap_hir_def::hir::Expr::Array(ra_ap_hir_def::hir::Array::Repeat {
-                initializer,
-                repeat,
-            }) => {
-                let initializer = self.emit_expr(*initializer, body, source_map);
-                let repeat = self.emit_expr(*repeat, body, source_map);
-
-                self.trap
-                    .emit(generated::RepeatExpr {
-                        id: TrapId::Star,
-                        initializer,
-                        repeat,
-                    })
-                    .into()
-            }
-            ra_ap_hir_def::hir::Expr::Literal(_literal) => self
-                .trap
-                .emit(generated::LiteralExpr { id: TrapId::Star })
-                .into(),
-            ra_ap_hir_def::hir::Expr::Underscore => self
-                .trap
-                .emit(generated::UnderscoreExpr { id: TrapId::Star })
-                .into(),
-            ra_ap_hir_def::hir::Expr::OffsetOf(offset) => {
-                let container = self.emit_type_ref(&offset.container);
-                let fields = offset.fields.iter().map(|x| x.as_str().into()).collect();
-                self.trap
-                    .emit(generated::OffsetOfExpr {
-                        id: TrapId::Star,
-                        container,
-                        fields,
-                    })
-                    .into()
-            }
-            ra_ap_hir_def::hir::Expr::InlineAsm(asm) => {
-                let expr = self.emit_expr(asm.e, body, source_map);
-                self.trap
-                    .emit(generated::AsmExpr {
-                        id: TrapId::Star,
-                        expr,
-                    })
-                    .into()
-            }
-        };
-        self.emit_location_for_expr(ret, expr_id, source_map);
-        ret
-    }
-
-    fn emit_definition(
-        &mut self,
-        module_label: Label<generated::Module>,
-        id: ModuleDef,
-        labels: &mut Vec<Label<generated::Declaration>>,
-    ) {
-        let label = match id {
-            ModuleDef::Module(_module) => self
-                .trap
-                .emit(generated::UnimplementedDeclaration { id: TrapId::Star })
-                .into(),
-            ModuleDef::Function(function) => {
-                let def: ra_ap_hir::DefWithBody = function.into();
-
-                let name = function.name(self.db);
-
-                let (body, source_map) = self.db.body_with_source_map(def.into());
-                let txt = body.pretty_print(self.db, def.into(), Edition::Edition2021);
-                log::trace!("{}", &txt);
-                let body = self.emit_expr(body.body_expr, &body, &source_map);
-
-                let label = self.trap.emit(generated::Function {
-                    id: trap_key![module_label, name.as_str()],
-                    name: name.as_str().into(),
-                    body,
-                });
-                self.emit_location(label, function);
-                label.into()
-            }
-            ModuleDef::Adt(adt) => {
-                let label = self
-                    .trap
-                    .emit(generated::UnimplementedDeclaration { id: TrapId::Star });
-                self.emit_location(label, adt);
-                label.into()
-            }
-            ModuleDef::Variant(variant) => {
-                let label = self
-                    .trap
-                    .emit(generated::UnimplementedDeclaration { id: TrapId::Star });
-                self.emit_location(label, variant);
-                label.into()
-            }
-            ModuleDef::Const(const_) => {
-                let label = self
-                    .trap
-                    .emit(generated::UnimplementedDeclaration { id: TrapId::Star });
-                self.emit_location(label, const_);
-                label.into()
-            }
-            ModuleDef::Static(static_) => {
-                let label = self
-                    .trap
-                    .emit(generated::UnimplementedDeclaration { id: TrapId::Star });
-                self.emit_location(label, static_);
-                label.into()
-            }
-            ModuleDef::Trait(trait_) => {
-                let label = self
-                    .trap
-                    .emit(generated::UnimplementedDeclaration { id: TrapId::Star });
-                self.emit_location(label, trait_);
-                label.into()
-            }
-            ModuleDef::TraitAlias(alias) => {
-                let label = self
-                    .trap
-                    .emit(generated::UnimplementedDeclaration { id: TrapId::Star });
-                self.emit_location(label, alias);
-                label.into()
-            }
-            ModuleDef::TypeAlias(type_alias) => {
-                let label = self
-                    .trap
-                    .emit(generated::UnimplementedDeclaration { id: TrapId::Star });
-                self.emit_location(label, type_alias);
-                label.into()
-            }
-            ModuleDef::BuiltinType(_builtin_type) => self
-                .trap
-                .emit(generated::UnimplementedDeclaration { id: TrapId::Star })
-                .into(),
-            ModuleDef::Macro(macro_) => {
-                let label = self
-                    .trap
-                    .emit(generated::UnimplementedDeclaration { id: TrapId::Star });
-                self.emit_location(label, macro_);
-                label.into()
-            }
-        };
-        labels.push(label);
-    }
-
-    fn emit_module(&mut self, label: Label<generated::Module>, module: Module) {
-        let mut children = Vec::new();
-        for id in module.declarations(self.db) {
-            self.emit_definition(label, id, &mut children);
-        }
-        self.trap.emit(generated::Module {
-            id: label.into(),
-            declarations: children,
-        });
-    }
-
-    pub fn emit_crate(&mut self) -> std::io::Result<()> {
-        self.emit_file(self.krate.root_file(self.db));
-        let mut map = HashMap::<Module, Label<generated::Module>>::new();
-        for module in self.krate.modules(self.db) {
-            let mut key = String::new();
-            if let Some(parent) = module.parent(self.db) {
-                // assumption: parent was already listed
-                let parent_label = *map.get(&parent).unwrap();
-                key.push_str(&parent_label.as_key_part());
-            }
-            let def = module.definition_source(self.db);
-            if let Some(file) = def.file_id.file_id() {
-                if let Some(data) = self.emit_file(file.file_id()) {
-                    key.push_str(&data.label.as_key_part());
-                }
-            }
-            if let Some(name) = module.name(self.db) {
-                key.push_str(name.as_str());
-            }
-            let label = self.trap.label(TrapId::Key(key));
-            map.insert(module, label);
-            self.emit_module(label, module);
-        }
-        self.trap.commit()
-    }
-}
+pub use base::Translator;
diff --git a/rust/extractor/src/translate/.gitattributes b/rust/extractor/src/translate/.gitattributes
new file mode 100644
index 00000000000..d408bf18300
--- /dev/null
+++ b/rust/extractor/src/translate/.gitattributes
@@ -0,0 +1 @@
+/generated.rs linguist-generated
diff --git a/rust/extractor/src/translate/base.rs b/rust/extractor/src/translate/base.rs
new file mode 100644
index 00000000000..c7e00edb331
--- /dev/null
+++ b/rust/extractor/src/translate/base.rs
@@ -0,0 +1,511 @@
+use super::mappings::{AddressableAst, AddressableHir};
+use crate::generated::MacroCall;
+use crate::generated::{self};
+use crate::rust_analyzer::FileSemanticInformation;
+use crate::trap::{DiagnosticSeverity, TrapFile, TrapId};
+use crate::trap::{Label, TrapClass};
+use codeql_extractor::trap::{self};
+use itertools::Either;
+use log::Level;
+use ra_ap_base_db::salsa::InternKey;
+use ra_ap_base_db::CrateOrigin;
+use ra_ap_hir::db::ExpandDatabase;
+use ra_ap_hir::{Adt, Crate, ItemContainer, Module, ModuleDef, PathResolution, Semantics, Type};
+use ra_ap_hir_def::type_ref::Mutability;
+use ra_ap_hir_def::ModuleId;
+use ra_ap_hir_expand::ExpandTo;
+use ra_ap_ide_db::line_index::{LineCol, LineIndex};
+use ra_ap_ide_db::RootDatabase;
+use ra_ap_parser::SyntaxKind;
+use ra_ap_span::{EditionedFileId, TextSize};
+use ra_ap_syntax::ast::HasName;
+use ra_ap_syntax::{
+    ast, AstNode, NodeOrToken, SyntaxElementChildren, SyntaxError, SyntaxNode, SyntaxToken,
+    TextRange,
+};
+
+#[macro_export]
+macro_rules! emit_detached {
+    (MacroCall, $self:ident, $node:ident, $label:ident) => {
+        $self.extract_macro_call_expanded(&$node, $label);
+    };
+    (Function, $self:ident, $node:ident, $label:ident) => {
+        $self.extract_canonical_origin(&$node, $label.into());
+    };
+    (Trait, $self:ident, $node:ident, $label:ident) => {
+        $self.extract_canonical_origin(&$node, $label.into());
+    };
+    (Struct, $self:ident, $node:ident, $label:ident) => {
+        $self.extract_canonical_origin(&$node, $label.into());
+    };
+    (Enum, $self:ident, $node:ident, $label:ident) => {
+        $self.extract_canonical_origin(&$node, $label.into());
+    };
+    (Union, $self:ident, $node:ident, $label:ident) => {
+        $self.extract_canonical_origin(&$node, $label.into());
+    };
+    (Module, $self:ident, $node:ident, $label:ident) => {
+        $self.extract_canonical_origin(&$node, $label.into());
+    };
+    // TODO canonical origin of other items
+    (Path, $self:ident, $node:ident, $label:ident) => {
+        $self.extract_canonical_destination(&$node, $label);
+    };
+    (MethodCallExpr, $self:ident, $node:ident, $label:ident) => {
+        $self.extract_method_canonical_destination(&$node, $label);
+    };
+    ($($_:tt)*) => {};
+}
+
+pub struct Translator<'a> {
+    pub trap: TrapFile,
+    path: &'a str,
+    label: trap::Label,
+    line_index: LineIndex,
+    file_id: Option<EditionedFileId>,
+    pub semantics: Option<&'a Semantics<'a, RootDatabase>>,
+}
+
+impl<'a> Translator<'a> {
+    pub fn new(
+        trap: TrapFile,
+        path: &'a str,
+        label: trap::Label,
+        line_index: LineIndex,
+        semantic_info: Option<&FileSemanticInformation<'a>>,
+    ) -> Translator<'a> {
+        Translator {
+            trap,
+            path,
+            label,
+            line_index,
+            file_id: semantic_info.map(|i| i.file_id),
+            semantics: semantic_info.map(|i| i.semantics),
+        }
+    }
+    fn location(&self, range: TextRange) -> (LineCol, LineCol) {
+        let start = self.line_index.line_col(range.start());
+        let range_end = range.end();
+        // QL end positions are inclusive, while TextRange offsets are exclusive and point at the position
+        // right after the last character of the range. We need to shift the end offset one character to the left to
+        // get the right inclusive QL position. Unfortunately, simply subtracting `1` from the end-offset may cause
+        // the offset to point in the middle of a multi-byte character, resulting in a `panic`. Therefore we use `try_line_col`
+        // with decreasing offsets to find the start of the last character included in the range.
+        for i in 1..4 {
+            if let Some(end) = range_end
+                .checked_sub(i.into())
+                .and_then(|x| self.line_index.try_line_col(x))
+            {
+                return (start, end);
+            }
+        }
+        let end = self.line_index.line_col(range_end);
+        (start, end)
+    }
+
+    pub fn text_range_for_node(&mut self, node: &impl ast::AstNode) -> Option<TextRange> {
+        if let Some(semantics) = self.semantics.as_ref() {
+            let file_range = semantics.original_range(node.syntax());
+            let file_id = self.file_id?;
+            if file_id == file_range.file_id {
+                Some(file_range.range)
+            } else {
+                None
+            }
+        } else {
+            Some(node.syntax().text_range())
+        }
+    }
+    pub fn emit_location<T: TrapClass>(&mut self, label: Label<T>, node: &impl ast::AstNode) {
+        if let Some(range) = self.text_range_for_node(node) {
+            let (start, end) = self.location(range);
+            self.trap.emit_location(self.label, label, start, end)
+        } else {
+            self.emit_diagnostic(
+                DiagnosticSeverity::Debug,
+                "locations".to_owned(),
+                "missing location for AstNode".to_owned(),
+                "missing location for AstNode".to_owned(),
+                (LineCol { line: 0, col: 0 }, LineCol { line: 0, col: 0 }),
+            );
+        }
+    }
+    pub fn emit_location_token(
+        &mut self,
+        label: Label<generated::Token>,
+        parent: &impl ast::AstNode,
+        token: &SyntaxToken,
+    ) {
+        let parent_range = parent.syntax().text_range();
+        let token_range = token.text_range();
+        if let Some(clipped_range) = token_range.intersect(parent_range) {
+            if let Some(parent_range2) = self.text_range_for_node(parent) {
+                let token_range = clipped_range + parent_range2.start() - parent_range.start();
+                let (start, end) = self.location(token_range);
+                self.trap.emit_location(self.label, label, start, end)
+            }
+        }
+    }
+    pub fn emit_diagnostic(
+        &mut self,
+        severity: DiagnosticSeverity,
+        tag: String,
+        message: String,
+        full_message: String,
+        location: (LineCol, LineCol),
+    ) {
+        let (start, end) = location;
+        let level = match severity {
+            DiagnosticSeverity::Debug => Level::Debug,
+            DiagnosticSeverity::Info => Level::Info,
+            DiagnosticSeverity::Warning => Level::Warn,
+            DiagnosticSeverity::Error => Level::Error,
+        };
+        log::log!(
+            level,
+            "{}:{}:{}: {}",
+            self.path,
+            start.line + 1,
+            start.col + 1,
+            &full_message
+        );
+        if severity > DiagnosticSeverity::Debug {
+            let location = self.trap.emit_location_label(self.label, start, end);
+            self.trap
+                .emit_diagnostic(severity, tag, message, full_message, location);
+        }
+    }
+    pub fn emit_parse_error(&mut self, owner: &impl ast::AstNode, err: &SyntaxError) {
+        let owner_range: TextRange = owner.syntax().text_range();
+        let err_range = err.range();
+        if let Some(owner_range2) = self.text_range_for_node(owner) {
+            let location = if let Some(clipped_range) = err_range.intersect(owner_range) {
+                let err_range = clipped_range + owner_range2.start() - owner_range.start();
+                self.location(err_range)
+            } else {
+                self.location(owner_range2)
+            };
+            let message = err.to_string();
+            self.emit_diagnostic(
+                DiagnosticSeverity::Warning,
+                "parse_error".to_owned(),
+                message.clone(),
+                message,
+                location,
+            );
+        }
+    }
+    pub fn emit_tokens(
+        &mut self,
+        parent_node: &impl ast::AstNode,
+        parent_label: Label<generated::AstNode>,
+        children: SyntaxElementChildren,
+    ) {
+        for child in children {
+            if let NodeOrToken::Token(token) = child {
+                if token.kind() == SyntaxKind::COMMENT {
+                    let label = self.trap.emit(generated::Comment {
+                        id: TrapId::Star,
+                        parent: parent_label,
+                        text: token.text().to_owned(),
+                    });
+                    self.emit_location_token(label.into(), parent_node, &token);
+                }
+            }
+        }
+    }
+    fn emit_macro_expansion_parse_errors(&mut self, mcall: &ast::MacroCall, expanded: &SyntaxNode) {
+        let semantics = self.semantics.as_ref().unwrap();
+        if let Some(value) = semantics
+            .hir_file_for(expanded)
+            .macro_file()
+            .and_then(|macro_file| {
+                semantics
+                    .db
+                    .parse_macro_expansion_error(macro_file.macro_call_id)
+            })
+        {
+            if let Some(err) = &value.err {
+                let (message, _error) = err.render_to_string(semantics.db);
+
+                if err.span().anchor.file_id == semantics.hir_file_for(mcall.syntax()) {
+                    let location = err.span().range
+                        + semantics
+                            .db
+                            .ast_id_map(err.span().anchor.file_id.into())
+                            .get_erased(err.span().anchor.ast_id)
+                            .text_range()
+                            .start();
+                    self.emit_parse_error(mcall, &SyntaxError::new(message, location));
+                };
+            }
+            for err in value.value.iter() {
+                self.emit_parse_error(mcall, err);
+            }
+        }
+    }
+
+    fn emit_expanded_as(
+        &mut self,
+        expand_to: ExpandTo,
+        expanded: SyntaxNode,
+    ) -> Option<Label<generated::AstNode>> {
+        match expand_to {
+            ra_ap_hir_expand::ExpandTo::Statements => {
+                ast::MacroStmts::cast(expanded).map(|x| self.emit_macro_stmts(x).into())
+            }
+            ra_ap_hir_expand::ExpandTo::Items => {
+                ast::MacroItems::cast(expanded).map(|x| self.emit_macro_items(x).into())
+            }
+
+            ra_ap_hir_expand::ExpandTo::Pattern => {
+                ast::Pat::cast(expanded).map(|x| self.emit_pat(x).into())
+            }
+            ra_ap_hir_expand::ExpandTo::Type => {
+                ast::Type::cast(expanded).map(|x| self.emit_type(x).into())
+            }
+            ra_ap_hir_expand::ExpandTo::Expr => {
+                ast::Expr::cast(expanded).map(|x| self.emit_expr(x).into())
+            }
+        }
+    }
+    pub(crate) fn extract_macro_call_expanded(
+        &mut self,
+        mcall: &ast::MacroCall,
+        label: Label<generated::MacroCall>,
+    ) {
+        if let Some(expanded) = self.semantics.as_ref().and_then(|s| s.expand(mcall)) {
+            self.emit_macro_expansion_parse_errors(mcall, &expanded);
+            let expand_to = ra_ap_hir_expand::ExpandTo::from_call_site(mcall);
+            let kind = expanded.kind();
+            if let Some(value) = self.emit_expanded_as(expand_to, expanded) {
+                MacroCall::emit_expanded(label, value, &mut self.trap.writer);
+            } else {
+                let range = self.text_range_for_node(mcall);
+                self.emit_parse_error(mcall, &SyntaxError::new(
+                    format!(
+                        "macro expansion failed: the macro '{}' expands to {:?} but a {:?} was expected",
+                        mcall.path().map(|p| p.to_string()).unwrap_or_default(),
+                        kind, expand_to
+                    ),
+                    range.unwrap_or_else(|| TextRange::empty(TextSize::from(0))),
+                ));
+            }
+        } else if self.semantics.is_some() {
+            // let's not spam warnings if we don't have semantics, we already emitted one
+            let range = self.text_range_for_node(mcall);
+            self.emit_parse_error(
+                mcall,
+                &SyntaxError::new(
+                    format!(
+                        "macro expansion failed: could not resolve macro '{}'",
+                        mcall.path().map(|p| p.to_string()).unwrap_or_default()
+                    ),
+                    range.unwrap_or_else(|| TextRange::empty(TextSize::from(0))),
+                ),
+            );
+        }
+    }
+    fn canonical_path_from_type(&self, ty: Type) -> Option<String> {
+        let sema = self.semantics.as_ref().unwrap();
+        // rust-analyzer doesn't provide a type enum directly
+        if let Some(it) = ty.as_adt() {
+            return match it {
+                Adt::Struct(it) => self.canonical_path_from_hir(it),
+                Adt::Union(it) => self.canonical_path_from_hir(it),
+                Adt::Enum(it) => self.canonical_path_from_hir(it),
+            };
+        };
+        if let Some((it, size)) = ty.as_array(sema.db) {
+            return self
+                .canonical_path_from_type(it)
+                .map(|p| format!("[{p}; {size}]"));
+        }
+        if let Some(it) = ty.as_slice() {
+            return self
+                .canonical_path_from_type(it)
+                .map(|p| format!("[{}]", p));
+        }
+        if let Some(it) = ty.as_builtin() {
+            return Some(it.name().as_str().to_owned());
+        }
+        if let Some(it) = ty.as_dyn_trait() {
+            return self.canonical_path_from_hir(it).map(|p| format!("dyn {p}"));
+        }
+        if let Some((it, mutability)) = ty.as_reference() {
+            let mut_str = match mutability {
+                Mutability::Shared => "",
+                Mutability::Mut => "mut ",
+            };
+            return self
+                .canonical_path_from_type(it)
+                .map(|p| format!("&{mut_str}{p}"));
+        }
+        if let Some(it) = ty.as_impl_traits(sema.db) {
+            let paths = it
+                .map(|t| self.canonical_path_from_hir(t))
+                .collect::<Option<Vec<_>>>()?;
+            return Some(format!("impl {}", paths.join(" + ")));
+        }
+        if ty.as_type_param(sema.db).is_some() {
+            // from the canonical path perspective, we just want a special name
+            // e.g. `crate::<_ as SomeTrait>::func`
+            return Some("_".to_owned());
+        }
+        None
+    }
+
+    fn canonical_path_from_hir_module(&self, item: Module) -> Option<String> {
+        if let Some(block_id) = ModuleId::from(item).containing_block() {
+            // this means this is a block module, i.e. a virtual module for a block scope
+            return Some(format!("{{{}}}", block_id.as_intern_id()));
+        }
+        if item.is_crate_root() {
+            return Some("crate".into());
+        }
+        self.canonical_path_from_hir::<ast::Module>(item)
+    }
+
+    fn canonical_path_from_hir<T: AstNode>(&self, item: impl AddressableHir<T>) -> Option<String> {
+        // if we have a Hir entity, it means we have semantics
+        let sema = self.semantics.as_ref().unwrap();
+        let name = item.name(sema)?;
+        let container = item.container(sema.db);
+        let prefix = match container {
+            ItemContainer::Trait(it) => self.canonical_path_from_hir(it),
+            ItemContainer::Impl(it) => {
+                let ty = self.canonical_path_from_type(it.self_ty(sema.db))?;
+                if let Some(trait_) = it.trait_(sema.db) {
+                    let tr = self.canonical_path_from_hir(trait_)?;
+                    Some(format!("<{ty} as {tr}>"))
+                } else {
+                    Some(format!("<{ty}>"))
+                }
+            }
+            ItemContainer::Module(it) => self.canonical_path_from_hir_module(it),
+            ItemContainer::ExternBlock() | ItemContainer::Crate(_) => Some("".to_owned()),
+        }?;
+        Some(format!("{prefix}::{name}"))
+    }
+
+    fn canonical_path_from_module_def(&self, item: ModuleDef) -> Option<String> {
+        match item {
+            ModuleDef::Module(it) => self.canonical_path_from_hir(it),
+            ModuleDef::Function(it) => self.canonical_path_from_hir(it),
+            ModuleDef::Adt(Adt::Enum(it)) => self.canonical_path_from_hir(it),
+            ModuleDef::Adt(Adt::Struct(it)) => self.canonical_path_from_hir(it),
+            ModuleDef::Adt(Adt::Union(it)) => self.canonical_path_from_hir(it),
+            ModuleDef::Trait(it) => self.canonical_path_from_hir(it),
+            ModuleDef::Static(_) => None,
+            ModuleDef::TraitAlias(_) => None,
+            ModuleDef::TypeAlias(_) => None,
+            ModuleDef::BuiltinType(_) => None,
+            ModuleDef::Macro(_) => None,
+            ModuleDef::Variant(_) => None,
+            ModuleDef::Const(_) => None,
+        }
+    }
+
+    fn origin_from_hir<T: AstNode>(&self, item: impl AddressableHir<T>) -> String {
+        // if we have a Hir entity, it means we have semantics
+        let sema = self.semantics.as_ref().unwrap();
+        self.origin_from_crate(item.module(sema).krate())
+    }
+
+    fn origin_from_crate(&self, item: Crate) -> String {
+        // if we have a Hir entity, it means we have semantics
+        let sema = self.semantics.as_ref().unwrap();
+        match item.origin(sema.db) {
+            CrateOrigin::Rustc { name } => format!("rustc:{}", name),
+            CrateOrigin::Local { repo, name } => format!(
+                "repo:{}:{}",
+                repo.unwrap_or_default(),
+                name.map(|s| s.as_str().to_owned()).unwrap_or_default()
+            ),
+            CrateOrigin::Library { repo, name } => {
+                format!("repo:{}:{}", repo.unwrap_or_default(), name)
+            }
+            CrateOrigin::Lang(it) => format!("lang:{}", it),
+        }
+    }
+
+    fn origin_from_module_def(&self, item: ModuleDef) -> Option<String> {
+        match item {
+            ModuleDef::Module(it) => Some(self.origin_from_hir(it)),
+            ModuleDef::Function(it) => Some(self.origin_from_hir(it)),
+            ModuleDef::Adt(Adt::Enum(it)) => Some(self.origin_from_hir(it)),
+            ModuleDef::Adt(Adt::Struct(it)) => Some(self.origin_from_hir(it)),
+            ModuleDef::Adt(Adt::Union(it)) => Some(self.origin_from_hir(it)),
+            ModuleDef::Trait(it) => Some(self.origin_from_hir(it)),
+            ModuleDef::Static(_) => None,
+            ModuleDef::TraitAlias(_) => None,
+            ModuleDef::TypeAlias(_) => None,
+            ModuleDef::BuiltinType(_) => None,
+            ModuleDef::Macro(_) => None,
+            ModuleDef::Variant(_) => None,
+            ModuleDef::Const(_) => None,
+        }
+    }
+
+    pub(crate) fn extract_canonical_origin<T: AddressableAst + HasName>(
+        &mut self,
+        item: &T,
+        label: Label<generated::Item>,
+    ) {
+        (|| {
+            let sema = self.semantics.as_ref()?;
+            let def = T::Hir::try_from_source(item, sema)?;
+            let path = self.canonical_path_from_hir(def)?;
+            let origin = self.origin_from_hir(def);
+            generated::Item::emit_crate_origin(label, origin, &mut self.trap.writer);
+            generated::Item::emit_extended_canonical_path(label, path, &mut self.trap.writer);
+            Some(())
+        })();
+    }
+
+    pub(crate) fn extract_canonical_destination(
+        &mut self,
+        item: &ast::Path,
+        label: Label<generated::Path>,
+    ) {
+        (|| {
+            let sema = self.semantics.as_ref()?;
+            let resolution = sema.resolve_path(item)?;
+            let PathResolution::Def(def) = resolution else {
+                return None;
+            };
+            let origin = self.origin_from_module_def(def)?;
+            let path = self.canonical_path_from_module_def(def)?;
+            generated::Resolvable::emit_resolved_crate_origin(
+                label.into(),
+                origin,
+                &mut self.trap.writer,
+            );
+            generated::Resolvable::emit_resolved_path(label.into(), path, &mut self.trap.writer);
+            Some(())
+        })();
+    }
+
+    pub(crate) fn extract_method_canonical_destination(
+        &mut self,
+        item: &ast::MethodCallExpr,
+        label: Label<generated::MethodCallExpr>,
+    ) {
+        (|| {
+            let sema = self.semantics.as_ref()?;
+            let resolved = sema.resolve_method_call_fallback(item)?;
+            let Either::Left(function) = resolved else {
+                return None;
+            };
+            let origin = self.origin_from_hir(function);
+            let path = self.canonical_path_from_hir(function)?;
+            generated::Resolvable::emit_resolved_crate_origin(
+                label.into(),
+                origin,
+                &mut self.trap.writer,
+            );
+            generated::Resolvable::emit_resolved_path(label.into(), path, &mut self.trap.writer);
+            Some(())
+        })();
+    }
+}
diff --git a/rust/extractor/src/translate/generated.rs b/rust/extractor/src/translate/generated.rs
new file mode 100644
index 00000000000..aea607b753d
--- /dev/null
+++ b/rust/extractor/src/translate/generated.rs
@@ -0,0 +1,2381 @@
+//! Generated by `ast-generator`, do not edit by hand.
+
+#![cfg_attr(any(), rustfmt::skip)]
+
+use super::base::Translator;
+use super::mappings::TextValue;
+use crate::emit_detached;
+use crate::generated;
+use crate::trap::{Label, TrapId};
+use ra_ap_syntax::ast::{
+    HasArgList, HasAttrs, HasGenericArgs, HasGenericParams, HasLoopBody, HasModuleItem, HasName,
+    HasTypeBounds, HasVisibility, RangeItem,
+};
+use ra_ap_syntax::{ast, AstNode};
+
+impl Translator<'_> {
+    fn emit_else_branch(&mut self, node: ast::ElseBranch) -> Label<generated::Expr> {
+        match node {
+            ast::ElseBranch::IfExpr(inner) => self.emit_if_expr(inner).into(),
+            ast::ElseBranch::Block(inner) => self.emit_block_expr(inner).into(),
+        }
+    }
+
+    pub(crate) fn emit_assoc_item(&mut self, node: ast::AssocItem) -> Label<generated::AssocItem> {
+        match node {
+            ast::AssocItem::Const(inner) => self.emit_const(inner).into(),
+            ast::AssocItem::Fn(inner) => self.emit_fn(inner).into(),
+            ast::AssocItem::MacroCall(inner) => self.emit_macro_call(inner).into(),
+            ast::AssocItem::TypeAlias(inner) => self.emit_type_alias(inner).into(),
+        }
+    }
+
+    pub(crate) fn emit_expr(&mut self, node: ast::Expr) -> Label<generated::Expr> {
+        match node {
+            ast::Expr::ArrayExpr(inner) => self.emit_array_expr(inner).into(),
+            ast::Expr::AsmExpr(inner) => self.emit_asm_expr(inner).into(),
+            ast::Expr::AwaitExpr(inner) => self.emit_await_expr(inner).into(),
+            ast::Expr::BecomeExpr(inner) => self.emit_become_expr(inner).into(),
+            ast::Expr::BinExpr(inner) => self.emit_bin_expr(inner).into(),
+            ast::Expr::BlockExpr(inner) => self.emit_block_expr(inner).into(),
+            ast::Expr::BreakExpr(inner) => self.emit_break_expr(inner).into(),
+            ast::Expr::CallExpr(inner) => self.emit_call_expr(inner).into(),
+            ast::Expr::CastExpr(inner) => self.emit_cast_expr(inner).into(),
+            ast::Expr::ClosureExpr(inner) => self.emit_closure_expr(inner).into(),
+            ast::Expr::ContinueExpr(inner) => self.emit_continue_expr(inner).into(),
+            ast::Expr::FieldExpr(inner) => self.emit_field_expr(inner).into(),
+            ast::Expr::ForExpr(inner) => self.emit_for_expr(inner).into(),
+            ast::Expr::FormatArgsExpr(inner) => self.emit_format_args_expr(inner).into(),
+            ast::Expr::IfExpr(inner) => self.emit_if_expr(inner).into(),
+            ast::Expr::IndexExpr(inner) => self.emit_index_expr(inner).into(),
+            ast::Expr::LetExpr(inner) => self.emit_let_expr(inner).into(),
+            ast::Expr::Literal(inner) => self.emit_literal(inner).into(),
+            ast::Expr::LoopExpr(inner) => self.emit_loop_expr(inner).into(),
+            ast::Expr::MacroExpr(inner) => self.emit_macro_expr(inner).into(),
+            ast::Expr::MatchExpr(inner) => self.emit_match_expr(inner).into(),
+            ast::Expr::MethodCallExpr(inner) => self.emit_method_call_expr(inner).into(),
+            ast::Expr::OffsetOfExpr(inner) => self.emit_offset_of_expr(inner).into(),
+            ast::Expr::ParenExpr(inner) => self.emit_paren_expr(inner).into(),
+            ast::Expr::PathExpr(inner) => self.emit_path_expr(inner).into(),
+            ast::Expr::PrefixExpr(inner) => self.emit_prefix_expr(inner).into(),
+            ast::Expr::RangeExpr(inner) => self.emit_range_expr(inner).into(),
+            ast::Expr::RecordExpr(inner) => self.emit_record_expr(inner).into(),
+            ast::Expr::RefExpr(inner) => self.emit_ref_expr(inner).into(),
+            ast::Expr::ReturnExpr(inner) => self.emit_return_expr(inner).into(),
+            ast::Expr::TryExpr(inner) => self.emit_try_expr(inner).into(),
+            ast::Expr::TupleExpr(inner) => self.emit_tuple_expr(inner).into(),
+            ast::Expr::UnderscoreExpr(inner) => self.emit_underscore_expr(inner).into(),
+            ast::Expr::WhileExpr(inner) => self.emit_while_expr(inner).into(),
+            ast::Expr::YeetExpr(inner) => self.emit_yeet_expr(inner).into(),
+            ast::Expr::YieldExpr(inner) => self.emit_yield_expr(inner).into(),
+        }
+    }
+
+    pub(crate) fn emit_extern_item(&mut self, node: ast::ExternItem) -> Label<generated::ExternItem> {
+        match node {
+            ast::ExternItem::Fn(inner) => self.emit_fn(inner).into(),
+            ast::ExternItem::MacroCall(inner) => self.emit_macro_call(inner).into(),
+            ast::ExternItem::Static(inner) => self.emit_static(inner).into(),
+            ast::ExternItem::TypeAlias(inner) => self.emit_type_alias(inner).into(),
+        }
+    }
+
+    pub(crate) fn emit_field_list(&mut self, node: ast::FieldList) -> Label<generated::FieldList> {
+        match node {
+            ast::FieldList::RecordFieldList(inner) => self.emit_record_field_list(inner).into(),
+            ast::FieldList::TupleFieldList(inner) => self.emit_tuple_field_list(inner).into(),
+        }
+    }
+
+    pub(crate) fn emit_generic_arg(&mut self, node: ast::GenericArg) -> Label<generated::GenericArg> {
+        match node {
+            ast::GenericArg::AssocTypeArg(inner) => self.emit_assoc_type_arg(inner).into(),
+            ast::GenericArg::ConstArg(inner) => self.emit_const_arg(inner).into(),
+            ast::GenericArg::LifetimeArg(inner) => self.emit_lifetime_arg(inner).into(),
+            ast::GenericArg::TypeArg(inner) => self.emit_type_arg(inner).into(),
+        }
+    }
+
+    pub(crate) fn emit_generic_param(&mut self, node: ast::GenericParam) -> Label<generated::GenericParam> {
+        match node {
+            ast::GenericParam::ConstParam(inner) => self.emit_const_param(inner).into(),
+            ast::GenericParam::LifetimeParam(inner) => self.emit_lifetime_param(inner).into(),
+            ast::GenericParam::TypeParam(inner) => self.emit_type_param(inner).into(),
+        }
+    }
+
+    pub(crate) fn emit_pat(&mut self, node: ast::Pat) -> Label<generated::Pat> {
+        match node {
+            ast::Pat::BoxPat(inner) => self.emit_box_pat(inner).into(),
+            ast::Pat::ConstBlockPat(inner) => self.emit_const_block_pat(inner).into(),
+            ast::Pat::IdentPat(inner) => self.emit_ident_pat(inner).into(),
+            ast::Pat::LiteralPat(inner) => self.emit_literal_pat(inner).into(),
+            ast::Pat::MacroPat(inner) => self.emit_macro_pat(inner).into(),
+            ast::Pat::OrPat(inner) => self.emit_or_pat(inner).into(),
+            ast::Pat::ParenPat(inner) => self.emit_paren_pat(inner).into(),
+            ast::Pat::PathPat(inner) => self.emit_path_pat(inner).into(),
+            ast::Pat::RangePat(inner) => self.emit_range_pat(inner).into(),
+            ast::Pat::RecordPat(inner) => self.emit_record_pat(inner).into(),
+            ast::Pat::RefPat(inner) => self.emit_ref_pat(inner).into(),
+            ast::Pat::RestPat(inner) => self.emit_rest_pat(inner).into(),
+            ast::Pat::SlicePat(inner) => self.emit_slice_pat(inner).into(),
+            ast::Pat::TuplePat(inner) => self.emit_tuple_pat(inner).into(),
+            ast::Pat::TupleStructPat(inner) => self.emit_tuple_struct_pat(inner).into(),
+            ast::Pat::WildcardPat(inner) => self.emit_wildcard_pat(inner).into(),
+        }
+    }
+
+    pub(crate) fn emit_stmt(&mut self, node: ast::Stmt) -> Label<generated::Stmt> {
+        match node {
+            ast::Stmt::ExprStmt(inner) => self.emit_expr_stmt(inner).into(),
+            ast::Stmt::Item(inner) => self.emit_item(inner).into(),
+            ast::Stmt::LetStmt(inner) => self.emit_let_stmt(inner).into(),
+        }
+    }
+
+    pub(crate) fn emit_type(&mut self, node: ast::Type) -> Label<generated::TypeRef> {
+        match node {
+            ast::Type::ArrayType(inner) => self.emit_array_type(inner).into(),
+            ast::Type::DynTraitType(inner) => self.emit_dyn_trait_type(inner).into(),
+            ast::Type::FnPtrType(inner) => self.emit_fn_ptr_type(inner).into(),
+            ast::Type::ForType(inner) => self.emit_for_type(inner).into(),
+            ast::Type::ImplTraitType(inner) => self.emit_impl_trait_type(inner).into(),
+            ast::Type::InferType(inner) => self.emit_infer_type(inner).into(),
+            ast::Type::MacroType(inner) => self.emit_macro_type(inner).into(),
+            ast::Type::NeverType(inner) => self.emit_never_type(inner).into(),
+            ast::Type::ParenType(inner) => self.emit_paren_type(inner).into(),
+            ast::Type::PathType(inner) => self.emit_path_type(inner).into(),
+            ast::Type::PtrType(inner) => self.emit_ptr_type(inner).into(),
+            ast::Type::RefType(inner) => self.emit_ref_type(inner).into(),
+            ast::Type::SliceType(inner) => self.emit_slice_type(inner).into(),
+            ast::Type::TupleType(inner) => self.emit_tuple_type(inner).into(),
+        }
+    }
+
+    pub(crate) fn emit_item(&mut self, node: ast::Item) -> Label<generated::Item> {
+        match node {
+            ast::Item::Const(inner) => self.emit_const(inner).into(),
+            ast::Item::Enum(inner) => self.emit_enum(inner).into(),
+            ast::Item::ExternBlock(inner) => self.emit_extern_block(inner).into(),
+            ast::Item::ExternCrate(inner) => self.emit_extern_crate(inner).into(),
+            ast::Item::Fn(inner) => self.emit_fn(inner).into(),
+            ast::Item::Impl(inner) => self.emit_impl(inner).into(),
+            ast::Item::MacroCall(inner) => self.emit_macro_call(inner).into(),
+            ast::Item::MacroDef(inner) => self.emit_macro_def(inner).into(),
+            ast::Item::MacroRules(inner) => self.emit_macro_rules(inner).into(),
+            ast::Item::Module(inner) => self.emit_module(inner).into(),
+            ast::Item::Static(inner) => self.emit_static(inner).into(),
+            ast::Item::Struct(inner) => self.emit_struct(inner).into(),
+            ast::Item::Trait(inner) => self.emit_trait(inner).into(),
+            ast::Item::TraitAlias(inner) => self.emit_trait_alias(inner).into(),
+            ast::Item::TypeAlias(inner) => self.emit_type_alias(inner).into(),
+            ast::Item::Union(inner) => self.emit_union(inner).into(),
+            ast::Item::Use(inner) => self.emit_use(inner).into(),
+        }
+    }
+
+    pub(crate) fn emit_abi(&mut self, node: ast::Abi) -> Label<generated::Abi> {
+        let abi_string = node.try_get_text();
+        let label = self.trap.emit(generated::Abi {
+            id: TrapId::Star,
+            abi_string,
+        });
+        self.emit_location(label, &node);
+        emit_detached!(Abi, self, node, label);
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
+        label
+    }
+
+    pub(crate) fn emit_arg_list(&mut self, node: ast::ArgList) -> Label<generated::ArgList> {
+        let args = node.args().map(|x| self.emit_expr(x)).collect();
+        let label = self.trap.emit(generated::ArgList {
+            id: TrapId::Star,
+            args,
+        });
+        self.emit_location(label, &node);
+        emit_detached!(ArgList, self, node, label);
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
+        label
+    }
+
+    pub(crate) fn emit_array_expr(&mut self, node: ast::ArrayExpr) -> Label<generated::ArrayExpr> {
+        let attrs = node.attrs().map(|x| self.emit_attr(x)).collect();
+        let exprs = node.exprs().map(|x| self.emit_expr(x)).collect();
+        let label = self.trap.emit(generated::ArrayExpr {
+            id: TrapId::Star,
+            attrs,
+            exprs,
+        });
+        self.emit_location(label, &node);
+        emit_detached!(ArrayExpr, self, node, label);
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
+        label
+    }
+
+    pub(crate) fn emit_array_type(&mut self, node: ast::ArrayType) -> Label<generated::ArrayType> {
+        let const_arg = node.const_arg().map(|x| self.emit_const_arg(x));
+        let ty = node.ty().map(|x| self.emit_type(x));
+        let label = self.trap.emit(generated::ArrayType {
+            id: TrapId::Star,
+            const_arg,
+            ty,
+        });
+        self.emit_location(label, &node);
+        emit_detached!(ArrayType, self, node, label);
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
+        label
+    }
+
+    pub(crate) fn emit_asm_expr(&mut self, node: ast::AsmExpr) -> Label<generated::AsmExpr> {
+        let attrs = node.attrs().map(|x| self.emit_attr(x)).collect();
+        let expr = node.expr().map(|x| self.emit_expr(x));
+        let label = self.trap.emit(generated::AsmExpr {
+            id: TrapId::Star,
+            attrs,
+            expr,
+        });
+        self.emit_location(label, &node);
+        emit_detached!(AsmExpr, self, node, label);
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
+        label
+    }
+
+    pub(crate) fn emit_assoc_item_list(&mut self, node: ast::AssocItemList) -> Label<generated::AssocItemList> {
+        let assoc_items = node.assoc_items().map(|x| self.emit_assoc_item(x)).collect();
+        let attrs = node.attrs().map(|x| self.emit_attr(x)).collect();
+        let label = self.trap.emit(generated::AssocItemList {
+            id: TrapId::Star,
+            assoc_items,
+            attrs,
+        });
+        self.emit_location(label, &node);
+        emit_detached!(AssocItemList, self, node, label);
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
+        label
+    }
+
+    pub(crate) fn emit_assoc_type_arg(&mut self, node: ast::AssocTypeArg) -> Label<generated::AssocTypeArg> {
+        let const_arg = node.const_arg().map(|x| self.emit_const_arg(x));
+        let generic_arg_list = node.generic_arg_list().map(|x| self.emit_generic_arg_list(x));
+        let name_ref = node.name_ref().map(|x| self.emit_name_ref(x));
+        let param_list = node.param_list().map(|x| self.emit_param_list(x));
+        let ret_type = node.ret_type().map(|x| self.emit_ret_type(x));
+        let return_type_syntax = node.return_type_syntax().map(|x| self.emit_return_type_syntax(x));
+        let ty = node.ty().map(|x| self.emit_type(x));
+        let type_bound_list = node.type_bound_list().map(|x| self.emit_type_bound_list(x));
+        let label = self.trap.emit(generated::AssocTypeArg {
+            id: TrapId::Star,
+            const_arg,
+            generic_arg_list,
+            name_ref,
+            param_list,
+            ret_type,
+            return_type_syntax,
+            ty,
+            type_bound_list,
+        });
+        self.emit_location(label, &node);
+        emit_detached!(AssocTypeArg, self, node, label);
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
+        label
+    }
+
+    pub(crate) fn emit_attr(&mut self, node: ast::Attr) -> Label<generated::Attr> {
+        let meta = node.meta().map(|x| self.emit_meta(x));
+        let label = self.trap.emit(generated::Attr {
+            id: TrapId::Star,
+            meta,
+        });
+        self.emit_location(label, &node);
+        emit_detached!(Attr, self, node, label);
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
+        label
+    }
+
+    pub(crate) fn emit_await_expr(&mut self, node: ast::AwaitExpr) -> Label<generated::AwaitExpr> {
+        let attrs = node.attrs().map(|x| self.emit_attr(x)).collect();
+        let expr = node.expr().map(|x| self.emit_expr(x));
+        let label = self.trap.emit(generated::AwaitExpr {
+            id: TrapId::Star,
+            attrs,
+            expr,
+        });
+        self.emit_location(label, &node);
+        emit_detached!(AwaitExpr, self, node, label);
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
+        label
+    }
+
+    pub(crate) fn emit_become_expr(&mut self, node: ast::BecomeExpr) -> Label<generated::BecomeExpr> {
+        let attrs = node.attrs().map(|x| self.emit_attr(x)).collect();
+        let expr = node.expr().map(|x| self.emit_expr(x));
+        let label = self.trap.emit(generated::BecomeExpr {
+            id: TrapId::Star,
+            attrs,
+            expr,
+        });
+        self.emit_location(label, &node);
+        emit_detached!(BecomeExpr, self, node, label);
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
+        label
+    }
+
+    pub(crate) fn emit_bin_expr(&mut self, node: ast::BinExpr) -> Label<generated::BinaryExpr> {
+        let attrs = node.attrs().map(|x| self.emit_attr(x)).collect();
+        let lhs = node.lhs().map(|x| self.emit_expr(x));
+        let operator_name = node.try_get_text();
+        let rhs = node.rhs().map(|x| self.emit_expr(x));
+        let label = self.trap.emit(generated::BinaryExpr {
+            id: TrapId::Star,
+            attrs,
+            lhs,
+            operator_name,
+            rhs,
+        });
+        self.emit_location(label, &node);
+        emit_detached!(BinaryExpr, self, node, label);
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
+        label
+    }
+
+    pub(crate) fn emit_block_expr(&mut self, node: ast::BlockExpr) -> Label<generated::BlockExpr> {
+        let attrs = node.attrs().map(|x| self.emit_attr(x)).collect();
+        let is_async = node.async_token().is_some();
+        let is_const = node.const_token().is_some();
+        let is_gen = node.gen_token().is_some();
+        let is_move = node.move_token().is_some();
+        let is_try = node.try_token().is_some();
+        let is_unsafe = node.unsafe_token().is_some();
+        let label = node.label().map(|x| self.emit_label(x));
+        let stmt_list = node.stmt_list().map(|x| self.emit_stmt_list(x));
+        let label = self.trap.emit(generated::BlockExpr {
+            id: TrapId::Star,
+            attrs,
+            is_async,
+            is_const,
+            is_gen,
+            is_move,
+            is_try,
+            is_unsafe,
+            label,
+            stmt_list,
+        });
+        self.emit_location(label, &node);
+        emit_detached!(BlockExpr, self, node, label);
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
+        label
+    }
+
+    pub(crate) fn emit_box_pat(&mut self, node: ast::BoxPat) -> Label<generated::BoxPat> {
+        let pat = node.pat().map(|x| self.emit_pat(x));
+        let label = self.trap.emit(generated::BoxPat {
+            id: TrapId::Star,
+            pat,
+        });
+        self.emit_location(label, &node);
+        emit_detached!(BoxPat, self, node, label);
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
+        label
+    }
+
+    pub(crate) fn emit_break_expr(&mut self, node: ast::BreakExpr) -> Label<generated::BreakExpr> {
+        let attrs = node.attrs().map(|x| self.emit_attr(x)).collect();
+        let expr = node.expr().map(|x| self.emit_expr(x));
+        let lifetime = node.lifetime().map(|x| self.emit_lifetime(x));
+        let label = self.trap.emit(generated::BreakExpr {
+            id: TrapId::Star,
+            attrs,
+            expr,
+            lifetime,
+        });
+        self.emit_location(label, &node);
+        emit_detached!(BreakExpr, self, node, label);
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
+        label
+    }
+
+    pub(crate) fn emit_call_expr(&mut self, node: ast::CallExpr) -> Label<generated::CallExpr> {
+        let arg_list = node.arg_list().map(|x| self.emit_arg_list(x));
+        let attrs = node.attrs().map(|x| self.emit_attr(x)).collect();
+        let expr = node.expr().map(|x| self.emit_expr(x));
+        let label = self.trap.emit(generated::CallExpr {
+            id: TrapId::Star,
+            arg_list,
+            attrs,
+            expr,
+        });
+        self.emit_location(label, &node);
+        emit_detached!(CallExpr, self, node, label);
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
+        label
+    }
+
+    pub(crate) fn emit_cast_expr(&mut self, node: ast::CastExpr) -> Label<generated::CastExpr> {
+        let attrs = node.attrs().map(|x| self.emit_attr(x)).collect();
+        let expr = node.expr().map(|x| self.emit_expr(x));
+        let ty = node.ty().map(|x| self.emit_type(x));
+        let label = self.trap.emit(generated::CastExpr {
+            id: TrapId::Star,
+            attrs,
+            expr,
+            ty,
+        });
+        self.emit_location(label, &node);
+        emit_detached!(CastExpr, self, node, label);
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
+        label
+    }
+
+    pub(crate) fn emit_closure_binder(&mut self, node: ast::ClosureBinder) -> Label<generated::ClosureBinder> {
+        let generic_param_list = node.generic_param_list().map(|x| self.emit_generic_param_list(x));
+        let label = self.trap.emit(generated::ClosureBinder {
+            id: TrapId::Star,
+            generic_param_list,
+        });
+        self.emit_location(label, &node);
+        emit_detached!(ClosureBinder, self, node, label);
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
+        label
+    }
+
+    pub(crate) fn emit_closure_expr(&mut self, node: ast::ClosureExpr) -> Label<generated::ClosureExpr> {
+        let attrs = node.attrs().map(|x| self.emit_attr(x)).collect();
+        let body = node.body().map(|x| self.emit_expr(x));
+        let closure_binder = node.closure_binder().map(|x| self.emit_closure_binder(x));
+        let is_async = node.async_token().is_some();
+        let is_const = node.const_token().is_some();
+        let is_gen = node.gen_token().is_some();
+        let is_move = node.move_token().is_some();
+        let is_static = node.static_token().is_some();
+        let param_list = node.param_list().map(|x| self.emit_param_list(x));
+        let ret_type = node.ret_type().map(|x| self.emit_ret_type(x));
+        let label = self.trap.emit(generated::ClosureExpr {
+            id: TrapId::Star,
+            attrs,
+            body,
+            closure_binder,
+            is_async,
+            is_const,
+            is_gen,
+            is_move,
+            is_static,
+            param_list,
+            ret_type,
+        });
+        self.emit_location(label, &node);
+        emit_detached!(ClosureExpr, self, node, label);
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
+        label
+    }
+
+    pub(crate) fn emit_const(&mut self, node: ast::Const) -> Label<generated::Const> {
+        let attrs = node.attrs().map(|x| self.emit_attr(x)).collect();
+        let body = node.body().map(|x| self.emit_expr(x));
+        let is_const = node.const_token().is_some();
+        let is_default = node.default_token().is_some();
+        let name = node.name().map(|x| self.emit_name(x));
+        let ty = node.ty().map(|x| self.emit_type(x));
+        let visibility = node.visibility().map(|x| self.emit_visibility(x));
+        let label = self.trap.emit(generated::Const {
+            id: TrapId::Star,
+            attrs,
+            body,
+            is_const,
+            is_default,
+            name,
+            ty,
+            visibility,
+        });
+        self.emit_location(label, &node);
+        emit_detached!(Const, self, node, label);
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
+        label
+    }
+
+    pub(crate) fn emit_const_arg(&mut self, node: ast::ConstArg) -> Label<generated::ConstArg> {
+        let expr = node.expr().map(|x| self.emit_expr(x));
+        let label = self.trap.emit(generated::ConstArg {
+            id: TrapId::Star,
+            expr,
+        });
+        self.emit_location(label, &node);
+        emit_detached!(ConstArg, self, node, label);
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
+        label
+    }
+
+    pub(crate) fn emit_const_block_pat(&mut self, node: ast::ConstBlockPat) -> Label<generated::ConstBlockPat> {
+        let block_expr = node.block_expr().map(|x| self.emit_block_expr(x));
+        let is_const = node.const_token().is_some();
+        let label = self.trap.emit(generated::ConstBlockPat {
+            id: TrapId::Star,
+            block_expr,
+            is_const,
+        });
+        self.emit_location(label, &node);
+        emit_detached!(ConstBlockPat, self, node, label);
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
+        label
+    }
+
+    pub(crate) fn emit_const_param(&mut self, node: ast::ConstParam) -> Label<generated::ConstParam> {
+        let attrs = node.attrs().map(|x| self.emit_attr(x)).collect();
+        let default_val = node.default_val().map(|x| self.emit_const_arg(x));
+        let is_const = node.const_token().is_some();
+        let name = node.name().map(|x| self.emit_name(x));
+        let ty = node.ty().map(|x| self.emit_type(x));
+        let label = self.trap.emit(generated::ConstParam {
+            id: TrapId::Star,
+            attrs,
+            default_val,
+            is_const,
+            name,
+            ty,
+        });
+        self.emit_location(label, &node);
+        emit_detached!(ConstParam, self, node, label);
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
+        label
+    }
+
+    pub(crate) fn emit_continue_expr(&mut self, node: ast::ContinueExpr) -> Label<generated::ContinueExpr> {
+        let attrs = node.attrs().map(|x| self.emit_attr(x)).collect();
+        let lifetime = node.lifetime().map(|x| self.emit_lifetime(x));
+        let label = self.trap.emit(generated::ContinueExpr {
+            id: TrapId::Star,
+            attrs,
+            lifetime,
+        });
+        self.emit_location(label, &node);
+        emit_detached!(ContinueExpr, self, node, label);
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
+        label
+    }
+
+    pub(crate) fn emit_dyn_trait_type(&mut self, node: ast::DynTraitType) -> Label<generated::DynTraitType> {
+        let type_bound_list = node.type_bound_list().map(|x| self.emit_type_bound_list(x));
+        let label = self.trap.emit(generated::DynTraitType {
+            id: TrapId::Star,
+            type_bound_list,
+        });
+        self.emit_location(label, &node);
+        emit_detached!(DynTraitType, self, node, label);
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
+        label
+    }
+
+    pub(crate) fn emit_enum(&mut self, node: ast::Enum) -> Label<generated::Enum> {
+        let attrs = node.attrs().map(|x| self.emit_attr(x)).collect();
+        let generic_param_list = node.generic_param_list().map(|x| self.emit_generic_param_list(x));
+        let name = node.name().map(|x| self.emit_name(x));
+        let variant_list = node.variant_list().map(|x| self.emit_variant_list(x));
+        let visibility = node.visibility().map(|x| self.emit_visibility(x));
+        let where_clause = node.where_clause().map(|x| self.emit_where_clause(x));
+        let label = self.trap.emit(generated::Enum {
+            id: TrapId::Star,
+            attrs,
+            generic_param_list,
+            name,
+            variant_list,
+            visibility,
+            where_clause,
+        });
+        self.emit_location(label, &node);
+        emit_detached!(Enum, self, node, label);
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
+        label
+    }
+
+    pub(crate) fn emit_expr_stmt(&mut self, node: ast::ExprStmt) -> Label<generated::ExprStmt> {
+        let expr = node.expr().map(|x| self.emit_expr(x));
+        let label = self.trap.emit(generated::ExprStmt {
+            id: TrapId::Star,
+            expr,
+        });
+        self.emit_location(label, &node);
+        emit_detached!(ExprStmt, self, node, label);
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
+        label
+    }
+
+    pub(crate) fn emit_extern_block(&mut self, node: ast::ExternBlock) -> Label<generated::ExternBlock> {
+        let abi = node.abi().map(|x| self.emit_abi(x));
+        let attrs = node.attrs().map(|x| self.emit_attr(x)).collect();
+        let extern_item_list = node.extern_item_list().map(|x| self.emit_extern_item_list(x));
+        let is_unsafe = node.unsafe_token().is_some();
+        let label = self.trap.emit(generated::ExternBlock {
+            id: TrapId::Star,
+            abi,
+            attrs,
+            extern_item_list,
+            is_unsafe,
+        });
+        self.emit_location(label, &node);
+        emit_detached!(ExternBlock, self, node, label);
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
+        label
+    }
+
+    pub(crate) fn emit_extern_crate(&mut self, node: ast::ExternCrate) -> Label<generated::ExternCrate> {
+        let attrs = node.attrs().map(|x| self.emit_attr(x)).collect();
+        let name_ref = node.name_ref().map(|x| self.emit_name_ref(x));
+        let rename = node.rename().map(|x| self.emit_rename(x));
+        let visibility = node.visibility().map(|x| self.emit_visibility(x));
+        let label = self.trap.emit(generated::ExternCrate {
+            id: TrapId::Star,
+            attrs,
+            name_ref,
+            rename,
+            visibility,
+        });
+        self.emit_location(label, &node);
+        emit_detached!(ExternCrate, self, node, label);
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
+        label
+    }
+
+    pub(crate) fn emit_extern_item_list(&mut self, node: ast::ExternItemList) -> Label<generated::ExternItemList> {
+        let attrs = node.attrs().map(|x| self.emit_attr(x)).collect();
+        let extern_items = node.extern_items().map(|x| self.emit_extern_item(x)).collect();
+        let label = self.trap.emit(generated::ExternItemList {
+            id: TrapId::Star,
+            attrs,
+            extern_items,
+        });
+        self.emit_location(label, &node);
+        emit_detached!(ExternItemList, self, node, label);
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
+        label
+    }
+
+    pub(crate) fn emit_field_expr(&mut self, node: ast::FieldExpr) -> Label<generated::FieldExpr> {
+        let attrs = node.attrs().map(|x| self.emit_attr(x)).collect();
+        let expr = node.expr().map(|x| self.emit_expr(x));
+        let name_ref = node.name_ref().map(|x| self.emit_name_ref(x));
+        let label = self.trap.emit(generated::FieldExpr {
+            id: TrapId::Star,
+            attrs,
+            expr,
+            name_ref,
+        });
+        self.emit_location(label, &node);
+        emit_detached!(FieldExpr, self, node, label);
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
+        label
+    }
+
+    pub(crate) fn emit_fn(&mut self, node: ast::Fn) -> Label<generated::Function> {
+        let abi = node.abi().map(|x| self.emit_abi(x));
+        let attrs = node.attrs().map(|x| self.emit_attr(x)).collect();
+        let body = node.body().map(|x| self.emit_block_expr(x));
+        let generic_param_list = node.generic_param_list().map(|x| self.emit_generic_param_list(x));
+        let is_async = node.async_token().is_some();
+        let is_const = node.const_token().is_some();
+        let is_default = node.default_token().is_some();
+        let is_gen = node.gen_token().is_some();
+        let is_unsafe = node.unsafe_token().is_some();
+        let name = node.name().map(|x| self.emit_name(x));
+        let param_list = node.param_list().map(|x| self.emit_param_list(x));
+        let ret_type = node.ret_type().map(|x| self.emit_ret_type(x));
+        let visibility = node.visibility().map(|x| self.emit_visibility(x));
+        let where_clause = node.where_clause().map(|x| self.emit_where_clause(x));
+        let label = self.trap.emit(generated::Function {
+            id: TrapId::Star,
+            abi,
+            attrs,
+            body,
+            generic_param_list,
+            is_async,
+            is_const,
+            is_default,
+            is_gen,
+            is_unsafe,
+            name,
+            param_list,
+            ret_type,
+            visibility,
+            where_clause,
+        });
+        self.emit_location(label, &node);
+        emit_detached!(Function, self, node, label);
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
+        label
+    }
+
+    pub(crate) fn emit_fn_ptr_type(&mut self, node: ast::FnPtrType) -> Label<generated::FnPtrType> {
+        let abi = node.abi().map(|x| self.emit_abi(x));
+        let is_async = node.async_token().is_some();
+        let is_const = node.const_token().is_some();
+        let is_unsafe = node.unsafe_token().is_some();
+        let param_list = node.param_list().map(|x| self.emit_param_list(x));
+        let ret_type = node.ret_type().map(|x| self.emit_ret_type(x));
+        let label = self.trap.emit(generated::FnPtrType {
+            id: TrapId::Star,
+            abi,
+            is_async,
+            is_const,
+            is_unsafe,
+            param_list,
+            ret_type,
+        });
+        self.emit_location(label, &node);
+        emit_detached!(FnPtrType, self, node, label);
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
+        label
+    }
+
+    pub(crate) fn emit_for_expr(&mut self, node: ast::ForExpr) -> Label<generated::ForExpr> {
+        let attrs = node.attrs().map(|x| self.emit_attr(x)).collect();
+        let iterable = node.iterable().map(|x| self.emit_expr(x));
+        let label = node.label().map(|x| self.emit_label(x));
+        let loop_body = node.loop_body().map(|x| self.emit_block_expr(x));
+        let pat = node.pat().map(|x| self.emit_pat(x));
+        let label = self.trap.emit(generated::ForExpr {
+            id: TrapId::Star,
+            attrs,
+            iterable,
+            label,
+            loop_body,
+            pat,
+        });
+        self.emit_location(label, &node);
+        emit_detached!(ForExpr, self, node, label);
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
+        label
+    }
+
+    pub(crate) fn emit_for_type(&mut self, node: ast::ForType) -> Label<generated::ForType> {
+        let generic_param_list = node.generic_param_list().map(|x| self.emit_generic_param_list(x));
+        let ty = node.ty().map(|x| self.emit_type(x));
+        let label = self.trap.emit(generated::ForType {
+            id: TrapId::Star,
+            generic_param_list,
+            ty,
+        });
+        self.emit_location(label, &node);
+        emit_detached!(ForType, self, node, label);
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
+        label
+    }
+
+    pub(crate) fn emit_format_args_arg(&mut self, node: ast::FormatArgsArg) -> Label<generated::FormatArgsArg> {
+        let expr = node.expr().map(|x| self.emit_expr(x));
+        let name = node.name().map(|x| self.emit_name(x));
+        let label = self.trap.emit(generated::FormatArgsArg {
+            id: TrapId::Star,
+            expr,
+            name,
+        });
+        self.emit_location(label, &node);
+        emit_detached!(FormatArgsArg, self, node, label);
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
+        label
+    }
+
+    pub(crate) fn emit_format_args_expr(&mut self, node: ast::FormatArgsExpr) -> Label<generated::FormatArgsExpr> {
+        let args = node.args().map(|x| self.emit_format_args_arg(x)).collect();
+        let attrs = node.attrs().map(|x| self.emit_attr(x)).collect();
+        let template = node.template().map(|x| self.emit_expr(x));
+        let label = self.trap.emit(generated::FormatArgsExpr {
+            id: TrapId::Star,
+            args,
+            attrs,
+            template,
+        });
+        self.emit_location(label, &node);
+        emit_detached!(FormatArgsExpr, self, node, label);
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
+        label
+    }
+
+    pub(crate) fn emit_generic_arg_list(&mut self, node: ast::GenericArgList) -> Label<generated::GenericArgList> {
+        let generic_args = node.generic_args().map(|x| self.emit_generic_arg(x)).collect();
+        let label = self.trap.emit(generated::GenericArgList {
+            id: TrapId::Star,
+            generic_args,
+        });
+        self.emit_location(label, &node);
+        emit_detached!(GenericArgList, self, node, label);
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
+        label
+    }
+
+    pub(crate) fn emit_generic_param_list(&mut self, node: ast::GenericParamList) -> Label<generated::GenericParamList> {
+        let generic_params = node.generic_params().map(|x| self.emit_generic_param(x)).collect();
+        let label = self.trap.emit(generated::GenericParamList {
+            id: TrapId::Star,
+            generic_params,
+        });
+        self.emit_location(label, &node);
+        emit_detached!(GenericParamList, self, node, label);
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
+        label
+    }
+
+    pub(crate) fn emit_ident_pat(&mut self, node: ast::IdentPat) -> Label<generated::IdentPat> {
+        let attrs = node.attrs().map(|x| self.emit_attr(x)).collect();
+        let is_mut = node.mut_token().is_some();
+        let is_ref = node.ref_token().is_some();
+        let name = node.name().map(|x| self.emit_name(x));
+        let pat = node.pat().map(|x| self.emit_pat(x));
+        let label = self.trap.emit(generated::IdentPat {
+            id: TrapId::Star,
+            attrs,
+            is_mut,
+            is_ref,
+            name,
+            pat,
+        });
+        self.emit_location(label, &node);
+        emit_detached!(IdentPat, self, node, label);
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
+        label
+    }
+
+    pub(crate) fn emit_if_expr(&mut self, node: ast::IfExpr) -> Label<generated::IfExpr> {
+        let attrs = node.attrs().map(|x| self.emit_attr(x)).collect();
+        let condition = node.condition().map(|x| self.emit_expr(x));
+        let else_ = node.else_branch().map(|x| self.emit_else_branch(x));
+        let then = node.then_branch().map(|x| self.emit_block_expr(x));
+        let label = self.trap.emit(generated::IfExpr {
+            id: TrapId::Star,
+            attrs,
+            condition,
+            else_,
+            then,
+        });
+        self.emit_location(label, &node);
+        emit_detached!(IfExpr, self, node, label);
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
+        label
+    }
+
+    pub(crate) fn emit_impl(&mut self, node: ast::Impl) -> Label<generated::Impl> {
+        let assoc_item_list = node.assoc_item_list().map(|x| self.emit_assoc_item_list(x));
+        let attrs = node.attrs().map(|x| self.emit_attr(x)).collect();
+        let generic_param_list = node.generic_param_list().map(|x| self.emit_generic_param_list(x));
+        let is_const = node.const_token().is_some();
+        let is_default = node.default_token().is_some();
+        let is_unsafe = node.unsafe_token().is_some();
+        let self_ty = node.self_ty().map(|x| self.emit_type(x));
+        let trait_ = node.trait_().map(|x| self.emit_type(x));
+        let visibility = node.visibility().map(|x| self.emit_visibility(x));
+        let where_clause = node.where_clause().map(|x| self.emit_where_clause(x));
+        let label = self.trap.emit(generated::Impl {
+            id: TrapId::Star,
+            assoc_item_list,
+            attrs,
+            generic_param_list,
+            is_const,
+            is_default,
+            is_unsafe,
+            self_ty,
+            trait_,
+            visibility,
+            where_clause,
+        });
+        self.emit_location(label, &node);
+        emit_detached!(Impl, self, node, label);
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
+        label
+    }
+
+    pub(crate) fn emit_impl_trait_type(&mut self, node: ast::ImplTraitType) -> Label<generated::ImplTraitType> {
+        let type_bound_list = node.type_bound_list().map(|x| self.emit_type_bound_list(x));
+        let label = self.trap.emit(generated::ImplTraitType {
+            id: TrapId::Star,
+            type_bound_list,
+        });
+        self.emit_location(label, &node);
+        emit_detached!(ImplTraitType, self, node, label);
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
+        label
+    }
+
+    pub(crate) fn emit_index_expr(&mut self, node: ast::IndexExpr) -> Label<generated::IndexExpr> {
+        let attrs = node.attrs().map(|x| self.emit_attr(x)).collect();
+        let base = node.base().map(|x| self.emit_expr(x));
+        let index = node.index().map(|x| self.emit_expr(x));
+        let label = self.trap.emit(generated::IndexExpr {
+            id: TrapId::Star,
+            attrs,
+            base,
+            index,
+        });
+        self.emit_location(label, &node);
+        emit_detached!(IndexExpr, self, node, label);
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
+        label
+    }
+
+    pub(crate) fn emit_infer_type(&mut self, node: ast::InferType) -> Label<generated::InferType> {
+        let label = self.trap.emit(generated::InferType {
+            id: TrapId::Star,
+        });
+        self.emit_location(label, &node);
+        emit_detached!(InferType, self, node, label);
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
+        label
+    }
+
+    pub(crate) fn emit_item_list(&mut self, node: ast::ItemList) -> Label<generated::ItemList> {
+        let attrs = node.attrs().map(|x| self.emit_attr(x)).collect();
+        let items = node.items().map(|x| self.emit_item(x)).collect();
+        let label = self.trap.emit(generated::ItemList {
+            id: TrapId::Star,
+            attrs,
+            items,
+        });
+        self.emit_location(label, &node);
+        emit_detached!(ItemList, self, node, label);
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
+        label
+    }
+
+    pub(crate) fn emit_label(&mut self, node: ast::Label) -> Label<generated::Label> {
+        let lifetime = node.lifetime().map(|x| self.emit_lifetime(x));
+        let label = self.trap.emit(generated::Label {
+            id: TrapId::Star,
+            lifetime,
+        });
+        self.emit_location(label, &node);
+        emit_detached!(Label, self, node, label);
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
+        label
+    }
+
+    pub(crate) fn emit_let_else(&mut self, node: ast::LetElse) -> Label<generated::LetElse> {
+        let block_expr = node.block_expr().map(|x| self.emit_block_expr(x));
+        let label = self.trap.emit(generated::LetElse {
+            id: TrapId::Star,
+            block_expr,
+        });
+        self.emit_location(label, &node);
+        emit_detached!(LetElse, self, node, label);
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
+        label
+    }
+
+    pub(crate) fn emit_let_expr(&mut self, node: ast::LetExpr) -> Label<generated::LetExpr> {
+        let attrs = node.attrs().map(|x| self.emit_attr(x)).collect();
+        let expr = node.expr().map(|x| self.emit_expr(x));
+        let pat = node.pat().map(|x| self.emit_pat(x));
+        let label = self.trap.emit(generated::LetExpr {
+            id: TrapId::Star,
+            attrs,
+            expr,
+            pat,
+        });
+        self.emit_location(label, &node);
+        emit_detached!(LetExpr, self, node, label);
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
+        label
+    }
+
+    pub(crate) fn emit_let_stmt(&mut self, node: ast::LetStmt) -> Label<generated::LetStmt> {
+        let attrs = node.attrs().map(|x| self.emit_attr(x)).collect();
+        let initializer = node.initializer().map(|x| self.emit_expr(x));
+        let let_else = node.let_else().map(|x| self.emit_let_else(x));
+        let pat = node.pat().map(|x| self.emit_pat(x));
+        let ty = node.ty().map(|x| self.emit_type(x));
+        let label = self.trap.emit(generated::LetStmt {
+            id: TrapId::Star,
+            attrs,
+            initializer,
+            let_else,
+            pat,
+            ty,
+        });
+        self.emit_location(label, &node);
+        emit_detached!(LetStmt, self, node, label);
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
+        label
+    }
+
+    pub(crate) fn emit_lifetime(&mut self, node: ast::Lifetime) -> Label<generated::Lifetime> {
+        let text = node.try_get_text();
+        let label = self.trap.emit(generated::Lifetime {
+            id: TrapId::Star,
+            text,
+        });
+        self.emit_location(label, &node);
+        emit_detached!(Lifetime, self, node, label);
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
+        label
+    }
+
+    pub(crate) fn emit_lifetime_arg(&mut self, node: ast::LifetimeArg) -> Label<generated::LifetimeArg> {
+        let lifetime = node.lifetime().map(|x| self.emit_lifetime(x));
+        let label = self.trap.emit(generated::LifetimeArg {
+            id: TrapId::Star,
+            lifetime,
+        });
+        self.emit_location(label, &node);
+        emit_detached!(LifetimeArg, self, node, label);
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
+        label
+    }
+
+    pub(crate) fn emit_lifetime_param(&mut self, node: ast::LifetimeParam) -> Label<generated::LifetimeParam> {
+        let attrs = node.attrs().map(|x| self.emit_attr(x)).collect();
+        let lifetime = node.lifetime().map(|x| self.emit_lifetime(x));
+        let type_bound_list = node.type_bound_list().map(|x| self.emit_type_bound_list(x));
+        let label = self.trap.emit(generated::LifetimeParam {
+            id: TrapId::Star,
+            attrs,
+            lifetime,
+            type_bound_list,
+        });
+        self.emit_location(label, &node);
+        emit_detached!(LifetimeParam, self, node, label);
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
+        label
+    }
+
+    pub(crate) fn emit_literal(&mut self, node: ast::Literal) -> Label<generated::LiteralExpr> {
+        let attrs = node.attrs().map(|x| self.emit_attr(x)).collect();
+        let text_value = node.try_get_text();
+        let label = self.trap.emit(generated::LiteralExpr {
+            id: TrapId::Star,
+            attrs,
+            text_value,
+        });
+        self.emit_location(label, &node);
+        emit_detached!(LiteralExpr, self, node, label);
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
+        label
+    }
+
+    pub(crate) fn emit_literal_pat(&mut self, node: ast::LiteralPat) -> Label<generated::LiteralPat> {
+        let literal = node.literal().map(|x| self.emit_literal(x));
+        let label = self.trap.emit(generated::LiteralPat {
+            id: TrapId::Star,
+            literal,
+        });
+        self.emit_location(label, &node);
+        emit_detached!(LiteralPat, self, node, label);
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
+        label
+    }
+
+    pub(crate) fn emit_loop_expr(&mut self, node: ast::LoopExpr) -> Label<generated::LoopExpr> {
+        let attrs = node.attrs().map(|x| self.emit_attr(x)).collect();
+        let label = node.label().map(|x| self.emit_label(x));
+        let loop_body = node.loop_body().map(|x| self.emit_block_expr(x));
+        let label = self.trap.emit(generated::LoopExpr {
+            id: TrapId::Star,
+            attrs,
+            label,
+            loop_body,
+        });
+        self.emit_location(label, &node);
+        emit_detached!(LoopExpr, self, node, label);
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
+        label
+    }
+
+    pub(crate) fn emit_macro_call(&mut self, node: ast::MacroCall) -> Label<generated::MacroCall> {
+        let attrs = node.attrs().map(|x| self.emit_attr(x)).collect();
+        let path = node.path().map(|x| self.emit_path(x));
+        let token_tree = node.token_tree().map(|x| self.emit_token_tree(x));
+        let label = self.trap.emit(generated::MacroCall {
+            id: TrapId::Star,
+            attrs,
+            path,
+            token_tree,
+        });
+        self.emit_location(label, &node);
+        emit_detached!(MacroCall, self, node, label);
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
+        label
+    }
+
+    pub(crate) fn emit_macro_def(&mut self, node: ast::MacroDef) -> Label<generated::MacroDef> {
+        let args = node.args().map(|x| self.emit_token_tree(x));
+        let attrs = node.attrs().map(|x| self.emit_attr(x)).collect();
+        let body = node.body().map(|x| self.emit_token_tree(x));
+        let name = node.name().map(|x| self.emit_name(x));
+        let visibility = node.visibility().map(|x| self.emit_visibility(x));
+        let label = self.trap.emit(generated::MacroDef {
+            id: TrapId::Star,
+            args,
+            attrs,
+            body,
+            name,
+            visibility,
+        });
+        self.emit_location(label, &node);
+        emit_detached!(MacroDef, self, node, label);
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
+        label
+    }
+
+    pub(crate) fn emit_macro_expr(&mut self, node: ast::MacroExpr) -> Label<generated::MacroExpr> {
+        let macro_call = node.macro_call().map(|x| self.emit_macro_call(x));
+        let label = self.trap.emit(generated::MacroExpr {
+            id: TrapId::Star,
+            macro_call,
+        });
+        self.emit_location(label, &node);
+        emit_detached!(MacroExpr, self, node, label);
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
+        label
+    }
+
+    pub(crate) fn emit_macro_items(&mut self, node: ast::MacroItems) -> Label<generated::MacroItems> {
+        let items = node.items().map(|x| self.emit_item(x)).collect();
+        let label = self.trap.emit(generated::MacroItems {
+            id: TrapId::Star,
+            items,
+        });
+        self.emit_location(label, &node);
+        emit_detached!(MacroItems, self, node, label);
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
+        label
+    }
+
+    pub(crate) fn emit_macro_pat(&mut self, node: ast::MacroPat) -> Label<generated::MacroPat> {
+        let macro_call = node.macro_call().map(|x| self.emit_macro_call(x));
+        let label = self.trap.emit(generated::MacroPat {
+            id: TrapId::Star,
+            macro_call,
+        });
+        self.emit_location(label, &node);
+        emit_detached!(MacroPat, self, node, label);
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
+        label
+    }
+
+    pub(crate) fn emit_macro_rules(&mut self, node: ast::MacroRules) -> Label<generated::MacroRules> {
+        let attrs = node.attrs().map(|x| self.emit_attr(x)).collect();
+        let name = node.name().map(|x| self.emit_name(x));
+        let token_tree = node.token_tree().map(|x| self.emit_token_tree(x));
+        let visibility = node.visibility().map(|x| self.emit_visibility(x));
+        let label = self.trap.emit(generated::MacroRules {
+            id: TrapId::Star,
+            attrs,
+            name,
+            token_tree,
+            visibility,
+        });
+        self.emit_location(label, &node);
+        emit_detached!(MacroRules, self, node, label);
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
+        label
+    }
+
+    pub(crate) fn emit_macro_stmts(&mut self, node: ast::MacroStmts) -> Label<generated::MacroStmts> {
+        let expr = node.expr().map(|x| self.emit_expr(x));
+        let statements = node.statements().map(|x| self.emit_stmt(x)).collect();
+        let label = self.trap.emit(generated::MacroStmts {
+            id: TrapId::Star,
+            expr,
+            statements,
+        });
+        self.emit_location(label, &node);
+        emit_detached!(MacroStmts, self, node, label);
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
+        label
+    }
+
+    pub(crate) fn emit_macro_type(&mut self, node: ast::MacroType) -> Label<generated::MacroType> {
+        let macro_call = node.macro_call().map(|x| self.emit_macro_call(x));
+        let label = self.trap.emit(generated::MacroType {
+            id: TrapId::Star,
+            macro_call,
+        });
+        self.emit_location(label, &node);
+        emit_detached!(MacroType, self, node, label);
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
+        label
+    }
+
+    pub(crate) fn emit_match_arm(&mut self, node: ast::MatchArm) -> Label<generated::MatchArm> {
+        let attrs = node.attrs().map(|x| self.emit_attr(x)).collect();
+        let expr = node.expr().map(|x| self.emit_expr(x));
+        let guard = node.guard().map(|x| self.emit_match_guard(x));
+        let pat = node.pat().map(|x| self.emit_pat(x));
+        let label = self.trap.emit(generated::MatchArm {
+            id: TrapId::Star,
+            attrs,
+            expr,
+            guard,
+            pat,
+        });
+        self.emit_location(label, &node);
+        emit_detached!(MatchArm, self, node, label);
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
+        label
+    }
+
+    pub(crate) fn emit_match_arm_list(&mut self, node: ast::MatchArmList) -> Label<generated::MatchArmList> {
+        let arms = node.arms().map(|x| self.emit_match_arm(x)).collect();
+        let attrs = node.attrs().map(|x| self.emit_attr(x)).collect();
+        let label = self.trap.emit(generated::MatchArmList {
+            id: TrapId::Star,
+            arms,
+            attrs,
+        });
+        self.emit_location(label, &node);
+        emit_detached!(MatchArmList, self, node, label);
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
+        label
+    }
+
+    pub(crate) fn emit_match_expr(&mut self, node: ast::MatchExpr) -> Label<generated::MatchExpr> {
+        let attrs = node.attrs().map(|x| self.emit_attr(x)).collect();
+        let expr = node.expr().map(|x| self.emit_expr(x));
+        let match_arm_list = node.match_arm_list().map(|x| self.emit_match_arm_list(x));
+        let label = self.trap.emit(generated::MatchExpr {
+            id: TrapId::Star,
+            attrs,
+            expr,
+            match_arm_list,
+        });
+        self.emit_location(label, &node);
+        emit_detached!(MatchExpr, self, node, label);
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
+        label
+    }
+
+    pub(crate) fn emit_match_guard(&mut self, node: ast::MatchGuard) -> Label<generated::MatchGuard> {
+        let condition = node.condition().map(|x| self.emit_expr(x));
+        let label = self.trap.emit(generated::MatchGuard {
+            id: TrapId::Star,
+            condition,
+        });
+        self.emit_location(label, &node);
+        emit_detached!(MatchGuard, self, node, label);
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
+        label
+    }
+
+    pub(crate) fn emit_meta(&mut self, node: ast::Meta) -> Label<generated::Meta> {
+        let expr = node.expr().map(|x| self.emit_expr(x));
+        let is_unsafe = node.unsafe_token().is_some();
+        let path = node.path().map(|x| self.emit_path(x));
+        let token_tree = node.token_tree().map(|x| self.emit_token_tree(x));
+        let label = self.trap.emit(generated::Meta {
+            id: TrapId::Star,
+            expr,
+            is_unsafe,
+            path,
+            token_tree,
+        });
+        self.emit_location(label, &node);
+        emit_detached!(Meta, self, node, label);
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
+        label
+    }
+
+    pub(crate) fn emit_method_call_expr(&mut self, node: ast::MethodCallExpr) -> Label<generated::MethodCallExpr> {
+        let arg_list = node.arg_list().map(|x| self.emit_arg_list(x));
+        let attrs = node.attrs().map(|x| self.emit_attr(x)).collect();
+        let generic_arg_list = node.generic_arg_list().map(|x| self.emit_generic_arg_list(x));
+        let name_ref = node.name_ref().map(|x| self.emit_name_ref(x));
+        let receiver = node.receiver().map(|x| self.emit_expr(x));
+        let label = self.trap.emit(generated::MethodCallExpr {
+            id: TrapId::Star,
+            arg_list,
+            attrs,
+            generic_arg_list,
+            name_ref,
+            receiver,
+        });
+        self.emit_location(label, &node);
+        emit_detached!(MethodCallExpr, self, node, label);
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
+        label
+    }
+
+    pub(crate) fn emit_module(&mut self, node: ast::Module) -> Label<generated::Module> {
+        let attrs = node.attrs().map(|x| self.emit_attr(x)).collect();
+        let item_list = node.item_list().map(|x| self.emit_item_list(x));
+        let name = node.name().map(|x| self.emit_name(x));
+        let visibility = node.visibility().map(|x| self.emit_visibility(x));
+        let label = self.trap.emit(generated::Module {
+            id: TrapId::Star,
+            attrs,
+            item_list,
+            name,
+            visibility,
+        });
+        self.emit_location(label, &node);
+        emit_detached!(Module, self, node, label);
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
+        label
+    }
+
+    pub(crate) fn emit_name(&mut self, node: ast::Name) -> Label<generated::Name> {
+        let text = node.try_get_text();
+        let label = self.trap.emit(generated::Name {
+            id: TrapId::Star,
+            text,
+        });
+        self.emit_location(label, &node);
+        emit_detached!(Name, self, node, label);
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
+        label
+    }
+
+    pub(crate) fn emit_name_ref(&mut self, node: ast::NameRef) -> Label<generated::NameRef> {
+        let text = node.try_get_text();
+        let label = self.trap.emit(generated::NameRef {
+            id: TrapId::Star,
+            text,
+        });
+        self.emit_location(label, &node);
+        emit_detached!(NameRef, self, node, label);
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
+        label
+    }
+
+    pub(crate) fn emit_never_type(&mut self, node: ast::NeverType) -> Label<generated::NeverType> {
+        let label = self.trap.emit(generated::NeverType {
+            id: TrapId::Star,
+        });
+        self.emit_location(label, &node);
+        emit_detached!(NeverType, self, node, label);
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
+        label
+    }
+
+    pub(crate) fn emit_offset_of_expr(&mut self, node: ast::OffsetOfExpr) -> Label<generated::OffsetOfExpr> {
+        let attrs = node.attrs().map(|x| self.emit_attr(x)).collect();
+        let fields = node.fields().map(|x| self.emit_name_ref(x)).collect();
+        let ty = node.ty().map(|x| self.emit_type(x));
+        let label = self.trap.emit(generated::OffsetOfExpr {
+            id: TrapId::Star,
+            attrs,
+            fields,
+            ty,
+        });
+        self.emit_location(label, &node);
+        emit_detached!(OffsetOfExpr, self, node, label);
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
+        label
+    }
+
+    pub(crate) fn emit_or_pat(&mut self, node: ast::OrPat) -> Label<generated::OrPat> {
+        let pats = node.pats().map(|x| self.emit_pat(x)).collect();
+        let label = self.trap.emit(generated::OrPat {
+            id: TrapId::Star,
+            pats,
+        });
+        self.emit_location(label, &node);
+        emit_detached!(OrPat, self, node, label);
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
+        label
+    }
+
+    pub(crate) fn emit_param(&mut self, node: ast::Param) -> Label<generated::Param> {
+        let attrs = node.attrs().map(|x| self.emit_attr(x)).collect();
+        let pat = node.pat().map(|x| self.emit_pat(x));
+        let ty = node.ty().map(|x| self.emit_type(x));
+        let label = self.trap.emit(generated::Param {
+            id: TrapId::Star,
+            attrs,
+            pat,
+            ty,
+        });
+        self.emit_location(label, &node);
+        emit_detached!(Param, self, node, label);
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
+        label
+    }
+
+    pub(crate) fn emit_param_list(&mut self, node: ast::ParamList) -> Label<generated::ParamList> {
+        let params = node.params().map(|x| self.emit_param(x)).collect();
+        let self_param = node.self_param().map(|x| self.emit_self_param(x));
+        let label = self.trap.emit(generated::ParamList {
+            id: TrapId::Star,
+            params,
+            self_param,
+        });
+        self.emit_location(label, &node);
+        emit_detached!(ParamList, self, node, label);
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
+        label
+    }
+
+    pub(crate) fn emit_paren_expr(&mut self, node: ast::ParenExpr) -> Label<generated::ParenExpr> {
+        let attrs = node.attrs().map(|x| self.emit_attr(x)).collect();
+        let expr = node.expr().map(|x| self.emit_expr(x));
+        let label = self.trap.emit(generated::ParenExpr {
+            id: TrapId::Star,
+            attrs,
+            expr,
+        });
+        self.emit_location(label, &node);
+        emit_detached!(ParenExpr, self, node, label);
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
+        label
+    }
+
+    pub(crate) fn emit_paren_pat(&mut self, node: ast::ParenPat) -> Label<generated::ParenPat> {
+        let pat = node.pat().map(|x| self.emit_pat(x));
+        let label = self.trap.emit(generated::ParenPat {
+            id: TrapId::Star,
+            pat,
+        });
+        self.emit_location(label, &node);
+        emit_detached!(ParenPat, self, node, label);
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
+        label
+    }
+
+    pub(crate) fn emit_paren_type(&mut self, node: ast::ParenType) -> Label<generated::ParenType> {
+        let ty = node.ty().map(|x| self.emit_type(x));
+        let label = self.trap.emit(generated::ParenType {
+            id: TrapId::Star,
+            ty,
+        });
+        self.emit_location(label, &node);
+        emit_detached!(ParenType, self, node, label);
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
+        label
+    }
+
+    pub(crate) fn emit_path(&mut self, node: ast::Path) -> Label<generated::Path> {
+        let qualifier = node.qualifier().map(|x| self.emit_path(x));
+        let part = node.segment().map(|x| self.emit_path_segment(x));
+        let label = self.trap.emit(generated::Path {
+            id: TrapId::Star,
+            qualifier,
+            part,
+        });
+        self.emit_location(label, &node);
+        emit_detached!(Path, self, node, label);
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
+        label
+    }
+
+    pub(crate) fn emit_path_expr(&mut self, node: ast::PathExpr) -> Label<generated::PathExpr> {
+        let attrs = node.attrs().map(|x| self.emit_attr(x)).collect();
+        let path = node.path().map(|x| self.emit_path(x));
+        let label = self.trap.emit(generated::PathExpr {
+            id: TrapId::Star,
+            attrs,
+            path,
+        });
+        self.emit_location(label, &node);
+        emit_detached!(PathExpr, self, node, label);
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
+        label
+    }
+
+    pub(crate) fn emit_path_pat(&mut self, node: ast::PathPat) -> Label<generated::PathPat> {
+        let path = node.path().map(|x| self.emit_path(x));
+        let label = self.trap.emit(generated::PathPat {
+            id: TrapId::Star,
+            path,
+        });
+        self.emit_location(label, &node);
+        emit_detached!(PathPat, self, node, label);
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
+        label
+    }
+
+    pub(crate) fn emit_path_segment(&mut self, node: ast::PathSegment) -> Label<generated::PathSegment> {
+        let generic_arg_list = node.generic_arg_list().map(|x| self.emit_generic_arg_list(x));
+        let name_ref = node.name_ref().map(|x| self.emit_name_ref(x));
+        let param_list = node.param_list().map(|x| self.emit_param_list(x));
+        let path_type = node.path_type().map(|x| self.emit_path_type(x));
+        let ret_type = node.ret_type().map(|x| self.emit_ret_type(x));
+        let return_type_syntax = node.return_type_syntax().map(|x| self.emit_return_type_syntax(x));
+        let ty = node.ty().map(|x| self.emit_type(x));
+        let label = self.trap.emit(generated::PathSegment {
+            id: TrapId::Star,
+            generic_arg_list,
+            name_ref,
+            param_list,
+            path_type,
+            ret_type,
+            return_type_syntax,
+            ty,
+        });
+        self.emit_location(label, &node);
+        emit_detached!(PathSegment, self, node, label);
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
+        label
+    }
+
+    pub(crate) fn emit_path_type(&mut self, node: ast::PathType) -> Label<generated::PathType> {
+        let path = node.path().map(|x| self.emit_path(x));
+        let label = self.trap.emit(generated::PathType {
+            id: TrapId::Star,
+            path,
+        });
+        self.emit_location(label, &node);
+        emit_detached!(PathType, self, node, label);
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
+        label
+    }
+
+    pub(crate) fn emit_prefix_expr(&mut self, node: ast::PrefixExpr) -> Label<generated::PrefixExpr> {
+        let attrs = node.attrs().map(|x| self.emit_attr(x)).collect();
+        let expr = node.expr().map(|x| self.emit_expr(x));
+        let operator_name = node.try_get_text();
+        let label = self.trap.emit(generated::PrefixExpr {
+            id: TrapId::Star,
+            attrs,
+            expr,
+            operator_name,
+        });
+        self.emit_location(label, &node);
+        emit_detached!(PrefixExpr, self, node, label);
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
+        label
+    }
+
+    pub(crate) fn emit_ptr_type(&mut self, node: ast::PtrType) -> Label<generated::PtrType> {
+        let is_const = node.const_token().is_some();
+        let is_mut = node.mut_token().is_some();
+        let ty = node.ty().map(|x| self.emit_type(x));
+        let label = self.trap.emit(generated::PtrType {
+            id: TrapId::Star,
+            is_const,
+            is_mut,
+            ty,
+        });
+        self.emit_location(label, &node);
+        emit_detached!(PtrType, self, node, label);
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
+        label
+    }
+
+    pub(crate) fn emit_range_expr(&mut self, node: ast::RangeExpr) -> Label<generated::RangeExpr> {
+        let attrs = node.attrs().map(|x| self.emit_attr(x)).collect();
+        let end = node.end().map(|x| self.emit_expr(x));
+        let operator_name = node.try_get_text();
+        let start = node.start().map(|x| self.emit_expr(x));
+        let label = self.trap.emit(generated::RangeExpr {
+            id: TrapId::Star,
+            attrs,
+            end,
+            operator_name,
+            start,
+        });
+        self.emit_location(label, &node);
+        emit_detached!(RangeExpr, self, node, label);
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
+        label
+    }
+
+    pub(crate) fn emit_range_pat(&mut self, node: ast::RangePat) -> Label<generated::RangePat> {
+        let end = node.end().map(|x| self.emit_pat(x));
+        let operator_name = node.try_get_text();
+        let start = node.start().map(|x| self.emit_pat(x));
+        let label = self.trap.emit(generated::RangePat {
+            id: TrapId::Star,
+            end,
+            operator_name,
+            start,
+        });
+        self.emit_location(label, &node);
+        emit_detached!(RangePat, self, node, label);
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
+        label
+    }
+
+    pub(crate) fn emit_record_expr(&mut self, node: ast::RecordExpr) -> Label<generated::RecordExpr> {
+        let path = node.path().map(|x| self.emit_path(x));
+        let record_expr_field_list = node.record_expr_field_list().map(|x| self.emit_record_expr_field_list(x));
+        let label = self.trap.emit(generated::RecordExpr {
+            id: TrapId::Star,
+            path,
+            record_expr_field_list,
+        });
+        self.emit_location(label, &node);
+        emit_detached!(RecordExpr, self, node, label);
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
+        label
+    }
+
+    pub(crate) fn emit_record_expr_field(&mut self, node: ast::RecordExprField) -> Label<generated::RecordExprField> {
+        let attrs = node.attrs().map(|x| self.emit_attr(x)).collect();
+        let expr = node.expr().map(|x| self.emit_expr(x));
+        let name_ref = node.name_ref().map(|x| self.emit_name_ref(x));
+        let label = self.trap.emit(generated::RecordExprField {
+            id: TrapId::Star,
+            attrs,
+            expr,
+            name_ref,
+        });
+        self.emit_location(label, &node);
+        emit_detached!(RecordExprField, self, node, label);
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
+        label
+    }
+
+    pub(crate) fn emit_record_expr_field_list(&mut self, node: ast::RecordExprFieldList) -> Label<generated::RecordExprFieldList> {
+        let attrs = node.attrs().map(|x| self.emit_attr(x)).collect();
+        let fields = node.fields().map(|x| self.emit_record_expr_field(x)).collect();
+        let spread = node.spread().map(|x| self.emit_expr(x));
+        let label = self.trap.emit(generated::RecordExprFieldList {
+            id: TrapId::Star,
+            attrs,
+            fields,
+            spread,
+        });
+        self.emit_location(label, &node);
+        emit_detached!(RecordExprFieldList, self, node, label);
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
+        label
+    }
+
+    pub(crate) fn emit_record_field(&mut self, node: ast::RecordField) -> Label<generated::RecordField> {
+        let attrs = node.attrs().map(|x| self.emit_attr(x)).collect();
+        let name = node.name().map(|x| self.emit_name(x));
+        let ty = node.ty().map(|x| self.emit_type(x));
+        let visibility = node.visibility().map(|x| self.emit_visibility(x));
+        let label = self.trap.emit(generated::RecordField {
+            id: TrapId::Star,
+            attrs,
+            name,
+            ty,
+            visibility,
+        });
+        self.emit_location(label, &node);
+        emit_detached!(RecordField, self, node, label);
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
+        label
+    }
+
+    pub(crate) fn emit_record_field_list(&mut self, node: ast::RecordFieldList) -> Label<generated::RecordFieldList> {
+        let fields = node.fields().map(|x| self.emit_record_field(x)).collect();
+        let label = self.trap.emit(generated::RecordFieldList {
+            id: TrapId::Star,
+            fields,
+        });
+        self.emit_location(label, &node);
+        emit_detached!(RecordFieldList, self, node, label);
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
+        label
+    }
+
+    pub(crate) fn emit_record_pat(&mut self, node: ast::RecordPat) -> Label<generated::RecordPat> {
+        let path = node.path().map(|x| self.emit_path(x));
+        let record_pat_field_list = node.record_pat_field_list().map(|x| self.emit_record_pat_field_list(x));
+        let label = self.trap.emit(generated::RecordPat {
+            id: TrapId::Star,
+            path,
+            record_pat_field_list,
+        });
+        self.emit_location(label, &node);
+        emit_detached!(RecordPat, self, node, label);
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
+        label
+    }
+
+    pub(crate) fn emit_record_pat_field(&mut self, node: ast::RecordPatField) -> Label<generated::RecordPatField> {
+        let attrs = node.attrs().map(|x| self.emit_attr(x)).collect();
+        let name_ref = node.name_ref().map(|x| self.emit_name_ref(x));
+        let pat = node.pat().map(|x| self.emit_pat(x));
+        let label = self.trap.emit(generated::RecordPatField {
+            id: TrapId::Star,
+            attrs,
+            name_ref,
+            pat,
+        });
+        self.emit_location(label, &node);
+        emit_detached!(RecordPatField, self, node, label);
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
+        label
+    }
+
+    pub(crate) fn emit_record_pat_field_list(&mut self, node: ast::RecordPatFieldList) -> Label<generated::RecordPatFieldList> {
+        let fields = node.fields().map(|x| self.emit_record_pat_field(x)).collect();
+        let rest_pat = node.rest_pat().map(|x| self.emit_rest_pat(x));
+        let label = self.trap.emit(generated::RecordPatFieldList {
+            id: TrapId::Star,
+            fields,
+            rest_pat,
+        });
+        self.emit_location(label, &node);
+        emit_detached!(RecordPatFieldList, self, node, label);
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
+        label
+    }
+
+    pub(crate) fn emit_ref_expr(&mut self, node: ast::RefExpr) -> Label<generated::RefExpr> {
+        let attrs = node.attrs().map(|x| self.emit_attr(x)).collect();
+        let expr = node.expr().map(|x| self.emit_expr(x));
+        let is_const = node.const_token().is_some();
+        let is_mut = node.mut_token().is_some();
+        let is_raw = node.raw_token().is_some();
+        let label = self.trap.emit(generated::RefExpr {
+            id: TrapId::Star,
+            attrs,
+            expr,
+            is_const,
+            is_mut,
+            is_raw,
+        });
+        self.emit_location(label, &node);
+        emit_detached!(RefExpr, self, node, label);
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
+        label
+    }
+
+    pub(crate) fn emit_ref_pat(&mut self, node: ast::RefPat) -> Label<generated::RefPat> {
+        let is_mut = node.mut_token().is_some();
+        let pat = node.pat().map(|x| self.emit_pat(x));
+        let label = self.trap.emit(generated::RefPat {
+            id: TrapId::Star,
+            is_mut,
+            pat,
+        });
+        self.emit_location(label, &node);
+        emit_detached!(RefPat, self, node, label);
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
+        label
+    }
+
+    pub(crate) fn emit_ref_type(&mut self, node: ast::RefType) -> Label<generated::RefType> {
+        let is_mut = node.mut_token().is_some();
+        let lifetime = node.lifetime().map(|x| self.emit_lifetime(x));
+        let ty = node.ty().map(|x| self.emit_type(x));
+        let label = self.trap.emit(generated::RefType {
+            id: TrapId::Star,
+            is_mut,
+            lifetime,
+            ty,
+        });
+        self.emit_location(label, &node);
+        emit_detached!(RefType, self, node, label);
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
+        label
+    }
+
+    pub(crate) fn emit_rename(&mut self, node: ast::Rename) -> Label<generated::Rename> {
+        let name = node.name().map(|x| self.emit_name(x));
+        let label = self.trap.emit(generated::Rename {
+            id: TrapId::Star,
+            name,
+        });
+        self.emit_location(label, &node);
+        emit_detached!(Rename, self, node, label);
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
+        label
+    }
+
+    pub(crate) fn emit_rest_pat(&mut self, node: ast::RestPat) -> Label<generated::RestPat> {
+        let attrs = node.attrs().map(|x| self.emit_attr(x)).collect();
+        let label = self.trap.emit(generated::RestPat {
+            id: TrapId::Star,
+            attrs,
+        });
+        self.emit_location(label, &node);
+        emit_detached!(RestPat, self, node, label);
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
+        label
+    }
+
+    pub(crate) fn emit_ret_type(&mut self, node: ast::RetType) -> Label<generated::RetType> {
+        let ty = node.ty().map(|x| self.emit_type(x));
+        let label = self.trap.emit(generated::RetType {
+            id: TrapId::Star,
+            ty,
+        });
+        self.emit_location(label, &node);
+        emit_detached!(RetType, self, node, label);
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
+        label
+    }
+
+    pub(crate) fn emit_return_expr(&mut self, node: ast::ReturnExpr) -> Label<generated::ReturnExpr> {
+        let attrs = node.attrs().map(|x| self.emit_attr(x)).collect();
+        let expr = node.expr().map(|x| self.emit_expr(x));
+        let label = self.trap.emit(generated::ReturnExpr {
+            id: TrapId::Star,
+            attrs,
+            expr,
+        });
+        self.emit_location(label, &node);
+        emit_detached!(ReturnExpr, self, node, label);
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
+        label
+    }
+
+    pub(crate) fn emit_return_type_syntax(&mut self, node: ast::ReturnTypeSyntax) -> Label<generated::ReturnTypeSyntax> {
+        let label = self.trap.emit(generated::ReturnTypeSyntax {
+            id: TrapId::Star,
+        });
+        self.emit_location(label, &node);
+        emit_detached!(ReturnTypeSyntax, self, node, label);
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
+        label
+    }
+
+    pub(crate) fn emit_self_param(&mut self, node: ast::SelfParam) -> Label<generated::SelfParam> {
+        let attrs = node.attrs().map(|x| self.emit_attr(x)).collect();
+        let is_mut = node.mut_token().is_some();
+        let lifetime = node.lifetime().map(|x| self.emit_lifetime(x));
+        let name = node.name().map(|x| self.emit_name(x));
+        let ty = node.ty().map(|x| self.emit_type(x));
+        let label = self.trap.emit(generated::SelfParam {
+            id: TrapId::Star,
+            attrs,
+            is_mut,
+            lifetime,
+            name,
+            ty,
+        });
+        self.emit_location(label, &node);
+        emit_detached!(SelfParam, self, node, label);
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
+        label
+    }
+
+    pub(crate) fn emit_slice_pat(&mut self, node: ast::SlicePat) -> Label<generated::SlicePat> {
+        let pats = node.pats().map(|x| self.emit_pat(x)).collect();
+        let label = self.trap.emit(generated::SlicePat {
+            id: TrapId::Star,
+            pats,
+        });
+        self.emit_location(label, &node);
+        emit_detached!(SlicePat, self, node, label);
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
+        label
+    }
+
+    pub(crate) fn emit_slice_type(&mut self, node: ast::SliceType) -> Label<generated::SliceType> {
+        let ty = node.ty().map(|x| self.emit_type(x));
+        let label = self.trap.emit(generated::SliceType {
+            id: TrapId::Star,
+            ty,
+        });
+        self.emit_location(label, &node);
+        emit_detached!(SliceType, self, node, label);
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
+        label
+    }
+
+    pub(crate) fn emit_source_file(&mut self, node: ast::SourceFile) -> Label<generated::SourceFile> {
+        let attrs = node.attrs().map(|x| self.emit_attr(x)).collect();
+        let items = node.items().map(|x| self.emit_item(x)).collect();
+        let label = self.trap.emit(generated::SourceFile {
+            id: TrapId::Star,
+            attrs,
+            items,
+        });
+        self.emit_location(label, &node);
+        emit_detached!(SourceFile, self, node, label);
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
+        label
+    }
+
+    pub(crate) fn emit_static(&mut self, node: ast::Static) -> Label<generated::Static> {
+        let attrs = node.attrs().map(|x| self.emit_attr(x)).collect();
+        let body = node.body().map(|x| self.emit_expr(x));
+        let is_mut = node.mut_token().is_some();
+        let is_static = node.static_token().is_some();
+        let name = node.name().map(|x| self.emit_name(x));
+        let ty = node.ty().map(|x| self.emit_type(x));
+        let visibility = node.visibility().map(|x| self.emit_visibility(x));
+        let label = self.trap.emit(generated::Static {
+            id: TrapId::Star,
+            attrs,
+            body,
+            is_mut,
+            is_static,
+            name,
+            ty,
+            visibility,
+        });
+        self.emit_location(label, &node);
+        emit_detached!(Static, self, node, label);
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
+        label
+    }
+
+    pub(crate) fn emit_stmt_list(&mut self, node: ast::StmtList) -> Label<generated::StmtList> {
+        let attrs = node.attrs().map(|x| self.emit_attr(x)).collect();
+        let statements = node.statements().map(|x| self.emit_stmt(x)).collect();
+        let tail_expr = node.tail_expr().map(|x| self.emit_expr(x));
+        let label = self.trap.emit(generated::StmtList {
+            id: TrapId::Star,
+            attrs,
+            statements,
+            tail_expr,
+        });
+        self.emit_location(label, &node);
+        emit_detached!(StmtList, self, node, label);
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
+        label
+    }
+
+    pub(crate) fn emit_struct(&mut self, node: ast::Struct) -> Label<generated::Struct> {
+        let attrs = node.attrs().map(|x| self.emit_attr(x)).collect();
+        let field_list = node.field_list().map(|x| self.emit_field_list(x));
+        let generic_param_list = node.generic_param_list().map(|x| self.emit_generic_param_list(x));
+        let name = node.name().map(|x| self.emit_name(x));
+        let visibility = node.visibility().map(|x| self.emit_visibility(x));
+        let where_clause = node.where_clause().map(|x| self.emit_where_clause(x));
+        let label = self.trap.emit(generated::Struct {
+            id: TrapId::Star,
+            attrs,
+            field_list,
+            generic_param_list,
+            name,
+            visibility,
+            where_clause,
+        });
+        self.emit_location(label, &node);
+        emit_detached!(Struct, self, node, label);
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
+        label
+    }
+
+    pub(crate) fn emit_token_tree(&mut self, node: ast::TokenTree) -> Label<generated::TokenTree> {
+        let label = self.trap.emit(generated::TokenTree {
+            id: TrapId::Star,
+        });
+        self.emit_location(label, &node);
+        emit_detached!(TokenTree, self, node, label);
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
+        label
+    }
+
+    pub(crate) fn emit_trait(&mut self, node: ast::Trait) -> Label<generated::Trait> {
+        let assoc_item_list = node.assoc_item_list().map(|x| self.emit_assoc_item_list(x));
+        let attrs = node.attrs().map(|x| self.emit_attr(x)).collect();
+        let generic_param_list = node.generic_param_list().map(|x| self.emit_generic_param_list(x));
+        let is_auto = node.auto_token().is_some();
+        let is_unsafe = node.unsafe_token().is_some();
+        let name = node.name().map(|x| self.emit_name(x));
+        let type_bound_list = node.type_bound_list().map(|x| self.emit_type_bound_list(x));
+        let visibility = node.visibility().map(|x| self.emit_visibility(x));
+        let where_clause = node.where_clause().map(|x| self.emit_where_clause(x));
+        let label = self.trap.emit(generated::Trait {
+            id: TrapId::Star,
+            assoc_item_list,
+            attrs,
+            generic_param_list,
+            is_auto,
+            is_unsafe,
+            name,
+            type_bound_list,
+            visibility,
+            where_clause,
+        });
+        self.emit_location(label, &node);
+        emit_detached!(Trait, self, node, label);
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
+        label
+    }
+
+    pub(crate) fn emit_trait_alias(&mut self, node: ast::TraitAlias) -> Label<generated::TraitAlias> {
+        let attrs = node.attrs().map(|x| self.emit_attr(x)).collect();
+        let generic_param_list = node.generic_param_list().map(|x| self.emit_generic_param_list(x));
+        let name = node.name().map(|x| self.emit_name(x));
+        let type_bound_list = node.type_bound_list().map(|x| self.emit_type_bound_list(x));
+        let visibility = node.visibility().map(|x| self.emit_visibility(x));
+        let where_clause = node.where_clause().map(|x| self.emit_where_clause(x));
+        let label = self.trap.emit(generated::TraitAlias {
+            id: TrapId::Star,
+            attrs,
+            generic_param_list,
+            name,
+            type_bound_list,
+            visibility,
+            where_clause,
+        });
+        self.emit_location(label, &node);
+        emit_detached!(TraitAlias, self, node, label);
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
+        label
+    }
+
+    pub(crate) fn emit_try_expr(&mut self, node: ast::TryExpr) -> Label<generated::TryExpr> {
+        let attrs = node.attrs().map(|x| self.emit_attr(x)).collect();
+        let expr = node.expr().map(|x| self.emit_expr(x));
+        let label = self.trap.emit(generated::TryExpr {
+            id: TrapId::Star,
+            attrs,
+            expr,
+        });
+        self.emit_location(label, &node);
+        emit_detached!(TryExpr, self, node, label);
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
+        label
+    }
+
+    pub(crate) fn emit_tuple_expr(&mut self, node: ast::TupleExpr) -> Label<generated::TupleExpr> {
+        let attrs = node.attrs().map(|x| self.emit_attr(x)).collect();
+        let fields = node.fields().map(|x| self.emit_expr(x)).collect();
+        let label = self.trap.emit(generated::TupleExpr {
+            id: TrapId::Star,
+            attrs,
+            fields,
+        });
+        self.emit_location(label, &node);
+        emit_detached!(TupleExpr, self, node, label);
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
+        label
+    }
+
+    pub(crate) fn emit_tuple_field(&mut self, node: ast::TupleField) -> Label<generated::TupleField> {
+        let attrs = node.attrs().map(|x| self.emit_attr(x)).collect();
+        let ty = node.ty().map(|x| self.emit_type(x));
+        let visibility = node.visibility().map(|x| self.emit_visibility(x));
+        let label = self.trap.emit(generated::TupleField {
+            id: TrapId::Star,
+            attrs,
+            ty,
+            visibility,
+        });
+        self.emit_location(label, &node);
+        emit_detached!(TupleField, self, node, label);
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
+        label
+    }
+
+    pub(crate) fn emit_tuple_field_list(&mut self, node: ast::TupleFieldList) -> Label<generated::TupleFieldList> {
+        let fields = node.fields().map(|x| self.emit_tuple_field(x)).collect();
+        let label = self.trap.emit(generated::TupleFieldList {
+            id: TrapId::Star,
+            fields,
+        });
+        self.emit_location(label, &node);
+        emit_detached!(TupleFieldList, self, node, label);
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
+        label
+    }
+
+    pub(crate) fn emit_tuple_pat(&mut self, node: ast::TuplePat) -> Label<generated::TuplePat> {
+        let fields = node.fields().map(|x| self.emit_pat(x)).collect();
+        let label = self.trap.emit(generated::TuplePat {
+            id: TrapId::Star,
+            fields,
+        });
+        self.emit_location(label, &node);
+        emit_detached!(TuplePat, self, node, label);
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
+        label
+    }
+
+    pub(crate) fn emit_tuple_struct_pat(&mut self, node: ast::TupleStructPat) -> Label<generated::TupleStructPat> {
+        let fields = node.fields().map(|x| self.emit_pat(x)).collect();
+        let path = node.path().map(|x| self.emit_path(x));
+        let label = self.trap.emit(generated::TupleStructPat {
+            id: TrapId::Star,
+            fields,
+            path,
+        });
+        self.emit_location(label, &node);
+        emit_detached!(TupleStructPat, self, node, label);
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
+        label
+    }
+
+    pub(crate) fn emit_tuple_type(&mut self, node: ast::TupleType) -> Label<generated::TupleType> {
+        let fields = node.fields().map(|x| self.emit_type(x)).collect();
+        let label = self.trap.emit(generated::TupleType {
+            id: TrapId::Star,
+            fields,
+        });
+        self.emit_location(label, &node);
+        emit_detached!(TupleType, self, node, label);
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
+        label
+    }
+
+    pub(crate) fn emit_type_alias(&mut self, node: ast::TypeAlias) -> Label<generated::TypeAlias> {
+        let attrs = node.attrs().map(|x| self.emit_attr(x)).collect();
+        let generic_param_list = node.generic_param_list().map(|x| self.emit_generic_param_list(x));
+        let is_default = node.default_token().is_some();
+        let name = node.name().map(|x| self.emit_name(x));
+        let ty = node.ty().map(|x| self.emit_type(x));
+        let type_bound_list = node.type_bound_list().map(|x| self.emit_type_bound_list(x));
+        let visibility = node.visibility().map(|x| self.emit_visibility(x));
+        let where_clause = node.where_clause().map(|x| self.emit_where_clause(x));
+        let label = self.trap.emit(generated::TypeAlias {
+            id: TrapId::Star,
+            attrs,
+            generic_param_list,
+            is_default,
+            name,
+            ty,
+            type_bound_list,
+            visibility,
+            where_clause,
+        });
+        self.emit_location(label, &node);
+        emit_detached!(TypeAlias, self, node, label);
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
+        label
+    }
+
+    pub(crate) fn emit_type_arg(&mut self, node: ast::TypeArg) -> Label<generated::TypeArg> {
+        let ty = node.ty().map(|x| self.emit_type(x));
+        let label = self.trap.emit(generated::TypeArg {
+            id: TrapId::Star,
+            ty,
+        });
+        self.emit_location(label, &node);
+        emit_detached!(TypeArg, self, node, label);
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
+        label
+    }
+
+    pub(crate) fn emit_type_bound(&mut self, node: ast::TypeBound) -> Label<generated::TypeBound> {
+        let generic_param_list = node.generic_param_list().map(|x| self.emit_generic_param_list(x));
+        let is_async = node.async_token().is_some();
+        let is_const = node.const_token().is_some();
+        let lifetime = node.lifetime().map(|x| self.emit_lifetime(x));
+        let ty = node.ty().map(|x| self.emit_type(x));
+        let label = self.trap.emit(generated::TypeBound {
+            id: TrapId::Star,
+            generic_param_list,
+            is_async,
+            is_const,
+            lifetime,
+            ty,
+        });
+        self.emit_location(label, &node);
+        emit_detached!(TypeBound, self, node, label);
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
+        label
+    }
+
+    pub(crate) fn emit_type_bound_list(&mut self, node: ast::TypeBoundList) -> Label<generated::TypeBoundList> {
+        let bounds = node.bounds().map(|x| self.emit_type_bound(x)).collect();
+        let label = self.trap.emit(generated::TypeBoundList {
+            id: TrapId::Star,
+            bounds,
+        });
+        self.emit_location(label, &node);
+        emit_detached!(TypeBoundList, self, node, label);
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
+        label
+    }
+
+    pub(crate) fn emit_type_param(&mut self, node: ast::TypeParam) -> Label<generated::TypeParam> {
+        let attrs = node.attrs().map(|x| self.emit_attr(x)).collect();
+        let default_type = node.default_type().map(|x| self.emit_type(x));
+        let name = node.name().map(|x| self.emit_name(x));
+        let type_bound_list = node.type_bound_list().map(|x| self.emit_type_bound_list(x));
+        let label = self.trap.emit(generated::TypeParam {
+            id: TrapId::Star,
+            attrs,
+            default_type,
+            name,
+            type_bound_list,
+        });
+        self.emit_location(label, &node);
+        emit_detached!(TypeParam, self, node, label);
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
+        label
+    }
+
+    pub(crate) fn emit_underscore_expr(&mut self, node: ast::UnderscoreExpr) -> Label<generated::UnderscoreExpr> {
+        let attrs = node.attrs().map(|x| self.emit_attr(x)).collect();
+        let label = self.trap.emit(generated::UnderscoreExpr {
+            id: TrapId::Star,
+            attrs,
+        });
+        self.emit_location(label, &node);
+        emit_detached!(UnderscoreExpr, self, node, label);
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
+        label
+    }
+
+    pub(crate) fn emit_union(&mut self, node: ast::Union) -> Label<generated::Union> {
+        let attrs = node.attrs().map(|x| self.emit_attr(x)).collect();
+        let generic_param_list = node.generic_param_list().map(|x| self.emit_generic_param_list(x));
+        let name = node.name().map(|x| self.emit_name(x));
+        let record_field_list = node.record_field_list().map(|x| self.emit_record_field_list(x));
+        let visibility = node.visibility().map(|x| self.emit_visibility(x));
+        let where_clause = node.where_clause().map(|x| self.emit_where_clause(x));
+        let label = self.trap.emit(generated::Union {
+            id: TrapId::Star,
+            attrs,
+            generic_param_list,
+            name,
+            record_field_list,
+            visibility,
+            where_clause,
+        });
+        self.emit_location(label, &node);
+        emit_detached!(Union, self, node, label);
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
+        label
+    }
+
+    pub(crate) fn emit_use(&mut self, node: ast::Use) -> Label<generated::Use> {
+        let attrs = node.attrs().map(|x| self.emit_attr(x)).collect();
+        let use_tree = node.use_tree().map(|x| self.emit_use_tree(x));
+        let visibility = node.visibility().map(|x| self.emit_visibility(x));
+        let label = self.trap.emit(generated::Use {
+            id: TrapId::Star,
+            attrs,
+            use_tree,
+            visibility,
+        });
+        self.emit_location(label, &node);
+        emit_detached!(Use, self, node, label);
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
+        label
+    }
+
+    pub(crate) fn emit_use_tree(&mut self, node: ast::UseTree) -> Label<generated::UseTree> {
+        let path = node.path().map(|x| self.emit_path(x));
+        let rename = node.rename().map(|x| self.emit_rename(x));
+        let use_tree_list = node.use_tree_list().map(|x| self.emit_use_tree_list(x));
+        let label = self.trap.emit(generated::UseTree {
+            id: TrapId::Star,
+            path,
+            rename,
+            use_tree_list,
+        });
+        self.emit_location(label, &node);
+        emit_detached!(UseTree, self, node, label);
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
+        label
+    }
+
+    pub(crate) fn emit_use_tree_list(&mut self, node: ast::UseTreeList) -> Label<generated::UseTreeList> {
+        let use_trees = node.use_trees().map(|x| self.emit_use_tree(x)).collect();
+        let label = self.trap.emit(generated::UseTreeList {
+            id: TrapId::Star,
+            use_trees,
+        });
+        self.emit_location(label, &node);
+        emit_detached!(UseTreeList, self, node, label);
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
+        label
+    }
+
+    pub(crate) fn emit_variant(&mut self, node: ast::Variant) -> Label<generated::Variant> {
+        let attrs = node.attrs().map(|x| self.emit_attr(x)).collect();
+        let expr = node.expr().map(|x| self.emit_expr(x));
+        let field_list = node.field_list().map(|x| self.emit_field_list(x));
+        let name = node.name().map(|x| self.emit_name(x));
+        let visibility = node.visibility().map(|x| self.emit_visibility(x));
+        let label = self.trap.emit(generated::Variant {
+            id: TrapId::Star,
+            attrs,
+            expr,
+            field_list,
+            name,
+            visibility,
+        });
+        self.emit_location(label, &node);
+        emit_detached!(Variant, self, node, label);
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
+        label
+    }
+
+    pub(crate) fn emit_variant_list(&mut self, node: ast::VariantList) -> Label<generated::VariantList> {
+        let variants = node.variants().map(|x| self.emit_variant(x)).collect();
+        let label = self.trap.emit(generated::VariantList {
+            id: TrapId::Star,
+            variants,
+        });
+        self.emit_location(label, &node);
+        emit_detached!(VariantList, self, node, label);
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
+        label
+    }
+
+    pub(crate) fn emit_visibility(&mut self, node: ast::Visibility) -> Label<generated::Visibility> {
+        let path = node.path().map(|x| self.emit_path(x));
+        let label = self.trap.emit(generated::Visibility {
+            id: TrapId::Star,
+            path,
+        });
+        self.emit_location(label, &node);
+        emit_detached!(Visibility, self, node, label);
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
+        label
+    }
+
+    pub(crate) fn emit_where_clause(&mut self, node: ast::WhereClause) -> Label<generated::WhereClause> {
+        let predicates = node.predicates().map(|x| self.emit_where_pred(x)).collect();
+        let label = self.trap.emit(generated::WhereClause {
+            id: TrapId::Star,
+            predicates,
+        });
+        self.emit_location(label, &node);
+        emit_detached!(WhereClause, self, node, label);
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
+        label
+    }
+
+    pub(crate) fn emit_where_pred(&mut self, node: ast::WherePred) -> Label<generated::WherePred> {
+        let generic_param_list = node.generic_param_list().map(|x| self.emit_generic_param_list(x));
+        let lifetime = node.lifetime().map(|x| self.emit_lifetime(x));
+        let ty = node.ty().map(|x| self.emit_type(x));
+        let type_bound_list = node.type_bound_list().map(|x| self.emit_type_bound_list(x));
+        let label = self.trap.emit(generated::WherePred {
+            id: TrapId::Star,
+            generic_param_list,
+            lifetime,
+            ty,
+            type_bound_list,
+        });
+        self.emit_location(label, &node);
+        emit_detached!(WherePred, self, node, label);
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
+        label
+    }
+
+    pub(crate) fn emit_while_expr(&mut self, node: ast::WhileExpr) -> Label<generated::WhileExpr> {
+        let attrs = node.attrs().map(|x| self.emit_attr(x)).collect();
+        let condition = node.condition().map(|x| self.emit_expr(x));
+        let label = node.label().map(|x| self.emit_label(x));
+        let loop_body = node.loop_body().map(|x| self.emit_block_expr(x));
+        let label = self.trap.emit(generated::WhileExpr {
+            id: TrapId::Star,
+            attrs,
+            condition,
+            label,
+            loop_body,
+        });
+        self.emit_location(label, &node);
+        emit_detached!(WhileExpr, self, node, label);
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
+        label
+    }
+
+    pub(crate) fn emit_wildcard_pat(&mut self, node: ast::WildcardPat) -> Label<generated::WildcardPat> {
+        let label = self.trap.emit(generated::WildcardPat {
+            id: TrapId::Star,
+        });
+        self.emit_location(label, &node);
+        emit_detached!(WildcardPat, self, node, label);
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
+        label
+    }
+
+    pub(crate) fn emit_yeet_expr(&mut self, node: ast::YeetExpr) -> Label<generated::YeetExpr> {
+        let attrs = node.attrs().map(|x| self.emit_attr(x)).collect();
+        let expr = node.expr().map(|x| self.emit_expr(x));
+        let label = self.trap.emit(generated::YeetExpr {
+            id: TrapId::Star,
+            attrs,
+            expr,
+        });
+        self.emit_location(label, &node);
+        emit_detached!(YeetExpr, self, node, label);
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
+        label
+    }
+
+    pub(crate) fn emit_yield_expr(&mut self, node: ast::YieldExpr) -> Label<generated::YieldExpr> {
+        let attrs = node.attrs().map(|x| self.emit_attr(x)).collect();
+        let expr = node.expr().map(|x| self.emit_expr(x));
+        let label = self.trap.emit(generated::YieldExpr {
+            id: TrapId::Star,
+            attrs,
+            expr,
+        });
+        self.emit_location(label, &node);
+        emit_detached!(YieldExpr, self, node, label);
+        self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
+        label
+    }
+
+}
diff --git a/rust/extractor/src/translate/mappings.rs b/rust/extractor/src/translate/mappings.rs
new file mode 100644
index 00000000000..885055a6017
--- /dev/null
+++ b/rust/extractor/src/translate/mappings.rs
@@ -0,0 +1,172 @@
+use ra_ap_hir::{Enum, Function, HasContainer, Module, Semantics, Struct, Trait, Union};
+use ra_ap_ide_db::RootDatabase;
+use ra_ap_syntax::{ast, ast::RangeItem, AstNode};
+
+pub(crate) trait TextValue {
+    fn try_get_text(&self) -> Option<String>;
+}
+
+impl TextValue for ast::Lifetime {
+    fn try_get_text(&self) -> Option<String> {
+        self.text().to_string().into()
+    }
+}
+impl TextValue for ast::Name {
+    fn try_get_text(&self) -> Option<String> {
+        self.text().to_string().into()
+    }
+}
+impl TextValue for ast::Literal {
+    fn try_get_text(&self) -> Option<String> {
+        self.token().text().to_string().into()
+    }
+}
+impl TextValue for ast::NameRef {
+    fn try_get_text(&self) -> Option<String> {
+        self.text().to_string().into()
+    }
+}
+impl TextValue for ast::Abi {
+    fn try_get_text(&self) -> Option<String> {
+        self.abi_string().map(|x| x.to_string())
+    }
+}
+
+impl TextValue for ast::BinExpr {
+    fn try_get_text(&self) -> Option<String> {
+        self.op_token().map(|x| x.text().to_string())
+    }
+}
+impl TextValue for ast::PrefixExpr {
+    fn try_get_text(&self) -> Option<String> {
+        self.op_token().map(|x| x.text().to_string())
+    }
+}
+impl TextValue for ast::RangeExpr {
+    fn try_get_text(&self) -> Option<String> {
+        self.op_token().map(|x| x.text().to_string())
+    }
+}
+impl TextValue for ast::RangePat {
+    fn try_get_text(&self) -> Option<String> {
+        self.op_token().map(|x| x.text().to_string())
+    }
+}
+
+pub(crate) trait AddressableHir<Ast: AstNode>: HasContainer + Copy {
+    fn name(self, sema: &Semantics<'_, RootDatabase>) -> Option<String>;
+    fn try_from_source(value: &Ast, sema: &Semantics<'_, RootDatabase>) -> Option<Self>;
+    fn module(self, sema: &Semantics<'_, RootDatabase>) -> Module;
+}
+
+impl AddressableHir<ast::Fn> for Function {
+    fn name(self, sema: &Semantics<'_, RootDatabase>) -> Option<String> {
+        Some(self.name(sema.db).as_str().to_owned())
+    }
+
+    fn try_from_source(value: &ast::Fn, sema: &Semantics<'_, RootDatabase>) -> Option<Self> {
+        sema.to_fn_def(value)
+    }
+
+    fn module(self, sema: &Semantics<'_, RootDatabase>) -> Module {
+        self.module(sema.db)
+    }
+}
+
+impl AddressableHir<ast::Trait> for Trait {
+    fn name(self, sema: &Semantics<'_, RootDatabase>) -> Option<String> {
+        Some(self.name(sema.db).as_str().to_owned())
+    }
+
+    fn try_from_source(value: &ast::Trait, sema: &Semantics<'_, RootDatabase>) -> Option<Self> {
+        sema.to_trait_def(value)
+    }
+
+    fn module(self, sema: &Semantics<'_, RootDatabase>) -> Module {
+        self.module(sema.db)
+    }
+}
+
+impl AddressableHir<ast::Module> for Module {
+    fn name(self, sema: &Semantics<'_, RootDatabase>) -> Option<String> {
+        self.name(sema.db).map(|s| s.as_str().to_owned())
+    }
+
+    fn try_from_source(value: &ast::Module, sema: &Semantics<'_, RootDatabase>) -> Option<Self> {
+        sema.to_module_def(value)
+    }
+
+    fn module(self, _sema: &Semantics<'_, RootDatabase>) -> Module {
+        self
+    }
+}
+
+impl AddressableHir<ast::Struct> for Struct {
+    fn name(self, sema: &Semantics<'_, RootDatabase>) -> Option<String> {
+        Some(self.name(sema.db).as_str().to_owned())
+    }
+
+    fn try_from_source(value: &ast::Struct, sema: &Semantics<'_, RootDatabase>) -> Option<Self> {
+        sema.to_struct_def(value)
+    }
+
+    fn module(self, sema: &Semantics<'_, RootDatabase>) -> Module {
+        self.module(sema.db)
+    }
+}
+
+impl AddressableHir<ast::Enum> for Enum {
+    fn name(self, sema: &Semantics<'_, RootDatabase>) -> Option<String> {
+        Some(self.name(sema.db).as_str().to_owned())
+    }
+
+    fn try_from_source(value: &ast::Enum, sema: &Semantics<'_, RootDatabase>) -> Option<Self> {
+        sema.to_enum_def(value)
+    }
+
+    fn module(self, sema: &Semantics<'_, RootDatabase>) -> Module {
+        self.module(sema.db)
+    }
+}
+
+impl AddressableHir<ast::Union> for Union {
+    fn name(self, sema: &Semantics<'_, RootDatabase>) -> Option<String> {
+        Some(self.name(sema.db).as_str().to_owned())
+    }
+
+    fn try_from_source(value: &ast::Union, sema: &Semantics<'_, RootDatabase>) -> Option<Self> {
+        sema.to_union_def(value)
+    }
+
+    fn module(self, sema: &Semantics<'_, RootDatabase>) -> Module {
+        self.module(sema.db)
+    }
+}
+
+pub(crate) trait AddressableAst: AstNode + Sized {
+    type Hir: AddressableHir<Self>;
+}
+
+impl AddressableAst for ast::Fn {
+    type Hir = Function;
+}
+
+impl AddressableAst for ast::Trait {
+    type Hir = Trait;
+}
+
+impl AddressableAst for ast::Struct {
+    type Hir = Struct;
+}
+
+impl AddressableAst for ast::Enum {
+    type Hir = Enum;
+}
+
+impl AddressableAst for ast::Union {
+    type Hir = Union;
+}
+
+impl AddressableAst for ast::Module {
+    type Hir = Module;
+}
diff --git a/rust/extractor/src/trap.rs b/rust/extractor/src/trap.rs
index f01aaebe5a8..58f56fb2b1e 100644
--- a/rust/extractor/src/trap.rs
+++ b/rust/extractor/src/trap.rs
@@ -1,9 +1,8 @@
+use crate::config;
 use crate::config::Compression;
-use crate::{config, path};
-use codeql_extractor::{extractor, trap};
+use codeql_extractor::{extractor, file_paths, trap};
 use log::debug;
 use ra_ap_ide_db::line_index::LineCol;
-use std::ffi::OsString;
 use std::fmt::Debug;
 use std::hash::Hash;
 use std::marker::PhantomData;
@@ -12,7 +11,6 @@ use std::path::{Path, PathBuf};
 pub use trap::Label as UntypedLabel;
 pub use trap::Writer;
 
-//TODO: typed labels
 pub trait AsTrapKeyPart {
     fn as_key_part(&self) -> String;
 }
@@ -126,23 +124,29 @@ impl<T: TrapClass> From<Label<T>> for trap::Arg {
 
 pub struct TrapFile {
     path: PathBuf,
-    writer: Writer,
+    pub writer: Writer,
     compression: Compression,
 }
 
+#[derive(Copy, Clone, PartialEq, Eq, PartialOrd, Ord)]
+pub enum DiagnosticSeverity {
+    Debug = 10,
+    Info = 20,
+    Warning = 30,
+    Error = 40,
+}
 impl TrapFile {
-    pub fn emit_location<E: TrapClass>(
+    pub fn emit_location_label(
         &mut self,
         file_label: UntypedLabel,
-        entity_label: Label<E>,
         start: LineCol,
         end: LineCol,
-    ) {
+    ) -> UntypedLabel {
         let start_line = 1 + start.line as usize;
         let start_column = 1 + start.col as usize;
         let end_line = 1 + end.line as usize;
         let end_column = 1 + end.col as usize;
-        let location_label = extractor::location_label(
+        extractor::location_label(
             &mut self.writer,
             trap::Location {
                 file_label,
@@ -151,13 +155,43 @@ impl TrapFile {
                 end_line,
                 end_column,
             },
-        );
+        )
+    }
+    pub fn emit_location<E: TrapClass>(
+        &mut self,
+        file_label: UntypedLabel,
+        entity_label: Label<E>,
+        start: LineCol,
+        end: LineCol,
+    ) {
+        let location_label = self.emit_location_label(file_label, start, end);
         self.writer.add_tuple(
             "locatable_locations",
             vec![entity_label.into(), location_label.into()],
         );
     }
 
+    pub fn emit_diagnostic(
+        &mut self,
+        severity: DiagnosticSeverity,
+        error_tag: String,
+        error_message: String,
+        full_error_message: String,
+        location: UntypedLabel,
+    ) {
+        let label = self.writer.fresh_id();
+        self.writer.add_tuple(
+            "diagnostics",
+            vec![
+                trap::Arg::Label(label),
+                trap::Arg::Int(severity as usize),
+                trap::Arg::String(error_tag),
+                trap::Arg::String(error_message),
+                trap::Arg::String(full_error_message),
+                trap::Arg::Label(location),
+            ],
+        );
+    }
     pub fn emit_file(&mut self, absolute_path: &Path) -> trap::Label {
         extractor::populate_file(&mut self.writer, absolute_path)
     }
@@ -210,19 +244,8 @@ impl TrapFileProvider {
     }
 
     pub fn create(&self, category: &str, key: &Path) -> TrapFile {
-        let mut path = PathBuf::from(category);
-        path.push(path::key(key));
-        path.set_extension(
-            path.extension()
-                .map(|e| {
-                    let mut o: OsString = e.to_owned();
-                    o.push(".trap");
-                    o
-                })
-                .unwrap_or("trap".into()),
-        );
+        let path = file_paths::path_for(&self.trap_dir.join(category), key, "trap");
         debug!("creating trap file {}", path.display());
-        path = self.trap_dir.join(path);
         let mut writer = trap::Writer::new();
         extractor::populate_empty_location(&mut writer);
         TrapFile {
diff --git a/rust/integration-tests/test.py b/rust/integration-tests/test.py
deleted file mode 100644
index b2d446decd2..00000000000
--- a/rust/integration-tests/test.py
+++ /dev/null
@@ -1,4 +0,0 @@
-# dummy test to get CI going
-
-def test(codeql, rust):
-    pass
diff --git a/rust/lint.py b/rust/lint.py
index eb71cbd0b3d..3a231c157df 100755
--- a/rust/lint.py
+++ b/rust/lint.py
@@ -12,7 +12,7 @@ assert cargo, "no cargo binary found on `PATH`"
 
 fmt = subprocess.run([cargo, "fmt", "--all", "--quiet"], cwd=this_dir)
 for manifest in this_dir.rglob("Cargo.toml"):
-    if not manifest.is_relative_to(this_dir / "ql"):
+    if not manifest.is_relative_to(this_dir / "ql") and not manifest.is_relative_to(this_dir / "integration-tests"):
         clippy = subprocess.run([cargo, "clippy", "--fix", "--allow-dirty", "--allow-staged", "--quiet"],
                                 cwd=manifest.parent)
 sys.exit(fmt.returncode or clippy.returncode)
diff --git a/rust/ql/.generated.list b/rust/ql/.generated.list
index f348b48f712..ca25e0533fc 100644
--- a/rust/ql/.generated.list
+++ b/rust/ql/.generated.list
@@ -1,168 +1,341 @@
-lib/codeql/rust/elements/ArrayExpr.qll 5d5e018ca1999dfcdac0b12259fa356db95cb371578accf0beeb0c92356d7bd0 b6937afa7075414ec874964eb4a7d2f67e01ec311295aca56b308dc0f05d45fe
-lib/codeql/rust/elements/AsmExpr.qll d0f548ab78924e4626b5d79ec06b4571920f8749f5b570927051a73cf2a5ce0e a3546d5d64d8351219b7bb6b63b4d8e69df0fb4d5b25b47fae2c807086906e50
+lib/codeql/rust/elements/Abi.qll 4c973d28b6d628f5959d1f1cc793704572fd0acaae9a97dfce82ff9d73f73476 250f68350180af080f904cd34cb2af481c5c688dc93edf7365fd0ae99855e893
+lib/codeql/rust/elements/ArgList.qll 661f5100f5d3ef8351452d9058b663a2a5c720eea8cf11bedd628969741486a2 28e424aac01a90fb58cd6f9f83c7e4cf379eea39e636bc0ba07efc818be71c71
+lib/codeql/rust/elements/ArrayExpr.qll a3e6e122632f4011644ec31b37f88b32fe3f2b7e388e7e878a6883309937049f 12ccb5873d95c433da5606fd371d182ef2f71b78d0c53c2d6dec10fa45852bdc
+lib/codeql/rust/elements/ArrayType.qll affd43d308200d60d08e8924cdbb2a17a827ebaa62a296e07bb9ce97451e3c4c 80589a7f79bf2ac293a027faf2589b3027a6c4a286533f2ffccad259a306a8cb
+lib/codeql/rust/elements/AsmExpr.qll 2f1c78e92b56d66a559543b2103d8f880dd4fa4c6907346f668b3714cf2355e9 12e174fc469c067c957f6c1a5969ab56a71a07c537ca930a564cce81c7ab4481
+lib/codeql/rust/elements/AssocItem.qll 5e514287bbe353d1d637991e7af836e5659ad66922df99af68ab61399e7f8f9a 3733af54938271161ee2720c32ac43228d519b5c46b7cea1e4bbe3dc634f8857
+lib/codeql/rust/elements/AssocItemList.qll ee719e7105a1936e2dd6cda0c55c73ff2704b6461861b2503ed86198484e4c06 de26c8127fd643b8b4567c0ce39511050f7ceefa0075a48a8ad03d50f56a1142
+lib/codeql/rust/elements/AssocTypeArg.qll 4740b296f596f58ed8d2788f55ffc1557ea22329b17b9374c885c4fd395d6eff 0191ca01b917d611ecd25f8171bbacd88335cf6a447f2f9da84dda816a170a65
 lib/codeql/rust/elements/AstNode.qll 5ee6355afb1cafd6dfe408b8c21836a1ba2aeb709fb618802aa09f9342646084 dee708f19c1b333cbd9609819db3dfdb48a0c90d26266c380f31357b1e2d6141
-lib/codeql/rust/elements/AsyncBlockExpr.qll 91d3964d4dc67c6a71e2720a8c32eba12aa7fa6fb11de512f409192aca96d832 1198b0dfaf59b70a0a9b4d36ea32ddff281f9bed53f3a0ad2f23c673d4441bdf
-lib/codeql/rust/elements/AwaitExpr.qll ec6bd645f3f062c5ae5bdc6a50e8fd3a99aca130592c1e329b3a52a48b8b2bae a57f310266b7fdf2d73ec54672f5bdf9111ee83e44cb86ebd984e67ed0a2715f
-lib/codeql/rust/elements/BecomeExpr.qll dc00738e96564f2a2e55a9a0c6125bb75b528b09bf515f64acc7725e584ac5fe 6e74e274ed38ac6a23e8ed1bfca3b490c4501834a3065a48bf3d480f5efaf973
-lib/codeql/rust/elements/BinaryExpr.qll 91bca0c2842d5afcec36868aa31bc19ec0f8b5ca45411bb9a64fc152dd23759a 9f2f747cb934486dfdb4406d15a161b51dcc837ca723091a6d5bed36b0ad4f98
-lib/codeql/rust/elements/BlockExpr.qll 72d39fa121f913aad03adeeafa15dd8978ea6c868cc37969ca02638165d6fe45 2fd2c9d35ef62021e823dd41410d462d45f8fe464e0c355734a7111090d99ab5
-lib/codeql/rust/elements/BlockExprBase.qll 7559e3575c32442970656f73490263bcf055ce69a57a5558c88a05259329f20c 5059db6a1b4aef51d7d7151758b9541597d877efc8426dd54db98b0b6f3ec5ee
-lib/codeql/rust/elements/BoxExpr.qll 3a13fd4b16211369f29294bf8cc77b8ff00109ba8b832eb30ff1b28f41b09f28 0c4c75007c290bcf97e369cf9560ab33366c48d0c0d8eed762843d7384c5241c
+lib/codeql/rust/elements/Attr.qll 53887a49513b95e38344b57d824a7474331467561f1edf38d5ca608d8cefa0cd 2e9eeb32ba6cc186691897979e30d32bc6eaff523e37064ee84cf09ded5afe17
+lib/codeql/rust/elements/AwaitExpr.qll d8b37c01f7d27f0ec40d92a533a8f09a06af7ece1ae832b4ea8f2450c1762511 92cdb7ff0efddf26bed2b7b2729fddd197e26c1a11c8fec0c747aab642710c21
+lib/codeql/rust/elements/BecomeExpr.qll 7a3cfc4894feb6be1cde664f675b18936434e68ccea52e55314c33d01491e34f 49666eca509b30d44bb02702bda67239c76bf8d9f231022c9cf6ecca123f8616
+lib/codeql/rust/elements/BinaryExpr.qll 394522da3bc3a716fc7bc40c3560143ca840f5d210cfcba2a752c3026dd0f725 fbbd6fb79bf16a7d9820613654c584cd7ff3e7a29988f3920b6cfbe746acfd8d
+lib/codeql/rust/elements/BlockExpr.qll b952fd44b89de248931d4089834d2c9406f6f2fc1a3f5c2365156be4e55157cf daccc07ab11ac696679b9fadc99f40b1bf579c90bf6c7cca6e82eaa313932ede
 lib/codeql/rust/elements/BoxPat.qll 1b2c3fff171aa6aa238c9460b122f26c79e04577cea67fa856de99842ba873d4 0caf8d23ed6e0997a6b8751def27641582151fba6e24fccf798712a4690b42f1
-lib/codeql/rust/elements/BreakExpr.qll d7f363fa00055149d83a5eec0b3cc31f6dffcaec5c93b9b4071e51e46e7762c0 dbe37d5561e282fe98e512975e44aaf91bc2ea36ab682f951b3d9823d4b0c7b3
-lib/codeql/rust/elements/CallExpr.qll 987034285d7db7075df66d388a4aea2a545532fd92b932f58b0c9115d5431bc5 1d1a729a534e348d73c5f219a4a12c5d58121c51cc832774d8388bfa5dd61ac9
-lib/codeql/rust/elements/CastExpr.qll 23ca51a640290d701d8772c75442188b9e35d2f004090ddbb96bf97d008f6085 c05b3e0d0a84be8dae4f7ec403ce1cb3695175e0c72f8892b2309abc133f6a2c
-lib/codeql/rust/elements/ClosureExpr.qll 49413c317e80f1ef0cd088bb4ade3bf8c4c40437913d341b86331652f6556153 6f1fcb57b49b13130abd06eec5aae56bbda77db277ceef122368cf7e62e2dbeb
-lib/codeql/rust/elements/ConstBlockPat.qll f5f9e256947d838c5c8891af4161e34814939594497ecda626ab191e59e39019 d0379babb6c59859be4f493f41fe84d8883f49fa641f290de30f5282c2e6bd63
-lib/codeql/rust/elements/ConstExpr.qll 42f9f01582c6600d3f31568c21762ddee45ce279ce164cc795115ec75f12a0dd 68ad86b6f6110b7e0fdca71e0372576f187b31acd2b5cf7e9a25e6658e4ade7e
-lib/codeql/rust/elements/ContinueExpr.qll b0692269719875def0093213e3c1532350027b656b385d2b877190100eaf0f34 5976080d329fcc72b028d6e425c286233c8a95c2fb207b61d57400b9d17b10d5
-lib/codeql/rust/elements/Declaration.qll ca2cf5f2b47a091de8d169f447f596711060624d86674303c676e0e5e8c73ba9 fa0d1fe6c2799094b976cf5dd3085c9ccc3de4669b6566563fc957464b629b06
+lib/codeql/rust/elements/BreakExpr.qll 7ca3807a20e9a9a988d1fd7abebf240325ed422fcb45c719ba46272f031f94db dffb7379d3f3ba220acfbd05eb7bb6cfd9cfda211e9c8b1f5240ca5fa61be3fc
+lib/codeql/rust/elements/CallExpr.qll f336500ca7a611b164d48b90e80edb0c0d3816792b0ececce659ac1ff1ffeb3e f99a9c55466418ef53860c44d9f2d6161af4b492178ddd9e5870dff742b70ae5
+lib/codeql/rust/elements/CallExprBase.qll 2846202b5208b541977500286951d96487bf555838c6c16cdd006a71e383745a c789d412bf099c624329379e0c7d94fa0d23ae2edea7a25a2ea0f3c0042ccf62
+lib/codeql/rust/elements/Callable.qll e1ed21a7e6bd2426f6ccd0e46cee506d8ebf90a6fdc4dca0979157da439853aa 02f6c09710116ce82157aec9a5ec706983c38e4d85cc631327baf8d409b018c6
+lib/codeql/rust/elements/CastExpr.qll ba281bde130f43c486c4ad889539b77fba9e41afdf7980e50b6a8696a1ec7527 61257003d395896ec60729d0bc01da36697615bb725d07141255fbb5c44e50a0
+lib/codeql/rust/elements/ClosureBinder.qll 977df800f97cc9b03fffb5e5e1fc6acd08a2938e04cb6ad91108784a15b0d510 f6fad4127226fe1dff2f16416d8a7fde5d8ab4a88f30e443ac5e5ff618de3e05
+lib/codeql/rust/elements/ClosureExpr.qll 192f67bb98d455f7de9eb871fc8f7353dfd991b857ed9fe65d01ef8610ece852 af99426b33dcf19ca4b97817dd94dd102cb0884c30bf7d947e9e6762e1c152ee
+lib/codeql/rust/elements/Comment.qll fedad50575125e9a64a8a8776a8c1dbf1e76df990f01849d9f0955f9d74cb2a6 8eb1afad1e1007a4f0090fdac65d81726b23eda6517d067fd0185f70f17635ab
+lib/codeql/rust/elements/Const.qll 2843a870e2abdf5b63fbea13f8a9ec4981b74369adec2ed3ce00a7d6f5a6fee3 c0bdb467cce63dcd3c65b21ef0836d8bf4e6c8d7d70049df8581fd35fdd03083
+lib/codeql/rust/elements/ConstArg.qll f37b34417503bbd2f3ce09b3211d8fa71f6a954970c2738c73be6c55f204e58e 15ef5e189b67cfdfe4d16909e0b411ac8fdd4ef187c328bdede03a1a5e416b54
+lib/codeql/rust/elements/ConstBlockPat.qll a25f42b84dbeb33e10955735ef53b8bb7e3258522d6d1a9068f19adaf1af89d9 eeb816d2b54db77a1e7bb70e90b68d040a0cd44e9d44455a223311c3615c5e6e
+lib/codeql/rust/elements/ConstParam.qll bda26c61f531b4a6bbe8c95c414f5431b75bbc3d9b559fc6dc21d60b32f993f9 dc82bcba1a513d1d9e0072ec252b78a17ff7217b2064290b1791b24f72a99221
+lib/codeql/rust/elements/ContinueExpr.qll 9f27c5d5c819ad0ebc5bd10967ba8d33a9dc95b9aae278fcfb1fcf9216bda79c 0dc061445a6b89854fdce92aaf022fdc76b724511a50bb777496ce75c9ecb262
+lib/codeql/rust/elements/DynTraitType.qll 5d249ac6b61916dad08be29631de77405928f0f38da499c66c1c412347945860 2adc38d1afd039b48c56d934e521e4a41589f761b988587bc55781104d6bd996
 lib/codeql/rust/elements/Element.qll 0b62d139fef54ed2cf2e2334806aa9bfbc036c9c2085d558f15a42cc3fa84c48 24b999b93df79383ef27ede46e38da752868c88a07fe35fcff5d526684ba7294
-lib/codeql/rust/elements/ElementListExpr.qll 6513476c0286e75201a136f2f16065eacd440d8948277114d82a22619612f49b 1259d0ccbfed47d316b073686a748d4e47d30aa1bc7182fc4998ec2745e3c643
+lib/codeql/rust/elements/Enum.qll 2f122b042519d55e221fceac72fce24b30d4caf1947b25e9b68ee4a2095deb11 83a47445145e4fda8c3631db602a42dbb7a431f259eddf5c09dccd86f6abdd0e
 lib/codeql/rust/elements/Expr.qll e5d65e805ccf440d64d331e55df4c4144ab8c8f63f367382494714087659ffe8 2bbc1e5d3a65f413ec33d9822fa451fbdbe32349158db58cc0bfcfafb0e21bda
-lib/codeql/rust/elements/ExprStmt.qll ea950ac5cbe8d8004bd674b5aeaf1f0b33d5b5910a41f2d4bca07f8ea36d1066 d882208b17fd3d2c8da07b1b84cb40d4c15938dc67c3d8404e36de57da84428c
-lib/codeql/rust/elements/FieldExpr.qll c6deb73b158f34bc9cdfff2813cca954644527e56d256e02a0acd49aab01637b 1f8a6b40727eaad96cee67af1a303a2b630df22ff1dafd1850530e1d29ec50b1
-lib/codeql/rust/elements/Function.qll 133c6af307a636cdba541c68c3e69fc1b20dce28af9cdce296efa9ef3b17ecb0 7ed6b2b392bbfbf8d048d2d08539fd74ce5beffb7b1073a59d99f0eefe9990a1
-lib/codeql/rust/elements/GenericArgList.qll c05f6967bae8c11238bb409ecc826caad70e56cc23a409477c2289c3217e7a5b 149b8f8a85b6aed8901d37b4feae79a132edefade08cec3a0ca60b1f7c92009f
-lib/codeql/rust/elements/IdentPat.qll 91127d4c86e56d2111cb356a75101f5a7b4251fe0101371134c3077f971b4e5a 491e0d69c700c7effe4214f88cb99ff28c4fcaac3049e2bd9f85b4374c9d769c
-lib/codeql/rust/elements/IfExpr.qll 08d2099dfeb6fd8739355bb7d60d4502f779d0e17dddfaab57eb9fae292a9b22 07ce96aa3feffbe7b1cdb86eb654f7dd31b3e039f0f6df6863d80c23451d6b2a
-lib/codeql/rust/elements/IndexExpr.qll 2b0157f808d3ddd37bf85198f6c8df6cbb5766a95ffa8964fb0c0fec75103c98 f77706efdd83ed6799e096fd1b96c1763149a6646b4521583a061c6ec038d2f2
-lib/codeql/rust/elements/ItemStmt.qll 765c5697a9bcfdac9acde36f11ffd33a3f3303382510e6d6a29d72396e493bcf 646b5c230d93d5d790206cc642e9758feec5cc755b3f6979ac3902f24075b641
-lib/codeql/rust/elements/Label.qll fe49e083f4214b73e8bf0e8861ad42030b92a6efeead4c747dd59e6e668456d2 7874551dd351416fbe3c8a8dc0b79d63ae91b6a210422f1b57248e8df2521761
-lib/codeql/rust/elements/LetExpr.qll 0bf1bb8b5084c17fc55056a5f447431d9d7fc1dc0d32ccb6a1e56c9a4ec55148 b91cd762755941225f73eeec28844a202dff58e66f6b0de5b638bee884238252
-lib/codeql/rust/elements/LetStmt.qll d1cd17c3bc4722c6885755dd4cf01dfacaee4b88c422a618d5d31999a7446639 0028b7d239b539a04e65d9a9df9d562e81dec8fe70081e2106ba1e50404ff1d3
-lib/codeql/rust/elements/LiteralExpr.qll ae18b29d2720f04e5e9b3d8b29d1c943084a83493498c6c003f48cc34bc9ffda f1e4bf0c74ccd5ef65c985d548f5178186829d0e2dbc375cacaf01dcdbe5257c
-lib/codeql/rust/elements/LiteralPat.qll 296c8371b473a660a8663484e554defa2db9cacf8be5fcb3602db59dc27ac973 a96791b355245411e313f06a4f68c397656686070e9ce57ca11cf3dd89b5c2e9
+lib/codeql/rust/elements/ExprStmt.qll 00ac4c7d0192b9e8b0f28d5ae59c27729ff5a831ca11938ea3e677a262337a64 7cc02aa5346cd7c50d75ca63cd6501097b0a3979eb2ed838adff114fe17d35a3
+lib/codeql/rust/elements/ExternBlock.qll 23d7ca86ad0366cfb0c5300a6e205f1fe59eebcb1b18dd5b6ea7fdba3830ca68 c718eed50d4d55b67e9cfcebee018b8e6f9b783f2b2f0e21c5785ead0f11f5b6
+lib/codeql/rust/elements/ExternCrate.qll 54e93a9ec560d72dc0f0269b42b237f21abbf37023492e657f048764d70b0734 fc5bb6f255f5293fd4f56cd14d5ce0ae781abff28c1f984101c38e15f82405df
+lib/codeql/rust/elements/ExternItem.qll c39bbae40fa569d3d84a10045d7eeced3db85e6cb7147f7a7065c5b484f890a1 bc56d6db3d05dbc552927d004328fbe399960711c920ef6b47f6faaa1a541183
+lib/codeql/rust/elements/ExternItemList.qll bc96f188970e8dc0cd1e77dea3e49b715edf6392539add5744cb1b396064a3b0 d1270d50448b36947372e86337a3efb5ed416c77aac709f6421d4d2f06999a7a
+lib/codeql/rust/elements/FieldExpr.qll 8102cd659f9059cf6af2a22033cfcd2aae9c35204b86f7d219a05f1f8de54b3b f818169dddf5102095ae1410583615f80031376a08b5307d0c464e79953c3975
+lib/codeql/rust/elements/FieldList.qll bd243adc4696c60f636055a1c2da28039fe2028476c9247eb6a68003b849b757 ab63cdf410afd1e515f873b49f46bb5c2bf27e6c78fd206ccbdba064c4c0a4b2
+lib/codeql/rust/elements/FnPtrType.qll c4a90dc660cf620972dc23b95494f5caf9f050eabd4bdb52fdc061f8797ba9a1 f8defc91582fa503607664668f9e2e6c2cd8b320c7c449610f21e52e332a129f
+lib/codeql/rust/elements/ForExpr.qll 312804d53dd9236a2f2a15c9d6ec348b46e139a54eb5893e7e12487725df7444 fa5e20099b1179033bc209bad3548e3d1d4019c7fe0e455cec8ca1a9d48692ab
+lib/codeql/rust/elements/ForType.qll 0036bed8749358c356d78c4a0eef40d73e2796284293cde5604ae70ddd6d0470 4edcaf8f7c67d42ebe3ebb1be6a7643758717d4fe88f5f648b6a1c5ff4ee4de7
+lib/codeql/rust/elements/Format.qll 506172d176f4b965f428585c032464f4abe07a0e47c574f8e011d8641ec45370 653e81bf233b8729649064de64f4a7a8533f8864ac6d2ea913f347088c924c60
+lib/codeql/rust/elements/FormatArgsArg.qll 5bc9b4cd1bac7131165836e93838c45452a08ea6011741cbddace3cbf9c69440 f825140e98dc9800d5c045402186793c7b21511448e2f6bf6402d1e06305219c
+lib/codeql/rust/elements/FormatArgsExpr.qll f2ffad5a1105b29a8437c8ed6cf918cfcf4d65ac164bbf1be0585c3b673ca749 3ba20dc312a0a994bb43b37b2db72cbd4e06061b97918fa0e84ce355070ffbeb
+lib/codeql/rust/elements/FormatArgument.qll bdd93e1da78637f19beee6f953d3a45512100e925d90cb5ad08a097f412009b8 2a0ae7eb885615e380f925c0d130a1b795bf3c395486550a1f1c9c82848f8d77
+lib/codeql/rust/elements/FormatTemplateVariableAccess.qll ff3218a1dda30c232d0ecd9d1c60bbb9f3973456ef0bee1d1a12ad14b1e082b5 e4316291c939800d8b34d477d92be9404a30d52b7eee37302aef3d3205cf4ae0
+lib/codeql/rust/elements/Function.qll 2c76c2c7036891996b1f0ebde16c414edf37ebb44ff9c3483088dc6218733e07 d84d017d98aa240bf3bee6502a030aa8cfb7ed95425ffa9853e73b41485e1f4a
+lib/codeql/rust/elements/GenericArg.qll 5f11ce0e3c5f08de84db61f56ba1b984652455ba6b95a8b8a5b5a235913d4072 756b6a73d66fde45bdcc65ce2362a5b1391af2927e6d54b6550b3ecd5fd11e75
+lib/codeql/rust/elements/GenericArgList.qll dcf274db517b0e8f19e4545d77f86cdd4066ff2805e68c808d0bb5750b49f569 1055a82929e850264e501b367ef4d314a3e6bb8943ec95f4284d157fb4d0092f
+lib/codeql/rust/elements/GenericParam.qll b58448b808d6dfa05db9574f54c22ce51f0b1d78784263c75a95d6bfc787067d 4afbab71fe717d7d7d3e2f60ea8c3d97bcb29b17b4efb79eabfe8f070edcb9bb
+lib/codeql/rust/elements/GenericParamList.qll 91d6f8cab06d7a3c53cfc714698a04c867867536705f03ed37b135e9e87f78c8 d1d88c31f712ca7ea83b6bf61466710069f2fbdfa40499321686e2867b99b35f
+lib/codeql/rust/elements/IdentPat.qll ad5f202316d4eeee3ca81ea445728f4ad7eb6bb7d81232bc958c22a93d064bf2 7ce2772e391e593d8fd23b2b44e26d0d7e780327ec973fcc9dce52a75fda0e36
+lib/codeql/rust/elements/IfExpr.qll f62153e8098b3eb08b569d4e25c750bc686665651579db4bc9e11dcef8e75d63 55006a55d612f189e73caa02f7b4deda388c692f0a801cdda9f833f2afdca778
+lib/codeql/rust/elements/Impl.qll 9593c47af4fa08afb19c52aab7d0bac6740fed7ec60201f47e7bc46f13bfb329 4ec840401563ab6136b99491b881c9a10108240de972b19ec64227e1e7d73e65
+lib/codeql/rust/elements/ImplTraitType.qll f7241044f6666a509cfbc01bf6df3db5360e67dd0f9baba4a323566701359203 350636d0b1c7a77e006170cbfa9108c259dd5831b0f242da76c10be3ecc32870
+lib/codeql/rust/elements/IndexExpr.qll 0e2e9f018d06ae72be0fc4ddbc019a9aacd8a06f42b4c4431760bd149e7f2290 2bcfd557abd53a48e48de7915c4f2089107c62dfb3e732a904848248dfd3727b
+lib/codeql/rust/elements/InferType.qll c71184ae6aa181be94e299882503350e057493e17f1133a1e96162a0e5cbd1ef f0f19b611708df45a6ff811f8066c8042a8e1ac9b7bd94910514547ea430d3d5
+lib/codeql/rust/elements/Item.qll 5c9148ff0eaeb4404c2d8156e7df0ef5753fd44ead972da05a49659ddaa25480 78446f788617e40525d4d4b489848e75f2143a90e18d40974c3bff7b1e7c825c
+lib/codeql/rust/elements/ItemList.qll c33e46a9ee45ccb194a0fe5b30a6ad3bcecb0f51486c94e0191a943710a17a7d 5a69c4e7712b4529681c4406d23dc1b6b9e5b3c03552688c55addab271912ed5
+lib/codeql/rust/elements/Label.qll a31d41db351af7f99a55b26cdbbc7f13b4e96b660a74e2f1cc90c17ee8df8d73 689f87cb056c8a2aefe1a0bfc2486a32feb44eb3175803c61961a6aeee53d66e
+lib/codeql/rust/elements/LetElse.qll 85d16cb9cb2162493a9bacfe4b9e6a3b325d9466175b6d1a8e649bdf2191b864 c268d0878e9f82e8ede930b3825745c39ab8cd4db818eb9be6dc5ca49bee7579
+lib/codeql/rust/elements/LetExpr.qll 435f233890799a9f52972a023e381bc6fe2e0b3df1e696dc98b21682a3c1d88e b34da72dd222a381e098f160551ec614ebb98eb46af35c6e1d337e173d8ec4b9
+lib/codeql/rust/elements/LetStmt.qll e589d750ff87c25e28e15dab61e1a3555a45ced42158b05c991c6f5873abd86a 383484181b825cd7bc20e014fc4d5888f66e1f257502e1893f3d55aed2cdef3d
+lib/codeql/rust/elements/Lifetime.qll 048b81704723fab0ad9011f2c26a61e4a37b901c9f8372a6a74a04bdd85e273d 1d1e47c37c74ed092aa89ed4d38f49de3ee8bd9677669a33488fadda9ff733d1
+lib/codeql/rust/elements/LifetimeArg.qll 58a3c02b5ae720a48533332fb1808fbcc993cd1dfdb717894ba95a4c1ce3de4d 07da9323f89b92da86efa3f44a0f96c4c9738b3a28a136c4523243be79365396
+lib/codeql/rust/elements/LifetimeParam.qll db9f2c7bb32d49808993b400875e79560ac546736f106983398e32c9fdac51ca 0cb2ceaac7b0459f149fcce5ed708c9445fae7e340ec0e63744987a4fc852ef4
+lib/codeql/rust/elements/LiteralExpr.qll 40b67404b7c2b81e5afabc53a2a93e0a503f687bb31a2b4bfa4e07b2d764eb8d 67ab1be2286e769fba7a50ca16748e3c141760ccaefaebae99faa71f523a43d5
+lib/codeql/rust/elements/LiteralPat.qll daffb5f380a47543669c8cc92628b0e0de478c3ac82685802c63e8d75a206bed adfe9796598cf6ca4a9170c89ffd871e117f1cea6dd7dd80ecbbb947327a1a5d
 lib/codeql/rust/elements/Locatable.qll 2855efa4a469b54e0ca85daa89309a8b991cded6f3f10db361010831ba1e11d3 00c3406d14603f90abea11bf074eaf2c0b623a30e29cf6afc3a247cb58b92f0f
-lib/codeql/rust/elements/LoopExpr.qll ff2dfefad8a887ca6d30955ccec04909e72b19e57c54719f87bd6b2daa69b161 971c44adefc1efd509d3800f43a06f91a59e2dcb796571f913ddbde22260a161
-lib/codeql/rust/elements/MatchArm.qll 225cf07fed76e81098949bed3b2f78fceed966f10e72a07084f9e755d9cf4446 349129b3ea120c9c26b44ef9d2e91096ed8ceff5dbe97f0b7f5ae8fd4ffbd8e7
-lib/codeql/rust/elements/MatchExpr.qll 52eb5f78fb0f77ebf60d3a99d0dc9f78797b8325550a2e30ada79fbf9f499e49 ceb438097a6fa7b70b4c487e36c21ea0e055c3fc27951e0160b86516ccab303c
-lib/codeql/rust/elements/MethodCallExpr.qll 3458f5cdf3e94d388bec415a5d824cc704dfaf32a7f8a30c7b0ea267a24c5740 79a5dc551b83ff081209b65e896f9ca3f9257ffeb0f016f86124f28d7a1cae44
+lib/codeql/rust/elements/LoopExpr.qll 58ade0bc4a01a1cc361363682fde3ea56f4c5fbb4b28f5723ceff52ebaf897d7 fa299162c742bcf3b2211dc20821b312e3c133350c288a050eb26e6f8b5a5c78
+lib/codeql/rust/elements/MacroCall.qll a39a11d387355f59af3007dcbab3282e2b9e3289c1f8f4c6b96154ddb802f8c3 88d4575e462af2aa780219ba1338a790547fdfc1d267c4b84f1b929f4bc08d05
+lib/codeql/rust/elements/MacroDef.qll acb39275a1a3257084314a46ad4d8477946130f57e401c70c5949ad6aafc5c5f 6a8a8db12a3ec345fede51ca36e8c6acbdce58c5144388bb94f0706416fa152a
+lib/codeql/rust/elements/MacroExpr.qll ea9fed13f610bab1a2c4541c994510e0cb806530b60beef0d0c36b23e3b620f0 ad11a6bbd3a229ad97a16049cc6b0f3c8740f9f75ea61bbf4eebb072db9b12d2
+lib/codeql/rust/elements/MacroItems.qll 00a5d41f7bb836d952abbd9382e42f72a9d81e65646a15a460b35ccd07a866c6 00efdb4d701b5599d76096f740da9ec157804865267b7e29bc2a214cbf03763e
+lib/codeql/rust/elements/MacroPat.qll dbf193b4fb544ac0b5a7dcfc31a6652de7239b6e643ff15b05868b2c142e940c 19b45c0a1eb1198e450c05d564b5d4aa0d6da29e7db84b9521eadf901e20a932
+lib/codeql/rust/elements/MacroRules.qll a94535506798077043b9c1470992ac4310bf67bcce5f722080886d1b3e6d90d1 bd8e08a7171991abc85100b45267631e66d1b332caf1e5882cd17caee5cf18a3
+lib/codeql/rust/elements/MacroStmts.qll 6e9a1f90231cb72b27d3ff9479e399a9fba4abd0872a5005ab2fac45d5ca9be0 d6ca3a8254fc45794a93c451a3305c9b4be033a467ad72158d40d6f675a377a0
+lib/codeql/rust/elements/MacroType.qll e5a153643e49a6be41483ad944550a030e0500764947b4e328cef6fa08c4fbd4 a42332c0a9c5cf7317fc49f3e1049e7751004fcc3efa056bbe058a8bfa2ef0cb
+lib/codeql/rust/elements/MatchArm.qll c39fd6cc0da24b1ff8d1e42835bcfee7695ad13580e3c7c50acd7c881b1cd894 62a31d2bd125e6aaebefc406e541a641271d3c497a377959f94dd4735b2bfbf8
+lib/codeql/rust/elements/MatchArmList.qll e6c48fd7419d88e996b82eb45e4aa2686dfd079b283b02be7710192fb2cb93a0 0ec63a0ca56f5f7f80093fd3e77b198b74c6289e67be55dc6a4deb610753c7bd
+lib/codeql/rust/elements/MatchExpr.qll e9ef1664f020823b6f4bb72d906a9dc0c1ee6432d4a9a13f7dbdbab2b2b1ee4d 38d71e5c487abcb5682293c573343be66e499a6e131bb630604c120d34b7777b
+lib/codeql/rust/elements/MatchGuard.qll 20754ab2009a7d40b50feece496ff7f38650586d79190ed2a372308594693694 471f8f118317efcf112f4ddfd60125ca2a9d9b3b08e6ee331c430961de7885ff
+lib/codeql/rust/elements/Meta.qll 9fa3216c86fa55ed5c0c4671708110a6ffc7c0f5d6cda8dda31aaff17f87534d c44ee2754dd71776ffd0a8a7d6c1ae8737c47e998e6bdb8efab5283625807cf4
+lib/codeql/rust/elements/MethodCallExpr.qll 318a46ba61e3e4f0d6ce0e8fa9f79ccbbf2d0f3d0638e6813e1bcb44d624715a 35e03ed4beddd75834fcfc4371bd65eaf099053aa23f7f1d1e6bea2e5825aa6e
 lib/codeql/rust/elements/Missing.qll 70e6ac9790314752849c9888443c98223ccfc93a193998b7ce350b2c6ebe8ea4 e2f0623511acaa76b091f748d417714137a8b94f1f2bdbbd177f1c682c786dad
-lib/codeql/rust/elements/MissingExpr.qll a21d1c11423c6a33c17b1974a2778d57f4def21b5f60479fb6555bd7c9df68e5 943125d136c2e49cf95c8beba089c125cb98c60c1316443bb2701cb7772723ea
-lib/codeql/rust/elements/MissingPat.qll 378b693f5d5e16480fde3f5baa78d5636534ae32cb05be0df3554a7985f6afd7 e1737ca67d4f6af91c7885356c187afca059dfd58f4ad148edb9e0ad2d05eb6b
-lib/codeql/rust/elements/Module.qll 2bb8ce56a71c31fe7ad4dc2a157fdfac74b09ba8893e4fd08dad587e5eba379a 2b9b114b85d7de21083a8f4456782cc950c9829bf8870e3081c88b16d798a741
-lib/codeql/rust/elements/OffsetOfExpr.qll f7a5e4051e43602eb4eaac17b2d417f2fb63b96199e86fafa10655cdbb1c6c1d ef60b0936baac117c459fcce22e508260f4bd44d8cf0a2b4585dd9df5c2c236a
+lib/codeql/rust/elements/Module.qll 0bc85019177709256f8078d9de2a36f62f848d476225bff7bba1e35f249875c7 3fbb70e0c417a644dd0cada2c364c6e6876cfa16f37960e219c87e49c966c94e
+lib/codeql/rust/elements/Name.qll 3d7ed16c232912e30e5a075f5087ad344a8f76dcc27bc8f71a80c133802b89d7 036dc3ba0c20eb0907ef6dcc532214aa5de8e0de0fa819eca1fce0355b3741a3
+lib/codeql/rust/elements/NameRef.qll f11e33cdbefb3efdd8db6cd1eee593948a16ef5dd13e781c167ebd5e35b22e8c acda02258d55a6ecda0bd92eecf1778e0737a46e861a41c7dfd3203acc0eb4e9
+lib/codeql/rust/elements/NeverType.qll 669823dd60bba0cebac614f9dbad9dc9228405d76e62092e265df57fdd2e04e2 8fe32975ef80d86fb8b218f56962f0a89911008a8d6989e245c3e0362f2c747f
+lib/codeql/rust/elements/OffsetOfExpr.qll 8f6dd1fe0aad1642e58f5e97620306e4b36cdf01324fead1e2a92e8e60951c41 b192f7a5fae3049a6cac3b7a225a0e590f744e6c5ff6346ffdd1699f83bf718f
 lib/codeql/rust/elements/OrPat.qll 408b71f51edbfc79bf93b86fb058d01fa79caf2ebfeef37b50ae1da886c71b68 4a3f2b00db33fe26ee0859e35261016312cb491e23c46746cdd6d8bb1f6c88ef
+lib/codeql/rust/elements/Param.qll 3108a710214977218421b220d1330793173d6b6b91708b641e3d1275f80faedb 4bb2b80d0a9a4d86f980440851d59ca6fffea681e5518f5d605c521191efd7b4
+lib/codeql/rust/elements/ParamList.qll 33a22ba7de565db4009d3f56eecd5ef809c28d9dce9bbac3fb71b528baae4f70 004375e227d87f76f930322ad3eac274f9b691bf58785ae69977fa319f3dba7e
+lib/codeql/rust/elements/ParenExpr.qll b635f0e5d300cd9cf3651cfcefd58316c21727295bbfd44b1f5672f9e3de67b6 d81c0034d4ea7ca5829f9b00e0a634ba5b557a6296d99f0b5344b11e1ba705a1
+lib/codeql/rust/elements/ParenPat.qll 40d033de6c85ad042223e0da80479adebab35494396ab652da85d3497e435c5a 8f2febe5d5cefcb076d201ae9607d403b9cfe8169d2f4b71d13868e0af43dc25
+lib/codeql/rust/elements/ParenType.qll e1f5695b143c97b98ccdb460a5cf872461cfc13b83a4f005f26c288dc0afae10 1164f8efae7f255925411bddb33939fab0bf1c07955a16fef173b3f4675d09ae
 lib/codeql/rust/elements/Pat.qll 56211c5cb4709e7c12a2bfd2da5e413a451672d99e23a8386c08ad0b999fd45c b1b1893a13a75c4f0390f7e2a14ee98a46f067cfdc991a8d43adc82497d20aff
-lib/codeql/rust/elements/Path.qll 5fe6bf8fd9c32fe59e81671674b35e1dc544b2e326eeecd00d0a00ad848dbaea 20cde06fb5f353baeaf92a1852c8220da3773a997a82a609382f756016b4577e
-lib/codeql/rust/elements/PathExpr.qll 4e2b58fea878671affb475b4f91dae323f96c4cb585bb00a37e080ef7e2f8b40 26e3968088a1f06ce4938df824a2bc6f090055db53c6d0d73f46cdd6f2709077
+lib/codeql/rust/elements/Path.qll a0078e6d57dfd5a3b7fb2be4587f55f8e9c65ee042815a8a5b8dbd5273b4076a 0e2d4f8cbd54bd60aa4929b5fd50fe214346b6c0451f73e45143445d15420108
+lib/codeql/rust/elements/PathExpr.qll 906df1d80c662b79f1b0b0428c39754b7f8dbcb2234919dd45dd8206a099dd36 1d6015afab6378c926c5838c9a5772cfcfeedf474e2eeca3e46085300ff8d4e1
+lib/codeql/rust/elements/PathExprBase.qll bb41092ec690ae926e3233c215dcaf1fd8e161b8a6955151949f492e02dba13a b2257072f8062d31c29c63ee1311b07e0d2eb37075f582cfc76bb542ef773198
 lib/codeql/rust/elements/PathPat.qll 6897e69bcb24b56d39ede796cf5767988dcd5741e02333fa8495dd7c814f771a 2a011fb92f17e4b4ff713e6d29f591054dfede22a9aaa006e67fca2c23ab76bf
-lib/codeql/rust/elements/PrefixExpr.qll 09db429d4a0188ca2c70bf0dc7d00638d8d227864ab9e0b2fa9360aaf9fce8a4 0c14fccf233484b27024501dfe8c8172f40c486b025ca4340f7cebe696db137d
-lib/codeql/rust/elements/RangeExpr.qll fd1d4d9df23f75ed3ec44f76b01d34d284ff532d6770a245f944883ccdf543d1 cf8b7d954daca1fbd1d887d5c8f5e03ac31347bcc6265b4f8e4f433a797327be
+lib/codeql/rust/elements/PathSegment.qll 536a8fe172db367e5f1dc678a014e2350eadfc379242d2b5451725e826ab1448 1a3a237f56c1d9ccdce6832ec6417fed25cd3e29ba836363cc6085e2125de4c5
+lib/codeql/rust/elements/PathType.qll a7bd3b05dc2c0e96c91c5485db508a1f5bb8fe3a01486be6815ae9dabb163add b11e996b6c0cc21a3d8d1ddc23c37e4d54a78e84a9278b3ceca1e94cb7321532
+lib/codeql/rust/elements/PrefixExpr.qll 107e7bd111b637fd6d76026062d54c2780760b965f172ef119c50dd0714a377d 46954a9404e561c51682395729daac3bda5442113f29839d043e9605d63f7f6d
+lib/codeql/rust/elements/PtrType.qll b137f47a53e41b3b30c7d80dbdd6724bf15f99530ca40cc264a04af5f07aa878 b2ffdf739bfb7564d942fe54409834a59511c0b305b6d5b2219a8ee0ef594332
+lib/codeql/rust/elements/RangeExpr.qll 43785bea08a6a537010db1138e68ae92eed7e481744188dfb3bad119425ff740 5e81cfbdf4617372a73d662a248a0b380c1f40988a5daefb7f00057cae10d3d4
 lib/codeql/rust/elements/RangePat.qll b5c0cfc84b8a767d58593fa7102dcf4be3ff8b02ba2f5360c384fa8af4aac830 cc28399dd99630bfa50c54e641a3833abe6643137d010a0a25749d1d70e8c911
-lib/codeql/rust/elements/RecordExpr.qll 9993c0de2ee85640c7ba11776c2a67247759c0b68ea4587cf61da72498be4891 f76cb43d8f1685bdc7d0f231fd9f88a4b4118d1e0cc6f858b83f4c31fdf7c20d
-lib/codeql/rust/elements/RecordExprField.qll f852b028eb218922ec1240cb21e625b7e4bde3b182c0bb9dcc814c5d4b033bdb 7fd6812145845e06dc83be219640c2e745dd5a9ad55f72c56db4b03e0f57909e
-lib/codeql/rust/elements/RecordPat.qll a7ae4a6924b256aef0c80670e4156c68f27a24f67a7d8e7d8f0a608aa2a3a700 91711627e4757eba60f2781b05562b9a2112a0eed9d96bea5eff061d2e6993e2
-lib/codeql/rust/elements/RecordPatField.qll 40bff2f0e2424d58dafe1a55b5a4f6f8aa3aa810114e9735180c60b55c4c0beb eff921a90a3a5d490595fd81c78e39ef72b3bf617b3d585cfe6cf3f29b24d4ea
-lib/codeql/rust/elements/RefExpr.qll cddb67c33029c674003bee569d246f9f290c0c39ce722a869b38edd8a01884e8 66385ef54f5d299fa52eaa623bbded93924c7530e5e069f23c22ff651af6cfcb
+lib/codeql/rust/elements/RecordExpr.qll eb402960c5c6a14d0a0ffebd61a352b59b5d1cc1c2531cacd54754310a812d77 415c93384e63cf38003dde987715554ebf45fc32ba03bc5fd78b8d2501812de1
+lib/codeql/rust/elements/RecordExprField.qll edac04146849e2aeca27e7bbb896c21aa2e2b15736b1e8a06ac51ab01433b3ac 7c062bd6d5dd5b1d972450fb0b3272cd9b45f94ccd668c3bd4347e2dce3279ed
+lib/codeql/rust/elements/RecordExprFieldList.qll 672c3854cb84090c8a2e9311c43448016dc2614ecbf86dbe404156304674e38f 01ae0ffca0bf640c61120e36fcf2c560555f4aabbd49ddce6f5c1a3561dbfc31
+lib/codeql/rust/elements/RecordField.qll 9c462033cc889756876cb3d2a07e4f0d9a67064cf188cdd68e08ab21e5edc459 437254bbf6537f1a575ae344c2e23ffad7138776db8f7ebf90026c13886a2638
+lib/codeql/rust/elements/RecordFieldList.qll cebab3fba41221e61cda801070a7f414b62b4fbcf2206e35462c0da35ad75c3f db092d47eea871d61541b9711d7139a99394e0ed83901a8ae60f03dfa8ed722f
+lib/codeql/rust/elements/RecordPat.qll a210d700e710107100fedad1098fb789056a0c0b8dbc11de2b242877e692ec20 3efa12d7bfa0da7c09a42b2b43c50ff3985c55676db7f3be2c771765d81f9a10
+lib/codeql/rust/elements/RecordPatField.qll 7487461887e82bcf224b02628dfc64457121ab17e731e2dc7aa7e731ab16c02f f2018e55722245eb4273fb067242aaa503c43f91671a55b3a4bb51fe7bc0a03c
+lib/codeql/rust/elements/RecordPatFieldList.qll c3198c997f389ce95db377ca40ac69a1448f120093f37ab1c92a5a3f1f6aa0d4 9db36d274f1ec77c442ae7e38f940a65c9a92f1541f66140188b226965851535
+lib/codeql/rust/elements/RefExpr.qll 91a0d3a86002289dc01ffbe8daca13e34e92e522fbb508241a9d51faf1d4a9d2 b6e63d8e6f8956d2501706d129a6f5f24b410ea6539839757c76ba950c410582
 lib/codeql/rust/elements/RefPat.qll fe076bdccb454111b38f360837d180274ba8a003b4cffe910b5197cd74188089 2604c8bb2b0b47091d5fc4aa276de46fe3561e346bd98f291c3783cef402ba06
-lib/codeql/rust/elements/RepeatExpr.qll 388d846ba51aa510c5fadc04edd71cae9c58efaccb192311844f61d00c117c00 50906707c8a025948ffb01c254899b0216a4b3e974471c5e435677f286eaa189
-lib/codeql/rust/elements/ReturnExpr.qll a6c108421e57e74c71a3e0c8ae9567388f5f7ee67042a7552276a7e9a5e4dfdb b0b6da2f0041fded1eff0f350718c4580e532300158372b811c31f7fddb6754b
+lib/codeql/rust/elements/RefType.qll 5dc6012188d5baf36cd7bf0ebc127e28e98862a3f91ea4df2f9b9c962f3a395d ddb06ebe7fb92ad7bbe86cf182270e8494b74edf91b8c841aaf7ba932e5092ac
+lib/codeql/rust/elements/Rename.qll 55fa06145f2160304caac0a5ce4cf6a496e41adfd66f44b3c0a1d23229ed8ce0 80262f0abf61749cdf0d5701637db359960f5404ad1dbfdd90f5048d2e7c315d
+lib/codeql/rust/elements/Resolvable.qll 213c0c157541002ddd61cc76cdc11386819aa59dff0a81780474cccb6b7fb211 cdcf807587f887493888341a1b6f9bed202b80b37cacc77041a256b05ff4d3d1
+lib/codeql/rust/elements/RestPat.qll a898a2c396f974a52424efbc8168174416ac6ed30f90d57c81646d2c08455794 db635ead3fa236e45bbd9955c714ff0abb1e57e1ce80d99dc5bb13438475adbf
+lib/codeql/rust/elements/RetType.qll 36ea39240a56c504d94d5487ea9679563eef3dfe0e23bf42d992d1ab2b883518 2fe5b6f62a634c6aa30a1ecd620f3446c167669cf1285c8ef8dd5e5a6ef5fc71
+lib/codeql/rust/elements/ReturnExpr.qll b87187cff55bc33c8c18558c9b88617179183d1341b322c1cab35ba07167bbdb 892f3a9df2187e745c869e67f33c228ee42754bc9e4f8f4c1718472eb8f8c80f
+lib/codeql/rust/elements/ReturnTypeSyntax.qll 0aa9125f5ea8864ecf1e4ff6e85f060f1b11fdd603448816145fea1b290f0232 3911819548ad1cf493199aac2ed15652c8e48b532a1e92153388b062191c1e6e
+lib/codeql/rust/elements/SelfParam.qll 5c9629e1cd837f5d84bdd79a1aef9cca6fb0acb1fb18671d4a4d28c23a74551a 41eb92527cf4379a2df54a0c9fabc368cb6f9b8d1ac73bd2ab3f13214573e764
 lib/codeql/rust/elements/SlicePat.qll f48f13bb13378cc68f935d5b09175c316f3e81f50ef6a3ac5fdbfbfb473d6fc1 4c8df0b092274f37028e287a949f1a287f7505b7c2c36ee8d5f47fb8365d278a
+lib/codeql/rust/elements/SliceType.qll 7e49dba57826c7bb72a88f9e802febdb09adfc49804f6205dc88f2a307fd1f30 6c3ee430f812f1d9fbb1fb1fdd2c47130a4bde7fccf17f09404b8cbc8104678a
+lib/codeql/rust/elements/SourceFile.qll 5916d550385d618bd3b3d4835fbd3040485822220af8ce52ee1adb649b3d8594 0b79766216649e948fa59de467d64fa752de4666c28e0e503e88740ae27a2aef
+lib/codeql/rust/elements/Static.qll 1e25940c774538de9b1aea877e20e34b672d6a3ed3b56a741195995f051c5acd 94f09d08b35decc6990c0cab23354f84aa8ef271ea1a77a233c9fcd6ab14c643
 lib/codeql/rust/elements/Stmt.qll 532b12973037301246daf7d8c0177f734202f43d9261c7a4ca6f5080eea8ca64 b838643c4f2b4623d2c816cddad0e68ca3e11f2879ab7beaece46f489ec4b1f3
-lib/codeql/rust/elements/TupleExpr.qll 1172163cc748d444a58f67650f50060fd3b5354be4d0781e0affe9a34364c2d1 bac77d1dd3acf08e723e812f3e16ca2f8a46468cb14ceb99fc65a9f3b27fa741
+lib/codeql/rust/elements/StmtList.qll 6f990782d5a5307d6d8a3256eb510aedfdaf7bd0e45f3dff35388842ab487b8c b412a27dea0c67307ab79104d45c5b4848c3191cc983e8b0d8dfa739a1b65d9c
+lib/codeql/rust/elements/Struct.qll 96b7020c7670d5ea7effa6e390d3a163dba05ca5206cfdd1284f4a41e5664c6a 3fea0d13b8da0f210f3ad9004189efc3c56bcc90e67d6ef7817c6767f6aff273
+lib/codeql/rust/elements/Token.qll e2de97c32e12c7ac9369f8dccabc22d89bfcbf7f6acd99f1aa7faa38eb4ac2b2 888d7e1743e802790e78bae694fedb4aba361b600fb9d9ecf022436f2138e13c
+lib/codeql/rust/elements/TokenTree.qll 68e579812960d855a8a7a370ce55566a0df5adc62b7e6ba19d775fff961ea67b af2520f272e937c898c51693c1157a61caac9c25826918981803b12b5a9cb246
+lib/codeql/rust/elements/Trait.qll f78a917c2f2e5a0dfcd7c36e95ad67b1fa218484ee509610db8ca38453bebd4c 2a12f03870ebf86e104bdc3b61aae8512bfafbbf79a0cff5c3c27a04635926af
+lib/codeql/rust/elements/TraitAlias.qll cb2af66ca1da20122b800097dbaaa904e5b6e753571fcfd6821e779be273d742 da8666db52609a5d04b847dfcecf753644f813597d58a4aa1a7e2d35ede96ef8
+lib/codeql/rust/elements/TryExpr.qll d2c5eb215f1b46a86b82e7d99fe1dcfb2b4cb42811f331e54cc602b40a10a0eb 8c207264924428e969060f4cb903b37e27f8ff74e45be7d13a2ead44a572b36a
+lib/codeql/rust/elements/TupleExpr.qll 561486554f0c397bc37c87894c56507771174bfb25f19b3bf258a94f67573e56 d523246820853ff0a7c6b5f9dbe73d42513cadd6d6b76ea7e64147140ac93c15
+lib/codeql/rust/elements/TupleField.qll e58d024fc41519b559eef36cf6081d03a786b05357e4322e7046092131ea508f cad861b23fb4cdf2fbe90595de0e4776f1db9b69c3f3825221e475bc92895351
+lib/codeql/rust/elements/TupleFieldList.qll 73397eef1cf8c18286b8f5bb12fbdc9bb75eee3b7bd64d149892952b79e498a3 13ac90f466ab22e5750af9e44aff9605b9e16f8350b4eaecff6a99e83d154e25
 lib/codeql/rust/elements/TuplePat.qll 028cdea43868b0fdd2fc4c31ff25b6bbb40813e8aaccf72186051a280db7632e 38c56187971671e6a9dd0c6ccccb2ee4470aa82852110c6b89884496eb4abc64
 lib/codeql/rust/elements/TupleStructPat.qll 16a3f10992db62cc6630dc962a2a0d243c41b8aca064d6cb6c82a2f4e6987a12 c2b4c14567ee2dd65e0b643c9d18dfe5098fb3bd4ed45dcc825065bfa7c7c02d
-lib/codeql/rust/elements/TypeRef.qll 1c937c23ba1688d6251213dfe7690a21cf79419f21a5b9844721479a96f3b44d db7ddc62d7a5b9e11062eca4bf210f2a1235c0ab0afa73f041f6c9c442f56ce4
-lib/codeql/rust/elements/UnderscoreExpr.qll a07426114a11ed667b5b5191b0261c9764a9da5fb3fe4e1b72c4fc156ed0c8da b8452b5b356d6d56a2bec9dd48c6aca17a6bb9ea7447b11ec6fa7bca734db794
+lib/codeql/rust/elements/TupleType.qll b5c798f7c9b08c8a6cc0a57fc5c36d714e70d5e955a9e87b6b309c18365d7596 ebea533ab126392344d080da1bc9efabcabb5397e93c9d213ffc71a61bb8d47c
+lib/codeql/rust/elements/TypeAlias.qll 64780697f5869266345d040fdaee05c62b8670b9b5c6369692f9a9dc646986fc afcc7617d0e2e16d92d2a53c3e6661fd184bf5cf21b154f121dbf4d3b7ab30e6
+lib/codeql/rust/elements/TypeArg.qll 39aea9a9f0b74e8b90e957dbc3ce593cbdb1d2e0d9320428ce2e9cbfcb772e53 f1f2612633de9f534faf76c368b6154a8dc20feb9297262fcb10a8f192aa2e02
+lib/codeql/rust/elements/TypeBound.qll 3549a2ded6dbe401a49690c7b7c1d629d55dae2347380ee0e0632d3b64f200e7 e407603af5bc1ba2704a457eaa7fffd8c52cb13b3ccfc9ef477ad120ff8e98a1
+lib/codeql/rust/elements/TypeBoundList.qll a0b95aa95485a0e23b9198ca492ea3fa075fb0dc9fb40ba997aff35d70c51d3b 51de36a56cd2921758260c62cebeb96e703d10b226ca505c874ae54c5a981348
+lib/codeql/rust/elements/TypeParam.qll e06ed282dd55dc68970265706a22499c8ec4ea8c3459d11e20549eeb5504e2b7 479826e69d2a9189f66962b17f55c62df89e297623f38287eb296ec78487a1a6
+lib/codeql/rust/elements/TypeRef.qll b180dc4fe85d0eb3032ed3a63aea54ca0b667a6a00f2fa0505fa742bd89d6927 b0210ee96929ca0f335955f76d2a0c06ce32201b8bb45d8424aece786ed6dae5
+lib/codeql/rust/elements/UnderscoreExpr.qll 233661b82b87c8cda16d8f2e17965658c3dc6b69efb23cb8eb9c4f50c68521e0 8edff8e80aac2ecf83a6b58f310cab688cbaeea0a0e68a298b644e565960cc74
 lib/codeql/rust/elements/Unextracted.qll 12e60c79ef5b94d72b579b19970622e7b73822ebc13fbcfedfe953527ab1ac36 ec015db2eb12c3c82693ddc71d32d9ab9ef7a958e741e2510681bb707ceca23e
 lib/codeql/rust/elements/Unimplemented.qll bf624d28163e5c99accda16c0c99f938bec4a3b1b920a463e86fc8529ff5ff02 013bc7777298d250338f835cd494b5a8accea2d6a4f9561851f283ac129a446b
-lib/codeql/rust/elements/UnimplementedDeclaration.qll db5b6a5fcaf9e2bf02e4f22a515d2753451fe6c5a2c3cd0f246f2c2fe3bae5fc 1f39abe96b47b3669d427b36a5ca8c742cad4843c6a0da34f2e6ad2b71492a44
-lib/codeql/rust/elements/UnsafeBlockExpr.qll 708a6c42e2c5ddbd5ef93c976bf961e98acb9fc6d78fc56b98186d21e5262c77 90f9fcf01cc9ac20b0a03ba6b9b30c398a1782a6f73a36fbd5484bd69dad490a
+lib/codeql/rust/elements/Union.qll 92ffb1abc03889b9b71dae9491d4595e443c80b472474644f4e2d80215d4420a 8ad87a33f56583c3ebd19083d8e177da91dcc4dacd5e9140a48f01750c6b1cdb
+lib/codeql/rust/elements/Use.qll e27d30ece0456a73732dfd867dfc5abdf48a50de56e7dafcab444b688610af72 7efe59c04dd2f10b4a25b8a17beb51362be0a93d73e5a9e1251cf133cf1227c3
+lib/codeql/rust/elements/UseTree.qll 16b6e42146dc4c2e9d8cc6bc143933d675d1a4c9a56b309f390f4bf5df99b25d 9f8dd7d621dd15f6f1ccec676b08da02773673cbb3a3570781c16167c6e08ef4
+lib/codeql/rust/elements/UseTreeList.qll 768c4ec25e8807bba65619f566b22fa5c0946c36e96c88cfdee04c2875b44554 6433c8d9acd4e346cadd5fef01d79dd35bb6245115bdceb5322c0511106030b0
+lib/codeql/rust/elements/Variant.qll b0770c3ce0a82dcb2e238024b1db4ee2b76271f5a3d94f03bdaee71a25218da1 af242bd8651b653d931bf4cd3c234bdb58c8516eb4576edc03a929232946c38e
+lib/codeql/rust/elements/VariantList.qll 07adfe5750b2d5b50c8629f36feba24edd84f75698a80339d4cee20f4e95829d 7d322e60c84ea45f8c8b509226da7ae3c0125bcda42a98a94e3e6a9855cab79e
+lib/codeql/rust/elements/Visibility.qll d2cf0727efaf8df6b3808cb4a6b2e26d18e42db766d92e97ad3ef046d91cb9e5 8947a1e2d48b532c6455ddf143fa5b1dff28c40da1f1c6a72769fc9db7ecbaf6
+lib/codeql/rust/elements/WhereClause.qll da51212766700e40713fff968078a0172a4f73eebc5425d8e0d60b03c2fe59fa 0ec036aea729b8f4af0eb8118911dce715e2eb4640ae7b5e40a007a48da03899
+lib/codeql/rust/elements/WherePred.qll 4815cd8f2a536c895e1f6831bef2ee6b9ea42c4fea12df1f164de1c965795bc1 3b46806767d81218d2e21656afe39c957c364ff7067c9af3ae8bacbf7f93858b
+lib/codeql/rust/elements/WhileExpr.qll 9c12c26f953163c70020669327bd8c931493ef7fb4b75e6711202c0bab1d2697 2e2c96425bcd4414c65d9069a71a5123a3a10dd1449cafc121ac08f91ea49728
 lib/codeql/rust/elements/WildcardPat.qll 4f941afc5f9f8d319719312399a8f787c75a0dbb709ec7cf488f019339635aab a9140a86da752f9126e586ddb9424b23b3fb4841a5420bac48108c38bb218930
-lib/codeql/rust/elements/YeetExpr.qll bfc953d454b1c54c11abc19287561b66f2a846492f7225506ae3dd42d1b49e99 b11b14c557db835b757cc130ed23adfda81f32e1cc55172e2aaed249f5093d56
-lib/codeql/rust/elements/YieldExpr.qll 34791d3ac3093f775704c10c2e59cfe7232ce8a054ba4da3fb031fd158a67da6 411f603f9701c831cc8bedb011d08769e9bcd05de26025f5e4f9cfe521fabe8c
+lib/codeql/rust/elements/YeetExpr.qll 4172bf70de31cab17639da6eed4a12a7afcefd7aa9182216c3811c822d3d6b17 88223aab1bef696f508e0605615d6b83e1eaef755314e6a651ae977edd3757c3
+lib/codeql/rust/elements/YieldExpr.qll de2dc096a077f6c57bba9d1c2b2dcdbecce501333753b866d77c3ffbe06aa516 1f3e8949689c09ed356ff4777394fe39f2ed2b1e6c381fd391790da4f5d5c76a
+lib/codeql/rust/elements/internal/AbiConstructor.qll 4484538db49d7c1d31c139f0f21879fceb48d00416e24499a1d4b1337b4141ac 460818e397f2a1a8f2e5466d9551698b0e569d4640fcb87de6c4268a519b3da1
+lib/codeql/rust/elements/internal/AbiImpl.qll 01439712ecadc9dc8da6f74d2e19cee13c77f8e1e25699055da675b2c88cb02d dcc9395ef8abd1af3805f3e7fcbc2d7ce30affbce654b6f5e559924768db403c
+lib/codeql/rust/elements/internal/ArgListConstructor.qll a73685c8792ae23a2d628e7357658efb3f6e34006ff6e9661863ef116ec0b015 0bee572a046e8dfc031b1216d729843991519d94ae66280f5e795d20aea07a22
+lib/codeql/rust/elements/internal/ArgListImpl.qll 19664651c06b46530f0ae5745ccb3233afc97b9152e053761d641de6e9c62d38 40af167e571f5c255f264b3be7cc7f5ff42ec109661ca03dcee94e92f8facfc6
+lib/codeql/rust/elements/internal/ArrayExprConstructor.qll f4ac4efefe5fe4fe1e666f35b1ee92d2243d977b3f3308151c89f61582203c09 4167ae58ec869f7dbd8467093c4a53afd7c1efcf1cc865efa62b4eb484bd7ff8
 lib/codeql/rust/elements/internal/ArrayExprImpl.qll 205db9816ec56409db1a0c3987e3a64b8e88b9942055d4bcf84a5fd5943efded 094c954c2861fa7dea69247c9c16ddc6c8699dcd3201a993c72229450bed1490
+lib/codeql/rust/elements/internal/ArrayTypeConstructor.qll 9e92e6c40df992b4d71ae0e80392e81499604c7586a671b89d31d2d98060380e 76a1915a88f50ffa60bf129237bae2d66cf26d2a9018aca8ccb343929e847531
+lib/codeql/rust/elements/internal/ArrayTypeImpl.qll e22d4f4eb21ba1ea44dd53e0c80aa60ec3a42818c1fc2d512c92dc496a6e2cb3 1b4a7347dbb9310ace1e9e3d08c3ba53c1dc441539cebcb4a78f64a58097bc0a
 lib/codeql/rust/elements/internal/AsmExprConstructor.qll 36c68023b58beec30af9f05d9d902a4c49faa0206b5528d6aad494a91da07941 4d91b7d30def03e634b92c0d7b99b47c3aadd75f4499f425b80355bc775ea5b6
 lib/codeql/rust/elements/internal/AsmExprImpl.qll c34419c96378e2ae2ebb17d16f9efb4c97d3558919c252be9203aee223ac30a2 1d99c8fa35fabf931e564383c06c95fb39201fd588b759d28aef2fda7ed2c247
-lib/codeql/rust/elements/internal/AstNodeImpl.qll 76446505990a4018cad1e70b1e8f3b819a18fa77b3411789fa8853dc9d439580 234e2a6a20abbf146807f7136dcb44ffeab5ca891b192a816a36222562805e66
-lib/codeql/rust/elements/internal/AsyncBlockExprConstructor.qll 3db7d71723925f407d36812134ef8f9440f6755714d4c5d3c82bb2b771d00f71 6709690b5da048dfd2213a704d438af0a02b69b30d48fb85668ae470ec000fb1
-lib/codeql/rust/elements/internal/AsyncBlockExprImpl.qll 769032fbb4ebeead4334a6ec9b44b3eda321e3c6f1b64e15f9349115918cafe6 a015a1b1f6b68dd197d10306256ec2484b68a18e5314a0ca3e3ed96cbcd8759c
+lib/codeql/rust/elements/internal/AssocItemImpl.qll f462dacb8e60db8d8ffae44307c990370210c57b66721fd072c34b5ae76d3cc9 7fdb8faff0f310c1cb2bdd52f18368c8d78873467800c41ab3d1989f3196d845
+lib/codeql/rust/elements/internal/AssocItemListConstructor.qll 1977164a68d52707ddee2f16e4d5a3de07280864510648750016010baec61637 bb750f1a016b42a32583b423655279e967be5def66f6b68c5018ec1e022e25e1
+lib/codeql/rust/elements/internal/AssocItemListImpl.qll 92369e446494617359283109c9d91d307e0efd8edb50e0d2f41b83213cf494c0 58e60fa0a55d6fa9fb6cee22544880842d88c6380efc28fb40f3c37b6851d509
+lib/codeql/rust/elements/internal/AssocTypeArgConstructor.qll 58b4ac5a532e55d71f77a5af8eadaf7ba53a8715c398f48285dac1db3a6c87a3 f0d889f32d9ea7bd633b495df014e39af24454608253200c05721022948bd856
+lib/codeql/rust/elements/internal/AssocTypeArgImpl.qll 429f12a1a53c81634fc35331bb31cbab0321e5343d3d1170c77a59385cad0213 e6139425973e78b0ea932446165a643e2836cd4706ec9375e08652ccb6a8de68
+lib/codeql/rust/elements/internal/AttrConstructor.qll de1dd30692635810277430291ba3889a456344dbd25938d9f8289ab22506d5cd 57b62b2b07dee4a9daeed241e0b4514ba36fd5ec0abb089869a4d5b2c79d6e72
+lib/codeql/rust/elements/internal/AttrImpl.qll 486d307f74a48e6475fe014b07d5e0e13bbdf493ea80823e77e39747edf470d7 0847aa78d0e075aedbe46c10935969046bde4a7ab842da9d184739eb99a777c2
 lib/codeql/rust/elements/internal/AwaitExprConstructor.qll 44ff1653e73d5b9f6885c0a200b45175bb8f2ceb8942c0816520976c74f1fc77 11e6f4a1e1462a59e2652925c8bd6663e0346c311c0b60ebe80daa3b55b268b0
 lib/codeql/rust/elements/internal/AwaitExprImpl.qll 97eb9abc0f30ead9385f31c87b461e6f1bbfbeaac17810838bb94543bfca181f 66357ffc8c106aae565524d7110e9f50f2b3f573b1508c1d1b02db02af4cc52e
 lib/codeql/rust/elements/internal/BecomeExprConstructor.qll ba073aaa256cb8827a0307c3128d50f62b11aac0b1f324e48c95f30351a9b942 3a787ded505c3158fa4f4923f66e8ecdcb7b5f86f27f64c5412dc32dca031f18
 lib/codeql/rust/elements/internal/BecomeExprImpl.qll 8522410257ca9ff09e5314c3a39fba02f6ba18e1d4349b91f8823586317f3e47 073a877a6d72c5b762aac64cdd843fd2872aaefb9e264fb90eac8c25753a6e07
 lib/codeql/rust/elements/internal/BinaryExprConstructor.qll 7f9b17757f78b9fb7c46e21d2040a77fa50083bef4911c8464991c3d1ad91d87 a59390cd8e896c0bfbdc9ba0674e06d980ffcefa710fbc9886be52ed427e9717
-lib/codeql/rust/elements/internal/BinaryExprImpl.qll 6e22b183edc36083c45a03a600da6ea995563268ecdcdd4980b612fb8c3e7d33 7d8f32500f1edf8e9b8a725a640605e2ecfd88f21ad09d10f81b0ac18f27360d
-lib/codeql/rust/elements/internal/BlockExprBaseImpl.qll d2976ca0e6942d8da5535b5805cce9e0c2400fd3d27ecaf4742c574c40e69a4d ab4b2a83311fb1f0f27b1d6ae90c63e1e7fd686458eb8c5a0c46b6bc1ccd852a
 lib/codeql/rust/elements/internal/BlockExprConstructor.qll 438337c807645e98a01440f3f4610d68b0567ba15c8f51dc43bf5a30c9af3696 48ce7a546910c884619762349b8ada9836284f8008298fdb0070a38f7ddf25a0
 lib/codeql/rust/elements/internal/BlockExprImpl.qll 36ac09e4a6eeeec22919b62b1d004bdb5bb2527e67932c308aec383a770768d6 3b4b2a2014f6fe075c63a2d633b297566b548ef2e4343cadf067a9edbcadc876
-lib/codeql/rust/elements/internal/BoxExprConstructor.qll 4182e3126c196f3e22bc3b2012d01a9dcb464e0a0939e56a1bb410f5caab28c7 6ea2c688292b8b4b60a99f5340726fda955d97b78b801655145841e361c87ea9
-lib/codeql/rust/elements/internal/BoxExprImpl.qll 196ab98f0350d569551ea92a6b0b4654cc413ef3e437afc9c142d724551ff81c de64a20706801f2b8c5d3039bd623b8d1082fc9a4f89ecc753cef4e050112d2b
 lib/codeql/rust/elements/internal/BoxPatConstructor.qll 153f110ba25fd6c889092bfd16f73bb610fa60d6e0c8965d5f44d2446fcd48a2 9324cf0d8aa29945551bf8ab64801d598f57aab8cd4e19bcd4e9ef8a4a4e06eb
 lib/codeql/rust/elements/internal/BoxPatImpl.qll d62a3cc1d5bab6bd258f702ec731ec57f0e5ef2672ab9de4b6f3b558078629eb 26b4fabb676adbbdb0d7f81449e493ee49380ea04d131f779714ac2434bb323a
 lib/codeql/rust/elements/internal/BreakExprConstructor.qll 356be043c28e0b34fdf925a119c945632ee883c6f5ebb9a27003c6a8d250afd9 bb77e66b04bb9489340e7506931559b94285c6904b6f9d2f83b214cba4f3cfd5
-lib/codeql/rust/elements/internal/BreakExprImpl.qll ab01a4db514ccccf286f7bc0537456dc07c288c83b79f024bc24a3ebe7af706a fcbabae9b526741ea4518c138317ad2aed4069126fd2bac92c5c16eaecb2e8a3
+lib/codeql/rust/elements/internal/CallExprBaseImpl.qll d2749cc1a9d7ee8bf7f34b6c3e0238a576a68e439a8c10a503c164ff45ffcbeb ffc7b0a8841945fe6736b0e1aed7d9ed69185db03dee2b16da121325b39397c7
 lib/codeql/rust/elements/internal/CallExprConstructor.qll 742b38e862e2cf82fd1ecc4d4fc5b4782a9c7c07f031452b2bae7aa59d5aa13a cad6e0a8be21d91b20ac2ec16cab9c30eae810b452c0f1992ed87d5c7f4144dc
 lib/codeql/rust/elements/internal/CallExprImpl.qll 7e48610680ba6f2876a1a005ab0743496dd2364b9c44aca441bd33e11317e2d7 bb12c3c28156b40796fe3ba112760f87bb5abb323aab3c5b7bb3e0facaef8d35
+lib/codeql/rust/elements/internal/CallableImpl.qll 917a7d298583e15246428f32fba4cde6fc57a1790262731be27a96baddd8cf5e c5c0848024e0fe3fbb775e7750cf1a2c2dfa454a5aef0df55fec3d0a6fe99190
 lib/codeql/rust/elements/internal/CastExprConstructor.qll f3d6e10c4731f38a384675aeab3fba47d17b9e15648293787092bb3247ed808d d738a7751dbadb70aa1dcffcf8af7fa61d4cf8029798369a7e8620013afff4ed
 lib/codeql/rust/elements/internal/CastExprImpl.qll 3c57b75f01efc70013ba3f05bd79fe2747fe1d1de47b84ff73b06ad38b4f1093 da813adc3390d23ec0643e37226a58e8afdb78e889380ad265d7531a344b841c
+lib/codeql/rust/elements/internal/ClosureBinderConstructor.qll 6e376ab9d40308e95bcdaf1cc892472c92099d477720192cd382d2c4e0d9c8a1 60a0efe50203ad5bb97bdfc06d602182edcc48ac9670f2d27a9675bd9fd8e19f
+lib/codeql/rust/elements/internal/ClosureBinderImpl.qll 58c6b17d34d678802ce3484f556482f3f6e3c3ff9a4be0e845bc2077818ab6fb 467261e12cba46f324364f5366bdb0034bf3c922b08307d39441ea5181e3f5f8
 lib/codeql/rust/elements/internal/ClosureExprConstructor.qll a348229d2b25c7ebd43b58461830b7915e92d31ae83436ec831e0c4873f6218a 70a1d2ac33db3ac4da5826b0e8628f2f29a8f9cdfd8e4fd0e488d90ce0031a38
 lib/codeql/rust/elements/internal/ClosureExprImpl.qll 5ae3d211273b3effc3bff9f06bcef480f8264084e0509e69b8ff29bc29f47b05 ff562bc8d15ecb76ada3111c7c74dd990a0e80f41a32477f5f2f7db9e8f71102
+lib/codeql/rust/elements/internal/CommentConstructor.qll 0b4a6a976d667bf7595500dfb91b9cfc87460a501837ba5382d9a8d8321d7736 7d02d8c94a319dc48e7978d5270e33fc5c308d443768ff96b618236d250123f1
+lib/codeql/rust/elements/internal/ConstArgConstructor.qll f63021dc1ca2276786da3a981d06c18d7a360b5e75c08bca5d1afece4f7c4a83 487a870cbf5ed6554d671a8e159edd9261d853eba2d28ce2bd459759f47f11f2
+lib/codeql/rust/elements/internal/ConstArgImpl.qll 234fe6533c208a1731cdb423aa3a28909bd7e042dbc28bbedfd4f62e42b6f21e c576a49006f7a10483041fc07f2f0d089710ac61840be61a2e71140db709f9c6
 lib/codeql/rust/elements/internal/ConstBlockPatConstructor.qll ddb4a0045635d477e87360ecafec0ba90ddcffc6e62996eb6e7edd5a5d65b860 442061d0497a615b3f008b990f5e3c4f045110f76500eff81a7f44ffd1319acf
 lib/codeql/rust/elements/internal/ConstBlockPatImpl.qll 2082a3244c21e03b6dadfba9b3f97a00981324e10d1465d3a51cf3c921eb89e4 889e347834d8c6e90dfef9714af073b3b2193f6830f1c8356cee9c6573b3ecb4
-lib/codeql/rust/elements/internal/ConstExprConstructor.qll deab07cdbf15ba3efa95e4b429871d10a9202809745e079ba73b6138a31cfe45 803aedfb3e1a16e39f736192a70fda47c511ea39942fd323a00109215f1a0b5d
-lib/codeql/rust/elements/internal/ConstExprImpl.qll ab94be913f30ddcbc5b26563b0c13269721c33b4b36c9dbce2c05898e85c99e0 1de85c301c4b9445396f1ce1d7345a64cff447049716ccd948385f7a64d23244
+lib/codeql/rust/elements/internal/ConstConstructor.qll 72a31fd9b8b3fd910e35af1b2b30fa54cc4d9e14e7eabdb94b4cd2af95b2df38 3edc0a82a7b446fdfd3e71947801f3c7cac010b2a217b8accb69980387bdd67a
+lib/codeql/rust/elements/internal/ConstImpl.qll 7aac2b441a41f21b7d788e3eb042554f49969f67bcaae34531c6767c37996caf d6b2bf107696dcb1838131a40043f0787eb683e0d9beecd0b7bcdcd8d876734d
+lib/codeql/rust/elements/internal/ConstParamConstructor.qll f6645f952aac87c7e00e5e9661275312a1df47172088b4de6b5a253d5c4ed048 eda737470a7b89cf6a02715c9147d074041d6d00fd50d5b2d70266add6e4b571
+lib/codeql/rust/elements/internal/ConstParamImpl.qll 909d85d857dfb973cd8e148744d3a88506d113d193d35ab0243be745d004ad45 c9e18170c5b4e4d5fca9f175bb139a248055b608ceafdd90c7182d06d67c3cba
 lib/codeql/rust/elements/internal/ContinueExprConstructor.qll cd93f1b35ccdb031d7e8deba92f6a76187f6009c454f3ea07e89ba459de57ca6 6f658e7d580c4c9068b01d6dd6f72888b8800860668a6653f8c3b27dc9996935
-lib/codeql/rust/elements/internal/ContinueExprImpl.qll 976890d17681315d2297b600a58c655ccc7c4db44cf587d7b5c359303f309acf 1ecae04df07ee20dcea4f00a9af33c108a0e15ed2ccf8b936804ad88ed66f883
-lib/codeql/rust/elements/internal/DeclarationImpl.qll e60951aa6fc1f39be52cf782a1413f04c132b890f61569286777936ac0926b23 b41b1d43214a461661f18bbb734ce6e257c5c8cf9d156424d401241d47fa2153
-lib/codeql/rust/elements/internal/ElementListExprConstructor.qll eafdb6ae921a73263d43702e895aed73e1e7b770871216835904f83c63c3d2e8 1443b028d4e32d74ee9f0756cae65e18851ee7ccd7dbd933b42096b52f6fe8c6
-lib/codeql/rust/elements/internal/ElementListExprImpl.qll 32d68a90a2a4c64006c352e762bd26e373a17dd57f39b23748830a07c1f33a96 9def1730379c2c5838b0d0b563eb7657e11d1f0bf094a55d168dabbcf99d5d25
+lib/codeql/rust/elements/internal/DynTraitTypeConstructor.qll 2bfd81fdf116b76f4a62b47bed5f0a730c04ce79747ecd1d3b683b8de22ff4aa 375c57350c432351396b92f28fded1e95a8002e3a1b31f3b66039f9b3d9bdea9
+lib/codeql/rust/elements/internal/DynTraitTypeImpl.qll 8ccf27db0b898f518874ae094e5c97206384ad2fd3f82f81a5ecaad953278f71 e28ab56b8814a804e23afa790ca0f9a2665195b0b316d6cc52936e76ce5c0011
+lib/codeql/rust/elements/internal/EnumConstructor.qll eca1a13937faacb1db50e4cf69d175f992f2204a5aaed9144bb6f3cb63814ac5 1bafba78b2729fdb052a25a1ba3f4f70871564aa4df632b4a1d467858a437924
+lib/codeql/rust/elements/internal/EnumImpl.qll c4dfa97b0c656957390417ab09c81b29b67fbff1b7b14976d65625ebea6b2c11 940303d4d4cec130f1981d309f8eaea6803c14a41174bbe9a87dd12ce4975945
 lib/codeql/rust/elements/internal/ExprImpl.qll ab20ee174e2e786f34af6e5dedf3ec071bb89fc266b3e91df6377f72aa38d3f2 f68192700f449bf1c229cfbaabd5353c7c559941c915d5a0c88752cf9844194b
 lib/codeql/rust/elements/internal/ExprStmtConstructor.qll dd6bb06a7d48c12f630aafd611621cc50ce0f3e7d9abba5484a695f90879264b dc8b6ec8acc314e041ae71868803630c5d4cab488c72c1ea929bb756e1847c52
-lib/codeql/rust/elements/internal/ExprStmtImpl.qll b6791b2152812597f2147d7bab1835e6e96ccb6eb2dacb124aaf4a53dee54d83 bae6bfd615ee551c926df3654b9d235bf3428abe1ab479e5b08da6c8188a9075
+lib/codeql/rust/elements/internal/ExprStmtImpl.qll 420221c64245b490dab85f4e50d6b408cf488349869eb87312c166e185ad8145 2c2a4c71eea8c1ad8823e8e22780fadebb38ae502b3a7b9b062923a188fef692
+lib/codeql/rust/elements/internal/ExternBlockConstructor.qll 884bafd1cb5a6ce9f54a7a6b9ba1c8814f38e3baf69a2ff8cfc8b02163204b9d ee26e070fcbfd730bbfaf0502d5ed54110c25f84e7b65948c8638a314b67ea5d
+lib/codeql/rust/elements/internal/ExternBlockImpl.qll 6c7e89b5e9113d014b6835e86c4653d4b34e05d565ab0264c0593aac463389a4 f0f06a8657bac7e5e5e8edaf0dfe83a6c3e323aed2e112e3df6f882306732c5f
+lib/codeql/rust/elements/internal/ExternCrateConstructor.qll edd4d69ca7e36bd8389a96eac4ce04d9dd3857b0470b9f24319312469b0f8654 c80f4968e675f4b29e92a2fd8783f800823cc855ad193fee64869d5ba244d949
+lib/codeql/rust/elements/internal/ExternCrateImpl.qll ade4df9d3f87daf6534b8e79ffb43317e01ea5bd634ed54996f3ebe3c6aea667 68c2bff3c92dbb522e76089d7ad8bd61c54fcd094f3966fe867b0a3d46330375
+lib/codeql/rust/elements/internal/ExternItemImpl.qll 577c8ac387c47746e3b45f943374c7ab641e8ad119e8591c31f219a5f08d3a29 bba88b974d1c03c78e0caf3d8f4118426d2aa8bd6ffd6f59a3da8ff1524a173f
+lib/codeql/rust/elements/internal/ExternItemListConstructor.qll 9e4f6a036707c848c0553119272fd2b11c1740dd9910a626a9a0cf68a55b249b efde86b18bd419154fb5b6d28790a14ea989b317d84b5c1ddbdfb29c6924fd86
+lib/codeql/rust/elements/internal/ExternItemListImpl.qll e89d0cf938f6e137ba1ce7907a923b1ab2be7be2fdd642c3b7a722f11b9199f8 85906d3ce89e5abc301cc96ea5104d53e90af3f5f22f8d54ec437687096e39d8
 lib/codeql/rust/elements/internal/FieldExprConstructor.qll b3be2c4ccaf2c8a1283f3d5349d7f4f49f87b35e310ef33491023c5ab6f3abc5 645d0d4073b032f6b7284fc36a10a6ec85596fb95c68f30c09504f2c5a6f789f
 lib/codeql/rust/elements/internal/FieldExprImpl.qll bae3828bdee6fa3b36219e831cecc2a09fd3c40c4a945f8a19fb5d8765c6f302 be4b89e39013a380bc172ac46e496f14ebdebb1d93e1b7ffb3bab98e08db3f6f
+lib/codeql/rust/elements/internal/FieldListImpl.qll 02a09d1d146030c68cead4614f4eef75854f19e55ed1eda60b34c4858a8d4a88 9b9f5e77546434c771d2f785119577ec46569a18473daa4169fb84a097369493
+lib/codeql/rust/elements/internal/FnPtrTypeConstructor.qll 494c53ee599039c02145f91394d8dfe7635b32d03f9fcde5efcc99ced437fec8 992462b1b6b9e64b6201f3c6c232ca524f126efcb562c9f0c176677bb559f33c
+lib/codeql/rust/elements/internal/FnPtrTypeImpl.qll 5d70f71e08341dfa851fc53a47cf362786b57f44244a636e2fbbad3d1c41371e 51d6a1b1132204129bb8ee9d2b72c6d13ce4b3ec8b185d3732d2e64d3f80e807
+lib/codeql/rust/elements/internal/ForExprConstructor.qll d79b88dac19256300b758ba0f37ce3f07e9f848d6ae0c1fdb87bd348e760aa3e 62123b11858293429aa609ea77d2f45cb8c8eebae80a1d81da6f3ad7d1dbc19b
+lib/codeql/rust/elements/internal/ForExprImpl.qll 88fc37b7030d3bfca6071f275c4eac6760ad7dea9a01135cee2079170efeb9d5 cd7216c460f8382498dfb0d61d65d83a9aa608b6a9b6657ccd552b82b55ffc5a
+lib/codeql/rust/elements/internal/ForTypeConstructor.qll 32c40b78aded314b5f51af904bfbd5ae4f1f0ea65854dd6249983cc26b8601bc 729069d58fac648a4b212b0068fb6bca348443b502c38978f171a7539b24333f
+lib/codeql/rust/elements/internal/ForTypeImpl.qll b515639844778d0fbe51e6161a2ec19201b0ba15156a91cdfecc93523081fd61 ab0c09ee415e55db6abcc07493a5d880c5ae0974f0cb760194e40b68a961676b
+lib/codeql/rust/elements/internal/FormatArgsArgConstructor.qll 8bd9b4e035ef8adeb3ac510dd68043934c0140facb933be1f240096d01cdfa11 74e9d3bbd8882ae59a7e88935d468e0a90a6529a4e2af6a3d83e93944470f0ee
+lib/codeql/rust/elements/internal/FormatArgsArgImpl.qll 601f7715e9a65bcfa7cea1979fa30d694b5bea29650d799d7dd3080b8eea58e9 ecb0800cdb8c0f93277982dad295ac6a5332e42eff4fb5c8ff19f903b9857003
+lib/codeql/rust/elements/internal/FormatArgsExprConstructor.qll ce29ff5a839b885b1ab7a02d6a381ae474ab1be3e6ee7dcfd7595bdf28e4b558 63bf957426871905a51ea319662a59e38104c197a1024360aca364dc145b11e8
 lib/codeql/rust/elements/internal/FunctionConstructor.qll b50aea579938d03745dfbd8b5fa8498f7f83b967369f63d6875510e09ab7f5d2 19cca32aeaecaf9debc27329e8c39ecec69464bb1d89d7b09908a1d73a8d92a2
+lib/codeql/rust/elements/internal/GenericArgImpl.qll 6b1b804c357425c223f926e560a688e81506f5a35b95485cecf704e88cc009ee cc1ccf6a23dadc397e82664f3911d4b385d4c8ca80b1ee16d5275d9c936148dd
 lib/codeql/rust/elements/internal/GenericArgListConstructor.qll 46859bb3eb09d77987a18642d65ba2e13471a4dc9c0a83a192fddc82e37c335c 2c7d54c876269a88d3461b05745e73b06532b1616cae9b614ac94b28735d8fc4
 lib/codeql/rust/elements/internal/GenericArgListImpl.qll 1a39ba7080147abccaaba451852c9c124fb6177f2ebd64e38ee74014444a34e1 80df3150c961936037ac02b46ef5f775c3f82e66490afbca00a016cb9eee798a
+lib/codeql/rust/elements/internal/GenericParamImpl.qll f435f80d7f275803c1311d362467f4a367deb5a2c0245b17a9e12468a2c3ce2f 8e8fcc29f510efa03ce194ad3a1e2ae3fbd7f8e04ab5a4a2d1db03e95f388446
+lib/codeql/rust/elements/internal/GenericParamListConstructor.qll 7221146d1724e0add3a8e70e0e46670142589eb7143425e1871ac4358a8c8bdb 2fbb7576444d6b2da6164245e2660d592d276ae2c1ca9f2bda5656b1c5c0a73a
+lib/codeql/rust/elements/internal/GenericParamListImpl.qll 524aa0949df6d4d2cb9bee6226650f63a6f181d7644933fa265673b281074885 27b0210e5eaa2040bc8a093e35e1394befb6994b25369544738d0447ef269a9c
 lib/codeql/rust/elements/internal/IdentPatConstructor.qll 09792f5a070996b65f095dc6b1b9e0fb096a56648eed26c0643c59f82377cab0 0bb1a9fcdc62b5197aef3dd6e0ea4d679dde10d5be54b57b5209727ba66e078b
-lib/codeql/rust/elements/internal/IdentPatImpl.qll 10b2758419b48d34013d0e1ea55006a72ea351e5298c9cde4d988f510d4094eb 63bdb210d7bcab42888b4f44688966a33951061573b0a9a734b5b262cbfa2cd8
 lib/codeql/rust/elements/internal/IfExprConstructor.qll 03088b54c8fa623f93a5b5a7eb896f680e8b0e9025488157a02c48aaebc6ad56 906f916c3690d0721a31dd31b302dcdcec4233bb507683007d82cf10793a648f
-lib/codeql/rust/elements/internal/IfExprImpl.qll 3f1496ad8622e83aeffc9269e8f3d1dfd5da1672e98bcd98cd2e67ead659fee3 9cd037ff01af557be51f792e36d5f1b62c838f0f988c8bfba38124f430416345
+lib/codeql/rust/elements/internal/IfExprImpl.qll 96dc5be0a650a74f96e0c2214eb58f1af5278ad1695ad790b660fdecb6738c14 06a292fcc459297ef3a0ef5c75c887f993ccd6350eb3fb0d2493e5b7c7199b6b
+lib/codeql/rust/elements/internal/ImplConstructor.qll 24edccca59f70d812d1458b412a45310ddc096d095332f6e3258903c54c1bb44 7eb673b3ab33a0873ee5ce189105425066b376821cce0fc9eb8ace22995f0bc7
+lib/codeql/rust/elements/internal/ImplImpl.qll 33a57be871fe3ab08467a65f2e2e9fb7df9f096c98e9f86d8a755eaf6da6e446 f01d0e9bfccf3926ae9720d3d660ba97e1c094f318bfb252449b2d387176f6a9
+lib/codeql/rust/elements/internal/ImplTraitTypeConstructor.qll b47501280b026a4e9c21ace21d9ae59f4d126a3a1e03a6088ca38cd676cc4f6d 3b0b325ab0139b290a81355559227050ba3096a58f9ff01c4c0f5c5fb5beb6ee
+lib/codeql/rust/elements/internal/ImplTraitTypeImpl.qll 9826a676525c98c30019f62f3c5943b4f62f278ed738dcc023d15f82f36a9d32 da369a61b95685c29fce3c07082d2a58ab633d526d094fa9eaefa82f564609f6
 lib/codeql/rust/elements/internal/IndexExprConstructor.qll 99bdc3d793c4dbd993860da60abe2b7c604345d645e86916462bc55a6939a5d1 3fe9d7da725956903707806aadbecac8d5b3874e8bed63c9bab54fff630e75dd
 lib/codeql/rust/elements/internal/IndexExprImpl.qll 7914bace26dadf2c1752b65afad2ed226165507e20f3dba7949696103f3d586e 708a9f7eff1cbfcf93841ee009dc01354f4ea3d2e1e00608924e670070410e20
-lib/codeql/rust/elements/internal/ItemStmtConstructor.qll 8f263f07fdbf52f58948926e3bfd2234c82b0a852db1c156cae131c1699ef526 b746247a55fc58986255822fb32e67e7f4614a328b8baddd0de6d146b1dd84f2
-lib/codeql/rust/elements/internal/ItemStmtImpl.qll 683044d5b90c61883b7da80a8b7cc8832d8d6bdd6fab4abb7d520d7201da369b 9976a59b7cc37fcee5e812badf8394d6b63a0a35364914ca371577c37d7d1be1
+lib/codeql/rust/elements/internal/InferTypeConstructor.qll fb8f2aec6cd1e681cd84a7bd574459e19b9b2a152009290e2eac550f012a06b7 e2b1694f00a4e6a82b13d08d7bb95c98a73792370c1155263d696e60d39b2c3b
+lib/codeql/rust/elements/internal/InferTypeImpl.qll 9d0bf471a7e0c2671aae52cebadc763ed13e6a62451bf22da3061d7781d8f0bf 4e9e218862e48700523d882eb64d24135289216653cf92195f74eb8a35f50d7c
+lib/codeql/rust/elements/internal/ItemImpl.qll 3eaa97dcbdb8870acaebc1e11a37a5cfdfa200751461e54d3a52ca48b90ba9bd 41fbd1110b0e24f4d5a3deee0a51c02d206178111a361a1e94501ca1ab70d7f7
+lib/codeql/rust/elements/internal/ItemListConstructor.qll 08af3bd12536941c3dd4a43c81cc861be24325e242e2593c087a3ce632674291 2fa166159c409d2aaffa73a30babb40829a6de580bd40894d909ee6152801082
+lib/codeql/rust/elements/internal/ItemListImpl.qll fb27417bb3ee17a739ae966dd7c6f382bc2a1de3e7efdfe1586d76a257c0b573 dee7ded650df8ef46b2ac9d472718536fd76dffee86bc208b5a6144060221886
 lib/codeql/rust/elements/internal/LabelConstructor.qll 1f814c94251e664bfa1b1a606aef995382e40e78d4f953350ec951ee0bc8bd34 3157fb8c7c6bd365a739f217ad73ba1e0b65ccd59b922e5ab034e3449915b36c
 lib/codeql/rust/elements/internal/LabelImpl.qll e1934c3f01e6c9a2517001285bc8e36166757a50ff63be09f9000171c04130f7 4f93e722af890b5241bf55674b29ac5cb134cfefb47eba983503dbd4212abb20
+lib/codeql/rust/elements/internal/LetElseConstructor.qll b2b5d68e5701379a0870aa6278078e09f06aa18ddd14045fc6ae62e90827ece7 7359e70bea8a78bcaf6e6ecc8cc37c5135ae31415b74645594456cc8daa82118
+lib/codeql/rust/elements/internal/LetElseImpl.qll 1c801275993b809e80a847736f080a9b650710ef8862797504495d62904a3a71 b79d4760d8e333893e984e45f21eb463dce7f2a49ebd0708321c8653aa8c20cb
 lib/codeql/rust/elements/internal/LetExprConstructor.qll 66f27cbdafb2b72b31d99645ec5ed72f4b762a7d6f5d292d7639dd8b86272972 7da048f4d7f677919c41d5c87ead301eacc12ece634d30b30a8ae1fab580ff30
 lib/codeql/rust/elements/internal/LetExprImpl.qll d9e2f8a2f4c7cf3b80178012b5f38b029064a52e705301b99c7477ec1d9fe479 1a059d383a5988b32ade329d2ac809f3a830eb9c54020e3271861aa9ef136ab8
 lib/codeql/rust/elements/internal/LetStmtConstructor.qll 7ee0d67bebd6d3b9c7560137c165675d17b231318c084952ba4a2226d61e501f 84199ba755bb6c00579eee245b2bca41da478ca813b202b05abaa1246dcf13d8
 lib/codeql/rust/elements/internal/LetStmtImpl.qll 2f3f387a78d1751652bd22dc0ea6cb39f0e186847b6f0dafd74d0f89e2db495a 2ab5a17f588e385f614c8a104a17a91859389227635bd239694a799643727ffc
+lib/codeql/rust/elements/internal/LifetimeArgConstructor.qll 270f7de475814d42e242e5bfe45d7365a675e62c10257110286e6a16ce026454 643d644b60bfe9943507a77011e5360231ac520fbc2f48e4064b80454b96c19b
+lib/codeql/rust/elements/internal/LifetimeArgImpl.qll 2d31b328c07b8922e2c448137d577af429150245170d26fe4a9220cba1a26bfe 18c5f5747ff4be87820c78cadd899d57e1d52c5cd6ae3f4e56ee2f5d3164bd41
+lib/codeql/rust/elements/internal/LifetimeConstructor.qll 2babe40165547ac53f69296bb966201e8634d6d46bc413a174f52575e874d8cd ef419ae0e1b334d8b03cdb96bc1696787b8e76de5d1a08716e2ff5bd7d6dc60d
+lib/codeql/rust/elements/internal/LifetimeImpl.qll 14ec1a4fa0c84fa9e75ea0babebae9c666909239806ed21325c32e47e11c8806 891168f29d4e06a927ec01ef8fd21ff6e0a0a3deadcf1481c99c74bf2ef20536
+lib/codeql/rust/elements/internal/LifetimeParamConstructor.qll 530c59a701d814ebc5e12dc35e3bfb84ed6ee9b5be7a0956ea7ada65f75ff100 ff6507e5d82690e0eec675956813afabbbcfb89626b2dbfffe3da34baeff278c
+lib/codeql/rust/elements/internal/LifetimeParamImpl.qll 8909288801bff8d3e87096dff4b45f434a4c064a9d69d8943a0b30970e011ef9 6d8f80eca24112b5eb659fe5d5fca4fd91c3df20ecab1085dfee9176091237b8
 lib/codeql/rust/elements/internal/LiteralExprConstructor.qll 8ea3569bd50704ce7d57be790d2dfd38f4c40cb0b12e0dd60d6830e8145a686f 88d07ad3298003f314f74bd8e3d64a3094de32080ad42a7e6741c416c3856095
-lib/codeql/rust/elements/internal/LiteralExprImpl.qll 0a8c8b398ed2f7f3dce5969b98fa61d65bbb690df035b7149a90926b692fab47 26ff1638781af837c454c3cf14d87d1e404c7b47f2582ad520925183c8c769e8
 lib/codeql/rust/elements/internal/LiteralPatConstructor.qll b660cb428a0cba0b713fc7b07d5d2921de4a2f65a805535fb6387684c40620de 2dbc9fbc56e9de53d24265d6b13738ef5b9ced33cc3c4c1c270e04dc2fc1330f
 lib/codeql/rust/elements/internal/LiteralPatImpl.qll af74456649e3949bf27e91f2127389e5c9f2ee99241958afeaa5b55276170994 b8b744b1d0c1b85ec86c535a35fc75d6289636a0e1988500debf236faf24a2cd
 lib/codeql/rust/elements/internal/LoopExprConstructor.qll 45f3f8f7441fcab6adc58831421679ee07bac68ac0417f3cbc90c97426cc805b f7ab3361b4a11e898126378ea277d76949466946762cd6cb5e9e9b4bb9860420
 lib/codeql/rust/elements/internal/LoopExprImpl.qll 068b98978296b22ae59bf9e941e7e2683f4fee0f6c1affbda1fa42c93f015114 e40e384aeff61099d102a681e5dca1aabc6dd6694731f8570d6358e0197368b0
+lib/codeql/rust/elements/internal/MacroCallConstructor.qll 707fee4fba1fd632cd00128f493e8919eaaea552ad653af4c1b7a138e362907d b49e7e36bf9306199f2326af042740ff858871b5c79f6aeddf3d5037044dbf1f
+lib/codeql/rust/elements/internal/MacroCallImpl.qll 7732221a0d8677f32695be3e6263f6e5f8857225cf98cc31eb91592e175df260 7c4e15e092abbf3a6070141669f2614909eb0accaaee0da6f70495de6087337b
+lib/codeql/rust/elements/internal/MacroDefConstructor.qll 382a3bdf46905d112ee491620cc94f87d584d72f49e01eb1483f749e4709c055 eb61b90d8d8d655c2b00ff576ae20c8da9709eeef754212bc64d8e1558ad05ce
+lib/codeql/rust/elements/internal/MacroDefImpl.qll f26e787ffd43e8cb079db01eba04412dbf32c338938acf1bc09a2f094bbdfdfe 044f43bc94fe4b6df22afae32e9f039d1d0d9e85ad9f24b6388be71211c37ce5
+lib/codeql/rust/elements/internal/MacroExprConstructor.qll b12edb21ea189a1b28d96309c69c3d08e08837621af22edd67ff9416c097d2df d35bc98e7b7b5451930214c0d93dce33a2c7b5b74f36bf99f113f53db1f19c14
+lib/codeql/rust/elements/internal/MacroExprImpl.qll 92dd9f658a85ae407e055f090385f451084de59190d8a00c7e1fba453c3eced4 89d544634fecdbead2ff06a26fc8132e127dab07f38b9322fa14dc55657b9f1a
+lib/codeql/rust/elements/internal/MacroItemsConstructor.qll 8e9ab7ec1e0f50a22605d4e993f99a85ca8059fbb506d67bc8f5a281af367b05 2602f9db31ea0c48192c3dde3bb5625a8ed1cae4cd3408729b9e09318d5bd071
+lib/codeql/rust/elements/internal/MacroItemsImpl.qll 76fd50a1f27336e9efc6d3f73ef4d724f19627cadbaa805d1e14d2cfa4f19899 40c0e512090050b39b69128730f4f4581f51ffd3c687fb52913617bd70a144e9
+lib/codeql/rust/elements/internal/MacroPatConstructor.qll 24744c1bbe21c1d249a04205fb09795ae38ed106ba1423e86ccbc5e62359eaa2 4fac3f731a1ffd87c1230d561c5236bd28dcde0d1ce0dcd7d7a84ba393669d4a
+lib/codeql/rust/elements/internal/MacroPatImpl.qll 7470e2d88c38c7300a64986f058ba92bb22b4945438e2e0e268f180c4f267b71 c1507df74fc4c92887f3e0a4f857f54b61f174ffae5b1af6fb70f466175d658b
+lib/codeql/rust/elements/internal/MacroRulesConstructor.qll dc04726ad59915ec980501c4cd3b3d2ad774f454ddbf138ff5808eba6bd63dea 8d6bf20feb850c47d1176237027ef131f18c5cbb095f6ab8b3ec58cea9bce856
+lib/codeql/rust/elements/internal/MacroRulesImpl.qll 10c03adfb63ee7a4348ff5cffc6ef5300a531b048f28811a51e940b053e69f68 2498bd64aeaea9849c086abeaa6c248e4ce41b4436155f4bd4840965976d5d54
+lib/codeql/rust/elements/internal/MacroStmtsConstructor.qll c293815cd69c002ba6de1db6018672654420f3f8bdd143f9d0c620adddd2be02 d376f8f07661a8cad1b10039076fd7fca353dcacf3ca40ed6507b8c874e849ca
+lib/codeql/rust/elements/internal/MacroStmtsImpl.qll 27faff9da93ad7f22a6236c73ebb4d4631161cf4ec1b82958cdf79c85aa2087c 7e2863eaf50d4b285b9240f2c5ff9497cfb4393c8528a0738d725d00f1a78406
+lib/codeql/rust/elements/internal/MacroTypeConstructor.qll 0a23573a6f69b38f3d7470050b16197601d67bdd5a4b1a43a155b0b99ccdf6b5 19b623962e8e1f73e55e3ed9712d2a3fe84b9510b99062173902feb2458ec12a
+lib/codeql/rust/elements/internal/MacroTypeImpl.qll b8711279f09f521b05bb67568c089271b7913f863ee64dfdeec2c502de2cbdc8 51bd9d3a2fb2065bce7b193b485e225ca5c8ba2029e60cab427d43a90baf0880
 lib/codeql/rust/elements/internal/MatchArmConstructor.qll b41c1d5822d54127ce376ef62c6a5fa60e11697319fc7d9c9c54fd313d784a93 96cca80e5684e5893c0e9c0dff365ef8ad9e15ff648c9969ba42d91f95abea05
 lib/codeql/rust/elements/internal/MatchArmImpl.qll 065dff16fc70b51924eb4db57be121283f4b5651105320901558bc93bfdf2641 37f4f6ecd23c5170ee5cb0041625c19a8d3245d56f6f1587a2e588eb86baecf9
+lib/codeql/rust/elements/internal/MatchArmListConstructor.qll 8bc5ac978fe1158ef70d0ac06bdad9e02aadd657decb64abcc4ea03f6715a87a 4604ab0e524d0de6e19c16711b713f2090c95a8708909816a2b046f1bd83fe24
+lib/codeql/rust/elements/internal/MatchArmListImpl.qll 896c6f1650e7ceb60d0b3d90e2b95fe7f8dc529203ddfec58edb063fa9b2871f a668fed1eb68806abfb021913786168d124de47b25da470e7b57f56bf8556891
 lib/codeql/rust/elements/internal/MatchExprConstructor.qll 0355ca543a0f9ad56697bc2e1e2511fa3f233bc1f6344d9e1c2369106901c696 78622807a1c4bff61b751c715639510146c7a713e0c4f63246e9a2cf302f4875
-lib/codeql/rust/elements/internal/MatchExprImpl.qll 2f933805bbe6f2676501c1c72ce1dbcffb0acff34883fa7b423b1a20eaf58afb 56f1c727f327717afc48c1dc505241d56c46e84094395ca32a33824cf64ebdce
+lib/codeql/rust/elements/internal/MatchGuardConstructor.qll d4cae02d2902fe8d3cb6b9c2796137863f41f55840f6623935a1c99df43f28d8 0c89f2ca71a2fd5a3f365291e784cb779e34ba0542d9285515e1856424cec60d
+lib/codeql/rust/elements/internal/MatchGuardImpl.qll 77453be572769507e6515e622e6c874a875464c2ade8bcd89ef447bdc4649062 86cdf08b0ac5ff9a865ab52eae535d8c4e7d341bc79d422e123af5b8f593ad22
+lib/codeql/rust/elements/internal/MetaConstructor.qll 49ab9aafdcab7785fc5fc9fb8f7c5bb0ae76cf85d0d259c4b3ac4b0eccbbeb56 bc11aef22661077e398b6ca75e3701fd8d0ac94a0e96dc556a6f6de4089d8b8c
+lib/codeql/rust/elements/internal/MetaImpl.qll c0768335e8b290d33474fac7d12b994c659c3020dcc488314e6b732000837584 ae56040758f407238008a952a29cf336b3e87115b0ab4bfde15b0d0f90d13b88
 lib/codeql/rust/elements/internal/MethodCallExprConstructor.qll a1b3c4587f0ae60d206980b1d9e6881d998f29d2b592a73421d6a44124c70c20 8d4eaa3eb54653fac17f7d95e9cc833fe1398d27c02b2388cd9af8724a560ded
-lib/codeql/rust/elements/internal/MethodCallExprImpl.qll 85bb150fa738c4206913cf8de15d3b0525e47c1a2cf5de77ac1978194f4b6333 a565680745b8c1374c17c6a0a9b1b4c8058b4f44ea934e36a919d2eb454b289d
-lib/codeql/rust/elements/internal/MissingExprConstructor.qll 90d15dd93cd6bfff08c9ddab18a8caedf6c4eb3a98aba640a557ac21bfb4150b 0199cc6ad9437aab8138c1e72e8a4707878af97ee34eb9ca685f0fa0b9b00338
-lib/codeql/rust/elements/internal/MissingExprImpl.qll 46363c3fad83685a835c0d80d94b3b6f7f85a671fb0fcbc758af6ae1d49f4330 1bef663c4243347196d5d61157717c11bf9e590b478f2489e8adce8776b4f421
+lib/codeql/rust/elements/internal/MissingConstructor.qll aab0b7f2846f14a5914661a18c7c9eae71b9bde2162a3c5e5e8a8ecafa20e854 8f30b00b5b7918a7500786cc749b61695158b5b3cc8e9f2277b6b6bf0f7850a0
 lib/codeql/rust/elements/internal/MissingImpl.qll e81caa383797dfe837cf101fb78d23ab150b32fef7b47ffcc5489bfcd942ac3e 9f3212d45d77e5888e435e7babd55c1e6b42c3c16f5b1f71170ac41f93ee8d0b
-lib/codeql/rust/elements/internal/MissingPatConstructor.qll 1d145a8a82cdd5e2c1ea902f3aefda774bfa8efd15f65a7c861327eb2cbb7bd5 9096b503ab71b83d6e9b853615549e8b4356b45e1eb434eb0da7792453856825
-lib/codeql/rust/elements/internal/MissingPatImpl.qll 891c38709ff0e107176c54f96fca41a398aaeedc0ec01c8037c8c193eed8d704 5eb2e24d50b1337bfd56c64f1a1b264fb7778c0259778e3c4a1a2fdf124bdf0c
 lib/codeql/rust/elements/internal/ModuleConstructor.qll 31cc83c9d8f25ac07375d19e568f05c068e1f5aa205ff3d9ac31c2510e6f8468 8a70f3f1c18ff87f17e6baf2f05ccaed55c70469288192fc39ef0bb5531b8c0e
 lib/codeql/rust/elements/internal/ModuleImpl.qll bbff32cadbad54bdb613df8c1ac6da8cd2a80d0576361b843f1529e6c63b1938 7342473026561b8e4923625a083ba52c31d3b6797f9061accd1a712598244410
+lib/codeql/rust/elements/internal/NameConstructor.qll a760134c6d4fc785746e1a5dc042a6bf25b8adaa3947a6897c31e50fd91dd5fd 1359f903d57112bcc1f62a609febb288301bfa810e569aa12e1045fd48b5b5c9
+lib/codeql/rust/elements/internal/NameRefConstructor.qll 5ff6eacc614fd41f98b54cbb4960a07a1471cf4ea291758d33e54a48fd5d1bc4 c538d65414a24dfdbeb49cfd997588227559ba038f0b55d14bb5d89ed1a016f2
+lib/codeql/rust/elements/internal/NeverTypeConstructor.qll 6a86bff9d885eddf39a159698710def40d693ccfd0888aefd090a283cb59ae95 9c51d6569f267dde5597067a8470d19d7714304399de4f730e7b85ca21feee20
+lib/codeql/rust/elements/internal/NeverTypeImpl.qll 8c7464cb76f9d081dab318d743817d87ecd69672f382d27323ade94c82e8e0f6 55351661214854bbf7faed6c7d17d598459d4e88eaba130a9b3a9f43f6665c37
 lib/codeql/rust/elements/internal/OffsetOfExprConstructor.qll 616e146562adb3ac0fba4d6f55dd6ce60518ed377c0856f1f09ba49593e7bfab 80518ce90fc6d08011d6f5fc2a543958067739e1b0a6a5f2ed90fc9b1db078f0
 lib/codeql/rust/elements/internal/OffsetOfExprImpl.qll e52d4596068cc54719438121f7d5afcaab04e0c70168ac5e4df1a3a0969817a6 6ab37e659d79e02fb2685d6802ae124157bf14b6f790b31688f437c87f40f52c
 lib/codeql/rust/elements/internal/OrPatConstructor.qll 4ef583e07298487c0c4c6d7c76ffcc04b1e5fe58aba0c1da3e2c8446a9e0c92b 980a6bd176ae5e5b11c134569910c5468ba91f480982d846e222d031a6a05f1a
-lib/codeql/rust/elements/internal/OrPatImpl.qll 0dbc461115f62306e679f69c4354550bc3425d4291aec0124ad8f7a55c779d51 d32ebaa5a3002e87b35949cb624b20377155869ad33aec873326f60f2f0b666d
+lib/codeql/rust/elements/internal/ParamConstructor.qll b98a2d8969f289fdcc8c0fb11cbd19a3b0c71be038c4a74f5988295a2bae52f0 77d81b31064167945b79b19d9697b57ca24462c3a7cc19e462c4693ce87db532
+lib/codeql/rust/elements/internal/ParamImpl.qll 8a5101559f5d636b60ab80237057944b537823ce054d760c3dbd58b2acf05a46 e7a08cefeb6a290a975899045b7b19a9624f5a2b0946cba0866b1854cc0c0fb0
+lib/codeql/rust/elements/internal/ParamListConstructor.qll 3123142ab3cab46fb53d7f3eff6ba2d3ff7a45b78839a53dc1979a9c6a54920e 165f3d777ea257cfcf142cc4ba9a0ebcd1902eb99842b8a6657c87087f3df6fe
+lib/codeql/rust/elements/internal/ParamListImpl.qll 0ed6e9affe1dc0144641502292c2ddd51958fe3d503419caf15198176e3a4174 92d053cc5fdf40a2d98acb665083b5da15403d7da205779a97a4ee66fac0add4
+lib/codeql/rust/elements/internal/ParenExprConstructor.qll 104b67dc3fd53ab52e2a42ffde37f3a3a50647aa7bf35df9ba9528e9670da210 d1f5937756e87a477710c61698d141cdad0ccce8b07ecb51bab00330a1ca9835
+lib/codeql/rust/elements/internal/ParenExprImpl.qll 185e7c0f8f377f62a7ccf1c0d168caf500afd0654b82d47569bfcb97e368a26d 25a41998ce0ff3490d677676bf02fea1861d6c01db99a02fc940cc37ae580db6
+lib/codeql/rust/elements/internal/ParenPatConstructor.qll 9aea3c3b677755177d85c63e20234c234f530a16db20ab699de05ca3f1b59787 29f24aed0d880629a53b30550467ade09a0a778dbf88891769c1e11b0b239f98
+lib/codeql/rust/elements/internal/ParenPatImpl.qll 39c45b3736c4d0329af7a1eec28a8470c3f244efd58a6ba62af482a0e9b4a842 d8aa9e6f8987666cd51cb65f81700d3b4584d3dc7d070836e52a9bc64e572d9e
+lib/codeql/rust/elements/internal/ParenTypeConstructor.qll d62e656a4a3c8ffd4eb87d49585a7a3bfb5dbe3826fbcbd11cb87b46f34c19ae febf6535965afa0f6eac4d2b08730f5a07bbb36a7434abe0a7663d7264961a3f
+lib/codeql/rust/elements/internal/ParenTypeImpl.qll 6f7b4fade4ac0af69bf9766ee7d73da3da1742ba8a7c12d2a067b71c7f96d849 f065ea466111a5abca33d97b9878ef2fcc221f286fc65bec87f3a9c2fd5d57fc
 lib/codeql/rust/elements/internal/PatImpl.qll 37c9b1da7aa625117644e2cd74ec0b174f69a38cf66926add01786a05d5ad2ad 143685a0b4873fa0b73b204285dca956e59b32d527bfac6cc336326d244994b7
 lib/codeql/rust/elements/internal/PathConstructor.qll 5c6354c28faf9f28f3efee8e19bdb82773adcf4b0c1a38788b06af25bcb6bc4a 3e2aeef7b6b9cda7f7f45a6c8119c98803aa644cf6a492cf0fce318eba40fe8f
+lib/codeql/rust/elements/internal/PathExprBaseImpl.qll e8b09447ee41b4123f7d94c6b366b2602d8022c9644f1088c670c7794307ab2e 96b9b328771aaf19ba18d0591e85fcc915c0f930b2479b433de3bfdd2ea25249
 lib/codeql/rust/elements/internal/PathExprConstructor.qll cf6e0a338a8ed2d1042bdee4c2c49be5827e8c572d8c56e828db265d39e59ae3 36a3d1b7c5cc2cf527616be787b32071b9e2a6613a4f6b3f82e2a3b0e02a516f
-lib/codeql/rust/elements/internal/PathExprImpl.qll 01ad25aa940bf949056db86220362f0f5a1b03a772af6a2f6aff8854170c5e49 a0f5ff6b04e2f9f22bda78bb2a7352d890899ba16cb7f6a267af902a3650c5ed
-lib/codeql/rust/elements/internal/PathImpl.qll 67ccef5792c0d17d800b910cbda3651aaa5c0ba8daa64e1fea23a1518b562193 6a54b958f7206c43565889a273a64b95aa4b915044a986ffffe7cfb4b8f9c3a9
 lib/codeql/rust/elements/internal/PathPatConstructor.qll 966c4ea22218ef71e000d7ce8dd5b570c39ad96b9239a3aa8a38292e2a9f36d2 8a1f348e9257ffc6e6bedcd70389b8e7ec2a3ed6e7b3733744ddfab284826e57
 lib/codeql/rust/elements/internal/PathPatImpl.qll 6ab5b5959cfd94e74f60422cbdbd764a5f51ff541db428938c36ba3a512d1d6b 47585157460e8384047de307b0b05deaab758d0f07fd0183d874f7bb9d8bda4b
+lib/codeql/rust/elements/internal/PathSegmentConstructor.qll 2d9639e42035dc7e73b7d6ddb8a977beadc6b4492dee4292b2f85b4409344441 c337fc3b9ef56366428772563e3f25f711474d16e860d3e89c1395a95d9e83e7
+lib/codeql/rust/elements/internal/PathTypeConstructor.qll 8949742c7ab7fcfa3a3f6469e87355a6888931ab9ac7a6a07d2bd51e3fdf8283 fb1a402e94e9a1f33b7757338d7e95b107933339615a4fe86de33e41206dd94a
+lib/codeql/rust/elements/internal/PathTypeImpl.qll 0e3b85df054d1194505796e457ee31a8dac2a2a77284c077cbf1a3bfc179294e c198d4fdf8d1d55f1cf57685a9ad2adf88cc2d6d4f84bafa1e9f039192761399
 lib/codeql/rust/elements/internal/PrefixExprConstructor.qll 90c50b0df2d4b4cbf5e2b7d67a9d243a1af9bfff660b7a70d8b9c7859c28bca7 1a1b5ea1f06ed8d41a658c872e8e1915c241a7c799c691df81b9a7b55d8f2f1e
-lib/codeql/rust/elements/internal/PrefixExprImpl.qll f3c6a88cead13fb88f5be170123e9d5fc0819e6626602c42d38e756ef5a46213 e5cd78e6a77484e164334befd533d52e4de00c0c3b30dd2fa03f412f669cf369
+lib/codeql/rust/elements/internal/PtrTypeConstructor.qll ee3c4326ea3f198d2537a914dd6eb51d0cf247310f037e13e87632fbd6cfb50a 3814218b5271f3c6c45b52082cca2a3250a2573abced43fe53e1b4145374afe3
+lib/codeql/rust/elements/internal/PtrTypeImpl.qll ff4283ffab39b4a3c0e55e7d655dfdb846171cde0907bf1f893c86b35d2c1135 e54d3a6fb0b5a1484f00fd5a4631455902bab80642c3bb076e538ddcc29a85a4
 lib/codeql/rust/elements/internal/RangeExprConstructor.qll a0aa90a1c38c5deea56475399016afae2a00a858b961fbbab8ddeb3bc6a08103 0ddf1bcf28aafc56d7334e6138fb268f9b36a429e4cbdd982cd8384e0644076b
 lib/codeql/rust/elements/internal/RangeExprImpl.qll a6ff92a27e44c2184f5c2d8483de1d0d4a77eb7a5154ff93a8f3a9fc8b63e561 d53d44bc1c1ae426f208595002adcddb88643e1027bbee7445095ca09e433331
 lib/codeql/rust/elements/internal/RangePatConstructor.qll fe4345cb41d970ab64196ca37eccb26e5b9cf85fab4253cacfd2b31de03bd070 1d09d5ec8203d76aed2dfb7e7f14c0c07d6559c8f589e11860fff8a2c682c1a6
@@ -170,233 +343,816 @@ lib/codeql/rust/elements/internal/RangePatImpl.qll ef11ab2c002896036553231741a7c
 lib/codeql/rust/elements/internal/RecordExprConstructor.qll 742198bd8223902b5625b4a574a9e3539a8b6cf8e48eecc57cc2de4e980fba6e 0a99e454e234e8b7b59dc11b167172a5fcd31b8a5282349956d6fd861ec735df
 lib/codeql/rust/elements/internal/RecordExprFieldConstructor.qll 11620bc4e2dc7b3903be764cd9510a8e002892722b502876cf3467994aa7a63c e42e50747dd9453a44705b2d6a05e7a4a8c6debed988a0335a774a547d8f7157
 lib/codeql/rust/elements/internal/RecordExprFieldImpl.qll 8af196cbaeeb7997e933fde9ddba50ec099df51f66e03501f00157f238505fe7 29ae10546577a354b0439876ce5deb5ab13455028f02c01fe3903b11eaee35e2
+lib/codeql/rust/elements/internal/RecordExprFieldListConstructor.qll 3a0d6ec872792c400d3a0a5ed1c5051b248a597a4b17ada1a078ea5d972b6721 52bae8222e7aa5bc89b73bec3fd1c3c1de0fe11bf30ccf5668454f63fbfc9b83
+lib/codeql/rust/elements/internal/RecordExprFieldListImpl.qll 1210c23c0495f5d1a72409afc8c559f8da2b8c71340ff2944af9d1f684d0a856 fea96b053cad4135ab09b1c070a4c9f26507dd890a62c30772cf3e2358686640
 lib/codeql/rust/elements/internal/RecordExprImpl.qll 233b3f7ee8dbd1e5431bea5436c6b7ee38e631c041111dcf53e45c6c4c08a6cf 9537497edb739c535d75ce80122f597ad93241bff5399b1dae17a7bfff1c15cd
+lib/codeql/rust/elements/internal/RecordFieldConstructor.qll 9fc05f5101e48a45a028c479b35ec3d2f1a3cc33f0938667fcb813c5a4ab9526 98791dcf7f3209524f6132f9c26980e499cbcf94c1559e95c67544732245f05b
+lib/codeql/rust/elements/internal/RecordFieldImpl.qll 2612dae3c95c9064420a3494872213f7fd7a3e1133243f4adea8a30808a209ae 143b75bb539a1bfea16e1c764a1f549522ef9c8d6d5de3fef377bbf67ba42075
+lib/codeql/rust/elements/internal/RecordFieldListConstructor.qll 9f1d916f3784092dcbff7224451c8f4f0daf6f8293a466b0a30ec9b92cd41358 8aafe377714a134287362c4b96439c1c6baa5a31c2c36a544bd5f73e9213477a
+lib/codeql/rust/elements/internal/RecordFieldListImpl.qll 1fa89578a1e27a7d6dd84c1cabbff08b38a3160ea0864c7be660984cf96fda1e 9fa6a775f0609f557548168424f02d068abb3978ba20a716c21619e904bd99f3
 lib/codeql/rust/elements/internal/RecordPatConstructor.qll a5507e0db7cb297c74faa9d571e613799d7b3327584e4696d1d5c219d1ea84ba aa5c8042a88e99dca09a6ea7775bd6963825a3c2dd5d61f118dbbc57a336c4a1
 lib/codeql/rust/elements/internal/RecordPatFieldConstructor.qll 6e1880ed05401b39c1e5e1a4eedb0a8a18c857aeb79c44c812cdc879eb3af1f4 1f7a5a2d4df22f7d7479fe348665d8a1411de47f8cc5b95b30ba4c3490ed8f61
 lib/codeql/rust/elements/internal/RecordPatFieldImpl.qll 04bc31b857c8250096d9d1bf3fad1e556a28d83bb3f3b48a3f049048d1e6785f 5853105e55650d05a4b196f17b89baf12b898df0a010e4f88289ce01d16a0379
+lib/codeql/rust/elements/internal/RecordPatFieldListConstructor.qll b8f0ef9b75ffe6be6ce7e601d528f0a1b871123c63e39cead3fd13b8bd4f54b7 166f07c708ab8b3de6bfaf193bac93081b2aacad046aa86de7441085dd20a8c5
+lib/codeql/rust/elements/internal/RecordPatFieldListImpl.qll 2d1dd9910480eb65c59fcef2e1576ce639be85c35d90e4bce721ce22ec742ba3 1e788a2d7d00e9f96dbf7e93d3a18d5bfb4d7749194ff8e9810e9053fa88a94b
 lib/codeql/rust/elements/internal/RecordPatImpl.qll 3c7086be84e336c069f4c7b538c7ad32a7728e7fbf42e4dc7f04c4c99d393c0d 8020215f38639965398c62ddb36c3560579d63928e71e0d773b254e121a68cc3
 lib/codeql/rust/elements/internal/RefExprConstructor.qll 9ad08c0f3d980a56a2af8857cb84db589941d20ab3ae5c8ece004ccaccaaf950 4cac3ace31b7ed77a72e989fce9cdbae2247f03c28a3f0c50d67385d02c7f193
 lib/codeql/rust/elements/internal/RefExprImpl.qll 56ed831a3b30ed375e7369b0a60b9b7635a1b00f058364a6b15078031a85af5f ca7e772b409514363e49d56a174ae9bd2e076755cbd09c4e7e5b732d09acdb25
 lib/codeql/rust/elements/internal/RefPatConstructor.qll d8b88c2c468b08072f6f853306eb61eb88ee1e6c5cfb63958f115a64a9715bb3 0c1d6a8af6a66912698acce47e89d4e3239e67f89c228a36a141f9c685c36394
 lib/codeql/rust/elements/internal/RefPatImpl.qll 3e06e8130d412b47267497097cffc9f4b930b9e54bc90465ab5ac620fbe52048 b8ac844ec99f30605ce476f89ced4fb1159d2df0df43c631f60b3c868e0e1fd7
-lib/codeql/rust/elements/internal/RepeatExprConstructor.qll 97cf95354fe6cf6f7e6a35c2eac3c260608e0480cc938bf982af09ba3e5f79f1 0d0fa66e78a381bca61d798b79928a055cf28a1d6c5931b70db2e8c71e496b95
-lib/codeql/rust/elements/internal/RepeatExprImpl.qll cbd1676aa99eea9651d407f4258cd9e8e6eb36ad5d172f67daf8b99a4f1cc30a 014335a50db03750ff599cdbe8d44a9a262ad9207d0539a544a80d1d61a46207
+lib/codeql/rust/elements/internal/RefTypeConstructor.qll e1952aa69586b440f878400a52d09b2d12d5a29dbe9651360344631cb9493cd4 e4ae45e89472dfd4547d647c75e1635cf065a7d221ed60ed34554f265c0c5405
+lib/codeql/rust/elements/internal/RefTypeImpl.qll f72b760a8a26be21170435da2cb2981638513617fd82742f45f38bc437d9f2c4 f32df49f0b6df85ca5fc4393ccd341ac4304b4947a282ccea48468a26837ef3d
+lib/codeql/rust/elements/internal/RenameConstructor.qll 65fa2e938978d154701e6cac05b56320b176ee014ef5c20a7b66f3e94fd5c4a7 dfc0ff4606b8e1c14003cc93a0811f4d62ec993b07ff3c1aa0776746577ed103
+lib/codeql/rust/elements/internal/RenameImpl.qll 4f5943fbda4ec772203e651ed4b7dd1fb072219ddc0cb208c0a0951af5e72bd6 b9854cdcf02e70ee372330a4e0bfdb03012bc81af79dd12af2a567fd7fc4672b
+lib/codeql/rust/elements/internal/ResolvableImpl.qll 7599625454fe81c3490a122943363a2a2522a7877b78a80649e93155a418fedd 442072c3d70bdaababd7de8bc6c9382f4a50bab41d13759dcd1a5bee9ea32e49
+lib/codeql/rust/elements/internal/RestPatConstructor.qll 45430925ddf08fba70ede44c7f413ddb41b3113c149b7efc276e0c2bf72507b4 25c678898d72446e7a975bb8b7f2fde51e55b59dbd42f2cca997c833b1a995f1
+lib/codeql/rust/elements/internal/RestPatImpl.qll 1b83464367e5fdc28b0b3946ae74c67c64d30b286c39268b4118337539250e51 83a03308cba4cb3344d48f0a0730b1d3e41a73f16f729d39dc2bae6d3f57f232
+lib/codeql/rust/elements/internal/RetTypeConstructor.qll a96d803c6e4b40be49cfed0853a3e04ae917c47351e5c880fcab06eddf1af9cc d06a0a191cb14c270c0441ffc3d289263808170dcbe05e01847a35ac9d61dfb3
+lib/codeql/rust/elements/internal/RetTypeImpl.qll 0e96f1075ccade28ce5664ab0f5c2e98984ae1d0ed708bc02e40e882672d9e2f 350725d16bcb1e8911bfdd87d9dd21be73ec66d23c2a35827c8c8525c48dc885
 lib/codeql/rust/elements/internal/ReturnExprConstructor.qll 57be5afbe20aa8db6e63c1f2871914c19c186730ad7dccaa424038c6305730d5 4d3c4f2e9b38a4b54ff26a0032455cdcca3d35fec201b6c932072a9e31fbb4fe
 lib/codeql/rust/elements/internal/ReturnExprImpl.qll eef4960a8c27eaa0540d048fe88893cfe9a6ac377a770cc23d72ebe05d5782f1 b7f35650d80f2f8b4893f0091fea74646341af406b6248f75c477112aca96dea
+lib/codeql/rust/elements/internal/ReturnTypeSyntaxConstructor.qll 8994672e504d1674e5773157d0ad8a0dc3aad3d64ef295e7722e647e78e36c11 abe7df754721f4ff7f3e3bb22d275976b2e9a1ef51436a461fe52ebd2d29cff1
+lib/codeql/rust/elements/internal/ReturnTypeSyntaxImpl.qll d47a3dcfcc2b02a6a9eaeefe9a7a4be2074ecd2019da129dda0f218bc3fbd94b 87198db7c0620ed49369da160f09287015e0cd1718784e1ba28ec3ec5a0bb4a8
+lib/codeql/rust/elements/internal/SelfParamConstructor.qll a63af1d1ccde6013c09e0397f1247f5ab3efd97f3410dd1b6c15e1fb6cd96e54 0d8977653c074d5010c78144327f8b6c4da07f09d21e5cc3342082cd50107a81
+lib/codeql/rust/elements/internal/SelfParamImpl.qll 5408738c40f070e0cea83a6a38d638ac7a134b5a055ecf0cccc035af58ff9b36 604922319ecf9a9405fdd0fe953169162ee2c8cca36349b49163a2895c53ed40
 lib/codeql/rust/elements/internal/SlicePatConstructor.qll 19216ec9e87ca98784d78b29b8b06ea9ac428e2faa468f0717d1c0d0a8e7351c 458e5be76aa51aec579566be39486525ec9d4c73d248cb228da74892e2a56c08
 lib/codeql/rust/elements/internal/SlicePatImpl.qll c6176095360e3b23382557242d2d3ff0b5e0f01f8b1c438452518e9c36ff3c70 644ab41a59a619947f69f75e2d0807245d4ddefc247efaeab63b99b4f08c1cc1
+lib/codeql/rust/elements/internal/SliceTypeConstructor.qll 643e7a2ae261e8f62de8bc2886efddcc096e0c7e8159c0b9e87b24d0509e10d0 719545abb0ccf6e8a203ec9c9f75109c5ab0593c838e2f90e388858680ec62f7
+lib/codeql/rust/elements/internal/SliceTypeImpl.qll a753aa9823b0288d3e8085faedb3a6bb750e98845a11a28b69796aa453c09c8e 343f5d4638b52e6eb0082000e1b147fe36173dcbfc035263819480b430c55127
+lib/codeql/rust/elements/internal/SourceFileConstructor.qll 1dc559887ea7798774528b5505c8601c61030c17480f7ffca49b68b76fcc0321 75a635b88622e3110b16795bd12ca6fc4af176c92d6e441518d60aa47255edc1
+lib/codeql/rust/elements/internal/SourceFileImpl.qll 0f844062989b363045f16488297f617d592cd90762befb7403f246d0b94a29c2 f38cabe8c34049f4454136bf7281aaef92d411dc41e686856b2058298b6cebc0
+lib/codeql/rust/elements/internal/StaticConstructor.qll 6dd7ee3fd16466c407de35b439074b56341fc97a9c36846b725c2eb43fd4a643 5bf5b0e78d0e9eb294a57b91075de6e4b86a9e6335f546c83ec11ab4c51e5679
+lib/codeql/rust/elements/internal/StaticImpl.qll 91b9b9d360c431f13cfa8761cfb1717c5eb7bceb6ccba3ccc8a7eef0a3606f80 21f508efb26d944c2883db954e766f4acf9033cea69c9ca9e418492fa4630f13
 lib/codeql/rust/elements/internal/StmtImpl.qll ea99d261f32592ff368cc3a1960864989897c92944f1675549e0753964cb562f 9117b4cdfad56f8fa3bc5d921c2146b4ff0658e8914ac51bf48eb3e68599dd6b
+lib/codeql/rust/elements/internal/StmtListConstructor.qll 435d59019e17a6279110a23d3d5dfbc1d1e16fc358a93a1d688484d22a754866 23fcb60a5cbb66174e459bc10bd7c28ed532fd1ab46f10b9f0c8a6291d3e343f
+lib/codeql/rust/elements/internal/StmtListImpl.qll fc16097d08124bcc39c998b07023710e0152baed165fb134cac2ee27e22a9f7a a4eceb42720593d8d0ce031016465de0bb61d40f31b2cc2718626ef8348ac900
+lib/codeql/rust/elements/internal/StructConstructor.qll 52921ea6e70421fd08884dc061d0c2dfbbb8dd83d98f1f3c70572cfe57b2a173 dcb3ea8e45ee875525c645fe5d08e6db9013b86bd351c77df4590d0c1439ab9f
+lib/codeql/rust/elements/internal/StructImpl.qll 7e3b58c3038ad7a3315cae34a34f99380e36d33cf3fb4437de6f6dcfed2ad579 1cfcb3bb5381349a2a4074a9e53927f5c540f2b251b187ad28da300968dfc649
+lib/codeql/rust/elements/internal/TokenImpl.qll 87629ffee74cacc6e8af5e96e18e62fb0fa4043d3ba1e7360daa880e628f8530 d54e213e39ae2b9bb92ab377dc72d72ba5bca88b72d29032507cdcbef201a215
+lib/codeql/rust/elements/internal/TokenTreeConstructor.qll 0be1f838b04ff944560aa477cbe4ab1ad0b3f4ae982de84773faac5902fcae45 254b387adc2e1e3c355651ab958785d0b8babbc0030194234698a1219e9497b3
+lib/codeql/rust/elements/internal/TokenTreeImpl.qll c61574f2b551db24640258117e0c8653196ba91392ce81da71a3a528ee07b1ad 489a1c8f550725e28871ae99c41d03b719c3099b8f73ae7422f497430f616267
+lib/codeql/rust/elements/internal/TraitAliasConstructor.qll d2f159cac53b9d65ec8176b8c8ccb944541cd35c64f0d1ceabb32cd975c000bf 6564981793de762af2775cc729e25054ea788648509d151cbfdbdf99fc9ed364
+lib/codeql/rust/elements/internal/TraitAliasImpl.qll f338dba5388973ec0c5928d4c60664737f75a93d0c7db5fb34053bc41c107641 f2e437469e4ba1d8dd321bc670978e7eed76508e728d1e08e52ddcf52a461d3a
+lib/codeql/rust/elements/internal/TraitConstructor.qll 1f790e63c32f1a22ae1b039ca585b5fe6ffef6339c1e2bf8bca108febb433035 535cebd676001bfbbb724d8006fa2da94e585951b8fd54c7dc092732214615b5
+lib/codeql/rust/elements/internal/TraitImpl.qll 776a0c10c944146b89d616e3bf1311502de9e1e84f0c9d5d7de5aecfc97b87e3 3795d920e98620b30f7e2c218cfb57ae91b37956f9165325b5da6705df8beffa
+lib/codeql/rust/elements/internal/TryExprConstructor.qll 98e3077ebc4d76f687488b344f532b698512af215b66f0a74b5cea8ed180836c b95603c10c262911eeffdf4ccba14849e8443916b360e287963d5f2582d8e434
+lib/codeql/rust/elements/internal/TryExprImpl.qll 00635685db339557cfb89fad0bfc134e53efc6d88c68cce400b72c2dd428ef9f 43559b46e45c009f985b58896b542881b81a3e6b82a6f51b784e8a712ae3da2b
 lib/codeql/rust/elements/internal/TupleExprConstructor.qll 71c38786723225d3d90399b8a085b2b2664c62256654db9e1288fadd56745b9d 639ad70b49ebadc027127fbdc9de14e5180169a4285908233bc38ccac6f14110
 lib/codeql/rust/elements/internal/TupleExprImpl.qll 23a0e4367fbcfcec3e2cf4a429f329a222b399c6729dd60f7ea42550273a6132 615f3b4897fdcbfddcf5c58e6edd64bf6e395923af89cc4e2a336099168bb6ad
+lib/codeql/rust/elements/internal/TupleFieldConstructor.qll 89d3cf2540235044ed5a89706cfbdebc5cdf9180fd5b6d3376c79a1b2c0430c0 16861fe089aac8e42a5a90d81dd48d5015391d0a06c78ca02bd876d65378699f
+lib/codeql/rust/elements/internal/TupleFieldImpl.qll f86d5df1598b9276bf2d6cb21a1daec8b27cef7a98db2b2ce91e4e0f9b3870ec b6db10ba5f6351bc1874daf47047ba74ada8b0011f355a44b6d529a1e9003657
+lib/codeql/rust/elements/internal/TupleFieldListConstructor.qll 4335ba2061b6e4968db9ec05c0b4d3e6a564db89a2df69e036f317672a7900b1 0b8dded875dbf696cf588e8c21acc27332a2ff66ced7bfabdfc1ad621991f888
+lib/codeql/rust/elements/internal/TupleFieldListImpl.qll ec17ddfe1d03210b7737f9c96b9d4003a91e504f3174e4b0eeba8a429eda2d6e ef6fb91c0d6b14b4d6bea6e516d5425d51d490956075ef314c72da59bfff5621
 lib/codeql/rust/elements/internal/TuplePatConstructor.qll 2a5e83ad5b8713a732e610128aeddf14e9b344402d6cf30ff0b43aa39e838418 6d467f7141307523994f03ed7b8e8b1a5bcf860963c9934b90e54582ea38096a
 lib/codeql/rust/elements/internal/TuplePatImpl.qll 4adb38f0f8dae4ff285b9f5843efb92af419719a7549e0ff62dc56969bd3c852 3f622130771d7731ed053175a83b289bab1d1f5931526c4854923dbcec7e43f1
 lib/codeql/rust/elements/internal/TupleStructPatConstructor.qll 9d68f67a17a5cec0e78907a53eccfa7696be5b0571da4b486c8184274e56344a 3ffa29f546cd6c644be4fecc7415477a3a4dc00d69b8764be9119abe4c6d8b9e
 lib/codeql/rust/elements/internal/TupleStructPatImpl.qll 896f001d82938bd018516a2b59ba5ad76350edb6b9747ed2ef5b96760aa16388 0552f9c0361d14be9896cbcfda17d8884d03a82c4f23c511a8de77fe71cfbb9f
-lib/codeql/rust/elements/internal/TypeRefConstructor.qll 2b7bfb8787c2ba2ca4bbf38b81c311f878d870e121ffab31dda03d51a931b310 096f90ee71c6e04c54f2fc07c4c80a5dcde39e6126330ca8f17d18c9f90c32a8
+lib/codeql/rust/elements/internal/TupleTypeConstructor.qll 88eaec829cd4dcc6a152c7a335b1d365702ef410e46d9c04806fe53f06325b23 044fd0aca067bae82eb8ac448b7bcc66bc736e7e0ab8b770ee126381888fac3d
+lib/codeql/rust/elements/internal/TupleTypeImpl.qll 4d570a1d6c3d69d8f62f125c71f67dd90e982801905716d50292f2e652156948 1dcefae60448b21f85d46d252e314d67a9f2a90171e56351e08e2bc0a4077fb8
+lib/codeql/rust/elements/internal/TypeAliasConstructor.qll 048caa79eb7d400971e3e6d7e580867cbee4bd6b9d291aafac423aa96c321e76 d1d1e33a789ae6fa1a96af4d23d6376b9d82e14e3cbb777963e2d2cb8b22f66d
+lib/codeql/rust/elements/internal/TypeAliasImpl.qll 43af0e8e3df8bca5b4bd48ad870cb619283710ec5b86085d85874a67cac3cb6e 75f1f8ba2bd722d55a84178cf338d34f7c57a156f8cc014bd2b29ee4da5ea9e2
+lib/codeql/rust/elements/internal/TypeArgConstructor.qll 51d621e170fdf5f91497f8cc8c1764ce8a59fde5a2b9ecfad17ce826a96c56c4 a5bbb329bde456a40ffa84a325a4be1271dbde842c1573d1beb7056c8fb0f681
+lib/codeql/rust/elements/internal/TypeArgImpl.qll c2b4aa45fb33c0e19e79584ec4245f9f1c19b4ec49ba7e7b03ea04a8a2be8c11 6b0be233709d67e1928bb519dd4492a7278d075289cae76a856182d56691f018
+lib/codeql/rust/elements/internal/TypeBoundConstructor.qll ba99616e65cf2811187016ff23e5b0005cfd0f1123622e908ff8b560aaa5847f fde78432b55b31cf68a3acb7093256217df37539f942c4441d1b1e7bf9271d89
+lib/codeql/rust/elements/internal/TypeBoundImpl.qll 4d6763884968be0dee85cd1a6a18e1406178a3cf3bc905be2813cf4953b428ac 1e2dd309a9153ab60962b2584b9a2f16b68a75bd7168815642dcadf480da292e
+lib/codeql/rust/elements/internal/TypeBoundListConstructor.qll 4b634b3a4ca8909ce8c0d172d9258168c5271435474089902456c2e3e47ae1c5 3af74623ced55b3263c096810a685517d36b75229431b81f3bb8101294940025
+lib/codeql/rust/elements/internal/TypeBoundListImpl.qll 23557f993a1de15a3b08652f53fd99dea8b3af4b8a65d7331e99f50735a7942c 8d91dbad037268ec37907ef6c2b0e927f648551afb57f706ed4d79d6aad5f5d6
+lib/codeql/rust/elements/internal/TypeParamConstructor.qll a6e57cccd6b54fa68742d7b8ce70678a79ac133ea8c1bfa89d60b5f74ad07e05 0e5f45d250d736aaf40387be22e55288543bdb55bbb20ecb43f2f056e8be8b09
+lib/codeql/rust/elements/internal/TypeParamImpl.qll 9e7169e8254e2d9d13b11a17cbe04e874f72fb67a75c3585e70eddec71ba5c7f b8c862b2cd53bc211caea23261d9832613418aae51f63ef08922d300c2d1f4f2
 lib/codeql/rust/elements/internal/TypeRefImpl.qll cfc08bdcc8e7e588f533c7e64c0c08d317d63cdb50f4cba4b4b3e589b37b0fea b46ee7de9b5e9894807004e1bedf39e7d25912ed79de6ac5adfb37a43aa4804b
 lib/codeql/rust/elements/internal/UnderscoreExprConstructor.qll 8dc27831adb49c1a47b9f8997d6065e82b4e48e41e3c35bd8d35255cea459905 6c5a5272d37f83f1c1b17475f8adb7d867e95025d201320e20a32dab1f69f7bf
 lib/codeql/rust/elements/internal/UnderscoreExprImpl.qll 4277b23a09a4ba5e53ca2cfbb20eba6a5f66039b6268da79410e0be30332fedd b9ed79468157a7e751f78aa7597165672cbc38191d5f85ecc15cfdaff388a26a
 lib/codeql/rust/elements/internal/UnextractedImpl.qll 5c23df7e448184d76ccab2c22757ace24663b8be2592a3fa2a44bef43159ebd3 77b0c9fe75a307adc08c422cc88423c5349756878793cf9e79c006c83b4c403b
-lib/codeql/rust/elements/internal/UnimplementedDeclarationConstructor.qll d6ccf867e9bb7c511ea77c0c2ef50b6a86fcbcf69d5e28952b46dd97ffaa4bc7 7cb2eb038b1da65e3a359f289583af9ac8ad366baf39b7977ff478b8e5232666
-lib/codeql/rust/elements/internal/UnimplementedDeclarationImpl.qll 2733841a03619458fdfff1aac11c93c82de712c95243b4f9d64b72ad219651eb 2a087037edf3da2b1f8a3942d9c3093e3710d0f8644215bd13a54ec3d3793e58
+lib/codeql/rust/elements/internal/UnimplementedConstructor.qll 70b0489fdc75fed389de8203947ed9c8eabb91373a1264eb2c8018ddbb2d9baa 0f2592c1697a2f2f913014ecd73b0e3ff1ec5b038ba1c3a22e7939bf8759e664
 lib/codeql/rust/elements/internal/UnimplementedImpl.qll 06771abc088e0a8fc24032c9d2633618e8e40343ef8757a68cc0a70f1617165a 5738f626f1f4f573fdf7dcd5bd57a0948d290ed89342b9160e95ef3c84044f9a
-lib/codeql/rust/elements/internal/UnsafeBlockExprConstructor.qll 1924127ed4b9f64812752b5f57c1e967f740fe252a7ed9cad492bddd3a2a7e25 a54065b28a58f46587e842f59320222e5477ee086c4df909062b60ccf57d01bb
-lib/codeql/rust/elements/internal/UnsafeBlockExprImpl.qll 5aca62cc87f2ff4f05cdd7b4810d9e42446e38912fcc5fd47e54f814d6b8ed9b 491010bffa0cabc1d7aceb7ba3050adaa98ae69a36f0c8d35f10c03ebb35a8b6
+lib/codeql/rust/elements/internal/UnionConstructor.qll d650551a1b3ef29c5a770bdad626269cf539ed0c675af954bc847d2c6111f3f6 aca9064ad653a126ab4f03703e96b274587c852dc5e7ff3fea0fec4d45993f10
+lib/codeql/rust/elements/internal/UnionImpl.qll f1765a7a37fb29eff98d67d166c35df4921eafc8cb61c11c7848185535f0497b 9f041f6ee82bd3cda2ddea0ee58d7a996123b1713b9d127f764eb74a9387f685
+lib/codeql/rust/elements/internal/UseConstructor.qll a4f790795e18abc29a50d6fbaa0db64cba781e3259a42cbf0468c24ac66b63e7 2fa288f073ac094a838c11f091def2c790b347b6a1b79407c11b10c73d6bff57
+lib/codeql/rust/elements/internal/UseImpl.qll ba779517c3c928ab6e794360b6344829e84ec6da5e1de1b03b4eaf8bdae58ce9 0f4ead9eecb584eb9827502276ffe8cb1da0d2fa4b8f660d2afc26ac4e0fba86
+lib/codeql/rust/elements/internal/UseTreeConstructor.qll 3e6e834100fcc7249f8a20f8bd9debe09b705fcf5a0e655537e71ac1c6f7956b cdbc84b8f1b009be1e4a7aaba7f5237823cea62c86b38f1794aad97e3dfcf64b
+lib/codeql/rust/elements/internal/UseTreeImpl.qll 25e286538c048cc7ee07f4b5a8b77bc8b5a215fb206f4ab20163bd81dec0b90f fe44969d441c0c34bea1b0c25cdf35f25ea667c6e2da9ea067d230f484492715
+lib/codeql/rust/elements/internal/UseTreeListConstructor.qll 973577da5d7b58eb245f108bd1ae2fecc5645f2795421dedf7687b067a233003 f41e5e3ffcb2a387e5c37f56c0b271e8dc20428b6ff4c63e1ee42fcfa4e67d0a
+lib/codeql/rust/elements/internal/UseTreeListImpl.qll 6cac5242f1219df0fe9b3c139db8cc075a2fde618614ca56de2c856130a8ebaa d2ec917055a45f4d07d4ea6dff14298925ae323b165a5bcb6e906f7aad463f82
+lib/codeql/rust/elements/internal/VariantConstructor.qll 0297d4a9a9b32448d6d6063d308c8d0e7a067d028b9ec97de10a1d659ee2cfdd 6a4bee28b340e97d06b262120fd39ab21717233a5bcc142ba542cb1b456eb952
+lib/codeql/rust/elements/internal/VariantImpl.qll f5204121f15407ffc0926128239f317cbb9277ee456217940c15d48ba80abd49 4de0a8895d9c08f86fa139007ed009a3a5e1101b9edb40c73c58a4059c318802
+lib/codeql/rust/elements/internal/VariantListConstructor.qll c841fb345eb46ea3978a0ed7a689f8955efc9178044b140b74d98a6bcd0c926a c9e52d112abdba2b60013fa01a944c8770766bf7368f9878e6b13daaa4eed446
+lib/codeql/rust/elements/internal/VariantListImpl.qll 858f3668f53d8b6aacb2715a59509969fe9fd24c5a2ff0b5ceed8a2441cd9cf7 f2a57b6232247687f529be8e4d2d3d0d4d108221d8a6eb45a69a1bcc0cdc51de
+lib/codeql/rust/elements/internal/VisibilityConstructor.qll 1fd30663d87945f08d15cfaca54f586a658f26b7a98ea45ac73a35d36d4f65d0 6ddaf11742cc8fbbe03af2aa578394041ae077911e62d2fa6c885ae0543ba53a
+lib/codeql/rust/elements/internal/VisibilityImpl.qll 767cf2421d615be1cf93b60b6887e3ede0b6932e13d87a547eb513d7da497454 2bd064c1210dec0c22bd96ee348c76e2f0a515ba4450b22f085f256010579491
+lib/codeql/rust/elements/internal/WhereClauseConstructor.qll 6d6f0f0376cf45fac37ea0c7c4345d08718d2a3d6d913e591de1de9e640317c9 ff690f3d4391e5f1fae6e9014365810105e8befe9d6b52a82625994319af9ffd
+lib/codeql/rust/elements/internal/WhereClauseImpl.qll 59d33533e641ce3851e493de3053acb5e21ece8d2a82b7b14fc01f83b82485ad a68a79ad4cdccc62145d0f5fffaf9a096391843589d0d1d27983facefce380d9
+lib/codeql/rust/elements/internal/WherePredConstructor.qll f331c37085792a01159e8c218e9ef827e80e99b7c3d5978b6489808f05bd11f8 179cad3e4c5aaaf27755891694ef3569322fcf34c5290e6af49e5b5e3f8aa732
+lib/codeql/rust/elements/internal/WherePredImpl.qll aad95f448ca051d5dcd462429fa1ca95dcec6df2e70b6f64a480bd6839307581 411a66a5d866aa8cb4911c5106849adb103a063e1b90a9ecc5d16db3022bb1f8
+lib/codeql/rust/elements/internal/WhileExprConstructor.qll 01eb17d834584b3cba0098d367324d137aacfc60860752d9053ec414180897e7 e5e0999fb48a48ba9b3e09f87d8f44f43cc3d8a276059d9f67e7714a1852b8a5
+lib/codeql/rust/elements/internal/WhileExprImpl.qll 5e716498402be3a1a8ed3594e13a03938bb793ac80f2a648bc93c0d746028d8b efcee38fe5e984a690c33f8bfdc78c677c2b0cdc5902525e2196a68fdabb6823
 lib/codeql/rust/elements/internal/WildcardPatConstructor.qll 5980c4e5724f88a8cb91365fc2b65a72a47183d01a37f3ff11dcd2021e612dd9 c015e94953e02dc405f8cdc1f24f7cae6b7c1134d69878e99c6858143fc7ab34
 lib/codeql/rust/elements/internal/WildcardPatImpl.qll 01e5fac111cce3bb139fc290dbdb2a80e7369a90952178228efeb025915d40b7 875e91fb1354ab8d94d5fa426b63714c70904f53d7bab15158fcbc290c62a0f1
 lib/codeql/rust/elements/internal/YeetExprConstructor.qll 7763e1717d3672156587250a093dd21680ad88c8224a815b472e1c9bba18f976 70dd1fd50824902362554c8c6075468060d0abbe3b3335957be335057512a417
 lib/codeql/rust/elements/internal/YeetExprImpl.qll e8924147c3ebe0c32d04c5b33edfd82ae965c32479acfd4429eeab525cf42efb b2debcfa42df901f254c58705a5009825ec153464c9ab4b323aa439e5924e59e
 lib/codeql/rust/elements/internal/YieldExprConstructor.qll 8cbfa6405acb151ee31ccc7c89336948a597d783e8890e5c3e53853850871712 966f685eb6b9063bc359213323d3ff760b536158ecd17608e7618a3e9adf475f
 lib/codeql/rust/elements/internal/YieldExprImpl.qll af184649a348ddd0be16dee9daae307240bf123ace09243950342e9d71ededd9 17df90f67dd51623e8a5715b344ccd8740c8fc415af092469f801b99caacb70d
-lib/codeql/rust/elements/internal/generated/ArrayExpr.qll 9fcf883630660af971a64391a941d8ad2da12f3b0768e954ba66ecad7db15f35 9fdfc1ad83bb69af59346287c374cf2ac5b8b37dfe8a389762fe25df50b89eaa
-lib/codeql/rust/elements/internal/generated/AsmExpr.qll bf43708d57ee66a5bdac6e04bd17c7432a4f4ab62fd9bcfe448f6e23ab31c8f2 17c50e0b3c420f8c25b5474d714aa9e01a2fe8914cc70b6e806f4f71adfd292b
+lib/codeql/rust/elements/internal/generated/Abi.qll 87e1ea6b2a8ebf60e1c69176632740e4e27fc56c3f173939b098ba376562b5fa 94b2121e71c4ec94d53a79f972c05a8484ef0d80ed638f53031e7cf4dc5343d5
+lib/codeql/rust/elements/internal/generated/ArgList.qll 1b75b2d7dcf524eb468a0268af6293e9d17832d6bedf3feec49a535824339b57 2bcaf464454bdfdda45fbd24d063f0f1df0eb69f684197b37105adc8f72cd1ea
+lib/codeql/rust/elements/internal/generated/ArrayExpr.qll 2ca97b602a707fe2c566002d8709792bb166ae52fdb7da28d7c4b8e0d66dd4bc 1cae1ef017171ec9a1ca28b4f2993b1ee26d22b51b3b04816d9b4e89fdff1fb3
+lib/codeql/rust/elements/internal/generated/ArrayType.qll 225ac477f67865d72b2a2e17420f5e52c25452a3c14f7ff367f873a859f97783 0030e3bf296dd5b69ea912fc85dc7120b060780033083127257cdca792dc3f4b
+lib/codeql/rust/elements/internal/generated/AsmExpr.qll b5fef59589c02c17857a4a7f5c7b5efb747a1e98710167efa5c2e88cffd7bcbb b43b297a3b4894e8dd92ef3a23b76f2684c303d41e6030398e69b7754ebea9cd
+lib/codeql/rust/elements/internal/generated/AssocItem.qll aa7c06e001b67e4a59476fa7299e09f8da16c93f91aff0ec9812c64386e7c023 0032b45e34e6aba9c4b3d319b108efa0de8ad679b5f254a1ec7c606877ff5e95
+lib/codeql/rust/elements/internal/generated/AssocItemList.qll c53d95395352bb3568198fd18da62e23511c64f19b5aaae4122bd696d402ebf5 3c244f2f0f053903576cdf2b1a15874dee0371caf9fecb5353aceab3c403f532
+lib/codeql/rust/elements/internal/generated/AssocTypeArg.qll 2a5bff8856c2c87f571629236218d23a7eb10fcc8e8e03f4f6957707972a96f8 1ceb581c640a9b0e9540655aebe7280101f33a6a8ff09d81f7d94ebb4d85c480
 lib/codeql/rust/elements/internal/generated/AstNode.qll 1cbfae6a732a1de54b56669ee69d875b0e1d15e58d9aa621df9337c59db5619d 37e16a0c70ae69c5dc1b6df241b9acca96a6326d6cca15456699c44a81c93666
-lib/codeql/rust/elements/internal/generated/AsyncBlockExpr.qll 3ecb467cd64e55f74c129f4ec28af69cc048694cd2dfc58c865a8547aef5b984 7c641b46a2f5bd163f1636323cf72d9b24ccfac37d94d2f604d27420d3902f3d
-lib/codeql/rust/elements/internal/generated/AwaitExpr.qll 7ad72c0258b919857f134895b403beb2395bc8babb0006b39d65d45aff586133 4f7e63e78150395a7c78bdee86f387779a2cba4c6130a539b8d8083c1f166780
-lib/codeql/rust/elements/internal/generated/BecomeExpr.qll 6a65500651fed3d37db5d7e776e3ff57eeb0a6d518750d6a6f7d150ae396f545 9aa9b01b8aa6dc7a4372b88b44aaaf98ada752fc3f9cfdfff8ab6c36bde1241e
-lib/codeql/rust/elements/internal/generated/BinaryExpr.qll 977ef302e1c2674a0431c8e90e5e052e01c8ee91d7a0181bf680cbcb2827c718 d0382bf0368007af038ba12616dc5826aae1b1a63eaa0bcd76060e57a64790b8
-lib/codeql/rust/elements/internal/generated/BlockExpr.qll 491b593ac52c76222b0fba9a292da412a1202308187ad984a655faaad3fc0831 dc912bd4158c9dba165d0c5da0e511ab341a8ad8de17d48490780a8767384869
-lib/codeql/rust/elements/internal/generated/BlockExprBase.qll a8597d47d855fdba22b621e23bee1419d5b09ca5488d479f7fe717f95531e613 d87c6f5c27f9cd25185208db28d9b68ad3c520936a810c01e65207c02dfe381a
-lib/codeql/rust/elements/internal/generated/BoxExpr.qll 74e17134130b78b16d178194703a057ec4827c2e08d450c8e77e402114836672 55b72320ef1e08b6fd8fc200628af92ae85dc3f8d4474c16fbc735e4cc8d9b23
-lib/codeql/rust/elements/internal/generated/BoxPat.qll ba1d5defc1f09be11edacb816aae536a72cda0c6f4585aa7e26c3b3fd6032cb0 b96a4850cf1e7388b2d94f3c4e994681410c805781b7cd666d6c346cbad2e949
-lib/codeql/rust/elements/internal/generated/BreakExpr.qll b07f7bcb29f777dd7c617c020935bf1155e77b0ddbbe0374087ee537025fe05c b8d0e80060c6f3ca3a71db2fccdc5f7503f7c788fd1ff20e466ce72fc5258095
-lib/codeql/rust/elements/internal/generated/CallExpr.qll 32cca7849018b7c5a012a1933aee58ec3d7b46cc0f5b65505932b54fffe8a218 72b0566914fefe7e44a3ee4e6fc39f45fa63ab44dd878d067fafe7fa364a1c29
-lib/codeql/rust/elements/internal/generated/CastExpr.qll 5d05557b7f27f776e178390505d52056bcf04792601b6cd2d7faa7975f1fd662 c59b897e3545b5bdafb7c41db8b625da46036f8eaf3ecf413973f135b728938b
-lib/codeql/rust/elements/internal/generated/ClosureExpr.qll 146186d9daeebe7a0a723d80bd2183e3c9bd77ba4f88d9ced7fafe6e81218d6f b700ca3e7518e7f4a5e2f87fa4abee043b98638901a7e6539bead62957f569f3
-lib/codeql/rust/elements/internal/generated/ConstBlockPat.qll c9ab93e9aa7b60ee714db181c650f51717504638ecd6e6d3b582847a18822607 f9ddabfcdc9a7d56833a35280163e7d3938d30041af5e1b2216caa477af0dfa9
-lib/codeql/rust/elements/internal/generated/ConstExpr.qll cffb4238fb0f74533d314529742da165ddd6b296193c19d88ee330c2c9e87e3d c2694572dae816989f1f6d80edbb5dee0e22a8f16022f2ef78c2c531ae6ccd95
-lib/codeql/rust/elements/internal/generated/ContinueExpr.qll 614aa21c9d6585479e6a205e11f05cf7fccf0ef7ee8871d38d773ac310a2a80b ec2a69f6c38b1b30601da3c55a891d326617fe20591c8f9f98ffe4751e233db7
-lib/codeql/rust/elements/internal/generated/Declaration.qll de0bccf895cb0187d570ce749d4c1b6dd6f747ca9f1d946fc319526bdc9397c8 a4e6ebe1b34f1f8ade683504f59e8820ffeacc09cd0d0d90701499d557c74c5c
+lib/codeql/rust/elements/internal/generated/Attr.qll 2e7983b2c462750065ed58cc10c62e42012ddf0dd32f5439df7c6d6bf8ff349d e8270d33a50f088a83a2dfaa5b0a63ec775a6c97c8bf3a9383ce7a1ba8fe8fa3
+lib/codeql/rust/elements/internal/generated/AwaitExpr.qll 1d71af702a1f397fb231fae3e0642b3deeba0cd5a43c1d8fabdff29cac979340 e0bfa007bdecc5a09a266d449d723ae35f5a24fbdfc11e4e48aeea3ec0c5147c
+lib/codeql/rust/elements/internal/generated/BecomeExpr.qll 7a211b785a4a2f961242d1d73fd031d381aad809f7b600ce7f7f864518bb7242 17a0388680007871748cfdc6621f700a7c2817b9601e1bd817fb48561e7c63ad
+lib/codeql/rust/elements/internal/generated/BinaryExpr.qll 64e9bd9c571edd6e5f3e7662b956b1d87fa0354ce6fe95da9caf25ac16b66c68 3fca09fdbe879db2ca3293618896a462e96376a2963d15cce3d5b1baac552fcb
+lib/codeql/rust/elements/internal/generated/BlockExpr.qll ccfbdc7bd268735a0424ff08dcf37d0e1fed61d5fe0520593c23f2490d400438 0facad59f6aba13ee0c069b691c99f52c04b723a2bfad4da226190c3c42dcabf
+lib/codeql/rust/elements/internal/generated/BoxPat.qll ec946a3e671ab7417e04b0207967adad004df512c570c4f0780ca5816d12d75f b0e64860855c4e85914042b1a51034899ff7cd1b2c6857188de89310a2726ea3
+lib/codeql/rust/elements/internal/generated/BreakExpr.qll 0f428a8b2f4209b134c2ffc3e1c93c30bc6b0e9c9172f140cefa88c1f77d8690 957b39f38ff6befe9061f55bc0b403c2f1c366dd0cf63b874bae6f8216576d76
+lib/codeql/rust/elements/internal/generated/CallExpr.qll 23ee64e3bf643cd5e6ff705181d2bb31e1aeaffecb5bdce73836172dbf15f12f 34b280139b1f8f70d78e1432392f03c971be392e8cb68d014eb325d0c101bddd
+lib/codeql/rust/elements/internal/generated/CallExprBase.qll cce796e36847249f416629bacf3ea146313084de3374587412e66c10d2917b83 c219aa2174321c161a4a742ca0605521687ca9a5ca32db453a5c62db6f7784cc
+lib/codeql/rust/elements/internal/generated/Callable.qll b0502b5263b7bcd18e740f284f992c0e600e37d68556e3e0ba54a2ac42b94934 bda3e1eea11cacf5a9b932cd72efc2de6105103e8c575880fcd0cd89daadf068
+lib/codeql/rust/elements/internal/generated/CastExpr.qll d6fbf02e9e202254666082a9116634d0eb933177866ac4c0a57b5e9c4bb4b383 477f67773492e3b82695461d56327c9db05a7d1a67e8d192406265f2ce369670
+lib/codeql/rust/elements/internal/generated/ClosureBinder.qll 94c0dcdd4cd87d115659d496c88a98354bc7d4ddc0fa27028003bf7688b99987 d59d713b426dbbdb775df9092d176eea031dac1f14e468810f2fc8591399cd19
+lib/codeql/rust/elements/internal/generated/ClosureExpr.qll 70bb3d961e4dc62ad2c9b80d8cbe1e1d5792eafa00a2b0730c06cf6e8a164105 acb3c5200877fda8dffc65b4aa1d4deeb806e035aefecf4da7f0ce03e0b3a477
+lib/codeql/rust/elements/internal/generated/Comment.qll cd1ef861e3803618f9f78a4ac00516d50ecfecdca1c1d14304dc5327cbe07a3b 8b67345aeb15beb5895212228761ea3496297846c93fd2127b417406ae87c201
+lib/codeql/rust/elements/internal/generated/Const.qll 40464df9d8baacbc85bd137c7d1661684c957c407b2363ea60d90946be93de4c a3316beae55f570a5ca4b1172ef8267d7acb1104cc7a5e9efc58d9fc8224500f
+lib/codeql/rust/elements/internal/generated/ConstArg.qll e2451cac6ee464f5b64883d60d534996fcff061a520517ac792116238a11e185 1dd6d4b073b0970448a52bbe2468cd160dfe108971dbf9ae9305900bd22ef146
+lib/codeql/rust/elements/internal/generated/ConstBlockPat.qll a425a7fd216d35f17a7ff239d431b349721f71f2e52722325755f43df2bb9886 a9aa37ee4f8c9d44ae49c807ac48d5a8a22f7d7d0ae2968ab50371a418ccc48a
+lib/codeql/rust/elements/internal/generated/ConstParam.qll 26f838dbbd7659cdbf464c2107304b66ad0fbd43370d6b649373c3b9fa4f6576 c658951ba92b919278fa445cd66c3b694f42d76bde49daa50a3128e5d44f647a
+lib/codeql/rust/elements/internal/generated/ContinueExpr.qll e2010feb14fb6edeb83a991d9357e50edb770172ddfde2e8670b0d3e68169f28 48d09d661e1443002f6d22b8710e22c9c36d9daa9cde09c6366a61e960d717cb
+lib/codeql/rust/elements/internal/generated/DynTraitType.qll da9dce6347ce385d7468986cf6960b4a6787f017ff5632612a7216ed62bdc9c9 9d0b37221674b597a21bfacbdfc7e08b54381a6adacfe544df154481cd562ed8
 lib/codeql/rust/elements/internal/generated/Element.qll fb483b636180c699181c8aff83bc471b2c416206694f7028c671015918547663 542d1b9ae80c997974c94db3655887186df3921a8fa3f565eaf292dcfdac3c4c
-lib/codeql/rust/elements/internal/generated/ElementListExpr.qll 655e8fb41ec8b16c1cea068608a5303690c105d52edafd236b7c42b8b4e08c6c f10df3f1d9dccfa997af9859edf4548cc6507339a15bb50cb4751139d02760e6
+lib/codeql/rust/elements/internal/generated/Enum.qll 4f4cbc9cd758c20d476bc767b916c62ba434d1750067d0ffb63e0821bb95ec86 3da735d54022add50cec0217bbf8ec4cf29b47f4851ee327628bcdd6454989d0
 lib/codeql/rust/elements/internal/generated/Expr.qll 5fa34f2ed21829a1509417440dae42d416234ff43433002974328e7aabb8f30f 46f3972c7413b7db28a3ea8acb5a50a74b6dd9b658e8725f6953a8829ac912f8
-lib/codeql/rust/elements/internal/generated/ExprStmt.qll 2465722236ab7619b671de90a8a66f506e7de8be5b0e65724a53bd17b2d4c70b 1e8a1e4e385b439a43c12fd25aa1f5655254f689ab472be0a69cf902361515c5
-lib/codeql/rust/elements/internal/generated/FieldExpr.qll 7932705fc5233b6fcbe2dcc87507a1ee056c84085c3dc2815f6aa68eded1363c e9d96bcbeaae02eb6f473d7cc01b92910db0e72d2c24f242f2fd15b75bf09427
-lib/codeql/rust/elements/internal/generated/Function.qll abbc910d3ab2870f0ec63a5f000ea1d8e256ef15db1d25d0999749c39dc524eb c0edf4f4bf864ac8f4366ecdf772913b4770dac31203f4172ff0e76dd87e196e
-lib/codeql/rust/elements/internal/generated/GenericArgList.qll 815b00446e366e90fa706ea6a3e2a54734de2278cb28cc51d575d710ccc11b02 001b44fb081b38b0e05c183066ae9015ac3d73efe69453c7083581c432ee5850
-lib/codeql/rust/elements/internal/generated/IdentPat.qll bbd43d6eb5bc46ae0950ae24d2f20c1a0fa4f81872c2ff212c536e0d665fe6c3 ae40b1fbd7ee9f1125b4849009d8a826588fd0a67090b73a6463b27c81dc424f
-lib/codeql/rust/elements/internal/generated/IfExpr.qll 10f682598616819380609e655c56050d2290b012d403f808a317f5ed0abd25ef 668224e1e2b5acc28268a74845de0905d0513f33a4ca2efb7286669448e2f5d3
-lib/codeql/rust/elements/internal/generated/IndexExpr.qll 41c01eb250abe44047a9df49383bbbe4e2f408468462959146caf49aef1e892c b7c04d13dbefd3d947bb32482380c6db137d35d3d9c23299c98d465e6fb15f15
-lib/codeql/rust/elements/internal/generated/ItemStmt.qll 14f807e70fa269b9be6803ea98c98bd9c8d3fc03e4366ca3b65fb3e6c0b5f417 3dfae7ffda28808a56ea5f312b079bbb1de171f9acaa012179eb6b3691ba5432
-lib/codeql/rust/elements/internal/generated/Label.qll b1d77900940e3799b371dcf384bee3af94b688e459246d12ad4df7c17606ea60 27459c9cdbe5d5bb0846ae694d093bbf00c9295af69d276b585808695528ee43
-lib/codeql/rust/elements/internal/generated/LetExpr.qll 14827eb8cd9f5a141b49661350465ef7f9d75e596338d427862cc73caf1c262f 951ce94df2ecc5ca1311a6a2329d13d893ed34dc77449bb1a92ba6729ae00a38
-lib/codeql/rust/elements/internal/generated/LetStmt.qll 344c3199ac41389d31ccd1e064945a3b01088f5a675debad8e9015a557f860d7 1c188d0162c57d0550bacaaf8c3ed68cc97855697f2b24443c63351887c5aa1c
-lib/codeql/rust/elements/internal/generated/LiteralExpr.qll 9cfc941448bd83d5b751488cdfd1644e927aeaceb9112183ea742887f19ea2ba 884bf31c28bc6ee3289cd31a42de6120132642bb407fe5889666272b5c2a5b57
-lib/codeql/rust/elements/internal/generated/LiteralPat.qll 2f156199b65475db3647869f8b403714062ae3021b90346b16175a6d1227230e ab8d455c4d44c4627a8cbe3243713ed571987fd7b35c7e2f4d6c2a846f249069
+lib/codeql/rust/elements/internal/generated/ExprStmt.qll d1112230015fbeb216b43407a268dc2ccd0f9e0836ab2dca4800c51b38fa1d7d 4a80562dcc55efa5e72c6c3b1d6747ab44fe494e76faff2b8f6e9f10a4b08b5b
+lib/codeql/rust/elements/internal/generated/ExternBlock.qll c292d804a1f8d2cf6a443be701640c4e87410662921e026d3553bc624fd18abd ba6fae821d2502a97dec636e2d70476ad0693bc6185ae50e8391699529bd0ee0
+lib/codeql/rust/elements/internal/generated/ExternCrate.qll 35fea4e810a896c1656adb4682c4c3bc20283768073e26ae064189ce310433c8 fc504dff79ba758d89b10cd5049539fbc766ee9862ff495066cea26abf0b5e0b
+lib/codeql/rust/elements/internal/generated/ExternItem.qll 749b064ad60f32197d5b85e25929afe18e56e12f567b73e21e43e2fdf4c447e3 e2c2d423876675cf2dae399ca442aef7b2860319da9bfadeff29f2c6946f8de7
+lib/codeql/rust/elements/internal/generated/ExternItemList.qll 6bc97fdae6c411cab5c501129c1d6c2321c1011cccb119515d75d07dc55c253b 6b5aa808025c0a4270cac540c07ba6faede1b3c70b8db5fd89ec5d46df9041b2
+lib/codeql/rust/elements/internal/generated/FieldExpr.qll 3e506b5cb93793ec30f56bb637a600db869fcba6181b068516a671d55c362739 7bbf953696d763ad6b210f378f487ba85b875fa115b22c0c0508599a63633502
+lib/codeql/rust/elements/internal/generated/FieldList.qll 43c13c6e3c9ba75a7a4cb870fc4f18752001584d48b9df0734055a6ebb789331 7c51b0b13eb02f1286d3365e53a976ba2655c4dbd8e735bc11c8b205c829e1ee
+lib/codeql/rust/elements/internal/generated/FnPtrType.qll 748d766dbefd19a7d644734c57885eeede66897029bbfe1b87919517f43bfde2 5a7d80acc00e56594ed85026a8ea4923104d2e98c2e42db8c5bcd32ddd164e48
+lib/codeql/rust/elements/internal/generated/ForExpr.qll 541b62b48911d4999f9ed64ab6c8b9910073ac4add0225761f319677328cf120 976c3a91c9eedfb1e2d9ea76ac501348643b3d23c723d7a777042258d416d091
+lib/codeql/rust/elements/internal/generated/ForType.qll 3d43d044a1189281f09c55caafb6c8020a836f49e2866077086101925a573cf2 646b59bfd1b428aaf7211f574c49f79cb4c6a79ca151aa0663b2b31480298721
+lib/codeql/rust/elements/internal/generated/Format.qll 37ad20cf2bf363b4027a8913d095292c8a4eb8ccdf2a9965f2fb7d41930f9bfe 329b89cdd75ce951269273dd18897e32ff5cfcc94f451001c64143386c1e48dd
+lib/codeql/rust/elements/internal/generated/FormatArgsArg.qll e07a1ae310f590003f1b88fada7dcf4847c99adb9d4c838d1c88e66e1da85c5f 0ef7342451fe2cb06e765fb4b33bb8c4a9b927f5edbc8feb5c6ba3655697f447
+lib/codeql/rust/elements/internal/generated/FormatArgsExpr.qll 40d6daa7d2bafb33798a21d79774dc802cfbd7a31618ac3bd0149399ea2bf893 d1172e2151791228559004792e125fc4625f6a26ffad25f29efb0ad263bf8795
+lib/codeql/rust/elements/internal/generated/FormatArgument.qll 00646f38217a66978b8b2648cca39dddbed22ece693b26cb682f019fbfedda95 e364e085f967847a7ed21b76156a9203d64032f0f0eea357b4779885a41bf9a7
+lib/codeql/rust/elements/internal/generated/FormatTemplateVariableAccess.qll a6175214fad445df9234b3ee9bf5147da75baf82473fb8d384b455e3add0dac1 a928db0ff126b2e54a18f5c488232abd1bd6c5eda24591d3c3bb80c6ee71c770
+lib/codeql/rust/elements/internal/generated/Function.qll f285ee0c771f897eba6db34a7e98f3cfb7db91b0df252ff4b37fc9d779de0bfb 07401e832565ff376acda219514c2e2bbe4ae5058c76a73b40ca6ca66f1626c7
+lib/codeql/rust/elements/internal/generated/GenericArg.qll 464da0ba1c5ddcd1be68617167f177773d99b5ac4775ec8ea24d503e789a9099 6faa1033d59baf7c210ac4837a55781cfc054b7acbad8027faf4630dbfa6e101
+lib/codeql/rust/elements/internal/generated/GenericArgList.qll b8cd936bba6f28344e28c98acf38acb8ef43af6ecf8367d79ed487e5b9da17cb 8b14331261e49d004807285b02fca190aafd62bfb9378b05c7d9c1e95525fe7b
+lib/codeql/rust/elements/internal/generated/GenericParam.qll a0285123f974f287154b706bf6688b86edf72a4adcec57346c654d962435651b b42c3915e9564b5b5c5282229bf882aa3309de26a77721b2255d6f4235c0cc38
+lib/codeql/rust/elements/internal/generated/GenericParamList.qll f2d8945bc70cda6929bb6b652f9e3c7707e73fb5e778b21e99dbac594e71285f 7b97da5b6a6504377456bedebddc293d714f90e8fc2ce64199656666d5f749af
+lib/codeql/rust/elements/internal/generated/IdentPat.qll a1269182132b2f52c5d842e58cbfa1cee49b143fa3766ed9fcf65389bf5137eb 46009fa66065222d865fa4714dd16c0373ffb16d576da45e7bf3a06432bd3a23
+lib/codeql/rust/elements/internal/generated/IfExpr.qll 413dd7a20c6b98c0d2ad2e5b50981c14bf96c1a719ace3e341d78926219a5af7 c9a2d44e3baa6a265a29a683ca3c1683352457987c92f599c5771b4f3b4bafff
+lib/codeql/rust/elements/internal/generated/Impl.qll e33ef5d3e49e64beca0ca9d5c0ba972d99007e5011eeedc11e67d3fbb569ab4a 5c5d88110864f4fd3d966b1ad973eaabd7a9c5a07adc18bff01dc09395214825
+lib/codeql/rust/elements/internal/generated/ImplTraitType.qll 3c29684f5ef386b883b79dc9758441d97f090e065be177ffc8240aaf0f3d1e7b 03ea42c2a95cf917ec73d88b7b4ca5e53e10d7b046074f59100c0ec6c2c1ed6d
+lib/codeql/rust/elements/internal/generated/IndexExpr.qll cf951fc40f6690e966b4dc78fa9a6221aa5c6cade44759dcb52254f799292d11 1572e71918cc4e0b7e028331b6d98c9db23100a3646cd3874d1915e06ab6211d
+lib/codeql/rust/elements/internal/generated/InferType.qll 23ee25135c59ea5578cdf7c34a41f606e217e7260c3c8f404d12836585d5cad4 400da322fa1be62c4e300ebdf481eb92d4226eb6c316c668da8cc5168065774f
+lib/codeql/rust/elements/internal/generated/Item.qll 25e645cb41222c21065798fb6cb0488bfef007aeb9b89717f58913f9b29d5559 3146941e55db2ff7c51ec030b4414e20d66d154cf6854b1a3fa42e74a09dfb77
+lib/codeql/rust/elements/internal/generated/ItemList.qll 73c8398a96d4caa47a2dc114d76c657bd3fcc59e4c63cb397ffac4a85b8cf8ab 540a13ca68d414e3727c3d53c6b1cc97687994d572bc74b3df99ecc8b7d8e791
+lib/codeql/rust/elements/internal/generated/Label.qll 6630fe16e9d2de6c759ff2684f5b9950bc8566a1525c835c131ebb26f3eea63e 671143775e811fd88ec90961837a6c0ee4db96e54f42efd80c5ae2571661f108
+lib/codeql/rust/elements/internal/generated/LetElse.qll 7ca556118b5446bfc85abba8f0edd4970e029b30d414ea824a1b5f568310a76c a403540881336f9d0269cbcdb4b87107a17ab234a985247dc52a380f150a1641
+lib/codeql/rust/elements/internal/generated/LetExpr.qll 9af0f89b294c8a0a751317e7074fe370339563d36c1df4911d1ea082a4df77fd 68272593d1feb88990bfbd0b8c222776f085e49694894384fc6d96e9464ba734
+lib/codeql/rust/elements/internal/generated/LetStmt.qll aa1852db86ec29f857a90677f0c6b4a07f0fd965fc193d4141be95ce15862fca 40f32a37c0cc161b099fe0b4c7d713da928781d3e2c3de90db991df1d9062647
+lib/codeql/rust/elements/internal/generated/Lifetime.qll 90d01c76188ce0c053122c62b41e47f27c4c7717ca5a4999a76797360043da0d 7b9feb202da5a06cd17f7770bb66742fd9e7cff0d410fefc7ffaafe710ac16d6
+lib/codeql/rust/elements/internal/generated/LifetimeArg.qll 7c1a44e3d480e75142b171eb51382c9492d393043833c0ab4a4036eba19043b8 7d8273b62794268dab6938ba1e3a3560a80a2c49cd9a9717345785dacd311059
+lib/codeql/rust/elements/internal/generated/LifetimeParam.qll bcbde38bfb99034e470634dbd32c0df34c40e1e531e2d235b7ef29c0b66f8a56 1fd15bbaa1dbc521b2ee4bf0bc1009c411aff15eac07c0842ed9883d9a291669
+lib/codeql/rust/elements/internal/generated/LiteralExpr.qll f3a564d0a3ed0d915f5ab48e12246777e4972ad987cd9deaafeb94cf407b2877 2337c3d5f60361bd10f6aeca301e88255f5dffb85301cf36cbbfa1a65bfad1cd
+lib/codeql/rust/elements/internal/generated/LiteralPat.qll ecc2bfe559abfce1be873fbf7b61b5728897c9afc3bb3f69551d8320d273da71 42196fb6a4a0ff9b570fd0bdbc920f24744b3f46772efbb46648af7fbfe1fbda
 lib/codeql/rust/elements/internal/generated/Locatable.qll c897dc1bdd4dfcb6ded83a4a93332ca3d8f421bae02493ea2a0555023071775e b32d242f8c9480dc9b53c1e13a5cb8dcfce575b0373991c082c1db460a3e37b8
-lib/codeql/rust/elements/internal/generated/LoopExpr.qll 69f7e4e72e411afb50ccd5e7e7aa15c095b6a7b006fd01b897d30b22ce27f6b9 ba48363c6da3cb3b27c9ab4b8fd163c2bda51750a2df0efbc01ecbae745e3b93
-lib/codeql/rust/elements/internal/generated/MatchArm.qll 91584e5ac04be06ed48e86356883de9fb1fa2888715a5180121b6072aeff2b9b 73aa1895213b184a8364745548227b411282cf8054997a715129d32b4af29f6c
-lib/codeql/rust/elements/internal/generated/MatchExpr.qll 194659fe8118c9bcd590143f103a71a2b4febb3b43e627bad5f1902183358a36 2ef5ae21990866462ea776fb69e407e736024755c4c8028fcba0e3b6a8060b8d
-lib/codeql/rust/elements/internal/generated/MethodCallExpr.qll be2299679f843da79c08c7734bb6d8b5ede195b40a5ad5058d126561c857fb51 d6fd89f6ff814e17a1700846dcdacbdab4105e00b1d8ee38f9db06eeaf1aa1c6
-lib/codeql/rust/elements/internal/generated/Missing.qll d33b611d2e4fb92918c380f6182ccad1372bb7d2560a11e2c4922aeec2de7796 35d1fb1aa5a9b2f51ea9d78013db1012e3e42f1847439009c550bf34b96c3755
-lib/codeql/rust/elements/internal/generated/MissingExpr.qll f2c564f660d6088d9aae741f6f964718976c7bbba6ed681da8992db6468dd55a 51aa7239ddaa2e5fa4e2eb651aee8542204373db27428211e1bc1a2f5888b12a
-lib/codeql/rust/elements/internal/generated/MissingPat.qll 36f8b571c79ca7955fb38c7919d4175fb81b2ffe89ab49845c796726f2484aad d522a46f87e99de6d812dfb729bcc963f46539933c805d71dcd21f891f07beb8
-lib/codeql/rust/elements/internal/generated/Module.qll 6e8747876877f83118c43c1a0f433ab6f41b43873d3d900cd06393c04a0d0146 523c71dd4afa1da5e4086eb03c07f66505b07c97eb1d1c4d4c330b4115b0bfa6
-lib/codeql/rust/elements/internal/generated/OffsetOfExpr.qll 33e324e98b9ae78de3ef8116311339fc523993fdb9bf21f0297a4383c996090b 408c9c5eb0013a1cc423636f3d9ce89e937bc396ddbd5e67f497a2e7437466b2
-lib/codeql/rust/elements/internal/generated/OrPat.qll 306c29185675965cfaa072027883392356efbf51d2ae573ef60f323735194575 4a9b47b7354be75ba3cb01682ac0ebeb49a552911e6491b1c778a3f4ed6afc00
-lib/codeql/rust/elements/internal/generated/ParentChild.qll e5e3dfe67e92553c3bed102e1217b44689c956fa165383baf57b74121da69b90 3c231960313227cb88d80dff8959f4d1a68ac9c09f3dfe5747008b7497609071
+lib/codeql/rust/elements/internal/generated/LoopExpr.qll 22b755dfaf238ecea722c0c94c399992014e23481ec6fdd61f803bbec012b6f9 08731630c2dc05aa1e0ada222a6057752d9ce737329c62076708828247a358be
+lib/codeql/rust/elements/internal/generated/MacroCall.qll fc8988696493992cc4fdce8c0e5610c54ee92ea52ebb05262338f8b612353f50 188a2d7a484bd402a521787371e64f6e00e928306c8d437e6b19bf890a7aa14e
+lib/codeql/rust/elements/internal/generated/MacroDef.qll e9b3f07ba41aa12a8e0bd6ec1437b26a6c363065ce134b6d059478e96c2273a6 87470dea99da1a6afb3a19565291f9382e851ba864b50a995ac6f29589efbd70
+lib/codeql/rust/elements/internal/generated/MacroExpr.qll 03a1daa41866f51e479ac20f51f8406d04e9946b24f3875e3cf75a6b172c3d35 1ae8ca0ee96bd2be32575d87c07cc999a6ff7770151b66c0e3406f9454153786
+lib/codeql/rust/elements/internal/generated/MacroItems.qll 894890f61e118b3727d03ca813ae7220a15e45195f2d1d059cb1bba6802128c8 db3854b347f8782a3ec9f9a1439da822727b66f0bd33727383184ab65dbf29ac
+lib/codeql/rust/elements/internal/generated/MacroPat.qll 9e927e09d47029a3025eaad271c975e73479a80ea933c921381b6c9d751f2866 bdf5c58ca27743eb2e2dae2aeea3f3fc21f8a4f98fe1001598876455c88e8f69
+lib/codeql/rust/elements/internal/generated/MacroRules.qll 4fbd94f22b5ee0f3e5aaae39c2b9a5e9b7bf878a1017811ca589942f6de92843 49fb69543ee867bae196febea6918e621f335afdf4d3ccbf219965b37c7537b1
+lib/codeql/rust/elements/internal/generated/MacroStmts.qll cb4f3c2721a4d0c8522e51f567c675f4fc95f39bac8a2bd97e125d5553515ad2 09b5a739ccee75e6c556b34ecd6f78c7dc799029d9bc7df2e6169098d24f0ccd
+lib/codeql/rust/elements/internal/generated/MacroType.qll c462824df4a002956c036966d15cd0bce206e664888f8d0c7834dedb38b3c0bf 947480f07c40128ef3d00ad4c3a29a685472b3e20a661680c22f6bb318205ed1
+lib/codeql/rust/elements/internal/generated/MatchArm.qll 8fb740a0f2e308782d9cf390672969cd7cf6e698e5b847fb02ae3fa6c205646f 42bfe8dd94fc24ec925fbd44016df111600f99d1216c9a698631373bb6048830
+lib/codeql/rust/elements/internal/generated/MatchArmList.qll 13362680c037fe83fef4653562cc10a4429078316b5ec7c47b076336cf4aca2e 41c674293c13eceaca62134ae0c6778541f6a5201cbc5c146f0ba01b898dc267
+lib/codeql/rust/elements/internal/generated/MatchExpr.qll 689d65f690fe05bc262d0a5bfe69bb4f8a142db387c5765fcc4958a9b49989f8 2979cd2017d0538870d17b2b7592c75cc05b706bd36c9de3e5dc38fa3a957e5b
+lib/codeql/rust/elements/internal/generated/MatchGuard.qll 521a507883963106780f1782084c581fbcf1179863c7c15438c4db79e30e78dd 6226feffaaa8d828a42ece0c693e616cd375672eb987c3b7ff1ca15fa23c116a
+lib/codeql/rust/elements/internal/generated/Meta.qll 38fca2c9958b4179de311546fe0850319010aca9cd17c97d57e12b521c5d0947 740f99c9d41044ceebfcc9d29baaa22f59c11a40f45502a34aa587d423c018f8
+lib/codeql/rust/elements/internal/generated/MethodCallExpr.qll 17bffcc826851a8be32a1900b8fdf777f9bab6aed9f8268d566173c4974c1cf9 134a2860bdf16daafdb3e574c52a69d2598210653db89c2fa062ca25e8f8a649
+lib/codeql/rust/elements/internal/generated/Missing.qll 16735d91df04a4e1ae52fae25db5f59a044e540755734bbab46b5fbb0fe6b0bd 28ca4e49fb7e6b4734be2f2f69e7c224c570344cc160ef80c5a5cd413e750dad
+lib/codeql/rust/elements/internal/generated/Module.qll ebae5d8963c9fd569c0fbad1d7770abd3fd2479437f236cbce0505ba9f9af52c fa3c382115fed18a26f1a755d8749a201b9489f82c09448a88fb8e9e1435fe5f
+lib/codeql/rust/elements/internal/generated/Name.qll 12aad57744b7d1b04454159536409244c47319aedd580acb58ee93ef9d7f837d 63fc67ccc085db22f82576a53489f15216a7c29d5b941b14a965eab481534e2e
+lib/codeql/rust/elements/internal/generated/NameRef.qll 4292fc7aa9ba22a7fa5bd638c38f696cc6724d8ed5e7346e7c5a52c4e4b65eec dfa8c3d4b521e43b76b18666d3d32d159c21b7b194285bac425df681544d269f
+lib/codeql/rust/elements/internal/generated/NeverType.qll 14dd3c08db1db873b365fc7f0d1cf3f5d6229b1f78bc85100c36c22d1bb8ee40 34257df0ac59cfd982ea5f30ab225c8bfece71d9fd3be84ff79cf1b0bff55060
+lib/codeql/rust/elements/internal/generated/OffsetOfExpr.qll bb17a1e1d4332225cf4bbbae4a1bab9302c2d81d191fe835f2f973915d40dd2a f9e73210b81992040a5a5a9ac3ad936159fb3475445f130c7b28f83dfb4170f5
+lib/codeql/rust/elements/internal/generated/OrPat.qll ee0487b90849c3e2a836c956ae8837f27515a9dc795bf17287cba2cf7a39d839 35117b6a3dcebab09f12665441332b6863200e206679ee97894170dd9ef7795c
+lib/codeql/rust/elements/internal/generated/Param.qll c57bf238123e8337adb1556cf788bde2b2e8841d4afa0799649db9d507b02d85 7cb580219ec9b6257735f7c53260cd2bb5533dbe342bef3b793ec7b6a65e7027
+lib/codeql/rust/elements/internal/generated/ParamList.qll c808c9d84dd7800573832b63a2ca5296b5506bffdeea054893a56cde08f91560 d4599c52231f93e1260fbae7de8891fe4287fa68b1423592b7a1d51c80146dc8
+lib/codeql/rust/elements/internal/generated/ParenExpr.qll bc0731505bfe88516205ec360582a4222d2681d11342c93e15258590ddee82f2 d4bd6e0c80cf1d63746c88d4bcb3a01d4c75732e5da09e3ebd9437ced227fb60
+lib/codeql/rust/elements/internal/generated/ParenPat.qll ce24b8f8ecbf0f204af200317405724063887257460c80cf250c39b2fdf37185 e7c87d37e1a0ca7ea03840017e1aa9ddb7f927f1f3b6396c0305b46aeee33db6
+lib/codeql/rust/elements/internal/generated/ParenType.qll 9cc954d73f8330dcac7b475f97748b63af5c8766dee9d2f2872c0a7e4c903537 c07534c8a9c683c4a9b11d490095647e420de0a0bfc23273eaf6f31b00244273
+lib/codeql/rust/elements/internal/generated/ParentChild.qll b4d25c43ed44715053255c3c2f8aeb8d21826adc365f24026b2123a4f25cba86 1bc4bb0380a1a8b69055ffeac203b11b2a1b94e5ad88d1b32ff659e8feb26016
 lib/codeql/rust/elements/internal/generated/Pat.qll 3605ac062be2f294ee73336e9669027b8b655f4ad55660e1eab35266275154ee 7f9400db2884d336dd1d21df2a8093759c2a110be9bf6482ce8e80ae0fd74ed4
-lib/codeql/rust/elements/internal/generated/Path.qll 97cc6afcaa2c23e7bfc3eebcdd27e431d77a671a4fbf86a6059fa87a83715816 c8792bfd3539b7e4a9869dd1c77fef4a1cf65533de274e0e449de165ffd2c5a4
-lib/codeql/rust/elements/internal/generated/PathExpr.qll f27ac02eaaa42206107c6d0c9c1286e9c69b91ca7a11a3067467a7733df5c6d6 7b21666640f6b8680aed2f4525cf7facb682aacbe0b9a5244adddd1a52b78d3a
-lib/codeql/rust/elements/internal/generated/PathPat.qll 6cabb06eb5c71b8fe207b1ec8af670620cadba614efad9a3eb81a700deef8375 a088478d50f64b535ea6c441eb0f026a5263bcd8e8a5bab34817e7b9b316ccd8
-lib/codeql/rust/elements/internal/generated/PrefixExpr.qll 1df0391e1b0dc314d879d974e788ce7f158678bd195631ab7827423900e6a6be 11cd02998816887193fb8ea792819bcc63b3b6728d5208069bde6e3ded5d16d1
-lib/codeql/rust/elements/internal/generated/PureSynthConstructors.qll dc03515d678ba052c2ff2dd9f0883e0bce54cac740ba9a15e5173f292c1b6971 dc03515d678ba052c2ff2dd9f0883e0bce54cac740ba9a15e5173f292c1b6971
-lib/codeql/rust/elements/internal/generated/RangeExpr.qll 28e40628e80c9924efe70243771543b8638213af6fe063330231b7bc2446fd18 fcfeeec7a26911b277ef6f3c816092025e0c0ffedae890af7f681012999a3a4f
-lib/codeql/rust/elements/internal/generated/RangePat.qll ce73052c756b83c63dc997739cca9f56dac71d4c9661245dd705a6fed30be2a7 a0b7b992ecb4a558c0c50802f999d5e122105d8eeb811f148f36ceb2d2cbabd0
-lib/codeql/rust/elements/internal/generated/Raw.qll 34de96931dcfc43b57395301449d8bcd5246651e6a660a5c2bdbf1a4d957aa87 89650413c4fe2e9bbd7640a5e5a16310fdf3a72cd9881e3239561a5d9c6e2eaa
-lib/codeql/rust/elements/internal/generated/RecordExpr.qll 94d4e71d1548992e089c201f0b9314a840f70bac67ba0d604b544425c2202bc0 a4e2361703e693ab45f1ce76653600270a7697519087ac9f5200fc25ca2a316d
-lib/codeql/rust/elements/internal/generated/RecordExprField.qll d2bb6f472067f9aa40e6c553b6263785b369330f20469f2720585147ce15a410 de50c5a38172d0db07bea798a91c5070e209687a403d1e6c559aa4fae118b19c
-lib/codeql/rust/elements/internal/generated/RecordPat.qll 7b98f68eb5893da9832aa449f584ea14a4563fa4cb0409387d26513ae3d5b2d7 16ee74805d9ed1492db85445f4c6873a911f55429db948aa7acf431299ed595a
-lib/codeql/rust/elements/internal/generated/RecordPatField.qll 09da5280ff073bb20e2903a4cdc08bae3d8d7391e7c0bed1ba856fd3a68b1a16 3c535c06ca94a4b7dd220121d4cfca6f499c3935eba1c0ab8d6d7efe6fc23fdc
-lib/codeql/rust/elements/internal/generated/RefExpr.qll 8f74eb7d3d276e2009e3e7caae081d2fb295c67d976bcb3004dd2e58da802d76 12b95c4130ef1bb1d480c5ed923c6f8b49931d508a88dd1c9db92e27f6d19f67
-lib/codeql/rust/elements/internal/generated/RefPat.qll 41a4b6a662aa46d3b0e073bc790daa55ce40fb91feca668347b9cd3070baf79c 15453bdebc84f81cd9195a3c4ca49b6765bcbb488aadab6833b4ec9a801f6879
-lib/codeql/rust/elements/internal/generated/RepeatExpr.qll 144d58719307d4c81079c4f763e4c4eeb1f2f961d46490ad0347cfd181a26845 38e45406d0aecb2750fffe96d6c22e9951dfdae3f5d52cd150fbb230bb5e886d
-lib/codeql/rust/elements/internal/generated/ReturnExpr.qll 3342e1a4c551692c60b5c9d4458819faf1328cd1248c6a523b2d694151ed9b60 6a93a297356d95704a6193048e172268db7c086c7e791b72ddc70766a217301a
-lib/codeql/rust/elements/internal/generated/SlicePat.qll 1373b9ccbef191615858292514c8bc9781191d23061f198f9c7208d042e71830 e62b9efba9672e5fd73b9c059918717b10ef121f0d38ab7b7a18e848f8471fbe
+lib/codeql/rust/elements/internal/generated/Path.qll f2b1be2f8f44001a6533533c978c4a9a8b7d64838d6f39eef5f0c0e7890611b8 d724a00a38f42429ffa8fb3bffbb5ec69e16a32ceeeb1d1f026fc7adf87424a8
+lib/codeql/rust/elements/internal/generated/PathExpr.qll 2096e3c1db22ee488a761690adabfc9cfdea501c99f7c5d96c0019cb113fc506 54245ce0449c4e263173213df01e079d5168a758503a5dbd61b25ad35a311140
+lib/codeql/rust/elements/internal/generated/PathExprBase.qll d8218e201b8557fa6d9ca2c30b764e5ad9a04a2e4fb695cc7219bbd7636a6ac2 4ef178426d7095a156f4f8c459b4d16f63abc64336cb50a6cf883a5f7ee09113
+lib/codeql/rust/elements/internal/generated/PathPat.qll 98c9938d6a359fd717829b196eb09701d2c798e18c1f43fa7b2a9145afdf6c19 caba2e629cae08682baac90a76ae9a48cda2d7d6f9c23d506fa0ff3f292978a4
+lib/codeql/rust/elements/internal/generated/PathSegment.qll 4621597fd86246f788b8f9ca73f6b0f27929fc04261ce3ccf85da1183071431d aadda8bce386a3b7a9c53b98465eedcc4f724e37b8a904c1775af5b7ffb041ee
+lib/codeql/rust/elements/internal/generated/PathType.qll 45de78e5374d6eb0446e2112ec72d3692c2811df9fa2ad03d0127e426940abe3 622cf70408413a565a0dac58f451035ac1339c8d0ee5b24f630680201cb0aa48
+lib/codeql/rust/elements/internal/generated/PrefixExpr.qll c9ede5f2deb7b41bc8240969e8554f645057018fe96e7e9ad9c2924c8b14722b 5ae2e3c3dc8fa73e7026ef6534185afa6b0b5051804435d8b741dd3640c864e1
+lib/codeql/rust/elements/internal/generated/PtrType.qll 40099c5a4041314b66932dfd777c9e2bef90a0711fb8d7c2c2cec764c003ac4a cf8297d93557356a572223d3e8acca701837c4b1f54e8d4351ba195fb7ed27f8
+lib/codeql/rust/elements/internal/generated/PureSynthConstructors.qll ea294a3ba33fd1bc632046c4fedbcb84dcb961a8e4599969d65893b19d90e590 ea294a3ba33fd1bc632046c4fedbcb84dcb961a8e4599969d65893b19d90e590
+lib/codeql/rust/elements/internal/generated/RangeExpr.qll 23cca03bf43535f33b22a38894f70d669787be4e4f5b8fe5c8f7b964d30e9027 18624cef6c6b679eeace2a98737e472432e0ead354cca02192b4d45330f047c9
+lib/codeql/rust/elements/internal/generated/RangePat.qll efd93730de217cf50dcba5875595263a5eadf9f7e4e1272401342a094d158614 229b251b3d118932e31e78ac4dfb75f48b766f240f20d436062785606d44467b
+lib/codeql/rust/elements/internal/generated/Raw.qll 5f83209cda8319c5c6c932631b60c6f2163d2d9cf7be63f63523e2206c01d004 3581039746e86365f37644e86ac2c89d67e2123aa1b039d9e0afdffc7156c96d
+lib/codeql/rust/elements/internal/generated/RecordExpr.qll eb6cb662e463f9260efae1a6ce874fa781172063b916ef1963f861e9942d308d 1a21cbccc8f3799ff13281e822818ebfb21d81591720a427cac3625512cb9d40
+lib/codeql/rust/elements/internal/generated/RecordExprField.qll 7e9f8663d3b74ebbc9603b10c9912f082febba6bd73d344b100bbd3edf837802 fbe6b578e7fd5d5a6f21bbb8c388957ab7210a6a249ec71510a50fb35b319ea1
+lib/codeql/rust/elements/internal/generated/RecordExprFieldList.qll 179a97211fe7aa6265085d4d54115cdbc0e1cd7c9b2135591e8f36d6432f13d3 dd44bbbc1e83a1ed3a587afb729d7debf7aeb7b63245de181726af13090e50c0
+lib/codeql/rust/elements/internal/generated/RecordField.qll 9f7840e1a2a194d5ed1d5201ab483eb01129849d49392581e0328bbc0934305c 0e019b5b8fe91bc96c7c07933c766d8a09c066d48ed96f24ae3dad303c00585e
+lib/codeql/rust/elements/internal/generated/RecordFieldList.qll d7bb2677338cf420b0d6371aeec781aacc2272c73413ea96b7418177ad149fb9 5ef52074b9f4ec31e7422b70efdb2e650d673b2625efdfec18a4e48c30e35cf6
+lib/codeql/rust/elements/internal/generated/RecordPat.qll f5f9904fcd8b8fa5fe65b46a68f830021a5e4a68f95ff403151565c3ec770477 56294ed2ff753d8be7742a501b15b5f3f5f20afe0f8171ee6771d049f26489e4
+lib/codeql/rust/elements/internal/generated/RecordPatField.qll f17b1aa265091fd8309fd90d5c3822d170870e304f160225327de5a844a9aed4 0458e39dbe88060b4b664692cf0b41ebf4364de268d9417658c14c883c9c1b33
+lib/codeql/rust/elements/internal/generated/RecordPatFieldList.qll 08d4740bbb519f15ab20b694b3c45e396a2a59cce0f68fa4b9698348784cae43 99919809607ae61c707f591ee609c50bcfb90d5b4f9c263f6b8e78658d21b605
+lib/codeql/rust/elements/internal/generated/RefExpr.qll 7d995884e3dc1c25fc719f5d7253179344d63650e217e9ff6530285fe7a57f64 f2c3c12551deea4964b66553fb9b6423ee16fec53bd63db4796191aa60dc6c66
+lib/codeql/rust/elements/internal/generated/RefPat.qll 5c4d908f851d89f42cf765007c46ac4199200f9b997f368d5b0e2a435efa82cd 42fd637bc98b5a9275386f1c5fb3ae8c4681987289a89b060991416a25131306
+lib/codeql/rust/elements/internal/generated/RefType.qll 3603a3e000acc25c5e675bd4bc4a5551b8f63851591e1e9247709e48d1769dc5 91bea4a1d5ef0779d575567253cd007157d3982524e63a7c49c5cae85cb42e5f
+lib/codeql/rust/elements/internal/generated/Rename.qll d23f999dab4863f9412e142756f956d79867a3579bd077c56993bdde0a5ac2f1 9256c487d3614bf3d22faa294314f490cf312ab526b8de0882e3a4a371434931
+lib/codeql/rust/elements/internal/generated/Resolvable.qll c038fa24b121ee3e7f6060bce639e7483ea1a14bb552e459b6c67663732dfd6c 4025f2ef318793913e6cfc5d8984e538f402bc062865dcb5496563bec64a2ea9
+lib/codeql/rust/elements/internal/generated/RestPat.qll b3a4206e68cf67a0310a466721e7c4b3ab855e65490d589d3d856ad333b3d5e8 30b471bec377784f61d73ef93e74fc0dcec7f512ac4b8791d1ca65f2bcea14b8
+lib/codeql/rust/elements/internal/generated/RetType.qll a26860cd526b339b9527c089d126c5486e678dd080e88c60ea2fe641e7d661fd a83c1ce32fd043945ad455b892a60c2a9b6a62d7a5aadf121c4b4056d1dfb094
+lib/codeql/rust/elements/internal/generated/ReturnExpr.qll c9c05400d326cd8e0da11c3bfa524daa08b2579ecaee80e468076e5dd7911d56 e7694926727220f46a7617b6ca336767450e359c6fa3782e82b1e21d85d37268
+lib/codeql/rust/elements/internal/generated/ReturnTypeSyntax.qll 34e32623d2c0e848c57ce1892c16f4bc81ccca7df22dc21dad5eb48969224465 ccb07c205468bce06392ff4a150136c0d8ebacfb15d1d96dd599ab020b353f47
+lib/codeql/rust/elements/internal/generated/SelfParam.qll cf6837c2731b45632f04092079d295eee3e02d19f73c73b3ccbce1abe12203bf 87eaa9d982506904c42030f7173dd01fd52f3edd9d2c8d19b572f6d5454f769b
+lib/codeql/rust/elements/internal/generated/SlicePat.qll 8b1463758d7b15a0303384c8136a48a8e71ce27da4ba6e421272b9751a988e64 7562d47308f197bc63ade0f114cd23a17e7f60fa696716f6a30fc7b7411642fe
+lib/codeql/rust/elements/internal/generated/SliceType.qll 98ee8b566be28f392ab9c9507600e8461ad0b48cbbbd422d22548aca691f8330 528d6eabddf49b9dc474971a2f3a6ddb6f2d77dc7f8449140ef54646c1ceb822
+lib/codeql/rust/elements/internal/generated/SourceFile.qll 55d44c9f09c5ff28c4f715f779a0db74083e1180acaf0d410e63ca07b90d1cb5 78c0af48b0b64aa377413ea4799dfe977602a111208e1d25e4bdfa920dbd7238
+lib/codeql/rust/elements/internal/generated/Static.qll 5fbd6879858cf356d4bdaa6da475de729c12d44ee99aef12bdefe657fdb885e0 0c8e9ef7a93c59b9346265338e38ae3f2e1265981f2d81aab49bc36cf0589382
 lib/codeql/rust/elements/internal/generated/Stmt.qll 8473ff532dd5cc9d7decaddcd174b94d610f6ca0aec8e473cc051dad9f3db917 6ef7d2b5237c2dbdcacbf7d8b39109d4dc100229f2b28b5c9e3e4fbf673ba72b
-lib/codeql/rust/elements/internal/generated/Synth.qll d9e3ea792b3f99599aadbe4643575fde58b7d9962e530a94568ad1929fc3badf b9bc9d8290dc8ce551664e872b6e6332b3034bd839e5e7db79d26d32a1862ec4
-lib/codeql/rust/elements/internal/generated/SynthConstructors.qll 119d55c15ed6be217168c52a544db614d06ff14cca6d8879ac17594b26248d60 119d55c15ed6be217168c52a544db614d06ff14cca6d8879ac17594b26248d60
-lib/codeql/rust/elements/internal/generated/TupleExpr.qll 36b6933ebaeff36f146f6ad6d640ee2fb7b5980d0e5e015354dfe1f17db1c853 fa0675b31f6e633b9ea25aac0f41c59028782449e499c559eba12a9901f1a43d
-lib/codeql/rust/elements/internal/generated/TuplePat.qll 76a28369b09b0e5ef24b8772a669284e7b057c9f79920aac7d68a164bed4694d c7b8092c3f98d4b5cd14f51d1af8199894a53b1105591fcc543cbee01204c72b
-lib/codeql/rust/elements/internal/generated/TupleStructPat.qll a4b505b976e04b320197861e154e0936d1514411a8dfafd226a9af9dfb6c20c5 75f3406827ece64ae19d7d80789bd090f71b7bb4deef92a50197a006ccd49990
-lib/codeql/rust/elements/internal/generated/TypeRef.qll 89013a9cd6dab225097e46d3bc6c1b5f567d62d19387f2c6082a65b6352f1856 b826b6e178fde80cd9077352bc682286bfebc2375b9d3bde3586d853529cddec
-lib/codeql/rust/elements/internal/generated/UnderscoreExpr.qll 88340f12cee9cddeece19dfb5407a22a31a298a4215dbdea8d5738e5845ce1f6 203f6efbe4016ad68d2dbe5a133637b325b33ed143718a65ada18e48d8adc3ce
+lib/codeql/rust/elements/internal/generated/StmtList.qll a667193e32341e17400867c6e359878c4e645ef9f5f4d97676afc0283a33a026 a320ed678ee359302e2fc1b70a9476705cd616fcfa44a499d32f0c7715627f73
+lib/codeql/rust/elements/internal/generated/Struct.qll 4d57f0db12dc7ad3e31e750a24172ef1505406b4dab16386af0674bd18bf8f4b 1a73c83df926b996f629316f74c61ea775be04532ab61b56af904223354f033e
+lib/codeql/rust/elements/internal/generated/Synth.qll 1ba88215c3f0640558a644534b954e4b93acb15a0f51a1e4887230f451718aa9 747eb3bec1c7245e59ea2b500604f5b4e614e4f061473d1a22fa398ee48ba080
+lib/codeql/rust/elements/internal/generated/SynthConstructors.qll e929c49ea60810a2bbc19ad38110b8bbaf21db54dae90393b21a3459a54abf6f e929c49ea60810a2bbc19ad38110b8bbaf21db54dae90393b21a3459a54abf6f
+lib/codeql/rust/elements/internal/generated/Token.qll 77a91a25ca5669703cf3a4353b591cef4d72caa6b0b9db07bb9e005d69c848d1 2fdffc4882ed3a6ca9ac6d1fb5f1ac5a471ca703e2ffdc642885fa558d6e373b
+lib/codeql/rust/elements/internal/generated/TokenTree.qll 8577c2b097c1be2f0f7daa5acfcf146f78674a424d99563e08a84dd3e6d91b46 d2f30764e84dbfc0a6a5d3d8a5f935cd432413688cb32da9c94e420fbc10665c
+lib/codeql/rust/elements/internal/generated/Trait.qll 8fa41b50fa0f68333534f2b66bb4ec8e103ff09ac8fa5c2cc64bc04beafec205 ce1c9aa6d0e2f05d28aab8e1165c3b9fb8e24681ade0cf6a9df2e8617abeae7e
+lib/codeql/rust/elements/internal/generated/TraitAlias.qll 0a3b568100baaca129a12140b0742a1c8e507ef5b2f2c191ff7452c882ba4064 c32e74569f885c683f8d3977682fcbc8b7699b00d5e538cc6b08acdfffa56bc8
+lib/codeql/rust/elements/internal/generated/TryExpr.qll 75bf9fdda5238155d2268806d415e341fa57f293dcadef003b4a11562c4cd877 935c746f822cf183cdf36bef2332f01e7ce38aa09aa8476d64c1062c5e8f13dd
+lib/codeql/rust/elements/internal/generated/TupleExpr.qll 75186da7c077287b9a86fc9194221ab565d458c08a5f80b763e73be5b646b29f 0250d75c43e2e6f56cdc8a0c00cc42b3d459ea8d48172d236c8cdf0fe96dfed2
+lib/codeql/rust/elements/internal/generated/TupleField.qll d2580e046a576a1a7669463956c929912e383de304854a86eea5e45807a0a882 b41cbc48fcbb56543705e6bf708b72156307c71735d2ed42b97d8bf3c1099dd1
+lib/codeql/rust/elements/internal/generated/TupleFieldList.qll 9d4981d04c2ee005e41035b9699f03bff270c4e0515af5482d02e614a0b1a875 4e60b857fbcb668fa1a001e0eff03f1aa3a7465d32ce68e23544b705fa54fc5d
+lib/codeql/rust/elements/internal/generated/TuplePat.qll d61163a380f3f2c1709080e2df69a90764509af060e607e27e832862e4dae18c 108b7db493a21fe1fa0db99fceee952aabb0a128eac41e050877ab9136407403
+lib/codeql/rust/elements/internal/generated/TupleStructPat.qll 87e0acfeb51d48c55648d5af783f5ea006aaeccce990ba26458c6935fbdf7c11 7c761e66ddacb51307e653c6ad45bec3fba8315049fbe6c4503ed19241204d41
+lib/codeql/rust/elements/internal/generated/TupleType.qll 7fae8e881157a24c4ce4f960269ba8010e227a81d3055b571f861f7196f868e2 18085a19a102df8e2cded938b49709225e89f0ce68b4a003310647bb259a6bd3
+lib/codeql/rust/elements/internal/generated/TypeAlias.qll af02bb172b6f2d7f5eab8645a5a219eee8a4bbc445838f5739f18ba217c7e608 6d871471d673adae99c8b146f6f7ab204f24d52b5013b4582037a42b279c9f05
+lib/codeql/rust/elements/internal/generated/TypeArg.qll fe4441b3faa44e542c43a85353347df23d3f74da0c4b17cb0fdc60f5aca9dee7 1473d044e979e7cb6628525ffd454549cd8a37560488c695f534243946cf83bc
+lib/codeql/rust/elements/internal/generated/TypeBound.qll c4e5a5a919a30f4b334e8218b69fae887bf43e3b87bc63863b2c891beba14ba0 c9d394f31a7cbcfae95d511ad030ed515f51e87697233643b9ac12d6ac61ab18
+lib/codeql/rust/elements/internal/generated/TypeBoundList.qll 31881cae2f71df5adf7a427357565bc0e7ba58c6a774a9d5835560a34c4db30f 1ff36ba34dd966d945d743781e3a1cccad4bb9fd5d32902dfd0bcad537501a85
+lib/codeql/rust/elements/internal/generated/TypeParam.qll dd57c5c370b4e3ed87c42c4fccf71b554cf1c588de1a1d1ac4ed5edbc1fb4664 09cd09537c1196f0a84850f654d324c6ad8aeaf9debcc3d9879e23a313ed93d9
+lib/codeql/rust/elements/internal/generated/TypeRef.qll c4c3bdafe3deb05338f5031c798fa6e72b58301ee7737a785314e72c9c4f091c e6ec0c680bcfe61ff79468de485241a75fbd795b2d501004324b66b003fddbce
+lib/codeql/rust/elements/internal/generated/UnderscoreExpr.qll b3780c99c5d57159bef4c6bd2fd8ec44ebd1854c892c1ca776c740f71249e58c 2fd451cbf0a779e8042e439882e7d9cadc19d1e596df3bbb086d16f2596407c7
 lib/codeql/rust/elements/internal/generated/Unextracted.qll 01563dfd769d6dc3c6b8a40d9a4dc0d99a3b6a0c6725c180d2bf4d7633929a17 a93ce90f8c03f4305e59de9c63f089fc7935298fc9a73d091d76933cf63e790c
-lib/codeql/rust/elements/internal/generated/Unimplemented.qll 465d7b113a1a8d692077690242ac2e2f276026473505412b813da6f96535706e 406f7f40cdd2086986a5e947655a0c3b114ff0c04fccf3a1fa1e2c14a94af9b0
-lib/codeql/rust/elements/internal/generated/UnimplementedDeclaration.qll 3b7820f5676b32a9c3761efc0158ef3d086692424934565b179abd330c649461 3ebf55e2d2238af56828fb918e7af6db7bdaeef16917f5c6da7b2affc8779824
-lib/codeql/rust/elements/internal/generated/UnsafeBlockExpr.qll b1a47956abada9fe79a648ab2c83950dd56d32a08a8e4647889fa6a4f509d101 794a51663d7733c074617b901a498ebe1a4c51781f21007bc318d80ad91d6bcb
+lib/codeql/rust/elements/internal/generated/Unimplemented.qll a3eb304781991bff1227de1e4422b68bf91e7b344e4f6c9e874b324e82a35e60 6bc4839fda3850a56dc993b79ef9ba921008395c8432b184e14438fba4566f21
+lib/codeql/rust/elements/internal/generated/Union.qll 06a602aa7c7097e72fff6ea33d8fb4debaf4023b64b765a3d388ffecc9fa43e4 60d72bd1273e624e36f6227925adc611f5de098081d4f455c32f5af4938ee45d
+lib/codeql/rust/elements/internal/generated/Use.qll d42ccf3516a9f79ae8766f93ad5f09d3cdcd7b96844d4c9de64189b56018a7b4 70a9553a8f71f6cbfdd0f59a4b42292d13177613ceb0542436436e0ac2e1f8ee
+lib/codeql/rust/elements/internal/generated/UseTree.qll b39cbc96e473802372726d580febbfa7d73668ba476095aa4a61fae914865913 40ce6515b7df068fa8c0a7e5ae8984f50b71f6f96d625d631b28d525e3e868b7
+lib/codeql/rust/elements/internal/generated/UseTreeList.qll 829441cf309f008a6a9d2e784aa414ab4c11880a658f8ee71aa4df385cd2b6a8 ced82df94fea7a191f414f7e6496d13791d2f535046844b6f712a390663ac3d0
+lib/codeql/rust/elements/internal/generated/Variant.qll 2e3d8e7a7a97f2f33d6cad458ec0ded498c17a14b697722a96fffecd50c83097 46149bb257c08d5cd9139198b6519d7ad3fd25cc9ea6bfe99deea66f5f1ef201
+lib/codeql/rust/elements/internal/generated/VariantList.qll 4eb923ca341033c256ca9b8a8a5b4e14c7eac9d015be187fd97eeb25dfb1e18e e7865e975c35db49cd72cb8f9864797d3cfed16c3a675b5032b867ced2bbb405
+lib/codeql/rust/elements/internal/generated/Visibility.qll aba81820f30bed0fd2cd06831f7256af15ae32525b2a437896420b4cc067ea38 d6aed90b27124b812daf2ddd14b4e181277cbe638b4ccaab74e27681ac30e4ab
+lib/codeql/rust/elements/internal/generated/WhereClause.qll d6c8f72bbec5d71c024f0d365c1c5e474f4d24ded0d34c56c1f66b1e4a384e9d ed14311d140eee00d3b26a4972f53e20d5af1bddf88fb5618e7e2d3ae1d816f3
+lib/codeql/rust/elements/internal/generated/WherePred.qll 342050e824ca6eb6116488d46cfc03efa79193b4de6049e1f5d4a9fe527b3036 ed07a81de7d63f853c93cbb7291eea3d7169953e34c2f2f98b570028dd1f8cd9
+lib/codeql/rust/elements/internal/generated/WhileExpr.qll fec8a9211b82a80601bf731db17409c5de6bf145295623bd86e28f96452fd91d 3916cf0c0e3b82b834727fc37809dd3e158f395bdf39971abe40b98e5f95a4d2
 lib/codeql/rust/elements/internal/generated/WildcardPat.qll d74b70b57a0a66bfae017a329352a5b27a6b9e73dd5521d627f680e810c6c59e 4b913b548ba27ff3c82fcd32cf996ff329cb57d176d3bebd0fcef394486ea499
-lib/codeql/rust/elements/internal/generated/YeetExpr.qll df8e2ebc4905d1ec05e918444c5ca0472a77f38249d075ac197d5b9787697d97 e3ca44b27f47dc966796499fc4238c30799abafd8da6133f715ef32d4ce36cd1
-lib/codeql/rust/elements/internal/generated/YieldExpr.qll 71f9efa8e6882ea74cfbfc819a25f95a56a541513f1e83e6d75f5db5c7f0531a d710f41dd38dc31211502ebaeec3a3a47d806fea18cc4ed24075d7ce123266ae
-lib/codeql/rust/elements.qll ff4b87ba3c6baf57a511d301bb9e16620f6adfe6477eab6040d825f0aa9457bb ff4b87ba3c6baf57a511d301bb9e16620f6adfe6477eab6040d825f0aa9457bb
-test/extractor-tests/generated/AsmExpr/AsmExpr.ql d0b9ab7eef8934807033f00a7a4752d5d1051d362840c248efda55d79b2b2092 8d6e7756b60f5dfa500c26ac232e0c44d2d7408aaadcb8d8db9af30a19546eae
-test/extractor-tests/generated/AsyncBlockExpr/AsyncBlockExpr.ql 85d756e682ad4f0e2be46776e914f80f4d97356cd27681f6a6c95b59af96d784 071bac3717eb18d89d9e489c3339c339a405d22ad9c2214323649e383cd9b259
-test/extractor-tests/generated/AsyncBlockExpr/AsyncBlockExpr_getStatement.ql 905343965d7ea869acc5a651aa98c04bf13124feb02d7df27dcfde7444d89645 ea93464d067b393856a0d9c2a1b3a5562e9a330bb74f490e6a0a11b3563b3f6b
-test/extractor-tests/generated/AsyncBlockExpr/AsyncBlockExpr_getTail.ql c7e97edbaab7fb5a1d94ba8054bfe25ad1cc03d3145c6e79e640a0435948841a 2c4ce3a66a3704a3ea976710ffe2f5d66cae374a00d251e7d1b020ff6eb75ec6
-test/extractor-tests/generated/AwaitExpr/AwaitExpr.ql 6baa86e600b1e644c31b07a0339cb0121f0f408b378f4724913d9e915a60ef15 1a6a1e861fdd06f684ff59da4e18e22e4e031eb7d74ef926e73fdbbae4b0c534
-test/extractor-tests/generated/BecomeExpr/BecomeExpr.ql a36a06c08b04daa6f6ff22867c175004794aebcfcbcb10c1fe074b2c5a2dee72 2c0beda0cdfa346d33768f9cdc690831c102919d96dc44c3c68b9cc254a9c0c4
-test/extractor-tests/generated/BinaryExpr/BinaryExpr.ql f51bee6fe6c127b93f3389a55907dcc3612cf55699409fe2f6ca0c170c276a90 a19675ed98a883e2aa6607af308cab050826e7a1c35c2a4b1d321040200265ff
-test/extractor-tests/generated/BinaryExpr/BinaryExpr_getOp.ql b1fd7293118b77c2d54cd0a235425cbfdc79ddabb522b062b3f888f2a14379a0 fe8ef99121912788d65dd57a6eef0a6a159afe90bfdf159b096478dfd0d5db5e
-test/extractor-tests/generated/BlockExpr/BlockExpr.ql 515422cb924e8f10f43c13850970a8cec5c9b1a5bd320825a8af0b6cf0fa213b 2665637c5ff2bbf601a2d156583bbd44b58bf295546ccf0fb67f069ff3ff74da
+lib/codeql/rust/elements/internal/generated/YeetExpr.qll cac328200872a35337b4bcb15c851afb4743f82c080f9738d295571eb01d7392 94af734eea08129b587fed849b643e7572800e8330c0b57d727d41abda47930b
+lib/codeql/rust/elements/internal/generated/YieldExpr.qll 37e5f0c1e373a22bbc53d8b7f2c0e1f476e5be5080b8437c5e964f4e83fad79a 4a9a68643401637bf48e5c2b2f74a6bf0ddcb4ff76f6bffb61d436b685621e85
+lib/codeql/rust/elements.qll 173d5ffbcc2874757033caab37559e84dbcbfed319730f8e41a4e9e10b146835 173d5ffbcc2874757033caab37559e84dbcbfed319730f8e41a4e9e10b146835
+test/extractor-tests/generated/Abi/Abi.ql 7f6e7dc4af86eca3ebdc79b10373988cd0871bd78b51997d3cffd969105e5fdd 2f936b6ca005c6157c755121584410c03e4a3949c23bee302fbe05ee10ce118f
+test/extractor-tests/generated/Abi/Abi_getAbiString.ql a496762fcec5a0887b87023bbf93e9b650f02e20113e25c44d6e4281ae8f5335 14109c7ce11ba25e3cd6e7f1b3fcb4cb00622f2a4eac91bfe43145c5f366bc52
+test/extractor-tests/generated/ArgList/ArgList.ql e412927756e72165d0e7c5c9bd3fca89d08197bbf760db8fb7683c64bb2229bc 043dba8506946fbb87753e22c387987d7eded6ddb963aa067f9e60ef9024d684
+test/extractor-tests/generated/ArgList/ArgList_getArg.ql c07c946218489a0ad5fe89e5fd4a7f0ad84a73dc2e650729f48a340cb133be84 ff2382c0693f47e5eb1290aca325290e60c19d877b25b1d7e2ee96009f5fe934
+test/extractor-tests/generated/ArrayExpr/ArrayExpr.ql fd4e504678714c99a987069e5013bda04313573cec2bab31b74bc4559bb73d7f 0b63120b61964a215ec451793a1b5aef525882484ad62193d7635b5a370881d4
+test/extractor-tests/generated/ArrayExpr/ArrayExpr_getAttr.ql ce143c8b416c35270cca839848baf6d8cda74251f3717314e0f332fcb74a9259 c86d282153feee3facad752ed0fc1638be0cbaafca4ec620f337ad61b694cade
+test/extractor-tests/generated/ArrayExpr/ArrayExpr_getExpr.ql e8b7e24db6fc6098131fea1053430920b2e2f33d2aa52b10d2ff29b9efd70a88 a52b6b2476104695b395d86bbd1a99068372ca56989ea94b150055e664ba034a
+test/extractor-tests/generated/ArrayType/ArrayType.ql d781ea647d60218777261d82230bd85f989a4768a043e736d268363b5a777390 b5c7fa0aa1b8b1f3a82b8af7254bf20efd3477bba83ad53530959d1733636604
+test/extractor-tests/generated/ArrayType/ArrayType_getConstArg.ql b6a250873bc2d553219b8301a15bd19a4044f590085992c532a800bf3ab744cb 5e6b9dbbe2d3ea7f6fa3fba4811517a528d5eb58169b69d1b9113e1508c6e627
+test/extractor-tests/generated/ArrayType/ArrayType_getTy.ql 1c23613e509ada3ffc1f727d0db7c5955dbc104d886fe5f9d8f39413b54d16b0 a662d234e1e54159d931a873f20ed8953d9b27778c7a6ca898f86b31d1dae0cc
+test/extractor-tests/generated/AsmExpr/AsmExpr.ql 1273efcd8aab7de2a04ead74075d25c8a22afc9f0e6a3fb4322e3508a2cb6f84 cdd5389a269c048f56afaf3e93a0fb076ba1f445d6dcfc6621d8a324cac2f421
+test/extractor-tests/generated/AsmExpr/AsmExpr_getAttr.ql 93e644147ddc4de00c882c32d17ff3c22822e116b67361d52217619153b7d4c4 4c0c3f72707f41e879426ff75c5631e9283dc0507316740bec22216c5feb04e9
+test/extractor-tests/generated/AsmExpr/AsmExpr_getExpr.ql 4a37390e948fe336b592342b0c2b63afeac3000ce1416f5875cc9b0ce5a826e4 d32df64ddc3ce1b0536018ddcff30a24d9099c67e6bcbe9a4693ffb6e478361d
+test/extractor-tests/generated/AssocTypeArg/AssocTypeArg.ql 2bf498a1e318cadf66f9f6341b41247c09070dbbab6d15ed4d3cd986a7f7da85 24d62bb3cb0a97c0e6180221e6cc8be86d9616021f8ef53175bbeabb5151a613
+test/extractor-tests/generated/AssocTypeArg/AssocTypeArg_getConstArg.ql c81e25fd7885f13c0500e8f9b84195876e70f2b25ad604046f497818226c8542 62ac0e7c82da169c248e4f9e0e8f866d2f4e599b03a287c2bd407b95a5d9efc8
+test/extractor-tests/generated/AssocTypeArg/AssocTypeArg_getGenericArgList.ql 4d20375752c000aab8d2e4988fff1a5c95689d114c8d63f37b389b95000ee873 957e360a4eeefa2536958770a7d150fda610d1d45c09900dbe66e470e361e294
+test/extractor-tests/generated/AssocTypeArg/AssocTypeArg_getNameRef.ql 0fbb10321c355b15a9fdb2022af254d9d50b084117e47abf4c03bacc6189c9dd 084624f77b21062822fd16441e0c05e7820140bd2e468aac624782f0c4474e26
+test/extractor-tests/generated/AssocTypeArg/AssocTypeArg_getParamList.ql 586cb26683e522469a5094d359be4d8e5c6a3a74c1621a059bfcbbbedc0e34b4 84784b38c24313f3ffc88371421550922d9deb44d09ca7727ca77e892a672dc9
+test/extractor-tests/generated/AssocTypeArg/AssocTypeArg_getRetType.ql 3e18791a74c12d93ac8f786aa76bd836876052837bb9f0b25222cde47c55e419 b53bb52ff98c1ca0ba09ffce034a97ddd86e32828df7acb9bf34e20c4fb19664
+test/extractor-tests/generated/AssocTypeArg/AssocTypeArg_getReturnTypeSyntax.ql 37252b5cee5ae64c36612aea57a6766bd34254ae35b9774642a36a8222aecfe6 c1f587d52b39c8aa66b9e6e4f36f40bda17dfcd72714ff79a262af99f829f89d
+test/extractor-tests/generated/AssocTypeArg/AssocTypeArg_getTy.ql 6973aa12e00987ad1482401fbc0855a5fa585df5b3d44e2db4e81a84e5af46b1 791822b44c21f78801c8360e2ee4651352719204d9b3ce75bd2d77e5f805f509
+test/extractor-tests/generated/AssocTypeArg/AssocTypeArg_getTypeBoundList.ql 7e006ac8e8574c66a312b1389c7a85a83561b946e060575cc7234ef523b1a3ba 6123b375796c014a0bc96d39877b3108c13eff34536aa68402bda85511da18da
+test/extractor-tests/generated/Attr/Attr.ql 028ac0a387f674205c5ef903238872ab1b6b7e2201f58c31776cdf740daf437c cb56a22887e0737d28034b39d7c3fb37a3d6eb1f34ce3d112bcea2f0affb3b13
+test/extractor-tests/generated/Attr/Attr_getMeta.ql f1e2df2bc987c670e31b454ab51b3028efc1018fbed2298a8c97f554eb1862f0 a9115ced872c89edc398bda1cbd54068f9065debc14ea5ac887ba13ad8f4e3d8
+test/extractor-tests/generated/AwaitExpr/AwaitExpr.ql 8dcc94a553fbddf17dfc619fbac563a9dc4fc6029860e10703e9ae9765d9ab66 52e7f0c98e6ab5dcef04b2ab5283ecde76e61a2297aa2080d16998f93dc923b7
+test/extractor-tests/generated/AwaitExpr/AwaitExpr_getAttr.ql c5ee1fc6017c4432a59dfec7d10d32681bd23f98cac70bbe65bc2aec8a680f3a ce6cf93c6305e6585c9d452bcc23af9dc8cbe2c872d2af5238a54c85df2071ee
+test/extractor-tests/generated/AwaitExpr/AwaitExpr_getExpr.ql 143158284c8b7cc40fd2fa47c0bcf3f137ecd080b830476faca0c950b97c797c 0c9f64ce70cccf90fff7e7e9602f8ffdf68535d113914aab24f6450505b61d10
+test/extractor-tests/generated/BecomeExpr/BecomeExpr.ql b095c87b128d667f76585cda671173808130df6d094ac7ebcf89fc345d7908f4 aa3f1caba1cc7a40a0903f91458807e9ac9e8e9f3f5688acea061cebc8a2ff07
+test/extractor-tests/generated/BecomeExpr/BecomeExpr_getAttr.ql 88c6342cfaa4d199a6c9f69612d3f783ad48c715c729f4909d563e032ee50be3 d90c139b22bf7350f9ae32b8b3ae6c19bf190fb2b4d5154b845f2252090fde32
+test/extractor-tests/generated/BecomeExpr/BecomeExpr_getExpr.ql c8942270a2ff2b1b5c9ee4319185f0a8f1f8acb39eb825029c02a2457a8cd641 fb4c910ab658404869506718e18a5c8097629ba56111329552abbf429df0a324
+test/extractor-tests/generated/BinaryExpr/BinaryExpr.ql 1c36f72c679d4c0e7d0653bf5f7b70e3019d68e9115645f6db61f6fccabfeaf4 890b64875e44a73eec0d7c905de3363fffec3468171de628652b5066a4306bed
+test/extractor-tests/generated/BinaryExpr/BinaryExpr_getAttr.ql 26d985ac4b668d78d2fefc6b5a37f2dc334e4c5f8511dd14b89014e2ef5c3b07 4546dae1816b2618f8d881e0ca8eaa851c768fcd994f3edd3285a3880878177c
+test/extractor-tests/generated/BinaryExpr/BinaryExpr_getLhs.ql c3f19d8a60066ad6b1810291a669473c75b659cd2f6ac3ab9ed3db2203d4145c c05c5e0226e30f923155669ffc79cfe63af1ca464e8dfc85888dda5f7049711b
+test/extractor-tests/generated/BinaryExpr/BinaryExpr_getOperatorName.ql 33612159be1c111e3306009d0b04579450fc962a81119b6ea4e255d3c409b401 1a0995b298f50242217cfef81dca8ac978e19e06f90a5f4caadcb6f84460fec2
+test/extractor-tests/generated/BinaryExpr/BinaryExpr_getRhs.ql 3bcd36b678e87d5c29a43b69c54c80468a89aefa7e69481b48158ae794a53160 a629dc1472b3f6fd7c608ff760e83d8e1363db81dfe9a4b2968690c2ba4925ca
+test/extractor-tests/generated/BlockExpr/BlockExpr.ql 0ab66b190d4e2aa784e61088c4779ef4d08cb4453677ea087c4f9aa369494bc2 1c3b5794008114d1297695d82590220929e3974e27836b2c6062d14b73379a40
+test/extractor-tests/generated/BlockExpr/BlockExpr_getAttr.ql 15d4d9853d3262ce6ec629c075c60a76eb112dcafe34b71df0e09b39282223cf 792c498bc7079bb5b93034b8a87db3b275a591d78954e844821aeacffe4258ea
 test/extractor-tests/generated/BlockExpr/BlockExpr_getLabel.ql de3c28a2677ed71ebd95207aa43ce270765f7f556283f095f1f6296622b80cbc 414ebbb2bfbe4350f933fc3d3636b49a6bb8242e200180780caf95ab8523adb0
-test/extractor-tests/generated/BlockExpr/BlockExpr_getStatement.ql 69f4b01ce9d5556d7feb6253b5338381fb87bbdac9689259782d4137974f1157 0d881570e704c1e0b9c9c5b4ed651d7cddcd68b3e0924e33245dc058cb67f870
-test/extractor-tests/generated/BlockExpr/BlockExpr_getTail.ql 741818e134e2bebcb85cda6ef51602630df107818ed9556542ac3cc24055e72d 62ffc7338d85dd08b35266c6c6f065f0b8738f48567905ebc7006702b81b4dae
-test/extractor-tests/generated/BoxExpr/BoxExpr.ql b978301a8c9efe3e6377c7e41c5b4750f172a61ebe2fd4c2bf1220de5a84a4d4 84903da0392078a0212c4eb18f8da29e1fbd33dc437cacd6545007f07649c66b
-test/extractor-tests/generated/BoxPat/BoxPat.ql 850ddde8ad94d0b96f042adea48be544dc87af810098aa3a18649f03349e1718 aa775f649d818a48b89c15c7c0de5346017d9e432c6b8089adac51d3144c3e17
-test/extractor-tests/generated/BreakExpr/BreakExpr.ql 498d6a8d397563b305e023868996e838600f6a8ef134aebf2a4bb16ff1b2a882 7bbd39b4122935ef24b891b3490f87745747d89fc92d96e24149e251dc40ef2b
+test/extractor-tests/generated/BlockExpr/BlockExpr_getStmtList.ql 8c391dfeb69bd92c547a2417bf231cc960a8f34845802722214294728772316a f3e847fa594e9d9cf25d09a0396a10176aad1100c1977a24756ff6287a79e69e
+test/extractor-tests/generated/BoxPat/BoxPat.ql 228052e5303f523797994232b1b762c26ce29bd1e38b49d496ccf04090b97c00 6501e816dcb8839b9b72c6ab231db449b8f7779e5faadf5a8c5be81f53eb001f
+test/extractor-tests/generated/BoxPat/BoxPat_getPat.ql 7372e29737d968820108211612ed880f3e13084992419f5b52eaddf4bbfa874c dda2f412fcfba756604c03b766e9bbd17e6c2141b2d355fc0e33ec33573ffadb
+test/extractor-tests/generated/BreakExpr/BreakExpr.ql cdde2855d98f658187c60b9edc2aa36b1853270f3c183a37b11801ff24d22a8b 687ec032ff86ee21952d2b95dde93fba026a09f6f39a284fbc6e9b42647d80e3
+test/extractor-tests/generated/BreakExpr/BreakExpr_getAttr.ql c7690a9aab1923bf3c2fb06f0a1d441d480b3c91ee1df3a868bbbd96c4042053 c592dd077fb6e22b2d6ddcaec37da2c5a26ba92d84f5d1ae4c78a615b9013765
 test/extractor-tests/generated/BreakExpr/BreakExpr_getExpr.ql 0358f4fe6a66da56177703cf0e991042729c5e34ae8b6dccbb827f95fe936c72 1cb2dd778c50e19fe04c5fdf3a08a502635ea8303e71ff38d03aa7dc53213986
-test/extractor-tests/generated/BreakExpr/BreakExpr_getLabel.ql d1ca3cdaf5345818310d2db0f2171ff5c3b51f72049d8e1593ba11e52273fdba a52927e447cadee30712adb139e248b0c303eaa111ec96a165c1e484129af8dd
-test/extractor-tests/generated/CallExpr/CallExpr.ql 9f4344f3e5c8d0fa4f4ae2852bd138bacd03aa3000915626c245d98a2bdf4d04 fc1a0e71feee06dd65fb7e587ece5720e79ade1e9f452fa752290aaa7c2f3ceb
-test/extractor-tests/generated/CallExpr/CallExpr_getArg.ql 7d8d53ee4a0642f85d6bbfee6912fead699b5d117534d2b1803a670550894484 1782b33724b72afc9b7d99e3a52cacd4431ce1e12a7e43a7ac9872aad769b4ee
-test/extractor-tests/generated/CastExpr/CastExpr.ql 15a1031c620660c59bcb97f194f6a2f51b980aefdb39b421bfd488d6083f301a db35e9fc243a10dfff2e689547bd72baff8d0a59c0c9a505027caa577d33fe58
-test/extractor-tests/generated/ClosureExpr/ClosureExpr.ql 34280a37a6854c3663baf9612e49de4267a06cd70d4c6252b97405627fc1829d 5e9f565f4fcf48eb4317fb9a6e532361f58db93344e50bdd0ad51cb88b92379c
-test/extractor-tests/generated/ClosureExpr/ClosureExpr_getArg.ql 828d3cb2e0c85a22691a7189f722eb9dc16e4a8e4df8aeebbfd47612ef60d774 74a7db9d3346fb364485e5b45f64b11eca58f080bedb9562a47c29587e0b9e00
-test/extractor-tests/generated/ClosureExpr/ClosureExpr_getArgType.ql 53f0ca394a11b9ba30cf3773f939c3d97071d22e417451a6cf4e4a81660e3f36 a6fd1043585b96c92875747186c0c211aca4228f82df6382804b2cad64458817
+test/extractor-tests/generated/BreakExpr/BreakExpr_getLifetime.ql ad83cc0db3c0f959fef6bb7ce0938d241a877e8cf84d15fb63879be2fe47238c 240b2fe2156b763d3a82fc64159615872db65b65ffb9ba2f3fd5d1ebd6c60f34
+test/extractor-tests/generated/CallExpr/CallExpr.ql 69d88b3c799f6e81fe53fe04724ed6c1cbfbfcc21023dd62aed3a3f852c6a2aa 0caa94802919d30bf2749d8a1c58545163e2b1cad5490f19158b5e5063806443
+test/extractor-tests/generated/CallExpr/CallExpr_getArgList.ql b022e7b6b6db9932e787e37b7760c6a09c91140a0368940374a2c919688e0488 c20849c96b53c96f6f717efff5e8b4c0e900c0ef5d715cfbaf7101c7056ad8f4
+test/extractor-tests/generated/CallExpr/CallExpr_getAttr.ql 1ace458070875b9ff2c671c2ee18392ea7bf6e51b68ee98d412c8606e8eb8d33 4c35da8255d2975cef4adee15623662441bb8f2e1d73582e4c193d1bc11cc1b5
+test/extractor-tests/generated/CallExpr/CallExpr_getExpr.ql f680f04423ece282c459d5908e5aa0bc43ca072ff0e605587dfa94210da1d06d f8a709015b8317b8e2dcf3b3ee9370e2c3a655ef7e3c6034b1b90f4d75ebdda2
+test/extractor-tests/generated/CastExpr/CastExpr.ql 2ffb22ebc6e47953a49162488b3605d36b9d89330b1e71187066e7bbc40a22ad 7621a39d49f573b9862b9a4e1021d53205670ee59b49e4d81128637926f76485
+test/extractor-tests/generated/CastExpr/CastExpr_getAttr.ql 5d5d98172e495cdb8b5cea9d6588c4c245107b441464e3ffd6c27668af11ab4e 5820bf083aaa4c3275004a2cd9eeecc4b45ab96916cbc0655a1b42611c540715
+test/extractor-tests/generated/CastExpr/CastExpr_getExpr.ql c37186b8f3e3dab8ae28c0da7263ff7272c40501beb16736ec0fb8990d285e22 59d50d7349234afcf84986b7570db9dcd342e16812f7c46199d4736cdfa5462d
+test/extractor-tests/generated/CastExpr/CastExpr_getTy.ql ad5d6e260e1495ba360bd2ade3b60f09705a86a08d618acf8c4aff342c8ee200 c02c1dc65ba9160bc28827e40473915de5403bdc91c16d9d8b6778aa97314a1b
+test/extractor-tests/generated/ClosureBinder/ClosureBinder.ql 42516df87ac28c814d65f6739b2ede6eaa41c505d64756a3b8c7e0ca79895230 8b840f92ec033a4ef5edbe52bed909d8be0fffddf6d3e4bfaf9a8bc174fa2f2c
+test/extractor-tests/generated/ClosureBinder/ClosureBinder_getGenericParamList.ql 71010c43a78a7abe8e63c94353f4b7eb97aca011755d200e7087467c1e3b7a68 2c834328f783ec5032544a692f7e23975bac0228b52b9f8fde46ef46a5f22a5f
+test/extractor-tests/generated/ClosureExpr/ClosureExpr.ql f25f9b32e5c0cd61e4b75053a5af4640a08b115ea5a4310ab95df450f6dfe1c4 9b731218857fa16776e29bce084c2ec1526b24e15f46d4f24047917d77d4646a
+test/extractor-tests/generated/ClosureExpr/ClosureExpr_getAttr.ql f7f803afa4e2a5976c911fdf8a91ec607c2f998e22531b9c69a63d85579e34c3 1296acd0fb97e1484aa3f1d5ba09d18088001186f3ba5821eb3218a931ca0d54
+test/extractor-tests/generated/ClosureExpr/ClosureExpr_getBody.ql 22a973a61274e87620e38338b29beef395818b95a88e2261fff197f7a78a8f76 bd28ed426e4d07823044db869aa8022dc81e8599d156e3e0e7cd49be914a1f36
+test/extractor-tests/generated/ClosureExpr/ClosureExpr_getClosureBinder.ql cbfcf89b8efb5cb9b7bfbea26b5a78b3d4c7994cbf03d5ca60b61ee1b5cb4be5 621431277732ef79c585cb0b7199c49b14c597ee6b594a70d9e6966a09d40a9f
+test/extractor-tests/generated/ClosureExpr/ClosureExpr_getParamList.ql 68ce501516094512dd5bfed42a785474583a91312f704087cba801b02ba7b834 eacbf89d63159e7decfd84c2a1dc5c067dfce56a8157fbb52bc133e9702d266d
 test/extractor-tests/generated/ClosureExpr/ClosureExpr_getRetType.ql c95bc7306b2d77aa05a6501b6321e6f1e7a48b7ad422ba082635ab20014288ae fe72d44c9819b42fff49b9092a9fb2bfafde6d3b9e4967547fb5298822f30bc3
-test/extractor-tests/generated/ConstBlockPat/ConstBlockPat.ql dfa92e1da623088e71f14e2298e07c30d2ec678236ec54d9654534ae195fc48a 72700785ab795ff6ccf702effbbd86a21c02d48ce2e206a90bca42c633167bc2
-test/extractor-tests/generated/ConstExpr/ConstExpr.ql e6699b72b1e61a0a4adb55e8fee7ee77f99d8ee4a4e0afc81072a71ce2160bd6 d30cbda271b51501b6c1764bc4e9e703e8bbfeac58bc9a4920d28b188da9aefd
-test/extractor-tests/generated/ContinueExpr/ContinueExpr.ql 79dac2a78474eb555579768726f5847f1c4dd8ddb62adbff577bd38fa2ec5a88 d8b3e9b6c1e5760f3d4d0a9768d96c73e6a10f415106212c6de4c2dd09e2fc0d
-test/extractor-tests/generated/ContinueExpr/ContinueExpr_getLabel.ql 8800ed6eb6639c8e2775d0ab73f489c5f050fba75768497bb3b811696de0fc33 26fabcec52eb83494ab7b49d4cb8da75d62240e2c90e60e2a339e09db5a17293
-test/extractor-tests/generated/ElementListExpr/ElementListExpr.ql 934e9f23cb987459baea1f9c2fb244ce6152891c5df91cd0bf55ac7aa1397993 05d0583509bed8122b47dd867e66df8c6bd8c3784b1d88c8efe2931f1605733a
-test/extractor-tests/generated/ElementListExpr/ElementListExpr_getElement.ql 6570425a1722361d965d3dee82ac520efa6b136405f895232156c51872a2020f 5f9c7b26ab2fd2a95a4a7e86797112a054ea0fa12d6c9daeb7ee570b680c65d1
-test/extractor-tests/generated/ExprStmt/ExprStmt.ql bfa740ca27f40dfa03d3d6e1d04b6a33eefb11b51f1be8e8eeb97e2175ab48d1 5dc2f48475155433eed95ee40b055095096d972c410ca633807dcc7bd012b8ee
-test/extractor-tests/generated/FieldExpr/FieldExpr.ql 3645fdca1ed9f90c2074b4797763b99cf9159dc61305068b6316cd3278904b37 5956b62c22ae38f8434a2a6bce2dc07f1a4ad2801d5a6b6c54dc30a4c1003b8c
-test/extractor-tests/generated/Function/Function.ql 347912a8d8e541993f56753400867e04e96f3b20d4a7aa75ba8c967982f23f8c c81f0cea4bb896c5ef56e43c0b98c9f1082af6ae6ef5a3aeaa7f3bdd8cc47e74
-test/extractor-tests/generated/GenericArgList/GenericArgList.ql 5dbc447435af8fc2d57838af87360976a0a9c262cf98e79999798f1cb44c709d 16dad42ef8445d3c29d8bece7b68b4c04e123a1e4054ac0673a99c85267638bc
-test/extractor-tests/generated/IdentPat/IdentPat.ql 8337872488c291ea441ad33103c5834c31f1db018a1f466d5075bc7e2ade01e7 72e2598880e389f1fad9cad937b0c6d1305ebee8a7b1613e1b1f913b9cd88d9b
-test/extractor-tests/generated/IdentPat/IdentPat_getSubpat.ql 7be7acda6ac92efa166e49788f5bce771e3962348c144664f0d3ad2142134d55 9ffb007e064f5aef13e436948b9683d0c424019d3fb36b812760f421b2670493
-test/extractor-tests/generated/IfExpr/IfExpr.ql 32c487d00371a9ba10d824677b3020f00a1f0e9377e1741b3d418f561552014e 6dc872bac32a54722d939c265da57fe405b78076f8022eebf36773858e0a6893
+test/extractor-tests/generated/Comment/Comment.ql 5428b8417a737f88f0d55d87de45c4693d81f03686f03da11dc5369e163d977b 8948c1860cde198d49cff7c74741f554a9e89f8af97bb94de80f3c62e1e29244
+test/extractor-tests/generated/Const/Const.ql fff4c81591a1f5e691f2ad242e8fe8e2b0d6b0f974e312a2a0bdb7de80b985b5 0cdf3eba64d5d66d5069727bad08cbeb1266456f61b3967d27f542412cf56d47
+test/extractor-tests/generated/Const/Const_getAttr.ql bd6296dab00065db39663db8d09fe62146838875206ff9d8595d06d6439f5043 34cb55ca6d1f44e27d82a8b624f16f9408bae2485c85da94cc76327eed168577
+test/extractor-tests/generated/Const/Const_getBody.ql f50f79b7f42bb1043b79ec96f999fa4740c8014e6969a25812d5d023d7a5a5d8 90e5060ba9757f1021429ed4ec4913bc78747f3fc415456ef7e7fc284b8a0026
+test/extractor-tests/generated/Const/Const_getCrateOrigin.ql f042bf15f9bde6c62d129601806c79951a2a131b6388e8df24b1dc5d17fe89f7 7c6decb624f087fda178f87f6609510907d2ed3877b0f36e605e2422b4b13f57
+test/extractor-tests/generated/Const/Const_getExtendedCanonicalPath.ql 3300b902e1d1f9928cfe918203b87043e13460cfa5348a8c93712d2e26d61ced 71e7b80d3290f17b1c235adaca2c48ae90eb8b2cb24d4c9e6dc66559daf3824c
+test/extractor-tests/generated/Const/Const_getName.ql b876a1964bbb857fbe8852fb05f589fba947a494f343e8c96a1171e791aa2b5e 83655b1fbc67a4a1704439726c1138bb6784553e35b6ac16250b807e6cd0f40c
+test/extractor-tests/generated/Const/Const_getTy.ql bf9abfd2be9d22193bc6be9916c7171d79ae7fcdaabf1fc9659997d11d2f074e 133348f60312055fe112eca3a0ef2e1e210b1690261dd9b06979214908d59097
+test/extractor-tests/generated/Const/Const_getVisibility.ql de6b2e9d887316e279b45fab7887980ca7d93fd32c2259f3a06de2b6e2957c12 2f135cdbbb84b43d282131edb7eb4df6caba61bf7421881a49d4679f0f44f661
+test/extractor-tests/generated/ConstArg/ConstArg.ql f1422b216eb45819ff41f0c19e0f88aa184ddd3fa2984ba22ec46df398147fc3 d2e4f367848c2bc4f6aef51c1dd8180035c39919430082c83f18a3f324228df3
+test/extractor-tests/generated/ConstArg/ConstArg_getExpr.ql 317fd83ad51acc3ff3dfab71ebb1385b67d49404c1d7b3804a8ca3c099b84e99 91ecf5ebbfc1aab286dce708680f0be97417f9755676db7479fa6836e50be845
+test/extractor-tests/generated/ConstBlockPat/ConstBlockPat.ql ee17b4deba9c503130e3ce565102bc8e181770efcb1309be9c822f0a7ba6fc17 638ed17b5c009e71b31f580c4060ba763bd4208c3984b6c032183ab46a4dd43d
+test/extractor-tests/generated/ConstBlockPat/ConstBlockPat_getBlockExpr.ql cc06e762e1652e467c7cf02c34f17c621fb3a938f294ee527fa04ed78c8701ec f863f8f6bfc9d169b585ae56b4e4ac0fc1603fd14775450e950cca4d5ea28e8a
+test/extractor-tests/generated/ConstParam/ConstParam.ql 1c2ec1a00ffc754ade227536f3efe789cdbee714fa003abff5e0221b9b53d08a 6f24ef0b280b18603a6efd217c691c4249898be95dafd5ff5a586cb2f2ecdf40
+test/extractor-tests/generated/ConstParam/ConstParam_getAttr.ql af8949f1ea039a562a3b3561185a85f7f8a871bf27dba0580782f81c62b6508c 2874783b84fdce47b809f953e02c36473cad6a2d3dd1c0f1a9cb14a3e28b9c30
+test/extractor-tests/generated/ConstParam/ConstParam_getDefaultVal.ql 021630468422c30e7aa623bdf4e97f3076e68087991723c624922b1ee608d173 9fd78738cfd0455be2c655852f6c618e901af80c6b6791396d9683c118a44e91
+test/extractor-tests/generated/ConstParam/ConstParam_getName.ql e2e9b75dd7ce501793efce75079aabd3851b91aa4d437972693bacd7b04859d8 4d2326b39af870a2ef8b37448f78395cdb5c1e94df88f137ef71f8fd3548cd8e
+test/extractor-tests/generated/ConstParam/ConstParam_getTy.ql ad3f1ee12d3ba8e851856cf3e75566791218e40649a8bf54b1f08764c8b5feec f4ed7f40f83f59df8dd2f53073f73ee94c2ef6f6f77963f81ac8c62dd88244c9
+test/extractor-tests/generated/ContinueExpr/ContinueExpr.ql 971ccb238aec663855745fa2669d5f8973a4e6c76bacdf0deaf23522ec1cf80c 4e3ceb4c4cd833ad8311bb02e5cda18163082e341cd8a3def60734a53cca8929
+test/extractor-tests/generated/ContinueExpr/ContinueExpr_getAttr.ql acb261869d3b3c65e364e7b6fbd7afdf5305806d4417b05044beed9a81e66ea4 af35ce0aee87ddc7a0cd34be4a480c619940d036d5cecce0e4e1fcd75b7c553e
+test/extractor-tests/generated/ContinueExpr/ContinueExpr_getLifetime.ql 39dae9872d92fa9b15343c93da545c2b0e15b4f27f2296c200fd4611b68858d5 52a209022e3b83260b4ef5513ffbcc1ca1f7c21bad2c721a0d3698793d2161d2
+test/extractor-tests/generated/DynTraitType/DynTraitType.ql db4cf318a76eaedaa9a9deaf11009a24497b88557439c2e0560290efe950ca05 e0fcd8be6bbe2e305ac16e25925a50206f36cba25cb0bc4c7e9b166d2ee6b19f
+test/extractor-tests/generated/DynTraitType/DynTraitType_getTypeBoundList.ql d04a1836c28f14884771f5868d5a3f551d9251c3c3a6c07a4dd9dbef6b764875 9c590f1ecd375c22fbc0ad5657243ef40fe7a7684ee81e57e7efbb73544d4398
+test/extractor-tests/generated/Enum/Enum.ql ed518d828d8e2e4790849284de1d0d5e728dbc2fe5e9f187e8ebfa2d503efd5a 7092b963eb133371e1cbc09d45f8c2308d7093523140b351d67073a8d258643e
+test/extractor-tests/generated/Enum/Enum_getAttr.ql 8109ef2495f4a154e3bb408d549a16c6085e28de3aa9b40b51043af3d007afa7 868cf275a582266ffa8da556d99247bc8af0fdf3b43026c49e250cf0cac64687
+test/extractor-tests/generated/Enum/Enum_getCrateOrigin.ql 76d32838b7800ed8e5cab895c9dbea76129f96afab949598bebec2b0cb34b7ff 226d099377c9d499cc614b45aa7e26756124d82f07b797863ad2ac6a6b2f5acb
+test/extractor-tests/generated/Enum/Enum_getExtendedCanonicalPath.ql 001bb634adc4b20afb241bff41194bc91ba8544d1edd55958a01975e2ac428e1 c7c3fe3dc22a1887981a895a1e5262b1d0ad18f5052c67aa73094586de5212f6
+test/extractor-tests/generated/Enum/Enum_getGenericParamList.ql 2a858a07195a4b26b8c92e28519995bd6eba64889bddd126e161038f4a8d78e0 db188f238db915c67b084bc85aa0784c6a20b97b5a5f1966b3530c4c945b5527
+test/extractor-tests/generated/Enum/Enum_getName.ql 32a8638534f37bfd416a6906114a3bcaf985af118a165b78f2c8fffd9f1841b8 c9ca8030622932dd6ceab7d41e05f86b923f77067b457fb7ec196fe4f4155397
+test/extractor-tests/generated/Enum/Enum_getVariantList.ql eb30e972b93770be1b64eb387814b99b3901e8884dd74701c5478574242f5269 43e2f53c339f27e71954a96e218f6fc8a631b827457f718693eb2c79737b6cb0
+test/extractor-tests/generated/Enum/Enum_getVisibility.ql 7fdae1b147d3d2ed41e055415c557e1e3d5d4c5ec0da01089c0a8a978782f9cb d377397b4d9a3f34aed2a1790d1e826c9f77b60d65d3535b7738f21c41e1a095
+test/extractor-tests/generated/Enum/Enum_getWhereClause.ql 00be944242a2056cd760a59a04d7a4f95910c122fe8ea6eca3efe44be1386b0c 70107b11fb72ed722afa9464acc4a90916822410d6b8bf3b670f6388a193d27d
+test/extractor-tests/generated/ExprStmt/ExprStmt.ql 811d3c75a93d081002ecf03f4e299c248f708e3c2708fca9e17b36708da620e5 a4477e67931ba90fd948a7ef778b18b50c8492bae32689356899e7104a6d6794
+test/extractor-tests/generated/ExprStmt/ExprStmt_getExpr.ql e269bb222317afe1470eee1be822d305fc37c65bca2999da8d24a86fa9337036 088369d6c5b072192290c34c1828b1068aeedaabdae131594ca529bbb1630548
+test/extractor-tests/generated/ExternBlock/ExternBlock.ql 45233abdf39caefd2d1d236990a5fbf06eb0b547d892f1ad3e82b8e3c215bc79 df30e0370ed20bef3b2c5bed6e8c27b27663716e7c9e14e85acb6e33a43f4edc
+test/extractor-tests/generated/ExternBlock/ExternBlock_getAbi.ql 9b7c7263fcbc84e07361f5b419026a525f781836ede051412b22fb4ddb5d0c6a c3755faa7ffb69ad7d3b4c5d6c7b4d378beca2fa349ea072e3bef4401e18ec99
+test/extractor-tests/generated/ExternBlock/ExternBlock_getAttr.ql 78ed6a2d31ccab67b02da4792e9d2c7c7084a9f20eb065d83f64cd1c0a603d1b e548d4fa8a3dc1ca4b7d7b893897537237a01242c187ac738493b9f5c4700521
+test/extractor-tests/generated/ExternBlock/ExternBlock_getCrateOrigin.ql 5a2e0b546e17a998156f48f62e711c8a7b920d352516de3518dfcd0dfedde82d 1d11b8a790c943ef215784907ff2e367b13737a5d1c24ad0d869794114deaa32
+test/extractor-tests/generated/ExternBlock/ExternBlock_getExtendedCanonicalPath.ql 40d6ee4bcb77c2669e07cf8070cc1aadfca22a638412c8fcf35ff892f5393b0c e9782a3b580e076800a1ad013c8f43cdda5c08fee30947599c0c38c2638820d6
+test/extractor-tests/generated/ExternBlock/ExternBlock_getExternItemList.ql 2c2b29bdfdc3b27173c068cbaab9946b42053aa14cf371236b4b60ff2e723370 dfc20fc8ef81cdce6f0badd664ef3914d6d49082eb942b1da3f45239b4351e2f
+test/extractor-tests/generated/ExternCrate/ExternCrate.ql c4313ed4790d6c085f47d6c14b11bfa67f7758a1f160758a385bcfcd37284151 9a761086cd80a6fdb7a41f2f6887e1c0b8b3aa19ada0b1dcc74a57646338ecc9
+test/extractor-tests/generated/ExternCrate/ExternCrate_getAttr.ql cbe8efdfdbe5d46b4cd28d0e9d3bffcf08f0f9a093acf12314c15b692a9e502e 67fe03af83e4460725f371920277186c13cf1ed35629bce4ed9e23dd3d986b95
+test/extractor-tests/generated/ExternCrate/ExternCrate_getCrateOrigin.ql c0bf9ba36beb93dc27cd1c688f18b606f961b687fd7a7afd4b3fc7328373dcfb 312da595252812bd311aecb356dd80f2f7dc5ecf77bc956e6478bbe96ec72fd9
+test/extractor-tests/generated/ExternCrate/ExternCrate_getExtendedCanonicalPath.ql 88e16e2bbef466cec43ace25716e354408b5289f9054eaafe38abafd9df327e3 83a69487e16d59492d44d8c02f0baf7898c88ed5fcf67c73ed89d80f00c69fe8
+test/extractor-tests/generated/ExternCrate/ExternCrate_getNameRef.ql 4bbc210ed3114f355a36768fc8173dfb65bd683bdf47491a30890cf110a6fb2c cd9c1b52dd350337e946fb43243de1504f0ae44d81668dab3629f2b7c2651572
+test/extractor-tests/generated/ExternCrate/ExternCrate_getRename.ql 52007ef7745e7ceb394de73212c5566300eb7962d1de669136633aea0263afb2 da98779b9e82a1b985c1b1310f0d43c784e5e66716a791ac0f2a78a10702f34b
+test/extractor-tests/generated/ExternCrate/ExternCrate_getVisibility.ql d2c13d0c19a5ef81ca776f03a7259e743adbfa66ef440f7d402cd97391ecdfc4 c678f6ac0a075c1e0adc3768a344dbeebcf0d13e30878546094777e3fcdf92bd
+test/extractor-tests/generated/ExternItemList/ExternItemList.ql 7596986006fe1084815ad47b7e1cb77c4062a8c0432c2e6234c974b8632ead40 23c30ea01dba595e6e1bfa384f3570d32df4310ec2e8dbeb9a20afab9edbbfc0
+test/extractor-tests/generated/ExternItemList/ExternItemList_getAttr.ql f9560f441efc30b65ad88e3d3d323f40cbe3862c04a9c044fb2ca16edac4f3ca 18138daa285c73d40e5caa03791a6133b44429bff4e14cb1f223d487cf1648b4
+test/extractor-tests/generated/ExternItemList/ExternItemList_getExternItem.ql 2f20a6a4f41babb7340dd366a8145bb7cc9ceb75812af8a6316d076a4eac3428 4f613a73604dfe3f0d32343156e8ae30f4295186ac4ef2f733c772e96821ffc4
+test/extractor-tests/generated/FieldExpr/FieldExpr.ql 1b45da610feb62cee42f7a3866e6a9396c1e4c880ce1a82f09892047090e1322 980eae97fdeff4b8b3b264080a3cbb320d3a2530960fa185108f665b4c2aee29
+test/extractor-tests/generated/FieldExpr/FieldExpr_getAttr.ql 609c4f1e275d963cf93a364b5ec750de8cb4790abdaa710cb533ff13ab750a4e 8c2aa84b1ea6ef40a7ee39a2168baf1b88323bfbc6b9f184e7b39631765a48dd
+test/extractor-tests/generated/FieldExpr/FieldExpr_getExpr.ql 57df2d733faf3e3e30ae106d8423aab612ab0ddf8659da008e384130cf1e8023 1e240bee8e83dc26f78d2c55464ca1fb88d773691d47aee9a2182c90f57eb8f1
+test/extractor-tests/generated/FieldExpr/FieldExpr_getNameRef.ql 8631f5e8bdd72443a1ee3d667ee9136a51ad49dfd206612a36b79686da1beb19 692aef607108b8e3eaa78b8c915f2fd1d310905f8fea770b9694722a9a2a6232
+test/extractor-tests/generated/FnPtrType/FnPtrType.ql 50b76d678582cd0b8d7cc4a7658d5009d660bafcec6bd9968c9f60a7f547fa23 5bbf2504eb835e231a2355bc5d099322423c49c6af371902cf20a150e360cea7
+test/extractor-tests/generated/FnPtrType/FnPtrType_getAbi.ql de1706382c2980c02dbdd295e0a2320c992afa3f19af0c2378b9980a7cd0c481 a3fa36711949d9d5ac53cc5dd39cb19b397c3f2e47c1d457df470c6e5142f9be
+test/extractor-tests/generated/FnPtrType/FnPtrType_getParamList.ql 9ea393acf37919e2fd1bbc16e738440e00a56552bf80baef9bfd2a9a405afb93 3b4237b22eea569cef0081eb3ea16b2d0f01f8f070f21e16390267e9cbe0cf57
+test/extractor-tests/generated/FnPtrType/FnPtrType_getRetType.ql 57f662e4778e1bf4103f061bb8085def0708528f94045c9ff4a95ce802fff13d 924b924c7d766458e956afa0963e6eb1bfc083e5f9aeae64cf2d08929f79612c
+test/extractor-tests/generated/ForExpr/ForExpr.ql eff335a301b9a71292bb6da0dffdf901c7a51df9960e9250f9eb980aaaa0c7ae ce7ab100c21c6fc334a4445b2ee311ae6c67992ef659ca32c94d60ac884936e3
+test/extractor-tests/generated/ForExpr/ForExpr_getAttr.ql d3399b7453e10ff48efc79ec38dd9b6e06bb472b9c39f559242d003e7f63b1d9 ba37e6bf129e1c2f9094e093bbfbf41864f2cb7725a64334f9443270dafdbfdc
+test/extractor-tests/generated/ForExpr/ForExpr_getIterable.ql 90a6540f8a91cfe3ed1bdde1e680786ce5a00edbb797a8fe70bcc0507c438fcc 65c67ad5890aa502628ee73efd26bcbd4597a8bdfc9839233ede9e26393638f8
+test/extractor-tests/generated/ForExpr/ForExpr_getLabel.ql ce90da75e040f448d524187357f3ceededba72407a84c1dc8e1498ed9788044d 0e23d43e0b3412fe90c6a5a4331f8da85eebe19e05b8c7d9710056857280797b
+test/extractor-tests/generated/ForExpr/ForExpr_getLoopBody.ql 21657e470752bd83e05e176c2ca9371ba0f7ca3d1f97f764a42dff3caeb46ff2 0cafad7adf79ce90f475465b4a144e6529c6345504282b1ba3c6a12ff2e99892
+test/extractor-tests/generated/ForExpr/ForExpr_getPat.ql 1e0205a9b3a58fd2ddba49ef1b13a82c812519604d4c5bc02f23cbb6ce960016 d00efc63d714b1c76e4b0a67195d4e605f43a1e49d469f4f18bfa18d12280b63
+test/extractor-tests/generated/ForType/ForType.ql ba930d0c4fe52d57449ce4025b1c3e49c688afc5ef18ee8ac1ed7a9fd3eb8d41 08e9aa0301a942f6f9564ddeddc69606f3e2916e1b551cc56ae3b6048c56ce61
+test/extractor-tests/generated/ForType/ForType_getGenericParamList.ql e25cd79737bbae92d8f417c6bbf6fb8ae660976b8005cd91d0900c7076fdd827 b1e32b7e3ca9f29a4564f83e37ae53de6baf04837a393e6dedc64a01cc7d10e8
+test/extractor-tests/generated/ForType/ForType_getTy.ql e932d3412828bb83afc42e2dc1a4cbe9fcf25ec9a9617ec138722f834091a61a 298fc9df34b2cb436c8f180c4d229341ee4a73e3c451b905f017f32a6f65056c
+test/extractor-tests/generated/FormatArgsArg/FormatArgsArg.ql a521903c73f79e2616f7b8ef76790e11cbf432f8437825d52d117da232022b9e 4cb195d09ecb51e5bbd5c1c069ec1720f74fc074efc88b0f5c07cfc140167775
+test/extractor-tests/generated/FormatArgsArg/FormatArgsArg_getExpr.ql 7e1a7f902fb661660760d2a2f3f4cb6818a0c9f5b5061ede6ae80223774e4e09 8a50f64cba6f56320631206c801160201e3c98e74367bb035d689baaa9b4e411
+test/extractor-tests/generated/FormatArgsArg/FormatArgsArg_getName.ql 0e2f24388d516e14d195957163a2d5d97029c9e11a83ca71cf69e00ecc0bb2a8 dab2969f5ae6a15ec331c0152e7c116d1ee2c3d073b2d4da59ffbcb83404c65f
+test/extractor-tests/generated/FormatArgsExpr/FormatArgsExpr.ql 0cd439f61569ecf046e9548c458329647f331bfa034ae8b3d4f7628595881287 013a948607e1ac96100ea9a8cd3c8f357e378ac21baa015dcf4927022c2bdafb
+test/extractor-tests/generated/FormatArgsExpr/FormatArgsExpr_getArg.ql 8f692486be1546b914b17abdff4a989dfbaa889bfa1fc44597f4357806c1a1dd da9fd237e31e9c8dd0ef0c3c968157815b87d3e8dcdfd74674c988ce2ab6d270
+test/extractor-tests/generated/FormatArgsExpr/FormatArgsExpr_getAttr.ql 1f9bf1344f942e65c3a3591b6ae04d3f5a2a1a65459bce0d976698de7d8a5958 02acb861d8ab4d32cf144c589881a888c3da5e2ade27e8c85fec3ae45219bb3b
+test/extractor-tests/generated/FormatArgsExpr/FormatArgsExpr_getTemplate.ql c912ac37275cbe7b3b29607bed1a3190c80779436422c14a475113e1bfd91a54 ef90f67a9b952a38ce557b1afbf0b5ce8551e83ddfaad8309a0c9523e40b5ea7
+test/extractor-tests/generated/Function/Function.ql c1c2a9b68c35f839ccd2b5e62e87d1acd94dcc2a3dc4c307c269b84b2a0806e6 1c446f19d2f81dd139aa5a1578d1b165e13bddbaeab8cfee8f0430bced3a99ab
+test/extractor-tests/generated/Function/Function_getAbi.ql e5c9c97de036ddd51cae5d99d41847c35c6b2eabbbd145f4467cb501edc606d8 0b81511528bd0ef9e63b19edfc3cb638d8af43eb87d018fad69d6ef8f8221454
+test/extractor-tests/generated/Function/Function_getAttr.ql 44067ee11bdec8e91774ff10de0704a8c5c1b60816d587378e86bf3d82e1f660 b4bebf9441bda1f2d1e34e9261e07a7468cbabf53cf8047384f3c8b11869f04e
+test/extractor-tests/generated/Function/Function_getBody.ql cf2716a751e309deba703ee4da70e607aae767c1961d3c0ac5b6728f7791f608 3beaf4032924720cb881ef6618a3dd22316f88635c86cbc1be60e3bdad173e21
+test/extractor-tests/generated/Function/Function_getCrateOrigin.ql acec761c56b386600443411cabb438d7a88f3a5e221942b31a2bf949e77c14b4 ff2387acb13eebfad614b808278f057a702ef4a844386680b8767f9bb4438461
+test/extractor-tests/generated/Function/Function_getExtendedCanonicalPath.ql 0bcdca25bb92424007cea950409d73ba681e3ffbea53e0508f1d630fccfa8bed ff28c3349f5fc007d5f144e549579bd04870973c0fabef4198edce0fba0ef421
+test/extractor-tests/generated/Function/Function_getGenericParamList.ql 0b255791c153b7cb03a64f1b9ab5beccc832984251f37516e1d06ce311e71c2b d200f90d4dd6f8dfd22ce49203423715d5bef27436c56ee553097c668e71c5a1
+test/extractor-tests/generated/Function/Function_getName.ql 3d9e0518075d161213485389efe0adf8a9e6352dd1c6233ef0403a9abbcc7ed1 841e644ecefff7e9a82f458bcf14d9976d6a6dbe9191755ead88374d7c086375
+test/extractor-tests/generated/Function/Function_getParamList.ql f888802ab00defb58de59cc39d1e0518e3884db7eaf845f39dfa55befdda58b2 ba0d1a07676f1c987b820a3d126a563ecf9a3d53ac1115b87a5af487a8a03c3e
+test/extractor-tests/generated/Function/Function_getRetType.ql b3a1ab90c8ebf0543e5db6a415896e44a02f984321f49bc409aec2657298942b cdfa37772e5026febb19c9bcd0d325688b0fbf2f6e7bba424b73eca38b9b3e38
+test/extractor-tests/generated/Function/Function_getVisibility.ql 490b0a369c809a757d4835b97becf617b0399f16a63a2b06258c9a227d5cc415 25ceff15d3cd03821e1cb2c04cb8894bcd101eeca62b66b54d1751b628107818
+test/extractor-tests/generated/Function/Function_getWhereClause.ql 37a44ce54bfa7e54dda5db2e5662d0fd70ad6e2caa07ffdedd923a6492b4c6a3 2ced4e49d19cf717b9bf26859fa20f94713b6438e817c63c29ccaf34bb5f373c
+test/extractor-tests/generated/GenericArgList/GenericArgList.ql 2d3e37da2c02a88ec8a1f99baebf352196f84c76c093c6f851d2c2d2ee941e9a 1cd884cfbaf59a2da080f50d966dc511243055fcfdd08a61bdfb10cc5701e1aa
+test/extractor-tests/generated/GenericArgList/GenericArgList_getGenericArg.ql 7f92dc62d814c39bc50dfd46c359540261fe433fcad1752ea2fe139a05071183 9863976c97c1b7c07d5d18d8ffee798b1c1b0223784a61066ee2c9ffc46c4979
+test/extractor-tests/generated/GenericParamList/GenericParamList.ql 5d04af9be32c5f8bdf9ec679b0acbabd58ff01a20f5543a0c7d4fe5c5773ebba 7e86c4d3ed64b9ef2f928abd22b593d72131862321096722df5150b5202a4a28
+test/extractor-tests/generated/GenericParamList/GenericParamList_getGenericParam.ql 7866ed49ebfca1cc1fffeec797329a592f52b4431a5d259aeb7120a7f4961c44 16d89dd05d9db1b1997f801d9e5ba2dd9389d13a3031c730414f3daf5fb7b12f
+test/extractor-tests/generated/IdentPat/IdentPat.ql 1e61edbdff611193bbb497eeba8c35043e1d1c6d3359903be58382b1c95e39e4 6f3a288cc12ee24a9ff21ca2fe544838d66f6481e60539cf7d4a473e628e3c3f
+test/extractor-tests/generated/IdentPat/IdentPat_getAttr.ql 02607c8c616dc94152777390f912fc1e6bb420cc3ea687397e31392848942aa7 aeb10434577815d9a9f0f45a1a448656323f05d5321ff07d435ca4a449527d53
+test/extractor-tests/generated/IdentPat/IdentPat_getName.ql b96a3dbca1bade052cad294d95f95504665ad0b14c7f5f9f8083486d0ee64026 28c851703250c25b518024add1052d3204271db3f89eddf862d9a1e122ee6eb0
+test/extractor-tests/generated/IdentPat/IdentPat_getPat.ql fea604fee0db39f83a3dadb4583cb53123c63351282bc3387b84f90477be19cb ef2e620ade30e0225f6bf1c84982d1b8f949ee0c2ced5edbd00e5547e0a81a7c
+test/extractor-tests/generated/IfExpr/IfExpr.ql 1401ba0ed88e27d24e5dc3911bfcc2aee3e0f3da30981866bfec2c71c238e6b9 2bd7abeb5ab28418eb4155206696356cc484ed83705a3a215e0d779b632a521c
+test/extractor-tests/generated/IfExpr/IfExpr_getAttr.ql f5872cdbb21683bed689e753ebe1c49cded210188883a5f846ab79c0b2147e1b 6cb3a47778c3116ee95f7aeac0e2dd640bbf0c07f8b65236e9040e139f02e5fb
+test/extractor-tests/generated/IfExpr/IfExpr_getCondition.ql 5bab301a1d53fe6ee599edfb17f9c7edb2410ec6ea7108b3f4a5f0a8d14316e3 355183b52cca9dc81591a09891dab799150370fff2034ddcbf7b1e4a7cb43482
 test/extractor-tests/generated/IfExpr/IfExpr_getElse.ql 8674cedf42fb7be513fdf6b9c3988308453ae3baf8051649832e7767b366c12f e064e5f0b8e394b080a05a7bccd57277a229c1f985aa4df37daea26aeade4603
-test/extractor-tests/generated/IndexExpr/IndexExpr.ql 13af7f85807917befce33d64274668593071a1669e1870ea16d22e05eddfdcff e7afa32f38ed6333cf943baa2298ae7e6d2550cb6e6c55372c575bf82703c46f
-test/extractor-tests/generated/Label/Label.ql 4fe2d7bf9114539791559e22ca3a245f89eac09672cfefad68ff0cb35b0778bd f7e6c99cbed35bb4282666fc5ca4b898319da61b9b30fab54561404d90bcf1a7
-test/extractor-tests/generated/LetExpr/LetExpr.ql 36ac1c0729726716d91272cf57c21991bf5916531d7ccc0a281420a52fb3e896 298164f9b79831fb4e0b4d75a592c680756ecf9f96893d66fd62ae52ca8dbfd5
-test/extractor-tests/generated/LetStmt/LetStmt.ql 471d18f20b46f62648456b5e0441955cd98bdc53390edcbb11a112ee775c412d 601e791bf918f28d3a69afab24573ac3b5c4267856a8895a9a14a1b206b1f0b4
-test/extractor-tests/generated/LetStmt/LetStmt_getElse.ql 30c4a33322c60222c0ca1c9df464cb2c9c6658abfb2628e285559a5a615d64b8 da9155a3343363223b9c45419ce389afcc9940f4fa77e50372ae4e382807948d
+test/extractor-tests/generated/IfExpr/IfExpr_getThen.ql 0989ddab2c231c0ee122ae805ffa0d3f0697fb7b6d9e53ee6d32b9140d4b0421 81028f9cd6b417c63091d46a8b85c3b32b1c77eea885f3f93ae12c99685bfe0a
+test/extractor-tests/generated/Impl/Impl.ql c473ab1d919fc56b641684b9eb7ba0e65defe554e1bb2fa603b8246a896aa574 16f2f7d8456aee81b395bf8e44fcf0562cfa44294fa03e4f85f3b06f5ff1c57f
+test/extractor-tests/generated/Impl/Impl_getAssocItemList.ql cf875361c53c081ac967482fd3af8daf735b0bc22f21dcf0936fcf70500a001a 0ad723839fa26d30fa1cd2badd01f9453977eba81add7f0f0a0fcb3adb76b87e
+test/extractor-tests/generated/Impl/Impl_getAttr.ql 018bdf6d9a9724d4f497d249de7cecd8bda0ac2340bde64b9b3d7c57482e715b cd065899d92aa35aca5d53ef64eadf7bb195d9a4e8ed632378a4e8c550b850cd
+test/extractor-tests/generated/Impl/Impl_getCrateOrigin.ql 494d5524ef7bac1286b8a465e833e98409c13f3f8155edab21d72424944f2ed9 b238ef992fce97699b14a5c45d386a2711287fd88fa44d43d18c0cdfd81ed72c
+test/extractor-tests/generated/Impl/Impl_getExtendedCanonicalPath.ql 3ab82fd7831d22c7ec125908abf9238a9e8562087d783c1c12c108b449c31c83 320afd5dd1cea9017dbc25cc31ebe1588d242e273d27207a5ad2578eee638f7e
+test/extractor-tests/generated/Impl/Impl_getGenericParamList.ql 88d5cd8fd03cb4cc2887393ee38b2e2315eeef8c4db40a9bd94cf86b95935bdd 9c72828669ccf8f7ca39851bc36a0c426325a91fc428b49681e4bb680d6547a9
+test/extractor-tests/generated/Impl/Impl_getSelfTy.ql 2962d540a174b38815d150cdd9053796251de4843b7276d051191c6a6c8ecad4 b7156cec08bd6231f7b8f621e823da0642a0eb036b05476222f259101d9d37c0
+test/extractor-tests/generated/Impl/Impl_getTrait.ql 3319d2649b4a7f3c501c8e16a1a3e5d74057c94c02772d33f19b4030daf934d2 3acca9d040c3f1d90ed26b159dac71625bea689221e180c856a75c2bab95d286
+test/extractor-tests/generated/Impl/Impl_getVisibility.ql 2497bb8c867297e4c398473ee7f0ec3693f7e894b84819f6336d69bebcd3af5f d8be2e9535b06471fa873af13b0223cc79d30d63a3f5e27a0f64874d60dbf07d
+test/extractor-tests/generated/Impl/Impl_getWhereClause.ql 269d4b0639db28a7535b2d745b11cda0885da7369f9cf4c4973a6ccc20c9960b c4baf89f68a173c1415baf90ddd9195e29784997a5ce45a36171485f6bb44c03
+test/extractor-tests/generated/ImplTraitType/ImplTraitType.ql ec1474d83239bf546fcace59188d7ea42f64345b92cf2364117da05f1827fa55 7d352e1cb65bb80c479c7eb90da08745e51252a7e7fd20e33d892b351b5304e1
+test/extractor-tests/generated/ImplTraitType/ImplTraitType_getTypeBoundList.ql dfb41cb9140f96bad398278294ecf20909c0fbc32b361c3dfc97aef2b8b9a5a8 17c9e4687345a5a788b01fcd708e700195ca28524467a3144708f1dc4c6471e5
+test/extractor-tests/generated/IndexExpr/IndexExpr.ql 0a93213b755faaab84b7eccb5b8f3d8f8ba87910ad661f194e06917722dbf6a8 46497b3e92523c6c015373fe122678846618b45412b903323ff3644e37f2c52d
+test/extractor-tests/generated/IndexExpr/IndexExpr_getAttr.ql 360dbf8e7d69c691a1f4c9bb0aaa7860a6b0f09b21a1d1a6db908ec7a7d7561a e50b942f7592cb944f607bd64f8e4d4abac30bdc53f73b4dc851e689dce61be9
+test/extractor-tests/generated/IndexExpr/IndexExpr_getBase.ql 841cacda1a1cd976229f2bd18dcee4315506105c2cb3789c30a7539fd6d49d0c 37a92e9151f10cf971b24f5af6e2ca6dccf87b6e0e0b2237a0564f97719a0d66
+test/extractor-tests/generated/IndexExpr/IndexExpr_getIndex.ql 1aa934524dd44009297ef89a657d1ba99304f6590514a0b0b51b2769780f8c20 a42f25640f0331318bbc8f44af133095580b8947309628511bf0b3675149506a
+test/extractor-tests/generated/InferType/InferType.ql ee94ff7a5d84299fdd6e52583fb2f548cff364cd3b5fe385707a2da8958bf641 9532163987d0c9f11456790d8c5a8249cb02f13526911bcfd4fc726db2e1aaef
+test/extractor-tests/generated/ItemList/ItemList.ql 6c1c8ef6da0fce64b1a5edbec98fe18910b0ecc390d1219cc08124ab51b13bf6 e94e5c8d1639c1ed2ba543a521a57a026e15ea6b339b6c6d4409dd30ae67a51f
+test/extractor-tests/generated/ItemList/ItemList_getAttr.ql 24d7a764d4f8997bb77e93c21e6e5ba7256ed11657bd6479bf42458b8e89b52f a6b4df0cc6bf79ab3f98c93eabbbd3aaf11ec2506a0e894fa1f51be90191d71c
+test/extractor-tests/generated/ItemList/ItemList_getItem.ql 6e129499f77f7dba287b2b31b58fe6d834559e27214797807bb29b2a401f1f7d e406c07421dd6382ea73308d9124c30e971591c9e4c797b3115955f22c93589f
+test/extractor-tests/generated/Label/Label.ql 6a92a27d615dd9c380cb9d889eecf827fc3a26f4bef65c2374e5ffbd6a7ce6b3 a344e26bc6ef835f2fa818413ba518c23f956750f9a2232acb1ad77aab9df446
+test/extractor-tests/generated/Label/Label_getLifetime.ql 3d6ddc3b44182e6432e938d5c1c95e0281575e320d517e431f6bad7748efb93e 56d07e485cb5e4263443eb5a0d62d7d4456bb0c2748331b371e519bfe14d3b81
+test/extractor-tests/generated/LetElse/LetElse.ql bdf2b17d5efe6b9cb5bb4fcfe854a5fcd72443d39ae1e7981d2a0459c481e394 a14a611d0783ae38d631600c2bde7409f4e739ba2f284314b90ec9a21c23ab3a
+test/extractor-tests/generated/LetElse/LetElse_getBlockExpr.ql 32c21ad843884944738a735f01e272032a347d1860fa6d27d17652c549f941b0 2bfd8a5e3d42eb1c73eb679ada847dd29f2f0657a0ad8ef15da126e54fff5ef5
+test/extractor-tests/generated/LetExpr/LetExpr.ql a25072a00cfe1242dc846b38199c000ed7217d33fdd50d2763237fdfda7b9449 8c9367af79d9fbc98ed2fe62450929fa876512f1c999615b5c1ecff082fdc7bc
+test/extractor-tests/generated/LetExpr/LetExpr_getAttr.ql 911b143afebaa0a487b13d533f089c5b0eaf336a44a4cab42147c284338484ba 625c91fb6d8c2e3a9f13e5679cc0cd29329c6c2b213d2e1191e23db2b65841dd
+test/extractor-tests/generated/LetExpr/LetExpr_getExpr.ql ccabfaa15cfc8685e86cb950cb62b7f2fec278f28906ab34deb97b308f160cc4 e0574537d47a77f1be85090970f3e1263858174479002fd4de3f85b777ee4336
+test/extractor-tests/generated/LetExpr/LetExpr_getPat.ql bc0363f77bc2ba583619ab7d309293ace0ed6a851bfb9b886f75729f96eb40a8 bc0cd9233b7904d8cc7f9021377120f5f4bcc5c7aa28b1b55f17bc738c434d78
+test/extractor-tests/generated/LetStmt/LetStmt.ql 02db64303bfe87a11a85663e4c79bdabd9ca13693f146c7923b47c4c92850fcc 9ec1326b8bc58b270b178a4c02621b1650d107de7c02a9408d97c59f0d8a6178
+test/extractor-tests/generated/LetStmt/LetStmt_getAttr.ql 68f69c4c054514140c0f0833a170e9f3facf950bd7af663ac9019f6c88ba0ea7 ca54d25cc052289458c7e34e40f0304bca2c412cecfb407f31279262bd74c15a
 test/extractor-tests/generated/LetStmt/LetStmt_getInitializer.ql 6a5f0eed3ce3e8cbc57be6ec2b4eed732f00e084108d21a61d9ab28b65e494ca a48b426b97a6c347ad04fe2e592cd25b5c66b2a6a299cbf8c0da03e14304fd70
-test/extractor-tests/generated/LetStmt/LetStmt_getType.ql 9a85b5d1f3baa012ace9a80e6daed660413248ee63da6dc3c84b0c668b25c7f9 c0efd0d112c4dc02c85cf1b1114fe9d0f89916e551f2d2a7c9a3315b5db4d46d
-test/extractor-tests/generated/LiteralExpr/LiteralExpr.ql 99450960211802b9616c11b264bb4fb9be8f1873b3b9278252f752a9de745aad abaca7c1690aeedd7a2a8452dc26108612a5cc0fee956ed6c54b780e02ff808a
-test/extractor-tests/generated/LiteralPat/LiteralPat.ql ec72777ee67c59a0136c0219c83341940d3f525609c85f42cf6779f2d16b1b67 1f0d6c3e93cf4c799839000fa1c35d07dad9b175503af38615c172a6fb0dec63
-test/extractor-tests/generated/LoopExpr/LoopExpr.ql db30c458ce8fef33044e9d1832464da05b86c3116c8601f698e7a0e1095b1450 a1032375dbbd1dabf5a41b23e8439db8e471933c3bda87d1671d5889aba252dc
+test/extractor-tests/generated/LetStmt/LetStmt_getLetElse.ql 21f8f1cbf725399da80c24c4d3ca27072758b76cbdfd726a7f1e851ea12e58fc c01a4eda22088184357288910fa41692f52486d60fbf7c0bc3b5b01f8f67fe07
+test/extractor-tests/generated/LetStmt/LetStmt_getPat.ql 978e4f7861c7b03e6f2a3a2f7ae82e9b72bb5ef000f111127cb583a04ea6f971 3c92dbb765dfb01c290413e538290b0b2bee5a83bcfee383d081f56202a784fa
+test/extractor-tests/generated/LetStmt/LetStmt_getTy.ql a13e89ca2f87aa6e5e0cfce296b9515656f4bc9b5291337cf18c2bdd7a04c4e3 7c7c8ac2cc5112d74081a5c239358d62e082b48b361e757cea23022f5ffcf04f
+test/extractor-tests/generated/Lifetime/Lifetime.ql 07b093285b08fddc149cbce3047700072874efb29d55e591c86d53e6432a10a7 29437b1b20f6321870837c12348d165729312e164ac4fac1029c1000e48d311a
+test/extractor-tests/generated/Lifetime/Lifetime_getText.ql 7b06b940145c3d1a1bb3aff67e8e106f902a737edf61ed91577cf3ca94606936 c70d6186c500fdf6bc9d9d028cf3ec093914e20ba9547a391203ac8c5df1d727
+test/extractor-tests/generated/LifetimeArg/LifetimeArg.ql 4a0c2166d9ba79c99d6be430a28f79d3e7e971dcd96777e02c3fec56cec3ffeb 158bbf0f06ad36c81704d11f6318f80a0f7dd9c1a71409980ca60cac49dbe9c4
+test/extractor-tests/generated/LifetimeArg/LifetimeArg_getLifetime.ql 050015eb1130bab1ff6fe7df6915a634e66e27f2c90609026aadb4287fcc0c3f e4f63abbbb7668aa36de0caa2bb38fdbb4ff198aafa312ab12c9667eea67f04e
+test/extractor-tests/generated/LifetimeParam/LifetimeParam.ql 4848a1c83b138e3842a7dbd0edb416b1ea2985b77b92d45b6d02b9f8bb997b1d 75fd2beafd2076121edb435996743e4d32ee58f6999205c9dadcb84a7fa80860
+test/extractor-tests/generated/LifetimeParam/LifetimeParam_getAttr.ql d1ff2d3cd34bfc0f363bcd7638d4b9fdcc604c6a9c74da22359df1877a0cb26d 57b7654249890266ecfc9a325c27da84b8b3cf21666a74f38e6439ed7a0596f9
+test/extractor-tests/generated/LifetimeParam/LifetimeParam_getLifetime.ql 893879293bed44e7a259c7e501f8301b92be0e00665c0049cddfc7d027790284 ee74064414e6ec1299180aa00851b5f323053bf4bbc2c5db6c0bedbcc1388411
+test/extractor-tests/generated/LifetimeParam/LifetimeParam_getTypeBoundList.ql b1fb7f8e9fff999f7b0508951c089b2d6588a0960f172b67e7e111e64d608d49 fdfdd3a159033fca0549d6db97d681114e83f630982e72abbbf7cf1b2d77b4e9
+test/extractor-tests/generated/LiteralExpr/LiteralExpr.ql a5644e5cf8b03121a1bdee793083cfe27286a7ac67d6ab5f1733b1fa81c5b38c 711d44afb1d0fba47f355563a040f4b21ca63a1c59a73d9b6510715133fee5b3
+test/extractor-tests/generated/LiteralExpr/LiteralExpr_getAttr.ql 6e76da2bb7858f493641f91216ea28f22dc5825931841327e34330f11d20c8b3 3f10a510944ea049b636ffc2c6223c0a15fd9b528ada7ffce54fb70637640768
+test/extractor-tests/generated/LiteralExpr/LiteralExpr_getTextValue.ql 7049fec0bbbf0e048af1ff318f42f43d0f8a7354a5638dc21174c4ea725b54ce 2edc94cc0a7f58ec9808b63ddb4d20a3907c88e50bd9ffb14f0281b433f5621b
+test/extractor-tests/generated/LiteralPat/LiteralPat.ql 3d3db6cad0eb13f84b69efa24a9f9a32d35c62582274d2751cc3ac54dca3b538 7feb64af87546ea64c139c61ac20176a99ad40b9949b361742a424b164fe6d54
+test/extractor-tests/generated/LiteralPat/LiteralPat_getLiteral.ql 2cb03a22220e99237d4f3cd94d5090757cd6e57df708d32e80bca3964507651f 4dd9a6c1e23ad9851d9aa8c42c79535f7a2c7224bbaaff286eac7fd04b39c6f0
+test/extractor-tests/generated/LoopExpr/LoopExpr.ql 636c28bff5f8c1ca0fb834f614b3215e02bdb00826fd8be26f9c4fa22c68a79a 1694c27850419d4edf366fe3f1d60fff578094adc3aeeb9691a3d6a8ec0100e1
+test/extractor-tests/generated/LoopExpr/LoopExpr_getAttr.ql d557c1a34ae8762b32702d6b50e79c25bc506275c33a896b6b94bbbe73d04c49 34846c9eefa0219f4a16e28b518b2afa23f372d0aa03b08d042c5a35375e0cd6
 test/extractor-tests/generated/LoopExpr/LoopExpr_getLabel.ql 0b77b9d9fb5903d37bce5a2c0d6b276e6269da56fcb37b83cd931872fb88490f c7f09c526e59dcadec13ec9719980d68b8619d630caab2c26b8368b06c1f2cc0
-test/extractor-tests/generated/MatchArm/MatchArm.ql a8371ede979aff0aa5d26ecf188695381ac82602c04a7267e11bea7cdc35406b d5f8026e8305be5b6b617bed63f3389564ef15cc1e0f9595ee739b3874299464
+test/extractor-tests/generated/LoopExpr/LoopExpr_getLoopBody.ql 0267f54077640f3dfeb38524577e4a1229115eeb1c839398d0c5f460c1d65129 96ec876635b8c561f7add19e57574444f630eae3df9ab9bc33ac180e61f3a7b8
+test/extractor-tests/generated/MacroCall/MacroCall.ql f41552ce4c8132db854132e445aa0c8df514bfd375aa71cc9ed0ae838b7df9f1 442ecbe1481084bb072c6f8cf0eb595b7ad371587e8708610a10f2cc718535f7
+test/extractor-tests/generated/MacroCall/MacroCall_getAttr.ql c22a2a29d705e85b03a6586d1eda1a2f4f99f95f7dfeb4e6908ec3188b5ad0ad 9b8d9dcc2116a123c15c520a880efab73ade20e08197c64bc3ed0c50902c4672
+test/extractor-tests/generated/MacroCall/MacroCall_getCrateOrigin.ql 3030e87de6f773d510882ee4469146f6008898e23a4a4ccabcbaa7da1a4e765e a10fe67315eda1c59d726d538ead34f35ccffc3e121eeda74c286d49a4ce4f54
+test/extractor-tests/generated/MacroCall/MacroCall_getExpanded.ql 757c4a4c32888e4604044c798a3180aa6d4f73381eec9bc28ba9dc71ffcbd03a 27d5edaa2c1096a24c86744aaad0f006da20d5caa28ccfd8528e7c98aa1bead1
+test/extractor-tests/generated/MacroCall/MacroCall_getExtendedCanonicalPath.ql 553b810f611014ae04d76663d1393c93687df8b96bda325bd71e264e950a8be9 a0e80c3dac6a0e48c635e9f25926b6a97adabd4b3c0e3cfb6766ae160bcb4ee7
+test/extractor-tests/generated/MacroCall/MacroCall_getPath.ql 160edc6a001a2d946da6049ffb21a84b9a3756e85f9a2fb0a4d85058124b399a 1e25dd600f19ef89a99f328f86603bce12190220168387c5a88bfb9926da56d9
+test/extractor-tests/generated/MacroCall/MacroCall_getTokenTree.ql 1cbf6b1ac7fa0910ff299b939743153fc00ad7e28a9a70c69a8297c6841e8238 570380c0dc4b20fe25c0499378569720a6da14bdb058e73d757e174bdd62d0c0
+test/extractor-tests/generated/MacroDef/MacroDef.ql b8186c22beb7f818a30fe80f36d2e4207887445863e4deeae88bd03c24863dbb 71bebfb1b57b56ea479bc6edd714a4f01bfce2fa8e12fb9eb1481f9dffa4515e
+test/extractor-tests/generated/MacroDef/MacroDef_getArgs.ql 61f11d6ba6ea3bd42708c4dc172be4016277c015d3560025d776e8fef447270f 331541eff1d8a835a9ecc6306f3adf234cbff96ea74b0638e482e03f3e336fd1
+test/extractor-tests/generated/MacroDef/MacroDef_getAttr.ql 0a30875f7b02351a4facf454273fb124aa40c6ef8a47dfe5210072a226b03656 8e97307aef71bf93b28f787050bfaa50fe95edf6c3f5418acd07c1de64e62cc1
+test/extractor-tests/generated/MacroDef/MacroDef_getBody.ql 7b350f48e6f208d9fa4725919efd439baf5e9ec4563ba9be261b7a17dacc451b 33f99a707bb89705c92195a5f86055d1f6019bcd33aafcc1942358a6ed413661
+test/extractor-tests/generated/MacroDef/MacroDef_getCrateOrigin.ql 6c46366798df82ed96b8fb1efeb46bd84c2660f226ff2359af0041d5cdf004ba 8ab22599ef784dcad778d86828318699c2230c8927ae98ab0c60ac4639d6d1b5
+test/extractor-tests/generated/MacroDef/MacroDef_getExtendedCanonicalPath.ql d09b262b8e5558078506ec370255a63c861ca0c41ab9af3eb4f987325dadd90c cd466062c59b6a8ea2a05ddac1bf5b6d04165755f4773867774215ec5e79afa3
+test/extractor-tests/generated/MacroDef/MacroDef_getName.ql 6bc8a17804f23782e98f7baf70a0a87256a639c11f92e3c80940021319868847 726f9d8249b2ca6789d37bb4248bf5dd044acc9add5c25ed62607502c8af65aa
+test/extractor-tests/generated/MacroDef/MacroDef_getVisibility.ql d858ccaab381432c529bf4a621afc82ea5e4b810b463f2b1f551de79908e14e7 83a85c4f90417ab44570a862642d8f8fc9208e62ba20ca69b32d39a3190381aa
+test/extractor-tests/generated/MacroExpr/MacroExpr.ql 69445cf24f5bec5c3f11f0ebf13604891bb2c0dffe715612628e5572587c7a6c 5434db79d94e437c86126d9cf20bf1e86e5537f462a57b9bf6b22a2caa95cc40
+test/extractor-tests/generated/MacroExpr/MacroExpr_getMacroCall.ql 8859743e23b987225a6a1933054a1ed8f5f1442b61a769599e2efd143f4feb9e d2d336135ff4d2ea65e79430dee8d0f69f9d7818a674f5446903d986f3948b92
+test/extractor-tests/generated/MacroItems/MacroItems.ql 876b5d2a4ce7dcb599e022083ff3f2d57300bcb0ea05f61069d59ad58353ca69 61ea54d4633ef871d3e634069e39fbb2545f7dc2796fa66f8edbacd4e0aa4ef5
+test/extractor-tests/generated/MacroItems/MacroItems_getItem.ql 53fc2db35a23b9aca6ee327d2a51202d23ddf482e6bdd92c5399b7f3a73959b1 63051c8b7a7bfbe9cc640f775e753c9a82f1eb8472989f7d3c8af94fdf26c7a0
+test/extractor-tests/generated/MacroPat/MacroPat.ql d9ec72d4d6a7342ee2d9aa7e90227faa31792ca5842fe948d7fdf22597a123b7 74b0f21ef2bb6c13aae74dba1eea97451755110909a083360e2c56cfbc76fd91
+test/extractor-tests/generated/MacroPat/MacroPat_getMacroCall.ql 398996f0d0f2aa6d3b58d80b26c7d1185b5094d455c6c5c7f075f6d414150aa6 b4662e57cac36ed0e692201f53ba46c3d0826bba99c5cc6dfcb302b44dd2154b
+test/extractor-tests/generated/MacroRules/MacroRules.ql e8a243a1aa368d44c963d81b4459aa6eba7caf514d4865af5007cc33fe53dde4 9e9114cb808239e3bb15403cf5712f8dbaf4e2719e74efddbb800ec0be19f06a
+test/extractor-tests/generated/MacroRules/MacroRules_getAttr.ql 7de501c724e3465520cdc870c357911e7e7fce147f6fb5ed30ad37f21cf7d932 0d7754b89bcad6c012a0b43ee4e48e64dd20b608b3a7aeb4042f95eec50bb6e6
+test/extractor-tests/generated/MacroRules/MacroRules_getCrateOrigin.ql fccedeee10ef85be3c26f6360b867e81d4ebce3e7f9cf90ccb641c5a14e73e7d 28c38a03a7597a9f56032077102e7a19378b0f3f3a6804e6c234526d0a441997
+test/extractor-tests/generated/MacroRules/MacroRules_getExtendedCanonicalPath.ql a0098b1d945df46e546e748c2297444aaccd04a4d543ba3d94424e7f33be6d26 3bab748c7f5bbe486f30e1a1c422a421ab622f401f4f865afb003915ae47be83
+test/extractor-tests/generated/MacroRules/MacroRules_getName.ql 591606e3accae8b8fb49e1218c4867a42724ac209cf99786db0e5d7ea0bf55d5 d2936ef5aa4bbf024372516dde3de578990aafb2b8675bbbf0f72e8b54eb82a8
+test/extractor-tests/generated/MacroRules/MacroRules_getTokenTree.ql 7598d33c3d86f9ad8629219b90667b2b65e3a1e18c6b0887291df9455a319cab 69d90446743e78e851145683c17677497fe42ed02f61f2b2974e216dc6e05b01
+test/extractor-tests/generated/MacroRules/MacroRules_getVisibility.ql 5306cc85f470d21ebcbe6e98436334b0bf5ba819a0ae186569ba7e88c31636c6 fcbf5c54e5a904767a6f4d37d853072aa0040738e622c49c9a02dec8739d6587
+test/extractor-tests/generated/MacroStmts/MacroStmts.ql 991042263ba99acef0972697ce79132e5650b27bf53be2f975a0da1f29940fd8 64c44e65b3c5d3de5f9532b4ff7ce54b39442b37f63da8b10d789b9b52b85a9e
+test/extractor-tests/generated/MacroStmts/MacroStmts_getExpr.ql 5717f20376600e7bf5e471beae1a7c0084f235f0931f8b3f25d2de94ebb86f8b e4685fd9d45b078a6402c285eed3a15cc4550f6656c8bc5e7e274a88d1c7e9b3
+test/extractor-tests/generated/MacroStmts/MacroStmts_getStatement.ql 8958b2212776f487869c29314e7d28f5871f5c3dde62fd9d6f87fb9e94204498 6804f5d4c0c5909689bdcdd5b8ec11ca7a8c0399b47695f66d2f99e39561565a
+test/extractor-tests/generated/MacroType/MacroType.ql 408327fdb4d7cf096536457401cc280f83cd7e4f6fa9aebd65e64031f6c119cf 0c502d25194ab96eb068a85e3f57a9217510a951fa923e9d7a20fd75412bd6da
+test/extractor-tests/generated/MacroType/MacroType_getMacroCall.ql 565be7a72670218d7999d3f6cec4e704b754c217186243f1b24c334589fa82e2 ba413c712783320188800e2a78738b09c40fe9a6305c08d9e67e971a8fca96ee
+test/extractor-tests/generated/MatchArm/MatchArm.ql 512aa404c94ba40b859564f07e9dffe6a5e687fafb039556e9145f4f3742981c 529f96e38cede8a26054f8981d4ba1d189c17d14d0f92d622eb20acd8f3d7e5d
+test/extractor-tests/generated/MatchArm/MatchArm_getAttr.ql 4faf7a542702d13283262be7cb2e1cc3c862bc2e1953a460fd2bb5e75a7e9b1e 1d43f4d2a580d0ac309dd18a45a9693ab92107cafd817ccdb26fd7998728edf3
+test/extractor-tests/generated/MatchArm/MatchArm_getExpr.ql 116f02bef8650d27784a8657208e9215b04af9139d19a54952c6ba2523770f4b e0677aed6d53148e120fd0b03f4bc4fa108c6dd090f605c87b2e3ba413fb0155
 test/extractor-tests/generated/MatchArm/MatchArm_getGuard.ql 54e2c2805d54b353c9e36258ed750189846cd422dfb476c6eb52301860d7ff13 8fd408a3e9c6e5c138860144ba0f69dc2099a7a062e3bdf7d324c09df7d132f3
-test/extractor-tests/generated/MatchExpr/MatchExpr.ql 7d52f44e4951420c21a3bb4a6d6903cbe9d81295510bb2b9b7de43a2a0a1d700 3cc0996d4fd19b37bf97cbd9d062b442409a56e18c6c8ef06b933faaaaa899a8
-test/extractor-tests/generated/MatchExpr/MatchExpr_getBranch.ql 331b9e606d66d399aeff9a83915411fdbe0d28e4dd4e86ac39021859454ee9ca d0ad3b17bf8a30cfbea6cde96180a503e74762ffa8dd1918557d5ab3971e59f2
-test/extractor-tests/generated/MethodCallExpr/MethodCallExpr.ql 563ee88de245a890c32a83ee317bf56c6d66d5c2ed7e7aada726101926fb0090 7277be66ae233700e4e94c4467ee688692a883e3d42a0207be5edf9dda4ecb5d
-test/extractor-tests/generated/MethodCallExpr/MethodCallExpr_getArg.ql 10a88c3bf63dfb26f43b9cd1ed7fceef0f436ce2eff4b5a816da369bf5b775d2 ee3b5043719591b4048ec32e21bb5fb3a9f83f0420ef18c338fc0ac28d0e3240
-test/extractor-tests/generated/MethodCallExpr/MethodCallExpr_getGenericArgs.ql f2ac26ad6c5cffb8e3c1916e35c97b6247264a9d61960a808330ad21c7294335 4405ec19db4d155e0f1741a9c23292c4d31dc700a86a3bfe346340e9d01cd047
-test/extractor-tests/generated/MissingExpr/MissingExpr.ql 31fb99d3986397ec78f75deb6e712e3385e3ce60a6b413cb69523ad520512053 01f469a3669b3a50121108fe24de005fcad567ea71c9d5fb12e5168714fa5dae
-test/extractor-tests/generated/MissingPat/MissingPat.ql 9ef95f4498e399c28241f1b187ea358bff6c0778c92812188164311c6b238530 d953cf729ebce6c627568db4b8193cd175b98a8b599d8790ba027eb3239a3348
-test/extractor-tests/generated/Module/Module.ql c9a97238ccb97b391b62bced326236e27bf003e1c341a653e441b5901fa8460b 7b69b35a462ac7cb210203d3f5e888effd09c63313d172fc31f9754f2cb3534f
-test/extractor-tests/generated/Module/Module_getDeclaration.ql b63127ac4c3dbdcf2596ff6e419275464a0581039f0a9438d766bfa8f6b9eaa5 d329498e942961ff29453f2194f48c720f19ed566ad0a817f5e14bf894fe4dd2
-test/extractor-tests/generated/OffsetOfExpr/OffsetOfExpr.ql fc3bcd5387d30c623750199ed836fa8132ec83d45e3ae1771ba7c2cb974683ca ff71a97721bb71f6c23f4db8c65311f0d3c9fab18911c28424ba1ca686c9cf24
+test/extractor-tests/generated/MatchArm/MatchArm_getPat.ql b346bca229226414b32acc3d8ab0ae26647563fd79e1c434d1ef8d14bda2d65b e72eb69bb243c39fa997d17bb7060e2f82f2bb33d11a58caaae48f8372996704
+test/extractor-tests/generated/MatchArmList/MatchArmList.ql 14b5e110d48e2b77c85b7a188262e6a98300e0d4d507bb7ed9179c5802251dd6 4d091f06b12fef0fffe1c80a10f74438d8068f2fa09c50d5e240b6d140e60d90
+test/extractor-tests/generated/MatchArmList/MatchArmList_getArm.ql 4781d002538a92b7f40fb0ec3d61aeedb6348341ddc354bbdd3ff61b74d59767 ae0da9497a30ce006e03bdb70e0ee24b685df529ac15a7d99a6869b5f7d7b371
+test/extractor-tests/generated/MatchArmList/MatchArmList_getAttr.ql 4d7e6d152d2dbeb4c9f594becabea27d3b25fecbde40d791a2907c69cc0c9631 4be9be658bb22e1b764c4ebc8d6b99bf50fd939f35ea44fbb869056c14632bd4
+test/extractor-tests/generated/MatchExpr/MatchExpr.ql ec116bca37079488977a50beeba508c440cf337799947fcb810b6bd7a7605255 42dc7b5f0dd6fd91417d9846a7b4f678cbfcf095791aaf57c8d3b4548ce2dd98
+test/extractor-tests/generated/MatchExpr/MatchExpr_getAttr.ql cb8057372dcf24dfa02896ebf4e60a0b757dc4742b94011edc38f5b898ed4d25 6809695c2d3ac3b92c06049c9b920e8c0e99ee1998a11a7f181f2b0ceb47c197
+test/extractor-tests/generated/MatchExpr/MatchExpr_getExpr.ql 7baaa64071cf2666e3b2bc05630d92a7a3b6cf04a026b1f7053c5e2a735bcaa8 d9ba8d8bbff05cfc0461ab41295f921b48429b4376c29adf54428bd5a9aa5298
+test/extractor-tests/generated/MatchExpr/MatchExpr_getMatchArmList.ql d97055bcb0431e8b258b5ecdd98aa07cb24ece06b0cd658b697cd71da4ede8fc 5e9c03b2665ef6b2af98897996abb2e0a9c18d54eb64588340b8efbcee9793bd
+test/extractor-tests/generated/MatchGuard/MatchGuard.ql 23e47ec1b13e2d80e31b57894a46ec789d6ab5ed1eb66bdb6bba9bd5ae71d3ef 7302f4a93108a83228e0ebd5b4a1bc6bccc1f6f0f3272054866fa90378c0dcc4
+test/extractor-tests/generated/MatchGuard/MatchGuard_getCondition.ql 8a79dd46798f111f8d0d5a975380b5cebe5e337267752b77b3718b268ba2773d 6691d8fb483f64fc7e3ad3f46e3129e0a1184d7beb9f83a1000acdbb081c8b5e
+test/extractor-tests/generated/Meta/Meta.ql 16f163f00ba2bbaa0a8c6f3f6710c860a8f61d02d43321c78e05a10a3606e39b ba982c6bb93ddb4fc2c44d24635bd487128a5b1d1f885214044c989a21f4d05a
+test/extractor-tests/generated/Meta/Meta_getExpr.ql ec9ec61f5be7d65c32775fb5c068daea04f9db7d875293ed99cc1b2481db041f 77a0c52f1cb6ddc8fdb294d637f9eda1b7301ffa3067f0fca6272d894f57d3ee
+test/extractor-tests/generated/Meta/Meta_getPath.ql aa9d4145a4e613c51b6e4637d57e3b7d0f66e0bb88f4ce959d598870814c06bb 2087e00686d502c0e2e89c88eae0fb354463576a9ae4101320981d3fd79b9078
+test/extractor-tests/generated/Meta/Meta_getTokenTree.ql 1051c27ffd0d9a20436d684fde529b9ff55abe30d50e1d575b0318951e75bd34 983975672d928fb907676628384c949731da9807bf0c781bb7ec749d25733d2d
+test/extractor-tests/generated/MethodCallExpr/MethodCallExpr.ql 0149a2d174c72a530b39a5878e204cb6db7632935a5ceaf20e2b2363b67dfdf6 8284d9133c21136f89a04105c280efe736a782035235c6abc081f3d9a2616447
+test/extractor-tests/generated/MethodCallExpr/MethodCallExpr_getArgList.ql 180e0b1715f5cd2be0de01bff3d3a45594b495b8250748d40ff7108d6c85923d bdadcdbecca5891287a47b6dd6b2fda62e07457718aef39212503ab63bc17783
+test/extractor-tests/generated/MethodCallExpr/MethodCallExpr_getAttr.ql 2ce876a04a159efce83b863dffc47fbb714b95daea2b91fa6fbb623d28eed9ec 7bca1cd0e8fbceec0e640afb6800e1780eff5b5b402e71b9b169c0ba26966f96
+test/extractor-tests/generated/MethodCallExpr/MethodCallExpr_getGenericArgList.ql 655db9a0501b1ef20d604cc4cd9d708371781291443e8dec97b70ec2914601d2 2fc7df0eca22dcef2f9f5c86d37ee43452d372a4c0f9f4da0194828c82ba93e0
+test/extractor-tests/generated/MethodCallExpr/MethodCallExpr_getNameRef.ql 9a4829a174388e818f0c63ee6b8bdf1b68beaab48f51734ec6cc14635d24001c f57c9cdaf5235aad604f60b53ce92e73946d03a085f95ed051a26683967be4ba
+test/extractor-tests/generated/MethodCallExpr/MethodCallExpr_getReceiver.ql 77407ac956c897ff7234132de1a825f1af5cfd0b6c1fd3a30f64fe08813d56db d80719e02d19c45bd6534c89ec7255652655f5680199854a0a6552b7c7793249
+test/extractor-tests/generated/MethodCallExpr/MethodCallExpr_getResolvedCrateOrigin.ql c22504665900715e8a32dd47627111e8cef4ed2646f74a8886dead15fbc85bb5 d92462cf3cb40dcd383bcaffc67d9a43e840494df9d7491339cbd09a0a73427b
+test/extractor-tests/generated/MethodCallExpr/MethodCallExpr_getResolvedPath.ql 9e7bbb7ed60db49b45c3bdf8e01ec58de751889fc394f59ac33f9d6e98200aa1 c055d877e2ff0edc78cce6dd79c78b2881e7940889729cbb5c12e7029ddeb5a3
+test/extractor-tests/generated/Module/Module.ql 4bc4d74921a5af94b124a5010cdf6908cdc9ecf26124e354155fba781009071f acca26579b087ce1fc674703c4d95d8d353075d3021c464d2f3fc06891716774
+test/extractor-tests/generated/Module/Module_getAttr.ql b97ae3f5175a358bf02c47ec154f7c2a0bd7ca54d0561517008d59344736d5cd f199116633c183826afa9ab8e409c3bf118d8e626647dbc617ae0d40d42e5d25
+test/extractor-tests/generated/Module/Module_getCrateOrigin.ql ff479546bf8fe8ef3da60c9c95b7e8e523c415be61839b2fff5f44c146c4e7df b14d3c0577bd6d6e3b6e5f4b93448cdccde424e21327a2e0213715b16c064a52
+test/extractor-tests/generated/Module/Module_getExtendedCanonicalPath.ql 55c5b633d05ddbe47d324535a337d5dfed5913ab23cdb826424ddd22009a2a53 ab9e11e334e99be0d4c8d2bd0580657211d05feeeb322fbb5400f07264219497
+test/extractor-tests/generated/Module/Module_getItemList.ql 59b49af9788e9d8b5bceaeffe3c3d203038abd987880a720669117ac3db35388 9550939a0e07b11892b38ca03a0ce305d0e924c28d27f25c9acc47a819088969
+test/extractor-tests/generated/Module/Module_getName.ql 7945dc007146c650cf4f5ac6e312bbd9c8b023246ff77f033a9410da29774ace 9de11a1806487d123376c6a267a332d72cd81e7d6e4baa48669e0bb28b7e352e
+test/extractor-tests/generated/Module/Module_getVisibility.ql bdce43e97b99226f55c84547a84d99b44f5d1eac757d49bcc06d732e0fb0b5a8 a482c18851286fb14ec6f709dc7f3280a62de8c3d59c49ba29d07bd24cf416cd
+test/extractor-tests/generated/Name/Name.ql 0a78cd5c0c703ff30f8e3253b38f9aac98a564b22c02329d525cf101d8ac3fda 2fd83327063e6ab57dcae2dc5103c2965d7a09f6a10d553ea336cf594d32032c
+test/extractor-tests/generated/Name/Name_getText.ql 5d223baad356308abc45cdce9ca9201d674de1cc1e9fff7ef55dd96082d59d99 6488ccc102ed4f0a2e1c5cef3f8b1adbe00d52c961573f1a16eca66af31e2d14
+test/extractor-tests/generated/NameRef/NameRef.ql f73d49d5c176cd7589f6ca148b0d0cc3d1084e27686910058adfd5764ef5767d ebff67ed3b325b01277e25baa1ad588e633ef8ce63209a72305465a0dc8002d1
+test/extractor-tests/generated/NameRef/NameRef_getText.ql 5212dfc1b65c0f724a72f5bffd82268d1f8ae287d3d61797673c29fd70d7ebd6 75c343614925c55a18917c07ef62af08c97c9cc714f627d1a27b9f26158a0bde
+test/extractor-tests/generated/NeverType/NeverType.ql 7da48f7c20733a77495718c06a96eb1a8ea5e825b95e585a960cf777edff1b6a 30e24cfcb4f2ae1b7862a177e622636b4563a1b1d348413884bc605302d31fcf
+test/extractor-tests/generated/OffsetOfExpr/OffsetOfExpr.ql f7d7b30870567124e46dc81503a33cb6425fff51f99fa57894228847e68291a3 b0c242095e0df52687502baae97f36e0fc7b4e1e01cd05f75ff0cbe92a6e2f33
+test/extractor-tests/generated/OffsetOfExpr/OffsetOfExpr_getAttr.ql a12e828c85577184a41b255f54b10d4a654b57703074a7ebcfde2d43a358955f bc2590e76b60a3ddda9cc10903c68d07c6af19a593c8426d108a2a6520304145
 test/extractor-tests/generated/OffsetOfExpr/OffsetOfExpr_getField.ql 6d729fb91deacb1f620df5cbc86473183664e81849958624195da883c410a707 f3374c3d7306699d1f9d1c6c5788ee7c5a17103345bf53847be9d94e5fb9f14d
-test/extractor-tests/generated/OrPat/OrPat.ql 444363895150e7a4be27a08224b0619fb38ba48719e234cbc93a70f1185e6770 1f34008389f968c1e4bdc847abd6cb0c3ee0196a5b965d9119c70b82e0f140cd
-test/extractor-tests/generated/OrPat/OrPat_getArg.ql e9daaa6198d427bd00dab3f103766f734c29d15c4bde639018329c65ef85d1f2 983659d27722e3f4f8c03cefe6b0927fb42c0a72f626b42bbdada7ca27669a62
-test/extractor-tests/generated/Path/Path.ql 1a7bb385742036dbd7e7e85ac30d78f4c29ef8cf73c8d6d816b974ae3e57661d 90073e4f293c518eabc6638f86ccb5af7982633501a9b7f2746ba85d043fb962
-test/extractor-tests/generated/PathExpr/PathExpr.ql 3f575a6fc59b571e3d89a87777e5e76baca6d89435068929e0c163f2edd51d55 bf8d00401dd24b1a7d332f326a4d8c00bd770e97332741fbabb7e74cf3f76e5d
-test/extractor-tests/generated/PathPat/PathPat.ql 8cd3e49a8a9a58d28ce4247ccb4b29ff864c8e1539f725f7faa3ff0cd3db8893 59479b7f0c8eeadf6e3f29849e2b5acff20af920db80fe35def16b21126bd6d2
-test/extractor-tests/generated/PrefixExpr/PrefixExpr.ql f4ceaca7f6e562b2572406538c946017696720ad6f848ef60207891cc990f6b7 8520b6fae2489f58d535e96f87a273388eac1e043f88e4a1dcdfde05b9aa4873
-test/extractor-tests/generated/RangeExpr/RangeExpr.ql d18b86af326b360d6b30e8ce60eab8c4acb6c65c9cd2e8b227c56200cce07c88 34a9bd2a93413ca8d6cd8501bd1134aeafed25d7a037165e7c471a28a61b47d6
-test/extractor-tests/generated/RangeExpr/RangeExpr_getLhs.ql 3ee67dbb7b5d727cc527853c011da2b750fff59300adcc21780decdf80ec1b90 f1b404ba59e43b911d0e55203861d067fa21e0ff80584e44c2a510b1c5d8e197
-test/extractor-tests/generated/RangeExpr/RangeExpr_getRhs.ql f9d5b081efcc2373e0b28854f863b1b9ce25eb8d02805c7ea82f0f98820d41e6 4ae93e7970f1396230fb063e05576bb26c4b5b7b10a96f53f95720df74d93ac2
-test/extractor-tests/generated/RangePat/RangePat.ql 6cea2c1cd4393d777a42c31ee54f4e78e62d63de6a18c343c44df45090fb75b9 33e424105bb67f73952a325d973095e53b4c1bdad6f785a861d0ea117f57ab24
+test/extractor-tests/generated/OffsetOfExpr/OffsetOfExpr_getTy.ql b8597637cffd7a492148020b306c4ab1d2f17f919f441f462ebc00d229b038ca 2c7de1df4351929c221b30e3cede4cd6981fe8a2c1861e194489981c65e00f33
+test/extractor-tests/generated/OrPat/OrPat.ql 49d881b384acaf68fa79de46da997cacab3e75467641f61150908f4112c47fa4 5d721da23be44e79d7b8a0dd475119836828d6a1edaff2c55decea8da83e65b8
+test/extractor-tests/generated/OrPat/OrPat_getPat.ql d56b78287cecebacb25249380647500387e0d9e28be20034b8a12406a999a7c4 cba7bb60afaaed4333ea5ff6d3850fb44a8b42edee67d86fd16df85938454269
+test/extractor-tests/generated/Param/Param.ql 060c53b7e93840ae9cbf0c8fdaea17b16d6825f4b7aaa2eab164a660c5a7ea4d 172f6f4b86a98720f710e5d4342b7d52839c6f3c169ce1debb37629961a702ba
+test/extractor-tests/generated/Param/Param_getAttr.ql e1dcf86540fd2971ced34a33b2959f001c3f654914d82e576caa4534b80fbfbf 987a826bf6dcd25c3426edb603a22f6caa030c82c1cb0e9e11062fdbfed23030
+test/extractor-tests/generated/Param/Param_getPat.ql 0c448e8ba8bf3432be08b5eb4a052aa19cccf0eb4596a3239481401dae9d2dc2 c943d4da36e1e734c1a012f092b2f597cb389a7ab33d5371ff8ee9c93e115ffc
+test/extractor-tests/generated/Param/Param_getTy.ql 134dec0c5562a8df68224069f10ee51c7dcc35e0b44a49c0e2078c305487db87 94fa72a213c37f2f63f03789a33e55fc5a22bd83cf0c1d293281bceffb63bd78
+test/extractor-tests/generated/ParamList/ParamList.ql 4d879e6a6db24fb8d7f935c2dd332075ca4b2de41cc841aafec7e0b6b77f2cf3 b7e2357b77961f0f8315d3c9e8fde8578373ecfb9efba892416b31d7c168bb26
+test/extractor-tests/generated/ParamList/ParamList_getParam.ql dcaabf654941bf9afe50df3a5c61ef0eab50830a436eede98e30778bfd244a09 63cc7f529f96d5016804f50a385d8a736a534475a6340a8c2f51de99b54206a1
+test/extractor-tests/generated/ParamList/ParamList_getSelfParam.ql 310582a9921226a44e6fee2b386d48bf84388351204941dd12e3a2da395eefaf 6c2e0a6d5bc6db49430cf25501444da6540b7b2f9ac0052da93c8086e2af0c46
+test/extractor-tests/generated/ParenExpr/ParenExpr.ql a40c60a92be944f15f5cbcca52b0fde318bb1ad6864f9ab9302dbf5ce5f1058d a50e80b6b222fb43f9fec82677d0785c0b2696b9818887e2befafb7a6d399a7a
+test/extractor-tests/generated/ParenExpr/ParenExpr_getAttr.ql e8b9016d2374d124472d135c8b9031124227cbb139362f6aa6d4d99cad631e30 4aaf95ee8a9ab1ead19eaa4dabc080f12aca49f50a150a287b93132de5c61df1
+test/extractor-tests/generated/ParenExpr/ParenExpr_getExpr.ql a75dc46dc78d3b4a4f629ba16f7129ecc0ab90f60b651259d00d241b2886bf7c 32164d75418df184618501f41fbc0a81dafe1ad2dcbc9ec87bea909aaf05ae40
+test/extractor-tests/generated/ParenPat/ParenPat.ql 565182ccd81a9b420911b488c083f540d339eec6a9c230424800bb505df13a66 876cdca008ed32f415c9ee99ce7e66b276769d0b51ad7eee716e1317484a34ce
+test/extractor-tests/generated/ParenPat/ParenPat_getPat.ql 96f3db0ec4e71fd8706192a16729203448ccc7b0a12ba0abeb0c20757b64fba1 0c66ba801869dc6d48dc0b2bca146757b868e8a88ad9429ba340837750f3a902
+test/extractor-tests/generated/ParenType/ParenType.ql 81c8ad667397ce36157941abd9b879e9305a440018853af4528eb737ae4d2935 3ef3b86203b0143be2d7f7f4833f55fd6c226cb9205e3c1940b6c2a1371622f3
+test/extractor-tests/generated/ParenType/ParenType_getTy.ql 41dd6605e7b348618156712b559e2f1b6aac02d6c727e8cbf8653530794ec969 30ac6611c730e76cfb75f98efcf817783a50cec0cf3b3197459d7642f74dde85
+test/extractor-tests/generated/Path/Path.ql f17c1c4d23c0d5e9776cee84444f6ee7445de88afbc1f26c34b96e13ab618158 89499cb0f63b3634d6b5e2b8c4a13bd4401ce82e54af0ab46e41a34b0288eeb9
+test/extractor-tests/generated/Path/Path_getPart.ql 8aa45a0b58203ef1177166efbe1c2851faf4b4c9a453c83137f0c9298badcdbf b82d490d9b3a8237487cd5da8b3b6fc4aa477977b332a5c6539b3cd4e6d5b45b
+test/extractor-tests/generated/Path/Path_getQualifier.ql 9af95e22cdf3a65da6a41d93136aef4523db5ce81d38f6ed4bc613f1c68784d0 3102d9241a417a92c97a53ac56a7a8683463f1adc7a593cda1382c0d25b3f261
+test/extractor-tests/generated/Path/Path_getResolvedCrateOrigin.ql 7c0ff524595514630de4178028260d4832bfc4f57bfddec9f8e72a6c6dbf241c 55e617380476c183ef9259199d2cfd551b07466e94bc452c4723754d0c82691b
+test/extractor-tests/generated/Path/Path_getResolvedPath.ql 20c8977781dfe687d5db03290612179cf1360eb47b86ea62d25d1eef62a681e7 c35b76e7d63c05dc80867285bb913042cbe90b45d4d4306df9eac2cba5e8db70
+test/extractor-tests/generated/PathExpr/PathExpr.ql b9696cd7ad9f3874e4bc4b1b9c77f42f06ab6c61b77fb641458da63667087b9b db84a7a8dd05e30ff80733af01f08d43ff031bb4b3e3af06332a73ba7e7bbc43
+test/extractor-tests/generated/PathExpr/PathExpr_getAttr.ql 2ccac48cd91d86670c1d2742de20344135d424e6f0e3dafcc059555046f92d92 9b7b5f5f9e3674fad9b3a5bcd3cabc0dff32a95640da0fce6f4d0eb931f1757d
+test/extractor-tests/generated/PathExpr/PathExpr_getPath.ql e7894071313a74166bdd31d7cd974037fcd5a7f0e92d5eec42833266196eb858 46a06e8a1207e7a0fa175cd4b61068e5fd6c43b5575b88986409f0ac2be64c51
+test/extractor-tests/generated/PathPat/PathPat.ql 823732954a5882e33a37bd0bf0cafb2cec51659a5203a4831eec2516da0e49fa 54001149718a9ca15d8c0d4be63f3fe00a9f0d44fa1309e2f605d7932355ea5d
+test/extractor-tests/generated/PathPat/PathPat_getPath.ql 6c0c71c80a6e631ea7775ec8660b470ff6b264bab14a399606cf113b1fb190fc 8e34cbb4d064db929e94652e1901ec4f26affa71e30e556b7acdff71dd622cbb
+test/extractor-tests/generated/PathSegment/PathSegment.ql efc39cea1b4c0b2b0da6434136334430d074699f84124d6bcf94c24aa854dc64 c0a4bd60c67665c058ca22a59e535e925fdb00dec95ffc5c71697fb0ed78a329
+test/extractor-tests/generated/PathSegment/PathSegment_getGenericArgList.ql 8f6e67b3e316309f20e21d7e7944accf66b0256b76fa50ee9a714044c6ec8cea 15f10a701fc4d3f9fd6734da90790cdbc8a1ddd57bf52695740acedcb2e6e485
+test/extractor-tests/generated/PathSegment/PathSegment_getNameRef.ql 799d284e2f9267d6bbe67aa7035e525ef347dc74cb3e2180e7b2171b5cb49674 592130bc2358989536abf62e8a261272c851483ede4f19783f7d61ffc1803e4b
+test/extractor-tests/generated/PathSegment/PathSegment_getParamList.ql e1e7b9b5062f936c33b7e7e29b21456448242df4985c6cffb54900063cfd3e63 6568e851cb6bcb32622f89d01e3aa6e7dd21940d21572a9988584e34bdf25366
+test/extractor-tests/generated/PathSegment/PathSegment_getPathType.ql 01942da6d0b10c1d15caec6abb8c53f1dc7f8c04a91a797f572063aa003dbc4b cb21e6cb160652527ba571265297dae86beffe191dd7dfc4d0beee45cb0cda29
+test/extractor-tests/generated/PathSegment/PathSegment_getRetType.ql 36386a514bc925f5b17ad87afba9fef7986900c1b791732de061213c6e86743f f38bcee68c1da19e70bb1e1c4a4047c763a466f1b8ef2c4f65f8c724c0b58197
+test/extractor-tests/generated/PathSegment/PathSegment_getReturnTypeSyntax.ql d1db51208a311c30af369ce2fdc3a3296e7d598b27bf4960b8b34622a9d9163b 561b1e38c6d8b301fdc016e1d012dd805fde1b42b0720c17d7b15535715047f2
+test/extractor-tests/generated/PathSegment/PathSegment_getTy.ql a0ceaf3f37e521cc92c21cc0bae929499ef3584f86349ef34808c20963d31c75 d674e56e08a6d2a7d211503a466df2cc90c35a3951e41598febf62c8dc693655
+test/extractor-tests/generated/PathType/PathType.ql cb67b05cf7e4f32cbd46ac89a15f6eafe3507cc655db0b9d54a1cf8e7fbcca40 890053e7fd8cd8a92015c09588c7c646f075901cddc3eb8d57210b02b23a5944
+test/extractor-tests/generated/PathType/PathType_getPath.ql 7043c7939e4f835e4b2c7e3e207637c362d7a9dbdba0151b38c873fdaf43e7a5 ee2aad1b4fb2b00e1a5d39387848aa164a39e3cd49141f07c175b205c8451bb1
+test/extractor-tests/generated/PrefixExpr/PrefixExpr.ql 44fb7174365c6deecdc22c720d84617c6e060c05d49c41c90433451588f8aa6f 871fab471c82fede3c36edc003f9decee5bb7844c016951d28be78d0c91487e5
+test/extractor-tests/generated/PrefixExpr/PrefixExpr_getAttr.ql fdad6ad5199435ded1e4a9ea6b246e76b904cd73a36aaa4780e84eef91741c5b 75d63940046e62c1efa1151b0cac45b5ec0bab5e39aec2e11d43f6c385e37984
+test/extractor-tests/generated/PrefixExpr/PrefixExpr_getExpr.ql 2d1d97f6277794871fbb032ea87ac30b1aa902a74cd874720156162057ea202e b1b9880fce07d66df7ec87f12189c37adf9f233a1d0b38a1b09808d052a95642
+test/extractor-tests/generated/PrefixExpr/PrefixExpr_getOperatorName.ql d27602e77ddf491a278426de65041dda8568f427d1e0ff97c0f23069ae64670e 4e4766e948adf88a6b003ead7d9de1ad26174fe9e30c370f1d3e666aa944df52
+test/extractor-tests/generated/PtrType/PtrType.ql 6317c79917e024d2162ae9089c17539fae818288f9ba5976fe39d004691dd343 d7e12a58475322a1292777608056ff90d7014b3e3a77bb756e233014d2670f28
+test/extractor-tests/generated/PtrType/PtrType_getTy.ql 97f5e6197e66c4dcf15d4a62692e30a26979f2902d83354911985d39c8560d1a 0b049b882a33be9746fbb704394a024ac320415cfd1707dc48fe114781558e36
+test/extractor-tests/generated/RangeExpr/RangeExpr.ql 707c08aab49cc0a22c80a734e663b13ecbbddf0db28b6a25fdbc030a1ce38d6f 1f78950b30485cdde9fe7d9e416ad1dfdac8c5b6bc328172e6e721821c076131
+test/extractor-tests/generated/RangeExpr/RangeExpr_getAttr.ql 8767e670f88c2115bc61b16195d2c9d02bc074adc4ca57d2aa537c1af9b4c530 4fa51652c60ca7d06bd9ad604107e002603ee2a7b4587636f6b46b8e8060e06c
+test/extractor-tests/generated/RangeExpr/RangeExpr_getEnd.ql 0328c3d0597004f3facf3d553ed763566344f54e1b9c9e26f2f41b8146b6bdba 8e701b595631af117fd0a79154e298dfc64cb0874eb58018921f94076a0c7ebe
+test/extractor-tests/generated/RangeExpr/RangeExpr_getOperatorName.ql 355a4d61bcb6ac37003c49e736e0e3d4c6d223343db4d79ecb43a78fbf6b4c94 a81c79a5d54dec5f3918ad486cb07ffcb0af067823f7597d8e86efaffdb70935
+test/extractor-tests/generated/RangeExpr/RangeExpr_getStart.ql e6e35c735b2bc56adf38f96f32ef59a004391cafbb23b9acc34d2177764588c7 478969212626b1d101c19115f726ca7616fdd4d8de82fa1e91c50a26515c2ee1
+test/extractor-tests/generated/RangePat/RangePat.ql 97314b9a5543a7471d722ae188a657fd325974eb38eafe0997a6cf1095d04d69 5dd655582157b3436722b4ba3118bdd29853b0bc170248ad2c4c1162c534afe6
 test/extractor-tests/generated/RangePat/RangePat_getEnd.ql 723eb5030ec52d3aa3650a3e2de6cc0195a0030630239b972235963320e0d808 2df3b1a6197c3abd43dc743fd09cbf55165e3191f2b49336777594541e5da96a
+test/extractor-tests/generated/RangePat/RangePat_getOperatorName.ql 564216b2342f56dc8c1aed6306f57b6dafb33de9e3ba337a840a8c077ce95933 2a76ec7a59bada29733a1515bc1ea8bedd37429d1694ca63c7a8fbf94098a4c7
 test/extractor-tests/generated/RangePat/RangePat_getStart.ql ad2066efa32fced2dd107031f2a9b9635c3c892e874870a4320522bae9309aa4 b4a8c57a838074e186b823938d1a9372153c193da6c839b5f242ca25c679e83f
-test/extractor-tests/generated/RecordExpr/RecordExpr.ql 7216a4118bd2b1dcf279e7f0127baed162902a9cae1bdc8ec7f11a04f2a4d924 87812e6936a9b9f0217a6ac2add7063e5ce9b31da2c843f9931418a54235d615
-test/extractor-tests/generated/RecordExpr/RecordExpr_getFld.ql 1c9eb98bb37b7d454a5ffea8cb7e5b73a6e3b30f8a99aa52dcca957111187b68 4b8f92d215653cb7186fc00a51156affd2a25959b1b5e8111d47772d83a6a222
+test/extractor-tests/generated/RecordExpr/RecordExpr.ql 1b8f5c315f8038e531bd92c5402acdafdbc9468e2f4474cbeffddca37cc87fb6 9458b2815fd13848659bdc2ce1e9566fccdb0b2c9f018c79885ba7608df07a5a
 test/extractor-tests/generated/RecordExpr/RecordExpr_getPath.ql 2eb8f7591f08199d124732d7f2d7dd3e81792a52f8e6c90003aa0609923f8cb0 27e245224d6c9aa20023b418ce8dffff1293b50a0e10938932631fca7c559e78
-test/extractor-tests/generated/RecordExpr/RecordExpr_getSpread.ql b2953ee3b508fdb5e5eade3e9b1ee9e55cfa966177d3710aad97b75f18ca97be 24842e2b44bbe48f721a2816783ce98640b128809dc9dba0d7e75cee493bbc38
-test/extractor-tests/generated/RecordExprField/RecordExprField.ql 50985b2ed4d1812c75e496fed7a72687d33b3256f2be20251bff932077d5fd45 787658ebe9536a6ab5b68b21386ddec26aa90c11d60cb89628f28efa3984f460
-test/extractor-tests/generated/RecordPat/RecordPat.ql 6112996f6cbbbde14690d74e838e26a95ae5e8869e41fcdfcb2becae0aba9ef4 51208594df12c47ae766429394ddf0fd6c3463176fbfe6a8c783a563c9737156
-test/extractor-tests/generated/RecordPat/RecordPat_getFld.ql 42a4aef52fde77fc5ffad105609d40478eabf62bdc35f35db38a3fb43e56aa9d 3e911c01c5b62a07ed36b41b66fa7bf409cfccddea5e051ab34c6c8d316226df
+test/extractor-tests/generated/RecordExpr/RecordExpr_getRecordExprFieldList.ql 6d3d872eb64ff8cd7317190f9b2627d3fa6a74976e362cfb49e21c6623d63f82 d98b07f932ecb25a427e655017de47f951d3eabc4eedbc6f873571ce8921e9ff
+test/extractor-tests/generated/RecordExprField/RecordExprField.ql 62ee00e478fcf07421b5989943a487ecc0c99cf50ec87f05aabe89dfb03f2a32 ad7c6ce362032e18fc9950b885c4b7b5c907e6abd2af2d13ecef84eb980027fb
+test/extractor-tests/generated/RecordExprField/RecordExprField_getAttr.ql 789d20f8c0bb0e9567d3d9a0c0266a04841cda0dbdbe10af8c450d5a82bb289e 9036f5b0e7ddf301012f52f3919804382421061366d2a4f3a016e9783befec6d
+test/extractor-tests/generated/RecordExprField/RecordExprField_getExpr.ql 7dcb5cf0d04bcd62b655fa0626535526cdaa0f891845f4b22cb50fcf1ae3e511 a177db76e4e9583438fad9bfb1300fed9e812c1046c44dccd307bf3a46603a69
+test/extractor-tests/generated/RecordExprField/RecordExprField_getNameRef.ql 4607b1adb0e25fc5314c108dab14c19aff5a35a6b16445ed64a82c01bb7f6086 0040f2b4dffb37b257fea9870b2ac742ea3c1f9dfdeff6f69b449f9a4a3719d7
+test/extractor-tests/generated/RecordExprFieldList/RecordExprFieldList.ql b6cd65fc4fa687dc34d0848ff8c23d37088345f94902b5622b5411a62924441e 34fa8bccddf7ead18b1e597f49af008e4b244ff19d4b7f23d0777978c4d3f361
+test/extractor-tests/generated/RecordExprFieldList/RecordExprFieldList_getAttr.ql 15b297e79c1ba8c92cb97148d6aab78ed1fd2c94f0d3a430ead8d541024e81ce 4f0a131011cf32e172f7bd027769e39642fb506d37b3d50b175c6ed5947d3d9c
+test/extractor-tests/generated/RecordExprFieldList/RecordExprFieldList_getField.ql c55e4775c8880c05944be04bdeb1c9e6bad45b922ba71ac3145acd83ff988e59 14ce98d1e5564e9e27c29110237cf6210d130ea887920b2b1bd34a853b7fcc63
+test/extractor-tests/generated/RecordExprFieldList/RecordExprFieldList_getSpread.ql f2dd6b85da1cd8195986aefbe7dc8171db6fbbe5b2612c4cbdd8aba052cb0c6a 2c19cb1510c215ddfa004d40bf30fc0fe0dcbb530c320b297541f1dbcb204143
+test/extractor-tests/generated/RecordField/RecordField.ql d503ee1b9de70830947f2b406df058a3fdff7d360293f1c70671bb7f21fcf514 08687d8737dd20ce4a699e2ba4a2313b18c08de593847bce4a13077b608900f4
+test/extractor-tests/generated/RecordField/RecordField_getAttr.ql aa29d317dee23039a807df530a6f04b0678c4d1d34207a4381be535ff04af478 41c5778d6316eec19192334046ed110aea44a4c45937d5c355a9b71c54aa8e04
+test/extractor-tests/generated/RecordField/RecordField_getName.ql 1f5c47d41367bd0115df86f22a70d4621d7cbfb41554daa598da29f549479670 64535303b273f1c2027b6ce89b50816ad3cbbca9bf00b2b8402e36b26e675d97
+test/extractor-tests/generated/RecordField/RecordField_getTy.ql 601fbb244267f366ff989d3cf3d1ff29fc7c6edf415c7844f401efc7798f09b5 de1e54cd4330abed23312a32efdea35fcd8b2d6accf8d8f6f984fe27f4af30e0
+test/extractor-tests/generated/RecordField/RecordField_getVisibility.ql cc45e9bb9418d15cef07a1827358c3f18a8737324c8e6852591a2da70df89360 45557497fc165a212fffda71dedabc8159a4f72323430df732698a18922b366c
+test/extractor-tests/generated/RecordFieldList/RecordFieldList.ql 586bccfa550243177d9fdfd6900a473f51a76ed360b537f19cb300330d5dad5b a063373dfdbf06b68c69694ea4ae72a26b906c910f9095894c09e72f8fb52819
+test/extractor-tests/generated/RecordFieldList/RecordFieldList_getField.ql 2eb92ef8528204f3f105c19a36cdc06b3b6d20242463ff2ed1fb81c544812a71 d69091899e7157099f117e14fe60cd3705cfda45f28f6a6a2b7234a4a9c1e664
+test/extractor-tests/generated/RecordPat/RecordPat.ql 01510828e1facc6551e06241e41636259883a546ad43b08499468c14d6052768 fcf3873fe1cd1ebe4910150763aa350f882ca8e84603f35520bb0beeea2c21af
 test/extractor-tests/generated/RecordPat/RecordPat_getPath.ql 187b8d44de158fc809257e28b2e8fdd246c8eb3c60115d54cd53396a320e372d 74813fd13c6f34927420ed44620743f7c80c537984e0db72c1c5f4b754b40b83
-test/extractor-tests/generated/RecordPatField/RecordPatField.ql 54cd63c1a5fb16d19d62bd805074f09b8eba9df15cce9e9d9c1637afbb7884a5 7b904d7ab1662233eb5587b62b197d90324d7dbd9fa63b28679ef19858af68f1
-test/extractor-tests/generated/RefExpr/RefExpr.ql f3a85ab3e534f795fb7f08c5e535cb72132b532d5ce0b448803b8daa94e59679 c4b4cfa003727f34c772164f3c8a9258b19337d0645d497d6fcec4eda9fc6a28
-test/extractor-tests/generated/RefPat/RefPat.ql 22353b55c0559f9b25f5b9610b22d7df3ba5a76ab3f5e46eefffa3f5c0f52fa6 82759e0f701109ecbb8e17288a5b636171e956bd3efee6ebb4553b74e73cdc03
-test/extractor-tests/generated/RepeatExpr/RepeatExpr.ql 4cc25fdbe5650e54ea886594b57c4fd0a47a9d3d65ecf61f3ba8e630dcd37ab9 accb72305335f60711f7064738a6c141f81df088c34b486d4dc86bcfcbdac5b1
-test/extractor-tests/generated/ReturnExpr/ReturnExpr.ql d0fd5b7af74ca6b059116607c11c5f3a5c522d31e9ad18dd2624ca30177e1425 897ccfe546c6dbc37212f4c1a26427ee59e29dc51ad764862ad719a10ad3ba2a
+test/extractor-tests/generated/RecordPat/RecordPat_getRecordPatFieldList.ql 32e45a6f59cdb8edbf7f9326164e225a7f545fabd2dd168b660699954a999fdf 325c9121dc130459426b473691876a0698b51d5cdf4530698a398510ce8e3051
+test/extractor-tests/generated/RecordPatField/RecordPatField.ql 6c51343258e56673d21b7ae73e7de011319ffa2eb65390e697f875bb428d25d1 82c3232db0cb353140618749b1cba5549b0ff43cbbaafb203077e18dbedb2c10
+test/extractor-tests/generated/RecordPatField/RecordPatField_getAttr.ql fb0592f7a1be4fd9c6f36c79dee5a0f6711b0a7820b079f8e95413722ae1aeb7 9dfb0de00ec9c4a23efd38515c63a3567204f2a3ac2634858296f58aa564d170
+test/extractor-tests/generated/RecordPatField/RecordPatField_getNameRef.ql 3380a41d6cecd80681fc955719fa11377c32a5e0be276871f2d0d75ae62d8f0a 44efe89657d3a59fb94962d0fbf52d06571e203863a3d9e9dd47a5135a8ba4d9
+test/extractor-tests/generated/RecordPatField/RecordPatField_getPat.ql 577187a4775283bbce66abcb54af50e5684e1f03f8b55e59d84f1914d142b04f 7c23778ad92a6dccf193abb269bd8fbcb33f3b778eb18c6d23135540a27fcec7
+test/extractor-tests/generated/RecordPatFieldList/RecordPatFieldList.ql 5a49488f43bbac2349d75b3acbb3bca4440d9b3725434fefd1ba2eda2be6feb2 898177f203181e5e095091b0a3f6a92f1323c80862400cbfd85902d783a9160d
+test/extractor-tests/generated/RecordPatFieldList/RecordPatFieldList_getField.ql 7c0d190762089af3b6f4fb9ef95561bb2107d7476477bdcfce6b313caa61cab1 17c85ac9670c4faea44a76e9e21184a3d5cabc6c3deba083a0b84fb91e3cbe16
+test/extractor-tests/generated/RecordPatFieldList/RecordPatFieldList_getRestPat.ql 0caef1f5d09a73a973200e061e09ea5498b855dc19af19c1dc48cd9f20da6857 45c12708b566a5efcc79155b45174fc3ff5a084109043493cffa5216b9054205
+test/extractor-tests/generated/RefExpr/RefExpr.ql 27d5dceb9e50668e77143ff5c4aa07cbe15aeea9829de70f1ddfe18d83690106 b95058b7a0bad4bddb857794901d9b651b2f9e4dd3554e5349a70a52cbbfaff6
+test/extractor-tests/generated/RefExpr/RefExpr_getAttr.ql 477fb3fee61395fabf78f76360ea27656432cb9db62e6f1dab1e9f3c75c83d39 5210f2ac54c082b616d8dcb091659cdad08a5d4ae06bf61193c33f208237482f
+test/extractor-tests/generated/RefExpr/RefExpr_getExpr.ql 180d6417fd7322cabf4143d0ddd7810f65506b172a5c82484b3ef398041636b2 a291f0bec1ec5b3fa6d088b3d1a658889b9a3521c39ff3bb7a5ab22a56b8b20a
+test/extractor-tests/generated/RefPat/RefPat.ql ba0f0c0b12394ed80880bea7d80a58791492f1f96a26783c2b19085d11e2fd2b 22aa62c6d4b6e4354f20511f8e6d12e6da9d8b0f0b3509eefe7a0c50f7acfb49
+test/extractor-tests/generated/RefPat/RefPat_getPat.ql 60f5e010b90c2c62d26674323d209b7e46c1c2b968a69765e1b1cde028893111 fe9e7dc6a5459250355336eca0bdf2a0be575b1e34936280fd12a76a004f7b46
+test/extractor-tests/generated/RefType/RefType.ql f6959c993a8e401a576c785fd1be4b910be218a212eaa9363ebf8f83dc2f1950 686678725a7f9824e74ec6dda294fc2233fd94aced8e2683b7019a1ce81f345d
+test/extractor-tests/generated/RefType/RefType_getLifetime.ql 880434f5908752adcc02d3645a48f22399250600c19e43c2da852cb6242e6a0b b8f9b9fab827972fd318d5edcaf37e4c7d0cf92261f9744e258537e6aee5a87a
+test/extractor-tests/generated/RefType/RefType_getTy.ql 0d5667542ad05a0da1a6a4c36882a39014c4803a76cadb11400d747b603890fd 2e6c3a56f1a7bbb72c181819be72d85c650af1df06f8582ae61bba9e165cf764
+test/extractor-tests/generated/Rename/Rename.ql c8605e5d8ebb39be238ba26e46861df493d86c9caf9aa9a791ed5ff8d65a812a 7263c2c2565e41c652eda03d1e1ddd030fea79a8e3c967909df9945e30ecbe68
+test/extractor-tests/generated/Rename/Rename_getName.ql 1648191216ece0e3468823ed376292611bd3e5dbe9b3e215167d7051aa03385f 381683d4637a1a7322c9a0df2d90a30a153630965e7facbfaccd6cdb5c1de2cd
+test/extractor-tests/generated/RestPat/RestPat.ql 0abc6a13ec82ebc923ce768344d468871a05a515690f0feaaf55b7967cf34a9e c2bc069de6927c6c04c89c54e694b50d6ca052230cc36668302907a7ed883e08
+test/extractor-tests/generated/RestPat/RestPat_getAttr.ql fb391ab265a454b10270136efd61c1ae9b29951cd28b0f585c6b6eea37c64745 6311e3ca49eb8a061684f8cebdfb11cc5ae09db6e145d1b2349a2ee80298cfe9
+test/extractor-tests/generated/RetType/RetType.ql 7aca20c92e840f930aacd0ef8e70840da76c02592ac2f2fd5a9bf24dc872c30e ef3aed1090a77684773c814692cfaee9cd245d88292cd75f1b5acf9005a2cd17
+test/extractor-tests/generated/RetType/RetType_getTy.ql 55118e2a41cc1a097f6a69d3b63f3ed77d5da6c02b218b69b1c93d605e7239fd b32abe7a3978fe858a53a5772faabf750b5d14880054493f5a99466092b10dce
+test/extractor-tests/generated/ReturnExpr/ReturnExpr.ql 8e9eba0837a466255e8e249e62c69c613cb5a78193fe50e26a617cf9d21c995a f33f6cc874f74d1ce93a6975c88748bd5bca6dc10360f8fd59493d939be63658
+test/extractor-tests/generated/ReturnExpr/ReturnExpr_getAttr.ql 9fb7e1c79798e4f42e18785f3af17ea75f901a36abf9beb47a1eede69c613ba9 9cdb7cc4a4742865f6c92357973f84cee9229f55ff28081e5d17b6d57d6d275f
 test/extractor-tests/generated/ReturnExpr/ReturnExpr_getExpr.ql 7d4562efb0d26d92d11f03a0ef80338eb7d5a0c073f1f09cbb8a826f0cef33de 523ebd51b97f957afaf497e5a4d27929eed18e1d276054e3d5a7c5cfe7285c6e
-test/extractor-tests/generated/SlicePat/SlicePat.ql 339a471e5519922555750dee1b052ea9a8d7c562f2c311d41e06ccc73df4fca1 60a430d57c07b443e0806be5b92a412767e74e7cae4c0f6d23f4cafc4003c4d3
-test/extractor-tests/generated/SlicePat/SlicePat_getPrefix.ql 0e0529209201838fc646b04155e71528348d478c3577bdde0afd9c23a29730e9 3597fbdba12eaa9cc4c2deafa07e558295f039b9b86c330bc23d2eef39351619
-test/extractor-tests/generated/SlicePat/SlicePat_getSlice.ql d4e2c34ff26f753da099370b91c83e0979536de7fe09e7a657324583935f786b 4e36f7e3d245b250de2861c9b868dd313c683caec7609c5d1a2f20bb974cec21
-test/extractor-tests/generated/SlicePat/SlicePat_getSuffix.ql 634db269d392a76c8a43cfd5cfaeb21c32fd049eb080201a78d10d5ec3beee87 a433e6e5664fc90bf40cbca5556f43e5b407d8c4303d55dd08816a722369dce4
-test/extractor-tests/generated/TupleExpr/TupleExpr.ql 0ac4829646d2fcd89636081f193ac0f88094c221a210766ceee7ad37342b67da 737bd100dc08d4ad9204bcd1c1bf19b18953f55d1c9c2e7b9937bca4364d6868
-test/extractor-tests/generated/TupleExpr/TupleExpr_getExpr.ql 3ee9e0172dff2fce6fa6cc9454040c03eeb85fd1336dbf5c3bd9267a9c962d43 71b8ee7fac1a421abefbd86cc811d2a75258f36698ca4ca0f933eb69a57f8d0b
-test/extractor-tests/generated/TuplePat/TuplePat.ql 8dd48a4a9b7ae94847cfbf5b804841784cb56372b2b66cb1da8c3d51d9b78188 7f9d96e11337525d1e074f84875311ec80c0b073ecd953550f72a95ec389132d
-test/extractor-tests/generated/TuplePat/TuplePat_getArg.ql 12ba9cab50c872d51329a6ed3904475fb6b6c990a4df7494c8906d1ce04d1d1a 41adebc7c9df727f60e5b83eeca8e688bbecc59e30997d9c4ad81a2627752ef5
-test/extractor-tests/generated/TuplePat/TuplePat_getEllipsisIndex.ql f8527322afe932311e30cdfd43ba5b3380ef43deb4e45141562961c6657883e0 5259bbb35a4ff7076ec5af20e21bf12d938cdc65335a825b4e2a83c542d1af7d
-test/extractor-tests/generated/TupleStructPat/TupleStructPat.ql 92829fb32660bea587a6bbdce63633040f6d5e4674c327af416bc211a5f2b08e 52ce0a1b9ae901dbdd286af2815fad27b0ed48842a358ec45474fa110ababdc5
-test/extractor-tests/generated/TupleStructPat/TupleStructPat_getArg.ql 890194aa8cfffecfff9f3de0b8e061e753b3d036668c2fa22023ab5e8f4d524a efd268815ecb12f4d285bf4b172d419933c8773574905e028750c46898530ae8
-test/extractor-tests/generated/TupleStructPat/TupleStructPat_getEllipsisIndex.ql e88875f8c508b60fcbe6b4dfb61239b506f9bd3a57233087bfec7a783697d7d9 a2024c4499afebfc86b3c7fa144fd9c33ab4059bdb0dc7e68f6951b12eafd079
+test/extractor-tests/generated/ReturnTypeSyntax/ReturnTypeSyntax.ql 976ce33fe3fd34aae2028a11b4accdee122b6d82d07722488c3239f0d2c14609 906bf8c8e7769a1052196bc78947b655158dd3b2903fef2802e2031cffbc1d78
+test/extractor-tests/generated/SelfParam/SelfParam.ql d051c7a2dd88382e37895f1d691f2702aed7f925d3936f51d49949463e4757c8 37f1f429093be7923a55f8b4f46b37bbf71d0dff3843c4d3686383c2863dee1a
+test/extractor-tests/generated/SelfParam/SelfParam_getAttr.ql 00dd5409c07e9a7b5dc51c1444e24b35d2ac3cab11320396ef70f531a3b65dc0 effbed79ad530a835e85b931389a0c8609a10ee035cb694f2e39b8539f8e54ba
+test/extractor-tests/generated/SelfParam/SelfParam_getLifetime.ql 0b7c243f609e005dd63fd1b3b9f0096fc13cb98fe113e6f3fefb0d5c414e9a5f f6e06de8bcddfc9bd978c058079e53174edbe7b39f18df3c0bd4e80486808eda
+test/extractor-tests/generated/SelfParam/SelfParam_getName.ql 69207a57b415ba590e50003d506a64fd1780b27b8832b14f9bd3c909bddb5593 56fa28ba1222f45893237052fa5a9421d960e14fbf1396b2d1049b440c2e5abe
+test/extractor-tests/generated/SelfParam/SelfParam_getTy.ql 521db95ede5184298ef05f78062f6c42152ebc60f1a395e162ceda73e4fe5d36 b1e261e0bef72db4bb1a5bc294b93497e5b61ba607588444154cacdb23ac15a4
+test/extractor-tests/generated/SlicePat/SlicePat.ql c6ff3c926ebbea3d923ba8ed00bf9cc20eaaee4c6ae49ea797c0975d0535240e 1b27e0caeb793da3b82059268b83bd624e81f215de42acbb548c52bacba3ed9e
+test/extractor-tests/generated/SlicePat/SlicePat_getPat.ql e2f892a3a4c623fe3f7e64e1438128126bc4d8b8c0f657ae53bb99d3209a3b13 af835d9ec840c63e13edc6a9230a4e34cb894f4379b85b463b8068de5a8bd717
+test/extractor-tests/generated/SliceType/SliceType.ql 2c81c68b54bf21d32f94ed66765642549540d3d179ac4daa52b597a3ad862c36 1d3b21af4a62a99776f3d569be3b85cac9fdb214d04f37ffb2f9f0759f520da9
+test/extractor-tests/generated/SliceType/SliceType_getTy.ql 0bc70c0e60fc3552584b07ba2a23f304b47ad24644e015674665d0182fa4d1e5 f6ec0703b013d805eec2bb11d28393fc750d000ff6c2188618aa333095c7e328
+test/extractor-tests/generated/SourceFile/SourceFile.ql c30a3c2c82be3114f3857295615e2ec1e59c823f0b65ea3918be85e6b7adb921 6a5bbe96f81861c953eb89f77ea64d580f996dca5950f717dd257a0b795453e6
+test/extractor-tests/generated/SourceFile/SourceFile_getAttr.ql 450404306b3d991b23c60a7bb354631d37925e74dec7cc795452fe3263dc2358 07ffcc91523fd029bd599be28fe2fc909917e22f2b95c4257d3605f54f9d7551
+test/extractor-tests/generated/SourceFile/SourceFile_getItem.ql f17e44bc0c829b2aadcb6d4ab9c687c10dc8f1afbed4e5190404e574d6ab3107 1cf49a37cc32a67fdc00d16b520daf39143e1b27205c1a610e24d2fe1a464b95
+test/extractor-tests/generated/Static/Static.ql b4266fc731d027e00825cbb02d27f9dde50c7e8d32fd6b571cb167da64a8747e 9dd9c4dd56210adcfbd1bd387d79f27a30394e7b8b9c81cc2553a718f36cca5a
+test/extractor-tests/generated/Static/Static_getAttr.ql adb0bbf55fb962c0e9d317fd815c09c88793c04f2fb78dfd62c259420c70bc68 d317429171c69c4d5d926c26e97b47f5df87cf0552338f575cd3aeea0e57d2c2
+test/extractor-tests/generated/Static/Static_getBody.ql e735bbd421e22c67db792671f5cb78291c437621fdfd700e5ef13b5b76b3684d 9148dc9d1899cedf817258a30a274e4f2c34659140090ca2afeb1b6f2f21e52f
+test/extractor-tests/generated/Static/Static_getCrateOrigin.ql f24ac3dac6a6e04d3cc58ae11b09749114a89816c28b96bf6be0e96b2e20d37f e4051426c5daa7e73c1a5a9023d6e50a2b46ebf194f45befbe3dd45e64831a55
+test/extractor-tests/generated/Static/Static_getExtendedCanonicalPath.ql 6ec02f7ec9cf4cb174a7cdf87921758a3e798c76171be85939614305d773b6a0 c51567dac069fc67ece0aa018ae6332187aa1145f33489093e4aee049d7cea52
+test/extractor-tests/generated/Static/Static_getName.ql c7537e166d994b6f961547e8b97ab4328b78cbd038a0eb9afaae42e35f6d9cb4 bb5ae24b85cd7a8340a4ce9e9d56ec3be31558051c82257ccb84289291f38a42
+test/extractor-tests/generated/Static/Static_getTy.ql 1f282ac9c52b8d9efa1eb7f963767d0af28332c99baf283b3818edf53b3b8b9f 656cd5516601e21ffd54c51934bbbbe293de0b30a4327240208f5bd51ed524b7
+test/extractor-tests/generated/Static/Static_getVisibility.ql 0672b27f16955f7b0223a27c037884338dcf30759b7b8bb3da44e5d533228f90 0e4916f5683963041ef23c724ca8e16acfa370b583d90b76508c87131b9e1c73
+test/extractor-tests/generated/StmtList/StmtList.ql 0010df0d5e30f7bed3bd5d916faff7d101cc1edddceab7ddc12bb744f8e46cf7 aaff98988c68713b3577f3d4b4ed16b978eb11433ec7f3a32def82e96aac8c5b
+test/extractor-tests/generated/StmtList/StmtList_getAttr.ql 78d4bf65273498f04238706330b03d0b61dd03b001531f05fcb2230f24ceab64 6e02cee05c0b9f104ddea72b20097034edb76e985188b3f10f079bb03163b830
+test/extractor-tests/generated/StmtList/StmtList_getStatement.ql abbc3bcf98aab395fc851d5cc58c9c8a13fe1bdd531723bec1bc1b8ddbec6614 e302a26079986fa055306a1f641533dfde36c9bc0dd7958d21e2518b59e808c2
+test/extractor-tests/generated/StmtList/StmtList_getTailExpr.ql 578d7c944ef42bdb822fc6ce52fe3d49a0012cf7854cfddbb3d5117133700587 64ea407455a3b4dfbb86202e71a72b5abbff885479367b2834c0dd16d1f9d0ee
+test/extractor-tests/generated/Struct/Struct.ql 14dc5ead6bed88c2c79d9fd3874198f845d8202290b0931b2d2375c0a397c44a 408b07b6bb40ca09f51d2becd94501cc2b95ec52e04ccc2703c2e25d6577b4c6
+test/extractor-tests/generated/Struct/Struct_getAttr.ql 028d90ddc5189b82cfc8de20f9e05d98e8a12cc185705481f91dd209f2cb1f87 760780a48c12be4581c1675c46aae054a6198196a55b6b989402cc29b7caf245
+test/extractor-tests/generated/Struct/Struct_getCrateOrigin.ql 289622244a1333277d3b1507c5cea7c7dd29a7905774f974d8c2100cea50b35f d32941a2d08d7830b42c263ee336bf54de5240bfc22082341b4420a20a1886c7
+test/extractor-tests/generated/Struct/Struct_getExtendedCanonicalPath.ql 866a5893bd0869224fb8aadd071fba35b5386183bb476f5de45c9de7ab88c583 267aedc228d69e31ca8e95dcab6bcb1aa30f9ebaea43896a55016b7d68e3c441
+test/extractor-tests/generated/Struct/Struct_getFieldList.ql f45d6d5d953741e52aca67129994b80f6904b2e6b43c519d6d42c29c7b663c42 77a7d07e8462fa608efc58af97ce8f17c5369f9573f9d200191136607cb0e600
+test/extractor-tests/generated/Struct/Struct_getGenericParamList.ql cd72452713004690b77086163541fa319f8ab5faf503bb4a6a20bcaf2f790d38 4d72e891c5fac6e491d9e18b87ecf680dc423787d6b419da8f700fe1a14bc26f
+test/extractor-tests/generated/Struct/Struct_getName.ql 8f1d9da4013307b4d23a1ce5dc76466ecdd7f0010b5148ec2e7dd2883efe3427 411b326d15d56713c2a5e6d22909474c5d33062296518221e36c920927f859fe
+test/extractor-tests/generated/Struct/Struct_getVisibility.ql 17139d3f91e02a0fc12ad8443fe166fe11003301fee0c303f13aa6d1138e82d5 07bdc1fbcc0ea40508364ea632fce899cbe734159f5c377ea2029bc41bc9a3b4
+test/extractor-tests/generated/Struct/Struct_getWhereClause.ql d0db2c9811ed4568359e84255f04f0c75ae65a80d40981a1545d6cddf53e9c09 1133a46bc502757aaab61a8ac94b4a256b590548c5e27ec6a239ffd5a4a81577
+test/extractor-tests/generated/TokenTree/TokenTree.ql ba2ef197e0566640b57503579f3bc811a16fec56f4817117395bf81da08922a6 2e7b105cb917a444171669eb06f5491a4b222b1f81fa79209a138ab97db85aff
+test/extractor-tests/generated/Trait/AssocItemList.ql 0ea572b1350f87cc09ce4dc1794b392cc9ad292abb8439c106a7a1afe166868b 6e7493a3ace65c68b714e31234e149f3fc44941c3b4d125892531102b1060b2f
+test/extractor-tests/generated/Trait/AssocItemList_getAssocItem.ql 8149d905f6fc6caeb51fa1ddec787d0d90f4642687461c7b1a9d4ab93a27d65d 8fb9caad7d88a89dd71e5cc8e17496afbdf33800e58179f424ef482b1b765bb1
+test/extractor-tests/generated/Trait/AssocItemList_getAttr.ql 06526c4a28fd4fdce04ca15fbadc2205b13dcc2d2de24177c370d812e02540e6 79c8ce6e1f8acc1aaca498531e2c1a0e7e2c0f2459d7fc9fe485fd82263c433f
+test/extractor-tests/generated/Trait/Trait.ql e88ff04557cf050a5acb5038537bb4f7a444c85721eaf3e0aa4c10e7e7724c56 e37b9e60fa8cc64ef9e8db1707d2d8c5a62f9804233c939b4aaa39762b9b0a9a
+test/extractor-tests/generated/Trait/Trait_getAssocItemList.ql 05e6896f60afabf931a244e42f75ee55e09c749954a751d8895846de3121f58f def1f07d9945e8d9b45a659a285b0eb72b37509d20624c88e0a2d34abf7f0c72
+test/extractor-tests/generated/Trait/Trait_getAttr.ql 9711125fa4fc0212b6357f06d1bc50df50b46168d139b649034296c64d732e21 901b6a9d04055b563f13d8742bd770c76ed1b2ccf9a7236a64de9d6d287fbd52
+test/extractor-tests/generated/Trait/Trait_getCrateOrigin.ql d8433d63bb2c4b3befaaedc9ce862d1d7edcdf8b83b3fb5529262fab93880d20 3779f2678b3e00aac87259ecfe60903bb564aa5dbbc39adc6c98ad70117d8510
+test/extractor-tests/generated/Trait/Trait_getExtendedCanonicalPath.ql a2bd16e84f057ed8cb6aae3e2a117453a6e312705302f544a1496dbdd6fcb3e6 b4d419045430aa7acbc45f8043acf6bdacd8aff7fdda8a96c70ae6c364c9f4d1
+test/extractor-tests/generated/Trait/Trait_getGenericParamList.ql b27ff28e3aff9ec3369bbbcbee40a07a4bd8af40928c8c1cb7dd1e407a88ffee 2b48e2049df18de61ae3026f8ab4c3e9e517f411605328b37a0b71b288826925
+test/extractor-tests/generated/Trait/Trait_getName.ql d4ff3374f9d6068633bd125ede188fcd3f842f739ede214327cd33c3ace37379 3dcf91c303531113b65ea5205e9b6936c5d8b45cd3ddb60cd89ca7e49f0f00c1
+test/extractor-tests/generated/Trait/Trait_getTypeBoundList.ql 8a4eb898424fe476db549207d67ba520999342f708cbb89ee0713e6bbf1c050d 69d01d97d161eef86f24dd0777e510530a4db5b0c31c760a9a3a54f70d6dc144
+test/extractor-tests/generated/Trait/Trait_getVisibility.ql 8f4641558effd13a96c45d902e5726ba5e78fc9f39d3a05b4c72069993c499f4 553cf299e7d60a242cf44f2a68b8349fd8666cc4ccecab5ce200ce44ad244ba9
+test/extractor-tests/generated/Trait/Trait_getWhereClause.ql b34562e7f9ad9003d2ae1f3a9be1b5c141944d3236eae3402a6c73f14652e8ad 509fa3815933737e8996ea2c1540f5d7f3f7de21947b02e10597006967efc9d1
+test/extractor-tests/generated/TraitAlias/TraitAlias.ql 8870048164ba3c3ea8d4c10e5793d860a4ed3ef0890bf32409827321ddde4b72 9a912ebba80977656e74e1d94478c193164684f01371e23f09817231b58007ff
+test/extractor-tests/generated/TraitAlias/TraitAlias_getAttr.ql 128c24196bfa6204fffd4154ff6acebd2d1924bb366809cdb227f33d89e185c8 56e8329e652567f19ef7d4c4933ee670a27c0afb877a0fab060a0a2031d8133e
+test/extractor-tests/generated/TraitAlias/TraitAlias_getCrateOrigin.ql 303212122021da7f745050c5de76c756461e5c6e8f4b20e26c43aa63d821c2b6 fdbd024cbe13e34265505147c6faffd997e5c222386c3d9e719cd2a385bde51c
+test/extractor-tests/generated/TraitAlias/TraitAlias_getExtendedCanonicalPath.ql 601b6b0e5e7e7f2926626866085d9a4a9e31dc575791e9bd0019befc0e397193 9bd325414edc35364dba570f6eecc48a8e18c4cbff37d32e920859773c586319
+test/extractor-tests/generated/TraitAlias/TraitAlias_getGenericParamList.ql 5a40c1760fcf5074dc9e9efa1a543fc6223f4e5d2984923355802f91edb307e4 9fd7ab65c1d6affe19f96b1037ec3fb9381e90f602dd4611bb958048710601fa
+test/extractor-tests/generated/TraitAlias/TraitAlias_getName.ql e91fa621774b9467ae820f3c408191ac75ad33dd73bcd417d299006a84c1a069 113e0c5dd2e3ac2ddb1fd6b099b9b5c91d5cdd4a02e62d4eb8e575096f7f4c6a
+test/extractor-tests/generated/TraitAlias/TraitAlias_getTypeBoundList.ql 9ab4c329b25ea5e1a899b8698093f404ee9c095f0b0e38011161ca6480cd10a7 95c3b93610cdc08a0e251ab1307523f8cfb5560460923c81aace8619e30746dd
+test/extractor-tests/generated/TraitAlias/TraitAlias_getVisibility.ql 7e86140d2e9081d46063a15d82719be315406eb4d6e6738b3cb5ba7bcbef458f 8fb1ecf6a96b1f1d4a840425139c4ad47feb8b0ff14a319c08f82535e62e23c7
+test/extractor-tests/generated/TraitAlias/TraitAlias_getWhereClause.ql 129e1f10aa23f10d71f144caa4ccb923928ec1fd791b203cdba9989b079fc1e1 1fb112215bd3e39b7bc8ebc059f9cc362e5b2f04a242df053e150efa638cfea7
+test/extractor-tests/generated/TryExpr/TryExpr.ql 3beaa08f6d734e74eca32ae2e3fb6aa7694400a429cd6b3db97bfd3402b379b8 3f55bfc71e804e2ba6f02087c0808901a379b2cb30f58d5933c91becc10f3654
+test/extractor-tests/generated/TryExpr/TryExpr_getAttr.ql a2cef886bb959ff0f47fa555e7a89075f93ab013e1766270590951bf0b14a47b 24d12c96f1c7a1ae3d0d596551fb53ef2745c890eb602e0f99db3cb70cf1e474
+test/extractor-tests/generated/TryExpr/TryExpr_getExpr.ql 4ccd50eb4bdf01381eabb843b5ea3ebddec5d5852a04f10be9b9a4ef8a3005f1 0ec050d28c70322f6f280180fee998d1b6cd82db4e114db7e10758fcee2a2fca
+test/extractor-tests/generated/TupleExpr/TupleExpr.ql d6caa8d9ff94f27f88d338b07cacc280289970931e101680c6574e32bc0c863e 70508104013003dcf98f22db6eb9b60d14552831714048f348f812807189e9b1
+test/extractor-tests/generated/TupleExpr/TupleExpr_getAttr.ql b1e93069613a8cd2b49af93a5cdd1571b343571e9c3d049d8bf19b25a461f9d3 be18008a00e3b0fb786f5dd36268201fd43bf8527d8a40119b147a3a8c973b3b
+test/extractor-tests/generated/TupleExpr/TupleExpr_getField.ql 308cd14873afedc74e3ed61d283f72da50008ce7690510c57fe0934c92158d58 5e3e23a7221486ead6502debb5d4978fb67046c8b0a5c8a688e4e196cb1f28a1
+test/extractor-tests/generated/TupleField/TupleField.ql 2dbdb37ecb22a05007713434ac747a348266bab2863e48704fff48a10eb01c75 4309f177306f8adea929c1cff809eb26e262ae12e0d95b22597efd36c9105bfd
+test/extractor-tests/generated/TupleField/TupleField_getAttr.ql b6b6a5349fc6767b0081d737e818425f0c93be5bd8de47c29fd89b7812e3267d 23d82a649cb733bc8c1d1b09dde84dbfcc8f847ed35be986a9ca8717ea9e5081
+test/extractor-tests/generated/TupleField/TupleField_getTy.ql 291d62ba4246acad200cd5347ed1280d80595fdf663f0ec39389996c23745fd0 d364381e5aab8aca36be354af5c41b2e8b5e95ae8cb7a14a702a28f644d567a8
+test/extractor-tests/generated/TupleField/TupleField_getVisibility.ql c7af5373382394a686d12a23c4e688a7cc0dfe6b6cbee25c7e863b4713601ddb b174f30404e69eef112dedc8397ad444e968f12dde9befdccb051305d98a75d2
+test/extractor-tests/generated/TupleFieldList/TupleFieldList.ql 7dc88440222ff036eb6aeabf9311568ea34f31f7c1ad19c71dd69a2dc17a6ed9 0255890d1389da004f18e8a0fc0b72d22790c36ccfacc6f452b269667f030f22
+test/extractor-tests/generated/TupleFieldList/TupleFieldList_getField.ql ad552a9c0b9964d1770f14cabbb436db60ebedc3c569006542a8eae9ddb30f6d 3a8c49d629376a9b8326138836b05ee2366b1021ffd19f5be74ab023e70aa50d
+test/extractor-tests/generated/TuplePat/TuplePat.ql 24ee56bc848537da65eb8ecef71e84cc351a2aedcc31d6fb53a5b7865f15f7c2 81db1076e2e4921ceb50933b96cd7b574caab1818de257c1e9038f3f97447d59
+test/extractor-tests/generated/TuplePat/TuplePat_getField.ql f000bed41af031bc56d0705ce312abe7ab3dc6745b2936798c9938781e51475e f464a84dbc36aa371d60d6db68d6251f6b275dc4ecebdc56f195637be390b067
+test/extractor-tests/generated/TupleStructPat/TupleStructPat.ql 6e6cfba0d2565782088af55ca977ada3d8093200aa180a49a67c9a176c52c254 c10c93823a9d814d694ca88fdf65a9bf8c1bb178e50c08982a97aa8d445284b3
+test/extractor-tests/generated/TupleStructPat/TupleStructPat_getField.ql f3f2e23cc2a32aa5abc1e0fda1300dab1693230632b9eaa75bb3b1e82ee9ea1a 24b87a39ec639a26ff8c1d04dc3429b72266b2a3b1650a06a7cd4387b6f0e615
 test/extractor-tests/generated/TupleStructPat/TupleStructPat_getPath.ql 13a06696bbf1fa8d5b73107e28cdba40e93da04b27f9c54381b78a52368d2ad1 5558c35ea9bb371ad90a5b374d7530dd1936f83e6ba656ebfbfd5bd63598e088
-test/extractor-tests/generated/TypeRef/TypeRef.ql 2bf65910d4cb9327d512cbb6643b48283b9f227ee1c7729c260b98b77cafa30d f5a55e600a82525aaaf0e3418926b12d62e5821a980ca2c79eba0b70ddf0cc13
-test/extractor-tests/generated/UnderscoreExpr/UnderscoreExpr.ql bf700e9d002d8427b0f4ad6c26cf7d58c77b586bc730ee133a56b17b6c946b37 f9bcafd16a86580877f95417c97458673bd7491de3f2cfc58463ad353455b504
-test/extractor-tests/generated/UnsafeBlockExpr/UnsafeBlockExpr.ql 6d6d636931caead6a142df8cfd3e7a642dce53c419e0adbe376fc78d7552d120 ce9c9254e64724f73d44b18aa659aeaa04227555d7368862e1094c11013e191a
-test/extractor-tests/generated/UnsafeBlockExpr/UnsafeBlockExpr_getStatement.ql 531d7a546eadd004230a7e565a5067acbb200e7dc9a6971499bc7f6957bc93d0 24077d716bc4d64a227749bb4285c7102373d727639f091ca8f1839a0b184167
-test/extractor-tests/generated/UnsafeBlockExpr/UnsafeBlockExpr_getTail.ql a2b247a370ae019a8ca38b5cfaa6b92e3c0fb6fb819fa5b34e2adb474a76ec5f 3278a70e1887123e282f26b43a5f6ebc94d3727f09eca999f46642f7d8541a88
+test/extractor-tests/generated/TupleType/TupleType.ql e5951a30817b8c51fe9cb9435f75bfdca2a1277b2094267d3205e33ef1ee9a9c 9a4d57322ed2cff57057654272981b056f833136f983141b033afaf64e19c117
+test/extractor-tests/generated/TupleType/TupleType_getField.ql b73a8cdaf6ba46cf9b63d8819239d2d2c06b3496ed4768e8a387a7558178fbd8 6efbcf13c25d0ff3ed0c6d194ba44d2abfa620406badef8184953395fab92bb4
+test/extractor-tests/generated/TypeAlias/TypeAlias.ql 87645d4aa0e2c789dfd7111c6150e72c65b2e108b371bb5fc247aa8d34a25893 6335b4e56d998eed57d8f026d2d1dbfc018754e87c755e1194a2ef9f7a468233
+test/extractor-tests/generated/TypeAlias/TypeAlias_getAttr.ql ecf4b45ef4876e46252785d2e42b11207e65757cdb26e60decafd765e7b03b49 21bb4d635d3d38abd731b9ad1a2b871f8e0788f48a03e9572823abeea0ea9382
+test/extractor-tests/generated/TypeAlias/TypeAlias_getCrateOrigin.ql cd66db5b43bcb46a6cf6db8c262fd524017ef67cdb67c010af61fab303e3bc65 2aebae618448530ec537709c5381359ea98399db83eeae3be88825ebefa1829d
+test/extractor-tests/generated/TypeAlias/TypeAlias_getExtendedCanonicalPath.ql fe9c4132e65b54eb071b779e508e9ed0081d860df20f8d4748332b45b7215fd5 448c10c3f8f785c380ce430996af4040419d8dccfa86f75253b6af83d2c8f1c9
+test/extractor-tests/generated/TypeAlias/TypeAlias_getGenericParamList.ql e7e936458dce5a8c6675485a49e2769b6dbff29c112ed744c880e0fc7ae740ef e5fcf3a33d2416db6b0a73401a3cbc0cece22d0e06794e01a1645f2b3bca9306
+test/extractor-tests/generated/TypeAlias/TypeAlias_getName.ql 757deb3493764677de3eb1ff7cc119a469482b7277ed01eb8aa0c38b4a8797fb 5efed24a6968544b10ff44bfac7d0432a9621bde0e53b8477563d600d4847825
+test/extractor-tests/generated/TypeAlias/TypeAlias_getTy.ql c4d56678981c78cd839b203dbd4a02dd30144db83329fb0015e90cf6c6138757 f9626eee79ce10727c6f13ed6a4819eb7da32827357a52939afaf4e71419af33
+test/extractor-tests/generated/TypeAlias/TypeAlias_getTypeBoundList.ql 309efaa32a840fb1fca7d34b7cdbbf51ab469707fa195b69a9f1a7d141db3a02 e12bf44d8858e930bdde80ecd7909b5405a51a1b00a6d2c8ee880e68dd622075
+test/extractor-tests/generated/TypeAlias/TypeAlias_getVisibility.ql a1851a78f31ad6e3e5e43537832701f4c420546c2c86449c8391d3cc366d5445 23c118f662dee5f0e286753d107165b1964ce703a1378765f974530929a32723
+test/extractor-tests/generated/TypeAlias/TypeAlias_getWhereClause.ql 0cd281b7b5d3a76e4ec1938d7dcebb41e24ed54e94f352dcf48cbcdb5d48b353 5898e71246d8ba7517dab1f8d726af02a7add79924c8e6b30ce2c760e1344e8f
+test/extractor-tests/generated/TypeArg/TypeArg.ql 8019f0eb5a64162df88e7e64ba0355578dad158b884c8eb42b2f10e093e52121 4871ac369925228978a1e16cf1393a449ea846657893d8a760fb46dbd6a0d609
+test/extractor-tests/generated/TypeArg/TypeArg_getTy.ql 54c291039d88fb460b0bc6bb83938c3be272898512415d08abffea714a000275 3117f1bbc1168b0ff75948459673c50971e3e71b0bb966783a8dc44328803f33
+test/extractor-tests/generated/TypeBound/TypeBound.ql f49bc5b12f9817d9464c771bd35837c1ae6c8b3162ab6b0fc9b3e6748d18e87a 2535af71fa8e212d6f9b9e10ca0ba7958808dea4d1af432e1d5167a681d7779c
+test/extractor-tests/generated/TypeBound/TypeBound_getGenericParamList.ql 7cf4ce64ea8048b85733fc2de627480465a616d62f57345c25bb62fdfda0ca59 e63b77ed3555b150cebf205016b1cc8d1b10fda315d5a21b3e60753ad602ea8f
+test/extractor-tests/generated/TypeBound/TypeBound_getLifetime.ql 615b0f5ccbffc425a3fa9480197bfae649c072717697f59d2e9b8112d2ff3fcf 1f969aca15be820eb27fe80317ad7fd4ce60f1a0fbcb4ae98b04828b0aeca632
+test/extractor-tests/generated/TypeBound/TypeBound_getTy.ql bded40be75f99b97869e5b4701a479db91867a861fb9f2071f4f7df0980ac6a2 6bdb30e50ba3ab7c2976aa602bae54a089019c8b81cab497c962b6b96362fbab
+test/extractor-tests/generated/TypeBoundList/TypeBoundList.ql 829c62ad88caa7707a4067c1a34f81971e936af1280a134b0b3532fbd4e4c887 10133eec05b902d5f0a6b3ed66156879914a83290014ba0ded26f1c3aaeb2b28
+test/extractor-tests/generated/TypeBoundList/TypeBoundList_getBound.ql a6f6ec3f8d329da3509a8040ee2383ec6d9c66fe7c5685d94e90ac989a9e61b0 c812280f09658c63beb2a2ec0ab86e007819da08b6637bb4299c6ed6c90a4c6f
+test/extractor-tests/generated/TypeParam/TypeParam.ql bff624133257883477db43ae05cc17681ab20d5564c2025dc78758255a62eaf2 a25d4adbe6119f4f36fa57f08cf7ba52e0b54668047e685d811570e0126bcfaf
+test/extractor-tests/generated/TypeParam/TypeParam_getAttr.ql c071639828faca21de4b65a26a712ce126f7e989118ad4a896342b8e7d2aa2d0 83050691345f58c73a47f9cfd011bdf65a0759ffb3ea957336dc0ff6d600d13a
+test/extractor-tests/generated/TypeParam/TypeParam_getDefaultType.ql 705edd03cf04c030a244541de287d2acfd3842389bfc58a26cfd1577da475113 7f2680131d4bcf301e8207a4844305c459615744a83c81f2c3a245db8284df74
+test/extractor-tests/generated/TypeParam/TypeParam_getName.ql 9d5b6d6a9f2a5793e2fff8dfa69d470659cc36dc417fc8b463364892f70c9d13 91dc4396c2af6c5175c188691c84b768da0d779d5d82afee19baf31e92c7dd91
+test/extractor-tests/generated/TypeParam/TypeParam_getTypeBoundList.ql 080a6b370ad460bf128fdfd632aa443af2ad91c3483e192ad756eb234dbfa4d8 8b048d282963f670db357f1eef9b8339f83d03adf57489a22b441d5c782aff62
+test/extractor-tests/generated/UnderscoreExpr/UnderscoreExpr.ql 4ad6ed0c803fb4f58094a55b866940b947b16259756c674200172551ee6546e0 d3270bdcc4c026325159bd2a59848eb51d96298b2bf21402ea0a83ac1ea6d291
+test/extractor-tests/generated/UnderscoreExpr/UnderscoreExpr_getAttr.ql d8502be88bcd97465f387c410b5078a4709e32b2baa556a4918ea5e609c40dd7 b238dc37404254e3e7806d50a7b1453e17e71da122931331b16a55853d3a843f
+test/extractor-tests/generated/Union/Union.ql 1049e542ca7723490d05e20b5a7a5867f74a5126395f333eae512aeb05efefd6 1f1cd82337e7ade9d02d16123201bbff62983c537672b5c1babfe6b65d300e82
+test/extractor-tests/generated/Union/Union_getAttr.ql 42fa0878a6566208863b1d884baf7b68b46089827fdb1dbbfacbfccf5966a9a2 54aa94f0281ca80d1a4bdb0e2240f4384af2ab8d50f251875d1877d0964579fc
+test/extractor-tests/generated/Union/Union_getCrateOrigin.ql c218308cf17b1490550229a725542d248617661b1a5fa14e9b0e18d29c5ecc00 e0489242c8ff7aa4dbfdebcd46a5e0d9bea0aa618eb0617e76b9b6f863a2907a
+test/extractor-tests/generated/Union/Union_getExtendedCanonicalPath.ql 6268ddb68c3e05906e3fc85e40635925b84e5c7290746ded9c6814d362033068 04473b3b9891012e95733463018db8da0e96659ea0b10458b33dc857c091d278
+test/extractor-tests/generated/Union/Union_getGenericParamList.ql c55156ae26b766e385be7d21e67f8c3c45c29274201c93d660077fcc47e1ceee 4c4d338e17c32876ef6e51fd19cff67d125dd89c10e939dfaadbac824bef6a68
+test/extractor-tests/generated/Union/Union_getName.ql 17247183e1a8c8bbb15e67120f65ca323630bddeb614fa8a48e1e74319f8ed37 e21c2a0205bc991ba86f3e508451ef31398bdf5441f6d2a3f72113aaae9e152b
+test/extractor-tests/generated/Union/Union_getRecordFieldList.ql ded2890094adaa627be35f2a8335abbe5c1d4b5dcf1671f09f504546148cc02e 1f0d94a5c3259b8c39f2a78f1f9250655c6183a5277131a7f3de14126eee6d03
+test/extractor-tests/generated/Union/Union_getVisibility.ql 86628736a677343d816e541ba76db02bdae3390f8367c09be3c1ff46d1ae8274 6514cdf4bfad8d9c968de290cc981be1063c0919051822cc6fdb03e8a891f123
+test/extractor-tests/generated/Union/Union_getWhereClause.ql 508e68ffa87f4eca2e2f9c894d215ea76070d628a294809dc267082b9e36a359 29da765d11794441a32a5745d4cf594495a9733e28189d898f64da864817894f
+test/extractor-tests/generated/Use/Use.ql b20f6221e6ee731718eb9a02fa765f298ad285f23393a3df0119707c48edd8b3 9ab45d9b3c51c6181a6609b72ebd763c336fee01b11757e7f044257510bd7f3f
+test/extractor-tests/generated/Use/Use_getAttr.ql 6d43c25401398108553508aabb32ca476b3072060bb73eb07b1b60823a01f964 84e6f6953b4aa9a7472082f0a4f2df26ab1d157529ab2c661f0031603c94bb1d
+test/extractor-tests/generated/Use/Use_getCrateOrigin.ql 912ebc1089aa3390d4142a39ea73d5490eae525d1fb51654fdd05e9dd48a94b6 c59e36362016ae536421e6d517889cea0b2670818ea1f9e997796f51a9b381e2
+test/extractor-tests/generated/Use/Use_getExtendedCanonicalPath.ql ccfde95c861cf4199e688b6efeeee9dab58a27cfecd520e39cc20f89143c03c9 6ff93df4134667d7cb74ae7efe102fe2db3ad4c67b4b5a0f8955f21997806f16
+test/extractor-tests/generated/Use/Use_getUseTree.ql 1dfe6bb40b29fbf823d67fecfc36ba928b43f17c38227b8eedf19fa252edf3af aacdcc4cf418ef1eec267287d2af905fe73f5bcfb080ef5373d08da31c608720
+test/extractor-tests/generated/Use/Use_getVisibility.ql 587f80acdd780042c48aeb347004be5e9fd9df063d263e6e4f2b660c48c53a8f 0c2c04f95838bca93dfe93fa208e1df7677797efc62b4e8052a4f9c5d20831dd
+test/extractor-tests/generated/UseTree/UseTree.ql cb9f63051ae08cf8557b86b69b02cefe1732fc1e2daec34bcb891e271829cd86 eb46496aab9252b21eb0ccdd75792a97264885259c23d7e17e3013d943783947
+test/extractor-tests/generated/UseTree/UseTree_getPath.ql 80384a99674bdda85315a36681cb22ad2ad094005a5543b63d930fc7e030dd5b 2cd92b5de8b4214527f8a58d641430f6804d9bd40927e1da0c7efda2f86f6544
+test/extractor-tests/generated/UseTree/UseTree_getRename.ql ec3917501f3c89ac4974fab3f812d00b159ae6f2402dd20e5b4b3f8e8426391d db9ed981ce5f822aee349e5841d3126af7878d90e64140756ab4519552defe72
+test/extractor-tests/generated/UseTree/UseTree_getUseTreeList.ql c265a88347e813840969ae934dfd2904bc06f502de77709bc0b1c7255e46382a 52a239c8ea5fd8fbfbd606559d70ecadc769887437a9bcab6fb3e774208ad868
+test/extractor-tests/generated/UseTreeList/UseTreeList.ql cd943c15c86e66244caafeb95b960a5c3d351d5edbd506258744fb60a61af3b2 cfa584cd9d8aa08267fd1106745a66226b2c99fadd1da65059cc7ecf2f2e68cf
+test/extractor-tests/generated/UseTreeList/UseTreeList_getUseTree.ql dd72966b1cb7b04f0267503013809063fcfb145e2b2d7d5250d9f24d2e405f9a 75b953aa11c51ca0fe95e67d50d6238962d8df4a4b9054999a2c6338e5a5613d
+test/extractor-tests/generated/Variant/Variant.ql bf9b928ab3b1911e6c81fdc3fb9811e754ea28bfd0e4a21dca08b844aa42c3f1 bffd4bcc5019f721010722453985b39a4285240774e474e233ebe46f1cd5beb1
+test/extractor-tests/generated/Variant/Variant_getAttr.ql dd38e48e1eb05ce280b880652a90010eb63f7de3be7232411ba6265691249420 f8980680104de1e5fd40f264d8d62346aacaf6403a5e051f6fd680e234c82c1f
+test/extractor-tests/generated/Variant/Variant_getExpr.ql ce00af303d28f60c5fd1dc7df628c7974aced21884e223a2f656cb4f0d1a74d5 9de51a65510cf9a15801d4207b616915bd959c95ec7330fdb502c5dff5b650cc
+test/extractor-tests/generated/Variant/Variant_getFieldList.ql 083c8cf61989663de33d99b72dec231c308ccc8bb6739921465c473a07e8ea03 d03bff6945853c940acdc053b813d53b008ddab9a8bd4307826433828d4763ce
+test/extractor-tests/generated/Variant/Variant_getName.ql 0d7b47bec9f9031c67f7b684112a84a311ef9b2efeb260bd7cd6f424011ca0d8 73565e6f965dd7fd7bb9b3408c7d7b69120e1971b67ab307fed293eb663a59ae
+test/extractor-tests/generated/Variant/Variant_getVisibility.ql 2c8f365d28d96af55589f4d71ac3fee718b319b4cbc784560c0591d1f605a119 13160d9cf39fe169410eff6c338f5d063e1948109e8f18dd33ea0064f1dd9283
+test/extractor-tests/generated/VariantList/VariantList.ql 9830a7910c10aab76af40b093f10250fc80b8e92c3e2d25c1e88f7866773119d 758d6a8499a4528468e77575ca8f436450a12d1244d17cd2ab1c375e30fea870
+test/extractor-tests/generated/VariantList/VariantList_getVariant.ql beaf322eb010ddfafc5957cd2795595bf2b331033de69842f05cc2b5f8c57da5 c57187b3105c8bcd43de018671c58d3d532cef1724cf2f82039a99061ecb8d27
+test/extractor-tests/generated/Visibility/Visibility.ql 417b501e0eef74006cdc41aef2ee7496871fac8479c93737147336d53a60b1fc f65527aeb6c888c18096efc8b3a68d02cc4e857c18ae5381d85d3e10c610812e
+test/extractor-tests/generated/Visibility/Visibility_getPath.ql 53de9942208dff340d4665f602c519592c79b65dad5db217360fe23bb22b9318 6e4d2b191792d7a259f2edbbb2333df3f97c14600b04142fff4c86266dc61b75
+test/extractor-tests/generated/WhereClause/WhereClause.ql 89af4f9e3021560c67c49a3b7458449aeda469f586317d8855d00977a8969a95 59f9f9e7619fb0aa17124679c69723a31f03e7a7af24088b274234c034371e7c
+test/extractor-tests/generated/WhereClause/WhereClause_getPredicate.ql cc9f83e30aa028d0130c7f27a1cb72a2c8e3100d65de4041f24670e8062192a4 a561ef1d71efc850b73f30a695777acda4835e2b9a34b1d054a57ebb2450d73c
+test/extractor-tests/generated/WherePred/WherePred.ql 4955fa96838565a7cbfaa3361586632764cb67e52e1ca10d2951a924353d94f3 4bfcfe08c3482e0801214b4a06ed632ca02e163c5437ad94d370fc901eb23baf
+test/extractor-tests/generated/WherePred/WherePred_getGenericParamList.ql 21c3aaae697a7c8b4df82aa5c6eeef4963c9240fafb20cca3888e4361e208966 2f9ab4ed12984a4c82af2b8b805b28c2cb0c82d4e90927d9cf5be81e3bdc231a
+test/extractor-tests/generated/WherePred/WherePred_getLifetime.ql e08d9d6cccf634746f42a6ee583bbb3e7e9a9edbb63242e73b2bff4463df55d8 139543750c18f88d9c1ad2cdbcf1699d597cf2264bbb6b02a7e5792444e277ef
+test/extractor-tests/generated/WherePred/WherePred_getTy.ql 34cee0335bbaf8946fe15e3c32449150d07a730fcca56b4faed554fbb8689e21 883976c8c27c276c402d591ebd89d076c2c4d8da4d4f738f3c860c34d4a03b97
+test/extractor-tests/generated/WherePred/WherePred_getTypeBoundList.ql c78e31ff4d1822a6b76f403e5ccb8f5529b4f784e14e618833df0378adca55fc 8bb1c9b5a1cfca0f5e8335464f7439aa098063176fbd3edbaf3407169f1899e6
+test/extractor-tests/generated/WhileExpr/WhileExpr.ql e061fac7584adf999d31ed0785041e2cc14b26a1c9901281f90c859335d8f614 fb1e597e28841e3b2d275d697aa6de7158db51b70a348d634291a75b25e4e80a
+test/extractor-tests/generated/WhileExpr/WhileExpr_getAttr.ql f8527130eb2492743c0e629c97db291abcefe3d35302c840fee327ab0d8f10fd b41bedd429e5566fd68a50140ff1f50b51e2c7c351cbc8253fbc126527073f7e
+test/extractor-tests/generated/WhileExpr/WhileExpr_getCondition.ql 84a021806423425b24eaeb9fb9967a6aadabe823c24e77a0dfefcb3509041597 147aa8bbe4dbf9b90be2467db8207dc96aed281e722eb6b9c998442a90911a6c
+test/extractor-tests/generated/WhileExpr/WhileExpr_getLabel.ql 60ef4de57d85c7df23c0518b944b3839a9b2478044326829b5bf709a8c8d7240 3916e9ff50733c58afdc09837339b72a555a043f92f1c4e09e1652866029b017
+test/extractor-tests/generated/WhileExpr/WhileExpr_getLoopBody.ql cd62b7a464b5778ac925c3dbaf607e97d88ecd30f83f9106ace8e4e148d935b6 ab8027bddd6f138d3530ecd1aeb342b15015e886af1db80b75160c210a380086
 test/extractor-tests/generated/WildcardPat/WildcardPat.ql c6da9df739528763f423eac0fa537bfd524d3ea67794abdbc7f7c56193163273 42be2c5e296ad3afd05b5dcc208a4d2db2fda9323cda2df66054f921e37f6efe
-test/extractor-tests/generated/YeetExpr/YeetExpr.ql daa085839cc878f9c32d395543d03c0b41a27dbfe981925f59af2c40dd21f136 fe59397f3c5ac7d12404bf2315ba72961950c9295ba7ee148fa179e6b9e0ddcb
+test/extractor-tests/generated/YeetExpr/YeetExpr.ql 8a9f110486be12494256382374d6d5af8aa2210a84fd4452e99a3a3882b0eb59 510fa9eadeb062bd4f733ca6b6892e8908c2c6d58ec8478efc6942bd63a527f4
+test/extractor-tests/generated/YeetExpr/YeetExpr_getAttr.ql 84e44a1fbf1a9d18f255781a3a9aaa71583b6c05da228989471dbe03da4e817f 560332129d3341fbb1c0ea88c894033f0bde19d0adc081111f7bf8af55b61f88
 test/extractor-tests/generated/YeetExpr/YeetExpr_getExpr.ql d77b68b621e5b903231e2dfbc53a1e1421d59a0ad2e8c346c2abc1a2dfc11efd 642eb5791eb336ff05594d06eca08735e54bdac3aecf5d31a4de1267d10cf440
-test/extractor-tests/generated/YieldExpr/YieldExpr.ql 144cd04488bc5d66f27f1ea8f067df1a8a31ac84688e818a77377c00c735d861 c4ea389244506bf73a0f285f15fd9844ee16640263e51cfe97d8aa87760cf835
+test/extractor-tests/generated/YieldExpr/YieldExpr.ql 1700b4b2660724d8dbabde5f3441424b79690e2a43dcc599dd69af255a7fc8ff a11e48d9fab0cc358c5806c01753d61e48713b740739ffc87f933754e7f103cc
+test/extractor-tests/generated/YieldExpr/YieldExpr_getAttr.ql d4c5e2710b4e41f6fcec51e74041a8af4c3e8116d42fd14fad6ae166a9c18031 cc6763b9f06a3fe6cafc672054cea8835f800f934af47c3c135b443486400394
 test/extractor-tests/generated/YieldExpr/YieldExpr_getExpr.ql 592f8938120a036d78d180eb59634341d72d5e76854d9df48ab1b9b69db99c35 efe2955a5b4acc24257f9d79a007d39951736ce8ca11970864d1e366c4e516e6
diff --git a/rust/ql/.gitattributes b/rust/ql/.gitattributes
index f4b54272a68..a532f142ec9 100644
--- a/rust/ql/.gitattributes
+++ b/rust/ql/.gitattributes
@@ -1,170 +1,343 @@
 /.generated.list linguist-generated
 /.gitattributes linguist-generated
+/lib/codeql/rust/elements/Abi.qll linguist-generated
+/lib/codeql/rust/elements/ArgList.qll linguist-generated
 /lib/codeql/rust/elements/ArrayExpr.qll linguist-generated
+/lib/codeql/rust/elements/ArrayType.qll linguist-generated
 /lib/codeql/rust/elements/AsmExpr.qll linguist-generated
+/lib/codeql/rust/elements/AssocItem.qll linguist-generated
+/lib/codeql/rust/elements/AssocItemList.qll linguist-generated
+/lib/codeql/rust/elements/AssocTypeArg.qll linguist-generated
 /lib/codeql/rust/elements/AstNode.qll linguist-generated
-/lib/codeql/rust/elements/AsyncBlockExpr.qll linguist-generated
+/lib/codeql/rust/elements/Attr.qll linguist-generated
 /lib/codeql/rust/elements/AwaitExpr.qll linguist-generated
 /lib/codeql/rust/elements/BecomeExpr.qll linguist-generated
 /lib/codeql/rust/elements/BinaryExpr.qll linguist-generated
 /lib/codeql/rust/elements/BlockExpr.qll linguist-generated
-/lib/codeql/rust/elements/BlockExprBase.qll linguist-generated
-/lib/codeql/rust/elements/BoxExpr.qll linguist-generated
 /lib/codeql/rust/elements/BoxPat.qll linguist-generated
 /lib/codeql/rust/elements/BreakExpr.qll linguist-generated
 /lib/codeql/rust/elements/CallExpr.qll linguist-generated
+/lib/codeql/rust/elements/CallExprBase.qll linguist-generated
+/lib/codeql/rust/elements/Callable.qll linguist-generated
 /lib/codeql/rust/elements/CastExpr.qll linguist-generated
+/lib/codeql/rust/elements/ClosureBinder.qll linguist-generated
 /lib/codeql/rust/elements/ClosureExpr.qll linguist-generated
+/lib/codeql/rust/elements/Comment.qll linguist-generated
+/lib/codeql/rust/elements/Const.qll linguist-generated
+/lib/codeql/rust/elements/ConstArg.qll linguist-generated
 /lib/codeql/rust/elements/ConstBlockPat.qll linguist-generated
-/lib/codeql/rust/elements/ConstExpr.qll linguist-generated
+/lib/codeql/rust/elements/ConstParam.qll linguist-generated
 /lib/codeql/rust/elements/ContinueExpr.qll linguist-generated
-/lib/codeql/rust/elements/Declaration.qll linguist-generated
+/lib/codeql/rust/elements/DynTraitType.qll linguist-generated
 /lib/codeql/rust/elements/Element.qll linguist-generated
-/lib/codeql/rust/elements/ElementListExpr.qll linguist-generated
+/lib/codeql/rust/elements/Enum.qll linguist-generated
 /lib/codeql/rust/elements/Expr.qll linguist-generated
 /lib/codeql/rust/elements/ExprStmt.qll linguist-generated
+/lib/codeql/rust/elements/ExternBlock.qll linguist-generated
+/lib/codeql/rust/elements/ExternCrate.qll linguist-generated
+/lib/codeql/rust/elements/ExternItem.qll linguist-generated
+/lib/codeql/rust/elements/ExternItemList.qll linguist-generated
 /lib/codeql/rust/elements/FieldExpr.qll linguist-generated
+/lib/codeql/rust/elements/FieldList.qll linguist-generated
+/lib/codeql/rust/elements/FnPtrType.qll linguist-generated
+/lib/codeql/rust/elements/ForExpr.qll linguist-generated
+/lib/codeql/rust/elements/ForType.qll linguist-generated
+/lib/codeql/rust/elements/Format.qll linguist-generated
+/lib/codeql/rust/elements/FormatArgsArg.qll linguist-generated
+/lib/codeql/rust/elements/FormatArgsExpr.qll linguist-generated
+/lib/codeql/rust/elements/FormatArgument.qll linguist-generated
+/lib/codeql/rust/elements/FormatTemplateVariableAccess.qll linguist-generated
 /lib/codeql/rust/elements/Function.qll linguist-generated
+/lib/codeql/rust/elements/GenericArg.qll linguist-generated
 /lib/codeql/rust/elements/GenericArgList.qll linguist-generated
+/lib/codeql/rust/elements/GenericParam.qll linguist-generated
+/lib/codeql/rust/elements/GenericParamList.qll linguist-generated
 /lib/codeql/rust/elements/IdentPat.qll linguist-generated
 /lib/codeql/rust/elements/IfExpr.qll linguist-generated
+/lib/codeql/rust/elements/Impl.qll linguist-generated
+/lib/codeql/rust/elements/ImplTraitType.qll linguist-generated
 /lib/codeql/rust/elements/IndexExpr.qll linguist-generated
-/lib/codeql/rust/elements/ItemStmt.qll linguist-generated
+/lib/codeql/rust/elements/InferType.qll linguist-generated
+/lib/codeql/rust/elements/Item.qll linguist-generated
+/lib/codeql/rust/elements/ItemList.qll linguist-generated
 /lib/codeql/rust/elements/Label.qll linguist-generated
+/lib/codeql/rust/elements/LetElse.qll linguist-generated
 /lib/codeql/rust/elements/LetExpr.qll linguist-generated
 /lib/codeql/rust/elements/LetStmt.qll linguist-generated
+/lib/codeql/rust/elements/Lifetime.qll linguist-generated
+/lib/codeql/rust/elements/LifetimeArg.qll linguist-generated
+/lib/codeql/rust/elements/LifetimeParam.qll linguist-generated
 /lib/codeql/rust/elements/LiteralExpr.qll linguist-generated
 /lib/codeql/rust/elements/LiteralPat.qll linguist-generated
 /lib/codeql/rust/elements/Locatable.qll linguist-generated
 /lib/codeql/rust/elements/LoopExpr.qll linguist-generated
+/lib/codeql/rust/elements/MacroCall.qll linguist-generated
+/lib/codeql/rust/elements/MacroDef.qll linguist-generated
+/lib/codeql/rust/elements/MacroExpr.qll linguist-generated
+/lib/codeql/rust/elements/MacroItems.qll linguist-generated
+/lib/codeql/rust/elements/MacroPat.qll linguist-generated
+/lib/codeql/rust/elements/MacroRules.qll linguist-generated
+/lib/codeql/rust/elements/MacroStmts.qll linguist-generated
+/lib/codeql/rust/elements/MacroType.qll linguist-generated
 /lib/codeql/rust/elements/MatchArm.qll linguist-generated
+/lib/codeql/rust/elements/MatchArmList.qll linguist-generated
 /lib/codeql/rust/elements/MatchExpr.qll linguist-generated
+/lib/codeql/rust/elements/MatchGuard.qll linguist-generated
+/lib/codeql/rust/elements/Meta.qll linguist-generated
 /lib/codeql/rust/elements/MethodCallExpr.qll linguist-generated
 /lib/codeql/rust/elements/Missing.qll linguist-generated
-/lib/codeql/rust/elements/MissingExpr.qll linguist-generated
-/lib/codeql/rust/elements/MissingPat.qll linguist-generated
 /lib/codeql/rust/elements/Module.qll linguist-generated
+/lib/codeql/rust/elements/Name.qll linguist-generated
+/lib/codeql/rust/elements/NameRef.qll linguist-generated
+/lib/codeql/rust/elements/NeverType.qll linguist-generated
 /lib/codeql/rust/elements/OffsetOfExpr.qll linguist-generated
 /lib/codeql/rust/elements/OrPat.qll linguist-generated
+/lib/codeql/rust/elements/Param.qll linguist-generated
+/lib/codeql/rust/elements/ParamList.qll linguist-generated
+/lib/codeql/rust/elements/ParenExpr.qll linguist-generated
+/lib/codeql/rust/elements/ParenPat.qll linguist-generated
+/lib/codeql/rust/elements/ParenType.qll linguist-generated
 /lib/codeql/rust/elements/Pat.qll linguist-generated
 /lib/codeql/rust/elements/Path.qll linguist-generated
 /lib/codeql/rust/elements/PathExpr.qll linguist-generated
+/lib/codeql/rust/elements/PathExprBase.qll linguist-generated
 /lib/codeql/rust/elements/PathPat.qll linguist-generated
+/lib/codeql/rust/elements/PathSegment.qll linguist-generated
+/lib/codeql/rust/elements/PathType.qll linguist-generated
 /lib/codeql/rust/elements/PrefixExpr.qll linguist-generated
+/lib/codeql/rust/elements/PtrType.qll linguist-generated
 /lib/codeql/rust/elements/RangeExpr.qll linguist-generated
 /lib/codeql/rust/elements/RangePat.qll linguist-generated
 /lib/codeql/rust/elements/RecordExpr.qll linguist-generated
 /lib/codeql/rust/elements/RecordExprField.qll linguist-generated
+/lib/codeql/rust/elements/RecordExprFieldList.qll linguist-generated
+/lib/codeql/rust/elements/RecordField.qll linguist-generated
+/lib/codeql/rust/elements/RecordFieldList.qll linguist-generated
 /lib/codeql/rust/elements/RecordPat.qll linguist-generated
 /lib/codeql/rust/elements/RecordPatField.qll linguist-generated
+/lib/codeql/rust/elements/RecordPatFieldList.qll linguist-generated
 /lib/codeql/rust/elements/RefExpr.qll linguist-generated
 /lib/codeql/rust/elements/RefPat.qll linguist-generated
-/lib/codeql/rust/elements/RepeatExpr.qll linguist-generated
+/lib/codeql/rust/elements/RefType.qll linguist-generated
+/lib/codeql/rust/elements/Rename.qll linguist-generated
+/lib/codeql/rust/elements/Resolvable.qll linguist-generated
+/lib/codeql/rust/elements/RestPat.qll linguist-generated
+/lib/codeql/rust/elements/RetType.qll linguist-generated
 /lib/codeql/rust/elements/ReturnExpr.qll linguist-generated
+/lib/codeql/rust/elements/ReturnTypeSyntax.qll linguist-generated
+/lib/codeql/rust/elements/SelfParam.qll linguist-generated
 /lib/codeql/rust/elements/SlicePat.qll linguist-generated
+/lib/codeql/rust/elements/SliceType.qll linguist-generated
+/lib/codeql/rust/elements/SourceFile.qll linguist-generated
+/lib/codeql/rust/elements/Static.qll linguist-generated
 /lib/codeql/rust/elements/Stmt.qll linguist-generated
+/lib/codeql/rust/elements/StmtList.qll linguist-generated
+/lib/codeql/rust/elements/Struct.qll linguist-generated
+/lib/codeql/rust/elements/Token.qll linguist-generated
+/lib/codeql/rust/elements/TokenTree.qll linguist-generated
+/lib/codeql/rust/elements/Trait.qll linguist-generated
+/lib/codeql/rust/elements/TraitAlias.qll linguist-generated
+/lib/codeql/rust/elements/TryExpr.qll linguist-generated
 /lib/codeql/rust/elements/TupleExpr.qll linguist-generated
+/lib/codeql/rust/elements/TupleField.qll linguist-generated
+/lib/codeql/rust/elements/TupleFieldList.qll linguist-generated
 /lib/codeql/rust/elements/TuplePat.qll linguist-generated
 /lib/codeql/rust/elements/TupleStructPat.qll linguist-generated
+/lib/codeql/rust/elements/TupleType.qll linguist-generated
+/lib/codeql/rust/elements/TypeAlias.qll linguist-generated
+/lib/codeql/rust/elements/TypeArg.qll linguist-generated
+/lib/codeql/rust/elements/TypeBound.qll linguist-generated
+/lib/codeql/rust/elements/TypeBoundList.qll linguist-generated
+/lib/codeql/rust/elements/TypeParam.qll linguist-generated
 /lib/codeql/rust/elements/TypeRef.qll linguist-generated
 /lib/codeql/rust/elements/UnderscoreExpr.qll linguist-generated
 /lib/codeql/rust/elements/Unextracted.qll linguist-generated
 /lib/codeql/rust/elements/Unimplemented.qll linguist-generated
-/lib/codeql/rust/elements/UnimplementedDeclaration.qll linguist-generated
-/lib/codeql/rust/elements/UnsafeBlockExpr.qll linguist-generated
+/lib/codeql/rust/elements/Union.qll linguist-generated
+/lib/codeql/rust/elements/Use.qll linguist-generated
+/lib/codeql/rust/elements/UseTree.qll linguist-generated
+/lib/codeql/rust/elements/UseTreeList.qll linguist-generated
+/lib/codeql/rust/elements/Variant.qll linguist-generated
+/lib/codeql/rust/elements/VariantList.qll linguist-generated
+/lib/codeql/rust/elements/Visibility.qll linguist-generated
+/lib/codeql/rust/elements/WhereClause.qll linguist-generated
+/lib/codeql/rust/elements/WherePred.qll linguist-generated
+/lib/codeql/rust/elements/WhileExpr.qll linguist-generated
 /lib/codeql/rust/elements/WildcardPat.qll linguist-generated
 /lib/codeql/rust/elements/YeetExpr.qll linguist-generated
 /lib/codeql/rust/elements/YieldExpr.qll linguist-generated
+/lib/codeql/rust/elements/internal/AbiConstructor.qll linguist-generated
+/lib/codeql/rust/elements/internal/AbiImpl.qll linguist-generated
+/lib/codeql/rust/elements/internal/ArgListConstructor.qll linguist-generated
+/lib/codeql/rust/elements/internal/ArgListImpl.qll linguist-generated
+/lib/codeql/rust/elements/internal/ArrayExprConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/ArrayExprImpl.qll linguist-generated
+/lib/codeql/rust/elements/internal/ArrayTypeConstructor.qll linguist-generated
+/lib/codeql/rust/elements/internal/ArrayTypeImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/AsmExprConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/AsmExprImpl.qll linguist-generated
-/lib/codeql/rust/elements/internal/AstNodeImpl.qll linguist-generated
-/lib/codeql/rust/elements/internal/AsyncBlockExprConstructor.qll linguist-generated
-/lib/codeql/rust/elements/internal/AsyncBlockExprImpl.qll linguist-generated
+/lib/codeql/rust/elements/internal/AssocItemImpl.qll linguist-generated
+/lib/codeql/rust/elements/internal/AssocItemListConstructor.qll linguist-generated
+/lib/codeql/rust/elements/internal/AssocItemListImpl.qll linguist-generated
+/lib/codeql/rust/elements/internal/AssocTypeArgConstructor.qll linguist-generated
+/lib/codeql/rust/elements/internal/AssocTypeArgImpl.qll linguist-generated
+/lib/codeql/rust/elements/internal/AttrConstructor.qll linguist-generated
+/lib/codeql/rust/elements/internal/AttrImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/AwaitExprConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/AwaitExprImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/BecomeExprConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/BecomeExprImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/BinaryExprConstructor.qll linguist-generated
-/lib/codeql/rust/elements/internal/BinaryExprImpl.qll linguist-generated
-/lib/codeql/rust/elements/internal/BlockExprBaseImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/BlockExprConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/BlockExprImpl.qll linguist-generated
-/lib/codeql/rust/elements/internal/BoxExprConstructor.qll linguist-generated
-/lib/codeql/rust/elements/internal/BoxExprImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/BoxPatConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/BoxPatImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/BreakExprConstructor.qll linguist-generated
-/lib/codeql/rust/elements/internal/BreakExprImpl.qll linguist-generated
+/lib/codeql/rust/elements/internal/CallExprBaseImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/CallExprConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/CallExprImpl.qll linguist-generated
+/lib/codeql/rust/elements/internal/CallableImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/CastExprConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/CastExprImpl.qll linguist-generated
+/lib/codeql/rust/elements/internal/ClosureBinderConstructor.qll linguist-generated
+/lib/codeql/rust/elements/internal/ClosureBinderImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/ClosureExprConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/ClosureExprImpl.qll linguist-generated
+/lib/codeql/rust/elements/internal/CommentConstructor.qll linguist-generated
+/lib/codeql/rust/elements/internal/ConstArgConstructor.qll linguist-generated
+/lib/codeql/rust/elements/internal/ConstArgImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/ConstBlockPatConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/ConstBlockPatImpl.qll linguist-generated
-/lib/codeql/rust/elements/internal/ConstExprConstructor.qll linguist-generated
-/lib/codeql/rust/elements/internal/ConstExprImpl.qll linguist-generated
+/lib/codeql/rust/elements/internal/ConstConstructor.qll linguist-generated
+/lib/codeql/rust/elements/internal/ConstImpl.qll linguist-generated
+/lib/codeql/rust/elements/internal/ConstParamConstructor.qll linguist-generated
+/lib/codeql/rust/elements/internal/ConstParamImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/ContinueExprConstructor.qll linguist-generated
-/lib/codeql/rust/elements/internal/ContinueExprImpl.qll linguist-generated
-/lib/codeql/rust/elements/internal/DeclarationImpl.qll linguist-generated
-/lib/codeql/rust/elements/internal/ElementListExprConstructor.qll linguist-generated
-/lib/codeql/rust/elements/internal/ElementListExprImpl.qll linguist-generated
+/lib/codeql/rust/elements/internal/DynTraitTypeConstructor.qll linguist-generated
+/lib/codeql/rust/elements/internal/DynTraitTypeImpl.qll linguist-generated
+/lib/codeql/rust/elements/internal/EnumConstructor.qll linguist-generated
+/lib/codeql/rust/elements/internal/EnumImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/ExprImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/ExprStmtConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/ExprStmtImpl.qll linguist-generated
+/lib/codeql/rust/elements/internal/ExternBlockConstructor.qll linguist-generated
+/lib/codeql/rust/elements/internal/ExternBlockImpl.qll linguist-generated
+/lib/codeql/rust/elements/internal/ExternCrateConstructor.qll linguist-generated
+/lib/codeql/rust/elements/internal/ExternCrateImpl.qll linguist-generated
+/lib/codeql/rust/elements/internal/ExternItemImpl.qll linguist-generated
+/lib/codeql/rust/elements/internal/ExternItemListConstructor.qll linguist-generated
+/lib/codeql/rust/elements/internal/ExternItemListImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/FieldExprConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/FieldExprImpl.qll linguist-generated
+/lib/codeql/rust/elements/internal/FieldListImpl.qll linguist-generated
+/lib/codeql/rust/elements/internal/FnPtrTypeConstructor.qll linguist-generated
+/lib/codeql/rust/elements/internal/FnPtrTypeImpl.qll linguist-generated
+/lib/codeql/rust/elements/internal/ForExprConstructor.qll linguist-generated
+/lib/codeql/rust/elements/internal/ForExprImpl.qll linguist-generated
+/lib/codeql/rust/elements/internal/ForTypeConstructor.qll linguist-generated
+/lib/codeql/rust/elements/internal/ForTypeImpl.qll linguist-generated
+/lib/codeql/rust/elements/internal/FormatArgsArgConstructor.qll linguist-generated
+/lib/codeql/rust/elements/internal/FormatArgsArgImpl.qll linguist-generated
+/lib/codeql/rust/elements/internal/FormatArgsExprConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/FunctionConstructor.qll linguist-generated
+/lib/codeql/rust/elements/internal/GenericArgImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/GenericArgListConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/GenericArgListImpl.qll linguist-generated
+/lib/codeql/rust/elements/internal/GenericParamImpl.qll linguist-generated
+/lib/codeql/rust/elements/internal/GenericParamListConstructor.qll linguist-generated
+/lib/codeql/rust/elements/internal/GenericParamListImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/IdentPatConstructor.qll linguist-generated
-/lib/codeql/rust/elements/internal/IdentPatImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/IfExprConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/IfExprImpl.qll linguist-generated
+/lib/codeql/rust/elements/internal/ImplConstructor.qll linguist-generated
+/lib/codeql/rust/elements/internal/ImplImpl.qll linguist-generated
+/lib/codeql/rust/elements/internal/ImplTraitTypeConstructor.qll linguist-generated
+/lib/codeql/rust/elements/internal/ImplTraitTypeImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/IndexExprConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/IndexExprImpl.qll linguist-generated
-/lib/codeql/rust/elements/internal/ItemStmtConstructor.qll linguist-generated
-/lib/codeql/rust/elements/internal/ItemStmtImpl.qll linguist-generated
+/lib/codeql/rust/elements/internal/InferTypeConstructor.qll linguist-generated
+/lib/codeql/rust/elements/internal/InferTypeImpl.qll linguist-generated
+/lib/codeql/rust/elements/internal/ItemImpl.qll linguist-generated
+/lib/codeql/rust/elements/internal/ItemListConstructor.qll linguist-generated
+/lib/codeql/rust/elements/internal/ItemListImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/LabelConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/LabelImpl.qll linguist-generated
+/lib/codeql/rust/elements/internal/LetElseConstructor.qll linguist-generated
+/lib/codeql/rust/elements/internal/LetElseImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/LetExprConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/LetExprImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/LetStmtConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/LetStmtImpl.qll linguist-generated
+/lib/codeql/rust/elements/internal/LifetimeArgConstructor.qll linguist-generated
+/lib/codeql/rust/elements/internal/LifetimeArgImpl.qll linguist-generated
+/lib/codeql/rust/elements/internal/LifetimeConstructor.qll linguist-generated
+/lib/codeql/rust/elements/internal/LifetimeImpl.qll linguist-generated
+/lib/codeql/rust/elements/internal/LifetimeParamConstructor.qll linguist-generated
+/lib/codeql/rust/elements/internal/LifetimeParamImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/LiteralExprConstructor.qll linguist-generated
-/lib/codeql/rust/elements/internal/LiteralExprImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/LiteralPatConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/LiteralPatImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/LoopExprConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/LoopExprImpl.qll linguist-generated
+/lib/codeql/rust/elements/internal/MacroCallConstructor.qll linguist-generated
+/lib/codeql/rust/elements/internal/MacroCallImpl.qll linguist-generated
+/lib/codeql/rust/elements/internal/MacroDefConstructor.qll linguist-generated
+/lib/codeql/rust/elements/internal/MacroDefImpl.qll linguist-generated
+/lib/codeql/rust/elements/internal/MacroExprConstructor.qll linguist-generated
+/lib/codeql/rust/elements/internal/MacroExprImpl.qll linguist-generated
+/lib/codeql/rust/elements/internal/MacroItemsConstructor.qll linguist-generated
+/lib/codeql/rust/elements/internal/MacroItemsImpl.qll linguist-generated
+/lib/codeql/rust/elements/internal/MacroPatConstructor.qll linguist-generated
+/lib/codeql/rust/elements/internal/MacroPatImpl.qll linguist-generated
+/lib/codeql/rust/elements/internal/MacroRulesConstructor.qll linguist-generated
+/lib/codeql/rust/elements/internal/MacroRulesImpl.qll linguist-generated
+/lib/codeql/rust/elements/internal/MacroStmtsConstructor.qll linguist-generated
+/lib/codeql/rust/elements/internal/MacroStmtsImpl.qll linguist-generated
+/lib/codeql/rust/elements/internal/MacroTypeConstructor.qll linguist-generated
+/lib/codeql/rust/elements/internal/MacroTypeImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/MatchArmConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/MatchArmImpl.qll linguist-generated
+/lib/codeql/rust/elements/internal/MatchArmListConstructor.qll linguist-generated
+/lib/codeql/rust/elements/internal/MatchArmListImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/MatchExprConstructor.qll linguist-generated
-/lib/codeql/rust/elements/internal/MatchExprImpl.qll linguist-generated
+/lib/codeql/rust/elements/internal/MatchGuardConstructor.qll linguist-generated
+/lib/codeql/rust/elements/internal/MatchGuardImpl.qll linguist-generated
+/lib/codeql/rust/elements/internal/MetaConstructor.qll linguist-generated
+/lib/codeql/rust/elements/internal/MetaImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/MethodCallExprConstructor.qll linguist-generated
-/lib/codeql/rust/elements/internal/MethodCallExprImpl.qll linguist-generated
-/lib/codeql/rust/elements/internal/MissingExprConstructor.qll linguist-generated
-/lib/codeql/rust/elements/internal/MissingExprImpl.qll linguist-generated
+/lib/codeql/rust/elements/internal/MissingConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/MissingImpl.qll linguist-generated
-/lib/codeql/rust/elements/internal/MissingPatConstructor.qll linguist-generated
-/lib/codeql/rust/elements/internal/MissingPatImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/ModuleConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/ModuleImpl.qll linguist-generated
+/lib/codeql/rust/elements/internal/NameConstructor.qll linguist-generated
+/lib/codeql/rust/elements/internal/NameRefConstructor.qll linguist-generated
+/lib/codeql/rust/elements/internal/NeverTypeConstructor.qll linguist-generated
+/lib/codeql/rust/elements/internal/NeverTypeImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/OffsetOfExprConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/OffsetOfExprImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/OrPatConstructor.qll linguist-generated
-/lib/codeql/rust/elements/internal/OrPatImpl.qll linguist-generated
+/lib/codeql/rust/elements/internal/ParamConstructor.qll linguist-generated
+/lib/codeql/rust/elements/internal/ParamImpl.qll linguist-generated
+/lib/codeql/rust/elements/internal/ParamListConstructor.qll linguist-generated
+/lib/codeql/rust/elements/internal/ParamListImpl.qll linguist-generated
+/lib/codeql/rust/elements/internal/ParenExprConstructor.qll linguist-generated
+/lib/codeql/rust/elements/internal/ParenExprImpl.qll linguist-generated
+/lib/codeql/rust/elements/internal/ParenPatConstructor.qll linguist-generated
+/lib/codeql/rust/elements/internal/ParenPatImpl.qll linguist-generated
+/lib/codeql/rust/elements/internal/ParenTypeConstructor.qll linguist-generated
+/lib/codeql/rust/elements/internal/ParenTypeImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/PatImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/PathConstructor.qll linguist-generated
+/lib/codeql/rust/elements/internal/PathExprBaseImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/PathExprConstructor.qll linguist-generated
-/lib/codeql/rust/elements/internal/PathExprImpl.qll linguist-generated
-/lib/codeql/rust/elements/internal/PathImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/PathPatConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/PathPatImpl.qll linguist-generated
+/lib/codeql/rust/elements/internal/PathSegmentConstructor.qll linguist-generated
+/lib/codeql/rust/elements/internal/PathTypeConstructor.qll linguist-generated
+/lib/codeql/rust/elements/internal/PathTypeImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/PrefixExprConstructor.qll linguist-generated
-/lib/codeql/rust/elements/internal/PrefixExprImpl.qll linguist-generated
+/lib/codeql/rust/elements/internal/PtrTypeConstructor.qll linguist-generated
+/lib/codeql/rust/elements/internal/PtrTypeImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/RangeExprConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/RangeExprImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/RangePatConstructor.qll linguist-generated
@@ -172,233 +345,816 @@
 /lib/codeql/rust/elements/internal/RecordExprConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/RecordExprFieldConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/RecordExprFieldImpl.qll linguist-generated
+/lib/codeql/rust/elements/internal/RecordExprFieldListConstructor.qll linguist-generated
+/lib/codeql/rust/elements/internal/RecordExprFieldListImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/RecordExprImpl.qll linguist-generated
+/lib/codeql/rust/elements/internal/RecordFieldConstructor.qll linguist-generated
+/lib/codeql/rust/elements/internal/RecordFieldImpl.qll linguist-generated
+/lib/codeql/rust/elements/internal/RecordFieldListConstructor.qll linguist-generated
+/lib/codeql/rust/elements/internal/RecordFieldListImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/RecordPatConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/RecordPatFieldConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/RecordPatFieldImpl.qll linguist-generated
+/lib/codeql/rust/elements/internal/RecordPatFieldListConstructor.qll linguist-generated
+/lib/codeql/rust/elements/internal/RecordPatFieldListImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/RecordPatImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/RefExprConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/RefExprImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/RefPatConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/RefPatImpl.qll linguist-generated
-/lib/codeql/rust/elements/internal/RepeatExprConstructor.qll linguist-generated
-/lib/codeql/rust/elements/internal/RepeatExprImpl.qll linguist-generated
+/lib/codeql/rust/elements/internal/RefTypeConstructor.qll linguist-generated
+/lib/codeql/rust/elements/internal/RefTypeImpl.qll linguist-generated
+/lib/codeql/rust/elements/internal/RenameConstructor.qll linguist-generated
+/lib/codeql/rust/elements/internal/RenameImpl.qll linguist-generated
+/lib/codeql/rust/elements/internal/ResolvableImpl.qll linguist-generated
+/lib/codeql/rust/elements/internal/RestPatConstructor.qll linguist-generated
+/lib/codeql/rust/elements/internal/RestPatImpl.qll linguist-generated
+/lib/codeql/rust/elements/internal/RetTypeConstructor.qll linguist-generated
+/lib/codeql/rust/elements/internal/RetTypeImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/ReturnExprConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/ReturnExprImpl.qll linguist-generated
+/lib/codeql/rust/elements/internal/ReturnTypeSyntaxConstructor.qll linguist-generated
+/lib/codeql/rust/elements/internal/ReturnTypeSyntaxImpl.qll linguist-generated
+/lib/codeql/rust/elements/internal/SelfParamConstructor.qll linguist-generated
+/lib/codeql/rust/elements/internal/SelfParamImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/SlicePatConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/SlicePatImpl.qll linguist-generated
+/lib/codeql/rust/elements/internal/SliceTypeConstructor.qll linguist-generated
+/lib/codeql/rust/elements/internal/SliceTypeImpl.qll linguist-generated
+/lib/codeql/rust/elements/internal/SourceFileConstructor.qll linguist-generated
+/lib/codeql/rust/elements/internal/SourceFileImpl.qll linguist-generated
+/lib/codeql/rust/elements/internal/StaticConstructor.qll linguist-generated
+/lib/codeql/rust/elements/internal/StaticImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/StmtImpl.qll linguist-generated
+/lib/codeql/rust/elements/internal/StmtListConstructor.qll linguist-generated
+/lib/codeql/rust/elements/internal/StmtListImpl.qll linguist-generated
+/lib/codeql/rust/elements/internal/StructConstructor.qll linguist-generated
+/lib/codeql/rust/elements/internal/StructImpl.qll linguist-generated
+/lib/codeql/rust/elements/internal/TokenImpl.qll linguist-generated
+/lib/codeql/rust/elements/internal/TokenTreeConstructor.qll linguist-generated
+/lib/codeql/rust/elements/internal/TokenTreeImpl.qll linguist-generated
+/lib/codeql/rust/elements/internal/TraitAliasConstructor.qll linguist-generated
+/lib/codeql/rust/elements/internal/TraitAliasImpl.qll linguist-generated
+/lib/codeql/rust/elements/internal/TraitConstructor.qll linguist-generated
+/lib/codeql/rust/elements/internal/TraitImpl.qll linguist-generated
+/lib/codeql/rust/elements/internal/TryExprConstructor.qll linguist-generated
+/lib/codeql/rust/elements/internal/TryExprImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/TupleExprConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/TupleExprImpl.qll linguist-generated
+/lib/codeql/rust/elements/internal/TupleFieldConstructor.qll linguist-generated
+/lib/codeql/rust/elements/internal/TupleFieldImpl.qll linguist-generated
+/lib/codeql/rust/elements/internal/TupleFieldListConstructor.qll linguist-generated
+/lib/codeql/rust/elements/internal/TupleFieldListImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/TuplePatConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/TuplePatImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/TupleStructPatConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/TupleStructPatImpl.qll linguist-generated
-/lib/codeql/rust/elements/internal/TypeRefConstructor.qll linguist-generated
+/lib/codeql/rust/elements/internal/TupleTypeConstructor.qll linguist-generated
+/lib/codeql/rust/elements/internal/TupleTypeImpl.qll linguist-generated
+/lib/codeql/rust/elements/internal/TypeAliasConstructor.qll linguist-generated
+/lib/codeql/rust/elements/internal/TypeAliasImpl.qll linguist-generated
+/lib/codeql/rust/elements/internal/TypeArgConstructor.qll linguist-generated
+/lib/codeql/rust/elements/internal/TypeArgImpl.qll linguist-generated
+/lib/codeql/rust/elements/internal/TypeBoundConstructor.qll linguist-generated
+/lib/codeql/rust/elements/internal/TypeBoundImpl.qll linguist-generated
+/lib/codeql/rust/elements/internal/TypeBoundListConstructor.qll linguist-generated
+/lib/codeql/rust/elements/internal/TypeBoundListImpl.qll linguist-generated
+/lib/codeql/rust/elements/internal/TypeParamConstructor.qll linguist-generated
+/lib/codeql/rust/elements/internal/TypeParamImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/TypeRefImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/UnderscoreExprConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/UnderscoreExprImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/UnextractedImpl.qll linguist-generated
-/lib/codeql/rust/elements/internal/UnimplementedDeclarationConstructor.qll linguist-generated
-/lib/codeql/rust/elements/internal/UnimplementedDeclarationImpl.qll linguist-generated
+/lib/codeql/rust/elements/internal/UnimplementedConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/UnimplementedImpl.qll linguist-generated
-/lib/codeql/rust/elements/internal/UnsafeBlockExprConstructor.qll linguist-generated
-/lib/codeql/rust/elements/internal/UnsafeBlockExprImpl.qll linguist-generated
+/lib/codeql/rust/elements/internal/UnionConstructor.qll linguist-generated
+/lib/codeql/rust/elements/internal/UnionImpl.qll linguist-generated
+/lib/codeql/rust/elements/internal/UseConstructor.qll linguist-generated
+/lib/codeql/rust/elements/internal/UseImpl.qll linguist-generated
+/lib/codeql/rust/elements/internal/UseTreeConstructor.qll linguist-generated
+/lib/codeql/rust/elements/internal/UseTreeImpl.qll linguist-generated
+/lib/codeql/rust/elements/internal/UseTreeListConstructor.qll linguist-generated
+/lib/codeql/rust/elements/internal/UseTreeListImpl.qll linguist-generated
+/lib/codeql/rust/elements/internal/VariantConstructor.qll linguist-generated
+/lib/codeql/rust/elements/internal/VariantImpl.qll linguist-generated
+/lib/codeql/rust/elements/internal/VariantListConstructor.qll linguist-generated
+/lib/codeql/rust/elements/internal/VariantListImpl.qll linguist-generated
+/lib/codeql/rust/elements/internal/VisibilityConstructor.qll linguist-generated
+/lib/codeql/rust/elements/internal/VisibilityImpl.qll linguist-generated
+/lib/codeql/rust/elements/internal/WhereClauseConstructor.qll linguist-generated
+/lib/codeql/rust/elements/internal/WhereClauseImpl.qll linguist-generated
+/lib/codeql/rust/elements/internal/WherePredConstructor.qll linguist-generated
+/lib/codeql/rust/elements/internal/WherePredImpl.qll linguist-generated
+/lib/codeql/rust/elements/internal/WhileExprConstructor.qll linguist-generated
+/lib/codeql/rust/elements/internal/WhileExprImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/WildcardPatConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/WildcardPatImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/YeetExprConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/YeetExprImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/YieldExprConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/YieldExprImpl.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/Abi.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/ArgList.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/ArrayExpr.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/ArrayType.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/AsmExpr.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/AssocItem.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/AssocItemList.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/AssocTypeArg.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/AstNode.qll linguist-generated
-/lib/codeql/rust/elements/internal/generated/AsyncBlockExpr.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/Attr.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/AwaitExpr.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/BecomeExpr.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/BinaryExpr.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/BlockExpr.qll linguist-generated
-/lib/codeql/rust/elements/internal/generated/BlockExprBase.qll linguist-generated
-/lib/codeql/rust/elements/internal/generated/BoxExpr.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/BoxPat.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/BreakExpr.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/CallExpr.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/CallExprBase.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/Callable.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/CastExpr.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/ClosureBinder.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/ClosureExpr.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/Comment.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/Const.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/ConstArg.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/ConstBlockPat.qll linguist-generated
-/lib/codeql/rust/elements/internal/generated/ConstExpr.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/ConstParam.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/ContinueExpr.qll linguist-generated
-/lib/codeql/rust/elements/internal/generated/Declaration.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/DynTraitType.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/Element.qll linguist-generated
-/lib/codeql/rust/elements/internal/generated/ElementListExpr.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/Enum.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/Expr.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/ExprStmt.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/ExternBlock.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/ExternCrate.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/ExternItem.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/ExternItemList.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/FieldExpr.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/FieldList.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/FnPtrType.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/ForExpr.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/ForType.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/Format.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/FormatArgsArg.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/FormatArgsExpr.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/FormatArgument.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/FormatTemplateVariableAccess.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/Function.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/GenericArg.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/GenericArgList.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/GenericParam.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/GenericParamList.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/IdentPat.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/IfExpr.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/Impl.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/ImplTraitType.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/IndexExpr.qll linguist-generated
-/lib/codeql/rust/elements/internal/generated/ItemStmt.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/InferType.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/Item.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/ItemList.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/Label.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/LetElse.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/LetExpr.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/LetStmt.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/Lifetime.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/LifetimeArg.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/LifetimeParam.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/LiteralExpr.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/LiteralPat.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/Locatable.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/LoopExpr.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/MacroCall.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/MacroDef.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/MacroExpr.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/MacroItems.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/MacroPat.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/MacroRules.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/MacroStmts.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/MacroType.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/MatchArm.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/MatchArmList.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/MatchExpr.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/MatchGuard.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/Meta.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/MethodCallExpr.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/Missing.qll linguist-generated
-/lib/codeql/rust/elements/internal/generated/MissingExpr.qll linguist-generated
-/lib/codeql/rust/elements/internal/generated/MissingPat.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/Module.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/Name.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/NameRef.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/NeverType.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/OffsetOfExpr.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/OrPat.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/Param.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/ParamList.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/ParenExpr.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/ParenPat.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/ParenType.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/ParentChild.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/Pat.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/Path.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/PathExpr.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/PathExprBase.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/PathPat.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/PathSegment.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/PathType.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/PrefixExpr.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/PtrType.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/PureSynthConstructors.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/RangeExpr.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/RangePat.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/Raw.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/RecordExpr.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/RecordExprField.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/RecordExprFieldList.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/RecordField.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/RecordFieldList.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/RecordPat.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/RecordPatField.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/RecordPatFieldList.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/RefExpr.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/RefPat.qll linguist-generated
-/lib/codeql/rust/elements/internal/generated/RepeatExpr.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/RefType.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/Rename.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/Resolvable.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/RestPat.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/RetType.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/ReturnExpr.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/ReturnTypeSyntax.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/SelfParam.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/SlicePat.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/SliceType.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/SourceFile.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/Static.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/Stmt.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/StmtList.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/Struct.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/Synth.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/SynthConstructors.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/Token.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/TokenTree.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/Trait.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/TraitAlias.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/TryExpr.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/TupleExpr.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/TupleField.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/TupleFieldList.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/TuplePat.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/TupleStructPat.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/TupleType.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/TypeAlias.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/TypeArg.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/TypeBound.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/TypeBoundList.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/TypeParam.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/TypeRef.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/UnderscoreExpr.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/Unextracted.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/Unimplemented.qll linguist-generated
-/lib/codeql/rust/elements/internal/generated/UnimplementedDeclaration.qll linguist-generated
-/lib/codeql/rust/elements/internal/generated/UnsafeBlockExpr.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/Union.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/Use.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/UseTree.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/UseTreeList.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/Variant.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/VariantList.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/Visibility.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/WhereClause.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/WherePred.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/WhileExpr.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/WildcardPat.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/YeetExpr.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/YieldExpr.qll linguist-generated
 /lib/codeql/rust/elements.qll linguist-generated
+/test/extractor-tests/generated/Abi/Abi.ql linguist-generated
+/test/extractor-tests/generated/Abi/Abi_getAbiString.ql linguist-generated
+/test/extractor-tests/generated/ArgList/ArgList.ql linguist-generated
+/test/extractor-tests/generated/ArgList/ArgList_getArg.ql linguist-generated
+/test/extractor-tests/generated/ArrayExpr/ArrayExpr.ql linguist-generated
+/test/extractor-tests/generated/ArrayExpr/ArrayExpr_getAttr.ql linguist-generated
+/test/extractor-tests/generated/ArrayExpr/ArrayExpr_getExpr.ql linguist-generated
+/test/extractor-tests/generated/ArrayType/ArrayType.ql linguist-generated
+/test/extractor-tests/generated/ArrayType/ArrayType_getConstArg.ql linguist-generated
+/test/extractor-tests/generated/ArrayType/ArrayType_getTy.ql linguist-generated
 /test/extractor-tests/generated/AsmExpr/AsmExpr.ql linguist-generated
-/test/extractor-tests/generated/AsyncBlockExpr/AsyncBlockExpr.ql linguist-generated
-/test/extractor-tests/generated/AsyncBlockExpr/AsyncBlockExpr_getStatement.ql linguist-generated
-/test/extractor-tests/generated/AsyncBlockExpr/AsyncBlockExpr_getTail.ql linguist-generated
+/test/extractor-tests/generated/AsmExpr/AsmExpr_getAttr.ql linguist-generated
+/test/extractor-tests/generated/AsmExpr/AsmExpr_getExpr.ql linguist-generated
+/test/extractor-tests/generated/AssocTypeArg/AssocTypeArg.ql linguist-generated
+/test/extractor-tests/generated/AssocTypeArg/AssocTypeArg_getConstArg.ql linguist-generated
+/test/extractor-tests/generated/AssocTypeArg/AssocTypeArg_getGenericArgList.ql linguist-generated
+/test/extractor-tests/generated/AssocTypeArg/AssocTypeArg_getNameRef.ql linguist-generated
+/test/extractor-tests/generated/AssocTypeArg/AssocTypeArg_getParamList.ql linguist-generated
+/test/extractor-tests/generated/AssocTypeArg/AssocTypeArg_getRetType.ql linguist-generated
+/test/extractor-tests/generated/AssocTypeArg/AssocTypeArg_getReturnTypeSyntax.ql linguist-generated
+/test/extractor-tests/generated/AssocTypeArg/AssocTypeArg_getTy.ql linguist-generated
+/test/extractor-tests/generated/AssocTypeArg/AssocTypeArg_getTypeBoundList.ql linguist-generated
+/test/extractor-tests/generated/Attr/Attr.ql linguist-generated
+/test/extractor-tests/generated/Attr/Attr_getMeta.ql linguist-generated
 /test/extractor-tests/generated/AwaitExpr/AwaitExpr.ql linguist-generated
+/test/extractor-tests/generated/AwaitExpr/AwaitExpr_getAttr.ql linguist-generated
+/test/extractor-tests/generated/AwaitExpr/AwaitExpr_getExpr.ql linguist-generated
 /test/extractor-tests/generated/BecomeExpr/BecomeExpr.ql linguist-generated
+/test/extractor-tests/generated/BecomeExpr/BecomeExpr_getAttr.ql linguist-generated
+/test/extractor-tests/generated/BecomeExpr/BecomeExpr_getExpr.ql linguist-generated
 /test/extractor-tests/generated/BinaryExpr/BinaryExpr.ql linguist-generated
-/test/extractor-tests/generated/BinaryExpr/BinaryExpr_getOp.ql linguist-generated
+/test/extractor-tests/generated/BinaryExpr/BinaryExpr_getAttr.ql linguist-generated
+/test/extractor-tests/generated/BinaryExpr/BinaryExpr_getLhs.ql linguist-generated
+/test/extractor-tests/generated/BinaryExpr/BinaryExpr_getOperatorName.ql linguist-generated
+/test/extractor-tests/generated/BinaryExpr/BinaryExpr_getRhs.ql linguist-generated
 /test/extractor-tests/generated/BlockExpr/BlockExpr.ql linguist-generated
+/test/extractor-tests/generated/BlockExpr/BlockExpr_getAttr.ql linguist-generated
 /test/extractor-tests/generated/BlockExpr/BlockExpr_getLabel.ql linguist-generated
-/test/extractor-tests/generated/BlockExpr/BlockExpr_getStatement.ql linguist-generated
-/test/extractor-tests/generated/BlockExpr/BlockExpr_getTail.ql linguist-generated
-/test/extractor-tests/generated/BoxExpr/BoxExpr.ql linguist-generated
+/test/extractor-tests/generated/BlockExpr/BlockExpr_getStmtList.ql linguist-generated
 /test/extractor-tests/generated/BoxPat/BoxPat.ql linguist-generated
+/test/extractor-tests/generated/BoxPat/BoxPat_getPat.ql linguist-generated
 /test/extractor-tests/generated/BreakExpr/BreakExpr.ql linguist-generated
+/test/extractor-tests/generated/BreakExpr/BreakExpr_getAttr.ql linguist-generated
 /test/extractor-tests/generated/BreakExpr/BreakExpr_getExpr.ql linguist-generated
-/test/extractor-tests/generated/BreakExpr/BreakExpr_getLabel.ql linguist-generated
+/test/extractor-tests/generated/BreakExpr/BreakExpr_getLifetime.ql linguist-generated
 /test/extractor-tests/generated/CallExpr/CallExpr.ql linguist-generated
-/test/extractor-tests/generated/CallExpr/CallExpr_getArg.ql linguist-generated
+/test/extractor-tests/generated/CallExpr/CallExpr_getArgList.ql linguist-generated
+/test/extractor-tests/generated/CallExpr/CallExpr_getAttr.ql linguist-generated
+/test/extractor-tests/generated/CallExpr/CallExpr_getExpr.ql linguist-generated
 /test/extractor-tests/generated/CastExpr/CastExpr.ql linguist-generated
+/test/extractor-tests/generated/CastExpr/CastExpr_getAttr.ql linguist-generated
+/test/extractor-tests/generated/CastExpr/CastExpr_getExpr.ql linguist-generated
+/test/extractor-tests/generated/CastExpr/CastExpr_getTy.ql linguist-generated
+/test/extractor-tests/generated/ClosureBinder/ClosureBinder.ql linguist-generated
+/test/extractor-tests/generated/ClosureBinder/ClosureBinder_getGenericParamList.ql linguist-generated
 /test/extractor-tests/generated/ClosureExpr/ClosureExpr.ql linguist-generated
-/test/extractor-tests/generated/ClosureExpr/ClosureExpr_getArg.ql linguist-generated
-/test/extractor-tests/generated/ClosureExpr/ClosureExpr_getArgType.ql linguist-generated
+/test/extractor-tests/generated/ClosureExpr/ClosureExpr_getAttr.ql linguist-generated
+/test/extractor-tests/generated/ClosureExpr/ClosureExpr_getBody.ql linguist-generated
+/test/extractor-tests/generated/ClosureExpr/ClosureExpr_getClosureBinder.ql linguist-generated
+/test/extractor-tests/generated/ClosureExpr/ClosureExpr_getParamList.ql linguist-generated
 /test/extractor-tests/generated/ClosureExpr/ClosureExpr_getRetType.ql linguist-generated
+/test/extractor-tests/generated/Comment/Comment.ql linguist-generated
+/test/extractor-tests/generated/Const/Const.ql linguist-generated
+/test/extractor-tests/generated/Const/Const_getAttr.ql linguist-generated
+/test/extractor-tests/generated/Const/Const_getBody.ql linguist-generated
+/test/extractor-tests/generated/Const/Const_getCrateOrigin.ql linguist-generated
+/test/extractor-tests/generated/Const/Const_getExtendedCanonicalPath.ql linguist-generated
+/test/extractor-tests/generated/Const/Const_getName.ql linguist-generated
+/test/extractor-tests/generated/Const/Const_getTy.ql linguist-generated
+/test/extractor-tests/generated/Const/Const_getVisibility.ql linguist-generated
+/test/extractor-tests/generated/ConstArg/ConstArg.ql linguist-generated
+/test/extractor-tests/generated/ConstArg/ConstArg_getExpr.ql linguist-generated
 /test/extractor-tests/generated/ConstBlockPat/ConstBlockPat.ql linguist-generated
-/test/extractor-tests/generated/ConstExpr/ConstExpr.ql linguist-generated
+/test/extractor-tests/generated/ConstBlockPat/ConstBlockPat_getBlockExpr.ql linguist-generated
+/test/extractor-tests/generated/ConstParam/ConstParam.ql linguist-generated
+/test/extractor-tests/generated/ConstParam/ConstParam_getAttr.ql linguist-generated
+/test/extractor-tests/generated/ConstParam/ConstParam_getDefaultVal.ql linguist-generated
+/test/extractor-tests/generated/ConstParam/ConstParam_getName.ql linguist-generated
+/test/extractor-tests/generated/ConstParam/ConstParam_getTy.ql linguist-generated
 /test/extractor-tests/generated/ContinueExpr/ContinueExpr.ql linguist-generated
-/test/extractor-tests/generated/ContinueExpr/ContinueExpr_getLabel.ql linguist-generated
-/test/extractor-tests/generated/ElementListExpr/ElementListExpr.ql linguist-generated
-/test/extractor-tests/generated/ElementListExpr/ElementListExpr_getElement.ql linguist-generated
+/test/extractor-tests/generated/ContinueExpr/ContinueExpr_getAttr.ql linguist-generated
+/test/extractor-tests/generated/ContinueExpr/ContinueExpr_getLifetime.ql linguist-generated
+/test/extractor-tests/generated/DynTraitType/DynTraitType.ql linguist-generated
+/test/extractor-tests/generated/DynTraitType/DynTraitType_getTypeBoundList.ql linguist-generated
+/test/extractor-tests/generated/Enum/Enum.ql linguist-generated
+/test/extractor-tests/generated/Enum/Enum_getAttr.ql linguist-generated
+/test/extractor-tests/generated/Enum/Enum_getCrateOrigin.ql linguist-generated
+/test/extractor-tests/generated/Enum/Enum_getExtendedCanonicalPath.ql linguist-generated
+/test/extractor-tests/generated/Enum/Enum_getGenericParamList.ql linguist-generated
+/test/extractor-tests/generated/Enum/Enum_getName.ql linguist-generated
+/test/extractor-tests/generated/Enum/Enum_getVariantList.ql linguist-generated
+/test/extractor-tests/generated/Enum/Enum_getVisibility.ql linguist-generated
+/test/extractor-tests/generated/Enum/Enum_getWhereClause.ql linguist-generated
 /test/extractor-tests/generated/ExprStmt/ExprStmt.ql linguist-generated
+/test/extractor-tests/generated/ExprStmt/ExprStmt_getExpr.ql linguist-generated
+/test/extractor-tests/generated/ExternBlock/ExternBlock.ql linguist-generated
+/test/extractor-tests/generated/ExternBlock/ExternBlock_getAbi.ql linguist-generated
+/test/extractor-tests/generated/ExternBlock/ExternBlock_getAttr.ql linguist-generated
+/test/extractor-tests/generated/ExternBlock/ExternBlock_getCrateOrigin.ql linguist-generated
+/test/extractor-tests/generated/ExternBlock/ExternBlock_getExtendedCanonicalPath.ql linguist-generated
+/test/extractor-tests/generated/ExternBlock/ExternBlock_getExternItemList.ql linguist-generated
+/test/extractor-tests/generated/ExternCrate/ExternCrate.ql linguist-generated
+/test/extractor-tests/generated/ExternCrate/ExternCrate_getAttr.ql linguist-generated
+/test/extractor-tests/generated/ExternCrate/ExternCrate_getCrateOrigin.ql linguist-generated
+/test/extractor-tests/generated/ExternCrate/ExternCrate_getExtendedCanonicalPath.ql linguist-generated
+/test/extractor-tests/generated/ExternCrate/ExternCrate_getNameRef.ql linguist-generated
+/test/extractor-tests/generated/ExternCrate/ExternCrate_getRename.ql linguist-generated
+/test/extractor-tests/generated/ExternCrate/ExternCrate_getVisibility.ql linguist-generated
+/test/extractor-tests/generated/ExternItemList/ExternItemList.ql linguist-generated
+/test/extractor-tests/generated/ExternItemList/ExternItemList_getAttr.ql linguist-generated
+/test/extractor-tests/generated/ExternItemList/ExternItemList_getExternItem.ql linguist-generated
 /test/extractor-tests/generated/FieldExpr/FieldExpr.ql linguist-generated
+/test/extractor-tests/generated/FieldExpr/FieldExpr_getAttr.ql linguist-generated
+/test/extractor-tests/generated/FieldExpr/FieldExpr_getExpr.ql linguist-generated
+/test/extractor-tests/generated/FieldExpr/FieldExpr_getNameRef.ql linguist-generated
+/test/extractor-tests/generated/FnPtrType/FnPtrType.ql linguist-generated
+/test/extractor-tests/generated/FnPtrType/FnPtrType_getAbi.ql linguist-generated
+/test/extractor-tests/generated/FnPtrType/FnPtrType_getParamList.ql linguist-generated
+/test/extractor-tests/generated/FnPtrType/FnPtrType_getRetType.ql linguist-generated
+/test/extractor-tests/generated/ForExpr/ForExpr.ql linguist-generated
+/test/extractor-tests/generated/ForExpr/ForExpr_getAttr.ql linguist-generated
+/test/extractor-tests/generated/ForExpr/ForExpr_getIterable.ql linguist-generated
+/test/extractor-tests/generated/ForExpr/ForExpr_getLabel.ql linguist-generated
+/test/extractor-tests/generated/ForExpr/ForExpr_getLoopBody.ql linguist-generated
+/test/extractor-tests/generated/ForExpr/ForExpr_getPat.ql linguist-generated
+/test/extractor-tests/generated/ForType/ForType.ql linguist-generated
+/test/extractor-tests/generated/ForType/ForType_getGenericParamList.ql linguist-generated
+/test/extractor-tests/generated/ForType/ForType_getTy.ql linguist-generated
+/test/extractor-tests/generated/FormatArgsArg/FormatArgsArg.ql linguist-generated
+/test/extractor-tests/generated/FormatArgsArg/FormatArgsArg_getExpr.ql linguist-generated
+/test/extractor-tests/generated/FormatArgsArg/FormatArgsArg_getName.ql linguist-generated
+/test/extractor-tests/generated/FormatArgsExpr/FormatArgsExpr.ql linguist-generated
+/test/extractor-tests/generated/FormatArgsExpr/FormatArgsExpr_getArg.ql linguist-generated
+/test/extractor-tests/generated/FormatArgsExpr/FormatArgsExpr_getAttr.ql linguist-generated
+/test/extractor-tests/generated/FormatArgsExpr/FormatArgsExpr_getTemplate.ql linguist-generated
 /test/extractor-tests/generated/Function/Function.ql linguist-generated
+/test/extractor-tests/generated/Function/Function_getAbi.ql linguist-generated
+/test/extractor-tests/generated/Function/Function_getAttr.ql linguist-generated
+/test/extractor-tests/generated/Function/Function_getBody.ql linguist-generated
+/test/extractor-tests/generated/Function/Function_getCrateOrigin.ql linguist-generated
+/test/extractor-tests/generated/Function/Function_getExtendedCanonicalPath.ql linguist-generated
+/test/extractor-tests/generated/Function/Function_getGenericParamList.ql linguist-generated
+/test/extractor-tests/generated/Function/Function_getName.ql linguist-generated
+/test/extractor-tests/generated/Function/Function_getParamList.ql linguist-generated
+/test/extractor-tests/generated/Function/Function_getRetType.ql linguist-generated
+/test/extractor-tests/generated/Function/Function_getVisibility.ql linguist-generated
+/test/extractor-tests/generated/Function/Function_getWhereClause.ql linguist-generated
 /test/extractor-tests/generated/GenericArgList/GenericArgList.ql linguist-generated
+/test/extractor-tests/generated/GenericArgList/GenericArgList_getGenericArg.ql linguist-generated
+/test/extractor-tests/generated/GenericParamList/GenericParamList.ql linguist-generated
+/test/extractor-tests/generated/GenericParamList/GenericParamList_getGenericParam.ql linguist-generated
 /test/extractor-tests/generated/IdentPat/IdentPat.ql linguist-generated
-/test/extractor-tests/generated/IdentPat/IdentPat_getSubpat.ql linguist-generated
+/test/extractor-tests/generated/IdentPat/IdentPat_getAttr.ql linguist-generated
+/test/extractor-tests/generated/IdentPat/IdentPat_getName.ql linguist-generated
+/test/extractor-tests/generated/IdentPat/IdentPat_getPat.ql linguist-generated
 /test/extractor-tests/generated/IfExpr/IfExpr.ql linguist-generated
+/test/extractor-tests/generated/IfExpr/IfExpr_getAttr.ql linguist-generated
+/test/extractor-tests/generated/IfExpr/IfExpr_getCondition.ql linguist-generated
 /test/extractor-tests/generated/IfExpr/IfExpr_getElse.ql linguist-generated
+/test/extractor-tests/generated/IfExpr/IfExpr_getThen.ql linguist-generated
+/test/extractor-tests/generated/Impl/Impl.ql linguist-generated
+/test/extractor-tests/generated/Impl/Impl_getAssocItemList.ql linguist-generated
+/test/extractor-tests/generated/Impl/Impl_getAttr.ql linguist-generated
+/test/extractor-tests/generated/Impl/Impl_getCrateOrigin.ql linguist-generated
+/test/extractor-tests/generated/Impl/Impl_getExtendedCanonicalPath.ql linguist-generated
+/test/extractor-tests/generated/Impl/Impl_getGenericParamList.ql linguist-generated
+/test/extractor-tests/generated/Impl/Impl_getSelfTy.ql linguist-generated
+/test/extractor-tests/generated/Impl/Impl_getTrait.ql linguist-generated
+/test/extractor-tests/generated/Impl/Impl_getVisibility.ql linguist-generated
+/test/extractor-tests/generated/Impl/Impl_getWhereClause.ql linguist-generated
+/test/extractor-tests/generated/ImplTraitType/ImplTraitType.ql linguist-generated
+/test/extractor-tests/generated/ImplTraitType/ImplTraitType_getTypeBoundList.ql linguist-generated
 /test/extractor-tests/generated/IndexExpr/IndexExpr.ql linguist-generated
+/test/extractor-tests/generated/IndexExpr/IndexExpr_getAttr.ql linguist-generated
+/test/extractor-tests/generated/IndexExpr/IndexExpr_getBase.ql linguist-generated
+/test/extractor-tests/generated/IndexExpr/IndexExpr_getIndex.ql linguist-generated
+/test/extractor-tests/generated/InferType/InferType.ql linguist-generated
+/test/extractor-tests/generated/ItemList/ItemList.ql linguist-generated
+/test/extractor-tests/generated/ItemList/ItemList_getAttr.ql linguist-generated
+/test/extractor-tests/generated/ItemList/ItemList_getItem.ql linguist-generated
 /test/extractor-tests/generated/Label/Label.ql linguist-generated
+/test/extractor-tests/generated/Label/Label_getLifetime.ql linguist-generated
+/test/extractor-tests/generated/LetElse/LetElse.ql linguist-generated
+/test/extractor-tests/generated/LetElse/LetElse_getBlockExpr.ql linguist-generated
 /test/extractor-tests/generated/LetExpr/LetExpr.ql linguist-generated
+/test/extractor-tests/generated/LetExpr/LetExpr_getAttr.ql linguist-generated
+/test/extractor-tests/generated/LetExpr/LetExpr_getExpr.ql linguist-generated
+/test/extractor-tests/generated/LetExpr/LetExpr_getPat.ql linguist-generated
 /test/extractor-tests/generated/LetStmt/LetStmt.ql linguist-generated
-/test/extractor-tests/generated/LetStmt/LetStmt_getElse.ql linguist-generated
+/test/extractor-tests/generated/LetStmt/LetStmt_getAttr.ql linguist-generated
 /test/extractor-tests/generated/LetStmt/LetStmt_getInitializer.ql linguist-generated
-/test/extractor-tests/generated/LetStmt/LetStmt_getType.ql linguist-generated
+/test/extractor-tests/generated/LetStmt/LetStmt_getLetElse.ql linguist-generated
+/test/extractor-tests/generated/LetStmt/LetStmt_getPat.ql linguist-generated
+/test/extractor-tests/generated/LetStmt/LetStmt_getTy.ql linguist-generated
+/test/extractor-tests/generated/Lifetime/Lifetime.ql linguist-generated
+/test/extractor-tests/generated/Lifetime/Lifetime_getText.ql linguist-generated
+/test/extractor-tests/generated/LifetimeArg/LifetimeArg.ql linguist-generated
+/test/extractor-tests/generated/LifetimeArg/LifetimeArg_getLifetime.ql linguist-generated
+/test/extractor-tests/generated/LifetimeParam/LifetimeParam.ql linguist-generated
+/test/extractor-tests/generated/LifetimeParam/LifetimeParam_getAttr.ql linguist-generated
+/test/extractor-tests/generated/LifetimeParam/LifetimeParam_getLifetime.ql linguist-generated
+/test/extractor-tests/generated/LifetimeParam/LifetimeParam_getTypeBoundList.ql linguist-generated
 /test/extractor-tests/generated/LiteralExpr/LiteralExpr.ql linguist-generated
+/test/extractor-tests/generated/LiteralExpr/LiteralExpr_getAttr.ql linguist-generated
+/test/extractor-tests/generated/LiteralExpr/LiteralExpr_getTextValue.ql linguist-generated
 /test/extractor-tests/generated/LiteralPat/LiteralPat.ql linguist-generated
+/test/extractor-tests/generated/LiteralPat/LiteralPat_getLiteral.ql linguist-generated
 /test/extractor-tests/generated/LoopExpr/LoopExpr.ql linguist-generated
+/test/extractor-tests/generated/LoopExpr/LoopExpr_getAttr.ql linguist-generated
 /test/extractor-tests/generated/LoopExpr/LoopExpr_getLabel.ql linguist-generated
+/test/extractor-tests/generated/LoopExpr/LoopExpr_getLoopBody.ql linguist-generated
+/test/extractor-tests/generated/MacroCall/MacroCall.ql linguist-generated
+/test/extractor-tests/generated/MacroCall/MacroCall_getAttr.ql linguist-generated
+/test/extractor-tests/generated/MacroCall/MacroCall_getCrateOrigin.ql linguist-generated
+/test/extractor-tests/generated/MacroCall/MacroCall_getExpanded.ql linguist-generated
+/test/extractor-tests/generated/MacroCall/MacroCall_getExtendedCanonicalPath.ql linguist-generated
+/test/extractor-tests/generated/MacroCall/MacroCall_getPath.ql linguist-generated
+/test/extractor-tests/generated/MacroCall/MacroCall_getTokenTree.ql linguist-generated
+/test/extractor-tests/generated/MacroDef/MacroDef.ql linguist-generated
+/test/extractor-tests/generated/MacroDef/MacroDef_getArgs.ql linguist-generated
+/test/extractor-tests/generated/MacroDef/MacroDef_getAttr.ql linguist-generated
+/test/extractor-tests/generated/MacroDef/MacroDef_getBody.ql linguist-generated
+/test/extractor-tests/generated/MacroDef/MacroDef_getCrateOrigin.ql linguist-generated
+/test/extractor-tests/generated/MacroDef/MacroDef_getExtendedCanonicalPath.ql linguist-generated
+/test/extractor-tests/generated/MacroDef/MacroDef_getName.ql linguist-generated
+/test/extractor-tests/generated/MacroDef/MacroDef_getVisibility.ql linguist-generated
+/test/extractor-tests/generated/MacroExpr/MacroExpr.ql linguist-generated
+/test/extractor-tests/generated/MacroExpr/MacroExpr_getMacroCall.ql linguist-generated
+/test/extractor-tests/generated/MacroItems/MacroItems.ql linguist-generated
+/test/extractor-tests/generated/MacroItems/MacroItems_getItem.ql linguist-generated
+/test/extractor-tests/generated/MacroPat/MacroPat.ql linguist-generated
+/test/extractor-tests/generated/MacroPat/MacroPat_getMacroCall.ql linguist-generated
+/test/extractor-tests/generated/MacroRules/MacroRules.ql linguist-generated
+/test/extractor-tests/generated/MacroRules/MacroRules_getAttr.ql linguist-generated
+/test/extractor-tests/generated/MacroRules/MacroRules_getCrateOrigin.ql linguist-generated
+/test/extractor-tests/generated/MacroRules/MacroRules_getExtendedCanonicalPath.ql linguist-generated
+/test/extractor-tests/generated/MacroRules/MacroRules_getName.ql linguist-generated
+/test/extractor-tests/generated/MacroRules/MacroRules_getTokenTree.ql linguist-generated
+/test/extractor-tests/generated/MacroRules/MacroRules_getVisibility.ql linguist-generated
+/test/extractor-tests/generated/MacroStmts/MacroStmts.ql linguist-generated
+/test/extractor-tests/generated/MacroStmts/MacroStmts_getExpr.ql linguist-generated
+/test/extractor-tests/generated/MacroStmts/MacroStmts_getStatement.ql linguist-generated
+/test/extractor-tests/generated/MacroType/MacroType.ql linguist-generated
+/test/extractor-tests/generated/MacroType/MacroType_getMacroCall.ql linguist-generated
 /test/extractor-tests/generated/MatchArm/MatchArm.ql linguist-generated
+/test/extractor-tests/generated/MatchArm/MatchArm_getAttr.ql linguist-generated
+/test/extractor-tests/generated/MatchArm/MatchArm_getExpr.ql linguist-generated
 /test/extractor-tests/generated/MatchArm/MatchArm_getGuard.ql linguist-generated
+/test/extractor-tests/generated/MatchArm/MatchArm_getPat.ql linguist-generated
+/test/extractor-tests/generated/MatchArmList/MatchArmList.ql linguist-generated
+/test/extractor-tests/generated/MatchArmList/MatchArmList_getArm.ql linguist-generated
+/test/extractor-tests/generated/MatchArmList/MatchArmList_getAttr.ql linguist-generated
 /test/extractor-tests/generated/MatchExpr/MatchExpr.ql linguist-generated
-/test/extractor-tests/generated/MatchExpr/MatchExpr_getBranch.ql linguist-generated
+/test/extractor-tests/generated/MatchExpr/MatchExpr_getAttr.ql linguist-generated
+/test/extractor-tests/generated/MatchExpr/MatchExpr_getExpr.ql linguist-generated
+/test/extractor-tests/generated/MatchExpr/MatchExpr_getMatchArmList.ql linguist-generated
+/test/extractor-tests/generated/MatchGuard/MatchGuard.ql linguist-generated
+/test/extractor-tests/generated/MatchGuard/MatchGuard_getCondition.ql linguist-generated
+/test/extractor-tests/generated/Meta/Meta.ql linguist-generated
+/test/extractor-tests/generated/Meta/Meta_getExpr.ql linguist-generated
+/test/extractor-tests/generated/Meta/Meta_getPath.ql linguist-generated
+/test/extractor-tests/generated/Meta/Meta_getTokenTree.ql linguist-generated
 /test/extractor-tests/generated/MethodCallExpr/MethodCallExpr.ql linguist-generated
-/test/extractor-tests/generated/MethodCallExpr/MethodCallExpr_getArg.ql linguist-generated
-/test/extractor-tests/generated/MethodCallExpr/MethodCallExpr_getGenericArgs.ql linguist-generated
-/test/extractor-tests/generated/MissingExpr/MissingExpr.ql linguist-generated
-/test/extractor-tests/generated/MissingPat/MissingPat.ql linguist-generated
+/test/extractor-tests/generated/MethodCallExpr/MethodCallExpr_getArgList.ql linguist-generated
+/test/extractor-tests/generated/MethodCallExpr/MethodCallExpr_getAttr.ql linguist-generated
+/test/extractor-tests/generated/MethodCallExpr/MethodCallExpr_getGenericArgList.ql linguist-generated
+/test/extractor-tests/generated/MethodCallExpr/MethodCallExpr_getNameRef.ql linguist-generated
+/test/extractor-tests/generated/MethodCallExpr/MethodCallExpr_getReceiver.ql linguist-generated
+/test/extractor-tests/generated/MethodCallExpr/MethodCallExpr_getResolvedCrateOrigin.ql linguist-generated
+/test/extractor-tests/generated/MethodCallExpr/MethodCallExpr_getResolvedPath.ql linguist-generated
 /test/extractor-tests/generated/Module/Module.ql linguist-generated
-/test/extractor-tests/generated/Module/Module_getDeclaration.ql linguist-generated
+/test/extractor-tests/generated/Module/Module_getAttr.ql linguist-generated
+/test/extractor-tests/generated/Module/Module_getCrateOrigin.ql linguist-generated
+/test/extractor-tests/generated/Module/Module_getExtendedCanonicalPath.ql linguist-generated
+/test/extractor-tests/generated/Module/Module_getItemList.ql linguist-generated
+/test/extractor-tests/generated/Module/Module_getName.ql linguist-generated
+/test/extractor-tests/generated/Module/Module_getVisibility.ql linguist-generated
+/test/extractor-tests/generated/Name/Name.ql linguist-generated
+/test/extractor-tests/generated/Name/Name_getText.ql linguist-generated
+/test/extractor-tests/generated/NameRef/NameRef.ql linguist-generated
+/test/extractor-tests/generated/NameRef/NameRef_getText.ql linguist-generated
+/test/extractor-tests/generated/NeverType/NeverType.ql linguist-generated
 /test/extractor-tests/generated/OffsetOfExpr/OffsetOfExpr.ql linguist-generated
+/test/extractor-tests/generated/OffsetOfExpr/OffsetOfExpr_getAttr.ql linguist-generated
 /test/extractor-tests/generated/OffsetOfExpr/OffsetOfExpr_getField.ql linguist-generated
+/test/extractor-tests/generated/OffsetOfExpr/OffsetOfExpr_getTy.ql linguist-generated
 /test/extractor-tests/generated/OrPat/OrPat.ql linguist-generated
-/test/extractor-tests/generated/OrPat/OrPat_getArg.ql linguist-generated
+/test/extractor-tests/generated/OrPat/OrPat_getPat.ql linguist-generated
+/test/extractor-tests/generated/Param/Param.ql linguist-generated
+/test/extractor-tests/generated/Param/Param_getAttr.ql linguist-generated
+/test/extractor-tests/generated/Param/Param_getPat.ql linguist-generated
+/test/extractor-tests/generated/Param/Param_getTy.ql linguist-generated
+/test/extractor-tests/generated/ParamList/ParamList.ql linguist-generated
+/test/extractor-tests/generated/ParamList/ParamList_getParam.ql linguist-generated
+/test/extractor-tests/generated/ParamList/ParamList_getSelfParam.ql linguist-generated
+/test/extractor-tests/generated/ParenExpr/ParenExpr.ql linguist-generated
+/test/extractor-tests/generated/ParenExpr/ParenExpr_getAttr.ql linguist-generated
+/test/extractor-tests/generated/ParenExpr/ParenExpr_getExpr.ql linguist-generated
+/test/extractor-tests/generated/ParenPat/ParenPat.ql linguist-generated
+/test/extractor-tests/generated/ParenPat/ParenPat_getPat.ql linguist-generated
+/test/extractor-tests/generated/ParenType/ParenType.ql linguist-generated
+/test/extractor-tests/generated/ParenType/ParenType_getTy.ql linguist-generated
 /test/extractor-tests/generated/Path/Path.ql linguist-generated
+/test/extractor-tests/generated/Path/Path_getPart.ql linguist-generated
+/test/extractor-tests/generated/Path/Path_getQualifier.ql linguist-generated
+/test/extractor-tests/generated/Path/Path_getResolvedCrateOrigin.ql linguist-generated
+/test/extractor-tests/generated/Path/Path_getResolvedPath.ql linguist-generated
 /test/extractor-tests/generated/PathExpr/PathExpr.ql linguist-generated
+/test/extractor-tests/generated/PathExpr/PathExpr_getAttr.ql linguist-generated
+/test/extractor-tests/generated/PathExpr/PathExpr_getPath.ql linguist-generated
 /test/extractor-tests/generated/PathPat/PathPat.ql linguist-generated
+/test/extractor-tests/generated/PathPat/PathPat_getPath.ql linguist-generated
+/test/extractor-tests/generated/PathSegment/PathSegment.ql linguist-generated
+/test/extractor-tests/generated/PathSegment/PathSegment_getGenericArgList.ql linguist-generated
+/test/extractor-tests/generated/PathSegment/PathSegment_getNameRef.ql linguist-generated
+/test/extractor-tests/generated/PathSegment/PathSegment_getParamList.ql linguist-generated
+/test/extractor-tests/generated/PathSegment/PathSegment_getPathType.ql linguist-generated
+/test/extractor-tests/generated/PathSegment/PathSegment_getRetType.ql linguist-generated
+/test/extractor-tests/generated/PathSegment/PathSegment_getReturnTypeSyntax.ql linguist-generated
+/test/extractor-tests/generated/PathSegment/PathSegment_getTy.ql linguist-generated
+/test/extractor-tests/generated/PathType/PathType.ql linguist-generated
+/test/extractor-tests/generated/PathType/PathType_getPath.ql linguist-generated
 /test/extractor-tests/generated/PrefixExpr/PrefixExpr.ql linguist-generated
+/test/extractor-tests/generated/PrefixExpr/PrefixExpr_getAttr.ql linguist-generated
+/test/extractor-tests/generated/PrefixExpr/PrefixExpr_getExpr.ql linguist-generated
+/test/extractor-tests/generated/PrefixExpr/PrefixExpr_getOperatorName.ql linguist-generated
+/test/extractor-tests/generated/PtrType/PtrType.ql linguist-generated
+/test/extractor-tests/generated/PtrType/PtrType_getTy.ql linguist-generated
 /test/extractor-tests/generated/RangeExpr/RangeExpr.ql linguist-generated
-/test/extractor-tests/generated/RangeExpr/RangeExpr_getLhs.ql linguist-generated
-/test/extractor-tests/generated/RangeExpr/RangeExpr_getRhs.ql linguist-generated
+/test/extractor-tests/generated/RangeExpr/RangeExpr_getAttr.ql linguist-generated
+/test/extractor-tests/generated/RangeExpr/RangeExpr_getEnd.ql linguist-generated
+/test/extractor-tests/generated/RangeExpr/RangeExpr_getOperatorName.ql linguist-generated
+/test/extractor-tests/generated/RangeExpr/RangeExpr_getStart.ql linguist-generated
 /test/extractor-tests/generated/RangePat/RangePat.ql linguist-generated
 /test/extractor-tests/generated/RangePat/RangePat_getEnd.ql linguist-generated
+/test/extractor-tests/generated/RangePat/RangePat_getOperatorName.ql linguist-generated
 /test/extractor-tests/generated/RangePat/RangePat_getStart.ql linguist-generated
 /test/extractor-tests/generated/RecordExpr/RecordExpr.ql linguist-generated
-/test/extractor-tests/generated/RecordExpr/RecordExpr_getFld.ql linguist-generated
 /test/extractor-tests/generated/RecordExpr/RecordExpr_getPath.ql linguist-generated
-/test/extractor-tests/generated/RecordExpr/RecordExpr_getSpread.ql linguist-generated
+/test/extractor-tests/generated/RecordExpr/RecordExpr_getRecordExprFieldList.ql linguist-generated
 /test/extractor-tests/generated/RecordExprField/RecordExprField.ql linguist-generated
+/test/extractor-tests/generated/RecordExprField/RecordExprField_getAttr.ql linguist-generated
+/test/extractor-tests/generated/RecordExprField/RecordExprField_getExpr.ql linguist-generated
+/test/extractor-tests/generated/RecordExprField/RecordExprField_getNameRef.ql linguist-generated
+/test/extractor-tests/generated/RecordExprFieldList/RecordExprFieldList.ql linguist-generated
+/test/extractor-tests/generated/RecordExprFieldList/RecordExprFieldList_getAttr.ql linguist-generated
+/test/extractor-tests/generated/RecordExprFieldList/RecordExprFieldList_getField.ql linguist-generated
+/test/extractor-tests/generated/RecordExprFieldList/RecordExprFieldList_getSpread.ql linguist-generated
+/test/extractor-tests/generated/RecordField/RecordField.ql linguist-generated
+/test/extractor-tests/generated/RecordField/RecordField_getAttr.ql linguist-generated
+/test/extractor-tests/generated/RecordField/RecordField_getName.ql linguist-generated
+/test/extractor-tests/generated/RecordField/RecordField_getTy.ql linguist-generated
+/test/extractor-tests/generated/RecordField/RecordField_getVisibility.ql linguist-generated
+/test/extractor-tests/generated/RecordFieldList/RecordFieldList.ql linguist-generated
+/test/extractor-tests/generated/RecordFieldList/RecordFieldList_getField.ql linguist-generated
 /test/extractor-tests/generated/RecordPat/RecordPat.ql linguist-generated
-/test/extractor-tests/generated/RecordPat/RecordPat_getFld.ql linguist-generated
 /test/extractor-tests/generated/RecordPat/RecordPat_getPath.ql linguist-generated
+/test/extractor-tests/generated/RecordPat/RecordPat_getRecordPatFieldList.ql linguist-generated
 /test/extractor-tests/generated/RecordPatField/RecordPatField.ql linguist-generated
+/test/extractor-tests/generated/RecordPatField/RecordPatField_getAttr.ql linguist-generated
+/test/extractor-tests/generated/RecordPatField/RecordPatField_getNameRef.ql linguist-generated
+/test/extractor-tests/generated/RecordPatField/RecordPatField_getPat.ql linguist-generated
+/test/extractor-tests/generated/RecordPatFieldList/RecordPatFieldList.ql linguist-generated
+/test/extractor-tests/generated/RecordPatFieldList/RecordPatFieldList_getField.ql linguist-generated
+/test/extractor-tests/generated/RecordPatFieldList/RecordPatFieldList_getRestPat.ql linguist-generated
 /test/extractor-tests/generated/RefExpr/RefExpr.ql linguist-generated
+/test/extractor-tests/generated/RefExpr/RefExpr_getAttr.ql linguist-generated
+/test/extractor-tests/generated/RefExpr/RefExpr_getExpr.ql linguist-generated
 /test/extractor-tests/generated/RefPat/RefPat.ql linguist-generated
-/test/extractor-tests/generated/RepeatExpr/RepeatExpr.ql linguist-generated
+/test/extractor-tests/generated/RefPat/RefPat_getPat.ql linguist-generated
+/test/extractor-tests/generated/RefType/RefType.ql linguist-generated
+/test/extractor-tests/generated/RefType/RefType_getLifetime.ql linguist-generated
+/test/extractor-tests/generated/RefType/RefType_getTy.ql linguist-generated
+/test/extractor-tests/generated/Rename/Rename.ql linguist-generated
+/test/extractor-tests/generated/Rename/Rename_getName.ql linguist-generated
+/test/extractor-tests/generated/RestPat/RestPat.ql linguist-generated
+/test/extractor-tests/generated/RestPat/RestPat_getAttr.ql linguist-generated
+/test/extractor-tests/generated/RetType/RetType.ql linguist-generated
+/test/extractor-tests/generated/RetType/RetType_getTy.ql linguist-generated
 /test/extractor-tests/generated/ReturnExpr/ReturnExpr.ql linguist-generated
+/test/extractor-tests/generated/ReturnExpr/ReturnExpr_getAttr.ql linguist-generated
 /test/extractor-tests/generated/ReturnExpr/ReturnExpr_getExpr.ql linguist-generated
+/test/extractor-tests/generated/ReturnTypeSyntax/ReturnTypeSyntax.ql linguist-generated
+/test/extractor-tests/generated/SelfParam/SelfParam.ql linguist-generated
+/test/extractor-tests/generated/SelfParam/SelfParam_getAttr.ql linguist-generated
+/test/extractor-tests/generated/SelfParam/SelfParam_getLifetime.ql linguist-generated
+/test/extractor-tests/generated/SelfParam/SelfParam_getName.ql linguist-generated
+/test/extractor-tests/generated/SelfParam/SelfParam_getTy.ql linguist-generated
 /test/extractor-tests/generated/SlicePat/SlicePat.ql linguist-generated
-/test/extractor-tests/generated/SlicePat/SlicePat_getPrefix.ql linguist-generated
-/test/extractor-tests/generated/SlicePat/SlicePat_getSlice.ql linguist-generated
-/test/extractor-tests/generated/SlicePat/SlicePat_getSuffix.ql linguist-generated
+/test/extractor-tests/generated/SlicePat/SlicePat_getPat.ql linguist-generated
+/test/extractor-tests/generated/SliceType/SliceType.ql linguist-generated
+/test/extractor-tests/generated/SliceType/SliceType_getTy.ql linguist-generated
+/test/extractor-tests/generated/SourceFile/SourceFile.ql linguist-generated
+/test/extractor-tests/generated/SourceFile/SourceFile_getAttr.ql linguist-generated
+/test/extractor-tests/generated/SourceFile/SourceFile_getItem.ql linguist-generated
+/test/extractor-tests/generated/Static/Static.ql linguist-generated
+/test/extractor-tests/generated/Static/Static_getAttr.ql linguist-generated
+/test/extractor-tests/generated/Static/Static_getBody.ql linguist-generated
+/test/extractor-tests/generated/Static/Static_getCrateOrigin.ql linguist-generated
+/test/extractor-tests/generated/Static/Static_getExtendedCanonicalPath.ql linguist-generated
+/test/extractor-tests/generated/Static/Static_getName.ql linguist-generated
+/test/extractor-tests/generated/Static/Static_getTy.ql linguist-generated
+/test/extractor-tests/generated/Static/Static_getVisibility.ql linguist-generated
+/test/extractor-tests/generated/StmtList/StmtList.ql linguist-generated
+/test/extractor-tests/generated/StmtList/StmtList_getAttr.ql linguist-generated
+/test/extractor-tests/generated/StmtList/StmtList_getStatement.ql linguist-generated
+/test/extractor-tests/generated/StmtList/StmtList_getTailExpr.ql linguist-generated
+/test/extractor-tests/generated/Struct/Struct.ql linguist-generated
+/test/extractor-tests/generated/Struct/Struct_getAttr.ql linguist-generated
+/test/extractor-tests/generated/Struct/Struct_getCrateOrigin.ql linguist-generated
+/test/extractor-tests/generated/Struct/Struct_getExtendedCanonicalPath.ql linguist-generated
+/test/extractor-tests/generated/Struct/Struct_getFieldList.ql linguist-generated
+/test/extractor-tests/generated/Struct/Struct_getGenericParamList.ql linguist-generated
+/test/extractor-tests/generated/Struct/Struct_getName.ql linguist-generated
+/test/extractor-tests/generated/Struct/Struct_getVisibility.ql linguist-generated
+/test/extractor-tests/generated/Struct/Struct_getWhereClause.ql linguist-generated
+/test/extractor-tests/generated/TokenTree/TokenTree.ql linguist-generated
+/test/extractor-tests/generated/Trait/AssocItemList.ql linguist-generated
+/test/extractor-tests/generated/Trait/AssocItemList_getAssocItem.ql linguist-generated
+/test/extractor-tests/generated/Trait/AssocItemList_getAttr.ql linguist-generated
+/test/extractor-tests/generated/Trait/Trait.ql linguist-generated
+/test/extractor-tests/generated/Trait/Trait_getAssocItemList.ql linguist-generated
+/test/extractor-tests/generated/Trait/Trait_getAttr.ql linguist-generated
+/test/extractor-tests/generated/Trait/Trait_getCrateOrigin.ql linguist-generated
+/test/extractor-tests/generated/Trait/Trait_getExtendedCanonicalPath.ql linguist-generated
+/test/extractor-tests/generated/Trait/Trait_getGenericParamList.ql linguist-generated
+/test/extractor-tests/generated/Trait/Trait_getName.ql linguist-generated
+/test/extractor-tests/generated/Trait/Trait_getTypeBoundList.ql linguist-generated
+/test/extractor-tests/generated/Trait/Trait_getVisibility.ql linguist-generated
+/test/extractor-tests/generated/Trait/Trait_getWhereClause.ql linguist-generated
+/test/extractor-tests/generated/TraitAlias/TraitAlias.ql linguist-generated
+/test/extractor-tests/generated/TraitAlias/TraitAlias_getAttr.ql linguist-generated
+/test/extractor-tests/generated/TraitAlias/TraitAlias_getCrateOrigin.ql linguist-generated
+/test/extractor-tests/generated/TraitAlias/TraitAlias_getExtendedCanonicalPath.ql linguist-generated
+/test/extractor-tests/generated/TraitAlias/TraitAlias_getGenericParamList.ql linguist-generated
+/test/extractor-tests/generated/TraitAlias/TraitAlias_getName.ql linguist-generated
+/test/extractor-tests/generated/TraitAlias/TraitAlias_getTypeBoundList.ql linguist-generated
+/test/extractor-tests/generated/TraitAlias/TraitAlias_getVisibility.ql linguist-generated
+/test/extractor-tests/generated/TraitAlias/TraitAlias_getWhereClause.ql linguist-generated
+/test/extractor-tests/generated/TryExpr/TryExpr.ql linguist-generated
+/test/extractor-tests/generated/TryExpr/TryExpr_getAttr.ql linguist-generated
+/test/extractor-tests/generated/TryExpr/TryExpr_getExpr.ql linguist-generated
 /test/extractor-tests/generated/TupleExpr/TupleExpr.ql linguist-generated
-/test/extractor-tests/generated/TupleExpr/TupleExpr_getExpr.ql linguist-generated
+/test/extractor-tests/generated/TupleExpr/TupleExpr_getAttr.ql linguist-generated
+/test/extractor-tests/generated/TupleExpr/TupleExpr_getField.ql linguist-generated
+/test/extractor-tests/generated/TupleField/TupleField.ql linguist-generated
+/test/extractor-tests/generated/TupleField/TupleField_getAttr.ql linguist-generated
+/test/extractor-tests/generated/TupleField/TupleField_getTy.ql linguist-generated
+/test/extractor-tests/generated/TupleField/TupleField_getVisibility.ql linguist-generated
+/test/extractor-tests/generated/TupleFieldList/TupleFieldList.ql linguist-generated
+/test/extractor-tests/generated/TupleFieldList/TupleFieldList_getField.ql linguist-generated
 /test/extractor-tests/generated/TuplePat/TuplePat.ql linguist-generated
-/test/extractor-tests/generated/TuplePat/TuplePat_getArg.ql linguist-generated
-/test/extractor-tests/generated/TuplePat/TuplePat_getEllipsisIndex.ql linguist-generated
+/test/extractor-tests/generated/TuplePat/TuplePat_getField.ql linguist-generated
 /test/extractor-tests/generated/TupleStructPat/TupleStructPat.ql linguist-generated
-/test/extractor-tests/generated/TupleStructPat/TupleStructPat_getArg.ql linguist-generated
-/test/extractor-tests/generated/TupleStructPat/TupleStructPat_getEllipsisIndex.ql linguist-generated
+/test/extractor-tests/generated/TupleStructPat/TupleStructPat_getField.ql linguist-generated
 /test/extractor-tests/generated/TupleStructPat/TupleStructPat_getPath.ql linguist-generated
-/test/extractor-tests/generated/TypeRef/TypeRef.ql linguist-generated
+/test/extractor-tests/generated/TupleType/TupleType.ql linguist-generated
+/test/extractor-tests/generated/TupleType/TupleType_getField.ql linguist-generated
+/test/extractor-tests/generated/TypeAlias/TypeAlias.ql linguist-generated
+/test/extractor-tests/generated/TypeAlias/TypeAlias_getAttr.ql linguist-generated
+/test/extractor-tests/generated/TypeAlias/TypeAlias_getCrateOrigin.ql linguist-generated
+/test/extractor-tests/generated/TypeAlias/TypeAlias_getExtendedCanonicalPath.ql linguist-generated
+/test/extractor-tests/generated/TypeAlias/TypeAlias_getGenericParamList.ql linguist-generated
+/test/extractor-tests/generated/TypeAlias/TypeAlias_getName.ql linguist-generated
+/test/extractor-tests/generated/TypeAlias/TypeAlias_getTy.ql linguist-generated
+/test/extractor-tests/generated/TypeAlias/TypeAlias_getTypeBoundList.ql linguist-generated
+/test/extractor-tests/generated/TypeAlias/TypeAlias_getVisibility.ql linguist-generated
+/test/extractor-tests/generated/TypeAlias/TypeAlias_getWhereClause.ql linguist-generated
+/test/extractor-tests/generated/TypeArg/TypeArg.ql linguist-generated
+/test/extractor-tests/generated/TypeArg/TypeArg_getTy.ql linguist-generated
+/test/extractor-tests/generated/TypeBound/TypeBound.ql linguist-generated
+/test/extractor-tests/generated/TypeBound/TypeBound_getGenericParamList.ql linguist-generated
+/test/extractor-tests/generated/TypeBound/TypeBound_getLifetime.ql linguist-generated
+/test/extractor-tests/generated/TypeBound/TypeBound_getTy.ql linguist-generated
+/test/extractor-tests/generated/TypeBoundList/TypeBoundList.ql linguist-generated
+/test/extractor-tests/generated/TypeBoundList/TypeBoundList_getBound.ql linguist-generated
+/test/extractor-tests/generated/TypeParam/TypeParam.ql linguist-generated
+/test/extractor-tests/generated/TypeParam/TypeParam_getAttr.ql linguist-generated
+/test/extractor-tests/generated/TypeParam/TypeParam_getDefaultType.ql linguist-generated
+/test/extractor-tests/generated/TypeParam/TypeParam_getName.ql linguist-generated
+/test/extractor-tests/generated/TypeParam/TypeParam_getTypeBoundList.ql linguist-generated
 /test/extractor-tests/generated/UnderscoreExpr/UnderscoreExpr.ql linguist-generated
-/test/extractor-tests/generated/UnsafeBlockExpr/UnsafeBlockExpr.ql linguist-generated
-/test/extractor-tests/generated/UnsafeBlockExpr/UnsafeBlockExpr_getStatement.ql linguist-generated
-/test/extractor-tests/generated/UnsafeBlockExpr/UnsafeBlockExpr_getTail.ql linguist-generated
+/test/extractor-tests/generated/UnderscoreExpr/UnderscoreExpr_getAttr.ql linguist-generated
+/test/extractor-tests/generated/Union/Union.ql linguist-generated
+/test/extractor-tests/generated/Union/Union_getAttr.ql linguist-generated
+/test/extractor-tests/generated/Union/Union_getCrateOrigin.ql linguist-generated
+/test/extractor-tests/generated/Union/Union_getExtendedCanonicalPath.ql linguist-generated
+/test/extractor-tests/generated/Union/Union_getGenericParamList.ql linguist-generated
+/test/extractor-tests/generated/Union/Union_getName.ql linguist-generated
+/test/extractor-tests/generated/Union/Union_getRecordFieldList.ql linguist-generated
+/test/extractor-tests/generated/Union/Union_getVisibility.ql linguist-generated
+/test/extractor-tests/generated/Union/Union_getWhereClause.ql linguist-generated
+/test/extractor-tests/generated/Use/Use.ql linguist-generated
+/test/extractor-tests/generated/Use/Use_getAttr.ql linguist-generated
+/test/extractor-tests/generated/Use/Use_getCrateOrigin.ql linguist-generated
+/test/extractor-tests/generated/Use/Use_getExtendedCanonicalPath.ql linguist-generated
+/test/extractor-tests/generated/Use/Use_getUseTree.ql linguist-generated
+/test/extractor-tests/generated/Use/Use_getVisibility.ql linguist-generated
+/test/extractor-tests/generated/UseTree/UseTree.ql linguist-generated
+/test/extractor-tests/generated/UseTree/UseTree_getPath.ql linguist-generated
+/test/extractor-tests/generated/UseTree/UseTree_getRename.ql linguist-generated
+/test/extractor-tests/generated/UseTree/UseTree_getUseTreeList.ql linguist-generated
+/test/extractor-tests/generated/UseTreeList/UseTreeList.ql linguist-generated
+/test/extractor-tests/generated/UseTreeList/UseTreeList_getUseTree.ql linguist-generated
+/test/extractor-tests/generated/Variant/Variant.ql linguist-generated
+/test/extractor-tests/generated/Variant/Variant_getAttr.ql linguist-generated
+/test/extractor-tests/generated/Variant/Variant_getExpr.ql linguist-generated
+/test/extractor-tests/generated/Variant/Variant_getFieldList.ql linguist-generated
+/test/extractor-tests/generated/Variant/Variant_getName.ql linguist-generated
+/test/extractor-tests/generated/Variant/Variant_getVisibility.ql linguist-generated
+/test/extractor-tests/generated/VariantList/VariantList.ql linguist-generated
+/test/extractor-tests/generated/VariantList/VariantList_getVariant.ql linguist-generated
+/test/extractor-tests/generated/Visibility/Visibility.ql linguist-generated
+/test/extractor-tests/generated/Visibility/Visibility_getPath.ql linguist-generated
+/test/extractor-tests/generated/WhereClause/WhereClause.ql linguist-generated
+/test/extractor-tests/generated/WhereClause/WhereClause_getPredicate.ql linguist-generated
+/test/extractor-tests/generated/WherePred/WherePred.ql linguist-generated
+/test/extractor-tests/generated/WherePred/WherePred_getGenericParamList.ql linguist-generated
+/test/extractor-tests/generated/WherePred/WherePred_getLifetime.ql linguist-generated
+/test/extractor-tests/generated/WherePred/WherePred_getTy.ql linguist-generated
+/test/extractor-tests/generated/WherePred/WherePred_getTypeBoundList.ql linguist-generated
+/test/extractor-tests/generated/WhileExpr/WhileExpr.ql linguist-generated
+/test/extractor-tests/generated/WhileExpr/WhileExpr_getAttr.ql linguist-generated
+/test/extractor-tests/generated/WhileExpr/WhileExpr_getCondition.ql linguist-generated
+/test/extractor-tests/generated/WhileExpr/WhileExpr_getLabel.ql linguist-generated
+/test/extractor-tests/generated/WhileExpr/WhileExpr_getLoopBody.ql linguist-generated
 /test/extractor-tests/generated/WildcardPat/WildcardPat.ql linguist-generated
 /test/extractor-tests/generated/YeetExpr/YeetExpr.ql linguist-generated
+/test/extractor-tests/generated/YeetExpr/YeetExpr_getAttr.ql linguist-generated
 /test/extractor-tests/generated/YeetExpr/YeetExpr_getExpr.ql linguist-generated
 /test/extractor-tests/generated/YieldExpr/YieldExpr.ql linguist-generated
+/test/extractor-tests/generated/YieldExpr/YieldExpr_getAttr.ql linguist-generated
 /test/extractor-tests/generated/YieldExpr/YieldExpr_getExpr.ql linguist-generated
diff --git a/rust/ql/consistency-queries/AstConsistency.ql b/rust/ql/consistency-queries/AstConsistency.ql
new file mode 100644
index 00000000000..1db4f27bef2
--- /dev/null
+++ b/rust/ql/consistency-queries/AstConsistency.ql
@@ -0,0 +1,8 @@
+/**
+ * @name Abstract syntax tree inconsistencies
+ * @description Lists the abstract syntax tree inconsistencies in the database.  This query is intended for internal use.
+ * @kind table
+ * @id rust/diagnostics/ast-consistency
+ */
+
+import codeql.rust.AstConsistency
diff --git a/rust/ql/consistency-queries/CfgConsistency.ql b/rust/ql/consistency-queries/CfgConsistency.ql
new file mode 100644
index 00000000000..4e155ca307b
--- /dev/null
+++ b/rust/ql/consistency-queries/CfgConsistency.ql
@@ -0,0 +1,8 @@
+/**
+ * @name Control flow graph inconsistencies
+ * @description Lists the control flow graph inconsistencies in the database.  This query is intended for internal use.
+ * @kind table
+ * @id rust/diagnostics/cfg-consistency
+ */
+
+import codeql.rust.controlflow.internal.CfgConsistency
diff --git a/rust/ql/consistency-queries/DataFlowConsistency.ql b/rust/ql/consistency-queries/DataFlowConsistency.ql
new file mode 100644
index 00000000000..3513121f260
--- /dev/null
+++ b/rust/ql/consistency-queries/DataFlowConsistency.ql
@@ -0,0 +1,16 @@
+/**
+ * @name Data flow inconsistencies
+ * @description Lists the data flow inconsistencies in the database.  This query is intended for internal use.
+ * @kind table
+ * @id rust/diagnostics/data-flow-consistency
+ */
+
+import codeql.rust.dataflow.DataFlow::DataFlow as DataFlow
+private import rust
+private import codeql.rust.dataflow.internal.DataFlowImpl
+private import codeql.rust.dataflow.internal.TaintTrackingImpl
+private import codeql.dataflow.internal.DataFlowImplConsistency
+
+private module Input implements InputSig<Location, RustDataFlow> { }
+
+import MakeConsistency<Location, RustDataFlow, RustTaintTracking, Input>
diff --git a/rust/ql/consistency-queries/ExtractionConsistency.ql b/rust/ql/consistency-queries/ExtractionConsistency.ql
new file mode 100644
index 00000000000..8b1f0adca94
--- /dev/null
+++ b/rust/ql/consistency-queries/ExtractionConsistency.ql
@@ -0,0 +1,12 @@
+/**
+ * @name Extraction consistency
+ * @description Lists the extraction inconsistencies (errors) in the database.  This query is intended for internal use.
+ * @kind table
+ * @id rust/diagnostics/extraction-consistency
+ */
+
+import codeql.rust.Diagnostics
+
+query predicate extractionError(ExtractionError ee) { any() }
+
+query predicate extractionWarning(ExtractionWarning ew) { any() }
diff --git a/rust/ql/consistency-queries/Placeholder.ql b/rust/ql/consistency-queries/Placeholder.ql
deleted file mode 100644
index 8e8965e4052..00000000000
--- a/rust/ql/consistency-queries/Placeholder.ql
+++ /dev/null
@@ -1,3 +0,0 @@
-from boolean b
-where b = true and b = false
-select b
diff --git a/rust/ql/consistency-queries/SsaConsistency.ql b/rust/ql/consistency-queries/SsaConsistency.ql
new file mode 100644
index 00000000000..0764842dac3
--- /dev/null
+++ b/rust/ql/consistency-queries/SsaConsistency.ql
@@ -0,0 +1,19 @@
+import codeql.rust.dataflow.Ssa
+import codeql.rust.dataflow.internal.SsaImpl
+import Consistency
+
+class MyRelevantDefinition extends RelevantDefinition, Ssa::Definition {
+  override predicate hasLocationInfo(
+    string filepath, int startline, int startcolumn, int endline, int endcolumn
+  ) {
+    this.getLocation().hasLocationInfo(filepath, startline, startcolumn, endline, endcolumn)
+  }
+}
+
+class MyRelevantDefinitionExt extends RelevantDefinitionExt, DefinitionExt {
+  override predicate hasLocationInfo(
+    string filepath, int startline, int startcolumn, int endline, int endcolumn
+  ) {
+    this.getLocation().hasLocationInfo(filepath, startline, startcolumn, endline, endcolumn)
+  }
+}
diff --git a/rust/ql/integration-tests/conftest.py b/rust/ql/integration-tests/conftest.py
new file mode 100644
index 00000000000..08b17f106f8
--- /dev/null
+++ b/rust/ql/integration-tests/conftest.py
@@ -0,0 +1,15 @@
+import pytest
+import shutil
+
+class _Manifests:
+    def __init__(self, cwd):
+        self.dir = cwd / "manifests"
+
+    def select(self, name: str):
+        (self.dir / name).rename(name)
+        shutil.rmtree(self.dir)
+
+
+@pytest.fixture
+def manifests(cwd):
+    return _Manifests(cwd)
diff --git a/rust/ql/integration-tests/hello-project/functions.expected b/rust/ql/integration-tests/hello-project/functions.expected
new file mode 100644
index 00000000000..fc49564084e
--- /dev/null
+++ b/rust/ql/integration-tests/hello-project/functions.expected
@@ -0,0 +1 @@
+| src/main.rs:4:1:6:1 | main |
diff --git a/rust/ql/integration-tests/hello-project/functions.ql b/rust/ql/integration-tests/hello-project/functions.ql
new file mode 100644
index 00000000000..8d9a3213dad
--- /dev/null
+++ b/rust/ql/integration-tests/hello-project/functions.ql
@@ -0,0 +1,5 @@
+import rust
+
+from Function f
+where exists(f.getLocation().getFile().getRelativePath())
+select f
diff --git a/rust/ql/integration-tests/hello-project/manifests/Cargo.toml b/rust/ql/integration-tests/hello-project/manifests/Cargo.toml
new file mode 100644
index 00000000000..909b5b525ff
--- /dev/null
+++ b/rust/ql/integration-tests/hello-project/manifests/Cargo.toml
@@ -0,0 +1,7 @@
+[workspace]
+[package]
+name = "hello-cargo"
+version = "0.1.0"
+edition = "2021"
+
+[dependencies]
diff --git a/rust/ql/integration-tests/hello-project/manifests/rust-project.json b/rust/ql/integration-tests/hello-project/manifests/rust-project.json
new file mode 100644
index 00000000000..03d9a5ce2c0
--- /dev/null
+++ b/rust/ql/integration-tests/hello-project/manifests/rust-project.json
@@ -0,0 +1,7 @@
+{
+  "crates": [{
+    "root_module": "src/main.rs",
+    "edition": "2021",
+    "deps": []
+  }]
+}
diff --git a/rust/ql/integration-tests/hello-project/source_archive.expected b/rust/ql/integration-tests/hello-project/source_archive.expected
new file mode 100644
index 00000000000..4c4c3f43193
--- /dev/null
+++ b/rust/ql/integration-tests/hello-project/source_archive.expected
@@ -0,0 +1,5 @@
+src/directory_module/mod.rs
+src/directory_module/nested_module.rs
+src/directory_module/not_loaded.rs
+src/file_module.rs
+src/main.rs
diff --git a/rust/ql/integration-tests/hello-project/src/directory_module/mod.rs b/rust/ql/integration-tests/hello-project/src/directory_module/mod.rs
new file mode 100644
index 00000000000..cd90d98055c
--- /dev/null
+++ b/rust/ql/integration-tests/hello-project/src/directory_module/mod.rs
@@ -0,0 +1 @@
+mod nested_module;
diff --git a/rust/ql/integration-tests/hello-project/src/directory_module/nested_module.rs b/rust/ql/integration-tests/hello-project/src/directory_module/nested_module.rs
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/integration-tests/hello-project/src/directory_module/not_loaded.rs b/rust/ql/integration-tests/hello-project/src/directory_module/not_loaded.rs
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/integration-tests/hello-project/src/file_module.rs b/rust/ql/integration-tests/hello-project/src/file_module.rs
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/integration-tests/hello-project/src/main.rs b/rust/ql/integration-tests/hello-project/src/main.rs
new file mode 100644
index 00000000000..c055220a51d
--- /dev/null
+++ b/rust/ql/integration-tests/hello-project/src/main.rs
@@ -0,0 +1,6 @@
+mod file_module;
+mod directory_module;
+
+fn main() {
+    println!("Hello, world!");
+}
diff --git a/rust/ql/integration-tests/hello-project/test_project.py b/rust/ql/integration-tests/hello-project/test_project.py
new file mode 100644
index 00000000000..d03c4f67e26
--- /dev/null
+++ b/rust/ql/integration-tests/hello-project/test_project.py
@@ -0,0 +1,7 @@
+def test_cargo(codeql, rust, manifests, check_source_archive):
+    manifests.select("Cargo.toml")
+    codeql.database.create()
+
+def test_rust_project(codeql, rust, manifests, check_source_archive):
+    manifests.select("rust-project.json")
+    codeql.database.create()
diff --git a/rust/ql/integration-tests/hello-workspace/exe/Cargo.toml b/rust/ql/integration-tests/hello-workspace/exe/Cargo.toml
new file mode 100644
index 00000000000..b63ccfd5da5
--- /dev/null
+++ b/rust/ql/integration-tests/hello-workspace/exe/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "exe"
+version = "0.1.0"
+edition = "2021"
+
+[dependencies]
+lib = { path = "../lib" }
diff --git a/rust/ql/integration-tests/hello-workspace/exe/src/a_module.rs b/rust/ql/integration-tests/hello-workspace/exe/src/a_module.rs
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/integration-tests/hello-workspace/exe/src/main.rs b/rust/ql/integration-tests/hello-workspace/exe/src/main.rs
new file mode 100644
index 00000000000..3c46784465a
--- /dev/null
+++ b/rust/ql/integration-tests/hello-workspace/exe/src/main.rs
@@ -0,0 +1,7 @@
+use lib::a_module::hello;
+
+mod a_module;
+
+fn main() {
+    hello();
+}
diff --git a/rust/ql/integration-tests/hello-workspace/functions.expected b/rust/ql/integration-tests/hello-workspace/functions.expected
new file mode 100644
index 00000000000..0ec9937972e
--- /dev/null
+++ b/rust/ql/integration-tests/hello-workspace/functions.expected
@@ -0,0 +1,2 @@
+| exe/src/main.rs:5:1:7:1 | main |
+| lib/src/a_module/mod.rs:1:1:3:1 | hello |
diff --git a/rust/ql/integration-tests/hello-workspace/functions.ql b/rust/ql/integration-tests/hello-workspace/functions.ql
new file mode 100644
index 00000000000..8d9a3213dad
--- /dev/null
+++ b/rust/ql/integration-tests/hello-workspace/functions.ql
@@ -0,0 +1,5 @@
+import rust
+
+from Function f
+where exists(f.getLocation().getFile().getRelativePath())
+select f
diff --git a/rust/ql/integration-tests/hello-workspace/lib/Cargo.toml b/rust/ql/integration-tests/hello-workspace/lib/Cargo.toml
new file mode 100644
index 00000000000..e8fc5405b71
--- /dev/null
+++ b/rust/ql/integration-tests/hello-workspace/lib/Cargo.toml
@@ -0,0 +1,6 @@
+[package]
+name = "lib"
+version = "0.1.0"
+edition = "2021"
+
+[dependencies]
diff --git a/rust/ql/integration-tests/hello-workspace/lib/src/a_module/mod.rs b/rust/ql/integration-tests/hello-workspace/lib/src/a_module/mod.rs
new file mode 100644
index 00000000000..fda8464098e
--- /dev/null
+++ b/rust/ql/integration-tests/hello-workspace/lib/src/a_module/mod.rs
@@ -0,0 +1,3 @@
+pub fn hello() {
+    println!("Hello, world!");
+}
diff --git a/rust/ql/integration-tests/hello-workspace/lib/src/lib.rs b/rust/ql/integration-tests/hello-workspace/lib/src/lib.rs
new file mode 100644
index 00000000000..e5b38ec20f6
--- /dev/null
+++ b/rust/ql/integration-tests/hello-workspace/lib/src/lib.rs
@@ -0,0 +1 @@
+pub mod a_module;
diff --git a/rust/ql/integration-tests/hello-workspace/manifests/Cargo.toml b/rust/ql/integration-tests/hello-workspace/manifests/Cargo.toml
new file mode 100644
index 00000000000..6ddb463a27e
--- /dev/null
+++ b/rust/ql/integration-tests/hello-workspace/manifests/Cargo.toml
@@ -0,0 +1,3 @@
+[workspace]
+members = [ "exe", "lib" ]
+resolver = "2"
diff --git a/rust/ql/integration-tests/hello-workspace/manifests/rust-project.json b/rust/ql/integration-tests/hello-workspace/manifests/rust-project.json
new file mode 100644
index 00000000000..38e16980196
--- /dev/null
+++ b/rust/ql/integration-tests/hello-workspace/manifests/rust-project.json
@@ -0,0 +1,14 @@
+{
+  "crates": [
+    {
+      "root_module": "exe/src/main.rs",
+      "edition": "2021",
+      "deps": [{"crate": 1, "name": "lib"}]
+    },
+    {
+      "root_module": "lib/src/lib.rs",
+      "edition": "2021",
+      "deps": []
+    }
+  ]
+}
diff --git a/rust/ql/integration-tests/hello-workspace/source_archive.expected b/rust/ql/integration-tests/hello-workspace/source_archive.expected
new file mode 100644
index 00000000000..85650c2b512
--- /dev/null
+++ b/rust/ql/integration-tests/hello-workspace/source_archive.expected
@@ -0,0 +1,4 @@
+exe/src/a_module.rs
+exe/src/main.rs
+lib/src/a_module/mod.rs
+lib/src/lib.rs
diff --git a/rust/ql/integration-tests/hello-workspace/test_workspace.py b/rust/ql/integration-tests/hello-workspace/test_workspace.py
new file mode 100644
index 00000000000..f3503e7cefa
--- /dev/null
+++ b/rust/ql/integration-tests/hello-workspace/test_workspace.py
@@ -0,0 +1,12 @@
+import pytest
+
+# currently the DB-check fails on actions because of loading files multiple times and assiging multiple locations
+# see https://github.com/github/codeql-team/issues/3365
+@pytest.mark.ql_test("DB-CHECK", xfail="maybe")
+def test_cargo(codeql, rust, manifests, check_source_archive):
+    manifests.select("Cargo.toml")
+    codeql.database.create()
+
+def test_rust_project(codeql, rust, manifests, check_source_archive):
+    manifests.select("rust-project.json")
+    codeql.database.create()
diff --git a/rust/ql/integration-tests/options/cfg/Cargo.toml b/rust/ql/integration-tests/options/cfg/Cargo.toml
new file mode 100644
index 00000000000..c5cbf8722f1
--- /dev/null
+++ b/rust/ql/integration-tests/options/cfg/Cargo.toml
@@ -0,0 +1,5 @@
+[workspace]
+[package]
+name = "cfg"
+version = "0.1.0"
+edition = "2021"
diff --git a/rust/ql/integration-tests/options/cfg/functions.expected b/rust/ql/integration-tests/options/cfg/functions.expected
new file mode 100644
index 00000000000..a2042c5e4c4
--- /dev/null
+++ b/rust/ql/integration-tests/options/cfg/functions.expected
@@ -0,0 +1,3 @@
+| src/lib.rs:7:1:8:19 | cfg_no_flag |
+| src/lib.rs:10:1:11:18 | cfg_no_key |
+| src/lib.rs:16:1:17:24 | pointer_width_64 |
diff --git a/rust/ql/integration-tests/options/cfg/functions.override.expected b/rust/ql/integration-tests/options/cfg/functions.override.expected
new file mode 100644
index 00000000000..4a19db56a74
--- /dev/null
+++ b/rust/ql/integration-tests/options/cfg/functions.override.expected
@@ -0,0 +1,4 @@
+| src/lib.rs:1:1:2:16 | cfg_flag |
+| src/lib.rs:4:1:5:15 | cfg_key |
+| src/lib.rs:13:1:14:12 | test |
+| src/lib.rs:19:1:20:24 | pointer_width_32 |
diff --git a/rust/ql/integration-tests/options/cfg/functions.ql b/rust/ql/integration-tests/options/cfg/functions.ql
new file mode 100644
index 00000000000..da7b22cf584
--- /dev/null
+++ b/rust/ql/integration-tests/options/cfg/functions.ql
@@ -0,0 +1,5 @@
+import rust
+
+from Function f
+where f.hasExtendedCanonicalPath()
+select f
diff --git a/rust/ql/integration-tests/options/cfg/src/lib.rs b/rust/ql/integration-tests/options/cfg/src/lib.rs
new file mode 100644
index 00000000000..1643ffbf2ad
--- /dev/null
+++ b/rust/ql/integration-tests/options/cfg/src/lib.rs
@@ -0,0 +1,20 @@
+#[cfg(cfg_flag)]
+fn cfg_flag() {}
+
+#[cfg(cfg_key = "value")]
+fn cfg_key() {}
+
+#[cfg(not(cfg_flag))]
+fn cfg_no_flag() {}
+
+#[cfg(not(cfg_key = "value"))]
+fn cfg_no_key() {}
+
+#[cfg(test)]
+fn test() {}
+
+#[cfg(target_pointer_width = "64")]
+fn pointer_width_64() {}
+
+#[cfg(target_pointer_width = "32")]
+fn pointer_width_32() {}
diff --git a/rust/ql/integration-tests/options/cfg/test_cfg_overrides_option.py b/rust/ql/integration-tests/options/cfg/test_cfg_overrides_option.py
new file mode 100644
index 00000000000..aa5f3cd3b2e
--- /dev/null
+++ b/rust/ql/integration-tests/options/cfg/test_cfg_overrides_option.py
@@ -0,0 +1,19 @@
+import pytest
+import platform
+import os
+
+
+def test_default(codeql, rust):
+    codeql.database.create()
+
+
+@pytest.mark.ql_test(expected=".override.expected")
+def test_cfg_overrides(codeql, rust):
+    overrides = ",".join((
+        "cfg_flag",
+        "cfg_key=value",
+        "-target_pointer_width=64",
+        "target_pointer_width=32",
+        "test",
+    ))
+    codeql.database.create(extractor_option=f"cargo_cfg_overrides={overrides}")
diff --git a/rust/ql/integration-tests/options/features/Cargo.toml b/rust/ql/integration-tests/options/features/Cargo.toml
new file mode 100644
index 00000000000..7faf9f167be
--- /dev/null
+++ b/rust/ql/integration-tests/options/features/Cargo.toml
@@ -0,0 +1,9 @@
+[workspace]
+[package]
+name = "features"
+version = "0.1.0"
+edition = "2021"
+
+[features]
+foo = []
+bar = []
diff --git a/rust/ql/integration-tests/options/features/functions.all.expected b/rust/ql/integration-tests/options/features/functions.all.expected
new file mode 100644
index 00000000000..5ce4cae2ab0
--- /dev/null
+++ b/rust/ql/integration-tests/options/features/functions.all.expected
@@ -0,0 +1,3 @@
+| src/lib.rs:1:1:2:11 | foo |
+| src/lib.rs:4:1:5:11 | bar |
+| src/lib.rs:7:1:7:14 | always |
diff --git a/rust/ql/integration-tests/options/features/functions.bar.expected b/rust/ql/integration-tests/options/features/functions.bar.expected
new file mode 100644
index 00000000000..cad441d6749
--- /dev/null
+++ b/rust/ql/integration-tests/options/features/functions.bar.expected
@@ -0,0 +1,2 @@
+| src/lib.rs:4:1:5:11 | bar |
+| src/lib.rs:7:1:7:14 | always |
diff --git a/rust/ql/integration-tests/options/features/functions.expected b/rust/ql/integration-tests/options/features/functions.expected
new file mode 100644
index 00000000000..523c2187688
--- /dev/null
+++ b/rust/ql/integration-tests/options/features/functions.expected
@@ -0,0 +1 @@
+| src/lib.rs:7:1:7:14 | always |
diff --git a/rust/ql/integration-tests/options/features/functions.foo.expected b/rust/ql/integration-tests/options/features/functions.foo.expected
new file mode 100644
index 00000000000..b7875423083
--- /dev/null
+++ b/rust/ql/integration-tests/options/features/functions.foo.expected
@@ -0,0 +1,2 @@
+| src/lib.rs:1:1:2:11 | foo |
+| src/lib.rs:7:1:7:14 | always |
diff --git a/rust/ql/integration-tests/options/features/functions.ql b/rust/ql/integration-tests/options/features/functions.ql
new file mode 100644
index 00000000000..da7b22cf584
--- /dev/null
+++ b/rust/ql/integration-tests/options/features/functions.ql
@@ -0,0 +1,5 @@
+import rust
+
+from Function f
+where f.hasExtendedCanonicalPath()
+select f
diff --git a/rust/ql/integration-tests/options/features/src/lib.rs b/rust/ql/integration-tests/options/features/src/lib.rs
new file mode 100644
index 00000000000..c1e97e05fd7
--- /dev/null
+++ b/rust/ql/integration-tests/options/features/src/lib.rs
@@ -0,0 +1,7 @@
+#[cfg(feature = "foo")]
+fn foo() {}
+
+#[cfg(feature = "bar")]
+fn bar() {}
+
+fn always() {}
diff --git a/rust/ql/integration-tests/options/features/test_features_option.py b/rust/ql/integration-tests/options/features/test_features_option.py
new file mode 100644
index 00000000000..75c5058be07
--- /dev/null
+++ b/rust/ql/integration-tests/options/features/test_features_option.py
@@ -0,0 +1,17 @@
+import pytest
+
+def test_default(codeql, rust):
+    codeql.database.create()
+
+@pytest.mark.parametrize("features",
+                         [
+                             pytest.param(p,
+                                          marks=pytest.mark.ql_test(expected=f".{e}.expected"))
+                             for p, e in (
+                                 ("foo", "foo"),
+                                 ("bar", "bar"),
+                                 ("*", "all"),
+                                 ("foo,bar", "all"))
+                         ])
+def test_features(codeql, rust, features):
+    codeql.database.create(extractor_option=f"cargo_features={features}")
diff --git a/rust/ql/integration-tests/options/target/Cargo.toml b/rust/ql/integration-tests/options/target/Cargo.toml
new file mode 100644
index 00000000000..90a82fb6a07
--- /dev/null
+++ b/rust/ql/integration-tests/options/target/Cargo.toml
@@ -0,0 +1,5 @@
+[workspace]
+[package]
+name = "target"
+version = "0.1.0"
+edition = "2021"
diff --git a/rust/ql/integration-tests/options/target/functions.Darwin.expected b/rust/ql/integration-tests/options/target/functions.Darwin.expected
new file mode 100644
index 00000000000..217974bb7c6
--- /dev/null
+++ b/rust/ql/integration-tests/options/target/functions.Darwin.expected
@@ -0,0 +1 @@
+| src/lib.rs:7:1:8:13 | macos |
diff --git a/rust/ql/integration-tests/options/target/functions.Linux.expected b/rust/ql/integration-tests/options/target/functions.Linux.expected
new file mode 100644
index 00000000000..57662579f1f
--- /dev/null
+++ b/rust/ql/integration-tests/options/target/functions.Linux.expected
@@ -0,0 +1 @@
+| src/lib.rs:1:1:2:13 | linux |
diff --git a/rust/ql/integration-tests/options/target/functions.Windows.expected b/rust/ql/integration-tests/options/target/functions.Windows.expected
new file mode 100644
index 00000000000..8ae2d8c86cc
--- /dev/null
+++ b/rust/ql/integration-tests/options/target/functions.Windows.expected
@@ -0,0 +1 @@
+| src/lib.rs:4:1:5:15 | windows |
diff --git a/rust/ql/integration-tests/options/target/functions.ql b/rust/ql/integration-tests/options/target/functions.ql
new file mode 100644
index 00000000000..da7b22cf584
--- /dev/null
+++ b/rust/ql/integration-tests/options/target/functions.ql
@@ -0,0 +1,5 @@
+import rust
+
+from Function f
+where f.hasExtendedCanonicalPath()
+select f
diff --git a/rust/ql/integration-tests/options/target/src/lib.rs b/rust/ql/integration-tests/options/target/src/lib.rs
new file mode 100644
index 00000000000..fc9ebcbb616
--- /dev/null
+++ b/rust/ql/integration-tests/options/target/src/lib.rs
@@ -0,0 +1,8 @@
+#[cfg(target_os = "linux")]
+fn linux() {}
+
+#[cfg(target_os = "windows")]
+fn windows() {}
+
+#[cfg(target_os = "macos")]
+fn macos() {}
diff --git a/rust/ql/integration-tests/options/target/test_target_option.py b/rust/ql/integration-tests/options/target/test_target_option.py
new file mode 100644
index 00000000000..3cb1db7513d
--- /dev/null
+++ b/rust/ql/integration-tests/options/target/test_target_option.py
@@ -0,0 +1,19 @@
+import pytest
+import platform
+
+
+@pytest.mark.ql_test(expected=f".{platform.system()}.expected")
+def test_default(codeql, rust):
+    codeql.database.create()
+
+@pytest.mark.ql_test(expected=".Windows.expected")
+def test_target_windows(codeql, rust):
+    codeql.database.create(extractor_option="cargo_target=x86_64-pc-windows-msvc")
+
+@pytest.mark.ql_test(expected=".Darwin.expected")
+def test_target_macos(codeql, rust):
+    codeql.database.create(extractor_option="cargo_target=aarch64-apple-darwin")
+
+@pytest.mark.ql_test(expected=".Linux.expected")
+def test_target_linux(codeql, rust):
+    codeql.database.create(extractor_option="cargo_target=x86_64-unknown-linux-gnu")
diff --git a/rust/ql/integration-tests/qlpack.lock.yml b/rust/ql/integration-tests/qlpack.lock.yml
new file mode 100644
index 00000000000..06dd07fc7dc
--- /dev/null
+++ b/rust/ql/integration-tests/qlpack.lock.yml
@@ -0,0 +1,4 @@
+---
+dependencies: {}
+compiled: false
+lockVersion: 1.0.0
diff --git a/rust/ql/integration-tests/qlpack.yml b/rust/ql/integration-tests/qlpack.yml
new file mode 100644
index 00000000000..e81e4c646c3
--- /dev/null
+++ b/rust/ql/integration-tests/qlpack.yml
@@ -0,0 +1,8 @@
+name: codeql/rust-integration-tests
+groups: [rust, test]
+dependencies:
+  codeql/rust-queries: ${workspace}
+  codeql/rust-all: ${workspace}
+extractor: rust
+tests: .
+warnOnImplicitThis: true
diff --git a/rust/ql/integration-tests/qltest/dependencies/functions.expected b/rust/ql/integration-tests/qltest/dependencies/functions.expected
new file mode 100644
index 00000000000..c062595f923
--- /dev/null
+++ b/rust/ql/integration-tests/qltest/dependencies/functions.expected
@@ -0,0 +1 @@
+| test.rs:4:1:7:1 | foo |
diff --git a/rust/ql/integration-tests/qltest/dependencies/functions.ql b/rust/ql/integration-tests/qltest/dependencies/functions.ql
new file mode 100644
index 00000000000..8d9a3213dad
--- /dev/null
+++ b/rust/ql/integration-tests/qltest/dependencies/functions.ql
@@ -0,0 +1,5 @@
+import rust
+
+from Function f
+where exists(f.getLocation().getFile().getRelativePath())
+select f
diff --git a/rust/ql/integration-tests/qltest/dependencies/options.yml b/rust/ql/integration-tests/qltest/dependencies/options.yml
new file mode 100644
index 00000000000..a628d3ca8b1
--- /dev/null
+++ b/rust/ql/integration-tests/qltest/dependencies/options.yml
@@ -0,0 +1,4 @@
+qltest_cargo_check: true
+qltest_dependencies:
+    - anyhow = "1.0.86"
+    - log = "0.4.22"
diff --git a/rust/ql/integration-tests/qltest/dependencies/test.rs b/rust/ql/integration-tests/qltest/dependencies/test.rs
new file mode 100644
index 00000000000..3b591ff9f65
--- /dev/null
+++ b/rust/ql/integration-tests/qltest/dependencies/test.rs
@@ -0,0 +1,7 @@
+use anyhow;
+use log::info;
+
+fn foo() -> anyhow::Result<()> {
+    info!("logging works");
+    Ok(())
+}
diff --git a/rust/ql/integration-tests/qltest/failing_cargo_check/does_not_compile.rs b/rust/ql/integration-tests/qltest/failing_cargo_check/does_not_compile.rs
new file mode 100644
index 00000000000..f6b56de2047
--- /dev/null
+++ b/rust/ql/integration-tests/qltest/failing_cargo_check/does_not_compile.rs
@@ -0,0 +1,5 @@
+fn foo() {
+    wat
+    is
+    this?
+}
diff --git a/rust/ql/integration-tests/qltest/failing_cargo_check/functions.ql b/rust/ql/integration-tests/qltest/failing_cargo_check/functions.ql
new file mode 100644
index 00000000000..8d9a3213dad
--- /dev/null
+++ b/rust/ql/integration-tests/qltest/failing_cargo_check/functions.ql
@@ -0,0 +1,5 @@
+import rust
+
+from Function f
+where exists(f.getLocation().getFile().getRelativePath())
+select f
diff --git a/rust/ql/integration-tests/qltest/failing_cargo_check/options.yml b/rust/ql/integration-tests/qltest/failing_cargo_check/options.yml
new file mode 100644
index 00000000000..c7a0beabb53
--- /dev/null
+++ b/rust/ql/integration-tests/qltest/failing_cargo_check/options.yml
@@ -0,0 +1 @@
+qltest_cargo_check: true
diff --git a/rust/ql/integration-tests/qltest/lib/functions.expected b/rust/ql/integration-tests/qltest/lib/functions.expected
new file mode 100644
index 00000000000..613d53954dc
--- /dev/null
+++ b/rust/ql/integration-tests/qltest/lib/functions.expected
@@ -0,0 +1 @@
+| test.rs:1:1:1:11 | foo |
diff --git a/rust/ql/integration-tests/qltest/lib/functions.ql b/rust/ql/integration-tests/qltest/lib/functions.ql
new file mode 100644
index 00000000000..8d9a3213dad
--- /dev/null
+++ b/rust/ql/integration-tests/qltest/lib/functions.ql
@@ -0,0 +1,5 @@
+import rust
+
+from Function f
+where exists(f.getLocation().getFile().getRelativePath())
+select f
diff --git a/rust/ql/integration-tests/qltest/lib/test.rs b/rust/ql/integration-tests/qltest/lib/test.rs
new file mode 100644
index 00000000000..8f3b7ef112a
--- /dev/null
+++ b/rust/ql/integration-tests/qltest/lib/test.rs
@@ -0,0 +1 @@
+fn foo() {}
diff --git a/rust/ql/integration-tests/qltest/main/functions.expected b/rust/ql/integration-tests/qltest/main/functions.expected
new file mode 100644
index 00000000000..9d363103419
--- /dev/null
+++ b/rust/ql/integration-tests/qltest/main/functions.expected
@@ -0,0 +1,2 @@
+| main.rs:1:1:1:12 | main |
+| test.rs:1:1:1:11 | foo |
diff --git a/rust/ql/integration-tests/qltest/main/functions.ql b/rust/ql/integration-tests/qltest/main/functions.ql
new file mode 100644
index 00000000000..8d9a3213dad
--- /dev/null
+++ b/rust/ql/integration-tests/qltest/main/functions.ql
@@ -0,0 +1,5 @@
+import rust
+
+from Function f
+where exists(f.getLocation().getFile().getRelativePath())
+select f
diff --git a/rust/ql/integration-tests/qltest/main/main.rs b/rust/ql/integration-tests/qltest/main/main.rs
new file mode 100644
index 00000000000..f328e4d9d04
--- /dev/null
+++ b/rust/ql/integration-tests/qltest/main/main.rs
@@ -0,0 +1 @@
+fn main() {}
diff --git a/rust/ql/integration-tests/qltest/main/test.rs b/rust/ql/integration-tests/qltest/main/test.rs
new file mode 100644
index 00000000000..8f3b7ef112a
--- /dev/null
+++ b/rust/ql/integration-tests/qltest/main/test.rs
@@ -0,0 +1 @@
+fn foo() {}
diff --git a/rust/ql/integration-tests/qltest/qlpack.yml b/rust/ql/integration-tests/qltest/qlpack.yml
new file mode 100644
index 00000000000..cf265260e0d
--- /dev/null
+++ b/rust/ql/integration-tests/qltest/qlpack.yml
@@ -0,0 +1,5 @@
+dependencies:
+  codeql/rust-queries: '*'
+  codeql/rust-all: '*'
+extractor: rust
+warnOnImplicitThis: true
diff --git a/rust/ql/integration-tests/qltest/test.py b/rust/ql/integration-tests/qltest/test.py
new file mode 100644
index 00000000000..e488dee2571
--- /dev/null
+++ b/rust/ql/integration-tests/qltest/test.py
@@ -0,0 +1,24 @@
+import runs_on
+import pytest
+
+# these tests are meant to exercise QL test running on multiple platforms
+# therefore they don't rely on integration test built-in QL test running
+# (which skips `qltest.{sh,cmd}`)
+
+@pytest.fixture(autouse=True)
+def default_options(codeql):
+    codeql.flags.update(
+        threads = 1,
+        show_extractor_output = True,
+        check_databases = False,
+    )
+
+@pytest.mark.parametrize("dir", ["lib", "main", "dependencies"])
+def test(codeql, rust, dir):
+    codeql.test.run(dir)
+
+def test_failing_cargo_check(codeql, rust):
+    out = codeql.test.run("failing_cargo_check", _assert_failure=True, _capture="stderr")
+    # TODO: QL test output redirection is currently broken on windows, leaving it up for follow-up work
+    if not runs_on.windows:
+        assert "requested cargo check failed" in out
diff --git a/rust/ql/lib/codeql/Locations.qll b/rust/ql/lib/codeql/Locations.qll
index 148c6b01f2d..c0841620a06 100644
--- a/rust/ql/lib/codeql/Locations.qll
+++ b/rust/ql/lib/codeql/Locations.qll
@@ -1,68 +1,8 @@
 /** Provides classes for working with locations. */
 
 import files.FileSystem
+private import codeql.rust.elements.internal.LocationImpl
 
-/**
- * A location as given by a file, a start line, a start column,
- * an end line, and an end column.
- *
- * For more information about locations see [Locations](https://codeql.github.com/docs/writing-codeql-queries/providing-locations-in-codeql-queries/).
- */
-class Location extends @location_default {
-  /** Gets the file for this location. */
-  File getFile() { locations_default(this, result, _, _, _, _) }
+final class Location = LocationImpl::Location;
 
-  /** Gets the 1-based line number (inclusive) where this location starts. */
-  int getStartLine() { locations_default(this, _, result, _, _, _) }
-
-  /** Gets the 1-based column number (inclusive) where this location starts. */
-  int getStartColumn() { locations_default(this, _, _, result, _, _) }
-
-  /** Gets the 1-based line number (inclusive) where this location ends. */
-  int getEndLine() { locations_default(this, _, _, _, result, _) }
-
-  /** Gets the 1-based column number (inclusive) where this location ends. */
-  int getEndColumn() { locations_default(this, _, _, _, _, result) }
-
-  /** Gets the number of lines covered by this location. */
-  int getNumLines() { result = this.getEndLine() - this.getStartLine() + 1 }
-
-  /** Gets a textual representation of this element. */
-  bindingset[this]
-  pragma[inline_late]
-  string toString() {
-    exists(string filepath, int startline, int startcolumn, int endline, int endcolumn |
-      this.hasLocationInfo(filepath, startline, startcolumn, endline, endcolumn) and
-      result = filepath + "@" + startline + ":" + startcolumn + ":" + endline + ":" + endcolumn
-    )
-  }
-
-  /**
-   * Holds if this element is at the specified location.
-   * The location spans column `startcolumn` of line `startline` to
-   * column `endcolumn` of line `endline` in file `filepath`.
-   * For more information, see
-   * [Providing locations in CodeQL queries](https://codeql.github.com/docs/writing-codeql-queries/providing-locations-in-codeql-queries/).
-   */
-  predicate hasLocationInfo(
-    string filepath, int startline, int startcolumn, int endline, int endcolumn
-  ) {
-    exists(File f |
-      locations_default(this, f, startline, startcolumn, endline, endcolumn) and
-      filepath = f.getAbsolutePath()
-    )
-  }
-
-  /** Holds if this location starts strictly before the specified location. */
-  pragma[inline]
-  predicate strictlyBefore(Location other) {
-    this.getStartLine() < other.getStartLine()
-    or
-    this.getStartLine() = other.getStartLine() and this.getStartColumn() < other.getStartColumn()
-  }
-}
-
-/** An entity representing an empty location. */
-class EmptyLocation extends Location {
-  EmptyLocation() { empty_location(this) }
-}
+final class EmptyLocation = LocationImpl::EmptyLocation;
diff --git a/rust/ql/lib/codeql/files/FileSystem.qll b/rust/ql/lib/codeql/files/FileSystem.qll
index 5588d2ecc7e..7136dcc3b5a 100644
--- a/rust/ql/lib/codeql/files/FileSystem.qll
+++ b/rust/ql/lib/codeql/files/FileSystem.qll
@@ -2,6 +2,10 @@
 
 private import codeql.Locations
 private import codeql.util.FileSystem
+private import codeql.rust.elements.SourceFile
+private import codeql.rust.elements.AstNode
+private import codeql.rust.elements.Comment
+private import codeql.rust.Diagnostics
 
 private module Input implements InputSig {
   abstract class ContainerBase extends @container {
@@ -41,11 +45,32 @@ class File extends Container, Impl::File {
   int getNumberOfLinesOfCode() {
     result =
       count(int line |
-        exists(Location loc |
-          loc.getFile() = this and
-          line = [loc.getStartLine(), loc.getEndLine()] and
+        exists(AstNode node, Location loc |
+          not node instanceof Comment and
+          not node instanceof SourceFile and
+          loc = node.getLocation()
+        |
+          node.getFile() = this and
+          line = [/*loc.getStartLine(), */ loc.getEndLine()] and // ignore start locations for now as we're getting them wrong for things with a comment attached
           not loc instanceof EmptyLocation
         )
       )
   }
 }
+
+/**
+ * A successfully extracted file, that is, a file that was extracted and
+ * contains no extraction errors or warnings.
+ */
+class SuccessfullyExtractedFile extends File {
+  SuccessfullyExtractedFile() {
+    not exists(Diagnostic d |
+      d.getLocation().getFile() = this and
+      (
+        d instanceof ExtractionError
+        or
+        d instanceof ExtractionWarning
+      )
+    )
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/AstConsistency.qll b/rust/ql/lib/codeql/rust/AstConsistency.qll
new file mode 100644
index 00000000000..dbb7f7216d7
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/AstConsistency.qll
@@ -0,0 +1,63 @@
+/**
+ * Provides classes for recognizing control flow graph inconsistencies.
+ */
+
+private import rust
+private import codeql.rust.elements.internal.generated.ParentChild
+
+private predicate multipleToStrings(Element e) { strictcount(e.toString()) > 1 }
+
+/**
+ * Holds if `e` has more than one `toString()` result.
+ */
+query predicate multipleToStrings(Element e, string s) {
+  multipleToStrings(e) and
+  s = strictconcat(e.toString(), ", ")
+}
+
+/**
+ * Holds if `e` has more than one `Location`.
+ */
+query predicate multipleLocations(Locatable e) { strictcount(e.getLocation()) > 1 }
+
+private predicate multiplePrimaryQlClasses(Element e) {
+  strictcount(string cls | cls = e.getAPrimaryQlClass() and cls != "VariableAccess") > 1
+}
+
+/**
+ * Holds if `e` has more than one `getPrimaryQlClasses()` result.
+ */
+query predicate multiplePrimaryQlClasses(Element e, string s) {
+  multiplePrimaryQlClasses(e) and
+  s = strictconcat(e.getPrimaryQlClasses(), ", ")
+}
+
+private Element getParent(Element child) { child = getChildAndAccessor(result, _, _) }
+
+private predicate multipleParents(Element child) { strictcount(getParent(child)) > 1 }
+
+/**
+ * Holds if `child` has more than one AST parent.
+ */
+query predicate multipleParents(Element child, Element parent) {
+  multipleParents(child) and
+  parent = getParent(child)
+}
+
+/**
+ * Gets counts of abstract syntax tree inconsistencies of each type.
+ */
+int getAstInconsistencyCounts(string type) {
+  // total results from all the AST consistency query predicates.
+  type = "Multiple toStrings" and
+  result = count(Element e | multipleToStrings(e) | e)
+  or
+  type = "Multiple locations" and
+  result = count(Element e | multipleLocations(e) | e)
+  or
+  type = "Multiple primary QL classes" and
+  result = count(Element e | multiplePrimaryQlClasses(e) | e)
+  or
+  type = "Multiple parents" and
+  result = count(Element e | multipleParents(e) | e)
+}
diff --git a/rust/ql/lib/codeql/rust/Diagnostics.qll b/rust/ql/lib/codeql/rust/Diagnostics.qll
new file mode 100644
index 00000000000..f0eeed219c3
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/Diagnostics.qll
@@ -0,0 +1,61 @@
+/** Provides classes relating to extraction diagnostics. */
+
+private import codeql.Locations
+private import codeql.rust.elements.internal.LocationImpl
+
+/** A diagnostic emitted during extraction, such as a parse error */
+class Diagnostic extends @diagnostic {
+  int severity;
+  string tag;
+  string message;
+  string fullMessage;
+  Location location;
+
+  Diagnostic() {
+    exists(@location_default loc |
+      diagnostics(this, severity, tag, message, fullMessage, loc) and
+      location = LocationImpl::TLocationDefault(loc)
+    )
+  }
+
+  /**
+   * Gets the numerical severity level associated with this diagnostic.
+   */
+  int getSeverity() { result = severity }
+
+  /** Gets a string representation of the severity of this diagnostic. */
+  string getSeverityText() {
+    severity = 10 and result = "Debug"
+    or
+    severity = 20 and result = "Info"
+    or
+    severity = 30 and result = "Warning"
+    or
+    severity = 40 and result = "Error"
+  }
+
+  /** Gets the error code associated with this diagnostic, e.g. parse_error. */
+  string getTag() { result = tag }
+
+  /**
+   * Gets the error message text associated with this diagnostic.
+   */
+  string getMessage() { result = message }
+
+  /**
+   * Gets the full error message text associated with this diagnostic.
+   */
+  string getFullMessage() { result = fullMessage }
+
+  /** Gets the source location of this diagnostic. */
+  Location getLocation() { result = location }
+
+  /** Gets a textual representation of this diagnostic. */
+  string toString() { result = this.getMessage() }
+}
+
+/** A diagnostic that is error severity. */
+class ExtractionError extends Diagnostic, @diagnostic_error { }
+
+/** A diagnostic that is warning severity. */
+class ExtractionWarning extends Diagnostic, @diagnostic_warning { }
diff --git a/rust/ql/lib/codeql/rust/controlflow/BasicBlocks.qll b/rust/ql/lib/codeql/rust/controlflow/BasicBlocks.qll
index 60f5b4db5af..f87a48a28a5 100644
--- a/rust/ql/lib/codeql/rust/controlflow/BasicBlocks.qll
+++ b/rust/ql/lib/codeql/rust/controlflow/BasicBlocks.qll
@@ -12,7 +12,7 @@ final class BasicBlock = BasicBlockImpl;
  * without branches or joins.
  */
 private class BasicBlockImpl extends TBasicBlockStart {
-  /** Gets the scope of this basic block. */
+  /** Gets the CFG scope of this basic block. */
   CfgScope getScope() { result = this.getAPredecessor().getScope() }
 
   /** Gets an immediate successor of this basic block, if any. */
diff --git a/rust/ql/lib/codeql/rust/controlflow/CfgNodes.qll b/rust/ql/lib/codeql/rust/controlflow/CfgNodes.qll
new file mode 100644
index 00000000000..4a51506dbc0
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/controlflow/CfgNodes.qll
@@ -0,0 +1,60 @@
+/**
+ * Provides subclasses of `CfgNode` that represents different types of nodes in
+ * the control flow graph.
+ */
+
+private import rust
+private import ControlFlowGraph
+private import internal.ControlFlowGraphImpl
+
+/** A CFG node that corresponds to an element in the AST. */
+class AstCfgNode extends CfgNode {
+  AstNode node;
+
+  AstCfgNode() { node = this.getAstNode() }
+
+  /** Gets the underlying ast node. */
+  AstNode getAstNode() { result = node }
+}
+
+/** A CFG node that corresponds to a parameter in the AST. */
+class ParamCfgNode extends AstCfgNode {
+  override Param node;
+
+  /** Gets the underlying parameter. */
+  Param getParam() { result = node }
+}
+
+/** A CFG node that corresponds to a parameter in the AST. */
+class PatCfgNode extends AstCfgNode {
+  override Pat node;
+
+  /** Gets the underlying pattern. */
+  Pat getPat() { result = node }
+}
+
+/** A CFG node that corresponds to an expression in the AST. */
+class ExprCfgNode extends AstCfgNode {
+  override Expr node;
+
+  /** Gets the underlying expression. */
+  Expr getExpr() { result = node }
+}
+
+/** A CFG node that corresponds to a call in the AST. */
+class CallExprCfgNode extends ExprCfgNode {
+  override CallExpr node;
+
+  /** Gets the underlying `CallExpr`. */
+  CallExpr getCallExpr() { result = node }
+}
+
+/** A CFG node that corresponds to a call in the AST. */
+class MethodCallExprCfgNode extends ExprCfgNode {
+  override MethodCallExpr node;
+
+  /** Gets the underlying `MethodCallExpr`. */
+  MethodCallExpr getMethodCallExpr() { result = node }
+}
+
+final class ExitCfgNode = ExitNode;
diff --git a/rust/ql/lib/codeql/rust/controlflow/ControlFlowGraph.qll b/rust/ql/lib/codeql/rust/controlflow/ControlFlowGraph.qll
index e8e6e5f98c9..20f1af4a4af 100644
--- a/rust/ql/lib/codeql/rust/controlflow/ControlFlowGraph.qll
+++ b/rust/ql/lib/codeql/rust/controlflow/ControlFlowGraph.qll
@@ -9,6 +9,22 @@ private import BasicBlocks
 
 final class CfgScope = Scope::CfgScope;
 
+final class SuccessorType = SuccessorTypeImpl;
+
+final class NormalSuccessor = NormalSuccessorImpl;
+
+final class ConditionalSuccessor = ConditionalSuccessorImpl;
+
+final class BooleanSuccessor = BooleanSuccessorImpl;
+
+final class MatchSuccessor = MatchSuccessorImpl;
+
+final class BreakSuccessor = BreakSuccessorImpl;
+
+final class ContinueSuccessor = ContinueSuccessorImpl;
+
+final class ReturnSuccessor = ReturnSuccessorImpl;
+
 /**
  * A control flow node.
  *
diff --git a/rust/ql/lib/codeql/rust/controlflow/internal/CfgConsistency.qll b/rust/ql/lib/codeql/rust/controlflow/internal/CfgConsistency.qll
new file mode 100644
index 00000000000..2722661494d
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/controlflow/internal/CfgConsistency.qll
@@ -0,0 +1,102 @@
+/**
+ * Provides classes for recognizing control flow graph inconsistencies.
+ */
+
+private import rust
+private import codeql.rust.controlflow.internal.ControlFlowGraphImpl::Consistency as Consistency
+import Consistency
+private import codeql.rust.controlflow.ControlFlowGraph
+private import codeql.rust.controlflow.internal.ControlFlowGraphImpl as CfgImpl
+private import codeql.rust.controlflow.internal.Completion
+
+private predicate nonPostOrderExpr(Expr e) {
+  not e instanceof LetExpr and
+  not e instanceof ParenExpr and
+  exists(AstNode last, Completion c |
+    CfgImpl::last(e, last, c) and
+    last != e and
+    c instanceof NormalCompletion
+  )
+}
+
+/**
+ * All `Expr` nodes are `PostOrderTree`s
+ */
+query predicate nonPostOrderExpr(Expr e, string cls) {
+  nonPostOrderExpr(e) and
+  cls = e.getPrimaryQlClasses()
+}
+
+/**
+ * Holds if CFG scope `scope` lacks an initial AST node.  Overrides shared consistency predicate.
+ */
+query predicate scopeNoFirst(CfgScope scope) {
+  Consistency::scopeNoFirst(scope) and
+  not scope =
+    [
+      any(AstNode f | not f.(Function).hasBody()),
+      any(ClosureExpr c | not c.hasBody()),
+      any(AsyncBlockExpr b | not b.hasStmtList())
+    ]
+}
+
+/** Holds if  `be` is the `else` branch of a `let` statement that results in a panic. */
+private predicate letElsePanic(BlockExpr be) {
+  be = any(LetStmt let).getLetElse().getBlockExpr() and
+  exists(Completion c | CfgImpl::last(be, _, c) | completionIsNormal(c))
+}
+
+/**
+ * Holds if `node` is lacking a successor. Overrides shared consistency predicate.
+ */
+query predicate deadEnd(CfgImpl::Node node) {
+  Consistency::deadEnd(node) and
+  not letElsePanic(node.getAstNode())
+}
+
+/**
+ * Gets counts of control flow graph inconsistencies of each type.
+ */
+int getCfgInconsistencyCounts(string type) {
+  // total results from all the CFG consistency query predicates in:
+  //  - `codeql.rust.controlflow.internal.CfgConsistency` (this file)
+  //  - `shared.controlflow.codeql.controlflow.Cfg`
+  type = "Non-unique set representation" and
+  result = count(CfgImpl::Splits ss | nonUniqueSetRepresentation(ss, _) | ss)
+  or
+  type = "Splitting invariant 2" and
+  result = count(AstNode n | breakInvariant2(n, _, _, _, _, _) | n)
+  or
+  type = "Splitting invariant 3" and
+  result = count(AstNode n | breakInvariant3(n, _, _, _, _, _) | n)
+  or
+  type = "Splitting invariant 4" and
+  result = count(AstNode n | breakInvariant4(n, _, _, _, _, _) | n)
+  or
+  type = "Splitting invariant 5" and
+  result = count(AstNode n | breakInvariant5(n, _, _, _, _, _) | n)
+  or
+  type = "Multiple successors of the same type" and
+  result = count(CfgNode n | multipleSuccessors(n, _, _) | n)
+  or
+  type = "Simple and normal successors" and
+  result = count(CfgNode n | simpleAndNormalSuccessors(n, _, _, _, _) | n)
+  or
+  type = "Dead end" and
+  result = count(CfgNode n | deadEnd(n) | n)
+  or
+  type = "Non-unique split kind" and
+  result = count(CfgImpl::SplitImpl si | nonUniqueSplitKind(si, _) | si)
+  or
+  type = "Non-unique list order" and
+  result = count(CfgImpl::SplitKind sk | nonUniqueListOrder(sk, _) | sk)
+  or
+  type = "Multiple toStrings" and
+  result = count(CfgNode n | multipleToString(n) | n)
+  or
+  type = "CFG scope lacks initial AST node" and
+  result = count(CfgScope s | scopeNoFirst(s) | s)
+  or
+  type = "Non-PostOrderTree Expr node" and
+  result = count(Expr e | nonPostOrderExpr(e) | e)
+}
diff --git a/rust/ql/lib/codeql/rust/controlflow/internal/Completion.qll b/rust/ql/lib/codeql/rust/controlflow/internal/Completion.qll
index 088866f7ea9..55bd269087d 100644
--- a/rust/ql/lib/codeql/rust/controlflow/internal/Completion.qll
+++ b/rust/ql/lib/codeql/rust/controlflow/internal/Completion.qll
@@ -3,9 +3,12 @@ private import codeql.rust.controlflow.ControlFlowGraph
 private import rust
 private import SuccessorType
 
-private newtype TCompletion =
+newtype TCompletion =
   TSimpleCompletion() or
   TBooleanCompletion(Boolean b) or
+  TMatchCompletion(Boolean isMatch) or
+  TBreakCompletion() or
+  TContinueCompletion() or
   TReturnCompletion()
 
 /** A completion of a statement or an expression. */
@@ -51,10 +54,19 @@ abstract class ConditionalCompletion extends NormalCompletion {
   /** Gets the Boolean value of this conditional completion. */
   final boolean getValue() { result = value }
 
+  final predicate succeeded() { value = true }
+
+  final predicate failed() { value = false }
+
   /** Gets the dual completion. */
   abstract ConditionalCompletion getDual();
 }
 
+/** Holds if node `le` has the constant Boolean value `value`. */
+private predicate isBooleanConstant(LiteralExpr le, Boolean value) {
+  le.getTextValue() = value.toString()
+}
+
 /**
  * A completion that represents evaluation of an expression
  * with a Boolean value.
@@ -62,7 +74,40 @@ abstract class ConditionalCompletion extends NormalCompletion {
 class BooleanCompletion extends ConditionalCompletion, TBooleanCompletion {
   BooleanCompletion() { this = TBooleanCompletion(value) }
 
-  override predicate isValidForSpecific(AstNode e) { e = any(IfExpr c).getCondition() }
+  private predicate isValidForSpecific0(AstNode e) {
+    e = any(IfExpr c).getCondition()
+    or
+    e = any(WhileExpr c).getCondition()
+    or
+    any(MatchGuard guard).getCondition() = e
+    or
+    e = any(BinaryLogicalOperation blo).getLhs()
+    or
+    exists(Expr parent | this.isValidForSpecific0(parent) |
+      e = parent.(ParenExpr).getExpr()
+      or
+      e = parent.(LogicalNotExpr).getExpr()
+      or
+      e = parent.(BinaryLogicalOperation).getRhs()
+      or
+      parent = any(IfExpr ie | e = [ie.getThen(), ie.getElse()])
+      or
+      e = parent.(MatchExpr).getAnArm().getExpr()
+      or
+      e = parent.(BlockExpr).getStmtList().getTailExpr()
+      or
+      e = any(BreakExpr be | be.getTarget() = parent).getExpr()
+    )
+  }
+
+  override predicate isValidForSpecific(AstNode e) {
+    this.isValidForSpecific0(e) and
+    (
+      isBooleanConstant(e, value)
+      or
+      not isBooleanConstant(e, _)
+    )
+  }
 
   /** Gets the dual Boolean completion. */
   override BooleanCompletion getDual() { result = TBooleanCompletion(value.booleanNot()) }
@@ -72,13 +117,103 @@ class BooleanCompletion extends ConditionalCompletion, TBooleanCompletion {
   override string toString() { result = "boolean(" + value + ")" }
 }
 
+/** Holds if `pat` is guaranteed to match at the point in the AST where it occurs. */
+pragma[nomagic]
+private predicate isExhaustiveMatch(Pat pat) {
+  (
+    pat instanceof WildcardPat
+    or
+    pat = any(IdentPat ip | not ip.hasPat() and ip = any(Variable v).getPat())
+    or
+    pat instanceof RestPat
+    or
+    // `let` statements without an `else` branch must be exhaustive
+    pat = any(LetStmt let | not let.hasLetElse()).getPat()
+    or
+    // `match` expressions must be exhaustive, so last arm cannot fail
+    pat = any(MatchExpr me).getLastArm().getPat()
+    or
+    // macro invocations are exhaustive if their expansion is
+    pat = any(MacroPat mp | isExhaustiveMatch(mp.getMacroCall().getExpanded()))
+    or
+    // parameter patterns must be exhaustive
+    pat = any(Param p).getPat()
+  ) and
+  not pat = any(ForExpr for).getPat() // workaround until `for` loops are desugared
+  or
+  exists(Pat parent | isExhaustiveMatch(parent) |
+    pat = parent.(BoxPat).getPat()
+    or
+    pat = parent.(IdentPat).getPat()
+    or
+    pat = parent.(MacroPat).getMacroCall().getExpanded()
+    or
+    pat = parent.(ParenPat).getPat()
+    or
+    pat = parent.(RecordPat).getRecordPatFieldList().getField(_).getPat()
+    or
+    pat = parent.(RefPat).getPat()
+    or
+    pat = parent.(TuplePat).getAField()
+    or
+    pat = parent.(TupleStructPat).getAField()
+    or
+    pat = parent.(OrPat).getLastPat()
+  )
+}
+
+/**
+ * A completion that represents the result of a pattern match.
+ */
+class MatchCompletion extends TMatchCompletion, ConditionalCompletion {
+  MatchCompletion() { this = TMatchCompletion(value) }
+
+  override predicate isValidForSpecific(AstNode e) {
+    e instanceof Pat and
+    if isExhaustiveMatch(e) then value = true else any()
+    or
+    e instanceof TryExpr and value = true
+  }
+
+  override MatchSuccessor getAMatchingSuccessorType() { result.getValue() = value }
+
+  /** Gets the dual match completion. */
+  override MatchCompletion getDual() { result = TMatchCompletion(value.booleanNot()) }
+
+  override string toString() { result = "match(" + value + ")" }
+}
+
+/**
+ * A completion that represents a `break`.
+ */
+class BreakCompletion extends TBreakCompletion, Completion {
+  override BreakSuccessor getAMatchingSuccessorType() { any() }
+
+  override predicate isValidForSpecific(AstNode e) { e instanceof BreakExpr }
+
+  override string toString() { result = this.getAMatchingSuccessorType().toString() }
+}
+
+/**
+ * A completion that represents a `continue`.
+ */
+class ContinueCompletion extends TContinueCompletion, Completion {
+  override ContinueSuccessor getAMatchingSuccessorType() { any() }
+
+  override predicate isValidForSpecific(AstNode e) { e instanceof ContinueExpr }
+
+  override string toString() { result = this.getAMatchingSuccessorType().toString() }
+}
+
 /**
  * A completion that represents a return.
  */
 class ReturnCompletion extends TReturnCompletion, Completion {
   override ReturnSuccessor getAMatchingSuccessorType() { any() }
 
-  override predicate isValidForSpecific(AstNode e) { e instanceof ReturnExpr }
+  override predicate isValidForSpecific(AstNode e) {
+    e instanceof ReturnExpr or e instanceof TryExpr
+  }
 
   override string toString() { result = "return" }
 }
diff --git a/rust/ql/lib/codeql/rust/controlflow/internal/ControlFlowGraphImpl.qll b/rust/ql/lib/codeql/rust/controlflow/internal/ControlFlowGraphImpl.qll
index 5f49d717754..b331ddd2d54 100644
--- a/rust/ql/lib/codeql/rust/controlflow/internal/ControlFlowGraphImpl.qll
+++ b/rust/ql/lib/codeql/rust/controlflow/internal/ControlFlowGraphImpl.qll
@@ -1,14 +1,13 @@
 private import rust
 import codeql.controlflow.Cfg
 import Completion
-import codeql.controlflow.Cfg
-private import SuccessorType as ST
 private import Scope as Scope
+private import codeql.rust.controlflow.ControlFlowGraph as Cfg
 
-module CfgInput implements InputSig<Location> {
+private module CfgInput implements InputSig<Location> {
+  private import codeql.rust.internal.CachedStages
   private import rust as Rust
   private import Completion as C
-  private import Splitting as S
 
   class AstNode = Rust::AstNode;
 
@@ -23,13 +22,12 @@ module CfgInput implements InputSig<Location> {
   /** An AST node with an associated control-flow graph. */
   class CfgScope = Scope::CfgScope;
 
-  CfgScope getCfgScope(AstNode n) { result = Scope::scopeOfAst(n) }
+  CfgScope getCfgScope(AstNode n) {
+    result = n.getEnclosingCfgScope() and
+    Stages::CfgStage::ref()
+  }
 
-  class SplitKindBase = S::TSplitKind;
-
-  class Split = S::Split;
-
-  class SuccessorType = ST::SuccessorType;
+  class SuccessorType = Cfg::SuccessorType;
 
   /** Gets a successor type that matches completion `c`. */
   SuccessorType getAMatchingSuccessorType(Completion c) { result = c.getAMatchingSuccessorType() }
@@ -37,93 +35,707 @@ module CfgInput implements InputSig<Location> {
   /**
    * Hold if `c` represents simple (normal) evaluation of a statement or an expression.
    */
-  predicate successorTypeIsSimple(SuccessorType t) { t instanceof ST::NormalSuccessor }
+  predicate successorTypeIsSimple(SuccessorType t) { t instanceof Cfg::NormalSuccessor }
 
   /** Holds if `t` is an abnormal exit type out of a CFG scope. */
   predicate isAbnormalExitType(SuccessorType t) { none() }
 
   /** Hold if `t` represents a conditional successor type. */
-  predicate successorTypeIsCondition(SuccessorType t) { t instanceof ST::BooleanSuccessor }
-
-  /** Gets the maximum number of splits allowed for a given node. */
-  int maxSplits() { result = 0 }
+  predicate successorTypeIsCondition(SuccessorType t) { t instanceof Cfg::BooleanSuccessor }
 
   /** Holds if `first` is first executed when entering `scope`. */
-  predicate scopeFirst(CfgScope scope, AstNode first) {
-    scope.(CfgImpl::ControlFlowTree).first(first)
-  }
+  predicate scopeFirst(CfgScope scope, AstNode first) { scope.scopeFirst(first) }
 
   /** Holds if `scope` is exited when `last` finishes with completion `c`. */
-  predicate scopeLast(CfgScope scope, AstNode last, Completion c) {
-    scope.(CfgImpl::ControlFlowTree).last(last, c)
-  }
+  predicate scopeLast(CfgScope scope, AstNode last, Completion c) { scope.scopeLast(last, c) }
 }
 
-module CfgImpl = Make<Location, CfgInput>;
+private module CfgSplittingInput implements SplittingInputSig<Location, CfgInput> {
+  private import Splitting as S
+
+  class SplitKindBase = S::TSplitKind;
+
+  class Split = S::Split;
+}
+
+private module ConditionalCompletionSplittingInput implements
+  ConditionalCompletionSplittingInputSig<Location, CfgInput, CfgSplittingInput>
+{
+  import Splitting::ConditionalCompletionSplitting::ConditionalCompletionSplittingInput
+}
+
+private module CfgImpl =
+  MakeWithSplitting<Location, CfgInput, CfgSplittingInput, ConditionalCompletionSplittingInput>;
 
 import CfgImpl
 
-class FunctionTree extends StandardPostOrderTree instanceof Function {
-  override ControlFlowTree getChildNode(int i) { i = 0 and result = super.getBody() }
-}
+class CallableScopeTree extends StandardTree, PreOrderTree, PostOrderTree, Scope::CallableScope {
+  override predicate propagatesAbnormal(AstNode child) { none() }
 
-class BlockExprTree extends StandardPostOrderTree instanceof BlockExpr {
-  override ControlFlowTree getChildNode(int i) {
-    result = super.getStatement(i)
+  override AstNode getChildNode(int i) {
+    result = this.getParamList().getParam(i)
     or
-    not exists(super.getStatement(i)) and
-    (exists(super.getStatement(i - 1)) or i = 0) and
-    result = super.getTail()
+    i = this.getParamList().getNumberOfParams() and
+    result = this.getBody()
   }
 }
 
-class CallExprTree extends StandardPostOrderTree instanceof CallExpr {
-  override ControlFlowTree getChildNode(int i) { result = super.getArg(i) }
+class ParamTree extends StandardPostOrderTree, Param {
+  override AstNode getChildNode(int i) { i = 0 and result = this.getPat() }
 }
 
-class BinaryOpExprTree extends StandardPostOrderTree instanceof BinaryExpr {
-  override ControlFlowTree getChildNode(int i) {
-    i = 0 and result = super.getLhs()
-    or
-    i = 1 and result = super.getRhs()
+class ExprStmtTree extends StandardPreOrderTree instanceof ExprStmt {
+  override AstNode getChildNode(int i) { i = 0 and result = super.getExpr() }
+}
+
+class FormatTemplateVariableAccessTree extends LeafTree, FormatTemplateVariableAccess { }
+
+class ItemTree extends LeafTree, Item {
+  ItemTree() {
+    not this instanceof MacroCall and
+    this = [any(StmtList s).getAStatement(), any(MacroStmts s).getAStatement()]
   }
 }
 
-class IfExprTree extends PostOrderTree instanceof IfExpr {
-  override predicate first(AstNode node) { first(super.getCondition(), node) }
-
-  override predicate propagatesAbnormal(AstNode child) {
-    child = [super.getCondition(), super.getThen(), super.getElse()]
+class LetStmtTree extends PreOrderTree, LetStmt {
+  final override predicate propagatesAbnormal(AstNode child) {
+    child = [this.getInitializer(), this.getLetElse().getBlockExpr()]
   }
 
   override predicate succ(AstNode pred, AstNode succ, Completion c) {
-    // Edges from the condition to each branch
-    last(super.getCondition(), pred, c) and
-    (
-      first(super.getThen(), succ) and c.(BooleanCompletion).getValue() = true
-      or
-      first(super.getElse(), succ) and c.(BooleanCompletion).getValue() = false
-    )
+    // Edge to start of initializer.
+    pred = this and first(this.getInitializer(), succ) and completionIsSimple(c)
     or
-    // An edge from the then branch to the last node
-    last(super.getThen(), pred, c) and
-    succ = this and
-    completionIsNormal(c)
+    // Edge to pattern when there is no initializer.
+    pred = this and
+    first(this.getPat(), succ) and
+    completionIsSimple(c) and
+    not this.hasInitializer()
     or
-    // An edge from the else branch to the last node
-    last(super.getElse(), pred, c) and
-    succ = this and
-    completionIsNormal(c)
+    // Edge from end of initializer to pattern.
+    last(this.getInitializer(), pred, c) and first(this.getPat(), succ) and completionIsNormal(c)
+    or
+    // Edge from failed pattern to `else` branch.
+    last(this.getPat(), pred, c) and
+    first(this.getLetElse().getBlockExpr(), succ) and
+    c.(MatchCompletion).failed()
+  }
+
+  override predicate last(AstNode node, Completion c) {
+    // Edge out of a successfully matched pattern.
+    last(this.getPat(), node, c) and c.(MatchCompletion).succeeded()
+    // NOTE: No edge out of the `else` branch as that is guaranteed to diverge.
   }
 }
 
-class LetExprTree extends StandardPostOrderTree instanceof LetExpr {
-  override ControlFlowTree getChildNode(int i) { i = 0 and result = super.getExpr() }
+class MacroCallTree extends ControlFlowTree, MacroCall {
+  override predicate first(AstNode first) {
+    first(this.getExpanded(), first)
+    or
+    not exists(this.getExpanded()) and first = this
+  }
+
+  override predicate last(AstNode last, Completion c) {
+    last(this.getExpanded(), last, c)
+    or
+    not exists(this.getExpanded()) and
+    last = this and
+    completionIsValidFor(c, last)
+  }
+
+  override predicate succ(AstNode pred, AstNode succ, Completion c) { none() }
+
+  override predicate propagatesAbnormal(AstNode child) { child = this.getExpanded() }
 }
 
-class LiteralExprTree extends LeafTree instanceof LiteralExpr { }
+class MacroStmtsTree extends StandardPreOrderTree, MacroStmts {
+  override AstNode getChildNode(int i) {
+    result = this.getStatement(i)
+    or
+    i = this.getNumberOfStatements() and
+    result = this.getExpr()
+  }
+}
 
-class PathExprTree extends LeafTree instanceof PathExpr { }
+class MatchArmTree extends ControlFlowTree, MatchArm {
+  override predicate propagatesAbnormal(AstNode child) { child = this.getExpr() }
 
-// A leaf tree for unimplemented nodes in the AST.
-class UnimplementedTree extends LeafTree instanceof Unimplemented { }
+  override predicate first(AstNode node) { first(this.getPat(), node) }
+
+  override predicate succ(AstNode pred, AstNode succ, Completion c) {
+    // Edge from pattern to guard/arm if match succeeds.
+    last(this.getPat(), pred, c) and
+    c.(MatchCompletion).succeeded() and
+    (
+      first(this.getGuard().getCondition(), succ)
+      or
+      not this.hasGuard() and first(this.getExpr(), succ)
+    )
+    or
+    // Edge from guard to arm if the guard succeeds.
+    last(this.getGuard().getCondition(), pred, c) and
+    first(this.getExpr(), succ) and
+    c.(BooleanCompletion).succeeded()
+  }
+
+  override predicate last(AstNode node, Completion c) {
+    last(this.getPat(), node, c) and c.(MatchCompletion).failed()
+    or
+    last(this.getGuard().getCondition(), node, c) and c.(BooleanCompletion).failed()
+    or
+    last(this.getExpr(), node, c)
+  }
+}
+
+class NameTree extends LeafTree, Name { }
+
+class NameRefTree extends LeafTree, NameRef { }
+
+class TypeRefTree extends LeafTree instanceof TypeRef { }
+
+/**
+ * Provides `ControlFlowTree`s for expressions.
+ *
+ * Since expressions construct values, they are modeled in post-order, except for
+ * `LetExpr`s.
+ */
+module ExprTrees {
+  class ArrayExprTree extends StandardPostOrderTree, ArrayExpr {
+    override AstNode getChildNode(int i) { result = this.getExpr(i) }
+  }
+
+  class AsmExprTree extends LeafTree instanceof AsmExpr { }
+
+  class AwaitExprTree extends StandardPostOrderTree instanceof AwaitExpr {
+    override AstNode getChildNode(int i) { i = 0 and result = super.getExpr() }
+  }
+
+  // NOTE: `become` is a reserved but unused keyword.
+  class BecomeExprTree extends StandardPostOrderTree instanceof BecomeExpr {
+    override AstNode getChildNode(int i) { i = 0 and result = super.getExpr() }
+  }
+
+  class BinaryOpExprTree extends StandardPostOrderTree instanceof BinaryExpr {
+    BinaryOpExprTree() { not this instanceof BinaryLogicalOperation }
+
+    override AstNode getChildNode(int i) {
+      i = 0 and result = super.getLhs()
+      or
+      i = 1 and result = super.getRhs()
+    }
+  }
+
+  class LogicalOrExprTree extends PostOrderTree, LogicalOrExpr {
+    final override predicate propagatesAbnormal(AstNode child) { child = this.getAnOperand() }
+
+    override predicate first(AstNode node) { first(this.getLhs(), node) }
+
+    override predicate succ(AstNode pred, AstNode succ, Completion c) {
+      // Edge from lhs to rhs
+      last(this.getLhs(), pred, c) and
+      c.(BooleanCompletion).failed() and
+      first(this.getRhs(), succ)
+      or
+      // Edge from lhs to this
+      last(this.getLhs(), pred, c) and
+      c.(BooleanCompletion).succeeded() and
+      succ = this
+      or
+      // Edge from rhs to this
+      last(this.getRhs(), pred, c) and
+      succ = this and
+      completionIsNormal(c)
+    }
+  }
+
+  class LogicalAndExprTree extends PostOrderTree, LogicalAndExpr {
+    final override predicate propagatesAbnormal(AstNode child) { child = this.getAnOperand() }
+
+    override predicate first(AstNode node) { first(this.getLhs(), node) }
+
+    override predicate succ(AstNode pred, AstNode succ, Completion c) {
+      // Edge from lhs to rhs
+      last(this.getLhs(), pred, c) and
+      c.(BooleanCompletion).succeeded() and
+      first(this.getRhs(), succ)
+      or
+      // Edge from lhs to this
+      last(this.getLhs(), pred, c) and
+      c.(BooleanCompletion).failed() and
+      succ = this
+      or
+      // Edge from rhs to this
+      last(this.getRhs(), pred, c) and
+      succ = this and
+      completionIsNormal(c)
+    }
+  }
+
+  private AstNode getBlockChildNode(BlockExpr b, int i) {
+    result = b.getStmtList().getStatement(i)
+    or
+    i = b.getStmtList().getNumberOfStatements() and
+    result = b.getStmtList().getTailExpr()
+  }
+
+  class AsyncBlockExprTree extends StandardTree, PreOrderTree, PostOrderTree, AsyncBlockExpr {
+    override AstNode getChildNode(int i) { result = getBlockChildNode(this, i) }
+
+    override predicate propagatesAbnormal(AstNode child) { none() }
+  }
+
+  class BlockExprTree extends StandardPostOrderTree, BlockExpr {
+    BlockExprTree() { not this.isAsync() }
+
+    override AstNode getChildNode(int i) { result = getBlockChildNode(this, i) }
+
+    override predicate propagatesAbnormal(AstNode child) { child = this.getChildNode(_) }
+  }
+
+  class BreakExprTree extends StandardPostOrderTree, BreakExpr {
+    override AstNode getChildNode(int i) { i = 0 and result = this.getExpr() }
+
+    override predicate last(AstNode last, Completion c) { none() }
+
+    override predicate succ(AstNode pred, AstNode succ, Completion c) {
+      super.succ(pred, succ, c)
+      or
+      pred = this and c.isValidFor(pred) and succ = this.getTarget()
+    }
+  }
+
+  class CallExprTree extends StandardPostOrderTree instanceof CallExpr {
+    override AstNode getChildNode(int i) {
+      i = 0 and result = super.getExpr()
+      or
+      result = super.getArgList().getArg(i - 1)
+    }
+  }
+
+  class CastExprTree extends StandardPostOrderTree instanceof CastExpr {
+    override AstNode getChildNode(int i) { i = 0 and result = super.getExpr() }
+  }
+
+  class ContinueExprTree extends LeafTree, ContinueExpr {
+    override predicate last(AstNode last, Completion c) { none() }
+
+    override predicate succ(AstNode pred, AstNode succ, Completion c) {
+      pred = this and
+      c.isValidFor(pred) and
+      first(this.getTarget().(LoopingExprTree).getLoopContinue(), succ)
+    }
+  }
+
+  class FieldExprTree extends StandardPostOrderTree instanceof FieldExpr {
+    override AstNode getChildNode(int i) { i = 0 and result = super.getExpr() }
+  }
+
+  class IfExprTree extends PostOrderTree instanceof IfExpr {
+    override predicate first(AstNode node) { first(super.getCondition(), node) }
+
+    override predicate propagatesAbnormal(AstNode child) {
+      child = [super.getCondition(), super.getThen(), super.getElse()]
+    }
+
+    private ConditionalCompletion conditionCompletion(Completion c) {
+      if super.getCondition() instanceof LetExpr
+      then result = c.(MatchCompletion)
+      else result = c.(BooleanCompletion)
+    }
+
+    override predicate succ(AstNode pred, AstNode succ, Completion c) {
+      // Edges from the condition to the branches
+      last(super.getCondition(), pred, c) and
+      (
+        first(super.getThen(), succ) and this.conditionCompletion(c).succeeded()
+        or
+        first(super.getElse(), succ) and this.conditionCompletion(c).failed()
+        or
+        not super.hasElse() and succ = this and this.conditionCompletion(c).failed()
+      )
+      or
+      // An edge from the then branch to the last node
+      last(super.getThen(), pred, c) and
+      succ = this and
+      completionIsNormal(c)
+      or
+      // An edge from the else branch to the last node
+      last(super.getElse(), pred, c) and
+      succ = this and
+      completionIsNormal(c)
+    }
+  }
+
+  class FormatArgsExprTree extends StandardPostOrderTree, FormatArgsExpr {
+    override AstNode getChildNode(int i) {
+      i = -1 and result = this.getTemplate()
+      or
+      result = this.getArg(i).getExpr()
+      or
+      result =
+        any(FormatTemplateVariableAccess v, Format f, int index, int kind |
+          f = this.getFormat(index) and
+          (
+            v.getArgument() = f.getArgumentRef() and kind = 0
+            or
+            v.getArgument() = f.getWidthArgument() and kind = 1
+            or
+            v.getArgument() = f.getPrecisionArgument() and kind = 2
+          ) and
+          i = this.getNumberOfArgs() + index * 3 + kind
+        |
+          v
+        )
+    }
+  }
+
+  class IndexExprTree extends StandardPostOrderTree instanceof IndexExpr {
+    override AstNode getChildNode(int i) {
+      i = 0 and result = super.getBase()
+      or
+      i = 1 and result = super.getIndex()
+    }
+  }
+
+  // `LetExpr` is a pre-order tree such that the pattern itself ends up
+  // dominating successors in the graph in the same way that patterns do in
+  // `match` expressions.
+  class LetExprTree extends StandardPreOrderTree, LetExpr {
+    override AstNode getChildNode(int i) {
+      i = 0 and
+      result = this.getExpr()
+      or
+      i = 1 and
+      result = this.getPat()
+    }
+  }
+
+  class LiteralExprTree extends LeafTree instanceof LiteralExpr { }
+
+  abstract class LoopingExprTree extends PostOrderTree {
+    override predicate propagatesAbnormal(AstNode child) { child = this.getLoopBody() }
+
+    abstract BlockExpr getLoopBody();
+
+    /**
+     * Gets the node to execute when continuing the loop; either after
+     * executing the last node in the body or after an explicit `continue`.
+     */
+    abstract AstNode getLoopContinue();
+
+    override predicate succ(AstNode pred, AstNode succ, Completion c) {
+      // Edge back to the start for final expression and continue expressions
+      last(this.getLoopBody(), pred, c) and
+      completionIsNormal(c) and
+      first(this.getLoopContinue(), succ)
+    }
+  }
+
+  class LoopExprTree extends LoopingExprTree instanceof LoopExpr {
+    override BlockExpr getLoopBody() { result = LoopExpr.super.getLoopBody() }
+
+    override AstNode getLoopContinue() { result = this.getLoopBody() }
+
+    override predicate first(AstNode node) { first(this.getLoopBody(), node) }
+  }
+
+  class WhileExprTree extends LoopingExprTree instanceof WhileExpr {
+    override BlockExpr getLoopBody() { result = WhileExpr.super.getLoopBody() }
+
+    override AstNode getLoopContinue() { result = super.getCondition() }
+
+    override predicate propagatesAbnormal(AstNode child) {
+      super.propagatesAbnormal(child)
+      or
+      child = super.getCondition()
+    }
+
+    override predicate first(AstNode node) { first(super.getCondition(), node) }
+
+    private ConditionalCompletion conditionCompletion(Completion c) {
+      if super.getCondition() instanceof LetExpr
+      then result = c.(MatchCompletion)
+      else result = c.(BooleanCompletion)
+    }
+
+    override predicate succ(AstNode pred, AstNode succ, Completion c) {
+      super.succ(pred, succ, c)
+      or
+      last(super.getCondition(), pred, c) and
+      this.conditionCompletion(c).succeeded() and
+      first(this.getLoopBody(), succ)
+      or
+      last(super.getCondition(), pred, c) and
+      this.conditionCompletion(c).failed() and
+      succ = this
+    }
+  }
+
+  class ForExprTree extends LoopingExprTree instanceof ForExpr {
+    override BlockExpr getLoopBody() { result = ForExpr.super.getLoopBody() }
+
+    override AstNode getLoopContinue() { result = super.getPat() }
+
+    override predicate propagatesAbnormal(AstNode child) {
+      super.propagatesAbnormal(child)
+      or
+      child = super.getIterable()
+    }
+
+    override predicate first(AstNode node) { first(super.getIterable(), node) }
+
+    override predicate succ(AstNode pred, AstNode succ, Completion c) {
+      super.succ(pred, succ, c)
+      or
+      last(super.getIterable(), pred, c) and
+      first(super.getPat(), succ) and
+      completionIsNormal(c)
+      or
+      last(super.getPat(), pred, c) and
+      c.(MatchCompletion).succeeded() and
+      first(this.getLoopBody(), succ)
+      or
+      last(super.getPat(), pred, c) and
+      c.(MatchCompletion).failed() and
+      succ = this
+    }
+  }
+
+  class MacroExprTree extends StandardPostOrderTree, MacroExpr {
+    override AstNode getChildNode(int i) { i = 0 and result = this.getMacroCall() }
+  }
+
+  class MatchExprTree extends PostOrderTree instanceof MatchExpr {
+    override predicate propagatesAbnormal(AstNode child) {
+      child = [super.getExpr(), super.getAnArm().getExpr()]
+    }
+
+    override predicate first(AstNode node) { first(super.getExpr(), node) }
+
+    override predicate succ(AstNode pred, AstNode succ, Completion c) {
+      // Edge from the scrutinee to the first arm or to the match expression if no arms.
+      last(super.getExpr(), pred, c) and
+      (
+        first(super.getArm(0).getPat(), succ)
+        or
+        not exists(super.getArm(0)) and succ = this
+      ) and
+      completionIsNormal(c)
+      or
+      // Edge from a failed pattern or guard in one arm to the beginning of the next arm.
+      exists(int i |
+        (
+          last(super.getArm(i).getPat(), pred, c) or
+          last(super.getArm(i).getGuard().getCondition(), pred, c)
+        ) and
+        first(super.getArm(i + 1), succ) and
+        c.(ConditionalCompletion).failed()
+      )
+      or
+      // Edge from the end of each arm to the match expression.
+      last(super.getArm(_).getExpr(), pred, c) and succ = this and completionIsNormal(c)
+    }
+  }
+
+  class MethodCallExprTree extends StandardPostOrderTree, MethodCallExpr {
+    override AstNode getChildNode(int i) {
+      if i = 0 then result = this.getReceiver() else result = this.getArgList().getArg(i - 1)
+    }
+  }
+
+  class OffsetOfExprTree extends LeafTree instanceof OffsetOfExpr { }
+
+  class ParenExprTree extends ControlFlowTree, ParenExpr {
+    private ControlFlowTree expr;
+
+    ParenExprTree() { expr = super.getExpr() }
+
+    override predicate propagatesAbnormal(AstNode child) { expr.propagatesAbnormal(child) }
+
+    override predicate first(AstNode first) { expr.first(first) }
+
+    override predicate last(AstNode last, Completion c) { expr.last(last, c) }
+
+    override predicate succ(AstNode pred, AstNode succ, Completion c) { none() }
+  }
+
+  class PathExprTree extends LeafTree instanceof PathExpr { }
+
+  class PrefixExprTree extends StandardPostOrderTree instanceof PrefixExpr {
+    override AstNode getChildNode(int i) { i = 0 and result = super.getExpr() }
+  }
+
+  class RangeExprTree extends StandardPostOrderTree instanceof RangeExpr {
+    override AstNode getChildNode(int i) {
+      i = 0 and result = super.getStart()
+      or
+      i = 1 and result = super.getEnd()
+    }
+  }
+
+  class RecordExprTree extends StandardPostOrderTree instanceof RecordExpr {
+    override AstNode getChildNode(int i) {
+      result = super.getRecordExprFieldList().getField(i).getExpr()
+    }
+  }
+
+  class RefExprTree extends StandardPostOrderTree instanceof RefExpr {
+    override AstNode getChildNode(int i) { i = 0 and result = super.getExpr() }
+  }
+
+  class ReturnExprTree extends StandardPostOrderTree instanceof ReturnExpr {
+    override AstNode getChildNode(int i) { i = 0 and result = super.getExpr() }
+  }
+
+  class TryExprTree extends StandardPostOrderTree instanceof TryExpr {
+    override AstNode getChildNode(int i) { i = 0 and result = super.getExpr() }
+  }
+
+  class TupleExprTree extends StandardPostOrderTree instanceof TupleExpr {
+    override AstNode getChildNode(int i) { result = super.getField(i) }
+  }
+
+  class UnderscoreExprTree extends LeafTree instanceof UnderscoreExpr { }
+
+  // NOTE: `yield` is a reserved but unused keyword.
+  class YieldExprTree extends StandardPostOrderTree instanceof YieldExpr {
+    override AstNode getChildNode(int i) { i = 0 and result = super.getExpr() }
+  }
+
+  // NOTE: `yeet` is experimental and not a part of Rust.
+  class YeetExprTree extends StandardPostOrderTree instanceof YeetExpr {
+    override AstNode getChildNode(int i) { i = 0 and result = super.getExpr() }
+  }
+}
+
+/**
+ * Provides `ControlFlowTree`s for patterns.
+ *
+ * Since patterns destruct values, they are modeled in pre-order, except for
+ * `LiteralPat`s, `OrPat`s, and `IdentPat`s.
+ */
+module PatternTrees {
+  abstract class StandardPatTree extends StandardTree {
+    abstract Pat getPat(int i);
+
+    Pat getPatRanked(int i) {
+      result = rank[i + 1](Pat pat, int j | pat = this.getPat(j) | pat order by j)
+    }
+
+    override AstNode getChildNode(int i) { result = this.getPat(i) }
+  }
+
+  abstract class PreOrderPatTree extends StandardPatTree, StandardPreOrderTree {
+    override predicate succ(AstNode pred, AstNode succ, Completion c) {
+      c.(MatchCompletion).succeeded() and
+      (
+        StandardPatTree.super.succ(pred, succ, c)
+        or
+        pred = this and first(this.getFirstChildNode(), succ) and completionIsValidFor(c, this)
+      )
+    }
+
+    override predicate last(AstNode node, Completion c) {
+      super.last(node, c)
+      or
+      c.(MatchCompletion).failed() and
+      completionIsValidFor(c, this) and
+      (node = this or last(this.getPatRanked(_), node, c))
+    }
+  }
+
+  abstract class PostOrderPatTree extends StandardPatTree, StandardPostOrderTree { }
+
+  class IdentPatTree extends PostOrderPatTree, IdentPat {
+    override Pat getPat(int i) { i = 0 and result = this.getPat() }
+
+    override predicate last(AstNode node, Completion c) {
+      super.last(node, c)
+      or
+      last(this.getPat(), node, c) and c.(MatchCompletion).failed()
+    }
+
+    override predicate succ(AstNode pred, AstNode succ, Completion c) {
+      super.succ(pred, succ, c) and c.(MatchCompletion).succeeded()
+    }
+  }
+
+  class BoxPatTree extends PreOrderPatTree, BoxPat {
+    override Pat getPat(int i) { i = 0 and result = this.getPat() }
+  }
+
+  class RestPatTree extends LeafTree, RestPat { }
+
+  class LiteralPatTree extends StandardPostOrderTree, LiteralPat {
+    override AstNode getChildNode(int i) { i = 0 and result = this.getLiteral() }
+  }
+
+  class MacroPatTree extends PreOrderPatTree, MacroPat {
+    override Pat getPat(int i) { i = 0 and result = this.getMacroCall().getExpanded() }
+  }
+
+  class OrPatTree extends PostOrderPatTree instanceof OrPat {
+    override Pat getPat(int i) { result = OrPat.super.getPat(i) }
+
+    override predicate succ(AstNode pred, AstNode succ, Completion c) {
+      // Failed patterns advance normally between children
+      c.(MatchCompletion).failed() and super.succ(pred, succ, c)
+      or
+      // Successful pattern step to this
+      c.(MatchCompletion).succeeded() and succ = this and last(this.getPat(_), pred, c)
+    }
+  }
+
+  class ParenPatTree extends ControlFlowTree, ParenPat {
+    private ControlFlowTree pat;
+
+    ParenPatTree() { pat = this.getPat() }
+
+    override predicate propagatesAbnormal(AstNode child) { pat.propagatesAbnormal(child) }
+
+    override predicate first(AstNode first) { pat.first(first) }
+
+    override predicate last(AstNode last, Completion c) { pat.last(last, c) }
+
+    override predicate succ(AstNode pred, AstNode succ, Completion c) { none() }
+  }
+
+  class PathPatTree extends LeafTree, PathPat { }
+
+  class WildcardPatTree extends LeafTree, WildcardPat { }
+
+  class RangePatTree extends PreOrderPatTree, RangePat {
+    override Pat getPat(int i) {
+      i = 0 and result = this.getStart()
+      or
+      i = 1 and result = this.getEnd()
+    }
+  }
+
+  class RecordPatTree extends PreOrderPatTree, RecordPat {
+    override Pat getPat(int i) {
+      result = this.getRecordPatFieldList().getField(i).getPat()
+      or
+      i = this.getRecordPatFieldList().getNumberOfFields() and
+      result = this.getRecordPatFieldList().getRestPat()
+    }
+  }
+
+  class RefPatTree extends PreOrderPatTree, RefPat {
+    override Pat getPat(int i) { i = 0 and result = super.getPat() }
+  }
+
+  class SlicePatTree extends PreOrderPatTree instanceof SlicePat {
+    override Pat getPat(int i) { result = SlicePat.super.getPat(i) }
+  }
+
+  class TuplePatTree extends PreOrderPatTree, TuplePat {
+    override Pat getPat(int i) { result = this.getField(i) }
+  }
+
+  class TupleStructPatTree extends PreOrderPatTree, TupleStructPat {
+    override Pat getPat(int i) { result = this.getField(i) }
+  }
+
+  class ConstBlockPatTree extends LeafTree, ConstBlockPat { } // todo?
+}
diff --git a/rust/ql/lib/codeql/rust/controlflow/internal/Scope.qll b/rust/ql/lib/codeql/rust/controlflow/internal/Scope.qll
index 9955d5da7fd..7b3367690ec 100644
--- a/rust/ql/lib/codeql/rust/controlflow/internal/Scope.qll
+++ b/rust/ql/lib/codeql/rust/controlflow/internal/Scope.qll
@@ -1,32 +1,56 @@
 private import rust
 private import Completion
+private import ControlFlowGraphImpl
 private import codeql.rust.elements.internal.generated.ParentChild
 
-abstract class CfgScope extends AstNode { }
+/**
+ * A control-flow graph (CFG) scope.
+ */
+abstract private class CfgScopeImpl extends AstNode {
+  /** Holds if `first` is executed first when entering `scope`. */
+  abstract predicate scopeFirst(AstNode first);
 
-class FunctionScope extends CfgScope, Function { }
+  /** Holds if `scope` is exited when `last` finishes with completion `c`. */
+  abstract predicate scopeLast(AstNode last, Completion c);
+}
+
+final class CfgScope = CfgScopeImpl;
+
+final class AsyncBlockScope extends CfgScopeImpl, AsyncBlockExpr instanceof ExprTrees::AsyncBlockExprTree
+{
+  override predicate scopeFirst(AstNode first) { first(super.getFirstChildNode(), first) }
+
+  override predicate scopeLast(AstNode last, Completion c) {
+    last(super.getLastChildElement(), last, c)
+    or
+    last(super.getChildNode(_), last, c) and
+    not c instanceof NormalCompletion
+  }
+}
 
 /**
- * Gets the immediate parent of a non-`AstNode` element `e`.
- *
- * We restrict `e` to be a non-`AstNode` to skip past non-`AstNode` in
- * the transitive closure computation in `getParentOfAst`. This is
- * necessary because the parent of an `AstNode` is not necessarily an `AstNode`.
+ * A CFG scope for a callable (a function or a closure) with a body.
  */
-private Element getParentOfAstStep(Element e) {
-  not e instanceof AstNode and
-  result = getImmediateParent(e)
-}
+final class CallableScope extends CfgScopeImpl, Callable {
+  CallableScope() {
+    // A function without a body corresponds to a trait method signature and
+    // should not have a CFG scope.
+    this.(Function).hasBody()
+    or
+    this instanceof ClosureExpr
+  }
 
-/** Gets the nearest enclosing parent of `ast` that is an `AstNode`. */
-private AstNode getParentOfAst(AstNode ast) {
-  result = getParentOfAstStep*(getImmediateParent(ast))
-}
+  /** Gets the body of this callable. */
+  AstNode getBody() {
+    result = this.(Function).getBody()
+    or
+    result = this.(ClosureExpr).getBody()
+  }
 
-/** Gets the enclosing scope of a node */
-cached
-AstNode scopeOfAst(AstNode n) {
-  exists(AstNode p | p = getParentOfAst(n) |
-    if p instanceof CfgScope then p = result else result = scopeOfAst(p)
-  )
+  override predicate scopeFirst(AstNode first) {
+    first(this.(CallableScopeTree).getFirstChildNode(), first)
+  }
+
+  /** Holds if `scope` is exited when `last` finishes with completion `c`. */
+  override predicate scopeLast(AstNode last, Completion c) { last(this.getBody(), last, c) }
 }
diff --git a/rust/ql/lib/codeql/rust/controlflow/internal/Splitting.qll b/rust/ql/lib/codeql/rust/controlflow/internal/Splitting.qll
index b4f0a060be6..e20cbcb1355 100644
--- a/rust/ql/lib/codeql/rust/controlflow/internal/Splitting.qll
+++ b/rust/ql/lib/codeql/rust/controlflow/internal/Splitting.qll
@@ -1,17 +1,128 @@
+private import rust
+private import ControlFlowGraphImpl
+private import Scope
+
 cached
 private module Cached {
-  // Not using CFG splitting, so the following are just placeholder types.
-  cached
-  newtype TSplitKind = TSplitKindUnit()
+  private import codeql.rust.internal.CachedStages
 
   cached
-  newtype TSplit = TSplitUnit()
+  newtype TSplitKind = TConditionalCompletionSplitKind() { Stages::CfgStage::ref() }
+
+  cached
+  newtype TSplit = TConditionalCompletionSplit(ConditionalCompletion c)
 }
 
 import Cached
 
 /** A split for a control flow node. */
-class Split extends TSplit {
+abstract private class Split_ extends TSplit {
   /** Gets a textual representation of this split. */
-  string toString() { none() }
+  abstract string toString();
+}
+
+final class Split = Split_;
+
+module ConditionalCompletionSplitting {
+  /**
+   * A split for conditional completions. For example, in
+   *
+   * ```rust
+   * if x && !y {
+   *   // ...
+   * }
+   * ```
+   *
+   * we record whether `x`, `y`, and `!y` evaluate to `true` or `false`, and restrict
+   * the edges out of `!y` and `x && !y` accordingly.
+   */
+  class ConditionalCompletionSplit extends Split_, TConditionalCompletionSplit {
+    ConditionalCompletion completion;
+
+    ConditionalCompletionSplit() { this = TConditionalCompletionSplit(completion) }
+
+    ConditionalCompletion getCompletion() { result = completion }
+
+    override string toString() { result = completion.toString() }
+  }
+
+  private class ConditionalCompletionSplitKind_ extends SplitKind, TConditionalCompletionSplitKind {
+    override int getListOrder() { result = 0 }
+
+    override predicate isEnabled(AstNode cfe) { this.appliesTo(cfe) }
+
+    override string toString() { result = "ConditionalCompletion" }
+  }
+
+  module ConditionalCompletionSplittingInput {
+    private import Completion as Comp
+
+    class ConditionalCompletion = Comp::ConditionalCompletion;
+
+    class ConditionalCompletionSplitKind extends ConditionalCompletionSplitKind_, TSplitKind { }
+
+    class ConditionalCompletionSplit = ConditionalCompletionSplitting::ConditionalCompletionSplit;
+
+    bindingset[parent, parentCompletion]
+    predicate condPropagateExpr(
+      AstNode parent, ConditionalCompletion parentCompletion, AstNode child,
+      ConditionalCompletion childCompletion
+    ) {
+      child = parent.(LogicalNotExpr).getExpr() and
+      childCompletion.getDual() = parentCompletion
+      or
+      (
+        childCompletion = parentCompletion
+        or
+        // needed for `let` expressions
+        childCompletion.(MatchCompletion).getValue() =
+          parentCompletion.(BooleanCompletion).getValue()
+      ) and
+      (
+        child = parent.(BinaryLogicalOperation).getAnOperand()
+        or
+        parent = any(IfExpr ie | child = [ie.getThen(), ie.getElse()])
+        or
+        child = parent.(MatchExpr).getAnArm().getExpr()
+        or
+        child = parent.(BlockExpr).getStmtList().getTailExpr()
+        or
+        child = parent.(PatternTrees::PreOrderPatTree).getPat(_) and
+        childCompletion.(MatchCompletion).failed()
+        or
+        child = parent.(PatternTrees::PostOrderPatTree).getPat(_)
+      )
+    }
+  }
+
+  private class ConditionalCompletionSplitImpl extends SplitImplementations::ConditionalCompletionSplitting::ConditionalCompletionSplitImpl
+  {
+    /**
+     * Gets a `break` expression whose target can have a Boolean completion that
+     * matches this split.
+     */
+    private BreakExpr getABreakExpr(Expr target) {
+      target = result.getTarget() and
+      last(target, _, this.getCompletion())
+    }
+
+    override predicate hasEntry(AstNode pred, AstNode succ, Completion c) {
+      super.hasEntry(pred, succ, c)
+      or
+      succ(pred, succ, c) and
+      last(succ.(BreakExpr).getExpr(), pred, c) and
+      succ = this.getABreakExpr(_) and
+      c = this.getCompletion()
+    }
+
+    override predicate hasSuccessor(AstNode pred, AstNode succ, Completion c) {
+      super.hasSuccessor(pred, succ, c)
+      or
+      this.appliesTo(pred) and
+      succ(pred, succ, c) and
+      pred = this.getABreakExpr(succ)
+    }
+  }
+
+  int getNextListOrder() { result = 1 }
 }
diff --git a/rust/ql/lib/codeql/rust/controlflow/internal/SuccessorType.qll b/rust/ql/lib/codeql/rust/controlflow/internal/SuccessorType.qll
index 5ea12fc8a5c..658d2a66706 100644
--- a/rust/ql/lib/codeql/rust/controlflow/internal/SuccessorType.qll
+++ b/rust/ql/lib/codeql/rust/controlflow/internal/SuccessorType.qll
@@ -1,45 +1,74 @@
+private import rust
 private import codeql.util.Boolean
+private import Completion
+private import codeql.rust.internal.CachedStages
 
 cached
 newtype TSuccessorType =
-  TSuccessorSuccessor() or
+  TNormalSuccessor() { Stages::CfgStage::ref() } or
   TBooleanSuccessor(Boolean b) or
+  TMatchSuccessor(Boolean b) or
+  TBreakSuccessor() or
+  TContinueSuccessor() or
   TReturnSuccessor()
 
 /** The type of a control flow successor. */
-abstract private class SuccessorTypeImpl extends TSuccessorType {
+abstract class SuccessorTypeImpl extends TSuccessorType {
   /** Gets a textual representation of successor type. */
   abstract string toString();
 }
 
-final class SuccessorType = SuccessorTypeImpl;
-
 /** A normal control flow successor. */
-final class NormalSuccessor extends SuccessorTypeImpl, TSuccessorSuccessor {
-  final override string toString() { result = "successor" }
+class NormalSuccessorImpl extends SuccessorTypeImpl, TNormalSuccessor {
+  override string toString() { result = "successor" }
 }
 
 /** A conditional control flow successor. */
-abstract private class ConditionalSuccessor extends SuccessorTypeImpl {
+abstract class ConditionalSuccessorImpl extends SuccessorTypeImpl {
   boolean value;
 
   bindingset[value]
-  ConditionalSuccessor() { any() }
+  ConditionalSuccessorImpl() { exists(value) }
 
   /** Gets the Boolean value of this successor. */
-  final boolean getValue() { result = value }
+  boolean getValue() { result = value }
+}
+
+/** A Boolean control flow successor for a boolean conditon. */
+class BooleanSuccessorImpl extends ConditionalSuccessorImpl, TBooleanSuccessor {
+  BooleanSuccessorImpl() { this = TBooleanSuccessor(value) }
 
   override string toString() { result = this.getValue().toString() }
 }
 
-/** A Boolean control flow successor. */
-final class BooleanSuccessor extends ConditionalSuccessor, TBooleanSuccessor {
-  BooleanSuccessor() { this = TBooleanSuccessor(value) }
+/**
+ * A control flow successor of a pattern match.
+ */
+class MatchSuccessorImpl extends ConditionalSuccessorImpl, TMatchSuccessor {
+  MatchSuccessorImpl() { this = TMatchSuccessor(value) }
+
+  override string toString() {
+    if this.getValue() = true then result = "match" else result = "no-match"
+  }
+}
+
+/**
+ * A control flow successor of a `break` expression.
+ */
+class BreakSuccessorImpl extends SuccessorTypeImpl, TBreakSuccessor {
+  override string toString() { result = "break" }
+}
+
+/**
+ * A control flow successor of a `continue` expression.
+ */
+class ContinueSuccessorImpl extends SuccessorTypeImpl, TContinueSuccessor {
+  override string toString() { result = "continue" }
 }
 
 /**
  * A `return` control flow successor.
  */
-final class ReturnSuccessor extends SuccessorTypeImpl, TReturnSuccessor {
-  final override string toString() { result = "return" }
+class ReturnSuccessorImpl extends SuccessorTypeImpl, TReturnSuccessor {
+  override string toString() { result = "return" }
 }
diff --git a/rust/ql/lib/codeql/rust/dataflow/DataFlow.qll b/rust/ql/lib/codeql/rust/dataflow/DataFlow.qll
new file mode 100644
index 00000000000..3a09df2c45d
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/dataflow/DataFlow.qll
@@ -0,0 +1,36 @@
+/**
+ * Provides a module for performing local (intra-procedural) and global
+ * (inter-procedural) data flow analyses.
+ */
+
+private import rust
+private import codeql.dataflow.DataFlow
+private import internal.DataFlowImpl as DataFlowImpl
+private import DataFlowImpl::Node as Node
+
+/**
+ * Provides classes for performing local (intra-procedural) and global
+ * (inter-procedural) data flow analyses.
+ */
+module DataFlow {
+  final class Node = Node::Node;
+
+  final class ParameterNode = Node::ParameterNode;
+
+  final class PostUpdateNode = Node::PostUpdateNode;
+
+  /**
+   * Holds if data flows from `nodeFrom` to `nodeTo` in exactly one local
+   * (intra-procedural) step.
+   */
+  predicate localFlowStep = DataFlowImpl::localFlowStepImpl/2;
+
+  /**
+   * Holds if data flows from `source` to `sink` in zero or more local
+   * (intra-procedural) steps.
+   */
+  pragma[inline]
+  predicate localFlow(Node::Node source, Node::Node sink) { localFlowStep*(source, sink) }
+
+  import DataFlowMake<Location, DataFlowImpl::RustDataFlow>
+}
diff --git a/rust/ql/lib/codeql/rust/dataflow/Ssa.qll b/rust/ql/lib/codeql/rust/dataflow/Ssa.qll
new file mode 100644
index 00000000000..ff1aae058aa
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/dataflow/Ssa.qll
@@ -0,0 +1,340 @@
+/**
+ * Provides the module `Ssa` for working with static single assignment (SSA) form.
+ */
+
+/**
+ * Provides classes for working with static single assignment (SSA) form.
+ */
+module Ssa {
+  private import rust
+  private import codeql.rust.controlflow.BasicBlocks
+  private import codeql.rust.controlflow.ControlFlowGraph
+  private import codeql.rust.controlflow.internal.ControlFlowGraphImpl as CfgImpl
+  private import internal.SsaImpl as SsaImpl
+
+  class Variable = SsaImpl::SsaInput::SourceVariable;
+
+  /** A static single assignment (SSA) definition. */
+  class Definition extends SsaImpl::Definition {
+    /**
+     * Gets the control flow node of this SSA definition, if any. Phi nodes are
+     * examples of SSA definitions without a control flow node, as they are
+     * modeled at index `-1` in the relevant basic block.
+     */
+    final CfgNode getControlFlowNode() {
+      exists(BasicBlock bb, int i | this.definesAt(_, bb, i) | result = bb.getNode(i))
+    }
+
+    /**
+     * Gets a control-flow node that reads the value of this SSA definition.
+     *
+     * Example:
+     *
+     * ```rust
+     * fn phi(b : bool) {              // defines b_0
+     *      let mut x = 1;             // defines x_0
+     *      println!("{}", x);         // reads x_0
+     *      println!("{}", x + 1);     // reads x_0
+     *
+     *      if b {                     // reads b_0
+     *          x = 2;                 // defines x_1
+     *          println!("{}", x);     // reads x_1
+     *          println!("{}", x + 1); // reads x_1
+     *      } else {
+     *          x = 3;                 // defines x_2
+     *          println!("{}", x);     // reads x_2
+     *          println!("{}", x + 1); // reads x_2
+     *      }
+     *                                 // defines x_3 = phi(x_1, x_2)
+     *      println!("{}", x);         // reads x_3
+     * }
+     * ```
+     */
+    final CfgNode getARead() { result = SsaImpl::getARead(this) }
+
+    /**
+     * Gets a first control-flow node that reads the value of this SSA definition.
+     * That is, a read that can be reached from this definition without passing
+     * through other reads.
+     *
+     * Example:
+     *
+     * ```rust
+     * fn phi(b : bool) {              // defines b_0
+     *      let mut x = 1;             // defines x_0
+     *      println!("{}", x);         // first read of x_0
+     *      println!("{}", x + 1);
+     *
+     *      if b {                     // first read of b_0
+     *          x = 2;                 // defines x_1
+     *          println!("{}", x);     // first read of x_1
+     *          println!("{}", x + 1);
+     *      } else {
+     *          x = 3;                 // defines x_2
+     *          println!("{}", x);     // first read of x_2
+     *          println!("{}", x + 1);
+     *      }
+     *                                 // defines x_3 = phi(x_1, x_2)
+     *      println!("{}", x);         // first read of x_3
+     * }
+     * ```
+     */
+    final CfgNode getAFirstRead() { SsaImpl::firstRead(this, result) }
+
+    /**
+     * Gets a last control-flow node that reads the value of this SSA definition.
+     * That is, a read that can reach the end of the enclosing CFG scope, or another
+     * SSA definition for the source variable, without passing through any other read.
+     *
+     * Example:
+     *
+     * ```rust
+     * fn phi(b : bool) {              // defines b_0
+     *      let mut x = 1;             // defines x_0
+     *      println!("{}", x);
+     *      println!("{}", x + 1);     // last read of x_0
+     *
+     *      if b {                     // last read of b_0
+     *          x = 2;                 // defines x_1
+     *          println!("{}", x);
+     *          println!("{}", x + 1); // last read of x_1
+     *      } else {
+     *          x = 3;                 // defines x_2
+     *          println!("{}", x);
+     *          println!("{}", x + 1); // last read of x_2
+     *      }
+     *                                 // defines x_3 = phi(x_1, x_2)
+     *      println!("{}", x);         // last read of x_3
+     * }
+     * ```
+     */
+    final CfgNode getALastRead() { SsaImpl::lastRead(this, result) }
+
+    /**
+     * Holds if `read1` and `read2` are adjacent reads of this SSA definition.
+     * That is, `read2` can be reached from `read1` without passing through
+     * another read.
+     *
+     * Example:
+     *
+     * ```rust
+     * fn phi(b : bool) {
+     *      let mut x = 1;             // defines x_0
+     *      println!("{}", x);         // reads x_0 (read1)
+     *      println!("{}", x + 1);     // reads x_0 (read2)
+     *
+     *      if b {
+     *          x = 2;                 // defines x_1
+     *          println!("{}", x);     // reads x_1 (read1)
+     *          println!("{}", x + 1); // reads x_1 (read2)
+     *      } else {
+     *          x = 3;                 // defines x_2
+     *          println!("{}", x);     // reads x_2 (read1)
+     *          println!("{}", x + 1); // reads x_2 (read2)
+     *      }
+     *      println!("{}", x);
+     * }
+     * ```
+     */
+    final predicate hasAdjacentReads(CfgNode read1, CfgNode read2) {
+      SsaImpl::adjacentReadPair(this, read1, read2)
+    }
+
+    /**
+     * Gets an SSA definition whose value can flow to this one in one step. This
+     * includes inputs to phi nodes and the prior definitions of uncertain writes.
+     */
+    private Definition getAPhiInputOrPriorDefinition() {
+      result = this.(PhiDefinition).getAnInput()
+    }
+
+    /**
+     * Gets a definition that ultimately defines this SSA definition and is
+     * not itself a phi node.
+     *
+     * Example:
+     *
+     * ```rust
+     * fn phi(b : bool) {
+     *      let mut x = 1;             // defines x_0
+     *      println!("{}", x);
+     *      println!("{}", x + 1);
+     *
+     *      if b {
+     *          x = 2;                 // defines x_1
+     *          println!("{}", x);
+     *          println!("{}", x + 1);
+     *      } else {
+     *          x = 3;                 // defines x_2
+     *          println!("{}", x);
+     *          println!("{}", x + 1);
+     *      }
+     *                                 // defines x_3 = phi(x_1, x_2); ultimate definitions are x_1 and x_2
+     *      println!("{}", x);
+     * }
+     * ```
+     */
+    final Definition getAnUltimateDefinition() {
+      result = this.getAPhiInputOrPriorDefinition*() and
+      not result instanceof PhiDefinition
+    }
+
+    override string toString() { result = this.getControlFlowNode().toString() }
+
+    /** Gets the scope of this SSA definition. */
+    CfgScope getScope() { result = this.getBasicBlock().getScope() }
+  }
+
+  /**
+   * An SSA definition that corresponds to a write. Example:
+   *
+   * ```rust
+   * fn m(i : i64) {     // writes `i`
+   *     let mut x = i;  // writes `x`
+   *     x = 11;         // writes `x`
+   * }
+   * ```
+   */
+  class WriteDefinition extends Definition, SsaImpl::WriteDefinition {
+    private CfgNode write;
+
+    WriteDefinition() {
+      exists(BasicBlock bb, int i, Variable v |
+        this.definesAt(v, bb, i) and
+        SsaImpl::variableWriteActual(bb, i, v, write)
+      )
+    }
+
+    /** Gets the underlying write access. */
+    final CfgNode getWriteAccess() { result = write }
+
+    /**
+     * Holds if this SSA definition assigns `value` to the underlying variable.
+     *
+     * This is either a direct assignment, `x = value`, or an assignment via
+     * simple pattern matching
+     *
+     * ```rb
+     * case value
+     *  in Foo => x then ...
+     *  in y => then ...
+     * end
+     * ```
+     */
+    predicate assigns(CfgNode value) {
+      exists(AssignmentExpr ae, BasicBlock bb, int i |
+        this.definesAt(_, bb, i) and
+        ae.getLhs() = bb.getNode(i).getAstNode() and
+        value.getAstNode() = ae.getRhs()
+      )
+    }
+
+    final override string toString() { result = write.toString() }
+
+    final override Location getLocation() { result = write.getLocation() }
+  }
+
+  /**
+   * A phi definition. For example, in
+   *
+   * ```rust
+   * if b {
+   *   x = 0
+   * } else {
+   *   x = 1
+   * }
+   * println!("{}", x);
+   * ```
+   *
+   * a phi definition for `x` is inserted just before the call to `println!`.
+   */
+  class PhiDefinition extends Definition, SsaImpl::PhiDefinition {
+    /**
+     * Gets an input of this phi definition.
+     *
+     * Example:
+     *
+     * ```rust
+     * fn phi(b : bool) {
+     *      let mut x = 1;             // defines x_0
+     *      println!("{}", x);
+     *      println!("{}", x + 1);
+     *
+     *      if b {
+     *          x = 2;                 // defines x_1
+     *          println!("{}", x);
+     *          println!("{}", x + 1);
+     *      } else {
+     *          x = 3;                 // defines x_2
+     *          println!("{}", x);
+     *          println!("{}", x + 1);
+     *      }
+     *                                 // defines x_3 = phi(x_1, x_2); inputs are x_1 and x_2
+     *      println!("{}", x);
+     * }
+     * ```
+     */
+    final Definition getAnInput() { this.hasInputFromBlock(result, _) }
+
+    /** Holds if `inp` is an input to this phi definition along the edge originating in `bb`. */
+    predicate hasInputFromBlock(Definition inp, BasicBlock bb) {
+      inp = SsaImpl::phiHasInputFromBlock(this, bb)
+    }
+
+    private string getSplitString() {
+      result = this.getBasicBlock().getFirstNode().(CfgImpl::AstCfgNode).getSplitsString()
+    }
+
+    override string toString() {
+      exists(string prefix |
+        prefix = "[" + this.getSplitString() + "] "
+        or
+        not exists(this.getSplitString()) and
+        prefix = ""
+      |
+        result = prefix + "phi"
+      )
+    }
+
+    /*
+     * The location of a phi definition is the same as the location of the first node
+     * in the basic block in which it is defined.
+     *
+     * Strictly speaking, the node is *before* the first node, but such a location
+     * does not exist in the source program.
+     */
+
+    final override Location getLocation() {
+      result = this.getBasicBlock().getFirstNode().getLocation()
+    }
+  }
+
+  /**
+   * An SSA definition inserted at the beginning of a scope to represent a
+   * captured local variable. For example, in
+   *
+   * ```rust
+   * fn capture_immut() {
+   *     let x = 100;
+   *     let mut cap = || {
+   *         println!("{}", x);
+   *     };
+   *     cap();
+   * }
+   * ```
+   *
+   * an entry definition for `x` is inserted at the start of the CFG for `cap`.
+   */
+  class CapturedEntryDefinition extends Definition, SsaImpl::WriteDefinition {
+    CapturedEntryDefinition() {
+      exists(BasicBlock bb, int i, Variable v |
+        this.definesAt(v, bb, i) and
+        SsaImpl::capturedEntryWrite(bb, i, v)
+      )
+    }
+
+    final override string toString() { result = "<captured entry> " + this.getSourceVariable() }
+
+    override Location getLocation() { result = this.getBasicBlock().getLocation() }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/dataflow/TaintTracking.qll b/rust/ql/lib/codeql/rust/dataflow/TaintTracking.qll
new file mode 100644
index 00000000000..195aecd5eab
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/dataflow/TaintTracking.qll
@@ -0,0 +1,17 @@
+/**
+ * Provides the module `TaintTracking` for performing local (intra-procedural)
+ * and global (inter-procedural) taint-tracking analyses.
+ */
+
+private import rust
+
+/**
+ * Provides a library for performing local (intra-procedural) and global
+ * (inter-procedural) taint-tracking analyses.
+ */
+module TaintTracking {
+  private import codeql.dataflow.TaintTracking
+  private import internal.DataFlowImpl
+  private import internal.TaintTrackingImpl
+  import TaintFlowMake<Location, RustDataFlow, RustTaintTracking>
+}
diff --git a/rust/ql/lib/codeql/rust/dataflow/internal/DataFlowImpl.qll b/rust/ql/lib/codeql/rust/dataflow/internal/DataFlowImpl.qll
new file mode 100644
index 00000000000..c31ef9e8107
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/dataflow/internal/DataFlowImpl.qll
@@ -0,0 +1,532 @@
+/**
+ * Provides Rust-specific definitions for use in the data flow library.
+ */
+
+private import codeql.util.Void
+private import codeql.util.Unit
+private import codeql.dataflow.DataFlow
+private import codeql.dataflow.internal.DataFlowImpl
+private import rust
+private import SsaImpl as SsaImpl
+private import codeql.rust.controlflow.ControlFlowGraph
+private import codeql.rust.controlflow.CfgNodes
+private import codeql.rust.dataflow.Ssa
+
+private newtype TReturnKind = TNormalReturnKind()
+
+/**
+ * A return kind. A return kind describes how a value can be returned from a
+ * callable.
+ *
+ * The only return kind is a "normal" return from a `return` statement or an
+ * expression body.
+ */
+final class ReturnKind extends TNormalReturnKind {
+  string toString() { result = "return" }
+}
+
+/**
+ * A callable. This includes callables from source code, as well as callables
+ * defined in library code.
+ */
+final class DataFlowCallable extends TDataFlowCallable {
+  /**
+   * Gets the underlying CFG scope, if any.
+   */
+  CfgScope asCfgScope() { this = TCfgScope(result) }
+
+  /** Gets a textual representation of this callable. */
+  string toString() { result = this.asCfgScope().toString() }
+
+  /** Gets the location of this callable. */
+  Location getLocation() { result = this.asCfgScope().getLocation() }
+}
+
+final class DataFlowCall extends TDataFlowCall {
+  /** Gets the underlying call in the CFG, if any. */
+  CallExprCfgNode asCallExprCfgNode() { this = TNormalCall(result) }
+
+  MethodCallExprCfgNode asMethodCallExprCfgNode() { this = TMethodCall(result) }
+
+  ExprCfgNode asExprCfgNode() {
+    result = this.asCallExprCfgNode() or result = this.asMethodCallExprCfgNode()
+  }
+
+  DataFlowCallable getEnclosingCallable() {
+    result = TCfgScope(this.asExprCfgNode().getExpr().getEnclosingCfgScope())
+  }
+
+  string toString() { result = this.asExprCfgNode().toString() }
+
+  Location getLocation() { result = this.asExprCfgNode().getLocation() }
+}
+
+module Node {
+  /**
+   * An element, viewed as a node in a data flow graph. Either an expression
+   * (`ExprNode`) or a parameter (`ParameterNode`).
+   */
+  abstract class Node extends TNode {
+    /** Gets the location of this node. */
+    abstract Location getLocation();
+
+    /** Gets a textual representation of this node. */
+    abstract string toString();
+
+    /**
+     * Gets the expression that corresponds to this node, if any.
+     */
+    Expr asExpr() { none() }
+
+    /** Gets the enclosing callable. */
+    DataFlowCallable getEnclosingCallable() { result = TCfgScope(this.getCfgScope()) }
+
+    /** Do not call: use `getEnclosingCallable()` instead. */
+    abstract CfgScope getCfgScope();
+
+    /**
+     * Gets the control flow node that corresponds to this data flow node.
+     */
+    CfgNode getCfgNode() { none() }
+
+    /**
+     * Gets this node's underlying SSA definition, if any.
+     */
+    Ssa::Definition asDefinition() { none() }
+
+    /**
+     * Gets the parameter that corresponds to this node, if any.
+     */
+    Param asParameter() { none() }
+  }
+
+  /** A node type that is not implemented. */
+  final class NaNode extends Node {
+    NaNode() { none() }
+
+    override CfgScope getCfgScope() { none() }
+
+    override string toString() { result = "N/A" }
+
+    override Location getLocation() { none() }
+  }
+
+  /** A data flow node that corresponds to a CFG node for an AST node. */
+  abstract class AstCfgFlowNode extends Node {
+    AstCfgNode n;
+
+    override CfgNode getCfgNode() { result = n }
+
+    override CfgScope getCfgScope() { result = n.getAstNode().getEnclosingCfgScope() }
+
+    override Location getLocation() { result = n.getAstNode().getLocation() }
+
+    override string toString() { result = n.getAstNode().toString() }
+  }
+
+  /**
+   * A node in the data flow graph that corresponds to an expression in the
+   * AST.
+   *
+   * Note that because of control-flow splitting, one `Expr` may correspond
+   * to multiple `ExprNode`s, just like it may correspond to multiple
+   * `ControlFlow::Node`s.
+   */
+  class ExprNode extends AstCfgFlowNode, TExprNode {
+    override ExprCfgNode n;
+
+    ExprNode() { this = TExprNode(n) }
+
+    override Expr asExpr() { result = n.getExpr() }
+  }
+
+  final class PatNode extends AstCfgFlowNode, TPatNode {
+    override PatCfgNode n;
+
+    PatNode() { this = TPatNode(n) }
+
+    /** Gets the `Pat` in the AST that this node corresponds to. */
+    Pat getPat() { result = n.getPat() }
+  }
+
+  /**
+   * The value of a parameter at function entry, viewed as a node in a data
+   * flow graph.
+   */
+  final class ParameterNode extends AstCfgFlowNode, TParameterNode {
+    override ParamCfgNode n;
+
+    ParameterNode() { this = TParameterNode(n) }
+
+    /** Gets the parameter in the AST that this node corresponds to. */
+    Param getParameter() { result = n.getParam() }
+  }
+
+  final class ArgumentNode = NaNode;
+
+  /** An SSA node. */
+  class SsaNode extends Node, TSsaNode {
+    SsaImpl::DataFlowIntegration::SsaNode node;
+    SsaImpl::DefinitionExt def;
+
+    SsaNode() {
+      this = TSsaNode(node) and
+      def = node.getDefinitionExt()
+    }
+
+    override CfgScope getCfgScope() { result = def.getBasicBlock().getScope() }
+
+    SsaImpl::DefinitionExt getDefinitionExt() { result = def }
+
+    override Location getLocation() { result = node.getLocation() }
+
+    override string toString() { result = "[SSA] " + node.toString() }
+  }
+
+  /** A data flow node that represents a value returned by a callable. */
+  final class ReturnNode extends ExprNode {
+    ReturnNode() { this.getCfgNode().getASuccessor() instanceof ExitCfgNode }
+
+    ReturnKind getKind() { any() }
+  }
+
+  /** A data-flow node that represents the output of a call. */
+  abstract class OutNode extends Node, ExprNode {
+    /** Gets the underlying call for this node. */
+    abstract DataFlowCall getCall();
+  }
+
+  final private class ExprOutNode extends ExprNode, OutNode {
+    ExprOutNode() { this.asExpr() instanceof CallExpr }
+
+    /** Gets the underlying call CFG node that includes this out node. */
+    override DataFlowCall getCall() { result.asExprCfgNode() = this.getCfgNode() }
+  }
+
+  /**
+   * 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.
+   */
+  final class PostUpdateNode extends Node::NaNode {
+    /** Gets the node before the state update. */
+    Node getPreUpdateNode() { none() }
+  }
+
+  final class CastNode = NaNode;
+}
+
+final class Node = Node::Node;
+
+/** Provides logic related to SSA. */
+module SsaFlow {
+  private module Impl = SsaImpl::DataFlowIntegration;
+
+  private Node::ParameterNode toParameterNode(Param p) { result.getParameter() = p }
+
+  /** Converts a control flow node into an SSA control flow node. */
+  Impl::Node asNode(Node n) {
+    n = TSsaNode(result)
+    or
+    result.(Impl::ExprNode).getExpr() = n.(Node::ExprNode).getCfgNode()
+    or
+    n = toParameterNode(result.(Impl::ParameterNode).getParameter())
+  }
+
+  predicate localFlowStep(SsaImpl::DefinitionExt def, Node nodeFrom, Node nodeTo, boolean isUseStep) {
+    Impl::localFlowStep(def, asNode(nodeFrom), asNode(nodeTo), isUseStep)
+  }
+
+  predicate localMustFlowStep(SsaImpl::DefinitionExt def, Node nodeFrom, Node nodeTo) {
+    Impl::localMustFlowStep(def, asNode(nodeFrom), asNode(nodeTo))
+  }
+}
+
+/**
+ * Holds for expressions `e` that evaluate to the value of any last (in
+ * evaluation order) subexpressions within it. E.g., expressions that propagate
+ * a values from a subexpression.
+ *
+ * For instance, the predicate holds for if expressions as `if b { e1 } else {
+ * e2 }` evalates to the value of one of the subexpressions `e1` or `e2`.
+ */
+private predicate propagatesValue(Expr e) {
+  e instanceof IfExpr or
+  e instanceof LoopExpr or
+  e instanceof ReturnExpr or
+  e instanceof BreakExpr or
+  e.(BlockExpr).getStmtList().hasTailExpr() or
+  e instanceof MatchExpr
+}
+
+/**
+ * Gets a node that may execute last in `n`, and which, when it executes last,
+ * will be the value of `n`.
+ */
+private ExprCfgNode getALastEvalNode(ExprCfgNode n) {
+  propagatesValue(n.getExpr()) and result.getASuccessor() = n
+}
+
+module LocalFlow {
+  pragma[nomagic]
+  predicate localFlowStepCommon(Node nodeFrom, Node nodeTo) {
+    nodeFrom.getCfgNode() = getALastEvalNode(nodeTo.getCfgNode())
+    or
+    exists(LetStmt s |
+      nodeFrom.getCfgNode().getAstNode() = s.getInitializer() and
+      nodeTo.getCfgNode().getAstNode() = s.getPat()
+    )
+    or
+    // An edge from a pattern/expression to its corresponding SSA definition.
+    nodeFrom.(Node::AstCfgFlowNode).getCfgNode() =
+      nodeTo.(Node::SsaNode).getDefinitionExt().(Ssa::WriteDefinition).getControlFlowNode()
+    or
+    SsaFlow::localFlowStep(_, nodeFrom, nodeTo, _)
+  }
+}
+
+private class DataFlowCallableAlias = DataFlowCallable;
+
+private class ReturnKindAlias = ReturnKind;
+
+private class DataFlowCallAlias = DataFlowCall;
+
+module RustDataFlow implements InputSig<Location> {
+  /**
+   * An element, viewed as a node in a data flow graph. Either an expression
+   * (`ExprNode`) or a parameter (`ParameterNode`).
+   */
+  final class Node = Node::Node;
+
+  final class ParameterNode = Node::ParameterNode;
+
+  final class ArgumentNode = Node::ArgumentNode;
+
+  final class ReturnNode = Node::ReturnNode;
+
+  final class OutNode = Node::OutNode;
+
+  final class PostUpdateNode = Node::PostUpdateNode;
+
+  final class CastNode = Node::NaNode;
+
+  predicate isParameterNode(ParameterNode p, DataFlowCallable c, ParameterPosition pos) { none() }
+
+  predicate isArgumentNode(ArgumentNode n, DataFlowCall call, ArgumentPosition pos) { none() }
+
+  DataFlowCallable nodeGetEnclosingCallable(Node node) { result = node.getEnclosingCallable() }
+
+  DataFlowType getNodeType(Node node) { any() }
+
+  predicate nodeIsHidden(Node node) { node instanceof Node::SsaNode }
+
+  class DataFlowExpr = ExprCfgNode;
+
+  /** Gets the node corresponding to `e`. */
+  Node exprNode(DataFlowExpr e) { result.getCfgNode() = e }
+
+  final class DataFlowCall = DataFlowCallAlias;
+
+  final class DataFlowCallable = DataFlowCallableAlias;
+
+  final class ReturnKind = ReturnKindAlias;
+
+  /** Gets a viable implementation of the target of the given `Call`. */
+  DataFlowCallable viableCallable(DataFlowCall c) {
+    exists(Function f, string name | result.asCfgScope() = f and name = f.getName().toString() |
+      if f.getParamList().hasSelfParam()
+      then name = c.asMethodCallExprCfgNode().getMethodCallExpr().getNameRef().getText()
+      else
+        name =
+          c.asCallExprCfgNode().getCallExpr().getExpr().(PathExpr).getPath().getPart().toString()
+    )
+  }
+
+  /**
+   * Gets a node that can read the value returned from `call` with return kind
+   * `kind`.
+   */
+  OutNode getAnOutNode(DataFlowCall call, ReturnKind kind) {
+    call = result.getCall() and exists(kind)
+  }
+
+  // NOTE: For now we use the type `Unit` and do not benefit from type
+  // information in the data flow analysis.
+  final class DataFlowType = Unit;
+
+  predicate compatibleTypes(DataFlowType t1, DataFlowType t2) { any() }
+
+  predicate typeStrongerThan(DataFlowType t1, DataFlowType t2) { none() }
+
+  final class Content = Void;
+
+  predicate forceHighPrecision(Content c) { none() }
+
+  class ContentSet extends TContentSet {
+    /** Gets a textual representation of this element. */
+    string toString() { result = "ContentSet" }
+
+    /** Gets a content that may be stored into when storing into this set. */
+    Content getAStoreContent() { none() }
+
+    /** Gets a content that may be read from when reading from this set. */
+    Content getAReadContent() { none() }
+  }
+
+  final class ContentApprox = Void;
+
+  ContentApprox getContentApprox(Content c) { any() }
+
+  class ParameterPosition extends string {
+    ParameterPosition() { this = "pos" }
+  }
+
+  class ArgumentPosition extends string {
+    ArgumentPosition() { this = "pos" }
+  }
+
+  /**
+   * Holds if the parameter position `ppos` matches the argument position
+   * `apos`.
+   */
+  predicate parameterMatch(ParameterPosition ppos, ArgumentPosition apos) { none() }
+
+  /**
+   * Holds if there is a simple local flow step from `node1` to `node2`. These
+   * are the value-preserving intra-callable flow steps.
+   */
+  predicate simpleLocalFlowStep(Node nodeFrom, Node nodeTo, string model) {
+    LocalFlow::localFlowStepCommon(nodeFrom, nodeTo) and
+    model = ""
+  }
+
+  /**
+   * Holds if data can flow from `node1` to `node2` through a non-local step
+   * that does not follow a call edge. For example, a step through a global
+   * variable.
+   */
+  predicate jumpStep(Node node1, Node node2) { none() }
+
+  /**
+   * Holds if data can flow from `node1` to `node2` via a read of `c`.  Thus,
+   * `node1` references an object with a content `c.getAReadContent()` whose
+   * value ends up in `node2`.
+   */
+  predicate readStep(Node node1, ContentSet c, Node node2) { none() }
+
+  /**
+   * Holds if data can flow from `node1` to `node2` via a store into `c`.  Thus,
+   * `node2` references an object with a content `c.getAStoreContent()` that
+   * contains the value of `node1`.
+   */
+  predicate storeStep(Node node1, ContentSet c, Node node2) { none() }
+
+  /**
+   * Holds if values stored inside content `c` are cleared at node `n`. For example,
+   * any value stored inside `f` is cleared at the pre-update node associated with `x`
+   * in `x.f = newValue`.
+   */
+  predicate clearsContent(Node n, ContentSet c) { none() }
+
+  /**
+   * Holds if the value that is being tracked is expected to be stored inside content `c`
+   * at node `n`.
+   */
+  predicate expectsContent(Node n, ContentSet c) { none() }
+
+  class NodeRegion instanceof Void {
+    string toString() { result = "NodeRegion" }
+
+    predicate contains(Node n) { none() }
+  }
+
+  /**
+   * Holds if the nodes in `nr` are unreachable when the call context is `call`.
+   */
+  predicate isUnreachableInCall(NodeRegion nr, DataFlowCall call) { none() }
+
+  /**
+   * Holds if flow is allowed to pass from parameter `p` and back to itself as a
+   * side-effect, resulting in a summary from `p` to itself.
+   *
+   * One example would be to allow flow like `p.foo = p.bar;`, which is disallowed
+   * by default as a heuristic.
+   */
+  predicate allowParameterReturnInSelf(ParameterNode p) { none() }
+
+  /**
+   * Holds if the value of `node2` is given by `node1`.
+   *
+   * This predicate is combined with type information in the following way: If
+   * the data flow library is able to compute an improved type for `node1` then
+   * it will also conclude that this type applies to `node2`. Vice versa, if
+   * `node2` must be visited along a flow path, then any type known for `node2`
+   * must also apply to `node1`.
+   */
+  predicate localMustFlowStep(Node node1, Node node2) {
+    SsaFlow::localMustFlowStep(_, node1, node2)
+  }
+
+  class LambdaCallKind = Void;
+
+  // class LambdaCallKind;
+  /** Holds if `creation` is an expression that creates a lambda of kind `kind` for `c`. */
+  predicate lambdaCreation(Node creation, LambdaCallKind kind, DataFlowCallable c) { none() }
+
+  /** Holds if `call` is a lambda call of kind `kind` where `receiver` is the lambda expression. */
+  predicate lambdaCall(DataFlowCall call, LambdaCallKind kind, Node receiver) { none() }
+
+  /** Extra data flow steps needed for lambda flow analysis. */
+  predicate additionalLambdaFlowStep(Node nodeFrom, Node nodeTo, boolean preservesValue) { none() }
+
+  predicate knownSourceModel(Node source, string model) { none() }
+
+  predicate knownSinkModel(Node sink, string model) { none() }
+
+  class DataFlowSecondLevelScope = Void;
+}
+
+final class ContentSet = RustDataFlow::ContentSet;
+
+import MakeImpl<Location, RustDataFlow>
+
+/** A collection of cached types and predicates to be evaluated in the same stage. */
+cached
+private module Cached {
+  cached
+  newtype TNode =
+    TExprNode(ExprCfgNode n) or
+    TParameterNode(ParamCfgNode p) or
+    TPatNode(PatCfgNode p) or
+    TSsaNode(SsaImpl::DataFlowIntegration::SsaNode node)
+
+  cached
+  newtype TDataFlowCall =
+    TNormalCall(CallExprCfgNode c) or
+    TMethodCall(MethodCallExprCfgNode c)
+
+  cached
+  newtype TOptionalContentSet =
+    TAnyElementContent() or
+    TAnyContent()
+
+  cached
+  class TContentSet = TAnyElementContent or TAnyContent;
+
+  cached
+  newtype TDataFlowCallable = TCfgScope(CfgScope scope)
+
+  /** This is the local flow predicate that is exposed. */
+  cached
+  predicate localFlowStepImpl(Node::Node nodeFrom, Node::Node nodeTo) {
+    LocalFlow::localFlowStepCommon(nodeFrom, nodeTo)
+  }
+}
+
+import Cached
diff --git a/rust/ql/lib/codeql/rust/dataflow/internal/SsaImpl.qll b/rust/ql/lib/codeql/rust/dataflow/internal/SsaImpl.qll
new file mode 100644
index 00000000000..d5263fca810
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/dataflow/internal/SsaImpl.qll
@@ -0,0 +1,509 @@
+private import rust
+private import codeql.rust.controlflow.BasicBlocks as BasicBlocks
+private import BasicBlocks
+private import codeql.rust.controlflow.ControlFlowGraph as Cfg
+private import codeql.rust.controlflow.CfgNodes as CfgNodes
+private import Cfg
+private import codeql.rust.controlflow.internal.ControlFlowGraphImpl as ControlFlowGraphImpl
+private import codeql.ssa.Ssa as SsaImplCommon
+
+/** Holds if `v` is introduced like `let v : i64;`. */
+private predicate isUnitializedLet(IdentPat pat, Variable v) {
+  pat = v.getPat() and
+  exists(LetStmt let |
+    let = v.getLetStmt() and
+    not let.hasInitializer()
+  )
+}
+
+/** Holds if `write` writes to variable `v`. */
+predicate variableWrite(AstNode write, Variable v) {
+  exists(IdentPat pat |
+    pat = write and
+    pat = v.getPat() and
+    not isUnitializedLet(pat, v)
+  )
+  or
+  exists(VariableAccess access |
+    access = write and
+    access.getVariable() = v
+  |
+    access instanceof VariableWriteAccess
+    or
+    // Although compound assignments, like `x += y`, may in fact not update `x`,
+    // it makes sense to treat them as such
+    access = any(CompoundAssignmentExpr cae).getLhs()
+  )
+}
+
+module SsaInput implements SsaImplCommon::InputSig<Location> {
+  class BasicBlock = BasicBlocks::BasicBlock;
+
+  class ControlFlowNode = CfgNode;
+
+  BasicBlock getImmediateBasicBlockDominator(BasicBlock bb) { result = bb.getImmediateDominator() }
+
+  BasicBlock getABasicBlockSuccessor(BasicBlock bb) { result = bb.getASuccessor() }
+
+  class ExitBasicBlock = BasicBlocks::ExitBasicBlock;
+
+  /**
+   * A variable amenable to SSA construction.
+   *
+   * All immutable variables are amenable. Mutable variables are restricted to
+   * those that are not borrowed (either explicitly using `& mut`, or
+   * (potentially) implicit as borrowed receivers in a method call).
+   */
+  class SourceVariable extends Variable {
+    SourceVariable() {
+      this.isMutable()
+      implies
+      not exists(VariableAccess va | va = this.getAnAccess() |
+        va = any(RefExpr re | re.isMut()).getExpr()
+        or
+        // receivers can be borrowed implicitly, cf.
+        // https://doc.rust-lang.org/reference/expressions/method-call-expr.html
+        va = any(MethodCallExpr mce).getReceiver()
+      )
+    }
+  }
+
+  predicate variableWrite(BasicBlock bb, int i, SourceVariable v, boolean certain) {
+    (
+      variableWriteActual(bb, i, v, _)
+      or
+      capturedEntryWrite(bb, i, v)
+    ) and
+    certain = true
+    or
+    capturedCallWrite(_, bb, i, v) and certain = false
+  }
+
+  predicate variableRead(BasicBlock bb, int i, SourceVariable v, boolean certain) {
+    exists(VariableAccess va |
+      bb.getNode(i).getAstNode() = va and
+      va = v.getAnAccess()
+    |
+      va instanceof VariableReadAccess
+      or
+      // Although compound assignments, like `x += y`, may in fact not read `x`,
+      // it makes sense to treat them as such
+      va = any(CompoundAssignmentExpr cae).getLhs()
+    ) and
+    certain = true
+    or
+    // For immutable variables, we model a read when they are borrowed (although the
+    // actual read happens later, if at all). This only affects the SSA liveness
+    // analysis.
+    exists(VariableAccess va |
+      va = any(RefExpr re).getExpr() and
+      va = bb.getNode(i).getAstNode() and
+      v = va.getVariable() and
+      certain = false
+    )
+    or
+    capturedCallRead(_, bb, i, v) and certain = false
+    or
+    capturedExitRead(bb, i, v) and certain = false
+  }
+}
+
+import SsaImplCommon::Make<Location, SsaInput> as Impl
+
+class Definition = Impl::Definition;
+
+class WriteDefinition = Impl::WriteDefinition;
+
+class UncertainWriteDefinition = Impl::UncertainWriteDefinition;
+
+class PhiDefinition = Impl::PhiNode;
+
+module Consistency = Impl::Consistency;
+
+module ExposedForTestingOnly {
+  predicate ssaDefReachesReadExt = Impl::ssaDefReachesReadExt/4;
+
+  predicate phiHasInputFromBlockExt = Impl::phiHasInputFromBlockExt/3;
+}
+
+pragma[noinline]
+private predicate adjacentDefRead(
+  Definition def, BasicBlock bb1, int i1, BasicBlock bb2, int i2, SsaInput::SourceVariable v
+) {
+  Impl::adjacentDefRead(def, bb1, i1, bb2, i2) and
+  v = def.getSourceVariable()
+}
+
+pragma[noinline]
+private predicate adjacentDefReadExt(
+  DefinitionExt def, BasicBlock bb1, int i1, BasicBlock bb2, int i2, SsaInput::SourceVariable v
+) {
+  Impl::adjacentDefReadExt(def, _, bb1, i1, bb2, i2) and
+  v = def.getSourceVariable()
+}
+
+/** Holds if `v` is read at index `i` in basic block `bb`. */
+private predicate variableReadActual(BasicBlock bb, int i, Variable v) {
+  exists(VariableReadAccess read |
+    read.getVariable() = v and
+    read = bb.getNode(i).getAstNode()
+  )
+}
+
+/**
+ * Holds if captured variable `v` is written directly inside `scope`,
+ * or inside a (transitively) nested scope of `scope`.
+ */
+pragma[noinline]
+private predicate hasCapturedWrite(Variable v, Cfg::CfgScope scope) {
+  any(VariableWriteAccess write | write.getVariable() = v and scope = write.getEnclosingCfgScope+())
+      .isCapture()
+}
+
+/**
+ * Holds if `v` is read inside basic block `bb` at index `i`, which is in the
+ * immediate outer CFG scope of `scope`.
+ */
+pragma[noinline]
+private predicate variableReadActualInOuterScope(
+  BasicBlock bb, int i, Variable v, Cfg::CfgScope scope
+) {
+  variableReadActual(bb, i, v) and bb.getScope() = scope.getEnclosingCfgScope()
+}
+
+pragma[noinline]
+private predicate hasVariableReadWithCapturedWrite(
+  BasicBlock bb, int i, Variable v, Cfg::CfgScope scope
+) {
+  hasCapturedWrite(v, scope) and
+  variableReadActualInOuterScope(bb, i, v, scope)
+}
+
+private predicate adjacentDefReachesRead(
+  Definition def, BasicBlock bb1, int i1, BasicBlock bb2, int i2
+) {
+  exists(SsaInput::SourceVariable v | adjacentDefRead(def, bb1, i1, bb2, i2, v) |
+    def.definesAt(v, bb1, i1)
+    or
+    SsaInput::variableRead(bb1, i1, v, true)
+  )
+  or
+  exists(BasicBlock bb3, int i3 |
+    adjacentDefReachesRead(def, bb1, i1, bb3, i3) and
+    SsaInput::variableRead(bb3, i3, _, false) and
+    Impl::adjacentDefRead(def, bb3, i3, bb2, i2)
+  )
+}
+
+private predicate adjacentDefReachesReadExt(
+  DefinitionExt def, BasicBlock bb1, int i1, BasicBlock bb2, int i2
+) {
+  exists(SsaInput::SourceVariable v | adjacentDefReadExt(def, bb1, i1, bb2, i2, v) |
+    def.definesAt(v, bb1, i1, _)
+    or
+    SsaInput::variableRead(bb1, i1, v, true)
+  )
+  or
+  exists(BasicBlock bb3, int i3 |
+    adjacentDefReachesReadExt(def, bb1, i1, bb3, i3) and
+    SsaInput::variableRead(bb3, i3, _, false) and
+    Impl::adjacentDefReadExt(def, _, bb3, i3, bb2, i2)
+  )
+}
+
+/** Same as `adjacentDefRead`, but skips uncertain reads. */
+pragma[nomagic]
+private predicate adjacentDefSkipUncertainReads(
+  Definition def, BasicBlock bb1, int i1, BasicBlock bb2, int i2
+) {
+  adjacentDefReachesRead(def, bb1, i1, bb2, i2) and
+  SsaInput::variableRead(bb2, i2, _, true)
+}
+
+private predicate adjacentDefReachesUncertainReadExt(
+  DefinitionExt def, BasicBlock bb1, int i1, BasicBlock bb2, int i2
+) {
+  adjacentDefReachesReadExt(def, bb1, i1, bb2, i2) and
+  SsaInput::variableRead(bb2, i2, _, false)
+}
+
+/** Same as `lastRefRedef`, but skips uncertain reads. */
+pragma[nomagic]
+private predicate lastRefSkipUncertainReadsExt(DefinitionExt def, BasicBlock bb, int i) {
+  Impl::lastRef(def, bb, i) and
+  not SsaInput::variableRead(bb, i, def.getSourceVariable(), false)
+  or
+  exists(BasicBlock bb0, int i0 |
+    Impl::lastRef(def, bb0, i0) and
+    adjacentDefReachesUncertainReadExt(def, bb, i, bb0, i0)
+  )
+}
+
+private VariableAccess getACapturedVariableAccess(BasicBlock bb, Variable v) {
+  result = bb.getANode().getAstNode() and
+  result.isCapture() and
+  result.getVariable() = v
+}
+
+/** Holds if `bb` contains a captured write to variable `v`. */
+pragma[noinline]
+private predicate writesCapturedVariable(BasicBlock bb, Variable v) {
+  getACapturedVariableAccess(bb, v) instanceof VariableWriteAccess
+}
+
+/** Holds if `bb` contains a captured read to variable `v`. */
+pragma[nomagic]
+private predicate readsCapturedVariable(BasicBlock bb, Variable v) {
+  getACapturedVariableAccess(bb, v) instanceof VariableReadAccess
+}
+
+/**
+ * Holds if captured variable `v` is read directly inside `scope`,
+ * or inside a (transitively) nested scope of `scope`.
+ */
+pragma[noinline]
+private predicate hasCapturedRead(Variable v, Cfg::CfgScope scope) {
+  any(VariableReadAccess read | read.getVariable() = v and scope = read.getEnclosingCfgScope+())
+      .isCapture()
+}
+
+/**
+ * Holds if `v` is written inside basic block `bb` at index `i`, which is in
+ * the immediate outer scope of `scope`.
+ */
+pragma[noinline]
+private predicate variableWriteInOuterScope(BasicBlock bb, int i, Variable v, Cfg::CfgScope scope) {
+  SsaInput::variableWrite(bb, i, v, _) and scope.getEnclosingCfgScope() = bb.getScope()
+}
+
+/** Holds if evaluating `e` jumps to the evaluation of a different CFG scope. */
+private predicate isControlFlowJump(Expr e) { e instanceof CallExprBase or e instanceof AwaitExpr }
+
+/**
+ * Holds if the call `call` at index `i` in basic block `bb` may reach
+ * a callable that reads captured variable `v`.
+ */
+private predicate capturedCallRead(Expr call, BasicBlock bb, int i, Variable v) {
+  isControlFlowJump(call) and
+  exists(Cfg::CfgScope scope |
+    hasCapturedRead(v, scope) and
+    (
+      variableWriteInOuterScope(bb, any(int j | j < i), v, scope) or
+      variableWriteInOuterScope(bb.getAPredecessor+(), _, v, scope)
+    ) and
+    call = bb.getNode(i).getAstNode()
+  )
+}
+
+/**
+ * Holds if the call `call` at index `i` in basic block `bb` may reach a callable
+ * that writes captured variable `v`.
+ */
+predicate capturedCallWrite(Expr call, BasicBlock bb, int i, Variable v) {
+  isControlFlowJump(call) and
+  call = bb.getNode(i).getAstNode() and
+  exists(Cfg::CfgScope scope |
+    hasVariableReadWithCapturedWrite(bb, any(int j | j > i), v, scope)
+    or
+    hasVariableReadWithCapturedWrite(bb.getASuccessor+(), _, v, scope)
+  )
+}
+
+/**
+ * Holds if a pseudo read of captured variable `v` should be inserted
+ * at index `i` in exit block `bb`.
+ */
+private predicate capturedExitRead(AnnotatedExitBasicBlock bb, int i, Variable v) {
+  bb.isNormal() and
+  writesCapturedVariable(bb.getAPredecessor*(), v) and
+  i = bb.length()
+}
+
+cached
+private module Cached {
+  /**
+   * Holds if an entry definition is needed for captured variable `v` at index
+   * `i` in entry block `bb`.
+   */
+  cached
+  predicate capturedEntryWrite(EntryBasicBlock bb, int i, Variable v) {
+    readsCapturedVariable(bb.getASuccessor*(), v) and
+    i = -1
+  }
+
+  /**
+   * Holds if `v` is written at index `i` in basic block `bb`, and the corresponding
+   * AST write access is `write`.
+   */
+  cached
+  predicate variableWriteActual(BasicBlock bb, int i, Variable v, CfgNode write) {
+    bb.getNode(i) = write and
+    variableWrite(write.getAstNode(), v)
+  }
+
+  cached
+  CfgNode getARead(Definition def) {
+    exists(Variable v, BasicBlock bb, int i |
+      Impl::ssaDefReachesRead(v, def, bb, i) and
+      variableReadActual(bb, i, v) and
+      result = bb.getNode(i)
+    )
+  }
+
+  cached
+  Definition phiHasInputFromBlock(PhiDefinition phi, BasicBlock bb) {
+    Impl::phiHasInputFromBlock(phi, result, bb)
+  }
+
+  /**
+   * Holds if the value defined at SSA definition `def` can reach a read at `read`,
+   * without passing through any other non-pseudo read.
+   */
+  cached
+  predicate firstRead(Definition def, CfgNode read) {
+    exists(BasicBlock bb1, int i1, BasicBlock bb2, int i2 |
+      def.definesAt(_, bb1, i1) and
+      adjacentDefSkipUncertainReads(def, bb1, i1, bb2, i2) and
+      read = bb2.getNode(i2)
+    )
+  }
+
+  /**
+   * Holds if the read at `read2` is a read of the same SSA definition `def`
+   * as the read at `read1`, and `read2` can be reached from `read1` without
+   * passing through another non-pseudo read.
+   */
+  cached
+  predicate adjacentReadPair(Definition def, CfgNode read1, CfgNode read2) {
+    exists(BasicBlock bb1, int i1, BasicBlock bb2, int i2 |
+      read1 = bb1.getNode(i1) and
+      variableReadActual(bb1, i1, _) and
+      adjacentDefSkipUncertainReads(def, bb1, i1, bb2, i2) and
+      read2 = bb2.getNode(i2)
+    )
+  }
+
+  /**
+   * Holds if the read of `def` at `read` may be a last read. That is, `read`
+   * can either reach another definition of the underlying source variable or
+   * the end of the CFG scope, without passing through another non-pseudo read.
+   */
+  cached
+  predicate lastRead(Definition def, CfgNode read) {
+    exists(BasicBlock bb, int i |
+      lastRefSkipUncertainReadsExt(def, bb, i) and
+      variableReadActual(bb, i, _) and
+      read = bb.getNode(i)
+    )
+  }
+
+  cached
+  Definition uncertainWriteDefinitionInput(UncertainWriteDefinition def) {
+    Impl::uncertainWriteDefinitionInput(def, result)
+  }
+
+  cached
+  module DataFlowIntegration {
+    import DataFlowIntegrationImpl
+
+    cached
+    predicate localFlowStep(DefinitionExt def, Node nodeFrom, Node nodeTo, boolean isUseStep) {
+      DataFlowIntegrationImpl::localFlowStep(def, nodeFrom, nodeTo, isUseStep)
+    }
+
+    cached
+    predicate localMustFlowStep(DefinitionExt def, Node nodeFrom, Node nodeTo) {
+      DataFlowIntegrationImpl::localMustFlowStep(def, nodeFrom, nodeTo)
+    }
+
+    signature predicate guardChecksSig(CfgNodes::AstCfgNode g, Cfg::CfgNode e, boolean branch);
+
+    cached // nothing is actually cached
+    module BarrierGuard<guardChecksSig/3 guardChecks> {
+      private predicate guardChecksAdjTypes(
+        DataFlowIntegrationInput::Guard g, DataFlowIntegrationInput::Expr e, boolean branch
+      ) {
+        guardChecks(g, e, branch)
+      }
+
+      private Node getABarrierNodeImpl() {
+        result = DataFlowIntegrationImpl::BarrierGuard<guardChecksAdjTypes/3>::getABarrierNode()
+      }
+
+      predicate getABarrierNode = getABarrierNodeImpl/0;
+    }
+  }
+}
+
+import Cached
+private import codeql.rust.dataflow.Ssa
+
+/**
+ * An extended static single assignment (SSA) definition.
+ *
+ * This is either a normal SSA definition (`Definition`) or a
+ * phi-read node (`PhiReadNode`).
+ *
+ * Only intended for internal use.
+ */
+class DefinitionExt extends Impl::DefinitionExt {
+  CfgNode getARead() { result = getARead(this) }
+
+  override string toString() { result = this.(Ssa::Definition).toString() }
+
+  override Location getLocation() { result = this.(Ssa::Definition).getLocation() }
+}
+
+/**
+ * A phi-read node.
+ *
+ * Only intended for internal use.
+ */
+class PhiReadNode extends DefinitionExt, Impl::PhiReadNode {
+  override string toString() { result = "SSA phi read(" + this.getSourceVariable() + ")" }
+
+  override Location getLocation() { result = Impl::PhiReadNode.super.getLocation() }
+}
+
+private module DataFlowIntegrationInput implements Impl::DataFlowIntegrationInputSig {
+  class Expr extends CfgNodes::AstCfgNode {
+    predicate hasCfgNode(SsaInput::BasicBlock bb, int i) { this = bb.getNode(i) }
+  }
+
+  Expr getARead(Definition def) { result = Cached::getARead(def) }
+
+  /** Holds if SSA definition `def` assigns `value` to the underlying variable. */
+  predicate ssaDefAssigns(WriteDefinition def, Expr value) {
+    exists(BasicBlock bb, int i | def.definesAt(_, bb, i) and value = bb.getNode(i))
+  }
+
+  class Parameter = Param;
+
+  /** Holds if SSA definition `def` initializes parameter `p` at function entry. */
+  predicate ssaDefInitializesParam(WriteDefinition def, Parameter p) {
+    exists(BasicBlock bb, int i | bb.getNode(i).getAstNode() = p and def.definesAt(_, bb, i))
+  }
+
+  class Guard extends CfgNodes::AstCfgNode {
+    predicate hasCfgNode(SsaInput::BasicBlock bb, int i) { this = bb.getNode(i) }
+  }
+
+  /** Holds if the guard `guard` controls block `bb` upon evaluating to `branch`. */
+  predicate guardControlsBlock(Guard guard, SsaInput::BasicBlock bb, boolean branch) {
+    exists(ConditionBlock conditionBlock, ConditionalSuccessor s |
+      guard = conditionBlock.getLastNode() and
+      s.getValue() = branch and
+      conditionBlock.controls(bb, s)
+    )
+  }
+
+  /** Gets an immediate conditional successor of basic block `bb`, if any. */
+  SsaInput::BasicBlock getAConditionalBasicBlockSuccessor(SsaInput::BasicBlock bb, boolean branch) {
+    exists(Cfg::ConditionalSuccessor s |
+      result = bb.getASuccessor(s) and
+      s.getValue() = branch
+    )
+  }
+}
+
+private module DataFlowIntegrationImpl = Impl::DataFlowIntegration<DataFlowIntegrationInput>;
diff --git a/rust/ql/lib/codeql/rust/dataflow/internal/TaintTrackingImpl.qll b/rust/ql/lib/codeql/rust/dataflow/internal/TaintTrackingImpl.qll
new file mode 100644
index 00000000000..917ce0aea45
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/dataflow/internal/TaintTrackingImpl.qll
@@ -0,0 +1,26 @@
+private import rust
+private import codeql.dataflow.TaintTracking
+private import DataFlowImpl
+
+module RustTaintTracking implements InputSig<Location, RustDataFlow> {
+  predicate defaultTaintSanitizer(Node::Node node) { none() }
+
+  /**
+   * Holds if the additional step from `src` to `sink` should be included in all
+   * global taint flow configurations.
+   */
+  predicate defaultAdditionalTaintStep(Node::Node src, Node::Node sink, string model) { none() }
+
+  /**
+   * Holds if taint flow configurations should allow implicit reads of `c` at sinks
+   * and inputs to additional taint steps.
+   */
+  bindingset[node]
+  predicate defaultImplicitTaintRead(Node::Node node, ContentSet c) { none() }
+
+  /**
+   * Holds if the additional step from `src` to `sink` should be considered in
+   * speculative taint flow exploration.
+   */
+  predicate speculativeTaintStep(Node::Node src, Node::Node sink) { none() }
+}
diff --git a/rust/ql/lib/codeql/rust/elements.qll b/rust/ql/lib/codeql/rust/elements.qll
index 3716c5f63eb..b516d8a9d18 100644
--- a/rust/ql/lib/codeql/rust/elements.qll
+++ b/rust/ql/lib/codeql/rust/elements.qll
@@ -3,78 +3,169 @@
  * This module exports all modules providing `Element` subclasses.
  */
 
+import codeql.rust.elements.Abi
+import codeql.rust.elements.ArgList
 import codeql.rust.elements.ArrayExpr
+import codeql.rust.elements.ArrayType
 import codeql.rust.elements.AsmExpr
+import codeql.rust.elements.AssocItem
+import codeql.rust.elements.AssocItemList
+import codeql.rust.elements.AssocTypeArg
 import codeql.rust.elements.AstNode
-import codeql.rust.elements.AsyncBlockExpr
+import codeql.rust.elements.Attr
 import codeql.rust.elements.AwaitExpr
 import codeql.rust.elements.BecomeExpr
 import codeql.rust.elements.BinaryExpr
 import codeql.rust.elements.BlockExpr
-import codeql.rust.elements.BlockExprBase
-import codeql.rust.elements.BoxExpr
 import codeql.rust.elements.BoxPat
 import codeql.rust.elements.BreakExpr
 import codeql.rust.elements.CallExpr
+import codeql.rust.elements.CallExprBase
+import codeql.rust.elements.Callable
 import codeql.rust.elements.CastExpr
+import codeql.rust.elements.ClosureBinder
 import codeql.rust.elements.ClosureExpr
+import codeql.rust.elements.Comment
+import codeql.rust.elements.Const
+import codeql.rust.elements.ConstArg
 import codeql.rust.elements.ConstBlockPat
-import codeql.rust.elements.ConstExpr
+import codeql.rust.elements.ConstParam
 import codeql.rust.elements.ContinueExpr
-import codeql.rust.elements.Declaration
+import codeql.rust.elements.DynTraitType
 import codeql.rust.elements.Element
-import codeql.rust.elements.ElementListExpr
+import codeql.rust.elements.Enum
 import codeql.rust.elements.Expr
 import codeql.rust.elements.ExprStmt
+import codeql.rust.elements.ExternBlock
+import codeql.rust.elements.ExternCrate
+import codeql.rust.elements.ExternItem
+import codeql.rust.elements.ExternItemList
 import codeql.rust.elements.FieldExpr
+import codeql.rust.elements.FieldList
+import codeql.rust.elements.FnPtrType
+import codeql.rust.elements.ForExpr
+import codeql.rust.elements.ForType
+import codeql.rust.elements.Format
+import codeql.rust.elements.FormatArgsArg
+import codeql.rust.elements.FormatArgsExpr
+import codeql.rust.elements.FormatArgument
+import codeql.rust.elements.FormatTemplateVariableAccess
 import codeql.rust.elements.Function
+import codeql.rust.elements.GenericArg
 import codeql.rust.elements.GenericArgList
+import codeql.rust.elements.GenericParam
+import codeql.rust.elements.GenericParamList
 import codeql.rust.elements.IdentPat
 import codeql.rust.elements.IfExpr
+import codeql.rust.elements.Impl
+import codeql.rust.elements.ImplTraitType
 import codeql.rust.elements.IndexExpr
-import codeql.rust.elements.ItemStmt
+import codeql.rust.elements.InferType
+import codeql.rust.elements.Item
+import codeql.rust.elements.ItemList
 import codeql.rust.elements.Label
+import codeql.rust.elements.LetElse
 import codeql.rust.elements.LetExpr
 import codeql.rust.elements.LetStmt
+import codeql.rust.elements.Lifetime
+import codeql.rust.elements.LifetimeArg
+import codeql.rust.elements.LifetimeParam
 import codeql.rust.elements.LiteralExpr
 import codeql.rust.elements.LiteralPat
 import codeql.rust.elements.Locatable
 import codeql.rust.elements.LoopExpr
+import codeql.rust.elements.MacroCall
+import codeql.rust.elements.MacroDef
+import codeql.rust.elements.MacroExpr
+import codeql.rust.elements.MacroItems
+import codeql.rust.elements.MacroPat
+import codeql.rust.elements.MacroRules
+import codeql.rust.elements.MacroStmts
+import codeql.rust.elements.MacroType
 import codeql.rust.elements.MatchArm
+import codeql.rust.elements.MatchArmList
 import codeql.rust.elements.MatchExpr
+import codeql.rust.elements.MatchGuard
+import codeql.rust.elements.Meta
 import codeql.rust.elements.MethodCallExpr
 import codeql.rust.elements.Missing
-import codeql.rust.elements.MissingExpr
-import codeql.rust.elements.MissingPat
 import codeql.rust.elements.Module
+import codeql.rust.elements.Name
+import codeql.rust.elements.NameRef
+import codeql.rust.elements.NeverType
 import codeql.rust.elements.OffsetOfExpr
 import codeql.rust.elements.OrPat
+import codeql.rust.elements.Param
+import codeql.rust.elements.ParamList
+import codeql.rust.elements.ParenExpr
+import codeql.rust.elements.ParenPat
+import codeql.rust.elements.ParenType
 import codeql.rust.elements.Pat
 import codeql.rust.elements.Path
 import codeql.rust.elements.PathExpr
+import codeql.rust.elements.PathExprBase
 import codeql.rust.elements.PathPat
+import codeql.rust.elements.PathSegment
+import codeql.rust.elements.PathType
 import codeql.rust.elements.PrefixExpr
+import codeql.rust.elements.PtrType
 import codeql.rust.elements.RangeExpr
 import codeql.rust.elements.RangePat
 import codeql.rust.elements.RecordExpr
 import codeql.rust.elements.RecordExprField
+import codeql.rust.elements.RecordExprFieldList
+import codeql.rust.elements.RecordField
+import codeql.rust.elements.RecordFieldList
 import codeql.rust.elements.RecordPat
 import codeql.rust.elements.RecordPatField
+import codeql.rust.elements.RecordPatFieldList
 import codeql.rust.elements.RefExpr
 import codeql.rust.elements.RefPat
-import codeql.rust.elements.RepeatExpr
+import codeql.rust.elements.RefType
+import codeql.rust.elements.Rename
+import codeql.rust.elements.Resolvable
+import codeql.rust.elements.RestPat
+import codeql.rust.elements.RetType
 import codeql.rust.elements.ReturnExpr
+import codeql.rust.elements.ReturnTypeSyntax
+import codeql.rust.elements.SelfParam
 import codeql.rust.elements.SlicePat
+import codeql.rust.elements.SliceType
+import codeql.rust.elements.SourceFile
+import codeql.rust.elements.Static
 import codeql.rust.elements.Stmt
+import codeql.rust.elements.StmtList
+import codeql.rust.elements.Struct
+import codeql.rust.elements.Token
+import codeql.rust.elements.TokenTree
+import codeql.rust.elements.Trait
+import codeql.rust.elements.TraitAlias
+import codeql.rust.elements.TryExpr
 import codeql.rust.elements.TupleExpr
+import codeql.rust.elements.TupleField
+import codeql.rust.elements.TupleFieldList
 import codeql.rust.elements.TuplePat
 import codeql.rust.elements.TupleStructPat
+import codeql.rust.elements.TupleType
+import codeql.rust.elements.TypeAlias
+import codeql.rust.elements.TypeArg
+import codeql.rust.elements.TypeBound
+import codeql.rust.elements.TypeBoundList
+import codeql.rust.elements.TypeParam
 import codeql.rust.elements.TypeRef
 import codeql.rust.elements.UnderscoreExpr
 import codeql.rust.elements.Unextracted
 import codeql.rust.elements.Unimplemented
-import codeql.rust.elements.UnimplementedDeclaration
-import codeql.rust.elements.UnsafeBlockExpr
+import codeql.rust.elements.Union
+import codeql.rust.elements.Use
+import codeql.rust.elements.UseTree
+import codeql.rust.elements.UseTreeList
+import codeql.rust.elements.Variant
+import codeql.rust.elements.VariantList
+import codeql.rust.elements.Visibility
+import codeql.rust.elements.WhereClause
+import codeql.rust.elements.WherePred
+import codeql.rust.elements.WhileExpr
 import codeql.rust.elements.WildcardPat
 import codeql.rust.elements.YeetExpr
 import codeql.rust.elements.YieldExpr
diff --git a/rust/ql/lib/codeql/rust/elements/Abi.qll b/rust/ql/lib/codeql/rust/elements/Abi.qll
new file mode 100644
index 00000000000..f8c95ad23a4
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/Abi.qll
@@ -0,0 +1,15 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `Abi`.
+ */
+
+private import internal.AbiImpl
+import codeql.rust.elements.AstNode
+
+/**
+ * A Abi. For example:
+ * ```rust
+ * todo!()
+ * ```
+ */
+final class Abi = Impl::Abi;
diff --git a/rust/ql/lib/codeql/rust/elements/ArgList.qll b/rust/ql/lib/codeql/rust/elements/ArgList.qll
new file mode 100644
index 00000000000..1f62274e1b0
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/ArgList.qll
@@ -0,0 +1,16 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `ArgList`.
+ */
+
+private import internal.ArgListImpl
+import codeql.rust.elements.AstNode
+import codeql.rust.elements.Expr
+
+/**
+ * A ArgList. For example:
+ * ```rust
+ * todo!()
+ * ```
+ */
+final class ArgList = Impl::ArgList;
diff --git a/rust/ql/lib/codeql/rust/elements/ArrayExpr.qll b/rust/ql/lib/codeql/rust/elements/ArrayExpr.qll
index 6dc71fd36b3..9b039cc1534 100644
--- a/rust/ql/lib/codeql/rust/elements/ArrayExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/ArrayExpr.qll
@@ -4,6 +4,7 @@
  */
 
 private import internal.ArrayExprImpl
+import codeql.rust.elements.Attr
 import codeql.rust.elements.Expr
 
 /**
diff --git a/rust/ql/lib/codeql/rust/elements/ArrayType.qll b/rust/ql/lib/codeql/rust/elements/ArrayType.qll
new file mode 100644
index 00000000000..85054d11329
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/ArrayType.qll
@@ -0,0 +1,16 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `ArrayType`.
+ */
+
+private import internal.ArrayTypeImpl
+import codeql.rust.elements.ConstArg
+import codeql.rust.elements.TypeRef
+
+/**
+ * A ArrayType. For example:
+ * ```rust
+ * todo!()
+ * ```
+ */
+final class ArrayType = Impl::ArrayType;
diff --git a/rust/ql/lib/codeql/rust/elements/AsmExpr.qll b/rust/ql/lib/codeql/rust/elements/AsmExpr.qll
index 07f91201863..da0fdc8b6cc 100644
--- a/rust/ql/lib/codeql/rust/elements/AsmExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/AsmExpr.qll
@@ -4,6 +4,7 @@
  */
 
 private import internal.AsmExprImpl
+import codeql.rust.elements.Attr
 import codeql.rust.elements.Expr
 
 /**
diff --git a/rust/ql/lib/codeql/rust/elements/AssignmentOperation.qll b/rust/ql/lib/codeql/rust/elements/AssignmentOperation.qll
new file mode 100644
index 00000000000..368e5738c19
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/AssignmentOperation.qll
@@ -0,0 +1,51 @@
+/** Provides classes for assignment operations. */
+
+private import rust
+private import codeql.rust.elements.internal.BinaryExprImpl
+
+/** An assignment operation. */
+abstract private class AssignmentOperationImpl extends Impl::BinaryExpr { }
+
+final class AssignmentOperation = AssignmentOperationImpl;
+
+/**
+ * An assignment expression, for example
+ *
+ * ```rust
+ * x = y;
+ * ```
+ */
+final class AssignmentExpr extends AssignmentOperationImpl {
+  AssignmentExpr() { this.getOperatorName() = "=" }
+
+  override string getAPrimaryQlClass() { result = "AssignmentExpr" }
+}
+
+/**
+ * A compound assignment expression, for example
+ *
+ * ```rust
+ * x += y;
+ * ```
+ *
+ * Note that compound assignment expressions are syntatic sugar for
+ * trait invocations, i.e., the above actually means
+ *
+ * ```rust
+ * (&mut x).add_assign(y);
+ * ```
+ */
+final class CompoundAssignmentExpr extends AssignmentOperationImpl {
+  private string operator;
+
+  CompoundAssignmentExpr() {
+    this.getOperatorName().regexpCapture("(\\+|-|\\*|/|%|&|\\||\\^|<<|>>)=", 1) = operator
+  }
+
+  /**
+   * Gets the operator of this compound assignment expression.
+   */
+  string getOperator() { result = operator }
+
+  override string getAPrimaryQlClass() { result = "CompoundAssignmentExpr" }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/AssocItem.qll b/rust/ql/lib/codeql/rust/elements/AssocItem.qll
new file mode 100644
index 00000000000..0a56f7109c3
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/AssocItem.qll
@@ -0,0 +1,15 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `AssocItem`.
+ */
+
+private import internal.AssocItemImpl
+import codeql.rust.elements.AstNode
+
+/**
+ * A AssocItem. For example:
+ * ```rust
+ * todo!()
+ * ```
+ */
+final class AssocItem = Impl::AssocItem;
diff --git a/rust/ql/lib/codeql/rust/elements/AssocItemList.qll b/rust/ql/lib/codeql/rust/elements/AssocItemList.qll
new file mode 100644
index 00000000000..63f568e1c25
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/AssocItemList.qll
@@ -0,0 +1,14 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `AssocItemList`.
+ */
+
+private import internal.AssocItemListImpl
+import codeql.rust.elements.AssocItem
+import codeql.rust.elements.AstNode
+import codeql.rust.elements.Attr
+
+/**
+ * A list of  `AssocItem` elements, as appearing for example in a `Trait`.
+ */
+final class AssocItemList = Impl::AssocItemList;
diff --git a/rust/ql/lib/codeql/rust/elements/AssocTypeArg.qll b/rust/ql/lib/codeql/rust/elements/AssocTypeArg.qll
new file mode 100644
index 00000000000..bd8f6aca76d
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/AssocTypeArg.qll
@@ -0,0 +1,23 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `AssocTypeArg`.
+ */
+
+private import internal.AssocTypeArgImpl
+import codeql.rust.elements.ConstArg
+import codeql.rust.elements.GenericArg
+import codeql.rust.elements.GenericArgList
+import codeql.rust.elements.NameRef
+import codeql.rust.elements.ParamList
+import codeql.rust.elements.RetType
+import codeql.rust.elements.ReturnTypeSyntax
+import codeql.rust.elements.TypeBoundList
+import codeql.rust.elements.TypeRef
+
+/**
+ * A AssocTypeArg. For example:
+ * ```rust
+ * todo!()
+ * ```
+ */
+final class AssocTypeArg = Impl::AssocTypeArg;
diff --git a/rust/ql/lib/codeql/rust/elements/AsyncBlockExpr.qll b/rust/ql/lib/codeql/rust/elements/AsyncBlockExpr.qll
index 88354333563..951452cdf24 100644
--- a/rust/ql/lib/codeql/rust/elements/AsyncBlockExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/AsyncBlockExpr.qll
@@ -1,18 +1,17 @@
-// generated by codegen, do not edit
 /**
  * This module provides the public class `AsyncBlockExpr`.
  */
 
-private import internal.AsyncBlockExprImpl
-import codeql.rust.elements.BlockExprBase
+private import codeql.rust.elements.BlockExpr
 
 /**
  * An async block expression. For example:
  * ```rust
  * async {
- *    let x = 42;
- *    x
- * }.await
+ *     let x = 42;
+ * }
  * ```
  */
-final class AsyncBlockExpr = Impl::AsyncBlockExpr;
+final class AsyncBlockExpr extends BlockExpr {
+  AsyncBlockExpr() { this.isAsync() }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/Attr.qll b/rust/ql/lib/codeql/rust/elements/Attr.qll
new file mode 100644
index 00000000000..c7160519253
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/Attr.qll
@@ -0,0 +1,16 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `Attr`.
+ */
+
+private import internal.AttrImpl
+import codeql.rust.elements.AstNode
+import codeql.rust.elements.Meta
+
+/**
+ * A Attr. For example:
+ * ```rust
+ * todo!()
+ * ```
+ */
+final class Attr = Impl::Attr;
diff --git a/rust/ql/lib/codeql/rust/elements/AwaitExpr.qll b/rust/ql/lib/codeql/rust/elements/AwaitExpr.qll
index 528b24407be..16c6790294c 100644
--- a/rust/ql/lib/codeql/rust/elements/AwaitExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/AwaitExpr.qll
@@ -4,6 +4,7 @@
  */
 
 private import internal.AwaitExprImpl
+import codeql.rust.elements.Attr
 import codeql.rust.elements.Expr
 
 /**
diff --git a/rust/ql/lib/codeql/rust/elements/BecomeExpr.qll b/rust/ql/lib/codeql/rust/elements/BecomeExpr.qll
index 19b5d6a21de..0348b862849 100644
--- a/rust/ql/lib/codeql/rust/elements/BecomeExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/BecomeExpr.qll
@@ -4,6 +4,7 @@
  */
 
 private import internal.BecomeExprImpl
+import codeql.rust.elements.Attr
 import codeql.rust.elements.Expr
 
 /**
diff --git a/rust/ql/lib/codeql/rust/elements/BinaryExpr.qll b/rust/ql/lib/codeql/rust/elements/BinaryExpr.qll
index babf5d66b18..39df861aba8 100644
--- a/rust/ql/lib/codeql/rust/elements/BinaryExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/BinaryExpr.qll
@@ -4,6 +4,7 @@
  */
 
 private import internal.BinaryExprImpl
+import codeql.rust.elements.Attr
 import codeql.rust.elements.Expr
 
 /**
diff --git a/rust/ql/lib/codeql/rust/elements/BlockExpr.qll b/rust/ql/lib/codeql/rust/elements/BlockExpr.qll
index 98fd8737d55..a87bbe47252 100644
--- a/rust/ql/lib/codeql/rust/elements/BlockExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/BlockExpr.qll
@@ -4,8 +4,10 @@
  */
 
 private import internal.BlockExprImpl
-import codeql.rust.elements.BlockExprBase
+import codeql.rust.elements.Attr
+import codeql.rust.elements.Expr
 import codeql.rust.elements.Label
+import codeql.rust.elements.StmtList
 
 /**
  * A block expression. For example:
diff --git a/rust/ql/lib/codeql/rust/elements/BlockExprBase.qll b/rust/ql/lib/codeql/rust/elements/BlockExprBase.qll
deleted file mode 100644
index 15390bbc1b2..00000000000
--- a/rust/ql/lib/codeql/rust/elements/BlockExprBase.qll
+++ /dev/null
@@ -1,10 +0,0 @@
-// generated by codegen, do not edit
-/**
- * This module provides the public class `BlockExprBase`.
- */
-
-private import internal.BlockExprBaseImpl
-import codeql.rust.elements.Expr
-import codeql.rust.elements.Stmt
-
-final class BlockExprBase = Impl::BlockExprBase;
diff --git a/rust/ql/lib/codeql/rust/elements/BoxExpr.qll b/rust/ql/lib/codeql/rust/elements/BoxExpr.qll
deleted file mode 100644
index 45e18c84537..00000000000
--- a/rust/ql/lib/codeql/rust/elements/BoxExpr.qll
+++ /dev/null
@@ -1,15 +0,0 @@
-// generated by codegen, do not edit
-/**
- * This module provides the public class `BoxExpr`.
- */
-
-private import internal.BoxExprImpl
-import codeql.rust.elements.Expr
-
-/**
- * A box expression. For example:
- * ```rust
- * let x = #[rustc_box] Box::new(42);
- * ```
- */
-final class BoxExpr = Impl::BoxExpr;
diff --git a/rust/ql/lib/codeql/rust/elements/BreakExpr.qll b/rust/ql/lib/codeql/rust/elements/BreakExpr.qll
index 3b565fefe94..8aec2220dc7 100644
--- a/rust/ql/lib/codeql/rust/elements/BreakExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/BreakExpr.qll
@@ -4,8 +4,9 @@
  */
 
 private import internal.BreakExprImpl
+import codeql.rust.elements.Attr
 import codeql.rust.elements.Expr
-import codeql.rust.elements.Label
+import codeql.rust.elements.Lifetime
 
 /**
  * A break expression. For example:
@@ -23,5 +24,13 @@ import codeql.rust.elements.Label
  *     }
  * };
  * ```
+ * ```rust
+ * let x = 'label: {
+ *     if exit() {
+ *         break 'label 42;
+ *     }
+ *     0;
+ * };
+ * ```
  */
 final class BreakExpr = Impl::BreakExpr;
diff --git a/rust/ql/lib/codeql/rust/elements/CallExpr.qll b/rust/ql/lib/codeql/rust/elements/CallExpr.qll
index 268ac24960a..ab5631b07ca 100644
--- a/rust/ql/lib/codeql/rust/elements/CallExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/CallExpr.qll
@@ -4,6 +4,7 @@
  */
 
 private import internal.CallExprImpl
+import codeql.rust.elements.CallExprBase
 import codeql.rust.elements.Expr
 
 /**
diff --git a/rust/ql/lib/codeql/rust/elements/CallExprBase.qll b/rust/ql/lib/codeql/rust/elements/CallExprBase.qll
new file mode 100644
index 00000000000..d59c4c705f7
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/CallExprBase.qll
@@ -0,0 +1,14 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `CallExprBase`.
+ */
+
+private import internal.CallExprBaseImpl
+import codeql.rust.elements.ArgList
+import codeql.rust.elements.Attr
+import codeql.rust.elements.Expr
+
+/**
+ * A function or method call expression. See `CallExpr` and `MethodCallExpr` for further details.
+ */
+final class CallExprBase = Impl::CallExprBase;
diff --git a/rust/ql/lib/codeql/rust/elements/Callable.qll b/rust/ql/lib/codeql/rust/elements/Callable.qll
new file mode 100644
index 00000000000..c42262a1854
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/Callable.qll
@@ -0,0 +1,14 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `Callable`.
+ */
+
+private import internal.CallableImpl
+import codeql.rust.elements.AstNode
+import codeql.rust.elements.Attr
+import codeql.rust.elements.ParamList
+
+/**
+ * A callable. Either a `Function` or a `ClosureExpr`.
+ */
+final class Callable = Impl::Callable;
diff --git a/rust/ql/lib/codeql/rust/elements/CastExpr.qll b/rust/ql/lib/codeql/rust/elements/CastExpr.qll
index 53adda22e28..8dfbcfc2e4f 100644
--- a/rust/ql/lib/codeql/rust/elements/CastExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/CastExpr.qll
@@ -4,6 +4,7 @@
  */
 
 private import internal.CastExprImpl
+import codeql.rust.elements.Attr
 import codeql.rust.elements.Expr
 import codeql.rust.elements.TypeRef
 
diff --git a/rust/ql/lib/codeql/rust/elements/ClosureBinder.qll b/rust/ql/lib/codeql/rust/elements/ClosureBinder.qll
new file mode 100644
index 00000000000..14464283aa8
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/ClosureBinder.qll
@@ -0,0 +1,16 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `ClosureBinder`.
+ */
+
+private import internal.ClosureBinderImpl
+import codeql.rust.elements.AstNode
+import codeql.rust.elements.GenericParamList
+
+/**
+ * A ClosureBinder. For example:
+ * ```rust
+ * todo!()
+ * ```
+ */
+final class ClosureBinder = Impl::ClosureBinder;
diff --git a/rust/ql/lib/codeql/rust/elements/ClosureExpr.qll b/rust/ql/lib/codeql/rust/elements/ClosureExpr.qll
index 3ef615eb584..cfcf18e48b2 100644
--- a/rust/ql/lib/codeql/rust/elements/ClosureExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/ClosureExpr.qll
@@ -4,9 +4,10 @@
  */
 
 private import internal.ClosureExprImpl
+import codeql.rust.elements.Callable
+import codeql.rust.elements.ClosureBinder
 import codeql.rust.elements.Expr
-import codeql.rust.elements.Pat
-import codeql.rust.elements.TypeRef
+import codeql.rust.elements.RetType
 
 /**
  * A closure expression. For example:
diff --git a/rust/ql/lib/codeql/rust/elements/Comment.qll b/rust/ql/lib/codeql/rust/elements/Comment.qll
new file mode 100644
index 00000000000..9a830ad29d9
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/Comment.qll
@@ -0,0 +1,17 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `Comment`.
+ */
+
+private import internal.CommentImpl
+import codeql.rust.elements.AstNode
+import codeql.rust.elements.Token
+
+/**
+ * A comment. For example:
+ * ```rust
+ * // this is a comment
+ * /// This is a doc comment
+ * ```
+ */
+final class Comment = Impl::Comment;
diff --git a/rust/ql/lib/codeql/rust/elements/Const.qll b/rust/ql/lib/codeql/rust/elements/Const.qll
new file mode 100644
index 00000000000..c069f1ae56c
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/Const.qll
@@ -0,0 +1,21 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `Const`.
+ */
+
+private import internal.ConstImpl
+import codeql.rust.elements.AssocItem
+import codeql.rust.elements.Attr
+import codeql.rust.elements.Expr
+import codeql.rust.elements.Item
+import codeql.rust.elements.Name
+import codeql.rust.elements.TypeRef
+import codeql.rust.elements.Visibility
+
+/**
+ * A Const. For example:
+ * ```rust
+ * todo!()
+ * ```
+ */
+final class Const = Impl::Const;
diff --git a/rust/ql/lib/codeql/rust/elements/ConstArg.qll b/rust/ql/lib/codeql/rust/elements/ConstArg.qll
new file mode 100644
index 00000000000..c48b43b3157
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/ConstArg.qll
@@ -0,0 +1,16 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `ConstArg`.
+ */
+
+private import internal.ConstArgImpl
+import codeql.rust.elements.Expr
+import codeql.rust.elements.GenericArg
+
+/**
+ * A ConstArg. For example:
+ * ```rust
+ * todo!()
+ * ```
+ */
+final class ConstArg = Impl::ConstArg;
diff --git a/rust/ql/lib/codeql/rust/elements/ConstBlockPat.qll b/rust/ql/lib/codeql/rust/elements/ConstBlockPat.qll
index 004d7f2e965..4aae647af80 100644
--- a/rust/ql/lib/codeql/rust/elements/ConstBlockPat.qll
+++ b/rust/ql/lib/codeql/rust/elements/ConstBlockPat.qll
@@ -4,7 +4,7 @@
  */
 
 private import internal.ConstBlockPatImpl
-import codeql.rust.elements.Expr
+import codeql.rust.elements.BlockExpr
 import codeql.rust.elements.Pat
 
 /**
diff --git a/rust/ql/lib/codeql/rust/elements/ConstExpr.qll b/rust/ql/lib/codeql/rust/elements/ConstExpr.qll
deleted file mode 100644
index 68a8ff560bc..00000000000
--- a/rust/ql/lib/codeql/rust/elements/ConstExpr.qll
+++ /dev/null
@@ -1,17 +0,0 @@
-// generated by codegen, do not edit
-/**
- * This module provides the public class `ConstExpr`.
- */
-
-private import internal.ConstExprImpl
-import codeql.rust.elements.Expr
-
-/**
- * A `const` block expression. For example:
- * ```rust
- * if const { SRC::IS_ZST || DEST::IS_ZST || mem::align_of::<SRC>() != mem::align_of::<DEST>() } {
- *     return false;
- * }
- * ```
- */
-final class ConstExpr = Impl::ConstExpr;
diff --git a/rust/ql/lib/codeql/rust/elements/ConstParam.qll b/rust/ql/lib/codeql/rust/elements/ConstParam.qll
new file mode 100644
index 00000000000..625e603cb8a
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/ConstParam.qll
@@ -0,0 +1,19 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `ConstParam`.
+ */
+
+private import internal.ConstParamImpl
+import codeql.rust.elements.Attr
+import codeql.rust.elements.ConstArg
+import codeql.rust.elements.GenericParam
+import codeql.rust.elements.Name
+import codeql.rust.elements.TypeRef
+
+/**
+ * A ConstParam. For example:
+ * ```rust
+ * todo!()
+ * ```
+ */
+final class ConstParam = Impl::ConstParam;
diff --git a/rust/ql/lib/codeql/rust/elements/ContinueExpr.qll b/rust/ql/lib/codeql/rust/elements/ContinueExpr.qll
index 0db73e0028d..7db17ff8277 100644
--- a/rust/ql/lib/codeql/rust/elements/ContinueExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/ContinueExpr.qll
@@ -4,8 +4,9 @@
  */
 
 private import internal.ContinueExprImpl
+import codeql.rust.elements.Attr
 import codeql.rust.elements.Expr
-import codeql.rust.elements.Label
+import codeql.rust.elements.Lifetime
 
 /**
  * A continue expression. For example:
diff --git a/rust/ql/lib/codeql/rust/elements/Declaration.qll b/rust/ql/lib/codeql/rust/elements/Declaration.qll
deleted file mode 100644
index 6cbea51c058..00000000000
--- a/rust/ql/lib/codeql/rust/elements/Declaration.qll
+++ /dev/null
@@ -1,12 +0,0 @@
-// generated by codegen, do not edit
-/**
- * This module provides the public class `Declaration`.
- */
-
-private import internal.DeclarationImpl
-import codeql.rust.elements.AstNode
-
-/**
- * The base class for declarations.
- */
-final class Declaration = Impl::Declaration;
diff --git a/rust/ql/lib/codeql/rust/elements/DynTraitType.qll b/rust/ql/lib/codeql/rust/elements/DynTraitType.qll
new file mode 100644
index 00000000000..237e7d4704a
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/DynTraitType.qll
@@ -0,0 +1,16 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `DynTraitType`.
+ */
+
+private import internal.DynTraitTypeImpl
+import codeql.rust.elements.TypeBoundList
+import codeql.rust.elements.TypeRef
+
+/**
+ * A DynTraitType. For example:
+ * ```rust
+ * todo!()
+ * ```
+ */
+final class DynTraitType = Impl::DynTraitType;
diff --git a/rust/ql/lib/codeql/rust/elements/ElementListExpr.qll b/rust/ql/lib/codeql/rust/elements/ElementListExpr.qll
deleted file mode 100644
index dac90585e2a..00000000000
--- a/rust/ql/lib/codeql/rust/elements/ElementListExpr.qll
+++ /dev/null
@@ -1,17 +0,0 @@
-// generated by codegen, do not edit
-/**
- * This module provides the public class `ElementListExpr`.
- */
-
-private import internal.ElementListExprImpl
-import codeql.rust.elements.ArrayExpr
-import codeql.rust.elements.Expr
-
-/**
- * An element list expression. For example:
- * ```rust
- * [1, 2, 3, 4, 5];
- * [1, 2, 3, 4, 5][0] = 6;
- * ```
- */
-final class ElementListExpr = Impl::ElementListExpr;
diff --git a/rust/ql/lib/codeql/rust/elements/Enum.qll b/rust/ql/lib/codeql/rust/elements/Enum.qll
new file mode 100644
index 00000000000..eb3801611cb
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/Enum.qll
@@ -0,0 +1,21 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `Enum`.
+ */
+
+private import internal.EnumImpl
+import codeql.rust.elements.Attr
+import codeql.rust.elements.GenericParamList
+import codeql.rust.elements.Item
+import codeql.rust.elements.Name
+import codeql.rust.elements.VariantList
+import codeql.rust.elements.Visibility
+import codeql.rust.elements.WhereClause
+
+/**
+ * A Enum. For example:
+ * ```rust
+ * todo!()
+ * ```
+ */
+final class Enum = Impl::Enum;
diff --git a/rust/ql/lib/codeql/rust/elements/ExprStmt.qll b/rust/ql/lib/codeql/rust/elements/ExprStmt.qll
index ba07a0d02a0..79511bf6c0d 100644
--- a/rust/ql/lib/codeql/rust/elements/ExprStmt.qll
+++ b/rust/ql/lib/codeql/rust/elements/ExprStmt.qll
@@ -11,7 +11,7 @@ import codeql.rust.elements.Stmt
  * An expression statement. For example:
  * ```rust
  * start();
- * finish()
+ * finish();
  * use std::env;
  * ```
  */
diff --git a/rust/ql/lib/codeql/rust/elements/ExternBlock.qll b/rust/ql/lib/codeql/rust/elements/ExternBlock.qll
new file mode 100644
index 00000000000..46112c915dc
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/ExternBlock.qll
@@ -0,0 +1,18 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `ExternBlock`.
+ */
+
+private import internal.ExternBlockImpl
+import codeql.rust.elements.Abi
+import codeql.rust.elements.Attr
+import codeql.rust.elements.ExternItemList
+import codeql.rust.elements.Item
+
+/**
+ * A ExternBlock. For example:
+ * ```rust
+ * todo!()
+ * ```
+ */
+final class ExternBlock = Impl::ExternBlock;
diff --git a/rust/ql/lib/codeql/rust/elements/ExternCrate.qll b/rust/ql/lib/codeql/rust/elements/ExternCrate.qll
new file mode 100644
index 00000000000..f76857a8058
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/ExternCrate.qll
@@ -0,0 +1,19 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `ExternCrate`.
+ */
+
+private import internal.ExternCrateImpl
+import codeql.rust.elements.Attr
+import codeql.rust.elements.Item
+import codeql.rust.elements.NameRef
+import codeql.rust.elements.Rename
+import codeql.rust.elements.Visibility
+
+/**
+ * A ExternCrate. For example:
+ * ```rust
+ * todo!()
+ * ```
+ */
+final class ExternCrate = Impl::ExternCrate;
diff --git a/rust/ql/lib/codeql/rust/elements/ExternItem.qll b/rust/ql/lib/codeql/rust/elements/ExternItem.qll
new file mode 100644
index 00000000000..e15a22a702d
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/ExternItem.qll
@@ -0,0 +1,15 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `ExternItem`.
+ */
+
+private import internal.ExternItemImpl
+import codeql.rust.elements.AstNode
+
+/**
+ * A ExternItem. For example:
+ * ```rust
+ * todo!()
+ * ```
+ */
+final class ExternItem = Impl::ExternItem;
diff --git a/rust/ql/lib/codeql/rust/elements/ExternItemList.qll b/rust/ql/lib/codeql/rust/elements/ExternItemList.qll
new file mode 100644
index 00000000000..5047b23daee
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/ExternItemList.qll
@@ -0,0 +1,17 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `ExternItemList`.
+ */
+
+private import internal.ExternItemListImpl
+import codeql.rust.elements.AstNode
+import codeql.rust.elements.Attr
+import codeql.rust.elements.ExternItem
+
+/**
+ * A ExternItemList. For example:
+ * ```rust
+ * todo!()
+ * ```
+ */
+final class ExternItemList = Impl::ExternItemList;
diff --git a/rust/ql/lib/codeql/rust/elements/FieldExpr.qll b/rust/ql/lib/codeql/rust/elements/FieldExpr.qll
index 602457fde52..ab8a9594954 100644
--- a/rust/ql/lib/codeql/rust/elements/FieldExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/FieldExpr.qll
@@ -4,7 +4,9 @@
  */
 
 private import internal.FieldExprImpl
+import codeql.rust.elements.Attr
 import codeql.rust.elements.Expr
+import codeql.rust.elements.NameRef
 
 /**
  * A field access expression. For example:
diff --git a/rust/ql/lib/codeql/rust/elements/FieldList.qll b/rust/ql/lib/codeql/rust/elements/FieldList.qll
new file mode 100644
index 00000000000..ce71dd9af02
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/FieldList.qll
@@ -0,0 +1,15 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `FieldList`.
+ */
+
+private import internal.FieldListImpl
+import codeql.rust.elements.AstNode
+
+/**
+ * A FieldList. For example:
+ * ```rust
+ * todo!()
+ * ```
+ */
+final class FieldList = Impl::FieldList;
diff --git a/rust/ql/lib/codeql/rust/elements/FnPtrType.qll b/rust/ql/lib/codeql/rust/elements/FnPtrType.qll
new file mode 100644
index 00000000000..e0ed6490b5f
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/FnPtrType.qll
@@ -0,0 +1,18 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `FnPtrType`.
+ */
+
+private import internal.FnPtrTypeImpl
+import codeql.rust.elements.Abi
+import codeql.rust.elements.ParamList
+import codeql.rust.elements.RetType
+import codeql.rust.elements.TypeRef
+
+/**
+ * A FnPtrType. For example:
+ * ```rust
+ * todo!()
+ * ```
+ */
+final class FnPtrType = Impl::FnPtrType;
diff --git a/rust/ql/lib/codeql/rust/elements/ForExpr.qll b/rust/ql/lib/codeql/rust/elements/ForExpr.qll
new file mode 100644
index 00000000000..c4ef6f9faff
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/ForExpr.qll
@@ -0,0 +1,19 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `ForExpr`.
+ */
+
+private import internal.ForExprImpl
+import codeql.rust.elements.Attr
+import codeql.rust.elements.BlockExpr
+import codeql.rust.elements.Expr
+import codeql.rust.elements.Label
+import codeql.rust.elements.Pat
+
+/**
+ * A ForExpr. For example:
+ * ```rust
+ * todo!()
+ * ```
+ */
+final class ForExpr = Impl::ForExpr;
diff --git a/rust/ql/lib/codeql/rust/elements/ForType.qll b/rust/ql/lib/codeql/rust/elements/ForType.qll
new file mode 100644
index 00000000000..ec6bae3ab95
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/ForType.qll
@@ -0,0 +1,16 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `ForType`.
+ */
+
+private import internal.ForTypeImpl
+import codeql.rust.elements.GenericParamList
+import codeql.rust.elements.TypeRef
+
+/**
+ * A ForType. For example:
+ * ```rust
+ * todo!()
+ * ```
+ */
+final class ForType = Impl::ForType;
diff --git a/rust/ql/lib/codeql/rust/elements/Format.qll b/rust/ql/lib/codeql/rust/elements/Format.qll
new file mode 100644
index 00000000000..0c8b5d1c541
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/Format.qll
@@ -0,0 +1,16 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `Format`.
+ */
+
+private import internal.FormatImpl
+import codeql.rust.elements.FormatArgsExpr
+import codeql.rust.elements.Locatable
+
+/**
+ * A format element in a formatting template. For example the `{}` in:
+ * ```rust
+ * println!("Hello {}", "world");
+ * ```
+ */
+final class Format = Impl::Format;
diff --git a/rust/ql/lib/codeql/rust/elements/FormatArgsArg.qll b/rust/ql/lib/codeql/rust/elements/FormatArgsArg.qll
new file mode 100644
index 00000000000..fc461602dd6
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/FormatArgsArg.qll
@@ -0,0 +1,17 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `FormatArgsArg`.
+ */
+
+private import internal.FormatArgsArgImpl
+import codeql.rust.elements.AstNode
+import codeql.rust.elements.Expr
+import codeql.rust.elements.Name
+
+/**
+ * A FormatArgsArg. For example:
+ * ```rust
+ * todo!()
+ * ```
+ */
+final class FormatArgsArg = Impl::FormatArgsArg;
diff --git a/rust/ql/lib/codeql/rust/elements/FormatArgsExpr.qll b/rust/ql/lib/codeql/rust/elements/FormatArgsExpr.qll
new file mode 100644
index 00000000000..226b4d211aa
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/FormatArgsExpr.qll
@@ -0,0 +1,17 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `FormatArgsExpr`.
+ */
+
+private import internal.FormatArgsExprImpl
+import codeql.rust.elements.Attr
+import codeql.rust.elements.Expr
+import codeql.rust.elements.FormatArgsArg
+
+/**
+ * A FormatArgsExpr. For example:
+ * ```rust
+ * todo!()
+ * ```
+ */
+final class FormatArgsExpr = Impl::FormatArgsExpr;
diff --git a/rust/ql/lib/codeql/rust/elements/FormatArgument.qll b/rust/ql/lib/codeql/rust/elements/FormatArgument.qll
new file mode 100644
index 00000000000..62313c52372
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/FormatArgument.qll
@@ -0,0 +1,20 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `FormatArgument`.
+ */
+
+private import internal.FormatArgumentImpl
+import codeql.rust.elements.Format
+import codeql.rust.elements.Locatable
+
+/**
+ * An argument in a format element in a formatting template. For example the `width`, `precision`, and `value` in:
+ * ```rust
+ * println!("Value {value:#width$.precision$}");
+ * ```
+ * or the `0`, `1` and `2` in:
+ * ```rust
+ * println!("Value {0:#1$.2$}", value, width, precision);
+ * ```
+ */
+final class FormatArgument = Impl::FormatArgument;
diff --git a/rust/ql/lib/codeql/rust/elements/FormatTemplateVariableAccess.qll b/rust/ql/lib/codeql/rust/elements/FormatTemplateVariableAccess.qll
new file mode 100644
index 00000000000..5d3923a06a9
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/FormatTemplateVariableAccess.qll
@@ -0,0 +1,9 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `FormatTemplateVariableAccess`.
+ */
+
+private import internal.FormatTemplateVariableAccessImpl
+import codeql.rust.elements.PathExprBase
+
+final class FormatTemplateVariableAccess = Impl::FormatTemplateVariableAccess;
diff --git a/rust/ql/lib/codeql/rust/elements/Function.qll b/rust/ql/lib/codeql/rust/elements/Function.qll
index 0d0dae4e9a6..2557429f60f 100644
--- a/rust/ql/lib/codeql/rust/elements/Function.qll
+++ b/rust/ql/lib/codeql/rust/elements/Function.qll
@@ -4,8 +4,17 @@
  */
 
 private import internal.FunctionImpl
-import codeql.rust.elements.Declaration
-import codeql.rust.elements.Expr
+import codeql.rust.elements.Abi
+import codeql.rust.elements.AssocItem
+import codeql.rust.elements.BlockExpr
+import codeql.rust.elements.Callable
+import codeql.rust.elements.ExternItem
+import codeql.rust.elements.GenericParamList
+import codeql.rust.elements.Item
+import codeql.rust.elements.Name
+import codeql.rust.elements.RetType
+import codeql.rust.elements.Visibility
+import codeql.rust.elements.WhereClause
 
 /**
  * A function declaration. For example
diff --git a/rust/ql/lib/codeql/rust/elements/GenericArg.qll b/rust/ql/lib/codeql/rust/elements/GenericArg.qll
new file mode 100644
index 00000000000..0958b33326f
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/GenericArg.qll
@@ -0,0 +1,15 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `GenericArg`.
+ */
+
+private import internal.GenericArgImpl
+import codeql.rust.elements.AstNode
+
+/**
+ * A GenericArg. For example:
+ * ```rust
+ * todo!()
+ * ```
+ */
+final class GenericArg = Impl::GenericArg;
diff --git a/rust/ql/lib/codeql/rust/elements/GenericArgList.qll b/rust/ql/lib/codeql/rust/elements/GenericArgList.qll
index 25ef0bc71ae..74ac1ba688e 100644
--- a/rust/ql/lib/codeql/rust/elements/GenericArgList.qll
+++ b/rust/ql/lib/codeql/rust/elements/GenericArgList.qll
@@ -5,7 +5,7 @@
 
 private import internal.GenericArgListImpl
 import codeql.rust.elements.AstNode
-import codeql.rust.elements.Unimplemented
+import codeql.rust.elements.GenericArg
 
 /**
  * The base class for generic arguments.
diff --git a/rust/ql/lib/codeql/rust/elements/GenericParam.qll b/rust/ql/lib/codeql/rust/elements/GenericParam.qll
new file mode 100644
index 00000000000..a7569c08f99
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/GenericParam.qll
@@ -0,0 +1,15 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `GenericParam`.
+ */
+
+private import internal.GenericParamImpl
+import codeql.rust.elements.AstNode
+
+/**
+ * A GenericParam. For example:
+ * ```rust
+ * todo!()
+ * ```
+ */
+final class GenericParam = Impl::GenericParam;
diff --git a/rust/ql/lib/codeql/rust/elements/GenericParamList.qll b/rust/ql/lib/codeql/rust/elements/GenericParamList.qll
new file mode 100644
index 00000000000..ea6756f5abf
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/GenericParamList.qll
@@ -0,0 +1,16 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `GenericParamList`.
+ */
+
+private import internal.GenericParamListImpl
+import codeql.rust.elements.AstNode
+import codeql.rust.elements.GenericParam
+
+/**
+ * A GenericParamList. For example:
+ * ```rust
+ * todo!()
+ * ```
+ */
+final class GenericParamList = Impl::GenericParamList;
diff --git a/rust/ql/lib/codeql/rust/elements/IdentPat.qll b/rust/ql/lib/codeql/rust/elements/IdentPat.qll
index c2383278f1c..91ad47b42e1 100644
--- a/rust/ql/lib/codeql/rust/elements/IdentPat.qll
+++ b/rust/ql/lib/codeql/rust/elements/IdentPat.qll
@@ -4,6 +4,8 @@
  */
 
 private import internal.IdentPatImpl
+import codeql.rust.elements.Attr
+import codeql.rust.elements.Name
 import codeql.rust.elements.Pat
 
 /**
diff --git a/rust/ql/lib/codeql/rust/elements/IfExpr.qll b/rust/ql/lib/codeql/rust/elements/IfExpr.qll
index a42381d46aa..d3689b9957a 100644
--- a/rust/ql/lib/codeql/rust/elements/IfExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/IfExpr.qll
@@ -4,6 +4,8 @@
  */
 
 private import internal.IfExprImpl
+import codeql.rust.elements.Attr
+import codeql.rust.elements.BlockExpr
 import codeql.rust.elements.Expr
 
 /**
@@ -18,7 +20,7 @@ import codeql.rust.elements.Expr
  *     1
  * } else {
  *     0
- * }
+ * };
  * ```
  */
 final class IfExpr = Impl::IfExpr;
diff --git a/rust/ql/lib/codeql/rust/elements/Impl.qll b/rust/ql/lib/codeql/rust/elements/Impl.qll
new file mode 100644
index 00000000000..747cbe90cc6
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/Impl.qll
@@ -0,0 +1,21 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `Impl`.
+ */
+
+private import internal.ImplImpl
+import codeql.rust.elements.AssocItemList
+import codeql.rust.elements.Attr
+import codeql.rust.elements.GenericParamList
+import codeql.rust.elements.Item
+import codeql.rust.elements.TypeRef
+import codeql.rust.elements.Visibility
+import codeql.rust.elements.WhereClause
+
+/**
+ * A Impl. For example:
+ * ```rust
+ * todo!()
+ * ```
+ */
+final class Impl = Impl::Impl;
diff --git a/rust/ql/lib/codeql/rust/elements/ImplTraitType.qll b/rust/ql/lib/codeql/rust/elements/ImplTraitType.qll
new file mode 100644
index 00000000000..7f3a8a96159
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/ImplTraitType.qll
@@ -0,0 +1,16 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `ImplTraitType`.
+ */
+
+private import internal.ImplTraitTypeImpl
+import codeql.rust.elements.TypeBoundList
+import codeql.rust.elements.TypeRef
+
+/**
+ * A ImplTraitType. For example:
+ * ```rust
+ * todo!()
+ * ```
+ */
+final class ImplTraitType = Impl::ImplTraitType;
diff --git a/rust/ql/lib/codeql/rust/elements/IndexExpr.qll b/rust/ql/lib/codeql/rust/elements/IndexExpr.qll
index eb410c53552..ea19aad353d 100644
--- a/rust/ql/lib/codeql/rust/elements/IndexExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/IndexExpr.qll
@@ -4,6 +4,7 @@
  */
 
 private import internal.IndexExprImpl
+import codeql.rust.elements.Attr
 import codeql.rust.elements.Expr
 
 /**
diff --git a/rust/ql/lib/codeql/rust/elements/InferType.qll b/rust/ql/lib/codeql/rust/elements/InferType.qll
new file mode 100644
index 00000000000..ae0f6eff7d5
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/InferType.qll
@@ -0,0 +1,15 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `InferType`.
+ */
+
+private import internal.InferTypeImpl
+import codeql.rust.elements.TypeRef
+
+/**
+ * A InferType. For example:
+ * ```rust
+ * todo!()
+ * ```
+ */
+final class InferType = Impl::InferType;
diff --git a/rust/ql/lib/codeql/rust/elements/Item.qll b/rust/ql/lib/codeql/rust/elements/Item.qll
new file mode 100644
index 00000000000..838ba32b964
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/Item.qll
@@ -0,0 +1,15 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `Item`.
+ */
+
+private import internal.ItemImpl
+import codeql.rust.elements.Stmt
+
+/**
+ * A Item. For example:
+ * ```rust
+ * todo!()
+ * ```
+ */
+final class Item = Impl::Item;
diff --git a/rust/ql/lib/codeql/rust/elements/ItemList.qll b/rust/ql/lib/codeql/rust/elements/ItemList.qll
new file mode 100644
index 00000000000..631b875820c
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/ItemList.qll
@@ -0,0 +1,17 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `ItemList`.
+ */
+
+private import internal.ItemListImpl
+import codeql.rust.elements.AstNode
+import codeql.rust.elements.Attr
+import codeql.rust.elements.Item
+
+/**
+ * A ItemList. For example:
+ * ```rust
+ * todo!()
+ * ```
+ */
+final class ItemList = Impl::ItemList;
diff --git a/rust/ql/lib/codeql/rust/elements/ItemStmt.qll b/rust/ql/lib/codeql/rust/elements/ItemStmt.qll
deleted file mode 100644
index 39de9b0667d..00000000000
--- a/rust/ql/lib/codeql/rust/elements/ItemStmt.qll
+++ /dev/null
@@ -1,18 +0,0 @@
-// generated by codegen, do not edit
-/**
- * This module provides the public class `ItemStmt`.
- */
-
-private import internal.ItemStmtImpl
-import codeql.rust.elements.Stmt
-
-/**
- * An item statement. For example:
- * ```rust
- * fn print_hello() {
- *     println!("Hello, world!");
- * }
- * print_hello();
- * ```
- */
-final class ItemStmt = Impl::ItemStmt;
diff --git a/rust/ql/lib/codeql/rust/elements/Label.qll b/rust/ql/lib/codeql/rust/elements/Label.qll
index f660e668432..a2a6eb28f5c 100644
--- a/rust/ql/lib/codeql/rust/elements/Label.qll
+++ b/rust/ql/lib/codeql/rust/elements/Label.qll
@@ -5,6 +5,7 @@
 
 private import internal.LabelImpl
 import codeql.rust.elements.AstNode
+import codeql.rust.elements.Lifetime
 
 /**
  * A label. For example:
diff --git a/rust/ql/lib/codeql/rust/elements/LetElse.qll b/rust/ql/lib/codeql/rust/elements/LetElse.qll
new file mode 100644
index 00000000000..1129ae3ff72
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/LetElse.qll
@@ -0,0 +1,16 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `LetElse`.
+ */
+
+private import internal.LetElseImpl
+import codeql.rust.elements.AstNode
+import codeql.rust.elements.BlockExpr
+
+/**
+ * A LetElse. For example:
+ * ```rust
+ * todo!()
+ * ```
+ */
+final class LetElse = Impl::LetElse;
diff --git a/rust/ql/lib/codeql/rust/elements/LetExpr.qll b/rust/ql/lib/codeql/rust/elements/LetExpr.qll
index bb82e058214..0792a10cbb7 100644
--- a/rust/ql/lib/codeql/rust/elements/LetExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/LetExpr.qll
@@ -4,6 +4,7 @@
  */
 
 private import internal.LetExprImpl
+import codeql.rust.elements.Attr
 import codeql.rust.elements.Expr
 import codeql.rust.elements.Pat
 
diff --git a/rust/ql/lib/codeql/rust/elements/LetStmt.qll b/rust/ql/lib/codeql/rust/elements/LetStmt.qll
index 1a840951c4b..63bf60e3e6f 100644
--- a/rust/ql/lib/codeql/rust/elements/LetStmt.qll
+++ b/rust/ql/lib/codeql/rust/elements/LetStmt.qll
@@ -4,7 +4,9 @@
  */
 
 private import internal.LetStmtImpl
+import codeql.rust.elements.Attr
 import codeql.rust.elements.Expr
+import codeql.rust.elements.LetElse
 import codeql.rust.elements.Pat
 import codeql.rust.elements.Stmt
 import codeql.rust.elements.TypeRef
diff --git a/rust/ql/lib/codeql/rust/elements/Lifetime.qll b/rust/ql/lib/codeql/rust/elements/Lifetime.qll
new file mode 100644
index 00000000000..512d04c1ee9
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/Lifetime.qll
@@ -0,0 +1,15 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `Lifetime`.
+ */
+
+private import internal.LifetimeImpl
+import codeql.rust.elements.AstNode
+
+/**
+ * A Lifetime. For example:
+ * ```rust
+ * todo!()
+ * ```
+ */
+final class Lifetime = Impl::Lifetime;
diff --git a/rust/ql/lib/codeql/rust/elements/LifetimeArg.qll b/rust/ql/lib/codeql/rust/elements/LifetimeArg.qll
new file mode 100644
index 00000000000..35342e96c03
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/LifetimeArg.qll
@@ -0,0 +1,16 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `LifetimeArg`.
+ */
+
+private import internal.LifetimeArgImpl
+import codeql.rust.elements.GenericArg
+import codeql.rust.elements.Lifetime
+
+/**
+ * A LifetimeArg. For example:
+ * ```rust
+ * todo!()
+ * ```
+ */
+final class LifetimeArg = Impl::LifetimeArg;
diff --git a/rust/ql/lib/codeql/rust/elements/LifetimeParam.qll b/rust/ql/lib/codeql/rust/elements/LifetimeParam.qll
new file mode 100644
index 00000000000..f3aa605c665
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/LifetimeParam.qll
@@ -0,0 +1,18 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `LifetimeParam`.
+ */
+
+private import internal.LifetimeParamImpl
+import codeql.rust.elements.Attr
+import codeql.rust.elements.GenericParam
+import codeql.rust.elements.Lifetime
+import codeql.rust.elements.TypeBoundList
+
+/**
+ * A LifetimeParam. For example:
+ * ```rust
+ * todo!()
+ * ```
+ */
+final class LifetimeParam = Impl::LifetimeParam;
diff --git a/rust/ql/lib/codeql/rust/elements/LiteralExpr.qll b/rust/ql/lib/codeql/rust/elements/LiteralExpr.qll
index 443497ee52a..91fcd8910ce 100644
--- a/rust/ql/lib/codeql/rust/elements/LiteralExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/LiteralExpr.qll
@@ -4,6 +4,7 @@
  */
 
 private import internal.LiteralExprImpl
+import codeql.rust.elements.Attr
 import codeql.rust.elements.Expr
 
 /**
diff --git a/rust/ql/lib/codeql/rust/elements/LiteralPat.qll b/rust/ql/lib/codeql/rust/elements/LiteralPat.qll
index a769e108301..92afa2074c7 100644
--- a/rust/ql/lib/codeql/rust/elements/LiteralPat.qll
+++ b/rust/ql/lib/codeql/rust/elements/LiteralPat.qll
@@ -4,7 +4,7 @@
  */
 
 private import internal.LiteralPatImpl
-import codeql.rust.elements.Expr
+import codeql.rust.elements.LiteralExpr
 import codeql.rust.elements.Pat
 
 /**
diff --git a/rust/ql/lib/codeql/rust/elements/LogicalOperation.qll b/rust/ql/lib/codeql/rust/elements/LogicalOperation.qll
new file mode 100644
index 00000000000..fdbfb5d4613
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/LogicalOperation.qll
@@ -0,0 +1,33 @@
+private import codeql.rust.elements.Expr
+private import codeql.rust.elements.BinaryExpr
+private import codeql.rust.elements.PrefixExpr
+
+abstract private class LogicalOperationImpl extends Expr {
+  abstract Expr getAnOperand();
+}
+
+final class LogicalOperation = LogicalOperationImpl;
+
+abstract private class BinaryLogicalOperationImpl extends BinaryExpr, LogicalOperationImpl {
+  override Expr getAnOperand() { result = [this.getLhs(), this.getRhs()] }
+}
+
+final class BinaryLogicalOperation = BinaryLogicalOperationImpl;
+
+final class LogicalAndExpr extends BinaryLogicalOperationImpl, BinaryExpr {
+  LogicalAndExpr() { this.getOperatorName() = "&&" }
+}
+
+final class LogicalOrExpr extends BinaryLogicalOperationImpl {
+  LogicalOrExpr() { this.getOperatorName() = "||" }
+}
+
+abstract private class UnaryLogicalOperationImpl extends PrefixExpr, LogicalOperationImpl { }
+
+final class UnaryLogicalOperation = UnaryLogicalOperationImpl;
+
+final class LogicalNotExpr extends UnaryLogicalOperationImpl {
+  LogicalNotExpr() { this.getOperatorName() = "!" }
+
+  override Expr getAnOperand() { result = this.getExpr() }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/LoopExpr.qll b/rust/ql/lib/codeql/rust/elements/LoopExpr.qll
index 713dd0ebab4..6abc449c626 100644
--- a/rust/ql/lib/codeql/rust/elements/LoopExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/LoopExpr.qll
@@ -4,6 +4,8 @@
  */
 
 private import internal.LoopExprImpl
+import codeql.rust.elements.Attr
+import codeql.rust.elements.BlockExpr
 import codeql.rust.elements.Expr
 import codeql.rust.elements.Label
 
diff --git a/rust/ql/lib/codeql/rust/elements/MacroCall.qll b/rust/ql/lib/codeql/rust/elements/MacroCall.qll
new file mode 100644
index 00000000000..b0985ea3fed
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/MacroCall.qll
@@ -0,0 +1,21 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `MacroCall`.
+ */
+
+private import internal.MacroCallImpl
+import codeql.rust.elements.AssocItem
+import codeql.rust.elements.AstNode
+import codeql.rust.elements.Attr
+import codeql.rust.elements.ExternItem
+import codeql.rust.elements.Item
+import codeql.rust.elements.Path
+import codeql.rust.elements.TokenTree
+
+/**
+ * A MacroCall. For example:
+ * ```rust
+ * todo!()
+ * ```
+ */
+final class MacroCall = Impl::MacroCall;
diff --git a/rust/ql/lib/codeql/rust/elements/MacroDef.qll b/rust/ql/lib/codeql/rust/elements/MacroDef.qll
new file mode 100644
index 00000000000..3ae14a9e662
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/MacroDef.qll
@@ -0,0 +1,19 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `MacroDef`.
+ */
+
+private import internal.MacroDefImpl
+import codeql.rust.elements.Attr
+import codeql.rust.elements.Item
+import codeql.rust.elements.Name
+import codeql.rust.elements.TokenTree
+import codeql.rust.elements.Visibility
+
+/**
+ * A MacroDef. For example:
+ * ```rust
+ * todo!()
+ * ```
+ */
+final class MacroDef = Impl::MacroDef;
diff --git a/rust/ql/lib/codeql/rust/elements/MacroExpr.qll b/rust/ql/lib/codeql/rust/elements/MacroExpr.qll
new file mode 100644
index 00000000000..8085cabc3fe
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/MacroExpr.qll
@@ -0,0 +1,16 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `MacroExpr`.
+ */
+
+private import internal.MacroExprImpl
+import codeql.rust.elements.Expr
+import codeql.rust.elements.MacroCall
+
+/**
+ * A MacroExpr. For example:
+ * ```rust
+ * todo!()
+ * ```
+ */
+final class MacroExpr = Impl::MacroExpr;
diff --git a/rust/ql/lib/codeql/rust/elements/MacroItems.qll b/rust/ql/lib/codeql/rust/elements/MacroItems.qll
new file mode 100644
index 00000000000..e189c0dca2e
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/MacroItems.qll
@@ -0,0 +1,18 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `MacroItems`.
+ */
+
+private import internal.MacroItemsImpl
+import codeql.rust.elements.AstNode
+import codeql.rust.elements.Item
+
+/**
+ * A sequence of items generated by a `MacroCall`. For example:
+ * ```rust
+ * mod foo{
+ *     include!("common_definitions.rs");
+ * }
+ * ```
+ */
+final class MacroItems = Impl::MacroItems;
diff --git a/rust/ql/lib/codeql/rust/elements/MacroPat.qll b/rust/ql/lib/codeql/rust/elements/MacroPat.qll
new file mode 100644
index 00000000000..7bb99d04ec4
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/MacroPat.qll
@@ -0,0 +1,16 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `MacroPat`.
+ */
+
+private import internal.MacroPatImpl
+import codeql.rust.elements.MacroCall
+import codeql.rust.elements.Pat
+
+/**
+ * A MacroPat. For example:
+ * ```rust
+ * todo!()
+ * ```
+ */
+final class MacroPat = Impl::MacroPat;
diff --git a/rust/ql/lib/codeql/rust/elements/MacroRules.qll b/rust/ql/lib/codeql/rust/elements/MacroRules.qll
new file mode 100644
index 00000000000..afaf41bd15a
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/MacroRules.qll
@@ -0,0 +1,19 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `MacroRules`.
+ */
+
+private import internal.MacroRulesImpl
+import codeql.rust.elements.Attr
+import codeql.rust.elements.Item
+import codeql.rust.elements.Name
+import codeql.rust.elements.TokenTree
+import codeql.rust.elements.Visibility
+
+/**
+ * A MacroRules. For example:
+ * ```rust
+ * todo!()
+ * ```
+ */
+final class MacroRules = Impl::MacroRules;
diff --git a/rust/ql/lib/codeql/rust/elements/MacroStmts.qll b/rust/ql/lib/codeql/rust/elements/MacroStmts.qll
new file mode 100644
index 00000000000..77416d93699
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/MacroStmts.qll
@@ -0,0 +1,19 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `MacroStmts`.
+ */
+
+private import internal.MacroStmtsImpl
+import codeql.rust.elements.AstNode
+import codeql.rust.elements.Expr
+import codeql.rust.elements.Stmt
+
+/**
+ * A sequence of statements generated by a `MacroCall`. For example:
+ * ```rust
+ * fn main() {
+ *     println!("Hello, world!"); // This macro expands into a list of statements
+ * }
+ * ```
+ */
+final class MacroStmts = Impl::MacroStmts;
diff --git a/rust/ql/lib/codeql/rust/elements/MacroType.qll b/rust/ql/lib/codeql/rust/elements/MacroType.qll
new file mode 100644
index 00000000000..38be0fa4a20
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/MacroType.qll
@@ -0,0 +1,16 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `MacroType`.
+ */
+
+private import internal.MacroTypeImpl
+import codeql.rust.elements.MacroCall
+import codeql.rust.elements.TypeRef
+
+/**
+ * A MacroType. For example:
+ * ```rust
+ * todo!()
+ * ```
+ */
+final class MacroType = Impl::MacroType;
diff --git a/rust/ql/lib/codeql/rust/elements/MatchArm.qll b/rust/ql/lib/codeql/rust/elements/MatchArm.qll
index c7061c17617..39505198021 100644
--- a/rust/ql/lib/codeql/rust/elements/MatchArm.qll
+++ b/rust/ql/lib/codeql/rust/elements/MatchArm.qll
@@ -5,7 +5,9 @@
 
 private import internal.MatchArmImpl
 import codeql.rust.elements.AstNode
+import codeql.rust.elements.Attr
 import codeql.rust.elements.Expr
+import codeql.rust.elements.MatchGuard
 import codeql.rust.elements.Pat
 
 /**
diff --git a/rust/ql/lib/codeql/rust/elements/MatchArmList.qll b/rust/ql/lib/codeql/rust/elements/MatchArmList.qll
new file mode 100644
index 00000000000..ce9b1edf329
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/MatchArmList.qll
@@ -0,0 +1,17 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `MatchArmList`.
+ */
+
+private import internal.MatchArmListImpl
+import codeql.rust.elements.AstNode
+import codeql.rust.elements.Attr
+import codeql.rust.elements.MatchArm
+
+/**
+ * A MatchArmList. For example:
+ * ```rust
+ * todo!()
+ * ```
+ */
+final class MatchArmList = Impl::MatchArmList;
diff --git a/rust/ql/lib/codeql/rust/elements/MatchExpr.qll b/rust/ql/lib/codeql/rust/elements/MatchExpr.qll
index 4ba68ddc217..ec1a5c538a4 100644
--- a/rust/ql/lib/codeql/rust/elements/MatchExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/MatchExpr.qll
@@ -4,8 +4,9 @@
  */
 
 private import internal.MatchExprImpl
+import codeql.rust.elements.Attr
 import codeql.rust.elements.Expr
-import codeql.rust.elements.MatchArm
+import codeql.rust.elements.MatchArmList
 
 /**
  * A match expression. For example:
diff --git a/rust/ql/lib/codeql/rust/elements/MatchGuard.qll b/rust/ql/lib/codeql/rust/elements/MatchGuard.qll
new file mode 100644
index 00000000000..79f90f151c9
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/MatchGuard.qll
@@ -0,0 +1,16 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `MatchGuard`.
+ */
+
+private import internal.MatchGuardImpl
+import codeql.rust.elements.AstNode
+import codeql.rust.elements.Expr
+
+/**
+ * A MatchGuard. For example:
+ * ```rust
+ * todo!()
+ * ```
+ */
+final class MatchGuard = Impl::MatchGuard;
diff --git a/rust/ql/lib/codeql/rust/elements/Meta.qll b/rust/ql/lib/codeql/rust/elements/Meta.qll
new file mode 100644
index 00000000000..62b8e008ef7
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/Meta.qll
@@ -0,0 +1,18 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `Meta`.
+ */
+
+private import internal.MetaImpl
+import codeql.rust.elements.AstNode
+import codeql.rust.elements.Expr
+import codeql.rust.elements.Path
+import codeql.rust.elements.TokenTree
+
+/**
+ * A Meta. For example:
+ * ```rust
+ * todo!()
+ * ```
+ */
+final class Meta = Impl::Meta;
diff --git a/rust/ql/lib/codeql/rust/elements/MethodCallExpr.qll b/rust/ql/lib/codeql/rust/elements/MethodCallExpr.qll
index 47f88b0c474..c3d62106100 100644
--- a/rust/ql/lib/codeql/rust/elements/MethodCallExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/MethodCallExpr.qll
@@ -4,8 +4,11 @@
  */
 
 private import internal.MethodCallExprImpl
+import codeql.rust.elements.CallExprBase
 import codeql.rust.elements.Expr
 import codeql.rust.elements.GenericArgList
+import codeql.rust.elements.NameRef
+import codeql.rust.elements.Resolvable
 
 /**
  * A method call expression. For example:
diff --git a/rust/ql/lib/codeql/rust/elements/MissingExpr.qll b/rust/ql/lib/codeql/rust/elements/MissingExpr.qll
deleted file mode 100644
index e2b1f088f4c..00000000000
--- a/rust/ql/lib/codeql/rust/elements/MissingExpr.qll
+++ /dev/null
@@ -1,17 +0,0 @@
-// generated by codegen, do not edit
-/**
- * This module provides the public class `MissingExpr`.
- */
-
-private import internal.MissingExprImpl
-import codeql.rust.elements.Expr
-import codeql.rust.elements.Missing
-
-/**
- * A missing expression, used as a placeholder for incomplete syntax.
- *
- * ```rust
- * let x = non_existing_macro!();
- * ```
- */
-final class MissingExpr = Impl::MissingExpr;
diff --git a/rust/ql/lib/codeql/rust/elements/MissingPat.qll b/rust/ql/lib/codeql/rust/elements/MissingPat.qll
deleted file mode 100644
index 082bee502d9..00000000000
--- a/rust/ql/lib/codeql/rust/elements/MissingPat.qll
+++ /dev/null
@@ -1,18 +0,0 @@
-// generated by codegen, do not edit
-/**
- * This module provides the public class `MissingPat`.
- */
-
-private import internal.MissingPatImpl
-import codeql.rust.elements.Missing
-import codeql.rust.elements.Pat
-
-/**
- * A missing pattern, used as a place holder for incomplete syntax.
- * ```rust
- * match Some(42) {
- *     .. => "bad use of .. syntax",
- * };
- * ```
- */
-final class MissingPat = Impl::MissingPat;
diff --git a/rust/ql/lib/codeql/rust/elements/Module.qll b/rust/ql/lib/codeql/rust/elements/Module.qll
index aec64c86d2e..efb31c3e74f 100644
--- a/rust/ql/lib/codeql/rust/elements/Module.qll
+++ b/rust/ql/lib/codeql/rust/elements/Module.qll
@@ -4,7 +4,11 @@
  */
 
 private import internal.ModuleImpl
-import codeql.rust.elements.Declaration
+import codeql.rust.elements.Attr
+import codeql.rust.elements.Item
+import codeql.rust.elements.ItemList
+import codeql.rust.elements.Name
+import codeql.rust.elements.Visibility
 
 /**
  * A module declaration. For example:
diff --git a/rust/ql/lib/codeql/rust/elements/Name.qll b/rust/ql/lib/codeql/rust/elements/Name.qll
new file mode 100644
index 00000000000..74c74acc44d
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/Name.qll
@@ -0,0 +1,15 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `Name`.
+ */
+
+private import internal.NameImpl
+import codeql.rust.elements.AstNode
+
+/**
+ * A Name. For example:
+ * ```rust
+ * todo!()
+ * ```
+ */
+final class Name = Impl::Name;
diff --git a/rust/ql/lib/codeql/rust/elements/NameRef.qll b/rust/ql/lib/codeql/rust/elements/NameRef.qll
new file mode 100644
index 00000000000..b9bc8ad82e1
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/NameRef.qll
@@ -0,0 +1,15 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `NameRef`.
+ */
+
+private import internal.NameRefImpl
+import codeql.rust.elements.AstNode
+
+/**
+ * A NameRef. For example:
+ * ```rust
+ * todo!()
+ * ```
+ */
+final class NameRef = Impl::NameRef;
diff --git a/rust/ql/lib/codeql/rust/elements/NamedFormatArgument.qll b/rust/ql/lib/codeql/rust/elements/NamedFormatArgument.qll
new file mode 100644
index 00000000000..ff22b674543
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/NamedFormatArgument.qll
@@ -0,0 +1,7 @@
+/**
+ * This module provides the public class `NamedFormatArgument`.
+ */
+
+private import internal.FormatArgumentImpl
+
+final class NamedFormatArgument = Impl::NamedFormatArgument;
diff --git a/rust/ql/lib/codeql/rust/elements/NeverType.qll b/rust/ql/lib/codeql/rust/elements/NeverType.qll
new file mode 100644
index 00000000000..3c46acd33ca
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/NeverType.qll
@@ -0,0 +1,15 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `NeverType`.
+ */
+
+private import internal.NeverTypeImpl
+import codeql.rust.elements.TypeRef
+
+/**
+ * A NeverType. For example:
+ * ```rust
+ * todo!()
+ * ```
+ */
+final class NeverType = Impl::NeverType;
diff --git a/rust/ql/lib/codeql/rust/elements/OffsetOfExpr.qll b/rust/ql/lib/codeql/rust/elements/OffsetOfExpr.qll
index 6e7d25d41c7..3cd31677a69 100644
--- a/rust/ql/lib/codeql/rust/elements/OffsetOfExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/OffsetOfExpr.qll
@@ -4,7 +4,9 @@
  */
 
 private import internal.OffsetOfExprImpl
+import codeql.rust.elements.Attr
 import codeql.rust.elements.Expr
+import codeql.rust.elements.NameRef
 import codeql.rust.elements.TypeRef
 
 /**
diff --git a/rust/ql/lib/codeql/rust/elements/Param.qll b/rust/ql/lib/codeql/rust/elements/Param.qll
new file mode 100644
index 00000000000..eb46d206ba4
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/Param.qll
@@ -0,0 +1,18 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `Param`.
+ */
+
+private import internal.ParamImpl
+import codeql.rust.elements.AstNode
+import codeql.rust.elements.Attr
+import codeql.rust.elements.Pat
+import codeql.rust.elements.TypeRef
+
+/**
+ * A Param. For example:
+ * ```rust
+ * todo!()
+ * ```
+ */
+final class Param = Impl::Param;
diff --git a/rust/ql/lib/codeql/rust/elements/ParamList.qll b/rust/ql/lib/codeql/rust/elements/ParamList.qll
new file mode 100644
index 00000000000..4678b78c3e6
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/ParamList.qll
@@ -0,0 +1,17 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `ParamList`.
+ */
+
+private import internal.ParamListImpl
+import codeql.rust.elements.AstNode
+import codeql.rust.elements.Param
+import codeql.rust.elements.SelfParam
+
+/**
+ * A ParamList. For example:
+ * ```rust
+ * todo!()
+ * ```
+ */
+final class ParamList = Impl::ParamList;
diff --git a/rust/ql/lib/codeql/rust/elements/ParenExpr.qll b/rust/ql/lib/codeql/rust/elements/ParenExpr.qll
new file mode 100644
index 00000000000..60466bdc7b7
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/ParenExpr.qll
@@ -0,0 +1,16 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `ParenExpr`.
+ */
+
+private import internal.ParenExprImpl
+import codeql.rust.elements.Attr
+import codeql.rust.elements.Expr
+
+/**
+ * A ParenExpr. For example:
+ * ```rust
+ * todo!()
+ * ```
+ */
+final class ParenExpr = Impl::ParenExpr;
diff --git a/rust/ql/lib/codeql/rust/elements/ParenPat.qll b/rust/ql/lib/codeql/rust/elements/ParenPat.qll
new file mode 100644
index 00000000000..291ddb76152
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/ParenPat.qll
@@ -0,0 +1,15 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `ParenPat`.
+ */
+
+private import internal.ParenPatImpl
+import codeql.rust.elements.Pat
+
+/**
+ * A ParenPat. For example:
+ * ```rust
+ * todo!()
+ * ```
+ */
+final class ParenPat = Impl::ParenPat;
diff --git a/rust/ql/lib/codeql/rust/elements/ParenType.qll b/rust/ql/lib/codeql/rust/elements/ParenType.qll
new file mode 100644
index 00000000000..cbf1b89dc5c
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/ParenType.qll
@@ -0,0 +1,15 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `ParenType`.
+ */
+
+private import internal.ParenTypeImpl
+import codeql.rust.elements.TypeRef
+
+/**
+ * A ParenType. For example:
+ * ```rust
+ * todo!()
+ * ```
+ */
+final class ParenType = Impl::ParenType;
diff --git a/rust/ql/lib/codeql/rust/elements/Path.qll b/rust/ql/lib/codeql/rust/elements/Path.qll
index df3f7fbaa2a..530c40397c3 100644
--- a/rust/ql/lib/codeql/rust/elements/Path.qll
+++ b/rust/ql/lib/codeql/rust/elements/Path.qll
@@ -4,8 +4,8 @@
  */
 
 private import internal.PathImpl
-import codeql.rust.elements.AstNode
-import codeql.rust.elements.Unimplemented
+import codeql.rust.elements.PathSegment
+import codeql.rust.elements.Resolvable
 
 /**
  * A path. For example:
diff --git a/rust/ql/lib/codeql/rust/elements/PathExpr.qll b/rust/ql/lib/codeql/rust/elements/PathExpr.qll
index ff640858bb6..e1bf10488e3 100644
--- a/rust/ql/lib/codeql/rust/elements/PathExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/PathExpr.qll
@@ -4,8 +4,9 @@
  */
 
 private import internal.PathExprImpl
-import codeql.rust.elements.Expr
+import codeql.rust.elements.Attr
 import codeql.rust.elements.Path
+import codeql.rust.elements.PathExprBase
 
 /**
  * A path expression. For example:
diff --git a/rust/ql/lib/codeql/rust/elements/PathExprBase.qll b/rust/ql/lib/codeql/rust/elements/PathExprBase.qll
new file mode 100644
index 00000000000..e2e45e718f0
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/PathExprBase.qll
@@ -0,0 +1,12 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `PathExprBase`.
+ */
+
+private import internal.PathExprBaseImpl
+import codeql.rust.elements.Expr
+
+/**
+ * A path expression or a variable access in a formatting template. See `PathExpr` and `FormatTemplateVariableAccess` for further details.
+ */
+final class PathExprBase = Impl::PathExprBase;
diff --git a/rust/ql/lib/codeql/rust/elements/PathSegment.qll b/rust/ql/lib/codeql/rust/elements/PathSegment.qll
new file mode 100644
index 00000000000..5566ba322b6
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/PathSegment.qll
@@ -0,0 +1,22 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `PathSegment`.
+ */
+
+private import internal.PathSegmentImpl
+import codeql.rust.elements.AstNode
+import codeql.rust.elements.GenericArgList
+import codeql.rust.elements.NameRef
+import codeql.rust.elements.ParamList
+import codeql.rust.elements.PathType
+import codeql.rust.elements.RetType
+import codeql.rust.elements.ReturnTypeSyntax
+import codeql.rust.elements.TypeRef
+
+/**
+ * A PathSegment. For example:
+ * ```rust
+ * todo!()
+ * ```
+ */
+final class PathSegment = Impl::PathSegment;
diff --git a/rust/ql/lib/codeql/rust/elements/PathType.qll b/rust/ql/lib/codeql/rust/elements/PathType.qll
new file mode 100644
index 00000000000..e313b9d1b56
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/PathType.qll
@@ -0,0 +1,16 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `PathType`.
+ */
+
+private import internal.PathTypeImpl
+import codeql.rust.elements.Path
+import codeql.rust.elements.TypeRef
+
+/**
+ * A PathType. For example:
+ * ```rust
+ * todo!()
+ * ```
+ */
+final class PathType = Impl::PathType;
diff --git a/rust/ql/lib/codeql/rust/elements/PositionalFormatArgument.qll b/rust/ql/lib/codeql/rust/elements/PositionalFormatArgument.qll
new file mode 100644
index 00000000000..e5fc88b14c4
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/PositionalFormatArgument.qll
@@ -0,0 +1,7 @@
+/**
+ * This module provides the public class `PositionalFormatArgument`.
+ */
+
+private import internal.FormatArgumentImpl
+
+final class PositionalFormatArgument = Impl::PositionalFormatArgument;
diff --git a/rust/ql/lib/codeql/rust/elements/PrefixExpr.qll b/rust/ql/lib/codeql/rust/elements/PrefixExpr.qll
index b171666401e..8bc627a39e7 100644
--- a/rust/ql/lib/codeql/rust/elements/PrefixExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/PrefixExpr.qll
@@ -4,14 +4,15 @@
  */
 
 private import internal.PrefixExprImpl
+import codeql.rust.elements.Attr
 import codeql.rust.elements.Expr
 
 /**
  * A unary operation expression. For example:
  * ```rust
- * let x = -42
- * let y = !true
- * let z = *ptr
+ * let x = -42;
+ * let y = !true;
+ * let z = *ptr;
  * ```
  */
 final class PrefixExpr = Impl::PrefixExpr;
diff --git a/rust/ql/lib/codeql/rust/elements/PtrType.qll b/rust/ql/lib/codeql/rust/elements/PtrType.qll
new file mode 100644
index 00000000000..4a40eaeeb48
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/PtrType.qll
@@ -0,0 +1,15 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `PtrType`.
+ */
+
+private import internal.PtrTypeImpl
+import codeql.rust.elements.TypeRef
+
+/**
+ * A PtrType. For example:
+ * ```rust
+ * todo!()
+ * ```
+ */
+final class PtrType = Impl::PtrType;
diff --git a/rust/ql/lib/codeql/rust/elements/RangeExpr.qll b/rust/ql/lib/codeql/rust/elements/RangeExpr.qll
index 37dd211ca2c..78fec598e0c 100644
--- a/rust/ql/lib/codeql/rust/elements/RangeExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/RangeExpr.qll
@@ -4,6 +4,7 @@
  */
 
 private import internal.RangeExprImpl
+import codeql.rust.elements.Attr
 import codeql.rust.elements.Expr
 
 /**
diff --git a/rust/ql/lib/codeql/rust/elements/RecordExpr.qll b/rust/ql/lib/codeql/rust/elements/RecordExpr.qll
index 4b5b420f346..90edf3d0c03 100644
--- a/rust/ql/lib/codeql/rust/elements/RecordExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/RecordExpr.qll
@@ -6,7 +6,7 @@
 private import internal.RecordExprImpl
 import codeql.rust.elements.Expr
 import codeql.rust.elements.Path
-import codeql.rust.elements.RecordExprField
+import codeql.rust.elements.RecordExprFieldList
 
 /**
  * A record expression. For example:
diff --git a/rust/ql/lib/codeql/rust/elements/RecordExprField.qll b/rust/ql/lib/codeql/rust/elements/RecordExprField.qll
index 290395bffa9..c17e1993ff8 100644
--- a/rust/ql/lib/codeql/rust/elements/RecordExprField.qll
+++ b/rust/ql/lib/codeql/rust/elements/RecordExprField.qll
@@ -5,7 +5,9 @@
 
 private import internal.RecordExprFieldImpl
 import codeql.rust.elements.AstNode
+import codeql.rust.elements.Attr
 import codeql.rust.elements.Expr
+import codeql.rust.elements.NameRef
 
 /**
  * A field in a record expression. For example `a: 1` in:
diff --git a/rust/ql/lib/codeql/rust/elements/RecordExprFieldList.qll b/rust/ql/lib/codeql/rust/elements/RecordExprFieldList.qll
new file mode 100644
index 00000000000..731dfb96262
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/RecordExprFieldList.qll
@@ -0,0 +1,18 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `RecordExprFieldList`.
+ */
+
+private import internal.RecordExprFieldListImpl
+import codeql.rust.elements.AstNode
+import codeql.rust.elements.Attr
+import codeql.rust.elements.Expr
+import codeql.rust.elements.RecordExprField
+
+/**
+ * A RecordExprFieldList. For example:
+ * ```rust
+ * todo!()
+ * ```
+ */
+final class RecordExprFieldList = Impl::RecordExprFieldList;
diff --git a/rust/ql/lib/codeql/rust/elements/RecordField.qll b/rust/ql/lib/codeql/rust/elements/RecordField.qll
new file mode 100644
index 00000000000..d5f4a6a021d
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/RecordField.qll
@@ -0,0 +1,19 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `RecordField`.
+ */
+
+private import internal.RecordFieldImpl
+import codeql.rust.elements.AstNode
+import codeql.rust.elements.Attr
+import codeql.rust.elements.Name
+import codeql.rust.elements.TypeRef
+import codeql.rust.elements.Visibility
+
+/**
+ * A RecordField. For example:
+ * ```rust
+ * todo!()
+ * ```
+ */
+final class RecordField = Impl::RecordField;
diff --git a/rust/ql/lib/codeql/rust/elements/RecordFieldList.qll b/rust/ql/lib/codeql/rust/elements/RecordFieldList.qll
new file mode 100644
index 00000000000..67fdc604e4d
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/RecordFieldList.qll
@@ -0,0 +1,16 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `RecordFieldList`.
+ */
+
+private import internal.RecordFieldListImpl
+import codeql.rust.elements.FieldList
+import codeql.rust.elements.RecordField
+
+/**
+ * A RecordFieldList. For example:
+ * ```rust
+ * todo!()
+ * ```
+ */
+final class RecordFieldList = Impl::RecordFieldList;
diff --git a/rust/ql/lib/codeql/rust/elements/RecordPat.qll b/rust/ql/lib/codeql/rust/elements/RecordPat.qll
index 83ded33a4aa..671bafda1c3 100644
--- a/rust/ql/lib/codeql/rust/elements/RecordPat.qll
+++ b/rust/ql/lib/codeql/rust/elements/RecordPat.qll
@@ -6,7 +6,7 @@
 private import internal.RecordPatImpl
 import codeql.rust.elements.Pat
 import codeql.rust.elements.Path
-import codeql.rust.elements.RecordPatField
+import codeql.rust.elements.RecordPatFieldList
 
 /**
  * A record pattern. For example:
diff --git a/rust/ql/lib/codeql/rust/elements/RecordPatField.qll b/rust/ql/lib/codeql/rust/elements/RecordPatField.qll
index 06a90462f0d..8e4545c61a3 100644
--- a/rust/ql/lib/codeql/rust/elements/RecordPatField.qll
+++ b/rust/ql/lib/codeql/rust/elements/RecordPatField.qll
@@ -5,6 +5,8 @@
 
 private import internal.RecordPatFieldImpl
 import codeql.rust.elements.AstNode
+import codeql.rust.elements.Attr
+import codeql.rust.elements.NameRef
 import codeql.rust.elements.Pat
 
 /**
diff --git a/rust/ql/lib/codeql/rust/elements/RecordPatFieldList.qll b/rust/ql/lib/codeql/rust/elements/RecordPatFieldList.qll
new file mode 100644
index 00000000000..1392d045d4e
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/RecordPatFieldList.qll
@@ -0,0 +1,17 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `RecordPatFieldList`.
+ */
+
+private import internal.RecordPatFieldListImpl
+import codeql.rust.elements.AstNode
+import codeql.rust.elements.RecordPatField
+import codeql.rust.elements.RestPat
+
+/**
+ * A RecordPatFieldList. For example:
+ * ```rust
+ * todo!()
+ * ```
+ */
+final class RecordPatFieldList = Impl::RecordPatFieldList;
diff --git a/rust/ql/lib/codeql/rust/elements/RefExpr.qll b/rust/ql/lib/codeql/rust/elements/RefExpr.qll
index 2eae0cd1803..8bbc0a8c87e 100644
--- a/rust/ql/lib/codeql/rust/elements/RefExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/RefExpr.qll
@@ -4,6 +4,7 @@
  */
 
 private import internal.RefExprImpl
+import codeql.rust.elements.Attr
 import codeql.rust.elements.Expr
 
 /**
diff --git a/rust/ql/lib/codeql/rust/elements/RefType.qll b/rust/ql/lib/codeql/rust/elements/RefType.qll
new file mode 100644
index 00000000000..71ecac73f53
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/RefType.qll
@@ -0,0 +1,16 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `RefType`.
+ */
+
+private import internal.RefTypeImpl
+import codeql.rust.elements.Lifetime
+import codeql.rust.elements.TypeRef
+
+/**
+ * A RefType. For example:
+ * ```rust
+ * todo!()
+ * ```
+ */
+final class RefType = Impl::RefType;
diff --git a/rust/ql/lib/codeql/rust/elements/Rename.qll b/rust/ql/lib/codeql/rust/elements/Rename.qll
new file mode 100644
index 00000000000..11b635b4af9
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/Rename.qll
@@ -0,0 +1,16 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `Rename`.
+ */
+
+private import internal.RenameImpl
+import codeql.rust.elements.AstNode
+import codeql.rust.elements.Name
+
+/**
+ * A Rename. For example:
+ * ```rust
+ * todo!()
+ * ```
+ */
+final class Rename = Impl::Rename;
diff --git a/rust/ql/lib/codeql/rust/elements/RepeatExpr.qll b/rust/ql/lib/codeql/rust/elements/RepeatExpr.qll
deleted file mode 100644
index 0dc435c2fae..00000000000
--- a/rust/ql/lib/codeql/rust/elements/RepeatExpr.qll
+++ /dev/null
@@ -1,16 +0,0 @@
-// generated by codegen, do not edit
-/**
- * This module provides the public class `RepeatExpr`.
- */
-
-private import internal.RepeatExprImpl
-import codeql.rust.elements.ArrayExpr
-import codeql.rust.elements.Expr
-
-/**
- * A repeat expression. For example:
- * ```rust
- * [1; 10];
- * ```
- */
-final class RepeatExpr = Impl::RepeatExpr;
diff --git a/rust/ql/lib/codeql/rust/elements/Resolvable.qll b/rust/ql/lib/codeql/rust/elements/Resolvable.qll
new file mode 100644
index 00000000000..e3e7b772501
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/Resolvable.qll
@@ -0,0 +1,12 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `Resolvable`.
+ */
+
+private import internal.ResolvableImpl
+import codeql.rust.elements.AstNode
+
+/**
+ * Either a `Path`, or a `MethodCallExpr`.
+ */
+final class Resolvable = Impl::Resolvable;
diff --git a/rust/ql/lib/codeql/rust/elements/RestPat.qll b/rust/ql/lib/codeql/rust/elements/RestPat.qll
new file mode 100644
index 00000000000..7a127cbc30a
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/RestPat.qll
@@ -0,0 +1,16 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `RestPat`.
+ */
+
+private import internal.RestPatImpl
+import codeql.rust.elements.Attr
+import codeql.rust.elements.Pat
+
+/**
+ * A RestPat. For example:
+ * ```rust
+ * todo!()
+ * ```
+ */
+final class RestPat = Impl::RestPat;
diff --git a/rust/ql/lib/codeql/rust/elements/RetType.qll b/rust/ql/lib/codeql/rust/elements/RetType.qll
new file mode 100644
index 00000000000..edca3af1b7a
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/RetType.qll
@@ -0,0 +1,16 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `RetType`.
+ */
+
+private import internal.RetTypeImpl
+import codeql.rust.elements.AstNode
+import codeql.rust.elements.TypeRef
+
+/**
+ * A RetType. For example:
+ * ```rust
+ * todo!()
+ * ```
+ */
+final class RetType = Impl::RetType;
diff --git a/rust/ql/lib/codeql/rust/elements/ReturnExpr.qll b/rust/ql/lib/codeql/rust/elements/ReturnExpr.qll
index db5ff7d08d6..73a499ec787 100644
--- a/rust/ql/lib/codeql/rust/elements/ReturnExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/ReturnExpr.qll
@@ -4,6 +4,7 @@
  */
 
 private import internal.ReturnExprImpl
+import codeql.rust.elements.Attr
 import codeql.rust.elements.Expr
 
 /**
diff --git a/rust/ql/lib/codeql/rust/elements/ReturnTypeSyntax.qll b/rust/ql/lib/codeql/rust/elements/ReturnTypeSyntax.qll
new file mode 100644
index 00000000000..85c42a697f2
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/ReturnTypeSyntax.qll
@@ -0,0 +1,15 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `ReturnTypeSyntax`.
+ */
+
+private import internal.ReturnTypeSyntaxImpl
+import codeql.rust.elements.AstNode
+
+/**
+ * A ReturnTypeSyntax. For example:
+ * ```rust
+ * todo!()
+ * ```
+ */
+final class ReturnTypeSyntax = Impl::ReturnTypeSyntax;
diff --git a/rust/ql/lib/codeql/rust/elements/SelfParam.qll b/rust/ql/lib/codeql/rust/elements/SelfParam.qll
new file mode 100644
index 00000000000..74d2fb5e2eb
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/SelfParam.qll
@@ -0,0 +1,19 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `SelfParam`.
+ */
+
+private import internal.SelfParamImpl
+import codeql.rust.elements.AstNode
+import codeql.rust.elements.Attr
+import codeql.rust.elements.Lifetime
+import codeql.rust.elements.Name
+import codeql.rust.elements.TypeRef
+
+/**
+ * A SelfParam. For example:
+ * ```rust
+ * todo!()
+ * ```
+ */
+final class SelfParam = Impl::SelfParam;
diff --git a/rust/ql/lib/codeql/rust/elements/SliceType.qll b/rust/ql/lib/codeql/rust/elements/SliceType.qll
new file mode 100644
index 00000000000..f8774678411
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/SliceType.qll
@@ -0,0 +1,15 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `SliceType`.
+ */
+
+private import internal.SliceTypeImpl
+import codeql.rust.elements.TypeRef
+
+/**
+ * A SliceType. For example:
+ * ```rust
+ * todo!()
+ * ```
+ */
+final class SliceType = Impl::SliceType;
diff --git a/rust/ql/lib/codeql/rust/elements/SourceFile.qll b/rust/ql/lib/codeql/rust/elements/SourceFile.qll
new file mode 100644
index 00000000000..f0cb51d063c
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/SourceFile.qll
@@ -0,0 +1,17 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `SourceFile`.
+ */
+
+private import internal.SourceFileImpl
+import codeql.rust.elements.AstNode
+import codeql.rust.elements.Attr
+import codeql.rust.elements.Item
+
+/**
+ * A SourceFile. For example:
+ * ```rust
+ * todo!()
+ * ```
+ */
+final class SourceFile = Impl::SourceFile;
diff --git a/rust/ql/lib/codeql/rust/elements/Static.qll b/rust/ql/lib/codeql/rust/elements/Static.qll
new file mode 100644
index 00000000000..6bc791bd403
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/Static.qll
@@ -0,0 +1,21 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `Static`.
+ */
+
+private import internal.StaticImpl
+import codeql.rust.elements.Attr
+import codeql.rust.elements.Expr
+import codeql.rust.elements.ExternItem
+import codeql.rust.elements.Item
+import codeql.rust.elements.Name
+import codeql.rust.elements.TypeRef
+import codeql.rust.elements.Visibility
+
+/**
+ * A Static. For example:
+ * ```rust
+ * todo!()
+ * ```
+ */
+final class Static = Impl::Static;
diff --git a/rust/ql/lib/codeql/rust/elements/StmtList.qll b/rust/ql/lib/codeql/rust/elements/StmtList.qll
new file mode 100644
index 00000000000..df22f0cc703
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/StmtList.qll
@@ -0,0 +1,18 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `StmtList`.
+ */
+
+private import internal.StmtListImpl
+import codeql.rust.elements.AstNode
+import codeql.rust.elements.Attr
+import codeql.rust.elements.Expr
+import codeql.rust.elements.Stmt
+
+/**
+ * A StmtList. For example:
+ * ```rust
+ * todo!()
+ * ```
+ */
+final class StmtList = Impl::StmtList;
diff --git a/rust/ql/lib/codeql/rust/elements/Struct.qll b/rust/ql/lib/codeql/rust/elements/Struct.qll
new file mode 100644
index 00000000000..b01abf3e9a4
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/Struct.qll
@@ -0,0 +1,21 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `Struct`.
+ */
+
+private import internal.StructImpl
+import codeql.rust.elements.Attr
+import codeql.rust.elements.FieldList
+import codeql.rust.elements.GenericParamList
+import codeql.rust.elements.Item
+import codeql.rust.elements.Name
+import codeql.rust.elements.Visibility
+import codeql.rust.elements.WhereClause
+
+/**
+ * A Struct. For example:
+ * ```rust
+ * todo!()
+ * ```
+ */
+final class Struct = Impl::Struct;
diff --git a/rust/ql/lib/codeql/rust/elements/Token.qll b/rust/ql/lib/codeql/rust/elements/Token.qll
new file mode 100644
index 00000000000..3ee0a22205e
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/Token.qll
@@ -0,0 +1,12 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `Token`.
+ */
+
+private import internal.TokenImpl
+import codeql.rust.elements.AstNode
+
+/**
+ * The base class for all tokens.
+ */
+final class Token = Impl::Token;
diff --git a/rust/ql/lib/codeql/rust/elements/TokenTree.qll b/rust/ql/lib/codeql/rust/elements/TokenTree.qll
new file mode 100644
index 00000000000..1461db3dc0f
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/TokenTree.qll
@@ -0,0 +1,15 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `TokenTree`.
+ */
+
+private import internal.TokenTreeImpl
+import codeql.rust.elements.AstNode
+
+/**
+ * A TokenTree. For example:
+ * ```rust
+ * todo!()
+ * ```
+ */
+final class TokenTree = Impl::TokenTree;
diff --git a/rust/ql/lib/codeql/rust/elements/Trait.qll b/rust/ql/lib/codeql/rust/elements/Trait.qll
new file mode 100644
index 00000000000..ee1166922cc
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/Trait.qll
@@ -0,0 +1,28 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `Trait`.
+ */
+
+private import internal.TraitImpl
+import codeql.rust.elements.AssocItemList
+import codeql.rust.elements.Attr
+import codeql.rust.elements.GenericParamList
+import codeql.rust.elements.Item
+import codeql.rust.elements.Name
+import codeql.rust.elements.TypeBoundList
+import codeql.rust.elements.Visibility
+import codeql.rust.elements.WhereClause
+
+/**
+ * A Trait. For example:
+ * ```
+ * trait Frobinizable {
+ *   type Frobinator;
+ *   type Result: Copy;
+ *   fn frobinize_with(&mut self, frobinator: &Self::Frobinator) -> Result;
+ * }
+ *
+ * pub trait Foo<T: Frobinizable> where T::Frobinator: Eq {}
+ * ```
+ */
+final class Trait = Impl::Trait;
diff --git a/rust/ql/lib/codeql/rust/elements/TraitAlias.qll b/rust/ql/lib/codeql/rust/elements/TraitAlias.qll
new file mode 100644
index 00000000000..21d89531ed5
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/TraitAlias.qll
@@ -0,0 +1,21 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `TraitAlias`.
+ */
+
+private import internal.TraitAliasImpl
+import codeql.rust.elements.Attr
+import codeql.rust.elements.GenericParamList
+import codeql.rust.elements.Item
+import codeql.rust.elements.Name
+import codeql.rust.elements.TypeBoundList
+import codeql.rust.elements.Visibility
+import codeql.rust.elements.WhereClause
+
+/**
+ * A TraitAlias. For example:
+ * ```rust
+ * todo!()
+ * ```
+ */
+final class TraitAlias = Impl::TraitAlias;
diff --git a/rust/ql/lib/codeql/rust/elements/TryExpr.qll b/rust/ql/lib/codeql/rust/elements/TryExpr.qll
new file mode 100644
index 00000000000..9617f5c5463
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/TryExpr.qll
@@ -0,0 +1,16 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `TryExpr`.
+ */
+
+private import internal.TryExprImpl
+import codeql.rust.elements.Attr
+import codeql.rust.elements.Expr
+
+/**
+ * A TryExpr. For example:
+ * ```rust
+ * todo!()
+ * ```
+ */
+final class TryExpr = Impl::TryExpr;
diff --git a/rust/ql/lib/codeql/rust/elements/TupleExpr.qll b/rust/ql/lib/codeql/rust/elements/TupleExpr.qll
index d257cfefb4e..e66d46957fc 100644
--- a/rust/ql/lib/codeql/rust/elements/TupleExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/TupleExpr.qll
@@ -4,6 +4,7 @@
  */
 
 private import internal.TupleExprImpl
+import codeql.rust.elements.Attr
 import codeql.rust.elements.Expr
 
 /**
diff --git a/rust/ql/lib/codeql/rust/elements/TupleField.qll b/rust/ql/lib/codeql/rust/elements/TupleField.qll
new file mode 100644
index 00000000000..a7ad4706e8e
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/TupleField.qll
@@ -0,0 +1,18 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `TupleField`.
+ */
+
+private import internal.TupleFieldImpl
+import codeql.rust.elements.AstNode
+import codeql.rust.elements.Attr
+import codeql.rust.elements.TypeRef
+import codeql.rust.elements.Visibility
+
+/**
+ * A TupleField. For example:
+ * ```rust
+ * todo!()
+ * ```
+ */
+final class TupleField = Impl::TupleField;
diff --git a/rust/ql/lib/codeql/rust/elements/TupleFieldList.qll b/rust/ql/lib/codeql/rust/elements/TupleFieldList.qll
new file mode 100644
index 00000000000..68294d7df7a
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/TupleFieldList.qll
@@ -0,0 +1,16 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `TupleFieldList`.
+ */
+
+private import internal.TupleFieldListImpl
+import codeql.rust.elements.FieldList
+import codeql.rust.elements.TupleField
+
+/**
+ * A TupleFieldList. For example:
+ * ```rust
+ * todo!()
+ * ```
+ */
+final class TupleFieldList = Impl::TupleFieldList;
diff --git a/rust/ql/lib/codeql/rust/elements/TupleType.qll b/rust/ql/lib/codeql/rust/elements/TupleType.qll
new file mode 100644
index 00000000000..a82799ee9de
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/TupleType.qll
@@ -0,0 +1,15 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `TupleType`.
+ */
+
+private import internal.TupleTypeImpl
+import codeql.rust.elements.TypeRef
+
+/**
+ * A TupleType. For example:
+ * ```rust
+ * todo!()
+ * ```
+ */
+final class TupleType = Impl::TupleType;
diff --git a/rust/ql/lib/codeql/rust/elements/TypeAlias.qll b/rust/ql/lib/codeql/rust/elements/TypeAlias.qll
new file mode 100644
index 00000000000..2f20a6c0ec6
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/TypeAlias.qll
@@ -0,0 +1,24 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `TypeAlias`.
+ */
+
+private import internal.TypeAliasImpl
+import codeql.rust.elements.AssocItem
+import codeql.rust.elements.Attr
+import codeql.rust.elements.ExternItem
+import codeql.rust.elements.GenericParamList
+import codeql.rust.elements.Item
+import codeql.rust.elements.Name
+import codeql.rust.elements.TypeBoundList
+import codeql.rust.elements.TypeRef
+import codeql.rust.elements.Visibility
+import codeql.rust.elements.WhereClause
+
+/**
+ * A TypeAlias. For example:
+ * ```rust
+ * todo!()
+ * ```
+ */
+final class TypeAlias = Impl::TypeAlias;
diff --git a/rust/ql/lib/codeql/rust/elements/TypeArg.qll b/rust/ql/lib/codeql/rust/elements/TypeArg.qll
new file mode 100644
index 00000000000..b93f0781adc
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/TypeArg.qll
@@ -0,0 +1,16 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `TypeArg`.
+ */
+
+private import internal.TypeArgImpl
+import codeql.rust.elements.GenericArg
+import codeql.rust.elements.TypeRef
+
+/**
+ * A TypeArg. For example:
+ * ```rust
+ * todo!()
+ * ```
+ */
+final class TypeArg = Impl::TypeArg;
diff --git a/rust/ql/lib/codeql/rust/elements/TypeBound.qll b/rust/ql/lib/codeql/rust/elements/TypeBound.qll
new file mode 100644
index 00000000000..77990f6425b
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/TypeBound.qll
@@ -0,0 +1,18 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `TypeBound`.
+ */
+
+private import internal.TypeBoundImpl
+import codeql.rust.elements.AstNode
+import codeql.rust.elements.GenericParamList
+import codeql.rust.elements.Lifetime
+import codeql.rust.elements.TypeRef
+
+/**
+ * A TypeBound. For example:
+ * ```rust
+ * todo!()
+ * ```
+ */
+final class TypeBound = Impl::TypeBound;
diff --git a/rust/ql/lib/codeql/rust/elements/TypeBoundList.qll b/rust/ql/lib/codeql/rust/elements/TypeBoundList.qll
new file mode 100644
index 00000000000..6f2107b9ddf
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/TypeBoundList.qll
@@ -0,0 +1,16 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `TypeBoundList`.
+ */
+
+private import internal.TypeBoundListImpl
+import codeql.rust.elements.AstNode
+import codeql.rust.elements.TypeBound
+
+/**
+ * A TypeBoundList. For example:
+ * ```rust
+ * todo!()
+ * ```
+ */
+final class TypeBoundList = Impl::TypeBoundList;
diff --git a/rust/ql/lib/codeql/rust/elements/TypeParam.qll b/rust/ql/lib/codeql/rust/elements/TypeParam.qll
new file mode 100644
index 00000000000..8de967d4f91
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/TypeParam.qll
@@ -0,0 +1,19 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `TypeParam`.
+ */
+
+private import internal.TypeParamImpl
+import codeql.rust.elements.Attr
+import codeql.rust.elements.GenericParam
+import codeql.rust.elements.Name
+import codeql.rust.elements.TypeBoundList
+import codeql.rust.elements.TypeRef
+
+/**
+ * A TypeParam. For example:
+ * ```rust
+ * todo!()
+ * ```
+ */
+final class TypeParam = Impl::TypeParam;
diff --git a/rust/ql/lib/codeql/rust/elements/TypeRef.qll b/rust/ql/lib/codeql/rust/elements/TypeRef.qll
index 2d2bf29a2db..f30bd7a0a61 100644
--- a/rust/ql/lib/codeql/rust/elements/TypeRef.qll
+++ b/rust/ql/lib/codeql/rust/elements/TypeRef.qll
@@ -5,7 +5,6 @@
 
 private import internal.TypeRefImpl
 import codeql.rust.elements.AstNode
-import codeql.rust.elements.Unimplemented
 
 /**
  * The base class for type references.
diff --git a/rust/ql/lib/codeql/rust/elements/UnderscoreExpr.qll b/rust/ql/lib/codeql/rust/elements/UnderscoreExpr.qll
index 1ec6c46df18..14d9a39d55f 100644
--- a/rust/ql/lib/codeql/rust/elements/UnderscoreExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/UnderscoreExpr.qll
@@ -4,6 +4,7 @@
  */
 
 private import internal.UnderscoreExprImpl
+import codeql.rust.elements.Attr
 import codeql.rust.elements.Expr
 
 /**
diff --git a/rust/ql/lib/codeql/rust/elements/UnimplementedDeclaration.qll b/rust/ql/lib/codeql/rust/elements/UnimplementedDeclaration.qll
deleted file mode 100644
index 479ed740e3e..00000000000
--- a/rust/ql/lib/codeql/rust/elements/UnimplementedDeclaration.qll
+++ /dev/null
@@ -1,13 +0,0 @@
-// generated by codegen, do not edit
-/**
- * This module provides the public class `UnimplementedDeclaration`.
- */
-
-private import internal.UnimplementedDeclarationImpl
-import codeql.rust.elements.Declaration
-import codeql.rust.elements.Unimplemented
-
-/**
- * A declaration that is not yet extracted.
- */
-final class UnimplementedDeclaration = Impl::UnimplementedDeclaration;
diff --git a/rust/ql/lib/codeql/rust/elements/Union.qll b/rust/ql/lib/codeql/rust/elements/Union.qll
new file mode 100644
index 00000000000..38a96aed38e
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/Union.qll
@@ -0,0 +1,21 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `Union`.
+ */
+
+private import internal.UnionImpl
+import codeql.rust.elements.Attr
+import codeql.rust.elements.GenericParamList
+import codeql.rust.elements.Item
+import codeql.rust.elements.Name
+import codeql.rust.elements.RecordFieldList
+import codeql.rust.elements.Visibility
+import codeql.rust.elements.WhereClause
+
+/**
+ * A Union. For example:
+ * ```rust
+ * todo!()
+ * ```
+ */
+final class Union = Impl::Union;
diff --git a/rust/ql/lib/codeql/rust/elements/UnsafeBlockExpr.qll b/rust/ql/lib/codeql/rust/elements/UnsafeBlockExpr.qll
deleted file mode 100644
index 9aa9b54512d..00000000000
--- a/rust/ql/lib/codeql/rust/elements/UnsafeBlockExpr.qll
+++ /dev/null
@@ -1,18 +0,0 @@
-// generated by codegen, do not edit
-/**
- * This module provides the public class `UnsafeBlockExpr`.
- */
-
-private import internal.UnsafeBlockExprImpl
-import codeql.rust.elements.BlockExprBase
-
-/**
- * An unsafe block expression. For example:
- * ```rust
- * let layout = unsafe {
- *     let x = 42;
- *     Layout::from_size_align_unchecked(size, align)
- * };
- * ```
- */
-final class UnsafeBlockExpr = Impl::UnsafeBlockExpr;
diff --git a/rust/ql/lib/codeql/rust/elements/Use.qll b/rust/ql/lib/codeql/rust/elements/Use.qll
new file mode 100644
index 00000000000..7485018a975
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/Use.qll
@@ -0,0 +1,18 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `Use`.
+ */
+
+private import internal.UseImpl
+import codeql.rust.elements.Attr
+import codeql.rust.elements.Item
+import codeql.rust.elements.UseTree
+import codeql.rust.elements.Visibility
+
+/**
+ * A Use. For example:
+ * ```rust
+ * todo!()
+ * ```
+ */
+final class Use = Impl::Use;
diff --git a/rust/ql/lib/codeql/rust/elements/UseTree.qll b/rust/ql/lib/codeql/rust/elements/UseTree.qll
new file mode 100644
index 00000000000..ff57eccc951
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/UseTree.qll
@@ -0,0 +1,18 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `UseTree`.
+ */
+
+private import internal.UseTreeImpl
+import codeql.rust.elements.AstNode
+import codeql.rust.elements.Path
+import codeql.rust.elements.Rename
+import codeql.rust.elements.UseTreeList
+
+/**
+ * A UseTree. For example:
+ * ```rust
+ * todo!()
+ * ```
+ */
+final class UseTree = Impl::UseTree;
diff --git a/rust/ql/lib/codeql/rust/elements/UseTreeList.qll b/rust/ql/lib/codeql/rust/elements/UseTreeList.qll
new file mode 100644
index 00000000000..92202501028
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/UseTreeList.qll
@@ -0,0 +1,16 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `UseTreeList`.
+ */
+
+private import internal.UseTreeListImpl
+import codeql.rust.elements.AstNode
+import codeql.rust.elements.UseTree
+
+/**
+ * A UseTreeList. For example:
+ * ```rust
+ * todo!()
+ * ```
+ */
+final class UseTreeList = Impl::UseTreeList;
diff --git a/rust/ql/lib/codeql/rust/elements/Variable.qll b/rust/ql/lib/codeql/rust/elements/Variable.qll
new file mode 100644
index 00000000000..31cc17a263f
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/Variable.qll
@@ -0,0 +1,13 @@
+/**
+ * This module provides classes related to variables.
+ */
+
+private import internal.VariableImpl
+
+final class Variable = Impl::Variable;
+
+final class VariableAccess = Impl::VariableAccess;
+
+final class VariableWriteAccess = Impl::VariableWriteAccess;
+
+final class VariableReadAccess = Impl::VariableReadAccess;
diff --git a/rust/ql/lib/codeql/rust/elements/Variant.qll b/rust/ql/lib/codeql/rust/elements/Variant.qll
new file mode 100644
index 00000000000..6100928696e
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/Variant.qll
@@ -0,0 +1,20 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `Variant`.
+ */
+
+private import internal.VariantImpl
+import codeql.rust.elements.AstNode
+import codeql.rust.elements.Attr
+import codeql.rust.elements.Expr
+import codeql.rust.elements.FieldList
+import codeql.rust.elements.Name
+import codeql.rust.elements.Visibility
+
+/**
+ * A Variant. For example:
+ * ```rust
+ * todo!()
+ * ```
+ */
+final class Variant = Impl::Variant;
diff --git a/rust/ql/lib/codeql/rust/elements/VariantList.qll b/rust/ql/lib/codeql/rust/elements/VariantList.qll
new file mode 100644
index 00000000000..e0cf435c468
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/VariantList.qll
@@ -0,0 +1,16 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `VariantList`.
+ */
+
+private import internal.VariantListImpl
+import codeql.rust.elements.AstNode
+import codeql.rust.elements.Variant
+
+/**
+ * A VariantList. For example:
+ * ```rust
+ * todo!()
+ * ```
+ */
+final class VariantList = Impl::VariantList;
diff --git a/rust/ql/lib/codeql/rust/elements/Visibility.qll b/rust/ql/lib/codeql/rust/elements/Visibility.qll
new file mode 100644
index 00000000000..58db9b66fe2
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/Visibility.qll
@@ -0,0 +1,16 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `Visibility`.
+ */
+
+private import internal.VisibilityImpl
+import codeql.rust.elements.AstNode
+import codeql.rust.elements.Path
+
+/**
+ * A Visibility. For example:
+ * ```rust
+ * todo!()
+ * ```
+ */
+final class Visibility = Impl::Visibility;
diff --git a/rust/ql/lib/codeql/rust/elements/WhereClause.qll b/rust/ql/lib/codeql/rust/elements/WhereClause.qll
new file mode 100644
index 00000000000..2f52bd3955f
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/WhereClause.qll
@@ -0,0 +1,16 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `WhereClause`.
+ */
+
+private import internal.WhereClauseImpl
+import codeql.rust.elements.AstNode
+import codeql.rust.elements.WherePred
+
+/**
+ * A WhereClause. For example:
+ * ```rust
+ * todo!()
+ * ```
+ */
+final class WhereClause = Impl::WhereClause;
diff --git a/rust/ql/lib/codeql/rust/elements/WherePred.qll b/rust/ql/lib/codeql/rust/elements/WherePred.qll
new file mode 100644
index 00000000000..2300be0ad45
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/WherePred.qll
@@ -0,0 +1,19 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `WherePred`.
+ */
+
+private import internal.WherePredImpl
+import codeql.rust.elements.AstNode
+import codeql.rust.elements.GenericParamList
+import codeql.rust.elements.Lifetime
+import codeql.rust.elements.TypeBoundList
+import codeql.rust.elements.TypeRef
+
+/**
+ * A WherePred. For example:
+ * ```rust
+ * todo!()
+ * ```
+ */
+final class WherePred = Impl::WherePred;
diff --git a/rust/ql/lib/codeql/rust/elements/WhileExpr.qll b/rust/ql/lib/codeql/rust/elements/WhileExpr.qll
new file mode 100644
index 00000000000..9dcbe9c6346
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/WhileExpr.qll
@@ -0,0 +1,18 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `WhileExpr`.
+ */
+
+private import internal.WhileExprImpl
+import codeql.rust.elements.Attr
+import codeql.rust.elements.BlockExpr
+import codeql.rust.elements.Expr
+import codeql.rust.elements.Label
+
+/**
+ * A WhileExpr. For example:
+ * ```rust
+ * todo!()
+ * ```
+ */
+final class WhileExpr = Impl::WhileExpr;
diff --git a/rust/ql/lib/codeql/rust/elements/YeetExpr.qll b/rust/ql/lib/codeql/rust/elements/YeetExpr.qll
index 3e6165e978f..c7e9f8ebdb7 100644
--- a/rust/ql/lib/codeql/rust/elements/YeetExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/YeetExpr.qll
@@ -4,6 +4,7 @@
  */
 
 private import internal.YeetExprImpl
+import codeql.rust.elements.Attr
 import codeql.rust.elements.Expr
 
 /**
diff --git a/rust/ql/lib/codeql/rust/elements/YieldExpr.qll b/rust/ql/lib/codeql/rust/elements/YieldExpr.qll
index fbbfbc193a9..f156071d6f3 100644
--- a/rust/ql/lib/codeql/rust/elements/YieldExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/YieldExpr.qll
@@ -4,6 +4,7 @@
  */
 
 private import internal.YieldExprImpl
+import codeql.rust.elements.Attr
 import codeql.rust.elements.Expr
 
 /**
diff --git a/rust/ql/lib/codeql/rust/elements/internal/AbiConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/AbiConstructor.qll
new file mode 100644
index 00000000000..2c6161a4657
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/AbiConstructor.qll
@@ -0,0 +1,14 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ *  This module defines the hook used internally to tweak the characteristic predicate of
+ *  `Abi` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Raw
+
+/**
+ *  The characteristic predicate of `Abi` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+predicate constructAbi(Raw::Abi id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/RepeatExprImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/AbiImpl.qll
similarity index 58%
rename from rust/ql/lib/codeql/rust/elements/internal/RepeatExprImpl.qll
rename to rust/ql/lib/codeql/rust/elements/internal/AbiImpl.qll
index 55560df7cd8..c0af077785f 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/RepeatExprImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/AbiImpl.qll
@@ -1,22 +1,22 @@
 // generated by codegen, remove this comment if you wish to edit this file
 /**
- * This module provides a hand-modifiable wrapper around the generated class `RepeatExpr`.
+ * This module provides a hand-modifiable wrapper around the generated class `Abi`.
  *
  * INTERNAL: Do not use.
  */
 
-private import codeql.rust.elements.internal.generated.RepeatExpr
+private import codeql.rust.elements.internal.generated.Abi
 
 /**
- * INTERNAL: This module contains the customizable definition of `RepeatExpr` and should not
+ * INTERNAL: This module contains the customizable definition of `Abi` and should not
  * be referenced directly.
  */
 module Impl {
   /**
-   * A repeat expression. For example:
+   * A Abi. For example:
    * ```rust
-   * [1; 10];
+   * todo!()
    * ```
    */
-  class RepeatExpr extends Generated::RepeatExpr { }
+  class Abi extends Generated::Abi { }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/TypeRefConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/ArgListConstructor.qll
similarity index 65%
rename from rust/ql/lib/codeql/rust/elements/internal/TypeRefConstructor.qll
rename to rust/ql/lib/codeql/rust/elements/internal/ArgListConstructor.qll
index b55c308a963..daafc9ba2d2 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/TypeRefConstructor.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/ArgListConstructor.qll
@@ -1,14 +1,14 @@
 // generated by codegen, remove this comment if you wish to edit this file
 /**
  *  This module defines the hook used internally to tweak the characteristic predicate of
- *  `TypeRef` synthesized instances.
+ *  `ArgList` synthesized instances.
  *  INTERNAL: Do not use.
  */
 
 private import codeql.rust.elements.internal.generated.Raw
 
 /**
- *  The characteristic predicate of `TypeRef` synthesized instances.
+ *  The characteristic predicate of `ArgList` synthesized instances.
  *  INTERNAL: Do not use.
  */
-predicate constructTypeRef(Raw::TypeRef id) { any() }
+predicate constructArgList(Raw::ArgList id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/BoxExprImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/ArgListImpl.qll
similarity index 58%
rename from rust/ql/lib/codeql/rust/elements/internal/BoxExprImpl.qll
rename to rust/ql/lib/codeql/rust/elements/internal/ArgListImpl.qll
index 0b695b43287..af47a245980 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/BoxExprImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/ArgListImpl.qll
@@ -1,22 +1,22 @@
 // generated by codegen, remove this comment if you wish to edit this file
 /**
- * This module provides a hand-modifiable wrapper around the generated class `BoxExpr`.
+ * This module provides a hand-modifiable wrapper around the generated class `ArgList`.
  *
  * INTERNAL: Do not use.
  */
 
-private import codeql.rust.elements.internal.generated.BoxExpr
+private import codeql.rust.elements.internal.generated.ArgList
 
 /**
- * INTERNAL: This module contains the customizable definition of `BoxExpr` and should not
+ * INTERNAL: This module contains the customizable definition of `ArgList` and should not
  * be referenced directly.
  */
 module Impl {
   /**
-   * A box expression. For example:
+   * A ArgList. For example:
    * ```rust
-   * let x = #[rustc_box] Box::new(42);
+   * todo!()
    * ```
    */
-  class BoxExpr extends Generated::BoxExpr { }
+  class ArgList extends Generated::ArgList { }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/ConstExprConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/ArrayExprConstructor.qll
similarity index 65%
rename from rust/ql/lib/codeql/rust/elements/internal/ConstExprConstructor.qll
rename to rust/ql/lib/codeql/rust/elements/internal/ArrayExprConstructor.qll
index 69accf79690..bd4a8362cc5 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/ConstExprConstructor.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/ArrayExprConstructor.qll
@@ -1,14 +1,14 @@
 // generated by codegen, remove this comment if you wish to edit this file
 /**
  *  This module defines the hook used internally to tweak the characteristic predicate of
- *  `ConstExpr` synthesized instances.
+ *  `ArrayExpr` synthesized instances.
  *  INTERNAL: Do not use.
  */
 
 private import codeql.rust.elements.internal.generated.Raw
 
 /**
- *  The characteristic predicate of `ConstExpr` synthesized instances.
+ *  The characteristic predicate of `ArrayExpr` synthesized instances.
  *  INTERNAL: Do not use.
  */
-predicate constructConstExpr(Raw::ConstExpr id) { any() }
+predicate constructArrayExpr(Raw::ArrayExpr id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/ArrayTypeConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/ArrayTypeConstructor.qll
new file mode 100644
index 00000000000..8a4ea671b28
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/ArrayTypeConstructor.qll
@@ -0,0 +1,14 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ *  This module defines the hook used internally to tweak the characteristic predicate of
+ *  `ArrayType` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Raw
+
+/**
+ *  The characteristic predicate of `ArrayType` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+predicate constructArrayType(Raw::ArrayType id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/ArrayTypeImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/ArrayTypeImpl.qll
new file mode 100644
index 00000000000..d1ff17da78d
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/ArrayTypeImpl.qll
@@ -0,0 +1,22 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ * This module provides a hand-modifiable wrapper around the generated class `ArrayType`.
+ *
+ * INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.ArrayType
+
+/**
+ * INTERNAL: This module contains the customizable definition of `ArrayType` and should not
+ * be referenced directly.
+ */
+module Impl {
+  /**
+   * A ArrayType. For example:
+   * ```rust
+   * todo!()
+   * ```
+   */
+  class ArrayType extends Generated::ArrayType { }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/AssocItemImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/AssocItemImpl.qll
new file mode 100644
index 00000000000..d4c871249b4
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/AssocItemImpl.qll
@@ -0,0 +1,22 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ * This module provides a hand-modifiable wrapper around the generated class `AssocItem`.
+ *
+ * INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.AssocItem
+
+/**
+ * INTERNAL: This module contains the customizable definition of `AssocItem` and should not
+ * be referenced directly.
+ */
+module Impl {
+  /**
+   * A AssocItem. For example:
+   * ```rust
+   * todo!()
+   * ```
+   */
+  class AssocItem extends Generated::AssocItem { }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/AssocItemListConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/AssocItemListConstructor.qll
new file mode 100644
index 00000000000..c8d2780e81d
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/AssocItemListConstructor.qll
@@ -0,0 +1,14 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ *  This module defines the hook used internally to tweak the characteristic predicate of
+ *  `AssocItemList` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Raw
+
+/**
+ *  The characteristic predicate of `AssocItemList` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+predicate constructAssocItemList(Raw::AssocItemList id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/AssocItemListImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/AssocItemListImpl.qll
new file mode 100644
index 00000000000..9cefb4cd2dd
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/AssocItemListImpl.qll
@@ -0,0 +1,19 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ * This module provides a hand-modifiable wrapper around the generated class `AssocItemList`.
+ *
+ * INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.AssocItemList
+
+/**
+ * INTERNAL: This module contains the customizable definition of `AssocItemList` and should not
+ * be referenced directly.
+ */
+module Impl {
+  /**
+   * A list of  `AssocItem` elements, as appearing for example in a `Trait`.
+   */
+  class AssocItemList extends Generated::AssocItemList { }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/AssocTypeArgConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/AssocTypeArgConstructor.qll
new file mode 100644
index 00000000000..45e1b1baece
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/AssocTypeArgConstructor.qll
@@ -0,0 +1,14 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ *  This module defines the hook used internally to tweak the characteristic predicate of
+ *  `AssocTypeArg` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Raw
+
+/**
+ *  The characteristic predicate of `AssocTypeArg` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+predicate constructAssocTypeArg(Raw::AssocTypeArg id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/ItemStmtImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/AssocTypeArgImpl.qll
similarity index 53%
rename from rust/ql/lib/codeql/rust/elements/internal/ItemStmtImpl.qll
rename to rust/ql/lib/codeql/rust/elements/internal/AssocTypeArgImpl.qll
index fd5d982fedd..075188ac0bd 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/ItemStmtImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/AssocTypeArgImpl.qll
@@ -1,25 +1,22 @@
 // generated by codegen, remove this comment if you wish to edit this file
 /**
- * This module provides a hand-modifiable wrapper around the generated class `ItemStmt`.
+ * This module provides a hand-modifiable wrapper around the generated class `AssocTypeArg`.
  *
  * INTERNAL: Do not use.
  */
 
-private import codeql.rust.elements.internal.generated.ItemStmt
+private import codeql.rust.elements.internal.generated.AssocTypeArg
 
 /**
- * INTERNAL: This module contains the customizable definition of `ItemStmt` and should not
+ * INTERNAL: This module contains the customizable definition of `AssocTypeArg` and should not
  * be referenced directly.
  */
 module Impl {
   /**
-   * An item statement. For example:
+   * A AssocTypeArg. For example:
    * ```rust
-   * fn print_hello() {
-   *     println!("Hello, world!");
-   * }
-   * print_hello();
+   * todo!()
    * ```
    */
-  class ItemStmt extends Generated::ItemStmt { }
+  class AssocTypeArg extends Generated::AssocTypeArg { }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/AstNodeImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/AstNodeImpl.qll
index d92914d54b5..f2784d058ae 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/AstNodeImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/AstNodeImpl.qll
@@ -1,4 +1,3 @@
-// generated by codegen, remove this comment if you wish to edit this file
 /**
  * This module provides a hand-modifiable wrapper around the generated class `AstNode`.
  *
@@ -6,11 +5,62 @@
  */
 
 private import codeql.rust.elements.internal.generated.AstNode
+private import codeql.rust.controlflow.ControlFlowGraph
 
 /**
  * INTERNAL: This module contains the customizable definition of `AstNode` and should not
  * be referenced directly.
  */
 module Impl {
-  class AstNode extends Generated::AstNode { }
+  private import rust
+  private import codeql.rust.elements.internal.generated.ParentChild
+
+  /**
+   * Gets the immediate parent of a non-`AstNode` element `e`.
+   *
+   * We restrict `e` to be a non-`AstNode` to skip past non-`AstNode` in
+   * the transitive closure computation in `getParentOfAst`. This is
+   * necessary because the parent of an `AstNode` is not necessarily an `AstNode`.
+   */
+  private Element getParentOfAstStep(Element e) {
+    not e instanceof AstNode and
+    result = getImmediateParent(e)
+  }
+
+  class AstNode extends Generated::AstNode {
+    /**
+     * Gets the nearest enclosing parent of this node, which is also an `AstNode`,
+     * if any.
+     */
+    AstNode getParentNode() { result = getParentOfAstStep*(getImmediateParent(this)) }
+
+    /** Gets the immediately enclosing callable of this node, if any. */
+    cached
+    Callable getEnclosingCallable() {
+      exists(AstNode p | p = this.getParentNode() |
+        result = p
+        or
+        not p instanceof Callable and
+        result = p.getEnclosingCallable()
+      )
+    }
+
+    /** Gets the CFG scope that encloses this node, if any. */
+    cached
+    CfgScope getEnclosingCfgScope() {
+      exists(AstNode p | p = this.getParentNode() |
+        result = p
+        or
+        not p instanceof CfgScope and
+        result = p.getEnclosingCfgScope()
+      )
+    }
+
+    /** Holds if this node is inside a macro expansion. */
+    predicate isInMacroExpansion() {
+      this = any(MacroCall mc).getExpanded()
+      or
+      this.getParentNode().isInMacroExpansion()
+    }
+  }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/AttrConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/AttrConstructor.qll
new file mode 100644
index 00000000000..ab7c223854d
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/AttrConstructor.qll
@@ -0,0 +1,14 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ *  This module defines the hook used internally to tweak the characteristic predicate of
+ *  `Attr` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Raw
+
+/**
+ *  The characteristic predicate of `Attr` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+predicate constructAttr(Raw::Attr id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/DeclarationImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/AttrImpl.qll
similarity index 58%
rename from rust/ql/lib/codeql/rust/elements/internal/DeclarationImpl.qll
rename to rust/ql/lib/codeql/rust/elements/internal/AttrImpl.qll
index bbc67b1e2ee..afdac06f558 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/DeclarationImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/AttrImpl.qll
@@ -1,19 +1,22 @@
 // generated by codegen, remove this comment if you wish to edit this file
 /**
- * This module provides a hand-modifiable wrapper around the generated class `Declaration`.
+ * This module provides a hand-modifiable wrapper around the generated class `Attr`.
  *
  * INTERNAL: Do not use.
  */
 
-private import codeql.rust.elements.internal.generated.Declaration
+private import codeql.rust.elements.internal.generated.Attr
 
 /**
- * INTERNAL: This module contains the customizable definition of `Declaration` and should not
+ * INTERNAL: This module contains the customizable definition of `Attr` and should not
  * be referenced directly.
  */
 module Impl {
   /**
-   * The base class for declarations.
+   * A Attr. For example:
+   * ```rust
+   * todo!()
+   * ```
    */
-  class Declaration extends Generated::Declaration { }
+  class Attr extends Generated::Attr { }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/BinaryExprImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/BinaryExprImpl.qll
index 10490787fc1..101295e5dc8 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/BinaryExprImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/BinaryExprImpl.qll
@@ -1,4 +1,3 @@
-// generated by codegen, remove this comment if you wish to edit this file
 /**
  * This module provides a hand-modifiable wrapper around the generated class `BinaryExpr`.
  *
@@ -12,6 +11,7 @@ private import codeql.rust.elements.internal.generated.BinaryExpr
  * be referenced directly.
  */
 module Impl {
+  // the following QLdoc is generated: if you need to edit it, do it in the schema file
   /**
    * A binary operation expression. For example:
    * ```rust
@@ -22,5 +22,7 @@ module Impl {
    * x += y;
    * ```
    */
-  class BinaryExpr extends Generated::BinaryExpr { }
+  class BinaryExpr extends Generated::BinaryExpr {
+    override string toString() { result = "... " + this.getOperatorName() + " ..." }
+  }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/BreakExprImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/BreakExprImpl.qll
index 6b1a9eb9ec8..4b302674a44 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/BreakExprImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/BreakExprImpl.qll
@@ -1,4 +1,3 @@
-// generated by codegen, remove this comment if you wish to edit this file
 /**
  * This module provides a hand-modifiable wrapper around the generated class `BreakExpr`.
  *
@@ -12,6 +11,58 @@ private import codeql.rust.elements.internal.generated.BreakExpr
  * be referenced directly.
  */
 module Impl {
+  private import rust
+  private import codeql.rust.elements.internal.generated.ParentChild
+
+  /** Holds if `e` is a loop labelled `label`. */
+  pragma[nomagic]
+  predicate isLabelledLoop(Expr e, string label) {
+    e =
+      any(LoopExpr le |
+        label = le.getLabel().getLifetime().getText()
+        or
+        label = ""
+      )
+    or
+    e =
+      any(ForExpr fe |
+        label = fe.getLabel().getLifetime().getText()
+        or
+        label = ""
+      )
+    or
+    e =
+      any(WhileExpr we |
+        label = we.getLabel().getLifetime().getText()
+        or
+        label = ""
+      )
+  }
+
+  pragma[nomagic]
+  private predicate isLabelled(Expr e, string label) {
+    isLabelledLoop(e, label)
+    or
+    label = e.(BlockExpr).getLabel().getLifetime().getText()
+  }
+
+  pragma[nomagic]
+  private AstNode getABreakAncestor(BreakExpr be, string label) {
+    (
+      label = be.getLifetime().getText()
+      or
+      not be.hasLifetime() and
+      label = ""
+    ) and
+    exists(AstNode n0 | result = getImmediateParent(n0) |
+      n0 = be
+      or
+      n0 = getABreakAncestor(be, label) and
+      not isLabelled(n0, label)
+    )
+  }
+
+  // the following QLdoc is generated: if you need to edit it, do it in the schema file
   /**
    * A break expression. For example:
    * ```rust
@@ -28,6 +79,28 @@ module Impl {
    *     }
    * };
    * ```
+   * ```rust
+   * let x = 'label: {
+   *     if exit() {
+   *         break 'label 42;
+   *     }
+   *     0;
+   * };
+   * ```
    */
-  class BreakExpr extends Generated::BreakExpr { }
+  class BreakExpr extends Generated::BreakExpr {
+    /**
+     * Gets the target of this `break` expression.
+     *
+     * The target is either a `LoopExpr`, a `ForExpr`, a `WhileExpr`, or a
+     * `BlockExpr`.
+     */
+    pragma[nomagic]
+    Expr getTarget() {
+      exists(string label |
+        result = getABreakAncestor(this, label) and
+        isLabelled(result, label)
+      )
+    }
+  }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/UnimplementedDeclarationImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/CallExprBaseImpl.qll
similarity index 51%
rename from rust/ql/lib/codeql/rust/elements/internal/UnimplementedDeclarationImpl.qll
rename to rust/ql/lib/codeql/rust/elements/internal/CallExprBaseImpl.qll
index a6e4cca24aa..332ba0fb6b3 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/UnimplementedDeclarationImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/CallExprBaseImpl.qll
@@ -1,19 +1,19 @@
 // generated by codegen, remove this comment if you wish to edit this file
 /**
- * This module provides a hand-modifiable wrapper around the generated class `UnimplementedDeclaration`.
+ * This module provides a hand-modifiable wrapper around the generated class `CallExprBase`.
  *
  * INTERNAL: Do not use.
  */
 
-private import codeql.rust.elements.internal.generated.UnimplementedDeclaration
+private import codeql.rust.elements.internal.generated.CallExprBase
 
 /**
- * INTERNAL: This module contains the customizable definition of `UnimplementedDeclaration` and should not
+ * INTERNAL: This module contains the customizable definition of `CallExprBase` and should not
  * be referenced directly.
  */
 module Impl {
   /**
-   * A declaration that is not yet extracted.
+   * A function or method call expression. See `CallExpr` and `MethodCallExpr` for further details.
    */
-  class UnimplementedDeclaration extends Generated::UnimplementedDeclaration { }
+  class CallExprBase extends Generated::CallExprBase { }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/CallableImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/CallableImpl.qll
new file mode 100644
index 00000000000..d604b4d239f
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/CallableImpl.qll
@@ -0,0 +1,19 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ * This module provides a hand-modifiable wrapper around the generated class `Callable`.
+ *
+ * INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Callable
+
+/**
+ * INTERNAL: This module contains the customizable definition of `Callable` and should not
+ * be referenced directly.
+ */
+module Impl {
+  /**
+   * A callable. Either a `Function` or a `ClosureExpr`.
+   */
+  class Callable extends Generated::Callable { }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/ClosureBinderConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/ClosureBinderConstructor.qll
new file mode 100644
index 00000000000..0213547728f
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/ClosureBinderConstructor.qll
@@ -0,0 +1,14 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ *  This module defines the hook used internally to tweak the characteristic predicate of
+ *  `ClosureBinder` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Raw
+
+/**
+ *  The characteristic predicate of `ClosureBinder` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+predicate constructClosureBinder(Raw::ClosureBinder id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/ClosureBinderImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/ClosureBinderImpl.qll
new file mode 100644
index 00000000000..e8493543898
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/ClosureBinderImpl.qll
@@ -0,0 +1,22 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ * This module provides a hand-modifiable wrapper around the generated class `ClosureBinder`.
+ *
+ * INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.ClosureBinder
+
+/**
+ * INTERNAL: This module contains the customizable definition of `ClosureBinder` and should not
+ * be referenced directly.
+ */
+module Impl {
+  /**
+   * A ClosureBinder. For example:
+   * ```rust
+   * todo!()
+   * ```
+   */
+  class ClosureBinder extends Generated::ClosureBinder { }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/BoxExprConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/CommentConstructor.qll
similarity index 65%
rename from rust/ql/lib/codeql/rust/elements/internal/BoxExprConstructor.qll
rename to rust/ql/lib/codeql/rust/elements/internal/CommentConstructor.qll
index cd9afed99a9..58647b38347 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/BoxExprConstructor.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/CommentConstructor.qll
@@ -1,14 +1,14 @@
 // generated by codegen, remove this comment if you wish to edit this file
 /**
  *  This module defines the hook used internally to tweak the characteristic predicate of
- *  `BoxExpr` synthesized instances.
+ *  `Comment` synthesized instances.
  *  INTERNAL: Do not use.
  */
 
 private import codeql.rust.elements.internal.generated.Raw
 
 /**
- *  The characteristic predicate of `BoxExpr` synthesized instances.
+ *  The characteristic predicate of `Comment` synthesized instances.
  *  INTERNAL: Do not use.
  */
-predicate constructBoxExpr(Raw::BoxExpr id) { any() }
+predicate constructComment(Raw::Comment id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/CommentImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/CommentImpl.qll
new file mode 100644
index 00000000000..32a4f415ab7
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/CommentImpl.qll
@@ -0,0 +1,30 @@
+/**
+ * This module provides a hand-modifiable wrapper around the generated class `Comment`.
+ *
+ * INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Comment
+
+/**
+ * INTERNAL: This module contains the customizable definition of `Comment` and should not
+ * be referenced directly.
+ */
+module Impl {
+  // the following QLdoc is generated: if you need to edit it, do it in the schema file
+  /**
+   * A comment. For example:
+   * ```rust
+   * // this is a comment
+   * /// This is a doc comment
+   * ```
+   */
+  class Comment extends Generated::Comment {
+    /**
+     * Gets the text of this comment, excluding the comment marker.
+     */
+    string getCommentText() {
+      exists(string s | s = this.getText() | result = s.regexpCapture("///?\\s*(.*)", 1))
+    }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/ItemStmtConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/ConstArgConstructor.qll
similarity index 65%
rename from rust/ql/lib/codeql/rust/elements/internal/ItemStmtConstructor.qll
rename to rust/ql/lib/codeql/rust/elements/internal/ConstArgConstructor.qll
index 3580cc315ab..c166c419f6c 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/ItemStmtConstructor.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/ConstArgConstructor.qll
@@ -1,14 +1,14 @@
 // generated by codegen, remove this comment if you wish to edit this file
 /**
  *  This module defines the hook used internally to tweak the characteristic predicate of
- *  `ItemStmt` synthesized instances.
+ *  `ConstArg` synthesized instances.
  *  INTERNAL: Do not use.
  */
 
 private import codeql.rust.elements.internal.generated.Raw
 
 /**
- *  The characteristic predicate of `ItemStmt` synthesized instances.
+ *  The characteristic predicate of `ConstArg` synthesized instances.
  *  INTERNAL: Do not use.
  */
-predicate constructItemStmt(Raw::ItemStmt id) { any() }
+predicate constructConstArg(Raw::ConstArg id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/ConstArgImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/ConstArgImpl.qll
new file mode 100644
index 00000000000..c66296be9c4
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/ConstArgImpl.qll
@@ -0,0 +1,22 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ * This module provides a hand-modifiable wrapper around the generated class `ConstArg`.
+ *
+ * INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.ConstArg
+
+/**
+ * INTERNAL: This module contains the customizable definition of `ConstArg` and should not
+ * be referenced directly.
+ */
+module Impl {
+  /**
+   * A ConstArg. For example:
+   * ```rust
+   * todo!()
+   * ```
+   */
+  class ConstArg extends Generated::ConstArg { }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/ConstConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/ConstConstructor.qll
new file mode 100644
index 00000000000..6e60ea8a6f4
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/ConstConstructor.qll
@@ -0,0 +1,14 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ *  This module defines the hook used internally to tweak the characteristic predicate of
+ *  `Const` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Raw
+
+/**
+ *  The characteristic predicate of `Const` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+predicate constructConst(Raw::Const id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/ConstExprImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/ConstExprImpl.qll
deleted file mode 100644
index 5c303eece03..00000000000
--- a/rust/ql/lib/codeql/rust/elements/internal/ConstExprImpl.qll
+++ /dev/null
@@ -1,24 +0,0 @@
-// generated by codegen, remove this comment if you wish to edit this file
-/**
- * This module provides a hand-modifiable wrapper around the generated class `ConstExpr`.
- *
- * INTERNAL: Do not use.
- */
-
-private import codeql.rust.elements.internal.generated.ConstExpr
-
-/**
- * INTERNAL: This module contains the customizable definition of `ConstExpr` and should not
- * be referenced directly.
- */
-module Impl {
-  /**
-   * A `const` block expression. For example:
-   * ```rust
-   * if const { SRC::IS_ZST || DEST::IS_ZST || mem::align_of::<SRC>() != mem::align_of::<DEST>() } {
-   *     return false;
-   * }
-   * ```
-   */
-  class ConstExpr extends Generated::ConstExpr { }
-}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/ConstImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/ConstImpl.qll
new file mode 100644
index 00000000000..b312e791d5e
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/ConstImpl.qll
@@ -0,0 +1,22 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ * This module provides a hand-modifiable wrapper around the generated class `Const`.
+ *
+ * INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Const
+
+/**
+ * INTERNAL: This module contains the customizable definition of `Const` and should not
+ * be referenced directly.
+ */
+module Impl {
+  /**
+   * A Const. For example:
+   * ```rust
+   * todo!()
+   * ```
+   */
+  class Const extends Generated::Const { }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/MissingPatConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/ConstParamConstructor.qll
similarity index 64%
rename from rust/ql/lib/codeql/rust/elements/internal/MissingPatConstructor.qll
rename to rust/ql/lib/codeql/rust/elements/internal/ConstParamConstructor.qll
index 5c2176ab269..5cf9881ee55 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/MissingPatConstructor.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/ConstParamConstructor.qll
@@ -1,14 +1,14 @@
 // generated by codegen, remove this comment if you wish to edit this file
 /**
  *  This module defines the hook used internally to tweak the characteristic predicate of
- *  `MissingPat` synthesized instances.
+ *  `ConstParam` synthesized instances.
  *  INTERNAL: Do not use.
  */
 
 private import codeql.rust.elements.internal.generated.Raw
 
 /**
- *  The characteristic predicate of `MissingPat` synthesized instances.
+ *  The characteristic predicate of `ConstParam` synthesized instances.
  *  INTERNAL: Do not use.
  */
-predicate constructMissingPat(Raw::MissingPat id) { any() }
+predicate constructConstParam(Raw::ConstParam id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/ConstParamImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/ConstParamImpl.qll
new file mode 100644
index 00000000000..72fcf276947
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/ConstParamImpl.qll
@@ -0,0 +1,22 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ * This module provides a hand-modifiable wrapper around the generated class `ConstParam`.
+ *
+ * INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.ConstParam
+
+/**
+ * INTERNAL: This module contains the customizable definition of `ConstParam` and should not
+ * be referenced directly.
+ */
+module Impl {
+  /**
+   * A ConstParam. For example:
+   * ```rust
+   * todo!()
+   * ```
+   */
+  class ConstParam extends Generated::ConstParam { }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/ContinueExprImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/ContinueExprImpl.qll
index dd2476c79b7..4328fdfc9f9 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/ContinueExprImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/ContinueExprImpl.qll
@@ -1,4 +1,3 @@
-// generated by codegen, remove this comment if you wish to edit this file
 /**
  * This module provides a hand-modifiable wrapper around the generated class `ContinueExpr`.
  *
@@ -12,6 +11,26 @@ private import codeql.rust.elements.internal.generated.ContinueExpr
  * be referenced directly.
  */
 module Impl {
+  private import codeql.rust.elements.internal.BreakExprImpl::Impl as BreakExprImpl
+  private import codeql.rust.elements.internal.generated.ParentChild
+
+  pragma[nomagic]
+  private AstNode getAContinueAncestor(ContinueExpr ce, string label) {
+    (
+      label = ce.getLifetime().getText()
+      or
+      not ce.hasLifetime() and
+      label = ""
+    ) and
+    exists(AstNode n0 | result = getImmediateParent(n0) |
+      n0 = ce
+      or
+      n0 = getAContinueAncestor(ce, label) and
+      not BreakExprImpl::isLabelledLoop(n0, label)
+    )
+  }
+
+  // the following QLdoc is generated: if you need to edit it, do it in the schema file
   /**
    * A continue expression. For example:
    * ```rust
@@ -29,5 +48,18 @@ module Impl {
    * }
    * ```
    */
-  class ContinueExpr extends Generated::ContinueExpr { }
+  class ContinueExpr extends Generated::ContinueExpr {
+    /**
+     * Gets the target of this `continue` expression.
+     *
+     * The target is either a `LoopExpr`, a `ForExpr`, or a `WhileExpr`.
+     */
+    pragma[nomagic]
+    Expr getTarget() {
+      exists(string label |
+        result = getAContinueAncestor(this, label) and
+        BreakExprImpl::isLabelledLoop(result, label)
+      )
+    }
+  }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/DynTraitTypeConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/DynTraitTypeConstructor.qll
new file mode 100644
index 00000000000..6ee1e461a53
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/DynTraitTypeConstructor.qll
@@ -0,0 +1,14 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ *  This module defines the hook used internally to tweak the characteristic predicate of
+ *  `DynTraitType` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Raw
+
+/**
+ *  The characteristic predicate of `DynTraitType` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+predicate constructDynTraitType(Raw::DynTraitType id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/DynTraitTypeImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/DynTraitTypeImpl.qll
new file mode 100644
index 00000000000..bba5a65eebd
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/DynTraitTypeImpl.qll
@@ -0,0 +1,22 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ * This module provides a hand-modifiable wrapper around the generated class `DynTraitType`.
+ *
+ * INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.DynTraitType
+
+/**
+ * INTERNAL: This module contains the customizable definition of `DynTraitType` and should not
+ * be referenced directly.
+ */
+module Impl {
+  /**
+   * A DynTraitType. For example:
+   * ```rust
+   * todo!()
+   * ```
+   */
+  class DynTraitType extends Generated::DynTraitType { }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/ElementListExprImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/ElementListExprImpl.qll
deleted file mode 100644
index 5dc33186840..00000000000
--- a/rust/ql/lib/codeql/rust/elements/internal/ElementListExprImpl.qll
+++ /dev/null
@@ -1,23 +0,0 @@
-// generated by codegen, remove this comment if you wish to edit this file
-/**
- * This module provides a hand-modifiable wrapper around the generated class `ElementListExpr`.
- *
- * INTERNAL: Do not use.
- */
-
-private import codeql.rust.elements.internal.generated.ElementListExpr
-
-/**
- * INTERNAL: This module contains the customizable definition of `ElementListExpr` and should not
- * be referenced directly.
- */
-module Impl {
-  /**
-   * An element list expression. For example:
-   * ```rust
-   * [1, 2, 3, 4, 5];
-   * [1, 2, 3, 4, 5][0] = 6;
-   * ```
-   */
-  class ElementListExpr extends Generated::ElementListExpr { }
-}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/EnumConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/EnumConstructor.qll
new file mode 100644
index 00000000000..72db497c284
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/EnumConstructor.qll
@@ -0,0 +1,14 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ *  This module defines the hook used internally to tweak the characteristic predicate of
+ *  `Enum` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Raw
+
+/**
+ *  The characteristic predicate of `Enum` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+predicate constructEnum(Raw::Enum id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/EnumImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/EnumImpl.qll
new file mode 100644
index 00000000000..bef9d3da903
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/EnumImpl.qll
@@ -0,0 +1,22 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ * This module provides a hand-modifiable wrapper around the generated class `Enum`.
+ *
+ * INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Enum
+
+/**
+ * INTERNAL: This module contains the customizable definition of `Enum` and should not
+ * be referenced directly.
+ */
+module Impl {
+  /**
+   * A Enum. For example:
+   * ```rust
+   * todo!()
+   * ```
+   */
+  class Enum extends Generated::Enum { }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/ExprStmtImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/ExprStmtImpl.qll
index 73806be519b..1f36bd00db7 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/ExprStmtImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/ExprStmtImpl.qll
@@ -16,7 +16,7 @@ module Impl {
    * An expression statement. For example:
    * ```rust
    * start();
-   * finish()
+   * finish();
    * use std::env;
    * ```
    */
diff --git a/rust/ql/lib/codeql/rust/elements/internal/MissingExprConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/ExternBlockConstructor.qll
similarity index 64%
rename from rust/ql/lib/codeql/rust/elements/internal/MissingExprConstructor.qll
rename to rust/ql/lib/codeql/rust/elements/internal/ExternBlockConstructor.qll
index 9c315efd526..5c96bf6053e 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/MissingExprConstructor.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/ExternBlockConstructor.qll
@@ -1,14 +1,14 @@
 // generated by codegen, remove this comment if you wish to edit this file
 /**
  *  This module defines the hook used internally to tweak the characteristic predicate of
- *  `MissingExpr` synthesized instances.
+ *  `ExternBlock` synthesized instances.
  *  INTERNAL: Do not use.
  */
 
 private import codeql.rust.elements.internal.generated.Raw
 
 /**
- *  The characteristic predicate of `MissingExpr` synthesized instances.
+ *  The characteristic predicate of `ExternBlock` synthesized instances.
  *  INTERNAL: Do not use.
  */
-predicate constructMissingExpr(Raw::MissingExpr id) { any() }
+predicate constructExternBlock(Raw::ExternBlock id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/ExternBlockImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/ExternBlockImpl.qll
new file mode 100644
index 00000000000..0bd734b8835
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/ExternBlockImpl.qll
@@ -0,0 +1,22 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ * This module provides a hand-modifiable wrapper around the generated class `ExternBlock`.
+ *
+ * INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.ExternBlock
+
+/**
+ * INTERNAL: This module contains the customizable definition of `ExternBlock` and should not
+ * be referenced directly.
+ */
+module Impl {
+  /**
+   * A ExternBlock. For example:
+   * ```rust
+   * todo!()
+   * ```
+   */
+  class ExternBlock extends Generated::ExternBlock { }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/ExternCrateConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/ExternCrateConstructor.qll
new file mode 100644
index 00000000000..99534bf2382
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/ExternCrateConstructor.qll
@@ -0,0 +1,14 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ *  This module defines the hook used internally to tweak the characteristic predicate of
+ *  `ExternCrate` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Raw
+
+/**
+ *  The characteristic predicate of `ExternCrate` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+predicate constructExternCrate(Raw::ExternCrate id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/ExternCrateImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/ExternCrateImpl.qll
new file mode 100644
index 00000000000..6c219b20d79
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/ExternCrateImpl.qll
@@ -0,0 +1,22 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ * This module provides a hand-modifiable wrapper around the generated class `ExternCrate`.
+ *
+ * INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.ExternCrate
+
+/**
+ * INTERNAL: This module contains the customizable definition of `ExternCrate` and should not
+ * be referenced directly.
+ */
+module Impl {
+  /**
+   * A ExternCrate. For example:
+   * ```rust
+   * todo!()
+   * ```
+   */
+  class ExternCrate extends Generated::ExternCrate { }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/ExternItemImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/ExternItemImpl.qll
new file mode 100644
index 00000000000..beabbf706ee
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/ExternItemImpl.qll
@@ -0,0 +1,22 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ * This module provides a hand-modifiable wrapper around the generated class `ExternItem`.
+ *
+ * INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.ExternItem
+
+/**
+ * INTERNAL: This module contains the customizable definition of `ExternItem` and should not
+ * be referenced directly.
+ */
+module Impl {
+  /**
+   * A ExternItem. For example:
+   * ```rust
+   * todo!()
+   * ```
+   */
+  class ExternItem extends Generated::ExternItem { }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/AsyncBlockExprConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/ExternItemListConstructor.qll
similarity index 64%
rename from rust/ql/lib/codeql/rust/elements/internal/AsyncBlockExprConstructor.qll
rename to rust/ql/lib/codeql/rust/elements/internal/ExternItemListConstructor.qll
index 88ef97a1f07..780c3b8c436 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/AsyncBlockExprConstructor.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/ExternItemListConstructor.qll
@@ -1,14 +1,14 @@
 // generated by codegen, remove this comment if you wish to edit this file
 /**
  *  This module defines the hook used internally to tweak the characteristic predicate of
- *  `AsyncBlockExpr` synthesized instances.
+ *  `ExternItemList` synthesized instances.
  *  INTERNAL: Do not use.
  */
 
 private import codeql.rust.elements.internal.generated.Raw
 
 /**
- *  The characteristic predicate of `AsyncBlockExpr` synthesized instances.
+ *  The characteristic predicate of `ExternItemList` synthesized instances.
  *  INTERNAL: Do not use.
  */
-predicate constructAsyncBlockExpr(Raw::AsyncBlockExpr id) { any() }
+predicate constructExternItemList(Raw::ExternItemList id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/ExternItemListImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/ExternItemListImpl.qll
new file mode 100644
index 00000000000..255074a9bf9
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/ExternItemListImpl.qll
@@ -0,0 +1,22 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ * This module provides a hand-modifiable wrapper around the generated class `ExternItemList`.
+ *
+ * INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.ExternItemList
+
+/**
+ * INTERNAL: This module contains the customizable definition of `ExternItemList` and should not
+ * be referenced directly.
+ */
+module Impl {
+  /**
+   * A ExternItemList. For example:
+   * ```rust
+   * todo!()
+   * ```
+   */
+  class ExternItemList extends Generated::ExternItemList { }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/FieldListImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/FieldListImpl.qll
new file mode 100644
index 00000000000..8d718648410
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/FieldListImpl.qll
@@ -0,0 +1,22 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ * This module provides a hand-modifiable wrapper around the generated class `FieldList`.
+ *
+ * INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.FieldList
+
+/**
+ * INTERNAL: This module contains the customizable definition of `FieldList` and should not
+ * be referenced directly.
+ */
+module Impl {
+  /**
+   * A FieldList. For example:
+   * ```rust
+   * todo!()
+   * ```
+   */
+  class FieldList extends Generated::FieldList { }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/FnPtrTypeConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/FnPtrTypeConstructor.qll
new file mode 100644
index 00000000000..a61677766d2
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/FnPtrTypeConstructor.qll
@@ -0,0 +1,14 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ *  This module defines the hook used internally to tweak the characteristic predicate of
+ *  `FnPtrType` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Raw
+
+/**
+ *  The characteristic predicate of `FnPtrType` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+predicate constructFnPtrType(Raw::FnPtrType id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/FnPtrTypeImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/FnPtrTypeImpl.qll
new file mode 100644
index 00000000000..63c7420cf33
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/FnPtrTypeImpl.qll
@@ -0,0 +1,22 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ * This module provides a hand-modifiable wrapper around the generated class `FnPtrType`.
+ *
+ * INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.FnPtrType
+
+/**
+ * INTERNAL: This module contains the customizable definition of `FnPtrType` and should not
+ * be referenced directly.
+ */
+module Impl {
+  /**
+   * A FnPtrType. For example:
+   * ```rust
+   * todo!()
+   * ```
+   */
+  class FnPtrType extends Generated::FnPtrType { }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/ForExprConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/ForExprConstructor.qll
new file mode 100644
index 00000000000..d229575cbc4
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/ForExprConstructor.qll
@@ -0,0 +1,14 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ *  This module defines the hook used internally to tweak the characteristic predicate of
+ *  `ForExpr` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Raw
+
+/**
+ *  The characteristic predicate of `ForExpr` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+predicate constructForExpr(Raw::ForExpr id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/ForExprImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/ForExprImpl.qll
new file mode 100644
index 00000000000..a196a6802e9
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/ForExprImpl.qll
@@ -0,0 +1,22 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ * This module provides a hand-modifiable wrapper around the generated class `ForExpr`.
+ *
+ * INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.ForExpr
+
+/**
+ * INTERNAL: This module contains the customizable definition of `ForExpr` and should not
+ * be referenced directly.
+ */
+module Impl {
+  /**
+   * A ForExpr. For example:
+   * ```rust
+   * todo!()
+   * ```
+   */
+  class ForExpr extends Generated::ForExpr { }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/ForTypeConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/ForTypeConstructor.qll
new file mode 100644
index 00000000000..8bf00679769
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/ForTypeConstructor.qll
@@ -0,0 +1,14 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ *  This module defines the hook used internally to tweak the characteristic predicate of
+ *  `ForType` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Raw
+
+/**
+ *  The characteristic predicate of `ForType` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+predicate constructForType(Raw::ForType id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/ForTypeImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/ForTypeImpl.qll
new file mode 100644
index 00000000000..d6465a76dc5
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/ForTypeImpl.qll
@@ -0,0 +1,22 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ * This module provides a hand-modifiable wrapper around the generated class `ForType`.
+ *
+ * INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.ForType
+
+/**
+ * INTERNAL: This module contains the customizable definition of `ForType` and should not
+ * be referenced directly.
+ */
+module Impl {
+  /**
+   * A ForType. For example:
+   * ```rust
+   * todo!()
+   * ```
+   */
+  class ForType extends Generated::ForType { }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/FormatArgsArgConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/FormatArgsArgConstructor.qll
new file mode 100644
index 00000000000..0cf656f2d46
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/FormatArgsArgConstructor.qll
@@ -0,0 +1,14 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ *  This module defines the hook used internally to tweak the characteristic predicate of
+ *  `FormatArgsArg` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Raw
+
+/**
+ *  The characteristic predicate of `FormatArgsArg` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+predicate constructFormatArgsArg(Raw::FormatArgsArg id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/FormatArgsArgImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/FormatArgsArgImpl.qll
new file mode 100644
index 00000000000..1b6c2e027b3
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/FormatArgsArgImpl.qll
@@ -0,0 +1,22 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ * This module provides a hand-modifiable wrapper around the generated class `FormatArgsArg`.
+ *
+ * INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.FormatArgsArg
+
+/**
+ * INTERNAL: This module contains the customizable definition of `FormatArgsArg` and should not
+ * be referenced directly.
+ */
+module Impl {
+  /**
+   * A FormatArgsArg. For example:
+   * ```rust
+   * todo!()
+   * ```
+   */
+  class FormatArgsArg extends Generated::FormatArgsArg { }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/FormatArgsExprConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/FormatArgsExprConstructor.qll
new file mode 100644
index 00000000000..0f07fc89986
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/FormatArgsExprConstructor.qll
@@ -0,0 +1,14 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ *  This module defines the hook used internally to tweak the characteristic predicate of
+ *  `FormatArgsExpr` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Raw
+
+/**
+ *  The characteristic predicate of `FormatArgsExpr` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+predicate constructFormatArgsExpr(Raw::FormatArgsExpr id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/FormatArgsExprImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/FormatArgsExprImpl.qll
new file mode 100644
index 00000000000..667439777b1
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/FormatArgsExprImpl.qll
@@ -0,0 +1,31 @@
+/**
+ * This module provides a hand-modifiable wrapper around the generated class `FormatArgsExpr`.
+ *
+ * INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.FormatArgsExpr
+private import codeql.rust.elements.Format
+
+/**
+ * INTERNAL: This module contains the customizable definition of `FormatArgsExpr` and should not
+ * be referenced directly.
+ */
+module Impl {
+  // the following QLdoc is generated: if you need to edit it, do it in the schema file
+  /**
+   * A FormatArgsExpr. For example:
+   * ```rust
+   * todo!()
+   * ```
+   */
+  class FormatArgsExpr extends Generated::FormatArgsExpr {
+    /**
+     * Gets the `index`th format of this `FormatArgsExpr`'s formatting template (0-based).
+     */
+    Format getFormat(int index) {
+      result =
+        rank[index + 1](Format f, int i | f.getParent() = this and f.getIndex() = i | f order by i)
+    }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/FormatArgumentConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/FormatArgumentConstructor.qll
new file mode 100644
index 00000000000..8602f1a0410
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/FormatArgumentConstructor.qll
@@ -0,0 +1,33 @@
+/**
+ *  This module defines the hook used internally to tweak the characteristic predicate of
+ *  `FormatArgument` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Raw
+private import codeql.rust.elements.internal.generated.Synth
+private import codeql.rust.elements.internal.FormatConstructor
+
+/**
+ *  The characteristic predicate of `FormatArgument` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+predicate constructFormatArgument(
+  Raw::FormatArgsExpr parent, int index, int kind, string value, boolean positional, int offset
+) {
+  exists(string text, int formatOffset, int group |
+    group = [3, 4] and offset = formatOffset + 1 and kind = 0
+    or
+    group = [15, 16] and
+    offset = formatOffset + min(text.indexOf(value + "$")) and
+    kind = 1
+    or
+    group = [23, 24] and
+    offset = formatOffset + max(text.indexOf(value + "$")) and
+    kind = 2
+  |
+    text = formatElement(parent, index, formatOffset) and
+    value = text.regexpCapture(formatRegex(), group) and
+    if group % 2 = 1 then positional = true else positional = false
+  )
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/FormatArgumentImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/FormatArgumentImpl.qll
new file mode 100644
index 00000000000..7370939716d
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/FormatArgumentImpl.qll
@@ -0,0 +1,85 @@
+/**
+ * This module provides a hand-modifiable wrapper around the generated class `FormatArgument`.
+ *
+ * INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.FormatArgument
+private import codeql.rust.elements.internal.generated.Raw
+private import codeql.rust.elements.internal.generated.Synth
+private import codeql.rust.elements.internal.FormatArgumentConstructor
+private import codeql.rust.elements.internal.LocatableImpl::Impl as LocatableImpl
+private import codeql.files.FileSystem
+
+/**
+ * INTERNAL: This module contains the customizable definition of `FormatArgument` and should not
+ * be referenced directly.
+ */
+module Impl {
+  // the following QLdoc is generated: if you need to edit it, do it in the schema file
+  /**
+   * An argument in a format element in a formatting template. For example the `width`, `precision`, and `value` in:
+   * ```rust
+   * println!("Value {value:#width$.precision$}");
+   * ```
+   * or the `0`, `1` and `2` in:
+   * ```rust
+   * println!("Value {0:#1$.2$}", value, width, precision);
+   * ```
+   */
+  class FormatArgument extends Generated::FormatArgument {
+    Raw::FormatArgsExpr parent;
+    int index;
+    int kind;
+    string name;
+    int offset;
+
+    FormatArgument() { this = Synth::TFormatArgument(parent, index, kind, name, _, offset) }
+
+    override string toString() { result = name }
+
+    override Format getParent() { result = Synth::TFormat(parent, index, _, _) }
+  }
+
+  private class FormatSynthLocationImpl extends FormatArgument, LocatableImpl::SynthLocatable {
+    override predicate hasSynthLocationInfo(
+      File file, int startline, int startcolumn, int endline, int endcolumn
+    ) {
+      // TODO: handle locations in multi-line comments
+      // TODO: handle the case where the template is from a nested macro call
+      LocatableImpl::getLocationDefault(Synth::convertFormatArgsExprFromRaw(parent)
+            .(FormatArgsExpr)
+            .getTemplate()).hasLocationFileInfo(file, startline, startcolumn - offset, _, _) and
+      endline = startline and
+      endcolumn = startcolumn + name.length() - 1
+    }
+  }
+
+  /**
+   * A positional `FormatArgument`. For example `0` in
+   * ```rust
+   * let name = "Alice";
+   * println!("{0} in wonderland", name);
+   * ```
+   */
+  class PositionalFormatArgument extends FormatArgument {
+    PositionalFormatArgument() { this = Synth::TFormatArgument(_, _, _, _, true, _) }
+
+    /** Gets the index of this positional argument */
+    int getIndex() { result = name.toInt() }
+  }
+
+  /**
+   * A named `FormatArgument`. For example `name` in
+   * ```rust
+   * let name = "Alice";
+   * println!("{name} in wonderland");
+   * ```
+   */
+  class NamedFormatArgument extends FormatArgument {
+    NamedFormatArgument() { this = Synth::TFormatArgument(_, _, _, _, false, _) }
+
+    /** Gets the name of this named argument */
+    string getName() { result = name }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/FormatConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/FormatConstructor.qll
new file mode 100644
index 00000000000..c643772f7af
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/FormatConstructor.qll
@@ -0,0 +1,86 @@
+/**
+ *  This module defines the hook used internally to tweak the characteristic predicate of
+ *  `Format` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Raw
+private import codeql.rust.internal.CachedStages
+
+/**
+ *  The characteristic predicate of `Format` synthesized instances.
+ *  INTERNAL: Do not use.
+ *
+ * Match an element of a format string, either text (`Hello`) or a format placeholder (`{}`).
+ */
+predicate constructFormat(Raw::FormatArgsExpr parent, int index, string text, int offset) {
+  text = formatElement(parent, index, offset) and
+  text.charAt(0) = "{" and
+  text.charAt(1) != "{"
+}
+
+/**
+ * Match an element of a format string, either text (`Hello`) or a format placeholder (`{}`).
+ */
+string formatElement(Raw::FormatArgsExpr parent, int occurrenceIndex, int occurrenceOffset) {
+  Stages::AstStage::ref() and
+  result =
+    parent
+        .getTemplate()
+        .(Raw::LiteralExpr)
+        .getTextValue()
+        // TODO: should also handle surrounding quotes and escaped characters
+        .regexpFind(textRegex() + "|" + formatRegex(), occurrenceIndex, occurrenceOffset)
+}
+
+/**
+ * A regular expression for matching format elements in a formatting template. The syntax of
+ * formatting templates is defined at https://doc.rust-lang.org/stable/std/fmt/#syntax . The
+ * regular expression is generated from the following python code:
+ *
+ *
+ * ```python
+ * identifier = "([A-Za-z_][A-Za-z0-9_]*)"
+ * integer = "([0-9]+)"
+ *
+ * # argument := integer | identifier
+ * argument = "({integer}|{identifier})".format(integer=integer, identifier=identifier)
+ *
+ * # parameter := argument '$'
+ * parameter = "(({argument})\\$)".format(argument=argument)
+ *
+ * # count := parameter | integer
+ * count = "({parameter}|{integer})".format(integer=integer, parameter=parameter)
+ *
+ * # fill := character
+ * fill = "(.)"
+ *
+ * # align := '<' | '^' | '>'
+ * align = "([<^>])"
+ *
+ * # sign := '+' | '-'
+ * sign = "([+-])"
+ *
+ * # width := count
+ * width = count
+ *
+ * # precision := count | '*'
+ * precision = "({count}|(\\*))".format(count=count)
+ *
+ * # type := '' | '?' | 'x?' | 'X?' | identifier
+ * type = "(|\\?|x\\?|X\\?|{identifier})".format(identifier=identifier)
+ *
+ * # format_spec := [[fill]align][sign]['#']['0'][width]['.' precision]type
+ * format_spec = "({fill}?{align})?{sign}?(#)?(0)?{width}?(\\.{precision})?{type}".format(fill=fill, align=align, sign=sign, width=width, precision=precision, type=type)
+ *
+ * # format := '{' [ argument ] [ ':' format_spec ] [ ws ] * '}'
+ * format = "(\\{{{argument}?(:{format_spec})?\s*}\\})".format(argument=argument, format_spec=format_spec)
+ *
+ * ```
+ */
+string formatRegex() {
+  result =
+    "(\\{(([0-9]+)|([A-Za-z_][A-Za-z0-9_]*))?(:((.)?([<^>]))?([+-])?(#)?(0)?(((([0-9]+)|([A-Za-z_][A-Za-z0-9_]*))\\$)|([0-9]+))?(\\.((((([0-9]+)|([A-Za-z_][A-Za-z0-9_]*))\\$)|([0-9]+))|(\\*)))?(|\\?|x\\?|X\\?|([A-Za-z_][A-Za-z0-9_]*)))?\\s*\\})"
+}
+
+private string textRegex() { result = "([^{}]|\\{\\{|\\}\\})+" }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/FormatImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/FormatImpl.qll
new file mode 100644
index 00000000000..59c66768f05
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/FormatImpl.qll
@@ -0,0 +1,88 @@
+/**
+ * This module provides a hand-modifiable wrapper around the generated class `Format`.
+ *
+ * INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Format
+private import codeql.rust.elements.internal.generated.Raw
+private import codeql.rust.elements.internal.generated.Synth
+private import codeql.rust.elements.internal.FormatConstructor
+private import codeql.rust.elements.internal.LocatableImpl::Impl as LocatableImpl
+private import codeql.files.FileSystem
+import codeql.rust.elements.FormatArgument
+
+/**
+ * INTERNAL: This module contains the customizable definition of `Format` and should not
+ * be referenced directly.
+ */
+module Impl {
+  // the following QLdoc is generated: if you need to edit it, do it in the schema file
+  /**
+   * A format element in a formatting template. For example the `{}` in:
+   * ```rust
+   * println!("Hello {}", "world");
+   * ```
+   */
+  class Format extends Generated::Format {
+    private Raw::FormatArgsExpr parent;
+    string text;
+    private int index;
+    int offset;
+
+    Format() { this = Synth::TFormat(parent, index, text, offset) }
+
+    override string toString() { result = text }
+
+    override FormatArgsExpr getParent() { result = Synth::convertFormatArgsExprFromRaw(parent) }
+
+    override int getIndex() { result = index }
+
+    /**
+     * Gets the name or position reference of this format, if any. For example `name` and `0` in:
+     * ```rust
+     * let name = "Alice";
+     * println!("{name} in wonderland");
+     * println!("{0} in wonderland", name);
+     * ```
+     */
+    FormatArgument getArgumentRef() {
+      result.getParent() = this and result = Synth::TFormatArgument(_, _, 0, _, _, _)
+    }
+
+    /**
+     * Gets the name or position reference of the width parameter in this format, if any. For example `width` and `1` in:
+     * ```rust
+     * let width = 6;
+     * println!("{:width$}", PI);
+     * println!("{:1$}", PI, width);
+     * ```
+     */
+    FormatArgument getWidthArgument() {
+      result.getParent() = this and result = Synth::TFormatArgument(_, _, 1, _, _, _)
+    }
+
+    /**
+     * Gets the name or position reference of the width parameter in this format, if any. For example `prec` and `1` in:
+     * ```rust
+     * let prec = 6;
+     * println!("{:.prec$}", PI);
+     * println!("{:.1$}", PI, prec);
+     * ```
+     */
+    FormatArgument getPrecisionArgument() {
+      result.getParent() = this and result = Synth::TFormatArgument(_, _, 2, _, _, _)
+    }
+  }
+
+  private class FormatSynthLocationImpl extends Format, LocatableImpl::SynthLocatable {
+    override predicate hasSynthLocationInfo(
+      File file, int startline, int startcolumn, int endline, int endcolumn
+    ) {
+      LocatableImpl::getLocationDefault(this.getParent().getTemplate())
+          .hasLocationFileInfo(file, startline, startcolumn - offset, _, _) and
+      endline = startline and
+      endcolumn = startcolumn + text.length() - 1
+    }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/FormatTemplateVariableAccessConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/FormatTemplateVariableAccessConstructor.qll
new file mode 100644
index 00000000000..7682d14ce46
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/FormatTemplateVariableAccessConstructor.qll
@@ -0,0 +1,39 @@
+/**
+ *  This module defines the hook used internally to tweak the characteristic predicate of
+ *  `FormatTemplateVariableAccess` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Raw
+private import codeql.rust.elements.internal.generated.Synth
+private import codeql.rust.elements.Format
+private import codeql.rust.elements.NamedFormatArgument
+
+/**
+ *  The characteristic predicate of `FormatTemplateVariableAccess` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+predicate constructFormatTemplateVariableAccess(Raw::FormatArgsExpr parent, int index, int kind) {
+  unboundNamedFormatArgument(parent, index, kind, _)
+}
+
+/**
+ * A named format argument for which no binding is found in the parent `FormatArgsExpr::getArg(_)`.
+ * INTERNAL: Do not use.
+ */
+predicate unboundNamedFormatArgument(
+  Raw::FormatArgsExpr parent, int index, int kind, NamedFormatArgument arg
+) {
+  exists(Format format, string name |
+    not parent.getArg(_).getName().getText() = name and
+    name = arg.getName() and
+    Synth::convertFormatArgsExprToRaw(format.getParent()) = parent and
+    format.getIndex() = index
+  |
+    arg = format.getArgumentRef() and kind = 0
+    or
+    arg = format.getWidthArgument() and kind = 1
+    or
+    arg = format.getPrecisionArgument() and kind = 2
+  )
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/FormatTemplateVariableAccessImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/FormatTemplateVariableAccessImpl.qll
new file mode 100644
index 00000000000..cb17fa52361
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/FormatTemplateVariableAccessImpl.qll
@@ -0,0 +1,40 @@
+/**
+ * This module provides a hand-modifiable wrapper around the generated class `FormatTemplateVariableAccess`.
+ *
+ * INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.FormatTemplateVariableAccess
+private import codeql.rust.elements.internal.FormatTemplateVariableAccessConstructor
+private import codeql.rust.elements.internal.generated.Raw
+private import codeql.rust.elements.internal.generated.Synth
+private import codeql.rust.elements.Format
+private import codeql.rust.elements.NamedFormatArgument
+private import codeql.Locations
+
+/**
+ * INTERNAL: This module contains the customizable definition of `FormatTemplateVariableAccess` and should not
+ * be referenced directly.
+ */
+module Impl {
+  class FormatTemplateVariableAccess extends Generated::FormatTemplateVariableAccess {
+    private NamedFormatArgument argument;
+
+    FormatTemplateVariableAccess() {
+      exists(Raw::FormatArgsExpr parent, int index, int kind |
+        this = Synth::TFormatTemplateVariableAccess(parent, index, kind) and
+        unboundNamedFormatArgument(parent, index, kind, argument)
+      )
+    }
+
+    override Location getLocation() { result = argument.getLocation() }
+
+    override string toString() { result = this.getName() }
+
+    /** Gets the name of the variable */
+    string getName() { result = argument.getName() }
+
+    /** Gets the underlying `NamedFormatArgument` . */
+    NamedFormatArgument getArgument() { result = argument }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/FunctionImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/FunctionImpl.qll
index cf0f7fea923..bff68da5620 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/FunctionImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/FunctionImpl.qll
@@ -25,6 +25,6 @@ module Impl {
    * ```
    */
   class Function extends Generated::Function {
-    override string toString() { result = this.getName() }
+    override string toString() { result = this.getName().getText() }
   }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/GenericArgImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/GenericArgImpl.qll
new file mode 100644
index 00000000000..9d9e3561472
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/GenericArgImpl.qll
@@ -0,0 +1,22 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ * This module provides a hand-modifiable wrapper around the generated class `GenericArg`.
+ *
+ * INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.GenericArg
+
+/**
+ * INTERNAL: This module contains the customizable definition of `GenericArg` and should not
+ * be referenced directly.
+ */
+module Impl {
+  /**
+   * A GenericArg. For example:
+   * ```rust
+   * todo!()
+   * ```
+   */
+  class GenericArg extends Generated::GenericArg { }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/GenericParamImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/GenericParamImpl.qll
new file mode 100644
index 00000000000..28027026ae8
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/GenericParamImpl.qll
@@ -0,0 +1,22 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ * This module provides a hand-modifiable wrapper around the generated class `GenericParam`.
+ *
+ * INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.GenericParam
+
+/**
+ * INTERNAL: This module contains the customizable definition of `GenericParam` and should not
+ * be referenced directly.
+ */
+module Impl {
+  /**
+   * A GenericParam. For example:
+   * ```rust
+   * todo!()
+   * ```
+   */
+  class GenericParam extends Generated::GenericParam { }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/ElementListExprConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/GenericParamListConstructor.qll
similarity index 60%
rename from rust/ql/lib/codeql/rust/elements/internal/ElementListExprConstructor.qll
rename to rust/ql/lib/codeql/rust/elements/internal/GenericParamListConstructor.qll
index 1190f38db7c..20ee400ab94 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/ElementListExprConstructor.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/GenericParamListConstructor.qll
@@ -1,14 +1,14 @@
 // generated by codegen, remove this comment if you wish to edit this file
 /**
  *  This module defines the hook used internally to tweak the characteristic predicate of
- *  `ElementListExpr` synthesized instances.
+ *  `GenericParamList` synthesized instances.
  *  INTERNAL: Do not use.
  */
 
 private import codeql.rust.elements.internal.generated.Raw
 
 /**
- *  The characteristic predicate of `ElementListExpr` synthesized instances.
+ *  The characteristic predicate of `GenericParamList` synthesized instances.
  *  INTERNAL: Do not use.
  */
-predicate constructElementListExpr(Raw::ElementListExpr id) { any() }
+predicate constructGenericParamList(Raw::GenericParamList id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/MissingExprImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/GenericParamListImpl.qll
similarity index 52%
rename from rust/ql/lib/codeql/rust/elements/internal/MissingExprImpl.qll
rename to rust/ql/lib/codeql/rust/elements/internal/GenericParamListImpl.qll
index f4e7fa8908b..a9e9004e4c4 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/MissingExprImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/GenericParamListImpl.qll
@@ -1,23 +1,22 @@
 // generated by codegen, remove this comment if you wish to edit this file
 /**
- * This module provides a hand-modifiable wrapper around the generated class `MissingExpr`.
+ * This module provides a hand-modifiable wrapper around the generated class `GenericParamList`.
  *
  * INTERNAL: Do not use.
  */
 
-private import codeql.rust.elements.internal.generated.MissingExpr
+private import codeql.rust.elements.internal.generated.GenericParamList
 
 /**
- * INTERNAL: This module contains the customizable definition of `MissingExpr` and should not
+ * INTERNAL: This module contains the customizable definition of `GenericParamList` and should not
  * be referenced directly.
  */
 module Impl {
   /**
-   * A missing expression, used as a placeholder for incomplete syntax.
-   *
+   * A GenericParamList. For example:
    * ```rust
-   * let x = non_existing_macro!();
+   * todo!()
    * ```
    */
-  class MissingExpr extends Generated::MissingExpr { }
+  class GenericParamList extends Generated::GenericParamList { }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/IdentPatImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/IdentPatImpl.qll
index 6f90f3d6d03..0c609207477 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/IdentPatImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/IdentPatImpl.qll
@@ -1,4 +1,3 @@
-// generated by codegen, remove this comment if you wish to edit this file
 /**
  * This module provides a hand-modifiable wrapper around the generated class `IdentPat`.
  *
@@ -12,6 +11,7 @@ private import codeql.rust.elements.internal.generated.IdentPat
  * be referenced directly.
  */
 module Impl {
+  // the following QLdoc is generated: if you need to edit it, do it in the schema file
   /**
    * A binding pattern. For example:
    * ```rust
@@ -27,5 +27,7 @@ module Impl {
    * };
    * ```
    */
-  class IdentPat extends Generated::IdentPat { }
+  class IdentPat extends Generated::IdentPat {
+    override string toString() { result = this.getName().getText() }
+  }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/IfExprImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/IfExprImpl.qll
index a500d39c298..f9aec6faed3 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/IfExprImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/IfExprImpl.qll
@@ -24,7 +24,7 @@ module Impl {
    *     1
    * } else {
    *     0
-   * }
+   * };
    * ```
    */
   class IfExpr extends Generated::IfExpr { }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/ImplConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/ImplConstructor.qll
new file mode 100644
index 00000000000..93bc646bc14
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/ImplConstructor.qll
@@ -0,0 +1,14 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ *  This module defines the hook used internally to tweak the characteristic predicate of
+ *  `Impl` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Raw
+
+/**
+ *  The characteristic predicate of `Impl` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+predicate constructImpl(Raw::Impl id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/ImplImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/ImplImpl.qll
new file mode 100644
index 00000000000..b1918d16e56
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/ImplImpl.qll
@@ -0,0 +1,22 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ * This module provides a hand-modifiable wrapper around the generated class `Impl`.
+ *
+ * INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Impl
+
+/**
+ * INTERNAL: This module contains the customizable definition of `Impl` and should not
+ * be referenced directly.
+ */
+module Impl {
+  /**
+   * A Impl. For example:
+   * ```rust
+   * todo!()
+   * ```
+   */
+  class Impl extends Generated::Impl { }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/ImplTraitTypeConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/ImplTraitTypeConstructor.qll
new file mode 100644
index 00000000000..242a3490708
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/ImplTraitTypeConstructor.qll
@@ -0,0 +1,14 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ *  This module defines the hook used internally to tweak the characteristic predicate of
+ *  `ImplTraitType` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Raw
+
+/**
+ *  The characteristic predicate of `ImplTraitType` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+predicate constructImplTraitType(Raw::ImplTraitType id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/ImplTraitTypeImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/ImplTraitTypeImpl.qll
new file mode 100644
index 00000000000..b0aaa982998
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/ImplTraitTypeImpl.qll
@@ -0,0 +1,22 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ * This module provides a hand-modifiable wrapper around the generated class `ImplTraitType`.
+ *
+ * INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.ImplTraitType
+
+/**
+ * INTERNAL: This module contains the customizable definition of `ImplTraitType` and should not
+ * be referenced directly.
+ */
+module Impl {
+  /**
+   * A ImplTraitType. For example:
+   * ```rust
+   * todo!()
+   * ```
+   */
+  class ImplTraitType extends Generated::ImplTraitType { }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/InferTypeConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/InferTypeConstructor.qll
new file mode 100644
index 00000000000..8c3a0fcf057
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/InferTypeConstructor.qll
@@ -0,0 +1,14 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ *  This module defines the hook used internally to tweak the characteristic predicate of
+ *  `InferType` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Raw
+
+/**
+ *  The characteristic predicate of `InferType` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+predicate constructInferType(Raw::InferType id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/InferTypeImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/InferTypeImpl.qll
new file mode 100644
index 00000000000..b29406661ba
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/InferTypeImpl.qll
@@ -0,0 +1,22 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ * This module provides a hand-modifiable wrapper around the generated class `InferType`.
+ *
+ * INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.InferType
+
+/**
+ * INTERNAL: This module contains the customizable definition of `InferType` and should not
+ * be referenced directly.
+ */
+module Impl {
+  /**
+   * A InferType. For example:
+   * ```rust
+   * todo!()
+   * ```
+   */
+  class InferType extends Generated::InferType { }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/ItemImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/ItemImpl.qll
new file mode 100644
index 00000000000..1a453671cbf
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/ItemImpl.qll
@@ -0,0 +1,22 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ * This module provides a hand-modifiable wrapper around the generated class `Item`.
+ *
+ * INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Item
+
+/**
+ * INTERNAL: This module contains the customizable definition of `Item` and should not
+ * be referenced directly.
+ */
+module Impl {
+  /**
+   * A Item. For example:
+   * ```rust
+   * todo!()
+   * ```
+   */
+  class Item extends Generated::Item { }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/ItemListConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/ItemListConstructor.qll
new file mode 100644
index 00000000000..527e2897a69
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/ItemListConstructor.qll
@@ -0,0 +1,14 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ *  This module defines the hook used internally to tweak the characteristic predicate of
+ *  `ItemList` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Raw
+
+/**
+ *  The characteristic predicate of `ItemList` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+predicate constructItemList(Raw::ItemList id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/ItemListImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/ItemListImpl.qll
new file mode 100644
index 00000000000..668bf039eb6
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/ItemListImpl.qll
@@ -0,0 +1,22 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ * This module provides a hand-modifiable wrapper around the generated class `ItemList`.
+ *
+ * INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.ItemList
+
+/**
+ * INTERNAL: This module contains the customizable definition of `ItemList` and should not
+ * be referenced directly.
+ */
+module Impl {
+  /**
+   * A ItemList. For example:
+   * ```rust
+   * todo!()
+   * ```
+   */
+  class ItemList extends Generated::ItemList { }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/LetElseConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/LetElseConstructor.qll
new file mode 100644
index 00000000000..73d624016d6
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/LetElseConstructor.qll
@@ -0,0 +1,14 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ *  This module defines the hook used internally to tweak the characteristic predicate of
+ *  `LetElse` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Raw
+
+/**
+ *  The characteristic predicate of `LetElse` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+predicate constructLetElse(Raw::LetElse id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/LetElseImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/LetElseImpl.qll
new file mode 100644
index 00000000000..2399964cf1a
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/LetElseImpl.qll
@@ -0,0 +1,22 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ * This module provides a hand-modifiable wrapper around the generated class `LetElse`.
+ *
+ * INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.LetElse
+
+/**
+ * INTERNAL: This module contains the customizable definition of `LetElse` and should not
+ * be referenced directly.
+ */
+module Impl {
+  /**
+   * A LetElse. For example:
+   * ```rust
+   * todo!()
+   * ```
+   */
+  class LetElse extends Generated::LetElse { }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/LifetimeArgConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/LifetimeArgConstructor.qll
new file mode 100644
index 00000000000..96132547108
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/LifetimeArgConstructor.qll
@@ -0,0 +1,14 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ *  This module defines the hook used internally to tweak the characteristic predicate of
+ *  `LifetimeArg` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Raw
+
+/**
+ *  The characteristic predicate of `LifetimeArg` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+predicate constructLifetimeArg(Raw::LifetimeArg id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/LifetimeArgImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/LifetimeArgImpl.qll
new file mode 100644
index 00000000000..d4f0373cda3
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/LifetimeArgImpl.qll
@@ -0,0 +1,22 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ * This module provides a hand-modifiable wrapper around the generated class `LifetimeArg`.
+ *
+ * INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.LifetimeArg
+
+/**
+ * INTERNAL: This module contains the customizable definition of `LifetimeArg` and should not
+ * be referenced directly.
+ */
+module Impl {
+  /**
+   * A LifetimeArg. For example:
+   * ```rust
+   * todo!()
+   * ```
+   */
+  class LifetimeArg extends Generated::LifetimeArg { }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/LifetimeConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/LifetimeConstructor.qll
new file mode 100644
index 00000000000..0b853c98777
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/LifetimeConstructor.qll
@@ -0,0 +1,14 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ *  This module defines the hook used internally to tweak the characteristic predicate of
+ *  `Lifetime` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Raw
+
+/**
+ *  The characteristic predicate of `Lifetime` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+predicate constructLifetime(Raw::Lifetime id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/LifetimeImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/LifetimeImpl.qll
new file mode 100644
index 00000000000..3eb13ac87e5
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/LifetimeImpl.qll
@@ -0,0 +1,22 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ * This module provides a hand-modifiable wrapper around the generated class `Lifetime`.
+ *
+ * INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Lifetime
+
+/**
+ * INTERNAL: This module contains the customizable definition of `Lifetime` and should not
+ * be referenced directly.
+ */
+module Impl {
+  /**
+   * A Lifetime. For example:
+   * ```rust
+   * todo!()
+   * ```
+   */
+  class Lifetime extends Generated::Lifetime { }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/LifetimeParamConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/LifetimeParamConstructor.qll
new file mode 100644
index 00000000000..f3c368fcfa2
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/LifetimeParamConstructor.qll
@@ -0,0 +1,14 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ *  This module defines the hook used internally to tweak the characteristic predicate of
+ *  `LifetimeParam` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Raw
+
+/**
+ *  The characteristic predicate of `LifetimeParam` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+predicate constructLifetimeParam(Raw::LifetimeParam id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/LifetimeParamImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/LifetimeParamImpl.qll
new file mode 100644
index 00000000000..e4918e4cf56
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/LifetimeParamImpl.qll
@@ -0,0 +1,22 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ * This module provides a hand-modifiable wrapper around the generated class `LifetimeParam`.
+ *
+ * INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.LifetimeParam
+
+/**
+ * INTERNAL: This module contains the customizable definition of `LifetimeParam` and should not
+ * be referenced directly.
+ */
+module Impl {
+  /**
+   * A LifetimeParam. For example:
+   * ```rust
+   * todo!()
+   * ```
+   */
+  class LifetimeParam extends Generated::LifetimeParam { }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/LiteralExprImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/LiteralExprImpl.qll
index 6c4d1464bd0..1b660b134c4 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/LiteralExprImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/LiteralExprImpl.qll
@@ -1,4 +1,3 @@
-// generated by codegen, remove this comment if you wish to edit this file
 /**
  * This module provides a hand-modifiable wrapper around the generated class `LiteralExpr`.
  *
@@ -12,6 +11,7 @@ private import codeql.rust.elements.internal.generated.LiteralExpr
  * be referenced directly.
  */
 module Impl {
+  // the following QLdoc is generated: if you need to edit it, do it in the schema file
   /**
    * A literal expression. For example:
    * ```rust
@@ -25,5 +25,7 @@ module Impl {
    * true;
    * ```
    */
-  class LiteralExpr extends Generated::LiteralExpr { }
+  class LiteralExpr extends Generated::LiteralExpr {
+    override string toString() { result = this.getTextValue() }
+  }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/LocatableImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/LocatableImpl.qll
index 570992497f1..605c0e0f816 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/LocatableImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/LocatableImpl.qll
@@ -5,32 +5,49 @@
  */
 
 import codeql.Locations
+private import codeql.rust.elements.internal.LocationImpl
 private import codeql.rust.elements.internal.generated.Locatable
 private import codeql.rust.elements.internal.generated.Synth
 private import codeql.rust.elements.internal.generated.Raw
+private import codeql.rust.internal.CachedStages
 
 /**
  * INTERNAL: This module contains the customizable definition of `Locatable` and should not
  * be referenced directly.
  */
 module Impl {
-  class Locatable extends Generated::Locatable {
+  abstract class SynthLocatable extends Locatable {
     pragma[nomagic]
-    final Location getLocation() {
-      exists(Raw::Locatable raw |
-        raw = Synth::convertLocatableToRaw(this) and
-        (
-          locatable_locations(raw, result)
-          or
-          not exists(Location loc | locatable_locations(raw, loc)) and
-          result instanceof EmptyLocation
-        )
+    abstract predicate hasSynthLocationInfo(
+      File file, int startline, int startcolumn, int endline, int endcolumn
+    );
+
+    final override Location getLocation() {
+      exists(File file, int startline, int startcolumn, int endline, int endcolumn |
+        this.hasSynthLocationInfo(file, startline, startcolumn, endline, endcolumn) and
+        result.hasLocationFileInfo(file, startline, startcolumn, endline, endcolumn)
       )
     }
+  }
+
+  class Locatable extends Generated::Locatable {
+    cached
+    Location getLocation() {
+      Stages::AstStage::ref() and
+      result = getLocationDefault(this)
+    }
 
     /**
      * Gets the primary file where this element occurs.
      */
     File getFile() { result = this.getLocation().getFile() }
   }
+
+  /** Gets the non-synthesized location of `l`, if any. */
+  LocationImpl::LocationDefault getLocationDefault(Locatable l) {
+    exists(@location_default location |
+      result = LocationImpl::TLocationDefault(location) and
+      locatable_locations(Synth::convertLocatableToRaw(l), location)
+    )
+  }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/LocationImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/LocationImpl.qll
new file mode 100644
index 00000000000..52daf46863b
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/LocationImpl.qll
@@ -0,0 +1,113 @@
+private import codeql.files.FileSystem
+private import codeql.rust.elements.internal.LocatableImpl::Impl as LocatableImpl
+private import codeql.rust.elements.Locatable
+private import codeql.rust.elements.Format
+private import codeql.rust.elements.FormatArgument
+private import codeql.rust.internal.CachedStages
+
+module LocationImpl {
+  cached
+  newtype TLocation =
+    TLocationDefault(@location_default location) { Stages::AstStage::ref() } or
+    TLocationSynth(File file, int beginLine, int beginColumn, int endLine, int endColumn) {
+      not locations_default(_, file, beginLine, beginColumn, endLine, endColumn) and
+      any(LocatableImpl::SynthLocatable l)
+          .hasSynthLocationInfo(file, beginLine, beginColumn, endLine, endColumn)
+    }
+
+  /**
+   * A location as given by a file, a start line, a start column,
+   * an end line, and an end column.
+   *
+   * For more information about locations see [Locations](https://codeql.github.com/docs/writing-codeql-queries/providing-locations-in-codeql-queries/).
+   */
+  abstract class Location extends TLocation {
+    /** Gets the file for this location. */
+    File getFile() { this.hasLocationInfo(result.getAbsolutePath(), _, _, _, _) }
+
+    /** Gets the 1-based line number (inclusive) where this location starts. */
+    int getStartLine() { this.hasLocationInfo(_, result, _, _, _) }
+
+    /** Gets the 1-based column number (inclusive) where this location starts. */
+    int getStartColumn() { this.hasLocationInfo(_, _, result, _, _) }
+
+    /** Gets the 1-based line number (inclusive) where this location ends. */
+    int getEndLine() { this.hasLocationInfo(_, _, _, result, _) }
+
+    /** Gets the 1-based column number (inclusive) where this location ends. */
+    int getEndColumn() { this.hasLocationInfo(_, _, _, _, result) }
+
+    /** Gets the number of lines covered by this location. */
+    int getNumLines() { result = this.getEndLine() - this.getStartLine() + 1 }
+
+    /** Gets a textual representation of this element. */
+    bindingset[this]
+    pragma[inline_late]
+    string toString() {
+      exists(string filepath, int startline, int startcolumn, int endline, int endcolumn |
+        this.hasLocationInfo(filepath, startline, startcolumn, endline, endcolumn) and
+        result = filepath + "@" + startline + ":" + startcolumn + ":" + endline + ":" + endcolumn
+      )
+    }
+
+    /**
+     * Holds if this element is at the specified location.
+     * The location spans column `startcolumn` of line `startline` to
+     * column `endcolumn` of line `endline` in file `filepath`.
+     * For more information, see
+     * [Providing locations in CodeQL queries](https://codeql.github.com/docs/writing-codeql-queries/providing-locations-in-codeql-queries/).
+     */
+    abstract predicate hasLocationFileInfo(
+      File file, int startline, int startcolumn, int endline, int endcolumn
+    );
+
+    /**
+     * Holds if this element is at the specified location.
+     * The location spans column `startcolumn` of line `startline` to
+     * column `endcolumn` of line `endline` in file `filepath`.
+     * For more information, see
+     * [Providing locations in CodeQL queries](https://codeql.github.com/docs/writing-codeql-queries/providing-locations-in-codeql-queries/).
+     */
+    final predicate hasLocationInfo(
+      string filepath, int startline, int startcolumn, int endline, int endcolumn
+    ) {
+      exists(File file |
+        this.hasLocationFileInfo(file, startline, startcolumn, endline, endcolumn) and
+        filepath = file.getAbsolutePath()
+      )
+    }
+
+    /** Holds if this location starts strictly before the specified location. */
+    pragma[inline]
+    predicate strictlyBefore(Location other) {
+      this.getStartLine() < other.getStartLine()
+      or
+      this.getStartLine() = other.getStartLine() and this.getStartColumn() < other.getStartColumn()
+    }
+  }
+
+  class LocationDefault extends Location, TLocationDefault {
+    @location_default self;
+
+    LocationDefault() { this = TLocationDefault(self) }
+
+    override predicate hasLocationFileInfo(
+      File file, int startline, int startcolumn, int endline, int endcolumn
+    ) {
+      locations_default(self, file, startline, startcolumn, endline, endcolumn)
+    }
+  }
+
+  /** An entity representing an empty location. */
+  class EmptyLocation extends LocationDefault {
+    EmptyLocation() { empty_location(self) }
+  }
+
+  class LocationSynth extends Location, TLocationSynth {
+    override predicate hasLocationFileInfo(
+      File file, int startline, int startcolumn, int endline, int endcolumn
+    ) {
+      this = TLocationSynth(file, startline, startcolumn, endline, endcolumn)
+    }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/MacroCallConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/MacroCallConstructor.qll
new file mode 100644
index 00000000000..364fbc1845c
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/MacroCallConstructor.qll
@@ -0,0 +1,14 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ *  This module defines the hook used internally to tweak the characteristic predicate of
+ *  `MacroCall` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Raw
+
+/**
+ *  The characteristic predicate of `MacroCall` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+predicate constructMacroCall(Raw::MacroCall id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/MacroCallImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/MacroCallImpl.qll
new file mode 100644
index 00000000000..76fcd7645a6
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/MacroCallImpl.qll
@@ -0,0 +1,22 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ * This module provides a hand-modifiable wrapper around the generated class `MacroCall`.
+ *
+ * INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.MacroCall
+
+/**
+ * INTERNAL: This module contains the customizable definition of `MacroCall` and should not
+ * be referenced directly.
+ */
+module Impl {
+  /**
+   * A MacroCall. For example:
+   * ```rust
+   * todo!()
+   * ```
+   */
+  class MacroCall extends Generated::MacroCall { }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/MacroDefConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/MacroDefConstructor.qll
new file mode 100644
index 00000000000..56eb406f930
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/MacroDefConstructor.qll
@@ -0,0 +1,14 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ *  This module defines the hook used internally to tweak the characteristic predicate of
+ *  `MacroDef` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Raw
+
+/**
+ *  The characteristic predicate of `MacroDef` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+predicate constructMacroDef(Raw::MacroDef id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/MacroDefImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/MacroDefImpl.qll
new file mode 100644
index 00000000000..17d0293b108
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/MacroDefImpl.qll
@@ -0,0 +1,22 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ * This module provides a hand-modifiable wrapper around the generated class `MacroDef`.
+ *
+ * INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.MacroDef
+
+/**
+ * INTERNAL: This module contains the customizable definition of `MacroDef` and should not
+ * be referenced directly.
+ */
+module Impl {
+  /**
+   * A MacroDef. For example:
+   * ```rust
+   * todo!()
+   * ```
+   */
+  class MacroDef extends Generated::MacroDef { }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/MacroExprConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/MacroExprConstructor.qll
new file mode 100644
index 00000000000..ab916abe268
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/MacroExprConstructor.qll
@@ -0,0 +1,14 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ *  This module defines the hook used internally to tweak the characteristic predicate of
+ *  `MacroExpr` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Raw
+
+/**
+ *  The characteristic predicate of `MacroExpr` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+predicate constructMacroExpr(Raw::MacroExpr id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/MacroExprImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/MacroExprImpl.qll
new file mode 100644
index 00000000000..42c46e9e60b
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/MacroExprImpl.qll
@@ -0,0 +1,22 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ * This module provides a hand-modifiable wrapper around the generated class `MacroExpr`.
+ *
+ * INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.MacroExpr
+
+/**
+ * INTERNAL: This module contains the customizable definition of `MacroExpr` and should not
+ * be referenced directly.
+ */
+module Impl {
+  /**
+   * A MacroExpr. For example:
+   * ```rust
+   * todo!()
+   * ```
+   */
+  class MacroExpr extends Generated::MacroExpr { }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/RepeatExprConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/MacroItemsConstructor.qll
similarity index 64%
rename from rust/ql/lib/codeql/rust/elements/internal/RepeatExprConstructor.qll
rename to rust/ql/lib/codeql/rust/elements/internal/MacroItemsConstructor.qll
index 4d495075c0f..90c37c4f278 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/RepeatExprConstructor.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/MacroItemsConstructor.qll
@@ -1,14 +1,14 @@
 // generated by codegen, remove this comment if you wish to edit this file
 /**
  *  This module defines the hook used internally to tweak the characteristic predicate of
- *  `RepeatExpr` synthesized instances.
+ *  `MacroItems` synthesized instances.
  *  INTERNAL: Do not use.
  */
 
 private import codeql.rust.elements.internal.generated.Raw
 
 /**
- *  The characteristic predicate of `RepeatExpr` synthesized instances.
+ *  The characteristic predicate of `MacroItems` synthesized instances.
  *  INTERNAL: Do not use.
  */
-predicate constructRepeatExpr(Raw::RepeatExpr id) { any() }
+predicate constructMacroItems(Raw::MacroItems id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/AsyncBlockExprImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/MacroItemsImpl.qll
similarity index 51%
rename from rust/ql/lib/codeql/rust/elements/internal/AsyncBlockExprImpl.qll
rename to rust/ql/lib/codeql/rust/elements/internal/MacroItemsImpl.qll
index c14ddf43bd5..2ed6536fac8 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/AsyncBlockExprImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/MacroItemsImpl.qll
@@ -1,25 +1,24 @@
 // generated by codegen, remove this comment if you wish to edit this file
 /**
- * This module provides a hand-modifiable wrapper around the generated class `AsyncBlockExpr`.
+ * This module provides a hand-modifiable wrapper around the generated class `MacroItems`.
  *
  * INTERNAL: Do not use.
  */
 
-private import codeql.rust.elements.internal.generated.AsyncBlockExpr
+private import codeql.rust.elements.internal.generated.MacroItems
 
 /**
- * INTERNAL: This module contains the customizable definition of `AsyncBlockExpr` and should not
+ * INTERNAL: This module contains the customizable definition of `MacroItems` and should not
  * be referenced directly.
  */
 module Impl {
   /**
-   * An async block expression. For example:
+   * A sequence of items generated by a `MacroCall`. For example:
    * ```rust
-   * async {
-   *    let x = 42;
-   *    x
-   * }.await
+   * mod foo{
+   *     include!("common_definitions.rs");
+   * }
    * ```
    */
-  class AsyncBlockExpr extends Generated::AsyncBlockExpr { }
+  class MacroItems extends Generated::MacroItems { }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/MacroPatConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/MacroPatConstructor.qll
new file mode 100644
index 00000000000..2ddbecfb7b1
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/MacroPatConstructor.qll
@@ -0,0 +1,14 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ *  This module defines the hook used internally to tweak the characteristic predicate of
+ *  `MacroPat` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Raw
+
+/**
+ *  The characteristic predicate of `MacroPat` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+predicate constructMacroPat(Raw::MacroPat id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/MacroPatImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/MacroPatImpl.qll
new file mode 100644
index 00000000000..70c056fa5c1
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/MacroPatImpl.qll
@@ -0,0 +1,22 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ * This module provides a hand-modifiable wrapper around the generated class `MacroPat`.
+ *
+ * INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.MacroPat
+
+/**
+ * INTERNAL: This module contains the customizable definition of `MacroPat` and should not
+ * be referenced directly.
+ */
+module Impl {
+  /**
+   * A MacroPat. For example:
+   * ```rust
+   * todo!()
+   * ```
+   */
+  class MacroPat extends Generated::MacroPat { }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/MacroRulesConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/MacroRulesConstructor.qll
new file mode 100644
index 00000000000..eaaac12beda
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/MacroRulesConstructor.qll
@@ -0,0 +1,14 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ *  This module defines the hook used internally to tweak the characteristic predicate of
+ *  `MacroRules` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Raw
+
+/**
+ *  The characteristic predicate of `MacroRules` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+predicate constructMacroRules(Raw::MacroRules id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/MacroRulesImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/MacroRulesImpl.qll
new file mode 100644
index 00000000000..ca0051dce8d
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/MacroRulesImpl.qll
@@ -0,0 +1,22 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ * This module provides a hand-modifiable wrapper around the generated class `MacroRules`.
+ *
+ * INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.MacroRules
+
+/**
+ * INTERNAL: This module contains the customizable definition of `MacroRules` and should not
+ * be referenced directly.
+ */
+module Impl {
+  /**
+   * A MacroRules. For example:
+   * ```rust
+   * todo!()
+   * ```
+   */
+  class MacroRules extends Generated::MacroRules { }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/MacroStmtsConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/MacroStmtsConstructor.qll
new file mode 100644
index 00000000000..6f588955125
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/MacroStmtsConstructor.qll
@@ -0,0 +1,14 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ *  This module defines the hook used internally to tweak the characteristic predicate of
+ *  `MacroStmts` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Raw
+
+/**
+ *  The characteristic predicate of `MacroStmts` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+predicate constructMacroStmts(Raw::MacroStmts id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/MacroStmtsImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/MacroStmtsImpl.qll
new file mode 100644
index 00000000000..8ec38e3c526
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/MacroStmtsImpl.qll
@@ -0,0 +1,24 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ * This module provides a hand-modifiable wrapper around the generated class `MacroStmts`.
+ *
+ * INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.MacroStmts
+
+/**
+ * INTERNAL: This module contains the customizable definition of `MacroStmts` and should not
+ * be referenced directly.
+ */
+module Impl {
+  /**
+   * A sequence of statements generated by a `MacroCall`. For example:
+   * ```rust
+   * fn main() {
+   *     println!("Hello, world!"); // This macro expands into a list of statements
+   * }
+   * ```
+   */
+  class MacroStmts extends Generated::MacroStmts { }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/MacroTypeConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/MacroTypeConstructor.qll
new file mode 100644
index 00000000000..cbe65a8bed7
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/MacroTypeConstructor.qll
@@ -0,0 +1,14 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ *  This module defines the hook used internally to tweak the characteristic predicate of
+ *  `MacroType` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Raw
+
+/**
+ *  The characteristic predicate of `MacroType` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+predicate constructMacroType(Raw::MacroType id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/MacroTypeImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/MacroTypeImpl.qll
new file mode 100644
index 00000000000..6feb1321888
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/MacroTypeImpl.qll
@@ -0,0 +1,22 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ * This module provides a hand-modifiable wrapper around the generated class `MacroType`.
+ *
+ * INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.MacroType
+
+/**
+ * INTERNAL: This module contains the customizable definition of `MacroType` and should not
+ * be referenced directly.
+ */
+module Impl {
+  /**
+   * A MacroType. For example:
+   * ```rust
+   * todo!()
+   * ```
+   */
+  class MacroType extends Generated::MacroType { }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/MatchArmListConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/MatchArmListConstructor.qll
new file mode 100644
index 00000000000..faf8223a3b6
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/MatchArmListConstructor.qll
@@ -0,0 +1,14 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ *  This module defines the hook used internally to tweak the characteristic predicate of
+ *  `MatchArmList` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Raw
+
+/**
+ *  The characteristic predicate of `MatchArmList` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+predicate constructMatchArmList(Raw::MatchArmList id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/MatchArmListImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/MatchArmListImpl.qll
new file mode 100644
index 00000000000..5e1ac06282a
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/MatchArmListImpl.qll
@@ -0,0 +1,22 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ * This module provides a hand-modifiable wrapper around the generated class `MatchArmList`.
+ *
+ * INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.MatchArmList
+
+/**
+ * INTERNAL: This module contains the customizable definition of `MatchArmList` and should not
+ * be referenced directly.
+ */
+module Impl {
+  /**
+   * A MatchArmList. For example:
+   * ```rust
+   * todo!()
+   * ```
+   */
+  class MatchArmList extends Generated::MatchArmList { }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/MatchExprImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/MatchExprImpl.qll
index fd2cb793ca8..c8cb535b526 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/MatchExprImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/MatchExprImpl.qll
@@ -1,4 +1,3 @@
-// generated by codegen, remove this comment if you wish to edit this file
 /**
  * This module provides a hand-modifiable wrapper around the generated class `MatchExpr`.
  *
@@ -12,6 +11,7 @@ private import codeql.rust.elements.internal.generated.MatchExpr
  * be referenced directly.
  */
 module Impl {
+  // the following QLdoc is generated: if you need to edit it, do it in the schema file
   /**
    * A match expression. For example:
    * ```rust
@@ -27,5 +27,28 @@ module Impl {
    * }
    * ```
    */
-  class MatchExpr extends Generated::MatchExpr { }
+  class MatchExpr extends Generated::MatchExpr {
+    /**
+     * Gets the `index`th arm of this match expression.
+     */
+    pragma[nomagic]
+    MatchArm getArm(int index) { result = this.getMatchArmList().getArm(index) }
+
+    /**
+     * Gets any of the arms of this match expression.
+     */
+    MatchArm getAnArm() { result = this.getArm(_) }
+
+    /**
+     * Gets the number of arms of this match expression.
+     */
+    pragma[nomagic]
+    int getNumberOfArms() { result = this.getMatchArmList().getNumberOfArms() }
+
+    /**
+     * Gets the last arm of this match expression. Due to exhaustiveness checking,
+     * this arm is guaranteed to succeed.
+     */
+    MatchArm getLastArm() { result = this.getArm(this.getNumberOfArms() - 1) }
+  }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/MatchGuardConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/MatchGuardConstructor.qll
new file mode 100644
index 00000000000..58e765e741b
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/MatchGuardConstructor.qll
@@ -0,0 +1,14 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ *  This module defines the hook used internally to tweak the characteristic predicate of
+ *  `MatchGuard` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Raw
+
+/**
+ *  The characteristic predicate of `MatchGuard` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+predicate constructMatchGuard(Raw::MatchGuard id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/MatchGuardImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/MatchGuardImpl.qll
new file mode 100644
index 00000000000..e4bc039ee53
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/MatchGuardImpl.qll
@@ -0,0 +1,22 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ * This module provides a hand-modifiable wrapper around the generated class `MatchGuard`.
+ *
+ * INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.MatchGuard
+
+/**
+ * INTERNAL: This module contains the customizable definition of `MatchGuard` and should not
+ * be referenced directly.
+ */
+module Impl {
+  /**
+   * A MatchGuard. For example:
+   * ```rust
+   * todo!()
+   * ```
+   */
+  class MatchGuard extends Generated::MatchGuard { }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/MetaConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/MetaConstructor.qll
new file mode 100644
index 00000000000..0cd1ca6bbe9
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/MetaConstructor.qll
@@ -0,0 +1,14 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ *  This module defines the hook used internally to tweak the characteristic predicate of
+ *  `Meta` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Raw
+
+/**
+ *  The characteristic predicate of `Meta` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+predicate constructMeta(Raw::Meta id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/MetaImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/MetaImpl.qll
new file mode 100644
index 00000000000..1e6b30b6249
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/MetaImpl.qll
@@ -0,0 +1,22 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ * This module provides a hand-modifiable wrapper around the generated class `Meta`.
+ *
+ * INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Meta
+
+/**
+ * INTERNAL: This module contains the customizable definition of `Meta` and should not
+ * be referenced directly.
+ */
+module Impl {
+  /**
+   * A Meta. For example:
+   * ```rust
+   * todo!()
+   * ```
+   */
+  class Meta extends Generated::Meta { }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/MethodCallExprImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/MethodCallExprImpl.qll
index 729c2fff0ed..a599feded62 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/MethodCallExprImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/MethodCallExprImpl.qll
@@ -1,4 +1,3 @@
-// generated by codegen, remove this comment if you wish to edit this file
 /**
  * This module provides a hand-modifiable wrapper around the generated class `MethodCallExpr`.
  *
@@ -12,6 +11,7 @@ private import codeql.rust.elements.internal.generated.MethodCallExpr
  * be referenced directly.
  */
 module Impl {
+  // the following QLdoc is generated: if you need to edit it, do it in the schema file
   /**
    * A method call expression. For example:
    * ```rust
@@ -19,5 +19,7 @@ module Impl {
    * x.foo::<u32, u64>(42);
    * ```
    */
-  class MethodCallExpr extends Generated::MethodCallExpr { }
+  class MethodCallExpr extends Generated::MethodCallExpr {
+    override string toString() { result = "... ." + this.getNameRef().toString() + "(...)" }
+  }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/MissingConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/MissingConstructor.qll
new file mode 100644
index 00000000000..8dbd1bddd6d
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/MissingConstructor.qll
@@ -0,0 +1,14 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ *  This module defines the hook used internally to tweak the characteristic predicate of
+ *  `Missing` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Raw
+
+/**
+ *  The characteristic predicate of `Missing` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+predicate constructMissing(Raw::Missing id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/MissingPatImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/MissingPatImpl.qll
deleted file mode 100644
index b798a75b1b9..00000000000
--- a/rust/ql/lib/codeql/rust/elements/internal/MissingPatImpl.qll
+++ /dev/null
@@ -1,24 +0,0 @@
-// generated by codegen, remove this comment if you wish to edit this file
-/**
- * This module provides a hand-modifiable wrapper around the generated class `MissingPat`.
- *
- * INTERNAL: Do not use.
- */
-
-private import codeql.rust.elements.internal.generated.MissingPat
-
-/**
- * INTERNAL: This module contains the customizable definition of `MissingPat` and should not
- * be referenced directly.
- */
-module Impl {
-  /**
-   * A missing pattern, used as a place holder for incomplete syntax.
-   * ```rust
-   * match Some(42) {
-   *     .. => "bad use of .. syntax",
-   * };
-   * ```
-   */
-  class MissingPat extends Generated::MissingPat { }
-}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/NameConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/NameConstructor.qll
new file mode 100644
index 00000000000..139908a3490
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/NameConstructor.qll
@@ -0,0 +1,14 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ *  This module defines the hook used internally to tweak the characteristic predicate of
+ *  `Name` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Raw
+
+/**
+ *  The characteristic predicate of `Name` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+predicate constructName(Raw::Name id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/NameImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/NameImpl.qll
new file mode 100644
index 00000000000..43642a03886
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/NameImpl.qll
@@ -0,0 +1,24 @@
+/**
+ * This module provides a hand-modifiable wrapper around the generated class `Name`.
+ *
+ * INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Name
+
+/**
+ * INTERNAL: This module contains the customizable definition of `Name` and should not
+ * be referenced directly.
+ */
+module Impl {
+  // the following QLdoc is generated: if you need to edit it, do it in the schema file
+  /**
+   * A Name. For example:
+   * ```rust
+   * todo!()
+   * ```
+   */
+  class Name extends Generated::Name {
+    override string toString() { result = this.getText() }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/NameRefConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/NameRefConstructor.qll
new file mode 100644
index 00000000000..8f90d066b51
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/NameRefConstructor.qll
@@ -0,0 +1,14 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ *  This module defines the hook used internally to tweak the characteristic predicate of
+ *  `NameRef` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Raw
+
+/**
+ *  The characteristic predicate of `NameRef` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+predicate constructNameRef(Raw::NameRef id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/NameRefImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/NameRefImpl.qll
new file mode 100644
index 00000000000..9f5f3eac48e
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/NameRefImpl.qll
@@ -0,0 +1,24 @@
+/**
+ * This module provides a hand-modifiable wrapper around the generated class `NameRef`.
+ *
+ * INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.NameRef
+
+/**
+ * INTERNAL: This module contains the customizable definition of `NameRef` and should not
+ * be referenced directly.
+ */
+module Impl {
+  // the following QLdoc is generated: if you need to edit it, do it in the schema file
+  /**
+   * A NameRef. For example:
+   * ```rust
+   * todo!()
+   * ```
+   */
+  class NameRef extends Generated::NameRef {
+    override string toString() { result = this.getText() }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/NeverTypeConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/NeverTypeConstructor.qll
new file mode 100644
index 00000000000..10b7b835e81
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/NeverTypeConstructor.qll
@@ -0,0 +1,14 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ *  This module defines the hook used internally to tweak the characteristic predicate of
+ *  `NeverType` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Raw
+
+/**
+ *  The characteristic predicate of `NeverType` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+predicate constructNeverType(Raw::NeverType id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/NeverTypeImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/NeverTypeImpl.qll
new file mode 100644
index 00000000000..9c04237f38c
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/NeverTypeImpl.qll
@@ -0,0 +1,22 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ * This module provides a hand-modifiable wrapper around the generated class `NeverType`.
+ *
+ * INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.NeverType
+
+/**
+ * INTERNAL: This module contains the customizable definition of `NeverType` and should not
+ * be referenced directly.
+ */
+module Impl {
+  /**
+   * A NeverType. For example:
+   * ```rust
+   * todo!()
+   * ```
+   */
+  class NeverType extends Generated::NeverType { }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/OrPatImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/OrPatImpl.qll
index c00be2a7793..f29e3d1865f 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/OrPatImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/OrPatImpl.qll
@@ -1,4 +1,3 @@
-// generated by codegen, remove this comment if you wish to edit this file
 /**
  * This module provides a hand-modifiable wrapper around the generated class `OrPat`.
  *
@@ -12,6 +11,7 @@ private import codeql.rust.elements.internal.generated.OrPat
  * be referenced directly.
  */
 module Impl {
+  // the following QLdoc is generated: if you need to edit it, do it in the schema file
   /**
    * An or pattern. For example:
    * ```rust
@@ -20,5 +20,9 @@ module Impl {
    * }
    * ```
    */
-  class OrPat extends Generated::OrPat { }
+  class OrPat extends Generated::OrPat {
+    /** Gets the last pattern in this or pattern. */
+    pragma[nomagic]
+    Pat getLastPat() { result = this.getPat(this.getNumberOfPats() - 1) }
+  }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/ParamConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/ParamConstructor.qll
new file mode 100644
index 00000000000..5bbdbe61af3
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/ParamConstructor.qll
@@ -0,0 +1,14 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ *  This module defines the hook used internally to tweak the characteristic predicate of
+ *  `Param` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Raw
+
+/**
+ *  The characteristic predicate of `Param` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+predicate constructParam(Raw::Param id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/ParamImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/ParamImpl.qll
new file mode 100644
index 00000000000..7015d097e9f
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/ParamImpl.qll
@@ -0,0 +1,22 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ * This module provides a hand-modifiable wrapper around the generated class `Param`.
+ *
+ * INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Param
+
+/**
+ * INTERNAL: This module contains the customizable definition of `Param` and should not
+ * be referenced directly.
+ */
+module Impl {
+  /**
+   * A Param. For example:
+   * ```rust
+   * todo!()
+   * ```
+   */
+  class Param extends Generated::Param { }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/ParamListConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/ParamListConstructor.qll
new file mode 100644
index 00000000000..53cb78f4be7
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/ParamListConstructor.qll
@@ -0,0 +1,14 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ *  This module defines the hook used internally to tweak the characteristic predicate of
+ *  `ParamList` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Raw
+
+/**
+ *  The characteristic predicate of `ParamList` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+predicate constructParamList(Raw::ParamList id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/ParamListImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/ParamListImpl.qll
new file mode 100644
index 00000000000..e31c2734355
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/ParamListImpl.qll
@@ -0,0 +1,22 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ * This module provides a hand-modifiable wrapper around the generated class `ParamList`.
+ *
+ * INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.ParamList
+
+/**
+ * INTERNAL: This module contains the customizable definition of `ParamList` and should not
+ * be referenced directly.
+ */
+module Impl {
+  /**
+   * A ParamList. For example:
+   * ```rust
+   * todo!()
+   * ```
+   */
+  class ParamList extends Generated::ParamList { }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/ParenExprConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/ParenExprConstructor.qll
new file mode 100644
index 00000000000..95452ccb610
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/ParenExprConstructor.qll
@@ -0,0 +1,14 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ *  This module defines the hook used internally to tweak the characteristic predicate of
+ *  `ParenExpr` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Raw
+
+/**
+ *  The characteristic predicate of `ParenExpr` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+predicate constructParenExpr(Raw::ParenExpr id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/ParenExprImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/ParenExprImpl.qll
new file mode 100644
index 00000000000..98c3cab9267
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/ParenExprImpl.qll
@@ -0,0 +1,22 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ * This module provides a hand-modifiable wrapper around the generated class `ParenExpr`.
+ *
+ * INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.ParenExpr
+
+/**
+ * INTERNAL: This module contains the customizable definition of `ParenExpr` and should not
+ * be referenced directly.
+ */
+module Impl {
+  /**
+   * A ParenExpr. For example:
+   * ```rust
+   * todo!()
+   * ```
+   */
+  class ParenExpr extends Generated::ParenExpr { }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/ParenPatConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/ParenPatConstructor.qll
new file mode 100644
index 00000000000..68ef6e0b036
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/ParenPatConstructor.qll
@@ -0,0 +1,14 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ *  This module defines the hook used internally to tweak the characteristic predicate of
+ *  `ParenPat` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Raw
+
+/**
+ *  The characteristic predicate of `ParenPat` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+predicate constructParenPat(Raw::ParenPat id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/ParenPatImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/ParenPatImpl.qll
new file mode 100644
index 00000000000..cdba455451c
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/ParenPatImpl.qll
@@ -0,0 +1,22 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ * This module provides a hand-modifiable wrapper around the generated class `ParenPat`.
+ *
+ * INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.ParenPat
+
+/**
+ * INTERNAL: This module contains the customizable definition of `ParenPat` and should not
+ * be referenced directly.
+ */
+module Impl {
+  /**
+   * A ParenPat. For example:
+   * ```rust
+   * todo!()
+   * ```
+   */
+  class ParenPat extends Generated::ParenPat { }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/ParenTypeConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/ParenTypeConstructor.qll
new file mode 100644
index 00000000000..f8450946a0b
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/ParenTypeConstructor.qll
@@ -0,0 +1,14 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ *  This module defines the hook used internally to tweak the characteristic predicate of
+ *  `ParenType` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Raw
+
+/**
+ *  The characteristic predicate of `ParenType` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+predicate constructParenType(Raw::ParenType id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/ParenTypeImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/ParenTypeImpl.qll
new file mode 100644
index 00000000000..ab49c9c4fcf
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/ParenTypeImpl.qll
@@ -0,0 +1,22 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ * This module provides a hand-modifiable wrapper around the generated class `ParenType`.
+ *
+ * INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.ParenType
+
+/**
+ * INTERNAL: This module contains the customizable definition of `ParenType` and should not
+ * be referenced directly.
+ */
+module Impl {
+  /**
+   * A ParenType. For example:
+   * ```rust
+   * todo!()
+   * ```
+   */
+  class ParenType extends Generated::ParenType { }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/PathExprBaseImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/PathExprBaseImpl.qll
new file mode 100644
index 00000000000..14552809524
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/PathExprBaseImpl.qll
@@ -0,0 +1,19 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ * This module provides a hand-modifiable wrapper around the generated class `PathExprBase`.
+ *
+ * INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.PathExprBase
+
+/**
+ * INTERNAL: This module contains the customizable definition of `PathExprBase` and should not
+ * be referenced directly.
+ */
+module Impl {
+  /**
+   * A path expression or a variable access in a formatting template. See `PathExpr` and `FormatTemplateVariableAccess` for further details.
+   */
+  class PathExprBase extends Generated::PathExprBase { }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/PathExprImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/PathExprImpl.qll
index 68b11db73b0..c8a2af3de33 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/PathExprImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/PathExprImpl.qll
@@ -1,4 +1,3 @@
-// generated by codegen, remove this comment if you wish to edit this file
 /**
  * This module provides a hand-modifiable wrapper around the generated class `PathExpr`.
  *
@@ -12,6 +11,7 @@ private import codeql.rust.elements.internal.generated.PathExpr
  * be referenced directly.
  */
 module Impl {
+  // the following QLdoc is generated: if you need to edit it, do it in the schema file
   /**
    * A path expression. For example:
    * ```rust
@@ -21,5 +21,7 @@ module Impl {
    * let z = <TypeRef as Trait>::foo;
    * ```
    */
-  class PathExpr extends Generated::PathExpr { }
+  class PathExpr extends Generated::PathExpr {
+    override string toString() { result = this.getPath().toString() }
+  }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/PathImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/PathImpl.qll
index 9e3d4127cb7..b53c86559f0 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/PathImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/PathImpl.qll
@@ -1,4 +1,3 @@
-// generated by codegen, remove this comment if you wish to edit this file
 /**
  * This module provides a hand-modifiable wrapper around the generated class `Path`.
  *
@@ -12,11 +11,18 @@ private import codeql.rust.elements.internal.generated.Path
  * be referenced directly.
  */
 module Impl {
+  // the following QLdoc is generated: if you need to edit it, do it in the schema file
   /**
    * A path. For example:
    * ```rust
    * foo::bar;
    * ```
    */
-  class Path extends Generated::Path { }
+  class Path extends Generated::Path {
+    override string toString() {
+      if this.hasQualifier()
+      then result = this.getQualifier().toString() + "::" + this.getPart().toString()
+      else result = this.getPart().toString()
+    }
+  }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/PathSegmentConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/PathSegmentConstructor.qll
new file mode 100644
index 00000000000..cc5d0f2eee6
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/PathSegmentConstructor.qll
@@ -0,0 +1,14 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ *  This module defines the hook used internally to tweak the characteristic predicate of
+ *  `PathSegment` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Raw
+
+/**
+ *  The characteristic predicate of `PathSegment` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+predicate constructPathSegment(Raw::PathSegment id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/PathSegmentImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/PathSegmentImpl.qll
new file mode 100644
index 00000000000..300a6c7d4a0
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/PathSegmentImpl.qll
@@ -0,0 +1,29 @@
+/**
+ * This module provides a hand-modifiable wrapper around the generated class `PathSegment`.
+ *
+ * INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.PathSegment
+
+/**
+ * INTERNAL: This module contains the customizable definition of `PathSegment` and should not
+ * be referenced directly.
+ */
+module Impl {
+  // the following QLdoc is generated: if you need to edit it, do it in the schema file
+  /**
+   * A PathSegment. For example:
+   * ```rust
+   * todo!()
+   * ```
+   */
+  class PathSegment extends Generated::PathSegment {
+    override string toString() {
+      // TODO: this does not cover everything
+      if this.hasGenericArgList()
+      then result = this.getNameRef().toString() + "::<...>"
+      else result = this.getNameRef().toString()
+    }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/PathTypeConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/PathTypeConstructor.qll
new file mode 100644
index 00000000000..f16371570f6
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/PathTypeConstructor.qll
@@ -0,0 +1,14 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ *  This module defines the hook used internally to tweak the characteristic predicate of
+ *  `PathType` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Raw
+
+/**
+ *  The characteristic predicate of `PathType` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+predicate constructPathType(Raw::PathType id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/PathTypeImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/PathTypeImpl.qll
new file mode 100644
index 00000000000..74fa536e08b
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/PathTypeImpl.qll
@@ -0,0 +1,22 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ * This module provides a hand-modifiable wrapper around the generated class `PathType`.
+ *
+ * INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.PathType
+
+/**
+ * INTERNAL: This module contains the customizable definition of `PathType` and should not
+ * be referenced directly.
+ */
+module Impl {
+  /**
+   * A PathType. For example:
+   * ```rust
+   * todo!()
+   * ```
+   */
+  class PathType extends Generated::PathType { }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/PrefixExprImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/PrefixExprImpl.qll
index f5878bac274..56fd5914660 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/PrefixExprImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/PrefixExprImpl.qll
@@ -1,4 +1,3 @@
-// generated by codegen, remove this comment if you wish to edit this file
 /**
  * This module provides a hand-modifiable wrapper around the generated class `PrefixExpr`.
  *
@@ -12,13 +11,16 @@ private import codeql.rust.elements.internal.generated.PrefixExpr
  * be referenced directly.
  */
 module Impl {
+  // the following QLdoc is generated: if you need to edit it, do it in the schema file
   /**
    * A unary operation expression. For example:
    * ```rust
-   * let x = -42
-   * let y = !true
-   * let z = *ptr
+   * let x = -42;
+   * let y = !true;
+   * let z = *ptr;
    * ```
    */
-  class PrefixExpr extends Generated::PrefixExpr { }
+  class PrefixExpr extends Generated::PrefixExpr {
+    override string toString() { result = this.getOperatorName() + " ..." }
+  }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/PtrTypeConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/PtrTypeConstructor.qll
new file mode 100644
index 00000000000..48fb82aeb9e
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/PtrTypeConstructor.qll
@@ -0,0 +1,14 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ *  This module defines the hook used internally to tweak the characteristic predicate of
+ *  `PtrType` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Raw
+
+/**
+ *  The characteristic predicate of `PtrType` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+predicate constructPtrType(Raw::PtrType id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/PtrTypeImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/PtrTypeImpl.qll
new file mode 100644
index 00000000000..95c558cdb81
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/PtrTypeImpl.qll
@@ -0,0 +1,22 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ * This module provides a hand-modifiable wrapper around the generated class `PtrType`.
+ *
+ * INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.PtrType
+
+/**
+ * INTERNAL: This module contains the customizable definition of `PtrType` and should not
+ * be referenced directly.
+ */
+module Impl {
+  /**
+   * A PtrType. For example:
+   * ```rust
+   * todo!()
+   * ```
+   */
+  class PtrType extends Generated::PtrType { }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/RecordExprFieldListConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/RecordExprFieldListConstructor.qll
new file mode 100644
index 00000000000..6ced8f30ce4
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/RecordExprFieldListConstructor.qll
@@ -0,0 +1,14 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ *  This module defines the hook used internally to tweak the characteristic predicate of
+ *  `RecordExprFieldList` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Raw
+
+/**
+ *  The characteristic predicate of `RecordExprFieldList` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+predicate constructRecordExprFieldList(Raw::RecordExprFieldList id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/RecordExprFieldListImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/RecordExprFieldListImpl.qll
new file mode 100644
index 00000000000..cc93f5fa8a6
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/RecordExprFieldListImpl.qll
@@ -0,0 +1,22 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ * This module provides a hand-modifiable wrapper around the generated class `RecordExprFieldList`.
+ *
+ * INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.RecordExprFieldList
+
+/**
+ * INTERNAL: This module contains the customizable definition of `RecordExprFieldList` and should not
+ * be referenced directly.
+ */
+module Impl {
+  /**
+   * A RecordExprFieldList. For example:
+   * ```rust
+   * todo!()
+   * ```
+   */
+  class RecordExprFieldList extends Generated::RecordExprFieldList { }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/RecordFieldConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/RecordFieldConstructor.qll
new file mode 100644
index 00000000000..2a4ea101e5b
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/RecordFieldConstructor.qll
@@ -0,0 +1,14 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ *  This module defines the hook used internally to tweak the characteristic predicate of
+ *  `RecordField` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Raw
+
+/**
+ *  The characteristic predicate of `RecordField` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+predicate constructRecordField(Raw::RecordField id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/RecordFieldImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/RecordFieldImpl.qll
new file mode 100644
index 00000000000..5e886e469ac
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/RecordFieldImpl.qll
@@ -0,0 +1,22 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ * This module provides a hand-modifiable wrapper around the generated class `RecordField`.
+ *
+ * INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.RecordField
+
+/**
+ * INTERNAL: This module contains the customizable definition of `RecordField` and should not
+ * be referenced directly.
+ */
+module Impl {
+  /**
+   * A RecordField. For example:
+   * ```rust
+   * todo!()
+   * ```
+   */
+  class RecordField extends Generated::RecordField { }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/UnsafeBlockExprConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/RecordFieldListConstructor.qll
similarity index 64%
rename from rust/ql/lib/codeql/rust/elements/internal/UnsafeBlockExprConstructor.qll
rename to rust/ql/lib/codeql/rust/elements/internal/RecordFieldListConstructor.qll
index 463bd691e97..184df0deb03 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/UnsafeBlockExprConstructor.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/RecordFieldListConstructor.qll
@@ -1,14 +1,14 @@
 // generated by codegen, remove this comment if you wish to edit this file
 /**
  *  This module defines the hook used internally to tweak the characteristic predicate of
- *  `UnsafeBlockExpr` synthesized instances.
+ *  `RecordFieldList` synthesized instances.
  *  INTERNAL: Do not use.
  */
 
 private import codeql.rust.elements.internal.generated.Raw
 
 /**
- *  The characteristic predicate of `UnsafeBlockExpr` synthesized instances.
+ *  The characteristic predicate of `RecordFieldList` synthesized instances.
  *  INTERNAL: Do not use.
  */
-predicate constructUnsafeBlockExpr(Raw::UnsafeBlockExpr id) { any() }
+predicate constructRecordFieldList(Raw::RecordFieldList id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/RecordFieldListImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/RecordFieldListImpl.qll
new file mode 100644
index 00000000000..732cecf0065
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/RecordFieldListImpl.qll
@@ -0,0 +1,22 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ * This module provides a hand-modifiable wrapper around the generated class `RecordFieldList`.
+ *
+ * INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.RecordFieldList
+
+/**
+ * INTERNAL: This module contains the customizable definition of `RecordFieldList` and should not
+ * be referenced directly.
+ */
+module Impl {
+  /**
+   * A RecordFieldList. For example:
+   * ```rust
+   * todo!()
+   * ```
+   */
+  class RecordFieldList extends Generated::RecordFieldList { }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/RecordPatFieldListConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/RecordPatFieldListConstructor.qll
new file mode 100644
index 00000000000..a9af6ed2acb
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/RecordPatFieldListConstructor.qll
@@ -0,0 +1,14 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ *  This module defines the hook used internally to tweak the characteristic predicate of
+ *  `RecordPatFieldList` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Raw
+
+/**
+ *  The characteristic predicate of `RecordPatFieldList` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+predicate constructRecordPatFieldList(Raw::RecordPatFieldList id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/RecordPatFieldListImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/RecordPatFieldListImpl.qll
new file mode 100644
index 00000000000..d0a706bd198
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/RecordPatFieldListImpl.qll
@@ -0,0 +1,22 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ * This module provides a hand-modifiable wrapper around the generated class `RecordPatFieldList`.
+ *
+ * INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.RecordPatFieldList
+
+/**
+ * INTERNAL: This module contains the customizable definition of `RecordPatFieldList` and should not
+ * be referenced directly.
+ */
+module Impl {
+  /**
+   * A RecordPatFieldList. For example:
+   * ```rust
+   * todo!()
+   * ```
+   */
+  class RecordPatFieldList extends Generated::RecordPatFieldList { }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/RefTypeConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/RefTypeConstructor.qll
new file mode 100644
index 00000000000..89a786420a2
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/RefTypeConstructor.qll
@@ -0,0 +1,14 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ *  This module defines the hook used internally to tweak the characteristic predicate of
+ *  `RefType` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Raw
+
+/**
+ *  The characteristic predicate of `RefType` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+predicate constructRefType(Raw::RefType id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/RefTypeImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/RefTypeImpl.qll
new file mode 100644
index 00000000000..c473ec2e8ef
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/RefTypeImpl.qll
@@ -0,0 +1,22 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ * This module provides a hand-modifiable wrapper around the generated class `RefType`.
+ *
+ * INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.RefType
+
+/**
+ * INTERNAL: This module contains the customizable definition of `RefType` and should not
+ * be referenced directly.
+ */
+module Impl {
+  /**
+   * A RefType. For example:
+   * ```rust
+   * todo!()
+   * ```
+   */
+  class RefType extends Generated::RefType { }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/RenameConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/RenameConstructor.qll
new file mode 100644
index 00000000000..5edcea656b1
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/RenameConstructor.qll
@@ -0,0 +1,14 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ *  This module defines the hook used internally to tweak the characteristic predicate of
+ *  `Rename` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Raw
+
+/**
+ *  The characteristic predicate of `Rename` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+predicate constructRename(Raw::Rename id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/RenameImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/RenameImpl.qll
new file mode 100644
index 00000000000..99aead7ffaa
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/RenameImpl.qll
@@ -0,0 +1,22 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ * This module provides a hand-modifiable wrapper around the generated class `Rename`.
+ *
+ * INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Rename
+
+/**
+ * INTERNAL: This module contains the customizable definition of `Rename` and should not
+ * be referenced directly.
+ */
+module Impl {
+  /**
+   * A Rename. For example:
+   * ```rust
+   * todo!()
+   * ```
+   */
+  class Rename extends Generated::Rename { }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/ResolvableImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/ResolvableImpl.qll
new file mode 100644
index 00000000000..c6f1f2e7a69
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/ResolvableImpl.qll
@@ -0,0 +1,19 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ * This module provides a hand-modifiable wrapper around the generated class `Resolvable`.
+ *
+ * INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Resolvable
+
+/**
+ * INTERNAL: This module contains the customizable definition of `Resolvable` and should not
+ * be referenced directly.
+ */
+module Impl {
+  /**
+   * Either a `Path`, or a `MethodCallExpr`.
+   */
+  class Resolvable extends Generated::Resolvable { }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/RestPatConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/RestPatConstructor.qll
new file mode 100644
index 00000000000..940a40e92e3
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/RestPatConstructor.qll
@@ -0,0 +1,14 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ *  This module defines the hook used internally to tweak the characteristic predicate of
+ *  `RestPat` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Raw
+
+/**
+ *  The characteristic predicate of `RestPat` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+predicate constructRestPat(Raw::RestPat id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/RestPatImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/RestPatImpl.qll
new file mode 100644
index 00000000000..bd483e4ba9a
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/RestPatImpl.qll
@@ -0,0 +1,22 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ * This module provides a hand-modifiable wrapper around the generated class `RestPat`.
+ *
+ * INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.RestPat
+
+/**
+ * INTERNAL: This module contains the customizable definition of `RestPat` and should not
+ * be referenced directly.
+ */
+module Impl {
+  /**
+   * A RestPat. For example:
+   * ```rust
+   * todo!()
+   * ```
+   */
+  class RestPat extends Generated::RestPat { }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/RetTypeConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/RetTypeConstructor.qll
new file mode 100644
index 00000000000..c123b5f8b93
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/RetTypeConstructor.qll
@@ -0,0 +1,14 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ *  This module defines the hook used internally to tweak the characteristic predicate of
+ *  `RetType` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Raw
+
+/**
+ *  The characteristic predicate of `RetType` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+predicate constructRetType(Raw::RetType id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/RetTypeImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/RetTypeImpl.qll
new file mode 100644
index 00000000000..9fcda02c6e6
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/RetTypeImpl.qll
@@ -0,0 +1,22 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ * This module provides a hand-modifiable wrapper around the generated class `RetType`.
+ *
+ * INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.RetType
+
+/**
+ * INTERNAL: This module contains the customizable definition of `RetType` and should not
+ * be referenced directly.
+ */
+module Impl {
+  /**
+   * A RetType. For example:
+   * ```rust
+   * todo!()
+   * ```
+   */
+  class RetType extends Generated::RetType { }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/ReturnTypeSyntaxConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/ReturnTypeSyntaxConstructor.qll
new file mode 100644
index 00000000000..797df79b29d
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/ReturnTypeSyntaxConstructor.qll
@@ -0,0 +1,14 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ *  This module defines the hook used internally to tweak the characteristic predicate of
+ *  `ReturnTypeSyntax` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Raw
+
+/**
+ *  The characteristic predicate of `ReturnTypeSyntax` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+predicate constructReturnTypeSyntax(Raw::ReturnTypeSyntax id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/ReturnTypeSyntaxImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/ReturnTypeSyntaxImpl.qll
new file mode 100644
index 00000000000..3ecfd51816c
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/ReturnTypeSyntaxImpl.qll
@@ -0,0 +1,22 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ * This module provides a hand-modifiable wrapper around the generated class `ReturnTypeSyntax`.
+ *
+ * INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.ReturnTypeSyntax
+
+/**
+ * INTERNAL: This module contains the customizable definition of `ReturnTypeSyntax` and should not
+ * be referenced directly.
+ */
+module Impl {
+  /**
+   * A ReturnTypeSyntax. For example:
+   * ```rust
+   * todo!()
+   * ```
+   */
+  class ReturnTypeSyntax extends Generated::ReturnTypeSyntax { }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/SelfParamConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/SelfParamConstructor.qll
new file mode 100644
index 00000000000..a088bd91124
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/SelfParamConstructor.qll
@@ -0,0 +1,14 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ *  This module defines the hook used internally to tweak the characteristic predicate of
+ *  `SelfParam` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Raw
+
+/**
+ *  The characteristic predicate of `SelfParam` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+predicate constructSelfParam(Raw::SelfParam id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/SelfParamImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/SelfParamImpl.qll
new file mode 100644
index 00000000000..2be3b75ac47
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/SelfParamImpl.qll
@@ -0,0 +1,22 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ * This module provides a hand-modifiable wrapper around the generated class `SelfParam`.
+ *
+ * INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.SelfParam
+
+/**
+ * INTERNAL: This module contains the customizable definition of `SelfParam` and should not
+ * be referenced directly.
+ */
+module Impl {
+  /**
+   * A SelfParam. For example:
+   * ```rust
+   * todo!()
+   * ```
+   */
+  class SelfParam extends Generated::SelfParam { }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/SliceTypeConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/SliceTypeConstructor.qll
new file mode 100644
index 00000000000..d337c0f0768
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/SliceTypeConstructor.qll
@@ -0,0 +1,14 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ *  This module defines the hook used internally to tweak the characteristic predicate of
+ *  `SliceType` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Raw
+
+/**
+ *  The characteristic predicate of `SliceType` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+predicate constructSliceType(Raw::SliceType id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/SliceTypeImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/SliceTypeImpl.qll
new file mode 100644
index 00000000000..ba7146aad7c
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/SliceTypeImpl.qll
@@ -0,0 +1,22 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ * This module provides a hand-modifiable wrapper around the generated class `SliceType`.
+ *
+ * INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.SliceType
+
+/**
+ * INTERNAL: This module contains the customizable definition of `SliceType` and should not
+ * be referenced directly.
+ */
+module Impl {
+  /**
+   * A SliceType. For example:
+   * ```rust
+   * todo!()
+   * ```
+   */
+  class SliceType extends Generated::SliceType { }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/SourceFileConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/SourceFileConstructor.qll
new file mode 100644
index 00000000000..78902397886
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/SourceFileConstructor.qll
@@ -0,0 +1,14 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ *  This module defines the hook used internally to tweak the characteristic predicate of
+ *  `SourceFile` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Raw
+
+/**
+ *  The characteristic predicate of `SourceFile` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+predicate constructSourceFile(Raw::SourceFile id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/SourceFileImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/SourceFileImpl.qll
new file mode 100644
index 00000000000..38acafaacf4
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/SourceFileImpl.qll
@@ -0,0 +1,22 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ * This module provides a hand-modifiable wrapper around the generated class `SourceFile`.
+ *
+ * INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.SourceFile
+
+/**
+ * INTERNAL: This module contains the customizable definition of `SourceFile` and should not
+ * be referenced directly.
+ */
+module Impl {
+  /**
+   * A SourceFile. For example:
+   * ```rust
+   * todo!()
+   * ```
+   */
+  class SourceFile extends Generated::SourceFile { }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/StaticConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/StaticConstructor.qll
new file mode 100644
index 00000000000..b9223b8d7c8
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/StaticConstructor.qll
@@ -0,0 +1,14 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ *  This module defines the hook used internally to tweak the characteristic predicate of
+ *  `Static` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Raw
+
+/**
+ *  The characteristic predicate of `Static` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+predicate constructStatic(Raw::Static id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/StaticImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/StaticImpl.qll
new file mode 100644
index 00000000000..69cad71522b
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/StaticImpl.qll
@@ -0,0 +1,22 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ * This module provides a hand-modifiable wrapper around the generated class `Static`.
+ *
+ * INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Static
+
+/**
+ * INTERNAL: This module contains the customizable definition of `Static` and should not
+ * be referenced directly.
+ */
+module Impl {
+  /**
+   * A Static. For example:
+   * ```rust
+   * todo!()
+   * ```
+   */
+  class Static extends Generated::Static { }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/StmtListConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/StmtListConstructor.qll
new file mode 100644
index 00000000000..e7aa6587ad4
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/StmtListConstructor.qll
@@ -0,0 +1,14 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ *  This module defines the hook used internally to tweak the characteristic predicate of
+ *  `StmtList` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Raw
+
+/**
+ *  The characteristic predicate of `StmtList` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+predicate constructStmtList(Raw::StmtList id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/StmtListImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/StmtListImpl.qll
new file mode 100644
index 00000000000..8bb9fb3ea0e
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/StmtListImpl.qll
@@ -0,0 +1,22 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ * This module provides a hand-modifiable wrapper around the generated class `StmtList`.
+ *
+ * INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.StmtList
+
+/**
+ * INTERNAL: This module contains the customizable definition of `StmtList` and should not
+ * be referenced directly.
+ */
+module Impl {
+  /**
+   * A StmtList. For example:
+   * ```rust
+   * todo!()
+   * ```
+   */
+  class StmtList extends Generated::StmtList { }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/StructConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/StructConstructor.qll
new file mode 100644
index 00000000000..da5fa96e436
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/StructConstructor.qll
@@ -0,0 +1,14 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ *  This module defines the hook used internally to tweak the characteristic predicate of
+ *  `Struct` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Raw
+
+/**
+ *  The characteristic predicate of `Struct` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+predicate constructStruct(Raw::Struct id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/StructImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/StructImpl.qll
new file mode 100644
index 00000000000..ddd1189658d
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/StructImpl.qll
@@ -0,0 +1,22 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ * This module provides a hand-modifiable wrapper around the generated class `Struct`.
+ *
+ * INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Struct
+
+/**
+ * INTERNAL: This module contains the customizable definition of `Struct` and should not
+ * be referenced directly.
+ */
+module Impl {
+  /**
+   * A Struct. For example:
+   * ```rust
+   * todo!()
+   * ```
+   */
+  class Struct extends Generated::Struct { }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/BlockExprBaseImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/TokenImpl.qll
similarity index 59%
rename from rust/ql/lib/codeql/rust/elements/internal/BlockExprBaseImpl.qll
rename to rust/ql/lib/codeql/rust/elements/internal/TokenImpl.qll
index 20e34111684..cfa650fe98e 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/BlockExprBaseImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/TokenImpl.qll
@@ -1,16 +1,19 @@
 // generated by codegen, remove this comment if you wish to edit this file
 /**
- * This module provides a hand-modifiable wrapper around the generated class `BlockExprBase`.
+ * This module provides a hand-modifiable wrapper around the generated class `Token`.
  *
  * INTERNAL: Do not use.
  */
 
-private import codeql.rust.elements.internal.generated.BlockExprBase
+private import codeql.rust.elements.internal.generated.Token
 
 /**
- * INTERNAL: This module contains the customizable definition of `BlockExprBase` and should not
+ * INTERNAL: This module contains the customizable definition of `Token` and should not
  * be referenced directly.
  */
 module Impl {
-  class BlockExprBase extends Generated::BlockExprBase { }
+  /**
+   * The base class for all tokens.
+   */
+  class Token extends Generated::Token { }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/TokenTreeConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/TokenTreeConstructor.qll
new file mode 100644
index 00000000000..df04d5a27e0
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/TokenTreeConstructor.qll
@@ -0,0 +1,14 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ *  This module defines the hook used internally to tweak the characteristic predicate of
+ *  `TokenTree` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Raw
+
+/**
+ *  The characteristic predicate of `TokenTree` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+predicate constructTokenTree(Raw::TokenTree id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/TokenTreeImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/TokenTreeImpl.qll
new file mode 100644
index 00000000000..111613deac3
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/TokenTreeImpl.qll
@@ -0,0 +1,22 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ * This module provides a hand-modifiable wrapper around the generated class `TokenTree`.
+ *
+ * INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.TokenTree
+
+/**
+ * INTERNAL: This module contains the customizable definition of `TokenTree` and should not
+ * be referenced directly.
+ */
+module Impl {
+  /**
+   * A TokenTree. For example:
+   * ```rust
+   * todo!()
+   * ```
+   */
+  class TokenTree extends Generated::TokenTree { }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/TraitAliasConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/TraitAliasConstructor.qll
new file mode 100644
index 00000000000..ee417d72651
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/TraitAliasConstructor.qll
@@ -0,0 +1,14 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ *  This module defines the hook used internally to tweak the characteristic predicate of
+ *  `TraitAlias` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Raw
+
+/**
+ *  The characteristic predicate of `TraitAlias` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+predicate constructTraitAlias(Raw::TraitAlias id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/TraitAliasImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/TraitAliasImpl.qll
new file mode 100644
index 00000000000..56071483928
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/TraitAliasImpl.qll
@@ -0,0 +1,22 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ * This module provides a hand-modifiable wrapper around the generated class `TraitAlias`.
+ *
+ * INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.TraitAlias
+
+/**
+ * INTERNAL: This module contains the customizable definition of `TraitAlias` and should not
+ * be referenced directly.
+ */
+module Impl {
+  /**
+   * A TraitAlias. For example:
+   * ```rust
+   * todo!()
+   * ```
+   */
+  class TraitAlias extends Generated::TraitAlias { }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/TraitConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/TraitConstructor.qll
new file mode 100644
index 00000000000..dd1039c5743
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/TraitConstructor.qll
@@ -0,0 +1,14 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ *  This module defines the hook used internally to tweak the characteristic predicate of
+ *  `Trait` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Raw
+
+/**
+ *  The characteristic predicate of `Trait` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+predicate constructTrait(Raw::Trait id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/TraitImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/TraitImpl.qll
new file mode 100644
index 00000000000..a6fa19517f4
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/TraitImpl.qll
@@ -0,0 +1,28 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ * This module provides a hand-modifiable wrapper around the generated class `Trait`.
+ *
+ * INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Trait
+
+/**
+ * INTERNAL: This module contains the customizable definition of `Trait` and should not
+ * be referenced directly.
+ */
+module Impl {
+  /**
+   * A Trait. For example:
+   * ```
+   * trait Frobinizable {
+   *   type Frobinator;
+   *   type Result: Copy;
+   *   fn frobinize_with(&mut self, frobinator: &Self::Frobinator) -> Result;
+   * }
+   *
+   * pub trait Foo<T: Frobinizable> where T::Frobinator: Eq {}
+   * ```
+   */
+  class Trait extends Generated::Trait { }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/TryExprConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/TryExprConstructor.qll
new file mode 100644
index 00000000000..2140ce17e61
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/TryExprConstructor.qll
@@ -0,0 +1,14 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ *  This module defines the hook used internally to tweak the characteristic predicate of
+ *  `TryExpr` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Raw
+
+/**
+ *  The characteristic predicate of `TryExpr` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+predicate constructTryExpr(Raw::TryExpr id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/TryExprImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/TryExprImpl.qll
new file mode 100644
index 00000000000..be694161dc7
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/TryExprImpl.qll
@@ -0,0 +1,22 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ * This module provides a hand-modifiable wrapper around the generated class `TryExpr`.
+ *
+ * INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.TryExpr
+
+/**
+ * INTERNAL: This module contains the customizable definition of `TryExpr` and should not
+ * be referenced directly.
+ */
+module Impl {
+  /**
+   * A TryExpr. For example:
+   * ```rust
+   * todo!()
+   * ```
+   */
+  class TryExpr extends Generated::TryExpr { }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/TupleFieldConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/TupleFieldConstructor.qll
new file mode 100644
index 00000000000..a9eb94c08bf
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/TupleFieldConstructor.qll
@@ -0,0 +1,14 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ *  This module defines the hook used internally to tweak the characteristic predicate of
+ *  `TupleField` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Raw
+
+/**
+ *  The characteristic predicate of `TupleField` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+predicate constructTupleField(Raw::TupleField id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/TupleFieldImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/TupleFieldImpl.qll
new file mode 100644
index 00000000000..7f9d23b1f5e
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/TupleFieldImpl.qll
@@ -0,0 +1,22 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ * This module provides a hand-modifiable wrapper around the generated class `TupleField`.
+ *
+ * INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.TupleField
+
+/**
+ * INTERNAL: This module contains the customizable definition of `TupleField` and should not
+ * be referenced directly.
+ */
+module Impl {
+  /**
+   * A TupleField. For example:
+   * ```rust
+   * todo!()
+   * ```
+   */
+  class TupleField extends Generated::TupleField { }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/TupleFieldListConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/TupleFieldListConstructor.qll
new file mode 100644
index 00000000000..80d714d0471
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/TupleFieldListConstructor.qll
@@ -0,0 +1,14 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ *  This module defines the hook used internally to tweak the characteristic predicate of
+ *  `TupleFieldList` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Raw
+
+/**
+ *  The characteristic predicate of `TupleFieldList` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+predicate constructTupleFieldList(Raw::TupleFieldList id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/TupleFieldListImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/TupleFieldListImpl.qll
new file mode 100644
index 00000000000..1065853b735
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/TupleFieldListImpl.qll
@@ -0,0 +1,22 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ * This module provides a hand-modifiable wrapper around the generated class `TupleFieldList`.
+ *
+ * INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.TupleFieldList
+
+/**
+ * INTERNAL: This module contains the customizable definition of `TupleFieldList` and should not
+ * be referenced directly.
+ */
+module Impl {
+  /**
+   * A TupleFieldList. For example:
+   * ```rust
+   * todo!()
+   * ```
+   */
+  class TupleFieldList extends Generated::TupleFieldList { }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/TupleTypeConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/TupleTypeConstructor.qll
new file mode 100644
index 00000000000..f96bc1826a9
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/TupleTypeConstructor.qll
@@ -0,0 +1,14 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ *  This module defines the hook used internally to tweak the characteristic predicate of
+ *  `TupleType` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Raw
+
+/**
+ *  The characteristic predicate of `TupleType` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+predicate constructTupleType(Raw::TupleType id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/TupleTypeImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/TupleTypeImpl.qll
new file mode 100644
index 00000000000..69ac32d20e4
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/TupleTypeImpl.qll
@@ -0,0 +1,22 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ * This module provides a hand-modifiable wrapper around the generated class `TupleType`.
+ *
+ * INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.TupleType
+
+/**
+ * INTERNAL: This module contains the customizable definition of `TupleType` and should not
+ * be referenced directly.
+ */
+module Impl {
+  /**
+   * A TupleType. For example:
+   * ```rust
+   * todo!()
+   * ```
+   */
+  class TupleType extends Generated::TupleType { }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/TypeAliasConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/TypeAliasConstructor.qll
new file mode 100644
index 00000000000..60d8b576a1b
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/TypeAliasConstructor.qll
@@ -0,0 +1,14 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ *  This module defines the hook used internally to tweak the characteristic predicate of
+ *  `TypeAlias` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Raw
+
+/**
+ *  The characteristic predicate of `TypeAlias` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+predicate constructTypeAlias(Raw::TypeAlias id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/TypeAliasImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/TypeAliasImpl.qll
new file mode 100644
index 00000000000..e8553da37a0
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/TypeAliasImpl.qll
@@ -0,0 +1,22 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ * This module provides a hand-modifiable wrapper around the generated class `TypeAlias`.
+ *
+ * INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.TypeAlias
+
+/**
+ * INTERNAL: This module contains the customizable definition of `TypeAlias` and should not
+ * be referenced directly.
+ */
+module Impl {
+  /**
+   * A TypeAlias. For example:
+   * ```rust
+   * todo!()
+   * ```
+   */
+  class TypeAlias extends Generated::TypeAlias { }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/TypeArgConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/TypeArgConstructor.qll
new file mode 100644
index 00000000000..5904fbfcc19
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/TypeArgConstructor.qll
@@ -0,0 +1,14 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ *  This module defines the hook used internally to tweak the characteristic predicate of
+ *  `TypeArg` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Raw
+
+/**
+ *  The characteristic predicate of `TypeArg` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+predicate constructTypeArg(Raw::TypeArg id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/TypeArgImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/TypeArgImpl.qll
new file mode 100644
index 00000000000..f48c2c50dbe
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/TypeArgImpl.qll
@@ -0,0 +1,22 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ * This module provides a hand-modifiable wrapper around the generated class `TypeArg`.
+ *
+ * INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.TypeArg
+
+/**
+ * INTERNAL: This module contains the customizable definition of `TypeArg` and should not
+ * be referenced directly.
+ */
+module Impl {
+  /**
+   * A TypeArg. For example:
+   * ```rust
+   * todo!()
+   * ```
+   */
+  class TypeArg extends Generated::TypeArg { }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/TypeBoundConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/TypeBoundConstructor.qll
new file mode 100644
index 00000000000..6cae5790347
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/TypeBoundConstructor.qll
@@ -0,0 +1,14 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ *  This module defines the hook used internally to tweak the characteristic predicate of
+ *  `TypeBound` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Raw
+
+/**
+ *  The characteristic predicate of `TypeBound` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+predicate constructTypeBound(Raw::TypeBound id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/TypeBoundImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/TypeBoundImpl.qll
new file mode 100644
index 00000000000..fea226dd742
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/TypeBoundImpl.qll
@@ -0,0 +1,22 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ * This module provides a hand-modifiable wrapper around the generated class `TypeBound`.
+ *
+ * INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.TypeBound
+
+/**
+ * INTERNAL: This module contains the customizable definition of `TypeBound` and should not
+ * be referenced directly.
+ */
+module Impl {
+  /**
+   * A TypeBound. For example:
+   * ```rust
+   * todo!()
+   * ```
+   */
+  class TypeBound extends Generated::TypeBound { }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/TypeBoundListConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/TypeBoundListConstructor.qll
new file mode 100644
index 00000000000..4a01215164a
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/TypeBoundListConstructor.qll
@@ -0,0 +1,14 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ *  This module defines the hook used internally to tweak the characteristic predicate of
+ *  `TypeBoundList` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Raw
+
+/**
+ *  The characteristic predicate of `TypeBoundList` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+predicate constructTypeBoundList(Raw::TypeBoundList id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/TypeBoundListImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/TypeBoundListImpl.qll
new file mode 100644
index 00000000000..bbd38ee7371
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/TypeBoundListImpl.qll
@@ -0,0 +1,22 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ * This module provides a hand-modifiable wrapper around the generated class `TypeBoundList`.
+ *
+ * INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.TypeBoundList
+
+/**
+ * INTERNAL: This module contains the customizable definition of `TypeBoundList` and should not
+ * be referenced directly.
+ */
+module Impl {
+  /**
+   * A TypeBoundList. For example:
+   * ```rust
+   * todo!()
+   * ```
+   */
+  class TypeBoundList extends Generated::TypeBoundList { }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/TypeParamConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/TypeParamConstructor.qll
new file mode 100644
index 00000000000..22307a57455
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/TypeParamConstructor.qll
@@ -0,0 +1,14 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ *  This module defines the hook used internally to tweak the characteristic predicate of
+ *  `TypeParam` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Raw
+
+/**
+ *  The characteristic predicate of `TypeParam` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+predicate constructTypeParam(Raw::TypeParam id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/TypeParamImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/TypeParamImpl.qll
new file mode 100644
index 00000000000..1581d2ec3c6
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/TypeParamImpl.qll
@@ -0,0 +1,22 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ * This module provides a hand-modifiable wrapper around the generated class `TypeParam`.
+ *
+ * INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.TypeParam
+
+/**
+ * INTERNAL: This module contains the customizable definition of `TypeParam` and should not
+ * be referenced directly.
+ */
+module Impl {
+  /**
+   * A TypeParam. For example:
+   * ```rust
+   * todo!()
+   * ```
+   */
+  class TypeParam extends Generated::TypeParam { }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/UnimplementedConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/UnimplementedConstructor.qll
new file mode 100644
index 00000000000..4b36982709a
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/UnimplementedConstructor.qll
@@ -0,0 +1,14 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ *  This module defines the hook used internally to tweak the characteristic predicate of
+ *  `Unimplemented` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Raw
+
+/**
+ *  The characteristic predicate of `Unimplemented` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+predicate constructUnimplemented(Raw::Unimplemented id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/UnimplementedDeclarationConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/UnimplementedDeclarationConstructor.qll
deleted file mode 100644
index 50c9bbf4a49..00000000000
--- a/rust/ql/lib/codeql/rust/elements/internal/UnimplementedDeclarationConstructor.qll
+++ /dev/null
@@ -1,14 +0,0 @@
-// generated by codegen, remove this comment if you wish to edit this file
-/**
- *  This module defines the hook used internally to tweak the characteristic predicate of
- *  `UnimplementedDeclaration` synthesized instances.
- *  INTERNAL: Do not use.
- */
-
-private import codeql.rust.elements.internal.generated.Raw
-
-/**
- *  The characteristic predicate of `UnimplementedDeclaration` synthesized instances.
- *  INTERNAL: Do not use.
- */
-predicate constructUnimplementedDeclaration(Raw::UnimplementedDeclaration id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/UnionConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/UnionConstructor.qll
new file mode 100644
index 00000000000..44666dab0dc
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/UnionConstructor.qll
@@ -0,0 +1,14 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ *  This module defines the hook used internally to tweak the characteristic predicate of
+ *  `Union` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Raw
+
+/**
+ *  The characteristic predicate of `Union` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+predicate constructUnion(Raw::Union id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/UnionImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/UnionImpl.qll
new file mode 100644
index 00000000000..dc850eac4d1
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/UnionImpl.qll
@@ -0,0 +1,22 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ * This module provides a hand-modifiable wrapper around the generated class `Union`.
+ *
+ * INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Union
+
+/**
+ * INTERNAL: This module contains the customizable definition of `Union` and should not
+ * be referenced directly.
+ */
+module Impl {
+  /**
+   * A Union. For example:
+   * ```rust
+   * todo!()
+   * ```
+   */
+  class Union extends Generated::Union { }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/UnsafeBlockExprImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/UnsafeBlockExprImpl.qll
deleted file mode 100644
index c8ed9218c44..00000000000
--- a/rust/ql/lib/codeql/rust/elements/internal/UnsafeBlockExprImpl.qll
+++ /dev/null
@@ -1,25 +0,0 @@
-// generated by codegen, remove this comment if you wish to edit this file
-/**
- * This module provides a hand-modifiable wrapper around the generated class `UnsafeBlockExpr`.
- *
- * INTERNAL: Do not use.
- */
-
-private import codeql.rust.elements.internal.generated.UnsafeBlockExpr
-
-/**
- * INTERNAL: This module contains the customizable definition of `UnsafeBlockExpr` and should not
- * be referenced directly.
- */
-module Impl {
-  /**
-   * An unsafe block expression. For example:
-   * ```rust
-   * let layout = unsafe {
-   *     let x = 42;
-   *     Layout::from_size_align_unchecked(size, align)
-   * };
-   * ```
-   */
-  class UnsafeBlockExpr extends Generated::UnsafeBlockExpr { }
-}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/UseConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/UseConstructor.qll
new file mode 100644
index 00000000000..297edbad067
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/UseConstructor.qll
@@ -0,0 +1,14 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ *  This module defines the hook used internally to tweak the characteristic predicate of
+ *  `Use` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Raw
+
+/**
+ *  The characteristic predicate of `Use` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+predicate constructUse(Raw::Use id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/UseImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/UseImpl.qll
new file mode 100644
index 00000000000..3b45ab46439
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/UseImpl.qll
@@ -0,0 +1,22 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ * This module provides a hand-modifiable wrapper around the generated class `Use`.
+ *
+ * INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Use
+
+/**
+ * INTERNAL: This module contains the customizable definition of `Use` and should not
+ * be referenced directly.
+ */
+module Impl {
+  /**
+   * A Use. For example:
+   * ```rust
+   * todo!()
+   * ```
+   */
+  class Use extends Generated::Use { }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/UseTreeConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/UseTreeConstructor.qll
new file mode 100644
index 00000000000..8ccf2452d0c
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/UseTreeConstructor.qll
@@ -0,0 +1,14 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ *  This module defines the hook used internally to tweak the characteristic predicate of
+ *  `UseTree` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Raw
+
+/**
+ *  The characteristic predicate of `UseTree` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+predicate constructUseTree(Raw::UseTree id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/UseTreeImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/UseTreeImpl.qll
new file mode 100644
index 00000000000..39d693400d7
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/UseTreeImpl.qll
@@ -0,0 +1,22 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ * This module provides a hand-modifiable wrapper around the generated class `UseTree`.
+ *
+ * INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.UseTree
+
+/**
+ * INTERNAL: This module contains the customizable definition of `UseTree` and should not
+ * be referenced directly.
+ */
+module Impl {
+  /**
+   * A UseTree. For example:
+   * ```rust
+   * todo!()
+   * ```
+   */
+  class UseTree extends Generated::UseTree { }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/UseTreeListConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/UseTreeListConstructor.qll
new file mode 100644
index 00000000000..08409e028c3
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/UseTreeListConstructor.qll
@@ -0,0 +1,14 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ *  This module defines the hook used internally to tweak the characteristic predicate of
+ *  `UseTreeList` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Raw
+
+/**
+ *  The characteristic predicate of `UseTreeList` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+predicate constructUseTreeList(Raw::UseTreeList id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/UseTreeListImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/UseTreeListImpl.qll
new file mode 100644
index 00000000000..eb4689c663d
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/UseTreeListImpl.qll
@@ -0,0 +1,22 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ * This module provides a hand-modifiable wrapper around the generated class `UseTreeList`.
+ *
+ * INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.UseTreeList
+
+/**
+ * INTERNAL: This module contains the customizable definition of `UseTreeList` and should not
+ * be referenced directly.
+ */
+module Impl {
+  /**
+   * A UseTreeList. For example:
+   * ```rust
+   * todo!()
+   * ```
+   */
+  class UseTreeList extends Generated::UseTreeList { }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/VariableImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/VariableImpl.qll
new file mode 100644
index 00000000000..4b94546d802
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/VariableImpl.qll
@@ -0,0 +1,500 @@
+private import rust
+private import codeql.rust.controlflow.ControlFlowGraph
+private import codeql.rust.elements.internal.generated.ParentChild
+private import codeql.rust.elements.internal.PathExprBaseImpl::Impl as PathExprBaseImpl
+private import codeql.rust.elements.internal.FormatTemplateVariableAccessImpl::Impl as FormatTemplateVariableAccessImpl
+private import codeql.util.DenseRank
+
+module Impl {
+  /**
+   * A variable scope. Either a block `{ ... }`, the guard/rhs
+   * of a match arm, or the body of a closure.
+   */
+  abstract class VariableScope extends AstNode { }
+
+  class BlockExprScope extends VariableScope, BlockExpr { }
+
+  abstract class MatchArmScope extends VariableScope {
+    MatchArm arm;
+
+    bindingset[arm]
+    MatchArmScope() { exists(arm) }
+
+    Pat getPat() { result = arm.getPat() }
+  }
+
+  class MatchArmExprScope extends MatchArmScope {
+    MatchArmExprScope() { this = arm.getExpr() }
+  }
+
+  class MatchArmGuardScope extends MatchArmScope {
+    MatchArmGuardScope() { this = arm.getGuard() }
+  }
+
+  class ClosureBodyScope extends VariableScope {
+    ClosureBodyScope() { this = any(ClosureExpr ce).getBody() }
+  }
+
+  private Pat getImmediatePatParent(AstNode n) {
+    result = getImmediateParent(n)
+    or
+    result.(RecordPat).getRecordPatFieldList().getAField().getPat() = n
+  }
+
+  private Pat getAPatAncestor(Pat p) {
+    (p instanceof IdentPat or p instanceof OrPat) and
+    exists(Pat p0 | result = getImmediatePatParent(p0) |
+      p0 = p
+      or
+      p0 = getAPatAncestor(p) and
+      not p0 instanceof OrPat
+    )
+  }
+
+  /** Gets the immediately enclosing `|` pattern of `p`, if any */
+  private OrPat getEnclosingOrPat(Pat p) { result = getAPatAncestor(p) }
+
+  /** Gets the outermost enclosing `|` pattern parent of `p`, if any. */
+  private OrPat getOutermostEnclosingOrPat(IdentPat p) {
+    result = getEnclosingOrPat+(p) and
+    not exists(getEnclosingOrPat(result))
+  }
+
+  /**
+   * Holds if `p` declares a variable named `name` at `definingNode`. Normally,
+   * `definingNode = p`, except in cases like
+   *
+   * ```rust
+   * match either {
+   *     Either::Left(x) | Either::Right(x) => println!(x),
+   * }
+   * ```
+   *
+   * where `definingNode` is the entire `Either::Left(x) | Either::Right(x)`
+   * pattern.
+   */
+  private predicate variableDecl(AstNode definingNode, IdentPat p, string name) {
+    (
+      definingNode = getOutermostEnclosingOrPat(p)
+      or
+      not exists(getOutermostEnclosingOrPat(p)) and
+      definingNode = p.getName()
+    ) and
+    name = p.getName().getText() and
+    // exclude for now anything starting with an uppercase character, which may be a reference to
+    // an enum constant (e.g. `None`). This excludes static and constant variables (UPPERCASE),
+    // which we don't appear to recognize yet anyway. This also assumes programmers follow the
+    // naming guidelines, which they generally do, but they're not enforced.
+    not name.charAt(0).isUppercase() and
+    // exclude parameters from functions without a body as these are trait method declarations
+    // without implementations
+    not exists(Function f | not f.hasBody() and f.getParamList().getAParam().getPat() = p) and
+    // exclude parameters from function pointer types (e.g. `x` in `fn(x: i32) -> i32`)
+    not exists(FnPtrType fp | fp.getParamList().getParam(_).getPat() = p)
+  }
+
+  /** A variable. */
+  class Variable extends MkVariable {
+    private AstNode definingNode;
+    private string name;
+
+    Variable() { this = MkVariable(definingNode, name) }
+
+    /** Gets the name of this variable. */
+    string getName() { result = name }
+
+    /** Gets the location of this variable. */
+    Location getLocation() { result = definingNode.getLocation() }
+
+    /** Gets a textual representation of this variable. */
+    string toString() { result = this.getName() }
+
+    /** Gets an access to this variable. */
+    VariableAccess getAnAccess() { result.getVariable() = this }
+
+    /**
+     * Gets the pattern that declares this variable.
+     *
+     * Normally, the pattern is unique, except when introduced in an or pattern:
+     *
+     * ```rust
+     * match either {
+     *    Either::Left(x) | Either::Right(x) => println!(x),
+     * }
+     * ```
+     */
+    IdentPat getPat() { variableDecl(definingNode, result, name) }
+
+    /** Gets the `let` statement that introduces this variable, if any. */
+    LetStmt getLetStmt() { this.getPat() = result.getPat() }
+
+    /** Gets the initial value of this variable, if any. */
+    Expr getInitializer() { result = this.getLetStmt().getInitializer() }
+
+    /** Holds if this variable is captured. */
+    predicate isCaptured() { this.getAnAccess().isCapture() }
+
+    /** Gets the parameter that introduces this variable, if any. */
+    Param getParameter() { parameterDeclInScope(result, this, _) }
+
+    /** Hold is this variable is mutable. */
+    predicate isMutable() { this.getPat().isMut() }
+
+    /** Hold is this variable is immutable. */
+    predicate isImmutable() { not this.isMutable() }
+  }
+
+  /** A path expression that may access a local variable. */
+  private class VariableAccessCand extends PathExprBase {
+    string name_;
+
+    VariableAccessCand() {
+      exists(Path p, PathSegment ps |
+        p = this.(PathExpr).getPath() and
+        not p.hasQualifier() and
+        ps = p.getPart() and
+        not ps.hasGenericArgList() and
+        not ps.hasParamList() and
+        not ps.hasPathType() and
+        not ps.hasReturnTypeSyntax() and
+        name_ = ps.getNameRef().getText()
+      )
+      or
+      this.(FormatTemplateVariableAccess).getName() = name_
+    }
+
+    string toString() { result = name_ }
+
+    string getName() { result = name_ }
+  }
+
+  private AstNode getAnAncestorInVariableScope(AstNode n) {
+    (
+      n instanceof Pat or
+      n instanceof VariableAccessCand or
+      n instanceof LetStmt or
+      n instanceof VariableScope
+    ) and
+    exists(AstNode n0 |
+      result = getImmediateParent(n0) or
+      result = n0.(FormatTemplateVariableAccess).getArgument().getParent().getParent()
+    |
+      n0 = n
+      or
+      n0 = getAnAncestorInVariableScope(n) and
+      not n0 instanceof VariableScope
+    )
+  }
+
+  /** Gets the immediately enclosing variable scope of `n`. */
+  private VariableScope getEnclosingScope(AstNode n) { result = getAnAncestorInVariableScope(n) }
+
+  private Pat getAVariablePatAncestor(Variable v) {
+    exists(AstNode definingNode, string name |
+      v = MkVariable(definingNode, name) and
+      variableDecl(definingNode, result, name)
+    )
+    or
+    exists(Pat mid |
+      mid = getAVariablePatAncestor(v) and
+      result = getImmediatePatParent(mid)
+    )
+  }
+
+  /**
+   * Holds if parameter `p` introduces the variable `v` inside variable scope
+   * `scope`.
+   */
+  private predicate parameterDeclInScope(Param p, Variable v, VariableScope scope) {
+    exists(Pat pat |
+      pat = getAVariablePatAncestor(v) and
+      p.getPat() = pat
+    |
+      exists(Function f |
+        f.getParamList().getAParam() = p and
+        scope = f.getBody()
+      )
+      or
+      exists(ClosureExpr ce |
+        ce.getParamList().getAParam() = p and
+        scope = ce.getBody()
+      )
+    )
+  }
+
+  /**
+   * Holds if `v` is named `name` and is declared inside variable scope
+   * `scope`, and `v` is bound starting from `(line, column)`.
+   */
+  private predicate variableDeclInScope(
+    Variable v, VariableScope scope, string name, int line, int column
+  ) {
+    name = v.getName() and
+    (
+      parameterDeclInScope(_, v, scope) and
+      scope.getLocation().hasLocationFileInfo(_, line, column, _, _)
+      or
+      exists(Pat pat | pat = getAVariablePatAncestor(v) |
+        scope =
+          any(MatchArmScope arm |
+            arm.getPat() = pat and
+            arm.getLocation().hasLocationFileInfo(_, line, column, _, _)
+          )
+        or
+        exists(LetStmt let |
+          let.getPat() = pat and
+          scope = getEnclosingScope(let) and
+          // for `let` statements, variables are bound _after_ the statement, i.e.
+          // not in the RHS
+          let.getLocation().hasLocationFileInfo(_, _, _, line, column)
+        )
+        or
+        exists(IfExpr ie, LetExpr let |
+          let.getPat() = pat and
+          ie.getCondition() = let and
+          scope = ie.getThen() and
+          scope.getLocation().hasLocationFileInfo(_, line, column, _, _)
+        )
+        or
+        exists(ForExpr fe |
+          fe.getPat() = pat and
+          scope = fe.getLoopBody() and
+          scope.getLocation().hasLocationFileInfo(_, line, column, _, _)
+        )
+        or
+        exists(WhileExpr we, LetExpr let |
+          let.getPat() = pat and
+          we.getCondition() = let and
+          scope = we.getLoopBody() and
+          scope.getLocation().hasLocationFileInfo(_, line, column, _, _)
+        )
+      )
+    )
+  }
+
+  /**
+   * Holds if `cand` may access a variable named `name` at
+   * `(startline, startcolumn, endline, endcolumn)` in the variable scope
+   * `scope`.
+   *
+   * `nestLevel` is the number of nested scopes that need to be traversed
+   * to reach `scope` from `cand`.
+   */
+  private predicate variableAccessCandInScope(
+    VariableAccessCand cand, VariableScope scope, string name, int nestLevel, int startline,
+    int startcolumn, int endline, int endcolumn
+  ) {
+    name = cand.getName() and
+    scope = [cand.(VariableScope), getEnclosingScope(cand)] and
+    cand.getLocation().hasLocationFileInfo(_, startline, startcolumn, endline, endcolumn) and
+    nestLevel = 0
+    or
+    exists(VariableScope inner |
+      variableAccessCandInScope(cand, inner, name, nestLevel - 1, _, _, _, _) and
+      scope = getEnclosingScope(inner) and
+      // Use the location of the inner scope as the location of the access, instead of the
+      // actual access location. This allows us to collapse multiple accesses in inner
+      // scopes to a single entity
+      inner.getLocation().hasLocationFileInfo(_, startline, startcolumn, endline, endcolumn)
+    )
+  }
+
+  private newtype TVariableOrAccessCand =
+    TVariableOrAccessCandVariable(Variable v) or
+    TVariableOrAccessCandVariableAccessCand(VariableAccessCand va)
+
+  /**
+   * A variable declaration or variable access candidate.
+   *
+   * In order to determine whether a candidate is an actual variable access,
+   * we rank declarations and candidates by their position in source code.
+   *
+   * The ranking must take variable names into account, but also variable scopes;
+   * below a comment `rank(scope, name, i)` means that the declaration/access on
+   * the given line has rank `i` amongst all declarations/accesses inside variable
+   * scope `scope`, for variable name `name`:
+   *
+   * ```rust
+   * fn f() {           // scope0
+   *     let x = 0;     // rank(scope0, "x", 0)
+   *     use(x);        // rank(scope0, "x", 1)
+   *     let x =        // rank(scope0, "x", 3)
+   *         x + 1;     // rank(scope0, "x", 2)
+   *     let y =        // rank(scope0, "y", 0)
+   *         x;         // rank(scope0, "x", 4)
+   *
+   *     {              // scope1
+   *         use(x);    // rank(scope1, "x", 0), rank(scope0, "x", 4)
+   *         use(y);    // rank(scope1, "y", 0), rank(scope0, "y", 1)
+   *         let x = 2; // rank(scope1, "x", 1)
+   *         use(x);    // rank(scope1, "x", 2), rank(scope0, "x", 4)
+   *     }
+   * }
+   * ```
+   *
+   * Variable declarations are only ranked in the scope that they bind into, while
+   * accesses candidates propagate outwards through scopes, as they may access
+   * declarations from outer scopes.
+   *
+   * For an access candidate with ranks `{ rank(scope_i, name, rnk_i) | i in I }` and
+   * declarations `d in D` with ranks `rnk(scope_d, name, rnk_d)`,  the target is
+   * calculated as
+   * ```
+   * max_{i in I} (
+   *   max_{d in D | scope_d = scope_i and rnk_d < rnk_i} (
+   *     d
+   *   )
+   * )
+   * ```
+   *
+   * i.e., its the nearest declaration before the access in the same (or outer) scope
+   * as the access.
+   */
+  private class VariableOrAccessCand extends TVariableOrAccessCand {
+    Variable asVariable() { this = TVariableOrAccessCandVariable(result) }
+
+    VariableAccessCand asVariableAccessCand() {
+      this = TVariableOrAccessCandVariableAccessCand(result)
+    }
+
+    string toString() {
+      result = this.asVariable().toString() or result = this.asVariableAccessCand().toString()
+    }
+
+    Location getLocation() {
+      result = this.asVariable().getLocation() or result = this.asVariableAccessCand().getLocation()
+    }
+
+    pragma[nomagic]
+    predicate rankBy(
+      string name, VariableScope scope, int startline, int startcolumn, int endline, int endcolumn
+    ) {
+      variableDeclInScope(this.asVariable(), scope, name, startline, startcolumn) and
+      endline = -1 and
+      endcolumn = -1
+      or
+      variableAccessCandInScope(this.asVariableAccessCand(), scope, name, _, startline, startcolumn,
+        endline, endcolumn)
+    }
+  }
+
+  private module DenseRankInput implements DenseRankInputSig3 {
+    class C1 = VariableScope;
+
+    class C2 = string;
+
+    class Ranked = VariableOrAccessCand;
+
+    int getRank(VariableScope scope, string name, VariableOrAccessCand v) {
+      v =
+        rank[result](VariableOrAccessCand v0, int startline, int startcolumn, int endline,
+          int endcolumn |
+          v0.rankBy(name, scope, startline, startcolumn, endline, endcolumn)
+        |
+          v0 order by startline, startcolumn, endline, endcolumn
+        )
+    }
+  }
+
+  /**
+   * Gets the rank of `v` amongst all other declarations or access candidates
+   * to a variable named `name` in the variable scope `scope`.
+   */
+  private int rankVariableOrAccess(VariableScope scope, string name, VariableOrAccessCand v) {
+    result = DenseRank3<DenseRankInput>::denseRank(scope, name, v) - 1
+  }
+
+  /**
+   * Holds if `v` can reach rank `rnk` in the variable scope `scope`. This is needed to
+   * take shadowing into account, for example in
+   *
+   * ```rust
+   * let x = 0;  // rank 0
+   * use(x);     // rank 1
+   * let x = ""; // rank 2
+   * use(x);     // rank 3
+   * ```
+   *
+   * the declaration at rank 0 can only reach the access at rank 1, while the declaration
+   * at rank 2 can only reach the access at rank 3.
+   */
+  private predicate variableReachesRank(VariableScope scope, string name, Variable v, int rnk) {
+    rnk = rankVariableOrAccess(scope, name, TVariableOrAccessCandVariable(v))
+    or
+    variableReachesRank(scope, name, v, rnk - 1) and
+    rnk = rankVariableOrAccess(scope, name, TVariableOrAccessCandVariableAccessCand(_))
+  }
+
+  private predicate variableReachesCand(
+    VariableScope scope, string name, Variable v, VariableAccessCand cand, int nestLevel
+  ) {
+    exists(int rnk |
+      variableReachesRank(scope, name, v, rnk) and
+      rnk = rankVariableOrAccess(scope, name, TVariableOrAccessCandVariableAccessCand(cand)) and
+      variableAccessCandInScope(cand, scope, name, nestLevel, _, _, _, _)
+    )
+  }
+
+  /** A variable access. */
+  class VariableAccess extends PathExprBaseImpl::PathExprBase instanceof VariableAccessCand {
+    private string name;
+    private Variable v;
+
+    VariableAccess() { variableAccess(name, v, this) }
+
+    /** Gets the variable being accessed. */
+    Variable getVariable() { result = v }
+
+    /** Holds if this access is a capture. */
+    predicate isCapture() { this.getEnclosingCfgScope() != v.getPat().getEnclosingCfgScope() }
+
+    override string toString() { result = name }
+
+    override string getAPrimaryQlClass() { result = "VariableAccess" }
+  }
+
+  /** Holds if `e` occurs in the LHS of an assignment or compound assignment. */
+  private predicate assignmentExprDescendant(Expr e) {
+    e = any(AssignmentExpr ae).getLhs()
+    or
+    exists(Expr mid |
+      assignmentExprDescendant(mid) and
+      getImmediateParent(e) = mid and
+      not mid.(PrefixExpr).getOperatorName() = "*" and
+      not mid instanceof FieldExpr
+    )
+  }
+
+  /** A variable write. */
+  class VariableWriteAccess extends VariableAccess {
+    VariableWriteAccess() { assignmentExprDescendant(this) }
+  }
+
+  /** A variable read. */
+  class VariableReadAccess extends VariableAccess {
+    VariableReadAccess() {
+      not this instanceof VariableWriteAccess and
+      not this = any(RefExpr re).getExpr() and
+      not this = any(CompoundAssignmentExpr cae).getLhs()
+    }
+  }
+
+  cached
+  private module Cached {
+    cached
+    newtype TVariable =
+      MkVariable(AstNode definingNode, string name) { variableDecl(definingNode, _, name) }
+
+    cached
+    predicate variableAccess(string name, Variable v, VariableAccessCand cand) {
+      v =
+        min(Variable v0, int nestLevel |
+          variableReachesCand(_, name, v0, cand, nestLevel)
+        |
+          v0 order by nestLevel
+        )
+    }
+  }
+
+  private import Cached
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/VariantConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/VariantConstructor.qll
new file mode 100644
index 00000000000..cbede605205
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/VariantConstructor.qll
@@ -0,0 +1,14 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ *  This module defines the hook used internally to tweak the characteristic predicate of
+ *  `Variant` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Raw
+
+/**
+ *  The characteristic predicate of `Variant` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+predicate constructVariant(Raw::Variant id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/VariantImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/VariantImpl.qll
new file mode 100644
index 00000000000..e58f32e0149
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/VariantImpl.qll
@@ -0,0 +1,22 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ * This module provides a hand-modifiable wrapper around the generated class `Variant`.
+ *
+ * INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Variant
+
+/**
+ * INTERNAL: This module contains the customizable definition of `Variant` and should not
+ * be referenced directly.
+ */
+module Impl {
+  /**
+   * A Variant. For example:
+   * ```rust
+   * todo!()
+   * ```
+   */
+  class Variant extends Generated::Variant { }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/VariantListConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/VariantListConstructor.qll
new file mode 100644
index 00000000000..f67d2b892c3
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/VariantListConstructor.qll
@@ -0,0 +1,14 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ *  This module defines the hook used internally to tweak the characteristic predicate of
+ *  `VariantList` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Raw
+
+/**
+ *  The characteristic predicate of `VariantList` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+predicate constructVariantList(Raw::VariantList id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/VariantListImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/VariantListImpl.qll
new file mode 100644
index 00000000000..deff6d7d196
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/VariantListImpl.qll
@@ -0,0 +1,22 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ * This module provides a hand-modifiable wrapper around the generated class `VariantList`.
+ *
+ * INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.VariantList
+
+/**
+ * INTERNAL: This module contains the customizable definition of `VariantList` and should not
+ * be referenced directly.
+ */
+module Impl {
+  /**
+   * A VariantList. For example:
+   * ```rust
+   * todo!()
+   * ```
+   */
+  class VariantList extends Generated::VariantList { }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/VisibilityConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/VisibilityConstructor.qll
new file mode 100644
index 00000000000..28debc84650
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/VisibilityConstructor.qll
@@ -0,0 +1,14 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ *  This module defines the hook used internally to tweak the characteristic predicate of
+ *  `Visibility` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Raw
+
+/**
+ *  The characteristic predicate of `Visibility` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+predicate constructVisibility(Raw::Visibility id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/VisibilityImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/VisibilityImpl.qll
new file mode 100644
index 00000000000..0e7f79cd243
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/VisibilityImpl.qll
@@ -0,0 +1,22 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ * This module provides a hand-modifiable wrapper around the generated class `Visibility`.
+ *
+ * INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Visibility
+
+/**
+ * INTERNAL: This module contains the customizable definition of `Visibility` and should not
+ * be referenced directly.
+ */
+module Impl {
+  /**
+   * A Visibility. For example:
+   * ```rust
+   * todo!()
+   * ```
+   */
+  class Visibility extends Generated::Visibility { }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/WhereClauseConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/WhereClauseConstructor.qll
new file mode 100644
index 00000000000..4df63457380
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/WhereClauseConstructor.qll
@@ -0,0 +1,14 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ *  This module defines the hook used internally to tweak the characteristic predicate of
+ *  `WhereClause` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Raw
+
+/**
+ *  The characteristic predicate of `WhereClause` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+predicate constructWhereClause(Raw::WhereClause id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/WhereClauseImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/WhereClauseImpl.qll
new file mode 100644
index 00000000000..40f01ae51cc
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/WhereClauseImpl.qll
@@ -0,0 +1,22 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ * This module provides a hand-modifiable wrapper around the generated class `WhereClause`.
+ *
+ * INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.WhereClause
+
+/**
+ * INTERNAL: This module contains the customizable definition of `WhereClause` and should not
+ * be referenced directly.
+ */
+module Impl {
+  /**
+   * A WhereClause. For example:
+   * ```rust
+   * todo!()
+   * ```
+   */
+  class WhereClause extends Generated::WhereClause { }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/WherePredConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/WherePredConstructor.qll
new file mode 100644
index 00000000000..fd6bc435b2d
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/WherePredConstructor.qll
@@ -0,0 +1,14 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ *  This module defines the hook used internally to tweak the characteristic predicate of
+ *  `WherePred` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Raw
+
+/**
+ *  The characteristic predicate of `WherePred` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+predicate constructWherePred(Raw::WherePred id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/WherePredImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/WherePredImpl.qll
new file mode 100644
index 00000000000..386a864eaf0
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/WherePredImpl.qll
@@ -0,0 +1,22 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ * This module provides a hand-modifiable wrapper around the generated class `WherePred`.
+ *
+ * INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.WherePred
+
+/**
+ * INTERNAL: This module contains the customizable definition of `WherePred` and should not
+ * be referenced directly.
+ */
+module Impl {
+  /**
+   * A WherePred. For example:
+   * ```rust
+   * todo!()
+   * ```
+   */
+  class WherePred extends Generated::WherePred { }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/WhileExprConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/WhileExprConstructor.qll
new file mode 100644
index 00000000000..66cd0d7ac88
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/WhileExprConstructor.qll
@@ -0,0 +1,14 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ *  This module defines the hook used internally to tweak the characteristic predicate of
+ *  `WhileExpr` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Raw
+
+/**
+ *  The characteristic predicate of `WhileExpr` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+predicate constructWhileExpr(Raw::WhileExpr id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/WhileExprImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/WhileExprImpl.qll
new file mode 100644
index 00000000000..647864d4659
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/WhileExprImpl.qll
@@ -0,0 +1,22 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ * This module provides a hand-modifiable wrapper around the generated class `WhileExpr`.
+ *
+ * INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.WhileExpr
+
+/**
+ * INTERNAL: This module contains the customizable definition of `WhileExpr` and should not
+ * be referenced directly.
+ */
+module Impl {
+  /**
+   * A WhileExpr. For example:
+   * ```rust
+   * todo!()
+   * ```
+   */
+  class WhileExpr extends Generated::WhileExpr { }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/Abi.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/Abi.qll
new file mode 100644
index 00000000000..f16f5ae4b31
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/Abi.qll
@@ -0,0 +1,37 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `Abi`.
+ * INTERNAL: Do not import directly.
+ */
+
+private import codeql.rust.elements.internal.generated.Synth
+private import codeql.rust.elements.internal.generated.Raw
+import codeql.rust.elements.internal.AstNodeImpl::Impl as AstNodeImpl
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `Abi` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * A Abi. For example:
+   * ```rust
+   * todo!()
+   * ```
+   * INTERNAL: Do not reference the `Generated::Abi` class directly.
+   * Use the subclass `Abi`, where the following predicates are available.
+   */
+  class Abi extends Synth::TAbi, AstNodeImpl::AstNode {
+    override string getAPrimaryQlClass() { result = "Abi" }
+
+    /**
+     * Gets the abi string of this abi, if it exists.
+     */
+    string getAbiString() { result = Synth::convertAbiToRaw(this).(Raw::Abi).getAbiString() }
+
+    /**
+     * Holds if `getAbiString()` exists.
+     */
+    final predicate hasAbiString() { exists(this.getAbiString()) }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/ArgList.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/ArgList.qll
new file mode 100644
index 00000000000..cd5334aedde
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/ArgList.qll
@@ -0,0 +1,46 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `ArgList`.
+ * INTERNAL: Do not import directly.
+ */
+
+private import codeql.rust.elements.internal.generated.Synth
+private import codeql.rust.elements.internal.generated.Raw
+import codeql.rust.elements.internal.AstNodeImpl::Impl as AstNodeImpl
+import codeql.rust.elements.Expr
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `ArgList` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * A ArgList. For example:
+   * ```rust
+   * todo!()
+   * ```
+   * INTERNAL: Do not reference the `Generated::ArgList` class directly.
+   * Use the subclass `ArgList`, where the following predicates are available.
+   */
+  class ArgList extends Synth::TArgList, AstNodeImpl::AstNode {
+    override string getAPrimaryQlClass() { result = "ArgList" }
+
+    /**
+     * Gets the `index`th argument of this argument list (0-based).
+     */
+    Expr getArg(int index) {
+      result =
+        Synth::convertExprFromRaw(Synth::convertArgListToRaw(this).(Raw::ArgList).getArg(index))
+    }
+
+    /**
+     * Gets any of the arguments of this argument list.
+     */
+    final Expr getAnArg() { result = this.getArg(_) }
+
+    /**
+     * Gets the number of arguments of this argument list.
+     */
+    final int getNumberOfArgs() { result = count(int i | exists(this.getArg(i))) }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/ArrayExpr.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/ArrayExpr.qll
index b0364e6eee9..95ffb491129 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/ArrayExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/ArrayExpr.qll
@@ -6,6 +6,8 @@
 
 private import codeql.rust.elements.internal.generated.Synth
 private import codeql.rust.elements.internal.generated.Raw
+import codeql.rust.elements.Attr
+import codeql.rust.elements.Expr
 import codeql.rust.elements.internal.ExprImpl::Impl as ExprImpl
 
 /**
@@ -22,5 +24,43 @@ module Generated {
    * INTERNAL: Do not reference the `Generated::ArrayExpr` class directly.
    * Use the subclass `ArrayExpr`, where the following predicates are available.
    */
-  class ArrayExpr extends Synth::TArrayExpr, ExprImpl::Expr { }
+  class ArrayExpr extends Synth::TArrayExpr, ExprImpl::Expr {
+    override string getAPrimaryQlClass() { result = "ArrayExpr" }
+
+    /**
+     * Gets the `index`th attr of this array expression (0-based).
+     */
+    Attr getAttr(int index) {
+      result =
+        Synth::convertAttrFromRaw(Synth::convertArrayExprToRaw(this).(Raw::ArrayExpr).getAttr(index))
+    }
+
+    /**
+     * Gets any of the attrs of this array expression.
+     */
+    final Attr getAnAttr() { result = this.getAttr(_) }
+
+    /**
+     * Gets the number of attrs of this array expression.
+     */
+    final int getNumberOfAttrs() { result = count(int i | exists(this.getAttr(i))) }
+
+    /**
+     * Gets the `index`th expression of this array expression (0-based).
+     */
+    Expr getExpr(int index) {
+      result =
+        Synth::convertExprFromRaw(Synth::convertArrayExprToRaw(this).(Raw::ArrayExpr).getExpr(index))
+    }
+
+    /**
+     * Gets any of the expressions of this array expression.
+     */
+    final Expr getAnExpr() { result = this.getExpr(_) }
+
+    /**
+     * Gets the number of expressions of this array expression.
+     */
+    final int getNumberOfExprs() { result = count(int i | exists(this.getExpr(i))) }
+  }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/ArrayType.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/ArrayType.qll
new file mode 100644
index 00000000000..6e4ae1314ce
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/ArrayType.qll
@@ -0,0 +1,57 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `ArrayType`.
+ * INTERNAL: Do not import directly.
+ */
+
+private import codeql.rust.elements.internal.generated.Synth
+private import codeql.rust.elements.internal.generated.Raw
+import codeql.rust.elements.ConstArg
+import codeql.rust.elements.TypeRef
+import codeql.rust.elements.internal.TypeRefImpl::Impl as TypeRefImpl
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `ArrayType` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * A ArrayType. For example:
+   * ```rust
+   * todo!()
+   * ```
+   * INTERNAL: Do not reference the `Generated::ArrayType` class directly.
+   * Use the subclass `ArrayType`, where the following predicates are available.
+   */
+  class ArrayType extends Synth::TArrayType, TypeRefImpl::TypeRef {
+    override string getAPrimaryQlClass() { result = "ArrayType" }
+
+    /**
+     * Gets the const argument of this array type, if it exists.
+     */
+    ConstArg getConstArg() {
+      result =
+        Synth::convertConstArgFromRaw(Synth::convertArrayTypeToRaw(this)
+              .(Raw::ArrayType)
+              .getConstArg())
+    }
+
+    /**
+     * Holds if `getConstArg()` exists.
+     */
+    final predicate hasConstArg() { exists(this.getConstArg()) }
+
+    /**
+     * Gets the ty of this array type, if it exists.
+     */
+    TypeRef getTy() {
+      result =
+        Synth::convertTypeRefFromRaw(Synth::convertArrayTypeToRaw(this).(Raw::ArrayType).getTy())
+    }
+
+    /**
+     * Holds if `getTy()` exists.
+     */
+    final predicate hasTy() { exists(this.getTy()) }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/AsmExpr.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/AsmExpr.qll
index 8998bc5bca4..0ab382232d7 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/AsmExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/AsmExpr.qll
@@ -6,6 +6,7 @@
 
 private import codeql.rust.elements.internal.generated.Synth
 private import codeql.rust.elements.internal.generated.Raw
+import codeql.rust.elements.Attr
 import codeql.rust.elements.Expr
 import codeql.rust.elements.internal.ExprImpl::Impl as ExprImpl
 
@@ -28,10 +29,33 @@ module Generated {
     override string getAPrimaryQlClass() { result = "AsmExpr" }
 
     /**
-     * Gets the expression of this asm expression.
+     * Gets the `index`th attr of this asm expression (0-based).
+     */
+    Attr getAttr(int index) {
+      result =
+        Synth::convertAttrFromRaw(Synth::convertAsmExprToRaw(this).(Raw::AsmExpr).getAttr(index))
+    }
+
+    /**
+     * Gets any of the attrs of this asm expression.
+     */
+    final Attr getAnAttr() { result = this.getAttr(_) }
+
+    /**
+     * Gets the number of attrs of this asm expression.
+     */
+    final int getNumberOfAttrs() { result = count(int i | exists(this.getAttr(i))) }
+
+    /**
+     * Gets the expression of this asm expression, if it exists.
      */
     Expr getExpr() {
       result = Synth::convertExprFromRaw(Synth::convertAsmExprToRaw(this).(Raw::AsmExpr).getExpr())
     }
+
+    /**
+     * Holds if `getExpr()` exists.
+     */
+    final predicate hasExpr() { exists(this.getExpr()) }
   }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/AssocItem.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/AssocItem.qll
new file mode 100644
index 00000000000..aadca24997a
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/AssocItem.qll
@@ -0,0 +1,25 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `AssocItem`.
+ * INTERNAL: Do not import directly.
+ */
+
+private import codeql.rust.elements.internal.generated.Synth
+private import codeql.rust.elements.internal.generated.Raw
+import codeql.rust.elements.internal.AstNodeImpl::Impl as AstNodeImpl
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `AssocItem` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * A AssocItem. For example:
+   * ```rust
+   * todo!()
+   * ```
+   * INTERNAL: Do not reference the `Generated::AssocItem` class directly.
+   * Use the subclass `AssocItem`, where the following predicates are available.
+   */
+  class AssocItem extends Synth::TAssocItem, AstNodeImpl::AstNode { }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/AssocItemList.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/AssocItemList.qll
new file mode 100644
index 00000000000..4d6ab67d3d0
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/AssocItemList.qll
@@ -0,0 +1,66 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `AssocItemList`.
+ * INTERNAL: Do not import directly.
+ */
+
+private import codeql.rust.elements.internal.generated.Synth
+private import codeql.rust.elements.internal.generated.Raw
+import codeql.rust.elements.AssocItem
+import codeql.rust.elements.internal.AstNodeImpl::Impl as AstNodeImpl
+import codeql.rust.elements.Attr
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `AssocItemList` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * A list of  `AssocItem` elements, as appearing for example in a `Trait`.
+   * INTERNAL: Do not reference the `Generated::AssocItemList` class directly.
+   * Use the subclass `AssocItemList`, where the following predicates are available.
+   */
+  class AssocItemList extends Synth::TAssocItemList, AstNodeImpl::AstNode {
+    override string getAPrimaryQlClass() { result = "AssocItemList" }
+
+    /**
+     * Gets the `index`th assoc item of this assoc item list (0-based).
+     */
+    AssocItem getAssocItem(int index) {
+      result =
+        Synth::convertAssocItemFromRaw(Synth::convertAssocItemListToRaw(this)
+              .(Raw::AssocItemList)
+              .getAssocItem(index))
+    }
+
+    /**
+     * Gets any of the assoc items of this assoc item list.
+     */
+    final AssocItem getAnAssocItem() { result = this.getAssocItem(_) }
+
+    /**
+     * Gets the number of assoc items of this assoc item list.
+     */
+    final int getNumberOfAssocItems() { result = count(int i | exists(this.getAssocItem(i))) }
+
+    /**
+     * Gets the `index`th attr of this assoc item list (0-based).
+     */
+    Attr getAttr(int index) {
+      result =
+        Synth::convertAttrFromRaw(Synth::convertAssocItemListToRaw(this)
+              .(Raw::AssocItemList)
+              .getAttr(index))
+    }
+
+    /**
+     * Gets any of the attrs of this assoc item list.
+     */
+    final Attr getAnAttr() { result = this.getAttr(_) }
+
+    /**
+     * Gets the number of attrs of this assoc item list.
+     */
+    final int getNumberOfAttrs() { result = count(int i | exists(this.getAttr(i))) }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/AssocTypeArg.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/AssocTypeArg.qll
new file mode 100644
index 00000000000..940e76ebbbc
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/AssocTypeArg.qll
@@ -0,0 +1,155 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `AssocTypeArg`.
+ * INTERNAL: Do not import directly.
+ */
+
+private import codeql.rust.elements.internal.generated.Synth
+private import codeql.rust.elements.internal.generated.Raw
+import codeql.rust.elements.ConstArg
+import codeql.rust.elements.internal.GenericArgImpl::Impl as GenericArgImpl
+import codeql.rust.elements.GenericArgList
+import codeql.rust.elements.NameRef
+import codeql.rust.elements.ParamList
+import codeql.rust.elements.RetType
+import codeql.rust.elements.ReturnTypeSyntax
+import codeql.rust.elements.TypeBoundList
+import codeql.rust.elements.TypeRef
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `AssocTypeArg` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * A AssocTypeArg. For example:
+   * ```rust
+   * todo!()
+   * ```
+   * INTERNAL: Do not reference the `Generated::AssocTypeArg` class directly.
+   * Use the subclass `AssocTypeArg`, where the following predicates are available.
+   */
+  class AssocTypeArg extends Synth::TAssocTypeArg, GenericArgImpl::GenericArg {
+    override string getAPrimaryQlClass() { result = "AssocTypeArg" }
+
+    /**
+     * Gets the const argument of this assoc type argument, if it exists.
+     */
+    ConstArg getConstArg() {
+      result =
+        Synth::convertConstArgFromRaw(Synth::convertAssocTypeArgToRaw(this)
+              .(Raw::AssocTypeArg)
+              .getConstArg())
+    }
+
+    /**
+     * Holds if `getConstArg()` exists.
+     */
+    final predicate hasConstArg() { exists(this.getConstArg()) }
+
+    /**
+     * Gets the generic argument list of this assoc type argument, if it exists.
+     */
+    GenericArgList getGenericArgList() {
+      result =
+        Synth::convertGenericArgListFromRaw(Synth::convertAssocTypeArgToRaw(this)
+              .(Raw::AssocTypeArg)
+              .getGenericArgList())
+    }
+
+    /**
+     * Holds if `getGenericArgList()` exists.
+     */
+    final predicate hasGenericArgList() { exists(this.getGenericArgList()) }
+
+    /**
+     * Gets the name reference of this assoc type argument, if it exists.
+     */
+    NameRef getNameRef() {
+      result =
+        Synth::convertNameRefFromRaw(Synth::convertAssocTypeArgToRaw(this)
+              .(Raw::AssocTypeArg)
+              .getNameRef())
+    }
+
+    /**
+     * Holds if `getNameRef()` exists.
+     */
+    final predicate hasNameRef() { exists(this.getNameRef()) }
+
+    /**
+     * Gets the parameter list of this assoc type argument, if it exists.
+     */
+    ParamList getParamList() {
+      result =
+        Synth::convertParamListFromRaw(Synth::convertAssocTypeArgToRaw(this)
+              .(Raw::AssocTypeArg)
+              .getParamList())
+    }
+
+    /**
+     * Holds if `getParamList()` exists.
+     */
+    final predicate hasParamList() { exists(this.getParamList()) }
+
+    /**
+     * Gets the ret type of this assoc type argument, if it exists.
+     */
+    RetType getRetType() {
+      result =
+        Synth::convertRetTypeFromRaw(Synth::convertAssocTypeArgToRaw(this)
+              .(Raw::AssocTypeArg)
+              .getRetType())
+    }
+
+    /**
+     * Holds if `getRetType()` exists.
+     */
+    final predicate hasRetType() { exists(this.getRetType()) }
+
+    /**
+     * Gets the return type syntax of this assoc type argument, if it exists.
+     */
+    ReturnTypeSyntax getReturnTypeSyntax() {
+      result =
+        Synth::convertReturnTypeSyntaxFromRaw(Synth::convertAssocTypeArgToRaw(this)
+              .(Raw::AssocTypeArg)
+              .getReturnTypeSyntax())
+    }
+
+    /**
+     * Holds if `getReturnTypeSyntax()` exists.
+     */
+    final predicate hasReturnTypeSyntax() { exists(this.getReturnTypeSyntax()) }
+
+    /**
+     * Gets the ty of this assoc type argument, if it exists.
+     */
+    TypeRef getTy() {
+      result =
+        Synth::convertTypeRefFromRaw(Synth::convertAssocTypeArgToRaw(this)
+              .(Raw::AssocTypeArg)
+              .getTy())
+    }
+
+    /**
+     * Holds if `getTy()` exists.
+     */
+    final predicate hasTy() { exists(this.getTy()) }
+
+    /**
+     * Gets the type bound list of this assoc type argument, if it exists.
+     */
+    TypeBoundList getTypeBoundList() {
+      result =
+        Synth::convertTypeBoundListFromRaw(Synth::convertAssocTypeArgToRaw(this)
+              .(Raw::AssocTypeArg)
+              .getTypeBoundList())
+    }
+
+    /**
+     * Holds if `getTypeBoundList()` exists.
+     */
+    final predicate hasTypeBoundList() { exists(this.getTypeBoundList()) }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/AsyncBlockExpr.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/AsyncBlockExpr.qll
deleted file mode 100644
index dc02c4ca992..00000000000
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/AsyncBlockExpr.qll
+++ /dev/null
@@ -1,30 +0,0 @@
-// generated by codegen, do not edit
-/**
- * This module provides the generated definition of `AsyncBlockExpr`.
- * INTERNAL: Do not import directly.
- */
-
-private import codeql.rust.elements.internal.generated.Synth
-private import codeql.rust.elements.internal.generated.Raw
-import codeql.rust.elements.internal.BlockExprBaseImpl::Impl as BlockExprBaseImpl
-
-/**
- * INTERNAL: This module contains the fully generated definition of `AsyncBlockExpr` and should not
- * be referenced directly.
- */
-module Generated {
-  /**
-   * An async block expression. For example:
-   * ```rust
-   * async {
-   *    let x = 42;
-   *    x
-   * }.await
-   * ```
-   * INTERNAL: Do not reference the `Generated::AsyncBlockExpr` class directly.
-   * Use the subclass `AsyncBlockExpr`, where the following predicates are available.
-   */
-  class AsyncBlockExpr extends Synth::TAsyncBlockExpr, BlockExprBaseImpl::BlockExprBase {
-    override string getAPrimaryQlClass() { result = "AsyncBlockExpr" }
-  }
-}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/Attr.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/Attr.qll
new file mode 100644
index 00000000000..00784693f7d
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/Attr.qll
@@ -0,0 +1,40 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `Attr`.
+ * INTERNAL: Do not import directly.
+ */
+
+private import codeql.rust.elements.internal.generated.Synth
+private import codeql.rust.elements.internal.generated.Raw
+import codeql.rust.elements.internal.AstNodeImpl::Impl as AstNodeImpl
+import codeql.rust.elements.Meta
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `Attr` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * A Attr. For example:
+   * ```rust
+   * todo!()
+   * ```
+   * INTERNAL: Do not reference the `Generated::Attr` class directly.
+   * Use the subclass `Attr`, where the following predicates are available.
+   */
+  class Attr extends Synth::TAttr, AstNodeImpl::AstNode {
+    override string getAPrimaryQlClass() { result = "Attr" }
+
+    /**
+     * Gets the meta of this attr, if it exists.
+     */
+    Meta getMeta() {
+      result = Synth::convertMetaFromRaw(Synth::convertAttrToRaw(this).(Raw::Attr).getMeta())
+    }
+
+    /**
+     * Holds if `getMeta()` exists.
+     */
+    final predicate hasMeta() { exists(this.getMeta()) }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/AwaitExpr.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/AwaitExpr.qll
index 06b407d78bc..baef03315c9 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/AwaitExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/AwaitExpr.qll
@@ -6,6 +6,7 @@
 
 private import codeql.rust.elements.internal.generated.Synth
 private import codeql.rust.elements.internal.generated.Raw
+import codeql.rust.elements.Attr
 import codeql.rust.elements.Expr
 import codeql.rust.elements.internal.ExprImpl::Impl as ExprImpl
 
@@ -29,11 +30,34 @@ module Generated {
     override string getAPrimaryQlClass() { result = "AwaitExpr" }
 
     /**
-     * Gets the expression of this await expression.
+     * Gets the `index`th attr of this await expression (0-based).
+     */
+    Attr getAttr(int index) {
+      result =
+        Synth::convertAttrFromRaw(Synth::convertAwaitExprToRaw(this).(Raw::AwaitExpr).getAttr(index))
+    }
+
+    /**
+     * Gets any of the attrs of this await expression.
+     */
+    final Attr getAnAttr() { result = this.getAttr(_) }
+
+    /**
+     * Gets the number of attrs of this await expression.
+     */
+    final int getNumberOfAttrs() { result = count(int i | exists(this.getAttr(i))) }
+
+    /**
+     * Gets the expression of this await expression, if it exists.
      */
     Expr getExpr() {
       result =
         Synth::convertExprFromRaw(Synth::convertAwaitExprToRaw(this).(Raw::AwaitExpr).getExpr())
     }
+
+    /**
+     * Holds if `getExpr()` exists.
+     */
+    final predicate hasExpr() { exists(this.getExpr()) }
   }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/BecomeExpr.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/BecomeExpr.qll
index 6dc3821fe02..7fdd78fcbee 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/BecomeExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/BecomeExpr.qll
@@ -6,6 +6,7 @@
 
 private import codeql.rust.elements.internal.generated.Synth
 private import codeql.rust.elements.internal.generated.Raw
+import codeql.rust.elements.Attr
 import codeql.rust.elements.Expr
 import codeql.rust.elements.internal.ExprImpl::Impl as ExprImpl
 
@@ -32,11 +33,36 @@ module Generated {
     override string getAPrimaryQlClass() { result = "BecomeExpr" }
 
     /**
-     * Gets the expression of this become expression.
+     * Gets the `index`th attr of this become expression (0-based).
+     */
+    Attr getAttr(int index) {
+      result =
+        Synth::convertAttrFromRaw(Synth::convertBecomeExprToRaw(this)
+              .(Raw::BecomeExpr)
+              .getAttr(index))
+    }
+
+    /**
+     * Gets any of the attrs of this become expression.
+     */
+    final Attr getAnAttr() { result = this.getAttr(_) }
+
+    /**
+     * Gets the number of attrs of this become expression.
+     */
+    final int getNumberOfAttrs() { result = count(int i | exists(this.getAttr(i))) }
+
+    /**
+     * Gets the expression of this become expression, if it exists.
      */
     Expr getExpr() {
       result =
         Synth::convertExprFromRaw(Synth::convertBecomeExprToRaw(this).(Raw::BecomeExpr).getExpr())
     }
+
+    /**
+     * Holds if `getExpr()` exists.
+     */
+    final predicate hasExpr() { exists(this.getExpr()) }
   }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/BinaryExpr.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/BinaryExpr.qll
index 63261184b2a..68e7d391e39 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/BinaryExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/BinaryExpr.qll
@@ -6,6 +6,7 @@
 
 private import codeql.rust.elements.internal.generated.Synth
 private import codeql.rust.elements.internal.generated.Raw
+import codeql.rust.elements.Attr
 import codeql.rust.elements.Expr
 import codeql.rust.elements.internal.ExprImpl::Impl as ExprImpl
 
@@ -30,7 +31,27 @@ module Generated {
     override string getAPrimaryQlClass() { result = "BinaryExpr" }
 
     /**
-     * Gets the lhs of this binary expression.
+     * Gets the `index`th attr of this binary expression (0-based).
+     */
+    Attr getAttr(int index) {
+      result =
+        Synth::convertAttrFromRaw(Synth::convertBinaryExprToRaw(this)
+              .(Raw::BinaryExpr)
+              .getAttr(index))
+    }
+
+    /**
+     * Gets any of the attrs of this binary expression.
+     */
+    final Attr getAnAttr() { result = this.getAttr(_) }
+
+    /**
+     * Gets the number of attrs of this binary expression.
+     */
+    final int getNumberOfAttrs() { result = count(int i | exists(this.getAttr(i))) }
+
+    /**
+     * Gets the lhs of this binary expression, if it exists.
      */
     Expr getLhs() {
       result =
@@ -38,7 +59,24 @@ module Generated {
     }
 
     /**
-     * Gets the rhs of this binary expression.
+     * Holds if `getLhs()` exists.
+     */
+    final predicate hasLhs() { exists(this.getLhs()) }
+
+    /**
+     * Gets the operator name of this binary expression, if it exists.
+     */
+    string getOperatorName() {
+      result = Synth::convertBinaryExprToRaw(this).(Raw::BinaryExpr).getOperatorName()
+    }
+
+    /**
+     * Holds if `getOperatorName()` exists.
+     */
+    final predicate hasOperatorName() { exists(this.getOperatorName()) }
+
+    /**
+     * Gets the rhs of this binary expression, if it exists.
      */
     Expr getRhs() {
       result =
@@ -46,13 +84,8 @@ module Generated {
     }
 
     /**
-     * Gets the op of this binary expression, if it exists.
+     * Holds if `getRhs()` exists.
      */
-    string getOp() { result = Synth::convertBinaryExprToRaw(this).(Raw::BinaryExpr).getOp() }
-
-    /**
-     * Holds if `getOp()` exists.
-     */
-    final predicate hasOp() { exists(this.getOp()) }
+    final predicate hasRhs() { exists(this.getRhs()) }
   }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/BlockExpr.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/BlockExpr.qll
index 22cb00a30d4..c4f11fdd90c 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/BlockExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/BlockExpr.qll
@@ -6,8 +6,10 @@
 
 private import codeql.rust.elements.internal.generated.Synth
 private import codeql.rust.elements.internal.generated.Raw
-import codeql.rust.elements.internal.BlockExprBaseImpl::Impl as BlockExprBaseImpl
+import codeql.rust.elements.Attr
+import codeql.rust.elements.internal.ExprImpl::Impl as ExprImpl
 import codeql.rust.elements.Label
+import codeql.rust.elements.StmtList
 
 /**
  * INTERNAL: This module contains the fully generated definition of `BlockExpr` and should not
@@ -30,9 +32,57 @@ module Generated {
    * INTERNAL: Do not reference the `Generated::BlockExpr` class directly.
    * Use the subclass `BlockExpr`, where the following predicates are available.
    */
-  class BlockExpr extends Synth::TBlockExpr, BlockExprBaseImpl::BlockExprBase {
+  class BlockExpr extends Synth::TBlockExpr, ExprImpl::Expr {
     override string getAPrimaryQlClass() { result = "BlockExpr" }
 
+    /**
+     * Gets the `index`th attr of this block expression (0-based).
+     */
+    Attr getAttr(int index) {
+      result =
+        Synth::convertAttrFromRaw(Synth::convertBlockExprToRaw(this).(Raw::BlockExpr).getAttr(index))
+    }
+
+    /**
+     * Gets any of the attrs of this block expression.
+     */
+    final Attr getAnAttr() { result = this.getAttr(_) }
+
+    /**
+     * Gets the number of attrs of this block expression.
+     */
+    final int getNumberOfAttrs() { result = count(int i | exists(this.getAttr(i))) }
+
+    /**
+     * Holds if this block expression is async.
+     */
+    predicate isAsync() { Synth::convertBlockExprToRaw(this).(Raw::BlockExpr).isAsync() }
+
+    /**
+     * Holds if this block expression is const.
+     */
+    predicate isConst() { Synth::convertBlockExprToRaw(this).(Raw::BlockExpr).isConst() }
+
+    /**
+     * Holds if this block expression is gen.
+     */
+    predicate isGen() { Synth::convertBlockExprToRaw(this).(Raw::BlockExpr).isGen() }
+
+    /**
+     * Holds if this block expression is move.
+     */
+    predicate isMove() { Synth::convertBlockExprToRaw(this).(Raw::BlockExpr).isMove() }
+
+    /**
+     * Holds if this block expression is try.
+     */
+    predicate isTry() { Synth::convertBlockExprToRaw(this).(Raw::BlockExpr).isTry() }
+
+    /**
+     * Holds if this block expression is unsafe.
+     */
+    predicate isUnsafe() { Synth::convertBlockExprToRaw(this).(Raw::BlockExpr).isUnsafe() }
+
     /**
      * Gets the label of this block expression, if it exists.
      */
@@ -45,5 +95,20 @@ module Generated {
      * Holds if `getLabel()` exists.
      */
     final predicate hasLabel() { exists(this.getLabel()) }
+
+    /**
+     * Gets the statement list of this block expression, if it exists.
+     */
+    StmtList getStmtList() {
+      result =
+        Synth::convertStmtListFromRaw(Synth::convertBlockExprToRaw(this)
+              .(Raw::BlockExpr)
+              .getStmtList())
+    }
+
+    /**
+     * Holds if `getStmtList()` exists.
+     */
+    final predicate hasStmtList() { exists(this.getStmtList()) }
   }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/BlockExprBase.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/BlockExprBase.qll
deleted file mode 100644
index 74c5ba6575f..00000000000
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/BlockExprBase.qll
+++ /dev/null
@@ -1,58 +0,0 @@
-// generated by codegen, do not edit
-/**
- * This module provides the generated definition of `BlockExprBase`.
- * INTERNAL: Do not import directly.
- */
-
-private import codeql.rust.elements.internal.generated.Synth
-private import codeql.rust.elements.internal.generated.Raw
-import codeql.rust.elements.Expr
-import codeql.rust.elements.internal.ExprImpl::Impl as ExprImpl
-import codeql.rust.elements.Stmt
-
-/**
- * INTERNAL: This module contains the fully generated definition of `BlockExprBase` and should not
- * be referenced directly.
- */
-module Generated {
-  /**
-   * INTERNAL: Do not reference the `Generated::BlockExprBase` class directly.
-   * Use the subclass `BlockExprBase`, where the following predicates are available.
-   */
-  class BlockExprBase extends Synth::TBlockExprBase, ExprImpl::Expr {
-    /**
-     * Gets the `index`th statement of this block expression base (0-based).
-     */
-    Stmt getStatement(int index) {
-      result =
-        Synth::convertStmtFromRaw(Synth::convertBlockExprBaseToRaw(this)
-              .(Raw::BlockExprBase)
-              .getStatement(index))
-    }
-
-    /**
-     * Gets any of the statements of this block expression base.
-     */
-    final Stmt getAStatement() { result = this.getStatement(_) }
-
-    /**
-     * Gets the number of statements of this block expression base.
-     */
-    final int getNumberOfStatements() { result = count(int i | exists(this.getStatement(i))) }
-
-    /**
-     * Gets the tail of this block expression base, if it exists.
-     */
-    Expr getTail() {
-      result =
-        Synth::convertExprFromRaw(Synth::convertBlockExprBaseToRaw(this)
-              .(Raw::BlockExprBase)
-              .getTail())
-    }
-
-    /**
-     * Holds if `getTail()` exists.
-     */
-    final predicate hasTail() { exists(this.getTail()) }
-  }
-}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/BoxExpr.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/BoxExpr.qll
deleted file mode 100644
index 9111fa7f866..00000000000
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/BoxExpr.qll
+++ /dev/null
@@ -1,35 +0,0 @@
-// generated by codegen, do not edit
-/**
- * This module provides the generated definition of `BoxExpr`.
- * INTERNAL: Do not import directly.
- */
-
-private import codeql.rust.elements.internal.generated.Synth
-private import codeql.rust.elements.internal.generated.Raw
-import codeql.rust.elements.Expr
-import codeql.rust.elements.internal.ExprImpl::Impl as ExprImpl
-
-/**
- * INTERNAL: This module contains the fully generated definition of `BoxExpr` and should not
- * be referenced directly.
- */
-module Generated {
-  /**
-   * A box expression. For example:
-   * ```rust
-   * let x = #[rustc_box] Box::new(42);
-   * ```
-   * INTERNAL: Do not reference the `Generated::BoxExpr` class directly.
-   * Use the subclass `BoxExpr`, where the following predicates are available.
-   */
-  class BoxExpr extends Synth::TBoxExpr, ExprImpl::Expr {
-    override string getAPrimaryQlClass() { result = "BoxExpr" }
-
-    /**
-     * Gets the expression of this box expression.
-     */
-    Expr getExpr() {
-      result = Synth::convertExprFromRaw(Synth::convertBoxExprToRaw(this).(Raw::BoxExpr).getExpr())
-    }
-  }
-}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/BoxPat.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/BoxPat.qll
index 063c98e1495..d741991d001 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/BoxPat.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/BoxPat.qll
@@ -29,10 +29,15 @@ module Generated {
     override string getAPrimaryQlClass() { result = "BoxPat" }
 
     /**
-     * Gets the inner of this box pat.
+     * Gets the pat of this box pat, if it exists.
      */
-    Pat getInner() {
-      result = Synth::convertPatFromRaw(Synth::convertBoxPatToRaw(this).(Raw::BoxPat).getInner())
+    Pat getPat() {
+      result = Synth::convertPatFromRaw(Synth::convertBoxPatToRaw(this).(Raw::BoxPat).getPat())
     }
+
+    /**
+     * Holds if `getPat()` exists.
+     */
+    final predicate hasPat() { exists(this.getPat()) }
   }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/BreakExpr.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/BreakExpr.qll
index 0c3c6bbe772..dae4a83377c 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/BreakExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/BreakExpr.qll
@@ -6,9 +6,10 @@
 
 private import codeql.rust.elements.internal.generated.Synth
 private import codeql.rust.elements.internal.generated.Raw
+import codeql.rust.elements.Attr
 import codeql.rust.elements.Expr
 import codeql.rust.elements.internal.ExprImpl::Impl as ExprImpl
-import codeql.rust.elements.Label
+import codeql.rust.elements.Lifetime
 
 /**
  * INTERNAL: This module contains the fully generated definition of `BreakExpr` and should not
@@ -31,12 +32,38 @@ module Generated {
    *     }
    * };
    * ```
+   * ```rust
+   * let x = 'label: {
+   *     if exit() {
+   *         break 'label 42;
+   *     }
+   *     0;
+   * };
+   * ```
    * INTERNAL: Do not reference the `Generated::BreakExpr` class directly.
    * Use the subclass `BreakExpr`, where the following predicates are available.
    */
   class BreakExpr extends Synth::TBreakExpr, ExprImpl::Expr {
     override string getAPrimaryQlClass() { result = "BreakExpr" }
 
+    /**
+     * Gets the `index`th attr of this break expression (0-based).
+     */
+    Attr getAttr(int index) {
+      result =
+        Synth::convertAttrFromRaw(Synth::convertBreakExprToRaw(this).(Raw::BreakExpr).getAttr(index))
+    }
+
+    /**
+     * Gets any of the attrs of this break expression.
+     */
+    final Attr getAnAttr() { result = this.getAttr(_) }
+
+    /**
+     * Gets the number of attrs of this break expression.
+     */
+    final int getNumberOfAttrs() { result = count(int i | exists(this.getAttr(i))) }
+
     /**
      * Gets the expression of this break expression, if it exists.
      */
@@ -51,16 +78,18 @@ module Generated {
     final predicate hasExpr() { exists(this.getExpr()) }
 
     /**
-     * Gets the label of this break expression, if it exists.
+     * Gets the lifetime of this break expression, if it exists.
      */
-    Label getLabel() {
+    Lifetime getLifetime() {
       result =
-        Synth::convertLabelFromRaw(Synth::convertBreakExprToRaw(this).(Raw::BreakExpr).getLabel())
+        Synth::convertLifetimeFromRaw(Synth::convertBreakExprToRaw(this)
+              .(Raw::BreakExpr)
+              .getLifetime())
     }
 
     /**
-     * Holds if `getLabel()` exists.
+     * Holds if `getLifetime()` exists.
      */
-    final predicate hasLabel() { exists(this.getLabel()) }
+    final predicate hasLifetime() { exists(this.getLifetime()) }
   }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/CallExpr.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/CallExpr.qll
index 45f6f93298c..2e41b664a4e 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/CallExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/CallExpr.qll
@@ -6,8 +6,8 @@
 
 private import codeql.rust.elements.internal.generated.Synth
 private import codeql.rust.elements.internal.generated.Raw
+import codeql.rust.elements.internal.CallExprBaseImpl::Impl as CallExprBaseImpl
 import codeql.rust.elements.Expr
-import codeql.rust.elements.internal.ExprImpl::Impl as ExprImpl
 
 /**
  * INTERNAL: This module contains the fully generated definition of `CallExpr` and should not
@@ -25,40 +25,20 @@ module Generated {
    * INTERNAL: Do not reference the `Generated::CallExpr` class directly.
    * Use the subclass `CallExpr`, where the following predicates are available.
    */
-  class CallExpr extends Synth::TCallExpr, ExprImpl::Expr {
+  class CallExpr extends Synth::TCallExpr, CallExprBaseImpl::CallExprBase {
     override string getAPrimaryQlClass() { result = "CallExpr" }
 
     /**
-     * Gets the callee of this call expression.
+     * Gets the expression of this call expression, if it exists.
      */
-    Expr getCallee() {
+    Expr getExpr() {
       result =
-        Synth::convertExprFromRaw(Synth::convertCallExprToRaw(this).(Raw::CallExpr).getCallee())
+        Synth::convertExprFromRaw(Synth::convertCallExprToRaw(this).(Raw::CallExpr).getExpr())
     }
 
     /**
-     * Gets the `index`th argument of this call expression (0-based).
+     * Holds if `getExpr()` exists.
      */
-    Expr getArg(int index) {
-      result =
-        Synth::convertExprFromRaw(Synth::convertCallExprToRaw(this).(Raw::CallExpr).getArg(index))
-    }
-
-    /**
-     * Gets any of the arguments of this call expression.
-     */
-    final Expr getAnArg() { result = this.getArg(_) }
-
-    /**
-     * Gets the number of arguments of this call expression.
-     */
-    final int getNumberOfArgs() { result = count(int i | exists(this.getArg(i))) }
-
-    /**
-     * Holds if this call expression is assignee expression.
-     */
-    predicate isAssigneeExpr() {
-      Synth::convertCallExprToRaw(this).(Raw::CallExpr).isAssigneeExpr()
-    }
+    final predicate hasExpr() { exists(this.getExpr()) }
   }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/CallExprBase.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/CallExprBase.qll
new file mode 100644
index 00000000000..046558c356d
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/CallExprBase.qll
@@ -0,0 +1,59 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `CallExprBase`.
+ * INTERNAL: Do not import directly.
+ */
+
+private import codeql.rust.elements.internal.generated.Synth
+private import codeql.rust.elements.internal.generated.Raw
+import codeql.rust.elements.ArgList
+import codeql.rust.elements.Attr
+import codeql.rust.elements.internal.ExprImpl::Impl as ExprImpl
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `CallExprBase` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * A function or method call expression. See `CallExpr` and `MethodCallExpr` for further details.
+   * INTERNAL: Do not reference the `Generated::CallExprBase` class directly.
+   * Use the subclass `CallExprBase`, where the following predicates are available.
+   */
+  class CallExprBase extends Synth::TCallExprBase, ExprImpl::Expr {
+    /**
+     * Gets the argument list of this call expression base, if it exists.
+     */
+    ArgList getArgList() {
+      result =
+        Synth::convertArgListFromRaw(Synth::convertCallExprBaseToRaw(this)
+              .(Raw::CallExprBase)
+              .getArgList())
+    }
+
+    /**
+     * Holds if `getArgList()` exists.
+     */
+    final predicate hasArgList() { exists(this.getArgList()) }
+
+    /**
+     * Gets the `index`th attr of this call expression base (0-based).
+     */
+    Attr getAttr(int index) {
+      result =
+        Synth::convertAttrFromRaw(Synth::convertCallExprBaseToRaw(this)
+              .(Raw::CallExprBase)
+              .getAttr(index))
+    }
+
+    /**
+     * Gets any of the attrs of this call expression base.
+     */
+    final Attr getAnAttr() { result = this.getAttr(_) }
+
+    /**
+     * Gets the number of attrs of this call expression base.
+     */
+    final int getNumberOfAttrs() { result = count(int i | exists(this.getAttr(i))) }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/Callable.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/Callable.qll
new file mode 100644
index 00000000000..710cfe2078e
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/Callable.qll
@@ -0,0 +1,57 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `Callable`.
+ * INTERNAL: Do not import directly.
+ */
+
+private import codeql.rust.elements.internal.generated.Synth
+private import codeql.rust.elements.internal.generated.Raw
+import codeql.rust.elements.internal.AstNodeImpl::Impl as AstNodeImpl
+import codeql.rust.elements.Attr
+import codeql.rust.elements.ParamList
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `Callable` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * A callable. Either a `Function` or a `ClosureExpr`.
+   * INTERNAL: Do not reference the `Generated::Callable` class directly.
+   * Use the subclass `Callable`, where the following predicates are available.
+   */
+  class Callable extends Synth::TCallable, AstNodeImpl::AstNode {
+    /**
+     * Gets the parameter list of this callable, if it exists.
+     */
+    ParamList getParamList() {
+      result =
+        Synth::convertParamListFromRaw(Synth::convertCallableToRaw(this)
+              .(Raw::Callable)
+              .getParamList())
+    }
+
+    /**
+     * Holds if `getParamList()` exists.
+     */
+    final predicate hasParamList() { exists(this.getParamList()) }
+
+    /**
+     * Gets the `index`th attr of this callable (0-based).
+     */
+    Attr getAttr(int index) {
+      result =
+        Synth::convertAttrFromRaw(Synth::convertCallableToRaw(this).(Raw::Callable).getAttr(index))
+    }
+
+    /**
+     * Gets any of the attrs of this callable.
+     */
+    final Attr getAnAttr() { result = this.getAttr(_) }
+
+    /**
+     * Gets the number of attrs of this callable.
+     */
+    final int getNumberOfAttrs() { result = count(int i | exists(this.getAttr(i))) }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/CastExpr.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/CastExpr.qll
index 774ab7c61a2..9ede7cd7f33 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/CastExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/CastExpr.qll
@@ -6,6 +6,7 @@
 
 private import codeql.rust.elements.internal.generated.Synth
 private import codeql.rust.elements.internal.generated.Raw
+import codeql.rust.elements.Attr
 import codeql.rust.elements.Expr
 import codeql.rust.elements.internal.ExprImpl::Impl as ExprImpl
 import codeql.rust.elements.TypeRef
@@ -27,7 +28,25 @@ module Generated {
     override string getAPrimaryQlClass() { result = "CastExpr" }
 
     /**
-     * Gets the expression of this cast expression.
+     * Gets the `index`th attr of this cast expression (0-based).
+     */
+    Attr getAttr(int index) {
+      result =
+        Synth::convertAttrFromRaw(Synth::convertCastExprToRaw(this).(Raw::CastExpr).getAttr(index))
+    }
+
+    /**
+     * Gets any of the attrs of this cast expression.
+     */
+    final Attr getAnAttr() { result = this.getAttr(_) }
+
+    /**
+     * Gets the number of attrs of this cast expression.
+     */
+    final int getNumberOfAttrs() { result = count(int i | exists(this.getAttr(i))) }
+
+    /**
+     * Gets the expression of this cast expression, if it exists.
      */
     Expr getExpr() {
       result =
@@ -35,11 +54,21 @@ module Generated {
     }
 
     /**
-     * Gets the type of this cast expression.
+     * Holds if `getExpr()` exists.
      */
-    TypeRef getType() {
+    final predicate hasExpr() { exists(this.getExpr()) }
+
+    /**
+     * Gets the ty of this cast expression, if it exists.
+     */
+    TypeRef getTy() {
       result =
-        Synth::convertTypeRefFromRaw(Synth::convertCastExprToRaw(this).(Raw::CastExpr).getType())
+        Synth::convertTypeRefFromRaw(Synth::convertCastExprToRaw(this).(Raw::CastExpr).getTy())
     }
+
+    /**
+     * Holds if `getTy()` exists.
+     */
+    final predicate hasTy() { exists(this.getTy()) }
   }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/ClosureBinder.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/ClosureBinder.qll
new file mode 100644
index 00000000000..20c26e455c7
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/ClosureBinder.qll
@@ -0,0 +1,43 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `ClosureBinder`.
+ * INTERNAL: Do not import directly.
+ */
+
+private import codeql.rust.elements.internal.generated.Synth
+private import codeql.rust.elements.internal.generated.Raw
+import codeql.rust.elements.internal.AstNodeImpl::Impl as AstNodeImpl
+import codeql.rust.elements.GenericParamList
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `ClosureBinder` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * A ClosureBinder. For example:
+   * ```rust
+   * todo!()
+   * ```
+   * INTERNAL: Do not reference the `Generated::ClosureBinder` class directly.
+   * Use the subclass `ClosureBinder`, where the following predicates are available.
+   */
+  class ClosureBinder extends Synth::TClosureBinder, AstNodeImpl::AstNode {
+    override string getAPrimaryQlClass() { result = "ClosureBinder" }
+
+    /**
+     * Gets the generic parameter list of this closure binder, if it exists.
+     */
+    GenericParamList getGenericParamList() {
+      result =
+        Synth::convertGenericParamListFromRaw(Synth::convertClosureBinderToRaw(this)
+              .(Raw::ClosureBinder)
+              .getGenericParamList())
+    }
+
+    /**
+     * Holds if `getGenericParamList()` exists.
+     */
+    final predicate hasGenericParamList() { exists(this.getGenericParamList()) }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/ClosureExpr.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/ClosureExpr.qll
index d58e9b0e28c..0e107c2301d 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/ClosureExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/ClosureExpr.qll
@@ -6,10 +6,11 @@
 
 private import codeql.rust.elements.internal.generated.Synth
 private import codeql.rust.elements.internal.generated.Raw
+import codeql.rust.elements.internal.CallableImpl::Impl as CallableImpl
+import codeql.rust.elements.ClosureBinder
 import codeql.rust.elements.Expr
 import codeql.rust.elements.internal.ExprImpl::Impl as ExprImpl
-import codeql.rust.elements.Pat
-import codeql.rust.elements.TypeRef
+import codeql.rust.elements.RetType
 
 /**
  * INTERNAL: This module contains the fully generated definition of `ClosureExpr` and should not
@@ -30,55 +31,68 @@ module Generated {
    * INTERNAL: Do not reference the `Generated::ClosureExpr` class directly.
    * Use the subclass `ClosureExpr`, where the following predicates are available.
    */
-  class ClosureExpr extends Synth::TClosureExpr, ExprImpl::Expr {
+  class ClosureExpr extends Synth::TClosureExpr, ExprImpl::Expr, CallableImpl::Callable {
     override string getAPrimaryQlClass() { result = "ClosureExpr" }
 
     /**
-     * Gets the `index`th argument of this closure expression (0-based).
+     * Gets the body of this closure expression, if it exists.
      */
-    Pat getArg(int index) {
+    Expr getBody() {
       result =
-        Synth::convertPatFromRaw(Synth::convertClosureExprToRaw(this)
-              .(Raw::ClosureExpr)
-              .getArg(index))
+        Synth::convertExprFromRaw(Synth::convertClosureExprToRaw(this).(Raw::ClosureExpr).getBody())
     }
 
     /**
-     * Gets any of the arguments of this closure expression.
+     * Holds if `getBody()` exists.
      */
-    final Pat getAnArg() { result = this.getArg(_) }
+    final predicate hasBody() { exists(this.getBody()) }
 
     /**
-     * Gets the number of arguments of this closure expression.
+     * Gets the closure binder of this closure expression, if it exists.
      */
-    final int getNumberOfArgs() { result = count(int i | exists(this.getArg(i))) }
-
-    /**
-     * Gets the `index`th argument type of this closure expression (0-based), if it exists.
-     */
-    TypeRef getArgType(int index) {
+    ClosureBinder getClosureBinder() {
       result =
-        Synth::convertTypeRefFromRaw(Synth::convertClosureExprToRaw(this)
+        Synth::convertClosureBinderFromRaw(Synth::convertClosureExprToRaw(this)
               .(Raw::ClosureExpr)
-              .getArgType(index))
+              .getClosureBinder())
     }
 
     /**
-     * Holds if `getArgType(index)` exists.
+     * Holds if `getClosureBinder()` exists.
      */
-    final predicate hasArgType(int index) { exists(this.getArgType(index)) }
+    final predicate hasClosureBinder() { exists(this.getClosureBinder()) }
 
     /**
-     * Gets any of the argument types of this closure expression.
+     * Holds if this closure expression is async.
      */
-    final TypeRef getAnArgType() { result = this.getArgType(_) }
+    predicate isAsync() { Synth::convertClosureExprToRaw(this).(Raw::ClosureExpr).isAsync() }
+
+    /**
+     * Holds if this closure expression is const.
+     */
+    predicate isConst() { Synth::convertClosureExprToRaw(this).(Raw::ClosureExpr).isConst() }
+
+    /**
+     * Holds if this closure expression is gen.
+     */
+    predicate isGen() { Synth::convertClosureExprToRaw(this).(Raw::ClosureExpr).isGen() }
+
+    /**
+     * Holds if this closure expression is move.
+     */
+    predicate isMove() { Synth::convertClosureExprToRaw(this).(Raw::ClosureExpr).isMove() }
+
+    /**
+     * Holds if this closure expression is static.
+     */
+    predicate isStatic() { Synth::convertClosureExprToRaw(this).(Raw::ClosureExpr).isStatic() }
 
     /**
      * Gets the ret type of this closure expression, if it exists.
      */
-    TypeRef getRetType() {
+    RetType getRetType() {
       result =
-        Synth::convertTypeRefFromRaw(Synth::convertClosureExprToRaw(this)
+        Synth::convertRetTypeFromRaw(Synth::convertClosureExprToRaw(this)
               .(Raw::ClosureExpr)
               .getRetType())
     }
@@ -87,25 +101,5 @@ module Generated {
      * Holds if `getRetType()` exists.
      */
     final predicate hasRetType() { exists(this.getRetType()) }
-
-    /**
-     * Gets the body of this closure expression.
-     */
-    Expr getBody() {
-      result =
-        Synth::convertExprFromRaw(Synth::convertClosureExprToRaw(this).(Raw::ClosureExpr).getBody())
-    }
-
-    /**
-     * Gets the closure kind of this closure expression.
-     */
-    string getClosureKind() {
-      result = Synth::convertClosureExprToRaw(this).(Raw::ClosureExpr).getClosureKind()
-    }
-
-    /**
-     * Holds if this closure expression is move.
-     */
-    predicate isMove() { Synth::convertClosureExprToRaw(this).(Raw::ClosureExpr).isMove() }
   }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/Comment.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/Comment.qll
new file mode 100644
index 00000000000..7a4ca595f11
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/Comment.qll
@@ -0,0 +1,42 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `Comment`.
+ * INTERNAL: Do not import directly.
+ */
+
+private import codeql.rust.elements.internal.generated.Synth
+private import codeql.rust.elements.internal.generated.Raw
+import codeql.rust.elements.AstNode
+import codeql.rust.elements.internal.TokenImpl::Impl as TokenImpl
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `Comment` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * A comment. For example:
+   * ```rust
+   * // this is a comment
+   * /// This is a doc comment
+   * ```
+   * INTERNAL: Do not reference the `Generated::Comment` class directly.
+   * Use the subclass `Comment`, where the following predicates are available.
+   */
+  class Comment extends Synth::TComment, TokenImpl::Token {
+    override string getAPrimaryQlClass() { result = "Comment" }
+
+    /**
+     * Gets the parent of this comment.
+     */
+    AstNode getParent() {
+      result =
+        Synth::convertAstNodeFromRaw(Synth::convertCommentToRaw(this).(Raw::Comment).getParent())
+    }
+
+    /**
+     * Gets the text of this comment.
+     */
+    string getText() { result = Synth::convertCommentToRaw(this).(Raw::Comment).getText() }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/Const.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/Const.qll
new file mode 100644
index 00000000000..a9b1932a935
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/Const.qll
@@ -0,0 +1,109 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `Const`.
+ * INTERNAL: Do not import directly.
+ */
+
+private import codeql.rust.elements.internal.generated.Synth
+private import codeql.rust.elements.internal.generated.Raw
+import codeql.rust.elements.internal.AssocItemImpl::Impl as AssocItemImpl
+import codeql.rust.elements.Attr
+import codeql.rust.elements.Expr
+import codeql.rust.elements.internal.ItemImpl::Impl as ItemImpl
+import codeql.rust.elements.Name
+import codeql.rust.elements.TypeRef
+import codeql.rust.elements.Visibility
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `Const` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * A Const. For example:
+   * ```rust
+   * todo!()
+   * ```
+   * INTERNAL: Do not reference the `Generated::Const` class directly.
+   * Use the subclass `Const`, where the following predicates are available.
+   */
+  class Const extends Synth::TConst, AssocItemImpl::AssocItem, ItemImpl::Item {
+    override string getAPrimaryQlClass() { result = "Const" }
+
+    /**
+     * Gets the `index`th attr of this const (0-based).
+     */
+    Attr getAttr(int index) {
+      result = Synth::convertAttrFromRaw(Synth::convertConstToRaw(this).(Raw::Const).getAttr(index))
+    }
+
+    /**
+     * Gets any of the attrs of this const.
+     */
+    final Attr getAnAttr() { result = this.getAttr(_) }
+
+    /**
+     * Gets the number of attrs of this const.
+     */
+    final int getNumberOfAttrs() { result = count(int i | exists(this.getAttr(i))) }
+
+    /**
+     * Gets the body of this const, if it exists.
+     */
+    Expr getBody() {
+      result = Synth::convertExprFromRaw(Synth::convertConstToRaw(this).(Raw::Const).getBody())
+    }
+
+    /**
+     * Holds if `getBody()` exists.
+     */
+    final predicate hasBody() { exists(this.getBody()) }
+
+    /**
+     * Holds if this const is const.
+     */
+    predicate isConst() { Synth::convertConstToRaw(this).(Raw::Const).isConst() }
+
+    /**
+     * Holds if this const is default.
+     */
+    predicate isDefault() { Synth::convertConstToRaw(this).(Raw::Const).isDefault() }
+
+    /**
+     * Gets the name of this const, if it exists.
+     */
+    Name getName() {
+      result = Synth::convertNameFromRaw(Synth::convertConstToRaw(this).(Raw::Const).getName())
+    }
+
+    /**
+     * Holds if `getName()` exists.
+     */
+    final predicate hasName() { exists(this.getName()) }
+
+    /**
+     * Gets the ty of this const, if it exists.
+     */
+    TypeRef getTy() {
+      result = Synth::convertTypeRefFromRaw(Synth::convertConstToRaw(this).(Raw::Const).getTy())
+    }
+
+    /**
+     * Holds if `getTy()` exists.
+     */
+    final predicate hasTy() { exists(this.getTy()) }
+
+    /**
+     * Gets the visibility of this const, if it exists.
+     */
+    Visibility getVisibility() {
+      result =
+        Synth::convertVisibilityFromRaw(Synth::convertConstToRaw(this).(Raw::Const).getVisibility())
+    }
+
+    /**
+     * Holds if `getVisibility()` exists.
+     */
+    final predicate hasVisibility() { exists(this.getVisibility()) }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/ConstArg.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/ConstArg.qll
new file mode 100644
index 00000000000..153a4bc16b7
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/ConstArg.qll
@@ -0,0 +1,41 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `ConstArg`.
+ * INTERNAL: Do not import directly.
+ */
+
+private import codeql.rust.elements.internal.generated.Synth
+private import codeql.rust.elements.internal.generated.Raw
+import codeql.rust.elements.Expr
+import codeql.rust.elements.internal.GenericArgImpl::Impl as GenericArgImpl
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `ConstArg` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * A ConstArg. For example:
+   * ```rust
+   * todo!()
+   * ```
+   * INTERNAL: Do not reference the `Generated::ConstArg` class directly.
+   * Use the subclass `ConstArg`, where the following predicates are available.
+   */
+  class ConstArg extends Synth::TConstArg, GenericArgImpl::GenericArg {
+    override string getAPrimaryQlClass() { result = "ConstArg" }
+
+    /**
+     * Gets the expression of this const argument, if it exists.
+     */
+    Expr getExpr() {
+      result =
+        Synth::convertExprFromRaw(Synth::convertConstArgToRaw(this).(Raw::ConstArg).getExpr())
+    }
+
+    /**
+     * Holds if `getExpr()` exists.
+     */
+    final predicate hasExpr() { exists(this.getExpr()) }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/ConstBlockPat.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/ConstBlockPat.qll
index d024d52f41c..2935c7c8f85 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/ConstBlockPat.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/ConstBlockPat.qll
@@ -6,7 +6,7 @@
 
 private import codeql.rust.elements.internal.generated.Synth
 private import codeql.rust.elements.internal.generated.Raw
-import codeql.rust.elements.Expr
+import codeql.rust.elements.BlockExpr
 import codeql.rust.elements.internal.PatImpl::Impl as PatImpl
 
 /**
@@ -29,13 +29,23 @@ module Generated {
     override string getAPrimaryQlClass() { result = "ConstBlockPat" }
 
     /**
-     * Gets the expression of this const block pat.
+     * Gets the block expression of this const block pat, if it exists.
      */
-    Expr getExpr() {
+    BlockExpr getBlockExpr() {
       result =
-        Synth::convertExprFromRaw(Synth::convertConstBlockPatToRaw(this)
+        Synth::convertBlockExprFromRaw(Synth::convertConstBlockPatToRaw(this)
               .(Raw::ConstBlockPat)
-              .getExpr())
+              .getBlockExpr())
     }
+
+    /**
+     * Holds if `getBlockExpr()` exists.
+     */
+    final predicate hasBlockExpr() { exists(this.getBlockExpr()) }
+
+    /**
+     * Holds if this const block pat is const.
+     */
+    predicate isConst() { Synth::convertConstBlockPatToRaw(this).(Raw::ConstBlockPat).isConst() }
   }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/ConstExpr.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/ConstExpr.qll
deleted file mode 100644
index 268a281325a..00000000000
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/ConstExpr.qll
+++ /dev/null
@@ -1,38 +0,0 @@
-// generated by codegen, do not edit
-/**
- * This module provides the generated definition of `ConstExpr`.
- * INTERNAL: Do not import directly.
- */
-
-private import codeql.rust.elements.internal.generated.Synth
-private import codeql.rust.elements.internal.generated.Raw
-import codeql.rust.elements.Expr
-import codeql.rust.elements.internal.ExprImpl::Impl as ExprImpl
-
-/**
- * INTERNAL: This module contains the fully generated definition of `ConstExpr` and should not
- * be referenced directly.
- */
-module Generated {
-  /**
-   * A `const` block expression. For example:
-   * ```rust
-   * if const { SRC::IS_ZST || DEST::IS_ZST || mem::align_of::<SRC>() != mem::align_of::<DEST>() } {
-   *     return false;
-   * }
-   * ```
-   * INTERNAL: Do not reference the `Generated::ConstExpr` class directly.
-   * Use the subclass `ConstExpr`, where the following predicates are available.
-   */
-  class ConstExpr extends Synth::TConstExpr, ExprImpl::Expr {
-    override string getAPrimaryQlClass() { result = "ConstExpr" }
-
-    /**
-     * Gets the expression of this const expression.
-     */
-    Expr getExpr() {
-      result =
-        Synth::convertExprFromRaw(Synth::convertConstExprToRaw(this).(Raw::ConstExpr).getExpr())
-    }
-  }
-}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/ConstParam.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/ConstParam.qll
new file mode 100644
index 00000000000..451234d3dc1
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/ConstParam.qll
@@ -0,0 +1,97 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `ConstParam`.
+ * INTERNAL: Do not import directly.
+ */
+
+private import codeql.rust.elements.internal.generated.Synth
+private import codeql.rust.elements.internal.generated.Raw
+import codeql.rust.elements.Attr
+import codeql.rust.elements.ConstArg
+import codeql.rust.elements.internal.GenericParamImpl::Impl as GenericParamImpl
+import codeql.rust.elements.Name
+import codeql.rust.elements.TypeRef
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `ConstParam` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * A ConstParam. For example:
+   * ```rust
+   * todo!()
+   * ```
+   * INTERNAL: Do not reference the `Generated::ConstParam` class directly.
+   * Use the subclass `ConstParam`, where the following predicates are available.
+   */
+  class ConstParam extends Synth::TConstParam, GenericParamImpl::GenericParam {
+    override string getAPrimaryQlClass() { result = "ConstParam" }
+
+    /**
+     * Gets the `index`th attr of this const parameter (0-based).
+     */
+    Attr getAttr(int index) {
+      result =
+        Synth::convertAttrFromRaw(Synth::convertConstParamToRaw(this)
+              .(Raw::ConstParam)
+              .getAttr(index))
+    }
+
+    /**
+     * Gets any of the attrs of this const parameter.
+     */
+    final Attr getAnAttr() { result = this.getAttr(_) }
+
+    /**
+     * Gets the number of attrs of this const parameter.
+     */
+    final int getNumberOfAttrs() { result = count(int i | exists(this.getAttr(i))) }
+
+    /**
+     * Gets the default val of this const parameter, if it exists.
+     */
+    ConstArg getDefaultVal() {
+      result =
+        Synth::convertConstArgFromRaw(Synth::convertConstParamToRaw(this)
+              .(Raw::ConstParam)
+              .getDefaultVal())
+    }
+
+    /**
+     * Holds if `getDefaultVal()` exists.
+     */
+    final predicate hasDefaultVal() { exists(this.getDefaultVal()) }
+
+    /**
+     * Holds if this const parameter is const.
+     */
+    predicate isConst() { Synth::convertConstParamToRaw(this).(Raw::ConstParam).isConst() }
+
+    /**
+     * Gets the name of this const parameter, if it exists.
+     */
+    Name getName() {
+      result =
+        Synth::convertNameFromRaw(Synth::convertConstParamToRaw(this).(Raw::ConstParam).getName())
+    }
+
+    /**
+     * Holds if `getName()` exists.
+     */
+    final predicate hasName() { exists(this.getName()) }
+
+    /**
+     * Gets the ty of this const parameter, if it exists.
+     */
+    TypeRef getTy() {
+      result =
+        Synth::convertTypeRefFromRaw(Synth::convertConstParamToRaw(this).(Raw::ConstParam).getTy())
+    }
+
+    /**
+     * Holds if `getTy()` exists.
+     */
+    final predicate hasTy() { exists(this.getTy()) }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/ContinueExpr.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/ContinueExpr.qll
index 736fe31d5e5..9e8df8e22e6 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/ContinueExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/ContinueExpr.qll
@@ -6,8 +6,9 @@
 
 private import codeql.rust.elements.internal.generated.Synth
 private import codeql.rust.elements.internal.generated.Raw
+import codeql.rust.elements.Attr
 import codeql.rust.elements.internal.ExprImpl::Impl as ExprImpl
-import codeql.rust.elements.Label
+import codeql.rust.elements.Lifetime
 
 /**
  * INTERNAL: This module contains the fully generated definition of `ContinueExpr` and should not
@@ -37,18 +38,38 @@ module Generated {
     override string getAPrimaryQlClass() { result = "ContinueExpr" }
 
     /**
-     * Gets the label of this continue expression, if it exists.
+     * Gets the `index`th attr of this continue expression (0-based).
      */
-    Label getLabel() {
+    Attr getAttr(int index) {
       result =
-        Synth::convertLabelFromRaw(Synth::convertContinueExprToRaw(this)
+        Synth::convertAttrFromRaw(Synth::convertContinueExprToRaw(this)
               .(Raw::ContinueExpr)
-              .getLabel())
+              .getAttr(index))
     }
 
     /**
-     * Holds if `getLabel()` exists.
+     * Gets any of the attrs of this continue expression.
      */
-    final predicate hasLabel() { exists(this.getLabel()) }
+    final Attr getAnAttr() { result = this.getAttr(_) }
+
+    /**
+     * Gets the number of attrs of this continue expression.
+     */
+    final int getNumberOfAttrs() { result = count(int i | exists(this.getAttr(i))) }
+
+    /**
+     * Gets the lifetime of this continue expression, if it exists.
+     */
+    Lifetime getLifetime() {
+      result =
+        Synth::convertLifetimeFromRaw(Synth::convertContinueExprToRaw(this)
+              .(Raw::ContinueExpr)
+              .getLifetime())
+    }
+
+    /**
+     * Holds if `getLifetime()` exists.
+     */
+    final predicate hasLifetime() { exists(this.getLifetime()) }
   }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/DynTraitType.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/DynTraitType.qll
new file mode 100644
index 00000000000..acd35715487
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/DynTraitType.qll
@@ -0,0 +1,43 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `DynTraitType`.
+ * INTERNAL: Do not import directly.
+ */
+
+private import codeql.rust.elements.internal.generated.Synth
+private import codeql.rust.elements.internal.generated.Raw
+import codeql.rust.elements.TypeBoundList
+import codeql.rust.elements.internal.TypeRefImpl::Impl as TypeRefImpl
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `DynTraitType` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * A DynTraitType. For example:
+   * ```rust
+   * todo!()
+   * ```
+   * INTERNAL: Do not reference the `Generated::DynTraitType` class directly.
+   * Use the subclass `DynTraitType`, where the following predicates are available.
+   */
+  class DynTraitType extends Synth::TDynTraitType, TypeRefImpl::TypeRef {
+    override string getAPrimaryQlClass() { result = "DynTraitType" }
+
+    /**
+     * Gets the type bound list of this dyn trait type, if it exists.
+     */
+    TypeBoundList getTypeBoundList() {
+      result =
+        Synth::convertTypeBoundListFromRaw(Synth::convertDynTraitTypeToRaw(this)
+              .(Raw::DynTraitType)
+              .getTypeBoundList())
+    }
+
+    /**
+     * Holds if `getTypeBoundList()` exists.
+     */
+    final predicate hasTypeBoundList() { exists(this.getTypeBoundList()) }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/ElementListExpr.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/ElementListExpr.qll
deleted file mode 100644
index 285e8e5aea4..00000000000
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/ElementListExpr.qll
+++ /dev/null
@@ -1,56 +0,0 @@
-// generated by codegen, do not edit
-/**
- * This module provides the generated definition of `ElementListExpr`.
- * INTERNAL: Do not import directly.
- */
-
-private import codeql.rust.elements.internal.generated.Synth
-private import codeql.rust.elements.internal.generated.Raw
-import codeql.rust.elements.internal.ArrayExprImpl::Impl as ArrayExprImpl
-import codeql.rust.elements.Expr
-
-/**
- * INTERNAL: This module contains the fully generated definition of `ElementListExpr` and should not
- * be referenced directly.
- */
-module Generated {
-  /**
-   * An element list expression. For example:
-   * ```rust
-   * [1, 2, 3, 4, 5];
-   * [1, 2, 3, 4, 5][0] = 6;
-   * ```
-   * INTERNAL: Do not reference the `Generated::ElementListExpr` class directly.
-   * Use the subclass `ElementListExpr`, where the following predicates are available.
-   */
-  class ElementListExpr extends Synth::TElementListExpr, ArrayExprImpl::ArrayExpr {
-    override string getAPrimaryQlClass() { result = "ElementListExpr" }
-
-    /**
-     * Gets the `index`th element of this element list expression (0-based).
-     */
-    Expr getElement(int index) {
-      result =
-        Synth::convertExprFromRaw(Synth::convertElementListExprToRaw(this)
-              .(Raw::ElementListExpr)
-              .getElement(index))
-    }
-
-    /**
-     * Gets any of the elements of this element list expression.
-     */
-    final Expr getAnElement() { result = this.getElement(_) }
-
-    /**
-     * Gets the number of elements of this element list expression.
-     */
-    final int getNumberOfElements() { result = count(int i | exists(this.getElement(i))) }
-
-    /**
-     * Holds if this element list expression is assignee expression.
-     */
-    predicate isAssigneeExpr() {
-      Synth::convertElementListExprToRaw(this).(Raw::ElementListExpr).isAssigneeExpr()
-    }
-  }
-}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/Enum.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/Enum.qll
new file mode 100644
index 00000000000..9c7c3bc331f
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/Enum.qll
@@ -0,0 +1,116 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `Enum`.
+ * INTERNAL: Do not import directly.
+ */
+
+private import codeql.rust.elements.internal.generated.Synth
+private import codeql.rust.elements.internal.generated.Raw
+import codeql.rust.elements.Attr
+import codeql.rust.elements.GenericParamList
+import codeql.rust.elements.internal.ItemImpl::Impl as ItemImpl
+import codeql.rust.elements.Name
+import codeql.rust.elements.VariantList
+import codeql.rust.elements.Visibility
+import codeql.rust.elements.WhereClause
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `Enum` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * A Enum. For example:
+   * ```rust
+   * todo!()
+   * ```
+   * INTERNAL: Do not reference the `Generated::Enum` class directly.
+   * Use the subclass `Enum`, where the following predicates are available.
+   */
+  class Enum extends Synth::TEnum, ItemImpl::Item {
+    override string getAPrimaryQlClass() { result = "Enum" }
+
+    /**
+     * Gets the `index`th attr of this enum (0-based).
+     */
+    Attr getAttr(int index) {
+      result = Synth::convertAttrFromRaw(Synth::convertEnumToRaw(this).(Raw::Enum).getAttr(index))
+    }
+
+    /**
+     * Gets any of the attrs of this enum.
+     */
+    final Attr getAnAttr() { result = this.getAttr(_) }
+
+    /**
+     * Gets the number of attrs of this enum.
+     */
+    final int getNumberOfAttrs() { result = count(int i | exists(this.getAttr(i))) }
+
+    /**
+     * Gets the generic parameter list of this enum, if it exists.
+     */
+    GenericParamList getGenericParamList() {
+      result =
+        Synth::convertGenericParamListFromRaw(Synth::convertEnumToRaw(this)
+              .(Raw::Enum)
+              .getGenericParamList())
+    }
+
+    /**
+     * Holds if `getGenericParamList()` exists.
+     */
+    final predicate hasGenericParamList() { exists(this.getGenericParamList()) }
+
+    /**
+     * Gets the name of this enum, if it exists.
+     */
+    Name getName() {
+      result = Synth::convertNameFromRaw(Synth::convertEnumToRaw(this).(Raw::Enum).getName())
+    }
+
+    /**
+     * Holds if `getName()` exists.
+     */
+    final predicate hasName() { exists(this.getName()) }
+
+    /**
+     * Gets the variant list of this enum, if it exists.
+     */
+    VariantList getVariantList() {
+      result =
+        Synth::convertVariantListFromRaw(Synth::convertEnumToRaw(this).(Raw::Enum).getVariantList())
+    }
+
+    /**
+     * Holds if `getVariantList()` exists.
+     */
+    final predicate hasVariantList() { exists(this.getVariantList()) }
+
+    /**
+     * Gets the visibility of this enum, if it exists.
+     */
+    Visibility getVisibility() {
+      result =
+        Synth::convertVisibilityFromRaw(Synth::convertEnumToRaw(this).(Raw::Enum).getVisibility())
+    }
+
+    /**
+     * Holds if `getVisibility()` exists.
+     */
+    final predicate hasVisibility() { exists(this.getVisibility()) }
+
+    /**
+     * Gets the where clause of this enum, if it exists.
+     */
+    WhereClause getWhereClause() {
+      result =
+        Synth::convertWhereClauseFromRaw(Synth::convertEnumToRaw(this).(Raw::Enum).getWhereClause())
+    }
+
+    /**
+     * Holds if `getWhereClause()` exists.
+     */
+    final predicate hasWhereClause() { exists(this.getWhereClause()) }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/ExprStmt.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/ExprStmt.qll
index 9f9e9aa47fc..23396d0c904 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/ExprStmt.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/ExprStmt.qll
@@ -18,7 +18,7 @@ module Generated {
    * An expression statement. For example:
    * ```rust
    * start();
-   * finish()
+   * finish();
    * use std::env;
    * ```
    * INTERNAL: Do not reference the `Generated::ExprStmt` class directly.
@@ -28,7 +28,7 @@ module Generated {
     override string getAPrimaryQlClass() { result = "ExprStmt" }
 
     /**
-     * Gets the expression of this expression statement.
+     * Gets the expression of this expression statement, if it exists.
      */
     Expr getExpr() {
       result =
@@ -36,8 +36,8 @@ module Generated {
     }
 
     /**
-     * Holds if this expression statement has semicolon.
+     * Holds if `getExpr()` exists.
      */
-    predicate hasSemicolon() { Synth::convertExprStmtToRaw(this).(Raw::ExprStmt).hasSemicolon() }
+    final predicate hasExpr() { exists(this.getExpr()) }
   }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/ExternBlock.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/ExternBlock.qll
new file mode 100644
index 00000000000..823bf4173c4
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/ExternBlock.qll
@@ -0,0 +1,83 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `ExternBlock`.
+ * INTERNAL: Do not import directly.
+ */
+
+private import codeql.rust.elements.internal.generated.Synth
+private import codeql.rust.elements.internal.generated.Raw
+import codeql.rust.elements.Abi
+import codeql.rust.elements.Attr
+import codeql.rust.elements.ExternItemList
+import codeql.rust.elements.internal.ItemImpl::Impl as ItemImpl
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `ExternBlock` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * A ExternBlock. For example:
+   * ```rust
+   * todo!()
+   * ```
+   * INTERNAL: Do not reference the `Generated::ExternBlock` class directly.
+   * Use the subclass `ExternBlock`, where the following predicates are available.
+   */
+  class ExternBlock extends Synth::TExternBlock, ItemImpl::Item {
+    override string getAPrimaryQlClass() { result = "ExternBlock" }
+
+    /**
+     * Gets the abi of this extern block, if it exists.
+     */
+    Abi getAbi() {
+      result =
+        Synth::convertAbiFromRaw(Synth::convertExternBlockToRaw(this).(Raw::ExternBlock).getAbi())
+    }
+
+    /**
+     * Holds if `getAbi()` exists.
+     */
+    final predicate hasAbi() { exists(this.getAbi()) }
+
+    /**
+     * Gets the `index`th attr of this extern block (0-based).
+     */
+    Attr getAttr(int index) {
+      result =
+        Synth::convertAttrFromRaw(Synth::convertExternBlockToRaw(this)
+              .(Raw::ExternBlock)
+              .getAttr(index))
+    }
+
+    /**
+     * Gets any of the attrs of this extern block.
+     */
+    final Attr getAnAttr() { result = this.getAttr(_) }
+
+    /**
+     * Gets the number of attrs of this extern block.
+     */
+    final int getNumberOfAttrs() { result = count(int i | exists(this.getAttr(i))) }
+
+    /**
+     * Gets the extern item list of this extern block, if it exists.
+     */
+    ExternItemList getExternItemList() {
+      result =
+        Synth::convertExternItemListFromRaw(Synth::convertExternBlockToRaw(this)
+              .(Raw::ExternBlock)
+              .getExternItemList())
+    }
+
+    /**
+     * Holds if `getExternItemList()` exists.
+     */
+    final predicate hasExternItemList() { exists(this.getExternItemList()) }
+
+    /**
+     * Holds if this extern block is unsafe.
+     */
+    predicate isUnsafe() { Synth::convertExternBlockToRaw(this).(Raw::ExternBlock).isUnsafe() }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/ExternCrate.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/ExternCrate.qll
new file mode 100644
index 00000000000..b3518993cf3
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/ExternCrate.qll
@@ -0,0 +1,96 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `ExternCrate`.
+ * INTERNAL: Do not import directly.
+ */
+
+private import codeql.rust.elements.internal.generated.Synth
+private import codeql.rust.elements.internal.generated.Raw
+import codeql.rust.elements.Attr
+import codeql.rust.elements.internal.ItemImpl::Impl as ItemImpl
+import codeql.rust.elements.NameRef
+import codeql.rust.elements.Rename
+import codeql.rust.elements.Visibility
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `ExternCrate` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * A ExternCrate. For example:
+   * ```rust
+   * todo!()
+   * ```
+   * INTERNAL: Do not reference the `Generated::ExternCrate` class directly.
+   * Use the subclass `ExternCrate`, where the following predicates are available.
+   */
+  class ExternCrate extends Synth::TExternCrate, ItemImpl::Item {
+    override string getAPrimaryQlClass() { result = "ExternCrate" }
+
+    /**
+     * Gets the `index`th attr of this extern crate (0-based).
+     */
+    Attr getAttr(int index) {
+      result =
+        Synth::convertAttrFromRaw(Synth::convertExternCrateToRaw(this)
+              .(Raw::ExternCrate)
+              .getAttr(index))
+    }
+
+    /**
+     * Gets any of the attrs of this extern crate.
+     */
+    final Attr getAnAttr() { result = this.getAttr(_) }
+
+    /**
+     * Gets the number of attrs of this extern crate.
+     */
+    final int getNumberOfAttrs() { result = count(int i | exists(this.getAttr(i))) }
+
+    /**
+     * Gets the name reference of this extern crate, if it exists.
+     */
+    NameRef getNameRef() {
+      result =
+        Synth::convertNameRefFromRaw(Synth::convertExternCrateToRaw(this)
+              .(Raw::ExternCrate)
+              .getNameRef())
+    }
+
+    /**
+     * Holds if `getNameRef()` exists.
+     */
+    final predicate hasNameRef() { exists(this.getNameRef()) }
+
+    /**
+     * Gets the rename of this extern crate, if it exists.
+     */
+    Rename getRename() {
+      result =
+        Synth::convertRenameFromRaw(Synth::convertExternCrateToRaw(this)
+              .(Raw::ExternCrate)
+              .getRename())
+    }
+
+    /**
+     * Holds if `getRename()` exists.
+     */
+    final predicate hasRename() { exists(this.getRename()) }
+
+    /**
+     * Gets the visibility of this extern crate, if it exists.
+     */
+    Visibility getVisibility() {
+      result =
+        Synth::convertVisibilityFromRaw(Synth::convertExternCrateToRaw(this)
+              .(Raw::ExternCrate)
+              .getVisibility())
+    }
+
+    /**
+     * Holds if `getVisibility()` exists.
+     */
+    final predicate hasVisibility() { exists(this.getVisibility()) }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/ExternItem.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/ExternItem.qll
new file mode 100644
index 00000000000..8756b707608
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/ExternItem.qll
@@ -0,0 +1,25 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `ExternItem`.
+ * INTERNAL: Do not import directly.
+ */
+
+private import codeql.rust.elements.internal.generated.Synth
+private import codeql.rust.elements.internal.generated.Raw
+import codeql.rust.elements.internal.AstNodeImpl::Impl as AstNodeImpl
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `ExternItem` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * A ExternItem. For example:
+   * ```rust
+   * todo!()
+   * ```
+   * INTERNAL: Do not reference the `Generated::ExternItem` class directly.
+   * Use the subclass `ExternItem`, where the following predicates are available.
+   */
+  class ExternItem extends Synth::TExternItem, AstNodeImpl::AstNode { }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/ExternItemList.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/ExternItemList.qll
new file mode 100644
index 00000000000..bffae8deb81
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/ExternItemList.qll
@@ -0,0 +1,69 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `ExternItemList`.
+ * INTERNAL: Do not import directly.
+ */
+
+private import codeql.rust.elements.internal.generated.Synth
+private import codeql.rust.elements.internal.generated.Raw
+import codeql.rust.elements.internal.AstNodeImpl::Impl as AstNodeImpl
+import codeql.rust.elements.Attr
+import codeql.rust.elements.ExternItem
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `ExternItemList` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * A ExternItemList. For example:
+   * ```rust
+   * todo!()
+   * ```
+   * INTERNAL: Do not reference the `Generated::ExternItemList` class directly.
+   * Use the subclass `ExternItemList`, where the following predicates are available.
+   */
+  class ExternItemList extends Synth::TExternItemList, AstNodeImpl::AstNode {
+    override string getAPrimaryQlClass() { result = "ExternItemList" }
+
+    /**
+     * Gets the `index`th attr of this extern item list (0-based).
+     */
+    Attr getAttr(int index) {
+      result =
+        Synth::convertAttrFromRaw(Synth::convertExternItemListToRaw(this)
+              .(Raw::ExternItemList)
+              .getAttr(index))
+    }
+
+    /**
+     * Gets any of the attrs of this extern item list.
+     */
+    final Attr getAnAttr() { result = this.getAttr(_) }
+
+    /**
+     * Gets the number of attrs of this extern item list.
+     */
+    final int getNumberOfAttrs() { result = count(int i | exists(this.getAttr(i))) }
+
+    /**
+     * Gets the `index`th extern item of this extern item list (0-based).
+     */
+    ExternItem getExternItem(int index) {
+      result =
+        Synth::convertExternItemFromRaw(Synth::convertExternItemListToRaw(this)
+              .(Raw::ExternItemList)
+              .getExternItem(index))
+    }
+
+    /**
+     * Gets any of the extern items of this extern item list.
+     */
+    final ExternItem getAnExternItem() { result = this.getExternItem(_) }
+
+    /**
+     * Gets the number of extern items of this extern item list.
+     */
+    final int getNumberOfExternItems() { result = count(int i | exists(this.getExternItem(i))) }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/FieldExpr.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/FieldExpr.qll
index a8910c54e64..909af4a3b04 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/FieldExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/FieldExpr.qll
@@ -6,8 +6,10 @@
 
 private import codeql.rust.elements.internal.generated.Synth
 private import codeql.rust.elements.internal.generated.Raw
+import codeql.rust.elements.Attr
 import codeql.rust.elements.Expr
 import codeql.rust.elements.internal.ExprImpl::Impl as ExprImpl
+import codeql.rust.elements.NameRef
 
 /**
  * INTERNAL: This module contains the fully generated definition of `FieldExpr` and should not
@@ -26,7 +28,25 @@ module Generated {
     override string getAPrimaryQlClass() { result = "FieldExpr" }
 
     /**
-     * Gets the expression of this field expression.
+     * Gets the `index`th attr of this field expression (0-based).
+     */
+    Attr getAttr(int index) {
+      result =
+        Synth::convertAttrFromRaw(Synth::convertFieldExprToRaw(this).(Raw::FieldExpr).getAttr(index))
+    }
+
+    /**
+     * Gets any of the attrs of this field expression.
+     */
+    final Attr getAnAttr() { result = this.getAttr(_) }
+
+    /**
+     * Gets the number of attrs of this field expression.
+     */
+    final int getNumberOfAttrs() { result = count(int i | exists(this.getAttr(i))) }
+
+    /**
+     * Gets the expression of this field expression, if it exists.
      */
     Expr getExpr() {
       result =
@@ -34,8 +54,23 @@ module Generated {
     }
 
     /**
-     * Gets the name of this field expression.
+     * Holds if `getExpr()` exists.
      */
-    string getName() { result = Synth::convertFieldExprToRaw(this).(Raw::FieldExpr).getName() }
+    final predicate hasExpr() { exists(this.getExpr()) }
+
+    /**
+     * Gets the name reference of this field expression, if it exists.
+     */
+    NameRef getNameRef() {
+      result =
+        Synth::convertNameRefFromRaw(Synth::convertFieldExprToRaw(this)
+              .(Raw::FieldExpr)
+              .getNameRef())
+    }
+
+    /**
+     * Holds if `getNameRef()` exists.
+     */
+    final predicate hasNameRef() { exists(this.getNameRef()) }
   }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/FieldList.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/FieldList.qll
new file mode 100644
index 00000000000..3c386c8d957
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/FieldList.qll
@@ -0,0 +1,25 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `FieldList`.
+ * INTERNAL: Do not import directly.
+ */
+
+private import codeql.rust.elements.internal.generated.Synth
+private import codeql.rust.elements.internal.generated.Raw
+import codeql.rust.elements.internal.AstNodeImpl::Impl as AstNodeImpl
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `FieldList` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * A FieldList. For example:
+   * ```rust
+   * todo!()
+   * ```
+   * INTERNAL: Do not reference the `Generated::FieldList` class directly.
+   * Use the subclass `FieldList`, where the following predicates are available.
+   */
+  class FieldList extends Synth::TFieldList, AstNodeImpl::AstNode { }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/FnPtrType.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/FnPtrType.qll
new file mode 100644
index 00000000000..8296c401fa8
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/FnPtrType.qll
@@ -0,0 +1,88 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `FnPtrType`.
+ * INTERNAL: Do not import directly.
+ */
+
+private import codeql.rust.elements.internal.generated.Synth
+private import codeql.rust.elements.internal.generated.Raw
+import codeql.rust.elements.Abi
+import codeql.rust.elements.ParamList
+import codeql.rust.elements.RetType
+import codeql.rust.elements.internal.TypeRefImpl::Impl as TypeRefImpl
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `FnPtrType` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * A FnPtrType. For example:
+   * ```rust
+   * todo!()
+   * ```
+   * INTERNAL: Do not reference the `Generated::FnPtrType` class directly.
+   * Use the subclass `FnPtrType`, where the following predicates are available.
+   */
+  class FnPtrType extends Synth::TFnPtrType, TypeRefImpl::TypeRef {
+    override string getAPrimaryQlClass() { result = "FnPtrType" }
+
+    /**
+     * Gets the abi of this fn ptr type, if it exists.
+     */
+    Abi getAbi() {
+      result =
+        Synth::convertAbiFromRaw(Synth::convertFnPtrTypeToRaw(this).(Raw::FnPtrType).getAbi())
+    }
+
+    /**
+     * Holds if `getAbi()` exists.
+     */
+    final predicate hasAbi() { exists(this.getAbi()) }
+
+    /**
+     * Holds if this fn ptr type is async.
+     */
+    predicate isAsync() { Synth::convertFnPtrTypeToRaw(this).(Raw::FnPtrType).isAsync() }
+
+    /**
+     * Holds if this fn ptr type is const.
+     */
+    predicate isConst() { Synth::convertFnPtrTypeToRaw(this).(Raw::FnPtrType).isConst() }
+
+    /**
+     * Holds if this fn ptr type is unsafe.
+     */
+    predicate isUnsafe() { Synth::convertFnPtrTypeToRaw(this).(Raw::FnPtrType).isUnsafe() }
+
+    /**
+     * Gets the parameter list of this fn ptr type, if it exists.
+     */
+    ParamList getParamList() {
+      result =
+        Synth::convertParamListFromRaw(Synth::convertFnPtrTypeToRaw(this)
+              .(Raw::FnPtrType)
+              .getParamList())
+    }
+
+    /**
+     * Holds if `getParamList()` exists.
+     */
+    final predicate hasParamList() { exists(this.getParamList()) }
+
+    /**
+     * Gets the ret type of this fn ptr type, if it exists.
+     */
+    RetType getRetType() {
+      result =
+        Synth::convertRetTypeFromRaw(Synth::convertFnPtrTypeToRaw(this)
+              .(Raw::FnPtrType)
+              .getRetType())
+    }
+
+    /**
+     * Holds if `getRetType()` exists.
+     */
+    final predicate hasRetType() { exists(this.getRetType()) }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/ForExpr.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/ForExpr.qll
new file mode 100644
index 00000000000..dc5f2d34d3e
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/ForExpr.qll
@@ -0,0 +1,101 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `ForExpr`.
+ * INTERNAL: Do not import directly.
+ */
+
+private import codeql.rust.elements.internal.generated.Synth
+private import codeql.rust.elements.internal.generated.Raw
+import codeql.rust.elements.Attr
+import codeql.rust.elements.BlockExpr
+import codeql.rust.elements.Expr
+import codeql.rust.elements.internal.ExprImpl::Impl as ExprImpl
+import codeql.rust.elements.Label
+import codeql.rust.elements.Pat
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `ForExpr` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * A ForExpr. For example:
+   * ```rust
+   * todo!()
+   * ```
+   * INTERNAL: Do not reference the `Generated::ForExpr` class directly.
+   * Use the subclass `ForExpr`, where the following predicates are available.
+   */
+  class ForExpr extends Synth::TForExpr, ExprImpl::Expr {
+    override string getAPrimaryQlClass() { result = "ForExpr" }
+
+    /**
+     * Gets the `index`th attr of this for expression (0-based).
+     */
+    Attr getAttr(int index) {
+      result =
+        Synth::convertAttrFromRaw(Synth::convertForExprToRaw(this).(Raw::ForExpr).getAttr(index))
+    }
+
+    /**
+     * Gets any of the attrs of this for expression.
+     */
+    final Attr getAnAttr() { result = this.getAttr(_) }
+
+    /**
+     * Gets the number of attrs of this for expression.
+     */
+    final int getNumberOfAttrs() { result = count(int i | exists(this.getAttr(i))) }
+
+    /**
+     * Gets the iterable of this for expression, if it exists.
+     */
+    Expr getIterable() {
+      result =
+        Synth::convertExprFromRaw(Synth::convertForExprToRaw(this).(Raw::ForExpr).getIterable())
+    }
+
+    /**
+     * Holds if `getIterable()` exists.
+     */
+    final predicate hasIterable() { exists(this.getIterable()) }
+
+    /**
+     * Gets the label of this for expression, if it exists.
+     */
+    Label getLabel() {
+      result =
+        Synth::convertLabelFromRaw(Synth::convertForExprToRaw(this).(Raw::ForExpr).getLabel())
+    }
+
+    /**
+     * Holds if `getLabel()` exists.
+     */
+    final predicate hasLabel() { exists(this.getLabel()) }
+
+    /**
+     * Gets the loop body of this for expression, if it exists.
+     */
+    BlockExpr getLoopBody() {
+      result =
+        Synth::convertBlockExprFromRaw(Synth::convertForExprToRaw(this).(Raw::ForExpr).getLoopBody())
+    }
+
+    /**
+     * Holds if `getLoopBody()` exists.
+     */
+    final predicate hasLoopBody() { exists(this.getLoopBody()) }
+
+    /**
+     * Gets the pat of this for expression, if it exists.
+     */
+    Pat getPat() {
+      result = Synth::convertPatFromRaw(Synth::convertForExprToRaw(this).(Raw::ForExpr).getPat())
+    }
+
+    /**
+     * Holds if `getPat()` exists.
+     */
+    final predicate hasPat() { exists(this.getPat()) }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/ForType.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/ForType.qll
new file mode 100644
index 00000000000..0230cd6cd44
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/ForType.qll
@@ -0,0 +1,56 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `ForType`.
+ * INTERNAL: Do not import directly.
+ */
+
+private import codeql.rust.elements.internal.generated.Synth
+private import codeql.rust.elements.internal.generated.Raw
+import codeql.rust.elements.GenericParamList
+import codeql.rust.elements.TypeRef
+import codeql.rust.elements.internal.TypeRefImpl::Impl as TypeRefImpl
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `ForType` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * A ForType. For example:
+   * ```rust
+   * todo!()
+   * ```
+   * INTERNAL: Do not reference the `Generated::ForType` class directly.
+   * Use the subclass `ForType`, where the following predicates are available.
+   */
+  class ForType extends Synth::TForType, TypeRefImpl::TypeRef {
+    override string getAPrimaryQlClass() { result = "ForType" }
+
+    /**
+     * Gets the generic parameter list of this for type, if it exists.
+     */
+    GenericParamList getGenericParamList() {
+      result =
+        Synth::convertGenericParamListFromRaw(Synth::convertForTypeToRaw(this)
+              .(Raw::ForType)
+              .getGenericParamList())
+    }
+
+    /**
+     * Holds if `getGenericParamList()` exists.
+     */
+    final predicate hasGenericParamList() { exists(this.getGenericParamList()) }
+
+    /**
+     * Gets the ty of this for type, if it exists.
+     */
+    TypeRef getTy() {
+      result = Synth::convertTypeRefFromRaw(Synth::convertForTypeToRaw(this).(Raw::ForType).getTy())
+    }
+
+    /**
+     * Holds if `getTy()` exists.
+     */
+    final predicate hasTy() { exists(this.getTy()) }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/Format.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/Format.qll
new file mode 100644
index 00000000000..f2ade708ffa
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/Format.qll
@@ -0,0 +1,38 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `Format`.
+ * INTERNAL: Do not import directly.
+ */
+
+private import codeql.rust.elements.internal.generated.Synth
+private import codeql.rust.elements.internal.generated.Raw
+import codeql.rust.elements.FormatArgsExpr
+import codeql.rust.elements.internal.LocatableImpl::Impl as LocatableImpl
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `Format` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * A format element in a formatting template. For example the `{}` in:
+   * ```rust
+   * println!("Hello {}", "world");
+   * ```
+   * INTERNAL: Do not reference the `Generated::Format` class directly.
+   * Use the subclass `Format`, where the following predicates are available.
+   */
+  class Format extends Synth::TFormat, LocatableImpl::Locatable {
+    override string getAPrimaryQlClass() { result = "Format" }
+
+    /**
+     * Gets the parent of this format.
+     */
+    FormatArgsExpr getParent() { none() }
+
+    /**
+     * Gets the index of this format.
+     */
+    int getIndex() { none() }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/FormatArgsArg.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/FormatArgsArg.qll
new file mode 100644
index 00000000000..0c78bd03f88
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/FormatArgsArg.qll
@@ -0,0 +1,59 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `FormatArgsArg`.
+ * INTERNAL: Do not import directly.
+ */
+
+private import codeql.rust.elements.internal.generated.Synth
+private import codeql.rust.elements.internal.generated.Raw
+import codeql.rust.elements.internal.AstNodeImpl::Impl as AstNodeImpl
+import codeql.rust.elements.Expr
+import codeql.rust.elements.Name
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `FormatArgsArg` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * A FormatArgsArg. For example:
+   * ```rust
+   * todo!()
+   * ```
+   * INTERNAL: Do not reference the `Generated::FormatArgsArg` class directly.
+   * Use the subclass `FormatArgsArg`, where the following predicates are available.
+   */
+  class FormatArgsArg extends Synth::TFormatArgsArg, AstNodeImpl::AstNode {
+    override string getAPrimaryQlClass() { result = "FormatArgsArg" }
+
+    /**
+     * Gets the expression of this format arguments argument, if it exists.
+     */
+    Expr getExpr() {
+      result =
+        Synth::convertExprFromRaw(Synth::convertFormatArgsArgToRaw(this)
+              .(Raw::FormatArgsArg)
+              .getExpr())
+    }
+
+    /**
+     * Holds if `getExpr()` exists.
+     */
+    final predicate hasExpr() { exists(this.getExpr()) }
+
+    /**
+     * Gets the name of this format arguments argument, if it exists.
+     */
+    Name getName() {
+      result =
+        Synth::convertNameFromRaw(Synth::convertFormatArgsArgToRaw(this)
+              .(Raw::FormatArgsArg)
+              .getName())
+    }
+
+    /**
+     * Holds if `getName()` exists.
+     */
+    final predicate hasName() { exists(this.getName()) }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/FormatArgsExpr.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/FormatArgsExpr.qll
new file mode 100644
index 00000000000..7fe088e2541
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/FormatArgsExpr.qll
@@ -0,0 +1,85 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `FormatArgsExpr`.
+ * INTERNAL: Do not import directly.
+ */
+
+private import codeql.rust.elements.internal.generated.Synth
+private import codeql.rust.elements.internal.generated.Raw
+import codeql.rust.elements.Attr
+import codeql.rust.elements.Expr
+import codeql.rust.elements.internal.ExprImpl::Impl as ExprImpl
+import codeql.rust.elements.FormatArgsArg
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `FormatArgsExpr` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * A FormatArgsExpr. For example:
+   * ```rust
+   * todo!()
+   * ```
+   * INTERNAL: Do not reference the `Generated::FormatArgsExpr` class directly.
+   * Use the subclass `FormatArgsExpr`, where the following predicates are available.
+   */
+  class FormatArgsExpr extends Synth::TFormatArgsExpr, ExprImpl::Expr {
+    override string getAPrimaryQlClass() { result = "FormatArgsExpr" }
+
+    /**
+     * Gets the `index`th argument of this format arguments expression (0-based).
+     */
+    FormatArgsArg getArg(int index) {
+      result =
+        Synth::convertFormatArgsArgFromRaw(Synth::convertFormatArgsExprToRaw(this)
+              .(Raw::FormatArgsExpr)
+              .getArg(index))
+    }
+
+    /**
+     * Gets any of the arguments of this format arguments expression.
+     */
+    final FormatArgsArg getAnArg() { result = this.getArg(_) }
+
+    /**
+     * Gets the number of arguments of this format arguments expression.
+     */
+    final int getNumberOfArgs() { result = count(int i | exists(this.getArg(i))) }
+
+    /**
+     * Gets the `index`th attr of this format arguments expression (0-based).
+     */
+    Attr getAttr(int index) {
+      result =
+        Synth::convertAttrFromRaw(Synth::convertFormatArgsExprToRaw(this)
+              .(Raw::FormatArgsExpr)
+              .getAttr(index))
+    }
+
+    /**
+     * Gets any of the attrs of this format arguments expression.
+     */
+    final Attr getAnAttr() { result = this.getAttr(_) }
+
+    /**
+     * Gets the number of attrs of this format arguments expression.
+     */
+    final int getNumberOfAttrs() { result = count(int i | exists(this.getAttr(i))) }
+
+    /**
+     * Gets the template of this format arguments expression, if it exists.
+     */
+    Expr getTemplate() {
+      result =
+        Synth::convertExprFromRaw(Synth::convertFormatArgsExprToRaw(this)
+              .(Raw::FormatArgsExpr)
+              .getTemplate())
+    }
+
+    /**
+     * Holds if `getTemplate()` exists.
+     */
+    final predicate hasTemplate() { exists(this.getTemplate()) }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/FormatArgument.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/FormatArgument.qll
new file mode 100644
index 00000000000..658d6b92e7a
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/FormatArgument.qll
@@ -0,0 +1,37 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `FormatArgument`.
+ * INTERNAL: Do not import directly.
+ */
+
+private import codeql.rust.elements.internal.generated.Synth
+private import codeql.rust.elements.internal.generated.Raw
+import codeql.rust.elements.Format
+import codeql.rust.elements.internal.LocatableImpl::Impl as LocatableImpl
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `FormatArgument` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * An argument in a format element in a formatting template. For example the `width`, `precision`, and `value` in:
+   * ```rust
+   * println!("Value {value:#width$.precision$}");
+   * ```
+   * or the `0`, `1` and `2` in:
+   * ```rust
+   * println!("Value {0:#1$.2$}", value, width, precision);
+   * ```
+   * INTERNAL: Do not reference the `Generated::FormatArgument` class directly.
+   * Use the subclass `FormatArgument`, where the following predicates are available.
+   */
+  class FormatArgument extends Synth::TFormatArgument, LocatableImpl::Locatable {
+    override string getAPrimaryQlClass() { result = "FormatArgument" }
+
+    /**
+     * Gets the parent of this format argument.
+     */
+    Format getParent() { none() }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/FormatTemplateVariableAccess.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/FormatTemplateVariableAccess.qll
new file mode 100644
index 00000000000..75e8a134f0a
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/FormatTemplateVariableAccess.qll
@@ -0,0 +1,25 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `FormatTemplateVariableAccess`.
+ * INTERNAL: Do not import directly.
+ */
+
+private import codeql.rust.elements.internal.generated.Synth
+private import codeql.rust.elements.internal.generated.Raw
+import codeql.rust.elements.internal.PathExprBaseImpl::Impl as PathExprBaseImpl
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `FormatTemplateVariableAccess` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * INTERNAL: Do not reference the `Generated::FormatTemplateVariableAccess` class directly.
+   * Use the subclass `FormatTemplateVariableAccess`, where the following predicates are available.
+   */
+  class FormatTemplateVariableAccess extends Synth::TFormatTemplateVariableAccess,
+    PathExprBaseImpl::PathExprBase
+  {
+    override string getAPrimaryQlClass() { result = "FormatTemplateVariableAccess" }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/Function.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/Function.qll
index 1432e8eb908..cc0179cb15b 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/Function.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/Function.qll
@@ -6,8 +6,17 @@
 
 private import codeql.rust.elements.internal.generated.Synth
 private import codeql.rust.elements.internal.generated.Raw
-import codeql.rust.elements.internal.DeclarationImpl::Impl as DeclarationImpl
-import codeql.rust.elements.Expr
+import codeql.rust.elements.Abi
+import codeql.rust.elements.internal.AssocItemImpl::Impl as AssocItemImpl
+import codeql.rust.elements.BlockExpr
+import codeql.rust.elements.internal.CallableImpl::Impl as CallableImpl
+import codeql.rust.elements.internal.ExternItemImpl::Impl as ExternItemImpl
+import codeql.rust.elements.GenericParamList
+import codeql.rust.elements.internal.ItemImpl::Impl as ItemImpl
+import codeql.rust.elements.Name
+import codeql.rust.elements.RetType
+import codeql.rust.elements.Visibility
+import codeql.rust.elements.WhereClause
 
 /**
  * INTERNAL: This module contains the fully generated definition of `Function` and should not
@@ -28,20 +37,130 @@ module Generated {
    * INTERNAL: Do not reference the `Generated::Function` class directly.
    * Use the subclass `Function`, where the following predicates are available.
    */
-  class Function extends Synth::TFunction, DeclarationImpl::Declaration {
+  class Function extends Synth::TFunction, AssocItemImpl::AssocItem, ExternItemImpl::ExternItem,
+    ItemImpl::Item, CallableImpl::Callable
+  {
     override string getAPrimaryQlClass() { result = "Function" }
 
     /**
-     * Gets the name of this function.
+     * Gets the abi of this function, if it exists.
      */
-    string getName() { result = Synth::convertFunctionToRaw(this).(Raw::Function).getName() }
+    Abi getAbi() {
+      result = Synth::convertAbiFromRaw(Synth::convertFunctionToRaw(this).(Raw::Function).getAbi())
+    }
 
     /**
-     * Gets the body of this function.
+     * Holds if `getAbi()` exists.
      */
-    Expr getBody() {
+    final predicate hasAbi() { exists(this.getAbi()) }
+
+    /**
+     * Gets the body of this function, if it exists.
+     */
+    BlockExpr getBody() {
       result =
-        Synth::convertExprFromRaw(Synth::convertFunctionToRaw(this).(Raw::Function).getBody())
+        Synth::convertBlockExprFromRaw(Synth::convertFunctionToRaw(this).(Raw::Function).getBody())
     }
+
+    /**
+     * Holds if `getBody()` exists.
+     */
+    final predicate hasBody() { exists(this.getBody()) }
+
+    /**
+     * Gets the generic parameter list of this function, if it exists.
+     */
+    GenericParamList getGenericParamList() {
+      result =
+        Synth::convertGenericParamListFromRaw(Synth::convertFunctionToRaw(this)
+              .(Raw::Function)
+              .getGenericParamList())
+    }
+
+    /**
+     * Holds if `getGenericParamList()` exists.
+     */
+    final predicate hasGenericParamList() { exists(this.getGenericParamList()) }
+
+    /**
+     * Holds if this function is async.
+     */
+    predicate isAsync() { Synth::convertFunctionToRaw(this).(Raw::Function).isAsync() }
+
+    /**
+     * Holds if this function is const.
+     */
+    predicate isConst() { Synth::convertFunctionToRaw(this).(Raw::Function).isConst() }
+
+    /**
+     * Holds if this function is default.
+     */
+    predicate isDefault() { Synth::convertFunctionToRaw(this).(Raw::Function).isDefault() }
+
+    /**
+     * Holds if this function is gen.
+     */
+    predicate isGen() { Synth::convertFunctionToRaw(this).(Raw::Function).isGen() }
+
+    /**
+     * Holds if this function is unsafe.
+     */
+    predicate isUnsafe() { Synth::convertFunctionToRaw(this).(Raw::Function).isUnsafe() }
+
+    /**
+     * Gets the name of this function, if it exists.
+     */
+    Name getName() {
+      result =
+        Synth::convertNameFromRaw(Synth::convertFunctionToRaw(this).(Raw::Function).getName())
+    }
+
+    /**
+     * Holds if `getName()` exists.
+     */
+    final predicate hasName() { exists(this.getName()) }
+
+    /**
+     * Gets the ret type of this function, if it exists.
+     */
+    RetType getRetType() {
+      result =
+        Synth::convertRetTypeFromRaw(Synth::convertFunctionToRaw(this).(Raw::Function).getRetType())
+    }
+
+    /**
+     * Holds if `getRetType()` exists.
+     */
+    final predicate hasRetType() { exists(this.getRetType()) }
+
+    /**
+     * Gets the visibility of this function, if it exists.
+     */
+    Visibility getVisibility() {
+      result =
+        Synth::convertVisibilityFromRaw(Synth::convertFunctionToRaw(this)
+              .(Raw::Function)
+              .getVisibility())
+    }
+
+    /**
+     * Holds if `getVisibility()` exists.
+     */
+    final predicate hasVisibility() { exists(this.getVisibility()) }
+
+    /**
+     * Gets the where clause of this function, if it exists.
+     */
+    WhereClause getWhereClause() {
+      result =
+        Synth::convertWhereClauseFromRaw(Synth::convertFunctionToRaw(this)
+              .(Raw::Function)
+              .getWhereClause())
+    }
+
+    /**
+     * Holds if `getWhereClause()` exists.
+     */
+    final predicate hasWhereClause() { exists(this.getWhereClause()) }
   }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/GenericArg.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/GenericArg.qll
new file mode 100644
index 00000000000..05227971de1
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/GenericArg.qll
@@ -0,0 +1,25 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `GenericArg`.
+ * INTERNAL: Do not import directly.
+ */
+
+private import codeql.rust.elements.internal.generated.Synth
+private import codeql.rust.elements.internal.generated.Raw
+import codeql.rust.elements.internal.AstNodeImpl::Impl as AstNodeImpl
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `GenericArg` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * A GenericArg. For example:
+   * ```rust
+   * todo!()
+   * ```
+   * INTERNAL: Do not reference the `Generated::GenericArg` class directly.
+   * Use the subclass `GenericArg`, where the following predicates are available.
+   */
+  class GenericArg extends Synth::TGenericArg, AstNodeImpl::AstNode { }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/GenericArgList.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/GenericArgList.qll
index 46ac2aecd73..ac10d591ec1 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/GenericArgList.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/GenericArgList.qll
@@ -7,7 +7,7 @@
 private import codeql.rust.elements.internal.generated.Synth
 private import codeql.rust.elements.internal.generated.Raw
 import codeql.rust.elements.internal.AstNodeImpl::Impl as AstNodeImpl
-import codeql.rust.elements.internal.UnimplementedImpl::Impl as UnimplementedImpl
+import codeql.rust.elements.GenericArg
 
 /**
  * INTERNAL: This module contains the fully generated definition of `GenericArgList` and should not
@@ -22,9 +22,27 @@ module Generated {
    * INTERNAL: Do not reference the `Generated::GenericArgList` class directly.
    * Use the subclass `GenericArgList`, where the following predicates are available.
    */
-  class GenericArgList extends Synth::TGenericArgList, AstNodeImpl::AstNode,
-    UnimplementedImpl::Unimplemented
-  {
+  class GenericArgList extends Synth::TGenericArgList, AstNodeImpl::AstNode {
     override string getAPrimaryQlClass() { result = "GenericArgList" }
+
+    /**
+     * Gets the `index`th generic argument of this generic argument list (0-based).
+     */
+    GenericArg getGenericArg(int index) {
+      result =
+        Synth::convertGenericArgFromRaw(Synth::convertGenericArgListToRaw(this)
+              .(Raw::GenericArgList)
+              .getGenericArg(index))
+    }
+
+    /**
+     * Gets any of the generic arguments of this generic argument list.
+     */
+    final GenericArg getAGenericArg() { result = this.getGenericArg(_) }
+
+    /**
+     * Gets the number of generic arguments of this generic argument list.
+     */
+    final int getNumberOfGenericArgs() { result = count(int i | exists(this.getGenericArg(i))) }
   }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/GenericParam.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/GenericParam.qll
new file mode 100644
index 00000000000..56532c2a85e
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/GenericParam.qll
@@ -0,0 +1,25 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `GenericParam`.
+ * INTERNAL: Do not import directly.
+ */
+
+private import codeql.rust.elements.internal.generated.Synth
+private import codeql.rust.elements.internal.generated.Raw
+import codeql.rust.elements.internal.AstNodeImpl::Impl as AstNodeImpl
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `GenericParam` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * A GenericParam. For example:
+   * ```rust
+   * todo!()
+   * ```
+   * INTERNAL: Do not reference the `Generated::GenericParam` class directly.
+   * Use the subclass `GenericParam`, where the following predicates are available.
+   */
+  class GenericParam extends Synth::TGenericParam, AstNodeImpl::AstNode { }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/GenericParamList.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/GenericParamList.qll
new file mode 100644
index 00000000000..3d726fa85bc
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/GenericParamList.qll
@@ -0,0 +1,48 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `GenericParamList`.
+ * INTERNAL: Do not import directly.
+ */
+
+private import codeql.rust.elements.internal.generated.Synth
+private import codeql.rust.elements.internal.generated.Raw
+import codeql.rust.elements.internal.AstNodeImpl::Impl as AstNodeImpl
+import codeql.rust.elements.GenericParam
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `GenericParamList` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * A GenericParamList. For example:
+   * ```rust
+   * todo!()
+   * ```
+   * INTERNAL: Do not reference the `Generated::GenericParamList` class directly.
+   * Use the subclass `GenericParamList`, where the following predicates are available.
+   */
+  class GenericParamList extends Synth::TGenericParamList, AstNodeImpl::AstNode {
+    override string getAPrimaryQlClass() { result = "GenericParamList" }
+
+    /**
+     * Gets the `index`th generic parameter of this generic parameter list (0-based).
+     */
+    GenericParam getGenericParam(int index) {
+      result =
+        Synth::convertGenericParamFromRaw(Synth::convertGenericParamListToRaw(this)
+              .(Raw::GenericParamList)
+              .getGenericParam(index))
+    }
+
+    /**
+     * Gets any of the generic parameters of this generic parameter list.
+     */
+    final GenericParam getAGenericParam() { result = this.getGenericParam(_) }
+
+    /**
+     * Gets the number of generic parameters of this generic parameter list.
+     */
+    final int getNumberOfGenericParams() { result = count(int i | exists(this.getGenericParam(i))) }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/IdentPat.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/IdentPat.qll
index f3e4780b30e..275272f06a0 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/IdentPat.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/IdentPat.qll
@@ -6,6 +6,8 @@
 
 private import codeql.rust.elements.internal.generated.Synth
 private import codeql.rust.elements.internal.generated.Raw
+import codeql.rust.elements.Attr
+import codeql.rust.elements.Name
 import codeql.rust.elements.Pat
 import codeql.rust.elements.internal.PatImpl::Impl as PatImpl
 
@@ -35,23 +37,56 @@ module Generated {
     override string getAPrimaryQlClass() { result = "IdentPat" }
 
     /**
-     * Gets the binding of this ident pat.
+     * Gets the `index`th attr of this ident pat (0-based).
      */
-    string getBindingId() {
-      result = Synth::convertIdentPatToRaw(this).(Raw::IdentPat).getBindingId()
-    }
-
-    /**
-     * Gets the subpat of this ident pat, if it exists.
-     */
-    Pat getSubpat() {
+    Attr getAttr(int index) {
       result =
-        Synth::convertPatFromRaw(Synth::convertIdentPatToRaw(this).(Raw::IdentPat).getSubpat())
+        Synth::convertAttrFromRaw(Synth::convertIdentPatToRaw(this).(Raw::IdentPat).getAttr(index))
     }
 
     /**
-     * Holds if `getSubpat()` exists.
+     * Gets any of the attrs of this ident pat.
      */
-    final predicate hasSubpat() { exists(this.getSubpat()) }
+    final Attr getAnAttr() { result = this.getAttr(_) }
+
+    /**
+     * Gets the number of attrs of this ident pat.
+     */
+    final int getNumberOfAttrs() { result = count(int i | exists(this.getAttr(i))) }
+
+    /**
+     * Holds if this ident pat is mut.
+     */
+    predicate isMut() { Synth::convertIdentPatToRaw(this).(Raw::IdentPat).isMut() }
+
+    /**
+     * Holds if this ident pat is reference.
+     */
+    predicate isRef() { Synth::convertIdentPatToRaw(this).(Raw::IdentPat).isRef() }
+
+    /**
+     * Gets the name of this ident pat, if it exists.
+     */
+    Name getName() {
+      result =
+        Synth::convertNameFromRaw(Synth::convertIdentPatToRaw(this).(Raw::IdentPat).getName())
+    }
+
+    /**
+     * Holds if `getName()` exists.
+     */
+    final predicate hasName() { exists(this.getName()) }
+
+    /**
+     * Gets the pat of this ident pat, if it exists.
+     */
+    Pat getPat() {
+      result = Synth::convertPatFromRaw(Synth::convertIdentPatToRaw(this).(Raw::IdentPat).getPat())
+    }
+
+    /**
+     * Holds if `getPat()` exists.
+     */
+    final predicate hasPat() { exists(this.getPat()) }
   }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/IfExpr.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/IfExpr.qll
index 979db8a4d94..57d726b6210 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/IfExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/IfExpr.qll
@@ -6,6 +6,8 @@
 
 private import codeql.rust.elements.internal.generated.Synth
 private import codeql.rust.elements.internal.generated.Raw
+import codeql.rust.elements.Attr
+import codeql.rust.elements.BlockExpr
 import codeql.rust.elements.Expr
 import codeql.rust.elements.internal.ExprImpl::Impl as ExprImpl
 
@@ -26,7 +28,7 @@ module Generated {
    *     1
    * } else {
    *     0
-   * }
+   * };
    * ```
    * INTERNAL: Do not reference the `Generated::IfExpr` class directly.
    * Use the subclass `IfExpr`, where the following predicates are available.
@@ -35,7 +37,25 @@ module Generated {
     override string getAPrimaryQlClass() { result = "IfExpr" }
 
     /**
-     * Gets the condition of this if expression.
+     * Gets the `index`th attr of this if expression (0-based).
+     */
+    Attr getAttr(int index) {
+      result =
+        Synth::convertAttrFromRaw(Synth::convertIfExprToRaw(this).(Raw::IfExpr).getAttr(index))
+    }
+
+    /**
+     * Gets any of the attrs of this if expression.
+     */
+    final Attr getAnAttr() { result = this.getAttr(_) }
+
+    /**
+     * Gets the number of attrs of this if expression.
+     */
+    final int getNumberOfAttrs() { result = count(int i | exists(this.getAttr(i))) }
+
+    /**
+     * Gets the condition of this if expression, if it exists.
      */
     Expr getCondition() {
       result =
@@ -43,11 +63,9 @@ module Generated {
     }
 
     /**
-     * Gets the then of this if expression.
+     * Holds if `getCondition()` exists.
      */
-    Expr getThen() {
-      result = Synth::convertExprFromRaw(Synth::convertIfExprToRaw(this).(Raw::IfExpr).getThen())
-    }
+    final predicate hasCondition() { exists(this.getCondition()) }
 
     /**
      * Gets the else of this if expression, if it exists.
@@ -60,5 +78,18 @@ module Generated {
      * Holds if `getElse()` exists.
      */
     final predicate hasElse() { exists(this.getElse()) }
+
+    /**
+     * Gets the then of this if expression, if it exists.
+     */
+    BlockExpr getThen() {
+      result =
+        Synth::convertBlockExprFromRaw(Synth::convertIfExprToRaw(this).(Raw::IfExpr).getThen())
+    }
+
+    /**
+     * Holds if `getThen()` exists.
+     */
+    final predicate hasThen() { exists(this.getThen()) }
   }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/Impl.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/Impl.qll
new file mode 100644
index 00000000000..14ec8ee3863
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/Impl.qll
@@ -0,0 +1,145 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `Impl`.
+ * INTERNAL: Do not import directly.
+ */
+
+private import codeql.rust.elements.internal.generated.Synth
+private import codeql.rust.elements.internal.generated.Raw
+import codeql.rust.elements.AssocItemList
+import codeql.rust.elements.Attr
+import codeql.rust.elements.GenericParamList
+import codeql.rust.elements.internal.ItemImpl::Impl as ItemImpl
+import codeql.rust.elements.TypeRef
+import codeql.rust.elements.Visibility
+import codeql.rust.elements.WhereClause
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `Impl` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * A Impl. For example:
+   * ```rust
+   * todo!()
+   * ```
+   * INTERNAL: Do not reference the `Generated::Impl` class directly.
+   * Use the subclass `Impl`, where the following predicates are available.
+   */
+  class Impl extends Synth::TImpl, ItemImpl::Item {
+    override string getAPrimaryQlClass() { result = "Impl" }
+
+    /**
+     * Gets the assoc item list of this impl, if it exists.
+     */
+    AssocItemList getAssocItemList() {
+      result =
+        Synth::convertAssocItemListFromRaw(Synth::convertImplToRaw(this)
+              .(Raw::Impl)
+              .getAssocItemList())
+    }
+
+    /**
+     * Holds if `getAssocItemList()` exists.
+     */
+    final predicate hasAssocItemList() { exists(this.getAssocItemList()) }
+
+    /**
+     * Gets the `index`th attr of this impl (0-based).
+     */
+    Attr getAttr(int index) {
+      result = Synth::convertAttrFromRaw(Synth::convertImplToRaw(this).(Raw::Impl).getAttr(index))
+    }
+
+    /**
+     * Gets any of the attrs of this impl.
+     */
+    final Attr getAnAttr() { result = this.getAttr(_) }
+
+    /**
+     * Gets the number of attrs of this impl.
+     */
+    final int getNumberOfAttrs() { result = count(int i | exists(this.getAttr(i))) }
+
+    /**
+     * Gets the generic parameter list of this impl, if it exists.
+     */
+    GenericParamList getGenericParamList() {
+      result =
+        Synth::convertGenericParamListFromRaw(Synth::convertImplToRaw(this)
+              .(Raw::Impl)
+              .getGenericParamList())
+    }
+
+    /**
+     * Holds if `getGenericParamList()` exists.
+     */
+    final predicate hasGenericParamList() { exists(this.getGenericParamList()) }
+
+    /**
+     * Holds if this impl is const.
+     */
+    predicate isConst() { Synth::convertImplToRaw(this).(Raw::Impl).isConst() }
+
+    /**
+     * Holds if this impl is default.
+     */
+    predicate isDefault() { Synth::convertImplToRaw(this).(Raw::Impl).isDefault() }
+
+    /**
+     * Holds if this impl is unsafe.
+     */
+    predicate isUnsafe() { Synth::convertImplToRaw(this).(Raw::Impl).isUnsafe() }
+
+    /**
+     * Gets the self ty of this impl, if it exists.
+     */
+    TypeRef getSelfTy() {
+      result = Synth::convertTypeRefFromRaw(Synth::convertImplToRaw(this).(Raw::Impl).getSelfTy())
+    }
+
+    /**
+     * Holds if `getSelfTy()` exists.
+     */
+    final predicate hasSelfTy() { exists(this.getSelfTy()) }
+
+    /**
+     * Gets the trait of this impl, if it exists.
+     */
+    TypeRef getTrait() {
+      result = Synth::convertTypeRefFromRaw(Synth::convertImplToRaw(this).(Raw::Impl).getTrait())
+    }
+
+    /**
+     * Holds if `getTrait()` exists.
+     */
+    final predicate hasTrait() { exists(this.getTrait()) }
+
+    /**
+     * Gets the visibility of this impl, if it exists.
+     */
+    Visibility getVisibility() {
+      result =
+        Synth::convertVisibilityFromRaw(Synth::convertImplToRaw(this).(Raw::Impl).getVisibility())
+    }
+
+    /**
+     * Holds if `getVisibility()` exists.
+     */
+    final predicate hasVisibility() { exists(this.getVisibility()) }
+
+    /**
+     * Gets the where clause of this impl, if it exists.
+     */
+    WhereClause getWhereClause() {
+      result =
+        Synth::convertWhereClauseFromRaw(Synth::convertImplToRaw(this).(Raw::Impl).getWhereClause())
+    }
+
+    /**
+     * Holds if `getWhereClause()` exists.
+     */
+    final predicate hasWhereClause() { exists(this.getWhereClause()) }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/ImplTraitType.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/ImplTraitType.qll
new file mode 100644
index 00000000000..1346e89d125
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/ImplTraitType.qll
@@ -0,0 +1,43 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `ImplTraitType`.
+ * INTERNAL: Do not import directly.
+ */
+
+private import codeql.rust.elements.internal.generated.Synth
+private import codeql.rust.elements.internal.generated.Raw
+import codeql.rust.elements.TypeBoundList
+import codeql.rust.elements.internal.TypeRefImpl::Impl as TypeRefImpl
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `ImplTraitType` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * A ImplTraitType. For example:
+   * ```rust
+   * todo!()
+   * ```
+   * INTERNAL: Do not reference the `Generated::ImplTraitType` class directly.
+   * Use the subclass `ImplTraitType`, where the following predicates are available.
+   */
+  class ImplTraitType extends Synth::TImplTraitType, TypeRefImpl::TypeRef {
+    override string getAPrimaryQlClass() { result = "ImplTraitType" }
+
+    /**
+     * Gets the type bound list of this impl trait type, if it exists.
+     */
+    TypeBoundList getTypeBoundList() {
+      result =
+        Synth::convertTypeBoundListFromRaw(Synth::convertImplTraitTypeToRaw(this)
+              .(Raw::ImplTraitType)
+              .getTypeBoundList())
+    }
+
+    /**
+     * Holds if `getTypeBoundList()` exists.
+     */
+    final predicate hasTypeBoundList() { exists(this.getTypeBoundList()) }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/IndexExpr.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/IndexExpr.qll
index f5b1ca158d4..51a9cd393e4 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/IndexExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/IndexExpr.qll
@@ -6,6 +6,7 @@
 
 private import codeql.rust.elements.internal.generated.Synth
 private import codeql.rust.elements.internal.generated.Raw
+import codeql.rust.elements.Attr
 import codeql.rust.elements.Expr
 import codeql.rust.elements.internal.ExprImpl::Impl as ExprImpl
 
@@ -27,7 +28,25 @@ module Generated {
     override string getAPrimaryQlClass() { result = "IndexExpr" }
 
     /**
-     * Gets the base of this index expression.
+     * Gets the `index`th attr of this index expression (0-based).
+     */
+    Attr getAttr(int index) {
+      result =
+        Synth::convertAttrFromRaw(Synth::convertIndexExprToRaw(this).(Raw::IndexExpr).getAttr(index))
+    }
+
+    /**
+     * Gets any of the attrs of this index expression.
+     */
+    final Attr getAnAttr() { result = this.getAttr(_) }
+
+    /**
+     * Gets the number of attrs of this index expression.
+     */
+    final int getNumberOfAttrs() { result = count(int i | exists(this.getAttr(i))) }
+
+    /**
+     * Gets the base of this index expression, if it exists.
      */
     Expr getBase() {
       result =
@@ -35,7 +54,12 @@ module Generated {
     }
 
     /**
-     * Gets the index of this index expression.
+     * Holds if `getBase()` exists.
+     */
+    final predicate hasBase() { exists(this.getBase()) }
+
+    /**
+     * Gets the index of this index expression, if it exists.
      */
     Expr getIndex() {
       result =
@@ -43,10 +67,8 @@ module Generated {
     }
 
     /**
-     * Holds if this index expression is assignee expression.
+     * Holds if `getIndex()` exists.
      */
-    predicate isAssigneeExpr() {
-      Synth::convertIndexExprToRaw(this).(Raw::IndexExpr).isAssigneeExpr()
-    }
+    final predicate hasIndex() { exists(this.getIndex()) }
   }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/InferType.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/InferType.qll
new file mode 100644
index 00000000000..09c8169a0b3
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/InferType.qll
@@ -0,0 +1,27 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `InferType`.
+ * INTERNAL: Do not import directly.
+ */
+
+private import codeql.rust.elements.internal.generated.Synth
+private import codeql.rust.elements.internal.generated.Raw
+import codeql.rust.elements.internal.TypeRefImpl::Impl as TypeRefImpl
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `InferType` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * A InferType. For example:
+   * ```rust
+   * todo!()
+   * ```
+   * INTERNAL: Do not reference the `Generated::InferType` class directly.
+   * Use the subclass `InferType`, where the following predicates are available.
+   */
+  class InferType extends Synth::TInferType, TypeRefImpl::TypeRef {
+    override string getAPrimaryQlClass() { result = "InferType" }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/Item.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/Item.qll
new file mode 100644
index 00000000000..429221c7f18
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/Item.qll
@@ -0,0 +1,57 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `Item`.
+ * INTERNAL: Do not import directly.
+ */
+
+private import codeql.rust.elements.internal.generated.Synth
+private import codeql.rust.elements.internal.generated.Raw
+import codeql.rust.elements.internal.StmtImpl::Impl as StmtImpl
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `Item` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * A Item. For example:
+   * ```rust
+   * todo!()
+   * ```
+   * INTERNAL: Do not reference the `Generated::Item` class directly.
+   * Use the subclass `Item`, where the following predicates are available.
+   */
+  class Item extends Synth::TItem, StmtImpl::Stmt {
+    /**
+     * Gets the extended canonical path of this item, if it exists.
+     *
+     * Either a canonical path (see https://doc.rust-lang.org/reference/paths.html#canonical-paths),
+     * or `{<block id>}::name` for addressable items defined in an anonymous block (and only
+     * addressable there-in).
+     * INTERNAL: Do not use.
+     */
+    string getExtendedCanonicalPath() {
+      result = Synth::convertItemToRaw(this).(Raw::Item).getExtendedCanonicalPath()
+    }
+
+    /**
+     * Holds if `getExtendedCanonicalPath()` exists.
+     * INTERNAL: Do not use.
+     */
+    final predicate hasExtendedCanonicalPath() { exists(this.getExtendedCanonicalPath()) }
+
+    /**
+     * Gets the crate origin of this item, if it exists.
+     *
+     * One of `rustc:<name>`, `repo:<repository>:<name>` or `lang:<name>`.
+     * INTERNAL: Do not use.
+     */
+    string getCrateOrigin() { result = Synth::convertItemToRaw(this).(Raw::Item).getCrateOrigin() }
+
+    /**
+     * Holds if `getCrateOrigin()` exists.
+     * INTERNAL: Do not use.
+     */
+    final predicate hasCrateOrigin() { exists(this.getCrateOrigin()) }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/ItemList.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/ItemList.qll
new file mode 100644
index 00000000000..7205dbc6bef
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/ItemList.qll
@@ -0,0 +1,65 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `ItemList`.
+ * INTERNAL: Do not import directly.
+ */
+
+private import codeql.rust.elements.internal.generated.Synth
+private import codeql.rust.elements.internal.generated.Raw
+import codeql.rust.elements.internal.AstNodeImpl::Impl as AstNodeImpl
+import codeql.rust.elements.Attr
+import codeql.rust.elements.Item
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `ItemList` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * A ItemList. For example:
+   * ```rust
+   * todo!()
+   * ```
+   * INTERNAL: Do not reference the `Generated::ItemList` class directly.
+   * Use the subclass `ItemList`, where the following predicates are available.
+   */
+  class ItemList extends Synth::TItemList, AstNodeImpl::AstNode {
+    override string getAPrimaryQlClass() { result = "ItemList" }
+
+    /**
+     * Gets the `index`th attr of this item list (0-based).
+     */
+    Attr getAttr(int index) {
+      result =
+        Synth::convertAttrFromRaw(Synth::convertItemListToRaw(this).(Raw::ItemList).getAttr(index))
+    }
+
+    /**
+     * Gets any of the attrs of this item list.
+     */
+    final Attr getAnAttr() { result = this.getAttr(_) }
+
+    /**
+     * Gets the number of attrs of this item list.
+     */
+    final int getNumberOfAttrs() { result = count(int i | exists(this.getAttr(i))) }
+
+    /**
+     * Gets the `index`th item of this item list (0-based).
+     */
+    Item getItem(int index) {
+      result =
+        Synth::convertItemFromRaw(Synth::convertItemListToRaw(this).(Raw::ItemList).getItem(index))
+    }
+
+    /**
+     * Gets any of the items of this item list.
+     */
+    final Item getAnItem() { result = this.getItem(_) }
+
+    /**
+     * Gets the number of items of this item list.
+     */
+    final int getNumberOfItems() { result = count(int i | exists(this.getItem(i))) }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/ItemStmt.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/ItemStmt.qll
deleted file mode 100644
index e6fc1d9c23c..00000000000
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/ItemStmt.qll
+++ /dev/null
@@ -1,30 +0,0 @@
-// generated by codegen, do not edit
-/**
- * This module provides the generated definition of `ItemStmt`.
- * INTERNAL: Do not import directly.
- */
-
-private import codeql.rust.elements.internal.generated.Synth
-private import codeql.rust.elements.internal.generated.Raw
-import codeql.rust.elements.internal.StmtImpl::Impl as StmtImpl
-
-/**
- * INTERNAL: This module contains the fully generated definition of `ItemStmt` and should not
- * be referenced directly.
- */
-module Generated {
-  /**
-   * An item statement. For example:
-   * ```rust
-   * fn print_hello() {
-   *     println!("Hello, world!");
-   * }
-   * print_hello();
-   * ```
-   * INTERNAL: Do not reference the `Generated::ItemStmt` class directly.
-   * Use the subclass `ItemStmt`, where the following predicates are available.
-   */
-  class ItemStmt extends Synth::TItemStmt, StmtImpl::Stmt {
-    override string getAPrimaryQlClass() { result = "ItemStmt" }
-  }
-}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/Label.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/Label.qll
index 16006d9c9bf..8cb3102efd9 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/Label.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/Label.qll
@@ -7,6 +7,7 @@
 private import codeql.rust.elements.internal.generated.Synth
 private import codeql.rust.elements.internal.generated.Raw
 import codeql.rust.elements.internal.AstNodeImpl::Impl as AstNodeImpl
+import codeql.rust.elements.Lifetime
 
 /**
  * INTERNAL: This module contains the fully generated definition of `Label` and should not
@@ -28,8 +29,16 @@ module Generated {
     override string getAPrimaryQlClass() { result = "Label" }
 
     /**
-     * Gets the name of this label.
+     * Gets the lifetime of this label, if it exists.
      */
-    string getName() { result = Synth::convertLabelToRaw(this).(Raw::Label).getName() }
+    Lifetime getLifetime() {
+      result =
+        Synth::convertLifetimeFromRaw(Synth::convertLabelToRaw(this).(Raw::Label).getLifetime())
+    }
+
+    /**
+     * Holds if `getLifetime()` exists.
+     */
+    final predicate hasLifetime() { exists(this.getLifetime()) }
   }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/LetElse.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/LetElse.qll
new file mode 100644
index 00000000000..69c89f1b3b5
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/LetElse.qll
@@ -0,0 +1,43 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `LetElse`.
+ * INTERNAL: Do not import directly.
+ */
+
+private import codeql.rust.elements.internal.generated.Synth
+private import codeql.rust.elements.internal.generated.Raw
+import codeql.rust.elements.internal.AstNodeImpl::Impl as AstNodeImpl
+import codeql.rust.elements.BlockExpr
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `LetElse` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * A LetElse. For example:
+   * ```rust
+   * todo!()
+   * ```
+   * INTERNAL: Do not reference the `Generated::LetElse` class directly.
+   * Use the subclass `LetElse`, where the following predicates are available.
+   */
+  class LetElse extends Synth::TLetElse, AstNodeImpl::AstNode {
+    override string getAPrimaryQlClass() { result = "LetElse" }
+
+    /**
+     * Gets the block expression of this let else, if it exists.
+     */
+    BlockExpr getBlockExpr() {
+      result =
+        Synth::convertBlockExprFromRaw(Synth::convertLetElseToRaw(this)
+              .(Raw::LetElse)
+              .getBlockExpr())
+    }
+
+    /**
+     * Holds if `getBlockExpr()` exists.
+     */
+    final predicate hasBlockExpr() { exists(this.getBlockExpr()) }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/LetExpr.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/LetExpr.qll
index dabdc44d01d..b53dc1c8c67 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/LetExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/LetExpr.qll
@@ -6,6 +6,7 @@
 
 private import codeql.rust.elements.internal.generated.Synth
 private import codeql.rust.elements.internal.generated.Raw
+import codeql.rust.elements.Attr
 import codeql.rust.elements.Expr
 import codeql.rust.elements.internal.ExprImpl::Impl as ExprImpl
 import codeql.rust.elements.Pat
@@ -29,17 +30,45 @@ module Generated {
     override string getAPrimaryQlClass() { result = "LetExpr" }
 
     /**
-     * Gets the pat of this let expression.
+     * Gets the `index`th attr of this let expression (0-based).
+     */
+    Attr getAttr(int index) {
+      result =
+        Synth::convertAttrFromRaw(Synth::convertLetExprToRaw(this).(Raw::LetExpr).getAttr(index))
+    }
+
+    /**
+     * Gets any of the attrs of this let expression.
+     */
+    final Attr getAnAttr() { result = this.getAttr(_) }
+
+    /**
+     * Gets the number of attrs of this let expression.
+     */
+    final int getNumberOfAttrs() { result = count(int i | exists(this.getAttr(i))) }
+
+    /**
+     * Gets the expression of this let expression, if it exists.
+     */
+    Expr getExpr() {
+      result = Synth::convertExprFromRaw(Synth::convertLetExprToRaw(this).(Raw::LetExpr).getExpr())
+    }
+
+    /**
+     * Holds if `getExpr()` exists.
+     */
+    final predicate hasExpr() { exists(this.getExpr()) }
+
+    /**
+     * Gets the pat of this let expression, if it exists.
      */
     Pat getPat() {
       result = Synth::convertPatFromRaw(Synth::convertLetExprToRaw(this).(Raw::LetExpr).getPat())
     }
 
     /**
-     * Gets the expression of this let expression.
+     * Holds if `getPat()` exists.
      */
-    Expr getExpr() {
-      result = Synth::convertExprFromRaw(Synth::convertLetExprToRaw(this).(Raw::LetExpr).getExpr())
-    }
+    final predicate hasPat() { exists(this.getPat()) }
   }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/LetStmt.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/LetStmt.qll
index 10c8a946b4e..3555636dc32 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/LetStmt.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/LetStmt.qll
@@ -6,7 +6,9 @@
 
 private import codeql.rust.elements.internal.generated.Synth
 private import codeql.rust.elements.internal.generated.Raw
+import codeql.rust.elements.Attr
 import codeql.rust.elements.Expr
+import codeql.rust.elements.LetElse
 import codeql.rust.elements.Pat
 import codeql.rust.elements.internal.StmtImpl::Impl as StmtImpl
 import codeql.rust.elements.TypeRef
@@ -35,24 +37,22 @@ module Generated {
     override string getAPrimaryQlClass() { result = "LetStmt" }
 
     /**
-     * Gets the pat of this let statement.
+     * Gets the `index`th attr of this let statement (0-based).
      */
-    Pat getPat() {
-      result = Synth::convertPatFromRaw(Synth::convertLetStmtToRaw(this).(Raw::LetStmt).getPat())
-    }
-
-    /**
-     * Gets the type of this let statement, if it exists.
-     */
-    TypeRef getType() {
+    Attr getAttr(int index) {
       result =
-        Synth::convertTypeRefFromRaw(Synth::convertLetStmtToRaw(this).(Raw::LetStmt).getType())
+        Synth::convertAttrFromRaw(Synth::convertLetStmtToRaw(this).(Raw::LetStmt).getAttr(index))
     }
 
     /**
-     * Holds if `getType()` exists.
+     * Gets any of the attrs of this let statement.
      */
-    final predicate hasType() { exists(this.getType()) }
+    final Attr getAnAttr() { result = this.getAttr(_) }
+
+    /**
+     * Gets the number of attrs of this let statement.
+     */
+    final int getNumberOfAttrs() { result = count(int i | exists(this.getAttr(i))) }
 
     /**
      * Gets the initializer of this let statement, if it exists.
@@ -68,15 +68,40 @@ module Generated {
     final predicate hasInitializer() { exists(this.getInitializer()) }
 
     /**
-     * Gets the else of this let statement, if it exists.
+     * Gets the let else of this let statement, if it exists.
      */
-    Expr getElse() {
-      result = Synth::convertExprFromRaw(Synth::convertLetStmtToRaw(this).(Raw::LetStmt).getElse())
+    LetElse getLetElse() {
+      result =
+        Synth::convertLetElseFromRaw(Synth::convertLetStmtToRaw(this).(Raw::LetStmt).getLetElse())
     }
 
     /**
-     * Holds if `getElse()` exists.
+     * Holds if `getLetElse()` exists.
      */
-    final predicate hasElse() { exists(this.getElse()) }
+    final predicate hasLetElse() { exists(this.getLetElse()) }
+
+    /**
+     * Gets the pat of this let statement, if it exists.
+     */
+    Pat getPat() {
+      result = Synth::convertPatFromRaw(Synth::convertLetStmtToRaw(this).(Raw::LetStmt).getPat())
+    }
+
+    /**
+     * Holds if `getPat()` exists.
+     */
+    final predicate hasPat() { exists(this.getPat()) }
+
+    /**
+     * Gets the ty of this let statement, if it exists.
+     */
+    TypeRef getTy() {
+      result = Synth::convertTypeRefFromRaw(Synth::convertLetStmtToRaw(this).(Raw::LetStmt).getTy())
+    }
+
+    /**
+     * Holds if `getTy()` exists.
+     */
+    final predicate hasTy() { exists(this.getTy()) }
   }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/Lifetime.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/Lifetime.qll
new file mode 100644
index 00000000000..2830b84d406
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/Lifetime.qll
@@ -0,0 +1,37 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `Lifetime`.
+ * INTERNAL: Do not import directly.
+ */
+
+private import codeql.rust.elements.internal.generated.Synth
+private import codeql.rust.elements.internal.generated.Raw
+import codeql.rust.elements.internal.AstNodeImpl::Impl as AstNodeImpl
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `Lifetime` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * A Lifetime. For example:
+   * ```rust
+   * todo!()
+   * ```
+   * INTERNAL: Do not reference the `Generated::Lifetime` class directly.
+   * Use the subclass `Lifetime`, where the following predicates are available.
+   */
+  class Lifetime extends Synth::TLifetime, AstNodeImpl::AstNode {
+    override string getAPrimaryQlClass() { result = "Lifetime" }
+
+    /**
+     * Gets the text of this lifetime, if it exists.
+     */
+    string getText() { result = Synth::convertLifetimeToRaw(this).(Raw::Lifetime).getText() }
+
+    /**
+     * Holds if `getText()` exists.
+     */
+    final predicate hasText() { exists(this.getText()) }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/LifetimeArg.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/LifetimeArg.qll
new file mode 100644
index 00000000000..38f66b06f2f
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/LifetimeArg.qll
@@ -0,0 +1,43 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `LifetimeArg`.
+ * INTERNAL: Do not import directly.
+ */
+
+private import codeql.rust.elements.internal.generated.Synth
+private import codeql.rust.elements.internal.generated.Raw
+import codeql.rust.elements.internal.GenericArgImpl::Impl as GenericArgImpl
+import codeql.rust.elements.Lifetime
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `LifetimeArg` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * A LifetimeArg. For example:
+   * ```rust
+   * todo!()
+   * ```
+   * INTERNAL: Do not reference the `Generated::LifetimeArg` class directly.
+   * Use the subclass `LifetimeArg`, where the following predicates are available.
+   */
+  class LifetimeArg extends Synth::TLifetimeArg, GenericArgImpl::GenericArg {
+    override string getAPrimaryQlClass() { result = "LifetimeArg" }
+
+    /**
+     * Gets the lifetime of this lifetime argument, if it exists.
+     */
+    Lifetime getLifetime() {
+      result =
+        Synth::convertLifetimeFromRaw(Synth::convertLifetimeArgToRaw(this)
+              .(Raw::LifetimeArg)
+              .getLifetime())
+    }
+
+    /**
+     * Holds if `getLifetime()` exists.
+     */
+    final predicate hasLifetime() { exists(this.getLifetime()) }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/LifetimeParam.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/LifetimeParam.qll
new file mode 100644
index 00000000000..7bf2d05b086
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/LifetimeParam.qll
@@ -0,0 +1,80 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `LifetimeParam`.
+ * INTERNAL: Do not import directly.
+ */
+
+private import codeql.rust.elements.internal.generated.Synth
+private import codeql.rust.elements.internal.generated.Raw
+import codeql.rust.elements.Attr
+import codeql.rust.elements.internal.GenericParamImpl::Impl as GenericParamImpl
+import codeql.rust.elements.Lifetime
+import codeql.rust.elements.TypeBoundList
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `LifetimeParam` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * A LifetimeParam. For example:
+   * ```rust
+   * todo!()
+   * ```
+   * INTERNAL: Do not reference the `Generated::LifetimeParam` class directly.
+   * Use the subclass `LifetimeParam`, where the following predicates are available.
+   */
+  class LifetimeParam extends Synth::TLifetimeParam, GenericParamImpl::GenericParam {
+    override string getAPrimaryQlClass() { result = "LifetimeParam" }
+
+    /**
+     * Gets the `index`th attr of this lifetime parameter (0-based).
+     */
+    Attr getAttr(int index) {
+      result =
+        Synth::convertAttrFromRaw(Synth::convertLifetimeParamToRaw(this)
+              .(Raw::LifetimeParam)
+              .getAttr(index))
+    }
+
+    /**
+     * Gets any of the attrs of this lifetime parameter.
+     */
+    final Attr getAnAttr() { result = this.getAttr(_) }
+
+    /**
+     * Gets the number of attrs of this lifetime parameter.
+     */
+    final int getNumberOfAttrs() { result = count(int i | exists(this.getAttr(i))) }
+
+    /**
+     * Gets the lifetime of this lifetime parameter, if it exists.
+     */
+    Lifetime getLifetime() {
+      result =
+        Synth::convertLifetimeFromRaw(Synth::convertLifetimeParamToRaw(this)
+              .(Raw::LifetimeParam)
+              .getLifetime())
+    }
+
+    /**
+     * Holds if `getLifetime()` exists.
+     */
+    final predicate hasLifetime() { exists(this.getLifetime()) }
+
+    /**
+     * Gets the type bound list of this lifetime parameter, if it exists.
+     */
+    TypeBoundList getTypeBoundList() {
+      result =
+        Synth::convertTypeBoundListFromRaw(Synth::convertLifetimeParamToRaw(this)
+              .(Raw::LifetimeParam)
+              .getTypeBoundList())
+    }
+
+    /**
+     * Holds if `getTypeBoundList()` exists.
+     */
+    final predicate hasTypeBoundList() { exists(this.getTypeBoundList()) }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/LiteralExpr.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/LiteralExpr.qll
index 2d446dd197b..57967d06538 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/LiteralExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/LiteralExpr.qll
@@ -6,6 +6,7 @@
 
 private import codeql.rust.elements.internal.generated.Synth
 private import codeql.rust.elements.internal.generated.Raw
+import codeql.rust.elements.Attr
 import codeql.rust.elements.internal.ExprImpl::Impl as ExprImpl
 
 /**
@@ -30,5 +31,37 @@ module Generated {
    */
   class LiteralExpr extends Synth::TLiteralExpr, ExprImpl::Expr {
     override string getAPrimaryQlClass() { result = "LiteralExpr" }
+
+    /**
+     * Gets the `index`th attr of this literal expression (0-based).
+     */
+    Attr getAttr(int index) {
+      result =
+        Synth::convertAttrFromRaw(Synth::convertLiteralExprToRaw(this)
+              .(Raw::LiteralExpr)
+              .getAttr(index))
+    }
+
+    /**
+     * Gets any of the attrs of this literal expression.
+     */
+    final Attr getAnAttr() { result = this.getAttr(_) }
+
+    /**
+     * Gets the number of attrs of this literal expression.
+     */
+    final int getNumberOfAttrs() { result = count(int i | exists(this.getAttr(i))) }
+
+    /**
+     * Gets the text value of this literal expression, if it exists.
+     */
+    string getTextValue() {
+      result = Synth::convertLiteralExprToRaw(this).(Raw::LiteralExpr).getTextValue()
+    }
+
+    /**
+     * Holds if `getTextValue()` exists.
+     */
+    final predicate hasTextValue() { exists(this.getTextValue()) }
   }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/LiteralPat.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/LiteralPat.qll
index 85566437ee4..84afc44e9e6 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/LiteralPat.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/LiteralPat.qll
@@ -6,7 +6,7 @@
 
 private import codeql.rust.elements.internal.generated.Synth
 private import codeql.rust.elements.internal.generated.Raw
-import codeql.rust.elements.Expr
+import codeql.rust.elements.LiteralExpr
 import codeql.rust.elements.internal.PatImpl::Impl as PatImpl
 
 /**
@@ -29,11 +29,18 @@ module Generated {
     override string getAPrimaryQlClass() { result = "LiteralPat" }
 
     /**
-     * Gets the expression of this literal pat.
+     * Gets the literal of this literal pat, if it exists.
      */
-    Expr getExpr() {
+    LiteralExpr getLiteral() {
       result =
-        Synth::convertExprFromRaw(Synth::convertLiteralPatToRaw(this).(Raw::LiteralPat).getExpr())
+        Synth::convertLiteralExprFromRaw(Synth::convertLiteralPatToRaw(this)
+              .(Raw::LiteralPat)
+              .getLiteral())
     }
+
+    /**
+     * Holds if `getLiteral()` exists.
+     */
+    final predicate hasLiteral() { exists(this.getLiteral()) }
   }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/LoopExpr.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/LoopExpr.qll
index a57ba9dea2b..eb943bf746a 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/LoopExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/LoopExpr.qll
@@ -6,7 +6,8 @@
 
 private import codeql.rust.elements.internal.generated.Synth
 private import codeql.rust.elements.internal.generated.Raw
-import codeql.rust.elements.Expr
+import codeql.rust.elements.Attr
+import codeql.rust.elements.BlockExpr
 import codeql.rust.elements.internal.ExprImpl::Impl as ExprImpl
 import codeql.rust.elements.Label
 
@@ -45,13 +46,23 @@ module Generated {
     override string getAPrimaryQlClass() { result = "LoopExpr" }
 
     /**
-     * Gets the body of this loop expression.
+     * Gets the `index`th attr of this loop expression (0-based).
      */
-    Expr getBody() {
+    Attr getAttr(int index) {
       result =
-        Synth::convertExprFromRaw(Synth::convertLoopExprToRaw(this).(Raw::LoopExpr).getBody())
+        Synth::convertAttrFromRaw(Synth::convertLoopExprToRaw(this).(Raw::LoopExpr).getAttr(index))
     }
 
+    /**
+     * Gets any of the attrs of this loop expression.
+     */
+    final Attr getAnAttr() { result = this.getAttr(_) }
+
+    /**
+     * Gets the number of attrs of this loop expression.
+     */
+    final int getNumberOfAttrs() { result = count(int i | exists(this.getAttr(i))) }
+
     /**
      * Gets the label of this loop expression, if it exists.
      */
@@ -64,5 +75,20 @@ module Generated {
      * Holds if `getLabel()` exists.
      */
     final predicate hasLabel() { exists(this.getLabel()) }
+
+    /**
+     * Gets the loop body of this loop expression, if it exists.
+     */
+    BlockExpr getLoopBody() {
+      result =
+        Synth::convertBlockExprFromRaw(Synth::convertLoopExprToRaw(this)
+              .(Raw::LoopExpr)
+              .getLoopBody())
+    }
+
+    /**
+     * Holds if `getLoopBody()` exists.
+     */
+    final predicate hasLoopBody() { exists(this.getLoopBody()) }
   }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/MacroCall.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/MacroCall.qll
new file mode 100644
index 00000000000..d95a29cd302
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/MacroCall.qll
@@ -0,0 +1,96 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `MacroCall`.
+ * INTERNAL: Do not import directly.
+ */
+
+private import codeql.rust.elements.internal.generated.Synth
+private import codeql.rust.elements.internal.generated.Raw
+import codeql.rust.elements.internal.AssocItemImpl::Impl as AssocItemImpl
+import codeql.rust.elements.AstNode
+import codeql.rust.elements.Attr
+import codeql.rust.elements.internal.ExternItemImpl::Impl as ExternItemImpl
+import codeql.rust.elements.internal.ItemImpl::Impl as ItemImpl
+import codeql.rust.elements.Path
+import codeql.rust.elements.TokenTree
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `MacroCall` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * A MacroCall. For example:
+   * ```rust
+   * todo!()
+   * ```
+   * INTERNAL: Do not reference the `Generated::MacroCall` class directly.
+   * Use the subclass `MacroCall`, where the following predicates are available.
+   */
+  class MacroCall extends Synth::TMacroCall, AssocItemImpl::AssocItem, ExternItemImpl::ExternItem,
+    ItemImpl::Item
+  {
+    override string getAPrimaryQlClass() { result = "MacroCall" }
+
+    /**
+     * Gets the `index`th attr of this macro call (0-based).
+     */
+    Attr getAttr(int index) {
+      result =
+        Synth::convertAttrFromRaw(Synth::convertMacroCallToRaw(this).(Raw::MacroCall).getAttr(index))
+    }
+
+    /**
+     * Gets any of the attrs of this macro call.
+     */
+    final Attr getAnAttr() { result = this.getAttr(_) }
+
+    /**
+     * Gets the number of attrs of this macro call.
+     */
+    final int getNumberOfAttrs() { result = count(int i | exists(this.getAttr(i))) }
+
+    /**
+     * Gets the path of this macro call, if it exists.
+     */
+    Path getPath() {
+      result =
+        Synth::convertPathFromRaw(Synth::convertMacroCallToRaw(this).(Raw::MacroCall).getPath())
+    }
+
+    /**
+     * Holds if `getPath()` exists.
+     */
+    final predicate hasPath() { exists(this.getPath()) }
+
+    /**
+     * Gets the token tree of this macro call, if it exists.
+     */
+    TokenTree getTokenTree() {
+      result =
+        Synth::convertTokenTreeFromRaw(Synth::convertMacroCallToRaw(this)
+              .(Raw::MacroCall)
+              .getTokenTree())
+    }
+
+    /**
+     * Holds if `getTokenTree()` exists.
+     */
+    final predicate hasTokenTree() { exists(this.getTokenTree()) }
+
+    /**
+     * Gets the expanded of this macro call, if it exists.
+     */
+    AstNode getExpanded() {
+      result =
+        Synth::convertAstNodeFromRaw(Synth::convertMacroCallToRaw(this)
+              .(Raw::MacroCall)
+              .getExpanded())
+    }
+
+    /**
+     * Holds if `getExpanded()` exists.
+     */
+    final predicate hasExpanded() { exists(this.getExpanded()) }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/MacroDef.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/MacroDef.qll
new file mode 100644
index 00000000000..8f4b7e0d8a4
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/MacroDef.qll
@@ -0,0 +1,103 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `MacroDef`.
+ * INTERNAL: Do not import directly.
+ */
+
+private import codeql.rust.elements.internal.generated.Synth
+private import codeql.rust.elements.internal.generated.Raw
+import codeql.rust.elements.Attr
+import codeql.rust.elements.internal.ItemImpl::Impl as ItemImpl
+import codeql.rust.elements.Name
+import codeql.rust.elements.TokenTree
+import codeql.rust.elements.Visibility
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `MacroDef` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * A MacroDef. For example:
+   * ```rust
+   * todo!()
+   * ```
+   * INTERNAL: Do not reference the `Generated::MacroDef` class directly.
+   * Use the subclass `MacroDef`, where the following predicates are available.
+   */
+  class MacroDef extends Synth::TMacroDef, ItemImpl::Item {
+    override string getAPrimaryQlClass() { result = "MacroDef" }
+
+    /**
+     * Gets the arguments of this macro def, if it exists.
+     */
+    TokenTree getArgs() {
+      result =
+        Synth::convertTokenTreeFromRaw(Synth::convertMacroDefToRaw(this).(Raw::MacroDef).getArgs())
+    }
+
+    /**
+     * Holds if `getArgs()` exists.
+     */
+    final predicate hasArgs() { exists(this.getArgs()) }
+
+    /**
+     * Gets the `index`th attr of this macro def (0-based).
+     */
+    Attr getAttr(int index) {
+      result =
+        Synth::convertAttrFromRaw(Synth::convertMacroDefToRaw(this).(Raw::MacroDef).getAttr(index))
+    }
+
+    /**
+     * Gets any of the attrs of this macro def.
+     */
+    final Attr getAnAttr() { result = this.getAttr(_) }
+
+    /**
+     * Gets the number of attrs of this macro def.
+     */
+    final int getNumberOfAttrs() { result = count(int i | exists(this.getAttr(i))) }
+
+    /**
+     * Gets the body of this macro def, if it exists.
+     */
+    TokenTree getBody() {
+      result =
+        Synth::convertTokenTreeFromRaw(Synth::convertMacroDefToRaw(this).(Raw::MacroDef).getBody())
+    }
+
+    /**
+     * Holds if `getBody()` exists.
+     */
+    final predicate hasBody() { exists(this.getBody()) }
+
+    /**
+     * Gets the name of this macro def, if it exists.
+     */
+    Name getName() {
+      result =
+        Synth::convertNameFromRaw(Synth::convertMacroDefToRaw(this).(Raw::MacroDef).getName())
+    }
+
+    /**
+     * Holds if `getName()` exists.
+     */
+    final predicate hasName() { exists(this.getName()) }
+
+    /**
+     * Gets the visibility of this macro def, if it exists.
+     */
+    Visibility getVisibility() {
+      result =
+        Synth::convertVisibilityFromRaw(Synth::convertMacroDefToRaw(this)
+              .(Raw::MacroDef)
+              .getVisibility())
+    }
+
+    /**
+     * Holds if `getVisibility()` exists.
+     */
+    final predicate hasVisibility() { exists(this.getVisibility()) }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/MacroExpr.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/MacroExpr.qll
new file mode 100644
index 00000000000..2a986228abd
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/MacroExpr.qll
@@ -0,0 +1,43 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `MacroExpr`.
+ * INTERNAL: Do not import directly.
+ */
+
+private import codeql.rust.elements.internal.generated.Synth
+private import codeql.rust.elements.internal.generated.Raw
+import codeql.rust.elements.internal.ExprImpl::Impl as ExprImpl
+import codeql.rust.elements.MacroCall
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `MacroExpr` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * A MacroExpr. For example:
+   * ```rust
+   * todo!()
+   * ```
+   * INTERNAL: Do not reference the `Generated::MacroExpr` class directly.
+   * Use the subclass `MacroExpr`, where the following predicates are available.
+   */
+  class MacroExpr extends Synth::TMacroExpr, ExprImpl::Expr {
+    override string getAPrimaryQlClass() { result = "MacroExpr" }
+
+    /**
+     * Gets the macro call of this macro expression, if it exists.
+     */
+    MacroCall getMacroCall() {
+      result =
+        Synth::convertMacroCallFromRaw(Synth::convertMacroExprToRaw(this)
+              .(Raw::MacroExpr)
+              .getMacroCall())
+    }
+
+    /**
+     * Holds if `getMacroCall()` exists.
+     */
+    final predicate hasMacroCall() { exists(this.getMacroCall()) }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/MacroItems.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/MacroItems.qll
new file mode 100644
index 00000000000..c86181ff5d5
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/MacroItems.qll
@@ -0,0 +1,50 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `MacroItems`.
+ * INTERNAL: Do not import directly.
+ */
+
+private import codeql.rust.elements.internal.generated.Synth
+private import codeql.rust.elements.internal.generated.Raw
+import codeql.rust.elements.internal.AstNodeImpl::Impl as AstNodeImpl
+import codeql.rust.elements.Item
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `MacroItems` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * A sequence of items generated by a `MacroCall`. For example:
+   * ```rust
+   * mod foo{
+   *     include!("common_definitions.rs");
+   * }
+   * ```
+   * INTERNAL: Do not reference the `Generated::MacroItems` class directly.
+   * Use the subclass `MacroItems`, where the following predicates are available.
+   */
+  class MacroItems extends Synth::TMacroItems, AstNodeImpl::AstNode {
+    override string getAPrimaryQlClass() { result = "MacroItems" }
+
+    /**
+     * Gets the `index`th item of this macro items (0-based).
+     */
+    Item getItem(int index) {
+      result =
+        Synth::convertItemFromRaw(Synth::convertMacroItemsToRaw(this)
+              .(Raw::MacroItems)
+              .getItem(index))
+    }
+
+    /**
+     * Gets any of the items of this macro items.
+     */
+    final Item getAnItem() { result = this.getItem(_) }
+
+    /**
+     * Gets the number of items of this macro items.
+     */
+    final int getNumberOfItems() { result = count(int i | exists(this.getItem(i))) }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/MacroPat.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/MacroPat.qll
new file mode 100644
index 00000000000..79a261adb09
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/MacroPat.qll
@@ -0,0 +1,43 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `MacroPat`.
+ * INTERNAL: Do not import directly.
+ */
+
+private import codeql.rust.elements.internal.generated.Synth
+private import codeql.rust.elements.internal.generated.Raw
+import codeql.rust.elements.MacroCall
+import codeql.rust.elements.internal.PatImpl::Impl as PatImpl
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `MacroPat` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * A MacroPat. For example:
+   * ```rust
+   * todo!()
+   * ```
+   * INTERNAL: Do not reference the `Generated::MacroPat` class directly.
+   * Use the subclass `MacroPat`, where the following predicates are available.
+   */
+  class MacroPat extends Synth::TMacroPat, PatImpl::Pat {
+    override string getAPrimaryQlClass() { result = "MacroPat" }
+
+    /**
+     * Gets the macro call of this macro pat, if it exists.
+     */
+    MacroCall getMacroCall() {
+      result =
+        Synth::convertMacroCallFromRaw(Synth::convertMacroPatToRaw(this)
+              .(Raw::MacroPat)
+              .getMacroCall())
+    }
+
+    /**
+     * Holds if `getMacroCall()` exists.
+     */
+    final predicate hasMacroCall() { exists(this.getMacroCall()) }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/MacroRules.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/MacroRules.qll
new file mode 100644
index 00000000000..0ca35704921
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/MacroRules.qll
@@ -0,0 +1,94 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `MacroRules`.
+ * INTERNAL: Do not import directly.
+ */
+
+private import codeql.rust.elements.internal.generated.Synth
+private import codeql.rust.elements.internal.generated.Raw
+import codeql.rust.elements.Attr
+import codeql.rust.elements.internal.ItemImpl::Impl as ItemImpl
+import codeql.rust.elements.Name
+import codeql.rust.elements.TokenTree
+import codeql.rust.elements.Visibility
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `MacroRules` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * A MacroRules. For example:
+   * ```rust
+   * todo!()
+   * ```
+   * INTERNAL: Do not reference the `Generated::MacroRules` class directly.
+   * Use the subclass `MacroRules`, where the following predicates are available.
+   */
+  class MacroRules extends Synth::TMacroRules, ItemImpl::Item {
+    override string getAPrimaryQlClass() { result = "MacroRules" }
+
+    /**
+     * Gets the `index`th attr of this macro rules (0-based).
+     */
+    Attr getAttr(int index) {
+      result =
+        Synth::convertAttrFromRaw(Synth::convertMacroRulesToRaw(this)
+              .(Raw::MacroRules)
+              .getAttr(index))
+    }
+
+    /**
+     * Gets any of the attrs of this macro rules.
+     */
+    final Attr getAnAttr() { result = this.getAttr(_) }
+
+    /**
+     * Gets the number of attrs of this macro rules.
+     */
+    final int getNumberOfAttrs() { result = count(int i | exists(this.getAttr(i))) }
+
+    /**
+     * Gets the name of this macro rules, if it exists.
+     */
+    Name getName() {
+      result =
+        Synth::convertNameFromRaw(Synth::convertMacroRulesToRaw(this).(Raw::MacroRules).getName())
+    }
+
+    /**
+     * Holds if `getName()` exists.
+     */
+    final predicate hasName() { exists(this.getName()) }
+
+    /**
+     * Gets the token tree of this macro rules, if it exists.
+     */
+    TokenTree getTokenTree() {
+      result =
+        Synth::convertTokenTreeFromRaw(Synth::convertMacroRulesToRaw(this)
+              .(Raw::MacroRules)
+              .getTokenTree())
+    }
+
+    /**
+     * Holds if `getTokenTree()` exists.
+     */
+    final predicate hasTokenTree() { exists(this.getTokenTree()) }
+
+    /**
+     * Gets the visibility of this macro rules, if it exists.
+     */
+    Visibility getVisibility() {
+      result =
+        Synth::convertVisibilityFromRaw(Synth::convertMacroRulesToRaw(this)
+              .(Raw::MacroRules)
+              .getVisibility())
+    }
+
+    /**
+     * Holds if `getVisibility()` exists.
+     */
+    final predicate hasVisibility() { exists(this.getVisibility()) }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/MacroStmts.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/MacroStmts.qll
new file mode 100644
index 00000000000..e80debcb27d
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/MacroStmts.qll
@@ -0,0 +1,64 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `MacroStmts`.
+ * INTERNAL: Do not import directly.
+ */
+
+private import codeql.rust.elements.internal.generated.Synth
+private import codeql.rust.elements.internal.generated.Raw
+import codeql.rust.elements.internal.AstNodeImpl::Impl as AstNodeImpl
+import codeql.rust.elements.Expr
+import codeql.rust.elements.Stmt
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `MacroStmts` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * A sequence of statements generated by a `MacroCall`. For example:
+   * ```rust
+   * fn main() {
+   *     println!("Hello, world!"); // This macro expands into a list of statements
+   * }
+   * ```
+   * INTERNAL: Do not reference the `Generated::MacroStmts` class directly.
+   * Use the subclass `MacroStmts`, where the following predicates are available.
+   */
+  class MacroStmts extends Synth::TMacroStmts, AstNodeImpl::AstNode {
+    override string getAPrimaryQlClass() { result = "MacroStmts" }
+
+    /**
+     * Gets the expression of this macro statements, if it exists.
+     */
+    Expr getExpr() {
+      result =
+        Synth::convertExprFromRaw(Synth::convertMacroStmtsToRaw(this).(Raw::MacroStmts).getExpr())
+    }
+
+    /**
+     * Holds if `getExpr()` exists.
+     */
+    final predicate hasExpr() { exists(this.getExpr()) }
+
+    /**
+     * Gets the `index`th statement of this macro statements (0-based).
+     */
+    Stmt getStatement(int index) {
+      result =
+        Synth::convertStmtFromRaw(Synth::convertMacroStmtsToRaw(this)
+              .(Raw::MacroStmts)
+              .getStatement(index))
+    }
+
+    /**
+     * Gets any of the statements of this macro statements.
+     */
+    final Stmt getAStatement() { result = this.getStatement(_) }
+
+    /**
+     * Gets the number of statements of this macro statements.
+     */
+    final int getNumberOfStatements() { result = count(int i | exists(this.getStatement(i))) }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/MacroType.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/MacroType.qll
new file mode 100644
index 00000000000..f2fd6ceb9eb
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/MacroType.qll
@@ -0,0 +1,43 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `MacroType`.
+ * INTERNAL: Do not import directly.
+ */
+
+private import codeql.rust.elements.internal.generated.Synth
+private import codeql.rust.elements.internal.generated.Raw
+import codeql.rust.elements.MacroCall
+import codeql.rust.elements.internal.TypeRefImpl::Impl as TypeRefImpl
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `MacroType` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * A MacroType. For example:
+   * ```rust
+   * todo!()
+   * ```
+   * INTERNAL: Do not reference the `Generated::MacroType` class directly.
+   * Use the subclass `MacroType`, where the following predicates are available.
+   */
+  class MacroType extends Synth::TMacroType, TypeRefImpl::TypeRef {
+    override string getAPrimaryQlClass() { result = "MacroType" }
+
+    /**
+     * Gets the macro call of this macro type, if it exists.
+     */
+    MacroCall getMacroCall() {
+      result =
+        Synth::convertMacroCallFromRaw(Synth::convertMacroTypeToRaw(this)
+              .(Raw::MacroType)
+              .getMacroCall())
+    }
+
+    /**
+     * Holds if `getMacroCall()` exists.
+     */
+    final predicate hasMacroCall() { exists(this.getMacroCall()) }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/MatchArm.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/MatchArm.qll
index bc69714eb4f..ae078cdfad4 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/MatchArm.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/MatchArm.qll
@@ -7,7 +7,9 @@
 private import codeql.rust.elements.internal.generated.Synth
 private import codeql.rust.elements.internal.generated.Raw
 import codeql.rust.elements.internal.AstNodeImpl::Impl as AstNodeImpl
+import codeql.rust.elements.Attr
 import codeql.rust.elements.Expr
+import codeql.rust.elements.MatchGuard
 import codeql.rust.elements.Pat
 
 /**
@@ -36,18 +38,42 @@ module Generated {
     override string getAPrimaryQlClass() { result = "MatchArm" }
 
     /**
-     * Gets the pat of this match arm.
+     * Gets the `index`th attr of this match arm (0-based).
      */
-    Pat getPat() {
-      result = Synth::convertPatFromRaw(Synth::convertMatchArmToRaw(this).(Raw::MatchArm).getPat())
+    Attr getAttr(int index) {
+      result =
+        Synth::convertAttrFromRaw(Synth::convertMatchArmToRaw(this).(Raw::MatchArm).getAttr(index))
     }
 
+    /**
+     * Gets any of the attrs of this match arm.
+     */
+    final Attr getAnAttr() { result = this.getAttr(_) }
+
+    /**
+     * Gets the number of attrs of this match arm.
+     */
+    final int getNumberOfAttrs() { result = count(int i | exists(this.getAttr(i))) }
+
+    /**
+     * Gets the expression of this match arm, if it exists.
+     */
+    Expr getExpr() {
+      result =
+        Synth::convertExprFromRaw(Synth::convertMatchArmToRaw(this).(Raw::MatchArm).getExpr())
+    }
+
+    /**
+     * Holds if `getExpr()` exists.
+     */
+    final predicate hasExpr() { exists(this.getExpr()) }
+
     /**
      * Gets the guard of this match arm, if it exists.
      */
-    Expr getGuard() {
+    MatchGuard getGuard() {
       result =
-        Synth::convertExprFromRaw(Synth::convertMatchArmToRaw(this).(Raw::MatchArm).getGuard())
+        Synth::convertMatchGuardFromRaw(Synth::convertMatchArmToRaw(this).(Raw::MatchArm).getGuard())
     }
 
     /**
@@ -56,11 +82,15 @@ module Generated {
     final predicate hasGuard() { exists(this.getGuard()) }
 
     /**
-     * Gets the expression of this match arm.
+     * Gets the pat of this match arm, if it exists.
      */
-    Expr getExpr() {
-      result =
-        Synth::convertExprFromRaw(Synth::convertMatchArmToRaw(this).(Raw::MatchArm).getExpr())
+    Pat getPat() {
+      result = Synth::convertPatFromRaw(Synth::convertMatchArmToRaw(this).(Raw::MatchArm).getPat())
     }
+
+    /**
+     * Holds if `getPat()` exists.
+     */
+    final predicate hasPat() { exists(this.getPat()) }
   }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/MatchArmList.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/MatchArmList.qll
new file mode 100644
index 00000000000..37658ce922f
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/MatchArmList.qll
@@ -0,0 +1,69 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `MatchArmList`.
+ * INTERNAL: Do not import directly.
+ */
+
+private import codeql.rust.elements.internal.generated.Synth
+private import codeql.rust.elements.internal.generated.Raw
+import codeql.rust.elements.internal.AstNodeImpl::Impl as AstNodeImpl
+import codeql.rust.elements.Attr
+import codeql.rust.elements.MatchArm
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `MatchArmList` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * A MatchArmList. For example:
+   * ```rust
+   * todo!()
+   * ```
+   * INTERNAL: Do not reference the `Generated::MatchArmList` class directly.
+   * Use the subclass `MatchArmList`, where the following predicates are available.
+   */
+  class MatchArmList extends Synth::TMatchArmList, AstNodeImpl::AstNode {
+    override string getAPrimaryQlClass() { result = "MatchArmList" }
+
+    /**
+     * Gets the `index`th arm of this match arm list (0-based).
+     */
+    MatchArm getArm(int index) {
+      result =
+        Synth::convertMatchArmFromRaw(Synth::convertMatchArmListToRaw(this)
+              .(Raw::MatchArmList)
+              .getArm(index))
+    }
+
+    /**
+     * Gets any of the arms of this match arm list.
+     */
+    final MatchArm getAnArm() { result = this.getArm(_) }
+
+    /**
+     * Gets the number of arms of this match arm list.
+     */
+    final int getNumberOfArms() { result = count(int i | exists(this.getArm(i))) }
+
+    /**
+     * Gets the `index`th attr of this match arm list (0-based).
+     */
+    Attr getAttr(int index) {
+      result =
+        Synth::convertAttrFromRaw(Synth::convertMatchArmListToRaw(this)
+              .(Raw::MatchArmList)
+              .getAttr(index))
+    }
+
+    /**
+     * Gets any of the attrs of this match arm list.
+     */
+    final Attr getAnAttr() { result = this.getAttr(_) }
+
+    /**
+     * Gets the number of attrs of this match arm list.
+     */
+    final int getNumberOfAttrs() { result = count(int i | exists(this.getAttr(i))) }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/MatchExpr.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/MatchExpr.qll
index ab2819279fc..5b48d8e1854 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/MatchExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/MatchExpr.qll
@@ -6,9 +6,10 @@
 
 private import codeql.rust.elements.internal.generated.Synth
 private import codeql.rust.elements.internal.generated.Raw
+import codeql.rust.elements.Attr
 import codeql.rust.elements.Expr
 import codeql.rust.elements.internal.ExprImpl::Impl as ExprImpl
-import codeql.rust.elements.MatchArm
+import codeql.rust.elements.MatchArmList
 
 /**
  * INTERNAL: This module contains the fully generated definition of `MatchExpr` and should not
@@ -36,7 +37,25 @@ module Generated {
     override string getAPrimaryQlClass() { result = "MatchExpr" }
 
     /**
-     * Gets the expression of this match expression.
+     * Gets the `index`th attr of this match expression (0-based).
+     */
+    Attr getAttr(int index) {
+      result =
+        Synth::convertAttrFromRaw(Synth::convertMatchExprToRaw(this).(Raw::MatchExpr).getAttr(index))
+    }
+
+    /**
+     * Gets any of the attrs of this match expression.
+     */
+    final Attr getAnAttr() { result = this.getAttr(_) }
+
+    /**
+     * Gets the number of attrs of this match expression.
+     */
+    final int getNumberOfAttrs() { result = count(int i | exists(this.getAttr(i))) }
+
+    /**
+     * Gets the expression of this match expression, if it exists.
      */
     Expr getExpr() {
       result =
@@ -44,23 +63,23 @@ module Generated {
     }
 
     /**
-     * Gets the `index`th branch of this match expression (0-based).
+     * Holds if `getExpr()` exists.
      */
-    MatchArm getBranch(int index) {
+    final predicate hasExpr() { exists(this.getExpr()) }
+
+    /**
+     * Gets the match arm list of this match expression, if it exists.
+     */
+    MatchArmList getMatchArmList() {
       result =
-        Synth::convertMatchArmFromRaw(Synth::convertMatchExprToRaw(this)
+        Synth::convertMatchArmListFromRaw(Synth::convertMatchExprToRaw(this)
               .(Raw::MatchExpr)
-              .getBranch(index))
+              .getMatchArmList())
     }
 
     /**
-     * Gets any of the branches of this match expression.
+     * Holds if `getMatchArmList()` exists.
      */
-    final MatchArm getABranch() { result = this.getBranch(_) }
-
-    /**
-     * Gets the number of branches of this match expression.
-     */
-    final int getNumberOfBranches() { result = count(int i | exists(this.getBranch(i))) }
+    final predicate hasMatchArmList() { exists(this.getMatchArmList()) }
   }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/MatchGuard.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/MatchGuard.qll
new file mode 100644
index 00000000000..193a85eaa11
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/MatchGuard.qll
@@ -0,0 +1,43 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `MatchGuard`.
+ * INTERNAL: Do not import directly.
+ */
+
+private import codeql.rust.elements.internal.generated.Synth
+private import codeql.rust.elements.internal.generated.Raw
+import codeql.rust.elements.internal.AstNodeImpl::Impl as AstNodeImpl
+import codeql.rust.elements.Expr
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `MatchGuard` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * A MatchGuard. For example:
+   * ```rust
+   * todo!()
+   * ```
+   * INTERNAL: Do not reference the `Generated::MatchGuard` class directly.
+   * Use the subclass `MatchGuard`, where the following predicates are available.
+   */
+  class MatchGuard extends Synth::TMatchGuard, AstNodeImpl::AstNode {
+    override string getAPrimaryQlClass() { result = "MatchGuard" }
+
+    /**
+     * Gets the condition of this match guard, if it exists.
+     */
+    Expr getCondition() {
+      result =
+        Synth::convertExprFromRaw(Synth::convertMatchGuardToRaw(this)
+              .(Raw::MatchGuard)
+              .getCondition())
+    }
+
+    /**
+     * Holds if `getCondition()` exists.
+     */
+    final predicate hasCondition() { exists(this.getCondition()) }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/Meta.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/Meta.qll
new file mode 100644
index 00000000000..9f4252af309
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/Meta.qll
@@ -0,0 +1,72 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `Meta`.
+ * INTERNAL: Do not import directly.
+ */
+
+private import codeql.rust.elements.internal.generated.Synth
+private import codeql.rust.elements.internal.generated.Raw
+import codeql.rust.elements.internal.AstNodeImpl::Impl as AstNodeImpl
+import codeql.rust.elements.Expr
+import codeql.rust.elements.Path
+import codeql.rust.elements.TokenTree
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `Meta` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * A Meta. For example:
+   * ```rust
+   * todo!()
+   * ```
+   * INTERNAL: Do not reference the `Generated::Meta` class directly.
+   * Use the subclass `Meta`, where the following predicates are available.
+   */
+  class Meta extends Synth::TMeta, AstNodeImpl::AstNode {
+    override string getAPrimaryQlClass() { result = "Meta" }
+
+    /**
+     * Gets the expression of this meta, if it exists.
+     */
+    Expr getExpr() {
+      result = Synth::convertExprFromRaw(Synth::convertMetaToRaw(this).(Raw::Meta).getExpr())
+    }
+
+    /**
+     * Holds if `getExpr()` exists.
+     */
+    final predicate hasExpr() { exists(this.getExpr()) }
+
+    /**
+     * Holds if this meta is unsafe.
+     */
+    predicate isUnsafe() { Synth::convertMetaToRaw(this).(Raw::Meta).isUnsafe() }
+
+    /**
+     * Gets the path of this meta, if it exists.
+     */
+    Path getPath() {
+      result = Synth::convertPathFromRaw(Synth::convertMetaToRaw(this).(Raw::Meta).getPath())
+    }
+
+    /**
+     * Holds if `getPath()` exists.
+     */
+    final predicate hasPath() { exists(this.getPath()) }
+
+    /**
+     * Gets the token tree of this meta, if it exists.
+     */
+    TokenTree getTokenTree() {
+      result =
+        Synth::convertTokenTreeFromRaw(Synth::convertMetaToRaw(this).(Raw::Meta).getTokenTree())
+    }
+
+    /**
+     * Holds if `getTokenTree()` exists.
+     */
+    final predicate hasTokenTree() { exists(this.getTokenTree()) }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/MethodCallExpr.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/MethodCallExpr.qll
index 773f1889485..dc1b32bea6c 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/MethodCallExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/MethodCallExpr.qll
@@ -6,9 +6,11 @@
 
 private import codeql.rust.elements.internal.generated.Synth
 private import codeql.rust.elements.internal.generated.Raw
+import codeql.rust.elements.internal.CallExprBaseImpl::Impl as CallExprBaseImpl
 import codeql.rust.elements.Expr
-import codeql.rust.elements.internal.ExprImpl::Impl as ExprImpl
 import codeql.rust.elements.GenericArgList
+import codeql.rust.elements.NameRef
+import codeql.rust.elements.internal.ResolvableImpl::Impl as ResolvableImpl
 
 /**
  * INTERNAL: This module contains the fully generated definition of `MethodCallExpr` and should not
@@ -24,11 +26,43 @@ module Generated {
    * INTERNAL: Do not reference the `Generated::MethodCallExpr` class directly.
    * Use the subclass `MethodCallExpr`, where the following predicates are available.
    */
-  class MethodCallExpr extends Synth::TMethodCallExpr, ExprImpl::Expr {
+  class MethodCallExpr extends Synth::TMethodCallExpr, CallExprBaseImpl::CallExprBase,
+    ResolvableImpl::Resolvable
+  {
     override string getAPrimaryQlClass() { result = "MethodCallExpr" }
 
     /**
-     * Gets the receiver of this method call expression.
+     * Gets the generic argument list of this method call expression, if it exists.
+     */
+    GenericArgList getGenericArgList() {
+      result =
+        Synth::convertGenericArgListFromRaw(Synth::convertMethodCallExprToRaw(this)
+              .(Raw::MethodCallExpr)
+              .getGenericArgList())
+    }
+
+    /**
+     * Holds if `getGenericArgList()` exists.
+     */
+    final predicate hasGenericArgList() { exists(this.getGenericArgList()) }
+
+    /**
+     * Gets the name reference of this method call expression, if it exists.
+     */
+    NameRef getNameRef() {
+      result =
+        Synth::convertNameRefFromRaw(Synth::convertMethodCallExprToRaw(this)
+              .(Raw::MethodCallExpr)
+              .getNameRef())
+    }
+
+    /**
+     * Holds if `getNameRef()` exists.
+     */
+    final predicate hasNameRef() { exists(this.getNameRef()) }
+
+    /**
+     * Gets the receiver of this method call expression, if it exists.
      */
     Expr getReceiver() {
       result =
@@ -38,45 +72,8 @@ module Generated {
     }
 
     /**
-     * Gets the method name of this method call expression.
+     * Holds if `getReceiver()` exists.
      */
-    string getMethodName() {
-      result = Synth::convertMethodCallExprToRaw(this).(Raw::MethodCallExpr).getMethodName()
-    }
-
-    /**
-     * Gets the `index`th argument of this method call expression (0-based).
-     */
-    Expr getArg(int index) {
-      result =
-        Synth::convertExprFromRaw(Synth::convertMethodCallExprToRaw(this)
-              .(Raw::MethodCallExpr)
-              .getArg(index))
-    }
-
-    /**
-     * Gets any of the arguments of this method call expression.
-     */
-    final Expr getAnArg() { result = this.getArg(_) }
-
-    /**
-     * Gets the number of arguments of this method call expression.
-     */
-    final int getNumberOfArgs() { result = count(int i | exists(this.getArg(i))) }
-
-    /**
-     * Gets the generic arguments of this method call expression, if it exists.
-     */
-    GenericArgList getGenericArgs() {
-      result =
-        Synth::convertGenericArgListFromRaw(Synth::convertMethodCallExprToRaw(this)
-              .(Raw::MethodCallExpr)
-              .getGenericArgs())
-    }
-
-    /**
-     * Holds if `getGenericArgs()` exists.
-     */
-    final predicate hasGenericArgs() { exists(this.getGenericArgs()) }
+    final predicate hasReceiver() { exists(this.getReceiver()) }
   }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/Missing.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/Missing.qll
index 90c51020d2d..9eff62a26c4 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/Missing.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/Missing.qll
@@ -18,5 +18,7 @@ module Generated {
    * INTERNAL: Do not reference the `Generated::Missing` class directly.
    * Use the subclass `Missing`, where the following predicates are available.
    */
-  class Missing extends Synth::TMissing, UnextractedImpl::Unextracted { }
+  class Missing extends Synth::TMissing, UnextractedImpl::Unextracted {
+    override string getAPrimaryQlClass() { result = "Missing" }
+  }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/MissingExpr.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/MissingExpr.qll
deleted file mode 100644
index 60de9e5c79c..00000000000
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/MissingExpr.qll
+++ /dev/null
@@ -1,29 +0,0 @@
-// generated by codegen, do not edit
-/**
- * This module provides the generated definition of `MissingExpr`.
- * INTERNAL: Do not import directly.
- */
-
-private import codeql.rust.elements.internal.generated.Synth
-private import codeql.rust.elements.internal.generated.Raw
-import codeql.rust.elements.internal.ExprImpl::Impl as ExprImpl
-import codeql.rust.elements.internal.MissingImpl::Impl as MissingImpl
-
-/**
- * INTERNAL: This module contains the fully generated definition of `MissingExpr` and should not
- * be referenced directly.
- */
-module Generated {
-  /**
-   * A missing expression, used as a placeholder for incomplete syntax.
-   *
-   * ```rust
-   * let x = non_existing_macro!();
-   * ```
-   * INTERNAL: Do not reference the `Generated::MissingExpr` class directly.
-   * Use the subclass `MissingExpr`, where the following predicates are available.
-   */
-  class MissingExpr extends Synth::TMissingExpr, ExprImpl::Expr, MissingImpl::Missing {
-    override string getAPrimaryQlClass() { result = "MissingExpr" }
-  }
-}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/MissingPat.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/MissingPat.qll
deleted file mode 100644
index 242caabed20..00000000000
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/MissingPat.qll
+++ /dev/null
@@ -1,30 +0,0 @@
-// generated by codegen, do not edit
-/**
- * This module provides the generated definition of `MissingPat`.
- * INTERNAL: Do not import directly.
- */
-
-private import codeql.rust.elements.internal.generated.Synth
-private import codeql.rust.elements.internal.generated.Raw
-import codeql.rust.elements.internal.MissingImpl::Impl as MissingImpl
-import codeql.rust.elements.internal.PatImpl::Impl as PatImpl
-
-/**
- * INTERNAL: This module contains the fully generated definition of `MissingPat` and should not
- * be referenced directly.
- */
-module Generated {
-  /**
-   * A missing pattern, used as a place holder for incomplete syntax.
-   * ```rust
-   * match Some(42) {
-   *     .. => "bad use of .. syntax",
-   * };
-   * ```
-   * INTERNAL: Do not reference the `Generated::MissingPat` class directly.
-   * Use the subclass `MissingPat`, where the following predicates are available.
-   */
-  class MissingPat extends Synth::TMissingPat, PatImpl::Pat, MissingImpl::Missing {
-    override string getAPrimaryQlClass() { result = "MissingPat" }
-  }
-}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/Module.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/Module.qll
index 016b5f72398..b4513c9ae85 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/Module.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/Module.qll
@@ -6,8 +6,11 @@
 
 private import codeql.rust.elements.internal.generated.Synth
 private import codeql.rust.elements.internal.generated.Raw
-import codeql.rust.elements.Declaration
-import codeql.rust.elements.internal.DeclarationImpl::Impl as DeclarationImpl
+import codeql.rust.elements.Attr
+import codeql.rust.elements.internal.ItemImpl::Impl as ItemImpl
+import codeql.rust.elements.ItemList
+import codeql.rust.elements.Name
+import codeql.rust.elements.Visibility
 
 /**
  * INTERNAL: This module contains the fully generated definition of `Module` and should not
@@ -27,27 +30,65 @@ module Generated {
    * INTERNAL: Do not reference the `Generated::Module` class directly.
    * Use the subclass `Module`, where the following predicates are available.
    */
-  class Module extends Synth::TModule, DeclarationImpl::Declaration {
+  class Module extends Synth::TModule, ItemImpl::Item {
     override string getAPrimaryQlClass() { result = "Module" }
 
     /**
-     * Gets the `index`th declaration of this module (0-based).
+     * Gets the `index`th attr of this module (0-based).
      */
-    Declaration getDeclaration(int index) {
+    Attr getAttr(int index) {
       result =
-        Synth::convertDeclarationFromRaw(Synth::convertModuleToRaw(this)
-              .(Raw::Module)
-              .getDeclaration(index))
+        Synth::convertAttrFromRaw(Synth::convertModuleToRaw(this).(Raw::Module).getAttr(index))
     }
 
     /**
-     * Gets any of the declarations of this module.
+     * Gets any of the attrs of this module.
      */
-    final Declaration getADeclaration() { result = this.getDeclaration(_) }
+    final Attr getAnAttr() { result = this.getAttr(_) }
 
     /**
-     * Gets the number of declarations of this module.
+     * Gets the number of attrs of this module.
      */
-    final int getNumberOfDeclarations() { result = count(int i | exists(this.getDeclaration(i))) }
+    final int getNumberOfAttrs() { result = count(int i | exists(this.getAttr(i))) }
+
+    /**
+     * Gets the item list of this module, if it exists.
+     */
+    ItemList getItemList() {
+      result =
+        Synth::convertItemListFromRaw(Synth::convertModuleToRaw(this).(Raw::Module).getItemList())
+    }
+
+    /**
+     * Holds if `getItemList()` exists.
+     */
+    final predicate hasItemList() { exists(this.getItemList()) }
+
+    /**
+     * Gets the name of this module, if it exists.
+     */
+    Name getName() {
+      result = Synth::convertNameFromRaw(Synth::convertModuleToRaw(this).(Raw::Module).getName())
+    }
+
+    /**
+     * Holds if `getName()` exists.
+     */
+    final predicate hasName() { exists(this.getName()) }
+
+    /**
+     * Gets the visibility of this module, if it exists.
+     */
+    Visibility getVisibility() {
+      result =
+        Synth::convertVisibilityFromRaw(Synth::convertModuleToRaw(this)
+              .(Raw::Module)
+              .getVisibility())
+    }
+
+    /**
+     * Holds if `getVisibility()` exists.
+     */
+    final predicate hasVisibility() { exists(this.getVisibility()) }
   }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/Name.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/Name.qll
new file mode 100644
index 00000000000..bffcfbdba6f
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/Name.qll
@@ -0,0 +1,37 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `Name`.
+ * INTERNAL: Do not import directly.
+ */
+
+private import codeql.rust.elements.internal.generated.Synth
+private import codeql.rust.elements.internal.generated.Raw
+import codeql.rust.elements.internal.AstNodeImpl::Impl as AstNodeImpl
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `Name` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * A Name. For example:
+   * ```rust
+   * todo!()
+   * ```
+   * INTERNAL: Do not reference the `Generated::Name` class directly.
+   * Use the subclass `Name`, where the following predicates are available.
+   */
+  class Name extends Synth::TName, AstNodeImpl::AstNode {
+    override string getAPrimaryQlClass() { result = "Name" }
+
+    /**
+     * Gets the text of this name, if it exists.
+     */
+    string getText() { result = Synth::convertNameToRaw(this).(Raw::Name).getText() }
+
+    /**
+     * Holds if `getText()` exists.
+     */
+    final predicate hasText() { exists(this.getText()) }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/NameRef.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/NameRef.qll
new file mode 100644
index 00000000000..ae05f5a0621
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/NameRef.qll
@@ -0,0 +1,37 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `NameRef`.
+ * INTERNAL: Do not import directly.
+ */
+
+private import codeql.rust.elements.internal.generated.Synth
+private import codeql.rust.elements.internal.generated.Raw
+import codeql.rust.elements.internal.AstNodeImpl::Impl as AstNodeImpl
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `NameRef` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * A NameRef. For example:
+   * ```rust
+   * todo!()
+   * ```
+   * INTERNAL: Do not reference the `Generated::NameRef` class directly.
+   * Use the subclass `NameRef`, where the following predicates are available.
+   */
+  class NameRef extends Synth::TNameRef, AstNodeImpl::AstNode {
+    override string getAPrimaryQlClass() { result = "NameRef" }
+
+    /**
+     * Gets the text of this name reference, if it exists.
+     */
+    string getText() { result = Synth::convertNameRefToRaw(this).(Raw::NameRef).getText() }
+
+    /**
+     * Holds if `getText()` exists.
+     */
+    final predicate hasText() { exists(this.getText()) }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/NeverType.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/NeverType.qll
new file mode 100644
index 00000000000..8bc481b5f2a
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/NeverType.qll
@@ -0,0 +1,27 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `NeverType`.
+ * INTERNAL: Do not import directly.
+ */
+
+private import codeql.rust.elements.internal.generated.Synth
+private import codeql.rust.elements.internal.generated.Raw
+import codeql.rust.elements.internal.TypeRefImpl::Impl as TypeRefImpl
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `NeverType` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * A NeverType. For example:
+   * ```rust
+   * todo!()
+   * ```
+   * INTERNAL: Do not reference the `Generated::NeverType` class directly.
+   * Use the subclass `NeverType`, where the following predicates are available.
+   */
+  class NeverType extends Synth::TNeverType, TypeRefImpl::TypeRef {
+    override string getAPrimaryQlClass() { result = "NeverType" }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/OffsetOfExpr.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/OffsetOfExpr.qll
index 1e891fd35ab..3c41c47dbdc 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/OffsetOfExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/OffsetOfExpr.qll
@@ -6,7 +6,9 @@
 
 private import codeql.rust.elements.internal.generated.Synth
 private import codeql.rust.elements.internal.generated.Raw
+import codeql.rust.elements.Attr
 import codeql.rust.elements.internal.ExprImpl::Impl as ExprImpl
+import codeql.rust.elements.NameRef
 import codeql.rust.elements.TypeRef
 
 /**
@@ -26,30 +28,58 @@ module Generated {
     override string getAPrimaryQlClass() { result = "OffsetOfExpr" }
 
     /**
-     * Gets the container of this offset of expression.
+     * Gets the `index`th attr of this offset of expression (0-based).
      */
-    TypeRef getContainer() {
+    Attr getAttr(int index) {
       result =
-        Synth::convertTypeRefFromRaw(Synth::convertOffsetOfExprToRaw(this)
+        Synth::convertAttrFromRaw(Synth::convertOffsetOfExprToRaw(this)
               .(Raw::OffsetOfExpr)
-              .getContainer())
+              .getAttr(index))
     }
 
+    /**
+     * Gets any of the attrs of this offset of expression.
+     */
+    final Attr getAnAttr() { result = this.getAttr(_) }
+
+    /**
+     * Gets the number of attrs of this offset of expression.
+     */
+    final int getNumberOfAttrs() { result = count(int i | exists(this.getAttr(i))) }
+
     /**
      * Gets the `index`th field of this offset of expression (0-based).
      */
-    string getField(int index) {
-      result = Synth::convertOffsetOfExprToRaw(this).(Raw::OffsetOfExpr).getField(index)
+    NameRef getField(int index) {
+      result =
+        Synth::convertNameRefFromRaw(Synth::convertOffsetOfExprToRaw(this)
+              .(Raw::OffsetOfExpr)
+              .getField(index))
     }
 
     /**
      * Gets any of the fields of this offset of expression.
      */
-    final string getAField() { result = this.getField(_) }
+    final NameRef getAField() { result = this.getField(_) }
 
     /**
      * Gets the number of fields of this offset of expression.
      */
     final int getNumberOfFields() { result = count(int i | exists(this.getField(i))) }
+
+    /**
+     * Gets the ty of this offset of expression, if it exists.
+     */
+    TypeRef getTy() {
+      result =
+        Synth::convertTypeRefFromRaw(Synth::convertOffsetOfExprToRaw(this)
+              .(Raw::OffsetOfExpr)
+              .getTy())
+    }
+
+    /**
+     * Holds if `getTy()` exists.
+     */
+    final predicate hasTy() { exists(this.getTy()) }
   }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/OrPat.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/OrPat.qll
index b88b9ef8a94..cfa9d9f7615 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/OrPat.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/OrPat.qll
@@ -28,20 +28,20 @@ module Generated {
     override string getAPrimaryQlClass() { result = "OrPat" }
 
     /**
-     * Gets the `index`th argument of this or pat (0-based).
+     * Gets the `index`th pat of this or pat (0-based).
      */
-    Pat getArg(int index) {
-      result = Synth::convertPatFromRaw(Synth::convertOrPatToRaw(this).(Raw::OrPat).getArg(index))
+    Pat getPat(int index) {
+      result = Synth::convertPatFromRaw(Synth::convertOrPatToRaw(this).(Raw::OrPat).getPat(index))
     }
 
     /**
-     * Gets any of the arguments of this or pat.
+     * Gets any of the pats of this or pat.
      */
-    final Pat getAnArg() { result = this.getArg(_) }
+    final Pat getAPat() { result = this.getPat(_) }
 
     /**
-     * Gets the number of arguments of this or pat.
+     * Gets the number of pats of this or pat.
      */
-    final int getNumberOfArgs() { result = count(int i | exists(this.getArg(i))) }
+    final int getNumberOfPats() { result = count(int i | exists(this.getPat(i))) }
   }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/Param.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/Param.qll
new file mode 100644
index 00000000000..1ac10da37d3
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/Param.qll
@@ -0,0 +1,71 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `Param`.
+ * INTERNAL: Do not import directly.
+ */
+
+private import codeql.rust.elements.internal.generated.Synth
+private import codeql.rust.elements.internal.generated.Raw
+import codeql.rust.elements.internal.AstNodeImpl::Impl as AstNodeImpl
+import codeql.rust.elements.Attr
+import codeql.rust.elements.Pat
+import codeql.rust.elements.TypeRef
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `Param` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * A Param. For example:
+   * ```rust
+   * todo!()
+   * ```
+   * INTERNAL: Do not reference the `Generated::Param` class directly.
+   * Use the subclass `Param`, where the following predicates are available.
+   */
+  class Param extends Synth::TParam, AstNodeImpl::AstNode {
+    override string getAPrimaryQlClass() { result = "Param" }
+
+    /**
+     * Gets the `index`th attr of this parameter (0-based).
+     */
+    Attr getAttr(int index) {
+      result = Synth::convertAttrFromRaw(Synth::convertParamToRaw(this).(Raw::Param).getAttr(index))
+    }
+
+    /**
+     * Gets any of the attrs of this parameter.
+     */
+    final Attr getAnAttr() { result = this.getAttr(_) }
+
+    /**
+     * Gets the number of attrs of this parameter.
+     */
+    final int getNumberOfAttrs() { result = count(int i | exists(this.getAttr(i))) }
+
+    /**
+     * Gets the pat of this parameter, if it exists.
+     */
+    Pat getPat() {
+      result = Synth::convertPatFromRaw(Synth::convertParamToRaw(this).(Raw::Param).getPat())
+    }
+
+    /**
+     * Holds if `getPat()` exists.
+     */
+    final predicate hasPat() { exists(this.getPat()) }
+
+    /**
+     * Gets the ty of this parameter, if it exists.
+     */
+    TypeRef getTy() {
+      result = Synth::convertTypeRefFromRaw(Synth::convertParamToRaw(this).(Raw::Param).getTy())
+    }
+
+    /**
+     * Holds if `getTy()` exists.
+     */
+    final predicate hasTy() { exists(this.getTy()) }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/ParamList.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/ParamList.qll
new file mode 100644
index 00000000000..e09cc06cdee
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/ParamList.qll
@@ -0,0 +1,64 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `ParamList`.
+ * INTERNAL: Do not import directly.
+ */
+
+private import codeql.rust.elements.internal.generated.Synth
+private import codeql.rust.elements.internal.generated.Raw
+import codeql.rust.elements.internal.AstNodeImpl::Impl as AstNodeImpl
+import codeql.rust.elements.Param
+import codeql.rust.elements.SelfParam
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `ParamList` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * A ParamList. For example:
+   * ```rust
+   * todo!()
+   * ```
+   * INTERNAL: Do not reference the `Generated::ParamList` class directly.
+   * Use the subclass `ParamList`, where the following predicates are available.
+   */
+  class ParamList extends Synth::TParamList, AstNodeImpl::AstNode {
+    override string getAPrimaryQlClass() { result = "ParamList" }
+
+    /**
+     * Gets the `index`th parameter of this parameter list (0-based).
+     */
+    Param getParam(int index) {
+      result =
+        Synth::convertParamFromRaw(Synth::convertParamListToRaw(this)
+              .(Raw::ParamList)
+              .getParam(index))
+    }
+
+    /**
+     * Gets any of the parameters of this parameter list.
+     */
+    final Param getAParam() { result = this.getParam(_) }
+
+    /**
+     * Gets the number of parameters of this parameter list.
+     */
+    final int getNumberOfParams() { result = count(int i | exists(this.getParam(i))) }
+
+    /**
+     * Gets the self parameter of this parameter list, if it exists.
+     */
+    SelfParam getSelfParam() {
+      result =
+        Synth::convertSelfParamFromRaw(Synth::convertParamListToRaw(this)
+              .(Raw::ParamList)
+              .getSelfParam())
+    }
+
+    /**
+     * Holds if `getSelfParam()` exists.
+     */
+    final predicate hasSelfParam() { exists(this.getSelfParam()) }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/ParenExpr.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/ParenExpr.qll
new file mode 100644
index 00000000000..5ad83f994ff
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/ParenExpr.qll
@@ -0,0 +1,60 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `ParenExpr`.
+ * INTERNAL: Do not import directly.
+ */
+
+private import codeql.rust.elements.internal.generated.Synth
+private import codeql.rust.elements.internal.generated.Raw
+import codeql.rust.elements.Attr
+import codeql.rust.elements.Expr
+import codeql.rust.elements.internal.ExprImpl::Impl as ExprImpl
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `ParenExpr` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * A ParenExpr. For example:
+   * ```rust
+   * todo!()
+   * ```
+   * INTERNAL: Do not reference the `Generated::ParenExpr` class directly.
+   * Use the subclass `ParenExpr`, where the following predicates are available.
+   */
+  class ParenExpr extends Synth::TParenExpr, ExprImpl::Expr {
+    override string getAPrimaryQlClass() { result = "ParenExpr" }
+
+    /**
+     * Gets the `index`th attr of this paren expression (0-based).
+     */
+    Attr getAttr(int index) {
+      result =
+        Synth::convertAttrFromRaw(Synth::convertParenExprToRaw(this).(Raw::ParenExpr).getAttr(index))
+    }
+
+    /**
+     * Gets any of the attrs of this paren expression.
+     */
+    final Attr getAnAttr() { result = this.getAttr(_) }
+
+    /**
+     * Gets the number of attrs of this paren expression.
+     */
+    final int getNumberOfAttrs() { result = count(int i | exists(this.getAttr(i))) }
+
+    /**
+     * Gets the expression of this paren expression, if it exists.
+     */
+    Expr getExpr() {
+      result =
+        Synth::convertExprFromRaw(Synth::convertParenExprToRaw(this).(Raw::ParenExpr).getExpr())
+    }
+
+    /**
+     * Holds if `getExpr()` exists.
+     */
+    final predicate hasExpr() { exists(this.getExpr()) }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/ParenPat.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/ParenPat.qll
new file mode 100644
index 00000000000..411362dde2b
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/ParenPat.qll
@@ -0,0 +1,40 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `ParenPat`.
+ * INTERNAL: Do not import directly.
+ */
+
+private import codeql.rust.elements.internal.generated.Synth
+private import codeql.rust.elements.internal.generated.Raw
+import codeql.rust.elements.Pat
+import codeql.rust.elements.internal.PatImpl::Impl as PatImpl
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `ParenPat` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * A ParenPat. For example:
+   * ```rust
+   * todo!()
+   * ```
+   * INTERNAL: Do not reference the `Generated::ParenPat` class directly.
+   * Use the subclass `ParenPat`, where the following predicates are available.
+   */
+  class ParenPat extends Synth::TParenPat, PatImpl::Pat {
+    override string getAPrimaryQlClass() { result = "ParenPat" }
+
+    /**
+     * Gets the pat of this paren pat, if it exists.
+     */
+    Pat getPat() {
+      result = Synth::convertPatFromRaw(Synth::convertParenPatToRaw(this).(Raw::ParenPat).getPat())
+    }
+
+    /**
+     * Holds if `getPat()` exists.
+     */
+    final predicate hasPat() { exists(this.getPat()) }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/ParenType.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/ParenType.qll
new file mode 100644
index 00000000000..abc547266e9
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/ParenType.qll
@@ -0,0 +1,41 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `ParenType`.
+ * INTERNAL: Do not import directly.
+ */
+
+private import codeql.rust.elements.internal.generated.Synth
+private import codeql.rust.elements.internal.generated.Raw
+import codeql.rust.elements.TypeRef
+import codeql.rust.elements.internal.TypeRefImpl::Impl as TypeRefImpl
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `ParenType` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * A ParenType. For example:
+   * ```rust
+   * todo!()
+   * ```
+   * INTERNAL: Do not reference the `Generated::ParenType` class directly.
+   * Use the subclass `ParenType`, where the following predicates are available.
+   */
+  class ParenType extends Synth::TParenType, TypeRefImpl::TypeRef {
+    override string getAPrimaryQlClass() { result = "ParenType" }
+
+    /**
+     * Gets the ty of this paren type, if it exists.
+     */
+    TypeRef getTy() {
+      result =
+        Synth::convertTypeRefFromRaw(Synth::convertParenTypeToRaw(this).(Raw::ParenType).getTy())
+    }
+
+    /**
+     * Holds if `getTy()` exists.
+     */
+    final predicate hasTy() { exists(this.getTy()) }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/ParentChild.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/ParentChild.qll
index 53d573b1f95..470207683ae 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/ParentChild.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/ParentChild.qll
@@ -51,6 +51,34 @@ private module Impl {
     )
   }
 
+  private Element getImmediateChildOfFormat(Format e, int index, string partialPredicateCall) {
+    exists(int b, int bLocatable, int n |
+      b = 0 and
+      bLocatable = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfLocatable(e, i, _)) | i) and
+      n = bLocatable and
+      (
+        none()
+        or
+        result = getImmediateChildOfLocatable(e, index - b, partialPredicateCall)
+      )
+    )
+  }
+
+  private Element getImmediateChildOfFormatArgument(
+    FormatArgument e, int index, string partialPredicateCall
+  ) {
+    exists(int b, int bLocatable, int n |
+      b = 0 and
+      bLocatable = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfLocatable(e, i, _)) | i) and
+      n = bLocatable and
+      (
+        none()
+        or
+        result = getImmediateChildOfLocatable(e, index - b, partialPredicateCall)
+      )
+    )
+  }
+
   private Element getImmediateChildOfMissing(Missing e, int index, string partialPredicateCall) {
     exists(int b, int bUnextracted, int n |
       b = 0 and
@@ -81,9 +109,7 @@ private module Impl {
     )
   }
 
-  private Element getImmediateChildOfDeclaration(
-    Declaration e, int index, string partialPredicateCall
-  ) {
+  private Element getImmediateChildOfAbi(Abi e, int index, string partialPredicateCall) {
     exists(int b, int bAstNode, int n |
       b = 0 and
       bAstNode = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfAstNode(e, i, _)) | i) and
@@ -96,6 +122,115 @@ private module Impl {
     )
   }
 
+  private Element getImmediateChildOfArgList(ArgList e, int index, string partialPredicateCall) {
+    exists(int b, int bAstNode, int n, int nArg |
+      b = 0 and
+      bAstNode = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfAstNode(e, i, _)) | i) and
+      n = bAstNode and
+      nArg = n + 1 + max(int i | i = -1 or exists(e.getArg(i)) | i) and
+      (
+        none()
+        or
+        result = getImmediateChildOfAstNode(e, index - b, partialPredicateCall)
+        or
+        result = e.getArg(index - n) and
+        partialPredicateCall = "Arg(" + (index - n).toString() + ")"
+      )
+    )
+  }
+
+  private Element getImmediateChildOfAssocItem(AssocItem e, int index, string partialPredicateCall) {
+    exists(int b, int bAstNode, int n |
+      b = 0 and
+      bAstNode = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfAstNode(e, i, _)) | i) and
+      n = bAstNode and
+      (
+        none()
+        or
+        result = getImmediateChildOfAstNode(e, index - b, partialPredicateCall)
+      )
+    )
+  }
+
+  private Element getImmediateChildOfAssocItemList(
+    AssocItemList e, int index, string partialPredicateCall
+  ) {
+    exists(int b, int bAstNode, int n, int nAssocItem, int nAttr |
+      b = 0 and
+      bAstNode = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfAstNode(e, i, _)) | i) and
+      n = bAstNode and
+      nAssocItem = n + 1 + max(int i | i = -1 or exists(e.getAssocItem(i)) | i) and
+      nAttr = nAssocItem + 1 + max(int i | i = -1 or exists(e.getAttr(i)) | i) and
+      (
+        none()
+        or
+        result = getImmediateChildOfAstNode(e, index - b, partialPredicateCall)
+        or
+        result = e.getAssocItem(index - n) and
+        partialPredicateCall = "AssocItem(" + (index - n).toString() + ")"
+        or
+        result = e.getAttr(index - nAssocItem) and
+        partialPredicateCall = "Attr(" + (index - nAssocItem).toString() + ")"
+      )
+    )
+  }
+
+  private Element getImmediateChildOfAttr(Attr e, int index, string partialPredicateCall) {
+    exists(int b, int bAstNode, int n, int nMeta |
+      b = 0 and
+      bAstNode = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfAstNode(e, i, _)) | i) and
+      n = bAstNode and
+      nMeta = n + 1 and
+      (
+        none()
+        or
+        result = getImmediateChildOfAstNode(e, index - b, partialPredicateCall)
+        or
+        index = n and result = e.getMeta() and partialPredicateCall = "Meta()"
+      )
+    )
+  }
+
+  private Element getImmediateChildOfCallable(Callable e, int index, string partialPredicateCall) {
+    exists(int b, int bAstNode, int n, int nParamList, int nAttr |
+      b = 0 and
+      bAstNode = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfAstNode(e, i, _)) | i) and
+      n = bAstNode and
+      nParamList = n + 1 and
+      nAttr = nParamList + 1 + max(int i | i = -1 or exists(e.getAttr(i)) | i) and
+      (
+        none()
+        or
+        result = getImmediateChildOfAstNode(e, index - b, partialPredicateCall)
+        or
+        index = n and result = e.getParamList() and partialPredicateCall = "ParamList()"
+        or
+        result = e.getAttr(index - nParamList) and
+        partialPredicateCall = "Attr(" + (index - nParamList).toString() + ")"
+      )
+    )
+  }
+
+  private Element getImmediateChildOfClosureBinder(
+    ClosureBinder e, int index, string partialPredicateCall
+  ) {
+    exists(int b, int bAstNode, int n, int nGenericParamList |
+      b = 0 and
+      bAstNode = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfAstNode(e, i, _)) | i) and
+      n = bAstNode and
+      nGenericParamList = n + 1 and
+      (
+        none()
+        or
+        result = getImmediateChildOfAstNode(e, index - b, partialPredicateCall)
+        or
+        index = n and
+        result = e.getGenericParamList() and
+        partialPredicateCall = "GenericParamList()"
+      )
+    )
+  }
+
   private Element getImmediateChildOfExpr(Expr e, int index, string partialPredicateCall) {
     exists(int b, int bAstNode, int n |
       b = 0 and
@@ -109,26 +244,7 @@ private module Impl {
     )
   }
 
-  private Element getImmediateChildOfGenericArgList(
-    GenericArgList e, int index, string partialPredicateCall
-  ) {
-    exists(int b, int bAstNode, int bUnimplemented, int n |
-      b = 0 and
-      bAstNode = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfAstNode(e, i, _)) | i) and
-      bUnimplemented =
-        bAstNode + 1 + max(int i | i = -1 or exists(getImmediateChildOfUnimplemented(e, i, _)) | i) and
-      n = bUnimplemented and
-      (
-        none()
-        or
-        result = getImmediateChildOfAstNode(e, index - b, partialPredicateCall)
-        or
-        result = getImmediateChildOfUnimplemented(e, index - bAstNode, partialPredicateCall)
-      )
-    )
-  }
-
-  private Element getImmediateChildOfLabel(Label e, int index, string partialPredicateCall) {
+  private Element getImmediateChildOfExternItem(ExternItem e, int index, string partialPredicateCall) {
     exists(int b, int bAstNode, int n |
       b = 0 and
       bAstNode = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfAstNode(e, i, _)) | i) and
@@ -141,24 +257,384 @@ private module Impl {
     )
   }
 
-  private Element getImmediateChildOfMatchArm(MatchArm e, int index, string partialPredicateCall) {
-    exists(int b, int bAstNode, int n, int nPat, int nGuard, int nExpr |
+  private Element getImmediateChildOfExternItemList(
+    ExternItemList e, int index, string partialPredicateCall
+  ) {
+    exists(int b, int bAstNode, int n, int nAttr, int nExternItem |
       b = 0 and
       bAstNode = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfAstNode(e, i, _)) | i) and
       n = bAstNode and
-      nPat = n + 1 and
-      nGuard = nPat + 1 and
-      nExpr = nGuard + 1 and
+      nAttr = n + 1 + max(int i | i = -1 or exists(e.getAttr(i)) | i) and
+      nExternItem = nAttr + 1 + max(int i | i = -1 or exists(e.getExternItem(i)) | i) and
       (
         none()
         or
         result = getImmediateChildOfAstNode(e, index - b, partialPredicateCall)
         or
-        index = n and result = e.getPat() and partialPredicateCall = "Pat()"
+        result = e.getAttr(index - n) and
+        partialPredicateCall = "Attr(" + (index - n).toString() + ")"
         or
-        index = nPat and result = e.getGuard() and partialPredicateCall = "Guard()"
+        result = e.getExternItem(index - nAttr) and
+        partialPredicateCall = "ExternItem(" + (index - nAttr).toString() + ")"
+      )
+    )
+  }
+
+  private Element getImmediateChildOfFieldList(FieldList e, int index, string partialPredicateCall) {
+    exists(int b, int bAstNode, int n |
+      b = 0 and
+      bAstNode = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfAstNode(e, i, _)) | i) and
+      n = bAstNode and
+      (
+        none()
         or
-        index = nGuard and result = e.getExpr() and partialPredicateCall = "Expr()"
+        result = getImmediateChildOfAstNode(e, index - b, partialPredicateCall)
+      )
+    )
+  }
+
+  private Element getImmediateChildOfFormatArgsArg(
+    FormatArgsArg e, int index, string partialPredicateCall
+  ) {
+    exists(int b, int bAstNode, int n, int nExpr, int nName |
+      b = 0 and
+      bAstNode = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfAstNode(e, i, _)) | i) and
+      n = bAstNode and
+      nExpr = n + 1 and
+      nName = nExpr + 1 and
+      (
+        none()
+        or
+        result = getImmediateChildOfAstNode(e, index - b, partialPredicateCall)
+        or
+        index = n and result = e.getExpr() and partialPredicateCall = "Expr()"
+        or
+        index = nExpr and result = e.getName() and partialPredicateCall = "Name()"
+      )
+    )
+  }
+
+  private Element getImmediateChildOfGenericArg(GenericArg e, int index, string partialPredicateCall) {
+    exists(int b, int bAstNode, int n |
+      b = 0 and
+      bAstNode = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfAstNode(e, i, _)) | i) and
+      n = bAstNode and
+      (
+        none()
+        or
+        result = getImmediateChildOfAstNode(e, index - b, partialPredicateCall)
+      )
+    )
+  }
+
+  private Element getImmediateChildOfGenericArgList(
+    GenericArgList e, int index, string partialPredicateCall
+  ) {
+    exists(int b, int bAstNode, int n, int nGenericArg |
+      b = 0 and
+      bAstNode = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfAstNode(e, i, _)) | i) and
+      n = bAstNode and
+      nGenericArg = n + 1 + max(int i | i = -1 or exists(e.getGenericArg(i)) | i) and
+      (
+        none()
+        or
+        result = getImmediateChildOfAstNode(e, index - b, partialPredicateCall)
+        or
+        result = e.getGenericArg(index - n) and
+        partialPredicateCall = "GenericArg(" + (index - n).toString() + ")"
+      )
+    )
+  }
+
+  private Element getImmediateChildOfGenericParam(
+    GenericParam e, int index, string partialPredicateCall
+  ) {
+    exists(int b, int bAstNode, int n |
+      b = 0 and
+      bAstNode = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfAstNode(e, i, _)) | i) and
+      n = bAstNode and
+      (
+        none()
+        or
+        result = getImmediateChildOfAstNode(e, index - b, partialPredicateCall)
+      )
+    )
+  }
+
+  private Element getImmediateChildOfGenericParamList(
+    GenericParamList e, int index, string partialPredicateCall
+  ) {
+    exists(int b, int bAstNode, int n, int nGenericParam |
+      b = 0 and
+      bAstNode = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfAstNode(e, i, _)) | i) and
+      n = bAstNode and
+      nGenericParam = n + 1 + max(int i | i = -1 or exists(e.getGenericParam(i)) | i) and
+      (
+        none()
+        or
+        result = getImmediateChildOfAstNode(e, index - b, partialPredicateCall)
+        or
+        result = e.getGenericParam(index - n) and
+        partialPredicateCall = "GenericParam(" + (index - n).toString() + ")"
+      )
+    )
+  }
+
+  private Element getImmediateChildOfItemList(ItemList e, int index, string partialPredicateCall) {
+    exists(int b, int bAstNode, int n, int nAttr, int nItem |
+      b = 0 and
+      bAstNode = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfAstNode(e, i, _)) | i) and
+      n = bAstNode and
+      nAttr = n + 1 + max(int i | i = -1 or exists(e.getAttr(i)) | i) and
+      nItem = nAttr + 1 + max(int i | i = -1 or exists(e.getItem(i)) | i) and
+      (
+        none()
+        or
+        result = getImmediateChildOfAstNode(e, index - b, partialPredicateCall)
+        or
+        result = e.getAttr(index - n) and
+        partialPredicateCall = "Attr(" + (index - n).toString() + ")"
+        or
+        result = e.getItem(index - nAttr) and
+        partialPredicateCall = "Item(" + (index - nAttr).toString() + ")"
+      )
+    )
+  }
+
+  private Element getImmediateChildOfLabel(Label e, int index, string partialPredicateCall) {
+    exists(int b, int bAstNode, int n, int nLifetime |
+      b = 0 and
+      bAstNode = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfAstNode(e, i, _)) | i) and
+      n = bAstNode and
+      nLifetime = n + 1 and
+      (
+        none()
+        or
+        result = getImmediateChildOfAstNode(e, index - b, partialPredicateCall)
+        or
+        index = n and result = e.getLifetime() and partialPredicateCall = "Lifetime()"
+      )
+    )
+  }
+
+  private Element getImmediateChildOfLetElse(LetElse e, int index, string partialPredicateCall) {
+    exists(int b, int bAstNode, int n, int nBlockExpr |
+      b = 0 and
+      bAstNode = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfAstNode(e, i, _)) | i) and
+      n = bAstNode and
+      nBlockExpr = n + 1 and
+      (
+        none()
+        or
+        result = getImmediateChildOfAstNode(e, index - b, partialPredicateCall)
+        or
+        index = n and result = e.getBlockExpr() and partialPredicateCall = "BlockExpr()"
+      )
+    )
+  }
+
+  private Element getImmediateChildOfLifetime(Lifetime e, int index, string partialPredicateCall) {
+    exists(int b, int bAstNode, int n |
+      b = 0 and
+      bAstNode = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfAstNode(e, i, _)) | i) and
+      n = bAstNode and
+      (
+        none()
+        or
+        result = getImmediateChildOfAstNode(e, index - b, partialPredicateCall)
+      )
+    )
+  }
+
+  private Element getImmediateChildOfMacroItems(MacroItems e, int index, string partialPredicateCall) {
+    exists(int b, int bAstNode, int n, int nItem |
+      b = 0 and
+      bAstNode = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfAstNode(e, i, _)) | i) and
+      n = bAstNode and
+      nItem = n + 1 + max(int i | i = -1 or exists(e.getItem(i)) | i) and
+      (
+        none()
+        or
+        result = getImmediateChildOfAstNode(e, index - b, partialPredicateCall)
+        or
+        result = e.getItem(index - n) and
+        partialPredicateCall = "Item(" + (index - n).toString() + ")"
+      )
+    )
+  }
+
+  private Element getImmediateChildOfMacroStmts(MacroStmts e, int index, string partialPredicateCall) {
+    exists(int b, int bAstNode, int n, int nExpr, int nStatement |
+      b = 0 and
+      bAstNode = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfAstNode(e, i, _)) | i) and
+      n = bAstNode and
+      nExpr = n + 1 and
+      nStatement = nExpr + 1 + max(int i | i = -1 or exists(e.getStatement(i)) | i) and
+      (
+        none()
+        or
+        result = getImmediateChildOfAstNode(e, index - b, partialPredicateCall)
+        or
+        index = n and result = e.getExpr() and partialPredicateCall = "Expr()"
+        or
+        result = e.getStatement(index - nExpr) and
+        partialPredicateCall = "Statement(" + (index - nExpr).toString() + ")"
+      )
+    )
+  }
+
+  private Element getImmediateChildOfMatchArm(MatchArm e, int index, string partialPredicateCall) {
+    exists(int b, int bAstNode, int n, int nAttr, int nExpr, int nGuard, int nPat |
+      b = 0 and
+      bAstNode = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfAstNode(e, i, _)) | i) and
+      n = bAstNode and
+      nAttr = n + 1 + max(int i | i = -1 or exists(e.getAttr(i)) | i) and
+      nExpr = nAttr + 1 and
+      nGuard = nExpr + 1 and
+      nPat = nGuard + 1 and
+      (
+        none()
+        or
+        result = getImmediateChildOfAstNode(e, index - b, partialPredicateCall)
+        or
+        result = e.getAttr(index - n) and
+        partialPredicateCall = "Attr(" + (index - n).toString() + ")"
+        or
+        index = nAttr and result = e.getExpr() and partialPredicateCall = "Expr()"
+        or
+        index = nExpr and result = e.getGuard() and partialPredicateCall = "Guard()"
+        or
+        index = nGuard and result = e.getPat() and partialPredicateCall = "Pat()"
+      )
+    )
+  }
+
+  private Element getImmediateChildOfMatchArmList(
+    MatchArmList e, int index, string partialPredicateCall
+  ) {
+    exists(int b, int bAstNode, int n, int nArm, int nAttr |
+      b = 0 and
+      bAstNode = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfAstNode(e, i, _)) | i) and
+      n = bAstNode and
+      nArm = n + 1 + max(int i | i = -1 or exists(e.getArm(i)) | i) and
+      nAttr = nArm + 1 + max(int i | i = -1 or exists(e.getAttr(i)) | i) and
+      (
+        none()
+        or
+        result = getImmediateChildOfAstNode(e, index - b, partialPredicateCall)
+        or
+        result = e.getArm(index - n) and
+        partialPredicateCall = "Arm(" + (index - n).toString() + ")"
+        or
+        result = e.getAttr(index - nArm) and
+        partialPredicateCall = "Attr(" + (index - nArm).toString() + ")"
+      )
+    )
+  }
+
+  private Element getImmediateChildOfMatchGuard(MatchGuard e, int index, string partialPredicateCall) {
+    exists(int b, int bAstNode, int n, int nCondition |
+      b = 0 and
+      bAstNode = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfAstNode(e, i, _)) | i) and
+      n = bAstNode and
+      nCondition = n + 1 and
+      (
+        none()
+        or
+        result = getImmediateChildOfAstNode(e, index - b, partialPredicateCall)
+        or
+        index = n and result = e.getCondition() and partialPredicateCall = "Condition()"
+      )
+    )
+  }
+
+  private Element getImmediateChildOfMeta(Meta e, int index, string partialPredicateCall) {
+    exists(int b, int bAstNode, int n, int nExpr, int nPath, int nTokenTree |
+      b = 0 and
+      bAstNode = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfAstNode(e, i, _)) | i) and
+      n = bAstNode and
+      nExpr = n + 1 and
+      nPath = nExpr + 1 and
+      nTokenTree = nPath + 1 and
+      (
+        none()
+        or
+        result = getImmediateChildOfAstNode(e, index - b, partialPredicateCall)
+        or
+        index = n and result = e.getExpr() and partialPredicateCall = "Expr()"
+        or
+        index = nExpr and result = e.getPath() and partialPredicateCall = "Path()"
+        or
+        index = nPath and result = e.getTokenTree() and partialPredicateCall = "TokenTree()"
+      )
+    )
+  }
+
+  private Element getImmediateChildOfName(Name e, int index, string partialPredicateCall) {
+    exists(int b, int bAstNode, int n |
+      b = 0 and
+      bAstNode = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfAstNode(e, i, _)) | i) and
+      n = bAstNode and
+      (
+        none()
+        or
+        result = getImmediateChildOfAstNode(e, index - b, partialPredicateCall)
+      )
+    )
+  }
+
+  private Element getImmediateChildOfNameRef(NameRef e, int index, string partialPredicateCall) {
+    exists(int b, int bAstNode, int n |
+      b = 0 and
+      bAstNode = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfAstNode(e, i, _)) | i) and
+      n = bAstNode and
+      (
+        none()
+        or
+        result = getImmediateChildOfAstNode(e, index - b, partialPredicateCall)
+      )
+    )
+  }
+
+  private Element getImmediateChildOfParam(Param e, int index, string partialPredicateCall) {
+    exists(int b, int bAstNode, int n, int nAttr, int nPat, int nTy |
+      b = 0 and
+      bAstNode = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfAstNode(e, i, _)) | i) and
+      n = bAstNode and
+      nAttr = n + 1 + max(int i | i = -1 or exists(e.getAttr(i)) | i) and
+      nPat = nAttr + 1 and
+      nTy = nPat + 1 and
+      (
+        none()
+        or
+        result = getImmediateChildOfAstNode(e, index - b, partialPredicateCall)
+        or
+        result = e.getAttr(index - n) and
+        partialPredicateCall = "Attr(" + (index - n).toString() + ")"
+        or
+        index = nAttr and result = e.getPat() and partialPredicateCall = "Pat()"
+        or
+        index = nPat and result = e.getTy() and partialPredicateCall = "Ty()"
+      )
+    )
+  }
+
+  private Element getImmediateChildOfParamList(ParamList e, int index, string partialPredicateCall) {
+    exists(int b, int bAstNode, int n, int nParam, int nSelfParam |
+      b = 0 and
+      bAstNode = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfAstNode(e, i, _)) | i) and
+      n = bAstNode and
+      nParam = n + 1 + max(int i | i = -1 or exists(e.getParam(i)) | i) and
+      nSelfParam = nParam + 1 and
+      (
+        none()
+        or
+        result = getImmediateChildOfAstNode(e, index - b, partialPredicateCall)
+        or
+        result = e.getParam(index - n) and
+        partialPredicateCall = "Param(" + (index - n).toString() + ")"
+        or
+        index = nParam and result = e.getSelfParam() and partialPredicateCall = "SelfParam()"
       )
     )
   }
@@ -176,19 +652,43 @@ private module Impl {
     )
   }
 
-  private Element getImmediateChildOfPath(Path e, int index, string partialPredicateCall) {
-    exists(int b, int bAstNode, int bUnimplemented, int n |
+  private Element getImmediateChildOfPathSegment(
+    PathSegment e, int index, string partialPredicateCall
+  ) {
+    exists(
+      int b, int bAstNode, int n, int nGenericArgList, int nNameRef, int nParamList, int nPathType,
+      int nRetType, int nReturnTypeSyntax, int nTy
+    |
       b = 0 and
       bAstNode = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfAstNode(e, i, _)) | i) and
-      bUnimplemented =
-        bAstNode + 1 + max(int i | i = -1 or exists(getImmediateChildOfUnimplemented(e, i, _)) | i) and
-      n = bUnimplemented and
+      n = bAstNode and
+      nGenericArgList = n + 1 and
+      nNameRef = nGenericArgList + 1 and
+      nParamList = nNameRef + 1 and
+      nPathType = nParamList + 1 and
+      nRetType = nPathType + 1 and
+      nReturnTypeSyntax = nRetType + 1 and
+      nTy = nReturnTypeSyntax + 1 and
       (
         none()
         or
         result = getImmediateChildOfAstNode(e, index - b, partialPredicateCall)
         or
-        result = getImmediateChildOfUnimplemented(e, index - bAstNode, partialPredicateCall)
+        index = n and result = e.getGenericArgList() and partialPredicateCall = "GenericArgList()"
+        or
+        index = nGenericArgList and result = e.getNameRef() and partialPredicateCall = "NameRef()"
+        or
+        index = nNameRef and result = e.getParamList() and partialPredicateCall = "ParamList()"
+        or
+        index = nParamList and result = e.getPathType() and partialPredicateCall = "PathType()"
+        or
+        index = nPathType and result = e.getRetType() and partialPredicateCall = "RetType()"
+        or
+        index = nRetType and
+        result = e.getReturnTypeSyntax() and
+        partialPredicateCall = "ReturnTypeSyntax()"
+        or
+        index = nReturnTypeSyntax and result = e.getTy() and partialPredicateCall = "Ty()"
       )
     )
   }
@@ -196,17 +696,78 @@ private module Impl {
   private Element getImmediateChildOfRecordExprField(
     RecordExprField e, int index, string partialPredicateCall
   ) {
-    exists(int b, int bAstNode, int n, int nExpr |
+    exists(int b, int bAstNode, int n, int nAttr, int nExpr, int nNameRef |
       b = 0 and
       bAstNode = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfAstNode(e, i, _)) | i) and
       n = bAstNode and
-      nExpr = n + 1 and
+      nAttr = n + 1 + max(int i | i = -1 or exists(e.getAttr(i)) | i) and
+      nExpr = nAttr + 1 and
+      nNameRef = nExpr + 1 and
       (
         none()
         or
         result = getImmediateChildOfAstNode(e, index - b, partialPredicateCall)
         or
-        index = n and result = e.getExpr() and partialPredicateCall = "Expr()"
+        result = e.getAttr(index - n) and
+        partialPredicateCall = "Attr(" + (index - n).toString() + ")"
+        or
+        index = nAttr and result = e.getExpr() and partialPredicateCall = "Expr()"
+        or
+        index = nExpr and result = e.getNameRef() and partialPredicateCall = "NameRef()"
+      )
+    )
+  }
+
+  private Element getImmediateChildOfRecordExprFieldList(
+    RecordExprFieldList e, int index, string partialPredicateCall
+  ) {
+    exists(int b, int bAstNode, int n, int nAttr, int nField, int nSpread |
+      b = 0 and
+      bAstNode = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfAstNode(e, i, _)) | i) and
+      n = bAstNode and
+      nAttr = n + 1 + max(int i | i = -1 or exists(e.getAttr(i)) | i) and
+      nField = nAttr + 1 + max(int i | i = -1 or exists(e.getField(i)) | i) and
+      nSpread = nField + 1 and
+      (
+        none()
+        or
+        result = getImmediateChildOfAstNode(e, index - b, partialPredicateCall)
+        or
+        result = e.getAttr(index - n) and
+        partialPredicateCall = "Attr(" + (index - n).toString() + ")"
+        or
+        result = e.getField(index - nAttr) and
+        partialPredicateCall = "Field(" + (index - nAttr).toString() + ")"
+        or
+        index = nField and result = e.getSpread() and partialPredicateCall = "Spread()"
+      )
+    )
+  }
+
+  private Element getImmediateChildOfRecordField(
+    RecordField e, int index, string partialPredicateCall
+  ) {
+    exists(int b, int bAstNode, int n, int nAttr, int nName, int nTy, int nVisibility |
+      b = 0 and
+      bAstNode = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfAstNode(e, i, _)) | i) and
+      n = bAstNode and
+      nAttr = n + 1 + max(int i | i = -1 or exists(e.getAttr(i)) | i) and
+      nName = nAttr + 1 and
+      nTy = nName + 1 and
+      nVisibility = nTy + 1 and
+      (
+        none()
+        or
+        result = getImmediateChildOfAstNode(e, index - b, partialPredicateCall)
+        or
+        result = e.getAttr(index - n) and
+        partialPredicateCall = "Attr(" + (index - n).toString() + ")"
+        or
+        index = nAttr and result = e.getName() and partialPredicateCall = "Name()"
+        or
+        index = nName and result = e.getTy() and partialPredicateCall = "Ty()"
+        or
+        index = nTy and result = e.getVisibility() and partialPredicateCall = "Visibility()"
       )
     )
   }
@@ -214,17 +775,153 @@ private module Impl {
   private Element getImmediateChildOfRecordPatField(
     RecordPatField e, int index, string partialPredicateCall
   ) {
-    exists(int b, int bAstNode, int n, int nPat |
+    exists(int b, int bAstNode, int n, int nAttr, int nNameRef, int nPat |
       b = 0 and
       bAstNode = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfAstNode(e, i, _)) | i) and
       n = bAstNode and
-      nPat = n + 1 and
+      nAttr = n + 1 + max(int i | i = -1 or exists(e.getAttr(i)) | i) and
+      nNameRef = nAttr + 1 and
+      nPat = nNameRef + 1 and
       (
         none()
         or
         result = getImmediateChildOfAstNode(e, index - b, partialPredicateCall)
         or
-        index = n and result = e.getPat() and partialPredicateCall = "Pat()"
+        result = e.getAttr(index - n) and
+        partialPredicateCall = "Attr(" + (index - n).toString() + ")"
+        or
+        index = nAttr and result = e.getNameRef() and partialPredicateCall = "NameRef()"
+        or
+        index = nNameRef and result = e.getPat() and partialPredicateCall = "Pat()"
+      )
+    )
+  }
+
+  private Element getImmediateChildOfRecordPatFieldList(
+    RecordPatFieldList e, int index, string partialPredicateCall
+  ) {
+    exists(int b, int bAstNode, int n, int nField, int nRestPat |
+      b = 0 and
+      bAstNode = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfAstNode(e, i, _)) | i) and
+      n = bAstNode and
+      nField = n + 1 + max(int i | i = -1 or exists(e.getField(i)) | i) and
+      nRestPat = nField + 1 and
+      (
+        none()
+        or
+        result = getImmediateChildOfAstNode(e, index - b, partialPredicateCall)
+        or
+        result = e.getField(index - n) and
+        partialPredicateCall = "Field(" + (index - n).toString() + ")"
+        or
+        index = nField and result = e.getRestPat() and partialPredicateCall = "RestPat()"
+      )
+    )
+  }
+
+  private Element getImmediateChildOfRename(Rename e, int index, string partialPredicateCall) {
+    exists(int b, int bAstNode, int n, int nName |
+      b = 0 and
+      bAstNode = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfAstNode(e, i, _)) | i) and
+      n = bAstNode and
+      nName = n + 1 and
+      (
+        none()
+        or
+        result = getImmediateChildOfAstNode(e, index - b, partialPredicateCall)
+        or
+        index = n and result = e.getName() and partialPredicateCall = "Name()"
+      )
+    )
+  }
+
+  private Element getImmediateChildOfResolvable(Resolvable e, int index, string partialPredicateCall) {
+    exists(int b, int bAstNode, int n |
+      b = 0 and
+      bAstNode = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfAstNode(e, i, _)) | i) and
+      n = bAstNode and
+      (
+        none()
+        or
+        result = getImmediateChildOfAstNode(e, index - b, partialPredicateCall)
+      )
+    )
+  }
+
+  private Element getImmediateChildOfRetType(RetType e, int index, string partialPredicateCall) {
+    exists(int b, int bAstNode, int n, int nTy |
+      b = 0 and
+      bAstNode = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfAstNode(e, i, _)) | i) and
+      n = bAstNode and
+      nTy = n + 1 and
+      (
+        none()
+        or
+        result = getImmediateChildOfAstNode(e, index - b, partialPredicateCall)
+        or
+        index = n and result = e.getTy() and partialPredicateCall = "Ty()"
+      )
+    )
+  }
+
+  private Element getImmediateChildOfReturnTypeSyntax(
+    ReturnTypeSyntax e, int index, string partialPredicateCall
+  ) {
+    exists(int b, int bAstNode, int n |
+      b = 0 and
+      bAstNode = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfAstNode(e, i, _)) | i) and
+      n = bAstNode and
+      (
+        none()
+        or
+        result = getImmediateChildOfAstNode(e, index - b, partialPredicateCall)
+      )
+    )
+  }
+
+  private Element getImmediateChildOfSelfParam(SelfParam e, int index, string partialPredicateCall) {
+    exists(int b, int bAstNode, int n, int nAttr, int nLifetime, int nName, int nTy |
+      b = 0 and
+      bAstNode = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfAstNode(e, i, _)) | i) and
+      n = bAstNode and
+      nAttr = n + 1 + max(int i | i = -1 or exists(e.getAttr(i)) | i) and
+      nLifetime = nAttr + 1 and
+      nName = nLifetime + 1 and
+      nTy = nName + 1 and
+      (
+        none()
+        or
+        result = getImmediateChildOfAstNode(e, index - b, partialPredicateCall)
+        or
+        result = e.getAttr(index - n) and
+        partialPredicateCall = "Attr(" + (index - n).toString() + ")"
+        or
+        index = nAttr and result = e.getLifetime() and partialPredicateCall = "Lifetime()"
+        or
+        index = nLifetime and result = e.getName() and partialPredicateCall = "Name()"
+        or
+        index = nName and result = e.getTy() and partialPredicateCall = "Ty()"
+      )
+    )
+  }
+
+  private Element getImmediateChildOfSourceFile(SourceFile e, int index, string partialPredicateCall) {
+    exists(int b, int bAstNode, int n, int nAttr, int nItem |
+      b = 0 and
+      bAstNode = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfAstNode(e, i, _)) | i) and
+      n = bAstNode and
+      nAttr = n + 1 + max(int i | i = -1 or exists(e.getAttr(i)) | i) and
+      nItem = nAttr + 1 + max(int i | i = -1 or exists(e.getItem(i)) | i) and
+      (
+        none()
+        or
+        result = getImmediateChildOfAstNode(e, index - b, partialPredicateCall)
+        or
+        result = e.getAttr(index - n) and
+        partialPredicateCall = "Attr(" + (index - n).toString() + ")"
+        or
+        result = e.getItem(index - nAttr) and
+        partialPredicateCall = "Item(" + (index - nAttr).toString() + ")"
       )
     )
   }
@@ -242,211 +939,567 @@ private module Impl {
     )
   }
 
-  private Element getImmediateChildOfTypeRef(TypeRef e, int index, string partialPredicateCall) {
-    exists(int b, int bAstNode, int bUnimplemented, int n |
+  private Element getImmediateChildOfStmtList(StmtList e, int index, string partialPredicateCall) {
+    exists(int b, int bAstNode, int n, int nAttr, int nStatement, int nTailExpr |
       b = 0 and
       bAstNode = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfAstNode(e, i, _)) | i) and
-      bUnimplemented =
-        bAstNode + 1 + max(int i | i = -1 or exists(getImmediateChildOfUnimplemented(e, i, _)) | i) and
-      n = bUnimplemented and
+      n = bAstNode and
+      nAttr = n + 1 + max(int i | i = -1 or exists(e.getAttr(i)) | i) and
+      nStatement = nAttr + 1 + max(int i | i = -1 or exists(e.getStatement(i)) | i) and
+      nTailExpr = nStatement + 1 and
       (
         none()
         or
         result = getImmediateChildOfAstNode(e, index - b, partialPredicateCall)
         or
-        result = getImmediateChildOfUnimplemented(e, index - bAstNode, partialPredicateCall)
+        result = e.getAttr(index - n) and
+        partialPredicateCall = "Attr(" + (index - n).toString() + ")"
+        or
+        result = e.getStatement(index - nAttr) and
+        partialPredicateCall = "Statement(" + (index - nAttr).toString() + ")"
+        or
+        index = nStatement and result = e.getTailExpr() and partialPredicateCall = "TailExpr()"
+      )
+    )
+  }
+
+  private Element getImmediateChildOfToken(Token e, int index, string partialPredicateCall) {
+    exists(int b, int bAstNode, int n |
+      b = 0 and
+      bAstNode = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfAstNode(e, i, _)) | i) and
+      n = bAstNode and
+      (
+        none()
+        or
+        result = getImmediateChildOfAstNode(e, index - b, partialPredicateCall)
+      )
+    )
+  }
+
+  private Element getImmediateChildOfTokenTree(TokenTree e, int index, string partialPredicateCall) {
+    exists(int b, int bAstNode, int n |
+      b = 0 and
+      bAstNode = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfAstNode(e, i, _)) | i) and
+      n = bAstNode and
+      (
+        none()
+        or
+        result = getImmediateChildOfAstNode(e, index - b, partialPredicateCall)
+      )
+    )
+  }
+
+  private Element getImmediateChildOfTupleField(TupleField e, int index, string partialPredicateCall) {
+    exists(int b, int bAstNode, int n, int nAttr, int nTy, int nVisibility |
+      b = 0 and
+      bAstNode = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfAstNode(e, i, _)) | i) and
+      n = bAstNode and
+      nAttr = n + 1 + max(int i | i = -1 or exists(e.getAttr(i)) | i) and
+      nTy = nAttr + 1 and
+      nVisibility = nTy + 1 and
+      (
+        none()
+        or
+        result = getImmediateChildOfAstNode(e, index - b, partialPredicateCall)
+        or
+        result = e.getAttr(index - n) and
+        partialPredicateCall = "Attr(" + (index - n).toString() + ")"
+        or
+        index = nAttr and result = e.getTy() and partialPredicateCall = "Ty()"
+        or
+        index = nTy and result = e.getVisibility() and partialPredicateCall = "Visibility()"
+      )
+    )
+  }
+
+  private Element getImmediateChildOfTypeBound(TypeBound e, int index, string partialPredicateCall) {
+    exists(int b, int bAstNode, int n, int nGenericParamList, int nLifetime, int nTy |
+      b = 0 and
+      bAstNode = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfAstNode(e, i, _)) | i) and
+      n = bAstNode and
+      nGenericParamList = n + 1 and
+      nLifetime = nGenericParamList + 1 and
+      nTy = nLifetime + 1 and
+      (
+        none()
+        or
+        result = getImmediateChildOfAstNode(e, index - b, partialPredicateCall)
+        or
+        index = n and
+        result = e.getGenericParamList() and
+        partialPredicateCall = "GenericParamList()"
+        or
+        index = nGenericParamList and
+        result = e.getLifetime() and
+        partialPredicateCall = "Lifetime()"
+        or
+        index = nLifetime and result = e.getTy() and partialPredicateCall = "Ty()"
+      )
+    )
+  }
+
+  private Element getImmediateChildOfTypeBoundList(
+    TypeBoundList e, int index, string partialPredicateCall
+  ) {
+    exists(int b, int bAstNode, int n, int nBound |
+      b = 0 and
+      bAstNode = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfAstNode(e, i, _)) | i) and
+      n = bAstNode and
+      nBound = n + 1 + max(int i | i = -1 or exists(e.getBound(i)) | i) and
+      (
+        none()
+        or
+        result = getImmediateChildOfAstNode(e, index - b, partialPredicateCall)
+        or
+        result = e.getBound(index - n) and
+        partialPredicateCall = "Bound(" + (index - n).toString() + ")"
+      )
+    )
+  }
+
+  private Element getImmediateChildOfTypeRef(TypeRef e, int index, string partialPredicateCall) {
+    exists(int b, int bAstNode, int n |
+      b = 0 and
+      bAstNode = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfAstNode(e, i, _)) | i) and
+      n = bAstNode and
+      (
+        none()
+        or
+        result = getImmediateChildOfAstNode(e, index - b, partialPredicateCall)
+      )
+    )
+  }
+
+  private Element getImmediateChildOfUseTree(UseTree e, int index, string partialPredicateCall) {
+    exists(int b, int bAstNode, int n, int nPath, int nRename, int nUseTreeList |
+      b = 0 and
+      bAstNode = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfAstNode(e, i, _)) | i) and
+      n = bAstNode and
+      nPath = n + 1 and
+      nRename = nPath + 1 and
+      nUseTreeList = nRename + 1 and
+      (
+        none()
+        or
+        result = getImmediateChildOfAstNode(e, index - b, partialPredicateCall)
+        or
+        index = n and result = e.getPath() and partialPredicateCall = "Path()"
+        or
+        index = nPath and result = e.getRename() and partialPredicateCall = "Rename()"
+        or
+        index = nRename and result = e.getUseTreeList() and partialPredicateCall = "UseTreeList()"
+      )
+    )
+  }
+
+  private Element getImmediateChildOfUseTreeList(
+    UseTreeList e, int index, string partialPredicateCall
+  ) {
+    exists(int b, int bAstNode, int n, int nUseTree |
+      b = 0 and
+      bAstNode = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfAstNode(e, i, _)) | i) and
+      n = bAstNode and
+      nUseTree = n + 1 + max(int i | i = -1 or exists(e.getUseTree(i)) | i) and
+      (
+        none()
+        or
+        result = getImmediateChildOfAstNode(e, index - b, partialPredicateCall)
+        or
+        result = e.getUseTree(index - n) and
+        partialPredicateCall = "UseTree(" + (index - n).toString() + ")"
+      )
+    )
+  }
+
+  private Element getImmediateChildOfVariant(Variant e, int index, string partialPredicateCall) {
+    exists(
+      int b, int bAstNode, int n, int nAttr, int nExpr, int nFieldList, int nName, int nVisibility
+    |
+      b = 0 and
+      bAstNode = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfAstNode(e, i, _)) | i) and
+      n = bAstNode and
+      nAttr = n + 1 + max(int i | i = -1 or exists(e.getAttr(i)) | i) and
+      nExpr = nAttr + 1 and
+      nFieldList = nExpr + 1 and
+      nName = nFieldList + 1 and
+      nVisibility = nName + 1 and
+      (
+        none()
+        or
+        result = getImmediateChildOfAstNode(e, index - b, partialPredicateCall)
+        or
+        result = e.getAttr(index - n) and
+        partialPredicateCall = "Attr(" + (index - n).toString() + ")"
+        or
+        index = nAttr and result = e.getExpr() and partialPredicateCall = "Expr()"
+        or
+        index = nExpr and result = e.getFieldList() and partialPredicateCall = "FieldList()"
+        or
+        index = nFieldList and result = e.getName() and partialPredicateCall = "Name()"
+        or
+        index = nName and result = e.getVisibility() and partialPredicateCall = "Visibility()"
+      )
+    )
+  }
+
+  private Element getImmediateChildOfVariantList(
+    VariantList e, int index, string partialPredicateCall
+  ) {
+    exists(int b, int bAstNode, int n, int nVariant |
+      b = 0 and
+      bAstNode = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfAstNode(e, i, _)) | i) and
+      n = bAstNode and
+      nVariant = n + 1 + max(int i | i = -1 or exists(e.getVariant(i)) | i) and
+      (
+        none()
+        or
+        result = getImmediateChildOfAstNode(e, index - b, partialPredicateCall)
+        or
+        result = e.getVariant(index - n) and
+        partialPredicateCall = "Variant(" + (index - n).toString() + ")"
+      )
+    )
+  }
+
+  private Element getImmediateChildOfVisibility(Visibility e, int index, string partialPredicateCall) {
+    exists(int b, int bAstNode, int n, int nPath |
+      b = 0 and
+      bAstNode = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfAstNode(e, i, _)) | i) and
+      n = bAstNode and
+      nPath = n + 1 and
+      (
+        none()
+        or
+        result = getImmediateChildOfAstNode(e, index - b, partialPredicateCall)
+        or
+        index = n and result = e.getPath() and partialPredicateCall = "Path()"
+      )
+    )
+  }
+
+  private Element getImmediateChildOfWhereClause(
+    WhereClause e, int index, string partialPredicateCall
+  ) {
+    exists(int b, int bAstNode, int n, int nPredicate |
+      b = 0 and
+      bAstNode = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfAstNode(e, i, _)) | i) and
+      n = bAstNode and
+      nPredicate = n + 1 + max(int i | i = -1 or exists(e.getPredicate(i)) | i) and
+      (
+        none()
+        or
+        result = getImmediateChildOfAstNode(e, index - b, partialPredicateCall)
+        or
+        result = e.getPredicate(index - n) and
+        partialPredicateCall = "Predicate(" + (index - n).toString() + ")"
+      )
+    )
+  }
+
+  private Element getImmediateChildOfWherePred(WherePred e, int index, string partialPredicateCall) {
+    exists(
+      int b, int bAstNode, int n, int nGenericParamList, int nLifetime, int nTy, int nTypeBoundList
+    |
+      b = 0 and
+      bAstNode = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfAstNode(e, i, _)) | i) and
+      n = bAstNode and
+      nGenericParamList = n + 1 and
+      nLifetime = nGenericParamList + 1 and
+      nTy = nLifetime + 1 and
+      nTypeBoundList = nTy + 1 and
+      (
+        none()
+        or
+        result = getImmediateChildOfAstNode(e, index - b, partialPredicateCall)
+        or
+        index = n and
+        result = e.getGenericParamList() and
+        partialPredicateCall = "GenericParamList()"
+        or
+        index = nGenericParamList and
+        result = e.getLifetime() and
+        partialPredicateCall = "Lifetime()"
+        or
+        index = nLifetime and result = e.getTy() and partialPredicateCall = "Ty()"
+        or
+        index = nTy and result = e.getTypeBoundList() and partialPredicateCall = "TypeBoundList()"
       )
     )
   }
 
   private Element getImmediateChildOfArrayExpr(ArrayExpr e, int index, string partialPredicateCall) {
-    exists(int b, int bExpr, int n |
+    exists(int b, int bExpr, int n, int nAttr, int nExpr |
       b = 0 and
       bExpr = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfExpr(e, i, _)) | i) and
       n = bExpr and
+      nAttr = n + 1 + max(int i | i = -1 or exists(e.getAttr(i)) | i) and
+      nExpr = nAttr + 1 + max(int i | i = -1 or exists(e.getExpr(i)) | i) and
       (
         none()
         or
         result = getImmediateChildOfExpr(e, index - b, partialPredicateCall)
+        or
+        result = e.getAttr(index - n) and
+        partialPredicateCall = "Attr(" + (index - n).toString() + ")"
+        or
+        result = e.getExpr(index - nAttr) and
+        partialPredicateCall = "Expr(" + (index - nAttr).toString() + ")"
+      )
+    )
+  }
+
+  private Element getImmediateChildOfArrayType(ArrayType e, int index, string partialPredicateCall) {
+    exists(int b, int bTypeRef, int n, int nConstArg, int nTy |
+      b = 0 and
+      bTypeRef = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfTypeRef(e, i, _)) | i) and
+      n = bTypeRef and
+      nConstArg = n + 1 and
+      nTy = nConstArg + 1 and
+      (
+        none()
+        or
+        result = getImmediateChildOfTypeRef(e, index - b, partialPredicateCall)
+        or
+        index = n and result = e.getConstArg() and partialPredicateCall = "ConstArg()"
+        or
+        index = nConstArg and result = e.getTy() and partialPredicateCall = "Ty()"
       )
     )
   }
 
   private Element getImmediateChildOfAsmExpr(AsmExpr e, int index, string partialPredicateCall) {
-    exists(int b, int bExpr, int n, int nExpr |
+    exists(int b, int bExpr, int n, int nAttr, int nExpr |
       b = 0 and
       bExpr = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfExpr(e, i, _)) | i) and
       n = bExpr and
-      nExpr = n + 1 and
+      nAttr = n + 1 + max(int i | i = -1 or exists(e.getAttr(i)) | i) and
+      nExpr = nAttr + 1 and
       (
         none()
         or
         result = getImmediateChildOfExpr(e, index - b, partialPredicateCall)
         or
-        index = n and result = e.getExpr() and partialPredicateCall = "Expr()"
+        result = e.getAttr(index - n) and
+        partialPredicateCall = "Attr(" + (index - n).toString() + ")"
+        or
+        index = nAttr and result = e.getExpr() and partialPredicateCall = "Expr()"
+      )
+    )
+  }
+
+  private Element getImmediateChildOfAssocTypeArg(
+    AssocTypeArg e, int index, string partialPredicateCall
+  ) {
+    exists(
+      int b, int bGenericArg, int n, int nConstArg, int nGenericArgList, int nNameRef,
+      int nParamList, int nRetType, int nReturnTypeSyntax, int nTy, int nTypeBoundList
+    |
+      b = 0 and
+      bGenericArg =
+        b + 1 + max(int i | i = -1 or exists(getImmediateChildOfGenericArg(e, i, _)) | i) and
+      n = bGenericArg and
+      nConstArg = n + 1 and
+      nGenericArgList = nConstArg + 1 and
+      nNameRef = nGenericArgList + 1 and
+      nParamList = nNameRef + 1 and
+      nRetType = nParamList + 1 and
+      nReturnTypeSyntax = nRetType + 1 and
+      nTy = nReturnTypeSyntax + 1 and
+      nTypeBoundList = nTy + 1 and
+      (
+        none()
+        or
+        result = getImmediateChildOfGenericArg(e, index - b, partialPredicateCall)
+        or
+        index = n and result = e.getConstArg() and partialPredicateCall = "ConstArg()"
+        or
+        index = nConstArg and
+        result = e.getGenericArgList() and
+        partialPredicateCall = "GenericArgList()"
+        or
+        index = nGenericArgList and result = e.getNameRef() and partialPredicateCall = "NameRef()"
+        or
+        index = nNameRef and result = e.getParamList() and partialPredicateCall = "ParamList()"
+        or
+        index = nParamList and result = e.getRetType() and partialPredicateCall = "RetType()"
+        or
+        index = nRetType and
+        result = e.getReturnTypeSyntax() and
+        partialPredicateCall = "ReturnTypeSyntax()"
+        or
+        index = nReturnTypeSyntax and result = e.getTy() and partialPredicateCall = "Ty()"
+        or
+        index = nTy and result = e.getTypeBoundList() and partialPredicateCall = "TypeBoundList()"
       )
     )
   }
 
   private Element getImmediateChildOfAwaitExpr(AwaitExpr e, int index, string partialPredicateCall) {
-    exists(int b, int bExpr, int n, int nExpr |
+    exists(int b, int bExpr, int n, int nAttr, int nExpr |
       b = 0 and
       bExpr = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfExpr(e, i, _)) | i) and
       n = bExpr and
-      nExpr = n + 1 and
+      nAttr = n + 1 + max(int i | i = -1 or exists(e.getAttr(i)) | i) and
+      nExpr = nAttr + 1 and
       (
         none()
         or
         result = getImmediateChildOfExpr(e, index - b, partialPredicateCall)
         or
-        index = n and result = e.getExpr() and partialPredicateCall = "Expr()"
+        result = e.getAttr(index - n) and
+        partialPredicateCall = "Attr(" + (index - n).toString() + ")"
+        or
+        index = nAttr and result = e.getExpr() and partialPredicateCall = "Expr()"
       )
     )
   }
 
   private Element getImmediateChildOfBecomeExpr(BecomeExpr e, int index, string partialPredicateCall) {
-    exists(int b, int bExpr, int n, int nExpr |
+    exists(int b, int bExpr, int n, int nAttr, int nExpr |
       b = 0 and
       bExpr = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfExpr(e, i, _)) | i) and
       n = bExpr and
-      nExpr = n + 1 and
+      nAttr = n + 1 + max(int i | i = -1 or exists(e.getAttr(i)) | i) and
+      nExpr = nAttr + 1 and
       (
         none()
         or
         result = getImmediateChildOfExpr(e, index - b, partialPredicateCall)
         or
-        index = n and result = e.getExpr() and partialPredicateCall = "Expr()"
+        result = e.getAttr(index - n) and
+        partialPredicateCall = "Attr(" + (index - n).toString() + ")"
+        or
+        index = nAttr and result = e.getExpr() and partialPredicateCall = "Expr()"
       )
     )
   }
 
   private Element getImmediateChildOfBinaryExpr(BinaryExpr e, int index, string partialPredicateCall) {
-    exists(int b, int bExpr, int n, int nLhs, int nRhs |
+    exists(int b, int bExpr, int n, int nAttr, int nLhs, int nRhs |
       b = 0 and
       bExpr = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfExpr(e, i, _)) | i) and
       n = bExpr and
-      nLhs = n + 1 and
+      nAttr = n + 1 + max(int i | i = -1 or exists(e.getAttr(i)) | i) and
+      nLhs = nAttr + 1 and
       nRhs = nLhs + 1 and
       (
         none()
         or
         result = getImmediateChildOfExpr(e, index - b, partialPredicateCall)
         or
-        index = n and result = e.getLhs() and partialPredicateCall = "Lhs()"
+        result = e.getAttr(index - n) and
+        partialPredicateCall = "Attr(" + (index - n).toString() + ")"
+        or
+        index = nAttr and result = e.getLhs() and partialPredicateCall = "Lhs()"
         or
         index = nLhs and result = e.getRhs() and partialPredicateCall = "Rhs()"
       )
     )
   }
 
-  private Element getImmediateChildOfBlockExprBase(
-    BlockExprBase e, int index, string partialPredicateCall
-  ) {
-    exists(int b, int bExpr, int n, int nStatement, int nTail |
+  private Element getImmediateChildOfBlockExpr(BlockExpr e, int index, string partialPredicateCall) {
+    exists(int b, int bExpr, int n, int nAttr, int nLabel, int nStmtList |
       b = 0 and
       bExpr = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfExpr(e, i, _)) | i) and
       n = bExpr and
-      nStatement = n + 1 + max(int i | i = -1 or exists(e.getStatement(i)) | i) and
-      nTail = nStatement + 1 and
+      nAttr = n + 1 + max(int i | i = -1 or exists(e.getAttr(i)) | i) and
+      nLabel = nAttr + 1 and
+      nStmtList = nLabel + 1 and
       (
         none()
         or
         result = getImmediateChildOfExpr(e, index - b, partialPredicateCall)
         or
-        result = e.getStatement(index - n) and
-        partialPredicateCall = "Statement(" + (index - n).toString() + ")"
+        result = e.getAttr(index - n) and
+        partialPredicateCall = "Attr(" + (index - n).toString() + ")"
         or
-        index = nStatement and result = e.getTail() and partialPredicateCall = "Tail()"
-      )
-    )
-  }
-
-  private Element getImmediateChildOfBoxExpr(BoxExpr e, int index, string partialPredicateCall) {
-    exists(int b, int bExpr, int n, int nExpr |
-      b = 0 and
-      bExpr = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfExpr(e, i, _)) | i) and
-      n = bExpr and
-      nExpr = n + 1 and
-      (
-        none()
+        index = nAttr and result = e.getLabel() and partialPredicateCall = "Label()"
         or
-        result = getImmediateChildOfExpr(e, index - b, partialPredicateCall)
-        or
-        index = n and result = e.getExpr() and partialPredicateCall = "Expr()"
+        index = nLabel and result = e.getStmtList() and partialPredicateCall = "StmtList()"
       )
     )
   }
 
   private Element getImmediateChildOfBoxPat(BoxPat e, int index, string partialPredicateCall) {
-    exists(int b, int bPat, int n, int nInner |
+    exists(int b, int bPat, int n, int nPat |
       b = 0 and
       bPat = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfPat(e, i, _)) | i) and
       n = bPat and
-      nInner = n + 1 and
+      nPat = n + 1 and
       (
         none()
         or
         result = getImmediateChildOfPat(e, index - b, partialPredicateCall)
         or
-        index = n and result = e.getInner() and partialPredicateCall = "Inner()"
+        index = n and result = e.getPat() and partialPredicateCall = "Pat()"
       )
     )
   }
 
   private Element getImmediateChildOfBreakExpr(BreakExpr e, int index, string partialPredicateCall) {
-    exists(int b, int bExpr, int n, int nExpr, int nLabel |
+    exists(int b, int bExpr, int n, int nAttr, int nExpr, int nLifetime |
       b = 0 and
       bExpr = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfExpr(e, i, _)) | i) and
       n = bExpr and
-      nExpr = n + 1 and
-      nLabel = nExpr + 1 and
+      nAttr = n + 1 + max(int i | i = -1 or exists(e.getAttr(i)) | i) and
+      nExpr = nAttr + 1 and
+      nLifetime = nExpr + 1 and
       (
         none()
         or
         result = getImmediateChildOfExpr(e, index - b, partialPredicateCall)
         or
-        index = n and result = e.getExpr() and partialPredicateCall = "Expr()"
+        result = e.getAttr(index - n) and
+        partialPredicateCall = "Attr(" + (index - n).toString() + ")"
         or
-        index = nExpr and result = e.getLabel() and partialPredicateCall = "Label()"
+        index = nAttr and result = e.getExpr() and partialPredicateCall = "Expr()"
+        or
+        index = nExpr and result = e.getLifetime() and partialPredicateCall = "Lifetime()"
       )
     )
   }
 
-  private Element getImmediateChildOfCallExpr(CallExpr e, int index, string partialPredicateCall) {
-    exists(int b, int bExpr, int n, int nCallee, int nArg |
+  private Element getImmediateChildOfCallExprBase(
+    CallExprBase e, int index, string partialPredicateCall
+  ) {
+    exists(int b, int bExpr, int n, int nArgList, int nAttr |
       b = 0 and
       bExpr = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfExpr(e, i, _)) | i) and
       n = bExpr and
-      nCallee = n + 1 and
-      nArg = nCallee + 1 + max(int i | i = -1 or exists(e.getArg(i)) | i) and
+      nArgList = n + 1 and
+      nAttr = nArgList + 1 + max(int i | i = -1 or exists(e.getAttr(i)) | i) and
       (
         none()
         or
         result = getImmediateChildOfExpr(e, index - b, partialPredicateCall)
         or
-        index = n and result = e.getCallee() and partialPredicateCall = "Callee()"
+        index = n and result = e.getArgList() and partialPredicateCall = "ArgList()"
         or
-        result = e.getArg(index - nCallee) and
-        partialPredicateCall = "Arg(" + (index - nCallee).toString() + ")"
+        result = e.getAttr(index - nArgList) and
+        partialPredicateCall = "Attr(" + (index - nArgList).toString() + ")"
       )
     )
   }
 
   private Element getImmediateChildOfCastExpr(CastExpr e, int index, string partialPredicateCall) {
-    exists(int b, int bExpr, int n, int nExpr, int nType |
+    exists(int b, int bExpr, int n, int nAttr, int nExpr, int nTy |
       b = 0 and
       bExpr = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfExpr(e, i, _)) | i) and
       n = bExpr and
-      nExpr = n + 1 and
-      nType = nExpr + 1 and
+      nAttr = n + 1 + max(int i | i = -1 or exists(e.getAttr(i)) | i) and
+      nExpr = nAttr + 1 and
+      nTy = nExpr + 1 and
       (
         none()
         or
         result = getImmediateChildOfExpr(e, index - b, partialPredicateCall)
         or
-        index = n and result = e.getExpr() and partialPredicateCall = "Expr()"
+        result = e.getAttr(index - n) and
+        partialPredicateCall = "Attr(" + (index - n).toString() + ")"
         or
-        index = nExpr and result = e.getType() and partialPredicateCall = "Type()"
+        index = nAttr and result = e.getExpr() and partialPredicateCall = "Expr()"
+        or
+        index = nExpr and result = e.getTy() and partialPredicateCall = "Ty()"
       )
     )
   }
@@ -454,28 +1507,57 @@ private module Impl {
   private Element getImmediateChildOfClosureExpr(
     ClosureExpr e, int index, string partialPredicateCall
   ) {
-    exists(int b, int bExpr, int n, int nArg, int nArgType, int nRetType, int nBody |
+    exists(int b, int bExpr, int bCallable, int n, int nBody, int nClosureBinder, int nRetType |
       b = 0 and
       bExpr = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfExpr(e, i, _)) | i) and
-      n = bExpr and
-      nArg = n + 1 + max(int i | i = -1 or exists(e.getArg(i)) | i) and
-      nArgType = nArg + 1 + max(int i | i = -1 or exists(e.getArgType(i)) | i) and
-      nRetType = nArgType + 1 and
-      nBody = nRetType + 1 and
+      bCallable =
+        bExpr + 1 + max(int i | i = -1 or exists(getImmediateChildOfCallable(e, i, _)) | i) and
+      n = bCallable and
+      nBody = n + 1 and
+      nClosureBinder = nBody + 1 and
+      nRetType = nClosureBinder + 1 and
       (
         none()
         or
         result = getImmediateChildOfExpr(e, index - b, partialPredicateCall)
         or
-        result = e.getArg(index - n) and
-        partialPredicateCall = "Arg(" + (index - n).toString() + ")"
+        result = getImmediateChildOfCallable(e, index - bExpr, partialPredicateCall)
         or
-        result = e.getArgType(index - nArg) and
-        partialPredicateCall = "ArgType(" + (index - nArg).toString() + ")"
+        index = n and result = e.getBody() and partialPredicateCall = "Body()"
         or
-        index = nArgType and result = e.getRetType() and partialPredicateCall = "RetType()"
+        index = nBody and result = e.getClosureBinder() and partialPredicateCall = "ClosureBinder()"
         or
-        index = nRetType and result = e.getBody() and partialPredicateCall = "Body()"
+        index = nClosureBinder and result = e.getRetType() and partialPredicateCall = "RetType()"
+      )
+    )
+  }
+
+  private Element getImmediateChildOfComment(Comment e, int index, string partialPredicateCall) {
+    exists(int b, int bToken, int n |
+      b = 0 and
+      bToken = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfToken(e, i, _)) | i) and
+      n = bToken and
+      (
+        none()
+        or
+        result = getImmediateChildOfToken(e, index - b, partialPredicateCall)
+      )
+    )
+  }
+
+  private Element getImmediateChildOfConstArg(ConstArg e, int index, string partialPredicateCall) {
+    exists(int b, int bGenericArg, int n, int nExpr |
+      b = 0 and
+      bGenericArg =
+        b + 1 + max(int i | i = -1 or exists(getImmediateChildOfGenericArg(e, i, _)) | i) and
+      n = bGenericArg and
+      nExpr = n + 1 and
+      (
+        none()
+        or
+        result = getImmediateChildOfGenericArg(e, index - b, partialPredicateCall)
+        or
+        index = n and result = e.getExpr() and partialPredicateCall = "Expr()"
       )
     )
   }
@@ -483,33 +1565,44 @@ private module Impl {
   private Element getImmediateChildOfConstBlockPat(
     ConstBlockPat e, int index, string partialPredicateCall
   ) {
-    exists(int b, int bPat, int n, int nExpr |
+    exists(int b, int bPat, int n, int nBlockExpr |
       b = 0 and
       bPat = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfPat(e, i, _)) | i) and
       n = bPat and
-      nExpr = n + 1 and
+      nBlockExpr = n + 1 and
       (
         none()
         or
         result = getImmediateChildOfPat(e, index - b, partialPredicateCall)
         or
-        index = n and result = e.getExpr() and partialPredicateCall = "Expr()"
+        index = n and result = e.getBlockExpr() and partialPredicateCall = "BlockExpr()"
       )
     )
   }
 
-  private Element getImmediateChildOfConstExpr(ConstExpr e, int index, string partialPredicateCall) {
-    exists(int b, int bExpr, int n, int nExpr |
+  private Element getImmediateChildOfConstParam(ConstParam e, int index, string partialPredicateCall) {
+    exists(int b, int bGenericParam, int n, int nAttr, int nDefaultVal, int nName, int nTy |
       b = 0 and
-      bExpr = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfExpr(e, i, _)) | i) and
-      n = bExpr and
-      nExpr = n + 1 and
+      bGenericParam =
+        b + 1 + max(int i | i = -1 or exists(getImmediateChildOfGenericParam(e, i, _)) | i) and
+      n = bGenericParam and
+      nAttr = n + 1 + max(int i | i = -1 or exists(e.getAttr(i)) | i) and
+      nDefaultVal = nAttr + 1 and
+      nName = nDefaultVal + 1 and
+      nTy = nName + 1 and
       (
         none()
         or
-        result = getImmediateChildOfExpr(e, index - b, partialPredicateCall)
+        result = getImmediateChildOfGenericParam(e, index - b, partialPredicateCall)
         or
-        index = n and result = e.getExpr() and partialPredicateCall = "Expr()"
+        result = e.getAttr(index - n) and
+        partialPredicateCall = "Attr(" + (index - n).toString() + ")"
+        or
+        index = nAttr and result = e.getDefaultVal() and partialPredicateCall = "DefaultVal()"
+        or
+        index = nDefaultVal and result = e.getName() and partialPredicateCall = "Name()"
+        or
+        index = nName and result = e.getTy() and partialPredicateCall = "Ty()"
       )
     )
   }
@@ -517,17 +1610,39 @@ private module Impl {
   private Element getImmediateChildOfContinueExpr(
     ContinueExpr e, int index, string partialPredicateCall
   ) {
-    exists(int b, int bExpr, int n, int nLabel |
+    exists(int b, int bExpr, int n, int nAttr, int nLifetime |
       b = 0 and
       bExpr = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfExpr(e, i, _)) | i) and
       n = bExpr and
-      nLabel = n + 1 and
+      nAttr = n + 1 + max(int i | i = -1 or exists(e.getAttr(i)) | i) and
+      nLifetime = nAttr + 1 and
       (
         none()
         or
         result = getImmediateChildOfExpr(e, index - b, partialPredicateCall)
         or
-        index = n and result = e.getLabel() and partialPredicateCall = "Label()"
+        result = e.getAttr(index - n) and
+        partialPredicateCall = "Attr(" + (index - n).toString() + ")"
+        or
+        index = nAttr and result = e.getLifetime() and partialPredicateCall = "Lifetime()"
+      )
+    )
+  }
+
+  private Element getImmediateChildOfDynTraitType(
+    DynTraitType e, int index, string partialPredicateCall
+  ) {
+    exists(int b, int bTypeRef, int n, int nTypeBoundList |
+      b = 0 and
+      bTypeRef = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfTypeRef(e, i, _)) | i) and
+      n = bTypeRef and
+      nTypeBoundList = n + 1 and
+      (
+        none()
+        or
+        result = getImmediateChildOfTypeRef(e, index - b, partialPredicateCall)
+        or
+        index = n and result = e.getTypeBoundList() and partialPredicateCall = "TypeBoundList()"
       )
     )
   }
@@ -549,96 +1664,230 @@ private module Impl {
   }
 
   private Element getImmediateChildOfFieldExpr(FieldExpr e, int index, string partialPredicateCall) {
-    exists(int b, int bExpr, int n, int nExpr |
+    exists(int b, int bExpr, int n, int nAttr, int nExpr, int nNameRef |
       b = 0 and
       bExpr = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfExpr(e, i, _)) | i) and
       n = bExpr and
-      nExpr = n + 1 and
+      nAttr = n + 1 + max(int i | i = -1 or exists(e.getAttr(i)) | i) and
+      nExpr = nAttr + 1 and
+      nNameRef = nExpr + 1 and
       (
         none()
         or
         result = getImmediateChildOfExpr(e, index - b, partialPredicateCall)
         or
-        index = n and result = e.getExpr() and partialPredicateCall = "Expr()"
+        result = e.getAttr(index - n) and
+        partialPredicateCall = "Attr(" + (index - n).toString() + ")"
+        or
+        index = nAttr and result = e.getExpr() and partialPredicateCall = "Expr()"
+        or
+        index = nExpr and result = e.getNameRef() and partialPredicateCall = "NameRef()"
       )
     )
   }
 
-  private Element getImmediateChildOfFunction(Function e, int index, string partialPredicateCall) {
-    exists(int b, int bDeclaration, int n, int nBody |
+  private Element getImmediateChildOfFnPtrType(FnPtrType e, int index, string partialPredicateCall) {
+    exists(int b, int bTypeRef, int n, int nAbi, int nParamList, int nRetType |
       b = 0 and
-      bDeclaration =
-        b + 1 + max(int i | i = -1 or exists(getImmediateChildOfDeclaration(e, i, _)) | i) and
-      n = bDeclaration and
-      nBody = n + 1 and
+      bTypeRef = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfTypeRef(e, i, _)) | i) and
+      n = bTypeRef and
+      nAbi = n + 1 and
+      nParamList = nAbi + 1 and
+      nRetType = nParamList + 1 and
       (
         none()
         or
-        result = getImmediateChildOfDeclaration(e, index - b, partialPredicateCall)
+        result = getImmediateChildOfTypeRef(e, index - b, partialPredicateCall)
         or
-        index = n and result = e.getBody() and partialPredicateCall = "Body()"
+        index = n and result = e.getAbi() and partialPredicateCall = "Abi()"
+        or
+        index = nAbi and result = e.getParamList() and partialPredicateCall = "ParamList()"
+        or
+        index = nParamList and result = e.getRetType() and partialPredicateCall = "RetType()"
+      )
+    )
+  }
+
+  private Element getImmediateChildOfForExpr(ForExpr e, int index, string partialPredicateCall) {
+    exists(int b, int bExpr, int n, int nAttr, int nIterable, int nLabel, int nLoopBody, int nPat |
+      b = 0 and
+      bExpr = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfExpr(e, i, _)) | i) and
+      n = bExpr and
+      nAttr = n + 1 + max(int i | i = -1 or exists(e.getAttr(i)) | i) and
+      nIterable = nAttr + 1 and
+      nLabel = nIterable + 1 and
+      nLoopBody = nLabel + 1 and
+      nPat = nLoopBody + 1 and
+      (
+        none()
+        or
+        result = getImmediateChildOfExpr(e, index - b, partialPredicateCall)
+        or
+        result = e.getAttr(index - n) and
+        partialPredicateCall = "Attr(" + (index - n).toString() + ")"
+        or
+        index = nAttr and result = e.getIterable() and partialPredicateCall = "Iterable()"
+        or
+        index = nIterable and result = e.getLabel() and partialPredicateCall = "Label()"
+        or
+        index = nLabel and result = e.getLoopBody() and partialPredicateCall = "LoopBody()"
+        or
+        index = nLoopBody and result = e.getPat() and partialPredicateCall = "Pat()"
+      )
+    )
+  }
+
+  private Element getImmediateChildOfForType(ForType e, int index, string partialPredicateCall) {
+    exists(int b, int bTypeRef, int n, int nGenericParamList, int nTy |
+      b = 0 and
+      bTypeRef = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfTypeRef(e, i, _)) | i) and
+      n = bTypeRef and
+      nGenericParamList = n + 1 and
+      nTy = nGenericParamList + 1 and
+      (
+        none()
+        or
+        result = getImmediateChildOfTypeRef(e, index - b, partialPredicateCall)
+        or
+        index = n and
+        result = e.getGenericParamList() and
+        partialPredicateCall = "GenericParamList()"
+        or
+        index = nGenericParamList and result = e.getTy() and partialPredicateCall = "Ty()"
+      )
+    )
+  }
+
+  private Element getImmediateChildOfFormatArgsExpr(
+    FormatArgsExpr e, int index, string partialPredicateCall
+  ) {
+    exists(int b, int bExpr, int n, int nArg, int nAttr, int nTemplate |
+      b = 0 and
+      bExpr = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfExpr(e, i, _)) | i) and
+      n = bExpr and
+      nArg = n + 1 + max(int i | i = -1 or exists(e.getArg(i)) | i) and
+      nAttr = nArg + 1 + max(int i | i = -1 or exists(e.getAttr(i)) | i) and
+      nTemplate = nAttr + 1 and
+      (
+        none()
+        or
+        result = getImmediateChildOfExpr(e, index - b, partialPredicateCall)
+        or
+        result = e.getArg(index - n) and
+        partialPredicateCall = "Arg(" + (index - n).toString() + ")"
+        or
+        result = e.getAttr(index - nArg) and
+        partialPredicateCall = "Attr(" + (index - nArg).toString() + ")"
+        or
+        index = nAttr and result = e.getTemplate() and partialPredicateCall = "Template()"
       )
     )
   }
 
   private Element getImmediateChildOfIdentPat(IdentPat e, int index, string partialPredicateCall) {
-    exists(int b, int bPat, int n, int nSubpat |
+    exists(int b, int bPat, int n, int nAttr, int nName, int nPat |
       b = 0 and
       bPat = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfPat(e, i, _)) | i) and
       n = bPat and
-      nSubpat = n + 1 and
+      nAttr = n + 1 + max(int i | i = -1 or exists(e.getAttr(i)) | i) and
+      nName = nAttr + 1 and
+      nPat = nName + 1 and
       (
         none()
         or
         result = getImmediateChildOfPat(e, index - b, partialPredicateCall)
         or
-        index = n and result = e.getSubpat() and partialPredicateCall = "Subpat()"
+        result = e.getAttr(index - n) and
+        partialPredicateCall = "Attr(" + (index - n).toString() + ")"
+        or
+        index = nAttr and result = e.getName() and partialPredicateCall = "Name()"
+        or
+        index = nName and result = e.getPat() and partialPredicateCall = "Pat()"
       )
     )
   }
 
   private Element getImmediateChildOfIfExpr(IfExpr e, int index, string partialPredicateCall) {
-    exists(int b, int bExpr, int n, int nCondition, int nThen, int nElse |
+    exists(int b, int bExpr, int n, int nAttr, int nCondition, int nElse, int nThen |
       b = 0 and
       bExpr = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfExpr(e, i, _)) | i) and
       n = bExpr and
-      nCondition = n + 1 and
-      nThen = nCondition + 1 and
-      nElse = nThen + 1 and
+      nAttr = n + 1 + max(int i | i = -1 or exists(e.getAttr(i)) | i) and
+      nCondition = nAttr + 1 and
+      nElse = nCondition + 1 and
+      nThen = nElse + 1 and
       (
         none()
         or
         result = getImmediateChildOfExpr(e, index - b, partialPredicateCall)
         or
-        index = n and result = e.getCondition() and partialPredicateCall = "Condition()"
+        result = e.getAttr(index - n) and
+        partialPredicateCall = "Attr(" + (index - n).toString() + ")"
         or
-        index = nCondition and result = e.getThen() and partialPredicateCall = "Then()"
+        index = nAttr and result = e.getCondition() and partialPredicateCall = "Condition()"
         or
-        index = nThen and result = e.getElse() and partialPredicateCall = "Else()"
+        index = nCondition and result = e.getElse() and partialPredicateCall = "Else()"
+        or
+        index = nElse and result = e.getThen() and partialPredicateCall = "Then()"
+      )
+    )
+  }
+
+  private Element getImmediateChildOfImplTraitType(
+    ImplTraitType e, int index, string partialPredicateCall
+  ) {
+    exists(int b, int bTypeRef, int n, int nTypeBoundList |
+      b = 0 and
+      bTypeRef = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfTypeRef(e, i, _)) | i) and
+      n = bTypeRef and
+      nTypeBoundList = n + 1 and
+      (
+        none()
+        or
+        result = getImmediateChildOfTypeRef(e, index - b, partialPredicateCall)
+        or
+        index = n and result = e.getTypeBoundList() and partialPredicateCall = "TypeBoundList()"
       )
     )
   }
 
   private Element getImmediateChildOfIndexExpr(IndexExpr e, int index, string partialPredicateCall) {
-    exists(int b, int bExpr, int n, int nBase, int nIndex |
+    exists(int b, int bExpr, int n, int nAttr, int nBase, int nIndex |
       b = 0 and
       bExpr = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfExpr(e, i, _)) | i) and
       n = bExpr and
-      nBase = n + 1 and
+      nAttr = n + 1 + max(int i | i = -1 or exists(e.getAttr(i)) | i) and
+      nBase = nAttr + 1 and
       nIndex = nBase + 1 and
       (
         none()
         or
         result = getImmediateChildOfExpr(e, index - b, partialPredicateCall)
         or
-        index = n and result = e.getBase() and partialPredicateCall = "Base()"
+        result = e.getAttr(index - n) and
+        partialPredicateCall = "Attr(" + (index - n).toString() + ")"
+        or
+        index = nAttr and result = e.getBase() and partialPredicateCall = "Base()"
         or
         index = nBase and result = e.getIndex() and partialPredicateCall = "Index()"
       )
     )
   }
 
-  private Element getImmediateChildOfItemStmt(ItemStmt e, int index, string partialPredicateCall) {
+  private Element getImmediateChildOfInferType(InferType e, int index, string partialPredicateCall) {
+    exists(int b, int bTypeRef, int n |
+      b = 0 and
+      bTypeRef = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfTypeRef(e, i, _)) | i) and
+      n = bTypeRef and
+      (
+        none()
+        or
+        result = getImmediateChildOfTypeRef(e, index - b, partialPredicateCall)
+      )
+    )
+  }
+
+  private Element getImmediateChildOfItem(Item e, int index, string partialPredicateCall) {
     exists(int b, int bStmt, int n |
       b = 0 and
       bStmt = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfStmt(e, i, _)) | i) and
@@ -652,51 +1901,363 @@ private module Impl {
   }
 
   private Element getImmediateChildOfLetExpr(LetExpr e, int index, string partialPredicateCall) {
-    exists(int b, int bExpr, int n, int nPat, int nExpr |
+    exists(int b, int bExpr, int n, int nAttr, int nExpr, int nPat |
       b = 0 and
       bExpr = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfExpr(e, i, _)) | i) and
       n = bExpr and
-      nPat = n + 1 and
-      nExpr = nPat + 1 and
+      nAttr = n + 1 + max(int i | i = -1 or exists(e.getAttr(i)) | i) and
+      nExpr = nAttr + 1 and
+      nPat = nExpr + 1 and
       (
         none()
         or
         result = getImmediateChildOfExpr(e, index - b, partialPredicateCall)
         or
-        index = n and result = e.getPat() and partialPredicateCall = "Pat()"
+        result = e.getAttr(index - n) and
+        partialPredicateCall = "Attr(" + (index - n).toString() + ")"
         or
-        index = nPat and result = e.getExpr() and partialPredicateCall = "Expr()"
+        index = nAttr and result = e.getExpr() and partialPredicateCall = "Expr()"
+        or
+        index = nExpr and result = e.getPat() and partialPredicateCall = "Pat()"
       )
     )
   }
 
   private Element getImmediateChildOfLetStmt(LetStmt e, int index, string partialPredicateCall) {
-    exists(int b, int bStmt, int n, int nPat, int nType, int nInitializer, int nElse |
+    exists(int b, int bStmt, int n, int nAttr, int nInitializer, int nLetElse, int nPat, int nTy |
       b = 0 and
       bStmt = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfStmt(e, i, _)) | i) and
       n = bStmt and
-      nPat = n + 1 and
-      nType = nPat + 1 and
-      nInitializer = nType + 1 and
-      nElse = nInitializer + 1 and
+      nAttr = n + 1 + max(int i | i = -1 or exists(e.getAttr(i)) | i) and
+      nInitializer = nAttr + 1 and
+      nLetElse = nInitializer + 1 and
+      nPat = nLetElse + 1 and
+      nTy = nPat + 1 and
       (
         none()
         or
         result = getImmediateChildOfStmt(e, index - b, partialPredicateCall)
         or
-        index = n and result = e.getPat() and partialPredicateCall = "Pat()"
+        result = e.getAttr(index - n) and
+        partialPredicateCall = "Attr(" + (index - n).toString() + ")"
         or
-        index = nPat and result = e.getType() and partialPredicateCall = "Type()"
+        index = nAttr and result = e.getInitializer() and partialPredicateCall = "Initializer()"
         or
-        index = nType and result = e.getInitializer() and partialPredicateCall = "Initializer()"
+        index = nInitializer and result = e.getLetElse() and partialPredicateCall = "LetElse()"
         or
-        index = nInitializer and result = e.getElse() and partialPredicateCall = "Else()"
+        index = nLetElse and result = e.getPat() and partialPredicateCall = "Pat()"
+        or
+        index = nPat and result = e.getTy() and partialPredicateCall = "Ty()"
+      )
+    )
+  }
+
+  private Element getImmediateChildOfLifetimeArg(
+    LifetimeArg e, int index, string partialPredicateCall
+  ) {
+    exists(int b, int bGenericArg, int n, int nLifetime |
+      b = 0 and
+      bGenericArg =
+        b + 1 + max(int i | i = -1 or exists(getImmediateChildOfGenericArg(e, i, _)) | i) and
+      n = bGenericArg and
+      nLifetime = n + 1 and
+      (
+        none()
+        or
+        result = getImmediateChildOfGenericArg(e, index - b, partialPredicateCall)
+        or
+        index = n and result = e.getLifetime() and partialPredicateCall = "Lifetime()"
+      )
+    )
+  }
+
+  private Element getImmediateChildOfLifetimeParam(
+    LifetimeParam e, int index, string partialPredicateCall
+  ) {
+    exists(int b, int bGenericParam, int n, int nAttr, int nLifetime, int nTypeBoundList |
+      b = 0 and
+      bGenericParam =
+        b + 1 + max(int i | i = -1 or exists(getImmediateChildOfGenericParam(e, i, _)) | i) and
+      n = bGenericParam and
+      nAttr = n + 1 + max(int i | i = -1 or exists(e.getAttr(i)) | i) and
+      nLifetime = nAttr + 1 and
+      nTypeBoundList = nLifetime + 1 and
+      (
+        none()
+        or
+        result = getImmediateChildOfGenericParam(e, index - b, partialPredicateCall)
+        or
+        result = e.getAttr(index - n) and
+        partialPredicateCall = "Attr(" + (index - n).toString() + ")"
+        or
+        index = nAttr and result = e.getLifetime() and partialPredicateCall = "Lifetime()"
+        or
+        index = nLifetime and
+        result = e.getTypeBoundList() and
+        partialPredicateCall = "TypeBoundList()"
       )
     )
   }
 
   private Element getImmediateChildOfLiteralExpr(
     LiteralExpr e, int index, string partialPredicateCall
+  ) {
+    exists(int b, int bExpr, int n, int nAttr |
+      b = 0 and
+      bExpr = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfExpr(e, i, _)) | i) and
+      n = bExpr and
+      nAttr = n + 1 + max(int i | i = -1 or exists(e.getAttr(i)) | i) and
+      (
+        none()
+        or
+        result = getImmediateChildOfExpr(e, index - b, partialPredicateCall)
+        or
+        result = e.getAttr(index - n) and
+        partialPredicateCall = "Attr(" + (index - n).toString() + ")"
+      )
+    )
+  }
+
+  private Element getImmediateChildOfLiteralPat(LiteralPat e, int index, string partialPredicateCall) {
+    exists(int b, int bPat, int n, int nLiteral |
+      b = 0 and
+      bPat = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfPat(e, i, _)) | i) and
+      n = bPat and
+      nLiteral = n + 1 and
+      (
+        none()
+        or
+        result = getImmediateChildOfPat(e, index - b, partialPredicateCall)
+        or
+        index = n and result = e.getLiteral() and partialPredicateCall = "Literal()"
+      )
+    )
+  }
+
+  private Element getImmediateChildOfLoopExpr(LoopExpr e, int index, string partialPredicateCall) {
+    exists(int b, int bExpr, int n, int nAttr, int nLabel, int nLoopBody |
+      b = 0 and
+      bExpr = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfExpr(e, i, _)) | i) and
+      n = bExpr and
+      nAttr = n + 1 + max(int i | i = -1 or exists(e.getAttr(i)) | i) and
+      nLabel = nAttr + 1 and
+      nLoopBody = nLabel + 1 and
+      (
+        none()
+        or
+        result = getImmediateChildOfExpr(e, index - b, partialPredicateCall)
+        or
+        result = e.getAttr(index - n) and
+        partialPredicateCall = "Attr(" + (index - n).toString() + ")"
+        or
+        index = nAttr and result = e.getLabel() and partialPredicateCall = "Label()"
+        or
+        index = nLabel and result = e.getLoopBody() and partialPredicateCall = "LoopBody()"
+      )
+    )
+  }
+
+  private Element getImmediateChildOfMacroExpr(MacroExpr e, int index, string partialPredicateCall) {
+    exists(int b, int bExpr, int n, int nMacroCall |
+      b = 0 and
+      bExpr = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfExpr(e, i, _)) | i) and
+      n = bExpr and
+      nMacroCall = n + 1 and
+      (
+        none()
+        or
+        result = getImmediateChildOfExpr(e, index - b, partialPredicateCall)
+        or
+        index = n and result = e.getMacroCall() and partialPredicateCall = "MacroCall()"
+      )
+    )
+  }
+
+  private Element getImmediateChildOfMacroPat(MacroPat e, int index, string partialPredicateCall) {
+    exists(int b, int bPat, int n, int nMacroCall |
+      b = 0 and
+      bPat = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfPat(e, i, _)) | i) and
+      n = bPat and
+      nMacroCall = n + 1 and
+      (
+        none()
+        or
+        result = getImmediateChildOfPat(e, index - b, partialPredicateCall)
+        or
+        index = n and result = e.getMacroCall() and partialPredicateCall = "MacroCall()"
+      )
+    )
+  }
+
+  private Element getImmediateChildOfMacroType(MacroType e, int index, string partialPredicateCall) {
+    exists(int b, int bTypeRef, int n, int nMacroCall |
+      b = 0 and
+      bTypeRef = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfTypeRef(e, i, _)) | i) and
+      n = bTypeRef and
+      nMacroCall = n + 1 and
+      (
+        none()
+        or
+        result = getImmediateChildOfTypeRef(e, index - b, partialPredicateCall)
+        or
+        index = n and result = e.getMacroCall() and partialPredicateCall = "MacroCall()"
+      )
+    )
+  }
+
+  private Element getImmediateChildOfMatchExpr(MatchExpr e, int index, string partialPredicateCall) {
+    exists(int b, int bExpr, int n, int nAttr, int nExpr, int nMatchArmList |
+      b = 0 and
+      bExpr = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfExpr(e, i, _)) | i) and
+      n = bExpr and
+      nAttr = n + 1 + max(int i | i = -1 or exists(e.getAttr(i)) | i) and
+      nExpr = nAttr + 1 and
+      nMatchArmList = nExpr + 1 and
+      (
+        none()
+        or
+        result = getImmediateChildOfExpr(e, index - b, partialPredicateCall)
+        or
+        result = e.getAttr(index - n) and
+        partialPredicateCall = "Attr(" + (index - n).toString() + ")"
+        or
+        index = nAttr and result = e.getExpr() and partialPredicateCall = "Expr()"
+        or
+        index = nExpr and result = e.getMatchArmList() and partialPredicateCall = "MatchArmList()"
+      )
+    )
+  }
+
+  private Element getImmediateChildOfNeverType(NeverType e, int index, string partialPredicateCall) {
+    exists(int b, int bTypeRef, int n |
+      b = 0 and
+      bTypeRef = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfTypeRef(e, i, _)) | i) and
+      n = bTypeRef and
+      (
+        none()
+        or
+        result = getImmediateChildOfTypeRef(e, index - b, partialPredicateCall)
+      )
+    )
+  }
+
+  private Element getImmediateChildOfOffsetOfExpr(
+    OffsetOfExpr e, int index, string partialPredicateCall
+  ) {
+    exists(int b, int bExpr, int n, int nAttr, int nField, int nTy |
+      b = 0 and
+      bExpr = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfExpr(e, i, _)) | i) and
+      n = bExpr and
+      nAttr = n + 1 + max(int i | i = -1 or exists(e.getAttr(i)) | i) and
+      nField = nAttr + 1 + max(int i | i = -1 or exists(e.getField(i)) | i) and
+      nTy = nField + 1 and
+      (
+        none()
+        or
+        result = getImmediateChildOfExpr(e, index - b, partialPredicateCall)
+        or
+        result = e.getAttr(index - n) and
+        partialPredicateCall = "Attr(" + (index - n).toString() + ")"
+        or
+        result = e.getField(index - nAttr) and
+        partialPredicateCall = "Field(" + (index - nAttr).toString() + ")"
+        or
+        index = nField and result = e.getTy() and partialPredicateCall = "Ty()"
+      )
+    )
+  }
+
+  private Element getImmediateChildOfOrPat(OrPat e, int index, string partialPredicateCall) {
+    exists(int b, int bPat, int n, int nPat |
+      b = 0 and
+      bPat = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfPat(e, i, _)) | i) and
+      n = bPat and
+      nPat = n + 1 + max(int i | i = -1 or exists(e.getPat(i)) | i) and
+      (
+        none()
+        or
+        result = getImmediateChildOfPat(e, index - b, partialPredicateCall)
+        or
+        result = e.getPat(index - n) and
+        partialPredicateCall = "Pat(" + (index - n).toString() + ")"
+      )
+    )
+  }
+
+  private Element getImmediateChildOfParenExpr(ParenExpr e, int index, string partialPredicateCall) {
+    exists(int b, int bExpr, int n, int nAttr, int nExpr |
+      b = 0 and
+      bExpr = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfExpr(e, i, _)) | i) and
+      n = bExpr and
+      nAttr = n + 1 + max(int i | i = -1 or exists(e.getAttr(i)) | i) and
+      nExpr = nAttr + 1 and
+      (
+        none()
+        or
+        result = getImmediateChildOfExpr(e, index - b, partialPredicateCall)
+        or
+        result = e.getAttr(index - n) and
+        partialPredicateCall = "Attr(" + (index - n).toString() + ")"
+        or
+        index = nAttr and result = e.getExpr() and partialPredicateCall = "Expr()"
+      )
+    )
+  }
+
+  private Element getImmediateChildOfParenPat(ParenPat e, int index, string partialPredicateCall) {
+    exists(int b, int bPat, int n, int nPat |
+      b = 0 and
+      bPat = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfPat(e, i, _)) | i) and
+      n = bPat and
+      nPat = n + 1 and
+      (
+        none()
+        or
+        result = getImmediateChildOfPat(e, index - b, partialPredicateCall)
+        or
+        index = n and result = e.getPat() and partialPredicateCall = "Pat()"
+      )
+    )
+  }
+
+  private Element getImmediateChildOfParenType(ParenType e, int index, string partialPredicateCall) {
+    exists(int b, int bTypeRef, int n, int nTy |
+      b = 0 and
+      bTypeRef = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfTypeRef(e, i, _)) | i) and
+      n = bTypeRef and
+      nTy = n + 1 and
+      (
+        none()
+        or
+        result = getImmediateChildOfTypeRef(e, index - b, partialPredicateCall)
+        or
+        index = n and result = e.getTy() and partialPredicateCall = "Ty()"
+      )
+    )
+  }
+
+  private Element getImmediateChildOfPath(Path e, int index, string partialPredicateCall) {
+    exists(int b, int bResolvable, int n, int nQualifier, int nPart |
+      b = 0 and
+      bResolvable =
+        b + 1 + max(int i | i = -1 or exists(getImmediateChildOfResolvable(e, i, _)) | i) and
+      n = bResolvable and
+      nQualifier = n + 1 and
+      nPart = nQualifier + 1 and
+      (
+        none()
+        or
+        result = getImmediateChildOfResolvable(e, index - b, partialPredicateCall)
+        or
+        index = n and result = e.getQualifier() and partialPredicateCall = "Qualifier()"
+        or
+        index = nQualifier and result = e.getPart() and partialPredicateCall = "Part()"
+      )
+    )
+  }
+
+  private Element getImmediateChildOfPathExprBase(
+    PathExprBase e, int index, string partialPredicateCall
   ) {
     exists(int b, int bExpr, int n |
       b = 0 and
@@ -710,189 +2271,6 @@ private module Impl {
     )
   }
 
-  private Element getImmediateChildOfLiteralPat(LiteralPat e, int index, string partialPredicateCall) {
-    exists(int b, int bPat, int n, int nExpr |
-      b = 0 and
-      bPat = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfPat(e, i, _)) | i) and
-      n = bPat and
-      nExpr = n + 1 and
-      (
-        none()
-        or
-        result = getImmediateChildOfPat(e, index - b, partialPredicateCall)
-        or
-        index = n and result = e.getExpr() and partialPredicateCall = "Expr()"
-      )
-    )
-  }
-
-  private Element getImmediateChildOfLoopExpr(LoopExpr e, int index, string partialPredicateCall) {
-    exists(int b, int bExpr, int n, int nBody, int nLabel |
-      b = 0 and
-      bExpr = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfExpr(e, i, _)) | i) and
-      n = bExpr and
-      nBody = n + 1 and
-      nLabel = nBody + 1 and
-      (
-        none()
-        or
-        result = getImmediateChildOfExpr(e, index - b, partialPredicateCall)
-        or
-        index = n and result = e.getBody() and partialPredicateCall = "Body()"
-        or
-        index = nBody and result = e.getLabel() and partialPredicateCall = "Label()"
-      )
-    )
-  }
-
-  private Element getImmediateChildOfMatchExpr(MatchExpr e, int index, string partialPredicateCall) {
-    exists(int b, int bExpr, int n, int nExpr, int nBranch |
-      b = 0 and
-      bExpr = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfExpr(e, i, _)) | i) and
-      n = bExpr and
-      nExpr = n + 1 and
-      nBranch = nExpr + 1 + max(int i | i = -1 or exists(e.getBranch(i)) | i) and
-      (
-        none()
-        or
-        result = getImmediateChildOfExpr(e, index - b, partialPredicateCall)
-        or
-        index = n and result = e.getExpr() and partialPredicateCall = "Expr()"
-        or
-        result = e.getBranch(index - nExpr) and
-        partialPredicateCall = "Branch(" + (index - nExpr).toString() + ")"
-      )
-    )
-  }
-
-  private Element getImmediateChildOfMethodCallExpr(
-    MethodCallExpr e, int index, string partialPredicateCall
-  ) {
-    exists(int b, int bExpr, int n, int nReceiver, int nArg, int nGenericArgs |
-      b = 0 and
-      bExpr = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfExpr(e, i, _)) | i) and
-      n = bExpr and
-      nReceiver = n + 1 and
-      nArg = nReceiver + 1 + max(int i | i = -1 or exists(e.getArg(i)) | i) and
-      nGenericArgs = nArg + 1 and
-      (
-        none()
-        or
-        result = getImmediateChildOfExpr(e, index - b, partialPredicateCall)
-        or
-        index = n and result = e.getReceiver() and partialPredicateCall = "Receiver()"
-        or
-        result = e.getArg(index - nReceiver) and
-        partialPredicateCall = "Arg(" + (index - nReceiver).toString() + ")"
-        or
-        index = nArg and result = e.getGenericArgs() and partialPredicateCall = "GenericArgs()"
-      )
-    )
-  }
-
-  private Element getImmediateChildOfMissingExpr(
-    MissingExpr e, int index, string partialPredicateCall
-  ) {
-    exists(int b, int bExpr, int bMissing, int n |
-      b = 0 and
-      bExpr = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfExpr(e, i, _)) | i) and
-      bMissing = bExpr + 1 + max(int i | i = -1 or exists(getImmediateChildOfMissing(e, i, _)) | i) and
-      n = bMissing and
-      (
-        none()
-        or
-        result = getImmediateChildOfExpr(e, index - b, partialPredicateCall)
-        or
-        result = getImmediateChildOfMissing(e, index - bExpr, partialPredicateCall)
-      )
-    )
-  }
-
-  private Element getImmediateChildOfMissingPat(MissingPat e, int index, string partialPredicateCall) {
-    exists(int b, int bPat, int bMissing, int n |
-      b = 0 and
-      bPat = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfPat(e, i, _)) | i) and
-      bMissing = bPat + 1 + max(int i | i = -1 or exists(getImmediateChildOfMissing(e, i, _)) | i) and
-      n = bMissing and
-      (
-        none()
-        or
-        result = getImmediateChildOfPat(e, index - b, partialPredicateCall)
-        or
-        result = getImmediateChildOfMissing(e, index - bPat, partialPredicateCall)
-      )
-    )
-  }
-
-  private Element getImmediateChildOfModule(Module e, int index, string partialPredicateCall) {
-    exists(int b, int bDeclaration, int n, int nDeclaration |
-      b = 0 and
-      bDeclaration =
-        b + 1 + max(int i | i = -1 or exists(getImmediateChildOfDeclaration(e, i, _)) | i) and
-      n = bDeclaration and
-      nDeclaration = n + 1 + max(int i | i = -1 or exists(e.getDeclaration(i)) | i) and
-      (
-        none()
-        or
-        result = getImmediateChildOfDeclaration(e, index - b, partialPredicateCall)
-        or
-        result = e.getDeclaration(index - n) and
-        partialPredicateCall = "Declaration(" + (index - n).toString() + ")"
-      )
-    )
-  }
-
-  private Element getImmediateChildOfOffsetOfExpr(
-    OffsetOfExpr e, int index, string partialPredicateCall
-  ) {
-    exists(int b, int bExpr, int n, int nContainer |
-      b = 0 and
-      bExpr = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfExpr(e, i, _)) | i) and
-      n = bExpr and
-      nContainer = n + 1 and
-      (
-        none()
-        or
-        result = getImmediateChildOfExpr(e, index - b, partialPredicateCall)
-        or
-        index = n and result = e.getContainer() and partialPredicateCall = "Container()"
-      )
-    )
-  }
-
-  private Element getImmediateChildOfOrPat(OrPat e, int index, string partialPredicateCall) {
-    exists(int b, int bPat, int n, int nArg |
-      b = 0 and
-      bPat = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfPat(e, i, _)) | i) and
-      n = bPat and
-      nArg = n + 1 + max(int i | i = -1 or exists(e.getArg(i)) | i) and
-      (
-        none()
-        or
-        result = getImmediateChildOfPat(e, index - b, partialPredicateCall)
-        or
-        result = e.getArg(index - n) and
-        partialPredicateCall = "Arg(" + (index - n).toString() + ")"
-      )
-    )
-  }
-
-  private Element getImmediateChildOfPathExpr(PathExpr e, int index, string partialPredicateCall) {
-    exists(int b, int bExpr, int n, int nPath |
-      b = 0 and
-      bExpr = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfExpr(e, i, _)) | i) and
-      n = bExpr and
-      nPath = n + 1 and
-      (
-        none()
-        or
-        result = getImmediateChildOfExpr(e, index - b, partialPredicateCall)
-        or
-        index = n and result = e.getPath() and partialPredicateCall = "Path()"
-      )
-    )
-  }
-
   private Element getImmediateChildOfPathPat(PathPat e, int index, string partialPredicateCall) {
     exists(int b, int bPat, int n, int nPath |
       b = 0 and
@@ -909,68 +2287,107 @@ private module Impl {
     )
   }
 
+  private Element getImmediateChildOfPathType(PathType e, int index, string partialPredicateCall) {
+    exists(int b, int bTypeRef, int n, int nPath |
+      b = 0 and
+      bTypeRef = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfTypeRef(e, i, _)) | i) and
+      n = bTypeRef and
+      nPath = n + 1 and
+      (
+        none()
+        or
+        result = getImmediateChildOfTypeRef(e, index - b, partialPredicateCall)
+        or
+        index = n and result = e.getPath() and partialPredicateCall = "Path()"
+      )
+    )
+  }
+
   private Element getImmediateChildOfPrefixExpr(PrefixExpr e, int index, string partialPredicateCall) {
-    exists(int b, int bExpr, int n, int nExpr |
+    exists(int b, int bExpr, int n, int nAttr, int nExpr |
       b = 0 and
       bExpr = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfExpr(e, i, _)) | i) and
       n = bExpr and
-      nExpr = n + 1 and
+      nAttr = n + 1 + max(int i | i = -1 or exists(e.getAttr(i)) | i) and
+      nExpr = nAttr + 1 and
       (
         none()
         or
         result = getImmediateChildOfExpr(e, index - b, partialPredicateCall)
         or
-        index = n and result = e.getExpr() and partialPredicateCall = "Expr()"
+        result = e.getAttr(index - n) and
+        partialPredicateCall = "Attr(" + (index - n).toString() + ")"
+        or
+        index = nAttr and result = e.getExpr() and partialPredicateCall = "Expr()"
+      )
+    )
+  }
+
+  private Element getImmediateChildOfPtrType(PtrType e, int index, string partialPredicateCall) {
+    exists(int b, int bTypeRef, int n, int nTy |
+      b = 0 and
+      bTypeRef = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfTypeRef(e, i, _)) | i) and
+      n = bTypeRef and
+      nTy = n + 1 and
+      (
+        none()
+        or
+        result = getImmediateChildOfTypeRef(e, index - b, partialPredicateCall)
+        or
+        index = n and result = e.getTy() and partialPredicateCall = "Ty()"
       )
     )
   }
 
   private Element getImmediateChildOfRangeExpr(RangeExpr e, int index, string partialPredicateCall) {
-    exists(int b, int bExpr, int n, int nLhs, int nRhs |
+    exists(int b, int bExpr, int n, int nAttr, int nEnd, int nStart |
       b = 0 and
       bExpr = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfExpr(e, i, _)) | i) and
       n = bExpr and
-      nLhs = n + 1 and
-      nRhs = nLhs + 1 and
+      nAttr = n + 1 + max(int i | i = -1 or exists(e.getAttr(i)) | i) and
+      nEnd = nAttr + 1 and
+      nStart = nEnd + 1 and
       (
         none()
         or
         result = getImmediateChildOfExpr(e, index - b, partialPredicateCall)
         or
-        index = n and result = e.getLhs() and partialPredicateCall = "Lhs()"
+        result = e.getAttr(index - n) and
+        partialPredicateCall = "Attr(" + (index - n).toString() + ")"
         or
-        index = nLhs and result = e.getRhs() and partialPredicateCall = "Rhs()"
+        index = nAttr and result = e.getEnd() and partialPredicateCall = "End()"
+        or
+        index = nEnd and result = e.getStart() and partialPredicateCall = "Start()"
       )
     )
   }
 
   private Element getImmediateChildOfRangePat(RangePat e, int index, string partialPredicateCall) {
-    exists(int b, int bPat, int n, int nStart, int nEnd |
+    exists(int b, int bPat, int n, int nEnd, int nStart |
       b = 0 and
       bPat = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfPat(e, i, _)) | i) and
       n = bPat and
-      nStart = n + 1 and
-      nEnd = nStart + 1 and
+      nEnd = n + 1 and
+      nStart = nEnd + 1 and
       (
         none()
         or
         result = getImmediateChildOfPat(e, index - b, partialPredicateCall)
         or
-        index = n and result = e.getStart() and partialPredicateCall = "Start()"
+        index = n and result = e.getEnd() and partialPredicateCall = "End()"
         or
-        index = nStart and result = e.getEnd() and partialPredicateCall = "End()"
+        index = nEnd and result = e.getStart() and partialPredicateCall = "Start()"
       )
     )
   }
 
   private Element getImmediateChildOfRecordExpr(RecordExpr e, int index, string partialPredicateCall) {
-    exists(int b, int bExpr, int n, int nPath, int nFld, int nSpread |
+    exists(int b, int bExpr, int n, int nPath, int nRecordExprFieldList |
       b = 0 and
       bExpr = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfExpr(e, i, _)) | i) and
       n = bExpr and
       nPath = n + 1 and
-      nFld = nPath + 1 + max(int i | i = -1 or exists(e.getFld(i)) | i) and
-      nSpread = nFld + 1 and
+      nRecordExprFieldList = nPath + 1 and
       (
         none()
         or
@@ -978,21 +2395,39 @@ private module Impl {
         or
         index = n and result = e.getPath() and partialPredicateCall = "Path()"
         or
-        result = e.getFld(index - nPath) and
-        partialPredicateCall = "Fld(" + (index - nPath).toString() + ")"
+        index = nPath and
+        result = e.getRecordExprFieldList() and
+        partialPredicateCall = "RecordExprFieldList()"
+      )
+    )
+  }
+
+  private Element getImmediateChildOfRecordFieldList(
+    RecordFieldList e, int index, string partialPredicateCall
+  ) {
+    exists(int b, int bFieldList, int n, int nField |
+      b = 0 and
+      bFieldList = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfFieldList(e, i, _)) | i) and
+      n = bFieldList and
+      nField = n + 1 + max(int i | i = -1 or exists(e.getField(i)) | i) and
+      (
+        none()
         or
-        index = nFld and result = e.getSpread() and partialPredicateCall = "Spread()"
+        result = getImmediateChildOfFieldList(e, index - b, partialPredicateCall)
+        or
+        result = e.getField(index - n) and
+        partialPredicateCall = "Field(" + (index - n).toString() + ")"
       )
     )
   }
 
   private Element getImmediateChildOfRecordPat(RecordPat e, int index, string partialPredicateCall) {
-    exists(int b, int bPat, int n, int nPath, int nFld |
+    exists(int b, int bPat, int n, int nPath, int nRecordPatFieldList |
       b = 0 and
       bPat = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfPat(e, i, _)) | i) and
       n = bPat and
       nPath = n + 1 and
-      nFld = nPath + 1 + max(int i | i = -1 or exists(e.getFld(i)) | i) and
+      nRecordPatFieldList = nPath + 1 and
       (
         none()
         or
@@ -1000,24 +2435,29 @@ private module Impl {
         or
         index = n and result = e.getPath() and partialPredicateCall = "Path()"
         or
-        result = e.getFld(index - nPath) and
-        partialPredicateCall = "Fld(" + (index - nPath).toString() + ")"
+        index = nPath and
+        result = e.getRecordPatFieldList() and
+        partialPredicateCall = "RecordPatFieldList()"
       )
     )
   }
 
   private Element getImmediateChildOfRefExpr(RefExpr e, int index, string partialPredicateCall) {
-    exists(int b, int bExpr, int n, int nExpr |
+    exists(int b, int bExpr, int n, int nAttr, int nExpr |
       b = 0 and
       bExpr = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfExpr(e, i, _)) | i) and
       n = bExpr and
-      nExpr = n + 1 and
+      nAttr = n + 1 + max(int i | i = -1 or exists(e.getAttr(i)) | i) and
+      nExpr = nAttr + 1 and
       (
         none()
         or
         result = getImmediateChildOfExpr(e, index - b, partialPredicateCall)
         or
-        index = n and result = e.getExpr() and partialPredicateCall = "Expr()"
+        result = e.getAttr(index - n) and
+        partialPredicateCall = "Attr(" + (index - n).toString() + ")"
+        or
+        index = nAttr and result = e.getExpr() and partialPredicateCall = "Expr()"
       )
     )
   }
@@ -1038,76 +2478,168 @@ private module Impl {
     )
   }
 
+  private Element getImmediateChildOfRefType(RefType e, int index, string partialPredicateCall) {
+    exists(int b, int bTypeRef, int n, int nLifetime, int nTy |
+      b = 0 and
+      bTypeRef = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfTypeRef(e, i, _)) | i) and
+      n = bTypeRef and
+      nLifetime = n + 1 and
+      nTy = nLifetime + 1 and
+      (
+        none()
+        or
+        result = getImmediateChildOfTypeRef(e, index - b, partialPredicateCall)
+        or
+        index = n and result = e.getLifetime() and partialPredicateCall = "Lifetime()"
+        or
+        index = nLifetime and result = e.getTy() and partialPredicateCall = "Ty()"
+      )
+    )
+  }
+
+  private Element getImmediateChildOfRestPat(RestPat e, int index, string partialPredicateCall) {
+    exists(int b, int bPat, int n, int nAttr |
+      b = 0 and
+      bPat = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfPat(e, i, _)) | i) and
+      n = bPat and
+      nAttr = n + 1 + max(int i | i = -1 or exists(e.getAttr(i)) | i) and
+      (
+        none()
+        or
+        result = getImmediateChildOfPat(e, index - b, partialPredicateCall)
+        or
+        result = e.getAttr(index - n) and
+        partialPredicateCall = "Attr(" + (index - n).toString() + ")"
+      )
+    )
+  }
+
   private Element getImmediateChildOfReturnExpr(ReturnExpr e, int index, string partialPredicateCall) {
-    exists(int b, int bExpr, int n, int nExpr |
+    exists(int b, int bExpr, int n, int nAttr, int nExpr |
       b = 0 and
       bExpr = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfExpr(e, i, _)) | i) and
       n = bExpr and
-      nExpr = n + 1 and
+      nAttr = n + 1 + max(int i | i = -1 or exists(e.getAttr(i)) | i) and
+      nExpr = nAttr + 1 and
       (
         none()
         or
         result = getImmediateChildOfExpr(e, index - b, partialPredicateCall)
         or
-        index = n and result = e.getExpr() and partialPredicateCall = "Expr()"
+        result = e.getAttr(index - n) and
+        partialPredicateCall = "Attr(" + (index - n).toString() + ")"
+        or
+        index = nAttr and result = e.getExpr() and partialPredicateCall = "Expr()"
       )
     )
   }
 
   private Element getImmediateChildOfSlicePat(SlicePat e, int index, string partialPredicateCall) {
-    exists(int b, int bPat, int n, int nPrefix, int nSlice, int nSuffix |
+    exists(int b, int bPat, int n, int nPat |
       b = 0 and
       bPat = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfPat(e, i, _)) | i) and
       n = bPat and
-      nPrefix = n + 1 + max(int i | i = -1 or exists(e.getPrefix(i)) | i) and
-      nSlice = nPrefix + 1 and
-      nSuffix = nSlice + 1 + max(int i | i = -1 or exists(e.getSuffix(i)) | i) and
+      nPat = n + 1 + max(int i | i = -1 or exists(e.getPat(i)) | i) and
       (
         none()
         or
         result = getImmediateChildOfPat(e, index - b, partialPredicateCall)
         or
-        result = e.getPrefix(index - n) and
-        partialPredicateCall = "Prefix(" + (index - n).toString() + ")"
-        or
-        index = nPrefix and result = e.getSlice() and partialPredicateCall = "Slice()"
-        or
-        result = e.getSuffix(index - nSlice) and
-        partialPredicateCall = "Suffix(" + (index - nSlice).toString() + ")"
+        result = e.getPat(index - n) and
+        partialPredicateCall = "Pat(" + (index - n).toString() + ")"
       )
     )
   }
 
-  private Element getImmediateChildOfTupleExpr(TupleExpr e, int index, string partialPredicateCall) {
-    exists(int b, int bExpr, int n, int nExpr |
+  private Element getImmediateChildOfSliceType(SliceType e, int index, string partialPredicateCall) {
+    exists(int b, int bTypeRef, int n, int nTy |
+      b = 0 and
+      bTypeRef = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfTypeRef(e, i, _)) | i) and
+      n = bTypeRef and
+      nTy = n + 1 and
+      (
+        none()
+        or
+        result = getImmediateChildOfTypeRef(e, index - b, partialPredicateCall)
+        or
+        index = n and result = e.getTy() and partialPredicateCall = "Ty()"
+      )
+    )
+  }
+
+  private Element getImmediateChildOfTryExpr(TryExpr e, int index, string partialPredicateCall) {
+    exists(int b, int bExpr, int n, int nAttr, int nExpr |
       b = 0 and
       bExpr = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfExpr(e, i, _)) | i) and
       n = bExpr and
-      nExpr = n + 1 + max(int i | i = -1 or exists(e.getExpr(i)) | i) and
+      nAttr = n + 1 + max(int i | i = -1 or exists(e.getAttr(i)) | i) and
+      nExpr = nAttr + 1 and
       (
         none()
         or
         result = getImmediateChildOfExpr(e, index - b, partialPredicateCall)
         or
-        result = e.getExpr(index - n) and
-        partialPredicateCall = "Expr(" + (index - n).toString() + ")"
+        result = e.getAttr(index - n) and
+        partialPredicateCall = "Attr(" + (index - n).toString() + ")"
+        or
+        index = nAttr and result = e.getExpr() and partialPredicateCall = "Expr()"
+      )
+    )
+  }
+
+  private Element getImmediateChildOfTupleExpr(TupleExpr e, int index, string partialPredicateCall) {
+    exists(int b, int bExpr, int n, int nAttr, int nField |
+      b = 0 and
+      bExpr = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfExpr(e, i, _)) | i) and
+      n = bExpr and
+      nAttr = n + 1 + max(int i | i = -1 or exists(e.getAttr(i)) | i) and
+      nField = nAttr + 1 + max(int i | i = -1 or exists(e.getField(i)) | i) and
+      (
+        none()
+        or
+        result = getImmediateChildOfExpr(e, index - b, partialPredicateCall)
+        or
+        result = e.getAttr(index - n) and
+        partialPredicateCall = "Attr(" + (index - n).toString() + ")"
+        or
+        result = e.getField(index - nAttr) and
+        partialPredicateCall = "Field(" + (index - nAttr).toString() + ")"
+      )
+    )
+  }
+
+  private Element getImmediateChildOfTupleFieldList(
+    TupleFieldList e, int index, string partialPredicateCall
+  ) {
+    exists(int b, int bFieldList, int n, int nField |
+      b = 0 and
+      bFieldList = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfFieldList(e, i, _)) | i) and
+      n = bFieldList and
+      nField = n + 1 + max(int i | i = -1 or exists(e.getField(i)) | i) and
+      (
+        none()
+        or
+        result = getImmediateChildOfFieldList(e, index - b, partialPredicateCall)
+        or
+        result = e.getField(index - n) and
+        partialPredicateCall = "Field(" + (index - n).toString() + ")"
       )
     )
   }
 
   private Element getImmediateChildOfTuplePat(TuplePat e, int index, string partialPredicateCall) {
-    exists(int b, int bPat, int n, int nArg |
+    exists(int b, int bPat, int n, int nField |
       b = 0 and
       bPat = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfPat(e, i, _)) | i) and
       n = bPat and
-      nArg = n + 1 + max(int i | i = -1 or exists(e.getArg(i)) | i) and
+      nField = n + 1 + max(int i | i = -1 or exists(e.getField(i)) | i) and
       (
         none()
         or
         result = getImmediateChildOfPat(e, index - b, partialPredicateCall)
         or
-        result = e.getArg(index - n) and
-        partialPredicateCall = "Arg(" + (index - n).toString() + ")"
+        result = e.getField(index - n) and
+        partialPredicateCall = "Field(" + (index - n).toString() + ")"
       )
     )
   }
@@ -1115,21 +2647,84 @@ private module Impl {
   private Element getImmediateChildOfTupleStructPat(
     TupleStructPat e, int index, string partialPredicateCall
   ) {
-    exists(int b, int bPat, int n, int nPath, int nArg |
+    exists(int b, int bPat, int n, int nField, int nPath |
       b = 0 and
       bPat = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfPat(e, i, _)) | i) and
       n = bPat and
-      nPath = n + 1 and
-      nArg = nPath + 1 + max(int i | i = -1 or exists(e.getArg(i)) | i) and
+      nField = n + 1 + max(int i | i = -1 or exists(e.getField(i)) | i) and
+      nPath = nField + 1 and
       (
         none()
         or
         result = getImmediateChildOfPat(e, index - b, partialPredicateCall)
         or
-        index = n and result = e.getPath() and partialPredicateCall = "Path()"
+        result = e.getField(index - n) and
+        partialPredicateCall = "Field(" + (index - n).toString() + ")"
         or
-        result = e.getArg(index - nPath) and
-        partialPredicateCall = "Arg(" + (index - nPath).toString() + ")"
+        index = nField and result = e.getPath() and partialPredicateCall = "Path()"
+      )
+    )
+  }
+
+  private Element getImmediateChildOfTupleType(TupleType e, int index, string partialPredicateCall) {
+    exists(int b, int bTypeRef, int n, int nField |
+      b = 0 and
+      bTypeRef = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfTypeRef(e, i, _)) | i) and
+      n = bTypeRef and
+      nField = n + 1 + max(int i | i = -1 or exists(e.getField(i)) | i) and
+      (
+        none()
+        or
+        result = getImmediateChildOfTypeRef(e, index - b, partialPredicateCall)
+        or
+        result = e.getField(index - n) and
+        partialPredicateCall = "Field(" + (index - n).toString() + ")"
+      )
+    )
+  }
+
+  private Element getImmediateChildOfTypeArg(TypeArg e, int index, string partialPredicateCall) {
+    exists(int b, int bGenericArg, int n, int nTy |
+      b = 0 and
+      bGenericArg =
+        b + 1 + max(int i | i = -1 or exists(getImmediateChildOfGenericArg(e, i, _)) | i) and
+      n = bGenericArg and
+      nTy = n + 1 and
+      (
+        none()
+        or
+        result = getImmediateChildOfGenericArg(e, index - b, partialPredicateCall)
+        or
+        index = n and result = e.getTy() and partialPredicateCall = "Ty()"
+      )
+    )
+  }
+
+  private Element getImmediateChildOfTypeParam(TypeParam e, int index, string partialPredicateCall) {
+    exists(
+      int b, int bGenericParam, int n, int nAttr, int nDefaultType, int nName, int nTypeBoundList
+    |
+      b = 0 and
+      bGenericParam =
+        b + 1 + max(int i | i = -1 or exists(getImmediateChildOfGenericParam(e, i, _)) | i) and
+      n = bGenericParam and
+      nAttr = n + 1 + max(int i | i = -1 or exists(e.getAttr(i)) | i) and
+      nDefaultType = nAttr + 1 and
+      nName = nDefaultType + 1 and
+      nTypeBoundList = nName + 1 and
+      (
+        none()
+        or
+        result = getImmediateChildOfGenericParam(e, index - b, partialPredicateCall)
+        or
+        result = e.getAttr(index - n) and
+        partialPredicateCall = "Attr(" + (index - n).toString() + ")"
+        or
+        index = nAttr and result = e.getDefaultType() and partialPredicateCall = "DefaultType()"
+        or
+        index = nDefaultType and result = e.getName() and partialPredicateCall = "Name()"
+        or
+        index = nName and result = e.getTypeBoundList() and partialPredicateCall = "TypeBoundList()"
       )
     )
   }
@@ -1137,35 +2732,44 @@ private module Impl {
   private Element getImmediateChildOfUnderscoreExpr(
     UnderscoreExpr e, int index, string partialPredicateCall
   ) {
-    exists(int b, int bExpr, int n |
+    exists(int b, int bExpr, int n, int nAttr |
       b = 0 and
       bExpr = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfExpr(e, i, _)) | i) and
       n = bExpr and
+      nAttr = n + 1 + max(int i | i = -1 or exists(e.getAttr(i)) | i) and
       (
         none()
         or
         result = getImmediateChildOfExpr(e, index - b, partialPredicateCall)
+        or
+        result = e.getAttr(index - n) and
+        partialPredicateCall = "Attr(" + (index - n).toString() + ")"
       )
     )
   }
 
-  private Element getImmediateChildOfUnimplementedDeclaration(
-    UnimplementedDeclaration e, int index, string partialPredicateCall
-  ) {
-    exists(int b, int bDeclaration, int bUnimplemented, int n |
+  private Element getImmediateChildOfWhileExpr(WhileExpr e, int index, string partialPredicateCall) {
+    exists(int b, int bExpr, int n, int nAttr, int nCondition, int nLabel, int nLoopBody |
       b = 0 and
-      bDeclaration =
-        b + 1 + max(int i | i = -1 or exists(getImmediateChildOfDeclaration(e, i, _)) | i) and
-      bUnimplemented =
-        bDeclaration + 1 +
-          max(int i | i = -1 or exists(getImmediateChildOfUnimplemented(e, i, _)) | i) and
-      n = bUnimplemented and
+      bExpr = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfExpr(e, i, _)) | i) and
+      n = bExpr and
+      nAttr = n + 1 + max(int i | i = -1 or exists(e.getAttr(i)) | i) and
+      nCondition = nAttr + 1 and
+      nLabel = nCondition + 1 and
+      nLoopBody = nLabel + 1 and
       (
         none()
         or
-        result = getImmediateChildOfDeclaration(e, index - b, partialPredicateCall)
+        result = getImmediateChildOfExpr(e, index - b, partialPredicateCall)
         or
-        result = getImmediateChildOfUnimplemented(e, index - bDeclaration, partialPredicateCall)
+        result = e.getAttr(index - n) and
+        partialPredicateCall = "Attr(" + (index - n).toString() + ")"
+        or
+        index = nAttr and result = e.getCondition() and partialPredicateCall = "Condition()"
+        or
+        index = nCondition and result = e.getLabel() and partialPredicateCall = "Label()"
+        or
+        index = nLabel and result = e.getLoopBody() and partialPredicateCall = "LoopBody()"
       )
     )
   }
@@ -1186,120 +2790,747 @@ private module Impl {
   }
 
   private Element getImmediateChildOfYeetExpr(YeetExpr e, int index, string partialPredicateCall) {
-    exists(int b, int bExpr, int n, int nExpr |
+    exists(int b, int bExpr, int n, int nAttr, int nExpr |
       b = 0 and
       bExpr = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfExpr(e, i, _)) | i) and
       n = bExpr and
-      nExpr = n + 1 and
+      nAttr = n + 1 + max(int i | i = -1 or exists(e.getAttr(i)) | i) and
+      nExpr = nAttr + 1 and
       (
         none()
         or
         result = getImmediateChildOfExpr(e, index - b, partialPredicateCall)
         or
-        index = n and result = e.getExpr() and partialPredicateCall = "Expr()"
+        result = e.getAttr(index - n) and
+        partialPredicateCall = "Attr(" + (index - n).toString() + ")"
+        or
+        index = nAttr and result = e.getExpr() and partialPredicateCall = "Expr()"
       )
     )
   }
 
   private Element getImmediateChildOfYieldExpr(YieldExpr e, int index, string partialPredicateCall) {
-    exists(int b, int bExpr, int n, int nExpr |
+    exists(int b, int bExpr, int n, int nAttr, int nExpr |
       b = 0 and
       bExpr = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfExpr(e, i, _)) | i) and
       n = bExpr and
-      nExpr = n + 1 and
+      nAttr = n + 1 + max(int i | i = -1 or exists(e.getAttr(i)) | i) and
+      nExpr = nAttr + 1 and
       (
         none()
         or
         result = getImmediateChildOfExpr(e, index - b, partialPredicateCall)
         or
+        result = e.getAttr(index - n) and
+        partialPredicateCall = "Attr(" + (index - n).toString() + ")"
+        or
+        index = nAttr and result = e.getExpr() and partialPredicateCall = "Expr()"
+      )
+    )
+  }
+
+  private Element getImmediateChildOfCallExpr(CallExpr e, int index, string partialPredicateCall) {
+    exists(int b, int bCallExprBase, int n, int nExpr |
+      b = 0 and
+      bCallExprBase =
+        b + 1 + max(int i | i = -1 or exists(getImmediateChildOfCallExprBase(e, i, _)) | i) and
+      n = bCallExprBase and
+      nExpr = n + 1 and
+      (
+        none()
+        or
+        result = getImmediateChildOfCallExprBase(e, index - b, partialPredicateCall)
+        or
         index = n and result = e.getExpr() and partialPredicateCall = "Expr()"
       )
     )
   }
 
-  private Element getImmediateChildOfAsyncBlockExpr(
-    AsyncBlockExpr e, int index, string partialPredicateCall
+  private Element getImmediateChildOfConst(Const e, int index, string partialPredicateCall) {
+    exists(
+      int b, int bAssocItem, int bItem, int n, int nAttr, int nBody, int nName, int nTy,
+      int nVisibility
+    |
+      b = 0 and
+      bAssocItem = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfAssocItem(e, i, _)) | i) and
+      bItem = bAssocItem + 1 + max(int i | i = -1 or exists(getImmediateChildOfItem(e, i, _)) | i) and
+      n = bItem and
+      nAttr = n + 1 + max(int i | i = -1 or exists(e.getAttr(i)) | i) and
+      nBody = nAttr + 1 and
+      nName = nBody + 1 and
+      nTy = nName + 1 and
+      nVisibility = nTy + 1 and
+      (
+        none()
+        or
+        result = getImmediateChildOfAssocItem(e, index - b, partialPredicateCall)
+        or
+        result = getImmediateChildOfItem(e, index - bAssocItem, partialPredicateCall)
+        or
+        result = e.getAttr(index - n) and
+        partialPredicateCall = "Attr(" + (index - n).toString() + ")"
+        or
+        index = nAttr and result = e.getBody() and partialPredicateCall = "Body()"
+        or
+        index = nBody and result = e.getName() and partialPredicateCall = "Name()"
+        or
+        index = nName and result = e.getTy() and partialPredicateCall = "Ty()"
+        or
+        index = nTy and result = e.getVisibility() and partialPredicateCall = "Visibility()"
+      )
+    )
+  }
+
+  private Element getImmediateChildOfEnum(Enum e, int index, string partialPredicateCall) {
+    exists(
+      int b, int bItem, int n, int nAttr, int nGenericParamList, int nName, int nVariantList,
+      int nVisibility, int nWhereClause
+    |
+      b = 0 and
+      bItem = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfItem(e, i, _)) | i) and
+      n = bItem and
+      nAttr = n + 1 + max(int i | i = -1 or exists(e.getAttr(i)) | i) and
+      nGenericParamList = nAttr + 1 and
+      nName = nGenericParamList + 1 and
+      nVariantList = nName + 1 and
+      nVisibility = nVariantList + 1 and
+      nWhereClause = nVisibility + 1 and
+      (
+        none()
+        or
+        result = getImmediateChildOfItem(e, index - b, partialPredicateCall)
+        or
+        result = e.getAttr(index - n) and
+        partialPredicateCall = "Attr(" + (index - n).toString() + ")"
+        or
+        index = nAttr and
+        result = e.getGenericParamList() and
+        partialPredicateCall = "GenericParamList()"
+        or
+        index = nGenericParamList and result = e.getName() and partialPredicateCall = "Name()"
+        or
+        index = nName and result = e.getVariantList() and partialPredicateCall = "VariantList()"
+        or
+        index = nVariantList and
+        result = e.getVisibility() and
+        partialPredicateCall = "Visibility()"
+        or
+        index = nVisibility and
+        result = e.getWhereClause() and
+        partialPredicateCall = "WhereClause()"
+      )
+    )
+  }
+
+  private Element getImmediateChildOfExternBlock(
+    ExternBlock e, int index, string partialPredicateCall
   ) {
-    exists(int b, int bBlockExprBase, int n |
+    exists(int b, int bItem, int n, int nAbi, int nAttr, int nExternItemList |
       b = 0 and
-      bBlockExprBase =
-        b + 1 + max(int i | i = -1 or exists(getImmediateChildOfBlockExprBase(e, i, _)) | i) and
-      n = bBlockExprBase and
+      bItem = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfItem(e, i, _)) | i) and
+      n = bItem and
+      nAbi = n + 1 and
+      nAttr = nAbi + 1 + max(int i | i = -1 or exists(e.getAttr(i)) | i) and
+      nExternItemList = nAttr + 1 and
       (
         none()
         or
-        result = getImmediateChildOfBlockExprBase(e, index - b, partialPredicateCall)
+        result = getImmediateChildOfItem(e, index - b, partialPredicateCall)
+        or
+        index = n and result = e.getAbi() and partialPredicateCall = "Abi()"
+        or
+        result = e.getAttr(index - nAbi) and
+        partialPredicateCall = "Attr(" + (index - nAbi).toString() + ")"
+        or
+        index = nAttr and
+        result = e.getExternItemList() and
+        partialPredicateCall = "ExternItemList()"
       )
     )
   }
 
-  private Element getImmediateChildOfBlockExpr(BlockExpr e, int index, string partialPredicateCall) {
-    exists(int b, int bBlockExprBase, int n, int nLabel |
-      b = 0 and
-      bBlockExprBase =
-        b + 1 + max(int i | i = -1 or exists(getImmediateChildOfBlockExprBase(e, i, _)) | i) and
-      n = bBlockExprBase and
-      nLabel = n + 1 and
-      (
-        none()
-        or
-        result = getImmediateChildOfBlockExprBase(e, index - b, partialPredicateCall)
-        or
-        index = n and result = e.getLabel() and partialPredicateCall = "Label()"
-      )
-    )
-  }
-
-  private Element getImmediateChildOfElementListExpr(
-    ElementListExpr e, int index, string partialPredicateCall
+  private Element getImmediateChildOfExternCrate(
+    ExternCrate e, int index, string partialPredicateCall
   ) {
-    exists(int b, int bArrayExpr, int n, int nElement |
+    exists(int b, int bItem, int n, int nAttr, int nNameRef, int nRename, int nVisibility |
       b = 0 and
-      bArrayExpr = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfArrayExpr(e, i, _)) | i) and
-      n = bArrayExpr and
-      nElement = n + 1 + max(int i | i = -1 or exists(e.getElement(i)) | i) and
+      bItem = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfItem(e, i, _)) | i) and
+      n = bItem and
+      nAttr = n + 1 + max(int i | i = -1 or exists(e.getAttr(i)) | i) and
+      nNameRef = nAttr + 1 and
+      nRename = nNameRef + 1 and
+      nVisibility = nRename + 1 and
       (
         none()
         or
-        result = getImmediateChildOfArrayExpr(e, index - b, partialPredicateCall)
+        result = getImmediateChildOfItem(e, index - b, partialPredicateCall)
         or
-        result = e.getElement(index - n) and
-        partialPredicateCall = "Element(" + (index - n).toString() + ")"
+        result = e.getAttr(index - n) and
+        partialPredicateCall = "Attr(" + (index - n).toString() + ")"
+        or
+        index = nAttr and result = e.getNameRef() and partialPredicateCall = "NameRef()"
+        or
+        index = nNameRef and result = e.getRename() and partialPredicateCall = "Rename()"
+        or
+        index = nRename and result = e.getVisibility() and partialPredicateCall = "Visibility()"
       )
     )
   }
 
-  private Element getImmediateChildOfRepeatExpr(RepeatExpr e, int index, string partialPredicateCall) {
-    exists(int b, int bArrayExpr, int n, int nInitializer, int nRepeat |
-      b = 0 and
-      bArrayExpr = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfArrayExpr(e, i, _)) | i) and
-      n = bArrayExpr and
-      nInitializer = n + 1 and
-      nRepeat = nInitializer + 1 and
-      (
-        none()
-        or
-        result = getImmediateChildOfArrayExpr(e, index - b, partialPredicateCall)
-        or
-        index = n and result = e.getInitializer() and partialPredicateCall = "Initializer()"
-        or
-        index = nInitializer and result = e.getRepeat() and partialPredicateCall = "Repeat()"
-      )
-    )
-  }
-
-  private Element getImmediateChildOfUnsafeBlockExpr(
-    UnsafeBlockExpr e, int index, string partialPredicateCall
+  private Element getImmediateChildOfFormatTemplateVariableAccess(
+    FormatTemplateVariableAccess e, int index, string partialPredicateCall
   ) {
-    exists(int b, int bBlockExprBase, int n |
+    exists(int b, int bPathExprBase, int n |
       b = 0 and
-      bBlockExprBase =
-        b + 1 + max(int i | i = -1 or exists(getImmediateChildOfBlockExprBase(e, i, _)) | i) and
-      n = bBlockExprBase and
+      bPathExprBase =
+        b + 1 + max(int i | i = -1 or exists(getImmediateChildOfPathExprBase(e, i, _)) | i) and
+      n = bPathExprBase and
       (
         none()
         or
-        result = getImmediateChildOfBlockExprBase(e, index - b, partialPredicateCall)
+        result = getImmediateChildOfPathExprBase(e, index - b, partialPredicateCall)
+      )
+    )
+  }
+
+  private Element getImmediateChildOfFunction(Function e, int index, string partialPredicateCall) {
+    exists(
+      int b, int bAssocItem, int bExternItem, int bItem, int bCallable, int n, int nAbi, int nBody,
+      int nGenericParamList, int nName, int nRetType, int nVisibility, int nWhereClause
+    |
+      b = 0 and
+      bAssocItem = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfAssocItem(e, i, _)) | i) and
+      bExternItem =
+        bAssocItem + 1 + max(int i | i = -1 or exists(getImmediateChildOfExternItem(e, i, _)) | i) and
+      bItem = bExternItem + 1 + max(int i | i = -1 or exists(getImmediateChildOfItem(e, i, _)) | i) and
+      bCallable =
+        bItem + 1 + max(int i | i = -1 or exists(getImmediateChildOfCallable(e, i, _)) | i) and
+      n = bCallable and
+      nAbi = n + 1 and
+      nBody = nAbi + 1 and
+      nGenericParamList = nBody + 1 and
+      nName = nGenericParamList + 1 and
+      nRetType = nName + 1 and
+      nVisibility = nRetType + 1 and
+      nWhereClause = nVisibility + 1 and
+      (
+        none()
+        or
+        result = getImmediateChildOfAssocItem(e, index - b, partialPredicateCall)
+        or
+        result = getImmediateChildOfExternItem(e, index - bAssocItem, partialPredicateCall)
+        or
+        result = getImmediateChildOfItem(e, index - bExternItem, partialPredicateCall)
+        or
+        result = getImmediateChildOfCallable(e, index - bItem, partialPredicateCall)
+        or
+        index = n and result = e.getAbi() and partialPredicateCall = "Abi()"
+        or
+        index = nAbi and result = e.getBody() and partialPredicateCall = "Body()"
+        or
+        index = nBody and
+        result = e.getGenericParamList() and
+        partialPredicateCall = "GenericParamList()"
+        or
+        index = nGenericParamList and result = e.getName() and partialPredicateCall = "Name()"
+        or
+        index = nName and result = e.getRetType() and partialPredicateCall = "RetType()"
+        or
+        index = nRetType and result = e.getVisibility() and partialPredicateCall = "Visibility()"
+        or
+        index = nVisibility and
+        result = e.getWhereClause() and
+        partialPredicateCall = "WhereClause()"
+      )
+    )
+  }
+
+  private Element getImmediateChildOfImpl(Impl e, int index, string partialPredicateCall) {
+    exists(
+      int b, int bItem, int n, int nAssocItemList, int nAttr, int nGenericParamList, int nSelfTy,
+      int nTrait, int nVisibility, int nWhereClause
+    |
+      b = 0 and
+      bItem = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfItem(e, i, _)) | i) and
+      n = bItem and
+      nAssocItemList = n + 1 and
+      nAttr = nAssocItemList + 1 + max(int i | i = -1 or exists(e.getAttr(i)) | i) and
+      nGenericParamList = nAttr + 1 and
+      nSelfTy = nGenericParamList + 1 and
+      nTrait = nSelfTy + 1 and
+      nVisibility = nTrait + 1 and
+      nWhereClause = nVisibility + 1 and
+      (
+        none()
+        or
+        result = getImmediateChildOfItem(e, index - b, partialPredicateCall)
+        or
+        index = n and result = e.getAssocItemList() and partialPredicateCall = "AssocItemList()"
+        or
+        result = e.getAttr(index - nAssocItemList) and
+        partialPredicateCall = "Attr(" + (index - nAssocItemList).toString() + ")"
+        or
+        index = nAttr and
+        result = e.getGenericParamList() and
+        partialPredicateCall = "GenericParamList()"
+        or
+        index = nGenericParamList and result = e.getSelfTy() and partialPredicateCall = "SelfTy()"
+        or
+        index = nSelfTy and result = e.getTrait() and partialPredicateCall = "Trait()"
+        or
+        index = nTrait and result = e.getVisibility() and partialPredicateCall = "Visibility()"
+        or
+        index = nVisibility and
+        result = e.getWhereClause() and
+        partialPredicateCall = "WhereClause()"
+      )
+    )
+  }
+
+  private Element getImmediateChildOfMacroCall(MacroCall e, int index, string partialPredicateCall) {
+    exists(
+      int b, int bAssocItem, int bExternItem, int bItem, int n, int nAttr, int nPath,
+      int nTokenTree, int nExpanded
+    |
+      b = 0 and
+      bAssocItem = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfAssocItem(e, i, _)) | i) and
+      bExternItem =
+        bAssocItem + 1 + max(int i | i = -1 or exists(getImmediateChildOfExternItem(e, i, _)) | i) and
+      bItem = bExternItem + 1 + max(int i | i = -1 or exists(getImmediateChildOfItem(e, i, _)) | i) and
+      n = bItem and
+      nAttr = n + 1 + max(int i | i = -1 or exists(e.getAttr(i)) | i) and
+      nPath = nAttr + 1 and
+      nTokenTree = nPath + 1 and
+      nExpanded = nTokenTree + 1 and
+      (
+        none()
+        or
+        result = getImmediateChildOfAssocItem(e, index - b, partialPredicateCall)
+        or
+        result = getImmediateChildOfExternItem(e, index - bAssocItem, partialPredicateCall)
+        or
+        result = getImmediateChildOfItem(e, index - bExternItem, partialPredicateCall)
+        or
+        result = e.getAttr(index - n) and
+        partialPredicateCall = "Attr(" + (index - n).toString() + ")"
+        or
+        index = nAttr and result = e.getPath() and partialPredicateCall = "Path()"
+        or
+        index = nPath and result = e.getTokenTree() and partialPredicateCall = "TokenTree()"
+        or
+        index = nTokenTree and result = e.getExpanded() and partialPredicateCall = "Expanded()"
+      )
+    )
+  }
+
+  private Element getImmediateChildOfMacroDef(MacroDef e, int index, string partialPredicateCall) {
+    exists(int b, int bItem, int n, int nArgs, int nAttr, int nBody, int nName, int nVisibility |
+      b = 0 and
+      bItem = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfItem(e, i, _)) | i) and
+      n = bItem and
+      nArgs = n + 1 and
+      nAttr = nArgs + 1 + max(int i | i = -1 or exists(e.getAttr(i)) | i) and
+      nBody = nAttr + 1 and
+      nName = nBody + 1 and
+      nVisibility = nName + 1 and
+      (
+        none()
+        or
+        result = getImmediateChildOfItem(e, index - b, partialPredicateCall)
+        or
+        index = n and result = e.getArgs() and partialPredicateCall = "Args()"
+        or
+        result = e.getAttr(index - nArgs) and
+        partialPredicateCall = "Attr(" + (index - nArgs).toString() + ")"
+        or
+        index = nAttr and result = e.getBody() and partialPredicateCall = "Body()"
+        or
+        index = nBody and result = e.getName() and partialPredicateCall = "Name()"
+        or
+        index = nName and result = e.getVisibility() and partialPredicateCall = "Visibility()"
+      )
+    )
+  }
+
+  private Element getImmediateChildOfMacroRules(MacroRules e, int index, string partialPredicateCall) {
+    exists(int b, int bItem, int n, int nAttr, int nName, int nTokenTree, int nVisibility |
+      b = 0 and
+      bItem = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfItem(e, i, _)) | i) and
+      n = bItem and
+      nAttr = n + 1 + max(int i | i = -1 or exists(e.getAttr(i)) | i) and
+      nName = nAttr + 1 and
+      nTokenTree = nName + 1 and
+      nVisibility = nTokenTree + 1 and
+      (
+        none()
+        or
+        result = getImmediateChildOfItem(e, index - b, partialPredicateCall)
+        or
+        result = e.getAttr(index - n) and
+        partialPredicateCall = "Attr(" + (index - n).toString() + ")"
+        or
+        index = nAttr and result = e.getName() and partialPredicateCall = "Name()"
+        or
+        index = nName and result = e.getTokenTree() and partialPredicateCall = "TokenTree()"
+        or
+        index = nTokenTree and result = e.getVisibility() and partialPredicateCall = "Visibility()"
+      )
+    )
+  }
+
+  private Element getImmediateChildOfMethodCallExpr(
+    MethodCallExpr e, int index, string partialPredicateCall
+  ) {
+    exists(
+      int b, int bCallExprBase, int bResolvable, int n, int nGenericArgList, int nNameRef,
+      int nReceiver
+    |
+      b = 0 and
+      bCallExprBase =
+        b + 1 + max(int i | i = -1 or exists(getImmediateChildOfCallExprBase(e, i, _)) | i) and
+      bResolvable =
+        bCallExprBase + 1 +
+          max(int i | i = -1 or exists(getImmediateChildOfResolvable(e, i, _)) | i) and
+      n = bResolvable and
+      nGenericArgList = n + 1 and
+      nNameRef = nGenericArgList + 1 and
+      nReceiver = nNameRef + 1 and
+      (
+        none()
+        or
+        result = getImmediateChildOfCallExprBase(e, index - b, partialPredicateCall)
+        or
+        result = getImmediateChildOfResolvable(e, index - bCallExprBase, partialPredicateCall)
+        or
+        index = n and result = e.getGenericArgList() and partialPredicateCall = "GenericArgList()"
+        or
+        index = nGenericArgList and result = e.getNameRef() and partialPredicateCall = "NameRef()"
+        or
+        index = nNameRef and result = e.getReceiver() and partialPredicateCall = "Receiver()"
+      )
+    )
+  }
+
+  private Element getImmediateChildOfModule(Module e, int index, string partialPredicateCall) {
+    exists(int b, int bItem, int n, int nAttr, int nItemList, int nName, int nVisibility |
+      b = 0 and
+      bItem = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfItem(e, i, _)) | i) and
+      n = bItem and
+      nAttr = n + 1 + max(int i | i = -1 or exists(e.getAttr(i)) | i) and
+      nItemList = nAttr + 1 and
+      nName = nItemList + 1 and
+      nVisibility = nName + 1 and
+      (
+        none()
+        or
+        result = getImmediateChildOfItem(e, index - b, partialPredicateCall)
+        or
+        result = e.getAttr(index - n) and
+        partialPredicateCall = "Attr(" + (index - n).toString() + ")"
+        or
+        index = nAttr and result = e.getItemList() and partialPredicateCall = "ItemList()"
+        or
+        index = nItemList and result = e.getName() and partialPredicateCall = "Name()"
+        or
+        index = nName and result = e.getVisibility() and partialPredicateCall = "Visibility()"
+      )
+    )
+  }
+
+  private Element getImmediateChildOfPathExpr(PathExpr e, int index, string partialPredicateCall) {
+    exists(int b, int bPathExprBase, int n, int nAttr, int nPath |
+      b = 0 and
+      bPathExprBase =
+        b + 1 + max(int i | i = -1 or exists(getImmediateChildOfPathExprBase(e, i, _)) | i) and
+      n = bPathExprBase and
+      nAttr = n + 1 + max(int i | i = -1 or exists(e.getAttr(i)) | i) and
+      nPath = nAttr + 1 and
+      (
+        none()
+        or
+        result = getImmediateChildOfPathExprBase(e, index - b, partialPredicateCall)
+        or
+        result = e.getAttr(index - n) and
+        partialPredicateCall = "Attr(" + (index - n).toString() + ")"
+        or
+        index = nAttr and result = e.getPath() and partialPredicateCall = "Path()"
+      )
+    )
+  }
+
+  private Element getImmediateChildOfStatic(Static e, int index, string partialPredicateCall) {
+    exists(
+      int b, int bExternItem, int bItem, int n, int nAttr, int nBody, int nName, int nTy,
+      int nVisibility
+    |
+      b = 0 and
+      bExternItem =
+        b + 1 + max(int i | i = -1 or exists(getImmediateChildOfExternItem(e, i, _)) | i) and
+      bItem = bExternItem + 1 + max(int i | i = -1 or exists(getImmediateChildOfItem(e, i, _)) | i) and
+      n = bItem and
+      nAttr = n + 1 + max(int i | i = -1 or exists(e.getAttr(i)) | i) and
+      nBody = nAttr + 1 and
+      nName = nBody + 1 and
+      nTy = nName + 1 and
+      nVisibility = nTy + 1 and
+      (
+        none()
+        or
+        result = getImmediateChildOfExternItem(e, index - b, partialPredicateCall)
+        or
+        result = getImmediateChildOfItem(e, index - bExternItem, partialPredicateCall)
+        or
+        result = e.getAttr(index - n) and
+        partialPredicateCall = "Attr(" + (index - n).toString() + ")"
+        or
+        index = nAttr and result = e.getBody() and partialPredicateCall = "Body()"
+        or
+        index = nBody and result = e.getName() and partialPredicateCall = "Name()"
+        or
+        index = nName and result = e.getTy() and partialPredicateCall = "Ty()"
+        or
+        index = nTy and result = e.getVisibility() and partialPredicateCall = "Visibility()"
+      )
+    )
+  }
+
+  private Element getImmediateChildOfStruct(Struct e, int index, string partialPredicateCall) {
+    exists(
+      int b, int bItem, int n, int nAttr, int nFieldList, int nGenericParamList, int nName,
+      int nVisibility, int nWhereClause
+    |
+      b = 0 and
+      bItem = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfItem(e, i, _)) | i) and
+      n = bItem and
+      nAttr = n + 1 + max(int i | i = -1 or exists(e.getAttr(i)) | i) and
+      nFieldList = nAttr + 1 and
+      nGenericParamList = nFieldList + 1 and
+      nName = nGenericParamList + 1 and
+      nVisibility = nName + 1 and
+      nWhereClause = nVisibility + 1 and
+      (
+        none()
+        or
+        result = getImmediateChildOfItem(e, index - b, partialPredicateCall)
+        or
+        result = e.getAttr(index - n) and
+        partialPredicateCall = "Attr(" + (index - n).toString() + ")"
+        or
+        index = nAttr and result = e.getFieldList() and partialPredicateCall = "FieldList()"
+        or
+        index = nFieldList and
+        result = e.getGenericParamList() and
+        partialPredicateCall = "GenericParamList()"
+        or
+        index = nGenericParamList and result = e.getName() and partialPredicateCall = "Name()"
+        or
+        index = nName and result = e.getVisibility() and partialPredicateCall = "Visibility()"
+        or
+        index = nVisibility and
+        result = e.getWhereClause() and
+        partialPredicateCall = "WhereClause()"
+      )
+    )
+  }
+
+  private Element getImmediateChildOfTrait(Trait e, int index, string partialPredicateCall) {
+    exists(
+      int b, int bItem, int n, int nAssocItemList, int nAttr, int nGenericParamList, int nName,
+      int nTypeBoundList, int nVisibility, int nWhereClause
+    |
+      b = 0 and
+      bItem = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfItem(e, i, _)) | i) and
+      n = bItem and
+      nAssocItemList = n + 1 and
+      nAttr = nAssocItemList + 1 + max(int i | i = -1 or exists(e.getAttr(i)) | i) and
+      nGenericParamList = nAttr + 1 and
+      nName = nGenericParamList + 1 and
+      nTypeBoundList = nName + 1 and
+      nVisibility = nTypeBoundList + 1 and
+      nWhereClause = nVisibility + 1 and
+      (
+        none()
+        or
+        result = getImmediateChildOfItem(e, index - b, partialPredicateCall)
+        or
+        index = n and result = e.getAssocItemList() and partialPredicateCall = "AssocItemList()"
+        or
+        result = e.getAttr(index - nAssocItemList) and
+        partialPredicateCall = "Attr(" + (index - nAssocItemList).toString() + ")"
+        or
+        index = nAttr and
+        result = e.getGenericParamList() and
+        partialPredicateCall = "GenericParamList()"
+        or
+        index = nGenericParamList and result = e.getName() and partialPredicateCall = "Name()"
+        or
+        index = nName and result = e.getTypeBoundList() and partialPredicateCall = "TypeBoundList()"
+        or
+        index = nTypeBoundList and
+        result = e.getVisibility() and
+        partialPredicateCall = "Visibility()"
+        or
+        index = nVisibility and
+        result = e.getWhereClause() and
+        partialPredicateCall = "WhereClause()"
+      )
+    )
+  }
+
+  private Element getImmediateChildOfTraitAlias(TraitAlias e, int index, string partialPredicateCall) {
+    exists(
+      int b, int bItem, int n, int nAttr, int nGenericParamList, int nName, int nTypeBoundList,
+      int nVisibility, int nWhereClause
+    |
+      b = 0 and
+      bItem = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfItem(e, i, _)) | i) and
+      n = bItem and
+      nAttr = n + 1 + max(int i | i = -1 or exists(e.getAttr(i)) | i) and
+      nGenericParamList = nAttr + 1 and
+      nName = nGenericParamList + 1 and
+      nTypeBoundList = nName + 1 and
+      nVisibility = nTypeBoundList + 1 and
+      nWhereClause = nVisibility + 1 and
+      (
+        none()
+        or
+        result = getImmediateChildOfItem(e, index - b, partialPredicateCall)
+        or
+        result = e.getAttr(index - n) and
+        partialPredicateCall = "Attr(" + (index - n).toString() + ")"
+        or
+        index = nAttr and
+        result = e.getGenericParamList() and
+        partialPredicateCall = "GenericParamList()"
+        or
+        index = nGenericParamList and result = e.getName() and partialPredicateCall = "Name()"
+        or
+        index = nName and result = e.getTypeBoundList() and partialPredicateCall = "TypeBoundList()"
+        or
+        index = nTypeBoundList and
+        result = e.getVisibility() and
+        partialPredicateCall = "Visibility()"
+        or
+        index = nVisibility and
+        result = e.getWhereClause() and
+        partialPredicateCall = "WhereClause()"
+      )
+    )
+  }
+
+  private Element getImmediateChildOfTypeAlias(TypeAlias e, int index, string partialPredicateCall) {
+    exists(
+      int b, int bAssocItem, int bExternItem, int bItem, int n, int nAttr, int nGenericParamList,
+      int nName, int nTy, int nTypeBoundList, int nVisibility, int nWhereClause
+    |
+      b = 0 and
+      bAssocItem = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfAssocItem(e, i, _)) | i) and
+      bExternItem =
+        bAssocItem + 1 + max(int i | i = -1 or exists(getImmediateChildOfExternItem(e, i, _)) | i) and
+      bItem = bExternItem + 1 + max(int i | i = -1 or exists(getImmediateChildOfItem(e, i, _)) | i) and
+      n = bItem and
+      nAttr = n + 1 + max(int i | i = -1 or exists(e.getAttr(i)) | i) and
+      nGenericParamList = nAttr + 1 and
+      nName = nGenericParamList + 1 and
+      nTy = nName + 1 and
+      nTypeBoundList = nTy + 1 and
+      nVisibility = nTypeBoundList + 1 and
+      nWhereClause = nVisibility + 1 and
+      (
+        none()
+        or
+        result = getImmediateChildOfAssocItem(e, index - b, partialPredicateCall)
+        or
+        result = getImmediateChildOfExternItem(e, index - bAssocItem, partialPredicateCall)
+        or
+        result = getImmediateChildOfItem(e, index - bExternItem, partialPredicateCall)
+        or
+        result = e.getAttr(index - n) and
+        partialPredicateCall = "Attr(" + (index - n).toString() + ")"
+        or
+        index = nAttr and
+        result = e.getGenericParamList() and
+        partialPredicateCall = "GenericParamList()"
+        or
+        index = nGenericParamList and result = e.getName() and partialPredicateCall = "Name()"
+        or
+        index = nName and result = e.getTy() and partialPredicateCall = "Ty()"
+        or
+        index = nTy and result = e.getTypeBoundList() and partialPredicateCall = "TypeBoundList()"
+        or
+        index = nTypeBoundList and
+        result = e.getVisibility() and
+        partialPredicateCall = "Visibility()"
+        or
+        index = nVisibility and
+        result = e.getWhereClause() and
+        partialPredicateCall = "WhereClause()"
+      )
+    )
+  }
+
+  private Element getImmediateChildOfUnion(Union e, int index, string partialPredicateCall) {
+    exists(
+      int b, int bItem, int n, int nAttr, int nGenericParamList, int nName, int nRecordFieldList,
+      int nVisibility, int nWhereClause
+    |
+      b = 0 and
+      bItem = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfItem(e, i, _)) | i) and
+      n = bItem and
+      nAttr = n + 1 + max(int i | i = -1 or exists(e.getAttr(i)) | i) and
+      nGenericParamList = nAttr + 1 and
+      nName = nGenericParamList + 1 and
+      nRecordFieldList = nName + 1 and
+      nVisibility = nRecordFieldList + 1 and
+      nWhereClause = nVisibility + 1 and
+      (
+        none()
+        or
+        result = getImmediateChildOfItem(e, index - b, partialPredicateCall)
+        or
+        result = e.getAttr(index - n) and
+        partialPredicateCall = "Attr(" + (index - n).toString() + ")"
+        or
+        index = nAttr and
+        result = e.getGenericParamList() and
+        partialPredicateCall = "GenericParamList()"
+        or
+        index = nGenericParamList and result = e.getName() and partialPredicateCall = "Name()"
+        or
+        index = nName and
+        result = e.getRecordFieldList() and
+        partialPredicateCall = "RecordFieldList()"
+        or
+        index = nRecordFieldList and
+        result = e.getVisibility() and
+        partialPredicateCall = "Visibility()"
+        or
+        index = nVisibility and
+        result = e.getWhereClause() and
+        partialPredicateCall = "WhereClause()"
+      )
+    )
+  }
+
+  private Element getImmediateChildOfUse(Use e, int index, string partialPredicateCall) {
+    exists(int b, int bItem, int n, int nAttr, int nUseTree, int nVisibility |
+      b = 0 and
+      bItem = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfItem(e, i, _)) | i) and
+      n = bItem and
+      nAttr = n + 1 + max(int i | i = -1 or exists(e.getAttr(i)) | i) and
+      nUseTree = nAttr + 1 and
+      nVisibility = nUseTree + 1 and
+      (
+        none()
+        or
+        result = getImmediateChildOfItem(e, index - b, partialPredicateCall)
+        or
+        result = e.getAttr(index - n) and
+        partialPredicateCall = "Attr(" + (index - n).toString() + ")"
+        or
+        index = nAttr and result = e.getUseTree() and partialPredicateCall = "UseTree()"
+        or
+        index = nUseTree and result = e.getVisibility() and partialPredicateCall = "Visibility()"
       )
     )
   }
@@ -1310,115 +3541,251 @@ private module Impl {
     // * none() simplifies generation, as we can append `or ...` without a special case for the first item
     none()
     or
+    result = getImmediateChildOfFormat(e, index, partialAccessor)
+    or
+    result = getImmediateChildOfFormatArgument(e, index, partialAccessor)
+    or
+    result = getImmediateChildOfMissing(e, index, partialAccessor)
+    or
+    result = getImmediateChildOfUnimplemented(e, index, partialAccessor)
+    or
+    result = getImmediateChildOfAbi(e, index, partialAccessor)
+    or
+    result = getImmediateChildOfArgList(e, index, partialAccessor)
+    or
+    result = getImmediateChildOfAssocItemList(e, index, partialAccessor)
+    or
+    result = getImmediateChildOfAttr(e, index, partialAccessor)
+    or
+    result = getImmediateChildOfClosureBinder(e, index, partialAccessor)
+    or
+    result = getImmediateChildOfExternItemList(e, index, partialAccessor)
+    or
+    result = getImmediateChildOfFormatArgsArg(e, index, partialAccessor)
+    or
     result = getImmediateChildOfGenericArgList(e, index, partialAccessor)
     or
+    result = getImmediateChildOfGenericParamList(e, index, partialAccessor)
+    or
+    result = getImmediateChildOfItemList(e, index, partialAccessor)
+    or
     result = getImmediateChildOfLabel(e, index, partialAccessor)
     or
+    result = getImmediateChildOfLetElse(e, index, partialAccessor)
+    or
+    result = getImmediateChildOfLifetime(e, index, partialAccessor)
+    or
+    result = getImmediateChildOfMacroItems(e, index, partialAccessor)
+    or
+    result = getImmediateChildOfMacroStmts(e, index, partialAccessor)
+    or
     result = getImmediateChildOfMatchArm(e, index, partialAccessor)
     or
-    result = getImmediateChildOfPath(e, index, partialAccessor)
+    result = getImmediateChildOfMatchArmList(e, index, partialAccessor)
+    or
+    result = getImmediateChildOfMatchGuard(e, index, partialAccessor)
+    or
+    result = getImmediateChildOfMeta(e, index, partialAccessor)
+    or
+    result = getImmediateChildOfName(e, index, partialAccessor)
+    or
+    result = getImmediateChildOfNameRef(e, index, partialAccessor)
+    or
+    result = getImmediateChildOfParam(e, index, partialAccessor)
+    or
+    result = getImmediateChildOfParamList(e, index, partialAccessor)
+    or
+    result = getImmediateChildOfPathSegment(e, index, partialAccessor)
     or
     result = getImmediateChildOfRecordExprField(e, index, partialAccessor)
     or
+    result = getImmediateChildOfRecordExprFieldList(e, index, partialAccessor)
+    or
+    result = getImmediateChildOfRecordField(e, index, partialAccessor)
+    or
     result = getImmediateChildOfRecordPatField(e, index, partialAccessor)
     or
-    result = getImmediateChildOfTypeRef(e, index, partialAccessor)
+    result = getImmediateChildOfRecordPatFieldList(e, index, partialAccessor)
+    or
+    result = getImmediateChildOfRename(e, index, partialAccessor)
+    or
+    result = getImmediateChildOfRetType(e, index, partialAccessor)
+    or
+    result = getImmediateChildOfReturnTypeSyntax(e, index, partialAccessor)
+    or
+    result = getImmediateChildOfSelfParam(e, index, partialAccessor)
+    or
+    result = getImmediateChildOfSourceFile(e, index, partialAccessor)
+    or
+    result = getImmediateChildOfStmtList(e, index, partialAccessor)
+    or
+    result = getImmediateChildOfTokenTree(e, index, partialAccessor)
+    or
+    result = getImmediateChildOfTupleField(e, index, partialAccessor)
+    or
+    result = getImmediateChildOfTypeBound(e, index, partialAccessor)
+    or
+    result = getImmediateChildOfTypeBoundList(e, index, partialAccessor)
+    or
+    result = getImmediateChildOfUseTree(e, index, partialAccessor)
+    or
+    result = getImmediateChildOfUseTreeList(e, index, partialAccessor)
+    or
+    result = getImmediateChildOfVariant(e, index, partialAccessor)
+    or
+    result = getImmediateChildOfVariantList(e, index, partialAccessor)
+    or
+    result = getImmediateChildOfVisibility(e, index, partialAccessor)
+    or
+    result = getImmediateChildOfWhereClause(e, index, partialAccessor)
+    or
+    result = getImmediateChildOfWherePred(e, index, partialAccessor)
+    or
+    result = getImmediateChildOfArrayExpr(e, index, partialAccessor)
+    or
+    result = getImmediateChildOfArrayType(e, index, partialAccessor)
     or
     result = getImmediateChildOfAsmExpr(e, index, partialAccessor)
     or
+    result = getImmediateChildOfAssocTypeArg(e, index, partialAccessor)
+    or
     result = getImmediateChildOfAwaitExpr(e, index, partialAccessor)
     or
     result = getImmediateChildOfBecomeExpr(e, index, partialAccessor)
     or
     result = getImmediateChildOfBinaryExpr(e, index, partialAccessor)
     or
-    result = getImmediateChildOfBoxExpr(e, index, partialAccessor)
+    result = getImmediateChildOfBlockExpr(e, index, partialAccessor)
     or
     result = getImmediateChildOfBoxPat(e, index, partialAccessor)
     or
     result = getImmediateChildOfBreakExpr(e, index, partialAccessor)
     or
-    result = getImmediateChildOfCallExpr(e, index, partialAccessor)
-    or
     result = getImmediateChildOfCastExpr(e, index, partialAccessor)
     or
     result = getImmediateChildOfClosureExpr(e, index, partialAccessor)
     or
+    result = getImmediateChildOfComment(e, index, partialAccessor)
+    or
+    result = getImmediateChildOfConstArg(e, index, partialAccessor)
+    or
     result = getImmediateChildOfConstBlockPat(e, index, partialAccessor)
     or
-    result = getImmediateChildOfConstExpr(e, index, partialAccessor)
+    result = getImmediateChildOfConstParam(e, index, partialAccessor)
     or
     result = getImmediateChildOfContinueExpr(e, index, partialAccessor)
     or
+    result = getImmediateChildOfDynTraitType(e, index, partialAccessor)
+    or
     result = getImmediateChildOfExprStmt(e, index, partialAccessor)
     or
     result = getImmediateChildOfFieldExpr(e, index, partialAccessor)
     or
-    result = getImmediateChildOfFunction(e, index, partialAccessor)
+    result = getImmediateChildOfFnPtrType(e, index, partialAccessor)
+    or
+    result = getImmediateChildOfForExpr(e, index, partialAccessor)
+    or
+    result = getImmediateChildOfForType(e, index, partialAccessor)
+    or
+    result = getImmediateChildOfFormatArgsExpr(e, index, partialAccessor)
     or
     result = getImmediateChildOfIdentPat(e, index, partialAccessor)
     or
     result = getImmediateChildOfIfExpr(e, index, partialAccessor)
     or
+    result = getImmediateChildOfImplTraitType(e, index, partialAccessor)
+    or
     result = getImmediateChildOfIndexExpr(e, index, partialAccessor)
     or
-    result = getImmediateChildOfItemStmt(e, index, partialAccessor)
+    result = getImmediateChildOfInferType(e, index, partialAccessor)
     or
     result = getImmediateChildOfLetExpr(e, index, partialAccessor)
     or
     result = getImmediateChildOfLetStmt(e, index, partialAccessor)
     or
+    result = getImmediateChildOfLifetimeArg(e, index, partialAccessor)
+    or
+    result = getImmediateChildOfLifetimeParam(e, index, partialAccessor)
+    or
     result = getImmediateChildOfLiteralExpr(e, index, partialAccessor)
     or
     result = getImmediateChildOfLiteralPat(e, index, partialAccessor)
     or
     result = getImmediateChildOfLoopExpr(e, index, partialAccessor)
     or
+    result = getImmediateChildOfMacroExpr(e, index, partialAccessor)
+    or
+    result = getImmediateChildOfMacroPat(e, index, partialAccessor)
+    or
+    result = getImmediateChildOfMacroType(e, index, partialAccessor)
+    or
     result = getImmediateChildOfMatchExpr(e, index, partialAccessor)
     or
-    result = getImmediateChildOfMethodCallExpr(e, index, partialAccessor)
-    or
-    result = getImmediateChildOfMissingExpr(e, index, partialAccessor)
-    or
-    result = getImmediateChildOfMissingPat(e, index, partialAccessor)
-    or
-    result = getImmediateChildOfModule(e, index, partialAccessor)
+    result = getImmediateChildOfNeverType(e, index, partialAccessor)
     or
     result = getImmediateChildOfOffsetOfExpr(e, index, partialAccessor)
     or
     result = getImmediateChildOfOrPat(e, index, partialAccessor)
     or
-    result = getImmediateChildOfPathExpr(e, index, partialAccessor)
+    result = getImmediateChildOfParenExpr(e, index, partialAccessor)
+    or
+    result = getImmediateChildOfParenPat(e, index, partialAccessor)
+    or
+    result = getImmediateChildOfParenType(e, index, partialAccessor)
+    or
+    result = getImmediateChildOfPath(e, index, partialAccessor)
     or
     result = getImmediateChildOfPathPat(e, index, partialAccessor)
     or
+    result = getImmediateChildOfPathType(e, index, partialAccessor)
+    or
     result = getImmediateChildOfPrefixExpr(e, index, partialAccessor)
     or
+    result = getImmediateChildOfPtrType(e, index, partialAccessor)
+    or
     result = getImmediateChildOfRangeExpr(e, index, partialAccessor)
     or
     result = getImmediateChildOfRangePat(e, index, partialAccessor)
     or
     result = getImmediateChildOfRecordExpr(e, index, partialAccessor)
     or
+    result = getImmediateChildOfRecordFieldList(e, index, partialAccessor)
+    or
     result = getImmediateChildOfRecordPat(e, index, partialAccessor)
     or
     result = getImmediateChildOfRefExpr(e, index, partialAccessor)
     or
     result = getImmediateChildOfRefPat(e, index, partialAccessor)
     or
+    result = getImmediateChildOfRefType(e, index, partialAccessor)
+    or
+    result = getImmediateChildOfRestPat(e, index, partialAccessor)
+    or
     result = getImmediateChildOfReturnExpr(e, index, partialAccessor)
     or
     result = getImmediateChildOfSlicePat(e, index, partialAccessor)
     or
+    result = getImmediateChildOfSliceType(e, index, partialAccessor)
+    or
+    result = getImmediateChildOfTryExpr(e, index, partialAccessor)
+    or
     result = getImmediateChildOfTupleExpr(e, index, partialAccessor)
     or
+    result = getImmediateChildOfTupleFieldList(e, index, partialAccessor)
+    or
     result = getImmediateChildOfTuplePat(e, index, partialAccessor)
     or
     result = getImmediateChildOfTupleStructPat(e, index, partialAccessor)
     or
+    result = getImmediateChildOfTupleType(e, index, partialAccessor)
+    or
+    result = getImmediateChildOfTypeArg(e, index, partialAccessor)
+    or
+    result = getImmediateChildOfTypeParam(e, index, partialAccessor)
+    or
     result = getImmediateChildOfUnderscoreExpr(e, index, partialAccessor)
     or
-    result = getImmediateChildOfUnimplementedDeclaration(e, index, partialAccessor)
+    result = getImmediateChildOfWhileExpr(e, index, partialAccessor)
     or
     result = getImmediateChildOfWildcardPat(e, index, partialAccessor)
     or
@@ -1426,15 +3793,47 @@ private module Impl {
     or
     result = getImmediateChildOfYieldExpr(e, index, partialAccessor)
     or
-    result = getImmediateChildOfAsyncBlockExpr(e, index, partialAccessor)
+    result = getImmediateChildOfCallExpr(e, index, partialAccessor)
     or
-    result = getImmediateChildOfBlockExpr(e, index, partialAccessor)
+    result = getImmediateChildOfConst(e, index, partialAccessor)
     or
-    result = getImmediateChildOfElementListExpr(e, index, partialAccessor)
+    result = getImmediateChildOfEnum(e, index, partialAccessor)
     or
-    result = getImmediateChildOfRepeatExpr(e, index, partialAccessor)
+    result = getImmediateChildOfExternBlock(e, index, partialAccessor)
     or
-    result = getImmediateChildOfUnsafeBlockExpr(e, index, partialAccessor)
+    result = getImmediateChildOfExternCrate(e, index, partialAccessor)
+    or
+    result = getImmediateChildOfFormatTemplateVariableAccess(e, index, partialAccessor)
+    or
+    result = getImmediateChildOfFunction(e, index, partialAccessor)
+    or
+    result = getImmediateChildOfImpl(e, index, partialAccessor)
+    or
+    result = getImmediateChildOfMacroCall(e, index, partialAccessor)
+    or
+    result = getImmediateChildOfMacroDef(e, index, partialAccessor)
+    or
+    result = getImmediateChildOfMacroRules(e, index, partialAccessor)
+    or
+    result = getImmediateChildOfMethodCallExpr(e, index, partialAccessor)
+    or
+    result = getImmediateChildOfModule(e, index, partialAccessor)
+    or
+    result = getImmediateChildOfPathExpr(e, index, partialAccessor)
+    or
+    result = getImmediateChildOfStatic(e, index, partialAccessor)
+    or
+    result = getImmediateChildOfStruct(e, index, partialAccessor)
+    or
+    result = getImmediateChildOfTrait(e, index, partialAccessor)
+    or
+    result = getImmediateChildOfTraitAlias(e, index, partialAccessor)
+    or
+    result = getImmediateChildOfTypeAlias(e, index, partialAccessor)
+    or
+    result = getImmediateChildOfUnion(e, index, partialAccessor)
+    or
+    result = getImmediateChildOfUse(e, index, partialAccessor)
   }
 }
 
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/Path.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/Path.qll
index 5d5b077d8a8..58f7d891d26 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/Path.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/Path.qll
@@ -6,8 +6,9 @@
 
 private import codeql.rust.elements.internal.generated.Synth
 private import codeql.rust.elements.internal.generated.Raw
-import codeql.rust.elements.internal.AstNodeImpl::Impl as AstNodeImpl
-import codeql.rust.elements.internal.UnimplementedImpl::Impl as UnimplementedImpl
+import codeql.rust.elements.Path
+import codeql.rust.elements.PathSegment
+import codeql.rust.elements.internal.ResolvableImpl::Impl as ResolvableImpl
 
 /**
  * INTERNAL: This module contains the fully generated definition of `Path` and should not
@@ -22,7 +23,31 @@ module Generated {
    * INTERNAL: Do not reference the `Generated::Path` class directly.
    * Use the subclass `Path`, where the following predicates are available.
    */
-  class Path extends Synth::TPath, AstNodeImpl::AstNode, UnimplementedImpl::Unimplemented {
+  class Path extends Synth::TPath, ResolvableImpl::Resolvable {
     override string getAPrimaryQlClass() { result = "Path" }
+
+    /**
+     * Gets the qualifier of this path, if it exists.
+     */
+    Path getQualifier() {
+      result = Synth::convertPathFromRaw(Synth::convertPathToRaw(this).(Raw::Path).getQualifier())
+    }
+
+    /**
+     * Holds if `getQualifier()` exists.
+     */
+    final predicate hasQualifier() { exists(this.getQualifier()) }
+
+    /**
+     * Gets the part of this path, if it exists.
+     */
+    PathSegment getPart() {
+      result = Synth::convertPathSegmentFromRaw(Synth::convertPathToRaw(this).(Raw::Path).getPart())
+    }
+
+    /**
+     * Holds if `getPart()` exists.
+     */
+    final predicate hasPart() { exists(this.getPart()) }
   }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/PathExpr.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/PathExpr.qll
index 1f8224da931..562747d0f11 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/PathExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/PathExpr.qll
@@ -6,8 +6,9 @@
 
 private import codeql.rust.elements.internal.generated.Synth
 private import codeql.rust.elements.internal.generated.Raw
-import codeql.rust.elements.internal.ExprImpl::Impl as ExprImpl
+import codeql.rust.elements.Attr
 import codeql.rust.elements.Path
+import codeql.rust.elements.internal.PathExprBaseImpl::Impl as PathExprBaseImpl
 
 /**
  * INTERNAL: This module contains the fully generated definition of `PathExpr` and should not
@@ -25,15 +26,38 @@ module Generated {
    * INTERNAL: Do not reference the `Generated::PathExpr` class directly.
    * Use the subclass `PathExpr`, where the following predicates are available.
    */
-  class PathExpr extends Synth::TPathExpr, ExprImpl::Expr {
+  class PathExpr extends Synth::TPathExpr, PathExprBaseImpl::PathExprBase {
     override string getAPrimaryQlClass() { result = "PathExpr" }
 
     /**
-     * Gets the path of this path expression.
+     * Gets the `index`th attr of this path expression (0-based).
+     */
+    Attr getAttr(int index) {
+      result =
+        Synth::convertAttrFromRaw(Synth::convertPathExprToRaw(this).(Raw::PathExpr).getAttr(index))
+    }
+
+    /**
+     * Gets any of the attrs of this path expression.
+     */
+    final Attr getAnAttr() { result = this.getAttr(_) }
+
+    /**
+     * Gets the number of attrs of this path expression.
+     */
+    final int getNumberOfAttrs() { result = count(int i | exists(this.getAttr(i))) }
+
+    /**
+     * Gets the path of this path expression, if it exists.
      */
     Path getPath() {
       result =
         Synth::convertPathFromRaw(Synth::convertPathExprToRaw(this).(Raw::PathExpr).getPath())
     }
+
+    /**
+     * Holds if `getPath()` exists.
+     */
+    final predicate hasPath() { exists(this.getPath()) }
   }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/PathExprBase.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/PathExprBase.qll
new file mode 100644
index 00000000000..cf924962dbe
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/PathExprBase.qll
@@ -0,0 +1,22 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `PathExprBase`.
+ * INTERNAL: Do not import directly.
+ */
+
+private import codeql.rust.elements.internal.generated.Synth
+private import codeql.rust.elements.internal.generated.Raw
+import codeql.rust.elements.internal.ExprImpl::Impl as ExprImpl
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `PathExprBase` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * A path expression or a variable access in a formatting template. See `PathExpr` and `FormatTemplateVariableAccess` for further details.
+   * INTERNAL: Do not reference the `Generated::PathExprBase` class directly.
+   * Use the subclass `PathExprBase`, where the following predicates are available.
+   */
+  class PathExprBase extends Synth::TPathExprBase, ExprImpl::Expr { }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/PathPat.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/PathPat.qll
index d79dd2bc042..f91949de40e 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/PathPat.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/PathPat.qll
@@ -29,10 +29,15 @@ module Generated {
     override string getAPrimaryQlClass() { result = "PathPat" }
 
     /**
-     * Gets the path of this path pat.
+     * Gets the path of this path pat, if it exists.
      */
     Path getPath() {
       result = Synth::convertPathFromRaw(Synth::convertPathPatToRaw(this).(Raw::PathPat).getPath())
     }
+
+    /**
+     * Holds if `getPath()` exists.
+     */
+    final predicate hasPath() { exists(this.getPath()) }
   }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/PathSegment.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/PathSegment.qll
new file mode 100644
index 00000000000..0878635e7d1
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/PathSegment.qll
@@ -0,0 +1,137 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `PathSegment`.
+ * INTERNAL: Do not import directly.
+ */
+
+private import codeql.rust.elements.internal.generated.Synth
+private import codeql.rust.elements.internal.generated.Raw
+import codeql.rust.elements.internal.AstNodeImpl::Impl as AstNodeImpl
+import codeql.rust.elements.GenericArgList
+import codeql.rust.elements.NameRef
+import codeql.rust.elements.ParamList
+import codeql.rust.elements.PathType
+import codeql.rust.elements.RetType
+import codeql.rust.elements.ReturnTypeSyntax
+import codeql.rust.elements.TypeRef
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `PathSegment` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * A PathSegment. For example:
+   * ```rust
+   * todo!()
+   * ```
+   * INTERNAL: Do not reference the `Generated::PathSegment` class directly.
+   * Use the subclass `PathSegment`, where the following predicates are available.
+   */
+  class PathSegment extends Synth::TPathSegment, AstNodeImpl::AstNode {
+    override string getAPrimaryQlClass() { result = "PathSegment" }
+
+    /**
+     * Gets the generic argument list of this path segment, if it exists.
+     */
+    GenericArgList getGenericArgList() {
+      result =
+        Synth::convertGenericArgListFromRaw(Synth::convertPathSegmentToRaw(this)
+              .(Raw::PathSegment)
+              .getGenericArgList())
+    }
+
+    /**
+     * Holds if `getGenericArgList()` exists.
+     */
+    final predicate hasGenericArgList() { exists(this.getGenericArgList()) }
+
+    /**
+     * Gets the name reference of this path segment, if it exists.
+     */
+    NameRef getNameRef() {
+      result =
+        Synth::convertNameRefFromRaw(Synth::convertPathSegmentToRaw(this)
+              .(Raw::PathSegment)
+              .getNameRef())
+    }
+
+    /**
+     * Holds if `getNameRef()` exists.
+     */
+    final predicate hasNameRef() { exists(this.getNameRef()) }
+
+    /**
+     * Gets the parameter list of this path segment, if it exists.
+     */
+    ParamList getParamList() {
+      result =
+        Synth::convertParamListFromRaw(Synth::convertPathSegmentToRaw(this)
+              .(Raw::PathSegment)
+              .getParamList())
+    }
+
+    /**
+     * Holds if `getParamList()` exists.
+     */
+    final predicate hasParamList() { exists(this.getParamList()) }
+
+    /**
+     * Gets the path type of this path segment, if it exists.
+     */
+    PathType getPathType() {
+      result =
+        Synth::convertPathTypeFromRaw(Synth::convertPathSegmentToRaw(this)
+              .(Raw::PathSegment)
+              .getPathType())
+    }
+
+    /**
+     * Holds if `getPathType()` exists.
+     */
+    final predicate hasPathType() { exists(this.getPathType()) }
+
+    /**
+     * Gets the ret type of this path segment, if it exists.
+     */
+    RetType getRetType() {
+      result =
+        Synth::convertRetTypeFromRaw(Synth::convertPathSegmentToRaw(this)
+              .(Raw::PathSegment)
+              .getRetType())
+    }
+
+    /**
+     * Holds if `getRetType()` exists.
+     */
+    final predicate hasRetType() { exists(this.getRetType()) }
+
+    /**
+     * Gets the return type syntax of this path segment, if it exists.
+     */
+    ReturnTypeSyntax getReturnTypeSyntax() {
+      result =
+        Synth::convertReturnTypeSyntaxFromRaw(Synth::convertPathSegmentToRaw(this)
+              .(Raw::PathSegment)
+              .getReturnTypeSyntax())
+    }
+
+    /**
+     * Holds if `getReturnTypeSyntax()` exists.
+     */
+    final predicate hasReturnTypeSyntax() { exists(this.getReturnTypeSyntax()) }
+
+    /**
+     * Gets the ty of this path segment, if it exists.
+     */
+    TypeRef getTy() {
+      result =
+        Synth::convertTypeRefFromRaw(Synth::convertPathSegmentToRaw(this).(Raw::PathSegment).getTy())
+    }
+
+    /**
+     * Holds if `getTy()` exists.
+     */
+    final predicate hasTy() { exists(this.getTy()) }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/PathType.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/PathType.qll
new file mode 100644
index 00000000000..3ac799108cc
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/PathType.qll
@@ -0,0 +1,41 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `PathType`.
+ * INTERNAL: Do not import directly.
+ */
+
+private import codeql.rust.elements.internal.generated.Synth
+private import codeql.rust.elements.internal.generated.Raw
+import codeql.rust.elements.Path
+import codeql.rust.elements.internal.TypeRefImpl::Impl as TypeRefImpl
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `PathType` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * A PathType. For example:
+   * ```rust
+   * todo!()
+   * ```
+   * INTERNAL: Do not reference the `Generated::PathType` class directly.
+   * Use the subclass `PathType`, where the following predicates are available.
+   */
+  class PathType extends Synth::TPathType, TypeRefImpl::TypeRef {
+    override string getAPrimaryQlClass() { result = "PathType" }
+
+    /**
+     * Gets the path of this path type, if it exists.
+     */
+    Path getPath() {
+      result =
+        Synth::convertPathFromRaw(Synth::convertPathTypeToRaw(this).(Raw::PathType).getPath())
+    }
+
+    /**
+     * Holds if `getPath()` exists.
+     */
+    final predicate hasPath() { exists(this.getPath()) }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/PrefixExpr.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/PrefixExpr.qll
index f77df97466b..d8c4bc29051 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/PrefixExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/PrefixExpr.qll
@@ -6,6 +6,7 @@
 
 private import codeql.rust.elements.internal.generated.Synth
 private import codeql.rust.elements.internal.generated.Raw
+import codeql.rust.elements.Attr
 import codeql.rust.elements.Expr
 import codeql.rust.elements.internal.ExprImpl::Impl as ExprImpl
 
@@ -17,9 +18,9 @@ module Generated {
   /**
    * A unary operation expression. For example:
    * ```rust
-   * let x = -42
-   * let y = !true
-   * let z = *ptr
+   * let x = -42;
+   * let y = !true;
+   * let z = *ptr;
    * ```
    * INTERNAL: Do not reference the `Generated::PrefixExpr` class directly.
    * Use the subclass `PrefixExpr`, where the following predicates are available.
@@ -28,7 +29,27 @@ module Generated {
     override string getAPrimaryQlClass() { result = "PrefixExpr" }
 
     /**
-     * Gets the expression of this prefix expression.
+     * Gets the `index`th attr of this prefix expression (0-based).
+     */
+    Attr getAttr(int index) {
+      result =
+        Synth::convertAttrFromRaw(Synth::convertPrefixExprToRaw(this)
+              .(Raw::PrefixExpr)
+              .getAttr(index))
+    }
+
+    /**
+     * Gets any of the attrs of this prefix expression.
+     */
+    final Attr getAnAttr() { result = this.getAttr(_) }
+
+    /**
+     * Gets the number of attrs of this prefix expression.
+     */
+    final int getNumberOfAttrs() { result = count(int i | exists(this.getAttr(i))) }
+
+    /**
+     * Gets the expression of this prefix expression, if it exists.
      */
     Expr getExpr() {
       result =
@@ -36,8 +57,20 @@ module Generated {
     }
 
     /**
-     * Gets the op of this prefix expression.
+     * Holds if `getExpr()` exists.
      */
-    string getOp() { result = Synth::convertPrefixExprToRaw(this).(Raw::PrefixExpr).getOp() }
+    final predicate hasExpr() { exists(this.getExpr()) }
+
+    /**
+     * Gets the operator name of this prefix expression, if it exists.
+     */
+    string getOperatorName() {
+      result = Synth::convertPrefixExprToRaw(this).(Raw::PrefixExpr).getOperatorName()
+    }
+
+    /**
+     * Holds if `getOperatorName()` exists.
+     */
+    final predicate hasOperatorName() { exists(this.getOperatorName()) }
   }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/PtrType.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/PtrType.qll
new file mode 100644
index 00000000000..598052d09d5
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/PtrType.qll
@@ -0,0 +1,50 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `PtrType`.
+ * INTERNAL: Do not import directly.
+ */
+
+private import codeql.rust.elements.internal.generated.Synth
+private import codeql.rust.elements.internal.generated.Raw
+import codeql.rust.elements.TypeRef
+import codeql.rust.elements.internal.TypeRefImpl::Impl as TypeRefImpl
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `PtrType` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * A PtrType. For example:
+   * ```rust
+   * todo!()
+   * ```
+   * INTERNAL: Do not reference the `Generated::PtrType` class directly.
+   * Use the subclass `PtrType`, where the following predicates are available.
+   */
+  class PtrType extends Synth::TPtrType, TypeRefImpl::TypeRef {
+    override string getAPrimaryQlClass() { result = "PtrType" }
+
+    /**
+     * Holds if this ptr type is const.
+     */
+    predicate isConst() { Synth::convertPtrTypeToRaw(this).(Raw::PtrType).isConst() }
+
+    /**
+     * Holds if this ptr type is mut.
+     */
+    predicate isMut() { Synth::convertPtrTypeToRaw(this).(Raw::PtrType).isMut() }
+
+    /**
+     * Gets the ty of this ptr type, if it exists.
+     */
+    TypeRef getTy() {
+      result = Synth::convertTypeRefFromRaw(Synth::convertPtrTypeToRaw(this).(Raw::PtrType).getTy())
+    }
+
+    /**
+     * Holds if `getTy()` exists.
+     */
+    final predicate hasTy() { exists(this.getTy()) }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/PureSynthConstructors.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/PureSynthConstructors.qll
index 100f7f4a756..382ab59ed8c 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/PureSynthConstructors.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/PureSynthConstructors.qll
@@ -3,3 +3,6 @@
  * This module exports all modules providing `Element` subclasses.
  */
 
+import codeql.rust.elements.internal.FormatConstructor
+import codeql.rust.elements.internal.FormatArgumentConstructor
+import codeql.rust.elements.internal.FormatTemplateVariableAccessConstructor
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/RangeExpr.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/RangeExpr.qll
index 1adc44373e4..06595838c22 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/RangeExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/RangeExpr.qll
@@ -6,6 +6,7 @@
 
 private import codeql.rust.elements.internal.generated.Synth
 private import codeql.rust.elements.internal.generated.Raw
+import codeql.rust.elements.Attr
 import codeql.rust.elements.Expr
 import codeql.rust.elements.internal.ExprImpl::Impl as ExprImpl
 
@@ -31,34 +32,59 @@ module Generated {
     override string getAPrimaryQlClass() { result = "RangeExpr" }
 
     /**
-     * Gets the lhs of this range expression, if it exists.
+     * Gets the `index`th attr of this range expression (0-based).
      */
-    Expr getLhs() {
+    Attr getAttr(int index) {
       result =
-        Synth::convertExprFromRaw(Synth::convertRangeExprToRaw(this).(Raw::RangeExpr).getLhs())
+        Synth::convertAttrFromRaw(Synth::convertRangeExprToRaw(this).(Raw::RangeExpr).getAttr(index))
     }
 
     /**
-     * Holds if `getLhs()` exists.
+     * Gets any of the attrs of this range expression.
      */
-    final predicate hasLhs() { exists(this.getLhs()) }
+    final Attr getAnAttr() { result = this.getAttr(_) }
 
     /**
-     * Gets the rhs of this range expression, if it exists.
+     * Gets the number of attrs of this range expression.
      */
-    Expr getRhs() {
+    final int getNumberOfAttrs() { result = count(int i | exists(this.getAttr(i))) }
+
+    /**
+     * Gets the end of this range expression, if it exists.
+     */
+    Expr getEnd() {
       result =
-        Synth::convertExprFromRaw(Synth::convertRangeExprToRaw(this).(Raw::RangeExpr).getRhs())
+        Synth::convertExprFromRaw(Synth::convertRangeExprToRaw(this).(Raw::RangeExpr).getEnd())
     }
 
     /**
-     * Holds if `getRhs()` exists.
+     * Holds if `getEnd()` exists.
      */
-    final predicate hasRhs() { exists(this.getRhs()) }
+    final predicate hasEnd() { exists(this.getEnd()) }
 
     /**
-     * Holds if this range expression is inclusive.
+     * Gets the operator name of this range expression, if it exists.
      */
-    predicate isInclusive() { Synth::convertRangeExprToRaw(this).(Raw::RangeExpr).isInclusive() }
+    string getOperatorName() {
+      result = Synth::convertRangeExprToRaw(this).(Raw::RangeExpr).getOperatorName()
+    }
+
+    /**
+     * Holds if `getOperatorName()` exists.
+     */
+    final predicate hasOperatorName() { exists(this.getOperatorName()) }
+
+    /**
+     * Gets the start of this range expression, if it exists.
+     */
+    Expr getStart() {
+      result =
+        Synth::convertExprFromRaw(Synth::convertRangeExprToRaw(this).(Raw::RangeExpr).getStart())
+    }
+
+    /**
+     * Holds if `getStart()` exists.
+     */
+    final predicate hasStart() { exists(this.getStart()) }
   }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/RangePat.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/RangePat.qll
index f131e1bfcba..2d78268e424 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/RangePat.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/RangePat.qll
@@ -29,6 +29,30 @@ module Generated {
   class RangePat extends Synth::TRangePat, PatImpl::Pat {
     override string getAPrimaryQlClass() { result = "RangePat" }
 
+    /**
+     * Gets the end of this range pat, if it exists.
+     */
+    Pat getEnd() {
+      result = Synth::convertPatFromRaw(Synth::convertRangePatToRaw(this).(Raw::RangePat).getEnd())
+    }
+
+    /**
+     * Holds if `getEnd()` exists.
+     */
+    final predicate hasEnd() { exists(this.getEnd()) }
+
+    /**
+     * Gets the operator name of this range pat, if it exists.
+     */
+    string getOperatorName() {
+      result = Synth::convertRangePatToRaw(this).(Raw::RangePat).getOperatorName()
+    }
+
+    /**
+     * Holds if `getOperatorName()` exists.
+     */
+    final predicate hasOperatorName() { exists(this.getOperatorName()) }
+
     /**
      * Gets the start of this range pat, if it exists.
      */
@@ -41,17 +65,5 @@ module Generated {
      * Holds if `getStart()` exists.
      */
     final predicate hasStart() { exists(this.getStart()) }
-
-    /**
-     * Gets the end of this range pat, if it exists.
-     */
-    Pat getEnd() {
-      result = Synth::convertPatFromRaw(Synth::convertRangePatToRaw(this).(Raw::RangePat).getEnd())
-    }
-
-    /**
-     * Holds if `getEnd()` exists.
-     */
-    final predicate hasEnd() { exists(this.getEnd()) }
   }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/Raw.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/Raw.qll
index ab847f991cd..25af8ddac64 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/Raw.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/Raw.qll
@@ -33,19 +33,124 @@ module Raw {
    * INTERNAL: Do not use.
    * The base class marking errors during parsing or resolution.
    */
-  class Missing extends @missing, Unextracted { }
+  class Missing extends @missing, Unextracted {
+    override string toString() { result = "Missing" }
+  }
 
   /**
    * INTERNAL: Do not use.
    * The base class for unimplemented nodes. This is used to mark nodes that are not yet extracted.
    */
-  class Unimplemented extends @unimplemented, Unextracted { }
+  class Unimplemented extends @unimplemented, Unextracted {
+    override string toString() { result = "Unimplemented" }
+  }
 
   /**
    * INTERNAL: Do not use.
-   * The base class for declarations.
+   * A Abi. For example:
+   * ```rust
+   * todo!()
+   * ```
    */
-  class Declaration extends @declaration, AstNode { }
+  class Abi extends @abi, AstNode {
+    override string toString() { result = "Abi" }
+
+    /**
+     * Gets the abi string of this abi, if it exists.
+     */
+    string getAbiString() { abi_abi_strings(this, result) }
+  }
+
+  /**
+   * INTERNAL: Do not use.
+   * A ArgList. For example:
+   * ```rust
+   * todo!()
+   * ```
+   */
+  class ArgList extends @arg_list, AstNode {
+    override string toString() { result = "ArgList" }
+
+    /**
+     * Gets the `index`th argument of this argument list (0-based).
+     */
+    Expr getArg(int index) { arg_list_args(this, index, result) }
+  }
+
+  /**
+   * INTERNAL: Do not use.
+   * A AssocItem. For example:
+   * ```rust
+   * todo!()
+   * ```
+   */
+  class AssocItem extends @assoc_item, AstNode { }
+
+  /**
+   * INTERNAL: Do not use.
+   * A list of  `AssocItem` elements, as appearing for example in a `Trait`.
+   */
+  class AssocItemList extends @assoc_item_list, AstNode {
+    override string toString() { result = "AssocItemList" }
+
+    /**
+     * Gets the `index`th assoc item of this assoc item list (0-based).
+     */
+    AssocItem getAssocItem(int index) { assoc_item_list_assoc_items(this, index, result) }
+
+    /**
+     * Gets the `index`th attr of this assoc item list (0-based).
+     */
+    Attr getAttr(int index) { assoc_item_list_attrs(this, index, result) }
+  }
+
+  /**
+   * INTERNAL: Do not use.
+   * A Attr. For example:
+   * ```rust
+   * todo!()
+   * ```
+   */
+  class Attr extends @attr, AstNode {
+    override string toString() { result = "Attr" }
+
+    /**
+     * Gets the meta of this attr, if it exists.
+     */
+    Meta getMeta() { attr_meta(this, result) }
+  }
+
+  /**
+   * INTERNAL: Do not use.
+   * A callable. Either a `Function` or a `ClosureExpr`.
+   */
+  class Callable extends @callable, AstNode {
+    /**
+     * Gets the parameter list of this callable, if it exists.
+     */
+    ParamList getParamList() { callable_param_lists(this, result) }
+
+    /**
+     * Gets the `index`th attr of this callable (0-based).
+     */
+    Attr getAttr(int index) { callable_attrs(this, index, result) }
+  }
+
+  /**
+   * INTERNAL: Do not use.
+   * A ClosureBinder. For example:
+   * ```rust
+   * todo!()
+   * ```
+   */
+  class ClosureBinder extends @closure_binder, AstNode {
+    override string toString() { result = "ClosureBinder" }
+
+    /**
+     * Gets the generic parameter list of this closure binder, if it exists.
+     */
+    GenericParamList getGenericParamList() { closure_binder_generic_param_lists(this, result) }
+  }
 
   /**
    * INTERNAL: Do not use.
@@ -53,6 +158,75 @@ module Raw {
    */
   class Expr extends @expr, AstNode { }
 
+  /**
+   * INTERNAL: Do not use.
+   * A ExternItem. For example:
+   * ```rust
+   * todo!()
+   * ```
+   */
+  class ExternItem extends @extern_item, AstNode { }
+
+  /**
+   * INTERNAL: Do not use.
+   * A ExternItemList. For example:
+   * ```rust
+   * todo!()
+   * ```
+   */
+  class ExternItemList extends @extern_item_list, AstNode {
+    override string toString() { result = "ExternItemList" }
+
+    /**
+     * Gets the `index`th attr of this extern item list (0-based).
+     */
+    Attr getAttr(int index) { extern_item_list_attrs(this, index, result) }
+
+    /**
+     * Gets the `index`th extern item of this extern item list (0-based).
+     */
+    ExternItem getExternItem(int index) { extern_item_list_extern_items(this, index, result) }
+  }
+
+  /**
+   * INTERNAL: Do not use.
+   * A FieldList. For example:
+   * ```rust
+   * todo!()
+   * ```
+   */
+  class FieldList extends @field_list, AstNode { }
+
+  /**
+   * INTERNAL: Do not use.
+   * A FormatArgsArg. For example:
+   * ```rust
+   * todo!()
+   * ```
+   */
+  class FormatArgsArg extends @format_args_arg, AstNode {
+    override string toString() { result = "FormatArgsArg" }
+
+    /**
+     * Gets the expression of this format arguments argument, if it exists.
+     */
+    Expr getExpr() { format_args_arg_exprs(this, result) }
+
+    /**
+     * Gets the name of this format arguments argument, if it exists.
+     */
+    Name getName() { format_args_arg_names(this, result) }
+  }
+
+  /**
+   * INTERNAL: Do not use.
+   * A GenericArg. For example:
+   * ```rust
+   * todo!()
+   * ```
+   */
+  class GenericArg extends @generic_arg, AstNode { }
+
   /**
    * INTERNAL: Do not use.
    * The base class for generic arguments.
@@ -60,8 +234,61 @@ module Raw {
    * x.foo::<u32, u64>(42);
    * ```
    */
-  class GenericArgList extends @generic_arg_list, AstNode, Unimplemented {
+  class GenericArgList extends @generic_arg_list, AstNode {
     override string toString() { result = "GenericArgList" }
+
+    /**
+     * Gets the `index`th generic argument of this generic argument list (0-based).
+     */
+    GenericArg getGenericArg(int index) { generic_arg_list_generic_args(this, index, result) }
+  }
+
+  /**
+   * INTERNAL: Do not use.
+   * A GenericParam. For example:
+   * ```rust
+   * todo!()
+   * ```
+   */
+  class GenericParam extends @generic_param, AstNode { }
+
+  /**
+   * INTERNAL: Do not use.
+   * A GenericParamList. For example:
+   * ```rust
+   * todo!()
+   * ```
+   */
+  class GenericParamList extends @generic_param_list, AstNode {
+    override string toString() { result = "GenericParamList" }
+
+    /**
+     * Gets the `index`th generic parameter of this generic parameter list (0-based).
+     */
+    GenericParam getGenericParam(int index) {
+      generic_param_list_generic_params(this, index, result)
+    }
+  }
+
+  /**
+   * INTERNAL: Do not use.
+   * A ItemList. For example:
+   * ```rust
+   * todo!()
+   * ```
+   */
+  class ItemList extends @item_list, AstNode {
+    override string toString() { result = "ItemList" }
+
+    /**
+     * Gets the `index`th attr of this item list (0-based).
+     */
+    Attr getAttr(int index) { item_list_attrs(this, index, result) }
+
+    /**
+     * Gets the `index`th item of this item list (0-based).
+     */
+    Item getItem(int index) { item_list_items(this, index, result) }
   }
 
   /**
@@ -78,9 +305,82 @@ module Raw {
     override string toString() { result = "Label" }
 
     /**
-     * Gets the name of this label.
+     * Gets the lifetime of this label, if it exists.
      */
-    string getName() { labels(this, result) }
+    Lifetime getLifetime() { label_lifetimes(this, result) }
+  }
+
+  /**
+   * INTERNAL: Do not use.
+   * A LetElse. For example:
+   * ```rust
+   * todo!()
+   * ```
+   */
+  class LetElse extends @let_else, AstNode {
+    override string toString() { result = "LetElse" }
+
+    /**
+     * Gets the block expression of this let else, if it exists.
+     */
+    BlockExpr getBlockExpr() { let_else_block_exprs(this, result) }
+  }
+
+  /**
+   * INTERNAL: Do not use.
+   * A Lifetime. For example:
+   * ```rust
+   * todo!()
+   * ```
+   */
+  class Lifetime extends @lifetime, AstNode {
+    override string toString() { result = "Lifetime" }
+
+    /**
+     * Gets the text of this lifetime, if it exists.
+     */
+    string getText() { lifetime_texts(this, result) }
+  }
+
+  /**
+   * INTERNAL: Do not use.
+   * A sequence of items generated by a `MacroCall`. For example:
+   * ```rust
+   * mod foo{
+   *     include!("common_definitions.rs");
+   * }
+   * ```
+   */
+  class MacroItems extends @macro_items, AstNode {
+    override string toString() { result = "MacroItems" }
+
+    /**
+     * Gets the `index`th item of this macro items (0-based).
+     */
+    Item getItem(int index) { macro_items_items(this, index, result) }
+  }
+
+  /**
+   * INTERNAL: Do not use.
+   * A sequence of statements generated by a `MacroCall`. For example:
+   * ```rust
+   * fn main() {
+   *     println!("Hello, world!"); // This macro expands into a list of statements
+   * }
+   * ```
+   */
+  class MacroStmts extends @macro_stmts, AstNode {
+    override string toString() { result = "MacroStmts" }
+
+    /**
+     * Gets the expression of this macro statements, if it exists.
+     */
+    Expr getExpr() { macro_stmts_exprs(this, result) }
+
+    /**
+     * Gets the `index`th statement of this macro statements (0-based).
+     */
+    Stmt getStatement(int index) { macro_stmts_statements(this, index, result) }
   }
 
   /**
@@ -103,19 +403,171 @@ module Raw {
     override string toString() { result = "MatchArm" }
 
     /**
-     * Gets the pat of this match arm.
+     * Gets the `index`th attr of this match arm (0-based).
      */
-    Pat getPat() { match_arms(this, result, _) }
+    Attr getAttr(int index) { match_arm_attrs(this, index, result) }
+
+    /**
+     * Gets the expression of this match arm, if it exists.
+     */
+    Expr getExpr() { match_arm_exprs(this, result) }
 
     /**
      * Gets the guard of this match arm, if it exists.
      */
-    Expr getGuard() { match_arm_guards(this, result) }
+    MatchGuard getGuard() { match_arm_guards(this, result) }
 
     /**
-     * Gets the expression of this match arm.
+     * Gets the pat of this match arm, if it exists.
      */
-    Expr getExpr() { match_arms(this, _, result) }
+    Pat getPat() { match_arm_pats(this, result) }
+  }
+
+  /**
+   * INTERNAL: Do not use.
+   * A MatchArmList. For example:
+   * ```rust
+   * todo!()
+   * ```
+   */
+  class MatchArmList extends @match_arm_list, AstNode {
+    override string toString() { result = "MatchArmList" }
+
+    /**
+     * Gets the `index`th arm of this match arm list (0-based).
+     */
+    MatchArm getArm(int index) { match_arm_list_arms(this, index, result) }
+
+    /**
+     * Gets the `index`th attr of this match arm list (0-based).
+     */
+    Attr getAttr(int index) { match_arm_list_attrs(this, index, result) }
+  }
+
+  /**
+   * INTERNAL: Do not use.
+   * A MatchGuard. For example:
+   * ```rust
+   * todo!()
+   * ```
+   */
+  class MatchGuard extends @match_guard, AstNode {
+    override string toString() { result = "MatchGuard" }
+
+    /**
+     * Gets the condition of this match guard, if it exists.
+     */
+    Expr getCondition() { match_guard_conditions(this, result) }
+  }
+
+  /**
+   * INTERNAL: Do not use.
+   * A Meta. For example:
+   * ```rust
+   * todo!()
+   * ```
+   */
+  class Meta extends @meta, AstNode {
+    override string toString() { result = "Meta" }
+
+    /**
+     * Gets the expression of this meta, if it exists.
+     */
+    Expr getExpr() { meta_exprs(this, result) }
+
+    /**
+     * Holds if this meta is unsafe.
+     */
+    predicate isUnsafe() { meta_is_unsafe(this) }
+
+    /**
+     * Gets the path of this meta, if it exists.
+     */
+    Path getPath() { meta_paths(this, result) }
+
+    /**
+     * Gets the token tree of this meta, if it exists.
+     */
+    TokenTree getTokenTree() { meta_token_trees(this, result) }
+  }
+
+  /**
+   * INTERNAL: Do not use.
+   * A Name. For example:
+   * ```rust
+   * todo!()
+   * ```
+   */
+  class Name extends @name, AstNode {
+    override string toString() { result = "Name" }
+
+    /**
+     * Gets the text of this name, if it exists.
+     */
+    string getText() { name_texts(this, result) }
+  }
+
+  /**
+   * INTERNAL: Do not use.
+   * A NameRef. For example:
+   * ```rust
+   * todo!()
+   * ```
+   */
+  class NameRef extends @name_ref, AstNode {
+    override string toString() { result = "NameRef" }
+
+    /**
+     * Gets the text of this name reference, if it exists.
+     */
+    string getText() { name_ref_texts(this, result) }
+  }
+
+  /**
+   * INTERNAL: Do not use.
+   * A Param. For example:
+   * ```rust
+   * todo!()
+   * ```
+   */
+  class Param extends @param, AstNode {
+    override string toString() { result = "Param" }
+
+    /**
+     * Gets the `index`th attr of this parameter (0-based).
+     */
+    Attr getAttr(int index) { param_attrs(this, index, result) }
+
+    /**
+     * Gets the pat of this parameter, if it exists.
+     */
+    Pat getPat() { param_pats(this, result) }
+
+    /**
+     * Gets the ty of this parameter, if it exists.
+     */
+    TypeRef getTy() { param_ties(this, result) }
+  }
+
+  /**
+   * INTERNAL: Do not use.
+   * A ParamList. For example:
+   * ```rust
+   * todo!()
+   * ```
+   */
+  class ParamList extends @param_list, AstNode {
+    override string toString() { result = "ParamList" }
+
+    /**
+     * Gets the `index`th parameter of this parameter list (0-based).
+     */
+    Param getParam(int index) { param_list_params(this, index, result) }
+
+    /**
+     * Gets the self parameter of this parameter list, if it exists.
+     */
+    SelfParam getSelfParam() { param_list_self_params(this, result) }
   }
 
   /**
@@ -126,13 +578,48 @@ module Raw {
 
   /**
    * INTERNAL: Do not use.
-   * A path. For example:
+   * A PathSegment. For example:
    * ```rust
-   * foo::bar;
+   * todo!()
    * ```
    */
-  class Path extends @path, AstNode, Unimplemented {
-    override string toString() { result = "Path" }
+  class PathSegment extends @path_segment, AstNode {
+    override string toString() { result = "PathSegment" }
+
+    /**
+     * Gets the generic argument list of this path segment, if it exists.
+     */
+    GenericArgList getGenericArgList() { path_segment_generic_arg_lists(this, result) }
+
+    /**
+     * Gets the name reference of this path segment, if it exists.
+     */
+    NameRef getNameRef() { path_segment_name_refs(this, result) }
+
+    /**
+     * Gets the parameter list of this path segment, if it exists.
+     */
+    ParamList getParamList() { path_segment_param_lists(this, result) }
+
+    /**
+     * Gets the path type of this path segment, if it exists.
+     */
+    PathType getPathType() { path_segment_path_types(this, result) }
+
+    /**
+     * Gets the ret type of this path segment, if it exists.
+     */
+    RetType getRetType() { path_segment_ret_types(this, result) }
+
+    /**
+     * Gets the return type syntax of this path segment, if it exists.
+     */
+    ReturnTypeSyntax getReturnTypeSyntax() { path_segment_return_type_syntaxes(this, result) }
+
+    /**
+     * Gets the ty of this path segment, if it exists.
+     */
+    TypeRef getTy() { path_segment_ties(this, result) }
   }
 
   /**
@@ -146,14 +633,76 @@ module Raw {
     override string toString() { result = "RecordExprField" }
 
     /**
-     * Gets the name of this record expression field.
+     * Gets the `index`th attr of this record expression field (0-based).
      */
-    string getName() { record_expr_fields(this, result, _) }
+    Attr getAttr(int index) { record_expr_field_attrs(this, index, result) }
 
     /**
-     * Gets the expression of this record expression field.
+     * Gets the expression of this record expression field, if it exists.
      */
-    Expr getExpr() { record_expr_fields(this, _, result) }
+    Expr getExpr() { record_expr_field_exprs(this, result) }
+
+    /**
+     * Gets the name reference of this record expression field, if it exists.
+     */
+    NameRef getNameRef() { record_expr_field_name_refs(this, result) }
+  }
+
+  /**
+   * INTERNAL: Do not use.
+   * A RecordExprFieldList. For example:
+   * ```rust
+   * todo!()
+   * ```
+   */
+  class RecordExprFieldList extends @record_expr_field_list, AstNode {
+    override string toString() { result = "RecordExprFieldList" }
+
+    /**
+     * Gets the `index`th attr of this record expression field list (0-based).
+     */
+    Attr getAttr(int index) { record_expr_field_list_attrs(this, index, result) }
+
+    /**
+     * Gets the `index`th field of this record expression field list (0-based).
+     */
+    RecordExprField getField(int index) { record_expr_field_list_fields(this, index, result) }
+
+    /**
+     * Gets the spread of this record expression field list, if it exists.
+     */
+    Expr getSpread() { record_expr_field_list_spreads(this, result) }
+  }
+
+  /**
+   * INTERNAL: Do not use.
+   * A RecordField. For example:
+   * ```rust
+   * todo!()
+   * ```
+   */
+  class RecordField extends @record_field, AstNode {
+    override string toString() { result = "RecordField" }
+
+    /**
+     * Gets the `index`th attr of this record field (0-based).
+     */
+    Attr getAttr(int index) { record_field_attrs(this, index, result) }
+
+    /**
+     * Gets the name of this record field, if it exists.
+     */
+    Name getName() { record_field_names(this, result) }
+
+    /**
+     * Gets the ty of this record field, if it exists.
+     */
+    TypeRef getTy() { record_field_ties(this, result) }
+
+    /**
+     * Gets the visibility of this record field, if it exists.
+     */
+    Visibility getVisibility() { record_field_visibilities(this, result) }
   }
 
   /**
@@ -167,14 +716,156 @@ module Raw {
     override string toString() { result = "RecordPatField" }
 
     /**
-     * Gets the name of this record pat field.
+     * Gets the `index`th attr of this record pat field (0-based).
      */
-    string getName() { record_pat_fields(this, result, _) }
+    Attr getAttr(int index) { record_pat_field_attrs(this, index, result) }
 
     /**
-     * Gets the pat of this record pat field.
+     * Gets the name reference of this record pat field, if it exists.
      */
-    Pat getPat() { record_pat_fields(this, _, result) }
+    NameRef getNameRef() { record_pat_field_name_refs(this, result) }
+
+    /**
+     * Gets the pat of this record pat field, if it exists.
+     */
+    Pat getPat() { record_pat_field_pats(this, result) }
+  }
+
+  /**
+   * INTERNAL: Do not use.
+   * A RecordPatFieldList. For example:
+   * ```rust
+   * todo!()
+   * ```
+   */
+  class RecordPatFieldList extends @record_pat_field_list, AstNode {
+    override string toString() { result = "RecordPatFieldList" }
+
+    /**
+     * Gets the `index`th field of this record pat field list (0-based).
+     */
+    RecordPatField getField(int index) { record_pat_field_list_fields(this, index, result) }
+
+    /**
+     * Gets the rest pat of this record pat field list, if it exists.
+     */
+    RestPat getRestPat() { record_pat_field_list_rest_pats(this, result) }
+  }
+
+  /**
+   * INTERNAL: Do not use.
+   * A Rename. For example:
+   * ```rust
+   * todo!()
+   * ```
+   */
+  class Rename extends @rename, AstNode {
+    override string toString() { result = "Rename" }
+
+    /**
+     * Gets the name of this rename, if it exists.
+     */
+    Name getName() { rename_names(this, result) }
+  }
+
+  /**
+   * INTERNAL: Do not use.
+   * Either a `Path`, or a `MethodCallExpr`.
+   */
+  class Resolvable extends @resolvable, AstNode {
+    /**
+     * Gets the resolved path of this resolvable, if it exists.
+     */
+    string getResolvedPath() { resolvable_resolved_paths(this, result) }
+
+    /**
+     * Gets the resolved crate origin of this resolvable, if it exists.
+     */
+    string getResolvedCrateOrigin() { resolvable_resolved_crate_origins(this, result) }
+  }
+
+  /**
+   * INTERNAL: Do not use.
+   * A RetType. For example:
+   * ```rust
+   * todo!()
+   * ```
+   */
+  class RetType extends @ret_type, AstNode {
+    override string toString() { result = "RetType" }
+
+    /**
+     * Gets the ty of this ret type, if it exists.
+     */
+    TypeRef getTy() { ret_type_ties(this, result) }
+  }
+
+  /**
+   * INTERNAL: Do not use.
+   * A ReturnTypeSyntax. For example:
+   * ```rust
+   * todo!()
+   * ```
+   */
+  class ReturnTypeSyntax extends @return_type_syntax, AstNode {
+    override string toString() { result = "ReturnTypeSyntax" }
+  }
+
+  /**
+   * INTERNAL: Do not use.
+   * A SelfParam. For example:
+   * ```rust
+   * todo!()
+   * ```
+   */
+  class SelfParam extends @self_param, AstNode {
+    override string toString() { result = "SelfParam" }
+
+    /**
+     * Gets the `index`th attr of this self parameter (0-based).
+     */
+    Attr getAttr(int index) { self_param_attrs(this, index, result) }
+
+    /**
+     * Holds if this self parameter is mut.
+     */
+    predicate isMut() { self_param_is_mut(this) }
+
+    /**
+     * Gets the lifetime of this self parameter, if it exists.
+     */
+    Lifetime getLifetime() { self_param_lifetimes(this, result) }
+
+    /**
+     * Gets the name of this self parameter, if it exists.
+     */
+    Name getName() { self_param_names(this, result) }
+
+    /**
+     * Gets the ty of this self parameter, if it exists.
+     */
+    TypeRef getTy() { self_param_ties(this, result) }
+  }
+
+  /**
+   * INTERNAL: Do not use.
+   * A SourceFile. For example:
+   * ```rust
+   * todo!()
+   * ```
+   */
+  class SourceFile extends @source_file, AstNode {
+    override string toString() { result = "SourceFile" }
+
+    /**
+     * Gets the `index`th attr of this source file (0-based).
+     */
+    Attr getAttr(int index) { source_file_attrs(this, index, result) }
+
+    /**
+     * Gets the `index`th item of this source file (0-based).
+     */
+    Item getItem(int index) { source_file_items(this, index, result) }
   }
 
   /**
@@ -183,6 +874,127 @@ module Raw {
    */
   class Stmt extends @stmt, AstNode { }
 
+  /**
+   * INTERNAL: Do not use.
+   * A StmtList. For example:
+   * ```rust
+   * todo!()
+   * ```
+   */
+  class StmtList extends @stmt_list, AstNode {
+    override string toString() { result = "StmtList" }
+
+    /**
+     * Gets the `index`th attr of this statement list (0-based).
+     */
+    Attr getAttr(int index) { stmt_list_attrs(this, index, result) }
+
+    /**
+     * Gets the `index`th statement of this statement list (0-based).
+     */
+    Stmt getStatement(int index) { stmt_list_statements(this, index, result) }
+
+    /**
+     * Gets the tail expression of this statement list, if it exists.
+     */
+    Expr getTailExpr() { stmt_list_tail_exprs(this, result) }
+  }
+
+  /**
+   * INTERNAL: Do not use.
+   * The base class for all tokens.
+   */
+  class Token extends @token, AstNode { }
+
+  /**
+   * INTERNAL: Do not use.
+   * A TokenTree. For example:
+   * ```rust
+   * todo!()
+   * ```
+   */
+  class TokenTree extends @token_tree, AstNode {
+    override string toString() { result = "TokenTree" }
+  }
+
+  /**
+   * INTERNAL: Do not use.
+   * A TupleField. For example:
+   * ```rust
+   * todo!()
+   * ```
+   */
+  class TupleField extends @tuple_field, AstNode {
+    override string toString() { result = "TupleField" }
+
+    /**
+     * Gets the `index`th attr of this tuple field (0-based).
+     */
+    Attr getAttr(int index) { tuple_field_attrs(this, index, result) }
+
+    /**
+     * Gets the ty of this tuple field, if it exists.
+     */
+    TypeRef getTy() { tuple_field_ties(this, result) }
+
+    /**
+     * Gets the visibility of this tuple field, if it exists.
+     */
+    Visibility getVisibility() { tuple_field_visibilities(this, result) }
+  }
+
+  /**
+   * INTERNAL: Do not use.
+   * A TypeBound. For example:
+   * ```rust
+   * todo!()
+   * ```
+   */
+  class TypeBound extends @type_bound, AstNode {
+    override string toString() { result = "TypeBound" }
+
+    /**
+     * Gets the generic parameter list of this type bound, if it exists.
+     */
+    GenericParamList getGenericParamList() { type_bound_generic_param_lists(this, result) }
+
+    /**
+     * Holds if this type bound is async.
+     */
+    predicate isAsync() { type_bound_is_async(this) }
+
+    /**
+     * Holds if this type bound is const.
+     */
+    predicate isConst() { type_bound_is_const(this) }
+
+    /**
+     * Gets the lifetime of this type bound, if it exists.
+     */
+    Lifetime getLifetime() { type_bound_lifetimes(this, result) }
+
+    /**
+     * Gets the ty of this type bound, if it exists.
+     */
+    TypeRef getTy() { type_bound_ties(this, result) }
+  }
+
+  /**
+   * INTERNAL: Do not use.
+   * A TypeBoundList. For example:
+   * ```rust
+   * todo!()
+   * ```
+   */
+  class TypeBoundList extends @type_bound_list, AstNode {
+    override string toString() { result = "TypeBoundList" }
+
+    /**
+     * Gets the `index`th bound of this type bound list (0-based).
+     */
+    TypeBound getBound(int index) { type_bound_list_bounds(this, index, result) }
+  }
+
   /**
    * INTERNAL: Do not use.
    * The base class for type references.
@@ -192,8 +1004,163 @@ module Raw {
    * let z: Option<i32>;
    * ```
    */
-  class TypeRef extends @type_ref, AstNode, Unimplemented {
-    override string toString() { result = "TypeRef" }
+  class TypeRef extends @type_ref, AstNode { }
+
+  /**
+   * INTERNAL: Do not use.
+   * A UseTree. For example:
+   * ```rust
+   * todo!()
+   * ```
+   */
+  class UseTree extends @use_tree, AstNode {
+    override string toString() { result = "UseTree" }
+
+    /**
+     * Gets the path of this use tree, if it exists.
+     */
+    Path getPath() { use_tree_paths(this, result) }
+
+    /**
+     * Gets the rename of this use tree, if it exists.
+     */
+    Rename getRename() { use_tree_renames(this, result) }
+
+    /**
+     * Gets the use tree list of this use tree, if it exists.
+     */
+    UseTreeList getUseTreeList() { use_tree_use_tree_lists(this, result) }
+  }
+
+  /**
+   * INTERNAL: Do not use.
+   * A UseTreeList. For example:
+   * ```rust
+   * todo!()
+   * ```
+   */
+  class UseTreeList extends @use_tree_list, AstNode {
+    override string toString() { result = "UseTreeList" }
+
+    /**
+     * Gets the `index`th use tree of this use tree list (0-based).
+     */
+    UseTree getUseTree(int index) { use_tree_list_use_trees(this, index, result) }
+  }
+
+  /**
+   * INTERNAL: Do not use.
+   * A Variant. For example:
+   * ```rust
+   * todo!()
+   * ```
+   */
+  class Variant extends @variant, AstNode {
+    override string toString() { result = "Variant" }
+
+    /**
+     * Gets the `index`th attr of this variant (0-based).
+     */
+    Attr getAttr(int index) { variant_attrs(this, index, result) }
+
+    /**
+     * Gets the expression of this variant, if it exists.
+     */
+    Expr getExpr() { variant_exprs(this, result) }
+
+    /**
+     * Gets the field list of this variant, if it exists.
+     */
+    FieldList getFieldList() { variant_field_lists(this, result) }
+
+    /**
+     * Gets the name of this variant, if it exists.
+     */
+    Name getName() { variant_names(this, result) }
+
+    /**
+     * Gets the visibility of this variant, if it exists.
+     */
+    Visibility getVisibility() { variant_visibilities(this, result) }
+  }
+
+  /**
+   * INTERNAL: Do not use.
+   * A VariantList. For example:
+   * ```rust
+   * todo!()
+   * ```
+   */
+  class VariantList extends @variant_list, AstNode {
+    override string toString() { result = "VariantList" }
+
+    /**
+     * Gets the `index`th variant of this variant list (0-based).
+     */
+    Variant getVariant(int index) { variant_list_variants(this, index, result) }
+  }
+
+  /**
+   * INTERNAL: Do not use.
+   * A Visibility. For example:
+   * ```rust
+   * todo!()
+   * ```
+   */
+  class Visibility extends @visibility, AstNode {
+    override string toString() { result = "Visibility" }
+
+    /**
+     * Gets the path of this visibility, if it exists.
+     */
+    Path getPath() { visibility_paths(this, result) }
+  }
+
+  /**
+   * INTERNAL: Do not use.
+   * A WhereClause. For example:
+   * ```rust
+   * todo!()
+   * ```
+   */
+  class WhereClause extends @where_clause, AstNode {
+    override string toString() { result = "WhereClause" }
+
+    /**
+     * Gets the `index`th predicate of this where clause (0-based).
+     */
+    WherePred getPredicate(int index) { where_clause_predicates(this, index, result) }
+  }
+
+  /**
+   * INTERNAL: Do not use.
+   * A WherePred. For example:
+   * ```rust
+   * todo!()
+   * ```
+   */
+  class WherePred extends @where_pred, AstNode {
+    override string toString() { result = "WherePred" }
+
+    /**
+     * Gets the generic parameter list of this where pred, if it exists.
+     */
+    GenericParamList getGenericParamList() { where_pred_generic_param_lists(this, result) }
+
+    /**
+     * Gets the lifetime of this where pred, if it exists.
+     */
+    Lifetime getLifetime() { where_pred_lifetimes(this, result) }
+
+    /**
+     * Gets the ty of this where pred, if it exists.
+     */
+    TypeRef getTy() { where_pred_ties(this, result) }
+
+    /**
+     * Gets the type bound list of this where pred, if it exists.
+     */
+    TypeBoundList getTypeBoundList() { where_pred_type_bound_lists(this, result) }
   }
 
   /**
@@ -204,7 +1171,40 @@ module Raw {
    * [1; 10];
    * ```
    */
-  class ArrayExpr extends @array_expr, Expr { }
+  class ArrayExpr extends @array_expr, Expr {
+    override string toString() { result = "ArrayExpr" }
+
+    /**
+     * Gets the `index`th attr of this array expression (0-based).
+     */
+    Attr getAttr(int index) { array_expr_attrs(this, index, result) }
+
+    /**
+     * Gets the `index`th expression of this array expression (0-based).
+     */
+    Expr getExpr(int index) { array_expr_exprs(this, index, result) }
+  }
+
+  /**
+   * INTERNAL: Do not use.
+   * A ArrayType. For example:
+   * ```rust
+   * todo!()
+   * ```
+   */
+  class ArrayType extends @array_type, TypeRef {
+    override string toString() { result = "ArrayType" }
+
+    /**
+     * Gets the const argument of this array type, if it exists.
+     */
+    ConstArg getConstArg() { array_type_const_args(this, result) }
+
+    /**
+     * Gets the ty of this array type, if it exists.
+     */
+    TypeRef getTy() { array_type_ties(this, result) }
+  }
 
   /**
    * INTERNAL: Do not use.
@@ -219,9 +1219,65 @@ module Raw {
     override string toString() { result = "AsmExpr" }
 
     /**
-     * Gets the expression of this asm expression.
+     * Gets the `index`th attr of this asm expression (0-based).
      */
-    Expr getExpr() { asm_exprs(this, result) }
+    Attr getAttr(int index) { asm_expr_attrs(this, index, result) }
+
+    /**
+     * Gets the expression of this asm expression, if it exists.
+     */
+    Expr getExpr() { asm_expr_exprs(this, result) }
+  }
+
+  /**
+   * INTERNAL: Do not use.
+   * A AssocTypeArg. For example:
+   * ```rust
+   * todo!()
+   * ```
+   */
+  class AssocTypeArg extends @assoc_type_arg, GenericArg {
+    override string toString() { result = "AssocTypeArg" }
+
+    /**
+     * Gets the const argument of this assoc type argument, if it exists.
+     */
+    ConstArg getConstArg() { assoc_type_arg_const_args(this, result) }
+
+    /**
+     * Gets the generic argument list of this assoc type argument, if it exists.
+     */
+    GenericArgList getGenericArgList() { assoc_type_arg_generic_arg_lists(this, result) }
+
+    /**
+     * Gets the name reference of this assoc type argument, if it exists.
+     */
+    NameRef getNameRef() { assoc_type_arg_name_refs(this, result) }
+
+    /**
+     * Gets the parameter list of this assoc type argument, if it exists.
+     */
+    ParamList getParamList() { assoc_type_arg_param_lists(this, result) }
+
+    /**
+     * Gets the ret type of this assoc type argument, if it exists.
+     */
+    RetType getRetType() { assoc_type_arg_ret_types(this, result) }
+
+    /**
+     * Gets the return type syntax of this assoc type argument, if it exists.
+     */
+    ReturnTypeSyntax getReturnTypeSyntax() { assoc_type_arg_return_type_syntaxes(this, result) }
+
+    /**
+     * Gets the ty of this assoc type argument, if it exists.
+     */
+    TypeRef getTy() { assoc_type_arg_ties(this, result) }
+
+    /**
+     * Gets the type bound list of this assoc type argument, if it exists.
+     */
+    TypeBoundList getTypeBoundList() { assoc_type_arg_type_bound_lists(this, result) }
   }
 
   /**
@@ -238,9 +1294,14 @@ module Raw {
     override string toString() { result = "AwaitExpr" }
 
     /**
-     * Gets the expression of this await expression.
+     * Gets the `index`th attr of this await expression (0-based).
      */
-    Expr getExpr() { await_exprs(this, result) }
+    Attr getAttr(int index) { await_expr_attrs(this, index, result) }
+
+    /**
+     * Gets the expression of this await expression, if it exists.
+     */
+    Expr getExpr() { await_expr_exprs(this, result) }
   }
 
   /**
@@ -260,9 +1321,14 @@ module Raw {
     override string toString() { result = "BecomeExpr" }
 
     /**
-     * Gets the expression of this become expression.
+     * Gets the `index`th attr of this become expression (0-based).
      */
-    Expr getExpr() { become_exprs(this, result) }
+    Attr getAttr(int index) { become_expr_attrs(this, index, result) }
+
+    /**
+     * Gets the expression of this become expression, if it exists.
+     */
+    Expr getExpr() { become_expr_exprs(this, result) }
   }
 
   /**
@@ -280,50 +1346,88 @@ module Raw {
     override string toString() { result = "BinaryExpr" }
 
     /**
-     * Gets the lhs of this binary expression.
+     * Gets the `index`th attr of this binary expression (0-based).
      */
-    Expr getLhs() { binary_exprs(this, result, _) }
+    Attr getAttr(int index) { binary_expr_attrs(this, index, result) }
 
     /**
-     * Gets the rhs of this binary expression.
+     * Gets the lhs of this binary expression, if it exists.
      */
-    Expr getRhs() { binary_exprs(this, _, result) }
+    Expr getLhs() { binary_expr_lhs(this, result) }
 
     /**
-     * Gets the op of this binary expression, if it exists.
+     * Gets the operator name of this binary expression, if it exists.
      */
-    string getOp() { binary_expr_ops(this, result) }
+    string getOperatorName() { binary_expr_operator_names(this, result) }
+
+    /**
+     * Gets the rhs of this binary expression, if it exists.
+     */
+    Expr getRhs() { binary_expr_rhs(this, result) }
   }
 
   /**
    * INTERNAL: Do not use.
-   */
-  class BlockExprBase extends @block_expr_base, Expr {
-    /**
-     * Gets the `index`th statement of this block expression base (0-based).
-     */
-    Stmt getStatement(int index) { block_expr_base_statements(this, index, result) }
-
-    /**
-     * Gets the tail of this block expression base, if it exists.
-     */
-    Expr getTail() { block_expr_base_tails(this, result) }
-  }
-
-  /**
-   * INTERNAL: Do not use.
-   * A box expression. For example:
+   * A block expression. For example:
    * ```rust
-   * let x = #[rustc_box] Box::new(42);
+   * {
+   *     let x = 42;
+   * }
+   * ```
+   * ```rust
+   * 'label: {
+   *     let x = 42;
+   *     x
+   * }
    * ```
    */
-  class BoxExpr extends @box_expr, Expr {
-    override string toString() { result = "BoxExpr" }
+  class BlockExpr extends @block_expr, Expr {
+    override string toString() { result = "BlockExpr" }
 
     /**
-     * Gets the expression of this box expression.
+     * Gets the `index`th attr of this block expression (0-based).
      */
-    Expr getExpr() { box_exprs(this, result) }
+    Attr getAttr(int index) { block_expr_attrs(this, index, result) }
+
+    /**
+     * Holds if this block expression is async.
+     */
+    predicate isAsync() { block_expr_is_async(this) }
+
+    /**
+     * Holds if this block expression is const.
+     */
+    predicate isConst() { block_expr_is_const(this) }
+
+    /**
+     * Holds if this block expression is gen.
+     */
+    predicate isGen() { block_expr_is_gen(this) }
+
+    /**
+     * Holds if this block expression is move.
+     */
+    predicate isMove() { block_expr_is_move(this) }
+
+    /**
+     * Holds if this block expression is try.
+     */
+    predicate isTry() { block_expr_is_try(this) }
+
+    /**
+     * Holds if this block expression is unsafe.
+     */
+    predicate isUnsafe() { block_expr_is_unsafe(this) }
+
+    /**
+     * Gets the label of this block expression, if it exists.
+     */
+    Label getLabel() { block_expr_labels(this, result) }
+
+    /**
+     * Gets the statement list of this block expression, if it exists.
+     */
+    StmtList getStmtList() { block_expr_stmt_lists(this, result) }
   }
 
   /**
@@ -340,9 +1444,9 @@ module Raw {
     override string toString() { result = "BoxPat" }
 
     /**
-     * Gets the inner of this box pat.
+     * Gets the pat of this box pat, if it exists.
      */
-    Pat getInner() { box_pats(this, result) }
+    Pat getPat() { box_pat_pats(this, result) }
   }
 
   /**
@@ -362,48 +1466,48 @@ module Raw {
    *     }
    * };
    * ```
+   * ```rust
+   * let x = 'label: {
+   *     if exit() {
+   *         break 'label 42;
+   *     }
+   *     0;
+   * };
+   * ```
    */
   class BreakExpr extends @break_expr, Expr {
     override string toString() { result = "BreakExpr" }
 
+    /**
+     * Gets the `index`th attr of this break expression (0-based).
+     */
+    Attr getAttr(int index) { break_expr_attrs(this, index, result) }
+
     /**
      * Gets the expression of this break expression, if it exists.
      */
     Expr getExpr() { break_expr_exprs(this, result) }
 
     /**
-     * Gets the label of this break expression, if it exists.
+     * Gets the lifetime of this break expression, if it exists.
      */
-    Label getLabel() { break_expr_labels(this, result) }
+    Lifetime getLifetime() { break_expr_lifetimes(this, result) }
   }
 
   /**
    * INTERNAL: Do not use.
-   * A function call expression. For example:
-   * ```rust
-   * foo(42);
-   * foo::<u32, u64>(42);
-   * foo[0](42);
-   * foo(1) = 4;
-   * ```
+   * A function or method call expression. See `CallExpr` and `MethodCallExpr` for further details.
    */
-  class CallExpr extends @call_expr, Expr {
-    override string toString() { result = "CallExpr" }
+  class CallExprBase extends @call_expr_base, Expr {
+    /**
+     * Gets the argument list of this call expression base, if it exists.
+     */
+    ArgList getArgList() { call_expr_base_arg_lists(this, result) }
 
     /**
-     * Gets the callee of this call expression.
+     * Gets the `index`th attr of this call expression base (0-based).
      */
-    Expr getCallee() { call_exprs(this, result) }
-
-    /**
-     * Gets the `index`th argument of this call expression (0-based).
-     */
-    Expr getArg(int index) { call_expr_args(this, index, result) }
-
-    /**
-     * Holds if this call expression is assignee expression.
-     */
-    predicate isAssigneeExpr() { call_expr_is_assignee_expr(this) }
+    Attr getAttr(int index) { call_expr_base_attrs(this, index, result) }
   }
 
   /**
@@ -417,14 +1521,19 @@ module Raw {
     override string toString() { result = "CastExpr" }
 
     /**
-     * Gets the expression of this cast expression.
+     * Gets the `index`th attr of this cast expression (0-based).
      */
-    Expr getExpr() { cast_exprs(this, result, _) }
+    Attr getAttr(int index) { cast_expr_attrs(this, index, result) }
 
     /**
-     * Gets the type of this cast expression.
+     * Gets the expression of this cast expression, if it exists.
      */
-    TypeRef getType() { cast_exprs(this, _, result) }
+    Expr getExpr() { cast_expr_exprs(this, result) }
+
+    /**
+     * Gets the ty of this cast expression, if it exists.
+     */
+    TypeRef getTy() { cast_expr_ties(this, result) }
   }
 
   /**
@@ -440,38 +1549,86 @@ module Raw {
    *  static |x| yield x;
    * ```
    */
-  class ClosureExpr extends @closure_expr, Expr {
+  class ClosureExpr extends @closure_expr, Expr, Callable {
     override string toString() { result = "ClosureExpr" }
 
     /**
-     * Gets the `index`th argument of this closure expression (0-based).
+     * Gets the body of this closure expression, if it exists.
      */
-    Pat getArg(int index) { closure_expr_args(this, index, result) }
+    Expr getBody() { closure_expr_bodies(this, result) }
 
     /**
-     * Gets the `index`th argument type of this closure expression (0-based), if it exists.
+     * Gets the closure binder of this closure expression, if it exists.
      */
-    TypeRef getArgType(int index) { closure_expr_arg_types(this, index, result) }
+    ClosureBinder getClosureBinder() { closure_expr_closure_binders(this, result) }
 
     /**
-     * Gets the ret type of this closure expression, if it exists.
+     * Holds if this closure expression is async.
      */
-    TypeRef getRetType() { closure_expr_ret_types(this, result) }
+    predicate isAsync() { closure_expr_is_async(this) }
 
     /**
-     * Gets the body of this closure expression.
+     * Holds if this closure expression is const.
      */
-    Expr getBody() { closure_exprs(this, result, _) }
+    predicate isConst() { closure_expr_is_const(this) }
 
     /**
-     * Gets the closure kind of this closure expression.
+     * Holds if this closure expression is gen.
      */
-    string getClosureKind() { closure_exprs(this, _, result) }
+    predicate isGen() { closure_expr_is_gen(this) }
 
     /**
      * Holds if this closure expression is move.
      */
     predicate isMove() { closure_expr_is_move(this) }
+
+    /**
+     * Holds if this closure expression is static.
+     */
+    predicate isStatic() { closure_expr_is_static(this) }
+
+    /**
+     * Gets the ret type of this closure expression, if it exists.
+     */
+    RetType getRetType() { closure_expr_ret_types(this, result) }
+  }
+
+  /**
+   * INTERNAL: Do not use.
+   * A comment. For example:
+   * ```rust
+   * // this is a comment
+   * /// This is a doc comment
+   * ```
+   */
+  class Comment extends @comment, Token {
+    override string toString() { result = "Comment" }
+
+    /**
+     * Gets the parent of this comment.
+     */
+    AstNode getParent() { comments(this, result, _) }
+
+    /**
+     * Gets the text of this comment.
+     */
+    string getText() { comments(this, _, result) }
+  }
+
+  /**
+   * INTERNAL: Do not use.
+   * A ConstArg. For example:
+   * ```rust
+   * todo!()
+   * ```
+   */
+  class ConstArg extends @const_arg, GenericArg {
+    override string toString() { result = "ConstArg" }
+
+    /**
+     * Gets the expression of this const argument, if it exists.
+     */
+    Expr getExpr() { const_arg_exprs(this, result) }
   }
 
   /**
@@ -488,27 +1645,50 @@ module Raw {
     override string toString() { result = "ConstBlockPat" }
 
     /**
-     * Gets the expression of this const block pat.
+     * Gets the block expression of this const block pat, if it exists.
      */
-    Expr getExpr() { const_block_pats(this, result) }
+    BlockExpr getBlockExpr() { const_block_pat_block_exprs(this, result) }
+
+    /**
+     * Holds if this const block pat is const.
+     */
+    predicate isConst() { const_block_pat_is_const(this) }
   }
 
   /**
    * INTERNAL: Do not use.
-   * A `const` block expression. For example:
+   * A ConstParam. For example:
    * ```rust
-   * if const { SRC::IS_ZST || DEST::IS_ZST || mem::align_of::<SRC>() != mem::align_of::<DEST>() } {
-   *     return false;
-   * }
+   * todo!()
    * ```
    */
-  class ConstExpr extends @const_expr, Expr {
-    override string toString() { result = "ConstExpr" }
+  class ConstParam extends @const_param, GenericParam {
+    override string toString() { result = "ConstParam" }
 
     /**
-     * Gets the expression of this const expression.
+     * Gets the `index`th attr of this const parameter (0-based).
      */
-    Expr getExpr() { const_exprs(this, result) }
+    Attr getAttr(int index) { const_param_attrs(this, index, result) }
+
+    /**
+     * Gets the default val of this const parameter, if it exists.
+     */
+    ConstArg getDefaultVal() { const_param_default_vals(this, result) }
+
+    /**
+     * Holds if this const parameter is const.
+     */
+    predicate isConst() { const_param_is_const(this) }
+
+    /**
+     * Gets the name of this const parameter, if it exists.
+     */
+    Name getName() { const_param_names(this, result) }
+
+    /**
+     * Gets the ty of this const parameter, if it exists.
+     */
+    TypeRef getTy() { const_param_ties(this, result) }
   }
 
   /**
@@ -533,9 +1713,30 @@ module Raw {
     override string toString() { result = "ContinueExpr" }
 
     /**
-     * Gets the label of this continue expression, if it exists.
+     * Gets the `index`th attr of this continue expression (0-based).
      */
-    Label getLabel() { continue_expr_labels(this, result) }
+    Attr getAttr(int index) { continue_expr_attrs(this, index, result) }
+
+    /**
+     * Gets the lifetime of this continue expression, if it exists.
+     */
+    Lifetime getLifetime() { continue_expr_lifetimes(this, result) }
+  }
+
+  /**
+   * INTERNAL: Do not use.
+   * A DynTraitType. For example:
+   * ```rust
+   * todo!()
+   * ```
+   */
+  class DynTraitType extends @dyn_trait_type, TypeRef {
+    override string toString() { result = "DynTraitType" }
+
+    /**
+     * Gets the type bound list of this dyn trait type, if it exists.
+     */
+    TypeBoundList getTypeBoundList() { dyn_trait_type_type_bound_lists(this, result) }
   }
 
   /**
@@ -543,7 +1744,7 @@ module Raw {
    * An expression statement. For example:
    * ```rust
    * start();
-   * finish()
+   * finish();
    * use std::env;
    * ```
    */
@@ -551,14 +1752,9 @@ module Raw {
     override string toString() { result = "ExprStmt" }
 
     /**
-     * Gets the expression of this expression statement.
+     * Gets the expression of this expression statement, if it exists.
      */
-    Expr getExpr() { expr_stmts(this, result) }
-
-    /**
-     * Holds if this expression statement has semicolon.
-     */
-    predicate hasSemicolon() { expr_stmt_has_semicolon(this) }
+    Expr getExpr() { expr_stmt_exprs(this, result) }
   }
 
   /**
@@ -572,41 +1768,143 @@ module Raw {
     override string toString() { result = "FieldExpr" }
 
     /**
-     * Gets the expression of this field expression.
+     * Gets the `index`th attr of this field expression (0-based).
      */
-    Expr getExpr() { field_exprs(this, result, _) }
+    Attr getAttr(int index) { field_expr_attrs(this, index, result) }
 
     /**
-     * Gets the name of this field expression.
+     * Gets the expression of this field expression, if it exists.
      */
-    string getName() { field_exprs(this, _, result) }
+    Expr getExpr() { field_expr_exprs(this, result) }
+
+    /**
+     * Gets the name reference of this field expression, if it exists.
+     */
+    NameRef getNameRef() { field_expr_name_refs(this, result) }
   }
 
   /**
    * INTERNAL: Do not use.
-   * A function declaration. For example
+   * A FnPtrType. For example:
    * ```rust
-   * fn foo(x: u32) -> u64 {(x + 1).into()}
-   * ```
-   * A function declaration within a trait might not have a body:
-   * ```rust
-   * trait Trait {
-   *     fn bar();
-   * }
+   * todo!()
    * ```
    */
-  class Function extends @function, Declaration {
-    override string toString() { result = "Function" }
+  class FnPtrType extends @fn_ptr_type, TypeRef {
+    override string toString() { result = "FnPtrType" }
 
     /**
-     * Gets the name of this function.
+     * Gets the abi of this fn ptr type, if it exists.
      */
-    string getName() { functions(this, result, _) }
+    Abi getAbi() { fn_ptr_type_abis(this, result) }
 
     /**
-     * Gets the body of this function.
+     * Holds if this fn ptr type is async.
      */
-    Expr getBody() { functions(this, _, result) }
+    predicate isAsync() { fn_ptr_type_is_async(this) }
+
+    /**
+     * Holds if this fn ptr type is const.
+     */
+    predicate isConst() { fn_ptr_type_is_const(this) }
+
+    /**
+     * Holds if this fn ptr type is unsafe.
+     */
+    predicate isUnsafe() { fn_ptr_type_is_unsafe(this) }
+
+    /**
+     * Gets the parameter list of this fn ptr type, if it exists.
+     */
+    ParamList getParamList() { fn_ptr_type_param_lists(this, result) }
+
+    /**
+     * Gets the ret type of this fn ptr type, if it exists.
+     */
+    RetType getRetType() { fn_ptr_type_ret_types(this, result) }
+  }
+
+  /**
+   * INTERNAL: Do not use.
+   * A ForExpr. For example:
+   * ```rust
+   * todo!()
+   * ```
+   */
+  class ForExpr extends @for_expr, Expr {
+    override string toString() { result = "ForExpr" }
+
+    /**
+     * Gets the `index`th attr of this for expression (0-based).
+     */
+    Attr getAttr(int index) { for_expr_attrs(this, index, result) }
+
+    /**
+     * Gets the iterable of this for expression, if it exists.
+     */
+    Expr getIterable() { for_expr_iterables(this, result) }
+
+    /**
+     * Gets the label of this for expression, if it exists.
+     */
+    Label getLabel() { for_expr_labels(this, result) }
+
+    /**
+     * Gets the loop body of this for expression, if it exists.
+     */
+    BlockExpr getLoopBody() { for_expr_loop_bodies(this, result) }
+
+    /**
+     * Gets the pat of this for expression, if it exists.
+     */
+    Pat getPat() { for_expr_pats(this, result) }
+  }
+
+  /**
+   * INTERNAL: Do not use.
+   * A ForType. For example:
+   * ```rust
+   * todo!()
+   * ```
+   */
+  class ForType extends @for_type, TypeRef {
+    override string toString() { result = "ForType" }
+
+    /**
+     * Gets the generic parameter list of this for type, if it exists.
+     */
+    GenericParamList getGenericParamList() { for_type_generic_param_lists(this, result) }
+
+    /**
+     * Gets the ty of this for type, if it exists.
+     */
+    TypeRef getTy() { for_type_ties(this, result) }
+  }
+
+  /**
+   * INTERNAL: Do not use.
+   * A FormatArgsExpr. For example:
+   * ```rust
+   * todo!()
+   * ```
+   */
+  class FormatArgsExpr extends @format_args_expr, Expr {
+    override string toString() { result = "FormatArgsExpr" }
+
+    /**
+     * Gets the `index`th argument of this format arguments expression (0-based).
+     */
+    FormatArgsArg getArg(int index) { format_args_expr_args(this, index, result) }
+
+    /**
+     * Gets the `index`th attr of this format arguments expression (0-based).
+     */
+    Attr getAttr(int index) { format_args_expr_attrs(this, index, result) }
+
+    /**
+     * Gets the template of this format arguments expression, if it exists.
+     */
+    Expr getTemplate() { format_args_expr_templates(this, result) }
   }
 
   /**
@@ -629,14 +1927,29 @@ module Raw {
     override string toString() { result = "IdentPat" }
 
     /**
-     * Gets the binding of this ident pat.
+     * Gets the `index`th attr of this ident pat (0-based).
      */
-    string getBindingId() { ident_pats(this, result) }
+    Attr getAttr(int index) { ident_pat_attrs(this, index, result) }
 
     /**
-     * Gets the subpat of this ident pat, if it exists.
+     * Holds if this ident pat is mut.
      */
-    Pat getSubpat() { ident_pat_subpats(this, result) }
+    predicate isMut() { ident_pat_is_mut(this) }
+
+    /**
+     * Holds if this ident pat is reference.
+     */
+    predicate isRef() { ident_pat_is_ref(this) }
+
+    /**
+     * Gets the name of this ident pat, if it exists.
+     */
+    Name getName() { ident_pat_names(this, result) }
+
+    /**
+     * Gets the pat of this ident pat, if it exists.
+     */
+    Pat getPat() { ident_pat_pats(this, result) }
   }
 
   /**
@@ -652,26 +1965,47 @@ module Raw {
    *     1
    * } else {
    *     0
-   * }
+   * };
    * ```
    */
   class IfExpr extends @if_expr, Expr {
     override string toString() { result = "IfExpr" }
 
     /**
-     * Gets the condition of this if expression.
+     * Gets the `index`th attr of this if expression (0-based).
      */
-    Expr getCondition() { if_exprs(this, result, _) }
+    Attr getAttr(int index) { if_expr_attrs(this, index, result) }
 
     /**
-     * Gets the then of this if expression.
+     * Gets the condition of this if expression, if it exists.
      */
-    Expr getThen() { if_exprs(this, _, result) }
+    Expr getCondition() { if_expr_conditions(this, result) }
 
     /**
      * Gets the else of this if expression, if it exists.
      */
     Expr getElse() { if_expr_elses(this, result) }
+
+    /**
+     * Gets the then of this if expression, if it exists.
+     */
+    BlockExpr getThen() { if_expr_thens(this, result) }
+  }
+
+  /**
+   * INTERNAL: Do not use.
+   * A ImplTraitType. For example:
+   * ```rust
+   * todo!()
+   * ```
+   */
+  class ImplTraitType extends @impl_trait_type, TypeRef {
+    override string toString() { result = "ImplTraitType" }
+
+    /**
+     * Gets the type bound list of this impl trait type, if it exists.
+     */
+    TypeBoundList getTypeBoundList() { impl_trait_type_type_bound_lists(this, result) }
   }
 
   /**
@@ -686,33 +2020,55 @@ module Raw {
     override string toString() { result = "IndexExpr" }
 
     /**
-     * Gets the base of this index expression.
+     * Gets the `index`th attr of this index expression (0-based).
      */
-    Expr getBase() { index_exprs(this, result, _) }
+    Attr getAttr(int index) { index_expr_attrs(this, index, result) }
 
     /**
-     * Gets the index of this index expression.
+     * Gets the base of this index expression, if it exists.
      */
-    Expr getIndex() { index_exprs(this, _, result) }
+    Expr getBase() { index_expr_bases(this, result) }
 
     /**
-     * Holds if this index expression is assignee expression.
+     * Gets the index of this index expression, if it exists.
      */
-    predicate isAssigneeExpr() { index_expr_is_assignee_expr(this) }
+    Expr getIndex() { index_expr_indices(this, result) }
   }
 
   /**
    * INTERNAL: Do not use.
-   * An item statement. For example:
+   * A InferType. For example:
    * ```rust
-   * fn print_hello() {
-   *     println!("Hello, world!");
-   * }
-   * print_hello();
+   * todo!()
    * ```
    */
-  class ItemStmt extends @item_stmt, Stmt {
-    override string toString() { result = "ItemStmt" }
+  class InferType extends @infer_type, TypeRef {
+    override string toString() { result = "InferType" }
+  }
+
+  /**
+   * INTERNAL: Do not use.
+   * A Item. For example:
+   * ```rust
+   * todo!()
+   * ```
+   */
+  class Item extends @item, Stmt {
+    /**
+     * Gets the extended canonical path of this item, if it exists.
+     *
+     * Either a canonical path (see https://doc.rust-lang.org/reference/paths.html#canonical-paths),
+     * or `{<block id>}::name` for addressable items defined in an anonymous block (and only
+     * addressable there-in).
+     */
+    string getExtendedCanonicalPath() { item_extended_canonical_paths(this, result) }
+
+    /**
+     * Gets the crate origin of this item, if it exists.
+     *
+     * One of `rustc:<name>`, `repo:<repository>:<name>` or `lang:<name>`.
+     */
+    string getCrateOrigin() { item_crate_origins(this, result) }
   }
 
   /**
@@ -728,14 +2084,19 @@ module Raw {
     override string toString() { result = "LetExpr" }
 
     /**
-     * Gets the pat of this let expression.
+     * Gets the `index`th attr of this let expression (0-based).
      */
-    Pat getPat() { let_exprs(this, result, _) }
+    Attr getAttr(int index) { let_expr_attrs(this, index, result) }
 
     /**
-     * Gets the expression of this let expression.
+     * Gets the expression of this let expression, if it exists.
      */
-    Expr getExpr() { let_exprs(this, _, result) }
+    Expr getExpr() { let_expr_exprs(this, result) }
+
+    /**
+     * Gets the pat of this let expression, if it exists.
+     */
+    Pat getPat() { let_expr_pats(this, result) }
   }
 
   /**
@@ -756,14 +2117,9 @@ module Raw {
     override string toString() { result = "LetStmt" }
 
     /**
-     * Gets the pat of this let statement.
+     * Gets the `index`th attr of this let statement (0-based).
      */
-    Pat getPat() { let_stmts(this, result) }
-
-    /**
-     * Gets the type of this let statement, if it exists.
-     */
-    TypeRef getType() { let_stmt_types(this, result) }
+    Attr getAttr(int index) { let_stmt_attrs(this, index, result) }
 
     /**
      * Gets the initializer of this let statement, if it exists.
@@ -771,9 +2127,61 @@ module Raw {
     Expr getInitializer() { let_stmt_initializers(this, result) }
 
     /**
-     * Gets the else of this let statement, if it exists.
+     * Gets the let else of this let statement, if it exists.
      */
-    Expr getElse() { let_stmt_elses(this, result) }
+    LetElse getLetElse() { let_stmt_let_elses(this, result) }
+
+    /**
+     * Gets the pat of this let statement, if it exists.
+     */
+    Pat getPat() { let_stmt_pats(this, result) }
+
+    /**
+     * Gets the ty of this let statement, if it exists.
+     */
+    TypeRef getTy() { let_stmt_ties(this, result) }
+  }
+
+  /**
+   * INTERNAL: Do not use.
+   * A LifetimeArg. For example:
+   * ```rust
+   * todo!()
+   * ```
+   */
+  class LifetimeArg extends @lifetime_arg, GenericArg {
+    override string toString() { result = "LifetimeArg" }
+
+    /**
+     * Gets the lifetime of this lifetime argument, if it exists.
+     */
+    Lifetime getLifetime() { lifetime_arg_lifetimes(this, result) }
+  }
+
+  /**
+   * INTERNAL: Do not use.
+   * A LifetimeParam. For example:
+   * ```rust
+   * todo!()
+   * ```
+   */
+  class LifetimeParam extends @lifetime_param, GenericParam {
+    override string toString() { result = "LifetimeParam" }
+
+    /**
+     * Gets the `index`th attr of this lifetime parameter (0-based).
+     */
+    Attr getAttr(int index) { lifetime_param_attrs(this, index, result) }
+
+    /**
+     * Gets the lifetime of this lifetime parameter, if it exists.
+     */
+    Lifetime getLifetime() { lifetime_param_lifetimes(this, result) }
+
+    /**
+     * Gets the type bound list of this lifetime parameter, if it exists.
+     */
+    TypeBoundList getTypeBoundList() { lifetime_param_type_bound_lists(this, result) }
   }
 
   /**
@@ -792,6 +2200,16 @@ module Raw {
    */
   class LiteralExpr extends @literal_expr, Expr {
     override string toString() { result = "LiteralExpr" }
+
+    /**
+     * Gets the `index`th attr of this literal expression (0-based).
+     */
+    Attr getAttr(int index) { literal_expr_attrs(this, index, result) }
+
+    /**
+     * Gets the text value of this literal expression, if it exists.
+     */
+    string getTextValue() { literal_expr_text_values(this, result) }
   }
 
   /**
@@ -808,9 +2226,9 @@ module Raw {
     override string toString() { result = "LiteralPat" }
 
     /**
-     * Gets the expression of this literal pat.
+     * Gets the literal of this literal pat, if it exists.
      */
-    Expr getExpr() { literal_pats(this, result) }
+    LiteralExpr getLiteral() { literal_pat_literals(this, result) }
   }
 
   /**
@@ -842,14 +2260,67 @@ module Raw {
     override string toString() { result = "LoopExpr" }
 
     /**
-     * Gets the body of this loop expression.
+     * Gets the `index`th attr of this loop expression (0-based).
      */
-    Expr getBody() { loop_exprs(this, result) }
+    Attr getAttr(int index) { loop_expr_attrs(this, index, result) }
 
     /**
      * Gets the label of this loop expression, if it exists.
      */
     Label getLabel() { loop_expr_labels(this, result) }
+
+    /**
+     * Gets the loop body of this loop expression, if it exists.
+     */
+    BlockExpr getLoopBody() { loop_expr_loop_bodies(this, result) }
+  }
+
+  /**
+   * INTERNAL: Do not use.
+   * A MacroExpr. For example:
+   * ```rust
+   * todo!()
+   * ```
+   */
+  class MacroExpr extends @macro_expr, Expr {
+    override string toString() { result = "MacroExpr" }
+
+    /**
+     * Gets the macro call of this macro expression, if it exists.
+     */
+    MacroCall getMacroCall() { macro_expr_macro_calls(this, result) }
+  }
+
+  /**
+   * INTERNAL: Do not use.
+   * A MacroPat. For example:
+   * ```rust
+   * todo!()
+   * ```
+   */
+  class MacroPat extends @macro_pat, Pat {
+    override string toString() { result = "MacroPat" }
+
+    /**
+     * Gets the macro call of this macro pat, if it exists.
+     */
+    MacroCall getMacroCall() { macro_pat_macro_calls(this, result) }
+  }
+
+  /**
+   * INTERNAL: Do not use.
+   * A MacroType. For example:
+   * ```rust
+   * todo!()
+   * ```
+   */
+  class MacroType extends @macro_type, TypeRef {
+    override string toString() { result = "MacroType" }
+
+    /**
+     * Gets the macro call of this macro type, if it exists.
+     */
+    MacroCall getMacroCall() { macro_type_macro_calls(this, result) }
   }
 
   /**
@@ -872,92 +2343,30 @@ module Raw {
     override string toString() { result = "MatchExpr" }
 
     /**
-     * Gets the expression of this match expression.
+     * Gets the `index`th attr of this match expression (0-based).
      */
-    Expr getExpr() { match_exprs(this, result) }
+    Attr getAttr(int index) { match_expr_attrs(this, index, result) }
 
     /**
-     * Gets the `index`th branch of this match expression (0-based).
+     * Gets the expression of this match expression, if it exists.
      */
-    MatchArm getBranch(int index) { match_expr_branches(this, index, result) }
+    Expr getExpr() { match_expr_exprs(this, result) }
+
+    /**
+     * Gets the match arm list of this match expression, if it exists.
+     */
+    MatchArmList getMatchArmList() { match_expr_match_arm_lists(this, result) }
   }
 
   /**
    * INTERNAL: Do not use.
-   * A method call expression. For example:
+   * A NeverType. For example:
    * ```rust
-   * x.foo(42);
-   * x.foo::<u32, u64>(42);
+   * todo!()
    * ```
    */
-  class MethodCallExpr extends @method_call_expr, Expr {
-    override string toString() { result = "MethodCallExpr" }
-
-    /**
-     * Gets the receiver of this method call expression.
-     */
-    Expr getReceiver() { method_call_exprs(this, result, _) }
-
-    /**
-     * Gets the method name of this method call expression.
-     */
-    string getMethodName() { method_call_exprs(this, _, result) }
-
-    /**
-     * Gets the `index`th argument of this method call expression (0-based).
-     */
-    Expr getArg(int index) { method_call_expr_args(this, index, result) }
-
-    /**
-     * Gets the generic arguments of this method call expression, if it exists.
-     */
-    GenericArgList getGenericArgs() { method_call_expr_generic_args(this, result) }
-  }
-
-  /**
-   * INTERNAL: Do not use.
-   * A missing expression, used as a placeholder for incomplete syntax.
-   *
-   * ```rust
-   * let x = non_existing_macro!();
-   * ```
-   */
-  class MissingExpr extends @missing_expr, Expr, Missing {
-    override string toString() { result = "MissingExpr" }
-  }
-
-  /**
-   * INTERNAL: Do not use.
-   * A missing pattern, used as a place holder for incomplete syntax.
-   * ```rust
-   * match Some(42) {
-   *     .. => "bad use of .. syntax",
-   * };
-   * ```
-   */
-  class MissingPat extends @missing_pat, Pat, Missing {
-    override string toString() { result = "MissingPat" }
-  }
-
-  /**
-   * INTERNAL: Do not use.
-   * A module declaration. For example:
-   * ```rust
-   * mod foo;
-   * ```
-   * ```rust
-   * mod bar {
-   *     pub fn baz() {}
-   * }
-   * ```
-   */
-  class Module extends @module, Declaration {
-    override string toString() { result = "Module" }
-
-    /**
-     * Gets the `index`th declaration of this module (0-based).
-     */
-    Declaration getDeclaration(int index) { module_declarations(this, index, result) }
+  class NeverType extends @never_type, TypeRef {
+    override string toString() { result = "NeverType" }
   }
 
   /**
@@ -971,14 +2380,19 @@ module Raw {
     override string toString() { result = "OffsetOfExpr" }
 
     /**
-     * Gets the container of this offset of expression.
+     * Gets the `index`th attr of this offset of expression (0-based).
      */
-    TypeRef getContainer() { offset_of_exprs(this, result) }
+    Attr getAttr(int index) { offset_of_expr_attrs(this, index, result) }
 
     /**
      * Gets the `index`th field of this offset of expression (0-based).
      */
-    string getField(int index) { offset_of_expr_fields(this, index, result) }
+    NameRef getField(int index) { offset_of_expr_fields(this, index, result) }
+
+    /**
+     * Gets the ty of this offset of expression, if it exists.
+     */
+    TypeRef getTy() { offset_of_expr_ties(this, result) }
   }
 
   /**
@@ -994,30 +2408,91 @@ module Raw {
     override string toString() { result = "OrPat" }
 
     /**
-     * Gets the `index`th argument of this or pat (0-based).
+     * Gets the `index`th pat of this or pat (0-based).
      */
-    Pat getArg(int index) { or_pat_args(this, index, result) }
+    Pat getPat(int index) { or_pat_pats(this, index, result) }
   }
 
   /**
    * INTERNAL: Do not use.
-   * A path expression. For example:
+   * A ParenExpr. For example:
    * ```rust
-   * let x = variable;
-   * let x = foo::bar;
-   * let y = <T>::foo;
-   * let z = <TypeRef as Trait>::foo;
+   * todo!()
    * ```
    */
-  class PathExpr extends @path_expr, Expr {
-    override string toString() { result = "PathExpr" }
+  class ParenExpr extends @paren_expr, Expr {
+    override string toString() { result = "ParenExpr" }
 
     /**
-     * Gets the path of this path expression.
+     * Gets the `index`th attr of this paren expression (0-based).
      */
-    Path getPath() { path_exprs(this, result) }
+    Attr getAttr(int index) { paren_expr_attrs(this, index, result) }
+
+    /**
+     * Gets the expression of this paren expression, if it exists.
+     */
+    Expr getExpr() { paren_expr_exprs(this, result) }
   }
 
+  /**
+   * INTERNAL: Do not use.
+   * A ParenPat. For example:
+   * ```rust
+   * todo!()
+   * ```
+   */
+  class ParenPat extends @paren_pat, Pat {
+    override string toString() { result = "ParenPat" }
+
+    /**
+     * Gets the pat of this paren pat, if it exists.
+     */
+    Pat getPat() { paren_pat_pats(this, result) }
+  }
+
+  /**
+   * INTERNAL: Do not use.
+   * A ParenType. For example:
+   * ```rust
+   * todo!()
+   * ```
+   */
+  class ParenType extends @paren_type, TypeRef {
+    override string toString() { result = "ParenType" }
+
+    /**
+     * Gets the ty of this paren type, if it exists.
+     */
+    TypeRef getTy() { paren_type_ties(this, result) }
+  }
+
+  /**
+   * INTERNAL: Do not use.
+   * A path. For example:
+   * ```rust
+   * foo::bar;
+   * ```
+   */
+  class Path extends @path, Resolvable {
+    override string toString() { result = "Path" }
+
+    /**
+     * Gets the qualifier of this path, if it exists.
+     */
+    Path getQualifier() { path_qualifiers(this, result) }
+
+    /**
+     * Gets the part of this path, if it exists.
+     */
+    PathSegment getPart() { path_parts(this, result) }
+  }
+
+  /**
+   * INTERNAL: Do not use.
+   * A path expression or a variable access in a formatting template. See `PathExpr` and `FormatTemplateVariableAccess` for further details.
+   */
+  class PathExprBase extends @path_expr_base, Expr { }
+
   /**
    * INTERNAL: Do not use.
    * A path pattern. For example:
@@ -1032,32 +2507,79 @@ module Raw {
     override string toString() { result = "PathPat" }
 
     /**
-     * Gets the path of this path pat.
+     * Gets the path of this path pat, if it exists.
      */
-    Path getPath() { path_pats(this, result) }
+    Path getPath() { path_pat_paths(this, result) }
+  }
+
+  /**
+   * INTERNAL: Do not use.
+   * A PathType. For example:
+   * ```rust
+   * todo!()
+   * ```
+   */
+  class PathType extends @path_type, TypeRef {
+    override string toString() { result = "PathType" }
+
+    /**
+     * Gets the path of this path type, if it exists.
+     */
+    Path getPath() { path_type_paths(this, result) }
   }
 
   /**
    * INTERNAL: Do not use.
    * A unary operation expression. For example:
    * ```rust
-   * let x = -42
-   * let y = !true
-   * let z = *ptr
+   * let x = -42;
+   * let y = !true;
+   * let z = *ptr;
    * ```
    */
   class PrefixExpr extends @prefix_expr, Expr {
     override string toString() { result = "PrefixExpr" }
 
     /**
-     * Gets the expression of this prefix expression.
+     * Gets the `index`th attr of this prefix expression (0-based).
      */
-    Expr getExpr() { prefix_exprs(this, result, _) }
+    Attr getAttr(int index) { prefix_expr_attrs(this, index, result) }
 
     /**
-     * Gets the op of this prefix expression.
+     * Gets the expression of this prefix expression, if it exists.
      */
-    string getOp() { prefix_exprs(this, _, result) }
+    Expr getExpr() { prefix_expr_exprs(this, result) }
+
+    /**
+     * Gets the operator name of this prefix expression, if it exists.
+     */
+    string getOperatorName() { prefix_expr_operator_names(this, result) }
+  }
+
+  /**
+   * INTERNAL: Do not use.
+   * A PtrType. For example:
+   * ```rust
+   * todo!()
+   * ```
+   */
+  class PtrType extends @ptr_type, TypeRef {
+    override string toString() { result = "PtrType" }
+
+    /**
+     * Holds if this ptr type is const.
+     */
+    predicate isConst() { ptr_type_is_const(this) }
+
+    /**
+     * Holds if this ptr type is mut.
+     */
+    predicate isMut() { ptr_type_is_mut(this) }
+
+    /**
+     * Gets the ty of this ptr type, if it exists.
+     */
+    TypeRef getTy() { ptr_type_ties(this, result) }
   }
 
   /**
@@ -1076,19 +2598,24 @@ module Raw {
     override string toString() { result = "RangeExpr" }
 
     /**
-     * Gets the lhs of this range expression, if it exists.
+     * Gets the `index`th attr of this range expression (0-based).
      */
-    Expr getLhs() { range_expr_lhs(this, result) }
+    Attr getAttr(int index) { range_expr_attrs(this, index, result) }
 
     /**
-     * Gets the rhs of this range expression, if it exists.
+     * Gets the end of this range expression, if it exists.
      */
-    Expr getRhs() { range_expr_rhs(this, result) }
+    Expr getEnd() { range_expr_ends(this, result) }
 
     /**
-     * Holds if this range expression is inclusive.
+     * Gets the operator name of this range expression, if it exists.
      */
-    predicate isInclusive() { range_expr_is_inclusive(this) }
+    string getOperatorName() { range_expr_operator_names(this, result) }
+
+    /**
+     * Gets the start of this range expression, if it exists.
+     */
+    Expr getStart() { range_expr_starts(this, result) }
   }
 
   /**
@@ -1105,15 +2632,20 @@ module Raw {
   class RangePat extends @range_pat, Pat {
     override string toString() { result = "RangePat" }
 
-    /**
-     * Gets the start of this range pat, if it exists.
-     */
-    Pat getStart() { range_pat_starts(this, result) }
-
     /**
      * Gets the end of this range pat, if it exists.
      */
     Pat getEnd() { range_pat_ends(this, result) }
+
+    /**
+     * Gets the operator name of this range pat, if it exists.
+     */
+    string getOperatorName() { range_pat_operator_names(this, result) }
+
+    /**
+     * Gets the start of this range pat, if it exists.
+     */
+    Pat getStart() { range_pat_starts(this, result) }
   }
 
   /**
@@ -1135,24 +2667,27 @@ module Raw {
     Path getPath() { record_expr_paths(this, result) }
 
     /**
-     * Gets the `index`th fld of this record expression (0-based).
+     * Gets the record expression field list of this record expression, if it exists.
      */
-    RecordExprField getFld(int index) { record_expr_flds(this, index, result) }
+    RecordExprFieldList getRecordExprFieldList() {
+      record_expr_record_expr_field_lists(this, result)
+    }
+  }
+
+  /**
+   * INTERNAL: Do not use.
+   * A RecordFieldList. For example:
+   * ```rust
+   * todo!()
+   * ```
+   */
+  class RecordFieldList extends @record_field_list, FieldList {
+    override string toString() { result = "RecordFieldList" }
 
     /**
-     * Gets the spread of this record expression, if it exists.
+     * Gets the `index`th field of this record field list (0-based).
      */
-    Expr getSpread() { record_expr_spreads(this, result) }
-
-    /**
-     * Holds if this record expression has ellipsis.
-     */
-    predicate hasEllipsis() { record_expr_has_ellipsis(this) }
-
-    /**
-     * Holds if this record expression is assignee expression.
-     */
-    predicate isAssigneeExpr() { record_expr_is_assignee_expr(this) }
+    RecordField getField(int index) { record_field_list_fields(this, index, result) }
   }
 
   /**
@@ -1174,14 +2709,9 @@ module Raw {
     Path getPath() { record_pat_paths(this, result) }
 
     /**
-     * Gets the `index`th fld of this record pat (0-based).
+     * Gets the record pat field list of this record pat, if it exists.
      */
-    RecordPatField getFld(int index) { record_pat_flds(this, index, result) }
-
-    /**
-     * Holds if this record pat has ellipsis.
-     */
-    predicate hasEllipsis() { record_pat_has_ellipsis(this) }
+    RecordPatFieldList getRecordPatFieldList() { record_pat_record_pat_field_lists(this, result) }
   }
 
   /**
@@ -1198,19 +2728,29 @@ module Raw {
     override string toString() { result = "RefExpr" }
 
     /**
-     * Gets the expression of this reference expression.
+     * Gets the `index`th attr of this reference expression (0-based).
      */
-    Expr getExpr() { ref_exprs(this, result) }
+    Attr getAttr(int index) { ref_expr_attrs(this, index, result) }
 
     /**
-     * Holds if this reference expression is raw.
+     * Gets the expression of this reference expression, if it exists.
      */
-    predicate isRaw() { ref_expr_is_raw(this) }
+    Expr getExpr() { ref_expr_exprs(this, result) }
+
+    /**
+     * Holds if this reference expression is const.
+     */
+    predicate isConst() { ref_expr_is_const(this) }
 
     /**
      * Holds if this reference expression is mut.
      */
     predicate isMut() { ref_expr_is_mut(this) }
+
+    /**
+     * Holds if this reference expression is raw.
+     */
+    predicate isRaw() { ref_expr_is_raw(this) }
   }
 
   /**
@@ -1226,15 +2766,57 @@ module Raw {
   class RefPat extends @ref_pat, Pat {
     override string toString() { result = "RefPat" }
 
-    /**
-     * Gets the pat of this reference pat.
-     */
-    Pat getPat() { ref_pats(this, result) }
-
     /**
      * Holds if this reference pat is mut.
      */
     predicate isMut() { ref_pat_is_mut(this) }
+
+    /**
+     * Gets the pat of this reference pat, if it exists.
+     */
+    Pat getPat() { ref_pat_pats(this, result) }
+  }
+
+  /**
+   * INTERNAL: Do not use.
+   * A RefType. For example:
+   * ```rust
+   * todo!()
+   * ```
+   */
+  class RefType extends @ref_type, TypeRef {
+    override string toString() { result = "RefType" }
+
+    /**
+     * Holds if this reference type is mut.
+     */
+    predicate isMut() { ref_type_is_mut(this) }
+
+    /**
+     * Gets the lifetime of this reference type, if it exists.
+     */
+    Lifetime getLifetime() { ref_type_lifetimes(this, result) }
+
+    /**
+     * Gets the ty of this reference type, if it exists.
+     */
+    TypeRef getTy() { ref_type_ties(this, result) }
+  }
+
+  /**
+   * INTERNAL: Do not use.
+   * A RestPat. For example:
+   * ```rust
+   * todo!()
+   * ```
+   */
+  class RestPat extends @rest_pat, Pat {
+    override string toString() { result = "RestPat" }
+
+    /**
+     * Gets the `index`th attr of this rest pat (0-based).
+     */
+    Attr getAttr(int index) { rest_pat_attrs(this, index, result) }
   }
 
   /**
@@ -1254,6 +2836,11 @@ module Raw {
   class ReturnExpr extends @return_expr, Expr {
     override string toString() { result = "ReturnExpr" }
 
+    /**
+     * Gets the `index`th attr of this return expression (0-based).
+     */
+    Attr getAttr(int index) { return_expr_attrs(this, index, result) }
+
     /**
      * Gets the expression of this return expression, if it exists.
      */
@@ -1275,19 +2862,46 @@ module Raw {
     override string toString() { result = "SlicePat" }
 
     /**
-     * Gets the `index`th prefix of this slice pat (0-based).
+     * Gets the `index`th pat of this slice pat (0-based).
      */
-    Pat getPrefix(int index) { slice_pat_prefixes(this, index, result) }
+    Pat getPat(int index) { slice_pat_pats(this, index, result) }
+  }
+
+  /**
+   * INTERNAL: Do not use.
+   * A SliceType. For example:
+   * ```rust
+   * todo!()
+   * ```
+   */
+  class SliceType extends @slice_type, TypeRef {
+    override string toString() { result = "SliceType" }
 
     /**
-     * Gets the slice of this slice pat, if it exists.
+     * Gets the ty of this slice type, if it exists.
      */
-    Pat getSlice() { slice_pat_slice(this, result) }
+    TypeRef getTy() { slice_type_ties(this, result) }
+  }
+
+  /**
+   * INTERNAL: Do not use.
+   * A TryExpr. For example:
+   * ```rust
+   * todo!()
+   * ```
+   */
+  class TryExpr extends @try_expr, Expr {
+    override string toString() { result = "TryExpr" }
 
     /**
-     * Gets the `index`th suffix of this slice pat (0-based).
+     * Gets the `index`th attr of this try expression (0-based).
      */
-    Pat getSuffix(int index) { slice_pat_suffixes(this, index, result) }
+    Attr getAttr(int index) { try_expr_attrs(this, index, result) }
+
+    /**
+     * Gets the expression of this try expression, if it exists.
+     */
+    Expr getExpr() { try_expr_exprs(this, result) }
   }
 
   /**
@@ -1302,14 +2916,30 @@ module Raw {
     override string toString() { result = "TupleExpr" }
 
     /**
-     * Gets the `index`th expression of this tuple expression (0-based).
+     * Gets the `index`th attr of this tuple expression (0-based).
      */
-    Expr getExpr(int index) { tuple_expr_exprs(this, index, result) }
+    Attr getAttr(int index) { tuple_expr_attrs(this, index, result) }
 
     /**
-     * Holds if this tuple expression is assignee expression.
+     * Gets the `index`th field of this tuple expression (0-based).
      */
-    predicate isAssigneeExpr() { tuple_expr_is_assignee_expr(this) }
+    Expr getField(int index) { tuple_expr_fields(this, index, result) }
+  }
+
+  /**
+   * INTERNAL: Do not use.
+   * A TupleFieldList. For example:
+   * ```rust
+   * todo!()
+   * ```
+   */
+  class TupleFieldList extends @tuple_field_list, FieldList {
+    override string toString() { result = "TupleFieldList" }
+
+    /**
+     * Gets the `index`th field of this tuple field list (0-based).
+     */
+    TupleField getField(int index) { tuple_field_list_fields(this, index, result) }
   }
 
   /**
@@ -1324,14 +2954,9 @@ module Raw {
     override string toString() { result = "TuplePat" }
 
     /**
-     * Gets the `index`th argument of this tuple pat (0-based).
+     * Gets the `index`th field of this tuple pat (0-based).
      */
-    Pat getArg(int index) { tuple_pat_args(this, index, result) }
-
-    /**
-     * Gets the ellipsis index of this tuple pat, if it exists.
-     */
-    int getEllipsisIndex() { tuple_pat_ellipsis_indices(this, result) }
+    Pat getField(int index) { tuple_pat_fields(this, index, result) }
   }
 
   /**
@@ -1348,20 +2973,78 @@ module Raw {
   class TupleStructPat extends @tuple_struct_pat, Pat {
     override string toString() { result = "TupleStructPat" }
 
+    /**
+     * Gets the `index`th field of this tuple struct pat (0-based).
+     */
+    Pat getField(int index) { tuple_struct_pat_fields(this, index, result) }
+
     /**
      * Gets the path of this tuple struct pat, if it exists.
      */
     Path getPath() { tuple_struct_pat_paths(this, result) }
+  }
+
+  /**
+   * INTERNAL: Do not use.
+   * A TupleType. For example:
+   * ```rust
+   * todo!()
+   * ```
+   */
+  class TupleType extends @tuple_type, TypeRef {
+    override string toString() { result = "TupleType" }
 
     /**
-     * Gets the `index`th argument of this tuple struct pat (0-based).
+     * Gets the `index`th field of this tuple type (0-based).
      */
-    Pat getArg(int index) { tuple_struct_pat_args(this, index, result) }
+    TypeRef getField(int index) { tuple_type_fields(this, index, result) }
+  }
+
+  /**
+   * INTERNAL: Do not use.
+   * A TypeArg. For example:
+   * ```rust
+   * todo!()
+   * ```
+   */
+  class TypeArg extends @type_arg, GenericArg {
+    override string toString() { result = "TypeArg" }
 
     /**
-     * Gets the ellipsis index of this tuple struct pat, if it exists.
+     * Gets the ty of this type argument, if it exists.
      */
-    int getEllipsisIndex() { tuple_struct_pat_ellipsis_indices(this, result) }
+    TypeRef getTy() { type_arg_ties(this, result) }
+  }
+
+  /**
+   * INTERNAL: Do not use.
+   * A TypeParam. For example:
+   * ```rust
+   * todo!()
+   * ```
+   */
+  class TypeParam extends @type_param, GenericParam {
+    override string toString() { result = "TypeParam" }
+
+    /**
+     * Gets the `index`th attr of this type parameter (0-based).
+     */
+    Attr getAttr(int index) { type_param_attrs(this, index, result) }
+
+    /**
+     * Gets the default type of this type parameter, if it exists.
+     */
+    TypeRef getDefaultType() { type_param_default_types(this, result) }
+
+    /**
+     * Gets the name of this type parameter, if it exists.
+     */
+    Name getName() { type_param_names(this, result) }
+
+    /**
+     * Gets the type bound list of this type parameter, if it exists.
+     */
+    TypeBoundList getTypeBoundList() { type_param_type_bound_lists(this, result) }
   }
 
   /**
@@ -1373,14 +3056,42 @@ module Raw {
    */
   class UnderscoreExpr extends @underscore_expr, Expr {
     override string toString() { result = "UnderscoreExpr" }
+
+    /**
+     * Gets the `index`th attr of this underscore expression (0-based).
+     */
+    Attr getAttr(int index) { underscore_expr_attrs(this, index, result) }
   }
 
   /**
    * INTERNAL: Do not use.
-   * A declaration that is not yet extracted.
+   * A WhileExpr. For example:
+   * ```rust
+   * todo!()
+   * ```
    */
-  class UnimplementedDeclaration extends @unimplemented_declaration, Declaration, Unimplemented {
-    override string toString() { result = "UnimplementedDeclaration" }
+  class WhileExpr extends @while_expr, Expr {
+    override string toString() { result = "WhileExpr" }
+
+    /**
+     * Gets the `index`th attr of this while expression (0-based).
+     */
+    Attr getAttr(int index) { while_expr_attrs(this, index, result) }
+
+    /**
+     * Gets the condition of this while expression, if it exists.
+     */
+    Expr getCondition() { while_expr_conditions(this, result) }
+
+    /**
+     * Gets the label of this while expression, if it exists.
+     */
+    Label getLabel() { while_expr_labels(this, result) }
+
+    /**
+     * Gets the loop body of this while expression, if it exists.
+     */
+    BlockExpr getLoopBody() { while_expr_loop_bodies(this, result) }
   }
 
   /**
@@ -1406,6 +3117,11 @@ module Raw {
   class YeetExpr extends @yeet_expr, Expr {
     override string toString() { result = "YeetExpr" }
 
+    /**
+     * Gets the `index`th attr of this yeet expression (0-based).
+     */
+    Attr getAttr(int index) { yeet_expr_attrs(this, index, result) }
+
     /**
      * Gets the expression of this yeet expression, if it exists.
      */
@@ -1425,6 +3141,11 @@ module Raw {
   class YieldExpr extends @yield_expr, Expr {
     override string toString() { result = "YieldExpr" }
 
+    /**
+     * Gets the `index`th attr of this yield expression (0-based).
+     */
+    Attr getAttr(int index) { yield_expr_attrs(this, index, result) }
+
     /**
      * Gets the expression of this yield expression, if it exists.
      */
@@ -1433,96 +3154,800 @@ module Raw {
 
   /**
    * INTERNAL: Do not use.
-   * An async block expression. For example:
+   * A function call expression. For example:
    * ```rust
-   * async {
-   *    let x = 42;
-   *    x
-   * }.await
+   * foo(42);
+   * foo::<u32, u64>(42);
+   * foo[0](42);
+   * foo(1) = 4;
    * ```
    */
-  class AsyncBlockExpr extends @async_block_expr, BlockExprBase {
-    override string toString() { result = "AsyncBlockExpr" }
+  class CallExpr extends @call_expr, CallExprBase {
+    override string toString() { result = "CallExpr" }
+
+    /**
+     * Gets the expression of this call expression, if it exists.
+     */
+    Expr getExpr() { call_expr_exprs(this, result) }
   }
 
   /**
    * INTERNAL: Do not use.
-   * A block expression. For example:
+   * A Const. For example:
    * ```rust
-   * {
-   *     let x = 42;
-   * }
+   * todo!()
    * ```
+   */
+  class Const extends @const, AssocItem, Item {
+    override string toString() { result = "Const" }
+
+    /**
+     * Gets the `index`th attr of this const (0-based).
+     */
+    Attr getAttr(int index) { const_attrs(this, index, result) }
+
+    /**
+     * Gets the body of this const, if it exists.
+     */
+    Expr getBody() { const_bodies(this, result) }
+
+    /**
+     * Holds if this const is const.
+     */
+    predicate isConst() { const_is_const(this) }
+
+    /**
+     * Holds if this const is default.
+     */
+    predicate isDefault() { const_is_default(this) }
+
+    /**
+     * Gets the name of this const, if it exists.
+     */
+    Name getName() { const_names(this, result) }
+
+    /**
+     * Gets the ty of this const, if it exists.
+     */
+    TypeRef getTy() { const_ties(this, result) }
+
+    /**
+     * Gets the visibility of this const, if it exists.
+     */
+    Visibility getVisibility() { const_visibilities(this, result) }
+  }
+
+  /**
+   * INTERNAL: Do not use.
+   * A Enum. For example:
    * ```rust
-   * 'label: {
-   *     let x = 42;
-   *     x
+   * todo!()
+   * ```
+   */
+  class Enum extends @enum, Item {
+    override string toString() { result = "Enum" }
+
+    /**
+     * Gets the `index`th attr of this enum (0-based).
+     */
+    Attr getAttr(int index) { enum_attrs(this, index, result) }
+
+    /**
+     * Gets the generic parameter list of this enum, if it exists.
+     */
+    GenericParamList getGenericParamList() { enum_generic_param_lists(this, result) }
+
+    /**
+     * Gets the name of this enum, if it exists.
+     */
+    Name getName() { enum_names(this, result) }
+
+    /**
+     * Gets the variant list of this enum, if it exists.
+     */
+    VariantList getVariantList() { enum_variant_lists(this, result) }
+
+    /**
+     * Gets the visibility of this enum, if it exists.
+     */
+    Visibility getVisibility() { enum_visibilities(this, result) }
+
+    /**
+     * Gets the where clause of this enum, if it exists.
+     */
+    WhereClause getWhereClause() { enum_where_clauses(this, result) }
+  }
+
+  /**
+   * INTERNAL: Do not use.
+   * A ExternBlock. For example:
+   * ```rust
+   * todo!()
+   * ```
+   */
+  class ExternBlock extends @extern_block, Item {
+    override string toString() { result = "ExternBlock" }
+
+    /**
+     * Gets the abi of this extern block, if it exists.
+     */
+    Abi getAbi() { extern_block_abis(this, result) }
+
+    /**
+     * Gets the `index`th attr of this extern block (0-based).
+     */
+    Attr getAttr(int index) { extern_block_attrs(this, index, result) }
+
+    /**
+     * Gets the extern item list of this extern block, if it exists.
+     */
+    ExternItemList getExternItemList() { extern_block_extern_item_lists(this, result) }
+
+    /**
+     * Holds if this extern block is unsafe.
+     */
+    predicate isUnsafe() { extern_block_is_unsafe(this) }
+  }
+
+  /**
+   * INTERNAL: Do not use.
+   * A ExternCrate. For example:
+   * ```rust
+   * todo!()
+   * ```
+   */
+  class ExternCrate extends @extern_crate, Item {
+    override string toString() { result = "ExternCrate" }
+
+    /**
+     * Gets the `index`th attr of this extern crate (0-based).
+     */
+    Attr getAttr(int index) { extern_crate_attrs(this, index, result) }
+
+    /**
+     * Gets the name reference of this extern crate, if it exists.
+     */
+    NameRef getNameRef() { extern_crate_name_refs(this, result) }
+
+    /**
+     * Gets the rename of this extern crate, if it exists.
+     */
+    Rename getRename() { extern_crate_renames(this, result) }
+
+    /**
+     * Gets the visibility of this extern crate, if it exists.
+     */
+    Visibility getVisibility() { extern_crate_visibilities(this, result) }
+  }
+
+  /**
+   * INTERNAL: Do not use.
+   * A function declaration. For example
+   * ```rust
+   * fn foo(x: u32) -> u64 {(x + 1).into()}
+   * ```
+   * A function declaration within a trait might not have a body:
+   * ```rust
+   * trait Trait {
+   *     fn bar();
    * }
    * ```
    */
-  class BlockExpr extends @block_expr, BlockExprBase {
-    override string toString() { result = "BlockExpr" }
+  class Function extends @function, AssocItem, ExternItem, Item, Callable {
+    override string toString() { result = "Function" }
 
     /**
-     * Gets the label of this block expression, if it exists.
+     * Gets the abi of this function, if it exists.
      */
-    Label getLabel() { block_expr_labels(this, result) }
+    Abi getAbi() { function_abis(this, result) }
+
+    /**
+     * Gets the body of this function, if it exists.
+     */
+    BlockExpr getBody() { function_bodies(this, result) }
+
+    /**
+     * Gets the generic parameter list of this function, if it exists.
+     */
+    GenericParamList getGenericParamList() { function_generic_param_lists(this, result) }
+
+    /**
+     * Holds if this function is async.
+     */
+    predicate isAsync() { function_is_async(this) }
+
+    /**
+     * Holds if this function is const.
+     */
+    predicate isConst() { function_is_const(this) }
+
+    /**
+     * Holds if this function is default.
+     */
+    predicate isDefault() { function_is_default(this) }
+
+    /**
+     * Holds if this function is gen.
+     */
+    predicate isGen() { function_is_gen(this) }
+
+    /**
+     * Holds if this function is unsafe.
+     */
+    predicate isUnsafe() { function_is_unsafe(this) }
+
+    /**
+     * Gets the name of this function, if it exists.
+     */
+    Name getName() { function_names(this, result) }
+
+    /**
+     * Gets the ret type of this function, if it exists.
+     */
+    RetType getRetType() { function_ret_types(this, result) }
+
+    /**
+     * Gets the visibility of this function, if it exists.
+     */
+    Visibility getVisibility() { function_visibilities(this, result) }
+
+    /**
+     * Gets the where clause of this function, if it exists.
+     */
+    WhereClause getWhereClause() { function_where_clauses(this, result) }
   }
 
   /**
    * INTERNAL: Do not use.
-   * An element list expression. For example:
+   * A Impl. For example:
    * ```rust
-   * [1, 2, 3, 4, 5];
-   * [1, 2, 3, 4, 5][0] = 6;
+   * todo!()
    * ```
    */
-  class ElementListExpr extends @element_list_expr, ArrayExpr {
-    override string toString() { result = "ElementListExpr" }
+  class Impl extends @impl, Item {
+    override string toString() { result = "Impl" }
 
     /**
-     * Gets the `index`th element of this element list expression (0-based).
+     * Gets the assoc item list of this impl, if it exists.
      */
-    Expr getElement(int index) { element_list_expr_elements(this, index, result) }
+    AssocItemList getAssocItemList() { impl_assoc_item_lists(this, result) }
 
     /**
-     * Holds if this element list expression is assignee expression.
+     * Gets the `index`th attr of this impl (0-based).
      */
-    predicate isAssigneeExpr() { element_list_expr_is_assignee_expr(this) }
+    Attr getAttr(int index) { impl_attrs(this, index, result) }
+
+    /**
+     * Gets the generic parameter list of this impl, if it exists.
+     */
+    GenericParamList getGenericParamList() { impl_generic_param_lists(this, result) }
+
+    /**
+     * Holds if this impl is const.
+     */
+    predicate isConst() { impl_is_const(this) }
+
+    /**
+     * Holds if this impl is default.
+     */
+    predicate isDefault() { impl_is_default(this) }
+
+    /**
+     * Holds if this impl is unsafe.
+     */
+    predicate isUnsafe() { impl_is_unsafe(this) }
+
+    /**
+     * Gets the self ty of this impl, if it exists.
+     */
+    TypeRef getSelfTy() { impl_self_ties(this, result) }
+
+    /**
+     * Gets the trait of this impl, if it exists.
+     */
+    TypeRef getTrait() { impl_traits(this, result) }
+
+    /**
+     * Gets the visibility of this impl, if it exists.
+     */
+    Visibility getVisibility() { impl_visibilities(this, result) }
+
+    /**
+     * Gets the where clause of this impl, if it exists.
+     */
+    WhereClause getWhereClause() { impl_where_clauses(this, result) }
   }
 
   /**
    * INTERNAL: Do not use.
-   * A repeat expression. For example:
+   * A MacroCall. For example:
    * ```rust
-   * [1; 10];
+   * todo!()
    * ```
    */
-  class RepeatExpr extends @repeat_expr, ArrayExpr {
-    override string toString() { result = "RepeatExpr" }
+  class MacroCall extends @macro_call, AssocItem, ExternItem, Item {
+    override string toString() { result = "MacroCall" }
 
     /**
-     * Gets the initializer of this repeat expression.
+     * Gets the `index`th attr of this macro call (0-based).
      */
-    Expr getInitializer() { repeat_exprs(this, result, _) }
+    Attr getAttr(int index) { macro_call_attrs(this, index, result) }
 
     /**
-     * Gets the repeat of this repeat expression.
+     * Gets the path of this macro call, if it exists.
      */
-    Expr getRepeat() { repeat_exprs(this, _, result) }
+    Path getPath() { macro_call_paths(this, result) }
+
+    /**
+     * Gets the token tree of this macro call, if it exists.
+     */
+    TokenTree getTokenTree() { macro_call_token_trees(this, result) }
+
+    /**
+     * Gets the expanded of this macro call, if it exists.
+     */
+    AstNode getExpanded() { macro_call_expandeds(this, result) }
   }
 
   /**
    * INTERNAL: Do not use.
-   * An unsafe block expression. For example:
+   * A MacroDef. For example:
    * ```rust
-   * let layout = unsafe {
-   *     let x = 42;
-   *     Layout::from_size_align_unchecked(size, align)
-   * };
+   * todo!()
    * ```
    */
-  class UnsafeBlockExpr extends @unsafe_block_expr, BlockExprBase {
-    override string toString() { result = "UnsafeBlockExpr" }
+  class MacroDef extends @macro_def, Item {
+    override string toString() { result = "MacroDef" }
+
+    /**
+     * Gets the arguments of this macro def, if it exists.
+     */
+    TokenTree getArgs() { macro_def_args(this, result) }
+
+    /**
+     * Gets the `index`th attr of this macro def (0-based).
+     */
+    Attr getAttr(int index) { macro_def_attrs(this, index, result) }
+
+    /**
+     * Gets the body of this macro def, if it exists.
+     */
+    TokenTree getBody() { macro_def_bodies(this, result) }
+
+    /**
+     * Gets the name of this macro def, if it exists.
+     */
+    Name getName() { macro_def_names(this, result) }
+
+    /**
+     * Gets the visibility of this macro def, if it exists.
+     */
+    Visibility getVisibility() { macro_def_visibilities(this, result) }
+  }
+
+  /**
+   * INTERNAL: Do not use.
+   * A MacroRules. For example:
+   * ```rust
+   * todo!()
+   * ```
+   */
+  class MacroRules extends @macro_rules, Item {
+    override string toString() { result = "MacroRules" }
+
+    /**
+     * Gets the `index`th attr of this macro rules (0-based).
+     */
+    Attr getAttr(int index) { macro_rules_attrs(this, index, result) }
+
+    /**
+     * Gets the name of this macro rules, if it exists.
+     */
+    Name getName() { macro_rules_names(this, result) }
+
+    /**
+     * Gets the token tree of this macro rules, if it exists.
+     */
+    TokenTree getTokenTree() { macro_rules_token_trees(this, result) }
+
+    /**
+     * Gets the visibility of this macro rules, if it exists.
+     */
+    Visibility getVisibility() { macro_rules_visibilities(this, result) }
+  }
+
+  /**
+   * INTERNAL: Do not use.
+   * A method call expression. For example:
+   * ```rust
+   * x.foo(42);
+   * x.foo::<u32, u64>(42);
+   * ```
+   */
+  class MethodCallExpr extends @method_call_expr, CallExprBase, Resolvable {
+    override string toString() { result = "MethodCallExpr" }
+
+    /**
+     * Gets the generic argument list of this method call expression, if it exists.
+     */
+    GenericArgList getGenericArgList() { method_call_expr_generic_arg_lists(this, result) }
+
+    /**
+     * Gets the name reference of this method call expression, if it exists.
+     */
+    NameRef getNameRef() { method_call_expr_name_refs(this, result) }
+
+    /**
+     * Gets the receiver of this method call expression, if it exists.
+     */
+    Expr getReceiver() { method_call_expr_receivers(this, result) }
+  }
+
+  /**
+   * INTERNAL: Do not use.
+   * A module declaration. For example:
+   * ```rust
+   * mod foo;
+   * ```
+   * ```rust
+   * mod bar {
+   *     pub fn baz() {}
+   * }
+   * ```
+   */
+  class Module extends @module, Item {
+    override string toString() { result = "Module" }
+
+    /**
+     * Gets the `index`th attr of this module (0-based).
+     */
+    Attr getAttr(int index) { module_attrs(this, index, result) }
+
+    /**
+     * Gets the item list of this module, if it exists.
+     */
+    ItemList getItemList() { module_item_lists(this, result) }
+
+    /**
+     * Gets the name of this module, if it exists.
+     */
+    Name getName() { module_names(this, result) }
+
+    /**
+     * Gets the visibility of this module, if it exists.
+     */
+    Visibility getVisibility() { module_visibilities(this, result) }
+  }
+
+  /**
+   * INTERNAL: Do not use.
+   * A path expression. For example:
+   * ```rust
+   * let x = variable;
+   * let x = foo::bar;
+   * let y = <T>::foo;
+   * let z = <TypeRef as Trait>::foo;
+   * ```
+   */
+  class PathExpr extends @path_expr, PathExprBase {
+    override string toString() { result = "PathExpr" }
+
+    /**
+     * Gets the `index`th attr of this path expression (0-based).
+     */
+    Attr getAttr(int index) { path_expr_attrs(this, index, result) }
+
+    /**
+     * Gets the path of this path expression, if it exists.
+     */
+    Path getPath() { path_expr_paths(this, result) }
+  }
+
+  /**
+   * INTERNAL: Do not use.
+   * A Static. For example:
+   * ```rust
+   * todo!()
+   * ```
+   */
+  class Static extends @static, ExternItem, Item {
+    override string toString() { result = "Static" }
+
+    /**
+     * Gets the `index`th attr of this static (0-based).
+     */
+    Attr getAttr(int index) { static_attrs(this, index, result) }
+
+    /**
+     * Gets the body of this static, if it exists.
+     */
+    Expr getBody() { static_bodies(this, result) }
+
+    /**
+     * Holds if this static is mut.
+     */
+    predicate isMut() { static_is_mut(this) }
+
+    /**
+     * Holds if this static is static.
+     */
+    predicate isStatic() { static_is_static(this) }
+
+    /**
+     * Gets the name of this static, if it exists.
+     */
+    Name getName() { static_names(this, result) }
+
+    /**
+     * Gets the ty of this static, if it exists.
+     */
+    TypeRef getTy() { static_ties(this, result) }
+
+    /**
+     * Gets the visibility of this static, if it exists.
+     */
+    Visibility getVisibility() { static_visibilities(this, result) }
+  }
+
+  /**
+   * INTERNAL: Do not use.
+   * A Struct. For example:
+   * ```rust
+   * todo!()
+   * ```
+   */
+  class Struct extends @struct, Item {
+    override string toString() { result = "Struct" }
+
+    /**
+     * Gets the `index`th attr of this struct (0-based).
+     */
+    Attr getAttr(int index) { struct_attrs(this, index, result) }
+
+    /**
+     * Gets the field list of this struct, if it exists.
+     */
+    FieldList getFieldList() { struct_field_lists(this, result) }
+
+    /**
+     * Gets the generic parameter list of this struct, if it exists.
+     */
+    GenericParamList getGenericParamList() { struct_generic_param_lists(this, result) }
+
+    /**
+     * Gets the name of this struct, if it exists.
+     */
+    Name getName() { struct_names(this, result) }
+
+    /**
+     * Gets the visibility of this struct, if it exists.
+     */
+    Visibility getVisibility() { struct_visibilities(this, result) }
+
+    /**
+     * Gets the where clause of this struct, if it exists.
+     */
+    WhereClause getWhereClause() { struct_where_clauses(this, result) }
+  }
+
+  /**
+   * INTERNAL: Do not use.
+   * A Trait. For example:
+   * ```
+   * trait Frobinizable {
+   *   type Frobinator;
+   *   type Result: Copy;
+   *   fn frobinize_with(&mut self, frobinator: &Self::Frobinator) -> Result;
+   * }
+   *
+   * pub trait Foo<T: Frobinizable> where T::Frobinator: Eq {}
+   * ```
+   */
+  class Trait extends @trait, Item {
+    override string toString() { result = "Trait" }
+
+    /**
+     * Gets the assoc item list of this trait, if it exists.
+     */
+    AssocItemList getAssocItemList() { trait_assoc_item_lists(this, result) }
+
+    /**
+     * Gets the `index`th attr of this trait (0-based).
+     */
+    Attr getAttr(int index) { trait_attrs(this, index, result) }
+
+    /**
+     * Gets the generic parameter list of this trait, if it exists.
+     */
+    GenericParamList getGenericParamList() { trait_generic_param_lists(this, result) }
+
+    /**
+     * Holds if this trait is auto.
+     */
+    predicate isAuto() { trait_is_auto(this) }
+
+    /**
+     * Holds if this trait is unsafe.
+     */
+    predicate isUnsafe() { trait_is_unsafe(this) }
+
+    /**
+     * Gets the name of this trait, if it exists.
+     */
+    Name getName() { trait_names(this, result) }
+
+    /**
+     * Gets the type bound list of this trait, if it exists.
+     */
+    TypeBoundList getTypeBoundList() { trait_type_bound_lists(this, result) }
+
+    /**
+     * Gets the visibility of this trait, if it exists.
+     */
+    Visibility getVisibility() { trait_visibilities(this, result) }
+
+    /**
+     * Gets the where clause of this trait, if it exists.
+     */
+    WhereClause getWhereClause() { trait_where_clauses(this, result) }
+  }
+
+  /**
+   * INTERNAL: Do not use.
+   * A TraitAlias. For example:
+   * ```rust
+   * todo!()
+   * ```
+   */
+  class TraitAlias extends @trait_alias, Item {
+    override string toString() { result = "TraitAlias" }
+
+    /**
+     * Gets the `index`th attr of this trait alias (0-based).
+     */
+    Attr getAttr(int index) { trait_alias_attrs(this, index, result) }
+
+    /**
+     * Gets the generic parameter list of this trait alias, if it exists.
+     */
+    GenericParamList getGenericParamList() { trait_alias_generic_param_lists(this, result) }
+
+    /**
+     * Gets the name of this trait alias, if it exists.
+     */
+    Name getName() { trait_alias_names(this, result) }
+
+    /**
+     * Gets the type bound list of this trait alias, if it exists.
+     */
+    TypeBoundList getTypeBoundList() { trait_alias_type_bound_lists(this, result) }
+
+    /**
+     * Gets the visibility of this trait alias, if it exists.
+     */
+    Visibility getVisibility() { trait_alias_visibilities(this, result) }
+
+    /**
+     * Gets the where clause of this trait alias, if it exists.
+     */
+    WhereClause getWhereClause() { trait_alias_where_clauses(this, result) }
+  }
+
+  /**
+   * INTERNAL: Do not use.
+   * A TypeAlias. For example:
+   * ```rust
+   * todo!()
+   * ```
+   */
+  class TypeAlias extends @type_alias, AssocItem, ExternItem, Item {
+    override string toString() { result = "TypeAlias" }
+
+    /**
+     * Gets the `index`th attr of this type alias (0-based).
+     */
+    Attr getAttr(int index) { type_alias_attrs(this, index, result) }
+
+    /**
+     * Gets the generic parameter list of this type alias, if it exists.
+     */
+    GenericParamList getGenericParamList() { type_alias_generic_param_lists(this, result) }
+
+    /**
+     * Holds if this type alias is default.
+     */
+    predicate isDefault() { type_alias_is_default(this) }
+
+    /**
+     * Gets the name of this type alias, if it exists.
+     */
+    Name getName() { type_alias_names(this, result) }
+
+    /**
+     * Gets the ty of this type alias, if it exists.
+     */
+    TypeRef getTy() { type_alias_ties(this, result) }
+
+    /**
+     * Gets the type bound list of this type alias, if it exists.
+     */
+    TypeBoundList getTypeBoundList() { type_alias_type_bound_lists(this, result) }
+
+    /**
+     * Gets the visibility of this type alias, if it exists.
+     */
+    Visibility getVisibility() { type_alias_visibilities(this, result) }
+
+    /**
+     * Gets the where clause of this type alias, if it exists.
+     */
+    WhereClause getWhereClause() { type_alias_where_clauses(this, result) }
+  }
+
+  /**
+   * INTERNAL: Do not use.
+   * A Union. For example:
+   * ```rust
+   * todo!()
+   * ```
+   */
+  class Union extends @union, Item {
+    override string toString() { result = "Union" }
+
+    /**
+     * Gets the `index`th attr of this union (0-based).
+     */
+    Attr getAttr(int index) { union_attrs(this, index, result) }
+
+    /**
+     * Gets the generic parameter list of this union, if it exists.
+     */
+    GenericParamList getGenericParamList() { union_generic_param_lists(this, result) }
+
+    /**
+     * Gets the name of this union, if it exists.
+     */
+    Name getName() { union_names(this, result) }
+
+    /**
+     * Gets the record field list of this union, if it exists.
+     */
+    RecordFieldList getRecordFieldList() { union_record_field_lists(this, result) }
+
+    /**
+     * Gets the visibility of this union, if it exists.
+     */
+    Visibility getVisibility() { union_visibilities(this, result) }
+
+    /**
+     * Gets the where clause of this union, if it exists.
+     */
+    WhereClause getWhereClause() { union_where_clauses(this, result) }
+  }
+
+  /**
+   * INTERNAL: Do not use.
+   * A Use. For example:
+   * ```rust
+   * todo!()
+   * ```
+   */
+  class Use extends @use, Item {
+    override string toString() { result = "Use" }
+
+    /**
+     * Gets the `index`th attr of this use (0-based).
+     */
+    Attr getAttr(int index) { use_attrs(this, index, result) }
+
+    /**
+     * Gets the use tree of this use, if it exists.
+     */
+    UseTree getUseTree() { use_use_trees(this, result) }
+
+    /**
+     * Gets the visibility of this use, if it exists.
+     */
+    Visibility getVisibility() { use_visibilities(this, result) }
   }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/RecordExpr.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/RecordExpr.qll
index 3db27e94656..96fc2aa61d0 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/RecordExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/RecordExpr.qll
@@ -6,10 +6,9 @@
 
 private import codeql.rust.elements.internal.generated.Synth
 private import codeql.rust.elements.internal.generated.Raw
-import codeql.rust.elements.Expr
 import codeql.rust.elements.internal.ExprImpl::Impl as ExprImpl
 import codeql.rust.elements.Path
-import codeql.rust.elements.RecordExprField
+import codeql.rust.elements.RecordExprFieldList
 
 /**
  * INTERNAL: This module contains the fully generated definition of `RecordExpr` and should not
@@ -44,48 +43,18 @@ module Generated {
     final predicate hasPath() { exists(this.getPath()) }
 
     /**
-     * Gets the `index`th fld of this record expression (0-based).
+     * Gets the record expression field list of this record expression, if it exists.
      */
-    RecordExprField getFld(int index) {
+    RecordExprFieldList getRecordExprFieldList() {
       result =
-        Synth::convertRecordExprFieldFromRaw(Synth::convertRecordExprToRaw(this)
+        Synth::convertRecordExprFieldListFromRaw(Synth::convertRecordExprToRaw(this)
               .(Raw::RecordExpr)
-              .getFld(index))
+              .getRecordExprFieldList())
     }
 
     /**
-     * Gets any of the flds of this record expression.
+     * Holds if `getRecordExprFieldList()` exists.
      */
-    final RecordExprField getAFld() { result = this.getFld(_) }
-
-    /**
-     * Gets the number of flds of this record expression.
-     */
-    final int getNumberOfFlds() { result = count(int i | exists(this.getFld(i))) }
-
-    /**
-     * Gets the spread of this record expression, if it exists.
-     */
-    Expr getSpread() {
-      result =
-        Synth::convertExprFromRaw(Synth::convertRecordExprToRaw(this).(Raw::RecordExpr).getSpread())
-    }
-
-    /**
-     * Holds if `getSpread()` exists.
-     */
-    final predicate hasSpread() { exists(this.getSpread()) }
-
-    /**
-     * Holds if this record expression has ellipsis.
-     */
-    predicate hasEllipsis() { Synth::convertRecordExprToRaw(this).(Raw::RecordExpr).hasEllipsis() }
-
-    /**
-     * Holds if this record expression is assignee expression.
-     */
-    predicate isAssigneeExpr() {
-      Synth::convertRecordExprToRaw(this).(Raw::RecordExpr).isAssigneeExpr()
-    }
+    final predicate hasRecordExprFieldList() { exists(this.getRecordExprFieldList()) }
   }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/RecordExprField.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/RecordExprField.qll
index f07050b524b..ddf9cd24806 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/RecordExprField.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/RecordExprField.qll
@@ -7,7 +7,9 @@
 private import codeql.rust.elements.internal.generated.Synth
 private import codeql.rust.elements.internal.generated.Raw
 import codeql.rust.elements.internal.AstNodeImpl::Impl as AstNodeImpl
+import codeql.rust.elements.Attr
 import codeql.rust.elements.Expr
+import codeql.rust.elements.NameRef
 
 /**
  * INTERNAL: This module contains the fully generated definition of `RecordExprField` and should not
@@ -26,14 +28,27 @@ module Generated {
     override string getAPrimaryQlClass() { result = "RecordExprField" }
 
     /**
-     * Gets the name of this record expression field.
+     * Gets the `index`th attr of this record expression field (0-based).
      */
-    string getName() {
-      result = Synth::convertRecordExprFieldToRaw(this).(Raw::RecordExprField).getName()
+    Attr getAttr(int index) {
+      result =
+        Synth::convertAttrFromRaw(Synth::convertRecordExprFieldToRaw(this)
+              .(Raw::RecordExprField)
+              .getAttr(index))
     }
 
     /**
-     * Gets the expression of this record expression field.
+     * Gets any of the attrs of this record expression field.
+     */
+    final Attr getAnAttr() { result = this.getAttr(_) }
+
+    /**
+     * Gets the number of attrs of this record expression field.
+     */
+    final int getNumberOfAttrs() { result = count(int i | exists(this.getAttr(i))) }
+
+    /**
+     * Gets the expression of this record expression field, if it exists.
      */
     Expr getExpr() {
       result =
@@ -41,5 +56,25 @@ module Generated {
               .(Raw::RecordExprField)
               .getExpr())
     }
+
+    /**
+     * Holds if `getExpr()` exists.
+     */
+    final predicate hasExpr() { exists(this.getExpr()) }
+
+    /**
+     * Gets the name reference of this record expression field, if it exists.
+     */
+    NameRef getNameRef() {
+      result =
+        Synth::convertNameRefFromRaw(Synth::convertRecordExprFieldToRaw(this)
+              .(Raw::RecordExprField)
+              .getNameRef())
+    }
+
+    /**
+     * Holds if `getNameRef()` exists.
+     */
+    final predicate hasNameRef() { exists(this.getNameRef()) }
   }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/RecordExprFieldList.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/RecordExprFieldList.qll
new file mode 100644
index 00000000000..5f531d8186d
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/RecordExprFieldList.qll
@@ -0,0 +1,85 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `RecordExprFieldList`.
+ * INTERNAL: Do not import directly.
+ */
+
+private import codeql.rust.elements.internal.generated.Synth
+private import codeql.rust.elements.internal.generated.Raw
+import codeql.rust.elements.internal.AstNodeImpl::Impl as AstNodeImpl
+import codeql.rust.elements.Attr
+import codeql.rust.elements.Expr
+import codeql.rust.elements.RecordExprField
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `RecordExprFieldList` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * A RecordExprFieldList. For example:
+   * ```rust
+   * todo!()
+   * ```
+   * INTERNAL: Do not reference the `Generated::RecordExprFieldList` class directly.
+   * Use the subclass `RecordExprFieldList`, where the following predicates are available.
+   */
+  class RecordExprFieldList extends Synth::TRecordExprFieldList, AstNodeImpl::AstNode {
+    override string getAPrimaryQlClass() { result = "RecordExprFieldList" }
+
+    /**
+     * Gets the `index`th attr of this record expression field list (0-based).
+     */
+    Attr getAttr(int index) {
+      result =
+        Synth::convertAttrFromRaw(Synth::convertRecordExprFieldListToRaw(this)
+              .(Raw::RecordExprFieldList)
+              .getAttr(index))
+    }
+
+    /**
+     * Gets any of the attrs of this record expression field list.
+     */
+    final Attr getAnAttr() { result = this.getAttr(_) }
+
+    /**
+     * Gets the number of attrs of this record expression field list.
+     */
+    final int getNumberOfAttrs() { result = count(int i | exists(this.getAttr(i))) }
+
+    /**
+     * Gets the `index`th field of this record expression field list (0-based).
+     */
+    RecordExprField getField(int index) {
+      result =
+        Synth::convertRecordExprFieldFromRaw(Synth::convertRecordExprFieldListToRaw(this)
+              .(Raw::RecordExprFieldList)
+              .getField(index))
+    }
+
+    /**
+     * Gets any of the fields of this record expression field list.
+     */
+    final RecordExprField getAField() { result = this.getField(_) }
+
+    /**
+     * Gets the number of fields of this record expression field list.
+     */
+    final int getNumberOfFields() { result = count(int i | exists(this.getField(i))) }
+
+    /**
+     * Gets the spread of this record expression field list, if it exists.
+     */
+    Expr getSpread() {
+      result =
+        Synth::convertExprFromRaw(Synth::convertRecordExprFieldListToRaw(this)
+              .(Raw::RecordExprFieldList)
+              .getSpread())
+    }
+
+    /**
+     * Holds if `getSpread()` exists.
+     */
+    final predicate hasSpread() { exists(this.getSpread()) }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/RecordField.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/RecordField.qll
new file mode 100644
index 00000000000..c5fcb867b89
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/RecordField.qll
@@ -0,0 +1,92 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `RecordField`.
+ * INTERNAL: Do not import directly.
+ */
+
+private import codeql.rust.elements.internal.generated.Synth
+private import codeql.rust.elements.internal.generated.Raw
+import codeql.rust.elements.internal.AstNodeImpl::Impl as AstNodeImpl
+import codeql.rust.elements.Attr
+import codeql.rust.elements.Name
+import codeql.rust.elements.TypeRef
+import codeql.rust.elements.Visibility
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `RecordField` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * A RecordField. For example:
+   * ```rust
+   * todo!()
+   * ```
+   * INTERNAL: Do not reference the `Generated::RecordField` class directly.
+   * Use the subclass `RecordField`, where the following predicates are available.
+   */
+  class RecordField extends Synth::TRecordField, AstNodeImpl::AstNode {
+    override string getAPrimaryQlClass() { result = "RecordField" }
+
+    /**
+     * Gets the `index`th attr of this record field (0-based).
+     */
+    Attr getAttr(int index) {
+      result =
+        Synth::convertAttrFromRaw(Synth::convertRecordFieldToRaw(this)
+              .(Raw::RecordField)
+              .getAttr(index))
+    }
+
+    /**
+     * Gets any of the attrs of this record field.
+     */
+    final Attr getAnAttr() { result = this.getAttr(_) }
+
+    /**
+     * Gets the number of attrs of this record field.
+     */
+    final int getNumberOfAttrs() { result = count(int i | exists(this.getAttr(i))) }
+
+    /**
+     * Gets the name of this record field, if it exists.
+     */
+    Name getName() {
+      result =
+        Synth::convertNameFromRaw(Synth::convertRecordFieldToRaw(this).(Raw::RecordField).getName())
+    }
+
+    /**
+     * Holds if `getName()` exists.
+     */
+    final predicate hasName() { exists(this.getName()) }
+
+    /**
+     * Gets the ty of this record field, if it exists.
+     */
+    TypeRef getTy() {
+      result =
+        Synth::convertTypeRefFromRaw(Synth::convertRecordFieldToRaw(this).(Raw::RecordField).getTy())
+    }
+
+    /**
+     * Holds if `getTy()` exists.
+     */
+    final predicate hasTy() { exists(this.getTy()) }
+
+    /**
+     * Gets the visibility of this record field, if it exists.
+     */
+    Visibility getVisibility() {
+      result =
+        Synth::convertVisibilityFromRaw(Synth::convertRecordFieldToRaw(this)
+              .(Raw::RecordField)
+              .getVisibility())
+    }
+
+    /**
+     * Holds if `getVisibility()` exists.
+     */
+    final predicate hasVisibility() { exists(this.getVisibility()) }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/RecordFieldList.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/RecordFieldList.qll
new file mode 100644
index 00000000000..2ce5c33093e
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/RecordFieldList.qll
@@ -0,0 +1,48 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `RecordFieldList`.
+ * INTERNAL: Do not import directly.
+ */
+
+private import codeql.rust.elements.internal.generated.Synth
+private import codeql.rust.elements.internal.generated.Raw
+import codeql.rust.elements.internal.FieldListImpl::Impl as FieldListImpl
+import codeql.rust.elements.RecordField
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `RecordFieldList` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * A RecordFieldList. For example:
+   * ```rust
+   * todo!()
+   * ```
+   * INTERNAL: Do not reference the `Generated::RecordFieldList` class directly.
+   * Use the subclass `RecordFieldList`, where the following predicates are available.
+   */
+  class RecordFieldList extends Synth::TRecordFieldList, FieldListImpl::FieldList {
+    override string getAPrimaryQlClass() { result = "RecordFieldList" }
+
+    /**
+     * Gets the `index`th field of this record field list (0-based).
+     */
+    RecordField getField(int index) {
+      result =
+        Synth::convertRecordFieldFromRaw(Synth::convertRecordFieldListToRaw(this)
+              .(Raw::RecordFieldList)
+              .getField(index))
+    }
+
+    /**
+     * Gets any of the fields of this record field list.
+     */
+    final RecordField getAField() { result = this.getField(_) }
+
+    /**
+     * Gets the number of fields of this record field list.
+     */
+    final int getNumberOfFields() { result = count(int i | exists(this.getField(i))) }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/RecordPat.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/RecordPat.qll
index de4efd9f150..b4aa66a71a0 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/RecordPat.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/RecordPat.qll
@@ -8,7 +8,7 @@ private import codeql.rust.elements.internal.generated.Synth
 private import codeql.rust.elements.internal.generated.Raw
 import codeql.rust.elements.internal.PatImpl::Impl as PatImpl
 import codeql.rust.elements.Path
-import codeql.rust.elements.RecordPatField
+import codeql.rust.elements.RecordPatFieldList
 
 /**
  * INTERNAL: This module contains the fully generated definition of `RecordPat` and should not
@@ -43,28 +43,18 @@ module Generated {
     final predicate hasPath() { exists(this.getPath()) }
 
     /**
-     * Gets the `index`th fld of this record pat (0-based).
+     * Gets the record pat field list of this record pat, if it exists.
      */
-    RecordPatField getFld(int index) {
+    RecordPatFieldList getRecordPatFieldList() {
       result =
-        Synth::convertRecordPatFieldFromRaw(Synth::convertRecordPatToRaw(this)
+        Synth::convertRecordPatFieldListFromRaw(Synth::convertRecordPatToRaw(this)
               .(Raw::RecordPat)
-              .getFld(index))
+              .getRecordPatFieldList())
     }
 
     /**
-     * Gets any of the flds of this record pat.
+     * Holds if `getRecordPatFieldList()` exists.
      */
-    final RecordPatField getAFld() { result = this.getFld(_) }
-
-    /**
-     * Gets the number of flds of this record pat.
-     */
-    final int getNumberOfFlds() { result = count(int i | exists(this.getFld(i))) }
-
-    /**
-     * Holds if this record pat has ellipsis.
-     */
-    predicate hasEllipsis() { Synth::convertRecordPatToRaw(this).(Raw::RecordPat).hasEllipsis() }
+    final predicate hasRecordPatFieldList() { exists(this.getRecordPatFieldList()) }
   }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/RecordPatField.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/RecordPatField.qll
index b54128c06a6..942df1972e4 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/RecordPatField.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/RecordPatField.qll
@@ -7,6 +7,8 @@
 private import codeql.rust.elements.internal.generated.Synth
 private import codeql.rust.elements.internal.generated.Raw
 import codeql.rust.elements.internal.AstNodeImpl::Impl as AstNodeImpl
+import codeql.rust.elements.Attr
+import codeql.rust.elements.NameRef
 import codeql.rust.elements.Pat
 
 /**
@@ -26,14 +28,42 @@ module Generated {
     override string getAPrimaryQlClass() { result = "RecordPatField" }
 
     /**
-     * Gets the name of this record pat field.
+     * Gets the `index`th attr of this record pat field (0-based).
      */
-    string getName() {
-      result = Synth::convertRecordPatFieldToRaw(this).(Raw::RecordPatField).getName()
+    Attr getAttr(int index) {
+      result =
+        Synth::convertAttrFromRaw(Synth::convertRecordPatFieldToRaw(this)
+              .(Raw::RecordPatField)
+              .getAttr(index))
     }
 
     /**
-     * Gets the pat of this record pat field.
+     * Gets any of the attrs of this record pat field.
+     */
+    final Attr getAnAttr() { result = this.getAttr(_) }
+
+    /**
+     * Gets the number of attrs of this record pat field.
+     */
+    final int getNumberOfAttrs() { result = count(int i | exists(this.getAttr(i))) }
+
+    /**
+     * Gets the name reference of this record pat field, if it exists.
+     */
+    NameRef getNameRef() {
+      result =
+        Synth::convertNameRefFromRaw(Synth::convertRecordPatFieldToRaw(this)
+              .(Raw::RecordPatField)
+              .getNameRef())
+    }
+
+    /**
+     * Holds if `getNameRef()` exists.
+     */
+    final predicate hasNameRef() { exists(this.getNameRef()) }
+
+    /**
+     * Gets the pat of this record pat field, if it exists.
      */
     Pat getPat() {
       result =
@@ -41,5 +71,10 @@ module Generated {
               .(Raw::RecordPatField)
               .getPat())
     }
+
+    /**
+     * Holds if `getPat()` exists.
+     */
+    final predicate hasPat() { exists(this.getPat()) }
   }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/RecordPatFieldList.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/RecordPatFieldList.qll
new file mode 100644
index 00000000000..45220797706
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/RecordPatFieldList.qll
@@ -0,0 +1,64 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `RecordPatFieldList`.
+ * INTERNAL: Do not import directly.
+ */
+
+private import codeql.rust.elements.internal.generated.Synth
+private import codeql.rust.elements.internal.generated.Raw
+import codeql.rust.elements.internal.AstNodeImpl::Impl as AstNodeImpl
+import codeql.rust.elements.RecordPatField
+import codeql.rust.elements.RestPat
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `RecordPatFieldList` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * A RecordPatFieldList. For example:
+   * ```rust
+   * todo!()
+   * ```
+   * INTERNAL: Do not reference the `Generated::RecordPatFieldList` class directly.
+   * Use the subclass `RecordPatFieldList`, where the following predicates are available.
+   */
+  class RecordPatFieldList extends Synth::TRecordPatFieldList, AstNodeImpl::AstNode {
+    override string getAPrimaryQlClass() { result = "RecordPatFieldList" }
+
+    /**
+     * Gets the `index`th field of this record pat field list (0-based).
+     */
+    RecordPatField getField(int index) {
+      result =
+        Synth::convertRecordPatFieldFromRaw(Synth::convertRecordPatFieldListToRaw(this)
+              .(Raw::RecordPatFieldList)
+              .getField(index))
+    }
+
+    /**
+     * Gets any of the fields of this record pat field list.
+     */
+    final RecordPatField getAField() { result = this.getField(_) }
+
+    /**
+     * Gets the number of fields of this record pat field list.
+     */
+    final int getNumberOfFields() { result = count(int i | exists(this.getField(i))) }
+
+    /**
+     * Gets the rest pat of this record pat field list, if it exists.
+     */
+    RestPat getRestPat() {
+      result =
+        Synth::convertRestPatFromRaw(Synth::convertRecordPatFieldListToRaw(this)
+              .(Raw::RecordPatFieldList)
+              .getRestPat())
+    }
+
+    /**
+     * Holds if `getRestPat()` exists.
+     */
+    final predicate hasRestPat() { exists(this.getRestPat()) }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/RefExpr.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/RefExpr.qll
index ca5a0dc6be3..4eef67e3ed1 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/RefExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/RefExpr.qll
@@ -6,6 +6,7 @@
 
 private import codeql.rust.elements.internal.generated.Synth
 private import codeql.rust.elements.internal.generated.Raw
+import codeql.rust.elements.Attr
 import codeql.rust.elements.Expr
 import codeql.rust.elements.internal.ExprImpl::Impl as ExprImpl
 
@@ -29,20 +30,48 @@ module Generated {
     override string getAPrimaryQlClass() { result = "RefExpr" }
 
     /**
-     * Gets the expression of this reference expression.
+     * Gets the `index`th attr of this reference expression (0-based).
+     */
+    Attr getAttr(int index) {
+      result =
+        Synth::convertAttrFromRaw(Synth::convertRefExprToRaw(this).(Raw::RefExpr).getAttr(index))
+    }
+
+    /**
+     * Gets any of the attrs of this reference expression.
+     */
+    final Attr getAnAttr() { result = this.getAttr(_) }
+
+    /**
+     * Gets the number of attrs of this reference expression.
+     */
+    final int getNumberOfAttrs() { result = count(int i | exists(this.getAttr(i))) }
+
+    /**
+     * Gets the expression of this reference expression, if it exists.
      */
     Expr getExpr() {
       result = Synth::convertExprFromRaw(Synth::convertRefExprToRaw(this).(Raw::RefExpr).getExpr())
     }
 
     /**
-     * Holds if this reference expression is raw.
+     * Holds if `getExpr()` exists.
      */
-    predicate isRaw() { Synth::convertRefExprToRaw(this).(Raw::RefExpr).isRaw() }
+    final predicate hasExpr() { exists(this.getExpr()) }
+
+    /**
+     * Holds if this reference expression is const.
+     */
+    predicate isConst() { Synth::convertRefExprToRaw(this).(Raw::RefExpr).isConst() }
 
     /**
      * Holds if this reference expression is mut.
      */
     predicate isMut() { Synth::convertRefExprToRaw(this).(Raw::RefExpr).isMut() }
+
+    /**
+     * Holds if this reference expression is raw.
+     */
+    predicate isRaw() { Synth::convertRefExprToRaw(this).(Raw::RefExpr).isRaw() }
   }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/RefPat.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/RefPat.qll
index 2711db83b24..197030ea1cb 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/RefPat.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/RefPat.qll
@@ -29,15 +29,20 @@ module Generated {
     override string getAPrimaryQlClass() { result = "RefPat" }
 
     /**
-     * Gets the pat of this reference pat.
+     * Holds if this reference pat is mut.
+     */
+    predicate isMut() { Synth::convertRefPatToRaw(this).(Raw::RefPat).isMut() }
+
+    /**
+     * Gets the pat of this reference pat, if it exists.
      */
     Pat getPat() {
       result = Synth::convertPatFromRaw(Synth::convertRefPatToRaw(this).(Raw::RefPat).getPat())
     }
 
     /**
-     * Holds if this reference pat is mut.
+     * Holds if `getPat()` exists.
      */
-    predicate isMut() { Synth::convertRefPatToRaw(this).(Raw::RefPat).isMut() }
+    final predicate hasPat() { exists(this.getPat()) }
   }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/RefType.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/RefType.qll
new file mode 100644
index 00000000000..ce0bbf1e416
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/RefType.qll
@@ -0,0 +1,59 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `RefType`.
+ * INTERNAL: Do not import directly.
+ */
+
+private import codeql.rust.elements.internal.generated.Synth
+private import codeql.rust.elements.internal.generated.Raw
+import codeql.rust.elements.Lifetime
+import codeql.rust.elements.TypeRef
+import codeql.rust.elements.internal.TypeRefImpl::Impl as TypeRefImpl
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `RefType` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * A RefType. For example:
+   * ```rust
+   * todo!()
+   * ```
+   * INTERNAL: Do not reference the `Generated::RefType` class directly.
+   * Use the subclass `RefType`, where the following predicates are available.
+   */
+  class RefType extends Synth::TRefType, TypeRefImpl::TypeRef {
+    override string getAPrimaryQlClass() { result = "RefType" }
+
+    /**
+     * Holds if this reference type is mut.
+     */
+    predicate isMut() { Synth::convertRefTypeToRaw(this).(Raw::RefType).isMut() }
+
+    /**
+     * Gets the lifetime of this reference type, if it exists.
+     */
+    Lifetime getLifetime() {
+      result =
+        Synth::convertLifetimeFromRaw(Synth::convertRefTypeToRaw(this).(Raw::RefType).getLifetime())
+    }
+
+    /**
+     * Holds if `getLifetime()` exists.
+     */
+    final predicate hasLifetime() { exists(this.getLifetime()) }
+
+    /**
+     * Gets the ty of this reference type, if it exists.
+     */
+    TypeRef getTy() {
+      result = Synth::convertTypeRefFromRaw(Synth::convertRefTypeToRaw(this).(Raw::RefType).getTy())
+    }
+
+    /**
+     * Holds if `getTy()` exists.
+     */
+    final predicate hasTy() { exists(this.getTy()) }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/Rename.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/Rename.qll
new file mode 100644
index 00000000000..89ac3f7f12c
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/Rename.qll
@@ -0,0 +1,40 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `Rename`.
+ * INTERNAL: Do not import directly.
+ */
+
+private import codeql.rust.elements.internal.generated.Synth
+private import codeql.rust.elements.internal.generated.Raw
+import codeql.rust.elements.internal.AstNodeImpl::Impl as AstNodeImpl
+import codeql.rust.elements.Name
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `Rename` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * A Rename. For example:
+   * ```rust
+   * todo!()
+   * ```
+   * INTERNAL: Do not reference the `Generated::Rename` class directly.
+   * Use the subclass `Rename`, where the following predicates are available.
+   */
+  class Rename extends Synth::TRename, AstNodeImpl::AstNode {
+    override string getAPrimaryQlClass() { result = "Rename" }
+
+    /**
+     * Gets the name of this rename, if it exists.
+     */
+    Name getName() {
+      result = Synth::convertNameFromRaw(Synth::convertRenameToRaw(this).(Raw::Rename).getName())
+    }
+
+    /**
+     * Holds if `getName()` exists.
+     */
+    final predicate hasName() { exists(this.getName()) }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/RepeatExpr.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/RepeatExpr.qll
deleted file mode 100644
index c6dba66523a..00000000000
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/RepeatExpr.qll
+++ /dev/null
@@ -1,46 +0,0 @@
-// generated by codegen, do not edit
-/**
- * This module provides the generated definition of `RepeatExpr`.
- * INTERNAL: Do not import directly.
- */
-
-private import codeql.rust.elements.internal.generated.Synth
-private import codeql.rust.elements.internal.generated.Raw
-import codeql.rust.elements.internal.ArrayExprImpl::Impl as ArrayExprImpl
-import codeql.rust.elements.Expr
-
-/**
- * INTERNAL: This module contains the fully generated definition of `RepeatExpr` and should not
- * be referenced directly.
- */
-module Generated {
-  /**
-   * A repeat expression. For example:
-   * ```rust
-   * [1; 10];
-   * ```
-   * INTERNAL: Do not reference the `Generated::RepeatExpr` class directly.
-   * Use the subclass `RepeatExpr`, where the following predicates are available.
-   */
-  class RepeatExpr extends Synth::TRepeatExpr, ArrayExprImpl::ArrayExpr {
-    override string getAPrimaryQlClass() { result = "RepeatExpr" }
-
-    /**
-     * Gets the initializer of this repeat expression.
-     */
-    Expr getInitializer() {
-      result =
-        Synth::convertExprFromRaw(Synth::convertRepeatExprToRaw(this)
-              .(Raw::RepeatExpr)
-              .getInitializer())
-    }
-
-    /**
-     * Gets the repeat of this repeat expression.
-     */
-    Expr getRepeat() {
-      result =
-        Synth::convertExprFromRaw(Synth::convertRepeatExprToRaw(this).(Raw::RepeatExpr).getRepeat())
-    }
-  }
-}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/Resolvable.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/Resolvable.qll
new file mode 100644
index 00000000000..018c451e584
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/Resolvable.qll
@@ -0,0 +1,52 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `Resolvable`.
+ * INTERNAL: Do not import directly.
+ */
+
+private import codeql.rust.elements.internal.generated.Synth
+private import codeql.rust.elements.internal.generated.Raw
+import codeql.rust.elements.internal.AstNodeImpl::Impl as AstNodeImpl
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `Resolvable` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * Either a `Path`, or a `MethodCallExpr`.
+   * INTERNAL: Do not reference the `Generated::Resolvable` class directly.
+   * Use the subclass `Resolvable`, where the following predicates are available.
+   */
+  class Resolvable extends Synth::TResolvable, AstNodeImpl::AstNode {
+    /**
+     * Gets the resolved path of this resolvable, if it exists.
+     *
+     * INTERNAL: Do not use.
+     */
+    string getResolvedPath() {
+      result = Synth::convertResolvableToRaw(this).(Raw::Resolvable).getResolvedPath()
+    }
+
+    /**
+     * Holds if `getResolvedPath()` exists.
+     * INTERNAL: Do not use.
+     */
+    final predicate hasResolvedPath() { exists(this.getResolvedPath()) }
+
+    /**
+     * Gets the resolved crate origin of this resolvable, if it exists.
+     *
+     * INTERNAL: Do not use.
+     */
+    string getResolvedCrateOrigin() {
+      result = Synth::convertResolvableToRaw(this).(Raw::Resolvable).getResolvedCrateOrigin()
+    }
+
+    /**
+     * Holds if `getResolvedCrateOrigin()` exists.
+     * INTERNAL: Do not use.
+     */
+    final predicate hasResolvedCrateOrigin() { exists(this.getResolvedCrateOrigin()) }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/RestPat.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/RestPat.qll
new file mode 100644
index 00000000000..055c6476f4c
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/RestPat.qll
@@ -0,0 +1,46 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `RestPat`.
+ * INTERNAL: Do not import directly.
+ */
+
+private import codeql.rust.elements.internal.generated.Synth
+private import codeql.rust.elements.internal.generated.Raw
+import codeql.rust.elements.Attr
+import codeql.rust.elements.internal.PatImpl::Impl as PatImpl
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `RestPat` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * A RestPat. For example:
+   * ```rust
+   * todo!()
+   * ```
+   * INTERNAL: Do not reference the `Generated::RestPat` class directly.
+   * Use the subclass `RestPat`, where the following predicates are available.
+   */
+  class RestPat extends Synth::TRestPat, PatImpl::Pat {
+    override string getAPrimaryQlClass() { result = "RestPat" }
+
+    /**
+     * Gets the `index`th attr of this rest pat (0-based).
+     */
+    Attr getAttr(int index) {
+      result =
+        Synth::convertAttrFromRaw(Synth::convertRestPatToRaw(this).(Raw::RestPat).getAttr(index))
+    }
+
+    /**
+     * Gets any of the attrs of this rest pat.
+     */
+    final Attr getAnAttr() { result = this.getAttr(_) }
+
+    /**
+     * Gets the number of attrs of this rest pat.
+     */
+    final int getNumberOfAttrs() { result = count(int i | exists(this.getAttr(i))) }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/RetType.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/RetType.qll
new file mode 100644
index 00000000000..3b916d7d20d
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/RetType.qll
@@ -0,0 +1,40 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `RetType`.
+ * INTERNAL: Do not import directly.
+ */
+
+private import codeql.rust.elements.internal.generated.Synth
+private import codeql.rust.elements.internal.generated.Raw
+import codeql.rust.elements.internal.AstNodeImpl::Impl as AstNodeImpl
+import codeql.rust.elements.TypeRef
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `RetType` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * A RetType. For example:
+   * ```rust
+   * todo!()
+   * ```
+   * INTERNAL: Do not reference the `Generated::RetType` class directly.
+   * Use the subclass `RetType`, where the following predicates are available.
+   */
+  class RetType extends Synth::TRetType, AstNodeImpl::AstNode {
+    override string getAPrimaryQlClass() { result = "RetType" }
+
+    /**
+     * Gets the ty of this ret type, if it exists.
+     */
+    TypeRef getTy() {
+      result = Synth::convertTypeRefFromRaw(Synth::convertRetTypeToRaw(this).(Raw::RetType).getTy())
+    }
+
+    /**
+     * Holds if `getTy()` exists.
+     */
+    final predicate hasTy() { exists(this.getTy()) }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/ReturnExpr.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/ReturnExpr.qll
index 23a3ae41e32..184b14b8fcf 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/ReturnExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/ReturnExpr.qll
@@ -6,6 +6,7 @@
 
 private import codeql.rust.elements.internal.generated.Synth
 private import codeql.rust.elements.internal.generated.Raw
+import codeql.rust.elements.Attr
 import codeql.rust.elements.Expr
 import codeql.rust.elements.internal.ExprImpl::Impl as ExprImpl
 
@@ -32,6 +33,26 @@ module Generated {
   class ReturnExpr extends Synth::TReturnExpr, ExprImpl::Expr {
     override string getAPrimaryQlClass() { result = "ReturnExpr" }
 
+    /**
+     * Gets the `index`th attr of this return expression (0-based).
+     */
+    Attr getAttr(int index) {
+      result =
+        Synth::convertAttrFromRaw(Synth::convertReturnExprToRaw(this)
+              .(Raw::ReturnExpr)
+              .getAttr(index))
+    }
+
+    /**
+     * Gets any of the attrs of this return expression.
+     */
+    final Attr getAnAttr() { result = this.getAttr(_) }
+
+    /**
+     * Gets the number of attrs of this return expression.
+     */
+    final int getNumberOfAttrs() { result = count(int i | exists(this.getAttr(i))) }
+
     /**
      * Gets the expression of this return expression, if it exists.
      */
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/ReturnTypeSyntax.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/ReturnTypeSyntax.qll
new file mode 100644
index 00000000000..e4c653da5d3
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/ReturnTypeSyntax.qll
@@ -0,0 +1,27 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `ReturnTypeSyntax`.
+ * INTERNAL: Do not import directly.
+ */
+
+private import codeql.rust.elements.internal.generated.Synth
+private import codeql.rust.elements.internal.generated.Raw
+import codeql.rust.elements.internal.AstNodeImpl::Impl as AstNodeImpl
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `ReturnTypeSyntax` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * A ReturnTypeSyntax. For example:
+   * ```rust
+   * todo!()
+   * ```
+   * INTERNAL: Do not reference the `Generated::ReturnTypeSyntax` class directly.
+   * Use the subclass `ReturnTypeSyntax`, where the following predicates are available.
+   */
+  class ReturnTypeSyntax extends Synth::TReturnTypeSyntax, AstNodeImpl::AstNode {
+    override string getAPrimaryQlClass() { result = "ReturnTypeSyntax" }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/SelfParam.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/SelfParam.qll
new file mode 100644
index 00000000000..243d04e9bb7
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/SelfParam.qll
@@ -0,0 +1,95 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `SelfParam`.
+ * INTERNAL: Do not import directly.
+ */
+
+private import codeql.rust.elements.internal.generated.Synth
+private import codeql.rust.elements.internal.generated.Raw
+import codeql.rust.elements.internal.AstNodeImpl::Impl as AstNodeImpl
+import codeql.rust.elements.Attr
+import codeql.rust.elements.Lifetime
+import codeql.rust.elements.Name
+import codeql.rust.elements.TypeRef
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `SelfParam` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * A SelfParam. For example:
+   * ```rust
+   * todo!()
+   * ```
+   * INTERNAL: Do not reference the `Generated::SelfParam` class directly.
+   * Use the subclass `SelfParam`, where the following predicates are available.
+   */
+  class SelfParam extends Synth::TSelfParam, AstNodeImpl::AstNode {
+    override string getAPrimaryQlClass() { result = "SelfParam" }
+
+    /**
+     * Gets the `index`th attr of this self parameter (0-based).
+     */
+    Attr getAttr(int index) {
+      result =
+        Synth::convertAttrFromRaw(Synth::convertSelfParamToRaw(this).(Raw::SelfParam).getAttr(index))
+    }
+
+    /**
+     * Gets any of the attrs of this self parameter.
+     */
+    final Attr getAnAttr() { result = this.getAttr(_) }
+
+    /**
+     * Gets the number of attrs of this self parameter.
+     */
+    final int getNumberOfAttrs() { result = count(int i | exists(this.getAttr(i))) }
+
+    /**
+     * Holds if this self parameter is mut.
+     */
+    predicate isMut() { Synth::convertSelfParamToRaw(this).(Raw::SelfParam).isMut() }
+
+    /**
+     * Gets the lifetime of this self parameter, if it exists.
+     */
+    Lifetime getLifetime() {
+      result =
+        Synth::convertLifetimeFromRaw(Synth::convertSelfParamToRaw(this)
+              .(Raw::SelfParam)
+              .getLifetime())
+    }
+
+    /**
+     * Holds if `getLifetime()` exists.
+     */
+    final predicate hasLifetime() { exists(this.getLifetime()) }
+
+    /**
+     * Gets the name of this self parameter, if it exists.
+     */
+    Name getName() {
+      result =
+        Synth::convertNameFromRaw(Synth::convertSelfParamToRaw(this).(Raw::SelfParam).getName())
+    }
+
+    /**
+     * Holds if `getName()` exists.
+     */
+    final predicate hasName() { exists(this.getName()) }
+
+    /**
+     * Gets the ty of this self parameter, if it exists.
+     */
+    TypeRef getTy() {
+      result =
+        Synth::convertTypeRefFromRaw(Synth::convertSelfParamToRaw(this).(Raw::SelfParam).getTy())
+    }
+
+    /**
+     * Holds if `getTy()` exists.
+     */
+    final predicate hasTy() { exists(this.getTy()) }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/SlicePat.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/SlicePat.qll
index 91e1382a5d4..1f54445a659 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/SlicePat.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/SlicePat.qll
@@ -30,52 +30,21 @@ module Generated {
     override string getAPrimaryQlClass() { result = "SlicePat" }
 
     /**
-     * Gets the `index`th prefix of this slice pat (0-based).
+     * Gets the `index`th pat of this slice pat (0-based).
      */
-    Pat getPrefix(int index) {
+    Pat getPat(int index) {
       result =
-        Synth::convertPatFromRaw(Synth::convertSlicePatToRaw(this).(Raw::SlicePat).getPrefix(index))
+        Synth::convertPatFromRaw(Synth::convertSlicePatToRaw(this).(Raw::SlicePat).getPat(index))
     }
 
     /**
-     * Gets any of the prefixes of this slice pat.
+     * Gets any of the pats of this slice pat.
      */
-    final Pat getAPrefix() { result = this.getPrefix(_) }
+    final Pat getAPat() { result = this.getPat(_) }
 
     /**
-     * Gets the number of prefixes of this slice pat.
+     * Gets the number of pats of this slice pat.
      */
-    final int getNumberOfPrefixes() { result = count(int i | exists(this.getPrefix(i))) }
-
-    /**
-     * Gets the slice of this slice pat, if it exists.
-     */
-    Pat getSlice() {
-      result =
-        Synth::convertPatFromRaw(Synth::convertSlicePatToRaw(this).(Raw::SlicePat).getSlice())
-    }
-
-    /**
-     * Holds if `getSlice()` exists.
-     */
-    final predicate hasSlice() { exists(this.getSlice()) }
-
-    /**
-     * Gets the `index`th suffix of this slice pat (0-based).
-     */
-    Pat getSuffix(int index) {
-      result =
-        Synth::convertPatFromRaw(Synth::convertSlicePatToRaw(this).(Raw::SlicePat).getSuffix(index))
-    }
-
-    /**
-     * Gets any of the suffixes of this slice pat.
-     */
-    final Pat getASuffix() { result = this.getSuffix(_) }
-
-    /**
-     * Gets the number of suffixes of this slice pat.
-     */
-    final int getNumberOfSuffixes() { result = count(int i | exists(this.getSuffix(i))) }
+    final int getNumberOfPats() { result = count(int i | exists(this.getPat(i))) }
   }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/SliceType.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/SliceType.qll
new file mode 100644
index 00000000000..5576f34e13d
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/SliceType.qll
@@ -0,0 +1,41 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `SliceType`.
+ * INTERNAL: Do not import directly.
+ */
+
+private import codeql.rust.elements.internal.generated.Synth
+private import codeql.rust.elements.internal.generated.Raw
+import codeql.rust.elements.TypeRef
+import codeql.rust.elements.internal.TypeRefImpl::Impl as TypeRefImpl
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `SliceType` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * A SliceType. For example:
+   * ```rust
+   * todo!()
+   * ```
+   * INTERNAL: Do not reference the `Generated::SliceType` class directly.
+   * Use the subclass `SliceType`, where the following predicates are available.
+   */
+  class SliceType extends Synth::TSliceType, TypeRefImpl::TypeRef {
+    override string getAPrimaryQlClass() { result = "SliceType" }
+
+    /**
+     * Gets the ty of this slice type, if it exists.
+     */
+    TypeRef getTy() {
+      result =
+        Synth::convertTypeRefFromRaw(Synth::convertSliceTypeToRaw(this).(Raw::SliceType).getTy())
+    }
+
+    /**
+     * Holds if `getTy()` exists.
+     */
+    final predicate hasTy() { exists(this.getTy()) }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/SourceFile.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/SourceFile.qll
new file mode 100644
index 00000000000..07b5f25fda0
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/SourceFile.qll
@@ -0,0 +1,69 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `SourceFile`.
+ * INTERNAL: Do not import directly.
+ */
+
+private import codeql.rust.elements.internal.generated.Synth
+private import codeql.rust.elements.internal.generated.Raw
+import codeql.rust.elements.internal.AstNodeImpl::Impl as AstNodeImpl
+import codeql.rust.elements.Attr
+import codeql.rust.elements.Item
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `SourceFile` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * A SourceFile. For example:
+   * ```rust
+   * todo!()
+   * ```
+   * INTERNAL: Do not reference the `Generated::SourceFile` class directly.
+   * Use the subclass `SourceFile`, where the following predicates are available.
+   */
+  class SourceFile extends Synth::TSourceFile, AstNodeImpl::AstNode {
+    override string getAPrimaryQlClass() { result = "SourceFile" }
+
+    /**
+     * Gets the `index`th attr of this source file (0-based).
+     */
+    Attr getAttr(int index) {
+      result =
+        Synth::convertAttrFromRaw(Synth::convertSourceFileToRaw(this)
+              .(Raw::SourceFile)
+              .getAttr(index))
+    }
+
+    /**
+     * Gets any of the attrs of this source file.
+     */
+    final Attr getAnAttr() { result = this.getAttr(_) }
+
+    /**
+     * Gets the number of attrs of this source file.
+     */
+    final int getNumberOfAttrs() { result = count(int i | exists(this.getAttr(i))) }
+
+    /**
+     * Gets the `index`th item of this source file (0-based).
+     */
+    Item getItem(int index) {
+      result =
+        Synth::convertItemFromRaw(Synth::convertSourceFileToRaw(this)
+              .(Raw::SourceFile)
+              .getItem(index))
+    }
+
+    /**
+     * Gets any of the items of this source file.
+     */
+    final Item getAnItem() { result = this.getItem(_) }
+
+    /**
+     * Gets the number of items of this source file.
+     */
+    final int getNumberOfItems() { result = count(int i | exists(this.getItem(i))) }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/Static.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/Static.qll
new file mode 100644
index 00000000000..a7d5828ee98
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/Static.qll
@@ -0,0 +1,112 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `Static`.
+ * INTERNAL: Do not import directly.
+ */
+
+private import codeql.rust.elements.internal.generated.Synth
+private import codeql.rust.elements.internal.generated.Raw
+import codeql.rust.elements.Attr
+import codeql.rust.elements.Expr
+import codeql.rust.elements.internal.ExternItemImpl::Impl as ExternItemImpl
+import codeql.rust.elements.internal.ItemImpl::Impl as ItemImpl
+import codeql.rust.elements.Name
+import codeql.rust.elements.TypeRef
+import codeql.rust.elements.Visibility
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `Static` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * A Static. For example:
+   * ```rust
+   * todo!()
+   * ```
+   * INTERNAL: Do not reference the `Generated::Static` class directly.
+   * Use the subclass `Static`, where the following predicates are available.
+   */
+  class Static extends Synth::TStatic, ExternItemImpl::ExternItem, ItemImpl::Item {
+    override string getAPrimaryQlClass() { result = "Static" }
+
+    /**
+     * Gets the `index`th attr of this static (0-based).
+     */
+    Attr getAttr(int index) {
+      result =
+        Synth::convertAttrFromRaw(Synth::convertStaticToRaw(this).(Raw::Static).getAttr(index))
+    }
+
+    /**
+     * Gets any of the attrs of this static.
+     */
+    final Attr getAnAttr() { result = this.getAttr(_) }
+
+    /**
+     * Gets the number of attrs of this static.
+     */
+    final int getNumberOfAttrs() { result = count(int i | exists(this.getAttr(i))) }
+
+    /**
+     * Gets the body of this static, if it exists.
+     */
+    Expr getBody() {
+      result = Synth::convertExprFromRaw(Synth::convertStaticToRaw(this).(Raw::Static).getBody())
+    }
+
+    /**
+     * Holds if `getBody()` exists.
+     */
+    final predicate hasBody() { exists(this.getBody()) }
+
+    /**
+     * Holds if this static is mut.
+     */
+    predicate isMut() { Synth::convertStaticToRaw(this).(Raw::Static).isMut() }
+
+    /**
+     * Holds if this static is static.
+     */
+    predicate isStatic() { Synth::convertStaticToRaw(this).(Raw::Static).isStatic() }
+
+    /**
+     * Gets the name of this static, if it exists.
+     */
+    Name getName() {
+      result = Synth::convertNameFromRaw(Synth::convertStaticToRaw(this).(Raw::Static).getName())
+    }
+
+    /**
+     * Holds if `getName()` exists.
+     */
+    final predicate hasName() { exists(this.getName()) }
+
+    /**
+     * Gets the ty of this static, if it exists.
+     */
+    TypeRef getTy() {
+      result = Synth::convertTypeRefFromRaw(Synth::convertStaticToRaw(this).(Raw::Static).getTy())
+    }
+
+    /**
+     * Holds if `getTy()` exists.
+     */
+    final predicate hasTy() { exists(this.getTy()) }
+
+    /**
+     * Gets the visibility of this static, if it exists.
+     */
+    Visibility getVisibility() {
+      result =
+        Synth::convertVisibilityFromRaw(Synth::convertStaticToRaw(this)
+              .(Raw::Static)
+              .getVisibility())
+    }
+
+    /**
+     * Holds if `getVisibility()` exists.
+     */
+    final predicate hasVisibility() { exists(this.getVisibility()) }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/StmtList.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/StmtList.qll
new file mode 100644
index 00000000000..1366eab7796
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/StmtList.qll
@@ -0,0 +1,81 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `StmtList`.
+ * INTERNAL: Do not import directly.
+ */
+
+private import codeql.rust.elements.internal.generated.Synth
+private import codeql.rust.elements.internal.generated.Raw
+import codeql.rust.elements.internal.AstNodeImpl::Impl as AstNodeImpl
+import codeql.rust.elements.Attr
+import codeql.rust.elements.Expr
+import codeql.rust.elements.Stmt
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `StmtList` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * A StmtList. For example:
+   * ```rust
+   * todo!()
+   * ```
+   * INTERNAL: Do not reference the `Generated::StmtList` class directly.
+   * Use the subclass `StmtList`, where the following predicates are available.
+   */
+  class StmtList extends Synth::TStmtList, AstNodeImpl::AstNode {
+    override string getAPrimaryQlClass() { result = "StmtList" }
+
+    /**
+     * Gets the `index`th attr of this statement list (0-based).
+     */
+    Attr getAttr(int index) {
+      result =
+        Synth::convertAttrFromRaw(Synth::convertStmtListToRaw(this).(Raw::StmtList).getAttr(index))
+    }
+
+    /**
+     * Gets any of the attrs of this statement list.
+     */
+    final Attr getAnAttr() { result = this.getAttr(_) }
+
+    /**
+     * Gets the number of attrs of this statement list.
+     */
+    final int getNumberOfAttrs() { result = count(int i | exists(this.getAttr(i))) }
+
+    /**
+     * Gets the `index`th statement of this statement list (0-based).
+     */
+    Stmt getStatement(int index) {
+      result =
+        Synth::convertStmtFromRaw(Synth::convertStmtListToRaw(this)
+              .(Raw::StmtList)
+              .getStatement(index))
+    }
+
+    /**
+     * Gets any of the statements of this statement list.
+     */
+    final Stmt getAStatement() { result = this.getStatement(_) }
+
+    /**
+     * Gets the number of statements of this statement list.
+     */
+    final int getNumberOfStatements() { result = count(int i | exists(this.getStatement(i))) }
+
+    /**
+     * Gets the tail expression of this statement list, if it exists.
+     */
+    Expr getTailExpr() {
+      result =
+        Synth::convertExprFromRaw(Synth::convertStmtListToRaw(this).(Raw::StmtList).getTailExpr())
+    }
+
+    /**
+     * Holds if `getTailExpr()` exists.
+     */
+    final predicate hasTailExpr() { exists(this.getTailExpr()) }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/Struct.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/Struct.qll
new file mode 100644
index 00000000000..a596843e100
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/Struct.qll
@@ -0,0 +1,121 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `Struct`.
+ * INTERNAL: Do not import directly.
+ */
+
+private import codeql.rust.elements.internal.generated.Synth
+private import codeql.rust.elements.internal.generated.Raw
+import codeql.rust.elements.Attr
+import codeql.rust.elements.FieldList
+import codeql.rust.elements.GenericParamList
+import codeql.rust.elements.internal.ItemImpl::Impl as ItemImpl
+import codeql.rust.elements.Name
+import codeql.rust.elements.Visibility
+import codeql.rust.elements.WhereClause
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `Struct` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * A Struct. For example:
+   * ```rust
+   * todo!()
+   * ```
+   * INTERNAL: Do not reference the `Generated::Struct` class directly.
+   * Use the subclass `Struct`, where the following predicates are available.
+   */
+  class Struct extends Synth::TStruct, ItemImpl::Item {
+    override string getAPrimaryQlClass() { result = "Struct" }
+
+    /**
+     * Gets the `index`th attr of this struct (0-based).
+     */
+    Attr getAttr(int index) {
+      result =
+        Synth::convertAttrFromRaw(Synth::convertStructToRaw(this).(Raw::Struct).getAttr(index))
+    }
+
+    /**
+     * Gets any of the attrs of this struct.
+     */
+    final Attr getAnAttr() { result = this.getAttr(_) }
+
+    /**
+     * Gets the number of attrs of this struct.
+     */
+    final int getNumberOfAttrs() { result = count(int i | exists(this.getAttr(i))) }
+
+    /**
+     * Gets the field list of this struct, if it exists.
+     */
+    FieldList getFieldList() {
+      result =
+        Synth::convertFieldListFromRaw(Synth::convertStructToRaw(this).(Raw::Struct).getFieldList())
+    }
+
+    /**
+     * Holds if `getFieldList()` exists.
+     */
+    final predicate hasFieldList() { exists(this.getFieldList()) }
+
+    /**
+     * Gets the generic parameter list of this struct, if it exists.
+     */
+    GenericParamList getGenericParamList() {
+      result =
+        Synth::convertGenericParamListFromRaw(Synth::convertStructToRaw(this)
+              .(Raw::Struct)
+              .getGenericParamList())
+    }
+
+    /**
+     * Holds if `getGenericParamList()` exists.
+     */
+    final predicate hasGenericParamList() { exists(this.getGenericParamList()) }
+
+    /**
+     * Gets the name of this struct, if it exists.
+     */
+    Name getName() {
+      result = Synth::convertNameFromRaw(Synth::convertStructToRaw(this).(Raw::Struct).getName())
+    }
+
+    /**
+     * Holds if `getName()` exists.
+     */
+    final predicate hasName() { exists(this.getName()) }
+
+    /**
+     * Gets the visibility of this struct, if it exists.
+     */
+    Visibility getVisibility() {
+      result =
+        Synth::convertVisibilityFromRaw(Synth::convertStructToRaw(this)
+              .(Raw::Struct)
+              .getVisibility())
+    }
+
+    /**
+     * Holds if `getVisibility()` exists.
+     */
+    final predicate hasVisibility() { exists(this.getVisibility()) }
+
+    /**
+     * Gets the where clause of this struct, if it exists.
+     */
+    WhereClause getWhereClause() {
+      result =
+        Synth::convertWhereClauseFromRaw(Synth::convertStructToRaw(this)
+              .(Raw::Struct)
+              .getWhereClause())
+    }
+
+    /**
+     * Holds if `getWhereClause()` exists.
+     */
+    final predicate hasWhereClause() { exists(this.getWhereClause()) }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/Synth.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/Synth.qll
index 6396fdefffc..927ba1f238d 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/Synth.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/Synth.qll
@@ -7,7 +7,6 @@
 private import codeql.rust.elements.internal.generated.SynthConstructors
 private import codeql.rust.elements.internal.generated.Raw
 
-cached
 module Synth {
   /**
    * INTERNAL: Do not use.
@@ -15,6 +14,22 @@ module Synth {
    */
   cached
   newtype TElement =
+    /**
+     * INTERNAL: Do not use.
+     */
+    TAbi(Raw::Abi id) { constructAbi(id) } or
+    /**
+     * INTERNAL: Do not use.
+     */
+    TArgList(Raw::ArgList id) { constructArgList(id) } or
+    /**
+     * INTERNAL: Do not use.
+     */
+    TArrayExpr(Raw::ArrayExpr id) { constructArrayExpr(id) } or
+    /**
+     * INTERNAL: Do not use.
+     */
+    TArrayType(Raw::ArrayType id) { constructArrayType(id) } or
     /**
      * INTERNAL: Do not use.
      */
@@ -22,7 +37,15 @@ module Synth {
     /**
      * INTERNAL: Do not use.
      */
-    TAsyncBlockExpr(Raw::AsyncBlockExpr id) { constructAsyncBlockExpr(id) } or
+    TAssocItemList(Raw::AssocItemList id) { constructAssocItemList(id) } or
+    /**
+     * INTERNAL: Do not use.
+     */
+    TAssocTypeArg(Raw::AssocTypeArg id) { constructAssocTypeArg(id) } or
+    /**
+     * INTERNAL: Do not use.
+     */
+    TAttr(Raw::Attr id) { constructAttr(id) } or
     /**
      * INTERNAL: Do not use.
      */
@@ -39,10 +62,6 @@ module Synth {
      * INTERNAL: Do not use.
      */
     TBlockExpr(Raw::BlockExpr id) { constructBlockExpr(id) } or
-    /**
-     * INTERNAL: Do not use.
-     */
-    TBoxExpr(Raw::BoxExpr id) { constructBoxExpr(id) } or
     /**
      * INTERNAL: Do not use.
      */
@@ -59,10 +78,26 @@ module Synth {
      * INTERNAL: Do not use.
      */
     TCastExpr(Raw::CastExpr id) { constructCastExpr(id) } or
+    /**
+     * INTERNAL: Do not use.
+     */
+    TClosureBinder(Raw::ClosureBinder id) { constructClosureBinder(id) } or
     /**
      * INTERNAL: Do not use.
      */
     TClosureExpr(Raw::ClosureExpr id) { constructClosureExpr(id) } or
+    /**
+     * INTERNAL: Do not use.
+     */
+    TComment(Raw::Comment id) { constructComment(id) } or
+    /**
+     * INTERNAL: Do not use.
+     */
+    TConst(Raw::Const id) { constructConst(id) } or
+    /**
+     * INTERNAL: Do not use.
+     */
+    TConstArg(Raw::ConstArg id) { constructConstArg(id) } or
     /**
      * INTERNAL: Do not use.
      */
@@ -70,7 +105,7 @@ module Synth {
     /**
      * INTERNAL: Do not use.
      */
-    TConstExpr(Raw::ConstExpr id) { constructConstExpr(id) } or
+    TConstParam(Raw::ConstParam id) { constructConstParam(id) } or
     /**
      * INTERNAL: Do not use.
      */
@@ -78,15 +113,71 @@ module Synth {
     /**
      * INTERNAL: Do not use.
      */
-    TElementListExpr(Raw::ElementListExpr id) { constructElementListExpr(id) } or
+    TDynTraitType(Raw::DynTraitType id) { constructDynTraitType(id) } or
+    /**
+     * INTERNAL: Do not use.
+     */
+    TEnum(Raw::Enum id) { constructEnum(id) } or
     /**
      * INTERNAL: Do not use.
      */
     TExprStmt(Raw::ExprStmt id) { constructExprStmt(id) } or
+    /**
+     * INTERNAL: Do not use.
+     */
+    TExternBlock(Raw::ExternBlock id) { constructExternBlock(id) } or
+    /**
+     * INTERNAL: Do not use.
+     */
+    TExternCrate(Raw::ExternCrate id) { constructExternCrate(id) } or
+    /**
+     * INTERNAL: Do not use.
+     */
+    TExternItemList(Raw::ExternItemList id) { constructExternItemList(id) } or
     /**
      * INTERNAL: Do not use.
      */
     TFieldExpr(Raw::FieldExpr id) { constructFieldExpr(id) } or
+    /**
+     * INTERNAL: Do not use.
+     */
+    TFnPtrType(Raw::FnPtrType id) { constructFnPtrType(id) } or
+    /**
+     * INTERNAL: Do not use.
+     */
+    TForExpr(Raw::ForExpr id) { constructForExpr(id) } or
+    /**
+     * INTERNAL: Do not use.
+     */
+    TForType(Raw::ForType id) { constructForType(id) } or
+    /**
+     * INTERNAL: Do not use.
+     */
+    TFormat(Raw::FormatArgsExpr parent, int index, string text, int offset) {
+      constructFormat(parent, index, text, offset)
+    } or
+    /**
+     * INTERNAL: Do not use.
+     */
+    TFormatArgsArg(Raw::FormatArgsArg id) { constructFormatArgsArg(id) } or
+    /**
+     * INTERNAL: Do not use.
+     */
+    TFormatArgsExpr(Raw::FormatArgsExpr id) { constructFormatArgsExpr(id) } or
+    /**
+     * INTERNAL: Do not use.
+     */
+    TFormatArgument(
+      Raw::FormatArgsExpr parent, int index, int kind, string name, boolean positional, int offset
+    ) {
+      constructFormatArgument(parent, index, kind, name, positional, offset)
+    } or
+    /**
+     * INTERNAL: Do not use.
+     */
+    TFormatTemplateVariableAccess(Raw::FormatArgsExpr parent, int index, int kind) {
+      constructFormatTemplateVariableAccess(parent, index, kind)
+    } or
     /**
      * INTERNAL: Do not use.
      */
@@ -95,6 +186,10 @@ module Synth {
      * INTERNAL: Do not use.
      */
     TGenericArgList(Raw::GenericArgList id) { constructGenericArgList(id) } or
+    /**
+     * INTERNAL: Do not use.
+     */
+    TGenericParamList(Raw::GenericParamList id) { constructGenericParamList(id) } or
     /**
      * INTERNAL: Do not use.
      */
@@ -103,6 +198,14 @@ module Synth {
      * INTERNAL: Do not use.
      */
     TIfExpr(Raw::IfExpr id) { constructIfExpr(id) } or
+    /**
+     * INTERNAL: Do not use.
+     */
+    TImpl(Raw::Impl id) { constructImpl(id) } or
+    /**
+     * INTERNAL: Do not use.
+     */
+    TImplTraitType(Raw::ImplTraitType id) { constructImplTraitType(id) } or
     /**
      * INTERNAL: Do not use.
      */
@@ -110,11 +213,19 @@ module Synth {
     /**
      * INTERNAL: Do not use.
      */
-    TItemStmt(Raw::ItemStmt id) { constructItemStmt(id) } or
+    TInferType(Raw::InferType id) { constructInferType(id) } or
+    /**
+     * INTERNAL: Do not use.
+     */
+    TItemList(Raw::ItemList id) { constructItemList(id) } or
     /**
      * INTERNAL: Do not use.
      */
     TLabel(Raw::Label id) { constructLabel(id) } or
+    /**
+     * INTERNAL: Do not use.
+     */
+    TLetElse(Raw::LetElse id) { constructLetElse(id) } or
     /**
      * INTERNAL: Do not use.
      */
@@ -123,6 +234,18 @@ module Synth {
      * INTERNAL: Do not use.
      */
     TLetStmt(Raw::LetStmt id) { constructLetStmt(id) } or
+    /**
+     * INTERNAL: Do not use.
+     */
+    TLifetime(Raw::Lifetime id) { constructLifetime(id) } or
+    /**
+     * INTERNAL: Do not use.
+     */
+    TLifetimeArg(Raw::LifetimeArg id) { constructLifetimeArg(id) } or
+    /**
+     * INTERNAL: Do not use.
+     */
+    TLifetimeParam(Raw::LifetimeParam id) { constructLifetimeParam(id) } or
     /**
      * INTERNAL: Do not use.
      */
@@ -135,14 +258,58 @@ module Synth {
      * INTERNAL: Do not use.
      */
     TLoopExpr(Raw::LoopExpr id) { constructLoopExpr(id) } or
+    /**
+     * INTERNAL: Do not use.
+     */
+    TMacroCall(Raw::MacroCall id) { constructMacroCall(id) } or
+    /**
+     * INTERNAL: Do not use.
+     */
+    TMacroDef(Raw::MacroDef id) { constructMacroDef(id) } or
+    /**
+     * INTERNAL: Do not use.
+     */
+    TMacroExpr(Raw::MacroExpr id) { constructMacroExpr(id) } or
+    /**
+     * INTERNAL: Do not use.
+     */
+    TMacroItems(Raw::MacroItems id) { constructMacroItems(id) } or
+    /**
+     * INTERNAL: Do not use.
+     */
+    TMacroPat(Raw::MacroPat id) { constructMacroPat(id) } or
+    /**
+     * INTERNAL: Do not use.
+     */
+    TMacroRules(Raw::MacroRules id) { constructMacroRules(id) } or
+    /**
+     * INTERNAL: Do not use.
+     */
+    TMacroStmts(Raw::MacroStmts id) { constructMacroStmts(id) } or
+    /**
+     * INTERNAL: Do not use.
+     */
+    TMacroType(Raw::MacroType id) { constructMacroType(id) } or
     /**
      * INTERNAL: Do not use.
      */
     TMatchArm(Raw::MatchArm id) { constructMatchArm(id) } or
+    /**
+     * INTERNAL: Do not use.
+     */
+    TMatchArmList(Raw::MatchArmList id) { constructMatchArmList(id) } or
     /**
      * INTERNAL: Do not use.
      */
     TMatchExpr(Raw::MatchExpr id) { constructMatchExpr(id) } or
+    /**
+     * INTERNAL: Do not use.
+     */
+    TMatchGuard(Raw::MatchGuard id) { constructMatchGuard(id) } or
+    /**
+     * INTERNAL: Do not use.
+     */
+    TMeta(Raw::Meta id) { constructMeta(id) } or
     /**
      * INTERNAL: Do not use.
      */
@@ -150,15 +317,23 @@ module Synth {
     /**
      * INTERNAL: Do not use.
      */
-    TMissingExpr(Raw::MissingExpr id) { constructMissingExpr(id) } or
-    /**
-     * INTERNAL: Do not use.
-     */
-    TMissingPat(Raw::MissingPat id) { constructMissingPat(id) } or
+    TMissing(Raw::Missing id) { constructMissing(id) } or
     /**
      * INTERNAL: Do not use.
      */
     TModule(Raw::Module id) { constructModule(id) } or
+    /**
+     * INTERNAL: Do not use.
+     */
+    TName(Raw::Name id) { constructName(id) } or
+    /**
+     * INTERNAL: Do not use.
+     */
+    TNameRef(Raw::NameRef id) { constructNameRef(id) } or
+    /**
+     * INTERNAL: Do not use.
+     */
+    TNeverType(Raw::NeverType id) { constructNeverType(id) } or
     /**
      * INTERNAL: Do not use.
      */
@@ -167,6 +342,26 @@ module Synth {
      * INTERNAL: Do not use.
      */
     TOrPat(Raw::OrPat id) { constructOrPat(id) } or
+    /**
+     * INTERNAL: Do not use.
+     */
+    TParam(Raw::Param id) { constructParam(id) } or
+    /**
+     * INTERNAL: Do not use.
+     */
+    TParamList(Raw::ParamList id) { constructParamList(id) } or
+    /**
+     * INTERNAL: Do not use.
+     */
+    TParenExpr(Raw::ParenExpr id) { constructParenExpr(id) } or
+    /**
+     * INTERNAL: Do not use.
+     */
+    TParenPat(Raw::ParenPat id) { constructParenPat(id) } or
+    /**
+     * INTERNAL: Do not use.
+     */
+    TParenType(Raw::ParenType id) { constructParenType(id) } or
     /**
      * INTERNAL: Do not use.
      */
@@ -179,10 +374,22 @@ module Synth {
      * INTERNAL: Do not use.
      */
     TPathPat(Raw::PathPat id) { constructPathPat(id) } or
+    /**
+     * INTERNAL: Do not use.
+     */
+    TPathSegment(Raw::PathSegment id) { constructPathSegment(id) } or
+    /**
+     * INTERNAL: Do not use.
+     */
+    TPathType(Raw::PathType id) { constructPathType(id) } or
     /**
      * INTERNAL: Do not use.
      */
     TPrefixExpr(Raw::PrefixExpr id) { constructPrefixExpr(id) } or
+    /**
+     * INTERNAL: Do not use.
+     */
+    TPtrType(Raw::PtrType id) { constructPtrType(id) } or
     /**
      * INTERNAL: Do not use.
      */
@@ -199,6 +406,18 @@ module Synth {
      * INTERNAL: Do not use.
      */
     TRecordExprField(Raw::RecordExprField id) { constructRecordExprField(id) } or
+    /**
+     * INTERNAL: Do not use.
+     */
+    TRecordExprFieldList(Raw::RecordExprFieldList id) { constructRecordExprFieldList(id) } or
+    /**
+     * INTERNAL: Do not use.
+     */
+    TRecordField(Raw::RecordField id) { constructRecordField(id) } or
+    /**
+     * INTERNAL: Do not use.
+     */
+    TRecordFieldList(Raw::RecordFieldList id) { constructRecordFieldList(id) } or
     /**
      * INTERNAL: Do not use.
      */
@@ -207,6 +426,10 @@ module Synth {
      * INTERNAL: Do not use.
      */
     TRecordPatField(Raw::RecordPatField id) { constructRecordPatField(id) } or
+    /**
+     * INTERNAL: Do not use.
+     */
+    TRecordPatFieldList(Raw::RecordPatFieldList id) { constructRecordPatFieldList(id) } or
     /**
      * INTERNAL: Do not use.
      */
@@ -218,19 +441,83 @@ module Synth {
     /**
      * INTERNAL: Do not use.
      */
-    TRepeatExpr(Raw::RepeatExpr id) { constructRepeatExpr(id) } or
+    TRefType(Raw::RefType id) { constructRefType(id) } or
+    /**
+     * INTERNAL: Do not use.
+     */
+    TRename(Raw::Rename id) { constructRename(id) } or
+    /**
+     * INTERNAL: Do not use.
+     */
+    TRestPat(Raw::RestPat id) { constructRestPat(id) } or
+    /**
+     * INTERNAL: Do not use.
+     */
+    TRetType(Raw::RetType id) { constructRetType(id) } or
     /**
      * INTERNAL: Do not use.
      */
     TReturnExpr(Raw::ReturnExpr id) { constructReturnExpr(id) } or
+    /**
+     * INTERNAL: Do not use.
+     */
+    TReturnTypeSyntax(Raw::ReturnTypeSyntax id) { constructReturnTypeSyntax(id) } or
+    /**
+     * INTERNAL: Do not use.
+     */
+    TSelfParam(Raw::SelfParam id) { constructSelfParam(id) } or
     /**
      * INTERNAL: Do not use.
      */
     TSlicePat(Raw::SlicePat id) { constructSlicePat(id) } or
+    /**
+     * INTERNAL: Do not use.
+     */
+    TSliceType(Raw::SliceType id) { constructSliceType(id) } or
+    /**
+     * INTERNAL: Do not use.
+     */
+    TSourceFile(Raw::SourceFile id) { constructSourceFile(id) } or
+    /**
+     * INTERNAL: Do not use.
+     */
+    TStatic(Raw::Static id) { constructStatic(id) } or
+    /**
+     * INTERNAL: Do not use.
+     */
+    TStmtList(Raw::StmtList id) { constructStmtList(id) } or
+    /**
+     * INTERNAL: Do not use.
+     */
+    TStruct(Raw::Struct id) { constructStruct(id) } or
+    /**
+     * INTERNAL: Do not use.
+     */
+    TTokenTree(Raw::TokenTree id) { constructTokenTree(id) } or
+    /**
+     * INTERNAL: Do not use.
+     */
+    TTrait(Raw::Trait id) { constructTrait(id) } or
+    /**
+     * INTERNAL: Do not use.
+     */
+    TTraitAlias(Raw::TraitAlias id) { constructTraitAlias(id) } or
+    /**
+     * INTERNAL: Do not use.
+     */
+    TTryExpr(Raw::TryExpr id) { constructTryExpr(id) } or
     /**
      * INTERNAL: Do not use.
      */
     TTupleExpr(Raw::TupleExpr id) { constructTupleExpr(id) } or
+    /**
+     * INTERNAL: Do not use.
+     */
+    TTupleField(Raw::TupleField id) { constructTupleField(id) } or
+    /**
+     * INTERNAL: Do not use.
+     */
+    TTupleFieldList(Raw::TupleFieldList id) { constructTupleFieldList(id) } or
     /**
      * INTERNAL: Do not use.
      */
@@ -242,7 +529,27 @@ module Synth {
     /**
      * INTERNAL: Do not use.
      */
-    TTypeRef(Raw::TypeRef id) { constructTypeRef(id) } or
+    TTupleType(Raw::TupleType id) { constructTupleType(id) } or
+    /**
+     * INTERNAL: Do not use.
+     */
+    TTypeAlias(Raw::TypeAlias id) { constructTypeAlias(id) } or
+    /**
+     * INTERNAL: Do not use.
+     */
+    TTypeArg(Raw::TypeArg id) { constructTypeArg(id) } or
+    /**
+     * INTERNAL: Do not use.
+     */
+    TTypeBound(Raw::TypeBound id) { constructTypeBound(id) } or
+    /**
+     * INTERNAL: Do not use.
+     */
+    TTypeBoundList(Raw::TypeBoundList id) { constructTypeBoundList(id) } or
+    /**
+     * INTERNAL: Do not use.
+     */
+    TTypeParam(Raw::TypeParam id) { constructTypeParam(id) } or
     /**
      * INTERNAL: Do not use.
      */
@@ -250,13 +557,47 @@ module Synth {
     /**
      * INTERNAL: Do not use.
      */
-    TUnimplementedDeclaration(Raw::UnimplementedDeclaration id) {
-      constructUnimplementedDeclaration(id)
-    } or
+    TUnimplemented(Raw::Unimplemented id) { constructUnimplemented(id) } or
     /**
      * INTERNAL: Do not use.
      */
-    TUnsafeBlockExpr(Raw::UnsafeBlockExpr id) { constructUnsafeBlockExpr(id) } or
+    TUnion(Raw::Union id) { constructUnion(id) } or
+    /**
+     * INTERNAL: Do not use.
+     */
+    TUse(Raw::Use id) { constructUse(id) } or
+    /**
+     * INTERNAL: Do not use.
+     */
+    TUseTree(Raw::UseTree id) { constructUseTree(id) } or
+    /**
+     * INTERNAL: Do not use.
+     */
+    TUseTreeList(Raw::UseTreeList id) { constructUseTreeList(id) } or
+    /**
+     * INTERNAL: Do not use.
+     */
+    TVariant(Raw::Variant id) { constructVariant(id) } or
+    /**
+     * INTERNAL: Do not use.
+     */
+    TVariantList(Raw::VariantList id) { constructVariantList(id) } or
+    /**
+     * INTERNAL: Do not use.
+     */
+    TVisibility(Raw::Visibility id) { constructVisibility(id) } or
+    /**
+     * INTERNAL: Do not use.
+     */
+    TWhereClause(Raw::WhereClause id) { constructWhereClause(id) } or
+    /**
+     * INTERNAL: Do not use.
+     */
+    TWherePred(Raw::WherePred id) { constructWherePred(id) } or
+    /**
+     * INTERNAL: Do not use.
+     */
+    TWhileExpr(Raw::WhileExpr id) { constructWhileExpr(id) } or
     /**
      * INTERNAL: Do not use.
      */
@@ -273,58 +614,112 @@ module Synth {
   /**
    * INTERNAL: Do not use.
    */
-  class TArrayExpr = TElementListExpr or TRepeatExpr;
+  class TAssocItem = TConst or TFunction or TMacroCall or TTypeAlias;
 
   /**
    * INTERNAL: Do not use.
    */
   class TAstNode =
-    TDeclaration or TExpr or TGenericArgList or TLabel or TMatchArm or TPat or TPath or
-        TRecordExprField or TRecordPatField or TStmt or TTypeRef;
+    TAbi or TArgList or TAssocItem or TAssocItemList or TAttr or TCallable or TClosureBinder or
+        TExpr or TExternItem or TExternItemList or TFieldList or TFormatArgsArg or TGenericArg or
+        TGenericArgList or TGenericParam or TGenericParamList or TItemList or TLabel or TLetElse or
+        TLifetime or TMacroItems or TMacroStmts or TMatchArm or TMatchArmList or TMatchGuard or
+        TMeta or TName or TNameRef or TParam or TParamList or TPat or TPathSegment or
+        TRecordExprField or TRecordExprFieldList or TRecordField or TRecordPatField or
+        TRecordPatFieldList or TRename or TResolvable or TRetType or TReturnTypeSyntax or
+        TSelfParam or TSourceFile or TStmt or TStmtList or TToken or TTokenTree or TTupleField or
+        TTypeBound or TTypeBoundList or TTypeRef or TUseTree or TUseTreeList or TVariant or
+        TVariantList or TVisibility or TWhereClause or TWherePred;
 
   /**
    * INTERNAL: Do not use.
    */
-  class TBlockExprBase = TAsyncBlockExpr or TBlockExpr or TUnsafeBlockExpr;
+  class TCallExprBase = TCallExpr or TMethodCallExpr;
 
   /**
    * INTERNAL: Do not use.
    */
-  class TDeclaration = TFunction or TModule or TUnimplementedDeclaration;
+  class TCallable = TClosureExpr or TFunction;
 
   /**
    * INTERNAL: Do not use.
    */
   class TExpr =
-    TArrayExpr or TAsmExpr or TAwaitExpr or TBecomeExpr or TBinaryExpr or TBlockExprBase or
-        TBoxExpr or TBreakExpr or TCallExpr or TCastExpr or TClosureExpr or TConstExpr or
-        TContinueExpr or TFieldExpr or TIfExpr or TIndexExpr or TLetExpr or TLiteralExpr or
-        TLoopExpr or TMatchExpr or TMethodCallExpr or TMissingExpr or TOffsetOfExpr or TPathExpr or
-        TPrefixExpr or TRangeExpr or TRecordExpr or TRefExpr or TReturnExpr or TTupleExpr or
-        TUnderscoreExpr or TYeetExpr or TYieldExpr;
+    TArrayExpr or TAsmExpr or TAwaitExpr or TBecomeExpr or TBinaryExpr or TBlockExpr or
+        TBreakExpr or TCallExprBase or TCastExpr or TClosureExpr or TContinueExpr or TFieldExpr or
+        TForExpr or TFormatArgsExpr or TIfExpr or TIndexExpr or TLetExpr or TLiteralExpr or
+        TLoopExpr or TMacroExpr or TMatchExpr or TOffsetOfExpr or TParenExpr or TPathExprBase or
+        TPrefixExpr or TRangeExpr or TRecordExpr or TRefExpr or TReturnExpr or TTryExpr or
+        TTupleExpr or TUnderscoreExpr or TWhileExpr or TYeetExpr or TYieldExpr;
 
   /**
    * INTERNAL: Do not use.
    */
-  class TLocatable = TAstNode;
+  class TExternItem = TFunction or TMacroCall or TStatic or TTypeAlias;
 
   /**
    * INTERNAL: Do not use.
    */
-  class TMissing = TMissingExpr or TMissingPat;
+  class TFieldList = TRecordFieldList or TTupleFieldList;
+
+  /**
+   * INTERNAL: Do not use.
+   */
+  class TGenericArg = TAssocTypeArg or TConstArg or TLifetimeArg or TTypeArg;
+
+  /**
+   * INTERNAL: Do not use.
+   */
+  class TGenericParam = TConstParam or TLifetimeParam or TTypeParam;
+
+  /**
+   * INTERNAL: Do not use.
+   */
+  class TItem =
+    TConst or TEnum or TExternBlock or TExternCrate or TFunction or TImpl or TMacroCall or
+        TMacroDef or TMacroRules or TModule or TStatic or TStruct or TTrait or TTraitAlias or
+        TTypeAlias or TUnion or TUse;
+
+  /**
+   * INTERNAL: Do not use.
+   */
+  class TLocatable = TAstNode or TFormat or TFormatArgument;
 
   /**
    * INTERNAL: Do not use.
    */
   class TPat =
-    TBoxPat or TConstBlockPat or TIdentPat or TLiteralPat or TMissingPat or TOrPat or TPathPat or
-        TRangePat or TRecordPat or TRefPat or TSlicePat or TTuplePat or TTupleStructPat or
-        TWildcardPat;
+    TBoxPat or TConstBlockPat or TIdentPat or TLiteralPat or TMacroPat or TOrPat or TParenPat or
+        TPathPat or TRangePat or TRecordPat or TRefPat or TRestPat or TSlicePat or TTuplePat or
+        TTupleStructPat or TWildcardPat;
 
   /**
    * INTERNAL: Do not use.
    */
-  class TStmt = TExprStmt or TItemStmt or TLetStmt;
+  class TPathExprBase = TFormatTemplateVariableAccess or TPathExpr;
+
+  /**
+   * INTERNAL: Do not use.
+   */
+  class TResolvable = TMethodCallExpr or TPath;
+
+  /**
+   * INTERNAL: Do not use.
+   */
+  class TStmt = TExprStmt or TItem or TLetStmt;
+
+  /**
+   * INTERNAL: Do not use.
+   */
+  class TToken = TComment;
+
+  /**
+   * INTERNAL: Do not use.
+   */
+  class TTypeRef =
+    TArrayType or TDynTraitType or TFnPtrType or TForType or TImplTraitType or TInferType or
+        TMacroType or TNeverType or TParenType or TPathType or TPtrType or TRefType or TSliceType or
+        TTupleType;
 
   /**
    * INTERNAL: Do not use.
@@ -333,523 +728,1052 @@ module Synth {
 
   /**
    * INTERNAL: Do not use.
+   * Converts a raw element to a synthesized `TAbi`, if possible.
    */
-  class TUnimplemented = TGenericArgList or TPath or TTypeRef or TUnimplementedDeclaration;
+  TAbi convertAbiFromRaw(Raw::Element e) { result = TAbi(e) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a raw element to a synthesized `TArgList`, if possible.
+   */
+  TArgList convertArgListFromRaw(Raw::Element e) { result = TArgList(e) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a raw element to a synthesized `TArrayExpr`, if possible.
+   */
+  TArrayExpr convertArrayExprFromRaw(Raw::Element e) { result = TArrayExpr(e) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a raw element to a synthesized `TArrayType`, if possible.
+   */
+  TArrayType convertArrayTypeFromRaw(Raw::Element e) { result = TArrayType(e) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TAsmExpr`, if possible.
    */
-  cached
   TAsmExpr convertAsmExprFromRaw(Raw::Element e) { result = TAsmExpr(e) }
 
   /**
    * INTERNAL: Do not use.
-   * Converts a raw element to a synthesized `TAsyncBlockExpr`, if possible.
+   * Converts a raw element to a synthesized `TAssocItemList`, if possible.
    */
-  cached
-  TAsyncBlockExpr convertAsyncBlockExprFromRaw(Raw::Element e) { result = TAsyncBlockExpr(e) }
+  TAssocItemList convertAssocItemListFromRaw(Raw::Element e) { result = TAssocItemList(e) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a raw element to a synthesized `TAssocTypeArg`, if possible.
+   */
+  TAssocTypeArg convertAssocTypeArgFromRaw(Raw::Element e) { result = TAssocTypeArg(e) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a raw element to a synthesized `TAttr`, if possible.
+   */
+  TAttr convertAttrFromRaw(Raw::Element e) { result = TAttr(e) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TAwaitExpr`, if possible.
    */
-  cached
   TAwaitExpr convertAwaitExprFromRaw(Raw::Element e) { result = TAwaitExpr(e) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TBecomeExpr`, if possible.
    */
-  cached
   TBecomeExpr convertBecomeExprFromRaw(Raw::Element e) { result = TBecomeExpr(e) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TBinaryExpr`, if possible.
    */
-  cached
   TBinaryExpr convertBinaryExprFromRaw(Raw::Element e) { result = TBinaryExpr(e) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TBlockExpr`, if possible.
    */
-  cached
   TBlockExpr convertBlockExprFromRaw(Raw::Element e) { result = TBlockExpr(e) }
 
-  /**
-   * INTERNAL: Do not use.
-   * Converts a raw element to a synthesized `TBoxExpr`, if possible.
-   */
-  cached
-  TBoxExpr convertBoxExprFromRaw(Raw::Element e) { result = TBoxExpr(e) }
-
   /**
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TBoxPat`, if possible.
    */
-  cached
   TBoxPat convertBoxPatFromRaw(Raw::Element e) { result = TBoxPat(e) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TBreakExpr`, if possible.
    */
-  cached
   TBreakExpr convertBreakExprFromRaw(Raw::Element e) { result = TBreakExpr(e) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TCallExpr`, if possible.
    */
-  cached
   TCallExpr convertCallExprFromRaw(Raw::Element e) { result = TCallExpr(e) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TCastExpr`, if possible.
    */
-  cached
   TCastExpr convertCastExprFromRaw(Raw::Element e) { result = TCastExpr(e) }
 
+  /**
+   * INTERNAL: Do not use.
+   * Converts a raw element to a synthesized `TClosureBinder`, if possible.
+   */
+  TClosureBinder convertClosureBinderFromRaw(Raw::Element e) { result = TClosureBinder(e) }
+
   /**
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TClosureExpr`, if possible.
    */
-  cached
   TClosureExpr convertClosureExprFromRaw(Raw::Element e) { result = TClosureExpr(e) }
 
+  /**
+   * INTERNAL: Do not use.
+   * Converts a raw element to a synthesized `TComment`, if possible.
+   */
+  TComment convertCommentFromRaw(Raw::Element e) { result = TComment(e) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a raw element to a synthesized `TConst`, if possible.
+   */
+  TConst convertConstFromRaw(Raw::Element e) { result = TConst(e) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a raw element to a synthesized `TConstArg`, if possible.
+   */
+  TConstArg convertConstArgFromRaw(Raw::Element e) { result = TConstArg(e) }
+
   /**
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TConstBlockPat`, if possible.
    */
-  cached
   TConstBlockPat convertConstBlockPatFromRaw(Raw::Element e) { result = TConstBlockPat(e) }
 
   /**
    * INTERNAL: Do not use.
-   * Converts a raw element to a synthesized `TConstExpr`, if possible.
+   * Converts a raw element to a synthesized `TConstParam`, if possible.
    */
-  cached
-  TConstExpr convertConstExprFromRaw(Raw::Element e) { result = TConstExpr(e) }
+  TConstParam convertConstParamFromRaw(Raw::Element e) { result = TConstParam(e) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TContinueExpr`, if possible.
    */
-  cached
   TContinueExpr convertContinueExprFromRaw(Raw::Element e) { result = TContinueExpr(e) }
 
   /**
    * INTERNAL: Do not use.
-   * Converts a raw element to a synthesized `TElementListExpr`, if possible.
+   * Converts a raw element to a synthesized `TDynTraitType`, if possible.
    */
-  cached
-  TElementListExpr convertElementListExprFromRaw(Raw::Element e) { result = TElementListExpr(e) }
+  TDynTraitType convertDynTraitTypeFromRaw(Raw::Element e) { result = TDynTraitType(e) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a raw element to a synthesized `TEnum`, if possible.
+   */
+  TEnum convertEnumFromRaw(Raw::Element e) { result = TEnum(e) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TExprStmt`, if possible.
    */
-  cached
   TExprStmt convertExprStmtFromRaw(Raw::Element e) { result = TExprStmt(e) }
 
+  /**
+   * INTERNAL: Do not use.
+   * Converts a raw element to a synthesized `TExternBlock`, if possible.
+   */
+  TExternBlock convertExternBlockFromRaw(Raw::Element e) { result = TExternBlock(e) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a raw element to a synthesized `TExternCrate`, if possible.
+   */
+  TExternCrate convertExternCrateFromRaw(Raw::Element e) { result = TExternCrate(e) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a raw element to a synthesized `TExternItemList`, if possible.
+   */
+  TExternItemList convertExternItemListFromRaw(Raw::Element e) { result = TExternItemList(e) }
+
   /**
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TFieldExpr`, if possible.
    */
-  cached
   TFieldExpr convertFieldExprFromRaw(Raw::Element e) { result = TFieldExpr(e) }
 
+  /**
+   * INTERNAL: Do not use.
+   * Converts a raw element to a synthesized `TFnPtrType`, if possible.
+   */
+  TFnPtrType convertFnPtrTypeFromRaw(Raw::Element e) { result = TFnPtrType(e) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a raw element to a synthesized `TForExpr`, if possible.
+   */
+  TForExpr convertForExprFromRaw(Raw::Element e) { result = TForExpr(e) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a raw element to a synthesized `TForType`, if possible.
+   */
+  TForType convertForTypeFromRaw(Raw::Element e) { result = TForType(e) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a raw element to a synthesized `TFormat`, if possible.
+   */
+  TFormat convertFormatFromRaw(Raw::Element e) { none() }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a raw element to a synthesized `TFormatArgsArg`, if possible.
+   */
+  TFormatArgsArg convertFormatArgsArgFromRaw(Raw::Element e) { result = TFormatArgsArg(e) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a raw element to a synthesized `TFormatArgsExpr`, if possible.
+   */
+  TFormatArgsExpr convertFormatArgsExprFromRaw(Raw::Element e) { result = TFormatArgsExpr(e) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a raw element to a synthesized `TFormatArgument`, if possible.
+   */
+  TFormatArgument convertFormatArgumentFromRaw(Raw::Element e) { none() }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a raw element to a synthesized `TFormatTemplateVariableAccess`, if possible.
+   */
+  TFormatTemplateVariableAccess convertFormatTemplateVariableAccessFromRaw(Raw::Element e) {
+    none()
+  }
+
   /**
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TFunction`, if possible.
    */
-  cached
   TFunction convertFunctionFromRaw(Raw::Element e) { result = TFunction(e) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TGenericArgList`, if possible.
    */
-  cached
   TGenericArgList convertGenericArgListFromRaw(Raw::Element e) { result = TGenericArgList(e) }
 
+  /**
+   * INTERNAL: Do not use.
+   * Converts a raw element to a synthesized `TGenericParamList`, if possible.
+   */
+  TGenericParamList convertGenericParamListFromRaw(Raw::Element e) { result = TGenericParamList(e) }
+
   /**
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TIdentPat`, if possible.
    */
-  cached
   TIdentPat convertIdentPatFromRaw(Raw::Element e) { result = TIdentPat(e) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TIfExpr`, if possible.
    */
-  cached
   TIfExpr convertIfExprFromRaw(Raw::Element e) { result = TIfExpr(e) }
 
+  /**
+   * INTERNAL: Do not use.
+   * Converts a raw element to a synthesized `TImpl`, if possible.
+   */
+  TImpl convertImplFromRaw(Raw::Element e) { result = TImpl(e) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a raw element to a synthesized `TImplTraitType`, if possible.
+   */
+  TImplTraitType convertImplTraitTypeFromRaw(Raw::Element e) { result = TImplTraitType(e) }
+
   /**
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TIndexExpr`, if possible.
    */
-  cached
   TIndexExpr convertIndexExprFromRaw(Raw::Element e) { result = TIndexExpr(e) }
 
   /**
    * INTERNAL: Do not use.
-   * Converts a raw element to a synthesized `TItemStmt`, if possible.
+   * Converts a raw element to a synthesized `TInferType`, if possible.
    */
-  cached
-  TItemStmt convertItemStmtFromRaw(Raw::Element e) { result = TItemStmt(e) }
+  TInferType convertInferTypeFromRaw(Raw::Element e) { result = TInferType(e) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a raw element to a synthesized `TItemList`, if possible.
+   */
+  TItemList convertItemListFromRaw(Raw::Element e) { result = TItemList(e) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TLabel`, if possible.
    */
-  cached
   TLabel convertLabelFromRaw(Raw::Element e) { result = TLabel(e) }
 
+  /**
+   * INTERNAL: Do not use.
+   * Converts a raw element to a synthesized `TLetElse`, if possible.
+   */
+  TLetElse convertLetElseFromRaw(Raw::Element e) { result = TLetElse(e) }
+
   /**
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TLetExpr`, if possible.
    */
-  cached
   TLetExpr convertLetExprFromRaw(Raw::Element e) { result = TLetExpr(e) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TLetStmt`, if possible.
    */
-  cached
   TLetStmt convertLetStmtFromRaw(Raw::Element e) { result = TLetStmt(e) }
 
+  /**
+   * INTERNAL: Do not use.
+   * Converts a raw element to a synthesized `TLifetime`, if possible.
+   */
+  TLifetime convertLifetimeFromRaw(Raw::Element e) { result = TLifetime(e) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a raw element to a synthesized `TLifetimeArg`, if possible.
+   */
+  TLifetimeArg convertLifetimeArgFromRaw(Raw::Element e) { result = TLifetimeArg(e) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a raw element to a synthesized `TLifetimeParam`, if possible.
+   */
+  TLifetimeParam convertLifetimeParamFromRaw(Raw::Element e) { result = TLifetimeParam(e) }
+
   /**
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TLiteralExpr`, if possible.
    */
-  cached
   TLiteralExpr convertLiteralExprFromRaw(Raw::Element e) { result = TLiteralExpr(e) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TLiteralPat`, if possible.
    */
-  cached
   TLiteralPat convertLiteralPatFromRaw(Raw::Element e) { result = TLiteralPat(e) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TLoopExpr`, if possible.
    */
-  cached
   TLoopExpr convertLoopExprFromRaw(Raw::Element e) { result = TLoopExpr(e) }
 
+  /**
+   * INTERNAL: Do not use.
+   * Converts a raw element to a synthesized `TMacroCall`, if possible.
+   */
+  TMacroCall convertMacroCallFromRaw(Raw::Element e) { result = TMacroCall(e) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a raw element to a synthesized `TMacroDef`, if possible.
+   */
+  TMacroDef convertMacroDefFromRaw(Raw::Element e) { result = TMacroDef(e) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a raw element to a synthesized `TMacroExpr`, if possible.
+   */
+  TMacroExpr convertMacroExprFromRaw(Raw::Element e) { result = TMacroExpr(e) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a raw element to a synthesized `TMacroItems`, if possible.
+   */
+  TMacroItems convertMacroItemsFromRaw(Raw::Element e) { result = TMacroItems(e) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a raw element to a synthesized `TMacroPat`, if possible.
+   */
+  TMacroPat convertMacroPatFromRaw(Raw::Element e) { result = TMacroPat(e) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a raw element to a synthesized `TMacroRules`, if possible.
+   */
+  TMacroRules convertMacroRulesFromRaw(Raw::Element e) { result = TMacroRules(e) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a raw element to a synthesized `TMacroStmts`, if possible.
+   */
+  TMacroStmts convertMacroStmtsFromRaw(Raw::Element e) { result = TMacroStmts(e) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a raw element to a synthesized `TMacroType`, if possible.
+   */
+  TMacroType convertMacroTypeFromRaw(Raw::Element e) { result = TMacroType(e) }
+
   /**
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TMatchArm`, if possible.
    */
-  cached
   TMatchArm convertMatchArmFromRaw(Raw::Element e) { result = TMatchArm(e) }
 
+  /**
+   * INTERNAL: Do not use.
+   * Converts a raw element to a synthesized `TMatchArmList`, if possible.
+   */
+  TMatchArmList convertMatchArmListFromRaw(Raw::Element e) { result = TMatchArmList(e) }
+
   /**
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TMatchExpr`, if possible.
    */
-  cached
   TMatchExpr convertMatchExprFromRaw(Raw::Element e) { result = TMatchExpr(e) }
 
+  /**
+   * INTERNAL: Do not use.
+   * Converts a raw element to a synthesized `TMatchGuard`, if possible.
+   */
+  TMatchGuard convertMatchGuardFromRaw(Raw::Element e) { result = TMatchGuard(e) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a raw element to a synthesized `TMeta`, if possible.
+   */
+  TMeta convertMetaFromRaw(Raw::Element e) { result = TMeta(e) }
+
   /**
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TMethodCallExpr`, if possible.
    */
-  cached
   TMethodCallExpr convertMethodCallExprFromRaw(Raw::Element e) { result = TMethodCallExpr(e) }
 
   /**
    * INTERNAL: Do not use.
-   * Converts a raw element to a synthesized `TMissingExpr`, if possible.
+   * Converts a raw element to a synthesized `TMissing`, if possible.
    */
-  cached
-  TMissingExpr convertMissingExprFromRaw(Raw::Element e) { result = TMissingExpr(e) }
-
-  /**
-   * INTERNAL: Do not use.
-   * Converts a raw element to a synthesized `TMissingPat`, if possible.
-   */
-  cached
-  TMissingPat convertMissingPatFromRaw(Raw::Element e) { result = TMissingPat(e) }
+  TMissing convertMissingFromRaw(Raw::Element e) { result = TMissing(e) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TModule`, if possible.
    */
-  cached
   TModule convertModuleFromRaw(Raw::Element e) { result = TModule(e) }
 
+  /**
+   * INTERNAL: Do not use.
+   * Converts a raw element to a synthesized `TName`, if possible.
+   */
+  TName convertNameFromRaw(Raw::Element e) { result = TName(e) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a raw element to a synthesized `TNameRef`, if possible.
+   */
+  TNameRef convertNameRefFromRaw(Raw::Element e) { result = TNameRef(e) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a raw element to a synthesized `TNeverType`, if possible.
+   */
+  TNeverType convertNeverTypeFromRaw(Raw::Element e) { result = TNeverType(e) }
+
   /**
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TOffsetOfExpr`, if possible.
    */
-  cached
   TOffsetOfExpr convertOffsetOfExprFromRaw(Raw::Element e) { result = TOffsetOfExpr(e) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TOrPat`, if possible.
    */
-  cached
   TOrPat convertOrPatFromRaw(Raw::Element e) { result = TOrPat(e) }
 
+  /**
+   * INTERNAL: Do not use.
+   * Converts a raw element to a synthesized `TParam`, if possible.
+   */
+  TParam convertParamFromRaw(Raw::Element e) { result = TParam(e) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a raw element to a synthesized `TParamList`, if possible.
+   */
+  TParamList convertParamListFromRaw(Raw::Element e) { result = TParamList(e) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a raw element to a synthesized `TParenExpr`, if possible.
+   */
+  TParenExpr convertParenExprFromRaw(Raw::Element e) { result = TParenExpr(e) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a raw element to a synthesized `TParenPat`, if possible.
+   */
+  TParenPat convertParenPatFromRaw(Raw::Element e) { result = TParenPat(e) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a raw element to a synthesized `TParenType`, if possible.
+   */
+  TParenType convertParenTypeFromRaw(Raw::Element e) { result = TParenType(e) }
+
   /**
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TPath`, if possible.
    */
-  cached
   TPath convertPathFromRaw(Raw::Element e) { result = TPath(e) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TPathExpr`, if possible.
    */
-  cached
   TPathExpr convertPathExprFromRaw(Raw::Element e) { result = TPathExpr(e) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TPathPat`, if possible.
    */
-  cached
   TPathPat convertPathPatFromRaw(Raw::Element e) { result = TPathPat(e) }
 
+  /**
+   * INTERNAL: Do not use.
+   * Converts a raw element to a synthesized `TPathSegment`, if possible.
+   */
+  TPathSegment convertPathSegmentFromRaw(Raw::Element e) { result = TPathSegment(e) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a raw element to a synthesized `TPathType`, if possible.
+   */
+  TPathType convertPathTypeFromRaw(Raw::Element e) { result = TPathType(e) }
+
   /**
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TPrefixExpr`, if possible.
    */
-  cached
   TPrefixExpr convertPrefixExprFromRaw(Raw::Element e) { result = TPrefixExpr(e) }
 
+  /**
+   * INTERNAL: Do not use.
+   * Converts a raw element to a synthesized `TPtrType`, if possible.
+   */
+  TPtrType convertPtrTypeFromRaw(Raw::Element e) { result = TPtrType(e) }
+
   /**
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TRangeExpr`, if possible.
    */
-  cached
   TRangeExpr convertRangeExprFromRaw(Raw::Element e) { result = TRangeExpr(e) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TRangePat`, if possible.
    */
-  cached
   TRangePat convertRangePatFromRaw(Raw::Element e) { result = TRangePat(e) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TRecordExpr`, if possible.
    */
-  cached
   TRecordExpr convertRecordExprFromRaw(Raw::Element e) { result = TRecordExpr(e) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TRecordExprField`, if possible.
    */
-  cached
   TRecordExprField convertRecordExprFieldFromRaw(Raw::Element e) { result = TRecordExprField(e) }
 
+  /**
+   * INTERNAL: Do not use.
+   * Converts a raw element to a synthesized `TRecordExprFieldList`, if possible.
+   */
+  TRecordExprFieldList convertRecordExprFieldListFromRaw(Raw::Element e) {
+    result = TRecordExprFieldList(e)
+  }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a raw element to a synthesized `TRecordField`, if possible.
+   */
+  TRecordField convertRecordFieldFromRaw(Raw::Element e) { result = TRecordField(e) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a raw element to a synthesized `TRecordFieldList`, if possible.
+   */
+  TRecordFieldList convertRecordFieldListFromRaw(Raw::Element e) { result = TRecordFieldList(e) }
+
   /**
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TRecordPat`, if possible.
    */
-  cached
   TRecordPat convertRecordPatFromRaw(Raw::Element e) { result = TRecordPat(e) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TRecordPatField`, if possible.
    */
-  cached
   TRecordPatField convertRecordPatFieldFromRaw(Raw::Element e) { result = TRecordPatField(e) }
 
+  /**
+   * INTERNAL: Do not use.
+   * Converts a raw element to a synthesized `TRecordPatFieldList`, if possible.
+   */
+  TRecordPatFieldList convertRecordPatFieldListFromRaw(Raw::Element e) {
+    result = TRecordPatFieldList(e)
+  }
+
   /**
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TRefExpr`, if possible.
    */
-  cached
   TRefExpr convertRefExprFromRaw(Raw::Element e) { result = TRefExpr(e) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TRefPat`, if possible.
    */
-  cached
   TRefPat convertRefPatFromRaw(Raw::Element e) { result = TRefPat(e) }
 
   /**
    * INTERNAL: Do not use.
-   * Converts a raw element to a synthesized `TRepeatExpr`, if possible.
+   * Converts a raw element to a synthesized `TRefType`, if possible.
    */
-  cached
-  TRepeatExpr convertRepeatExprFromRaw(Raw::Element e) { result = TRepeatExpr(e) }
+  TRefType convertRefTypeFromRaw(Raw::Element e) { result = TRefType(e) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a raw element to a synthesized `TRename`, if possible.
+   */
+  TRename convertRenameFromRaw(Raw::Element e) { result = TRename(e) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a raw element to a synthesized `TRestPat`, if possible.
+   */
+  TRestPat convertRestPatFromRaw(Raw::Element e) { result = TRestPat(e) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a raw element to a synthesized `TRetType`, if possible.
+   */
+  TRetType convertRetTypeFromRaw(Raw::Element e) { result = TRetType(e) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TReturnExpr`, if possible.
    */
-  cached
   TReturnExpr convertReturnExprFromRaw(Raw::Element e) { result = TReturnExpr(e) }
 
+  /**
+   * INTERNAL: Do not use.
+   * Converts a raw element to a synthesized `TReturnTypeSyntax`, if possible.
+   */
+  TReturnTypeSyntax convertReturnTypeSyntaxFromRaw(Raw::Element e) { result = TReturnTypeSyntax(e) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a raw element to a synthesized `TSelfParam`, if possible.
+   */
+  TSelfParam convertSelfParamFromRaw(Raw::Element e) { result = TSelfParam(e) }
+
   /**
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TSlicePat`, if possible.
    */
-  cached
   TSlicePat convertSlicePatFromRaw(Raw::Element e) { result = TSlicePat(e) }
 
+  /**
+   * INTERNAL: Do not use.
+   * Converts a raw element to a synthesized `TSliceType`, if possible.
+   */
+  TSliceType convertSliceTypeFromRaw(Raw::Element e) { result = TSliceType(e) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a raw element to a synthesized `TSourceFile`, if possible.
+   */
+  TSourceFile convertSourceFileFromRaw(Raw::Element e) { result = TSourceFile(e) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a raw element to a synthesized `TStatic`, if possible.
+   */
+  TStatic convertStaticFromRaw(Raw::Element e) { result = TStatic(e) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a raw element to a synthesized `TStmtList`, if possible.
+   */
+  TStmtList convertStmtListFromRaw(Raw::Element e) { result = TStmtList(e) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a raw element to a synthesized `TStruct`, if possible.
+   */
+  TStruct convertStructFromRaw(Raw::Element e) { result = TStruct(e) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a raw element to a synthesized `TTokenTree`, if possible.
+   */
+  TTokenTree convertTokenTreeFromRaw(Raw::Element e) { result = TTokenTree(e) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a raw element to a synthesized `TTrait`, if possible.
+   */
+  TTrait convertTraitFromRaw(Raw::Element e) { result = TTrait(e) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a raw element to a synthesized `TTraitAlias`, if possible.
+   */
+  TTraitAlias convertTraitAliasFromRaw(Raw::Element e) { result = TTraitAlias(e) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a raw element to a synthesized `TTryExpr`, if possible.
+   */
+  TTryExpr convertTryExprFromRaw(Raw::Element e) { result = TTryExpr(e) }
+
   /**
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TTupleExpr`, if possible.
    */
-  cached
   TTupleExpr convertTupleExprFromRaw(Raw::Element e) { result = TTupleExpr(e) }
 
+  /**
+   * INTERNAL: Do not use.
+   * Converts a raw element to a synthesized `TTupleField`, if possible.
+   */
+  TTupleField convertTupleFieldFromRaw(Raw::Element e) { result = TTupleField(e) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a raw element to a synthesized `TTupleFieldList`, if possible.
+   */
+  TTupleFieldList convertTupleFieldListFromRaw(Raw::Element e) { result = TTupleFieldList(e) }
+
   /**
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TTuplePat`, if possible.
    */
-  cached
   TTuplePat convertTuplePatFromRaw(Raw::Element e) { result = TTuplePat(e) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TTupleStructPat`, if possible.
    */
-  cached
   TTupleStructPat convertTupleStructPatFromRaw(Raw::Element e) { result = TTupleStructPat(e) }
 
   /**
    * INTERNAL: Do not use.
-   * Converts a raw element to a synthesized `TTypeRef`, if possible.
+   * Converts a raw element to a synthesized `TTupleType`, if possible.
    */
-  cached
-  TTypeRef convertTypeRefFromRaw(Raw::Element e) { result = TTypeRef(e) }
+  TTupleType convertTupleTypeFromRaw(Raw::Element e) { result = TTupleType(e) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a raw element to a synthesized `TTypeAlias`, if possible.
+   */
+  TTypeAlias convertTypeAliasFromRaw(Raw::Element e) { result = TTypeAlias(e) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a raw element to a synthesized `TTypeArg`, if possible.
+   */
+  TTypeArg convertTypeArgFromRaw(Raw::Element e) { result = TTypeArg(e) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a raw element to a synthesized `TTypeBound`, if possible.
+   */
+  TTypeBound convertTypeBoundFromRaw(Raw::Element e) { result = TTypeBound(e) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a raw element to a synthesized `TTypeBoundList`, if possible.
+   */
+  TTypeBoundList convertTypeBoundListFromRaw(Raw::Element e) { result = TTypeBoundList(e) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a raw element to a synthesized `TTypeParam`, if possible.
+   */
+  TTypeParam convertTypeParamFromRaw(Raw::Element e) { result = TTypeParam(e) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TUnderscoreExpr`, if possible.
    */
-  cached
   TUnderscoreExpr convertUnderscoreExprFromRaw(Raw::Element e) { result = TUnderscoreExpr(e) }
 
   /**
    * INTERNAL: Do not use.
-   * Converts a raw element to a synthesized `TUnimplementedDeclaration`, if possible.
+   * Converts a raw element to a synthesized `TUnimplemented`, if possible.
    */
-  cached
-  TUnimplementedDeclaration convertUnimplementedDeclarationFromRaw(Raw::Element e) {
-    result = TUnimplementedDeclaration(e)
-  }
+  TUnimplemented convertUnimplementedFromRaw(Raw::Element e) { result = TUnimplemented(e) }
 
   /**
    * INTERNAL: Do not use.
-   * Converts a raw element to a synthesized `TUnsafeBlockExpr`, if possible.
+   * Converts a raw element to a synthesized `TUnion`, if possible.
    */
-  cached
-  TUnsafeBlockExpr convertUnsafeBlockExprFromRaw(Raw::Element e) { result = TUnsafeBlockExpr(e) }
+  TUnion convertUnionFromRaw(Raw::Element e) { result = TUnion(e) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a raw element to a synthesized `TUse`, if possible.
+   */
+  TUse convertUseFromRaw(Raw::Element e) { result = TUse(e) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a raw element to a synthesized `TUseTree`, if possible.
+   */
+  TUseTree convertUseTreeFromRaw(Raw::Element e) { result = TUseTree(e) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a raw element to a synthesized `TUseTreeList`, if possible.
+   */
+  TUseTreeList convertUseTreeListFromRaw(Raw::Element e) { result = TUseTreeList(e) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a raw element to a synthesized `TVariant`, if possible.
+   */
+  TVariant convertVariantFromRaw(Raw::Element e) { result = TVariant(e) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a raw element to a synthesized `TVariantList`, if possible.
+   */
+  TVariantList convertVariantListFromRaw(Raw::Element e) { result = TVariantList(e) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a raw element to a synthesized `TVisibility`, if possible.
+   */
+  TVisibility convertVisibilityFromRaw(Raw::Element e) { result = TVisibility(e) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a raw element to a synthesized `TWhereClause`, if possible.
+   */
+  TWhereClause convertWhereClauseFromRaw(Raw::Element e) { result = TWhereClause(e) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a raw element to a synthesized `TWherePred`, if possible.
+   */
+  TWherePred convertWherePredFromRaw(Raw::Element e) { result = TWherePred(e) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a raw element to a synthesized `TWhileExpr`, if possible.
+   */
+  TWhileExpr convertWhileExprFromRaw(Raw::Element e) { result = TWhileExpr(e) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TWildcardPat`, if possible.
    */
-  cached
   TWildcardPat convertWildcardPatFromRaw(Raw::Element e) { result = TWildcardPat(e) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TYeetExpr`, if possible.
    */
-  cached
   TYeetExpr convertYeetExprFromRaw(Raw::Element e) { result = TYeetExpr(e) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TYieldExpr`, if possible.
    */
-  cached
   TYieldExpr convertYieldExprFromRaw(Raw::Element e) { result = TYieldExpr(e) }
 
   /**
    * INTERNAL: Do not use.
-   * Converts a raw DB element to a synthesized `TArrayExpr`, if possible.
+   * Converts a raw DB element to a synthesized `TAssocItem`, if possible.
    */
-  cached
-  TArrayExpr convertArrayExprFromRaw(Raw::Element e) {
-    result = convertElementListExprFromRaw(e)
+  TAssocItem convertAssocItemFromRaw(Raw::Element e) {
+    result = convertConstFromRaw(e)
     or
-    result = convertRepeatExprFromRaw(e)
+    result = convertFunctionFromRaw(e)
+    or
+    result = convertMacroCallFromRaw(e)
+    or
+    result = convertTypeAliasFromRaw(e)
   }
 
   /**
    * INTERNAL: Do not use.
    * Converts a raw DB element to a synthesized `TAstNode`, if possible.
    */
-  cached
   TAstNode convertAstNodeFromRaw(Raw::Element e) {
-    result = convertDeclarationFromRaw(e)
+    result = convertAbiFromRaw(e)
+    or
+    result = convertArgListFromRaw(e)
+    or
+    result = convertAssocItemFromRaw(e)
+    or
+    result = convertAssocItemListFromRaw(e)
+    or
+    result = convertAttrFromRaw(e)
+    or
+    result = convertCallableFromRaw(e)
+    or
+    result = convertClosureBinderFromRaw(e)
     or
     result = convertExprFromRaw(e)
     or
+    result = convertExternItemFromRaw(e)
+    or
+    result = convertExternItemListFromRaw(e)
+    or
+    result = convertFieldListFromRaw(e)
+    or
+    result = convertFormatArgsArgFromRaw(e)
+    or
+    result = convertGenericArgFromRaw(e)
+    or
     result = convertGenericArgListFromRaw(e)
     or
+    result = convertGenericParamFromRaw(e)
+    or
+    result = convertGenericParamListFromRaw(e)
+    or
+    result = convertItemListFromRaw(e)
+    or
     result = convertLabelFromRaw(e)
     or
+    result = convertLetElseFromRaw(e)
+    or
+    result = convertLifetimeFromRaw(e)
+    or
+    result = convertMacroItemsFromRaw(e)
+    or
+    result = convertMacroStmtsFromRaw(e)
+    or
     result = convertMatchArmFromRaw(e)
     or
+    result = convertMatchArmListFromRaw(e)
+    or
+    result = convertMatchGuardFromRaw(e)
+    or
+    result = convertMetaFromRaw(e)
+    or
+    result = convertNameFromRaw(e)
+    or
+    result = convertNameRefFromRaw(e)
+    or
+    result = convertParamFromRaw(e)
+    or
+    result = convertParamListFromRaw(e)
+    or
     result = convertPatFromRaw(e)
     or
-    result = convertPathFromRaw(e)
+    result = convertPathSegmentFromRaw(e)
     or
     result = convertRecordExprFieldFromRaw(e)
     or
+    result = convertRecordExprFieldListFromRaw(e)
+    or
+    result = convertRecordFieldFromRaw(e)
+    or
     result = convertRecordPatFieldFromRaw(e)
     or
+    result = convertRecordPatFieldListFromRaw(e)
+    or
+    result = convertRenameFromRaw(e)
+    or
+    result = convertResolvableFromRaw(e)
+    or
+    result = convertRetTypeFromRaw(e)
+    or
+    result = convertReturnTypeSyntaxFromRaw(e)
+    or
+    result = convertSelfParamFromRaw(e)
+    or
+    result = convertSourceFileFromRaw(e)
+    or
     result = convertStmtFromRaw(e)
     or
+    result = convertStmtListFromRaw(e)
+    or
+    result = convertTokenFromRaw(e)
+    or
+    result = convertTokenTreeFromRaw(e)
+    or
+    result = convertTupleFieldFromRaw(e)
+    or
+    result = convertTypeBoundFromRaw(e)
+    or
+    result = convertTypeBoundListFromRaw(e)
+    or
     result = convertTypeRefFromRaw(e)
+    or
+    result = convertUseTreeFromRaw(e)
+    or
+    result = convertUseTreeListFromRaw(e)
+    or
+    result = convertVariantFromRaw(e)
+    or
+    result = convertVariantListFromRaw(e)
+    or
+    result = convertVisibilityFromRaw(e)
+    or
+    result = convertWhereClauseFromRaw(e)
+    or
+    result = convertWherePredFromRaw(e)
   }
 
   /**
    * INTERNAL: Do not use.
-   * Converts a raw DB element to a synthesized `TBlockExprBase`, if possible.
+   * Converts a raw DB element to a synthesized `TCallExprBase`, if possible.
    */
-  cached
-  TBlockExprBase convertBlockExprBaseFromRaw(Raw::Element e) {
-    result = convertAsyncBlockExprFromRaw(e)
+  TCallExprBase convertCallExprBaseFromRaw(Raw::Element e) {
+    result = convertCallExprFromRaw(e)
     or
-    result = convertBlockExprFromRaw(e)
-    or
-    result = convertUnsafeBlockExprFromRaw(e)
+    result = convertMethodCallExprFromRaw(e)
   }
 
   /**
    * INTERNAL: Do not use.
-   * Converts a raw DB element to a synthesized `TDeclaration`, if possible.
+   * Converts a raw DB element to a synthesized `TCallable`, if possible.
    */
-  cached
-  TDeclaration convertDeclarationFromRaw(Raw::Element e) {
+  TCallable convertCallableFromRaw(Raw::Element e) {
+    result = convertClosureExprFromRaw(e)
+    or
     result = convertFunctionFromRaw(e)
-    or
-    result = convertModuleFromRaw(e)
-    or
-    result = convertUnimplementedDeclarationFromRaw(e)
   }
 
   /**
    * INTERNAL: Do not use.
    * Converts a raw DB element to a synthesized `TElement`, if possible.
    */
-  cached
   TElement convertElementFromRaw(Raw::Element e) {
     result = convertLocatableFromRaw(e)
     or
@@ -860,7 +1784,6 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a raw DB element to a synthesized `TExpr`, if possible.
    */
-  cached
   TExpr convertExprFromRaw(Raw::Element e) {
     result = convertArrayExprFromRaw(e)
     or
@@ -872,24 +1795,24 @@ module Synth {
     or
     result = convertBinaryExprFromRaw(e)
     or
-    result = convertBlockExprBaseFromRaw(e)
-    or
-    result = convertBoxExprFromRaw(e)
+    result = convertBlockExprFromRaw(e)
     or
     result = convertBreakExprFromRaw(e)
     or
-    result = convertCallExprFromRaw(e)
+    result = convertCallExprBaseFromRaw(e)
     or
     result = convertCastExprFromRaw(e)
     or
     result = convertClosureExprFromRaw(e)
     or
-    result = convertConstExprFromRaw(e)
-    or
     result = convertContinueExprFromRaw(e)
     or
     result = convertFieldExprFromRaw(e)
     or
+    result = convertForExprFromRaw(e)
+    or
+    result = convertFormatArgsExprFromRaw(e)
+    or
     result = convertIfExprFromRaw(e)
     or
     result = convertIndexExprFromRaw(e)
@@ -900,15 +1823,15 @@ module Synth {
     or
     result = convertLoopExprFromRaw(e)
     or
+    result = convertMacroExprFromRaw(e)
+    or
     result = convertMatchExprFromRaw(e)
     or
-    result = convertMethodCallExprFromRaw(e)
-    or
-    result = convertMissingExprFromRaw(e)
-    or
     result = convertOffsetOfExprFromRaw(e)
     or
-    result = convertPathExprFromRaw(e)
+    result = convertParenExprFromRaw(e)
+    or
+    result = convertPathExprBaseFromRaw(e)
     or
     result = convertPrefixExprFromRaw(e)
     or
@@ -920,10 +1843,14 @@ module Synth {
     or
     result = convertReturnExprFromRaw(e)
     or
+    result = convertTryExprFromRaw(e)
+    or
     result = convertTupleExprFromRaw(e)
     or
     result = convertUnderscoreExprFromRaw(e)
     or
+    result = convertWhileExprFromRaw(e)
+    or
     result = convertYeetExprFromRaw(e)
     or
     result = convertYieldExprFromRaw(e)
@@ -931,27 +1858,110 @@ module Synth {
 
   /**
    * INTERNAL: Do not use.
-   * Converts a raw DB element to a synthesized `TLocatable`, if possible.
+   * Converts a raw DB element to a synthesized `TExternItem`, if possible.
    */
-  cached
-  TLocatable convertLocatableFromRaw(Raw::Element e) { result = convertAstNodeFromRaw(e) }
+  TExternItem convertExternItemFromRaw(Raw::Element e) {
+    result = convertFunctionFromRaw(e)
+    or
+    result = convertMacroCallFromRaw(e)
+    or
+    result = convertStaticFromRaw(e)
+    or
+    result = convertTypeAliasFromRaw(e)
+  }
 
   /**
    * INTERNAL: Do not use.
-   * Converts a raw DB element to a synthesized `TMissing`, if possible.
+   * Converts a raw DB element to a synthesized `TFieldList`, if possible.
    */
-  cached
-  TMissing convertMissingFromRaw(Raw::Element e) {
-    result = convertMissingExprFromRaw(e)
+  TFieldList convertFieldListFromRaw(Raw::Element e) {
+    result = convertRecordFieldListFromRaw(e)
     or
-    result = convertMissingPatFromRaw(e)
+    result = convertTupleFieldListFromRaw(e)
+  }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a raw DB element to a synthesized `TGenericArg`, if possible.
+   */
+  TGenericArg convertGenericArgFromRaw(Raw::Element e) {
+    result = convertAssocTypeArgFromRaw(e)
+    or
+    result = convertConstArgFromRaw(e)
+    or
+    result = convertLifetimeArgFromRaw(e)
+    or
+    result = convertTypeArgFromRaw(e)
+  }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a raw DB element to a synthesized `TGenericParam`, if possible.
+   */
+  TGenericParam convertGenericParamFromRaw(Raw::Element e) {
+    result = convertConstParamFromRaw(e)
+    or
+    result = convertLifetimeParamFromRaw(e)
+    or
+    result = convertTypeParamFromRaw(e)
+  }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a raw DB element to a synthesized `TItem`, if possible.
+   */
+  TItem convertItemFromRaw(Raw::Element e) {
+    result = convertConstFromRaw(e)
+    or
+    result = convertEnumFromRaw(e)
+    or
+    result = convertExternBlockFromRaw(e)
+    or
+    result = convertExternCrateFromRaw(e)
+    or
+    result = convertFunctionFromRaw(e)
+    or
+    result = convertImplFromRaw(e)
+    or
+    result = convertMacroCallFromRaw(e)
+    or
+    result = convertMacroDefFromRaw(e)
+    or
+    result = convertMacroRulesFromRaw(e)
+    or
+    result = convertModuleFromRaw(e)
+    or
+    result = convertStaticFromRaw(e)
+    or
+    result = convertStructFromRaw(e)
+    or
+    result = convertTraitFromRaw(e)
+    or
+    result = convertTraitAliasFromRaw(e)
+    or
+    result = convertTypeAliasFromRaw(e)
+    or
+    result = convertUnionFromRaw(e)
+    or
+    result = convertUseFromRaw(e)
+  }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a raw DB element to a synthesized `TLocatable`, if possible.
+   */
+  TLocatable convertLocatableFromRaw(Raw::Element e) {
+    result = convertAstNodeFromRaw(e)
+    or
+    result = convertFormatFromRaw(e)
+    or
+    result = convertFormatArgumentFromRaw(e)
   }
 
   /**
    * INTERNAL: Do not use.
    * Converts a raw DB element to a synthesized `TPat`, if possible.
    */
-  cached
   TPat convertPatFromRaw(Raw::Element e) {
     result = convertBoxPatFromRaw(e)
     or
@@ -961,10 +1971,12 @@ module Synth {
     or
     result = convertLiteralPatFromRaw(e)
     or
-    result = convertMissingPatFromRaw(e)
+    result = convertMacroPatFromRaw(e)
     or
     result = convertOrPatFromRaw(e)
     or
+    result = convertParenPatFromRaw(e)
+    or
     result = convertPathPatFromRaw(e)
     or
     result = convertRangePatFromRaw(e)
@@ -973,6 +1985,8 @@ module Synth {
     or
     result = convertRefPatFromRaw(e)
     or
+    result = convertRestPatFromRaw(e)
+    or
     result = convertSlicePatFromRaw(e)
     or
     result = convertTuplePatFromRaw(e)
@@ -982,24 +1996,82 @@ module Synth {
     result = convertWildcardPatFromRaw(e)
   }
 
+  /**
+   * INTERNAL: Do not use.
+   * Converts a raw DB element to a synthesized `TPathExprBase`, if possible.
+   */
+  TPathExprBase convertPathExprBaseFromRaw(Raw::Element e) {
+    result = convertFormatTemplateVariableAccessFromRaw(e)
+    or
+    result = convertPathExprFromRaw(e)
+  }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a raw DB element to a synthesized `TResolvable`, if possible.
+   */
+  TResolvable convertResolvableFromRaw(Raw::Element e) {
+    result = convertMethodCallExprFromRaw(e)
+    or
+    result = convertPathFromRaw(e)
+  }
+
   /**
    * INTERNAL: Do not use.
    * Converts a raw DB element to a synthesized `TStmt`, if possible.
    */
-  cached
   TStmt convertStmtFromRaw(Raw::Element e) {
     result = convertExprStmtFromRaw(e)
     or
-    result = convertItemStmtFromRaw(e)
+    result = convertItemFromRaw(e)
     or
     result = convertLetStmtFromRaw(e)
   }
 
+  /**
+   * INTERNAL: Do not use.
+   * Converts a raw DB element to a synthesized `TToken`, if possible.
+   */
+  TToken convertTokenFromRaw(Raw::Element e) { result = convertCommentFromRaw(e) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a raw DB element to a synthesized `TTypeRef`, if possible.
+   */
+  TTypeRef convertTypeRefFromRaw(Raw::Element e) {
+    result = convertArrayTypeFromRaw(e)
+    or
+    result = convertDynTraitTypeFromRaw(e)
+    or
+    result = convertFnPtrTypeFromRaw(e)
+    or
+    result = convertForTypeFromRaw(e)
+    or
+    result = convertImplTraitTypeFromRaw(e)
+    or
+    result = convertInferTypeFromRaw(e)
+    or
+    result = convertMacroTypeFromRaw(e)
+    or
+    result = convertNeverTypeFromRaw(e)
+    or
+    result = convertParenTypeFromRaw(e)
+    or
+    result = convertPathTypeFromRaw(e)
+    or
+    result = convertPtrTypeFromRaw(e)
+    or
+    result = convertRefTypeFromRaw(e)
+    or
+    result = convertSliceTypeFromRaw(e)
+    or
+    result = convertTupleTypeFromRaw(e)
+  }
+
   /**
    * INTERNAL: Do not use.
    * Converts a raw DB element to a synthesized `TUnextracted`, if possible.
    */
-  cached
   TUnextracted convertUnextractedFromRaw(Raw::Element e) {
     result = convertMissingFromRaw(e)
     or
@@ -1008,533 +2080,1050 @@ module Synth {
 
   /**
    * INTERNAL: Do not use.
-   * Converts a raw DB element to a synthesized `TUnimplemented`, if possible.
+   * Converts a synthesized `TAbi` to a raw DB element, if possible.
    */
-  cached
-  TUnimplemented convertUnimplementedFromRaw(Raw::Element e) {
-    result = convertGenericArgListFromRaw(e)
-    or
-    result = convertPathFromRaw(e)
-    or
-    result = convertTypeRefFromRaw(e)
-    or
-    result = convertUnimplementedDeclarationFromRaw(e)
-  }
+  Raw::Element convertAbiToRaw(TAbi e) { e = TAbi(result) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a synthesized `TArgList` to a raw DB element, if possible.
+   */
+  Raw::Element convertArgListToRaw(TArgList e) { e = TArgList(result) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a synthesized `TArrayExpr` to a raw DB element, if possible.
+   */
+  Raw::Element convertArrayExprToRaw(TArrayExpr e) { e = TArrayExpr(result) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a synthesized `TArrayType` to a raw DB element, if possible.
+   */
+  Raw::Element convertArrayTypeToRaw(TArrayType e) { e = TArrayType(result) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a synthesized `TAsmExpr` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertAsmExprToRaw(TAsmExpr e) { e = TAsmExpr(result) }
 
   /**
    * INTERNAL: Do not use.
-   * Converts a synthesized `TAsyncBlockExpr` to a raw DB element, if possible.
+   * Converts a synthesized `TAssocItemList` to a raw DB element, if possible.
    */
-  cached
-  Raw::Element convertAsyncBlockExprToRaw(TAsyncBlockExpr e) { e = TAsyncBlockExpr(result) }
+  Raw::Element convertAssocItemListToRaw(TAssocItemList e) { e = TAssocItemList(result) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a synthesized `TAssocTypeArg` to a raw DB element, if possible.
+   */
+  Raw::Element convertAssocTypeArgToRaw(TAssocTypeArg e) { e = TAssocTypeArg(result) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a synthesized `TAttr` to a raw DB element, if possible.
+   */
+  Raw::Element convertAttrToRaw(TAttr e) { e = TAttr(result) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a synthesized `TAwaitExpr` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertAwaitExprToRaw(TAwaitExpr e) { e = TAwaitExpr(result) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a synthesized `TBecomeExpr` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertBecomeExprToRaw(TBecomeExpr e) { e = TBecomeExpr(result) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a synthesized `TBinaryExpr` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertBinaryExprToRaw(TBinaryExpr e) { e = TBinaryExpr(result) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a synthesized `TBlockExpr` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertBlockExprToRaw(TBlockExpr e) { e = TBlockExpr(result) }
 
-  /**
-   * INTERNAL: Do not use.
-   * Converts a synthesized `TBoxExpr` to a raw DB element, if possible.
-   */
-  cached
-  Raw::Element convertBoxExprToRaw(TBoxExpr e) { e = TBoxExpr(result) }
-
   /**
    * INTERNAL: Do not use.
    * Converts a synthesized `TBoxPat` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertBoxPatToRaw(TBoxPat e) { e = TBoxPat(result) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a synthesized `TBreakExpr` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertBreakExprToRaw(TBreakExpr e) { e = TBreakExpr(result) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a synthesized `TCallExpr` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertCallExprToRaw(TCallExpr e) { e = TCallExpr(result) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a synthesized `TCastExpr` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertCastExprToRaw(TCastExpr e) { e = TCastExpr(result) }
 
+  /**
+   * INTERNAL: Do not use.
+   * Converts a synthesized `TClosureBinder` to a raw DB element, if possible.
+   */
+  Raw::Element convertClosureBinderToRaw(TClosureBinder e) { e = TClosureBinder(result) }
+
   /**
    * INTERNAL: Do not use.
    * Converts a synthesized `TClosureExpr` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertClosureExprToRaw(TClosureExpr e) { e = TClosureExpr(result) }
 
+  /**
+   * INTERNAL: Do not use.
+   * Converts a synthesized `TComment` to a raw DB element, if possible.
+   */
+  Raw::Element convertCommentToRaw(TComment e) { e = TComment(result) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a synthesized `TConst` to a raw DB element, if possible.
+   */
+  Raw::Element convertConstToRaw(TConst e) { e = TConst(result) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a synthesized `TConstArg` to a raw DB element, if possible.
+   */
+  Raw::Element convertConstArgToRaw(TConstArg e) { e = TConstArg(result) }
+
   /**
    * INTERNAL: Do not use.
    * Converts a synthesized `TConstBlockPat` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertConstBlockPatToRaw(TConstBlockPat e) { e = TConstBlockPat(result) }
 
   /**
    * INTERNAL: Do not use.
-   * Converts a synthesized `TConstExpr` to a raw DB element, if possible.
+   * Converts a synthesized `TConstParam` to a raw DB element, if possible.
    */
-  cached
-  Raw::Element convertConstExprToRaw(TConstExpr e) { e = TConstExpr(result) }
+  Raw::Element convertConstParamToRaw(TConstParam e) { e = TConstParam(result) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a synthesized `TContinueExpr` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertContinueExprToRaw(TContinueExpr e) { e = TContinueExpr(result) }
 
   /**
    * INTERNAL: Do not use.
-   * Converts a synthesized `TElementListExpr` to a raw DB element, if possible.
+   * Converts a synthesized `TDynTraitType` to a raw DB element, if possible.
    */
-  cached
-  Raw::Element convertElementListExprToRaw(TElementListExpr e) { e = TElementListExpr(result) }
+  Raw::Element convertDynTraitTypeToRaw(TDynTraitType e) { e = TDynTraitType(result) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a synthesized `TEnum` to a raw DB element, if possible.
+   */
+  Raw::Element convertEnumToRaw(TEnum e) { e = TEnum(result) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a synthesized `TExprStmt` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertExprStmtToRaw(TExprStmt e) { e = TExprStmt(result) }
 
+  /**
+   * INTERNAL: Do not use.
+   * Converts a synthesized `TExternBlock` to a raw DB element, if possible.
+   */
+  Raw::Element convertExternBlockToRaw(TExternBlock e) { e = TExternBlock(result) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a synthesized `TExternCrate` to a raw DB element, if possible.
+   */
+  Raw::Element convertExternCrateToRaw(TExternCrate e) { e = TExternCrate(result) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a synthesized `TExternItemList` to a raw DB element, if possible.
+   */
+  Raw::Element convertExternItemListToRaw(TExternItemList e) { e = TExternItemList(result) }
+
   /**
    * INTERNAL: Do not use.
    * Converts a synthesized `TFieldExpr` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertFieldExprToRaw(TFieldExpr e) { e = TFieldExpr(result) }
 
+  /**
+   * INTERNAL: Do not use.
+   * Converts a synthesized `TFnPtrType` to a raw DB element, if possible.
+   */
+  Raw::Element convertFnPtrTypeToRaw(TFnPtrType e) { e = TFnPtrType(result) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a synthesized `TForExpr` to a raw DB element, if possible.
+   */
+  Raw::Element convertForExprToRaw(TForExpr e) { e = TForExpr(result) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a synthesized `TForType` to a raw DB element, if possible.
+   */
+  Raw::Element convertForTypeToRaw(TForType e) { e = TForType(result) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a synthesized `TFormat` to a raw DB element, if possible.
+   */
+  Raw::Element convertFormatToRaw(TFormat e) { none() }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a synthesized `TFormatArgsArg` to a raw DB element, if possible.
+   */
+  Raw::Element convertFormatArgsArgToRaw(TFormatArgsArg e) { e = TFormatArgsArg(result) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a synthesized `TFormatArgsExpr` to a raw DB element, if possible.
+   */
+  Raw::Element convertFormatArgsExprToRaw(TFormatArgsExpr e) { e = TFormatArgsExpr(result) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a synthesized `TFormatArgument` to a raw DB element, if possible.
+   */
+  Raw::Element convertFormatArgumentToRaw(TFormatArgument e) { none() }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a synthesized `TFormatTemplateVariableAccess` to a raw DB element, if possible.
+   */
+  Raw::Element convertFormatTemplateVariableAccessToRaw(TFormatTemplateVariableAccess e) { none() }
+
   /**
    * INTERNAL: Do not use.
    * Converts a synthesized `TFunction` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertFunctionToRaw(TFunction e) { e = TFunction(result) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a synthesized `TGenericArgList` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertGenericArgListToRaw(TGenericArgList e) { e = TGenericArgList(result) }
 
+  /**
+   * INTERNAL: Do not use.
+   * Converts a synthesized `TGenericParamList` to a raw DB element, if possible.
+   */
+  Raw::Element convertGenericParamListToRaw(TGenericParamList e) { e = TGenericParamList(result) }
+
   /**
    * INTERNAL: Do not use.
    * Converts a synthesized `TIdentPat` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertIdentPatToRaw(TIdentPat e) { e = TIdentPat(result) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a synthesized `TIfExpr` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertIfExprToRaw(TIfExpr e) { e = TIfExpr(result) }
 
+  /**
+   * INTERNAL: Do not use.
+   * Converts a synthesized `TImpl` to a raw DB element, if possible.
+   */
+  Raw::Element convertImplToRaw(TImpl e) { e = TImpl(result) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a synthesized `TImplTraitType` to a raw DB element, if possible.
+   */
+  Raw::Element convertImplTraitTypeToRaw(TImplTraitType e) { e = TImplTraitType(result) }
+
   /**
    * INTERNAL: Do not use.
    * Converts a synthesized `TIndexExpr` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertIndexExprToRaw(TIndexExpr e) { e = TIndexExpr(result) }
 
   /**
    * INTERNAL: Do not use.
-   * Converts a synthesized `TItemStmt` to a raw DB element, if possible.
+   * Converts a synthesized `TInferType` to a raw DB element, if possible.
    */
-  cached
-  Raw::Element convertItemStmtToRaw(TItemStmt e) { e = TItemStmt(result) }
+  Raw::Element convertInferTypeToRaw(TInferType e) { e = TInferType(result) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a synthesized `TItemList` to a raw DB element, if possible.
+   */
+  Raw::Element convertItemListToRaw(TItemList e) { e = TItemList(result) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a synthesized `TLabel` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertLabelToRaw(TLabel e) { e = TLabel(result) }
 
+  /**
+   * INTERNAL: Do not use.
+   * Converts a synthesized `TLetElse` to a raw DB element, if possible.
+   */
+  Raw::Element convertLetElseToRaw(TLetElse e) { e = TLetElse(result) }
+
   /**
    * INTERNAL: Do not use.
    * Converts a synthesized `TLetExpr` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertLetExprToRaw(TLetExpr e) { e = TLetExpr(result) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a synthesized `TLetStmt` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertLetStmtToRaw(TLetStmt e) { e = TLetStmt(result) }
 
+  /**
+   * INTERNAL: Do not use.
+   * Converts a synthesized `TLifetime` to a raw DB element, if possible.
+   */
+  Raw::Element convertLifetimeToRaw(TLifetime e) { e = TLifetime(result) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a synthesized `TLifetimeArg` to a raw DB element, if possible.
+   */
+  Raw::Element convertLifetimeArgToRaw(TLifetimeArg e) { e = TLifetimeArg(result) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a synthesized `TLifetimeParam` to a raw DB element, if possible.
+   */
+  Raw::Element convertLifetimeParamToRaw(TLifetimeParam e) { e = TLifetimeParam(result) }
+
   /**
    * INTERNAL: Do not use.
    * Converts a synthesized `TLiteralExpr` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertLiteralExprToRaw(TLiteralExpr e) { e = TLiteralExpr(result) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a synthesized `TLiteralPat` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertLiteralPatToRaw(TLiteralPat e) { e = TLiteralPat(result) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a synthesized `TLoopExpr` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertLoopExprToRaw(TLoopExpr e) { e = TLoopExpr(result) }
 
+  /**
+   * INTERNAL: Do not use.
+   * Converts a synthesized `TMacroCall` to a raw DB element, if possible.
+   */
+  Raw::Element convertMacroCallToRaw(TMacroCall e) { e = TMacroCall(result) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a synthesized `TMacroDef` to a raw DB element, if possible.
+   */
+  Raw::Element convertMacroDefToRaw(TMacroDef e) { e = TMacroDef(result) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a synthesized `TMacroExpr` to a raw DB element, if possible.
+   */
+  Raw::Element convertMacroExprToRaw(TMacroExpr e) { e = TMacroExpr(result) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a synthesized `TMacroItems` to a raw DB element, if possible.
+   */
+  Raw::Element convertMacroItemsToRaw(TMacroItems e) { e = TMacroItems(result) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a synthesized `TMacroPat` to a raw DB element, if possible.
+   */
+  Raw::Element convertMacroPatToRaw(TMacroPat e) { e = TMacroPat(result) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a synthesized `TMacroRules` to a raw DB element, if possible.
+   */
+  Raw::Element convertMacroRulesToRaw(TMacroRules e) { e = TMacroRules(result) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a synthesized `TMacroStmts` to a raw DB element, if possible.
+   */
+  Raw::Element convertMacroStmtsToRaw(TMacroStmts e) { e = TMacroStmts(result) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a synthesized `TMacroType` to a raw DB element, if possible.
+   */
+  Raw::Element convertMacroTypeToRaw(TMacroType e) { e = TMacroType(result) }
+
   /**
    * INTERNAL: Do not use.
    * Converts a synthesized `TMatchArm` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertMatchArmToRaw(TMatchArm e) { e = TMatchArm(result) }
 
+  /**
+   * INTERNAL: Do not use.
+   * Converts a synthesized `TMatchArmList` to a raw DB element, if possible.
+   */
+  Raw::Element convertMatchArmListToRaw(TMatchArmList e) { e = TMatchArmList(result) }
+
   /**
    * INTERNAL: Do not use.
    * Converts a synthesized `TMatchExpr` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertMatchExprToRaw(TMatchExpr e) { e = TMatchExpr(result) }
 
+  /**
+   * INTERNAL: Do not use.
+   * Converts a synthesized `TMatchGuard` to a raw DB element, if possible.
+   */
+  Raw::Element convertMatchGuardToRaw(TMatchGuard e) { e = TMatchGuard(result) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a synthesized `TMeta` to a raw DB element, if possible.
+   */
+  Raw::Element convertMetaToRaw(TMeta e) { e = TMeta(result) }
+
   /**
    * INTERNAL: Do not use.
    * Converts a synthesized `TMethodCallExpr` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertMethodCallExprToRaw(TMethodCallExpr e) { e = TMethodCallExpr(result) }
 
   /**
    * INTERNAL: Do not use.
-   * Converts a synthesized `TMissingExpr` to a raw DB element, if possible.
+   * Converts a synthesized `TMissing` to a raw DB element, if possible.
    */
-  cached
-  Raw::Element convertMissingExprToRaw(TMissingExpr e) { e = TMissingExpr(result) }
-
-  /**
-   * INTERNAL: Do not use.
-   * Converts a synthesized `TMissingPat` to a raw DB element, if possible.
-   */
-  cached
-  Raw::Element convertMissingPatToRaw(TMissingPat e) { e = TMissingPat(result) }
+  Raw::Element convertMissingToRaw(TMissing e) { e = TMissing(result) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a synthesized `TModule` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertModuleToRaw(TModule e) { e = TModule(result) }
 
+  /**
+   * INTERNAL: Do not use.
+   * Converts a synthesized `TName` to a raw DB element, if possible.
+   */
+  Raw::Element convertNameToRaw(TName e) { e = TName(result) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a synthesized `TNameRef` to a raw DB element, if possible.
+   */
+  Raw::Element convertNameRefToRaw(TNameRef e) { e = TNameRef(result) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a synthesized `TNeverType` to a raw DB element, if possible.
+   */
+  Raw::Element convertNeverTypeToRaw(TNeverType e) { e = TNeverType(result) }
+
   /**
    * INTERNAL: Do not use.
    * Converts a synthesized `TOffsetOfExpr` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertOffsetOfExprToRaw(TOffsetOfExpr e) { e = TOffsetOfExpr(result) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a synthesized `TOrPat` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertOrPatToRaw(TOrPat e) { e = TOrPat(result) }
 
+  /**
+   * INTERNAL: Do not use.
+   * Converts a synthesized `TParam` to a raw DB element, if possible.
+   */
+  Raw::Element convertParamToRaw(TParam e) { e = TParam(result) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a synthesized `TParamList` to a raw DB element, if possible.
+   */
+  Raw::Element convertParamListToRaw(TParamList e) { e = TParamList(result) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a synthesized `TParenExpr` to a raw DB element, if possible.
+   */
+  Raw::Element convertParenExprToRaw(TParenExpr e) { e = TParenExpr(result) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a synthesized `TParenPat` to a raw DB element, if possible.
+   */
+  Raw::Element convertParenPatToRaw(TParenPat e) { e = TParenPat(result) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a synthesized `TParenType` to a raw DB element, if possible.
+   */
+  Raw::Element convertParenTypeToRaw(TParenType e) { e = TParenType(result) }
+
   /**
    * INTERNAL: Do not use.
    * Converts a synthesized `TPath` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertPathToRaw(TPath e) { e = TPath(result) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a synthesized `TPathExpr` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertPathExprToRaw(TPathExpr e) { e = TPathExpr(result) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a synthesized `TPathPat` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertPathPatToRaw(TPathPat e) { e = TPathPat(result) }
 
+  /**
+   * INTERNAL: Do not use.
+   * Converts a synthesized `TPathSegment` to a raw DB element, if possible.
+   */
+  Raw::Element convertPathSegmentToRaw(TPathSegment e) { e = TPathSegment(result) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a synthesized `TPathType` to a raw DB element, if possible.
+   */
+  Raw::Element convertPathTypeToRaw(TPathType e) { e = TPathType(result) }
+
   /**
    * INTERNAL: Do not use.
    * Converts a synthesized `TPrefixExpr` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertPrefixExprToRaw(TPrefixExpr e) { e = TPrefixExpr(result) }
 
+  /**
+   * INTERNAL: Do not use.
+   * Converts a synthesized `TPtrType` to a raw DB element, if possible.
+   */
+  Raw::Element convertPtrTypeToRaw(TPtrType e) { e = TPtrType(result) }
+
   /**
    * INTERNAL: Do not use.
    * Converts a synthesized `TRangeExpr` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertRangeExprToRaw(TRangeExpr e) { e = TRangeExpr(result) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a synthesized `TRangePat` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertRangePatToRaw(TRangePat e) { e = TRangePat(result) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a synthesized `TRecordExpr` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertRecordExprToRaw(TRecordExpr e) { e = TRecordExpr(result) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a synthesized `TRecordExprField` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertRecordExprFieldToRaw(TRecordExprField e) { e = TRecordExprField(result) }
 
+  /**
+   * INTERNAL: Do not use.
+   * Converts a synthesized `TRecordExprFieldList` to a raw DB element, if possible.
+   */
+  Raw::Element convertRecordExprFieldListToRaw(TRecordExprFieldList e) {
+    e = TRecordExprFieldList(result)
+  }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a synthesized `TRecordField` to a raw DB element, if possible.
+   */
+  Raw::Element convertRecordFieldToRaw(TRecordField e) { e = TRecordField(result) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a synthesized `TRecordFieldList` to a raw DB element, if possible.
+   */
+  Raw::Element convertRecordFieldListToRaw(TRecordFieldList e) { e = TRecordFieldList(result) }
+
   /**
    * INTERNAL: Do not use.
    * Converts a synthesized `TRecordPat` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertRecordPatToRaw(TRecordPat e) { e = TRecordPat(result) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a synthesized `TRecordPatField` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertRecordPatFieldToRaw(TRecordPatField e) { e = TRecordPatField(result) }
 
+  /**
+   * INTERNAL: Do not use.
+   * Converts a synthesized `TRecordPatFieldList` to a raw DB element, if possible.
+   */
+  Raw::Element convertRecordPatFieldListToRaw(TRecordPatFieldList e) {
+    e = TRecordPatFieldList(result)
+  }
+
   /**
    * INTERNAL: Do not use.
    * Converts a synthesized `TRefExpr` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertRefExprToRaw(TRefExpr e) { e = TRefExpr(result) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a synthesized `TRefPat` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertRefPatToRaw(TRefPat e) { e = TRefPat(result) }
 
   /**
    * INTERNAL: Do not use.
-   * Converts a synthesized `TRepeatExpr` to a raw DB element, if possible.
+   * Converts a synthesized `TRefType` to a raw DB element, if possible.
    */
-  cached
-  Raw::Element convertRepeatExprToRaw(TRepeatExpr e) { e = TRepeatExpr(result) }
+  Raw::Element convertRefTypeToRaw(TRefType e) { e = TRefType(result) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a synthesized `TRename` to a raw DB element, if possible.
+   */
+  Raw::Element convertRenameToRaw(TRename e) { e = TRename(result) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a synthesized `TRestPat` to a raw DB element, if possible.
+   */
+  Raw::Element convertRestPatToRaw(TRestPat e) { e = TRestPat(result) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a synthesized `TRetType` to a raw DB element, if possible.
+   */
+  Raw::Element convertRetTypeToRaw(TRetType e) { e = TRetType(result) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a synthesized `TReturnExpr` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertReturnExprToRaw(TReturnExpr e) { e = TReturnExpr(result) }
 
+  /**
+   * INTERNAL: Do not use.
+   * Converts a synthesized `TReturnTypeSyntax` to a raw DB element, if possible.
+   */
+  Raw::Element convertReturnTypeSyntaxToRaw(TReturnTypeSyntax e) { e = TReturnTypeSyntax(result) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a synthesized `TSelfParam` to a raw DB element, if possible.
+   */
+  Raw::Element convertSelfParamToRaw(TSelfParam e) { e = TSelfParam(result) }
+
   /**
    * INTERNAL: Do not use.
    * Converts a synthesized `TSlicePat` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertSlicePatToRaw(TSlicePat e) { e = TSlicePat(result) }
 
+  /**
+   * INTERNAL: Do not use.
+   * Converts a synthesized `TSliceType` to a raw DB element, if possible.
+   */
+  Raw::Element convertSliceTypeToRaw(TSliceType e) { e = TSliceType(result) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a synthesized `TSourceFile` to a raw DB element, if possible.
+   */
+  Raw::Element convertSourceFileToRaw(TSourceFile e) { e = TSourceFile(result) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a synthesized `TStatic` to a raw DB element, if possible.
+   */
+  Raw::Element convertStaticToRaw(TStatic e) { e = TStatic(result) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a synthesized `TStmtList` to a raw DB element, if possible.
+   */
+  Raw::Element convertStmtListToRaw(TStmtList e) { e = TStmtList(result) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a synthesized `TStruct` to a raw DB element, if possible.
+   */
+  Raw::Element convertStructToRaw(TStruct e) { e = TStruct(result) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a synthesized `TTokenTree` to a raw DB element, if possible.
+   */
+  Raw::Element convertTokenTreeToRaw(TTokenTree e) { e = TTokenTree(result) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a synthesized `TTrait` to a raw DB element, if possible.
+   */
+  Raw::Element convertTraitToRaw(TTrait e) { e = TTrait(result) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a synthesized `TTraitAlias` to a raw DB element, if possible.
+   */
+  Raw::Element convertTraitAliasToRaw(TTraitAlias e) { e = TTraitAlias(result) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a synthesized `TTryExpr` to a raw DB element, if possible.
+   */
+  Raw::Element convertTryExprToRaw(TTryExpr e) { e = TTryExpr(result) }
+
   /**
    * INTERNAL: Do not use.
    * Converts a synthesized `TTupleExpr` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertTupleExprToRaw(TTupleExpr e) { e = TTupleExpr(result) }
 
+  /**
+   * INTERNAL: Do not use.
+   * Converts a synthesized `TTupleField` to a raw DB element, if possible.
+   */
+  Raw::Element convertTupleFieldToRaw(TTupleField e) { e = TTupleField(result) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a synthesized `TTupleFieldList` to a raw DB element, if possible.
+   */
+  Raw::Element convertTupleFieldListToRaw(TTupleFieldList e) { e = TTupleFieldList(result) }
+
   /**
    * INTERNAL: Do not use.
    * Converts a synthesized `TTuplePat` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertTuplePatToRaw(TTuplePat e) { e = TTuplePat(result) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a synthesized `TTupleStructPat` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertTupleStructPatToRaw(TTupleStructPat e) { e = TTupleStructPat(result) }
 
   /**
    * INTERNAL: Do not use.
-   * Converts a synthesized `TTypeRef` to a raw DB element, if possible.
+   * Converts a synthesized `TTupleType` to a raw DB element, if possible.
    */
-  cached
-  Raw::Element convertTypeRefToRaw(TTypeRef e) { e = TTypeRef(result) }
+  Raw::Element convertTupleTypeToRaw(TTupleType e) { e = TTupleType(result) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a synthesized `TTypeAlias` to a raw DB element, if possible.
+   */
+  Raw::Element convertTypeAliasToRaw(TTypeAlias e) { e = TTypeAlias(result) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a synthesized `TTypeArg` to a raw DB element, if possible.
+   */
+  Raw::Element convertTypeArgToRaw(TTypeArg e) { e = TTypeArg(result) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a synthesized `TTypeBound` to a raw DB element, if possible.
+   */
+  Raw::Element convertTypeBoundToRaw(TTypeBound e) { e = TTypeBound(result) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a synthesized `TTypeBoundList` to a raw DB element, if possible.
+   */
+  Raw::Element convertTypeBoundListToRaw(TTypeBoundList e) { e = TTypeBoundList(result) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a synthesized `TTypeParam` to a raw DB element, if possible.
+   */
+  Raw::Element convertTypeParamToRaw(TTypeParam e) { e = TTypeParam(result) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a synthesized `TUnderscoreExpr` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertUnderscoreExprToRaw(TUnderscoreExpr e) { e = TUnderscoreExpr(result) }
 
   /**
    * INTERNAL: Do not use.
-   * Converts a synthesized `TUnimplementedDeclaration` to a raw DB element, if possible.
+   * Converts a synthesized `TUnimplemented` to a raw DB element, if possible.
    */
-  cached
-  Raw::Element convertUnimplementedDeclarationToRaw(TUnimplementedDeclaration e) {
-    e = TUnimplementedDeclaration(result)
-  }
+  Raw::Element convertUnimplementedToRaw(TUnimplemented e) { e = TUnimplemented(result) }
 
   /**
    * INTERNAL: Do not use.
-   * Converts a synthesized `TUnsafeBlockExpr` to a raw DB element, if possible.
+   * Converts a synthesized `TUnion` to a raw DB element, if possible.
    */
-  cached
-  Raw::Element convertUnsafeBlockExprToRaw(TUnsafeBlockExpr e) { e = TUnsafeBlockExpr(result) }
+  Raw::Element convertUnionToRaw(TUnion e) { e = TUnion(result) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a synthesized `TUse` to a raw DB element, if possible.
+   */
+  Raw::Element convertUseToRaw(TUse e) { e = TUse(result) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a synthesized `TUseTree` to a raw DB element, if possible.
+   */
+  Raw::Element convertUseTreeToRaw(TUseTree e) { e = TUseTree(result) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a synthesized `TUseTreeList` to a raw DB element, if possible.
+   */
+  Raw::Element convertUseTreeListToRaw(TUseTreeList e) { e = TUseTreeList(result) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a synthesized `TVariant` to a raw DB element, if possible.
+   */
+  Raw::Element convertVariantToRaw(TVariant e) { e = TVariant(result) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a synthesized `TVariantList` to a raw DB element, if possible.
+   */
+  Raw::Element convertVariantListToRaw(TVariantList e) { e = TVariantList(result) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a synthesized `TVisibility` to a raw DB element, if possible.
+   */
+  Raw::Element convertVisibilityToRaw(TVisibility e) { e = TVisibility(result) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a synthesized `TWhereClause` to a raw DB element, if possible.
+   */
+  Raw::Element convertWhereClauseToRaw(TWhereClause e) { e = TWhereClause(result) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a synthesized `TWherePred` to a raw DB element, if possible.
+   */
+  Raw::Element convertWherePredToRaw(TWherePred e) { e = TWherePred(result) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a synthesized `TWhileExpr` to a raw DB element, if possible.
+   */
+  Raw::Element convertWhileExprToRaw(TWhileExpr e) { e = TWhileExpr(result) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a synthesized `TWildcardPat` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertWildcardPatToRaw(TWildcardPat e) { e = TWildcardPat(result) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a synthesized `TYeetExpr` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertYeetExprToRaw(TYeetExpr e) { e = TYeetExpr(result) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a synthesized `TYieldExpr` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertYieldExprToRaw(TYieldExpr e) { e = TYieldExpr(result) }
 
   /**
    * INTERNAL: Do not use.
-   * Converts a synthesized `TArrayExpr` to a raw DB element, if possible.
+   * Converts a synthesized `TAssocItem` to a raw DB element, if possible.
    */
-  cached
-  Raw::Element convertArrayExprToRaw(TArrayExpr e) {
-    result = convertElementListExprToRaw(e)
+  Raw::Element convertAssocItemToRaw(TAssocItem e) {
+    result = convertConstToRaw(e)
     or
-    result = convertRepeatExprToRaw(e)
+    result = convertFunctionToRaw(e)
+    or
+    result = convertMacroCallToRaw(e)
+    or
+    result = convertTypeAliasToRaw(e)
   }
 
   /**
    * INTERNAL: Do not use.
    * Converts a synthesized `TAstNode` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertAstNodeToRaw(TAstNode e) {
-    result = convertDeclarationToRaw(e)
+    result = convertAbiToRaw(e)
+    or
+    result = convertArgListToRaw(e)
+    or
+    result = convertAssocItemToRaw(e)
+    or
+    result = convertAssocItemListToRaw(e)
+    or
+    result = convertAttrToRaw(e)
+    or
+    result = convertCallableToRaw(e)
+    or
+    result = convertClosureBinderToRaw(e)
     or
     result = convertExprToRaw(e)
     or
+    result = convertExternItemToRaw(e)
+    or
+    result = convertExternItemListToRaw(e)
+    or
+    result = convertFieldListToRaw(e)
+    or
+    result = convertFormatArgsArgToRaw(e)
+    or
+    result = convertGenericArgToRaw(e)
+    or
     result = convertGenericArgListToRaw(e)
     or
+    result = convertGenericParamToRaw(e)
+    or
+    result = convertGenericParamListToRaw(e)
+    or
+    result = convertItemListToRaw(e)
+    or
     result = convertLabelToRaw(e)
     or
+    result = convertLetElseToRaw(e)
+    or
+    result = convertLifetimeToRaw(e)
+    or
+    result = convertMacroItemsToRaw(e)
+    or
+    result = convertMacroStmtsToRaw(e)
+    or
     result = convertMatchArmToRaw(e)
     or
+    result = convertMatchArmListToRaw(e)
+    or
+    result = convertMatchGuardToRaw(e)
+    or
+    result = convertMetaToRaw(e)
+    or
+    result = convertNameToRaw(e)
+    or
+    result = convertNameRefToRaw(e)
+    or
+    result = convertParamToRaw(e)
+    or
+    result = convertParamListToRaw(e)
+    or
     result = convertPatToRaw(e)
     or
-    result = convertPathToRaw(e)
+    result = convertPathSegmentToRaw(e)
     or
     result = convertRecordExprFieldToRaw(e)
     or
+    result = convertRecordExprFieldListToRaw(e)
+    or
+    result = convertRecordFieldToRaw(e)
+    or
     result = convertRecordPatFieldToRaw(e)
     or
+    result = convertRecordPatFieldListToRaw(e)
+    or
+    result = convertRenameToRaw(e)
+    or
+    result = convertResolvableToRaw(e)
+    or
+    result = convertRetTypeToRaw(e)
+    or
+    result = convertReturnTypeSyntaxToRaw(e)
+    or
+    result = convertSelfParamToRaw(e)
+    or
+    result = convertSourceFileToRaw(e)
+    or
     result = convertStmtToRaw(e)
     or
+    result = convertStmtListToRaw(e)
+    or
+    result = convertTokenToRaw(e)
+    or
+    result = convertTokenTreeToRaw(e)
+    or
+    result = convertTupleFieldToRaw(e)
+    or
+    result = convertTypeBoundToRaw(e)
+    or
+    result = convertTypeBoundListToRaw(e)
+    or
     result = convertTypeRefToRaw(e)
+    or
+    result = convertUseTreeToRaw(e)
+    or
+    result = convertUseTreeListToRaw(e)
+    or
+    result = convertVariantToRaw(e)
+    or
+    result = convertVariantListToRaw(e)
+    or
+    result = convertVisibilityToRaw(e)
+    or
+    result = convertWhereClauseToRaw(e)
+    or
+    result = convertWherePredToRaw(e)
   }
 
   /**
    * INTERNAL: Do not use.
-   * Converts a synthesized `TBlockExprBase` to a raw DB element, if possible.
+   * Converts a synthesized `TCallExprBase` to a raw DB element, if possible.
    */
-  cached
-  Raw::Element convertBlockExprBaseToRaw(TBlockExprBase e) {
-    result = convertAsyncBlockExprToRaw(e)
+  Raw::Element convertCallExprBaseToRaw(TCallExprBase e) {
+    result = convertCallExprToRaw(e)
     or
-    result = convertBlockExprToRaw(e)
-    or
-    result = convertUnsafeBlockExprToRaw(e)
+    result = convertMethodCallExprToRaw(e)
   }
 
   /**
    * INTERNAL: Do not use.
-   * Converts a synthesized `TDeclaration` to a raw DB element, if possible.
+   * Converts a synthesized `TCallable` to a raw DB element, if possible.
    */
-  cached
-  Raw::Element convertDeclarationToRaw(TDeclaration e) {
+  Raw::Element convertCallableToRaw(TCallable e) {
+    result = convertClosureExprToRaw(e)
+    or
     result = convertFunctionToRaw(e)
-    or
-    result = convertModuleToRaw(e)
-    or
-    result = convertUnimplementedDeclarationToRaw(e)
   }
 
   /**
    * INTERNAL: Do not use.
    * Converts a synthesized `TElement` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertElementToRaw(TElement e) {
     result = convertLocatableToRaw(e)
     or
@@ -1545,7 +3134,6 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a synthesized `TExpr` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertExprToRaw(TExpr e) {
     result = convertArrayExprToRaw(e)
     or
@@ -1557,24 +3145,24 @@ module Synth {
     or
     result = convertBinaryExprToRaw(e)
     or
-    result = convertBlockExprBaseToRaw(e)
-    or
-    result = convertBoxExprToRaw(e)
+    result = convertBlockExprToRaw(e)
     or
     result = convertBreakExprToRaw(e)
     or
-    result = convertCallExprToRaw(e)
+    result = convertCallExprBaseToRaw(e)
     or
     result = convertCastExprToRaw(e)
     or
     result = convertClosureExprToRaw(e)
     or
-    result = convertConstExprToRaw(e)
-    or
     result = convertContinueExprToRaw(e)
     or
     result = convertFieldExprToRaw(e)
     or
+    result = convertForExprToRaw(e)
+    or
+    result = convertFormatArgsExprToRaw(e)
+    or
     result = convertIfExprToRaw(e)
     or
     result = convertIndexExprToRaw(e)
@@ -1585,15 +3173,15 @@ module Synth {
     or
     result = convertLoopExprToRaw(e)
     or
+    result = convertMacroExprToRaw(e)
+    or
     result = convertMatchExprToRaw(e)
     or
-    result = convertMethodCallExprToRaw(e)
-    or
-    result = convertMissingExprToRaw(e)
-    or
     result = convertOffsetOfExprToRaw(e)
     or
-    result = convertPathExprToRaw(e)
+    result = convertParenExprToRaw(e)
+    or
+    result = convertPathExprBaseToRaw(e)
     or
     result = convertPrefixExprToRaw(e)
     or
@@ -1605,10 +3193,14 @@ module Synth {
     or
     result = convertReturnExprToRaw(e)
     or
+    result = convertTryExprToRaw(e)
+    or
     result = convertTupleExprToRaw(e)
     or
     result = convertUnderscoreExprToRaw(e)
     or
+    result = convertWhileExprToRaw(e)
+    or
     result = convertYeetExprToRaw(e)
     or
     result = convertYieldExprToRaw(e)
@@ -1616,27 +3208,110 @@ module Synth {
 
   /**
    * INTERNAL: Do not use.
-   * Converts a synthesized `TLocatable` to a raw DB element, if possible.
+   * Converts a synthesized `TExternItem` to a raw DB element, if possible.
    */
-  cached
-  Raw::Element convertLocatableToRaw(TLocatable e) { result = convertAstNodeToRaw(e) }
+  Raw::Element convertExternItemToRaw(TExternItem e) {
+    result = convertFunctionToRaw(e)
+    or
+    result = convertMacroCallToRaw(e)
+    or
+    result = convertStaticToRaw(e)
+    or
+    result = convertTypeAliasToRaw(e)
+  }
 
   /**
    * INTERNAL: Do not use.
-   * Converts a synthesized `TMissing` to a raw DB element, if possible.
+   * Converts a synthesized `TFieldList` to a raw DB element, if possible.
    */
-  cached
-  Raw::Element convertMissingToRaw(TMissing e) {
-    result = convertMissingExprToRaw(e)
+  Raw::Element convertFieldListToRaw(TFieldList e) {
+    result = convertRecordFieldListToRaw(e)
     or
-    result = convertMissingPatToRaw(e)
+    result = convertTupleFieldListToRaw(e)
+  }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a synthesized `TGenericArg` to a raw DB element, if possible.
+   */
+  Raw::Element convertGenericArgToRaw(TGenericArg e) {
+    result = convertAssocTypeArgToRaw(e)
+    or
+    result = convertConstArgToRaw(e)
+    or
+    result = convertLifetimeArgToRaw(e)
+    or
+    result = convertTypeArgToRaw(e)
+  }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a synthesized `TGenericParam` to a raw DB element, if possible.
+   */
+  Raw::Element convertGenericParamToRaw(TGenericParam e) {
+    result = convertConstParamToRaw(e)
+    or
+    result = convertLifetimeParamToRaw(e)
+    or
+    result = convertTypeParamToRaw(e)
+  }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a synthesized `TItem` to a raw DB element, if possible.
+   */
+  Raw::Element convertItemToRaw(TItem e) {
+    result = convertConstToRaw(e)
+    or
+    result = convertEnumToRaw(e)
+    or
+    result = convertExternBlockToRaw(e)
+    or
+    result = convertExternCrateToRaw(e)
+    or
+    result = convertFunctionToRaw(e)
+    or
+    result = convertImplToRaw(e)
+    or
+    result = convertMacroCallToRaw(e)
+    or
+    result = convertMacroDefToRaw(e)
+    or
+    result = convertMacroRulesToRaw(e)
+    or
+    result = convertModuleToRaw(e)
+    or
+    result = convertStaticToRaw(e)
+    or
+    result = convertStructToRaw(e)
+    or
+    result = convertTraitToRaw(e)
+    or
+    result = convertTraitAliasToRaw(e)
+    or
+    result = convertTypeAliasToRaw(e)
+    or
+    result = convertUnionToRaw(e)
+    or
+    result = convertUseToRaw(e)
+  }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a synthesized `TLocatable` to a raw DB element, if possible.
+   */
+  Raw::Element convertLocatableToRaw(TLocatable e) {
+    result = convertAstNodeToRaw(e)
+    or
+    result = convertFormatToRaw(e)
+    or
+    result = convertFormatArgumentToRaw(e)
   }
 
   /**
    * INTERNAL: Do not use.
    * Converts a synthesized `TPat` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertPatToRaw(TPat e) {
     result = convertBoxPatToRaw(e)
     or
@@ -1646,10 +3321,12 @@ module Synth {
     or
     result = convertLiteralPatToRaw(e)
     or
-    result = convertMissingPatToRaw(e)
+    result = convertMacroPatToRaw(e)
     or
     result = convertOrPatToRaw(e)
     or
+    result = convertParenPatToRaw(e)
+    or
     result = convertPathPatToRaw(e)
     or
     result = convertRangePatToRaw(e)
@@ -1658,6 +3335,8 @@ module Synth {
     or
     result = convertRefPatToRaw(e)
     or
+    result = convertRestPatToRaw(e)
+    or
     result = convertSlicePatToRaw(e)
     or
     result = convertTuplePatToRaw(e)
@@ -1667,42 +3346,85 @@ module Synth {
     result = convertWildcardPatToRaw(e)
   }
 
+  /**
+   * INTERNAL: Do not use.
+   * Converts a synthesized `TPathExprBase` to a raw DB element, if possible.
+   */
+  Raw::Element convertPathExprBaseToRaw(TPathExprBase e) {
+    result = convertFormatTemplateVariableAccessToRaw(e)
+    or
+    result = convertPathExprToRaw(e)
+  }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a synthesized `TResolvable` to a raw DB element, if possible.
+   */
+  Raw::Element convertResolvableToRaw(TResolvable e) {
+    result = convertMethodCallExprToRaw(e)
+    or
+    result = convertPathToRaw(e)
+  }
+
   /**
    * INTERNAL: Do not use.
    * Converts a synthesized `TStmt` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertStmtToRaw(TStmt e) {
     result = convertExprStmtToRaw(e)
     or
-    result = convertItemStmtToRaw(e)
+    result = convertItemToRaw(e)
     or
     result = convertLetStmtToRaw(e)
   }
 
+  /**
+   * INTERNAL: Do not use.
+   * Converts a synthesized `TToken` to a raw DB element, if possible.
+   */
+  Raw::Element convertTokenToRaw(TToken e) { result = convertCommentToRaw(e) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a synthesized `TTypeRef` to a raw DB element, if possible.
+   */
+  Raw::Element convertTypeRefToRaw(TTypeRef e) {
+    result = convertArrayTypeToRaw(e)
+    or
+    result = convertDynTraitTypeToRaw(e)
+    or
+    result = convertFnPtrTypeToRaw(e)
+    or
+    result = convertForTypeToRaw(e)
+    or
+    result = convertImplTraitTypeToRaw(e)
+    or
+    result = convertInferTypeToRaw(e)
+    or
+    result = convertMacroTypeToRaw(e)
+    or
+    result = convertNeverTypeToRaw(e)
+    or
+    result = convertParenTypeToRaw(e)
+    or
+    result = convertPathTypeToRaw(e)
+    or
+    result = convertPtrTypeToRaw(e)
+    or
+    result = convertRefTypeToRaw(e)
+    or
+    result = convertSliceTypeToRaw(e)
+    or
+    result = convertTupleTypeToRaw(e)
+  }
+
   /**
    * INTERNAL: Do not use.
    * Converts a synthesized `TUnextracted` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertUnextractedToRaw(TUnextracted e) {
     result = convertMissingToRaw(e)
     or
     result = convertUnimplementedToRaw(e)
   }
-
-  /**
-   * INTERNAL: Do not use.
-   * Converts a synthesized `TUnimplemented` to a raw DB element, if possible.
-   */
-  cached
-  Raw::Element convertUnimplementedToRaw(TUnimplemented e) {
-    result = convertGenericArgListToRaw(e)
-    or
-    result = convertPathToRaw(e)
-    or
-    result = convertTypeRefToRaw(e)
-    or
-    result = convertUnimplementedDeclarationToRaw(e)
-  }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/SynthConstructors.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/SynthConstructors.qll
index 1cb18d5ff7f..9b68c858c6a 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/SynthConstructors.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/SynthConstructors.qll
@@ -3,66 +3,150 @@
  * This module exports all modules providing `Element` subclasses.
  */
 
+import codeql.rust.elements.internal.AbiConstructor
+import codeql.rust.elements.internal.ArgListConstructor
+import codeql.rust.elements.internal.ArrayExprConstructor
+import codeql.rust.elements.internal.ArrayTypeConstructor
 import codeql.rust.elements.internal.AsmExprConstructor
-import codeql.rust.elements.internal.AsyncBlockExprConstructor
+import codeql.rust.elements.internal.AssocItemListConstructor
+import codeql.rust.elements.internal.AssocTypeArgConstructor
+import codeql.rust.elements.internal.AttrConstructor
 import codeql.rust.elements.internal.AwaitExprConstructor
 import codeql.rust.elements.internal.BecomeExprConstructor
 import codeql.rust.elements.internal.BinaryExprConstructor
 import codeql.rust.elements.internal.BlockExprConstructor
-import codeql.rust.elements.internal.BoxExprConstructor
 import codeql.rust.elements.internal.BoxPatConstructor
 import codeql.rust.elements.internal.BreakExprConstructor
 import codeql.rust.elements.internal.CallExprConstructor
 import codeql.rust.elements.internal.CastExprConstructor
+import codeql.rust.elements.internal.ClosureBinderConstructor
 import codeql.rust.elements.internal.ClosureExprConstructor
+import codeql.rust.elements.internal.CommentConstructor
+import codeql.rust.elements.internal.ConstConstructor
+import codeql.rust.elements.internal.ConstArgConstructor
 import codeql.rust.elements.internal.ConstBlockPatConstructor
-import codeql.rust.elements.internal.ConstExprConstructor
+import codeql.rust.elements.internal.ConstParamConstructor
 import codeql.rust.elements.internal.ContinueExprConstructor
-import codeql.rust.elements.internal.ElementListExprConstructor
+import codeql.rust.elements.internal.DynTraitTypeConstructor
+import codeql.rust.elements.internal.EnumConstructor
 import codeql.rust.elements.internal.ExprStmtConstructor
+import codeql.rust.elements.internal.ExternBlockConstructor
+import codeql.rust.elements.internal.ExternCrateConstructor
+import codeql.rust.elements.internal.ExternItemListConstructor
 import codeql.rust.elements.internal.FieldExprConstructor
+import codeql.rust.elements.internal.FnPtrTypeConstructor
+import codeql.rust.elements.internal.ForExprConstructor
+import codeql.rust.elements.internal.ForTypeConstructor
+import codeql.rust.elements.internal.FormatConstructor
+import codeql.rust.elements.internal.FormatArgsArgConstructor
+import codeql.rust.elements.internal.FormatArgsExprConstructor
+import codeql.rust.elements.internal.FormatArgumentConstructor
+import codeql.rust.elements.internal.FormatTemplateVariableAccessConstructor
 import codeql.rust.elements.internal.FunctionConstructor
 import codeql.rust.elements.internal.GenericArgListConstructor
+import codeql.rust.elements.internal.GenericParamListConstructor
 import codeql.rust.elements.internal.IdentPatConstructor
 import codeql.rust.elements.internal.IfExprConstructor
+import codeql.rust.elements.internal.ImplConstructor
+import codeql.rust.elements.internal.ImplTraitTypeConstructor
 import codeql.rust.elements.internal.IndexExprConstructor
-import codeql.rust.elements.internal.ItemStmtConstructor
+import codeql.rust.elements.internal.InferTypeConstructor
+import codeql.rust.elements.internal.ItemListConstructor
 import codeql.rust.elements.internal.LabelConstructor
+import codeql.rust.elements.internal.LetElseConstructor
 import codeql.rust.elements.internal.LetExprConstructor
 import codeql.rust.elements.internal.LetStmtConstructor
+import codeql.rust.elements.internal.LifetimeConstructor
+import codeql.rust.elements.internal.LifetimeArgConstructor
+import codeql.rust.elements.internal.LifetimeParamConstructor
 import codeql.rust.elements.internal.LiteralExprConstructor
 import codeql.rust.elements.internal.LiteralPatConstructor
 import codeql.rust.elements.internal.LoopExprConstructor
+import codeql.rust.elements.internal.MacroCallConstructor
+import codeql.rust.elements.internal.MacroDefConstructor
+import codeql.rust.elements.internal.MacroExprConstructor
+import codeql.rust.elements.internal.MacroItemsConstructor
+import codeql.rust.elements.internal.MacroPatConstructor
+import codeql.rust.elements.internal.MacroRulesConstructor
+import codeql.rust.elements.internal.MacroStmtsConstructor
+import codeql.rust.elements.internal.MacroTypeConstructor
 import codeql.rust.elements.internal.MatchArmConstructor
+import codeql.rust.elements.internal.MatchArmListConstructor
 import codeql.rust.elements.internal.MatchExprConstructor
+import codeql.rust.elements.internal.MatchGuardConstructor
+import codeql.rust.elements.internal.MetaConstructor
 import codeql.rust.elements.internal.MethodCallExprConstructor
-import codeql.rust.elements.internal.MissingExprConstructor
-import codeql.rust.elements.internal.MissingPatConstructor
+import codeql.rust.elements.internal.MissingConstructor
 import codeql.rust.elements.internal.ModuleConstructor
+import codeql.rust.elements.internal.NameConstructor
+import codeql.rust.elements.internal.NameRefConstructor
+import codeql.rust.elements.internal.NeverTypeConstructor
 import codeql.rust.elements.internal.OffsetOfExprConstructor
 import codeql.rust.elements.internal.OrPatConstructor
+import codeql.rust.elements.internal.ParamConstructor
+import codeql.rust.elements.internal.ParamListConstructor
+import codeql.rust.elements.internal.ParenExprConstructor
+import codeql.rust.elements.internal.ParenPatConstructor
+import codeql.rust.elements.internal.ParenTypeConstructor
 import codeql.rust.elements.internal.PathConstructor
 import codeql.rust.elements.internal.PathExprConstructor
 import codeql.rust.elements.internal.PathPatConstructor
+import codeql.rust.elements.internal.PathSegmentConstructor
+import codeql.rust.elements.internal.PathTypeConstructor
 import codeql.rust.elements.internal.PrefixExprConstructor
+import codeql.rust.elements.internal.PtrTypeConstructor
 import codeql.rust.elements.internal.RangeExprConstructor
 import codeql.rust.elements.internal.RangePatConstructor
 import codeql.rust.elements.internal.RecordExprConstructor
 import codeql.rust.elements.internal.RecordExprFieldConstructor
+import codeql.rust.elements.internal.RecordExprFieldListConstructor
+import codeql.rust.elements.internal.RecordFieldConstructor
+import codeql.rust.elements.internal.RecordFieldListConstructor
 import codeql.rust.elements.internal.RecordPatConstructor
 import codeql.rust.elements.internal.RecordPatFieldConstructor
+import codeql.rust.elements.internal.RecordPatFieldListConstructor
 import codeql.rust.elements.internal.RefExprConstructor
 import codeql.rust.elements.internal.RefPatConstructor
-import codeql.rust.elements.internal.RepeatExprConstructor
+import codeql.rust.elements.internal.RefTypeConstructor
+import codeql.rust.elements.internal.RenameConstructor
+import codeql.rust.elements.internal.RestPatConstructor
+import codeql.rust.elements.internal.RetTypeConstructor
 import codeql.rust.elements.internal.ReturnExprConstructor
+import codeql.rust.elements.internal.ReturnTypeSyntaxConstructor
+import codeql.rust.elements.internal.SelfParamConstructor
 import codeql.rust.elements.internal.SlicePatConstructor
+import codeql.rust.elements.internal.SliceTypeConstructor
+import codeql.rust.elements.internal.SourceFileConstructor
+import codeql.rust.elements.internal.StaticConstructor
+import codeql.rust.elements.internal.StmtListConstructor
+import codeql.rust.elements.internal.StructConstructor
+import codeql.rust.elements.internal.TokenTreeConstructor
+import codeql.rust.elements.internal.TraitConstructor
+import codeql.rust.elements.internal.TraitAliasConstructor
+import codeql.rust.elements.internal.TryExprConstructor
 import codeql.rust.elements.internal.TupleExprConstructor
+import codeql.rust.elements.internal.TupleFieldConstructor
+import codeql.rust.elements.internal.TupleFieldListConstructor
 import codeql.rust.elements.internal.TuplePatConstructor
 import codeql.rust.elements.internal.TupleStructPatConstructor
-import codeql.rust.elements.internal.TypeRefConstructor
+import codeql.rust.elements.internal.TupleTypeConstructor
+import codeql.rust.elements.internal.TypeAliasConstructor
+import codeql.rust.elements.internal.TypeArgConstructor
+import codeql.rust.elements.internal.TypeBoundConstructor
+import codeql.rust.elements.internal.TypeBoundListConstructor
+import codeql.rust.elements.internal.TypeParamConstructor
 import codeql.rust.elements.internal.UnderscoreExprConstructor
-import codeql.rust.elements.internal.UnimplementedDeclarationConstructor
-import codeql.rust.elements.internal.UnsafeBlockExprConstructor
+import codeql.rust.elements.internal.UnimplementedConstructor
+import codeql.rust.elements.internal.UnionConstructor
+import codeql.rust.elements.internal.UseConstructor
+import codeql.rust.elements.internal.UseTreeConstructor
+import codeql.rust.elements.internal.UseTreeListConstructor
+import codeql.rust.elements.internal.VariantConstructor
+import codeql.rust.elements.internal.VariantListConstructor
+import codeql.rust.elements.internal.VisibilityConstructor
+import codeql.rust.elements.internal.WhereClauseConstructor
+import codeql.rust.elements.internal.WherePredConstructor
+import codeql.rust.elements.internal.WhileExprConstructor
 import codeql.rust.elements.internal.WildcardPatConstructor
 import codeql.rust.elements.internal.YeetExprConstructor
 import codeql.rust.elements.internal.YieldExprConstructor
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/Declaration.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/Token.qll
similarity index 52%
rename from rust/ql/lib/codeql/rust/elements/internal/generated/Declaration.qll
rename to rust/ql/lib/codeql/rust/elements/internal/generated/Token.qll
index 0809fcb4dc8..52bfd21c9da 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/Declaration.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/Token.qll
@@ -1,6 +1,6 @@
 // generated by codegen, do not edit
 /**
- * This module provides the generated definition of `Declaration`.
+ * This module provides the generated definition of `Token`.
  * INTERNAL: Do not import directly.
  */
 
@@ -9,14 +9,14 @@ private import codeql.rust.elements.internal.generated.Raw
 import codeql.rust.elements.internal.AstNodeImpl::Impl as AstNodeImpl
 
 /**
- * INTERNAL: This module contains the fully generated definition of `Declaration` and should not
+ * INTERNAL: This module contains the fully generated definition of `Token` and should not
  * be referenced directly.
  */
 module Generated {
   /**
-   * The base class for declarations.
-   * INTERNAL: Do not reference the `Generated::Declaration` class directly.
-   * Use the subclass `Declaration`, where the following predicates are available.
+   * The base class for all tokens.
+   * INTERNAL: Do not reference the `Generated::Token` class directly.
+   * Use the subclass `Token`, where the following predicates are available.
    */
-  class Declaration extends Synth::TDeclaration, AstNodeImpl::AstNode { }
+  class Token extends Synth::TToken, AstNodeImpl::AstNode { }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/TokenTree.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/TokenTree.qll
new file mode 100644
index 00000000000..530f3e3199c
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/TokenTree.qll
@@ -0,0 +1,27 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `TokenTree`.
+ * INTERNAL: Do not import directly.
+ */
+
+private import codeql.rust.elements.internal.generated.Synth
+private import codeql.rust.elements.internal.generated.Raw
+import codeql.rust.elements.internal.AstNodeImpl::Impl as AstNodeImpl
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `TokenTree` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * A TokenTree. For example:
+   * ```rust
+   * todo!()
+   * ```
+   * INTERNAL: Do not reference the `Generated::TokenTree` class directly.
+   * Use the subclass `TokenTree`, where the following predicates are available.
+   */
+  class TokenTree extends Synth::TTokenTree, AstNodeImpl::AstNode {
+    override string getAPrimaryQlClass() { result = "TokenTree" }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/Trait.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/Trait.qll
new file mode 100644
index 00000000000..fff0363a3c7
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/Trait.qll
@@ -0,0 +1,152 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `Trait`.
+ * INTERNAL: Do not import directly.
+ */
+
+private import codeql.rust.elements.internal.generated.Synth
+private import codeql.rust.elements.internal.generated.Raw
+import codeql.rust.elements.AssocItemList
+import codeql.rust.elements.Attr
+import codeql.rust.elements.GenericParamList
+import codeql.rust.elements.internal.ItemImpl::Impl as ItemImpl
+import codeql.rust.elements.Name
+import codeql.rust.elements.TypeBoundList
+import codeql.rust.elements.Visibility
+import codeql.rust.elements.WhereClause
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `Trait` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * A Trait. For example:
+   * ```
+   * trait Frobinizable {
+   *   type Frobinator;
+   *   type Result: Copy;
+   *   fn frobinize_with(&mut self, frobinator: &Self::Frobinator) -> Result;
+   * }
+   *
+   * pub trait Foo<T: Frobinizable> where T::Frobinator: Eq {}
+   * ```
+   * INTERNAL: Do not reference the `Generated::Trait` class directly.
+   * Use the subclass `Trait`, where the following predicates are available.
+   */
+  class Trait extends Synth::TTrait, ItemImpl::Item {
+    override string getAPrimaryQlClass() { result = "Trait" }
+
+    /**
+     * Gets the assoc item list of this trait, if it exists.
+     */
+    AssocItemList getAssocItemList() {
+      result =
+        Synth::convertAssocItemListFromRaw(Synth::convertTraitToRaw(this)
+              .(Raw::Trait)
+              .getAssocItemList())
+    }
+
+    /**
+     * Holds if `getAssocItemList()` exists.
+     */
+    final predicate hasAssocItemList() { exists(this.getAssocItemList()) }
+
+    /**
+     * Gets the `index`th attr of this trait (0-based).
+     */
+    Attr getAttr(int index) {
+      result = Synth::convertAttrFromRaw(Synth::convertTraitToRaw(this).(Raw::Trait).getAttr(index))
+    }
+
+    /**
+     * Gets any of the attrs of this trait.
+     */
+    final Attr getAnAttr() { result = this.getAttr(_) }
+
+    /**
+     * Gets the number of attrs of this trait.
+     */
+    final int getNumberOfAttrs() { result = count(int i | exists(this.getAttr(i))) }
+
+    /**
+     * Gets the generic parameter list of this trait, if it exists.
+     */
+    GenericParamList getGenericParamList() {
+      result =
+        Synth::convertGenericParamListFromRaw(Synth::convertTraitToRaw(this)
+              .(Raw::Trait)
+              .getGenericParamList())
+    }
+
+    /**
+     * Holds if `getGenericParamList()` exists.
+     */
+    final predicate hasGenericParamList() { exists(this.getGenericParamList()) }
+
+    /**
+     * Holds if this trait is auto.
+     */
+    predicate isAuto() { Synth::convertTraitToRaw(this).(Raw::Trait).isAuto() }
+
+    /**
+     * Holds if this trait is unsafe.
+     */
+    predicate isUnsafe() { Synth::convertTraitToRaw(this).(Raw::Trait).isUnsafe() }
+
+    /**
+     * Gets the name of this trait, if it exists.
+     */
+    Name getName() {
+      result = Synth::convertNameFromRaw(Synth::convertTraitToRaw(this).(Raw::Trait).getName())
+    }
+
+    /**
+     * Holds if `getName()` exists.
+     */
+    final predicate hasName() { exists(this.getName()) }
+
+    /**
+     * Gets the type bound list of this trait, if it exists.
+     */
+    TypeBoundList getTypeBoundList() {
+      result =
+        Synth::convertTypeBoundListFromRaw(Synth::convertTraitToRaw(this)
+              .(Raw::Trait)
+              .getTypeBoundList())
+    }
+
+    /**
+     * Holds if `getTypeBoundList()` exists.
+     */
+    final predicate hasTypeBoundList() { exists(this.getTypeBoundList()) }
+
+    /**
+     * Gets the visibility of this trait, if it exists.
+     */
+    Visibility getVisibility() {
+      result =
+        Synth::convertVisibilityFromRaw(Synth::convertTraitToRaw(this).(Raw::Trait).getVisibility())
+    }
+
+    /**
+     * Holds if `getVisibility()` exists.
+     */
+    final predicate hasVisibility() { exists(this.getVisibility()) }
+
+    /**
+     * Gets the where clause of this trait, if it exists.
+     */
+    WhereClause getWhereClause() {
+      result =
+        Synth::convertWhereClauseFromRaw(Synth::convertTraitToRaw(this)
+              .(Raw::Trait)
+              .getWhereClause())
+    }
+
+    /**
+     * Holds if `getWhereClause()` exists.
+     */
+    final predicate hasWhereClause() { exists(this.getWhereClause()) }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/TraitAlias.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/TraitAlias.qll
new file mode 100644
index 00000000000..d084fc36436
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/TraitAlias.qll
@@ -0,0 +1,126 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `TraitAlias`.
+ * INTERNAL: Do not import directly.
+ */
+
+private import codeql.rust.elements.internal.generated.Synth
+private import codeql.rust.elements.internal.generated.Raw
+import codeql.rust.elements.Attr
+import codeql.rust.elements.GenericParamList
+import codeql.rust.elements.internal.ItemImpl::Impl as ItemImpl
+import codeql.rust.elements.Name
+import codeql.rust.elements.TypeBoundList
+import codeql.rust.elements.Visibility
+import codeql.rust.elements.WhereClause
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `TraitAlias` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * A TraitAlias. For example:
+   * ```rust
+   * todo!()
+   * ```
+   * INTERNAL: Do not reference the `Generated::TraitAlias` class directly.
+   * Use the subclass `TraitAlias`, where the following predicates are available.
+   */
+  class TraitAlias extends Synth::TTraitAlias, ItemImpl::Item {
+    override string getAPrimaryQlClass() { result = "TraitAlias" }
+
+    /**
+     * Gets the `index`th attr of this trait alias (0-based).
+     */
+    Attr getAttr(int index) {
+      result =
+        Synth::convertAttrFromRaw(Synth::convertTraitAliasToRaw(this)
+              .(Raw::TraitAlias)
+              .getAttr(index))
+    }
+
+    /**
+     * Gets any of the attrs of this trait alias.
+     */
+    final Attr getAnAttr() { result = this.getAttr(_) }
+
+    /**
+     * Gets the number of attrs of this trait alias.
+     */
+    final int getNumberOfAttrs() { result = count(int i | exists(this.getAttr(i))) }
+
+    /**
+     * Gets the generic parameter list of this trait alias, if it exists.
+     */
+    GenericParamList getGenericParamList() {
+      result =
+        Synth::convertGenericParamListFromRaw(Synth::convertTraitAliasToRaw(this)
+              .(Raw::TraitAlias)
+              .getGenericParamList())
+    }
+
+    /**
+     * Holds if `getGenericParamList()` exists.
+     */
+    final predicate hasGenericParamList() { exists(this.getGenericParamList()) }
+
+    /**
+     * Gets the name of this trait alias, if it exists.
+     */
+    Name getName() {
+      result =
+        Synth::convertNameFromRaw(Synth::convertTraitAliasToRaw(this).(Raw::TraitAlias).getName())
+    }
+
+    /**
+     * Holds if `getName()` exists.
+     */
+    final predicate hasName() { exists(this.getName()) }
+
+    /**
+     * Gets the type bound list of this trait alias, if it exists.
+     */
+    TypeBoundList getTypeBoundList() {
+      result =
+        Synth::convertTypeBoundListFromRaw(Synth::convertTraitAliasToRaw(this)
+              .(Raw::TraitAlias)
+              .getTypeBoundList())
+    }
+
+    /**
+     * Holds if `getTypeBoundList()` exists.
+     */
+    final predicate hasTypeBoundList() { exists(this.getTypeBoundList()) }
+
+    /**
+     * Gets the visibility of this trait alias, if it exists.
+     */
+    Visibility getVisibility() {
+      result =
+        Synth::convertVisibilityFromRaw(Synth::convertTraitAliasToRaw(this)
+              .(Raw::TraitAlias)
+              .getVisibility())
+    }
+
+    /**
+     * Holds if `getVisibility()` exists.
+     */
+    final predicate hasVisibility() { exists(this.getVisibility()) }
+
+    /**
+     * Gets the where clause of this trait alias, if it exists.
+     */
+    WhereClause getWhereClause() {
+      result =
+        Synth::convertWhereClauseFromRaw(Synth::convertTraitAliasToRaw(this)
+              .(Raw::TraitAlias)
+              .getWhereClause())
+    }
+
+    /**
+     * Holds if `getWhereClause()` exists.
+     */
+    final predicate hasWhereClause() { exists(this.getWhereClause()) }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/TryExpr.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/TryExpr.qll
new file mode 100644
index 00000000000..e71c2c26b9e
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/TryExpr.qll
@@ -0,0 +1,59 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `TryExpr`.
+ * INTERNAL: Do not import directly.
+ */
+
+private import codeql.rust.elements.internal.generated.Synth
+private import codeql.rust.elements.internal.generated.Raw
+import codeql.rust.elements.Attr
+import codeql.rust.elements.Expr
+import codeql.rust.elements.internal.ExprImpl::Impl as ExprImpl
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `TryExpr` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * A TryExpr. For example:
+   * ```rust
+   * todo!()
+   * ```
+   * INTERNAL: Do not reference the `Generated::TryExpr` class directly.
+   * Use the subclass `TryExpr`, where the following predicates are available.
+   */
+  class TryExpr extends Synth::TTryExpr, ExprImpl::Expr {
+    override string getAPrimaryQlClass() { result = "TryExpr" }
+
+    /**
+     * Gets the `index`th attr of this try expression (0-based).
+     */
+    Attr getAttr(int index) {
+      result =
+        Synth::convertAttrFromRaw(Synth::convertTryExprToRaw(this).(Raw::TryExpr).getAttr(index))
+    }
+
+    /**
+     * Gets any of the attrs of this try expression.
+     */
+    final Attr getAnAttr() { result = this.getAttr(_) }
+
+    /**
+     * Gets the number of attrs of this try expression.
+     */
+    final int getNumberOfAttrs() { result = count(int i | exists(this.getAttr(i))) }
+
+    /**
+     * Gets the expression of this try expression, if it exists.
+     */
+    Expr getExpr() {
+      result = Synth::convertExprFromRaw(Synth::convertTryExprToRaw(this).(Raw::TryExpr).getExpr())
+    }
+
+    /**
+     * Holds if `getExpr()` exists.
+     */
+    final predicate hasExpr() { exists(this.getExpr()) }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/TupleExpr.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/TupleExpr.qll
index 86533c97139..0860831446b 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/TupleExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/TupleExpr.qll
@@ -6,6 +6,7 @@
 
 private import codeql.rust.elements.internal.generated.Synth
 private import codeql.rust.elements.internal.generated.Raw
+import codeql.rust.elements.Attr
 import codeql.rust.elements.Expr
 import codeql.rust.elements.internal.ExprImpl::Impl as ExprImpl
 
@@ -27,28 +28,41 @@ module Generated {
     override string getAPrimaryQlClass() { result = "TupleExpr" }
 
     /**
-     * Gets the `index`th expression of this tuple expression (0-based).
+     * Gets the `index`th attr of this tuple expression (0-based).
      */
-    Expr getExpr(int index) {
+    Attr getAttr(int index) {
       result =
-        Synth::convertExprFromRaw(Synth::convertTupleExprToRaw(this).(Raw::TupleExpr).getExpr(index))
+        Synth::convertAttrFromRaw(Synth::convertTupleExprToRaw(this).(Raw::TupleExpr).getAttr(index))
     }
 
     /**
-     * Gets any of the expressions of this tuple expression.
+     * Gets any of the attrs of this tuple expression.
      */
-    final Expr getAnExpr() { result = this.getExpr(_) }
+    final Attr getAnAttr() { result = this.getAttr(_) }
 
     /**
-     * Gets the number of expressions of this tuple expression.
+     * Gets the number of attrs of this tuple expression.
      */
-    final int getNumberOfExprs() { result = count(int i | exists(this.getExpr(i))) }
+    final int getNumberOfAttrs() { result = count(int i | exists(this.getAttr(i))) }
 
     /**
-     * Holds if this tuple expression is assignee expression.
+     * Gets the `index`th field of this tuple expression (0-based).
      */
-    predicate isAssigneeExpr() {
-      Synth::convertTupleExprToRaw(this).(Raw::TupleExpr).isAssigneeExpr()
+    Expr getField(int index) {
+      result =
+        Synth::convertExprFromRaw(Synth::convertTupleExprToRaw(this)
+              .(Raw::TupleExpr)
+              .getField(index))
     }
+
+    /**
+     * Gets any of the fields of this tuple expression.
+     */
+    final Expr getAField() { result = this.getField(_) }
+
+    /**
+     * Gets the number of fields of this tuple expression.
+     */
+    final int getNumberOfFields() { result = count(int i | exists(this.getField(i))) }
   }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/TupleField.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/TupleField.qll
new file mode 100644
index 00000000000..fa7b8a338ff
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/TupleField.qll
@@ -0,0 +1,78 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `TupleField`.
+ * INTERNAL: Do not import directly.
+ */
+
+private import codeql.rust.elements.internal.generated.Synth
+private import codeql.rust.elements.internal.generated.Raw
+import codeql.rust.elements.internal.AstNodeImpl::Impl as AstNodeImpl
+import codeql.rust.elements.Attr
+import codeql.rust.elements.TypeRef
+import codeql.rust.elements.Visibility
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `TupleField` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * A TupleField. For example:
+   * ```rust
+   * todo!()
+   * ```
+   * INTERNAL: Do not reference the `Generated::TupleField` class directly.
+   * Use the subclass `TupleField`, where the following predicates are available.
+   */
+  class TupleField extends Synth::TTupleField, AstNodeImpl::AstNode {
+    override string getAPrimaryQlClass() { result = "TupleField" }
+
+    /**
+     * Gets the `index`th attr of this tuple field (0-based).
+     */
+    Attr getAttr(int index) {
+      result =
+        Synth::convertAttrFromRaw(Synth::convertTupleFieldToRaw(this)
+              .(Raw::TupleField)
+              .getAttr(index))
+    }
+
+    /**
+     * Gets any of the attrs of this tuple field.
+     */
+    final Attr getAnAttr() { result = this.getAttr(_) }
+
+    /**
+     * Gets the number of attrs of this tuple field.
+     */
+    final int getNumberOfAttrs() { result = count(int i | exists(this.getAttr(i))) }
+
+    /**
+     * Gets the ty of this tuple field, if it exists.
+     */
+    TypeRef getTy() {
+      result =
+        Synth::convertTypeRefFromRaw(Synth::convertTupleFieldToRaw(this).(Raw::TupleField).getTy())
+    }
+
+    /**
+     * Holds if `getTy()` exists.
+     */
+    final predicate hasTy() { exists(this.getTy()) }
+
+    /**
+     * Gets the visibility of this tuple field, if it exists.
+     */
+    Visibility getVisibility() {
+      result =
+        Synth::convertVisibilityFromRaw(Synth::convertTupleFieldToRaw(this)
+              .(Raw::TupleField)
+              .getVisibility())
+    }
+
+    /**
+     * Holds if `getVisibility()` exists.
+     */
+    final predicate hasVisibility() { exists(this.getVisibility()) }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/TupleFieldList.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/TupleFieldList.qll
new file mode 100644
index 00000000000..9b25d9a9316
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/TupleFieldList.qll
@@ -0,0 +1,48 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `TupleFieldList`.
+ * INTERNAL: Do not import directly.
+ */
+
+private import codeql.rust.elements.internal.generated.Synth
+private import codeql.rust.elements.internal.generated.Raw
+import codeql.rust.elements.internal.FieldListImpl::Impl as FieldListImpl
+import codeql.rust.elements.TupleField
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `TupleFieldList` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * A TupleFieldList. For example:
+   * ```rust
+   * todo!()
+   * ```
+   * INTERNAL: Do not reference the `Generated::TupleFieldList` class directly.
+   * Use the subclass `TupleFieldList`, where the following predicates are available.
+   */
+  class TupleFieldList extends Synth::TTupleFieldList, FieldListImpl::FieldList {
+    override string getAPrimaryQlClass() { result = "TupleFieldList" }
+
+    /**
+     * Gets the `index`th field of this tuple field list (0-based).
+     */
+    TupleField getField(int index) {
+      result =
+        Synth::convertTupleFieldFromRaw(Synth::convertTupleFieldListToRaw(this)
+              .(Raw::TupleFieldList)
+              .getField(index))
+    }
+
+    /**
+     * Gets any of the fields of this tuple field list.
+     */
+    final TupleField getAField() { result = this.getField(_) }
+
+    /**
+     * Gets the number of fields of this tuple field list.
+     */
+    final int getNumberOfFields() { result = count(int i | exists(this.getField(i))) }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/TuplePat.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/TuplePat.qll
index f9b2ae22b7b..0e7fc44809e 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/TuplePat.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/TuplePat.qll
@@ -27,33 +27,21 @@ module Generated {
     override string getAPrimaryQlClass() { result = "TuplePat" }
 
     /**
-     * Gets the `index`th argument of this tuple pat (0-based).
+     * Gets the `index`th field of this tuple pat (0-based).
      */
-    Pat getArg(int index) {
+    Pat getField(int index) {
       result =
-        Synth::convertPatFromRaw(Synth::convertTuplePatToRaw(this).(Raw::TuplePat).getArg(index))
+        Synth::convertPatFromRaw(Synth::convertTuplePatToRaw(this).(Raw::TuplePat).getField(index))
     }
 
     /**
-     * Gets any of the arguments of this tuple pat.
+     * Gets any of the fields of this tuple pat.
      */
-    final Pat getAnArg() { result = this.getArg(_) }
+    final Pat getAField() { result = this.getField(_) }
 
     /**
-     * Gets the number of arguments of this tuple pat.
+     * Gets the number of fields of this tuple pat.
      */
-    final int getNumberOfArgs() { result = count(int i | exists(this.getArg(i))) }
-
-    /**
-     * Gets the ellipsis index of this tuple pat, if it exists.
-     */
-    int getEllipsisIndex() {
-      result = Synth::convertTuplePatToRaw(this).(Raw::TuplePat).getEllipsisIndex()
-    }
-
-    /**
-     * Holds if `getEllipsisIndex()` exists.
-     */
-    final predicate hasEllipsisIndex() { exists(this.getEllipsisIndex()) }
+    final int getNumberOfFields() { result = count(int i | exists(this.getField(i))) }
   }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/TupleStructPat.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/TupleStructPat.qll
index 9c4c9344274..ed4e57d8719 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/TupleStructPat.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/TupleStructPat.qll
@@ -30,6 +30,26 @@ module Generated {
   class TupleStructPat extends Synth::TTupleStructPat, PatImpl::Pat {
     override string getAPrimaryQlClass() { result = "TupleStructPat" }
 
+    /**
+     * Gets the `index`th field of this tuple struct pat (0-based).
+     */
+    Pat getField(int index) {
+      result =
+        Synth::convertPatFromRaw(Synth::convertTupleStructPatToRaw(this)
+              .(Raw::TupleStructPat)
+              .getField(index))
+    }
+
+    /**
+     * Gets any of the fields of this tuple struct pat.
+     */
+    final Pat getAField() { result = this.getField(_) }
+
+    /**
+     * Gets the number of fields of this tuple struct pat.
+     */
+    final int getNumberOfFields() { result = count(int i | exists(this.getField(i))) }
+
     /**
      * Gets the path of this tuple struct pat, if it exists.
      */
@@ -44,37 +64,5 @@ module Generated {
      * Holds if `getPath()` exists.
      */
     final predicate hasPath() { exists(this.getPath()) }
-
-    /**
-     * Gets the `index`th argument of this tuple struct pat (0-based).
-     */
-    Pat getArg(int index) {
-      result =
-        Synth::convertPatFromRaw(Synth::convertTupleStructPatToRaw(this)
-              .(Raw::TupleStructPat)
-              .getArg(index))
-    }
-
-    /**
-     * Gets any of the arguments of this tuple struct pat.
-     */
-    final Pat getAnArg() { result = this.getArg(_) }
-
-    /**
-     * Gets the number of arguments of this tuple struct pat.
-     */
-    final int getNumberOfArgs() { result = count(int i | exists(this.getArg(i))) }
-
-    /**
-     * Gets the ellipsis index of this tuple struct pat, if it exists.
-     */
-    int getEllipsisIndex() {
-      result = Synth::convertTupleStructPatToRaw(this).(Raw::TupleStructPat).getEllipsisIndex()
-    }
-
-    /**
-     * Holds if `getEllipsisIndex()` exists.
-     */
-    final predicate hasEllipsisIndex() { exists(this.getEllipsisIndex()) }
   }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/TupleType.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/TupleType.qll
new file mode 100644
index 00000000000..ec7d95114d8
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/TupleType.qll
@@ -0,0 +1,48 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `TupleType`.
+ * INTERNAL: Do not import directly.
+ */
+
+private import codeql.rust.elements.internal.generated.Synth
+private import codeql.rust.elements.internal.generated.Raw
+import codeql.rust.elements.TypeRef
+import codeql.rust.elements.internal.TypeRefImpl::Impl as TypeRefImpl
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `TupleType` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * A TupleType. For example:
+   * ```rust
+   * todo!()
+   * ```
+   * INTERNAL: Do not reference the `Generated::TupleType` class directly.
+   * Use the subclass `TupleType`, where the following predicates are available.
+   */
+  class TupleType extends Synth::TTupleType, TypeRefImpl::TypeRef {
+    override string getAPrimaryQlClass() { result = "TupleType" }
+
+    /**
+     * Gets the `index`th field of this tuple type (0-based).
+     */
+    TypeRef getField(int index) {
+      result =
+        Synth::convertTypeRefFromRaw(Synth::convertTupleTypeToRaw(this)
+              .(Raw::TupleType)
+              .getField(index))
+    }
+
+    /**
+     * Gets any of the fields of this tuple type.
+     */
+    final TypeRef getAField() { result = this.getField(_) }
+
+    /**
+     * Gets the number of fields of this tuple type.
+     */
+    final int getNumberOfFields() { result = count(int i | exists(this.getField(i))) }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/TypeAlias.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/TypeAlias.qll
new file mode 100644
index 00000000000..2f5294ef65e
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/TypeAlias.qll
@@ -0,0 +1,147 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `TypeAlias`.
+ * INTERNAL: Do not import directly.
+ */
+
+private import codeql.rust.elements.internal.generated.Synth
+private import codeql.rust.elements.internal.generated.Raw
+import codeql.rust.elements.internal.AssocItemImpl::Impl as AssocItemImpl
+import codeql.rust.elements.Attr
+import codeql.rust.elements.internal.ExternItemImpl::Impl as ExternItemImpl
+import codeql.rust.elements.GenericParamList
+import codeql.rust.elements.internal.ItemImpl::Impl as ItemImpl
+import codeql.rust.elements.Name
+import codeql.rust.elements.TypeBoundList
+import codeql.rust.elements.TypeRef
+import codeql.rust.elements.Visibility
+import codeql.rust.elements.WhereClause
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `TypeAlias` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * A TypeAlias. For example:
+   * ```rust
+   * todo!()
+   * ```
+   * INTERNAL: Do not reference the `Generated::TypeAlias` class directly.
+   * Use the subclass `TypeAlias`, where the following predicates are available.
+   */
+  class TypeAlias extends Synth::TTypeAlias, AssocItemImpl::AssocItem, ExternItemImpl::ExternItem,
+    ItemImpl::Item
+  {
+    override string getAPrimaryQlClass() { result = "TypeAlias" }
+
+    /**
+     * Gets the `index`th attr of this type alias (0-based).
+     */
+    Attr getAttr(int index) {
+      result =
+        Synth::convertAttrFromRaw(Synth::convertTypeAliasToRaw(this).(Raw::TypeAlias).getAttr(index))
+    }
+
+    /**
+     * Gets any of the attrs of this type alias.
+     */
+    final Attr getAnAttr() { result = this.getAttr(_) }
+
+    /**
+     * Gets the number of attrs of this type alias.
+     */
+    final int getNumberOfAttrs() { result = count(int i | exists(this.getAttr(i))) }
+
+    /**
+     * Gets the generic parameter list of this type alias, if it exists.
+     */
+    GenericParamList getGenericParamList() {
+      result =
+        Synth::convertGenericParamListFromRaw(Synth::convertTypeAliasToRaw(this)
+              .(Raw::TypeAlias)
+              .getGenericParamList())
+    }
+
+    /**
+     * Holds if `getGenericParamList()` exists.
+     */
+    final predicate hasGenericParamList() { exists(this.getGenericParamList()) }
+
+    /**
+     * Holds if this type alias is default.
+     */
+    predicate isDefault() { Synth::convertTypeAliasToRaw(this).(Raw::TypeAlias).isDefault() }
+
+    /**
+     * Gets the name of this type alias, if it exists.
+     */
+    Name getName() {
+      result =
+        Synth::convertNameFromRaw(Synth::convertTypeAliasToRaw(this).(Raw::TypeAlias).getName())
+    }
+
+    /**
+     * Holds if `getName()` exists.
+     */
+    final predicate hasName() { exists(this.getName()) }
+
+    /**
+     * Gets the ty of this type alias, if it exists.
+     */
+    TypeRef getTy() {
+      result =
+        Synth::convertTypeRefFromRaw(Synth::convertTypeAliasToRaw(this).(Raw::TypeAlias).getTy())
+    }
+
+    /**
+     * Holds if `getTy()` exists.
+     */
+    final predicate hasTy() { exists(this.getTy()) }
+
+    /**
+     * Gets the type bound list of this type alias, if it exists.
+     */
+    TypeBoundList getTypeBoundList() {
+      result =
+        Synth::convertTypeBoundListFromRaw(Synth::convertTypeAliasToRaw(this)
+              .(Raw::TypeAlias)
+              .getTypeBoundList())
+    }
+
+    /**
+     * Holds if `getTypeBoundList()` exists.
+     */
+    final predicate hasTypeBoundList() { exists(this.getTypeBoundList()) }
+
+    /**
+     * Gets the visibility of this type alias, if it exists.
+     */
+    Visibility getVisibility() {
+      result =
+        Synth::convertVisibilityFromRaw(Synth::convertTypeAliasToRaw(this)
+              .(Raw::TypeAlias)
+              .getVisibility())
+    }
+
+    /**
+     * Holds if `getVisibility()` exists.
+     */
+    final predicate hasVisibility() { exists(this.getVisibility()) }
+
+    /**
+     * Gets the where clause of this type alias, if it exists.
+     */
+    WhereClause getWhereClause() {
+      result =
+        Synth::convertWhereClauseFromRaw(Synth::convertTypeAliasToRaw(this)
+              .(Raw::TypeAlias)
+              .getWhereClause())
+    }
+
+    /**
+     * Holds if `getWhereClause()` exists.
+     */
+    final predicate hasWhereClause() { exists(this.getWhereClause()) }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/TypeArg.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/TypeArg.qll
new file mode 100644
index 00000000000..29b24efb930
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/TypeArg.qll
@@ -0,0 +1,40 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `TypeArg`.
+ * INTERNAL: Do not import directly.
+ */
+
+private import codeql.rust.elements.internal.generated.Synth
+private import codeql.rust.elements.internal.generated.Raw
+import codeql.rust.elements.internal.GenericArgImpl::Impl as GenericArgImpl
+import codeql.rust.elements.TypeRef
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `TypeArg` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * A TypeArg. For example:
+   * ```rust
+   * todo!()
+   * ```
+   * INTERNAL: Do not reference the `Generated::TypeArg` class directly.
+   * Use the subclass `TypeArg`, where the following predicates are available.
+   */
+  class TypeArg extends Synth::TTypeArg, GenericArgImpl::GenericArg {
+    override string getAPrimaryQlClass() { result = "TypeArg" }
+
+    /**
+     * Gets the ty of this type argument, if it exists.
+     */
+    TypeRef getTy() {
+      result = Synth::convertTypeRefFromRaw(Synth::convertTypeArgToRaw(this).(Raw::TypeArg).getTy())
+    }
+
+    /**
+     * Holds if `getTy()` exists.
+     */
+    final predicate hasTy() { exists(this.getTy()) }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/TypeBound.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/TypeBound.qll
new file mode 100644
index 00000000000..e83586d9cdf
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/TypeBound.qll
@@ -0,0 +1,83 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `TypeBound`.
+ * INTERNAL: Do not import directly.
+ */
+
+private import codeql.rust.elements.internal.generated.Synth
+private import codeql.rust.elements.internal.generated.Raw
+import codeql.rust.elements.internal.AstNodeImpl::Impl as AstNodeImpl
+import codeql.rust.elements.GenericParamList
+import codeql.rust.elements.Lifetime
+import codeql.rust.elements.TypeRef
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `TypeBound` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * A TypeBound. For example:
+   * ```rust
+   * todo!()
+   * ```
+   * INTERNAL: Do not reference the `Generated::TypeBound` class directly.
+   * Use the subclass `TypeBound`, where the following predicates are available.
+   */
+  class TypeBound extends Synth::TTypeBound, AstNodeImpl::AstNode {
+    override string getAPrimaryQlClass() { result = "TypeBound" }
+
+    /**
+     * Gets the generic parameter list of this type bound, if it exists.
+     */
+    GenericParamList getGenericParamList() {
+      result =
+        Synth::convertGenericParamListFromRaw(Synth::convertTypeBoundToRaw(this)
+              .(Raw::TypeBound)
+              .getGenericParamList())
+    }
+
+    /**
+     * Holds if `getGenericParamList()` exists.
+     */
+    final predicate hasGenericParamList() { exists(this.getGenericParamList()) }
+
+    /**
+     * Holds if this type bound is async.
+     */
+    predicate isAsync() { Synth::convertTypeBoundToRaw(this).(Raw::TypeBound).isAsync() }
+
+    /**
+     * Holds if this type bound is const.
+     */
+    predicate isConst() { Synth::convertTypeBoundToRaw(this).(Raw::TypeBound).isConst() }
+
+    /**
+     * Gets the lifetime of this type bound, if it exists.
+     */
+    Lifetime getLifetime() {
+      result =
+        Synth::convertLifetimeFromRaw(Synth::convertTypeBoundToRaw(this)
+              .(Raw::TypeBound)
+              .getLifetime())
+    }
+
+    /**
+     * Holds if `getLifetime()` exists.
+     */
+    final predicate hasLifetime() { exists(this.getLifetime()) }
+
+    /**
+     * Gets the ty of this type bound, if it exists.
+     */
+    TypeRef getTy() {
+      result =
+        Synth::convertTypeRefFromRaw(Synth::convertTypeBoundToRaw(this).(Raw::TypeBound).getTy())
+    }
+
+    /**
+     * Holds if `getTy()` exists.
+     */
+    final predicate hasTy() { exists(this.getTy()) }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/TypeBoundList.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/TypeBoundList.qll
new file mode 100644
index 00000000000..2781ab89de0
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/TypeBoundList.qll
@@ -0,0 +1,48 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `TypeBoundList`.
+ * INTERNAL: Do not import directly.
+ */
+
+private import codeql.rust.elements.internal.generated.Synth
+private import codeql.rust.elements.internal.generated.Raw
+import codeql.rust.elements.internal.AstNodeImpl::Impl as AstNodeImpl
+import codeql.rust.elements.TypeBound
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `TypeBoundList` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * A TypeBoundList. For example:
+   * ```rust
+   * todo!()
+   * ```
+   * INTERNAL: Do not reference the `Generated::TypeBoundList` class directly.
+   * Use the subclass `TypeBoundList`, where the following predicates are available.
+   */
+  class TypeBoundList extends Synth::TTypeBoundList, AstNodeImpl::AstNode {
+    override string getAPrimaryQlClass() { result = "TypeBoundList" }
+
+    /**
+     * Gets the `index`th bound of this type bound list (0-based).
+     */
+    TypeBound getBound(int index) {
+      result =
+        Synth::convertTypeBoundFromRaw(Synth::convertTypeBoundListToRaw(this)
+              .(Raw::TypeBoundList)
+              .getBound(index))
+    }
+
+    /**
+     * Gets any of the bounds of this type bound list.
+     */
+    final TypeBound getABound() { result = this.getBound(_) }
+
+    /**
+     * Gets the number of bounds of this type bound list.
+     */
+    final int getNumberOfBounds() { result = count(int i | exists(this.getBound(i))) }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/TypeParam.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/TypeParam.qll
new file mode 100644
index 00000000000..6b010ca50db
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/TypeParam.qll
@@ -0,0 +1,92 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `TypeParam`.
+ * INTERNAL: Do not import directly.
+ */
+
+private import codeql.rust.elements.internal.generated.Synth
+private import codeql.rust.elements.internal.generated.Raw
+import codeql.rust.elements.Attr
+import codeql.rust.elements.internal.GenericParamImpl::Impl as GenericParamImpl
+import codeql.rust.elements.Name
+import codeql.rust.elements.TypeBoundList
+import codeql.rust.elements.TypeRef
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `TypeParam` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * A TypeParam. For example:
+   * ```rust
+   * todo!()
+   * ```
+   * INTERNAL: Do not reference the `Generated::TypeParam` class directly.
+   * Use the subclass `TypeParam`, where the following predicates are available.
+   */
+  class TypeParam extends Synth::TTypeParam, GenericParamImpl::GenericParam {
+    override string getAPrimaryQlClass() { result = "TypeParam" }
+
+    /**
+     * Gets the `index`th attr of this type parameter (0-based).
+     */
+    Attr getAttr(int index) {
+      result =
+        Synth::convertAttrFromRaw(Synth::convertTypeParamToRaw(this).(Raw::TypeParam).getAttr(index))
+    }
+
+    /**
+     * Gets any of the attrs of this type parameter.
+     */
+    final Attr getAnAttr() { result = this.getAttr(_) }
+
+    /**
+     * Gets the number of attrs of this type parameter.
+     */
+    final int getNumberOfAttrs() { result = count(int i | exists(this.getAttr(i))) }
+
+    /**
+     * Gets the default type of this type parameter, if it exists.
+     */
+    TypeRef getDefaultType() {
+      result =
+        Synth::convertTypeRefFromRaw(Synth::convertTypeParamToRaw(this)
+              .(Raw::TypeParam)
+              .getDefaultType())
+    }
+
+    /**
+     * Holds if `getDefaultType()` exists.
+     */
+    final predicate hasDefaultType() { exists(this.getDefaultType()) }
+
+    /**
+     * Gets the name of this type parameter, if it exists.
+     */
+    Name getName() {
+      result =
+        Synth::convertNameFromRaw(Synth::convertTypeParamToRaw(this).(Raw::TypeParam).getName())
+    }
+
+    /**
+     * Holds if `getName()` exists.
+     */
+    final predicate hasName() { exists(this.getName()) }
+
+    /**
+     * Gets the type bound list of this type parameter, if it exists.
+     */
+    TypeBoundList getTypeBoundList() {
+      result =
+        Synth::convertTypeBoundListFromRaw(Synth::convertTypeParamToRaw(this)
+              .(Raw::TypeParam)
+              .getTypeBoundList())
+    }
+
+    /**
+     * Holds if `getTypeBoundList()` exists.
+     */
+    final predicate hasTypeBoundList() { exists(this.getTypeBoundList()) }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/TypeRef.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/TypeRef.qll
index 7e20a32add1..2eab9874ecc 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/TypeRef.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/TypeRef.qll
@@ -7,7 +7,6 @@
 private import codeql.rust.elements.internal.generated.Synth
 private import codeql.rust.elements.internal.generated.Raw
 import codeql.rust.elements.internal.AstNodeImpl::Impl as AstNodeImpl
-import codeql.rust.elements.internal.UnimplementedImpl::Impl as UnimplementedImpl
 
 /**
  * INTERNAL: This module contains the fully generated definition of `TypeRef` and should not
@@ -24,7 +23,5 @@ module Generated {
    * INTERNAL: Do not reference the `Generated::TypeRef` class directly.
    * Use the subclass `TypeRef`, where the following predicates are available.
    */
-  class TypeRef extends Synth::TTypeRef, AstNodeImpl::AstNode, UnimplementedImpl::Unimplemented {
-    override string getAPrimaryQlClass() { result = "TypeRef" }
-  }
+  class TypeRef extends Synth::TTypeRef, AstNodeImpl::AstNode { }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/UnderscoreExpr.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/UnderscoreExpr.qll
index 3227535df30..89cc654eb17 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/UnderscoreExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/UnderscoreExpr.qll
@@ -6,6 +6,7 @@
 
 private import codeql.rust.elements.internal.generated.Synth
 private import codeql.rust.elements.internal.generated.Raw
+import codeql.rust.elements.Attr
 import codeql.rust.elements.internal.ExprImpl::Impl as ExprImpl
 
 /**
@@ -23,5 +24,25 @@ module Generated {
    */
   class UnderscoreExpr extends Synth::TUnderscoreExpr, ExprImpl::Expr {
     override string getAPrimaryQlClass() { result = "UnderscoreExpr" }
+
+    /**
+     * Gets the `index`th attr of this underscore expression (0-based).
+     */
+    Attr getAttr(int index) {
+      result =
+        Synth::convertAttrFromRaw(Synth::convertUnderscoreExprToRaw(this)
+              .(Raw::UnderscoreExpr)
+              .getAttr(index))
+    }
+
+    /**
+     * Gets any of the attrs of this underscore expression.
+     */
+    final Attr getAnAttr() { result = this.getAttr(_) }
+
+    /**
+     * Gets the number of attrs of this underscore expression.
+     */
+    final int getNumberOfAttrs() { result = count(int i | exists(this.getAttr(i))) }
   }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/Unimplemented.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/Unimplemented.qll
index 7772db79adb..04e38d47781 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/Unimplemented.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/Unimplemented.qll
@@ -18,5 +18,7 @@ module Generated {
    * INTERNAL: Do not reference the `Generated::Unimplemented` class directly.
    * Use the subclass `Unimplemented`, where the following predicates are available.
    */
-  class Unimplemented extends Synth::TUnimplemented, UnextractedImpl::Unextracted { }
+  class Unimplemented extends Synth::TUnimplemented, UnextractedImpl::Unextracted {
+    override string getAPrimaryQlClass() { result = "Unimplemented" }
+  }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/UnimplementedDeclaration.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/UnimplementedDeclaration.qll
deleted file mode 100644
index 2acd04d4caa..00000000000
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/UnimplementedDeclaration.qll
+++ /dev/null
@@ -1,27 +0,0 @@
-// generated by codegen, do not edit
-/**
- * This module provides the generated definition of `UnimplementedDeclaration`.
- * INTERNAL: Do not import directly.
- */
-
-private import codeql.rust.elements.internal.generated.Synth
-private import codeql.rust.elements.internal.generated.Raw
-import codeql.rust.elements.internal.DeclarationImpl::Impl as DeclarationImpl
-import codeql.rust.elements.internal.UnimplementedImpl::Impl as UnimplementedImpl
-
-/**
- * INTERNAL: This module contains the fully generated definition of `UnimplementedDeclaration` and should not
- * be referenced directly.
- */
-module Generated {
-  /**
-   * A declaration that is not yet extracted.
-   * INTERNAL: Do not reference the `Generated::UnimplementedDeclaration` class directly.
-   * Use the subclass `UnimplementedDeclaration`, where the following predicates are available.
-   */
-  class UnimplementedDeclaration extends Synth::TUnimplementedDeclaration,
-    DeclarationImpl::Declaration, UnimplementedImpl::Unimplemented
-  {
-    override string getAPrimaryQlClass() { result = "UnimplementedDeclaration" }
-  }
-}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/Union.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/Union.qll
new file mode 100644
index 00000000000..a456d5b56e7
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/Union.qll
@@ -0,0 +1,120 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `Union`.
+ * INTERNAL: Do not import directly.
+ */
+
+private import codeql.rust.elements.internal.generated.Synth
+private import codeql.rust.elements.internal.generated.Raw
+import codeql.rust.elements.Attr
+import codeql.rust.elements.GenericParamList
+import codeql.rust.elements.internal.ItemImpl::Impl as ItemImpl
+import codeql.rust.elements.Name
+import codeql.rust.elements.RecordFieldList
+import codeql.rust.elements.Visibility
+import codeql.rust.elements.WhereClause
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `Union` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * A Union. For example:
+   * ```rust
+   * todo!()
+   * ```
+   * INTERNAL: Do not reference the `Generated::Union` class directly.
+   * Use the subclass `Union`, where the following predicates are available.
+   */
+  class Union extends Synth::TUnion, ItemImpl::Item {
+    override string getAPrimaryQlClass() { result = "Union" }
+
+    /**
+     * Gets the `index`th attr of this union (0-based).
+     */
+    Attr getAttr(int index) {
+      result = Synth::convertAttrFromRaw(Synth::convertUnionToRaw(this).(Raw::Union).getAttr(index))
+    }
+
+    /**
+     * Gets any of the attrs of this union.
+     */
+    final Attr getAnAttr() { result = this.getAttr(_) }
+
+    /**
+     * Gets the number of attrs of this union.
+     */
+    final int getNumberOfAttrs() { result = count(int i | exists(this.getAttr(i))) }
+
+    /**
+     * Gets the generic parameter list of this union, if it exists.
+     */
+    GenericParamList getGenericParamList() {
+      result =
+        Synth::convertGenericParamListFromRaw(Synth::convertUnionToRaw(this)
+              .(Raw::Union)
+              .getGenericParamList())
+    }
+
+    /**
+     * Holds if `getGenericParamList()` exists.
+     */
+    final predicate hasGenericParamList() { exists(this.getGenericParamList()) }
+
+    /**
+     * Gets the name of this union, if it exists.
+     */
+    Name getName() {
+      result = Synth::convertNameFromRaw(Synth::convertUnionToRaw(this).(Raw::Union).getName())
+    }
+
+    /**
+     * Holds if `getName()` exists.
+     */
+    final predicate hasName() { exists(this.getName()) }
+
+    /**
+     * Gets the record field list of this union, if it exists.
+     */
+    RecordFieldList getRecordFieldList() {
+      result =
+        Synth::convertRecordFieldListFromRaw(Synth::convertUnionToRaw(this)
+              .(Raw::Union)
+              .getRecordFieldList())
+    }
+
+    /**
+     * Holds if `getRecordFieldList()` exists.
+     */
+    final predicate hasRecordFieldList() { exists(this.getRecordFieldList()) }
+
+    /**
+     * Gets the visibility of this union, if it exists.
+     */
+    Visibility getVisibility() {
+      result =
+        Synth::convertVisibilityFromRaw(Synth::convertUnionToRaw(this).(Raw::Union).getVisibility())
+    }
+
+    /**
+     * Holds if `getVisibility()` exists.
+     */
+    final predicate hasVisibility() { exists(this.getVisibility()) }
+
+    /**
+     * Gets the where clause of this union, if it exists.
+     */
+    WhereClause getWhereClause() {
+      result =
+        Synth::convertWhereClauseFromRaw(Synth::convertUnionToRaw(this)
+              .(Raw::Union)
+              .getWhereClause())
+    }
+
+    /**
+     * Holds if `getWhereClause()` exists.
+     */
+    final predicate hasWhereClause() { exists(this.getWhereClause()) }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/UnsafeBlockExpr.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/UnsafeBlockExpr.qll
deleted file mode 100644
index 052f1737606..00000000000
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/UnsafeBlockExpr.qll
+++ /dev/null
@@ -1,30 +0,0 @@
-// generated by codegen, do not edit
-/**
- * This module provides the generated definition of `UnsafeBlockExpr`.
- * INTERNAL: Do not import directly.
- */
-
-private import codeql.rust.elements.internal.generated.Synth
-private import codeql.rust.elements.internal.generated.Raw
-import codeql.rust.elements.internal.BlockExprBaseImpl::Impl as BlockExprBaseImpl
-
-/**
- * INTERNAL: This module contains the fully generated definition of `UnsafeBlockExpr` and should not
- * be referenced directly.
- */
-module Generated {
-  /**
-   * An unsafe block expression. For example:
-   * ```rust
-   * let layout = unsafe {
-   *     let x = 42;
-   *     Layout::from_size_align_unchecked(size, align)
-   * };
-   * ```
-   * INTERNAL: Do not reference the `Generated::UnsafeBlockExpr` class directly.
-   * Use the subclass `UnsafeBlockExpr`, where the following predicates are available.
-   */
-  class UnsafeBlockExpr extends Synth::TUnsafeBlockExpr, BlockExprBaseImpl::BlockExprBase {
-    override string getAPrimaryQlClass() { result = "UnsafeBlockExpr" }
-  }
-}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/Use.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/Use.qll
new file mode 100644
index 00000000000..2bc1364b790
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/Use.qll
@@ -0,0 +1,72 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `Use`.
+ * INTERNAL: Do not import directly.
+ */
+
+private import codeql.rust.elements.internal.generated.Synth
+private import codeql.rust.elements.internal.generated.Raw
+import codeql.rust.elements.Attr
+import codeql.rust.elements.internal.ItemImpl::Impl as ItemImpl
+import codeql.rust.elements.UseTree
+import codeql.rust.elements.Visibility
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `Use` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * A Use. For example:
+   * ```rust
+   * todo!()
+   * ```
+   * INTERNAL: Do not reference the `Generated::Use` class directly.
+   * Use the subclass `Use`, where the following predicates are available.
+   */
+  class Use extends Synth::TUse, ItemImpl::Item {
+    override string getAPrimaryQlClass() { result = "Use" }
+
+    /**
+     * Gets the `index`th attr of this use (0-based).
+     */
+    Attr getAttr(int index) {
+      result = Synth::convertAttrFromRaw(Synth::convertUseToRaw(this).(Raw::Use).getAttr(index))
+    }
+
+    /**
+     * Gets any of the attrs of this use.
+     */
+    final Attr getAnAttr() { result = this.getAttr(_) }
+
+    /**
+     * Gets the number of attrs of this use.
+     */
+    final int getNumberOfAttrs() { result = count(int i | exists(this.getAttr(i))) }
+
+    /**
+     * Gets the use tree of this use, if it exists.
+     */
+    UseTree getUseTree() {
+      result = Synth::convertUseTreeFromRaw(Synth::convertUseToRaw(this).(Raw::Use).getUseTree())
+    }
+
+    /**
+     * Holds if `getUseTree()` exists.
+     */
+    final predicate hasUseTree() { exists(this.getUseTree()) }
+
+    /**
+     * Gets the visibility of this use, if it exists.
+     */
+    Visibility getVisibility() {
+      result =
+        Synth::convertVisibilityFromRaw(Synth::convertUseToRaw(this).(Raw::Use).getVisibility())
+    }
+
+    /**
+     * Holds if `getVisibility()` exists.
+     */
+    final predicate hasVisibility() { exists(this.getVisibility()) }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/UseTree.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/UseTree.qll
new file mode 100644
index 00000000000..38696c378ad
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/UseTree.qll
@@ -0,0 +1,70 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `UseTree`.
+ * INTERNAL: Do not import directly.
+ */
+
+private import codeql.rust.elements.internal.generated.Synth
+private import codeql.rust.elements.internal.generated.Raw
+import codeql.rust.elements.internal.AstNodeImpl::Impl as AstNodeImpl
+import codeql.rust.elements.Path
+import codeql.rust.elements.Rename
+import codeql.rust.elements.UseTreeList
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `UseTree` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * A UseTree. For example:
+   * ```rust
+   * todo!()
+   * ```
+   * INTERNAL: Do not reference the `Generated::UseTree` class directly.
+   * Use the subclass `UseTree`, where the following predicates are available.
+   */
+  class UseTree extends Synth::TUseTree, AstNodeImpl::AstNode {
+    override string getAPrimaryQlClass() { result = "UseTree" }
+
+    /**
+     * Gets the path of this use tree, if it exists.
+     */
+    Path getPath() {
+      result = Synth::convertPathFromRaw(Synth::convertUseTreeToRaw(this).(Raw::UseTree).getPath())
+    }
+
+    /**
+     * Holds if `getPath()` exists.
+     */
+    final predicate hasPath() { exists(this.getPath()) }
+
+    /**
+     * Gets the rename of this use tree, if it exists.
+     */
+    Rename getRename() {
+      result =
+        Synth::convertRenameFromRaw(Synth::convertUseTreeToRaw(this).(Raw::UseTree).getRename())
+    }
+
+    /**
+     * Holds if `getRename()` exists.
+     */
+    final predicate hasRename() { exists(this.getRename()) }
+
+    /**
+     * Gets the use tree list of this use tree, if it exists.
+     */
+    UseTreeList getUseTreeList() {
+      result =
+        Synth::convertUseTreeListFromRaw(Synth::convertUseTreeToRaw(this)
+              .(Raw::UseTree)
+              .getUseTreeList())
+    }
+
+    /**
+     * Holds if `getUseTreeList()` exists.
+     */
+    final predicate hasUseTreeList() { exists(this.getUseTreeList()) }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/UseTreeList.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/UseTreeList.qll
new file mode 100644
index 00000000000..9aa72b89a1e
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/UseTreeList.qll
@@ -0,0 +1,48 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `UseTreeList`.
+ * INTERNAL: Do not import directly.
+ */
+
+private import codeql.rust.elements.internal.generated.Synth
+private import codeql.rust.elements.internal.generated.Raw
+import codeql.rust.elements.internal.AstNodeImpl::Impl as AstNodeImpl
+import codeql.rust.elements.UseTree
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `UseTreeList` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * A UseTreeList. For example:
+   * ```rust
+   * todo!()
+   * ```
+   * INTERNAL: Do not reference the `Generated::UseTreeList` class directly.
+   * Use the subclass `UseTreeList`, where the following predicates are available.
+   */
+  class UseTreeList extends Synth::TUseTreeList, AstNodeImpl::AstNode {
+    override string getAPrimaryQlClass() { result = "UseTreeList" }
+
+    /**
+     * Gets the `index`th use tree of this use tree list (0-based).
+     */
+    UseTree getUseTree(int index) {
+      result =
+        Synth::convertUseTreeFromRaw(Synth::convertUseTreeListToRaw(this)
+              .(Raw::UseTreeList)
+              .getUseTree(index))
+    }
+
+    /**
+     * Gets any of the use trees of this use tree list.
+     */
+    final UseTree getAUseTree() { result = this.getUseTree(_) }
+
+    /**
+     * Gets the number of use trees of this use tree list.
+     */
+    final int getNumberOfUseTrees() { result = count(int i | exists(this.getUseTree(i))) }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/Variant.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/Variant.qll
new file mode 100644
index 00000000000..ec57b2a03da
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/Variant.qll
@@ -0,0 +1,104 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `Variant`.
+ * INTERNAL: Do not import directly.
+ */
+
+private import codeql.rust.elements.internal.generated.Synth
+private import codeql.rust.elements.internal.generated.Raw
+import codeql.rust.elements.internal.AstNodeImpl::Impl as AstNodeImpl
+import codeql.rust.elements.Attr
+import codeql.rust.elements.Expr
+import codeql.rust.elements.FieldList
+import codeql.rust.elements.Name
+import codeql.rust.elements.Visibility
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `Variant` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * A Variant. For example:
+   * ```rust
+   * todo!()
+   * ```
+   * INTERNAL: Do not reference the `Generated::Variant` class directly.
+   * Use the subclass `Variant`, where the following predicates are available.
+   */
+  class Variant extends Synth::TVariant, AstNodeImpl::AstNode {
+    override string getAPrimaryQlClass() { result = "Variant" }
+
+    /**
+     * Gets the `index`th attr of this variant (0-based).
+     */
+    Attr getAttr(int index) {
+      result =
+        Synth::convertAttrFromRaw(Synth::convertVariantToRaw(this).(Raw::Variant).getAttr(index))
+    }
+
+    /**
+     * Gets any of the attrs of this variant.
+     */
+    final Attr getAnAttr() { result = this.getAttr(_) }
+
+    /**
+     * Gets the number of attrs of this variant.
+     */
+    final int getNumberOfAttrs() { result = count(int i | exists(this.getAttr(i))) }
+
+    /**
+     * Gets the expression of this variant, if it exists.
+     */
+    Expr getExpr() {
+      result = Synth::convertExprFromRaw(Synth::convertVariantToRaw(this).(Raw::Variant).getExpr())
+    }
+
+    /**
+     * Holds if `getExpr()` exists.
+     */
+    final predicate hasExpr() { exists(this.getExpr()) }
+
+    /**
+     * Gets the field list of this variant, if it exists.
+     */
+    FieldList getFieldList() {
+      result =
+        Synth::convertFieldListFromRaw(Synth::convertVariantToRaw(this)
+              .(Raw::Variant)
+              .getFieldList())
+    }
+
+    /**
+     * Holds if `getFieldList()` exists.
+     */
+    final predicate hasFieldList() { exists(this.getFieldList()) }
+
+    /**
+     * Gets the name of this variant, if it exists.
+     */
+    Name getName() {
+      result = Synth::convertNameFromRaw(Synth::convertVariantToRaw(this).(Raw::Variant).getName())
+    }
+
+    /**
+     * Holds if `getName()` exists.
+     */
+    final predicate hasName() { exists(this.getName()) }
+
+    /**
+     * Gets the visibility of this variant, if it exists.
+     */
+    Visibility getVisibility() {
+      result =
+        Synth::convertVisibilityFromRaw(Synth::convertVariantToRaw(this)
+              .(Raw::Variant)
+              .getVisibility())
+    }
+
+    /**
+     * Holds if `getVisibility()` exists.
+     */
+    final predicate hasVisibility() { exists(this.getVisibility()) }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/VariantList.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/VariantList.qll
new file mode 100644
index 00000000000..a09fcb80e3d
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/VariantList.qll
@@ -0,0 +1,48 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `VariantList`.
+ * INTERNAL: Do not import directly.
+ */
+
+private import codeql.rust.elements.internal.generated.Synth
+private import codeql.rust.elements.internal.generated.Raw
+import codeql.rust.elements.internal.AstNodeImpl::Impl as AstNodeImpl
+import codeql.rust.elements.Variant
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `VariantList` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * A VariantList. For example:
+   * ```rust
+   * todo!()
+   * ```
+   * INTERNAL: Do not reference the `Generated::VariantList` class directly.
+   * Use the subclass `VariantList`, where the following predicates are available.
+   */
+  class VariantList extends Synth::TVariantList, AstNodeImpl::AstNode {
+    override string getAPrimaryQlClass() { result = "VariantList" }
+
+    /**
+     * Gets the `index`th variant of this variant list (0-based).
+     */
+    Variant getVariant(int index) {
+      result =
+        Synth::convertVariantFromRaw(Synth::convertVariantListToRaw(this)
+              .(Raw::VariantList)
+              .getVariant(index))
+    }
+
+    /**
+     * Gets any of the variants of this variant list.
+     */
+    final Variant getAVariant() { result = this.getVariant(_) }
+
+    /**
+     * Gets the number of variants of this variant list.
+     */
+    final int getNumberOfVariants() { result = count(int i | exists(this.getVariant(i))) }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/Visibility.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/Visibility.qll
new file mode 100644
index 00000000000..ba397d4a5d2
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/Visibility.qll
@@ -0,0 +1,41 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `Visibility`.
+ * INTERNAL: Do not import directly.
+ */
+
+private import codeql.rust.elements.internal.generated.Synth
+private import codeql.rust.elements.internal.generated.Raw
+import codeql.rust.elements.internal.AstNodeImpl::Impl as AstNodeImpl
+import codeql.rust.elements.Path
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `Visibility` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * A Visibility. For example:
+   * ```rust
+   * todo!()
+   * ```
+   * INTERNAL: Do not reference the `Generated::Visibility` class directly.
+   * Use the subclass `Visibility`, where the following predicates are available.
+   */
+  class Visibility extends Synth::TVisibility, AstNodeImpl::AstNode {
+    override string getAPrimaryQlClass() { result = "Visibility" }
+
+    /**
+     * Gets the path of this visibility, if it exists.
+     */
+    Path getPath() {
+      result =
+        Synth::convertPathFromRaw(Synth::convertVisibilityToRaw(this).(Raw::Visibility).getPath())
+    }
+
+    /**
+     * Holds if `getPath()` exists.
+     */
+    final predicate hasPath() { exists(this.getPath()) }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/WhereClause.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/WhereClause.qll
new file mode 100644
index 00000000000..727af1be136
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/WhereClause.qll
@@ -0,0 +1,48 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `WhereClause`.
+ * INTERNAL: Do not import directly.
+ */
+
+private import codeql.rust.elements.internal.generated.Synth
+private import codeql.rust.elements.internal.generated.Raw
+import codeql.rust.elements.internal.AstNodeImpl::Impl as AstNodeImpl
+import codeql.rust.elements.WherePred
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `WhereClause` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * A WhereClause. For example:
+   * ```rust
+   * todo!()
+   * ```
+   * INTERNAL: Do not reference the `Generated::WhereClause` class directly.
+   * Use the subclass `WhereClause`, where the following predicates are available.
+   */
+  class WhereClause extends Synth::TWhereClause, AstNodeImpl::AstNode {
+    override string getAPrimaryQlClass() { result = "WhereClause" }
+
+    /**
+     * Gets the `index`th predicate of this where clause (0-based).
+     */
+    WherePred getPredicate(int index) {
+      result =
+        Synth::convertWherePredFromRaw(Synth::convertWhereClauseToRaw(this)
+              .(Raw::WhereClause)
+              .getPredicate(index))
+    }
+
+    /**
+     * Gets any of the predicates of this where clause.
+     */
+    final WherePred getAPredicate() { result = this.getPredicate(_) }
+
+    /**
+     * Gets the number of predicates of this where clause.
+     */
+    final int getNumberOfPredicates() { result = count(int i | exists(this.getPredicate(i))) }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/WherePred.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/WherePred.qll
new file mode 100644
index 00000000000..90a1d732b30
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/WherePred.qll
@@ -0,0 +1,89 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `WherePred`.
+ * INTERNAL: Do not import directly.
+ */
+
+private import codeql.rust.elements.internal.generated.Synth
+private import codeql.rust.elements.internal.generated.Raw
+import codeql.rust.elements.internal.AstNodeImpl::Impl as AstNodeImpl
+import codeql.rust.elements.GenericParamList
+import codeql.rust.elements.Lifetime
+import codeql.rust.elements.TypeBoundList
+import codeql.rust.elements.TypeRef
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `WherePred` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * A WherePred. For example:
+   * ```rust
+   * todo!()
+   * ```
+   * INTERNAL: Do not reference the `Generated::WherePred` class directly.
+   * Use the subclass `WherePred`, where the following predicates are available.
+   */
+  class WherePred extends Synth::TWherePred, AstNodeImpl::AstNode {
+    override string getAPrimaryQlClass() { result = "WherePred" }
+
+    /**
+     * Gets the generic parameter list of this where pred, if it exists.
+     */
+    GenericParamList getGenericParamList() {
+      result =
+        Synth::convertGenericParamListFromRaw(Synth::convertWherePredToRaw(this)
+              .(Raw::WherePred)
+              .getGenericParamList())
+    }
+
+    /**
+     * Holds if `getGenericParamList()` exists.
+     */
+    final predicate hasGenericParamList() { exists(this.getGenericParamList()) }
+
+    /**
+     * Gets the lifetime of this where pred, if it exists.
+     */
+    Lifetime getLifetime() {
+      result =
+        Synth::convertLifetimeFromRaw(Synth::convertWherePredToRaw(this)
+              .(Raw::WherePred)
+              .getLifetime())
+    }
+
+    /**
+     * Holds if `getLifetime()` exists.
+     */
+    final predicate hasLifetime() { exists(this.getLifetime()) }
+
+    /**
+     * Gets the ty of this where pred, if it exists.
+     */
+    TypeRef getTy() {
+      result =
+        Synth::convertTypeRefFromRaw(Synth::convertWherePredToRaw(this).(Raw::WherePred).getTy())
+    }
+
+    /**
+     * Holds if `getTy()` exists.
+     */
+    final predicate hasTy() { exists(this.getTy()) }
+
+    /**
+     * Gets the type bound list of this where pred, if it exists.
+     */
+    TypeBoundList getTypeBoundList() {
+      result =
+        Synth::convertTypeBoundListFromRaw(Synth::convertWherePredToRaw(this)
+              .(Raw::WherePred)
+              .getTypeBoundList())
+    }
+
+    /**
+     * Holds if `getTypeBoundList()` exists.
+     */
+    final predicate hasTypeBoundList() { exists(this.getTypeBoundList()) }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/WhileExpr.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/WhileExpr.qll
new file mode 100644
index 00000000000..5cd48bb2506
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/WhileExpr.qll
@@ -0,0 +1,90 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `WhileExpr`.
+ * INTERNAL: Do not import directly.
+ */
+
+private import codeql.rust.elements.internal.generated.Synth
+private import codeql.rust.elements.internal.generated.Raw
+import codeql.rust.elements.Attr
+import codeql.rust.elements.BlockExpr
+import codeql.rust.elements.Expr
+import codeql.rust.elements.internal.ExprImpl::Impl as ExprImpl
+import codeql.rust.elements.Label
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `WhileExpr` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * A WhileExpr. For example:
+   * ```rust
+   * todo!()
+   * ```
+   * INTERNAL: Do not reference the `Generated::WhileExpr` class directly.
+   * Use the subclass `WhileExpr`, where the following predicates are available.
+   */
+  class WhileExpr extends Synth::TWhileExpr, ExprImpl::Expr {
+    override string getAPrimaryQlClass() { result = "WhileExpr" }
+
+    /**
+     * Gets the `index`th attr of this while expression (0-based).
+     */
+    Attr getAttr(int index) {
+      result =
+        Synth::convertAttrFromRaw(Synth::convertWhileExprToRaw(this).(Raw::WhileExpr).getAttr(index))
+    }
+
+    /**
+     * Gets any of the attrs of this while expression.
+     */
+    final Attr getAnAttr() { result = this.getAttr(_) }
+
+    /**
+     * Gets the number of attrs of this while expression.
+     */
+    final int getNumberOfAttrs() { result = count(int i | exists(this.getAttr(i))) }
+
+    /**
+     * Gets the condition of this while expression, if it exists.
+     */
+    Expr getCondition() {
+      result =
+        Synth::convertExprFromRaw(Synth::convertWhileExprToRaw(this).(Raw::WhileExpr).getCondition())
+    }
+
+    /**
+     * Holds if `getCondition()` exists.
+     */
+    final predicate hasCondition() { exists(this.getCondition()) }
+
+    /**
+     * Gets the label of this while expression, if it exists.
+     */
+    Label getLabel() {
+      result =
+        Synth::convertLabelFromRaw(Synth::convertWhileExprToRaw(this).(Raw::WhileExpr).getLabel())
+    }
+
+    /**
+     * Holds if `getLabel()` exists.
+     */
+    final predicate hasLabel() { exists(this.getLabel()) }
+
+    /**
+     * Gets the loop body of this while expression, if it exists.
+     */
+    BlockExpr getLoopBody() {
+      result =
+        Synth::convertBlockExprFromRaw(Synth::convertWhileExprToRaw(this)
+              .(Raw::WhileExpr)
+              .getLoopBody())
+    }
+
+    /**
+     * Holds if `getLoopBody()` exists.
+     */
+    final predicate hasLoopBody() { exists(this.getLoopBody()) }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/YeetExpr.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/YeetExpr.qll
index e067204ce9e..a9bd1e991d5 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/YeetExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/YeetExpr.qll
@@ -6,6 +6,7 @@
 
 private import codeql.rust.elements.internal.generated.Synth
 private import codeql.rust.elements.internal.generated.Raw
+import codeql.rust.elements.Attr
 import codeql.rust.elements.Expr
 import codeql.rust.elements.internal.ExprImpl::Impl as ExprImpl
 
@@ -27,6 +28,24 @@ module Generated {
   class YeetExpr extends Synth::TYeetExpr, ExprImpl::Expr {
     override string getAPrimaryQlClass() { result = "YeetExpr" }
 
+    /**
+     * Gets the `index`th attr of this yeet expression (0-based).
+     */
+    Attr getAttr(int index) {
+      result =
+        Synth::convertAttrFromRaw(Synth::convertYeetExprToRaw(this).(Raw::YeetExpr).getAttr(index))
+    }
+
+    /**
+     * Gets any of the attrs of this yeet expression.
+     */
+    final Attr getAnAttr() { result = this.getAttr(_) }
+
+    /**
+     * Gets the number of attrs of this yeet expression.
+     */
+    final int getNumberOfAttrs() { result = count(int i | exists(this.getAttr(i))) }
+
     /**
      * Gets the expression of this yeet expression, if it exists.
      */
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/YieldExpr.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/YieldExpr.qll
index 790726d669f..03541b83cfb 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/YieldExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/YieldExpr.qll
@@ -6,6 +6,7 @@
 
 private import codeql.rust.elements.internal.generated.Synth
 private import codeql.rust.elements.internal.generated.Raw
+import codeql.rust.elements.Attr
 import codeql.rust.elements.Expr
 import codeql.rust.elements.internal.ExprImpl::Impl as ExprImpl
 
@@ -28,6 +29,24 @@ module Generated {
   class YieldExpr extends Synth::TYieldExpr, ExprImpl::Expr {
     override string getAPrimaryQlClass() { result = "YieldExpr" }
 
+    /**
+     * Gets the `index`th attr of this yield expression (0-based).
+     */
+    Attr getAttr(int index) {
+      result =
+        Synth::convertAttrFromRaw(Synth::convertYieldExprToRaw(this).(Raw::YieldExpr).getAttr(index))
+    }
+
+    /**
+     * Gets any of the attrs of this yield expression.
+     */
+    final Attr getAnAttr() { result = this.getAttr(_) }
+
+    /**
+     * Gets the number of attrs of this yield expression.
+     */
+    final int getNumberOfAttrs() { result = count(int i | exists(this.getAttr(i))) }
+
     /**
      * Gets the expression of this yield expression, if it exists.
      */
diff --git a/rust/ql/lib/codeql/rust/internal/CachedStages.qll b/rust/ql/lib/codeql/rust/internal/CachedStages.qll
new file mode 100644
index 00000000000..162853846f2
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/internal/CachedStages.qll
@@ -0,0 +1,98 @@
+/**
+ * The purpose of this file is to control which cached predicates belong to the same stage.
+ *
+ * Combining stages can improve performance as we are more likely to reuse shared, non-cached predicates.
+ *
+ * To make a predicate `p` belong to a stage `A`:
+ * - make `p` depend on `A::ref()`, and
+ * - make `A::backref()` depend on `p`.
+ *
+ * Since `A` is a cached module, `ref` and `backref` must be in the same stage, and the dependency
+ * chain above thus forces `p` to be in that stage as well.
+ *
+ * With these two predicates in a `cached module` we ensure that all the cached predicates will be in a single stage at runtime.
+ *
+ * Grouping stages can cause unnecessary computation, as a concrete query might not depend on
+ * all the cached predicates in a stage.
+ * Care should therefore be taken not to combine two stages, if it is likely that a query only depend
+ * on some but not all the cached predicates in the combined stage.
+ */
+
+import rust
+
+/**
+ * Contains a `cached module` for each stage.
+ * Each `cached module` ensures that predicates that are supposed to be in the same stage, are in the same stage.
+ *
+ * Each `cached module` contain two predicates:
+ * The first, `ref`, always holds, and is referenced from `cached` predicates.
+ * The second, `backref`, contains references to the same `cached` predicates.
+ * The `backref` predicate starts with `1 = 1 or` to ensure that the predicate will be optimized down to a constant by the optimizer.
+ */
+module Stages {
+  /**
+   * The abstract syntex tree (AST) stage.
+   */
+  cached
+  module AstStage {
+    private import codeql.rust.controlflow.internal.Splitting
+    private import codeql.rust.controlflow.internal.SuccessorType
+    private import codeql.rust.controlflow.internal.ControlFlowGraphImpl
+
+    /**
+     * Always holds.
+     * Ensures that a predicate is evaluated as part of the AST stage.
+     */
+    cached
+    predicate ref() { 1 = 1 }
+
+    /**
+     * DO NOT USE!
+     *
+     * Contains references to each predicate that use the above `ref` predicate.
+     */
+    cached
+    predicate backref() {
+      1 = 1
+      or
+      exists(Location l)
+      or
+      exists(any(Locatable l).getLocation())
+      or
+      exists(Format f)
+    }
+  }
+
+  /**
+   * The control flow graph (CFG) stage.
+   */
+  cached
+  module CfgStage {
+    private import codeql.rust.controlflow.internal.Splitting
+    private import codeql.rust.controlflow.internal.SuccessorType
+    private import codeql.rust.controlflow.internal.ControlFlowGraphImpl
+
+    /**
+     * Always holds.
+     * Ensures that a predicate is evaluated as part of the CFG stage.
+     */
+    cached
+    predicate ref() { 1 = 1 }
+
+    /**
+     * DO NOT USE!
+     *
+     * Contains references to each predicate that use the above `ref` predicate.
+     */
+    cached
+    predicate backref() {
+      1 = 1
+      or
+      exists(TConditionalCompletionSplitKind())
+      or
+      exists(TNormalSuccessor())
+      or
+      exists(AstCfgNode n)
+    }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/internal/Definitions.qll b/rust/ql/lib/codeql/rust/internal/Definitions.qll
new file mode 100644
index 00000000000..6b380dae332
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/internal/Definitions.qll
@@ -0,0 +1,126 @@
+/**
+ * Provides classes and predicates related to jump-to-definition links
+ * in the code viewer.
+ */
+
+private import codeql.rust.elements.Variable
+private import codeql.rust.elements.Locatable
+private import codeql.rust.elements.FormatArgsExpr
+private import codeql.rust.elements.FormatArgsArg
+private import codeql.rust.elements.Format
+private import codeql.rust.elements.MacroCall
+private import codeql.rust.elements.NamedFormatArgument
+private import codeql.rust.elements.PositionalFormatArgument
+private import codeql.Locations
+
+/** An element with an associated definition. */
+abstract class Use extends Locatable {
+  /** Gets the definition associated with this element. */
+  abstract Definition getDefinition();
+
+  /**
+   * Gets the type of use.
+   */
+  abstract string getUseType();
+}
+
+cached
+private module Cached {
+  cached
+  newtype TDef =
+    TVariable(Variable v) or
+    TFormatArgsArgName(Name name) { name = any(FormatArgsArg a).getName() } or
+    TFormatArgsArgIndex(Expr e) { e = any(FormatArgsArg a).getExpr() }
+
+  /**
+   * Gets an element, of kind `kind`, that element `use` uses, if any.
+   */
+  cached
+  Definition definitionOf(Use use, string kind) {
+    result = use.getDefinition() and
+    kind = use.getUseType() and
+    not result.getLocation() = any(MacroCall m).getLocation()
+  }
+}
+
+predicate definitionOf = Cached::definitionOf/2;
+
+/** A definition */
+class Definition extends Cached::TDef {
+  /** Gets the location of this variable. */
+  Location getLocation() {
+    result = this.asVariable().getLocation() or
+    result = this.asName().getLocation() or
+    result = this.asExpr().getLocation()
+  }
+
+  /** Gets this definition as a `Variable` */
+  Variable asVariable() { this = Cached::TVariable(result) }
+
+  /** Gets this definition as a `Name` */
+  Name asName() { this = Cached::TFormatArgsArgName(result) }
+
+  /** Gets this definition as an `Expr` */
+  Expr asExpr() { this = Cached::TFormatArgsArgIndex(result) }
+
+  /** Gets the string representation of this element. */
+  string toString() {
+    result = this.asExpr().toString() or
+    result = this.asVariable().toString() or
+    result = this.asName().getText()
+  }
+}
+
+private class LocalVariableUse extends Use instanceof VariableAccess {
+  private Variable def;
+
+  LocalVariableUse() { this = def.getAnAccess() }
+
+  override Definition getDefinition() { result.asVariable() = def }
+
+  override string getUseType() { result = "local variable" }
+}
+
+private class NamedFormatArgumentUse extends Use instanceof NamedFormatArgument {
+  private Name def;
+
+  NamedFormatArgumentUse() {
+    exists(FormatArgsExpr parent |
+      parent = this.getParent().getParent() and
+      parent.getAnArg().getName() = def and
+      this.getName() = def.getText()
+    )
+  }
+
+  override Definition getDefinition() { result.asName() = def }
+
+  override string getUseType() { result = "format argument" }
+}
+
+private class PositionalFormatUse extends Use instanceof Format {
+  PositionalFormatUse() { not exists(this.getArgumentRef()) }
+
+  override Definition getDefinition() {
+    exists(FormatArgsExpr parent, int index | parent.getFormat(_) = this |
+      this = rank[index + 1](PositionalFormatUse f, int i | parent.getFormat(i) = f | f order by i) and
+      result.asExpr() = parent.getArg(index).getExpr()
+    )
+  }
+
+  override string getUseType() { result = "format argument" }
+}
+
+private class PositionalFormatArgumentUse extends Use instanceof PositionalFormatArgument {
+  private Expr def;
+
+  PositionalFormatArgumentUse() {
+    exists(FormatArgsExpr parent |
+      parent = this.getParent().getParent() and
+      def = parent.getArg(this.getIndex()).getExpr()
+    )
+  }
+
+  override Definition getDefinition() { result.asExpr() = def }
+
+  override string getUseType() { result = "format argument" }
+}
diff --git a/rust/ql/lib/codeql/rust/printast/PrintAst.qll b/rust/ql/lib/codeql/rust/printast/PrintAst.qll
index b485efe8022..7b4e4fea68a 100644
--- a/rust/ql/lib/codeql/rust/printast/PrintAst.qll
+++ b/rust/ql/lib/codeql/rust/printast/PrintAst.qll
@@ -2,48 +2,51 @@
  * Provides queries to pretty-print a Rust AST as a graph.
  */
 
-import PrintAstNode
+import codeql.rust.printast.PrintAstNode
 
-cached
-private int getOrder(PrintAstNode node) {
-  node =
-    rank[result](PrintAstNode n, Location loc |
-      loc = n.getLocation()
-    |
-      n
-      order by
-        loc.getFile().getAbsolutePath(), loc.getStartLine(), loc.getStartColumn(), loc.getEndLine(),
-        loc.getEndColumn()
-    )
-}
+module PrintAst<shouldPrintSig/1 shouldPrint> {
+  import PrintAstNode<shouldPrint/1>
 
-/** Holds if `node` belongs to the output tree, and its property `key` has the given `value`. */
-query predicate nodes(PrintAstNode node, string key, string value) {
-  node.shouldBePrinted() and
-  (
+  pragma[nomagic]
+  private predicate orderBy(
+    PrintAstNode n, string filepath, int startline, int startcolumn, int endline, int endcolumn
+  ) {
+    n.getLocation().hasLocationInfo(filepath, startline, startcolumn, endline, endcolumn)
+  }
+
+  private int getOrder(PrintAstNode node) {
+    node =
+      rank[result](PrintAstNode n, string filepath, int startline, int startcolumn, int endline,
+        int endcolumn |
+        orderBy(n, filepath, startline, startcolumn, endline, endcolumn)
+      |
+        n order by filepath, startline, startcolumn, endline, endcolumn
+      )
+  }
+
+  /** Holds if `node` belongs to the output tree, and its property `key` has the given `value`. */
+  query predicate nodes(PrintAstNode node, string key, string value) {
     key = "semmle.label" and value = node.toString()
     or
     key = "semmle.order" and value = getOrder(node).toString()
     or
     value = node.getProperty(key)
-  )
-}
+  }
 
-/**
- * Holds if `target` is a child of `source` in the AST, and property `key` of the edge has the
- * given `value`.
- */
-query predicate edges(PrintAstNode source, PrintAstNode target, string key, string value) {
-  source.shouldBePrinted() and
-  target.shouldBePrinted() and
-  exists(int index, string accessor | source.hasChild(target, index, accessor) |
-    key = "semmle.label" and value = accessor
-    or
-    key = "semmle.order" and value = index.toString()
-  )
-}
+  /**
+   * Holds if `target` is a child of `source` in the AST, and property `key` of the edge has the
+   * given `value`.
+   */
+  query predicate edges(PrintAstNode source, PrintAstNode target, string key, string value) {
+    exists(int index, string accessor | source.hasChild(target, index, accessor) |
+      key = "semmle.label" and value = accessor
+      or
+      key = "semmle.order" and value = index.toString()
+    )
+  }
 
-/** Holds if property `key` of the graph has the given `value`. */
-query predicate graphProperties(string key, string value) {
-  key = "semmle.graphKind" and value = "tree"
+  /** Holds if property `key` of the graph has the given `value`. */
+  query predicate graphProperties(string key, string value) {
+    key = "semmle.graphKind" and value = "tree"
+  }
 }
diff --git a/rust/ql/lib/codeql/rust/printast/PrintAstNode.qll b/rust/ql/lib/codeql/rust/printast/PrintAstNode.qll
index db5afa9b708..3ba4360ada2 100644
--- a/rust/ql/lib/codeql/rust/printast/PrintAstNode.qll
+++ b/rust/ql/lib/codeql/rust/printast/PrintAstNode.qll
@@ -6,105 +6,81 @@
 import rust
 import codeql.rust.elements.internal.generated.ParentChild
 
-private newtype TPrintAstConfiguration = TMakePrintAstConfiguration()
+signature predicate shouldPrintSig(Locatable e);
 
-/**
- * The hook to customize the files and functions printed by this module.
- */
-class PrintAstConfiguration extends TPrintAstConfiguration {
+module PrintAstNode<shouldPrintSig/1 shouldPrint> {
   /**
-   * Gets the string representation of this singleton
+   * An AST node that should be printed.
    */
-  string toString() { result = "PrintAstConfiguration" }
+  private newtype TPrintAstNode = TPrintLocatable(Locatable ast) { shouldPrint(ast) }
 
   /**
-   * Holds if the AST for `e` should be printed. By default, holds for all.
+   * A node in the output tree.
    */
-  predicate shouldPrint(Locatable e) { any() }
-}
+  class PrintAstNode extends TPrintAstNode {
+    /**
+     * Gets a textual representation of this node.
+     */
+    abstract string toString();
 
-private predicate shouldPrint(Locatable e) { any(PrintAstConfiguration config).shouldPrint(e) }
+    /**
+     * Gets the child node at index `index`. Child indices must be unique,
+     * but need not be contiguous.
+     */
+    abstract predicate hasChild(PrintAstNode child, int index, string label);
 
-/**
- * An AST node that should be printed.
- */
-private newtype TPrintAstNode = TPrintLocatable(Locatable ast)
+    /**
+     * Gets the location of this node in the source code.
+     */
+    abstract Location getLocation();
 
-/**
- * A node in the output tree.
- */
-class PrintAstNode extends TPrintAstNode {
-  /**
-   * Gets a textual representation of this node.
-   */
-  abstract string toString();
+    /**
+     * Gets the value of an additional property of this node, where the name of
+     * the property is `key`.
+     */
+    string getProperty(string key) { none() }
 
-  /**
-   * Gets the child node at index `index`. Child indices must be unique,
-   * but need not be contiguous.
-   */
-  abstract predicate hasChild(PrintAstNode child, int index, string label);
-
-  /**
-   * Holds if this node should be printed in the output.
-   */
-  abstract predicate shouldBePrinted();
-
-  /**
-   * Gets the location of this node in the source code.
-   */
-  abstract Location getLocation();
-
-  /**
-   * Gets the value of an additional property of this node, where the name of
-   * the property is `key`.
-   */
-  string getProperty(string key) { none() }
-
-  /**
-   * Gets the underlying AST node, if any.
-   */
-  abstract Locatable getAstNode();
-}
-
-private string prettyPrint(Locatable e) {
-  result = "[" + concat(e.getPrimaryQlClasses(), ", ") + "] " + e
-}
-
-private class Unresolved extends Locatable {
-  Unresolved() { this != this.resolve() }
-}
-
-/**
- * A graph node representing a real Locatable node.
- */
-class PrintLocatable extends PrintAstNode, TPrintLocatable {
-  Locatable ast;
-
-  PrintLocatable() { this = TPrintLocatable(ast) }
-
-  override string toString() { result = prettyPrint(ast) }
-
-  final override predicate shouldBePrinted() { shouldPrint(ast) }
-
-  override predicate hasChild(PrintAstNode child, int index, string label) {
-    child = TPrintLocatable(any(Locatable c | c = getChildAndAccessor(ast, index, label)))
+    /**
+     * Gets the underlying AST node, if any.
+     */
+    abstract Locatable getAstNode();
   }
 
-  final override Locatable getAstNode() { result = ast }
+  private string prettyPrint(Locatable e) { result = "[" + e.getPrimaryQlClasses() + "] " + e }
 
-  final override Location getLocation() { result = ast.getLocation() }
-}
+  private class Unresolved extends Locatable {
+    Unresolved() { this != this.resolve() }
+  }
 
-/**
- * A specialization of graph node for "unresolved" children, that is nodes in
- * the parallel conversion AST.
- */
-class PrintUnresolved extends PrintLocatable {
-  override Unresolved ast;
+  /**
+   * A graph node representing a real Locatable node.
+   */
+  class PrintLocatable extends PrintAstNode, TPrintLocatable {
+    Locatable ast;
 
-  override predicate hasChild(PrintAstNode child, int index, string label) {
-    // only print immediate unresolved children from the "parallel" AST
-    child = TPrintLocatable(getImmediateChildAndAccessor(ast, index, label).(Unresolved))
+    PrintLocatable() { this = TPrintLocatable(ast) }
+
+    override string toString() { result = prettyPrint(ast) }
+
+    override predicate hasChild(PrintAstNode child, int index, string label) {
+      child = TPrintLocatable(any(Locatable c | c = getChildAndAccessor(ast, index, label)))
+    }
+
+    final override Locatable getAstNode() { result = ast }
+
+    final override Location getLocation() { result = ast.getLocation() }
+  }
+
+  /**
+   * A specialization of graph node for "unresolved" children, that is nodes in
+   * the parallel conversion AST.
+   */
+  class PrintUnresolved extends PrintLocatable {
+    override Unresolved ast;
+
+    override predicate hasChild(PrintAstNode child, int index, string label) {
+      // only print immediate unresolved children from the "parallel" AST
+      child = TPrintLocatable(getImmediateChildAndAccessor(ast, index, label).(Unresolved))
+    }
   }
 }
diff --git a/rust/ql/lib/codeql/rust/controlflow/internal/PrintCfg.ql b/rust/ql/lib/ide-contextual-queries/PrintCfg.ql
similarity index 100%
rename from rust/ql/lib/codeql/rust/controlflow/internal/PrintCfg.ql
rename to rust/ql/lib/ide-contextual-queries/PrintCfg.ql
diff --git a/rust/ql/lib/ide-contextual-queries/localDefinitions.ql b/rust/ql/lib/ide-contextual-queries/localDefinitions.ql
new file mode 100644
index 00000000000..677a876987b
--- /dev/null
+++ b/rust/ql/lib/ide-contextual-queries/localDefinitions.ql
@@ -0,0 +1,19 @@
+/**
+ * @name Jump-to-definition links
+ * @description Generates use-definition pairs that provide the data
+ *              for jump-to-definition in the code viewer.
+ * @kind definitions
+ * @id rust/ide-jump-to-definition
+ * @tags ide-contextual-queries/local-definitions
+ */
+
+import codeql.IDEContextual
+import codeql.rust.internal.Definitions
+
+external string selectedSourceFile();
+
+from Use use, Definition def, string kind
+where
+  def = definitionOf(use, kind) and
+  use.getLocation().getFile() = getFileBySourceArchiveName(selectedSourceFile())
+select use, def, kind
diff --git a/rust/ql/lib/ide-contextual-queries/localReferences.ql b/rust/ql/lib/ide-contextual-queries/localReferences.ql
new file mode 100644
index 00000000000..87e4cc5ca84
--- /dev/null
+++ b/rust/ql/lib/ide-contextual-queries/localReferences.ql
@@ -0,0 +1,19 @@
+/**
+ * @name Find-references links
+ * @description Generates use-definition pairs that provide the data
+ *              for find-references in the code viewer.
+ * @kind definitions
+ * @id rust/ide-find-references
+ * @tags ide-contextual-queries/local-references
+ */
+
+import codeql.IDEContextual
+import codeql.rust.internal.Definitions
+
+external string selectedSourceFile();
+
+from Use use, Definition def, string kind
+where
+  def = definitionOf(use, kind) and
+  def.getLocation().getFile() = getFileBySourceArchiveName(selectedSourceFile())
+select use, def, kind
diff --git a/rust/ql/src/queries/ide-contextual-queries/printAst.ql b/rust/ql/lib/ide-contextual-queries/printAst.ql
similarity index 51%
rename from rust/ql/src/queries/ide-contextual-queries/printAst.ql
rename to rust/ql/lib/ide-contextual-queries/printAst.ql
index 2362a206a34..f878530c47c 100644
--- a/rust/ql/src/queries/ide-contextual-queries/printAst.ql
+++ b/rust/ql/lib/ide-contextual-queries/printAst.ql
@@ -17,17 +17,10 @@ import codeql.rust.elements.internal.generated.ParentChild
  */
 external string selectedSourceFile();
 
-class PrintAstConfigurationOverride extends PrintAstConfiguration {
-  /**
-   * Holds if the location matches the selected file in the VS Code extension and
-   * the element is `e`.
-   */
-  override predicate shouldPrint(Locatable e) {
-    super.shouldPrint(e) and
-    (
-      e.getFile() = getFileBySourceArchiveName(selectedSourceFile())
-      or
-      exists(Locatable parent | this.shouldPrint(parent) and parent = getImmediateParent(e))
-    )
-  }
+predicate shouldPrint(Locatable e) {
+  e.getFile() = getFileBySourceArchiveName(selectedSourceFile())
+  or
+  exists(Locatable parent | shouldPrint(parent) and parent = getImmediateParent(e))
 }
+
+import PrintAst<shouldPrint/1>
diff --git a/rust/ql/lib/rust.dbscheme b/rust/ql/lib/rust.dbscheme
index 46c5a1a2f0b..666a1e2b0e1 100644
--- a/rust/ql/lib/rust.dbscheme
+++ b/rust/ql/lib/rust.dbscheme
@@ -117,7 +117,7 @@ locatable_locations(
 );
 
 
-// from schema.py
+// from schema
 
 @element =
   @locatable
@@ -134,36 +134,157 @@ locatable_locations(
 ;
 
 @ast_node =
-  @declaration
+  @abi
+| @arg_list
+| @assoc_item
+| @assoc_item_list
+| @attr
+| @callable
+| @closure_binder
 | @expr
+| @extern_item
+| @extern_item_list
+| @field_list
+| @format_args_arg
+| @generic_arg
 | @generic_arg_list
+| @generic_param
+| @generic_param_list
+| @item_list
 | @label
+| @let_else
+| @lifetime
+| @macro_items
+| @macro_stmts
 | @match_arm
+| @match_arm_list
+| @match_guard
+| @meta
+| @name
+| @name_ref
+| @param
+| @param_list
 | @pat
-| @path
+| @path_segment
 | @record_expr_field
+| @record_expr_field_list
+| @record_field
 | @record_pat_field
+| @record_pat_field_list
+| @rename
+| @resolvable
+| @ret_type
+| @return_type_syntax
+| @self_param
+| @source_file
 | @stmt
+| @stmt_list
+| @token
+| @token_tree
+| @tuple_field
+| @type_bound
+| @type_bound_list
 | @type_ref
+| @use_tree
+| @use_tree_list
+| @variant
+| @variant_list
+| @visibility
+| @where_clause
+| @where_pred
 ;
 
-@missing =
-  @missing_expr
-| @missing_pat
+missings(
+  unique int id: @missing
+);
+
+unimplementeds(
+  unique int id: @unimplemented
+);
+
+abis(
+  unique int id: @abi
+);
+
+#keyset[id]
+abi_abi_strings(
+  int id: @abi ref,
+  string abi_string: string ref
+);
+
+arg_lists(
+  unique int id: @arg_list
+);
+
+#keyset[id, index]
+arg_list_args(
+  int id: @arg_list ref,
+  int index: int ref,
+  int arg: @expr ref
+);
+
+@assoc_item =
+  @const
+| @function
+| @macro_call
+| @type_alias
 ;
 
-@unimplemented =
-  @generic_arg_list
-| @path
-| @type_ref
-| @unimplemented_declaration
+assoc_item_lists(
+  unique int id: @assoc_item_list
+);
+
+#keyset[id, index]
+assoc_item_list_assoc_items(
+  int id: @assoc_item_list ref,
+  int index: int ref,
+  int assoc_item: @assoc_item ref
+);
+
+#keyset[id, index]
+assoc_item_list_attrs(
+  int id: @assoc_item_list ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+attrs(
+  unique int id: @attr
+);
+
+#keyset[id]
+attr_meta(
+  int id: @attr ref,
+  int meta: @meta ref
+);
+
+@callable =
+  @closure_expr
+| @function
 ;
 
-@declaration =
-  @function
-| @module
-| @unimplemented_declaration
-;
+#keyset[id]
+callable_param_lists(
+  int id: @callable ref,
+  int param_list: @param_list ref
+);
+
+#keyset[id, index]
+callable_attrs(
+  int id: @callable ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+closure_binders(
+  unique int id: @closure_binder
+);
+
+#keyset[id]
+closure_binder_generic_param_lists(
+  int id: @closure_binder ref,
+  int generic_param_list: @generic_param_list ref
+);
 
 @expr =
   @array_expr
@@ -171,55 +292,337 @@ locatable_locations(
 | @await_expr
 | @become_expr
 | @binary_expr
-| @block_expr_base
-| @box_expr
+| @block_expr
 | @break_expr
-| @call_expr
+| @call_expr_base
 | @cast_expr
 | @closure_expr
-| @const_expr
 | @continue_expr
 | @field_expr
+| @for_expr
+| @format_args_expr
 | @if_expr
 | @index_expr
 | @let_expr
 | @literal_expr
 | @loop_expr
+| @macro_expr
 | @match_expr
-| @method_call_expr
-| @missing_expr
 | @offset_of_expr
-| @path_expr
+| @paren_expr
+| @path_expr_base
 | @prefix_expr
 | @range_expr
 | @record_expr
 | @ref_expr
 | @return_expr
+| @try_expr
 | @tuple_expr
 | @underscore_expr
+| @while_expr
 | @yeet_expr
 | @yield_expr
 ;
 
+@extern_item =
+  @function
+| @macro_call
+| @static
+| @type_alias
+;
+
+extern_item_lists(
+  unique int id: @extern_item_list
+);
+
+#keyset[id, index]
+extern_item_list_attrs(
+  int id: @extern_item_list ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+extern_item_list_extern_items(
+  int id: @extern_item_list ref,
+  int index: int ref,
+  int extern_item: @extern_item ref
+);
+
+@field_list =
+  @record_field_list
+| @tuple_field_list
+;
+
+format_args_args(
+  unique int id: @format_args_arg
+);
+
+#keyset[id]
+format_args_arg_exprs(
+  int id: @format_args_arg ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+format_args_arg_names(
+  int id: @format_args_arg ref,
+  int name: @name ref
+);
+
+@generic_arg =
+  @assoc_type_arg
+| @const_arg
+| @lifetime_arg
+| @type_arg
+;
+
 generic_arg_lists(
   unique int id: @generic_arg_list
 );
 
+#keyset[id, index]
+generic_arg_list_generic_args(
+  int id: @generic_arg_list ref,
+  int index: int ref,
+  int generic_arg: @generic_arg ref
+);
+
+@generic_param =
+  @const_param
+| @lifetime_param
+| @type_param
+;
+
+generic_param_lists(
+  unique int id: @generic_param_list
+);
+
+#keyset[id, index]
+generic_param_list_generic_params(
+  int id: @generic_param_list ref,
+  int index: int ref,
+  int generic_param: @generic_param ref
+);
+
+item_lists(
+  unique int id: @item_list
+);
+
+#keyset[id, index]
+item_list_attrs(
+  int id: @item_list ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+item_list_items(
+  int id: @item_list ref,
+  int index: int ref,
+  int item: @item ref
+);
+
 labels(
-  unique int id: @label,
-  string name: string ref
+  unique int id: @label
+);
+
+#keyset[id]
+label_lifetimes(
+  int id: @label ref,
+  int lifetime: @lifetime ref
+);
+
+let_elses(
+  unique int id: @let_else
+);
+
+#keyset[id]
+let_else_block_exprs(
+  int id: @let_else ref,
+  int block_expr: @block_expr ref
+);
+
+lifetimes(
+  unique int id: @lifetime
+);
+
+#keyset[id]
+lifetime_texts(
+  int id: @lifetime ref,
+  string text: string ref
+);
+
+macro_items(
+  unique int id: @macro_items
+);
+
+#keyset[id, index]
+macro_items_items(
+  int id: @macro_items ref,
+  int index: int ref,
+  int item: @item ref
+);
+
+macro_stmts(
+  unique int id: @macro_stmts
+);
+
+#keyset[id]
+macro_stmts_exprs(
+  int id: @macro_stmts ref,
+  int expr: @expr ref
+);
+
+#keyset[id, index]
+macro_stmts_statements(
+  int id: @macro_stmts ref,
+  int index: int ref,
+  int statement: @stmt ref
 );
 
 match_arms(
-  unique int id: @match_arm,
-  int pat: @pat ref,
+  unique int id: @match_arm
+);
+
+#keyset[id, index]
+match_arm_attrs(
+  int id: @match_arm ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+match_arm_exprs(
+  int id: @match_arm ref,
   int expr: @expr ref
 );
 
 #keyset[id]
 match_arm_guards(
   int id: @match_arm ref,
-  int guard: @expr ref
+  int guard: @match_guard ref
+);
+
+#keyset[id]
+match_arm_pats(
+  int id: @match_arm ref,
+  int pat: @pat ref
+);
+
+match_arm_lists(
+  unique int id: @match_arm_list
+);
+
+#keyset[id, index]
+match_arm_list_arms(
+  int id: @match_arm_list ref,
+  int index: int ref,
+  int arm: @match_arm ref
+);
+
+#keyset[id, index]
+match_arm_list_attrs(
+  int id: @match_arm_list ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+match_guards(
+  unique int id: @match_guard
+);
+
+#keyset[id]
+match_guard_conditions(
+  int id: @match_guard ref,
+  int condition: @expr ref
+);
+
+meta(
+  unique int id: @meta
+);
+
+#keyset[id]
+meta_exprs(
+  int id: @meta ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+meta_is_unsafe(
+  int id: @meta ref
+);
+
+#keyset[id]
+meta_paths(
+  int id: @meta ref,
+  int path: @path ref
+);
+
+#keyset[id]
+meta_token_trees(
+  int id: @meta ref,
+  int token_tree: @token_tree ref
+);
+
+names(
+  unique int id: @name
+);
+
+#keyset[id]
+name_texts(
+  int id: @name ref,
+  string text: string ref
+);
+
+name_refs(
+  unique int id: @name_ref
+);
+
+#keyset[id]
+name_ref_texts(
+  int id: @name_ref ref,
+  string text: string ref
+);
+
+params(
+  unique int id: @param
+);
+
+#keyset[id, index]
+param_attrs(
+  int id: @param ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+param_pats(
+  int id: @param ref,
+  int pat: @pat ref
+);
+
+#keyset[id]
+param_ties(
+  int id: @param ref,
+  int ty: @type_ref ref
+);
+
+param_lists(
+  unique int id: @param_list
+);
+
+#keyset[id, index]
+param_list_params(
+  int id: @param_list ref,
+  int index: int ref,
+  int param: @param ref
+);
+
+#keyset[id]
+param_list_self_params(
+  int id: @param_list ref,
+  int self_param: @self_param ref
 );
 
 @pat =
@@ -227,109 +630,764 @@ match_arm_guards(
 | @const_block_pat
 | @ident_pat
 | @literal_pat
-| @missing_pat
+| @macro_pat
 | @or_pat
+| @paren_pat
 | @path_pat
 | @range_pat
 | @record_pat
 | @ref_pat
+| @rest_pat
 | @slice_pat
 | @tuple_pat
 | @tuple_struct_pat
 | @wildcard_pat
 ;
 
-paths(
-  unique int id: @path
+path_segments(
+  unique int id: @path_segment
+);
+
+#keyset[id]
+path_segment_generic_arg_lists(
+  int id: @path_segment ref,
+  int generic_arg_list: @generic_arg_list ref
+);
+
+#keyset[id]
+path_segment_name_refs(
+  int id: @path_segment ref,
+  int name_ref: @name_ref ref
+);
+
+#keyset[id]
+path_segment_param_lists(
+  int id: @path_segment ref,
+  int param_list: @param_list ref
+);
+
+#keyset[id]
+path_segment_path_types(
+  int id: @path_segment ref,
+  int path_type: @path_type ref
+);
+
+#keyset[id]
+path_segment_ret_types(
+  int id: @path_segment ref,
+  int ret_type: @ret_type ref
+);
+
+#keyset[id]
+path_segment_return_type_syntaxes(
+  int id: @path_segment ref,
+  int return_type_syntax: @return_type_syntax ref
+);
+
+#keyset[id]
+path_segment_ties(
+  int id: @path_segment ref,
+  int ty: @type_ref ref
 );
 
 record_expr_fields(
-  unique int id: @record_expr_field,
-  string name: string ref,
+  unique int id: @record_expr_field
+);
+
+#keyset[id, index]
+record_expr_field_attrs(
+  int id: @record_expr_field ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+record_expr_field_exprs(
+  int id: @record_expr_field ref,
   int expr: @expr ref
 );
 
+#keyset[id]
+record_expr_field_name_refs(
+  int id: @record_expr_field ref,
+  int name_ref: @name_ref ref
+);
+
+record_expr_field_lists(
+  unique int id: @record_expr_field_list
+);
+
+#keyset[id, index]
+record_expr_field_list_attrs(
+  int id: @record_expr_field_list ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+record_expr_field_list_fields(
+  int id: @record_expr_field_list ref,
+  int index: int ref,
+  int field: @record_expr_field ref
+);
+
+#keyset[id]
+record_expr_field_list_spreads(
+  int id: @record_expr_field_list ref,
+  int spread: @expr ref
+);
+
+record_fields(
+  unique int id: @record_field
+);
+
+#keyset[id, index]
+record_field_attrs(
+  int id: @record_field ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+record_field_names(
+  int id: @record_field ref,
+  int name: @name ref
+);
+
+#keyset[id]
+record_field_ties(
+  int id: @record_field ref,
+  int ty: @type_ref ref
+);
+
+#keyset[id]
+record_field_visibilities(
+  int id: @record_field ref,
+  int visibility: @visibility ref
+);
+
 record_pat_fields(
-  unique int id: @record_pat_field,
-  string name: string ref,
+  unique int id: @record_pat_field
+);
+
+#keyset[id, index]
+record_pat_field_attrs(
+  int id: @record_pat_field ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+record_pat_field_name_refs(
+  int id: @record_pat_field ref,
+  int name_ref: @name_ref ref
+);
+
+#keyset[id]
+record_pat_field_pats(
+  int id: @record_pat_field ref,
   int pat: @pat ref
 );
 
+record_pat_field_lists(
+  unique int id: @record_pat_field_list
+);
+
+#keyset[id, index]
+record_pat_field_list_fields(
+  int id: @record_pat_field_list ref,
+  int index: int ref,
+  int field: @record_pat_field ref
+);
+
+#keyset[id]
+record_pat_field_list_rest_pats(
+  int id: @record_pat_field_list ref,
+  int rest_pat: @rest_pat ref
+);
+
+renames(
+  unique int id: @rename
+);
+
+#keyset[id]
+rename_names(
+  int id: @rename ref,
+  int name: @name ref
+);
+
+@resolvable =
+  @method_call_expr
+| @path
+;
+
+#keyset[id]
+resolvable_resolved_paths(
+  int id: @resolvable ref,
+  string resolved_path: string ref
+);
+
+#keyset[id]
+resolvable_resolved_crate_origins(
+  int id: @resolvable ref,
+  string resolved_crate_origin: string ref
+);
+
+ret_types(
+  unique int id: @ret_type
+);
+
+#keyset[id]
+ret_type_ties(
+  int id: @ret_type ref,
+  int ty: @type_ref ref
+);
+
+return_type_syntaxes(
+  unique int id: @return_type_syntax
+);
+
+self_params(
+  unique int id: @self_param
+);
+
+#keyset[id, index]
+self_param_attrs(
+  int id: @self_param ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+self_param_is_mut(
+  int id: @self_param ref
+);
+
+#keyset[id]
+self_param_lifetimes(
+  int id: @self_param ref,
+  int lifetime: @lifetime ref
+);
+
+#keyset[id]
+self_param_names(
+  int id: @self_param ref,
+  int name: @name ref
+);
+
+#keyset[id]
+self_param_ties(
+  int id: @self_param ref,
+  int ty: @type_ref ref
+);
+
+source_files(
+  unique int id: @source_file
+);
+
+#keyset[id, index]
+source_file_attrs(
+  int id: @source_file ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+source_file_items(
+  int id: @source_file ref,
+  int index: int ref,
+  int item: @item ref
+);
+
 @stmt =
   @expr_stmt
-| @item_stmt
+| @item
 | @let_stmt
 ;
 
-type_refs(
-  unique int id: @type_ref
+stmt_lists(
+  unique int id: @stmt_list
 );
 
-@array_expr =
-  @element_list_expr
-| @repeat_expr
-;
-
-asm_exprs(
-  unique int id: @asm_expr,
-  int expr: @expr ref
-);
-
-await_exprs(
-  unique int id: @await_expr,
-  int expr: @expr ref
-);
-
-become_exprs(
-  unique int id: @become_expr,
-  int expr: @expr ref
-);
-
-binary_exprs(
-  unique int id: @binary_expr,
-  int lhs: @expr ref,
-  int rhs: @expr ref
-);
-
-#keyset[id]
-binary_expr_ops(
-  int id: @binary_expr ref,
-  string op: string ref
-);
-
-@block_expr_base =
-  @async_block_expr
-| @block_expr
-| @unsafe_block_expr
-;
-
 #keyset[id, index]
-block_expr_base_statements(
-  int id: @block_expr_base ref,
+stmt_list_attrs(
+  int id: @stmt_list ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+stmt_list_statements(
+  int id: @stmt_list ref,
   int index: int ref,
   int statement: @stmt ref
 );
 
 #keyset[id]
-block_expr_base_tails(
-  int id: @block_expr_base ref,
-  int tail: @expr ref
+stmt_list_tail_exprs(
+  int id: @stmt_list ref,
+  int tail_expr: @expr ref
 );
 
-box_exprs(
-  unique int id: @box_expr,
+@token =
+  @comment
+;
+
+token_trees(
+  unique int id: @token_tree
+);
+
+tuple_fields(
+  unique int id: @tuple_field
+);
+
+#keyset[id, index]
+tuple_field_attrs(
+  int id: @tuple_field ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+tuple_field_ties(
+  int id: @tuple_field ref,
+  int ty: @type_ref ref
+);
+
+#keyset[id]
+tuple_field_visibilities(
+  int id: @tuple_field ref,
+  int visibility: @visibility ref
+);
+
+type_bounds(
+  unique int id: @type_bound
+);
+
+#keyset[id]
+type_bound_generic_param_lists(
+  int id: @type_bound ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+type_bound_is_async(
+  int id: @type_bound ref
+);
+
+#keyset[id]
+type_bound_is_const(
+  int id: @type_bound ref
+);
+
+#keyset[id]
+type_bound_lifetimes(
+  int id: @type_bound ref,
+  int lifetime: @lifetime ref
+);
+
+#keyset[id]
+type_bound_ties(
+  int id: @type_bound ref,
+  int ty: @type_ref ref
+);
+
+type_bound_lists(
+  unique int id: @type_bound_list
+);
+
+#keyset[id, index]
+type_bound_list_bounds(
+  int id: @type_bound_list ref,
+  int index: int ref,
+  int bound: @type_bound ref
+);
+
+@type_ref =
+  @array_type
+| @dyn_trait_type
+| @fn_ptr_type
+| @for_type
+| @impl_trait_type
+| @infer_type
+| @macro_type
+| @never_type
+| @paren_type
+| @path_type
+| @ptr_type
+| @ref_type
+| @slice_type
+| @tuple_type
+;
+
+use_trees(
+  unique int id: @use_tree
+);
+
+#keyset[id]
+use_tree_paths(
+  int id: @use_tree ref,
+  int path: @path ref
+);
+
+#keyset[id]
+use_tree_renames(
+  int id: @use_tree ref,
+  int rename: @rename ref
+);
+
+#keyset[id]
+use_tree_use_tree_lists(
+  int id: @use_tree ref,
+  int use_tree_list: @use_tree_list ref
+);
+
+use_tree_lists(
+  unique int id: @use_tree_list
+);
+
+#keyset[id, index]
+use_tree_list_use_trees(
+  int id: @use_tree_list ref,
+  int index: int ref,
+  int use_tree: @use_tree ref
+);
+
+variants(
+  unique int id: @variant
+);
+
+#keyset[id, index]
+variant_attrs(
+  int id: @variant ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+variant_exprs(
+  int id: @variant ref,
   int expr: @expr ref
 );
 
+#keyset[id]
+variant_field_lists(
+  int id: @variant ref,
+  int field_list: @field_list ref
+);
+
+#keyset[id]
+variant_names(
+  int id: @variant ref,
+  int name: @name ref
+);
+
+#keyset[id]
+variant_visibilities(
+  int id: @variant ref,
+  int visibility: @visibility ref
+);
+
+variant_lists(
+  unique int id: @variant_list
+);
+
+#keyset[id, index]
+variant_list_variants(
+  int id: @variant_list ref,
+  int index: int ref,
+  int variant: @variant ref
+);
+
+visibilities(
+  unique int id: @visibility
+);
+
+#keyset[id]
+visibility_paths(
+  int id: @visibility ref,
+  int path: @path ref
+);
+
+where_clauses(
+  unique int id: @where_clause
+);
+
+#keyset[id, index]
+where_clause_predicates(
+  int id: @where_clause ref,
+  int index: int ref,
+  int predicate: @where_pred ref
+);
+
+where_preds(
+  unique int id: @where_pred
+);
+
+#keyset[id]
+where_pred_generic_param_lists(
+  int id: @where_pred ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+where_pred_lifetimes(
+  int id: @where_pred ref,
+  int lifetime: @lifetime ref
+);
+
+#keyset[id]
+where_pred_ties(
+  int id: @where_pred ref,
+  int ty: @type_ref ref
+);
+
+#keyset[id]
+where_pred_type_bound_lists(
+  int id: @where_pred ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+array_exprs(
+  unique int id: @array_expr
+);
+
+#keyset[id, index]
+array_expr_attrs(
+  int id: @array_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+array_expr_exprs(
+  int id: @array_expr ref,
+  int index: int ref,
+  int expr: @expr ref
+);
+
+array_types(
+  unique int id: @array_type
+);
+
+#keyset[id]
+array_type_const_args(
+  int id: @array_type ref,
+  int const_arg: @const_arg ref
+);
+
+#keyset[id]
+array_type_ties(
+  int id: @array_type ref,
+  int ty: @type_ref ref
+);
+
+asm_exprs(
+  unique int id: @asm_expr
+);
+
+#keyset[id, index]
+asm_expr_attrs(
+  int id: @asm_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+asm_expr_exprs(
+  int id: @asm_expr ref,
+  int expr: @expr ref
+);
+
+assoc_type_args(
+  unique int id: @assoc_type_arg
+);
+
+#keyset[id]
+assoc_type_arg_const_args(
+  int id: @assoc_type_arg ref,
+  int const_arg: @const_arg ref
+);
+
+#keyset[id]
+assoc_type_arg_generic_arg_lists(
+  int id: @assoc_type_arg ref,
+  int generic_arg_list: @generic_arg_list ref
+);
+
+#keyset[id]
+assoc_type_arg_name_refs(
+  int id: @assoc_type_arg ref,
+  int name_ref: @name_ref ref
+);
+
+#keyset[id]
+assoc_type_arg_param_lists(
+  int id: @assoc_type_arg ref,
+  int param_list: @param_list ref
+);
+
+#keyset[id]
+assoc_type_arg_ret_types(
+  int id: @assoc_type_arg ref,
+  int ret_type: @ret_type ref
+);
+
+#keyset[id]
+assoc_type_arg_return_type_syntaxes(
+  int id: @assoc_type_arg ref,
+  int return_type_syntax: @return_type_syntax ref
+);
+
+#keyset[id]
+assoc_type_arg_ties(
+  int id: @assoc_type_arg ref,
+  int ty: @type_ref ref
+);
+
+#keyset[id]
+assoc_type_arg_type_bound_lists(
+  int id: @assoc_type_arg ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+await_exprs(
+  unique int id: @await_expr
+);
+
+#keyset[id, index]
+await_expr_attrs(
+  int id: @await_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+await_expr_exprs(
+  int id: @await_expr ref,
+  int expr: @expr ref
+);
+
+become_exprs(
+  unique int id: @become_expr
+);
+
+#keyset[id, index]
+become_expr_attrs(
+  int id: @become_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+become_expr_exprs(
+  int id: @become_expr ref,
+  int expr: @expr ref
+);
+
+binary_exprs(
+  unique int id: @binary_expr
+);
+
+#keyset[id, index]
+binary_expr_attrs(
+  int id: @binary_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+binary_expr_lhs(
+  int id: @binary_expr ref,
+  int lhs: @expr ref
+);
+
+#keyset[id]
+binary_expr_operator_names(
+  int id: @binary_expr ref,
+  string operator_name: string ref
+);
+
+#keyset[id]
+binary_expr_rhs(
+  int id: @binary_expr ref,
+  int rhs: @expr ref
+);
+
+block_exprs(
+  unique int id: @block_expr
+);
+
+#keyset[id, index]
+block_expr_attrs(
+  int id: @block_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+block_expr_is_async(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_is_const(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_is_gen(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_is_move(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_is_try(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_is_unsafe(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_labels(
+  int id: @block_expr ref,
+  int label: @label ref
+);
+
+#keyset[id]
+block_expr_stmt_lists(
+  int id: @block_expr ref,
+  int stmt_list: @stmt_list ref
+);
+
 box_pats(
-  unique int id: @box_pat,
-  int inner: @pat ref
+  unique int id: @box_pat
+);
+
+#keyset[id]
+box_pat_pats(
+  int id: @box_pat ref,
+  int pat: @pat ref
 );
 
 break_exprs(
   unique int id: @break_expr
 );
 
+#keyset[id, index]
+break_expr_attrs(
+  int id: @break_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
 #keyset[id]
 break_expr_exprs(
   int id: @break_expr ref,
@@ -337,58 +1395,81 @@ break_expr_exprs(
 );
 
 #keyset[id]
-break_expr_labels(
+break_expr_lifetimes(
   int id: @break_expr ref,
-  int label: @label ref
+  int lifetime: @lifetime ref
 );
 
-call_exprs(
-  unique int id: @call_expr,
-  int callee: @expr ref
+@call_expr_base =
+  @call_expr
+| @method_call_expr
+;
+
+#keyset[id]
+call_expr_base_arg_lists(
+  int id: @call_expr_base ref,
+  int arg_list: @arg_list ref
 );
 
 #keyset[id, index]
-call_expr_args(
-  int id: @call_expr ref,
+call_expr_base_attrs(
+  int id: @call_expr_base ref,
   int index: int ref,
-  int arg: @expr ref
-);
-
-#keyset[id]
-call_expr_is_assignee_expr(
-  int id: @call_expr ref
+  int attr: @attr ref
 );
 
 cast_exprs(
-  unique int id: @cast_expr,
-  int expr: @expr ref,
-  int type_: @type_ref ref
-);
-
-closure_exprs(
-  unique int id: @closure_expr,
-  int body: @expr ref,
-  string closure_kind: string ref
+  unique int id: @cast_expr
 );
 
 #keyset[id, index]
-closure_expr_args(
-  int id: @closure_expr ref,
+cast_expr_attrs(
+  int id: @cast_expr ref,
   int index: int ref,
-  int arg: @pat ref
-);
-
-#keyset[id, index]
-closure_expr_arg_types(
-  int id: @closure_expr ref,
-  int index: int ref,
-  int arg_type: @type_ref ref
+  int attr: @attr ref
 );
 
 #keyset[id]
-closure_expr_ret_types(
+cast_expr_exprs(
+  int id: @cast_expr ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+cast_expr_ties(
+  int id: @cast_expr ref,
+  int ty: @type_ref ref
+);
+
+closure_exprs(
+  unique int id: @closure_expr
+);
+
+#keyset[id]
+closure_expr_bodies(
   int id: @closure_expr ref,
-  int ret_type: @type_ref ref
+  int body: @expr ref
+);
+
+#keyset[id]
+closure_expr_closure_binders(
+  int id: @closure_expr ref,
+  int closure_binder: @closure_binder ref
+);
+
+#keyset[id]
+closure_expr_is_async(
+  int id: @closure_expr ref
+);
+
+#keyset[id]
+closure_expr_is_const(
+  int id: @closure_expr ref
+);
+
+#keyset[id]
+closure_expr_is_gen(
+  int id: @closure_expr ref
 );
 
 #keyset[id]
@@ -396,63 +1477,302 @@ closure_expr_is_move(
   int id: @closure_expr ref
 );
 
-const_block_pats(
-  unique int id: @const_block_pat,
+#keyset[id]
+closure_expr_is_static(
+  int id: @closure_expr ref
+);
+
+#keyset[id]
+closure_expr_ret_types(
+  int id: @closure_expr ref,
+  int ret_type: @ret_type ref
+);
+
+comments(
+  unique int id: @comment,
+  int parent: @ast_node ref,
+  string text: string ref
+);
+
+const_args(
+  unique int id: @const_arg
+);
+
+#keyset[id]
+const_arg_exprs(
+  int id: @const_arg ref,
   int expr: @expr ref
 );
 
-const_exprs(
-  unique int id: @const_expr,
-  int expr: @expr ref
+const_block_pats(
+  unique int id: @const_block_pat
+);
+
+#keyset[id]
+const_block_pat_block_exprs(
+  int id: @const_block_pat ref,
+  int block_expr: @block_expr ref
+);
+
+#keyset[id]
+const_block_pat_is_const(
+  int id: @const_block_pat ref
+);
+
+const_params(
+  unique int id: @const_param
+);
+
+#keyset[id, index]
+const_param_attrs(
+  int id: @const_param ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+const_param_default_vals(
+  int id: @const_param ref,
+  int default_val: @const_arg ref
+);
+
+#keyset[id]
+const_param_is_const(
+  int id: @const_param ref
+);
+
+#keyset[id]
+const_param_names(
+  int id: @const_param ref,
+  int name: @name ref
+);
+
+#keyset[id]
+const_param_ties(
+  int id: @const_param ref,
+  int ty: @type_ref ref
 );
 
 continue_exprs(
   unique int id: @continue_expr
 );
 
-#keyset[id]
-continue_expr_labels(
+#keyset[id, index]
+continue_expr_attrs(
   int id: @continue_expr ref,
-  int label: @label ref
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+continue_expr_lifetimes(
+  int id: @continue_expr ref,
+  int lifetime: @lifetime ref
+);
+
+dyn_trait_types(
+  unique int id: @dyn_trait_type
+);
+
+#keyset[id]
+dyn_trait_type_type_bound_lists(
+  int id: @dyn_trait_type ref,
+  int type_bound_list: @type_bound_list ref
 );
 
 expr_stmts(
-  unique int id: @expr_stmt,
+  unique int id: @expr_stmt
+);
+
+#keyset[id]
+expr_stmt_exprs(
+  int id: @expr_stmt ref,
+  int expr: @expr ref
+);
+
+field_exprs(
+  unique int id: @field_expr
+);
+
+#keyset[id, index]
+field_expr_attrs(
+  int id: @field_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+field_expr_exprs(
+  int id: @field_expr ref,
   int expr: @expr ref
 );
 
 #keyset[id]
-expr_stmt_has_semicolon(
-  int id: @expr_stmt ref
+field_expr_name_refs(
+  int id: @field_expr ref,
+  int name_ref: @name_ref ref
 );
 
-field_exprs(
-  unique int id: @field_expr,
-  int expr: @expr ref,
-  string name: string ref
-);
-
-functions(
-  unique int id: @function,
-  string name: string ref,
-  int body: @expr ref
-);
-
-ident_pats(
-  unique int id: @ident_pat,
-  string binding_id: string ref
+fn_ptr_types(
+  unique int id: @fn_ptr_type
 );
 
 #keyset[id]
-ident_pat_subpats(
+fn_ptr_type_abis(
+  int id: @fn_ptr_type ref,
+  int abi: @abi ref
+);
+
+#keyset[id]
+fn_ptr_type_is_async(
+  int id: @fn_ptr_type ref
+);
+
+#keyset[id]
+fn_ptr_type_is_const(
+  int id: @fn_ptr_type ref
+);
+
+#keyset[id]
+fn_ptr_type_is_unsafe(
+  int id: @fn_ptr_type ref
+);
+
+#keyset[id]
+fn_ptr_type_param_lists(
+  int id: @fn_ptr_type ref,
+  int param_list: @param_list ref
+);
+
+#keyset[id]
+fn_ptr_type_ret_types(
+  int id: @fn_ptr_type ref,
+  int ret_type: @ret_type ref
+);
+
+for_exprs(
+  unique int id: @for_expr
+);
+
+#keyset[id, index]
+for_expr_attrs(
+  int id: @for_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+for_expr_iterables(
+  int id: @for_expr ref,
+  int iterable: @expr ref
+);
+
+#keyset[id]
+for_expr_labels(
+  int id: @for_expr ref,
+  int label: @label ref
+);
+
+#keyset[id]
+for_expr_loop_bodies(
+  int id: @for_expr ref,
+  int loop_body: @block_expr ref
+);
+
+#keyset[id]
+for_expr_pats(
+  int id: @for_expr ref,
+  int pat: @pat ref
+);
+
+for_types(
+  unique int id: @for_type
+);
+
+#keyset[id]
+for_type_generic_param_lists(
+  int id: @for_type ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+for_type_ties(
+  int id: @for_type ref,
+  int ty: @type_ref ref
+);
+
+format_args_exprs(
+  unique int id: @format_args_expr
+);
+
+#keyset[id, index]
+format_args_expr_args(
+  int id: @format_args_expr ref,
+  int index: int ref,
+  int arg: @format_args_arg ref
+);
+
+#keyset[id, index]
+format_args_expr_attrs(
+  int id: @format_args_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+format_args_expr_templates(
+  int id: @format_args_expr ref,
+  int template: @expr ref
+);
+
+ident_pats(
+  unique int id: @ident_pat
+);
+
+#keyset[id, index]
+ident_pat_attrs(
   int id: @ident_pat ref,
-  int subpat: @pat ref
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+ident_pat_is_mut(
+  int id: @ident_pat ref
+);
+
+#keyset[id]
+ident_pat_is_ref(
+  int id: @ident_pat ref
+);
+
+#keyset[id]
+ident_pat_names(
+  int id: @ident_pat ref,
+  int name: @name ref
+);
+
+#keyset[id]
+ident_pat_pats(
+  int id: @ident_pat ref,
+  int pat: @pat ref
 );
 
 if_exprs(
-  unique int id: @if_expr,
-  int condition: @expr ref,
-  int then: @expr ref
+  unique int id: @if_expr
+);
+
+#keyset[id, index]
+if_expr_attrs(
+  int id: @if_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+if_expr_conditions(
+  int id: @if_expr ref,
+  int condition: @expr ref
 );
 
 #keyset[id]
@@ -461,36 +1781,113 @@ if_expr_elses(
   int else: @expr ref
 );
 
+#keyset[id]
+if_expr_thens(
+  int id: @if_expr ref,
+  int then: @block_expr ref
+);
+
+impl_trait_types(
+  unique int id: @impl_trait_type
+);
+
+#keyset[id]
+impl_trait_type_type_bound_lists(
+  int id: @impl_trait_type ref,
+  int type_bound_list: @type_bound_list ref
+);
+
 index_exprs(
-  unique int id: @index_expr,
-  int base: @expr ref,
+  unique int id: @index_expr
+);
+
+#keyset[id, index]
+index_expr_attrs(
+  int id: @index_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+index_expr_bases(
+  int id: @index_expr ref,
+  int base: @expr ref
+);
+
+#keyset[id]
+index_expr_indices(
+  int id: @index_expr ref,
   int index: @expr ref
 );
 
-#keyset[id]
-index_expr_is_assignee_expr(
-  int id: @index_expr ref
+infer_types(
+  unique int id: @infer_type
 );
 
-item_stmts(
-  unique int id: @item_stmt
+@item =
+  @const
+| @enum
+| @extern_block
+| @extern_crate
+| @function
+| @impl
+| @macro_call
+| @macro_def
+| @macro_rules
+| @module
+| @static
+| @struct
+| @trait
+| @trait_alias
+| @type_alias
+| @union
+| @use
+;
+
+#keyset[id]
+item_extended_canonical_paths(
+  int id: @item ref,
+  string extended_canonical_path: string ref
+);
+
+#keyset[id]
+item_crate_origins(
+  int id: @item ref,
+  string crate_origin: string ref
 );
 
 let_exprs(
-  unique int id: @let_expr,
-  int pat: @pat ref,
-  int expr: @expr ref
+  unique int id: @let_expr
 );
 
-let_stmts(
-  unique int id: @let_stmt,
-  int pat: @pat ref
+#keyset[id, index]
+let_expr_attrs(
+  int id: @let_expr ref,
+  int index: int ref,
+  int attr: @attr ref
 );
 
 #keyset[id]
-let_stmt_types(
+let_expr_exprs(
+  int id: @let_expr ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+let_expr_pats(
+  int id: @let_expr ref,
+  int pat: @pat ref
+);
+
+let_stmts(
+  unique int id: @let_stmt
+);
+
+#keyset[id, index]
+let_stmt_attrs(
   int id: @let_stmt ref,
-  int type_: @type_ref ref
+  int index: int ref,
+  int attr: @attr ref
 );
 
 #keyset[id]
@@ -500,23 +1897,92 @@ let_stmt_initializers(
 );
 
 #keyset[id]
-let_stmt_elses(
+let_stmt_let_elses(
   int id: @let_stmt ref,
-  int else: @expr ref
+  int let_else: @let_else ref
+);
+
+#keyset[id]
+let_stmt_pats(
+  int id: @let_stmt ref,
+  int pat: @pat ref
+);
+
+#keyset[id]
+let_stmt_ties(
+  int id: @let_stmt ref,
+  int ty: @type_ref ref
+);
+
+lifetime_args(
+  unique int id: @lifetime_arg
+);
+
+#keyset[id]
+lifetime_arg_lifetimes(
+  int id: @lifetime_arg ref,
+  int lifetime: @lifetime ref
+);
+
+lifetime_params(
+  unique int id: @lifetime_param
+);
+
+#keyset[id, index]
+lifetime_param_attrs(
+  int id: @lifetime_param ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+lifetime_param_lifetimes(
+  int id: @lifetime_param ref,
+  int lifetime: @lifetime ref
+);
+
+#keyset[id]
+lifetime_param_type_bound_lists(
+  int id: @lifetime_param ref,
+  int type_bound_list: @type_bound_list ref
 );
 
 literal_exprs(
   unique int id: @literal_expr
 );
 
+#keyset[id, index]
+literal_expr_attrs(
+  int id: @literal_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+literal_expr_text_values(
+  int id: @literal_expr ref,
+  string text_value: string ref
+);
+
 literal_pats(
-  unique int id: @literal_pat,
-  int expr: @expr ref
+  unique int id: @literal_pat
+);
+
+#keyset[id]
+literal_pat_literals(
+  int id: @literal_pat ref,
+  int literal: @literal_expr ref
 );
 
 loop_exprs(
-  unique int id: @loop_expr,
-  int body: @expr ref
+  unique int id: @loop_expr
+);
+
+#keyset[id, index]
+loop_expr_attrs(
+  int id: @loop_expr ref,
+  int index: int ref,
+  int attr: @attr ref
 );
 
 #keyset[id]
@@ -525,66 +1991,91 @@ loop_expr_labels(
   int label: @label ref
 );
 
-match_exprs(
-  unique int id: @match_expr,
-  int expr: @expr ref
+#keyset[id]
+loop_expr_loop_bodies(
+  int id: @loop_expr ref,
+  int loop_body: @block_expr ref
 );
 
-#keyset[id, index]
-match_expr_branches(
-  int id: @match_expr ref,
-  int index: int ref,
-  int branch: @match_arm ref
-);
-
-method_call_exprs(
-  unique int id: @method_call_expr,
-  int receiver: @expr ref,
-  string method_name: string ref
-);
-
-#keyset[id, index]
-method_call_expr_args(
-  int id: @method_call_expr ref,
-  int index: int ref,
-  int arg: @expr ref
+macro_exprs(
+  unique int id: @macro_expr
 );
 
 #keyset[id]
-method_call_expr_generic_args(
-  int id: @method_call_expr ref,
-  int generic_args: @generic_arg_list ref
+macro_expr_macro_calls(
+  int id: @macro_expr ref,
+  int macro_call: @macro_call ref
 );
 
-missing_exprs(
-  unique int id: @missing_expr
+macro_pats(
+  unique int id: @macro_pat
 );
 
-missing_pats(
-  unique int id: @missing_pat
+#keyset[id]
+macro_pat_macro_calls(
+  int id: @macro_pat ref,
+  int macro_call: @macro_call ref
 );
 
-modules(
-  unique int id: @module
+macro_types(
+  unique int id: @macro_type
+);
+
+#keyset[id]
+macro_type_macro_calls(
+  int id: @macro_type ref,
+  int macro_call: @macro_call ref
+);
+
+match_exprs(
+  unique int id: @match_expr
 );
 
 #keyset[id, index]
-module_declarations(
-  int id: @module ref,
+match_expr_attrs(
+  int id: @match_expr ref,
   int index: int ref,
-  int declaration: @declaration ref
+  int attr: @attr ref
+);
+
+#keyset[id]
+match_expr_exprs(
+  int id: @match_expr ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+match_expr_match_arm_lists(
+  int id: @match_expr ref,
+  int match_arm_list: @match_arm_list ref
+);
+
+never_types(
+  unique int id: @never_type
 );
 
 offset_of_exprs(
-  unique int id: @offset_of_expr,
-  int container: @type_ref ref
+  unique int id: @offset_of_expr
+);
+
+#keyset[id, index]
+offset_of_expr_attrs(
+  int id: @offset_of_expr ref,
+  int index: int ref,
+  int attr: @attr ref
 );
 
 #keyset[id, index]
 offset_of_expr_fields(
   int id: @offset_of_expr ref,
   int index: int ref,
-  string field: string ref
+  int field: @name_ref ref
+);
+
+#keyset[id]
+offset_of_expr_ties(
+  int id: @offset_of_expr ref,
+  int ty: @type_ref ref
 );
 
 or_pats(
@@ -592,65 +2083,183 @@ or_pats(
 );
 
 #keyset[id, index]
-or_pat_args(
+or_pat_pats(
   int id: @or_pat ref,
   int index: int ref,
-  int arg: @pat ref
+  int pat: @pat ref
 );
 
-path_exprs(
-  unique int id: @path_expr,
+paren_exprs(
+  unique int id: @paren_expr
+);
+
+#keyset[id, index]
+paren_expr_attrs(
+  int id: @paren_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+paren_expr_exprs(
+  int id: @paren_expr ref,
+  int expr: @expr ref
+);
+
+paren_pats(
+  unique int id: @paren_pat
+);
+
+#keyset[id]
+paren_pat_pats(
+  int id: @paren_pat ref,
+  int pat: @pat ref
+);
+
+paren_types(
+  unique int id: @paren_type
+);
+
+#keyset[id]
+paren_type_ties(
+  int id: @paren_type ref,
+  int ty: @type_ref ref
+);
+
+paths(
+  unique int id: @path
+);
+
+#keyset[id]
+path_qualifiers(
+  int id: @path ref,
+  int qualifier: @path ref
+);
+
+#keyset[id]
+path_parts(
+  int id: @path ref,
+  int part: @path_segment ref
+);
+
+@path_expr_base =
+  @path_expr
+;
+
+path_pats(
+  unique int id: @path_pat
+);
+
+#keyset[id]
+path_pat_paths(
+  int id: @path_pat ref,
   int path: @path ref
 );
 
-path_pats(
-  unique int id: @path_pat,
+path_types(
+  unique int id: @path_type
+);
+
+#keyset[id]
+path_type_paths(
+  int id: @path_type ref,
   int path: @path ref
 );
 
 prefix_exprs(
-  unique int id: @prefix_expr,
-  int expr: @expr ref,
-  string op: string ref
+  unique int id: @prefix_expr
+);
+
+#keyset[id, index]
+prefix_expr_attrs(
+  int id: @prefix_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+prefix_expr_exprs(
+  int id: @prefix_expr ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+prefix_expr_operator_names(
+  int id: @prefix_expr ref,
+  string operator_name: string ref
+);
+
+ptr_types(
+  unique int id: @ptr_type
+);
+
+#keyset[id]
+ptr_type_is_const(
+  int id: @ptr_type ref
+);
+
+#keyset[id]
+ptr_type_is_mut(
+  int id: @ptr_type ref
+);
+
+#keyset[id]
+ptr_type_ties(
+  int id: @ptr_type ref,
+  int ty: @type_ref ref
 );
 
 range_exprs(
   unique int id: @range_expr
 );
 
-#keyset[id]
-range_expr_lhs(
+#keyset[id, index]
+range_expr_attrs(
   int id: @range_expr ref,
-  int lhs: @expr ref
+  int index: int ref,
+  int attr: @attr ref
 );
 
 #keyset[id]
-range_expr_rhs(
+range_expr_ends(
   int id: @range_expr ref,
-  int rhs: @expr ref
+  int end: @expr ref
 );
 
 #keyset[id]
-range_expr_is_inclusive(
-  int id: @range_expr ref
+range_expr_operator_names(
+  int id: @range_expr ref,
+  string operator_name: string ref
+);
+
+#keyset[id]
+range_expr_starts(
+  int id: @range_expr ref,
+  int start: @expr ref
 );
 
 range_pats(
   unique int id: @range_pat
 );
 
-#keyset[id]
-range_pat_starts(
-  int id: @range_pat ref,
-  int start: @pat ref
-);
-
 #keyset[id]
 range_pat_ends(
   int id: @range_pat ref,
   int end: @pat ref
 );
 
+#keyset[id]
+range_pat_operator_names(
+  int id: @range_pat ref,
+  string operator_name: string ref
+);
+
+#keyset[id]
+range_pat_starts(
+  int id: @range_pat ref,
+  int start: @pat ref
+);
+
 record_exprs(
   unique int id: @record_expr
 );
@@ -661,27 +2270,21 @@ record_expr_paths(
   int path: @path ref
 );
 
+#keyset[id]
+record_expr_record_expr_field_lists(
+  int id: @record_expr ref,
+  int record_expr_field_list: @record_expr_field_list ref
+);
+
+record_field_lists(
+  unique int id: @record_field_list
+);
+
 #keyset[id, index]
-record_expr_flds(
-  int id: @record_expr ref,
+record_field_list_fields(
+  int id: @record_field_list ref,
   int index: int ref,
-  int fld: @record_expr_field ref
-);
-
-#keyset[id]
-record_expr_spreads(
-  int id: @record_expr ref,
-  int spread: @expr ref
-);
-
-#keyset[id]
-record_expr_has_ellipsis(
-  int id: @record_expr ref
-);
-
-#keyset[id]
-record_expr_is_assignee_expr(
-  int id: @record_expr ref
+  int field: @record_field ref
 );
 
 record_pats(
@@ -694,25 +2297,31 @@ record_pat_paths(
   int path: @path ref
 );
 
-#keyset[id, index]
-record_pat_flds(
-  int id: @record_pat ref,
-  int index: int ref,
-  int fld: @record_pat_field ref
-);
-
 #keyset[id]
-record_pat_has_ellipsis(
-  int id: @record_pat ref
+record_pat_record_pat_field_lists(
+  int id: @record_pat ref,
+  int record_pat_field_list: @record_pat_field_list ref
 );
 
 ref_exprs(
-  unique int id: @ref_expr,
+  unique int id: @ref_expr
+);
+
+#keyset[id, index]
+ref_expr_attrs(
+  int id: @ref_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+ref_expr_exprs(
+  int id: @ref_expr ref,
   int expr: @expr ref
 );
 
 #keyset[id]
-ref_expr_is_raw(
+ref_expr_is_const(
   int id: @ref_expr ref
 );
 
@@ -721,9 +2330,13 @@ ref_expr_is_mut(
   int id: @ref_expr ref
 );
 
+#keyset[id]
+ref_expr_is_raw(
+  int id: @ref_expr ref
+);
+
 ref_pats(
-  unique int id: @ref_pat,
-  int pat: @pat ref
+  unique int id: @ref_pat
 );
 
 #keyset[id]
@@ -731,10 +2344,55 @@ ref_pat_is_mut(
   int id: @ref_pat ref
 );
 
+#keyset[id]
+ref_pat_pats(
+  int id: @ref_pat ref,
+  int pat: @pat ref
+);
+
+ref_types(
+  unique int id: @ref_type
+);
+
+#keyset[id]
+ref_type_is_mut(
+  int id: @ref_type ref
+);
+
+#keyset[id]
+ref_type_lifetimes(
+  int id: @ref_type ref,
+  int lifetime: @lifetime ref
+);
+
+#keyset[id]
+ref_type_ties(
+  int id: @ref_type ref,
+  int ty: @type_ref ref
+);
+
+rest_pats(
+  unique int id: @rest_pat
+);
+
+#keyset[id, index]
+rest_pat_attrs(
+  int id: @rest_pat ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
 return_exprs(
   unique int id: @return_expr
 );
 
+#keyset[id, index]
+return_expr_attrs(
+  int id: @return_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
 #keyset[id]
 return_expr_exprs(
   int id: @return_expr ref,
@@ -746,23 +2404,37 @@ slice_pats(
 );
 
 #keyset[id, index]
-slice_pat_prefixes(
+slice_pat_pats(
   int id: @slice_pat ref,
   int index: int ref,
-  int prefix: @pat ref
+  int pat: @pat ref
+);
+
+slice_types(
+  unique int id: @slice_type
 );
 
 #keyset[id]
-slice_pat_slice(
-  int id: @slice_pat ref,
-  int slice: @pat ref
+slice_type_ties(
+  int id: @slice_type ref,
+  int ty: @type_ref ref
+);
+
+try_exprs(
+  unique int id: @try_expr
 );
 
 #keyset[id, index]
-slice_pat_suffixes(
-  int id: @slice_pat ref,
+try_expr_attrs(
+  int id: @try_expr ref,
   int index: int ref,
-  int suffix: @pat ref
+  int attr: @attr ref
+);
+
+#keyset[id]
+try_expr_exprs(
+  int id: @try_expr ref,
+  int expr: @expr ref
 );
 
 tuple_exprs(
@@ -770,15 +2442,28 @@ tuple_exprs(
 );
 
 #keyset[id, index]
-tuple_expr_exprs(
+tuple_expr_attrs(
   int id: @tuple_expr ref,
   int index: int ref,
-  int expr: @expr ref
+  int attr: @attr ref
 );
 
-#keyset[id]
-tuple_expr_is_assignee_expr(
-  int id: @tuple_expr ref
+#keyset[id, index]
+tuple_expr_fields(
+  int id: @tuple_expr ref,
+  int index: int ref,
+  int field: @expr ref
+);
+
+tuple_field_lists(
+  unique int id: @tuple_field_list
+);
+
+#keyset[id, index]
+tuple_field_list_fields(
+  int id: @tuple_field_list ref,
+  int index: int ref,
+  int field: @tuple_field ref
 );
 
 tuple_pats(
@@ -786,47 +2471,117 @@ tuple_pats(
 );
 
 #keyset[id, index]
-tuple_pat_args(
+tuple_pat_fields(
   int id: @tuple_pat ref,
   int index: int ref,
-  int arg: @pat ref
-);
-
-#keyset[id]
-tuple_pat_ellipsis_indices(
-  int id: @tuple_pat ref,
-  int ellipsis_index: int ref
+  int field: @pat ref
 );
 
 tuple_struct_pats(
   unique int id: @tuple_struct_pat
 );
 
+#keyset[id, index]
+tuple_struct_pat_fields(
+  int id: @tuple_struct_pat ref,
+  int index: int ref,
+  int field: @pat ref
+);
+
 #keyset[id]
 tuple_struct_pat_paths(
   int id: @tuple_struct_pat ref,
   int path: @path ref
 );
 
+tuple_types(
+  unique int id: @tuple_type
+);
+
 #keyset[id, index]
-tuple_struct_pat_args(
-  int id: @tuple_struct_pat ref,
+tuple_type_fields(
+  int id: @tuple_type ref,
   int index: int ref,
-  int arg: @pat ref
+  int field: @type_ref ref
+);
+
+type_args(
+  unique int id: @type_arg
 );
 
 #keyset[id]
-tuple_struct_pat_ellipsis_indices(
-  int id: @tuple_struct_pat ref,
-  int ellipsis_index: int ref
+type_arg_ties(
+  int id: @type_arg ref,
+  int ty: @type_ref ref
+);
+
+type_params(
+  unique int id: @type_param
+);
+
+#keyset[id, index]
+type_param_attrs(
+  int id: @type_param ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+type_param_default_types(
+  int id: @type_param ref,
+  int default_type: @type_ref ref
+);
+
+#keyset[id]
+type_param_names(
+  int id: @type_param ref,
+  int name: @name ref
+);
+
+#keyset[id]
+type_param_type_bound_lists(
+  int id: @type_param ref,
+  int type_bound_list: @type_bound_list ref
 );
 
 underscore_exprs(
   unique int id: @underscore_expr
 );
 
-unimplemented_declarations(
-  unique int id: @unimplemented_declaration
+#keyset[id, index]
+underscore_expr_attrs(
+  int id: @underscore_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+while_exprs(
+  unique int id: @while_expr
+);
+
+#keyset[id, index]
+while_expr_attrs(
+  int id: @while_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+while_expr_conditions(
+  int id: @while_expr ref,
+  int condition: @expr ref
+);
+
+#keyset[id]
+while_expr_labels(
+  int id: @while_expr ref,
+  int label: @label ref
+);
+
+#keyset[id]
+while_expr_loop_bodies(
+  int id: @while_expr ref,
+  int loop_body: @block_expr ref
 );
 
 wildcard_pats(
@@ -837,6 +2592,13 @@ yeet_exprs(
   unique int id: @yeet_expr
 );
 
+#keyset[id, index]
+yeet_expr_attrs(
+  int id: @yeet_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
 #keyset[id]
 yeet_expr_exprs(
   int id: @yeet_expr ref,
@@ -847,48 +2609,762 @@ yield_exprs(
   unique int id: @yield_expr
 );
 
+#keyset[id, index]
+yield_expr_attrs(
+  int id: @yield_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
 #keyset[id]
 yield_expr_exprs(
   int id: @yield_expr ref,
   int expr: @expr ref
 );
 
-async_block_exprs(
-  unique int id: @async_block_expr
-);
-
-block_exprs(
-  unique int id: @block_expr
+call_exprs(
+  unique int id: @call_expr
 );
 
 #keyset[id]
-block_expr_labels(
-  int id: @block_expr ref,
-  int label: @label ref
+call_expr_exprs(
+  int id: @call_expr ref,
+  int expr: @expr ref
 );
 
-element_list_exprs(
-  unique int id: @element_list_expr
+consts(
+  unique int id: @const
 );
 
 #keyset[id, index]
-element_list_expr_elements(
-  int id: @element_list_expr ref,
+const_attrs(
+  int id: @const ref,
   int index: int ref,
-  int element: @expr ref
+  int attr: @attr ref
 );
 
 #keyset[id]
-element_list_expr_is_assignee_expr(
-  int id: @element_list_expr ref
+const_bodies(
+  int id: @const ref,
+  int body: @expr ref
 );
 
-repeat_exprs(
-  unique int id: @repeat_expr,
-  int initializer: @expr ref,
-  int repeat: @expr ref
+#keyset[id]
+const_is_const(
+  int id: @const ref
 );
 
-unsafe_block_exprs(
-  unique int id: @unsafe_block_expr
+#keyset[id]
+const_is_default(
+  int id: @const ref
+);
+
+#keyset[id]
+const_names(
+  int id: @const ref,
+  int name: @name ref
+);
+
+#keyset[id]
+const_ties(
+  int id: @const ref,
+  int ty: @type_ref ref
+);
+
+#keyset[id]
+const_visibilities(
+  int id: @const ref,
+  int visibility: @visibility ref
+);
+
+enums(
+  unique int id: @enum
+);
+
+#keyset[id, index]
+enum_attrs(
+  int id: @enum ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+enum_generic_param_lists(
+  int id: @enum ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+enum_names(
+  int id: @enum ref,
+  int name: @name ref
+);
+
+#keyset[id]
+enum_variant_lists(
+  int id: @enum ref,
+  int variant_list: @variant_list ref
+);
+
+#keyset[id]
+enum_visibilities(
+  int id: @enum ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+enum_where_clauses(
+  int id: @enum ref,
+  int where_clause: @where_clause ref
+);
+
+extern_blocks(
+  unique int id: @extern_block
+);
+
+#keyset[id]
+extern_block_abis(
+  int id: @extern_block ref,
+  int abi: @abi ref
+);
+
+#keyset[id, index]
+extern_block_attrs(
+  int id: @extern_block ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+extern_block_extern_item_lists(
+  int id: @extern_block ref,
+  int extern_item_list: @extern_item_list ref
+);
+
+#keyset[id]
+extern_block_is_unsafe(
+  int id: @extern_block ref
+);
+
+extern_crates(
+  unique int id: @extern_crate
+);
+
+#keyset[id, index]
+extern_crate_attrs(
+  int id: @extern_crate ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+extern_crate_name_refs(
+  int id: @extern_crate ref,
+  int name_ref: @name_ref ref
+);
+
+#keyset[id]
+extern_crate_renames(
+  int id: @extern_crate ref,
+  int rename: @rename ref
+);
+
+#keyset[id]
+extern_crate_visibilities(
+  int id: @extern_crate ref,
+  int visibility: @visibility ref
+);
+
+functions(
+  unique int id: @function
+);
+
+#keyset[id]
+function_abis(
+  int id: @function ref,
+  int abi: @abi ref
+);
+
+#keyset[id]
+function_bodies(
+  int id: @function ref,
+  int body: @block_expr ref
+);
+
+#keyset[id]
+function_generic_param_lists(
+  int id: @function ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+function_is_async(
+  int id: @function ref
+);
+
+#keyset[id]
+function_is_const(
+  int id: @function ref
+);
+
+#keyset[id]
+function_is_default(
+  int id: @function ref
+);
+
+#keyset[id]
+function_is_gen(
+  int id: @function ref
+);
+
+#keyset[id]
+function_is_unsafe(
+  int id: @function ref
+);
+
+#keyset[id]
+function_names(
+  int id: @function ref,
+  int name: @name ref
+);
+
+#keyset[id]
+function_ret_types(
+  int id: @function ref,
+  int ret_type: @ret_type ref
+);
+
+#keyset[id]
+function_visibilities(
+  int id: @function ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+function_where_clauses(
+  int id: @function ref,
+  int where_clause: @where_clause ref
+);
+
+impls(
+  unique int id: @impl
+);
+
+#keyset[id]
+impl_assoc_item_lists(
+  int id: @impl ref,
+  int assoc_item_list: @assoc_item_list ref
+);
+
+#keyset[id, index]
+impl_attrs(
+  int id: @impl ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+impl_generic_param_lists(
+  int id: @impl ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+impl_is_const(
+  int id: @impl ref
+);
+
+#keyset[id]
+impl_is_default(
+  int id: @impl ref
+);
+
+#keyset[id]
+impl_is_unsafe(
+  int id: @impl ref
+);
+
+#keyset[id]
+impl_self_ties(
+  int id: @impl ref,
+  int self_ty: @type_ref ref
+);
+
+#keyset[id]
+impl_traits(
+  int id: @impl ref,
+  int trait: @type_ref ref
+);
+
+#keyset[id]
+impl_visibilities(
+  int id: @impl ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+impl_where_clauses(
+  int id: @impl ref,
+  int where_clause: @where_clause ref
+);
+
+macro_calls(
+  unique int id: @macro_call
+);
+
+#keyset[id, index]
+macro_call_attrs(
+  int id: @macro_call ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+macro_call_paths(
+  int id: @macro_call ref,
+  int path: @path ref
+);
+
+#keyset[id]
+macro_call_token_trees(
+  int id: @macro_call ref,
+  int token_tree: @token_tree ref
+);
+
+#keyset[id]
+macro_call_expandeds(
+  int id: @macro_call ref,
+  int expanded: @ast_node ref
+);
+
+macro_defs(
+  unique int id: @macro_def
+);
+
+#keyset[id]
+macro_def_args(
+  int id: @macro_def ref,
+  int args: @token_tree ref
+);
+
+#keyset[id, index]
+macro_def_attrs(
+  int id: @macro_def ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+macro_def_bodies(
+  int id: @macro_def ref,
+  int body: @token_tree ref
+);
+
+#keyset[id]
+macro_def_names(
+  int id: @macro_def ref,
+  int name: @name ref
+);
+
+#keyset[id]
+macro_def_visibilities(
+  int id: @macro_def ref,
+  int visibility: @visibility ref
+);
+
+macro_rules(
+  unique int id: @macro_rules
+);
+
+#keyset[id, index]
+macro_rules_attrs(
+  int id: @macro_rules ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+macro_rules_names(
+  int id: @macro_rules ref,
+  int name: @name ref
+);
+
+#keyset[id]
+macro_rules_token_trees(
+  int id: @macro_rules ref,
+  int token_tree: @token_tree ref
+);
+
+#keyset[id]
+macro_rules_visibilities(
+  int id: @macro_rules ref,
+  int visibility: @visibility ref
+);
+
+method_call_exprs(
+  unique int id: @method_call_expr
+);
+
+#keyset[id]
+method_call_expr_generic_arg_lists(
+  int id: @method_call_expr ref,
+  int generic_arg_list: @generic_arg_list ref
+);
+
+#keyset[id]
+method_call_expr_name_refs(
+  int id: @method_call_expr ref,
+  int name_ref: @name_ref ref
+);
+
+#keyset[id]
+method_call_expr_receivers(
+  int id: @method_call_expr ref,
+  int receiver: @expr ref
+);
+
+modules(
+  unique int id: @module
+);
+
+#keyset[id, index]
+module_attrs(
+  int id: @module ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+module_item_lists(
+  int id: @module ref,
+  int item_list: @item_list ref
+);
+
+#keyset[id]
+module_names(
+  int id: @module ref,
+  int name: @name ref
+);
+
+#keyset[id]
+module_visibilities(
+  int id: @module ref,
+  int visibility: @visibility ref
+);
+
+path_exprs(
+  unique int id: @path_expr
+);
+
+#keyset[id, index]
+path_expr_attrs(
+  int id: @path_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+path_expr_paths(
+  int id: @path_expr ref,
+  int path: @path ref
+);
+
+statics(
+  unique int id: @static
+);
+
+#keyset[id, index]
+static_attrs(
+  int id: @static ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+static_bodies(
+  int id: @static ref,
+  int body: @expr ref
+);
+
+#keyset[id]
+static_is_mut(
+  int id: @static ref
+);
+
+#keyset[id]
+static_is_static(
+  int id: @static ref
+);
+
+#keyset[id]
+static_names(
+  int id: @static ref,
+  int name: @name ref
+);
+
+#keyset[id]
+static_ties(
+  int id: @static ref,
+  int ty: @type_ref ref
+);
+
+#keyset[id]
+static_visibilities(
+  int id: @static ref,
+  int visibility: @visibility ref
+);
+
+structs(
+  unique int id: @struct
+);
+
+#keyset[id, index]
+struct_attrs(
+  int id: @struct ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+struct_field_lists(
+  int id: @struct ref,
+  int field_list: @field_list ref
+);
+
+#keyset[id]
+struct_generic_param_lists(
+  int id: @struct ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+struct_names(
+  int id: @struct ref,
+  int name: @name ref
+);
+
+#keyset[id]
+struct_visibilities(
+  int id: @struct ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+struct_where_clauses(
+  int id: @struct ref,
+  int where_clause: @where_clause ref
+);
+
+traits(
+  unique int id: @trait
+);
+
+#keyset[id]
+trait_assoc_item_lists(
+  int id: @trait ref,
+  int assoc_item_list: @assoc_item_list ref
+);
+
+#keyset[id, index]
+trait_attrs(
+  int id: @trait ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+trait_generic_param_lists(
+  int id: @trait ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+trait_is_auto(
+  int id: @trait ref
+);
+
+#keyset[id]
+trait_is_unsafe(
+  int id: @trait ref
+);
+
+#keyset[id]
+trait_names(
+  int id: @trait ref,
+  int name: @name ref
+);
+
+#keyset[id]
+trait_type_bound_lists(
+  int id: @trait ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+#keyset[id]
+trait_visibilities(
+  int id: @trait ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+trait_where_clauses(
+  int id: @trait ref,
+  int where_clause: @where_clause ref
+);
+
+trait_aliases(
+  unique int id: @trait_alias
+);
+
+#keyset[id, index]
+trait_alias_attrs(
+  int id: @trait_alias ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+trait_alias_generic_param_lists(
+  int id: @trait_alias ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+trait_alias_names(
+  int id: @trait_alias ref,
+  int name: @name ref
+);
+
+#keyset[id]
+trait_alias_type_bound_lists(
+  int id: @trait_alias ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+#keyset[id]
+trait_alias_visibilities(
+  int id: @trait_alias ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+trait_alias_where_clauses(
+  int id: @trait_alias ref,
+  int where_clause: @where_clause ref
+);
+
+type_aliases(
+  unique int id: @type_alias
+);
+
+#keyset[id, index]
+type_alias_attrs(
+  int id: @type_alias ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+type_alias_generic_param_lists(
+  int id: @type_alias ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+type_alias_is_default(
+  int id: @type_alias ref
+);
+
+#keyset[id]
+type_alias_names(
+  int id: @type_alias ref,
+  int name: @name ref
+);
+
+#keyset[id]
+type_alias_ties(
+  int id: @type_alias ref,
+  int ty: @type_ref ref
+);
+
+#keyset[id]
+type_alias_type_bound_lists(
+  int id: @type_alias ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+#keyset[id]
+type_alias_visibilities(
+  int id: @type_alias ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+type_alias_where_clauses(
+  int id: @type_alias ref,
+  int where_clause: @where_clause ref
+);
+
+unions(
+  unique int id: @union
+);
+
+#keyset[id, index]
+union_attrs(
+  int id: @union ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+union_generic_param_lists(
+  int id: @union ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+union_names(
+  int id: @union ref,
+  int name: @name ref
+);
+
+#keyset[id]
+union_record_field_lists(
+  int id: @union ref,
+  int record_field_list: @record_field_list ref
+);
+
+#keyset[id]
+union_visibilities(
+  int id: @union ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+union_where_clauses(
+  int id: @union ref,
+  int where_clause: @where_clause ref
+);
+
+uses(
+  unique int id: @use
+);
+
+#keyset[id, index]
+use_attrs(
+  int id: @use ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+use_use_trees(
+  int id: @use ref,
+  int use_tree: @use_tree ref
+);
+
+#keyset[id]
+use_visibilities(
+  int id: @use ref,
+  int visibility: @visibility ref
 );
diff --git a/rust/ql/lib/rust.qll b/rust/ql/lib/rust.qll
index bdb9f3df374..ff97a37b5d1 100644
--- a/rust/ql/lib/rust.qll
+++ b/rust/ql/lib/rust.qll
@@ -3,3 +3,9 @@
 import codeql.rust.elements
 import codeql.Locations
 import codeql.files.FileSystem
+import codeql.rust.elements.AssignmentOperation
+import codeql.rust.elements.LogicalOperation
+import codeql.rust.elements.AsyncBlockExpr
+import codeql.rust.elements.Variable
+import codeql.rust.elements.NamedFormatArgument
+import codeql.rust.elements.PositionalFormatArgument
diff --git a/rust/ql/src/qlpack.yml b/rust/ql/src/qlpack.yml
index 1638da417ce..9073d47cb68 100644
--- a/rust/ql/src/qlpack.yml
+++ b/rust/ql/src/qlpack.yml
@@ -5,6 +5,7 @@ groups:
   - queries
 suites: codeql-suites
 extractor: rust
+defaultSuiteFile: codeql-suites/rust-code-scanning.qls
 dependencies:
   codeql/rust-all: ${workspace}
   codeql/suite-helpers: ${workspace}
diff --git a/rust/ql/src/queries/diagnostics/AstConsistencyCounts.ql b/rust/ql/src/queries/diagnostics/AstConsistencyCounts.ql
new file mode 100644
index 00000000000..9a46b1a8bb1
--- /dev/null
+++ b/rust/ql/src/queries/diagnostics/AstConsistencyCounts.ql
@@ -0,0 +1,15 @@
+/**
+ * @name Abstract syntax tree inconsistency counts
+ * @description Counts the number of abstract syntax tree inconsistencies of each type.  This query is intended for internal use.
+ * @kind diagnostic
+ * @id rust/diagnostics/ast-consistency-counts
+ */
+
+import rust
+import codeql.rust.AstConsistency as Consistency
+
+// see also `rust/diagnostics/ast-consistency`, which lists the
+// individual inconsistency results.
+from string type, int num
+where num = Consistency::getAstInconsistencyCounts(type)
+select type, num
diff --git a/rust/ql/src/queries/diagnostics/CfgConsistencyCounts.ql b/rust/ql/src/queries/diagnostics/CfgConsistencyCounts.ql
new file mode 100644
index 00000000000..ecc1833176a
--- /dev/null
+++ b/rust/ql/src/queries/diagnostics/CfgConsistencyCounts.ql
@@ -0,0 +1,15 @@
+/**
+ * @name Control flow graph inconsistency counts
+ * @description Counts the number of control flow graph inconsistencies of each type.  This query is intended for internal use.
+ * @kind diagnostic
+ * @id rust/diagnostics/cfg-consistency-counts
+ */
+
+import rust
+import codeql.rust.controlflow.internal.CfgConsistency as Consistency
+
+// see also `rust/diagnostics/cfg-consistency`, which lists the
+// individual inconsistency results.
+from string type, int num
+where num = Consistency::getCfgInconsistencyCounts(type)
+select type, num
diff --git a/rust/ql/src/queries/diagnostics/DataFlowConsistencyCounts.ql b/rust/ql/src/queries/diagnostics/DataFlowConsistencyCounts.ql
new file mode 100644
index 00000000000..79c582adb08
--- /dev/null
+++ b/rust/ql/src/queries/diagnostics/DataFlowConsistencyCounts.ql
@@ -0,0 +1,21 @@
+/**
+ * @name Data flow inconsistency counts
+ * @description Counts the number of data flow inconsistencies of each type.  This query is intended for internal use.
+ * @kind diagnostic
+ * @id rust/diagnostics/data-flow-consistency-counts
+ */
+
+private import rust
+private import codeql.rust.dataflow.internal.DataFlowImpl
+private import codeql.rust.dataflow.internal.TaintTrackingImpl
+private import codeql.dataflow.internal.DataFlowImplConsistency
+
+private module Input implements InputSig<Location, RustDataFlow> { }
+
+// see also `rust/diagnostics/data-flow-consistency`, which lists the
+// individual inconsistency results.
+from string type, int num
+where
+  num =
+    MakeConsistency<Location, RustDataFlow, RustTaintTracking, Input>::getInconsistencyCounts(type)
+select type, num
diff --git a/rust/ql/src/queries/diagnostics/ExtractionErrors.ql b/rust/ql/src/queries/diagnostics/ExtractionErrors.ql
new file mode 100644
index 00000000000..68be66f8ca9
--- /dev/null
+++ b/rust/ql/src/queries/diagnostics/ExtractionErrors.ql
@@ -0,0 +1,18 @@
+/**
+ * @name Extraction errors
+ * @description List all extraction errors for files in the source code directory.
+ * @kind diagnostic
+ * @id rust/diagnostics/extraction-errors
+ */
+
+import codeql.rust.Diagnostics
+import codeql.files.FileSystem
+
+/** Gets the SARIF severity to associate with an error. */
+int getSeverity() { result = 2 }
+
+from ExtractionError error, File f
+where
+  f = error.getLocation().getFile() and
+  exists(f.getRelativePath())
+select error, "Extraction failed in " + f + " with error " + error.getMessage(), getSeverity()
diff --git a/rust/ql/src/queries/diagnostics/ExtractionWarnings.ql b/rust/ql/src/queries/diagnostics/ExtractionWarnings.ql
new file mode 100644
index 00000000000..99773cc6d53
--- /dev/null
+++ b/rust/ql/src/queries/diagnostics/ExtractionWarnings.ql
@@ -0,0 +1,19 @@
+/**
+ * @name Extraction warnings
+ * @description List all extraction warnings for files in the source code directory.
+ * @kind diagnostic
+ * @id rust/diagnostics/extraction-warnings
+ */
+
+import codeql.rust.Diagnostics
+import codeql.files.FileSystem
+
+/** Gets the SARIF severity to associate with a warning. */
+int getSeverity() { result = 1 }
+
+from ExtractionWarning warning, File f
+where
+  f = warning.getLocation().getFile() and
+  exists(f.getRelativePath())
+select warning, "Extraction warning in " + f + " with message " + warning.getMessage(),
+  getSeverity()
diff --git a/rust/ql/src/queries/diagnostics/UnextractedElements.ql b/rust/ql/src/queries/diagnostics/UnextractedElements.ql
index ae368aac677..dccf7d2ab09 100644
--- a/rust/ql/src/queries/diagnostics/UnextractedElements.ql
+++ b/rust/ql/src/queries/diagnostics/UnextractedElements.ql
@@ -7,27 +7,8 @@
 import rust
 
 /**
- * Gets a location for an `Unimplemented` node.
- */
-Location getUnimplementedLocation(Unimplemented node) {
-  result = node.(Locatable).getLocation()
-  or
-  not node instanceof Locatable and
-  result instanceof EmptyLocation
-}
-
-/**
- * Gets `l.toString()`, but with any locations outside of the source location prefix cleaned up.
- */
-bindingset[l]
-string cleanLocationString(Location l) {
-  if exists(l.getFile().getRelativePath()) or l instanceof EmptyLocation
-  then result = l.toString()
-  else l.getFile().getParentContainer().getAbsolutePath() + result = l.toString() // remove the directory from the string
-}
-
-/**
- * Gets a string along the lines of " (x2)", corresponding to the number `i`. For `i = 1`, the result is the empty string.
+ * Gets a string along the lines of " (x2)", corresponding to the number `i`.
+ * For `i = 1`, the result is the empty string.
  */
 bindingset[i]
 string multipleString(int i) {
@@ -36,26 +17,8 @@ string multipleString(int i) {
   i > 1 and result = " (x" + i.toString() + ")"
 }
 
-query predicate listUnimplemented(string location, string msg) {
-  // something that is not extracted yet
-  exists(int c |
-    c = strictcount(Unimplemented n | cleanLocationString(getUnimplementedLocation(n)) = location) and
-    msg = "Not yet implemented" + multipleString(c) + "."
-  )
-}
-
-query predicate listMissingExpr(string location, string msg) {
-  // gaps in the AST due to parse errors
-  exists(int c |
-    c = strictcount(MissingExpr e | cleanLocationString(e.getLocation()) = location) and
-    msg = "Missing expression" + multipleString(c) + "."
-  )
-}
-
-query predicate listMissingPat(string location, string msg) {
-  // gaps in the AST due to parse errors
-  exists(int c |
-    c = strictcount(MissingPat p | cleanLocationString(p.getLocation()) = location) and
-    msg = "Missing pattern" + multipleString(c) + "."
-  )
-}
+from string name, int c
+where c = strictcount(Unextracted e | e.toString() = name)
+// we don't have locations, so just list the number of each type of
+// `Unextracted` element.
+select name + multipleString(c)
diff --git a/rust/ql/src/queries/summary/NumberOfFilesExtractedWithErrors.ql b/rust/ql/src/queries/summary/NumberOfFilesExtractedWithErrors.ql
new file mode 100644
index 00000000000..23db30f53e9
--- /dev/null
+++ b/rust/ql/src/queries/summary/NumberOfFilesExtractedWithErrors.ql
@@ -0,0 +1,16 @@
+/**
+ * @id rust/summary/number-of-files-extracted-with-errors
+ * @name Total number of Rust files that were extracted with errors
+ * @description The total number of Rust files in the source code directory that
+ *  were extracted, but where at least one extraction error (or warning) occurred
+ *  in the process.
+ * @kind metric
+ * @tags summary
+ */
+
+import codeql.files.FileSystem
+
+select count(File f |
+    exists(f.getRelativePath()) and
+    not f instanceof SuccessfullyExtractedFile
+  )
diff --git a/rust/ql/src/queries/summary/NumberOfSuccessfullyExtractedFiles.ql b/rust/ql/src/queries/summary/NumberOfSuccessfullyExtractedFiles.ql
new file mode 100644
index 00000000000..c960599ad18
--- /dev/null
+++ b/rust/ql/src/queries/summary/NumberOfSuccessfullyExtractedFiles.ql
@@ -0,0 +1,12 @@
+/**
+ * @id rust/summary/number-of-successfully-extracted-files
+ * @name Total number of Rust files that were extracted without error
+ * @description The total number of Rust files in the source code directory that
+ *  were extracted without encountering any extraction errors (or warnings).
+ * @kind metric
+ * @tags summary
+ */
+
+import codeql.files.FileSystem
+
+select count(SuccessfullyExtractedFile f | exists(f.getRelativePath()))
diff --git a/rust/ql/src/queries/summary/Stats.qll b/rust/ql/src/queries/summary/Stats.qll
index 2f3992303f3..aec671098eb 100644
--- a/rust/ql/src/queries/summary/Stats.qll
+++ b/rust/ql/src/queries/summary/Stats.qll
@@ -3,9 +3,47 @@
  */
 
 import rust
+private import codeql.rust.dataflow.internal.DataFlowImpl
+private import codeql.rust.dataflow.internal.TaintTrackingImpl
+private import codeql.rust.AstConsistency as AstConsistency
+private import codeql.rust.controlflow.internal.CfgConsistency as CfgConsistency
+private import codeql.dataflow.internal.DataFlowImplConsistency as DataFlowImplConsistency
 
+/**
+ * Gets a count of the total number of lines of code in the database.
+ */
 int getLinesOfCode() { result = sum(File f | | f.getNumberOfLinesOfCode()) }
 
+/**
+ * Gets a count of the total number of lines of code from the source code directory in the database.
+ */
 int getLinesOfUserCode() {
   result = sum(File f | exists(f.getRelativePath()) | f.getNumberOfLinesOfCode())
 }
+
+/**
+ * Gets a count of the total number of abstract syntax tree inconsistencies in the database.
+ */
+int getTotalAstInconsistencies() {
+  result = sum(string type | | AstConsistency::getAstInconsistencyCounts(type))
+}
+
+/**
+ * Gets a count of the total number of control flow graph inconsistencies in the database.
+ */
+int getTotalCfgInconsistencies() {
+  result = sum(string type | | CfgConsistency::getCfgInconsistencyCounts(type))
+}
+
+private module Input implements DataFlowImplConsistency::InputSig<Location, RustDataFlow> { }
+
+/**
+ * Gets a count of the total number of data flow inconsistencies in the database.
+ */
+int getTotalDataFlowInconsistencies() {
+  result =
+    sum(string type |
+      |
+      DataFlowImplConsistency::MakeConsistency<Location, RustDataFlow, RustTaintTracking, Input>::getInconsistencyCounts(type)
+    )
+}
diff --git a/rust/ql/src/queries/summary/SummaryStats.ql b/rust/ql/src/queries/summary/SummaryStats.ql
index 447325514ca..3f24eb50d19 100644
--- a/rust/ql/src/queries/summary/SummaryStats.ql
+++ b/rust/ql/src/queries/summary/SummaryStats.ql
@@ -1,23 +1,40 @@
 /**
  * @name Summary Statistics
  * @description A table of summary statistics about a database.
- * @kind table
+ * @kind metric
  * @id rust/summary/summary-statistics
  * @tags summary
  */
 
 import rust
+import codeql.rust.Diagnostics
 import Stats
 
-from string key, string value
+from string key, int value
 where
-  key = "Files extracted" and value = count(File f | exists(f.getRelativePath())).toString()
+  key = "Elements extracted" and value = count(Element e | not e instanceof Unextracted)
   or
-  key = "Elements extracted" and value = count(Element e | not e instanceof Unextracted).toString()
+  key = "Elements unextracted" and value = count(Unextracted e)
   or
-  key = "Elements unextracted" and value = count(Unextracted e).toString()
+  key = "Extraction errors" and value = count(ExtractionError e)
   or
-  key = "Lines of code extracted" and value = getLinesOfCode().toString()
+  key = "Extraction warnings" and value = count(ExtractionWarning w)
   or
-  key = "Lines of user code extracted" and value = getLinesOfUserCode().toString()
+  key = "Files extracted - total" and value = count(File f | exists(f.getRelativePath()))
+  or
+  key = "Files extracted - with errors" and
+  value = count(File f | exists(f.getRelativePath()) and not f instanceof SuccessfullyExtractedFile)
+  or
+  key = "Files extracted - without errors" and
+  value = count(SuccessfullyExtractedFile f | exists(f.getRelativePath()))
+  or
+  key = "Lines of code extracted" and value = getLinesOfCode()
+  or
+  key = "Lines of user code extracted" and value = getLinesOfUserCode()
+  or
+  key = "Inconsistencies - AST" and value = getTotalAstInconsistencies()
+  or
+  key = "Inconsistencies - CFG" and value = getTotalCfgInconsistencies()
+  or
+  key = "Inconsistencies - data flow" and value = getTotalDataFlowInconsistencies()
 select key, value
diff --git a/rust/ql/src/queries/unusedentities/UnreachableCode.qhelp b/rust/ql/src/queries/unusedentities/UnreachableCode.qhelp
new file mode 100644
index 00000000000..fef1aa71f6b
--- /dev/null
+++ b/rust/ql/src/queries/unusedentities/UnreachableCode.qhelp
@@ -0,0 +1,24 @@
+<!DOCTYPE qhelp PUBLIC
+  "-//Semmle//qhelp//EN"
+  "qhelp.dtd">
+<qhelp>
+
+<overview>
+<p>This rule finds code that is never reached. Unused code should be removed to increase readability and avoid confusion.</p>
+</overview>
+
+<recommendation>
+<p>Remove any unreachable code.</p>
+</recommendation>
+
+<example>
+<p>In the following example, the final <code>return</code> statement can never be reached:</p>
+<sample src="UnreachableCodeBad.rs" />
+<p>The problem can be fixed simply by removing the unreachable code:</p>
+<sample src="UnreachableCodeGood.rs" />
+</example>
+
+<references>
+<li>Wikipedia: <a href="https://en.wikipedia.org/wiki/Unreachable_code">Unreachable code</a></li>
+</references>
+</qhelp>
diff --git a/rust/ql/src/queries/unusedentities/UnreachableCode.ql b/rust/ql/src/queries/unusedentities/UnreachableCode.ql
new file mode 100644
index 00000000000..aa49c30ce5a
--- /dev/null
+++ b/rust/ql/src/queries/unusedentities/UnreachableCode.ql
@@ -0,0 +1,77 @@
+/**
+ * @name Unreachable code
+ * @description Code that cannot be reached should be deleted.
+ * @kind problem
+ * @problem.severity recommendation
+ * @precision medium
+ * @id rust/dead-code
+ * @tags maintainability
+ */
+
+import rust
+import codeql.rust.controlflow.ControlFlowGraph
+import codeql.rust.controlflow.internal.ControlFlowGraphImpl as ControlFlowGraphImpl
+
+/**
+ * Successor relation that includes unreachable AST nodes.
+ */
+private predicate succ(AstNode a, AstNode b) {
+  exists(ControlFlowGraphImpl::ControlFlowTree cft | cft.succ(a, b, _))
+}
+
+/**
+ * Gets a node we'd prefer not to report as unreachable. These will be removed
+ * from the AST for the purposes of this query, with successor links being
+ * made across them where appropriate.
+ */
+predicate hiddenNode(AstNode n) {
+  // isolated node (not intended to be part of the CFG)
+  not succ(n, _) and
+  not succ(_, n)
+  or
+  n instanceof ControlFlowGraphImpl::PostOrderTree and // location is counter-intuitive
+  not n instanceof MacroExpr
+  or
+  n.isInMacroExpansion()
+}
+
+/**
+ * Successor relation for edges out of `hiddenNode`s.
+ */
+private predicate succHidden(AstNode a, AstNode b) {
+  hiddenNode(a) and
+  succ(a, b)
+}
+
+/**
+ * Successor relation that removes / links over `hiddenNode`s.
+ */
+private predicate succWithHiding(AstNode a, AstNode b) {
+  exists(AstNode mid |
+    not hiddenNode(a) and
+    succ(a, mid) and
+    succHidden*(mid, b) and
+    not hiddenNode(b)
+  )
+}
+
+/**
+ * An AST node that is reachable.
+ */
+predicate reachable(AstNode n) { n = any(CfgNode cfn).getAstNode() }
+
+/**
+ * Holds if `n` is an AST node that's unreachable, and any predecessors
+ * of it are reachable (to avoid duplicate results).
+ */
+private predicate firstUnreachable(AstNode n) {
+  not reachable(n) and
+  not hiddenNode(n) and
+  forall(AstNode pred | succWithHiding(pred, n) | reachable(pred))
+}
+
+from AstNode n
+where
+  firstUnreachable(n) and
+  exists(n.getFile().getRelativePath()) // in source
+select n, "This code is never reached."
diff --git a/rust/ql/src/queries/unusedentities/UnreachableCodeBad.rs b/rust/ql/src/queries/unusedentities/UnreachableCodeBad.rs
new file mode 100644
index 00000000000..a27bc0cab16
--- /dev/null
+++ b/rust/ql/src/queries/unusedentities/UnreachableCodeBad.rs
@@ -0,0 +1,11 @@
+fn fib(input: u32) -> u32 {
+	if (input == 0) {
+		return 0;
+	} else if (input == 1) {
+		return 1;
+	} else {
+		return fib(input - 1) + fib(input - 2);
+	}
+
+	return input; // BAD: this code is never reached
+}
diff --git a/rust/ql/src/queries/unusedentities/UnreachableCodeGood.rs b/rust/ql/src/queries/unusedentities/UnreachableCodeGood.rs
new file mode 100644
index 00000000000..0b2bde66fe9
--- /dev/null
+++ b/rust/ql/src/queries/unusedentities/UnreachableCodeGood.rs
@@ -0,0 +1,9 @@
+fn fib(input: u32) -> u32 {
+	if (input == 0) {
+		return 0;
+	} else if (input == 1) {
+		return 1;
+	} else {
+		return fib(input - 1) + fib(input - 2);
+	}
+}
diff --git a/rust/ql/src/queries/unusedentities/UnusedValue.qhelp b/rust/ql/src/queries/unusedentities/UnusedValue.qhelp
new file mode 100644
index 00000000000..bfcdd0e0877
--- /dev/null
+++ b/rust/ql/src/queries/unusedentities/UnusedValue.qhelp
@@ -0,0 +1,24 @@
+<!DOCTYPE qhelp PUBLIC
+  "-//Semmle//qhelp//EN"
+  "qhelp.dtd">
+<qhelp>
+
+<overview>
+<p>This rule finds values that are assigned to variables but never used. Unused values should be removed to increase readability and avoid confusion.</p>
+</overview>
+
+<recommendation>
+<p>Remove any unused values. Also remove any variables that only hold unused values.</p>
+</recommendation>
+
+<example>
+<p>In the following example, there is a variable <code>average</code> that is initialized to <code>0</code>, but that value is never used:</p>
+<sample src="UnusedValueBad.rs" />
+<p>The problem can be fixed by removing the unused value:</p>
+<sample src="UnusedValueGood.rs" />
+</example>
+
+<references>
+<li>GeeksforGeeks: <a href="https://www.geeksforgeeks.org/how-to-avoid-unused-variable-warning-in-rust/">How to avoid unused Variable warning in Rust?</a></li>
+</references>
+</qhelp>
diff --git a/rust/ql/src/queries/unusedentities/UnusedValue.ql b/rust/ql/src/queries/unusedentities/UnusedValue.ql
new file mode 100644
index 00000000000..32b54fc7442
--- /dev/null
+++ b/rust/ql/src/queries/unusedentities/UnusedValue.ql
@@ -0,0 +1,25 @@
+/**
+ * @name Unused value
+ * @description Unused values may be an indication that the code is incomplete or has a typo.
+ * @kind problem
+ * @problem.severity recommendation
+ * @precision medium
+ * @id rust/unused-value
+ * @tags maintainability
+ */
+
+import rust
+import codeql.rust.dataflow.Ssa
+import codeql.rust.dataflow.internal.SsaImpl
+import UnusedVariable
+
+from AstNode write, Ssa::Variable v
+where
+  variableWrite(write, v) and
+  // SSA definitions are only created for live writes
+  not write = any(Ssa::WriteDefinition def).getWriteAccess().getAstNode() and
+  // avoid overlap with the unused variable query
+  not isUnused(v) and
+  not v instanceof DiscardVariable and
+  not write.isInMacroExpansion()
+select write, "Variable $@ is assigned a value that is never used.", v, v.getName()
diff --git a/rust/ql/src/queries/unusedentities/UnusedValueBad.rs b/rust/ql/src/queries/unusedentities/UnusedValueBad.rs
new file mode 100644
index 00000000000..1256a8d95a4
--- /dev/null
+++ b/rust/ql/src/queries/unusedentities/UnusedValueBad.rs
@@ -0,0 +1,11 @@
+fn get_average(values:&[i32]) -> f64 {
+	let mut sum = 0;
+	let mut average = 0.0; // BAD: unused value
+
+	for v in values {
+		sum += v;
+	}
+
+	average = sum as f64 / values.len() as f64;
+	return average;
+}
diff --git a/rust/ql/src/queries/unusedentities/UnusedValueGood.rs b/rust/ql/src/queries/unusedentities/UnusedValueGood.rs
new file mode 100644
index 00000000000..0b3c6930203
--- /dev/null
+++ b/rust/ql/src/queries/unusedentities/UnusedValueGood.rs
@@ -0,0 +1,11 @@
+fn get_average(values:&[i32]) -> f64 {
+	let mut sum = 0;
+	let average;
+
+	for v in values {
+		sum += v;
+	}
+
+	average = sum as f64 / values.len() as f64;
+	return average;
+}
diff --git a/rust/ql/src/queries/unusedentities/UnusedVariable.qhelp b/rust/ql/src/queries/unusedentities/UnusedVariable.qhelp
new file mode 100644
index 00000000000..c34283962f6
--- /dev/null
+++ b/rust/ql/src/queries/unusedentities/UnusedVariable.qhelp
@@ -0,0 +1,24 @@
+<!DOCTYPE qhelp PUBLIC
+  "-//Semmle//qhelp//EN"
+  "qhelp.dtd">
+<qhelp>
+
+<overview>
+<p>This rule finds variables that are never accessed. Unused variables should be removed to increase readability and avoid confusion.</p>
+</overview>
+
+<recommendation>
+<p>Remove any unused variables.</p>
+</recommendation>
+
+<example>
+<p>In the following example, there is an unused variable <code>average</code> that is never used:</p>
+<sample src="UnusedVariableBad.rs" />
+<p>The problem can be fixed simply by removing the variable:</p>
+<sample src="UnusedVariableGood.rs" />
+</example>
+
+<references>
+<li>GeeksforGeeks: <a href="https://www.geeksforgeeks.org/how-to-avoid-unused-variable-warning-in-rust/">How to avoid unused Variable warning in Rust?</a></li>
+</references>
+</qhelp>
diff --git a/rust/ql/src/queries/unusedentities/UnusedVariable.ql b/rust/ql/src/queries/unusedentities/UnusedVariable.ql
new file mode 100644
index 00000000000..388c98d07b6
--- /dev/null
+++ b/rust/ql/src/queries/unusedentities/UnusedVariable.ql
@@ -0,0 +1,19 @@
+/**
+ * @name Unused variable
+ * @description Unused variables may be an indication that the code is incomplete or has a typo.
+ * @kind problem
+ * @problem.severity recommendation
+ * @precision high
+ * @id rust/unused-variable
+ * @tags maintainability
+ */
+
+import rust
+import UnusedVariable
+
+from Variable v
+where
+  isUnused(v) and
+  not isAllowableUnused(v) and
+  not v instanceof DiscardVariable
+select v, "Variable '" + v + "' is not used."
diff --git a/rust/ql/src/queries/unusedentities/UnusedVariable.qll b/rust/ql/src/queries/unusedentities/UnusedVariable.qll
new file mode 100644
index 00000000000..d92f8787af1
--- /dev/null
+++ b/rust/ql/src/queries/unusedentities/UnusedVariable.qll
@@ -0,0 +1,26 @@
+import rust
+
+/**
+ * A deliberately unused variable, for example `_` or `_x`.
+ */
+class DiscardVariable extends Variable {
+  DiscardVariable() { this.getName().charAt(0) = "_" }
+}
+
+/**
+ * Holds if variable `v` is unused.
+ */
+predicate isUnused(Variable v) {
+  // variable is not accessed or initialized
+  not exists(v.getAnAccess()) and
+  not exists(v.getInitializer())
+}
+
+/**
+ * Holds if variable `v` is in a context where we may not find a use for it,
+ * but that's expected and should not be considered a problem.
+ */
+predicate isAllowableUnused(Variable v) {
+  // in a macro expansion
+  v.getPat().isInMacroExpansion()
+}
diff --git a/rust/ql/src/queries/unusedentities/UnusedVariableBad.rs b/rust/ql/src/queries/unusedentities/UnusedVariableBad.rs
new file mode 100644
index 00000000000..e968ea6d80e
--- /dev/null
+++ b/rust/ql/src/queries/unusedentities/UnusedVariableBad.rs
@@ -0,0 +1,10 @@
+fn get_sum(values:&[i32]) -> i32 {
+	let mut sum = 0;
+	let mut average; // BAD: unused variable
+
+	for v in values {
+		sum += v;
+	}
+
+	return sum;
+}
diff --git a/rust/ql/src/queries/unusedentities/UnusedVariableGood.rs b/rust/ql/src/queries/unusedentities/UnusedVariableGood.rs
new file mode 100644
index 00000000000..1b502ea2915
--- /dev/null
+++ b/rust/ql/src/queries/unusedentities/UnusedVariableGood.rs
@@ -0,0 +1,9 @@
+fn get_sum(values:&[i32]) -> i32 {
+	let mut sum = 0;
+
+	for v in values {
+		sum += v;
+	}
+
+	return sum;
+}
diff --git a/rust/ql/test/extractor-tests/canonical_path/canonical_paths.expected b/rust/ql/test/extractor-tests/canonical_path/canonical_paths.expected
new file mode 100644
index 00000000000..622652e091f
--- /dev/null
+++ b/rust/ql/test/extractor-tests/canonical_path/canonical_paths.expected
@@ -0,0 +1,70 @@
+canonicalPaths
+| canonical_paths.rs:1:1:34:1 | Module | repo::test | crate::canonical_paths::a |
+| canonical_paths.rs:2:5:3:22 | Struct | repo::test | crate::canonical_paths::a::Struct |
+| canonical_paths.rs:5:5:7:5 | Trait | repo::test | crate::canonical_paths::a::Trait |
+| canonical_paths.rs:6:9:6:20 | f | repo::test | crate::canonical_paths::a::Trait::f |
+| canonical_paths.rs:9:5:11:5 | Impl | None | None |
+| canonical_paths.rs:10:9:10:22 | f | repo::test | <crate::canonical_paths::a::Struct as crate::canonical_paths::a::Trait>::f |
+| canonical_paths.rs:13:5:15:5 | Impl | None | None |
+| canonical_paths.rs:14:9:14:22 | g | repo::test | <crate::canonical_paths::a::Struct>::g |
+| canonical_paths.rs:17:5:19:5 | Trait | repo::test | crate::canonical_paths::a::TraitWithBlanketImpl |
+| canonical_paths.rs:18:9:18:20 | h | repo::test | crate::canonical_paths::a::TraitWithBlanketImpl::h |
+| canonical_paths.rs:21:5:23:5 | Impl | None | None |
+| canonical_paths.rs:22:9:22:22 | h | repo::test | <_ as crate::canonical_paths::a::TraitWithBlanketImpl>::h |
+| canonical_paths.rs:25:5:25:16 | free | repo::test | crate::canonical_paths::a::free |
+| canonical_paths.rs:27:5:33:5 | usage | repo::test | crate::canonical_paths::a::usage |
+| canonical_paths.rs:36:1:73:1 | Module | repo::test | crate::canonical_paths::without |
+| canonical_paths.rs:37:5:37:24 | Use | None | None |
+| canonical_paths.rs:39:5:68:5 | canonicals | repo::test | crate::canonical_paths::without::canonicals |
+| canonical_paths.rs:40:9:40:27 | Struct | repo::test | {34}::OtherStruct |
+| canonical_paths.rs:42:9:44:9 | Trait | repo::test | {34}::OtherTrait |
+| canonical_paths.rs:43:13:43:24 | g | repo::test | {34}::OtherTrait::g |
+| canonical_paths.rs:46:9:48:9 | Impl | None | None |
+| canonical_paths.rs:47:13:47:26 | g | repo::test | <{34}::OtherStruct as {34}::OtherTrait>::g |
+| canonical_paths.rs:50:9:52:9 | Impl | None | None |
+| canonical_paths.rs:51:13:51:26 | g | repo::test | <crate::canonical_paths::a::Struct as {34}::OtherTrait>::g |
+| canonical_paths.rs:54:9:56:9 | Impl | None | None |
+| canonical_paths.rs:55:13:55:26 | f | repo::test | <{34}::OtherStruct as crate::canonical_paths::a::Trait>::f |
+| canonical_paths.rs:58:9:60:9 | nested | repo::test | {34}::nested |
+| canonical_paths.rs:59:13:59:31 | Struct | repo::test | {35}::OtherStruct |
+| canonical_paths.rs:62:9:67:9 | usage | repo::test | {34}::usage |
+| canonical_paths.rs:70:5:72:5 | other | repo::test | crate::canonical_paths::without::other |
+| canonical_paths.rs:71:9:71:27 | Struct | repo::test | {36}::OtherStruct |
+| lib.rs:1:1:1:20 | Module | repo::test | crate::canonical_paths |
+resolvedPaths
+| canonical_paths.rs:2:7:2:12 | derive | None | None |
+| canonical_paths.rs:9:10:9:14 | Trait | repo::test | crate::canonical_paths::a::Trait |
+| canonical_paths.rs:9:20:9:25 | Struct | repo::test | crate::canonical_paths::a::Struct |
+| canonical_paths.rs:13:10:13:15 | Struct | repo::test | crate::canonical_paths::a::Struct |
+| canonical_paths.rs:21:13:21:14 | Eq | lang:core | crate::cmp::Eq |
+| canonical_paths.rs:21:17:21:36 | TraitWithBlanketImpl | repo::test | crate::canonical_paths::a::TraitWithBlanketImpl |
+| canonical_paths.rs:21:42:21:42 | T | None | None |
+| canonical_paths.rs:28:17:28:22 | Struct | repo::test | crate::canonical_paths::a::Struct |
+| canonical_paths.rs:29:9:29:9 | s | None | None |
+| canonical_paths.rs:29:9:29:13 | ... .f(...) | repo::test | <crate::canonical_paths::a::Struct as crate::canonical_paths::a::Trait>::f |
+| canonical_paths.rs:30:9:30:9 | s | None | None |
+| canonical_paths.rs:30:9:30:13 | ... .g(...) | repo::test | <crate::canonical_paths::a::Struct>::g |
+| canonical_paths.rs:31:9:31:9 | s | None | None |
+| canonical_paths.rs:31:9:31:13 | ... .h(...) | repo::test | <_ as crate::canonical_paths::a::TraitWithBlanketImpl>::h |
+| canonical_paths.rs:32:9:32:12 | free | repo::test | crate::canonical_paths::a::free |
+| canonical_paths.rs:37:9:37:13 | super | repo::test | crate::canonical_paths |
+| canonical_paths.rs:37:9:37:16 | super::a | repo::test | crate::canonical_paths::a |
+| canonical_paths.rs:37:9:37:23 | super::a::Trait | repo::test | crate::canonical_paths::a::Trait |
+| canonical_paths.rs:46:14:46:23 | OtherTrait | repo::test | {34}::OtherTrait |
+| canonical_paths.rs:46:29:46:39 | OtherStruct | repo::test | {34}::OtherStruct |
+| canonical_paths.rs:50:14:50:23 | OtherTrait | repo::test | {34}::OtherTrait |
+| canonical_paths.rs:50:29:50:33 | crate | None | None |
+| canonical_paths.rs:50:29:50:50 | crate::canonical_paths | repo::test | crate::canonical_paths |
+| canonical_paths.rs:50:29:50:53 | crate::canonical_paths::a | repo::test | crate::canonical_paths::a |
+| canonical_paths.rs:50:29:50:61 | crate::canonical_paths::a::Struct | repo::test | crate::canonical_paths::a::Struct |
+| canonical_paths.rs:54:14:54:18 | crate | None | None |
+| canonical_paths.rs:54:14:54:35 | crate::canonical_paths | repo::test | crate::canonical_paths |
+| canonical_paths.rs:54:14:54:38 | crate::canonical_paths::a | repo::test | crate::canonical_paths::a |
+| canonical_paths.rs:54:14:54:45 | crate::canonical_paths::a::Trait | repo::test | crate::canonical_paths::a::Trait |
+| canonical_paths.rs:54:51:54:61 | OtherStruct | repo::test | {34}::OtherStruct |
+| canonical_paths.rs:63:21:63:31 | OtherStruct | repo::test | {34}::OtherStruct |
+| canonical_paths.rs:64:13:64:13 | s | None | None |
+| canonical_paths.rs:64:13:64:17 | ... .f(...) | repo::test | <{34}::OtherStruct as crate::canonical_paths::a::Trait>::f |
+| canonical_paths.rs:65:13:65:13 | s | None | None |
+| canonical_paths.rs:65:13:65:17 | ... .g(...) | repo::test | <{34}::OtherStruct as {34}::OtherTrait>::g |
+| canonical_paths.rs:66:13:66:18 | nested | repo::test | {34}::nested |
diff --git a/rust/ql/test/extractor-tests/canonical_path/canonical_paths.ql b/rust/ql/test/extractor-tests/canonical_path/canonical_paths.ql
new file mode 100644
index 00000000000..7488d699087
--- /dev/null
+++ b/rust/ql/test/extractor-tests/canonical_path/canonical_paths.ql
@@ -0,0 +1,30 @@
+import rust
+import TestUtils
+
+query predicate canonicalPaths(Item i, string origin, string path) {
+  toBeTested(i) and
+  (
+    origin = i.getCrateOrigin()
+    or
+    not i.hasCrateOrigin() and origin = "None"
+  ) and
+  (
+    path = i.getExtendedCanonicalPath()
+    or
+    not i.hasExtendedCanonicalPath() and path = "None"
+  )
+}
+
+query predicate resolvedPaths(Resolvable e, string origin, string path) {
+  toBeTested(e) and
+  (
+    origin = e.getResolvedCrateOrigin()
+    or
+    not e.hasResolvedCrateOrigin() and origin = "None"
+  ) and
+  (
+    path = e.getResolvedPath()
+    or
+    not e.hasResolvedPath() and path = "None"
+  )
+}
diff --git a/rust/ql/test/extractor-tests/canonical_path/canonical_paths.rs b/rust/ql/test/extractor-tests/canonical_path/canonical_paths.rs
new file mode 100644
index 00000000000..7444903dc01
--- /dev/null
+++ b/rust/ql/test/extractor-tests/canonical_path/canonical_paths.rs
@@ -0,0 +1,73 @@
+mod a {
+    #[derive(Eq, PartialEq)]
+    pub struct Struct;
+
+    pub trait Trait {
+        fn f(&self);
+    }
+
+    impl Trait for Struct {
+        fn f(&self) {}
+    }
+
+    impl Struct {
+        fn g(&self) {}
+    }
+
+    trait TraitWithBlanketImpl {
+        fn h(&self);
+    }
+
+    impl<T: Eq> TraitWithBlanketImpl for T {
+        fn h(&self) {}
+    }
+
+    fn free() {}
+
+    fn usage() {
+        let s = Struct {};
+        s.f();
+        s.g();
+        s.h();
+        free();
+    }
+}
+
+mod without {
+    use super::a::Trait;
+
+    fn canonicals() {
+        struct OtherStruct;
+
+        trait OtherTrait {
+            fn g(&self);
+        }
+
+        impl OtherTrait for OtherStruct {
+            fn g(&self) {}
+        }
+
+        impl OtherTrait for crate::canonical_paths::a::Struct {
+            fn g(&self) {}
+        }
+
+        impl crate::canonical_paths::a::Trait for OtherStruct {
+            fn f(&self) {}
+        }
+
+        fn nested() {
+            struct OtherStruct;
+        }
+
+        fn usage() {
+            let s = OtherStruct {};
+            s.f();
+            s.g();
+            nested();
+        }
+    }
+
+    fn other() {
+        struct OtherStruct;
+    }
+}
diff --git a/rust/ql/test/extractor-tests/generated/.generated_tests.list b/rust/ql/test/extractor-tests/generated/.generated_tests.list
index 717a41c882f..b60779ebd86 100644
--- a/rust/ql/test/extractor-tests/generated/.generated_tests.list
+++ b/rust/ql/test/extractor-tests/generated/.generated_tests.list
@@ -1,61 +1,141 @@
+Abi/gen_abi.rs 5d2f6eccb2bab86080188be9700ab64a34fa6e8e8e7b08f65a5c97d1de0a900c 5d2f6eccb2bab86080188be9700ab64a34fa6e8e8e7b08f65a5c97d1de0a900c
+ArgList/gen_arg_list.rs 569d0b9b0479de5453ae0f89e4f90e32b02ee84dfb3d815821d722ece6f75b64 569d0b9b0479de5453ae0f89e4f90e32b02ee84dfb3d815821d722ece6f75b64
+ArrayExpr/gen_array_expr.rs e4863b428ea2b5cfd59773f201e58fd905f7363512e54e4fdebd02c297bd85ff e4863b428ea2b5cfd59773f201e58fd905f7363512e54e4fdebd02c297bd85ff
+ArrayType/gen_array_type.rs 3cb5f35006648d676ead1088aa330cd34beaabaaad7b9aa952e6375bc1cec5cb 3cb5f35006648d676ead1088aa330cd34beaabaaad7b9aa952e6375bc1cec5cb
 AsmExpr/gen_asm_expr.rs 00b21fd66fe12785174bd0160d0317a6c78ff05dbba73313eb07b56531cf3158 00b21fd66fe12785174bd0160d0317a6c78ff05dbba73313eb07b56531cf3158
-AsyncBlockExpr/gen_async_block_expr.rs e608c67564863c969d512fea8df22f3b9556c4f8bd5582a04da2629388511591 e608c67564863c969d512fea8df22f3b9556c4f8bd5582a04da2629388511591
+AssocTypeArg/gen_assoc_type_arg.rs 00ec0e22c4d73338de605dc3b1b1306bc83a95f87376ce976f08d2f9923cc2b4 00ec0e22c4d73338de605dc3b1b1306bc83a95f87376ce976f08d2f9923cc2b4
+Attr/gen_attr.rs cd6e50f5ebb17066209682b1a9f22ff116584ffef180d8ab51e2ba5cab6a91ec cd6e50f5ebb17066209682b1a9f22ff116584ffef180d8ab51e2ba5cab6a91ec
 AwaitExpr/gen_await_expr.rs cbfa17a0b84bb0033b1f577c1f2a7ff187506c6211faaf6d90c371d4186b9aa2 cbfa17a0b84bb0033b1f577c1f2a7ff187506c6211faaf6d90c371d4186b9aa2
 BecomeExpr/gen_become_expr.rs ab763211a01a2ca92be1589625465672c762df66fa3d12c9f1376021e497c06c ab763211a01a2ca92be1589625465672c762df66fa3d12c9f1376021e497c06c
 BinaryExpr/gen_binary_expr.rs 5ea68396dc2e3ff7fcaf5a5201636dd175dd45be36647b6ae0043c765ce24549 5ea68396dc2e3ff7fcaf5a5201636dd175dd45be36647b6ae0043c765ce24549
 BlockExpr/gen_block_expr.rs 17b06c726e304e0efcfde8e71afd9c657860312be554366894236125cb08719e 17b06c726e304e0efcfde8e71afd9c657860312be554366894236125cb08719e
-BoxExpr/gen_box_expr.rs f3a121bdb82794d223a294e2fcb67f9d5c77aff5f4f5be8c4673e2bed0e694d8 f3a121bdb82794d223a294e2fcb67f9d5c77aff5f4f5be8c4673e2bed0e694d8
 BoxPat/gen_box_pat.rs 1493e24b732370b577ade38c47db17fa157df19f5390606a67a6040e49b501c0 1493e24b732370b577ade38c47db17fa157df19f5390606a67a6040e49b501c0
-BreakExpr/gen_break_expr.rs 5240475a75b772ea45ab5a9d4f09a8fbba4a9d3e6cd8483fc2d0de29c880eac8 5240475a75b772ea45ab5a9d4f09a8fbba4a9d3e6cd8483fc2d0de29c880eac8
+BreakExpr/gen_break_expr.rs aacdf9df7fc51d19742b9e813835c0bd0913017e8d62765960e06b27d58b9031 aacdf9df7fc51d19742b9e813835c0bd0913017e8d62765960e06b27d58b9031
 CallExpr/gen_call_expr.rs 013a7c878996aefb25b94b68eebc4f0b1bb74ccd09e91c491980817a383e2401 013a7c878996aefb25b94b68eebc4f0b1bb74ccd09e91c491980817a383e2401
 CastExpr/gen_cast_expr.rs abd59cc7b92578b56098ac0045cf7de4b15c645cce79e3bdad8d3b6f4657360d abd59cc7b92578b56098ac0045cf7de4b15c645cce79e3bdad8d3b6f4657360d
+ClosureBinder/gen_closure_binder.rs 78d3219bdfc58a22f333e3c82468fc23001e92b1d5acb085de7f48d7d1722244 78d3219bdfc58a22f333e3c82468fc23001e92b1d5acb085de7f48d7d1722244
 ClosureExpr/gen_closure_expr.rs 15bd9abdb8aaffabb8bb335f8ebd0571eb5f29115e1dc8d11837aa988702cd80 15bd9abdb8aaffabb8bb335f8ebd0571eb5f29115e1dc8d11837aa988702cd80
+Comment/gen_comment.rs 1e1f9f43161a79c096c2056e8b7f5346385ab7addcdec68c2d53b383dd3debe6 1e1f9f43161a79c096c2056e8b7f5346385ab7addcdec68c2d53b383dd3debe6
+Const/gen_const.rs fea9d399fe4036c55b94b419ecb1cbb3131248ae338c20d383080dd1ca30f274 fea9d399fe4036c55b94b419ecb1cbb3131248ae338c20d383080dd1ca30f274
+ConstArg/gen_const_arg.rs feab3cdbbc469a287884ff7605e9a7541f904e9e5bd1f14a8e0f741fa970dd7c feab3cdbbc469a287884ff7605e9a7541f904e9e5bd1f14a8e0f741fa970dd7c
 ConstBlockPat/gen_const_block_pat.rs 7e3057cd24d22e752354369cf7e08e9536642812c0947b36aa5d8290a45476fd 7e3057cd24d22e752354369cf7e08e9536642812c0947b36aa5d8290a45476fd
-ConstExpr/gen_const_expr.rs d9c261139d784ad5efd6ca384528c6f2296392932d0284ae4d0e63844e94a091 d9c261139d784ad5efd6ca384528c6f2296392932d0284ae4d0e63844e94a091
+ConstParam/gen_const_param.rs f0a4176333b9519b4cc2533a083f68f6859b5b0855d1b0dbcef4d4e206721830 f0a4176333b9519b4cc2533a083f68f6859b5b0855d1b0dbcef4d4e206721830
 ContinueExpr/gen_continue_expr.rs 63840dcd8440aaf1b96b713b80eb2b56acb1639d3200b3c732b45291a071b5ff 63840dcd8440aaf1b96b713b80eb2b56acb1639d3200b3c732b45291a071b5ff
-ElementListExpr/gen_element_list_expr.rs 3edce2774071165be5023a34ea7162f40d5dfb738b2b263fefa99fca026f89ee 3edce2774071165be5023a34ea7162f40d5dfb738b2b263fefa99fca026f89ee
-ExprStmt/gen_expr_stmt.rs 318a0fd72ee8d6da17c5d635ba0724ed2c11c0f7e9b75c939990cd0c7f3929e4 318a0fd72ee8d6da17c5d635ba0724ed2c11c0f7e9b75c939990cd0c7f3929e4
+DynTraitType/gen_dyn_trait_type.rs 65b8e54bdc4bdfff8b68480582acca642bf2d28e316c5251fb3b8371cd7328bd 65b8e54bdc4bdfff8b68480582acca642bf2d28e316c5251fb3b8371cd7328bd
+Enum/gen_enum.rs efa816c579bfba60d1f32f818b022956d08d397af508c82b7331f14615f25be4 efa816c579bfba60d1f32f818b022956d08d397af508c82b7331f14615f25be4
+ExprStmt/gen_expr_stmt.rs 6ce47428a8d33b902c1f14b06cc375d08eff95251e4a81dac2fa51872b7649b1 6ce47428a8d33b902c1f14b06cc375d08eff95251e4a81dac2fa51872b7649b1
+ExternBlock/gen_extern_block.rs 5b5c4d7a2c4a91027df1578b74900ae1b971aede7720ab12de9bb918c42a583d 5b5c4d7a2c4a91027df1578b74900ae1b971aede7720ab12de9bb918c42a583d
+ExternCrate/gen_extern_crate.rs 9b3ab23a56b7778723ce436b25310547b2b0aeca3e5c6b7e61f273b5ce5573e3 9b3ab23a56b7778723ce436b25310547b2b0aeca3e5c6b7e61f273b5ce5573e3
+ExternItemList/gen_extern_item_list.rs ff2baaaa32099808b86fbf6f4853171146594d5db23c6ee447eb5cec10cee7cf ff2baaaa32099808b86fbf6f4853171146594d5db23c6ee447eb5cec10cee7cf
 FieldExpr/gen_field_expr.rs 9a70500d592e0a071b03d974a55558b3bc0df531ff11bce5898feb36e17ffd8b 9a70500d592e0a071b03d974a55558b3bc0df531ff11bce5898feb36e17ffd8b
+FnPtrType/gen_fn_ptr_type.rs a7842d8c21636739d1be959e5ce5e0b23482d5ef6eab5c45b009895da8175932 a7842d8c21636739d1be959e5ce5e0b23482d5ef6eab5c45b009895da8175932
+ForExpr/gen_for_expr.rs 67decf3073e1a9363d9df05a5a64a6059349e50b81356f480f7aeb352189136d 67decf3073e1a9363d9df05a5a64a6059349e50b81356f480f7aeb352189136d
+ForType/gen_for_type.rs 6cb447df02c61b192e283e019576c28225added02d167030d64ebd0bebb1b158 6cb447df02c61b192e283e019576c28225added02d167030d64ebd0bebb1b158
+FormatArgsArg/gen_format_args_arg.rs c466f2fc2c0f9592061a159a217a87551d67f1ccb0e4d8f7f56a463a2aa4a73a c466f2fc2c0f9592061a159a217a87551d67f1ccb0e4d8f7f56a463a2aa4a73a
+FormatArgsExpr/gen_format_args_expr.rs 7184dbb8833f970676e59fca3a40ec51d14a68e3151d8a6d637896494f2b4454 7184dbb8833f970676e59fca3a40ec51d14a68e3151d8a6d637896494f2b4454
 Function/gen_function.rs ba6ecb9e0d89183295eb02f3c20ebbf5c209f89bd0172c73a3b4a6dacbf3a54c ba6ecb9e0d89183295eb02f3c20ebbf5c209f89bd0172c73a3b4a6dacbf3a54c
 GenericArgList/gen_generic_arg_list.rs cfb072d3b48f9dd568c23d4dfefba28766628678f66bbf9a436de9919ead35f5 cfb072d3b48f9dd568c23d4dfefba28766628678f66bbf9a436de9919ead35f5
+GenericParamList/gen_generic_param_list.rs 4cc9b628f53e1a6c5781ad195b8648fa6dee0bb41b24007fbd986527374d3669 4cc9b628f53e1a6c5781ad195b8648fa6dee0bb41b24007fbd986527374d3669
 IdentPat/gen_ident_pat.rs 87f9201ca47683ff6f12a0c844c062fdedb6d86546794522d358b117ba0fe477 87f9201ca47683ff6f12a0c844c062fdedb6d86546794522d358b117ba0fe477
-IfExpr/gen_if_expr.rs f2f79d4df0f01dc691b5c62c0f9e1815d7ebc978cf83b7559b5eeab0fcc2fc01 f2f79d4df0f01dc691b5c62c0f9e1815d7ebc978cf83b7559b5eeab0fcc2fc01
+IfExpr/gen_if_expr.rs 2df66735394ebb20db29d3fbf2721ad4812afbe8d4614d03f26265c1f481f1e8 2df66735394ebb20db29d3fbf2721ad4812afbe8d4614d03f26265c1f481f1e8
+Impl/gen_impl.rs dd97fa44ec844b735b30e7dfd1b8ecd4449c7914af1ea427edcba848194a84ed dd97fa44ec844b735b30e7dfd1b8ecd4449c7914af1ea427edcba848194a84ed
+ImplTraitType/gen_impl_trait_type.rs feef13242cbee4e8c59a6db01778384d6d27d5b702431c2fd8dca0859f04a831 feef13242cbee4e8c59a6db01778384d6d27d5b702431c2fd8dca0859f04a831
 IndexExpr/gen_index_expr.rs 22d7f81ba43dc63f1f49e21a2c25ce25a1b8f6e8e95e1a66f518f010a4d73c61 22d7f81ba43dc63f1f49e21a2c25ce25a1b8f6e8e95e1a66f518f010a4d73c61
+InferType/gen_infer_type.rs d1b7ee04417cfa8617bfd170920a48e8cfe97373b704153f5e2182ae29072ca3 d1b7ee04417cfa8617bfd170920a48e8cfe97373b704153f5e2182ae29072ca3
+ItemList/gen_item_list.rs 2ea6180e66de963627aabdaf64ce3c95c40cc7628d8734607ae2720bab857643 2ea6180e66de963627aabdaf64ce3c95c40cc7628d8734607ae2720bab857643
 Label/gen_label.rs 0584f519f210f621d7ebc0cb8c95ce05db0795d6109c0d16866f8f699a28213c 0584f519f210f621d7ebc0cb8c95ce05db0795d6109c0d16866f8f699a28213c
+LetElse/gen_let_else.rs 2cb09461b0ea48f666bd65a208663e64a874efadacb22764301871ea07956901 2cb09461b0ea48f666bd65a208663e64a874efadacb22764301871ea07956901
 LetExpr/gen_let_expr.rs 7aebcd7197fd0e6b5b954deb2f6380769c94609c57e34eb86a33eb04e91d4a78 7aebcd7197fd0e6b5b954deb2f6380769c94609c57e34eb86a33eb04e91d4a78
 LetStmt/gen_let_stmt.rs 3f41c9721149ee0bf8f89a58bc419756358a2e267b80d07660354a7fc44ef1eb 3f41c9721149ee0bf8f89a58bc419756358a2e267b80d07660354a7fc44ef1eb
+Lifetime/gen_lifetime.rs 4f5c39d68e29ee4a351379ae9aa9c216f750b8858dac94d30928a348bee87a20 4f5c39d68e29ee4a351379ae9aa9c216f750b8858dac94d30928a348bee87a20
+LifetimeArg/gen_lifetime_arg.rs 95616e0dc445679761f4a60fe03247418b2c5979251413e309306b1c8fbf09de 95616e0dc445679761f4a60fe03247418b2c5979251413e309306b1c8fbf09de
+LifetimeParam/gen_lifetime_param.rs 2caed50ce48360681271e4e89fde0d6d9076ebb9cd9c62fc4d43109cd873b31c 2caed50ce48360681271e4e89fde0d6d9076ebb9cd9c62fc4d43109cd873b31c
 LiteralExpr/gen_literal_expr.rs 2db01ad390e5c0c63a957c043230a462cb4cc25715eea6ede15d43c55d35976d 2db01ad390e5c0c63a957c043230a462cb4cc25715eea6ede15d43c55d35976d
 LiteralPat/gen_literal_pat.rs a471b481b6989001817a3988696f445d9a4dea784e543c346536dacbee1e96f3 a471b481b6989001817a3988696f445d9a4dea784e543c346536dacbee1e96f3
 LoopExpr/gen_loop_expr.rs 35deaf35e765db4ae3124a11284266d8f341d1ce7b700030efada0dda8878619 35deaf35e765db4ae3124a11284266d8f341d1ce7b700030efada0dda8878619
+MacroCall/gen_macro_call.rs 139ef2c69323eea1a901e260d4e2acdd00b26f013b90c9344f48c6503ce29d79 139ef2c69323eea1a901e260d4e2acdd00b26f013b90c9344f48c6503ce29d79
+MacroDef/gen_macro_def.rs 17c5387fb464a60b4a4520d22b055ba35ff23e9fe431a18a33808ae02c4bbff5 17c5387fb464a60b4a4520d22b055ba35ff23e9fe431a18a33808ae02c4bbff5
+MacroExpr/gen_macro_expr.rs 3c23dc88fcc4bc8f97d9364d2f367671a0a5a63d07e52237d28204b64756dcdb 3c23dc88fcc4bc8f97d9364d2f367671a0a5a63d07e52237d28204b64756dcdb
+MacroItems/gen_macro_items.rs 8ef3e16b73635dc97afa3ffa4db2bb21a8f1b435176861a594b0200cc5b9b931 8ef3e16b73635dc97afa3ffa4db2bb21a8f1b435176861a594b0200cc5b9b931
+MacroPat/gen_macro_pat.rs b8041370598bd7fb26778d829a15c415c2078d69124f6af634ddeba13a114aa0 b8041370598bd7fb26778d829a15c415c2078d69124f6af634ddeba13a114aa0
+MacroRules/gen_macro_rules.rs 7e03b410f4669e422d3b4328f7aafdca2e286e5d951495dd69cee0d44cb793a9 7e03b410f4669e422d3b4328f7aafdca2e286e5d951495dd69cee0d44cb793a9
+MacroStmts/gen_macro_stmts.rs 2e45dcf44bf2e8404b49ce9abeee4931572693174b5d96f3fd81eb40ea8e7b4b 2e45dcf44bf2e8404b49ce9abeee4931572693174b5d96f3fd81eb40ea8e7b4b
+MacroType/gen_macro_type.rs 84db79c78860512b14f885391fcae999ca7282f2d8a9ab65d30cc413d5bbebd0 84db79c78860512b14f885391fcae999ca7282f2d8a9ab65d30cc413d5bbebd0
 MatchArm/gen_match_arm.rs ac75b4836a103e2755bd47a1ee1b74af6eb8349adc4ebedaaa27b3ea3ae41aa5 ac75b4836a103e2755bd47a1ee1b74af6eb8349adc4ebedaaa27b3ea3ae41aa5
+MatchArmList/gen_match_arm_list.rs dbf36444d371421a2b8768a188660dd45ed3b823fb1c56b90c1ba77f177d23d6 dbf36444d371421a2b8768a188660dd45ed3b823fb1c56b90c1ba77f177d23d6
 MatchExpr/gen_match_expr.rs 081c5d4c78cb71ccd13fb37a93d7f525267c51b179f44b5a22ca3297897002a0 081c5d4c78cb71ccd13fb37a93d7f525267c51b179f44b5a22ca3297897002a0
+MatchGuard/gen_match_guard.rs d2b4bd28bf175620383a01584171f641990136c5b3087a66b3261d11747573ff d2b4bd28bf175620383a01584171f641990136c5b3087a66b3261d11747573ff
+Meta/gen_meta.rs e5c16b61f41a5fb5e4f83d4a7103ece0ff97656ac2e06d9040adc7101c6dbef2 e5c16b61f41a5fb5e4f83d4a7103ece0ff97656ac2e06d9040adc7101c6dbef2
 MethodCallExpr/gen_method_call_expr.rs f2b4679eb1ec095981fe6bd656b632c22bf6bd0da133309da3f7ef5bd1ab4b5d f2b4679eb1ec095981fe6bd656b632c22bf6bd0da133309da3f7ef5bd1ab4b5d
-MissingExpr/gen_missing_expr.rs 5f7d398068d98b8e3a8fef6b4009b58e7816e8c0c4467b3567472799fc31bb18 5f7d398068d98b8e3a8fef6b4009b58e7816e8c0c4467b3567472799fc31bb18
-MissingPat/gen_missing_pat.rs 925e789e16d048f140886b22d3da5b75f871287f355f978cfd03b5fc3f319a32 925e789e16d048f140886b22d3da5b75f871287f355f978cfd03b5fc3f319a32
 Module/gen_module.rs 815605a604fea1d9276684f8d6738a4e833eacad57ceeb27e2095fc450264fc1 815605a604fea1d9276684f8d6738a4e833eacad57ceeb27e2095fc450264fc1
+Name/gen_name.rs bbf5cff7da2400de554712ed66ff1e6370170ba988209b4e346bc053421df1ff bbf5cff7da2400de554712ed66ff1e6370170ba988209b4e346bc053421df1ff
+NameRef/gen_name_ref.rs 41307c2f7ca82d28217129639e556bd4c91221cf3a4170250b313fd53b9e3f82 41307c2f7ca82d28217129639e556bd4c91221cf3a4170250b313fd53b9e3f82
+NeverType/gen_never_type.rs a5413fab6a45dcfc2ff0ec5c8308b6c515963212ec4aa9edb9a96ec9a7e96830 a5413fab6a45dcfc2ff0ec5c8308b6c515963212ec4aa9edb9a96ec9a7e96830
 OffsetOfExpr/gen_offset_of_expr.rs 8e2077b4d7b85c91c17c3630511bc4f929950e9007261cbf0471c4a064c4b934 8e2077b4d7b85c91c17c3630511bc4f929950e9007261cbf0471c4a064c4b934
 OrPat/gen_or_pat.rs 71feef6e056bfe4cc8c22c9eb54fa3fecef613606769061d0efd059adbbd6f56 71feef6e056bfe4cc8c22c9eb54fa3fecef613606769061d0efd059adbbd6f56
+Param/gen_param.rs 6c9e4a972b2dc0702dc29ebcbdcbe2c6a433b3cd372ad6924feedcea4698faba 6c9e4a972b2dc0702dc29ebcbdcbe2c6a433b3cd372ad6924feedcea4698faba
+ParamList/gen_param_list.rs ef2e83d0aed45b969fe78dd717e87ef3c1f848e6179cfb4dc3cb136f1836b998 ef2e83d0aed45b969fe78dd717e87ef3c1f848e6179cfb4dc3cb136f1836b998
+ParenExpr/gen_paren_expr.rs dd0c4a21a92e54e8a6151145e013cbec9c9e1cad093d572e293b4f51d6c44aea dd0c4a21a92e54e8a6151145e013cbec9c9e1cad093d572e293b4f51d6c44aea
+ParenPat/gen_paren_pat.rs c8d18521b9a0b7d39841eb72e3895914aa652b7235dea42ed12a4eb280e3bf0e c8d18521b9a0b7d39841eb72e3895914aa652b7235dea42ed12a4eb280e3bf0e
+ParenType/gen_paren_type.rs ae1a945b56020eab14bb0ef75ae9ccb735d8e45d1213adee210a90e6dba8430f ae1a945b56020eab14bb0ef75ae9ccb735d8e45d1213adee210a90e6dba8430f
 Path/gen_path.rs e32637d04445d5b9411086f3ad5d8b41de24327f7ad641d1a1a25c1d160121c8 e32637d04445d5b9411086f3ad5d8b41de24327f7ad641d1a1a25c1d160121c8
 PathExpr/gen_path_expr.rs a1e0ececfe62a63a43583c9bd8064a80a90c042c55bac29d86776c0c6559f33a a1e0ececfe62a63a43583c9bd8064a80a90c042c55bac29d86776c0c6559f33a
 PathPat/gen_path_pat.rs fd7f941f8b33f19d3693be1fdb595c2fb2e85e8296702b82bf12bcd44632f371 fd7f941f8b33f19d3693be1fdb595c2fb2e85e8296702b82bf12bcd44632f371
-PrefixExpr/gen_prefix_expr.rs 2b7c6eb7efe5b1bbf895dde386eca9e1c4dcfa047ca141628580c97ec304ac4a 2b7c6eb7efe5b1bbf895dde386eca9e1c4dcfa047ca141628580c97ec304ac4a
+PathSegment/gen_path_segment.rs bc0c914821a70f9a7db23766f4d84e2d69fc76d5075a8bc3341f2ba59a8ce911 bc0c914821a70f9a7db23766f4d84e2d69fc76d5075a8bc3341f2ba59a8ce911
+PathType/gen_path_type.rs 710a5505615769da940202e7c6d9031edc23a4b05cd9fb25241c60affbba4027 710a5505615769da940202e7c6d9031edc23a4b05cd9fb25241c60affbba4027
+PrefixExpr/gen_prefix_expr.rs c4b53e87f370713b9a9e257be26d082b0761497bac19b1d7401a31b22b30d1ab c4b53e87f370713b9a9e257be26d082b0761497bac19b1d7401a31b22b30d1ab
+PtrType/gen_ptr_type.rs dd7faad19454b92d7942ef664df1a5f26c01863e408b87249aa4d5d4f68c78b3 dd7faad19454b92d7942ef664df1a5f26c01863e408b87249aa4d5d4f68c78b3
 RangeExpr/gen_range_expr.rs 3f27cff9cc76b2703beff622d1453b84121e1970a869e45f9428deac92c4ecb0 3f27cff9cc76b2703beff622d1453b84121e1970a869e45f9428deac92c4ecb0
 RangePat/gen_range_pat.rs 18b5169c3ab9230c95d86c4897f8343b2176d9602c9ea371c70c1eb0dbf89a28 18b5169c3ab9230c95d86c4897f8343b2176d9602c9ea371c70c1eb0dbf89a28
 RecordExpr/gen_record_expr.rs f8a7db88ae9e2a47588d26a76331cba64014dc6d5e065af28adcd718c8c52727 f8a7db88ae9e2a47588d26a76331cba64014dc6d5e065af28adcd718c8c52727
 RecordExprField/gen_record_expr_field.rs ea34f9fc64a600a5fff6b3388a2f89990bc9381937f49e83ce5f8192a14a0e4f ea34f9fc64a600a5fff6b3388a2f89990bc9381937f49e83ce5f8192a14a0e4f
+RecordExprFieldList/gen_record_expr_field_list.rs e1cf6cdf9b8eaade99e8ad60c24d34c401d3789173fa31cb9aacf14fbd84e062 e1cf6cdf9b8eaade99e8ad60c24d34c401d3789173fa31cb9aacf14fbd84e062
+RecordField/gen_record_field.rs 6adab09450e655a004190d3f5485f9cb0f0bdc2d94206f727a3b323358c0cd72 6adab09450e655a004190d3f5485f9cb0f0bdc2d94206f727a3b323358c0cd72
+RecordFieldList/gen_record_field_list.rs 7799933ffee9cc21cb848866b0d6d6c2d290dbee32d6a5f441ee9ce708f0d95a 7799933ffee9cc21cb848866b0d6d6c2d290dbee32d6a5f441ee9ce708f0d95a
 RecordPat/gen_record_pat.rs a7e8aafb51532785459467e82d175a4cbab7ad5757cd00d74a0b1b673a5f21d9 a7e8aafb51532785459467e82d175a4cbab7ad5757cd00d74a0b1b673a5f21d9
 RecordPatField/gen_record_pat_field.rs f6c31bd08e6021aa4da6e8238561a77208f0ef723c5e217c6fbc16b8aec73a84 f6c31bd08e6021aa4da6e8238561a77208f0ef723c5e217c6fbc16b8aec73a84
+RecordPatFieldList/gen_record_pat_field_list.rs 35aa6ce694da1c822a593a9b1251e2a2c61365489edf2c0e9710251d8d02fe3f 35aa6ce694da1c822a593a9b1251e2a2c61365489edf2c0e9710251d8d02fe3f
 RefExpr/gen_ref_expr.rs 82695467551def4a00c78aa1ea6a1460e9edbef7df2672f13daccb0ee5d6b4c6 82695467551def4a00c78aa1ea6a1460e9edbef7df2672f13daccb0ee5d6b4c6
 RefPat/gen_ref_pat.rs aba7518649d9a37928e59a40d42f76cc0f4735e8daf711a3def6d2f0520e1f54 aba7518649d9a37928e59a40d42f76cc0f4735e8daf711a3def6d2f0520e1f54
-RepeatExpr/gen_repeat_expr.rs 36d8ee353f3115ca99a6b070d174b971e9440e73038489ee571e408c354fecf8 36d8ee353f3115ca99a6b070d174b971e9440e73038489ee571e408c354fecf8
+RefType/gen_ref_type.rs 9d5c6d8257e580b550cbec5717e96b5cea6257c9e261e6f56db36c8570363b9d 9d5c6d8257e580b550cbec5717e96b5cea6257c9e261e6f56db36c8570363b9d
+Rename/gen_rename.rs 553c16f243d1ae3b6b28510d39436c83425944e5085171c18e0a2aa40deb74fc 553c16f243d1ae3b6b28510d39436c83425944e5085171c18e0a2aa40deb74fc
+RestPat/gen_rest_pat.rs e762bf7537225f97da751c5dca6a2cd3836ad7579b68c748b8c6cba65087acca e762bf7537225f97da751c5dca6a2cd3836ad7579b68c748b8c6cba65087acca
+RetType/gen_ret_type.rs 0947aed0974461b7a5b56bbc5fe36131663bde715c37302345d4eee23b71c825 0947aed0974461b7a5b56bbc5fe36131663bde715c37302345d4eee23b71c825
 ReturnExpr/gen_return_expr.rs 4f6ef29d7b3c60d6d71d1a6034a0721671f517428ba21897361a92b01009d38f 4f6ef29d7b3c60d6d71d1a6034a0721671f517428ba21897361a92b01009d38f
+ReturnTypeSyntax/gen_return_type_syntax.rs 0b11a4cc400f9a2001996f99d61391bdb636e8aea036f587cf18ad6a957fe496 0b11a4cc400f9a2001996f99d61391bdb636e8aea036f587cf18ad6a957fe496
+SelfParam/gen_self_param.rs b7bf9f23fedad6f1a15f02e5fac33fc2c68ec3409b44f24142c2fdec1e5e6f1f b7bf9f23fedad6f1a15f02e5fac33fc2c68ec3409b44f24142c2fdec1e5e6f1f
 SlicePat/gen_slice_pat.rs df4a6692f5100aa11dd777561400ce71e37b85f2363b0638c21975a1771b15d5 df4a6692f5100aa11dd777561400ce71e37b85f2363b0638c21975a1771b15d5
+SliceType/gen_slice_type.rs 073282f4755994473933db7e4f1e4d34a80363d7e331299ec4ac1a2d6a235b86 073282f4755994473933db7e4f1e4d34a80363d7e331299ec4ac1a2d6a235b86
+SourceFile/gen_source_file.rs a7a1d4fa77b53adb6fbc031bf7ab49cf7c8787728ba0a687c348b5eefbb5b9df a7a1d4fa77b53adb6fbc031bf7ab49cf7c8787728ba0a687c348b5eefbb5b9df
+Static/gen_static.rs ff01782c2f0f702373fc6df45ac9277fbdd8d4fad69dbe5f984a14790a46e7b9 ff01782c2f0f702373fc6df45ac9277fbdd8d4fad69dbe5f984a14790a46e7b9
+StmtList/gen_stmt_list.rs bb3791a613b91a2086c19cb0eddbf978bb37bbb2bd79d3e61b40be35c71daaad bb3791a613b91a2086c19cb0eddbf978bb37bbb2bd79d3e61b40be35c71daaad
+Struct/gen_struct.rs 09c5c164d7c8a3991fad1a118d66c12c24d2ebf30fbea6205f7690ca9f24dbb2 09c5c164d7c8a3991fad1a118d66c12c24d2ebf30fbea6205f7690ca9f24dbb2
+TokenTree/gen_token_tree.rs dde6595ee4e8f3fcdecfb054438b08e1a7db10d83d9fff121794df814c7aee0e dde6595ee4e8f3fcdecfb054438b08e1a7db10d83d9fff121794df814c7aee0e
+Trait/gen_trait.rs bac694993e224f9c6dd86cfb28c54846ae1b3bae45a1e58d3149c884184487ea bac694993e224f9c6dd86cfb28c54846ae1b3bae45a1e58d3149c884184487ea
+TraitAlias/gen_trait_alias.rs c0c2d370674a20173db33e118e011328a880ba8ab42788ca735bb3d80b4b64a8 c0c2d370674a20173db33e118e011328a880ba8ab42788ca735bb3d80b4b64a8
+TryExpr/gen_try_expr.rs 2c7d8a5f3d65a084b645b5e4659fbbd3fbe65994fed1e6474ebd83df06f8d725 2c7d8a5f3d65a084b645b5e4659fbbd3fbe65994fed1e6474ebd83df06f8d725
 TupleExpr/gen_tuple_expr.rs 8ecd1b6ecc58a0319eed434a423cc6f41bdf1901b1950e6e79735d7f7b2f8374 8ecd1b6ecc58a0319eed434a423cc6f41bdf1901b1950e6e79735d7f7b2f8374
+TupleField/gen_tuple_field.rs 8a77f7f1c2e4ac4374a147c27db7789e80496b5a405fd9cc3341f764a2136c38 8a77f7f1c2e4ac4374a147c27db7789e80496b5a405fd9cc3341f764a2136c38
+TupleFieldList/gen_tuple_field_list.rs d2a5151b413be3edbf093c4f47a8d57945e794d399378971940f6a5c65d4c223 d2a5151b413be3edbf093c4f47a8d57945e794d399378971940f6a5c65d4c223
 TuplePat/gen_tuple_pat.rs b1b0c9c5ff1b787f380644691c77807655a4f6441fc7431c90ecf78c54c26148 b1b0c9c5ff1b787f380644691c77807655a4f6441fc7431c90ecf78c54c26148
 TupleStructPat/gen_tuple_struct_pat.rs 601ca8813272d15b4c8fd7402d0d28a42a62be82865eb5e86b985ad31464ca98 601ca8813272d15b4c8fd7402d0d28a42a62be82865eb5e86b985ad31464ca98
-TypeRef/gen_type_ref.rs d9a3ebe221015919dd0422545397c64865f7fad4987ab09be2124029bbb7fcc3 d9a3ebe221015919dd0422545397c64865f7fad4987ab09be2124029bbb7fcc3
+TupleType/gen_tuple_type.rs f4302ca264cb17e0c27015f657e678a13147f691c06323cba778836467815265 f4302ca264cb17e0c27015f657e678a13147f691c06323cba778836467815265
+TypeAlias/gen_type_alias.rs eee732f674d9f999fee1e1976c426ba07f23c63b58b3a53c2026a4b922c00c8f eee732f674d9f999fee1e1976c426ba07f23c63b58b3a53c2026a4b922c00c8f
+TypeArg/gen_type_arg.rs 11e024708429bb683adc848d0be168cd9d190793833880e6ec74139df296e818 11e024708429bb683adc848d0be168cd9d190793833880e6ec74139df296e818
+TypeBound/gen_type_bound.rs 4198346113b075812f79858ccbd467339d6b8039a449bd58c4710dd0aba1c9c1 4198346113b075812f79858ccbd467339d6b8039a449bd58c4710dd0aba1c9c1
+TypeBoundList/gen_type_bound_list.rs bf70e31e5908e0eea6cdb4354ae78fc6ee1077b193409e741cac9b5d93d5deb2 bf70e31e5908e0eea6cdb4354ae78fc6ee1077b193409e741cac9b5d93d5deb2
+TypeParam/gen_type_param.rs 31c02d18020b305f1c37fdeb97656dd5b1e49e6b9a072329c2f099c55a06e3b7 31c02d18020b305f1c37fdeb97656dd5b1e49e6b9a072329c2f099c55a06e3b7
 UnderscoreExpr/gen_underscore_expr.rs fe34e99d322bf86c0f5509c9b5fd6e1e8abbdf63dbe7e01687344a41e9aabe52 fe34e99d322bf86c0f5509c9b5fd6e1e8abbdf63dbe7e01687344a41e9aabe52
-UnsafeBlockExpr/gen_unsafe_block_expr.rs 4f995811d788098a86470645957803310a8d87f7974aebe6e67073230977566f 4f995811d788098a86470645957803310a8d87f7974aebe6e67073230977566f
+Union/gen_union.rs d5e814688e93dcb105f29a392159c1b995ee15a74720167219f9431db8ef70a3 d5e814688e93dcb105f29a392159c1b995ee15a74720167219f9431db8ef70a3
+Use/gen_use.rs 2a0ea9fa34d844fda63e8f605f6a951e8b272d63ebfb0ae501fc734559a83a6b 2a0ea9fa34d844fda63e8f605f6a951e8b272d63ebfb0ae501fc734559a83a6b
+UseTree/gen_use_tree.rs 0a310eb8ce7abf481df813464dabac528a8f70d64d541409c66f957dfdd068d0 0a310eb8ce7abf481df813464dabac528a8f70d64d541409c66f957dfdd068d0
+UseTreeList/gen_use_tree_list.rs ba450699782e51b1d3139148709827e35f2e57235849fb26a073e2786dfc53e3 ba450699782e51b1d3139148709827e35f2e57235849fb26a073e2786dfc53e3
+Variant/gen_variant.rs 036566793ee468418f915974e2925d8bafaec3c93c2463212f222e6a5f290f24 036566793ee468418f915974e2925d8bafaec3c93c2463212f222e6a5f290f24
+VariantList/gen_variant_list.rs 932b67564c5ef4116d84db6945e098f6d7438755d99fc198fde8f4527979bf00 932b67564c5ef4116d84db6945e098f6d7438755d99fc198fde8f4527979bf00
+Visibility/gen_visibility.rs 6f5ca31d3593643eb0ff2be9b191619d3d8c3a4aa0093293ae2bdc299421ce60 6f5ca31d3593643eb0ff2be9b191619d3d8c3a4aa0093293ae2bdc299421ce60
+WhereClause/gen_where_clause.rs bdfb67817b24df5d33080825320f07574e57f1a950a4505a79c2cbd6967fb882 bdfb67817b24df5d33080825320f07574e57f1a950a4505a79c2cbd6967fb882
+WherePred/gen_where_pred.rs d127641a319766500581898c09b7d00be34c686670cb860022dc0f7f52f50137 d127641a319766500581898c09b7d00be34c686670cb860022dc0f7f52f50137
+WhileExpr/gen_while_expr.rs 81c9082bcba72c6a89d6f4cbdb456ccc521be64fd554755924dbd3bbe6dcdf6d 81c9082bcba72c6a89d6f4cbdb456ccc521be64fd554755924dbd3bbe6dcdf6d
 WildcardPat/gen_wildcard_pat.rs f1b175eeb3a0fc32bbcfb70a207be33dfde51a7d5198f72b8e08948f0d43e3dc f1b175eeb3a0fc32bbcfb70a207be33dfde51a7d5198f72b8e08948f0d43e3dc
 YeetExpr/gen_yeet_expr.rs c243b785a2cbd941bcec23dafc23ffbc64b93cf2843b6ede9783cdb81fed439d c243b785a2cbd941bcec23dafc23ffbc64b93cf2843b6ede9783cdb81fed439d
 YieldExpr/gen_yield_expr.rs 20f607719ff90bbcd831fe48a530400d0774394867ae65618cd1671d638f853e 20f607719ff90bbcd831fe48a530400d0774394867ae65618cd1671d638f853e
diff --git a/rust/ql/test/extractor-tests/generated/.gitattributes b/rust/ql/test/extractor-tests/generated/.gitattributes
index 1c0da518b29..8ea3a00a31f 100644
--- a/rust/ql/test/extractor-tests/generated/.gitattributes
+++ b/rust/ql/test/extractor-tests/generated/.gitattributes
@@ -1,63 +1,143 @@
 /.generated_tests.list linguist-generated
 /.gitattributes linguist-generated
+/Abi/gen_abi.rs linguist-generated
+/ArgList/gen_arg_list.rs linguist-generated
+/ArrayExpr/gen_array_expr.rs linguist-generated
+/ArrayType/gen_array_type.rs linguist-generated
 /AsmExpr/gen_asm_expr.rs linguist-generated
-/AsyncBlockExpr/gen_async_block_expr.rs linguist-generated
+/AssocTypeArg/gen_assoc_type_arg.rs linguist-generated
+/Attr/gen_attr.rs linguist-generated
 /AwaitExpr/gen_await_expr.rs linguist-generated
 /BecomeExpr/gen_become_expr.rs linguist-generated
 /BinaryExpr/gen_binary_expr.rs linguist-generated
 /BlockExpr/gen_block_expr.rs linguist-generated
-/BoxExpr/gen_box_expr.rs linguist-generated
 /BoxPat/gen_box_pat.rs linguist-generated
 /BreakExpr/gen_break_expr.rs linguist-generated
 /CallExpr/gen_call_expr.rs linguist-generated
 /CastExpr/gen_cast_expr.rs linguist-generated
+/ClosureBinder/gen_closure_binder.rs linguist-generated
 /ClosureExpr/gen_closure_expr.rs linguist-generated
+/Comment/gen_comment.rs linguist-generated
+/Const/gen_const.rs linguist-generated
+/ConstArg/gen_const_arg.rs linguist-generated
 /ConstBlockPat/gen_const_block_pat.rs linguist-generated
-/ConstExpr/gen_const_expr.rs linguist-generated
+/ConstParam/gen_const_param.rs linguist-generated
 /ContinueExpr/gen_continue_expr.rs linguist-generated
-/ElementListExpr/gen_element_list_expr.rs linguist-generated
+/DynTraitType/gen_dyn_trait_type.rs linguist-generated
+/Enum/gen_enum.rs linguist-generated
 /ExprStmt/gen_expr_stmt.rs linguist-generated
+/ExternBlock/gen_extern_block.rs linguist-generated
+/ExternCrate/gen_extern_crate.rs linguist-generated
+/ExternItemList/gen_extern_item_list.rs linguist-generated
 /FieldExpr/gen_field_expr.rs linguist-generated
+/FnPtrType/gen_fn_ptr_type.rs linguist-generated
+/ForExpr/gen_for_expr.rs linguist-generated
+/ForType/gen_for_type.rs linguist-generated
+/FormatArgsArg/gen_format_args_arg.rs linguist-generated
+/FormatArgsExpr/gen_format_args_expr.rs linguist-generated
 /Function/gen_function.rs linguist-generated
 /GenericArgList/gen_generic_arg_list.rs linguist-generated
+/GenericParamList/gen_generic_param_list.rs linguist-generated
 /IdentPat/gen_ident_pat.rs linguist-generated
 /IfExpr/gen_if_expr.rs linguist-generated
+/Impl/gen_impl.rs linguist-generated
+/ImplTraitType/gen_impl_trait_type.rs linguist-generated
 /IndexExpr/gen_index_expr.rs linguist-generated
+/InferType/gen_infer_type.rs linguist-generated
+/ItemList/gen_item_list.rs linguist-generated
 /Label/gen_label.rs linguist-generated
+/LetElse/gen_let_else.rs linguist-generated
 /LetExpr/gen_let_expr.rs linguist-generated
 /LetStmt/gen_let_stmt.rs linguist-generated
+/Lifetime/gen_lifetime.rs linguist-generated
+/LifetimeArg/gen_lifetime_arg.rs linguist-generated
+/LifetimeParam/gen_lifetime_param.rs linguist-generated
 /LiteralExpr/gen_literal_expr.rs linguist-generated
 /LiteralPat/gen_literal_pat.rs linguist-generated
 /LoopExpr/gen_loop_expr.rs linguist-generated
+/MacroCall/gen_macro_call.rs linguist-generated
+/MacroDef/gen_macro_def.rs linguist-generated
+/MacroExpr/gen_macro_expr.rs linguist-generated
+/MacroItems/gen_macro_items.rs linguist-generated
+/MacroPat/gen_macro_pat.rs linguist-generated
+/MacroRules/gen_macro_rules.rs linguist-generated
+/MacroStmts/gen_macro_stmts.rs linguist-generated
+/MacroType/gen_macro_type.rs linguist-generated
 /MatchArm/gen_match_arm.rs linguist-generated
+/MatchArmList/gen_match_arm_list.rs linguist-generated
 /MatchExpr/gen_match_expr.rs linguist-generated
+/MatchGuard/gen_match_guard.rs linguist-generated
+/Meta/gen_meta.rs linguist-generated
 /MethodCallExpr/gen_method_call_expr.rs linguist-generated
-/MissingExpr/gen_missing_expr.rs linguist-generated
-/MissingPat/gen_missing_pat.rs linguist-generated
 /Module/gen_module.rs linguist-generated
+/Name/gen_name.rs linguist-generated
+/NameRef/gen_name_ref.rs linguist-generated
+/NeverType/gen_never_type.rs linguist-generated
 /OffsetOfExpr/gen_offset_of_expr.rs linguist-generated
 /OrPat/gen_or_pat.rs linguist-generated
+/Param/gen_param.rs linguist-generated
+/ParamList/gen_param_list.rs linguist-generated
+/ParenExpr/gen_paren_expr.rs linguist-generated
+/ParenPat/gen_paren_pat.rs linguist-generated
+/ParenType/gen_paren_type.rs linguist-generated
 /Path/gen_path.rs linguist-generated
 /PathExpr/gen_path_expr.rs linguist-generated
 /PathPat/gen_path_pat.rs linguist-generated
+/PathSegment/gen_path_segment.rs linguist-generated
+/PathType/gen_path_type.rs linguist-generated
 /PrefixExpr/gen_prefix_expr.rs linguist-generated
+/PtrType/gen_ptr_type.rs linguist-generated
 /RangeExpr/gen_range_expr.rs linguist-generated
 /RangePat/gen_range_pat.rs linguist-generated
 /RecordExpr/gen_record_expr.rs linguist-generated
 /RecordExprField/gen_record_expr_field.rs linguist-generated
+/RecordExprFieldList/gen_record_expr_field_list.rs linguist-generated
+/RecordField/gen_record_field.rs linguist-generated
+/RecordFieldList/gen_record_field_list.rs linguist-generated
 /RecordPat/gen_record_pat.rs linguist-generated
 /RecordPatField/gen_record_pat_field.rs linguist-generated
+/RecordPatFieldList/gen_record_pat_field_list.rs linguist-generated
 /RefExpr/gen_ref_expr.rs linguist-generated
 /RefPat/gen_ref_pat.rs linguist-generated
-/RepeatExpr/gen_repeat_expr.rs linguist-generated
+/RefType/gen_ref_type.rs linguist-generated
+/Rename/gen_rename.rs linguist-generated
+/RestPat/gen_rest_pat.rs linguist-generated
+/RetType/gen_ret_type.rs linguist-generated
 /ReturnExpr/gen_return_expr.rs linguist-generated
+/ReturnTypeSyntax/gen_return_type_syntax.rs linguist-generated
+/SelfParam/gen_self_param.rs linguist-generated
 /SlicePat/gen_slice_pat.rs linguist-generated
+/SliceType/gen_slice_type.rs linguist-generated
+/SourceFile/gen_source_file.rs linguist-generated
+/Static/gen_static.rs linguist-generated
+/StmtList/gen_stmt_list.rs linguist-generated
+/Struct/gen_struct.rs linguist-generated
+/TokenTree/gen_token_tree.rs linguist-generated
+/Trait/gen_trait.rs linguist-generated
+/TraitAlias/gen_trait_alias.rs linguist-generated
+/TryExpr/gen_try_expr.rs linguist-generated
 /TupleExpr/gen_tuple_expr.rs linguist-generated
+/TupleField/gen_tuple_field.rs linguist-generated
+/TupleFieldList/gen_tuple_field_list.rs linguist-generated
 /TuplePat/gen_tuple_pat.rs linguist-generated
 /TupleStructPat/gen_tuple_struct_pat.rs linguist-generated
-/TypeRef/gen_type_ref.rs linguist-generated
+/TupleType/gen_tuple_type.rs linguist-generated
+/TypeAlias/gen_type_alias.rs linguist-generated
+/TypeArg/gen_type_arg.rs linguist-generated
+/TypeBound/gen_type_bound.rs linguist-generated
+/TypeBoundList/gen_type_bound_list.rs linguist-generated
+/TypeParam/gen_type_param.rs linguist-generated
 /UnderscoreExpr/gen_underscore_expr.rs linguist-generated
-/UnsafeBlockExpr/gen_unsafe_block_expr.rs linguist-generated
+/Union/gen_union.rs linguist-generated
+/Use/gen_use.rs linguist-generated
+/UseTree/gen_use_tree.rs linguist-generated
+/UseTreeList/gen_use_tree_list.rs linguist-generated
+/Variant/gen_variant.rs linguist-generated
+/VariantList/gen_variant_list.rs linguist-generated
+/Visibility/gen_visibility.rs linguist-generated
+/WhereClause/gen_where_clause.rs linguist-generated
+/WherePred/gen_where_pred.rs linguist-generated
+/WhileExpr/gen_while_expr.rs linguist-generated
 /WildcardPat/gen_wildcard_pat.rs linguist-generated
 /YeetExpr/gen_yeet_expr.rs linguist-generated
 /YieldExpr/gen_yield_expr.rs linguist-generated
diff --git a/rust/ql/test/extractor-tests/generated/Abi/Abi.expected b/rust/ql/test/extractor-tests/generated/Abi/Abi.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/Abi/Abi.ql b/rust/ql/test/extractor-tests/generated/Abi/Abi.ql
new file mode 100644
index 00000000000..3c0fd40eaeb
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/Abi/Abi.ql
@@ -0,0 +1,10 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from Abi x, string hasAbiString
+where
+  toBeTested(x) and
+  not x.isUnknown() and
+  if x.hasAbiString() then hasAbiString = "yes" else hasAbiString = "no"
+select x, "hasAbiString:", hasAbiString
diff --git a/rust/ql/test/extractor-tests/generated/Abi/Abi_getAbiString.expected b/rust/ql/test/extractor-tests/generated/Abi/Abi_getAbiString.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/Abi/Abi_getAbiString.ql b/rust/ql/test/extractor-tests/generated/Abi/Abi_getAbiString.ql
new file mode 100644
index 00000000000..77104019b32
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/Abi/Abi_getAbiString.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from Abi x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getAbiString()
diff --git a/rust/ql/test/extractor-tests/generated/Abi/gen_abi.rs b/rust/ql/test/extractor-tests/generated/Abi/gen_abi.rs
new file mode 100644
index 00000000000..01c614999d0
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/Abi/gen_abi.rs
@@ -0,0 +1,6 @@
+// generated by codegen, do not edit
+
+fn test_abi() -> () {
+    // A Abi. For example:
+    todo!()
+}
diff --git a/rust/ql/test/extractor-tests/generated/ArgList/ArgList.expected b/rust/ql/test/extractor-tests/generated/ArgList/ArgList.expected
new file mode 100644
index 00000000000..883d8f2a698
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/ArgList/ArgList.expected
@@ -0,0 +1 @@
+| gen_arg_list.rs:5:5:5:11 | ArgList | getNumberOfArgs: | 1 |
diff --git a/rust/ql/test/extractor-tests/generated/ArgList/ArgList.ql b/rust/ql/test/extractor-tests/generated/ArgList/ArgList.ql
new file mode 100644
index 00000000000..0e8c23922b5
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/ArgList/ArgList.ql
@@ -0,0 +1,10 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from ArgList x, int getNumberOfArgs
+where
+  toBeTested(x) and
+  not x.isUnknown() and
+  getNumberOfArgs = x.getNumberOfArgs()
+select x, "getNumberOfArgs:", getNumberOfArgs
diff --git a/rust/ql/test/extractor-tests/generated/ArgList/ArgList_getArg.expected b/rust/ql/test/extractor-tests/generated/ArgList/ArgList_getArg.expected
new file mode 100644
index 00000000000..9bbaa63495c
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/ArgList/ArgList_getArg.expected
@@ -0,0 +1 @@
+| gen_arg_list.rs:5:5:5:11 | ArgList | 0 | gen_arg_list.rs:5:5:5:11 | "not yet implemented" |
diff --git a/rust/ql/test/extractor-tests/generated/OrPat/OrPat_getArg.ql b/rust/ql/test/extractor-tests/generated/ArgList/ArgList_getArg.ql
similarity index 85%
rename from rust/ql/test/extractor-tests/generated/OrPat/OrPat_getArg.ql
rename to rust/ql/test/extractor-tests/generated/ArgList/ArgList_getArg.ql
index 71da1732609..253d13f2b56 100644
--- a/rust/ql/test/extractor-tests/generated/OrPat/OrPat_getArg.ql
+++ b/rust/ql/test/extractor-tests/generated/ArgList/ArgList_getArg.ql
@@ -2,6 +2,6 @@
 import codeql.rust.elements
 import TestUtils
 
-from OrPat x, int index
+from ArgList x, int index
 where toBeTested(x) and not x.isUnknown()
 select x, index, x.getArg(index)
diff --git a/rust/ql/test/extractor-tests/generated/ArgList/gen_arg_list.rs b/rust/ql/test/extractor-tests/generated/ArgList/gen_arg_list.rs
new file mode 100644
index 00000000000..2cfe6d29c0d
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/ArgList/gen_arg_list.rs
@@ -0,0 +1,6 @@
+// generated by codegen, do not edit
+
+fn test_arg_list() -> () {
+    // A ArgList. For example:
+    todo!()
+}
diff --git a/rust/ql/test/extractor-tests/generated/ArrayExpr/ArrayExpr.expected b/rust/ql/test/extractor-tests/generated/ArrayExpr/ArrayExpr.expected
new file mode 100644
index 00000000000..549f43fc989
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/ArrayExpr/ArrayExpr.expected
@@ -0,0 +1,2 @@
+| gen_array_expr.rs:5:5:5:13 | ArrayExpr | getNumberOfAttrs: | 0 | getNumberOfExprs: | 3 |
+| gen_array_expr.rs:6:5:6:11 | ArrayExpr | getNumberOfAttrs: | 0 | getNumberOfExprs: | 2 |
diff --git a/rust/ql/test/extractor-tests/generated/ArrayExpr/ArrayExpr.ql b/rust/ql/test/extractor-tests/generated/ArrayExpr/ArrayExpr.ql
new file mode 100644
index 00000000000..e0f2223f57b
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/ArrayExpr/ArrayExpr.ql
@@ -0,0 +1,11 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from ArrayExpr x, int getNumberOfAttrs, int getNumberOfExprs
+where
+  toBeTested(x) and
+  not x.isUnknown() and
+  getNumberOfAttrs = x.getNumberOfAttrs() and
+  getNumberOfExprs = x.getNumberOfExprs()
+select x, "getNumberOfAttrs:", getNumberOfAttrs, "getNumberOfExprs:", getNumberOfExprs
diff --git a/rust/ql/test/extractor-tests/generated/ArrayExpr/ArrayExpr_getAttr.expected b/rust/ql/test/extractor-tests/generated/ArrayExpr/ArrayExpr_getAttr.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/ArrayExpr/ArrayExpr_getAttr.ql b/rust/ql/test/extractor-tests/generated/ArrayExpr/ArrayExpr_getAttr.ql
new file mode 100644
index 00000000000..89113fe91f0
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/ArrayExpr/ArrayExpr_getAttr.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from ArrayExpr x, int index
+where toBeTested(x) and not x.isUnknown()
+select x, index, x.getAttr(index)
diff --git a/rust/ql/test/extractor-tests/generated/ArrayExpr/ArrayExpr_getExpr.expected b/rust/ql/test/extractor-tests/generated/ArrayExpr/ArrayExpr_getExpr.expected
new file mode 100644
index 00000000000..97da5ba1c2a
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/ArrayExpr/ArrayExpr_getExpr.expected
@@ -0,0 +1,5 @@
+| gen_array_expr.rs:5:5:5:13 | ArrayExpr | 0 | gen_array_expr.rs:5:6:5:6 | 1 |
+| gen_array_expr.rs:5:5:5:13 | ArrayExpr | 1 | gen_array_expr.rs:5:9:5:9 | 2 |
+| gen_array_expr.rs:5:5:5:13 | ArrayExpr | 2 | gen_array_expr.rs:5:12:5:12 | 3 |
+| gen_array_expr.rs:6:5:6:11 | ArrayExpr | 0 | gen_array_expr.rs:6:6:6:6 | 1 |
+| gen_array_expr.rs:6:5:6:11 | ArrayExpr | 1 | gen_array_expr.rs:6:9:6:10 | 10 |
diff --git a/rust/ql/test/extractor-tests/generated/TupleExpr/TupleExpr_getExpr.ql b/rust/ql/test/extractor-tests/generated/ArrayExpr/ArrayExpr_getExpr.ql
similarity index 85%
rename from rust/ql/test/extractor-tests/generated/TupleExpr/TupleExpr_getExpr.ql
rename to rust/ql/test/extractor-tests/generated/ArrayExpr/ArrayExpr_getExpr.ql
index dbb8beef002..f75aef4b1e1 100644
--- a/rust/ql/test/extractor-tests/generated/TupleExpr/TupleExpr_getExpr.ql
+++ b/rust/ql/test/extractor-tests/generated/ArrayExpr/ArrayExpr_getExpr.ql
@@ -2,6 +2,6 @@
 import codeql.rust.elements
 import TestUtils
 
-from TupleExpr x, int index
+from ArrayExpr x, int index
 where toBeTested(x) and not x.isUnknown()
 select x, index, x.getExpr(index)
diff --git a/rust/ql/test/extractor-tests/generated/ArrayExpr/gen_array_expr.rs b/rust/ql/test/extractor-tests/generated/ArrayExpr/gen_array_expr.rs
new file mode 100644
index 00000000000..48252cde12f
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/ArrayExpr/gen_array_expr.rs
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+
+fn test_array_expr() -> () {
+    // An array expression. For example:
+    [1, 2, 3];
+    [1; 10];
+}
diff --git a/rust/ql/test/extractor-tests/generated/ArrayType/ArrayType.expected b/rust/ql/test/extractor-tests/generated/ArrayType/ArrayType.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/ArrayType/ArrayType.ql b/rust/ql/test/extractor-tests/generated/ArrayType/ArrayType.ql
new file mode 100644
index 00000000000..1538043e292
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/ArrayType/ArrayType.ql
@@ -0,0 +1,11 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from ArrayType x, string hasConstArg, string hasTy
+where
+  toBeTested(x) and
+  not x.isUnknown() and
+  (if x.hasConstArg() then hasConstArg = "yes" else hasConstArg = "no") and
+  if x.hasTy() then hasTy = "yes" else hasTy = "no"
+select x, "hasConstArg:", hasConstArg, "hasTy:", hasTy
diff --git a/rust/ql/test/extractor-tests/generated/ArrayType/ArrayType_getConstArg.expected b/rust/ql/test/extractor-tests/generated/ArrayType/ArrayType_getConstArg.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/ArrayType/ArrayType_getConstArg.ql b/rust/ql/test/extractor-tests/generated/ArrayType/ArrayType_getConstArg.ql
new file mode 100644
index 00000000000..55c3fc89475
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/ArrayType/ArrayType_getConstArg.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from ArrayType x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getConstArg()
diff --git a/rust/ql/test/extractor-tests/generated/ArrayType/ArrayType_getTy.expected b/rust/ql/test/extractor-tests/generated/ArrayType/ArrayType_getTy.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/ArrayType/ArrayType_getTy.ql b/rust/ql/test/extractor-tests/generated/ArrayType/ArrayType_getTy.ql
new file mode 100644
index 00000000000..d274baf857f
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/ArrayType/ArrayType_getTy.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from ArrayType x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getTy()
diff --git a/rust/ql/test/extractor-tests/generated/ArrayType/gen_array_type.rs b/rust/ql/test/extractor-tests/generated/ArrayType/gen_array_type.rs
new file mode 100644
index 00000000000..2449a205227
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/ArrayType/gen_array_type.rs
@@ -0,0 +1,6 @@
+// generated by codegen, do not edit
+
+fn test_array_type() -> () {
+    // A ArrayType. For example:
+    todo!()
+}
diff --git a/rust/ql/test/extractor-tests/generated/AsmExpr/AsmExpr.expected b/rust/ql/test/extractor-tests/generated/AsmExpr/AsmExpr.expected
index 44831a8693d..19464c21fd6 100644
--- a/rust/ql/test/extractor-tests/generated/AsmExpr/AsmExpr.expected
+++ b/rust/ql/test/extractor-tests/generated/AsmExpr/AsmExpr.expected
@@ -1 +1 @@
-| gen_asm_expr.rs:6:9:6:24 | AsmExpr | getExpr: | gen_asm_expr.rs:6:23:6:23 | UnderscoreExpr |
+| gen_asm_expr.rs:6:9:6:24 | AsmExpr | getNumberOfAttrs: | 0 | hasExpr: | yes |
diff --git a/rust/ql/test/extractor-tests/generated/AsmExpr/AsmExpr.ql b/rust/ql/test/extractor-tests/generated/AsmExpr/AsmExpr.ql
index be56bdf712e..f5662fedfbb 100644
--- a/rust/ql/test/extractor-tests/generated/AsmExpr/AsmExpr.ql
+++ b/rust/ql/test/extractor-tests/generated/AsmExpr/AsmExpr.ql
@@ -2,9 +2,10 @@
 import codeql.rust.elements
 import TestUtils
 
-from AsmExpr x, Expr getExpr
+from AsmExpr x, int getNumberOfAttrs, string hasExpr
 where
   toBeTested(x) and
   not x.isUnknown() and
-  getExpr = x.getExpr()
-select x, "getExpr:", getExpr
+  getNumberOfAttrs = x.getNumberOfAttrs() and
+  if x.hasExpr() then hasExpr = "yes" else hasExpr = "no"
+select x, "getNumberOfAttrs:", getNumberOfAttrs, "hasExpr:", hasExpr
diff --git a/rust/ql/test/extractor-tests/generated/AsmExpr/AsmExpr_getAttr.expected b/rust/ql/test/extractor-tests/generated/AsmExpr/AsmExpr_getAttr.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/AsmExpr/AsmExpr_getAttr.ql b/rust/ql/test/extractor-tests/generated/AsmExpr/AsmExpr_getAttr.ql
new file mode 100644
index 00000000000..4455caf1aa5
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/AsmExpr/AsmExpr_getAttr.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from AsmExpr x, int index
+where toBeTested(x) and not x.isUnknown()
+select x, index, x.getAttr(index)
diff --git a/rust/ql/test/extractor-tests/generated/AsmExpr/AsmExpr_getExpr.expected b/rust/ql/test/extractor-tests/generated/AsmExpr/AsmExpr_getExpr.expected
new file mode 100644
index 00000000000..7a4af543f31
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/AsmExpr/AsmExpr_getExpr.expected
@@ -0,0 +1 @@
+| gen_asm_expr.rs:6:9:6:24 | AsmExpr | gen_asm_expr.rs:6:23:6:23 | UnderscoreExpr |
diff --git a/rust/ql/test/extractor-tests/generated/AsmExpr/AsmExpr_getExpr.ql b/rust/ql/test/extractor-tests/generated/AsmExpr/AsmExpr_getExpr.ql
new file mode 100644
index 00000000000..375017aab2d
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/AsmExpr/AsmExpr_getExpr.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from AsmExpr x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getExpr()
diff --git a/rust/ql/test/extractor-tests/generated/AssocItemList/AssocItemList.expected b/rust/ql/test/extractor-tests/generated/AssocItemList/AssocItemList.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/AssocItemList/AssocItemList_getAssocItem.expected b/rust/ql/test/extractor-tests/generated/AssocItemList/AssocItemList_getAssocItem.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/AssocItemList/AssocItemList_getAttr.expected b/rust/ql/test/extractor-tests/generated/AssocItemList/AssocItemList_getAttr.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/AssocTypeArg/AssocTypeArg.expected b/rust/ql/test/extractor-tests/generated/AssocTypeArg/AssocTypeArg.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/AssocTypeArg/AssocTypeArg.ql b/rust/ql/test/extractor-tests/generated/AssocTypeArg/AssocTypeArg.ql
new file mode 100644
index 00000000000..b1cafa773f5
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/AssocTypeArg/AssocTypeArg.ql
@@ -0,0 +1,22 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from
+  AssocTypeArg x, string hasConstArg, string hasGenericArgList, string hasNameRef,
+  string hasParamList, string hasRetType, string hasReturnTypeSyntax, string hasTy,
+  string hasTypeBoundList
+where
+  toBeTested(x) and
+  not x.isUnknown() and
+  (if x.hasConstArg() then hasConstArg = "yes" else hasConstArg = "no") and
+  (if x.hasGenericArgList() then hasGenericArgList = "yes" else hasGenericArgList = "no") and
+  (if x.hasNameRef() then hasNameRef = "yes" else hasNameRef = "no") and
+  (if x.hasParamList() then hasParamList = "yes" else hasParamList = "no") and
+  (if x.hasRetType() then hasRetType = "yes" else hasRetType = "no") and
+  (if x.hasReturnTypeSyntax() then hasReturnTypeSyntax = "yes" else hasReturnTypeSyntax = "no") and
+  (if x.hasTy() then hasTy = "yes" else hasTy = "no") and
+  if x.hasTypeBoundList() then hasTypeBoundList = "yes" else hasTypeBoundList = "no"
+select x, "hasConstArg:", hasConstArg, "hasGenericArgList:", hasGenericArgList, "hasNameRef:",
+  hasNameRef, "hasParamList:", hasParamList, "hasRetType:", hasRetType, "hasReturnTypeSyntax:",
+  hasReturnTypeSyntax, "hasTy:", hasTy, "hasTypeBoundList:", hasTypeBoundList
diff --git a/rust/ql/test/extractor-tests/generated/AssocTypeArg/AssocTypeArg_getConstArg.expected b/rust/ql/test/extractor-tests/generated/AssocTypeArg/AssocTypeArg_getConstArg.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/AssocTypeArg/AssocTypeArg_getConstArg.ql b/rust/ql/test/extractor-tests/generated/AssocTypeArg/AssocTypeArg_getConstArg.ql
new file mode 100644
index 00000000000..6619858dfe3
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/AssocTypeArg/AssocTypeArg_getConstArg.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from AssocTypeArg x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getConstArg()
diff --git a/rust/ql/test/extractor-tests/generated/AssocTypeArg/AssocTypeArg_getGenericArgList.expected b/rust/ql/test/extractor-tests/generated/AssocTypeArg/AssocTypeArg_getGenericArgList.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/AssocTypeArg/AssocTypeArg_getGenericArgList.ql b/rust/ql/test/extractor-tests/generated/AssocTypeArg/AssocTypeArg_getGenericArgList.ql
new file mode 100644
index 00000000000..09c1924f693
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/AssocTypeArg/AssocTypeArg_getGenericArgList.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from AssocTypeArg x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getGenericArgList()
diff --git a/rust/ql/test/extractor-tests/generated/AssocTypeArg/AssocTypeArg_getNameRef.expected b/rust/ql/test/extractor-tests/generated/AssocTypeArg/AssocTypeArg_getNameRef.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/AssocTypeArg/AssocTypeArg_getNameRef.ql b/rust/ql/test/extractor-tests/generated/AssocTypeArg/AssocTypeArg_getNameRef.ql
new file mode 100644
index 00000000000..8f393e34443
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/AssocTypeArg/AssocTypeArg_getNameRef.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from AssocTypeArg x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getNameRef()
diff --git a/rust/ql/test/extractor-tests/generated/AssocTypeArg/AssocTypeArg_getParamList.expected b/rust/ql/test/extractor-tests/generated/AssocTypeArg/AssocTypeArg_getParamList.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/AssocTypeArg/AssocTypeArg_getParamList.ql b/rust/ql/test/extractor-tests/generated/AssocTypeArg/AssocTypeArg_getParamList.ql
new file mode 100644
index 00000000000..e745669c52d
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/AssocTypeArg/AssocTypeArg_getParamList.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from AssocTypeArg x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getParamList()
diff --git a/rust/ql/test/extractor-tests/generated/AssocTypeArg/AssocTypeArg_getRetType.expected b/rust/ql/test/extractor-tests/generated/AssocTypeArg/AssocTypeArg_getRetType.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/AssocTypeArg/AssocTypeArg_getRetType.ql b/rust/ql/test/extractor-tests/generated/AssocTypeArg/AssocTypeArg_getRetType.ql
new file mode 100644
index 00000000000..413b05df0d4
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/AssocTypeArg/AssocTypeArg_getRetType.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from AssocTypeArg x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getRetType()
diff --git a/rust/ql/test/extractor-tests/generated/AssocTypeArg/AssocTypeArg_getReturnTypeSyntax.expected b/rust/ql/test/extractor-tests/generated/AssocTypeArg/AssocTypeArg_getReturnTypeSyntax.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/AssocTypeArg/AssocTypeArg_getReturnTypeSyntax.ql b/rust/ql/test/extractor-tests/generated/AssocTypeArg/AssocTypeArg_getReturnTypeSyntax.ql
new file mode 100644
index 00000000000..f3929edba7e
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/AssocTypeArg/AssocTypeArg_getReturnTypeSyntax.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from AssocTypeArg x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getReturnTypeSyntax()
diff --git a/rust/ql/test/extractor-tests/generated/AssocTypeArg/AssocTypeArg_getTy.expected b/rust/ql/test/extractor-tests/generated/AssocTypeArg/AssocTypeArg_getTy.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/AssocTypeArg/AssocTypeArg_getTy.ql b/rust/ql/test/extractor-tests/generated/AssocTypeArg/AssocTypeArg_getTy.ql
new file mode 100644
index 00000000000..4b037c90ab2
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/AssocTypeArg/AssocTypeArg_getTy.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from AssocTypeArg x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getTy()
diff --git a/rust/ql/test/extractor-tests/generated/AssocTypeArg/AssocTypeArg_getTypeBoundList.expected b/rust/ql/test/extractor-tests/generated/AssocTypeArg/AssocTypeArg_getTypeBoundList.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/AssocTypeArg/AssocTypeArg_getTypeBoundList.ql b/rust/ql/test/extractor-tests/generated/AssocTypeArg/AssocTypeArg_getTypeBoundList.ql
new file mode 100644
index 00000000000..e798c8bbaa4
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/AssocTypeArg/AssocTypeArg_getTypeBoundList.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from AssocTypeArg x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getTypeBoundList()
diff --git a/rust/ql/test/extractor-tests/generated/AssocTypeArg/gen_assoc_type_arg.rs b/rust/ql/test/extractor-tests/generated/AssocTypeArg/gen_assoc_type_arg.rs
new file mode 100644
index 00000000000..9f7bb10a69a
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/AssocTypeArg/gen_assoc_type_arg.rs
@@ -0,0 +1,6 @@
+// generated by codegen, do not edit
+
+fn test_assoc_type_arg() -> () {
+    // A AssocTypeArg. For example:
+    todo!()
+}
diff --git a/rust/ql/test/extractor-tests/generated/AsyncBlockExpr/AsyncBlockExpr.expected b/rust/ql/test/extractor-tests/generated/AsyncBlockExpr/AsyncBlockExpr.expected
deleted file mode 100644
index 1cd82381fb4..00000000000
--- a/rust/ql/test/extractor-tests/generated/AsyncBlockExpr/AsyncBlockExpr.expected
+++ /dev/null
@@ -1 +0,0 @@
-| gen_async_block_expr.rs:5:5:8:5 | AsyncBlockExpr | getNumberOfStatements: | 1 | hasTail: | yes |
diff --git a/rust/ql/test/extractor-tests/generated/AsyncBlockExpr/AsyncBlockExpr.ql b/rust/ql/test/extractor-tests/generated/AsyncBlockExpr/AsyncBlockExpr.ql
deleted file mode 100644
index f81e395a73b..00000000000
--- a/rust/ql/test/extractor-tests/generated/AsyncBlockExpr/AsyncBlockExpr.ql
+++ /dev/null
@@ -1,11 +0,0 @@
-// generated by codegen, do not edit
-import codeql.rust.elements
-import TestUtils
-
-from AsyncBlockExpr x, int getNumberOfStatements, string hasTail
-where
-  toBeTested(x) and
-  not x.isUnknown() and
-  getNumberOfStatements = x.getNumberOfStatements() and
-  if x.hasTail() then hasTail = "yes" else hasTail = "no"
-select x, "getNumberOfStatements:", getNumberOfStatements, "hasTail:", hasTail
diff --git a/rust/ql/test/extractor-tests/generated/AsyncBlockExpr/AsyncBlockExpr_getStatement.expected b/rust/ql/test/extractor-tests/generated/AsyncBlockExpr/AsyncBlockExpr_getStatement.expected
deleted file mode 100644
index d9c3f9a6897..00000000000
--- a/rust/ql/test/extractor-tests/generated/AsyncBlockExpr/AsyncBlockExpr_getStatement.expected
+++ /dev/null
@@ -1 +0,0 @@
-| gen_async_block_expr.rs:5:5:8:5 | AsyncBlockExpr | 0 | gen_async_block_expr.rs:6:12:6:12 | LetStmt |
diff --git a/rust/ql/test/extractor-tests/generated/AsyncBlockExpr/AsyncBlockExpr_getTail.expected b/rust/ql/test/extractor-tests/generated/AsyncBlockExpr/AsyncBlockExpr_getTail.expected
deleted file mode 100644
index 66ead87e312..00000000000
--- a/rust/ql/test/extractor-tests/generated/AsyncBlockExpr/AsyncBlockExpr_getTail.expected
+++ /dev/null
@@ -1 +0,0 @@
-| gen_async_block_expr.rs:5:5:8:5 | AsyncBlockExpr | gen_async_block_expr.rs:7:8:7:8 | PathExpr |
diff --git a/rust/ql/test/extractor-tests/generated/AsyncBlockExpr/gen_async_block_expr.rs b/rust/ql/test/extractor-tests/generated/AsyncBlockExpr/gen_async_block_expr.rs
deleted file mode 100644
index 18f5e33f77e..00000000000
--- a/rust/ql/test/extractor-tests/generated/AsyncBlockExpr/gen_async_block_expr.rs
+++ /dev/null
@@ -1,9 +0,0 @@
-// generated by codegen, do not edit
-
-fn test_async_block_expr() -> i32 {
-    // An async block expression. For example:
-    async {
-       let x = 42;
-       x
-    }.await
-}
diff --git a/rust/ql/test/extractor-tests/generated/Attr/Attr.expected b/rust/ql/test/extractor-tests/generated/Attr/Attr.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/Attr/Attr.ql b/rust/ql/test/extractor-tests/generated/Attr/Attr.ql
new file mode 100644
index 00000000000..b80d3089be9
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/Attr/Attr.ql
@@ -0,0 +1,10 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from Attr x, string hasMeta
+where
+  toBeTested(x) and
+  not x.isUnknown() and
+  if x.hasMeta() then hasMeta = "yes" else hasMeta = "no"
+select x, "hasMeta:", hasMeta
diff --git a/rust/ql/test/extractor-tests/generated/Attr/Attr_getMeta.expected b/rust/ql/test/extractor-tests/generated/Attr/Attr_getMeta.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/Attr/Attr_getMeta.ql b/rust/ql/test/extractor-tests/generated/Attr/Attr_getMeta.ql
new file mode 100644
index 00000000000..dd4ed7f56ef
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/Attr/Attr_getMeta.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from Attr x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getMeta()
diff --git a/rust/ql/test/extractor-tests/generated/Attr/gen_attr.rs b/rust/ql/test/extractor-tests/generated/Attr/gen_attr.rs
new file mode 100644
index 00000000000..c028915cabf
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/Attr/gen_attr.rs
@@ -0,0 +1,6 @@
+// generated by codegen, do not edit
+
+fn test_attr() -> () {
+    // A Attr. For example:
+    todo!()
+}
diff --git a/rust/ql/test/extractor-tests/generated/AwaitExpr/AwaitExpr.expected b/rust/ql/test/extractor-tests/generated/AwaitExpr/AwaitExpr.expected
index df585132030..2ed01b9058e 100644
--- a/rust/ql/test/extractor-tests/generated/AwaitExpr/AwaitExpr.expected
+++ b/rust/ql/test/extractor-tests/generated/AwaitExpr/AwaitExpr.expected
@@ -1 +1 @@
-| gen_await_expr.rs:6:17:6:27 | AwaitExpr | getExpr: | gen_await_expr.rs:6:17:6:21 | CallExpr |
+| gen_await_expr.rs:6:17:6:27 | AwaitExpr | getNumberOfAttrs: | 0 | hasExpr: | yes |
diff --git a/rust/ql/test/extractor-tests/generated/AwaitExpr/AwaitExpr.ql b/rust/ql/test/extractor-tests/generated/AwaitExpr/AwaitExpr.ql
index 6039b921e90..f78d81a3ec4 100644
--- a/rust/ql/test/extractor-tests/generated/AwaitExpr/AwaitExpr.ql
+++ b/rust/ql/test/extractor-tests/generated/AwaitExpr/AwaitExpr.ql
@@ -2,9 +2,10 @@
 import codeql.rust.elements
 import TestUtils
 
-from AwaitExpr x, Expr getExpr
+from AwaitExpr x, int getNumberOfAttrs, string hasExpr
 where
   toBeTested(x) and
   not x.isUnknown() and
-  getExpr = x.getExpr()
-select x, "getExpr:", getExpr
+  getNumberOfAttrs = x.getNumberOfAttrs() and
+  if x.hasExpr() then hasExpr = "yes" else hasExpr = "no"
+select x, "getNumberOfAttrs:", getNumberOfAttrs, "hasExpr:", hasExpr
diff --git a/rust/ql/test/extractor-tests/generated/AwaitExpr/AwaitExpr_getAttr.expected b/rust/ql/test/extractor-tests/generated/AwaitExpr/AwaitExpr_getAttr.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/AwaitExpr/AwaitExpr_getAttr.ql b/rust/ql/test/extractor-tests/generated/AwaitExpr/AwaitExpr_getAttr.ql
new file mode 100644
index 00000000000..9ac930312b5
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/AwaitExpr/AwaitExpr_getAttr.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from AwaitExpr x, int index
+where toBeTested(x) and not x.isUnknown()
+select x, index, x.getAttr(index)
diff --git a/rust/ql/test/extractor-tests/generated/AwaitExpr/AwaitExpr_getExpr.expected b/rust/ql/test/extractor-tests/generated/AwaitExpr/AwaitExpr_getExpr.expected
new file mode 100644
index 00000000000..c34a6012f4c
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/AwaitExpr/AwaitExpr_getExpr.expected
@@ -0,0 +1 @@
+| gen_await_expr.rs:6:17:6:27 | AwaitExpr | gen_await_expr.rs:6:17:6:21 | CallExpr |
diff --git a/rust/ql/test/extractor-tests/generated/AwaitExpr/AwaitExpr_getExpr.ql b/rust/ql/test/extractor-tests/generated/AwaitExpr/AwaitExpr_getExpr.ql
new file mode 100644
index 00000000000..45e9d40ec73
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/AwaitExpr/AwaitExpr_getExpr.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from AwaitExpr x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getExpr()
diff --git a/rust/ql/test/extractor-tests/generated/BecomeExpr/BecomeExpr.expected b/rust/ql/test/extractor-tests/generated/BecomeExpr/BecomeExpr.expected
index f067a46ca8d..75840ec81fe 100644
--- a/rust/ql/test/extractor-tests/generated/BecomeExpr/BecomeExpr.expected
+++ b/rust/ql/test/extractor-tests/generated/BecomeExpr/BecomeExpr.expected
@@ -1 +1 @@
-| gen_become_expr.rs:8:10:8:36 | BecomeExpr | getExpr: | gen_become_expr.rs:8:17:8:36 | CallExpr |
+| gen_become_expr.rs:8:10:8:36 | BecomeExpr | getNumberOfAttrs: | 0 | hasExpr: | yes |
diff --git a/rust/ql/test/extractor-tests/generated/BecomeExpr/BecomeExpr.ql b/rust/ql/test/extractor-tests/generated/BecomeExpr/BecomeExpr.ql
index b98b67f97f3..e297230419c 100644
--- a/rust/ql/test/extractor-tests/generated/BecomeExpr/BecomeExpr.ql
+++ b/rust/ql/test/extractor-tests/generated/BecomeExpr/BecomeExpr.ql
@@ -2,9 +2,10 @@
 import codeql.rust.elements
 import TestUtils
 
-from BecomeExpr x, Expr getExpr
+from BecomeExpr x, int getNumberOfAttrs, string hasExpr
 where
   toBeTested(x) and
   not x.isUnknown() and
-  getExpr = x.getExpr()
-select x, "getExpr:", getExpr
+  getNumberOfAttrs = x.getNumberOfAttrs() and
+  if x.hasExpr() then hasExpr = "yes" else hasExpr = "no"
+select x, "getNumberOfAttrs:", getNumberOfAttrs, "hasExpr:", hasExpr
diff --git a/rust/ql/test/extractor-tests/generated/BecomeExpr/BecomeExpr_getAttr.expected b/rust/ql/test/extractor-tests/generated/BecomeExpr/BecomeExpr_getAttr.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/BecomeExpr/BecomeExpr_getAttr.ql b/rust/ql/test/extractor-tests/generated/BecomeExpr/BecomeExpr_getAttr.ql
new file mode 100644
index 00000000000..aac3e259a32
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/BecomeExpr/BecomeExpr_getAttr.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from BecomeExpr x, int index
+where toBeTested(x) and not x.isUnknown()
+select x, index, x.getAttr(index)
diff --git a/rust/ql/test/extractor-tests/generated/BecomeExpr/BecomeExpr_getExpr.expected b/rust/ql/test/extractor-tests/generated/BecomeExpr/BecomeExpr_getExpr.expected
new file mode 100644
index 00000000000..8992c4868ca
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/BecomeExpr/BecomeExpr_getExpr.expected
@@ -0,0 +1 @@
+| gen_become_expr.rs:8:10:8:36 | BecomeExpr | gen_become_expr.rs:8:17:8:36 | CallExpr |
diff --git a/rust/ql/test/extractor-tests/generated/BecomeExpr/BecomeExpr_getExpr.ql b/rust/ql/test/extractor-tests/generated/BecomeExpr/BecomeExpr_getExpr.ql
new file mode 100644
index 00000000000..697178d5e48
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/BecomeExpr/BecomeExpr_getExpr.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from BecomeExpr x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getExpr()
diff --git a/rust/ql/test/extractor-tests/generated/BinaryExpr/BinaryExpr.expected b/rust/ql/test/extractor-tests/generated/BinaryExpr/BinaryExpr.expected
index 7523e3df01c..2f7a47933b1 100644
--- a/rust/ql/test/extractor-tests/generated/BinaryExpr/BinaryExpr.expected
+++ b/rust/ql/test/extractor-tests/generated/BinaryExpr/BinaryExpr.expected
@@ -1,5 +1,5 @@
-| gen_binary_expr.rs:5:5:5:9 | BinaryExpr | getLhs: | gen_binary_expr.rs:5:5:5:5 | PathExpr | getRhs: | gen_binary_expr.rs:5:9:5:9 | PathExpr | hasOp: | yes |
-| gen_binary_expr.rs:6:5:6:10 | BinaryExpr | getLhs: | gen_binary_expr.rs:6:5:6:5 | PathExpr | getRhs: | gen_binary_expr.rs:6:10:6:10 | PathExpr | hasOp: | yes |
-| gen_binary_expr.rs:7:5:7:10 | BinaryExpr | getLhs: | gen_binary_expr.rs:7:5:7:5 | PathExpr | getRhs: | gen_binary_expr.rs:7:10:7:10 | PathExpr | hasOp: | yes |
-| gen_binary_expr.rs:8:5:8:9 | BinaryExpr | getLhs: | gen_binary_expr.rs:8:5:8:5 | PathExpr | getRhs: | gen_binary_expr.rs:8:9:8:9 | PathExpr | hasOp: | yes |
-| gen_binary_expr.rs:9:5:9:10 | BinaryExpr | getLhs: | gen_binary_expr.rs:9:5:9:5 | PathExpr | getRhs: | gen_binary_expr.rs:9:10:9:10 | PathExpr | hasOp: | yes |
+| gen_binary_expr.rs:5:5:5:9 | ... + ... | getNumberOfAttrs: | 0 | hasLhs: | yes | hasOperatorName: | yes | hasRhs: | yes |
+| gen_binary_expr.rs:6:5:6:10 | ... && ... | getNumberOfAttrs: | 0 | hasLhs: | yes | hasOperatorName: | yes | hasRhs: | yes |
+| gen_binary_expr.rs:7:5:7:10 | ... <= ... | getNumberOfAttrs: | 0 | hasLhs: | yes | hasOperatorName: | yes | hasRhs: | yes |
+| gen_binary_expr.rs:8:5:8:9 | ... = ... | getNumberOfAttrs: | 0 | hasLhs: | yes | hasOperatorName: | yes | hasRhs: | yes |
+| gen_binary_expr.rs:9:5:9:10 | ... += ... | getNumberOfAttrs: | 0 | hasLhs: | yes | hasOperatorName: | yes | hasRhs: | yes |
diff --git a/rust/ql/test/extractor-tests/generated/BinaryExpr/BinaryExpr.ql b/rust/ql/test/extractor-tests/generated/BinaryExpr/BinaryExpr.ql
index adbd8dcbdb6..87c00d18e3e 100644
--- a/rust/ql/test/extractor-tests/generated/BinaryExpr/BinaryExpr.ql
+++ b/rust/ql/test/extractor-tests/generated/BinaryExpr/BinaryExpr.ql
@@ -2,11 +2,13 @@
 import codeql.rust.elements
 import TestUtils
 
-from BinaryExpr x, Expr getLhs, Expr getRhs, string hasOp
+from BinaryExpr x, int getNumberOfAttrs, string hasLhs, string hasOperatorName, string hasRhs
 where
   toBeTested(x) and
   not x.isUnknown() and
-  getLhs = x.getLhs() and
-  getRhs = x.getRhs() and
-  if x.hasOp() then hasOp = "yes" else hasOp = "no"
-select x, "getLhs:", getLhs, "getRhs:", getRhs, "hasOp:", hasOp
+  getNumberOfAttrs = x.getNumberOfAttrs() and
+  (if x.hasLhs() then hasLhs = "yes" else hasLhs = "no") and
+  (if x.hasOperatorName() then hasOperatorName = "yes" else hasOperatorName = "no") and
+  if x.hasRhs() then hasRhs = "yes" else hasRhs = "no"
+select x, "getNumberOfAttrs:", getNumberOfAttrs, "hasLhs:", hasLhs, "hasOperatorName:",
+  hasOperatorName, "hasRhs:", hasRhs
diff --git a/rust/ql/test/extractor-tests/generated/BinaryExpr/BinaryExpr_getAttr.expected b/rust/ql/test/extractor-tests/generated/BinaryExpr/BinaryExpr_getAttr.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/BinaryExpr/BinaryExpr_getAttr.ql b/rust/ql/test/extractor-tests/generated/BinaryExpr/BinaryExpr_getAttr.ql
new file mode 100644
index 00000000000..0d4503c82bd
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/BinaryExpr/BinaryExpr_getAttr.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from BinaryExpr x, int index
+where toBeTested(x) and not x.isUnknown()
+select x, index, x.getAttr(index)
diff --git a/rust/ql/test/extractor-tests/generated/BinaryExpr/BinaryExpr_getLhs.expected b/rust/ql/test/extractor-tests/generated/BinaryExpr/BinaryExpr_getLhs.expected
new file mode 100644
index 00000000000..9321ce0724a
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/BinaryExpr/BinaryExpr_getLhs.expected
@@ -0,0 +1,5 @@
+| gen_binary_expr.rs:5:5:5:9 | ... + ... | gen_binary_expr.rs:5:5:5:5 | x |
+| gen_binary_expr.rs:6:5:6:10 | ... && ... | gen_binary_expr.rs:6:5:6:5 | x |
+| gen_binary_expr.rs:7:5:7:10 | ... <= ... | gen_binary_expr.rs:7:5:7:5 | x |
+| gen_binary_expr.rs:8:5:8:9 | ... = ... | gen_binary_expr.rs:8:5:8:5 | x |
+| gen_binary_expr.rs:9:5:9:10 | ... += ... | gen_binary_expr.rs:9:5:9:5 | x |
diff --git a/rust/ql/test/extractor-tests/generated/RangeExpr/RangeExpr_getLhs.ql b/rust/ql/test/extractor-tests/generated/BinaryExpr/BinaryExpr_getLhs.ql
similarity index 89%
rename from rust/ql/test/extractor-tests/generated/RangeExpr/RangeExpr_getLhs.ql
rename to rust/ql/test/extractor-tests/generated/BinaryExpr/BinaryExpr_getLhs.ql
index b05ec80e73d..a8b21f01495 100644
--- a/rust/ql/test/extractor-tests/generated/RangeExpr/RangeExpr_getLhs.ql
+++ b/rust/ql/test/extractor-tests/generated/BinaryExpr/BinaryExpr_getLhs.ql
@@ -2,6 +2,6 @@
 import codeql.rust.elements
 import TestUtils
 
-from RangeExpr x
+from BinaryExpr x
 where toBeTested(x) and not x.isUnknown()
 select x, x.getLhs()
diff --git a/rust/ql/test/extractor-tests/generated/BinaryExpr/BinaryExpr_getOp.expected b/rust/ql/test/extractor-tests/generated/BinaryExpr/BinaryExpr_getOp.expected
deleted file mode 100644
index 9f9e191f660..00000000000
--- a/rust/ql/test/extractor-tests/generated/BinaryExpr/BinaryExpr_getOp.expected
+++ /dev/null
@@ -1,5 +0,0 @@
-| gen_binary_expr.rs:5:5:5:9 | BinaryExpr | + |
-| gen_binary_expr.rs:6:5:6:10 | BinaryExpr | && |
-| gen_binary_expr.rs:7:5:7:10 | BinaryExpr | <= |
-| gen_binary_expr.rs:8:5:8:9 | BinaryExpr | = |
-| gen_binary_expr.rs:9:5:9:10 | BinaryExpr | += |
diff --git a/rust/ql/test/extractor-tests/generated/BinaryExpr/BinaryExpr_getOperatorName.expected b/rust/ql/test/extractor-tests/generated/BinaryExpr/BinaryExpr_getOperatorName.expected
new file mode 100644
index 00000000000..e55ca0c63a0
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/BinaryExpr/BinaryExpr_getOperatorName.expected
@@ -0,0 +1,5 @@
+| gen_binary_expr.rs:5:5:5:9 | ... + ... | + |
+| gen_binary_expr.rs:6:5:6:10 | ... && ... | && |
+| gen_binary_expr.rs:7:5:7:10 | ... <= ... | <= |
+| gen_binary_expr.rs:8:5:8:9 | ... = ... | = |
+| gen_binary_expr.rs:9:5:9:10 | ... += ... | += |
diff --git a/rust/ql/test/extractor-tests/generated/BinaryExpr/BinaryExpr_getOp.ql b/rust/ql/test/extractor-tests/generated/BinaryExpr/BinaryExpr_getOperatorName.ql
similarity index 82%
rename from rust/ql/test/extractor-tests/generated/BinaryExpr/BinaryExpr_getOp.ql
rename to rust/ql/test/extractor-tests/generated/BinaryExpr/BinaryExpr_getOperatorName.ql
index 955f1552c1e..05da704202d 100644
--- a/rust/ql/test/extractor-tests/generated/BinaryExpr/BinaryExpr_getOp.ql
+++ b/rust/ql/test/extractor-tests/generated/BinaryExpr/BinaryExpr_getOperatorName.ql
@@ -4,4 +4,4 @@ import TestUtils
 
 from BinaryExpr x
 where toBeTested(x) and not x.isUnknown()
-select x, x.getOp()
+select x, x.getOperatorName()
diff --git a/rust/ql/test/extractor-tests/generated/BinaryExpr/BinaryExpr_getRhs.expected b/rust/ql/test/extractor-tests/generated/BinaryExpr/BinaryExpr_getRhs.expected
new file mode 100644
index 00000000000..9bd36da5fa6
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/BinaryExpr/BinaryExpr_getRhs.expected
@@ -0,0 +1,5 @@
+| gen_binary_expr.rs:5:5:5:9 | ... + ... | gen_binary_expr.rs:5:9:5:9 | y |
+| gen_binary_expr.rs:6:5:6:10 | ... && ... | gen_binary_expr.rs:6:10:6:10 | y |
+| gen_binary_expr.rs:7:5:7:10 | ... <= ... | gen_binary_expr.rs:7:10:7:10 | y |
+| gen_binary_expr.rs:8:5:8:9 | ... = ... | gen_binary_expr.rs:8:9:8:9 | y |
+| gen_binary_expr.rs:9:5:9:10 | ... += ... | gen_binary_expr.rs:9:10:9:10 | y |
diff --git a/rust/ql/test/extractor-tests/generated/RangeExpr/RangeExpr_getRhs.ql b/rust/ql/test/extractor-tests/generated/BinaryExpr/BinaryExpr_getRhs.ql
similarity index 89%
rename from rust/ql/test/extractor-tests/generated/RangeExpr/RangeExpr_getRhs.ql
rename to rust/ql/test/extractor-tests/generated/BinaryExpr/BinaryExpr_getRhs.ql
index 9b32e5f5825..8c491b7f575 100644
--- a/rust/ql/test/extractor-tests/generated/RangeExpr/RangeExpr_getRhs.ql
+++ b/rust/ql/test/extractor-tests/generated/BinaryExpr/BinaryExpr_getRhs.ql
@@ -2,6 +2,6 @@
 import codeql.rust.elements
 import TestUtils
 
-from RangeExpr x
+from BinaryExpr x
 where toBeTested(x) and not x.isUnknown()
 select x, x.getRhs()
diff --git a/rust/ql/test/extractor-tests/generated/BlockExpr/BlockExpr.expected b/rust/ql/test/extractor-tests/generated/BlockExpr/BlockExpr.expected
index 348f98b730b..39ec1d6a7e1 100644
--- a/rust/ql/test/extractor-tests/generated/BlockExpr/BlockExpr.expected
+++ b/rust/ql/test/extractor-tests/generated/BlockExpr/BlockExpr.expected
@@ -1,3 +1,3 @@
-| gen_block_expr.rs:3:28:12:1 | BlockExpr | getNumberOfStatements: | 1 | hasTail: | yes | hasLabel: | no |
-| gen_block_expr.rs:5:5:7:5 | BlockExpr | getNumberOfStatements: | 1 | hasTail: | no | hasLabel: | no |
-| gen_block_expr.rs:8:5:11:5 | BlockExpr | getNumberOfStatements: | 1 | hasTail: | yes | hasLabel: | yes |
+| gen_block_expr.rs:3:28:12:1 | BlockExpr | getNumberOfAttrs: | 0 | isAsync: | no | isConst: | no | isGen: | no | isMove: | no | isTry: | no | isUnsafe: | no | hasLabel: | no | hasStmtList: | yes |
+| gen_block_expr.rs:5:5:7:5 | BlockExpr | getNumberOfAttrs: | 0 | isAsync: | no | isConst: | no | isGen: | no | isMove: | no | isTry: | no | isUnsafe: | no | hasLabel: | no | hasStmtList: | yes |
+| gen_block_expr.rs:8:5:11:5 | BlockExpr | getNumberOfAttrs: | 0 | isAsync: | no | isConst: | no | isGen: | no | isMove: | no | isTry: | no | isUnsafe: | no | hasLabel: | yes | hasStmtList: | yes |
diff --git a/rust/ql/test/extractor-tests/generated/BlockExpr/BlockExpr.ql b/rust/ql/test/extractor-tests/generated/BlockExpr/BlockExpr.ql
index 9cd6c27688a..58107054515 100644
--- a/rust/ql/test/extractor-tests/generated/BlockExpr/BlockExpr.ql
+++ b/rust/ql/test/extractor-tests/generated/BlockExpr/BlockExpr.ql
@@ -2,12 +2,21 @@
 import codeql.rust.elements
 import TestUtils
 
-from BlockExpr x, int getNumberOfStatements, string hasTail, string hasLabel
+from
+  BlockExpr x, int getNumberOfAttrs, string isAsync, string isConst, string isGen, string isMove,
+  string isTry, string isUnsafe, string hasLabel, string hasStmtList
 where
   toBeTested(x) and
   not x.isUnknown() and
-  getNumberOfStatements = x.getNumberOfStatements() and
-  (if x.hasTail() then hasTail = "yes" else hasTail = "no") and
-  if x.hasLabel() then hasLabel = "yes" else hasLabel = "no"
-select x, "getNumberOfStatements:", getNumberOfStatements, "hasTail:", hasTail, "hasLabel:",
-  hasLabel
+  getNumberOfAttrs = x.getNumberOfAttrs() and
+  (if x.isAsync() then isAsync = "yes" else isAsync = "no") and
+  (if x.isConst() then isConst = "yes" else isConst = "no") and
+  (if x.isGen() then isGen = "yes" else isGen = "no") and
+  (if x.isMove() then isMove = "yes" else isMove = "no") and
+  (if x.isTry() then isTry = "yes" else isTry = "no") and
+  (if x.isUnsafe() then isUnsafe = "yes" else isUnsafe = "no") and
+  (if x.hasLabel() then hasLabel = "yes" else hasLabel = "no") and
+  if x.hasStmtList() then hasStmtList = "yes" else hasStmtList = "no"
+select x, "getNumberOfAttrs:", getNumberOfAttrs, "isAsync:", isAsync, "isConst:", isConst, "isGen:",
+  isGen, "isMove:", isMove, "isTry:", isTry, "isUnsafe:", isUnsafe, "hasLabel:", hasLabel,
+  "hasStmtList:", hasStmtList
diff --git a/rust/ql/test/extractor-tests/generated/BlockExpr/BlockExpr_getAttr.expected b/rust/ql/test/extractor-tests/generated/BlockExpr/BlockExpr_getAttr.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/BlockExpr/BlockExpr_getAttr.ql b/rust/ql/test/extractor-tests/generated/BlockExpr/BlockExpr_getAttr.ql
new file mode 100644
index 00000000000..b44ebf9d08d
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/BlockExpr/BlockExpr_getAttr.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from BlockExpr x, int index
+where toBeTested(x) and not x.isUnknown()
+select x, index, x.getAttr(index)
diff --git a/rust/ql/test/extractor-tests/generated/BlockExpr/BlockExpr_getStatement.expected b/rust/ql/test/extractor-tests/generated/BlockExpr/BlockExpr_getStatement.expected
deleted file mode 100644
index 66dc93e503d..00000000000
--- a/rust/ql/test/extractor-tests/generated/BlockExpr/BlockExpr_getStatement.expected
+++ /dev/null
@@ -1,3 +0,0 @@
-| gen_block_expr.rs:3:28:12:1 | BlockExpr | 0 | gen_block_expr.rs:5:5:7:5 | ExprStmt |
-| gen_block_expr.rs:5:5:7:5 | BlockExpr | 0 | gen_block_expr.rs:6:13:6:13 | LetStmt |
-| gen_block_expr.rs:8:5:11:5 | BlockExpr | 0 | gen_block_expr.rs:9:13:9:13 | LetStmt |
diff --git a/rust/ql/test/extractor-tests/generated/BlockExpr/BlockExpr_getStmtList.expected b/rust/ql/test/extractor-tests/generated/BlockExpr/BlockExpr_getStmtList.expected
new file mode 100644
index 00000000000..21eb195289a
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/BlockExpr/BlockExpr_getStmtList.expected
@@ -0,0 +1,3 @@
+| gen_block_expr.rs:3:28:12:1 | BlockExpr | gen_block_expr.rs:3:28:12:1 | StmtList |
+| gen_block_expr.rs:5:5:7:5 | BlockExpr | gen_block_expr.rs:5:5:7:5 | StmtList |
+| gen_block_expr.rs:8:5:11:5 | BlockExpr | gen_block_expr.rs:8:13:11:5 | StmtList |
diff --git a/rust/ql/test/extractor-tests/generated/BlockExpr/BlockExpr_getTail.ql b/rust/ql/test/extractor-tests/generated/BlockExpr/BlockExpr_getStmtList.ql
similarity index 84%
rename from rust/ql/test/extractor-tests/generated/BlockExpr/BlockExpr_getTail.ql
rename to rust/ql/test/extractor-tests/generated/BlockExpr/BlockExpr_getStmtList.ql
index b27adc54bb8..493e9ad5d4a 100644
--- a/rust/ql/test/extractor-tests/generated/BlockExpr/BlockExpr_getTail.ql
+++ b/rust/ql/test/extractor-tests/generated/BlockExpr/BlockExpr_getStmtList.ql
@@ -4,4 +4,4 @@ import TestUtils
 
 from BlockExpr x
 where toBeTested(x) and not x.isUnknown()
-select x, x.getTail()
+select x, x.getStmtList()
diff --git a/rust/ql/test/extractor-tests/generated/BlockExpr/BlockExpr_getTail.expected b/rust/ql/test/extractor-tests/generated/BlockExpr/BlockExpr_getTail.expected
deleted file mode 100644
index 2a3d8031821..00000000000
--- a/rust/ql/test/extractor-tests/generated/BlockExpr/BlockExpr_getTail.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-| gen_block_expr.rs:3:28:12:1 | BlockExpr | gen_block_expr.rs:8:5:11:5 | BlockExpr |
-| gen_block_expr.rs:8:5:11:5 | BlockExpr | gen_block_expr.rs:10:9:10:9 | PathExpr |
diff --git a/rust/ql/test/extractor-tests/generated/BoxExpr/BoxExpr.expected b/rust/ql/test/extractor-tests/generated/BoxExpr/BoxExpr.expected
deleted file mode 100644
index b3324e400f5..00000000000
--- a/rust/ql/test/extractor-tests/generated/BoxExpr/BoxExpr.expected
+++ /dev/null
@@ -1 +0,0 @@
-| gen_box_expr.rs:5:13:5:37 | BoxExpr | getExpr: | gen_box_expr.rs:5:35:5:36 | LiteralExpr |
diff --git a/rust/ql/test/extractor-tests/generated/BoxExpr/gen_box_expr.rs b/rust/ql/test/extractor-tests/generated/BoxExpr/gen_box_expr.rs
deleted file mode 100644
index 1404d99f758..00000000000
--- a/rust/ql/test/extractor-tests/generated/BoxExpr/gen_box_expr.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-// generated by codegen, do not edit
-
-fn test_box_expr() -> () {
-    // A box expression. For example:
-    let x = #[rustc_box] Box::new(42);
-}
diff --git a/rust/ql/test/extractor-tests/generated/BoxPat/BoxPat.expected b/rust/ql/test/extractor-tests/generated/BoxPat/BoxPat.expected
index 41597634b95..95c8bdebd47 100644
--- a/rust/ql/test/extractor-tests/generated/BoxPat/BoxPat.expected
+++ b/rust/ql/test/extractor-tests/generated/BoxPat/BoxPat.expected
@@ -1,2 +1,2 @@
-| gen_box_pat.rs:6:9:6:27 | BoxPat | getInner: | gen_box_pat.rs:6:13:6:27 | TupleStructPat |
-| gen_box_pat.rs:7:9:7:24 | BoxPat | getInner: | gen_box_pat.rs:7:13:7:24 | PathPat |
+| gen_box_pat.rs:6:9:6:27 | BoxPat | hasPat: | yes |
+| gen_box_pat.rs:7:9:7:24 | BoxPat | hasPat: | yes |
diff --git a/rust/ql/test/extractor-tests/generated/BoxPat/BoxPat.ql b/rust/ql/test/extractor-tests/generated/BoxPat/BoxPat.ql
index 525eac91982..cee3b683e66 100644
--- a/rust/ql/test/extractor-tests/generated/BoxPat/BoxPat.ql
+++ b/rust/ql/test/extractor-tests/generated/BoxPat/BoxPat.ql
@@ -2,9 +2,9 @@
 import codeql.rust.elements
 import TestUtils
 
-from BoxPat x, Pat getInner
+from BoxPat x, string hasPat
 where
   toBeTested(x) and
   not x.isUnknown() and
-  getInner = x.getInner()
-select x, "getInner:", getInner
+  if x.hasPat() then hasPat = "yes" else hasPat = "no"
+select x, "hasPat:", hasPat
diff --git a/rust/ql/test/extractor-tests/generated/BoxPat/BoxPat_getPat.expected b/rust/ql/test/extractor-tests/generated/BoxPat/BoxPat_getPat.expected
new file mode 100644
index 00000000000..cac8ee05d3c
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/BoxPat/BoxPat_getPat.expected
@@ -0,0 +1,2 @@
+| gen_box_pat.rs:6:9:6:27 | BoxPat | gen_box_pat.rs:6:13:6:27 | TupleStructPat |
+| gen_box_pat.rs:7:9:7:24 | BoxPat | gen_box_pat.rs:7:13:7:24 | PathPat |
diff --git a/rust/ql/test/extractor-tests/generated/BoxPat/BoxPat_getPat.ql b/rust/ql/test/extractor-tests/generated/BoxPat/BoxPat_getPat.ql
new file mode 100644
index 00000000000..d1a4ad6fca8
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/BoxPat/BoxPat_getPat.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from BoxPat x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getPat()
diff --git a/rust/ql/test/extractor-tests/generated/BreakExpr/BreakExpr.expected b/rust/ql/test/extractor-tests/generated/BreakExpr/BreakExpr.expected
index c7b451c235f..763fae60866 100644
--- a/rust/ql/test/extractor-tests/generated/BreakExpr/BreakExpr.expected
+++ b/rust/ql/test/extractor-tests/generated/BreakExpr/BreakExpr.expected
@@ -1,2 +1,3 @@
-| gen_break_expr.rs:7:13:7:17 | BreakExpr | hasExpr: | no | hasLabel: | no |
-| gen_break_expr.rs:12:13:12:27 | BreakExpr | hasExpr: | yes | hasLabel: | yes |
+| gen_break_expr.rs:7:13:7:17 | BreakExpr | getNumberOfAttrs: | 0 | hasExpr: | no | hasLifetime: | no |
+| gen_break_expr.rs:12:13:12:27 | BreakExpr | getNumberOfAttrs: | 0 | hasExpr: | yes | hasLifetime: | yes |
+| gen_break_expr.rs:17:13:17:27 | BreakExpr | getNumberOfAttrs: | 0 | hasExpr: | yes | hasLifetime: | yes |
diff --git a/rust/ql/test/extractor-tests/generated/BreakExpr/BreakExpr.ql b/rust/ql/test/extractor-tests/generated/BreakExpr/BreakExpr.ql
index 39b93ac5fe4..1238e6e4231 100644
--- a/rust/ql/test/extractor-tests/generated/BreakExpr/BreakExpr.ql
+++ b/rust/ql/test/extractor-tests/generated/BreakExpr/BreakExpr.ql
@@ -2,10 +2,11 @@
 import codeql.rust.elements
 import TestUtils
 
-from BreakExpr x, string hasExpr, string hasLabel
+from BreakExpr x, int getNumberOfAttrs, string hasExpr, string hasLifetime
 where
   toBeTested(x) and
   not x.isUnknown() and
+  getNumberOfAttrs = x.getNumberOfAttrs() and
   (if x.hasExpr() then hasExpr = "yes" else hasExpr = "no") and
-  if x.hasLabel() then hasLabel = "yes" else hasLabel = "no"
-select x, "hasExpr:", hasExpr, "hasLabel:", hasLabel
+  if x.hasLifetime() then hasLifetime = "yes" else hasLifetime = "no"
+select x, "getNumberOfAttrs:", getNumberOfAttrs, "hasExpr:", hasExpr, "hasLifetime:", hasLifetime
diff --git a/rust/ql/test/extractor-tests/generated/BreakExpr/BreakExpr_getAttr.expected b/rust/ql/test/extractor-tests/generated/BreakExpr/BreakExpr_getAttr.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/BreakExpr/BreakExpr_getAttr.ql b/rust/ql/test/extractor-tests/generated/BreakExpr/BreakExpr_getAttr.ql
new file mode 100644
index 00000000000..dca05d9b890
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/BreakExpr/BreakExpr_getAttr.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from BreakExpr x, int index
+where toBeTested(x) and not x.isUnknown()
+select x, index, x.getAttr(index)
diff --git a/rust/ql/test/extractor-tests/generated/BreakExpr/BreakExpr_getExpr.expected b/rust/ql/test/extractor-tests/generated/BreakExpr/BreakExpr_getExpr.expected
index 16dfc812459..0bd373a4bbc 100644
--- a/rust/ql/test/extractor-tests/generated/BreakExpr/BreakExpr_getExpr.expected
+++ b/rust/ql/test/extractor-tests/generated/BreakExpr/BreakExpr_getExpr.expected
@@ -1 +1,2 @@
-| gen_break_expr.rs:12:13:12:27 | BreakExpr | gen_break_expr.rs:12:26:12:27 | LiteralExpr |
+| gen_break_expr.rs:12:13:12:27 | BreakExpr | gen_break_expr.rs:12:26:12:27 | 42 |
+| gen_break_expr.rs:17:13:17:27 | BreakExpr | gen_break_expr.rs:17:26:17:27 | 42 |
diff --git a/rust/ql/test/extractor-tests/generated/BreakExpr/BreakExpr_getLabel.expected b/rust/ql/test/extractor-tests/generated/BreakExpr/BreakExpr_getLabel.expected
deleted file mode 100644
index e8918129a36..00000000000
--- a/rust/ql/test/extractor-tests/generated/BreakExpr/BreakExpr_getLabel.expected
+++ /dev/null
@@ -1 +0,0 @@
-| gen_break_expr.rs:12:13:12:27 | BreakExpr | gen_break_expr.rs:10:13:10:19 | Label |
diff --git a/rust/ql/test/extractor-tests/generated/BreakExpr/BreakExpr_getLifetime.expected b/rust/ql/test/extractor-tests/generated/BreakExpr/BreakExpr_getLifetime.expected
new file mode 100644
index 00000000000..b993a2eebf5
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/BreakExpr/BreakExpr_getLifetime.expected
@@ -0,0 +1,2 @@
+| gen_break_expr.rs:12:13:12:27 | BreakExpr | gen_break_expr.rs:12:19:12:24 | Lifetime |
+| gen_break_expr.rs:17:13:17:27 | BreakExpr | gen_break_expr.rs:17:19:17:24 | Lifetime |
diff --git a/rust/ql/test/extractor-tests/generated/BreakExpr/BreakExpr_getLifetime.ql b/rust/ql/test/extractor-tests/generated/BreakExpr/BreakExpr_getLifetime.ql
new file mode 100644
index 00000000000..c272d79f9cf
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/BreakExpr/BreakExpr_getLifetime.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from BreakExpr x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getLifetime()
diff --git a/rust/ql/test/extractor-tests/generated/BreakExpr/gen_break_expr.rs b/rust/ql/test/extractor-tests/generated/BreakExpr/gen_break_expr.rs
index cd40541da9c..0f7d3ec6246 100644
--- a/rust/ql/test/extractor-tests/generated/BreakExpr/gen_break_expr.rs
+++ b/rust/ql/test/extractor-tests/generated/BreakExpr/gen_break_expr.rs
@@ -12,4 +12,10 @@ fn test_break_expr() -> () {
             break 'label 42;
         }
     };
+    let x = 'label: {
+        if exit() {
+            break 'label 42;
+        }
+        0;
+    };
 }
diff --git a/rust/ql/test/extractor-tests/generated/CallExpr/CallExpr.expected b/rust/ql/test/extractor-tests/generated/CallExpr/CallExpr.expected
index 111ff8392d2..5414108064c 100644
--- a/rust/ql/test/extractor-tests/generated/CallExpr/CallExpr.expected
+++ b/rust/ql/test/extractor-tests/generated/CallExpr/CallExpr.expected
@@ -1,4 +1,4 @@
-| gen_call_expr.rs:5:5:5:11 | CallExpr | getCallee: | gen_call_expr.rs:5:5:5:7 | PathExpr | getNumberOfArgs: | 1 | isAssigneeExpr: | no |
-| gen_call_expr.rs:6:5:6:23 | CallExpr | getCallee: | gen_call_expr.rs:6:5:6:19 | PathExpr | getNumberOfArgs: | 1 | isAssigneeExpr: | no |
-| gen_call_expr.rs:7:5:7:14 | CallExpr | getCallee: | gen_call_expr.rs:7:5:7:10 | IndexExpr | getNumberOfArgs: | 1 | isAssigneeExpr: | no |
-| gen_call_expr.rs:8:5:8:10 | CallExpr | getCallee: | gen_call_expr.rs:8:5:8:7 | PathExpr | getNumberOfArgs: | 1 | isAssigneeExpr: | yes |
+| gen_call_expr.rs:5:5:5:11 | CallExpr | hasArgList: | yes | getNumberOfAttrs: | 0 | hasExpr: | yes |
+| gen_call_expr.rs:6:5:6:23 | CallExpr | hasArgList: | yes | getNumberOfAttrs: | 0 | hasExpr: | yes |
+| gen_call_expr.rs:7:5:7:14 | CallExpr | hasArgList: | yes | getNumberOfAttrs: | 0 | hasExpr: | yes |
+| gen_call_expr.rs:8:5:8:10 | CallExpr | hasArgList: | yes | getNumberOfAttrs: | 0 | hasExpr: | yes |
diff --git a/rust/ql/test/extractor-tests/generated/CallExpr/CallExpr.ql b/rust/ql/test/extractor-tests/generated/CallExpr/CallExpr.ql
index ddbe62ac5a0..b44136c4942 100644
--- a/rust/ql/test/extractor-tests/generated/CallExpr/CallExpr.ql
+++ b/rust/ql/test/extractor-tests/generated/CallExpr/CallExpr.ql
@@ -2,12 +2,11 @@
 import codeql.rust.elements
 import TestUtils
 
-from CallExpr x, Expr getCallee, int getNumberOfArgs, string isAssigneeExpr
+from CallExpr x, string hasArgList, int getNumberOfAttrs, string hasExpr
 where
   toBeTested(x) and
   not x.isUnknown() and
-  getCallee = x.getCallee() and
-  getNumberOfArgs = x.getNumberOfArgs() and
-  if x.isAssigneeExpr() then isAssigneeExpr = "yes" else isAssigneeExpr = "no"
-select x, "getCallee:", getCallee, "getNumberOfArgs:", getNumberOfArgs, "isAssigneeExpr:",
-  isAssigneeExpr
+  (if x.hasArgList() then hasArgList = "yes" else hasArgList = "no") and
+  getNumberOfAttrs = x.getNumberOfAttrs() and
+  if x.hasExpr() then hasExpr = "yes" else hasExpr = "no"
+select x, "hasArgList:", hasArgList, "getNumberOfAttrs:", getNumberOfAttrs, "hasExpr:", hasExpr
diff --git a/rust/ql/test/extractor-tests/generated/CallExpr/CallExpr_getArg.expected b/rust/ql/test/extractor-tests/generated/CallExpr/CallExpr_getArg.expected
deleted file mode 100644
index 6ff1a242993..00000000000
--- a/rust/ql/test/extractor-tests/generated/CallExpr/CallExpr_getArg.expected
+++ /dev/null
@@ -1,4 +0,0 @@
-| gen_call_expr.rs:5:5:5:11 | CallExpr | 0 | gen_call_expr.rs:5:9:5:10 | LiteralExpr |
-| gen_call_expr.rs:6:5:6:23 | CallExpr | 0 | gen_call_expr.rs:6:21:6:22 | LiteralExpr |
-| gen_call_expr.rs:7:5:7:14 | CallExpr | 0 | gen_call_expr.rs:7:12:7:13 | LiteralExpr |
-| gen_call_expr.rs:8:5:8:10 | CallExpr | 0 | gen_call_expr.rs:8:9:8:9 | LiteralExpr |
diff --git a/rust/ql/test/extractor-tests/generated/CallExpr/CallExpr_getArgList.expected b/rust/ql/test/extractor-tests/generated/CallExpr/CallExpr_getArgList.expected
new file mode 100644
index 00000000000..a42cc13bf39
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/CallExpr/CallExpr_getArgList.expected
@@ -0,0 +1,4 @@
+| gen_call_expr.rs:5:5:5:11 | CallExpr | gen_call_expr.rs:5:8:5:11 | ArgList |
+| gen_call_expr.rs:6:5:6:23 | CallExpr | gen_call_expr.rs:6:20:6:23 | ArgList |
+| gen_call_expr.rs:7:5:7:14 | CallExpr | gen_call_expr.rs:7:11:7:14 | ArgList |
+| gen_call_expr.rs:8:5:8:10 | CallExpr | gen_call_expr.rs:8:8:8:10 | ArgList |
diff --git a/rust/ql/test/extractor-tests/generated/CallExpr/CallExpr_getArgList.ql b/rust/ql/test/extractor-tests/generated/CallExpr/CallExpr_getArgList.ql
new file mode 100644
index 00000000000..088f92ec06d
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/CallExpr/CallExpr_getArgList.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from CallExpr x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getArgList()
diff --git a/rust/ql/test/extractor-tests/generated/CallExpr/CallExpr_getAttr.expected b/rust/ql/test/extractor-tests/generated/CallExpr/CallExpr_getAttr.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/CallExpr/CallExpr_getAttr.ql b/rust/ql/test/extractor-tests/generated/CallExpr/CallExpr_getAttr.ql
new file mode 100644
index 00000000000..53b8ec257a6
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/CallExpr/CallExpr_getAttr.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from CallExpr x, int index
+where toBeTested(x) and not x.isUnknown()
+select x, index, x.getAttr(index)
diff --git a/rust/ql/test/extractor-tests/generated/CallExpr/CallExpr_getExpr.expected b/rust/ql/test/extractor-tests/generated/CallExpr/CallExpr_getExpr.expected
new file mode 100644
index 00000000000..544937866b7
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/CallExpr/CallExpr_getExpr.expected
@@ -0,0 +1,4 @@
+| gen_call_expr.rs:5:5:5:11 | CallExpr | gen_call_expr.rs:5:5:5:7 | foo |
+| gen_call_expr.rs:6:5:6:23 | CallExpr | gen_call_expr.rs:6:5:6:19 | foo::<...> |
+| gen_call_expr.rs:7:5:7:14 | CallExpr | gen_call_expr.rs:7:5:7:10 | IndexExpr |
+| gen_call_expr.rs:8:5:8:10 | CallExpr | gen_call_expr.rs:8:5:8:7 | foo |
diff --git a/rust/ql/test/extractor-tests/generated/CallExpr/CallExpr_getExpr.ql b/rust/ql/test/extractor-tests/generated/CallExpr/CallExpr_getExpr.ql
new file mode 100644
index 00000000000..d09819fc1fd
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/CallExpr/CallExpr_getExpr.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from CallExpr x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getExpr()
diff --git a/rust/ql/test/extractor-tests/generated/CastExpr/CastExpr.expected b/rust/ql/test/extractor-tests/generated/CastExpr/CastExpr.expected
index b06efc92f75..6050eb02259 100644
--- a/rust/ql/test/extractor-tests/generated/CastExpr/CastExpr.expected
+++ b/rust/ql/test/extractor-tests/generated/CastExpr/CastExpr.expected
@@ -1 +1 @@
-| gen_cast_expr.rs:5:5:5:16 | CastExpr | getExpr: | gen_cast_expr.rs:5:5:5:9 | PathExpr | getType: | file://:0:0:0:0 | TypeRef |
+| gen_cast_expr.rs:5:5:5:16 | CastExpr | getNumberOfAttrs: | 0 | hasExpr: | yes | hasTy: | yes |
diff --git a/rust/ql/test/extractor-tests/generated/CastExpr/CastExpr.ql b/rust/ql/test/extractor-tests/generated/CastExpr/CastExpr.ql
index 1082b80fa01..d7db68cfdf2 100644
--- a/rust/ql/test/extractor-tests/generated/CastExpr/CastExpr.ql
+++ b/rust/ql/test/extractor-tests/generated/CastExpr/CastExpr.ql
@@ -2,10 +2,11 @@
 import codeql.rust.elements
 import TestUtils
 
-from CastExpr x, Expr getExpr, TypeRef getType
+from CastExpr x, int getNumberOfAttrs, string hasExpr, string hasTy
 where
   toBeTested(x) and
   not x.isUnknown() and
-  getExpr = x.getExpr() and
-  getType = x.getType()
-select x, "getExpr:", getExpr, "getType:", getType
+  getNumberOfAttrs = x.getNumberOfAttrs() and
+  (if x.hasExpr() then hasExpr = "yes" else hasExpr = "no") and
+  if x.hasTy() then hasTy = "yes" else hasTy = "no"
+select x, "getNumberOfAttrs:", getNumberOfAttrs, "hasExpr:", hasExpr, "hasTy:", hasTy
diff --git a/rust/ql/test/extractor-tests/generated/CastExpr/CastExpr_getAttr.expected b/rust/ql/test/extractor-tests/generated/CastExpr/CastExpr_getAttr.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/CastExpr/CastExpr_getAttr.ql b/rust/ql/test/extractor-tests/generated/CastExpr/CastExpr_getAttr.ql
new file mode 100644
index 00000000000..afb47c82fdb
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/CastExpr/CastExpr_getAttr.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from CastExpr x, int index
+where toBeTested(x) and not x.isUnknown()
+select x, index, x.getAttr(index)
diff --git a/rust/ql/test/extractor-tests/generated/CastExpr/CastExpr_getExpr.expected b/rust/ql/test/extractor-tests/generated/CastExpr/CastExpr_getExpr.expected
new file mode 100644
index 00000000000..f3e1d4c7ec9
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/CastExpr/CastExpr_getExpr.expected
@@ -0,0 +1 @@
+| gen_cast_expr.rs:5:5:5:16 | CastExpr | gen_cast_expr.rs:5:5:5:9 | value |
diff --git a/rust/ql/test/extractor-tests/generated/CastExpr/CastExpr_getExpr.ql b/rust/ql/test/extractor-tests/generated/CastExpr/CastExpr_getExpr.ql
new file mode 100644
index 00000000000..3d8c47f1354
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/CastExpr/CastExpr_getExpr.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from CastExpr x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getExpr()
diff --git a/rust/ql/test/extractor-tests/generated/CastExpr/CastExpr_getTy.expected b/rust/ql/test/extractor-tests/generated/CastExpr/CastExpr_getTy.expected
new file mode 100644
index 00000000000..29cc49cc3b9
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/CastExpr/CastExpr_getTy.expected
@@ -0,0 +1 @@
+| gen_cast_expr.rs:5:5:5:16 | CastExpr | gen_cast_expr.rs:5:14:5:16 | PathType |
diff --git a/rust/ql/test/extractor-tests/generated/CastExpr/CastExpr_getTy.ql b/rust/ql/test/extractor-tests/generated/CastExpr/CastExpr_getTy.ql
new file mode 100644
index 00000000000..68b6f5126f4
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/CastExpr/CastExpr_getTy.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from CastExpr x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getTy()
diff --git a/rust/ql/test/extractor-tests/generated/ClosureBinder/ClosureBinder.expected b/rust/ql/test/extractor-tests/generated/ClosureBinder/ClosureBinder.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/ClosureBinder/ClosureBinder.ql b/rust/ql/test/extractor-tests/generated/ClosureBinder/ClosureBinder.ql
new file mode 100644
index 00000000000..b099f4aa548
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/ClosureBinder/ClosureBinder.ql
@@ -0,0 +1,10 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from ClosureBinder x, string hasGenericParamList
+where
+  toBeTested(x) and
+  not x.isUnknown() and
+  if x.hasGenericParamList() then hasGenericParamList = "yes" else hasGenericParamList = "no"
+select x, "hasGenericParamList:", hasGenericParamList
diff --git a/rust/ql/test/extractor-tests/generated/ClosureBinder/ClosureBinder_getGenericParamList.expected b/rust/ql/test/extractor-tests/generated/ClosureBinder/ClosureBinder_getGenericParamList.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/ClosureBinder/ClosureBinder_getGenericParamList.ql b/rust/ql/test/extractor-tests/generated/ClosureBinder/ClosureBinder_getGenericParamList.ql
new file mode 100644
index 00000000000..553bcf8970e
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/ClosureBinder/ClosureBinder_getGenericParamList.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from ClosureBinder x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getGenericParamList()
diff --git a/rust/ql/test/extractor-tests/generated/ClosureBinder/gen_closure_binder.rs b/rust/ql/test/extractor-tests/generated/ClosureBinder/gen_closure_binder.rs
new file mode 100644
index 00000000000..a924e2f6168
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/ClosureBinder/gen_closure_binder.rs
@@ -0,0 +1,6 @@
+// generated by codegen, do not edit
+
+fn test_closure_binder() -> () {
+    // A ClosureBinder. For example:
+    todo!()
+}
diff --git a/rust/ql/test/extractor-tests/generated/ClosureExpr/ClosureExpr.expected b/rust/ql/test/extractor-tests/generated/ClosureExpr/ClosureExpr.expected
index 0d9c025ea4a..fb665ca8f60 100644
--- a/rust/ql/test/extractor-tests/generated/ClosureExpr/ClosureExpr.expected
+++ b/rust/ql/test/extractor-tests/generated/ClosureExpr/ClosureExpr.expected
@@ -1,5 +1,5 @@
-| gen_closure_expr.rs:5:5:5:13 | ClosureExpr | getNumberOfArgs: | 1 | hasRetType: | no | getBody: | gen_closure_expr.rs:5:9:5:13 | BinaryExpr | getClosureKind: | Closure | isMove: | no |
-| gen_closure_expr.rs:6:5:6:34 | ClosureExpr | getNumberOfArgs: | 1 | hasRetType: | yes | getBody: | gen_closure_expr.rs:6:26:6:34 | BlockExpr | getClosureKind: | Closure | isMove: | yes |
-| gen_closure_expr.rs:7:5:7:27 | ClosureExpr | getNumberOfArgs: | 2 | hasRetType: | no | getBody: | gen_closure_expr.rs:7:23:7:27 | BinaryExpr | getClosureKind: | Async | isMove: | no |
-| gen_closure_expr.rs:8:6:9:15 | ClosureExpr | getNumberOfArgs: | 1 | hasRetType: | no | getBody: | gen_closure_expr.rs:9:9:9:15 | YieldExpr | getClosureKind: | Coroutine(Movable) | isMove: | no |
-| gen_closure_expr.rs:10:6:11:23 | ClosureExpr | getNumberOfArgs: | 1 | hasRetType: | no | getBody: | gen_closure_expr.rs:11:17:11:23 | YieldExpr | getClosureKind: | Coroutine(Static) | isMove: | no |
+| gen_closure_expr.rs:5:5:5:13 | ClosureExpr | hasParamList: | yes | getNumberOfAttrs: | 0 | hasBody: | yes | hasClosureBinder: | no | isAsync: | no | isConst: | no | isGen: | no | isMove: | no | isStatic: | no | hasRetType: | no |
+| gen_closure_expr.rs:6:5:6:34 | ClosureExpr | hasParamList: | yes | getNumberOfAttrs: | 0 | hasBody: | yes | hasClosureBinder: | no | isAsync: | no | isConst: | no | isGen: | no | isMove: | yes | isStatic: | no | hasRetType: | yes |
+| gen_closure_expr.rs:7:5:7:27 | ClosureExpr | hasParamList: | yes | getNumberOfAttrs: | 0 | hasBody: | yes | hasClosureBinder: | no | isAsync: | yes | isConst: | no | isGen: | no | isMove: | no | isStatic: | no | hasRetType: | no |
+| gen_closure_expr.rs:8:6:9:15 | ClosureExpr | hasParamList: | yes | getNumberOfAttrs: | 1 | hasBody: | yes | hasClosureBinder: | no | isAsync: | no | isConst: | no | isGen: | no | isMove: | no | isStatic: | no | hasRetType: | no |
+| gen_closure_expr.rs:10:6:11:23 | ClosureExpr | hasParamList: | yes | getNumberOfAttrs: | 1 | hasBody: | yes | hasClosureBinder: | no | isAsync: | no | isConst: | no | isGen: | no | isMove: | no | isStatic: | yes | hasRetType: | no |
diff --git a/rust/ql/test/extractor-tests/generated/ClosureExpr/ClosureExpr.ql b/rust/ql/test/extractor-tests/generated/ClosureExpr/ClosureExpr.ql
index d2c394b4ad8..b4b3dddc679 100644
--- a/rust/ql/test/extractor-tests/generated/ClosureExpr/ClosureExpr.ql
+++ b/rust/ql/test/extractor-tests/generated/ClosureExpr/ClosureExpr.ql
@@ -3,15 +3,21 @@ import codeql.rust.elements
 import TestUtils
 
 from
-  ClosureExpr x, int getNumberOfArgs, string hasRetType, Expr getBody, string getClosureKind,
-  string isMove
+  ClosureExpr x, string hasParamList, int getNumberOfAttrs, string hasBody, string hasClosureBinder,
+  string isAsync, string isConst, string isGen, string isMove, string isStatic, string hasRetType
 where
   toBeTested(x) and
   not x.isUnknown() and
-  getNumberOfArgs = x.getNumberOfArgs() and
-  (if x.hasRetType() then hasRetType = "yes" else hasRetType = "no") and
-  getBody = x.getBody() and
-  getClosureKind = x.getClosureKind() and
-  if x.isMove() then isMove = "yes" else isMove = "no"
-select x, "getNumberOfArgs:", getNumberOfArgs, "hasRetType:", hasRetType, "getBody:", getBody,
-  "getClosureKind:", getClosureKind, "isMove:", isMove
+  (if x.hasParamList() then hasParamList = "yes" else hasParamList = "no") and
+  getNumberOfAttrs = x.getNumberOfAttrs() and
+  (if x.hasBody() then hasBody = "yes" else hasBody = "no") and
+  (if x.hasClosureBinder() then hasClosureBinder = "yes" else hasClosureBinder = "no") and
+  (if x.isAsync() then isAsync = "yes" else isAsync = "no") and
+  (if x.isConst() then isConst = "yes" else isConst = "no") and
+  (if x.isGen() then isGen = "yes" else isGen = "no") and
+  (if x.isMove() then isMove = "yes" else isMove = "no") and
+  (if x.isStatic() then isStatic = "yes" else isStatic = "no") and
+  if x.hasRetType() then hasRetType = "yes" else hasRetType = "no"
+select x, "hasParamList:", hasParamList, "getNumberOfAttrs:", getNumberOfAttrs, "hasBody:", hasBody,
+  "hasClosureBinder:", hasClosureBinder, "isAsync:", isAsync, "isConst:", isConst, "isGen:", isGen,
+  "isMove:", isMove, "isStatic:", isStatic, "hasRetType:", hasRetType
diff --git a/rust/ql/test/extractor-tests/generated/ClosureExpr/ClosureExpr_getArg.expected b/rust/ql/test/extractor-tests/generated/ClosureExpr/ClosureExpr_getArg.expected
deleted file mode 100644
index 41bbc86fb70..00000000000
--- a/rust/ql/test/extractor-tests/generated/ClosureExpr/ClosureExpr_getArg.expected
+++ /dev/null
@@ -1,6 +0,0 @@
-| gen_closure_expr.rs:5:5:5:13 | ClosureExpr | 0 | gen_closure_expr.rs:5:6:5:6 | IdentPat |
-| gen_closure_expr.rs:6:5:6:34 | ClosureExpr | 0 | gen_closure_expr.rs:6:11:6:11 | IdentPat |
-| gen_closure_expr.rs:7:5:7:27 | ClosureExpr | 0 | gen_closure_expr.rs:7:12:7:12 | IdentPat |
-| gen_closure_expr.rs:7:5:7:27 | ClosureExpr | 1 | gen_closure_expr.rs:7:20:7:20 | IdentPat |
-| gen_closure_expr.rs:8:6:9:15 | ClosureExpr | 0 | gen_closure_expr.rs:9:6:9:6 | IdentPat |
-| gen_closure_expr.rs:10:6:11:23 | ClosureExpr | 0 | gen_closure_expr.rs:11:14:11:14 | IdentPat |
diff --git a/rust/ql/test/extractor-tests/generated/ClosureExpr/ClosureExpr_getArgType.expected b/rust/ql/test/extractor-tests/generated/ClosureExpr/ClosureExpr_getArgType.expected
deleted file mode 100644
index dd1f87a74c1..00000000000
--- a/rust/ql/test/extractor-tests/generated/ClosureExpr/ClosureExpr_getArgType.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-| gen_closure_expr.rs:6:5:6:34 | ClosureExpr | 0 | file://:0:0:0:0 | TypeRef |
-| gen_closure_expr.rs:7:5:7:27 | ClosureExpr | 0 | file://:0:0:0:0 | TypeRef |
diff --git a/rust/ql/test/extractor-tests/generated/ClosureExpr/ClosureExpr_getArgType.ql b/rust/ql/test/extractor-tests/generated/ClosureExpr/ClosureExpr_getArgType.ql
deleted file mode 100644
index dcac99b7ed4..00000000000
--- a/rust/ql/test/extractor-tests/generated/ClosureExpr/ClosureExpr_getArgType.ql
+++ /dev/null
@@ -1,7 +0,0 @@
-// generated by codegen, do not edit
-import codeql.rust.elements
-import TestUtils
-
-from ClosureExpr x, int index
-where toBeTested(x) and not x.isUnknown()
-select x, index, x.getArgType(index)
diff --git a/rust/ql/test/extractor-tests/generated/ClosureExpr/ClosureExpr_getAttr.expected b/rust/ql/test/extractor-tests/generated/ClosureExpr/ClosureExpr_getAttr.expected
new file mode 100644
index 00000000000..f1859d594d1
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/ClosureExpr/ClosureExpr_getAttr.expected
@@ -0,0 +1,2 @@
+| gen_closure_expr.rs:8:6:9:15 | ClosureExpr | 0 | gen_closure_expr.rs:8:6:8:17 | Attr |
+| gen_closure_expr.rs:10:6:11:23 | ClosureExpr | 0 | gen_closure_expr.rs:10:6:10:17 | Attr |
diff --git a/rust/ql/test/extractor-tests/generated/ClosureExpr/ClosureExpr_getArg.ql b/rust/ql/test/extractor-tests/generated/ClosureExpr/ClosureExpr_getAttr.ql
similarity index 82%
rename from rust/ql/test/extractor-tests/generated/ClosureExpr/ClosureExpr_getArg.ql
rename to rust/ql/test/extractor-tests/generated/ClosureExpr/ClosureExpr_getAttr.ql
index f10c54f1ff3..b32da8e541b 100644
--- a/rust/ql/test/extractor-tests/generated/ClosureExpr/ClosureExpr_getArg.ql
+++ b/rust/ql/test/extractor-tests/generated/ClosureExpr/ClosureExpr_getAttr.ql
@@ -4,4 +4,4 @@ import TestUtils
 
 from ClosureExpr x, int index
 where toBeTested(x) and not x.isUnknown()
-select x, index, x.getArg(index)
+select x, index, x.getAttr(index)
diff --git a/rust/ql/test/extractor-tests/generated/ClosureExpr/ClosureExpr_getBody.expected b/rust/ql/test/extractor-tests/generated/ClosureExpr/ClosureExpr_getBody.expected
new file mode 100644
index 00000000000..71bc3cccda3
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/ClosureExpr/ClosureExpr_getBody.expected
@@ -0,0 +1,5 @@
+| gen_closure_expr.rs:5:5:5:13 | ClosureExpr | gen_closure_expr.rs:5:9:5:13 | ... + ... |
+| gen_closure_expr.rs:6:5:6:34 | ClosureExpr | gen_closure_expr.rs:6:26:6:34 | BlockExpr |
+| gen_closure_expr.rs:7:5:7:27 | ClosureExpr | gen_closure_expr.rs:7:23:7:27 | ... + ... |
+| gen_closure_expr.rs:8:6:9:15 | ClosureExpr | gen_closure_expr.rs:9:9:9:15 | YieldExpr |
+| gen_closure_expr.rs:10:6:11:23 | ClosureExpr | gen_closure_expr.rs:11:17:11:23 | YieldExpr |
diff --git a/rust/ql/test/extractor-tests/generated/ClosureExpr/ClosureExpr_getBody.ql b/rust/ql/test/extractor-tests/generated/ClosureExpr/ClosureExpr_getBody.ql
new file mode 100644
index 00000000000..cee8662cc44
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/ClosureExpr/ClosureExpr_getBody.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from ClosureExpr x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getBody()
diff --git a/rust/ql/test/extractor-tests/generated/ClosureExpr/ClosureExpr_getClosureBinder.expected b/rust/ql/test/extractor-tests/generated/ClosureExpr/ClosureExpr_getClosureBinder.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/ClosureExpr/ClosureExpr_getClosureBinder.ql b/rust/ql/test/extractor-tests/generated/ClosureExpr/ClosureExpr_getClosureBinder.ql
new file mode 100644
index 00000000000..fc838f8e254
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/ClosureExpr/ClosureExpr_getClosureBinder.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from ClosureExpr x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getClosureBinder()
diff --git a/rust/ql/test/extractor-tests/generated/ClosureExpr/ClosureExpr_getParamList.expected b/rust/ql/test/extractor-tests/generated/ClosureExpr/ClosureExpr_getParamList.expected
new file mode 100644
index 00000000000..d0e6aaeac06
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/ClosureExpr/ClosureExpr_getParamList.expected
@@ -0,0 +1,5 @@
+| gen_closure_expr.rs:5:5:5:13 | ClosureExpr | gen_closure_expr.rs:5:5:5:7 | ParamList |
+| gen_closure_expr.rs:6:5:6:34 | ClosureExpr | gen_closure_expr.rs:6:10:6:17 | ParamList |
+| gen_closure_expr.rs:7:5:7:27 | ClosureExpr | gen_closure_expr.rs:7:11:7:21 | ParamList |
+| gen_closure_expr.rs:8:6:9:15 | ClosureExpr | gen_closure_expr.rs:9:5:9:7 | ParamList |
+| gen_closure_expr.rs:10:6:11:23 | ClosureExpr | gen_closure_expr.rs:11:13:11:15 | ParamList |
diff --git a/rust/ql/test/extractor-tests/generated/ClosureExpr/ClosureExpr_getParamList.ql b/rust/ql/test/extractor-tests/generated/ClosureExpr/ClosureExpr_getParamList.ql
new file mode 100644
index 00000000000..d055aa69de3
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/ClosureExpr/ClosureExpr_getParamList.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from ClosureExpr x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getParamList()
diff --git a/rust/ql/test/extractor-tests/generated/ClosureExpr/ClosureExpr_getRetType.expected b/rust/ql/test/extractor-tests/generated/ClosureExpr/ClosureExpr_getRetType.expected
index 6decd91ca76..e018209cb53 100644
--- a/rust/ql/test/extractor-tests/generated/ClosureExpr/ClosureExpr_getRetType.expected
+++ b/rust/ql/test/extractor-tests/generated/ClosureExpr/ClosureExpr_getRetType.expected
@@ -1 +1 @@
-| gen_closure_expr.rs:6:5:6:34 | ClosureExpr | file://:0:0:0:0 | TypeRef |
+| gen_closure_expr.rs:6:5:6:34 | ClosureExpr | gen_closure_expr.rs:6:19:6:24 | RetType |
diff --git a/rust/ql/test/extractor-tests/generated/Comment/Comment.expected b/rust/ql/test/extractor-tests/generated/Comment/Comment.expected
new file mode 100644
index 00000000000..21861bb40bf
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/Comment/Comment.expected
@@ -0,0 +1,7 @@
+| comments.rs:1:1:3:2 | Comment | getParent: | comments.rs:1:1:9:1 | foo | getText: | /** \n* A doc comment\n*/ |
+| comments.rs:6:17:6:34 | Comment | getParent: | comments.rs:6:17:8:16 | nested | getText: | // print some text |
+| comments.rs:7:3:7:31 | Comment | getParent: | comments.rs:6:17:8:16 | nested | getText: | /// This is a nested function |
+| gen_comment.rs:1:1:1:36 | Comment | getParent: | gen_comment.rs:1:1:7:2 | SourceFile | getText: | // generated by codegen, do not edit |
+| gen_comment.rs:4:5:4:30 | Comment | getParent: | gen_comment.rs:3:25:7:1 | StmtList | getText: | // A comment. For example: |
+| gen_comment.rs:5:5:5:24 | Comment | getParent: | gen_comment.rs:3:25:7:1 | StmtList | getText: | // this is a comment |
+| gen_comment.rs:6:5:6:29 | Comment | getParent: | gen_comment.rs:3:25:7:1 | StmtList | getText: | /// This is a doc comment |
diff --git a/rust/ql/test/extractor-tests/generated/Comment/Comment.ql b/rust/ql/test/extractor-tests/generated/Comment/Comment.ql
new file mode 100644
index 00000000000..7e940186748
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/Comment/Comment.ql
@@ -0,0 +1,11 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from Comment x, AstNode getParent, string getText
+where
+  toBeTested(x) and
+  not x.isUnknown() and
+  getParent = x.getParent() and
+  getText = x.getText()
+select x, "getParent:", getParent, "getText:", getText
diff --git a/rust/ql/test/extractor-tests/generated/Comment/comments.rs b/rust/ql/test/extractor-tests/generated/Comment/comments.rs
new file mode 100644
index 00000000000..058f963a962
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/Comment/comments.rs
@@ -0,0 +1,10 @@
+/** 
+* A doc comment
+*/
+
+fn foo() {
+  print("foo"); // print some text
+  /// This is a nested function
+  fn nested() {}
+}
+
diff --git a/rust/ql/test/extractor-tests/generated/Comment/gen_comment.rs b/rust/ql/test/extractor-tests/generated/Comment/gen_comment.rs
new file mode 100644
index 00000000000..1e9682754d8
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/Comment/gen_comment.rs
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+
+fn test_comment() -> () {
+    // A comment. For example:
+    // this is a comment
+    /// This is a doc comment
+}
diff --git a/rust/ql/test/extractor-tests/generated/Const/Const.expected b/rust/ql/test/extractor-tests/generated/Const/Const.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/Const/Const.ql b/rust/ql/test/extractor-tests/generated/Const/Const.ql
new file mode 100644
index 00000000000..125943f40a0
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/Const/Const.ql
@@ -0,0 +1,27 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from
+  Const x, string hasExtendedCanonicalPath, string hasCrateOrigin, int getNumberOfAttrs,
+  string hasBody, string isConst, string isDefault, string hasName, string hasTy,
+  string hasVisibility
+where
+  toBeTested(x) and
+  not x.isUnknown() and
+  (
+    if x.hasExtendedCanonicalPath()
+    then hasExtendedCanonicalPath = "yes"
+    else hasExtendedCanonicalPath = "no"
+  ) and
+  (if x.hasCrateOrigin() then hasCrateOrigin = "yes" else hasCrateOrigin = "no") and
+  getNumberOfAttrs = x.getNumberOfAttrs() and
+  (if x.hasBody() then hasBody = "yes" else hasBody = "no") and
+  (if x.isConst() then isConst = "yes" else isConst = "no") and
+  (if x.isDefault() then isDefault = "yes" else isDefault = "no") and
+  (if x.hasName() then hasName = "yes" else hasName = "no") and
+  (if x.hasTy() then hasTy = "yes" else hasTy = "no") and
+  if x.hasVisibility() then hasVisibility = "yes" else hasVisibility = "no"
+select x, "hasExtendedCanonicalPath:", hasExtendedCanonicalPath, "hasCrateOrigin:", hasCrateOrigin,
+  "getNumberOfAttrs:", getNumberOfAttrs, "hasBody:", hasBody, "isConst:", isConst, "isDefault:",
+  isDefault, "hasName:", hasName, "hasTy:", hasTy, "hasVisibility:", hasVisibility
diff --git a/rust/ql/test/extractor-tests/generated/Const/Const_getAttr.expected b/rust/ql/test/extractor-tests/generated/Const/Const_getAttr.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/Const/Const_getAttr.ql b/rust/ql/test/extractor-tests/generated/Const/Const_getAttr.ql
new file mode 100644
index 00000000000..0b4adeec093
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/Const/Const_getAttr.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from Const x, int index
+where toBeTested(x) and not x.isUnknown()
+select x, index, x.getAttr(index)
diff --git a/rust/ql/test/extractor-tests/generated/Const/Const_getBody.expected b/rust/ql/test/extractor-tests/generated/Const/Const_getBody.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/Const/Const_getBody.ql b/rust/ql/test/extractor-tests/generated/Const/Const_getBody.ql
new file mode 100644
index 00000000000..368aa82afb4
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/Const/Const_getBody.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from Const x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getBody()
diff --git a/rust/ql/test/extractor-tests/generated/Const/Const_getCrateOrigin.expected b/rust/ql/test/extractor-tests/generated/Const/Const_getCrateOrigin.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/Const/Const_getCrateOrigin.ql b/rust/ql/test/extractor-tests/generated/Const/Const_getCrateOrigin.ql
new file mode 100644
index 00000000000..644b9240980
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/Const/Const_getCrateOrigin.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from Const x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getCrateOrigin()
diff --git a/rust/ql/test/extractor-tests/generated/Const/Const_getExtendedCanonicalPath.expected b/rust/ql/test/extractor-tests/generated/Const/Const_getExtendedCanonicalPath.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/Const/Const_getExtendedCanonicalPath.ql b/rust/ql/test/extractor-tests/generated/Const/Const_getExtendedCanonicalPath.ql
new file mode 100644
index 00000000000..c11c4e0856d
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/Const/Const_getExtendedCanonicalPath.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from Const x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getExtendedCanonicalPath()
diff --git a/rust/ql/test/extractor-tests/generated/Const/Const_getName.expected b/rust/ql/test/extractor-tests/generated/Const/Const_getName.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/Const/Const_getName.ql b/rust/ql/test/extractor-tests/generated/Const/Const_getName.ql
new file mode 100644
index 00000000000..23698a012eb
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/Const/Const_getName.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from Const x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getName()
diff --git a/rust/ql/test/extractor-tests/generated/Const/Const_getTy.expected b/rust/ql/test/extractor-tests/generated/Const/Const_getTy.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/Const/Const_getTy.ql b/rust/ql/test/extractor-tests/generated/Const/Const_getTy.ql
new file mode 100644
index 00000000000..d133dcb5d38
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/Const/Const_getTy.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from Const x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getTy()
diff --git a/rust/ql/test/extractor-tests/generated/Const/Const_getVisibility.expected b/rust/ql/test/extractor-tests/generated/Const/Const_getVisibility.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/Const/Const_getVisibility.ql b/rust/ql/test/extractor-tests/generated/Const/Const_getVisibility.ql
new file mode 100644
index 00000000000..c0599d921a0
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/Const/Const_getVisibility.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from Const x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getVisibility()
diff --git a/rust/ql/test/extractor-tests/generated/Const/gen_const.rs b/rust/ql/test/extractor-tests/generated/Const/gen_const.rs
new file mode 100644
index 00000000000..32c17ef6c2b
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/Const/gen_const.rs
@@ -0,0 +1,6 @@
+// generated by codegen, do not edit
+
+fn test_const() -> () {
+    // A Const. For example:
+    todo!()
+}
diff --git a/rust/ql/test/extractor-tests/generated/ConstArg/ConstArg.expected b/rust/ql/test/extractor-tests/generated/ConstArg/ConstArg.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/ConstArg/ConstArg.ql b/rust/ql/test/extractor-tests/generated/ConstArg/ConstArg.ql
new file mode 100644
index 00000000000..4080bf099c4
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/ConstArg/ConstArg.ql
@@ -0,0 +1,10 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from ConstArg x, string hasExpr
+where
+  toBeTested(x) and
+  not x.isUnknown() and
+  if x.hasExpr() then hasExpr = "yes" else hasExpr = "no"
+select x, "hasExpr:", hasExpr
diff --git a/rust/ql/test/extractor-tests/generated/ConstArg/ConstArg_getExpr.expected b/rust/ql/test/extractor-tests/generated/ConstArg/ConstArg_getExpr.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/ConstArg/ConstArg_getExpr.ql b/rust/ql/test/extractor-tests/generated/ConstArg/ConstArg_getExpr.ql
new file mode 100644
index 00000000000..702328c2aac
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/ConstArg/ConstArg_getExpr.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from ConstArg x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getExpr()
diff --git a/rust/ql/test/extractor-tests/generated/ConstArg/gen_const_arg.rs b/rust/ql/test/extractor-tests/generated/ConstArg/gen_const_arg.rs
new file mode 100644
index 00000000000..ac9bd5d1551
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/ConstArg/gen_const_arg.rs
@@ -0,0 +1,6 @@
+// generated by codegen, do not edit
+
+fn test_const_arg() -> () {
+    // A ConstArg. For example:
+    todo!()
+}
diff --git a/rust/ql/test/extractor-tests/generated/ConstBlockPat/ConstBlockPat.expected b/rust/ql/test/extractor-tests/generated/ConstBlockPat/ConstBlockPat.expected
index 965df88445e..21feba1f729 100644
--- a/rust/ql/test/extractor-tests/generated/ConstBlockPat/ConstBlockPat.expected
+++ b/rust/ql/test/extractor-tests/generated/ConstBlockPat/ConstBlockPat.expected
@@ -1 +1 @@
-| gen_const_block_pat.rs:6:9:6:27 | ConstBlockPat | getExpr: | gen_const_block_pat.rs:6:15:6:27 | BlockExpr |
+| gen_const_block_pat.rs:6:9:6:27 | ConstBlockPat | hasBlockExpr: | yes | isConst: | yes |
diff --git a/rust/ql/test/extractor-tests/generated/ConstBlockPat/ConstBlockPat.ql b/rust/ql/test/extractor-tests/generated/ConstBlockPat/ConstBlockPat.ql
index b298a56e8c4..005f8a752c1 100644
--- a/rust/ql/test/extractor-tests/generated/ConstBlockPat/ConstBlockPat.ql
+++ b/rust/ql/test/extractor-tests/generated/ConstBlockPat/ConstBlockPat.ql
@@ -2,9 +2,10 @@
 import codeql.rust.elements
 import TestUtils
 
-from ConstBlockPat x, Expr getExpr
+from ConstBlockPat x, string hasBlockExpr, string isConst
 where
   toBeTested(x) and
   not x.isUnknown() and
-  getExpr = x.getExpr()
-select x, "getExpr:", getExpr
+  (if x.hasBlockExpr() then hasBlockExpr = "yes" else hasBlockExpr = "no") and
+  if x.isConst() then isConst = "yes" else isConst = "no"
+select x, "hasBlockExpr:", hasBlockExpr, "isConst:", isConst
diff --git a/rust/ql/test/extractor-tests/generated/ConstBlockPat/ConstBlockPat_getBlockExpr.expected b/rust/ql/test/extractor-tests/generated/ConstBlockPat/ConstBlockPat_getBlockExpr.expected
new file mode 100644
index 00000000000..58a885a4857
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/ConstBlockPat/ConstBlockPat_getBlockExpr.expected
@@ -0,0 +1 @@
+| gen_const_block_pat.rs:6:9:6:27 | ConstBlockPat | gen_const_block_pat.rs:6:15:6:27 | BlockExpr |
diff --git a/rust/ql/test/extractor-tests/generated/ConstBlockPat/ConstBlockPat_getBlockExpr.ql b/rust/ql/test/extractor-tests/generated/ConstBlockPat/ConstBlockPat_getBlockExpr.ql
new file mode 100644
index 00000000000..e2c0f644007
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/ConstBlockPat/ConstBlockPat_getBlockExpr.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from ConstBlockPat x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getBlockExpr()
diff --git a/rust/ql/test/extractor-tests/generated/ConstExpr/ConstExpr.expected b/rust/ql/test/extractor-tests/generated/ConstExpr/ConstExpr.expected
deleted file mode 100644
index b36d974f773..00000000000
--- a/rust/ql/test/extractor-tests/generated/ConstExpr/ConstExpr.expected
+++ /dev/null
@@ -1 +0,0 @@
-| gen_const_expr.rs:5:8:5:97 | ConstExpr | getExpr: | gen_const_expr.rs:5:8:5:97 | BlockExpr |
diff --git a/rust/ql/test/extractor-tests/generated/ConstExpr/gen_const_expr.rs b/rust/ql/test/extractor-tests/generated/ConstExpr/gen_const_expr.rs
deleted file mode 100644
index f23ce557961..00000000000
--- a/rust/ql/test/extractor-tests/generated/ConstExpr/gen_const_expr.rs
+++ /dev/null
@@ -1,8 +0,0 @@
-// generated by codegen, do not edit
-
-fn test_const_expr() -> bool {
-    // A `const` block expression. For example:
-    if const { SRC::IS_ZST || DEST::IS_ZST || mem::align_of::<SRC>() != mem::align_of::<DEST>() } {
-        return false;
-    }
-}
diff --git a/rust/ql/test/extractor-tests/generated/ConstParam/ConstParam.expected b/rust/ql/test/extractor-tests/generated/ConstParam/ConstParam.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/ConstParam/ConstParam.ql b/rust/ql/test/extractor-tests/generated/ConstParam/ConstParam.ql
new file mode 100644
index 00000000000..5988a54b4d1
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/ConstParam/ConstParam.ql
@@ -0,0 +1,17 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from
+  ConstParam x, int getNumberOfAttrs, string hasDefaultVal, string isConst, string hasName,
+  string hasTy
+where
+  toBeTested(x) and
+  not x.isUnknown() and
+  getNumberOfAttrs = x.getNumberOfAttrs() and
+  (if x.hasDefaultVal() then hasDefaultVal = "yes" else hasDefaultVal = "no") and
+  (if x.isConst() then isConst = "yes" else isConst = "no") and
+  (if x.hasName() then hasName = "yes" else hasName = "no") and
+  if x.hasTy() then hasTy = "yes" else hasTy = "no"
+select x, "getNumberOfAttrs:", getNumberOfAttrs, "hasDefaultVal:", hasDefaultVal, "isConst:",
+  isConst, "hasName:", hasName, "hasTy:", hasTy
diff --git a/rust/ql/test/extractor-tests/generated/ConstParam/ConstParam_getAttr.expected b/rust/ql/test/extractor-tests/generated/ConstParam/ConstParam_getAttr.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/ConstParam/ConstParam_getAttr.ql b/rust/ql/test/extractor-tests/generated/ConstParam/ConstParam_getAttr.ql
new file mode 100644
index 00000000000..ed8406eecef
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/ConstParam/ConstParam_getAttr.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from ConstParam x, int index
+where toBeTested(x) and not x.isUnknown()
+select x, index, x.getAttr(index)
diff --git a/rust/ql/test/extractor-tests/generated/ConstParam/ConstParam_getDefaultVal.expected b/rust/ql/test/extractor-tests/generated/ConstParam/ConstParam_getDefaultVal.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/ConstParam/ConstParam_getDefaultVal.ql b/rust/ql/test/extractor-tests/generated/ConstParam/ConstParam_getDefaultVal.ql
new file mode 100644
index 00000000000..f4af24f39b7
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/ConstParam/ConstParam_getDefaultVal.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from ConstParam x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getDefaultVal()
diff --git a/rust/ql/test/extractor-tests/generated/ConstParam/ConstParam_getName.expected b/rust/ql/test/extractor-tests/generated/ConstParam/ConstParam_getName.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/ConstParam/ConstParam_getName.ql b/rust/ql/test/extractor-tests/generated/ConstParam/ConstParam_getName.ql
new file mode 100644
index 00000000000..7c627d43650
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/ConstParam/ConstParam_getName.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from ConstParam x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getName()
diff --git a/rust/ql/test/extractor-tests/generated/ConstParam/ConstParam_getTy.expected b/rust/ql/test/extractor-tests/generated/ConstParam/ConstParam_getTy.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/ConstParam/ConstParam_getTy.ql b/rust/ql/test/extractor-tests/generated/ConstParam/ConstParam_getTy.ql
new file mode 100644
index 00000000000..9f9aa53542b
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/ConstParam/ConstParam_getTy.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from ConstParam x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getTy()
diff --git a/rust/ql/test/extractor-tests/generated/ConstParam/gen_const_param.rs b/rust/ql/test/extractor-tests/generated/ConstParam/gen_const_param.rs
new file mode 100644
index 00000000000..c0e3388f3e9
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/ConstParam/gen_const_param.rs
@@ -0,0 +1,6 @@
+// generated by codegen, do not edit
+
+fn test_const_param() -> () {
+    // A ConstParam. For example:
+    todo!()
+}
diff --git a/rust/ql/test/extractor-tests/generated/ContinueExpr/ContinueExpr.expected b/rust/ql/test/extractor-tests/generated/ContinueExpr/ContinueExpr.expected
index 5bc5e5fc666..ab921873d62 100644
--- a/rust/ql/test/extractor-tests/generated/ContinueExpr/ContinueExpr.expected
+++ b/rust/ql/test/extractor-tests/generated/ContinueExpr/ContinueExpr.expected
@@ -1,2 +1,2 @@
-| gen_continue_expr.rs:7:13:7:20 | ContinueExpr | hasLabel: | no |
-| gen_continue_expr.rs:12:13:12:27 | ContinueExpr | hasLabel: | yes |
+| gen_continue_expr.rs:7:13:7:20 | ContinueExpr | getNumberOfAttrs: | 0 | hasLifetime: | no |
+| gen_continue_expr.rs:12:13:12:27 | ContinueExpr | getNumberOfAttrs: | 0 | hasLifetime: | yes |
diff --git a/rust/ql/test/extractor-tests/generated/ContinueExpr/ContinueExpr.ql b/rust/ql/test/extractor-tests/generated/ContinueExpr/ContinueExpr.ql
index 89fe9d7021c..9d2e2d5177d 100644
--- a/rust/ql/test/extractor-tests/generated/ContinueExpr/ContinueExpr.ql
+++ b/rust/ql/test/extractor-tests/generated/ContinueExpr/ContinueExpr.ql
@@ -2,9 +2,10 @@
 import codeql.rust.elements
 import TestUtils
 
-from ContinueExpr x, string hasLabel
+from ContinueExpr x, int getNumberOfAttrs, string hasLifetime
 where
   toBeTested(x) and
   not x.isUnknown() and
-  if x.hasLabel() then hasLabel = "yes" else hasLabel = "no"
-select x, "hasLabel:", hasLabel
+  getNumberOfAttrs = x.getNumberOfAttrs() and
+  if x.hasLifetime() then hasLifetime = "yes" else hasLifetime = "no"
+select x, "getNumberOfAttrs:", getNumberOfAttrs, "hasLifetime:", hasLifetime
diff --git a/rust/ql/test/extractor-tests/generated/ContinueExpr/ContinueExpr_getAttr.expected b/rust/ql/test/extractor-tests/generated/ContinueExpr/ContinueExpr_getAttr.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/ContinueExpr/ContinueExpr_getAttr.ql b/rust/ql/test/extractor-tests/generated/ContinueExpr/ContinueExpr_getAttr.ql
new file mode 100644
index 00000000000..d6166fe4a29
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/ContinueExpr/ContinueExpr_getAttr.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from ContinueExpr x, int index
+where toBeTested(x) and not x.isUnknown()
+select x, index, x.getAttr(index)
diff --git a/rust/ql/test/extractor-tests/generated/ContinueExpr/ContinueExpr_getLabel.expected b/rust/ql/test/extractor-tests/generated/ContinueExpr/ContinueExpr_getLifetime.expected
similarity index 65%
rename from rust/ql/test/extractor-tests/generated/ContinueExpr/ContinueExpr_getLabel.expected
rename to rust/ql/test/extractor-tests/generated/ContinueExpr/ContinueExpr_getLifetime.expected
index 8688627b27e..525d2bb55a8 100644
--- a/rust/ql/test/extractor-tests/generated/ContinueExpr/ContinueExpr_getLabel.expected
+++ b/rust/ql/test/extractor-tests/generated/ContinueExpr/ContinueExpr_getLifetime.expected
@@ -1 +1 @@
-| gen_continue_expr.rs:12:13:12:27 | ContinueExpr | gen_continue_expr.rs:10:5:10:11 | Label |
+| gen_continue_expr.rs:12:13:12:27 | ContinueExpr | gen_continue_expr.rs:12:22:12:27 | Lifetime |
diff --git a/rust/ql/test/extractor-tests/generated/ContinueExpr/ContinueExpr_getLifetime.ql b/rust/ql/test/extractor-tests/generated/ContinueExpr/ContinueExpr_getLifetime.ql
new file mode 100644
index 00000000000..89bc6f68dd3
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/ContinueExpr/ContinueExpr_getLifetime.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from ContinueExpr x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getLifetime()
diff --git a/rust/ql/test/extractor-tests/generated/DynTraitType/DynTraitType.expected b/rust/ql/test/extractor-tests/generated/DynTraitType/DynTraitType.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/DynTraitType/DynTraitType.ql b/rust/ql/test/extractor-tests/generated/DynTraitType/DynTraitType.ql
new file mode 100644
index 00000000000..ad7a7e7101e
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/DynTraitType/DynTraitType.ql
@@ -0,0 +1,10 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from DynTraitType x, string hasTypeBoundList
+where
+  toBeTested(x) and
+  not x.isUnknown() and
+  if x.hasTypeBoundList() then hasTypeBoundList = "yes" else hasTypeBoundList = "no"
+select x, "hasTypeBoundList:", hasTypeBoundList
diff --git a/rust/ql/test/extractor-tests/generated/DynTraitType/DynTraitType_getTypeBoundList.expected b/rust/ql/test/extractor-tests/generated/DynTraitType/DynTraitType_getTypeBoundList.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/DynTraitType/DynTraitType_getTypeBoundList.ql b/rust/ql/test/extractor-tests/generated/DynTraitType/DynTraitType_getTypeBoundList.ql
new file mode 100644
index 00000000000..bd63c4c6e3b
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/DynTraitType/DynTraitType_getTypeBoundList.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from DynTraitType x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getTypeBoundList()
diff --git a/rust/ql/test/extractor-tests/generated/DynTraitType/gen_dyn_trait_type.rs b/rust/ql/test/extractor-tests/generated/DynTraitType/gen_dyn_trait_type.rs
new file mode 100644
index 00000000000..511d9b782c0
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/DynTraitType/gen_dyn_trait_type.rs
@@ -0,0 +1,6 @@
+// generated by codegen, do not edit
+
+fn test_dyn_trait_type() -> () {
+    // A DynTraitType. For example:
+    todo!()
+}
diff --git a/rust/ql/test/extractor-tests/generated/ElementListExpr/ElementListExpr.expected b/rust/ql/test/extractor-tests/generated/ElementListExpr/ElementListExpr.expected
deleted file mode 100644
index 8d6bdea6775..00000000000
--- a/rust/ql/test/extractor-tests/generated/ElementListExpr/ElementListExpr.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-| gen_element_list_expr.rs:5:5:5:19 | ElementListExpr | getNumberOfElements: | 5 | isAssigneeExpr: | no |
-| gen_element_list_expr.rs:6:5:6:19 | ElementListExpr | getNumberOfElements: | 5 | isAssigneeExpr: | yes |
diff --git a/rust/ql/test/extractor-tests/generated/ElementListExpr/ElementListExpr.ql b/rust/ql/test/extractor-tests/generated/ElementListExpr/ElementListExpr.ql
deleted file mode 100644
index 38b861e7db0..00000000000
--- a/rust/ql/test/extractor-tests/generated/ElementListExpr/ElementListExpr.ql
+++ /dev/null
@@ -1,11 +0,0 @@
-// generated by codegen, do not edit
-import codeql.rust.elements
-import TestUtils
-
-from ElementListExpr x, int getNumberOfElements, string isAssigneeExpr
-where
-  toBeTested(x) and
-  not x.isUnknown() and
-  getNumberOfElements = x.getNumberOfElements() and
-  if x.isAssigneeExpr() then isAssigneeExpr = "yes" else isAssigneeExpr = "no"
-select x, "getNumberOfElements:", getNumberOfElements, "isAssigneeExpr:", isAssigneeExpr
diff --git a/rust/ql/test/extractor-tests/generated/ElementListExpr/ElementListExpr_getElement.expected b/rust/ql/test/extractor-tests/generated/ElementListExpr/ElementListExpr_getElement.expected
deleted file mode 100644
index 8bed9878b6e..00000000000
--- a/rust/ql/test/extractor-tests/generated/ElementListExpr/ElementListExpr_getElement.expected
+++ /dev/null
@@ -1,10 +0,0 @@
-| gen_element_list_expr.rs:5:5:5:19 | ElementListExpr | 0 | gen_element_list_expr.rs:5:6:5:6 | LiteralExpr |
-| gen_element_list_expr.rs:5:5:5:19 | ElementListExpr | 1 | gen_element_list_expr.rs:5:9:5:9 | LiteralExpr |
-| gen_element_list_expr.rs:5:5:5:19 | ElementListExpr | 2 | gen_element_list_expr.rs:5:12:5:12 | LiteralExpr |
-| gen_element_list_expr.rs:5:5:5:19 | ElementListExpr | 3 | gen_element_list_expr.rs:5:15:5:15 | LiteralExpr |
-| gen_element_list_expr.rs:5:5:5:19 | ElementListExpr | 4 | gen_element_list_expr.rs:5:18:5:18 | LiteralExpr |
-| gen_element_list_expr.rs:6:5:6:19 | ElementListExpr | 0 | gen_element_list_expr.rs:6:6:6:6 | LiteralExpr |
-| gen_element_list_expr.rs:6:5:6:19 | ElementListExpr | 1 | gen_element_list_expr.rs:6:9:6:9 | LiteralExpr |
-| gen_element_list_expr.rs:6:5:6:19 | ElementListExpr | 2 | gen_element_list_expr.rs:6:12:6:12 | LiteralExpr |
-| gen_element_list_expr.rs:6:5:6:19 | ElementListExpr | 3 | gen_element_list_expr.rs:6:15:6:15 | LiteralExpr |
-| gen_element_list_expr.rs:6:5:6:19 | ElementListExpr | 4 | gen_element_list_expr.rs:6:18:6:18 | LiteralExpr |
diff --git a/rust/ql/test/extractor-tests/generated/ElementListExpr/ElementListExpr_getElement.ql b/rust/ql/test/extractor-tests/generated/ElementListExpr/ElementListExpr_getElement.ql
deleted file mode 100644
index b66322849c4..00000000000
--- a/rust/ql/test/extractor-tests/generated/ElementListExpr/ElementListExpr_getElement.ql
+++ /dev/null
@@ -1,7 +0,0 @@
-// generated by codegen, do not edit
-import codeql.rust.elements
-import TestUtils
-
-from ElementListExpr x, int index
-where toBeTested(x) and not x.isUnknown()
-select x, index, x.getElement(index)
diff --git a/rust/ql/test/extractor-tests/generated/ElementListExpr/gen_element_list_expr.rs b/rust/ql/test/extractor-tests/generated/ElementListExpr/gen_element_list_expr.rs
deleted file mode 100644
index d074b0a2553..00000000000
--- a/rust/ql/test/extractor-tests/generated/ElementListExpr/gen_element_list_expr.rs
+++ /dev/null
@@ -1,7 +0,0 @@
-// generated by codegen, do not edit
-
-fn test_element_list_expr() -> () {
-    // An element list expression. For example:
-    [1, 2, 3, 4, 5];
-    [1, 2, 3, 4, 5][0] = 6;
-}
diff --git a/rust/ql/test/extractor-tests/generated/Enum/Enum.expected b/rust/ql/test/extractor-tests/generated/Enum/Enum.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/Enum/Enum.ql b/rust/ql/test/extractor-tests/generated/Enum/Enum.ql
new file mode 100644
index 00000000000..3468056c072
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/Enum/Enum.ql
@@ -0,0 +1,27 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from
+  Enum x, string hasExtendedCanonicalPath, string hasCrateOrigin, int getNumberOfAttrs,
+  string hasGenericParamList, string hasName, string hasVariantList, string hasVisibility,
+  string hasWhereClause
+where
+  toBeTested(x) and
+  not x.isUnknown() and
+  (
+    if x.hasExtendedCanonicalPath()
+    then hasExtendedCanonicalPath = "yes"
+    else hasExtendedCanonicalPath = "no"
+  ) and
+  (if x.hasCrateOrigin() then hasCrateOrigin = "yes" else hasCrateOrigin = "no") and
+  getNumberOfAttrs = x.getNumberOfAttrs() and
+  (if x.hasGenericParamList() then hasGenericParamList = "yes" else hasGenericParamList = "no") and
+  (if x.hasName() then hasName = "yes" else hasName = "no") and
+  (if x.hasVariantList() then hasVariantList = "yes" else hasVariantList = "no") and
+  (if x.hasVisibility() then hasVisibility = "yes" else hasVisibility = "no") and
+  if x.hasWhereClause() then hasWhereClause = "yes" else hasWhereClause = "no"
+select x, "hasExtendedCanonicalPath:", hasExtendedCanonicalPath, "hasCrateOrigin:", hasCrateOrigin,
+  "getNumberOfAttrs:", getNumberOfAttrs, "hasGenericParamList:", hasGenericParamList, "hasName:",
+  hasName, "hasVariantList:", hasVariantList, "hasVisibility:", hasVisibility, "hasWhereClause:",
+  hasWhereClause
diff --git a/rust/ql/test/extractor-tests/generated/Enum/Enum_getAttr.expected b/rust/ql/test/extractor-tests/generated/Enum/Enum_getAttr.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/Enum/Enum_getAttr.ql b/rust/ql/test/extractor-tests/generated/Enum/Enum_getAttr.ql
new file mode 100644
index 00000000000..b2ffb4b5666
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/Enum/Enum_getAttr.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from Enum x, int index
+where toBeTested(x) and not x.isUnknown()
+select x, index, x.getAttr(index)
diff --git a/rust/ql/test/extractor-tests/generated/Enum/Enum_getCrateOrigin.expected b/rust/ql/test/extractor-tests/generated/Enum/Enum_getCrateOrigin.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/Enum/Enum_getCrateOrigin.ql b/rust/ql/test/extractor-tests/generated/Enum/Enum_getCrateOrigin.ql
new file mode 100644
index 00000000000..07fdc2fe5cd
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/Enum/Enum_getCrateOrigin.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from Enum x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getCrateOrigin()
diff --git a/rust/ql/test/extractor-tests/generated/Enum/Enum_getExtendedCanonicalPath.expected b/rust/ql/test/extractor-tests/generated/Enum/Enum_getExtendedCanonicalPath.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/Enum/Enum_getExtendedCanonicalPath.ql b/rust/ql/test/extractor-tests/generated/Enum/Enum_getExtendedCanonicalPath.ql
new file mode 100644
index 00000000000..fa456ecd9d0
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/Enum/Enum_getExtendedCanonicalPath.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from Enum x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getExtendedCanonicalPath()
diff --git a/rust/ql/test/extractor-tests/generated/Enum/Enum_getGenericParamList.expected b/rust/ql/test/extractor-tests/generated/Enum/Enum_getGenericParamList.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/Enum/Enum_getGenericParamList.ql b/rust/ql/test/extractor-tests/generated/Enum/Enum_getGenericParamList.ql
new file mode 100644
index 00000000000..79486fad3eb
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/Enum/Enum_getGenericParamList.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from Enum x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getGenericParamList()
diff --git a/rust/ql/test/extractor-tests/generated/Enum/Enum_getName.expected b/rust/ql/test/extractor-tests/generated/Enum/Enum_getName.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/Enum/Enum_getName.ql b/rust/ql/test/extractor-tests/generated/Enum/Enum_getName.ql
new file mode 100644
index 00000000000..218e5ee494b
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/Enum/Enum_getName.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from Enum x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getName()
diff --git a/rust/ql/test/extractor-tests/generated/Enum/Enum_getVariantList.expected b/rust/ql/test/extractor-tests/generated/Enum/Enum_getVariantList.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/Enum/Enum_getVariantList.ql b/rust/ql/test/extractor-tests/generated/Enum/Enum_getVariantList.ql
new file mode 100644
index 00000000000..35af7d9d396
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/Enum/Enum_getVariantList.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from Enum x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getVariantList()
diff --git a/rust/ql/test/extractor-tests/generated/Enum/Enum_getVisibility.expected b/rust/ql/test/extractor-tests/generated/Enum/Enum_getVisibility.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/Enum/Enum_getVisibility.ql b/rust/ql/test/extractor-tests/generated/Enum/Enum_getVisibility.ql
new file mode 100644
index 00000000000..b437e30e2ca
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/Enum/Enum_getVisibility.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from Enum x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getVisibility()
diff --git a/rust/ql/test/extractor-tests/generated/Enum/Enum_getWhereClause.expected b/rust/ql/test/extractor-tests/generated/Enum/Enum_getWhereClause.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/Enum/Enum_getWhereClause.ql b/rust/ql/test/extractor-tests/generated/Enum/Enum_getWhereClause.ql
new file mode 100644
index 00000000000..b9aaa3f3499
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/Enum/Enum_getWhereClause.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from Enum x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getWhereClause()
diff --git a/rust/ql/test/extractor-tests/generated/Enum/gen_enum.rs b/rust/ql/test/extractor-tests/generated/Enum/gen_enum.rs
new file mode 100644
index 00000000000..0711920e4ca
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/Enum/gen_enum.rs
@@ -0,0 +1,6 @@
+// generated by codegen, do not edit
+
+fn test_enum() -> () {
+    // A Enum. For example:
+    todo!()
+}
diff --git a/rust/ql/test/extractor-tests/generated/ExprStmt/ExprStmt.expected b/rust/ql/test/extractor-tests/generated/ExprStmt/ExprStmt.expected
index 38497d3afab..61f85c10f9e 100644
--- a/rust/ql/test/extractor-tests/generated/ExprStmt/ExprStmt.expected
+++ b/rust/ql/test/extractor-tests/generated/ExprStmt/ExprStmt.expected
@@ -1,2 +1,2 @@
-| gen_expr_stmt.rs:5:5:5:11 | ExprStmt | getExpr: | gen_expr_stmt.rs:5:5:5:11 | CallExpr | hasSemicolon: | yes |
-| gen_expr_stmt.rs:6:5:6:12 | ExprStmt | getExpr: | gen_expr_stmt.rs:6:5:6:12 | CallExpr | hasSemicolon: | no |
+| gen_expr_stmt.rs:5:5:5:12 | ExprStmt | hasExpr: | yes |
+| gen_expr_stmt.rs:6:5:6:13 | ExprStmt | hasExpr: | yes |
diff --git a/rust/ql/test/extractor-tests/generated/ExprStmt/ExprStmt.ql b/rust/ql/test/extractor-tests/generated/ExprStmt/ExprStmt.ql
index 4e6d5ab9d19..977516d1eea 100644
--- a/rust/ql/test/extractor-tests/generated/ExprStmt/ExprStmt.ql
+++ b/rust/ql/test/extractor-tests/generated/ExprStmt/ExprStmt.ql
@@ -2,10 +2,9 @@
 import codeql.rust.elements
 import TestUtils
 
-from ExprStmt x, Expr getExpr, string hasSemicolon
+from ExprStmt x, string hasExpr
 where
   toBeTested(x) and
   not x.isUnknown() and
-  getExpr = x.getExpr() and
-  if x.hasSemicolon() then hasSemicolon = "yes" else hasSemicolon = "no"
-select x, "getExpr:", getExpr, "hasSemicolon:", hasSemicolon
+  if x.hasExpr() then hasExpr = "yes" else hasExpr = "no"
+select x, "hasExpr:", hasExpr
diff --git a/rust/ql/test/extractor-tests/generated/ExprStmt/ExprStmt_getExpr.expected b/rust/ql/test/extractor-tests/generated/ExprStmt/ExprStmt_getExpr.expected
new file mode 100644
index 00000000000..f29a7f83d7d
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/ExprStmt/ExprStmt_getExpr.expected
@@ -0,0 +1,2 @@
+| gen_expr_stmt.rs:5:5:5:12 | ExprStmt | gen_expr_stmt.rs:5:5:5:11 | CallExpr |
+| gen_expr_stmt.rs:6:5:6:13 | ExprStmt | gen_expr_stmt.rs:6:5:6:12 | CallExpr |
diff --git a/rust/ql/test/extractor-tests/generated/ExprStmt/ExprStmt_getExpr.ql b/rust/ql/test/extractor-tests/generated/ExprStmt/ExprStmt_getExpr.ql
new file mode 100644
index 00000000000..df142202a02
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/ExprStmt/ExprStmt_getExpr.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from ExprStmt x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getExpr()
diff --git a/rust/ql/test/extractor-tests/generated/ExprStmt/gen_expr_stmt.rs b/rust/ql/test/extractor-tests/generated/ExprStmt/gen_expr_stmt.rs
index bf6d4f667f2..31a3c227cc5 100644
--- a/rust/ql/test/extractor-tests/generated/ExprStmt/gen_expr_stmt.rs
+++ b/rust/ql/test/extractor-tests/generated/ExprStmt/gen_expr_stmt.rs
@@ -3,6 +3,6 @@
 fn test_expr_stmt() -> () {
     // An expression statement. For example:
     start();
-    finish()
+    finish();
     use std::env;
 }
diff --git a/rust/ql/test/extractor-tests/generated/ExternBlock/ExternBlock.expected b/rust/ql/test/extractor-tests/generated/ExternBlock/ExternBlock.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/ExternBlock/ExternBlock.ql b/rust/ql/test/extractor-tests/generated/ExternBlock/ExternBlock.ql
new file mode 100644
index 00000000000..3d58a471412
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/ExternBlock/ExternBlock.ql
@@ -0,0 +1,23 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from
+  ExternBlock x, string hasExtendedCanonicalPath, string hasCrateOrigin, string hasAbi,
+  int getNumberOfAttrs, string hasExternItemList, string isUnsafe
+where
+  toBeTested(x) and
+  not x.isUnknown() and
+  (
+    if x.hasExtendedCanonicalPath()
+    then hasExtendedCanonicalPath = "yes"
+    else hasExtendedCanonicalPath = "no"
+  ) and
+  (if x.hasCrateOrigin() then hasCrateOrigin = "yes" else hasCrateOrigin = "no") and
+  (if x.hasAbi() then hasAbi = "yes" else hasAbi = "no") and
+  getNumberOfAttrs = x.getNumberOfAttrs() and
+  (if x.hasExternItemList() then hasExternItemList = "yes" else hasExternItemList = "no") and
+  if x.isUnsafe() then isUnsafe = "yes" else isUnsafe = "no"
+select x, "hasExtendedCanonicalPath:", hasExtendedCanonicalPath, "hasCrateOrigin:", hasCrateOrigin,
+  "hasAbi:", hasAbi, "getNumberOfAttrs:", getNumberOfAttrs, "hasExternItemList:", hasExternItemList,
+  "isUnsafe:", isUnsafe
diff --git a/rust/ql/test/extractor-tests/generated/ExternBlock/ExternBlock_getAbi.expected b/rust/ql/test/extractor-tests/generated/ExternBlock/ExternBlock_getAbi.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/ExternBlock/ExternBlock_getAbi.ql b/rust/ql/test/extractor-tests/generated/ExternBlock/ExternBlock_getAbi.ql
new file mode 100644
index 00000000000..d713045ef75
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/ExternBlock/ExternBlock_getAbi.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from ExternBlock x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getAbi()
diff --git a/rust/ql/test/extractor-tests/generated/ExternBlock/ExternBlock_getAttr.expected b/rust/ql/test/extractor-tests/generated/ExternBlock/ExternBlock_getAttr.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/ExternBlock/ExternBlock_getAttr.ql b/rust/ql/test/extractor-tests/generated/ExternBlock/ExternBlock_getAttr.ql
new file mode 100644
index 00000000000..2ac7fc2aa72
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/ExternBlock/ExternBlock_getAttr.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from ExternBlock x, int index
+where toBeTested(x) and not x.isUnknown()
+select x, index, x.getAttr(index)
diff --git a/rust/ql/test/extractor-tests/generated/ExternBlock/ExternBlock_getCrateOrigin.expected b/rust/ql/test/extractor-tests/generated/ExternBlock/ExternBlock_getCrateOrigin.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/ExternBlock/ExternBlock_getCrateOrigin.ql b/rust/ql/test/extractor-tests/generated/ExternBlock/ExternBlock_getCrateOrigin.ql
new file mode 100644
index 00000000000..5be455fe7d2
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/ExternBlock/ExternBlock_getCrateOrigin.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from ExternBlock x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getCrateOrigin()
diff --git a/rust/ql/test/extractor-tests/generated/ExternBlock/ExternBlock_getExtendedCanonicalPath.expected b/rust/ql/test/extractor-tests/generated/ExternBlock/ExternBlock_getExtendedCanonicalPath.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/ExternBlock/ExternBlock_getExtendedCanonicalPath.ql b/rust/ql/test/extractor-tests/generated/ExternBlock/ExternBlock_getExtendedCanonicalPath.ql
new file mode 100644
index 00000000000..f0bd607a179
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/ExternBlock/ExternBlock_getExtendedCanonicalPath.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from ExternBlock x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getExtendedCanonicalPath()
diff --git a/rust/ql/test/extractor-tests/generated/ExternBlock/ExternBlock_getExternItemList.expected b/rust/ql/test/extractor-tests/generated/ExternBlock/ExternBlock_getExternItemList.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/ExternBlock/ExternBlock_getExternItemList.ql b/rust/ql/test/extractor-tests/generated/ExternBlock/ExternBlock_getExternItemList.ql
new file mode 100644
index 00000000000..6d04cb67441
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/ExternBlock/ExternBlock_getExternItemList.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from ExternBlock x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getExternItemList()
diff --git a/rust/ql/test/extractor-tests/generated/ExternBlock/gen_extern_block.rs b/rust/ql/test/extractor-tests/generated/ExternBlock/gen_extern_block.rs
new file mode 100644
index 00000000000..8ba8ca6532a
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/ExternBlock/gen_extern_block.rs
@@ -0,0 +1,6 @@
+// generated by codegen, do not edit
+
+fn test_extern_block() -> () {
+    // A ExternBlock. For example:
+    todo!()
+}
diff --git a/rust/ql/test/extractor-tests/generated/ExternCrate/ExternCrate.expected b/rust/ql/test/extractor-tests/generated/ExternCrate/ExternCrate.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/ExternCrate/ExternCrate.ql b/rust/ql/test/extractor-tests/generated/ExternCrate/ExternCrate.ql
new file mode 100644
index 00000000000..547a2080864
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/ExternCrate/ExternCrate.ql
@@ -0,0 +1,23 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from
+  ExternCrate x, string hasExtendedCanonicalPath, string hasCrateOrigin, int getNumberOfAttrs,
+  string hasNameRef, string hasRename, string hasVisibility
+where
+  toBeTested(x) and
+  not x.isUnknown() and
+  (
+    if x.hasExtendedCanonicalPath()
+    then hasExtendedCanonicalPath = "yes"
+    else hasExtendedCanonicalPath = "no"
+  ) and
+  (if x.hasCrateOrigin() then hasCrateOrigin = "yes" else hasCrateOrigin = "no") and
+  getNumberOfAttrs = x.getNumberOfAttrs() and
+  (if x.hasNameRef() then hasNameRef = "yes" else hasNameRef = "no") and
+  (if x.hasRename() then hasRename = "yes" else hasRename = "no") and
+  if x.hasVisibility() then hasVisibility = "yes" else hasVisibility = "no"
+select x, "hasExtendedCanonicalPath:", hasExtendedCanonicalPath, "hasCrateOrigin:", hasCrateOrigin,
+  "getNumberOfAttrs:", getNumberOfAttrs, "hasNameRef:", hasNameRef, "hasRename:", hasRename,
+  "hasVisibility:", hasVisibility
diff --git a/rust/ql/test/extractor-tests/generated/ExternCrate/ExternCrate_getAttr.expected b/rust/ql/test/extractor-tests/generated/ExternCrate/ExternCrate_getAttr.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/ExternCrate/ExternCrate_getAttr.ql b/rust/ql/test/extractor-tests/generated/ExternCrate/ExternCrate_getAttr.ql
new file mode 100644
index 00000000000..68edd573a7a
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/ExternCrate/ExternCrate_getAttr.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from ExternCrate x, int index
+where toBeTested(x) and not x.isUnknown()
+select x, index, x.getAttr(index)
diff --git a/rust/ql/test/extractor-tests/generated/ExternCrate/ExternCrate_getCrateOrigin.expected b/rust/ql/test/extractor-tests/generated/ExternCrate/ExternCrate_getCrateOrigin.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/ExternCrate/ExternCrate_getCrateOrigin.ql b/rust/ql/test/extractor-tests/generated/ExternCrate/ExternCrate_getCrateOrigin.ql
new file mode 100644
index 00000000000..b6b74730fe4
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/ExternCrate/ExternCrate_getCrateOrigin.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from ExternCrate x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getCrateOrigin()
diff --git a/rust/ql/test/extractor-tests/generated/ExternCrate/ExternCrate_getExtendedCanonicalPath.expected b/rust/ql/test/extractor-tests/generated/ExternCrate/ExternCrate_getExtendedCanonicalPath.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/ExternCrate/ExternCrate_getExtendedCanonicalPath.ql b/rust/ql/test/extractor-tests/generated/ExternCrate/ExternCrate_getExtendedCanonicalPath.ql
new file mode 100644
index 00000000000..15959426eed
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/ExternCrate/ExternCrate_getExtendedCanonicalPath.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from ExternCrate x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getExtendedCanonicalPath()
diff --git a/rust/ql/test/extractor-tests/generated/ExternCrate/ExternCrate_getNameRef.expected b/rust/ql/test/extractor-tests/generated/ExternCrate/ExternCrate_getNameRef.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/AsyncBlockExpr/AsyncBlockExpr_getTail.ql b/rust/ql/test/extractor-tests/generated/ExternCrate/ExternCrate_getNameRef.ql
similarity index 73%
rename from rust/ql/test/extractor-tests/generated/AsyncBlockExpr/AsyncBlockExpr_getTail.ql
rename to rust/ql/test/extractor-tests/generated/ExternCrate/ExternCrate_getNameRef.ql
index 6feb1237027..3a9fcac3774 100644
--- a/rust/ql/test/extractor-tests/generated/AsyncBlockExpr/AsyncBlockExpr_getTail.ql
+++ b/rust/ql/test/extractor-tests/generated/ExternCrate/ExternCrate_getNameRef.ql
@@ -2,6 +2,6 @@
 import codeql.rust.elements
 import TestUtils
 
-from AsyncBlockExpr x
+from ExternCrate x
 where toBeTested(x) and not x.isUnknown()
-select x, x.getTail()
+select x, x.getNameRef()
diff --git a/rust/ql/test/extractor-tests/generated/ExternCrate/ExternCrate_getRename.expected b/rust/ql/test/extractor-tests/generated/ExternCrate/ExternCrate_getRename.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/ExternCrate/ExternCrate_getRename.ql b/rust/ql/test/extractor-tests/generated/ExternCrate/ExternCrate_getRename.ql
new file mode 100644
index 00000000000..82df3d60e05
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/ExternCrate/ExternCrate_getRename.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from ExternCrate x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getRename()
diff --git a/rust/ql/test/extractor-tests/generated/ExternCrate/ExternCrate_getVisibility.expected b/rust/ql/test/extractor-tests/generated/ExternCrate/ExternCrate_getVisibility.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/ExternCrate/ExternCrate_getVisibility.ql b/rust/ql/test/extractor-tests/generated/ExternCrate/ExternCrate_getVisibility.ql
new file mode 100644
index 00000000000..e7a9b316e1b
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/ExternCrate/ExternCrate_getVisibility.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from ExternCrate x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getVisibility()
diff --git a/rust/ql/test/extractor-tests/generated/ExternCrate/gen_extern_crate.rs b/rust/ql/test/extractor-tests/generated/ExternCrate/gen_extern_crate.rs
new file mode 100644
index 00000000000..88a4a7e0b9d
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/ExternCrate/gen_extern_crate.rs
@@ -0,0 +1,6 @@
+// generated by codegen, do not edit
+
+fn test_extern_crate() -> () {
+    // A ExternCrate. For example:
+    todo!()
+}
diff --git a/rust/ql/test/extractor-tests/generated/ExternItemList/ExternItemList.expected b/rust/ql/test/extractor-tests/generated/ExternItemList/ExternItemList.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/ExternItemList/ExternItemList.ql b/rust/ql/test/extractor-tests/generated/ExternItemList/ExternItemList.ql
new file mode 100644
index 00000000000..e9530f3c1aa
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/ExternItemList/ExternItemList.ql
@@ -0,0 +1,11 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from ExternItemList x, int getNumberOfAttrs, int getNumberOfExternItems
+where
+  toBeTested(x) and
+  not x.isUnknown() and
+  getNumberOfAttrs = x.getNumberOfAttrs() and
+  getNumberOfExternItems = x.getNumberOfExternItems()
+select x, "getNumberOfAttrs:", getNumberOfAttrs, "getNumberOfExternItems:", getNumberOfExternItems
diff --git a/rust/ql/test/extractor-tests/generated/ExternItemList/ExternItemList_getAttr.expected b/rust/ql/test/extractor-tests/generated/ExternItemList/ExternItemList_getAttr.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/ExternItemList/ExternItemList_getAttr.ql b/rust/ql/test/extractor-tests/generated/ExternItemList/ExternItemList_getAttr.ql
new file mode 100644
index 00000000000..33a1c2f4c5c
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/ExternItemList/ExternItemList_getAttr.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from ExternItemList x, int index
+where toBeTested(x) and not x.isUnknown()
+select x, index, x.getAttr(index)
diff --git a/rust/ql/test/extractor-tests/generated/ExternItemList/ExternItemList_getExternItem.expected b/rust/ql/test/extractor-tests/generated/ExternItemList/ExternItemList_getExternItem.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/ExternItemList/ExternItemList_getExternItem.ql b/rust/ql/test/extractor-tests/generated/ExternItemList/ExternItemList_getExternItem.ql
new file mode 100644
index 00000000000..d4be03a1d47
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/ExternItemList/ExternItemList_getExternItem.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from ExternItemList x, int index
+where toBeTested(x) and not x.isUnknown()
+select x, index, x.getExternItem(index)
diff --git a/rust/ql/test/extractor-tests/generated/ExternItemList/gen_extern_item_list.rs b/rust/ql/test/extractor-tests/generated/ExternItemList/gen_extern_item_list.rs
new file mode 100644
index 00000000000..80577fc78fb
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/ExternItemList/gen_extern_item_list.rs
@@ -0,0 +1,6 @@
+// generated by codegen, do not edit
+
+fn test_extern_item_list() -> () {
+    // A ExternItemList. For example:
+    todo!()
+}
diff --git a/rust/ql/test/extractor-tests/generated/FieldExpr/FieldExpr.expected b/rust/ql/test/extractor-tests/generated/FieldExpr/FieldExpr.expected
index 0ac28f7f13f..22dcb3c92e1 100644
--- a/rust/ql/test/extractor-tests/generated/FieldExpr/FieldExpr.expected
+++ b/rust/ql/test/extractor-tests/generated/FieldExpr/FieldExpr.expected
@@ -1 +1 @@
-| gen_field_expr.rs:5:5:5:9 | FieldExpr | getExpr: | gen_field_expr.rs:5:5:5:5 | PathExpr | getName: | foo |
+| gen_field_expr.rs:5:5:5:9 | FieldExpr | getNumberOfAttrs: | 0 | hasExpr: | yes | hasNameRef: | yes |
diff --git a/rust/ql/test/extractor-tests/generated/FieldExpr/FieldExpr.ql b/rust/ql/test/extractor-tests/generated/FieldExpr/FieldExpr.ql
index 72b068b1c87..1de84ec3427 100644
--- a/rust/ql/test/extractor-tests/generated/FieldExpr/FieldExpr.ql
+++ b/rust/ql/test/extractor-tests/generated/FieldExpr/FieldExpr.ql
@@ -2,10 +2,11 @@
 import codeql.rust.elements
 import TestUtils
 
-from FieldExpr x, Expr getExpr, string getName
+from FieldExpr x, int getNumberOfAttrs, string hasExpr, string hasNameRef
 where
   toBeTested(x) and
   not x.isUnknown() and
-  getExpr = x.getExpr() and
-  getName = x.getName()
-select x, "getExpr:", getExpr, "getName:", getName
+  getNumberOfAttrs = x.getNumberOfAttrs() and
+  (if x.hasExpr() then hasExpr = "yes" else hasExpr = "no") and
+  if x.hasNameRef() then hasNameRef = "yes" else hasNameRef = "no"
+select x, "getNumberOfAttrs:", getNumberOfAttrs, "hasExpr:", hasExpr, "hasNameRef:", hasNameRef
diff --git a/rust/ql/test/extractor-tests/generated/FieldExpr/FieldExpr_getAttr.expected b/rust/ql/test/extractor-tests/generated/FieldExpr/FieldExpr_getAttr.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/FieldExpr/FieldExpr_getAttr.ql b/rust/ql/test/extractor-tests/generated/FieldExpr/FieldExpr_getAttr.ql
new file mode 100644
index 00000000000..eeaad96fb6a
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/FieldExpr/FieldExpr_getAttr.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from FieldExpr x, int index
+where toBeTested(x) and not x.isUnknown()
+select x, index, x.getAttr(index)
diff --git a/rust/ql/test/extractor-tests/generated/FieldExpr/FieldExpr_getExpr.expected b/rust/ql/test/extractor-tests/generated/FieldExpr/FieldExpr_getExpr.expected
new file mode 100644
index 00000000000..32b13c1cb2b
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/FieldExpr/FieldExpr_getExpr.expected
@@ -0,0 +1 @@
+| gen_field_expr.rs:5:5:5:9 | FieldExpr | gen_field_expr.rs:5:5:5:5 | x |
diff --git a/rust/ql/test/extractor-tests/generated/FieldExpr/FieldExpr_getExpr.ql b/rust/ql/test/extractor-tests/generated/FieldExpr/FieldExpr_getExpr.ql
new file mode 100644
index 00000000000..e307cf26da0
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/FieldExpr/FieldExpr_getExpr.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from FieldExpr x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getExpr()
diff --git a/rust/ql/test/extractor-tests/generated/FieldExpr/FieldExpr_getNameRef.expected b/rust/ql/test/extractor-tests/generated/FieldExpr/FieldExpr_getNameRef.expected
new file mode 100644
index 00000000000..667f3130968
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/FieldExpr/FieldExpr_getNameRef.expected
@@ -0,0 +1 @@
+| gen_field_expr.rs:5:5:5:9 | FieldExpr | gen_field_expr.rs:5:7:5:9 | foo |
diff --git a/rust/ql/test/extractor-tests/generated/FieldExpr/FieldExpr_getNameRef.ql b/rust/ql/test/extractor-tests/generated/FieldExpr/FieldExpr_getNameRef.ql
new file mode 100644
index 00000000000..f87d456f2c0
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/FieldExpr/FieldExpr_getNameRef.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from FieldExpr x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getNameRef()
diff --git a/rust/ql/test/extractor-tests/generated/FnPtrType/FnPtrType.expected b/rust/ql/test/extractor-tests/generated/FnPtrType/FnPtrType.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/FnPtrType/FnPtrType.ql b/rust/ql/test/extractor-tests/generated/FnPtrType/FnPtrType.ql
new file mode 100644
index 00000000000..83cf90dec0a
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/FnPtrType/FnPtrType.ql
@@ -0,0 +1,18 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from
+  FnPtrType x, string hasAbi, string isAsync, string isConst, string isUnsafe, string hasParamList,
+  string hasRetType
+where
+  toBeTested(x) and
+  not x.isUnknown() and
+  (if x.hasAbi() then hasAbi = "yes" else hasAbi = "no") and
+  (if x.isAsync() then isAsync = "yes" else isAsync = "no") and
+  (if x.isConst() then isConst = "yes" else isConst = "no") and
+  (if x.isUnsafe() then isUnsafe = "yes" else isUnsafe = "no") and
+  (if x.hasParamList() then hasParamList = "yes" else hasParamList = "no") and
+  if x.hasRetType() then hasRetType = "yes" else hasRetType = "no"
+select x, "hasAbi:", hasAbi, "isAsync:", isAsync, "isConst:", isConst, "isUnsafe:", isUnsafe,
+  "hasParamList:", hasParamList, "hasRetType:", hasRetType
diff --git a/rust/ql/test/extractor-tests/generated/FnPtrType/FnPtrType_getAbi.expected b/rust/ql/test/extractor-tests/generated/FnPtrType/FnPtrType_getAbi.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/FnPtrType/FnPtrType_getAbi.ql b/rust/ql/test/extractor-tests/generated/FnPtrType/FnPtrType_getAbi.ql
new file mode 100644
index 00000000000..cfe7f4ba6fc
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/FnPtrType/FnPtrType_getAbi.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from FnPtrType x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getAbi()
diff --git a/rust/ql/test/extractor-tests/generated/FnPtrType/FnPtrType_getParamList.expected b/rust/ql/test/extractor-tests/generated/FnPtrType/FnPtrType_getParamList.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/FnPtrType/FnPtrType_getParamList.ql b/rust/ql/test/extractor-tests/generated/FnPtrType/FnPtrType_getParamList.ql
new file mode 100644
index 00000000000..718885c3be0
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/FnPtrType/FnPtrType_getParamList.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from FnPtrType x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getParamList()
diff --git a/rust/ql/test/extractor-tests/generated/FnPtrType/FnPtrType_getRetType.expected b/rust/ql/test/extractor-tests/generated/FnPtrType/FnPtrType_getRetType.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/FnPtrType/FnPtrType_getRetType.ql b/rust/ql/test/extractor-tests/generated/FnPtrType/FnPtrType_getRetType.ql
new file mode 100644
index 00000000000..39bece0dbeb
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/FnPtrType/FnPtrType_getRetType.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from FnPtrType x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getRetType()
diff --git a/rust/ql/test/extractor-tests/generated/FnPtrType/gen_fn_ptr_type.rs b/rust/ql/test/extractor-tests/generated/FnPtrType/gen_fn_ptr_type.rs
new file mode 100644
index 00000000000..6f58b0cc520
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/FnPtrType/gen_fn_ptr_type.rs
@@ -0,0 +1,6 @@
+// generated by codegen, do not edit
+
+fn test_fn_ptr_type() -> () {
+    // A FnPtrType. For example:
+    todo!()
+}
diff --git a/rust/ql/test/extractor-tests/generated/ForExpr/ForExpr.expected b/rust/ql/test/extractor-tests/generated/ForExpr/ForExpr.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/ForExpr/ForExpr.ql b/rust/ql/test/extractor-tests/generated/ForExpr/ForExpr.ql
new file mode 100644
index 00000000000..ef1999ff4a9
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/ForExpr/ForExpr.ql
@@ -0,0 +1,17 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from
+  ForExpr x, int getNumberOfAttrs, string hasIterable, string hasLabel, string hasLoopBody,
+  string hasPat
+where
+  toBeTested(x) and
+  not x.isUnknown() and
+  getNumberOfAttrs = x.getNumberOfAttrs() and
+  (if x.hasIterable() then hasIterable = "yes" else hasIterable = "no") and
+  (if x.hasLabel() then hasLabel = "yes" else hasLabel = "no") and
+  (if x.hasLoopBody() then hasLoopBody = "yes" else hasLoopBody = "no") and
+  if x.hasPat() then hasPat = "yes" else hasPat = "no"
+select x, "getNumberOfAttrs:", getNumberOfAttrs, "hasIterable:", hasIterable, "hasLabel:", hasLabel,
+  "hasLoopBody:", hasLoopBody, "hasPat:", hasPat
diff --git a/rust/ql/test/extractor-tests/generated/ForExpr/ForExpr_getAttr.expected b/rust/ql/test/extractor-tests/generated/ForExpr/ForExpr_getAttr.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/ForExpr/ForExpr_getAttr.ql b/rust/ql/test/extractor-tests/generated/ForExpr/ForExpr_getAttr.ql
new file mode 100644
index 00000000000..c348759b84e
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/ForExpr/ForExpr_getAttr.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from ForExpr x, int index
+where toBeTested(x) and not x.isUnknown()
+select x, index, x.getAttr(index)
diff --git a/rust/ql/test/extractor-tests/generated/ForExpr/ForExpr_getIterable.expected b/rust/ql/test/extractor-tests/generated/ForExpr/ForExpr_getIterable.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/ForExpr/ForExpr_getIterable.ql b/rust/ql/test/extractor-tests/generated/ForExpr/ForExpr_getIterable.ql
new file mode 100644
index 00000000000..74218990350
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/ForExpr/ForExpr_getIterable.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from ForExpr x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getIterable()
diff --git a/rust/ql/test/extractor-tests/generated/ForExpr/ForExpr_getLabel.expected b/rust/ql/test/extractor-tests/generated/ForExpr/ForExpr_getLabel.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/BreakExpr/BreakExpr_getLabel.ql b/rust/ql/test/extractor-tests/generated/ForExpr/ForExpr_getLabel.ql
similarity index 89%
rename from rust/ql/test/extractor-tests/generated/BreakExpr/BreakExpr_getLabel.ql
rename to rust/ql/test/extractor-tests/generated/ForExpr/ForExpr_getLabel.ql
index 7deb806e306..019495fcf98 100644
--- a/rust/ql/test/extractor-tests/generated/BreakExpr/BreakExpr_getLabel.ql
+++ b/rust/ql/test/extractor-tests/generated/ForExpr/ForExpr_getLabel.ql
@@ -2,6 +2,6 @@
 import codeql.rust.elements
 import TestUtils
 
-from BreakExpr x
+from ForExpr x
 where toBeTested(x) and not x.isUnknown()
 select x, x.getLabel()
diff --git a/rust/ql/test/extractor-tests/generated/ForExpr/ForExpr_getLoopBody.expected b/rust/ql/test/extractor-tests/generated/ForExpr/ForExpr_getLoopBody.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/ForExpr/ForExpr_getLoopBody.ql b/rust/ql/test/extractor-tests/generated/ForExpr/ForExpr_getLoopBody.ql
new file mode 100644
index 00000000000..5cc166fa96f
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/ForExpr/ForExpr_getLoopBody.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from ForExpr x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getLoopBody()
diff --git a/rust/ql/test/extractor-tests/generated/ForExpr/ForExpr_getPat.expected b/rust/ql/test/extractor-tests/generated/ForExpr/ForExpr_getPat.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/ForExpr/ForExpr_getPat.ql b/rust/ql/test/extractor-tests/generated/ForExpr/ForExpr_getPat.ql
new file mode 100644
index 00000000000..9f83218ea31
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/ForExpr/ForExpr_getPat.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from ForExpr x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getPat()
diff --git a/rust/ql/test/extractor-tests/generated/ForExpr/gen_for_expr.rs b/rust/ql/test/extractor-tests/generated/ForExpr/gen_for_expr.rs
new file mode 100644
index 00000000000..bda4a972556
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/ForExpr/gen_for_expr.rs
@@ -0,0 +1,6 @@
+// generated by codegen, do not edit
+
+fn test_for_expr() -> () {
+    // A ForExpr. For example:
+    todo!()
+}
diff --git a/rust/ql/test/extractor-tests/generated/ForType/ForType.expected b/rust/ql/test/extractor-tests/generated/ForType/ForType.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/ForType/ForType.ql b/rust/ql/test/extractor-tests/generated/ForType/ForType.ql
new file mode 100644
index 00000000000..fd98b365bfc
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/ForType/ForType.ql
@@ -0,0 +1,11 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from ForType x, string hasGenericParamList, string hasTy
+where
+  toBeTested(x) and
+  not x.isUnknown() and
+  (if x.hasGenericParamList() then hasGenericParamList = "yes" else hasGenericParamList = "no") and
+  if x.hasTy() then hasTy = "yes" else hasTy = "no"
+select x, "hasGenericParamList:", hasGenericParamList, "hasTy:", hasTy
diff --git a/rust/ql/test/extractor-tests/generated/ForType/ForType_getGenericParamList.expected b/rust/ql/test/extractor-tests/generated/ForType/ForType_getGenericParamList.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/ForType/ForType_getGenericParamList.ql b/rust/ql/test/extractor-tests/generated/ForType/ForType_getGenericParamList.ql
new file mode 100644
index 00000000000..7a2c53aba83
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/ForType/ForType_getGenericParamList.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from ForType x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getGenericParamList()
diff --git a/rust/ql/test/extractor-tests/generated/ForType/ForType_getTy.expected b/rust/ql/test/extractor-tests/generated/ForType/ForType_getTy.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/ForType/ForType_getTy.ql b/rust/ql/test/extractor-tests/generated/ForType/ForType_getTy.ql
new file mode 100644
index 00000000000..4ed564967a1
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/ForType/ForType_getTy.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from ForType x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getTy()
diff --git a/rust/ql/test/extractor-tests/generated/ForType/gen_for_type.rs b/rust/ql/test/extractor-tests/generated/ForType/gen_for_type.rs
new file mode 100644
index 00000000000..f44e4411a04
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/ForType/gen_for_type.rs
@@ -0,0 +1,6 @@
+// generated by codegen, do not edit
+
+fn test_for_type() -> () {
+    // A ForType. For example:
+    todo!()
+}
diff --git a/rust/ql/test/extractor-tests/generated/FormatArgsArg/FormatArgsArg.expected b/rust/ql/test/extractor-tests/generated/FormatArgsArg/FormatArgsArg.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/FormatArgsArg/FormatArgsArg.ql b/rust/ql/test/extractor-tests/generated/FormatArgsArg/FormatArgsArg.ql
new file mode 100644
index 00000000000..428bd82909f
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/FormatArgsArg/FormatArgsArg.ql
@@ -0,0 +1,11 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from FormatArgsArg x, string hasExpr, string hasName
+where
+  toBeTested(x) and
+  not x.isUnknown() and
+  (if x.hasExpr() then hasExpr = "yes" else hasExpr = "no") and
+  if x.hasName() then hasName = "yes" else hasName = "no"
+select x, "hasExpr:", hasExpr, "hasName:", hasName
diff --git a/rust/ql/test/extractor-tests/generated/FormatArgsArg/FormatArgsArg_getExpr.expected b/rust/ql/test/extractor-tests/generated/FormatArgsArg/FormatArgsArg_getExpr.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/FormatArgsArg/FormatArgsArg_getExpr.ql b/rust/ql/test/extractor-tests/generated/FormatArgsArg/FormatArgsArg_getExpr.ql
new file mode 100644
index 00000000000..ee67794f93a
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/FormatArgsArg/FormatArgsArg_getExpr.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from FormatArgsArg x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getExpr()
diff --git a/rust/ql/test/extractor-tests/generated/FormatArgsArg/FormatArgsArg_getName.expected b/rust/ql/test/extractor-tests/generated/FormatArgsArg/FormatArgsArg_getName.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/FormatArgsArg/FormatArgsArg_getName.ql b/rust/ql/test/extractor-tests/generated/FormatArgsArg/FormatArgsArg_getName.ql
new file mode 100644
index 00000000000..8f4bdb2a0c8
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/FormatArgsArg/FormatArgsArg_getName.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from FormatArgsArg x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getName()
diff --git a/rust/ql/test/extractor-tests/generated/FormatArgsArg/gen_format_args_arg.rs b/rust/ql/test/extractor-tests/generated/FormatArgsArg/gen_format_args_arg.rs
new file mode 100644
index 00000000000..6f189e15de6
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/FormatArgsArg/gen_format_args_arg.rs
@@ -0,0 +1,6 @@
+// generated by codegen, do not edit
+
+fn test_format_args_arg() -> () {
+    // A FormatArgsArg. For example:
+    todo!()
+}
diff --git a/rust/ql/test/extractor-tests/generated/FormatArgsExpr/FormatArgsExpr.expected b/rust/ql/test/extractor-tests/generated/FormatArgsExpr/FormatArgsExpr.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/FormatArgsExpr/FormatArgsExpr.ql b/rust/ql/test/extractor-tests/generated/FormatArgsExpr/FormatArgsExpr.ql
new file mode 100644
index 00000000000..4d5bcf05173
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/FormatArgsExpr/FormatArgsExpr.ql
@@ -0,0 +1,13 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from FormatArgsExpr x, int getNumberOfArgs, int getNumberOfAttrs, string hasTemplate
+where
+  toBeTested(x) and
+  not x.isUnknown() and
+  getNumberOfArgs = x.getNumberOfArgs() and
+  getNumberOfAttrs = x.getNumberOfAttrs() and
+  if x.hasTemplate() then hasTemplate = "yes" else hasTemplate = "no"
+select x, "getNumberOfArgs:", getNumberOfArgs, "getNumberOfAttrs:", getNumberOfAttrs,
+  "hasTemplate:", hasTemplate
diff --git a/rust/ql/test/extractor-tests/generated/FormatArgsExpr/FormatArgsExpr_getArg.expected b/rust/ql/test/extractor-tests/generated/FormatArgsExpr/FormatArgsExpr_getArg.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/CallExpr/CallExpr_getArg.ql b/rust/ql/test/extractor-tests/generated/FormatArgsExpr/FormatArgsExpr_getArg.ql
similarity index 82%
rename from rust/ql/test/extractor-tests/generated/CallExpr/CallExpr_getArg.ql
rename to rust/ql/test/extractor-tests/generated/FormatArgsExpr/FormatArgsExpr_getArg.ql
index 37483c3e637..1bf575a0f86 100644
--- a/rust/ql/test/extractor-tests/generated/CallExpr/CallExpr_getArg.ql
+++ b/rust/ql/test/extractor-tests/generated/FormatArgsExpr/FormatArgsExpr_getArg.ql
@@ -2,6 +2,6 @@
 import codeql.rust.elements
 import TestUtils
 
-from CallExpr x, int index
+from FormatArgsExpr x, int index
 where toBeTested(x) and not x.isUnknown()
 select x, index, x.getArg(index)
diff --git a/rust/ql/test/extractor-tests/generated/FormatArgsExpr/FormatArgsExpr_getAttr.expected b/rust/ql/test/extractor-tests/generated/FormatArgsExpr/FormatArgsExpr_getAttr.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/FormatArgsExpr/FormatArgsExpr_getAttr.ql b/rust/ql/test/extractor-tests/generated/FormatArgsExpr/FormatArgsExpr_getAttr.ql
new file mode 100644
index 00000000000..bfaf15b6ff5
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/FormatArgsExpr/FormatArgsExpr_getAttr.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from FormatArgsExpr x, int index
+where toBeTested(x) and not x.isUnknown()
+select x, index, x.getAttr(index)
diff --git a/rust/ql/test/extractor-tests/generated/FormatArgsExpr/FormatArgsExpr_getTemplate.expected b/rust/ql/test/extractor-tests/generated/FormatArgsExpr/FormatArgsExpr_getTemplate.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/FormatArgsExpr/FormatArgsExpr_getTemplate.ql b/rust/ql/test/extractor-tests/generated/FormatArgsExpr/FormatArgsExpr_getTemplate.ql
new file mode 100644
index 00000000000..b43b24ed4f2
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/FormatArgsExpr/FormatArgsExpr_getTemplate.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from FormatArgsExpr x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getTemplate()
diff --git a/rust/ql/test/extractor-tests/generated/FormatArgsExpr/gen_format_args_expr.rs b/rust/ql/test/extractor-tests/generated/FormatArgsExpr/gen_format_args_expr.rs
new file mode 100644
index 00000000000..7345a633ba5
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/FormatArgsExpr/gen_format_args_expr.rs
@@ -0,0 +1,6 @@
+// generated by codegen, do not edit
+
+fn test_format_args_expr() -> () {
+    // A FormatArgsExpr. For example:
+    todo!()
+}
diff --git a/rust/ql/test/extractor-tests/generated/Function/Function.expected b/rust/ql/test/extractor-tests/generated/Function/Function.expected
index ccb4ce460e3..f93eb58b2ae 100644
--- a/rust/ql/test/extractor-tests/generated/Function/Function.expected
+++ b/rust/ql/test/extractor-tests/generated/Function/Function.expected
@@ -1 +1,2 @@
-| gen_function.rs:3:1:4:38 | foo | getName: | foo | getBody: | gen_function.rs:4:23:4:38 | BlockExpr |
+| gen_function.rs:3:1:4:38 | foo | hasParamList: | yes | getNumberOfAttrs: | 0 | hasExtendedCanonicalPath: | yes | hasCrateOrigin: | yes | hasAbi: | no | hasBody: | yes | hasGenericParamList: | no | isAsync: | no | isConst: | no | isDefault: | no | isGen: | no | isUnsafe: | no | hasName: | yes | hasRetType: | yes | hasVisibility: | no | hasWhereClause: | no |
+| gen_function.rs:7:5:7:13 | bar | hasParamList: | yes | getNumberOfAttrs: | 0 | hasExtendedCanonicalPath: | yes | hasCrateOrigin: | yes | hasAbi: | no | hasBody: | no | hasGenericParamList: | no | isAsync: | no | isConst: | no | isDefault: | no | isGen: | no | isUnsafe: | no | hasName: | yes | hasRetType: | no | hasVisibility: | no | hasWhereClause: | no |
diff --git a/rust/ql/test/extractor-tests/generated/Function/Function.ql b/rust/ql/test/extractor-tests/generated/Function/Function.ql
index e9faa2aef17..a6e969111fb 100644
--- a/rust/ql/test/extractor-tests/generated/Function/Function.ql
+++ b/rust/ql/test/extractor-tests/generated/Function/Function.ql
@@ -2,10 +2,37 @@
 import codeql.rust.elements
 import TestUtils
 
-from Function x, string getName, Expr getBody
+from
+  Function x, string hasParamList, int getNumberOfAttrs, string hasExtendedCanonicalPath,
+  string hasCrateOrigin, string hasAbi, string hasBody, string hasGenericParamList, string isAsync,
+  string isConst, string isDefault, string isGen, string isUnsafe, string hasName,
+  string hasRetType, string hasVisibility, string hasWhereClause
 where
   toBeTested(x) and
   not x.isUnknown() and
-  getName = x.getName() and
-  getBody = x.getBody()
-select x, "getName:", getName, "getBody:", getBody
+  (if x.hasParamList() then hasParamList = "yes" else hasParamList = "no") and
+  getNumberOfAttrs = x.getNumberOfAttrs() and
+  (
+    if x.hasExtendedCanonicalPath()
+    then hasExtendedCanonicalPath = "yes"
+    else hasExtendedCanonicalPath = "no"
+  ) and
+  (if x.hasCrateOrigin() then hasCrateOrigin = "yes" else hasCrateOrigin = "no") and
+  (if x.hasAbi() then hasAbi = "yes" else hasAbi = "no") and
+  (if x.hasBody() then hasBody = "yes" else hasBody = "no") and
+  (if x.hasGenericParamList() then hasGenericParamList = "yes" else hasGenericParamList = "no") and
+  (if x.isAsync() then isAsync = "yes" else isAsync = "no") and
+  (if x.isConst() then isConst = "yes" else isConst = "no") and
+  (if x.isDefault() then isDefault = "yes" else isDefault = "no") and
+  (if x.isGen() then isGen = "yes" else isGen = "no") and
+  (if x.isUnsafe() then isUnsafe = "yes" else isUnsafe = "no") and
+  (if x.hasName() then hasName = "yes" else hasName = "no") and
+  (if x.hasRetType() then hasRetType = "yes" else hasRetType = "no") and
+  (if x.hasVisibility() then hasVisibility = "yes" else hasVisibility = "no") and
+  if x.hasWhereClause() then hasWhereClause = "yes" else hasWhereClause = "no"
+select x, "hasParamList:", hasParamList, "getNumberOfAttrs:", getNumberOfAttrs,
+  "hasExtendedCanonicalPath:", hasExtendedCanonicalPath, "hasCrateOrigin:", hasCrateOrigin,
+  "hasAbi:", hasAbi, "hasBody:", hasBody, "hasGenericParamList:", hasGenericParamList, "isAsync:",
+  isAsync, "isConst:", isConst, "isDefault:", isDefault, "isGen:", isGen, "isUnsafe:", isUnsafe,
+  "hasName:", hasName, "hasRetType:", hasRetType, "hasVisibility:", hasVisibility,
+  "hasWhereClause:", hasWhereClause
diff --git a/rust/ql/test/extractor-tests/generated/Function/Function_getAbi.expected b/rust/ql/test/extractor-tests/generated/Function/Function_getAbi.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/Function/Function_getAbi.ql b/rust/ql/test/extractor-tests/generated/Function/Function_getAbi.ql
new file mode 100644
index 00000000000..a1317ed761f
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/Function/Function_getAbi.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from Function x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getAbi()
diff --git a/rust/ql/test/extractor-tests/generated/Function/Function_getAttr.expected b/rust/ql/test/extractor-tests/generated/Function/Function_getAttr.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/Function/Function_getAttr.ql b/rust/ql/test/extractor-tests/generated/Function/Function_getAttr.ql
new file mode 100644
index 00000000000..239c6da56c4
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/Function/Function_getAttr.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from Function x, int index
+where toBeTested(x) and not x.isUnknown()
+select x, index, x.getAttr(index)
diff --git a/rust/ql/test/extractor-tests/generated/Function/Function_getBody.expected b/rust/ql/test/extractor-tests/generated/Function/Function_getBody.expected
new file mode 100644
index 00000000000..996e8c1a27c
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/Function/Function_getBody.expected
@@ -0,0 +1 @@
+| gen_function.rs:3:1:4:38 | foo | gen_function.rs:4:23:4:38 | BlockExpr |
diff --git a/rust/ql/test/extractor-tests/generated/Function/Function_getBody.ql b/rust/ql/test/extractor-tests/generated/Function/Function_getBody.ql
new file mode 100644
index 00000000000..5b3191cac00
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/Function/Function_getBody.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from Function x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getBody()
diff --git a/rust/ql/test/extractor-tests/generated/Function/Function_getCrateOrigin.expected b/rust/ql/test/extractor-tests/generated/Function/Function_getCrateOrigin.expected
new file mode 100644
index 00000000000..7c376ffaf1e
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/Function/Function_getCrateOrigin.expected
@@ -0,0 +1,2 @@
+| gen_function.rs:3:1:4:38 | foo | repo::test |
+| gen_function.rs:7:5:7:13 | bar | repo::test |
diff --git a/rust/ql/test/extractor-tests/generated/Function/Function_getCrateOrigin.ql b/rust/ql/test/extractor-tests/generated/Function/Function_getCrateOrigin.ql
new file mode 100644
index 00000000000..933e5867d84
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/Function/Function_getCrateOrigin.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from Function x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getCrateOrigin()
diff --git a/rust/ql/test/extractor-tests/generated/Function/Function_getExtendedCanonicalPath.expected b/rust/ql/test/extractor-tests/generated/Function/Function_getExtendedCanonicalPath.expected
new file mode 100644
index 00000000000..d9b6255918f
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/Function/Function_getExtendedCanonicalPath.expected
@@ -0,0 +1,2 @@
+| gen_function.rs:3:1:4:38 | foo | crate::gen_function::foo |
+| gen_function.rs:7:5:7:13 | bar | crate::gen_function::Trait::bar |
diff --git a/rust/ql/test/extractor-tests/generated/Function/Function_getExtendedCanonicalPath.ql b/rust/ql/test/extractor-tests/generated/Function/Function_getExtendedCanonicalPath.ql
new file mode 100644
index 00000000000..f2c413748de
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/Function/Function_getExtendedCanonicalPath.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from Function x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getExtendedCanonicalPath()
diff --git a/rust/ql/test/extractor-tests/generated/Function/Function_getGenericParamList.expected b/rust/ql/test/extractor-tests/generated/Function/Function_getGenericParamList.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/Function/Function_getGenericParamList.ql b/rust/ql/test/extractor-tests/generated/Function/Function_getGenericParamList.ql
new file mode 100644
index 00000000000..410d28c3ef8
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/Function/Function_getGenericParamList.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from Function x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getGenericParamList()
diff --git a/rust/ql/test/extractor-tests/generated/Function/Function_getName.expected b/rust/ql/test/extractor-tests/generated/Function/Function_getName.expected
new file mode 100644
index 00000000000..62676019818
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/Function/Function_getName.expected
@@ -0,0 +1,2 @@
+| gen_function.rs:3:1:4:38 | foo | gen_function.rs:4:4:4:6 | foo |
+| gen_function.rs:7:5:7:13 | bar | gen_function.rs:7:8:7:10 | bar |
diff --git a/rust/ql/test/extractor-tests/generated/Function/Function_getName.ql b/rust/ql/test/extractor-tests/generated/Function/Function_getName.ql
new file mode 100644
index 00000000000..8d1e2fbfe20
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/Function/Function_getName.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from Function x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getName()
diff --git a/rust/ql/test/extractor-tests/generated/Function/Function_getParamList.expected b/rust/ql/test/extractor-tests/generated/Function/Function_getParamList.expected
new file mode 100644
index 00000000000..baa2734e86a
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/Function/Function_getParamList.expected
@@ -0,0 +1,2 @@
+| gen_function.rs:3:1:4:38 | foo | gen_function.rs:4:7:4:14 | ParamList |
+| gen_function.rs:7:5:7:13 | bar | gen_function.rs:7:11:7:12 | ParamList |
diff --git a/rust/ql/test/extractor-tests/generated/Function/Function_getParamList.ql b/rust/ql/test/extractor-tests/generated/Function/Function_getParamList.ql
new file mode 100644
index 00000000000..6d9fed49b7b
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/Function/Function_getParamList.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from Function x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getParamList()
diff --git a/rust/ql/test/extractor-tests/generated/Function/Function_getRetType.expected b/rust/ql/test/extractor-tests/generated/Function/Function_getRetType.expected
new file mode 100644
index 00000000000..7a533870560
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/Function/Function_getRetType.expected
@@ -0,0 +1 @@
+| gen_function.rs:3:1:4:38 | foo | gen_function.rs:4:16:4:21 | RetType |
diff --git a/rust/ql/test/extractor-tests/generated/Function/Function_getRetType.ql b/rust/ql/test/extractor-tests/generated/Function/Function_getRetType.ql
new file mode 100644
index 00000000000..123640add8b
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/Function/Function_getRetType.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from Function x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getRetType()
diff --git a/rust/ql/test/extractor-tests/generated/Function/Function_getVisibility.expected b/rust/ql/test/extractor-tests/generated/Function/Function_getVisibility.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/Function/Function_getVisibility.ql b/rust/ql/test/extractor-tests/generated/Function/Function_getVisibility.ql
new file mode 100644
index 00000000000..1aa04da90e9
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/Function/Function_getVisibility.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from Function x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getVisibility()
diff --git a/rust/ql/test/extractor-tests/generated/Function/Function_getWhereClause.expected b/rust/ql/test/extractor-tests/generated/Function/Function_getWhereClause.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/Function/Function_getWhereClause.ql b/rust/ql/test/extractor-tests/generated/Function/Function_getWhereClause.ql
new file mode 100644
index 00000000000..b4f5bd56274
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/Function/Function_getWhereClause.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from Function x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getWhereClause()
diff --git a/rust/ql/test/extractor-tests/generated/GenericArgList/GenericArgList.expected b/rust/ql/test/extractor-tests/generated/GenericArgList/GenericArgList.expected
index 43c48a03159..370ee8ce4d6 100644
--- a/rust/ql/test/extractor-tests/generated/GenericArgList/GenericArgList.expected
+++ b/rust/ql/test/extractor-tests/generated/GenericArgList/GenericArgList.expected
@@ -1 +1 @@
-| file://:0:0:0:0 | GenericArgList |
+| gen_generic_arg_list.rs:5:10:5:21 | GenericArgList | getNumberOfGenericArgs: | 2 |
diff --git a/rust/ql/test/extractor-tests/generated/GenericArgList/GenericArgList.ql b/rust/ql/test/extractor-tests/generated/GenericArgList/GenericArgList.ql
index b35dd87ab96..bd3e8bfb63f 100644
--- a/rust/ql/test/extractor-tests/generated/GenericArgList/GenericArgList.ql
+++ b/rust/ql/test/extractor-tests/generated/GenericArgList/GenericArgList.ql
@@ -2,6 +2,9 @@
 import codeql.rust.elements
 import TestUtils
 
-from GenericArgList x
-where toBeTested(x) and not x.isUnknown()
-select x
+from GenericArgList x, int getNumberOfGenericArgs
+where
+  toBeTested(x) and
+  not x.isUnknown() and
+  getNumberOfGenericArgs = x.getNumberOfGenericArgs()
+select x, "getNumberOfGenericArgs:", getNumberOfGenericArgs
diff --git a/rust/ql/test/extractor-tests/generated/GenericArgList/GenericArgList_getGenericArg.expected b/rust/ql/test/extractor-tests/generated/GenericArgList/GenericArgList_getGenericArg.expected
new file mode 100644
index 00000000000..b72d3035ed1
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/GenericArgList/GenericArgList_getGenericArg.expected
@@ -0,0 +1,2 @@
+| gen_generic_arg_list.rs:5:10:5:21 | GenericArgList | 0 | gen_generic_arg_list.rs:5:13:5:15 | TypeArg |
+| gen_generic_arg_list.rs:5:10:5:21 | GenericArgList | 1 | gen_generic_arg_list.rs:5:18:5:20 | TypeArg |
diff --git a/rust/ql/test/extractor-tests/generated/GenericArgList/GenericArgList_getGenericArg.ql b/rust/ql/test/extractor-tests/generated/GenericArgList/GenericArgList_getGenericArg.ql
new file mode 100644
index 00000000000..cc13c85782a
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/GenericArgList/GenericArgList_getGenericArg.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from GenericArgList x, int index
+where toBeTested(x) and not x.isUnknown()
+select x, index, x.getGenericArg(index)
diff --git a/rust/ql/test/extractor-tests/generated/GenericParamList/GenericParamList.expected b/rust/ql/test/extractor-tests/generated/GenericParamList/GenericParamList.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/GenericParamList/GenericParamList.ql b/rust/ql/test/extractor-tests/generated/GenericParamList/GenericParamList.ql
new file mode 100644
index 00000000000..b79afcf33f7
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/GenericParamList/GenericParamList.ql
@@ -0,0 +1,10 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from GenericParamList x, int getNumberOfGenericParams
+where
+  toBeTested(x) and
+  not x.isUnknown() and
+  getNumberOfGenericParams = x.getNumberOfGenericParams()
+select x, "getNumberOfGenericParams:", getNumberOfGenericParams
diff --git a/rust/ql/test/extractor-tests/generated/GenericParamList/GenericParamList_getGenericParam.expected b/rust/ql/test/extractor-tests/generated/GenericParamList/GenericParamList_getGenericParam.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/GenericParamList/GenericParamList_getGenericParam.ql b/rust/ql/test/extractor-tests/generated/GenericParamList/GenericParamList_getGenericParam.ql
new file mode 100644
index 00000000000..323c11e3841
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/GenericParamList/GenericParamList_getGenericParam.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from GenericParamList x, int index
+where toBeTested(x) and not x.isUnknown()
+select x, index, x.getGenericParam(index)
diff --git a/rust/ql/test/extractor-tests/generated/GenericParamList/gen_generic_param_list.rs b/rust/ql/test/extractor-tests/generated/GenericParamList/gen_generic_param_list.rs
new file mode 100644
index 00000000000..a6b4414d2b5
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/GenericParamList/gen_generic_param_list.rs
@@ -0,0 +1,6 @@
+// generated by codegen, do not edit
+
+fn test_generic_param_list() -> () {
+    // A GenericParamList. For example:
+    todo!()
+}
diff --git a/rust/ql/test/extractor-tests/generated/IdentPat/IdentPat.expected b/rust/ql/test/extractor-tests/generated/IdentPat/IdentPat.expected
index 6973ca9aba2..bdc57b38cf3 100644
--- a/rust/ql/test/extractor-tests/generated/IdentPat/IdentPat.expected
+++ b/rust/ql/test/extractor-tests/generated/IdentPat/IdentPat.expected
@@ -1,2 +1,2 @@
-| gen_ident_pat.rs:6:22:6:22 | IdentPat | getBindingId: | y | hasSubpat: | no |
-| gen_ident_pat.rs:10:9:10:25 | IdentPat | getBindingId: | y | hasSubpat: | yes |
+| gen_ident_pat.rs:6:22:6:22 | y | getNumberOfAttrs: | 0 | isMut: | no | isRef: | no | hasName: | yes | hasPat: | no |
+| gen_ident_pat.rs:10:9:10:25 | y | getNumberOfAttrs: | 0 | isMut: | no | isRef: | no | hasName: | yes | hasPat: | yes |
diff --git a/rust/ql/test/extractor-tests/generated/IdentPat/IdentPat.ql b/rust/ql/test/extractor-tests/generated/IdentPat/IdentPat.ql
index 2eb3e3ac35b..3587ccff9ae 100644
--- a/rust/ql/test/extractor-tests/generated/IdentPat/IdentPat.ql
+++ b/rust/ql/test/extractor-tests/generated/IdentPat/IdentPat.ql
@@ -2,10 +2,14 @@
 import codeql.rust.elements
 import TestUtils
 
-from IdentPat x, string getBindingId, string hasSubpat
+from IdentPat x, int getNumberOfAttrs, string isMut, string isRef, string hasName, string hasPat
 where
   toBeTested(x) and
   not x.isUnknown() and
-  getBindingId = x.getBindingId() and
-  if x.hasSubpat() then hasSubpat = "yes" else hasSubpat = "no"
-select x, "getBindingId:", getBindingId, "hasSubpat:", hasSubpat
+  getNumberOfAttrs = x.getNumberOfAttrs() and
+  (if x.isMut() then isMut = "yes" else isMut = "no") and
+  (if x.isRef() then isRef = "yes" else isRef = "no") and
+  (if x.hasName() then hasName = "yes" else hasName = "no") and
+  if x.hasPat() then hasPat = "yes" else hasPat = "no"
+select x, "getNumberOfAttrs:", getNumberOfAttrs, "isMut:", isMut, "isRef:", isRef, "hasName:",
+  hasName, "hasPat:", hasPat
diff --git a/rust/ql/test/extractor-tests/generated/IdentPat/IdentPat_getAttr.expected b/rust/ql/test/extractor-tests/generated/IdentPat/IdentPat_getAttr.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/IdentPat/IdentPat_getAttr.ql b/rust/ql/test/extractor-tests/generated/IdentPat/IdentPat_getAttr.ql
new file mode 100644
index 00000000000..8dde5cce1ca
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/IdentPat/IdentPat_getAttr.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from IdentPat x, int index
+where toBeTested(x) and not x.isUnknown()
+select x, index, x.getAttr(index)
diff --git a/rust/ql/test/extractor-tests/generated/IdentPat/IdentPat_getName.expected b/rust/ql/test/extractor-tests/generated/IdentPat/IdentPat_getName.expected
new file mode 100644
index 00000000000..b4168bbb750
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/IdentPat/IdentPat_getName.expected
@@ -0,0 +1,2 @@
+| gen_ident_pat.rs:6:22:6:22 | y | gen_ident_pat.rs:6:22:6:22 | y |
+| gen_ident_pat.rs:10:9:10:25 | y | gen_ident_pat.rs:10:9:10:9 | y |
diff --git a/rust/ql/test/extractor-tests/generated/IdentPat/IdentPat_getSubpat.ql b/rust/ql/test/extractor-tests/generated/IdentPat/IdentPat_getName.ql
similarity index 85%
rename from rust/ql/test/extractor-tests/generated/IdentPat/IdentPat_getSubpat.ql
rename to rust/ql/test/extractor-tests/generated/IdentPat/IdentPat_getName.ql
index 0fd3f8cfe77..e96736741f5 100644
--- a/rust/ql/test/extractor-tests/generated/IdentPat/IdentPat_getSubpat.ql
+++ b/rust/ql/test/extractor-tests/generated/IdentPat/IdentPat_getName.ql
@@ -4,4 +4,4 @@ import TestUtils
 
 from IdentPat x
 where toBeTested(x) and not x.isUnknown()
-select x, x.getSubpat()
+select x, x.getName()
diff --git a/rust/ql/test/extractor-tests/generated/IdentPat/IdentPat_getPat.expected b/rust/ql/test/extractor-tests/generated/IdentPat/IdentPat_getPat.expected
new file mode 100644
index 00000000000..2e2f0d9228e
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/IdentPat/IdentPat_getPat.expected
@@ -0,0 +1 @@
+| gen_ident_pat.rs:10:9:10:25 | y | gen_ident_pat.rs:10:11:10:25 | TupleStructPat |
diff --git a/rust/ql/test/extractor-tests/generated/IdentPat/IdentPat_getPat.ql b/rust/ql/test/extractor-tests/generated/IdentPat/IdentPat_getPat.ql
new file mode 100644
index 00000000000..14d979626d4
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/IdentPat/IdentPat_getPat.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from IdentPat x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getPat()
diff --git a/rust/ql/test/extractor-tests/generated/IdentPat/IdentPat_getSubpat.expected b/rust/ql/test/extractor-tests/generated/IdentPat/IdentPat_getSubpat.expected
deleted file mode 100644
index 705456753b9..00000000000
--- a/rust/ql/test/extractor-tests/generated/IdentPat/IdentPat_getSubpat.expected
+++ /dev/null
@@ -1 +0,0 @@
-| gen_ident_pat.rs:10:9:10:25 | IdentPat | gen_ident_pat.rs:10:11:10:25 | TupleStructPat |
diff --git a/rust/ql/test/extractor-tests/generated/IfExpr/IfExpr.expected b/rust/ql/test/extractor-tests/generated/IfExpr/IfExpr.expected
index 44dff354b04..a0e0ea15594 100644
--- a/rust/ql/test/extractor-tests/generated/IfExpr/IfExpr.expected
+++ b/rust/ql/test/extractor-tests/generated/IfExpr/IfExpr.expected
@@ -1,2 +1,2 @@
-| gen_if_expr.rs:5:5:7:5 | IfExpr | getCondition: | gen_if_expr.rs:5:8:5:14 | BinaryExpr | getThen: | gen_if_expr.rs:5:16:7:5 | BlockExpr | hasElse: | no |
-| gen_if_expr.rs:8:13:12:5 | IfExpr | getCondition: | gen_if_expr.rs:8:16:8:20 | BinaryExpr | getThen: | gen_if_expr.rs:8:22:10:5 | BlockExpr | hasElse: | yes |
+| gen_if_expr.rs:5:5:7:5 | IfExpr | getNumberOfAttrs: | 0 | hasCondition: | yes | hasElse: | no | hasThen: | yes |
+| gen_if_expr.rs:8:13:12:5 | IfExpr | getNumberOfAttrs: | 0 | hasCondition: | yes | hasElse: | yes | hasThen: | yes |
diff --git a/rust/ql/test/extractor-tests/generated/IfExpr/IfExpr.ql b/rust/ql/test/extractor-tests/generated/IfExpr/IfExpr.ql
index 4b230a91c15..e7281627957 100644
--- a/rust/ql/test/extractor-tests/generated/IfExpr/IfExpr.ql
+++ b/rust/ql/test/extractor-tests/generated/IfExpr/IfExpr.ql
@@ -2,11 +2,13 @@
 import codeql.rust.elements
 import TestUtils
 
-from IfExpr x, Expr getCondition, Expr getThen, string hasElse
+from IfExpr x, int getNumberOfAttrs, string hasCondition, string hasElse, string hasThen
 where
   toBeTested(x) and
   not x.isUnknown() and
-  getCondition = x.getCondition() and
-  getThen = x.getThen() and
-  if x.hasElse() then hasElse = "yes" else hasElse = "no"
-select x, "getCondition:", getCondition, "getThen:", getThen, "hasElse:", hasElse
+  getNumberOfAttrs = x.getNumberOfAttrs() and
+  (if x.hasCondition() then hasCondition = "yes" else hasCondition = "no") and
+  (if x.hasElse() then hasElse = "yes" else hasElse = "no") and
+  if x.hasThen() then hasThen = "yes" else hasThen = "no"
+select x, "getNumberOfAttrs:", getNumberOfAttrs, "hasCondition:", hasCondition, "hasElse:", hasElse,
+  "hasThen:", hasThen
diff --git a/rust/ql/test/extractor-tests/generated/IfExpr/IfExpr_getAttr.expected b/rust/ql/test/extractor-tests/generated/IfExpr/IfExpr_getAttr.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/IfExpr/IfExpr_getAttr.ql b/rust/ql/test/extractor-tests/generated/IfExpr/IfExpr_getAttr.ql
new file mode 100644
index 00000000000..46f5bde3e3b
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/IfExpr/IfExpr_getAttr.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from IfExpr x, int index
+where toBeTested(x) and not x.isUnknown()
+select x, index, x.getAttr(index)
diff --git a/rust/ql/test/extractor-tests/generated/IfExpr/IfExpr_getCondition.expected b/rust/ql/test/extractor-tests/generated/IfExpr/IfExpr_getCondition.expected
new file mode 100644
index 00000000000..7bdb262dd32
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/IfExpr/IfExpr_getCondition.expected
@@ -0,0 +1,2 @@
+| gen_if_expr.rs:5:5:7:5 | IfExpr | gen_if_expr.rs:5:8:5:14 | ... == ... |
+| gen_if_expr.rs:8:13:12:5 | IfExpr | gen_if_expr.rs:8:16:8:20 | ... > ... |
diff --git a/rust/ql/test/extractor-tests/generated/IfExpr/IfExpr_getCondition.ql b/rust/ql/test/extractor-tests/generated/IfExpr/IfExpr_getCondition.ql
new file mode 100644
index 00000000000..459d6961e5a
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/IfExpr/IfExpr_getCondition.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from IfExpr x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getCondition()
diff --git a/rust/ql/test/extractor-tests/generated/IfExpr/IfExpr_getThen.expected b/rust/ql/test/extractor-tests/generated/IfExpr/IfExpr_getThen.expected
new file mode 100644
index 00000000000..0916c3f3391
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/IfExpr/IfExpr_getThen.expected
@@ -0,0 +1,2 @@
+| gen_if_expr.rs:5:5:7:5 | IfExpr | gen_if_expr.rs:5:16:7:5 | BlockExpr |
+| gen_if_expr.rs:8:13:12:5 | IfExpr | gen_if_expr.rs:8:22:10:5 | BlockExpr |
diff --git a/rust/ql/test/extractor-tests/generated/IfExpr/IfExpr_getThen.ql b/rust/ql/test/extractor-tests/generated/IfExpr/IfExpr_getThen.ql
new file mode 100644
index 00000000000..35fa0919661
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/IfExpr/IfExpr_getThen.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from IfExpr x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getThen()
diff --git a/rust/ql/test/extractor-tests/generated/IfExpr/gen_if_expr.rs b/rust/ql/test/extractor-tests/generated/IfExpr/gen_if_expr.rs
index 22de54eb896..2afd9864525 100644
--- a/rust/ql/test/extractor-tests/generated/IfExpr/gen_if_expr.rs
+++ b/rust/ql/test/extractor-tests/generated/IfExpr/gen_if_expr.rs
@@ -9,5 +9,5 @@ fn test_if_expr() -> () {
         1
     } else {
         0
-    }
+    };
 }
diff --git a/rust/ql/test/extractor-tests/generated/Impl/Impl.expected b/rust/ql/test/extractor-tests/generated/Impl/Impl.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/Impl/Impl.ql b/rust/ql/test/extractor-tests/generated/Impl/Impl.ql
new file mode 100644
index 00000000000..5af0d0da0d4
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/Impl/Impl.ql
@@ -0,0 +1,32 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from
+  Impl x, string hasExtendedCanonicalPath, string hasCrateOrigin, string hasAssocItemList,
+  int getNumberOfAttrs, string hasGenericParamList, string isConst, string isDefault,
+  string isUnsafe, string hasSelfTy, string hasTrait, string hasVisibility, string hasWhereClause
+where
+  toBeTested(x) and
+  not x.isUnknown() and
+  (
+    if x.hasExtendedCanonicalPath()
+    then hasExtendedCanonicalPath = "yes"
+    else hasExtendedCanonicalPath = "no"
+  ) and
+  (if x.hasCrateOrigin() then hasCrateOrigin = "yes" else hasCrateOrigin = "no") and
+  (if x.hasAssocItemList() then hasAssocItemList = "yes" else hasAssocItemList = "no") and
+  getNumberOfAttrs = x.getNumberOfAttrs() and
+  (if x.hasGenericParamList() then hasGenericParamList = "yes" else hasGenericParamList = "no") and
+  (if x.isConst() then isConst = "yes" else isConst = "no") and
+  (if x.isDefault() then isDefault = "yes" else isDefault = "no") and
+  (if x.isUnsafe() then isUnsafe = "yes" else isUnsafe = "no") and
+  (if x.hasSelfTy() then hasSelfTy = "yes" else hasSelfTy = "no") and
+  (if x.hasTrait() then hasTrait = "yes" else hasTrait = "no") and
+  (if x.hasVisibility() then hasVisibility = "yes" else hasVisibility = "no") and
+  if x.hasWhereClause() then hasWhereClause = "yes" else hasWhereClause = "no"
+select x, "hasExtendedCanonicalPath:", hasExtendedCanonicalPath, "hasCrateOrigin:", hasCrateOrigin,
+  "hasAssocItemList:", hasAssocItemList, "getNumberOfAttrs:", getNumberOfAttrs,
+  "hasGenericParamList:", hasGenericParamList, "isConst:", isConst, "isDefault:", isDefault,
+  "isUnsafe:", isUnsafe, "hasSelfTy:", hasSelfTy, "hasTrait:", hasTrait, "hasVisibility:",
+  hasVisibility, "hasWhereClause:", hasWhereClause
diff --git a/rust/ql/test/extractor-tests/generated/Impl/Impl_getAssocItemList.expected b/rust/ql/test/extractor-tests/generated/Impl/Impl_getAssocItemList.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/Impl/Impl_getAssocItemList.ql b/rust/ql/test/extractor-tests/generated/Impl/Impl_getAssocItemList.ql
new file mode 100644
index 00000000000..8365b6b0dfe
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/Impl/Impl_getAssocItemList.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from Impl x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getAssocItemList()
diff --git a/rust/ql/test/extractor-tests/generated/Impl/Impl_getAttr.expected b/rust/ql/test/extractor-tests/generated/Impl/Impl_getAttr.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/Impl/Impl_getAttr.ql b/rust/ql/test/extractor-tests/generated/Impl/Impl_getAttr.ql
new file mode 100644
index 00000000000..d6c01005755
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/Impl/Impl_getAttr.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from Impl x, int index
+where toBeTested(x) and not x.isUnknown()
+select x, index, x.getAttr(index)
diff --git a/rust/ql/test/extractor-tests/generated/Impl/Impl_getCrateOrigin.expected b/rust/ql/test/extractor-tests/generated/Impl/Impl_getCrateOrigin.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/Impl/Impl_getCrateOrigin.ql b/rust/ql/test/extractor-tests/generated/Impl/Impl_getCrateOrigin.ql
new file mode 100644
index 00000000000..b9d428ce94a
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/Impl/Impl_getCrateOrigin.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from Impl x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getCrateOrigin()
diff --git a/rust/ql/test/extractor-tests/generated/Impl/Impl_getExtendedCanonicalPath.expected b/rust/ql/test/extractor-tests/generated/Impl/Impl_getExtendedCanonicalPath.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/Impl/Impl_getExtendedCanonicalPath.ql b/rust/ql/test/extractor-tests/generated/Impl/Impl_getExtendedCanonicalPath.ql
new file mode 100644
index 00000000000..140490fcaff
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/Impl/Impl_getExtendedCanonicalPath.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from Impl x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getExtendedCanonicalPath()
diff --git a/rust/ql/test/extractor-tests/generated/Impl/Impl_getGenericParamList.expected b/rust/ql/test/extractor-tests/generated/Impl/Impl_getGenericParamList.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/Impl/Impl_getGenericParamList.ql b/rust/ql/test/extractor-tests/generated/Impl/Impl_getGenericParamList.ql
new file mode 100644
index 00000000000..2b24c7d73a9
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/Impl/Impl_getGenericParamList.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from Impl x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getGenericParamList()
diff --git a/rust/ql/test/extractor-tests/generated/Impl/Impl_getSelfTy.expected b/rust/ql/test/extractor-tests/generated/Impl/Impl_getSelfTy.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/Impl/Impl_getSelfTy.ql b/rust/ql/test/extractor-tests/generated/Impl/Impl_getSelfTy.ql
new file mode 100644
index 00000000000..283903e8d34
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/Impl/Impl_getSelfTy.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from Impl x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getSelfTy()
diff --git a/rust/ql/test/extractor-tests/generated/Impl/Impl_getTrait.expected b/rust/ql/test/extractor-tests/generated/Impl/Impl_getTrait.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/Impl/Impl_getTrait.ql b/rust/ql/test/extractor-tests/generated/Impl/Impl_getTrait.ql
new file mode 100644
index 00000000000..7551a5e960e
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/Impl/Impl_getTrait.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from Impl x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getTrait()
diff --git a/rust/ql/test/extractor-tests/generated/Impl/Impl_getVisibility.expected b/rust/ql/test/extractor-tests/generated/Impl/Impl_getVisibility.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/Impl/Impl_getVisibility.ql b/rust/ql/test/extractor-tests/generated/Impl/Impl_getVisibility.ql
new file mode 100644
index 00000000000..f50c36bc834
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/Impl/Impl_getVisibility.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from Impl x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getVisibility()
diff --git a/rust/ql/test/extractor-tests/generated/Impl/Impl_getWhereClause.expected b/rust/ql/test/extractor-tests/generated/Impl/Impl_getWhereClause.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/Impl/Impl_getWhereClause.ql b/rust/ql/test/extractor-tests/generated/Impl/Impl_getWhereClause.ql
new file mode 100644
index 00000000000..e2e87ef03c4
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/Impl/Impl_getWhereClause.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from Impl x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getWhereClause()
diff --git a/rust/ql/test/extractor-tests/generated/Impl/gen_impl.rs b/rust/ql/test/extractor-tests/generated/Impl/gen_impl.rs
new file mode 100644
index 00000000000..41254299a94
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/Impl/gen_impl.rs
@@ -0,0 +1,6 @@
+// generated by codegen, do not edit
+
+fn test_impl() -> () {
+    // A Impl. For example:
+    todo!()
+}
diff --git a/rust/ql/test/extractor-tests/generated/ImplTraitType/ImplTraitType.expected b/rust/ql/test/extractor-tests/generated/ImplTraitType/ImplTraitType.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/ImplTraitType/ImplTraitType.ql b/rust/ql/test/extractor-tests/generated/ImplTraitType/ImplTraitType.ql
new file mode 100644
index 00000000000..d4cfdef4778
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/ImplTraitType/ImplTraitType.ql
@@ -0,0 +1,10 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from ImplTraitType x, string hasTypeBoundList
+where
+  toBeTested(x) and
+  not x.isUnknown() and
+  if x.hasTypeBoundList() then hasTypeBoundList = "yes" else hasTypeBoundList = "no"
+select x, "hasTypeBoundList:", hasTypeBoundList
diff --git a/rust/ql/test/extractor-tests/generated/ImplTraitType/ImplTraitType_getTypeBoundList.expected b/rust/ql/test/extractor-tests/generated/ImplTraitType/ImplTraitType_getTypeBoundList.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/ImplTraitType/ImplTraitType_getTypeBoundList.ql b/rust/ql/test/extractor-tests/generated/ImplTraitType/ImplTraitType_getTypeBoundList.ql
new file mode 100644
index 00000000000..132a6001355
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/ImplTraitType/ImplTraitType_getTypeBoundList.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from ImplTraitType x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getTypeBoundList()
diff --git a/rust/ql/test/extractor-tests/generated/ImplTraitType/gen_impl_trait_type.rs b/rust/ql/test/extractor-tests/generated/ImplTraitType/gen_impl_trait_type.rs
new file mode 100644
index 00000000000..3f50d59edbd
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/ImplTraitType/gen_impl_trait_type.rs
@@ -0,0 +1,6 @@
+// generated by codegen, do not edit
+
+fn test_impl_trait_type() -> () {
+    // A ImplTraitType. For example:
+    todo!()
+}
diff --git a/rust/ql/test/extractor-tests/generated/IndexExpr/IndexExpr.expected b/rust/ql/test/extractor-tests/generated/IndexExpr/IndexExpr.expected
index edbf139dfc3..c113934115d 100644
--- a/rust/ql/test/extractor-tests/generated/IndexExpr/IndexExpr.expected
+++ b/rust/ql/test/extractor-tests/generated/IndexExpr/IndexExpr.expected
@@ -1,2 +1,2 @@
-| gen_index_expr.rs:5:5:5:12 | IndexExpr | getBase: | gen_index_expr.rs:5:5:5:8 | PathExpr | getIndex: | gen_index_expr.rs:5:10:5:11 | LiteralExpr | isAssigneeExpr: | no |
-| gen_index_expr.rs:6:5:6:12 | IndexExpr | getBase: | gen_index_expr.rs:6:5:6:8 | PathExpr | getIndex: | gen_index_expr.rs:6:10:6:11 | LiteralExpr | isAssigneeExpr: | yes |
+| gen_index_expr.rs:5:5:5:12 | IndexExpr | getNumberOfAttrs: | 0 | hasBase: | yes | hasIndex: | yes |
+| gen_index_expr.rs:6:5:6:12 | IndexExpr | getNumberOfAttrs: | 0 | hasBase: | yes | hasIndex: | yes |
diff --git a/rust/ql/test/extractor-tests/generated/IndexExpr/IndexExpr.ql b/rust/ql/test/extractor-tests/generated/IndexExpr/IndexExpr.ql
index 1443f3e58e2..a4b7139c97e 100644
--- a/rust/ql/test/extractor-tests/generated/IndexExpr/IndexExpr.ql
+++ b/rust/ql/test/extractor-tests/generated/IndexExpr/IndexExpr.ql
@@ -2,11 +2,11 @@
 import codeql.rust.elements
 import TestUtils
 
-from IndexExpr x, Expr getBase, Expr getIndex, string isAssigneeExpr
+from IndexExpr x, int getNumberOfAttrs, string hasBase, string hasIndex
 where
   toBeTested(x) and
   not x.isUnknown() and
-  getBase = x.getBase() and
-  getIndex = x.getIndex() and
-  if x.isAssigneeExpr() then isAssigneeExpr = "yes" else isAssigneeExpr = "no"
-select x, "getBase:", getBase, "getIndex:", getIndex, "isAssigneeExpr:", isAssigneeExpr
+  getNumberOfAttrs = x.getNumberOfAttrs() and
+  (if x.hasBase() then hasBase = "yes" else hasBase = "no") and
+  if x.hasIndex() then hasIndex = "yes" else hasIndex = "no"
+select x, "getNumberOfAttrs:", getNumberOfAttrs, "hasBase:", hasBase, "hasIndex:", hasIndex
diff --git a/rust/ql/test/extractor-tests/generated/IndexExpr/IndexExpr_getAttr.expected b/rust/ql/test/extractor-tests/generated/IndexExpr/IndexExpr_getAttr.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/IndexExpr/IndexExpr_getAttr.ql b/rust/ql/test/extractor-tests/generated/IndexExpr/IndexExpr_getAttr.ql
new file mode 100644
index 00000000000..504f8e56cbe
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/IndexExpr/IndexExpr_getAttr.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from IndexExpr x, int index
+where toBeTested(x) and not x.isUnknown()
+select x, index, x.getAttr(index)
diff --git a/rust/ql/test/extractor-tests/generated/IndexExpr/IndexExpr_getBase.expected b/rust/ql/test/extractor-tests/generated/IndexExpr/IndexExpr_getBase.expected
new file mode 100644
index 00000000000..c149597172b
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/IndexExpr/IndexExpr_getBase.expected
@@ -0,0 +1,2 @@
+| gen_index_expr.rs:5:5:5:12 | IndexExpr | gen_index_expr.rs:5:5:5:8 | list |
+| gen_index_expr.rs:6:5:6:12 | IndexExpr | gen_index_expr.rs:6:5:6:8 | list |
diff --git a/rust/ql/test/extractor-tests/generated/IndexExpr/IndexExpr_getBase.ql b/rust/ql/test/extractor-tests/generated/IndexExpr/IndexExpr_getBase.ql
new file mode 100644
index 00000000000..b4debab06d7
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/IndexExpr/IndexExpr_getBase.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from IndexExpr x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getBase()
diff --git a/rust/ql/test/extractor-tests/generated/IndexExpr/IndexExpr_getIndex.expected b/rust/ql/test/extractor-tests/generated/IndexExpr/IndexExpr_getIndex.expected
new file mode 100644
index 00000000000..433afd85eb9
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/IndexExpr/IndexExpr_getIndex.expected
@@ -0,0 +1,2 @@
+| gen_index_expr.rs:5:5:5:12 | IndexExpr | gen_index_expr.rs:5:10:5:11 | 42 |
+| gen_index_expr.rs:6:5:6:12 | IndexExpr | gen_index_expr.rs:6:10:6:11 | 42 |
diff --git a/rust/ql/test/extractor-tests/generated/IndexExpr/IndexExpr_getIndex.ql b/rust/ql/test/extractor-tests/generated/IndexExpr/IndexExpr_getIndex.ql
new file mode 100644
index 00000000000..f6d5b1e5998
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/IndexExpr/IndexExpr_getIndex.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from IndexExpr x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getIndex()
diff --git a/rust/ql/test/extractor-tests/generated/InferType/InferType.expected b/rust/ql/test/extractor-tests/generated/InferType/InferType.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/TypeRef/TypeRef.ql b/rust/ql/test/extractor-tests/generated/InferType/InferType.ql
similarity index 88%
rename from rust/ql/test/extractor-tests/generated/TypeRef/TypeRef.ql
rename to rust/ql/test/extractor-tests/generated/InferType/InferType.ql
index ef4a4c96806..88b42a4d53f 100644
--- a/rust/ql/test/extractor-tests/generated/TypeRef/TypeRef.ql
+++ b/rust/ql/test/extractor-tests/generated/InferType/InferType.ql
@@ -2,6 +2,6 @@
 import codeql.rust.elements
 import TestUtils
 
-from TypeRef x
+from InferType x
 where toBeTested(x) and not x.isUnknown()
 select x
diff --git a/rust/ql/test/extractor-tests/generated/InferType/gen_infer_type.rs b/rust/ql/test/extractor-tests/generated/InferType/gen_infer_type.rs
new file mode 100644
index 00000000000..c65f65c2230
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/InferType/gen_infer_type.rs
@@ -0,0 +1,6 @@
+// generated by codegen, do not edit
+
+fn test_infer_type() -> () {
+    // A InferType. For example:
+    todo!()
+}
diff --git a/rust/ql/test/extractor-tests/generated/ItemList/ItemList.expected b/rust/ql/test/extractor-tests/generated/ItemList/ItemList.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/ItemList/ItemList.ql b/rust/ql/test/extractor-tests/generated/ItemList/ItemList.ql
new file mode 100644
index 00000000000..b656fd73500
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/ItemList/ItemList.ql
@@ -0,0 +1,11 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from ItemList x, int getNumberOfAttrs, int getNumberOfItems
+where
+  toBeTested(x) and
+  not x.isUnknown() and
+  getNumberOfAttrs = x.getNumberOfAttrs() and
+  getNumberOfItems = x.getNumberOfItems()
+select x, "getNumberOfAttrs:", getNumberOfAttrs, "getNumberOfItems:", getNumberOfItems
diff --git a/rust/ql/test/extractor-tests/generated/ItemList/ItemList_getAttr.expected b/rust/ql/test/extractor-tests/generated/ItemList/ItemList_getAttr.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/ItemList/ItemList_getAttr.ql b/rust/ql/test/extractor-tests/generated/ItemList/ItemList_getAttr.ql
new file mode 100644
index 00000000000..b49e5c18d37
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/ItemList/ItemList_getAttr.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from ItemList x, int index
+where toBeTested(x) and not x.isUnknown()
+select x, index, x.getAttr(index)
diff --git a/rust/ql/test/extractor-tests/generated/ItemList/ItemList_getItem.expected b/rust/ql/test/extractor-tests/generated/ItemList/ItemList_getItem.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/ItemList/ItemList_getItem.ql b/rust/ql/test/extractor-tests/generated/ItemList/ItemList_getItem.ql
new file mode 100644
index 00000000000..f9e65903fe9
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/ItemList/ItemList_getItem.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from ItemList x, int index
+where toBeTested(x) and not x.isUnknown()
+select x, index, x.getItem(index)
diff --git a/rust/ql/test/extractor-tests/generated/ItemList/gen_item_list.rs b/rust/ql/test/extractor-tests/generated/ItemList/gen_item_list.rs
new file mode 100644
index 00000000000..5866f8da891
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/ItemList/gen_item_list.rs
@@ -0,0 +1,6 @@
+// generated by codegen, do not edit
+
+fn test_item_list() -> () {
+    // A ItemList. For example:
+    todo!()
+}
diff --git a/rust/ql/test/extractor-tests/generated/Label/Label.expected b/rust/ql/test/extractor-tests/generated/Label/Label.expected
index 297511910be..5cea4ef7222 100644
--- a/rust/ql/test/extractor-tests/generated/Label/Label.expected
+++ b/rust/ql/test/extractor-tests/generated/Label/Label.expected
@@ -1,2 +1 @@
-| gen_label.rs:5:5:5:11 | Label | getName: | 'label |
-| gen_label.rs:5:5:5:11 | Label | getName: | 'label |
+| gen_label.rs:5:5:5:11 | Label | hasLifetime: | yes |
diff --git a/rust/ql/test/extractor-tests/generated/Label/Label.ql b/rust/ql/test/extractor-tests/generated/Label/Label.ql
index 6fa1930f0ba..92f4d44230e 100644
--- a/rust/ql/test/extractor-tests/generated/Label/Label.ql
+++ b/rust/ql/test/extractor-tests/generated/Label/Label.ql
@@ -2,9 +2,9 @@
 import codeql.rust.elements
 import TestUtils
 
-from Label x, string getName
+from Label x, string hasLifetime
 where
   toBeTested(x) and
   not x.isUnknown() and
-  getName = x.getName()
-select x, "getName:", getName
+  if x.hasLifetime() then hasLifetime = "yes" else hasLifetime = "no"
+select x, "hasLifetime:", hasLifetime
diff --git a/rust/ql/test/extractor-tests/generated/Label/Label_getLifetime.expected b/rust/ql/test/extractor-tests/generated/Label/Label_getLifetime.expected
new file mode 100644
index 00000000000..9c78f23307d
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/Label/Label_getLifetime.expected
@@ -0,0 +1 @@
+| gen_label.rs:5:5:5:11 | Label | gen_label.rs:5:5:5:10 | Lifetime |
diff --git a/rust/ql/test/extractor-tests/generated/Label/Label_getLifetime.ql b/rust/ql/test/extractor-tests/generated/Label/Label_getLifetime.ql
new file mode 100644
index 00000000000..ba555d1209c
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/Label/Label_getLifetime.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from Label x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getLifetime()
diff --git a/rust/ql/test/extractor-tests/generated/LetElse/LetElse.expected b/rust/ql/test/extractor-tests/generated/LetElse/LetElse.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/LetElse/LetElse.ql b/rust/ql/test/extractor-tests/generated/LetElse/LetElse.ql
new file mode 100644
index 00000000000..288e99d5a47
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/LetElse/LetElse.ql
@@ -0,0 +1,10 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from LetElse x, string hasBlockExpr
+where
+  toBeTested(x) and
+  not x.isUnknown() and
+  if x.hasBlockExpr() then hasBlockExpr = "yes" else hasBlockExpr = "no"
+select x, "hasBlockExpr:", hasBlockExpr
diff --git a/rust/ql/test/extractor-tests/generated/LetElse/LetElse_getBlockExpr.expected b/rust/ql/test/extractor-tests/generated/LetElse/LetElse_getBlockExpr.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/LetElse/LetElse_getBlockExpr.ql b/rust/ql/test/extractor-tests/generated/LetElse/LetElse_getBlockExpr.ql
new file mode 100644
index 00000000000..daebdb30613
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/LetElse/LetElse_getBlockExpr.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from LetElse x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getBlockExpr()
diff --git a/rust/ql/test/extractor-tests/generated/LetElse/gen_let_else.rs b/rust/ql/test/extractor-tests/generated/LetElse/gen_let_else.rs
new file mode 100644
index 00000000000..3bd4a625448
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/LetElse/gen_let_else.rs
@@ -0,0 +1,6 @@
+// generated by codegen, do not edit
+
+fn test_let_else() -> () {
+    // A LetElse. For example:
+    todo!()
+}
diff --git a/rust/ql/test/extractor-tests/generated/LetExpr/LetExpr.expected b/rust/ql/test/extractor-tests/generated/LetExpr/LetExpr.expected
index 41d358886f4..26a968ef35b 100644
--- a/rust/ql/test/extractor-tests/generated/LetExpr/LetExpr.expected
+++ b/rust/ql/test/extractor-tests/generated/LetExpr/LetExpr.expected
@@ -1 +1 @@
-| gen_let_expr.rs:5:8:5:31 | LetExpr | getPat: | gen_let_expr.rs:5:12:5:18 | TupleStructPat | getExpr: | gen_let_expr.rs:5:22:5:31 | PathExpr |
+| gen_let_expr.rs:5:8:5:31 | LetExpr | getNumberOfAttrs: | 0 | hasExpr: | yes | hasPat: | yes |
diff --git a/rust/ql/test/extractor-tests/generated/LetExpr/LetExpr.ql b/rust/ql/test/extractor-tests/generated/LetExpr/LetExpr.ql
index a00b026d048..1b7648a5668 100644
--- a/rust/ql/test/extractor-tests/generated/LetExpr/LetExpr.ql
+++ b/rust/ql/test/extractor-tests/generated/LetExpr/LetExpr.ql
@@ -2,10 +2,11 @@
 import codeql.rust.elements
 import TestUtils
 
-from LetExpr x, Pat getPat, Expr getExpr
+from LetExpr x, int getNumberOfAttrs, string hasExpr, string hasPat
 where
   toBeTested(x) and
   not x.isUnknown() and
-  getPat = x.getPat() and
-  getExpr = x.getExpr()
-select x, "getPat:", getPat, "getExpr:", getExpr
+  getNumberOfAttrs = x.getNumberOfAttrs() and
+  (if x.hasExpr() then hasExpr = "yes" else hasExpr = "no") and
+  if x.hasPat() then hasPat = "yes" else hasPat = "no"
+select x, "getNumberOfAttrs:", getNumberOfAttrs, "hasExpr:", hasExpr, "hasPat:", hasPat
diff --git a/rust/ql/test/extractor-tests/generated/LetExpr/LetExpr_getAttr.expected b/rust/ql/test/extractor-tests/generated/LetExpr/LetExpr_getAttr.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/LetExpr/LetExpr_getAttr.ql b/rust/ql/test/extractor-tests/generated/LetExpr/LetExpr_getAttr.ql
new file mode 100644
index 00000000000..24330c4b19b
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/LetExpr/LetExpr_getAttr.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from LetExpr x, int index
+where toBeTested(x) and not x.isUnknown()
+select x, index, x.getAttr(index)
diff --git a/rust/ql/test/extractor-tests/generated/LetExpr/LetExpr_getExpr.expected b/rust/ql/test/extractor-tests/generated/LetExpr/LetExpr_getExpr.expected
new file mode 100644
index 00000000000..f90fa586229
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/LetExpr/LetExpr_getExpr.expected
@@ -0,0 +1 @@
+| gen_let_expr.rs:5:8:5:31 | LetExpr | gen_let_expr.rs:5:22:5:31 | maybe_some |
diff --git a/rust/ql/test/extractor-tests/generated/LetExpr/LetExpr_getExpr.ql b/rust/ql/test/extractor-tests/generated/LetExpr/LetExpr_getExpr.ql
new file mode 100644
index 00000000000..0f9e8088b46
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/LetExpr/LetExpr_getExpr.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from LetExpr x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getExpr()
diff --git a/rust/ql/test/extractor-tests/generated/LetExpr/LetExpr_getPat.expected b/rust/ql/test/extractor-tests/generated/LetExpr/LetExpr_getPat.expected
new file mode 100644
index 00000000000..287200e610f
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/LetExpr/LetExpr_getPat.expected
@@ -0,0 +1 @@
+| gen_let_expr.rs:5:8:5:31 | LetExpr | gen_let_expr.rs:5:12:5:18 | TupleStructPat |
diff --git a/rust/ql/test/extractor-tests/generated/LetExpr/LetExpr_getPat.ql b/rust/ql/test/extractor-tests/generated/LetExpr/LetExpr_getPat.ql
new file mode 100644
index 00000000000..bd358b49c04
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/LetExpr/LetExpr_getPat.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from LetExpr x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getPat()
diff --git a/rust/ql/test/extractor-tests/generated/LetStmt/LetStmt.expected b/rust/ql/test/extractor-tests/generated/LetStmt/LetStmt.expected
index a60f2479833..7c05e07e2f3 100644
--- a/rust/ql/test/extractor-tests/generated/LetStmt/LetStmt.expected
+++ b/rust/ql/test/extractor-tests/generated/LetStmt/LetStmt.expected
@@ -1,6 +1,6 @@
-| gen_let_stmt.rs:5:9:5:9 | LetStmt | getPat: | gen_let_stmt.rs:5:9:5:9 | IdentPat | hasType: | no | hasInitializer: | yes | hasElse: | no |
-| gen_let_stmt.rs:6:9:6:9 | LetStmt | getPat: | gen_let_stmt.rs:6:9:6:9 | IdentPat | hasType: | yes | hasInitializer: | yes | hasElse: | no |
-| gen_let_stmt.rs:7:9:7:9 | LetStmt | getPat: | gen_let_stmt.rs:7:9:7:9 | IdentPat | hasType: | yes | hasInitializer: | no | hasElse: | no |
-| gen_let_stmt.rs:8:9:8:9 | LetStmt | getPat: | gen_let_stmt.rs:8:9:8:9 | IdentPat | hasType: | no | hasInitializer: | no | hasElse: | no |
-| gen_let_stmt.rs:9:9:9:14 | LetStmt | getPat: | gen_let_stmt.rs:9:9:9:14 | TuplePat | hasType: | no | hasInitializer: | yes | hasElse: | no |
-| gen_let_stmt.rs:10:9:10:15 | LetStmt | getPat: | gen_let_stmt.rs:10:9:10:15 | TupleStructPat | hasType: | no | hasInitializer: | yes | hasElse: | yes |
+| gen_let_stmt.rs:5:5:5:15 | LetStmt | getNumberOfAttrs: | 0 | hasInitializer: | yes | hasLetElse: | no | hasPat: | yes | hasTy: | no |
+| gen_let_stmt.rs:6:5:6:20 | LetStmt | getNumberOfAttrs: | 0 | hasInitializer: | yes | hasLetElse: | no | hasPat: | yes | hasTy: | yes |
+| gen_let_stmt.rs:7:5:7:15 | LetStmt | getNumberOfAttrs: | 0 | hasInitializer: | no | hasLetElse: | no | hasPat: | yes | hasTy: | yes |
+| gen_let_stmt.rs:8:5:8:10 | LetStmt | getNumberOfAttrs: | 0 | hasInitializer: | no | hasLetElse: | no | hasPat: | yes | hasTy: | no |
+| gen_let_stmt.rs:9:5:9:24 | LetStmt | getNumberOfAttrs: | 0 | hasInitializer: | yes | hasLetElse: | no | hasPat: | yes | hasTy: | no |
+| gen_let_stmt.rs:10:5:12:6 | LetStmt | getNumberOfAttrs: | 0 | hasInitializer: | yes | hasLetElse: | yes | hasPat: | yes | hasTy: | no |
diff --git a/rust/ql/test/extractor-tests/generated/LetStmt/LetStmt.ql b/rust/ql/test/extractor-tests/generated/LetStmt/LetStmt.ql
index 6d67a88dcb5..bd7ce9ad958 100644
--- a/rust/ql/test/extractor-tests/generated/LetStmt/LetStmt.ql
+++ b/rust/ql/test/extractor-tests/generated/LetStmt/LetStmt.ql
@@ -2,13 +2,16 @@
 import codeql.rust.elements
 import TestUtils
 
-from LetStmt x, Pat getPat, string hasType, string hasInitializer, string hasElse
+from
+  LetStmt x, int getNumberOfAttrs, string hasInitializer, string hasLetElse, string hasPat,
+  string hasTy
 where
   toBeTested(x) and
   not x.isUnknown() and
-  getPat = x.getPat() and
-  (if x.hasType() then hasType = "yes" else hasType = "no") and
+  getNumberOfAttrs = x.getNumberOfAttrs() and
   (if x.hasInitializer() then hasInitializer = "yes" else hasInitializer = "no") and
-  if x.hasElse() then hasElse = "yes" else hasElse = "no"
-select x, "getPat:", getPat, "hasType:", hasType, "hasInitializer:", hasInitializer, "hasElse:",
-  hasElse
+  (if x.hasLetElse() then hasLetElse = "yes" else hasLetElse = "no") and
+  (if x.hasPat() then hasPat = "yes" else hasPat = "no") and
+  if x.hasTy() then hasTy = "yes" else hasTy = "no"
+select x, "getNumberOfAttrs:", getNumberOfAttrs, "hasInitializer:", hasInitializer, "hasLetElse:",
+  hasLetElse, "hasPat:", hasPat, "hasTy:", hasTy
diff --git a/rust/ql/test/extractor-tests/generated/LetStmt/LetStmt_getAttr.expected b/rust/ql/test/extractor-tests/generated/LetStmt/LetStmt_getAttr.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/LetStmt/LetStmt_getAttr.ql b/rust/ql/test/extractor-tests/generated/LetStmt/LetStmt_getAttr.ql
new file mode 100644
index 00000000000..82f56332351
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/LetStmt/LetStmt_getAttr.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from LetStmt x, int index
+where toBeTested(x) and not x.isUnknown()
+select x, index, x.getAttr(index)
diff --git a/rust/ql/test/extractor-tests/generated/LetStmt/LetStmt_getElse.expected b/rust/ql/test/extractor-tests/generated/LetStmt/LetStmt_getElse.expected
deleted file mode 100644
index 2d6e500d14a..00000000000
--- a/rust/ql/test/extractor-tests/generated/LetStmt/LetStmt_getElse.expected
+++ /dev/null
@@ -1 +0,0 @@
-| gen_let_stmt.rs:10:9:10:15 | LetStmt | gen_let_stmt.rs:10:45:12:5 | BlockExpr |
diff --git a/rust/ql/test/extractor-tests/generated/LetStmt/LetStmt_getInitializer.expected b/rust/ql/test/extractor-tests/generated/LetStmt/LetStmt_getInitializer.expected
index 59bffddf545..5e79b98f827 100644
--- a/rust/ql/test/extractor-tests/generated/LetStmt/LetStmt_getInitializer.expected
+++ b/rust/ql/test/extractor-tests/generated/LetStmt/LetStmt_getInitializer.expected
@@ -1,4 +1,4 @@
-| gen_let_stmt.rs:5:9:5:9 | LetStmt | gen_let_stmt.rs:5:13:5:14 | LiteralExpr |
-| gen_let_stmt.rs:6:9:6:9 | LetStmt | gen_let_stmt.rs:6:18:6:19 | LiteralExpr |
-| gen_let_stmt.rs:9:9:9:14 | LetStmt | gen_let_stmt.rs:9:18:9:23 | TupleExpr |
-| gen_let_stmt.rs:10:9:10:15 | LetStmt | gen_let_stmt.rs:10:19:10:38 | CallExpr |
+| gen_let_stmt.rs:5:5:5:15 | LetStmt | gen_let_stmt.rs:5:13:5:14 | 42 |
+| gen_let_stmt.rs:6:5:6:20 | LetStmt | gen_let_stmt.rs:6:18:6:19 | 42 |
+| gen_let_stmt.rs:9:5:9:24 | LetStmt | gen_let_stmt.rs:9:18:9:23 | TupleExpr |
+| gen_let_stmt.rs:10:5:12:6 | LetStmt | gen_let_stmt.rs:10:19:10:38 | CallExpr |
diff --git a/rust/ql/test/extractor-tests/generated/LetStmt/LetStmt_getLetElse.expected b/rust/ql/test/extractor-tests/generated/LetStmt/LetStmt_getLetElse.expected
new file mode 100644
index 00000000000..8078ec66966
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/LetStmt/LetStmt_getLetElse.expected
@@ -0,0 +1 @@
+| gen_let_stmt.rs:10:5:12:6 | LetStmt | gen_let_stmt.rs:10:40:12:5 | LetElse |
diff --git a/rust/ql/test/extractor-tests/generated/LetStmt/LetStmt_getLetElse.ql b/rust/ql/test/extractor-tests/generated/LetStmt/LetStmt_getLetElse.ql
new file mode 100644
index 00000000000..f29257c0b28
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/LetStmt/LetStmt_getLetElse.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from LetStmt x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getLetElse()
diff --git a/rust/ql/test/extractor-tests/generated/LetStmt/LetStmt_getPat.expected b/rust/ql/test/extractor-tests/generated/LetStmt/LetStmt_getPat.expected
new file mode 100644
index 00000000000..93810df10e3
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/LetStmt/LetStmt_getPat.expected
@@ -0,0 +1,6 @@
+| gen_let_stmt.rs:5:5:5:15 | LetStmt | gen_let_stmt.rs:5:9:5:9 | x |
+| gen_let_stmt.rs:6:5:6:20 | LetStmt | gen_let_stmt.rs:6:9:6:9 | x |
+| gen_let_stmt.rs:7:5:7:15 | LetStmt | gen_let_stmt.rs:7:9:7:9 | x |
+| gen_let_stmt.rs:8:5:8:10 | LetStmt | gen_let_stmt.rs:8:9:8:9 | x |
+| gen_let_stmt.rs:9:5:9:24 | LetStmt | gen_let_stmt.rs:9:9:9:14 | TuplePat |
+| gen_let_stmt.rs:10:5:12:6 | LetStmt | gen_let_stmt.rs:10:9:10:15 | TupleStructPat |
diff --git a/rust/ql/test/extractor-tests/generated/LetStmt/LetStmt_getElse.ql b/rust/ql/test/extractor-tests/generated/LetStmt/LetStmt_getPat.ql
similarity index 86%
rename from rust/ql/test/extractor-tests/generated/LetStmt/LetStmt_getElse.ql
rename to rust/ql/test/extractor-tests/generated/LetStmt/LetStmt_getPat.ql
index 35c29979fd0..fd10317a287 100644
--- a/rust/ql/test/extractor-tests/generated/LetStmt/LetStmt_getElse.ql
+++ b/rust/ql/test/extractor-tests/generated/LetStmt/LetStmt_getPat.ql
@@ -4,4 +4,4 @@ import TestUtils
 
 from LetStmt x
 where toBeTested(x) and not x.isUnknown()
-select x, x.getElse()
+select x, x.getPat()
diff --git a/rust/ql/test/extractor-tests/generated/LetStmt/LetStmt_getTy.expected b/rust/ql/test/extractor-tests/generated/LetStmt/LetStmt_getTy.expected
new file mode 100644
index 00000000000..1cf6d1d2a51
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/LetStmt/LetStmt_getTy.expected
@@ -0,0 +1,2 @@
+| gen_let_stmt.rs:6:5:6:20 | LetStmt | gen_let_stmt.rs:6:12:6:14 | PathType |
+| gen_let_stmt.rs:7:5:7:15 | LetStmt | gen_let_stmt.rs:7:12:7:14 | PathType |
diff --git a/rust/ql/test/extractor-tests/generated/LetStmt/LetStmt_getType.ql b/rust/ql/test/extractor-tests/generated/LetStmt/LetStmt_getTy.ql
similarity index 86%
rename from rust/ql/test/extractor-tests/generated/LetStmt/LetStmt_getType.ql
rename to rust/ql/test/extractor-tests/generated/LetStmt/LetStmt_getTy.ql
index 641cdfe3245..507c43a5619 100644
--- a/rust/ql/test/extractor-tests/generated/LetStmt/LetStmt_getType.ql
+++ b/rust/ql/test/extractor-tests/generated/LetStmt/LetStmt_getTy.ql
@@ -4,4 +4,4 @@ import TestUtils
 
 from LetStmt x
 where toBeTested(x) and not x.isUnknown()
-select x, x.getType()
+select x, x.getTy()
diff --git a/rust/ql/test/extractor-tests/generated/LetStmt/LetStmt_getType.expected b/rust/ql/test/extractor-tests/generated/LetStmt/LetStmt_getType.expected
deleted file mode 100644
index 7a67697cb65..00000000000
--- a/rust/ql/test/extractor-tests/generated/LetStmt/LetStmt_getType.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-| gen_let_stmt.rs:6:9:6:9 | LetStmt | file://:0:0:0:0 | TypeRef |
-| gen_let_stmt.rs:7:9:7:9 | LetStmt | file://:0:0:0:0 | TypeRef |
diff --git a/rust/ql/test/extractor-tests/generated/Lifetime/Lifetime.expected b/rust/ql/test/extractor-tests/generated/Lifetime/Lifetime.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/Lifetime/Lifetime.ql b/rust/ql/test/extractor-tests/generated/Lifetime/Lifetime.ql
new file mode 100644
index 00000000000..e07b53ec7a0
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/Lifetime/Lifetime.ql
@@ -0,0 +1,10 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from Lifetime x, string hasText
+where
+  toBeTested(x) and
+  not x.isUnknown() and
+  if x.hasText() then hasText = "yes" else hasText = "no"
+select x, "hasText:", hasText
diff --git a/rust/ql/test/extractor-tests/generated/Lifetime/Lifetime_getText.expected b/rust/ql/test/extractor-tests/generated/Lifetime/Lifetime_getText.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/Lifetime/Lifetime_getText.ql b/rust/ql/test/extractor-tests/generated/Lifetime/Lifetime_getText.ql
new file mode 100644
index 00000000000..471b3a2405b
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/Lifetime/Lifetime_getText.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from Lifetime x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getText()
diff --git a/rust/ql/test/extractor-tests/generated/Lifetime/gen_lifetime.rs b/rust/ql/test/extractor-tests/generated/Lifetime/gen_lifetime.rs
new file mode 100644
index 00000000000..700261e2af5
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/Lifetime/gen_lifetime.rs
@@ -0,0 +1,6 @@
+// generated by codegen, do not edit
+
+fn test_lifetime() -> () {
+    // A Lifetime. For example:
+    todo!()
+}
diff --git a/rust/ql/test/extractor-tests/generated/LifetimeArg/LifetimeArg.expected b/rust/ql/test/extractor-tests/generated/LifetimeArg/LifetimeArg.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/LifetimeArg/LifetimeArg.ql b/rust/ql/test/extractor-tests/generated/LifetimeArg/LifetimeArg.ql
new file mode 100644
index 00000000000..83033e27af9
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/LifetimeArg/LifetimeArg.ql
@@ -0,0 +1,10 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from LifetimeArg x, string hasLifetime
+where
+  toBeTested(x) and
+  not x.isUnknown() and
+  if x.hasLifetime() then hasLifetime = "yes" else hasLifetime = "no"
+select x, "hasLifetime:", hasLifetime
diff --git a/rust/ql/test/extractor-tests/generated/LifetimeArg/LifetimeArg_getLifetime.expected b/rust/ql/test/extractor-tests/generated/LifetimeArg/LifetimeArg_getLifetime.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/LifetimeArg/LifetimeArg_getLifetime.ql b/rust/ql/test/extractor-tests/generated/LifetimeArg/LifetimeArg_getLifetime.ql
new file mode 100644
index 00000000000..0fe36ad8514
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/LifetimeArg/LifetimeArg_getLifetime.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from LifetimeArg x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getLifetime()
diff --git a/rust/ql/test/extractor-tests/generated/LifetimeArg/gen_lifetime_arg.rs b/rust/ql/test/extractor-tests/generated/LifetimeArg/gen_lifetime_arg.rs
new file mode 100644
index 00000000000..cb03015cad0
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/LifetimeArg/gen_lifetime_arg.rs
@@ -0,0 +1,6 @@
+// generated by codegen, do not edit
+
+fn test_lifetime_arg() -> () {
+    // A LifetimeArg. For example:
+    todo!()
+}
diff --git a/rust/ql/test/extractor-tests/generated/LifetimeParam/LifetimeParam.expected b/rust/ql/test/extractor-tests/generated/LifetimeParam/LifetimeParam.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/LifetimeParam/LifetimeParam.ql b/rust/ql/test/extractor-tests/generated/LifetimeParam/LifetimeParam.ql
new file mode 100644
index 00000000000..abe4635c285
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/LifetimeParam/LifetimeParam.ql
@@ -0,0 +1,13 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from LifetimeParam x, int getNumberOfAttrs, string hasLifetime, string hasTypeBoundList
+where
+  toBeTested(x) and
+  not x.isUnknown() and
+  getNumberOfAttrs = x.getNumberOfAttrs() and
+  (if x.hasLifetime() then hasLifetime = "yes" else hasLifetime = "no") and
+  if x.hasTypeBoundList() then hasTypeBoundList = "yes" else hasTypeBoundList = "no"
+select x, "getNumberOfAttrs:", getNumberOfAttrs, "hasLifetime:", hasLifetime, "hasTypeBoundList:",
+  hasTypeBoundList
diff --git a/rust/ql/test/extractor-tests/generated/LifetimeParam/LifetimeParam_getAttr.expected b/rust/ql/test/extractor-tests/generated/LifetimeParam/LifetimeParam_getAttr.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/LifetimeParam/LifetimeParam_getAttr.ql b/rust/ql/test/extractor-tests/generated/LifetimeParam/LifetimeParam_getAttr.ql
new file mode 100644
index 00000000000..6053ca9b5fe
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/LifetimeParam/LifetimeParam_getAttr.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from LifetimeParam x, int index
+where toBeTested(x) and not x.isUnknown()
+select x, index, x.getAttr(index)
diff --git a/rust/ql/test/extractor-tests/generated/LifetimeParam/LifetimeParam_getLifetime.expected b/rust/ql/test/extractor-tests/generated/LifetimeParam/LifetimeParam_getLifetime.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/LifetimeParam/LifetimeParam_getLifetime.ql b/rust/ql/test/extractor-tests/generated/LifetimeParam/LifetimeParam_getLifetime.ql
new file mode 100644
index 00000000000..0cc315fabe0
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/LifetimeParam/LifetimeParam_getLifetime.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from LifetimeParam x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getLifetime()
diff --git a/rust/ql/test/extractor-tests/generated/LifetimeParam/LifetimeParam_getTypeBoundList.expected b/rust/ql/test/extractor-tests/generated/LifetimeParam/LifetimeParam_getTypeBoundList.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/LifetimeParam/LifetimeParam_getTypeBoundList.ql b/rust/ql/test/extractor-tests/generated/LifetimeParam/LifetimeParam_getTypeBoundList.ql
new file mode 100644
index 00000000000..67370167084
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/LifetimeParam/LifetimeParam_getTypeBoundList.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from LifetimeParam x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getTypeBoundList()
diff --git a/rust/ql/test/extractor-tests/generated/LifetimeParam/gen_lifetime_param.rs b/rust/ql/test/extractor-tests/generated/LifetimeParam/gen_lifetime_param.rs
new file mode 100644
index 00000000000..7b55f134665
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/LifetimeParam/gen_lifetime_param.rs
@@ -0,0 +1,6 @@
+// generated by codegen, do not edit
+
+fn test_lifetime_param() -> () {
+    // A LifetimeParam. For example:
+    todo!()
+}
diff --git a/rust/ql/test/extractor-tests/generated/LiteralExpr/LiteralExpr.expected b/rust/ql/test/extractor-tests/generated/LiteralExpr/LiteralExpr.expected
index 4ea6107f6a8..afe42a48f8f 100644
--- a/rust/ql/test/extractor-tests/generated/LiteralExpr/LiteralExpr.expected
+++ b/rust/ql/test/extractor-tests/generated/LiteralExpr/LiteralExpr.expected
@@ -1,8 +1,8 @@
-| gen_literal_expr.rs:5:5:5:6 | LiteralExpr |
-| gen_literal_expr.rs:6:5:6:8 | LiteralExpr |
-| gen_literal_expr.rs:7:5:7:19 | LiteralExpr |
-| gen_literal_expr.rs:8:5:8:20 | LiteralExpr |
-| gen_literal_expr.rs:9:5:9:7 | LiteralExpr |
-| gen_literal_expr.rs:10:5:10:8 | LiteralExpr |
-| gen_literal_expr.rs:11:5:11:20 | LiteralExpr |
-| gen_literal_expr.rs:12:5:12:8 | LiteralExpr |
+| gen_literal_expr.rs:5:5:5:6 | 42 | getNumberOfAttrs: | 0 | hasTextValue: | yes |
+| gen_literal_expr.rs:6:5:6:8 | 42.0 | getNumberOfAttrs: | 0 | hasTextValue: | yes |
+| gen_literal_expr.rs:7:5:7:19 | "Hello, world!" | getNumberOfAttrs: | 0 | hasTextValue: | yes |
+| gen_literal_expr.rs:8:5:8:20 | b"Hello, world!" | getNumberOfAttrs: | 0 | hasTextValue: | yes |
+| gen_literal_expr.rs:9:5:9:7 | 'x' | getNumberOfAttrs: | 0 | hasTextValue: | yes |
+| gen_literal_expr.rs:10:5:10:8 | b'x' | getNumberOfAttrs: | 0 | hasTextValue: | yes |
+| gen_literal_expr.rs:11:5:11:20 | r"Hello, world!" | getNumberOfAttrs: | 0 | hasTextValue: | yes |
+| gen_literal_expr.rs:12:5:12:8 | true | getNumberOfAttrs: | 0 | hasTextValue: | yes |
diff --git a/rust/ql/test/extractor-tests/generated/LiteralExpr/LiteralExpr.ql b/rust/ql/test/extractor-tests/generated/LiteralExpr/LiteralExpr.ql
index 70c1d4f7c3f..c33f15d8aff 100644
--- a/rust/ql/test/extractor-tests/generated/LiteralExpr/LiteralExpr.ql
+++ b/rust/ql/test/extractor-tests/generated/LiteralExpr/LiteralExpr.ql
@@ -2,6 +2,10 @@
 import codeql.rust.elements
 import TestUtils
 
-from LiteralExpr x
-where toBeTested(x) and not x.isUnknown()
-select x
+from LiteralExpr x, int getNumberOfAttrs, string hasTextValue
+where
+  toBeTested(x) and
+  not x.isUnknown() and
+  getNumberOfAttrs = x.getNumberOfAttrs() and
+  if x.hasTextValue() then hasTextValue = "yes" else hasTextValue = "no"
+select x, "getNumberOfAttrs:", getNumberOfAttrs, "hasTextValue:", hasTextValue
diff --git a/rust/ql/test/extractor-tests/generated/LiteralExpr/LiteralExpr_getAttr.expected b/rust/ql/test/extractor-tests/generated/LiteralExpr/LiteralExpr_getAttr.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/LiteralExpr/LiteralExpr_getAttr.ql b/rust/ql/test/extractor-tests/generated/LiteralExpr/LiteralExpr_getAttr.ql
new file mode 100644
index 00000000000..a4362a3ea72
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/LiteralExpr/LiteralExpr_getAttr.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from LiteralExpr x, int index
+where toBeTested(x) and not x.isUnknown()
+select x, index, x.getAttr(index)
diff --git a/rust/ql/test/extractor-tests/generated/LiteralExpr/LiteralExpr_getTextValue.expected b/rust/ql/test/extractor-tests/generated/LiteralExpr/LiteralExpr_getTextValue.expected
new file mode 100644
index 00000000000..c41aeee97ec
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/LiteralExpr/LiteralExpr_getTextValue.expected
@@ -0,0 +1,8 @@
+| gen_literal_expr.rs:5:5:5:6 | 42 | 42 |
+| gen_literal_expr.rs:6:5:6:8 | 42.0 | 42.0 |
+| gen_literal_expr.rs:7:5:7:19 | "Hello, world!" | "Hello, world!" |
+| gen_literal_expr.rs:8:5:8:20 | b"Hello, world!" | b"Hello, world!" |
+| gen_literal_expr.rs:9:5:9:7 | 'x' | 'x' |
+| gen_literal_expr.rs:10:5:10:8 | b'x' | b'x' |
+| gen_literal_expr.rs:11:5:11:20 | r"Hello, world!" | r"Hello, world!" |
+| gen_literal_expr.rs:12:5:12:8 | true | true |
diff --git a/rust/ql/test/extractor-tests/generated/LiteralExpr/LiteralExpr_getTextValue.ql b/rust/ql/test/extractor-tests/generated/LiteralExpr/LiteralExpr_getTextValue.ql
new file mode 100644
index 00000000000..147110b9333
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/LiteralExpr/LiteralExpr_getTextValue.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from LiteralExpr x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getTextValue()
diff --git a/rust/ql/test/extractor-tests/generated/LiteralPat/LiteralPat.expected b/rust/ql/test/extractor-tests/generated/LiteralPat/LiteralPat.expected
index ebde9562c6d..b7ac2ced75f 100644
--- a/rust/ql/test/extractor-tests/generated/LiteralPat/LiteralPat.expected
+++ b/rust/ql/test/extractor-tests/generated/LiteralPat/LiteralPat.expected
@@ -1 +1 @@
-| gen_literal_pat.rs:6:9:6:10 | LiteralPat | getExpr: | gen_literal_pat.rs:6:9:6:10 | LiteralExpr |
+| gen_literal_pat.rs:6:9:6:10 | LiteralPat | hasLiteral: | yes |
diff --git a/rust/ql/test/extractor-tests/generated/LiteralPat/LiteralPat.ql b/rust/ql/test/extractor-tests/generated/LiteralPat/LiteralPat.ql
index 4c8993f88bb..6052b07a005 100644
--- a/rust/ql/test/extractor-tests/generated/LiteralPat/LiteralPat.ql
+++ b/rust/ql/test/extractor-tests/generated/LiteralPat/LiteralPat.ql
@@ -2,9 +2,9 @@
 import codeql.rust.elements
 import TestUtils
 
-from LiteralPat x, Expr getExpr
+from LiteralPat x, string hasLiteral
 where
   toBeTested(x) and
   not x.isUnknown() and
-  getExpr = x.getExpr()
-select x, "getExpr:", getExpr
+  if x.hasLiteral() then hasLiteral = "yes" else hasLiteral = "no"
+select x, "hasLiteral:", hasLiteral
diff --git a/rust/ql/test/extractor-tests/generated/LiteralPat/LiteralPat_getLiteral.expected b/rust/ql/test/extractor-tests/generated/LiteralPat/LiteralPat_getLiteral.expected
new file mode 100644
index 00000000000..ce74da0fb3a
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/LiteralPat/LiteralPat_getLiteral.expected
@@ -0,0 +1 @@
+| gen_literal_pat.rs:6:9:6:10 | LiteralPat | gen_literal_pat.rs:6:9:6:10 | 42 |
diff --git a/rust/ql/test/extractor-tests/generated/LiteralPat/LiteralPat_getLiteral.ql b/rust/ql/test/extractor-tests/generated/LiteralPat/LiteralPat_getLiteral.ql
new file mode 100644
index 00000000000..ca6ff418b1a
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/LiteralPat/LiteralPat_getLiteral.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from LiteralPat x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getLiteral()
diff --git a/rust/ql/test/extractor-tests/generated/LoopExpr/LoopExpr.expected b/rust/ql/test/extractor-tests/generated/LoopExpr/LoopExpr.expected
index 82e50bf474f..aae22652d64 100644
--- a/rust/ql/test/extractor-tests/generated/LoopExpr/LoopExpr.expected
+++ b/rust/ql/test/extractor-tests/generated/LoopExpr/LoopExpr.expected
@@ -1,3 +1,3 @@
-| gen_loop_expr.rs:5:5:7:5 | LoopExpr | getBody: | gen_loop_expr.rs:5:10:7:5 | BlockExpr | hasLabel: | no |
-| gen_loop_expr.rs:8:5:11:5 | LoopExpr | getBody: | gen_loop_expr.rs:8:18:11:5 | BlockExpr | hasLabel: | yes |
-| gen_loop_expr.rs:13:5:19:5 | LoopExpr | getBody: | gen_loop_expr.rs:13:10:19:5 | BlockExpr | hasLabel: | no |
+| gen_loop_expr.rs:5:5:7:5 | LoopExpr | getNumberOfAttrs: | 0 | hasLabel: | no | hasLoopBody: | yes |
+| gen_loop_expr.rs:8:5:11:5 | LoopExpr | getNumberOfAttrs: | 0 | hasLabel: | yes | hasLoopBody: | yes |
+| gen_loop_expr.rs:13:5:19:5 | LoopExpr | getNumberOfAttrs: | 0 | hasLabel: | no | hasLoopBody: | yes |
diff --git a/rust/ql/test/extractor-tests/generated/LoopExpr/LoopExpr.ql b/rust/ql/test/extractor-tests/generated/LoopExpr/LoopExpr.ql
index 535381c822c..c627fb16771 100644
--- a/rust/ql/test/extractor-tests/generated/LoopExpr/LoopExpr.ql
+++ b/rust/ql/test/extractor-tests/generated/LoopExpr/LoopExpr.ql
@@ -2,10 +2,11 @@
 import codeql.rust.elements
 import TestUtils
 
-from LoopExpr x, Expr getBody, string hasLabel
+from LoopExpr x, int getNumberOfAttrs, string hasLabel, string hasLoopBody
 where
   toBeTested(x) and
   not x.isUnknown() and
-  getBody = x.getBody() and
-  if x.hasLabel() then hasLabel = "yes" else hasLabel = "no"
-select x, "getBody:", getBody, "hasLabel:", hasLabel
+  getNumberOfAttrs = x.getNumberOfAttrs() and
+  (if x.hasLabel() then hasLabel = "yes" else hasLabel = "no") and
+  if x.hasLoopBody() then hasLoopBody = "yes" else hasLoopBody = "no"
+select x, "getNumberOfAttrs:", getNumberOfAttrs, "hasLabel:", hasLabel, "hasLoopBody:", hasLoopBody
diff --git a/rust/ql/test/extractor-tests/generated/LoopExpr/LoopExpr_getAttr.expected b/rust/ql/test/extractor-tests/generated/LoopExpr/LoopExpr_getAttr.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/LoopExpr/LoopExpr_getAttr.ql b/rust/ql/test/extractor-tests/generated/LoopExpr/LoopExpr_getAttr.ql
new file mode 100644
index 00000000000..6367edb6421
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/LoopExpr/LoopExpr_getAttr.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from LoopExpr x, int index
+where toBeTested(x) and not x.isUnknown()
+select x, index, x.getAttr(index)
diff --git a/rust/ql/test/extractor-tests/generated/LoopExpr/LoopExpr_getLoopBody.expected b/rust/ql/test/extractor-tests/generated/LoopExpr/LoopExpr_getLoopBody.expected
new file mode 100644
index 00000000000..358fd7625b5
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/LoopExpr/LoopExpr_getLoopBody.expected
@@ -0,0 +1,3 @@
+| gen_loop_expr.rs:5:5:7:5 | LoopExpr | gen_loop_expr.rs:5:10:7:5 | BlockExpr |
+| gen_loop_expr.rs:8:5:11:5 | LoopExpr | gen_loop_expr.rs:8:18:11:5 | BlockExpr |
+| gen_loop_expr.rs:13:5:19:5 | LoopExpr | gen_loop_expr.rs:13:10:19:5 | BlockExpr |
diff --git a/rust/ql/test/extractor-tests/generated/LoopExpr/LoopExpr_getLoopBody.ql b/rust/ql/test/extractor-tests/generated/LoopExpr/LoopExpr_getLoopBody.ql
new file mode 100644
index 00000000000..bd44b0ac733
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/LoopExpr/LoopExpr_getLoopBody.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from LoopExpr x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getLoopBody()
diff --git a/rust/ql/test/extractor-tests/generated/MacroCall/MacroCall.expected b/rust/ql/test/extractor-tests/generated/MacroCall/MacroCall.expected
new file mode 100644
index 00000000000..03bcc247a9d
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/MacroCall/MacroCall.expected
@@ -0,0 +1 @@
+| gen_macro_call.rs:5:5:5:11 | MacroCall | hasExtendedCanonicalPath: | no | hasCrateOrigin: | no | getNumberOfAttrs: | 0 | hasPath: | yes | hasTokenTree: | yes | hasExpanded: | yes |
diff --git a/rust/ql/test/extractor-tests/generated/MacroCall/MacroCall.ql b/rust/ql/test/extractor-tests/generated/MacroCall/MacroCall.ql
new file mode 100644
index 00000000000..56044c127c2
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/MacroCall/MacroCall.ql
@@ -0,0 +1,23 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from
+  MacroCall x, string hasExtendedCanonicalPath, string hasCrateOrigin, int getNumberOfAttrs,
+  string hasPath, string hasTokenTree, string hasExpanded
+where
+  toBeTested(x) and
+  not x.isUnknown() and
+  (
+    if x.hasExtendedCanonicalPath()
+    then hasExtendedCanonicalPath = "yes"
+    else hasExtendedCanonicalPath = "no"
+  ) and
+  (if x.hasCrateOrigin() then hasCrateOrigin = "yes" else hasCrateOrigin = "no") and
+  getNumberOfAttrs = x.getNumberOfAttrs() and
+  (if x.hasPath() then hasPath = "yes" else hasPath = "no") and
+  (if x.hasTokenTree() then hasTokenTree = "yes" else hasTokenTree = "no") and
+  if x.hasExpanded() then hasExpanded = "yes" else hasExpanded = "no"
+select x, "hasExtendedCanonicalPath:", hasExtendedCanonicalPath, "hasCrateOrigin:", hasCrateOrigin,
+  "getNumberOfAttrs:", getNumberOfAttrs, "hasPath:", hasPath, "hasTokenTree:", hasTokenTree,
+  "hasExpanded:", hasExpanded
diff --git a/rust/ql/test/extractor-tests/generated/MacroCall/MacroCall_getAttr.expected b/rust/ql/test/extractor-tests/generated/MacroCall/MacroCall_getAttr.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/MacroCall/MacroCall_getAttr.ql b/rust/ql/test/extractor-tests/generated/MacroCall/MacroCall_getAttr.ql
new file mode 100644
index 00000000000..ef6a94400f0
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/MacroCall/MacroCall_getAttr.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from MacroCall x, int index
+where toBeTested(x) and not x.isUnknown()
+select x, index, x.getAttr(index)
diff --git a/rust/ql/test/extractor-tests/generated/MacroCall/MacroCall_getCrateOrigin.expected b/rust/ql/test/extractor-tests/generated/MacroCall/MacroCall_getCrateOrigin.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/MacroCall/MacroCall_getCrateOrigin.ql b/rust/ql/test/extractor-tests/generated/MacroCall/MacroCall_getCrateOrigin.ql
new file mode 100644
index 00000000000..60e32669e7f
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/MacroCall/MacroCall_getCrateOrigin.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from MacroCall x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getCrateOrigin()
diff --git a/rust/ql/test/extractor-tests/generated/MacroCall/MacroCall_getExpanded.expected b/rust/ql/test/extractor-tests/generated/MacroCall/MacroCall_getExpanded.expected
new file mode 100644
index 00000000000..7bdb564985f
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/MacroCall/MacroCall_getExpanded.expected
@@ -0,0 +1 @@
+| gen_macro_call.rs:5:5:5:11 | MacroCall | gen_macro_call.rs:5:5:5:11 | MacroStmts |
diff --git a/rust/ql/test/extractor-tests/generated/MacroCall/MacroCall_getExpanded.ql b/rust/ql/test/extractor-tests/generated/MacroCall/MacroCall_getExpanded.ql
new file mode 100644
index 00000000000..be63430c9ed
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/MacroCall/MacroCall_getExpanded.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from MacroCall x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getExpanded()
diff --git a/rust/ql/test/extractor-tests/generated/MacroCall/MacroCall_getExtendedCanonicalPath.expected b/rust/ql/test/extractor-tests/generated/MacroCall/MacroCall_getExtendedCanonicalPath.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/MacroCall/MacroCall_getExtendedCanonicalPath.ql b/rust/ql/test/extractor-tests/generated/MacroCall/MacroCall_getExtendedCanonicalPath.ql
new file mode 100644
index 00000000000..0fffb4f4384
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/MacroCall/MacroCall_getExtendedCanonicalPath.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from MacroCall x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getExtendedCanonicalPath()
diff --git a/rust/ql/test/extractor-tests/generated/MacroCall/MacroCall_getPath.expected b/rust/ql/test/extractor-tests/generated/MacroCall/MacroCall_getPath.expected
new file mode 100644
index 00000000000..33685ad0aad
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/MacroCall/MacroCall_getPath.expected
@@ -0,0 +1 @@
+| gen_macro_call.rs:5:5:5:11 | MacroCall | gen_macro_call.rs:5:5:5:8 | todo |
diff --git a/rust/ql/test/extractor-tests/generated/MacroCall/MacroCall_getPath.ql b/rust/ql/test/extractor-tests/generated/MacroCall/MacroCall_getPath.ql
new file mode 100644
index 00000000000..729ce15fb3f
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/MacroCall/MacroCall_getPath.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from MacroCall x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getPath()
diff --git a/rust/ql/test/extractor-tests/generated/MacroCall/MacroCall_getTokenTree.expected b/rust/ql/test/extractor-tests/generated/MacroCall/MacroCall_getTokenTree.expected
new file mode 100644
index 00000000000..5f92a68536c
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/MacroCall/MacroCall_getTokenTree.expected
@@ -0,0 +1 @@
+| gen_macro_call.rs:5:5:5:11 | MacroCall | gen_macro_call.rs:5:10:5:11 | TokenTree |
diff --git a/rust/ql/test/extractor-tests/generated/MacroCall/MacroCall_getTokenTree.ql b/rust/ql/test/extractor-tests/generated/MacroCall/MacroCall_getTokenTree.ql
new file mode 100644
index 00000000000..3186e5c6297
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/MacroCall/MacroCall_getTokenTree.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from MacroCall x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getTokenTree()
diff --git a/rust/ql/test/extractor-tests/generated/MacroCall/gen_macro_call.rs b/rust/ql/test/extractor-tests/generated/MacroCall/gen_macro_call.rs
new file mode 100644
index 00000000000..33b3ec16124
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/MacroCall/gen_macro_call.rs
@@ -0,0 +1,6 @@
+// generated by codegen, do not edit
+
+fn test_macro_call() -> () {
+    // A MacroCall. For example:
+    todo!()
+}
diff --git a/rust/ql/test/extractor-tests/generated/MacroDef/MacroDef.expected b/rust/ql/test/extractor-tests/generated/MacroDef/MacroDef.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/MacroDef/MacroDef.ql b/rust/ql/test/extractor-tests/generated/MacroDef/MacroDef.ql
new file mode 100644
index 00000000000..957d5b9ea9e
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/MacroDef/MacroDef.ql
@@ -0,0 +1,24 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from
+  MacroDef x, string hasExtendedCanonicalPath, string hasCrateOrigin, string hasArgs,
+  int getNumberOfAttrs, string hasBody, string hasName, string hasVisibility
+where
+  toBeTested(x) and
+  not x.isUnknown() and
+  (
+    if x.hasExtendedCanonicalPath()
+    then hasExtendedCanonicalPath = "yes"
+    else hasExtendedCanonicalPath = "no"
+  ) and
+  (if x.hasCrateOrigin() then hasCrateOrigin = "yes" else hasCrateOrigin = "no") and
+  (if x.hasArgs() then hasArgs = "yes" else hasArgs = "no") and
+  getNumberOfAttrs = x.getNumberOfAttrs() and
+  (if x.hasBody() then hasBody = "yes" else hasBody = "no") and
+  (if x.hasName() then hasName = "yes" else hasName = "no") and
+  if x.hasVisibility() then hasVisibility = "yes" else hasVisibility = "no"
+select x, "hasExtendedCanonicalPath:", hasExtendedCanonicalPath, "hasCrateOrigin:", hasCrateOrigin,
+  "hasArgs:", hasArgs, "getNumberOfAttrs:", getNumberOfAttrs, "hasBody:", hasBody, "hasName:",
+  hasName, "hasVisibility:", hasVisibility
diff --git a/rust/ql/test/extractor-tests/generated/MacroDef/MacroDef_getArgs.expected b/rust/ql/test/extractor-tests/generated/MacroDef/MacroDef_getArgs.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/MacroDef/MacroDef_getArgs.ql b/rust/ql/test/extractor-tests/generated/MacroDef/MacroDef_getArgs.ql
new file mode 100644
index 00000000000..304f6f8d5e3
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/MacroDef/MacroDef_getArgs.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from MacroDef x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getArgs()
diff --git a/rust/ql/test/extractor-tests/generated/MacroDef/MacroDef_getAttr.expected b/rust/ql/test/extractor-tests/generated/MacroDef/MacroDef_getAttr.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/MacroDef/MacroDef_getAttr.ql b/rust/ql/test/extractor-tests/generated/MacroDef/MacroDef_getAttr.ql
new file mode 100644
index 00000000000..28e5f418c01
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/MacroDef/MacroDef_getAttr.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from MacroDef x, int index
+where toBeTested(x) and not x.isUnknown()
+select x, index, x.getAttr(index)
diff --git a/rust/ql/test/extractor-tests/generated/MacroDef/MacroDef_getBody.expected b/rust/ql/test/extractor-tests/generated/MacroDef/MacroDef_getBody.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/MacroDef/MacroDef_getBody.ql b/rust/ql/test/extractor-tests/generated/MacroDef/MacroDef_getBody.ql
new file mode 100644
index 00000000000..0c2f4e329fd
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/MacroDef/MacroDef_getBody.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from MacroDef x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getBody()
diff --git a/rust/ql/test/extractor-tests/generated/MacroDef/MacroDef_getCrateOrigin.expected b/rust/ql/test/extractor-tests/generated/MacroDef/MacroDef_getCrateOrigin.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/MacroDef/MacroDef_getCrateOrigin.ql b/rust/ql/test/extractor-tests/generated/MacroDef/MacroDef_getCrateOrigin.ql
new file mode 100644
index 00000000000..81aa4aa3fad
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/MacroDef/MacroDef_getCrateOrigin.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from MacroDef x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getCrateOrigin()
diff --git a/rust/ql/test/extractor-tests/generated/MacroDef/MacroDef_getExtendedCanonicalPath.expected b/rust/ql/test/extractor-tests/generated/MacroDef/MacroDef_getExtendedCanonicalPath.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/MacroDef/MacroDef_getExtendedCanonicalPath.ql b/rust/ql/test/extractor-tests/generated/MacroDef/MacroDef_getExtendedCanonicalPath.ql
new file mode 100644
index 00000000000..c30de43e669
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/MacroDef/MacroDef_getExtendedCanonicalPath.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from MacroDef x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getExtendedCanonicalPath()
diff --git a/rust/ql/test/extractor-tests/generated/MacroDef/MacroDef_getName.expected b/rust/ql/test/extractor-tests/generated/MacroDef/MacroDef_getName.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/MacroDef/MacroDef_getName.ql b/rust/ql/test/extractor-tests/generated/MacroDef/MacroDef_getName.ql
new file mode 100644
index 00000000000..49cba18e277
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/MacroDef/MacroDef_getName.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from MacroDef x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getName()
diff --git a/rust/ql/test/extractor-tests/generated/MacroDef/MacroDef_getVisibility.expected b/rust/ql/test/extractor-tests/generated/MacroDef/MacroDef_getVisibility.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/MacroDef/MacroDef_getVisibility.ql b/rust/ql/test/extractor-tests/generated/MacroDef/MacroDef_getVisibility.ql
new file mode 100644
index 00000000000..11323b3a581
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/MacroDef/MacroDef_getVisibility.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from MacroDef x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getVisibility()
diff --git a/rust/ql/test/extractor-tests/generated/MacroDef/gen_macro_def.rs b/rust/ql/test/extractor-tests/generated/MacroDef/gen_macro_def.rs
new file mode 100644
index 00000000000..7fdd2aea756
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/MacroDef/gen_macro_def.rs
@@ -0,0 +1,6 @@
+// generated by codegen, do not edit
+
+fn test_macro_def() -> () {
+    // A MacroDef. For example:
+    todo!()
+}
diff --git a/rust/ql/test/extractor-tests/generated/MacroExpr/MacroExpr.expected b/rust/ql/test/extractor-tests/generated/MacroExpr/MacroExpr.expected
new file mode 100644
index 00000000000..79f6d26b811
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/MacroExpr/MacroExpr.expected
@@ -0,0 +1 @@
+| gen_macro_expr.rs:5:5:5:11 | MacroExpr | hasMacroCall: | yes |
diff --git a/rust/ql/test/extractor-tests/generated/MacroExpr/MacroExpr.ql b/rust/ql/test/extractor-tests/generated/MacroExpr/MacroExpr.ql
new file mode 100644
index 00000000000..a2c2d431512
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/MacroExpr/MacroExpr.ql
@@ -0,0 +1,10 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from MacroExpr x, string hasMacroCall
+where
+  toBeTested(x) and
+  not x.isUnknown() and
+  if x.hasMacroCall() then hasMacroCall = "yes" else hasMacroCall = "no"
+select x, "hasMacroCall:", hasMacroCall
diff --git a/rust/ql/test/extractor-tests/generated/MacroExpr/MacroExpr_getMacroCall.expected b/rust/ql/test/extractor-tests/generated/MacroExpr/MacroExpr_getMacroCall.expected
new file mode 100644
index 00000000000..5a635cabcbe
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/MacroExpr/MacroExpr_getMacroCall.expected
@@ -0,0 +1 @@
+| gen_macro_expr.rs:5:5:5:11 | MacroExpr | gen_macro_expr.rs:5:5:5:11 | MacroCall |
diff --git a/rust/ql/test/extractor-tests/generated/MacroExpr/MacroExpr_getMacroCall.ql b/rust/ql/test/extractor-tests/generated/MacroExpr/MacroExpr_getMacroCall.ql
new file mode 100644
index 00000000000..7c1d6c44c26
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/MacroExpr/MacroExpr_getMacroCall.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from MacroExpr x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getMacroCall()
diff --git a/rust/ql/test/extractor-tests/generated/MacroExpr/gen_macro_expr.rs b/rust/ql/test/extractor-tests/generated/MacroExpr/gen_macro_expr.rs
new file mode 100644
index 00000000000..245187b1853
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/MacroExpr/gen_macro_expr.rs
@@ -0,0 +1,6 @@
+// generated by codegen, do not edit
+
+fn test_macro_expr() -> () {
+    // A MacroExpr. For example:
+    todo!()
+}
diff --git a/rust/ql/test/extractor-tests/generated/MacroItems/CONSISTENCY/DataFlowConsistency.expected b/rust/ql/test/extractor-tests/generated/MacroItems/CONSISTENCY/DataFlowConsistency.expected
new file mode 100644
index 00000000000..02210855a69
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/MacroItems/CONSISTENCY/DataFlowConsistency.expected
@@ -0,0 +1,9 @@
+uniqueNodeLocation
+| file://:0:0:0:0 | ... .parent(...) | Node should have one location but has 0. |
+| file://:0:0:0:0 | ... .unwrap(...) | Node should have one location but has 0. |
+| file://:0:0:0:0 | BlockExpr | Node should have one location but has 0. |
+| file://:0:0:0:0 | Param | Node should have one location but has 0. |
+| file://:0:0:0:0 | path | Node should have one location but has 0. |
+| file://:0:0:0:0 | path | Node should have one location but has 0. |
+missingLocation
+| Nodes without location: 6 |
diff --git a/rust/ql/test/extractor-tests/generated/MacroItems/MacroItems.expected b/rust/ql/test/extractor-tests/generated/MacroItems/MacroItems.expected
new file mode 100644
index 00000000000..6ef208f9c74
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/MacroItems/MacroItems.expected
@@ -0,0 +1 @@
+| file://:0:0:0:0 | MacroItems | getNumberOfItems: | 2 |
diff --git a/rust/ql/test/extractor-tests/generated/MacroItems/MacroItems.ql b/rust/ql/test/extractor-tests/generated/MacroItems/MacroItems.ql
new file mode 100644
index 00000000000..cd72b24c18d
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/MacroItems/MacroItems.ql
@@ -0,0 +1,10 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from MacroItems x, int getNumberOfItems
+where
+  toBeTested(x) and
+  not x.isUnknown() and
+  getNumberOfItems = x.getNumberOfItems()
+select x, "getNumberOfItems:", getNumberOfItems
diff --git a/rust/ql/test/extractor-tests/generated/MacroItems/MacroItems_getItem.expected b/rust/ql/test/extractor-tests/generated/MacroItems/MacroItems_getItem.expected
new file mode 100644
index 00000000000..a66e6bcca5e
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/MacroItems/MacroItems_getItem.expected
@@ -0,0 +1,2 @@
+| file://:0:0:0:0 | MacroItems | 0 | file://:0:0:0:0 | Use |
+| file://:0:0:0:0 | MacroItems | 1 | file://:0:0:0:0 | get_parent |
diff --git a/rust/ql/test/extractor-tests/generated/MacroItems/MacroItems_getItem.ql b/rust/ql/test/extractor-tests/generated/MacroItems/MacroItems_getItem.ql
new file mode 100644
index 00000000000..09aaa2b8be7
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/MacroItems/MacroItems_getItem.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from MacroItems x, int index
+where toBeTested(x) and not x.isUnknown()
+select x, index, x.getItem(index)
diff --git a/rust/ql/test/extractor-tests/generated/MacroItems/common_definitions.rs b/rust/ql/test/extractor-tests/generated/MacroItems/common_definitions.rs
new file mode 100644
index 00000000000..95a388ea93d
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/MacroItems/common_definitions.rs
@@ -0,0 +1,5 @@
+use std::path::Path;
+
+fn get_parent(path: &Path) -> &Path {
+    path.parent().unwrap()
+}
diff --git a/rust/ql/test/extractor-tests/generated/MacroItems/gen_macro_items.rs b/rust/ql/test/extractor-tests/generated/MacroItems/gen_macro_items.rs
new file mode 100644
index 00000000000..08914ad0452
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/MacroItems/gen_macro_items.rs
@@ -0,0 +1,6 @@
+// generated by codegen, do not edit
+
+// A sequence of items generated by a `MacroCall`. For example:
+mod foo{
+    include!("common_definitions.rs");
+}
diff --git a/rust/ql/test/extractor-tests/generated/MacroPat/MacroPat.expected b/rust/ql/test/extractor-tests/generated/MacroPat/MacroPat.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/MacroPat/MacroPat.ql b/rust/ql/test/extractor-tests/generated/MacroPat/MacroPat.ql
new file mode 100644
index 00000000000..d54889e043b
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/MacroPat/MacroPat.ql
@@ -0,0 +1,10 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from MacroPat x, string hasMacroCall
+where
+  toBeTested(x) and
+  not x.isUnknown() and
+  if x.hasMacroCall() then hasMacroCall = "yes" else hasMacroCall = "no"
+select x, "hasMacroCall:", hasMacroCall
diff --git a/rust/ql/test/extractor-tests/generated/MacroPat/MacroPat_getMacroCall.expected b/rust/ql/test/extractor-tests/generated/MacroPat/MacroPat_getMacroCall.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/MacroPat/MacroPat_getMacroCall.ql b/rust/ql/test/extractor-tests/generated/MacroPat/MacroPat_getMacroCall.ql
new file mode 100644
index 00000000000..9c8f0846ede
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/MacroPat/MacroPat_getMacroCall.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from MacroPat x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getMacroCall()
diff --git a/rust/ql/test/extractor-tests/generated/MacroPat/gen_macro_pat.rs b/rust/ql/test/extractor-tests/generated/MacroPat/gen_macro_pat.rs
new file mode 100644
index 00000000000..bfd718fe928
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/MacroPat/gen_macro_pat.rs
@@ -0,0 +1,6 @@
+// generated by codegen, do not edit
+
+fn test_macro_pat() -> () {
+    // A MacroPat. For example:
+    todo!()
+}
diff --git a/rust/ql/test/extractor-tests/generated/MacroRules/MacroRules.expected b/rust/ql/test/extractor-tests/generated/MacroRules/MacroRules.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/MacroRules/MacroRules.ql b/rust/ql/test/extractor-tests/generated/MacroRules/MacroRules.ql
new file mode 100644
index 00000000000..7bdc462c01c
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/MacroRules/MacroRules.ql
@@ -0,0 +1,23 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from
+  MacroRules x, string hasExtendedCanonicalPath, string hasCrateOrigin, int getNumberOfAttrs,
+  string hasName, string hasTokenTree, string hasVisibility
+where
+  toBeTested(x) and
+  not x.isUnknown() and
+  (
+    if x.hasExtendedCanonicalPath()
+    then hasExtendedCanonicalPath = "yes"
+    else hasExtendedCanonicalPath = "no"
+  ) and
+  (if x.hasCrateOrigin() then hasCrateOrigin = "yes" else hasCrateOrigin = "no") and
+  getNumberOfAttrs = x.getNumberOfAttrs() and
+  (if x.hasName() then hasName = "yes" else hasName = "no") and
+  (if x.hasTokenTree() then hasTokenTree = "yes" else hasTokenTree = "no") and
+  if x.hasVisibility() then hasVisibility = "yes" else hasVisibility = "no"
+select x, "hasExtendedCanonicalPath:", hasExtendedCanonicalPath, "hasCrateOrigin:", hasCrateOrigin,
+  "getNumberOfAttrs:", getNumberOfAttrs, "hasName:", hasName, "hasTokenTree:", hasTokenTree,
+  "hasVisibility:", hasVisibility
diff --git a/rust/ql/test/extractor-tests/generated/MacroRules/MacroRules_getAttr.expected b/rust/ql/test/extractor-tests/generated/MacroRules/MacroRules_getAttr.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/MacroRules/MacroRules_getAttr.ql b/rust/ql/test/extractor-tests/generated/MacroRules/MacroRules_getAttr.ql
new file mode 100644
index 00000000000..4fa5d762c62
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/MacroRules/MacroRules_getAttr.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from MacroRules x, int index
+where toBeTested(x) and not x.isUnknown()
+select x, index, x.getAttr(index)
diff --git a/rust/ql/test/extractor-tests/generated/MacroRules/MacroRules_getCrateOrigin.expected b/rust/ql/test/extractor-tests/generated/MacroRules/MacroRules_getCrateOrigin.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/MacroRules/MacroRules_getCrateOrigin.ql b/rust/ql/test/extractor-tests/generated/MacroRules/MacroRules_getCrateOrigin.ql
new file mode 100644
index 00000000000..987a91f5706
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/MacroRules/MacroRules_getCrateOrigin.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from MacroRules x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getCrateOrigin()
diff --git a/rust/ql/test/extractor-tests/generated/MacroRules/MacroRules_getExtendedCanonicalPath.expected b/rust/ql/test/extractor-tests/generated/MacroRules/MacroRules_getExtendedCanonicalPath.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/MacroRules/MacroRules_getExtendedCanonicalPath.ql b/rust/ql/test/extractor-tests/generated/MacroRules/MacroRules_getExtendedCanonicalPath.ql
new file mode 100644
index 00000000000..b2fa0cc9f7e
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/MacroRules/MacroRules_getExtendedCanonicalPath.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from MacroRules x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getExtendedCanonicalPath()
diff --git a/rust/ql/test/extractor-tests/generated/MacroRules/MacroRules_getName.expected b/rust/ql/test/extractor-tests/generated/MacroRules/MacroRules_getName.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/MacroRules/MacroRules_getName.ql b/rust/ql/test/extractor-tests/generated/MacroRules/MacroRules_getName.ql
new file mode 100644
index 00000000000..7a1fd49401a
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/MacroRules/MacroRules_getName.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from MacroRules x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getName()
diff --git a/rust/ql/test/extractor-tests/generated/MacroRules/MacroRules_getTokenTree.expected b/rust/ql/test/extractor-tests/generated/MacroRules/MacroRules_getTokenTree.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/MacroRules/MacroRules_getTokenTree.ql b/rust/ql/test/extractor-tests/generated/MacroRules/MacroRules_getTokenTree.ql
new file mode 100644
index 00000000000..7fae79438fc
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/MacroRules/MacroRules_getTokenTree.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from MacroRules x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getTokenTree()
diff --git a/rust/ql/test/extractor-tests/generated/MacroRules/MacroRules_getVisibility.expected b/rust/ql/test/extractor-tests/generated/MacroRules/MacroRules_getVisibility.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/MacroRules/MacroRules_getVisibility.ql b/rust/ql/test/extractor-tests/generated/MacroRules/MacroRules_getVisibility.ql
new file mode 100644
index 00000000000..bd50e49e339
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/MacroRules/MacroRules_getVisibility.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from MacroRules x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getVisibility()
diff --git a/rust/ql/test/extractor-tests/generated/MacroRules/gen_macro_rules.rs b/rust/ql/test/extractor-tests/generated/MacroRules/gen_macro_rules.rs
new file mode 100644
index 00000000000..19c15ac5f78
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/MacroRules/gen_macro_rules.rs
@@ -0,0 +1,6 @@
+// generated by codegen, do not edit
+
+fn test_macro_rules() -> () {
+    // A MacroRules. For example:
+    todo!()
+}
diff --git a/rust/ql/test/extractor-tests/generated/MacroStmts/MacroStmts.expected b/rust/ql/test/extractor-tests/generated/MacroStmts/MacroStmts.expected
new file mode 100644
index 00000000000..e74a5e4e857
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/MacroStmts/MacroStmts.expected
@@ -0,0 +1 @@
+| gen_macro_stmts.rs:5:14:5:28 | MacroStmts | hasExpr: | yes | getNumberOfStatements: | 0 |
diff --git a/rust/ql/test/extractor-tests/generated/MacroStmts/MacroStmts.ql b/rust/ql/test/extractor-tests/generated/MacroStmts/MacroStmts.ql
new file mode 100644
index 00000000000..189e280605c
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/MacroStmts/MacroStmts.ql
@@ -0,0 +1,11 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from MacroStmts x, string hasExpr, int getNumberOfStatements
+where
+  toBeTested(x) and
+  not x.isUnknown() and
+  (if x.hasExpr() then hasExpr = "yes" else hasExpr = "no") and
+  getNumberOfStatements = x.getNumberOfStatements()
+select x, "hasExpr:", hasExpr, "getNumberOfStatements:", getNumberOfStatements
diff --git a/rust/ql/test/extractor-tests/generated/MacroStmts/MacroStmts_getExpr.expected b/rust/ql/test/extractor-tests/generated/MacroStmts/MacroStmts_getExpr.expected
new file mode 100644
index 00000000000..7d30926c152
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/MacroStmts/MacroStmts_getExpr.expected
@@ -0,0 +1 @@
+| gen_macro_stmts.rs:5:14:5:28 | MacroStmts | gen_macro_stmts.rs:5:14:5:28 | BlockExpr |
diff --git a/rust/ql/test/extractor-tests/generated/MacroStmts/MacroStmts_getExpr.ql b/rust/ql/test/extractor-tests/generated/MacroStmts/MacroStmts_getExpr.ql
new file mode 100644
index 00000000000..f03854ddb14
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/MacroStmts/MacroStmts_getExpr.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from MacroStmts x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getExpr()
diff --git a/rust/ql/test/extractor-tests/generated/MacroStmts/MacroStmts_getStatement.expected b/rust/ql/test/extractor-tests/generated/MacroStmts/MacroStmts_getStatement.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/AsyncBlockExpr/AsyncBlockExpr_getStatement.ql b/rust/ql/test/extractor-tests/generated/MacroStmts/MacroStmts_getStatement.ql
similarity index 83%
rename from rust/ql/test/extractor-tests/generated/AsyncBlockExpr/AsyncBlockExpr_getStatement.ql
rename to rust/ql/test/extractor-tests/generated/MacroStmts/MacroStmts_getStatement.ql
index 0a5058e5ac0..0d0743de096 100644
--- a/rust/ql/test/extractor-tests/generated/AsyncBlockExpr/AsyncBlockExpr_getStatement.ql
+++ b/rust/ql/test/extractor-tests/generated/MacroStmts/MacroStmts_getStatement.ql
@@ -2,6 +2,6 @@
 import codeql.rust.elements
 import TestUtils
 
-from AsyncBlockExpr x, int index
+from MacroStmts x, int index
 where toBeTested(x) and not x.isUnknown()
 select x, index, x.getStatement(index)
diff --git a/rust/ql/test/extractor-tests/generated/MacroStmts/gen_macro_stmts.rs b/rust/ql/test/extractor-tests/generated/MacroStmts/gen_macro_stmts.rs
new file mode 100644
index 00000000000..035b7ddc98c
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/MacroStmts/gen_macro_stmts.rs
@@ -0,0 +1,6 @@
+// generated by codegen, do not edit
+
+// A sequence of statements generated by a `MacroCall`. For example:
+fn main() {
+    println!("Hello, world!"); // This macro expands into a list of statements
+}
diff --git a/rust/ql/test/extractor-tests/generated/MacroType/MacroType.expected b/rust/ql/test/extractor-tests/generated/MacroType/MacroType.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/MacroType/MacroType.ql b/rust/ql/test/extractor-tests/generated/MacroType/MacroType.ql
new file mode 100644
index 00000000000..6fcbdc8617a
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/MacroType/MacroType.ql
@@ -0,0 +1,10 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from MacroType x, string hasMacroCall
+where
+  toBeTested(x) and
+  not x.isUnknown() and
+  if x.hasMacroCall() then hasMacroCall = "yes" else hasMacroCall = "no"
+select x, "hasMacroCall:", hasMacroCall
diff --git a/rust/ql/test/extractor-tests/generated/MacroType/MacroType_getMacroCall.expected b/rust/ql/test/extractor-tests/generated/MacroType/MacroType_getMacroCall.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/MacroType/MacroType_getMacroCall.ql b/rust/ql/test/extractor-tests/generated/MacroType/MacroType_getMacroCall.ql
new file mode 100644
index 00000000000..d7c5035f79b
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/MacroType/MacroType_getMacroCall.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from MacroType x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getMacroCall()
diff --git a/rust/ql/test/extractor-tests/generated/MacroType/gen_macro_type.rs b/rust/ql/test/extractor-tests/generated/MacroType/gen_macro_type.rs
new file mode 100644
index 00000000000..31f93e580a2
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/MacroType/gen_macro_type.rs
@@ -0,0 +1,6 @@
+// generated by codegen, do not edit
+
+fn test_macro_type() -> () {
+    // A MacroType. For example:
+    todo!()
+}
diff --git a/rust/ql/test/extractor-tests/generated/MatchArm/MatchArm.expected b/rust/ql/test/extractor-tests/generated/MatchArm/MatchArm.expected
index 97b049e6f54..b685f882362 100644
--- a/rust/ql/test/extractor-tests/generated/MatchArm/MatchArm.expected
+++ b/rust/ql/test/extractor-tests/generated/MatchArm/MatchArm.expected
@@ -1,4 +1,4 @@
-| gen_match_arm.rs:6:9:6:23 | MatchArm | getPat: | gen_match_arm.rs:6:9:6:23 | TupleStructPat | hasGuard: | no | getExpr: | gen_match_arm.rs:6:28:6:28 | PathExpr |
-| gen_match_arm.rs:7:9:7:20 | MatchArm | getPat: | gen_match_arm.rs:7:9:7:20 | PathPat | hasGuard: | no | getExpr: | gen_match_arm.rs:7:25:7:25 | LiteralExpr |
-| gen_match_arm.rs:10:9:10:15 | MatchArm | getPat: | gen_match_arm.rs:10:9:10:15 | TupleStructPat | hasGuard: | yes | getExpr: | gen_match_arm.rs:10:30:10:34 | BinaryExpr |
-| gen_match_arm.rs:11:9:11:9 | MatchArm | getPat: | gen_match_arm.rs:11:9:11:9 | WildcardPat | hasGuard: | no | getExpr: | gen_match_arm.rs:11:14:11:14 | LiteralExpr |
+| gen_match_arm.rs:6:9:6:29 | MatchArm | getNumberOfAttrs: | 0 | hasExpr: | yes | hasGuard: | no | hasPat: | yes |
+| gen_match_arm.rs:7:9:7:26 | MatchArm | getNumberOfAttrs: | 0 | hasExpr: | yes | hasGuard: | no | hasPat: | yes |
+| gen_match_arm.rs:10:9:10:35 | MatchArm | getNumberOfAttrs: | 0 | hasExpr: | yes | hasGuard: | yes | hasPat: | yes |
+| gen_match_arm.rs:11:9:11:15 | MatchArm | getNumberOfAttrs: | 0 | hasExpr: | yes | hasGuard: | no | hasPat: | yes |
diff --git a/rust/ql/test/extractor-tests/generated/MatchArm/MatchArm.ql b/rust/ql/test/extractor-tests/generated/MatchArm/MatchArm.ql
index 10b8f33d0c6..9161cdadf73 100644
--- a/rust/ql/test/extractor-tests/generated/MatchArm/MatchArm.ql
+++ b/rust/ql/test/extractor-tests/generated/MatchArm/MatchArm.ql
@@ -2,11 +2,13 @@
 import codeql.rust.elements
 import TestUtils
 
-from MatchArm x, Pat getPat, string hasGuard, Expr getExpr
+from MatchArm x, int getNumberOfAttrs, string hasExpr, string hasGuard, string hasPat
 where
   toBeTested(x) and
   not x.isUnknown() and
-  getPat = x.getPat() and
+  getNumberOfAttrs = x.getNumberOfAttrs() and
+  (if x.hasExpr() then hasExpr = "yes" else hasExpr = "no") and
   (if x.hasGuard() then hasGuard = "yes" else hasGuard = "no") and
-  getExpr = x.getExpr()
-select x, "getPat:", getPat, "hasGuard:", hasGuard, "getExpr:", getExpr
+  if x.hasPat() then hasPat = "yes" else hasPat = "no"
+select x, "getNumberOfAttrs:", getNumberOfAttrs, "hasExpr:", hasExpr, "hasGuard:", hasGuard,
+  "hasPat:", hasPat
diff --git a/rust/ql/test/extractor-tests/generated/MatchArm/MatchArm_getAttr.expected b/rust/ql/test/extractor-tests/generated/MatchArm/MatchArm_getAttr.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/MatchArm/MatchArm_getAttr.ql b/rust/ql/test/extractor-tests/generated/MatchArm/MatchArm_getAttr.ql
new file mode 100644
index 00000000000..d86de1bb46d
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/MatchArm/MatchArm_getAttr.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from MatchArm x, int index
+where toBeTested(x) and not x.isUnknown()
+select x, index, x.getAttr(index)
diff --git a/rust/ql/test/extractor-tests/generated/MatchArm/MatchArm_getExpr.expected b/rust/ql/test/extractor-tests/generated/MatchArm/MatchArm_getExpr.expected
new file mode 100644
index 00000000000..493ea8d9bb0
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/MatchArm/MatchArm_getExpr.expected
@@ -0,0 +1,4 @@
+| gen_match_arm.rs:6:9:6:29 | MatchArm | gen_match_arm.rs:6:28:6:28 | y |
+| gen_match_arm.rs:7:9:7:26 | MatchArm | gen_match_arm.rs:7:25:7:25 | 0 |
+| gen_match_arm.rs:10:9:10:35 | MatchArm | gen_match_arm.rs:10:30:10:34 | ... / ... |
+| gen_match_arm.rs:11:9:11:15 | MatchArm | gen_match_arm.rs:11:14:11:14 | 0 |
diff --git a/rust/ql/test/extractor-tests/generated/MatchArm/MatchArm_getExpr.ql b/rust/ql/test/extractor-tests/generated/MatchArm/MatchArm_getExpr.ql
new file mode 100644
index 00000000000..b488c8cd7ad
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/MatchArm/MatchArm_getExpr.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from MatchArm x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getExpr()
diff --git a/rust/ql/test/extractor-tests/generated/MatchArm/MatchArm_getGuard.expected b/rust/ql/test/extractor-tests/generated/MatchArm/MatchArm_getGuard.expected
index 7430f1179eb..4e5da987474 100644
--- a/rust/ql/test/extractor-tests/generated/MatchArm/MatchArm_getGuard.expected
+++ b/rust/ql/test/extractor-tests/generated/MatchArm/MatchArm_getGuard.expected
@@ -1 +1 @@
-| gen_match_arm.rs:10:9:10:15 | MatchArm | gen_match_arm.rs:10:20:10:25 | BinaryExpr |
+| gen_match_arm.rs:10:9:10:35 | MatchArm | gen_match_arm.rs:10:17:10:25 | MatchGuard |
diff --git a/rust/ql/test/extractor-tests/generated/MatchArm/MatchArm_getPat.expected b/rust/ql/test/extractor-tests/generated/MatchArm/MatchArm_getPat.expected
new file mode 100644
index 00000000000..41f79ed16c9
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/MatchArm/MatchArm_getPat.expected
@@ -0,0 +1,4 @@
+| gen_match_arm.rs:6:9:6:29 | MatchArm | gen_match_arm.rs:6:9:6:23 | TupleStructPat |
+| gen_match_arm.rs:7:9:7:26 | MatchArm | gen_match_arm.rs:7:9:7:20 | PathPat |
+| gen_match_arm.rs:10:9:10:35 | MatchArm | gen_match_arm.rs:10:9:10:15 | TupleStructPat |
+| gen_match_arm.rs:11:9:11:15 | MatchArm | gen_match_arm.rs:11:9:11:9 | WildcardPat |
diff --git a/rust/ql/test/extractor-tests/generated/MatchArm/MatchArm_getPat.ql b/rust/ql/test/extractor-tests/generated/MatchArm/MatchArm_getPat.ql
new file mode 100644
index 00000000000..ff83947901a
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/MatchArm/MatchArm_getPat.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from MatchArm x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getPat()
diff --git a/rust/ql/test/extractor-tests/generated/MatchArmList/MatchArmList.expected b/rust/ql/test/extractor-tests/generated/MatchArmList/MatchArmList.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/MatchArmList/MatchArmList.ql b/rust/ql/test/extractor-tests/generated/MatchArmList/MatchArmList.ql
new file mode 100644
index 00000000000..be4583a9501
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/MatchArmList/MatchArmList.ql
@@ -0,0 +1,11 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from MatchArmList x, int getNumberOfArms, int getNumberOfAttrs
+where
+  toBeTested(x) and
+  not x.isUnknown() and
+  getNumberOfArms = x.getNumberOfArms() and
+  getNumberOfAttrs = x.getNumberOfAttrs()
+select x, "getNumberOfArms:", getNumberOfArms, "getNumberOfAttrs:", getNumberOfAttrs
diff --git a/rust/ql/test/extractor-tests/generated/MatchArmList/MatchArmList_getArm.expected b/rust/ql/test/extractor-tests/generated/MatchArmList/MatchArmList_getArm.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/MatchArmList/MatchArmList_getArm.ql b/rust/ql/test/extractor-tests/generated/MatchArmList/MatchArmList_getArm.ql
new file mode 100644
index 00000000000..3d29c573158
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/MatchArmList/MatchArmList_getArm.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from MatchArmList x, int index
+where toBeTested(x) and not x.isUnknown()
+select x, index, x.getArm(index)
diff --git a/rust/ql/test/extractor-tests/generated/MatchArmList/MatchArmList_getAttr.expected b/rust/ql/test/extractor-tests/generated/MatchArmList/MatchArmList_getAttr.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/MatchArmList/MatchArmList_getAttr.ql b/rust/ql/test/extractor-tests/generated/MatchArmList/MatchArmList_getAttr.ql
new file mode 100644
index 00000000000..0992c49ba30
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/MatchArmList/MatchArmList_getAttr.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from MatchArmList x, int index
+where toBeTested(x) and not x.isUnknown()
+select x, index, x.getAttr(index)
diff --git a/rust/ql/test/extractor-tests/generated/MatchArmList/gen_match_arm_list.rs b/rust/ql/test/extractor-tests/generated/MatchArmList/gen_match_arm_list.rs
new file mode 100644
index 00000000000..b2192f929e2
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/MatchArmList/gen_match_arm_list.rs
@@ -0,0 +1,6 @@
+// generated by codegen, do not edit
+
+fn test_match_arm_list() -> () {
+    // A MatchArmList. For example:
+    todo!()
+}
diff --git a/rust/ql/test/extractor-tests/generated/MatchExpr/MatchExpr.expected b/rust/ql/test/extractor-tests/generated/MatchExpr/MatchExpr.expected
index 15c7dcb2f23..4591d8a57c3 100644
--- a/rust/ql/test/extractor-tests/generated/MatchExpr/MatchExpr.expected
+++ b/rust/ql/test/extractor-tests/generated/MatchExpr/MatchExpr.expected
@@ -1,2 +1,2 @@
-| gen_match_expr.rs:5:5:8:5 | MatchExpr | getExpr: | gen_match_expr.rs:5:11:5:11 | PathExpr | getNumberOfBranches: | 2 |
-| gen_match_expr.rs:9:5:12:5 | MatchExpr | getExpr: | gen_match_expr.rs:9:11:9:11 | PathExpr | getNumberOfBranches: | 2 |
+| gen_match_expr.rs:5:5:8:5 | MatchExpr | getNumberOfAttrs: | 0 | hasExpr: | yes | hasMatchArmList: | yes |
+| gen_match_expr.rs:9:5:12:5 | MatchExpr | getNumberOfAttrs: | 0 | hasExpr: | yes | hasMatchArmList: | yes |
diff --git a/rust/ql/test/extractor-tests/generated/MatchExpr/MatchExpr.ql b/rust/ql/test/extractor-tests/generated/MatchExpr/MatchExpr.ql
index efdc81755c7..b29e333d330 100644
--- a/rust/ql/test/extractor-tests/generated/MatchExpr/MatchExpr.ql
+++ b/rust/ql/test/extractor-tests/generated/MatchExpr/MatchExpr.ql
@@ -2,10 +2,12 @@
 import codeql.rust.elements
 import TestUtils
 
-from MatchExpr x, Expr getExpr, int getNumberOfBranches
+from MatchExpr x, int getNumberOfAttrs, string hasExpr, string hasMatchArmList
 where
   toBeTested(x) and
   not x.isUnknown() and
-  getExpr = x.getExpr() and
-  getNumberOfBranches = x.getNumberOfBranches()
-select x, "getExpr:", getExpr, "getNumberOfBranches:", getNumberOfBranches
+  getNumberOfAttrs = x.getNumberOfAttrs() and
+  (if x.hasExpr() then hasExpr = "yes" else hasExpr = "no") and
+  if x.hasMatchArmList() then hasMatchArmList = "yes" else hasMatchArmList = "no"
+select x, "getNumberOfAttrs:", getNumberOfAttrs, "hasExpr:", hasExpr, "hasMatchArmList:",
+  hasMatchArmList
diff --git a/rust/ql/test/extractor-tests/generated/MatchExpr/MatchExpr_getAttr.expected b/rust/ql/test/extractor-tests/generated/MatchExpr/MatchExpr_getAttr.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/MatchExpr/MatchExpr_getBranch.ql b/rust/ql/test/extractor-tests/generated/MatchExpr/MatchExpr_getAttr.ql
similarity index 80%
rename from rust/ql/test/extractor-tests/generated/MatchExpr/MatchExpr_getBranch.ql
rename to rust/ql/test/extractor-tests/generated/MatchExpr/MatchExpr_getAttr.ql
index cf7ad63b345..51c49a77073 100644
--- a/rust/ql/test/extractor-tests/generated/MatchExpr/MatchExpr_getBranch.ql
+++ b/rust/ql/test/extractor-tests/generated/MatchExpr/MatchExpr_getAttr.ql
@@ -4,4 +4,4 @@ import TestUtils
 
 from MatchExpr x, int index
 where toBeTested(x) and not x.isUnknown()
-select x, index, x.getBranch(index)
+select x, index, x.getAttr(index)
diff --git a/rust/ql/test/extractor-tests/generated/MatchExpr/MatchExpr_getBranch.expected b/rust/ql/test/extractor-tests/generated/MatchExpr/MatchExpr_getBranch.expected
deleted file mode 100644
index ff70602e20d..00000000000
--- a/rust/ql/test/extractor-tests/generated/MatchExpr/MatchExpr_getBranch.expected
+++ /dev/null
@@ -1,4 +0,0 @@
-| gen_match_expr.rs:5:5:8:5 | MatchExpr | 0 | gen_match_expr.rs:6:9:6:23 | MatchArm |
-| gen_match_expr.rs:5:5:8:5 | MatchExpr | 1 | gen_match_expr.rs:7:9:7:20 | MatchArm |
-| gen_match_expr.rs:9:5:12:5 | MatchExpr | 0 | gen_match_expr.rs:10:9:10:15 | MatchArm |
-| gen_match_expr.rs:9:5:12:5 | MatchExpr | 1 | gen_match_expr.rs:11:9:11:9 | MatchArm |
diff --git a/rust/ql/test/extractor-tests/generated/MatchExpr/MatchExpr_getExpr.expected b/rust/ql/test/extractor-tests/generated/MatchExpr/MatchExpr_getExpr.expected
new file mode 100644
index 00000000000..924eb3f807f
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/MatchExpr/MatchExpr_getExpr.expected
@@ -0,0 +1,2 @@
+| gen_match_expr.rs:5:5:8:5 | MatchExpr | gen_match_expr.rs:5:11:5:11 | x |
+| gen_match_expr.rs:9:5:12:5 | MatchExpr | gen_match_expr.rs:9:11:9:11 | x |
diff --git a/rust/ql/test/extractor-tests/generated/MatchExpr/MatchExpr_getExpr.ql b/rust/ql/test/extractor-tests/generated/MatchExpr/MatchExpr_getExpr.ql
new file mode 100644
index 00000000000..40dd65afcbc
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/MatchExpr/MatchExpr_getExpr.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from MatchExpr x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getExpr()
diff --git a/rust/ql/test/extractor-tests/generated/MatchExpr/MatchExpr_getMatchArmList.expected b/rust/ql/test/extractor-tests/generated/MatchExpr/MatchExpr_getMatchArmList.expected
new file mode 100644
index 00000000000..db83ecb1c53
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/MatchExpr/MatchExpr_getMatchArmList.expected
@@ -0,0 +1,2 @@
+| gen_match_expr.rs:5:5:8:5 | MatchExpr | gen_match_expr.rs:5:13:8:5 | MatchArmList |
+| gen_match_expr.rs:9:5:12:5 | MatchExpr | gen_match_expr.rs:9:13:12:5 | MatchArmList |
diff --git a/rust/ql/test/extractor-tests/generated/MatchExpr/MatchExpr_getMatchArmList.ql b/rust/ql/test/extractor-tests/generated/MatchExpr/MatchExpr_getMatchArmList.ql
new file mode 100644
index 00000000000..d6dc36bfc91
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/MatchExpr/MatchExpr_getMatchArmList.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from MatchExpr x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getMatchArmList()
diff --git a/rust/ql/test/extractor-tests/generated/MatchGuard/MatchGuard.expected b/rust/ql/test/extractor-tests/generated/MatchGuard/MatchGuard.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/MatchGuard/MatchGuard.ql b/rust/ql/test/extractor-tests/generated/MatchGuard/MatchGuard.ql
new file mode 100644
index 00000000000..d31138b1d95
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/MatchGuard/MatchGuard.ql
@@ -0,0 +1,10 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from MatchGuard x, string hasCondition
+where
+  toBeTested(x) and
+  not x.isUnknown() and
+  if x.hasCondition() then hasCondition = "yes" else hasCondition = "no"
+select x, "hasCondition:", hasCondition
diff --git a/rust/ql/test/extractor-tests/generated/MatchGuard/MatchGuard_getCondition.expected b/rust/ql/test/extractor-tests/generated/MatchGuard/MatchGuard_getCondition.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/MatchGuard/MatchGuard_getCondition.ql b/rust/ql/test/extractor-tests/generated/MatchGuard/MatchGuard_getCondition.ql
new file mode 100644
index 00000000000..1334666a960
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/MatchGuard/MatchGuard_getCondition.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from MatchGuard x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getCondition()
diff --git a/rust/ql/test/extractor-tests/generated/MatchGuard/gen_match_guard.rs b/rust/ql/test/extractor-tests/generated/MatchGuard/gen_match_guard.rs
new file mode 100644
index 00000000000..9e45b8c3564
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/MatchGuard/gen_match_guard.rs
@@ -0,0 +1,6 @@
+// generated by codegen, do not edit
+
+fn test_match_guard() -> () {
+    // A MatchGuard. For example:
+    todo!()
+}
diff --git a/rust/ql/test/extractor-tests/generated/Meta/Meta.expected b/rust/ql/test/extractor-tests/generated/Meta/Meta.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/Meta/Meta.ql b/rust/ql/test/extractor-tests/generated/Meta/Meta.ql
new file mode 100644
index 00000000000..72a0426d809
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/Meta/Meta.ql
@@ -0,0 +1,14 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from Meta x, string hasExpr, string isUnsafe, string hasPath, string hasTokenTree
+where
+  toBeTested(x) and
+  not x.isUnknown() and
+  (if x.hasExpr() then hasExpr = "yes" else hasExpr = "no") and
+  (if x.isUnsafe() then isUnsafe = "yes" else isUnsafe = "no") and
+  (if x.hasPath() then hasPath = "yes" else hasPath = "no") and
+  if x.hasTokenTree() then hasTokenTree = "yes" else hasTokenTree = "no"
+select x, "hasExpr:", hasExpr, "isUnsafe:", isUnsafe, "hasPath:", hasPath, "hasTokenTree:",
+  hasTokenTree
diff --git a/rust/ql/test/extractor-tests/generated/Meta/Meta_getExpr.expected b/rust/ql/test/extractor-tests/generated/Meta/Meta_getExpr.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/Meta/Meta_getExpr.ql b/rust/ql/test/extractor-tests/generated/Meta/Meta_getExpr.ql
new file mode 100644
index 00000000000..a93132dd15a
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/Meta/Meta_getExpr.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from Meta x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getExpr()
diff --git a/rust/ql/test/extractor-tests/generated/Meta/Meta_getPath.expected b/rust/ql/test/extractor-tests/generated/Meta/Meta_getPath.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/Meta/Meta_getPath.ql b/rust/ql/test/extractor-tests/generated/Meta/Meta_getPath.ql
new file mode 100644
index 00000000000..759c013a975
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/Meta/Meta_getPath.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from Meta x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getPath()
diff --git a/rust/ql/test/extractor-tests/generated/Meta/Meta_getTokenTree.expected b/rust/ql/test/extractor-tests/generated/Meta/Meta_getTokenTree.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/Meta/Meta_getTokenTree.ql b/rust/ql/test/extractor-tests/generated/Meta/Meta_getTokenTree.ql
new file mode 100644
index 00000000000..b0425a57bd3
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/Meta/Meta_getTokenTree.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from Meta x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getTokenTree()
diff --git a/rust/ql/test/extractor-tests/generated/Meta/gen_meta.rs b/rust/ql/test/extractor-tests/generated/Meta/gen_meta.rs
new file mode 100644
index 00000000000..204fb3bd7de
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/Meta/gen_meta.rs
@@ -0,0 +1,6 @@
+// generated by codegen, do not edit
+
+fn test_meta() -> () {
+    // A Meta. For example:
+    todo!()
+}
diff --git a/rust/ql/test/extractor-tests/generated/MethodCallExpr/MethodCallExpr.expected b/rust/ql/test/extractor-tests/generated/MethodCallExpr/MethodCallExpr.expected
index d28ebe1c53e..d6c0d90cd75 100644
--- a/rust/ql/test/extractor-tests/generated/MethodCallExpr/MethodCallExpr.expected
+++ b/rust/ql/test/extractor-tests/generated/MethodCallExpr/MethodCallExpr.expected
@@ -1,2 +1,2 @@
-| gen_method_call_expr.rs:5:5:5:13 | MethodCallExpr | getReceiver: | gen_method_call_expr.rs:5:5:5:5 | PathExpr | getMethodName: | foo | getNumberOfArgs: | 1 | hasGenericArgs: | no |
-| gen_method_call_expr.rs:6:5:6:25 | MethodCallExpr | getReceiver: | gen_method_call_expr.rs:6:5:6:5 | PathExpr | getMethodName: | foo | getNumberOfArgs: | 1 | hasGenericArgs: | yes |
+| gen_method_call_expr.rs:5:5:5:13 | ... .foo(...) | hasArgList: | yes | getNumberOfAttrs: | 0 | hasResolvedPath: | no | hasResolvedCrateOrigin: | no | hasGenericArgList: | no | hasNameRef: | yes | hasReceiver: | yes |
+| gen_method_call_expr.rs:6:5:6:25 | ... .foo(...) | hasArgList: | yes | getNumberOfAttrs: | 0 | hasResolvedPath: | no | hasResolvedCrateOrigin: | no | hasGenericArgList: | yes | hasNameRef: | yes | hasReceiver: | yes |
diff --git a/rust/ql/test/extractor-tests/generated/MethodCallExpr/MethodCallExpr.ql b/rust/ql/test/extractor-tests/generated/MethodCallExpr/MethodCallExpr.ql
index ff0ee06bcf5..989540265a0 100644
--- a/rust/ql/test/extractor-tests/generated/MethodCallExpr/MethodCallExpr.ql
+++ b/rust/ql/test/extractor-tests/generated/MethodCallExpr/MethodCallExpr.ql
@@ -3,14 +3,22 @@ import codeql.rust.elements
 import TestUtils
 
 from
-  MethodCallExpr x, Expr getReceiver, string getMethodName, int getNumberOfArgs,
-  string hasGenericArgs
+  MethodCallExpr x, string hasArgList, int getNumberOfAttrs, string hasResolvedPath,
+  string hasResolvedCrateOrigin, string hasGenericArgList, string hasNameRef, string hasReceiver
 where
   toBeTested(x) and
   not x.isUnknown() and
-  getReceiver = x.getReceiver() and
-  getMethodName = x.getMethodName() and
-  getNumberOfArgs = x.getNumberOfArgs() and
-  if x.hasGenericArgs() then hasGenericArgs = "yes" else hasGenericArgs = "no"
-select x, "getReceiver:", getReceiver, "getMethodName:", getMethodName, "getNumberOfArgs:",
-  getNumberOfArgs, "hasGenericArgs:", hasGenericArgs
+  (if x.hasArgList() then hasArgList = "yes" else hasArgList = "no") and
+  getNumberOfAttrs = x.getNumberOfAttrs() and
+  (if x.hasResolvedPath() then hasResolvedPath = "yes" else hasResolvedPath = "no") and
+  (
+    if x.hasResolvedCrateOrigin()
+    then hasResolvedCrateOrigin = "yes"
+    else hasResolvedCrateOrigin = "no"
+  ) and
+  (if x.hasGenericArgList() then hasGenericArgList = "yes" else hasGenericArgList = "no") and
+  (if x.hasNameRef() then hasNameRef = "yes" else hasNameRef = "no") and
+  if x.hasReceiver() then hasReceiver = "yes" else hasReceiver = "no"
+select x, "hasArgList:", hasArgList, "getNumberOfAttrs:", getNumberOfAttrs, "hasResolvedPath:",
+  hasResolvedPath, "hasResolvedCrateOrigin:", hasResolvedCrateOrigin, "hasGenericArgList:",
+  hasGenericArgList, "hasNameRef:", hasNameRef, "hasReceiver:", hasReceiver
diff --git a/rust/ql/test/extractor-tests/generated/MethodCallExpr/MethodCallExpr_getArg.expected b/rust/ql/test/extractor-tests/generated/MethodCallExpr/MethodCallExpr_getArg.expected
deleted file mode 100644
index 601b344cd0f..00000000000
--- a/rust/ql/test/extractor-tests/generated/MethodCallExpr/MethodCallExpr_getArg.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-| gen_method_call_expr.rs:5:5:5:13 | MethodCallExpr | 0 | gen_method_call_expr.rs:5:11:5:12 | LiteralExpr |
-| gen_method_call_expr.rs:6:5:6:25 | MethodCallExpr | 0 | gen_method_call_expr.rs:6:23:6:24 | LiteralExpr |
diff --git a/rust/ql/test/extractor-tests/generated/MethodCallExpr/MethodCallExpr_getArgList.expected b/rust/ql/test/extractor-tests/generated/MethodCallExpr/MethodCallExpr_getArgList.expected
new file mode 100644
index 00000000000..e6fad5c36ec
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/MethodCallExpr/MethodCallExpr_getArgList.expected
@@ -0,0 +1,2 @@
+| gen_method_call_expr.rs:5:5:5:13 | ... .foo(...) | gen_method_call_expr.rs:5:10:5:13 | ArgList |
+| gen_method_call_expr.rs:6:5:6:25 | ... .foo(...) | gen_method_call_expr.rs:6:22:6:25 | ArgList |
diff --git a/rust/ql/test/extractor-tests/generated/MethodCallExpr/MethodCallExpr_getGenericArgs.ql b/rust/ql/test/extractor-tests/generated/MethodCallExpr/MethodCallExpr_getArgList.ql
similarity index 83%
rename from rust/ql/test/extractor-tests/generated/MethodCallExpr/MethodCallExpr_getGenericArgs.ql
rename to rust/ql/test/extractor-tests/generated/MethodCallExpr/MethodCallExpr_getArgList.ql
index 3ea5a68b302..3e6eb43ba1f 100644
--- a/rust/ql/test/extractor-tests/generated/MethodCallExpr/MethodCallExpr_getGenericArgs.ql
+++ b/rust/ql/test/extractor-tests/generated/MethodCallExpr/MethodCallExpr_getArgList.ql
@@ -4,4 +4,4 @@ import TestUtils
 
 from MethodCallExpr x
 where toBeTested(x) and not x.isUnknown()
-select x, x.getGenericArgs()
+select x, x.getArgList()
diff --git a/rust/ql/test/extractor-tests/generated/MethodCallExpr/MethodCallExpr_getAttr.expected b/rust/ql/test/extractor-tests/generated/MethodCallExpr/MethodCallExpr_getAttr.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/MethodCallExpr/MethodCallExpr_getArg.ql b/rust/ql/test/extractor-tests/generated/MethodCallExpr/MethodCallExpr_getAttr.ql
similarity index 82%
rename from rust/ql/test/extractor-tests/generated/MethodCallExpr/MethodCallExpr_getArg.ql
rename to rust/ql/test/extractor-tests/generated/MethodCallExpr/MethodCallExpr_getAttr.ql
index 58529cebfe5..5cffc6cd43b 100644
--- a/rust/ql/test/extractor-tests/generated/MethodCallExpr/MethodCallExpr_getArg.ql
+++ b/rust/ql/test/extractor-tests/generated/MethodCallExpr/MethodCallExpr_getAttr.ql
@@ -4,4 +4,4 @@ import TestUtils
 
 from MethodCallExpr x, int index
 where toBeTested(x) and not x.isUnknown()
-select x, index, x.getArg(index)
+select x, index, x.getAttr(index)
diff --git a/rust/ql/test/extractor-tests/generated/MethodCallExpr/MethodCallExpr_getGenericArgList.expected b/rust/ql/test/extractor-tests/generated/MethodCallExpr/MethodCallExpr_getGenericArgList.expected
new file mode 100644
index 00000000000..8b2622f09ab
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/MethodCallExpr/MethodCallExpr_getGenericArgList.expected
@@ -0,0 +1 @@
+| gen_method_call_expr.rs:6:5:6:25 | ... .foo(...) | gen_method_call_expr.rs:6:10:6:21 | GenericArgList |
diff --git a/rust/ql/test/extractor-tests/generated/MethodCallExpr/MethodCallExpr_getGenericArgList.ql b/rust/ql/test/extractor-tests/generated/MethodCallExpr/MethodCallExpr_getGenericArgList.ql
new file mode 100644
index 00000000000..d68ec9fa0ca
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/MethodCallExpr/MethodCallExpr_getGenericArgList.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from MethodCallExpr x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getGenericArgList()
diff --git a/rust/ql/test/extractor-tests/generated/MethodCallExpr/MethodCallExpr_getGenericArgs.expected b/rust/ql/test/extractor-tests/generated/MethodCallExpr/MethodCallExpr_getGenericArgs.expected
deleted file mode 100644
index f4590b4f4e1..00000000000
--- a/rust/ql/test/extractor-tests/generated/MethodCallExpr/MethodCallExpr_getGenericArgs.expected
+++ /dev/null
@@ -1 +0,0 @@
-| gen_method_call_expr.rs:6:5:6:25 | MethodCallExpr | file://:0:0:0:0 | GenericArgList |
diff --git a/rust/ql/test/extractor-tests/generated/MethodCallExpr/MethodCallExpr_getNameRef.expected b/rust/ql/test/extractor-tests/generated/MethodCallExpr/MethodCallExpr_getNameRef.expected
new file mode 100644
index 00000000000..ba9fb15a113
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/MethodCallExpr/MethodCallExpr_getNameRef.expected
@@ -0,0 +1,2 @@
+| gen_method_call_expr.rs:5:5:5:13 | ... .foo(...) | gen_method_call_expr.rs:5:7:5:9 | foo |
+| gen_method_call_expr.rs:6:5:6:25 | ... .foo(...) | gen_method_call_expr.rs:6:7:6:9 | foo |
diff --git a/rust/ql/test/extractor-tests/generated/MethodCallExpr/MethodCallExpr_getNameRef.ql b/rust/ql/test/extractor-tests/generated/MethodCallExpr/MethodCallExpr_getNameRef.ql
new file mode 100644
index 00000000000..358d9e3daa7
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/MethodCallExpr/MethodCallExpr_getNameRef.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from MethodCallExpr x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getNameRef()
diff --git a/rust/ql/test/extractor-tests/generated/MethodCallExpr/MethodCallExpr_getReceiver.expected b/rust/ql/test/extractor-tests/generated/MethodCallExpr/MethodCallExpr_getReceiver.expected
new file mode 100644
index 00000000000..b8e6631e189
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/MethodCallExpr/MethodCallExpr_getReceiver.expected
@@ -0,0 +1,2 @@
+| gen_method_call_expr.rs:5:5:5:13 | ... .foo(...) | gen_method_call_expr.rs:5:5:5:5 | x |
+| gen_method_call_expr.rs:6:5:6:25 | ... .foo(...) | gen_method_call_expr.rs:6:5:6:5 | x |
diff --git a/rust/ql/test/extractor-tests/generated/MethodCallExpr/MethodCallExpr_getReceiver.ql b/rust/ql/test/extractor-tests/generated/MethodCallExpr/MethodCallExpr_getReceiver.ql
new file mode 100644
index 00000000000..853315863fb
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/MethodCallExpr/MethodCallExpr_getReceiver.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from MethodCallExpr x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getReceiver()
diff --git a/rust/ql/test/extractor-tests/generated/MethodCallExpr/MethodCallExpr_getResolvedCrateOrigin.expected b/rust/ql/test/extractor-tests/generated/MethodCallExpr/MethodCallExpr_getResolvedCrateOrigin.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/MethodCallExpr/MethodCallExpr_getResolvedCrateOrigin.ql b/rust/ql/test/extractor-tests/generated/MethodCallExpr/MethodCallExpr_getResolvedCrateOrigin.ql
new file mode 100644
index 00000000000..dfb29218133
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/MethodCallExpr/MethodCallExpr_getResolvedCrateOrigin.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from MethodCallExpr x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getResolvedCrateOrigin()
diff --git a/rust/ql/test/extractor-tests/generated/MethodCallExpr/MethodCallExpr_getResolvedPath.expected b/rust/ql/test/extractor-tests/generated/MethodCallExpr/MethodCallExpr_getResolvedPath.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/MethodCallExpr/MethodCallExpr_getResolvedPath.ql b/rust/ql/test/extractor-tests/generated/MethodCallExpr/MethodCallExpr_getResolvedPath.ql
new file mode 100644
index 00000000000..df94686cbf6
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/MethodCallExpr/MethodCallExpr_getResolvedPath.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from MethodCallExpr x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getResolvedPath()
diff --git a/rust/ql/test/extractor-tests/generated/MissingExpr/MissingExpr.expected b/rust/ql/test/extractor-tests/generated/MissingExpr/MissingExpr.expected
deleted file mode 100644
index bd096b3f488..00000000000
--- a/rust/ql/test/extractor-tests/generated/MissingExpr/MissingExpr.expected
+++ /dev/null
@@ -1 +0,0 @@
-| gen_missing_expr.rs:6:13:6:33 | MissingExpr |
diff --git a/rust/ql/test/extractor-tests/generated/MissingExpr/gen_missing_expr.rs b/rust/ql/test/extractor-tests/generated/MissingExpr/gen_missing_expr.rs
deleted file mode 100644
index dea3de12cf1..00000000000
--- a/rust/ql/test/extractor-tests/generated/MissingExpr/gen_missing_expr.rs
+++ /dev/null
@@ -1,7 +0,0 @@
-// generated by codegen, do not edit
-
-fn test_missing_expr() -> () {
-    // A missing expression, used as a placeholder for incomplete syntax.
-    // 
-    let x = non_existing_macro!();
-}
diff --git a/rust/ql/test/extractor-tests/generated/MissingPat/MissingPat.expected b/rust/ql/test/extractor-tests/generated/MissingPat/MissingPat.expected
deleted file mode 100644
index 10515823daa..00000000000
--- a/rust/ql/test/extractor-tests/generated/MissingPat/MissingPat.expected
+++ /dev/null
@@ -1 +0,0 @@
-| gen_missing_pat.rs:6:9:6:10 | MissingPat |
diff --git a/rust/ql/test/extractor-tests/generated/MissingPat/gen_missing_pat.rs b/rust/ql/test/extractor-tests/generated/MissingPat/gen_missing_pat.rs
deleted file mode 100644
index 0848d4531c3..00000000000
--- a/rust/ql/test/extractor-tests/generated/MissingPat/gen_missing_pat.rs
+++ /dev/null
@@ -1,8 +0,0 @@
-// generated by codegen, do not edit
-
-fn test_missing_pat() -> () {
-    // A missing pattern, used as a place holder for incomplete syntax.
-    match Some(42) {
-        .. => "bad use of .. syntax",
-    };
-}
diff --git a/rust/ql/test/extractor-tests/generated/Module/Module.expected b/rust/ql/test/extractor-tests/generated/Module/Module.expected
index 7198e7b0f23..d7c04f7c118 100644
--- a/rust/ql/test/extractor-tests/generated/Module/Module.expected
+++ b/rust/ql/test/extractor-tests/generated/Module/Module.expected
@@ -1,7 +1,3 @@
-| file://:0:0:0:0 | Module | getNumberOfDeclarations: | 0 |
-| file://:0:0:0:0 | Module | getNumberOfDeclarations: | 0 |
-| file://:0:0:0:0 | Module | getNumberOfDeclarations: | 0 |
-| file://:0:0:0:0 | Module | getNumberOfDeclarations: | 1 |
-| file://:0:0:0:0 | Module | getNumberOfDeclarations: | 2 |
-| file://:0:0:0:0 | Module | getNumberOfDeclarations: | 2 |
-| file://:0:0:0:0 | Module | getNumberOfDeclarations: | 2 |
+| gen_module.rs:3:1:4:8 | Module | hasExtendedCanonicalPath: | yes | hasCrateOrigin: | yes | getNumberOfAttrs: | 0 | hasItemList: | no | hasName: | yes | hasVisibility: | no |
+| gen_module.rs:5:1:7:1 | Module | hasExtendedCanonicalPath: | yes | hasCrateOrigin: | yes | getNumberOfAttrs: | 0 | hasItemList: | yes | hasName: | yes | hasVisibility: | no |
+| lib.rs:1:1:1:15 | Module | hasExtendedCanonicalPath: | yes | hasCrateOrigin: | yes | getNumberOfAttrs: | 0 | hasItemList: | no | hasName: | yes | hasVisibility: | no |
diff --git a/rust/ql/test/extractor-tests/generated/Module/Module.ql b/rust/ql/test/extractor-tests/generated/Module/Module.ql
index fd3ba6caceb..a33b7daa895 100644
--- a/rust/ql/test/extractor-tests/generated/Module/Module.ql
+++ b/rust/ql/test/extractor-tests/generated/Module/Module.ql
@@ -2,9 +2,22 @@
 import codeql.rust.elements
 import TestUtils
 
-from Module x, int getNumberOfDeclarations
+from
+  Module x, string hasExtendedCanonicalPath, string hasCrateOrigin, int getNumberOfAttrs,
+  string hasItemList, string hasName, string hasVisibility
 where
   toBeTested(x) and
   not x.isUnknown() and
-  getNumberOfDeclarations = x.getNumberOfDeclarations()
-select x, "getNumberOfDeclarations:", getNumberOfDeclarations
+  (
+    if x.hasExtendedCanonicalPath()
+    then hasExtendedCanonicalPath = "yes"
+    else hasExtendedCanonicalPath = "no"
+  ) and
+  (if x.hasCrateOrigin() then hasCrateOrigin = "yes" else hasCrateOrigin = "no") and
+  getNumberOfAttrs = x.getNumberOfAttrs() and
+  (if x.hasItemList() then hasItemList = "yes" else hasItemList = "no") and
+  (if x.hasName() then hasName = "yes" else hasName = "no") and
+  if x.hasVisibility() then hasVisibility = "yes" else hasVisibility = "no"
+select x, "hasExtendedCanonicalPath:", hasExtendedCanonicalPath, "hasCrateOrigin:", hasCrateOrigin,
+  "getNumberOfAttrs:", getNumberOfAttrs, "hasItemList:", hasItemList, "hasName:", hasName,
+  "hasVisibility:", hasVisibility
diff --git a/rust/ql/test/extractor-tests/generated/Module/Module_getAttr.expected b/rust/ql/test/extractor-tests/generated/Module/Module_getAttr.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/Module/Module_getDeclaration.ql b/rust/ql/test/extractor-tests/generated/Module/Module_getAttr.ql
similarity index 78%
rename from rust/ql/test/extractor-tests/generated/Module/Module_getDeclaration.ql
rename to rust/ql/test/extractor-tests/generated/Module/Module_getAttr.ql
index 9ac42e00b23..1efd9a937c3 100644
--- a/rust/ql/test/extractor-tests/generated/Module/Module_getDeclaration.ql
+++ b/rust/ql/test/extractor-tests/generated/Module/Module_getAttr.ql
@@ -4,4 +4,4 @@ import TestUtils
 
 from Module x, int index
 where toBeTested(x) and not x.isUnknown()
-select x, index, x.getDeclaration(index)
+select x, index, x.getAttr(index)
diff --git a/rust/ql/test/extractor-tests/generated/Module/Module_getCrateOrigin.expected b/rust/ql/test/extractor-tests/generated/Module/Module_getCrateOrigin.expected
new file mode 100644
index 00000000000..e2e58c030ef
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/Module/Module_getCrateOrigin.expected
@@ -0,0 +1,3 @@
+| gen_module.rs:3:1:4:8 | Module | repo::test |
+| gen_module.rs:5:1:7:1 | Module | repo::test |
+| lib.rs:1:1:1:15 | Module | repo::test |
diff --git a/rust/ql/test/extractor-tests/generated/Module/Module_getCrateOrigin.ql b/rust/ql/test/extractor-tests/generated/Module/Module_getCrateOrigin.ql
new file mode 100644
index 00000000000..7a95cdcc772
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/Module/Module_getCrateOrigin.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from Module x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getCrateOrigin()
diff --git a/rust/ql/test/extractor-tests/generated/Module/Module_getDeclaration.expected b/rust/ql/test/extractor-tests/generated/Module/Module_getDeclaration.expected
deleted file mode 100644
index 1441501f34e..00000000000
--- a/rust/ql/test/extractor-tests/generated/Module/Module_getDeclaration.expected
+++ /dev/null
@@ -1,7 +0,0 @@
-| file://:0:0:0:0 | Module | 0 | file://:0:0:0:0 | UnimplementedDeclaration |
-| file://:0:0:0:0 | Module | 0 | file://:0:0:0:0 | UnimplementedDeclaration |
-| file://:0:0:0:0 | Module | 0 | file://:0:0:0:0 | UnimplementedDeclaration |
-| file://:0:0:0:0 | Module | 0 | gen_module.rs:6:5:6:19 | baz |
-| file://:0:0:0:0 | Module | 1 | file://:0:0:0:0 | UnimplementedDeclaration |
-| file://:0:0:0:0 | Module | 1 | file://:0:0:0:0 | UnimplementedDeclaration |
-| file://:0:0:0:0 | Module | 1 | file://:0:0:0:0 | UnimplementedDeclaration |
diff --git a/rust/ql/test/extractor-tests/generated/Module/Module_getExtendedCanonicalPath.expected b/rust/ql/test/extractor-tests/generated/Module/Module_getExtendedCanonicalPath.expected
new file mode 100644
index 00000000000..19eadfdafd5
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/Module/Module_getExtendedCanonicalPath.expected
@@ -0,0 +1,3 @@
+| gen_module.rs:3:1:4:8 | Module | crate::gen_module::foo |
+| gen_module.rs:5:1:7:1 | Module | crate::gen_module::bar |
+| lib.rs:1:1:1:15 | Module | crate::gen_module |
diff --git a/rust/ql/test/extractor-tests/generated/Module/Module_getExtendedCanonicalPath.ql b/rust/ql/test/extractor-tests/generated/Module/Module_getExtendedCanonicalPath.ql
new file mode 100644
index 00000000000..9c810fe65c6
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/Module/Module_getExtendedCanonicalPath.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from Module x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getExtendedCanonicalPath()
diff --git a/rust/ql/test/extractor-tests/generated/Module/Module_getItemList.expected b/rust/ql/test/extractor-tests/generated/Module/Module_getItemList.expected
new file mode 100644
index 00000000000..04fd8d4a81a
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/Module/Module_getItemList.expected
@@ -0,0 +1 @@
+| gen_module.rs:5:1:7:1 | Module | gen_module.rs:5:9:7:1 | ItemList |
diff --git a/rust/ql/test/extractor-tests/generated/Module/Module_getItemList.ql b/rust/ql/test/extractor-tests/generated/Module/Module_getItemList.ql
new file mode 100644
index 00000000000..0654df37918
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/Module/Module_getItemList.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from Module x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getItemList()
diff --git a/rust/ql/test/extractor-tests/generated/Module/Module_getName.expected b/rust/ql/test/extractor-tests/generated/Module/Module_getName.expected
new file mode 100644
index 00000000000..cc295b1da89
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/Module/Module_getName.expected
@@ -0,0 +1,3 @@
+| gen_module.rs:3:1:4:8 | Module | gen_module.rs:4:5:4:7 | foo |
+| gen_module.rs:5:1:7:1 | Module | gen_module.rs:5:5:5:7 | bar |
+| lib.rs:1:1:1:15 | Module | lib.rs:1:5:1:14 | gen_module |
diff --git a/rust/ql/test/extractor-tests/generated/Module/Module_getName.ql b/rust/ql/test/extractor-tests/generated/Module/Module_getName.ql
new file mode 100644
index 00000000000..dbda0724b1e
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/Module/Module_getName.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from Module x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getName()
diff --git a/rust/ql/test/extractor-tests/generated/Module/Module_getVisibility.expected b/rust/ql/test/extractor-tests/generated/Module/Module_getVisibility.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/Module/Module_getVisibility.ql b/rust/ql/test/extractor-tests/generated/Module/Module_getVisibility.ql
new file mode 100644
index 00000000000..064f520d6a7
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/Module/Module_getVisibility.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from Module x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getVisibility()
diff --git a/rust/ql/test/extractor-tests/generated/Name/Name.expected b/rust/ql/test/extractor-tests/generated/Name/Name.expected
new file mode 100644
index 00000000000..37d1c2e1dd4
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/Name/Name.expected
@@ -0,0 +1,2 @@
+| gen_name.rs:3:4:3:12 | test_name | hasText: | yes |
+| lib.rs:1:5:1:12 | gen_name | hasText: | yes |
diff --git a/rust/ql/test/extractor-tests/generated/Name/Name.ql b/rust/ql/test/extractor-tests/generated/Name/Name.ql
new file mode 100644
index 00000000000..6685f4f9b7a
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/Name/Name.ql
@@ -0,0 +1,10 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from Name x, string hasText
+where
+  toBeTested(x) and
+  not x.isUnknown() and
+  if x.hasText() then hasText = "yes" else hasText = "no"
+select x, "hasText:", hasText
diff --git a/rust/ql/test/extractor-tests/generated/Name/Name_getText.expected b/rust/ql/test/extractor-tests/generated/Name/Name_getText.expected
new file mode 100644
index 00000000000..9cee64fd236
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/Name/Name_getText.expected
@@ -0,0 +1,2 @@
+| gen_name.rs:3:4:3:12 | test_name | test_name |
+| lib.rs:1:5:1:12 | gen_name | gen_name |
diff --git a/rust/ql/test/extractor-tests/generated/Name/Name_getText.ql b/rust/ql/test/extractor-tests/generated/Name/Name_getText.ql
new file mode 100644
index 00000000000..90ff2d3e04b
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/Name/Name_getText.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from Name x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getText()
diff --git a/rust/ql/test/extractor-tests/generated/Name/gen_name.rs b/rust/ql/test/extractor-tests/generated/Name/gen_name.rs
new file mode 100644
index 00000000000..6b09a11fc12
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/Name/gen_name.rs
@@ -0,0 +1,6 @@
+// generated by codegen, do not edit
+
+fn test_name() -> () {
+    // A Name. For example:
+    todo!()
+}
diff --git a/rust/ql/test/extractor-tests/generated/NameRef/NameRef.expected b/rust/ql/test/extractor-tests/generated/NameRef/NameRef.expected
new file mode 100644
index 00000000000..2c0b9dffa4d
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/NameRef/NameRef.expected
@@ -0,0 +1,4 @@
+| gen_name_ref.rs:5:5:5:8 | todo | hasText: | yes |
+| gen_name_ref.rs:5:5:5:11 | $crate | hasText: | yes |
+| gen_name_ref.rs:5:5:5:11 | panic | hasText: | yes |
+| gen_name_ref.rs:5:5:5:11 | panicking | hasText: | yes |
diff --git a/rust/ql/test/extractor-tests/generated/NameRef/NameRef.ql b/rust/ql/test/extractor-tests/generated/NameRef/NameRef.ql
new file mode 100644
index 00000000000..cb5ab8652f8
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/NameRef/NameRef.ql
@@ -0,0 +1,10 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from NameRef x, string hasText
+where
+  toBeTested(x) and
+  not x.isUnknown() and
+  if x.hasText() then hasText = "yes" else hasText = "no"
+select x, "hasText:", hasText
diff --git a/rust/ql/test/extractor-tests/generated/NameRef/NameRef_getText.expected b/rust/ql/test/extractor-tests/generated/NameRef/NameRef_getText.expected
new file mode 100644
index 00000000000..17f24a9cefe
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/NameRef/NameRef_getText.expected
@@ -0,0 +1,4 @@
+| gen_name_ref.rs:5:5:5:8 | todo | todo |
+| gen_name_ref.rs:5:5:5:11 | $crate | $crate |
+| gen_name_ref.rs:5:5:5:11 | panic | panic |
+| gen_name_ref.rs:5:5:5:11 | panicking | panicking |
diff --git a/rust/ql/test/extractor-tests/generated/NameRef/NameRef_getText.ql b/rust/ql/test/extractor-tests/generated/NameRef/NameRef_getText.ql
new file mode 100644
index 00000000000..daa44134dca
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/NameRef/NameRef_getText.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from NameRef x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getText()
diff --git a/rust/ql/test/extractor-tests/generated/NameRef/gen_name_ref.rs b/rust/ql/test/extractor-tests/generated/NameRef/gen_name_ref.rs
new file mode 100644
index 00000000000..fe161cef749
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/NameRef/gen_name_ref.rs
@@ -0,0 +1,6 @@
+// generated by codegen, do not edit
+
+fn test_name_ref() -> () {
+    // A NameRef. For example:
+    todo!()
+}
diff --git a/rust/ql/test/extractor-tests/generated/NeverType/NeverType.expected b/rust/ql/test/extractor-tests/generated/NeverType/NeverType.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/MissingPat/MissingPat.ql b/rust/ql/test/extractor-tests/generated/NeverType/NeverType.ql
similarity index 88%
rename from rust/ql/test/extractor-tests/generated/MissingPat/MissingPat.ql
rename to rust/ql/test/extractor-tests/generated/NeverType/NeverType.ql
index 61047e1e6be..b093d5f1ee5 100644
--- a/rust/ql/test/extractor-tests/generated/MissingPat/MissingPat.ql
+++ b/rust/ql/test/extractor-tests/generated/NeverType/NeverType.ql
@@ -2,6 +2,6 @@
 import codeql.rust.elements
 import TestUtils
 
-from MissingPat x
+from NeverType x
 where toBeTested(x) and not x.isUnknown()
 select x
diff --git a/rust/ql/test/extractor-tests/generated/NeverType/gen_never_type.rs b/rust/ql/test/extractor-tests/generated/NeverType/gen_never_type.rs
new file mode 100644
index 00000000000..f84b6dc6c0a
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/NeverType/gen_never_type.rs
@@ -0,0 +1,6 @@
+// generated by codegen, do not edit
+
+fn test_never_type() -> () {
+    // A NeverType. For example:
+    todo!()
+}
diff --git a/rust/ql/test/extractor-tests/generated/OffsetOfExpr/OffsetOfExpr.expected b/rust/ql/test/extractor-tests/generated/OffsetOfExpr/OffsetOfExpr.expected
index e28c61da351..1e53040c6cb 100644
--- a/rust/ql/test/extractor-tests/generated/OffsetOfExpr/OffsetOfExpr.expected
+++ b/rust/ql/test/extractor-tests/generated/OffsetOfExpr/OffsetOfExpr.expected
@@ -1 +1 @@
-| gen_offset_of_expr.rs:5:5:5:38 | OffsetOfExpr | getContainer: | file://:0:0:0:0 | TypeRef | getNumberOfFields: | 1 |
+| gen_offset_of_expr.rs:5:5:5:38 | OffsetOfExpr | getNumberOfAttrs: | 0 | getNumberOfFields: | 1 | hasTy: | yes |
diff --git a/rust/ql/test/extractor-tests/generated/OffsetOfExpr/OffsetOfExpr.ql b/rust/ql/test/extractor-tests/generated/OffsetOfExpr/OffsetOfExpr.ql
index 4cdb625caa8..9161ff35a93 100644
--- a/rust/ql/test/extractor-tests/generated/OffsetOfExpr/OffsetOfExpr.ql
+++ b/rust/ql/test/extractor-tests/generated/OffsetOfExpr/OffsetOfExpr.ql
@@ -2,10 +2,12 @@
 import codeql.rust.elements
 import TestUtils
 
-from OffsetOfExpr x, TypeRef getContainer, int getNumberOfFields
+from OffsetOfExpr x, int getNumberOfAttrs, int getNumberOfFields, string hasTy
 where
   toBeTested(x) and
   not x.isUnknown() and
-  getContainer = x.getContainer() and
-  getNumberOfFields = x.getNumberOfFields()
-select x, "getContainer:", getContainer, "getNumberOfFields:", getNumberOfFields
+  getNumberOfAttrs = x.getNumberOfAttrs() and
+  getNumberOfFields = x.getNumberOfFields() and
+  if x.hasTy() then hasTy = "yes" else hasTy = "no"
+select x, "getNumberOfAttrs:", getNumberOfAttrs, "getNumberOfFields:", getNumberOfFields, "hasTy:",
+  hasTy
diff --git a/rust/ql/test/extractor-tests/generated/OffsetOfExpr/OffsetOfExpr_getAttr.expected b/rust/ql/test/extractor-tests/generated/OffsetOfExpr/OffsetOfExpr_getAttr.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/OffsetOfExpr/OffsetOfExpr_getAttr.ql b/rust/ql/test/extractor-tests/generated/OffsetOfExpr/OffsetOfExpr_getAttr.ql
new file mode 100644
index 00000000000..c038e83f2f5
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/OffsetOfExpr/OffsetOfExpr_getAttr.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from OffsetOfExpr x, int index
+where toBeTested(x) and not x.isUnknown()
+select x, index, x.getAttr(index)
diff --git a/rust/ql/test/extractor-tests/generated/OffsetOfExpr/OffsetOfExpr_getField.expected b/rust/ql/test/extractor-tests/generated/OffsetOfExpr/OffsetOfExpr_getField.expected
index 5aac2799dab..bec224d18ce 100644
--- a/rust/ql/test/extractor-tests/generated/OffsetOfExpr/OffsetOfExpr_getField.expected
+++ b/rust/ql/test/extractor-tests/generated/OffsetOfExpr/OffsetOfExpr_getField.expected
@@ -1 +1 @@
-| gen_offset_of_expr.rs:5:5:5:38 | OffsetOfExpr | 0 | field |
+| gen_offset_of_expr.rs:5:5:5:38 | OffsetOfExpr | 0 | gen_offset_of_expr.rs:5:33:5:37 | field |
diff --git a/rust/ql/test/extractor-tests/generated/OffsetOfExpr/OffsetOfExpr_getTy.expected b/rust/ql/test/extractor-tests/generated/OffsetOfExpr/OffsetOfExpr_getTy.expected
new file mode 100644
index 00000000000..c7d0f2ee6af
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/OffsetOfExpr/OffsetOfExpr_getTy.expected
@@ -0,0 +1 @@
+| gen_offset_of_expr.rs:5:5:5:38 | OffsetOfExpr | gen_offset_of_expr.rs:5:25:5:30 | PathType |
diff --git a/rust/ql/test/extractor-tests/generated/OffsetOfExpr/OffsetOfExpr_getTy.ql b/rust/ql/test/extractor-tests/generated/OffsetOfExpr/OffsetOfExpr_getTy.ql
new file mode 100644
index 00000000000..4ab524b18c7
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/OffsetOfExpr/OffsetOfExpr_getTy.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from OffsetOfExpr x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getTy()
diff --git a/rust/ql/test/extractor-tests/generated/OrPat/OrPat.expected b/rust/ql/test/extractor-tests/generated/OrPat/OrPat.expected
index bca61721ca4..786a0018093 100644
--- a/rust/ql/test/extractor-tests/generated/OrPat/OrPat.expected
+++ b/rust/ql/test/extractor-tests/generated/OrPat/OrPat.expected
@@ -1 +1 @@
-| gen_or_pat.rs:6:9:6:38 | OrPat | getNumberOfArgs: | 2 |
+| gen_or_pat.rs:6:9:6:38 | OrPat | getNumberOfPats: | 2 |
diff --git a/rust/ql/test/extractor-tests/generated/OrPat/OrPat.ql b/rust/ql/test/extractor-tests/generated/OrPat/OrPat.ql
index 8eb2b245bb0..11b3bb7394c 100644
--- a/rust/ql/test/extractor-tests/generated/OrPat/OrPat.ql
+++ b/rust/ql/test/extractor-tests/generated/OrPat/OrPat.ql
@@ -2,9 +2,9 @@
 import codeql.rust.elements
 import TestUtils
 
-from OrPat x, int getNumberOfArgs
+from OrPat x, int getNumberOfPats
 where
   toBeTested(x) and
   not x.isUnknown() and
-  getNumberOfArgs = x.getNumberOfArgs()
-select x, "getNumberOfArgs:", getNumberOfArgs
+  getNumberOfPats = x.getNumberOfPats()
+select x, "getNumberOfPats:", getNumberOfPats
diff --git a/rust/ql/test/extractor-tests/generated/OrPat/OrPat_getArg.expected b/rust/ql/test/extractor-tests/generated/OrPat/OrPat_getPat.expected
similarity index 100%
rename from rust/ql/test/extractor-tests/generated/OrPat/OrPat_getArg.expected
rename to rust/ql/test/extractor-tests/generated/OrPat/OrPat_getPat.expected
diff --git a/rust/ql/test/extractor-tests/generated/OrPat/OrPat_getPat.ql b/rust/ql/test/extractor-tests/generated/OrPat/OrPat_getPat.ql
new file mode 100644
index 00000000000..468619511dd
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/OrPat/OrPat_getPat.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from OrPat x, int index
+where toBeTested(x) and not x.isUnknown()
+select x, index, x.getPat(index)
diff --git a/rust/ql/test/extractor-tests/generated/Param/Param.expected b/rust/ql/test/extractor-tests/generated/Param/Param.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/Param/Param.ql b/rust/ql/test/extractor-tests/generated/Param/Param.ql
new file mode 100644
index 00000000000..6e022c29db9
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/Param/Param.ql
@@ -0,0 +1,12 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from Param x, int getNumberOfAttrs, string hasPat, string hasTy
+where
+  toBeTested(x) and
+  not x.isUnknown() and
+  getNumberOfAttrs = x.getNumberOfAttrs() and
+  (if x.hasPat() then hasPat = "yes" else hasPat = "no") and
+  if x.hasTy() then hasTy = "yes" else hasTy = "no"
+select x, "getNumberOfAttrs:", getNumberOfAttrs, "hasPat:", hasPat, "hasTy:", hasTy
diff --git a/rust/ql/test/extractor-tests/generated/Param/Param_getAttr.expected b/rust/ql/test/extractor-tests/generated/Param/Param_getAttr.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/Param/Param_getAttr.ql b/rust/ql/test/extractor-tests/generated/Param/Param_getAttr.ql
new file mode 100644
index 00000000000..72c78863531
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/Param/Param_getAttr.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from Param x, int index
+where toBeTested(x) and not x.isUnknown()
+select x, index, x.getAttr(index)
diff --git a/rust/ql/test/extractor-tests/generated/Param/Param_getPat.expected b/rust/ql/test/extractor-tests/generated/Param/Param_getPat.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/Param/Param_getPat.ql b/rust/ql/test/extractor-tests/generated/Param/Param_getPat.ql
new file mode 100644
index 00000000000..5e8e11356c7
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/Param/Param_getPat.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from Param x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getPat()
diff --git a/rust/ql/test/extractor-tests/generated/Param/Param_getTy.expected b/rust/ql/test/extractor-tests/generated/Param/Param_getTy.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/Param/Param_getTy.ql b/rust/ql/test/extractor-tests/generated/Param/Param_getTy.ql
new file mode 100644
index 00000000000..360f8b65bd7
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/Param/Param_getTy.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from Param x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getTy()
diff --git a/rust/ql/test/extractor-tests/generated/Param/gen_param.rs b/rust/ql/test/extractor-tests/generated/Param/gen_param.rs
new file mode 100644
index 00000000000..5bc96d63219
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/Param/gen_param.rs
@@ -0,0 +1,6 @@
+// generated by codegen, do not edit
+
+fn test_param() -> () {
+    // A Param. For example:
+    todo!()
+}
diff --git a/rust/ql/test/extractor-tests/generated/ParamList/ParamList.expected b/rust/ql/test/extractor-tests/generated/ParamList/ParamList.expected
new file mode 100644
index 00000000000..e966a16e13c
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/ParamList/ParamList.expected
@@ -0,0 +1 @@
+| gen_param_list.rs:3:19:3:20 | ParamList | getNumberOfParams: | 0 | hasSelfParam: | no |
diff --git a/rust/ql/test/extractor-tests/generated/ParamList/ParamList.ql b/rust/ql/test/extractor-tests/generated/ParamList/ParamList.ql
new file mode 100644
index 00000000000..9e65fbf7f7f
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/ParamList/ParamList.ql
@@ -0,0 +1,11 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from ParamList x, int getNumberOfParams, string hasSelfParam
+where
+  toBeTested(x) and
+  not x.isUnknown() and
+  getNumberOfParams = x.getNumberOfParams() and
+  if x.hasSelfParam() then hasSelfParam = "yes" else hasSelfParam = "no"
+select x, "getNumberOfParams:", getNumberOfParams, "hasSelfParam:", hasSelfParam
diff --git a/rust/ql/test/extractor-tests/generated/ParamList/ParamList_getParam.expected b/rust/ql/test/extractor-tests/generated/ParamList/ParamList_getParam.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/ParamList/ParamList_getParam.ql b/rust/ql/test/extractor-tests/generated/ParamList/ParamList_getParam.ql
new file mode 100644
index 00000000000..d0a24b09409
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/ParamList/ParamList_getParam.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from ParamList x, int index
+where toBeTested(x) and not x.isUnknown()
+select x, index, x.getParam(index)
diff --git a/rust/ql/test/extractor-tests/generated/ParamList/ParamList_getSelfParam.expected b/rust/ql/test/extractor-tests/generated/ParamList/ParamList_getSelfParam.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/ParamList/ParamList_getSelfParam.ql b/rust/ql/test/extractor-tests/generated/ParamList/ParamList_getSelfParam.ql
new file mode 100644
index 00000000000..bdd98b434d7
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/ParamList/ParamList_getSelfParam.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from ParamList x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getSelfParam()
diff --git a/rust/ql/test/extractor-tests/generated/ParamList/gen_param_list.rs b/rust/ql/test/extractor-tests/generated/ParamList/gen_param_list.rs
new file mode 100644
index 00000000000..7f25b68c774
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/ParamList/gen_param_list.rs
@@ -0,0 +1,6 @@
+// generated by codegen, do not edit
+
+fn test_param_list() -> () {
+    // A ParamList. For example:
+    todo!()
+}
diff --git a/rust/ql/test/extractor-tests/generated/ParenExpr/ParenExpr.expected b/rust/ql/test/extractor-tests/generated/ParenExpr/ParenExpr.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/ParenExpr/ParenExpr.ql b/rust/ql/test/extractor-tests/generated/ParenExpr/ParenExpr.ql
new file mode 100644
index 00000000000..114bf888239
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/ParenExpr/ParenExpr.ql
@@ -0,0 +1,11 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from ParenExpr x, int getNumberOfAttrs, string hasExpr
+where
+  toBeTested(x) and
+  not x.isUnknown() and
+  getNumberOfAttrs = x.getNumberOfAttrs() and
+  if x.hasExpr() then hasExpr = "yes" else hasExpr = "no"
+select x, "getNumberOfAttrs:", getNumberOfAttrs, "hasExpr:", hasExpr
diff --git a/rust/ql/test/extractor-tests/generated/ParenExpr/ParenExpr_getAttr.expected b/rust/ql/test/extractor-tests/generated/ParenExpr/ParenExpr_getAttr.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/ParenExpr/ParenExpr_getAttr.ql b/rust/ql/test/extractor-tests/generated/ParenExpr/ParenExpr_getAttr.ql
new file mode 100644
index 00000000000..c2352453b9a
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/ParenExpr/ParenExpr_getAttr.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from ParenExpr x, int index
+where toBeTested(x) and not x.isUnknown()
+select x, index, x.getAttr(index)
diff --git a/rust/ql/test/extractor-tests/generated/ParenExpr/ParenExpr_getExpr.expected b/rust/ql/test/extractor-tests/generated/ParenExpr/ParenExpr_getExpr.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/ParenExpr/ParenExpr_getExpr.ql b/rust/ql/test/extractor-tests/generated/ParenExpr/ParenExpr_getExpr.ql
new file mode 100644
index 00000000000..c8a007478c3
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/ParenExpr/ParenExpr_getExpr.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from ParenExpr x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getExpr()
diff --git a/rust/ql/test/extractor-tests/generated/ParenExpr/gen_paren_expr.rs b/rust/ql/test/extractor-tests/generated/ParenExpr/gen_paren_expr.rs
new file mode 100644
index 00000000000..954e1878ee3
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/ParenExpr/gen_paren_expr.rs
@@ -0,0 +1,6 @@
+// generated by codegen, do not edit
+
+fn test_paren_expr() -> () {
+    // A ParenExpr. For example:
+    todo!()
+}
diff --git a/rust/ql/test/extractor-tests/generated/ParenPat/ParenPat.expected b/rust/ql/test/extractor-tests/generated/ParenPat/ParenPat.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/ParenPat/ParenPat.ql b/rust/ql/test/extractor-tests/generated/ParenPat/ParenPat.ql
new file mode 100644
index 00000000000..bf9724edde3
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/ParenPat/ParenPat.ql
@@ -0,0 +1,10 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from ParenPat x, string hasPat
+where
+  toBeTested(x) and
+  not x.isUnknown() and
+  if x.hasPat() then hasPat = "yes" else hasPat = "no"
+select x, "hasPat:", hasPat
diff --git a/rust/ql/test/extractor-tests/generated/ParenPat/ParenPat_getPat.expected b/rust/ql/test/extractor-tests/generated/ParenPat/ParenPat_getPat.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/ParenPat/ParenPat_getPat.ql b/rust/ql/test/extractor-tests/generated/ParenPat/ParenPat_getPat.ql
new file mode 100644
index 00000000000..648fbfd9df0
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/ParenPat/ParenPat_getPat.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from ParenPat x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getPat()
diff --git a/rust/ql/test/extractor-tests/generated/ParenPat/gen_paren_pat.rs b/rust/ql/test/extractor-tests/generated/ParenPat/gen_paren_pat.rs
new file mode 100644
index 00000000000..9c24db9dce7
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/ParenPat/gen_paren_pat.rs
@@ -0,0 +1,6 @@
+// generated by codegen, do not edit
+
+fn test_paren_pat() -> () {
+    // A ParenPat. For example:
+    todo!()
+}
diff --git a/rust/ql/test/extractor-tests/generated/ParenType/ParenType.expected b/rust/ql/test/extractor-tests/generated/ParenType/ParenType.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/ParenType/ParenType.ql b/rust/ql/test/extractor-tests/generated/ParenType/ParenType.ql
new file mode 100644
index 00000000000..e704767d631
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/ParenType/ParenType.ql
@@ -0,0 +1,10 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from ParenType x, string hasTy
+where
+  toBeTested(x) and
+  not x.isUnknown() and
+  if x.hasTy() then hasTy = "yes" else hasTy = "no"
+select x, "hasTy:", hasTy
diff --git a/rust/ql/test/extractor-tests/generated/ParenType/ParenType_getTy.expected b/rust/ql/test/extractor-tests/generated/ParenType/ParenType_getTy.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/ParenType/ParenType_getTy.ql b/rust/ql/test/extractor-tests/generated/ParenType/ParenType_getTy.ql
new file mode 100644
index 00000000000..b472d03f718
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/ParenType/ParenType_getTy.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from ParenType x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getTy()
diff --git a/rust/ql/test/extractor-tests/generated/ParenType/gen_paren_type.rs b/rust/ql/test/extractor-tests/generated/ParenType/gen_paren_type.rs
new file mode 100644
index 00000000000..ad07406451b
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/ParenType/gen_paren_type.rs
@@ -0,0 +1,6 @@
+// generated by codegen, do not edit
+
+fn test_paren_type() -> () {
+    // A ParenType. For example:
+    todo!()
+}
diff --git a/rust/ql/test/extractor-tests/generated/Path/Path.expected b/rust/ql/test/extractor-tests/generated/Path/Path.expected
index 3e0c5eb3e26..db093224b76 100644
--- a/rust/ql/test/extractor-tests/generated/Path/Path.expected
+++ b/rust/ql/test/extractor-tests/generated/Path/Path.expected
@@ -1 +1,2 @@
-| gen_path.rs:5:5:5:12 | Path |
+| gen_path.rs:5:5:5:7 | foo | hasResolvedPath: | no | hasResolvedCrateOrigin: | no | hasQualifier: | no | hasPart: | yes |
+| gen_path.rs:5:5:5:12 | foo::bar | hasResolvedPath: | no | hasResolvedCrateOrigin: | no | hasQualifier: | yes | hasPart: | yes |
diff --git a/rust/ql/test/extractor-tests/generated/Path/Path.ql b/rust/ql/test/extractor-tests/generated/Path/Path.ql
index 4e51bef1402..d84c2d86987 100644
--- a/rust/ql/test/extractor-tests/generated/Path/Path.ql
+++ b/rust/ql/test/extractor-tests/generated/Path/Path.ql
@@ -2,6 +2,18 @@
 import codeql.rust.elements
 import TestUtils
 
-from Path x
-where toBeTested(x) and not x.isUnknown()
-select x
+from
+  Path x, string hasResolvedPath, string hasResolvedCrateOrigin, string hasQualifier, string hasPart
+where
+  toBeTested(x) and
+  not x.isUnknown() and
+  (if x.hasResolvedPath() then hasResolvedPath = "yes" else hasResolvedPath = "no") and
+  (
+    if x.hasResolvedCrateOrigin()
+    then hasResolvedCrateOrigin = "yes"
+    else hasResolvedCrateOrigin = "no"
+  ) and
+  (if x.hasQualifier() then hasQualifier = "yes" else hasQualifier = "no") and
+  if x.hasPart() then hasPart = "yes" else hasPart = "no"
+select x, "hasResolvedPath:", hasResolvedPath, "hasResolvedCrateOrigin:", hasResolvedCrateOrigin,
+  "hasQualifier:", hasQualifier, "hasPart:", hasPart
diff --git a/rust/ql/test/extractor-tests/generated/Path/Path_getPart.expected b/rust/ql/test/extractor-tests/generated/Path/Path_getPart.expected
new file mode 100644
index 00000000000..0e05956ea89
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/Path/Path_getPart.expected
@@ -0,0 +1,2 @@
+| gen_path.rs:5:5:5:7 | foo | gen_path.rs:5:5:5:7 | foo |
+| gen_path.rs:5:5:5:12 | foo::bar | gen_path.rs:5:10:5:12 | bar |
diff --git a/rust/ql/test/extractor-tests/generated/Path/Path_getPart.ql b/rust/ql/test/extractor-tests/generated/Path/Path_getPart.ql
new file mode 100644
index 00000000000..402b1354588
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/Path/Path_getPart.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from Path x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getPart()
diff --git a/rust/ql/test/extractor-tests/generated/Path/Path_getQualifier.expected b/rust/ql/test/extractor-tests/generated/Path/Path_getQualifier.expected
new file mode 100644
index 00000000000..44aa2ca5a00
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/Path/Path_getQualifier.expected
@@ -0,0 +1 @@
+| gen_path.rs:5:5:5:12 | foo::bar | gen_path.rs:5:5:5:7 | foo |
diff --git a/rust/ql/test/extractor-tests/generated/Path/Path_getQualifier.ql b/rust/ql/test/extractor-tests/generated/Path/Path_getQualifier.ql
new file mode 100644
index 00000000000..7678cffceca
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/Path/Path_getQualifier.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from Path x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getQualifier()
diff --git a/rust/ql/test/extractor-tests/generated/Path/Path_getResolvedCrateOrigin.expected b/rust/ql/test/extractor-tests/generated/Path/Path_getResolvedCrateOrigin.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/Path/Path_getResolvedCrateOrigin.ql b/rust/ql/test/extractor-tests/generated/Path/Path_getResolvedCrateOrigin.ql
new file mode 100644
index 00000000000..c998981364f
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/Path/Path_getResolvedCrateOrigin.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from Path x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getResolvedCrateOrigin()
diff --git a/rust/ql/test/extractor-tests/generated/Path/Path_getResolvedPath.expected b/rust/ql/test/extractor-tests/generated/Path/Path_getResolvedPath.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/Path/Path_getResolvedPath.ql b/rust/ql/test/extractor-tests/generated/Path/Path_getResolvedPath.ql
new file mode 100644
index 00000000000..c8969309836
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/Path/Path_getResolvedPath.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from Path x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getResolvedPath()
diff --git a/rust/ql/test/extractor-tests/generated/PathExpr/CONSISTENCY/DataFlowConsistency.expected b/rust/ql/test/extractor-tests/generated/PathExpr/CONSISTENCY/DataFlowConsistency.expected
new file mode 100644
index 00000000000..c54360f7361
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/PathExpr/CONSISTENCY/DataFlowConsistency.expected
@@ -0,0 +1,3 @@
+uniqueNodeToString
+| gen_path_expr.rs:7:13:7:20 | (no string representation) | Node should have one toString but has 0. |
+| gen_path_expr.rs:8:13:8:35 | (no string representation) | Node should have one toString but has 0. |
diff --git a/rust/ql/test/extractor-tests/generated/PathExpr/PathExpr.expected b/rust/ql/test/extractor-tests/generated/PathExpr/PathExpr.expected
index 7f24b432aa2..a676396a2f9 100644
--- a/rust/ql/test/extractor-tests/generated/PathExpr/PathExpr.expected
+++ b/rust/ql/test/extractor-tests/generated/PathExpr/PathExpr.expected
@@ -1,4 +1,4 @@
-| gen_path_expr.rs:5:13:5:20 | PathExpr | getPath: | gen_path_expr.rs:5:13:5:20 | Path |
-| gen_path_expr.rs:6:13:6:20 | PathExpr | getPath: | gen_path_expr.rs:6:13:6:20 | Path |
-| gen_path_expr.rs:7:13:7:20 | PathExpr | getPath: | gen_path_expr.rs:7:13:7:20 | Path |
-| gen_path_expr.rs:8:13:8:35 | PathExpr | getPath: | gen_path_expr.rs:8:13:8:35 | Path |
+| gen_path_expr.rs:5:13:5:20 | variable | getNumberOfAttrs: | 0 | hasPath: | yes |
+| gen_path_expr.rs:6:13:6:20 | foo::bar | getNumberOfAttrs: | 0 | hasPath: | yes |
+| gen_path_expr.rs:7:13:7:20 | (no string representation) | getNumberOfAttrs: | 0 | hasPath: | yes |
+| gen_path_expr.rs:8:13:8:35 | (no string representation) | getNumberOfAttrs: | 0 | hasPath: | yes |
diff --git a/rust/ql/test/extractor-tests/generated/PathExpr/PathExpr.ql b/rust/ql/test/extractor-tests/generated/PathExpr/PathExpr.ql
index d90c15fe6e4..4d472add336 100644
--- a/rust/ql/test/extractor-tests/generated/PathExpr/PathExpr.ql
+++ b/rust/ql/test/extractor-tests/generated/PathExpr/PathExpr.ql
@@ -2,9 +2,10 @@
 import codeql.rust.elements
 import TestUtils
 
-from PathExpr x, Path getPath
+from PathExpr x, int getNumberOfAttrs, string hasPath
 where
   toBeTested(x) and
   not x.isUnknown() and
-  getPath = x.getPath()
-select x, "getPath:", getPath
+  getNumberOfAttrs = x.getNumberOfAttrs() and
+  if x.hasPath() then hasPath = "yes" else hasPath = "no"
+select x, "getNumberOfAttrs:", getNumberOfAttrs, "hasPath:", hasPath
diff --git a/rust/ql/test/extractor-tests/generated/PathExpr/PathExpr_getAttr.expected b/rust/ql/test/extractor-tests/generated/PathExpr/PathExpr_getAttr.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/PathExpr/PathExpr_getAttr.ql b/rust/ql/test/extractor-tests/generated/PathExpr/PathExpr_getAttr.ql
new file mode 100644
index 00000000000..0c0ed2aa7e4
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/PathExpr/PathExpr_getAttr.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from PathExpr x, int index
+where toBeTested(x) and not x.isUnknown()
+select x, index, x.getAttr(index)
diff --git a/rust/ql/test/extractor-tests/generated/PathExpr/PathExpr_getPath.expected b/rust/ql/test/extractor-tests/generated/PathExpr/PathExpr_getPath.expected
new file mode 100644
index 00000000000..a5765b5be60
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/PathExpr/PathExpr_getPath.expected
@@ -0,0 +1,4 @@
+| gen_path_expr.rs:5:13:5:20 | variable | gen_path_expr.rs:5:13:5:20 | variable |
+| gen_path_expr.rs:6:13:6:20 | foo::bar | gen_path_expr.rs:6:13:6:20 | foo::bar |
+| gen_path_expr.rs:7:13:7:20 | (no string representation) | gen_path_expr.rs:7:13:7:20 | (no string representation) |
+| gen_path_expr.rs:8:13:8:35 | (no string representation) | gen_path_expr.rs:8:13:8:35 | (no string representation) |
diff --git a/rust/ql/test/extractor-tests/generated/PathExpr/PathExpr_getPath.ql b/rust/ql/test/extractor-tests/generated/PathExpr/PathExpr_getPath.ql
new file mode 100644
index 00000000000..a776443137e
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/PathExpr/PathExpr_getPath.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from PathExpr x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getPath()
diff --git a/rust/ql/test/extractor-tests/generated/PathPat/PathPat.expected b/rust/ql/test/extractor-tests/generated/PathPat/PathPat.expected
index 38e42ebfcf2..54845a7565c 100644
--- a/rust/ql/test/extractor-tests/generated/PathPat/PathPat.expected
+++ b/rust/ql/test/extractor-tests/generated/PathPat/PathPat.expected
@@ -1 +1 @@
-| gen_path_pat.rs:6:9:6:16 | PathPat | getPath: | gen_path_pat.rs:6:9:6:16 | Path |
+| gen_path_pat.rs:6:9:6:16 | PathPat | hasPath: | yes |
diff --git a/rust/ql/test/extractor-tests/generated/PathPat/PathPat.ql b/rust/ql/test/extractor-tests/generated/PathPat/PathPat.ql
index 49726bd7dad..3e6cce8f151 100644
--- a/rust/ql/test/extractor-tests/generated/PathPat/PathPat.ql
+++ b/rust/ql/test/extractor-tests/generated/PathPat/PathPat.ql
@@ -2,9 +2,9 @@
 import codeql.rust.elements
 import TestUtils
 
-from PathPat x, Path getPath
+from PathPat x, string hasPath
 where
   toBeTested(x) and
   not x.isUnknown() and
-  getPath = x.getPath()
-select x, "getPath:", getPath
+  if x.hasPath() then hasPath = "yes" else hasPath = "no"
+select x, "hasPath:", hasPath
diff --git a/rust/ql/test/extractor-tests/generated/PathPat/PathPat_getPath.expected b/rust/ql/test/extractor-tests/generated/PathPat/PathPat_getPath.expected
new file mode 100644
index 00000000000..d48ba6549db
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/PathPat/PathPat_getPath.expected
@@ -0,0 +1 @@
+| gen_path_pat.rs:6:9:6:16 | PathPat | gen_path_pat.rs:6:9:6:16 | Foo::Bar |
diff --git a/rust/ql/test/extractor-tests/generated/PathPat/PathPat_getPath.ql b/rust/ql/test/extractor-tests/generated/PathPat/PathPat_getPath.ql
new file mode 100644
index 00000000000..820b1028de2
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/PathPat/PathPat_getPath.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from PathPat x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getPath()
diff --git a/rust/ql/test/extractor-tests/generated/PathSegment/PathSegment.expected b/rust/ql/test/extractor-tests/generated/PathSegment/PathSegment.expected
new file mode 100644
index 00000000000..32042fc6a59
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/PathSegment/PathSegment.expected
@@ -0,0 +1,4 @@
+| gen_path_segment.rs:5:5:5:8 | todo | hasGenericArgList: | no | hasNameRef: | yes | hasParamList: | no | hasPathType: | no | hasRetType: | no | hasReturnTypeSyntax: | no | hasTy: | no |
+| gen_path_segment.rs:5:5:5:11 | $crate | hasGenericArgList: | no | hasNameRef: | yes | hasParamList: | no | hasPathType: | no | hasRetType: | no | hasReturnTypeSyntax: | no | hasTy: | no |
+| gen_path_segment.rs:5:5:5:11 | panic | hasGenericArgList: | no | hasNameRef: | yes | hasParamList: | no | hasPathType: | no | hasRetType: | no | hasReturnTypeSyntax: | no | hasTy: | no |
+| gen_path_segment.rs:5:5:5:11 | panicking | hasGenericArgList: | no | hasNameRef: | yes | hasParamList: | no | hasPathType: | no | hasRetType: | no | hasReturnTypeSyntax: | no | hasTy: | no |
diff --git a/rust/ql/test/extractor-tests/generated/PathSegment/PathSegment.ql b/rust/ql/test/extractor-tests/generated/PathSegment/PathSegment.ql
new file mode 100644
index 00000000000..cf18bedaced
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/PathSegment/PathSegment.ql
@@ -0,0 +1,20 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from
+  PathSegment x, string hasGenericArgList, string hasNameRef, string hasParamList,
+  string hasPathType, string hasRetType, string hasReturnTypeSyntax, string hasTy
+where
+  toBeTested(x) and
+  not x.isUnknown() and
+  (if x.hasGenericArgList() then hasGenericArgList = "yes" else hasGenericArgList = "no") and
+  (if x.hasNameRef() then hasNameRef = "yes" else hasNameRef = "no") and
+  (if x.hasParamList() then hasParamList = "yes" else hasParamList = "no") and
+  (if x.hasPathType() then hasPathType = "yes" else hasPathType = "no") and
+  (if x.hasRetType() then hasRetType = "yes" else hasRetType = "no") and
+  (if x.hasReturnTypeSyntax() then hasReturnTypeSyntax = "yes" else hasReturnTypeSyntax = "no") and
+  if x.hasTy() then hasTy = "yes" else hasTy = "no"
+select x, "hasGenericArgList:", hasGenericArgList, "hasNameRef:", hasNameRef, "hasParamList:",
+  hasParamList, "hasPathType:", hasPathType, "hasRetType:", hasRetType, "hasReturnTypeSyntax:",
+  hasReturnTypeSyntax, "hasTy:", hasTy
diff --git a/rust/ql/test/extractor-tests/generated/PathSegment/PathSegment_getGenericArgList.expected b/rust/ql/test/extractor-tests/generated/PathSegment/PathSegment_getGenericArgList.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/PathSegment/PathSegment_getGenericArgList.ql b/rust/ql/test/extractor-tests/generated/PathSegment/PathSegment_getGenericArgList.ql
new file mode 100644
index 00000000000..a9367578003
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/PathSegment/PathSegment_getGenericArgList.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from PathSegment x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getGenericArgList()
diff --git a/rust/ql/test/extractor-tests/generated/PathSegment/PathSegment_getNameRef.expected b/rust/ql/test/extractor-tests/generated/PathSegment/PathSegment_getNameRef.expected
new file mode 100644
index 00000000000..28346240d29
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/PathSegment/PathSegment_getNameRef.expected
@@ -0,0 +1,4 @@
+| gen_path_segment.rs:5:5:5:8 | todo | gen_path_segment.rs:5:5:5:8 | todo |
+| gen_path_segment.rs:5:5:5:11 | $crate | gen_path_segment.rs:5:5:5:11 | $crate |
+| gen_path_segment.rs:5:5:5:11 | panic | gen_path_segment.rs:5:5:5:11 | panic |
+| gen_path_segment.rs:5:5:5:11 | panicking | gen_path_segment.rs:5:5:5:11 | panicking |
diff --git a/rust/ql/test/extractor-tests/generated/PathSegment/PathSegment_getNameRef.ql b/rust/ql/test/extractor-tests/generated/PathSegment/PathSegment_getNameRef.ql
new file mode 100644
index 00000000000..6a68a4d7bba
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/PathSegment/PathSegment_getNameRef.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from PathSegment x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getNameRef()
diff --git a/rust/ql/test/extractor-tests/generated/PathSegment/PathSegment_getParamList.expected b/rust/ql/test/extractor-tests/generated/PathSegment/PathSegment_getParamList.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/PathSegment/PathSegment_getParamList.ql b/rust/ql/test/extractor-tests/generated/PathSegment/PathSegment_getParamList.ql
new file mode 100644
index 00000000000..761c43ad8ec
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/PathSegment/PathSegment_getParamList.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from PathSegment x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getParamList()
diff --git a/rust/ql/test/extractor-tests/generated/PathSegment/PathSegment_getPathType.expected b/rust/ql/test/extractor-tests/generated/PathSegment/PathSegment_getPathType.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/PathSegment/PathSegment_getPathType.ql b/rust/ql/test/extractor-tests/generated/PathSegment/PathSegment_getPathType.ql
new file mode 100644
index 00000000000..6131393c89a
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/PathSegment/PathSegment_getPathType.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from PathSegment x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getPathType()
diff --git a/rust/ql/test/extractor-tests/generated/PathSegment/PathSegment_getRetType.expected b/rust/ql/test/extractor-tests/generated/PathSegment/PathSegment_getRetType.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/PathSegment/PathSegment_getRetType.ql b/rust/ql/test/extractor-tests/generated/PathSegment/PathSegment_getRetType.ql
new file mode 100644
index 00000000000..311642a5f85
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/PathSegment/PathSegment_getRetType.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from PathSegment x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getRetType()
diff --git a/rust/ql/test/extractor-tests/generated/PathSegment/PathSegment_getReturnTypeSyntax.expected b/rust/ql/test/extractor-tests/generated/PathSegment/PathSegment_getReturnTypeSyntax.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/PathSegment/PathSegment_getReturnTypeSyntax.ql b/rust/ql/test/extractor-tests/generated/PathSegment/PathSegment_getReturnTypeSyntax.ql
new file mode 100644
index 00000000000..f978f70c8a6
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/PathSegment/PathSegment_getReturnTypeSyntax.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from PathSegment x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getReturnTypeSyntax()
diff --git a/rust/ql/test/extractor-tests/generated/PathSegment/PathSegment_getTy.expected b/rust/ql/test/extractor-tests/generated/PathSegment/PathSegment_getTy.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/PathSegment/PathSegment_getTy.ql b/rust/ql/test/extractor-tests/generated/PathSegment/PathSegment_getTy.ql
new file mode 100644
index 00000000000..6445000c2a4
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/PathSegment/PathSegment_getTy.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from PathSegment x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getTy()
diff --git a/rust/ql/test/extractor-tests/generated/PathSegment/gen_path_segment.rs b/rust/ql/test/extractor-tests/generated/PathSegment/gen_path_segment.rs
new file mode 100644
index 00000000000..0ab008b6a68
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/PathSegment/gen_path_segment.rs
@@ -0,0 +1,6 @@
+// generated by codegen, do not edit
+
+fn test_path_segment() -> () {
+    // A PathSegment. For example:
+    todo!()
+}
diff --git a/rust/ql/test/extractor-tests/generated/PathType/PathType.expected b/rust/ql/test/extractor-tests/generated/PathType/PathType.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/PathType/PathType.ql b/rust/ql/test/extractor-tests/generated/PathType/PathType.ql
new file mode 100644
index 00000000000..a064955c56f
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/PathType/PathType.ql
@@ -0,0 +1,10 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from PathType x, string hasPath
+where
+  toBeTested(x) and
+  not x.isUnknown() and
+  if x.hasPath() then hasPath = "yes" else hasPath = "no"
+select x, "hasPath:", hasPath
diff --git a/rust/ql/test/extractor-tests/generated/PathType/PathType_getPath.expected b/rust/ql/test/extractor-tests/generated/PathType/PathType_getPath.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/PathType/PathType_getPath.ql b/rust/ql/test/extractor-tests/generated/PathType/PathType_getPath.ql
new file mode 100644
index 00000000000..991efc31037
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/PathType/PathType_getPath.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from PathType x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getPath()
diff --git a/rust/ql/test/extractor-tests/generated/PathType/gen_path_type.rs b/rust/ql/test/extractor-tests/generated/PathType/gen_path_type.rs
new file mode 100644
index 00000000000..e7666e2128a
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/PathType/gen_path_type.rs
@@ -0,0 +1,6 @@
+// generated by codegen, do not edit
+
+fn test_path_type() -> () {
+    // A PathType. For example:
+    todo!()
+}
diff --git a/rust/ql/test/extractor-tests/generated/PrefixExpr/PrefixExpr.expected b/rust/ql/test/extractor-tests/generated/PrefixExpr/PrefixExpr.expected
index 151eb7e1745..01ebd0f099c 100644
--- a/rust/ql/test/extractor-tests/generated/PrefixExpr/PrefixExpr.expected
+++ b/rust/ql/test/extractor-tests/generated/PrefixExpr/PrefixExpr.expected
@@ -1,3 +1,3 @@
-| gen_prefix_expr.rs:5:13:5:15 | PrefixExpr | getExpr: | gen_prefix_expr.rs:5:14:5:15 | LiteralExpr | getOp: | - |
-| gen_prefix_expr.rs:6:13:6:17 | PrefixExpr | getExpr: | gen_prefix_expr.rs:6:14:6:17 | LiteralExpr | getOp: | ! |
-| gen_prefix_expr.rs:7:13:7:16 | PrefixExpr | getExpr: | gen_prefix_expr.rs:7:14:7:16 | PathExpr | getOp: | * |
+| gen_prefix_expr.rs:5:13:5:15 | - ... | getNumberOfAttrs: | 0 | hasExpr: | yes | hasOperatorName: | yes |
+| gen_prefix_expr.rs:6:13:6:17 | ! ... | getNumberOfAttrs: | 0 | hasExpr: | yes | hasOperatorName: | yes |
+| gen_prefix_expr.rs:7:13:7:16 | * ... | getNumberOfAttrs: | 0 | hasExpr: | yes | hasOperatorName: | yes |
diff --git a/rust/ql/test/extractor-tests/generated/PrefixExpr/PrefixExpr.ql b/rust/ql/test/extractor-tests/generated/PrefixExpr/PrefixExpr.ql
index 3105466e1df..67d69c5363b 100644
--- a/rust/ql/test/extractor-tests/generated/PrefixExpr/PrefixExpr.ql
+++ b/rust/ql/test/extractor-tests/generated/PrefixExpr/PrefixExpr.ql
@@ -2,10 +2,12 @@
 import codeql.rust.elements
 import TestUtils
 
-from PrefixExpr x, Expr getExpr, string getOp
+from PrefixExpr x, int getNumberOfAttrs, string hasExpr, string hasOperatorName
 where
   toBeTested(x) and
   not x.isUnknown() and
-  getExpr = x.getExpr() and
-  getOp = x.getOp()
-select x, "getExpr:", getExpr, "getOp:", getOp
+  getNumberOfAttrs = x.getNumberOfAttrs() and
+  (if x.hasExpr() then hasExpr = "yes" else hasExpr = "no") and
+  if x.hasOperatorName() then hasOperatorName = "yes" else hasOperatorName = "no"
+select x, "getNumberOfAttrs:", getNumberOfAttrs, "hasExpr:", hasExpr, "hasOperatorName:",
+  hasOperatorName
diff --git a/rust/ql/test/extractor-tests/generated/PrefixExpr/PrefixExpr_getAttr.expected b/rust/ql/test/extractor-tests/generated/PrefixExpr/PrefixExpr_getAttr.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/PrefixExpr/PrefixExpr_getAttr.ql b/rust/ql/test/extractor-tests/generated/PrefixExpr/PrefixExpr_getAttr.ql
new file mode 100644
index 00000000000..813cb53ae4f
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/PrefixExpr/PrefixExpr_getAttr.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from PrefixExpr x, int index
+where toBeTested(x) and not x.isUnknown()
+select x, index, x.getAttr(index)
diff --git a/rust/ql/test/extractor-tests/generated/PrefixExpr/PrefixExpr_getExpr.expected b/rust/ql/test/extractor-tests/generated/PrefixExpr/PrefixExpr_getExpr.expected
new file mode 100644
index 00000000000..6c9edcba00d
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/PrefixExpr/PrefixExpr_getExpr.expected
@@ -0,0 +1,3 @@
+| gen_prefix_expr.rs:5:13:5:15 | - ... | gen_prefix_expr.rs:5:14:5:15 | 42 |
+| gen_prefix_expr.rs:6:13:6:17 | ! ... | gen_prefix_expr.rs:6:14:6:17 | true |
+| gen_prefix_expr.rs:7:13:7:16 | * ... | gen_prefix_expr.rs:7:14:7:16 | ptr |
diff --git a/rust/ql/test/extractor-tests/generated/PrefixExpr/PrefixExpr_getExpr.ql b/rust/ql/test/extractor-tests/generated/PrefixExpr/PrefixExpr_getExpr.ql
new file mode 100644
index 00000000000..d3e054d5eb8
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/PrefixExpr/PrefixExpr_getExpr.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from PrefixExpr x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getExpr()
diff --git a/rust/ql/test/extractor-tests/generated/PrefixExpr/PrefixExpr_getOperatorName.expected b/rust/ql/test/extractor-tests/generated/PrefixExpr/PrefixExpr_getOperatorName.expected
new file mode 100644
index 00000000000..0cee9c31bc3
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/PrefixExpr/PrefixExpr_getOperatorName.expected
@@ -0,0 +1,3 @@
+| gen_prefix_expr.rs:5:13:5:15 | - ... | - |
+| gen_prefix_expr.rs:6:13:6:17 | ! ... | ! |
+| gen_prefix_expr.rs:7:13:7:16 | * ... | * |
diff --git a/rust/ql/test/extractor-tests/generated/PrefixExpr/PrefixExpr_getOperatorName.ql b/rust/ql/test/extractor-tests/generated/PrefixExpr/PrefixExpr_getOperatorName.ql
new file mode 100644
index 00000000000..0246ef2465c
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/PrefixExpr/PrefixExpr_getOperatorName.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from PrefixExpr x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getOperatorName()
diff --git a/rust/ql/test/extractor-tests/generated/PrefixExpr/gen_prefix_expr.rs b/rust/ql/test/extractor-tests/generated/PrefixExpr/gen_prefix_expr.rs
index b3101ca64b2..96dbb3148f6 100644
--- a/rust/ql/test/extractor-tests/generated/PrefixExpr/gen_prefix_expr.rs
+++ b/rust/ql/test/extractor-tests/generated/PrefixExpr/gen_prefix_expr.rs
@@ -2,7 +2,7 @@
 
 fn test_prefix_expr() -> () {
     // A unary operation expression. For example:
-    let x = -42
-    let y = !true
-    let z = *ptr
+    let x = -42;
+    let y = !true;
+    let z = *ptr;
 }
diff --git a/rust/ql/test/extractor-tests/generated/PtrType/PtrType.expected b/rust/ql/test/extractor-tests/generated/PtrType/PtrType.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/PtrType/PtrType.ql b/rust/ql/test/extractor-tests/generated/PtrType/PtrType.ql
new file mode 100644
index 00000000000..7dc004522c7
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/PtrType/PtrType.ql
@@ -0,0 +1,12 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from PtrType x, string isConst, string isMut, string hasTy
+where
+  toBeTested(x) and
+  not x.isUnknown() and
+  (if x.isConst() then isConst = "yes" else isConst = "no") and
+  (if x.isMut() then isMut = "yes" else isMut = "no") and
+  if x.hasTy() then hasTy = "yes" else hasTy = "no"
+select x, "isConst:", isConst, "isMut:", isMut, "hasTy:", hasTy
diff --git a/rust/ql/test/extractor-tests/generated/PtrType/PtrType_getTy.expected b/rust/ql/test/extractor-tests/generated/PtrType/PtrType_getTy.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/PtrType/PtrType_getTy.ql b/rust/ql/test/extractor-tests/generated/PtrType/PtrType_getTy.ql
new file mode 100644
index 00000000000..4b42d47161a
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/PtrType/PtrType_getTy.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from PtrType x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getTy()
diff --git a/rust/ql/test/extractor-tests/generated/PtrType/gen_ptr_type.rs b/rust/ql/test/extractor-tests/generated/PtrType/gen_ptr_type.rs
new file mode 100644
index 00000000000..1a7e8960f1d
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/PtrType/gen_ptr_type.rs
@@ -0,0 +1,6 @@
+// generated by codegen, do not edit
+
+fn test_ptr_type() -> () {
+    // A PtrType. For example:
+    todo!()
+}
diff --git a/rust/ql/test/extractor-tests/generated/RangeExpr/RangeExpr.expected b/rust/ql/test/extractor-tests/generated/RangeExpr/RangeExpr.expected
index 12e7e47c757..6f222c18f03 100644
--- a/rust/ql/test/extractor-tests/generated/RangeExpr/RangeExpr.expected
+++ b/rust/ql/test/extractor-tests/generated/RangeExpr/RangeExpr.expected
@@ -1,6 +1,6 @@
-| gen_range_expr.rs:5:13:5:18 | RangeExpr | hasLhs: | yes | hasRhs: | yes | isInclusive: | yes |
-| gen_range_expr.rs:6:13:6:17 | RangeExpr | hasLhs: | yes | hasRhs: | yes | isInclusive: | no |
-| gen_range_expr.rs:7:13:7:16 | RangeExpr | hasLhs: | yes | hasRhs: | no | isInclusive: | no |
-| gen_range_expr.rs:8:13:8:16 | RangeExpr | hasLhs: | no | hasRhs: | yes | isInclusive: | no |
-| gen_range_expr.rs:9:13:9:17 | RangeExpr | hasLhs: | no | hasRhs: | yes | isInclusive: | yes |
-| gen_range_expr.rs:10:13:10:14 | RangeExpr | hasLhs: | no | hasRhs: | no | isInclusive: | no |
+| gen_range_expr.rs:5:13:5:18 | RangeExpr | getNumberOfAttrs: | 0 | hasEnd: | yes | hasOperatorName: | yes | hasStart: | yes |
+| gen_range_expr.rs:6:13:6:17 | RangeExpr | getNumberOfAttrs: | 0 | hasEnd: | yes | hasOperatorName: | yes | hasStart: | yes |
+| gen_range_expr.rs:7:13:7:16 | RangeExpr | getNumberOfAttrs: | 0 | hasEnd: | no | hasOperatorName: | yes | hasStart: | yes |
+| gen_range_expr.rs:8:13:8:16 | RangeExpr | getNumberOfAttrs: | 0 | hasEnd: | yes | hasOperatorName: | yes | hasStart: | no |
+| gen_range_expr.rs:9:13:9:17 | RangeExpr | getNumberOfAttrs: | 0 | hasEnd: | yes | hasOperatorName: | yes | hasStart: | no |
+| gen_range_expr.rs:10:13:10:14 | RangeExpr | getNumberOfAttrs: | 0 | hasEnd: | no | hasOperatorName: | yes | hasStart: | no |
diff --git a/rust/ql/test/extractor-tests/generated/RangeExpr/RangeExpr.ql b/rust/ql/test/extractor-tests/generated/RangeExpr/RangeExpr.ql
index e48dbed5e86..c664f1d747e 100644
--- a/rust/ql/test/extractor-tests/generated/RangeExpr/RangeExpr.ql
+++ b/rust/ql/test/extractor-tests/generated/RangeExpr/RangeExpr.ql
@@ -2,11 +2,13 @@
 import codeql.rust.elements
 import TestUtils
 
-from RangeExpr x, string hasLhs, string hasRhs, string isInclusive
+from RangeExpr x, int getNumberOfAttrs, string hasEnd, string hasOperatorName, string hasStart
 where
   toBeTested(x) and
   not x.isUnknown() and
-  (if x.hasLhs() then hasLhs = "yes" else hasLhs = "no") and
-  (if x.hasRhs() then hasRhs = "yes" else hasRhs = "no") and
-  if x.isInclusive() then isInclusive = "yes" else isInclusive = "no"
-select x, "hasLhs:", hasLhs, "hasRhs:", hasRhs, "isInclusive:", isInclusive
+  getNumberOfAttrs = x.getNumberOfAttrs() and
+  (if x.hasEnd() then hasEnd = "yes" else hasEnd = "no") and
+  (if x.hasOperatorName() then hasOperatorName = "yes" else hasOperatorName = "no") and
+  if x.hasStart() then hasStart = "yes" else hasStart = "no"
+select x, "getNumberOfAttrs:", getNumberOfAttrs, "hasEnd:", hasEnd, "hasOperatorName:",
+  hasOperatorName, "hasStart:", hasStart
diff --git a/rust/ql/test/extractor-tests/generated/RangeExpr/RangeExpr_getAttr.expected b/rust/ql/test/extractor-tests/generated/RangeExpr/RangeExpr_getAttr.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/RangeExpr/RangeExpr_getAttr.ql b/rust/ql/test/extractor-tests/generated/RangeExpr/RangeExpr_getAttr.ql
new file mode 100644
index 00000000000..1c538e88c29
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/RangeExpr/RangeExpr_getAttr.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from RangeExpr x, int index
+where toBeTested(x) and not x.isUnknown()
+select x, index, x.getAttr(index)
diff --git a/rust/ql/test/extractor-tests/generated/RangeExpr/RangeExpr_getRhs.expected b/rust/ql/test/extractor-tests/generated/RangeExpr/RangeExpr_getEnd.expected
similarity index 72%
rename from rust/ql/test/extractor-tests/generated/RangeExpr/RangeExpr_getRhs.expected
rename to rust/ql/test/extractor-tests/generated/RangeExpr/RangeExpr_getEnd.expected
index f596145bfc9..101ae46138a 100644
--- a/rust/ql/test/extractor-tests/generated/RangeExpr/RangeExpr_getRhs.expected
+++ b/rust/ql/test/extractor-tests/generated/RangeExpr/RangeExpr_getEnd.expected
@@ -1,4 +1,4 @@
-| gen_range_expr.rs:5:13:5:18 | RangeExpr | gen_range_expr.rs:5:17:5:18 | LiteralExpr |
-| gen_range_expr.rs:6:13:6:17 | RangeExpr | gen_range_expr.rs:6:16:6:17 | LiteralExpr |
-| gen_range_expr.rs:8:13:8:16 | RangeExpr | gen_range_expr.rs:8:15:8:16 | LiteralExpr |
-| gen_range_expr.rs:9:13:9:17 | RangeExpr | gen_range_expr.rs:9:16:9:17 | LiteralExpr |
+| gen_range_expr.rs:5:13:5:18 | RangeExpr | gen_range_expr.rs:5:17:5:18 | 10 |
+| gen_range_expr.rs:6:13:6:17 | RangeExpr | gen_range_expr.rs:6:16:6:17 | 10 |
+| gen_range_expr.rs:8:13:8:16 | RangeExpr | gen_range_expr.rs:8:15:8:16 | 10 |
+| gen_range_expr.rs:9:13:9:17 | RangeExpr | gen_range_expr.rs:9:16:9:17 | 10 |
diff --git a/rust/ql/test/extractor-tests/generated/RangeExpr/RangeExpr_getEnd.ql b/rust/ql/test/extractor-tests/generated/RangeExpr/RangeExpr_getEnd.ql
new file mode 100644
index 00000000000..c39a039099d
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/RangeExpr/RangeExpr_getEnd.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from RangeExpr x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getEnd()
diff --git a/rust/ql/test/extractor-tests/generated/RangeExpr/RangeExpr_getOperatorName.expected b/rust/ql/test/extractor-tests/generated/RangeExpr/RangeExpr_getOperatorName.expected
new file mode 100644
index 00000000000..b0d778eb7bb
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/RangeExpr/RangeExpr_getOperatorName.expected
@@ -0,0 +1,6 @@
+| gen_range_expr.rs:5:13:5:18 | RangeExpr | ..= |
+| gen_range_expr.rs:6:13:6:17 | RangeExpr | .. |
+| gen_range_expr.rs:7:13:7:16 | RangeExpr | .. |
+| gen_range_expr.rs:8:13:8:16 | RangeExpr | .. |
+| gen_range_expr.rs:9:13:9:17 | RangeExpr | ..= |
+| gen_range_expr.rs:10:13:10:14 | RangeExpr | .. |
diff --git a/rust/ql/test/extractor-tests/generated/RangeExpr/RangeExpr_getOperatorName.ql b/rust/ql/test/extractor-tests/generated/RangeExpr/RangeExpr_getOperatorName.ql
new file mode 100644
index 00000000000..f554a9ecf74
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/RangeExpr/RangeExpr_getOperatorName.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from RangeExpr x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getOperatorName()
diff --git a/rust/ql/test/extractor-tests/generated/RangeExpr/RangeExpr_getLhs.expected b/rust/ql/test/extractor-tests/generated/RangeExpr/RangeExpr_getStart.expected
similarity index 72%
rename from rust/ql/test/extractor-tests/generated/RangeExpr/RangeExpr_getLhs.expected
rename to rust/ql/test/extractor-tests/generated/RangeExpr/RangeExpr_getStart.expected
index f88c18b39c2..79b34397efe 100644
--- a/rust/ql/test/extractor-tests/generated/RangeExpr/RangeExpr_getLhs.expected
+++ b/rust/ql/test/extractor-tests/generated/RangeExpr/RangeExpr_getStart.expected
@@ -1,3 +1,3 @@
-| gen_range_expr.rs:5:13:5:18 | RangeExpr | gen_range_expr.rs:5:13:5:13 | LiteralExpr |
-| gen_range_expr.rs:6:13:6:17 | RangeExpr | gen_range_expr.rs:6:13:6:13 | LiteralExpr |
-| gen_range_expr.rs:7:13:7:16 | RangeExpr | gen_range_expr.rs:7:13:7:14 | LiteralExpr |
+| gen_range_expr.rs:5:13:5:18 | RangeExpr | gen_range_expr.rs:5:13:5:13 | 1 |
+| gen_range_expr.rs:6:13:6:17 | RangeExpr | gen_range_expr.rs:6:13:6:13 | 1 |
+| gen_range_expr.rs:7:13:7:16 | RangeExpr | gen_range_expr.rs:7:13:7:14 | 10 |
diff --git a/rust/ql/test/extractor-tests/generated/RangeExpr/RangeExpr_getStart.ql b/rust/ql/test/extractor-tests/generated/RangeExpr/RangeExpr_getStart.ql
new file mode 100644
index 00000000000..d47b9e81b86
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/RangeExpr/RangeExpr_getStart.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from RangeExpr x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getStart()
diff --git a/rust/ql/test/extractor-tests/generated/RangePat/RangePat.expected b/rust/ql/test/extractor-tests/generated/RangePat/RangePat.expected
index 51b3ecd3d68..ec32f2a5a1c 100644
--- a/rust/ql/test/extractor-tests/generated/RangePat/RangePat.expected
+++ b/rust/ql/test/extractor-tests/generated/RangePat/RangePat.expected
@@ -1,3 +1,3 @@
-| gen_range_pat.rs:6:9:6:12 | RangePat | hasStart: | no | hasEnd: | yes |
-| gen_range_pat.rs:7:9:7:15 | RangePat | hasStart: | yes | hasEnd: | yes |
-| gen_range_pat.rs:8:9:8:12 | RangePat | hasStart: | yes | hasEnd: | no |
+| gen_range_pat.rs:6:9:6:12 | RangePat | hasEnd: | yes | hasOperatorName: | yes | hasStart: | no |
+| gen_range_pat.rs:7:9:7:15 | RangePat | hasEnd: | yes | hasOperatorName: | yes | hasStart: | yes |
+| gen_range_pat.rs:8:9:8:12 | RangePat | hasEnd: | no | hasOperatorName: | yes | hasStart: | yes |
diff --git a/rust/ql/test/extractor-tests/generated/RangePat/RangePat.ql b/rust/ql/test/extractor-tests/generated/RangePat/RangePat.ql
index 4e366ec7820..d9b4bb41348 100644
--- a/rust/ql/test/extractor-tests/generated/RangePat/RangePat.ql
+++ b/rust/ql/test/extractor-tests/generated/RangePat/RangePat.ql
@@ -2,10 +2,11 @@
 import codeql.rust.elements
 import TestUtils
 
-from RangePat x, string hasStart, string hasEnd
+from RangePat x, string hasEnd, string hasOperatorName, string hasStart
 where
   toBeTested(x) and
   not x.isUnknown() and
-  (if x.hasStart() then hasStart = "yes" else hasStart = "no") and
-  if x.hasEnd() then hasEnd = "yes" else hasEnd = "no"
-select x, "hasStart:", hasStart, "hasEnd:", hasEnd
+  (if x.hasEnd() then hasEnd = "yes" else hasEnd = "no") and
+  (if x.hasOperatorName() then hasOperatorName = "yes" else hasOperatorName = "no") and
+  if x.hasStart() then hasStart = "yes" else hasStart = "no"
+select x, "hasEnd:", hasEnd, "hasOperatorName:", hasOperatorName, "hasStart:", hasStart
diff --git a/rust/ql/test/extractor-tests/generated/RangePat/RangePat_getEnd.expected b/rust/ql/test/extractor-tests/generated/RangePat/RangePat_getEnd.expected
index bc0e1485b8c..591b8d9093e 100644
--- a/rust/ql/test/extractor-tests/generated/RangePat/RangePat_getEnd.expected
+++ b/rust/ql/test/extractor-tests/generated/RangePat/RangePat_getEnd.expected
@@ -1,2 +1,2 @@
-| gen_range_pat.rs:6:9:6:12 | RangePat | gen_range_pat.rs:6:9:6:12 | LiteralPat |
-| gen_range_pat.rs:7:9:7:15 | RangePat | gen_range_pat.rs:7:9:7:15 | LiteralPat |
+| gen_range_pat.rs:6:9:6:12 | RangePat | gen_range_pat.rs:6:11:6:12 | LiteralPat |
+| gen_range_pat.rs:7:9:7:15 | RangePat | gen_range_pat.rs:7:14:7:15 | LiteralPat |
diff --git a/rust/ql/test/extractor-tests/generated/RangePat/RangePat_getOperatorName.expected b/rust/ql/test/extractor-tests/generated/RangePat/RangePat_getOperatorName.expected
new file mode 100644
index 00000000000..537608104c7
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/RangePat/RangePat_getOperatorName.expected
@@ -0,0 +1,3 @@
+| gen_range_pat.rs:6:9:6:12 | RangePat | .. |
+| gen_range_pat.rs:7:9:7:15 | RangePat | ..= |
+| gen_range_pat.rs:8:9:8:12 | RangePat | .. |
diff --git a/rust/ql/test/extractor-tests/generated/RangePat/RangePat_getOperatorName.ql b/rust/ql/test/extractor-tests/generated/RangePat/RangePat_getOperatorName.ql
new file mode 100644
index 00000000000..f2f3052eae3
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/RangePat/RangePat_getOperatorName.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from RangePat x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getOperatorName()
diff --git a/rust/ql/test/extractor-tests/generated/RangePat/RangePat_getStart.expected b/rust/ql/test/extractor-tests/generated/RangePat/RangePat_getStart.expected
index fe4a876680a..ef6a8ea2121 100644
--- a/rust/ql/test/extractor-tests/generated/RangePat/RangePat_getStart.expected
+++ b/rust/ql/test/extractor-tests/generated/RangePat/RangePat_getStart.expected
@@ -1,2 +1,2 @@
-| gen_range_pat.rs:7:9:7:15 | RangePat | gen_range_pat.rs:7:9:7:15 | LiteralPat |
-| gen_range_pat.rs:8:9:8:12 | RangePat | gen_range_pat.rs:8:9:8:12 | LiteralPat |
+| gen_range_pat.rs:7:9:7:15 | RangePat | gen_range_pat.rs:7:9:7:10 | LiteralPat |
+| gen_range_pat.rs:8:9:8:12 | RangePat | gen_range_pat.rs:8:9:8:10 | LiteralPat |
diff --git a/rust/ql/test/extractor-tests/generated/RecordExpr/RecordExpr.expected b/rust/ql/test/extractor-tests/generated/RecordExpr/RecordExpr.expected
index e5759d93ad8..d30c4ef70e5 100644
--- a/rust/ql/test/extractor-tests/generated/RecordExpr/RecordExpr.expected
+++ b/rust/ql/test/extractor-tests/generated/RecordExpr/RecordExpr.expected
@@ -1,4 +1,4 @@
-| gen_record_expr.rs:5:17:5:34 | RecordExpr | hasPath: | yes | getNumberOfFlds: | 2 | hasSpread: | no | hasEllipsis: | no | isAssigneeExpr: | no |
-| gen_record_expr.rs:6:18:6:38 | RecordExpr | hasPath: | yes | getNumberOfFlds: | 1 | hasSpread: | yes | hasEllipsis: | yes | isAssigneeExpr: | no |
-| gen_record_expr.rs:7:5:7:22 | RecordExpr | hasPath: | yes | getNumberOfFlds: | 2 | hasSpread: | no | hasEllipsis: | no | isAssigneeExpr: | yes |
-| gen_record_expr.rs:8:5:8:14 | RecordExpr | hasPath: | yes | getNumberOfFlds: | 0 | hasSpread: | no | hasEllipsis: | yes | isAssigneeExpr: | yes |
+| gen_record_expr.rs:5:17:5:34 | RecordExpr | hasPath: | yes | hasRecordExprFieldList: | yes |
+| gen_record_expr.rs:6:18:6:38 | RecordExpr | hasPath: | yes | hasRecordExprFieldList: | yes |
+| gen_record_expr.rs:7:5:7:22 | RecordExpr | hasPath: | yes | hasRecordExprFieldList: | yes |
+| gen_record_expr.rs:8:5:8:14 | RecordExpr | hasPath: | yes | hasRecordExprFieldList: | yes |
diff --git a/rust/ql/test/extractor-tests/generated/RecordExpr/RecordExpr.ql b/rust/ql/test/extractor-tests/generated/RecordExpr/RecordExpr.ql
index bafc195a85c..41cd6a41c4b 100644
--- a/rust/ql/test/extractor-tests/generated/RecordExpr/RecordExpr.ql
+++ b/rust/ql/test/extractor-tests/generated/RecordExpr/RecordExpr.ql
@@ -2,16 +2,12 @@
 import codeql.rust.elements
 import TestUtils
 
-from
-  RecordExpr x, string hasPath, int getNumberOfFlds, string hasSpread, string hasEllipsis,
-  string isAssigneeExpr
+from RecordExpr x, string hasPath, string hasRecordExprFieldList
 where
   toBeTested(x) and
   not x.isUnknown() and
   (if x.hasPath() then hasPath = "yes" else hasPath = "no") and
-  getNumberOfFlds = x.getNumberOfFlds() and
-  (if x.hasSpread() then hasSpread = "yes" else hasSpread = "no") and
-  (if x.hasEllipsis() then hasEllipsis = "yes" else hasEllipsis = "no") and
-  if x.isAssigneeExpr() then isAssigneeExpr = "yes" else isAssigneeExpr = "no"
-select x, "hasPath:", hasPath, "getNumberOfFlds:", getNumberOfFlds, "hasSpread:", hasSpread,
-  "hasEllipsis:", hasEllipsis, "isAssigneeExpr:", isAssigneeExpr
+  if x.hasRecordExprFieldList()
+  then hasRecordExprFieldList = "yes"
+  else hasRecordExprFieldList = "no"
+select x, "hasPath:", hasPath, "hasRecordExprFieldList:", hasRecordExprFieldList
diff --git a/rust/ql/test/extractor-tests/generated/RecordExpr/RecordExpr_getFld.expected b/rust/ql/test/extractor-tests/generated/RecordExpr/RecordExpr_getFld.expected
deleted file mode 100644
index f020086a8f7..00000000000
--- a/rust/ql/test/extractor-tests/generated/RecordExpr/RecordExpr_getFld.expected
+++ /dev/null
@@ -1,5 +0,0 @@
-| gen_record_expr.rs:5:17:5:34 | RecordExpr | 0 | gen_record_expr.rs:5:26:5:26 | RecordExprField |
-| gen_record_expr.rs:5:17:5:34 | RecordExpr | 1 | gen_record_expr.rs:5:32:5:32 | RecordExprField |
-| gen_record_expr.rs:6:18:6:38 | RecordExpr | 0 | gen_record_expr.rs:6:27:6:27 | RecordExprField |
-| gen_record_expr.rs:7:5:7:22 | RecordExpr | 0 | gen_record_expr.rs:7:14:7:14 | RecordExprField |
-| gen_record_expr.rs:7:5:7:22 | RecordExpr | 1 | gen_record_expr.rs:7:20:7:20 | RecordExprField |
diff --git a/rust/ql/test/extractor-tests/generated/RecordExpr/RecordExpr_getFld.ql b/rust/ql/test/extractor-tests/generated/RecordExpr/RecordExpr_getFld.ql
deleted file mode 100644
index 74231c780e9..00000000000
--- a/rust/ql/test/extractor-tests/generated/RecordExpr/RecordExpr_getFld.ql
+++ /dev/null
@@ -1,7 +0,0 @@
-// generated by codegen, do not edit
-import codeql.rust.elements
-import TestUtils
-
-from RecordExpr x, int index
-where toBeTested(x) and not x.isUnknown()
-select x, index, x.getFld(index)
diff --git a/rust/ql/test/extractor-tests/generated/RecordExpr/RecordExpr_getPath.expected b/rust/ql/test/extractor-tests/generated/RecordExpr/RecordExpr_getPath.expected
index e49dd014e30..91d4f5cb0b5 100644
--- a/rust/ql/test/extractor-tests/generated/RecordExpr/RecordExpr_getPath.expected
+++ b/rust/ql/test/extractor-tests/generated/RecordExpr/RecordExpr_getPath.expected
@@ -1,4 +1,4 @@
-| gen_record_expr.rs:5:17:5:34 | RecordExpr | gen_record_expr.rs:5:17:5:34 | Path |
-| gen_record_expr.rs:6:18:6:38 | RecordExpr | gen_record_expr.rs:6:18:6:38 | Path |
-| gen_record_expr.rs:7:5:7:22 | RecordExpr | gen_record_expr.rs:7:5:7:22 | Path |
-| gen_record_expr.rs:8:5:8:14 | RecordExpr | gen_record_expr.rs:8:5:8:14 | Path |
+| gen_record_expr.rs:5:17:5:34 | RecordExpr | gen_record_expr.rs:5:17:5:19 | Foo |
+| gen_record_expr.rs:6:18:6:38 | RecordExpr | gen_record_expr.rs:6:18:6:20 | Foo |
+| gen_record_expr.rs:7:5:7:22 | RecordExpr | gen_record_expr.rs:7:5:7:7 | Foo |
+| gen_record_expr.rs:8:5:8:14 | RecordExpr | gen_record_expr.rs:8:5:8:7 | Foo |
diff --git a/rust/ql/test/extractor-tests/generated/RecordExpr/RecordExpr_getRecordExprFieldList.expected b/rust/ql/test/extractor-tests/generated/RecordExpr/RecordExpr_getRecordExprFieldList.expected
new file mode 100644
index 00000000000..d00bf3935d3
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/RecordExpr/RecordExpr_getRecordExprFieldList.expected
@@ -0,0 +1,4 @@
+| gen_record_expr.rs:5:17:5:34 | RecordExpr | gen_record_expr.rs:5:21:5:34 | RecordExprFieldList |
+| gen_record_expr.rs:6:18:6:38 | RecordExpr | gen_record_expr.rs:6:22:6:38 | RecordExprFieldList |
+| gen_record_expr.rs:7:5:7:22 | RecordExpr | gen_record_expr.rs:7:9:7:22 | RecordExprFieldList |
+| gen_record_expr.rs:8:5:8:14 | RecordExpr | gen_record_expr.rs:8:9:8:14 | RecordExprFieldList |
diff --git a/rust/ql/test/extractor-tests/generated/RecordExpr/RecordExpr_getRecordExprFieldList.ql b/rust/ql/test/extractor-tests/generated/RecordExpr/RecordExpr_getRecordExprFieldList.ql
new file mode 100644
index 00000000000..d524805d001
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/RecordExpr/RecordExpr_getRecordExprFieldList.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from RecordExpr x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getRecordExprFieldList()
diff --git a/rust/ql/test/extractor-tests/generated/RecordExpr/RecordExpr_getSpread.expected b/rust/ql/test/extractor-tests/generated/RecordExpr/RecordExpr_getSpread.expected
deleted file mode 100644
index ae380aa5d66..00000000000
--- a/rust/ql/test/extractor-tests/generated/RecordExpr/RecordExpr_getSpread.expected
+++ /dev/null
@@ -1 +0,0 @@
-| gen_record_expr.rs:6:18:6:38 | RecordExpr | gen_record_expr.rs:6:32:6:36 | PathExpr |
diff --git a/rust/ql/test/extractor-tests/generated/RecordExprField/RecordExprField.expected b/rust/ql/test/extractor-tests/generated/RecordExprField/RecordExprField.expected
index 10165f69cfd..79ed3875918 100644
--- a/rust/ql/test/extractor-tests/generated/RecordExprField/RecordExprField.expected
+++ b/rust/ql/test/extractor-tests/generated/RecordExprField/RecordExprField.expected
@@ -1,2 +1,2 @@
-| gen_record_expr_field.rs:5:14:5:14 | RecordExprField | getName: | a | getExpr: | gen_record_expr_field.rs:5:14:5:14 | LiteralExpr |
-| gen_record_expr_field.rs:5:20:5:20 | RecordExprField | getName: | b | getExpr: | gen_record_expr_field.rs:5:20:5:20 | LiteralExpr |
+| gen_record_expr_field.rs:5:11:5:14 | RecordExprField | getNumberOfAttrs: | 0 | hasExpr: | yes | hasNameRef: | yes |
+| gen_record_expr_field.rs:5:17:5:20 | RecordExprField | getNumberOfAttrs: | 0 | hasExpr: | yes | hasNameRef: | yes |
diff --git a/rust/ql/test/extractor-tests/generated/RecordExprField/RecordExprField.ql b/rust/ql/test/extractor-tests/generated/RecordExprField/RecordExprField.ql
index 87eaf9b6c0a..6a834cfd5ad 100644
--- a/rust/ql/test/extractor-tests/generated/RecordExprField/RecordExprField.ql
+++ b/rust/ql/test/extractor-tests/generated/RecordExprField/RecordExprField.ql
@@ -2,10 +2,11 @@
 import codeql.rust.elements
 import TestUtils
 
-from RecordExprField x, string getName, Expr getExpr
+from RecordExprField x, int getNumberOfAttrs, string hasExpr, string hasNameRef
 where
   toBeTested(x) and
   not x.isUnknown() and
-  getName = x.getName() and
-  getExpr = x.getExpr()
-select x, "getName:", getName, "getExpr:", getExpr
+  getNumberOfAttrs = x.getNumberOfAttrs() and
+  (if x.hasExpr() then hasExpr = "yes" else hasExpr = "no") and
+  if x.hasNameRef() then hasNameRef = "yes" else hasNameRef = "no"
+select x, "getNumberOfAttrs:", getNumberOfAttrs, "hasExpr:", hasExpr, "hasNameRef:", hasNameRef
diff --git a/rust/ql/test/extractor-tests/generated/RecordExprField/RecordExprField_getAttr.expected b/rust/ql/test/extractor-tests/generated/RecordExprField/RecordExprField_getAttr.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/RecordExprField/RecordExprField_getAttr.ql b/rust/ql/test/extractor-tests/generated/RecordExprField/RecordExprField_getAttr.ql
new file mode 100644
index 00000000000..f667ec4f479
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/RecordExprField/RecordExprField_getAttr.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from RecordExprField x, int index
+where toBeTested(x) and not x.isUnknown()
+select x, index, x.getAttr(index)
diff --git a/rust/ql/test/extractor-tests/generated/RecordExprField/RecordExprField_getExpr.expected b/rust/ql/test/extractor-tests/generated/RecordExprField/RecordExprField_getExpr.expected
new file mode 100644
index 00000000000..ec096d00a31
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/RecordExprField/RecordExprField_getExpr.expected
@@ -0,0 +1,2 @@
+| gen_record_expr_field.rs:5:11:5:14 | RecordExprField | gen_record_expr_field.rs:5:14:5:14 | 1 |
+| gen_record_expr_field.rs:5:17:5:20 | RecordExprField | gen_record_expr_field.rs:5:20:5:20 | 2 |
diff --git a/rust/ql/test/extractor-tests/generated/RecordExprField/RecordExprField_getExpr.ql b/rust/ql/test/extractor-tests/generated/RecordExprField/RecordExprField_getExpr.ql
new file mode 100644
index 00000000000..c0526394229
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/RecordExprField/RecordExprField_getExpr.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from RecordExprField x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getExpr()
diff --git a/rust/ql/test/extractor-tests/generated/RecordExprField/RecordExprField_getNameRef.expected b/rust/ql/test/extractor-tests/generated/RecordExprField/RecordExprField_getNameRef.expected
new file mode 100644
index 00000000000..081e3ccac56
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/RecordExprField/RecordExprField_getNameRef.expected
@@ -0,0 +1,2 @@
+| gen_record_expr_field.rs:5:11:5:14 | RecordExprField | gen_record_expr_field.rs:5:11:5:11 | a |
+| gen_record_expr_field.rs:5:17:5:20 | RecordExprField | gen_record_expr_field.rs:5:17:5:17 | b |
diff --git a/rust/ql/test/extractor-tests/generated/RecordExprField/RecordExprField_getNameRef.ql b/rust/ql/test/extractor-tests/generated/RecordExprField/RecordExprField_getNameRef.ql
new file mode 100644
index 00000000000..fd3e3c0da50
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/RecordExprField/RecordExprField_getNameRef.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from RecordExprField x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getNameRef()
diff --git a/rust/ql/test/extractor-tests/generated/RecordExprFieldList/RecordExprFieldList.expected b/rust/ql/test/extractor-tests/generated/RecordExprFieldList/RecordExprFieldList.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/RecordExprFieldList/RecordExprFieldList.ql b/rust/ql/test/extractor-tests/generated/RecordExprFieldList/RecordExprFieldList.ql
new file mode 100644
index 00000000000..a68e94bea3f
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/RecordExprFieldList/RecordExprFieldList.ql
@@ -0,0 +1,13 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from RecordExprFieldList x, int getNumberOfAttrs, int getNumberOfFields, string hasSpread
+where
+  toBeTested(x) and
+  not x.isUnknown() and
+  getNumberOfAttrs = x.getNumberOfAttrs() and
+  getNumberOfFields = x.getNumberOfFields() and
+  if x.hasSpread() then hasSpread = "yes" else hasSpread = "no"
+select x, "getNumberOfAttrs:", getNumberOfAttrs, "getNumberOfFields:", getNumberOfFields,
+  "hasSpread:", hasSpread
diff --git a/rust/ql/test/extractor-tests/generated/RecordExprFieldList/RecordExprFieldList_getAttr.expected b/rust/ql/test/extractor-tests/generated/RecordExprFieldList/RecordExprFieldList_getAttr.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/RecordExprFieldList/RecordExprFieldList_getAttr.ql b/rust/ql/test/extractor-tests/generated/RecordExprFieldList/RecordExprFieldList_getAttr.ql
new file mode 100644
index 00000000000..546c4cdda0a
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/RecordExprFieldList/RecordExprFieldList_getAttr.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from RecordExprFieldList x, int index
+where toBeTested(x) and not x.isUnknown()
+select x, index, x.getAttr(index)
diff --git a/rust/ql/test/extractor-tests/generated/RecordExprFieldList/RecordExprFieldList_getField.expected b/rust/ql/test/extractor-tests/generated/RecordExprFieldList/RecordExprFieldList_getField.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/RecordExprFieldList/RecordExprFieldList_getField.ql b/rust/ql/test/extractor-tests/generated/RecordExprFieldList/RecordExprFieldList_getField.ql
new file mode 100644
index 00000000000..47d0784b8a9
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/RecordExprFieldList/RecordExprFieldList_getField.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from RecordExprFieldList x, int index
+where toBeTested(x) and not x.isUnknown()
+select x, index, x.getField(index)
diff --git a/rust/ql/test/extractor-tests/generated/RecordExprFieldList/RecordExprFieldList_getSpread.expected b/rust/ql/test/extractor-tests/generated/RecordExprFieldList/RecordExprFieldList_getSpread.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/RecordExpr/RecordExpr_getSpread.ql b/rust/ql/test/extractor-tests/generated/RecordExprFieldList/RecordExprFieldList_getSpread.ql
similarity index 84%
rename from rust/ql/test/extractor-tests/generated/RecordExpr/RecordExpr_getSpread.ql
rename to rust/ql/test/extractor-tests/generated/RecordExprFieldList/RecordExprFieldList_getSpread.ql
index 71bef136e76..494e680c8cf 100644
--- a/rust/ql/test/extractor-tests/generated/RecordExpr/RecordExpr_getSpread.ql
+++ b/rust/ql/test/extractor-tests/generated/RecordExprFieldList/RecordExprFieldList_getSpread.ql
@@ -2,6 +2,6 @@
 import codeql.rust.elements
 import TestUtils
 
-from RecordExpr x
+from RecordExprFieldList x
 where toBeTested(x) and not x.isUnknown()
 select x, x.getSpread()
diff --git a/rust/ql/test/extractor-tests/generated/RecordExprFieldList/gen_record_expr_field_list.rs b/rust/ql/test/extractor-tests/generated/RecordExprFieldList/gen_record_expr_field_list.rs
new file mode 100644
index 00000000000..bb00282cad3
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/RecordExprFieldList/gen_record_expr_field_list.rs
@@ -0,0 +1,6 @@
+// generated by codegen, do not edit
+
+fn test_record_expr_field_list() -> () {
+    // A RecordExprFieldList. For example:
+    todo!()
+}
diff --git a/rust/ql/test/extractor-tests/generated/RecordField/RecordField.expected b/rust/ql/test/extractor-tests/generated/RecordField/RecordField.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/RecordField/RecordField.ql b/rust/ql/test/extractor-tests/generated/RecordField/RecordField.ql
new file mode 100644
index 00000000000..a54b29b8215
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/RecordField/RecordField.ql
@@ -0,0 +1,14 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from RecordField x, int getNumberOfAttrs, string hasName, string hasTy, string hasVisibility
+where
+  toBeTested(x) and
+  not x.isUnknown() and
+  getNumberOfAttrs = x.getNumberOfAttrs() and
+  (if x.hasName() then hasName = "yes" else hasName = "no") and
+  (if x.hasTy() then hasTy = "yes" else hasTy = "no") and
+  if x.hasVisibility() then hasVisibility = "yes" else hasVisibility = "no"
+select x, "getNumberOfAttrs:", getNumberOfAttrs, "hasName:", hasName, "hasTy:", hasTy,
+  "hasVisibility:", hasVisibility
diff --git a/rust/ql/test/extractor-tests/generated/RecordField/RecordField_getAttr.expected b/rust/ql/test/extractor-tests/generated/RecordField/RecordField_getAttr.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/RecordField/RecordField_getAttr.ql b/rust/ql/test/extractor-tests/generated/RecordField/RecordField_getAttr.ql
new file mode 100644
index 00000000000..ba85fae117f
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/RecordField/RecordField_getAttr.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from RecordField x, int index
+where toBeTested(x) and not x.isUnknown()
+select x, index, x.getAttr(index)
diff --git a/rust/ql/test/extractor-tests/generated/RecordField/RecordField_getName.expected b/rust/ql/test/extractor-tests/generated/RecordField/RecordField_getName.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/RecordField/RecordField_getName.ql b/rust/ql/test/extractor-tests/generated/RecordField/RecordField_getName.ql
new file mode 100644
index 00000000000..07c40f02c8b
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/RecordField/RecordField_getName.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from RecordField x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getName()
diff --git a/rust/ql/test/extractor-tests/generated/RecordField/RecordField_getTy.expected b/rust/ql/test/extractor-tests/generated/RecordField/RecordField_getTy.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/RecordField/RecordField_getTy.ql b/rust/ql/test/extractor-tests/generated/RecordField/RecordField_getTy.ql
new file mode 100644
index 00000000000..1abbb150b25
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/RecordField/RecordField_getTy.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from RecordField x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getTy()
diff --git a/rust/ql/test/extractor-tests/generated/RecordField/RecordField_getVisibility.expected b/rust/ql/test/extractor-tests/generated/RecordField/RecordField_getVisibility.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/RecordField/RecordField_getVisibility.ql b/rust/ql/test/extractor-tests/generated/RecordField/RecordField_getVisibility.ql
new file mode 100644
index 00000000000..b20e05587d9
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/RecordField/RecordField_getVisibility.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from RecordField x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getVisibility()
diff --git a/rust/ql/test/extractor-tests/generated/RecordField/gen_record_field.rs b/rust/ql/test/extractor-tests/generated/RecordField/gen_record_field.rs
new file mode 100644
index 00000000000..ece43571ef8
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/RecordField/gen_record_field.rs
@@ -0,0 +1,6 @@
+// generated by codegen, do not edit
+
+fn test_record_field() -> () {
+    // A RecordField. For example:
+    todo!()
+}
diff --git a/rust/ql/test/extractor-tests/generated/RecordFieldList/RecordFieldList.expected b/rust/ql/test/extractor-tests/generated/RecordFieldList/RecordFieldList.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/RecordFieldList/RecordFieldList.ql b/rust/ql/test/extractor-tests/generated/RecordFieldList/RecordFieldList.ql
new file mode 100644
index 00000000000..6fdb617e311
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/RecordFieldList/RecordFieldList.ql
@@ -0,0 +1,10 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from RecordFieldList x, int getNumberOfFields
+where
+  toBeTested(x) and
+  not x.isUnknown() and
+  getNumberOfFields = x.getNumberOfFields()
+select x, "getNumberOfFields:", getNumberOfFields
diff --git a/rust/ql/test/extractor-tests/generated/RecordFieldList/RecordFieldList_getField.expected b/rust/ql/test/extractor-tests/generated/RecordFieldList/RecordFieldList_getField.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/RecordFieldList/RecordFieldList_getField.ql b/rust/ql/test/extractor-tests/generated/RecordFieldList/RecordFieldList_getField.ql
new file mode 100644
index 00000000000..8a20f3de13f
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/RecordFieldList/RecordFieldList_getField.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from RecordFieldList x, int index
+where toBeTested(x) and not x.isUnknown()
+select x, index, x.getField(index)
diff --git a/rust/ql/test/extractor-tests/generated/RecordFieldList/gen_record_field_list.rs b/rust/ql/test/extractor-tests/generated/RecordFieldList/gen_record_field_list.rs
new file mode 100644
index 00000000000..34add5d3754
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/RecordFieldList/gen_record_field_list.rs
@@ -0,0 +1,6 @@
+// generated by codegen, do not edit
+
+fn test_record_field_list() -> () {
+    // A RecordFieldList. For example:
+    todo!()
+}
diff --git a/rust/ql/test/extractor-tests/generated/RecordPat/RecordPat.expected b/rust/ql/test/extractor-tests/generated/RecordPat/RecordPat.expected
index c6abe134f67..62cd3eb3c37 100644
--- a/rust/ql/test/extractor-tests/generated/RecordPat/RecordPat.expected
+++ b/rust/ql/test/extractor-tests/generated/RecordPat/RecordPat.expected
@@ -1,2 +1,2 @@
-| gen_record_pat.rs:6:9:6:26 | RecordPat | hasPath: | yes | getNumberOfFlds: | 2 | hasEllipsis: | no |
-| gen_record_pat.rs:7:9:7:18 | RecordPat | hasPath: | yes | getNumberOfFlds: | 0 | hasEllipsis: | yes |
+| gen_record_pat.rs:6:9:6:26 | RecordPat | hasPath: | yes | hasRecordPatFieldList: | yes |
+| gen_record_pat.rs:7:9:7:18 | RecordPat | hasPath: | yes | hasRecordPatFieldList: | yes |
diff --git a/rust/ql/test/extractor-tests/generated/RecordPat/RecordPat.ql b/rust/ql/test/extractor-tests/generated/RecordPat/RecordPat.ql
index 95372dd9634..19bc5ea6e3a 100644
--- a/rust/ql/test/extractor-tests/generated/RecordPat/RecordPat.ql
+++ b/rust/ql/test/extractor-tests/generated/RecordPat/RecordPat.ql
@@ -2,11 +2,10 @@
 import codeql.rust.elements
 import TestUtils
 
-from RecordPat x, string hasPath, int getNumberOfFlds, string hasEllipsis
+from RecordPat x, string hasPath, string hasRecordPatFieldList
 where
   toBeTested(x) and
   not x.isUnknown() and
   (if x.hasPath() then hasPath = "yes" else hasPath = "no") and
-  getNumberOfFlds = x.getNumberOfFlds() and
-  if x.hasEllipsis() then hasEllipsis = "yes" else hasEllipsis = "no"
-select x, "hasPath:", hasPath, "getNumberOfFlds:", getNumberOfFlds, "hasEllipsis:", hasEllipsis
+  if x.hasRecordPatFieldList() then hasRecordPatFieldList = "yes" else hasRecordPatFieldList = "no"
+select x, "hasPath:", hasPath, "hasRecordPatFieldList:", hasRecordPatFieldList
diff --git a/rust/ql/test/extractor-tests/generated/RecordPat/RecordPat_getFld.expected b/rust/ql/test/extractor-tests/generated/RecordPat/RecordPat_getFld.expected
deleted file mode 100644
index d99c027de91..00000000000
--- a/rust/ql/test/extractor-tests/generated/RecordPat/RecordPat_getFld.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-| gen_record_pat.rs:6:9:6:26 | RecordPat | 0 | gen_record_pat.rs:6:18:6:18 | RecordPatField |
-| gen_record_pat.rs:6:9:6:26 | RecordPat | 1 | gen_record_pat.rs:6:24:6:24 | RecordPatField |
diff --git a/rust/ql/test/extractor-tests/generated/RecordPat/RecordPat_getFld.ql b/rust/ql/test/extractor-tests/generated/RecordPat/RecordPat_getFld.ql
deleted file mode 100644
index c5b7e9ed439..00000000000
--- a/rust/ql/test/extractor-tests/generated/RecordPat/RecordPat_getFld.ql
+++ /dev/null
@@ -1,7 +0,0 @@
-// generated by codegen, do not edit
-import codeql.rust.elements
-import TestUtils
-
-from RecordPat x, int index
-where toBeTested(x) and not x.isUnknown()
-select x, index, x.getFld(index)
diff --git a/rust/ql/test/extractor-tests/generated/RecordPat/RecordPat_getPath.expected b/rust/ql/test/extractor-tests/generated/RecordPat/RecordPat_getPath.expected
index 0dfc1cf99cb..a9e0be01d5b 100644
--- a/rust/ql/test/extractor-tests/generated/RecordPat/RecordPat_getPath.expected
+++ b/rust/ql/test/extractor-tests/generated/RecordPat/RecordPat_getPath.expected
@@ -1,2 +1,2 @@
-| gen_record_pat.rs:6:9:6:26 | RecordPat | gen_record_pat.rs:6:9:6:26 | Path |
-| gen_record_pat.rs:7:9:7:18 | RecordPat | gen_record_pat.rs:7:9:7:18 | Path |
+| gen_record_pat.rs:6:9:6:26 | RecordPat | gen_record_pat.rs:6:9:6:11 | Foo |
+| gen_record_pat.rs:7:9:7:18 | RecordPat | gen_record_pat.rs:7:9:7:11 | Foo |
diff --git a/rust/ql/test/extractor-tests/generated/RecordPat/RecordPat_getRecordPatFieldList.expected b/rust/ql/test/extractor-tests/generated/RecordPat/RecordPat_getRecordPatFieldList.expected
new file mode 100644
index 00000000000..86ba10ed9a3
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/RecordPat/RecordPat_getRecordPatFieldList.expected
@@ -0,0 +1,2 @@
+| gen_record_pat.rs:6:9:6:26 | RecordPat | gen_record_pat.rs:6:13:6:26 | RecordPatFieldList |
+| gen_record_pat.rs:7:9:7:18 | RecordPat | gen_record_pat.rs:7:13:7:18 | RecordPatFieldList |
diff --git a/rust/ql/test/extractor-tests/generated/RecordPat/RecordPat_getRecordPatFieldList.ql b/rust/ql/test/extractor-tests/generated/RecordPat/RecordPat_getRecordPatFieldList.ql
new file mode 100644
index 00000000000..4f9cfdf1b5f
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/RecordPat/RecordPat_getRecordPatFieldList.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from RecordPat x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getRecordPatFieldList()
diff --git a/rust/ql/test/extractor-tests/generated/RecordPatField/RecordPatField.expected b/rust/ql/test/extractor-tests/generated/RecordPatField/RecordPatField.expected
index 8941bd466d3..431d7cb2855 100644
--- a/rust/ql/test/extractor-tests/generated/RecordPatField/RecordPatField.expected
+++ b/rust/ql/test/extractor-tests/generated/RecordPatField/RecordPatField.expected
@@ -1,2 +1,2 @@
-| gen_record_pat_field.rs:5:18:5:18 | RecordPatField | getName: | a | getPat: | gen_record_pat_field.rs:5:18:5:18 | LiteralPat |
-| gen_record_pat_field.rs:5:24:5:24 | RecordPatField | getName: | b | getPat: | gen_record_pat_field.rs:5:24:5:24 | LiteralPat |
+| gen_record_pat_field.rs:5:15:5:18 | RecordPatField | getNumberOfAttrs: | 0 | hasNameRef: | yes | hasPat: | yes |
+| gen_record_pat_field.rs:5:21:5:24 | RecordPatField | getNumberOfAttrs: | 0 | hasNameRef: | yes | hasPat: | yes |
diff --git a/rust/ql/test/extractor-tests/generated/RecordPatField/RecordPatField.ql b/rust/ql/test/extractor-tests/generated/RecordPatField/RecordPatField.ql
index 96d613dee76..dd6bedf98e0 100644
--- a/rust/ql/test/extractor-tests/generated/RecordPatField/RecordPatField.ql
+++ b/rust/ql/test/extractor-tests/generated/RecordPatField/RecordPatField.ql
@@ -2,10 +2,11 @@
 import codeql.rust.elements
 import TestUtils
 
-from RecordPatField x, string getName, Pat getPat
+from RecordPatField x, int getNumberOfAttrs, string hasNameRef, string hasPat
 where
   toBeTested(x) and
   not x.isUnknown() and
-  getName = x.getName() and
-  getPat = x.getPat()
-select x, "getName:", getName, "getPat:", getPat
+  getNumberOfAttrs = x.getNumberOfAttrs() and
+  (if x.hasNameRef() then hasNameRef = "yes" else hasNameRef = "no") and
+  if x.hasPat() then hasPat = "yes" else hasPat = "no"
+select x, "getNumberOfAttrs:", getNumberOfAttrs, "hasNameRef:", hasNameRef, "hasPat:", hasPat
diff --git a/rust/ql/test/extractor-tests/generated/RecordPatField/RecordPatField_getAttr.expected b/rust/ql/test/extractor-tests/generated/RecordPatField/RecordPatField_getAttr.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/RecordPatField/RecordPatField_getAttr.ql b/rust/ql/test/extractor-tests/generated/RecordPatField/RecordPatField_getAttr.ql
new file mode 100644
index 00000000000..f079ebc0484
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/RecordPatField/RecordPatField_getAttr.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from RecordPatField x, int index
+where toBeTested(x) and not x.isUnknown()
+select x, index, x.getAttr(index)
diff --git a/rust/ql/test/extractor-tests/generated/RecordPatField/RecordPatField_getNameRef.expected b/rust/ql/test/extractor-tests/generated/RecordPatField/RecordPatField_getNameRef.expected
new file mode 100644
index 00000000000..abbb171ae68
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/RecordPatField/RecordPatField_getNameRef.expected
@@ -0,0 +1,2 @@
+| gen_record_pat_field.rs:5:15:5:18 | RecordPatField | gen_record_pat_field.rs:5:15:5:15 | a |
+| gen_record_pat_field.rs:5:21:5:24 | RecordPatField | gen_record_pat_field.rs:5:21:5:21 | b |
diff --git a/rust/ql/test/extractor-tests/generated/RecordPatField/RecordPatField_getNameRef.ql b/rust/ql/test/extractor-tests/generated/RecordPatField/RecordPatField_getNameRef.ql
new file mode 100644
index 00000000000..acc577910e5
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/RecordPatField/RecordPatField_getNameRef.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from RecordPatField x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getNameRef()
diff --git a/rust/ql/test/extractor-tests/generated/RecordPatField/RecordPatField_getPat.expected b/rust/ql/test/extractor-tests/generated/RecordPatField/RecordPatField_getPat.expected
new file mode 100644
index 00000000000..a3ac24ec52b
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/RecordPatField/RecordPatField_getPat.expected
@@ -0,0 +1,2 @@
+| gen_record_pat_field.rs:5:15:5:18 | RecordPatField | gen_record_pat_field.rs:5:18:5:18 | LiteralPat |
+| gen_record_pat_field.rs:5:21:5:24 | RecordPatField | gen_record_pat_field.rs:5:24:5:24 | LiteralPat |
diff --git a/rust/ql/test/extractor-tests/generated/RecordPatField/RecordPatField_getPat.ql b/rust/ql/test/extractor-tests/generated/RecordPatField/RecordPatField_getPat.ql
new file mode 100644
index 00000000000..ad0e6e06cf0
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/RecordPatField/RecordPatField_getPat.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from RecordPatField x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getPat()
diff --git a/rust/ql/test/extractor-tests/generated/RecordPatFieldList/RecordPatFieldList.expected b/rust/ql/test/extractor-tests/generated/RecordPatFieldList/RecordPatFieldList.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/RecordPatFieldList/RecordPatFieldList.ql b/rust/ql/test/extractor-tests/generated/RecordPatFieldList/RecordPatFieldList.ql
new file mode 100644
index 00000000000..527f6722cd2
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/RecordPatFieldList/RecordPatFieldList.ql
@@ -0,0 +1,11 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from RecordPatFieldList x, int getNumberOfFields, string hasRestPat
+where
+  toBeTested(x) and
+  not x.isUnknown() and
+  getNumberOfFields = x.getNumberOfFields() and
+  if x.hasRestPat() then hasRestPat = "yes" else hasRestPat = "no"
+select x, "getNumberOfFields:", getNumberOfFields, "hasRestPat:", hasRestPat
diff --git a/rust/ql/test/extractor-tests/generated/RecordPatFieldList/RecordPatFieldList_getField.expected b/rust/ql/test/extractor-tests/generated/RecordPatFieldList/RecordPatFieldList_getField.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/RecordPatFieldList/RecordPatFieldList_getField.ql b/rust/ql/test/extractor-tests/generated/RecordPatFieldList/RecordPatFieldList_getField.ql
new file mode 100644
index 00000000000..21a45ead535
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/RecordPatFieldList/RecordPatFieldList_getField.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from RecordPatFieldList x, int index
+where toBeTested(x) and not x.isUnknown()
+select x, index, x.getField(index)
diff --git a/rust/ql/test/extractor-tests/generated/RecordPatFieldList/RecordPatFieldList_getRestPat.expected b/rust/ql/test/extractor-tests/generated/RecordPatFieldList/RecordPatFieldList_getRestPat.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/RecordPatFieldList/RecordPatFieldList_getRestPat.ql b/rust/ql/test/extractor-tests/generated/RecordPatFieldList/RecordPatFieldList_getRestPat.ql
new file mode 100644
index 00000000000..82877cbe6ba
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/RecordPatFieldList/RecordPatFieldList_getRestPat.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from RecordPatFieldList x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getRestPat()
diff --git a/rust/ql/test/extractor-tests/generated/RecordPatFieldList/gen_record_pat_field_list.rs b/rust/ql/test/extractor-tests/generated/RecordPatFieldList/gen_record_pat_field_list.rs
new file mode 100644
index 00000000000..b2f5d70cd57
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/RecordPatFieldList/gen_record_pat_field_list.rs
@@ -0,0 +1,6 @@
+// generated by codegen, do not edit
+
+fn test_record_pat_field_list() -> () {
+    // A RecordPatFieldList. For example:
+    todo!()
+}
diff --git a/rust/ql/test/extractor-tests/generated/RefExpr/RefExpr.expected b/rust/ql/test/extractor-tests/generated/RefExpr/RefExpr.expected
index b2b75ae61e1..d4c75d9a79a 100644
--- a/rust/ql/test/extractor-tests/generated/RefExpr/RefExpr.expected
+++ b/rust/ql/test/extractor-tests/generated/RefExpr/RefExpr.expected
@@ -1,4 +1,4 @@
-| gen_ref_expr.rs:5:25:5:28 | RefExpr | getExpr: | gen_ref_expr.rs:5:26:5:28 | PathExpr | isRaw: | no | isMut: | no |
-| gen_ref_expr.rs:6:23:6:30 | RefExpr | getExpr: | gen_ref_expr.rs:6:28:6:30 | PathExpr | isRaw: | no | isMut: | yes |
-| gen_ref_expr.rs:7:35:7:48 | RefExpr | getExpr: | gen_ref_expr.rs:7:46:7:48 | PathExpr | isRaw: | yes | isMut: | no |
-| gen_ref_expr.rs:8:33:8:44 | RefExpr | getExpr: | gen_ref_expr.rs:8:42:8:44 | PathExpr | isRaw: | yes | isMut: | yes |
+| gen_ref_expr.rs:5:25:5:28 | RefExpr | getNumberOfAttrs: | 0 | hasExpr: | yes | isConst: | no | isMut: | no | isRaw: | no |
+| gen_ref_expr.rs:6:23:6:30 | RefExpr | getNumberOfAttrs: | 0 | hasExpr: | yes | isConst: | no | isMut: | yes | isRaw: | no |
+| gen_ref_expr.rs:7:35:7:48 | RefExpr | getNumberOfAttrs: | 0 | hasExpr: | yes | isConst: | yes | isMut: | no | isRaw: | yes |
+| gen_ref_expr.rs:8:33:8:44 | RefExpr | getNumberOfAttrs: | 0 | hasExpr: | yes | isConst: | no | isMut: | yes | isRaw: | yes |
diff --git a/rust/ql/test/extractor-tests/generated/RefExpr/RefExpr.ql b/rust/ql/test/extractor-tests/generated/RefExpr/RefExpr.ql
index 447235d74a7..a2567b81ed7 100644
--- a/rust/ql/test/extractor-tests/generated/RefExpr/RefExpr.ql
+++ b/rust/ql/test/extractor-tests/generated/RefExpr/RefExpr.ql
@@ -2,11 +2,14 @@
 import codeql.rust.elements
 import TestUtils
 
-from RefExpr x, Expr getExpr, string isRaw, string isMut
+from RefExpr x, int getNumberOfAttrs, string hasExpr, string isConst, string isMut, string isRaw
 where
   toBeTested(x) and
   not x.isUnknown() and
-  getExpr = x.getExpr() and
-  (if x.isRaw() then isRaw = "yes" else isRaw = "no") and
-  if x.isMut() then isMut = "yes" else isMut = "no"
-select x, "getExpr:", getExpr, "isRaw:", isRaw, "isMut:", isMut
+  getNumberOfAttrs = x.getNumberOfAttrs() and
+  (if x.hasExpr() then hasExpr = "yes" else hasExpr = "no") and
+  (if x.isConst() then isConst = "yes" else isConst = "no") and
+  (if x.isMut() then isMut = "yes" else isMut = "no") and
+  if x.isRaw() then isRaw = "yes" else isRaw = "no"
+select x, "getNumberOfAttrs:", getNumberOfAttrs, "hasExpr:", hasExpr, "isConst:", isConst, "isMut:",
+  isMut, "isRaw:", isRaw
diff --git a/rust/ql/test/extractor-tests/generated/RefExpr/RefExpr_getAttr.expected b/rust/ql/test/extractor-tests/generated/RefExpr/RefExpr_getAttr.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/RefExpr/RefExpr_getAttr.ql b/rust/ql/test/extractor-tests/generated/RefExpr/RefExpr_getAttr.ql
new file mode 100644
index 00000000000..7ef6d44228e
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/RefExpr/RefExpr_getAttr.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from RefExpr x, int index
+where toBeTested(x) and not x.isUnknown()
+select x, index, x.getAttr(index)
diff --git a/rust/ql/test/extractor-tests/generated/RefExpr/RefExpr_getExpr.expected b/rust/ql/test/extractor-tests/generated/RefExpr/RefExpr_getExpr.expected
new file mode 100644
index 00000000000..571986ecf10
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/RefExpr/RefExpr_getExpr.expected
@@ -0,0 +1,4 @@
+| gen_ref_expr.rs:5:25:5:28 | RefExpr | gen_ref_expr.rs:5:26:5:28 | foo |
+| gen_ref_expr.rs:6:23:6:30 | RefExpr | gen_ref_expr.rs:6:28:6:30 | foo |
+| gen_ref_expr.rs:7:35:7:48 | RefExpr | gen_ref_expr.rs:7:46:7:48 | foo |
+| gen_ref_expr.rs:8:33:8:44 | RefExpr | gen_ref_expr.rs:8:42:8:44 | foo |
diff --git a/rust/ql/test/extractor-tests/generated/RefExpr/RefExpr_getExpr.ql b/rust/ql/test/extractor-tests/generated/RefExpr/RefExpr_getExpr.ql
new file mode 100644
index 00000000000..b1404db9783
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/RefExpr/RefExpr_getExpr.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from RefExpr x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getExpr()
diff --git a/rust/ql/test/extractor-tests/generated/RefPat/RefPat.expected b/rust/ql/test/extractor-tests/generated/RefPat/RefPat.expected
index 095e9af1d6f..c2fc3416297 100644
--- a/rust/ql/test/extractor-tests/generated/RefPat/RefPat.expected
+++ b/rust/ql/test/extractor-tests/generated/RefPat/RefPat.expected
@@ -1,2 +1,2 @@
-| gen_ref_pat.rs:6:9:6:28 | RefPat | getPat: | gen_ref_pat.rs:6:14:6:28 | TupleStructPat | isMut: | yes |
-| gen_ref_pat.rs:7:9:7:21 | RefPat | getPat: | gen_ref_pat.rs:7:10:7:21 | PathPat | isMut: | no |
+| gen_ref_pat.rs:6:9:6:28 | RefPat | isMut: | yes | hasPat: | yes |
+| gen_ref_pat.rs:7:9:7:21 | RefPat | isMut: | no | hasPat: | yes |
diff --git a/rust/ql/test/extractor-tests/generated/RefPat/RefPat.ql b/rust/ql/test/extractor-tests/generated/RefPat/RefPat.ql
index 51707e7df3a..4ae72433dad 100644
--- a/rust/ql/test/extractor-tests/generated/RefPat/RefPat.ql
+++ b/rust/ql/test/extractor-tests/generated/RefPat/RefPat.ql
@@ -2,10 +2,10 @@
 import codeql.rust.elements
 import TestUtils
 
-from RefPat x, Pat getPat, string isMut
+from RefPat x, string isMut, string hasPat
 where
   toBeTested(x) and
   not x.isUnknown() and
-  getPat = x.getPat() and
-  if x.isMut() then isMut = "yes" else isMut = "no"
-select x, "getPat:", getPat, "isMut:", isMut
+  (if x.isMut() then isMut = "yes" else isMut = "no") and
+  if x.hasPat() then hasPat = "yes" else hasPat = "no"
+select x, "isMut:", isMut, "hasPat:", hasPat
diff --git a/rust/ql/test/extractor-tests/generated/RefPat/RefPat_getPat.expected b/rust/ql/test/extractor-tests/generated/RefPat/RefPat_getPat.expected
new file mode 100644
index 00000000000..891c3c8216e
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/RefPat/RefPat_getPat.expected
@@ -0,0 +1,2 @@
+| gen_ref_pat.rs:6:9:6:28 | RefPat | gen_ref_pat.rs:6:14:6:28 | TupleStructPat |
+| gen_ref_pat.rs:7:9:7:21 | RefPat | gen_ref_pat.rs:7:10:7:21 | PathPat |
diff --git a/rust/ql/test/extractor-tests/generated/RefPat/RefPat_getPat.ql b/rust/ql/test/extractor-tests/generated/RefPat/RefPat_getPat.ql
new file mode 100644
index 00000000000..758e4e7895e
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/RefPat/RefPat_getPat.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from RefPat x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getPat()
diff --git a/rust/ql/test/extractor-tests/generated/RefType/RefType.expected b/rust/ql/test/extractor-tests/generated/RefType/RefType.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/RefType/RefType.ql b/rust/ql/test/extractor-tests/generated/RefType/RefType.ql
new file mode 100644
index 00000000000..1a0df7a0b98
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/RefType/RefType.ql
@@ -0,0 +1,12 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from RefType x, string isMut, string hasLifetime, string hasTy
+where
+  toBeTested(x) and
+  not x.isUnknown() and
+  (if x.isMut() then isMut = "yes" else isMut = "no") and
+  (if x.hasLifetime() then hasLifetime = "yes" else hasLifetime = "no") and
+  if x.hasTy() then hasTy = "yes" else hasTy = "no"
+select x, "isMut:", isMut, "hasLifetime:", hasLifetime, "hasTy:", hasTy
diff --git a/rust/ql/test/extractor-tests/generated/RefType/RefType_getLifetime.expected b/rust/ql/test/extractor-tests/generated/RefType/RefType_getLifetime.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/RefType/RefType_getLifetime.ql b/rust/ql/test/extractor-tests/generated/RefType/RefType_getLifetime.ql
new file mode 100644
index 00000000000..897c4ef519d
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/RefType/RefType_getLifetime.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from RefType x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getLifetime()
diff --git a/rust/ql/test/extractor-tests/generated/RefType/RefType_getTy.expected b/rust/ql/test/extractor-tests/generated/RefType/RefType_getTy.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/RefType/RefType_getTy.ql b/rust/ql/test/extractor-tests/generated/RefType/RefType_getTy.ql
new file mode 100644
index 00000000000..43df7ca037c
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/RefType/RefType_getTy.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from RefType x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getTy()
diff --git a/rust/ql/test/extractor-tests/generated/RefType/gen_ref_type.rs b/rust/ql/test/extractor-tests/generated/RefType/gen_ref_type.rs
new file mode 100644
index 00000000000..dacb6fc482d
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/RefType/gen_ref_type.rs
@@ -0,0 +1,6 @@
+// generated by codegen, do not edit
+
+fn test_ref_type() -> () {
+    // A RefType. For example:
+    todo!()
+}
diff --git a/rust/ql/test/extractor-tests/generated/Rename/Rename.expected b/rust/ql/test/extractor-tests/generated/Rename/Rename.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/Rename/Rename.ql b/rust/ql/test/extractor-tests/generated/Rename/Rename.ql
new file mode 100644
index 00000000000..91e748797f2
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/Rename/Rename.ql
@@ -0,0 +1,10 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from Rename x, string hasName
+where
+  toBeTested(x) and
+  not x.isUnknown() and
+  if x.hasName() then hasName = "yes" else hasName = "no"
+select x, "hasName:", hasName
diff --git a/rust/ql/test/extractor-tests/generated/Rename/Rename_getName.expected b/rust/ql/test/extractor-tests/generated/Rename/Rename_getName.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/Rename/Rename_getName.ql b/rust/ql/test/extractor-tests/generated/Rename/Rename_getName.ql
new file mode 100644
index 00000000000..59df9dcf5ca
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/Rename/Rename_getName.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from Rename x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getName()
diff --git a/rust/ql/test/extractor-tests/generated/Rename/gen_rename.rs b/rust/ql/test/extractor-tests/generated/Rename/gen_rename.rs
new file mode 100644
index 00000000000..8d8ca68ce35
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/Rename/gen_rename.rs
@@ -0,0 +1,6 @@
+// generated by codegen, do not edit
+
+fn test_rename() -> () {
+    // A Rename. For example:
+    todo!()
+}
diff --git a/rust/ql/test/extractor-tests/generated/RepeatExpr/RepeatExpr.expected b/rust/ql/test/extractor-tests/generated/RepeatExpr/RepeatExpr.expected
deleted file mode 100644
index 370729af71d..00000000000
--- a/rust/ql/test/extractor-tests/generated/RepeatExpr/RepeatExpr.expected
+++ /dev/null
@@ -1 +0,0 @@
-| gen_repeat_expr.rs:5:5:5:11 | RepeatExpr | getInitializer: | gen_repeat_expr.rs:5:6:5:6 | LiteralExpr | getRepeat: | gen_repeat_expr.rs:5:9:5:10 | LiteralExpr |
diff --git a/rust/ql/test/extractor-tests/generated/RepeatExpr/RepeatExpr.ql b/rust/ql/test/extractor-tests/generated/RepeatExpr/RepeatExpr.ql
deleted file mode 100644
index 2b6ec3ca337..00000000000
--- a/rust/ql/test/extractor-tests/generated/RepeatExpr/RepeatExpr.ql
+++ /dev/null
@@ -1,11 +0,0 @@
-// generated by codegen, do not edit
-import codeql.rust.elements
-import TestUtils
-
-from RepeatExpr x, Expr getInitializer, Expr getRepeat
-where
-  toBeTested(x) and
-  not x.isUnknown() and
-  getInitializer = x.getInitializer() and
-  getRepeat = x.getRepeat()
-select x, "getInitializer:", getInitializer, "getRepeat:", getRepeat
diff --git a/rust/ql/test/extractor-tests/generated/RepeatExpr/gen_repeat_expr.rs b/rust/ql/test/extractor-tests/generated/RepeatExpr/gen_repeat_expr.rs
deleted file mode 100644
index 7eac4d424b1..00000000000
--- a/rust/ql/test/extractor-tests/generated/RepeatExpr/gen_repeat_expr.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-// generated by codegen, do not edit
-
-fn test_repeat_expr() -> () {
-    // A repeat expression. For example:
-    [1; 10];
-}
diff --git a/rust/ql/test/extractor-tests/generated/RestPat/RestPat.expected b/rust/ql/test/extractor-tests/generated/RestPat/RestPat.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/RestPat/RestPat.ql b/rust/ql/test/extractor-tests/generated/RestPat/RestPat.ql
new file mode 100644
index 00000000000..c3cb2a24f83
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/RestPat/RestPat.ql
@@ -0,0 +1,10 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from RestPat x, int getNumberOfAttrs
+where
+  toBeTested(x) and
+  not x.isUnknown() and
+  getNumberOfAttrs = x.getNumberOfAttrs()
+select x, "getNumberOfAttrs:", getNumberOfAttrs
diff --git a/rust/ql/test/extractor-tests/generated/RestPat/RestPat_getAttr.expected b/rust/ql/test/extractor-tests/generated/RestPat/RestPat_getAttr.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/RestPat/RestPat_getAttr.ql b/rust/ql/test/extractor-tests/generated/RestPat/RestPat_getAttr.ql
new file mode 100644
index 00000000000..e85a7975b6b
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/RestPat/RestPat_getAttr.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from RestPat x, int index
+where toBeTested(x) and not x.isUnknown()
+select x, index, x.getAttr(index)
diff --git a/rust/ql/test/extractor-tests/generated/RestPat/gen_rest_pat.rs b/rust/ql/test/extractor-tests/generated/RestPat/gen_rest_pat.rs
new file mode 100644
index 00000000000..0f7b95b93f2
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/RestPat/gen_rest_pat.rs
@@ -0,0 +1,6 @@
+// generated by codegen, do not edit
+
+fn test_rest_pat() -> () {
+    // A RestPat. For example:
+    todo!()
+}
diff --git a/rust/ql/test/extractor-tests/generated/RetType/RetType.expected b/rust/ql/test/extractor-tests/generated/RetType/RetType.expected
new file mode 100644
index 00000000000..726fcffd1d6
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/RetType/RetType.expected
@@ -0,0 +1 @@
+| gen_ret_type.rs:3:20:3:24 | RetType | hasTy: | yes |
diff --git a/rust/ql/test/extractor-tests/generated/BoxExpr/BoxExpr.ql b/rust/ql/test/extractor-tests/generated/RetType/RetType.ql
similarity index 55%
rename from rust/ql/test/extractor-tests/generated/BoxExpr/BoxExpr.ql
rename to rust/ql/test/extractor-tests/generated/RetType/RetType.ql
index 5ca82028931..c2fd2818d85 100644
--- a/rust/ql/test/extractor-tests/generated/BoxExpr/BoxExpr.ql
+++ b/rust/ql/test/extractor-tests/generated/RetType/RetType.ql
@@ -2,9 +2,9 @@
 import codeql.rust.elements
 import TestUtils
 
-from BoxExpr x, Expr getExpr
+from RetType x, string hasTy
 where
   toBeTested(x) and
   not x.isUnknown() and
-  getExpr = x.getExpr()
-select x, "getExpr:", getExpr
+  if x.hasTy() then hasTy = "yes" else hasTy = "no"
+select x, "hasTy:", hasTy
diff --git a/rust/ql/test/extractor-tests/generated/RetType/RetType_getTy.expected b/rust/ql/test/extractor-tests/generated/RetType/RetType_getTy.expected
new file mode 100644
index 00000000000..e8e62fa58ec
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/RetType/RetType_getTy.expected
@@ -0,0 +1 @@
+| gen_ret_type.rs:3:20:3:24 | RetType | gen_ret_type.rs:3:23:3:24 | TupleType |
diff --git a/rust/ql/test/extractor-tests/generated/RetType/RetType_getTy.ql b/rust/ql/test/extractor-tests/generated/RetType/RetType_getTy.ql
new file mode 100644
index 00000000000..5163cb62b2f
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/RetType/RetType_getTy.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from RetType x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getTy()
diff --git a/rust/ql/test/extractor-tests/generated/RetType/gen_ret_type.rs b/rust/ql/test/extractor-tests/generated/RetType/gen_ret_type.rs
new file mode 100644
index 00000000000..146766cefe3
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/RetType/gen_ret_type.rs
@@ -0,0 +1,6 @@
+// generated by codegen, do not edit
+
+fn test_ret_type() -> () {
+    // A RetType. For example:
+    todo!()
+}
diff --git a/rust/ql/test/extractor-tests/generated/ReturnExpr/ReturnExpr.expected b/rust/ql/test/extractor-tests/generated/ReturnExpr/ReturnExpr.expected
index d715c0cb664..dbf54e0f49b 100644
--- a/rust/ql/test/extractor-tests/generated/ReturnExpr/ReturnExpr.expected
+++ b/rust/ql/test/extractor-tests/generated/ReturnExpr/ReturnExpr.expected
@@ -1,2 +1,2 @@
-| gen_return_expr.rs:5:5:5:13 | ReturnExpr | hasExpr: | yes |
-| gen_return_expr.rs:8:5:8:10 | ReturnExpr | hasExpr: | no |
+| gen_return_expr.rs:5:5:5:13 | ReturnExpr | getNumberOfAttrs: | 0 | hasExpr: | yes |
+| gen_return_expr.rs:8:5:8:10 | ReturnExpr | getNumberOfAttrs: | 0 | hasExpr: | no |
diff --git a/rust/ql/test/extractor-tests/generated/ReturnExpr/ReturnExpr.ql b/rust/ql/test/extractor-tests/generated/ReturnExpr/ReturnExpr.ql
index c648bb6a16d..aa8c4d886a7 100644
--- a/rust/ql/test/extractor-tests/generated/ReturnExpr/ReturnExpr.ql
+++ b/rust/ql/test/extractor-tests/generated/ReturnExpr/ReturnExpr.ql
@@ -2,9 +2,10 @@
 import codeql.rust.elements
 import TestUtils
 
-from ReturnExpr x, string hasExpr
+from ReturnExpr x, int getNumberOfAttrs, string hasExpr
 where
   toBeTested(x) and
   not x.isUnknown() and
+  getNumberOfAttrs = x.getNumberOfAttrs() and
   if x.hasExpr() then hasExpr = "yes" else hasExpr = "no"
-select x, "hasExpr:", hasExpr
+select x, "getNumberOfAttrs:", getNumberOfAttrs, "hasExpr:", hasExpr
diff --git a/rust/ql/test/extractor-tests/generated/ReturnExpr/ReturnExpr_getAttr.expected b/rust/ql/test/extractor-tests/generated/ReturnExpr/ReturnExpr_getAttr.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/ReturnExpr/ReturnExpr_getAttr.ql b/rust/ql/test/extractor-tests/generated/ReturnExpr/ReturnExpr_getAttr.ql
new file mode 100644
index 00000000000..23366928f39
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/ReturnExpr/ReturnExpr_getAttr.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from ReturnExpr x, int index
+where toBeTested(x) and not x.isUnknown()
+select x, index, x.getAttr(index)
diff --git a/rust/ql/test/extractor-tests/generated/ReturnExpr/ReturnExpr_getExpr.expected b/rust/ql/test/extractor-tests/generated/ReturnExpr/ReturnExpr_getExpr.expected
index 4247069ccc2..2e1a4a8f8ce 100644
--- a/rust/ql/test/extractor-tests/generated/ReturnExpr/ReturnExpr_getExpr.expected
+++ b/rust/ql/test/extractor-tests/generated/ReturnExpr/ReturnExpr_getExpr.expected
@@ -1 +1 @@
-| gen_return_expr.rs:5:5:5:13 | ReturnExpr | gen_return_expr.rs:5:12:5:13 | LiteralExpr |
+| gen_return_expr.rs:5:5:5:13 | ReturnExpr | gen_return_expr.rs:5:12:5:13 | 42 |
diff --git a/rust/ql/test/extractor-tests/generated/ReturnTypeSyntax/ReturnTypeSyntax.expected b/rust/ql/test/extractor-tests/generated/ReturnTypeSyntax/ReturnTypeSyntax.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/ReturnTypeSyntax/ReturnTypeSyntax.ql b/rust/ql/test/extractor-tests/generated/ReturnTypeSyntax/ReturnTypeSyntax.ql
new file mode 100644
index 00000000000..e29f818af43
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/ReturnTypeSyntax/ReturnTypeSyntax.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from ReturnTypeSyntax x
+where toBeTested(x) and not x.isUnknown()
+select x
diff --git a/rust/ql/test/extractor-tests/generated/ReturnTypeSyntax/gen_return_type_syntax.rs b/rust/ql/test/extractor-tests/generated/ReturnTypeSyntax/gen_return_type_syntax.rs
new file mode 100644
index 00000000000..31601c86b33
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/ReturnTypeSyntax/gen_return_type_syntax.rs
@@ -0,0 +1,6 @@
+// generated by codegen, do not edit
+
+fn test_return_type_syntax() -> () {
+    // A ReturnTypeSyntax. For example:
+    todo!()
+}
diff --git a/rust/ql/test/extractor-tests/generated/SelfParam/SelfParam.expected b/rust/ql/test/extractor-tests/generated/SelfParam/SelfParam.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/SelfParam/SelfParam.ql b/rust/ql/test/extractor-tests/generated/SelfParam/SelfParam.ql
new file mode 100644
index 00000000000..af2fa064a72
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/SelfParam/SelfParam.ql
@@ -0,0 +1,16 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from
+  SelfParam x, int getNumberOfAttrs, string isMut, string hasLifetime, string hasName, string hasTy
+where
+  toBeTested(x) and
+  not x.isUnknown() and
+  getNumberOfAttrs = x.getNumberOfAttrs() and
+  (if x.isMut() then isMut = "yes" else isMut = "no") and
+  (if x.hasLifetime() then hasLifetime = "yes" else hasLifetime = "no") and
+  (if x.hasName() then hasName = "yes" else hasName = "no") and
+  if x.hasTy() then hasTy = "yes" else hasTy = "no"
+select x, "getNumberOfAttrs:", getNumberOfAttrs, "isMut:", isMut, "hasLifetime:", hasLifetime,
+  "hasName:", hasName, "hasTy:", hasTy
diff --git a/rust/ql/test/extractor-tests/generated/SelfParam/SelfParam_getAttr.expected b/rust/ql/test/extractor-tests/generated/SelfParam/SelfParam_getAttr.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/SelfParam/SelfParam_getAttr.ql b/rust/ql/test/extractor-tests/generated/SelfParam/SelfParam_getAttr.ql
new file mode 100644
index 00000000000..682c1a9374a
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/SelfParam/SelfParam_getAttr.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from SelfParam x, int index
+where toBeTested(x) and not x.isUnknown()
+select x, index, x.getAttr(index)
diff --git a/rust/ql/test/extractor-tests/generated/SelfParam/SelfParam_getLifetime.expected b/rust/ql/test/extractor-tests/generated/SelfParam/SelfParam_getLifetime.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/SelfParam/SelfParam_getLifetime.ql b/rust/ql/test/extractor-tests/generated/SelfParam/SelfParam_getLifetime.ql
new file mode 100644
index 00000000000..a64eb368a71
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/SelfParam/SelfParam_getLifetime.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from SelfParam x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getLifetime()
diff --git a/rust/ql/test/extractor-tests/generated/SelfParam/SelfParam_getName.expected b/rust/ql/test/extractor-tests/generated/SelfParam/SelfParam_getName.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/SelfParam/SelfParam_getName.ql b/rust/ql/test/extractor-tests/generated/SelfParam/SelfParam_getName.ql
new file mode 100644
index 00000000000..7a99270bfa5
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/SelfParam/SelfParam_getName.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from SelfParam x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getName()
diff --git a/rust/ql/test/extractor-tests/generated/SelfParam/SelfParam_getTy.expected b/rust/ql/test/extractor-tests/generated/SelfParam/SelfParam_getTy.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/SelfParam/SelfParam_getTy.ql b/rust/ql/test/extractor-tests/generated/SelfParam/SelfParam_getTy.ql
new file mode 100644
index 00000000000..5c04c13cdf2
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/SelfParam/SelfParam_getTy.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from SelfParam x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getTy()
diff --git a/rust/ql/test/extractor-tests/generated/SelfParam/gen_self_param.rs b/rust/ql/test/extractor-tests/generated/SelfParam/gen_self_param.rs
new file mode 100644
index 00000000000..36f8ffd8baf
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/SelfParam/gen_self_param.rs
@@ -0,0 +1,6 @@
+// generated by codegen, do not edit
+
+fn test_self_param() -> () {
+    // A SelfParam. For example:
+    todo!()
+}
diff --git a/rust/ql/test/extractor-tests/generated/SlicePat/SlicePat.expected b/rust/ql/test/extractor-tests/generated/SlicePat/SlicePat.expected
index 96aa9c9cb28..0821ea23323 100644
--- a/rust/ql/test/extractor-tests/generated/SlicePat/SlicePat.expected
+++ b/rust/ql/test/extractor-tests/generated/SlicePat/SlicePat.expected
@@ -1,3 +1,3 @@
-| gen_slice_pat.rs:6:9:6:23 | SlicePat | getNumberOfPrefixes: | 5 | hasSlice: | no | getNumberOfSuffixes: | 0 |
-| gen_slice_pat.rs:7:9:7:18 | SlicePat | getNumberOfPrefixes: | 2 | hasSlice: | yes | getNumberOfSuffixes: | 0 |
-| gen_slice_pat.rs:8:9:8:24 | SlicePat | getNumberOfPrefixes: | 2 | hasSlice: | yes | getNumberOfSuffixes: | 2 |
+| gen_slice_pat.rs:6:9:6:23 | SlicePat | getNumberOfPats: | 5 |
+| gen_slice_pat.rs:7:9:7:18 | SlicePat | getNumberOfPats: | 3 |
+| gen_slice_pat.rs:8:9:8:24 | SlicePat | getNumberOfPats: | 5 |
diff --git a/rust/ql/test/extractor-tests/generated/SlicePat/SlicePat.ql b/rust/ql/test/extractor-tests/generated/SlicePat/SlicePat.ql
index 0ab0d4bb0ce..2b6c51f9da6 100644
--- a/rust/ql/test/extractor-tests/generated/SlicePat/SlicePat.ql
+++ b/rust/ql/test/extractor-tests/generated/SlicePat/SlicePat.ql
@@ -2,12 +2,9 @@
 import codeql.rust.elements
 import TestUtils
 
-from SlicePat x, int getNumberOfPrefixes, string hasSlice, int getNumberOfSuffixes
+from SlicePat x, int getNumberOfPats
 where
   toBeTested(x) and
   not x.isUnknown() and
-  getNumberOfPrefixes = x.getNumberOfPrefixes() and
-  (if x.hasSlice() then hasSlice = "yes" else hasSlice = "no") and
-  getNumberOfSuffixes = x.getNumberOfSuffixes()
-select x, "getNumberOfPrefixes:", getNumberOfPrefixes, "hasSlice:", hasSlice,
-  "getNumberOfSuffixes:", getNumberOfSuffixes
+  getNumberOfPats = x.getNumberOfPats()
+select x, "getNumberOfPats:", getNumberOfPats
diff --git a/rust/ql/test/extractor-tests/generated/SlicePat/SlicePat_getPrefix.expected b/rust/ql/test/extractor-tests/generated/SlicePat/SlicePat_getPat.expected
similarity index 67%
rename from rust/ql/test/extractor-tests/generated/SlicePat/SlicePat_getPrefix.expected
rename to rust/ql/test/extractor-tests/generated/SlicePat/SlicePat_getPat.expected
index 763ef8783b4..e874d3a22ee 100644
--- a/rust/ql/test/extractor-tests/generated/SlicePat/SlicePat_getPrefix.expected
+++ b/rust/ql/test/extractor-tests/generated/SlicePat/SlicePat_getPat.expected
@@ -5,5 +5,9 @@
 | gen_slice_pat.rs:6:9:6:23 | SlicePat | 4 | gen_slice_pat.rs:6:22:6:22 | LiteralPat |
 | gen_slice_pat.rs:7:9:7:18 | SlicePat | 0 | gen_slice_pat.rs:7:10:7:10 | LiteralPat |
 | gen_slice_pat.rs:7:9:7:18 | SlicePat | 1 | gen_slice_pat.rs:7:13:7:13 | LiteralPat |
-| gen_slice_pat.rs:8:9:8:24 | SlicePat | 0 | gen_slice_pat.rs:8:10:8:10 | IdentPat |
-| gen_slice_pat.rs:8:9:8:24 | SlicePat | 1 | gen_slice_pat.rs:8:13:8:13 | IdentPat |
+| gen_slice_pat.rs:7:9:7:18 | SlicePat | 2 | gen_slice_pat.rs:7:16:7:17 | RestPat |
+| gen_slice_pat.rs:8:9:8:24 | SlicePat | 0 | gen_slice_pat.rs:8:10:8:10 | x |
+| gen_slice_pat.rs:8:9:8:24 | SlicePat | 1 | gen_slice_pat.rs:8:13:8:13 | y |
+| gen_slice_pat.rs:8:9:8:24 | SlicePat | 2 | gen_slice_pat.rs:8:16:8:17 | RestPat |
+| gen_slice_pat.rs:8:9:8:24 | SlicePat | 3 | gen_slice_pat.rs:8:20:8:20 | z |
+| gen_slice_pat.rs:8:9:8:24 | SlicePat | 4 | gen_slice_pat.rs:8:23:8:23 | LiteralPat |
diff --git a/rust/ql/test/extractor-tests/generated/SlicePat/SlicePat_getPrefix.ql b/rust/ql/test/extractor-tests/generated/SlicePat/SlicePat_getPat.ql
similarity index 80%
rename from rust/ql/test/extractor-tests/generated/SlicePat/SlicePat_getPrefix.ql
rename to rust/ql/test/extractor-tests/generated/SlicePat/SlicePat_getPat.ql
index 983f1133730..37194fd2f1d 100644
--- a/rust/ql/test/extractor-tests/generated/SlicePat/SlicePat_getPrefix.ql
+++ b/rust/ql/test/extractor-tests/generated/SlicePat/SlicePat_getPat.ql
@@ -4,4 +4,4 @@ import TestUtils
 
 from SlicePat x, int index
 where toBeTested(x) and not x.isUnknown()
-select x, index, x.getPrefix(index)
+select x, index, x.getPat(index)
diff --git a/rust/ql/test/extractor-tests/generated/SlicePat/SlicePat_getSlice.expected b/rust/ql/test/extractor-tests/generated/SlicePat/SlicePat_getSlice.expected
deleted file mode 100644
index 1e0f4586250..00000000000
--- a/rust/ql/test/extractor-tests/generated/SlicePat/SlicePat_getSlice.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-| gen_slice_pat.rs:7:9:7:18 | SlicePat | gen_slice_pat.rs:7:16:7:17 | MissingPat |
-| gen_slice_pat.rs:8:9:8:24 | SlicePat | gen_slice_pat.rs:8:16:8:17 | MissingPat |
diff --git a/rust/ql/test/extractor-tests/generated/SlicePat/SlicePat_getSlice.ql b/rust/ql/test/extractor-tests/generated/SlicePat/SlicePat_getSlice.ql
deleted file mode 100644
index 6e4ae62cf17..00000000000
--- a/rust/ql/test/extractor-tests/generated/SlicePat/SlicePat_getSlice.ql
+++ /dev/null
@@ -1,7 +0,0 @@
-// generated by codegen, do not edit
-import codeql.rust.elements
-import TestUtils
-
-from SlicePat x
-where toBeTested(x) and not x.isUnknown()
-select x, x.getSlice()
diff --git a/rust/ql/test/extractor-tests/generated/SlicePat/SlicePat_getSuffix.expected b/rust/ql/test/extractor-tests/generated/SlicePat/SlicePat_getSuffix.expected
deleted file mode 100644
index a815226345a..00000000000
--- a/rust/ql/test/extractor-tests/generated/SlicePat/SlicePat_getSuffix.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-| gen_slice_pat.rs:8:9:8:24 | SlicePat | 0 | gen_slice_pat.rs:8:20:8:20 | IdentPat |
-| gen_slice_pat.rs:8:9:8:24 | SlicePat | 1 | gen_slice_pat.rs:8:23:8:23 | LiteralPat |
diff --git a/rust/ql/test/extractor-tests/generated/SlicePat/SlicePat_getSuffix.ql b/rust/ql/test/extractor-tests/generated/SlicePat/SlicePat_getSuffix.ql
deleted file mode 100644
index 351f3ffcdff..00000000000
--- a/rust/ql/test/extractor-tests/generated/SlicePat/SlicePat_getSuffix.ql
+++ /dev/null
@@ -1,7 +0,0 @@
-// generated by codegen, do not edit
-import codeql.rust.elements
-import TestUtils
-
-from SlicePat x, int index
-where toBeTested(x) and not x.isUnknown()
-select x, index, x.getSuffix(index)
diff --git a/rust/ql/test/extractor-tests/generated/SliceType/SliceType.expected b/rust/ql/test/extractor-tests/generated/SliceType/SliceType.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/SliceType/SliceType.ql b/rust/ql/test/extractor-tests/generated/SliceType/SliceType.ql
new file mode 100644
index 00000000000..ebd87495b49
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/SliceType/SliceType.ql
@@ -0,0 +1,10 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from SliceType x, string hasTy
+where
+  toBeTested(x) and
+  not x.isUnknown() and
+  if x.hasTy() then hasTy = "yes" else hasTy = "no"
+select x, "hasTy:", hasTy
diff --git a/rust/ql/test/extractor-tests/generated/SliceType/SliceType_getTy.expected b/rust/ql/test/extractor-tests/generated/SliceType/SliceType_getTy.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/SliceType/SliceType_getTy.ql b/rust/ql/test/extractor-tests/generated/SliceType/SliceType_getTy.ql
new file mode 100644
index 00000000000..ff977cdd8fc
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/SliceType/SliceType_getTy.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from SliceType x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getTy()
diff --git a/rust/ql/test/extractor-tests/generated/SliceType/gen_slice_type.rs b/rust/ql/test/extractor-tests/generated/SliceType/gen_slice_type.rs
new file mode 100644
index 00000000000..49c11e484ac
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/SliceType/gen_slice_type.rs
@@ -0,0 +1,6 @@
+// generated by codegen, do not edit
+
+fn test_slice_type() -> () {
+    // A SliceType. For example:
+    todo!()
+}
diff --git a/rust/ql/test/extractor-tests/generated/SourceFile/SourceFile.expected b/rust/ql/test/extractor-tests/generated/SourceFile/SourceFile.expected
new file mode 100644
index 00000000000..9aac17e8e84
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/SourceFile/SourceFile.expected
@@ -0,0 +1,2 @@
+| gen_source_file.rs:1:1:6:2 | SourceFile | getNumberOfAttrs: | 0 | getNumberOfItems: | 1 |
+| lib.rs:1:1:1:20 | SourceFile | getNumberOfAttrs: | 0 | getNumberOfItems: | 1 |
diff --git a/rust/ql/test/extractor-tests/generated/SourceFile/SourceFile.ql b/rust/ql/test/extractor-tests/generated/SourceFile/SourceFile.ql
new file mode 100644
index 00000000000..b904bf731a8
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/SourceFile/SourceFile.ql
@@ -0,0 +1,11 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from SourceFile x, int getNumberOfAttrs, int getNumberOfItems
+where
+  toBeTested(x) and
+  not x.isUnknown() and
+  getNumberOfAttrs = x.getNumberOfAttrs() and
+  getNumberOfItems = x.getNumberOfItems()
+select x, "getNumberOfAttrs:", getNumberOfAttrs, "getNumberOfItems:", getNumberOfItems
diff --git a/rust/ql/test/extractor-tests/generated/SourceFile/SourceFile_getAttr.expected b/rust/ql/test/extractor-tests/generated/SourceFile/SourceFile_getAttr.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/SourceFile/SourceFile_getAttr.ql b/rust/ql/test/extractor-tests/generated/SourceFile/SourceFile_getAttr.ql
new file mode 100644
index 00000000000..d1842052239
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/SourceFile/SourceFile_getAttr.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from SourceFile x, int index
+where toBeTested(x) and not x.isUnknown()
+select x, index, x.getAttr(index)
diff --git a/rust/ql/test/extractor-tests/generated/SourceFile/SourceFile_getItem.expected b/rust/ql/test/extractor-tests/generated/SourceFile/SourceFile_getItem.expected
new file mode 100644
index 00000000000..a256c2b84b2
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/SourceFile/SourceFile_getItem.expected
@@ -0,0 +1,2 @@
+| gen_source_file.rs:1:1:6:2 | SourceFile | 0 | gen_source_file.rs:3:1:6:1 | test_source_file |
+| lib.rs:1:1:1:20 | SourceFile | 0 | lib.rs:1:1:1:20 | Module |
diff --git a/rust/ql/test/extractor-tests/generated/SourceFile/SourceFile_getItem.ql b/rust/ql/test/extractor-tests/generated/SourceFile/SourceFile_getItem.ql
new file mode 100644
index 00000000000..339ea18c216
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/SourceFile/SourceFile_getItem.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from SourceFile x, int index
+where toBeTested(x) and not x.isUnknown()
+select x, index, x.getItem(index)
diff --git a/rust/ql/test/extractor-tests/generated/SourceFile/gen_source_file.rs b/rust/ql/test/extractor-tests/generated/SourceFile/gen_source_file.rs
new file mode 100644
index 00000000000..5d8e1d2caf4
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/SourceFile/gen_source_file.rs
@@ -0,0 +1,6 @@
+// generated by codegen, do not edit
+
+fn test_source_file() -> () {
+    // A SourceFile. For example:
+    todo!()
+}
diff --git a/rust/ql/test/extractor-tests/generated/Static/Static.expected b/rust/ql/test/extractor-tests/generated/Static/Static.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/Static/Static.ql b/rust/ql/test/extractor-tests/generated/Static/Static.ql
new file mode 100644
index 00000000000..7450b7778a1
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/Static/Static.ql
@@ -0,0 +1,26 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from
+  Static x, string hasExtendedCanonicalPath, string hasCrateOrigin, int getNumberOfAttrs,
+  string hasBody, string isMut, string isStatic, string hasName, string hasTy, string hasVisibility
+where
+  toBeTested(x) and
+  not x.isUnknown() and
+  (
+    if x.hasExtendedCanonicalPath()
+    then hasExtendedCanonicalPath = "yes"
+    else hasExtendedCanonicalPath = "no"
+  ) and
+  (if x.hasCrateOrigin() then hasCrateOrigin = "yes" else hasCrateOrigin = "no") and
+  getNumberOfAttrs = x.getNumberOfAttrs() and
+  (if x.hasBody() then hasBody = "yes" else hasBody = "no") and
+  (if x.isMut() then isMut = "yes" else isMut = "no") and
+  (if x.isStatic() then isStatic = "yes" else isStatic = "no") and
+  (if x.hasName() then hasName = "yes" else hasName = "no") and
+  (if x.hasTy() then hasTy = "yes" else hasTy = "no") and
+  if x.hasVisibility() then hasVisibility = "yes" else hasVisibility = "no"
+select x, "hasExtendedCanonicalPath:", hasExtendedCanonicalPath, "hasCrateOrigin:", hasCrateOrigin,
+  "getNumberOfAttrs:", getNumberOfAttrs, "hasBody:", hasBody, "isMut:", isMut, "isStatic:",
+  isStatic, "hasName:", hasName, "hasTy:", hasTy, "hasVisibility:", hasVisibility
diff --git a/rust/ql/test/extractor-tests/generated/Static/Static_getAttr.expected b/rust/ql/test/extractor-tests/generated/Static/Static_getAttr.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/Static/Static_getAttr.ql b/rust/ql/test/extractor-tests/generated/Static/Static_getAttr.ql
new file mode 100644
index 00000000000..df76d9642d2
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/Static/Static_getAttr.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from Static x, int index
+where toBeTested(x) and not x.isUnknown()
+select x, index, x.getAttr(index)
diff --git a/rust/ql/test/extractor-tests/generated/Static/Static_getBody.expected b/rust/ql/test/extractor-tests/generated/Static/Static_getBody.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/Static/Static_getBody.ql b/rust/ql/test/extractor-tests/generated/Static/Static_getBody.ql
new file mode 100644
index 00000000000..3983685f7fa
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/Static/Static_getBody.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from Static x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getBody()
diff --git a/rust/ql/test/extractor-tests/generated/Static/Static_getCrateOrigin.expected b/rust/ql/test/extractor-tests/generated/Static/Static_getCrateOrigin.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/Static/Static_getCrateOrigin.ql b/rust/ql/test/extractor-tests/generated/Static/Static_getCrateOrigin.ql
new file mode 100644
index 00000000000..373b6bd45f4
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/Static/Static_getCrateOrigin.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from Static x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getCrateOrigin()
diff --git a/rust/ql/test/extractor-tests/generated/Static/Static_getExtendedCanonicalPath.expected b/rust/ql/test/extractor-tests/generated/Static/Static_getExtendedCanonicalPath.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/Static/Static_getExtendedCanonicalPath.ql b/rust/ql/test/extractor-tests/generated/Static/Static_getExtendedCanonicalPath.ql
new file mode 100644
index 00000000000..32b3a0c127e
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/Static/Static_getExtendedCanonicalPath.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from Static x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getExtendedCanonicalPath()
diff --git a/rust/ql/test/extractor-tests/generated/Static/Static_getName.expected b/rust/ql/test/extractor-tests/generated/Static/Static_getName.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/Static/Static_getName.ql b/rust/ql/test/extractor-tests/generated/Static/Static_getName.ql
new file mode 100644
index 00000000000..714d58c3892
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/Static/Static_getName.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from Static x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getName()
diff --git a/rust/ql/test/extractor-tests/generated/Static/Static_getTy.expected b/rust/ql/test/extractor-tests/generated/Static/Static_getTy.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/Static/Static_getTy.ql b/rust/ql/test/extractor-tests/generated/Static/Static_getTy.ql
new file mode 100644
index 00000000000..b1dc6d79529
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/Static/Static_getTy.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from Static x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getTy()
diff --git a/rust/ql/test/extractor-tests/generated/Static/Static_getVisibility.expected b/rust/ql/test/extractor-tests/generated/Static/Static_getVisibility.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/Static/Static_getVisibility.ql b/rust/ql/test/extractor-tests/generated/Static/Static_getVisibility.ql
new file mode 100644
index 00000000000..7ba134e17bc
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/Static/Static_getVisibility.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from Static x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getVisibility()
diff --git a/rust/ql/test/extractor-tests/generated/Static/gen_static.rs b/rust/ql/test/extractor-tests/generated/Static/gen_static.rs
new file mode 100644
index 00000000000..cd0e40d3f6c
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/Static/gen_static.rs
@@ -0,0 +1,6 @@
+// generated by codegen, do not edit
+
+fn test_static() -> () {
+    // A Static. For example:
+    todo!()
+}
diff --git a/rust/ql/test/extractor-tests/generated/StmtList/StmtList.expected b/rust/ql/test/extractor-tests/generated/StmtList/StmtList.expected
new file mode 100644
index 00000000000..201b91c921f
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/StmtList/StmtList.expected
@@ -0,0 +1 @@
+| gen_stmt_list.rs:3:27:6:1 | StmtList | getNumberOfAttrs: | 0 | getNumberOfStatements: | 0 | hasTailExpr: | yes |
diff --git a/rust/ql/test/extractor-tests/generated/StmtList/StmtList.ql b/rust/ql/test/extractor-tests/generated/StmtList/StmtList.ql
new file mode 100644
index 00000000000..e24be9ebffe
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/StmtList/StmtList.ql
@@ -0,0 +1,13 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from StmtList x, int getNumberOfAttrs, int getNumberOfStatements, string hasTailExpr
+where
+  toBeTested(x) and
+  not x.isUnknown() and
+  getNumberOfAttrs = x.getNumberOfAttrs() and
+  getNumberOfStatements = x.getNumberOfStatements() and
+  if x.hasTailExpr() then hasTailExpr = "yes" else hasTailExpr = "no"
+select x, "getNumberOfAttrs:", getNumberOfAttrs, "getNumberOfStatements:", getNumberOfStatements,
+  "hasTailExpr:", hasTailExpr
diff --git a/rust/ql/test/extractor-tests/generated/StmtList/StmtList_getAttr.expected b/rust/ql/test/extractor-tests/generated/StmtList/StmtList_getAttr.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/StmtList/StmtList_getAttr.ql b/rust/ql/test/extractor-tests/generated/StmtList/StmtList_getAttr.ql
new file mode 100644
index 00000000000..a1a2079e938
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/StmtList/StmtList_getAttr.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from StmtList x, int index
+where toBeTested(x) and not x.isUnknown()
+select x, index, x.getAttr(index)
diff --git a/rust/ql/test/extractor-tests/generated/StmtList/StmtList_getStatement.expected b/rust/ql/test/extractor-tests/generated/StmtList/StmtList_getStatement.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/BlockExpr/BlockExpr_getStatement.ql b/rust/ql/test/extractor-tests/generated/StmtList/StmtList_getStatement.ql
similarity index 85%
rename from rust/ql/test/extractor-tests/generated/BlockExpr/BlockExpr_getStatement.ql
rename to rust/ql/test/extractor-tests/generated/StmtList/StmtList_getStatement.ql
index 13a94844bf2..f895ca9fa01 100644
--- a/rust/ql/test/extractor-tests/generated/BlockExpr/BlockExpr_getStatement.ql
+++ b/rust/ql/test/extractor-tests/generated/StmtList/StmtList_getStatement.ql
@@ -2,6 +2,6 @@
 import codeql.rust.elements
 import TestUtils
 
-from BlockExpr x, int index
+from StmtList x, int index
 where toBeTested(x) and not x.isUnknown()
 select x, index, x.getStatement(index)
diff --git a/rust/ql/test/extractor-tests/generated/StmtList/StmtList_getTailExpr.expected b/rust/ql/test/extractor-tests/generated/StmtList/StmtList_getTailExpr.expected
new file mode 100644
index 00000000000..007a65f8439
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/StmtList/StmtList_getTailExpr.expected
@@ -0,0 +1 @@
+| gen_stmt_list.rs:3:27:6:1 | StmtList | gen_stmt_list.rs:5:5:5:11 | MacroExpr |
diff --git a/rust/ql/test/extractor-tests/generated/StmtList/StmtList_getTailExpr.ql b/rust/ql/test/extractor-tests/generated/StmtList/StmtList_getTailExpr.ql
new file mode 100644
index 00000000000..592c6085451
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/StmtList/StmtList_getTailExpr.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from StmtList x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getTailExpr()
diff --git a/rust/ql/test/extractor-tests/generated/StmtList/gen_stmt_list.rs b/rust/ql/test/extractor-tests/generated/StmtList/gen_stmt_list.rs
new file mode 100644
index 00000000000..cea5eceb1cd
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/StmtList/gen_stmt_list.rs
@@ -0,0 +1,6 @@
+// generated by codegen, do not edit
+
+fn test_stmt_list() -> () {
+    // A StmtList. For example:
+    todo!()
+}
diff --git a/rust/ql/test/extractor-tests/generated/Struct/Struct.expected b/rust/ql/test/extractor-tests/generated/Struct/Struct.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/Struct/Struct.ql b/rust/ql/test/extractor-tests/generated/Struct/Struct.ql
new file mode 100644
index 00000000000..d2b3a349386
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/Struct/Struct.ql
@@ -0,0 +1,27 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from
+  Struct x, string hasExtendedCanonicalPath, string hasCrateOrigin, int getNumberOfAttrs,
+  string hasFieldList, string hasGenericParamList, string hasName, string hasVisibility,
+  string hasWhereClause
+where
+  toBeTested(x) and
+  not x.isUnknown() and
+  (
+    if x.hasExtendedCanonicalPath()
+    then hasExtendedCanonicalPath = "yes"
+    else hasExtendedCanonicalPath = "no"
+  ) and
+  (if x.hasCrateOrigin() then hasCrateOrigin = "yes" else hasCrateOrigin = "no") and
+  getNumberOfAttrs = x.getNumberOfAttrs() and
+  (if x.hasFieldList() then hasFieldList = "yes" else hasFieldList = "no") and
+  (if x.hasGenericParamList() then hasGenericParamList = "yes" else hasGenericParamList = "no") and
+  (if x.hasName() then hasName = "yes" else hasName = "no") and
+  (if x.hasVisibility() then hasVisibility = "yes" else hasVisibility = "no") and
+  if x.hasWhereClause() then hasWhereClause = "yes" else hasWhereClause = "no"
+select x, "hasExtendedCanonicalPath:", hasExtendedCanonicalPath, "hasCrateOrigin:", hasCrateOrigin,
+  "getNumberOfAttrs:", getNumberOfAttrs, "hasFieldList:", hasFieldList, "hasGenericParamList:",
+  hasGenericParamList, "hasName:", hasName, "hasVisibility:", hasVisibility, "hasWhereClause:",
+  hasWhereClause
diff --git a/rust/ql/test/extractor-tests/generated/Struct/Struct_getAttr.expected b/rust/ql/test/extractor-tests/generated/Struct/Struct_getAttr.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/Struct/Struct_getAttr.ql b/rust/ql/test/extractor-tests/generated/Struct/Struct_getAttr.ql
new file mode 100644
index 00000000000..11789c109f0
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/Struct/Struct_getAttr.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from Struct x, int index
+where toBeTested(x) and not x.isUnknown()
+select x, index, x.getAttr(index)
diff --git a/rust/ql/test/extractor-tests/generated/Struct/Struct_getCrateOrigin.expected b/rust/ql/test/extractor-tests/generated/Struct/Struct_getCrateOrigin.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/Struct/Struct_getCrateOrigin.ql b/rust/ql/test/extractor-tests/generated/Struct/Struct_getCrateOrigin.ql
new file mode 100644
index 00000000000..cafe120d4de
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/Struct/Struct_getCrateOrigin.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from Struct x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getCrateOrigin()
diff --git a/rust/ql/test/extractor-tests/generated/Struct/Struct_getExtendedCanonicalPath.expected b/rust/ql/test/extractor-tests/generated/Struct/Struct_getExtendedCanonicalPath.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/Struct/Struct_getExtendedCanonicalPath.ql b/rust/ql/test/extractor-tests/generated/Struct/Struct_getExtendedCanonicalPath.ql
new file mode 100644
index 00000000000..f502a347b3e
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/Struct/Struct_getExtendedCanonicalPath.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from Struct x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getExtendedCanonicalPath()
diff --git a/rust/ql/test/extractor-tests/generated/Struct/Struct_getFieldList.expected b/rust/ql/test/extractor-tests/generated/Struct/Struct_getFieldList.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/Struct/Struct_getFieldList.ql b/rust/ql/test/extractor-tests/generated/Struct/Struct_getFieldList.ql
new file mode 100644
index 00000000000..cdbdf6a37be
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/Struct/Struct_getFieldList.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from Struct x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getFieldList()
diff --git a/rust/ql/test/extractor-tests/generated/Struct/Struct_getGenericParamList.expected b/rust/ql/test/extractor-tests/generated/Struct/Struct_getGenericParamList.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/Struct/Struct_getGenericParamList.ql b/rust/ql/test/extractor-tests/generated/Struct/Struct_getGenericParamList.ql
new file mode 100644
index 00000000000..31a30a865f7
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/Struct/Struct_getGenericParamList.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from Struct x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getGenericParamList()
diff --git a/rust/ql/test/extractor-tests/generated/Struct/Struct_getName.expected b/rust/ql/test/extractor-tests/generated/Struct/Struct_getName.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/Struct/Struct_getName.ql b/rust/ql/test/extractor-tests/generated/Struct/Struct_getName.ql
new file mode 100644
index 00000000000..40a167b3f2e
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/Struct/Struct_getName.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from Struct x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getName()
diff --git a/rust/ql/test/extractor-tests/generated/Struct/Struct_getVisibility.expected b/rust/ql/test/extractor-tests/generated/Struct/Struct_getVisibility.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/Struct/Struct_getVisibility.ql b/rust/ql/test/extractor-tests/generated/Struct/Struct_getVisibility.ql
new file mode 100644
index 00000000000..a86863cb1c7
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/Struct/Struct_getVisibility.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from Struct x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getVisibility()
diff --git a/rust/ql/test/extractor-tests/generated/Struct/Struct_getWhereClause.expected b/rust/ql/test/extractor-tests/generated/Struct/Struct_getWhereClause.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/Struct/Struct_getWhereClause.ql b/rust/ql/test/extractor-tests/generated/Struct/Struct_getWhereClause.ql
new file mode 100644
index 00000000000..b1df6874c1d
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/Struct/Struct_getWhereClause.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from Struct x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getWhereClause()
diff --git a/rust/ql/test/extractor-tests/generated/Struct/gen_struct.rs b/rust/ql/test/extractor-tests/generated/Struct/gen_struct.rs
new file mode 100644
index 00000000000..f5b42b79190
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/Struct/gen_struct.rs
@@ -0,0 +1,6 @@
+// generated by codegen, do not edit
+
+fn test_struct() -> () {
+    // A Struct. For example:
+    todo!()
+}
diff --git a/rust/ql/test/extractor-tests/generated/TokenTree/TokenTree.expected b/rust/ql/test/extractor-tests/generated/TokenTree/TokenTree.expected
new file mode 100644
index 00000000000..b13382221bb
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/TokenTree/TokenTree.expected
@@ -0,0 +1 @@
+| gen_token_tree.rs:5:10:5:11 | TokenTree |
diff --git a/rust/ql/test/extractor-tests/generated/MissingExpr/MissingExpr.ql b/rust/ql/test/extractor-tests/generated/TokenTree/TokenTree.ql
similarity index 87%
rename from rust/ql/test/extractor-tests/generated/MissingExpr/MissingExpr.ql
rename to rust/ql/test/extractor-tests/generated/TokenTree/TokenTree.ql
index 1aa6119b6aa..299c1e48b6b 100644
--- a/rust/ql/test/extractor-tests/generated/MissingExpr/MissingExpr.ql
+++ b/rust/ql/test/extractor-tests/generated/TokenTree/TokenTree.ql
@@ -2,6 +2,6 @@
 import codeql.rust.elements
 import TestUtils
 
-from MissingExpr x
+from TokenTree x
 where toBeTested(x) and not x.isUnknown()
 select x
diff --git a/rust/ql/test/extractor-tests/generated/TokenTree/gen_token_tree.rs b/rust/ql/test/extractor-tests/generated/TokenTree/gen_token_tree.rs
new file mode 100644
index 00000000000..7781391e232
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/TokenTree/gen_token_tree.rs
@@ -0,0 +1,6 @@
+// generated by codegen, do not edit
+
+fn test_token_tree() -> () {
+    // A TokenTree. For example:
+    todo!()
+}
diff --git a/rust/ql/test/extractor-tests/generated/Trait/AssocItemList.expected b/rust/ql/test/extractor-tests/generated/Trait/AssocItemList.expected
new file mode 100644
index 00000000000..123a2da6653
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/Trait/AssocItemList.expected
@@ -0,0 +1,2 @@
+| gen_trait.rs:4:20:8:1 | AssocItemList | getNumberOfAssocItems: | 3 | getNumberOfAttrs: | 0 |
+| gen_trait.rs:10:56:10:57 | AssocItemList | getNumberOfAssocItems: | 0 | getNumberOfAttrs: | 0 |
diff --git a/rust/ql/test/extractor-tests/generated/Trait/AssocItemList.ql b/rust/ql/test/extractor-tests/generated/Trait/AssocItemList.ql
new file mode 100644
index 00000000000..eebd261c6bd
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/Trait/AssocItemList.ql
@@ -0,0 +1,11 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from AssocItemList x, int getNumberOfAssocItems, int getNumberOfAttrs
+where
+  toBeTested(x) and
+  not x.isUnknown() and
+  getNumberOfAssocItems = x.getNumberOfAssocItems() and
+  getNumberOfAttrs = x.getNumberOfAttrs()
+select x, "getNumberOfAssocItems:", getNumberOfAssocItems, "getNumberOfAttrs:", getNumberOfAttrs
diff --git a/rust/ql/test/extractor-tests/generated/Trait/AssocItemList_getAssocItem.expected b/rust/ql/test/extractor-tests/generated/Trait/AssocItemList_getAssocItem.expected
new file mode 100644
index 00000000000..0f70039583a
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/Trait/AssocItemList_getAssocItem.expected
@@ -0,0 +1,3 @@
+| gen_trait.rs:4:20:8:1 | AssocItemList | 0 | gen_trait.rs:5:3:5:18 | TypeAlias |
+| gen_trait.rs:4:20:8:1 | AssocItemList | 1 | gen_trait.rs:6:3:6:20 | TypeAlias |
+| gen_trait.rs:4:20:8:1 | AssocItemList | 2 | gen_trait.rs:7:3:7:72 | frobinize_with |
diff --git a/rust/ql/test/extractor-tests/generated/Trait/AssocItemList_getAssocItem.ql b/rust/ql/test/extractor-tests/generated/Trait/AssocItemList_getAssocItem.ql
new file mode 100644
index 00000000000..01d36f7cc54
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/Trait/AssocItemList_getAssocItem.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from AssocItemList x, int index
+where toBeTested(x) and not x.isUnknown()
+select x, index, x.getAssocItem(index)
diff --git a/rust/ql/test/extractor-tests/generated/Trait/AssocItemList_getAttr.expected b/rust/ql/test/extractor-tests/generated/Trait/AssocItemList_getAttr.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/Trait/AssocItemList_getAttr.ql b/rust/ql/test/extractor-tests/generated/Trait/AssocItemList_getAttr.ql
new file mode 100644
index 00000000000..72b5f366737
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/Trait/AssocItemList_getAttr.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from AssocItemList x, int index
+where toBeTested(x) and not x.isUnknown()
+select x, index, x.getAttr(index)
diff --git a/rust/ql/test/extractor-tests/generated/Trait/Trait.expected b/rust/ql/test/extractor-tests/generated/Trait/Trait.expected
new file mode 100644
index 00000000000..ba06219a2d4
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/Trait/Trait.expected
@@ -0,0 +1,2 @@
+| gen_trait.rs:3:1:8:1 | Trait | hasExtendedCanonicalPath: | yes | hasCrateOrigin: | yes | hasAssocItemList: | yes | getNumberOfAttrs: | 0 | hasGenericParamList: | no | isAuto: | no | isUnsafe: | no | hasName: | yes | hasTypeBoundList: | no | hasVisibility: | no | hasWhereClause: | no |
+| gen_trait.rs:10:1:10:57 | Trait | hasExtendedCanonicalPath: | yes | hasCrateOrigin: | yes | hasAssocItemList: | yes | getNumberOfAttrs: | 0 | hasGenericParamList: | yes | isAuto: | no | isUnsafe: | no | hasName: | yes | hasTypeBoundList: | no | hasVisibility: | yes | hasWhereClause: | yes |
diff --git a/rust/ql/test/extractor-tests/generated/Trait/Trait.ql b/rust/ql/test/extractor-tests/generated/Trait/Trait.ql
new file mode 100644
index 00000000000..b4548cddcee
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/Trait/Trait.ql
@@ -0,0 +1,31 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from
+  Trait x, string hasExtendedCanonicalPath, string hasCrateOrigin, string hasAssocItemList,
+  int getNumberOfAttrs, string hasGenericParamList, string isAuto, string isUnsafe, string hasName,
+  string hasTypeBoundList, string hasVisibility, string hasWhereClause
+where
+  toBeTested(x) and
+  not x.isUnknown() and
+  (
+    if x.hasExtendedCanonicalPath()
+    then hasExtendedCanonicalPath = "yes"
+    else hasExtendedCanonicalPath = "no"
+  ) and
+  (if x.hasCrateOrigin() then hasCrateOrigin = "yes" else hasCrateOrigin = "no") and
+  (if x.hasAssocItemList() then hasAssocItemList = "yes" else hasAssocItemList = "no") and
+  getNumberOfAttrs = x.getNumberOfAttrs() and
+  (if x.hasGenericParamList() then hasGenericParamList = "yes" else hasGenericParamList = "no") and
+  (if x.isAuto() then isAuto = "yes" else isAuto = "no") and
+  (if x.isUnsafe() then isUnsafe = "yes" else isUnsafe = "no") and
+  (if x.hasName() then hasName = "yes" else hasName = "no") and
+  (if x.hasTypeBoundList() then hasTypeBoundList = "yes" else hasTypeBoundList = "no") and
+  (if x.hasVisibility() then hasVisibility = "yes" else hasVisibility = "no") and
+  if x.hasWhereClause() then hasWhereClause = "yes" else hasWhereClause = "no"
+select x, "hasExtendedCanonicalPath:", hasExtendedCanonicalPath, "hasCrateOrigin:", hasCrateOrigin,
+  "hasAssocItemList:", hasAssocItemList, "getNumberOfAttrs:", getNumberOfAttrs,
+  "hasGenericParamList:", hasGenericParamList, "isAuto:", isAuto, "isUnsafe:", isUnsafe, "hasName:",
+  hasName, "hasTypeBoundList:", hasTypeBoundList, "hasVisibility:", hasVisibility,
+  "hasWhereClause:", hasWhereClause
diff --git a/rust/ql/test/extractor-tests/generated/Trait/Trait_getAssocItemList.expected b/rust/ql/test/extractor-tests/generated/Trait/Trait_getAssocItemList.expected
new file mode 100644
index 00000000000..fc16a774800
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/Trait/Trait_getAssocItemList.expected
@@ -0,0 +1,2 @@
+| gen_trait.rs:3:1:8:1 | Trait | gen_trait.rs:4:20:8:1 | AssocItemList |
+| gen_trait.rs:10:1:10:57 | Trait | gen_trait.rs:10:56:10:57 | AssocItemList |
diff --git a/rust/ql/test/extractor-tests/generated/Trait/Trait_getAssocItemList.ql b/rust/ql/test/extractor-tests/generated/Trait/Trait_getAssocItemList.ql
new file mode 100644
index 00000000000..94a59605021
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/Trait/Trait_getAssocItemList.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from Trait x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getAssocItemList()
diff --git a/rust/ql/test/extractor-tests/generated/Trait/Trait_getAttr.expected b/rust/ql/test/extractor-tests/generated/Trait/Trait_getAttr.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/Trait/Trait_getAttr.ql b/rust/ql/test/extractor-tests/generated/Trait/Trait_getAttr.ql
new file mode 100644
index 00000000000..219303af515
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/Trait/Trait_getAttr.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from Trait x, int index
+where toBeTested(x) and not x.isUnknown()
+select x, index, x.getAttr(index)
diff --git a/rust/ql/test/extractor-tests/generated/Trait/Trait_getCrateOrigin.expected b/rust/ql/test/extractor-tests/generated/Trait/Trait_getCrateOrigin.expected
new file mode 100644
index 00000000000..36106a58ae0
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/Trait/Trait_getCrateOrigin.expected
@@ -0,0 +1,2 @@
+| gen_trait.rs:3:1:8:1 | Trait | repo::test |
+| gen_trait.rs:10:1:10:57 | Trait | repo::test |
diff --git a/rust/ql/test/extractor-tests/generated/Trait/Trait_getCrateOrigin.ql b/rust/ql/test/extractor-tests/generated/Trait/Trait_getCrateOrigin.ql
new file mode 100644
index 00000000000..8c2c71a918e
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/Trait/Trait_getCrateOrigin.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from Trait x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getCrateOrigin()
diff --git a/rust/ql/test/extractor-tests/generated/Trait/Trait_getExtendedCanonicalPath.expected b/rust/ql/test/extractor-tests/generated/Trait/Trait_getExtendedCanonicalPath.expected
new file mode 100644
index 00000000000..d89c9f23757
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/Trait/Trait_getExtendedCanonicalPath.expected
@@ -0,0 +1,2 @@
+| gen_trait.rs:3:1:8:1 | Trait | crate::gen_trait::Frobinizable |
+| gen_trait.rs:10:1:10:57 | Trait | crate::gen_trait::Foo |
diff --git a/rust/ql/test/extractor-tests/generated/Trait/Trait_getExtendedCanonicalPath.ql b/rust/ql/test/extractor-tests/generated/Trait/Trait_getExtendedCanonicalPath.ql
new file mode 100644
index 00000000000..5281a18656b
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/Trait/Trait_getExtendedCanonicalPath.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from Trait x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getExtendedCanonicalPath()
diff --git a/rust/ql/test/extractor-tests/generated/Trait/Trait_getGenericParamList.expected b/rust/ql/test/extractor-tests/generated/Trait/Trait_getGenericParamList.expected
new file mode 100644
index 00000000000..85a848355f1
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/Trait/Trait_getGenericParamList.expected
@@ -0,0 +1 @@
+| gen_trait.rs:10:1:10:57 | Trait | gen_trait.rs:10:14:10:30 | GenericParamList |
diff --git a/rust/ql/test/extractor-tests/generated/Trait/Trait_getGenericParamList.ql b/rust/ql/test/extractor-tests/generated/Trait/Trait_getGenericParamList.ql
new file mode 100644
index 00000000000..db979636892
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/Trait/Trait_getGenericParamList.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from Trait x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getGenericParamList()
diff --git a/rust/ql/test/extractor-tests/generated/Trait/Trait_getName.expected b/rust/ql/test/extractor-tests/generated/Trait/Trait_getName.expected
new file mode 100644
index 00000000000..cc60a2ab938
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/Trait/Trait_getName.expected
@@ -0,0 +1,2 @@
+| gen_trait.rs:3:1:8:1 | Trait | gen_trait.rs:4:7:4:18 | Frobinizable |
+| gen_trait.rs:10:1:10:57 | Trait | gen_trait.rs:10:11:10:13 | Foo |
diff --git a/rust/ql/test/extractor-tests/generated/Trait/Trait_getName.ql b/rust/ql/test/extractor-tests/generated/Trait/Trait_getName.ql
new file mode 100644
index 00000000000..eeb7b6f4802
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/Trait/Trait_getName.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from Trait x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getName()
diff --git a/rust/ql/test/extractor-tests/generated/Trait/Trait_getTypeBoundList.expected b/rust/ql/test/extractor-tests/generated/Trait/Trait_getTypeBoundList.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/Trait/Trait_getTypeBoundList.ql b/rust/ql/test/extractor-tests/generated/Trait/Trait_getTypeBoundList.ql
new file mode 100644
index 00000000000..f5544da39d3
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/Trait/Trait_getTypeBoundList.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from Trait x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getTypeBoundList()
diff --git a/rust/ql/test/extractor-tests/generated/Trait/Trait_getVisibility.expected b/rust/ql/test/extractor-tests/generated/Trait/Trait_getVisibility.expected
new file mode 100644
index 00000000000..67d505acda7
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/Trait/Trait_getVisibility.expected
@@ -0,0 +1 @@
+| gen_trait.rs:10:1:10:57 | Trait | gen_trait.rs:10:1:10:3 | Visibility |
diff --git a/rust/ql/test/extractor-tests/generated/Trait/Trait_getVisibility.ql b/rust/ql/test/extractor-tests/generated/Trait/Trait_getVisibility.ql
new file mode 100644
index 00000000000..1405d15127e
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/Trait/Trait_getVisibility.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from Trait x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getVisibility()
diff --git a/rust/ql/test/extractor-tests/generated/Trait/Trait_getWhereClause.expected b/rust/ql/test/extractor-tests/generated/Trait/Trait_getWhereClause.expected
new file mode 100644
index 00000000000..a1ae3161e79
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/Trait/Trait_getWhereClause.expected
@@ -0,0 +1 @@
+| gen_trait.rs:10:1:10:57 | Trait | gen_trait.rs:10:32:10:54 | WhereClause |
diff --git a/rust/ql/test/extractor-tests/generated/Trait/Trait_getWhereClause.ql b/rust/ql/test/extractor-tests/generated/Trait/Trait_getWhereClause.ql
new file mode 100644
index 00000000000..fb7448f8196
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/Trait/Trait_getWhereClause.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from Trait x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getWhereClause()
diff --git a/rust/ql/test/extractor-tests/generated/Trait/gen_trait.rs b/rust/ql/test/extractor-tests/generated/Trait/gen_trait.rs
new file mode 100644
index 00000000000..a6f30619ffa
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/Trait/gen_trait.rs
@@ -0,0 +1,10 @@
+// generated by codegen, do not edit
+
+// A Trait. For example:
+trait Frobinizable {
+  type Frobinator;
+  type Result: Copy;
+  fn frobinize_with(&mut self, frobinator: &Self::Frobinator) -> Result;
+}
+
+pub trait Foo<T: Frobinizable> where T::Frobinator: Eq {}
diff --git a/rust/ql/test/extractor-tests/generated/TraitAlias/TraitAlias.expected b/rust/ql/test/extractor-tests/generated/TraitAlias/TraitAlias.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/TraitAlias/TraitAlias.ql b/rust/ql/test/extractor-tests/generated/TraitAlias/TraitAlias.ql
new file mode 100644
index 00000000000..80fe86e2749
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/TraitAlias/TraitAlias.ql
@@ -0,0 +1,27 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from
+  TraitAlias x, string hasExtendedCanonicalPath, string hasCrateOrigin, int getNumberOfAttrs,
+  string hasGenericParamList, string hasName, string hasTypeBoundList, string hasVisibility,
+  string hasWhereClause
+where
+  toBeTested(x) and
+  not x.isUnknown() and
+  (
+    if x.hasExtendedCanonicalPath()
+    then hasExtendedCanonicalPath = "yes"
+    else hasExtendedCanonicalPath = "no"
+  ) and
+  (if x.hasCrateOrigin() then hasCrateOrigin = "yes" else hasCrateOrigin = "no") and
+  getNumberOfAttrs = x.getNumberOfAttrs() and
+  (if x.hasGenericParamList() then hasGenericParamList = "yes" else hasGenericParamList = "no") and
+  (if x.hasName() then hasName = "yes" else hasName = "no") and
+  (if x.hasTypeBoundList() then hasTypeBoundList = "yes" else hasTypeBoundList = "no") and
+  (if x.hasVisibility() then hasVisibility = "yes" else hasVisibility = "no") and
+  if x.hasWhereClause() then hasWhereClause = "yes" else hasWhereClause = "no"
+select x, "hasExtendedCanonicalPath:", hasExtendedCanonicalPath, "hasCrateOrigin:", hasCrateOrigin,
+  "getNumberOfAttrs:", getNumberOfAttrs, "hasGenericParamList:", hasGenericParamList, "hasName:",
+  hasName, "hasTypeBoundList:", hasTypeBoundList, "hasVisibility:", hasVisibility,
+  "hasWhereClause:", hasWhereClause
diff --git a/rust/ql/test/extractor-tests/generated/TraitAlias/TraitAlias_getAttr.expected b/rust/ql/test/extractor-tests/generated/TraitAlias/TraitAlias_getAttr.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/TraitAlias/TraitAlias_getAttr.ql b/rust/ql/test/extractor-tests/generated/TraitAlias/TraitAlias_getAttr.ql
new file mode 100644
index 00000000000..3ca992de122
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/TraitAlias/TraitAlias_getAttr.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from TraitAlias x, int index
+where toBeTested(x) and not x.isUnknown()
+select x, index, x.getAttr(index)
diff --git a/rust/ql/test/extractor-tests/generated/TraitAlias/TraitAlias_getCrateOrigin.expected b/rust/ql/test/extractor-tests/generated/TraitAlias/TraitAlias_getCrateOrigin.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/TraitAlias/TraitAlias_getCrateOrigin.ql b/rust/ql/test/extractor-tests/generated/TraitAlias/TraitAlias_getCrateOrigin.ql
new file mode 100644
index 00000000000..6f9ccf89262
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/TraitAlias/TraitAlias_getCrateOrigin.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from TraitAlias x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getCrateOrigin()
diff --git a/rust/ql/test/extractor-tests/generated/TraitAlias/TraitAlias_getExtendedCanonicalPath.expected b/rust/ql/test/extractor-tests/generated/TraitAlias/TraitAlias_getExtendedCanonicalPath.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/TraitAlias/TraitAlias_getExtendedCanonicalPath.ql b/rust/ql/test/extractor-tests/generated/TraitAlias/TraitAlias_getExtendedCanonicalPath.ql
new file mode 100644
index 00000000000..6326e730c33
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/TraitAlias/TraitAlias_getExtendedCanonicalPath.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from TraitAlias x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getExtendedCanonicalPath()
diff --git a/rust/ql/test/extractor-tests/generated/TraitAlias/TraitAlias_getGenericParamList.expected b/rust/ql/test/extractor-tests/generated/TraitAlias/TraitAlias_getGenericParamList.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/TraitAlias/TraitAlias_getGenericParamList.ql b/rust/ql/test/extractor-tests/generated/TraitAlias/TraitAlias_getGenericParamList.ql
new file mode 100644
index 00000000000..3372d78e89e
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/TraitAlias/TraitAlias_getGenericParamList.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from TraitAlias x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getGenericParamList()
diff --git a/rust/ql/test/extractor-tests/generated/TraitAlias/TraitAlias_getName.expected b/rust/ql/test/extractor-tests/generated/TraitAlias/TraitAlias_getName.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/TraitAlias/TraitAlias_getName.ql b/rust/ql/test/extractor-tests/generated/TraitAlias/TraitAlias_getName.ql
new file mode 100644
index 00000000000..2b64f27e19d
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/TraitAlias/TraitAlias_getName.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from TraitAlias x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getName()
diff --git a/rust/ql/test/extractor-tests/generated/TraitAlias/TraitAlias_getTypeBoundList.expected b/rust/ql/test/extractor-tests/generated/TraitAlias/TraitAlias_getTypeBoundList.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/TraitAlias/TraitAlias_getTypeBoundList.ql b/rust/ql/test/extractor-tests/generated/TraitAlias/TraitAlias_getTypeBoundList.ql
new file mode 100644
index 00000000000..28f7588ec9f
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/TraitAlias/TraitAlias_getTypeBoundList.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from TraitAlias x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getTypeBoundList()
diff --git a/rust/ql/test/extractor-tests/generated/TraitAlias/TraitAlias_getVisibility.expected b/rust/ql/test/extractor-tests/generated/TraitAlias/TraitAlias_getVisibility.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/TraitAlias/TraitAlias_getVisibility.ql b/rust/ql/test/extractor-tests/generated/TraitAlias/TraitAlias_getVisibility.ql
new file mode 100644
index 00000000000..1dde55e9663
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/TraitAlias/TraitAlias_getVisibility.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from TraitAlias x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getVisibility()
diff --git a/rust/ql/test/extractor-tests/generated/TraitAlias/TraitAlias_getWhereClause.expected b/rust/ql/test/extractor-tests/generated/TraitAlias/TraitAlias_getWhereClause.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/TraitAlias/TraitAlias_getWhereClause.ql b/rust/ql/test/extractor-tests/generated/TraitAlias/TraitAlias_getWhereClause.ql
new file mode 100644
index 00000000000..91e39d5e646
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/TraitAlias/TraitAlias_getWhereClause.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from TraitAlias x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getWhereClause()
diff --git a/rust/ql/test/extractor-tests/generated/TraitAlias/gen_trait_alias.rs b/rust/ql/test/extractor-tests/generated/TraitAlias/gen_trait_alias.rs
new file mode 100644
index 00000000000..708e0d99e58
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/TraitAlias/gen_trait_alias.rs
@@ -0,0 +1,6 @@
+// generated by codegen, do not edit
+
+fn test_trait_alias() -> () {
+    // A TraitAlias. For example:
+    todo!()
+}
diff --git a/rust/ql/test/extractor-tests/generated/TryExpr/TryExpr.expected b/rust/ql/test/extractor-tests/generated/TryExpr/TryExpr.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/TryExpr/TryExpr.ql b/rust/ql/test/extractor-tests/generated/TryExpr/TryExpr.ql
new file mode 100644
index 00000000000..be3c70a933c
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/TryExpr/TryExpr.ql
@@ -0,0 +1,11 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from TryExpr x, int getNumberOfAttrs, string hasExpr
+where
+  toBeTested(x) and
+  not x.isUnknown() and
+  getNumberOfAttrs = x.getNumberOfAttrs() and
+  if x.hasExpr() then hasExpr = "yes" else hasExpr = "no"
+select x, "getNumberOfAttrs:", getNumberOfAttrs, "hasExpr:", hasExpr
diff --git a/rust/ql/test/extractor-tests/generated/TryExpr/TryExpr_getAttr.expected b/rust/ql/test/extractor-tests/generated/TryExpr/TryExpr_getAttr.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/TryExpr/TryExpr_getAttr.ql b/rust/ql/test/extractor-tests/generated/TryExpr/TryExpr_getAttr.ql
new file mode 100644
index 00000000000..1073bec1860
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/TryExpr/TryExpr_getAttr.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from TryExpr x, int index
+where toBeTested(x) and not x.isUnknown()
+select x, index, x.getAttr(index)
diff --git a/rust/ql/test/extractor-tests/generated/TryExpr/TryExpr_getExpr.expected b/rust/ql/test/extractor-tests/generated/TryExpr/TryExpr_getExpr.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/TryExpr/TryExpr_getExpr.ql b/rust/ql/test/extractor-tests/generated/TryExpr/TryExpr_getExpr.ql
new file mode 100644
index 00000000000..477a2bb5811
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/TryExpr/TryExpr_getExpr.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from TryExpr x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getExpr()
diff --git a/rust/ql/test/extractor-tests/generated/TryExpr/gen_try_expr.rs b/rust/ql/test/extractor-tests/generated/TryExpr/gen_try_expr.rs
new file mode 100644
index 00000000000..083dffd3c35
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/TryExpr/gen_try_expr.rs
@@ -0,0 +1,6 @@
+// generated by codegen, do not edit
+
+fn test_try_expr() -> () {
+    // A TryExpr. For example:
+    todo!()
+}
diff --git a/rust/ql/test/extractor-tests/generated/TupleExpr/TupleExpr.expected b/rust/ql/test/extractor-tests/generated/TupleExpr/TupleExpr.expected
index 9522fe8750d..2bd4e57c30e 100644
--- a/rust/ql/test/extractor-tests/generated/TupleExpr/TupleExpr.expected
+++ b/rust/ql/test/extractor-tests/generated/TupleExpr/TupleExpr.expected
@@ -1,2 +1,2 @@
-| gen_tuple_expr.rs:5:5:5:14 | TupleExpr | getNumberOfExprs: | 2 | isAssigneeExpr: | no |
-| gen_tuple_expr.rs:6:5:6:14 | TupleExpr | getNumberOfExprs: | 2 | isAssigneeExpr: | yes |
+| gen_tuple_expr.rs:5:5:5:14 | TupleExpr | getNumberOfAttrs: | 0 | getNumberOfFields: | 2 |
+| gen_tuple_expr.rs:6:5:6:14 | TupleExpr | getNumberOfAttrs: | 0 | getNumberOfFields: | 2 |
diff --git a/rust/ql/test/extractor-tests/generated/TupleExpr/TupleExpr.ql b/rust/ql/test/extractor-tests/generated/TupleExpr/TupleExpr.ql
index 1020f4d101d..573d7936d6c 100644
--- a/rust/ql/test/extractor-tests/generated/TupleExpr/TupleExpr.ql
+++ b/rust/ql/test/extractor-tests/generated/TupleExpr/TupleExpr.ql
@@ -2,10 +2,10 @@
 import codeql.rust.elements
 import TestUtils
 
-from TupleExpr x, int getNumberOfExprs, string isAssigneeExpr
+from TupleExpr x, int getNumberOfAttrs, int getNumberOfFields
 where
   toBeTested(x) and
   not x.isUnknown() and
-  getNumberOfExprs = x.getNumberOfExprs() and
-  if x.isAssigneeExpr() then isAssigneeExpr = "yes" else isAssigneeExpr = "no"
-select x, "getNumberOfExprs:", getNumberOfExprs, "isAssigneeExpr:", isAssigneeExpr
+  getNumberOfAttrs = x.getNumberOfAttrs() and
+  getNumberOfFields = x.getNumberOfFields()
+select x, "getNumberOfAttrs:", getNumberOfAttrs, "getNumberOfFields:", getNumberOfFields
diff --git a/rust/ql/test/extractor-tests/generated/TupleExpr/TupleExpr_getAttr.expected b/rust/ql/test/extractor-tests/generated/TupleExpr/TupleExpr_getAttr.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/TupleExpr/TupleExpr_getAttr.ql b/rust/ql/test/extractor-tests/generated/TupleExpr/TupleExpr_getAttr.ql
new file mode 100644
index 00000000000..6736dada82b
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/TupleExpr/TupleExpr_getAttr.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from TupleExpr x, int index
+where toBeTested(x) and not x.isUnknown()
+select x, index, x.getAttr(index)
diff --git a/rust/ql/test/extractor-tests/generated/TupleExpr/TupleExpr_getExpr.expected b/rust/ql/test/extractor-tests/generated/TupleExpr/TupleExpr_getField.expected
similarity index 71%
rename from rust/ql/test/extractor-tests/generated/TupleExpr/TupleExpr_getExpr.expected
rename to rust/ql/test/extractor-tests/generated/TupleExpr/TupleExpr_getField.expected
index 936d2a39bb2..11cd1614ccd 100644
--- a/rust/ql/test/extractor-tests/generated/TupleExpr/TupleExpr_getExpr.expected
+++ b/rust/ql/test/extractor-tests/generated/TupleExpr/TupleExpr_getField.expected
@@ -1,4 +1,4 @@
-| gen_tuple_expr.rs:5:5:5:14 | TupleExpr | 0 | gen_tuple_expr.rs:5:6:5:6 | LiteralExpr |
-| gen_tuple_expr.rs:5:5:5:14 | TupleExpr | 1 | gen_tuple_expr.rs:5:9:5:13 | LiteralExpr |
-| gen_tuple_expr.rs:6:5:6:14 | TupleExpr | 0 | gen_tuple_expr.rs:6:6:6:6 | LiteralExpr |
-| gen_tuple_expr.rs:6:5:6:14 | TupleExpr | 1 | gen_tuple_expr.rs:6:9:6:13 | LiteralExpr |
+| gen_tuple_expr.rs:5:5:5:14 | TupleExpr | 0 | gen_tuple_expr.rs:5:6:5:6 | 1 |
+| gen_tuple_expr.rs:5:5:5:14 | TupleExpr | 1 | gen_tuple_expr.rs:5:9:5:13 | "one" |
+| gen_tuple_expr.rs:6:5:6:14 | TupleExpr | 0 | gen_tuple_expr.rs:6:6:6:6 | 2 |
+| gen_tuple_expr.rs:6:5:6:14 | TupleExpr | 1 | gen_tuple_expr.rs:6:9:6:13 | "two" |
diff --git a/rust/ql/test/extractor-tests/generated/TupleExpr/TupleExpr_getField.ql b/rust/ql/test/extractor-tests/generated/TupleExpr/TupleExpr_getField.ql
new file mode 100644
index 00000000000..79c25f047d0
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/TupleExpr/TupleExpr_getField.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from TupleExpr x, int index
+where toBeTested(x) and not x.isUnknown()
+select x, index, x.getField(index)
diff --git a/rust/ql/test/extractor-tests/generated/TupleField/TupleField.expected b/rust/ql/test/extractor-tests/generated/TupleField/TupleField.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/TupleField/TupleField.ql b/rust/ql/test/extractor-tests/generated/TupleField/TupleField.ql
new file mode 100644
index 00000000000..d3f83968497
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/TupleField/TupleField.ql
@@ -0,0 +1,12 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from TupleField x, int getNumberOfAttrs, string hasTy, string hasVisibility
+where
+  toBeTested(x) and
+  not x.isUnknown() and
+  getNumberOfAttrs = x.getNumberOfAttrs() and
+  (if x.hasTy() then hasTy = "yes" else hasTy = "no") and
+  if x.hasVisibility() then hasVisibility = "yes" else hasVisibility = "no"
+select x, "getNumberOfAttrs:", getNumberOfAttrs, "hasTy:", hasTy, "hasVisibility:", hasVisibility
diff --git a/rust/ql/test/extractor-tests/generated/TupleField/TupleField_getAttr.expected b/rust/ql/test/extractor-tests/generated/TupleField/TupleField_getAttr.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/TupleField/TupleField_getAttr.ql b/rust/ql/test/extractor-tests/generated/TupleField/TupleField_getAttr.ql
new file mode 100644
index 00000000000..23481ed001a
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/TupleField/TupleField_getAttr.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from TupleField x, int index
+where toBeTested(x) and not x.isUnknown()
+select x, index, x.getAttr(index)
diff --git a/rust/ql/test/extractor-tests/generated/TupleField/TupleField_getTy.expected b/rust/ql/test/extractor-tests/generated/TupleField/TupleField_getTy.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/TupleField/TupleField_getTy.ql b/rust/ql/test/extractor-tests/generated/TupleField/TupleField_getTy.ql
new file mode 100644
index 00000000000..ba0b3bfdbee
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/TupleField/TupleField_getTy.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from TupleField x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getTy()
diff --git a/rust/ql/test/extractor-tests/generated/TupleField/TupleField_getVisibility.expected b/rust/ql/test/extractor-tests/generated/TupleField/TupleField_getVisibility.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/TupleField/TupleField_getVisibility.ql b/rust/ql/test/extractor-tests/generated/TupleField/TupleField_getVisibility.ql
new file mode 100644
index 00000000000..457bbd1a57b
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/TupleField/TupleField_getVisibility.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from TupleField x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getVisibility()
diff --git a/rust/ql/test/extractor-tests/generated/TupleField/gen_tuple_field.rs b/rust/ql/test/extractor-tests/generated/TupleField/gen_tuple_field.rs
new file mode 100644
index 00000000000..245862c35d7
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/TupleField/gen_tuple_field.rs
@@ -0,0 +1,6 @@
+// generated by codegen, do not edit
+
+fn test_tuple_field() -> () {
+    // A TupleField. For example:
+    todo!()
+}
diff --git a/rust/ql/test/extractor-tests/generated/TupleFieldList/TupleFieldList.expected b/rust/ql/test/extractor-tests/generated/TupleFieldList/TupleFieldList.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/TupleFieldList/TupleFieldList.ql b/rust/ql/test/extractor-tests/generated/TupleFieldList/TupleFieldList.ql
new file mode 100644
index 00000000000..fd25929804e
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/TupleFieldList/TupleFieldList.ql
@@ -0,0 +1,10 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from TupleFieldList x, int getNumberOfFields
+where
+  toBeTested(x) and
+  not x.isUnknown() and
+  getNumberOfFields = x.getNumberOfFields()
+select x, "getNumberOfFields:", getNumberOfFields
diff --git a/rust/ql/test/extractor-tests/generated/TupleFieldList/TupleFieldList_getField.expected b/rust/ql/test/extractor-tests/generated/TupleFieldList/TupleFieldList_getField.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/TupleFieldList/TupleFieldList_getField.ql b/rust/ql/test/extractor-tests/generated/TupleFieldList/TupleFieldList_getField.ql
new file mode 100644
index 00000000000..8483c03f1d7
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/TupleFieldList/TupleFieldList_getField.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from TupleFieldList x, int index
+where toBeTested(x) and not x.isUnknown()
+select x, index, x.getField(index)
diff --git a/rust/ql/test/extractor-tests/generated/TupleFieldList/gen_tuple_field_list.rs b/rust/ql/test/extractor-tests/generated/TupleFieldList/gen_tuple_field_list.rs
new file mode 100644
index 00000000000..5f6858c12ab
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/TupleFieldList/gen_tuple_field_list.rs
@@ -0,0 +1,6 @@
+// generated by codegen, do not edit
+
+fn test_tuple_field_list() -> () {
+    // A TupleFieldList. For example:
+    todo!()
+}
diff --git a/rust/ql/test/extractor-tests/generated/TuplePat/TuplePat.expected b/rust/ql/test/extractor-tests/generated/TuplePat/TuplePat.expected
index 393cbfdda38..d6522bb7bf1 100644
--- a/rust/ql/test/extractor-tests/generated/TuplePat/TuplePat.expected
+++ b/rust/ql/test/extractor-tests/generated/TuplePat/TuplePat.expected
@@ -1,2 +1,2 @@
-| gen_tuple_pat.rs:5:9:5:14 | TuplePat | getNumberOfArgs: | 2 | hasEllipsisIndex: | no |
-| gen_tuple_pat.rs:6:9:6:22 | TuplePat | getNumberOfArgs: | 3 | hasEllipsisIndex: | yes |
+| gen_tuple_pat.rs:5:9:5:14 | TuplePat | getNumberOfFields: | 2 |
+| gen_tuple_pat.rs:6:9:6:22 | TuplePat | getNumberOfFields: | 4 |
diff --git a/rust/ql/test/extractor-tests/generated/TuplePat/TuplePat.ql b/rust/ql/test/extractor-tests/generated/TuplePat/TuplePat.ql
index 7d6ce9fcb6a..6e65f167985 100644
--- a/rust/ql/test/extractor-tests/generated/TuplePat/TuplePat.ql
+++ b/rust/ql/test/extractor-tests/generated/TuplePat/TuplePat.ql
@@ -2,10 +2,9 @@
 import codeql.rust.elements
 import TestUtils
 
-from TuplePat x, int getNumberOfArgs, string hasEllipsisIndex
+from TuplePat x, int getNumberOfFields
 where
   toBeTested(x) and
   not x.isUnknown() and
-  getNumberOfArgs = x.getNumberOfArgs() and
-  if x.hasEllipsisIndex() then hasEllipsisIndex = "yes" else hasEllipsisIndex = "no"
-select x, "getNumberOfArgs:", getNumberOfArgs, "hasEllipsisIndex:", hasEllipsisIndex
+  getNumberOfFields = x.getNumberOfFields()
+select x, "getNumberOfFields:", getNumberOfFields
diff --git a/rust/ql/test/extractor-tests/generated/TuplePat/TuplePat_getEllipsisIndex.expected b/rust/ql/test/extractor-tests/generated/TuplePat/TuplePat_getEllipsisIndex.expected
deleted file mode 100644
index 7248cb17ab3..00000000000
--- a/rust/ql/test/extractor-tests/generated/TuplePat/TuplePat_getEllipsisIndex.expected
+++ /dev/null
@@ -1 +0,0 @@
-| gen_tuple_pat.rs:6:9:6:22 | TuplePat | 2 |
diff --git a/rust/ql/test/extractor-tests/generated/TuplePat/TuplePat_getEllipsisIndex.ql b/rust/ql/test/extractor-tests/generated/TuplePat/TuplePat_getEllipsisIndex.ql
deleted file mode 100644
index 442912b721e..00000000000
--- a/rust/ql/test/extractor-tests/generated/TuplePat/TuplePat_getEllipsisIndex.ql
+++ /dev/null
@@ -1,7 +0,0 @@
-// generated by codegen, do not edit
-import codeql.rust.elements
-import TestUtils
-
-from TuplePat x
-where toBeTested(x) and not x.isUnknown()
-select x, x.getEllipsisIndex()
diff --git a/rust/ql/test/extractor-tests/generated/TuplePat/TuplePat_getArg.expected b/rust/ql/test/extractor-tests/generated/TuplePat/TuplePat_getField.expected
similarity index 67%
rename from rust/ql/test/extractor-tests/generated/TuplePat/TuplePat_getArg.expected
rename to rust/ql/test/extractor-tests/generated/TuplePat/TuplePat_getField.expected
index 993b348b4ee..59d028b43ca 100644
--- a/rust/ql/test/extractor-tests/generated/TuplePat/TuplePat_getArg.expected
+++ b/rust/ql/test/extractor-tests/generated/TuplePat/TuplePat_getField.expected
@@ -1,5 +1,6 @@
-| gen_tuple_pat.rs:5:9:5:14 | TuplePat | 0 | gen_tuple_pat.rs:5:10:5:10 | IdentPat |
-| gen_tuple_pat.rs:5:9:5:14 | TuplePat | 1 | gen_tuple_pat.rs:5:13:5:13 | IdentPat |
-| gen_tuple_pat.rs:6:9:6:22 | TuplePat | 0 | gen_tuple_pat.rs:6:10:6:10 | IdentPat |
-| gen_tuple_pat.rs:6:9:6:22 | TuplePat | 1 | gen_tuple_pat.rs:6:13:6:13 | IdentPat |
-| gen_tuple_pat.rs:6:9:6:22 | TuplePat | 2 | gen_tuple_pat.rs:6:21:6:21 | IdentPat |
+| gen_tuple_pat.rs:5:9:5:14 | TuplePat | 0 | gen_tuple_pat.rs:5:10:5:10 | x |
+| gen_tuple_pat.rs:5:9:5:14 | TuplePat | 1 | gen_tuple_pat.rs:5:13:5:13 | y |
+| gen_tuple_pat.rs:6:9:6:22 | TuplePat | 0 | gen_tuple_pat.rs:6:10:6:10 | a |
+| gen_tuple_pat.rs:6:9:6:22 | TuplePat | 1 | gen_tuple_pat.rs:6:13:6:13 | b |
+| gen_tuple_pat.rs:6:9:6:22 | TuplePat | 2 | gen_tuple_pat.rs:6:16:6:17 | RestPat |
+| gen_tuple_pat.rs:6:9:6:22 | TuplePat | 3 | gen_tuple_pat.rs:6:21:6:21 | z |
diff --git a/rust/ql/test/extractor-tests/generated/TuplePat/TuplePat_getArg.ql b/rust/ql/test/extractor-tests/generated/TuplePat/TuplePat_getField.ql
similarity index 81%
rename from rust/ql/test/extractor-tests/generated/TuplePat/TuplePat_getArg.ql
rename to rust/ql/test/extractor-tests/generated/TuplePat/TuplePat_getField.ql
index 927b8212c4f..5366bc445f1 100644
--- a/rust/ql/test/extractor-tests/generated/TuplePat/TuplePat_getArg.ql
+++ b/rust/ql/test/extractor-tests/generated/TuplePat/TuplePat_getField.ql
@@ -4,4 +4,4 @@ import TestUtils
 
 from TuplePat x, int index
 where toBeTested(x) and not x.isUnknown()
-select x, index, x.getArg(index)
+select x, index, x.getField(index)
diff --git a/rust/ql/test/extractor-tests/generated/TupleStructPat/TupleStructPat.expected b/rust/ql/test/extractor-tests/generated/TupleStructPat/TupleStructPat.expected
index 03ce4b8082d..a0d12cc8509 100644
--- a/rust/ql/test/extractor-tests/generated/TupleStructPat/TupleStructPat.expected
+++ b/rust/ql/test/extractor-tests/generated/TupleStructPat/TupleStructPat.expected
@@ -1,3 +1,3 @@
-| gen_tuple_struct_pat.rs:6:9:6:27 | TupleStructPat | hasPath: | yes | getNumberOfArgs: | 4 | hasEllipsisIndex: | no |
-| gen_tuple_struct_pat.rs:7:9:7:20 | TupleStructPat | hasPath: | yes | getNumberOfArgs: | 1 | hasEllipsisIndex: | yes |
-| gen_tuple_struct_pat.rs:8:9:8:17 | TupleStructPat | hasPath: | yes | getNumberOfArgs: | 0 | hasEllipsisIndex: | yes |
+| gen_tuple_struct_pat.rs:6:9:6:27 | TupleStructPat | getNumberOfFields: | 4 | hasPath: | yes |
+| gen_tuple_struct_pat.rs:7:9:7:20 | TupleStructPat | getNumberOfFields: | 2 | hasPath: | yes |
+| gen_tuple_struct_pat.rs:8:9:8:17 | TupleStructPat | getNumberOfFields: | 1 | hasPath: | yes |
diff --git a/rust/ql/test/extractor-tests/generated/TupleStructPat/TupleStructPat.ql b/rust/ql/test/extractor-tests/generated/TupleStructPat/TupleStructPat.ql
index e46934a81f4..d12f3427df5 100644
--- a/rust/ql/test/extractor-tests/generated/TupleStructPat/TupleStructPat.ql
+++ b/rust/ql/test/extractor-tests/generated/TupleStructPat/TupleStructPat.ql
@@ -2,12 +2,10 @@
 import codeql.rust.elements
 import TestUtils
 
-from TupleStructPat x, string hasPath, int getNumberOfArgs, string hasEllipsisIndex
+from TupleStructPat x, int getNumberOfFields, string hasPath
 where
   toBeTested(x) and
   not x.isUnknown() and
-  (if x.hasPath() then hasPath = "yes" else hasPath = "no") and
-  getNumberOfArgs = x.getNumberOfArgs() and
-  if x.hasEllipsisIndex() then hasEllipsisIndex = "yes" else hasEllipsisIndex = "no"
-select x, "hasPath:", hasPath, "getNumberOfArgs:", getNumberOfArgs, "hasEllipsisIndex:",
-  hasEllipsisIndex
+  getNumberOfFields = x.getNumberOfFields() and
+  if x.hasPath() then hasPath = "yes" else hasPath = "no"
+select x, "getNumberOfFields:", getNumberOfFields, "hasPath:", hasPath
diff --git a/rust/ql/test/extractor-tests/generated/TupleStructPat/TupleStructPat_getEllipsisIndex.expected b/rust/ql/test/extractor-tests/generated/TupleStructPat/TupleStructPat_getEllipsisIndex.expected
deleted file mode 100644
index 96cb3797a62..00000000000
--- a/rust/ql/test/extractor-tests/generated/TupleStructPat/TupleStructPat_getEllipsisIndex.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-| gen_tuple_struct_pat.rs:7:9:7:20 | TupleStructPat | 0 |
-| gen_tuple_struct_pat.rs:8:9:8:17 | TupleStructPat | 0 |
diff --git a/rust/ql/test/extractor-tests/generated/TupleStructPat/TupleStructPat_getEllipsisIndex.ql b/rust/ql/test/extractor-tests/generated/TupleStructPat/TupleStructPat_getEllipsisIndex.ql
deleted file mode 100644
index f31fb1a9342..00000000000
--- a/rust/ql/test/extractor-tests/generated/TupleStructPat/TupleStructPat_getEllipsisIndex.ql
+++ /dev/null
@@ -1,7 +0,0 @@
-// generated by codegen, do not edit
-import codeql.rust.elements
-import TestUtils
-
-from TupleStructPat x
-where toBeTested(x) and not x.isUnknown()
-select x, x.getEllipsisIndex()
diff --git a/rust/ql/test/extractor-tests/generated/TupleStructPat/TupleStructPat_getArg.expected b/rust/ql/test/extractor-tests/generated/TupleStructPat/TupleStructPat_getField.expected
similarity index 72%
rename from rust/ql/test/extractor-tests/generated/TupleStructPat/TupleStructPat_getArg.expected
rename to rust/ql/test/extractor-tests/generated/TupleStructPat/TupleStructPat_getField.expected
index 2a1a163a5aa..7a009a0818b 100644
--- a/rust/ql/test/extractor-tests/generated/TupleStructPat/TupleStructPat_getArg.expected
+++ b/rust/ql/test/extractor-tests/generated/TupleStructPat/TupleStructPat_getField.expected
@@ -2,4 +2,6 @@
 | gen_tuple_struct_pat.rs:6:9:6:27 | TupleStructPat | 1 | gen_tuple_struct_pat.rs:6:20:6:20 | LiteralPat |
 | gen_tuple_struct_pat.rs:6:9:6:27 | TupleStructPat | 2 | gen_tuple_struct_pat.rs:6:23:6:23 | LiteralPat |
 | gen_tuple_struct_pat.rs:6:9:6:27 | TupleStructPat | 3 | gen_tuple_struct_pat.rs:6:26:6:26 | LiteralPat |
-| gen_tuple_struct_pat.rs:7:9:7:20 | TupleStructPat | 0 | gen_tuple_struct_pat.rs:7:19:7:19 | LiteralPat |
+| gen_tuple_struct_pat.rs:7:9:7:20 | TupleStructPat | 0 | gen_tuple_struct_pat.rs:7:15:7:16 | RestPat |
+| gen_tuple_struct_pat.rs:7:9:7:20 | TupleStructPat | 1 | gen_tuple_struct_pat.rs:7:19:7:19 | LiteralPat |
+| gen_tuple_struct_pat.rs:8:9:8:17 | TupleStructPat | 0 | gen_tuple_struct_pat.rs:8:15:8:16 | RestPat |
diff --git a/rust/ql/test/extractor-tests/generated/TupleStructPat/TupleStructPat_getArg.ql b/rust/ql/test/extractor-tests/generated/TupleStructPat/TupleStructPat_getField.ql
similarity index 81%
rename from rust/ql/test/extractor-tests/generated/TupleStructPat/TupleStructPat_getArg.ql
rename to rust/ql/test/extractor-tests/generated/TupleStructPat/TupleStructPat_getField.ql
index 77622933e70..b3919608ce8 100644
--- a/rust/ql/test/extractor-tests/generated/TupleStructPat/TupleStructPat_getArg.ql
+++ b/rust/ql/test/extractor-tests/generated/TupleStructPat/TupleStructPat_getField.ql
@@ -4,4 +4,4 @@ import TestUtils
 
 from TupleStructPat x, int index
 where toBeTested(x) and not x.isUnknown()
-select x, index, x.getArg(index)
+select x, index, x.getField(index)
diff --git a/rust/ql/test/extractor-tests/generated/TupleStructPat/TupleStructPat_getPath.expected b/rust/ql/test/extractor-tests/generated/TupleStructPat/TupleStructPat_getPath.expected
index de7f0f1ffe0..0c07d081720 100644
--- a/rust/ql/test/extractor-tests/generated/TupleStructPat/TupleStructPat_getPath.expected
+++ b/rust/ql/test/extractor-tests/generated/TupleStructPat/TupleStructPat_getPath.expected
@@ -1,3 +1,3 @@
-| gen_tuple_struct_pat.rs:6:9:6:27 | TupleStructPat | gen_tuple_struct_pat.rs:6:9:6:27 | Path |
-| gen_tuple_struct_pat.rs:7:9:7:20 | TupleStructPat | gen_tuple_struct_pat.rs:7:9:7:20 | Path |
-| gen_tuple_struct_pat.rs:8:9:8:17 | TupleStructPat | gen_tuple_struct_pat.rs:8:9:8:17 | Path |
+| gen_tuple_struct_pat.rs:6:9:6:27 | TupleStructPat | gen_tuple_struct_pat.rs:6:9:6:13 | Tuple |
+| gen_tuple_struct_pat.rs:7:9:7:20 | TupleStructPat | gen_tuple_struct_pat.rs:7:9:7:13 | Tuple |
+| gen_tuple_struct_pat.rs:8:9:8:17 | TupleStructPat | gen_tuple_struct_pat.rs:8:9:8:13 | Tuple |
diff --git a/rust/ql/test/extractor-tests/generated/TupleType/TupleType.expected b/rust/ql/test/extractor-tests/generated/TupleType/TupleType.expected
new file mode 100644
index 00000000000..40f8dde9302
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/TupleType/TupleType.expected
@@ -0,0 +1 @@
+| gen_tuple_type.rs:3:25:3:26 | TupleType | getNumberOfFields: | 0 |
diff --git a/rust/ql/test/extractor-tests/generated/TupleType/TupleType.ql b/rust/ql/test/extractor-tests/generated/TupleType/TupleType.ql
new file mode 100644
index 00000000000..785ae988aa0
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/TupleType/TupleType.ql
@@ -0,0 +1,10 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from TupleType x, int getNumberOfFields
+where
+  toBeTested(x) and
+  not x.isUnknown() and
+  getNumberOfFields = x.getNumberOfFields()
+select x, "getNumberOfFields:", getNumberOfFields
diff --git a/rust/ql/test/extractor-tests/generated/TupleType/TupleType_getField.expected b/rust/ql/test/extractor-tests/generated/TupleType/TupleType_getField.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/TupleType/TupleType_getField.ql b/rust/ql/test/extractor-tests/generated/TupleType/TupleType_getField.ql
new file mode 100644
index 00000000000..c77aa1e03b6
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/TupleType/TupleType_getField.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from TupleType x, int index
+where toBeTested(x) and not x.isUnknown()
+select x, index, x.getField(index)
diff --git a/rust/ql/test/extractor-tests/generated/TupleType/gen_tuple_type.rs b/rust/ql/test/extractor-tests/generated/TupleType/gen_tuple_type.rs
new file mode 100644
index 00000000000..5e1a26db519
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/TupleType/gen_tuple_type.rs
@@ -0,0 +1,6 @@
+// generated by codegen, do not edit
+
+fn test_tuple_type() -> () {
+    // A TupleType. For example:
+    todo!()
+}
diff --git a/rust/ql/test/extractor-tests/generated/TypeAlias/TypeAlias.expected b/rust/ql/test/extractor-tests/generated/TypeAlias/TypeAlias.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/TypeAlias/TypeAlias.ql b/rust/ql/test/extractor-tests/generated/TypeAlias/TypeAlias.ql
new file mode 100644
index 00000000000..5959301f81a
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/TypeAlias/TypeAlias.ql
@@ -0,0 +1,29 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from
+  TypeAlias x, string hasExtendedCanonicalPath, string hasCrateOrigin, int getNumberOfAttrs,
+  string hasGenericParamList, string isDefault, string hasName, string hasTy,
+  string hasTypeBoundList, string hasVisibility, string hasWhereClause
+where
+  toBeTested(x) and
+  not x.isUnknown() and
+  (
+    if x.hasExtendedCanonicalPath()
+    then hasExtendedCanonicalPath = "yes"
+    else hasExtendedCanonicalPath = "no"
+  ) and
+  (if x.hasCrateOrigin() then hasCrateOrigin = "yes" else hasCrateOrigin = "no") and
+  getNumberOfAttrs = x.getNumberOfAttrs() and
+  (if x.hasGenericParamList() then hasGenericParamList = "yes" else hasGenericParamList = "no") and
+  (if x.isDefault() then isDefault = "yes" else isDefault = "no") and
+  (if x.hasName() then hasName = "yes" else hasName = "no") and
+  (if x.hasTy() then hasTy = "yes" else hasTy = "no") and
+  (if x.hasTypeBoundList() then hasTypeBoundList = "yes" else hasTypeBoundList = "no") and
+  (if x.hasVisibility() then hasVisibility = "yes" else hasVisibility = "no") and
+  if x.hasWhereClause() then hasWhereClause = "yes" else hasWhereClause = "no"
+select x, "hasExtendedCanonicalPath:", hasExtendedCanonicalPath, "hasCrateOrigin:", hasCrateOrigin,
+  "getNumberOfAttrs:", getNumberOfAttrs, "hasGenericParamList:", hasGenericParamList, "isDefault:",
+  isDefault, "hasName:", hasName, "hasTy:", hasTy, "hasTypeBoundList:", hasTypeBoundList,
+  "hasVisibility:", hasVisibility, "hasWhereClause:", hasWhereClause
diff --git a/rust/ql/test/extractor-tests/generated/TypeAlias/TypeAlias_getAttr.expected b/rust/ql/test/extractor-tests/generated/TypeAlias/TypeAlias_getAttr.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/TypeAlias/TypeAlias_getAttr.ql b/rust/ql/test/extractor-tests/generated/TypeAlias/TypeAlias_getAttr.ql
new file mode 100644
index 00000000000..2eabe53ca6d
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/TypeAlias/TypeAlias_getAttr.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from TypeAlias x, int index
+where toBeTested(x) and not x.isUnknown()
+select x, index, x.getAttr(index)
diff --git a/rust/ql/test/extractor-tests/generated/TypeAlias/TypeAlias_getCrateOrigin.expected b/rust/ql/test/extractor-tests/generated/TypeAlias/TypeAlias_getCrateOrigin.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/TypeAlias/TypeAlias_getCrateOrigin.ql b/rust/ql/test/extractor-tests/generated/TypeAlias/TypeAlias_getCrateOrigin.ql
new file mode 100644
index 00000000000..9a4de0cd9b8
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/TypeAlias/TypeAlias_getCrateOrigin.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from TypeAlias x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getCrateOrigin()
diff --git a/rust/ql/test/extractor-tests/generated/TypeAlias/TypeAlias_getExtendedCanonicalPath.expected b/rust/ql/test/extractor-tests/generated/TypeAlias/TypeAlias_getExtendedCanonicalPath.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/TypeAlias/TypeAlias_getExtendedCanonicalPath.ql b/rust/ql/test/extractor-tests/generated/TypeAlias/TypeAlias_getExtendedCanonicalPath.ql
new file mode 100644
index 00000000000..1f99c759556
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/TypeAlias/TypeAlias_getExtendedCanonicalPath.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from TypeAlias x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getExtendedCanonicalPath()
diff --git a/rust/ql/test/extractor-tests/generated/TypeAlias/TypeAlias_getGenericParamList.expected b/rust/ql/test/extractor-tests/generated/TypeAlias/TypeAlias_getGenericParamList.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/TypeAlias/TypeAlias_getGenericParamList.ql b/rust/ql/test/extractor-tests/generated/TypeAlias/TypeAlias_getGenericParamList.ql
new file mode 100644
index 00000000000..9742b1a9bb7
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/TypeAlias/TypeAlias_getGenericParamList.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from TypeAlias x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getGenericParamList()
diff --git a/rust/ql/test/extractor-tests/generated/TypeAlias/TypeAlias_getName.expected b/rust/ql/test/extractor-tests/generated/TypeAlias/TypeAlias_getName.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/TypeAlias/TypeAlias_getName.ql b/rust/ql/test/extractor-tests/generated/TypeAlias/TypeAlias_getName.ql
new file mode 100644
index 00000000000..95b90c69e39
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/TypeAlias/TypeAlias_getName.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from TypeAlias x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getName()
diff --git a/rust/ql/test/extractor-tests/generated/TypeAlias/TypeAlias_getTy.expected b/rust/ql/test/extractor-tests/generated/TypeAlias/TypeAlias_getTy.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/TypeAlias/TypeAlias_getTy.ql b/rust/ql/test/extractor-tests/generated/TypeAlias/TypeAlias_getTy.ql
new file mode 100644
index 00000000000..885047b16e9
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/TypeAlias/TypeAlias_getTy.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from TypeAlias x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getTy()
diff --git a/rust/ql/test/extractor-tests/generated/TypeAlias/TypeAlias_getTypeBoundList.expected b/rust/ql/test/extractor-tests/generated/TypeAlias/TypeAlias_getTypeBoundList.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/TypeAlias/TypeAlias_getTypeBoundList.ql b/rust/ql/test/extractor-tests/generated/TypeAlias/TypeAlias_getTypeBoundList.ql
new file mode 100644
index 00000000000..6988a3baf7d
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/TypeAlias/TypeAlias_getTypeBoundList.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from TypeAlias x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getTypeBoundList()
diff --git a/rust/ql/test/extractor-tests/generated/TypeAlias/TypeAlias_getVisibility.expected b/rust/ql/test/extractor-tests/generated/TypeAlias/TypeAlias_getVisibility.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/TypeAlias/TypeAlias_getVisibility.ql b/rust/ql/test/extractor-tests/generated/TypeAlias/TypeAlias_getVisibility.ql
new file mode 100644
index 00000000000..78bb19e876a
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/TypeAlias/TypeAlias_getVisibility.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from TypeAlias x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getVisibility()
diff --git a/rust/ql/test/extractor-tests/generated/TypeAlias/TypeAlias_getWhereClause.expected b/rust/ql/test/extractor-tests/generated/TypeAlias/TypeAlias_getWhereClause.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/TypeAlias/TypeAlias_getWhereClause.ql b/rust/ql/test/extractor-tests/generated/TypeAlias/TypeAlias_getWhereClause.ql
new file mode 100644
index 00000000000..becbdac3016
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/TypeAlias/TypeAlias_getWhereClause.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from TypeAlias x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getWhereClause()
diff --git a/rust/ql/test/extractor-tests/generated/TypeAlias/gen_type_alias.rs b/rust/ql/test/extractor-tests/generated/TypeAlias/gen_type_alias.rs
new file mode 100644
index 00000000000..e7aedd9c126
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/TypeAlias/gen_type_alias.rs
@@ -0,0 +1,6 @@
+// generated by codegen, do not edit
+
+fn test_type_alias() -> () {
+    // A TypeAlias. For example:
+    todo!()
+}
diff --git a/rust/ql/test/extractor-tests/generated/TypeArg/TypeArg.expected b/rust/ql/test/extractor-tests/generated/TypeArg/TypeArg.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/ConstExpr/ConstExpr.ql b/rust/ql/test/extractor-tests/generated/TypeArg/TypeArg.ql
similarity index 55%
rename from rust/ql/test/extractor-tests/generated/ConstExpr/ConstExpr.ql
rename to rust/ql/test/extractor-tests/generated/TypeArg/TypeArg.ql
index 293158e36ae..17a26b5b190 100644
--- a/rust/ql/test/extractor-tests/generated/ConstExpr/ConstExpr.ql
+++ b/rust/ql/test/extractor-tests/generated/TypeArg/TypeArg.ql
@@ -2,9 +2,9 @@
 import codeql.rust.elements
 import TestUtils
 
-from ConstExpr x, Expr getExpr
+from TypeArg x, string hasTy
 where
   toBeTested(x) and
   not x.isUnknown() and
-  getExpr = x.getExpr()
-select x, "getExpr:", getExpr
+  if x.hasTy() then hasTy = "yes" else hasTy = "no"
+select x, "hasTy:", hasTy
diff --git a/rust/ql/test/extractor-tests/generated/TypeArg/TypeArg_getTy.expected b/rust/ql/test/extractor-tests/generated/TypeArg/TypeArg_getTy.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/TypeArg/TypeArg_getTy.ql b/rust/ql/test/extractor-tests/generated/TypeArg/TypeArg_getTy.ql
new file mode 100644
index 00000000000..55434bfda46
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/TypeArg/TypeArg_getTy.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from TypeArg x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getTy()
diff --git a/rust/ql/test/extractor-tests/generated/TypeArg/gen_type_arg.rs b/rust/ql/test/extractor-tests/generated/TypeArg/gen_type_arg.rs
new file mode 100644
index 00000000000..f429e9d2187
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/TypeArg/gen_type_arg.rs
@@ -0,0 +1,6 @@
+// generated by codegen, do not edit
+
+fn test_type_arg() -> () {
+    // A TypeArg. For example:
+    todo!()
+}
diff --git a/rust/ql/test/extractor-tests/generated/TypeBound/TypeBound.expected b/rust/ql/test/extractor-tests/generated/TypeBound/TypeBound.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/TypeBound/TypeBound.ql b/rust/ql/test/extractor-tests/generated/TypeBound/TypeBound.ql
new file mode 100644
index 00000000000..449ca67ed71
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/TypeBound/TypeBound.ql
@@ -0,0 +1,17 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from
+  TypeBound x, string hasGenericParamList, string isAsync, string isConst, string hasLifetime,
+  string hasTy
+where
+  toBeTested(x) and
+  not x.isUnknown() and
+  (if x.hasGenericParamList() then hasGenericParamList = "yes" else hasGenericParamList = "no") and
+  (if x.isAsync() then isAsync = "yes" else isAsync = "no") and
+  (if x.isConst() then isConst = "yes" else isConst = "no") and
+  (if x.hasLifetime() then hasLifetime = "yes" else hasLifetime = "no") and
+  if x.hasTy() then hasTy = "yes" else hasTy = "no"
+select x, "hasGenericParamList:", hasGenericParamList, "isAsync:", isAsync, "isConst:", isConst,
+  "hasLifetime:", hasLifetime, "hasTy:", hasTy
diff --git a/rust/ql/test/extractor-tests/generated/TypeBound/TypeBound_getGenericParamList.expected b/rust/ql/test/extractor-tests/generated/TypeBound/TypeBound_getGenericParamList.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/TypeBound/TypeBound_getGenericParamList.ql b/rust/ql/test/extractor-tests/generated/TypeBound/TypeBound_getGenericParamList.ql
new file mode 100644
index 00000000000..ee304647601
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/TypeBound/TypeBound_getGenericParamList.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from TypeBound x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getGenericParamList()
diff --git a/rust/ql/test/extractor-tests/generated/TypeBound/TypeBound_getLifetime.expected b/rust/ql/test/extractor-tests/generated/TypeBound/TypeBound_getLifetime.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/TypeBound/TypeBound_getLifetime.ql b/rust/ql/test/extractor-tests/generated/TypeBound/TypeBound_getLifetime.ql
new file mode 100644
index 00000000000..267ed0dd7ae
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/TypeBound/TypeBound_getLifetime.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from TypeBound x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getLifetime()
diff --git a/rust/ql/test/extractor-tests/generated/TypeBound/TypeBound_getTy.expected b/rust/ql/test/extractor-tests/generated/TypeBound/TypeBound_getTy.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/TypeBound/TypeBound_getTy.ql b/rust/ql/test/extractor-tests/generated/TypeBound/TypeBound_getTy.ql
new file mode 100644
index 00000000000..56c8f92d433
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/TypeBound/TypeBound_getTy.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from TypeBound x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getTy()
diff --git a/rust/ql/test/extractor-tests/generated/TypeBound/gen_type_bound.rs b/rust/ql/test/extractor-tests/generated/TypeBound/gen_type_bound.rs
new file mode 100644
index 00000000000..a5ee2af2236
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/TypeBound/gen_type_bound.rs
@@ -0,0 +1,6 @@
+// generated by codegen, do not edit
+
+fn test_type_bound() -> () {
+    // A TypeBound. For example:
+    todo!()
+}
diff --git a/rust/ql/test/extractor-tests/generated/TypeBoundList/TypeBoundList.expected b/rust/ql/test/extractor-tests/generated/TypeBoundList/TypeBoundList.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/TypeBoundList/TypeBoundList.ql b/rust/ql/test/extractor-tests/generated/TypeBoundList/TypeBoundList.ql
new file mode 100644
index 00000000000..c5da2906153
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/TypeBoundList/TypeBoundList.ql
@@ -0,0 +1,10 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from TypeBoundList x, int getNumberOfBounds
+where
+  toBeTested(x) and
+  not x.isUnknown() and
+  getNumberOfBounds = x.getNumberOfBounds()
+select x, "getNumberOfBounds:", getNumberOfBounds
diff --git a/rust/ql/test/extractor-tests/generated/TypeBoundList/TypeBoundList_getBound.expected b/rust/ql/test/extractor-tests/generated/TypeBoundList/TypeBoundList_getBound.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/TypeBoundList/TypeBoundList_getBound.ql b/rust/ql/test/extractor-tests/generated/TypeBoundList/TypeBoundList_getBound.ql
new file mode 100644
index 00000000000..d06ceb53fae
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/TypeBoundList/TypeBoundList_getBound.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from TypeBoundList x, int index
+where toBeTested(x) and not x.isUnknown()
+select x, index, x.getBound(index)
diff --git a/rust/ql/test/extractor-tests/generated/TypeBoundList/gen_type_bound_list.rs b/rust/ql/test/extractor-tests/generated/TypeBoundList/gen_type_bound_list.rs
new file mode 100644
index 00000000000..aa2c2992225
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/TypeBoundList/gen_type_bound_list.rs
@@ -0,0 +1,6 @@
+// generated by codegen, do not edit
+
+fn test_type_bound_list() -> () {
+    // A TypeBoundList. For example:
+    todo!()
+}
diff --git a/rust/ql/test/extractor-tests/generated/TypeParam/TypeParam.expected b/rust/ql/test/extractor-tests/generated/TypeParam/TypeParam.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/TypeParam/TypeParam.ql b/rust/ql/test/extractor-tests/generated/TypeParam/TypeParam.ql
new file mode 100644
index 00000000000..d81ec72681c
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/TypeParam/TypeParam.ql
@@ -0,0 +1,15 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from
+  TypeParam x, int getNumberOfAttrs, string hasDefaultType, string hasName, string hasTypeBoundList
+where
+  toBeTested(x) and
+  not x.isUnknown() and
+  getNumberOfAttrs = x.getNumberOfAttrs() and
+  (if x.hasDefaultType() then hasDefaultType = "yes" else hasDefaultType = "no") and
+  (if x.hasName() then hasName = "yes" else hasName = "no") and
+  if x.hasTypeBoundList() then hasTypeBoundList = "yes" else hasTypeBoundList = "no"
+select x, "getNumberOfAttrs:", getNumberOfAttrs, "hasDefaultType:", hasDefaultType, "hasName:",
+  hasName, "hasTypeBoundList:", hasTypeBoundList
diff --git a/rust/ql/test/extractor-tests/generated/TypeParam/TypeParam_getAttr.expected b/rust/ql/test/extractor-tests/generated/TypeParam/TypeParam_getAttr.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/TypeParam/TypeParam_getAttr.ql b/rust/ql/test/extractor-tests/generated/TypeParam/TypeParam_getAttr.ql
new file mode 100644
index 00000000000..fdbefc1b5bd
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/TypeParam/TypeParam_getAttr.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from TypeParam x, int index
+where toBeTested(x) and not x.isUnknown()
+select x, index, x.getAttr(index)
diff --git a/rust/ql/test/extractor-tests/generated/TypeParam/TypeParam_getDefaultType.expected b/rust/ql/test/extractor-tests/generated/TypeParam/TypeParam_getDefaultType.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/TypeParam/TypeParam_getDefaultType.ql b/rust/ql/test/extractor-tests/generated/TypeParam/TypeParam_getDefaultType.ql
new file mode 100644
index 00000000000..8afef31826a
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/TypeParam/TypeParam_getDefaultType.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from TypeParam x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getDefaultType()
diff --git a/rust/ql/test/extractor-tests/generated/TypeParam/TypeParam_getName.expected b/rust/ql/test/extractor-tests/generated/TypeParam/TypeParam_getName.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/TypeParam/TypeParam_getName.ql b/rust/ql/test/extractor-tests/generated/TypeParam/TypeParam_getName.ql
new file mode 100644
index 00000000000..37b18a8b39c
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/TypeParam/TypeParam_getName.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from TypeParam x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getName()
diff --git a/rust/ql/test/extractor-tests/generated/TypeParam/TypeParam_getTypeBoundList.expected b/rust/ql/test/extractor-tests/generated/TypeParam/TypeParam_getTypeBoundList.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/TypeParam/TypeParam_getTypeBoundList.ql b/rust/ql/test/extractor-tests/generated/TypeParam/TypeParam_getTypeBoundList.ql
new file mode 100644
index 00000000000..b496a7793a6
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/TypeParam/TypeParam_getTypeBoundList.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from TypeParam x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getTypeBoundList()
diff --git a/rust/ql/test/extractor-tests/generated/TypeParam/gen_type_param.rs b/rust/ql/test/extractor-tests/generated/TypeParam/gen_type_param.rs
new file mode 100644
index 00000000000..6d5dbf5dd39
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/TypeParam/gen_type_param.rs
@@ -0,0 +1,6 @@
+// generated by codegen, do not edit
+
+fn test_type_param() -> () {
+    // A TypeParam. For example:
+    todo!()
+}
diff --git a/rust/ql/test/extractor-tests/generated/TypeRef/TypeRef.expected b/rust/ql/test/extractor-tests/generated/TypeRef/TypeRef.expected
deleted file mode 100644
index af51fa0b603..00000000000
--- a/rust/ql/test/extractor-tests/generated/TypeRef/TypeRef.expected
+++ /dev/null
@@ -1,3 +0,0 @@
-| file://:0:0:0:0 | TypeRef |
-| file://:0:0:0:0 | TypeRef |
-| file://:0:0:0:0 | TypeRef |
diff --git a/rust/ql/test/extractor-tests/generated/TypeRef/gen_type_ref.rs b/rust/ql/test/extractor-tests/generated/TypeRef/gen_type_ref.rs
deleted file mode 100644
index 0c7c71df235..00000000000
--- a/rust/ql/test/extractor-tests/generated/TypeRef/gen_type_ref.rs
+++ /dev/null
@@ -1,8 +0,0 @@
-// generated by codegen, do not edit
-
-fn test_type_ref() -> () {
-    // The base class for type references.
-    let x: i32;
-    let y: Vec<i32>;
-    let z: Option<i32>;
-}
diff --git a/rust/ql/test/extractor-tests/generated/UnderscoreExpr/UnderscoreExpr.expected b/rust/ql/test/extractor-tests/generated/UnderscoreExpr/UnderscoreExpr.expected
index b81aa1f81b0..3b2effb788e 100644
--- a/rust/ql/test/extractor-tests/generated/UnderscoreExpr/UnderscoreExpr.expected
+++ b/rust/ql/test/extractor-tests/generated/UnderscoreExpr/UnderscoreExpr.expected
@@ -1 +1 @@
-| gen_underscore_expr.rs:5:5:5:5 | UnderscoreExpr |
+| gen_underscore_expr.rs:5:5:5:5 | UnderscoreExpr | getNumberOfAttrs: | 0 |
diff --git a/rust/ql/test/extractor-tests/generated/UnderscoreExpr/UnderscoreExpr.ql b/rust/ql/test/extractor-tests/generated/UnderscoreExpr/UnderscoreExpr.ql
index c3ad706b805..1dc793e9d6e 100644
--- a/rust/ql/test/extractor-tests/generated/UnderscoreExpr/UnderscoreExpr.ql
+++ b/rust/ql/test/extractor-tests/generated/UnderscoreExpr/UnderscoreExpr.ql
@@ -2,6 +2,9 @@
 import codeql.rust.elements
 import TestUtils
 
-from UnderscoreExpr x
-where toBeTested(x) and not x.isUnknown()
-select x
+from UnderscoreExpr x, int getNumberOfAttrs
+where
+  toBeTested(x) and
+  not x.isUnknown() and
+  getNumberOfAttrs = x.getNumberOfAttrs()
+select x, "getNumberOfAttrs:", getNumberOfAttrs
diff --git a/rust/ql/test/extractor-tests/generated/UnderscoreExpr/UnderscoreExpr_getAttr.expected b/rust/ql/test/extractor-tests/generated/UnderscoreExpr/UnderscoreExpr_getAttr.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/UnderscoreExpr/UnderscoreExpr_getAttr.ql b/rust/ql/test/extractor-tests/generated/UnderscoreExpr/UnderscoreExpr_getAttr.ql
new file mode 100644
index 00000000000..8b2b16e2904
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/UnderscoreExpr/UnderscoreExpr_getAttr.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from UnderscoreExpr x, int index
+where toBeTested(x) and not x.isUnknown()
+select x, index, x.getAttr(index)
diff --git a/rust/ql/test/extractor-tests/generated/Union/Union.expected b/rust/ql/test/extractor-tests/generated/Union/Union.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/Union/Union.ql b/rust/ql/test/extractor-tests/generated/Union/Union.ql
new file mode 100644
index 00000000000..0f0e0872d9d
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/Union/Union.ql
@@ -0,0 +1,27 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from
+  Union x, string hasExtendedCanonicalPath, string hasCrateOrigin, int getNumberOfAttrs,
+  string hasGenericParamList, string hasName, string hasRecordFieldList, string hasVisibility,
+  string hasWhereClause
+where
+  toBeTested(x) and
+  not x.isUnknown() and
+  (
+    if x.hasExtendedCanonicalPath()
+    then hasExtendedCanonicalPath = "yes"
+    else hasExtendedCanonicalPath = "no"
+  ) and
+  (if x.hasCrateOrigin() then hasCrateOrigin = "yes" else hasCrateOrigin = "no") and
+  getNumberOfAttrs = x.getNumberOfAttrs() and
+  (if x.hasGenericParamList() then hasGenericParamList = "yes" else hasGenericParamList = "no") and
+  (if x.hasName() then hasName = "yes" else hasName = "no") and
+  (if x.hasRecordFieldList() then hasRecordFieldList = "yes" else hasRecordFieldList = "no") and
+  (if x.hasVisibility() then hasVisibility = "yes" else hasVisibility = "no") and
+  if x.hasWhereClause() then hasWhereClause = "yes" else hasWhereClause = "no"
+select x, "hasExtendedCanonicalPath:", hasExtendedCanonicalPath, "hasCrateOrigin:", hasCrateOrigin,
+  "getNumberOfAttrs:", getNumberOfAttrs, "hasGenericParamList:", hasGenericParamList, "hasName:",
+  hasName, "hasRecordFieldList:", hasRecordFieldList, "hasVisibility:", hasVisibility,
+  "hasWhereClause:", hasWhereClause
diff --git a/rust/ql/test/extractor-tests/generated/Union/Union_getAttr.expected b/rust/ql/test/extractor-tests/generated/Union/Union_getAttr.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/Union/Union_getAttr.ql b/rust/ql/test/extractor-tests/generated/Union/Union_getAttr.ql
new file mode 100644
index 00000000000..a4ae6761d23
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/Union/Union_getAttr.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from Union x, int index
+where toBeTested(x) and not x.isUnknown()
+select x, index, x.getAttr(index)
diff --git a/rust/ql/test/extractor-tests/generated/Union/Union_getCrateOrigin.expected b/rust/ql/test/extractor-tests/generated/Union/Union_getCrateOrigin.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/Union/Union_getCrateOrigin.ql b/rust/ql/test/extractor-tests/generated/Union/Union_getCrateOrigin.ql
new file mode 100644
index 00000000000..fdbd56d9e88
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/Union/Union_getCrateOrigin.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from Union x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getCrateOrigin()
diff --git a/rust/ql/test/extractor-tests/generated/Union/Union_getExtendedCanonicalPath.expected b/rust/ql/test/extractor-tests/generated/Union/Union_getExtendedCanonicalPath.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/Union/Union_getExtendedCanonicalPath.ql b/rust/ql/test/extractor-tests/generated/Union/Union_getExtendedCanonicalPath.ql
new file mode 100644
index 00000000000..fb20efa8f29
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/Union/Union_getExtendedCanonicalPath.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from Union x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getExtendedCanonicalPath()
diff --git a/rust/ql/test/extractor-tests/generated/Union/Union_getGenericParamList.expected b/rust/ql/test/extractor-tests/generated/Union/Union_getGenericParamList.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/Union/Union_getGenericParamList.ql b/rust/ql/test/extractor-tests/generated/Union/Union_getGenericParamList.ql
new file mode 100644
index 00000000000..e9ba2bbeef6
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/Union/Union_getGenericParamList.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from Union x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getGenericParamList()
diff --git a/rust/ql/test/extractor-tests/generated/Union/Union_getName.expected b/rust/ql/test/extractor-tests/generated/Union/Union_getName.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/Union/Union_getName.ql b/rust/ql/test/extractor-tests/generated/Union/Union_getName.ql
new file mode 100644
index 00000000000..e452a2ff63e
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/Union/Union_getName.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from Union x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getName()
diff --git a/rust/ql/test/extractor-tests/generated/Union/Union_getRecordFieldList.expected b/rust/ql/test/extractor-tests/generated/Union/Union_getRecordFieldList.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/Union/Union_getRecordFieldList.ql b/rust/ql/test/extractor-tests/generated/Union/Union_getRecordFieldList.ql
new file mode 100644
index 00000000000..3248a16d286
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/Union/Union_getRecordFieldList.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from Union x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getRecordFieldList()
diff --git a/rust/ql/test/extractor-tests/generated/Union/Union_getVisibility.expected b/rust/ql/test/extractor-tests/generated/Union/Union_getVisibility.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/Union/Union_getVisibility.ql b/rust/ql/test/extractor-tests/generated/Union/Union_getVisibility.ql
new file mode 100644
index 00000000000..5b1688250a5
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/Union/Union_getVisibility.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from Union x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getVisibility()
diff --git a/rust/ql/test/extractor-tests/generated/Union/Union_getWhereClause.expected b/rust/ql/test/extractor-tests/generated/Union/Union_getWhereClause.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/Union/Union_getWhereClause.ql b/rust/ql/test/extractor-tests/generated/Union/Union_getWhereClause.ql
new file mode 100644
index 00000000000..083aea2ba01
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/Union/Union_getWhereClause.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from Union x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getWhereClause()
diff --git a/rust/ql/test/extractor-tests/generated/Union/gen_union.rs b/rust/ql/test/extractor-tests/generated/Union/gen_union.rs
new file mode 100644
index 00000000000..ef74acf7f60
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/Union/gen_union.rs
@@ -0,0 +1,6 @@
+// generated by codegen, do not edit
+
+fn test_union() -> () {
+    // A Union. For example:
+    todo!()
+}
diff --git a/rust/ql/test/extractor-tests/generated/UnsafeBlockExpr/UnsafeBlockExpr.expected b/rust/ql/test/extractor-tests/generated/UnsafeBlockExpr/UnsafeBlockExpr.expected
deleted file mode 100644
index 2fb952294e6..00000000000
--- a/rust/ql/test/extractor-tests/generated/UnsafeBlockExpr/UnsafeBlockExpr.expected
+++ /dev/null
@@ -1 +0,0 @@
-| gen_unsafe_block_expr.rs:5:18:8:5 | UnsafeBlockExpr | getNumberOfStatements: | 1 | hasTail: | yes |
diff --git a/rust/ql/test/extractor-tests/generated/UnsafeBlockExpr/UnsafeBlockExpr.ql b/rust/ql/test/extractor-tests/generated/UnsafeBlockExpr/UnsafeBlockExpr.ql
deleted file mode 100644
index 30da2bbc0ef..00000000000
--- a/rust/ql/test/extractor-tests/generated/UnsafeBlockExpr/UnsafeBlockExpr.ql
+++ /dev/null
@@ -1,11 +0,0 @@
-// generated by codegen, do not edit
-import codeql.rust.elements
-import TestUtils
-
-from UnsafeBlockExpr x, int getNumberOfStatements, string hasTail
-where
-  toBeTested(x) and
-  not x.isUnknown() and
-  getNumberOfStatements = x.getNumberOfStatements() and
-  if x.hasTail() then hasTail = "yes" else hasTail = "no"
-select x, "getNumberOfStatements:", getNumberOfStatements, "hasTail:", hasTail
diff --git a/rust/ql/test/extractor-tests/generated/UnsafeBlockExpr/UnsafeBlockExpr_getStatement.expected b/rust/ql/test/extractor-tests/generated/UnsafeBlockExpr/UnsafeBlockExpr_getStatement.expected
deleted file mode 100644
index a9c91832300..00000000000
--- a/rust/ql/test/extractor-tests/generated/UnsafeBlockExpr/UnsafeBlockExpr_getStatement.expected
+++ /dev/null
@@ -1 +0,0 @@
-| gen_unsafe_block_expr.rs:5:18:8:5 | UnsafeBlockExpr | 0 | gen_unsafe_block_expr.rs:6:13:6:13 | LetStmt |
diff --git a/rust/ql/test/extractor-tests/generated/UnsafeBlockExpr/UnsafeBlockExpr_getStatement.ql b/rust/ql/test/extractor-tests/generated/UnsafeBlockExpr/UnsafeBlockExpr_getStatement.ql
deleted file mode 100644
index 5fa1d4ad779..00000000000
--- a/rust/ql/test/extractor-tests/generated/UnsafeBlockExpr/UnsafeBlockExpr_getStatement.ql
+++ /dev/null
@@ -1,7 +0,0 @@
-// generated by codegen, do not edit
-import codeql.rust.elements
-import TestUtils
-
-from UnsafeBlockExpr x, int index
-where toBeTested(x) and not x.isUnknown()
-select x, index, x.getStatement(index)
diff --git a/rust/ql/test/extractor-tests/generated/UnsafeBlockExpr/UnsafeBlockExpr_getTail.expected b/rust/ql/test/extractor-tests/generated/UnsafeBlockExpr/UnsafeBlockExpr_getTail.expected
deleted file mode 100644
index c0d12ae28a5..00000000000
--- a/rust/ql/test/extractor-tests/generated/UnsafeBlockExpr/UnsafeBlockExpr_getTail.expected
+++ /dev/null
@@ -1 +0,0 @@
-| gen_unsafe_block_expr.rs:5:18:8:5 | UnsafeBlockExpr | gen_unsafe_block_expr.rs:7:9:7:54 | CallExpr |
diff --git a/rust/ql/test/extractor-tests/generated/UnsafeBlockExpr/UnsafeBlockExpr_getTail.ql b/rust/ql/test/extractor-tests/generated/UnsafeBlockExpr/UnsafeBlockExpr_getTail.ql
deleted file mode 100644
index 24ed95ca9b1..00000000000
--- a/rust/ql/test/extractor-tests/generated/UnsafeBlockExpr/UnsafeBlockExpr_getTail.ql
+++ /dev/null
@@ -1,7 +0,0 @@
-// generated by codegen, do not edit
-import codeql.rust.elements
-import TestUtils
-
-from UnsafeBlockExpr x
-where toBeTested(x) and not x.isUnknown()
-select x, x.getTail()
diff --git a/rust/ql/test/extractor-tests/generated/UnsafeBlockExpr/gen_unsafe_block_expr.rs b/rust/ql/test/extractor-tests/generated/UnsafeBlockExpr/gen_unsafe_block_expr.rs
deleted file mode 100644
index 0beaf5ef644..00000000000
--- a/rust/ql/test/extractor-tests/generated/UnsafeBlockExpr/gen_unsafe_block_expr.rs
+++ /dev/null
@@ -1,9 +0,0 @@
-// generated by codegen, do not edit
-
-fn test_unsafe_block_expr() -> () {
-    // An unsafe block expression. For example:
-    let layout = unsafe {
-        let x = 42;
-        Layout::from_size_align_unchecked(size, align)
-    };
-}
diff --git a/rust/ql/test/extractor-tests/generated/Use/Use.expected b/rust/ql/test/extractor-tests/generated/Use/Use.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/Use/Use.ql b/rust/ql/test/extractor-tests/generated/Use/Use.ql
new file mode 100644
index 00000000000..b88b3a69332
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/Use/Use.ql
@@ -0,0 +1,21 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from
+  Use x, string hasExtendedCanonicalPath, string hasCrateOrigin, int getNumberOfAttrs,
+  string hasUseTree, string hasVisibility
+where
+  toBeTested(x) and
+  not x.isUnknown() and
+  (
+    if x.hasExtendedCanonicalPath()
+    then hasExtendedCanonicalPath = "yes"
+    else hasExtendedCanonicalPath = "no"
+  ) and
+  (if x.hasCrateOrigin() then hasCrateOrigin = "yes" else hasCrateOrigin = "no") and
+  getNumberOfAttrs = x.getNumberOfAttrs() and
+  (if x.hasUseTree() then hasUseTree = "yes" else hasUseTree = "no") and
+  if x.hasVisibility() then hasVisibility = "yes" else hasVisibility = "no"
+select x, "hasExtendedCanonicalPath:", hasExtendedCanonicalPath, "hasCrateOrigin:", hasCrateOrigin,
+  "getNumberOfAttrs:", getNumberOfAttrs, "hasUseTree:", hasUseTree, "hasVisibility:", hasVisibility
diff --git a/rust/ql/test/extractor-tests/generated/Use/Use_getAttr.expected b/rust/ql/test/extractor-tests/generated/Use/Use_getAttr.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/Use/Use_getAttr.ql b/rust/ql/test/extractor-tests/generated/Use/Use_getAttr.ql
new file mode 100644
index 00000000000..35b975fa0e6
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/Use/Use_getAttr.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from Use x, int index
+where toBeTested(x) and not x.isUnknown()
+select x, index, x.getAttr(index)
diff --git a/rust/ql/test/extractor-tests/generated/Use/Use_getCrateOrigin.expected b/rust/ql/test/extractor-tests/generated/Use/Use_getCrateOrigin.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/Use/Use_getCrateOrigin.ql b/rust/ql/test/extractor-tests/generated/Use/Use_getCrateOrigin.ql
new file mode 100644
index 00000000000..8e90afcc335
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/Use/Use_getCrateOrigin.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from Use x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getCrateOrigin()
diff --git a/rust/ql/test/extractor-tests/generated/Use/Use_getExtendedCanonicalPath.expected b/rust/ql/test/extractor-tests/generated/Use/Use_getExtendedCanonicalPath.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/Use/Use_getExtendedCanonicalPath.ql b/rust/ql/test/extractor-tests/generated/Use/Use_getExtendedCanonicalPath.ql
new file mode 100644
index 00000000000..64c633c6c7d
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/Use/Use_getExtendedCanonicalPath.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from Use x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getExtendedCanonicalPath()
diff --git a/rust/ql/test/extractor-tests/generated/Use/Use_getUseTree.expected b/rust/ql/test/extractor-tests/generated/Use/Use_getUseTree.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/Use/Use_getUseTree.ql b/rust/ql/test/extractor-tests/generated/Use/Use_getUseTree.ql
new file mode 100644
index 00000000000..863d1617d40
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/Use/Use_getUseTree.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from Use x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getUseTree()
diff --git a/rust/ql/test/extractor-tests/generated/Use/Use_getVisibility.expected b/rust/ql/test/extractor-tests/generated/Use/Use_getVisibility.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/Use/Use_getVisibility.ql b/rust/ql/test/extractor-tests/generated/Use/Use_getVisibility.ql
new file mode 100644
index 00000000000..122499de581
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/Use/Use_getVisibility.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from Use x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getVisibility()
diff --git a/rust/ql/test/extractor-tests/generated/Use/gen_use.rs b/rust/ql/test/extractor-tests/generated/Use/gen_use.rs
new file mode 100644
index 00000000000..c61de79f9ff
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/Use/gen_use.rs
@@ -0,0 +1,6 @@
+// generated by codegen, do not edit
+
+fn test_use() -> () {
+    // A Use. For example:
+    todo!()
+}
diff --git a/rust/ql/test/extractor-tests/generated/UseTree/UseTree.expected b/rust/ql/test/extractor-tests/generated/UseTree/UseTree.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/UseTree/UseTree.ql b/rust/ql/test/extractor-tests/generated/UseTree/UseTree.ql
new file mode 100644
index 00000000000..e536bed9de0
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/UseTree/UseTree.ql
@@ -0,0 +1,12 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from UseTree x, string hasPath, string hasRename, string hasUseTreeList
+where
+  toBeTested(x) and
+  not x.isUnknown() and
+  (if x.hasPath() then hasPath = "yes" else hasPath = "no") and
+  (if x.hasRename() then hasRename = "yes" else hasRename = "no") and
+  if x.hasUseTreeList() then hasUseTreeList = "yes" else hasUseTreeList = "no"
+select x, "hasPath:", hasPath, "hasRename:", hasRename, "hasUseTreeList:", hasUseTreeList
diff --git a/rust/ql/test/extractor-tests/generated/UseTree/UseTree_getPath.expected b/rust/ql/test/extractor-tests/generated/UseTree/UseTree_getPath.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/UseTree/UseTree_getPath.ql b/rust/ql/test/extractor-tests/generated/UseTree/UseTree_getPath.ql
new file mode 100644
index 00000000000..74f892d46f8
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/UseTree/UseTree_getPath.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from UseTree x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getPath()
diff --git a/rust/ql/test/extractor-tests/generated/UseTree/UseTree_getRename.expected b/rust/ql/test/extractor-tests/generated/UseTree/UseTree_getRename.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/UseTree/UseTree_getRename.ql b/rust/ql/test/extractor-tests/generated/UseTree/UseTree_getRename.ql
new file mode 100644
index 00000000000..754d167eefd
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/UseTree/UseTree_getRename.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from UseTree x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getRename()
diff --git a/rust/ql/test/extractor-tests/generated/UseTree/UseTree_getUseTreeList.expected b/rust/ql/test/extractor-tests/generated/UseTree/UseTree_getUseTreeList.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/UseTree/UseTree_getUseTreeList.ql b/rust/ql/test/extractor-tests/generated/UseTree/UseTree_getUseTreeList.ql
new file mode 100644
index 00000000000..5e57b7a6b69
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/UseTree/UseTree_getUseTreeList.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from UseTree x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getUseTreeList()
diff --git a/rust/ql/test/extractor-tests/generated/UseTree/gen_use_tree.rs b/rust/ql/test/extractor-tests/generated/UseTree/gen_use_tree.rs
new file mode 100644
index 00000000000..f0a87b1a650
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/UseTree/gen_use_tree.rs
@@ -0,0 +1,6 @@
+// generated by codegen, do not edit
+
+fn test_use_tree() -> () {
+    // A UseTree. For example:
+    todo!()
+}
diff --git a/rust/ql/test/extractor-tests/generated/UseTreeList/UseTreeList.expected b/rust/ql/test/extractor-tests/generated/UseTreeList/UseTreeList.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/UseTreeList/UseTreeList.ql b/rust/ql/test/extractor-tests/generated/UseTreeList/UseTreeList.ql
new file mode 100644
index 00000000000..ebcfc59a58f
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/UseTreeList/UseTreeList.ql
@@ -0,0 +1,10 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from UseTreeList x, int getNumberOfUseTrees
+where
+  toBeTested(x) and
+  not x.isUnknown() and
+  getNumberOfUseTrees = x.getNumberOfUseTrees()
+select x, "getNumberOfUseTrees:", getNumberOfUseTrees
diff --git a/rust/ql/test/extractor-tests/generated/UseTreeList/UseTreeList_getUseTree.expected b/rust/ql/test/extractor-tests/generated/UseTreeList/UseTreeList_getUseTree.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/UseTreeList/UseTreeList_getUseTree.ql b/rust/ql/test/extractor-tests/generated/UseTreeList/UseTreeList_getUseTree.ql
new file mode 100644
index 00000000000..dc7262d7ab5
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/UseTreeList/UseTreeList_getUseTree.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from UseTreeList x, int index
+where toBeTested(x) and not x.isUnknown()
+select x, index, x.getUseTree(index)
diff --git a/rust/ql/test/extractor-tests/generated/UseTreeList/gen_use_tree_list.rs b/rust/ql/test/extractor-tests/generated/UseTreeList/gen_use_tree_list.rs
new file mode 100644
index 00000000000..dfbdef69408
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/UseTreeList/gen_use_tree_list.rs
@@ -0,0 +1,6 @@
+// generated by codegen, do not edit
+
+fn test_use_tree_list() -> () {
+    // A UseTreeList. For example:
+    todo!()
+}
diff --git a/rust/ql/test/extractor-tests/generated/Variant/Variant.expected b/rust/ql/test/extractor-tests/generated/Variant/Variant.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/Variant/Variant.ql b/rust/ql/test/extractor-tests/generated/Variant/Variant.ql
new file mode 100644
index 00000000000..2cbcd20cbf0
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/Variant/Variant.ql
@@ -0,0 +1,17 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from
+  Variant x, int getNumberOfAttrs, string hasExpr, string hasFieldList, string hasName,
+  string hasVisibility
+where
+  toBeTested(x) and
+  not x.isUnknown() and
+  getNumberOfAttrs = x.getNumberOfAttrs() and
+  (if x.hasExpr() then hasExpr = "yes" else hasExpr = "no") and
+  (if x.hasFieldList() then hasFieldList = "yes" else hasFieldList = "no") and
+  (if x.hasName() then hasName = "yes" else hasName = "no") and
+  if x.hasVisibility() then hasVisibility = "yes" else hasVisibility = "no"
+select x, "getNumberOfAttrs:", getNumberOfAttrs, "hasExpr:", hasExpr, "hasFieldList:", hasFieldList,
+  "hasName:", hasName, "hasVisibility:", hasVisibility
diff --git a/rust/ql/test/extractor-tests/generated/Variant/Variant_getAttr.expected b/rust/ql/test/extractor-tests/generated/Variant/Variant_getAttr.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/Variant/Variant_getAttr.ql b/rust/ql/test/extractor-tests/generated/Variant/Variant_getAttr.ql
new file mode 100644
index 00000000000..99972ef847d
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/Variant/Variant_getAttr.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from Variant x, int index
+where toBeTested(x) and not x.isUnknown()
+select x, index, x.getAttr(index)
diff --git a/rust/ql/test/extractor-tests/generated/Variant/Variant_getExpr.expected b/rust/ql/test/extractor-tests/generated/Variant/Variant_getExpr.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/Variant/Variant_getExpr.ql b/rust/ql/test/extractor-tests/generated/Variant/Variant_getExpr.ql
new file mode 100644
index 00000000000..3836c782dc9
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/Variant/Variant_getExpr.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from Variant x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getExpr()
diff --git a/rust/ql/test/extractor-tests/generated/Variant/Variant_getFieldList.expected b/rust/ql/test/extractor-tests/generated/Variant/Variant_getFieldList.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/Variant/Variant_getFieldList.ql b/rust/ql/test/extractor-tests/generated/Variant/Variant_getFieldList.ql
new file mode 100644
index 00000000000..e1bae7650ba
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/Variant/Variant_getFieldList.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from Variant x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getFieldList()
diff --git a/rust/ql/test/extractor-tests/generated/Variant/Variant_getName.expected b/rust/ql/test/extractor-tests/generated/Variant/Variant_getName.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/Variant/Variant_getName.ql b/rust/ql/test/extractor-tests/generated/Variant/Variant_getName.ql
new file mode 100644
index 00000000000..73f4ff33e40
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/Variant/Variant_getName.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from Variant x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getName()
diff --git a/rust/ql/test/extractor-tests/generated/Variant/Variant_getVisibility.expected b/rust/ql/test/extractor-tests/generated/Variant/Variant_getVisibility.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/Variant/Variant_getVisibility.ql b/rust/ql/test/extractor-tests/generated/Variant/Variant_getVisibility.ql
new file mode 100644
index 00000000000..7edb649fbda
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/Variant/Variant_getVisibility.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from Variant x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getVisibility()
diff --git a/rust/ql/test/extractor-tests/generated/Variant/gen_variant.rs b/rust/ql/test/extractor-tests/generated/Variant/gen_variant.rs
new file mode 100644
index 00000000000..37e7506e2bc
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/Variant/gen_variant.rs
@@ -0,0 +1,6 @@
+// generated by codegen, do not edit
+
+fn test_variant() -> () {
+    // A Variant. For example:
+    todo!()
+}
diff --git a/rust/ql/test/extractor-tests/generated/VariantList/VariantList.expected b/rust/ql/test/extractor-tests/generated/VariantList/VariantList.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/VariantList/VariantList.ql b/rust/ql/test/extractor-tests/generated/VariantList/VariantList.ql
new file mode 100644
index 00000000000..213e4d447dc
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/VariantList/VariantList.ql
@@ -0,0 +1,10 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from VariantList x, int getNumberOfVariants
+where
+  toBeTested(x) and
+  not x.isUnknown() and
+  getNumberOfVariants = x.getNumberOfVariants()
+select x, "getNumberOfVariants:", getNumberOfVariants
diff --git a/rust/ql/test/extractor-tests/generated/VariantList/VariantList_getVariant.expected b/rust/ql/test/extractor-tests/generated/VariantList/VariantList_getVariant.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/VariantList/VariantList_getVariant.ql b/rust/ql/test/extractor-tests/generated/VariantList/VariantList_getVariant.ql
new file mode 100644
index 00000000000..fe1800104a3
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/VariantList/VariantList_getVariant.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from VariantList x, int index
+where toBeTested(x) and not x.isUnknown()
+select x, index, x.getVariant(index)
diff --git a/rust/ql/test/extractor-tests/generated/VariantList/gen_variant_list.rs b/rust/ql/test/extractor-tests/generated/VariantList/gen_variant_list.rs
new file mode 100644
index 00000000000..c13f6430cc6
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/VariantList/gen_variant_list.rs
@@ -0,0 +1,6 @@
+// generated by codegen, do not edit
+
+fn test_variant_list() -> () {
+    // A VariantList. For example:
+    todo!()
+}
diff --git a/rust/ql/test/extractor-tests/generated/Visibility/Visibility.expected b/rust/ql/test/extractor-tests/generated/Visibility/Visibility.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/Visibility/Visibility.ql b/rust/ql/test/extractor-tests/generated/Visibility/Visibility.ql
new file mode 100644
index 00000000000..adf0833c12c
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/Visibility/Visibility.ql
@@ -0,0 +1,10 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from Visibility x, string hasPath
+where
+  toBeTested(x) and
+  not x.isUnknown() and
+  if x.hasPath() then hasPath = "yes" else hasPath = "no"
+select x, "hasPath:", hasPath
diff --git a/rust/ql/test/extractor-tests/generated/Visibility/Visibility_getPath.expected b/rust/ql/test/extractor-tests/generated/Visibility/Visibility_getPath.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/Visibility/Visibility_getPath.ql b/rust/ql/test/extractor-tests/generated/Visibility/Visibility_getPath.ql
new file mode 100644
index 00000000000..0f0b641d212
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/Visibility/Visibility_getPath.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from Visibility x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getPath()
diff --git a/rust/ql/test/extractor-tests/generated/Visibility/gen_visibility.rs b/rust/ql/test/extractor-tests/generated/Visibility/gen_visibility.rs
new file mode 100644
index 00000000000..5dbc762f3e7
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/Visibility/gen_visibility.rs
@@ -0,0 +1,6 @@
+// generated by codegen, do not edit
+
+fn test_visibility() -> () {
+    // A Visibility. For example:
+    todo!()
+}
diff --git a/rust/ql/test/extractor-tests/generated/WhereClause/WhereClause.expected b/rust/ql/test/extractor-tests/generated/WhereClause/WhereClause.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/WhereClause/WhereClause.ql b/rust/ql/test/extractor-tests/generated/WhereClause/WhereClause.ql
new file mode 100644
index 00000000000..891b8d55fc2
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/WhereClause/WhereClause.ql
@@ -0,0 +1,10 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from WhereClause x, int getNumberOfPredicates
+where
+  toBeTested(x) and
+  not x.isUnknown() and
+  getNumberOfPredicates = x.getNumberOfPredicates()
+select x, "getNumberOfPredicates:", getNumberOfPredicates
diff --git a/rust/ql/test/extractor-tests/generated/WhereClause/WhereClause_getPredicate.expected b/rust/ql/test/extractor-tests/generated/WhereClause/WhereClause_getPredicate.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/WhereClause/WhereClause_getPredicate.ql b/rust/ql/test/extractor-tests/generated/WhereClause/WhereClause_getPredicate.ql
new file mode 100644
index 00000000000..4b0c8ab7b7d
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/WhereClause/WhereClause_getPredicate.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from WhereClause x, int index
+where toBeTested(x) and not x.isUnknown()
+select x, index, x.getPredicate(index)
diff --git a/rust/ql/test/extractor-tests/generated/WhereClause/gen_where_clause.rs b/rust/ql/test/extractor-tests/generated/WhereClause/gen_where_clause.rs
new file mode 100644
index 00000000000..ef389c9ee4f
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/WhereClause/gen_where_clause.rs
@@ -0,0 +1,6 @@
+// generated by codegen, do not edit
+
+fn test_where_clause() -> () {
+    // A WhereClause. For example:
+    todo!()
+}
diff --git a/rust/ql/test/extractor-tests/generated/WherePred/WherePred.expected b/rust/ql/test/extractor-tests/generated/WherePred/WherePred.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/WherePred/WherePred.ql b/rust/ql/test/extractor-tests/generated/WherePred/WherePred.ql
new file mode 100644
index 00000000000..40d5072725d
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/WherePred/WherePred.ql
@@ -0,0 +1,15 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from
+  WherePred x, string hasGenericParamList, string hasLifetime, string hasTy, string hasTypeBoundList
+where
+  toBeTested(x) and
+  not x.isUnknown() and
+  (if x.hasGenericParamList() then hasGenericParamList = "yes" else hasGenericParamList = "no") and
+  (if x.hasLifetime() then hasLifetime = "yes" else hasLifetime = "no") and
+  (if x.hasTy() then hasTy = "yes" else hasTy = "no") and
+  if x.hasTypeBoundList() then hasTypeBoundList = "yes" else hasTypeBoundList = "no"
+select x, "hasGenericParamList:", hasGenericParamList, "hasLifetime:", hasLifetime, "hasTy:", hasTy,
+  "hasTypeBoundList:", hasTypeBoundList
diff --git a/rust/ql/test/extractor-tests/generated/WherePred/WherePred_getGenericParamList.expected b/rust/ql/test/extractor-tests/generated/WherePred/WherePred_getGenericParamList.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/WherePred/WherePred_getGenericParamList.ql b/rust/ql/test/extractor-tests/generated/WherePred/WherePred_getGenericParamList.ql
new file mode 100644
index 00000000000..ef15cd7f4f8
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/WherePred/WherePred_getGenericParamList.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from WherePred x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getGenericParamList()
diff --git a/rust/ql/test/extractor-tests/generated/WherePred/WherePred_getLifetime.expected b/rust/ql/test/extractor-tests/generated/WherePred/WherePred_getLifetime.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/WherePred/WherePred_getLifetime.ql b/rust/ql/test/extractor-tests/generated/WherePred/WherePred_getLifetime.ql
new file mode 100644
index 00000000000..a0bd226ca4f
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/WherePred/WherePred_getLifetime.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from WherePred x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getLifetime()
diff --git a/rust/ql/test/extractor-tests/generated/WherePred/WherePred_getTy.expected b/rust/ql/test/extractor-tests/generated/WherePred/WherePred_getTy.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/WherePred/WherePred_getTy.ql b/rust/ql/test/extractor-tests/generated/WherePred/WherePred_getTy.ql
new file mode 100644
index 00000000000..bbb432ddbe7
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/WherePred/WherePred_getTy.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from WherePred x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getTy()
diff --git a/rust/ql/test/extractor-tests/generated/WherePred/WherePred_getTypeBoundList.expected b/rust/ql/test/extractor-tests/generated/WherePred/WherePred_getTypeBoundList.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/WherePred/WherePred_getTypeBoundList.ql b/rust/ql/test/extractor-tests/generated/WherePred/WherePred_getTypeBoundList.ql
new file mode 100644
index 00000000000..0f269fa9140
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/WherePred/WherePred_getTypeBoundList.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from WherePred x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getTypeBoundList()
diff --git a/rust/ql/test/extractor-tests/generated/WherePred/gen_where_pred.rs b/rust/ql/test/extractor-tests/generated/WherePred/gen_where_pred.rs
new file mode 100644
index 00000000000..781d4697e20
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/WherePred/gen_where_pred.rs
@@ -0,0 +1,6 @@
+// generated by codegen, do not edit
+
+fn test_where_pred() -> () {
+    // A WherePred. For example:
+    todo!()
+}
diff --git a/rust/ql/test/extractor-tests/generated/WhileExpr/WhileExpr.expected b/rust/ql/test/extractor-tests/generated/WhileExpr/WhileExpr.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/WhileExpr/WhileExpr.ql b/rust/ql/test/extractor-tests/generated/WhileExpr/WhileExpr.ql
new file mode 100644
index 00000000000..ceb095e9d20
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/WhileExpr/WhileExpr.ql
@@ -0,0 +1,14 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from WhileExpr x, int getNumberOfAttrs, string hasCondition, string hasLabel, string hasLoopBody
+where
+  toBeTested(x) and
+  not x.isUnknown() and
+  getNumberOfAttrs = x.getNumberOfAttrs() and
+  (if x.hasCondition() then hasCondition = "yes" else hasCondition = "no") and
+  (if x.hasLabel() then hasLabel = "yes" else hasLabel = "no") and
+  if x.hasLoopBody() then hasLoopBody = "yes" else hasLoopBody = "no"
+select x, "getNumberOfAttrs:", getNumberOfAttrs, "hasCondition:", hasCondition, "hasLabel:",
+  hasLabel, "hasLoopBody:", hasLoopBody
diff --git a/rust/ql/test/extractor-tests/generated/WhileExpr/WhileExpr_getAttr.expected b/rust/ql/test/extractor-tests/generated/WhileExpr/WhileExpr_getAttr.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/WhileExpr/WhileExpr_getAttr.ql b/rust/ql/test/extractor-tests/generated/WhileExpr/WhileExpr_getAttr.ql
new file mode 100644
index 00000000000..eeb05dcc0b0
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/WhileExpr/WhileExpr_getAttr.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from WhileExpr x, int index
+where toBeTested(x) and not x.isUnknown()
+select x, index, x.getAttr(index)
diff --git a/rust/ql/test/extractor-tests/generated/WhileExpr/WhileExpr_getCondition.expected b/rust/ql/test/extractor-tests/generated/WhileExpr/WhileExpr_getCondition.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/WhileExpr/WhileExpr_getCondition.ql b/rust/ql/test/extractor-tests/generated/WhileExpr/WhileExpr_getCondition.ql
new file mode 100644
index 00000000000..184dc6f8a7c
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/WhileExpr/WhileExpr_getCondition.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from WhileExpr x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getCondition()
diff --git a/rust/ql/test/extractor-tests/generated/WhileExpr/WhileExpr_getLabel.expected b/rust/ql/test/extractor-tests/generated/WhileExpr/WhileExpr_getLabel.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/ContinueExpr/ContinueExpr_getLabel.ql b/rust/ql/test/extractor-tests/generated/WhileExpr/WhileExpr_getLabel.ql
similarity index 88%
rename from rust/ql/test/extractor-tests/generated/ContinueExpr/ContinueExpr_getLabel.ql
rename to rust/ql/test/extractor-tests/generated/WhileExpr/WhileExpr_getLabel.ql
index ecfccc42d65..59865e97014 100644
--- a/rust/ql/test/extractor-tests/generated/ContinueExpr/ContinueExpr_getLabel.ql
+++ b/rust/ql/test/extractor-tests/generated/WhileExpr/WhileExpr_getLabel.ql
@@ -2,6 +2,6 @@
 import codeql.rust.elements
 import TestUtils
 
-from ContinueExpr x
+from WhileExpr x
 where toBeTested(x) and not x.isUnknown()
 select x, x.getLabel()
diff --git a/rust/ql/test/extractor-tests/generated/WhileExpr/WhileExpr_getLoopBody.expected b/rust/ql/test/extractor-tests/generated/WhileExpr/WhileExpr_getLoopBody.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/WhileExpr/WhileExpr_getLoopBody.ql b/rust/ql/test/extractor-tests/generated/WhileExpr/WhileExpr_getLoopBody.ql
new file mode 100644
index 00000000000..3d19f2e7341
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/WhileExpr/WhileExpr_getLoopBody.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from WhileExpr x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getLoopBody()
diff --git a/rust/ql/test/extractor-tests/generated/WhileExpr/gen_while_expr.rs b/rust/ql/test/extractor-tests/generated/WhileExpr/gen_while_expr.rs
new file mode 100644
index 00000000000..5078a8a794f
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/WhileExpr/gen_while_expr.rs
@@ -0,0 +1,6 @@
+// generated by codegen, do not edit
+
+fn test_while_expr() -> () {
+    // A WhileExpr. For example:
+    todo!()
+}
diff --git a/rust/ql/test/extractor-tests/generated/YeetExpr/YeetExpr.expected b/rust/ql/test/extractor-tests/generated/YeetExpr/YeetExpr.expected
index bda4e84abfd..3bce2660fe3 100644
--- a/rust/ql/test/extractor-tests/generated/YeetExpr/YeetExpr.expected
+++ b/rust/ql/test/extractor-tests/generated/YeetExpr/YeetExpr.expected
@@ -1 +1 @@
-| gen_yeet_expr.rs:6:8:6:36 | YeetExpr | hasExpr: | yes |
+| gen_yeet_expr.rs:6:8:6:36 | YeetExpr | getNumberOfAttrs: | 0 | hasExpr: | yes |
diff --git a/rust/ql/test/extractor-tests/generated/YeetExpr/YeetExpr.ql b/rust/ql/test/extractor-tests/generated/YeetExpr/YeetExpr.ql
index 2b8d7e27610..165bd667d3c 100644
--- a/rust/ql/test/extractor-tests/generated/YeetExpr/YeetExpr.ql
+++ b/rust/ql/test/extractor-tests/generated/YeetExpr/YeetExpr.ql
@@ -2,9 +2,10 @@
 import codeql.rust.elements
 import TestUtils
 
-from YeetExpr x, string hasExpr
+from YeetExpr x, int getNumberOfAttrs, string hasExpr
 where
   toBeTested(x) and
   not x.isUnknown() and
+  getNumberOfAttrs = x.getNumberOfAttrs() and
   if x.hasExpr() then hasExpr = "yes" else hasExpr = "no"
-select x, "hasExpr:", hasExpr
+select x, "getNumberOfAttrs:", getNumberOfAttrs, "hasExpr:", hasExpr
diff --git a/rust/ql/test/extractor-tests/generated/YeetExpr/YeetExpr_getAttr.expected b/rust/ql/test/extractor-tests/generated/YeetExpr/YeetExpr_getAttr.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/YeetExpr/YeetExpr_getAttr.ql b/rust/ql/test/extractor-tests/generated/YeetExpr/YeetExpr_getAttr.ql
new file mode 100644
index 00000000000..a246607b779
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/YeetExpr/YeetExpr_getAttr.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from YeetExpr x, int index
+where toBeTested(x) and not x.isUnknown()
+select x, index, x.getAttr(index)
diff --git a/rust/ql/test/extractor-tests/generated/YeetExpr/YeetExpr_getExpr.expected b/rust/ql/test/extractor-tests/generated/YeetExpr/YeetExpr_getExpr.expected
index 074c6fbff74..e1d96684eec 100644
--- a/rust/ql/test/extractor-tests/generated/YeetExpr/YeetExpr_getExpr.expected
+++ b/rust/ql/test/extractor-tests/generated/YeetExpr/YeetExpr_getExpr.expected
@@ -1 +1 @@
-| gen_yeet_expr.rs:6:8:6:36 | YeetExpr | gen_yeet_expr.rs:6:16:6:36 | LiteralExpr |
+| gen_yeet_expr.rs:6:8:6:36 | YeetExpr | gen_yeet_expr.rs:6:16:6:36 | "index out of bounds" |
diff --git a/rust/ql/test/extractor-tests/generated/YieldExpr/YieldExpr.expected b/rust/ql/test/extractor-tests/generated/YieldExpr/YieldExpr.expected
index e897a88bb24..5045b11d25d 100644
--- a/rust/ql/test/extractor-tests/generated/YieldExpr/YieldExpr.expected
+++ b/rust/ql/test/extractor-tests/generated/YieldExpr/YieldExpr.expected
@@ -1 +1 @@
-| gen_yield_expr.rs:7:13:7:19 | YieldExpr | hasExpr: | yes |
+| gen_yield_expr.rs:7:13:7:19 | YieldExpr | getNumberOfAttrs: | 0 | hasExpr: | yes |
diff --git a/rust/ql/test/extractor-tests/generated/YieldExpr/YieldExpr.ql b/rust/ql/test/extractor-tests/generated/YieldExpr/YieldExpr.ql
index bec12938c91..47f32503bfc 100644
--- a/rust/ql/test/extractor-tests/generated/YieldExpr/YieldExpr.ql
+++ b/rust/ql/test/extractor-tests/generated/YieldExpr/YieldExpr.ql
@@ -2,9 +2,10 @@
 import codeql.rust.elements
 import TestUtils
 
-from YieldExpr x, string hasExpr
+from YieldExpr x, int getNumberOfAttrs, string hasExpr
 where
   toBeTested(x) and
   not x.isUnknown() and
+  getNumberOfAttrs = x.getNumberOfAttrs() and
   if x.hasExpr() then hasExpr = "yes" else hasExpr = "no"
-select x, "hasExpr:", hasExpr
+select x, "getNumberOfAttrs:", getNumberOfAttrs, "hasExpr:", hasExpr
diff --git a/rust/ql/test/extractor-tests/generated/YieldExpr/YieldExpr_getAttr.expected b/rust/ql/test/extractor-tests/generated/YieldExpr/YieldExpr_getAttr.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/generated/YieldExpr/YieldExpr_getAttr.ql b/rust/ql/test/extractor-tests/generated/YieldExpr/YieldExpr_getAttr.ql
new file mode 100644
index 00000000000..9c6b01bc228
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/YieldExpr/YieldExpr_getAttr.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from YieldExpr x, int index
+where toBeTested(x) and not x.isUnknown()
+select x, index, x.getAttr(index)
diff --git a/rust/ql/test/extractor-tests/generated/YieldExpr/YieldExpr_getExpr.expected b/rust/ql/test/extractor-tests/generated/YieldExpr/YieldExpr_getExpr.expected
index 87b88ef2419..96884087f9d 100644
--- a/rust/ql/test/extractor-tests/generated/YieldExpr/YieldExpr_getExpr.expected
+++ b/rust/ql/test/extractor-tests/generated/YieldExpr/YieldExpr_getExpr.expected
@@ -1 +1 @@
-| gen_yield_expr.rs:7:13:7:19 | YieldExpr | gen_yield_expr.rs:7:19:7:19 | LiteralExpr |
+| gen_yield_expr.rs:7:13:7:19 | YieldExpr | gen_yield_expr.rs:7:19:7:19 | 1 |
diff --git a/rust/ql/test/extractor-tests/generated/options.yml b/rust/ql/test/extractor-tests/generated/options.yml
new file mode 100644
index 00000000000..cf148dd35f8
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/options.yml
@@ -0,0 +1 @@
+qltest_cargo_check: false
diff --git a/rust/ql/test/extractor-tests/utf8/ast.expected b/rust/ql/test/extractor-tests/utf8/ast.expected
new file mode 100644
index 00000000000..dfc20f5ab58
--- /dev/null
+++ b/rust/ql/test/extractor-tests/utf8/ast.expected
@@ -0,0 +1,33 @@
+| lib.rs:1:1:1:21 | Module |
+| lib.rs:1:1:1:21 | SourceFile |
+| lib.rs:1:5:1:20 | utf8_identifiers |
+| utf8_identifiers.rs:1:1:4:6 | foo |
+| utf8_identifiers.rs:1:1:12:2 | SourceFile |
+| utf8_identifiers.rs:1:4:1:6 | foo |
+| utf8_identifiers.rs:1:7:4:1 | GenericParamList |
+| utf8_identifiers.rs:2:5:2:6 | Lifetime |
+| utf8_identifiers.rs:2:5:2:6 | LifetimeParam |
+| utf8_identifiers.rs:3:5:3:5 | TypeParam |
+| utf8_identifiers.rs:3:5:3:5 | \u03b3 |
+| utf8_identifiers.rs:4:2:4:3 | ParamList |
+| utf8_identifiers.rs:4:5:4:6 | BlockExpr |
+| utf8_identifiers.rs:4:5:4:6 | StmtList |
+| utf8_identifiers.rs:6:1:8:1 | Struct |
+| utf8_identifiers.rs:6:8:6:8 | X |
+| utf8_identifiers.rs:6:10:8:1 | RecordFieldList |
+| utf8_identifiers.rs:7:5:7:5 | \u03b4 |
+| utf8_identifiers.rs:7:5:7:13 | RecordField |
+| utf8_identifiers.rs:7:9:7:13 | PathType |
+| utf8_identifiers.rs:7:9:7:13 | usize |
+| utf8_identifiers.rs:7:9:7:13 | usize |
+| utf8_identifiers.rs:7:9:7:13 | usize |
+| utf8_identifiers.rs:10:1:10:3 | Visibility |
+| utf8_identifiers.rs:10:1:12:1 | main |
+| utf8_identifiers.rs:10:8:10:11 | main |
+| utf8_identifiers.rs:10:12:10:13 | ParamList |
+| utf8_identifiers.rs:10:15:12:1 | BlockExpr |
+| utf8_identifiers.rs:10:15:12:1 | StmtList |
+| utf8_identifiers.rs:11:5:11:24 | LetStmt |
+| utf8_identifiers.rs:11:9:11:9 | \u03b1 |
+| utf8_identifiers.rs:11:9:11:9 | \u03b1 |
+| utf8_identifiers.rs:11:14:11:23 | 0.00001f64 |
diff --git a/rust/ql/test/extractor-tests/utf8/ast.ql b/rust/ql/test/extractor-tests/utf8/ast.ql
new file mode 100644
index 00000000000..420f7e94eb9
--- /dev/null
+++ b/rust/ql/test/extractor-tests/utf8/ast.ql
@@ -0,0 +1,3 @@
+import codeql.rust.elements
+
+select any(AstNode n)
diff --git a/rust/ql/test/extractor-tests/utf8/utf8_identifiers.rs b/rust/ql/test/extractor-tests/utf8/utf8_identifiers.rs
new file mode 100644
index 00000000000..579dc82ab5f
--- /dev/null
+++ b/rust/ql/test/extractor-tests/utf8/utf8_identifiers.rs
@@ -0,0 +1,12 @@
+fn foo<
+    'β,
+    γ
+>() {}
+
+struct X {
+    δ: usize
+}
+
+pub fn main() {
+    let α = 0.00001f64;
+}
diff --git a/rust/ql/test/library-tests/controlflow-unstable/Cfg.expected b/rust/ql/test/library-tests/controlflow-unstable/Cfg.expected
new file mode 100644
index 00000000000..05851289a35
--- /dev/null
+++ b/rust/ql/test/library-tests/controlflow-unstable/Cfg.expected
@@ -0,0 +1,53 @@
+edges
+| test.rs:5:5:11:5 | enter test_and_if_let | test.rs:5:24:5:24 | a |  |
+| test.rs:5:5:11:5 | exit test_and_if_let (normal) | test.rs:5:5:11:5 | exit test_and_if_let |  |
+| test.rs:5:24:5:24 | a | test.rs:5:24:5:30 | Param | match |
+| test.rs:5:24:5:30 | Param | test.rs:5:33:5:33 | b |  |
+| test.rs:5:33:5:33 | b | test.rs:5:33:5:47 | Param | match |
+| test.rs:5:33:5:47 | Param | test.rs:5:50:5:50 | c |  |
+| test.rs:5:50:5:50 | c | test.rs:5:50:5:56 | Param | match |
+| test.rs:5:50:5:56 | Param | test.rs:6:12:6:12 | a |  |
+| test.rs:5:67:11:5 | BlockExpr | test.rs:5:5:11:5 | exit test_and_if_let (normal) |  |
+| test.rs:6:9:10:9 | IfExpr | test.rs:5:67:11:5 | BlockExpr |  |
+| test.rs:6:12:6:12 | a | test.rs:6:12:6:31 | [boolean(false)] ... && ... | false |
+| test.rs:6:12:6:12 | a | test.rs:6:17:6:31 | LetExpr | true |
+| test.rs:6:12:6:31 | [boolean(false)] ... && ... | test.rs:9:13:9:17 | false | false |
+| test.rs:6:12:6:31 | [boolean(true)] ... && ... | test.rs:7:13:7:13 | d | true |
+| test.rs:6:17:6:31 | LetExpr | test.rs:6:31:6:31 | b |  |
+| test.rs:6:21:6:27 | TupleStructPat | test.rs:6:12:6:31 | [boolean(false)] ... && ... | no-match |
+| test.rs:6:21:6:27 | TupleStructPat | test.rs:6:26:6:26 | d | match |
+| test.rs:6:26:6:26 | d | test.rs:6:12:6:31 | [boolean(true)] ... && ... | match |
+| test.rs:6:31:6:31 | b | test.rs:6:21:6:27 | TupleStructPat |  |
+| test.rs:6:33:8:9 | BlockExpr | test.rs:6:9:10:9 | IfExpr |  |
+| test.rs:7:13:7:13 | d | test.rs:6:33:8:9 | BlockExpr |  |
+| test.rs:8:16:10:9 | BlockExpr | test.rs:6:9:10:9 | IfExpr |  |
+| test.rs:9:13:9:17 | false | test.rs:8:16:10:9 | BlockExpr |  |
+| test.rs:13:5:21:5 | enter test_and_if_let2 | test.rs:13:25:13:25 | a |  |
+| test.rs:13:5:21:5 | exit test_and_if_let2 (normal) | test.rs:13:5:21:5 | exit test_and_if_let2 |  |
+| test.rs:13:25:13:25 | a | test.rs:13:25:13:31 | Param | match |
+| test.rs:13:25:13:31 | Param | test.rs:13:34:13:34 | b |  |
+| test.rs:13:34:13:34 | b | test.rs:13:34:13:39 | Param | match |
+| test.rs:13:34:13:39 | Param | test.rs:13:42:13:42 | c |  |
+| test.rs:13:42:13:42 | c | test.rs:13:42:13:48 | Param | match |
+| test.rs:13:42:13:48 | Param | test.rs:14:12:14:12 | a |  |
+| test.rs:13:59:21:5 | BlockExpr | test.rs:13:5:21:5 | exit test_and_if_let2 (normal) |  |
+| test.rs:14:9:20:9 | IfExpr | test.rs:13:59:21:5 | BlockExpr |  |
+| test.rs:14:12:14:12 | a | test.rs:14:12:14:25 | [boolean(false)] ... && ... | false |
+| test.rs:14:12:14:12 | a | test.rs:14:17:14:25 | LetExpr | true |
+| test.rs:14:12:14:25 | [boolean(false)] ... && ... | test.rs:14:12:15:16 | [boolean(false)] ... && ... | false |
+| test.rs:14:12:14:25 | [boolean(true)] ... && ... | test.rs:15:16:15:16 | c | true |
+| test.rs:14:12:15:16 | [boolean(false)] ... && ... | test.rs:19:13:19:17 | false | false |
+| test.rs:14:12:15:16 | [boolean(true)] ... && ... | test.rs:17:13:17:13 | d | true |
+| test.rs:14:17:14:25 | LetExpr | test.rs:14:25:14:25 | b |  |
+| test.rs:14:21:14:21 | d | test.rs:14:12:14:25 | [boolean(true)] ... && ... | match |
+| test.rs:14:25:14:25 | b | test.rs:14:21:14:21 | d |  |
+| test.rs:15:16:15:16 | c | test.rs:14:12:15:16 | [boolean(false)] ... && ... | false |
+| test.rs:15:16:15:16 | c | test.rs:14:12:15:16 | [boolean(true)] ... && ... | true |
+| test.rs:16:9:18:9 | BlockExpr | test.rs:14:9:20:9 | IfExpr |  |
+| test.rs:17:13:17:13 | d | test.rs:17:17:17:17 | 0 |  |
+| test.rs:17:13:17:17 | ... > ... | test.rs:16:9:18:9 | BlockExpr |  |
+| test.rs:17:17:17:17 | 0 | test.rs:17:13:17:17 | ... > ... |  |
+| test.rs:18:16:20:9 | BlockExpr | test.rs:14:9:20:9 | IfExpr |  |
+| test.rs:19:13:19:17 | false | test.rs:18:16:20:9 | BlockExpr |  |
+breakTarget
+continueTarget
diff --git a/rust/ql/test/library-tests/controlflow-unstable/Cfg.qlref b/rust/ql/test/library-tests/controlflow-unstable/Cfg.qlref
new file mode 100644
index 00000000000..ba4ee4b414f
--- /dev/null
+++ b/rust/ql/test/library-tests/controlflow-unstable/Cfg.qlref
@@ -0,0 +1 @@
+query: utils/Cfg.ql
\ No newline at end of file
diff --git a/rust/ql/test/library-tests/controlflow-unstable/options.yml b/rust/ql/test/library-tests/controlflow-unstable/options.yml
new file mode 100644
index 00000000000..cf148dd35f8
--- /dev/null
+++ b/rust/ql/test/library-tests/controlflow-unstable/options.yml
@@ -0,0 +1 @@
+qltest_cargo_check: false
diff --git a/rust/ql/test/library-tests/controlflow-unstable/test.rs b/rust/ql/test/library-tests/controlflow-unstable/test.rs
new file mode 100644
index 00000000000..738d696bebe
--- /dev/null
+++ b/rust/ql/test/library-tests/controlflow-unstable/test.rs
@@ -0,0 +1,22 @@
+// TODO: Move these tests into `controlflow` when they become stable features
+
+mod if_expression {
+
+    fn test_and_if_let(a: bool, b: Option<bool>, c: bool) -> bool {
+        if a && let Some(d) = b {
+            d
+        } else {
+            false
+        }
+    }
+
+    fn test_and_if_let2(a: bool, b: i64, c: bool) -> bool {
+        if a && let d = b
+            && c
+        {
+            d > 0
+        } else {
+            false
+        }
+    }
+}
diff --git a/rust/ql/test/library-tests/controlflow/Cfg.expected b/rust/ql/test/library-tests/controlflow/Cfg.expected
index 6b660ee661f..620837abc82 100644
--- a/rust/ql/test/library-tests/controlflow/Cfg.expected
+++ b/rust/ql/test/library-tests/controlflow/Cfg.expected
@@ -1,92 +1,1069 @@
-nodes
-| test.rs:1:1:7:1 | enter main | semmle.order | 1 |
-| test.rs:1:1:7:1 | exit main | semmle.order | 2 |
-| test.rs:1:1:7:1 | exit main (normal) | semmle.order | 3 |
-| test.rs:1:1:7:1 | main | semmle.order | 4 |
-| test.rs:1:18:7:1 | BlockExpr | semmle.order | 5 |
-| test.rs:2:5:6:5 | IfExpr | semmle.order | 6 |
-| test.rs:2:8:2:12 | LiteralExpr | semmle.order | 7 |
-| test.rs:2:8:2:21 | BinaryExpr | semmle.order | 8 |
-| test.rs:2:17:2:21 | LiteralExpr | semmle.order | 9 |
-| test.rs:2:23:4:5 | BlockExpr | semmle.order | 10 |
-| test.rs:3:9:3:20 | CallExpr | semmle.order | 11 |
-| test.rs:3:19:3:19 | LiteralExpr | semmle.order | 12 |
-| test.rs:4:12:6:5 | BlockExpr | semmle.order | 13 |
-| test.rs:5:9:5:20 | CallExpr | semmle.order | 14 |
-| test.rs:5:19:5:19 | LiteralExpr | semmle.order | 15 |
-| test.rs:9:1:16:1 | decrement | semmle.order | 16 |
-| test.rs:9:1:16:1 | enter decrement | semmle.order | 17 |
-| test.rs:9:1:16:1 | exit decrement | semmle.order | 18 |
-| test.rs:9:1:16:1 | exit decrement (normal) | semmle.order | 19 |
-| test.rs:9:29:16:1 | BlockExpr | semmle.order | 20 |
-| test.rs:11:5:15:5 | IfExpr | semmle.order | 21 |
-| test.rs:11:8:11:8 | PathExpr | semmle.order | 22 |
-| test.rs:11:8:11:13 | BinaryExpr | semmle.order | 23 |
-| test.rs:11:13:11:13 | LiteralExpr | semmle.order | 24 |
-| test.rs:11:15:13:5 | BlockExpr | semmle.order | 25 |
-| test.rs:12:9:12:9 | LiteralExpr | semmle.order | 26 |
-| test.rs:13:12:15:5 | BlockExpr | semmle.order | 27 |
-| test.rs:14:9:14:9 | PathExpr | semmle.order | 28 |
-| test.rs:14:9:14:13 | BinaryExpr | semmle.order | 29 |
-| test.rs:14:13:14:13 | LiteralExpr | semmle.order | 30 |
 edges
-| test.rs:1:1:7:1 | enter main | test.rs:2:8:2:12 | LiteralExpr | semmle.label |  |
-| test.rs:1:1:7:1 | enter main | test.rs:2:8:2:12 | LiteralExpr | semmle.order | 1 |
-| test.rs:1:1:7:1 | exit main (normal) | test.rs:1:1:7:1 | exit main | semmle.label |  |
-| test.rs:1:1:7:1 | exit main (normal) | test.rs:1:1:7:1 | exit main | semmle.order | 1 |
-| test.rs:1:1:7:1 | main | test.rs:1:1:7:1 | exit main (normal) | semmle.label |  |
-| test.rs:1:1:7:1 | main | test.rs:1:1:7:1 | exit main (normal) | semmle.order | 1 |
-| test.rs:1:18:7:1 | BlockExpr | test.rs:1:1:7:1 | main | semmle.label |  |
-| test.rs:1:18:7:1 | BlockExpr | test.rs:1:1:7:1 | main | semmle.order | 1 |
-| test.rs:2:5:6:5 | IfExpr | test.rs:1:18:7:1 | BlockExpr | semmle.label |  |
-| test.rs:2:5:6:5 | IfExpr | test.rs:1:18:7:1 | BlockExpr | semmle.order | 1 |
-| test.rs:2:8:2:12 | LiteralExpr | test.rs:2:17:2:21 | LiteralExpr | semmle.label |  |
-| test.rs:2:8:2:12 | LiteralExpr | test.rs:2:17:2:21 | LiteralExpr | semmle.order | 1 |
-| test.rs:2:8:2:21 | BinaryExpr | test.rs:3:19:3:19 | LiteralExpr | semmle.label | true |
-| test.rs:2:8:2:21 | BinaryExpr | test.rs:3:19:3:19 | LiteralExpr | semmle.order | 1 |
-| test.rs:2:8:2:21 | BinaryExpr | test.rs:5:19:5:19 | LiteralExpr | semmle.label | false |
-| test.rs:2:8:2:21 | BinaryExpr | test.rs:5:19:5:19 | LiteralExpr | semmle.order | 2 |
-| test.rs:2:17:2:21 | LiteralExpr | test.rs:2:8:2:21 | BinaryExpr | semmle.label |  |
-| test.rs:2:17:2:21 | LiteralExpr | test.rs:2:8:2:21 | BinaryExpr | semmle.order | 1 |
-| test.rs:2:23:4:5 | BlockExpr | test.rs:2:5:6:5 | IfExpr | semmle.label |  |
-| test.rs:2:23:4:5 | BlockExpr | test.rs:2:5:6:5 | IfExpr | semmle.order | 1 |
-| test.rs:3:9:3:20 | CallExpr | test.rs:2:23:4:5 | BlockExpr | semmle.label |  |
-| test.rs:3:9:3:20 | CallExpr | test.rs:2:23:4:5 | BlockExpr | semmle.order | 1 |
-| test.rs:3:19:3:19 | LiteralExpr | test.rs:3:9:3:20 | CallExpr | semmle.label |  |
-| test.rs:3:19:3:19 | LiteralExpr | test.rs:3:9:3:20 | CallExpr | semmle.order | 1 |
-| test.rs:4:12:6:5 | BlockExpr | test.rs:2:5:6:5 | IfExpr | semmle.label |  |
-| test.rs:4:12:6:5 | BlockExpr | test.rs:2:5:6:5 | IfExpr | semmle.order | 1 |
-| test.rs:5:9:5:20 | CallExpr | test.rs:4:12:6:5 | BlockExpr | semmle.label |  |
-| test.rs:5:9:5:20 | CallExpr | test.rs:4:12:6:5 | BlockExpr | semmle.order | 1 |
-| test.rs:5:19:5:19 | LiteralExpr | test.rs:5:9:5:20 | CallExpr | semmle.label |  |
-| test.rs:5:19:5:19 | LiteralExpr | test.rs:5:9:5:20 | CallExpr | semmle.order | 1 |
-| test.rs:9:1:16:1 | decrement | test.rs:9:1:16:1 | exit decrement (normal) | semmle.label |  |
-| test.rs:9:1:16:1 | decrement | test.rs:9:1:16:1 | exit decrement (normal) | semmle.order | 1 |
-| test.rs:9:1:16:1 | enter decrement | test.rs:11:8:11:8 | PathExpr | semmle.label |  |
-| test.rs:9:1:16:1 | enter decrement | test.rs:11:8:11:8 | PathExpr | semmle.order | 1 |
-| test.rs:9:1:16:1 | exit decrement (normal) | test.rs:9:1:16:1 | exit decrement | semmle.label |  |
-| test.rs:9:1:16:1 | exit decrement (normal) | test.rs:9:1:16:1 | exit decrement | semmle.order | 1 |
-| test.rs:9:29:16:1 | BlockExpr | test.rs:9:1:16:1 | decrement | semmle.label |  |
-| test.rs:9:29:16:1 | BlockExpr | test.rs:9:1:16:1 | decrement | semmle.order | 1 |
-| test.rs:11:5:15:5 | IfExpr | test.rs:9:29:16:1 | BlockExpr | semmle.label |  |
-| test.rs:11:5:15:5 | IfExpr | test.rs:9:29:16:1 | BlockExpr | semmle.order | 1 |
-| test.rs:11:8:11:8 | PathExpr | test.rs:11:13:11:13 | LiteralExpr | semmle.label |  |
-| test.rs:11:8:11:8 | PathExpr | test.rs:11:13:11:13 | LiteralExpr | semmle.order | 1 |
-| test.rs:11:8:11:13 | BinaryExpr | test.rs:12:9:12:9 | LiteralExpr | semmle.label | true |
-| test.rs:11:8:11:13 | BinaryExpr | test.rs:12:9:12:9 | LiteralExpr | semmle.order | 1 |
-| test.rs:11:8:11:13 | BinaryExpr | test.rs:14:9:14:9 | PathExpr | semmle.label | false |
-| test.rs:11:8:11:13 | BinaryExpr | test.rs:14:9:14:9 | PathExpr | semmle.order | 2 |
-| test.rs:11:13:11:13 | LiteralExpr | test.rs:11:8:11:13 | BinaryExpr | semmle.label |  |
-| test.rs:11:13:11:13 | LiteralExpr | test.rs:11:8:11:13 | BinaryExpr | semmle.order | 1 |
-| test.rs:11:15:13:5 | BlockExpr | test.rs:11:5:15:5 | IfExpr | semmle.label |  |
-| test.rs:11:15:13:5 | BlockExpr | test.rs:11:5:15:5 | IfExpr | semmle.order | 1 |
-| test.rs:12:9:12:9 | LiteralExpr | test.rs:11:15:13:5 | BlockExpr | semmle.label |  |
-| test.rs:12:9:12:9 | LiteralExpr | test.rs:11:15:13:5 | BlockExpr | semmle.order | 1 |
-| test.rs:13:12:15:5 | BlockExpr | test.rs:11:5:15:5 | IfExpr | semmle.label |  |
-| test.rs:13:12:15:5 | BlockExpr | test.rs:11:5:15:5 | IfExpr | semmle.order | 1 |
-| test.rs:14:9:14:9 | PathExpr | test.rs:14:13:14:13 | LiteralExpr | semmle.label |  |
-| test.rs:14:9:14:9 | PathExpr | test.rs:14:13:14:13 | LiteralExpr | semmle.order | 1 |
-| test.rs:14:9:14:13 | BinaryExpr | test.rs:13:12:15:5 | BlockExpr | semmle.label |  |
-| test.rs:14:9:14:13 | BinaryExpr | test.rs:13:12:15:5 | BlockExpr | semmle.order | 1 |
-| test.rs:14:13:14:13 | LiteralExpr | test.rs:14:9:14:13 | BinaryExpr | semmle.label |  |
-| test.rs:14:13:14:13 | LiteralExpr | test.rs:14:9:14:13 | BinaryExpr | semmle.order | 1 |
+| test.rs:5:5:8:5 | enter function_call | test.rs:6:9:6:64 | ExprStmt |  |
+| test.rs:5:5:8:5 | exit function_call (normal) | test.rs:5:5:8:5 | exit function_call |  |
+| test.rs:5:24:8:5 | BlockExpr | test.rs:5:5:8:5 | exit function_call (normal) |  |
+| test.rs:6:9:6:44 | logical_operators::test_and_operator | test.rs:6:46:6:49 | true |  |
+| test.rs:6:9:6:63 | CallExpr | test.rs:7:9:7:22 | ExprStmt |  |
+| test.rs:6:9:6:64 | ExprStmt | test.rs:6:9:6:44 | logical_operators::test_and_operator |  |
+| test.rs:6:46:6:49 | true | test.rs:6:52:6:56 | false |  |
+| test.rs:6:52:6:56 | false | test.rs:6:59:6:62 | true |  |
+| test.rs:6:59:6:62 | true | test.rs:6:9:6:63 | CallExpr |  |
+| test.rs:7:9:7:19 | method_call | test.rs:7:9:7:21 | CallExpr |  |
+| test.rs:7:9:7:21 | CallExpr | test.rs:5:24:8:5 | BlockExpr |  |
+| test.rs:7:9:7:22 | ExprStmt | test.rs:7:9:7:19 | method_call |  |
+| test.rs:10:5:13:5 | enter method_call | test.rs:11:9:11:37 | LetStmt |  |
+| test.rs:10:5:13:5 | exit method_call (normal) | test.rs:10:5:13:5 | exit method_call |  |
+| test.rs:10:22:13:5 | BlockExpr | test.rs:10:5:13:5 | exit method_call (normal) |  |
+| test.rs:11:9:11:37 | LetStmt | test.rs:11:23:11:34 | HashMap::new |  |
+| test.rs:11:13:11:19 | map | test.rs:12:9:12:28 | ExprStmt | match |
+| test.rs:11:23:11:34 | HashMap::new | test.rs:11:23:11:36 | CallExpr |  |
+| test.rs:11:23:11:36 | CallExpr | test.rs:11:13:11:19 | map |  |
+| test.rs:12:9:12:11 | map | test.rs:12:20:12:21 | 37 |  |
+| test.rs:12:9:12:27 | ... .insert(...) | test.rs:10:22:13:5 | BlockExpr |  |
+| test.rs:12:9:12:28 | ExprStmt | test.rs:12:9:12:11 | map |  |
+| test.rs:12:20:12:21 | 37 | test.rs:12:24:12:26 | "a" |  |
+| test.rs:12:24:12:26 | "a" | test.rs:12:9:12:27 | ... .insert(...) |  |
+| test.rs:18:5:24:5 | enter next | test.rs:18:13:18:13 | n |  |
+| test.rs:18:5:24:5 | exit next (normal) | test.rs:18:5:24:5 | exit next |  |
+| test.rs:18:13:18:13 | n | test.rs:18:13:18:18 | Param | match |
+| test.rs:18:13:18:18 | Param | test.rs:19:12:19:12 | n |  |
+| test.rs:18:28:24:5 | BlockExpr | test.rs:18:5:24:5 | exit next (normal) |  |
+| test.rs:19:9:23:9 | IfExpr | test.rs:18:28:24:5 | BlockExpr |  |
+| test.rs:19:12:19:12 | n | test.rs:19:16:19:16 | 2 |  |
+| test.rs:19:12:19:16 | ... % ... | test.rs:19:21:19:21 | 0 |  |
+| test.rs:19:12:19:21 | ... == ... | test.rs:20:13:20:13 | n | true |
+| test.rs:19:12:19:21 | ... == ... | test.rs:22:13:22:13 | 3 | false |
+| test.rs:19:16:19:16 | 2 | test.rs:19:12:19:16 | ... % ... |  |
+| test.rs:19:21:19:21 | 0 | test.rs:19:12:19:21 | ... == ... |  |
+| test.rs:19:23:21:9 | BlockExpr | test.rs:19:9:23:9 | IfExpr |  |
+| test.rs:20:13:20:13 | n | test.rs:20:17:20:17 | 2 |  |
+| test.rs:20:13:20:17 | ... / ... | test.rs:19:23:21:9 | BlockExpr |  |
+| test.rs:20:17:20:17 | 2 | test.rs:20:13:20:17 | ... / ... |  |
+| test.rs:21:16:23:9 | BlockExpr | test.rs:19:9:23:9 | IfExpr |  |
+| test.rs:22:13:22:13 | 3 | test.rs:22:17:22:17 | n |  |
+| test.rs:22:13:22:17 | ... * ... | test.rs:22:21:22:21 | 1 |  |
+| test.rs:22:13:22:21 | ... + ... | test.rs:21:16:23:9 | BlockExpr |  |
+| test.rs:22:17:22:17 | n | test.rs:22:13:22:17 | ... * ... |  |
+| test.rs:22:21:22:21 | 1 | test.rs:22:13:22:21 | ... + ... |  |
+| test.rs:26:5:42:5 | enter test_break_and_continue | test.rs:26:32:26:32 | n |  |
+| test.rs:26:5:42:5 | exit test_break_and_continue (normal) | test.rs:26:5:42:5 | exit test_break_and_continue |  |
+| test.rs:26:32:26:32 | n | test.rs:26:32:26:37 | Param | match |
+| test.rs:26:32:26:37 | Param | test.rs:27:9:27:22 | LetStmt |  |
+| test.rs:27:9:27:22 | LetStmt | test.rs:27:21:27:21 | n |  |
+| test.rs:27:13:27:17 | i | test.rs:28:9:40:9 | ExprStmt | match |
+| test.rs:27:21:27:21 | n | test.rs:27:13:27:17 | i |  |
+| test.rs:28:9:40:9 | ExprStmt | test.rs:29:13:29:24 | ExprStmt |  |
+| test.rs:28:9:40:9 | LoopExpr | test.rs:41:9:41:20 | ExprStmt |  |
+| test.rs:28:14:40:9 | BlockExpr | test.rs:29:13:29:24 | ExprStmt |  |
+| test.rs:29:13:29:13 | i | test.rs:29:17:29:20 | next |  |
+| test.rs:29:13:29:23 | ... = ... | test.rs:30:13:32:13 | ExprStmt |  |
+| test.rs:29:13:29:24 | ExprStmt | test.rs:29:13:29:13 | i |  |
+| test.rs:29:17:29:20 | next | test.rs:29:22:29:22 | i |  |
+| test.rs:29:17:29:23 | CallExpr | test.rs:29:13:29:23 | ... = ... |  |
+| test.rs:29:22:29:22 | i | test.rs:29:17:29:23 | CallExpr |  |
+| test.rs:30:13:32:13 | ExprStmt | test.rs:30:16:30:16 | i |  |
+| test.rs:30:13:32:13 | IfExpr | test.rs:33:13:35:13 | ExprStmt |  |
+| test.rs:30:16:30:16 | i | test.rs:30:20:30:24 | 10000 |  |
+| test.rs:30:16:30:24 | ... > ... | test.rs:30:13:32:13 | IfExpr | false |
+| test.rs:30:16:30:24 | ... > ... | test.rs:31:17:31:29 | ExprStmt | true |
+| test.rs:30:20:30:24 | 10000 | test.rs:30:16:30:24 | ... > ... |  |
+| test.rs:31:17:31:28 | ReturnExpr | test.rs:26:5:42:5 | exit test_break_and_continue (normal) | return |
+| test.rs:31:17:31:29 | ExprStmt | test.rs:31:24:31:28 | false |  |
+| test.rs:31:24:31:28 | false | test.rs:31:17:31:28 | ReturnExpr |  |
+| test.rs:33:13:35:13 | ExprStmt | test.rs:33:16:33:16 | i |  |
+| test.rs:33:13:35:13 | IfExpr | test.rs:36:13:38:13 | ExprStmt |  |
+| test.rs:33:16:33:16 | i | test.rs:33:21:33:21 | 1 |  |
+| test.rs:33:16:33:21 | ... == ... | test.rs:33:13:35:13 | IfExpr | false |
+| test.rs:33:16:33:21 | ... == ... | test.rs:34:17:34:22 | ExprStmt | true |
+| test.rs:33:21:33:21 | 1 | test.rs:33:16:33:21 | ... == ... |  |
+| test.rs:34:17:34:21 | BreakExpr | test.rs:28:9:40:9 | LoopExpr | break |
+| test.rs:34:17:34:22 | ExprStmt | test.rs:34:17:34:21 | BreakExpr |  |
+| test.rs:36:13:38:13 | ExprStmt | test.rs:36:16:36:16 | i |  |
+| test.rs:36:13:38:13 | IfExpr | test.rs:39:13:39:13 | i |  |
+| test.rs:36:16:36:16 | i | test.rs:36:20:36:20 | 2 |  |
+| test.rs:36:16:36:20 | ... % ... | test.rs:36:25:36:25 | 0 |  |
+| test.rs:36:16:36:25 | ... != ... | test.rs:36:13:38:13 | IfExpr | false |
+| test.rs:36:16:36:25 | ... != ... | test.rs:37:17:37:25 | ExprStmt | true |
+| test.rs:36:20:36:20 | 2 | test.rs:36:16:36:20 | ... % ... |  |
+| test.rs:36:25:36:25 | 0 | test.rs:36:16:36:25 | ... != ... |  |
+| test.rs:37:17:37:24 | ContinueExpr | test.rs:29:13:29:24 | ExprStmt | continue |
+| test.rs:37:17:37:25 | ExprStmt | test.rs:37:17:37:24 | ContinueExpr |  |
+| test.rs:39:13:39:13 | i | test.rs:39:17:39:17 | i |  |
+| test.rs:39:13:39:21 | ... = ... | test.rs:28:14:40:9 | BlockExpr |  |
+| test.rs:39:17:39:17 | i | test.rs:39:21:39:21 | 2 |  |
+| test.rs:39:17:39:21 | ... / ... | test.rs:39:13:39:21 | ... = ... |  |
+| test.rs:39:21:39:21 | 2 | test.rs:39:17:39:21 | ... / ... |  |
+| test.rs:41:9:41:19 | ReturnExpr | test.rs:26:5:42:5 | exit test_break_and_continue (normal) | return |
+| test.rs:41:9:41:20 | ExprStmt | test.rs:41:16:41:19 | true |  |
+| test.rs:41:16:41:19 | true | test.rs:41:9:41:19 | ReturnExpr |  |
+| test.rs:44:5:56:5 | enter test_break_with_labels | test.rs:44:31:44:31 | b |  |
+| test.rs:44:5:56:5 | exit test_break_with_labels (normal) | test.rs:44:5:56:5 | exit test_break_with_labels |  |
+| test.rs:44:31:44:31 | b | test.rs:44:31:44:37 | Param | match |
+| test.rs:44:31:44:37 | Param | test.rs:45:9:54:9 | ExprStmt |  |
+| test.rs:44:48:56:5 | BlockExpr | test.rs:44:5:56:5 | exit test_break_with_labels (normal) |  |
+| test.rs:45:9:54:9 | ExprStmt | test.rs:47:17:51:17 | ExprStmt |  |
+| test.rs:45:9:54:9 | LoopExpr | test.rs:55:9:55:12 | true |  |
+| test.rs:45:22:54:9 | BlockExpr | test.rs:47:17:51:17 | ExprStmt |  |
+| test.rs:46:13:53:13 | LoopExpr | test.rs:45:22:54:9 | BlockExpr |  |
+| test.rs:47:17:51:17 | ExprStmt | test.rs:47:20:47:20 | b |  |
+| test.rs:47:17:51:17 | IfExpr | test.rs:52:17:52:29 | ExprStmt |  |
+| test.rs:47:20:47:20 | b | test.rs:48:21:48:26 | ExprStmt | true |
+| test.rs:47:20:47:20 | b | test.rs:49:27:49:27 | b | false |
+| test.rs:48:21:48:25 | BreakExpr | test.rs:46:13:53:13 | LoopExpr | break |
+| test.rs:48:21:48:26 | ExprStmt | test.rs:48:21:48:25 | BreakExpr |  |
+| test.rs:49:24:51:17 | IfExpr | test.rs:47:17:51:17 | IfExpr |  |
+| test.rs:49:27:49:27 | b | test.rs:49:24:51:17 | IfExpr | false |
+| test.rs:49:27:49:27 | b | test.rs:50:21:50:33 | ExprStmt | true |
+| test.rs:50:21:50:32 | BreakExpr | test.rs:45:9:54:9 | LoopExpr | break |
+| test.rs:50:21:50:33 | ExprStmt | test.rs:50:21:50:32 | BreakExpr |  |
+| test.rs:52:17:52:28 | BreakExpr | test.rs:46:13:53:13 | LoopExpr | break |
+| test.rs:52:17:52:29 | ExprStmt | test.rs:52:17:52:28 | BreakExpr |  |
+| test.rs:55:9:55:12 | true | test.rs:44:48:56:5 | BlockExpr |  |
+| test.rs:58:5:70:5 | enter test_continue_with_labels | test.rs:58:34:58:34 | b |  |
+| test.rs:58:34:58:34 | b | test.rs:58:34:58:40 | Param | match |
+| test.rs:58:34:58:40 | Param | test.rs:60:13:60:14 | ExprStmt |  |
+| test.rs:60:13:60:13 | 1 | test.rs:62:17:66:17 | ExprStmt |  |
+| test.rs:60:13:60:14 | ExprStmt | test.rs:60:13:60:13 | 1 |  |
+| test.rs:62:17:66:17 | ExprStmt | test.rs:62:20:62:20 | b |  |
+| test.rs:62:17:66:17 | IfExpr | test.rs:67:17:67:32 | ExprStmt |  |
+| test.rs:62:20:62:20 | b | test.rs:63:21:63:29 | ExprStmt | true |
+| test.rs:62:20:62:20 | b | test.rs:64:27:64:27 | b | false |
+| test.rs:63:21:63:28 | ContinueExpr | test.rs:62:17:66:17 | ExprStmt | continue |
+| test.rs:63:21:63:29 | ExprStmt | test.rs:63:21:63:28 | ContinueExpr |  |
+| test.rs:64:24:66:17 | IfExpr | test.rs:62:17:66:17 | IfExpr |  |
+| test.rs:64:27:64:27 | b | test.rs:64:24:66:17 | IfExpr | false |
+| test.rs:64:27:64:27 | b | test.rs:65:21:65:36 | ExprStmt | true |
+| test.rs:65:21:65:35 | ContinueExpr | test.rs:60:13:60:14 | ExprStmt | continue |
+| test.rs:65:21:65:36 | ExprStmt | test.rs:65:21:65:35 | ContinueExpr |  |
+| test.rs:67:17:67:31 | ContinueExpr | test.rs:62:17:66:17 | ExprStmt | continue |
+| test.rs:67:17:67:32 | ExprStmt | test.rs:67:17:67:31 | ContinueExpr |  |
+| test.rs:72:5:84:5 | enter test_loop_label_shadowing | test.rs:72:34:72:34 | b |  |
+| test.rs:72:34:72:34 | b | test.rs:72:34:72:40 | Param | match |
+| test.rs:72:34:72:40 | Param | test.rs:74:13:74:14 | ExprStmt |  |
+| test.rs:74:13:74:13 | 1 | test.rs:76:17:80:17 | ExprStmt |  |
+| test.rs:74:13:74:14 | ExprStmt | test.rs:74:13:74:13 | 1 |  |
+| test.rs:76:17:80:17 | ExprStmt | test.rs:76:20:76:20 | b |  |
+| test.rs:76:17:80:17 | IfExpr | test.rs:81:17:81:32 | ExprStmt |  |
+| test.rs:76:20:76:20 | b | test.rs:77:21:77:29 | ExprStmt | true |
+| test.rs:76:20:76:20 | b | test.rs:78:27:78:27 | b | false |
+| test.rs:77:21:77:28 | ContinueExpr | test.rs:76:17:80:17 | ExprStmt | continue |
+| test.rs:77:21:77:29 | ExprStmt | test.rs:77:21:77:28 | ContinueExpr |  |
+| test.rs:78:24:80:17 | IfExpr | test.rs:76:17:80:17 | IfExpr |  |
+| test.rs:78:27:78:27 | b | test.rs:78:24:80:17 | IfExpr | false |
+| test.rs:78:27:78:27 | b | test.rs:79:21:79:36 | ExprStmt | true |
+| test.rs:79:21:79:35 | ContinueExpr | test.rs:76:17:80:17 | ExprStmt | continue |
+| test.rs:79:21:79:36 | ExprStmt | test.rs:79:21:79:35 | ContinueExpr |  |
+| test.rs:81:17:81:31 | ContinueExpr | test.rs:76:17:80:17 | ExprStmt | continue |
+| test.rs:81:17:81:32 | ExprStmt | test.rs:81:17:81:31 | ContinueExpr |  |
+| test.rs:86:5:95:5 | enter test_while | test.rs:86:19:86:19 | i |  |
+| test.rs:86:5:95:5 | exit test_while (normal) | test.rs:86:5:95:5 | exit test_while |  |
+| test.rs:86:19:86:19 | i | test.rs:86:19:86:24 | Param | match |
+| test.rs:86:19:86:24 | Param | test.rs:87:9:87:25 | LetStmt |  |
+| test.rs:86:27:95:5 | BlockExpr | test.rs:86:5:95:5 | exit test_while (normal) |  |
+| test.rs:87:9:87:25 | LetStmt | test.rs:87:21:87:24 | true |  |
+| test.rs:87:13:87:17 | b | test.rs:88:15:88:15 | b | match |
+| test.rs:87:21:87:24 | true | test.rs:87:13:87:17 | b |  |
+| test.rs:88:9:94:9 | WhileExpr | test.rs:86:27:95:5 | BlockExpr |  |
+| test.rs:88:15:88:15 | b | test.rs:88:9:94:9 | WhileExpr | false |
+| test.rs:88:15:88:15 | b | test.rs:89:13:89:14 | ExprStmt | true |
+| test.rs:88:17:94:9 | BlockExpr | test.rs:88:15:88:15 | b |  |
+| test.rs:89:13:89:13 | 1 | test.rs:90:13:92:13 | ExprStmt |  |
+| test.rs:89:13:89:14 | ExprStmt | test.rs:89:13:89:13 | 1 |  |
+| test.rs:90:13:92:13 | ExprStmt | test.rs:90:17:90:17 | i |  |
+| test.rs:90:13:92:13 | IfExpr | test.rs:93:13:93:22 | ExprStmt |  |
+| test.rs:90:17:90:17 | i | test.rs:90:21:90:21 | 0 |  |
+| test.rs:90:17:90:21 | ... > ... | test.rs:90:13:92:13 | IfExpr | false |
+| test.rs:90:17:90:21 | ... > ... | test.rs:91:17:91:22 | ExprStmt | true |
+| test.rs:90:21:90:21 | 0 | test.rs:90:17:90:21 | ... > ... |  |
+| test.rs:91:17:91:21 | BreakExpr | test.rs:88:9:94:9 | WhileExpr | break |
+| test.rs:91:17:91:22 | ExprStmt | test.rs:91:17:91:21 | BreakExpr |  |
+| test.rs:93:13:93:13 | b | test.rs:93:17:93:21 | false |  |
+| test.rs:93:13:93:21 | ... = ... | test.rs:88:17:94:9 | BlockExpr |  |
+| test.rs:93:13:93:22 | ExprStmt | test.rs:93:13:93:13 | b |  |
+| test.rs:93:17:93:21 | false | test.rs:93:13:93:21 | ... = ... |  |
+| test.rs:97:5:104:5 | enter test_while_let | test.rs:98:9:98:29 | LetStmt |  |
+| test.rs:97:5:104:5 | exit test_while_let (normal) | test.rs:97:5:104:5 | exit test_while_let |  |
+| test.rs:97:25:104:5 | BlockExpr | test.rs:97:5:104:5 | exit test_while_let (normal) |  |
+| test.rs:98:9:98:29 | LetStmt | test.rs:98:24:98:24 | 1 |  |
+| test.rs:98:13:98:20 | iter | test.rs:99:15:99:39 | LetExpr | match |
+| test.rs:98:24:98:24 | 1 | test.rs:98:27:98:28 | 10 |  |
+| test.rs:98:24:98:28 | RangeExpr | test.rs:98:13:98:20 | iter |  |
+| test.rs:98:27:98:28 | 10 | test.rs:98:24:98:28 | RangeExpr |  |
+| test.rs:99:9:103:9 | WhileExpr | test.rs:97:25:104:5 | BlockExpr |  |
+| test.rs:99:15:99:39 | LetExpr | test.rs:99:29:99:32 | iter |  |
+| test.rs:99:19:99:25 | TupleStructPat | test.rs:99:9:103:9 | WhileExpr | no-match |
+| test.rs:99:19:99:25 | TupleStructPat | test.rs:99:24:99:24 | x | match |
+| test.rs:99:24:99:24 | x | test.rs:100:17:100:17 | x | match |
+| test.rs:99:29:99:32 | iter | test.rs:99:29:99:39 | ... .next(...) |  |
+| test.rs:99:29:99:39 | ... .next(...) | test.rs:99:19:99:25 | TupleStructPat |  |
+| test.rs:99:41:103:9 | BlockExpr | test.rs:99:15:99:39 | LetExpr |  |
+| test.rs:100:13:102:13 | IfExpr | test.rs:99:41:103:9 | BlockExpr |  |
+| test.rs:100:17:100:17 | x | test.rs:100:22:100:22 | 5 |  |
+| test.rs:100:17:100:22 | ... == ... | test.rs:100:13:102:13 | IfExpr | false |
+| test.rs:100:17:100:22 | ... == ... | test.rs:101:17:101:22 | ExprStmt | true |
+| test.rs:100:22:100:22 | 5 | test.rs:100:17:100:22 | ... == ... |  |
+| test.rs:101:17:101:21 | BreakExpr | test.rs:99:9:103:9 | WhileExpr | break |
+| test.rs:101:17:101:22 | ExprStmt | test.rs:101:17:101:21 | BreakExpr |  |
+| test.rs:106:5:113:5 | enter test_for | test.rs:106:17:106:17 | j |  |
+| test.rs:106:5:113:5 | exit test_for (normal) | test.rs:106:5:113:5 | exit test_for |  |
+| test.rs:106:17:106:17 | j | test.rs:106:17:106:22 | Param | match |
+| test.rs:106:17:106:22 | Param | test.rs:107:18:107:18 | 0 |  |
+| test.rs:106:25:113:5 | BlockExpr | test.rs:106:5:113:5 | exit test_for (normal) |  |
+| test.rs:107:9:112:9 | ForExpr | test.rs:106:25:113:5 | BlockExpr |  |
+| test.rs:107:13:107:13 | i | test.rs:107:9:112:9 | ForExpr | no-match |
+| test.rs:107:13:107:13 | i | test.rs:108:13:110:13 | ExprStmt | match |
+| test.rs:107:18:107:18 | 0 | test.rs:107:21:107:22 | 10 |  |
+| test.rs:107:18:107:22 | RangeExpr | test.rs:107:13:107:13 | i |  |
+| test.rs:107:21:107:22 | 10 | test.rs:107:18:107:22 | RangeExpr |  |
+| test.rs:107:24:112:9 | BlockExpr | test.rs:107:13:107:13 | i |  |
+| test.rs:108:13:110:13 | ExprStmt | test.rs:108:17:108:17 | i |  |
+| test.rs:108:13:110:13 | IfExpr | test.rs:111:13:111:14 | ExprStmt |  |
+| test.rs:108:17:108:17 | i | test.rs:108:22:108:22 | j |  |
+| test.rs:108:17:108:22 | ... == ... | test.rs:108:13:110:13 | IfExpr | false |
+| test.rs:108:17:108:22 | ... == ... | test.rs:109:17:109:22 | ExprStmt | true |
+| test.rs:108:22:108:22 | j | test.rs:108:17:108:22 | ... == ... |  |
+| test.rs:109:17:109:21 | BreakExpr | test.rs:107:9:112:9 | ForExpr | break |
+| test.rs:109:17:109:22 | ExprStmt | test.rs:109:17:109:21 | BreakExpr |  |
+| test.rs:111:13:111:13 | 1 | test.rs:107:24:112:9 | BlockExpr |  |
+| test.rs:111:13:111:14 | ExprStmt | test.rs:111:13:111:13 | 1 |  |
+| test.rs:115:5:119:5 | enter break_with_return | test.rs:117:13:117:27 | ExprStmt |  |
+| test.rs:115:5:119:5 | exit break_with_return (normal) | test.rs:115:5:119:5 | exit break_with_return |  |
+| test.rs:117:13:117:27 | ExprStmt | test.rs:117:26:117:26 | 1 |  |
+| test.rs:117:19:117:26 | ReturnExpr | test.rs:115:5:119:5 | exit break_with_return (normal) | return |
+| test.rs:117:26:117:26 | 1 | test.rs:117:19:117:26 | ReturnExpr |  |
+| test.rs:122:1:125:1 | enter test_nested_function | test.rs:122:25:122:25 | n |  |
+| test.rs:122:1:125:1 | exit test_nested_function (normal) | test.rs:122:1:125:1 | exit test_nested_function |  |
+| test.rs:122:25:122:25 | n | test.rs:122:25:122:30 | Param | match |
+| test.rs:122:25:122:30 | Param | test.rs:123:5:123:28 | LetStmt |  |
+| test.rs:122:40:125:1 | BlockExpr | test.rs:122:1:125:1 | exit test_nested_function (normal) |  |
+| test.rs:123:5:123:28 | LetStmt | test.rs:123:19:123:27 | ClosureExpr |  |
+| test.rs:123:9:123:15 | add_one | test.rs:124:5:124:11 | add_one | match |
+| test.rs:123:19:123:27 | ClosureExpr | test.rs:123:9:123:15 | add_one |  |
+| test.rs:123:19:123:27 | enter ClosureExpr | test.rs:123:20:123:20 | i |  |
+| test.rs:123:19:123:27 | exit ClosureExpr (normal) | test.rs:123:19:123:27 | exit ClosureExpr |  |
+| test.rs:123:20:123:20 | Param | test.rs:123:23:123:23 | i |  |
+| test.rs:123:20:123:20 | i | test.rs:123:20:123:20 | Param | match |
+| test.rs:123:23:123:23 | i | test.rs:123:27:123:27 | 1 |  |
+| test.rs:123:23:123:27 | ... + ... | test.rs:123:19:123:27 | exit ClosureExpr (normal) |  |
+| test.rs:123:27:123:27 | 1 | test.rs:123:23:123:27 | ... + ... |  |
+| test.rs:124:5:124:11 | add_one | test.rs:124:13:124:19 | add_one |  |
+| test.rs:124:5:124:23 | CallExpr | test.rs:122:40:125:1 | BlockExpr |  |
+| test.rs:124:13:124:19 | add_one | test.rs:124:21:124:21 | n |  |
+| test.rs:124:13:124:22 | CallExpr | test.rs:124:5:124:23 | CallExpr |  |
+| test.rs:124:21:124:21 | n | test.rs:124:13:124:22 | CallExpr |  |
+| test.rs:129:5:135:5 | enter test_if_else | test.rs:129:21:129:21 | n |  |
+| test.rs:129:5:135:5 | exit test_if_else (normal) | test.rs:129:5:135:5 | exit test_if_else |  |
+| test.rs:129:21:129:21 | n | test.rs:129:21:129:26 | Param | match |
+| test.rs:129:21:129:26 | Param | test.rs:130:12:130:12 | n |  |
+| test.rs:129:36:135:5 | BlockExpr | test.rs:129:5:135:5 | exit test_if_else (normal) |  |
+| test.rs:130:9:134:9 | IfExpr | test.rs:129:36:135:5 | BlockExpr |  |
+| test.rs:130:12:130:12 | n | test.rs:130:17:130:17 | 0 |  |
+| test.rs:130:12:130:17 | ... <= ... | test.rs:131:13:131:13 | 0 | true |
+| test.rs:130:12:130:17 | ... <= ... | test.rs:133:13:133:13 | n | false |
+| test.rs:130:17:130:17 | 0 | test.rs:130:12:130:17 | ... <= ... |  |
+| test.rs:130:19:132:9 | BlockExpr | test.rs:130:9:134:9 | IfExpr |  |
+| test.rs:131:13:131:13 | 0 | test.rs:130:19:132:9 | BlockExpr |  |
+| test.rs:132:16:134:9 | BlockExpr | test.rs:130:9:134:9 | IfExpr |  |
+| test.rs:133:13:133:13 | n | test.rs:133:17:133:17 | 1 |  |
+| test.rs:133:13:133:17 | ... - ... | test.rs:132:16:134:9 | BlockExpr |  |
+| test.rs:133:17:133:17 | 1 | test.rs:133:13:133:17 | ... - ... |  |
+| test.rs:137:5:143:5 | enter test_if_let_else | test.rs:137:25:137:25 | a |  |
+| test.rs:137:5:143:5 | exit test_if_let_else (normal) | test.rs:137:5:143:5 | exit test_if_let_else |  |
+| test.rs:137:25:137:25 | a | test.rs:137:25:137:38 | Param | match |
+| test.rs:137:25:137:38 | Param | test.rs:138:12:138:26 | LetExpr |  |
+| test.rs:137:48:143:5 | BlockExpr | test.rs:137:5:143:5 | exit test_if_let_else (normal) |  |
+| test.rs:138:9:142:9 | IfExpr | test.rs:137:48:143:5 | BlockExpr |  |
+| test.rs:138:12:138:26 | LetExpr | test.rs:138:26:138:26 | a |  |
+| test.rs:138:16:138:22 | TupleStructPat | test.rs:138:21:138:21 | n | match |
+| test.rs:138:16:138:22 | TupleStructPat | test.rs:141:13:141:13 | 0 | no-match |
+| test.rs:138:21:138:21 | n | test.rs:139:13:139:13 | n | match |
+| test.rs:138:26:138:26 | a | test.rs:138:16:138:22 | TupleStructPat |  |
+| test.rs:138:28:140:9 | BlockExpr | test.rs:138:9:142:9 | IfExpr |  |
+| test.rs:139:13:139:13 | n | test.rs:138:28:140:9 | BlockExpr |  |
+| test.rs:140:16:142:9 | BlockExpr | test.rs:138:9:142:9 | IfExpr |  |
+| test.rs:141:13:141:13 | 0 | test.rs:140:16:142:9 | BlockExpr |  |
+| test.rs:145:5:150:5 | enter test_if_let | test.rs:145:20:145:20 | a |  |
+| test.rs:145:5:150:5 | exit test_if_let (normal) | test.rs:145:5:150:5 | exit test_if_let |  |
+| test.rs:145:20:145:20 | a | test.rs:145:20:145:33 | Param | match |
+| test.rs:145:20:145:33 | Param | test.rs:146:9:148:9 | ExprStmt |  |
+| test.rs:145:43:150:5 | BlockExpr | test.rs:145:5:150:5 | exit test_if_let (normal) |  |
+| test.rs:146:9:148:9 | ExprStmt | test.rs:146:12:146:26 | LetExpr |  |
+| test.rs:146:9:148:9 | IfExpr | test.rs:149:9:149:9 | 0 |  |
+| test.rs:146:12:146:26 | LetExpr | test.rs:146:26:146:26 | a |  |
+| test.rs:146:16:146:22 | TupleStructPat | test.rs:146:9:148:9 | IfExpr | no-match |
+| test.rs:146:16:146:22 | TupleStructPat | test.rs:146:21:146:21 | n | match |
+| test.rs:146:21:146:21 | n | test.rs:147:13:147:21 | ExprStmt | match |
+| test.rs:146:26:146:26 | a | test.rs:146:16:146:22 | TupleStructPat |  |
+| test.rs:147:13:147:20 | ReturnExpr | test.rs:145:5:150:5 | exit test_if_let (normal) | return |
+| test.rs:147:13:147:21 | ExprStmt | test.rs:147:20:147:20 | n |  |
+| test.rs:147:20:147:20 | n | test.rs:147:13:147:20 | ReturnExpr |  |
+| test.rs:149:9:149:9 | 0 | test.rs:145:43:150:5 | BlockExpr |  |
+| test.rs:152:5:158:5 | enter test_nested_if | test.rs:152:23:152:23 | a |  |
+| test.rs:152:5:158:5 | exit test_nested_if (normal) | test.rs:152:5:158:5 | exit test_nested_if |  |
+| test.rs:152:23:152:23 | a | test.rs:152:23:152:28 | Param | match |
+| test.rs:152:23:152:28 | Param | test.rs:153:16:153:16 | a |  |
+| test.rs:152:38:158:5 | BlockExpr | test.rs:152:5:158:5 | exit test_nested_if (normal) |  |
+| test.rs:153:9:157:9 | IfExpr | test.rs:152:38:158:5 | BlockExpr |  |
+| test.rs:153:13:153:48 | [boolean(false)] IfExpr | test.rs:156:13:156:13 | 0 | false |
+| test.rs:153:13:153:48 | [boolean(true)] IfExpr | test.rs:154:13:154:13 | 1 | true |
+| test.rs:153:16:153:16 | a | test.rs:153:20:153:20 | 0 |  |
+| test.rs:153:16:153:20 | ... < ... | test.rs:153:24:153:24 | a | true |
+| test.rs:153:16:153:20 | ... < ... | test.rs:153:41:153:41 | a | false |
+| test.rs:153:20:153:20 | 0 | test.rs:153:16:153:20 | ... < ... |  |
+| test.rs:153:22:153:32 | [boolean(false)] BlockExpr | test.rs:153:13:153:48 | [boolean(false)] IfExpr | false |
+| test.rs:153:22:153:32 | [boolean(true)] BlockExpr | test.rs:153:13:153:48 | [boolean(true)] IfExpr | true |
+| test.rs:153:24:153:24 | a | test.rs:153:29:153:30 | 10 |  |
+| test.rs:153:24:153:30 | ... < ... | test.rs:153:22:153:32 | [boolean(false)] BlockExpr | false |
+| test.rs:153:24:153:30 | ... < ... | test.rs:153:22:153:32 | [boolean(true)] BlockExpr | true |
+| test.rs:153:28:153:30 | - ... | test.rs:153:24:153:30 | ... < ... |  |
+| test.rs:153:29:153:30 | 10 | test.rs:153:28:153:30 | - ... |  |
+| test.rs:153:39:153:48 | [boolean(false)] BlockExpr | test.rs:153:13:153:48 | [boolean(false)] IfExpr | false |
+| test.rs:153:39:153:48 | [boolean(true)] BlockExpr | test.rs:153:13:153:48 | [boolean(true)] IfExpr | true |
+| test.rs:153:41:153:41 | a | test.rs:153:45:153:46 | 10 |  |
+| test.rs:153:41:153:46 | ... > ... | test.rs:153:39:153:48 | [boolean(false)] BlockExpr | false |
+| test.rs:153:41:153:46 | ... > ... | test.rs:153:39:153:48 | [boolean(true)] BlockExpr | true |
+| test.rs:153:45:153:46 | 10 | test.rs:153:41:153:46 | ... > ... |  |
+| test.rs:153:51:155:9 | BlockExpr | test.rs:153:9:157:9 | IfExpr |  |
+| test.rs:154:13:154:13 | 1 | test.rs:153:51:155:9 | BlockExpr |  |
+| test.rs:155:16:157:9 | BlockExpr | test.rs:153:9:157:9 | IfExpr |  |
+| test.rs:156:13:156:13 | 0 | test.rs:155:16:157:9 | BlockExpr |  |
+| test.rs:160:5:169:5 | enter test_nested_if_match | test.rs:160:29:160:29 | a |  |
+| test.rs:160:5:169:5 | exit test_nested_if_match (normal) | test.rs:160:5:169:5 | exit test_nested_if_match |  |
+| test.rs:160:29:160:29 | a | test.rs:160:29:160:34 | Param | match |
+| test.rs:160:29:160:34 | Param | test.rs:161:19:161:19 | a |  |
+| test.rs:160:44:169:5 | BlockExpr | test.rs:160:5:169:5 | exit test_nested_if_match (normal) |  |
+| test.rs:161:9:168:9 | IfExpr | test.rs:160:44:169:5 | BlockExpr |  |
+| test.rs:161:13:164:9 | [boolean(false)] MatchExpr | test.rs:167:13:167:13 | 0 | false |
+| test.rs:161:13:164:9 | [boolean(true)] MatchExpr | test.rs:165:13:165:13 | 1 | true |
+| test.rs:161:19:161:19 | a | test.rs:162:13:162:13 | 0 |  |
+| test.rs:162:13:162:13 | 0 | test.rs:162:13:162:13 | LiteralPat |  |
+| test.rs:162:13:162:13 | LiteralPat | test.rs:162:18:162:21 | true | match |
+| test.rs:162:13:162:13 | LiteralPat | test.rs:163:13:163:13 | WildcardPat | no-match |
+| test.rs:162:18:162:21 | true | test.rs:161:13:164:9 | [boolean(true)] MatchExpr | true |
+| test.rs:163:13:163:13 | WildcardPat | test.rs:163:18:163:22 | false | match |
+| test.rs:163:18:163:22 | false | test.rs:161:13:164:9 | [boolean(false)] MatchExpr | false |
+| test.rs:164:12:166:9 | BlockExpr | test.rs:161:9:168:9 | IfExpr |  |
+| test.rs:165:13:165:13 | 1 | test.rs:164:12:166:9 | BlockExpr |  |
+| test.rs:166:16:168:9 | BlockExpr | test.rs:161:9:168:9 | IfExpr |  |
+| test.rs:167:13:167:13 | 0 | test.rs:166:16:168:9 | BlockExpr |  |
+| test.rs:171:5:180:5 | enter test_nested_if_block | test.rs:171:29:171:29 | a |  |
+| test.rs:171:5:180:5 | exit test_nested_if_block (normal) | test.rs:171:5:180:5 | exit test_nested_if_block |  |
+| test.rs:171:29:171:29 | a | test.rs:171:29:171:34 | Param | match |
+| test.rs:171:29:171:34 | Param | test.rs:173:13:173:15 | ExprStmt |  |
+| test.rs:171:44:180:5 | BlockExpr | test.rs:171:5:180:5 | exit test_nested_if_block (normal) |  |
+| test.rs:172:9:179:9 | IfExpr | test.rs:171:44:180:5 | BlockExpr |  |
+| test.rs:172:12:175:9 | [boolean(false)] BlockExpr | test.rs:178:13:178:13 | 0 | false |
+| test.rs:172:12:175:9 | [boolean(true)] BlockExpr | test.rs:176:13:176:13 | 1 | true |
+| test.rs:173:13:173:14 | TupleExpr | test.rs:174:13:174:13 | a |  |
+| test.rs:173:13:173:15 | ExprStmt | test.rs:173:13:173:14 | TupleExpr |  |
+| test.rs:174:13:174:13 | a | test.rs:174:17:174:17 | 0 |  |
+| test.rs:174:13:174:17 | ... > ... | test.rs:172:12:175:9 | [boolean(false)] BlockExpr | false |
+| test.rs:174:13:174:17 | ... > ... | test.rs:172:12:175:9 | [boolean(true)] BlockExpr | true |
+| test.rs:174:17:174:17 | 0 | test.rs:174:13:174:17 | ... > ... |  |
+| test.rs:175:11:177:9 | BlockExpr | test.rs:172:9:179:9 | IfExpr |  |
+| test.rs:176:13:176:13 | 1 | test.rs:175:11:177:9 | BlockExpr |  |
+| test.rs:177:16:179:9 | BlockExpr | test.rs:172:9:179:9 | IfExpr |  |
+| test.rs:178:13:178:13 | 0 | test.rs:177:16:179:9 | BlockExpr |  |
+| test.rs:182:5:192:5 | enter test_if_assignment | test.rs:182:27:182:27 | a |  |
+| test.rs:182:5:192:5 | exit test_if_assignment (normal) | test.rs:182:5:192:5 | exit test_if_assignment |  |
+| test.rs:182:27:182:27 | a | test.rs:182:27:182:32 | Param | match |
+| test.rs:182:27:182:32 | Param | test.rs:183:9:183:26 | LetStmt |  |
+| test.rs:182:42:192:5 | BlockExpr | test.rs:182:5:192:5 | exit test_if_assignment (normal) |  |
+| test.rs:183:9:183:26 | LetStmt | test.rs:183:21:183:25 | false |  |
+| test.rs:183:13:183:17 | x | test.rs:185:13:185:21 | ExprStmt | match |
+| test.rs:183:21:183:25 | false | test.rs:183:13:183:17 | x |  |
+| test.rs:184:9:191:9 | IfExpr | test.rs:182:42:192:5 | BlockExpr |  |
+| test.rs:184:12:187:9 | [boolean(false)] BlockExpr | test.rs:190:13:190:13 | 0 | false |
+| test.rs:184:12:187:9 | [boolean(true)] BlockExpr | test.rs:188:13:188:13 | 1 | true |
+| test.rs:185:13:185:13 | x | test.rs:185:17:185:20 | true |  |
+| test.rs:185:13:185:20 | ... = ... | test.rs:186:13:186:13 | x |  |
+| test.rs:185:13:185:21 | ExprStmt | test.rs:185:13:185:13 | x |  |
+| test.rs:185:17:185:20 | true | test.rs:185:13:185:20 | ... = ... |  |
+| test.rs:186:13:186:13 | x | test.rs:184:12:187:9 | [boolean(false)] BlockExpr | false |
+| test.rs:186:13:186:13 | x | test.rs:184:12:187:9 | [boolean(true)] BlockExpr | true |
+| test.rs:187:11:189:9 | BlockExpr | test.rs:184:9:191:9 | IfExpr |  |
+| test.rs:188:13:188:13 | 1 | test.rs:187:11:189:9 | BlockExpr |  |
+| test.rs:189:16:191:9 | BlockExpr | test.rs:184:9:191:9 | IfExpr |  |
+| test.rs:190:13:190:13 | 0 | test.rs:189:16:191:9 | BlockExpr |  |
+| test.rs:194:5:205:5 | enter test_if_loop1 | test.rs:194:22:194:22 | a |  |
+| test.rs:194:5:205:5 | exit test_if_loop1 (normal) | test.rs:194:5:205:5 | exit test_if_loop1 |  |
+| test.rs:194:22:194:22 | a | test.rs:194:22:194:27 | Param | match |
+| test.rs:194:22:194:27 | Param | test.rs:196:13:198:14 | ExprStmt |  |
+| test.rs:194:37:205:5 | BlockExpr | test.rs:194:5:205:5 | exit test_if_loop1 (normal) |  |
+| test.rs:195:9:204:9 | IfExpr | test.rs:194:37:205:5 | BlockExpr |  |
+| test.rs:195:13:200:9 | [boolean(false)] LoopExpr | test.rs:203:13:203:13 | 0 | false |
+| test.rs:195:13:200:9 | [boolean(true)] LoopExpr | test.rs:201:13:201:13 | 1 | true |
+| test.rs:195:18:200:9 | BlockExpr | test.rs:196:13:198:14 | ExprStmt |  |
+| test.rs:196:13:198:13 | IfExpr | test.rs:199:13:199:19 | ExprStmt |  |
+| test.rs:196:13:198:14 | ExprStmt | test.rs:196:16:196:16 | a |  |
+| test.rs:196:16:196:16 | a | test.rs:196:20:196:20 | 0 |  |
+| test.rs:196:16:196:20 | ... > ... | test.rs:196:13:198:13 | IfExpr | false |
+| test.rs:196:16:196:20 | ... > ... | test.rs:197:17:197:29 | ExprStmt | true |
+| test.rs:196:20:196:20 | 0 | test.rs:196:16:196:20 | ... > ... |  |
+| test.rs:197:17:197:28 | [boolean(false)] BreakExpr | test.rs:195:13:200:9 | [boolean(false)] LoopExpr | break |
+| test.rs:197:17:197:28 | [boolean(true)] BreakExpr | test.rs:195:13:200:9 | [boolean(true)] LoopExpr | break |
+| test.rs:197:17:197:29 | ExprStmt | test.rs:197:23:197:23 | a |  |
+| test.rs:197:23:197:23 | a | test.rs:197:27:197:28 | 10 |  |
+| test.rs:197:23:197:28 | ... > ... | test.rs:197:17:197:28 | [boolean(false)] BreakExpr | false |
+| test.rs:197:23:197:28 | ... > ... | test.rs:197:17:197:28 | [boolean(true)] BreakExpr | true |
+| test.rs:197:27:197:28 | 10 | test.rs:197:23:197:28 | ... > ... |  |
+| test.rs:199:13:199:13 | a | test.rs:199:17:199:18 | 10 |  |
+| test.rs:199:13:199:18 | ... < ... | test.rs:195:18:200:9 | BlockExpr |  |
+| test.rs:199:13:199:19 | ExprStmt | test.rs:199:13:199:13 | a |  |
+| test.rs:199:17:199:18 | 10 | test.rs:199:13:199:18 | ... < ... |  |
+| test.rs:200:12:202:9 | BlockExpr | test.rs:195:9:204:9 | IfExpr |  |
+| test.rs:201:13:201:13 | 1 | test.rs:200:12:202:9 | BlockExpr |  |
+| test.rs:202:16:204:9 | BlockExpr | test.rs:195:9:204:9 | IfExpr |  |
+| test.rs:203:13:203:13 | 0 | test.rs:202:16:204:9 | BlockExpr |  |
+| test.rs:207:5:218:5 | enter test_if_loop2 | test.rs:207:22:207:22 | a |  |
+| test.rs:207:5:218:5 | exit test_if_loop2 (normal) | test.rs:207:5:218:5 | exit test_if_loop2 |  |
+| test.rs:207:22:207:22 | a | test.rs:207:22:207:27 | Param | match |
+| test.rs:207:22:207:27 | Param | test.rs:209:13:211:14 | ExprStmt |  |
+| test.rs:207:37:218:5 | BlockExpr | test.rs:207:5:218:5 | exit test_if_loop2 (normal) |  |
+| test.rs:208:9:217:9 | IfExpr | test.rs:207:37:218:5 | BlockExpr |  |
+| test.rs:208:13:213:9 | [boolean(false)] LoopExpr | test.rs:216:13:216:13 | 0 | false |
+| test.rs:208:13:213:9 | [boolean(true)] LoopExpr | test.rs:214:13:214:13 | 1 | true |
+| test.rs:208:26:213:9 | BlockExpr | test.rs:209:13:211:14 | ExprStmt |  |
+| test.rs:209:13:211:13 | IfExpr | test.rs:212:13:212:19 | ExprStmt |  |
+| test.rs:209:13:211:14 | ExprStmt | test.rs:209:16:209:16 | a |  |
+| test.rs:209:16:209:16 | a | test.rs:209:20:209:20 | 0 |  |
+| test.rs:209:16:209:20 | ... > ... | test.rs:209:13:211:13 | IfExpr | false |
+| test.rs:209:16:209:20 | ... > ... | test.rs:210:17:210:36 | ExprStmt | true |
+| test.rs:209:20:209:20 | 0 | test.rs:209:16:209:20 | ... > ... |  |
+| test.rs:210:17:210:35 | [boolean(false)] BreakExpr | test.rs:208:13:213:9 | [boolean(false)] LoopExpr | break |
+| test.rs:210:17:210:35 | [boolean(true)] BreakExpr | test.rs:208:13:213:9 | [boolean(true)] LoopExpr | break |
+| test.rs:210:17:210:36 | ExprStmt | test.rs:210:30:210:30 | a |  |
+| test.rs:210:30:210:30 | a | test.rs:210:34:210:35 | 10 |  |
+| test.rs:210:30:210:35 | ... > ... | test.rs:210:17:210:35 | [boolean(false)] BreakExpr | false |
+| test.rs:210:30:210:35 | ... > ... | test.rs:210:17:210:35 | [boolean(true)] BreakExpr | true |
+| test.rs:210:34:210:35 | 10 | test.rs:210:30:210:35 | ... > ... |  |
+| test.rs:212:13:212:13 | a | test.rs:212:17:212:18 | 10 |  |
+| test.rs:212:13:212:18 | ... < ... | test.rs:208:26:213:9 | BlockExpr |  |
+| test.rs:212:13:212:19 | ExprStmt | test.rs:212:13:212:13 | a |  |
+| test.rs:212:17:212:18 | 10 | test.rs:212:13:212:18 | ... < ... |  |
+| test.rs:213:12:215:9 | BlockExpr | test.rs:208:9:217:9 | IfExpr |  |
+| test.rs:214:13:214:13 | 1 | test.rs:213:12:215:9 | BlockExpr |  |
+| test.rs:215:16:217:9 | BlockExpr | test.rs:208:9:217:9 | IfExpr |  |
+| test.rs:216:13:216:13 | 0 | test.rs:215:16:217:9 | BlockExpr |  |
+| test.rs:220:5:228:5 | enter test_labelled_block | test.rs:220:28:220:28 | a |  |
+| test.rs:220:5:228:5 | exit test_labelled_block (normal) | test.rs:220:5:228:5 | exit test_labelled_block |  |
+| test.rs:220:28:220:28 | a | test.rs:220:28:220:33 | Param | match |
+| test.rs:220:28:220:33 | Param | test.rs:222:13:222:31 | ExprStmt |  |
+| test.rs:220:43:228:5 | BlockExpr | test.rs:220:5:228:5 | exit test_labelled_block (normal) |  |
+| test.rs:221:9:227:9 | IfExpr | test.rs:220:43:228:5 | BlockExpr |  |
+| test.rs:221:13:223:9 | [boolean(false)] BlockExpr | test.rs:226:13:226:13 | 0 | false |
+| test.rs:221:13:223:9 | [boolean(true)] BlockExpr | test.rs:224:13:224:13 | 1 | true |
+| test.rs:222:13:222:30 | [boolean(false)] BreakExpr | test.rs:221:13:223:9 | [boolean(false)] BlockExpr | break |
+| test.rs:222:13:222:30 | [boolean(true)] BreakExpr | test.rs:221:13:223:9 | [boolean(true)] BlockExpr | break |
+| test.rs:222:13:222:31 | ExprStmt | test.rs:222:26:222:26 | a |  |
+| test.rs:222:26:222:26 | a | test.rs:222:30:222:30 | 0 |  |
+| test.rs:222:26:222:30 | ... > ... | test.rs:222:13:222:30 | [boolean(false)] BreakExpr | false |
+| test.rs:222:26:222:30 | ... > ... | test.rs:222:13:222:30 | [boolean(true)] BreakExpr | true |
+| test.rs:222:30:222:30 | 0 | test.rs:222:26:222:30 | ... > ... |  |
+| test.rs:223:12:225:9 | BlockExpr | test.rs:221:9:227:9 | IfExpr |  |
+| test.rs:224:13:224:13 | 1 | test.rs:223:12:225:9 | BlockExpr |  |
+| test.rs:225:16:227:9 | BlockExpr | test.rs:221:9:227:9 | IfExpr |  |
+| test.rs:226:13:226:13 | 0 | test.rs:225:16:227:9 | BlockExpr |  |
+| test.rs:233:5:236:5 | enter test_and_operator | test.rs:233:30:233:30 | a |  |
+| test.rs:233:5:236:5 | exit test_and_operator (normal) | test.rs:233:5:236:5 | exit test_and_operator |  |
+| test.rs:233:30:233:30 | a | test.rs:233:30:233:36 | Param | match |
+| test.rs:233:30:233:36 | Param | test.rs:233:39:233:39 | b |  |
+| test.rs:233:39:233:39 | b | test.rs:233:39:233:45 | Param | match |
+| test.rs:233:39:233:45 | Param | test.rs:233:48:233:48 | c |  |
+| test.rs:233:48:233:48 | c | test.rs:233:48:233:54 | Param | match |
+| test.rs:233:48:233:54 | Param | test.rs:234:9:234:28 | LetStmt |  |
+| test.rs:233:65:236:5 | BlockExpr | test.rs:233:5:236:5 | exit test_and_operator (normal) |  |
+| test.rs:234:9:234:28 | LetStmt | test.rs:234:17:234:17 | a |  |
+| test.rs:234:13:234:13 | d | test.rs:235:9:235:9 | d | match |
+| test.rs:234:17:234:17 | a | test.rs:234:17:234:22 | [boolean(false)] ... && ... | false |
+| test.rs:234:17:234:17 | a | test.rs:234:22:234:22 | b | true |
+| test.rs:234:17:234:22 | [boolean(false)] ... && ... | test.rs:234:17:234:27 | ... && ... | false |
+| test.rs:234:17:234:22 | [boolean(true)] ... && ... | test.rs:234:27:234:27 | c | true |
+| test.rs:234:17:234:27 | ... && ... | test.rs:234:13:234:13 | d |  |
+| test.rs:234:22:234:22 | b | test.rs:234:17:234:22 | [boolean(false)] ... && ... | false |
+| test.rs:234:22:234:22 | b | test.rs:234:17:234:22 | [boolean(true)] ... && ... | true |
+| test.rs:234:27:234:27 | c | test.rs:234:17:234:27 | ... && ... |  |
+| test.rs:235:9:235:9 | d | test.rs:233:65:236:5 | BlockExpr |  |
+| test.rs:238:5:241:5 | enter test_or_operator | test.rs:238:25:238:25 | a |  |
+| test.rs:238:5:241:5 | exit test_or_operator (normal) | test.rs:238:5:241:5 | exit test_or_operator |  |
+| test.rs:238:25:238:25 | a | test.rs:238:25:238:31 | Param | match |
+| test.rs:238:25:238:31 | Param | test.rs:238:34:238:34 | b |  |
+| test.rs:238:34:238:34 | b | test.rs:238:34:238:40 | Param | match |
+| test.rs:238:34:238:40 | Param | test.rs:238:43:238:43 | c |  |
+| test.rs:238:43:238:43 | c | test.rs:238:43:238:49 | Param | match |
+| test.rs:238:43:238:49 | Param | test.rs:239:9:239:28 | LetStmt |  |
+| test.rs:238:60:241:5 | BlockExpr | test.rs:238:5:241:5 | exit test_or_operator (normal) |  |
+| test.rs:239:9:239:28 | LetStmt | test.rs:239:17:239:17 | a |  |
+| test.rs:239:13:239:13 | d | test.rs:240:9:240:9 | d | match |
+| test.rs:239:17:239:17 | a | test.rs:239:17:239:22 | [boolean(true)] ... \|\| ... | true |
+| test.rs:239:17:239:17 | a | test.rs:239:22:239:22 | b | false |
+| test.rs:239:17:239:22 | [boolean(false)] ... \|\| ... | test.rs:239:27:239:27 | c | false |
+| test.rs:239:17:239:22 | [boolean(true)] ... \|\| ... | test.rs:239:17:239:27 | ... \|\| ... | true |
+| test.rs:239:17:239:27 | ... \|\| ... | test.rs:239:13:239:13 | d |  |
+| test.rs:239:22:239:22 | b | test.rs:239:17:239:22 | [boolean(false)] ... \|\| ... | false |
+| test.rs:239:22:239:22 | b | test.rs:239:17:239:22 | [boolean(true)] ... \|\| ... | true |
+| test.rs:239:27:239:27 | c | test.rs:239:17:239:27 | ... \|\| ... |  |
+| test.rs:240:9:240:9 | d | test.rs:238:60:241:5 | BlockExpr |  |
+| test.rs:243:5:246:5 | enter test_or_operator_2 | test.rs:243:27:243:27 | a |  |
+| test.rs:243:5:246:5 | exit test_or_operator_2 (normal) | test.rs:243:5:246:5 | exit test_or_operator_2 |  |
+| test.rs:243:27:243:27 | a | test.rs:243:27:243:33 | Param | match |
+| test.rs:243:27:243:33 | Param | test.rs:243:36:243:36 | b |  |
+| test.rs:243:36:243:36 | b | test.rs:243:36:243:41 | Param | match |
+| test.rs:243:36:243:41 | Param | test.rs:243:44:243:44 | c |  |
+| test.rs:243:44:243:44 | c | test.rs:243:44:243:50 | Param | match |
+| test.rs:243:44:243:50 | Param | test.rs:244:9:244:36 | LetStmt |  |
+| test.rs:243:61:246:5 | BlockExpr | test.rs:243:5:246:5 | exit test_or_operator_2 (normal) |  |
+| test.rs:244:9:244:36 | LetStmt | test.rs:244:17:244:17 | a |  |
+| test.rs:244:13:244:13 | d | test.rs:245:9:245:9 | d | match |
+| test.rs:244:17:244:17 | a | test.rs:244:17:244:30 | [boolean(true)] ... \|\| ... | true |
+| test.rs:244:17:244:17 | a | test.rs:244:23:244:23 | b | false |
+| test.rs:244:17:244:30 | [boolean(false)] ... \|\| ... | test.rs:244:35:244:35 | c | false |
+| test.rs:244:17:244:30 | [boolean(true)] ... \|\| ... | test.rs:244:17:244:35 | ... \|\| ... | true |
+| test.rs:244:17:244:35 | ... \|\| ... | test.rs:244:13:244:13 | d |  |
+| test.rs:244:23:244:23 | b | test.rs:244:28:244:29 | 28 |  |
+| test.rs:244:23:244:29 | ... == ... | test.rs:244:17:244:30 | [boolean(false)] ... \|\| ... | false |
+| test.rs:244:23:244:29 | ... == ... | test.rs:244:17:244:30 | [boolean(true)] ... \|\| ... | true |
+| test.rs:244:28:244:29 | 28 | test.rs:244:23:244:29 | ... == ... |  |
+| test.rs:244:35:244:35 | c | test.rs:244:17:244:35 | ... \|\| ... |  |
+| test.rs:245:9:245:9 | d | test.rs:243:61:246:5 | BlockExpr |  |
+| test.rs:248:5:251:5 | enter test_not_operator | test.rs:248:26:248:26 | a |  |
+| test.rs:248:5:251:5 | exit test_not_operator (normal) | test.rs:248:5:251:5 | exit test_not_operator |  |
+| test.rs:248:26:248:26 | a | test.rs:248:26:248:32 | Param | match |
+| test.rs:248:26:248:32 | Param | test.rs:249:9:249:19 | LetStmt |  |
+| test.rs:248:43:251:5 | BlockExpr | test.rs:248:5:251:5 | exit test_not_operator (normal) |  |
+| test.rs:249:9:249:19 | LetStmt | test.rs:249:18:249:18 | a |  |
+| test.rs:249:13:249:13 | d | test.rs:250:9:250:9 | d | match |
+| test.rs:249:17:249:18 | ! ... | test.rs:249:13:249:13 | d |  |
+| test.rs:249:18:249:18 | a | test.rs:249:17:249:18 | ! ... |  |
+| test.rs:250:9:250:9 | d | test.rs:248:43:251:5 | BlockExpr |  |
+| test.rs:253:5:259:5 | enter test_if_and_operator | test.rs:253:29:253:29 | a |  |
+| test.rs:253:5:259:5 | exit test_if_and_operator (normal) | test.rs:253:5:259:5 | exit test_if_and_operator |  |
+| test.rs:253:29:253:29 | a | test.rs:253:29:253:35 | Param | match |
+| test.rs:253:29:253:35 | Param | test.rs:253:38:253:38 | b |  |
+| test.rs:253:38:253:38 | b | test.rs:253:38:253:44 | Param | match |
+| test.rs:253:38:253:44 | Param | test.rs:253:47:253:47 | c |  |
+| test.rs:253:47:253:47 | c | test.rs:253:47:253:53 | Param | match |
+| test.rs:253:47:253:53 | Param | test.rs:254:12:254:12 | a |  |
+| test.rs:253:64:259:5 | BlockExpr | test.rs:253:5:259:5 | exit test_if_and_operator (normal) |  |
+| test.rs:254:9:258:9 | IfExpr | test.rs:253:64:259:5 | BlockExpr |  |
+| test.rs:254:12:254:12 | a | test.rs:254:12:254:17 | [boolean(false)] ... && ... | false |
+| test.rs:254:12:254:12 | a | test.rs:254:17:254:17 | b | true |
+| test.rs:254:12:254:17 | [boolean(false)] ... && ... | test.rs:254:12:254:22 | [boolean(false)] ... && ... | false |
+| test.rs:254:12:254:17 | [boolean(true)] ... && ... | test.rs:254:22:254:22 | c | true |
+| test.rs:254:12:254:22 | [boolean(false)] ... && ... | test.rs:257:13:257:17 | false | false |
+| test.rs:254:12:254:22 | [boolean(true)] ... && ... | test.rs:255:13:255:16 | true | true |
+| test.rs:254:17:254:17 | b | test.rs:254:12:254:17 | [boolean(false)] ... && ... | false |
+| test.rs:254:17:254:17 | b | test.rs:254:12:254:17 | [boolean(true)] ... && ... | true |
+| test.rs:254:22:254:22 | c | test.rs:254:12:254:22 | [boolean(false)] ... && ... | false |
+| test.rs:254:22:254:22 | c | test.rs:254:12:254:22 | [boolean(true)] ... && ... | true |
+| test.rs:254:24:256:9 | BlockExpr | test.rs:254:9:258:9 | IfExpr |  |
+| test.rs:255:13:255:16 | true | test.rs:254:24:256:9 | BlockExpr |  |
+| test.rs:256:16:258:9 | BlockExpr | test.rs:254:9:258:9 | IfExpr |  |
+| test.rs:257:13:257:17 | false | test.rs:256:16:258:9 | BlockExpr |  |
+| test.rs:261:5:267:5 | enter test_if_or_operator | test.rs:261:28:261:28 | a |  |
+| test.rs:261:5:267:5 | exit test_if_or_operator (normal) | test.rs:261:5:267:5 | exit test_if_or_operator |  |
+| test.rs:261:28:261:28 | a | test.rs:261:28:261:34 | Param | match |
+| test.rs:261:28:261:34 | Param | test.rs:261:37:261:37 | b |  |
+| test.rs:261:37:261:37 | b | test.rs:261:37:261:43 | Param | match |
+| test.rs:261:37:261:43 | Param | test.rs:261:46:261:46 | c |  |
+| test.rs:261:46:261:46 | c | test.rs:261:46:261:52 | Param | match |
+| test.rs:261:46:261:52 | Param | test.rs:262:12:262:12 | a |  |
+| test.rs:261:63:267:5 | BlockExpr | test.rs:261:5:267:5 | exit test_if_or_operator (normal) |  |
+| test.rs:262:9:266:9 | IfExpr | test.rs:261:63:267:5 | BlockExpr |  |
+| test.rs:262:12:262:12 | a | test.rs:262:12:262:17 | [boolean(true)] ... \|\| ... | true |
+| test.rs:262:12:262:12 | a | test.rs:262:17:262:17 | b | false |
+| test.rs:262:12:262:17 | [boolean(false)] ... \|\| ... | test.rs:262:22:262:22 | c | false |
+| test.rs:262:12:262:17 | [boolean(true)] ... \|\| ... | test.rs:262:12:262:22 | [boolean(true)] ... \|\| ... | true |
+| test.rs:262:12:262:22 | [boolean(false)] ... \|\| ... | test.rs:265:13:265:17 | false | false |
+| test.rs:262:12:262:22 | [boolean(true)] ... \|\| ... | test.rs:263:13:263:16 | true | true |
+| test.rs:262:17:262:17 | b | test.rs:262:12:262:17 | [boolean(false)] ... \|\| ... | false |
+| test.rs:262:17:262:17 | b | test.rs:262:12:262:17 | [boolean(true)] ... \|\| ... | true |
+| test.rs:262:22:262:22 | c | test.rs:262:12:262:22 | [boolean(false)] ... \|\| ... | false |
+| test.rs:262:22:262:22 | c | test.rs:262:12:262:22 | [boolean(true)] ... \|\| ... | true |
+| test.rs:262:24:264:9 | BlockExpr | test.rs:262:9:266:9 | IfExpr |  |
+| test.rs:263:13:263:16 | true | test.rs:262:24:264:9 | BlockExpr |  |
+| test.rs:264:16:266:9 | BlockExpr | test.rs:262:9:266:9 | IfExpr |  |
+| test.rs:265:13:265:17 | false | test.rs:264:16:266:9 | BlockExpr |  |
+| test.rs:269:5:275:5 | enter test_if_not_operator | test.rs:269:29:269:29 | a |  |
+| test.rs:269:5:275:5 | exit test_if_not_operator (normal) | test.rs:269:5:275:5 | exit test_if_not_operator |  |
+| test.rs:269:29:269:29 | a | test.rs:269:29:269:35 | Param | match |
+| test.rs:269:29:269:35 | Param | test.rs:270:13:270:13 | a |  |
+| test.rs:269:46:275:5 | BlockExpr | test.rs:269:5:275:5 | exit test_if_not_operator (normal) |  |
+| test.rs:270:9:274:9 | IfExpr | test.rs:269:46:275:5 | BlockExpr |  |
+| test.rs:270:12:270:13 | [boolean(false)] ! ... | test.rs:273:13:273:17 | false | false |
+| test.rs:270:12:270:13 | [boolean(true)] ! ... | test.rs:271:13:271:16 | true | true |
+| test.rs:270:13:270:13 | a | test.rs:270:12:270:13 | [boolean(false)] ! ... | true |
+| test.rs:270:13:270:13 | a | test.rs:270:12:270:13 | [boolean(true)] ! ... | false |
+| test.rs:270:15:272:9 | BlockExpr | test.rs:270:9:274:9 | IfExpr |  |
+| test.rs:271:13:271:16 | true | test.rs:270:15:272:9 | BlockExpr |  |
+| test.rs:272:16:274:9 | BlockExpr | test.rs:270:9:274:9 | IfExpr |  |
+| test.rs:273:13:273:17 | false | test.rs:272:16:274:9 | BlockExpr |  |
+| test.rs:277:5:279:5 | enter test_and_return | test.rs:277:24:277:24 | a |  |
+| test.rs:277:5:279:5 | exit test_and_return (normal) | test.rs:277:5:279:5 | exit test_and_return |  |
+| test.rs:277:24:277:24 | a | test.rs:277:24:277:30 | Param | match |
+| test.rs:277:24:277:30 | Param | test.rs:278:9:278:20 | ExprStmt |  |
+| test.rs:277:33:279:5 | BlockExpr | test.rs:277:5:279:5 | exit test_and_return (normal) |  |
+| test.rs:278:9:278:9 | a | test.rs:278:9:278:19 | ... && ... | false |
+| test.rs:278:9:278:9 | a | test.rs:278:14:278:19 | ReturnExpr | true |
+| test.rs:278:9:278:19 | ... && ... | test.rs:277:33:279:5 | BlockExpr |  |
+| test.rs:278:9:278:20 | ExprStmt | test.rs:278:9:278:9 | a |  |
+| test.rs:278:14:278:19 | ReturnExpr | test.rs:277:5:279:5 | exit test_and_return (normal) | return |
+| test.rs:285:5:287:5 | enter test_question_mark_operator_1 | test.rs:285:38:285:38 | s |  |
+| test.rs:285:5:287:5 | exit test_question_mark_operator_1 (normal) | test.rs:285:5:287:5 | exit test_question_mark_operator_1 |  |
+| test.rs:285:38:285:38 | s | test.rs:285:38:285:44 | Param | match |
+| test.rs:285:38:285:44 | Param | test.rs:286:9:286:10 | Ok |  |
+| test.rs:285:87:287:5 | BlockExpr | test.rs:285:5:287:5 | exit test_question_mark_operator_1 (normal) |  |
+| test.rs:286:9:286:10 | Ok | test.rs:286:12:286:12 | s |  |
+| test.rs:286:9:286:33 | CallExpr | test.rs:285:87:287:5 | BlockExpr |  |
+| test.rs:286:12:286:12 | s | test.rs:286:12:286:27 | ... .parse(...) |  |
+| test.rs:286:12:286:27 | ... .parse(...) | test.rs:286:12:286:28 | TryExpr |  |
+| test.rs:286:12:286:28 | TryExpr | test.rs:285:5:287:5 | exit test_question_mark_operator_1 (normal) | return |
+| test.rs:286:12:286:28 | TryExpr | test.rs:286:32:286:32 | 4 | match |
+| test.rs:286:12:286:32 | ... + ... | test.rs:286:9:286:33 | CallExpr |  |
+| test.rs:286:32:286:32 | 4 | test.rs:286:12:286:32 | ... + ... |  |
+| test.rs:289:5:294:5 | enter test_question_mark_operator_2 | test.rs:289:38:289:38 | b |  |
+| test.rs:289:5:294:5 | exit test_question_mark_operator_2 (normal) | test.rs:289:5:294:5 | exit test_question_mark_operator_2 |  |
+| test.rs:289:38:289:38 | b | test.rs:289:38:289:52 | Param | match |
+| test.rs:289:38:289:52 | Param | test.rs:290:15:290:15 | b |  |
+| test.rs:289:71:294:5 | BlockExpr | test.rs:289:5:294:5 | exit test_question_mark_operator_2 (normal) |  |
+| test.rs:290:9:293:9 | MatchExpr | test.rs:289:71:294:5 | BlockExpr |  |
+| test.rs:290:15:290:15 | b | test.rs:290:15:290:16 | TryExpr |  |
+| test.rs:290:15:290:16 | TryExpr | test.rs:289:5:294:5 | exit test_question_mark_operator_2 (normal) | return |
+| test.rs:290:15:290:16 | TryExpr | test.rs:291:13:291:16 | true | match |
+| test.rs:291:13:291:16 | LiteralPat | test.rs:291:21:291:24 | Some | match |
+| test.rs:291:13:291:16 | LiteralPat | test.rs:292:13:292:17 | false | no-match |
+| test.rs:291:13:291:16 | true | test.rs:291:13:291:16 | LiteralPat |  |
+| test.rs:291:21:291:24 | Some | test.rs:291:26:291:30 | false |  |
+| test.rs:291:21:291:31 | CallExpr | test.rs:290:9:293:9 | MatchExpr |  |
+| test.rs:291:26:291:30 | false | test.rs:291:21:291:31 | CallExpr |  |
+| test.rs:292:13:292:17 | LiteralPat | test.rs:292:22:292:25 | Some | match |
+| test.rs:292:13:292:17 | false | test.rs:292:13:292:17 | LiteralPat |  |
+| test.rs:292:22:292:25 | Some | test.rs:292:27:292:30 | true |  |
+| test.rs:292:22:292:31 | CallExpr | test.rs:290:9:293:9 | MatchExpr |  |
+| test.rs:292:27:292:30 | true | test.rs:292:22:292:31 | CallExpr |  |
+| test.rs:300:5:306:5 | enter test_match | test.rs:300:19:300:29 | maybe_digit |  |
+| test.rs:300:5:306:5 | exit test_match (normal) | test.rs:300:5:306:5 | exit test_match |  |
+| test.rs:300:19:300:29 | maybe_digit | test.rs:300:19:300:42 | Param | match |
+| test.rs:300:19:300:42 | Param | test.rs:301:15:301:25 | maybe_digit |  |
+| test.rs:300:52:306:5 | BlockExpr | test.rs:300:5:306:5 | exit test_match (normal) |  |
+| test.rs:301:9:305:9 | MatchExpr | test.rs:300:52:306:5 | BlockExpr |  |
+| test.rs:301:15:301:25 | maybe_digit | test.rs:302:13:302:27 | TupleStructPat |  |
+| test.rs:302:13:302:27 | TupleStructPat | test.rs:302:26:302:26 | x | match |
+| test.rs:302:13:302:27 | TupleStructPat | test.rs:303:13:303:27 | TupleStructPat | no-match |
+| test.rs:302:26:302:26 | x | test.rs:302:32:302:32 | x | match |
+| test.rs:302:32:302:32 | x | test.rs:302:36:302:37 | 10 |  |
+| test.rs:302:32:302:37 | ... < ... | test.rs:302:42:302:42 | x | true |
+| test.rs:302:32:302:37 | ... < ... | test.rs:303:13:303:27 | TupleStructPat | false |
+| test.rs:302:36:302:37 | 10 | test.rs:302:32:302:37 | ... < ... |  |
+| test.rs:302:42:302:42 | x | test.rs:302:46:302:46 | 5 |  |
+| test.rs:302:42:302:46 | ... + ... | test.rs:301:9:305:9 | MatchExpr |  |
+| test.rs:302:46:302:46 | 5 | test.rs:302:42:302:46 | ... + ... |  |
+| test.rs:303:13:303:27 | TupleStructPat | test.rs:303:26:303:26 | x | match |
+| test.rs:303:13:303:27 | TupleStructPat | test.rs:304:13:304:24 | PathPat | no-match |
+| test.rs:303:26:303:26 | x | test.rs:303:32:303:32 | x | match |
+| test.rs:303:32:303:32 | x | test.rs:301:9:305:9 | MatchExpr |  |
+| test.rs:304:13:304:24 | PathPat | test.rs:304:29:304:29 | 5 | match |
+| test.rs:304:29:304:29 | 5 | test.rs:301:9:305:9 | MatchExpr |  |
+| test.rs:308:5:317:5 | enter test_match_with_return_in_scrutinee | test.rs:308:44:308:54 | maybe_digit |  |
+| test.rs:308:5:317:5 | exit test_match_with_return_in_scrutinee (normal) | test.rs:308:5:317:5 | exit test_match_with_return_in_scrutinee |  |
+| test.rs:308:44:308:54 | maybe_digit | test.rs:308:44:308:67 | Param | match |
+| test.rs:308:44:308:67 | Param | test.rs:309:19:309:29 | maybe_digit |  |
+| test.rs:308:77:317:5 | BlockExpr | test.rs:308:5:317:5 | exit test_match_with_return_in_scrutinee (normal) |  |
+| test.rs:309:9:316:9 | MatchExpr | test.rs:308:77:317:5 | BlockExpr |  |
+| test.rs:309:16:313:9 | IfExpr | test.rs:314:13:314:27 | TupleStructPat |  |
+| test.rs:309:19:309:29 | maybe_digit | test.rs:309:34:309:37 | Some |  |
+| test.rs:309:19:309:40 | ... == ... | test.rs:310:13:310:21 | ExprStmt | true |
+| test.rs:309:19:309:40 | ... == ... | test.rs:312:13:312:23 | maybe_digit | false |
+| test.rs:309:34:309:37 | Some | test.rs:309:39:309:39 | 3 |  |
+| test.rs:309:34:309:40 | CallExpr | test.rs:309:19:309:40 | ... == ... |  |
+| test.rs:309:39:309:39 | 3 | test.rs:309:34:309:40 | CallExpr |  |
+| test.rs:310:13:310:20 | ReturnExpr | test.rs:308:5:317:5 | exit test_match_with_return_in_scrutinee (normal) | return |
+| test.rs:310:13:310:21 | ExprStmt | test.rs:310:20:310:20 | 3 |  |
+| test.rs:310:20:310:20 | 3 | test.rs:310:13:310:20 | ReturnExpr |  |
+| test.rs:311:16:313:9 | BlockExpr | test.rs:309:16:313:9 | IfExpr |  |
+| test.rs:312:13:312:23 | maybe_digit | test.rs:311:16:313:9 | BlockExpr |  |
+| test.rs:314:13:314:27 | TupleStructPat | test.rs:314:26:314:26 | x | match |
+| test.rs:314:13:314:27 | TupleStructPat | test.rs:315:13:315:24 | PathPat | no-match |
+| test.rs:314:26:314:26 | x | test.rs:314:32:314:32 | x | match |
+| test.rs:314:32:314:32 | x | test.rs:314:36:314:36 | 5 |  |
+| test.rs:314:32:314:36 | ... + ... | test.rs:309:9:316:9 | MatchExpr |  |
+| test.rs:314:36:314:36 | 5 | test.rs:314:32:314:36 | ... + ... |  |
+| test.rs:315:13:315:24 | PathPat | test.rs:315:29:315:29 | 5 | match |
+| test.rs:315:29:315:29 | 5 | test.rs:309:9:316:9 | MatchExpr |  |
+| test.rs:319:5:324:5 | enter test_match_and | test.rs:319:23:319:26 | cond |  |
+| test.rs:319:5:324:5 | exit test_match_and (normal) | test.rs:319:5:324:5 | exit test_match_and |  |
+| test.rs:319:23:319:26 | cond | test.rs:319:23:319:32 | Param | match |
+| test.rs:319:23:319:32 | Param | test.rs:319:35:319:35 | r |  |
+| test.rs:319:35:319:35 | r | test.rs:319:35:319:49 | Param | match |
+| test.rs:319:35:319:49 | Param | test.rs:320:16:320:16 | r |  |
+| test.rs:319:60:324:5 | BlockExpr | test.rs:319:5:324:5 | exit test_match_and (normal) |  |
+| test.rs:320:9:323:18 | ... && ... | test.rs:319:60:324:5 | BlockExpr |  |
+| test.rs:320:10:323:9 | [boolean(false)] MatchExpr | test.rs:320:9:323:18 | ... && ... | false |
+| test.rs:320:10:323:9 | [boolean(true)] MatchExpr | test.rs:323:15:323:18 | cond | true |
+| test.rs:320:16:320:16 | r | test.rs:321:13:321:19 | TupleStructPat |  |
+| test.rs:321:13:321:19 | TupleStructPat | test.rs:321:18:321:18 | a | match |
+| test.rs:321:13:321:19 | TupleStructPat | test.rs:322:13:322:13 | WildcardPat | no-match |
+| test.rs:321:18:321:18 | a | test.rs:321:24:321:24 | a | match |
+| test.rs:321:24:321:24 | a | test.rs:320:10:323:9 | [boolean(false)] MatchExpr | false |
+| test.rs:321:24:321:24 | a | test.rs:320:10:323:9 | [boolean(true)] MatchExpr | true |
+| test.rs:322:13:322:13 | WildcardPat | test.rs:322:18:322:22 | false | match |
+| test.rs:322:18:322:22 | false | test.rs:320:10:323:9 | [boolean(false)] MatchExpr | false |
+| test.rs:323:15:323:18 | cond | test.rs:320:9:323:18 | ... && ... |  |
+| test.rs:326:5:331:5 | enter test_match_with_no_arms | test.rs:326:35:326:35 | r |  |
+| test.rs:326:5:331:5 | exit test_match_with_no_arms (normal) | test.rs:326:5:331:5 | exit test_match_with_no_arms |  |
+| test.rs:326:35:326:35 | r | test.rs:326:35:326:58 | Param | match |
+| test.rs:326:35:326:58 | Param | test.rs:327:15:327:15 | r |  |
+| test.rs:326:66:331:5 | BlockExpr | test.rs:326:5:331:5 | exit test_match_with_no_arms (normal) |  |
+| test.rs:327:9:330:9 | MatchExpr | test.rs:326:66:331:5 | BlockExpr |  |
+| test.rs:327:15:327:15 | r | test.rs:328:13:328:21 | TupleStructPat |  |
+| test.rs:328:13:328:21 | TupleStructPat | test.rs:328:16:328:20 | value | match |
+| test.rs:328:13:328:21 | TupleStructPat | test.rs:329:13:329:22 | TupleStructPat | no-match |
+| test.rs:328:16:328:20 | value | test.rs:328:26:328:30 | value | match |
+| test.rs:328:26:328:30 | value | test.rs:327:9:330:9 | MatchExpr |  |
+| test.rs:329:13:329:22 | TupleStructPat | test.rs:329:17:329:21 | never | match |
+| test.rs:329:17:329:21 | never | test.rs:329:33:329:37 | never | match |
+| test.rs:329:27:329:40 | MatchExpr | test.rs:327:9:330:9 | MatchExpr |  |
+| test.rs:329:33:329:37 | never | test.rs:329:27:329:40 | MatchExpr |  |
+| test.rs:336:5:339:5 | enter test_let_match | test.rs:336:23:336:23 | a |  |
+| test.rs:336:5:339:5 | exit test_let_match (normal) | test.rs:336:5:339:5 | exit test_let_match |  |
+| test.rs:336:23:336:23 | a | test.rs:336:23:336:36 | Param | match |
+| test.rs:336:23:336:36 | Param | test.rs:337:9:337:57 | LetStmt |  |
+| test.rs:336:46:339:5 | BlockExpr | test.rs:336:5:339:5 | exit test_let_match (normal) |  |
+| test.rs:337:9:337:57 | LetStmt | test.rs:337:23:337:23 | a |  |
+| test.rs:337:13:337:19 | TupleStructPat | test.rs:337:18:337:18 | n | match |
+| test.rs:337:13:337:19 | TupleStructPat | test.rs:337:39:337:53 | MacroStmts | no-match |
+| test.rs:337:18:337:18 | n | test.rs:338:9:338:9 | n | match |
+| test.rs:337:23:337:23 | a | test.rs:337:13:337:19 | TupleStructPat |  |
+| test.rs:337:32:337:54 | $crate::panicking::panic_fmt | test.rs:337:39:337:53 | "Expected some" |  |
+| test.rs:337:32:337:54 | MacroExpr | test.rs:337:30:337:56 | BlockExpr |  |
+| test.rs:337:39:337:53 | "Expected some" | test.rs:337:39:337:53 | FormatArgsExpr |  |
+| test.rs:337:39:337:53 | BlockExpr | test.rs:337:39:337:53 | MacroExpr |  |
+| test.rs:337:39:337:53 | CallExpr | test.rs:337:39:337:53 | BlockExpr |  |
+| test.rs:337:39:337:53 | ExprStmt | test.rs:337:32:337:54 | $crate::panicking::panic_fmt |  |
+| test.rs:337:39:337:53 | FormatArgsExpr | test.rs:337:39:337:53 | MacroExpr |  |
+| test.rs:337:39:337:53 | MacroExpr | test.rs:337:32:337:54 | MacroExpr |  |
+| test.rs:337:39:337:53 | MacroExpr | test.rs:337:39:337:53 | CallExpr |  |
+| test.rs:337:39:337:53 | MacroStmts | test.rs:337:39:337:53 | ExprStmt |  |
+| test.rs:337:39:337:53 | MacroStmts | test.rs:337:39:337:53 | MacroStmts |  |
+| test.rs:338:9:338:9 | n | test.rs:336:46:339:5 | BlockExpr |  |
+| test.rs:341:5:347:5 | enter test_let_with_return | test.rs:341:29:341:29 | m |  |
+| test.rs:341:5:347:5 | exit test_let_with_return (normal) | test.rs:341:5:347:5 | exit test_let_with_return |  |
+| test.rs:341:29:341:29 | m | test.rs:341:29:341:42 | Param | match |
+| test.rs:341:29:341:42 | Param | test.rs:342:9:345:10 | LetStmt |  |
+| test.rs:341:53:347:5 | BlockExpr | test.rs:341:5:347:5 | exit test_let_with_return (normal) |  |
+| test.rs:342:9:345:10 | LetStmt | test.rs:342:25:342:25 | m |  |
+| test.rs:342:13:342:15 | ret | test.rs:346:9:346:12 | true | match |
+| test.rs:342:19:345:9 | MatchExpr | test.rs:342:13:342:15 | ret |  |
+| test.rs:342:25:342:25 | m | test.rs:343:13:343:21 | TupleStructPat |  |
+| test.rs:343:13:343:21 | TupleStructPat | test.rs:343:18:343:20 | ret | match |
+| test.rs:343:13:343:21 | TupleStructPat | test.rs:344:13:344:16 | None | no-match |
+| test.rs:343:18:343:20 | ret | test.rs:343:26:343:28 | ret | match |
+| test.rs:343:26:343:28 | ret | test.rs:342:19:345:9 | MatchExpr |  |
+| test.rs:344:13:344:16 | None | test.rs:344:28:344:32 | false | match |
+| test.rs:344:21:344:32 | ReturnExpr | test.rs:341:5:347:5 | exit test_let_with_return (normal) | return |
+| test.rs:344:28:344:32 | false | test.rs:344:21:344:32 | ReturnExpr |  |
+| test.rs:346:9:346:12 | true | test.rs:341:53:347:5 | BlockExpr |  |
+| test.rs:352:5:355:5 | enter empty_tuple_pattern | test.rs:352:28:352:31 | unit |  |
+| test.rs:352:5:355:5 | exit empty_tuple_pattern (normal) | test.rs:352:5:355:5 | exit empty_tuple_pattern |  |
+| test.rs:352:28:352:31 | unit | test.rs:352:28:352:35 | Param | match |
+| test.rs:352:28:352:35 | Param | test.rs:353:9:353:22 | LetStmt |  |
+| test.rs:353:9:353:22 | LetStmt | test.rs:353:18:353:21 | unit |  |
+| test.rs:353:13:353:14 | TuplePat | test.rs:354:9:354:15 | ExprStmt | match |
+| test.rs:353:18:353:21 | unit | test.rs:353:13:353:14 | TuplePat |  |
+| test.rs:354:9:354:14 | ReturnExpr | test.rs:352:5:355:5 | exit empty_tuple_pattern (normal) | return |
+| test.rs:354:9:354:15 | ExprStmt | test.rs:354:9:354:14 | ReturnExpr |  |
+| test.rs:359:5:363:5 | enter empty_struct_pattern | test.rs:359:29:359:30 | st |  |
+| test.rs:359:5:363:5 | exit empty_struct_pattern (normal) | test.rs:359:5:363:5 | exit empty_struct_pattern |  |
+| test.rs:359:29:359:30 | st | test.rs:359:29:359:40 | Param | match |
+| test.rs:359:29:359:40 | Param | test.rs:360:15:360:16 | st |  |
+| test.rs:359:50:363:5 | BlockExpr | test.rs:359:5:363:5 | exit empty_struct_pattern (normal) |  |
+| test.rs:360:9:362:9 | MatchExpr | test.rs:359:50:363:5 | BlockExpr |  |
+| test.rs:360:15:360:16 | st | test.rs:361:13:361:27 | RecordPat |  |
+| test.rs:361:13:361:27 | RecordPat | test.rs:361:24:361:25 | RestPat | match |
+| test.rs:361:24:361:25 | RestPat | test.rs:361:32:361:32 | 1 | match |
+| test.rs:361:32:361:32 | 1 | test.rs:360:9:362:9 | MatchExpr |  |
+| test.rs:365:5:372:5 | enter range_pattern | test.rs:366:15:366:16 | 42 |  |
+| test.rs:365:5:372:5 | exit range_pattern (normal) | test.rs:365:5:372:5 | exit range_pattern |  |
+| test.rs:365:31:372:5 | BlockExpr | test.rs:365:5:372:5 | exit range_pattern (normal) |  |
+| test.rs:366:9:371:9 | MatchExpr | test.rs:365:31:372:5 | BlockExpr |  |
+| test.rs:366:15:366:16 | 42 | test.rs:367:13:367:15 | RangePat |  |
+| test.rs:367:13:367:15 | RangePat | test.rs:367:15:367:15 | 0 | match |
+| test.rs:367:13:367:15 | RangePat | test.rs:368:13:368:16 | RangePat | no-match |
+| test.rs:367:15:367:15 | 0 | test.rs:367:15:367:15 | LiteralPat |  |
+| test.rs:367:15:367:15 | LiteralPat | test.rs:367:20:367:20 | 1 | match |
+| test.rs:367:15:367:15 | LiteralPat | test.rs:368:13:368:16 | RangePat | no-match |
+| test.rs:367:20:367:20 | 1 | test.rs:366:9:371:9 | MatchExpr |  |
+| test.rs:368:13:368:13 | 1 | test.rs:368:13:368:13 | LiteralPat |  |
+| test.rs:368:13:368:13 | LiteralPat | test.rs:368:16:368:16 | 2 | match |
+| test.rs:368:13:368:13 | LiteralPat | test.rs:369:13:369:15 | RangePat | no-match |
+| test.rs:368:13:368:16 | RangePat | test.rs:368:13:368:13 | 1 | match |
+| test.rs:368:13:368:16 | RangePat | test.rs:369:13:369:15 | RangePat | no-match |
+| test.rs:368:16:368:16 | 2 | test.rs:368:16:368:16 | LiteralPat |  |
+| test.rs:368:16:368:16 | LiteralPat | test.rs:368:21:368:21 | 2 | match |
+| test.rs:368:16:368:16 | LiteralPat | test.rs:369:13:369:15 | RangePat | no-match |
+| test.rs:368:21:368:21 | 2 | test.rs:366:9:371:9 | MatchExpr |  |
+| test.rs:369:13:369:13 | 5 | test.rs:369:13:369:13 | LiteralPat |  |
+| test.rs:369:13:369:13 | LiteralPat | test.rs:369:20:369:20 | 3 | match |
+| test.rs:369:13:369:13 | LiteralPat | test.rs:370:13:370:13 | WildcardPat | no-match |
+| test.rs:369:13:369:15 | RangePat | test.rs:369:13:369:13 | 5 | match |
+| test.rs:369:13:369:15 | RangePat | test.rs:370:13:370:13 | WildcardPat | no-match |
+| test.rs:369:20:369:20 | 3 | test.rs:366:9:371:9 | MatchExpr |  |
+| test.rs:370:13:370:13 | WildcardPat | test.rs:370:18:370:18 | 4 | match |
+| test.rs:370:18:370:18 | 4 | test.rs:366:9:371:9 | MatchExpr |  |
+| test.rs:376:5:381:5 | enter test_infinite_loop | test.rs:377:9:379:9 | ExprStmt |  |
+| test.rs:377:9:379:9 | ExprStmt | test.rs:378:13:378:14 | TupleExpr |  |
+| test.rs:377:14:379:9 | BlockExpr | test.rs:378:13:378:14 | TupleExpr |  |
+| test.rs:378:13:378:14 | TupleExpr | test.rs:377:14:379:9 | BlockExpr |  |
+| test.rs:385:5:387:5 | enter say_hello | test.rs:386:9:386:34 | ExprStmt |  |
+| test.rs:385:5:387:5 | exit say_hello (normal) | test.rs:385:5:387:5 | exit say_hello |  |
+| test.rs:385:26:387:5 | BlockExpr | test.rs:385:5:387:5 | exit say_hello (normal) |  |
+| test.rs:386:9:386:33 | $crate::io::_print | test.rs:386:18:386:32 | "hello, world!\\n" |  |
+| test.rs:386:9:386:33 | MacroExpr | test.rs:385:26:387:5 | BlockExpr |  |
+| test.rs:386:9:386:34 | ExprStmt | test.rs:386:18:386:32 | MacroStmts |  |
+| test.rs:386:18:386:32 | "hello, world!\\n" | test.rs:386:18:386:32 | FormatArgsExpr |  |
+| test.rs:386:18:386:32 | BlockExpr | test.rs:386:9:386:33 | MacroExpr |  |
+| test.rs:386:18:386:32 | CallExpr | test.rs:386:18:386:32 | BlockExpr |  |
+| test.rs:386:18:386:32 | ExprStmt | test.rs:386:9:386:33 | $crate::io::_print |  |
+| test.rs:386:18:386:32 | FormatArgsExpr | test.rs:386:18:386:32 | MacroExpr |  |
+| test.rs:386:18:386:32 | MacroExpr | test.rs:386:18:386:32 | CallExpr |  |
+| test.rs:386:18:386:32 | MacroStmts | test.rs:386:18:386:32 | ExprStmt |  |
+| test.rs:389:5:408:5 | enter async_block | test.rs:389:26:389:26 | b |  |
+| test.rs:389:5:408:5 | exit async_block (normal) | test.rs:389:5:408:5 | exit async_block |  |
+| test.rs:389:26:389:26 | b | test.rs:389:26:389:32 | Param | match |
+| test.rs:389:26:389:32 | Param | test.rs:390:9:392:10 | LetStmt |  |
+| test.rs:389:35:408:5 | BlockExpr | test.rs:389:5:408:5 | exit async_block (normal) |  |
+| test.rs:390:9:392:10 | LetStmt | test.rs:390:26:392:9 | BlockExpr |  |
+| test.rs:390:13:390:22 | say_godbye | test.rs:393:9:395:10 | LetStmt | match |
+| test.rs:390:26:392:9 | BlockExpr | test.rs:390:13:390:22 | say_godbye |  |
+| test.rs:390:26:392:9 | enter BlockExpr | test.rs:391:13:391:42 | ExprStmt |  |
+| test.rs:390:26:392:9 | exit BlockExpr (normal) | test.rs:390:26:392:9 | exit BlockExpr |  |
+| test.rs:391:13:391:41 | $crate::io::_print | test.rs:391:22:391:40 | "godbye, everyone!\\n" |  |
+| test.rs:391:13:391:41 | MacroExpr | test.rs:390:26:392:9 | exit BlockExpr (normal) |  |
+| test.rs:391:13:391:42 | ExprStmt | test.rs:391:22:391:40 | MacroStmts |  |
+| test.rs:391:22:391:40 | "godbye, everyone!\\n" | test.rs:391:22:391:40 | FormatArgsExpr |  |
+| test.rs:391:22:391:40 | BlockExpr | test.rs:391:13:391:41 | MacroExpr |  |
+| test.rs:391:22:391:40 | CallExpr | test.rs:391:22:391:40 | BlockExpr |  |
+| test.rs:391:22:391:40 | ExprStmt | test.rs:391:13:391:41 | $crate::io::_print |  |
+| test.rs:391:22:391:40 | FormatArgsExpr | test.rs:391:22:391:40 | MacroExpr |  |
+| test.rs:391:22:391:40 | MacroExpr | test.rs:391:22:391:40 | CallExpr |  |
+| test.rs:391:22:391:40 | MacroStmts | test.rs:391:22:391:40 | ExprStmt |  |
+| test.rs:393:9:395:10 | LetStmt | test.rs:393:31:395:9 | BlockExpr |  |
+| test.rs:393:13:393:27 | say_how_are_you | test.rs:396:9:396:28 | LetStmt | match |
+| test.rs:393:31:395:9 | BlockExpr | test.rs:393:13:393:27 | say_how_are_you |  |
+| test.rs:393:31:395:9 | enter BlockExpr | test.rs:394:13:394:37 | ExprStmt |  |
+| test.rs:393:31:395:9 | exit BlockExpr (normal) | test.rs:393:31:395:9 | exit BlockExpr |  |
+| test.rs:394:13:394:36 | $crate::io::_print | test.rs:394:22:394:35 | "how are you?\\n" |  |
+| test.rs:394:13:394:36 | MacroExpr | test.rs:393:31:395:9 | exit BlockExpr (normal) |  |
+| test.rs:394:13:394:37 | ExprStmt | test.rs:394:22:394:35 | MacroStmts |  |
+| test.rs:394:22:394:35 | "how are you?\\n" | test.rs:394:22:394:35 | FormatArgsExpr |  |
+| test.rs:394:22:394:35 | BlockExpr | test.rs:394:13:394:36 | MacroExpr |  |
+| test.rs:394:22:394:35 | CallExpr | test.rs:394:22:394:35 | BlockExpr |  |
+| test.rs:394:22:394:35 | ExprStmt | test.rs:394:13:394:36 | $crate::io::_print |  |
+| test.rs:394:22:394:35 | FormatArgsExpr | test.rs:394:22:394:35 | MacroExpr |  |
+| test.rs:394:22:394:35 | MacroExpr | test.rs:394:22:394:35 | CallExpr |  |
+| test.rs:394:22:394:35 | MacroStmts | test.rs:394:22:394:35 | ExprStmt |  |
+| test.rs:396:9:396:28 | LetStmt | test.rs:396:20:396:27 | BlockExpr |  |
+| test.rs:396:13:396:16 | noop | test.rs:397:9:397:26 | ExprStmt | match |
+| test.rs:396:20:396:27 | BlockExpr | test.rs:396:13:396:16 | noop |  |
+| test.rs:397:9:397:17 | say_hello | test.rs:397:9:397:19 | CallExpr |  |
+| test.rs:397:9:397:19 | CallExpr | test.rs:397:9:397:25 | AwaitExpr |  |
+| test.rs:397:9:397:25 | AwaitExpr | test.rs:398:9:398:30 | ExprStmt |  |
+| test.rs:397:9:397:26 | ExprStmt | test.rs:397:9:397:17 | say_hello |  |
+| test.rs:398:9:398:23 | say_how_are_you | test.rs:398:9:398:29 | AwaitExpr |  |
+| test.rs:398:9:398:29 | AwaitExpr | test.rs:399:9:399:25 | ExprStmt |  |
+| test.rs:398:9:398:30 | ExprStmt | test.rs:398:9:398:23 | say_how_are_you |  |
+| test.rs:399:9:399:18 | say_godbye | test.rs:399:9:399:24 | AwaitExpr |  |
+| test.rs:399:9:399:24 | AwaitExpr | test.rs:400:9:400:19 | ExprStmt |  |
+| test.rs:399:9:399:25 | ExprStmt | test.rs:399:9:399:18 | say_godbye |  |
+| test.rs:400:9:400:12 | noop | test.rs:400:9:400:18 | AwaitExpr |  |
+| test.rs:400:9:400:18 | AwaitExpr | test.rs:402:9:407:10 | LetStmt |  |
+| test.rs:400:9:400:19 | ExprStmt | test.rs:400:9:400:12 | noop |  |
+| test.rs:402:9:407:10 | LetStmt | test.rs:402:22:407:9 | ClosureExpr |  |
+| test.rs:402:13:402:18 | lambda | test.rs:389:35:408:5 | BlockExpr | match |
+| test.rs:402:22:407:9 | ClosureExpr | test.rs:402:13:402:18 | lambda |  |
+| test.rs:402:22:407:9 | enter ClosureExpr | test.rs:402:23:402:25 | foo |  |
+| test.rs:402:22:407:9 | exit ClosureExpr (normal) | test.rs:402:22:407:9 | exit ClosureExpr |  |
+| test.rs:402:23:402:25 | Param | test.rs:402:28:407:9 | BlockExpr |  |
+| test.rs:402:23:402:25 | foo | test.rs:402:23:402:25 | Param | match |
+| test.rs:402:28:407:9 | BlockExpr | test.rs:402:22:407:9 | exit ClosureExpr (normal) |  |
+| test.rs:402:28:407:9 | enter BlockExpr | test.rs:403:13:405:14 | ExprStmt |  |
+| test.rs:402:28:407:9 | exit BlockExpr (normal) | test.rs:402:28:407:9 | exit BlockExpr |  |
+| test.rs:403:13:405:13 | IfExpr | test.rs:406:13:406:15 | foo |  |
+| test.rs:403:13:405:14 | ExprStmt | test.rs:403:16:403:16 | b |  |
+| test.rs:403:16:403:16 | b | test.rs:403:13:405:13 | IfExpr | false |
+| test.rs:403:16:403:16 | b | test.rs:404:17:404:41 | ExprStmt | true |
+| test.rs:404:17:404:40 | ReturnExpr | test.rs:402:28:407:9 | exit BlockExpr (normal) | return |
+| test.rs:404:17:404:41 | ExprStmt | test.rs:404:24:404:34 | async_block |  |
+| test.rs:404:24:404:34 | async_block | test.rs:404:36:404:39 | true |  |
+| test.rs:404:24:404:40 | CallExpr | test.rs:404:17:404:40 | ReturnExpr |  |
+| test.rs:404:36:404:39 | true | test.rs:404:24:404:40 | CallExpr |  |
+| test.rs:406:13:406:15 | foo | test.rs:402:28:407:9 | exit BlockExpr (normal) |  |
+| test.rs:414:5:416:5 | enter add_two | test.rs:414:22:414:22 | n |  |
+| test.rs:414:5:416:5 | exit add_two (normal) | test.rs:414:5:416:5 | exit add_two |  |
+| test.rs:414:22:414:22 | n | test.rs:414:22:414:27 | Param | match |
+| test.rs:414:22:414:27 | Param | test.rs:415:9:415:9 | n |  |
+| test.rs:414:37:416:5 | BlockExpr | test.rs:414:5:416:5 | exit add_two (normal) |  |
+| test.rs:415:9:415:9 | n | test.rs:415:13:415:13 | 2 |  |
+| test.rs:415:9:415:13 | ... + ... | test.rs:414:37:416:5 | BlockExpr |  |
+| test.rs:415:13:415:13 | 2 | test.rs:415:9:415:13 | ... + ... |  |
+| test.rs:420:5:428:5 | enter const_block_assert | test.rs:423:9:425:9 | ExprStmt |  |
+| test.rs:420:5:428:5 | exit const_block_assert (normal) | test.rs:420:5:428:5 | exit const_block_assert |  |
+| test.rs:420:41:428:5 | BlockExpr | test.rs:420:5:428:5 | exit const_block_assert (normal) |  |
+| test.rs:423:9:425:9 | BlockExpr | test.rs:427:9:427:10 | 42 |  |
+| test.rs:423:9:425:9 | ExprStmt | test.rs:424:13:424:50 | ExprStmt |  |
+| test.rs:424:13:424:49 | $crate::panicking::panic_explicit | test.rs:424:13:424:49 | CallExpr |  |
+| test.rs:424:13:424:49 | BlockExpr | test.rs:424:13:424:49 | MacroExpr |  |
+| test.rs:424:13:424:49 | BlockExpr | test.rs:424:13:424:49 | exit panic_cold_explicit (normal) |  |
+| test.rs:424:13:424:49 | BlockExpr | test.rs:424:21:424:48 | IfExpr |  |
+| test.rs:424:13:424:49 | CallExpr | test.rs:424:13:424:49 | BlockExpr |  |
+| test.rs:424:13:424:49 | CallExpr | test.rs:424:13:424:49 | BlockExpr |  |
+| test.rs:424:13:424:49 | ExprStmt | test.rs:424:13:424:49 | MacroStmts |  |
+| test.rs:424:13:424:49 | ExprStmt | test.rs:424:13:424:49 | panic_cold_explicit |  |
+| test.rs:424:13:424:49 | MacroExpr | test.rs:423:9:425:9 | BlockExpr |  |
+| test.rs:424:13:424:49 | MacroExpr | test.rs:424:13:424:49 | BlockExpr |  |
+| test.rs:424:13:424:49 | MacroStmts | test.rs:424:13:424:49 | panic_cold_explicit |  |
+| test.rs:424:13:424:49 | enter panic_cold_explicit | test.rs:424:13:424:49 | $crate::panicking::panic_explicit |  |
+| test.rs:424:13:424:49 | exit panic_cold_explicit (normal) | test.rs:424:13:424:49 | exit panic_cold_explicit |  |
+| test.rs:424:13:424:49 | panic_cold_explicit | test.rs:424:13:424:49 | CallExpr |  |
+| test.rs:424:13:424:49 | panic_cold_explicit | test.rs:424:13:424:49 | ExprStmt |  |
+| test.rs:424:13:424:50 | ExprStmt | test.rs:424:21:424:48 | MacroStmts |  |
+| test.rs:424:21:424:42 | std::mem::size_of::<...> | test.rs:424:21:424:44 | CallExpr |  |
+| test.rs:424:21:424:44 | CallExpr | test.rs:424:48:424:48 | 0 |  |
+| test.rs:424:21:424:48 | ... > ... | test.rs:424:21:424:48 | [boolean(false)] ! ... | true |
+| test.rs:424:21:424:48 | ... > ... | test.rs:424:21:424:48 | [boolean(true)] ! ... | false |
+| test.rs:424:21:424:48 | BlockExpr | test.rs:424:13:424:49 | MacroExpr |  |
+| test.rs:424:21:424:48 | IfExpr | test.rs:424:21:424:48 | BlockExpr |  |
+| test.rs:424:21:424:48 | MacroStmts | test.rs:424:21:424:42 | std::mem::size_of::<...> |  |
+| test.rs:424:21:424:48 | [boolean(false)] ! ... | test.rs:424:21:424:48 | IfExpr | false |
+| test.rs:424:21:424:48 | [boolean(true)] ! ... | test.rs:424:13:424:49 | ExprStmt | true |
+| test.rs:424:48:424:48 | 0 | test.rs:424:21:424:48 | ... > ... |  |
+| test.rs:427:9:427:10 | 42 | test.rs:420:41:428:5 | BlockExpr |  |
+| test.rs:430:5:439:5 | enter const_block_panic | test.rs:431:9:431:30 | Const |  |
+| test.rs:430:5:439:5 | exit const_block_panic (normal) | test.rs:430:5:439:5 | exit const_block_panic |  |
+| test.rs:430:35:439:5 | BlockExpr | test.rs:430:5:439:5 | exit const_block_panic (normal) |  |
+| test.rs:431:9:431:30 | Const | test.rs:432:9:437:9 | ExprStmt |  |
+| test.rs:432:9:437:9 | ExprStmt | test.rs:432:12:432:16 | false |  |
+| test.rs:432:9:437:9 | IfExpr | test.rs:438:9:438:9 | N |  |
+| test.rs:432:12:432:16 | false | test.rs:432:9:437:9 | IfExpr | false |
+| test.rs:435:17:435:24 | $crate::panicking::panic_explicit | test.rs:435:17:435:24 | CallExpr |  |
+| test.rs:435:17:435:24 | BlockExpr | test.rs:435:17:435:24 | exit panic_cold_explicit (normal) |  |
+| test.rs:435:17:435:24 | CallExpr | test.rs:435:17:435:24 | BlockExpr |  |
+| test.rs:435:17:435:24 | enter panic_cold_explicit | test.rs:435:17:435:24 | $crate::panicking::panic_explicit |  |
+| test.rs:435:17:435:24 | exit panic_cold_explicit (normal) | test.rs:435:17:435:24 | exit panic_cold_explicit |  |
+| test.rs:438:9:438:9 | N | test.rs:430:35:439:5 | BlockExpr |  |
+| test.rs:442:1:447:1 | enter dead_code | test.rs:443:5:445:5 | ExprStmt |  |
+| test.rs:442:1:447:1 | exit dead_code (normal) | test.rs:442:1:447:1 | exit dead_code |  |
+| test.rs:443:5:445:5 | ExprStmt | test.rs:443:9:443:12 | true |  |
+| test.rs:443:9:443:12 | true | test.rs:444:9:444:17 | ExprStmt | true |
+| test.rs:444:9:444:16 | ReturnExpr | test.rs:442:1:447:1 | exit dead_code (normal) | return |
+| test.rs:444:9:444:17 | ExprStmt | test.rs:444:16:444:16 | 0 |  |
+| test.rs:444:16:444:16 | 0 | test.rs:444:9:444:16 | ReturnExpr |  |
+| test.rs:449:1:449:16 | enter do_thing | test.rs:449:15:449:16 | BlockExpr |  |
+| test.rs:449:1:449:16 | exit do_thing (normal) | test.rs:449:1:449:16 | exit do_thing |  |
+| test.rs:449:15:449:16 | BlockExpr | test.rs:449:1:449:16 | exit do_thing (normal) |  |
+| test.rs:451:1:453:1 | enter condition_not_met | test.rs:452:5:452:9 | false |  |
+| test.rs:451:1:453:1 | exit condition_not_met (normal) | test.rs:451:1:453:1 | exit condition_not_met |  |
+| test.rs:451:32:453:1 | BlockExpr | test.rs:451:1:453:1 | exit condition_not_met (normal) |  |
+| test.rs:452:5:452:9 | false | test.rs:451:32:453:1 | BlockExpr |  |
+| test.rs:455:1:455:21 | enter do_next_thing | test.rs:455:20:455:21 | BlockExpr |  |
+| test.rs:455:1:455:21 | exit do_next_thing (normal) | test.rs:455:1:455:21 | exit do_next_thing |  |
+| test.rs:455:20:455:21 | BlockExpr | test.rs:455:1:455:21 | exit do_next_thing (normal) |  |
+| test.rs:457:1:457:21 | enter do_last_thing | test.rs:457:20:457:21 | BlockExpr |  |
+| test.rs:457:1:457:21 | exit do_last_thing (normal) | test.rs:457:1:457:21 | exit do_last_thing |  |
+| test.rs:457:20:457:21 | BlockExpr | test.rs:457:1:457:21 | exit do_last_thing (normal) |  |
+| test.rs:459:1:473:1 | enter labelled_block1 | test.rs:460:5:471:6 | LetStmt |  |
+| test.rs:459:1:473:1 | exit labelled_block1 (normal) | test.rs:459:1:473:1 | exit labelled_block1 |  |
+| test.rs:459:29:473:1 | BlockExpr | test.rs:459:1:473:1 | exit labelled_block1 (normal) |  |
+| test.rs:460:5:471:6 | LetStmt | test.rs:461:9:461:19 | ExprStmt |  |
+| test.rs:460:9:460:14 | result | test.rs:472:5:472:10 | result | match |
+| test.rs:460:18:471:5 | BlockExpr | test.rs:460:9:460:14 | result |  |
+| test.rs:461:9:461:16 | do_thing | test.rs:461:9:461:18 | CallExpr |  |
+| test.rs:461:9:461:18 | CallExpr | test.rs:462:9:464:9 | ExprStmt |  |
+| test.rs:461:9:461:19 | ExprStmt | test.rs:461:9:461:16 | do_thing |  |
+| test.rs:462:9:464:9 | ExprStmt | test.rs:462:12:462:28 | condition_not_met |  |
+| test.rs:462:9:464:9 | IfExpr | test.rs:465:9:465:24 | ExprStmt |  |
+| test.rs:462:12:462:28 | condition_not_met | test.rs:462:12:462:30 | CallExpr |  |
+| test.rs:462:12:462:30 | CallExpr | test.rs:462:9:464:9 | IfExpr | false |
+| test.rs:462:12:462:30 | CallExpr | test.rs:463:13:463:27 | ExprStmt | true |
+| test.rs:463:13:463:26 | BreakExpr | test.rs:460:18:471:5 | BlockExpr | break |
+| test.rs:463:13:463:27 | ExprStmt | test.rs:463:26:463:26 | 1 |  |
+| test.rs:463:26:463:26 | 1 | test.rs:463:13:463:26 | BreakExpr |  |
+| test.rs:465:9:465:21 | do_next_thing | test.rs:465:9:465:23 | CallExpr |  |
+| test.rs:465:9:465:23 | CallExpr | test.rs:466:9:468:9 | ExprStmt |  |
+| test.rs:465:9:465:24 | ExprStmt | test.rs:465:9:465:21 | do_next_thing |  |
+| test.rs:466:9:468:9 | ExprStmt | test.rs:466:12:466:28 | condition_not_met |  |
+| test.rs:466:9:468:9 | IfExpr | test.rs:469:9:469:24 | ExprStmt |  |
+| test.rs:466:12:466:28 | condition_not_met | test.rs:466:12:466:30 | CallExpr |  |
+| test.rs:466:12:466:30 | CallExpr | test.rs:466:9:468:9 | IfExpr | false |
+| test.rs:466:12:466:30 | CallExpr | test.rs:467:13:467:27 | ExprStmt | true |
+| test.rs:467:13:467:26 | BreakExpr | test.rs:460:18:471:5 | BlockExpr | break |
+| test.rs:467:13:467:27 | ExprStmt | test.rs:467:26:467:26 | 2 |  |
+| test.rs:467:26:467:26 | 2 | test.rs:467:13:467:26 | BreakExpr |  |
+| test.rs:469:9:469:21 | do_last_thing | test.rs:469:9:469:23 | CallExpr |  |
+| test.rs:469:9:469:23 | CallExpr | test.rs:470:9:470:9 | 3 |  |
+| test.rs:469:9:469:24 | ExprStmt | test.rs:469:9:469:21 | do_last_thing |  |
+| test.rs:470:9:470:9 | 3 | test.rs:460:18:471:5 | BlockExpr |  |
+| test.rs:472:5:472:10 | result | test.rs:459:29:473:1 | BlockExpr |  |
+| test.rs:475:1:483:1 | enter labelled_block2 | test.rs:476:5:482:6 | LetStmt |  |
+| test.rs:475:1:483:1 | exit labelled_block2 (normal) | test.rs:475:1:483:1 | exit labelled_block2 |  |
+| test.rs:475:22:483:1 | BlockExpr | test.rs:475:1:483:1 | exit labelled_block2 (normal) |  |
+| test.rs:476:5:482:6 | LetStmt | test.rs:477:9:477:34 | LetStmt |  |
+| test.rs:476:9:476:14 | result | test.rs:475:22:483:1 | BlockExpr | match |
+| test.rs:476:18:482:5 | BlockExpr | test.rs:476:9:476:14 | result |  |
+| test.rs:477:9:477:34 | LetStmt | test.rs:477:30:477:33 | None |  |
+| test.rs:477:13:477:13 | x | test.rs:478:9:480:10 | LetStmt | match |
+| test.rs:477:30:477:33 | None | test.rs:477:13:477:13 | x |  |
+| test.rs:478:9:480:10 | LetStmt | test.rs:478:23:478:23 | x |  |
+| test.rs:478:13:478:19 | TupleStructPat | test.rs:478:18:478:18 | y | match |
+| test.rs:478:13:478:19 | TupleStructPat | test.rs:479:13:479:27 | ExprStmt | no-match |
+| test.rs:478:18:478:18 | y | test.rs:481:9:481:9 | 0 | match |
+| test.rs:478:23:478:23 | x | test.rs:478:13:478:19 | TupleStructPat |  |
+| test.rs:479:13:479:26 | BreakExpr | test.rs:476:18:482:5 | BlockExpr | break |
+| test.rs:479:13:479:27 | ExprStmt | test.rs:479:26:479:26 | 1 |  |
+| test.rs:479:26:479:26 | 1 | test.rs:479:13:479:26 | BreakExpr |  |
+| test.rs:481:9:481:9 | 0 | test.rs:476:18:482:5 | BlockExpr |  |
+| test.rs:485:1:491:1 | enter test_nested_function2 | test.rs:486:5:486:18 | LetStmt |  |
+| test.rs:485:1:491:1 | exit test_nested_function2 (normal) | test.rs:485:1:491:1 | exit test_nested_function2 |  |
+| test.rs:485:28:491:1 | BlockExpr | test.rs:485:1:491:1 | exit test_nested_function2 (normal) |  |
+| test.rs:486:5:486:18 | LetStmt | test.rs:486:17:486:17 | 0 |  |
+| test.rs:486:9:486:13 | x | test.rs:487:5:489:5 | nested | match |
+| test.rs:486:17:486:17 | 0 | test.rs:486:9:486:13 | x |  |
+| test.rs:487:5:489:5 | enter nested | test.rs:487:15:487:15 | x |  |
+| test.rs:487:5:489:5 | exit nested (normal) | test.rs:487:5:489:5 | exit nested |  |
+| test.rs:487:5:489:5 | nested | test.rs:490:5:490:19 | ExprStmt |  |
+| test.rs:487:15:487:15 | x | test.rs:487:15:487:25 | Param | match |
+| test.rs:487:15:487:25 | Param | test.rs:488:9:488:16 | ExprStmt |  |
+| test.rs:487:28:489:5 | BlockExpr | test.rs:487:5:489:5 | exit nested (normal) |  |
+| test.rs:488:9:488:10 | * ... | test.rs:488:15:488:15 | 1 |  |
+| test.rs:488:9:488:15 | ... += ... | test.rs:487:28:489:5 | BlockExpr |  |
+| test.rs:488:9:488:16 | ExprStmt | test.rs:488:10:488:10 | x |  |
+| test.rs:488:10:488:10 | x | test.rs:488:9:488:10 | * ... |  |
+| test.rs:488:15:488:15 | 1 | test.rs:488:9:488:15 | ... += ... |  |
+| test.rs:490:5:490:10 | nested | test.rs:490:17:490:17 | x |  |
+| test.rs:490:5:490:18 | CallExpr | test.rs:485:28:491:1 | BlockExpr |  |
+| test.rs:490:5:490:19 | ExprStmt | test.rs:490:5:490:10 | nested |  |
+| test.rs:490:12:490:17 | RefExpr | test.rs:490:5:490:18 | CallExpr |  |
+| test.rs:490:17:490:17 | x | test.rs:490:12:490:17 | RefExpr |  |
+breakTarget
+| test.rs:34:17:34:21 | BreakExpr | test.rs:28:9:40:9 | LoopExpr |
+| test.rs:48:21:48:25 | BreakExpr | test.rs:46:13:53:13 | LoopExpr |
+| test.rs:50:21:50:32 | BreakExpr | test.rs:45:9:54:9 | LoopExpr |
+| test.rs:52:17:52:28 | BreakExpr | test.rs:46:13:53:13 | LoopExpr |
+| test.rs:91:17:91:21 | BreakExpr | test.rs:88:9:94:9 | WhileExpr |
+| test.rs:101:17:101:21 | BreakExpr | test.rs:99:9:103:9 | WhileExpr |
+| test.rs:109:17:109:21 | BreakExpr | test.rs:107:9:112:9 | ForExpr |
+| test.rs:117:13:117:26 | BreakExpr | test.rs:116:9:118:9 | LoopExpr |
+| test.rs:197:17:197:28 | BreakExpr | test.rs:195:13:200:9 | LoopExpr |
+| test.rs:210:17:210:35 | BreakExpr | test.rs:208:13:213:9 | LoopExpr |
+| test.rs:222:13:222:30 | BreakExpr | test.rs:221:13:223:9 | BlockExpr |
+| test.rs:463:13:463:26 | BreakExpr | test.rs:460:18:471:5 | BlockExpr |
+| test.rs:467:13:467:26 | BreakExpr | test.rs:460:18:471:5 | BlockExpr |
+| test.rs:479:13:479:26 | BreakExpr | test.rs:476:18:482:5 | BlockExpr |
+continueTarget
+| test.rs:37:17:37:24 | ContinueExpr | test.rs:28:9:40:9 | LoopExpr |
+| test.rs:63:21:63:28 | ContinueExpr | test.rs:61:13:68:13 | LoopExpr |
+| test.rs:65:21:65:35 | ContinueExpr | test.rs:59:9:69:9 | LoopExpr |
+| test.rs:67:17:67:31 | ContinueExpr | test.rs:61:13:68:13 | LoopExpr |
+| test.rs:77:21:77:28 | ContinueExpr | test.rs:75:13:82:13 | LoopExpr |
+| test.rs:79:21:79:35 | ContinueExpr | test.rs:75:13:82:13 | LoopExpr |
+| test.rs:81:17:81:31 | ContinueExpr | test.rs:75:13:82:13 | LoopExpr |
diff --git a/rust/ql/test/library-tests/controlflow/Cfg.qlref b/rust/ql/test/library-tests/controlflow/Cfg.qlref
new file mode 100644
index 00000000000..ba4ee4b414f
--- /dev/null
+++ b/rust/ql/test/library-tests/controlflow/Cfg.qlref
@@ -0,0 +1 @@
+query: utils/Cfg.ql
\ No newline at end of file
diff --git a/rust/ql/test/library-tests/controlflow/test.rs b/rust/ql/test/library-tests/controlflow/test.rs
index f60a227c16c..e1d59618806 100644
--- a/rust/ql/test/library-tests/controlflow/test.rs
+++ b/rust/ql/test/library-tests/controlflow/test.rs
@@ -1,16 +1,495 @@
-fn main() -> i64 {
-    if "foo" == "bar" {
-        decrement(0)
-    } else {
-        decrement(5)
+mod calls {
+    use crate::test::logical_operators;
+    use std::collections::HashMap;
+
+    fn function_call() {
+        logical_operators::test_and_operator(true, false, true);
+        method_call();
+    }
+
+    fn method_call() {
+        let mut map = HashMap::new();
+        map.insert(37, "a");
     }
 }
 
-fn decrement(n: i64) -> i64 {
-    12;
-    if n == 0 {
-        0
-    } else {
-        n - 1
+mod loop_expression {
+
+    fn next(n: i64) -> i64 {
+        if n % 2 == 0 {
+            n / 2
+        } else {
+            3 * n + 1
+        }
+    }
+
+    fn test_break_and_continue(n: i64) -> bool {
+        let mut i = n;
+        loop {
+            i = next(i);
+            if i > 10000 {
+                return false;
+            }
+            if i == 1 {
+                break;
+            }
+            if i % 2 != 0 {
+                continue;
+            }
+            i = i / 2
+        }
+        return true;
+    }
+
+    fn test_break_with_labels(b: bool) -> bool {
+        'outer: loop {
+            'inner: loop {
+                if b {
+                    break;
+                } else if b {
+                    break 'outer;
+                }
+                break 'inner;
+            }
+        }
+        true
+    }
+
+    fn test_continue_with_labels(b: bool) -> ! {
+        'outer: loop {
+            1;
+            'inner: loop {
+                if b {
+                    continue;
+                } else if b {
+                    continue 'outer;
+                }
+                continue 'inner;
+            }
+        }
+    }
+
+    fn test_loop_label_shadowing(b: bool) -> ! {
+        'label: loop {
+            1;
+            'label: loop {
+                if b {
+                    continue;
+                } else if b {
+                    continue 'label;
+                }
+                continue 'label;
+            }
+        }
+    }
+
+    fn test_while(i: i64) {
+        let mut b = true;
+        while b {
+            1;
+            if (i > 0) {
+                break;
+            }
+            b = false;
+        }
+    }
+
+    fn test_while_let() {
+        let mut iter = 1..10;
+        while let Some(x) = iter.next() {
+            if (x == 5) {
+                break;
+            }
+        }
+    }
+
+    fn test_for(j: i64) {
+        for i in 0..10 {
+            if (i == j) {
+                break;
+            }
+            1;
+        }
+    }
+
+    fn break_with_return() -> i64 {
+        loop {
+            break return 1;
+        }
     }
 }
+
+fn test_nested_function(n: i64) -> i64 {
+    let add_one = |i| i + 1;
+    add_one(add_one(n))
+}
+
+mod if_expression {
+
+    fn test_if_else(n: i64) -> i64 {
+        if n <= 0 {
+            0
+        } else {
+            n - 1
+        }
+    }
+
+    fn test_if_let_else(a: Option<i64>) -> i64 {
+        if let Some(n) = a {
+            n
+        } else {
+            0
+        }
+    }
+
+    fn test_if_let(a: Option<i64>) -> i64 {
+        if let Some(n) = a {
+            return n;
+        }
+        0
+    }
+
+    fn test_nested_if(a: i64) -> i64 {
+        if (if a < 0 { a < -10 } else { a > 10 }) {
+            1
+        } else {
+            0
+        }
+    }
+
+    fn test_nested_if_match(a: i64) -> i64 {
+        if (match a {
+            0 => true,
+            _ => false,
+        }) {
+            1
+        } else {
+            0
+        }
+    }
+
+    fn test_nested_if_block(a: i64) -> i64 {
+        if {
+            ();
+            a > 0
+        } {
+            1
+        } else {
+            0
+        }
+    }
+
+    fn test_if_assignment(a: i64) -> i64 {
+        let mut x = false;
+        if {
+            x = true;
+            x
+        } {
+            1
+        } else {
+            0
+        }
+    }
+
+    fn test_if_loop1(a: i64) -> i64 {
+        if (loop {
+            if a > 0 {
+                break a > 10;
+            };
+            a < 10;
+        }) {
+            1
+        } else {
+            0
+        }
+    }
+
+    fn test_if_loop2(a: i64) -> i64 {
+        if ('label: loop {
+            if a > 0 {
+                break 'label a > 10;
+            };
+            a < 10;
+        }) {
+            1
+        } else {
+            0
+        }
+    }
+
+    fn test_labelled_block(a: i64) -> i64 {
+        if ('block: {
+            break 'block a > 0;
+        }) {
+            1
+        } else {
+            0
+        }
+    }
+}
+
+mod logical_operators {
+
+    pub fn test_and_operator(a: bool, b: bool, c: bool) -> bool {
+        let d = a && b && c;
+        d
+    }
+
+    fn test_or_operator(a: bool, b: bool, c: bool) -> bool {
+        let d = a || b || c;
+        d
+    }
+
+    fn test_or_operator_2(a: bool, b: i64, c: bool) -> bool {
+        let d = a || (b == 28) || c;
+        d
+    }
+
+    fn test_not_operator(a: bool) -> bool {
+        let d = !a;
+        d
+    }
+
+    fn test_if_and_operator(a: bool, b: bool, c: bool) -> bool {
+        if a && b && c {
+            true
+        } else {
+            false
+        }
+    }
+
+    fn test_if_or_operator(a: bool, b: bool, c: bool) -> bool {
+        if a || b || c {
+            true
+        } else {
+            false
+        }
+    }
+
+    fn test_if_not_operator(a: bool) -> bool {
+        if !a {
+            true
+        } else {
+            false
+        }
+    }
+
+    fn test_and_return(a: bool) {
+        a && return;
+    }
+}
+
+mod question_mark_operator {
+    use std::num;
+
+    fn test_question_mark_operator_1(s: &str) -> Result<u32, std::num::ParseIntError> {
+        Ok(s.parse::<u32>()? + 4)
+    }
+
+    fn test_question_mark_operator_2(b: Option<bool>) -> Option<bool> {
+        match b? {
+            true => Some(false),
+            false => Some(true),
+        }
+    }
+}
+
+mod match_expression {
+    use std::convert::Infallible;
+
+    fn test_match(maybe_digit: Option<i64>) -> i64 {
+        match maybe_digit {
+            Option::Some(x) if x < 10 => x + 5,
+            Option::Some(x) => x,
+            Option::None => 5,
+        }
+    }
+
+    fn test_match_with_return_in_scrutinee(maybe_digit: Option<i64>) -> i64 {
+        match (if maybe_digit == Some(3) {
+            return 3;
+        } else {
+            maybe_digit
+        }) {
+            Option::Some(x) => x + 5,
+            Option::None => 5,
+        }
+    }
+
+    fn test_match_and(cond: bool, r: Option<bool>) -> bool {
+        (match r {
+            Some(a) => a,
+            _ => false,
+        }) && cond
+    }
+
+    fn test_match_with_no_arms<T>(r: Result<T, Infallible>) -> T {
+        match r {
+            Ok(value) => value,
+            Err(never) => match never {},
+        }
+    }
+}
+
+mod let_statement {
+
+    fn test_let_match(a: Option<i64>) -> i64 {
+        let Some(n) = a else { panic!("Expected some") };
+        n
+    }
+
+    fn test_let_with_return(m: Option<i64>) -> bool {
+        let ret = match m {
+            Some(ret) => ret,
+            None => return false,
+        };
+        true
+    }
+}
+
+mod patterns {
+
+    fn empty_tuple_pattern(unit: ()) -> () {
+        let () = unit;
+        return;
+    }
+
+    struct MyStruct {}
+
+    fn empty_struct_pattern(st: MyStruct) -> i64 {
+        match st {
+            MyStruct { .. } => 1,
+        }
+    }
+
+    fn range_pattern() -> i64 {
+        match 42 {
+            ..0 => 1,
+            1..2 => 2,
+            5.. => 3,
+            _ => 4,
+        }
+    }
+}
+
+mod divergence {
+    fn test_infinite_loop() -> &'static str {
+        loop {
+            ()
+        }
+        "never reached"
+    }
+}
+
+mod async_await {
+    async fn say_hello() {
+        println!("hello, world!");
+    }
+
+    async fn async_block(b: bool) {
+        let say_godbye = async {
+            println!("godbye, everyone!");
+        };
+        let say_how_are_you = async {
+            println!("how are you?");
+        };
+        let noop = async {};
+        say_hello().await;
+        say_how_are_you.await;
+        say_godbye.await;
+        noop.await;
+
+        let lambda = |foo| async {
+            if b {
+                return async_block(true);
+            };
+            foo
+        };
+    }
+}
+
+mod const_evaluation {
+    const PI: f64 = 3.14159;
+
+    const fn add_two(n: i64) -> i64 {
+        n + 2
+    }
+
+    const A_NUMBER: f64 = if add_two(2) + 2 == 4 { PI } else { 0.0 };
+
+    fn const_block_assert<T>() -> usize {
+        // If this code ever gets executed, then the assertion has definitely
+        // been evaluated at compile-time.
+        const {
+            assert!(std::mem::size_of::<T>() > 0);
+        }
+        // Here we can have unsafe code relying on the type being non-zero-sized.
+        42
+    }
+
+    fn const_block_panic() -> i64 {
+        const N: i64 = 12 + 7;
+        if false {
+            // The panic may or may not occur when the program is built.
+            const {
+                panic!();
+            }
+        }
+        N
+    }
+}
+
+fn dead_code() -> i64 {
+    if (true) {
+        return 0;
+    }
+    return 1;
+}
+
+fn do_thing() {}
+
+fn condition_not_met() -> bool {
+    false
+}
+
+fn do_next_thing() {}
+
+fn do_last_thing() {}
+
+fn labelled_block1() -> i64 {
+    let result = 'block: {
+        do_thing();
+        if condition_not_met() {
+            break 'block 1;
+        }
+        do_next_thing();
+        if condition_not_met() {
+            break 'block 2;
+        }
+        do_last_thing();
+        3
+    };
+    result
+}
+
+fn labelled_block2() {
+    let result = 'block: {
+        let x: Option<i64> = None;
+        let Some(y) = x else {
+            break 'block 1;
+        };
+        0
+    };
+}
+
+fn test_nested_function2() {
+    let mut x = 0;
+    fn nested(x: &mut i64) {
+        *x += 1;
+    }
+    nested(&mut x);
+}
+
+trait MyFrom<T> {
+    fn my_from(x: T) -> Self;
+}
diff --git a/rust/ql/test/library-tests/dataflow/barrier/barrier.expected b/rust/ql/test/library-tests/dataflow/barrier/barrier.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/library-tests/dataflow/barrier/barrier.ql b/rust/ql/test/library-tests/dataflow/barrier/barrier.ql
new file mode 100644
index 00000000000..a9aa46d09a0
--- /dev/null
+++ b/rust/ql/test/library-tests/dataflow/barrier/barrier.ql
@@ -0,0 +1,17 @@
+import rust
+import codeql.rust.dataflow.DataFlow
+import codeql.rust.dataflow.TaintTracking
+
+module FlowConfig implements DataFlow::ConfigSig {
+  predicate isSource(DataFlow::Node source) { none() }
+
+  predicate isSink(DataFlow::Node sink) { none() }
+
+  predicate isBarrier(DataFlow::Node n) { none() }
+}
+
+module Tainted = TaintTracking::Global<FlowConfig>;
+
+from Tainted::PathNode source, Tainted::PathNode sink
+where Tainted::flowPath(source, sink)
+select sink, source, sink, "$@", source, source.toString()
diff --git a/rust/ql/test/library-tests/dataflow/barrier/inline-flow.expected b/rust/ql/test/library-tests/dataflow/barrier/inline-flow.expected
new file mode 100644
index 00000000000..a54c75d0c17
--- /dev/null
+++ b/rust/ql/test/library-tests/dataflow/barrier/inline-flow.expected
@@ -0,0 +1,16 @@
+models
+edges
+| main.rs:21:13:21:21 | CallExpr : unit | main.rs:22:10:22:10 | s | provenance |  |
+| main.rs:32:13:32:21 | CallExpr : unit | main.rs:33:10:33:10 | s | provenance |  |
+nodes
+| main.rs:17:10:17:18 | CallExpr | semmle.label | CallExpr |
+| main.rs:21:13:21:21 | CallExpr : unit | semmle.label | CallExpr : unit |
+| main.rs:22:10:22:10 | s | semmle.label | s |
+| main.rs:32:13:32:21 | CallExpr : unit | semmle.label | CallExpr : unit |
+| main.rs:33:10:33:10 | s | semmle.label | s |
+subpaths
+testFailures
+#select
+| main.rs:17:10:17:18 | CallExpr | main.rs:17:10:17:18 | CallExpr | main.rs:17:10:17:18 | CallExpr | $@ | main.rs:17:10:17:18 | CallExpr | CallExpr |
+| main.rs:22:10:22:10 | s | main.rs:21:13:21:21 | CallExpr : unit | main.rs:22:10:22:10 | s | $@ | main.rs:21:13:21:21 | CallExpr : unit | CallExpr : unit |
+| main.rs:33:10:33:10 | s | main.rs:32:13:32:21 | CallExpr : unit | main.rs:33:10:33:10 | s | $@ | main.rs:32:13:32:21 | CallExpr : unit | CallExpr : unit |
diff --git a/rust/ql/test/library-tests/dataflow/barrier/inline-flow.ql b/rust/ql/test/library-tests/dataflow/barrier/inline-flow.ql
new file mode 100644
index 00000000000..ad553fe548d
--- /dev/null
+++ b/rust/ql/test/library-tests/dataflow/barrier/inline-flow.ql
@@ -0,0 +1,12 @@
+/**
+ * @kind path-problem
+ */
+
+import rust
+import utils.InlineFlowTest
+import DefaultFlowTest
+import ValueFlow::PathGraph
+
+from ValueFlow::PathNode source, ValueFlow::PathNode sink
+where ValueFlow::flowPath(source, sink)
+select sink, source, sink, "$@", source, source.toString()
diff --git a/rust/ql/test/library-tests/dataflow/barrier/main.rs b/rust/ql/test/library-tests/dataflow/barrier/main.rs
new file mode 100644
index 00000000000..8a0a7bc2be6
--- /dev/null
+++ b/rust/ql/test/library-tests/dataflow/barrier/main.rs
@@ -0,0 +1,34 @@
+fn source(i: i64) -> &'static str {
+    "source"
+}
+
+fn sink(s: &str) {
+    println!("{}", s);
+}
+
+fn sanitize(s: &str) -> &str {
+    match s {
+        "dangerous" => "",
+        s => s
+    }
+}
+
+fn directly() {
+    sink(source(1)); // $ hasValueFlow=1
+}
+
+fn through_variable() {
+    let s = source(1);
+    sink(s); // $ hasValueFlow=1
+}
+
+fn with_barrier() {
+    let s = source(1);
+    let s = sanitize(s);
+    sink(s);
+}
+
+fn main() {
+    let s = source(1);
+    sink(s); // $ hasValueFlow=1
+}
diff --git a/rust/ql/test/library-tests/dataflow/global/main.rs b/rust/ql/test/library-tests/dataflow/global/main.rs
new file mode 100644
index 00000000000..eb3a5985692
--- /dev/null
+++ b/rust/ql/test/library-tests/dataflow/global/main.rs
@@ -0,0 +1,94 @@
+fn source(i: i64) -> i64 {
+    1000 + i
+}
+
+fn sink(s: i64) {
+    println!("{}", s);
+}
+
+// -----------------------------------------------------------------------------
+// Data flow in, out, and through functions.
+
+fn get_data(n: i64) -> i64 {
+    source(n)
+}
+
+fn data_out_of_call() {
+    let a = get_data(7);
+    sink(a); // $ hasValueFlow=n
+}
+
+fn data_in(n: i64) {
+    sink(n + 7); // $ hasValueFlow
+}
+
+fn data_in_to_call() {
+    let a = source(3);
+    data_in(a);
+}
+
+fn pass_through(i: i64) -> i64 {
+    i
+}
+
+fn data_through_call() {
+    let a = source(1);
+    let b = pass_through(a);
+    sink(b); // $ hasValueFlow=1
+}
+
+// -----------------------------------------------------------------------------
+// Data flow in, out, and through method.
+
+struct MyFlag {
+    flag: bool,
+}
+
+impl MyFlag {
+    fn data_in(&self, n: i64) {
+        sink(n); // $ hasValueFlow=1
+    }
+    fn get_data(&self) -> i64 {
+        if self.flag {
+            0
+        } else {
+            source(2)
+        }
+    }
+    fn data_through(&self, n: i64) -> i64 {
+        if self.flag {
+            0
+        } else {
+            n
+        }
+    }
+}
+
+fn data_out_of_method() {
+    let mn = MyFlag { flag: true };
+    let a = mn.get_data();
+    sink(a);
+}
+
+fn data_in_to_method_call() {
+    let mn = MyFlag { flag: true };
+    let a = source(1);
+    mn.data_in(a)
+}
+
+fn data_through_method() {
+    let mn = MyFlag { flag: true };
+    let a = source(4);
+    mn.data_through(a);
+    sink(a); // $ hasValueFlow=4
+}
+
+fn main() {
+    data_out_of_call();
+    data_in_to_call();
+    data_through_call();
+
+    data_out_of_method();
+    data_in_to_method_call();
+    data_through_method();
+}
diff --git a/rust/ql/test/library-tests/dataflow/global/viableCallable.expected b/rust/ql/test/library-tests/dataflow/global/viableCallable.expected
new file mode 100644
index 00000000000..6a15bb25249
--- /dev/null
+++ b/rust/ql/test/library-tests/dataflow/global/viableCallable.expected
@@ -0,0 +1,24 @@
+| main.rs:13:5:13:13 | CallExpr | main.rs:1:1:3:1 | source |
+| main.rs:17:13:17:23 | CallExpr | main.rs:12:1:14:1 | get_data |
+| main.rs:18:5:18:11 | CallExpr | main.rs:5:1:7:1 | sink |
+| main.rs:22:5:22:15 | CallExpr | main.rs:5:1:7:1 | sink |
+| main.rs:26:13:26:21 | CallExpr | main.rs:1:1:3:1 | source |
+| main.rs:27:5:27:14 | CallExpr | main.rs:21:1:23:1 | data_in |
+| main.rs:35:13:35:21 | CallExpr | main.rs:1:1:3:1 | source |
+| main.rs:36:13:36:27 | CallExpr | main.rs:30:1:32:1 | pass_through |
+| main.rs:37:5:37:11 | CallExpr | main.rs:5:1:7:1 | sink |
+| main.rs:49:9:49:15 | CallExpr | main.rs:5:1:7:1 | sink |
+| main.rs:55:13:55:21 | CallExpr | main.rs:1:1:3:1 | source |
+| main.rs:69:13:69:25 | ... .get_data(...) | main.rs:51:5:57:5 | get_data |
+| main.rs:70:5:70:11 | CallExpr | main.rs:5:1:7:1 | sink |
+| main.rs:75:13:75:21 | CallExpr | main.rs:1:1:3:1 | source |
+| main.rs:76:5:76:17 | ... .data_in(...) | main.rs:48:5:50:5 | data_in |
+| main.rs:81:13:81:21 | CallExpr | main.rs:1:1:3:1 | source |
+| main.rs:82:5:82:22 | ... .data_through(...) | main.rs:58:5:64:5 | data_through |
+| main.rs:83:5:83:11 | CallExpr | main.rs:5:1:7:1 | sink |
+| main.rs:87:5:87:22 | CallExpr | main.rs:16:1:19:1 | data_out_of_call |
+| main.rs:88:5:88:21 | CallExpr | main.rs:25:1:28:1 | data_in_to_call |
+| main.rs:89:5:89:23 | CallExpr | main.rs:34:1:38:1 | data_through_call |
+| main.rs:91:5:91:24 | CallExpr | main.rs:67:1:71:1 | data_out_of_method |
+| main.rs:92:5:92:28 | CallExpr | main.rs:73:1:77:1 | data_in_to_method_call |
+| main.rs:93:5:93:25 | CallExpr | main.rs:79:1:84:1 | data_through_method |
diff --git a/rust/ql/test/library-tests/dataflow/global/viableCallable.ql b/rust/ql/test/library-tests/dataflow/global/viableCallable.ql
new file mode 100644
index 00000000000..3daa8b4b17f
--- /dev/null
+++ b/rust/ql/test/library-tests/dataflow/global/viableCallable.ql
@@ -0,0 +1,5 @@
+import codeql.rust.dataflow.internal.DataFlowImpl
+
+query predicate viableCallable(DataFlowCall call, DataFlowCallable callee) {
+  RustDataFlow::viableCallable(call) = callee
+}
diff --git a/rust/ql/test/library-tests/dataflow/local/DataFlowStep.expected b/rust/ql/test/library-tests/dataflow/local/DataFlowStep.expected
new file mode 100644
index 00000000000..8cc12598f62
--- /dev/null
+++ b/rust/ql/test/library-tests/dataflow/local/DataFlowStep.expected
@@ -0,0 +1,85 @@
+| main.rs:3:11:3:11 | [SSA] i | main.rs:4:12:4:12 | i |
+| main.rs:3:11:3:11 | i | main.rs:3:11:3:11 | [SSA] i |
+| main.rs:4:5:4:12 | ... + ... | main.rs:3:26:5:1 | BlockExpr |
+| main.rs:7:9:7:9 | [SSA] s | main.rs:8:20:8:20 | s |
+| main.rs:7:9:7:9 | s | main.rs:7:9:7:9 | [SSA] s |
+| main.rs:19:9:19:9 | [SSA] s | main.rs:20:10:20:10 | s |
+| main.rs:19:9:19:9 | s | main.rs:19:9:19:9 | [SSA] s |
+| main.rs:19:13:19:21 | CallExpr | main.rs:19:9:19:9 | s |
+| main.rs:23:18:23:21 | [SSA] cond | main.rs:26:16:26:19 | cond |
+| main.rs:23:18:23:21 | cond | main.rs:23:18:23:21 | [SSA] cond |
+| main.rs:24:9:24:9 | [SSA] a | main.rs:26:23:26:23 | a |
+| main.rs:24:9:24:9 | a | main.rs:24:9:24:9 | [SSA] a |
+| main.rs:24:13:24:21 | CallExpr | main.rs:24:9:24:9 | a |
+| main.rs:25:9:25:9 | [SSA] b | main.rs:26:34:26:34 | b |
+| main.rs:25:9:25:9 | b | main.rs:25:9:25:9 | [SSA] b |
+| main.rs:25:13:25:13 | 2 | main.rs:25:9:25:9 | b |
+| main.rs:26:9:26:9 | [SSA] c | main.rs:27:10:27:10 | c |
+| main.rs:26:9:26:9 | c | main.rs:26:9:26:9 | [SSA] c |
+| main.rs:26:13:26:36 | IfExpr | main.rs:26:9:26:9 | c |
+| main.rs:26:21:26:25 | BlockExpr | main.rs:26:13:26:36 | IfExpr |
+| main.rs:26:23:26:23 | a | main.rs:26:21:26:25 | BlockExpr |
+| main.rs:26:32:26:36 | BlockExpr | main.rs:26:13:26:36 | IfExpr |
+| main.rs:26:34:26:34 | b | main.rs:26:32:26:36 | BlockExpr |
+| main.rs:30:21:30:21 | [SSA] m | main.rs:32:19:32:19 | m |
+| main.rs:30:21:30:21 | m | main.rs:30:21:30:21 | [SSA] m |
+| main.rs:31:9:31:9 | [SSA] a | main.rs:33:20:33:20 | a |
+| main.rs:31:9:31:9 | a | main.rs:31:9:31:9 | [SSA] a |
+| main.rs:31:13:31:21 | CallExpr | main.rs:31:9:31:9 | a |
+| main.rs:32:9:32:9 | [SSA] b | main.rs:36:10:36:10 | b |
+| main.rs:32:9:32:9 | b | main.rs:32:9:32:9 | [SSA] b |
+| main.rs:32:13:35:5 | MatchExpr | main.rs:32:9:32:9 | b |
+| main.rs:33:20:33:20 | a | main.rs:32:13:35:5 | MatchExpr |
+| main.rs:34:17:34:17 | 0 | main.rs:32:13:35:5 | MatchExpr |
+| main.rs:40:9:40:9 | [SSA] a | main.rs:43:10:43:10 | a |
+| main.rs:40:9:40:9 | a | main.rs:40:9:40:9 | [SSA] a |
+| main.rs:40:13:42:5 | LoopExpr | main.rs:40:9:40:9 | a |
+| main.rs:41:9:41:15 | BreakExpr | main.rs:40:13:42:5 | LoopExpr |
+| main.rs:41:15:41:15 | 1 | main.rs:41:9:41:15 | BreakExpr |
+| main.rs:44:9:44:9 | [SSA] b | main.rs:47:10:47:10 | b |
+| main.rs:44:9:44:9 | b | main.rs:44:9:44:9 | [SSA] b |
+| main.rs:44:13:46:5 | LoopExpr | main.rs:44:9:44:9 | b |
+| main.rs:45:9:45:23 | BreakExpr | main.rs:44:13:46:5 | LoopExpr |
+| main.rs:45:15:45:23 | CallExpr | main.rs:45:9:45:23 | BreakExpr |
+| main.rs:51:9:51:13 | [SSA] i | main.rs:52:10:52:10 | i |
+| main.rs:51:9:51:13 | i | main.rs:51:9:51:13 | [SSA] i |
+| main.rs:51:17:51:17 | 1 | main.rs:51:9:51:13 | i |
+| main.rs:53:5:53:5 | [SSA] i | main.rs:54:10:54:10 | i |
+| main.rs:53:5:53:5 | i | main.rs:53:5:53:5 | [SSA] i |
+| main.rs:61:9:61:9 | [SSA] i | main.rs:62:11:62:11 | i |
+| main.rs:61:9:61:9 | i | main.rs:61:9:61:9 | [SSA] i |
+| main.rs:61:13:61:31 | CallExpr | main.rs:61:9:61:9 | i |
+| main.rs:66:9:66:9 | [SSA] a | main.rs:67:10:67:10 | a |
+| main.rs:66:9:66:9 | a | main.rs:66:9:66:9 | [SSA] a |
+| main.rs:66:13:66:26 | TupleExpr | main.rs:66:9:66:9 | a |
+| main.rs:67:10:67:10 | a | main.rs:68:10:68:10 | a |
+| main.rs:78:9:78:9 | [SSA] p | main.rs:83:10:83:10 | p |
+| main.rs:78:9:78:9 | p | main.rs:78:9:78:9 | [SSA] p |
+| main.rs:78:13:82:5 | RecordExpr | main.rs:78:9:78:9 | p |
+| main.rs:83:10:83:10 | p | main.rs:84:10:84:10 | p |
+| main.rs:84:10:84:10 | p | main.rs:85:10:85:10 | p |
+| main.rs:92:9:92:9 | [SSA] p | main.rs:97:38:97:38 | p |
+| main.rs:92:9:92:9 | p | main.rs:92:9:92:9 | [SSA] p |
+| main.rs:92:13:96:5 | RecordExpr | main.rs:92:9:92:9 | p |
+| main.rs:97:20:97:20 | [SSA] a | main.rs:98:10:98:10 | a |
+| main.rs:97:20:97:20 | a | main.rs:97:20:97:20 | [SSA] a |
+| main.rs:97:26:97:26 | [SSA] b | main.rs:99:10:99:10 | b |
+| main.rs:97:26:97:26 | b | main.rs:97:26:97:26 | [SSA] b |
+| main.rs:97:32:97:32 | [SSA] c | main.rs:100:10:100:10 | c |
+| main.rs:97:32:97:32 | c | main.rs:97:32:97:32 | [SSA] c |
+| main.rs:97:38:97:38 | p | main.rs:97:9:97:34 | RecordPat |
+| main.rs:104:9:104:10 | [SSA] s1 | main.rs:106:11:106:12 | s1 |
+| main.rs:104:9:104:10 | s1 | main.rs:104:9:104:10 | [SSA] s1 |
+| main.rs:104:14:104:28 | CallExpr | main.rs:104:9:104:10 | s1 |
+| main.rs:105:9:105:10 | [SSA] s2 | main.rs:110:11:110:12 | s2 |
+| main.rs:105:9:105:10 | s2 | main.rs:105:9:105:10 | [SSA] s2 |
+| main.rs:105:14:105:20 | CallExpr | main.rs:105:9:105:10 | s2 |
+| main.rs:107:14:107:14 | [SSA] n | main.rs:107:25:107:25 | n |
+| main.rs:107:14:107:14 | n | main.rs:107:14:107:14 | [SSA] n |
+| main.rs:107:20:107:26 | CallExpr | main.rs:106:5:109:5 | MatchExpr |
+| main.rs:108:17:108:23 | CallExpr | main.rs:106:5:109:5 | MatchExpr |
+| main.rs:110:5:113:5 | MatchExpr | main.rs:103:27:114:1 | BlockExpr |
+| main.rs:111:14:111:14 | [SSA] n | main.rs:111:25:111:25 | n |
+| main.rs:111:14:111:14 | n | main.rs:111:14:111:14 | [SSA] n |
+| main.rs:111:20:111:26 | CallExpr | main.rs:110:5:113:5 | MatchExpr |
+| main.rs:112:17:112:23 | CallExpr | main.rs:110:5:113:5 | MatchExpr |
diff --git a/rust/ql/test/library-tests/dataflow/local/DataFlowStep.ql b/rust/ql/test/library-tests/dataflow/local/DataFlowStep.ql
new file mode 100644
index 00000000000..77147a50573
--- /dev/null
+++ b/rust/ql/test/library-tests/dataflow/local/DataFlowStep.ql
@@ -0,0 +1,5 @@
+import codeql.rust.dataflow.DataFlow
+
+from DataFlow::Node pred, DataFlow::Node succ
+where DataFlow::localFlowStep(pred, succ)
+select pred, succ
diff --git a/rust/ql/test/library-tests/dataflow/local/inline-flow.expected b/rust/ql/test/library-tests/dataflow/local/inline-flow.expected
new file mode 100644
index 00000000000..72273334c6f
--- /dev/null
+++ b/rust/ql/test/library-tests/dataflow/local/inline-flow.expected
@@ -0,0 +1,24 @@
+models
+edges
+| main.rs:19:13:19:21 | CallExpr : unit | main.rs:20:10:20:10 | s | provenance |  |
+| main.rs:24:13:24:21 | CallExpr : unit | main.rs:27:10:27:10 | c | provenance |  |
+| main.rs:31:13:31:21 | CallExpr : unit | main.rs:36:10:36:10 | b | provenance |  |
+| main.rs:45:15:45:23 | CallExpr : unit | main.rs:47:10:47:10 | b | provenance |  |
+nodes
+| main.rs:15:10:15:18 | CallExpr | semmle.label | CallExpr |
+| main.rs:19:13:19:21 | CallExpr : unit | semmle.label | CallExpr : unit |
+| main.rs:20:10:20:10 | s | semmle.label | s |
+| main.rs:24:13:24:21 | CallExpr : unit | semmle.label | CallExpr : unit |
+| main.rs:27:10:27:10 | c | semmle.label | c |
+| main.rs:31:13:31:21 | CallExpr : unit | semmle.label | CallExpr : unit |
+| main.rs:36:10:36:10 | b | semmle.label | b |
+| main.rs:45:15:45:23 | CallExpr : unit | semmle.label | CallExpr : unit |
+| main.rs:47:10:47:10 | b | semmle.label | b |
+subpaths
+testFailures
+#select
+| main.rs:15:10:15:18 | CallExpr | main.rs:15:10:15:18 | CallExpr | main.rs:15:10:15:18 | CallExpr | $@ | main.rs:15:10:15:18 | CallExpr | CallExpr |
+| main.rs:20:10:20:10 | s | main.rs:19:13:19:21 | CallExpr : unit | main.rs:20:10:20:10 | s | $@ | main.rs:19:13:19:21 | CallExpr : unit | CallExpr : unit |
+| main.rs:27:10:27:10 | c | main.rs:24:13:24:21 | CallExpr : unit | main.rs:27:10:27:10 | c | $@ | main.rs:24:13:24:21 | CallExpr : unit | CallExpr : unit |
+| main.rs:36:10:36:10 | b | main.rs:31:13:31:21 | CallExpr : unit | main.rs:36:10:36:10 | b | $@ | main.rs:31:13:31:21 | CallExpr : unit | CallExpr : unit |
+| main.rs:47:10:47:10 | b | main.rs:45:15:45:23 | CallExpr : unit | main.rs:47:10:47:10 | b | $@ | main.rs:45:15:45:23 | CallExpr : unit | CallExpr : unit |
diff --git a/rust/ql/test/library-tests/dataflow/local/inline-flow.ql b/rust/ql/test/library-tests/dataflow/local/inline-flow.ql
new file mode 100644
index 00000000000..ad553fe548d
--- /dev/null
+++ b/rust/ql/test/library-tests/dataflow/local/inline-flow.ql
@@ -0,0 +1,12 @@
+/**
+ * @kind path-problem
+ */
+
+import rust
+import utils.InlineFlowTest
+import DefaultFlowTest
+import ValueFlow::PathGraph
+
+from ValueFlow::PathNode source, ValueFlow::PathNode sink
+where ValueFlow::flowPath(source, sink)
+select sink, source, sink, "$@", source, source.toString()
diff --git a/rust/ql/test/library-tests/dataflow/local/main.rs b/rust/ql/test/library-tests/dataflow/local/main.rs
new file mode 100644
index 00000000000..fb79baa70bd
--- /dev/null
+++ b/rust/ql/test/library-tests/dataflow/local/main.rs
@@ -0,0 +1,128 @@
+// Tests for intraprocedural data flow.
+
+fn source(i: i64) -> i64 {
+    1000 + i
+}
+
+fn sink(s: i64) {
+    println!("{}", s);
+}
+
+// -----------------------------------------------------------------------------
+// Simple data flow through expressions and assignments
+
+fn direct() {
+    sink(source(1)); // $ hasValueFlow=1
+}
+
+fn variable_usage() {
+    let s = source(1);
+    sink(s); // $ hasValueFlow=1
+}
+
+fn if_expression(cond: bool) {
+    let a = source(1);
+    let b = 2;
+    let c = if cond { a } else { b };
+    sink(c); // $ hasValueFlow=1
+}
+
+fn match_expression(m: Option<i64>) {
+    let a = source(1);
+    let b = match m {
+        Some(_) => a,
+        None => 0,
+    };
+    sink(b); // $ hasValueFlow=1
+}
+
+fn loop_with_break() {
+    let a = loop {
+        break 1;
+    };
+    sink(a);
+    let b = loop {
+        break source(1);
+    };
+    sink(b); // $ hasValueFlow=1
+}
+
+fn assignment() {
+    let mut i = 1;
+    sink(i);
+    i = source(2);
+    sink(i); // $ MISSING: hasValueFlow=2
+}
+
+// -----------------------------------------------------------------------------
+// Data flow through data structures by writing and reading
+
+fn box_deref() {
+    let i = Box::new(source(1));
+    sink(*i); // $ MISSING: hasValueFlow=1
+}
+
+fn tuple() {
+    let a = (source(1), 2);
+    sink(a.0); // $ MISSING: hasValueFlow=1
+    sink(a.1);
+}
+
+struct Point {
+    x: i64,
+    y: i64,
+    z: i64,
+}
+
+fn struct_field() {
+    let p = Point {
+        x: source(1),
+        y: 2,
+        z: source(3),
+    };
+    sink(p.x); // MISSING: hasValueFlow=1
+    sink(p.y);
+    sink(p.z); // MISSING: hasValueFlow=3
+}
+
+// -----------------------------------------------------------------------------
+// Data flow through data structures by pattern matching
+
+fn struct_pattern_match() {
+    let p = Point {
+        x: source(1),
+        y: 2,
+        z: source(3),
+    };
+    let Point { x: a, y: b, z: c } = p;
+    sink(a); // MISSING: hasValueFlow=1
+    sink(b);
+    sink(c); // MISSING: hasValueFlow=3
+}
+
+fn option_pattern_match() {
+    let s1 = Some(source(1));
+    let s2 = Some(2);
+    match s1 {
+        Some(n) => sink(n), // MISSING: hasValueFlow=3
+        None => sink(0),
+    }
+    match s2 {
+        Some(n) => sink(n),
+        None => sink(0),
+    }
+}
+
+fn main() {
+    direct();
+    variable_usage();
+    if_expression(true);
+    match_expression(Some(0));
+    loop_with_break();
+    assignment();
+    box_deref();
+    tuple();
+    struct_field();
+    struct_pattern_match();
+    option_pattern_match();
+}
diff --git a/rust/ql/test/library-tests/definitions/CONSISTENCY/DataFlowConsistency.expected b/rust/ql/test/library-tests/definitions/CONSISTENCY/DataFlowConsistency.expected
new file mode 100644
index 00000000000..8d729bb5fd9
--- /dev/null
+++ b/rust/ql/test/library-tests/definitions/CONSISTENCY/DataFlowConsistency.expected
@@ -0,0 +1,4 @@
+uniqueEnclosingCallable
+| main.rs:5:29:5:33 | width | Node should have one enclosing callable but has 0. |
+| main.rs:5:36:5:44 | precision | Node should have one enclosing callable but has 0. |
+| main.rs:9:22:9:27 | people | Node should have one enclosing callable but has 0. |
diff --git a/rust/ql/test/library-tests/definitions/Definitions.expected b/rust/ql/test/library-tests/definitions/Definitions.expected
new file mode 100644
index 00000000000..11f50118d22
--- /dev/null
+++ b/rust/ql/test/library-tests/definitions/Definitions.expected
@@ -0,0 +1,19 @@
+| main.rs:2:9:2:13 | width | main.rs:5:29:5:33 | width | local variable |
+| main.rs:2:9:2:13 | width | main.rs:6:41:6:45 | width | local variable |
+| main.rs:2:9:2:13 | width | main.rs:7:36:7:40 | width | local variable |
+| main.rs:3:9:3:17 | precision | main.rs:5:36:5:44 | precision | local variable |
+| main.rs:3:9:3:17 | precision | main.rs:6:48:6:56 | precision | local variable |
+| main.rs:4:9:4:13 | value | main.rs:6:34:6:38 | value | local variable |
+| main.rs:4:9:4:13 | value | main.rs:7:29:7:33 | value | local variable |
+| main.rs:5:50:5:54 | value | main.rs:5:22:5:26 | value | format argument |
+| main.rs:6:34:6:38 | value | main.rs:6:22:6:22 | 0 | format argument |
+| main.rs:6:41:6:45 | width | main.rs:6:25:6:25 | 1 | format argument |
+| main.rs:6:48:6:56 | precision | main.rs:6:28:6:28 | 2 | format argument |
+| main.rs:7:29:7:33 | value | main.rs:7:21:7:22 | {} | format argument |
+| main.rs:7:36:7:40 | width | main.rs:7:24:7:25 | {} | format argument |
+| main.rs:8:9:8:14 | people | main.rs:9:22:9:27 | people | local variable |
+| main.rs:10:31:10:31 | 1 | main.rs:10:19:10:20 | {} | format argument |
+| main.rs:10:31:10:31 | 1 | main.rs:10:23:10:23 | 0 | format argument |
+| main.rs:10:34:10:34 | 2 | main.rs:10:16:10:16 | 1 | format argument |
+| main.rs:10:34:10:34 | 2 | main.rs:10:26:10:27 | {} | format argument |
+| main.rs:11:40:11:42 | "x" | main.rs:11:31:11:35 | {:<5} | format argument |
diff --git a/rust/ql/test/library-tests/definitions/Definitions.ql b/rust/ql/test/library-tests/definitions/Definitions.ql
new file mode 100644
index 00000000000..021d5f07e4a
--- /dev/null
+++ b/rust/ql/test/library-tests/definitions/Definitions.ql
@@ -0,0 +1,5 @@
+import codeql.rust.internal.Definitions
+
+from Definition def, Use use, string kind
+where def = definitionOf(use, kind)
+select def, use, kind
diff --git a/rust/ql/test/library-tests/definitions/main.rs b/rust/ql/test/library-tests/definitions/main.rs
new file mode 100644
index 00000000000..a0ee6288280
--- /dev/null
+++ b/rust/ql/test/library-tests/definitions/main.rs
@@ -0,0 +1,12 @@
+fn main() {
+    let width = 4;
+    let precision = 2;
+    let value = 10;
+    println!("Value {value:#width$.precision$}", value = 10.5);
+    println!("Value {0:#1$.2$}", value, width, precision);
+    println!("Value {} {}", value, width);
+    let people = "Rustaceans";
+    println!("Hello {people}!");
+    println!("{1} {} {0} {}", 1, 2);
+    assert_eq!(format!("Hello {:<5}!", "x"), "Hello x    !");
+}
diff --git a/rust/ql/test/library-tests/formatstrings/CONSISTENCY/DataFlowConsistency.expected b/rust/ql/test/library-tests/formatstrings/CONSISTENCY/DataFlowConsistency.expected
new file mode 100644
index 00000000000..5bd870a7205
--- /dev/null
+++ b/rust/ql/test/library-tests/formatstrings/CONSISTENCY/DataFlowConsistency.expected
@@ -0,0 +1,5 @@
+uniqueEnclosingCallable
+| main.rs:5:29:5:33 | width | Node should have one enclosing callable but has 0. |
+| main.rs:5:36:5:44 | precision | Node should have one enclosing callable but has 0. |
+| main.rs:16:22:16:27 | people | Node should have one enclosing callable but has 0. |
+| main.rs:27:23:27:27 | width | Node should have one enclosing callable but has 0. |
diff --git a/rust/ql/test/library-tests/formatstrings/FormatTemplate.expected b/rust/ql/test/library-tests/formatstrings/FormatTemplate.expected
new file mode 100644
index 00000000000..6750a5dc5f0
--- /dev/null
+++ b/rust/ql/test/library-tests/formatstrings/FormatTemplate.expected
@@ -0,0 +1,132 @@
+getFormat
+| main.rs:5:14:5:61 | FormatArgsExpr | main.rs:5:21:5:46 | {value:#width$.precision$} | 0 |
+| main.rs:6:14:6:56 | FormatArgsExpr | main.rs:6:21:6:30 | {0:#1$.2$} | 0 |
+| main.rs:7:14:7:40 | FormatArgsExpr | main.rs:7:21:7:22 | {} | 0 |
+| main.rs:7:14:7:40 | FormatArgsExpr | main.rs:7:24:7:25 | {} | 1 |
+| main.rs:11:14:11:34 | FormatArgsExpr | main.rs:11:22:11:23 | {} | 0 |
+| main.rs:12:14:12:34 | FormatArgsExpr | main.rs:12:29:12:30 | {} | 0 |
+| main.rs:13:14:13:27 | FormatArgsExpr | main.rs:13:15:13:18 | {:?} | 0 |
+| main.rs:14:14:14:33 | FormatArgsExpr | main.rs:14:15:14:21 | {value} | 0 |
+| main.rs:16:14:16:30 | FormatArgsExpr | main.rs:16:21:16:28 | {people} | 0 |
+| main.rs:17:14:17:26 | FormatArgsExpr | main.rs:17:15:17:16 | {} | 0 |
+| main.rs:17:14:17:26 | FormatArgsExpr | main.rs:17:18:17:19 | {} | 1 |
+| main.rs:18:14:18:24 | FormatArgsExpr | main.rs:18:15:18:19 | {:04} | 0 |
+| main.rs:19:14:19:32 | FormatArgsExpr | main.rs:19:15:19:19 | {:#?} | 0 |
+| main.rs:21:14:21:34 | FormatArgsExpr | main.rs:21:15:21:17 | {1} | 0 |
+| main.rs:21:14:21:34 | FormatArgsExpr | main.rs:21:19:21:20 | {} | 1 |
+| main.rs:21:14:21:34 | FormatArgsExpr | main.rs:21:22:21:24 | {0} | 2 |
+| main.rs:21:14:21:34 | FormatArgsExpr | main.rs:21:26:21:27 | {} | 3 |
+| main.rs:22:14:22:31 | FormatArgsExpr | main.rs:22:21:22:24 | {:5} | 0 |
+| main.rs:23:14:23:35 | FormatArgsExpr | main.rs:23:21:23:25 | {:1$} | 0 |
+| main.rs:24:14:24:36 | FormatArgsExpr | main.rs:24:21:24:26 | {1:0$} | 0 |
+| main.rs:25:14:25:47 | FormatArgsExpr | main.rs:25:21:25:29 | {:width$} | 0 |
+| main.rs:27:14:27:36 | FormatArgsExpr | main.rs:27:21:27:29 | {:width$} | 0 |
+| main.rs:28:24:28:42 | FormatArgsExpr | main.rs:28:31:28:35 | {:<5} | 0 |
+| main.rs:29:24:29:43 | FormatArgsExpr | main.rs:29:31:29:36 | {:-<5} | 0 |
+| main.rs:30:24:30:42 | FormatArgsExpr | main.rs:30:31:30:35 | {:^5} | 0 |
+| main.rs:31:24:31:42 | FormatArgsExpr | main.rs:31:31:31:35 | {:>5} | 0 |
+| main.rs:32:14:32:57 | FormatArgsExpr | main.rs:32:21:32:26 | {:^15} | 0 |
+| main.rs:32:39:32:56 | FormatArgsExpr | main.rs:32:40:32:43 | {:?} | 0 |
+| main.rs:33:24:33:39 | FormatArgsExpr | main.rs:33:31:33:34 | {:+} | 0 |
+| main.rs:34:24:34:35 | FormatArgsExpr | main.rs:34:25:34:29 | {:#x} | 0 |
+| main.rs:35:24:35:40 | FormatArgsExpr | main.rs:35:31:35:35 | {:05} | 0 |
+| main.rs:36:24:36:41 | FormatArgsExpr | main.rs:36:31:36:35 | {:05} | 0 |
+| main.rs:37:24:37:38 | FormatArgsExpr | main.rs:37:25:37:32 | {:#010x} | 0 |
+| main.rs:39:14:39:45 | FormatArgsExpr | main.rs:39:21:39:23 | {0} | 0 |
+| main.rs:39:14:39:45 | FormatArgsExpr | main.rs:39:28:39:33 | {1:.5} | 1 |
+| main.rs:41:14:41:49 | FormatArgsExpr | main.rs:41:21:41:23 | {1} | 0 |
+| main.rs:41:14:41:49 | FormatArgsExpr | main.rs:41:28:41:34 | {2:.0$} | 1 |
+| main.rs:43:14:43:49 | FormatArgsExpr | main.rs:43:21:43:23 | {0} | 0 |
+| main.rs:43:14:43:49 | FormatArgsExpr | main.rs:43:28:43:34 | {2:.1$} | 1 |
+| main.rs:45:14:45:46 | FormatArgsExpr | main.rs:45:21:45:22 | {} | 0 |
+| main.rs:45:14:45:46 | FormatArgsExpr | main.rs:45:27:45:31 | {:.*} | 1 |
+| main.rs:47:14:47:48 | FormatArgsExpr | main.rs:47:21:47:23 | {1} | 0 |
+| main.rs:47:14:47:48 | FormatArgsExpr | main.rs:47:28:47:33 | {2:.*} | 1 |
+| main.rs:48:14:48:47 | FormatArgsExpr | main.rs:48:21:48:22 | {} | 0 |
+| main.rs:48:14:48:47 | FormatArgsExpr | main.rs:48:27:48:32 | {2:.*} | 1 |
+| main.rs:49:14:49:72 | FormatArgsExpr | main.rs:49:21:49:22 | {} | 0 |
+| main.rs:49:14:49:72 | FormatArgsExpr | main.rs:49:27:49:41 | {number:.prec$} | 1 |
+| main.rs:52:9:55:22 | FormatArgsExpr | main.rs:52:10:52:11 | {} | 0 |
+| main.rs:52:9:55:22 | FormatArgsExpr | main.rs:52:15:52:23 | {name:.*} | 1 |
+| main.rs:58:9:61:24 | FormatArgsExpr | main.rs:58:10:58:11 | {} | 0 |
+| main.rs:58:9:61:24 | FormatArgsExpr | main.rs:58:15:58:23 | {name:.*} | 1 |
+| main.rs:64:9:67:24 | FormatArgsExpr | main.rs:64:10:64:11 | {} | 0 |
+| main.rs:64:9:67:24 | FormatArgsExpr | main.rs:64:15:64:25 | {name:>8.*} | 1 |
+| main.rs:70:12:70:31 | FormatArgsExpr | main.rs:70:13:70:20 | {0:.1$e} | 0 |
+| main.rs:71:12:71:31 | FormatArgsExpr | main.rs:71:13:71:20 | {0:.1$e} | 0 |
+| main.rs:73:14:73:35 | FormatArgsExpr | main.rs:73:28:73:29 | {} | 0 |
+getArgumentRef
+| main.rs:5:21:5:46 | {value:#width$.precision$} | main.rs:5:22:5:26 | value |
+| main.rs:6:21:6:30 | {0:#1$.2$} | main.rs:6:22:6:22 | 0 |
+| main.rs:14:15:14:21 | {value} | main.rs:14:16:14:20 | value |
+| main.rs:16:21:16:28 | {people} | main.rs:16:22:16:27 | people |
+| main.rs:21:15:21:17 | {1} | main.rs:21:16:21:16 | 1 |
+| main.rs:21:22:21:24 | {0} | main.rs:21:23:21:23 | 0 |
+| main.rs:24:21:24:26 | {1:0$} | main.rs:24:22:24:22 | 1 |
+| main.rs:39:21:39:23 | {0} | main.rs:39:22:39:22 | 0 |
+| main.rs:39:28:39:33 | {1:.5} | main.rs:39:29:39:29 | 1 |
+| main.rs:41:21:41:23 | {1} | main.rs:41:22:41:22 | 1 |
+| main.rs:41:28:41:34 | {2:.0$} | main.rs:41:29:41:29 | 2 |
+| main.rs:43:21:43:23 | {0} | main.rs:43:22:43:22 | 0 |
+| main.rs:43:28:43:34 | {2:.1$} | main.rs:43:29:43:29 | 2 |
+| main.rs:47:21:47:23 | {1} | main.rs:47:22:47:22 | 1 |
+| main.rs:47:28:47:33 | {2:.*} | main.rs:47:29:47:29 | 2 |
+| main.rs:48:27:48:32 | {2:.*} | main.rs:48:28:48:28 | 2 |
+| main.rs:49:27:49:41 | {number:.prec$} | main.rs:49:28:49:33 | number |
+| main.rs:52:15:52:23 | {name:.*} | main.rs:52:16:52:19 | name |
+| main.rs:58:15:58:23 | {name:.*} | main.rs:58:16:58:19 | name |
+| main.rs:64:15:64:25 | {name:>8.*} | main.rs:64:16:64:19 | name |
+| main.rs:70:13:70:20 | {0:.1$e} | main.rs:70:14:70:14 | 0 |
+| main.rs:71:13:71:20 | {0:.1$e} | main.rs:71:14:71:14 | 0 |
+getWidthArgument
+| main.rs:5:21:5:46 | {value:#width$.precision$} | main.rs:5:29:5:33 | width |
+| main.rs:6:21:6:30 | {0:#1$.2$} | main.rs:6:25:6:25 | 1 |
+| main.rs:23:21:23:25 | {:1$} | main.rs:23:23:23:23 | 1 |
+| main.rs:24:21:24:26 | {1:0$} | main.rs:24:24:24:24 | 0 |
+| main.rs:25:21:25:29 | {:width$} | main.rs:25:23:25:27 | width |
+| main.rs:27:21:27:29 | {:width$} | main.rs:27:23:27:27 | width |
+getPrecisionArgument
+| main.rs:5:21:5:46 | {value:#width$.precision$} | main.rs:5:36:5:44 | precision |
+| main.rs:6:21:6:30 | {0:#1$.2$} | main.rs:6:28:6:28 | 2 |
+| main.rs:41:28:41:34 | {2:.0$} | main.rs:41:32:41:32 | 0 |
+| main.rs:43:28:43:34 | {2:.1$} | main.rs:43:32:43:32 | 1 |
+| main.rs:49:27:49:41 | {number:.prec$} | main.rs:49:36:49:39 | prec |
+| main.rs:70:13:70:20 | {0:.1$e} | main.rs:70:17:70:17 | 1 |
+| main.rs:71:13:71:20 | {0:.1$e} | main.rs:71:17:71:17 | 1 |
+getIndex
+| main.rs:6:22:6:22 | 0 | 0 |
+| main.rs:6:25:6:25 | 1 | 1 |
+| main.rs:6:28:6:28 | 2 | 2 |
+| main.rs:21:16:21:16 | 1 | 1 |
+| main.rs:21:23:21:23 | 0 | 0 |
+| main.rs:23:23:23:23 | 1 | 1 |
+| main.rs:24:22:24:22 | 1 | 1 |
+| main.rs:24:24:24:24 | 0 | 0 |
+| main.rs:39:22:39:22 | 0 | 0 |
+| main.rs:39:29:39:29 | 1 | 1 |
+| main.rs:41:22:41:22 | 1 | 1 |
+| main.rs:41:29:41:29 | 2 | 2 |
+| main.rs:41:32:41:32 | 0 | 0 |
+| main.rs:43:22:43:22 | 0 | 0 |
+| main.rs:43:29:43:29 | 2 | 2 |
+| main.rs:43:32:43:32 | 1 | 1 |
+| main.rs:47:22:47:22 | 1 | 1 |
+| main.rs:47:29:47:29 | 2 | 2 |
+| main.rs:48:28:48:28 | 2 | 2 |
+| main.rs:70:14:70:14 | 0 | 0 |
+| main.rs:70:17:70:17 | 1 | 1 |
+| main.rs:71:14:71:14 | 0 | 0 |
+| main.rs:71:17:71:17 | 1 | 1 |
+getName
+| main.rs:5:22:5:26 | value | value |
+| main.rs:5:29:5:33 | width | width |
+| main.rs:5:36:5:44 | precision | precision |
+| main.rs:14:16:14:20 | value | value |
+| main.rs:16:22:16:27 | people | people |
+| main.rs:25:23:25:27 | width | width |
+| main.rs:27:23:27:27 | width | width |
+| main.rs:49:28:49:33 | number | number |
+| main.rs:49:36:49:39 | prec | prec |
+| main.rs:52:16:52:19 | name | name |
+| main.rs:58:16:58:19 | name | name |
+| main.rs:64:16:64:19 | name | name |
diff --git a/rust/ql/test/library-tests/formatstrings/FormatTemplate.ql b/rust/ql/test/library-tests/formatstrings/FormatTemplate.ql
new file mode 100644
index 00000000000..a1e068a61bb
--- /dev/null
+++ b/rust/ql/test/library-tests/formatstrings/FormatTemplate.ql
@@ -0,0 +1,19 @@
+import rust
+
+query predicate getFormat(FormatArgsExpr arg, Format format, int index) {
+  format = arg.getFormat(index)
+}
+
+query predicate getArgumentRef(Format format, FormatArgument arg) { arg = format.getArgumentRef() }
+
+query predicate getWidthArgument(Format format, FormatArgument arg) {
+  arg = format.getWidthArgument()
+}
+
+query predicate getPrecisionArgument(Format format, FormatArgument arg) {
+  arg = format.getPrecisionArgument()
+}
+
+query predicate getIndex(PositionalFormatArgument arg, int index) { arg.getIndex() = index }
+
+query predicate getName(NamedFormatArgument arg, string name) { arg.getName() = name }
diff --git a/rust/ql/test/library-tests/formatstrings/main.rs b/rust/ql/test/library-tests/formatstrings/main.rs
new file mode 100644
index 00000000000..b056262f46f
--- /dev/null
+++ b/rust/ql/test/library-tests/formatstrings/main.rs
@@ -0,0 +1,77 @@
+fn main() {
+    let width = 4;
+    let precision = 2;
+    let value = 10;
+    println!("Value {value:#width$.precision$}", value = 10.5);
+    println!("Value {0:#1$.2$}", value, width, precision);
+    println!("Value {} {}", value, width);
+
+    // Examples from https://doc.rust-lang.org/std/fmt
+    println!("Hello");
+    println!("Hello, {}!", "world");
+    println!("The number is {}", 1);
+    println!("{:?}", (3, 4));
+    println!("{value}", value = 4);
+    let people = "Rustaceans";
+    println!("Hello {people}!");
+    println!("{} {}", 1, 2);
+    println!("{:04}", 42);
+    println!("{:#?}", (100, 200));
+
+    println!("{1} {} {0} {}", 1, 2);
+    println!("Hello {:5}!", "x");
+    println!("Hello {:1$}!", "x", 5);
+    println!("Hello {1:0$}!", 5, "x");
+    println!("Hello {:width$}!", "x", width = 5);
+    let width = 5;
+    println!("Hello {:width$}!", "x");
+    assert_eq!(format!("Hello {:<5}!", "x"), "Hello x    !");
+    assert_eq!(format!("Hello {:-<5}!", "x"), "Hello x----!");
+    assert_eq!(format!("Hello {:^5}!", "x"), "Hello   x  !");
+    assert_eq!(format!("Hello {:>5}!", "x"), "Hello     x!");
+    println!("Hello {:^15}!", format!("{:?}", Some("hi")));
+    assert_eq!(format!("Hello {:+}!", 5), "Hello +5!");
+    assert_eq!(format!("{:#x}!", 27), "0x1b!");
+    assert_eq!(format!("Hello {:05}!", 5), "Hello 00005!");
+    assert_eq!(format!("Hello {:05}!", -5), "Hello -0005!");
+    assert_eq!(format!("{:#010x}!", 27), "0x0000001b!");
+
+    println!("Hello {0} is {1:.5}", "x", 0.01);
+
+    println!("Hello {1} is {2:.0$}", 5, "x", 0.01);
+
+    println!("Hello {0} is {2:.1$}", "x", 5, 0.01);
+
+    println!("Hello {} is {:.*}", "x", 5, 0.01);
+
+    println!("Hello {1} is {2:.*}", 5, "x", 0.01);
+    println!("Hello {} is {2:.*}", "x", 5, 0.01);
+    println!("Hello {} is {number:.prec$}", "x", prec = 5, number = 0.01);
+
+    println!(
+        "{}, `{name:.*}` has 3 fractional digits",
+        "Hello",
+        3,
+        name = 1234.56
+    );
+    println!(
+        "{}, `{name:.*}` has 3 characters",
+        "Hello",
+        3,
+        name = "1234.56"
+    );
+    println!(
+        "{}, `{name:>8.*}` has 3 right-aligned characters",
+        "Hello",
+        3,
+        name = "1234.56"
+    );
+
+    print!("{0:.1$e}", 12345, 3);
+    print!("{0:.1$e}", 12355, 3);
+
+    println!("The value is {}", 1.5);
+
+    assert_eq!(format!("Hello {{}}"), "Hello {}");
+    assert_eq!(format!("{{ Hello"), "{ Hello");
+}
diff --git a/rust/ql/test/library-tests/variables/Cfg.expected b/rust/ql/test/library-tests/variables/Cfg.expected
new file mode 100644
index 00000000000..3ff46aa9f7e
--- /dev/null
+++ b/rust/ql/test/library-tests/variables/Cfg.expected
@@ -0,0 +1,1268 @@
+edges
+| variables.rs:3:1:5:1 | enter print_str | variables.rs:3:14:3:14 | s |  |
+| variables.rs:3:1:5:1 | exit print_str (normal) | variables.rs:3:1:5:1 | exit print_str |  |
+| variables.rs:3:14:3:14 | s | variables.rs:3:14:3:20 | Param | match |
+| variables.rs:3:14:3:20 | Param | variables.rs:4:5:4:22 | ExprStmt |  |
+| variables.rs:3:23:5:1 | BlockExpr | variables.rs:3:1:5:1 | exit print_str (normal) |  |
+| variables.rs:4:5:4:21 | $crate::io::_print | variables.rs:4:14:4:17 | "{}\\n" |  |
+| variables.rs:4:5:4:21 | MacroExpr | variables.rs:3:23:5:1 | BlockExpr |  |
+| variables.rs:4:5:4:22 | ExprStmt | variables.rs:4:14:4:20 | MacroStmts |  |
+| variables.rs:4:14:4:17 | "{}\\n" | variables.rs:4:20:4:20 | s |  |
+| variables.rs:4:14:4:20 | BlockExpr | variables.rs:4:5:4:21 | MacroExpr |  |
+| variables.rs:4:14:4:20 | CallExpr | variables.rs:4:14:4:20 | BlockExpr |  |
+| variables.rs:4:14:4:20 | ExprStmt | variables.rs:4:5:4:21 | $crate::io::_print |  |
+| variables.rs:4:14:4:20 | FormatArgsExpr | variables.rs:4:14:4:20 | MacroExpr |  |
+| variables.rs:4:14:4:20 | MacroExpr | variables.rs:4:14:4:20 | CallExpr |  |
+| variables.rs:4:14:4:20 | MacroStmts | variables.rs:4:14:4:20 | ExprStmt |  |
+| variables.rs:4:20:4:20 | s | variables.rs:4:14:4:20 | FormatArgsExpr |  |
+| variables.rs:7:1:9:1 | enter print_i64 | variables.rs:7:14:7:14 | i |  |
+| variables.rs:7:1:9:1 | exit print_i64 (normal) | variables.rs:7:1:9:1 | exit print_i64 |  |
+| variables.rs:7:14:7:14 | i | variables.rs:7:14:7:19 | Param | match |
+| variables.rs:7:14:7:19 | Param | variables.rs:8:5:8:22 | ExprStmt |  |
+| variables.rs:7:22:9:1 | BlockExpr | variables.rs:7:1:9:1 | exit print_i64 (normal) |  |
+| variables.rs:8:5:8:21 | $crate::io::_print | variables.rs:8:14:8:17 | "{}\\n" |  |
+| variables.rs:8:5:8:21 | MacroExpr | variables.rs:7:22:9:1 | BlockExpr |  |
+| variables.rs:8:5:8:22 | ExprStmt | variables.rs:8:14:8:20 | MacroStmts |  |
+| variables.rs:8:14:8:17 | "{}\\n" | variables.rs:8:20:8:20 | i |  |
+| variables.rs:8:14:8:20 | BlockExpr | variables.rs:8:5:8:21 | MacroExpr |  |
+| variables.rs:8:14:8:20 | CallExpr | variables.rs:8:14:8:20 | BlockExpr |  |
+| variables.rs:8:14:8:20 | ExprStmt | variables.rs:8:5:8:21 | $crate::io::_print |  |
+| variables.rs:8:14:8:20 | FormatArgsExpr | variables.rs:8:14:8:20 | MacroExpr |  |
+| variables.rs:8:14:8:20 | MacroExpr | variables.rs:8:14:8:20 | CallExpr |  |
+| variables.rs:8:14:8:20 | MacroStmts | variables.rs:8:14:8:20 | ExprStmt |  |
+| variables.rs:8:20:8:20 | i | variables.rs:8:14:8:20 | FormatArgsExpr |  |
+| variables.rs:11:1:13:1 | enter print_i64_ref | variables.rs:11:18:11:18 | i |  |
+| variables.rs:11:1:13:1 | exit print_i64_ref (normal) | variables.rs:11:1:13:1 | exit print_i64_ref |  |
+| variables.rs:11:18:11:18 | i | variables.rs:11:18:11:24 | Param | match |
+| variables.rs:11:18:11:24 | Param | variables.rs:12:5:12:13 | print_i64 |  |
+| variables.rs:11:27:13:1 | BlockExpr | variables.rs:11:1:13:1 | exit print_i64_ref (normal) |  |
+| variables.rs:12:5:12:13 | print_i64 | variables.rs:12:16:12:16 | i |  |
+| variables.rs:12:5:12:17 | CallExpr | variables.rs:11:27:13:1 | BlockExpr |  |
+| variables.rs:12:15:12:16 | * ... | variables.rs:12:5:12:17 | CallExpr |  |
+| variables.rs:12:16:12:16 | i | variables.rs:12:15:12:16 | * ... |  |
+| variables.rs:15:1:18:1 | enter immutable_variable | variables.rs:16:5:16:17 | LetStmt |  |
+| variables.rs:15:1:18:1 | exit immutable_variable (normal) | variables.rs:15:1:18:1 | exit immutable_variable |  |
+| variables.rs:15:25:18:1 | BlockExpr | variables.rs:15:1:18:1 | exit immutable_variable (normal) |  |
+| variables.rs:16:5:16:17 | LetStmt | variables.rs:16:14:16:16 | "a" |  |
+| variables.rs:16:9:16:10 | x1 | variables.rs:17:5:17:18 | ExprStmt | match |
+| variables.rs:16:14:16:16 | "a" | variables.rs:16:9:16:10 | x1 |  |
+| variables.rs:17:5:17:13 | print_str | variables.rs:17:15:17:16 | x1 |  |
+| variables.rs:17:5:17:17 | CallExpr | variables.rs:15:25:18:1 | BlockExpr |  |
+| variables.rs:17:5:17:18 | ExprStmt | variables.rs:17:5:17:13 | print_str |  |
+| variables.rs:17:15:17:16 | x1 | variables.rs:17:5:17:17 | CallExpr |  |
+| variables.rs:20:1:25:1 | enter mutable_variable | variables.rs:21:5:21:19 | LetStmt |  |
+| variables.rs:20:1:25:1 | exit mutable_variable (normal) | variables.rs:20:1:25:1 | exit mutable_variable |  |
+| variables.rs:20:23:25:1 | BlockExpr | variables.rs:20:1:25:1 | exit mutable_variable (normal) |  |
+| variables.rs:21:5:21:19 | LetStmt | variables.rs:21:18:21:18 | 4 |  |
+| variables.rs:21:9:21:14 | x2 | variables.rs:22:5:22:18 | ExprStmt | match |
+| variables.rs:21:18:21:18 | 4 | variables.rs:21:9:21:14 | x2 |  |
+| variables.rs:22:5:22:13 | print_i64 | variables.rs:22:15:22:16 | x2 |  |
+| variables.rs:22:5:22:17 | CallExpr | variables.rs:23:5:23:11 | ExprStmt |  |
+| variables.rs:22:5:22:18 | ExprStmt | variables.rs:22:5:22:13 | print_i64 |  |
+| variables.rs:22:15:22:16 | x2 | variables.rs:22:5:22:17 | CallExpr |  |
+| variables.rs:23:5:23:6 | x2 | variables.rs:23:10:23:10 | 5 |  |
+| variables.rs:23:5:23:10 | ... = ... | variables.rs:24:5:24:18 | ExprStmt |  |
+| variables.rs:23:5:23:11 | ExprStmt | variables.rs:23:5:23:6 | x2 |  |
+| variables.rs:23:10:23:10 | 5 | variables.rs:23:5:23:10 | ... = ... |  |
+| variables.rs:24:5:24:13 | print_i64 | variables.rs:24:15:24:16 | x2 |  |
+| variables.rs:24:5:24:17 | CallExpr | variables.rs:20:23:25:1 | BlockExpr |  |
+| variables.rs:24:5:24:18 | ExprStmt | variables.rs:24:5:24:13 | print_i64 |  |
+| variables.rs:24:15:24:16 | x2 | variables.rs:24:5:24:17 | CallExpr |  |
+| variables.rs:27:1:32:1 | enter mutable_variable_immutable_borrow | variables.rs:28:5:28:18 | LetStmt |  |
+| variables.rs:27:1:32:1 | exit mutable_variable_immutable_borrow (normal) | variables.rs:27:1:32:1 | exit mutable_variable_immutable_borrow |  |
+| variables.rs:27:40:32:1 | BlockExpr | variables.rs:27:1:32:1 | exit mutable_variable_immutable_borrow (normal) |  |
+| variables.rs:28:5:28:18 | LetStmt | variables.rs:28:17:28:17 | 1 |  |
+| variables.rs:28:9:28:13 | x | variables.rs:29:5:29:22 | ExprStmt | match |
+| variables.rs:28:17:28:17 | 1 | variables.rs:28:9:28:13 | x |  |
+| variables.rs:29:5:29:17 | print_i64_ref | variables.rs:29:20:29:20 | x |  |
+| variables.rs:29:5:29:21 | CallExpr | variables.rs:30:5:30:10 | ExprStmt |  |
+| variables.rs:29:5:29:22 | ExprStmt | variables.rs:29:5:29:17 | print_i64_ref |  |
+| variables.rs:29:19:29:20 | RefExpr | variables.rs:29:5:29:21 | CallExpr |  |
+| variables.rs:29:20:29:20 | x | variables.rs:29:19:29:20 | RefExpr |  |
+| variables.rs:30:5:30:5 | x | variables.rs:30:9:30:9 | 2 |  |
+| variables.rs:30:5:30:9 | ... = ... | variables.rs:31:5:31:22 | ExprStmt |  |
+| variables.rs:30:5:30:10 | ExprStmt | variables.rs:30:5:30:5 | x |  |
+| variables.rs:30:9:30:9 | 2 | variables.rs:30:5:30:9 | ... = ... |  |
+| variables.rs:31:5:31:17 | print_i64_ref | variables.rs:31:20:31:20 | x |  |
+| variables.rs:31:5:31:21 | CallExpr | variables.rs:27:40:32:1 | BlockExpr |  |
+| variables.rs:31:5:31:22 | ExprStmt | variables.rs:31:5:31:17 | print_i64_ref |  |
+| variables.rs:31:19:31:20 | RefExpr | variables.rs:31:5:31:21 | CallExpr |  |
+| variables.rs:31:20:31:20 | x | variables.rs:31:19:31:20 | RefExpr |  |
+| variables.rs:34:1:40:1 | enter variable_shadow1 | variables.rs:35:5:35:15 | LetStmt |  |
+| variables.rs:34:1:40:1 | exit variable_shadow1 (normal) | variables.rs:34:1:40:1 | exit variable_shadow1 |  |
+| variables.rs:34:23:40:1 | BlockExpr | variables.rs:34:1:40:1 | exit variable_shadow1 (normal) |  |
+| variables.rs:35:5:35:15 | LetStmt | variables.rs:35:14:35:14 | 1 |  |
+| variables.rs:35:9:35:10 | x3 | variables.rs:36:5:36:18 | ExprStmt | match |
+| variables.rs:35:14:35:14 | 1 | variables.rs:35:9:35:10 | x3 |  |
+| variables.rs:36:5:36:13 | print_i64 | variables.rs:36:15:36:16 | x3 |  |
+| variables.rs:36:5:36:17 | CallExpr | variables.rs:37:5:38:15 | LetStmt |  |
+| variables.rs:36:5:36:18 | ExprStmt | variables.rs:36:5:36:13 | print_i64 |  |
+| variables.rs:36:15:36:16 | x3 | variables.rs:36:5:36:17 | CallExpr |  |
+| variables.rs:37:5:38:15 | LetStmt | variables.rs:38:9:38:10 | x3 |  |
+| variables.rs:37:9:37:10 | x3 | variables.rs:39:5:39:18 | ExprStmt | match |
+| variables.rs:38:9:38:10 | x3 | variables.rs:38:14:38:14 | 1 |  |
+| variables.rs:38:9:38:14 | ... + ... | variables.rs:37:9:37:10 | x3 |  |
+| variables.rs:38:14:38:14 | 1 | variables.rs:38:9:38:14 | ... + ... |  |
+| variables.rs:39:5:39:13 | print_i64 | variables.rs:39:15:39:16 | x3 |  |
+| variables.rs:39:5:39:17 | CallExpr | variables.rs:34:23:40:1 | BlockExpr |  |
+| variables.rs:39:5:39:18 | ExprStmt | variables.rs:39:5:39:13 | print_i64 |  |
+| variables.rs:39:15:39:16 | x3 | variables.rs:39:5:39:17 | CallExpr |  |
+| variables.rs:42:1:50:1 | enter variable_shadow2 | variables.rs:43:5:43:17 | LetStmt |  |
+| variables.rs:42:1:50:1 | exit variable_shadow2 (normal) | variables.rs:42:1:50:1 | exit variable_shadow2 |  |
+| variables.rs:42:23:50:1 | BlockExpr | variables.rs:42:1:50:1 | exit variable_shadow2 (normal) |  |
+| variables.rs:43:5:43:17 | LetStmt | variables.rs:43:14:43:16 | "a" |  |
+| variables.rs:43:9:43:10 | x4 | variables.rs:44:5:44:18 | ExprStmt | match |
+| variables.rs:43:14:43:16 | "a" | variables.rs:43:9:43:10 | x4 |  |
+| variables.rs:44:5:44:13 | print_str | variables.rs:44:15:44:16 | x4 |  |
+| variables.rs:44:5:44:17 | CallExpr | variables.rs:45:5:48:5 | ExprStmt |  |
+| variables.rs:44:5:44:18 | ExprStmt | variables.rs:44:5:44:13 | print_str |  |
+| variables.rs:44:15:44:16 | x4 | variables.rs:44:5:44:17 | CallExpr |  |
+| variables.rs:45:5:48:5 | BlockExpr | variables.rs:49:5:49:18 | ExprStmt |  |
+| variables.rs:45:5:48:5 | ExprStmt | variables.rs:46:9:46:21 | LetStmt |  |
+| variables.rs:46:9:46:21 | LetStmt | variables.rs:46:18:46:20 | "b" |  |
+| variables.rs:46:13:46:14 | x4 | variables.rs:47:9:47:22 | ExprStmt | match |
+| variables.rs:46:18:46:20 | "b" | variables.rs:46:13:46:14 | x4 |  |
+| variables.rs:47:9:47:17 | print_str | variables.rs:47:19:47:20 | x4 |  |
+| variables.rs:47:9:47:21 | CallExpr | variables.rs:45:5:48:5 | BlockExpr |  |
+| variables.rs:47:9:47:22 | ExprStmt | variables.rs:47:9:47:17 | print_str |  |
+| variables.rs:47:19:47:20 | x4 | variables.rs:47:9:47:21 | CallExpr |  |
+| variables.rs:49:5:49:13 | print_str | variables.rs:49:15:49:16 | x4 |  |
+| variables.rs:49:5:49:17 | CallExpr | variables.rs:42:23:50:1 | BlockExpr |  |
+| variables.rs:49:5:49:18 | ExprStmt | variables.rs:49:5:49:13 | print_str |  |
+| variables.rs:49:15:49:16 | x4 | variables.rs:49:5:49:17 | CallExpr |  |
+| variables.rs:57:1:72:1 | enter let_pattern1 | variables.rs:58:5:67:47 | LetStmt |  |
+| variables.rs:57:1:72:1 | exit let_pattern1 (normal) | variables.rs:57:1:72:1 | exit let_pattern1 |  |
+| variables.rs:57:19:72:1 | BlockExpr | variables.rs:57:1:72:1 | exit let_pattern1 (normal) |  |
+| variables.rs:58:5:67:47 | LetStmt | variables.rs:67:11:67:13 | "a" |  |
+| variables.rs:58:9:67:5 | TuplePat | variables.rs:59:9:62:9 | TuplePat | match |
+| variables.rs:59:9:62:9 | TuplePat | variables.rs:60:13:60:14 | a1 | match |
+| variables.rs:60:13:60:14 | a1 | variables.rs:61:13:61:14 | b1 | match |
+| variables.rs:61:13:61:14 | b1 | variables.rs:63:9:66:9 | RecordPat | match |
+| variables.rs:63:9:66:9 | RecordPat | variables.rs:64:13:64:13 | x | match |
+| variables.rs:64:13:64:13 | x | variables.rs:65:13:65:13 | y | match |
+| variables.rs:65:13:65:13 | y | variables.rs:68:5:68:18 | ExprStmt | match |
+| variables.rs:67:9:67:46 | TupleExpr | variables.rs:58:9:67:5 | TuplePat |  |
+| variables.rs:67:10:67:19 | TupleExpr | variables.rs:67:33:67:35 | "x" |  |
+| variables.rs:67:11:67:13 | "a" | variables.rs:67:16:67:18 | "b" |  |
+| variables.rs:67:16:67:18 | "b" | variables.rs:67:10:67:19 | TupleExpr |  |
+| variables.rs:67:22:67:45 | RecordExpr | variables.rs:67:9:67:46 | TupleExpr |  |
+| variables.rs:67:33:67:35 | "x" | variables.rs:67:41:67:43 | "y" |  |
+| variables.rs:67:41:67:43 | "y" | variables.rs:67:22:67:45 | RecordExpr |  |
+| variables.rs:68:5:68:13 | print_str | variables.rs:68:15:68:16 | a1 |  |
+| variables.rs:68:5:68:17 | CallExpr | variables.rs:69:5:69:18 | ExprStmt |  |
+| variables.rs:68:5:68:18 | ExprStmt | variables.rs:68:5:68:13 | print_str |  |
+| variables.rs:68:15:68:16 | a1 | variables.rs:68:5:68:17 | CallExpr |  |
+| variables.rs:69:5:69:13 | print_str | variables.rs:69:15:69:16 | b1 |  |
+| variables.rs:69:5:69:17 | CallExpr | variables.rs:70:5:70:17 | ExprStmt |  |
+| variables.rs:69:5:69:18 | ExprStmt | variables.rs:69:5:69:13 | print_str |  |
+| variables.rs:69:15:69:16 | b1 | variables.rs:69:5:69:17 | CallExpr |  |
+| variables.rs:70:5:70:13 | print_str | variables.rs:70:15:70:15 | x |  |
+| variables.rs:70:5:70:16 | CallExpr | variables.rs:71:5:71:17 | ExprStmt |  |
+| variables.rs:70:5:70:17 | ExprStmt | variables.rs:70:5:70:13 | print_str |  |
+| variables.rs:70:15:70:15 | x | variables.rs:70:5:70:16 | CallExpr |  |
+| variables.rs:71:5:71:13 | print_str | variables.rs:71:15:71:15 | y |  |
+| variables.rs:71:5:71:16 | CallExpr | variables.rs:57:19:72:1 | BlockExpr |  |
+| variables.rs:71:5:71:17 | ExprStmt | variables.rs:71:5:71:13 | print_str |  |
+| variables.rs:71:15:71:15 | y | variables.rs:71:5:71:16 | CallExpr |  |
+| variables.rs:74:1:82:1 | enter let_pattern2 | variables.rs:75:5:75:38 | LetStmt |  |
+| variables.rs:74:1:82:1 | exit let_pattern2 (normal) | variables.rs:74:1:82:1 | exit let_pattern2 |  |
+| variables.rs:74:19:82:1 | BlockExpr | variables.rs:74:1:82:1 | exit let_pattern2 (normal) |  |
+| variables.rs:75:5:75:38 | LetStmt | variables.rs:75:25:75:27 | "a" |  |
+| variables.rs:75:9:75:10 | p1 | variables.rs:76:5:79:11 | LetStmt | match |
+| variables.rs:75:14:75:37 | RecordExpr | variables.rs:75:9:75:10 | p1 |  |
+| variables.rs:75:25:75:27 | "a" | variables.rs:75:33:75:35 | "b" |  |
+| variables.rs:75:33:75:35 | "b" | variables.rs:75:14:75:37 | RecordExpr |  |
+| variables.rs:76:5:79:11 | LetStmt | variables.rs:79:9:79:10 | p1 |  |
+| variables.rs:76:9:79:5 | RecordPat | variables.rs:77:12:77:13 | a2 | match |
+| variables.rs:77:12:77:13 | a2 | variables.rs:78:12:78:13 | b2 | match |
+| variables.rs:78:12:78:13 | b2 | variables.rs:80:5:80:18 | ExprStmt | match |
+| variables.rs:79:9:79:10 | p1 | variables.rs:76:9:79:5 | RecordPat |  |
+| variables.rs:80:5:80:13 | print_str | variables.rs:80:15:80:16 | a2 |  |
+| variables.rs:80:5:80:17 | CallExpr | variables.rs:81:5:81:18 | ExprStmt |  |
+| variables.rs:80:5:80:18 | ExprStmt | variables.rs:80:5:80:13 | print_str |  |
+| variables.rs:80:15:80:16 | a2 | variables.rs:80:5:80:17 | CallExpr |  |
+| variables.rs:81:5:81:13 | print_str | variables.rs:81:15:81:16 | b2 |  |
+| variables.rs:81:5:81:17 | CallExpr | variables.rs:74:19:82:1 | BlockExpr |  |
+| variables.rs:81:5:81:18 | ExprStmt | variables.rs:81:5:81:13 | print_str |  |
+| variables.rs:81:15:81:16 | b2 | variables.rs:81:5:81:17 | CallExpr |  |
+| variables.rs:84:1:91:1 | enter let_pattern3 | variables.rs:85:5:85:42 | LetStmt |  |
+| variables.rs:84:1:91:1 | exit let_pattern3 (normal) | variables.rs:84:1:91:1 | exit let_pattern3 |  |
+| variables.rs:84:19:91:1 | BlockExpr | variables.rs:84:1:91:1 | exit let_pattern3 (normal) |  |
+| variables.rs:85:5:85:42 | LetStmt | variables.rs:85:14:85:17 | Some |  |
+| variables.rs:85:9:85:10 | s1 | variables.rs:87:8:88:12 | LetExpr | match |
+| variables.rs:85:14:85:17 | Some | variables.rs:85:19:85:30 | String::from |  |
+| variables.rs:85:14:85:41 | CallExpr | variables.rs:85:9:85:10 | s1 |  |
+| variables.rs:85:19:85:30 | String::from | variables.rs:85:32:85:39 | "Hello!" |  |
+| variables.rs:85:19:85:40 | CallExpr | variables.rs:85:14:85:41 | CallExpr |  |
+| variables.rs:85:32:85:39 | "Hello!" | variables.rs:85:19:85:40 | CallExpr |  |
+| variables.rs:87:5:90:5 | IfExpr | variables.rs:84:19:91:1 | BlockExpr |  |
+| variables.rs:87:8:88:12 | LetExpr | variables.rs:88:11:88:12 | s1 |  |
+| variables.rs:87:12:87:23 | TupleStructPat | variables.rs:87:5:90:5 | IfExpr | no-match |
+| variables.rs:87:12:87:23 | TupleStructPat | variables.rs:87:17:87:22 | s2 | match |
+| variables.rs:87:17:87:22 | s2 | variables.rs:89:9:89:22 | ExprStmt | match |
+| variables.rs:88:11:88:12 | s1 | variables.rs:87:12:87:23 | TupleStructPat |  |
+| variables.rs:88:14:90:5 | BlockExpr | variables.rs:87:5:90:5 | IfExpr |  |
+| variables.rs:89:9:89:17 | print_str | variables.rs:89:19:89:20 | s2 |  |
+| variables.rs:89:9:89:21 | CallExpr | variables.rs:88:14:90:5 | BlockExpr |  |
+| variables.rs:89:9:89:22 | ExprStmt | variables.rs:89:9:89:17 | print_str |  |
+| variables.rs:89:19:89:20 | s2 | variables.rs:89:9:89:21 | CallExpr |  |
+| variables.rs:93:1:99:1 | enter let_pattern4 | variables.rs:94:5:97:10 | LetStmt |  |
+| variables.rs:93:1:99:1 | exit let_pattern4 (normal) | variables.rs:93:1:99:1 | exit let_pattern4 |  |
+| variables.rs:93:19:99:1 | BlockExpr | variables.rs:93:1:99:1 | exit let_pattern4 (normal) |  |
+| variables.rs:94:5:97:10 | LetStmt | variables.rs:94:34:94:37 | Some |  |
+| variables.rs:94:9:94:16 | TupleStructPat | variables.rs:94:14:94:15 | x5 | match |
+| variables.rs:94:9:94:16 | TupleStructPat | variables.rs:96:13:96:19 | MacroStmts | no-match |
+| variables.rs:94:14:94:15 | x5 | variables.rs:98:5:98:18 | ExprStmt | match |
+| variables.rs:94:34:94:37 | Some | variables.rs:94:39:94:42 | "x5" |  |
+| variables.rs:94:34:94:43 | CallExpr | variables.rs:94:9:94:16 | TupleStructPat |  |
+| variables.rs:94:39:94:42 | "x5" | variables.rs:94:34:94:43 | CallExpr |  |
+| variables.rs:96:13:96:19 | "not yet implemented" | variables.rs:96:13:96:19 | CallExpr |  |
+| variables.rs:96:13:96:19 | $crate::panicking::panic | variables.rs:96:13:96:19 | "not yet implemented" |  |
+| variables.rs:96:13:96:19 | CallExpr | variables.rs:96:13:96:19 | MacroExpr |  |
+| variables.rs:96:13:96:19 | MacroExpr | variables.rs:95:14:97:9 | BlockExpr |  |
+| variables.rs:96:13:96:19 | MacroStmts | variables.rs:96:13:96:19 | $crate::panicking::panic |  |
+| variables.rs:98:5:98:13 | print_str | variables.rs:98:15:98:16 | x5 |  |
+| variables.rs:98:5:98:17 | CallExpr | variables.rs:93:19:99:1 | BlockExpr |  |
+| variables.rs:98:5:98:18 | ExprStmt | variables.rs:98:5:98:13 | print_str |  |
+| variables.rs:98:15:98:16 | x5 | variables.rs:98:5:98:17 | CallExpr |  |
+| variables.rs:101:1:108:1 | enter let_pattern5 | variables.rs:102:5:102:42 | LetStmt |  |
+| variables.rs:101:1:108:1 | exit let_pattern5 (normal) | variables.rs:101:1:108:1 | exit let_pattern5 |  |
+| variables.rs:101:19:108:1 | BlockExpr | variables.rs:101:1:108:1 | exit let_pattern5 (normal) |  |
+| variables.rs:102:5:102:42 | LetStmt | variables.rs:102:14:102:17 | Some |  |
+| variables.rs:102:9:102:10 | s1 | variables.rs:104:11:105:12 | LetExpr | match |
+| variables.rs:102:14:102:17 | Some | variables.rs:102:19:102:30 | String::from |  |
+| variables.rs:102:14:102:41 | CallExpr | variables.rs:102:9:102:10 | s1 |  |
+| variables.rs:102:19:102:30 | String::from | variables.rs:102:32:102:39 | "Hello!" |  |
+| variables.rs:102:19:102:40 | CallExpr | variables.rs:102:14:102:41 | CallExpr |  |
+| variables.rs:102:32:102:39 | "Hello!" | variables.rs:102:19:102:40 | CallExpr |  |
+| variables.rs:104:5:107:5 | WhileExpr | variables.rs:101:19:108:1 | BlockExpr |  |
+| variables.rs:104:11:105:12 | LetExpr | variables.rs:105:11:105:12 | s1 |  |
+| variables.rs:104:15:104:26 | TupleStructPat | variables.rs:104:5:107:5 | WhileExpr | no-match |
+| variables.rs:104:15:104:26 | TupleStructPat | variables.rs:104:20:104:25 | s2 | match |
+| variables.rs:104:20:104:25 | s2 | variables.rs:106:9:106:22 | ExprStmt | match |
+| variables.rs:105:11:105:12 | s1 | variables.rs:104:15:104:26 | TupleStructPat |  |
+| variables.rs:105:14:107:5 | BlockExpr | variables.rs:104:11:105:12 | LetExpr |  |
+| variables.rs:106:9:106:17 | print_str | variables.rs:106:19:106:20 | s2 |  |
+| variables.rs:106:9:106:21 | CallExpr | variables.rs:105:14:107:5 | BlockExpr |  |
+| variables.rs:106:9:106:22 | ExprStmt | variables.rs:106:9:106:17 | print_str |  |
+| variables.rs:106:19:106:20 | s2 | variables.rs:106:9:106:21 | CallExpr |  |
+| variables.rs:110:1:125:1 | enter match_pattern1 | variables.rs:111:5:111:21 | LetStmt |  |
+| variables.rs:110:1:125:1 | exit match_pattern1 (normal) | variables.rs:110:1:125:1 | exit match_pattern1 |  |
+| variables.rs:110:21:125:1 | BlockExpr | variables.rs:110:1:125:1 | exit match_pattern1 (normal) |  |
+| variables.rs:111:5:111:21 | LetStmt | variables.rs:111:14:111:17 | Some |  |
+| variables.rs:111:9:111:10 | x6 | variables.rs:112:5:112:16 | LetStmt | match |
+| variables.rs:111:14:111:17 | Some | variables.rs:111:19:111:19 | 5 |  |
+| variables.rs:111:14:111:20 | CallExpr | variables.rs:111:9:111:10 | x6 |  |
+| variables.rs:111:19:111:19 | 5 | variables.rs:111:14:111:20 | CallExpr |  |
+| variables.rs:112:5:112:16 | LetStmt | variables.rs:112:14:112:15 | 10 |  |
+| variables.rs:112:9:112:10 | y1 | variables.rs:114:5:122:5 | ExprStmt | match |
+| variables.rs:112:14:112:15 | 10 | variables.rs:112:9:112:10 | y1 |  |
+| variables.rs:114:5:122:5 | ExprStmt | variables.rs:114:11:114:12 | x6 |  |
+| variables.rs:114:5:122:5 | MatchExpr | variables.rs:124:5:124:18 | ExprStmt |  |
+| variables.rs:114:11:114:12 | x6 | variables.rs:115:9:115:16 | TupleStructPat |  |
+| variables.rs:115:9:115:16 | TupleStructPat | variables.rs:115:14:115:15 | 50 | match |
+| variables.rs:115:9:115:16 | TupleStructPat | variables.rs:116:9:116:16 | TupleStructPat | no-match |
+| variables.rs:115:14:115:15 | 50 | variables.rs:115:14:115:15 | LiteralPat |  |
+| variables.rs:115:14:115:15 | LiteralPat | variables.rs:115:21:115:29 | print_str | match |
+| variables.rs:115:14:115:15 | LiteralPat | variables.rs:116:9:116:16 | TupleStructPat | no-match |
+| variables.rs:115:21:115:29 | print_str | variables.rs:115:31:115:38 | "Got 50" |  |
+| variables.rs:115:21:115:39 | CallExpr | variables.rs:114:5:122:5 | MatchExpr |  |
+| variables.rs:115:31:115:38 | "Got 50" | variables.rs:115:21:115:39 | CallExpr |  |
+| variables.rs:116:9:116:16 | TupleStructPat | variables.rs:116:14:116:15 | y1 | match |
+| variables.rs:116:9:116:16 | TupleStructPat | variables.rs:121:9:121:12 | None | no-match |
+| variables.rs:116:14:116:15 | y1 | variables.rs:119:13:119:21 | print_i64 | match |
+| variables.rs:118:9:120:9 | BlockExpr | variables.rs:114:5:122:5 | MatchExpr |  |
+| variables.rs:119:13:119:21 | print_i64 | variables.rs:119:23:119:24 | y1 |  |
+| variables.rs:119:13:119:25 | CallExpr | variables.rs:118:9:120:9 | BlockExpr |  |
+| variables.rs:119:23:119:24 | y1 | variables.rs:119:13:119:25 | CallExpr |  |
+| variables.rs:121:9:121:12 | None | variables.rs:121:17:121:25 | print_str | match |
+| variables.rs:121:17:121:25 | print_str | variables.rs:121:27:121:32 | "NONE" |  |
+| variables.rs:121:17:121:33 | CallExpr | variables.rs:114:5:122:5 | MatchExpr |  |
+| variables.rs:121:27:121:32 | "NONE" | variables.rs:121:17:121:33 | CallExpr |  |
+| variables.rs:124:5:124:13 | print_i64 | variables.rs:124:15:124:16 | y1 |  |
+| variables.rs:124:5:124:17 | CallExpr | variables.rs:110:21:125:1 | BlockExpr |  |
+| variables.rs:124:5:124:18 | ExprStmt | variables.rs:124:5:124:13 | print_i64 |  |
+| variables.rs:124:15:124:16 | y1 | variables.rs:124:5:124:17 | CallExpr |  |
+| variables.rs:127:1:152:1 | enter match_pattern2 | variables.rs:128:5:128:36 | LetStmt |  |
+| variables.rs:127:1:152:1 | exit match_pattern2 (normal) | variables.rs:127:1:152:1 | exit match_pattern2 |  |
+| variables.rs:127:21:152:1 | BlockExpr | variables.rs:127:1:152:1 | exit match_pattern2 (normal) |  |
+| variables.rs:128:5:128:36 | LetStmt | variables.rs:128:20:128:20 | 2 |  |
+| variables.rs:128:9:128:15 | numbers | variables.rs:130:5:140:5 | ExprStmt | match |
+| variables.rs:128:19:128:35 | TupleExpr | variables.rs:128:9:128:15 | numbers |  |
+| variables.rs:128:20:128:20 | 2 | variables.rs:128:23:128:23 | 4 |  |
+| variables.rs:128:23:128:23 | 4 | variables.rs:128:26:128:26 | 8 |  |
+| variables.rs:128:26:128:26 | 8 | variables.rs:128:29:128:30 | 16 |  |
+| variables.rs:128:29:128:30 | 16 | variables.rs:128:33:128:34 | 32 |  |
+| variables.rs:128:33:128:34 | 32 | variables.rs:128:19:128:35 | TupleExpr |  |
+| variables.rs:130:5:140:5 | ExprStmt | variables.rs:130:11:130:17 | numbers |  |
+| variables.rs:130:5:140:5 | MatchExpr | variables.rs:142:11:142:17 | numbers |  |
+| variables.rs:130:11:130:17 | numbers | variables.rs:131:9:135:9 | TuplePat |  |
+| variables.rs:131:9:135:9 | TuplePat | variables.rs:132:13:132:17 | first | match |
+| variables.rs:132:13:132:17 | first | variables.rs:132:20:132:20 | WildcardPat | match |
+| variables.rs:132:20:132:20 | WildcardPat | variables.rs:133:13:133:17 | third | match |
+| variables.rs:133:13:133:17 | third | variables.rs:133:20:133:20 | WildcardPat | match |
+| variables.rs:133:20:133:20 | WildcardPat | variables.rs:134:13:134:17 | fifth | match |
+| variables.rs:134:13:134:17 | fifth | variables.rs:136:13:136:29 | ExprStmt | match |
+| variables.rs:135:14:139:9 | BlockExpr | variables.rs:130:5:140:5 | MatchExpr |  |
+| variables.rs:136:13:136:21 | print_i64 | variables.rs:136:23:136:27 | first |  |
+| variables.rs:136:13:136:28 | CallExpr | variables.rs:137:13:137:29 | ExprStmt |  |
+| variables.rs:136:13:136:29 | ExprStmt | variables.rs:136:13:136:21 | print_i64 |  |
+| variables.rs:136:23:136:27 | first | variables.rs:136:13:136:28 | CallExpr |  |
+| variables.rs:137:13:137:21 | print_i64 | variables.rs:137:23:137:27 | third |  |
+| variables.rs:137:13:137:28 | CallExpr | variables.rs:138:13:138:29 | ExprStmt |  |
+| variables.rs:137:13:137:29 | ExprStmt | variables.rs:137:13:137:21 | print_i64 |  |
+| variables.rs:137:23:137:27 | third | variables.rs:137:13:137:28 | CallExpr |  |
+| variables.rs:138:13:138:21 | print_i64 | variables.rs:138:23:138:27 | fifth |  |
+| variables.rs:138:13:138:28 | CallExpr | variables.rs:135:14:139:9 | BlockExpr |  |
+| variables.rs:138:13:138:29 | ExprStmt | variables.rs:138:13:138:21 | print_i64 |  |
+| variables.rs:138:23:138:27 | fifth | variables.rs:138:13:138:28 | CallExpr |  |
+| variables.rs:142:5:151:5 | MatchExpr | variables.rs:127:21:152:1 | BlockExpr |  |
+| variables.rs:142:11:142:17 | numbers | variables.rs:143:9:147:9 | TuplePat |  |
+| variables.rs:143:9:147:9 | TuplePat | variables.rs:144:13:144:17 | first | match |
+| variables.rs:144:13:144:17 | first | variables.rs:145:13:145:14 | RestPat | match |
+| variables.rs:145:13:145:14 | RestPat | variables.rs:146:13:146:16 | last | match |
+| variables.rs:146:13:146:16 | last | variables.rs:148:13:148:29 | ExprStmt | match |
+| variables.rs:147:14:150:9 | BlockExpr | variables.rs:142:5:151:5 | MatchExpr |  |
+| variables.rs:148:13:148:21 | print_i64 | variables.rs:148:23:148:27 | first |  |
+| variables.rs:148:13:148:28 | CallExpr | variables.rs:149:13:149:28 | ExprStmt |  |
+| variables.rs:148:13:148:29 | ExprStmt | variables.rs:148:13:148:21 | print_i64 |  |
+| variables.rs:148:23:148:27 | first | variables.rs:148:13:148:28 | CallExpr |  |
+| variables.rs:149:13:149:21 | print_i64 | variables.rs:149:23:149:26 | last |  |
+| variables.rs:149:13:149:27 | CallExpr | variables.rs:147:14:150:9 | BlockExpr |  |
+| variables.rs:149:13:149:28 | ExprStmt | variables.rs:149:13:149:21 | print_i64 |  |
+| variables.rs:149:23:149:26 | last | variables.rs:149:13:149:27 | CallExpr |  |
+| variables.rs:154:1:162:1 | enter match_pattern3 | variables.rs:155:5:155:38 | LetStmt |  |
+| variables.rs:154:1:162:1 | exit match_pattern3 (normal) | variables.rs:154:1:162:1 | exit match_pattern3 |  |
+| variables.rs:154:21:162:1 | BlockExpr | variables.rs:154:1:162:1 | exit match_pattern3 (normal) |  |
+| variables.rs:155:5:155:38 | LetStmt | variables.rs:155:25:155:27 | "x" |  |
+| variables.rs:155:9:155:10 | p2 | variables.rs:157:11:157:12 | p2 | match |
+| variables.rs:155:14:155:37 | RecordExpr | variables.rs:155:9:155:10 | p2 |  |
+| variables.rs:155:25:155:27 | "x" | variables.rs:155:33:155:35 | "y" |  |
+| variables.rs:155:33:155:35 | "y" | variables.rs:155:14:155:37 | RecordExpr |  |
+| variables.rs:157:5:161:5 | MatchExpr | variables.rs:154:21:162:1 | BlockExpr |  |
+| variables.rs:157:11:157:12 | p2 | variables.rs:158:9:160:9 | RecordPat |  |
+| variables.rs:158:9:160:9 | RecordPat | variables.rs:159:16:159:17 | x7 | match |
+| variables.rs:159:16:159:17 | x7 | variables.rs:159:20:159:21 | RestPat | match |
+| variables.rs:159:20:159:21 | RestPat | variables.rs:160:14:160:22 | print_str | match |
+| variables.rs:160:14:160:22 | print_str | variables.rs:160:24:160:25 | x7 |  |
+| variables.rs:160:14:160:26 | CallExpr | variables.rs:157:5:161:5 | MatchExpr |  |
+| variables.rs:160:24:160:25 | x7 | variables.rs:160:14:160:26 | CallExpr |  |
+| variables.rs:168:1:181:1 | enter match_pattern4 | variables.rs:169:5:169:39 | LetStmt |  |
+| variables.rs:168:1:181:1 | exit match_pattern4 (normal) | variables.rs:168:1:181:1 | exit match_pattern4 |  |
+| variables.rs:168:21:181:1 | BlockExpr | variables.rs:168:1:181:1 | exit match_pattern4 (normal) |  |
+| variables.rs:169:5:169:39 | LetStmt | variables.rs:169:36:169:36 | 0 |  |
+| variables.rs:169:9:169:11 | msg | variables.rs:171:11:171:13 | msg | match |
+| variables.rs:169:15:169:38 | RecordExpr | variables.rs:169:9:169:11 | msg |  |
+| variables.rs:169:36:169:36 | 0 | variables.rs:169:15:169:38 | RecordExpr |  |
+| variables.rs:171:5:180:5 | MatchExpr | variables.rs:168:21:181:1 | BlockExpr |  |
+| variables.rs:171:11:171:13 | msg | variables.rs:172:9:174:9 | RecordPat |  |
+| variables.rs:172:9:174:9 | RecordPat | variables.rs:173:31:173:35 | RangePat | match |
+| variables.rs:172:9:174:9 | RecordPat | variables.rs:175:9:175:38 | RecordPat | no-match |
+| variables.rs:173:17:173:35 | [match(true)] id_variable | variables.rs:174:14:174:22 | print_i64 | match |
+| variables.rs:173:31:173:31 | 3 | variables.rs:173:31:173:31 | LiteralPat |  |
+| variables.rs:173:31:173:31 | LiteralPat | variables.rs:173:35:173:35 | 7 | match |
+| variables.rs:173:31:173:31 | LiteralPat | variables.rs:175:9:175:38 | RecordPat | no-match |
+| variables.rs:173:31:173:35 | RangePat | variables.rs:173:31:173:31 | 3 | match |
+| variables.rs:173:31:173:35 | RangePat | variables.rs:175:9:175:38 | RecordPat | no-match |
+| variables.rs:173:35:173:35 | 7 | variables.rs:173:35:173:35 | LiteralPat |  |
+| variables.rs:173:35:173:35 | LiteralPat | variables.rs:173:17:173:35 | [match(true)] id_variable | match |
+| variables.rs:173:35:173:35 | LiteralPat | variables.rs:175:9:175:38 | RecordPat | no-match |
+| variables.rs:174:14:174:22 | print_i64 | variables.rs:174:24:174:34 | id_variable |  |
+| variables.rs:174:14:174:35 | CallExpr | variables.rs:171:5:180:5 | MatchExpr |  |
+| variables.rs:174:24:174:34 | id_variable | variables.rs:174:14:174:35 | CallExpr |  |
+| variables.rs:175:9:175:38 | RecordPat | variables.rs:175:30:175:36 | RangePat | match |
+| variables.rs:175:9:175:38 | RecordPat | variables.rs:178:9:178:29 | RecordPat | no-match |
+| variables.rs:175:30:175:31 | 10 | variables.rs:175:30:175:31 | LiteralPat |  |
+| variables.rs:175:30:175:31 | LiteralPat | variables.rs:175:35:175:36 | 12 | match |
+| variables.rs:175:30:175:31 | LiteralPat | variables.rs:178:9:178:29 | RecordPat | no-match |
+| variables.rs:175:30:175:36 | RangePat | variables.rs:175:30:175:31 | 10 | match |
+| variables.rs:175:30:175:36 | RangePat | variables.rs:178:9:178:29 | RecordPat | no-match |
+| variables.rs:175:35:175:36 | 12 | variables.rs:175:35:175:36 | LiteralPat |  |
+| variables.rs:175:35:175:36 | LiteralPat | variables.rs:176:22:176:51 | MacroStmts | match |
+| variables.rs:175:35:175:36 | LiteralPat | variables.rs:178:9:178:29 | RecordPat | no-match |
+| variables.rs:175:43:177:9 | BlockExpr | variables.rs:171:5:180:5 | MatchExpr |  |
+| variables.rs:176:13:176:52 | $crate::io::_print | variables.rs:176:22:176:51 | "Found an id in another range\\n" |  |
+| variables.rs:176:13:176:52 | MacroExpr | variables.rs:175:43:177:9 | BlockExpr |  |
+| variables.rs:176:22:176:51 | "Found an id in another range\\n" | variables.rs:176:22:176:51 | FormatArgsExpr |  |
+| variables.rs:176:22:176:51 | BlockExpr | variables.rs:176:13:176:52 | MacroExpr |  |
+| variables.rs:176:22:176:51 | CallExpr | variables.rs:176:22:176:51 | BlockExpr |  |
+| variables.rs:176:22:176:51 | ExprStmt | variables.rs:176:13:176:52 | $crate::io::_print |  |
+| variables.rs:176:22:176:51 | FormatArgsExpr | variables.rs:176:22:176:51 | MacroExpr |  |
+| variables.rs:176:22:176:51 | MacroExpr | variables.rs:176:22:176:51 | CallExpr |  |
+| variables.rs:176:22:176:51 | MacroStmts | variables.rs:176:22:176:51 | ExprStmt |  |
+| variables.rs:178:9:178:29 | RecordPat | variables.rs:178:26:178:27 | id | match |
+| variables.rs:178:26:178:27 | id | variables.rs:179:13:179:21 | print_i64 | match |
+| variables.rs:179:13:179:21 | print_i64 | variables.rs:179:23:179:24 | id |  |
+| variables.rs:179:13:179:25 | CallExpr | variables.rs:171:5:180:5 | MatchExpr |  |
+| variables.rs:179:23:179:24 | id | variables.rs:179:13:179:25 | CallExpr |  |
+| variables.rs:188:1:194:1 | enter match_pattern5 | variables.rs:189:5:189:34 | LetStmt |  |
+| variables.rs:188:1:194:1 | exit match_pattern5 (normal) | variables.rs:188:1:194:1 | exit match_pattern5 |  |
+| variables.rs:188:21:194:1 | BlockExpr | variables.rs:188:1:194:1 | exit match_pattern5 (normal) |  |
+| variables.rs:189:5:189:34 | LetStmt | variables.rs:189:18:189:29 | Either::Left |  |
+| variables.rs:189:9:189:14 | either | variables.rs:190:11:190:16 | either | match |
+| variables.rs:189:18:189:29 | Either::Left | variables.rs:189:31:189:32 | 32 |  |
+| variables.rs:189:18:189:33 | CallExpr | variables.rs:189:9:189:14 | either |  |
+| variables.rs:189:31:189:32 | 32 | variables.rs:189:18:189:33 | CallExpr |  |
+| variables.rs:190:5:193:5 | MatchExpr | variables.rs:188:21:194:1 | BlockExpr |  |
+| variables.rs:190:11:190:16 | either | variables.rs:191:9:191:24 | TupleStructPat |  |
+| variables.rs:191:9:191:24 | TupleStructPat | variables.rs:191:22:191:23 | a3 | match |
+| variables.rs:191:9:191:24 | TupleStructPat | variables.rs:191:28:191:44 | TupleStructPat | no-match |
+| variables.rs:191:9:191:44 | [match(true)] OrPat | variables.rs:192:16:192:24 | print_i64 | match |
+| variables.rs:191:22:191:23 | a3 | variables.rs:191:9:191:44 | [match(true)] OrPat | match |
+| variables.rs:191:28:191:44 | TupleStructPat | variables.rs:191:42:191:43 | a3 | match |
+| variables.rs:191:42:191:43 | a3 | variables.rs:191:9:191:44 | [match(true)] OrPat | match |
+| variables.rs:192:16:192:24 | print_i64 | variables.rs:192:26:192:27 | a3 |  |
+| variables.rs:192:16:192:28 | CallExpr | variables.rs:190:5:193:5 | MatchExpr |  |
+| variables.rs:192:26:192:27 | a3 | variables.rs:192:16:192:28 | CallExpr |  |
+| variables.rs:202:1:216:1 | enter match_pattern6 | variables.rs:203:5:203:37 | LetStmt |  |
+| variables.rs:202:1:216:1 | exit match_pattern6 (normal) | variables.rs:202:1:216:1 | exit match_pattern6 |  |
+| variables.rs:202:21:216:1 | BlockExpr | variables.rs:202:1:216:1 | exit match_pattern6 (normal) |  |
+| variables.rs:203:5:203:37 | LetStmt | variables.rs:203:14:203:32 | ThreeValued::Second |  |
+| variables.rs:203:9:203:10 | tv | variables.rs:204:5:207:5 | ExprStmt | match |
+| variables.rs:203:14:203:32 | ThreeValued::Second | variables.rs:203:34:203:35 | 62 |  |
+| variables.rs:203:14:203:36 | CallExpr | variables.rs:203:9:203:10 | tv |  |
+| variables.rs:203:34:203:35 | 62 | variables.rs:203:14:203:36 | CallExpr |  |
+| variables.rs:204:5:207:5 | ExprStmt | variables.rs:204:11:204:12 | tv |  |
+| variables.rs:204:5:207:5 | MatchExpr | variables.rs:208:5:211:5 | ExprStmt |  |
+| variables.rs:204:11:204:12 | tv | variables.rs:205:9:205:30 | TupleStructPat |  |
+| variables.rs:205:9:205:30 | TupleStructPat | variables.rs:205:28:205:29 | a4 | match |
+| variables.rs:205:9:205:30 | TupleStructPat | variables.rs:205:34:205:56 | TupleStructPat | no-match |
+| variables.rs:205:9:205:81 | [match(true)] OrPat | variables.rs:206:16:206:24 | print_i64 | match |
+| variables.rs:205:28:205:29 | a4 | variables.rs:205:9:205:81 | [match(true)] OrPat | match |
+| variables.rs:205:34:205:56 | TupleStructPat | variables.rs:205:54:205:55 | a4 | match |
+| variables.rs:205:34:205:56 | TupleStructPat | variables.rs:205:60:205:81 | TupleStructPat | no-match |
+| variables.rs:205:54:205:55 | a4 | variables.rs:205:9:205:81 | [match(true)] OrPat | match |
+| variables.rs:205:60:205:81 | TupleStructPat | variables.rs:205:79:205:80 | a4 | match |
+| variables.rs:205:79:205:80 | a4 | variables.rs:205:9:205:81 | [match(true)] OrPat | match |
+| variables.rs:206:16:206:24 | print_i64 | variables.rs:206:26:206:27 | a4 |  |
+| variables.rs:206:16:206:28 | CallExpr | variables.rs:204:5:207:5 | MatchExpr |  |
+| variables.rs:206:26:206:27 | a4 | variables.rs:206:16:206:28 | CallExpr |  |
+| variables.rs:208:5:211:5 | ExprStmt | variables.rs:208:11:208:12 | tv |  |
+| variables.rs:208:5:211:5 | MatchExpr | variables.rs:212:11:212:12 | tv |  |
+| variables.rs:208:11:208:12 | tv | variables.rs:209:10:209:31 | TupleStructPat |  |
+| variables.rs:209:9:209:83 | [match(true)] OrPat | variables.rs:210:16:210:24 | print_i64 | match |
+| variables.rs:209:10:209:31 | TupleStructPat | variables.rs:209:29:209:30 | a5 | match |
+| variables.rs:209:10:209:31 | TupleStructPat | variables.rs:209:35:209:57 | TupleStructPat | no-match |
+| variables.rs:209:10:209:57 | [match(false)] OrPat | variables.rs:209:62:209:83 | TupleStructPat | no-match |
+| variables.rs:209:10:209:57 | [match(true)] OrPat | variables.rs:209:9:209:83 | [match(true)] OrPat | match |
+| variables.rs:209:29:209:30 | a5 | variables.rs:209:10:209:57 | [match(true)] OrPat | match |
+| variables.rs:209:35:209:57 | TupleStructPat | variables.rs:209:10:209:57 | [match(false)] OrPat | no-match |
+| variables.rs:209:35:209:57 | TupleStructPat | variables.rs:209:55:209:56 | a5 | match |
+| variables.rs:209:55:209:56 | a5 | variables.rs:209:10:209:57 | [match(true)] OrPat | match |
+| variables.rs:209:62:209:83 | TupleStructPat | variables.rs:209:81:209:82 | a5 | match |
+| variables.rs:209:81:209:82 | a5 | variables.rs:209:9:209:83 | [match(true)] OrPat | match |
+| variables.rs:210:16:210:24 | print_i64 | variables.rs:210:26:210:27 | a5 |  |
+| variables.rs:210:16:210:28 | CallExpr | variables.rs:208:5:211:5 | MatchExpr |  |
+| variables.rs:210:26:210:27 | a5 | variables.rs:210:16:210:28 | CallExpr |  |
+| variables.rs:212:5:215:5 | MatchExpr | variables.rs:202:21:216:1 | BlockExpr |  |
+| variables.rs:212:11:212:12 | tv | variables.rs:213:9:213:30 | TupleStructPat |  |
+| variables.rs:213:9:213:30 | TupleStructPat | variables.rs:213:28:213:29 | a6 | match |
+| variables.rs:213:9:213:30 | TupleStructPat | variables.rs:213:35:213:57 | TupleStructPat | no-match |
+| variables.rs:213:9:213:83 | [match(true)] OrPat | variables.rs:214:16:214:24 | print_i64 | match |
+| variables.rs:213:28:213:29 | a6 | variables.rs:213:9:213:83 | [match(true)] OrPat | match |
+| variables.rs:213:35:213:57 | TupleStructPat | variables.rs:213:55:213:56 | a6 | match |
+| variables.rs:213:35:213:57 | TupleStructPat | variables.rs:213:61:213:82 | TupleStructPat | no-match |
+| variables.rs:213:35:213:82 | [match(true)] OrPat | variables.rs:213:9:213:83 | [match(true)] OrPat | match |
+| variables.rs:213:55:213:56 | a6 | variables.rs:213:35:213:82 | [match(true)] OrPat | match |
+| variables.rs:213:61:213:82 | TupleStructPat | variables.rs:213:80:213:81 | a6 | match |
+| variables.rs:213:80:213:81 | a6 | variables.rs:213:35:213:82 | [match(true)] OrPat | match |
+| variables.rs:214:16:214:24 | print_i64 | variables.rs:214:26:214:27 | a6 |  |
+| variables.rs:214:16:214:28 | CallExpr | variables.rs:212:5:215:5 | MatchExpr |  |
+| variables.rs:214:26:214:27 | a6 | variables.rs:214:16:214:28 | CallExpr |  |
+| variables.rs:218:1:226:1 | enter match_pattern7 | variables.rs:219:5:219:34 | LetStmt |  |
+| variables.rs:218:1:226:1 | exit match_pattern7 (normal) | variables.rs:218:1:226:1 | exit match_pattern7 |  |
+| variables.rs:218:21:226:1 | BlockExpr | variables.rs:218:1:226:1 | exit match_pattern7 (normal) |  |
+| variables.rs:219:5:219:34 | LetStmt | variables.rs:219:18:219:29 | Either::Left |  |
+| variables.rs:219:9:219:14 | either | variables.rs:220:11:220:16 | either | match |
+| variables.rs:219:18:219:29 | Either::Left | variables.rs:219:31:219:32 | 32 |  |
+| variables.rs:219:18:219:33 | CallExpr | variables.rs:219:9:219:14 | either |  |
+| variables.rs:219:31:219:32 | 32 | variables.rs:219:18:219:33 | CallExpr |  |
+| variables.rs:220:5:225:5 | MatchExpr | variables.rs:218:21:226:1 | BlockExpr |  |
+| variables.rs:220:11:220:16 | either | variables.rs:221:9:221:24 | TupleStructPat |  |
+| variables.rs:221:9:221:24 | TupleStructPat | variables.rs:221:22:221:23 | a7 | match |
+| variables.rs:221:9:221:24 | TupleStructPat | variables.rs:221:28:221:44 | TupleStructPat | no-match |
+| variables.rs:221:9:221:44 | [match(false)] OrPat | variables.rs:224:9:224:9 | WildcardPat | no-match |
+| variables.rs:221:9:221:44 | [match(true)] OrPat | variables.rs:222:16:222:17 | a7 | match |
+| variables.rs:221:22:221:23 | a7 | variables.rs:221:9:221:44 | [match(true)] OrPat | match |
+| variables.rs:221:28:221:44 | TupleStructPat | variables.rs:221:9:221:44 | [match(false)] OrPat | no-match |
+| variables.rs:221:28:221:44 | TupleStructPat | variables.rs:221:42:221:43 | a7 | match |
+| variables.rs:221:42:221:43 | a7 | variables.rs:221:9:221:44 | [match(true)] OrPat | match |
+| variables.rs:222:16:222:17 | a7 | variables.rs:222:21:222:21 | 0 |  |
+| variables.rs:222:16:222:21 | ... > ... | variables.rs:223:16:223:24 | print_i64 | true |
+| variables.rs:222:16:222:21 | ... > ... | variables.rs:224:9:224:9 | WildcardPat | false |
+| variables.rs:222:21:222:21 | 0 | variables.rs:222:16:222:21 | ... > ... |  |
+| variables.rs:223:16:223:24 | print_i64 | variables.rs:223:26:223:27 | a7 |  |
+| variables.rs:223:16:223:28 | CallExpr | variables.rs:220:5:225:5 | MatchExpr |  |
+| variables.rs:223:26:223:27 | a7 | variables.rs:223:16:223:28 | CallExpr |  |
+| variables.rs:224:9:224:9 | WildcardPat | variables.rs:224:14:224:15 | TupleExpr | match |
+| variables.rs:224:14:224:15 | TupleExpr | variables.rs:220:5:225:5 | MatchExpr |  |
+| variables.rs:228:1:243:1 | enter match_pattern8 | variables.rs:229:5:229:34 | LetStmt |  |
+| variables.rs:228:1:243:1 | exit match_pattern8 (normal) | variables.rs:228:1:243:1 | exit match_pattern8 |  |
+| variables.rs:228:21:243:1 | BlockExpr | variables.rs:228:1:243:1 | exit match_pattern8 (normal) |  |
+| variables.rs:229:5:229:34 | LetStmt | variables.rs:229:18:229:29 | Either::Left |  |
+| variables.rs:229:9:229:14 | either | variables.rs:231:11:231:16 | either | match |
+| variables.rs:229:18:229:29 | Either::Left | variables.rs:229:31:229:32 | 32 |  |
+| variables.rs:229:18:229:33 | CallExpr | variables.rs:229:9:229:14 | either |  |
+| variables.rs:229:31:229:32 | 32 | variables.rs:229:18:229:33 | CallExpr |  |
+| variables.rs:231:5:242:5 | MatchExpr | variables.rs:228:21:243:1 | BlockExpr |  |
+| variables.rs:231:11:231:16 | either | variables.rs:233:14:233:30 | TupleStructPat |  |
+| variables.rs:232:9:233:52 | [match(true)] e | variables.rs:235:13:235:27 | ExprStmt | match |
+| variables.rs:233:14:233:30 | TupleStructPat | variables.rs:233:27:233:29 | a11 | match |
+| variables.rs:233:14:233:30 | TupleStructPat | variables.rs:233:34:233:51 | TupleStructPat | no-match |
+| variables.rs:233:14:233:51 | [match(false)] OrPat | variables.rs:241:9:241:9 | WildcardPat | no-match |
+| variables.rs:233:14:233:51 | [match(true)] OrPat | variables.rs:232:9:233:52 | [match(true)] e | match |
+| variables.rs:233:27:233:29 | a11 | variables.rs:233:14:233:51 | [match(true)] OrPat | match |
+| variables.rs:233:34:233:51 | TupleStructPat | variables.rs:233:14:233:51 | [match(false)] OrPat | no-match |
+| variables.rs:233:34:233:51 | TupleStructPat | variables.rs:233:48:233:50 | a11 | match |
+| variables.rs:233:48:233:50 | a11 | variables.rs:233:14:233:51 | [match(true)] OrPat | match |
+| variables.rs:234:12:240:9 | BlockExpr | variables.rs:231:5:242:5 | MatchExpr |  |
+| variables.rs:235:13:235:21 | print_i64 | variables.rs:235:23:235:25 | a11 |  |
+| variables.rs:235:13:235:26 | CallExpr | variables.rs:236:16:237:15 | LetExpr |  |
+| variables.rs:235:13:235:27 | ExprStmt | variables.rs:235:13:235:21 | print_i64 |  |
+| variables.rs:235:23:235:25 | a11 | variables.rs:235:13:235:26 | CallExpr |  |
+| variables.rs:236:13:239:13 | IfExpr | variables.rs:234:12:240:9 | BlockExpr |  |
+| variables.rs:236:16:237:15 | LetExpr | variables.rs:237:15:237:15 | e |  |
+| variables.rs:236:20:236:36 | TupleStructPat | variables.rs:236:13:239:13 | IfExpr | no-match |
+| variables.rs:236:20:236:36 | TupleStructPat | variables.rs:236:33:236:35 | a12 | match |
+| variables.rs:236:33:236:35 | a12 | variables.rs:238:17:238:32 | ExprStmt | match |
+| variables.rs:237:15:237:15 | e | variables.rs:236:20:236:36 | TupleStructPat |  |
+| variables.rs:237:17:239:13 | BlockExpr | variables.rs:236:13:239:13 | IfExpr |  |
+| variables.rs:238:17:238:25 | print_i64 | variables.rs:238:28:238:30 | a12 |  |
+| variables.rs:238:17:238:31 | CallExpr | variables.rs:237:17:239:13 | BlockExpr |  |
+| variables.rs:238:17:238:32 | ExprStmt | variables.rs:238:17:238:25 | print_i64 |  |
+| variables.rs:238:27:238:30 | * ... | variables.rs:238:17:238:31 | CallExpr |  |
+| variables.rs:238:28:238:30 | a12 | variables.rs:238:27:238:30 | * ... |  |
+| variables.rs:241:9:241:9 | WildcardPat | variables.rs:241:14:241:15 | TupleExpr | match |
+| variables.rs:241:14:241:15 | TupleExpr | variables.rs:231:5:242:5 | MatchExpr |  |
+| variables.rs:252:1:258:1 | enter match_pattern9 | variables.rs:253:5:253:36 | LetStmt |  |
+| variables.rs:252:1:258:1 | exit match_pattern9 (normal) | variables.rs:252:1:258:1 | exit match_pattern9 |  |
+| variables.rs:252:21:258:1 | BlockExpr | variables.rs:252:1:258:1 | exit match_pattern9 (normal) |  |
+| variables.rs:253:5:253:36 | LetStmt | variables.rs:253:14:253:31 | FourValued::Second |  |
+| variables.rs:253:9:253:10 | fv | variables.rs:254:11:254:12 | fv | match |
+| variables.rs:253:14:253:31 | FourValued::Second | variables.rs:253:33:253:34 | 62 |  |
+| variables.rs:253:14:253:35 | CallExpr | variables.rs:253:9:253:10 | fv |  |
+| variables.rs:253:33:253:34 | 62 | variables.rs:253:14:253:35 | CallExpr |  |
+| variables.rs:254:5:257:5 | MatchExpr | variables.rs:252:21:258:1 | BlockExpr |  |
+| variables.rs:254:11:254:12 | fv | variables.rs:255:9:255:30 | TupleStructPat |  |
+| variables.rs:255:9:255:30 | TupleStructPat | variables.rs:255:27:255:29 | a13 | match |
+| variables.rs:255:9:255:30 | TupleStructPat | variables.rs:255:35:255:57 | TupleStructPat | no-match |
+| variables.rs:255:9:255:109 | [match(true)] OrPat | variables.rs:256:16:256:24 | print_i64 | match |
+| variables.rs:255:27:255:29 | a13 | variables.rs:255:9:255:109 | [match(true)] OrPat | match |
+| variables.rs:255:35:255:57 | TupleStructPat | variables.rs:255:54:255:56 | a13 | match |
+| variables.rs:255:35:255:57 | TupleStructPat | variables.rs:255:61:255:82 | TupleStructPat | no-match |
+| variables.rs:255:35:255:82 | [match(false)] OrPat | variables.rs:255:87:255:109 | TupleStructPat | no-match |
+| variables.rs:255:35:255:82 | [match(true)] OrPat | variables.rs:255:9:255:109 | [match(true)] OrPat | match |
+| variables.rs:255:54:255:56 | a13 | variables.rs:255:35:255:82 | [match(true)] OrPat | match |
+| variables.rs:255:61:255:82 | TupleStructPat | variables.rs:255:35:255:82 | [match(false)] OrPat | no-match |
+| variables.rs:255:61:255:82 | TupleStructPat | variables.rs:255:79:255:81 | a13 | match |
+| variables.rs:255:79:255:81 | a13 | variables.rs:255:35:255:82 | [match(true)] OrPat | match |
+| variables.rs:255:87:255:109 | TupleStructPat | variables.rs:255:106:255:108 | a13 | match |
+| variables.rs:255:106:255:108 | a13 | variables.rs:255:9:255:109 | [match(true)] OrPat | match |
+| variables.rs:256:16:256:24 | print_i64 | variables.rs:256:26:256:28 | a13 |  |
+| variables.rs:256:16:256:29 | CallExpr | variables.rs:254:5:257:5 | MatchExpr |  |
+| variables.rs:256:26:256:28 | a13 | variables.rs:256:16:256:29 | CallExpr |  |
+| variables.rs:260:1:269:1 | enter param_pattern1 | variables.rs:261:5:261:6 | a8 |  |
+| variables.rs:260:1:269:1 | exit param_pattern1 (normal) | variables.rs:260:1:269:1 | exit param_pattern1 |  |
+| variables.rs:261:5:261:6 | a8 | variables.rs:261:5:261:12 | Param | match |
+| variables.rs:261:5:261:12 | Param | variables.rs:262:5:265:5 | TuplePat |  |
+| variables.rs:262:5:265:5 | TuplePat | variables.rs:263:9:263:10 | b3 | match |
+| variables.rs:262:5:265:19 | Param | variables.rs:266:5:266:18 | ExprStmt |  |
+| variables.rs:263:9:263:10 | b3 | variables.rs:264:9:264:10 | c1 | match |
+| variables.rs:264:9:264:10 | c1 | variables.rs:262:5:265:19 | Param | match |
+| variables.rs:265:28:269:1 | BlockExpr | variables.rs:260:1:269:1 | exit param_pattern1 (normal) |  |
+| variables.rs:266:5:266:13 | print_str | variables.rs:266:15:266:16 | a8 |  |
+| variables.rs:266:5:266:17 | CallExpr | variables.rs:267:5:267:18 | ExprStmt |  |
+| variables.rs:266:5:266:18 | ExprStmt | variables.rs:266:5:266:13 | print_str |  |
+| variables.rs:266:15:266:16 | a8 | variables.rs:266:5:266:17 | CallExpr |  |
+| variables.rs:267:5:267:13 | print_str | variables.rs:267:15:267:16 | b3 |  |
+| variables.rs:267:5:267:17 | CallExpr | variables.rs:268:5:268:18 | ExprStmt |  |
+| variables.rs:267:5:267:18 | ExprStmt | variables.rs:267:5:267:13 | print_str |  |
+| variables.rs:267:15:267:16 | b3 | variables.rs:267:5:267:17 | CallExpr |  |
+| variables.rs:268:5:268:13 | print_str | variables.rs:268:15:268:16 | c1 |  |
+| variables.rs:268:5:268:17 | CallExpr | variables.rs:265:28:269:1 | BlockExpr |  |
+| variables.rs:268:5:268:18 | ExprStmt | variables.rs:268:5:268:13 | print_str |  |
+| variables.rs:268:15:268:16 | c1 | variables.rs:268:5:268:17 | CallExpr |  |
+| variables.rs:271:1:275:1 | enter param_pattern2 | variables.rs:272:6:272:21 | TupleStructPat |  |
+| variables.rs:271:1:275:1 | exit param_pattern2 (normal) | variables.rs:271:1:275:1 | exit param_pattern2 |  |
+| variables.rs:272:5:272:50 | Param | variables.rs:274:5:274:18 | ExprStmt |  |
+| variables.rs:272:6:272:21 | TupleStructPat | variables.rs:272:19:272:20 | a9 | match |
+| variables.rs:272:6:272:21 | TupleStructPat | variables.rs:272:25:272:41 | TupleStructPat | no-match |
+| variables.rs:272:6:272:41 | [match(true)] OrPat | variables.rs:272:5:272:50 | Param | match |
+| variables.rs:272:19:272:20 | a9 | variables.rs:272:6:272:41 | [match(true)] OrPat | match |
+| variables.rs:272:25:272:41 | TupleStructPat | variables.rs:272:39:272:40 | a9 | match |
+| variables.rs:272:39:272:40 | a9 | variables.rs:272:6:272:41 | [match(true)] OrPat | match |
+| variables.rs:273:9:275:1 | BlockExpr | variables.rs:271:1:275:1 | exit param_pattern2 (normal) |  |
+| variables.rs:274:5:274:13 | print_i64 | variables.rs:274:15:274:16 | a9 |  |
+| variables.rs:274:5:274:17 | CallExpr | variables.rs:273:9:275:1 | BlockExpr |  |
+| variables.rs:274:5:274:18 | ExprStmt | variables.rs:274:5:274:13 | print_i64 |  |
+| variables.rs:274:15:274:16 | a9 | variables.rs:274:5:274:17 | CallExpr |  |
+| variables.rs:277:1:312:1 | enter destruct_assignment | variables.rs:278:5:282:18 | LetStmt |  |
+| variables.rs:277:1:312:1 | exit destruct_assignment (normal) | variables.rs:277:1:312:1 | exit destruct_assignment |  |
+| variables.rs:277:26:312:1 | BlockExpr | variables.rs:277:1:312:1 | exit destruct_assignment (normal) |  |
+| variables.rs:278:5:282:18 | LetStmt | variables.rs:282:10:282:10 | 1 |  |
+| variables.rs:278:9:282:5 | TuplePat | variables.rs:279:9:279:15 | a10 | match |
+| variables.rs:279:9:279:15 | a10 | variables.rs:280:9:280:14 | b4 | match |
+| variables.rs:280:9:280:14 | b4 | variables.rs:281:9:281:14 | c2 | match |
+| variables.rs:281:9:281:14 | c2 | variables.rs:283:5:283:19 | ExprStmt | match |
+| variables.rs:282:9:282:17 | TupleExpr | variables.rs:278:9:282:5 | TuplePat |  |
+| variables.rs:282:10:282:10 | 1 | variables.rs:282:13:282:13 | 2 |  |
+| variables.rs:282:13:282:13 | 2 | variables.rs:282:16:282:16 | 3 |  |
+| variables.rs:282:16:282:16 | 3 | variables.rs:282:9:282:17 | TupleExpr |  |
+| variables.rs:283:5:283:13 | print_i64 | variables.rs:283:15:283:17 | a10 |  |
+| variables.rs:283:5:283:18 | CallExpr | variables.rs:284:5:284:18 | ExprStmt |  |
+| variables.rs:283:5:283:19 | ExprStmt | variables.rs:283:5:283:13 | print_i64 |  |
+| variables.rs:283:15:283:17 | a10 | variables.rs:283:5:283:18 | CallExpr |  |
+| variables.rs:284:5:284:13 | print_i64 | variables.rs:284:15:284:16 | b4 |  |
+| variables.rs:284:5:284:17 | CallExpr | variables.rs:285:5:285:18 | ExprStmt |  |
+| variables.rs:284:5:284:18 | ExprStmt | variables.rs:284:5:284:13 | print_i64 |  |
+| variables.rs:284:15:284:16 | b4 | variables.rs:284:5:284:17 | CallExpr |  |
+| variables.rs:285:5:285:13 | print_i64 | variables.rs:285:15:285:16 | c2 |  |
+| variables.rs:285:5:285:17 | CallExpr | variables.rs:287:5:295:6 | ExprStmt |  |
+| variables.rs:285:5:285:18 | ExprStmt | variables.rs:285:5:285:13 | print_i64 |  |
+| variables.rs:285:15:285:16 | c2 | variables.rs:285:5:285:17 | CallExpr |  |
+| variables.rs:287:5:291:5 | TupleExpr | variables.rs:292:9:292:11 | a10 |  |
+| variables.rs:287:5:295:5 | ... = ... | variables.rs:296:5:296:19 | ExprStmt |  |
+| variables.rs:287:5:295:6 | ExprStmt | variables.rs:288:9:288:10 | c2 |  |
+| variables.rs:288:9:288:10 | c2 | variables.rs:289:9:289:10 | b4 |  |
+| variables.rs:289:9:289:10 | b4 | variables.rs:290:9:290:11 | a10 |  |
+| variables.rs:290:9:290:11 | a10 | variables.rs:287:5:291:5 | TupleExpr |  |
+| variables.rs:291:9:295:5 | TupleExpr | variables.rs:287:5:295:5 | ... = ... |  |
+| variables.rs:292:9:292:11 | a10 | variables.rs:293:9:293:10 | b4 |  |
+| variables.rs:293:9:293:10 | b4 | variables.rs:294:9:294:10 | c2 |  |
+| variables.rs:294:9:294:10 | c2 | variables.rs:291:9:295:5 | TupleExpr |  |
+| variables.rs:296:5:296:13 | print_i64 | variables.rs:296:15:296:17 | a10 |  |
+| variables.rs:296:5:296:18 | CallExpr | variables.rs:297:5:297:18 | ExprStmt |  |
+| variables.rs:296:5:296:19 | ExprStmt | variables.rs:296:5:296:13 | print_i64 |  |
+| variables.rs:296:15:296:17 | a10 | variables.rs:296:5:296:18 | CallExpr |  |
+| variables.rs:297:5:297:13 | print_i64 | variables.rs:297:15:297:16 | b4 |  |
+| variables.rs:297:5:297:17 | CallExpr | variables.rs:298:5:298:18 | ExprStmt |  |
+| variables.rs:297:5:297:18 | ExprStmt | variables.rs:297:5:297:13 | print_i64 |  |
+| variables.rs:297:15:297:16 | b4 | variables.rs:297:5:297:17 | CallExpr |  |
+| variables.rs:298:5:298:13 | print_i64 | variables.rs:298:15:298:16 | c2 |  |
+| variables.rs:298:5:298:17 | CallExpr | variables.rs:300:5:308:5 | ExprStmt |  |
+| variables.rs:298:5:298:18 | ExprStmt | variables.rs:298:5:298:13 | print_i64 |  |
+| variables.rs:298:15:298:16 | c2 | variables.rs:298:5:298:17 | CallExpr |  |
+| variables.rs:300:5:308:5 | ExprStmt | variables.rs:300:12:300:12 | 4 |  |
+| variables.rs:300:5:308:5 | MatchExpr | variables.rs:310:5:310:19 | ExprStmt |  |
+| variables.rs:300:11:300:16 | TupleExpr | variables.rs:301:9:304:9 | TuplePat |  |
+| variables.rs:300:12:300:12 | 4 | variables.rs:300:15:300:15 | 5 |  |
+| variables.rs:300:15:300:15 | 5 | variables.rs:300:11:300:16 | TupleExpr |  |
+| variables.rs:301:9:304:9 | TuplePat | variables.rs:302:13:302:15 | a10 | match |
+| variables.rs:302:13:302:15 | a10 | variables.rs:303:13:303:14 | b4 | match |
+| variables.rs:303:13:303:14 | b4 | variables.rs:305:13:305:27 | ExprStmt | match |
+| variables.rs:304:14:307:9 | BlockExpr | variables.rs:300:5:308:5 | MatchExpr |  |
+| variables.rs:305:13:305:21 | print_i64 | variables.rs:305:23:305:25 | a10 |  |
+| variables.rs:305:13:305:26 | CallExpr | variables.rs:306:13:306:26 | ExprStmt |  |
+| variables.rs:305:13:305:27 | ExprStmt | variables.rs:305:13:305:21 | print_i64 |  |
+| variables.rs:305:23:305:25 | a10 | variables.rs:305:13:305:26 | CallExpr |  |
+| variables.rs:306:13:306:21 | print_i64 | variables.rs:306:23:306:24 | b4 |  |
+| variables.rs:306:13:306:25 | CallExpr | variables.rs:304:14:307:9 | BlockExpr |  |
+| variables.rs:306:13:306:26 | ExprStmt | variables.rs:306:13:306:21 | print_i64 |  |
+| variables.rs:306:23:306:24 | b4 | variables.rs:306:13:306:25 | CallExpr |  |
+| variables.rs:310:5:310:13 | print_i64 | variables.rs:310:15:310:17 | a10 |  |
+| variables.rs:310:5:310:18 | CallExpr | variables.rs:311:5:311:18 | ExprStmt |  |
+| variables.rs:310:5:310:19 | ExprStmt | variables.rs:310:5:310:13 | print_i64 |  |
+| variables.rs:310:15:310:17 | a10 | variables.rs:310:5:310:18 | CallExpr |  |
+| variables.rs:311:5:311:13 | print_i64 | variables.rs:311:15:311:16 | b4 |  |
+| variables.rs:311:5:311:17 | CallExpr | variables.rs:277:26:312:1 | BlockExpr |  |
+| variables.rs:311:5:311:18 | ExprStmt | variables.rs:311:5:311:13 | print_i64 |  |
+| variables.rs:311:15:311:16 | b4 | variables.rs:311:5:311:17 | CallExpr |  |
+| variables.rs:314:1:329:1 | enter closure_variable | variables.rs:315:5:317:10 | LetStmt |  |
+| variables.rs:314:1:329:1 | exit closure_variable (normal) | variables.rs:314:1:329:1 | exit closure_variable |  |
+| variables.rs:314:23:329:1 | BlockExpr | variables.rs:314:1:329:1 | exit closure_variable (normal) |  |
+| variables.rs:315:5:317:10 | LetStmt | variables.rs:316:9:317:9 | ClosureExpr |  |
+| variables.rs:315:9:315:23 | example_closure | variables.rs:318:5:319:27 | LetStmt | match |
+| variables.rs:316:9:317:9 | ClosureExpr | variables.rs:315:9:315:23 | example_closure |  |
+| variables.rs:316:9:317:9 | enter ClosureExpr | variables.rs:316:10:316:10 | x |  |
+| variables.rs:316:9:317:9 | exit ClosureExpr (normal) | variables.rs:316:9:317:9 | exit ClosureExpr |  |
+| variables.rs:316:10:316:10 | x | variables.rs:316:10:316:15 | Param | match |
+| variables.rs:316:10:316:15 | Param | variables.rs:317:9:317:9 | x |  |
+| variables.rs:317:9:317:9 | x | variables.rs:316:9:317:9 | exit ClosureExpr (normal) |  |
+| variables.rs:318:5:319:27 | LetStmt | variables.rs:319:9:319:23 | example_closure |  |
+| variables.rs:318:9:318:10 | n1 | variables.rs:320:5:320:18 | ExprStmt | match |
+| variables.rs:319:9:319:23 | example_closure | variables.rs:319:25:319:25 | 5 |  |
+| variables.rs:319:9:319:26 | CallExpr | variables.rs:318:9:318:10 | n1 |  |
+| variables.rs:319:25:319:25 | 5 | variables.rs:319:9:319:26 | CallExpr |  |
+| variables.rs:320:5:320:13 | print_i64 | variables.rs:320:15:320:16 | n1 |  |
+| variables.rs:320:5:320:17 | CallExpr | variables.rs:322:5:322:25 | ExprStmt |  |
+| variables.rs:320:5:320:18 | ExprStmt | variables.rs:320:5:320:13 | print_i64 |  |
+| variables.rs:320:15:320:16 | n1 | variables.rs:320:5:320:17 | CallExpr |  |
+| variables.rs:322:5:322:22 | immutable_variable | variables.rs:322:5:322:24 | CallExpr |  |
+| variables.rs:322:5:322:24 | CallExpr | variables.rs:323:5:325:10 | LetStmt |  |
+| variables.rs:322:5:322:25 | ExprStmt | variables.rs:322:5:322:22 | immutable_variable |  |
+| variables.rs:323:5:325:10 | LetStmt | variables.rs:324:9:325:9 | ClosureExpr |  |
+| variables.rs:323:9:323:26 | immutable_variable | variables.rs:326:5:327:30 | LetStmt | match |
+| variables.rs:324:9:325:9 | ClosureExpr | variables.rs:323:9:323:26 | immutable_variable |  |
+| variables.rs:324:9:325:9 | enter ClosureExpr | variables.rs:324:10:324:10 | x |  |
+| variables.rs:324:9:325:9 | exit ClosureExpr (normal) | variables.rs:324:9:325:9 | exit ClosureExpr |  |
+| variables.rs:324:10:324:10 | x | variables.rs:324:10:324:15 | Param | match |
+| variables.rs:324:10:324:15 | Param | variables.rs:325:9:325:9 | x |  |
+| variables.rs:325:9:325:9 | x | variables.rs:324:9:325:9 | exit ClosureExpr (normal) |  |
+| variables.rs:326:5:327:30 | LetStmt | variables.rs:327:9:327:26 | immutable_variable |  |
+| variables.rs:326:9:326:10 | n2 | variables.rs:328:5:328:18 | ExprStmt | match |
+| variables.rs:327:9:327:26 | immutable_variable | variables.rs:327:28:327:28 | 6 |  |
+| variables.rs:327:9:327:29 | CallExpr | variables.rs:326:9:326:10 | n2 |  |
+| variables.rs:327:28:327:28 | 6 | variables.rs:327:9:327:29 | CallExpr |  |
+| variables.rs:328:5:328:13 | print_i64 | variables.rs:328:15:328:16 | n2 |  |
+| variables.rs:328:5:328:17 | CallExpr | variables.rs:314:23:329:1 | BlockExpr |  |
+| variables.rs:328:5:328:18 | ExprStmt | variables.rs:328:5:328:13 | print_i64 |  |
+| variables.rs:328:15:328:16 | n2 | variables.rs:328:5:328:17 | CallExpr |  |
+| variables.rs:331:1:338:1 | enter for_variable | variables.rs:332:5:332:42 | LetStmt |  |
+| variables.rs:331:1:338:1 | exit for_variable (normal) | variables.rs:331:1:338:1 | exit for_variable |  |
+| variables.rs:331:19:338:1 | BlockExpr | variables.rs:331:1:338:1 | exit for_variable (normal) |  |
+| variables.rs:332:5:332:42 | LetStmt | variables.rs:332:15:332:22 | "apples" |  |
+| variables.rs:332:9:332:9 | v | variables.rs:335:12:335:12 | v | match |
+| variables.rs:332:13:332:41 | RefExpr | variables.rs:332:9:332:9 | v |  |
+| variables.rs:332:14:332:41 | ArrayExpr | variables.rs:332:13:332:41 | RefExpr |  |
+| variables.rs:332:15:332:22 | "apples" | variables.rs:332:25:332:30 | "cake" |  |
+| variables.rs:332:25:332:30 | "cake" | variables.rs:332:33:332:40 | "coffee" |  |
+| variables.rs:332:33:332:40 | "coffee" | variables.rs:332:14:332:41 | ArrayExpr |  |
+| variables.rs:334:5:337:5 | ForExpr | variables.rs:331:19:338:1 | BlockExpr |  |
+| variables.rs:334:9:334:12 | text | variables.rs:334:5:337:5 | ForExpr | no-match |
+| variables.rs:334:9:334:12 | text | variables.rs:336:9:336:24 | ExprStmt | match |
+| variables.rs:335:12:335:12 | v | variables.rs:334:9:334:12 | text |  |
+| variables.rs:335:14:337:5 | BlockExpr | variables.rs:334:9:334:12 | text |  |
+| variables.rs:336:9:336:17 | print_str | variables.rs:336:19:336:22 | text |  |
+| variables.rs:336:9:336:23 | CallExpr | variables.rs:335:14:337:5 | BlockExpr |  |
+| variables.rs:336:9:336:24 | ExprStmt | variables.rs:336:9:336:17 | print_str |  |
+| variables.rs:336:19:336:22 | text | variables.rs:336:9:336:23 | CallExpr |  |
+| variables.rs:340:1:346:1 | enter add_assign | variables.rs:341:5:341:18 | LetStmt |  |
+| variables.rs:340:1:346:1 | exit add_assign (normal) | variables.rs:340:1:346:1 | exit add_assign |  |
+| variables.rs:340:17:346:1 | BlockExpr | variables.rs:340:1:346:1 | exit add_assign (normal) |  |
+| variables.rs:341:5:341:18 | LetStmt | variables.rs:341:17:341:17 | 0 |  |
+| variables.rs:341:9:341:13 | a | variables.rs:342:5:342:11 | ExprStmt | match |
+| variables.rs:341:17:341:17 | 0 | variables.rs:341:9:341:13 | a |  |
+| variables.rs:342:5:342:5 | a | variables.rs:342:10:342:10 | 1 |  |
+| variables.rs:342:5:342:10 | ... += ... | variables.rs:343:5:343:17 | ExprStmt |  |
+| variables.rs:342:5:342:11 | ExprStmt | variables.rs:342:5:342:5 | a |  |
+| variables.rs:342:10:342:10 | 1 | variables.rs:342:5:342:10 | ... += ... |  |
+| variables.rs:343:5:343:13 | print_i64 | variables.rs:343:15:343:15 | a |  |
+| variables.rs:343:5:343:16 | CallExpr | variables.rs:344:5:344:28 | ExprStmt |  |
+| variables.rs:343:5:343:17 | ExprStmt | variables.rs:343:5:343:13 | print_i64 |  |
+| variables.rs:343:15:343:15 | a | variables.rs:343:5:343:16 | CallExpr |  |
+| variables.rs:344:5:344:27 | ... .add_assign(...) | variables.rs:345:5:345:17 | ExprStmt |  |
+| variables.rs:344:5:344:28 | ExprStmt | variables.rs:344:11:344:11 | a |  |
+| variables.rs:344:6:344:11 | RefExpr | variables.rs:344:25:344:26 | 10 |  |
+| variables.rs:344:11:344:11 | a | variables.rs:344:6:344:11 | RefExpr |  |
+| variables.rs:344:25:344:26 | 10 | variables.rs:344:5:344:27 | ... .add_assign(...) |  |
+| variables.rs:345:5:345:13 | print_i64 | variables.rs:345:15:345:15 | a |  |
+| variables.rs:345:5:345:16 | CallExpr | variables.rs:340:17:346:1 | BlockExpr |  |
+| variables.rs:345:5:345:17 | ExprStmt | variables.rs:345:5:345:13 | print_i64 |  |
+| variables.rs:345:15:345:15 | a | variables.rs:345:5:345:16 | CallExpr |  |
+| variables.rs:348:1:354:1 | enter mutate | variables.rs:349:5:349:18 | LetStmt |  |
+| variables.rs:348:1:354:1 | exit mutate (normal) | variables.rs:348:1:354:1 | exit mutate |  |
+| variables.rs:348:13:354:1 | BlockExpr | variables.rs:348:1:354:1 | exit mutate (normal) |  |
+| variables.rs:349:5:349:18 | LetStmt | variables.rs:349:17:349:17 | 1 |  |
+| variables.rs:349:9:349:13 | i | variables.rs:350:5:351:15 | LetStmt | match |
+| variables.rs:349:17:349:17 | 1 | variables.rs:349:9:349:13 | i |  |
+| variables.rs:350:5:351:15 | LetStmt | variables.rs:351:14:351:14 | i |  |
+| variables.rs:350:9:350:13 | ref_i | variables.rs:352:5:352:15 | ExprStmt | match |
+| variables.rs:351:9:351:14 | RefExpr | variables.rs:350:9:350:13 | ref_i |  |
+| variables.rs:351:14:351:14 | i | variables.rs:351:9:351:14 | RefExpr |  |
+| variables.rs:352:5:352:10 | * ... | variables.rs:352:14:352:14 | 2 |  |
+| variables.rs:352:5:352:14 | ... = ... | variables.rs:353:5:353:17 | ExprStmt |  |
+| variables.rs:352:5:352:15 | ExprStmt | variables.rs:352:6:352:10 | ref_i |  |
+| variables.rs:352:6:352:10 | ref_i | variables.rs:352:5:352:10 | * ... |  |
+| variables.rs:352:14:352:14 | 2 | variables.rs:352:5:352:14 | ... = ... |  |
+| variables.rs:353:5:353:13 | print_i64 | variables.rs:353:15:353:15 | i |  |
+| variables.rs:353:5:353:16 | CallExpr | variables.rs:348:13:354:1 | BlockExpr |  |
+| variables.rs:353:5:353:17 | ExprStmt | variables.rs:353:5:353:13 | print_i64 |  |
+| variables.rs:353:15:353:15 | i | variables.rs:353:5:353:16 | CallExpr |  |
+| variables.rs:356:1:361:1 | enter mutate_param | variables.rs:356:17:356:17 | x |  |
+| variables.rs:356:1:361:1 | exit mutate_param (normal) | variables.rs:356:1:361:1 | exit mutate_param |  |
+| variables.rs:356:17:356:17 | x | variables.rs:356:17:356:28 | Param | match |
+| variables.rs:356:17:356:28 | Param | variables.rs:357:5:359:11 | ExprStmt |  |
+| variables.rs:357:5:357:6 | * ... | variables.rs:358:10:358:10 | x |  |
+| variables.rs:357:5:359:10 | ... = ... | variables.rs:360:5:360:13 | ExprStmt |  |
+| variables.rs:357:5:359:11 | ExprStmt | variables.rs:357:6:357:6 | x |  |
+| variables.rs:357:6:357:6 | x | variables.rs:357:5:357:6 | * ... |  |
+| variables.rs:358:9:358:10 | * ... | variables.rs:359:10:359:10 | x |  |
+| variables.rs:358:9:359:10 | ... + ... | variables.rs:357:5:359:10 | ... = ... |  |
+| variables.rs:358:10:358:10 | x | variables.rs:358:9:358:10 | * ... |  |
+| variables.rs:359:9:359:10 | * ... | variables.rs:358:9:359:10 | ... + ... |  |
+| variables.rs:359:10:359:10 | x | variables.rs:359:9:359:10 | * ... |  |
+| variables.rs:360:5:360:12 | ReturnExpr | variables.rs:356:1:361:1 | exit mutate_param (normal) | return |
+| variables.rs:360:5:360:13 | ExprStmt | variables.rs:360:12:360:12 | x |  |
+| variables.rs:360:12:360:12 | x | variables.rs:360:5:360:12 | ReturnExpr |  |
+| variables.rs:363:1:369:1 | enter mutate_param2 | variables.rs:363:22:363:22 | x |  |
+| variables.rs:363:1:369:1 | exit mutate_param2 (normal) | variables.rs:363:1:369:1 | exit mutate_param2 |  |
+| variables.rs:363:22:363:22 | x | variables.rs:363:22:363:36 | Param | match |
+| variables.rs:363:22:363:36 | Param | variables.rs:363:39:363:39 | y |  |
+| variables.rs:363:39:363:39 | y | variables.rs:363:39:363:57 | Param | match |
+| variables.rs:363:39:363:57 | Param | variables.rs:364:5:366:11 | ExprStmt |  |
+| variables.rs:363:60:369:1 | BlockExpr | variables.rs:363:1:369:1 | exit mutate_param2 (normal) |  |
+| variables.rs:364:5:364:6 | * ... | variables.rs:365:10:365:10 | x |  |
+| variables.rs:364:5:366:10 | ... = ... | variables.rs:367:5:368:10 | ExprStmt |  |
+| variables.rs:364:5:366:11 | ExprStmt | variables.rs:364:6:364:6 | x |  |
+| variables.rs:364:6:364:6 | x | variables.rs:364:5:364:6 | * ... |  |
+| variables.rs:365:9:365:10 | * ... | variables.rs:366:10:366:10 | x |  |
+| variables.rs:365:9:366:10 | ... + ... | variables.rs:364:5:366:10 | ... = ... |  |
+| variables.rs:365:10:365:10 | x | variables.rs:365:9:365:10 | * ... |  |
+| variables.rs:366:9:366:10 | * ... | variables.rs:365:9:366:10 | ... + ... |  |
+| variables.rs:366:10:366:10 | x | variables.rs:366:9:366:10 | * ... |  |
+| variables.rs:367:5:367:6 | * ... | variables.rs:368:9:368:9 | x |  |
+| variables.rs:367:5:368:9 | ... = ... | variables.rs:363:60:369:1 | BlockExpr |  |
+| variables.rs:367:5:368:10 | ExprStmt | variables.rs:367:6:367:6 | y |  |
+| variables.rs:367:6:367:6 | y | variables.rs:367:5:367:6 | * ... |  |
+| variables.rs:368:9:368:9 | x | variables.rs:367:5:368:9 | ... = ... |  |
+| variables.rs:371:1:389:1 | enter mutate_arg | variables.rs:372:5:372:18 | LetStmt |  |
+| variables.rs:371:1:389:1 | exit mutate_arg (normal) | variables.rs:371:1:389:1 | exit mutate_arg |  |
+| variables.rs:371:17:389:1 | BlockExpr | variables.rs:371:1:389:1 | exit mutate_arg (normal) |  |
+| variables.rs:372:5:372:18 | LetStmt | variables.rs:372:17:372:17 | 2 |  |
+| variables.rs:372:9:372:13 | x | variables.rs:373:5:374:29 | LetStmt | match |
+| variables.rs:372:17:372:17 | 2 | variables.rs:372:9:372:13 | x |  |
+| variables.rs:373:5:374:29 | LetStmt | variables.rs:374:9:374:20 | mutate_param |  |
+| variables.rs:373:9:373:9 | y | variables.rs:375:5:375:12 | ExprStmt | match |
+| variables.rs:374:9:374:20 | mutate_param | variables.rs:374:27:374:27 | x |  |
+| variables.rs:374:9:374:28 | CallExpr | variables.rs:373:9:373:9 | y |  |
+| variables.rs:374:22:374:27 | RefExpr | variables.rs:374:9:374:28 | CallExpr |  |
+| variables.rs:374:27:374:27 | x | variables.rs:374:22:374:27 | RefExpr |  |
+| variables.rs:375:5:375:6 | * ... | variables.rs:375:10:375:11 | 10 |  |
+| variables.rs:375:5:375:11 | ... = ... | variables.rs:377:5:377:17 | ExprStmt |  |
+| variables.rs:375:5:375:12 | ExprStmt | variables.rs:375:6:375:6 | y |  |
+| variables.rs:375:6:375:6 | y | variables.rs:375:5:375:6 | * ... |  |
+| variables.rs:375:10:375:11 | 10 | variables.rs:375:5:375:11 | ... = ... |  |
+| variables.rs:377:5:377:13 | print_i64 | variables.rs:377:15:377:15 | x |  |
+| variables.rs:377:5:377:16 | CallExpr | variables.rs:379:5:379:18 | LetStmt |  |
+| variables.rs:377:5:377:17 | ExprStmt | variables.rs:377:5:377:13 | print_i64 |  |
+| variables.rs:377:15:377:15 | x | variables.rs:377:5:377:16 | CallExpr |  |
+| variables.rs:379:5:379:18 | LetStmt | variables.rs:379:17:379:17 | 4 |  |
+| variables.rs:379:9:379:13 | z | variables.rs:380:5:381:20 | LetStmt | match |
+| variables.rs:379:17:379:17 | 4 | variables.rs:379:9:379:13 | z |  |
+| variables.rs:380:5:381:20 | LetStmt | variables.rs:381:19:381:19 | x |  |
+| variables.rs:380:9:380:9 | w | variables.rs:382:5:385:6 | ExprStmt | match |
+| variables.rs:381:9:381:19 | RefExpr | variables.rs:380:9:380:9 | w |  |
+| variables.rs:381:14:381:19 | RefExpr | variables.rs:381:9:381:19 | RefExpr |  |
+| variables.rs:381:19:381:19 | x | variables.rs:381:14:381:19 | RefExpr |  |
+| variables.rs:382:5:382:17 | mutate_param2 | variables.rs:383:14:383:14 | z |  |
+| variables.rs:382:5:385:5 | CallExpr | variables.rs:386:5:386:13 | ExprStmt |  |
+| variables.rs:382:5:385:6 | ExprStmt | variables.rs:382:5:382:17 | mutate_param2 |  |
+| variables.rs:383:9:383:14 | RefExpr | variables.rs:384:9:384:9 | w |  |
+| variables.rs:383:14:383:14 | z | variables.rs:383:9:383:14 | RefExpr |  |
+| variables.rs:384:9:384:9 | w | variables.rs:382:5:385:5 | CallExpr |  |
+| variables.rs:386:5:386:7 | * ... | variables.rs:386:11:386:12 | 11 |  |
+| variables.rs:386:5:386:12 | ... = ... | variables.rs:388:5:388:17 | ExprStmt |  |
+| variables.rs:386:5:386:13 | ExprStmt | variables.rs:386:7:386:7 | w |  |
+| variables.rs:386:6:386:7 | * ... | variables.rs:386:5:386:7 | * ... |  |
+| variables.rs:386:7:386:7 | w | variables.rs:386:6:386:7 | * ... |  |
+| variables.rs:386:11:386:12 | 11 | variables.rs:386:5:386:12 | ... = ... |  |
+| variables.rs:388:5:388:13 | print_i64 | variables.rs:388:15:388:15 | z |  |
+| variables.rs:388:5:388:16 | CallExpr | variables.rs:371:17:389:1 | BlockExpr |  |
+| variables.rs:388:5:388:17 | ExprStmt | variables.rs:388:5:388:13 | print_i64 |  |
+| variables.rs:388:15:388:15 | z | variables.rs:388:5:388:16 | CallExpr |  |
+| variables.rs:391:1:397:1 | enter alias | variables.rs:392:5:392:18 | LetStmt |  |
+| variables.rs:391:1:397:1 | exit alias (normal) | variables.rs:391:1:397:1 | exit alias |  |
+| variables.rs:391:12:397:1 | BlockExpr | variables.rs:391:1:397:1 | exit alias (normal) |  |
+| variables.rs:392:5:392:18 | LetStmt | variables.rs:392:17:392:17 | 1 |  |
+| variables.rs:392:9:392:13 | x | variables.rs:393:5:394:15 | LetStmt | match |
+| variables.rs:392:17:392:17 | 1 | variables.rs:392:9:392:13 | x |  |
+| variables.rs:393:5:394:15 | LetStmt | variables.rs:394:14:394:14 | x |  |
+| variables.rs:393:9:393:9 | y | variables.rs:395:5:395:11 | ExprStmt | match |
+| variables.rs:394:9:394:14 | RefExpr | variables.rs:393:9:393:9 | y |  |
+| variables.rs:394:14:394:14 | x | variables.rs:394:9:394:14 | RefExpr |  |
+| variables.rs:395:5:395:6 | * ... | variables.rs:395:10:395:10 | 2 |  |
+| variables.rs:395:5:395:10 | ... = ... | variables.rs:396:5:396:17 | ExprStmt |  |
+| variables.rs:395:5:395:11 | ExprStmt | variables.rs:395:6:395:6 | y |  |
+| variables.rs:395:6:395:6 | y | variables.rs:395:5:395:6 | * ... |  |
+| variables.rs:395:10:395:10 | 2 | variables.rs:395:5:395:10 | ... = ... |  |
+| variables.rs:396:5:396:13 | print_i64 | variables.rs:396:15:396:15 | x |  |
+| variables.rs:396:5:396:16 | CallExpr | variables.rs:391:12:397:1 | BlockExpr |  |
+| variables.rs:396:5:396:17 | ExprStmt | variables.rs:396:5:396:13 | print_i64 |  |
+| variables.rs:396:15:396:15 | x | variables.rs:396:5:396:16 | CallExpr |  |
+| variables.rs:399:1:407:1 | enter capture_immut | variables.rs:400:5:400:16 | LetStmt |  |
+| variables.rs:399:1:407:1 | exit capture_immut (normal) | variables.rs:399:1:407:1 | exit capture_immut |  |
+| variables.rs:399:20:407:1 | BlockExpr | variables.rs:399:1:407:1 | exit capture_immut (normal) |  |
+| variables.rs:400:5:400:16 | LetStmt | variables.rs:400:13:400:15 | 100 |  |
+| variables.rs:400:9:400:9 | x | variables.rs:402:5:404:6 | LetStmt | match |
+| variables.rs:400:13:400:15 | 100 | variables.rs:400:9:400:9 | x |  |
+| variables.rs:402:5:404:6 | LetStmt | variables.rs:402:15:404:5 | ClosureExpr |  |
+| variables.rs:402:9:402:11 | cap | variables.rs:405:5:405:10 | ExprStmt | match |
+| variables.rs:402:15:404:5 | ClosureExpr | variables.rs:402:9:402:11 | cap |  |
+| variables.rs:402:15:404:5 | enter ClosureExpr | variables.rs:403:9:403:21 | ExprStmt |  |
+| variables.rs:402:15:404:5 | exit ClosureExpr (normal) | variables.rs:402:15:404:5 | exit ClosureExpr |  |
+| variables.rs:402:18:404:5 | BlockExpr | variables.rs:402:15:404:5 | exit ClosureExpr (normal) |  |
+| variables.rs:403:9:403:17 | print_i64 | variables.rs:403:19:403:19 | x |  |
+| variables.rs:403:9:403:20 | CallExpr | variables.rs:402:18:404:5 | BlockExpr |  |
+| variables.rs:403:9:403:21 | ExprStmt | variables.rs:403:9:403:17 | print_i64 |  |
+| variables.rs:403:19:403:19 | x | variables.rs:403:9:403:20 | CallExpr |  |
+| variables.rs:405:5:405:7 | cap | variables.rs:405:5:405:9 | CallExpr |  |
+| variables.rs:405:5:405:9 | CallExpr | variables.rs:406:5:406:17 | ExprStmt |  |
+| variables.rs:405:5:405:10 | ExprStmt | variables.rs:405:5:405:7 | cap |  |
+| variables.rs:406:5:406:13 | print_i64 | variables.rs:406:15:406:15 | x |  |
+| variables.rs:406:5:406:16 | CallExpr | variables.rs:399:20:407:1 | BlockExpr |  |
+| variables.rs:406:5:406:17 | ExprStmt | variables.rs:406:5:406:13 | print_i64 |  |
+| variables.rs:406:15:406:15 | x | variables.rs:406:5:406:16 | CallExpr |  |
+| variables.rs:409:1:433:1 | enter capture_mut | variables.rs:410:5:410:18 | LetStmt |  |
+| variables.rs:409:1:433:1 | exit capture_mut (normal) | variables.rs:409:1:433:1 | exit capture_mut |  |
+| variables.rs:409:18:433:1 | BlockExpr | variables.rs:409:1:433:1 | exit capture_mut (normal) |  |
+| variables.rs:410:5:410:18 | LetStmt | variables.rs:410:17:410:17 | 1 |  |
+| variables.rs:410:9:410:13 | x | variables.rs:412:5:414:6 | LetStmt | match |
+| variables.rs:410:17:410:17 | 1 | variables.rs:410:9:410:13 | x |  |
+| variables.rs:412:5:414:6 | LetStmt | variables.rs:412:20:414:5 | ClosureExpr |  |
+| variables.rs:412:9:412:16 | closure1 | variables.rs:415:5:415:15 | ExprStmt | match |
+| variables.rs:412:20:414:5 | ClosureExpr | variables.rs:412:9:412:16 | closure1 |  |
+| variables.rs:412:20:414:5 | enter ClosureExpr | variables.rs:413:9:413:21 | ExprStmt |  |
+| variables.rs:412:20:414:5 | exit ClosureExpr (normal) | variables.rs:412:20:414:5 | exit ClosureExpr |  |
+| variables.rs:412:23:414:5 | BlockExpr | variables.rs:412:20:414:5 | exit ClosureExpr (normal) |  |
+| variables.rs:413:9:413:17 | print_i64 | variables.rs:413:19:413:19 | x |  |
+| variables.rs:413:9:413:20 | CallExpr | variables.rs:412:23:414:5 | BlockExpr |  |
+| variables.rs:413:9:413:21 | ExprStmt | variables.rs:413:9:413:17 | print_i64 |  |
+| variables.rs:413:19:413:19 | x | variables.rs:413:9:413:20 | CallExpr |  |
+| variables.rs:415:5:415:12 | closure1 | variables.rs:415:5:415:14 | CallExpr |  |
+| variables.rs:415:5:415:14 | CallExpr | variables.rs:416:5:416:17 | ExprStmt |  |
+| variables.rs:415:5:415:15 | ExprStmt | variables.rs:415:5:415:12 | closure1 |  |
+| variables.rs:416:5:416:13 | print_i64 | variables.rs:416:15:416:15 | x |  |
+| variables.rs:416:5:416:16 | CallExpr | variables.rs:418:5:418:18 | LetStmt |  |
+| variables.rs:416:5:416:17 | ExprStmt | variables.rs:416:5:416:13 | print_i64 |  |
+| variables.rs:416:15:416:15 | x | variables.rs:416:5:416:16 | CallExpr |  |
+| variables.rs:418:5:418:18 | LetStmt | variables.rs:418:17:418:17 | 2 |  |
+| variables.rs:418:9:418:13 | y | variables.rs:420:5:422:6 | LetStmt | match |
+| variables.rs:418:17:418:17 | 2 | variables.rs:418:9:418:13 | y |  |
+| variables.rs:420:5:422:6 | LetStmt | variables.rs:420:24:422:5 | ClosureExpr |  |
+| variables.rs:420:9:420:20 | closure2 | variables.rs:423:5:423:15 | ExprStmt | match |
+| variables.rs:420:24:422:5 | ClosureExpr | variables.rs:420:9:420:20 | closure2 |  |
+| variables.rs:420:24:422:5 | enter ClosureExpr | variables.rs:421:9:421:14 | ExprStmt |  |
+| variables.rs:420:24:422:5 | exit ClosureExpr (normal) | variables.rs:420:24:422:5 | exit ClosureExpr |  |
+| variables.rs:420:27:422:5 | BlockExpr | variables.rs:420:24:422:5 | exit ClosureExpr (normal) |  |
+| variables.rs:421:9:421:9 | y | variables.rs:421:13:421:13 | 3 |  |
+| variables.rs:421:9:421:13 | ... = ... | variables.rs:420:27:422:5 | BlockExpr |  |
+| variables.rs:421:9:421:14 | ExprStmt | variables.rs:421:9:421:9 | y |  |
+| variables.rs:421:13:421:13 | 3 | variables.rs:421:9:421:13 | ... = ... |  |
+| variables.rs:423:5:423:12 | closure2 | variables.rs:423:5:423:14 | CallExpr |  |
+| variables.rs:423:5:423:14 | CallExpr | variables.rs:424:5:424:17 | ExprStmt |  |
+| variables.rs:423:5:423:15 | ExprStmt | variables.rs:423:5:423:12 | closure2 |  |
+| variables.rs:424:5:424:13 | print_i64 | variables.rs:424:15:424:15 | y |  |
+| variables.rs:424:5:424:16 | CallExpr | variables.rs:426:5:426:18 | LetStmt |  |
+| variables.rs:424:5:424:17 | ExprStmt | variables.rs:424:5:424:13 | print_i64 |  |
+| variables.rs:424:15:424:15 | y | variables.rs:424:5:424:16 | CallExpr |  |
+| variables.rs:426:5:426:18 | LetStmt | variables.rs:426:17:426:17 | 2 |  |
+| variables.rs:426:9:426:13 | z | variables.rs:428:5:430:6 | LetStmt | match |
+| variables.rs:426:17:426:17 | 2 | variables.rs:426:9:426:13 | z |  |
+| variables.rs:428:5:430:6 | LetStmt | variables.rs:428:24:430:5 | ClosureExpr |  |
+| variables.rs:428:9:428:20 | closure3 | variables.rs:431:5:431:15 | ExprStmt | match |
+| variables.rs:428:24:430:5 | ClosureExpr | variables.rs:428:9:428:20 | closure3 |  |
+| variables.rs:428:24:430:5 | enter ClosureExpr | variables.rs:429:9:429:24 | ExprStmt |  |
+| variables.rs:428:24:430:5 | exit ClosureExpr (normal) | variables.rs:428:24:430:5 | exit ClosureExpr |  |
+| variables.rs:428:27:430:5 | BlockExpr | variables.rs:428:24:430:5 | exit ClosureExpr (normal) |  |
+| variables.rs:429:9:429:9 | z | variables.rs:429:22:429:22 | 1 |  |
+| variables.rs:429:9:429:23 | ... .add_assign(...) | variables.rs:428:27:430:5 | BlockExpr |  |
+| variables.rs:429:9:429:24 | ExprStmt | variables.rs:429:9:429:9 | z |  |
+| variables.rs:429:22:429:22 | 1 | variables.rs:429:9:429:23 | ... .add_assign(...) |  |
+| variables.rs:431:5:431:12 | closure3 | variables.rs:431:5:431:14 | CallExpr |  |
+| variables.rs:431:5:431:14 | CallExpr | variables.rs:432:5:432:17 | ExprStmt |  |
+| variables.rs:431:5:431:15 | ExprStmt | variables.rs:431:5:431:12 | closure3 |  |
+| variables.rs:432:5:432:13 | print_i64 | variables.rs:432:15:432:15 | z |  |
+| variables.rs:432:5:432:16 | CallExpr | variables.rs:409:18:433:1 | BlockExpr |  |
+| variables.rs:432:5:432:17 | ExprStmt | variables.rs:432:5:432:13 | print_i64 |  |
+| variables.rs:432:15:432:15 | z | variables.rs:432:5:432:16 | CallExpr |  |
+| variables.rs:435:1:443:1 | enter async_block_capture | variables.rs:436:5:436:23 | LetStmt |  |
+| variables.rs:435:1:443:1 | exit async_block_capture (normal) | variables.rs:435:1:443:1 | exit async_block_capture |  |
+| variables.rs:435:32:443:1 | BlockExpr | variables.rs:435:1:443:1 | exit async_block_capture (normal) |  |
+| variables.rs:436:5:436:23 | LetStmt | variables.rs:436:22:436:22 | 0 |  |
+| variables.rs:436:9:436:13 | i | variables.rs:437:5:439:6 | LetStmt | match |
+| variables.rs:436:22:436:22 | 0 | variables.rs:436:9:436:13 | i |  |
+| variables.rs:437:5:439:6 | LetStmt | variables.rs:437:17:439:5 | BlockExpr |  |
+| variables.rs:437:9:437:13 | block | variables.rs:441:5:441:16 | ExprStmt | match |
+| variables.rs:437:17:439:5 | BlockExpr | variables.rs:437:9:437:13 | block |  |
+| variables.rs:437:17:439:5 | enter BlockExpr | variables.rs:438:9:438:14 | ExprStmt |  |
+| variables.rs:437:17:439:5 | exit BlockExpr (normal) | variables.rs:437:17:439:5 | exit BlockExpr |  |
+| variables.rs:438:9:438:9 | i | variables.rs:438:13:438:13 | 1 |  |
+| variables.rs:438:9:438:13 | ... = ... | variables.rs:437:17:439:5 | exit BlockExpr (normal) |  |
+| variables.rs:438:9:438:14 | ExprStmt | variables.rs:438:9:438:9 | i |  |
+| variables.rs:438:13:438:13 | 1 | variables.rs:438:9:438:13 | ... = ... |  |
+| variables.rs:441:5:441:9 | block | variables.rs:441:5:441:15 | AwaitExpr |  |
+| variables.rs:441:5:441:15 | AwaitExpr | variables.rs:442:5:442:17 | ExprStmt |  |
+| variables.rs:441:5:441:16 | ExprStmt | variables.rs:441:5:441:9 | block |  |
+| variables.rs:442:5:442:13 | print_i64 | variables.rs:442:15:442:15 | i |  |
+| variables.rs:442:5:442:16 | CallExpr | variables.rs:435:32:443:1 | BlockExpr |  |
+| variables.rs:442:5:442:17 | ExprStmt | variables.rs:442:5:442:13 | print_i64 |  |
+| variables.rs:442:15:442:15 | i | variables.rs:442:5:442:16 | CallExpr |  |
+| variables.rs:445:1:459:1 | enter phi | variables.rs:445:8:445:8 | b |  |
+| variables.rs:445:1:459:1 | exit phi (normal) | variables.rs:445:1:459:1 | exit phi |  |
+| variables.rs:445:8:445:8 | b | variables.rs:445:8:445:15 | Param | match |
+| variables.rs:445:8:445:15 | Param | variables.rs:446:5:446:18 | LetStmt |  |
+| variables.rs:445:18:459:1 | BlockExpr | variables.rs:445:1:459:1 | exit phi (normal) |  |
+| variables.rs:446:5:446:18 | LetStmt | variables.rs:446:17:446:17 | 1 |  |
+| variables.rs:446:9:446:13 | x | variables.rs:447:5:447:17 | ExprStmt | match |
+| variables.rs:446:17:446:17 | 1 | variables.rs:446:9:446:13 | x |  |
+| variables.rs:447:5:447:13 | print_i64 | variables.rs:447:15:447:15 | x |  |
+| variables.rs:447:5:447:16 | CallExpr | variables.rs:448:5:448:21 | ExprStmt |  |
+| variables.rs:447:5:447:17 | ExprStmt | variables.rs:447:5:447:13 | print_i64 |  |
+| variables.rs:447:15:447:15 | x | variables.rs:447:5:447:16 | CallExpr |  |
+| variables.rs:448:5:448:13 | print_i64 | variables.rs:448:15:448:15 | x |  |
+| variables.rs:448:5:448:20 | CallExpr | variables.rs:449:5:457:5 | ExprStmt |  |
+| variables.rs:448:5:448:21 | ExprStmt | variables.rs:448:5:448:13 | print_i64 |  |
+| variables.rs:448:15:448:15 | x | variables.rs:448:19:448:19 | 1 |  |
+| variables.rs:448:15:448:19 | ... + ... | variables.rs:448:5:448:20 | CallExpr |  |
+| variables.rs:448:19:448:19 | 1 | variables.rs:448:15:448:19 | ... + ... |  |
+| variables.rs:449:5:457:5 | ExprStmt | variables.rs:449:8:449:8 | b |  |
+| variables.rs:449:5:457:5 | IfExpr | variables.rs:458:5:458:17 | ExprStmt |  |
+| variables.rs:449:8:449:8 | b | variables.rs:450:9:450:14 | ExprStmt | true |
+| variables.rs:449:8:449:8 | b | variables.rs:454:9:454:14 | ExprStmt | false |
+| variables.rs:449:10:453:5 | BlockExpr | variables.rs:449:5:457:5 | IfExpr |  |
+| variables.rs:450:9:450:9 | x | variables.rs:450:13:450:13 | 2 |  |
+| variables.rs:450:9:450:13 | ... = ... | variables.rs:451:9:451:21 | ExprStmt |  |
+| variables.rs:450:9:450:14 | ExprStmt | variables.rs:450:9:450:9 | x |  |
+| variables.rs:450:13:450:13 | 2 | variables.rs:450:9:450:13 | ... = ... |  |
+| variables.rs:451:9:451:17 | print_i64 | variables.rs:451:19:451:19 | x |  |
+| variables.rs:451:9:451:20 | CallExpr | variables.rs:452:9:452:25 | ExprStmt |  |
+| variables.rs:451:9:451:21 | ExprStmt | variables.rs:451:9:451:17 | print_i64 |  |
+| variables.rs:451:19:451:19 | x | variables.rs:451:9:451:20 | CallExpr |  |
+| variables.rs:452:9:452:17 | print_i64 | variables.rs:452:19:452:19 | x |  |
+| variables.rs:452:9:452:24 | CallExpr | variables.rs:449:10:453:5 | BlockExpr |  |
+| variables.rs:452:9:452:25 | ExprStmt | variables.rs:452:9:452:17 | print_i64 |  |
+| variables.rs:452:19:452:19 | x | variables.rs:452:23:452:23 | 1 |  |
+| variables.rs:452:19:452:23 | ... + ... | variables.rs:452:9:452:24 | CallExpr |  |
+| variables.rs:452:23:452:23 | 1 | variables.rs:452:19:452:23 | ... + ... |  |
+| variables.rs:453:12:457:5 | BlockExpr | variables.rs:449:5:457:5 | IfExpr |  |
+| variables.rs:454:9:454:9 | x | variables.rs:454:13:454:13 | 3 |  |
+| variables.rs:454:9:454:13 | ... = ... | variables.rs:455:9:455:21 | ExprStmt |  |
+| variables.rs:454:9:454:14 | ExprStmt | variables.rs:454:9:454:9 | x |  |
+| variables.rs:454:13:454:13 | 3 | variables.rs:454:9:454:13 | ... = ... |  |
+| variables.rs:455:9:455:17 | print_i64 | variables.rs:455:19:455:19 | x |  |
+| variables.rs:455:9:455:20 | CallExpr | variables.rs:456:9:456:25 | ExprStmt |  |
+| variables.rs:455:9:455:21 | ExprStmt | variables.rs:455:9:455:17 | print_i64 |  |
+| variables.rs:455:19:455:19 | x | variables.rs:455:9:455:20 | CallExpr |  |
+| variables.rs:456:9:456:17 | print_i64 | variables.rs:456:19:456:19 | x |  |
+| variables.rs:456:9:456:24 | CallExpr | variables.rs:453:12:457:5 | BlockExpr |  |
+| variables.rs:456:9:456:25 | ExprStmt | variables.rs:456:9:456:17 | print_i64 |  |
+| variables.rs:456:19:456:19 | x | variables.rs:456:23:456:23 | 1 |  |
+| variables.rs:456:19:456:23 | ... + ... | variables.rs:456:9:456:24 | CallExpr |  |
+| variables.rs:456:23:456:23 | 1 | variables.rs:456:19:456:23 | ... + ... |  |
+| variables.rs:458:5:458:13 | print_i64 | variables.rs:458:15:458:15 | x |  |
+| variables.rs:458:5:458:16 | CallExpr | variables.rs:445:18:459:1 | BlockExpr |  |
+| variables.rs:458:5:458:17 | ExprStmt | variables.rs:458:5:458:13 | print_i64 |  |
+| variables.rs:458:15:458:15 | x | variables.rs:458:5:458:16 | CallExpr |  |
+| variables.rs:461:1:474:1 | enter phi_read | variables.rs:461:13:461:14 | b1 |  |
+| variables.rs:461:1:474:1 | exit phi_read (normal) | variables.rs:461:1:474:1 | exit phi_read |  |
+| variables.rs:461:13:461:14 | b1 | variables.rs:461:13:461:21 | Param | match |
+| variables.rs:461:13:461:21 | Param | variables.rs:461:24:461:25 | b2 |  |
+| variables.rs:461:24:461:25 | b2 | variables.rs:461:24:461:32 | Param | match |
+| variables.rs:461:24:461:32 | Param | variables.rs:462:5:462:14 | LetStmt |  |
+| variables.rs:461:35:474:1 | BlockExpr | variables.rs:461:1:474:1 | exit phi_read (normal) |  |
+| variables.rs:462:5:462:14 | LetStmt | variables.rs:462:13:462:13 | 1 |  |
+| variables.rs:462:9:462:9 | x | variables.rs:463:5:467:5 | ExprStmt | match |
+| variables.rs:462:13:462:13 | 1 | variables.rs:462:9:462:9 | x |  |
+| variables.rs:463:5:467:5 | ExprStmt | variables.rs:463:8:463:9 | b1 |  |
+| variables.rs:463:5:467:5 | IfExpr | variables.rs:469:8:469:9 | b2 |  |
+| variables.rs:463:8:463:9 | b1 | variables.rs:464:9:464:21 | ExprStmt | true |
+| variables.rs:463:8:463:9 | b1 | variables.rs:466:9:466:21 | ExprStmt | false |
+| variables.rs:463:11:465:5 | BlockExpr | variables.rs:463:5:467:5 | IfExpr |  |
+| variables.rs:464:9:464:17 | print_i64 | variables.rs:464:19:464:19 | x |  |
+| variables.rs:464:9:464:20 | CallExpr | variables.rs:463:11:465:5 | BlockExpr |  |
+| variables.rs:464:9:464:21 | ExprStmt | variables.rs:464:9:464:17 | print_i64 |  |
+| variables.rs:464:19:464:19 | x | variables.rs:464:9:464:20 | CallExpr |  |
+| variables.rs:465:12:467:5 | BlockExpr | variables.rs:463:5:467:5 | IfExpr |  |
+| variables.rs:466:9:466:17 | print_i64 | variables.rs:466:19:466:19 | x |  |
+| variables.rs:466:9:466:20 | CallExpr | variables.rs:465:12:467:5 | BlockExpr |  |
+| variables.rs:466:9:466:21 | ExprStmt | variables.rs:466:9:466:17 | print_i64 |  |
+| variables.rs:466:19:466:19 | x | variables.rs:466:9:466:20 | CallExpr |  |
+| variables.rs:469:5:473:5 | IfExpr | variables.rs:461:35:474:1 | BlockExpr |  |
+| variables.rs:469:8:469:9 | b2 | variables.rs:470:9:470:21 | ExprStmt | true |
+| variables.rs:469:8:469:9 | b2 | variables.rs:472:9:472:21 | ExprStmt | false |
+| variables.rs:469:11:471:5 | BlockExpr | variables.rs:469:5:473:5 | IfExpr |  |
+| variables.rs:470:9:470:17 | print_i64 | variables.rs:470:19:470:19 | x |  |
+| variables.rs:470:9:470:20 | CallExpr | variables.rs:469:11:471:5 | BlockExpr |  |
+| variables.rs:470:9:470:21 | ExprStmt | variables.rs:470:9:470:17 | print_i64 |  |
+| variables.rs:470:19:470:19 | x | variables.rs:470:9:470:20 | CallExpr |  |
+| variables.rs:471:12:473:5 | BlockExpr | variables.rs:469:5:473:5 | IfExpr |  |
+| variables.rs:472:9:472:17 | print_i64 | variables.rs:472:19:472:19 | x |  |
+| variables.rs:472:9:472:20 | CallExpr | variables.rs:471:12:473:5 | BlockExpr |  |
+| variables.rs:472:9:472:21 | ExprStmt | variables.rs:472:9:472:17 | print_i64 |  |
+| variables.rs:472:19:472:19 | x | variables.rs:472:9:472:20 | CallExpr |  |
+| variables.rs:482:5:484:5 | enter my_get | variables.rs:483:9:483:24 | ExprStmt |  |
+| variables.rs:482:5:484:5 | exit my_get (normal) | variables.rs:482:5:484:5 | exit my_get |  |
+| variables.rs:483:9:483:23 | ReturnExpr | variables.rs:482:5:484:5 | exit my_get (normal) | return |
+| variables.rs:483:9:483:24 | ExprStmt | variables.rs:483:16:483:19 | self |  |
+| variables.rs:483:16:483:19 | self | variables.rs:483:16:483:23 | FieldExpr |  |
+| variables.rs:483:16:483:23 | FieldExpr | variables.rs:483:9:483:23 | ReturnExpr |  |
+| variables.rs:487:1:494:1 | enter structs | variables.rs:488:5:488:36 | LetStmt |  |
+| variables.rs:487:1:494:1 | exit structs (normal) | variables.rs:487:1:494:1 | exit structs |  |
+| variables.rs:487:14:494:1 | BlockExpr | variables.rs:487:1:494:1 | exit structs (normal) |  |
+| variables.rs:488:5:488:36 | LetStmt | variables.rs:488:33:488:33 | 1 |  |
+| variables.rs:488:9:488:13 | a | variables.rs:489:5:489:26 | ExprStmt | match |
+| variables.rs:488:17:488:35 | RecordExpr | variables.rs:488:9:488:13 | a |  |
+| variables.rs:488:33:488:33 | 1 | variables.rs:488:17:488:35 | RecordExpr |  |
+| variables.rs:489:5:489:13 | print_i64 | variables.rs:489:15:489:15 | a |  |
+| variables.rs:489:5:489:25 | CallExpr | variables.rs:490:5:490:14 | ExprStmt |  |
+| variables.rs:489:5:489:26 | ExprStmt | variables.rs:489:5:489:13 | print_i64 |  |
+| variables.rs:489:15:489:15 | a | variables.rs:489:15:489:24 | ... .my_get(...) |  |
+| variables.rs:489:15:489:24 | ... .my_get(...) | variables.rs:489:5:489:25 | CallExpr |  |
+| variables.rs:490:5:490:5 | a | variables.rs:490:5:490:9 | FieldExpr |  |
+| variables.rs:490:5:490:9 | FieldExpr | variables.rs:490:13:490:13 | 5 |  |
+| variables.rs:490:5:490:13 | ... = ... | variables.rs:491:5:491:26 | ExprStmt |  |
+| variables.rs:490:5:490:14 | ExprStmt | variables.rs:490:5:490:5 | a |  |
+| variables.rs:490:13:490:13 | 5 | variables.rs:490:5:490:13 | ... = ... |  |
+| variables.rs:491:5:491:13 | print_i64 | variables.rs:491:15:491:15 | a |  |
+| variables.rs:491:5:491:25 | CallExpr | variables.rs:492:5:492:28 | ExprStmt |  |
+| variables.rs:491:5:491:26 | ExprStmt | variables.rs:491:5:491:13 | print_i64 |  |
+| variables.rs:491:15:491:15 | a | variables.rs:491:15:491:24 | ... .my_get(...) |  |
+| variables.rs:491:15:491:24 | ... .my_get(...) | variables.rs:491:5:491:25 | CallExpr |  |
+| variables.rs:492:5:492:5 | a | variables.rs:492:25:492:25 | 2 |  |
+| variables.rs:492:5:492:27 | ... = ... | variables.rs:493:5:493:26 | ExprStmt |  |
+| variables.rs:492:5:492:28 | ExprStmt | variables.rs:492:5:492:5 | a |  |
+| variables.rs:492:9:492:27 | RecordExpr | variables.rs:492:5:492:27 | ... = ... |  |
+| variables.rs:492:25:492:25 | 2 | variables.rs:492:9:492:27 | RecordExpr |  |
+| variables.rs:493:5:493:13 | print_i64 | variables.rs:493:15:493:15 | a |  |
+| variables.rs:493:5:493:25 | CallExpr | variables.rs:487:14:494:1 | BlockExpr |  |
+| variables.rs:493:5:493:26 | ExprStmt | variables.rs:493:5:493:13 | print_i64 |  |
+| variables.rs:493:15:493:15 | a | variables.rs:493:15:493:24 | ... .my_get(...) |  |
+| variables.rs:493:15:493:24 | ... .my_get(...) | variables.rs:493:5:493:25 | CallExpr |  |
+| variables.rs:496:1:503:1 | enter ref_arg | variables.rs:497:5:497:15 | LetStmt |  |
+| variables.rs:496:1:503:1 | exit ref_arg (normal) | variables.rs:496:1:503:1 | exit ref_arg |  |
+| variables.rs:496:14:503:1 | BlockExpr | variables.rs:496:1:503:1 | exit ref_arg (normal) |  |
+| variables.rs:497:5:497:15 | LetStmt | variables.rs:497:13:497:14 | 16 |  |
+| variables.rs:497:9:497:9 | x | variables.rs:498:5:498:22 | ExprStmt | match |
+| variables.rs:497:13:497:14 | 16 | variables.rs:497:9:497:9 | x |  |
+| variables.rs:498:5:498:17 | print_i64_ref | variables.rs:498:20:498:20 | x |  |
+| variables.rs:498:5:498:21 | CallExpr | variables.rs:499:5:499:17 | ExprStmt |  |
+| variables.rs:498:5:498:22 | ExprStmt | variables.rs:498:5:498:17 | print_i64_ref |  |
+| variables.rs:498:19:498:20 | RefExpr | variables.rs:498:5:498:21 | CallExpr |  |
+| variables.rs:498:20:498:20 | x | variables.rs:498:19:498:20 | RefExpr |  |
+| variables.rs:499:5:499:13 | print_i64 | variables.rs:499:15:499:15 | x |  |
+| variables.rs:499:5:499:16 | CallExpr | variables.rs:501:5:501:15 | LetStmt |  |
+| variables.rs:499:5:499:17 | ExprStmt | variables.rs:499:5:499:13 | print_i64 |  |
+| variables.rs:499:15:499:15 | x | variables.rs:499:5:499:16 | CallExpr |  |
+| variables.rs:501:5:501:15 | LetStmt | variables.rs:501:13:501:14 | 17 |  |
+| variables.rs:501:9:501:9 | z | variables.rs:502:5:502:22 | ExprStmt | match |
+| variables.rs:501:13:501:14 | 17 | variables.rs:501:9:501:9 | z |  |
+| variables.rs:502:5:502:17 | print_i64_ref | variables.rs:502:20:502:20 | z |  |
+| variables.rs:502:5:502:21 | CallExpr | variables.rs:496:14:503:1 | BlockExpr |  |
+| variables.rs:502:5:502:22 | ExprStmt | variables.rs:502:5:502:17 | print_i64_ref |  |
+| variables.rs:502:19:502:20 | RefExpr | variables.rs:502:5:502:21 | CallExpr |  |
+| variables.rs:502:20:502:20 | z | variables.rs:502:19:502:20 | RefExpr |  |
+| variables.rs:510:3:512:3 | enter bar | variables.rs:511:5:511:32 | ExprStmt |  |
+| variables.rs:510:3:512:3 | exit bar (normal) | variables.rs:510:3:512:3 | exit bar |  |
+| variables.rs:510:21:512:3 | BlockExpr | variables.rs:510:3:512:3 | exit bar (normal) |  |
+| variables.rs:511:5:511:9 | * ... | variables.rs:511:29:511:29 | 3 |  |
+| variables.rs:511:5:511:31 | ... = ... | variables.rs:510:21:512:3 | BlockExpr |  |
+| variables.rs:511:5:511:32 | ExprStmt | variables.rs:511:6:511:9 | self |  |
+| variables.rs:511:6:511:9 | self | variables.rs:511:5:511:9 | * ... |  |
+| variables.rs:511:13:511:31 | RecordExpr | variables.rs:511:5:511:31 | ... = ... |  |
+| variables.rs:511:29:511:29 | 3 | variables.rs:511:13:511:31 | RecordExpr |  |
+| variables.rs:515:1:520:1 | enter ref_methodcall_receiver | variables.rs:516:3:516:34 | LetStmt |  |
+| variables.rs:515:1:520:1 | exit ref_methodcall_receiver (normal) | variables.rs:515:1:520:1 | exit ref_methodcall_receiver |  |
+| variables.rs:515:30:520:1 | BlockExpr | variables.rs:515:1:520:1 | exit ref_methodcall_receiver (normal) |  |
+| variables.rs:516:3:516:34 | LetStmt | variables.rs:516:31:516:31 | 1 |  |
+| variables.rs:516:7:516:11 | a | variables.rs:517:3:517:10 | ExprStmt | match |
+| variables.rs:516:15:516:33 | RecordExpr | variables.rs:516:7:516:11 | a |  |
+| variables.rs:516:31:516:31 | 1 | variables.rs:516:15:516:33 | RecordExpr |  |
+| variables.rs:517:3:517:3 | a | variables.rs:517:3:517:9 | ... .bar(...) |  |
+| variables.rs:517:3:517:9 | ... .bar(...) | variables.rs:519:3:519:19 | ExprStmt |  |
+| variables.rs:517:3:517:10 | ExprStmt | variables.rs:517:3:517:3 | a |  |
+| variables.rs:519:3:519:11 | print_i64 | variables.rs:519:13:519:13 | a |  |
+| variables.rs:519:3:519:18 | CallExpr | variables.rs:515:30:520:1 | BlockExpr |  |
+| variables.rs:519:3:519:19 | ExprStmt | variables.rs:519:3:519:11 | print_i64 |  |
+| variables.rs:519:13:519:13 | a | variables.rs:519:13:519:17 | FieldExpr |  |
+| variables.rs:519:13:519:17 | FieldExpr | variables.rs:519:3:519:18 | CallExpr |  |
+| variables.rs:522:1:556:1 | enter main | variables.rs:523:5:523:25 | ExprStmt |  |
+| variables.rs:522:1:556:1 | exit main (normal) | variables.rs:522:1:556:1 | exit main |  |
+| variables.rs:522:11:556:1 | BlockExpr | variables.rs:522:1:556:1 | exit main (normal) |  |
+| variables.rs:523:5:523:22 | immutable_variable | variables.rs:523:5:523:24 | CallExpr |  |
+| variables.rs:523:5:523:24 | CallExpr | variables.rs:524:5:524:23 | ExprStmt |  |
+| variables.rs:523:5:523:25 | ExprStmt | variables.rs:523:5:523:22 | immutable_variable |  |
+| variables.rs:524:5:524:20 | mutable_variable | variables.rs:524:5:524:22 | CallExpr |  |
+| variables.rs:524:5:524:22 | CallExpr | variables.rs:525:5:525:40 | ExprStmt |  |
+| variables.rs:524:5:524:23 | ExprStmt | variables.rs:524:5:524:20 | mutable_variable |  |
+| variables.rs:525:5:525:37 | mutable_variable_immutable_borrow | variables.rs:525:5:525:39 | CallExpr |  |
+| variables.rs:525:5:525:39 | CallExpr | variables.rs:526:5:526:23 | ExprStmt |  |
+| variables.rs:525:5:525:40 | ExprStmt | variables.rs:525:5:525:37 | mutable_variable_immutable_borrow |  |
+| variables.rs:526:5:526:20 | variable_shadow1 | variables.rs:526:5:526:22 | CallExpr |  |
+| variables.rs:526:5:526:22 | CallExpr | variables.rs:527:5:527:23 | ExprStmt |  |
+| variables.rs:526:5:526:23 | ExprStmt | variables.rs:526:5:526:20 | variable_shadow1 |  |
+| variables.rs:527:5:527:20 | variable_shadow2 | variables.rs:527:5:527:22 | CallExpr |  |
+| variables.rs:527:5:527:22 | CallExpr | variables.rs:528:5:528:19 | ExprStmt |  |
+| variables.rs:527:5:527:23 | ExprStmt | variables.rs:527:5:527:20 | variable_shadow2 |  |
+| variables.rs:528:5:528:16 | let_pattern1 | variables.rs:528:5:528:18 | CallExpr |  |
+| variables.rs:528:5:528:18 | CallExpr | variables.rs:529:5:529:19 | ExprStmt |  |
+| variables.rs:528:5:528:19 | ExprStmt | variables.rs:528:5:528:16 | let_pattern1 |  |
+| variables.rs:529:5:529:16 | let_pattern2 | variables.rs:529:5:529:18 | CallExpr |  |
+| variables.rs:529:5:529:18 | CallExpr | variables.rs:530:5:530:19 | ExprStmt |  |
+| variables.rs:529:5:529:19 | ExprStmt | variables.rs:529:5:529:16 | let_pattern2 |  |
+| variables.rs:530:5:530:16 | let_pattern3 | variables.rs:530:5:530:18 | CallExpr |  |
+| variables.rs:530:5:530:18 | CallExpr | variables.rs:531:5:531:19 | ExprStmt |  |
+| variables.rs:530:5:530:19 | ExprStmt | variables.rs:530:5:530:16 | let_pattern3 |  |
+| variables.rs:531:5:531:16 | let_pattern4 | variables.rs:531:5:531:18 | CallExpr |  |
+| variables.rs:531:5:531:18 | CallExpr | variables.rs:532:5:532:21 | ExprStmt |  |
+| variables.rs:531:5:531:19 | ExprStmt | variables.rs:531:5:531:16 | let_pattern4 |  |
+| variables.rs:532:5:532:18 | match_pattern1 | variables.rs:532:5:532:20 | CallExpr |  |
+| variables.rs:532:5:532:20 | CallExpr | variables.rs:533:5:533:21 | ExprStmt |  |
+| variables.rs:532:5:532:21 | ExprStmt | variables.rs:532:5:532:18 | match_pattern1 |  |
+| variables.rs:533:5:533:18 | match_pattern2 | variables.rs:533:5:533:20 | CallExpr |  |
+| variables.rs:533:5:533:20 | CallExpr | variables.rs:534:5:534:21 | ExprStmt |  |
+| variables.rs:533:5:533:21 | ExprStmt | variables.rs:533:5:533:18 | match_pattern2 |  |
+| variables.rs:534:5:534:18 | match_pattern3 | variables.rs:534:5:534:20 | CallExpr |  |
+| variables.rs:534:5:534:20 | CallExpr | variables.rs:535:5:535:21 | ExprStmt |  |
+| variables.rs:534:5:534:21 | ExprStmt | variables.rs:534:5:534:18 | match_pattern3 |  |
+| variables.rs:535:5:535:18 | match_pattern4 | variables.rs:535:5:535:20 | CallExpr |  |
+| variables.rs:535:5:535:20 | CallExpr | variables.rs:536:5:536:21 | ExprStmt |  |
+| variables.rs:535:5:535:21 | ExprStmt | variables.rs:535:5:535:18 | match_pattern4 |  |
+| variables.rs:536:5:536:18 | match_pattern5 | variables.rs:536:5:536:20 | CallExpr |  |
+| variables.rs:536:5:536:20 | CallExpr | variables.rs:537:5:537:21 | ExprStmt |  |
+| variables.rs:536:5:536:21 | ExprStmt | variables.rs:536:5:536:18 | match_pattern5 |  |
+| variables.rs:537:5:537:18 | match_pattern6 | variables.rs:537:5:537:20 | CallExpr |  |
+| variables.rs:537:5:537:20 | CallExpr | variables.rs:538:5:538:21 | ExprStmt |  |
+| variables.rs:537:5:537:21 | ExprStmt | variables.rs:537:5:537:18 | match_pattern6 |  |
+| variables.rs:538:5:538:18 | match_pattern7 | variables.rs:538:5:538:20 | CallExpr |  |
+| variables.rs:538:5:538:20 | CallExpr | variables.rs:539:5:539:21 | ExprStmt |  |
+| variables.rs:538:5:538:21 | ExprStmt | variables.rs:538:5:538:18 | match_pattern7 |  |
+| variables.rs:539:5:539:18 | match_pattern8 | variables.rs:539:5:539:20 | CallExpr |  |
+| variables.rs:539:5:539:20 | CallExpr | variables.rs:540:5:540:21 | ExprStmt |  |
+| variables.rs:539:5:539:21 | ExprStmt | variables.rs:539:5:539:18 | match_pattern8 |  |
+| variables.rs:540:5:540:18 | match_pattern9 | variables.rs:540:5:540:20 | CallExpr |  |
+| variables.rs:540:5:540:20 | CallExpr | variables.rs:541:5:541:36 | ExprStmt |  |
+| variables.rs:540:5:540:21 | ExprStmt | variables.rs:540:5:540:18 | match_pattern9 |  |
+| variables.rs:541:5:541:18 | param_pattern1 | variables.rs:541:20:541:22 | "a" |  |
+| variables.rs:541:5:541:35 | CallExpr | variables.rs:542:5:542:37 | ExprStmt |  |
+| variables.rs:541:5:541:36 | ExprStmt | variables.rs:541:5:541:18 | param_pattern1 |  |
+| variables.rs:541:20:541:22 | "a" | variables.rs:541:26:541:28 | "b" |  |
+| variables.rs:541:25:541:34 | TupleExpr | variables.rs:541:5:541:35 | CallExpr |  |
+| variables.rs:541:26:541:28 | "b" | variables.rs:541:31:541:33 | "c" |  |
+| variables.rs:541:31:541:33 | "c" | variables.rs:541:25:541:34 | TupleExpr |  |
+| variables.rs:542:5:542:18 | param_pattern2 | variables.rs:542:20:542:31 | Either::Left |  |
+| variables.rs:542:5:542:36 | CallExpr | variables.rs:543:5:543:26 | ExprStmt |  |
+| variables.rs:542:5:542:37 | ExprStmt | variables.rs:542:5:542:18 | param_pattern2 |  |
+| variables.rs:542:20:542:31 | Either::Left | variables.rs:542:33:542:34 | 45 |  |
+| variables.rs:542:20:542:35 | CallExpr | variables.rs:542:5:542:36 | CallExpr |  |
+| variables.rs:542:33:542:34 | 45 | variables.rs:542:20:542:35 | CallExpr |  |
+| variables.rs:543:5:543:23 | destruct_assignment | variables.rs:543:5:543:25 | CallExpr |  |
+| variables.rs:543:5:543:25 | CallExpr | variables.rs:544:5:544:23 | ExprStmt |  |
+| variables.rs:543:5:543:26 | ExprStmt | variables.rs:543:5:543:23 | destruct_assignment |  |
+| variables.rs:544:5:544:20 | closure_variable | variables.rs:544:5:544:22 | CallExpr |  |
+| variables.rs:544:5:544:22 | CallExpr | variables.rs:545:5:545:19 | ExprStmt |  |
+| variables.rs:544:5:544:23 | ExprStmt | variables.rs:544:5:544:20 | closure_variable |  |
+| variables.rs:545:5:545:16 | for_variable | variables.rs:545:5:545:18 | CallExpr |  |
+| variables.rs:545:5:545:18 | CallExpr | variables.rs:546:5:546:17 | ExprStmt |  |
+| variables.rs:545:5:545:19 | ExprStmt | variables.rs:545:5:545:16 | for_variable |  |
+| variables.rs:546:5:546:14 | add_assign | variables.rs:546:5:546:16 | CallExpr |  |
+| variables.rs:546:5:546:16 | CallExpr | variables.rs:547:5:547:13 | ExprStmt |  |
+| variables.rs:546:5:546:17 | ExprStmt | variables.rs:546:5:546:14 | add_assign |  |
+| variables.rs:547:5:547:10 | mutate | variables.rs:547:5:547:12 | CallExpr |  |
+| variables.rs:547:5:547:12 | CallExpr | variables.rs:548:5:548:17 | ExprStmt |  |
+| variables.rs:547:5:547:13 | ExprStmt | variables.rs:547:5:547:10 | mutate |  |
+| variables.rs:548:5:548:14 | mutate_arg | variables.rs:548:5:548:16 | CallExpr |  |
+| variables.rs:548:5:548:16 | CallExpr | variables.rs:549:5:549:12 | ExprStmt |  |
+| variables.rs:548:5:548:17 | ExprStmt | variables.rs:548:5:548:14 | mutate_arg |  |
+| variables.rs:549:5:549:9 | alias | variables.rs:549:5:549:11 | CallExpr |  |
+| variables.rs:549:5:549:11 | CallExpr | variables.rs:550:5:550:18 | ExprStmt |  |
+| variables.rs:549:5:549:12 | ExprStmt | variables.rs:549:5:549:9 | alias |  |
+| variables.rs:550:5:550:15 | capture_mut | variables.rs:550:5:550:17 | CallExpr |  |
+| variables.rs:550:5:550:17 | CallExpr | variables.rs:551:5:551:20 | ExprStmt |  |
+| variables.rs:550:5:550:18 | ExprStmt | variables.rs:550:5:550:15 | capture_mut |  |
+| variables.rs:551:5:551:17 | capture_immut | variables.rs:551:5:551:19 | CallExpr |  |
+| variables.rs:551:5:551:19 | CallExpr | variables.rs:552:5:552:26 | ExprStmt |  |
+| variables.rs:551:5:551:20 | ExprStmt | variables.rs:551:5:551:17 | capture_immut |  |
+| variables.rs:552:5:552:23 | async_block_capture | variables.rs:552:5:552:25 | CallExpr |  |
+| variables.rs:552:5:552:25 | CallExpr | variables.rs:553:5:553:14 | ExprStmt |  |
+| variables.rs:552:5:552:26 | ExprStmt | variables.rs:552:5:552:23 | async_block_capture |  |
+| variables.rs:553:5:553:11 | structs | variables.rs:553:5:553:13 | CallExpr |  |
+| variables.rs:553:5:553:13 | CallExpr | variables.rs:554:5:554:14 | ExprStmt |  |
+| variables.rs:553:5:553:14 | ExprStmt | variables.rs:553:5:553:11 | structs |  |
+| variables.rs:554:5:554:11 | ref_arg | variables.rs:554:5:554:13 | CallExpr |  |
+| variables.rs:554:5:554:13 | CallExpr | variables.rs:555:5:555:30 | ExprStmt |  |
+| variables.rs:554:5:554:14 | ExprStmt | variables.rs:554:5:554:11 | ref_arg |  |
+| variables.rs:555:5:555:27 | ref_methodcall_receiver | variables.rs:555:5:555:29 | CallExpr |  |
+| variables.rs:555:5:555:29 | CallExpr | variables.rs:522:11:556:1 | BlockExpr |  |
+| variables.rs:555:5:555:30 | ExprStmt | variables.rs:555:5:555:27 | ref_methodcall_receiver |  |
+breakTarget
+continueTarget
diff --git a/rust/ql/test/library-tests/variables/Cfg.qlref b/rust/ql/test/library-tests/variables/Cfg.qlref
new file mode 100644
index 00000000000..ba4ee4b414f
--- /dev/null
+++ b/rust/ql/test/library-tests/variables/Cfg.qlref
@@ -0,0 +1 @@
+query: utils/Cfg.ql
\ No newline at end of file
diff --git a/rust/ql/test/library-tests/variables/Ssa.expected b/rust/ql/test/library-tests/variables/Ssa.expected
new file mode 100644
index 00000000000..f17152793a3
--- /dev/null
+++ b/rust/ql/test/library-tests/variables/Ssa.expected
@@ -0,0 +1,561 @@
+nonSsaVariable
+| variables.rs:341:13:341:13 | a |
+| variables.rs:349:13:349:13 | i |
+| variables.rs:372:13:372:13 | x |
+| variables.rs:379:13:379:13 | z |
+| variables.rs:392:13:392:13 | x |
+| variables.rs:426:13:426:13 | z |
+| variables.rs:488:13:488:13 | a |
+| variables.rs:516:11:516:11 | a |
+definition
+| variables.rs:3:14:3:14 | s | variables.rs:3:14:3:14 | s |
+| variables.rs:7:14:7:14 | i | variables.rs:7:14:7:14 | i |
+| variables.rs:11:18:11:18 | i | variables.rs:11:18:11:18 | i |
+| variables.rs:16:9:16:10 | x1 | variables.rs:16:9:16:10 | x1 |
+| variables.rs:21:9:21:14 | x2 | variables.rs:21:13:21:14 | x2 |
+| variables.rs:23:5:23:6 | x2 | variables.rs:21:13:21:14 | x2 |
+| variables.rs:28:9:28:13 | x | variables.rs:28:13:28:13 | x |
+| variables.rs:30:5:30:5 | x | variables.rs:28:13:28:13 | x |
+| variables.rs:35:9:35:10 | x3 | variables.rs:35:9:35:10 | x3 |
+| variables.rs:37:9:37:10 | x3 | variables.rs:37:9:37:10 | x3 |
+| variables.rs:43:9:43:10 | x4 | variables.rs:43:9:43:10 | x4 |
+| variables.rs:46:13:46:14 | x4 | variables.rs:46:13:46:14 | x4 |
+| variables.rs:60:13:60:14 | a1 | variables.rs:60:13:60:14 | a1 |
+| variables.rs:61:13:61:14 | b1 | variables.rs:61:13:61:14 | b1 |
+| variables.rs:64:13:64:13 | x | variables.rs:64:13:64:13 | x |
+| variables.rs:65:13:65:13 | y | variables.rs:65:13:65:13 | y |
+| variables.rs:75:9:75:10 | p1 | variables.rs:75:9:75:10 | p1 |
+| variables.rs:77:12:77:13 | a2 | variables.rs:77:12:77:13 | a2 |
+| variables.rs:78:12:78:13 | b2 | variables.rs:78:12:78:13 | b2 |
+| variables.rs:85:9:85:10 | s1 | variables.rs:85:9:85:10 | s1 |
+| variables.rs:87:17:87:22 | s2 | variables.rs:87:21:87:22 | s2 |
+| variables.rs:94:14:94:15 | x5 | variables.rs:94:14:94:15 | x5 |
+| variables.rs:102:9:102:10 | s1 | variables.rs:102:9:102:10 | s1 |
+| variables.rs:104:20:104:25 | s2 | variables.rs:104:24:104:25 | s2 |
+| variables.rs:111:9:111:10 | x6 | variables.rs:111:9:111:10 | x6 |
+| variables.rs:112:9:112:10 | y1 | variables.rs:112:9:112:10 | y1 |
+| variables.rs:116:14:116:15 | y1 | variables.rs:116:14:116:15 | y1 |
+| variables.rs:128:9:128:15 | numbers | variables.rs:128:9:128:15 | numbers |
+| variables.rs:132:13:132:17 | first | variables.rs:132:13:132:17 | first |
+| variables.rs:133:13:133:17 | third | variables.rs:133:13:133:17 | third |
+| variables.rs:134:13:134:17 | fifth | variables.rs:134:13:134:17 | fifth |
+| variables.rs:144:13:144:17 | first | variables.rs:144:13:144:17 | first |
+| variables.rs:146:13:146:16 | last | variables.rs:146:13:146:16 | last |
+| variables.rs:155:9:155:10 | p2 | variables.rs:155:9:155:10 | p2 |
+| variables.rs:159:16:159:17 | x7 | variables.rs:159:16:159:17 | x7 |
+| variables.rs:169:9:169:11 | msg | variables.rs:169:9:169:11 | msg |
+| variables.rs:173:17:173:35 | [match(true)] id_variable | variables.rs:173:17:173:27 | id_variable |
+| variables.rs:178:26:178:27 | id | variables.rs:178:26:178:27 | id |
+| variables.rs:189:9:189:14 | either | variables.rs:189:9:189:14 | either |
+| variables.rs:191:9:191:44 | [match(true)] phi | variables.rs:191:9:191:44 | a3 |
+| variables.rs:191:22:191:23 | a3 | variables.rs:191:9:191:44 | a3 |
+| variables.rs:191:42:191:43 | a3 | variables.rs:191:9:191:44 | a3 |
+| variables.rs:203:9:203:10 | tv | variables.rs:203:9:203:10 | tv |
+| variables.rs:205:9:205:81 | [match(true)] phi | variables.rs:205:9:205:81 | a4 |
+| variables.rs:205:28:205:29 | a4 | variables.rs:205:9:205:81 | a4 |
+| variables.rs:205:54:205:55 | a4 | variables.rs:205:9:205:81 | a4 |
+| variables.rs:205:79:205:80 | a4 | variables.rs:205:9:205:81 | a4 |
+| variables.rs:209:9:209:83 | [match(true)] phi | variables.rs:209:9:209:83 | a5 |
+| variables.rs:209:10:209:57 | [match(true)] phi | variables.rs:209:9:209:83 | a5 |
+| variables.rs:209:29:209:30 | a5 | variables.rs:209:9:209:83 | a5 |
+| variables.rs:209:55:209:56 | a5 | variables.rs:209:9:209:83 | a5 |
+| variables.rs:209:81:209:82 | a5 | variables.rs:209:9:209:83 | a5 |
+| variables.rs:213:9:213:83 | [match(true)] phi | variables.rs:213:9:213:83 | a6 |
+| variables.rs:213:28:213:29 | a6 | variables.rs:213:9:213:83 | a6 |
+| variables.rs:213:35:213:82 | [match(true)] phi | variables.rs:213:9:213:83 | a6 |
+| variables.rs:213:55:213:56 | a6 | variables.rs:213:9:213:83 | a6 |
+| variables.rs:213:80:213:81 | a6 | variables.rs:213:9:213:83 | a6 |
+| variables.rs:219:9:219:14 | either | variables.rs:219:9:219:14 | either |
+| variables.rs:221:9:221:44 | [match(true)] phi | variables.rs:221:9:221:44 | a7 |
+| variables.rs:221:22:221:23 | a7 | variables.rs:221:9:221:44 | a7 |
+| variables.rs:221:42:221:43 | a7 | variables.rs:221:9:221:44 | a7 |
+| variables.rs:229:9:229:14 | either | variables.rs:229:9:229:14 | either |
+| variables.rs:232:9:233:52 | [match(true)] e | variables.rs:232:13:232:13 | e |
+| variables.rs:233:14:233:51 | [match(true)] phi | variables.rs:233:14:233:51 | a11 |
+| variables.rs:233:27:233:29 | a11 | variables.rs:233:14:233:51 | a11 |
+| variables.rs:233:48:233:50 | a11 | variables.rs:233:14:233:51 | a11 |
+| variables.rs:236:33:236:35 | a12 | variables.rs:236:33:236:35 | a12 |
+| variables.rs:253:9:253:10 | fv | variables.rs:253:9:253:10 | fv |
+| variables.rs:255:9:255:109 | [match(true)] phi | variables.rs:255:9:255:109 | a13 |
+| variables.rs:255:27:255:29 | a13 | variables.rs:255:9:255:109 | a13 |
+| variables.rs:255:35:255:82 | [match(true)] phi | variables.rs:255:9:255:109 | a13 |
+| variables.rs:255:54:255:56 | a13 | variables.rs:255:9:255:109 | a13 |
+| variables.rs:255:79:255:81 | a13 | variables.rs:255:9:255:109 | a13 |
+| variables.rs:255:106:255:108 | a13 | variables.rs:255:9:255:109 | a13 |
+| variables.rs:261:5:261:6 | a8 | variables.rs:261:5:261:6 | a8 |
+| variables.rs:263:9:263:10 | b3 | variables.rs:263:9:263:10 | b3 |
+| variables.rs:264:9:264:10 | c1 | variables.rs:264:9:264:10 | c1 |
+| variables.rs:272:6:272:41 | [match(true)] phi | variables.rs:272:6:272:41 | a9 |
+| variables.rs:272:19:272:20 | a9 | variables.rs:272:6:272:41 | a9 |
+| variables.rs:272:39:272:40 | a9 | variables.rs:272:6:272:41 | a9 |
+| variables.rs:279:9:279:15 | a10 | variables.rs:279:13:279:15 | a10 |
+| variables.rs:280:9:280:14 | b4 | variables.rs:280:13:280:14 | b4 |
+| variables.rs:281:9:281:14 | c2 | variables.rs:281:13:281:14 | c2 |
+| variables.rs:288:9:288:10 | c2 | variables.rs:281:13:281:14 | c2 |
+| variables.rs:289:9:289:10 | b4 | variables.rs:280:13:280:14 | b4 |
+| variables.rs:290:9:290:11 | a10 | variables.rs:279:13:279:15 | a10 |
+| variables.rs:302:13:302:15 | a10 | variables.rs:302:13:302:15 | a10 |
+| variables.rs:303:13:303:14 | b4 | variables.rs:303:13:303:14 | b4 |
+| variables.rs:315:9:315:23 | example_closure | variables.rs:315:9:315:23 | example_closure |
+| variables.rs:316:10:316:10 | x | variables.rs:316:10:316:10 | x |
+| variables.rs:318:9:318:10 | n1 | variables.rs:318:9:318:10 | n1 |
+| variables.rs:323:9:323:26 | immutable_variable | variables.rs:323:9:323:26 | immutable_variable |
+| variables.rs:324:10:324:10 | x | variables.rs:324:10:324:10 | x |
+| variables.rs:326:9:326:10 | n2 | variables.rs:326:9:326:10 | n2 |
+| variables.rs:332:9:332:9 | v | variables.rs:332:9:332:9 | v |
+| variables.rs:334:9:334:12 | text | variables.rs:334:9:334:12 | text |
+| variables.rs:350:9:350:13 | ref_i | variables.rs:350:9:350:13 | ref_i |
+| variables.rs:356:17:356:17 | x | variables.rs:356:17:356:17 | x |
+| variables.rs:363:22:363:22 | x | variables.rs:363:22:363:22 | x |
+| variables.rs:363:39:363:39 | y | variables.rs:363:39:363:39 | y |
+| variables.rs:373:9:373:9 | y | variables.rs:373:9:373:9 | y |
+| variables.rs:380:9:380:9 | w | variables.rs:380:9:380:9 | w |
+| variables.rs:393:9:393:9 | y | variables.rs:393:9:393:9 | y |
+| variables.rs:400:9:400:9 | x | variables.rs:400:9:400:9 | x |
+| variables.rs:402:9:402:11 | cap | variables.rs:402:9:402:11 | cap |
+| variables.rs:402:15:404:5 | <captured entry> x | variables.rs:400:9:400:9 | x |
+| variables.rs:410:9:410:13 | x | variables.rs:410:13:410:13 | x |
+| variables.rs:412:9:412:16 | closure1 | variables.rs:412:9:412:16 | closure1 |
+| variables.rs:412:20:414:5 | <captured entry> x | variables.rs:410:13:410:13 | x |
+| variables.rs:418:9:418:13 | y | variables.rs:418:13:418:13 | y |
+| variables.rs:420:9:420:20 | closure2 | variables.rs:420:13:420:20 | closure2 |
+| variables.rs:421:9:421:9 | y | variables.rs:418:13:418:13 | y |
+| variables.rs:423:5:423:14 | CallExpr | variables.rs:418:13:418:13 | y |
+| variables.rs:428:9:428:20 | closure3 | variables.rs:428:13:428:20 | closure3 |
+| variables.rs:436:9:436:13 | i | variables.rs:436:13:436:13 | i |
+| variables.rs:437:9:437:13 | block | variables.rs:437:9:437:13 | block |
+| variables.rs:438:9:438:9 | i | variables.rs:436:13:436:13 | i |
+| variables.rs:441:5:441:15 | AwaitExpr | variables.rs:436:13:436:13 | i |
+| variables.rs:445:8:445:8 | b | variables.rs:445:8:445:8 | b |
+| variables.rs:446:9:446:13 | x | variables.rs:446:13:446:13 | x |
+| variables.rs:449:5:457:5 | phi | variables.rs:446:13:446:13 | x |
+| variables.rs:450:9:450:9 | x | variables.rs:446:13:446:13 | x |
+| variables.rs:454:9:454:9 | x | variables.rs:446:13:446:13 | x |
+| variables.rs:461:13:461:14 | b1 | variables.rs:461:13:461:14 | b1 |
+| variables.rs:461:24:461:25 | b2 | variables.rs:461:24:461:25 | b2 |
+| variables.rs:462:9:462:9 | x | variables.rs:462:9:462:9 | x |
+| variables.rs:497:9:497:9 | x | variables.rs:497:9:497:9 | x |
+| variables.rs:501:9:501:9 | z | variables.rs:501:9:501:9 | z |
+read
+| variables.rs:3:14:3:14 | s | variables.rs:3:14:3:14 | s | variables.rs:4:20:4:20 | s |
+| variables.rs:7:14:7:14 | i | variables.rs:7:14:7:14 | i | variables.rs:8:20:8:20 | i |
+| variables.rs:11:18:11:18 | i | variables.rs:11:18:11:18 | i | variables.rs:12:16:12:16 | i |
+| variables.rs:16:9:16:10 | x1 | variables.rs:16:9:16:10 | x1 | variables.rs:17:15:17:16 | x1 |
+| variables.rs:21:9:21:14 | x2 | variables.rs:21:13:21:14 | x2 | variables.rs:22:15:22:16 | x2 |
+| variables.rs:23:5:23:6 | x2 | variables.rs:21:13:21:14 | x2 | variables.rs:24:15:24:16 | x2 |
+| variables.rs:35:9:35:10 | x3 | variables.rs:35:9:35:10 | x3 | variables.rs:36:15:36:16 | x3 |
+| variables.rs:35:9:35:10 | x3 | variables.rs:35:9:35:10 | x3 | variables.rs:38:9:38:10 | x3 |
+| variables.rs:37:9:37:10 | x3 | variables.rs:37:9:37:10 | x3 | variables.rs:39:15:39:16 | x3 |
+| variables.rs:43:9:43:10 | x4 | variables.rs:43:9:43:10 | x4 | variables.rs:44:15:44:16 | x4 |
+| variables.rs:43:9:43:10 | x4 | variables.rs:43:9:43:10 | x4 | variables.rs:49:15:49:16 | x4 |
+| variables.rs:46:13:46:14 | x4 | variables.rs:46:13:46:14 | x4 | variables.rs:47:19:47:20 | x4 |
+| variables.rs:60:13:60:14 | a1 | variables.rs:60:13:60:14 | a1 | variables.rs:68:15:68:16 | a1 |
+| variables.rs:61:13:61:14 | b1 | variables.rs:61:13:61:14 | b1 | variables.rs:69:15:69:16 | b1 |
+| variables.rs:64:13:64:13 | x | variables.rs:64:13:64:13 | x | variables.rs:70:15:70:15 | x |
+| variables.rs:65:13:65:13 | y | variables.rs:65:13:65:13 | y | variables.rs:71:15:71:15 | y |
+| variables.rs:75:9:75:10 | p1 | variables.rs:75:9:75:10 | p1 | variables.rs:79:9:79:10 | p1 |
+| variables.rs:77:12:77:13 | a2 | variables.rs:77:12:77:13 | a2 | variables.rs:80:15:80:16 | a2 |
+| variables.rs:78:12:78:13 | b2 | variables.rs:78:12:78:13 | b2 | variables.rs:81:15:81:16 | b2 |
+| variables.rs:85:9:85:10 | s1 | variables.rs:85:9:85:10 | s1 | variables.rs:88:11:88:12 | s1 |
+| variables.rs:87:17:87:22 | s2 | variables.rs:87:21:87:22 | s2 | variables.rs:89:19:89:20 | s2 |
+| variables.rs:94:14:94:15 | x5 | variables.rs:94:14:94:15 | x5 | variables.rs:98:15:98:16 | x5 |
+| variables.rs:102:9:102:10 | s1 | variables.rs:102:9:102:10 | s1 | variables.rs:105:11:105:12 | s1 |
+| variables.rs:104:20:104:25 | s2 | variables.rs:104:24:104:25 | s2 | variables.rs:106:19:106:20 | s2 |
+| variables.rs:111:9:111:10 | x6 | variables.rs:111:9:111:10 | x6 | variables.rs:114:11:114:12 | x6 |
+| variables.rs:112:9:112:10 | y1 | variables.rs:112:9:112:10 | y1 | variables.rs:124:15:124:16 | y1 |
+| variables.rs:116:14:116:15 | y1 | variables.rs:116:14:116:15 | y1 | variables.rs:119:23:119:24 | y1 |
+| variables.rs:128:9:128:15 | numbers | variables.rs:128:9:128:15 | numbers | variables.rs:130:11:130:17 | numbers |
+| variables.rs:128:9:128:15 | numbers | variables.rs:128:9:128:15 | numbers | variables.rs:142:11:142:17 | numbers |
+| variables.rs:132:13:132:17 | first | variables.rs:132:13:132:17 | first | variables.rs:136:23:136:27 | first |
+| variables.rs:133:13:133:17 | third | variables.rs:133:13:133:17 | third | variables.rs:137:23:137:27 | third |
+| variables.rs:134:13:134:17 | fifth | variables.rs:134:13:134:17 | fifth | variables.rs:138:23:138:27 | fifth |
+| variables.rs:144:13:144:17 | first | variables.rs:144:13:144:17 | first | variables.rs:148:23:148:27 | first |
+| variables.rs:146:13:146:16 | last | variables.rs:146:13:146:16 | last | variables.rs:149:23:149:26 | last |
+| variables.rs:155:9:155:10 | p2 | variables.rs:155:9:155:10 | p2 | variables.rs:157:11:157:12 | p2 |
+| variables.rs:159:16:159:17 | x7 | variables.rs:159:16:159:17 | x7 | variables.rs:160:24:160:25 | x7 |
+| variables.rs:169:9:169:11 | msg | variables.rs:169:9:169:11 | msg | variables.rs:171:11:171:13 | msg |
+| variables.rs:173:17:173:35 | [match(true)] id_variable | variables.rs:173:17:173:27 | id_variable | variables.rs:174:24:174:34 | id_variable |
+| variables.rs:178:26:178:27 | id | variables.rs:178:26:178:27 | id | variables.rs:179:23:179:24 | id |
+| variables.rs:189:9:189:14 | either | variables.rs:189:9:189:14 | either | variables.rs:190:11:190:16 | either |
+| variables.rs:191:9:191:44 | [match(true)] phi | variables.rs:191:9:191:44 | a3 | variables.rs:192:26:192:27 | a3 |
+| variables.rs:203:9:203:10 | tv | variables.rs:203:9:203:10 | tv | variables.rs:204:11:204:12 | tv |
+| variables.rs:203:9:203:10 | tv | variables.rs:203:9:203:10 | tv | variables.rs:208:11:208:12 | tv |
+| variables.rs:203:9:203:10 | tv | variables.rs:203:9:203:10 | tv | variables.rs:212:11:212:12 | tv |
+| variables.rs:205:9:205:81 | [match(true)] phi | variables.rs:205:9:205:81 | a4 | variables.rs:206:26:206:27 | a4 |
+| variables.rs:209:9:209:83 | [match(true)] phi | variables.rs:209:9:209:83 | a5 | variables.rs:210:26:210:27 | a5 |
+| variables.rs:213:9:213:83 | [match(true)] phi | variables.rs:213:9:213:83 | a6 | variables.rs:214:26:214:27 | a6 |
+| variables.rs:219:9:219:14 | either | variables.rs:219:9:219:14 | either | variables.rs:220:11:220:16 | either |
+| variables.rs:221:9:221:44 | [match(true)] phi | variables.rs:221:9:221:44 | a7 | variables.rs:222:16:222:17 | a7 |
+| variables.rs:221:9:221:44 | [match(true)] phi | variables.rs:221:9:221:44 | a7 | variables.rs:223:26:223:27 | a7 |
+| variables.rs:229:9:229:14 | either | variables.rs:229:9:229:14 | either | variables.rs:231:11:231:16 | either |
+| variables.rs:232:9:233:52 | [match(true)] e | variables.rs:232:13:232:13 | e | variables.rs:237:15:237:15 | e |
+| variables.rs:233:14:233:51 | [match(true)] phi | variables.rs:233:14:233:51 | a11 | variables.rs:235:23:235:25 | a11 |
+| variables.rs:236:33:236:35 | a12 | variables.rs:236:33:236:35 | a12 | variables.rs:238:28:238:30 | a12 |
+| variables.rs:253:9:253:10 | fv | variables.rs:253:9:253:10 | fv | variables.rs:254:11:254:12 | fv |
+| variables.rs:255:9:255:109 | [match(true)] phi | variables.rs:255:9:255:109 | a13 | variables.rs:256:26:256:28 | a13 |
+| variables.rs:261:5:261:6 | a8 | variables.rs:261:5:261:6 | a8 | variables.rs:266:15:266:16 | a8 |
+| variables.rs:263:9:263:10 | b3 | variables.rs:263:9:263:10 | b3 | variables.rs:267:15:267:16 | b3 |
+| variables.rs:264:9:264:10 | c1 | variables.rs:264:9:264:10 | c1 | variables.rs:268:15:268:16 | c1 |
+| variables.rs:272:6:272:41 | [match(true)] phi | variables.rs:272:6:272:41 | a9 | variables.rs:274:15:274:16 | a9 |
+| variables.rs:279:9:279:15 | a10 | variables.rs:279:13:279:15 | a10 | variables.rs:283:15:283:17 | a10 |
+| variables.rs:280:9:280:14 | b4 | variables.rs:280:13:280:14 | b4 | variables.rs:284:15:284:16 | b4 |
+| variables.rs:281:9:281:14 | c2 | variables.rs:281:13:281:14 | c2 | variables.rs:285:15:285:16 | c2 |
+| variables.rs:288:9:288:10 | c2 | variables.rs:281:13:281:14 | c2 | variables.rs:294:9:294:10 | c2 |
+| variables.rs:288:9:288:10 | c2 | variables.rs:281:13:281:14 | c2 | variables.rs:298:15:298:16 | c2 |
+| variables.rs:289:9:289:10 | b4 | variables.rs:280:13:280:14 | b4 | variables.rs:293:9:293:10 | b4 |
+| variables.rs:289:9:289:10 | b4 | variables.rs:280:13:280:14 | b4 | variables.rs:297:15:297:16 | b4 |
+| variables.rs:289:9:289:10 | b4 | variables.rs:280:13:280:14 | b4 | variables.rs:311:15:311:16 | b4 |
+| variables.rs:290:9:290:11 | a10 | variables.rs:279:13:279:15 | a10 | variables.rs:292:9:292:11 | a10 |
+| variables.rs:290:9:290:11 | a10 | variables.rs:279:13:279:15 | a10 | variables.rs:296:15:296:17 | a10 |
+| variables.rs:290:9:290:11 | a10 | variables.rs:279:13:279:15 | a10 | variables.rs:310:15:310:17 | a10 |
+| variables.rs:302:13:302:15 | a10 | variables.rs:302:13:302:15 | a10 | variables.rs:305:23:305:25 | a10 |
+| variables.rs:303:13:303:14 | b4 | variables.rs:303:13:303:14 | b4 | variables.rs:306:23:306:24 | b4 |
+| variables.rs:315:9:315:23 | example_closure | variables.rs:315:9:315:23 | example_closure | variables.rs:319:9:319:23 | example_closure |
+| variables.rs:316:10:316:10 | x | variables.rs:316:10:316:10 | x | variables.rs:317:9:317:9 | x |
+| variables.rs:318:9:318:10 | n1 | variables.rs:318:9:318:10 | n1 | variables.rs:320:15:320:16 | n1 |
+| variables.rs:323:9:323:26 | immutable_variable | variables.rs:323:9:323:26 | immutable_variable | variables.rs:327:9:327:26 | immutable_variable |
+| variables.rs:324:10:324:10 | x | variables.rs:324:10:324:10 | x | variables.rs:325:9:325:9 | x |
+| variables.rs:326:9:326:10 | n2 | variables.rs:326:9:326:10 | n2 | variables.rs:328:15:328:16 | n2 |
+| variables.rs:332:9:332:9 | v | variables.rs:332:9:332:9 | v | variables.rs:335:12:335:12 | v |
+| variables.rs:334:9:334:12 | text | variables.rs:334:9:334:12 | text | variables.rs:336:19:336:22 | text |
+| variables.rs:350:9:350:13 | ref_i | variables.rs:350:9:350:13 | ref_i | variables.rs:352:6:352:10 | ref_i |
+| variables.rs:356:17:356:17 | x | variables.rs:356:17:356:17 | x | variables.rs:357:6:357:6 | x |
+| variables.rs:356:17:356:17 | x | variables.rs:356:17:356:17 | x | variables.rs:358:10:358:10 | x |
+| variables.rs:356:17:356:17 | x | variables.rs:356:17:356:17 | x | variables.rs:359:10:359:10 | x |
+| variables.rs:356:17:356:17 | x | variables.rs:356:17:356:17 | x | variables.rs:360:12:360:12 | x |
+| variables.rs:363:22:363:22 | x | variables.rs:363:22:363:22 | x | variables.rs:364:6:364:6 | x |
+| variables.rs:363:22:363:22 | x | variables.rs:363:22:363:22 | x | variables.rs:365:10:365:10 | x |
+| variables.rs:363:22:363:22 | x | variables.rs:363:22:363:22 | x | variables.rs:366:10:366:10 | x |
+| variables.rs:363:22:363:22 | x | variables.rs:363:22:363:22 | x | variables.rs:368:9:368:9 | x |
+| variables.rs:363:39:363:39 | y | variables.rs:363:39:363:39 | y | variables.rs:367:6:367:6 | y |
+| variables.rs:373:9:373:9 | y | variables.rs:373:9:373:9 | y | variables.rs:375:6:375:6 | y |
+| variables.rs:380:9:380:9 | w | variables.rs:380:9:380:9 | w | variables.rs:384:9:384:9 | w |
+| variables.rs:380:9:380:9 | w | variables.rs:380:9:380:9 | w | variables.rs:386:7:386:7 | w |
+| variables.rs:393:9:393:9 | y | variables.rs:393:9:393:9 | y | variables.rs:395:6:395:6 | y |
+| variables.rs:400:9:400:9 | x | variables.rs:400:9:400:9 | x | variables.rs:406:15:406:15 | x |
+| variables.rs:402:9:402:11 | cap | variables.rs:402:9:402:11 | cap | variables.rs:405:5:405:7 | cap |
+| variables.rs:402:15:404:5 | <captured entry> x | variables.rs:400:9:400:9 | x | variables.rs:403:19:403:19 | x |
+| variables.rs:410:9:410:13 | x | variables.rs:410:13:410:13 | x | variables.rs:416:15:416:15 | x |
+| variables.rs:412:9:412:16 | closure1 | variables.rs:412:9:412:16 | closure1 | variables.rs:415:5:415:12 | closure1 |
+| variables.rs:412:20:414:5 | <captured entry> x | variables.rs:410:13:410:13 | x | variables.rs:413:19:413:19 | x |
+| variables.rs:420:9:420:20 | closure2 | variables.rs:420:13:420:20 | closure2 | variables.rs:423:5:423:12 | closure2 |
+| variables.rs:423:5:423:14 | CallExpr | variables.rs:418:13:418:13 | y | variables.rs:424:15:424:15 | y |
+| variables.rs:428:9:428:20 | closure3 | variables.rs:428:13:428:20 | closure3 | variables.rs:431:5:431:12 | closure3 |
+| variables.rs:437:9:437:13 | block | variables.rs:437:9:437:13 | block | variables.rs:441:5:441:9 | block |
+| variables.rs:441:5:441:15 | AwaitExpr | variables.rs:436:13:436:13 | i | variables.rs:442:15:442:15 | i |
+| variables.rs:445:8:445:8 | b | variables.rs:445:8:445:8 | b | variables.rs:449:8:449:8 | b |
+| variables.rs:446:9:446:13 | x | variables.rs:446:13:446:13 | x | variables.rs:447:15:447:15 | x |
+| variables.rs:446:9:446:13 | x | variables.rs:446:13:446:13 | x | variables.rs:448:15:448:15 | x |
+| variables.rs:449:5:457:5 | phi | variables.rs:446:13:446:13 | x | variables.rs:458:15:458:15 | x |
+| variables.rs:450:9:450:9 | x | variables.rs:446:13:446:13 | x | variables.rs:451:19:451:19 | x |
+| variables.rs:450:9:450:9 | x | variables.rs:446:13:446:13 | x | variables.rs:452:19:452:19 | x |
+| variables.rs:454:9:454:9 | x | variables.rs:446:13:446:13 | x | variables.rs:455:19:455:19 | x |
+| variables.rs:454:9:454:9 | x | variables.rs:446:13:446:13 | x | variables.rs:456:19:456:19 | x |
+| variables.rs:461:13:461:14 | b1 | variables.rs:461:13:461:14 | b1 | variables.rs:463:8:463:9 | b1 |
+| variables.rs:461:24:461:25 | b2 | variables.rs:461:24:461:25 | b2 | variables.rs:469:8:469:9 | b2 |
+| variables.rs:462:9:462:9 | x | variables.rs:462:9:462:9 | x | variables.rs:464:19:464:19 | x |
+| variables.rs:462:9:462:9 | x | variables.rs:462:9:462:9 | x | variables.rs:466:19:466:19 | x |
+| variables.rs:462:9:462:9 | x | variables.rs:462:9:462:9 | x | variables.rs:470:19:470:19 | x |
+| variables.rs:462:9:462:9 | x | variables.rs:462:9:462:9 | x | variables.rs:472:19:472:19 | x |
+| variables.rs:497:9:497:9 | x | variables.rs:497:9:497:9 | x | variables.rs:499:15:499:15 | x |
+firstRead
+| variables.rs:3:14:3:14 | s | variables.rs:3:14:3:14 | s | variables.rs:4:20:4:20 | s |
+| variables.rs:7:14:7:14 | i | variables.rs:7:14:7:14 | i | variables.rs:8:20:8:20 | i |
+| variables.rs:11:18:11:18 | i | variables.rs:11:18:11:18 | i | variables.rs:12:16:12:16 | i |
+| variables.rs:16:9:16:10 | x1 | variables.rs:16:9:16:10 | x1 | variables.rs:17:15:17:16 | x1 |
+| variables.rs:21:9:21:14 | x2 | variables.rs:21:13:21:14 | x2 | variables.rs:22:15:22:16 | x2 |
+| variables.rs:23:5:23:6 | x2 | variables.rs:21:13:21:14 | x2 | variables.rs:24:15:24:16 | x2 |
+| variables.rs:35:9:35:10 | x3 | variables.rs:35:9:35:10 | x3 | variables.rs:36:15:36:16 | x3 |
+| variables.rs:37:9:37:10 | x3 | variables.rs:37:9:37:10 | x3 | variables.rs:39:15:39:16 | x3 |
+| variables.rs:43:9:43:10 | x4 | variables.rs:43:9:43:10 | x4 | variables.rs:44:15:44:16 | x4 |
+| variables.rs:46:13:46:14 | x4 | variables.rs:46:13:46:14 | x4 | variables.rs:47:19:47:20 | x4 |
+| variables.rs:60:13:60:14 | a1 | variables.rs:60:13:60:14 | a1 | variables.rs:68:15:68:16 | a1 |
+| variables.rs:61:13:61:14 | b1 | variables.rs:61:13:61:14 | b1 | variables.rs:69:15:69:16 | b1 |
+| variables.rs:64:13:64:13 | x | variables.rs:64:13:64:13 | x | variables.rs:70:15:70:15 | x |
+| variables.rs:65:13:65:13 | y | variables.rs:65:13:65:13 | y | variables.rs:71:15:71:15 | y |
+| variables.rs:75:9:75:10 | p1 | variables.rs:75:9:75:10 | p1 | variables.rs:79:9:79:10 | p1 |
+| variables.rs:77:12:77:13 | a2 | variables.rs:77:12:77:13 | a2 | variables.rs:80:15:80:16 | a2 |
+| variables.rs:78:12:78:13 | b2 | variables.rs:78:12:78:13 | b2 | variables.rs:81:15:81:16 | b2 |
+| variables.rs:85:9:85:10 | s1 | variables.rs:85:9:85:10 | s1 | variables.rs:88:11:88:12 | s1 |
+| variables.rs:87:17:87:22 | s2 | variables.rs:87:21:87:22 | s2 | variables.rs:89:19:89:20 | s2 |
+| variables.rs:94:14:94:15 | x5 | variables.rs:94:14:94:15 | x5 | variables.rs:98:15:98:16 | x5 |
+| variables.rs:102:9:102:10 | s1 | variables.rs:102:9:102:10 | s1 | variables.rs:105:11:105:12 | s1 |
+| variables.rs:104:20:104:25 | s2 | variables.rs:104:24:104:25 | s2 | variables.rs:106:19:106:20 | s2 |
+| variables.rs:111:9:111:10 | x6 | variables.rs:111:9:111:10 | x6 | variables.rs:114:11:114:12 | x6 |
+| variables.rs:112:9:112:10 | y1 | variables.rs:112:9:112:10 | y1 | variables.rs:124:15:124:16 | y1 |
+| variables.rs:116:14:116:15 | y1 | variables.rs:116:14:116:15 | y1 | variables.rs:119:23:119:24 | y1 |
+| variables.rs:128:9:128:15 | numbers | variables.rs:128:9:128:15 | numbers | variables.rs:130:11:130:17 | numbers |
+| variables.rs:132:13:132:17 | first | variables.rs:132:13:132:17 | first | variables.rs:136:23:136:27 | first |
+| variables.rs:133:13:133:17 | third | variables.rs:133:13:133:17 | third | variables.rs:137:23:137:27 | third |
+| variables.rs:134:13:134:17 | fifth | variables.rs:134:13:134:17 | fifth | variables.rs:138:23:138:27 | fifth |
+| variables.rs:144:13:144:17 | first | variables.rs:144:13:144:17 | first | variables.rs:148:23:148:27 | first |
+| variables.rs:146:13:146:16 | last | variables.rs:146:13:146:16 | last | variables.rs:149:23:149:26 | last |
+| variables.rs:155:9:155:10 | p2 | variables.rs:155:9:155:10 | p2 | variables.rs:157:11:157:12 | p2 |
+| variables.rs:159:16:159:17 | x7 | variables.rs:159:16:159:17 | x7 | variables.rs:160:24:160:25 | x7 |
+| variables.rs:169:9:169:11 | msg | variables.rs:169:9:169:11 | msg | variables.rs:171:11:171:13 | msg |
+| variables.rs:173:17:173:35 | [match(true)] id_variable | variables.rs:173:17:173:27 | id_variable | variables.rs:174:24:174:34 | id_variable |
+| variables.rs:178:26:178:27 | id | variables.rs:178:26:178:27 | id | variables.rs:179:23:179:24 | id |
+| variables.rs:189:9:189:14 | either | variables.rs:189:9:189:14 | either | variables.rs:190:11:190:16 | either |
+| variables.rs:191:9:191:44 | [match(true)] phi | variables.rs:191:9:191:44 | a3 | variables.rs:192:26:192:27 | a3 |
+| variables.rs:203:9:203:10 | tv | variables.rs:203:9:203:10 | tv | variables.rs:204:11:204:12 | tv |
+| variables.rs:205:9:205:81 | [match(true)] phi | variables.rs:205:9:205:81 | a4 | variables.rs:206:26:206:27 | a4 |
+| variables.rs:209:9:209:83 | [match(true)] phi | variables.rs:209:9:209:83 | a5 | variables.rs:210:26:210:27 | a5 |
+| variables.rs:213:9:213:83 | [match(true)] phi | variables.rs:213:9:213:83 | a6 | variables.rs:214:26:214:27 | a6 |
+| variables.rs:219:9:219:14 | either | variables.rs:219:9:219:14 | either | variables.rs:220:11:220:16 | either |
+| variables.rs:221:9:221:44 | [match(true)] phi | variables.rs:221:9:221:44 | a7 | variables.rs:222:16:222:17 | a7 |
+| variables.rs:229:9:229:14 | either | variables.rs:229:9:229:14 | either | variables.rs:231:11:231:16 | either |
+| variables.rs:232:9:233:52 | [match(true)] e | variables.rs:232:13:232:13 | e | variables.rs:237:15:237:15 | e |
+| variables.rs:233:14:233:51 | [match(true)] phi | variables.rs:233:14:233:51 | a11 | variables.rs:235:23:235:25 | a11 |
+| variables.rs:236:33:236:35 | a12 | variables.rs:236:33:236:35 | a12 | variables.rs:238:28:238:30 | a12 |
+| variables.rs:253:9:253:10 | fv | variables.rs:253:9:253:10 | fv | variables.rs:254:11:254:12 | fv |
+| variables.rs:255:9:255:109 | [match(true)] phi | variables.rs:255:9:255:109 | a13 | variables.rs:256:26:256:28 | a13 |
+| variables.rs:261:5:261:6 | a8 | variables.rs:261:5:261:6 | a8 | variables.rs:266:15:266:16 | a8 |
+| variables.rs:263:9:263:10 | b3 | variables.rs:263:9:263:10 | b3 | variables.rs:267:15:267:16 | b3 |
+| variables.rs:264:9:264:10 | c1 | variables.rs:264:9:264:10 | c1 | variables.rs:268:15:268:16 | c1 |
+| variables.rs:272:6:272:41 | [match(true)] phi | variables.rs:272:6:272:41 | a9 | variables.rs:274:15:274:16 | a9 |
+| variables.rs:279:9:279:15 | a10 | variables.rs:279:13:279:15 | a10 | variables.rs:283:15:283:17 | a10 |
+| variables.rs:280:9:280:14 | b4 | variables.rs:280:13:280:14 | b4 | variables.rs:284:15:284:16 | b4 |
+| variables.rs:281:9:281:14 | c2 | variables.rs:281:13:281:14 | c2 | variables.rs:285:15:285:16 | c2 |
+| variables.rs:288:9:288:10 | c2 | variables.rs:281:13:281:14 | c2 | variables.rs:294:9:294:10 | c2 |
+| variables.rs:289:9:289:10 | b4 | variables.rs:280:13:280:14 | b4 | variables.rs:293:9:293:10 | b4 |
+| variables.rs:290:9:290:11 | a10 | variables.rs:279:13:279:15 | a10 | variables.rs:292:9:292:11 | a10 |
+| variables.rs:302:13:302:15 | a10 | variables.rs:302:13:302:15 | a10 | variables.rs:305:23:305:25 | a10 |
+| variables.rs:303:13:303:14 | b4 | variables.rs:303:13:303:14 | b4 | variables.rs:306:23:306:24 | b4 |
+| variables.rs:315:9:315:23 | example_closure | variables.rs:315:9:315:23 | example_closure | variables.rs:319:9:319:23 | example_closure |
+| variables.rs:316:10:316:10 | x | variables.rs:316:10:316:10 | x | variables.rs:317:9:317:9 | x |
+| variables.rs:318:9:318:10 | n1 | variables.rs:318:9:318:10 | n1 | variables.rs:320:15:320:16 | n1 |
+| variables.rs:323:9:323:26 | immutable_variable | variables.rs:323:9:323:26 | immutable_variable | variables.rs:327:9:327:26 | immutable_variable |
+| variables.rs:324:10:324:10 | x | variables.rs:324:10:324:10 | x | variables.rs:325:9:325:9 | x |
+| variables.rs:326:9:326:10 | n2 | variables.rs:326:9:326:10 | n2 | variables.rs:328:15:328:16 | n2 |
+| variables.rs:332:9:332:9 | v | variables.rs:332:9:332:9 | v | variables.rs:335:12:335:12 | v |
+| variables.rs:334:9:334:12 | text | variables.rs:334:9:334:12 | text | variables.rs:336:19:336:22 | text |
+| variables.rs:350:9:350:13 | ref_i | variables.rs:350:9:350:13 | ref_i | variables.rs:352:6:352:10 | ref_i |
+| variables.rs:356:17:356:17 | x | variables.rs:356:17:356:17 | x | variables.rs:357:6:357:6 | x |
+| variables.rs:363:22:363:22 | x | variables.rs:363:22:363:22 | x | variables.rs:364:6:364:6 | x |
+| variables.rs:363:39:363:39 | y | variables.rs:363:39:363:39 | y | variables.rs:367:6:367:6 | y |
+| variables.rs:373:9:373:9 | y | variables.rs:373:9:373:9 | y | variables.rs:375:6:375:6 | y |
+| variables.rs:380:9:380:9 | w | variables.rs:380:9:380:9 | w | variables.rs:384:9:384:9 | w |
+| variables.rs:393:9:393:9 | y | variables.rs:393:9:393:9 | y | variables.rs:395:6:395:6 | y |
+| variables.rs:400:9:400:9 | x | variables.rs:400:9:400:9 | x | variables.rs:406:15:406:15 | x |
+| variables.rs:402:9:402:11 | cap | variables.rs:402:9:402:11 | cap | variables.rs:405:5:405:7 | cap |
+| variables.rs:402:15:404:5 | <captured entry> x | variables.rs:400:9:400:9 | x | variables.rs:403:19:403:19 | x |
+| variables.rs:410:9:410:13 | x | variables.rs:410:13:410:13 | x | variables.rs:416:15:416:15 | x |
+| variables.rs:412:9:412:16 | closure1 | variables.rs:412:9:412:16 | closure1 | variables.rs:415:5:415:12 | closure1 |
+| variables.rs:412:20:414:5 | <captured entry> x | variables.rs:410:13:410:13 | x | variables.rs:413:19:413:19 | x |
+| variables.rs:420:9:420:20 | closure2 | variables.rs:420:13:420:20 | closure2 | variables.rs:423:5:423:12 | closure2 |
+| variables.rs:423:5:423:14 | CallExpr | variables.rs:418:13:418:13 | y | variables.rs:424:15:424:15 | y |
+| variables.rs:428:9:428:20 | closure3 | variables.rs:428:13:428:20 | closure3 | variables.rs:431:5:431:12 | closure3 |
+| variables.rs:437:9:437:13 | block | variables.rs:437:9:437:13 | block | variables.rs:441:5:441:9 | block |
+| variables.rs:441:5:441:15 | AwaitExpr | variables.rs:436:13:436:13 | i | variables.rs:442:15:442:15 | i |
+| variables.rs:445:8:445:8 | b | variables.rs:445:8:445:8 | b | variables.rs:449:8:449:8 | b |
+| variables.rs:446:9:446:13 | x | variables.rs:446:13:446:13 | x | variables.rs:447:15:447:15 | x |
+| variables.rs:449:5:457:5 | phi | variables.rs:446:13:446:13 | x | variables.rs:458:15:458:15 | x |
+| variables.rs:450:9:450:9 | x | variables.rs:446:13:446:13 | x | variables.rs:451:19:451:19 | x |
+| variables.rs:454:9:454:9 | x | variables.rs:446:13:446:13 | x | variables.rs:455:19:455:19 | x |
+| variables.rs:461:13:461:14 | b1 | variables.rs:461:13:461:14 | b1 | variables.rs:463:8:463:9 | b1 |
+| variables.rs:461:24:461:25 | b2 | variables.rs:461:24:461:25 | b2 | variables.rs:469:8:469:9 | b2 |
+| variables.rs:462:9:462:9 | x | variables.rs:462:9:462:9 | x | variables.rs:464:19:464:19 | x |
+| variables.rs:462:9:462:9 | x | variables.rs:462:9:462:9 | x | variables.rs:466:19:466:19 | x |
+| variables.rs:497:9:497:9 | x | variables.rs:497:9:497:9 | x | variables.rs:499:15:499:15 | x |
+lastRead
+| variables.rs:3:14:3:14 | s | variables.rs:3:14:3:14 | s | variables.rs:4:20:4:20 | s |
+| variables.rs:7:14:7:14 | i | variables.rs:7:14:7:14 | i | variables.rs:8:20:8:20 | i |
+| variables.rs:11:18:11:18 | i | variables.rs:11:18:11:18 | i | variables.rs:12:16:12:16 | i |
+| variables.rs:16:9:16:10 | x1 | variables.rs:16:9:16:10 | x1 | variables.rs:17:15:17:16 | x1 |
+| variables.rs:21:9:21:14 | x2 | variables.rs:21:13:21:14 | x2 | variables.rs:22:15:22:16 | x2 |
+| variables.rs:23:5:23:6 | x2 | variables.rs:21:13:21:14 | x2 | variables.rs:24:15:24:16 | x2 |
+| variables.rs:35:9:35:10 | x3 | variables.rs:35:9:35:10 | x3 | variables.rs:38:9:38:10 | x3 |
+| variables.rs:37:9:37:10 | x3 | variables.rs:37:9:37:10 | x3 | variables.rs:39:15:39:16 | x3 |
+| variables.rs:43:9:43:10 | x4 | variables.rs:43:9:43:10 | x4 | variables.rs:49:15:49:16 | x4 |
+| variables.rs:46:13:46:14 | x4 | variables.rs:46:13:46:14 | x4 | variables.rs:47:19:47:20 | x4 |
+| variables.rs:60:13:60:14 | a1 | variables.rs:60:13:60:14 | a1 | variables.rs:68:15:68:16 | a1 |
+| variables.rs:61:13:61:14 | b1 | variables.rs:61:13:61:14 | b1 | variables.rs:69:15:69:16 | b1 |
+| variables.rs:64:13:64:13 | x | variables.rs:64:13:64:13 | x | variables.rs:70:15:70:15 | x |
+| variables.rs:65:13:65:13 | y | variables.rs:65:13:65:13 | y | variables.rs:71:15:71:15 | y |
+| variables.rs:75:9:75:10 | p1 | variables.rs:75:9:75:10 | p1 | variables.rs:79:9:79:10 | p1 |
+| variables.rs:77:12:77:13 | a2 | variables.rs:77:12:77:13 | a2 | variables.rs:80:15:80:16 | a2 |
+| variables.rs:78:12:78:13 | b2 | variables.rs:78:12:78:13 | b2 | variables.rs:81:15:81:16 | b2 |
+| variables.rs:85:9:85:10 | s1 | variables.rs:85:9:85:10 | s1 | variables.rs:88:11:88:12 | s1 |
+| variables.rs:87:17:87:22 | s2 | variables.rs:87:21:87:22 | s2 | variables.rs:89:19:89:20 | s2 |
+| variables.rs:94:14:94:15 | x5 | variables.rs:94:14:94:15 | x5 | variables.rs:98:15:98:16 | x5 |
+| variables.rs:102:9:102:10 | s1 | variables.rs:102:9:102:10 | s1 | variables.rs:105:11:105:12 | s1 |
+| variables.rs:104:20:104:25 | s2 | variables.rs:104:24:104:25 | s2 | variables.rs:106:19:106:20 | s2 |
+| variables.rs:111:9:111:10 | x6 | variables.rs:111:9:111:10 | x6 | variables.rs:114:11:114:12 | x6 |
+| variables.rs:112:9:112:10 | y1 | variables.rs:112:9:112:10 | y1 | variables.rs:124:15:124:16 | y1 |
+| variables.rs:116:14:116:15 | y1 | variables.rs:116:14:116:15 | y1 | variables.rs:119:23:119:24 | y1 |
+| variables.rs:128:9:128:15 | numbers | variables.rs:128:9:128:15 | numbers | variables.rs:142:11:142:17 | numbers |
+| variables.rs:132:13:132:17 | first | variables.rs:132:13:132:17 | first | variables.rs:136:23:136:27 | first |
+| variables.rs:133:13:133:17 | third | variables.rs:133:13:133:17 | third | variables.rs:137:23:137:27 | third |
+| variables.rs:134:13:134:17 | fifth | variables.rs:134:13:134:17 | fifth | variables.rs:138:23:138:27 | fifth |
+| variables.rs:144:13:144:17 | first | variables.rs:144:13:144:17 | first | variables.rs:148:23:148:27 | first |
+| variables.rs:146:13:146:16 | last | variables.rs:146:13:146:16 | last | variables.rs:149:23:149:26 | last |
+| variables.rs:155:9:155:10 | p2 | variables.rs:155:9:155:10 | p2 | variables.rs:157:11:157:12 | p2 |
+| variables.rs:159:16:159:17 | x7 | variables.rs:159:16:159:17 | x7 | variables.rs:160:24:160:25 | x7 |
+| variables.rs:169:9:169:11 | msg | variables.rs:169:9:169:11 | msg | variables.rs:171:11:171:13 | msg |
+| variables.rs:173:17:173:35 | [match(true)] id_variable | variables.rs:173:17:173:27 | id_variable | variables.rs:174:24:174:34 | id_variable |
+| variables.rs:178:26:178:27 | id | variables.rs:178:26:178:27 | id | variables.rs:179:23:179:24 | id |
+| variables.rs:189:9:189:14 | either | variables.rs:189:9:189:14 | either | variables.rs:190:11:190:16 | either |
+| variables.rs:191:9:191:44 | [match(true)] phi | variables.rs:191:9:191:44 | a3 | variables.rs:192:26:192:27 | a3 |
+| variables.rs:203:9:203:10 | tv | variables.rs:203:9:203:10 | tv | variables.rs:212:11:212:12 | tv |
+| variables.rs:205:9:205:81 | [match(true)] phi | variables.rs:205:9:205:81 | a4 | variables.rs:206:26:206:27 | a4 |
+| variables.rs:209:9:209:83 | [match(true)] phi | variables.rs:209:9:209:83 | a5 | variables.rs:210:26:210:27 | a5 |
+| variables.rs:213:9:213:83 | [match(true)] phi | variables.rs:213:9:213:83 | a6 | variables.rs:214:26:214:27 | a6 |
+| variables.rs:219:9:219:14 | either | variables.rs:219:9:219:14 | either | variables.rs:220:11:220:16 | either |
+| variables.rs:221:9:221:44 | [match(true)] phi | variables.rs:221:9:221:44 | a7 | variables.rs:222:16:222:17 | a7 |
+| variables.rs:221:9:221:44 | [match(true)] phi | variables.rs:221:9:221:44 | a7 | variables.rs:223:26:223:27 | a7 |
+| variables.rs:229:9:229:14 | either | variables.rs:229:9:229:14 | either | variables.rs:231:11:231:16 | either |
+| variables.rs:232:9:233:52 | [match(true)] e | variables.rs:232:13:232:13 | e | variables.rs:237:15:237:15 | e |
+| variables.rs:233:14:233:51 | [match(true)] phi | variables.rs:233:14:233:51 | a11 | variables.rs:235:23:235:25 | a11 |
+| variables.rs:236:33:236:35 | a12 | variables.rs:236:33:236:35 | a12 | variables.rs:238:28:238:30 | a12 |
+| variables.rs:253:9:253:10 | fv | variables.rs:253:9:253:10 | fv | variables.rs:254:11:254:12 | fv |
+| variables.rs:255:9:255:109 | [match(true)] phi | variables.rs:255:9:255:109 | a13 | variables.rs:256:26:256:28 | a13 |
+| variables.rs:261:5:261:6 | a8 | variables.rs:261:5:261:6 | a8 | variables.rs:266:15:266:16 | a8 |
+| variables.rs:263:9:263:10 | b3 | variables.rs:263:9:263:10 | b3 | variables.rs:267:15:267:16 | b3 |
+| variables.rs:264:9:264:10 | c1 | variables.rs:264:9:264:10 | c1 | variables.rs:268:15:268:16 | c1 |
+| variables.rs:272:6:272:41 | [match(true)] phi | variables.rs:272:6:272:41 | a9 | variables.rs:274:15:274:16 | a9 |
+| variables.rs:279:9:279:15 | a10 | variables.rs:279:13:279:15 | a10 | variables.rs:283:15:283:17 | a10 |
+| variables.rs:280:9:280:14 | b4 | variables.rs:280:13:280:14 | b4 | variables.rs:284:15:284:16 | b4 |
+| variables.rs:281:9:281:14 | c2 | variables.rs:281:13:281:14 | c2 | variables.rs:285:15:285:16 | c2 |
+| variables.rs:288:9:288:10 | c2 | variables.rs:281:13:281:14 | c2 | variables.rs:298:15:298:16 | c2 |
+| variables.rs:289:9:289:10 | b4 | variables.rs:280:13:280:14 | b4 | variables.rs:311:15:311:16 | b4 |
+| variables.rs:290:9:290:11 | a10 | variables.rs:279:13:279:15 | a10 | variables.rs:310:15:310:17 | a10 |
+| variables.rs:302:13:302:15 | a10 | variables.rs:302:13:302:15 | a10 | variables.rs:305:23:305:25 | a10 |
+| variables.rs:303:13:303:14 | b4 | variables.rs:303:13:303:14 | b4 | variables.rs:306:23:306:24 | b4 |
+| variables.rs:315:9:315:23 | example_closure | variables.rs:315:9:315:23 | example_closure | variables.rs:319:9:319:23 | example_closure |
+| variables.rs:316:10:316:10 | x | variables.rs:316:10:316:10 | x | variables.rs:317:9:317:9 | x |
+| variables.rs:318:9:318:10 | n1 | variables.rs:318:9:318:10 | n1 | variables.rs:320:15:320:16 | n1 |
+| variables.rs:323:9:323:26 | immutable_variable | variables.rs:323:9:323:26 | immutable_variable | variables.rs:327:9:327:26 | immutable_variable |
+| variables.rs:324:10:324:10 | x | variables.rs:324:10:324:10 | x | variables.rs:325:9:325:9 | x |
+| variables.rs:326:9:326:10 | n2 | variables.rs:326:9:326:10 | n2 | variables.rs:328:15:328:16 | n2 |
+| variables.rs:332:9:332:9 | v | variables.rs:332:9:332:9 | v | variables.rs:335:12:335:12 | v |
+| variables.rs:334:9:334:12 | text | variables.rs:334:9:334:12 | text | variables.rs:336:19:336:22 | text |
+| variables.rs:350:9:350:13 | ref_i | variables.rs:350:9:350:13 | ref_i | variables.rs:352:6:352:10 | ref_i |
+| variables.rs:356:17:356:17 | x | variables.rs:356:17:356:17 | x | variables.rs:360:12:360:12 | x |
+| variables.rs:363:22:363:22 | x | variables.rs:363:22:363:22 | x | variables.rs:368:9:368:9 | x |
+| variables.rs:363:39:363:39 | y | variables.rs:363:39:363:39 | y | variables.rs:367:6:367:6 | y |
+| variables.rs:373:9:373:9 | y | variables.rs:373:9:373:9 | y | variables.rs:375:6:375:6 | y |
+| variables.rs:380:9:380:9 | w | variables.rs:380:9:380:9 | w | variables.rs:386:7:386:7 | w |
+| variables.rs:393:9:393:9 | y | variables.rs:393:9:393:9 | y | variables.rs:395:6:395:6 | y |
+| variables.rs:400:9:400:9 | x | variables.rs:400:9:400:9 | x | variables.rs:406:15:406:15 | x |
+| variables.rs:402:9:402:11 | cap | variables.rs:402:9:402:11 | cap | variables.rs:405:5:405:7 | cap |
+| variables.rs:402:15:404:5 | <captured entry> x | variables.rs:400:9:400:9 | x | variables.rs:403:19:403:19 | x |
+| variables.rs:410:9:410:13 | x | variables.rs:410:13:410:13 | x | variables.rs:416:15:416:15 | x |
+| variables.rs:412:9:412:16 | closure1 | variables.rs:412:9:412:16 | closure1 | variables.rs:415:5:415:12 | closure1 |
+| variables.rs:412:20:414:5 | <captured entry> x | variables.rs:410:13:410:13 | x | variables.rs:413:19:413:19 | x |
+| variables.rs:420:9:420:20 | closure2 | variables.rs:420:13:420:20 | closure2 | variables.rs:423:5:423:12 | closure2 |
+| variables.rs:423:5:423:14 | CallExpr | variables.rs:418:13:418:13 | y | variables.rs:424:15:424:15 | y |
+| variables.rs:428:9:428:20 | closure3 | variables.rs:428:13:428:20 | closure3 | variables.rs:431:5:431:12 | closure3 |
+| variables.rs:437:9:437:13 | block | variables.rs:437:9:437:13 | block | variables.rs:441:5:441:9 | block |
+| variables.rs:441:5:441:15 | AwaitExpr | variables.rs:436:13:436:13 | i | variables.rs:442:15:442:15 | i |
+| variables.rs:445:8:445:8 | b | variables.rs:445:8:445:8 | b | variables.rs:449:8:449:8 | b |
+| variables.rs:446:9:446:13 | x | variables.rs:446:13:446:13 | x | variables.rs:448:15:448:15 | x |
+| variables.rs:449:5:457:5 | phi | variables.rs:446:13:446:13 | x | variables.rs:458:15:458:15 | x |
+| variables.rs:450:9:450:9 | x | variables.rs:446:13:446:13 | x | variables.rs:452:19:452:19 | x |
+| variables.rs:454:9:454:9 | x | variables.rs:446:13:446:13 | x | variables.rs:456:19:456:19 | x |
+| variables.rs:461:13:461:14 | b1 | variables.rs:461:13:461:14 | b1 | variables.rs:463:8:463:9 | b1 |
+| variables.rs:461:24:461:25 | b2 | variables.rs:461:24:461:25 | b2 | variables.rs:469:8:469:9 | b2 |
+| variables.rs:462:9:462:9 | x | variables.rs:462:9:462:9 | x | variables.rs:470:19:470:19 | x |
+| variables.rs:462:9:462:9 | x | variables.rs:462:9:462:9 | x | variables.rs:472:19:472:19 | x |
+| variables.rs:497:9:497:9 | x | variables.rs:497:9:497:9 | x | variables.rs:499:15:499:15 | x |
+adjacentReads
+| variables.rs:35:9:35:10 | x3 | variables.rs:35:9:35:10 | x3 | variables.rs:36:15:36:16 | x3 | variables.rs:38:9:38:10 | x3 |
+| variables.rs:43:9:43:10 | x4 | variables.rs:43:9:43:10 | x4 | variables.rs:44:15:44:16 | x4 | variables.rs:49:15:49:16 | x4 |
+| variables.rs:102:9:102:10 | s1 | variables.rs:102:9:102:10 | s1 | variables.rs:105:11:105:12 | s1 | variables.rs:105:11:105:12 | s1 |
+| variables.rs:128:9:128:15 | numbers | variables.rs:128:9:128:15 | numbers | variables.rs:130:11:130:17 | numbers | variables.rs:142:11:142:17 | numbers |
+| variables.rs:203:9:203:10 | tv | variables.rs:203:9:203:10 | tv | variables.rs:204:11:204:12 | tv | variables.rs:208:11:208:12 | tv |
+| variables.rs:203:9:203:10 | tv | variables.rs:203:9:203:10 | tv | variables.rs:208:11:208:12 | tv | variables.rs:212:11:212:12 | tv |
+| variables.rs:221:9:221:44 | [match(true)] phi | variables.rs:221:9:221:44 | a7 | variables.rs:222:16:222:17 | a7 | variables.rs:223:26:223:27 | a7 |
+| variables.rs:288:9:288:10 | c2 | variables.rs:281:13:281:14 | c2 | variables.rs:294:9:294:10 | c2 | variables.rs:298:15:298:16 | c2 |
+| variables.rs:289:9:289:10 | b4 | variables.rs:280:13:280:14 | b4 | variables.rs:293:9:293:10 | b4 | variables.rs:297:15:297:16 | b4 |
+| variables.rs:289:9:289:10 | b4 | variables.rs:280:13:280:14 | b4 | variables.rs:297:15:297:16 | b4 | variables.rs:311:15:311:16 | b4 |
+| variables.rs:290:9:290:11 | a10 | variables.rs:279:13:279:15 | a10 | variables.rs:292:9:292:11 | a10 | variables.rs:296:15:296:17 | a10 |
+| variables.rs:290:9:290:11 | a10 | variables.rs:279:13:279:15 | a10 | variables.rs:296:15:296:17 | a10 | variables.rs:310:15:310:17 | a10 |
+| variables.rs:356:17:356:17 | x | variables.rs:356:17:356:17 | x | variables.rs:357:6:357:6 | x | variables.rs:358:10:358:10 | x |
+| variables.rs:356:17:356:17 | x | variables.rs:356:17:356:17 | x | variables.rs:358:10:358:10 | x | variables.rs:359:10:359:10 | x |
+| variables.rs:356:17:356:17 | x | variables.rs:356:17:356:17 | x | variables.rs:359:10:359:10 | x | variables.rs:360:12:360:12 | x |
+| variables.rs:363:22:363:22 | x | variables.rs:363:22:363:22 | x | variables.rs:364:6:364:6 | x | variables.rs:365:10:365:10 | x |
+| variables.rs:363:22:363:22 | x | variables.rs:363:22:363:22 | x | variables.rs:365:10:365:10 | x | variables.rs:366:10:366:10 | x |
+| variables.rs:363:22:363:22 | x | variables.rs:363:22:363:22 | x | variables.rs:366:10:366:10 | x | variables.rs:368:9:368:9 | x |
+| variables.rs:380:9:380:9 | w | variables.rs:380:9:380:9 | w | variables.rs:384:9:384:9 | w | variables.rs:386:7:386:7 | w |
+| variables.rs:446:9:446:13 | x | variables.rs:446:13:446:13 | x | variables.rs:447:15:447:15 | x | variables.rs:448:15:448:15 | x |
+| variables.rs:450:9:450:9 | x | variables.rs:446:13:446:13 | x | variables.rs:451:19:451:19 | x | variables.rs:452:19:452:19 | x |
+| variables.rs:454:9:454:9 | x | variables.rs:446:13:446:13 | x | variables.rs:455:19:455:19 | x | variables.rs:456:19:456:19 | x |
+| variables.rs:462:9:462:9 | x | variables.rs:462:9:462:9 | x | variables.rs:464:19:464:19 | x | variables.rs:470:19:470:19 | x |
+| variables.rs:462:9:462:9 | x | variables.rs:462:9:462:9 | x | variables.rs:464:19:464:19 | x | variables.rs:472:19:472:19 | x |
+| variables.rs:462:9:462:9 | x | variables.rs:462:9:462:9 | x | variables.rs:466:19:466:19 | x | variables.rs:470:19:470:19 | x |
+| variables.rs:462:9:462:9 | x | variables.rs:462:9:462:9 | x | variables.rs:466:19:466:19 | x | variables.rs:472:19:472:19 | x |
+phi
+| variables.rs:191:9:191:44 | [match(true)] phi | variables.rs:191:9:191:44 | a3 | variables.rs:191:22:191:23 | a3 |
+| variables.rs:191:9:191:44 | [match(true)] phi | variables.rs:191:9:191:44 | a3 | variables.rs:191:42:191:43 | a3 |
+| variables.rs:205:9:205:81 | [match(true)] phi | variables.rs:205:9:205:81 | a4 | variables.rs:205:28:205:29 | a4 |
+| variables.rs:205:9:205:81 | [match(true)] phi | variables.rs:205:9:205:81 | a4 | variables.rs:205:54:205:55 | a4 |
+| variables.rs:205:9:205:81 | [match(true)] phi | variables.rs:205:9:205:81 | a4 | variables.rs:205:79:205:80 | a4 |
+| variables.rs:209:9:209:83 | [match(true)] phi | variables.rs:209:9:209:83 | a5 | variables.rs:209:10:209:57 | [match(true)] phi |
+| variables.rs:209:9:209:83 | [match(true)] phi | variables.rs:209:9:209:83 | a5 | variables.rs:209:81:209:82 | a5 |
+| variables.rs:209:10:209:57 | [match(true)] phi | variables.rs:209:9:209:83 | a5 | variables.rs:209:29:209:30 | a5 |
+| variables.rs:209:10:209:57 | [match(true)] phi | variables.rs:209:9:209:83 | a5 | variables.rs:209:55:209:56 | a5 |
+| variables.rs:213:9:213:83 | [match(true)] phi | variables.rs:213:9:213:83 | a6 | variables.rs:213:28:213:29 | a6 |
+| variables.rs:213:9:213:83 | [match(true)] phi | variables.rs:213:9:213:83 | a6 | variables.rs:213:35:213:82 | [match(true)] phi |
+| variables.rs:213:35:213:82 | [match(true)] phi | variables.rs:213:9:213:83 | a6 | variables.rs:213:55:213:56 | a6 |
+| variables.rs:213:35:213:82 | [match(true)] phi | variables.rs:213:9:213:83 | a6 | variables.rs:213:80:213:81 | a6 |
+| variables.rs:221:9:221:44 | [match(true)] phi | variables.rs:221:9:221:44 | a7 | variables.rs:221:22:221:23 | a7 |
+| variables.rs:221:9:221:44 | [match(true)] phi | variables.rs:221:9:221:44 | a7 | variables.rs:221:42:221:43 | a7 |
+| variables.rs:233:14:233:51 | [match(true)] phi | variables.rs:233:14:233:51 | a11 | variables.rs:233:27:233:29 | a11 |
+| variables.rs:233:14:233:51 | [match(true)] phi | variables.rs:233:14:233:51 | a11 | variables.rs:233:48:233:50 | a11 |
+| variables.rs:255:9:255:109 | [match(true)] phi | variables.rs:255:9:255:109 | a13 | variables.rs:255:27:255:29 | a13 |
+| variables.rs:255:9:255:109 | [match(true)] phi | variables.rs:255:9:255:109 | a13 | variables.rs:255:35:255:82 | [match(true)] phi |
+| variables.rs:255:9:255:109 | [match(true)] phi | variables.rs:255:9:255:109 | a13 | variables.rs:255:106:255:108 | a13 |
+| variables.rs:255:35:255:82 | [match(true)] phi | variables.rs:255:9:255:109 | a13 | variables.rs:255:54:255:56 | a13 |
+| variables.rs:255:35:255:82 | [match(true)] phi | variables.rs:255:9:255:109 | a13 | variables.rs:255:79:255:81 | a13 |
+| variables.rs:272:6:272:41 | [match(true)] phi | variables.rs:272:6:272:41 | a9 | variables.rs:272:19:272:20 | a9 |
+| variables.rs:272:6:272:41 | [match(true)] phi | variables.rs:272:6:272:41 | a9 | variables.rs:272:39:272:40 | a9 |
+| variables.rs:449:5:457:5 | phi | variables.rs:446:13:446:13 | x | variables.rs:450:9:450:9 | x |
+| variables.rs:449:5:457:5 | phi | variables.rs:446:13:446:13 | x | variables.rs:454:9:454:9 | x |
+phiReadNode
+| variables.rs:104:11:105:12 | SSA phi read(s1) | variables.rs:102:9:102:10 | s1 |
+| variables.rs:463:5:467:5 | SSA phi read(x) | variables.rs:462:9:462:9 | x |
+phiReadNodeRead
+| variables.rs:104:11:105:12 | SSA phi read(s1) | variables.rs:102:9:102:10 | s1 | variables.rs:105:11:105:12 | s1 |
+| variables.rs:463:5:467:5 | SSA phi read(x) | variables.rs:462:9:462:9 | x | variables.rs:470:19:470:19 | x |
+| variables.rs:463:5:467:5 | SSA phi read(x) | variables.rs:462:9:462:9 | x | variables.rs:472:19:472:19 | x |
+phiReadInput
+| variables.rs:104:11:105:12 | SSA phi read(s1) | variables.rs:102:9:102:10 | s1 |
+| variables.rs:104:11:105:12 | SSA phi read(s1) | variables.rs:104:11:105:12 | SSA phi read(s1) |
+| variables.rs:463:5:467:5 | SSA phi read(x) | variables.rs:462:9:462:9 | x |
+ultimateDef
+| variables.rs:191:9:191:44 | [match(true)] phi | variables.rs:191:22:191:23 | a3 |
+| variables.rs:191:9:191:44 | [match(true)] phi | variables.rs:191:42:191:43 | a3 |
+| variables.rs:205:9:205:81 | [match(true)] phi | variables.rs:205:28:205:29 | a4 |
+| variables.rs:205:9:205:81 | [match(true)] phi | variables.rs:205:54:205:55 | a4 |
+| variables.rs:205:9:205:81 | [match(true)] phi | variables.rs:205:79:205:80 | a4 |
+| variables.rs:209:9:209:83 | [match(true)] phi | variables.rs:209:29:209:30 | a5 |
+| variables.rs:209:9:209:83 | [match(true)] phi | variables.rs:209:55:209:56 | a5 |
+| variables.rs:209:9:209:83 | [match(true)] phi | variables.rs:209:81:209:82 | a5 |
+| variables.rs:209:10:209:57 | [match(true)] phi | variables.rs:209:29:209:30 | a5 |
+| variables.rs:209:10:209:57 | [match(true)] phi | variables.rs:209:55:209:56 | a5 |
+| variables.rs:213:9:213:83 | [match(true)] phi | variables.rs:213:28:213:29 | a6 |
+| variables.rs:213:9:213:83 | [match(true)] phi | variables.rs:213:55:213:56 | a6 |
+| variables.rs:213:9:213:83 | [match(true)] phi | variables.rs:213:80:213:81 | a6 |
+| variables.rs:213:35:213:82 | [match(true)] phi | variables.rs:213:55:213:56 | a6 |
+| variables.rs:213:35:213:82 | [match(true)] phi | variables.rs:213:80:213:81 | a6 |
+| variables.rs:221:9:221:44 | [match(true)] phi | variables.rs:221:22:221:23 | a7 |
+| variables.rs:221:9:221:44 | [match(true)] phi | variables.rs:221:42:221:43 | a7 |
+| variables.rs:233:14:233:51 | [match(true)] phi | variables.rs:233:27:233:29 | a11 |
+| variables.rs:233:14:233:51 | [match(true)] phi | variables.rs:233:48:233:50 | a11 |
+| variables.rs:255:9:255:109 | [match(true)] phi | variables.rs:255:27:255:29 | a13 |
+| variables.rs:255:9:255:109 | [match(true)] phi | variables.rs:255:54:255:56 | a13 |
+| variables.rs:255:9:255:109 | [match(true)] phi | variables.rs:255:79:255:81 | a13 |
+| variables.rs:255:9:255:109 | [match(true)] phi | variables.rs:255:106:255:108 | a13 |
+| variables.rs:255:35:255:82 | [match(true)] phi | variables.rs:255:54:255:56 | a13 |
+| variables.rs:255:35:255:82 | [match(true)] phi | variables.rs:255:79:255:81 | a13 |
+| variables.rs:272:6:272:41 | [match(true)] phi | variables.rs:272:19:272:20 | a9 |
+| variables.rs:272:6:272:41 | [match(true)] phi | variables.rs:272:39:272:40 | a9 |
+| variables.rs:449:5:457:5 | phi | variables.rs:450:9:450:9 | x |
+| variables.rs:449:5:457:5 | phi | variables.rs:454:9:454:9 | x |
+assigns
+| variables.rs:23:5:23:6 | x2 | variables.rs:23:10:23:10 | 5 |
+| variables.rs:30:5:30:5 | x | variables.rs:30:9:30:9 | 2 |
+| variables.rs:421:9:421:9 | y | variables.rs:421:13:421:13 | 3 |
+| variables.rs:438:9:438:9 | i | variables.rs:438:13:438:13 | 1 |
+| variables.rs:450:9:450:9 | x | variables.rs:450:13:450:13 | 2 |
+| variables.rs:454:9:454:9 | x | variables.rs:454:13:454:13 | 3 |
diff --git a/rust/ql/test/library-tests/variables/Ssa.ql b/rust/ql/test/library-tests/variables/Ssa.ql
new file mode 100644
index 00000000000..750aa8f666b
--- /dev/null
+++ b/rust/ql/test/library-tests/variables/Ssa.ql
@@ -0,0 +1,52 @@
+import rust
+import codeql.rust.controlflow.BasicBlocks
+import codeql.rust.controlflow.ControlFlowGraph
+import codeql.rust.dataflow.Ssa
+import codeql.rust.dataflow.internal.SsaImpl
+import ExposedForTestingOnly
+
+query predicate nonSsaVariable(Variable v) { not v instanceof Ssa::Variable }
+
+query predicate definition(Ssa::Definition def, Variable v) { def.getSourceVariable() = v }
+
+query predicate read(Ssa::Definition def, Variable v, CfgNode read) {
+  def.getSourceVariable() = v and read = def.getARead()
+}
+
+query predicate firstRead(Ssa::Definition def, Variable v, CfgNode read) {
+  def.getSourceVariable() = v and read = def.getAFirstRead()
+}
+
+query predicate lastRead(Ssa::Definition def, Variable v, CfgNode read) {
+  def.getSourceVariable() = v and read = def.getALastRead()
+}
+
+query predicate adjacentReads(Ssa::Definition def, Variable v, CfgNode read1, CfgNode read2) {
+  def.getSourceVariable() = v and
+  def.hasAdjacentReads(read1, read2)
+}
+
+query predicate phi(Ssa::PhiDefinition phi, Variable v, Ssa::Definition input) {
+  phi.getSourceVariable() = v and input = phi.getAnInput()
+}
+
+query predicate phiReadNode(PhiReadNode phi, Variable v) { phi.getSourceVariable() = v }
+
+query predicate phiReadNodeRead(PhiReadNode phi, Variable v, CfgNode read) {
+  phi.getSourceVariable() = v and
+  exists(BasicBlock bb, int i |
+    ssaDefReachesReadExt(v, phi, bb, i) and
+    read = bb.getNode(i)
+  )
+}
+
+query predicate phiReadInput(PhiReadNode phi, DefinitionExt inp) {
+  phiHasInputFromBlockExt(phi, inp, _)
+}
+
+query predicate ultimateDef(Ssa::Definition def, Definition ult) {
+  ult = def.getAnUltimateDefinition() and
+  ult != def
+}
+
+query predicate assigns(Ssa::WriteDefinition def, CfgNode value) { def.assigns(value) }
diff --git a/rust/ql/test/library-tests/variables/variables.expected b/rust/ql/test/library-tests/variables/variables.expected
new file mode 100644
index 00000000000..6760f9bcdde
--- /dev/null
+++ b/rust/ql/test/library-tests/variables/variables.expected
@@ -0,0 +1,468 @@
+testFailures
+failures
+variable
+| variables.rs:3:14:3:14 | s |
+| variables.rs:7:14:7:14 | i |
+| variables.rs:11:18:11:18 | i |
+| variables.rs:16:9:16:10 | x1 |
+| variables.rs:21:13:21:14 | x2 |
+| variables.rs:28:13:28:13 | x |
+| variables.rs:35:9:35:10 | x3 |
+| variables.rs:37:9:37:10 | x3 |
+| variables.rs:43:9:43:10 | x4 |
+| variables.rs:46:13:46:14 | x4 |
+| variables.rs:60:13:60:14 | a1 |
+| variables.rs:61:13:61:14 | b1 |
+| variables.rs:64:13:64:13 | x |
+| variables.rs:65:13:65:13 | y |
+| variables.rs:75:9:75:10 | p1 |
+| variables.rs:77:12:77:13 | a2 |
+| variables.rs:78:12:78:13 | b2 |
+| variables.rs:85:9:85:10 | s1 |
+| variables.rs:87:21:87:22 | s2 |
+| variables.rs:94:14:94:15 | x5 |
+| variables.rs:102:9:102:10 | s1 |
+| variables.rs:104:24:104:25 | s2 |
+| variables.rs:111:9:111:10 | x6 |
+| variables.rs:112:9:112:10 | y1 |
+| variables.rs:116:14:116:15 | y1 |
+| variables.rs:128:9:128:15 | numbers |
+| variables.rs:132:13:132:17 | first |
+| variables.rs:133:13:133:17 | third |
+| variables.rs:134:13:134:17 | fifth |
+| variables.rs:144:13:144:17 | first |
+| variables.rs:146:13:146:16 | last |
+| variables.rs:155:9:155:10 | p2 |
+| variables.rs:159:16:159:17 | x7 |
+| variables.rs:169:9:169:11 | msg |
+| variables.rs:173:17:173:27 | id_variable |
+| variables.rs:178:26:178:27 | id |
+| variables.rs:189:9:189:14 | either |
+| variables.rs:191:9:191:44 | a3 |
+| variables.rs:203:9:203:10 | tv |
+| variables.rs:205:9:205:81 | a4 |
+| variables.rs:209:9:209:83 | a5 |
+| variables.rs:213:9:213:83 | a6 |
+| variables.rs:219:9:219:14 | either |
+| variables.rs:221:9:221:44 | a7 |
+| variables.rs:229:9:229:14 | either |
+| variables.rs:232:13:232:13 | e |
+| variables.rs:233:14:233:51 | a11 |
+| variables.rs:236:33:236:35 | a12 |
+| variables.rs:253:9:253:10 | fv |
+| variables.rs:255:9:255:109 | a13 |
+| variables.rs:261:5:261:6 | a8 |
+| variables.rs:263:9:263:10 | b3 |
+| variables.rs:264:9:264:10 | c1 |
+| variables.rs:272:6:272:41 | a9 |
+| variables.rs:279:13:279:15 | a10 |
+| variables.rs:280:13:280:14 | b4 |
+| variables.rs:281:13:281:14 | c2 |
+| variables.rs:302:13:302:15 | a10 |
+| variables.rs:303:13:303:14 | b4 |
+| variables.rs:315:9:315:23 | example_closure |
+| variables.rs:316:10:316:10 | x |
+| variables.rs:318:9:318:10 | n1 |
+| variables.rs:323:9:323:26 | immutable_variable |
+| variables.rs:324:10:324:10 | x |
+| variables.rs:326:9:326:10 | n2 |
+| variables.rs:332:9:332:9 | v |
+| variables.rs:334:9:334:12 | text |
+| variables.rs:341:13:341:13 | a |
+| variables.rs:349:13:349:13 | i |
+| variables.rs:350:9:350:13 | ref_i |
+| variables.rs:356:17:356:17 | x |
+| variables.rs:363:22:363:22 | x |
+| variables.rs:363:39:363:39 | y |
+| variables.rs:372:13:372:13 | x |
+| variables.rs:373:9:373:9 | y |
+| variables.rs:379:13:379:13 | z |
+| variables.rs:380:9:380:9 | w |
+| variables.rs:392:13:392:13 | x |
+| variables.rs:393:9:393:9 | y |
+| variables.rs:400:9:400:9 | x |
+| variables.rs:402:9:402:11 | cap |
+| variables.rs:410:13:410:13 | x |
+| variables.rs:412:9:412:16 | closure1 |
+| variables.rs:418:13:418:13 | y |
+| variables.rs:420:13:420:20 | closure2 |
+| variables.rs:426:13:426:13 | z |
+| variables.rs:428:13:428:20 | closure3 |
+| variables.rs:436:13:436:13 | i |
+| variables.rs:437:9:437:13 | block |
+| variables.rs:445:8:445:8 | b |
+| variables.rs:446:13:446:13 | x |
+| variables.rs:461:13:461:14 | b1 |
+| variables.rs:461:24:461:25 | b2 |
+| variables.rs:462:9:462:9 | x |
+| variables.rs:488:13:488:13 | a |
+| variables.rs:497:9:497:9 | x |
+| variables.rs:501:9:501:9 | z |
+| variables.rs:516:11:516:11 | a |
+variableAccess
+| variables.rs:4:20:4:20 | s | variables.rs:3:14:3:14 | s |
+| variables.rs:8:20:8:20 | i | variables.rs:7:14:7:14 | i |
+| variables.rs:12:16:12:16 | i | variables.rs:11:18:11:18 | i |
+| variables.rs:17:15:17:16 | x1 | variables.rs:16:9:16:10 | x1 |
+| variables.rs:22:15:22:16 | x2 | variables.rs:21:13:21:14 | x2 |
+| variables.rs:23:5:23:6 | x2 | variables.rs:21:13:21:14 | x2 |
+| variables.rs:24:15:24:16 | x2 | variables.rs:21:13:21:14 | x2 |
+| variables.rs:29:20:29:20 | x | variables.rs:28:13:28:13 | x |
+| variables.rs:30:5:30:5 | x | variables.rs:28:13:28:13 | x |
+| variables.rs:31:20:31:20 | x | variables.rs:28:13:28:13 | x |
+| variables.rs:36:15:36:16 | x3 | variables.rs:35:9:35:10 | x3 |
+| variables.rs:38:9:38:10 | x3 | variables.rs:35:9:35:10 | x3 |
+| variables.rs:39:15:39:16 | x3 | variables.rs:37:9:37:10 | x3 |
+| variables.rs:44:15:44:16 | x4 | variables.rs:43:9:43:10 | x4 |
+| variables.rs:47:19:47:20 | x4 | variables.rs:46:13:46:14 | x4 |
+| variables.rs:49:15:49:16 | x4 | variables.rs:43:9:43:10 | x4 |
+| variables.rs:68:15:68:16 | a1 | variables.rs:60:13:60:14 | a1 |
+| variables.rs:69:15:69:16 | b1 | variables.rs:61:13:61:14 | b1 |
+| variables.rs:70:15:70:15 | x | variables.rs:64:13:64:13 | x |
+| variables.rs:71:15:71:15 | y | variables.rs:65:13:65:13 | y |
+| variables.rs:79:9:79:10 | p1 | variables.rs:75:9:75:10 | p1 |
+| variables.rs:80:15:80:16 | a2 | variables.rs:77:12:77:13 | a2 |
+| variables.rs:81:15:81:16 | b2 | variables.rs:78:12:78:13 | b2 |
+| variables.rs:88:11:88:12 | s1 | variables.rs:85:9:85:10 | s1 |
+| variables.rs:89:19:89:20 | s2 | variables.rs:87:21:87:22 | s2 |
+| variables.rs:98:15:98:16 | x5 | variables.rs:94:14:94:15 | x5 |
+| variables.rs:105:11:105:12 | s1 | variables.rs:102:9:102:10 | s1 |
+| variables.rs:106:19:106:20 | s2 | variables.rs:104:24:104:25 | s2 |
+| variables.rs:114:11:114:12 | x6 | variables.rs:111:9:111:10 | x6 |
+| variables.rs:119:23:119:24 | y1 | variables.rs:116:14:116:15 | y1 |
+| variables.rs:124:15:124:16 | y1 | variables.rs:112:9:112:10 | y1 |
+| variables.rs:130:11:130:17 | numbers | variables.rs:128:9:128:15 | numbers |
+| variables.rs:136:23:136:27 | first | variables.rs:132:13:132:17 | first |
+| variables.rs:137:23:137:27 | third | variables.rs:133:13:133:17 | third |
+| variables.rs:138:23:138:27 | fifth | variables.rs:134:13:134:17 | fifth |
+| variables.rs:142:11:142:17 | numbers | variables.rs:128:9:128:15 | numbers |
+| variables.rs:148:23:148:27 | first | variables.rs:144:13:144:17 | first |
+| variables.rs:149:23:149:26 | last | variables.rs:146:13:146:16 | last |
+| variables.rs:157:11:157:12 | p2 | variables.rs:155:9:155:10 | p2 |
+| variables.rs:160:24:160:25 | x7 | variables.rs:159:16:159:17 | x7 |
+| variables.rs:171:11:171:13 | msg | variables.rs:169:9:169:11 | msg |
+| variables.rs:174:24:174:34 | id_variable | variables.rs:173:17:173:27 | id_variable |
+| variables.rs:179:23:179:24 | id | variables.rs:178:26:178:27 | id |
+| variables.rs:190:11:190:16 | either | variables.rs:189:9:189:14 | either |
+| variables.rs:192:26:192:27 | a3 | variables.rs:191:9:191:44 | a3 |
+| variables.rs:204:11:204:12 | tv | variables.rs:203:9:203:10 | tv |
+| variables.rs:206:26:206:27 | a4 | variables.rs:205:9:205:81 | a4 |
+| variables.rs:208:11:208:12 | tv | variables.rs:203:9:203:10 | tv |
+| variables.rs:210:26:210:27 | a5 | variables.rs:209:9:209:83 | a5 |
+| variables.rs:212:11:212:12 | tv | variables.rs:203:9:203:10 | tv |
+| variables.rs:214:26:214:27 | a6 | variables.rs:213:9:213:83 | a6 |
+| variables.rs:220:11:220:16 | either | variables.rs:219:9:219:14 | either |
+| variables.rs:222:16:222:17 | a7 | variables.rs:221:9:221:44 | a7 |
+| variables.rs:223:26:223:27 | a7 | variables.rs:221:9:221:44 | a7 |
+| variables.rs:231:11:231:16 | either | variables.rs:229:9:229:14 | either |
+| variables.rs:235:23:235:25 | a11 | variables.rs:233:14:233:51 | a11 |
+| variables.rs:237:15:237:15 | e | variables.rs:232:13:232:13 | e |
+| variables.rs:238:28:238:30 | a12 | variables.rs:236:33:236:35 | a12 |
+| variables.rs:254:11:254:12 | fv | variables.rs:253:9:253:10 | fv |
+| variables.rs:256:26:256:28 | a13 | variables.rs:255:9:255:109 | a13 |
+| variables.rs:266:15:266:16 | a8 | variables.rs:261:5:261:6 | a8 |
+| variables.rs:267:15:267:16 | b3 | variables.rs:263:9:263:10 | b3 |
+| variables.rs:268:15:268:16 | c1 | variables.rs:264:9:264:10 | c1 |
+| variables.rs:274:15:274:16 | a9 | variables.rs:272:6:272:41 | a9 |
+| variables.rs:283:15:283:17 | a10 | variables.rs:279:13:279:15 | a10 |
+| variables.rs:284:15:284:16 | b4 | variables.rs:280:13:280:14 | b4 |
+| variables.rs:285:15:285:16 | c2 | variables.rs:281:13:281:14 | c2 |
+| variables.rs:288:9:288:10 | c2 | variables.rs:281:13:281:14 | c2 |
+| variables.rs:289:9:289:10 | b4 | variables.rs:280:13:280:14 | b4 |
+| variables.rs:290:9:290:11 | a10 | variables.rs:279:13:279:15 | a10 |
+| variables.rs:292:9:292:11 | a10 | variables.rs:279:13:279:15 | a10 |
+| variables.rs:293:9:293:10 | b4 | variables.rs:280:13:280:14 | b4 |
+| variables.rs:294:9:294:10 | c2 | variables.rs:281:13:281:14 | c2 |
+| variables.rs:296:15:296:17 | a10 | variables.rs:279:13:279:15 | a10 |
+| variables.rs:297:15:297:16 | b4 | variables.rs:280:13:280:14 | b4 |
+| variables.rs:298:15:298:16 | c2 | variables.rs:281:13:281:14 | c2 |
+| variables.rs:305:23:305:25 | a10 | variables.rs:302:13:302:15 | a10 |
+| variables.rs:306:23:306:24 | b4 | variables.rs:303:13:303:14 | b4 |
+| variables.rs:310:15:310:17 | a10 | variables.rs:279:13:279:15 | a10 |
+| variables.rs:311:15:311:16 | b4 | variables.rs:280:13:280:14 | b4 |
+| variables.rs:317:9:317:9 | x | variables.rs:316:10:316:10 | x |
+| variables.rs:319:9:319:23 | example_closure | variables.rs:315:9:315:23 | example_closure |
+| variables.rs:320:15:320:16 | n1 | variables.rs:318:9:318:10 | n1 |
+| variables.rs:325:9:325:9 | x | variables.rs:324:10:324:10 | x |
+| variables.rs:327:9:327:26 | immutable_variable | variables.rs:323:9:323:26 | immutable_variable |
+| variables.rs:328:15:328:16 | n2 | variables.rs:326:9:326:10 | n2 |
+| variables.rs:335:12:335:12 | v | variables.rs:332:9:332:9 | v |
+| variables.rs:336:19:336:22 | text | variables.rs:334:9:334:12 | text |
+| variables.rs:342:5:342:5 | a | variables.rs:341:13:341:13 | a |
+| variables.rs:343:15:343:15 | a | variables.rs:341:13:341:13 | a |
+| variables.rs:344:11:344:11 | a | variables.rs:341:13:341:13 | a |
+| variables.rs:345:15:345:15 | a | variables.rs:341:13:341:13 | a |
+| variables.rs:351:14:351:14 | i | variables.rs:349:13:349:13 | i |
+| variables.rs:352:6:352:10 | ref_i | variables.rs:350:9:350:13 | ref_i |
+| variables.rs:353:15:353:15 | i | variables.rs:349:13:349:13 | i |
+| variables.rs:357:6:357:6 | x | variables.rs:356:17:356:17 | x |
+| variables.rs:358:10:358:10 | x | variables.rs:356:17:356:17 | x |
+| variables.rs:359:10:359:10 | x | variables.rs:356:17:356:17 | x |
+| variables.rs:360:12:360:12 | x | variables.rs:356:17:356:17 | x |
+| variables.rs:364:6:364:6 | x | variables.rs:363:22:363:22 | x |
+| variables.rs:365:10:365:10 | x | variables.rs:363:22:363:22 | x |
+| variables.rs:366:10:366:10 | x | variables.rs:363:22:363:22 | x |
+| variables.rs:367:6:367:6 | y | variables.rs:363:39:363:39 | y |
+| variables.rs:368:9:368:9 | x | variables.rs:363:22:363:22 | x |
+| variables.rs:374:27:374:27 | x | variables.rs:372:13:372:13 | x |
+| variables.rs:375:6:375:6 | y | variables.rs:373:9:373:9 | y |
+| variables.rs:377:15:377:15 | x | variables.rs:372:13:372:13 | x |
+| variables.rs:381:19:381:19 | x | variables.rs:372:13:372:13 | x |
+| variables.rs:383:14:383:14 | z | variables.rs:379:13:379:13 | z |
+| variables.rs:384:9:384:9 | w | variables.rs:380:9:380:9 | w |
+| variables.rs:386:7:386:7 | w | variables.rs:380:9:380:9 | w |
+| variables.rs:388:15:388:15 | z | variables.rs:379:13:379:13 | z |
+| variables.rs:394:14:394:14 | x | variables.rs:392:13:392:13 | x |
+| variables.rs:395:6:395:6 | y | variables.rs:393:9:393:9 | y |
+| variables.rs:396:15:396:15 | x | variables.rs:392:13:392:13 | x |
+| variables.rs:403:19:403:19 | x | variables.rs:400:9:400:9 | x |
+| variables.rs:405:5:405:7 | cap | variables.rs:402:9:402:11 | cap |
+| variables.rs:406:15:406:15 | x | variables.rs:400:9:400:9 | x |
+| variables.rs:413:19:413:19 | x | variables.rs:410:13:410:13 | x |
+| variables.rs:415:5:415:12 | closure1 | variables.rs:412:9:412:16 | closure1 |
+| variables.rs:416:15:416:15 | x | variables.rs:410:13:410:13 | x |
+| variables.rs:421:9:421:9 | y | variables.rs:418:13:418:13 | y |
+| variables.rs:423:5:423:12 | closure2 | variables.rs:420:13:420:20 | closure2 |
+| variables.rs:424:15:424:15 | y | variables.rs:418:13:418:13 | y |
+| variables.rs:429:9:429:9 | z | variables.rs:426:13:426:13 | z |
+| variables.rs:431:5:431:12 | closure3 | variables.rs:428:13:428:20 | closure3 |
+| variables.rs:432:15:432:15 | z | variables.rs:426:13:426:13 | z |
+| variables.rs:438:9:438:9 | i | variables.rs:436:13:436:13 | i |
+| variables.rs:441:5:441:9 | block | variables.rs:437:9:437:13 | block |
+| variables.rs:442:15:442:15 | i | variables.rs:436:13:436:13 | i |
+| variables.rs:447:15:447:15 | x | variables.rs:446:13:446:13 | x |
+| variables.rs:448:15:448:15 | x | variables.rs:446:13:446:13 | x |
+| variables.rs:449:8:449:8 | b | variables.rs:445:8:445:8 | b |
+| variables.rs:450:9:450:9 | x | variables.rs:446:13:446:13 | x |
+| variables.rs:451:19:451:19 | x | variables.rs:446:13:446:13 | x |
+| variables.rs:452:19:452:19 | x | variables.rs:446:13:446:13 | x |
+| variables.rs:454:9:454:9 | x | variables.rs:446:13:446:13 | x |
+| variables.rs:455:19:455:19 | x | variables.rs:446:13:446:13 | x |
+| variables.rs:456:19:456:19 | x | variables.rs:446:13:446:13 | x |
+| variables.rs:458:15:458:15 | x | variables.rs:446:13:446:13 | x |
+| variables.rs:463:8:463:9 | b1 | variables.rs:461:13:461:14 | b1 |
+| variables.rs:464:19:464:19 | x | variables.rs:462:9:462:9 | x |
+| variables.rs:466:19:466:19 | x | variables.rs:462:9:462:9 | x |
+| variables.rs:469:8:469:9 | b2 | variables.rs:461:24:461:25 | b2 |
+| variables.rs:470:19:470:19 | x | variables.rs:462:9:462:9 | x |
+| variables.rs:472:19:472:19 | x | variables.rs:462:9:462:9 | x |
+| variables.rs:489:15:489:15 | a | variables.rs:488:13:488:13 | a |
+| variables.rs:490:5:490:5 | a | variables.rs:488:13:488:13 | a |
+| variables.rs:491:15:491:15 | a | variables.rs:488:13:488:13 | a |
+| variables.rs:492:5:492:5 | a | variables.rs:488:13:488:13 | a |
+| variables.rs:493:15:493:15 | a | variables.rs:488:13:488:13 | a |
+| variables.rs:498:20:498:20 | x | variables.rs:497:9:497:9 | x |
+| variables.rs:499:15:499:15 | x | variables.rs:497:9:497:9 | x |
+| variables.rs:502:20:502:20 | z | variables.rs:501:9:501:9 | z |
+| variables.rs:517:3:517:3 | a | variables.rs:516:11:516:11 | a |
+| variables.rs:519:13:519:13 | a | variables.rs:516:11:516:11 | a |
+variableWriteAccess
+| variables.rs:23:5:23:6 | x2 | variables.rs:21:13:21:14 | x2 |
+| variables.rs:30:5:30:5 | x | variables.rs:28:13:28:13 | x |
+| variables.rs:288:9:288:10 | c2 | variables.rs:281:13:281:14 | c2 |
+| variables.rs:289:9:289:10 | b4 | variables.rs:280:13:280:14 | b4 |
+| variables.rs:290:9:290:11 | a10 | variables.rs:279:13:279:15 | a10 |
+| variables.rs:421:9:421:9 | y | variables.rs:418:13:418:13 | y |
+| variables.rs:438:9:438:9 | i | variables.rs:436:13:436:13 | i |
+| variables.rs:450:9:450:9 | x | variables.rs:446:13:446:13 | x |
+| variables.rs:454:9:454:9 | x | variables.rs:446:13:446:13 | x |
+| variables.rs:492:5:492:5 | a | variables.rs:488:13:488:13 | a |
+variableReadAccess
+| variables.rs:4:20:4:20 | s | variables.rs:3:14:3:14 | s |
+| variables.rs:8:20:8:20 | i | variables.rs:7:14:7:14 | i |
+| variables.rs:12:16:12:16 | i | variables.rs:11:18:11:18 | i |
+| variables.rs:17:15:17:16 | x1 | variables.rs:16:9:16:10 | x1 |
+| variables.rs:22:15:22:16 | x2 | variables.rs:21:13:21:14 | x2 |
+| variables.rs:24:15:24:16 | x2 | variables.rs:21:13:21:14 | x2 |
+| variables.rs:36:15:36:16 | x3 | variables.rs:35:9:35:10 | x3 |
+| variables.rs:38:9:38:10 | x3 | variables.rs:35:9:35:10 | x3 |
+| variables.rs:39:15:39:16 | x3 | variables.rs:37:9:37:10 | x3 |
+| variables.rs:44:15:44:16 | x4 | variables.rs:43:9:43:10 | x4 |
+| variables.rs:47:19:47:20 | x4 | variables.rs:46:13:46:14 | x4 |
+| variables.rs:49:15:49:16 | x4 | variables.rs:43:9:43:10 | x4 |
+| variables.rs:68:15:68:16 | a1 | variables.rs:60:13:60:14 | a1 |
+| variables.rs:69:15:69:16 | b1 | variables.rs:61:13:61:14 | b1 |
+| variables.rs:70:15:70:15 | x | variables.rs:64:13:64:13 | x |
+| variables.rs:71:15:71:15 | y | variables.rs:65:13:65:13 | y |
+| variables.rs:79:9:79:10 | p1 | variables.rs:75:9:75:10 | p1 |
+| variables.rs:80:15:80:16 | a2 | variables.rs:77:12:77:13 | a2 |
+| variables.rs:81:15:81:16 | b2 | variables.rs:78:12:78:13 | b2 |
+| variables.rs:88:11:88:12 | s1 | variables.rs:85:9:85:10 | s1 |
+| variables.rs:89:19:89:20 | s2 | variables.rs:87:21:87:22 | s2 |
+| variables.rs:98:15:98:16 | x5 | variables.rs:94:14:94:15 | x5 |
+| variables.rs:105:11:105:12 | s1 | variables.rs:102:9:102:10 | s1 |
+| variables.rs:106:19:106:20 | s2 | variables.rs:104:24:104:25 | s2 |
+| variables.rs:114:11:114:12 | x6 | variables.rs:111:9:111:10 | x6 |
+| variables.rs:119:23:119:24 | y1 | variables.rs:116:14:116:15 | y1 |
+| variables.rs:124:15:124:16 | y1 | variables.rs:112:9:112:10 | y1 |
+| variables.rs:130:11:130:17 | numbers | variables.rs:128:9:128:15 | numbers |
+| variables.rs:136:23:136:27 | first | variables.rs:132:13:132:17 | first |
+| variables.rs:137:23:137:27 | third | variables.rs:133:13:133:17 | third |
+| variables.rs:138:23:138:27 | fifth | variables.rs:134:13:134:17 | fifth |
+| variables.rs:142:11:142:17 | numbers | variables.rs:128:9:128:15 | numbers |
+| variables.rs:148:23:148:27 | first | variables.rs:144:13:144:17 | first |
+| variables.rs:149:23:149:26 | last | variables.rs:146:13:146:16 | last |
+| variables.rs:157:11:157:12 | p2 | variables.rs:155:9:155:10 | p2 |
+| variables.rs:160:24:160:25 | x7 | variables.rs:159:16:159:17 | x7 |
+| variables.rs:171:11:171:13 | msg | variables.rs:169:9:169:11 | msg |
+| variables.rs:174:24:174:34 | id_variable | variables.rs:173:17:173:27 | id_variable |
+| variables.rs:179:23:179:24 | id | variables.rs:178:26:178:27 | id |
+| variables.rs:190:11:190:16 | either | variables.rs:189:9:189:14 | either |
+| variables.rs:192:26:192:27 | a3 | variables.rs:191:9:191:44 | a3 |
+| variables.rs:204:11:204:12 | tv | variables.rs:203:9:203:10 | tv |
+| variables.rs:206:26:206:27 | a4 | variables.rs:205:9:205:81 | a4 |
+| variables.rs:208:11:208:12 | tv | variables.rs:203:9:203:10 | tv |
+| variables.rs:210:26:210:27 | a5 | variables.rs:209:9:209:83 | a5 |
+| variables.rs:212:11:212:12 | tv | variables.rs:203:9:203:10 | tv |
+| variables.rs:214:26:214:27 | a6 | variables.rs:213:9:213:83 | a6 |
+| variables.rs:220:11:220:16 | either | variables.rs:219:9:219:14 | either |
+| variables.rs:222:16:222:17 | a7 | variables.rs:221:9:221:44 | a7 |
+| variables.rs:223:26:223:27 | a7 | variables.rs:221:9:221:44 | a7 |
+| variables.rs:231:11:231:16 | either | variables.rs:229:9:229:14 | either |
+| variables.rs:235:23:235:25 | a11 | variables.rs:233:14:233:51 | a11 |
+| variables.rs:237:15:237:15 | e | variables.rs:232:13:232:13 | e |
+| variables.rs:238:28:238:30 | a12 | variables.rs:236:33:236:35 | a12 |
+| variables.rs:254:11:254:12 | fv | variables.rs:253:9:253:10 | fv |
+| variables.rs:256:26:256:28 | a13 | variables.rs:255:9:255:109 | a13 |
+| variables.rs:266:15:266:16 | a8 | variables.rs:261:5:261:6 | a8 |
+| variables.rs:267:15:267:16 | b3 | variables.rs:263:9:263:10 | b3 |
+| variables.rs:268:15:268:16 | c1 | variables.rs:264:9:264:10 | c1 |
+| variables.rs:274:15:274:16 | a9 | variables.rs:272:6:272:41 | a9 |
+| variables.rs:283:15:283:17 | a10 | variables.rs:279:13:279:15 | a10 |
+| variables.rs:284:15:284:16 | b4 | variables.rs:280:13:280:14 | b4 |
+| variables.rs:285:15:285:16 | c2 | variables.rs:281:13:281:14 | c2 |
+| variables.rs:292:9:292:11 | a10 | variables.rs:279:13:279:15 | a10 |
+| variables.rs:293:9:293:10 | b4 | variables.rs:280:13:280:14 | b4 |
+| variables.rs:294:9:294:10 | c2 | variables.rs:281:13:281:14 | c2 |
+| variables.rs:296:15:296:17 | a10 | variables.rs:279:13:279:15 | a10 |
+| variables.rs:297:15:297:16 | b4 | variables.rs:280:13:280:14 | b4 |
+| variables.rs:298:15:298:16 | c2 | variables.rs:281:13:281:14 | c2 |
+| variables.rs:305:23:305:25 | a10 | variables.rs:302:13:302:15 | a10 |
+| variables.rs:306:23:306:24 | b4 | variables.rs:303:13:303:14 | b4 |
+| variables.rs:310:15:310:17 | a10 | variables.rs:279:13:279:15 | a10 |
+| variables.rs:311:15:311:16 | b4 | variables.rs:280:13:280:14 | b4 |
+| variables.rs:317:9:317:9 | x | variables.rs:316:10:316:10 | x |
+| variables.rs:319:9:319:23 | example_closure | variables.rs:315:9:315:23 | example_closure |
+| variables.rs:320:15:320:16 | n1 | variables.rs:318:9:318:10 | n1 |
+| variables.rs:325:9:325:9 | x | variables.rs:324:10:324:10 | x |
+| variables.rs:327:9:327:26 | immutable_variable | variables.rs:323:9:323:26 | immutable_variable |
+| variables.rs:328:15:328:16 | n2 | variables.rs:326:9:326:10 | n2 |
+| variables.rs:335:12:335:12 | v | variables.rs:332:9:332:9 | v |
+| variables.rs:336:19:336:22 | text | variables.rs:334:9:334:12 | text |
+| variables.rs:343:15:343:15 | a | variables.rs:341:13:341:13 | a |
+| variables.rs:345:15:345:15 | a | variables.rs:341:13:341:13 | a |
+| variables.rs:352:6:352:10 | ref_i | variables.rs:350:9:350:13 | ref_i |
+| variables.rs:353:15:353:15 | i | variables.rs:349:13:349:13 | i |
+| variables.rs:357:6:357:6 | x | variables.rs:356:17:356:17 | x |
+| variables.rs:358:10:358:10 | x | variables.rs:356:17:356:17 | x |
+| variables.rs:359:10:359:10 | x | variables.rs:356:17:356:17 | x |
+| variables.rs:360:12:360:12 | x | variables.rs:356:17:356:17 | x |
+| variables.rs:364:6:364:6 | x | variables.rs:363:22:363:22 | x |
+| variables.rs:365:10:365:10 | x | variables.rs:363:22:363:22 | x |
+| variables.rs:366:10:366:10 | x | variables.rs:363:22:363:22 | x |
+| variables.rs:367:6:367:6 | y | variables.rs:363:39:363:39 | y |
+| variables.rs:368:9:368:9 | x | variables.rs:363:22:363:22 | x |
+| variables.rs:375:6:375:6 | y | variables.rs:373:9:373:9 | y |
+| variables.rs:377:15:377:15 | x | variables.rs:372:13:372:13 | x |
+| variables.rs:384:9:384:9 | w | variables.rs:380:9:380:9 | w |
+| variables.rs:386:7:386:7 | w | variables.rs:380:9:380:9 | w |
+| variables.rs:388:15:388:15 | z | variables.rs:379:13:379:13 | z |
+| variables.rs:395:6:395:6 | y | variables.rs:393:9:393:9 | y |
+| variables.rs:396:15:396:15 | x | variables.rs:392:13:392:13 | x |
+| variables.rs:403:19:403:19 | x | variables.rs:400:9:400:9 | x |
+| variables.rs:405:5:405:7 | cap | variables.rs:402:9:402:11 | cap |
+| variables.rs:406:15:406:15 | x | variables.rs:400:9:400:9 | x |
+| variables.rs:413:19:413:19 | x | variables.rs:410:13:410:13 | x |
+| variables.rs:415:5:415:12 | closure1 | variables.rs:412:9:412:16 | closure1 |
+| variables.rs:416:15:416:15 | x | variables.rs:410:13:410:13 | x |
+| variables.rs:423:5:423:12 | closure2 | variables.rs:420:13:420:20 | closure2 |
+| variables.rs:424:15:424:15 | y | variables.rs:418:13:418:13 | y |
+| variables.rs:429:9:429:9 | z | variables.rs:426:13:426:13 | z |
+| variables.rs:431:5:431:12 | closure3 | variables.rs:428:13:428:20 | closure3 |
+| variables.rs:432:15:432:15 | z | variables.rs:426:13:426:13 | z |
+| variables.rs:441:5:441:9 | block | variables.rs:437:9:437:13 | block |
+| variables.rs:442:15:442:15 | i | variables.rs:436:13:436:13 | i |
+| variables.rs:447:15:447:15 | x | variables.rs:446:13:446:13 | x |
+| variables.rs:448:15:448:15 | x | variables.rs:446:13:446:13 | x |
+| variables.rs:449:8:449:8 | b | variables.rs:445:8:445:8 | b |
+| variables.rs:451:19:451:19 | x | variables.rs:446:13:446:13 | x |
+| variables.rs:452:19:452:19 | x | variables.rs:446:13:446:13 | x |
+| variables.rs:455:19:455:19 | x | variables.rs:446:13:446:13 | x |
+| variables.rs:456:19:456:19 | x | variables.rs:446:13:446:13 | x |
+| variables.rs:458:15:458:15 | x | variables.rs:446:13:446:13 | x |
+| variables.rs:463:8:463:9 | b1 | variables.rs:461:13:461:14 | b1 |
+| variables.rs:464:19:464:19 | x | variables.rs:462:9:462:9 | x |
+| variables.rs:466:19:466:19 | x | variables.rs:462:9:462:9 | x |
+| variables.rs:469:8:469:9 | b2 | variables.rs:461:24:461:25 | b2 |
+| variables.rs:470:19:470:19 | x | variables.rs:462:9:462:9 | x |
+| variables.rs:472:19:472:19 | x | variables.rs:462:9:462:9 | x |
+| variables.rs:489:15:489:15 | a | variables.rs:488:13:488:13 | a |
+| variables.rs:490:5:490:5 | a | variables.rs:488:13:488:13 | a |
+| variables.rs:491:15:491:15 | a | variables.rs:488:13:488:13 | a |
+| variables.rs:493:15:493:15 | a | variables.rs:488:13:488:13 | a |
+| variables.rs:499:15:499:15 | x | variables.rs:497:9:497:9 | x |
+| variables.rs:517:3:517:3 | a | variables.rs:516:11:516:11 | a |
+| variables.rs:519:13:519:13 | a | variables.rs:516:11:516:11 | a |
+variableInitializer
+| variables.rs:16:9:16:10 | x1 | variables.rs:16:14:16:16 | "a" |
+| variables.rs:21:13:21:14 | x2 | variables.rs:21:18:21:18 | 4 |
+| variables.rs:28:13:28:13 | x | variables.rs:28:17:28:17 | 1 |
+| variables.rs:35:9:35:10 | x3 | variables.rs:35:14:35:14 | 1 |
+| variables.rs:37:9:37:10 | x3 | variables.rs:38:9:38:14 | ... + ... |
+| variables.rs:43:9:43:10 | x4 | variables.rs:43:14:43:16 | "a" |
+| variables.rs:46:13:46:14 | x4 | variables.rs:46:18:46:20 | "b" |
+| variables.rs:75:9:75:10 | p1 | variables.rs:75:14:75:37 | RecordExpr |
+| variables.rs:85:9:85:10 | s1 | variables.rs:85:14:85:41 | CallExpr |
+| variables.rs:102:9:102:10 | s1 | variables.rs:102:14:102:41 | CallExpr |
+| variables.rs:111:9:111:10 | x6 | variables.rs:111:14:111:20 | CallExpr |
+| variables.rs:112:9:112:10 | y1 | variables.rs:112:14:112:15 | 10 |
+| variables.rs:128:9:128:15 | numbers | variables.rs:128:19:128:35 | TupleExpr |
+| variables.rs:155:9:155:10 | p2 | variables.rs:155:14:155:37 | RecordExpr |
+| variables.rs:169:9:169:11 | msg | variables.rs:169:15:169:38 | RecordExpr |
+| variables.rs:189:9:189:14 | either | variables.rs:189:18:189:33 | CallExpr |
+| variables.rs:203:9:203:10 | tv | variables.rs:203:14:203:36 | CallExpr |
+| variables.rs:219:9:219:14 | either | variables.rs:219:18:219:33 | CallExpr |
+| variables.rs:229:9:229:14 | either | variables.rs:229:18:229:33 | CallExpr |
+| variables.rs:253:9:253:10 | fv | variables.rs:253:14:253:35 | CallExpr |
+| variables.rs:315:9:315:23 | example_closure | variables.rs:316:9:317:9 | ClosureExpr |
+| variables.rs:318:9:318:10 | n1 | variables.rs:319:9:319:26 | CallExpr |
+| variables.rs:323:9:323:26 | immutable_variable | variables.rs:324:9:325:9 | ClosureExpr |
+| variables.rs:326:9:326:10 | n2 | variables.rs:327:9:327:29 | CallExpr |
+| variables.rs:332:9:332:9 | v | variables.rs:332:13:332:41 | RefExpr |
+| variables.rs:341:13:341:13 | a | variables.rs:341:17:341:17 | 0 |
+| variables.rs:349:13:349:13 | i | variables.rs:349:17:349:17 | 1 |
+| variables.rs:350:9:350:13 | ref_i | variables.rs:351:9:351:14 | RefExpr |
+| variables.rs:372:13:372:13 | x | variables.rs:372:17:372:17 | 2 |
+| variables.rs:373:9:373:9 | y | variables.rs:374:9:374:28 | CallExpr |
+| variables.rs:379:13:379:13 | z | variables.rs:379:17:379:17 | 4 |
+| variables.rs:380:9:380:9 | w | variables.rs:381:9:381:19 | RefExpr |
+| variables.rs:392:13:392:13 | x | variables.rs:392:17:392:17 | 1 |
+| variables.rs:393:9:393:9 | y | variables.rs:394:9:394:14 | RefExpr |
+| variables.rs:400:9:400:9 | x | variables.rs:400:13:400:15 | 100 |
+| variables.rs:402:9:402:11 | cap | variables.rs:402:15:404:5 | ClosureExpr |
+| variables.rs:410:13:410:13 | x | variables.rs:410:17:410:17 | 1 |
+| variables.rs:412:9:412:16 | closure1 | variables.rs:412:20:414:5 | ClosureExpr |
+| variables.rs:418:13:418:13 | y | variables.rs:418:17:418:17 | 2 |
+| variables.rs:420:13:420:20 | closure2 | variables.rs:420:24:422:5 | ClosureExpr |
+| variables.rs:426:13:426:13 | z | variables.rs:426:17:426:17 | 2 |
+| variables.rs:428:13:428:20 | closure3 | variables.rs:428:24:430:5 | ClosureExpr |
+| variables.rs:436:13:436:13 | i | variables.rs:436:22:436:22 | 0 |
+| variables.rs:437:9:437:13 | block | variables.rs:437:17:439:5 | BlockExpr |
+| variables.rs:446:13:446:13 | x | variables.rs:446:17:446:17 | 1 |
+| variables.rs:462:9:462:9 | x | variables.rs:462:13:462:13 | 1 |
+| variables.rs:488:13:488:13 | a | variables.rs:488:17:488:35 | RecordExpr |
+| variables.rs:497:9:497:9 | x | variables.rs:497:13:497:14 | 16 |
+| variables.rs:501:9:501:9 | z | variables.rs:501:13:501:14 | 17 |
+| variables.rs:516:11:516:11 | a | variables.rs:516:15:516:33 | RecordExpr |
+capturedVariable
+| variables.rs:400:9:400:9 | x |
+| variables.rs:410:13:410:13 | x |
+| variables.rs:418:13:418:13 | y |
+| variables.rs:426:13:426:13 | z |
+| variables.rs:436:13:436:13 | i |
+capturedAccess
+| variables.rs:403:19:403:19 | x |
+| variables.rs:413:19:413:19 | x |
+| variables.rs:421:9:421:9 | y |
+| variables.rs:429:9:429:9 | z |
+| variables.rs:438:9:438:9 | i |
diff --git a/rust/ql/test/library-tests/variables/variables.ql b/rust/ql/test/library-tests/variables/variables.ql
new file mode 100644
index 00000000000..23eab977445
--- /dev/null
+++ b/rust/ql/test/library-tests/variables/variables.ql
@@ -0,0 +1,58 @@
+import rust
+import utils.InlineExpectationsTest
+
+query predicate variable(Variable v) { any() }
+
+query predicate variableAccess(VariableAccess va, Variable v) { v = va.getVariable() }
+
+query predicate variableWriteAccess(VariableWriteAccess va, Variable v) { v = va.getVariable() }
+
+query predicate variableReadAccess(VariableReadAccess va, Variable v) { v = va.getVariable() }
+
+query predicate variableInitializer(Variable v, Expr e) { e = v.getInitializer() }
+
+query predicate capturedVariable(Variable v) { v.isCaptured() }
+
+query predicate capturedAccess(VariableAccess va) { va.isCapture() }
+
+module VariableAccessTest implements TestSig {
+  string getARelevantTag() { result = ["", "write_", "read_"] + "access" }
+
+  private predicate declAt(Variable v, string filepath, int line) {
+    v.getLocation().hasLocationInfo(filepath, _, _, line, _)
+  }
+
+  private predicate commmentAt(string text, string filepath, int line) {
+    exists(Comment c |
+      c.getLocation().hasLocationInfo(filepath, line, _, _, _) and
+      c.getCommentText() = text
+    )
+  }
+
+  private predicate decl(Variable v, string value) {
+    exists(string filepath, int line | declAt(v, filepath, line) |
+      commmentAt(value, filepath, line)
+      or
+      not commmentAt(_, filepath, line) and
+      value = v.getName()
+    )
+  }
+
+  predicate hasActualResult(Location location, string element, string tag, string value) {
+    exists(VariableAccess va |
+      location = va.getLocation() and
+      element = va.toString() and
+      decl(va.getVariable(), value)
+    |
+      va instanceof VariableWriteAccess and tag = "write_access"
+      or
+      va instanceof VariableReadAccess and tag = "read_access"
+      or
+      not va instanceof VariableWriteAccess and
+      not va instanceof VariableReadAccess and
+      tag = "access"
+    )
+  }
+}
+
+import MakeTest<VariableAccessTest>
diff --git a/rust/ql/test/library-tests/variables/variables.rs b/rust/ql/test/library-tests/variables/variables.rs
new file mode 100644
index 00000000000..8dd00c7ebb2
--- /dev/null
+++ b/rust/ql/test/library-tests/variables/variables.rs
@@ -0,0 +1,556 @@
+use std::ops::AddAssign;
+
+fn print_str(s: &str) { // s
+    println!("{}", s); // $ read_access=s
+}
+
+fn print_i64(i: i64) { // i
+    println!("{}", i); // $ read_access=i
+}
+
+fn print_i64_ref(i: &i64) {
+    print_i64(*i) // $ read_access=i
+}
+
+fn immutable_variable() {
+    let x1 = "a"; // x1
+    print_str(x1); // $ read_access=x1
+}
+
+fn mutable_variable() {
+    let mut x2 = 4; // x2
+    print_i64(x2); // $ read_access=x2
+    x2 = 5; // $ write_access=x2
+    print_i64(x2); // $ read_access=x2
+}
+
+fn mutable_variable_immutable_borrow() {
+    let mut x = 1;
+    print_i64_ref(&x); // $ access=x
+    x = 2; // $ write_access=x
+    print_i64_ref(&x); // $ access=x
+}
+
+fn variable_shadow1() {
+    let x3 = 1; // x3_1
+    print_i64(x3); // $ read_access=x3_1
+    let x3 = // x3_2
+        x3 + 1; // $ read_access=x3_1
+    print_i64(x3); // $ read_access=x3_2
+}
+
+fn variable_shadow2() {
+    let x4 = "a"; // x4_1
+    print_str(x4); // $ read_access=x4_1
+    {
+        let x4 = "b"; // x4_2
+        print_str(x4); // $ read_access=x4_2
+    }
+    print_str(x4); // $ read_access=x4_1
+}
+
+struct Point<'a> {
+    x: &'a str,
+    y: &'a str,
+}
+
+fn let_pattern1() {
+    let (
+        (
+            a1, // a1
+            b1, // b1
+        ),
+        Point {
+            x, // x
+            y, // y
+        },
+    ) = (("a", "b"), Point { x: "x", y: "y" });
+    print_str(a1); // $ read_access=a1
+    print_str(b1); // $ read_access=b1
+    print_str(x); // $ read_access=x
+    print_str(y); // $ read_access=y
+}
+
+fn let_pattern2() {
+    let p1 = Point { x: "a", y: "b" }; // p1
+    let Point {
+        x: a2, // a2
+        y: b2, // b2
+    } = p1; // $ read_access=p1
+    print_str(a2); // $ read_access=a2
+    print_str(b2); // $ read_access=b2
+}
+
+fn let_pattern3() {
+    let s1 = Some(String::from("Hello!")); // s1
+
+    if let Some(ref s2) // s2
+        = s1 { // $ read_access=s1
+        print_str(s2); // $ read_access=s2
+    }
+}
+
+fn let_pattern4() {
+    let Some(x5): Option<&str> = Some("x5") // x5
+        else {
+            todo!()
+        };
+    print_str(x5); // $ read_access=x5
+}
+
+fn let_pattern5() {
+    let s1 = Some(String::from("Hello!")); // s1
+
+    while let Some(ref s2) // s2
+        = s1 { // $ read_access=s1
+        print_str(s2); // $ read_access=s2
+    }
+}
+
+fn match_pattern1() {
+    let x6 = Some(5); // x6
+    let y1 = 10; // y1_1
+
+    match x6 { // $ read_access=x6
+        Some(50) => print_str("Got 50"),
+        Some(y1) // y1_2
+        =>
+        {
+            print_i64(y1)// $ read_access=y1_2
+        } 
+        None => print_str("NONE"),
+    }
+
+    print_i64(y1); // $ read_access=y1_1
+}
+
+fn match_pattern2() {
+    let numbers = (2, 4, 8, 16, 32); // numbers
+
+    match numbers { // $ read_access=numbers
+        (
+            first, _, // first
+            third, _, // third
+            fifth // fifth
+        ) => {
+            print_i64(first); // $ read_access=first
+            print_i64(third); // $ read_access=third
+            print_i64(fifth); // $ read_access=fifth
+        }
+    }
+
+    match numbers { // $ read_access=numbers
+        (
+            first, // first
+            ..,
+            last // last
+        ) => {
+            print_i64(first); // $ read_access=first
+            print_i64(last); // $ read_access=last
+        }
+    }
+}
+
+fn match_pattern3() {
+    let p2 = Point { x: "x", y: "y" }; // p2
+
+    match p2 { // $ read_access=p2
+        Point {
+            x: x7, .. // x7
+        } => print_str(x7), // $ read_access=x7
+    }
+}
+
+enum Message {
+    Hello { id: i64 },
+}
+
+fn match_pattern4() {
+    let msg = Message::Hello { id: 0 }; // msg
+
+    match msg { // $ read_access=msg
+        Message::Hello {
+            id: id_variable @ 3..=7, // id_variable
+        } => print_i64(id_variable), // $ read_access=id_variable
+        Message::Hello { id: 10..=12 } => {
+            println!("Found an id in another range")
+        }
+        Message::Hello { id } => // id
+            print_i64(id), // $ read_access=id
+    }
+}
+
+enum Either {
+    Left(i64),
+    Right(i64),
+}
+
+fn match_pattern5() {
+    let either = Either::Left(32); // either
+    match either { // $ read_access=either
+        Either::Left(a3) | Either::Right(a3) // a3
+            => print_i64(a3), // $ read_access=a3
+    }
+}
+
+enum ThreeValued {
+    First(i64),
+    Second(i64),
+    Third(i64),
+}
+
+fn match_pattern6() {
+    let tv = ThreeValued::Second(62); // tv
+    match tv { // $ read_access=tv
+        ThreeValued::First(a4) | ThreeValued::Second(a4) | ThreeValued::Third(a4) // a4
+            => print_i64(a4), // $ read_access=a4
+    }
+    match tv { // $ read_access=tv
+        (ThreeValued::First(a5) | ThreeValued::Second(a5)) | ThreeValued::Third(a5) // a5
+            => print_i64(a5), // $ read_access=a5
+    }
+    match tv { // $ read_access=tv
+        ThreeValued::First(a6) | (ThreeValued::Second(a6) | ThreeValued::Third(a6)) // a6
+            => print_i64(a6), // $ read_access=a6
+    }
+}
+
+fn match_pattern7() {
+    let either = Either::Left(32); // either
+    match either { // $ read_access=either
+        Either::Left(a7) | Either::Right(a7) // a7
+            if a7 > 0 // $ read_access=a7
+            => print_i64(a7), // $ read_access=a7
+        _ => (),
+    }
+}
+
+fn match_pattern8() {
+    let either = Either::Left(32); // either
+
+    match either { // $ read_access=either
+        ref e @ // e
+            (Either::Left(a11) | Either::Right(a11)) // a11
+        => {
+            print_i64(a11); // $ read_access=a11
+            if let Either::Left(a12) // a12
+            = e { // $ read_access=e
+                print_i64(*a12); // $ read_access=a12
+            }
+        }
+        _ => (),
+    }
+}
+
+enum FourValued {
+    First(i64),
+    Second(i64),
+    Third(i64),
+    Fourth(i64),
+}
+
+fn match_pattern9() {
+    let fv = FourValued::Second(62); // tv
+    match fv { // $ read_access=tv
+        FourValued::First(a13) | (FourValued::Second(a13) | FourValued::Third(a13)) | FourValued::Fourth(a13) // a13
+            => print_i64(a13), // $ read_access=a13
+    }
+}
+
+fn param_pattern1(
+    a8: &str, // a8
+    (
+        b3, // b3
+        c1, // c1
+    ): (&str, &str)) -> () {
+    print_str(a8); // $ read_access=a8
+    print_str(b3); // $ read_access=b3
+    print_str(c1); // $ read_access=c1
+}
+
+fn param_pattern2(
+    (Either::Left(a9) | Either::Right(a9)): Either // a9
+) -> () {
+    print_i64(a9); // $ read_access=a9
+}
+
+fn destruct_assignment() {
+    let (
+        mut a10, // a10
+        mut b4, // b4
+        mut c2 // c2
+    ) = (1, 2, 3);
+    print_i64(a10); // $ read_access=a10
+    print_i64(b4); // $ read_access=b4
+    print_i64(c2); // $ read_access=c2
+
+    (
+        c2, // $ write_access=c2
+        b4, // $ write_access=b4
+        a10 // $ write_access=a10
+    ) = (
+        a10, // $ read_access=a10
+        b4, // $ read_access=b4
+        c2 // $ read_access=c2
+    );
+    print_i64(a10); // $ read_access=a10
+    print_i64(b4); // $ read_access=b4
+    print_i64(c2); // $ read_access=c2
+
+    match (4, 5) {
+        (
+            a10, // a10_2
+            b4 // b4
+        ) => {
+            print_i64(a10); // $ read_access=a10_2
+            print_i64(b4); // $ read_access=b4
+        }
+    }
+
+    print_i64(a10); // $ read_access=a10
+    print_i64(b4); // $ read_access=b4
+}
+
+fn closure_variable() {
+    let example_closure = // example_closure
+        |x: i64| // x_1
+        x; // $ read_access=x_1
+    let n1 = // n1
+        example_closure(5); // $ read_access=example_closure
+    print_i64(n1); // $ read_access=n1
+
+    immutable_variable();
+    let immutable_variable =
+        |x: i64| // x_2
+        x; // $ read_access=x_2
+    let n2 = // n2
+        immutable_variable(6); // $ read_access=immutable_variable
+    print_i64(n2); // $ read_access=n2
+}
+
+fn for_variable() {
+    let v = &["apples", "cake", "coffee"]; // v
+
+    for text // text
+        in v { // $ read_access=v
+        print_str(text); // $ read_access=text
+    }
+}
+
+fn add_assign() {
+    let mut a = 0; // a
+    a += 1; // $ access=a
+    print_i64(a); // $ read_access=a
+    (&mut a).add_assign(10); // $ access=a
+    print_i64(a); // $ read_access=a
+}
+
+fn mutate() {
+    let mut i = 1; // i
+    let ref_i = // ref_i
+        &mut i; // $ access=i
+    *ref_i = 2; // $ read_access=ref_i
+    print_i64(i); // $ read_access=i
+}
+
+fn mutate_param(x : &mut i64) -> &mut i64 {
+    *x = // $ read_access=x
+        *x + // $ read_access=x
+        *x; // $ read_access=x
+    return x; // $ read_access=x
+}
+
+fn mutate_param2<'a>(x : &'a mut i64, y :&mut &'a mut i64) {
+    *x = // $ read_access=x
+        *x + // $ read_access=x
+        *x; // $ read_access=x
+    *y = // $ read_access=y
+        x; // $ read_access=x
+}
+
+fn mutate_arg() {
+    let mut x = 2; // x
+    let y = // y
+        mutate_param(&mut x); // $ access=x
+    *y = 10; // $ read_access=y
+    // prints 10, not 4
+    print_i64(x); // $ read_access=x
+
+    let mut z = 4; // z
+    let w = // w
+        &mut &mut x; // $ access=x
+    mutate_param2(
+        &mut z, // $ access=z
+        w // $ read_access=w
+    );
+    **w = 11; // $ read_access=w
+    // prints 11, not 8
+    print_i64(z); // $ read_access=z
+}
+
+fn alias() {
+    let mut x = 1; // x
+    let y = // y
+        &mut x; // $ access=x
+    *y = 2; // $ read_access=y
+    print_i64(x); // $ read_access=x
+}
+
+fn capture_immut() {
+    let x = 100; // x
+    // Captures immutable value by immutable reference
+    let cap = || {
+        print_i64(x); // $ read_access=x
+    };
+    cap(); // $ read_access=cap
+    print_i64(x); // $ read_access=x
+}
+
+fn capture_mut() {
+    let mut x = 1; // x
+    // Captures mutable value by immutable reference
+    let closure1 = || {
+        print_i64(x); // $ read_access=x
+    };
+    closure1(); // $ read_access=closure1
+    print_i64(x); // $ read_access=x
+
+    let mut y = 2; // y
+    // Captures mutable value by mutable reference
+    let mut closure2 = || {
+        y = 3; // $ write_access=y
+    };
+    closure2(); // $ read_access=closure2
+    print_i64(y); // $ read_access=y
+
+    let mut z = 2; // z
+    // Captures mutable value by mutable reference and calls mutating method
+    let mut closure3 = || {
+        z.add_assign(1); // $ read_access=z
+    };
+    closure3(); // $ read_access=closure3
+    print_i64(z); // $ read_access=z
+}
+
+async fn async_block_capture() {
+    let mut i: i64 = 0; // i
+    let block = async {
+        i = 1; // $ write_access=i
+    };
+    // The await below causes write to `i`
+    block.await; // $ read_access=block
+    print_i64(i); // $ read_access=i
+}
+
+fn phi(b : bool) {
+    let mut x = 1; // x
+    print_i64(x); // $ read_access=x
+    print_i64(x + 1); // $ read_access=x
+    if b { // $ read_access=b
+        x = 2; // $ write_access=x
+        print_i64(x); // $ read_access=x
+        print_i64(x + 1); // $ read_access=x
+    } else {
+        x = 3; // $ write_access=x
+        print_i64(x); // $ read_access=x
+        print_i64(x + 1); // $ read_access=x
+    }
+    print_i64(x); // $ read_access=x
+}
+
+fn phi_read(b1 : bool, b2 : bool) {
+    let x = 1; // x
+    if b1 { // $ read_access=b1
+        print_i64(x); // $ read_access=x
+    } else {
+        print_i64(x); // $ read_access=x
+    }
+
+    if b2 { // $ read_access=b2
+        print_i64(x); // $ read_access=x
+    } else {
+        print_i64(x); // $ read_access=x
+    }
+}
+
+#[derive(Debug)]
+struct MyStruct {
+    val: i64,
+}
+
+impl MyStruct {
+    fn my_get(&mut self) -> i64 {
+        return self.val;
+    }
+}
+
+fn structs() {
+    let mut a = MyStruct { val: 1 }; // a
+    print_i64(a.my_get()); // $ read_access=a
+    a.val = 5; // $ read_access=a
+    print_i64(a.my_get()); // $ read_access=a
+    a = MyStruct { val: 2 }; // $ write_access=a
+    print_i64(a.my_get()); // $ read_access=a
+}
+
+fn ref_arg() {
+    let x = 16; // x
+    print_i64_ref(&x); // $ access=x
+    print_i64(x); // $ read_access=x
+
+    let z = 17; // z
+    print_i64_ref(&z); // $ access=z
+}
+
+trait Bar {
+  fn bar(&self);
+}
+
+impl MyStruct {
+  fn bar(&mut self) {
+    *self = MyStruct { val: 3 };
+  }
+}
+
+fn ref_methodcall_receiver() {
+  let mut a = MyStruct { val: 1 }; // a
+  a.bar(); // $ read_access=a
+  // prints 3, not 1
+  print_i64(a.val); // $ read_access=a
+}
+
+fn main() {
+    immutable_variable();
+    mutable_variable();
+    mutable_variable_immutable_borrow();
+    variable_shadow1();
+    variable_shadow2();
+    let_pattern1();
+    let_pattern2();
+    let_pattern3();
+    let_pattern4();
+    match_pattern1();
+    match_pattern2();
+    match_pattern3();
+    match_pattern4();
+    match_pattern5();
+    match_pattern6();
+    match_pattern7();
+    match_pattern8();
+    match_pattern9();
+    param_pattern1("a", ("b", "c"));
+    param_pattern2(Either::Left(45));
+    destruct_assignment();
+    closure_variable();
+    for_variable();
+    add_assign();
+    mutate();
+    mutate_arg();
+    alias();
+    capture_mut();
+    capture_immut();
+    async_block_capture();
+    structs();
+    ref_arg();
+    ref_methodcall_receiver();
+}
diff --git a/rust/ql/test/options.yml b/rust/ql/test/options.yml
new file mode 100644
index 00000000000..c7a0beabb53
--- /dev/null
+++ b/rust/ql/test/options.yml
@@ -0,0 +1 @@
+qltest_cargo_check: true
diff --git a/rust/ql/test/query-tests/diagnostics/AstConsistencyCounts.expected b/rust/ql/test/query-tests/diagnostics/AstConsistencyCounts.expected
new file mode 100644
index 00000000000..62ee879ab1e
--- /dev/null
+++ b/rust/ql/test/query-tests/diagnostics/AstConsistencyCounts.expected
@@ -0,0 +1,4 @@
+| Multiple locations | 0 |
+| Multiple parents | 0 |
+| Multiple primary QL classes | 0 |
+| Multiple toStrings | 0 |
diff --git a/rust/ql/test/query-tests/diagnostics/AstConsistencyCounts.qlref b/rust/ql/test/query-tests/diagnostics/AstConsistencyCounts.qlref
new file mode 100644
index 00000000000..68d587b883e
--- /dev/null
+++ b/rust/ql/test/query-tests/diagnostics/AstConsistencyCounts.qlref
@@ -0,0 +1 @@
+queries/diagnostics/AstConsistencyCounts.ql
diff --git a/rust/ql/test/query-tests/diagnostics/CONSISTENCY/ExtractionConsistency.expected b/rust/ql/test/query-tests/diagnostics/CONSISTENCY/ExtractionConsistency.expected
new file mode 100644
index 00000000000..bdfa4a9792d
--- /dev/null
+++ b/rust/ql/test/query-tests/diagnostics/CONSISTENCY/ExtractionConsistency.expected
@@ -0,0 +1,8 @@
+extractionWarning
+| does_not_compile.rs:2:6:2:5 | expected SEMICOLON |
+| does_not_compile.rs:2:9:2:8 | expected SEMICOLON |
+| does_not_compile.rs:2:13:2:12 | expected SEMICOLON |
+| does_not_compile.rs:2:21:2:20 | expected SEMICOLON |
+| does_not_compile.rs:2:26:2:25 | expected SEMICOLON |
+| does_not_compile.rs:2:32:2:31 | expected field name or number |
+| error.rs:2:5:2:17 | An error! |
diff --git a/rust/ql/test/query-tests/diagnostics/CfgConsistencyCounts.expected b/rust/ql/test/query-tests/diagnostics/CfgConsistencyCounts.expected
new file mode 100644
index 00000000000..7df2863da9e
--- /dev/null
+++ b/rust/ql/test/query-tests/diagnostics/CfgConsistencyCounts.expected
@@ -0,0 +1,13 @@
+| CFG scope lacks initial AST node | 0 |
+| Dead end | 0 |
+| Multiple successors of the same type | 0 |
+| Multiple toStrings | 0 |
+| Non-PostOrderTree Expr node | 0 |
+| Non-unique list order | 0 |
+| Non-unique set representation | 0 |
+| Non-unique split kind | 0 |
+| Simple and normal successors | 0 |
+| Splitting invariant 2 | 0 |
+| Splitting invariant 3 | 0 |
+| Splitting invariant 4 | 0 |
+| Splitting invariant 5 | 0 |
diff --git a/rust/ql/test/query-tests/diagnostics/CfgConsistencyCounts.qlref b/rust/ql/test/query-tests/diagnostics/CfgConsistencyCounts.qlref
new file mode 100644
index 00000000000..6e7ffa8aaa9
--- /dev/null
+++ b/rust/ql/test/query-tests/diagnostics/CfgConsistencyCounts.qlref
@@ -0,0 +1 @@
+queries/diagnostics/CfgConsistencyCounts.ql
diff --git a/rust/ql/test/query-tests/diagnostics/DataFlowConsistencyCounts.expected b/rust/ql/test/query-tests/diagnostics/DataFlowConsistencyCounts.expected
new file mode 100644
index 00000000000..4d1cdfed89a
--- /dev/null
+++ b/rust/ql/test/query-tests/diagnostics/DataFlowConsistencyCounts.expected
@@ -0,0 +1,29 @@
+| ArgumentNode is missing PostUpdateNode | 0 |
+| Call context for isUnreachableInCall is inconsistent with call graph | 0 |
+| Call context too large | 0 |
+| Call should have one enclosing callable | 0 |
+| Callable mismatch for parameter | 0 |
+| Lambda call enclosing callable mismatch | 0 |
+| Local flow step does not preserve enclosing callable | 0 |
+| Missing call for argument node | 0 |
+| Multiple calls for argument node | 0 |
+| Node and call does not share enclosing callable | 0 |
+| Node has multiple PostUpdateNodes | 0 |
+| Node should have one enclosing callable | 0 |
+| Node should have one location | 0 |
+| Node should have one toString | 0 |
+| Node should have one type | 0 |
+| Node steps to itself | 0 |
+| Nodes without location | 0 |
+| Non-unique content approximation | 0 |
+| Origin of readStep is missing a PostUpdateNode | 0 |
+| Parameter node with multiple positions | 0 |
+| Parameters with overlapping positions | 0 |
+| PostUpdateNode does not share callable with its pre-update node | 0 |
+| PostUpdateNode should have one pre-update node | 0 |
+| PostUpdateNode should not be the target of local flow | 0 |
+| PostUpdateNode should not equal its pre-update node | 0 |
+| Read step does not preserve enclosing callable | 0 |
+| Speculative step already hasM Model | 0 |
+| Store step does not preserve enclosing callable | 0 |
+| Type compatibility predicate is not reflexive | 0 |
diff --git a/rust/ql/test/query-tests/diagnostics/DataFlowConsistencyCounts.qlref b/rust/ql/test/query-tests/diagnostics/DataFlowConsistencyCounts.qlref
new file mode 100644
index 00000000000..128d80b2291
--- /dev/null
+++ b/rust/ql/test/query-tests/diagnostics/DataFlowConsistencyCounts.qlref
@@ -0,0 +1 @@
+queries/diagnostics/DataFlowConsistencyCounts.ql
diff --git a/rust/ql/test/query-tests/diagnostics/ExtractedFiles.expected b/rust/ql/test/query-tests/diagnostics/ExtractedFiles.expected
index cc6f775e86d..bc8dc8cccf1 100644
--- a/rust/ql/test/query-tests/diagnostics/ExtractedFiles.expected
+++ b/rust/ql/test/query-tests/diagnostics/ExtractedFiles.expected
@@ -1,6 +1,8 @@
+| comments.rs:0:0:0:0 | comments.rs | File successfully extracted. |
 | does_not_compile.rs:0:0:0:0 | does_not_compile.rs | File successfully extracted. |
 | error.rs:0:0:0:0 | error.rs | File successfully extracted. |
 | lib.rs:0:0:0:0 | lib.rs | File successfully extracted. |
 | main.rs:0:0:0:0 | main.rs | File successfully extracted. |
 | my_macro.rs:0:0:0:0 | my_macro.rs | File successfully extracted. |
 | my_struct.rs:0:0:0:0 | my_struct.rs | File successfully extracted. |
+| options.yml:0:0:0:0 | options.yml | File successfully extracted. |
diff --git a/rust/ql/test/query-tests/diagnostics/ExtractionErrors.expected b/rust/ql/test/query-tests/diagnostics/ExtractionErrors.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/query-tests/diagnostics/ExtractionErrors.qlref b/rust/ql/test/query-tests/diagnostics/ExtractionErrors.qlref
new file mode 100644
index 00000000000..ffbdb0a7b1b
--- /dev/null
+++ b/rust/ql/test/query-tests/diagnostics/ExtractionErrors.qlref
@@ -0,0 +1 @@
+queries/diagnostics/ExtractionErrors.ql
\ No newline at end of file
diff --git a/rust/ql/test/query-tests/diagnostics/ExtractionWarnings.expected b/rust/ql/test/query-tests/diagnostics/ExtractionWarnings.expected
new file mode 100644
index 00000000000..1ebd7e23221
--- /dev/null
+++ b/rust/ql/test/query-tests/diagnostics/ExtractionWarnings.expected
@@ -0,0 +1,7 @@
+| does_not_compile.rs:2:6:2:5 | expected SEMICOLON | Extraction warning in does_not_compile.rs with message expected SEMICOLON | 1 |
+| does_not_compile.rs:2:9:2:8 | expected SEMICOLON | Extraction warning in does_not_compile.rs with message expected SEMICOLON | 1 |
+| does_not_compile.rs:2:13:2:12 | expected SEMICOLON | Extraction warning in does_not_compile.rs with message expected SEMICOLON | 1 |
+| does_not_compile.rs:2:21:2:20 | expected SEMICOLON | Extraction warning in does_not_compile.rs with message expected SEMICOLON | 1 |
+| does_not_compile.rs:2:26:2:25 | expected SEMICOLON | Extraction warning in does_not_compile.rs with message expected SEMICOLON | 1 |
+| does_not_compile.rs:2:32:2:31 | expected field name or number | Extraction warning in does_not_compile.rs with message expected field name or number | 1 |
+| error.rs:2:5:2:17 | An error! | Extraction warning in error.rs with message An error! | 1 |
diff --git a/rust/ql/test/query-tests/diagnostics/ExtractionWarnings.qlref b/rust/ql/test/query-tests/diagnostics/ExtractionWarnings.qlref
new file mode 100644
index 00000000000..ff6e566d20a
--- /dev/null
+++ b/rust/ql/test/query-tests/diagnostics/ExtractionWarnings.qlref
@@ -0,0 +1 @@
+queries/diagnostics/ExtractionWarnings.ql
diff --git a/rust/ql/test/query-tests/diagnostics/LinesOfCode.expected b/rust/ql/test/query-tests/diagnostics/LinesOfCode.expected
index cec53d5df7a..6facd293859 100644
--- a/rust/ql/test/query-tests/diagnostics/LinesOfCode.expected
+++ b/rust/ql/test/query-tests/diagnostics/LinesOfCode.expected
@@ -1 +1 @@
-| 24 |
+| 59 |
diff --git a/rust/ql/test/query-tests/diagnostics/LinesOfUserCode.expected b/rust/ql/test/query-tests/diagnostics/LinesOfUserCode.expected
index cec53d5df7a..6facd293859 100644
--- a/rust/ql/test/query-tests/diagnostics/LinesOfUserCode.expected
+++ b/rust/ql/test/query-tests/diagnostics/LinesOfUserCode.expected
@@ -1 +1 @@
-| 24 |
+| 59 |
diff --git a/rust/ql/test/query-tests/diagnostics/LinesOfUserCodeInFiles.expected b/rust/ql/test/query-tests/diagnostics/LinesOfUserCodeInFiles.expected
index bc80df02e77..b3465471096 100644
--- a/rust/ql/test/query-tests/diagnostics/LinesOfUserCodeInFiles.expected
+++ b/rust/ql/test/query-tests/diagnostics/LinesOfUserCodeInFiles.expected
@@ -1,6 +1,8 @@
-| my_struct.rs:0:0:0:0 | my_struct.rs | 11 |
-| main.rs:0:0:0:0 | main.rs | 4 |
-| my_macro.rs:0:0:0:0 | my_macro.rs | 4 |
+| my_struct.rs:0:0:0:0 | my_struct.rs | 20 |
+| comments.rs:0:0:0:0 | comments.rs | 13 |
+| main.rs:0:0:0:0 | main.rs | 8 |
+| my_macro.rs:0:0:0:0 | my_macro.rs | 7 |
+| lib.rs:0:0:0:0 | lib.rs | 5 |
 | does_not_compile.rs:0:0:0:0 | does_not_compile.rs | 3 |
-| error.rs:0:0:0:0 | error.rs | 2 |
-| lib.rs:0:0:0:0 | lib.rs | 0 |
+| error.rs:0:0:0:0 | error.rs | 3 |
+| options.yml:0:0:0:0 | options.yml | 0 |
diff --git a/rust/ql/test/query-tests/diagnostics/SummaryStats.expected b/rust/ql/test/query-tests/diagnostics/SummaryStats.expected
index 03ea7f60b21..aeba0ac1ee6 100644
--- a/rust/ql/test/query-tests/diagnostics/SummaryStats.expected
+++ b/rust/ql/test/query-tests/diagnostics/SummaryStats.expected
@@ -1,5 +1,12 @@
-| Elements extracted | 61 |
-| Elements unextracted | 26 |
-| Files extracted | 6 |
-| Lines of code extracted | 24 |
-| Lines of user code extracted | 24 |
+| Elements extracted | 376 |
+| Elements unextracted | 0 |
+| Extraction errors | 0 |
+| Extraction warnings | 7 |
+| Files extracted - total | 8 |
+| Files extracted - with errors | 2 |
+| Files extracted - without errors | 6 |
+| Inconsistencies - AST | 0 |
+| Inconsistencies - CFG | 0 |
+| Inconsistencies - data flow | 0 |
+| Lines of code extracted | 59 |
+| Lines of user code extracted | 59 |
diff --git a/rust/ql/test/query-tests/diagnostics/UnextractedElements.expected b/rust/ql/test/query-tests/diagnostics/UnextractedElements.expected
index 5ed70660c2b..e69de29bb2d 100644
--- a/rust/ql/test/query-tests/diagnostics/UnextractedElements.expected
+++ b/rust/ql/test/query-tests/diagnostics/UnextractedElements.expected
@@ -1,16 +0,0 @@
-listUnimplemented
-| @0:0:0:0 | Not yet implemented (x14). |
-| does_not_compile.rs@2:2:2:5 | Not yet implemented. |
-| does_not_compile.rs@2:7:2:8 | Not yet implemented. |
-| does_not_compile.rs@2:10:2:12 | Not yet implemented. |
-| does_not_compile.rs@2:14:2:20 | Not yet implemented. |
-| does_not_compile.rs@2:22:2:25 | Not yet implemented. |
-| does_not_compile.rs@2:27:2:30 | Not yet implemented. |
-| main.rs@16:5:16:22 | Not yet implemented. |
-| main.rs@17:5:17:21 | Not yet implemented. |
-| my_struct.rs@2:1:13:1 | Not yet implemented. |
-| my_struct.rs@24:9:27:9 | Not yet implemented. |
-| my_struct.rs@25:19:25:30 | Not yet implemented. |
-| my_struct.rs@29:5:29:5 | Not yet implemented. |
-listMissingExpr
-listMissingPat
diff --git a/rust/ql/test/query-tests/diagnostics/comments.rs b/rust/ql/test/query-tests/diagnostics/comments.rs
new file mode 100644
index 00000000000..fe99fdd4e3e
--- /dev/null
+++ b/rust/ql/test/query-tests/diagnostics/comments.rs
@@ -0,0 +1,60 @@
+/**
+ * total lines in this file: 61
+ * of which code: 16
+ * of which only comments: 33
+ * of which blank: 12
+ */
+
+// a comment
+
+/**
+ * Comment attached to a struct.
+ */
+struct StructWithComments
+{
+    /**
+     * Another attached comment.
+     */
+    a: i32,
+
+    // And another attached comment.
+    b: i32,
+
+    /*
+     * And yet another attached comment.
+     */
+    c: i32,
+
+    // informal
+    // comment
+    // block.
+    cd: i32,
+
+    // Just a comment.
+}
+
+pub fn my_simple_func()
+{
+}
+
+/**
+ * Comment attached to a function.
+ */
+pub fn my_func_with_comments()
+{
+    // comment
+    let a = 1; // comment
+    // comment
+    let b = 2;
+
+    // comment
+
+    /*
+     * Comment.
+     */
+    my_simple_func();
+}
+
+/*
+ * Comment.
+ */
diff --git a/rust/ql/test/query-tests/diagnostics/main.rs b/rust/ql/test/query-tests/diagnostics/main.rs
index 790547c0ff9..07dd4234a6e 100644
--- a/rust/ql/test/query-tests/diagnostics/main.rs
+++ b/rust/ql/test/query-tests/diagnostics/main.rs
@@ -1,17 +1,16 @@
 /**
  * total lines in this file: 18
- * of which code: 7
- * of which only comments: 7
+ * of which code: 8
+ * of which only comments: 6
  * of which blank: 4
  */
 
 mod my_struct;
 mod my_macro;
+mod comments;
 
-// another comment
-
-fn main() { // another comment
-    //println!("Hello, world!"); // currently causes consistency issues
+fn main() {
+    println!("Hello, world!");
 
     my_struct::my_func();
     my_macro::my_func();
diff --git a/rust/ql/test/query-tests/diagnostics/my_macro.rs b/rust/ql/test/query-tests/diagnostics/my_macro.rs
index 0f85877c3c6..d8a0cc2812b 100644
--- a/rust/ql/test/query-tests/diagnostics/my_macro.rs
+++ b/rust/ql/test/query-tests/diagnostics/my_macro.rs
@@ -7,7 +7,7 @@
 
 macro_rules! myMacro {
     () => {
-        //println!("Hello, world!"); // currently causes consistency issues
+        println!("Hello, world!");
     };
 }
 
diff --git a/rust/ql/test/query-tests/diagnostics/options.yml b/rust/ql/test/query-tests/diagnostics/options.yml
new file mode 100644
index 00000000000..cf148dd35f8
--- /dev/null
+++ b/rust/ql/test/query-tests/diagnostics/options.yml
@@ -0,0 +1 @@
+qltest_cargo_check: false
diff --git a/rust/ql/test/query-tests/unusedentities/CONSISTENCY/DataFlowConsistency.expected b/rust/ql/test/query-tests/unusedentities/CONSISTENCY/DataFlowConsistency.expected
new file mode 100644
index 00000000000..0a61a151c20
--- /dev/null
+++ b/rust/ql/test/query-tests/unusedentities/CONSISTENCY/DataFlowConsistency.expected
@@ -0,0 +1,5 @@
+uniqueEnclosingCallable
+| main.rs:194:25:194:25 | x | Node should have one enclosing callable but has 0. |
+| main.rs:198:28:198:28 | x | Node should have one enclosing callable but has 0. |
+| main.rs:202:28:202:28 | x | Node should have one enclosing callable but has 0. |
+| main.rs:206:28:206:28 | x | Node should have one enclosing callable but has 0. |
diff --git a/rust/ql/test/query-tests/unusedentities/UnreachableCode.expected b/rust/ql/test/query-tests/unusedentities/UnreachableCode.expected
new file mode 100644
index 00000000000..77c923e9280
--- /dev/null
+++ b/rust/ql/test/query-tests/unusedentities/UnreachableCode.expected
@@ -0,0 +1,23 @@
+| unreachable.rs:19:9:19:23 | ExprStmt | This code is never reached. |
+| unreachable.rs:27:9:27:23 | ExprStmt | This code is never reached. |
+| unreachable.rs:39:9:39:23 | ExprStmt | This code is never reached. |
+| unreachable.rs:46:9:46:23 | ExprStmt | This code is never reached. |
+| unreachable.rs:67:5:67:19 | ExprStmt | This code is never reached. |
+| unreachable.rs:134:13:134:20 | MacroExpr | This code is never reached. |
+| unreachable.rs:143:13:143:20 | MacroExpr | This code is never reached. |
+| unreachable.rs:166:9:166:23 | ExprStmt | This code is never reached. |
+| unreachable.rs:171:9:171:17 | MacroExpr | This code is never reached. |
+| unreachable.rs:177:9:177:26 | MacroExpr | This code is never reached. |
+| unreachable.rs:206:9:206:23 | ExprStmt | This code is never reached. |
+| unreachable.rs:231:13:231:27 | ExprStmt | This code is never reached. |
+| unreachable.rs:241:13:241:27 | ExprStmt | This code is never reached. |
+| unreachable.rs:247:9:247:23 | ExprStmt | This code is never reached. |
+| unreachable.rs:254:17:254:31 | ExprStmt | This code is never reached. |
+| unreachable.rs:264:17:264:31 | ExprStmt | This code is never reached. |
+| unreachable.rs:267:9:267:23 | ExprStmt | This code is never reached. |
+| unreachable.rs:303:9:303:23 | ExprStmt | This code is never reached. |
+| unreachable.rs:332:9:332:23 | ExprStmt | This code is never reached. |
+| unreachable.rs:348:9:348:23 | ExprStmt | This code is never reached. |
+| unreachable.rs:370:9:370:23 | ExprStmt | This code is never reached. |
+| unreachable.rs:375:5:375:10 | ExprStmt | This code is never reached. |
+| unreachable.rs:382:5:382:10 | ExprStmt | This code is never reached. |
diff --git a/rust/ql/test/query-tests/unusedentities/UnreachableCode.qlref b/rust/ql/test/query-tests/unusedentities/UnreachableCode.qlref
new file mode 100644
index 00000000000..23ca9359181
--- /dev/null
+++ b/rust/ql/test/query-tests/unusedentities/UnreachableCode.qlref
@@ -0,0 +1,2 @@
+query: queries/unusedentities/UnreachableCode.ql
+postprocess: utils/InlineExpectationsTestQuery.ql
\ No newline at end of file
diff --git a/rust/ql/test/query-tests/unusedentities/UnusedValue.expected b/rust/ql/test/query-tests/unusedentities/UnusedValue.expected
new file mode 100644
index 00000000000..f8538e5b8bc
--- /dev/null
+++ b/rust/ql/test/query-tests/unusedentities/UnusedValue.expected
@@ -0,0 +1,20 @@
+| main.rs:10:9:10:9 | a | Variable $@ is assigned a value that is never used. | main.rs:10:9:10:9 | a | a |
+| main.rs:13:9:13:9 | d | Variable $@ is assigned a value that is never used. | main.rs:13:9:13:9 | d | d |
+| main.rs:39:5:39:5 | b | Variable $@ is assigned a value that is never used. | main.rs:30:9:30:9 | b | b |
+| main.rs:41:5:41:5 | c | Variable $@ is assigned a value that is never used. | main.rs:31:13:31:13 | c | c |
+| main.rs:44:5:44:5 | c | Variable $@ is assigned a value that is never used. | main.rs:31:13:31:13 | c | c |
+| main.rs:48:9:48:9 | d | Variable $@ is assigned a value that is never used. | main.rs:32:13:32:13 | d | d |
+| main.rs:54:5:54:5 | e | Variable $@ is assigned a value that is never used. | main.rs:33:13:33:13 | e | e |
+| main.rs:65:5:65:5 | f | Variable $@ is assigned a value that is never used. | main.rs:34:13:34:13 | f | f |
+| main.rs:67:5:67:5 | f | Variable $@ is assigned a value that is never used. | main.rs:34:13:34:13 | f | f |
+| main.rs:69:5:69:5 | g | Variable $@ is assigned a value that is never used. | main.rs:35:9:35:9 | g | g |
+| main.rs:91:9:91:9 | a | Variable $@ is assigned a value that is never used. | main.rs:91:9:91:9 | a | a |
+| main.rs:112:9:112:10 | is | Variable $@ is assigned a value that is never used. | main.rs:112:9:112:10 | is | is |
+| main.rs:135:13:135:17 | total | Variable $@ is assigned a value that is never used. | main.rs:135:13:135:17 | total | total |
+| main.rs:280:13:280:17 | total | Variable $@ is assigned a value that is never used. | main.rs:248:13:248:17 | total | total |
+| main.rs:373:9:373:9 | x | Variable $@ is assigned a value that is never used. | main.rs:373:9:373:9 | x | x |
+| main.rs:381:17:381:17 | x | Variable $@ is assigned a value that is never used. | main.rs:381:17:381:17 | x | x |
+| main.rs:482:9:482:9 | c | Variable $@ is assigned a value that is never used. | main.rs:482:9:482:9 | c | c |
+| more.rs:44:9:44:14 | a_ptr4 | Variable $@ is assigned a value that is never used. | more.rs:44:9:44:14 | a_ptr4 | a_ptr4 |
+| more.rs:59:9:59:13 | d_ptr | Variable $@ is assigned a value that is never used. | more.rs:59:9:59:13 | d_ptr | d_ptr |
+| more.rs:65:9:65:17 | f_ptr | Variable $@ is assigned a value that is never used. | more.rs:65:13:65:17 | f_ptr | f_ptr |
diff --git a/rust/ql/test/query-tests/unusedentities/UnusedValue.qlref b/rust/ql/test/query-tests/unusedentities/UnusedValue.qlref
new file mode 100644
index 00000000000..d08b310e2d0
--- /dev/null
+++ b/rust/ql/test/query-tests/unusedentities/UnusedValue.qlref
@@ -0,0 +1,2 @@
+query: queries/unusedentities/UnusedValue.ql
+postprocess: utils/InlineExpectationsTestQuery.ql
\ No newline at end of file
diff --git a/rust/ql/test/query-tests/unusedentities/UnusedVariable.expected b/rust/ql/test/query-tests/unusedentities/UnusedVariable.expected
new file mode 100644
index 00000000000..dcfde3c46f5
--- /dev/null
+++ b/rust/ql/test/query-tests/unusedentities/UnusedVariable.expected
@@ -0,0 +1,22 @@
+| main.rs:29:9:29:9 | a | Variable 'a' is not used. |
+| main.rs:94:13:94:13 | d | Variable 'd' is not used. |
+| main.rs:143:5:143:5 | y | Variable 'y' is not used. |
+| main.rs:170:9:170:9 | x | Variable 'x' is not used. |
+| main.rs:250:17:250:17 | a | Variable 'a' is not used. |
+| main.rs:258:20:258:22 | val | Variable 'val' is not used. |
+| main.rs:272:14:272:16 | val | Variable 'val' is not used. |
+| main.rs:287:22:287:24 | val | Variable 'val' is not used. |
+| main.rs:294:24:294:26 | val | Variable 'val' is not used. |
+| main.rs:302:13:302:15 | num | Variable 'num' is not used. |
+| main.rs:317:12:317:12 | j | Variable 'j' is not used. |
+| main.rs:337:25:337:25 | y | Variable 'y' is not used. |
+| main.rs:340:28:340:28 | a | Variable 'a' is not used. |
+| main.rs:343:9:343:9 | p | Variable 'p' is not used. |
+| main.rs:361:9:361:13 | right | Variable 'right' is not used. |
+| main.rs:367:9:367:14 | right2 | Variable 'right2' is not used. |
+| main.rs:374:13:374:13 | y | Variable 'y' is not used. |
+| main.rs:382:21:382:21 | y | Variable 'y' is not used. |
+| main.rs:427:26:427:28 | val | Variable 'val' is not used. |
+| main.rs:430:21:430:23 | acc | Variable 'acc' is not used. |
+| main.rs:451:9:451:14 | unused | Variable 'unused' is not used. |
+| more.rs:24:9:24:11 | val | Variable 'val' is not used. |
diff --git a/rust/ql/test/query-tests/unusedentities/UnusedVariable.qlref b/rust/ql/test/query-tests/unusedentities/UnusedVariable.qlref
new file mode 100644
index 00000000000..709d2b61d55
--- /dev/null
+++ b/rust/ql/test/query-tests/unusedentities/UnusedVariable.qlref
@@ -0,0 +1,2 @@
+query: queries/unusedentities/UnusedVariable.ql
+postprocess: utils/InlineExpectationsTestQuery.ql
\ No newline at end of file
diff --git a/rust/ql/test/query-tests/unusedentities/main.rs b/rust/ql/test/query-tests/unusedentities/main.rs
new file mode 100644
index 00000000000..bd4bc4d23e1
--- /dev/null
+++ b/rust/ql/test/query-tests/unusedentities/main.rs
@@ -0,0 +1,537 @@
+mod more;
+mod unreachable;
+
+use more::*;
+use unreachable::*;
+
+// --- locals ---
+
+fn locals_1() {
+    let a = 1; // $ Alert[rust/unused-value]
+    let b = 1;
+    let c = 1;
+    let d = String::from("a"); // $ Alert[rust/unused-value]
+    let e = String::from("b");
+    let f = 1;
+    let _ = 1; // (deliberately unused)
+
+    println!("use {}", b);
+
+    if cond() {
+        println!("use {}", c);
+    }
+
+    println!("use {}", e);
+    assert!(f == 1);
+}
+
+fn locals_2() {
+    let a: i32; // $ Alert[rust/unused-variable]
+    let b: i32;
+    let mut c: i32;
+    let mut d: i32;
+    let mut e: i32;
+    let mut f: i32;
+    let g: i32;
+    let h: i32;
+    let i: i32;
+
+    b = 1; // $ Alert[rust/unused-value]
+
+    c = 1; // $ Alert[rust/unused-value]
+    c = 2;
+    println!("use {}", c);
+    c = 3; // $ Alert[rust/unused-value]
+
+    d = 1;
+    if cond() {
+        d = 2; // $ Alert[rust/unused-value]
+        d = 3;
+    } else {
+    }
+    println!("use {}", d);
+
+    e = 1; // $ Alert[rust/unused-value]
+    if cond() {
+        e = 2;
+    } else {
+        e = 3;
+    }
+    println!("use {}", e);
+
+    f = 1;
+    f += 1;
+    println!("use {}", f);
+    f += 1; // $ Alert[rust/unused-value]
+    f = 1;
+    f += 1; // $ Alert[rust/unused-value]
+
+    g = if cond() { 1 } else { 2 }; // $ Alert[rust/unused-value]
+    h = if cond() { 3 } else { 4 };
+    i = if cond() { h } else { 5 };
+    println!("use {}", i);
+
+    _ = 1; // GOOD (deliberately unused)
+}
+
+// --- structs ---
+
+#[derive(Debug)]
+struct MyStruct {
+    val: i64,
+}
+
+impl MyStruct {
+    fn my_get(&mut self) -> i64 {
+        return self.val;
+    }
+}
+
+fn structs() {
+    let a = MyStruct { val: 1 }; // $ Alert[rust/unused-value]
+    let b = MyStruct { val: 2 };
+    let c = MyStruct { val: 3 };
+    let mut d: MyStruct; // $ Alert[rust/unused-variable]
+    let mut e: MyStruct;
+    let mut f: MyStruct;
+
+    println!("lets use {:?} and {}", b, c.val);
+
+    e = MyStruct { val: 4 };
+    println!("lets use {}", e.my_get());
+    e.val = 5;
+    println!("lets use {}", e.my_get());
+
+    f = MyStruct { val: 6 }; // $ MISSING: Alert[rust/unused-value]
+    f.val = 7; // $ MISSING: Alert[rust/unused-value]
+}
+
+// --- arrays ---
+
+fn arrays() {
+    let is = [1, 2, 3]; // $ Alert[rust/unused-value]
+    let js = [1, 2, 3];
+    let ks = [1, 2, 3];
+
+    println!("lets use {:?}", js);
+
+    for k in ks {
+        println!("lets use {}", k); // [unreachable FALSE POSITIVE]
+    }
+}
+
+// --- constants and statics ---
+
+const CON1: i32 = 1;
+const CON2: i32 = 2; // $ MISSING: Alert[rust/unused-value]
+static mut STAT1: i32 = 1;
+static mut STAT2: i32 = 2; // $ MISSING: Alert[rust/unused-value]
+
+fn statics() {
+    static mut STAT3: i32 = 0;
+    static mut STAT4: i32 = 0; // $ MISSING: Alert[rust/unused-value]
+
+    unsafe {
+        let total = CON1 + STAT1 + STAT3; // $ Alert[rust/unused-value]
+    }
+}
+
+// --- parameters ---
+
+fn parameters(
+    x: i32,
+    y: i32,  // $ Alert[rust/unused-variable]
+    _z: i32, // (`_` is asking the compiler, and by extension us, to not warn that this is unused)
+) -> i32 {
+    return x;
+}
+
+// --- loops ---
+
+fn id(v: i32) -> i32 {
+    return v;
+}
+
+fn loops() {
+    let mut a: i64 = 10;
+    let b: i64 = 20;
+    let c: i64 = 30;
+    let d: i64 = 40;
+    let mut e: i64 = 50;
+
+    while a < b {
+        a += 1;
+    }
+
+    for x in c..d {
+        e += x;
+    }
+
+    for x in 1..10 { // $ Alert[rust/unused-variable]
+    }
+
+    for _ in 1..10 {}
+
+    for x in 1..10 {
+        println!("x is {}", x);
+    }
+
+    for x in 1..10 {
+        println!("x is {:?}", x);
+    }
+
+    for x in 1..10 {
+        println!("x + 1 is {}", x + 1);
+    }
+
+    for x in 1..10 {
+        for y in 1..x {
+            println!("y is {}", y);
+        }
+    }
+
+    for x in 1..10 {
+        println!("x is {x}");
+    }
+
+    for x in 1..10 {
+        _ = format!("x is {x}");
+    }
+
+    for x in 1..10 {
+        _ = format!("x is {x:?}");
+    }
+
+    [1, 2, 3].iter().for_each(|x| {
+        _ = format!("x is {x}");
+    });
+
+    for x in 1..10 {
+        println!("x is {val}", val = x);
+    }
+
+    for x in 1..10 {
+        assert!(x != 11);
+    }
+
+    for x in 1..10 {
+        assert_eq!(x, 1);
+        break;
+    }
+
+    for x in 1..10 {
+        assert_eq!(id(x), id(1));
+        break;
+    }
+}
+
+// --- lets ---
+
+enum MyOption<T> {
+    None,
+    Some(T),
+}
+
+enum YesOrNo {
+    Yes,
+    No,
+}
+
+use YesOrNo::{No, Yes}; // allows `Yes`, `No` to be accessed without qualifiers.
+
+struct MyPoint {
+    x: i64,
+    y: i64,
+}
+
+fn if_lets_matches() {
+    let mut total: i64 = 0;
+
+    if let Some(a) = Some(10) { // $ Alert[rust/unused-variable]
+    }
+
+    if let Some(b) = Some(20) {
+        total += b;
+    }
+
+    let mut next = Some(30);
+    while let Some(val) = // $ Alert[rust/unused-variable]
+        next
+    {
+        next = None;
+    }
+
+    let mut next2 = Some(40);
+    while let Some(val) = next2 {
+        total += val;
+        next2 = None;
+    }
+
+    let c = Some(60);
+    match c {
+        Some(val) => { // $ Alert[rust/unused-variable]
+        }
+        None => {}
+    }
+
+    let d = Some(70);
+    match d {
+        Some(val) => {
+            total += val; // $ Alert[rust/unused-value]
+        }
+        None => {}
+    }
+
+    let e = Option::Some(80);
+    match e {
+        Option::Some(val) => { // $ Alert[rust/unused-variable]
+        }
+        Option::None => {}
+    }
+
+    let f = MyOption::Some(90);
+    match f {
+        MyOption::Some(val) => { // $ Alert[rust/unused-variable]
+        }
+        MyOption::None => {}
+    }
+
+    let g: Result<i64, i64> = Ok(100);
+    match g {
+        Ok(_) => {}
+        Err(num) => {} // $ Alert[rust/unused-variable]
+    }
+
+    let h = YesOrNo::Yes;
+    match h {
+        YesOrNo::Yes => {}
+        YesOrNo::No => {}
+    }
+
+    let i = Yes;
+    match i {
+        Yes => {}
+        No => {}
+    }
+
+    if let j = Yes { // $ Alert[rust/unused-variable]
+    }
+
+    if let k = Yes {
+        match k {
+            _ => {}
+        }
+    }
+
+    let l = Yes;
+    if let Yes = l {}
+
+    match 1 {
+        1 => {}
+        _ => {}
+    }
+
+    let p1 = MyPoint { x: 1, y: 2 };
+    match p1 {
+        MyPoint { x: 0, y: 0 } => {}
+        MyPoint { x: 1, y } => { // $ Alert[rust/unused-variable]
+        }
+        MyPoint { x: 2, y: _ } => {}
+        MyPoint { x: 3, y: a } => { // $ Alert[rust/unused-variable]
+        }
+        MyPoint { x: 4, .. } => {}
+        p => { // $ Alert[rust/unused-variable]
+        }
+    }
+
+    let duration1 = std::time::Duration::new(10, 0); // ten seconds
+    assert_eq!(duration1.as_secs(), 10);
+
+    let duration2: Result<std::time::Duration, String> = Ok(std::time::Duration::new(10, 0));
+    match duration2 {
+        Ok(n) => {
+            println!("duration was {} seconds", n.as_secs());
+        }
+        Err(_) => {
+            println!("failed");
+        }
+    }
+
+    let (left,
+        right) = // $ MISSING: Alert[rust/unused-value] $ SPURIOUS: Alert[rust/unused-variable]
+        (1, 2);
+    _ = left;
+
+    let pair = (1, 2);
+    let (left2,
+        right2) = // $ MISSING: Alert[rust/unused-value] $ SPURIOUS: Alert[rust/unused-variable]
+        pair;
+    _ = left2;
+}
+
+fn shadowing() -> i32 {
+    let x = 1; // $ Alert[rust/unused-value]
+    let mut y: i32; // $ Alert[rust/unused-variable]
+
+    {
+        let x = 2;
+        let mut y: i32;
+
+        {
+            let x = 3; // $ Alert[rust/unused-value]
+            let mut y: i32; // $ Alert[rust/unused-variable]
+        }
+
+        y = x;
+        return y;
+    }
+}
+
+// --- function pointers ---
+
+type FuncPtr = fn(i32) -> i32;
+
+fn increment(x: i32) -> i32 {
+    return x + 1;
+}
+
+fn func_ptrs() {
+    let my_func: FuncPtr = increment;
+
+    for x in 1..10 {
+        _ = x + 1;
+    }
+
+    for x in 1..10 {
+        _ = increment(x);
+    }
+
+    for x in 1..10 {
+        _ = my_func(x);
+    }
+}
+
+// --- folds and closures ---
+
+fn folds_and_closures() {
+    let a1 = 1..10;
+    _ = a1.sum::<i32>();
+
+    let a2 = 1..10;
+    _ = a2.fold(0, |acc: i32, val: i32| -> i32 { acc + val });
+
+    let a3 = 1..10;
+    _ = a3.fold(0, |acc, val| acc + val);
+
+    let a4 = 1..10;
+    _ = a4.fold(0, |acc, val| acc); // $ Alert[rust/unused-variable]
+
+    let a5 = 1..10;
+    _ = a5.fold(0, |acc, val| val); // $ Alert[rust/unused-variable]
+
+    let i6 = 1;
+    let a6 = 1..10;
+    _ = a6.fold(0, |acc, val| acc + val + i6);
+}
+
+// --- traits ---
+
+trait Incrementable {
+    fn increment(&mut self, times: i32, unused: &mut i32);
+}
+
+struct MyValue {
+    value: i32,
+}
+
+impl Incrementable for MyValue {
+    fn increment(
+        &mut self,
+        times: i32,
+        unused: &mut i32, // $ Alert[rust/unused-variable]
+    ) {
+        self.value += times;
+    }
+}
+
+fn traits() {
+    let mut i = MyValue { value: 0 };
+    let a = 1;
+    let mut b = 2;
+
+    i.increment(a, &mut b);
+}
+
+// --- macros ---
+
+fn macros() {
+    let x;
+    println!(
+        "The value of x is {}",
+        ({
+            x = 10; // $ MISSING: Alert[rust/unused-value]
+            10
+        })
+    )
+}
+// --- references ---
+
+fn references() {
+    let a = 1;
+    let b = &a;
+    let c = *b; // $ Alert[rust/unused-value]
+    let d = 2;
+    let e = 3;
+    let f = &&e;
+
+    assert!(&d != *f);
+}
+
+// --- declarations in types ---
+
+pub struct my_declaration {
+    field1: fn(i32) -> i32,
+    field2: fn(x: i32) -> i32,
+    field3: fn(y:
+        fn(z: i32) -> i32) -> i32,
+}
+
+type MyType = fn(x: i32) -> i32;
+
+trait MyTrait {
+    fn my_func2(&self, x: i32) -> i32;
+}
+
+// --- main ---
+
+fn main() {
+    locals_1();
+    locals_2();
+    structs();
+    arrays();
+    statics();
+    println!("lets use result {}", parameters(1, 2, 3));
+    loops();
+    if_lets_matches();
+    shadowing();
+    func_ptrs();
+    folds_and_closures();
+    macros();
+    references();
+
+    generics();
+    pointers();
+
+    unreachable_if_1();
+    unreachable_if_2();
+    unreachable_if_3();
+    unreachable_panic();
+    _ = unreachable_bail();
+    unreachable_match();
+    unreachable_loop();
+    unreachable_loop_async();
+    unreachable_paren();
+    unreachable_let_1();
+    unreachable_let_2();
+    unreachable_attributes();
+}
diff --git a/rust/ql/test/query-tests/unusedentities/more.rs b/rust/ql/test/query-tests/unusedentities/more.rs
new file mode 100644
index 00000000000..27acf729ef6
--- /dev/null
+++ b/rust/ql/test/query-tests/unusedentities/more.rs
@@ -0,0 +1,83 @@
+// --- generics ---
+
+trait MySettable<T> {
+    fn set(&mut self, val: T);
+}
+
+trait MyGettable<T> {
+    fn get(&self, val: T) -> &T;
+}
+
+struct MyContainer<T> {
+    val: T,
+}
+
+impl<T> MySettable<T> for MyContainer<T> {
+    fn set(&mut self, val: T) {
+        self.val = val;
+    }
+}
+
+impl<T> MyGettable<T> for MyContainer<T> {
+    fn get(
+        &self,
+        val: T, // $ Alert[rust/unused-variable]
+    ) -> &T {
+        return &(self.val);
+    }
+}
+
+pub fn generics() {
+    let mut a = MyContainer { val: 1 }; // $ MISSING: Alert[rust/unused-value]
+    let b = MyContainer { val: 2 };
+
+    a.set(*b.get(3));
+}
+
+// --- pointers ---
+
+pub fn pointers() {
+    let a = 1;
+    let a_ptr1 = &a;
+    let a_ptr2 = &a;
+    let a_ptr3 = &a; // $ MISSING: Alert[rust/unused-value]
+    let a_ptr4 = &a; // $ Alert[rust/unused-value]
+    println!("{}", *a_ptr1);
+    println!("{}", a_ptr2);
+    println!("{}", &a_ptr3);
+
+    let b = 2; // $ MISSING: Alert[rust/unused-value]
+    let b_ptr = &b;
+    println!("{}", b_ptr);
+
+    let c = 3;
+    let c_ptr = &c;
+    let c_ptr_ptr = &c_ptr;
+    println!("{}", **c_ptr_ptr);
+
+    let d = 4;
+    let d_ptr = &d; // $ Alert[rust/unused-value]
+    let d_ptr_ptr = &&d;
+    println!("{}", **d_ptr_ptr);
+
+    let e = 5; // $ MISSING: Alert[rust/unused-value]
+    let f = 6;
+    let mut f_ptr = &e; // $ Alert[rust/unused-value]
+    f_ptr = &f;
+    println!("{}", *f_ptr);
+
+    let mut g = 7; // $ MISSING: Alert[rust/unused-value]
+    let g_ptr = &mut g;
+    *g_ptr = 77; // $ MISSING: Alert[rust/unused-value]
+
+    let mut h = 8; // $ MISSING: Alert[rust/unused-value]
+    let h_ptr = &mut h;
+    *h_ptr = 88;
+    println!("{}", h);
+
+    let mut i = 9; // $ MISSING: Alert[rust/unused-value]
+    let i_ptr = &mut i;
+    *i_ptr = 99;
+    let i_ptr2 = &mut i;
+    println!("{}", *i_ptr2);
+}
diff --git a/rust/ql/test/query-tests/unusedentities/unreachable.rs b/rust/ql/test/query-tests/unusedentities/unreachable.rs
new file mode 100644
index 00000000000..f55459a0e6e
--- /dev/null
+++ b/rust/ql/test/query-tests/unusedentities/unreachable.rs
@@ -0,0 +1,383 @@
+pub fn cond() -> bool {
+    get_a_number() == 1
+}
+
+fn get_a_number() -> i32 {
+    maybe_get_a_number().unwrap_or(0)
+}
+
+fn maybe_get_a_number() -> Option<i32> {
+    std::env::args().nth(1).map(|s| s.parse::<i32>().unwrap())
+}
+
+// --- unreachable code --
+
+fn do_something() {}
+
+pub fn unreachable_if_1() {
+    if false {
+        do_something(); // $ Alert[rust/dead-code]
+    } else {
+        do_something();
+    }
+
+    if true {
+        do_something();
+    } else {
+        do_something(); // $ Alert[rust/dead-code]
+    }
+
+    let v = get_a_number();
+    if v == 1 {
+        if v != 1 {
+            do_something(); // $ MISSING: Alert[rust/dead-code]
+        }
+    }
+
+    if cond() {
+        return;
+        do_something(); // $ Alert[rust/dead-code]
+    }
+
+    if cond() {
+        do_something();
+    } else {
+        return;
+        do_something(); // $ Alert[rust/dead-code]
+    }
+    do_something();
+
+    if cond() {
+        let x = cond();
+
+        if (x) {
+            do_something();
+            if (!x) {
+                do_something(); // $ MISSING: Alert[rust/dead-code]
+            }
+            do_something();
+        }
+    }
+
+    if cond() {
+        return;
+    } else {
+        return;
+    }
+    do_something(); // $ Alert[rust/dead-code]
+}
+
+pub fn unreachable_if_2() {
+    if cond() {
+        do_something();
+        return;
+    } else {
+        do_something();
+    }
+
+    do_something();
+}
+
+pub fn unreachable_if_3() {
+    if !cond() {
+        do_something();
+        return;
+    }
+
+    do_something();
+}
+
+pub fn unreachable_panic() {
+    if cond() {
+        do_something();
+        panic!("Oh no!!!");
+        do_something(); // $ MISSING: Alert[rust/dead-code]
+    }
+
+    if cond() {
+        do_something();
+        unimplemented!();
+        do_something(); // $ MISSING: Alert[rust/dead-code]
+    }
+
+    if cond() {
+        do_something();
+        todo!();
+        do_something(); // $ MISSING: Alert[rust/dead-code]
+    }
+
+    if cond() {
+        do_something();
+        unreachable!();
+        do_something(); // $ MISSING: Alert[rust/dead-code]
+    }
+
+    if cond() {
+        let mut maybe;
+
+        maybe = Some("Thing");
+        _ = maybe.unwrap(); // (safe)
+        do_something();
+
+        maybe = if cond() { Some("Other") } else { None };
+        _ = maybe.unwrap(); // (might panic)
+        do_something();
+
+        maybe = None;
+        _ = maybe.unwrap(); // (always panics)
+        do_something(); // $ MISSING: Alert[rust/dead-code]
+    }
+
+    if cond() {
+        do_something();
+        _ = false && // .
+            panic!(); // $ Alert[rust/dead-code]
+        do_something();
+        _ = false || panic!();
+        do_something(); // $ MISSING: Alert[rust/dead-code]
+    }
+
+    if cond() {
+        do_something();
+        _ = true || // .
+            panic!(); // $ Alert[rust/dead-code]
+        do_something();
+        _ = true && panic!();
+        do_something(); // $ MISSING: Alert[rust/dead-code]
+    }
+}
+
+macro_rules! bail_1 {
+    () => {
+        return Err(String::from("message"))
+    };
+}
+
+macro_rules! bail_2 {
+    ($message:literal) => {
+        return Err(String::from($message))
+    };
+}
+
+pub fn unreachable_bail() -> Result<i32, String> {
+    if cond() {
+        do_something();
+        return Err(String::from("message"));
+        do_something(); // $ Alert[rust/dead-code]
+    }
+
+    if cond() {
+        do_something();
+        bail_1!(); // $ SPURIOUS: Alert[rust/dead-code]
+        do_something(); // $ MISSING: Alert[rust/dead-code]
+    }
+
+    if cond() {
+        do_something();
+        bail_2!("message"); // $ SPURIOUS: Alert[rust/dead-code]
+    }
+    do_something();
+
+    Ok(1)
+}
+
+pub fn unreachable_match() {
+    if cond() {
+        match get_a_number() {
+            1 => {
+                return;
+            }
+            _ => {
+                do_something();
+            }
+        }
+        do_something();
+    }
+
+    if cond() {
+        match get_a_number() {
+            1 => {
+                return;
+            }
+            _ => {
+                return;
+            }
+        }
+        do_something(); // $ Alert[rust/dead-code]
+    }
+
+    if cond() {
+        _ = match get_a_number() {
+            1 => "One",
+            _ => "Some"
+        };
+        do_something();
+    }
+
+    if cond() {
+        _ = Some(match get_a_number() {
+            1 => "One",
+            _ => "Some"
+        });
+        do_something();
+    }
+}
+
+pub fn unreachable_loop() {
+    if cond() {
+        loop {
+            do_something();
+            break;
+            do_something(); // $ Alert[rust/dead-code]
+        }
+    }
+
+    if cond() {
+        while cond() {
+            do_something();
+        }
+
+        while false {
+            do_something(); // $ Alert[rust/dead-code]
+        }
+
+        while true {
+            do_something();
+        }
+        do_something(); // $ Alert[rust/dead-code]
+    }
+
+    if cond() {
+        for _ in 1..10 {
+            if cond() {
+                continue;
+                do_something(); // $ Alert[rust/dead-code]
+            }
+            do_something();
+        }
+    }
+
+    if cond() {
+        loop {
+            if cond() {
+                return;
+                do_something(); // $ Alert[rust/dead-code]
+            }
+        }
+        do_something(); // $ Alert[rust/dead-code]
+        do_something();
+        do_something();
+    }
+
+    if cond() {
+        fn do_nothing() { };
+        fn loop_forever() { loop {} };
+        fn take_a_fn(_: fn() -> ()) {
+        };
+        fn call_a_fn(f: fn() -> ()) {
+            f();
+        };
+
+        take_a_fn( do_nothing );
+        call_a_fn( do_nothing );
+        take_a_fn( loop_forever );
+        call_a_fn( loop_forever );
+        do_something(); // $ MISSING: Alert[rust/dead-code]
+    }
+}
+
+async fn do_something_async() {}
+
+pub async fn unreachable_loop_async() {
+    let for_ten = async {
+        for _ in 1..10 {
+            do_something_async().await;
+        }
+        do_something();
+    };
+
+    let for_ever = async {
+        loop {
+            do_something_async().await;
+        }
+        do_something(); // $ Alert[rust/dead-code]
+    };
+
+    do_something();
+    for_ten.await;
+    do_something();
+    for_ever.await;
+    do_something(); // $ MISSING: Alert[rust/dead-code]
+}
+
+pub fn unreachable_paren() {
+    let _ = (((1)));
+}
+
+pub fn unreachable_let_1() {
+    if let Some(_) = maybe_get_a_number() {
+        do_something();
+        return;
+    } else {
+        do_something();
+    }
+
+    do_something();
+
+    if let _ = get_a_number() {
+        // (always succeeds)
+        do_something();
+        return;
+    } else {
+        do_something(); // $ Alert[rust/dead-code]
+    }
+
+    do_something();
+}
+
+pub fn unreachable_let_2() {
+    let Some(_) = maybe_get_a_number() else {
+        do_something();
+        return;
+    };
+
+    do_something();
+
+    let _ = maybe_get_a_number() else {
+        // (always succeeds)
+        do_something(); // $ Alert[rust/dead-code]
+        return;
+    };
+
+    do_something();
+}
+
+#[cfg(not(foo))]
+pub fn unreachable_attributes() {
+    // `#[cfg` and `cfg!` checks can go either way, we should not assume this
+    // function or either branch below is unreachable.
+    if cfg!(bar) {
+        do_something();
+    } else {
+        do_something();
+    }
+
+    #[doc="This is a doc comment declared through an attribute."]
+
+    if (true) {
+        do_something();
+    } else {
+        do_something(); // $ Alert[rust/dead-code]
+    }
+}
+
+const _: () = {
+    _ = 1; // $ SPURIOUS: Alert[rust/dead-code]
+};
+
+const _: () = {
+    const fn foo() {
+        _ = 1;
+    };
+    foo(); // $ SPURIOUS: Alert[rust/dead-code]
+};
diff --git a/rust/ql/test/utils/Cfg.expected b/rust/ql/test/utils/Cfg.expected
new file mode 100644
index 00000000000..f19a576c93a
--- /dev/null
+++ b/rust/ql/test/utils/Cfg.expected
@@ -0,0 +1,3 @@
+edges
+breakTarget
+continueTarget
diff --git a/rust/ql/test/library-tests/controlflow/Cfg.ql b/rust/ql/test/utils/Cfg.ql
similarity index 60%
rename from rust/ql/test/library-tests/controlflow/Cfg.ql
rename to rust/ql/test/utils/Cfg.ql
index 7792c6c9cc1..ee9a967553d 100644
--- a/rust/ql/test/library-tests/controlflow/Cfg.ql
+++ b/rust/ql/test/utils/Cfg.ql
@@ -1,15 +1,13 @@
-/**
- * @id rust/controlflow/cfg
- */
-
 import rust
 import codeql.rust.controlflow.ControlFlowGraph
 import TestUtils
 
 class MyRelevantNode extends CfgNode {
   MyRelevantNode() { toBeTested(this.getScope()) }
-
-  string getOrderDisambiguation() { result = "" }
 }
 
 import codeql.rust.controlflow.internal.ControlFlowGraphImpl::TestOutput<MyRelevantNode>
+
+query predicate breakTarget(BreakExpr be, Expr target) { target = be.getTarget() }
+
+query predicate continueTarget(ContinueExpr ce, Expr target) { target = ce.getTarget() }
diff --git a/rust/ql/test/utils/InlineExpectationsTest.qll b/rust/ql/test/utils/InlineExpectationsTest.qll
new file mode 100644
index 00000000000..840e04ccbe0
--- /dev/null
+++ b/rust/ql/test/utils/InlineExpectationsTest.qll
@@ -0,0 +1,8 @@
+/**
+ * Inline expectation tests for Rust.
+ * See `shared/util/codeql/util/test/InlineExpectationsTest.qll`
+ */
+
+private import codeql.util.test.InlineExpectationsTest
+private import internal.InlineExpectationsTestImpl
+import Make<Impl>
diff --git a/rust/ql/test/utils/InlineExpectationsTestQuery.ql b/rust/ql/test/utils/InlineExpectationsTestQuery.ql
new file mode 100644
index 00000000000..e5821ba4f50
--- /dev/null
+++ b/rust/ql/test/utils/InlineExpectationsTestQuery.ql
@@ -0,0 +1,21 @@
+/**
+ * @kind test-postprocess
+ */
+
+private import rust
+private import codeql.util.test.InlineExpectationsTest as T
+private import internal.InlineExpectationsTestImpl
+import T::TestPostProcessing
+import T::TestPostProcessing::Make<Impl, Input>
+
+private module Input implements T::TestPostProcessing::InputSig<Impl> {
+  string getRelativeUrl(Location location) {
+    exists(File f, int startline, int startcolumn, int endline, int endcolumn |
+      location.hasLocationInfo(_, startline, startcolumn, endline, endcolumn) and
+      f = location.getFile()
+    |
+      result =
+        f.getRelativePath() + ":" + startline + ":" + startcolumn + ":" + endline + ":" + endcolumn
+    )
+  }
+}
diff --git a/rust/ql/test/utils/InlineFlowTest.qll b/rust/ql/test/utils/InlineFlowTest.qll
new file mode 100644
index 00000000000..b4960a055ee
--- /dev/null
+++ b/rust/ql/test/utils/InlineFlowTest.qll
@@ -0,0 +1,43 @@
+/**
+ * Inline flow tests for Rust.
+ * See `shared/util/codeql/dataflow/test/InlineFlowTest.qll`
+ */
+
+import rust
+private import codeql.dataflow.test.InlineFlowTest
+private import codeql.rust.dataflow.DataFlow
+private import codeql.rust.dataflow.internal.DataFlowImpl
+private import codeql.rust.dataflow.internal.TaintTrackingImpl
+private import internal.InlineExpectationsTestImpl as InlineExpectationsTestImpl
+
+// Holds if the target expression of `call` is a path and the string representation of the path is `name`.
+private predicate callTargetName(CallExpr call, string name) {
+  call.getExpr().(PathExpr).toString() = name
+}
+
+private module FlowTestImpl implements InputSig<Location, RustDataFlow> {
+  predicate defaultSource(DataFlow::Node source) { callTargetName(source.asExpr(), "source") }
+
+  predicate defaultSink(DataFlow::Node sink) {
+    any(CallExpr call | callTargetName(call, "sink")).getArgList().getAnArg() = sink.asExpr()
+  }
+
+  private string getSourceArgString(DataFlow::Node src) {
+    defaultSource(src) and
+    result = src.asExpr().(CallExpr).getArgList().getArg(0).toString()
+  }
+
+  bindingset[src, sink]
+  string getArgString(DataFlow::Node src, DataFlow::Node sink) {
+    (
+      result = getSourceArgString(src)
+      or
+      not exists(getSourceArgString(src)) and result = ""
+    ) and
+    exists(sink)
+  }
+
+  predicate interpretModelForTest(QlBuiltins::ExtensionId madId, string model) { none() }
+}
+
+import InlineFlowTestMake<Location, RustDataFlow, RustTaintTracking, InlineExpectationsTestImpl::Impl, FlowTestImpl>
diff --git a/rust/ql/test/utils/internal/InlineExpectationsTestImpl.qll b/rust/ql/test/utils/internal/InlineExpectationsTestImpl.qll
new file mode 100644
index 00000000000..2e851f52951
--- /dev/null
+++ b/rust/ql/test/utils/internal/InlineExpectationsTestImpl.qll
@@ -0,0 +1,12 @@
+private import rust as R
+private import R
+private import codeql.util.test.InlineExpectationsTest
+
+module Impl implements InlineExpectationsTestSig {
+  class ExpectationComment extends R::Comment {
+    /** Gets the contents of the given comment, _without_ the preceding comment marker (`//`). */
+    string getContents() { result = this.getCommentText() }
+  }
+
+  class Location = R::Location;
+}
diff --git a/rust/schema.py b/rust/schema.py
deleted file mode 100644
index 4739e8ab65e..00000000000
--- a/rust/schema.py
+++ /dev/null
@@ -1,1014 +0,0 @@
-"""
-Schema description
-
-This file should be kept simple:
-* no flow control
-* no aliases
-* only class definitions with annotations and `include` calls
-
-For how documentation of generated QL code works, please read `misc/codegen/schema_documentation.md`.
-"""
-
-from misc.codegen.lib.schemadefs import *
-
-include("../shared/tree-sitter-extractor/src/generator/prefix.dbscheme")
-include("prefix.dbscheme")
-
-
-@qltest.skip
-class Element:
-    pass
-
-@qltest.skip
-class Locatable(Element):
-    pass
-
-
-@qltest.skip
-class AstNode(Locatable):
-    pass
-
-
-@qltest.skip
-class Unextracted(Element):
-    """
-    The base class marking everything that was not properly extracted for some reason, such as:
-    * syntax errors
-    * insufficient context information
-    * yet unimplemented parts of the extractor
-    """
-    pass
-
-
-@qltest.skip
-class Missing(Unextracted):
-    """
-    The base class marking errors during parsing or resolution.
-    """
-
-
-@qltest.skip
-class Unimplemented(Unextracted):
-    """
-    The base class for unimplemented nodes. This is used to mark nodes that are not yet extracted.
-    """
-    pass
-
-
-class Declaration(AstNode):
-    """
-    The base class for declarations.
-    """
-    pass
-
-
-@qltest.skip
-class UnimplementedDeclaration(Declaration, Unimplemented):
-    """
-    A declaration that is not yet extracted.
-    """
-    pass
-
-
-@rust.doc_test_signature(None)
-class Module(Declaration):
-    """
-    A module declaration. For example:
-    ```rust
-    mod foo;
-    ```
-    ```rust
-    mod bar {
-        pub fn baz() {}
-    }
-    ```
-    """
-    declarations: list[Declaration] | child
-
-
-class Expr(AstNode):
-    """
-    The base class for expressions.
-    """
-    pass
-
-
-class Pat(AstNode):
-    """
-    The base class for patterns.
-    """
-    pass
-
-
-class Label(AstNode):
-    """
-    A label. For example:
-    ```rust
-    'label: loop {
-        println!("Hello, world (once)!");
-        break 'label;
-    };
-    ```
-    """
-    name: string
-
-
-class Stmt(AstNode):
-    """
-    The base class for statements.
-    """
-    pass
-
-
-class TypeRef(AstNode, Unimplemented):
-    """
-    The base class for type references.
-    ```rust
-    let x: i32;
-    let y: Vec<i32>;
-    let z: Option<i32>;
-    ```
-    """
-    pass
-
-
-class Path(AstNode, Unimplemented):
-    """
-    A path. For example:
-    ```rust
-    foo::bar;
-    ```
-    """
-    pass
-
-
-class GenericArgList(AstNode, Unimplemented):
-    """
-    The base class for generic arguments.
-    ```rust
-    x.foo::<u32, u64>(42);
-    ```
-    """
-    pass
-
-
-@rust.doc_test_signature(None)
-class Function(Declaration):
-    """
-    A function declaration. For example
-    ```rust
-    fn foo(x: u32) -> u64 {(x + 1).into()}
-    ```
-    A function declaration within a trait might not have a body:
-    ```rust
-    trait Trait {
-        fn bar();
-    }
-    ```
-    """
-    name: string
-    body: Expr | child
-
-
-class MissingExpr(Expr, Missing):
-    """
-    A missing expression, used as a placeholder for incomplete syntax.
-
-    ```rust
-    let x = non_existing_macro!();
-    ```
-    """
-    pass
-
-
-class PathExpr(Expr):
-    """
-    A path expression. For example:
-    ```rust
-    let x = variable;
-    let x = foo::bar;
-    let y = <T>::foo;
-    let z = <TypeRef as Trait>::foo;
-    ```
-    """
-    path: Path | child
-
-
-class IfExpr(Expr):
-    """
-    An `if` expression. For example:
-    ```rust
-    if x == 42 {
-        println!("that's the answer");
-    }
-    ```
-    ```rust
-    let y = if x > 0 {
-        1
-    } else {
-        0
-    }
-    ```
-    """
-    condition: Expr | child
-    then: Expr | child
-    else_: optional[Expr] | child
-
-
-@rust.doc_test_signature("(maybe_some: Option<String>) -> ()")
-class LetExpr(Expr):
-    """
-    A `let` expression. For example:
-    ```rust
-    if let Some(x) = maybe_some {
-        println!("{}", x);
-    }
-    ```
-    """
-    pat: Pat | child
-    expr: Expr | child
-
-
-class BlockExprBase(Expr):
-    statements: list[Stmt] | child
-    tail: optional[Expr] | child
-
-
-class BlockExpr(BlockExprBase):
-    """
-    A block expression. For example:
-    ```rust
-    {
-        let x = 42;
-    }
-    ```
-    ```rust
-    'label: {
-        let x = 42;
-        x
-    }
-    ```
-    """
-    label: optional[Label] | child
-
-
-@rust.doc_test_signature("() -> i32")
-class AsyncBlockExpr(BlockExprBase):
-    """
-    An async block expression. For example:
-    ```rust
-    async {
-       let x = 42;
-       x
-    }.await
-    ```
-    """
-    pass
-
-
-@rust.doc_test_signature("() -> bool")
-class ConstExpr(Expr):
-    """
-    A `const` block expression. For example:
-    ```rust
-    if const { SRC::IS_ZST || DEST::IS_ZST || mem::align_of::<SRC>() != mem::align_of::<DEST>() } {
-        return false;
-    }
-    ```
-    """
-    expr: Expr | child
-
-
-class UnsafeBlockExpr(BlockExprBase):
-    """
-    An unsafe block expression. For example:
-    ```rust
-    let layout = unsafe {
-        let x = 42;
-        Layout::from_size_align_unchecked(size, align)
-    };
-    ```
-    """
-    pass
-
-
-class LoopExpr(Expr):
-    """
-    A loop expression. For example:
-    ```rust
-    loop {
-        println!("Hello, world (again)!");
-    };
-    ```
-    ```rust
-    'label: loop {
-        println!("Hello, world (once)!");
-        break 'label;
-    };
-    ```
-    ```rust
-    let mut x = 0;
-    loop {
-        if x < 10 {
-            x += 1;
-        } else {
-            break;
-        }
-    };
-    ```
-    """
-    body: Expr | child
-    label: optional[Label] | child
-
-
-class CallExpr(Expr):
-    """
-    A function call expression. For example:
-    ```rust
-    foo(42);
-    foo::<u32, u64>(42);
-    foo[0](42);
-    foo(1) = 4;
-    ```
-    """
-    callee: Expr | child
-    args: list[Expr] | child
-    is_assignee_expr: predicate
-
-
-class MethodCallExpr(Expr):
-    """
-    A method call expression. For example:
-    ```rust
-    x.foo(42);
-    x.foo::<u32, u64>(42);
-    ```
-    """
-    receiver: Expr | child
-    method_name: string
-    args: list[Expr] | child
-    generic_args: optional[GenericArgList] | child
-
-
-@rust.doc_test_signature("(x: i32) -> i32")
-class MatchArm(AstNode):
-    """
-    A match arm. For example:
-    ```rust
-    match x {
-        Option::Some(y) => y,
-        Option::None => 0,
-    };
-    ```
-    ```rust
-    match x {
-        Some(y) if y != 0 => 1 / y,
-        _ => 0,
-    };
-    ```
-    """
-    pat: Pat | child
-    guard: optional[Expr] | child
-    expr: Expr | child
-
-
-@rust.doc_test_signature("(x: i32) -> i32")
-class MatchExpr(Expr):
-    """
-    A match expression. For example:
-    ```rust
-    match x {
-        Option::Some(y) => y,
-        Option::None => 0,
-    }
-    ```
-    ```rust
-    match x {
-        Some(y) if y != 0 => 1 / y,
-        _ => 0,
-    }
-    ```
-    """
-    expr: Expr | child
-    branches: list[MatchArm] | child
-
-
-class ContinueExpr(Expr):
-    """
-    A continue expression. For example:
-    ```rust
-    loop {
-        if not_ready() {
-            continue;
-        }
-    }
-    ```
-    ```rust
-    'label: loop {
-        if not_ready() {
-            continue 'label;
-        }
-    }
-    ```
-    """
-    label: optional[Label] | child
-
-
-class BreakExpr(Expr):
-    """
-    A break expression. For example:
-    ```rust
-    loop {
-        if not_ready() {
-            break;
-         }
-    }
-    ```
-    ```rust
-    let x = 'label: loop {
-        if done() {
-            break 'label 42;
-        }
-    };
-    ```
-  """
-    expr: optional[Expr] | child
-    label: optional[Label] | child
-
-
-@rust.doc_test_signature(None)
-class ReturnExpr(Expr):
-    """
-    A return expression. For example:
-    ```rust
-    fn some_value() -> i32 {
-        return 42;
-    }
-    ```
-    ```rust
-    fn no_value() -> () {
-        return;
-    }
-    ```
-    """
-    expr: optional[Expr] | child
-
-
-@rust.doc_test_signature(None)
-class BecomeExpr(Expr):
-    """
-    A `become` expression. For example:
-    ```rust
-    fn fact_a(n: i32, a: i32) -> i32 {
-         if n == 0 {
-             a
-         } else {
-             become fact_a(n - 1, n * a)
-         }
-    }
-    ```
-    """
-    expr: Expr | child
-
-
-class YieldExpr(Expr):
-    """
-    A `yield` expression. For example:
-    ```rust
-    let one = #[coroutine]
-        || {
-            yield 1;
-        };
-    ```
-    """
-    expr: optional[Expr] | child
-
-
-class YeetExpr(Expr):
-    """
-    A `yeet` expression. For example:
-    ```rust
-    if x < size {
-       do yeet "index out of bounds";
-    }
-    ```
-    """
-    expr: optional[Expr] | child
-
-
-class RecordExprField(AstNode):
-    """
-    A field in a record expression. For example `a: 1` in:
-    ```rust
-    Foo { a: 1, b: 2 };
-    ```
-    """
-    name: string
-    expr: Expr | child
-
-
-class RecordExpr(Expr):
-    """
-    A record expression. For example:
-    ```rust
-    let first = Foo { a: 1, b: 2 };
-    let second = Foo { a: 2, ..first };
-    Foo { a: 1, b: 2 }[2] = 10;
-    Foo { .. } = second;
-    ```
-    """
-    path: optional[Path] | child
-    flds: list[RecordExprField] | child
-    spread: optional[Expr] | child
-    has_ellipsis: predicate
-    is_assignee_expr: predicate
-
-
-class FieldExpr(Expr):
-    """
-    A field access expression. For example:
-    ```rust
-    x.foo
-    ```
-    """
-    expr: Expr | child
-    name: string
-
-
-class AwaitExpr(Expr):
-    """
-    An `await` expression. For example:
-    ```rust
-    async {
-        let x = foo().await;
-        x
-    }
-    ```
-    """
-    expr: Expr | child
-
-
-class CastExpr(Expr):
-    """
-    A cast expression. For example:
-    ```rust
-    value as u64;
-    ```
-    """
-    expr: Expr | child
-    type: TypeRef | child
-
-
-class RefExpr(Expr):
-    """
-    A reference expression. For example:
-    ```rust
-        let ref_const = &foo;
-        let ref_mut = &mut foo;
-        let raw_const: &mut i32 = &raw const foo;
-        let raw_mut: &mut i32 = &raw mut foo;
-    ```
-    """
-    expr: Expr | child
-    is_raw: predicate
-    is_mut: predicate
-
-
-class BoxExpr(Expr):
-    """
-    A box expression. For example:
-    ```rust
-    let x = #[rustc_box] Box::new(42);
-    ```
-    """
-    expr: Expr | child
-
-
-class PrefixExpr(Expr):
-    """
-    A unary operation expression. For example:
-    ```rust
-    let x = -42
-    let y = !true
-    let z = *ptr
-    ```
-    """
-    expr: Expr | child
-    op: string
-
-
-class BinaryExpr(Expr):
-    """
-    A binary operation expression. For example:
-    ```rust
-    x + y;
-    x && y;
-    x <= y;
-    x = y;
-    x += y;
-    ```
-    """
-    lhs: Expr | child
-    rhs: Expr | child
-    op: optional[string]
-
-
-class RangeExpr(Expr):
-    """
-    A range expression. For example:
-    ```rust
-    let x = 1..=10;
-    let x = 1..10;
-    let x = 10..;
-    let x = ..10;
-    let x = ..=10;
-    let x = ..;
-    ```
-    """
-    lhs: optional[Expr] | child
-    rhs: optional[Expr] | child
-    is_inclusive: predicate
-
-
-class IndexExpr(Expr):
-    """
-    An index expression. For example:
-    ```rust
-    list[42];
-    list[42] = 1;
-    ```
-    """
-    base: Expr | child
-    index: Expr | child
-    is_assignee_expr: predicate
-
-
-class ClosureExpr(Expr):
-    """
-    A closure expression. For example:
-    ```rust
-    |x| x + 1;
-    move |x: i32| -> i32 { x + 1 };
-    async |x: i32, y| x + y;
-     #[coroutine]
-    |x| yield x;
-     #[coroutine]
-     static |x| yield x;
-    ```
-    """
-    args: list[Pat] | child
-    arg_types: list[optional[TypeRef]] | child
-    ret_type: optional[TypeRef] | child
-    body: Expr | child
-    closure_kind: string
-    is_move: predicate
-
-
-class TupleExpr(Expr):
-    """
-    A tuple expression. For example:
-    ```rust
-    (1, "one");
-    (2, "two")[0] = 3;
-    ```
-    """
-    exprs: list[Expr] | child
-    is_assignee_expr: predicate
-
-
-class ArrayExpr(Expr):
-    """
-    An array expression. For example:
-    ```rust
-    [1, 2, 3];
-    [1; 10];
-    ```
-    """
-    pass
-
-
-class ElementListExpr(ArrayExpr):
-    """
-    An element list expression. For example:
-    ```rust
-    [1, 2, 3, 4, 5];
-    [1, 2, 3, 4, 5][0] = 6;
-    ```
-    """
-    elements: list[Expr] | child
-    is_assignee_expr: predicate
-
-
-class RepeatExpr(ArrayExpr):
-    """
-    A repeat expression. For example:
-    ```rust
-    [1; 10];
-    ```
-    """
-    initializer: Expr | child
-    repeat: Expr | child
-
-
-class LiteralExpr(Expr):
-    """
-    A literal expression. For example:
-    ```rust
-    42;
-    42.0;
-    "Hello, world!";
-    b"Hello, world!";
-    'x';
-    b'x';
-    r"Hello, world!";
-    true;
-    ```
-    """
-    pass
-
-
-class UnderscoreExpr(Expr):
-    """
-    An underscore expression. For example:
-    ```rust
-    _ = 42;
-    ```
-    """
-    pass
-
-
-class OffsetOfExpr(Expr):
-    """
-     An `offset_of` expression. For example:
-    ```rust
-    builtin # offset_of(Struct, field);
-    ```
-    """
-    container: TypeRef | child
-    fields: list[string]
-
-
-class AsmExpr(Expr):
-    """
-    An inline assembly expression. For example:
-    ```rust
-    unsafe {
-        builtin # asm(_);
-    }
-    ```
-    """
-    expr: Expr | child
-
-
-class LetStmt(Stmt):
-    """
-    A let statement. For example:
-    ```rust
-    let x = 42;
-    let x: i32 = 42;
-    let x: i32;
-    let x;
-    let (x, y) = (1, 2);
-    let Some(x) = std::env::var("FOO") else {
-        return;
-    };
-    ```
-    """
-    pat: Pat | child
-    type: optional[TypeRef] | child
-    initializer: optional[Expr] | child
-    else_: optional[Expr] | child
-
-
-class ExprStmt(Stmt):
-    """
-    An expression statement. For example:
-    ```rust
-    start();
-    finish()
-    use std::env;
-    ```
-    """
-    expr: Expr | child
-    has_semicolon: predicate
-
-
-# At the HIR-level, we don't have items, only some markers without location indicating where they used to be.
-@qltest.skip
-class ItemStmt(Stmt):
-    """
-    An item statement. For example:
-    ```rust
-    fn print_hello() {
-        println!("Hello, world!");
-    }
-    print_hello();
-    ```
-    """
-    pass
-
-
-class MissingPat(Pat, Missing):
-    """
-    A missing pattern, used as a place holder for incomplete syntax.
-    ```rust
-    match Some(42) {
-        .. => "bad use of .. syntax",
-    };
-    ```
-    """
-    pass
-
-
-class WildcardPat(Pat):
-    """
-    A wildcard pattern. For example:
-    ```rust
-    let _ = 42;
-    ```
-    """
-    pass
-
-
-class TuplePat(Pat):
-    """
-    A tuple pattern. For example:
-    ```rust
-    let (x, y) = (1, 2);
-    let (a, b, ..,  z) = (1, 2, 3, 4, 5);
-    ```
-    """
-    args: list[Pat] | child
-    ellipsis_index: optional[int]
-
-
-class OrPat(Pat):
-    """
-    An or pattern. For example:
-    ```rust
-    match x {
-        Option::Some(y) | Option::None => 0,
-    }
-    ```
-    """
-    args: list[Pat] | child
-
-
-class RecordPatField(AstNode):
-    """
-    A field in a record pattern. For example `a: 1` in:
-    ```rust
-    let Foo { a: 1, b: 2 } = foo;
-    ```
-    """
-    name: string
-    pat: Pat | child
-
-
-class RecordPat(Pat):
-    """
-    A record pattern. For example:
-    ```rust
-    match x {
-        Foo { a: 1, b: 2 } => "ok",
-        Foo { .. } => "fail",
-    }
-    ```
-    """
-
-    path: optional[Path] | child
-    flds: list[RecordPatField] | child
-    has_ellipsis: predicate
-
-
-class RangePat(Pat):
-    """
-    A range pattern. For example:
-    ```rust
-    match x {
-        ..15 => "too cold",
-        16..=25 => "just right",
-        26.. => "too hot",
-    }
-    ```
-    """
-    start: optional[Pat] | child
-    end: optional[Pat] | child
-
-
-class SlicePat(Pat):
-    """
-    A slice pattern. For example:
-    ```rust
-    match x {
-        [1, 2, 3, 4, 5] => "ok",
-        [1, 2, ..] => "fail",
-        [x, y, .., z, 7] => "fail",
-    }
-    ```
-    """
-    prefix: list[Pat] | child
-    slice: optional[Pat] | child
-    suffix: list[Pat] | child
-
-
-class PathPat(Pat):
-    """
-    A path pattern. For example:
-    ```rust
-    match x {
-        Foo::Bar => "ok",
-        _ => "fail",
-    }
-    ```
-    """
-    path: Path | child
-
-
-class LiteralPat(Pat):
-    """
-    A literal pattern. For example:
-    ```rust
-    match x {
-        42 => "ok",
-        _ => "fail",
-    }
-    ```
-    """
-    expr: Expr | child
-
-
-class IdentPat(Pat):
-    """
-    A binding pattern. For example:
-    ```rust
-    match x {
-        Option::Some(y) => y,
-        Option::None => 0,
-    };
-    ```
-    ```rust
-    match x {
-        y@Option::Some(_) => y,
-        Option::None => 0,
-    };
-    ```
-    """
-    binding_id: string
-    subpat: optional[Pat] | child
-
-
-class TupleStructPat(Pat):
-    """
-    A tuple struct pattern. For example:
-    ```rust
-    match x {
-        Tuple("a", 1, 2, 3) => "great",
-        Tuple(.., 3) => "fine",
-        Tuple(..) => "fail",
-    };
-    ```
-    """
-    path: optional[Path] | child
-    args: list[Pat] | child
-    ellipsis_index: optional[int]
-
-
-class RefPat(Pat):
-    """
-    A reference pattern. For example:
-    ```rust
-    match x {
-        &mut Option::Some(y) => y,
-        &Option::None => 0,
-    };
-    ```
-    """
-    pat: Pat | child
-    is_mut: predicate
-
-
-class BoxPat(Pat):
-    """
-    A box pattern. For example:
-    ```rust
-    match x {
-        box Option::Some(y) => y,
-        box Option::None => 0,
-    };
-    ```
-    """
-    inner: Pat | child
-
-
-class ConstBlockPat(Pat):
-    """
-    A const block pattern. For example:
-    ```rust
-    match x {
-        const { 1 + 2 + 3 } => "ok",
-        _ => "fail",
-    };
-    ```
-    """
-    expr: Expr | child
diff --git a/rust/schema/.gitattributes b/rust/schema/.gitattributes
new file mode 100644
index 00000000000..515346ca14c
--- /dev/null
+++ b/rust/schema/.gitattributes
@@ -0,0 +1 @@
+/ast.py linguist-generated
diff --git a/rust/schema/__init__.py b/rust/schema/__init__.py
new file mode 100644
index 00000000000..9d5aa440663
--- /dev/null
+++ b/rust/schema/__init__.py
@@ -0,0 +1,14 @@
+"""
+Schema description
+
+This file should be kept simple:
+* no flow control
+* no aliases
+* only class definitions with annotations and `include` calls
+
+For how documentation of generated QL code works, please read `misc/codegen/schema_documentation.md`.
+"""
+
+from .prelude import *
+from .ast import *
+from .annotations import *
diff --git a/rust/schema/annotations.py b/rust/schema/annotations.py
new file mode 100644
index 00000000000..d8e9835b16a
--- /dev/null
+++ b/rust/schema/annotations.py
@@ -0,0 +1,1810 @@
+from misc.codegen.lib.schemadefs import *
+from .ast import *
+
+
+@annotate(Module)
+@rust.doc_test_signature(None)
+class _:
+    """
+    A module declaration. For example:
+    ```rust
+    mod foo;
+    ```
+    ```rust
+    mod bar {
+        pub fn baz() {}
+    }
+    ```
+    """
+
+
+@annotate(Expr)
+class _:
+    """
+    The base class for expressions.
+    """
+
+
+@annotate(Pat)
+class _:
+    """
+    The base class for patterns.
+    """
+
+
+@annotate(Label)
+class _:
+    """
+    A label. For example:
+    ```rust
+    'label: loop {
+        println!("Hello, world (once)!");
+        break 'label;
+    };
+    ```
+    """
+
+
+@annotate(Stmt)
+class _:
+    """
+    The base class for statements.
+    """
+
+
+@annotate(TypeRef)
+class _:
+    """
+    The base class for type references.
+    ```rust
+    let x: i32;
+    let y: Vec<i32>;
+    let z: Option<i32>;
+    ```
+    """
+
+@annotate(Path, replace_bases={AstNode: Resolvable})
+class _:
+    """
+    A path. For example:
+    ```rust
+    foo::bar;
+    ```
+    """
+
+
+@annotate(GenericArgList)
+class _:
+    """
+    The base class for generic arguments.
+    ```rust
+    x.foo::<u32, u64>(42);
+    ```
+    """
+
+
+@annotate(Function)
+@rust.doc_test_signature(None)
+class _:
+    """
+    A function declaration. For example
+    ```rust
+    fn foo(x: u32) -> u64 {(x + 1).into()}
+    ```
+    A function declaration within a trait might not have a body:
+    ```rust
+    trait Trait {
+        fn bar();
+    }
+    ```
+    """
+
+
+class PathExprBase(Expr):
+    """
+    A path expression or a variable access in a formatting template. See `PathExpr` and `FormatTemplateVariableAccess` for further details.
+    """
+
+
+@annotate(PathExpr, replace_bases={Expr: PathExprBase})
+class _:
+    """
+    A path expression. For example:
+    ```rust
+    let x = variable;
+    let x = foo::bar;
+    let y = <T>::foo;
+    let z = <TypeRef as Trait>::foo;
+    ```
+    """
+
+
+@annotate(IfExpr)
+class _:
+    """
+    An `if` expression. For example:
+    ```rust
+    if x == 42 {
+        println!("that's the answer");
+    }
+    ```
+    ```rust
+    let y = if x > 0 {
+        1
+    } else {
+        0
+    };
+    ```
+    """
+
+
+@annotate(LetExpr)
+@rust.doc_test_signature("(maybe_some: Option<String>) -> ()")
+class _:
+    """
+    A `let` expression. For example:
+    ```rust
+    if let Some(x) = maybe_some {
+        println!("{}", x);
+    }
+    ```
+    """
+
+
+@annotate(BlockExpr)
+class _:
+    """
+    A block expression. For example:
+    ```rust
+    {
+        let x = 42;
+    }
+    ```
+    ```rust
+    'label: {
+        let x = 42;
+        x
+    }
+    ```
+    """
+
+
+@annotate(LoopExpr)
+class _:
+    """
+    A loop expression. For example:
+    ```rust
+    loop {
+        println!("Hello, world (again)!");
+    };
+    ```
+    ```rust
+    'label: loop {
+        println!("Hello, world (once)!");
+        break 'label;
+    };
+    ```
+    ```rust
+    let mut x = 0;
+    loop {
+        if x < 10 {
+            x += 1;
+        } else {
+            break;
+        }
+    };
+    ```
+    """
+
+
+class CallExprBase(Expr):
+    """
+    A function or method call expression. See `CallExpr` and `MethodCallExpr` for further details.
+    """
+    arg_list: optional["ArgList"] | child
+    attrs: list["Attr"] | child
+
+
+@annotate(CallExpr, replace_bases={Expr: CallExprBase})
+class _:
+    """
+    A function call expression. For example:
+    ```rust
+    foo(42);
+    foo::<u32, u64>(42);
+    foo[0](42);
+    foo(1) = 4;
+    ```
+    """
+    arg_list: drop
+    attrs: drop
+
+
+@annotate(MethodCallExpr, replace_bases={Expr: CallExprBase}, add_bases=(Resolvable,))
+class _:
+    """
+    A method call expression. For example:
+    ```rust
+    x.foo(42);
+    x.foo::<u32, u64>(42);
+    ```
+    """
+    arg_list: drop
+    attrs: drop
+
+
+@annotate(MatchArm)
+@rust.doc_test_signature("(x: i32) -> i32")
+class _:
+    """
+    A match arm. For example:
+    ```rust
+    match x {
+        Option::Some(y) => y,
+        Option::None => 0,
+    };
+    ```
+    ```rust
+    match x {
+        Some(y) if y != 0 => 1 / y,
+        _ => 0,
+    };
+    ```
+    """
+
+
+@annotate(MatchExpr)
+@rust.doc_test_signature("(x: i32) -> i32")
+class _:
+    """
+    A match expression. For example:
+    ```rust
+    match x {
+        Option::Some(y) => y,
+        Option::None => 0,
+    }
+    ```
+    ```rust
+    match x {
+        Some(y) if y != 0 => 1 / y,
+        _ => 0,
+    }
+    ```
+    """
+
+
+@annotate(ContinueExpr)
+class _:
+    """
+    A continue expression. For example:
+    ```rust
+    loop {
+        if not_ready() {
+            continue;
+        }
+    }
+    ```
+    ```rust
+    'label: loop {
+        if not_ready() {
+            continue 'label;
+        }
+    }
+    ```
+    """
+
+
+@annotate(BreakExpr)
+class _:
+    """
+    A break expression. For example:
+    ```rust
+    loop {
+        if not_ready() {
+            break;
+         }
+    }
+    ```
+    ```rust
+    let x = 'label: loop {
+        if done() {
+            break 'label 42;
+        }
+    };
+    ```
+    ```rust
+    let x = 'label: {
+        if exit() {
+            break 'label 42;
+        }
+        0;
+    };
+    ```
+  """
+
+
+@annotate(ReturnExpr)
+@rust.doc_test_signature(None)
+class _:
+    """
+    A return expression. For example:
+    ```rust
+    fn some_value() -> i32 {
+        return 42;
+    }
+    ```
+    ```rust
+    fn no_value() -> () {
+        return;
+    }
+    ```
+    """
+
+
+@annotate(BecomeExpr)
+@rust.doc_test_signature(None)
+class _:
+    """
+    A `become` expression. For example:
+    ```rust
+    fn fact_a(n: i32, a: i32) -> i32 {
+         if n == 0 {
+             a
+         } else {
+             become fact_a(n - 1, n * a)
+         }
+    }
+    ```
+    """
+
+
+@annotate(YieldExpr)
+class _:
+    """
+    A `yield` expression. For example:
+    ```rust
+    let one = #[coroutine]
+        || {
+            yield 1;
+        };
+    ```
+    """
+
+
+@annotate(YeetExpr)
+class _:
+    """
+    A `yeet` expression. For example:
+    ```rust
+    if x < size {
+       do yeet "index out of bounds";
+    }
+    ```
+    """
+
+
+@annotate(RecordExprField)
+class _:
+    """
+    A field in a record expression. For example `a: 1` in:
+    ```rust
+    Foo { a: 1, b: 2 };
+    ```
+    """
+
+
+@annotate(RecordExpr)
+class _:
+    """
+    A record expression. For example:
+    ```rust
+    let first = Foo { a: 1, b: 2 };
+    let second = Foo { a: 2, ..first };
+    Foo { a: 1, b: 2 }[2] = 10;
+    Foo { .. } = second;
+    ```
+    """
+
+
+@annotate(FieldExpr)
+class _:
+    """
+    A field access expression. For example:
+    ```rust
+    x.foo
+    ```
+    """
+
+
+@annotate(AwaitExpr)
+class _:
+    """
+    An `await` expression. For example:
+    ```rust
+    async {
+        let x = foo().await;
+        x
+    }
+    ```
+    """
+
+
+@annotate(CastExpr)
+class _:
+    """
+    A cast expression. For example:
+    ```rust
+    value as u64;
+    ```
+    """
+
+
+@annotate(RefExpr)
+class _:
+    """
+    A reference expression. For example:
+    ```rust
+        let ref_const = &foo;
+        let ref_mut = &mut foo;
+        let raw_const: &mut i32 = &raw const foo;
+        let raw_mut: &mut i32 = &raw mut foo;
+    ```
+    """
+
+
+@annotate(PrefixExpr)
+class _:
+    """
+    A unary operation expression. For example:
+    ```rust
+    let x = -42;
+    let y = !true;
+    let z = *ptr;
+    ```
+    """
+
+
+@annotate(BinaryExpr)
+class _:
+    """
+    A binary operation expression. For example:
+    ```rust
+    x + y;
+    x && y;
+    x <= y;
+    x = y;
+    x += y;
+    ```
+    """
+
+
+@annotate(RangeExpr)
+class _:
+    """
+    A range expression. For example:
+    ```rust
+    let x = 1..=10;
+    let x = 1..10;
+    let x = 10..;
+    let x = ..10;
+    let x = ..=10;
+    let x = ..;
+    ```
+    """
+
+
+@annotate(IndexExpr)
+class _:
+    """
+    An index expression. For example:
+    ```rust
+    list[42];
+    list[42] = 1;
+    ```
+    """
+
+
+@annotate(ClosureExpr)
+class _:
+    """
+    A closure expression. For example:
+    ```rust
+    |x| x + 1;
+    move |x: i32| -> i32 { x + 1 };
+    async |x: i32, y| x + y;
+     #[coroutine]
+    |x| yield x;
+     #[coroutine]
+     static |x| yield x;
+    ```
+    """
+
+
+@annotate(TupleExpr)
+class _:
+    """
+    A tuple expression. For example:
+    ```rust
+    (1, "one");
+    (2, "two")[0] = 3;
+    ```
+    """
+
+
+@annotate(ArrayExpr)
+class _:
+    """
+    An array expression. For example:
+    ```rust
+    [1, 2, 3];
+    [1; 10];
+    ```
+    """
+
+
+@annotate(LiteralExpr)
+class _:
+    """
+    A literal expression. For example:
+    ```rust
+    42;
+    42.0;
+    "Hello, world!";
+    b"Hello, world!";
+    'x';
+    b'x';
+    r"Hello, world!";
+    true;
+    ```
+    """
+
+
+@annotate(UnderscoreExpr)
+class _:
+    """
+    An underscore expression. For example:
+    ```rust
+    _ = 42;
+    ```
+    """
+
+
+@annotate(OffsetOfExpr)
+class _:
+    """
+     An `offset_of` expression. For example:
+    ```rust
+    builtin # offset_of(Struct, field);
+    ```
+    """
+
+
+@annotate(AsmExpr)
+class _:
+    """
+    An inline assembly expression. For example:
+    ```rust
+    unsafe {
+        builtin # asm(_);
+    }
+    ```
+    """
+
+
+@annotate(LetStmt)
+class _:
+    """
+    A let statement. For example:
+    ```rust
+    let x = 42;
+    let x: i32 = 42;
+    let x: i32;
+    let x;
+    let (x, y) = (1, 2);
+    let Some(x) = std::env::var("FOO") else {
+        return;
+    };
+    ```
+    """
+
+
+@annotate(ExprStmt)
+class _:
+    """
+    An expression statement. For example:
+    ```rust
+    start();
+    finish();
+    use std::env;
+    ```
+    """
+
+
+@annotate(WildcardPat)
+class _:
+    """
+    A wildcard pattern. For example:
+    ```rust
+    let _ = 42;
+    ```
+    """
+
+
+@annotate(TuplePat)
+class _:
+    """
+    A tuple pattern. For example:
+    ```rust
+    let (x, y) = (1, 2);
+    let (a, b, ..,  z) = (1, 2, 3, 4, 5);
+    ```
+    """
+
+
+@annotate(OrPat)
+class _:
+    """
+    An or pattern. For example:
+    ```rust
+    match x {
+        Option::Some(y) | Option::None => 0,
+    }
+    ```
+    """
+
+
+@annotate(RecordPatField)
+class _:
+    """
+    A field in a record pattern. For example `a: 1` in:
+    ```rust
+    let Foo { a: 1, b: 2 } = foo;
+    ```
+    """
+
+
+@annotate(RecordPat)
+class _:
+    """
+    A record pattern. For example:
+    ```rust
+    match x {
+        Foo { a: 1, b: 2 } => "ok",
+        Foo { .. } => "fail",
+    }
+    ```
+    """
+
+
+@annotate(RangePat)
+class _:
+    """
+    A range pattern. For example:
+    ```rust
+    match x {
+        ..15 => "too cold",
+        16..=25 => "just right",
+        26.. => "too hot",
+    }
+    ```
+    """
+
+
+@annotate(SlicePat)
+class _:
+    """
+    A slice pattern. For example:
+    ```rust
+    match x {
+        [1, 2, 3, 4, 5] => "ok",
+        [1, 2, ..] => "fail",
+        [x, y, .., z, 7] => "fail",
+    }
+    ```
+    """
+
+
+@annotate(PathPat)
+class _:
+    """
+    A path pattern. For example:
+    ```rust
+    match x {
+        Foo::Bar => "ok",
+        _ => "fail",
+    }
+    ```
+    """
+
+
+@annotate(LiteralPat)
+class _:
+    """
+    A literal pattern. For example:
+    ```rust
+    match x {
+        42 => "ok",
+        _ => "fail",
+    }
+    ```
+    """
+
+
+@annotate(IdentPat)
+class _:
+    """
+    A binding pattern. For example:
+    ```rust
+    match x {
+        Option::Some(y) => y,
+        Option::None => 0,
+    };
+    ```
+    ```rust
+    match x {
+        y@Option::Some(_) => y,
+        Option::None => 0,
+    };
+    ```
+    """
+
+
+@annotate(TupleStructPat)
+class _:
+    """
+    A tuple struct pattern. For example:
+    ```rust
+    match x {
+        Tuple("a", 1, 2, 3) => "great",
+        Tuple(.., 3) => "fine",
+        Tuple(..) => "fail",
+    };
+    ```
+    """
+
+
+@annotate(RefPat)
+class _:
+    """
+    A reference pattern. For example:
+    ```rust
+    match x {
+        &mut Option::Some(y) => y,
+        &Option::None => 0,
+    };
+    ```
+    """
+
+
+@annotate(BoxPat)
+class _:
+    """
+    A box pattern. For example:
+    ```rust
+    match x {
+        box Option::Some(y) => y,
+        box Option::None => 0,
+    };
+    ```
+    """
+
+
+@annotate(ConstBlockPat)
+class _:
+    """
+    A const block pattern. For example:
+    ```rust
+    match x {
+        const { 1 + 2 + 3 } => "ok",
+        _ => "fail",
+    };
+    ```
+    """
+
+
+@annotate(Abi)
+class _:
+    """
+    A Abi. For example:
+    ```rust
+    todo!()
+    ```
+    """
+
+
+@annotate(ArgList)
+class _:
+    """
+    A ArgList. For example:
+    ```rust
+    todo!()
+    ```
+    """
+
+
+@annotate(ArrayType)
+class _:
+    """
+    A ArrayType. For example:
+    ```rust
+    todo!()
+    ```
+    """
+
+
+@annotate(AssocItem)
+class _:
+    """
+    A AssocItem. For example:
+    ```rust
+    todo!()
+    ```
+    """
+
+
+@annotate(AssocItemList)
+@qltest.test_with(Trait)
+class _:
+    """
+    A list of  `AssocItem` elements, as appearing for example in a `Trait`.
+    """
+
+
+@annotate(AssocTypeArg)
+class _:
+    """
+    A AssocTypeArg. For example:
+    ```rust
+    todo!()
+    ```
+    """
+
+
+@annotate(Attr)
+class _:
+    """
+    A Attr. For example:
+    ```rust
+    todo!()
+    ```
+    """
+
+
+@annotate(ClosureBinder)
+class _:
+    """
+    A ClosureBinder. For example:
+    ```rust
+    todo!()
+    ```
+    """
+
+
+@annotate(Const)
+class _:
+    """
+    A Const. For example:
+    ```rust
+    todo!()
+    ```
+    """
+
+
+@annotate(ConstArg)
+class _:
+    """
+    A ConstArg. For example:
+    ```rust
+    todo!()
+    ```
+    """
+
+
+@annotate(ConstParam)
+class _:
+    """
+    A ConstParam. For example:
+    ```rust
+    todo!()
+    ```
+    """
+
+
+@annotate(DynTraitType)
+class _:
+    """
+    A DynTraitType. For example:
+    ```rust
+    todo!()
+    ```
+    """
+
+
+@annotate(Enum)
+class _:
+    """
+    A Enum. For example:
+    ```rust
+    todo!()
+    ```
+    """
+
+
+@annotate(ExternBlock)
+class _:
+    """
+    A ExternBlock. For example:
+    ```rust
+    todo!()
+    ```
+    """
+
+
+@annotate(ExternCrate)
+class _:
+    """
+    A ExternCrate. For example:
+    ```rust
+    todo!()
+    ```
+    """
+
+
+@annotate(ExternItem)
+class _:
+    """
+    A ExternItem. For example:
+    ```rust
+    todo!()
+    ```
+    """
+
+
+@annotate(ExternItemList)
+class _:
+    """
+    A ExternItemList. For example:
+    ```rust
+    todo!()
+    ```
+    """
+
+
+@annotate(FieldList)
+class _:
+    """
+    A FieldList. For example:
+    ```rust
+    todo!()
+    ```
+    """
+
+
+@annotate(FnPtrType)
+class _:
+    """
+    A FnPtrType. For example:
+    ```rust
+    todo!()
+    ```
+    """
+
+
+@annotate(ForExpr)
+class _:
+    """
+    A ForExpr. For example:
+    ```rust
+    todo!()
+    ```
+    """
+
+
+@annotate(ForType)
+class _:
+    """
+    A ForType. For example:
+    ```rust
+    todo!()
+    ```
+    """
+
+
+@annotate(FormatArgsArg)
+class _:
+    """
+    A FormatArgsArg. For example:
+    ```rust
+    todo!()
+    ```
+    """
+
+
+@annotate(FormatArgsExpr)
+class _:
+    """
+    A FormatArgsExpr. For example:
+    ```rust
+    todo!()
+    ```
+    """
+
+
+@annotate(GenericArg)
+class _:
+    """
+    A GenericArg. For example:
+    ```rust
+    todo!()
+    ```
+    """
+
+
+@annotate(GenericParam)
+class _:
+    """
+    A GenericParam. For example:
+    ```rust
+    todo!()
+    ```
+    """
+
+
+@annotate(GenericParamList)
+class _:
+    """
+    A GenericParamList. For example:
+    ```rust
+    todo!()
+    ```
+    """
+
+
+@annotate(Impl)
+class _:
+    """
+    A Impl. For example:
+    ```rust
+    todo!()
+    ```
+    """
+
+
+@annotate(ImplTraitType)
+class _:
+    """
+    A ImplTraitType. For example:
+    ```rust
+    todo!()
+    ```
+    """
+
+
+@annotate(InferType)
+class _:
+    """
+    A InferType. For example:
+    ```rust
+    todo!()
+    ```
+    """
+
+
+@annotate(Item)
+class _:
+    """
+    A Item. For example:
+    ```rust
+    todo!()
+    ```
+    """
+
+
+@annotate(ItemList)
+class _:
+    """
+    A ItemList. For example:
+    ```rust
+    todo!()
+    ```
+    """
+
+
+@annotate(LetElse)
+class _:
+    """
+    A LetElse. For example:
+    ```rust
+    todo!()
+    ```
+    """
+
+
+@annotate(Lifetime)
+class _:
+    """
+    A Lifetime. For example:
+    ```rust
+    todo!()
+    ```
+    """
+
+
+@annotate(LifetimeArg)
+class _:
+    """
+    A LifetimeArg. For example:
+    ```rust
+    todo!()
+    ```
+    """
+
+
+@annotate(LifetimeParam)
+class _:
+    """
+    A LifetimeParam. For example:
+    ```rust
+    todo!()
+    ```
+    """
+
+
+@annotate(MacroCall)
+class _:
+    """
+    A MacroCall. For example:
+    ```rust
+    todo!()
+    ```
+    """
+    expanded: optional[AstNode] | child | rust.detach
+
+
+@annotate(MacroDef)
+class _:
+    """
+    A MacroDef. For example:
+    ```rust
+    todo!()
+    ```
+    """
+
+
+@annotate(MacroExpr)
+class _:
+    """
+    A MacroExpr. For example:
+    ```rust
+    todo!()
+    ```
+    """
+
+
+@annotate(MacroItems)
+@rust.doc_test_signature(None)
+class _:
+    """
+    A sequence of items generated by a `MacroCall`. For example:
+    ```rust
+    mod foo{
+        include!("common_definitions.rs");
+    }
+    ```
+    """
+
+
+@annotate(MacroPat)
+class _:
+    """
+    A MacroPat. For example:
+    ```rust
+    todo!()
+    ```
+    """
+
+
+@annotate(MacroRules)
+class _:
+    """
+    A MacroRules. For example:
+    ```rust
+    todo!()
+    ```
+    """
+
+
+@annotate(MacroStmts)
+@rust.doc_test_signature(None)
+class _:
+    """
+    A sequence of statements generated by a `MacroCall`. For example:
+    ```rust
+    fn main() {
+        println!("Hello, world!"); // This macro expands into a list of statements
+    }
+    ```
+    """
+
+
+@annotate(MacroType)
+class _:
+    """
+    A MacroType. For example:
+    ```rust
+    todo!()
+    ```
+    """
+
+
+@annotate(MatchArmList)
+class _:
+    """
+    A MatchArmList. For example:
+    ```rust
+    todo!()
+    ```
+    """
+
+
+@annotate(MatchGuard)
+class _:
+    """
+    A MatchGuard. For example:
+    ```rust
+    todo!()
+    ```
+    """
+
+
+@annotate(Meta)
+class _:
+    """
+    A Meta. For example:
+    ```rust
+    todo!()
+    ```
+    """
+
+
+@annotate(Name)
+class _:
+    """
+    A Name. For example:
+    ```rust
+    todo!()
+    ```
+    """
+
+
+@annotate(NameRef)
+class _:
+    """
+    A NameRef. For example:
+    ```rust
+    todo!()
+    ```
+    """
+
+
+@annotate(NeverType)
+class _:
+    """
+    A NeverType. For example:
+    ```rust
+    todo!()
+    ```
+    """
+
+
+@annotate(Param)
+class _:
+    """
+    A Param. For example:
+    ```rust
+    todo!()
+    ```
+    """
+
+
+@annotate(ParamList)
+class _:
+    """
+    A ParamList. For example:
+    ```rust
+    todo!()
+    ```
+    """
+
+
+@annotate(ParenExpr)
+class _:
+    """
+    A ParenExpr. For example:
+    ```rust
+    todo!()
+    ```
+    """
+
+
+@annotate(ParenPat)
+class _:
+    """
+    A ParenPat. For example:
+    ```rust
+    todo!()
+    ```
+    """
+
+
+@annotate(ParenType)
+class _:
+    """
+    A ParenType. For example:
+    ```rust
+    todo!()
+    ```
+    """
+
+
+@annotate(PathSegment)
+class _:
+    """
+    A PathSegment. For example:
+    ```rust
+    todo!()
+    ```
+    """
+
+
+@annotate(PathType)
+class _:
+    """
+    A PathType. For example:
+    ```rust
+    todo!()
+    ```
+    """
+
+
+@annotate(PtrType)
+class _:
+    """
+    A PtrType. For example:
+    ```rust
+    todo!()
+    ```
+    """
+
+
+@annotate(RecordExprFieldList)
+class _:
+    """
+    A RecordExprFieldList. For example:
+    ```rust
+    todo!()
+    ```
+    """
+
+
+@annotate(RecordField)
+class _:
+    """
+    A RecordField. For example:
+    ```rust
+    todo!()
+    ```
+    """
+
+
+@annotate(RecordFieldList)
+class _:
+    """
+    A RecordFieldList. For example:
+    ```rust
+    todo!()
+    ```
+    """
+
+
+@annotate(RecordPatFieldList)
+class _:
+    """
+    A RecordPatFieldList. For example:
+    ```rust
+    todo!()
+    ```
+    """
+
+
+@annotate(RefType)
+class _:
+    """
+    A RefType. For example:
+    ```rust
+    todo!()
+    ```
+    """
+
+
+@annotate(Rename)
+class _:
+    """
+    A Rename. For example:
+    ```rust
+    todo!()
+    ```
+    """
+
+
+@annotate(RestPat)
+class _:
+    """
+    A RestPat. For example:
+    ```rust
+    todo!()
+    ```
+    """
+
+
+@annotate(RetType)
+class _:
+    """
+    A RetType. For example:
+    ```rust
+    todo!()
+    ```
+    """
+
+
+@annotate(ReturnTypeSyntax)
+class _:
+    """
+    A ReturnTypeSyntax. For example:
+    ```rust
+    todo!()
+    ```
+    """
+
+
+@annotate(SelfParam)
+class _:
+    """
+    A SelfParam. For example:
+    ```rust
+    todo!()
+    ```
+    """
+
+
+@annotate(SliceType)
+class _:
+    """
+    A SliceType. For example:
+    ```rust
+    todo!()
+    ```
+    """
+
+
+@annotate(SourceFile)
+class _:
+    """
+    A SourceFile. For example:
+    ```rust
+    todo!()
+    ```
+    """
+
+
+@annotate(Static)
+class _:
+    """
+    A Static. For example:
+    ```rust
+    todo!()
+    ```
+    """
+
+
+@annotate(StmtList)
+class _:
+    """
+    A StmtList. For example:
+    ```rust
+    todo!()
+    ```
+    """
+
+
+@annotate(Struct)
+class _:
+    """
+    A Struct. For example:
+    ```rust
+    todo!()
+    ```
+    """
+
+
+@annotate(TokenTree)
+class _:
+    """
+    A TokenTree. For example:
+    ```rust
+    todo!()
+    ```
+    """
+
+
+@annotate(Trait)
+@rust.doc_test_signature(None)
+class _:
+    """
+    A Trait. For example:
+    ```
+    trait Frobinizable {
+      type Frobinator;
+      type Result: Copy;
+      fn frobinize_with(&mut self, frobinator: &Self::Frobinator) -> Result;
+    }
+
+    pub trait Foo<T: Frobinizable> where T::Frobinator: Eq {}
+    ```
+    """
+
+
+@annotate(TraitAlias)
+class _:
+    """
+    A TraitAlias. For example:
+    ```rust
+    todo!()
+    ```
+    """
+
+
+@annotate(TryExpr)
+class _:
+    """
+    A TryExpr. For example:
+    ```rust
+    todo!()
+    ```
+    """
+
+
+@annotate(TupleField)
+class _:
+    """
+    A TupleField. For example:
+    ```rust
+    todo!()
+    ```
+    """
+
+
+@annotate(TupleFieldList)
+class _:
+    """
+    A TupleFieldList. For example:
+    ```rust
+    todo!()
+    ```
+    """
+
+
+@annotate(TupleType)
+class _:
+    """
+    A TupleType. For example:
+    ```rust
+    todo!()
+    ```
+    """
+
+
+@annotate(TypeAlias)
+class _:
+    """
+    A TypeAlias. For example:
+    ```rust
+    todo!()
+    ```
+    """
+
+
+@annotate(TypeArg)
+class _:
+    """
+    A TypeArg. For example:
+    ```rust
+    todo!()
+    ```
+    """
+
+
+@annotate(TypeBound)
+class _:
+    """
+    A TypeBound. For example:
+    ```rust
+    todo!()
+    ```
+    """
+
+
+@annotate(TypeBoundList)
+class _:
+    """
+    A TypeBoundList. For example:
+    ```rust
+    todo!()
+    ```
+    """
+
+
+@annotate(TypeParam)
+class _:
+    """
+    A TypeParam. For example:
+    ```rust
+    todo!()
+    ```
+    """
+
+
+@annotate(Union)
+class _:
+    """
+    A Union. For example:
+    ```rust
+    todo!()
+    ```
+    """
+
+
+@annotate(Use)
+class _:
+    """
+    A Use. For example:
+    ```rust
+    todo!()
+    ```
+    """
+
+
+@annotate(UseTree)
+class _:
+    """
+    A UseTree. For example:
+    ```rust
+    todo!()
+    ```
+    """
+
+
+@annotate(UseTreeList)
+class _:
+    """
+    A UseTreeList. For example:
+    ```rust
+    todo!()
+    ```
+    """
+
+
+@annotate(Variant)
+class _:
+    """
+    A Variant. For example:
+    ```rust
+    todo!()
+    ```
+    """
+
+
+@annotate(VariantList)
+class _:
+    """
+    A VariantList. For example:
+    ```rust
+    todo!()
+    ```
+    """
+
+
+@annotate(Visibility)
+class _:
+    """
+    A Visibility. For example:
+    ```rust
+    todo!()
+    ```
+    """
+
+
+@annotate(WhereClause)
+class _:
+    """
+    A WhereClause. For example:
+    ```rust
+    todo!()
+    ```
+    """
+
+
+@annotate(WherePred)
+class _:
+    """
+    A WherePred. For example:
+    ```rust
+    todo!()
+    ```
+    """
+
+
+@annotate(WhileExpr)
+class _:
+    """
+    A WhileExpr. For example:
+    ```rust
+    todo!()
+    ```
+    """
+
+
+@annotate(Function, add_bases=[Callable])
+class _:
+    param_list: drop
+    attrs: drop
+
+
+@annotate(ClosureExpr, add_bases=[Callable])
+class _:
+    param_list: drop
+    attrs: drop
+
+
+@qltest.skip
+@synth.on_arguments(parent="FormatArgsExpr", index=int, kind=int)
+class FormatTemplateVariableAccess(PathExprBase):
+    pass
+
+
+@qltest.skip
+@synth.on_arguments(parent=FormatArgsExpr, index=int, text=string, offset=int)
+class Format(Locatable):
+    """
+    A format element in a formatting template. For example the `{}` in:
+    ```rust
+    println!("Hello {}", "world");
+    ```
+    """
+    parent: FormatArgsExpr
+    index: int
+
+
+@qltest.skip
+@synth.on_arguments(parent=FormatArgsExpr, index=int, kind=int, name=string, positional=boolean, offset=int)
+class FormatArgument(Locatable):
+    """
+    An argument in a format element in a formatting template. For example the `width`, `precision`, and `value` in:
+    ```rust
+    println!("Value {value:#width$.precision$}");
+    ```
+    or the `0`, `1` and `2` in:
+    ```rust
+    println!("Value {0:#1$.2$}", value, width, precision);
+    ```
+    """
+    parent: Format
+
+@annotate(Item)
+class _:
+    extended_canonical_path: optional[string] | desc("""
+        Either a canonical path (see https://doc.rust-lang.org/reference/paths.html#canonical-paths),
+        or `{<block id>}::name` for addressable items defined in an anonymous block (and only
+        addressable there-in).
+    """) | rust.detach | ql.internal
+    crate_origin: optional[string] | desc("One of `rustc:<name>`, `repo:<repository>:<name>` or `lang:<name>`.") | rust.detach | ql.internal
diff --git a/rust/schema/ast.py b/rust/schema/ast.py
new file mode 100644
index 00000000000..bdbb1990d30
--- /dev/null
+++ b/rust/schema/ast.py
@@ -0,0 +1,717 @@
+# Generated by `ast-generator`, do not edit by hand.
+
+from .prelude import *
+
+class AssocItem(AstNode):
+   pass
+
+class Expr(AstNode):
+   pass
+
+class ExternItem(AstNode):
+   pass
+
+class FieldList(AstNode):
+   pass
+
+class GenericArg(AstNode):
+   pass
+
+class GenericParam(AstNode):
+   pass
+
+class Pat(AstNode):
+   pass
+
+class Stmt(AstNode):
+   pass
+
+class TypeRef(AstNode):
+   pass
+
+class Item(Stmt):
+   pass
+
+class Abi(AstNode):
+   abi_string: optional[string]
+
+class ArgList(AstNode):
+   args: list["Expr"] | child
+
+class ArrayExpr(Expr):
+   attrs: list["Attr"] | child
+   exprs: list["Expr"] | child
+
+class ArrayType(TypeRef):
+   const_arg: optional["ConstArg"] | child
+   ty: optional["TypeRef"] | child
+
+class AsmExpr(Expr):
+   attrs: list["Attr"] | child
+   expr: optional["Expr"] | child
+
+class AssocItemList(AstNode):
+   assoc_items: list["AssocItem"] | child
+   attrs: list["Attr"] | child
+
+class AssocTypeArg(GenericArg):
+   const_arg: optional["ConstArg"] | child
+   generic_arg_list: optional["GenericArgList"] | child
+   name_ref: optional["NameRef"] | child
+   param_list: optional["ParamList"] | child
+   ret_type: optional["RetType"] | child
+   return_type_syntax: optional["ReturnTypeSyntax"] | child
+   ty: optional["TypeRef"] | child
+   type_bound_list: optional["TypeBoundList"] | child
+
+class Attr(AstNode):
+   meta: optional["Meta"] | child
+
+class AwaitExpr(Expr):
+   attrs: list["Attr"] | child
+   expr: optional["Expr"] | child
+
+class BecomeExpr(Expr):
+   attrs: list["Attr"] | child
+   expr: optional["Expr"] | child
+
+class BinaryExpr(Expr):
+   attrs: list["Attr"] | child
+   lhs: optional["Expr"] | child
+   operator_name: optional[string]
+   rhs: optional["Expr"] | child
+
+class BlockExpr(Expr):
+   attrs: list["Attr"] | child
+   is_async: predicate
+   is_const: predicate
+   is_gen: predicate
+   is_move: predicate
+   is_try: predicate
+   is_unsafe: predicate
+   label: optional["Label"] | child
+   stmt_list: optional["StmtList"] | child
+
+class BoxPat(Pat):
+   pat: optional["Pat"] | child
+
+class BreakExpr(Expr):
+   attrs: list["Attr"] | child
+   expr: optional["Expr"] | child
+   lifetime: optional["Lifetime"] | child
+
+class CallExpr(Expr):
+   arg_list: optional["ArgList"] | child
+   attrs: list["Attr"] | child
+   expr: optional["Expr"] | child
+
+class CastExpr(Expr):
+   attrs: list["Attr"] | child
+   expr: optional["Expr"] | child
+   ty: optional["TypeRef"] | child
+
+class ClosureBinder(AstNode):
+   generic_param_list: optional["GenericParamList"] | child
+
+class ClosureExpr(Expr):
+   attrs: list["Attr"] | child
+   body: optional["Expr"] | child
+   closure_binder: optional["ClosureBinder"] | child
+   is_async: predicate
+   is_const: predicate
+   is_gen: predicate
+   is_move: predicate
+   is_static: predicate
+   param_list: optional["ParamList"] | child
+   ret_type: optional["RetType"] | child
+
+class Const(AssocItem,Item):
+   attrs: list["Attr"] | child
+   body: optional["Expr"] | child
+   is_const: predicate
+   is_default: predicate
+   name: optional["Name"] | child
+   ty: optional["TypeRef"] | child
+   visibility: optional["Visibility"] | child
+
+class ConstArg(GenericArg):
+   expr: optional["Expr"] | child
+
+class ConstBlockPat(Pat):
+   block_expr: optional["BlockExpr"] | child
+   is_const: predicate
+
+class ConstParam(GenericParam):
+   attrs: list["Attr"] | child
+   default_val: optional["ConstArg"] | child
+   is_const: predicate
+   name: optional["Name"] | child
+   ty: optional["TypeRef"] | child
+
+class ContinueExpr(Expr):
+   attrs: list["Attr"] | child
+   lifetime: optional["Lifetime"] | child
+
+class DynTraitType(TypeRef):
+   type_bound_list: optional["TypeBoundList"] | child
+
+class Enum(Item):
+   attrs: list["Attr"] | child
+   generic_param_list: optional["GenericParamList"] | child
+   name: optional["Name"] | child
+   variant_list: optional["VariantList"] | child
+   visibility: optional["Visibility"] | child
+   where_clause: optional["WhereClause"] | child
+
+class ExprStmt(Stmt):
+   expr: optional["Expr"] | child
+
+class ExternBlock(Item):
+   abi: optional["Abi"] | child
+   attrs: list["Attr"] | child
+   extern_item_list: optional["ExternItemList"] | child
+   is_unsafe: predicate
+
+class ExternCrate(Item):
+   attrs: list["Attr"] | child
+   name_ref: optional["NameRef"] | child
+   rename: optional["Rename"] | child
+   visibility: optional["Visibility"] | child
+
+class ExternItemList(AstNode):
+   attrs: list["Attr"] | child
+   extern_items: list["ExternItem"] | child
+
+class FieldExpr(Expr):
+   attrs: list["Attr"] | child
+   expr: optional["Expr"] | child
+   name_ref: optional["NameRef"] | child
+
+class Function(AssocItem,ExternItem,Item):
+   abi: optional["Abi"] | child
+   attrs: list["Attr"] | child
+   body: optional["BlockExpr"] | child
+   generic_param_list: optional["GenericParamList"] | child
+   is_async: predicate
+   is_const: predicate
+   is_default: predicate
+   is_gen: predicate
+   is_unsafe: predicate
+   name: optional["Name"] | child
+   param_list: optional["ParamList"] | child
+   ret_type: optional["RetType"] | child
+   visibility: optional["Visibility"] | child
+   where_clause: optional["WhereClause"] | child
+
+class FnPtrType(TypeRef):
+   abi: optional["Abi"] | child
+   is_async: predicate
+   is_const: predicate
+   is_unsafe: predicate
+   param_list: optional["ParamList"] | child
+   ret_type: optional["RetType"] | child
+
+class ForExpr(Expr):
+   attrs: list["Attr"] | child
+   iterable: optional["Expr"] | child
+   label: optional["Label"] | child
+   loop_body: optional["BlockExpr"] | child
+   pat: optional["Pat"] | child
+
+class ForType(TypeRef):
+   generic_param_list: optional["GenericParamList"] | child
+   ty: optional["TypeRef"] | child
+
+class FormatArgsArg(AstNode):
+   expr: optional["Expr"] | child
+   name: optional["Name"] | child
+
+class FormatArgsExpr(Expr):
+   args: list["FormatArgsArg"] | child
+   attrs: list["Attr"] | child
+   template: optional["Expr"] | child
+
+class GenericArgList(AstNode):
+   generic_args: list["GenericArg"] | child
+
+class GenericParamList(AstNode):
+   generic_params: list["GenericParam"] | child
+
+class IdentPat(Pat):
+   attrs: list["Attr"] | child
+   is_mut: predicate
+   is_ref: predicate
+   name: optional["Name"] | child
+   pat: optional["Pat"] | child
+
+class IfExpr(Expr):
+   attrs: list["Attr"] | child
+   condition: optional["Expr"] | child
+   else_: optional["Expr"] | child
+   then: optional["BlockExpr"] | child
+
+class Impl(Item):
+   assoc_item_list: optional["AssocItemList"] | child
+   attrs: list["Attr"] | child
+   generic_param_list: optional["GenericParamList"] | child
+   is_const: predicate
+   is_default: predicate
+   is_unsafe: predicate
+   self_ty: optional["TypeRef"] | child
+   trait_: optional["TypeRef"] | child
+   visibility: optional["Visibility"] | child
+   where_clause: optional["WhereClause"] | child
+
+class ImplTraitType(TypeRef):
+   type_bound_list: optional["TypeBoundList"] | child
+
+class IndexExpr(Expr):
+   attrs: list["Attr"] | child
+   base: optional["Expr"] | child
+   index: optional["Expr"] | child
+
+class InferType(TypeRef):
+   pass
+
+class ItemList(AstNode):
+   attrs: list["Attr"] | child
+   items: list["Item"] | child
+
+class Label(AstNode):
+   lifetime: optional["Lifetime"] | child
+
+class LetElse(AstNode):
+   block_expr: optional["BlockExpr"] | child
+
+class LetExpr(Expr):
+   attrs: list["Attr"] | child
+   expr: optional["Expr"] | child
+   pat: optional["Pat"] | child
+
+class LetStmt(Stmt):
+   attrs: list["Attr"] | child
+   initializer: optional["Expr"] | child
+   let_else: optional["LetElse"] | child
+   pat: optional["Pat"] | child
+   ty: optional["TypeRef"] | child
+
+class Lifetime(AstNode):
+   text: optional[string]
+
+class LifetimeArg(GenericArg):
+   lifetime: optional["Lifetime"] | child
+
+class LifetimeParam(GenericParam):
+   attrs: list["Attr"] | child
+   lifetime: optional["Lifetime"] | child
+   type_bound_list: optional["TypeBoundList"] | child
+
+class LiteralExpr(Expr):
+   attrs: list["Attr"] | child
+   text_value: optional[string]
+
+class LiteralPat(Pat):
+   literal: optional["LiteralExpr"] | child
+
+class LoopExpr(Expr):
+   attrs: list["Attr"] | child
+   label: optional["Label"] | child
+   loop_body: optional["BlockExpr"] | child
+
+class MacroCall(AssocItem,ExternItem,Item):
+   attrs: list["Attr"] | child
+   path: optional["Path"] | child
+   token_tree: optional["TokenTree"] | child
+
+class MacroDef(Item):
+   args: optional["TokenTree"] | child
+   attrs: list["Attr"] | child
+   body: optional["TokenTree"] | child
+   name: optional["Name"] | child
+   visibility: optional["Visibility"] | child
+
+class MacroExpr(Expr):
+   macro_call: optional["MacroCall"] | child
+
+class MacroItems(AstNode):
+   items: list["Item"] | child
+
+class MacroPat(Pat):
+   macro_call: optional["MacroCall"] | child
+
+class MacroRules(Item):
+   attrs: list["Attr"] | child
+   name: optional["Name"] | child
+   token_tree: optional["TokenTree"] | child
+   visibility: optional["Visibility"] | child
+
+class MacroStmts(AstNode):
+   expr: optional["Expr"] | child
+   statements: list["Stmt"] | child
+
+class MacroType(TypeRef):
+   macro_call: optional["MacroCall"] | child
+
+class MatchArm(AstNode):
+   attrs: list["Attr"] | child
+   expr: optional["Expr"] | child
+   guard: optional["MatchGuard"] | child
+   pat: optional["Pat"] | child
+
+class MatchArmList(AstNode):
+   arms: list["MatchArm"] | child
+   attrs: list["Attr"] | child
+
+class MatchExpr(Expr):
+   attrs: list["Attr"] | child
+   expr: optional["Expr"] | child
+   match_arm_list: optional["MatchArmList"] | child
+
+class MatchGuard(AstNode):
+   condition: optional["Expr"] | child
+
+class Meta(AstNode):
+   expr: optional["Expr"] | child
+   is_unsafe: predicate
+   path: optional["Path"] | child
+   token_tree: optional["TokenTree"] | child
+
+class MethodCallExpr(Expr):
+   arg_list: optional["ArgList"] | child
+   attrs: list["Attr"] | child
+   generic_arg_list: optional["GenericArgList"] | child
+   name_ref: optional["NameRef"] | child
+   receiver: optional["Expr"] | child
+
+class Module(Item):
+   attrs: list["Attr"] | child
+   item_list: optional["ItemList"] | child
+   name: optional["Name"] | child
+   visibility: optional["Visibility"] | child
+
+class Name(AstNode):
+   text: optional[string]
+
+class NameRef(AstNode):
+   text: optional[string]
+
+class NeverType(TypeRef):
+   pass
+
+class OffsetOfExpr(Expr):
+   attrs: list["Attr"] | child
+   fields: list["NameRef"] | child
+   ty: optional["TypeRef"] | child
+
+class OrPat(Pat):
+   pats: list["Pat"] | child
+
+class Param(AstNode):
+   attrs: list["Attr"] | child
+   pat: optional["Pat"] | child
+   ty: optional["TypeRef"] | child
+
+class ParamList(AstNode):
+   params: list["Param"] | child
+   self_param: optional["SelfParam"] | child
+
+class ParenExpr(Expr):
+   attrs: list["Attr"] | child
+   expr: optional["Expr"] | child
+
+class ParenPat(Pat):
+   pat: optional["Pat"] | child
+
+class ParenType(TypeRef):
+   ty: optional["TypeRef"] | child
+
+class Path(AstNode):
+   qualifier: optional["Path"] | child
+   part: optional["PathSegment"] | child
+
+class PathExpr(Expr):
+   attrs: list["Attr"] | child
+   path: optional["Path"] | child
+
+class PathPat(Pat):
+   path: optional["Path"] | child
+
+class PathSegment(AstNode):
+   generic_arg_list: optional["GenericArgList"] | child
+   name_ref: optional["NameRef"] | child
+   param_list: optional["ParamList"] | child
+   path_type: optional["PathType"] | child
+   ret_type: optional["RetType"] | child
+   return_type_syntax: optional["ReturnTypeSyntax"] | child
+   ty: optional["TypeRef"] | child
+
+class PathType(TypeRef):
+   path: optional["Path"] | child
+
+class PrefixExpr(Expr):
+   attrs: list["Attr"] | child
+   expr: optional["Expr"] | child
+   operator_name: optional[string]
+
+class PtrType(TypeRef):
+   is_const: predicate
+   is_mut: predicate
+   ty: optional["TypeRef"] | child
+
+class RangeExpr(Expr):
+   attrs: list["Attr"] | child
+   end: optional["Expr"] | child
+   operator_name: optional[string]
+   start: optional["Expr"] | child
+
+class RangePat(Pat):
+   end: optional["Pat"] | child
+   operator_name: optional[string]
+   start: optional["Pat"] | child
+
+class RecordExpr(Expr):
+   path: optional["Path"] | child
+   record_expr_field_list: optional["RecordExprFieldList"] | child
+
+class RecordExprField(AstNode):
+   attrs: list["Attr"] | child
+   expr: optional["Expr"] | child
+   name_ref: optional["NameRef"] | child
+
+class RecordExprFieldList(AstNode):
+   attrs: list["Attr"] | child
+   fields: list["RecordExprField"] | child
+   spread: optional["Expr"] | child
+
+class RecordField(AstNode):
+   attrs: list["Attr"] | child
+   name: optional["Name"] | child
+   ty: optional["TypeRef"] | child
+   visibility: optional["Visibility"] | child
+
+class RecordFieldList(FieldList):
+   fields: list["RecordField"] | child
+
+class RecordPat(Pat):
+   path: optional["Path"] | child
+   record_pat_field_list: optional["RecordPatFieldList"] | child
+
+class RecordPatField(AstNode):
+   attrs: list["Attr"] | child
+   name_ref: optional["NameRef"] | child
+   pat: optional["Pat"] | child
+
+class RecordPatFieldList(AstNode):
+   fields: list["RecordPatField"] | child
+   rest_pat: optional["RestPat"] | child
+
+class RefExpr(Expr):
+   attrs: list["Attr"] | child
+   expr: optional["Expr"] | child
+   is_const: predicate
+   is_mut: predicate
+   is_raw: predicate
+
+class RefPat(Pat):
+   is_mut: predicate
+   pat: optional["Pat"] | child
+
+class RefType(TypeRef):
+   is_mut: predicate
+   lifetime: optional["Lifetime"] | child
+   ty: optional["TypeRef"] | child
+
+class Rename(AstNode):
+   name: optional["Name"] | child
+
+class RestPat(Pat):
+   attrs: list["Attr"] | child
+
+class RetType(AstNode):
+   ty: optional["TypeRef"] | child
+
+class ReturnExpr(Expr):
+   attrs: list["Attr"] | child
+   expr: optional["Expr"] | child
+
+class ReturnTypeSyntax(AstNode):
+   pass
+
+class SelfParam(AstNode):
+   attrs: list["Attr"] | child
+   is_mut: predicate
+   lifetime: optional["Lifetime"] | child
+   name: optional["Name"] | child
+   ty: optional["TypeRef"] | child
+
+class SlicePat(Pat):
+   pats: list["Pat"] | child
+
+class SliceType(TypeRef):
+   ty: optional["TypeRef"] | child
+
+class SourceFile(AstNode):
+   attrs: list["Attr"] | child
+   items: list["Item"] | child
+
+class Static(ExternItem,Item):
+   attrs: list["Attr"] | child
+   body: optional["Expr"] | child
+   is_mut: predicate
+   is_static: predicate
+   name: optional["Name"] | child
+   ty: optional["TypeRef"] | child
+   visibility: optional["Visibility"] | child
+
+class StmtList(AstNode):
+   attrs: list["Attr"] | child
+   statements: list["Stmt"] | child
+   tail_expr: optional["Expr"] | child
+
+class Struct(Item):
+   attrs: list["Attr"] | child
+   field_list: optional["FieldList"] | child
+   generic_param_list: optional["GenericParamList"] | child
+   name: optional["Name"] | child
+   visibility: optional["Visibility"] | child
+   where_clause: optional["WhereClause"] | child
+
+class TokenTree(AstNode):
+   pass
+
+class Trait(Item):
+   assoc_item_list: optional["AssocItemList"] | child
+   attrs: list["Attr"] | child
+   generic_param_list: optional["GenericParamList"] | child
+   is_auto: predicate
+   is_unsafe: predicate
+   name: optional["Name"] | child
+   type_bound_list: optional["TypeBoundList"] | child
+   visibility: optional["Visibility"] | child
+   where_clause: optional["WhereClause"] | child
+
+class TraitAlias(Item):
+   attrs: list["Attr"] | child
+   generic_param_list: optional["GenericParamList"] | child
+   name: optional["Name"] | child
+   type_bound_list: optional["TypeBoundList"] | child
+   visibility: optional["Visibility"] | child
+   where_clause: optional["WhereClause"] | child
+
+class TryExpr(Expr):
+   attrs: list["Attr"] | child
+   expr: optional["Expr"] | child
+
+class TupleExpr(Expr):
+   attrs: list["Attr"] | child
+   fields: list["Expr"] | child
+
+class TupleField(AstNode):
+   attrs: list["Attr"] | child
+   ty: optional["TypeRef"] | child
+   visibility: optional["Visibility"] | child
+
+class TupleFieldList(FieldList):
+   fields: list["TupleField"] | child
+
+class TuplePat(Pat):
+   fields: list["Pat"] | child
+
+class TupleStructPat(Pat):
+   fields: list["Pat"] | child
+   path: optional["Path"] | child
+
+class TupleType(TypeRef):
+   fields: list["TypeRef"] | child
+
+class TypeAlias(AssocItem,ExternItem,Item):
+   attrs: list["Attr"] | child
+   generic_param_list: optional["GenericParamList"] | child
+   is_default: predicate
+   name: optional["Name"] | child
+   ty: optional["TypeRef"] | child
+   type_bound_list: optional["TypeBoundList"] | child
+   visibility: optional["Visibility"] | child
+   where_clause: optional["WhereClause"] | child
+
+class TypeArg(GenericArg):
+   ty: optional["TypeRef"] | child
+
+class TypeBound(AstNode):
+   generic_param_list: optional["GenericParamList"] | child
+   is_async: predicate
+   is_const: predicate
+   lifetime: optional["Lifetime"] | child
+   ty: optional["TypeRef"] | child
+
+class TypeBoundList(AstNode):
+   bounds: list["TypeBound"] | child
+
+class TypeParam(GenericParam):
+   attrs: list["Attr"] | child
+   default_type: optional["TypeRef"] | child
+   name: optional["Name"] | child
+   type_bound_list: optional["TypeBoundList"] | child
+
+class UnderscoreExpr(Expr):
+   attrs: list["Attr"] | child
+
+class Union(Item):
+   attrs: list["Attr"] | child
+   generic_param_list: optional["GenericParamList"] | child
+   name: optional["Name"] | child
+   record_field_list: optional["RecordFieldList"] | child
+   visibility: optional["Visibility"] | child
+   where_clause: optional["WhereClause"] | child
+
+class Use(Item):
+   attrs: list["Attr"] | child
+   use_tree: optional["UseTree"] | child
+   visibility: optional["Visibility"] | child
+
+class UseTree(AstNode):
+   path: optional["Path"] | child
+   rename: optional["Rename"] | child
+   use_tree_list: optional["UseTreeList"] | child
+
+class UseTreeList(AstNode):
+   use_trees: list["UseTree"] | child
+
+class Variant(AstNode):
+   attrs: list["Attr"] | child
+   expr: optional["Expr"] | child
+   field_list: optional["FieldList"] | child
+   name: optional["Name"] | child
+   visibility: optional["Visibility"] | child
+
+class VariantList(AstNode):
+   variants: list["Variant"] | child
+
+class Visibility(AstNode):
+   path: optional["Path"] | child
+
+class WhereClause(AstNode):
+   predicates: list["WherePred"] | child
+
+class WherePred(AstNode):
+   generic_param_list: optional["GenericParamList"] | child
+   lifetime: optional["Lifetime"] | child
+   ty: optional["TypeRef"] | child
+   type_bound_list: optional["TypeBoundList"] | child
+
+class WhileExpr(Expr):
+   attrs: list["Attr"] | child
+   condition: optional["Expr"] | child
+   label: optional["Label"] | child
+   loop_body: optional["BlockExpr"] | child
+
+class WildcardPat(Pat):
+   pass
+
+class YeetExpr(Expr):
+   attrs: list["Attr"] | child
+   expr: optional["Expr"] | child
+
+class YieldExpr(Expr):
+   attrs: list["Attr"] | child
+   expr: optional["Expr"] | child
diff --git a/rust/schema/prelude.py b/rust/schema/prelude.py
new file mode 100644
index 00000000000..60de626e59c
--- /dev/null
+++ b/rust/schema/prelude.py
@@ -0,0 +1,81 @@
+from misc.codegen.lib.schemadefs import *
+
+include("../shared/tree-sitter-extractor/src/generator/prefix.dbscheme")
+include("prefix.dbscheme")
+
+
+@qltest.skip
+class Element:
+    pass
+
+
+@qltest.skip
+class Locatable(Element):
+    pass
+
+
+@qltest.skip
+class AstNode(Locatable):
+    pass
+
+
+@qltest.skip
+class Token(AstNode):
+    """
+    The base class for all tokens.
+    """
+    pass
+
+
+class Comment(Token):
+    """
+    A comment. For example:
+    ```rust
+    // this is a comment
+    /// This is a doc comment
+    ```
+    """
+    parent: AstNode
+    text: string
+
+
+@qltest.skip
+class Unextracted(Element):
+    """
+    The base class marking everything that was not properly extracted for some reason, such as:
+    * syntax errors
+    * insufficient context information
+    * yet unimplemented parts of the extractor
+    """
+    pass
+
+
+@qltest.skip
+class Missing(Unextracted):
+    """
+    The base class marking errors during parsing or resolution.
+    """
+
+
+@qltest.skip
+class Unimplemented(Unextracted):
+    """
+    The base class for unimplemented nodes. This is used to mark nodes that are not yet extracted.
+    """
+    pass
+
+
+class Callable(AstNode):
+    """
+    A callable. Either a `Function` or a `ClosureExpr`.
+    """
+    param_list: optional["ParamList"] | child
+    attrs: list["Attr"] | child
+
+
+class Resolvable(AstNode):
+    """
+    Either a `Path`, or a `MethodCallExpr`.
+    """
+    resolved_path: optional[string] | rust.detach | ql.internal
+    resolved_crate_origin: optional[string] | rust.detach | ql.internal
diff --git a/rust/tools/autobuild.sh b/rust/tools/autobuild.sh
index fdea6e80e52..9d30ff1b3c3 100755
--- a/rust/tools/autobuild.sh
+++ b/rust/tools/autobuild.sh
@@ -1,5 +1,6 @@
 #!/bin/bash
 
+export RUST_BACKTRACE=1
 exec "${CODEQL_DIST}/codeql" database index-files \
   --working-dir=. --language=rust --include-extension=.rs \
   "${CODEQL_EXTRACTOR_RUST_WIP_DATABASE}"
diff --git a/rust/tools/index-files.sh b/rust/tools/index-files.sh
index f3d93fbaf4a..bb8d665adfc 100755
--- a/rust/tools/index-files.sh
+++ b/rust/tools/index-files.sh
@@ -2,4 +2,5 @@
 
 set -eu
 
+export RUST_BACKTRACE=1
 exec "$CODEQL_EXTRACTOR_RUST_ROOT/tools/$CODEQL_PLATFORM/extractor" @"$1"
diff --git a/rust/tools/qltest.cmd b/rust/tools/qltest.cmd
new file mode 100644
index 00000000000..72c9911d7d4
--- /dev/null
+++ b/rust/tools/qltest.cmd
@@ -0,0 +1,11 @@
+@echo off
+
+set "RUST_BACKTRACE=full"
+set "QLTEST_LOG=%CODEQL_EXTRACTOR_RUST_LOG_DIR%/qltest.log"
+
+type NUL && "%CODEQL_EXTRACTOR_RUST_ROOT%/tools/%CODEQL_PLATFORM%/extractor" --qltest >"%QLTEST_LOG%" 2>&1
+
+if %ERRORLEVEL% neq 0 (
+    type "%QLTEST_LOG%"
+    exit /b 1
+)
diff --git a/rust/tools/qltest.sh b/rust/tools/qltest.sh
index 09c3c9ab131..1d586826314 100755
--- a/rust/tools/qltest.sh
+++ b/rust/tools/qltest.sh
@@ -1,27 +1,10 @@
 #!/bin/bash
 
-mkdir -p "$CODEQL_EXTRACTOR_RUST_TRAP_DIR"
+set -eu
 
 export RUST_BACKTRACE=full
-
 QLTEST_LOG="$CODEQL_EXTRACTOR_RUST_LOG_DIR"/qltest.log
-
-EXTRACTOR="$CODEQL_EXTRACTOR_RUST_ROOT/tools/$CODEQL_PLATFORM/extractor"
-echo > lib.rs
-for src in *.rs; do
-  echo "mod ${src%.rs};" >> lib.rs
-done
-cat > Cargo.toml << EOF
-[workspace]
-[package]
-name = "test"
-version="0.0.1"
-edition="2021"
-[lib]
-path="lib.rs"
-EOF
-"$EXTRACTOR" *.rs >> "$QLTEST_LOG"
-if [[ "$?" != 0 ]]; then
-  cat "$QLTEST_LOG" # Show compiler errors on extraction failure
+if ! "$CODEQL_EXTRACTOR_RUST_ROOT/tools/$CODEQL_PLATFORM/extractor" --qltest >> "$QLTEST_LOG" 2>&1; then
+  cat "$QLTEST_LOG"
   exit 1
 fi
diff --git a/rust/update_cargo_deps.sh b/rust/update_cargo_deps.sh
new file mode 100755
index 00000000000..c60670c2404
--- /dev/null
+++ b/rust/update_cargo_deps.sh
@@ -0,0 +1,9 @@
+#!/bin/bash
+
+set -eu
+
+SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
+
+cd "$SCRIPT_DIR/.."
+time bazel run //misc/bazel/3rdparty:vendor_tree_sitter_extractors
+bazel mod tidy
diff --git a/shared/controlflow/CHANGELOG.md b/shared/controlflow/CHANGELOG.md
index 15a3aca14c6..2eddc42a47d 100644
--- a/shared/controlflow/CHANGELOG.md
+++ b/shared/controlflow/CHANGELOG.md
@@ -1,3 +1,15 @@
+## 1.0.11
+
+No user-facing changes.
+
+## 1.0.10
+
+No user-facing changes.
+
+## 1.0.9
+
+No user-facing changes.
+
 ## 1.0.8
 
 No user-facing changes.
diff --git a/shared/controlflow/change-notes/released/1.0.10.md b/shared/controlflow/change-notes/released/1.0.10.md
new file mode 100644
index 00000000000..b601d878453
--- /dev/null
+++ b/shared/controlflow/change-notes/released/1.0.10.md
@@ -0,0 +1,3 @@
+## 1.0.10
+
+No user-facing changes.
diff --git a/shared/controlflow/change-notes/released/1.0.11.md b/shared/controlflow/change-notes/released/1.0.11.md
new file mode 100644
index 00000000000..245e0812108
--- /dev/null
+++ b/shared/controlflow/change-notes/released/1.0.11.md
@@ -0,0 +1,3 @@
+## 1.0.11
+
+No user-facing changes.
diff --git a/shared/controlflow/change-notes/released/1.0.9.md b/shared/controlflow/change-notes/released/1.0.9.md
new file mode 100644
index 00000000000..ee073f7ec16
--- /dev/null
+++ b/shared/controlflow/change-notes/released/1.0.9.md
@@ -0,0 +1,3 @@
+## 1.0.9
+
+No user-facing changes.
diff --git a/shared/controlflow/codeql-pack.release.yml b/shared/controlflow/codeql-pack.release.yml
index 5c55fbd52ed..56a2fb38872 100644
--- a/shared/controlflow/codeql-pack.release.yml
+++ b/shared/controlflow/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.0.8
+lastReleaseVersion: 1.0.11
diff --git a/shared/controlflow/codeql/controlflow/Cfg.qll b/shared/controlflow/codeql/controlflow/Cfg.qll
index 9ed75a6539b..4130920daf6 100644
--- a/shared/controlflow/codeql/controlflow/Cfg.qll
+++ b/shared/controlflow/codeql/controlflow/Cfg.qll
@@ -5,6 +5,7 @@
 
 private import codeql.util.Location
 private import codeql.util.FileSystem
+private import codeql.util.Void
 
 /** Provides the language-specific input specification. */
 signature module InputSig<LocationSig Location> {
@@ -56,18 +57,6 @@ signature module InputSig<LocationSig Location> {
   /** Holds if `scope` is exited when `last` finishes with completion `c`. */
   predicate scopeLast(CfgScope scope, AstNode last, Completion c);
 
-  /** Gets the maximum number of splits allowed for a given node. */
-  default int maxSplits() { result = 5 }
-
-  /** The base class of `SplitKind`. */
-  class SplitKindBase;
-
-  /** A split. */
-  class Split {
-    /** Gets a textual representation of this split. */
-    string toString();
-  }
-
   /** A type of a control flow successor. */
   class SuccessorType {
     /** Gets a textual representation of this successor type. */
@@ -90,6 +79,56 @@ signature module InputSig<LocationSig Location> {
   predicate isAbnormalExitType(SuccessorType t);
 }
 
+/** Provides input needed for CFG splitting. */
+signature module SplittingInputSig<LocationSig Location, InputSig<Location> Input> {
+  /** Gets the maximum number of splits allowed for a given node. */
+  default int maxSplits() { result = 5 }
+
+  /** The base class of `SplitKind`. */
+  class SplitKindBase;
+
+  /** A split. */
+  class Split {
+    /** Gets a textual representation of this split. */
+    string toString();
+  }
+}
+
+/** Provides input needed for `ConditionalCompletionSplitting`. */
+signature module ConditionalCompletionSplittingInputSig<
+  LocationSig Location, InputSig<Location> Input, SplittingInputSig<Location, Input> SplittingInput>
+{
+  /** A conditional control-flow completion. */
+  class ConditionalCompletion extends Input::Completion;
+
+  /** A split kind for `ConditionalCompletionSplitting`. */
+  class ConditionalCompletionSplitKind extends SplittingInput::SplitKindBase;
+
+  /** The user-facing split class. */
+  class ConditionalCompletionSplit extends SplittingInput::Split {
+    /** Gets the completion recorded in this split. */
+    ConditionalCompletion getCompletion();
+  }
+
+  /**
+   * Holds if `child` is a sub expression of `parent`, and whenever a last node
+   * of `child` (normally `child` itself) has `parent` as a successor with label
+   * `childCompletion`, then edges out of `parent` must have label
+   * `parentCompletion`.
+   *
+   * For example, for an expression `!x`, when `child = x` has conditional
+   * completion `c` then `parent = !x` must have the dual completion of `c`.
+   *
+   * Similarly, for an expression `x && y`, when `child = {x, y}` has conditional
+   * completion `c`, then `parent = x && y` must have the same completion of `c`.
+   */
+  bindingset[parent, parentCompletion]
+  predicate condPropagateExpr(
+    Input::AstNode parent, ConditionalCompletion parentCompletion, Input::AstNode child,
+    ConditionalCompletion childCompletion
+  );
+}
+
 /**
  * Provides a shared interface for constructing control-flow graphs (CFGs) from
  * abstract syntax trees (ASTs).
@@ -122,8 +161,14 @@ signature module InputSig<LocationSig Location> {
  * loop break will be caught up by its surrounding loop and turned into a normal
  * completion.
  */
-module Make<LocationSig Location, InputSig<Location> Input> {
+module MakeWithSplitting<
+  LocationSig Location, //
+  InputSig<Location> Input, //
+  SplittingInputSig<Location, Input> SplittingInput, //
+  ConditionalCompletionSplittingInputSig<Location, Input, SplittingInput> ConditionalCompletionSplittingInput>
+{
   private import Input
+  private import SplittingInput
 
   final private class AstNodeFinal = AstNode;
 
@@ -1133,67 +1178,107 @@ module Make<LocationSig Location, InputSig<Location> Input> {
 
   final class AstCfgNode = AstCfgNodeImpl;
 
-  /** A node to be included in the output of `TestOutput`. */
-  signature class RelevantNodeSig extends Node {
+  /** Provides logic for common CFG split implementations that can be reused across languages. */
+  module SplitImplementations {
     /**
-     * Gets a string used to resolve ties in node and edge ordering.
+     * Provides an implementation of splitting for conditional completions.
+     *
+     * For example, in
+     *
+     * ```rust
+     * if x && !y {
+     *   // ...
+     * }
+     * ```
+     *
+     * we record whether `x`, `y`, and `!y` evaluate to `true` or `false`, and restrict
+     * the edges out of `!y` and `x && !y` accordingly.
      */
-    string getOrderDisambiguation();
+    module ConditionalCompletionSplitting {
+      private import ConditionalCompletionSplittingInput
+
+      final private class ConditionalCompletionSplitFinal =
+        ConditionalCompletionSplittingInput::ConditionalCompletionSplit;
+
+      /** A split for conditional completions. */
+      class ConditionalCompletionSplitImpl extends SplitImpl, ConditionalCompletionSplitFinal {
+        ConditionalCompletion completion;
+
+        ConditionalCompletionSplitImpl() { completion = this.getCompletion() }
+
+        override SplitKind getKind() { result instanceof ConditionalCompletionSplitKind }
+
+        override predicate hasEntry(AstNode pred, AstNode succ, Completion c) {
+          exists(AstNode child, AstNode parent |
+            last(parent, succ, completion) and
+            condPropagateExpr(parent, completion, child, c) and
+            succ(pred, succ, c) and
+            last(child, pred, c)
+          )
+        }
+
+        override predicate hasEntryScope(CfgScope scope, AstNode first) { none() }
+
+        override predicate hasExit(AstNode pred, AstNode succ, Completion c) {
+          this.appliesTo(pred) and
+          succ(pred, succ, c) and
+          if c instanceof ConditionalCompletion
+          then completion = c
+          else not this.hasSuccessor(pred, succ, c)
+        }
+
+        override predicate hasExitScope(CfgScope scope, AstNode last, Completion c) {
+          this.appliesTo(last) and
+          scopeLast(scope, last, c) and
+          if c instanceof ConditionalCompletion then completion = c else any()
+        }
+
+        override predicate hasSuccessor(AstNode pred, AstNode succ, Completion c) {
+          this.appliesTo(pred) and
+          succ(pred, succ, c) and
+          not c instanceof ConditionalCompletion and
+          completionIsNormal(c)
+        }
+      }
+    }
   }
 
+  /** A node to be included in the output of `TestOutput`. */
+  signature class RelevantNodeSig extends Node;
+
   /**
-   * Import this module into a `.ql` file of `@kind graph` to render a CFG. The
+   * Import this module into a `.ql` file to output a CFG. The
    * graph is restricted to nodes from `RelevantNode`.
    */
   module TestOutput<RelevantNodeSig RelevantNode> {
-    /** Holds if `n` is a relevant node in the CFG. */
-    query predicate nodes(RelevantNode n, string attr, string val) {
-      attr = "semmle.order" and
-      val =
-        any(int i |
-          n =
-            rank[i](RelevantNode p, string filePath, int startLine, int startColumn, int endLine,
-              int endColumn |
-              p.getLocation().hasLocationInfo(filePath, startLine, startColumn, endLine, endColumn)
-            |
-              p
-              order by
-                filePath, startLine, startColumn, endLine, endColumn, p.toString(),
-                p.getOrderDisambiguation()
-            )
-        ).toString()
-    }
-
     /** Holds if `pred -> succ` is an edge in the CFG. */
-    query predicate edges(RelevantNode pred, RelevantNode succ, string attr, string val) {
-      attr = "semmle.label" and
-      val =
+    query predicate edges(RelevantNode pred, RelevantNode succ, string label) {
+      label =
         strictconcat(SuccessorType t, string s |
           succ = getASuccessor(pred, t) and
           if successorTypeIsSimple(t) then s = "" else s = t.toString()
         |
           s, ", " order by s
         )
-      or
-      attr = "semmle.order" and
-      val =
-        any(int i |
-          succ =
-            rank[i](RelevantNode s, SuccessorType t, string filePath, int startLine,
-              int startColumn, int endLine, int endColumn |
-              s = getASuccessor(pred, t) and
-              s.getLocation().hasLocationInfo(filePath, startLine, startColumn, endLine, endColumn)
-            |
-              s
-              order by
-                filePath, startLine, startColumn, endLine, endColumn, t.toString(), s.toString(),
-                s.getOrderDisambiguation()
-            )
-        ).toString()
     }
 
+    /**
+     * Provides logic for representing a CFG as a [Mermaid diagram](https://mermaid.js.org/).
+     */
     module Mermaid {
-      private string nodeId(RelevantNode n) { nodes(n, "semmle.order", result) }
+      private string nodeId(RelevantNode n) {
+        result =
+          any(int i |
+            n =
+              rank[i](RelevantNode p, string filePath, int startLine, int startColumn, int endLine,
+                int endColumn |
+                p.getLocation()
+                    .hasLocationInfo(filePath, startLine, startColumn, endLine, endColumn)
+              |
+                p order by filePath, startLine, startColumn, endLine, endColumn, p.toString()
+              )
+          ).toString()
+      }
 
       private string nodes() {
         result =
@@ -1205,10 +1290,10 @@ module Make<LocationSig Location, InputSig<Location> Input> {
           )
       }
 
-      private string edge(RelevantNode pred, RelevantNode succ, string ord) {
-        edges(pred, succ, "semmle.order", ord) and
+      private string edge(RelevantNode pred, RelevantNode succ) {
+        edges(pred, succ, _) and
         exists(string label |
-          edges(pred, succ, "semmle.label", label) and
+          edges(pred, succ, label) and
           if label = ""
           then result = nodeId(pred) + " --> " + nodeId(succ)
           else result = nodeId(pred) + " -- " + label + " --> " + nodeId(succ)
@@ -1217,13 +1302,18 @@ module Make<LocationSig Location, InputSig<Location> Input> {
 
       private string edges() {
         result =
-          concat(RelevantNode pred, RelevantNode succ, string edge, string ord |
-            edge = edge(pred, succ, ord)
+          concat(RelevantNode pred, RelevantNode succ, string edge, string filePath, int startLine,
+            int startColumn, int endLine, int endColumn |
+            edge = edge(pred, succ) and
+            pred.getLocation().hasLocationInfo(filePath, startLine, startColumn, endLine, endColumn)
           |
-            edge, "\n" order by ord
+            edge, "\n"
+            order by
+              filePath, startLine, startColumn, endLine, endColumn, pred.toString()
           )
       }
 
+      /** Holds if the Mermaid representation is `s`. */
       query predicate mermaid(string s) { s = "flowchart TD\n" + nodes() + "\n\n" + edges() }
     }
   }
@@ -1297,8 +1387,15 @@ module Make<LocationSig Location, InputSig<Location> Input> {
       string getOrderDisambiguation() { result = "" }
     }
 
-    import TestOutput<RelevantNode>
-    import Mermaid
+    private module Output = TestOutput<RelevantNode>;
+
+    import Output::Mermaid
+
+    /** Holds if `pred` -> `succ` is an edge in the CFG. */
+    query predicate edges(RelevantNode pred, RelevantNode succ, string attr, string val) {
+      attr = "semmle.label" and
+      Output::edges(pred, succ, val)
+    }
   }
 
   /** Provides a set of consistency queries. */
@@ -1404,5 +1501,72 @@ module Make<LocationSig Location, InputSig<Location> Input> {
       ord = sk.getListOrder() and
       strictcount(sk.getListOrder()) > 1
     }
+
+    /** Holds if `n` has multiple textual representations. */
+    predicate multipleToString(Node n) { strictcount(n.toString()) > 1 }
+
+    /** Holds if `n` has multiple textual representations. */
+    query predicate multipleToString(Node n, string s) {
+      multipleToString(n) and
+      s = strictconcat(n.toString(), ",")
+    }
+
+    /** Holds if CFG scope `scope` lacks an initial AST node. */
+    query predicate scopeNoFirst(CfgScope scope) { not scopeFirst(scope, _) }
   }
 }
+
+/** Provides a disabled `SplittingInputSig` implementation. */
+module NoSplittingInput<LocationSig Location, InputSig<Location> Input> implements
+  SplittingInputSig<Location, Input>
+{
+  int maxSplits() { result = 0 }
+
+  class SplitKindBase = Void;
+
+  class Split = Void;
+}
+
+/** Provides a disabled `ConditionalCompletionSplittingInputSig` implementation. */
+module NoConditionalCompletionSplittingInput<
+  LocationSig Location, InputSig<Location> Input, SplittingInputSig<Location, Input> SplittingInput>
+  implements ConditionalCompletionSplittingInputSig<Location, Input, SplittingInput>
+{
+  final private class Completion = Input::Completion;
+
+  class ConditionalCompletion extends Completion {
+    ConditionalCompletion() { none() }
+  }
+
+  final private class SplitKindBase = SplittingInput::SplitKindBase;
+
+  class ConditionalCompletionSplitKind extends SplitKindBase {
+    ConditionalCompletionSplitKind() { none() }
+
+    /** Gets a textual representation of this split kind. */
+    string toString() { none() }
+  }
+
+  final private class Split = SplittingInput::Split;
+
+  class ConditionalCompletionSplit extends Split {
+    ConditionalCompletion getCompletion() { none() }
+  }
+
+  predicate condPropagateExpr(
+    Input::AstNode parent, ConditionalCompletion parentCompletion, Input::AstNode child,
+    ConditionalCompletion childCompletion
+  ) {
+    none()
+  }
+}
+
+/** Same as `MakeWithSplitting`, but without CFG splitting. */
+module Make<LocationSig Location, InputSig<Location> Input> {
+  private module SplittingInput = NoSplittingInput<Location, Input>;
+
+  private module ConditionalCompletionSplittingInput =
+    NoConditionalCompletionSplittingInput<Location, Input, SplittingInput>;
+
+  import MakeWithSplitting<Location, Input, SplittingInput, ConditionalCompletionSplittingInput>
+}
diff --git a/shared/controlflow/qlpack.yml b/shared/controlflow/qlpack.yml
index 8e88b6d4da3..10314626ec7 100644
--- a/shared/controlflow/qlpack.yml
+++ b/shared/controlflow/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/controlflow
-version: 1.0.9-dev
+version: 1.0.12-dev
 groups: shared
 library: true
 dependencies:
diff --git a/shared/dataflow/CHANGELOG.md b/shared/dataflow/CHANGELOG.md
index 594e7e40d60..72c27aa8762 100644
--- a/shared/dataflow/CHANGELOG.md
+++ b/shared/dataflow/CHANGELOG.md
@@ -1,3 +1,15 @@
+## 1.1.5
+
+No user-facing changes.
+
+## 1.1.4
+
+No user-facing changes.
+
+## 1.1.3
+
+No user-facing changes.
+
 ## 1.1.2
 
 No user-facing changes.
diff --git a/shared/dataflow/change-notes/released/1.1.3.md b/shared/dataflow/change-notes/released/1.1.3.md
new file mode 100644
index 00000000000..e8f1701bd62
--- /dev/null
+++ b/shared/dataflow/change-notes/released/1.1.3.md
@@ -0,0 +1,3 @@
+## 1.1.3
+
+No user-facing changes.
diff --git a/shared/dataflow/change-notes/released/1.1.4.md b/shared/dataflow/change-notes/released/1.1.4.md
new file mode 100644
index 00000000000..b95051903c5
--- /dev/null
+++ b/shared/dataflow/change-notes/released/1.1.4.md
@@ -0,0 +1,3 @@
+## 1.1.4
+
+No user-facing changes.
diff --git a/shared/dataflow/change-notes/released/1.1.5.md b/shared/dataflow/change-notes/released/1.1.5.md
new file mode 100644
index 00000000000..11a52a121d1
--- /dev/null
+++ b/shared/dataflow/change-notes/released/1.1.5.md
@@ -0,0 +1,3 @@
+## 1.1.5
+
+No user-facing changes.
diff --git a/shared/dataflow/codeql-pack.release.yml b/shared/dataflow/codeql-pack.release.yml
index 53ab127707f..df39a9de059 100644
--- a/shared/dataflow/codeql-pack.release.yml
+++ b/shared/dataflow/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.1.2
+lastReleaseVersion: 1.1.5
diff --git a/shared/dataflow/codeql/dataflow/DataFlow.qll b/shared/dataflow/codeql/dataflow/DataFlow.qll
index 6e4921521b1..7a2f7808977 100644
--- a/shared/dataflow/codeql/dataflow/DataFlow.qll
+++ b/shared/dataflow/codeql/dataflow/DataFlow.qll
@@ -431,6 +431,17 @@ module Configs<LocationSig Location, InputSig<Location> Lang> {
      * is not visualized (as it is in a `path-problem` query).
      */
     default predicate includeHiddenNodes() { none() }
+
+    /**
+     * Holds if sources and sinks should be filtered to only include those that
+     * may lead to a flow path with either a source or a sink in the location
+     * range given by `AlertFiltering`. This only has an effect when running
+     * in diff-informed incremental mode.
+     *
+     * This flag should only be applied to flow configurations whose results
+     * are used directly in a query result.
+     */
+    default predicate observeDiffInformedIncrementalMode() { none() }
   }
 
   /** An input configuration for data flow using flow state. */
@@ -547,6 +558,17 @@ module Configs<LocationSig Location, InputSig<Location> Lang> {
      * is not visualized (as it is in a `path-problem` query).
      */
     default predicate includeHiddenNodes() { none() }
+
+    /**
+     * Holds if sources and sinks should be filtered to only include those that
+     * may lead to a flow path with either a source or a sink in the location
+     * range given by `AlertFiltering`. This only has an effect when running
+     * in diff-informed incremental mode.
+     *
+     * This flag should only be applied to flow configurations whose results
+     * are used directly in a query result.
+     */
+    default predicate observeDiffInformedIncrementalMode() { none() }
   }
 }
 
@@ -654,6 +676,12 @@ module DataFlowMake<LocationSig Location, InputSig<Location> Lang> {
       predicate isAdditionalFlowStep(Node node1, Node node2, string model) {
         Config::isAdditionalFlowStep(node1, node2) and model = "Config"
       }
+
+      predicate isAdditionalFlowStep(
+        Node node1, FlowState state1, Node node2, FlowState state2, string model
+      ) {
+        Config::isAdditionalFlowStep(node1, state1, node2, state2) and model = "Config"
+      }
     }
 
     import Impl<C>
diff --git a/shared/dataflow/codeql/dataflow/TaintTracking.qll b/shared/dataflow/codeql/dataflow/TaintTracking.qll
index 343f8be041f..8247255038c 100644
--- a/shared/dataflow/codeql/dataflow/TaintTracking.qll
+++ b/shared/dataflow/codeql/dataflow/TaintTracking.qll
@@ -29,6 +29,12 @@ signature module InputSig<LocationSig Location, DF::InputSig<Location> Lang> {
    */
   bindingset[node]
   predicate defaultImplicitTaintRead(Lang::Node node, Lang::ContentSet c);
+
+  /**
+   * Holds if the additional step from `src` to `sink` should be considered in
+   * speculative taint flow exploration.
+   */
+  predicate speculativeTaintStep(Lang::Node src, Lang::Node sink);
 }
 
 /**
@@ -63,7 +69,7 @@ module TaintFlowMake<
         Config::isSink(node) or
         Config::isSink(node, _) or
         Config::isAdditionalFlowStep(node, _, _) or
-        Config::isAdditionalFlowStep(node, _, _, _)
+        Config::isAdditionalFlowStep(node, _, _, _, _)
       ) and
       defaultImplicitTaintRead(node, c)
     }
@@ -108,6 +114,13 @@ module TaintFlowMake<
       ) {
         Config::isAdditionalFlowStep(node1, node2) and model = "Config"
       }
+
+      predicate isAdditionalFlowStep(
+        DataFlowLang::Node node1, FlowState state1, DataFlowLang::Node node2, FlowState state2,
+        string model
+      ) {
+        Config::isAdditionalFlowStep(node1, state1, node2, state2) and model = "Config"
+      }
     }
 
     private module C implements DataFlowInternal::FullStateConfigSig {
@@ -123,4 +136,132 @@ module TaintFlowMake<
   {
     import GlobalWithState<Config>
   }
+
+  signature int speculationLimitSig();
+
+  private module AddSpeculativeTaintSteps<
+    DataFlowInternal::FullStateConfigSig Config, speculationLimitSig/0 speculationLimit> implements
+    DataFlowInternal::FullStateConfigSig
+  {
+    import Config
+
+    private predicate relevantState(Config::FlowState state) {
+      Config::isSource(_, state)
+      or
+      exists(Config::FlowState state0 |
+        relevantState(state0) and Config::isAdditionalFlowStep(_, state0, _, state, _)
+      )
+    }
+
+    private newtype TFlowState =
+      TMkFlowState(Config::FlowState state, int spec) {
+        relevantState(state) and spec = [0 .. speculationLimit()]
+      }
+
+    class FlowState extends TFlowState {
+      private Config::FlowState state;
+      private int spec;
+
+      FlowState() { this = TMkFlowState(state, spec) }
+
+      string toString() { result = "FlowState" }
+
+      Config::FlowState getState() { result = state }
+
+      int getSpec() { result = spec }
+    }
+
+    predicate isSource(DataFlowLang::Node source, FlowState state) {
+      Config::isSource(source, state.getState()) and state.getSpec() = 0
+    }
+
+    predicate isSink(DataFlowLang::Node sink, FlowState state) {
+      Config::isSink(sink, state.getState())
+    }
+
+    predicate isBarrier(DataFlowLang::Node node, FlowState state) {
+      Config::isBarrier(node, state.getState())
+    }
+
+    predicate isBarrierIn(DataFlowLang::Node node, FlowState state) {
+      Config::isBarrierIn(node, state.getState())
+    }
+
+    predicate isBarrierOut(DataFlowLang::Node node, FlowState state) {
+      Config::isBarrierOut(node, state.getState())
+    }
+
+    predicate isAdditionalFlowStep(
+      DataFlowLang::Node node1, FlowState state1, DataFlowLang::Node node2, FlowState state2,
+      string model
+    ) {
+      Config::isAdditionalFlowStep(node1, state1.getState(), node2, state2.getState(), model) and
+      state1.getSpec() = state2.getSpec()
+      or
+      speculativeTaintStep(node1, node2) and
+      not defaultAdditionalTaintStep(node1, node2, _) and
+      not Config::isAdditionalFlowStep(node1, _, node2, _, _) and
+      not Config::isAdditionalFlowStep(node1, node2, _) and
+      model = "Speculative" and
+      state1.getSpec() + 1 = state2.getSpec() and
+      state1.getState() = state2.getState()
+    }
+  }
+
+  /**
+   * Constructs a global taint tracking computation that also allows a given
+   * maximum number of speculative taint steps.
+   */
+  module SpeculativeGlobal<DataFlow::ConfigSig Config, speculationLimitSig/0 speculationLimit>
+    implements DataFlow::GlobalFlowSig
+  {
+    private module Config0 implements DataFlowInternal::FullStateConfigSig {
+      import DataFlowInternal::DefaultState<Config>
+      import Config
+
+      predicate isAdditionalFlowStep(
+        DataFlowLang::Node node1, DataFlowLang::Node node2, string model
+      ) {
+        Config::isAdditionalFlowStep(node1, node2) and model = "Config"
+      }
+    }
+
+    private module C implements DataFlowInternal::FullStateConfigSig {
+      import AddTaintDefaults<AddSpeculativeTaintSteps<Config0, speculationLimit/0>>
+    }
+
+    import DataFlowInternal::Impl<C>
+  }
+
+  /**
+   * Constructs a global taint tracking computation using flow state that also
+   * allows a given maximum number of speculative taint steps.
+   */
+  module SpeculativeGlobalWithState<
+    DataFlow::StateConfigSig Config, speculationLimitSig/0 speculationLimit> implements
+    DataFlow::GlobalFlowSig
+  {
+    private module Config0 implements DataFlowInternal::FullStateConfigSig {
+      import Config
+
+      predicate isAdditionalFlowStep(
+        DataFlowLang::Node node1, DataFlowLang::Node node2, string model
+      ) {
+        Config::isAdditionalFlowStep(node1, node2) and model = "Config"
+      }
+
+      predicate isAdditionalFlowStep(
+        DataFlowLang::Node node1, FlowState state1, DataFlowLang::Node node2, FlowState state2,
+        string model
+      ) {
+        Config::isAdditionalFlowStep(node1, state1, node2, state2) and model = "Config"
+      }
+    }
+
+    private module C implements DataFlowInternal::FullStateConfigSig {
+      import AddTaintDefaults<AddSpeculativeTaintSteps<Config0, speculationLimit/0>>
+    }
+
+    import DataFlowInternal::Impl<C>
+  }
 }
diff --git a/shared/dataflow/codeql/dataflow/internal/ContentDataFlowImpl.qll b/shared/dataflow/codeql/dataflow/internal/ContentDataFlowImpl.qll
index f413c6dd7ad..1eaa8450541 100644
--- a/shared/dataflow/codeql/dataflow/internal/ContentDataFlowImpl.qll
+++ b/shared/dataflow/codeql/dataflow/internal/ContentDataFlowImpl.qll
@@ -271,6 +271,24 @@ module MakeImplContentDataFlow<LocationSig Location, InputSig<Location> Lang> {
           result = head + "." + tail
         )
       }
+
+      /**
+       * Gets the content set at index `i` in this access path, if any.
+       */
+      ContentSet getAtIndex(int i) {
+        i = 0 and
+        result = this.getHead()
+        or
+        i > 0 and
+        result = this.getTail().getAtIndex(i - 1)
+      }
+
+      private AccessPath reverse0(int i) {
+        i = -1 and result = TAccessPathNil()
+        or
+        i >= 0 and
+        result = TAccessPathCons(this.getAtIndex(i), this.reverse0(i - 1))
+      }
     }
 
     /**
diff --git a/shared/dataflow/codeql/dataflow/internal/DataFlowImpl.qll b/shared/dataflow/codeql/dataflow/internal/DataFlowImpl.qll
index c8b56db0b34..d4c73c234be 100644
--- a/shared/dataflow/codeql/dataflow/internal/DataFlowImpl.qll
+++ b/shared/dataflow/codeql/dataflow/internal/DataFlowImpl.qll
@@ -73,7 +73,9 @@ module MakeImpl<LocationSig Location, InputSig<Location> Lang> {
      * Holds if data may flow from `node1` to `node2` in addition to the normal data-flow steps.
      * This step is only applicable in `state1` and updates the flow state to `state2`.
      */
-    predicate isAdditionalFlowStep(Node node1, FlowState state1, Node node2, FlowState state2);
+    predicate isAdditionalFlowStep(
+      Node node1, FlowState state1, Node node2, FlowState state2, string model
+    );
 
     /**
      * Holds if an arbitrary number of implicit read steps of content `c` may be
@@ -124,6 +126,17 @@ module MakeImpl<LocationSig Location, InputSig<Location> Lang> {
      * is not visualized (as it is in a `path-problem` query).
      */
     predicate includeHiddenNodes();
+
+    /**
+     * Holds if sources and sinks should be filtered to only include those that
+     * may lead to a flow path with either a source or a sink in the location
+     * range given by `AlertFiltering`. This only has an effect when running
+     * in diff-informed incremental mode.
+     *
+     * This flag should only be applied to flow configurations whose results
+     * are used directly in a query result.
+     */
+    predicate observeDiffInformedIncrementalMode();
   }
 
   /**
@@ -142,7 +155,9 @@ module MakeImpl<LocationSig Location, InputSig<Location> Lang> {
 
     predicate isBarrierOut(Node node, FlowState state) { none() }
 
-    predicate isAdditionalFlowStep(Node node1, FlowState state1, Node node2, FlowState state2) {
+    predicate isAdditionalFlowStep(
+      Node node1, FlowState state1, Node node2, FlowState state2, string model
+    ) {
       none()
     }
   }
@@ -153,104 +168,82 @@ module MakeImpl<LocationSig Location, InputSig<Location> Lang> {
   module Impl<FullStateConfigSig Config> {
     private class FlowState = Config::FlowState;
 
-    private newtype TNodeEx =
-      TNodeNormal(Node n) or
-      TNodeImplicitRead(Node n, boolean hasRead) {
-        Config::allowImplicitRead(n, _) and hasRead = [false, true]
-      } or
-      TParamReturnNode(ParameterNode p, SndLevelScopeOption scope) {
-        paramReturnNode(_, p, scope, _)
-      }
+    private module SourceSinkFiltering {
+      private import codeql.util.AlertFiltering
 
-    private class NodeEx extends TNodeEx {
-      string toString() {
-        result = this.asNode().toString()
-        or
-        exists(Node n | this.isImplicitReadNode(n, _) | result = n.toString() + " [Ext]")
-        or
-        result = this.asParamReturnNode().toString() + " [Return]"
-      }
+      private module AlertFiltering = AlertFilteringImpl<Location>;
 
-      Node asNode() { this = TNodeNormal(result) }
-
-      /** Gets the corresponding Node if this is a normal node or its post-implicit read node. */
-      Node asNodeOrImplicitRead() {
-        this = TNodeNormal(result) or this = TNodeImplicitRead(result, true)
-      }
-
-      predicate isImplicitReadNode(Node n, boolean hasRead) { this = TNodeImplicitRead(n, hasRead) }
-
-      ParameterNode asParamReturnNode() { this = TParamReturnNode(result, _) }
-
-      Node projectToNode() {
-        this = TNodeNormal(result) or
-        this = TNodeImplicitRead(result, _) or
-        this = TParamReturnNode(result, _)
+      pragma[nomagic]
+      private predicate isFilteredSource(Node source) {
+        Config::isSource(source, _) and
+        if Config::observeDiffInformedIncrementalMode()
+        then AlertFiltering::filterByLocation(source.getLocation())
+        else any()
       }
 
       pragma[nomagic]
-      private DataFlowCallable getEnclosingCallable0() {
-        nodeEnclosingCallable(this.projectToNode(), result)
+      private predicate isFilteredSink(Node sink) {
+        (
+          Config::isSink(sink, _) or
+          Config::isSink(sink)
+        ) and
+        if Config::observeDiffInformedIncrementalMode()
+        then AlertFiltering::filterByLocation(sink.getLocation())
+        else any()
       }
 
-      pragma[inline]
-      DataFlowCallable getEnclosingCallable() {
-        pragma[only_bind_out](this).getEnclosingCallable0() = pragma[only_bind_into](result)
+      private predicate hasFilteredSource() { isFilteredSource(_) }
+
+      private predicate hasFilteredSink() { isFilteredSink(_) }
+
+      predicate isRelevantSource(Node source, FlowState state) {
+        // If there are filtered sinks, we need to pass through all sources to preserve all alerts
+        // with filtered sinks. Otherwise the only alerts of interest are those with filtered
+        // sources, so we can perform the source filtering right here.
+        Config::isSource(source, state) and
+        (
+          isFilteredSource(source) or
+          hasFilteredSink()
+        )
       }
 
-      pragma[nomagic]
-      private DataFlowType getDataFlowType0() {
-        nodeDataFlowType(this.asNode(), result)
-        or
-        nodeDataFlowType(this.asParamReturnNode(), result)
+      predicate isRelevantSink(Node sink, FlowState state) {
+        // If there are filtered sources, we need to pass through all sinks to preserve all alerts
+        // with filtered sources. Otherwise the only alerts of interest are those with filtered
+        // sinks, so we can perform the sink filtering right here.
+        Config::isSink(sink, state) and
+        (
+          isFilteredSink(sink) or
+          hasFilteredSource()
+        )
       }
 
-      pragma[inline]
-      DataFlowType getDataFlowType() {
-        pragma[only_bind_out](this).getDataFlowType0() = pragma[only_bind_into](result)
+      predicate isRelevantSink(Node sink) {
+        // If there are filtered sources, we need to pass through all sinks to preserve all alerts
+        // with filtered sources. Otherwise the only alerts of interest are those with filtered
+        // sinks, so we can perform the sink filtering right here.
+        Config::isSink(sink) and
+        (
+          isFilteredSink(sink) or
+          hasFilteredSource()
+        )
       }
 
-      Location getLocation() { result = this.projectToNode().getLocation() }
+      bindingset[source, sink]
+      pragma[inline_late]
+      predicate isRelevantSourceSinkPair(Node source, Node sink) {
+        isFilteredSource(source) or
+        isFilteredSink(sink)
+      }
     }
 
-    private class ArgNodeEx extends NodeEx {
-      ArgNodeEx() { this.asNode() instanceof ArgNode }
-
-      DataFlowCall getCall() { this.asNode().(ArgNode).argumentOf(result, _) }
-    }
-
-    private class ParamNodeEx extends NodeEx {
-      ParamNodeEx() { this.asNode() instanceof ParamNode }
-
-      predicate isParameterOf(DataFlowCallable c, ParameterPosition pos) {
-        this.asNode().(ParamNode).isParameterOf(c, pos)
-      }
-
-      ParameterPosition getPosition() { this.isParameterOf(_, result) }
-    }
-
-    /**
-     * A node from which flow can return to the caller. This is either a regular
-     * `ReturnNode` or a synthesized node for flow out via a parameter.
-     */
-    private class RetNodeEx extends NodeEx {
-      private ReturnPosition pos;
-
-      RetNodeEx() {
-        pos = getValueReturnPosition(this.asNode()) or
-        pos = getParamReturnPosition(_, this.asParamReturnNode())
-      }
-
-      ReturnPosition getReturnPosition() { result = pos }
-
-      ReturnKindExt getKind() { result = pos.getKind() }
-    }
+    private import SourceSinkFiltering
 
     private predicate inBarrier(NodeEx node) {
       exists(Node n |
         node.asNode() = n and
         Config::isBarrierIn(n) and
-        Config::isSource(n, _)
+        isRelevantSource(n, _)
       )
     }
 
@@ -259,7 +252,7 @@ module MakeImpl<LocationSig Location, InputSig<Location> Lang> {
       exists(Node n |
         node.asNode() = n and
         Config::isBarrierIn(n, state) and
-        Config::isSource(n, state)
+        isRelevantSource(n, state)
       )
     }
 
@@ -268,9 +261,9 @@ module MakeImpl<LocationSig Location, InputSig<Location> Lang> {
         node.asNodeOrImplicitRead() = n and
         Config::isBarrierOut(n)
       |
-        Config::isSink(n, _)
+        isRelevantSink(n, _)
         or
-        Config::isSink(n)
+        isRelevantSink(n)
       )
     }
 
@@ -280,9 +273,9 @@ module MakeImpl<LocationSig Location, InputSig<Location> Lang> {
         node.asNodeOrImplicitRead() = n and
         Config::isBarrierOut(n, state)
       |
-        Config::isSink(n, state)
+        isRelevantSink(n, state)
         or
-        Config::isSink(n)
+        isRelevantSink(n)
       )
     }
 
@@ -292,11 +285,11 @@ module MakeImpl<LocationSig Location, InputSig<Location> Lang> {
         Config::isBarrier(n)
         or
         Config::isBarrierIn(n) and
-        not Config::isSource(n, _)
+        not isRelevantSource(n, _)
         or
         Config::isBarrierOut(n) and
-        not Config::isSink(n, _) and
-        not Config::isSink(n)
+        not isRelevantSink(n, _) and
+        not isRelevantSink(n)
       )
     }
 
@@ -306,24 +299,24 @@ module MakeImpl<LocationSig Location, InputSig<Location> Lang> {
         Config::isBarrier(n, state)
         or
         Config::isBarrierIn(n, state) and
-        not Config::isSource(n, state)
+        not isRelevantSource(n, state)
         or
         Config::isBarrierOut(n, state) and
-        not Config::isSink(n, state) and
-        not Config::isSink(n)
+        not isRelevantSink(n, state) and
+        not isRelevantSink(n)
       )
     }
 
     pragma[nomagic]
     private predicate sourceNode(NodeEx node, FlowState state) {
-      Config::isSource(node.asNode(), state) and
+      isRelevantSource(node.asNode(), state) and
       not fullBarrier(node) and
       not stateBarrier(node, state)
     }
 
     pragma[nomagic]
     private predicate sinkNodeWithState(NodeEx node, FlowState state) {
-      Config::isSink(node.asNodeOrImplicitRead(), state) and
+      isRelevantSink(node.asNodeOrImplicitRead(), state) and
       not fullBarrier(node) and
       not stateBarrier(node, state)
     }
@@ -357,27 +350,8 @@ module MakeImpl<LocationSig Location, InputSig<Location> Lang> {
      * Holds if data can flow in one local step from `node1` to `node2`.
      */
     private predicate localFlowStepEx(NodeEx node1, NodeEx node2, string model) {
-      exists(Node n1, Node n2 |
-        node1.asNode() = n1 and
-        node2.asNode() = n2 and
-        simpleLocalFlowStepExt(pragma[only_bind_into](n1), pragma[only_bind_into](n2), model) and
-        stepFilter(node1, node2)
-      )
-      or
-      exists(Node n |
-        node1.asNode() = n and
-        node2.isImplicitReadNode(n, false) and
-        not fullBarrier(node1) and
-        model = ""
-      )
-      or
-      exists(Node n1, Node n2, SndLevelScopeOption scope |
-        node1.asNode() = n1 and
-        node2 = TParamReturnNode(n2, scope) and
-        paramReturnNode(pragma[only_bind_into](n1), pragma[only_bind_into](n2),
-          pragma[only_bind_into](scope), _) and
-        model = ""
-      )
+      localFlowStepExImpl(node1, node2, model) and
+      stepFilter(node1, node2)
     }
 
     /**
@@ -394,12 +368,13 @@ module MakeImpl<LocationSig Location, InputSig<Location> Lang> {
     }
 
     private predicate additionalLocalStateStep(
-      NodeEx node1, FlowState s1, NodeEx node2, FlowState s2
+      NodeEx node1, FlowState s1, NodeEx node2, FlowState s2, string model
     ) {
       exists(Node n1, Node n2 |
         node1.asNodeOrImplicitRead() = n1 and
         node2.asNode() = n2 and
-        Config::isAdditionalFlowStep(pragma[only_bind_into](n1), s1, pragma[only_bind_into](n2), s2) and
+        Config::isAdditionalFlowStep(pragma[only_bind_into](n1), s1, pragma[only_bind_into](n2), s2,
+          model) and
         getNodeEnclosingCallable(n1) = getNodeEnclosingCallable(n2) and
         stateStepFilter(node1, s1, node2, s2)
       )
@@ -432,11 +407,14 @@ module MakeImpl<LocationSig Location, InputSig<Location> Lang> {
       )
     }
 
-    private predicate additionalJumpStateStep(NodeEx node1, FlowState s1, NodeEx node2, FlowState s2) {
+    private predicate additionalJumpStateStep(
+      NodeEx node1, FlowState s1, NodeEx node2, FlowState s2, string model
+    ) {
       exists(Node n1, Node n2 |
         node1.asNodeOrImplicitRead() = n1 and
         node2.asNode() = n2 and
-        Config::isAdditionalFlowStep(pragma[only_bind_into](n1), s1, pragma[only_bind_into](n2), s2) and
+        Config::isAdditionalFlowStep(pragma[only_bind_into](n1), s1, pragma[only_bind_into](n2), s2,
+          model) and
         getNodeEnclosingCallable(n1) != getNodeEnclosingCallable(n2) and
         stateStepFilter(node1, s1, node2, s2) and
         not Config::getAFeature() instanceof FeatureEqualSourceSinkCallContext
@@ -449,9 +427,13 @@ module MakeImpl<LocationSig Location, InputSig<Location> Lang> {
       stepFilter(node1, node2)
       or
       exists(Node n |
-        node2.isImplicitReadNode(n, true) and
-        node1.isImplicitReadNode(n, _) and
+        node2.isImplicitReadNode(n) and
         Config::allowImplicitRead(n, c)
+      |
+        node1.asNode() = n and
+        not fullBarrier(node1)
+        or
+        node1.isImplicitReadNode(n)
       )
     }
 
@@ -563,13 +545,13 @@ module MakeImpl<LocationSig Location, InputSig<Location> Lang> {
         exists(NodeEx mid | fwdFlow(mid, cc) |
           localFlowStepEx(mid, node, _) or
           additionalLocalFlowStep(mid, node, _) or
-          additionalLocalStateStep(mid, _, node, _)
+          additionalLocalStateStep(mid, _, node, _, _)
         )
         or
         exists(NodeEx mid | fwdFlow(mid, _) and cc = false |
           jumpStepEx(mid, node) or
           additionalJumpStep(mid, node, _) or
-          additionalJumpStateStep(mid, _, node, _)
+          additionalJumpStateStep(mid, _, node, _, _)
         )
         or
         // store
@@ -710,8 +692,8 @@ module MakeImpl<LocationSig Location, InputSig<Location> Lang> {
 
       private predicate stateStepFwd(FlowState state1, FlowState state2) {
         exists(NodeEx node1 |
-          additionalLocalStateStep(node1, state1, _, state2) or
-          additionalJumpStateStep(node1, state1, _, state2)
+          additionalLocalStateStep(node1, state1, _, state2, _) or
+          additionalJumpStateStep(node1, state1, _, state2, _)
         |
           fwdFlow(node1)
         )
@@ -727,9 +709,9 @@ module MakeImpl<LocationSig Location, InputSig<Location> Lang> {
       }
 
       additional predicate sinkNode(NodeEx node, FlowState state) {
-        fwdFlow(node) and
+        fwdFlow(pragma[only_bind_into](node)) and
         fwdFlowState(state) and
-        Config::isSink(node.asNodeOrImplicitRead())
+        isRelevantSink(node.asNodeOrImplicitRead())
         or
         fwdFlow(node) and
         fwdFlowState(state) and
@@ -756,13 +738,13 @@ module MakeImpl<LocationSig Location, InputSig<Location> Lang> {
         exists(NodeEx mid | revFlow(mid, toReturn) |
           localFlowStepEx(node, mid, _) or
           additionalLocalFlowStep(node, mid, _) or
-          additionalLocalStateStep(node, _, mid, _)
+          additionalLocalStateStep(node, _, mid, _, _)
         )
         or
         exists(NodeEx mid | revFlow(mid, _) and toReturn = false |
           jumpStepEx(node, mid) or
           additionalJumpStep(node, mid, _) or
-          additionalJumpStateStep(node, _, mid, _)
+          additionalJumpStateStep(node, _, mid, _, _)
         )
         or
         // store
@@ -880,8 +862,8 @@ module MakeImpl<LocationSig Location, InputSig<Location> Lang> {
 
       private predicate stateStepRev(FlowState state1, FlowState state2) {
         exists(NodeEx node1, NodeEx node2 |
-          additionalLocalStateStep(node1, state1, node2, state2) or
-          additionalJumpStateStep(node1, state1, node2, state2)
+          additionalLocalStateStep(node1, state1, node2, state2, _) or
+          additionalJumpStateStep(node1, state1, node2, state2, _)
         |
           revFlow(node1, _) and
           revFlow(node2, _) and
@@ -1062,10 +1044,15 @@ module MakeImpl<LocationSig Location, InputSig<Location> Lang> {
     bindingset[label1, label2]
     pragma[inline_late]
     private string mergeLabels(string label1, string label2) {
-      // Big-step, hidden nodes, and summaries all may need to merge labels.
-      // These cases are expected to involve at most one non-empty label, so
-      // we'll just discard the 2nd+ label for now.
-      if label1 = "" then result = label2 else result = label1
+      if label2.matches("Sink:%")
+      then if label1 = "" then result = label2 else result = label1 + " " + label2
+      else
+        // Big-step, hidden nodes, and summaries all may need to merge labels.
+        // These cases are expected to involve at most one non-empty label, so
+        // we'll just discard the 2nd+ label for now.
+        if label1 = ""
+        then result = label2
+        else result = label1
     }
 
     pragma[nomagic]
@@ -1096,8 +1083,7 @@ module MakeImpl<LocationSig Location, InputSig<Location> Lang> {
     ) {
       Stage1::revFlow(node1) and
       Stage1::revFlow(node2) and
-      additionalLocalStateStep(node1, state1, node2, state2) and
-      label = "Config" and
+      additionalLocalStateStep(node1, state1, node2, state2, label) and
       t = node2.getDataFlowType() and
       lcc.relevantFor(node1.getEnclosingCallable()) and
       not isUnreachableInCall1(node1, lcc) and
@@ -1649,7 +1635,7 @@ module MakeImpl<LocationSig Location, InputSig<Location> Lang> {
           or
           exists(NodeEx mid, FlowState state0 |
             fwdFlow(mid, state0, _, _, _, ap, apa) and
-            additionalJumpStateStep(mid, state0, node, state) and
+            additionalJumpStateStep(mid, state0, node, state, _) and
             t = getNodeTyp(node) and
             ap instanceof ApNil
           )
@@ -2314,7 +2300,7 @@ module MakeImpl<LocationSig Location, InputSig<Location> Lang> {
           )
           or
           exists(NodeEx mid, FlowState state0 |
-            additionalJumpStateStep(node, state, mid, state0) and
+            additionalJumpStateStep(node, state, mid, state0, _) and
             revFlow(pragma[only_bind_into](mid), pragma[only_bind_into](state0), _, _, ap) and
             ap instanceof ApNil
           )
@@ -2617,31 +2603,27 @@ module MakeImpl<LocationSig Location, InputSig<Location> Lang> {
           callEdgeReturn(call, c, _, _, _, _, _)
         }
 
-        /** Provides the input to `LocalFlowBigStep`. */
-        signature module LocalFlowBigStepInputSig {
-          bindingset[node1, state1]
-          bindingset[node2, state2]
-          predicate localStep(
-            NodeEx node1, FlowState state1, NodeEx node2, FlowState state2, boolean preservesValue,
-            DataFlowType t, LocalCallContext lcc, string label
-          );
-        }
+        /** Holds if `node1` can step to `node2` in one or more local steps. */
+        bindingset[node1, state1]
+        bindingset[node2, state2]
+        signature predicate localStepSig(
+          NodeEx node1, FlowState state1, NodeEx node2, FlowState state2, boolean preservesValue,
+          DataFlowType t, LocalCallContext lcc, string label
+        );
 
         /**
          * Provides a big-step relation for local flow steps.
          *
-         * The big-step releation is based on the `localStep` relation from the
-         * input module, restricted to nodes that are forwards and backwards
-         * reachable in this stage.
+         * The big-step releation is based on the `localStepInput` relation,
+         * restricted to nodes that are forwards and backwards reachable in
+         * this stage.
          */
-        additional module LocalFlowBigStep<LocalFlowBigStepInputSig Input> {
-          final private class NodeExFinal = NodeEx;
-
+        additional module LocalFlowBigStep<localStepSig/8 localStepInput> {
           /**
            * A node where some checking is required, and hence the big-step relation
            * is not allowed to step over.
            */
-          private class FlowCheckNode extends NodeExFinal {
+          private class FlowCheckNode extends NodeEx {
             FlowCheckNode() {
               revFlow(this, _, _) and
               (
@@ -2661,7 +2643,7 @@ module MakeImpl<LocationSig Location, InputSig<Location> Lang> {
             exists(ApNil nil |
               revFlow(node1, state1, pragma[only_bind_into](nil)) and
               revFlow(node2, state2, pragma[only_bind_into](nil)) and
-              Input::localStep(node1, state1, node2, state2, false, t, lcc, label) and
+              localStepInput(node1, state1, node2, state2, false, t, lcc, label) and
               state1 != state2
             )
           }
@@ -2679,7 +2661,7 @@ module MakeImpl<LocationSig Location, InputSig<Location> Lang> {
               or
               additionalJumpStep(_, node, _)
               or
-              additionalJumpStateStep(_, _, node, state)
+              additionalJumpStateStep(_, _, node, state, _)
               or
               node instanceof ParamNodeEx
               or
@@ -2727,9 +2709,9 @@ module MakeImpl<LocationSig Location, InputSig<Location> Lang> {
               exists(NodeEx next, FlowState s |
                 revFlow(next, s, pragma[only_bind_into](ap)) and ap instanceof ApNil
               |
-                additionalJumpStateStep(node, state, next, s)
+                additionalJumpStateStep(node, state, next, s, _)
                 or
-                additionalLocalStateStep(node, state, next, s) and
+                additionalLocalStateStep(node, state, next, s, _) and
                 s != state
               )
               or
@@ -2755,7 +2737,7 @@ module MakeImpl<LocationSig Location, InputSig<Location> Lang> {
             not inBarrier(node2, state) and
             not outBarrier(node1, state) and
             exists(NodeEx mid, boolean preservesValue2, DataFlowType t2, string label2, Ap ap |
-              Input::localStep(mid, state, node2, state, preservesValue2, t2, cc, label2) and
+              localStepInput(mid, state, node2, state, preservesValue2, t2, cc, label2) and
               revFlow(node2, pragma[only_bind_into](state), pragma[only_bind_into](ap)) and
               not outBarrier(mid, state) and
               (preservesValue = true or ap instanceof ApNil)
@@ -2790,6 +2772,33 @@ module MakeImpl<LocationSig Location, InputSig<Location> Lang> {
             exists(Ap ap |
               localFlowStepPlus(node1, state1, node2, preservesValue, t, callContext, label) and
               localFlowExit(node2, state1, ap) and
+              state1 = state2 and
+              node1 != node2
+            |
+              preservesValue = true or ap instanceof ApNil
+            )
+            or
+            additionalLocalStateStep(node1, state1, node2, state2, t, callContext, label) and
+            preservesValue = false
+          }
+
+          /**
+           * Holds if `node1` can step to `node2` in one or more local steps and this
+           * path can occur as a maximal subsequence of local steps in a dataflow path.
+           *
+           * This predicate should be used when `localStepInput` is already a big-step
+           * relation, which will do the same as `localFlowBigStep`, but avoids potential
+           * worst-case quadratic complexity.
+           */
+          pragma[nomagic]
+          predicate localFlowBigStepTc(
+            NodeEx node1, FlowState state1, NodeEx node2, FlowState state2, boolean preservesValue,
+            DataFlowType t, LocalCallContext callContext, string label
+          ) {
+            exists(Ap ap |
+              localFlowEntry(node1, pragma[only_bind_into](state1), pragma[only_bind_into](ap)) and
+              localStepInput(node1, state1, node2, state2, preservesValue, t, callContext, label) and
+              localFlowExit(node2, pragma[only_bind_into](state2), pragma[only_bind_into](ap)) and
               state1 = state2
             |
               preservesValue = true or ap instanceof ApNil
@@ -2801,8 +2810,6 @@ module MakeImpl<LocationSig Location, InputSig<Location> Lang> {
         }
 
         /**
-         * INTERNAL: Only for debugging.
-         *
          * Provides a graph representation of the data flow in this stage suitable for use in a `path-problem` query.
          */
         additional module Graph {
@@ -2835,14 +2842,50 @@ module MakeImpl<LocationSig Location, InputSig<Location> Lang> {
 
             abstract PathNodeImpl getASuccessorImpl(string label);
 
+            pragma[nomagic]
+            PathNodeImpl getAnImplicitReadSuccessorAtSink(string label) {
+              exists(PathNodeMid readTarget |
+                result = this.getASuccessorImpl(_) and
+                localStep(this, readTarget, _) and
+                readTarget.getNodeEx().isImplicitReadNode(_)
+              |
+                // last implicit read, leaving the access path empty
+                result = readTarget.projectToSink(label)
+                or
+                // implicit read, leaving the access path non-empty
+                exists(result.getAnImplicitReadSuccessorAtSink(label)) and
+                result = readTarget
+              )
+            }
+
             private PathNodeImpl getASuccessorIfHidden(string label) {
               this.isHidden() and
               result = this.getASuccessorImpl(label)
+              or
+              result = this.getAnImplicitReadSuccessorAtSink(label)
             }
 
             private PathNodeImpl getASuccessorFromNonHidden(string label) {
               result = this.getASuccessorImpl(label) and
-              not this.isHidden()
+              not this.isHidden() and
+              // In cases like
+              //
+              // ```
+              // x.Field = taint;
+              // Sink(x);
+              // ```
+              //
+              // we only want the direct edge
+              //
+              //  `[post update] x [Field]` -> `x`
+              //
+              // and not the two edges
+              //
+              //  `[post update] x [Field]` -> `x [Field]`
+              //  `x [Field]`               -> `x`
+              //
+              // which the restriction below ensures.
+              not result = this.getAnImplicitReadSuccessorAtSink(_)
               or
               exists(string l1, string l2 |
                 result = this.getASuccessorFromNonHidden(l1).getASuccessorIfHidden(l2) and
@@ -2946,7 +2989,7 @@ module MakeImpl<LocationSig Location, InputSig<Location> Lang> {
             NodeEx toNormalSinkNodeEx() {
               exists(Node n |
                 pragma[only_bind_out](node.asNodeOrImplicitRead()) = n and
-                (Config::isSink(n) or Config::isSink(n, _)) and
+                (isRelevantSink(n) or isRelevantSink(n, _)) and
                 result.asNode() = n
               )
             }
@@ -2963,17 +3006,15 @@ module MakeImpl<LocationSig Location, InputSig<Location> Lang> {
               )
               or
               // a final step to a sink
-              exists(string l2, string sinkmodel |
-                result = this.getSuccMid(l2).projectToSink(sinkmodel)
+              exists(string l2, string sinkLabel |
+                result = this.getSuccMid(l2).projectToSink(sinkLabel)
               |
                 not this.isSourceWithLabel(_) and
-                if sinkmodel != "" then label = l2 + " Sink:" + sinkmodel else label = l2
+                label = mergeLabels(l2, sinkLabel)
                 or
                 exists(string l1 |
                   this.isSourceWithLabel(l1) and
-                  if sinkmodel != ""
-                  then label = l1 + l2 + " Sink:" + sinkmodel
-                  else label = l1 + l2
+                  label = l1 + mergeLabels(l2, sinkLabel)
                 )
               )
             }
@@ -3039,11 +3080,14 @@ module MakeImpl<LocationSig Location, InputSig<Location> Lang> {
                 else any()
             }
 
-            PathNodeSink projectToSink(string model) {
-              this.isAtSink() and
-              sinkModel(node, model) and
-              result.getNodeEx() = this.toNormalSinkNodeEx() and
-              result.getState() = state
+            PathNodeSink projectToSink(string label) {
+              exists(string model |
+                this.isAtSink() and
+                sinkModel(node, model) and
+                result.getNodeEx() = this.toNormalSinkNodeEx() and
+                result.getState() = state and
+                if model != "" then label = "Sink:" + model else label = ""
+              )
             }
           }
 
@@ -3239,10 +3283,9 @@ module MakeImpl<LocationSig Location, InputSig<Location> Lang> {
               t = getNodeTyp(node) and
               ap instanceof ApNil
               or
-              additionalJumpStateStep(mid, state0, node, state) and
+              additionalJumpStateStep(mid, state0, node, state, label) and
               t = getNodeTyp(node) and
-              ap instanceof ApNil and
-              label = "Config"
+              ap instanceof ApNil
             )
             or
             // flow into a callable
@@ -3315,6 +3358,8 @@ module MakeImpl<LocationSig Location, InputSig<Location> Lang> {
             private predicate localStepFromHidden(PathNodeImpl n1, PathNodeImpl n2) {
               n2 = localStep(n1) and
               n1.isHidden()
+              or
+              n2 = n1.getAnImplicitReadSuccessorAtSink(_)
             }
 
             bindingset[par, ret]
@@ -3502,6 +3547,17 @@ module MakeImpl<LocationSig Location, InputSig<Location> Lang> {
              * included in the module `PathGraph`.
              */
             predicate flowPath(PathNode source, PathNode sink) {
+              (
+                // When there are both sources and sinks in the diff range,
+                // diff-informed dataflow falls back to computing all paths without
+                // any filtering. To prevent significant alert flip-flopping due to
+                // minor code changes triggering the fallback, we consistently apply
+                // source-or-sink filtering here to ensure that we return the same
+                // paths regardless of whether the fallback is triggered.
+                if Config::observeDiffInformedIncrementalMode()
+                then isRelevantSourceSinkPair(source.getNode(), sink.getNode())
+                else any()
+              ) and
               exists(PathNodeImpl flowsource, PathNodeImpl flowsink |
                 source = flowsource and sink = flowsink
               |
@@ -3763,27 +3819,25 @@ module MakeImpl<LocationSig Location, InputSig<Location> Lang> {
       import CallContextSensitivity<CallContextSensitivityInput>
       import NoLocalCallContext
 
-      private module BigStepInput implements PrevStage::LocalFlowBigStepInputSig {
-        bindingset[node1, state1]
-        bindingset[node2, state2]
-        predicate localStep(
-          NodeEx node1, FlowState state1, NodeEx node2, FlowState state2, boolean preservesValue,
-          DataFlowType t, LocalCallContext lcc, string label
-        ) {
-          localStepNodeCand1(node1, node2, preservesValue, t, lcc, label) and
-          state1 = state2
-          or
-          localStateStepNodeCand1(node1, state1, node2, state2, t, lcc, label) and
-          preservesValue = false
-        }
+      bindingset[node1, state1]
+      bindingset[node2, state2]
+      private predicate localStepInput(
+        NodeEx node1, FlowState state1, NodeEx node2, FlowState state2, boolean preservesValue,
+        DataFlowType t, LocalCallContext lcc, string label
+      ) {
+        localStepNodeCand1(node1, node2, preservesValue, t, lcc, label) and
+        state1 = state2
+        or
+        localStateStepNodeCand1(node1, state1, node2, state2, t, lcc, label) and
+        preservesValue = false
       }
 
       additional predicate localFlowBigStep(
         NodeEx node1, FlowState state1, NodeEx node2, FlowState state2, boolean preservesValue,
         DataFlowType t, LocalCallContext lcc, string label
       ) {
-        PrevStage::LocalFlowBigStep<BigStepInput>::localFlowBigStep(node1, state1, node2, state2,
-          preservesValue, t, lcc, label)
+        PrevStage::LocalFlowBigStep<localStepInput/8>::localFlowBigStep(node1, state1, node2,
+          state2, preservesValue, t, lcc, label)
       }
 
       bindingset[node1, state1]
@@ -4178,14 +4232,8 @@ module MakeImpl<LocationSig Location, InputSig<Location> Lang> {
       import CallContextSensitivity<CallContextSensitivityInput>
       import LocalCallContext
 
-      predicate localStep(
-        NodeEx node1, FlowState state1, NodeEx node2, FlowState state2, boolean preservesValue,
-        Typ t, LocalCc lcc, string label
-      ) {
-        Stage3Param::localFlowBigStep(node1, state1, node2, state2, preservesValue, t, lcc, label) and
-        PrevStage::revFlow(node1, pragma[only_bind_into](state1), _) and
-        PrevStage::revFlow(node2, pragma[only_bind_into](state2), _)
-      }
+      predicate localStep =
+        PrevStage::LocalFlowBigStep<Stage3Param::localFlowBigStep/8>::localFlowBigStepTc/8;
 
       bindingset[node, state, t0, ap]
       predicate filter(NodeEx node, FlowState state, Typ t0, Ap ap, Typ t) {
@@ -4383,18 +4431,8 @@ module MakeImpl<LocationSig Location, InputSig<Location> Lang> {
       import CallContextSensitivity<CallContextSensitivityInput>
       import LocalCallContext
 
-      private module BigStepInput implements PrevStage::LocalFlowBigStepInputSig {
-        predicate localStep(
-          NodeEx node1, FlowState state1, NodeEx node2, FlowState state2, boolean preservesValue,
-          DataFlowType t, LocalCallContext lcc, string label
-        ) {
-          Stage3Param::localFlowBigStep(node1, state1, node2, state2, preservesValue, t, lcc, label) and
-          PrevStage::revFlow(node1, pragma[only_bind_into](state1), _) and
-          PrevStage::revFlow(node2, pragma[only_bind_into](state2), _)
-        }
-      }
-
-      predicate localStep = PrevStage::LocalFlowBigStep<BigStepInput>::localFlowBigStep/8;
+      predicate localStep =
+        PrevStage::LocalFlowBigStep<Stage5Param::localStep/8>::localFlowBigStepTc/8;
 
       bindingset[node, state, t0, ap]
       predicate filter(NodeEx node, FlowState state, Typ t0, Ap ap, Typ t) {
@@ -4623,6 +4661,8 @@ module MakeImpl<LocationSig Location, InputSig<Location> Lang> {
      */
     predicate stageStats = Debug::stageStats/10;
 
+    private module Stage1alias = Stage1;
+
     private module Stage2alias = Stage2;
 
     private module Stage3alias = Stage3;
@@ -4632,11 +4672,13 @@ module MakeImpl<LocationSig Location, InputSig<Location> Lang> {
     private module Stage5alias = Stage5;
 
     /**
-     * INTERNAL: Only for debugging.
+     * INTERNAL: Subject to change without notice.
      *
      * Contains references to individual pruning stages.
      */
-    module Debug {
+    module Stages {
+      module Stage1 = Stage1alias;
+
       module Stage2 = Stage2alias;
 
       module Stage3 = Stage3alias;
@@ -4644,6 +4686,15 @@ module MakeImpl<LocationSig Location, InputSig<Location> Lang> {
       module Stage4 = Stage4alias;
 
       module Stage5 = Stage5alias;
+    }
+
+    /**
+     * INTERNAL: Only for debugging.
+     *
+     * Contains references to individual pruning stages and stage statistics.
+     */
+    module Debug {
+      import Stages
 
       predicate stageStats1(
         int n, string stage, int nodes, int fields, int conscand, int states, int tuples,
@@ -4777,7 +4828,7 @@ module MakeImpl<LocationSig Location, InputSig<Location> Lang> {
           or
           additionalJumpStep(node1, node2, _)
           or
-          additionalJumpStateStep(node1, _, node2, _)
+          additionalJumpStateStep(node1, _, node2, _, _)
           or
           // flow into callable
           viableParamArgEx(_, node2, node1)
@@ -4792,15 +4843,15 @@ module MakeImpl<LocationSig Location, InputSig<Location> Lang> {
       }
 
       private predicate interestingCallableSrc(DataFlowCallable c) {
-        exists(Node n | Config::isSource(n, _) and c = getNodeEnclosingCallable(n))
+        exists(Node n | isRelevantSource(n, _) and c = getNodeEnclosingCallable(n))
         or
         exists(DataFlowCallable mid | interestingCallableSrc(mid) and callableStep(mid, c))
       }
 
       private predicate interestingCallableSink(DataFlowCallable c) {
         exists(Node n | c = getNodeEnclosingCallable(n) |
-          Config::isSink(n, _) or
-          Config::isSink(n)
+          isRelevantSink(n, _) or
+          isRelevantSink(n)
         )
         or
         exists(DataFlowCallable mid | interestingCallableSink(mid) and callableStep(c, mid))
@@ -4827,7 +4878,7 @@ module MakeImpl<LocationSig Location, InputSig<Location> Lang> {
         or
         exists(Node n |
           ce1 = TCallableSrc() and
-          Config::isSource(n, _) and
+          isRelevantSource(n, _) and
           ce2 = TCallable(getNodeEnclosingCallable(n))
         )
         or
@@ -4835,8 +4886,8 @@ module MakeImpl<LocationSig Location, InputSig<Location> Lang> {
           ce2 = TCallableSink() and
           ce1 = TCallable(getNodeEnclosingCallable(n))
         |
-          Config::isSink(n, _) or
-          Config::isSink(n)
+          isRelevantSink(n, _) or
+          isRelevantSink(n)
         )
       }
 
@@ -4891,16 +4942,16 @@ module MakeImpl<LocationSig Location, InputSig<Location> Lang> {
       private predicate relevantState(FlowState state) {
         sourceNode(_, state) or
         sinkNodeWithState(_, state) or
-        additionalLocalStateStep(_, state, _, _) or
-        additionalLocalStateStep(_, _, _, state) or
-        additionalJumpStateStep(_, state, _, _) or
-        additionalJumpStateStep(_, _, _, state)
+        additionalLocalStateStep(_, state, _, _, _) or
+        additionalLocalStateStep(_, _, _, state, _) or
+        additionalJumpStateStep(_, state, _, _, _) or
+        additionalJumpStateStep(_, _, _, state, _)
       }
 
       private predicate revSinkNode(NodeEx node, FlowState state) {
         sinkNodeWithState(node, state)
         or
-        Config::isSink(node.asNodeOrImplicitRead()) and
+        isRelevantSink(node.asNodeOrImplicitRead()) and
         relevantState(state) and
         not fullBarrier(node) and
         not stateBarrier(node, state)
@@ -5230,7 +5281,7 @@ module MakeImpl<LocationSig Location, InputSig<Location> Lang> {
           t = node.getDataFlowType() and
           ap = TPartialNil()
           or
-          additionalLocalStateStep(mid.getNodeEx(), mid.getState(), node, state) and
+          additionalLocalStateStep(mid.getNodeEx(), mid.getState(), node, state, _) and
           cc = mid.getCallContext() and
           sc1 = mid.getSummaryCtx1() and
           sc2 = mid.getSummaryCtx2() and
@@ -5265,7 +5316,7 @@ module MakeImpl<LocationSig Location, InputSig<Location> Lang> {
         ap = TPartialNil() and
         isStoreStep = false
         or
-        additionalJumpStateStep(mid.getNodeEx(), mid.getState(), node, state) and
+        additionalJumpStateStep(mid.getNodeEx(), mid.getState(), node, state, _) and
         cc = callContextNone() and
         sc1 = TSummaryCtx1None() and
         sc2 = TSummaryCtx2None() and
@@ -5537,7 +5588,7 @@ module MakeImpl<LocationSig Location, InputSig<Location> Lang> {
         ap = TPartialNil() and
         isStoreStep = false
         or
-        additionalLocalStateStep(node, state, mid.getNodeEx(), mid.getState()) and
+        additionalLocalStateStep(node, state, mid.getNodeEx(), mid.getState(), _) and
         sc1 = mid.getSummaryCtx1() and
         sc2 = mid.getSummaryCtx2() and
         sc3 = mid.getSummaryCtx3() and
@@ -5562,7 +5613,7 @@ module MakeImpl<LocationSig Location, InputSig<Location> Lang> {
         ap = TPartialNil() and
         isStoreStep = false
         or
-        additionalJumpStateStep(node, state, mid.getNodeEx(), mid.getState()) and
+        additionalJumpStateStep(node, state, mid.getNodeEx(), mid.getState(), _) and
         sc1 = TRevSummaryCtx1None() and
         sc2 = TRevSummaryCtx2None() and
         sc3 = TRevSummaryCtx3None() and
diff --git a/shared/dataflow/codeql/dataflow/internal/DataFlowImplCommon.qll b/shared/dataflow/codeql/dataflow/internal/DataFlowImplCommon.qll
index 8a82c7b570c..81f9946126d 100644
--- a/shared/dataflow/codeql/dataflow/internal/DataFlowImplCommon.qll
+++ b/shared/dataflow/codeql/dataflow/internal/DataFlowImplCommon.qll
@@ -850,6 +850,85 @@ module MakeImplCommon<LocationSig Location, InputSig<Location> Lang> {
 
   class SndLevelScopeOption = SndLevelScopeOption::Option;
 
+  final class NodeEx extends TNodeEx {
+    string toString() {
+      result = this.asNode().toString()
+      or
+      exists(Node n | this.isImplicitReadNode(n) | result = n.toString() + " [Ext]")
+      or
+      result = this.asParamReturnNode().toString() + " [Return]"
+    }
+
+    Node asNode() { this = TNodeNormal(result) }
+
+    /** Gets the corresponding Node if this is a normal node or its post-implicit read node. */
+    Node asNodeOrImplicitRead() { this = TNodeNormal(result) or this = TNodeImplicitRead(result) }
+
+    predicate isImplicitReadNode(Node n) { this = TNodeImplicitRead(n) }
+
+    ParameterNode asParamReturnNode() { this = TParamReturnNode(result, _) }
+
+    Node projectToNode() {
+      this = TNodeNormal(result) or
+      this = TNodeImplicitRead(result) or
+      this = TParamReturnNode(result, _)
+    }
+
+    pragma[nomagic]
+    private DataFlowCallable getEnclosingCallable0() {
+      nodeEnclosingCallable(this.projectToNode(), result)
+    }
+
+    pragma[inline]
+    DataFlowCallable getEnclosingCallable() {
+      pragma[only_bind_out](this).getEnclosingCallable0() = pragma[only_bind_into](result)
+    }
+
+    pragma[nomagic]
+    private DataFlowType getDataFlowType0() {
+      nodeDataFlowType(this.asNode(), result)
+      or
+      nodeDataFlowType(this.asParamReturnNode(), result)
+    }
+
+    pragma[inline]
+    DataFlowType getDataFlowType() {
+      pragma[only_bind_out](this).getDataFlowType0() = pragma[only_bind_into](result)
+    }
+
+    Location getLocation() { result = this.projectToNode().getLocation() }
+  }
+
+  final class ArgNodeEx extends NodeEx {
+    ArgNodeEx() { this.asNode() instanceof ArgNode }
+
+    DataFlowCall getCall() { this.asNode().(ArgNode).argumentOf(result, _) }
+  }
+
+  final class ParamNodeEx extends NodeEx {
+    ParamNodeEx() { this.asNode() instanceof ParamNode }
+
+    predicate isParameterOf(DataFlowCallable c, ParameterPosition pos) {
+      this.asNode().(ParamNode).isParameterOf(c, pos)
+    }
+
+    ParameterPosition getPosition() { this.isParameterOf(_, result) }
+  }
+
+  /**
+   * A node from which flow can return to the caller. This is either a regular
+   * `ReturnNode` or a synthesized node for flow out via a parameter.
+   */
+  final class RetNodeEx extends NodeEx {
+    private ReturnPosition pos;
+
+    RetNodeEx() { pos = getReturnPositionEx(this) }
+
+    ReturnPosition getReturnPosition() { result = pos }
+
+    ReturnKindExt getKind() { result = pos.getKind() }
+  }
+
   cached
   private module Cached {
     /**
@@ -927,11 +1006,8 @@ module MakeImplCommon<LocationSig Location, InputSig<Location> Lang> {
       )
     }
 
-    cached
-    predicate valueReturnNode(ReturnNode n, ReturnKindExt k) { k = TValueReturn(n.getKind()) }
-
-    cached
-    predicate paramReturnNode(
+    pragma[nomagic]
+    private predicate paramReturnNode(
       PostUpdateNode n, ParamNode p, SndLevelScopeOption scope, ReturnKindExt k
     ) {
       exists(ParameterPosition pos |
@@ -1541,6 +1617,20 @@ module MakeImplCommon<LocationSig Location, InputSig<Location> Lang> {
 
     class UnreachableSetOption = UnreachableSetOption::Option;
 
+    pragma[nomagic]
+    private predicate hasValueReturnKindIn(ReturnNode ret, ReturnKindExt kind, DataFlowCallable c) {
+      c = getNodeEnclosingCallable(ret) and
+      kind = TValueReturn(ret.getKind())
+    }
+
+    pragma[nomagic]
+    private predicate hasParamReturnKindIn(
+      PostUpdateNode n, ParamNode p, ReturnKindExt kind, DataFlowCallable c
+    ) {
+      c = getNodeEnclosingCallable(n) and
+      paramReturnNode(n, p, _, kind)
+    }
+
     cached
     newtype TReturnPosition =
       TReturnPosition0(DataFlowCallable c, ReturnKindExt kind) {
@@ -1549,6 +1639,22 @@ module MakeImplCommon<LocationSig Location, InputSig<Location> Lang> {
         hasParamReturnKindIn(_, _, kind, c)
       }
 
+    cached
+    ReturnPosition getValueReturnPosition(ReturnNode ret) {
+      exists(ReturnKindExt kind, DataFlowCallable c |
+        hasValueReturnKindIn(ret, kind, c) and
+        result = TReturnPosition0(c, kind)
+      )
+    }
+
+    cached
+    ReturnPosition getParamReturnPosition(PostUpdateNode n, ParamNode p) {
+      exists(ReturnKindExt kind, DataFlowCallable c |
+        hasParamReturnKindIn(n, p, kind, c) and
+        result = TReturnPosition0(c, kind)
+      )
+    }
+
     cached
     newtype TLocalFlowCallContext =
       TAnyLocalCall() or
@@ -1594,6 +1700,44 @@ module MakeImplCommon<LocationSig Location, InputSig<Location> Lang> {
     newtype TApproxAccessPathFrontOption =
       TApproxAccessPathFrontNone() or
       TApproxAccessPathFrontSome(ApproxAccessPathFront apf)
+
+    cached
+    newtype TNodeEx =
+      TNodeNormal(Node n) or
+      TNodeImplicitRead(Node n) or // will be restricted to nodes with actual implicit reads in `DataFlowImpl.qll`
+      TParamReturnNode(ParameterNode p, SndLevelScopeOption scope) {
+        paramReturnNode(_, p, scope, _)
+      }
+
+    /**
+     * Holds if data can flow in one local step from `node1` to `node2`.
+     */
+    cached
+    predicate localFlowStepExImpl(NodeEx node1, NodeEx node2, string model) {
+      exists(Node n1, Node n2 |
+        node1.asNode() = n1 and
+        node2.asNode() = n2 and
+        simpleLocalFlowStepExt(pragma[only_bind_into](n1), pragma[only_bind_into](n2), model)
+      )
+      or
+      exists(Node n1, Node n2, SndLevelScopeOption scope |
+        node1.asNode() = n1 and
+        node2 = TParamReturnNode(n2, scope) and
+        paramReturnNode(pragma[only_bind_into](n1), pragma[only_bind_into](n2),
+          pragma[only_bind_into](scope), _) and
+        model = ""
+      )
+    }
+
+    cached
+    ReturnPosition getReturnPositionEx(NodeEx ret) {
+      result = getValueReturnPosition(ret.asNode())
+      or
+      exists(ParamNode p |
+        ret = TParamReturnNode(p, _) and
+        result = getParamReturnPosition(_, p)
+      )
+    }
   }
 
   bindingset[call, tgt]
@@ -2177,36 +2321,6 @@ module MakeImplCommon<LocationSig Location, InputSig<Location> Lang> {
     nodeDataFlowType(pragma[only_bind_out](n), pragma[only_bind_into](result))
   }
 
-  pragma[nomagic]
-  private predicate hasValueReturnKindIn(ReturnNode ret, ReturnKindExt kind, DataFlowCallable c) {
-    c = getNodeEnclosingCallable(ret) and
-    valueReturnNode(ret, kind)
-  }
-
-  pragma[nomagic]
-  private predicate hasParamReturnKindIn(
-    PostUpdateNode n, ParamNode p, ReturnKindExt kind, DataFlowCallable c
-  ) {
-    c = getNodeEnclosingCallable(n) and
-    paramReturnNode(n, p, _, kind)
-  }
-
-  pragma[nomagic]
-  ReturnPosition getValueReturnPosition(ReturnNode ret) {
-    exists(ReturnKindExt kind, DataFlowCallable c |
-      hasValueReturnKindIn(ret, kind, c) and
-      result = TReturnPosition0(c, kind)
-    )
-  }
-
-  pragma[nomagic]
-  ReturnPosition getParamReturnPosition(PostUpdateNode n, ParamNode p) {
-    exists(ReturnKindExt kind, DataFlowCallable c |
-      hasParamReturnKindIn(n, p, kind, c) and
-      result = TReturnPosition0(c, kind)
-    )
-  }
-
   /** An optional Boolean value. */
   class BooleanOption extends TBooleanOption {
     string toString() {
diff --git a/shared/dataflow/codeql/dataflow/internal/DataFlowImplConsistency.qll b/shared/dataflow/codeql/dataflow/internal/DataFlowImplConsistency.qll
index 48c4d42daaa..f46b62f51e2 100644
--- a/shared/dataflow/codeql/dataflow/internal/DataFlowImplConsistency.qll
+++ b/shared/dataflow/codeql/dataflow/internal/DataFlowImplConsistency.qll
@@ -323,4 +323,121 @@ module MakeConsistency<
     lambdaCall(call, _, receiver) and
     not nodeGetEnclosingCallable(receiver) = call.getEnclosingCallable()
   }
+
+  query predicate speculativeStepAlreadyHasModel(Node n1, Node n2, string model) {
+    speculativeTaintStep(n1, n2) and
+    not defaultAdditionalTaintStep(n1, n2, _) and
+    (
+      simpleLocalFlowStep(n1, n2, _) and model = "SimpleLocalFlowStep"
+      or
+      exists(DataFlowCall call |
+        exists(viableCallable(call)) and
+        isArgumentNode(n1, call, _) and
+        model = "dispatch"
+      )
+    )
+  }
+
+  /**
+   * Gets counts of inconsistencies of each type.
+   */
+  int getInconsistencyCounts(string type) {
+    // total results from all the AST consistency query predicates.
+    type = "Node should have one enclosing callable" and
+    result = count(Node n | uniqueEnclosingCallable(n, _))
+    or
+    type = "Call should have one enclosing callable" and
+    result = count(DataFlowCall c | uniqueCallEnclosingCallable(c, _))
+    or
+    type = "Node should have one type" and
+    result = count(Node n | uniqueType(n, _))
+    or
+    type = "Node should have one location" and
+    result = count(Node n | uniqueNodeLocation(n, _))
+    or
+    type = "Nodes without location" and
+    result = count( | missingLocation(_) | 1)
+    or
+    type = "Node should have one toString" and
+    result = count(Node n | uniqueNodeToString(n, _))
+    or
+    type = "Callable mismatch for parameter" and
+    result = count(ParameterNode p | parameterCallable(p, _))
+    or
+    type = "Local flow step does not preserve enclosing callable" and
+    result = count(Node n1, Node n2 | localFlowIsLocal(n1, n2, _))
+    or
+    type = "Read step does not preserve enclosing callable" and
+    result = count(Node n1, Node n2 | readStepIsLocal(n1, n2, _))
+    or
+    type = "Store step does not preserve enclosing callable" and
+    result = count(Node n1, Node n2 | storeStepIsLocal(n1, n2, _))
+    or
+    type = "Type compatibility predicate is not reflexive" and
+    result = count(DataFlowType t | compatibleTypesReflexive(t, _))
+    or
+    type = "Call context for isUnreachableInCall is inconsistent with call graph" and
+    result = count(Node n, DataFlowCall call | unreachableNodeCCtx(n, call, _))
+    or
+    type = "Node and call does not share enclosing callable" and
+    result = count(DataFlowCall call, Node n | localCallNodes(call, n, _))
+    or
+    type = "PostUpdateNode should not equal its pre-update node" and
+    result = count(PostUpdateNode n | postIsNotPre(n, _))
+    or
+    type = "PostUpdateNode should have one pre-update node" and
+    result = count(PostUpdateNode n | postHasUniquePre(n, _))
+    or
+    type = "Node has multiple PostUpdateNodes" and
+    result = count(Node n | uniquePostUpdate(n, _))
+    or
+    type = "PostUpdateNode does not share callable with its pre-update node" and
+    result = count(PostUpdateNode n | postIsInSameCallable(n, _))
+    or
+    type = "Origin of readStep is missing a PostUpdateNode" and
+    result = count(Node n | reverseRead(n, _))
+    or
+    type = "ArgumentNode is missing PostUpdateNode" and
+    result = count(ArgumentNode n | argHasPostUpdate(n, _))
+    or
+    type = "PostUpdateNode should not be the target of local flow" and
+    result = count(PostUpdateNode n | postWithInFlow(n, _))
+    or
+    type = "Call context too large" and
+    result =
+      count(DataFlowCall call, DataFlowCall ctx, DataFlowCallable callable |
+        viableImplInCallContextTooLarge(call, ctx, callable)
+      )
+    or
+    type = "Parameters with overlapping positions" and
+    result =
+      count(DataFlowCallable c, ParameterPosition pos, Node p |
+        uniqueParameterNodeAtPosition(c, pos, p, _)
+      )
+    or
+    type = "Parameter node with multiple positions" and
+    result =
+      count(DataFlowCallable c, ParameterPosition pos, Node p |
+        uniqueParameterNodePosition(c, pos, p, _)
+      )
+    or
+    type = "Non-unique content approximation" and
+    result = count(Content c | uniqueContentApprox(c, _))
+    or
+    type = "Node steps to itself" and
+    result = count(Node n | identityLocalStep(n, _))
+    or
+    type = "Missing call for argument node" and
+    result = count(ArgumentNode n | missingArgumentCall(n, _))
+    or
+    type = "Multiple calls for argument node" and
+    result = count(ArgumentNode arg, DataFlowCall call | multipleArgumentCall(arg, call, _))
+    or
+    type = "Lambda call enclosing callable mismatch" and
+    result =
+      count(DataFlowCall call, Node receiver | lambdaCallEnclosingCallableMismatch(call, receiver))
+    or
+    type = "Speculative step already hasM Model" and
+    result = count(Node n1, Node n2 | speculativeStepAlreadyHasModel(n1, n2, _))
+  }
 }
diff --git a/shared/dataflow/codeql/dataflow/internal/FlowSummaryImpl.qll b/shared/dataflow/codeql/dataflow/internal/FlowSummaryImpl.qll
index 86b79d4433a..4f6a88b6b28 100644
--- a/shared/dataflow/codeql/dataflow/internal/FlowSummaryImpl.qll
+++ b/shared/dataflow/codeql/dataflow/internal/FlowSummaryImpl.qll
@@ -171,6 +171,7 @@ module Make<
         [
           "ai", // AI (machine learning)
           "df", // Dataflow (model generator)
+          "dfc", // Content dataflow (model generator)
           "tb", // Type based (model generator)
           "hq", // Heuristic query
         ]
@@ -1775,7 +1776,7 @@ module Make<
             exists(ReturnNode ret, ValueReturnKind kind |
               c = "ReturnValue" and
               ret = node.asNode() and
-              valueReturnNode(ret, kind) and
+              kind.getKind() = ret.getKind() and
               kind.getKind() = getStandardReturnValueKind() and
               mid.asCallable() = getNodeEnclosingCallable(ret)
             )
diff --git a/shared/dataflow/codeql/dataflow/test/ProvenancePathGraph.qll b/shared/dataflow/codeql/dataflow/test/ProvenancePathGraph.qll
index 0260b8160a3..e82435e6a6b 100644
--- a/shared/dataflow/codeql/dataflow/test/ProvenancePathGraph.qll
+++ b/shared/dataflow/codeql/dataflow/test/ProvenancePathGraph.qll
@@ -17,7 +17,7 @@ signature class PathNodeSig {
 private signature predicate provenanceSig(string model);
 
 private module TranslateModels<
-  interpretModelForTestSig/2 interpretModelForTest, provenanceSig/1 provenance>
+  interpretModelForTestSig/2 interpretModelForTest0, provenanceSig/1 provenance>
 {
   private predicate madIds(string madId) {
     exists(string model |
@@ -26,15 +26,42 @@ private module TranslateModels<
     )
   }
 
-  private predicate rankedMadIds(string madId, int r) {
-    madId = rank[r](string madId0 | madIds(madId0) | madId0 order by madId0.toInt())
+  // Be robust against MaD IDs with multiple textual representations; simply
+  // concatenate them all
+  private predicate interpretModelForTest(QlBuiltins::ExtensionId madId, string model) {
+    model = strictconcat(string mod | interpretModelForTest0(madId, mod) | mod, ", ")
+  }
+
+  private QlBuiltins::ExtensionId getModelId(string model) {
+    madIds(result.toString()) and
+    interpretModelForTest(result, model)
+  }
+
+  // collapse models with the same textual representation, in order to not rely
+  // on the order of `ExtensionId`s
+  private module ExtensionIdSets =
+    QlBuiltins::InternSets<string, QlBuiltins::ExtensionId, getModelId/1>;
+
+  private predicate rankedMadIds(ExtensionIdSets::Set extIdSet, int r) {
+    extIdSet =
+      rank[r](ExtensionIdSets::Set extIdSet0, string model |
+        extIdSet0 = ExtensionIdSets::getSet(model)
+      |
+        extIdSet0 order by model
+      )
+  }
+
+  private predicate translateModel(string id, int r) {
+    exists(QlBuiltins::ExtensionId madId, ExtensionIdSets::Set extIdSet |
+      id = madId.toString() and
+      extIdSet.contains(madId) and
+      rankedMadIds(extIdSet, r)
+    )
   }
 
   /** Lists the renumbered and pretty-printed models used in the edges relation. */
   predicate models(int r, string model) {
-    exists(QlBuiltins::ExtensionId madId |
-      rankedMadIds(madId.toString(), r) and interpretModelForTest(madId, model)
-    )
+    exists(string madId | translateModel(madId, r) and getModelId(model).toString() = madId)
   }
 
   private predicate translateModelsPart(string model1, string model2, int i) {
@@ -46,7 +73,7 @@ private module TranslateModels<
         translateModelsPart(model1, part, i - 1) and
         madId = s.regexpCapture("([0-9]*)(.*)", 1) and
         rest = s.regexpCapture("([0-9]*)(.*)", 2) and
-        rankedMadIds(madId, r) and
+        translateModel(madId, r) and
         model2 = part + "MaD:" + r + rest
       )
     )
@@ -102,18 +129,7 @@ module TestPostProcessing {
 
     private module Models = TranslateModels<interpretModelForTest/2, provenance/1>;
 
-    private newtype TModelRow = TMkModelRow(int r, string model) { Models::models(r, model) }
-
-    private predicate rankedModels(int i, int r, string model) {
-      TMkModelRow(r, model) =
-        rank[i](TModelRow row, int r0, string model0 |
-          row = TMkModelRow(r0, model0)
-        |
-          row order by r0, model0
-        )
-    }
-
-    predicate results(string relation, int row, int column, string data) {
+    query predicate results(string relation, int row, int column, string data) {
       queryResults(relation, row, column, data) and
       (relation != "edges" or column != provenanceColumn())
       or
@@ -124,11 +140,11 @@ module TestPostProcessing {
         Models::translateModels(model, data)
       )
       or
-      exists(int r, string model |
+      exists(string model |
         relation = "models" and
-        rankedModels(row, r, model)
+        Models::models(row, model)
       |
-        column = 0 and data = r.toString()
+        column = 0 and data = row.toString()
         or
         column = 1 and data = model
       )
diff --git a/shared/dataflow/qlpack.yml b/shared/dataflow/qlpack.yml
index 02566309731..3802aa99a1e 100644
--- a/shared/dataflow/qlpack.yml
+++ b/shared/dataflow/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/dataflow
-version: 1.1.3-dev
+version: 1.1.6-dev
 groups: shared
 library: true
 dependencies:
diff --git a/shared/mad/CHANGELOG.md b/shared/mad/CHANGELOG.md
index 74187f36112..0d9dcaf2768 100644
--- a/shared/mad/CHANGELOG.md
+++ b/shared/mad/CHANGELOG.md
@@ -1,3 +1,15 @@
+## 1.0.11
+
+No user-facing changes.
+
+## 1.0.10
+
+No user-facing changes.
+
+## 1.0.9
+
+No user-facing changes.
+
 ## 1.0.8
 
 No user-facing changes.
diff --git a/shared/mad/change-notes/released/1.0.10.md b/shared/mad/change-notes/released/1.0.10.md
new file mode 100644
index 00000000000..b601d878453
--- /dev/null
+++ b/shared/mad/change-notes/released/1.0.10.md
@@ -0,0 +1,3 @@
+## 1.0.10
+
+No user-facing changes.
diff --git a/shared/mad/change-notes/released/1.0.11.md b/shared/mad/change-notes/released/1.0.11.md
new file mode 100644
index 00000000000..245e0812108
--- /dev/null
+++ b/shared/mad/change-notes/released/1.0.11.md
@@ -0,0 +1,3 @@
+## 1.0.11
+
+No user-facing changes.
diff --git a/shared/mad/change-notes/released/1.0.9.md b/shared/mad/change-notes/released/1.0.9.md
new file mode 100644
index 00000000000..ee073f7ec16
--- /dev/null
+++ b/shared/mad/change-notes/released/1.0.9.md
@@ -0,0 +1,3 @@
+## 1.0.9
+
+No user-facing changes.
diff --git a/shared/mad/codeql-pack.release.yml b/shared/mad/codeql-pack.release.yml
index 5c55fbd52ed..56a2fb38872 100644
--- a/shared/mad/codeql-pack.release.yml
+++ b/shared/mad/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.0.8
+lastReleaseVersion: 1.0.11
diff --git a/shared/mad/codeql/mad/modelgenerator/internal/ModelGeneratorImpl.qll b/shared/mad/codeql/mad/modelgenerator/internal/ModelGeneratorImpl.qll
new file mode 100644
index 00000000000..2e22ae2c2ba
--- /dev/null
+++ b/shared/mad/codeql/mad/modelgenerator/internal/ModelGeneratorImpl.qll
@@ -0,0 +1,1040 @@
+/**
+ * INTERNAL: Do not use.
+ *
+ * Provides classes and predicates related to capturing summary, source,
+ * and sink models of the Standard or a 3rd party library.
+ */
+
+private import codeql.dataflow.DataFlow
+private import codeql.dataflow.TaintTracking as Tt
+private import codeql.dataflow.internal.ContentDataFlowImpl
+private import codeql.dataflow.internal.DataFlowImplCommon as DataFlowImplCommon
+private import codeql.util.Location
+private import ModelPrinting
+
+/**
+ * Provides language-specific model generator parameters.
+ */
+signature module ModelGeneratorInputSig<LocationSig Location, InputSig<Location> Lang> {
+  /**
+   * A Type.
+   */
+  class Type;
+
+  /**
+   * A Parameter.
+   */
+  class Parameter;
+
+  /**
+   * A Callable.
+   */
+  class Callable {
+    /**
+     * Gets a string representation of this callable.
+     */
+    string toString();
+  }
+
+  /**
+   * A node.
+   */
+  class NodeExtended extends Lang::Node {
+    /**
+     * Gets the type of this node.
+     */
+    Type getType();
+
+    /**
+     * Gets the enclosing callable of this node.
+     */
+    Callable getEnclosingCallable();
+
+    /**
+     * Gets the enclosing callable of this node, when considered as an expression.
+     */
+    Callable getAsExprEnclosingCallable();
+
+    /**
+     * Gets the parameter corresponding to this node, if any.
+     */
+    Parameter asParameter();
+  }
+
+  /**
+   * A class of callables that are potentially relevant for generating summary or
+   * neutral models.
+   *
+   * In the Standard library and 3rd party libraries it is the callables (or callables that have a
+   * super implementation) that can be called from outside the library itself.
+   */
+  class SummaryTargetApi extends Callable {
+    /**
+     * Gets the callable that a model will be lifted to.
+     *
+     * The lifted callable is relevant in terms of model
+     * generation (this is ensured by `liftedImpl`).
+     */
+    Callable lift();
+
+    /**
+     * Holds if `this` is relevant in terms of model generation.
+     */
+    predicate isRelevant();
+  }
+
+  /**
+   * A class of callables that are potentially relevant for generating source or
+   * sink models.
+   */
+  class SourceOrSinkTargetApi extends Callable;
+
+  /**
+   * A class of callables that are potentially relevant for generating source models.
+   */
+  class SourceTargetApi extends SourceOrSinkTargetApi;
+
+  /**
+   * A class of callables that are potentially relevant for generating sink models.
+   */
+  class SinkTargetApi extends SourceOrSinkTargetApi;
+
+  /**
+   * An instance parameter node.
+   */
+  class InstanceParameterNode extends Lang::Node;
+
+  /**
+   * Holds for type `t` for fields that are relevant as an intermediate
+   * read or write step in the data flow analysis.
+   * That is, flow through any data-flow node that does not have a relevant type
+   * will be excluded.
+   */
+  predicate isRelevantType(Type t);
+
+  /**
+   * Gets the underlying type of the content `c`.
+   */
+  Type getUnderlyingContentType(Lang::ContentSet c);
+
+  /**
+   * Gets the MaD string representation of the qualifier.
+   */
+  string qualifierString();
+
+  /**
+   * Gets the MaD string representation of the parameter `p`.
+   */
+  string parameterAccess(Parameter p);
+
+  /**
+   * Gets the MaD string representation of the parameter `p`
+   * when used in content flow.
+   */
+  string parameterContentAccess(Parameter p);
+
+  /**
+   * Gets the MaD string representation of return through parameter at position
+   * `pos` of callable `c`.
+   */
+  bindingset[c]
+  string paramReturnNodeAsOutput(Callable c, Lang::ParameterPosition p);
+
+  /**
+   * Gets the MaD string representation of return through parameter at position
+   * `pos` of callable `c` when used in content flow.
+   */
+  bindingset[c]
+  string paramReturnNodeAsContentOutput(Callable c, Lang::ParameterPosition pos);
+
+  /**
+   * Gets the enclosing callable of `ret`.
+   */
+  Callable returnNodeEnclosingCallable(Lang::Node node);
+
+  /**
+   * Holds if `node` is an own instance access.
+   */
+  predicate isOwnInstanceAccessNode(Lang::ReturnNode node);
+
+  /**
+   * Holds if `node` is a sanitizer for sink model construction.
+   */
+  predicate sinkModelSanitizer(Lang::Node node);
+
+  /**
+   * Holds if `source` is an api entrypoint relevant for creating sink models.
+   */
+  predicate apiSource(Lang::Node source);
+
+  /**
+   * Gets the MaD input string representation of `source`.
+   */
+  string getInputArgument(Lang::Node source);
+
+  /**
+   * Holds if it is not relevant to generate a source model for `api`, even
+   * if flow is detected from a node within `source` to a sink within `api`.
+   */
+  bindingset[sourceEnclosing, api]
+  predicate irrelevantSourceSinkApi(Callable sourceEnclosing, SourceTargetApi api);
+
+  /**
+   * Holds if `kind` is a relevant sink kind for creating sink models.
+   */
+  bindingset[kind]
+  predicate isRelevantSinkKind(string kind);
+
+  /**
+   * Holds if `kind` is a relevant source kind for creating source models.
+   */
+  bindingset[kind]
+  predicate isRelevantSourceKind(string kind);
+
+  /**
+   * Holds if the the content `c` is a container.
+   */
+  predicate containerContent(Lang::ContentSet c);
+
+  /**
+   * Holds if there is a taint step from `node1` to `node2` in content flow.
+   */
+  predicate isAdditionalContentFlowStep(Lang::Node nodeFrom, Lang::Node nodeTo);
+
+  /**
+   * Holds if the content set `c` is field like.
+   */
+  predicate isField(Lang::ContentSet c);
+
+  /**
+   * Holds if the content set `c` is callback like.
+   */
+  predicate isCallback(Lang::ContentSet c);
+
+  /**
+   * Gets the MaD synthetic name string representation for the content set `c`, if any.
+   */
+  string getSyntheticName(Lang::ContentSet c);
+
+  /**
+   * Gets the MaD string representation of the content set `c`.
+   */
+  string printContent(Lang::ContentSet c);
+
+  /**
+   * Holds if it is irrelevant to generate models for `api` based on data flow analysis.
+   *
+   * This serves as an extra filter for the `relevant` predicate.
+   */
+  predicate isUninterestingForDataFlowModels(Callable api);
+
+  /**
+   * Holds if it is irrelevant to generate models for `api` based on the heuristic
+   * (non-content) flow analysis.
+   *
+   * This serves as an extra filter for the `relevant`
+   * and `isUninterestingForDataFlowModels` predicates.
+   */
+  predicate isUninterestingForHeuristicDataFlowModels(Callable api);
+
+  /**
+   * Holds if `namespace`, `type`, `extensible`, `name` and `parameters` are string representations
+   * for the corresponding MaD columns for `api`.
+   */
+  predicate partialModel(
+    Callable api, string namespace, string type, string extensible, string name, string parameters
+  );
+
+  /**
+   * Holds if `node` is specified as a source with the given kind in a MaD flow
+   * model.
+   */
+  predicate sourceNode(Lang::Node node, string kind);
+
+  /**
+   * Holds if `node` is specified as a sink with the given kind in a MaD flow
+   * model.
+   */
+  predicate sinkNode(Lang::Node node, string kind);
+}
+
+module MakeModelGenerator<
+  LocationSig Location, InputSig<Location> Lang, Tt::InputSig<Location, Lang> TaintLang,
+  ModelGeneratorInputSig<Location, Lang> ModelGeneratorInput>
+{
+  private module DataFlow {
+    import Lang
+    import DataFlowMake<Location, Lang>
+    import DataFlowImplCommon::MakeImplCommon<Location, Lang>
+  }
+
+  private import ModelGeneratorInput
+  private import Tt::TaintFlowMake<Location, Lang, TaintLang> as TaintTracking
+
+  private module ModelPrintingLang implements ModelPrintingLangSig {
+    class Callable = ModelGeneratorInput::Callable;
+
+    predicate partialModel = ModelGeneratorInput::partialModel/6;
+  }
+
+  private import ModelPrintingImpl<ModelPrintingLang> as Printing
+
+  final private class NodeExtendedFinal = NodeExtended;
+
+  /**
+   * A node from which flow can return to the caller. This is either a regular
+   * `ReturnNode` or a `PostUpdateNode` corresponding to the value of a parameter.
+   */
+  private class ReturnNodeExt extends NodeExtendedFinal {
+    private DataFlow::ReturnKindExt kind;
+
+    ReturnNodeExt() {
+      kind = DataFlow::getValueReturnPosition(this).getKind() or
+      kind = DataFlow::getParamReturnPosition(this, _).getKind()
+    }
+
+    /**
+     * Gets the kind of the return node.
+     */
+    DataFlow::ReturnKindExt getKind() { result = kind }
+  }
+
+  bindingset[c]
+  private signature string printCallableParamSig(Callable c, DataFlow::ParameterPosition p);
+
+  private module PrintReturnNodeExt<printCallableParamSig/2 printCallableParam> {
+    string getOutput(ReturnNodeExt node) {
+      node.getKind() instanceof DataFlow::ValueReturnKind and
+      result = "ReturnValue"
+      or
+      exists(DataFlow::ParameterPosition pos |
+        pos = node.getKind().(DataFlow::ParamUpdateReturnKind).getPosition() and
+        result = printCallableParam(returnNodeEnclosingCallable(node), pos)
+      )
+    }
+  }
+
+  private string getOutput(ReturnNodeExt node) {
+    result = PrintReturnNodeExt<paramReturnNodeAsOutput/2>::getOutput(node)
+  }
+
+  final private class SummaryTargetApiFinal = SummaryTargetApi;
+
+  class DataFlowSummaryTargetApi extends SummaryTargetApiFinal {
+    DataFlowSummaryTargetApi() { not isUninterestingForDataFlowModels(this) }
+  }
+
+  class DataFlowSourceTargetApi = SourceTargetApi;
+
+  class DataFlowSinkTargetApi = SinkTargetApi;
+
+  private module ModelPrintingInput implements Printing::ModelPrintingSig {
+    class SummaryApi = DataFlowSummaryTargetApi;
+
+    class SourceOrSinkApi = SourceOrSinkTargetApi;
+
+    string getProvenance() { result = "df-generated" }
+  }
+
+  module ModelPrinting = Printing::ModelPrinting<ModelPrintingInput>;
+
+  /**
+   * Holds if `c` is a relevant content kind, where the underlying type is relevant.
+   */
+  private predicate isRelevantTypeInContent(DataFlow::ContentSet c) {
+    isRelevantType(getUnderlyingContentType(c))
+  }
+
+  /**
+   * Holds if data can flow from `node1` to `node2` either via a read or a write of an intermediate field `f`.
+   */
+  private predicate isRelevantTaintStep(DataFlow::Node node1, DataFlow::Node node2) {
+    exists(DataFlow::ContentSet f |
+      DataFlow::readStep(node1, f, node2) and
+      // Partially restrict the content types used for intermediate steps.
+      (not exists(getUnderlyingContentType(f)) or isRelevantTypeInContent(f))
+    )
+    or
+    exists(DataFlow::ContentSet f | DataFlow::storeStep(node1, f, node2) | containerContent(f))
+  }
+
+  /**
+   * Holds if content `c` is either a field, a synthetic field or language specific
+   * content of a relevant type or a container like content.
+   */
+  pragma[nomagic]
+  private predicate isRelevantContent0(DataFlow::ContentSet c) {
+    isRelevantTypeInContent(c) or
+    containerContent(c)
+  }
+
+  /**
+   * Gets the MaD string representation of the parameter node `p`.
+   */
+  string parameterNodeAsInput(DataFlow::ParameterNode p) {
+    result = parameterAccess(p.(NodeExtended).asParameter())
+    or
+    result = qualifierString() and p instanceof InstanceParameterNode
+  }
+
+  /**
+   * Gets the MaD input string representation of `source`.
+   */
+  string asInputArgument(NodeExtended source) { result = getInputArgument(source) }
+
+  /**
+   * Gets the summary model of `api`, if it follows the `fluent` programming pattern (returns `this`).
+   */
+  private string captureQualifierFlow(DataFlowSummaryTargetApi api) {
+    exists(ReturnNodeExt ret |
+      api = returnNodeEnclosingCallable(ret) and
+      isOwnInstanceAccessNode(ret)
+    ) and
+    result = ModelPrinting::asLiftedValueModel(api, qualifierString(), "ReturnValue")
+  }
+
+  private int accessPathLimit0() { result = 2 }
+
+  private newtype TTaintState =
+    TTaintRead(int n) { n in [0 .. accessPathLimit0()] } or
+    TTaintStore(int n) { n in [1 .. accessPathLimit0()] }
+
+  abstract private class TaintState extends TTaintState {
+    abstract string toString();
+  }
+
+  /**
+   * A FlowState representing a tainted read.
+   */
+  private class TaintRead extends TaintState, TTaintRead {
+    private int step;
+
+    TaintRead() { this = TTaintRead(step) }
+
+    /**
+     * Gets the flow state step number.
+     */
+    int getStep() { result = step }
+
+    override string toString() { result = "TaintRead(" + step + ")" }
+  }
+
+  /**
+   * A FlowState representing a tainted write.
+   */
+  private class TaintStore extends TaintState, TTaintStore {
+    private int step;
+
+    TaintStore() { this = TTaintStore(step) }
+
+    /**
+     * Gets the flow state step number.
+     */
+    int getStep() { result = step }
+
+    override string toString() { result = "TaintStore(" + step + ")" }
+  }
+
+  /**
+   * A data-flow configuration for tracking flow through APIs.
+   * The sources are the parameters of an API and the sinks are the return values (excluding `this`) and parameters.
+   *
+   * This can be used to generate Flow summaries for APIs from parameter to return.
+   */
+  module PropagateFlowConfig implements DataFlow::StateConfigSig {
+    class FlowState = TaintState;
+
+    predicate isSource(DataFlow::Node source, FlowState state) {
+      source instanceof DataFlow::ParameterNode and
+      exists(Callable c |
+        c = source.(NodeExtended).getEnclosingCallable() and
+        c instanceof DataFlowSummaryTargetApi and
+        not isUninterestingForHeuristicDataFlowModels(c)
+      ) and
+      state.(TaintRead).getStep() = 0
+    }
+
+    predicate isSink(DataFlow::Node sink, FlowState state) {
+      sink instanceof ReturnNodeExt and
+      not isOwnInstanceAccessNode(sink) and
+      not exists(captureQualifierFlow(sink.(NodeExtended).getAsExprEnclosingCallable())) and
+      (state instanceof TaintRead or state instanceof TaintStore)
+    }
+
+    predicate isAdditionalFlowStep(
+      DataFlow::Node node1, FlowState state1, DataFlow::Node node2, FlowState state2
+    ) {
+      exists(DataFlow::ContentSet c |
+        DataFlow::store(node1, c.getAStoreContent(), node2, _, _) and
+        isRelevantContent0(c) and
+        (
+          state1 instanceof TaintRead and state2.(TaintStore).getStep() = 1
+          or
+          state1.(TaintStore).getStep() + 1 = state2.(TaintStore).getStep()
+        )
+      )
+      or
+      exists(DataFlow::ContentSet c |
+        DataFlow::readStep(node1, c, node2) and
+        isRelevantContent0(c) and
+        state1.(TaintRead).getStep() + 1 = state2.(TaintRead).getStep()
+      )
+    }
+
+    predicate isBarrier(DataFlow::Node n) {
+      exists(Type t | t = n.(NodeExtended).getType() and not isRelevantType(t))
+    }
+
+    DataFlow::FlowFeature getAFeature() {
+      result instanceof DataFlow::FeatureEqualSourceSinkCallContext
+    }
+  }
+
+  module PropagateFlow = TaintTracking::GlobalWithState<PropagateFlowConfig>;
+
+  /**
+   * Gets the summary model(s) of `api`, if there is flow from parameters to return value or parameter.
+   */
+  string captureThroughFlow0(
+    DataFlowSummaryTargetApi api, DataFlow::ParameterNode p, ReturnNodeExt returnNodeExt
+  ) {
+    exists(string input, string output |
+      p.(NodeExtended).getEnclosingCallable() = api and
+      returnNodeExt.getEnclosingCallable() = api and
+      input = parameterNodeAsInput(p) and
+      output = getOutput(returnNodeExt) and
+      input != output and
+      result = ModelPrinting::asLiftedTaintModel(api, input, output)
+    )
+  }
+
+  /**
+   * Gets the summary model(s) of `api`, if there is flow from parameters to return value or parameter.
+   */
+  private string captureThroughFlow(DataFlowSummaryTargetApi api) {
+    exists(DataFlow::ParameterNode p, ReturnNodeExt returnNodeExt |
+      PropagateFlow::flow(p, returnNodeExt) and
+      result = captureThroughFlow0(api, p, returnNodeExt)
+    )
+  }
+
+  /**
+   * Gets the summary model(s) of `api`, if there is flow from parameters to the
+   * return value or parameter or if `api` is a fluent API.
+   */
+  string captureFlow(DataFlowSummaryTargetApi api) {
+    result = captureQualifierFlow(api) or
+    result = captureThroughFlow(api)
+  }
+
+  /**
+   * Gets the neutral summary model for `api`, if any.
+   * A neutral summary model is generated, if we are not generating
+   * a summary model that applies to `api`.
+   */
+  string captureNoFlow(DataFlowSummaryTargetApi api) {
+    not exists(DataFlowSummaryTargetApi api0 |
+      exists(captureFlow(api0)) and api0.lift() = api.lift()
+    ) and
+    api.isRelevant() and
+    result = ModelPrinting::asNeutralSummaryModel(api)
+  }
+
+  /**
+   * Provides classes and predicates related to capturing summary models
+   * based on content data flow.
+   */
+  module ContentSensitive {
+    private import MakeImplContentDataFlow<Location, Lang> as ContentDataFlow
+
+    private module PropagateContentFlowConfig implements ContentDataFlow::ConfigSig {
+      predicate isSource(DataFlow::Node source) {
+        source instanceof DataFlow::ParameterNode and
+        source.(NodeExtended).getEnclosingCallable() instanceof DataFlowSummaryTargetApi
+      }
+
+      predicate isSink(DataFlow::Node sink) {
+        sink.(ReturnNodeExt).getEnclosingCallable() instanceof DataFlowSummaryTargetApi
+      }
+
+      predicate isAdditionalFlowStep = isAdditionalContentFlowStep/2;
+
+      predicate isBarrier(DataFlow::Node n) {
+        exists(Type t | t = n.(NodeExtended).getType() and not isRelevantType(t))
+      }
+
+      int accessPathLimit() { result = 2 }
+
+      predicate isRelevantContent(DataFlow::ContentSet s) { isRelevantContent0(s) }
+
+      DataFlow::FlowFeature getAFeature() {
+        result instanceof DataFlow::FeatureEqualSourceSinkCallContext
+      }
+    }
+
+    private module PropagateContentFlow = ContentDataFlow::Global<PropagateContentFlowConfig>;
+
+    private module ContentModelPrintingInput implements Printing::ModelPrintingSig {
+      class SummaryApi = DataFlowSummaryTargetApi;
+
+      class SourceOrSinkApi = SourceOrSinkTargetApi;
+
+      string getProvenance() { result = "dfc-generated" }
+    }
+
+    private module ContentModelPrinting = Printing::ModelPrinting<ContentModelPrintingInput>;
+
+    private string getContentOutput(ReturnNodeExt node) {
+      result = PrintReturnNodeExt<paramReturnNodeAsContentOutput/2>::getOutput(node)
+    }
+
+    /**
+     * Gets the MaD string representation of the parameter `p`
+     * when used in content flow.
+     */
+    private string parameterNodeAsContentInput(DataFlow::ParameterNode p) {
+      result = parameterContentAccess(p.(NodeExtended).asParameter())
+      or
+      result = qualifierString() and p instanceof InstanceParameterNode
+    }
+
+    private string getContent(PropagateContentFlow::AccessPath ap, int i) {
+      result = "." + printContent(ap.getAtIndex(i))
+    }
+
+    /**
+     * Gets the MaD string representation of a store step access path.
+     */
+    private string printStoreAccessPath(PropagateContentFlow::AccessPath ap) {
+      result = concat(int i | | getContent(ap, i), "" order by i)
+    }
+
+    /**
+     * Gets the MaD string representation of a read step access path.
+     */
+    private string printReadAccessPath(PropagateContentFlow::AccessPath ap) {
+      result = concat(int i | | getContent(ap, i), "" order by i desc)
+    }
+
+    /**
+     * Holds if the access path `ap` contains a field or synthetic field access.
+     */
+    private predicate mentionsField(PropagateContentFlow::AccessPath ap) {
+      isField(ap.getAtIndex(_))
+    }
+
+    /**
+     * Holds if this access path `ap` mentions a callback.
+     */
+    private predicate mentionsCallback(PropagateContentFlow::AccessPath ap) {
+      isCallback(ap.getAtIndex(_))
+    }
+
+    /**
+     * Holds if the access path `ap` is not a parameter or returnvalue of a callback
+     * stored in a field.
+     *
+     * That is, we currently don't include summaries that rely on parameters or return values
+     * of callbacks stored in fields.
+     */
+    private predicate validateAccessPath(PropagateContentFlow::AccessPath ap) {
+      not (mentionsField(ap) and mentionsCallback(ap))
+    }
+
+    private predicate apiFlow(
+      DataFlowSummaryTargetApi api, DataFlow::ParameterNode p,
+      PropagateContentFlow::AccessPath reads, ReturnNodeExt returnNodeExt,
+      PropagateContentFlow::AccessPath stores, boolean preservesValue
+    ) {
+      PropagateContentFlow::flow(p, reads, returnNodeExt, stores, preservesValue) and
+      returnNodeExt.getEnclosingCallable() = api and
+      p.(NodeExtended).getEnclosingCallable() = api
+    }
+
+    /**
+     * A class of APIs relevant for modeling using content flow.
+     * The following heuristic is applied:
+     * Content flow is only relevant for an API on a parameter, if
+     *    #content flow from parameter <= 3
+     * If an API produces more content flow on a parameter, it is likely that
+     * 1. Types are not sufficiently constrained on the parameter leading to a combinatorial
+     * explosion in dispatch and thus in the generated summaries.
+     * 2. It is a reasonable approximation to use the non-content based flow
+     * detection instead, as reads and stores would use a significant
+     * part of an objects internal state.
+     */
+    private class ContentDataFlowSummaryTargetApi extends DataFlowSummaryTargetApi {
+      private DataFlow::ParameterNode parameter;
+
+      ContentDataFlowSummaryTargetApi() {
+        count(string input, string output |
+          exists(
+            PropagateContentFlow::AccessPath reads, ReturnNodeExt returnNodeExt,
+            PropagateContentFlow::AccessPath stores
+          |
+            apiFlow(this, parameter, reads, returnNodeExt, stores, _) and
+            input = parameterNodeAsContentInput(parameter) + printReadAccessPath(reads) and
+            output = getContentOutput(returnNodeExt) + printStoreAccessPath(stores)
+          )
+        ) <= 3
+      }
+
+      /**
+       * Gets a parameter node of `this` api, where there are less than 3 possible models, if any.
+       */
+      DataFlow::ParameterNode getARelevantParameterNode() { result = parameter }
+    }
+
+    pragma[nomagic]
+    private predicate apiContentFlow(
+      ContentDataFlowSummaryTargetApi api, DataFlow::ParameterNode p,
+      PropagateContentFlow::AccessPath reads, ReturnNodeExt returnNodeExt,
+      PropagateContentFlow::AccessPath stores, boolean preservesValue
+    ) {
+      PropagateContentFlow::flow(p, reads, returnNodeExt, stores, preservesValue) and
+      returnNodeExt.getEnclosingCallable() = api and
+      p.(NodeExtended).getEnclosingCallable() = api and
+      p = api.getARelevantParameterNode()
+    }
+
+    /**
+     * Holds if any of the content sets in `path` translates into a synthetic field.
+     */
+    private predicate hasSyntheticContent(PropagateContentFlow::AccessPath path) {
+      exists(getSyntheticName(path.getAtIndex(_)))
+    }
+
+    private string getHashAtIndex(PropagateContentFlow::AccessPath ap, int i) {
+      result = getSyntheticName(ap.getAtIndex(i))
+    }
+
+    private string getReversedHash(PropagateContentFlow::AccessPath ap) {
+      result = strictconcat(int i | | getHashAtIndex(ap, i), "." order by i desc)
+    }
+
+    private string getHash(PropagateContentFlow::AccessPath ap) {
+      result = strictconcat(int i | | getHashAtIndex(ap, i), "." order by i)
+    }
+
+    /**
+     * Gets all access paths that contain the synthetic fields
+     * from `ap` in reverse order (if `ap` contains at least one synthetic field).
+     * These are the possible candidates for synthetic path continuations.
+     */
+    private PropagateContentFlow::AccessPath getSyntheticPathCandidate(
+      PropagateContentFlow::AccessPath ap
+    ) {
+      getHash(ap) = getReversedHash(result)
+    }
+
+    /**
+     * A module containing predicates for validating access paths containing content sets
+     * that translates into synthetic fields, when used for generated summary models.
+     */
+    private module AccessPathSyntheticValidation {
+      /**
+       * Holds if there exists an API that has content flow from `read` (on type `t1`)
+       * to `store` (on type `t2`).
+       */
+      private predicate step(
+        Type t1, PropagateContentFlow::AccessPath read, Type t2,
+        PropagateContentFlow::AccessPath store
+      ) {
+        exists(DataFlow::ParameterNode p, ReturnNodeExt returnNodeExt |
+          p.(NodeExtended).getType() = t1 and
+          returnNodeExt.getType() = t2 and
+          apiContentFlow(_, p, read, returnNodeExt, store, _)
+        )
+      }
+
+      /**
+       * Holds if there exists an API that has content flow from `read` (on type `t1`)
+       * to `store` (on type `t2`), where `read` does not have synthetic content and `store` does.
+       *
+       * Step A -> Synth.
+       */
+      private predicate synthPathEntry(
+        Type t1, PropagateContentFlow::AccessPath read, Type t2,
+        PropagateContentFlow::AccessPath store
+      ) {
+        not hasSyntheticContent(read) and
+        hasSyntheticContent(store) and
+        step(t1, read, t2, store)
+      }
+
+      /**
+       * Holds if there exists an API that has content flow from `read` (on type `t1`)
+       * to `store` (on type `t2`), where `read` has synthetic content
+       * and `store` does not.
+       *
+       * Step Synth -> A.
+       */
+      private predicate synthPathExit(
+        Type t1, PropagateContentFlow::AccessPath read, Type t2,
+        PropagateContentFlow::AccessPath store
+      ) {
+        hasSyntheticContent(read) and
+        not hasSyntheticContent(store) and
+        step(t1, read, t2, store)
+      }
+
+      /**
+       * Holds if there exists a path of steps from `read` to an exit.
+       *
+       * read ->* Synth -> A
+       */
+      private predicate reachesSynthExit(Type t, PropagateContentFlow::AccessPath read) {
+        synthPathExit(t, read, _, _)
+        or
+        hasSyntheticContent(read) and
+        exists(PropagateContentFlow::AccessPath mid, Type midType |
+          hasSyntheticContent(mid) and
+          step(t, read, midType, mid) and
+          reachesSynthExit(midType, getSyntheticPathCandidate(mid))
+        )
+      }
+
+      /**
+       * Holds if there exists a path of steps from an entry to `store`.
+       *
+       * A -> Synth ->* store
+       */
+      private predicate synthEntryReaches(Type t, PropagateContentFlow::AccessPath store) {
+        synthPathEntry(_, _, t, store)
+        or
+        hasSyntheticContent(store) and
+        exists(PropagateContentFlow::AccessPath mid, Type midType |
+          hasSyntheticContent(mid) and
+          step(midType, mid, t, store) and
+          synthEntryReaches(midType, getSyntheticPathCandidate(mid))
+        )
+      }
+
+      /**
+       * Holds if at least one of the access paths `read` (on type `t1`) and `store` (on type `t2`)
+       * contain content that will be translated into a synthetic field, when being used in
+       * a MaD summary model, and if there is a range of APIs, such that
+       * when chaining their flow access paths, there exists access paths `A` and `B` where
+       * A ->* read -> store ->* B and where `A` and `B` do not contain content that will
+       * be translated into a synthetic field.
+       *
+       * This is needed because we don't want to include summaries that reads from or
+       * stores into an "internal" synthetic field.
+       *
+       * Example:
+       * Assume we have a type `t` (in this case `t1` = `t2`) with methods `getX` and
+       * `setX`, which gets and sets a private field `X` on `t`.
+       * This would lead to the following content flows
+       * getX : Argument[this].SyntheticField[t.X] -> ReturnValue.
+       * setX : Argument[0] -> Argument[this].SyntheticField[t.X]
+       * As the reads and stores are on synthetic fields we should only make summaries
+       * if both of these methods exist.
+       */
+      pragma[nomagic]
+      predicate acceptReadStore(
+        Type t1, PropagateContentFlow::AccessPath read, Type t2,
+        PropagateContentFlow::AccessPath store
+      ) {
+        synthPathEntry(t1, read, t2, store) and
+        reachesSynthExit(t2, getSyntheticPathCandidate(store))
+        or
+        exists(PropagateContentFlow::AccessPath store0 | getSyntheticPathCandidate(store0) = read |
+          synthEntryReaches(t1, store0) and synthPathExit(t1, read, t2, store)
+          or
+          synthEntryReaches(t1, store0) and
+          step(t1, read, t2, store) and
+          reachesSynthExit(t2, getSyntheticPathCandidate(store))
+        )
+      }
+    }
+
+    /**
+     * Holds, if the API `api` has relevant flow from `read` on `p` to `store` on `returnNodeExt`.
+     * Flow is considered relevant,
+     * 1. If `read` or `store` do not contain a content set that translates into a synthetic field.
+     * 2. If `read` or `store` contain a content set that translates into a synthetic field, and if
+     * the synthetic content is "live" on the relevant declaring type.
+     */
+    private predicate apiRelevantContentFlow(
+      ContentDataFlowSummaryTargetApi api, DataFlow::ParameterNode p,
+      PropagateContentFlow::AccessPath read, ReturnNodeExt returnNodeExt,
+      PropagateContentFlow::AccessPath store, boolean preservesValue
+    ) {
+      apiContentFlow(api, p, read, returnNodeExt, store, preservesValue) and
+      (
+        not hasSyntheticContent(read) and not hasSyntheticContent(store)
+        or
+        AccessPathSyntheticValidation::acceptReadStore(p.(NodeExtended).getType(), read,
+          returnNodeExt.getType(), store)
+      )
+    }
+
+    pragma[nomagic]
+    private predicate captureFlow0(
+      ContentDataFlowSummaryTargetApi api, string input, string output, boolean preservesValue,
+      boolean lift
+    ) {
+      exists(
+        DataFlow::ParameterNode p, ReturnNodeExt returnNodeExt,
+        PropagateContentFlow::AccessPath reads, PropagateContentFlow::AccessPath stores
+      |
+        apiRelevantContentFlow(api, p, reads, returnNodeExt, stores, preservesValue) and
+        input = parameterNodeAsContentInput(p) + printReadAccessPath(reads) and
+        output = getContentOutput(returnNodeExt) + printStoreAccessPath(stores) and
+        input != output and
+        validateAccessPath(reads) and
+        validateAccessPath(stores) and
+        (
+          if mentionsField(reads) or mentionsField(stores)
+          then lift = false and api.isRelevant()
+          else lift = true
+        )
+      )
+    }
+
+    /**
+     * Gets the content based summary model(s) of the API `api` (if there is flow from a parameter to
+     * the return value or a parameter). `lift` is true, if the model should be lifted, otherwise false.
+     *
+     * Models are lifted to the best type in case the read and store access paths do not
+     * contain a field or synthetic field access.
+     */
+    string captureFlow(ContentDataFlowSummaryTargetApi api, boolean lift) {
+      exists(string input, string output, boolean preservesValue |
+        captureFlow0(api, input, output, _, lift) and
+        preservesValue = max(boolean p | captureFlow0(api, input, output, p, lift)) and
+        result = ContentModelPrinting::asModel(api, input, output, preservesValue, lift)
+      )
+    }
+  }
+
+  /**
+   * Gets the summary model(s) for `api`, if any. `lift` is true if the model is lifted
+   * otherwise false.
+   * The following heuristic is applied:
+   * 1. If content based flow yields at lease one summary for an API, then we use that.
+   * 2. If content based flow does not yield any summary for an API, then we try and
+   * generate flow summaries using the non-content based summary generator.
+   */
+  string captureMixedFlow(DataFlowSummaryTargetApi api, boolean lift) {
+    result = ContentSensitive::captureFlow(api, lift)
+    or
+    not exists(DataFlowSummaryTargetApi api0 |
+      (api0 = api or api.lift() = api0) and
+      exists(ContentSensitive::captureFlow(api0, false))
+      or
+      api0.lift() = api.lift() and
+      exists(ContentSensitive::captureFlow(api0, true))
+    ) and
+    result = captureFlow(api) and
+    lift = true
+  }
+
+  /**
+   * Gets the neutral summary model for `api`, if any.
+   * A neutral summary model is generated, if we are not generating
+   * a mixed summary model that applies to `api`.
+   */
+  string captureMixedNeutral(DataFlowSummaryTargetApi api) {
+    not exists(DataFlowSummaryTargetApi api0, boolean lift |
+      exists(captureMixedFlow(api0, lift)) and
+      (
+        lift = false and
+        (api0 = api or api0 = api.lift())
+        or
+        lift = true and api0.lift() = api.lift()
+      )
+    ) and
+    api.isRelevant() and
+    result = ModelPrinting::asNeutralSummaryModel(api)
+  }
+
+  /**
+   * A dataflow configuration used for finding new sources.
+   * The sources are the already known existing sources and the sinks are the API return nodes.
+   *
+   * This can be used to generate Source summaries for an API, if the API expose an already known source
+   * via its return (then the API itself becomes a source).
+   */
+  module PropagateFromSourceConfig implements DataFlow::ConfigSig {
+    predicate isSource(DataFlow::Node source) {
+      exists(string kind |
+        isRelevantSourceKind(kind) and
+        sourceNode(source, kind)
+      )
+    }
+
+    predicate isSink(DataFlow::Node sink) {
+      sink.(ReturnNodeExt).getEnclosingCallable() instanceof DataFlowSourceTargetApi
+    }
+
+    DataFlow::FlowFeature getAFeature() { result instanceof DataFlow::FeatureHasSinkCallContext }
+
+    predicate isBarrier(DataFlow::Node n) {
+      exists(Type t | t = n.(NodeExtended).getType() and not isRelevantType(t))
+    }
+
+    predicate isAdditionalFlowStep(DataFlow::Node node1, DataFlow::Node node2) {
+      isRelevantTaintStep(node1, node2)
+    }
+  }
+
+  private module PropagateFromSource = TaintTracking::Global<PropagateFromSourceConfig>;
+
+  /**
+   * Gets the source model(s) of `api`, if there is flow from an existing known source to the return of `api`.
+   */
+  string captureSource(DataFlowSourceTargetApi api) {
+    exists(NodeExtended source, ReturnNodeExt sink, string kind |
+      PropagateFromSource::flow(source, sink) and
+      sourceNode(source, kind) and
+      api = sink.getEnclosingCallable() and
+      not irrelevantSourceSinkApi(source.getEnclosingCallable(), api) and
+      result = ModelPrinting::asSourceModel(api, getOutput(sink), kind)
+    )
+  }
+
+  /**
+   * A dataflow configuration used for finding new sinks.
+   * The sources are the parameters of the API and the fields of the enclosing type.
+   *
+   * This can be used to generate Sink summaries for APIs, if the API propagates a parameter (or enclosing type field)
+   * into an existing known sink (then the API itself becomes a sink).
+   */
+  module PropagateToSinkConfig implements DataFlow::ConfigSig {
+    predicate isSource(DataFlow::Node source) {
+      apiSource(source) and
+      source.(NodeExtended).getEnclosingCallable() instanceof DataFlowSinkTargetApi
+    }
+
+    predicate isSink(DataFlow::Node sink) {
+      exists(string kind | isRelevantSinkKind(kind) and sinkNode(sink, kind))
+    }
+
+    predicate isBarrier(DataFlow::Node node) {
+      exists(Type t | t = node.(NodeExtended).getType() and not isRelevantType(t))
+      or
+      sinkModelSanitizer(node)
+    }
+
+    DataFlow::FlowFeature getAFeature() { result instanceof DataFlow::FeatureHasSourceCallContext }
+
+    predicate isAdditionalFlowStep(DataFlow::Node node1, DataFlow::Node node2) {
+      isRelevantTaintStep(node1, node2)
+    }
+  }
+
+  private module PropagateToSink = TaintTracking::Global<PropagateToSinkConfig>;
+
+  /**
+   * Gets the sink model(s) of `api`, if there is flow from a parameter to an existing known sink.
+   */
+  string captureSink(DataFlowSinkTargetApi api) {
+    exists(NodeExtended src, NodeExtended sink, string kind |
+      PropagateToSink::flow(src, sink) and
+      sinkNode(sink, kind) and
+      api = src.getEnclosingCallable() and
+      result = ModelPrinting::asSinkModel(api, asInputArgument(src), kind)
+    )
+  }
+}
diff --git a/shared/mad/codeql/mad/modelgenerator/ModelPrinting.qll b/shared/mad/codeql/mad/modelgenerator/internal/ModelPrinting.qll
similarity index 71%
rename from shared/mad/codeql/mad/modelgenerator/ModelPrinting.qll
rename to shared/mad/codeql/mad/modelgenerator/internal/ModelPrinting.qll
index 2867d927984..4f5fa59d537 100644
--- a/shared/mad/codeql/mad/modelgenerator/ModelPrinting.qll
+++ b/shared/mad/codeql/mad/modelgenerator/internal/ModelPrinting.qll
@@ -64,14 +64,23 @@ module ModelPrintingImpl<ModelPrintingLangSig Lang> {
 
     /**
      * Gets the summary model for `api` with `input`, `output` and `kind`.
+     * The model is lifted in case `lift` is true.
      */
     bindingset[input, output, kind]
-    private string asSummaryModel(Printing::SummaryApi api, string input, string output, string kind) {
-      result =
-        asPartialModel(api.lift()) + input + ";" //
-          + output + ";" //
-          + kind + ";" //
-          + Printing::getProvenance()
+    private string asSummaryModel(
+      Printing::SummaryApi api, string input, string output, string kind, boolean lift
+    ) {
+      exists(Lang::Callable c |
+        lift = true and c = api.lift()
+        or
+        lift = false and c = api
+      |
+        result =
+          asPartialModel(c) + input + ";" //
+            + output + ";" //
+            + kind + ";" //
+            + Printing::getProvenance()
+      )
     }
 
     string asNeutralSummaryModel(Printing::SummaryApi api) {
@@ -82,31 +91,35 @@ module ModelPrintingImpl<ModelPrintingLangSig Lang> {
     }
 
     /**
-     * Gets the value summary model for `api` with `input` and `output`.
+     * Gets the lifted value summary model for `api` with `input` and `output`.
      */
     bindingset[input, output]
-    string asValueModel(Printing::SummaryApi api, string input, string output) {
-      result = asSummaryModel(api, input, output, "value")
+    string asLiftedValueModel(Printing::SummaryApi api, string input, string output) {
+      result = asModel(api, input, output, true, true)
     }
 
     /**
-     * Gets the taint summary model for `api` with `input` and `output`.
+     * Gets the lifted taint summary model for `api` with `input` and `output`.
      */
     bindingset[input, output]
-    string asTaintModel(Printing::SummaryApi api, string input, string output) {
-      result = asSummaryModel(api, input, output, "taint")
+    string asLiftedTaintModel(Printing::SummaryApi api, string input, string output) {
+      result = asModel(api, input, output, false, true)
     }
 
     /**
      * Gets the summary model for `api` with `input` and `output`.
+     * (1) If `preservesValue` is true a "value" model is created.
+     * (2) If `lift` is true the model is lifted to the best possible type.
      */
     bindingset[input, output, preservesValue]
-    string asModel(Printing::SummaryApi api, string input, string output, boolean preservesValue) {
+    string asModel(
+      Printing::SummaryApi api, string input, string output, boolean preservesValue, boolean lift
+    ) {
       preservesValue = true and
-      result = asValueModel(api, input, output)
+      result = asSummaryModel(api, input, output, "value", lift)
       or
       preservesValue = false and
-      result = asTaintModel(api, input, output)
+      result = asSummaryModel(api, input, output, "taint", lift)
     }
 
     /**
diff --git a/shared/mad/qlpack.yml b/shared/mad/qlpack.yml
index 9933a7eef31..2205120fc09 100644
--- a/shared/mad/qlpack.yml
+++ b/shared/mad/qlpack.yml
@@ -1,7 +1,8 @@
 name: codeql/mad
-version: 1.0.9-dev
+version: 1.0.12-dev
 groups: shared
 library: true
 dependencies:
   codeql/util: ${workspace}
+  codeql/dataflow: ${workspace}
 warnOnImplicitThis: true
diff --git a/shared/rangeanalysis/CHANGELOG.md b/shared/rangeanalysis/CHANGELOG.md
index 8a3b99e0bdf..f3d5e9c3685 100644
--- a/shared/rangeanalysis/CHANGELOG.md
+++ b/shared/rangeanalysis/CHANGELOG.md
@@ -1,3 +1,15 @@
+## 1.0.11
+
+No user-facing changes.
+
+## 1.0.10
+
+No user-facing changes.
+
+## 1.0.9
+
+No user-facing changes.
+
 ## 1.0.8
 
 No user-facing changes.
diff --git a/shared/rangeanalysis/change-notes/released/1.0.10.md b/shared/rangeanalysis/change-notes/released/1.0.10.md
new file mode 100644
index 00000000000..b601d878453
--- /dev/null
+++ b/shared/rangeanalysis/change-notes/released/1.0.10.md
@@ -0,0 +1,3 @@
+## 1.0.10
+
+No user-facing changes.
diff --git a/shared/rangeanalysis/change-notes/released/1.0.11.md b/shared/rangeanalysis/change-notes/released/1.0.11.md
new file mode 100644
index 00000000000..245e0812108
--- /dev/null
+++ b/shared/rangeanalysis/change-notes/released/1.0.11.md
@@ -0,0 +1,3 @@
+## 1.0.11
+
+No user-facing changes.
diff --git a/shared/rangeanalysis/change-notes/released/1.0.9.md b/shared/rangeanalysis/change-notes/released/1.0.9.md
new file mode 100644
index 00000000000..ee073f7ec16
--- /dev/null
+++ b/shared/rangeanalysis/change-notes/released/1.0.9.md
@@ -0,0 +1,3 @@
+## 1.0.9
+
+No user-facing changes.
diff --git a/shared/rangeanalysis/codeql-pack.release.yml b/shared/rangeanalysis/codeql-pack.release.yml
index 5c55fbd52ed..56a2fb38872 100644
--- a/shared/rangeanalysis/codeql-pack.release.yml
+++ b/shared/rangeanalysis/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.0.8
+lastReleaseVersion: 1.0.11
diff --git a/shared/rangeanalysis/qlpack.yml b/shared/rangeanalysis/qlpack.yml
index e443eea184f..8bd5c263848 100644
--- a/shared/rangeanalysis/qlpack.yml
+++ b/shared/rangeanalysis/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/rangeanalysis
-version: 1.0.9-dev
+version: 1.0.12-dev
 groups: shared
 library: true
 dependencies:
diff --git a/shared/regex/CHANGELOG.md b/shared/regex/CHANGELOG.md
index f0b74ab2c7e..e4aa1758db2 100644
--- a/shared/regex/CHANGELOG.md
+++ b/shared/regex/CHANGELOG.md
@@ -1,3 +1,15 @@
+## 1.0.11
+
+No user-facing changes.
+
+## 1.0.10
+
+No user-facing changes.
+
+## 1.0.9
+
+No user-facing changes.
+
 ## 1.0.8
 
 No user-facing changes.
diff --git a/shared/regex/change-notes/released/1.0.10.md b/shared/regex/change-notes/released/1.0.10.md
new file mode 100644
index 00000000000..b601d878453
--- /dev/null
+++ b/shared/regex/change-notes/released/1.0.10.md
@@ -0,0 +1,3 @@
+## 1.0.10
+
+No user-facing changes.
diff --git a/shared/regex/change-notes/released/1.0.11.md b/shared/regex/change-notes/released/1.0.11.md
new file mode 100644
index 00000000000..245e0812108
--- /dev/null
+++ b/shared/regex/change-notes/released/1.0.11.md
@@ -0,0 +1,3 @@
+## 1.0.11
+
+No user-facing changes.
diff --git a/shared/regex/change-notes/released/1.0.9.md b/shared/regex/change-notes/released/1.0.9.md
new file mode 100644
index 00000000000..ee073f7ec16
--- /dev/null
+++ b/shared/regex/change-notes/released/1.0.9.md
@@ -0,0 +1,3 @@
+## 1.0.9
+
+No user-facing changes.
diff --git a/shared/regex/codeql-pack.release.yml b/shared/regex/codeql-pack.release.yml
index 5c55fbd52ed..56a2fb38872 100644
--- a/shared/regex/codeql-pack.release.yml
+++ b/shared/regex/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.0.8
+lastReleaseVersion: 1.0.11
diff --git a/shared/regex/qlpack.yml b/shared/regex/qlpack.yml
index 56deb3800a1..624c826410e 100644
--- a/shared/regex/qlpack.yml
+++ b/shared/regex/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/regex
-version: 1.0.9-dev
+version: 1.0.12-dev
 groups: shared
 library: true
 dependencies:
diff --git a/shared/ssa/CHANGELOG.md b/shared/ssa/CHANGELOG.md
index 8d36e2ab664..6fc1f4442c7 100644
--- a/shared/ssa/CHANGELOG.md
+++ b/shared/ssa/CHANGELOG.md
@@ -1,3 +1,15 @@
+## 1.0.11
+
+No user-facing changes.
+
+## 1.0.10
+
+No user-facing changes.
+
+## 1.0.9
+
+No user-facing changes.
+
 ## 1.0.8
 
 No user-facing changes.
diff --git a/shared/ssa/change-notes/released/1.0.10.md b/shared/ssa/change-notes/released/1.0.10.md
new file mode 100644
index 00000000000..b601d878453
--- /dev/null
+++ b/shared/ssa/change-notes/released/1.0.10.md
@@ -0,0 +1,3 @@
+## 1.0.10
+
+No user-facing changes.
diff --git a/shared/ssa/change-notes/released/1.0.11.md b/shared/ssa/change-notes/released/1.0.11.md
new file mode 100644
index 00000000000..245e0812108
--- /dev/null
+++ b/shared/ssa/change-notes/released/1.0.11.md
@@ -0,0 +1,3 @@
+## 1.0.11
+
+No user-facing changes.
diff --git a/shared/ssa/change-notes/released/1.0.9.md b/shared/ssa/change-notes/released/1.0.9.md
new file mode 100644
index 00000000000..ee073f7ec16
--- /dev/null
+++ b/shared/ssa/change-notes/released/1.0.9.md
@@ -0,0 +1,3 @@
+## 1.0.9
+
+No user-facing changes.
diff --git a/shared/ssa/codeql-pack.release.yml b/shared/ssa/codeql-pack.release.yml
index 5c55fbd52ed..56a2fb38872 100644
--- a/shared/ssa/codeql-pack.release.yml
+++ b/shared/ssa/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.0.8
+lastReleaseVersion: 1.0.11
diff --git a/shared/ssa/codeql/ssa/Ssa.qll b/shared/ssa/codeql/ssa/Ssa.qll
index fd785540a37..d3b1414dfcf 100644
--- a/shared/ssa/codeql/ssa/Ssa.qll
+++ b/shared/ssa/codeql/ssa/Ssa.qll
@@ -4,6 +4,7 @@
  */
 
 private import codeql.util.Location
+private import codeql.util.Unit
 
 /** Provides the input specification of the SSA implementation. */
 signature module InputSig<LocationSig Location> {
@@ -1631,6 +1632,23 @@ module Make<LocationSig Location, InputSig<Location> Input> {
       )
     }
 
+    bindingset[this]
+    signature class StateSig;
+
+    private module WithState<StateSig State> {
+      /**
+       * Holds if the guard `g` validates the expression `e` upon evaluating to `branch`, blocking
+       * flow in the given `state`.
+       *
+       * 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(
+        DfInput::Guard g, DfInput::Expr e, boolean branch, State state
+      );
+    }
+
     /**
      * Provides a set of barrier nodes for a guard that validates an expression.
      *
@@ -1638,16 +1656,38 @@ module Make<LocationSig Location, InputSig<Location> Input> {
      * in data flow and taint tracking.
      */
     module BarrierGuard<guardChecksSig/3 guardChecks> {
+      private predicate guardChecksWithState(
+        DfInput::Guard g, DfInput::Expr e, boolean branch, Unit state
+      ) {
+        guardChecks(g, e, branch) and exists(state)
+      }
+
+      private module StatefulBarrier = BarrierGuardWithState<Unit, guardChecksWithState/4>;
+
+      /** Gets a node that is safely guarded by the given guard check. */
       pragma[nomagic]
-      private predicate guardChecksSsaDef(DfInput::Guard g, Definition def, boolean branch) {
-        guardChecks(g, DfInput::getARead(def), branch)
+      Node getABarrierNode() { result = StatefulBarrier::getABarrierNode(_) }
+    }
+
+    /**
+     * 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 BarrierGuardWithState<StateSig State, WithState<State>::guardChecksSig/4 guardChecks> {
+      pragma[nomagic]
+      private predicate guardChecksSsaDef(
+        DfInput::Guard g, Definition def, boolean branch, State state
+      ) {
+        guardChecks(g, DfInput::getARead(def), branch, state)
       }
 
       /** Gets a node that is safely guarded by the given guard check. */
       pragma[nomagic]
-      Node getABarrierNode() {
+      Node getABarrierNode(State state) {
         exists(DfInput::Guard g, boolean branch, Definition def, BasicBlock bb |
-          guardChecksSsaDef(g, def, branch)
+          guardChecksSsaDef(g, def, branch, state)
         |
           // guard controls a read
           exists(DfInput::Expr e |
diff --git a/shared/ssa/qlpack.yml b/shared/ssa/qlpack.yml
index f412d56b995..d55025c28d1 100644
--- a/shared/ssa/qlpack.yml
+++ b/shared/ssa/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/ssa
-version: 1.0.9-dev
+version: 1.0.12-dev
 groups: shared
 library: true
 dependencies:
diff --git a/shared/threat-models/CHANGELOG.md b/shared/threat-models/CHANGELOG.md
index 7e87aa46357..1c514d078a2 100644
--- a/shared/threat-models/CHANGELOG.md
+++ b/shared/threat-models/CHANGELOG.md
@@ -1,3 +1,15 @@
+## 1.0.11
+
+No user-facing changes.
+
+## 1.0.10
+
+No user-facing changes.
+
+## 1.0.9
+
+No user-facing changes.
+
 ## 1.0.8
 
 No user-facing changes.
diff --git a/shared/threat-models/change-notes/released/1.0.10.md b/shared/threat-models/change-notes/released/1.0.10.md
new file mode 100644
index 00000000000..b601d878453
--- /dev/null
+++ b/shared/threat-models/change-notes/released/1.0.10.md
@@ -0,0 +1,3 @@
+## 1.0.10
+
+No user-facing changes.
diff --git a/shared/threat-models/change-notes/released/1.0.11.md b/shared/threat-models/change-notes/released/1.0.11.md
new file mode 100644
index 00000000000..245e0812108
--- /dev/null
+++ b/shared/threat-models/change-notes/released/1.0.11.md
@@ -0,0 +1,3 @@
+## 1.0.11
+
+No user-facing changes.
diff --git a/shared/threat-models/change-notes/released/1.0.9.md b/shared/threat-models/change-notes/released/1.0.9.md
new file mode 100644
index 00000000000..ee073f7ec16
--- /dev/null
+++ b/shared/threat-models/change-notes/released/1.0.9.md
@@ -0,0 +1,3 @@
+## 1.0.9
+
+No user-facing changes.
diff --git a/shared/threat-models/codeql-pack.release.yml b/shared/threat-models/codeql-pack.release.yml
index 5c55fbd52ed..56a2fb38872 100644
--- a/shared/threat-models/codeql-pack.release.yml
+++ b/shared/threat-models/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.0.8
+lastReleaseVersion: 1.0.11
diff --git a/shared/threat-models/codeql/threatmodels/ThreatModels.qll b/shared/threat-models/codeql/threatmodels/ThreatModels.qll
index d12139ef28e..19dfd0d1a65 100644
--- a/shared/threat-models/codeql/threatmodels/ThreatModels.qll
+++ b/shared/threat-models/codeql/threatmodels/ThreatModels.qll
@@ -29,7 +29,7 @@ extensible predicate threatModelConfiguration(string kind, boolean enable, int p
 extensible private predicate threatModelGrouping(string kind, string group);
 
 /** Holds if the specified threat model kind is mentioned in either the configuration or grouping table. */
-private predicate knownThreatModel(string kind) {
+predicate knownThreatModel(string kind) {
   threatModelConfiguration(kind, _, _) or
   threatModelGrouping(kind, _) or
   threatModelGrouping(_, kind) or
diff --git a/shared/threat-models/qlpack.yml b/shared/threat-models/qlpack.yml
index 0035335c6e3..42ac623c23b 100644
--- a/shared/threat-models/qlpack.yml
+++ b/shared/threat-models/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/threat-models
-version: 1.0.9-dev
+version: 1.0.12-dev
 library: true
 groups: shared
 dataExtensions:
diff --git a/shared/tree-sitter-extractor/BUILD.bazel b/shared/tree-sitter-extractor/BUILD.bazel
index ac38c99ffcc..ee19d8e5c77 100644
--- a/shared/tree-sitter-extractor/BUILD.bazel
+++ b/shared/tree-sitter-extractor/BUILD.bazel
@@ -1,5 +1,7 @@
 load("@rules_rust//rust:defs.bzl", "rust_library")
-load("@tree_sitter_extractors_deps//:defs.bzl", "aliases", "all_crate_deps")
+load("//misc/bazel/3rdparty/tree_sitter_extractors_deps:defs.bzl", "aliases", "all_crate_deps")
+
+exports_files(["Cargo.toml"])
 
 rust_library(
     name = "codeql-extractor",
diff --git a/shared/tree-sitter-extractor/Cargo.toml b/shared/tree-sitter-extractor/Cargo.toml
index d7d1e0f37ab..f8161615152 100644
--- a/shared/tree-sitter-extractor/Cargo.toml
+++ b/shared/tree-sitter-extractor/Cargo.toml
@@ -4,6 +4,7 @@ version = "0.2.0"
 edition = "2021"
 authors = ["GitHub"]
 
+# When updating these dependencies, run `misc/bazel/3rdparty/update_cargo_deps.sh`
 [dependencies]
 flate2 = "1.0"
 globset = "0.4"
@@ -20,7 +21,6 @@ chrono = { version = "0.4.19", features = ["serde"] }
 num_cpus = "1.14.0"
 
 [dev-dependencies]
-tree-sitter-ql = { git = "https://github.com/tree-sitter/tree-sitter-ql" }
-tree-sitter-json = {git = "https://github.com/tree-sitter/tree-sitter-json" }
+tree-sitter-ql = "0.23.1"
+tree-sitter-json = "0.24.8"
 rand = "0.8.5"
-
diff --git a/shared/tutorial/CHANGELOG.md b/shared/tutorial/CHANGELOG.md
index 93d06a2b74f..416a3ab33fc 100644
--- a/shared/tutorial/CHANGELOG.md
+++ b/shared/tutorial/CHANGELOG.md
@@ -1,3 +1,15 @@
+## 1.0.11
+
+No user-facing changes.
+
+## 1.0.10
+
+No user-facing changes.
+
+## 1.0.9
+
+No user-facing changes.
+
 ## 1.0.8
 
 No user-facing changes.
diff --git a/shared/tutorial/change-notes/released/1.0.10.md b/shared/tutorial/change-notes/released/1.0.10.md
new file mode 100644
index 00000000000..b601d878453
--- /dev/null
+++ b/shared/tutorial/change-notes/released/1.0.10.md
@@ -0,0 +1,3 @@
+## 1.0.10
+
+No user-facing changes.
diff --git a/shared/tutorial/change-notes/released/1.0.11.md b/shared/tutorial/change-notes/released/1.0.11.md
new file mode 100644
index 00000000000..245e0812108
--- /dev/null
+++ b/shared/tutorial/change-notes/released/1.0.11.md
@@ -0,0 +1,3 @@
+## 1.0.11
+
+No user-facing changes.
diff --git a/shared/tutorial/change-notes/released/1.0.9.md b/shared/tutorial/change-notes/released/1.0.9.md
new file mode 100644
index 00000000000..ee073f7ec16
--- /dev/null
+++ b/shared/tutorial/change-notes/released/1.0.9.md
@@ -0,0 +1,3 @@
+## 1.0.9
+
+No user-facing changes.
diff --git a/shared/tutorial/codeql-pack.release.yml b/shared/tutorial/codeql-pack.release.yml
index 5c55fbd52ed..56a2fb38872 100644
--- a/shared/tutorial/codeql-pack.release.yml
+++ b/shared/tutorial/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.0.8
+lastReleaseVersion: 1.0.11
diff --git a/shared/tutorial/qlpack.yml b/shared/tutorial/qlpack.yml
index 6f745d6c77e..bd281c1a818 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.9-dev
+version: 1.0.12-dev
 groups: shared
 library: true
 warnOnImplicitThis: true
diff --git a/shared/typeflow/CHANGELOG.md b/shared/typeflow/CHANGELOG.md
index de58be267d7..1506cdea175 100644
--- a/shared/typeflow/CHANGELOG.md
+++ b/shared/typeflow/CHANGELOG.md
@@ -1,3 +1,15 @@
+## 1.0.11
+
+No user-facing changes.
+
+## 1.0.10
+
+No user-facing changes.
+
+## 1.0.9
+
+No user-facing changes.
+
 ## 1.0.8
 
 No user-facing changes.
diff --git a/shared/typeflow/change-notes/released/1.0.10.md b/shared/typeflow/change-notes/released/1.0.10.md
new file mode 100644
index 00000000000..b601d878453
--- /dev/null
+++ b/shared/typeflow/change-notes/released/1.0.10.md
@@ -0,0 +1,3 @@
+## 1.0.10
+
+No user-facing changes.
diff --git a/shared/typeflow/change-notes/released/1.0.11.md b/shared/typeflow/change-notes/released/1.0.11.md
new file mode 100644
index 00000000000..245e0812108
--- /dev/null
+++ b/shared/typeflow/change-notes/released/1.0.11.md
@@ -0,0 +1,3 @@
+## 1.0.11
+
+No user-facing changes.
diff --git a/shared/typeflow/change-notes/released/1.0.9.md b/shared/typeflow/change-notes/released/1.0.9.md
new file mode 100644
index 00000000000..ee073f7ec16
--- /dev/null
+++ b/shared/typeflow/change-notes/released/1.0.9.md
@@ -0,0 +1,3 @@
+## 1.0.9
+
+No user-facing changes.
diff --git a/shared/typeflow/codeql-pack.release.yml b/shared/typeflow/codeql-pack.release.yml
index 5c55fbd52ed..56a2fb38872 100644
--- a/shared/typeflow/codeql-pack.release.yml
+++ b/shared/typeflow/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.0.8
+lastReleaseVersion: 1.0.11
diff --git a/shared/typeflow/codeql/typeflow/TypeFlow.qll b/shared/typeflow/codeql/typeflow/TypeFlow.qll
index 7518805ac56..a2ae213ecb7 100644
--- a/shared/typeflow/codeql/typeflow/TypeFlow.qll
+++ b/shared/typeflow/codeql/typeflow/TypeFlow.qll
@@ -28,14 +28,9 @@ signature module TypeFlowInput<LocationSig Location> {
   }
 
   /**
-   * Holds if data can flow from `n1` to `n2` in one step, and `n1` is not
-   * necessarily functionally determined by `n2`.
-   */
-  predicate joinStep(TypeFlowNode n1, TypeFlowNode n2);
-
-  /**
-   * Holds if data can flow from `n1` to `n2` in one step, and `n1` is
-   * functionally determined by `n2`.
+   * Holds if data can flow from `n1` to `n2` in one step.
+   *
+   * For a given `n2`, this predicate must include all possible `n1` that can flow to `n2`.
    */
   predicate step(TypeFlowNode n1, TypeFlowNode n2);
 
diff --git a/shared/typeflow/codeql/typeflow/UniversalFlow.qll b/shared/typeflow/codeql/typeflow/UniversalFlow.qll
new file mode 100644
index 00000000000..75b210f8ceb
--- /dev/null
+++ b/shared/typeflow/codeql/typeflow/UniversalFlow.qll
@@ -0,0 +1,351 @@
+/**
+ * Provides predicates for proving data flow properties that hold for all
+ * paths, that is, reachability is computed using universal quantification over
+ * the step relation.
+ *
+ * Regular data flow search for the existence of a path, that is, reachability
+ * using existential quantification over the step relation. Hence, this library
+ * computes the dual reachability predicate that states that a certain property
+ * always holds for a given node regardless of the path taken.
+ *
+ * As a simple comparison, the computed predicate is essentially equivalent to
+ * the folllowing:
+ * ```ql
+ *   predicate hasProperty(FlowNode n, Prop t) {
+ *     basecase(n, t)
+ *     or
+ *     forex(FlowNode mid | step(mid, n) | hasProperty(mid, t))
+ *   }
+ * ```
+ * More complex property propagation is supported, and strongly connected
+ * components in the flow graph are handled.
+ *
+ * As an initial such property calculation, the library computes the set of
+ * nodes that are always null. These are then subtracted from the graph such
+ * that subsequently calculated properties hold under the assumption that the
+ * value is not null.
+ */
+
+private import codeql.util.Location
+private import codeql.util.Unit
+
+/** Provides the input specification. */
+signature module UniversalFlowInput<LocationSig Location> {
+  /**
+   * A node for which certain data flow properties may be proved. For example,
+   * expressions and method declarations.
+   */
+  class FlowNode {
+    /** Gets a textual representation of this node. */
+    string toString();
+
+    /** Gets the location of this node. */
+    Location getLocation();
+  }
+
+  /**
+   * Holds if data can flow from `n1` to `n2` in one step.
+   *
+   * For a given `n2`, this predicate must include all possible `n1` that can flow to `n2`.
+   */
+  predicate step(FlowNode n1, FlowNode n2);
+
+  /** Holds if `n` represents a `null` value. */
+  predicate isNullValue(FlowNode n);
+
+  /**
+   * Holds if `n` should be excluded from the set of null values even if
+   * the null analysis determines that `n` is always null.
+   */
+  default predicate isExcludedFromNullAnalysis(FlowNode n) { none() }
+}
+
+/**
+ * Provides an implementation of universal flow using input `I`.
+ */
+module Make<LocationSig Location, UniversalFlowInput<Location> I> {
+  private import I
+
+  /**
+   * Holds if data can flow from `n1` to `n2` in one step, and `n1` is
+   * functionally determined by `n2`.
+   */
+  private predicate uniqStep(FlowNode n1, FlowNode n2) { n1 = unique(FlowNode n | step(n, n2)) }
+
+  /**
+   * Holds if data can flow from `n1` to `n2` in one step, and `n1` is not
+   * functionally determined by `n2`.
+   */
+  private predicate joinStep(FlowNode n1, FlowNode n2) { step(n1, n2) and not uniqStep(n1, n2) }
+
+  /** Holds if `null` is the only value that flows to `n`. */
+  private predicate isNull(FlowNode n) {
+    isNullValue(n)
+    or
+    not isExcludedFromNullAnalysis(n) and
+    (
+      exists(FlowNode mid | isNull(mid) and uniqStep(mid, n))
+      or
+      forex(FlowNode mid | joinStep(mid, n) | isNull(mid))
+    )
+  }
+
+  private predicate uniqStepNotNull(FlowNode n1, FlowNode n2) {
+    uniqStep(n1, n2) and not isNull(n1)
+  }
+
+  private import Internal
+
+  /** Provides access to internal step relations. */
+  module Internal {
+    /**
+     * Holds if data can flow from `n1` to `n2` in one step, `n1` is not necessarily
+     * functionally determined by `n2`, and `n1` might take a non-null value.
+     */
+    predicate joinStepNotNull(FlowNode n1, FlowNode n2) { joinStep(n1, n2) and not isNull(n1) }
+
+    /**
+     * Holds if data can flow from `n1` to `n2` in one step, excluding join
+     * steps from nodes that are always null.
+     */
+    predicate anyStep(FlowNode n1, FlowNode n2) {
+      joinStepNotNull(n1, n2) or uniqStepNotNull(n1, n2)
+    }
+  }
+
+  private predicate sccEdge(FlowNode n1, FlowNode n2) { anyStep(n1, n2) and anyStep+(n2, n1) }
+
+  private module Scc = QlBuiltins::EquivalenceRelation<FlowNode, sccEdge/2>;
+
+  private class FlowScc = Scc::EquivalenceClass;
+
+  /** Holds if `n` is part of an SCC of size 2 or more represented by `scc`. */
+  private predicate sccRepr(FlowNode n, FlowScc scc) { scc = Scc::getEquivalenceClass(n) }
+
+  private predicate sccJoinStepNotNull(FlowNode n, FlowScc scc) {
+    exists(FlowNode mid |
+      joinStepNotNull(n, mid) and
+      sccRepr(mid, scc) and
+      not sccRepr(n, scc)
+    )
+  }
+
+  private signature class NodeSig;
+
+  private signature module Edge {
+    class Node;
+
+    predicate edge(FlowNode n1, Node n2);
+  }
+
+  private signature module RankedEdge<NodeSig Node> {
+    predicate edgeRank(int r, FlowNode n1, Node n2);
+
+    int lastRank(Node n);
+  }
+
+  private module RankEdge<Edge E> implements RankedEdge<E::Node> {
+    private import E
+
+    /**
+     * Holds if `r` is a ranking of the incoming edges `(n1,n2)` to `n2`. The used
+     * ordering is not necessarily total, so the ranking may have gaps.
+     */
+    private predicate edgeRank1(int r, FlowNode n1, Node n2) {
+      n1 =
+        rank[r](FlowNode n, int startline, int startcolumn |
+          edge(n, n2) and
+          n.getLocation().hasLocationInfo(_, startline, startcolumn, _, _)
+        |
+          n order by startline, startcolumn
+        )
+    }
+
+    /**
+     * Holds if `r2` is a ranking of the ranks from `edgeRank1`. This removes the
+     * gaps from the ranking.
+     */
+    private predicate edgeRank2(int r2, int r1, Node n) {
+      r1 = rank[r2](int r | edgeRank1(r, _, n) | r)
+    }
+
+    /** Holds if `r` is a ranking of the incoming edges `(n1,n2)` to `n2`. */
+    predicate edgeRank(int r, FlowNode n1, Node n2) {
+      exists(int r1 |
+        edgeRank1(r1, n1, n2) and
+        edgeRank2(r, r1, n2)
+      )
+    }
+
+    int lastRank(Node n) { result = max(int r | edgeRank(r, _, n)) }
+  }
+
+  private signature module PropPropagation {
+    class Prop;
+
+    predicate candProp(FlowNode n, Prop t);
+
+    bindingset[t]
+    predicate supportsProp(FlowNode n, Prop t);
+  }
+
+  /** Implements recursion through `forall` by way of edge ranking. */
+  private module ForAll<NodeSig Node, RankedEdge<Node> E, PropPropagation T> {
+    /**
+     * Holds if `t` is a property that holds on one of the incoming edges to `n` and
+     * thus is a candidate property for `n`.
+     */
+    pragma[nomagic]
+    private predicate candJoinProp(Node n, T::Prop t) {
+      exists(FlowNode mid |
+        T::candProp(mid, t) and
+        E::edgeRank(_, mid, n)
+      )
+    }
+
+    /**
+     * Holds if `t` is a candidate property for `n` that is also valid for data coming
+     * through the edges into `n` ranked from `1` to `r`.
+     */
+    private predicate flowJoin(int r, Node n, T::Prop t) {
+      (
+        r = 1 and candJoinProp(n, t)
+        or
+        flowJoin(r - 1, n, t) and E::edgeRank(r, _, n)
+      ) and
+      forall(FlowNode mid | E::edgeRank(r, mid, n) | T::supportsProp(mid, t))
+    }
+
+    /**
+     * Holds if `t` is a candidate property for `n` that is also valid for data
+     * coming through all the incoming edges, and therefore is a valid property for
+     * `n`.
+     */
+    predicate flowJoin(Node n, T::Prop t) { flowJoin(E::lastRank(n), n, t) }
+  }
+
+  private module JoinStep implements Edge {
+    class Node = FlowNode;
+
+    predicate edge = joinStepNotNull/2;
+  }
+
+  private module SccJoinStep implements Edge {
+    class Node = FlowScc;
+
+    predicate edge = sccJoinStepNotNull/2;
+  }
+
+  private module RankedJoinStep = RankEdge<JoinStep>;
+
+  private module RankedSccJoinStep = RankEdge<SccJoinStep>;
+
+  signature module NullaryPropertySig {
+    predicate hasPropertyBase(FlowNode n);
+
+    default predicate barrier(FlowNode n) { none() }
+  }
+
+  /**
+   * Calculates a (nullary) property using universal flow given a base case
+   * relation.
+   */
+  module FlowNullary<NullaryPropertySig P> {
+    private module Propagation implements PropPropagation {
+      class Prop = Unit;
+
+      predicate candProp(FlowNode n, Unit u) { hasProperty(n) and exists(u) }
+
+      predicate supportsProp = candProp/2;
+    }
+
+    /**
+     * Holds if all flow reaching `n` originates from nodes in
+     * `hasPropertyBase`.
+     */
+    predicate hasProperty(FlowNode n) {
+      P::hasPropertyBase(n)
+      or
+      not P::barrier(n) and
+      (
+        exists(FlowNode mid | hasProperty(mid) and uniqStepNotNull(mid, n))
+        or
+        // The following is an optimized version of
+        // `forex(FlowNode mid | joinStepNotNull(mid, n) | hasPropery(mid))`
+        ForAll<FlowNode, RankedJoinStep, Propagation>::flowJoin(n, _)
+        or
+        exists(FlowScc scc |
+          sccRepr(n, scc) and
+          // Optimized version of
+          // `forex(FlowNode mid | sccJoinStepNotNull(mid, scc) | hasPropery(mid))`
+          ForAll<FlowScc, RankedSccJoinStep, Propagation>::flowJoin(scc, _)
+        )
+      )
+    }
+  }
+
+  signature module PropertySig {
+    class Prop;
+
+    bindingset[t1, t2]
+    default predicate propImplies(Prop t1, Prop t2) { t1 = t2 }
+
+    predicate hasPropertyBase(FlowNode n, Prop t);
+
+    default predicate barrier(FlowNode n) { none() }
+  }
+
+  /**
+   * Calculates a unary property using universal flow given a base case
+   * relation.
+   */
+  module Flow<PropertySig P> {
+    private module Propagation implements PropPropagation {
+      class Prop = P::Prop;
+
+      predicate candProp = hasProperty/2;
+
+      bindingset[t]
+      predicate supportsProp(FlowNode n, Prop t) {
+        exists(Prop t0 | hasProperty(n, t0) and P::propImplies(t0, t))
+      }
+    }
+
+    /**
+     * Holds if all flow reaching `n` originates from nodes in
+     * `hasPropertyBase`. The property `t` is taken from one of those origins
+     * such that all other origins imply `t`.
+     */
+    predicate hasProperty(FlowNode n, P::Prop t) {
+      P::hasPropertyBase(n, t)
+      or
+      not P::barrier(n) and
+      (
+        exists(FlowNode mid | hasProperty(mid, t) and uniqStepNotNull(mid, n))
+        or
+        // The following is an optimized version of
+        // ```
+        // exists(FlowNode mid | joinStepNotNull(mid, n) | hasPropery(mid, t)) and
+        // forall(FlowNode mid | joinStepNotNull(mid, n) | hasPropery(mid, _)) and
+        // forall(FlowNode mid, P::Prop t0 | joinStepNotNull(mid, n) and hasPropery(mid, t0) |
+        //   P::propImplies(t0, t)
+        // )
+        // ```
+        ForAll<FlowNode, RankedJoinStep, Propagation>::flowJoin(n, t)
+        or
+        exists(FlowScc scc |
+          sccRepr(n, scc) and
+          // Optimized version of
+          // ```
+          // exists(FlowNode mid | sccJoinStepNotNull(mid, n) | hasPropery(mid, t)) and
+          // forall(FlowNode mid | sccJoinStepNotNull(mid, n) | hasPropery(mid, _)) and
+          // forall(FlowNode mid, P::Prop t0 | sccJoinStepNotNull(mid, n) and hasPropery(mid, t0) |
+          //   P::propImplies(t0, t)
+          // )
+          // ```
+          ForAll<FlowScc, RankedSccJoinStep, Propagation>::flowJoin(scc, t)
+        )
+      )
+    }
+  }
+}
diff --git a/shared/typeflow/codeql/typeflow/internal/TypeFlowImpl.qll b/shared/typeflow/codeql/typeflow/internal/TypeFlowImpl.qll
index ac7de53f85a..f578b61b77b 100644
--- a/shared/typeflow/codeql/typeflow/internal/TypeFlowImpl.qll
+++ b/shared/typeflow/codeql/typeflow/internal/TypeFlowImpl.qll
@@ -1,189 +1,34 @@
 private import codeql.typeflow.TypeFlow
+private import codeql.typeflow.UniversalFlow as UniversalFlow
 private import codeql.util.Location
 private import codeql.util.Unit
 
 module TypeFlow<LocationSig Location, TypeFlowInput<Location> I> {
   private import I
 
-  /** Holds if `null` is the only value that flows to `n`. */
-  predicate isNull(TypeFlowNode n) {
-    isNullValue(n)
-    or
-    exists(TypeFlowNode mid | isNull(mid) and step(mid, n))
-    or
-    forex(TypeFlowNode mid | joinStep(mid, n) | isNull(mid)) and
-    not isExcludedFromNullAnalysis(n)
+  private module UfInput implements UniversalFlow::UniversalFlowInput<Location> {
+    class FlowNode = TypeFlowNode;
+
+    predicate step = I::step/2;
+
+    predicate isNullValue = I::isNullValue/1;
+
+    predicate isExcludedFromNullAnalysis = I::isExcludedFromNullAnalysis/1;
   }
 
-  /**
-   * Holds if data can flow from `n1` to `n2` in one step, `n1` is not necessarily
-   * functionally determined by `n2`, and `n1` might take a non-null value.
-   */
-  private predicate joinStepNotNull(TypeFlowNode n1, TypeFlowNode n2) {
-    joinStep(n1, n2) and not isNull(n1)
-  }
+  private module UnivFlow = UniversalFlow::Make<Location, UfInput>;
 
-  private predicate anyStep(TypeFlowNode n1, TypeFlowNode n2) {
-    joinStepNotNull(n1, n2) or step(n1, n2)
-  }
+  private module ExactTypeProperty implements UnivFlow::PropertySig {
+    class Prop = Type;
 
-  private predicate sccEdge(TypeFlowNode n1, TypeFlowNode n2) {
-    anyStep(n1, n2) and anyStep+(n2, n1)
-  }
-
-  private module Scc = QlBuiltins::EquivalenceRelation<TypeFlowNode, sccEdge/2>;
-
-  private class TypeFlowScc = Scc::EquivalenceClass;
-
-  /** Holds if `n` is part of an SCC of size 2 or more represented by `scc`. */
-  private predicate sccRepr(TypeFlowNode n, TypeFlowScc scc) { scc = Scc::getEquivalenceClass(n) }
-
-  private predicate sccJoinStepNotNull(TypeFlowNode n, TypeFlowScc scc) {
-    exists(TypeFlowNode mid |
-      joinStepNotNull(n, mid) and
-      sccRepr(mid, scc) and
-      not sccRepr(n, scc)
-    )
-  }
-
-  private signature class NodeSig;
-
-  private signature module Edge {
-    class Node;
-
-    predicate edge(TypeFlowNode n1, Node n2);
-  }
-
-  private signature module RankedEdge<NodeSig Node> {
-    predicate edgeRank(int r, TypeFlowNode n1, Node n2);
-
-    int lastRank(Node n);
-  }
-
-  private module RankEdge<Edge E> implements RankedEdge<E::Node> {
-    private import E
-
-    /**
-     * Holds if `r` is a ranking of the incoming edges `(n1,n2)` to `n2`. The used
-     * ordering is not necessarily total, so the ranking may have gaps.
-     */
-    private predicate edgeRank1(int r, TypeFlowNode n1, Node n2) {
-      n1 =
-        rank[r](TypeFlowNode n, int startline, int startcolumn |
-          edge(n, n2) and
-          n.getLocation().hasLocationInfo(_, startline, startcolumn, _, _)
-        |
-          n order by startline, startcolumn
-        )
-    }
-
-    /**
-     * Holds if `r2` is a ranking of the ranks from `edgeRank1`. This removes the
-     * gaps from the ranking.
-     */
-    private predicate edgeRank2(int r2, int r1, Node n) {
-      r1 = rank[r2](int r | edgeRank1(r, _, n) | r)
-    }
-
-    /** Holds if `r` is a ranking of the incoming edges `(n1,n2)` to `n2`. */
-    predicate edgeRank(int r, TypeFlowNode n1, Node n2) {
-      exists(int r1 |
-        edgeRank1(r1, n1, n2) and
-        edgeRank2(r, r1, n2)
-      )
-    }
-
-    int lastRank(Node n) { result = max(int r | edgeRank(r, _, n)) }
-  }
-
-  private signature module TypePropagation {
-    class Typ;
-
-    predicate candType(TypeFlowNode n, Typ t);
-
-    bindingset[t]
-    predicate supportsType(TypeFlowNode n, Typ t);
-  }
-
-  /** Implements recursion through `forall` by way of edge ranking. */
-  private module ForAll<NodeSig Node, RankedEdge<Node> E, TypePropagation T> {
-    /**
-     * Holds if `t` is a bound that holds on one of the incoming edges to `n` and
-     * thus is a candidate bound for `n`.
-     */
-    pragma[nomagic]
-    private predicate candJoinType(Node n, T::Typ t) {
-      exists(TypeFlowNode mid |
-        T::candType(mid, t) and
-        E::edgeRank(_, mid, n)
-      )
-    }
-
-    /**
-     * Holds if `t` is a candidate bound for `n` that is also valid for data coming
-     * through the edges into `n` ranked from `1` to `r`.
-     */
-    private predicate flowJoin(int r, Node n, T::Typ t) {
-      (
-        r = 1 and candJoinType(n, t)
-        or
-        flowJoin(r - 1, n, t) and E::edgeRank(r, _, n)
-      ) and
-      forall(TypeFlowNode mid | E::edgeRank(r, mid, n) | T::supportsType(mid, t))
-    }
-
-    /**
-     * Holds if `t` is a candidate bound for `n` that is also valid for data
-     * coming through all the incoming edges, and therefore is a valid bound for
-     * `n`.
-     */
-    predicate flowJoin(Node n, T::Typ t) { flowJoin(E::lastRank(n), n, t) }
-  }
-
-  private module JoinStep implements Edge {
-    class Node = TypeFlowNode;
-
-    predicate edge = joinStepNotNull/2;
-  }
-
-  private module SccJoinStep implements Edge {
-    class Node = TypeFlowScc;
-
-    predicate edge = sccJoinStepNotNull/2;
-  }
-
-  private module RankedJoinStep = RankEdge<JoinStep>;
-
-  private module RankedSccJoinStep = RankEdge<SccJoinStep>;
-
-  private module ExactTypePropagation implements TypePropagation {
-    class Typ = Type;
-
-    predicate candType = exactType/2;
-
-    predicate supportsType = exactType/2;
+    predicate hasPropertyBase = exactTypeBase/2;
   }
 
   /**
    * Holds if the runtime type of `n` is exactly `t` and if this bound is a
    * non-trivial lower bound, that is, `t` has a subtype.
    */
-  private predicate exactType(TypeFlowNode n, Type t) {
-    exactTypeBase(n, t)
-    or
-    exists(TypeFlowNode mid | exactType(mid, t) and step(mid, n))
-    or
-    // The following is an optimized version of
-    // `forex(TypeFlowNode mid | joinStepNotNull(mid, n) | exactType(mid, t))`
-    ForAll<TypeFlowNode, RankedJoinStep, ExactTypePropagation>::flowJoin(n, t)
-    or
-    exists(TypeFlowScc scc |
-      sccRepr(n, scc) and
-      // Optimized version of
-      // `forex(TypeFlowNode mid | sccJoinStepNotNull(mid, scc) | exactType(mid, t))`
-      ForAll<TypeFlowScc, RankedSccJoinStep, ExactTypePropagation>::flowJoin(scc, t)
-    )
-  }
+  private predicate exactType = UnivFlow::Flow<ExactTypeProperty>::hasProperty/2;
 
   /**
    * Gets the source declaration of a direct supertype of this type, excluding itself.
@@ -214,17 +59,13 @@ module TypeFlow<LocationSig Location, TypeFlowInput<Location> I> {
     )
   }
 
-  private module TypeFlowPropagation implements TypePropagation {
-    class Typ = Type;
+  private module TypeFlowProperty implements UnivFlow::PropertySig {
+    class Prop = Type;
 
-    predicate candType = typeFlow/2;
+    bindingset[t1, t2]
+    predicate propImplies(Type t1, Type t2) { getAnAncestor(pragma[only_bind_out](t1)) = t2 }
 
-    bindingset[t]
-    predicate supportsType(TypeFlowNode mid, Type t) {
-      exists(Type midtyp | exactType(mid, midtyp) or typeFlow(mid, midtyp) |
-        getAnAncestor(pragma[only_bind_out](midtyp)) = t
-      )
-    }
+    predicate hasPropertyBase(TypeFlowNode n, Prop t) { typeFlowBase(n, t) or exactType(n, t) }
   }
 
   /**
@@ -232,16 +73,8 @@ module TypeFlow<LocationSig Location, TypeFlowInput<Location> I> {
    * likely to be better than the static type of `n`.
    */
   private predicate typeFlow(TypeFlowNode n, Type t) {
-    typeFlowBase(n, t)
-    or
-    exists(TypeFlowNode mid | typeFlow(mid, t) and step(mid, n))
-    or
-    ForAll<TypeFlowNode, RankedJoinStep, TypeFlowPropagation>::flowJoin(n, t)
-    or
-    exists(TypeFlowScc scc |
-      sccRepr(n, scc) and
-      ForAll<TypeFlowScc, RankedSccJoinStep, TypeFlowPropagation>::flowJoin(scc, t)
-    )
+    UnivFlow::Flow<TypeFlowProperty>::hasProperty(n, t) and
+    not exactType(n, t)
   }
 
   pragma[nomagic]
@@ -329,22 +162,20 @@ module TypeFlow<LocationSig Location, TypeFlowInput<Location> I> {
    */
   private predicate unionTypeFlowBaseCand(TypeFlowNode n, Type t, boolean exact) {
     exists(TypeFlowNode next |
-      joinStepNotNull(n, next) and
+      UnivFlow::Internal::joinStepNotNull(n, next) and
       bestTypeFlowOrTypeFlowBase(n, t, exact) and
       not bestTypeFlowOrTypeFlowBase(next, t, exact) and
       not exactType(next, _)
     )
   }
 
-  private module HasUnionTypePropagation implements TypePropagation {
-    class Typ = Unit;
-
-    predicate candType(TypeFlowNode mid, Unit unit) {
-      exists(unit) and
-      (unionTypeFlowBaseCand(mid, _, _) or hasUnionTypeFlow(mid))
+  module UnionTypeFlowProperty implements UnivFlow::NullaryPropertySig {
+    predicate hasPropertyBase(TypeFlowNode n) {
+      unionTypeFlowBaseCand(n, _, _) or
+      instanceofDisjunctionGuarded(n, _)
     }
 
-    predicate supportsType = candType/2;
+    predicate barrier(TypeFlowNode n) { exactType(n, _) }
   }
 
   /**
@@ -352,25 +183,7 @@ module TypeFlow<LocationSig Location, TypeFlowInput<Location> I> {
    * `unionTypeFlowBaseCand`, such that we can compute a union type bound for `n`.
    * Disregards nodes for which we have an exact bound.
    */
-  private predicate hasUnionTypeFlow(TypeFlowNode n) {
-    not exactType(n, _) and
-    (
-      // Optimized version of
-      // `forex(TypeFlowNode mid | joinStepNotNull(mid, n) | unionTypeFlowBaseCand(mid, _, _) or hasUnionTypeFlow(mid))`
-      ForAll<TypeFlowNode, RankedJoinStep, HasUnionTypePropagation>::flowJoin(n, _)
-      or
-      exists(TypeFlowScc scc |
-        sccRepr(n, scc) and
-        // Optimized version of
-        // `forex(TypeFlowNode mid | sccJoinStep(mid, scc) | unionTypeFlowBaseCand(mid, _, _) or hasUnionTypeFlow(mid))`
-        ForAll<TypeFlowScc, RankedSccJoinStep, HasUnionTypePropagation>::flowJoin(scc, _)
-      )
-      or
-      exists(TypeFlowNode mid | step(mid, n) and hasUnionTypeFlow(mid))
-      or
-      instanceofDisjunctionGuarded(n, _)
-    )
-  }
+  private predicate hasUnionTypeFlow = UnivFlow::FlowNullary<UnionTypeFlowProperty>::hasProperty/1;
 
   pragma[nomagic]
   private Type getTypeBound(TypeFlowNode n) {
@@ -383,9 +196,9 @@ module TypeFlow<LocationSig Location, TypeFlowInput<Location> I> {
   private predicate unionTypeFlow0(TypeFlowNode n, Type t, boolean exact) {
     hasUnionTypeFlow(n) and
     (
-      exists(TypeFlowNode mid | anyStep(mid, n) |
-        unionTypeFlowBaseCand(mid, t, exact) or unionTypeFlow(mid, t, exact)
-      )
+      exists(TypeFlowNode mid | UnivFlow::Internal::anyStep(mid, n) | unionTypeFlow(mid, t, exact))
+      or
+      unionTypeFlowBaseCand(n, t, exact)
       or
       instanceofDisjunctionGuarded(n, t) and exact = false
     )
@@ -470,6 +283,7 @@ module TypeFlow<LocationSig Location, TypeFlowInput<Location> I> {
    */
   predicate bestUnionType(TypeFlowNode n, Type t, boolean exact) {
     unionTypeFlow(n, t, exact) and
+    not exactType(n, _) and
     not irrelevantUnionType(n) and
     not irrelevantUnionTypePart(n, t, exact)
   }
diff --git a/shared/typeflow/qlpack.yml b/shared/typeflow/qlpack.yml
index 71d74cb3af5..6c7ecc03264 100644
--- a/shared/typeflow/qlpack.yml
+++ b/shared/typeflow/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/typeflow
-version: 1.0.9-dev
+version: 1.0.12-dev
 groups: shared
 library: true
 dependencies:
diff --git a/shared/typetracking/CHANGELOG.md b/shared/typetracking/CHANGELOG.md
index 0135f24d76b..d35be2a3771 100644
--- a/shared/typetracking/CHANGELOG.md
+++ b/shared/typetracking/CHANGELOG.md
@@ -1,3 +1,15 @@
+## 1.0.11
+
+No user-facing changes.
+
+## 1.0.10
+
+No user-facing changes.
+
+## 1.0.9
+
+No user-facing changes.
+
 ## 1.0.8
 
 No user-facing changes.
diff --git a/shared/typetracking/change-notes/released/1.0.10.md b/shared/typetracking/change-notes/released/1.0.10.md
new file mode 100644
index 00000000000..b601d878453
--- /dev/null
+++ b/shared/typetracking/change-notes/released/1.0.10.md
@@ -0,0 +1,3 @@
+## 1.0.10
+
+No user-facing changes.
diff --git a/shared/typetracking/change-notes/released/1.0.11.md b/shared/typetracking/change-notes/released/1.0.11.md
new file mode 100644
index 00000000000..245e0812108
--- /dev/null
+++ b/shared/typetracking/change-notes/released/1.0.11.md
@@ -0,0 +1,3 @@
+## 1.0.11
+
+No user-facing changes.
diff --git a/shared/typetracking/change-notes/released/1.0.9.md b/shared/typetracking/change-notes/released/1.0.9.md
new file mode 100644
index 00000000000..ee073f7ec16
--- /dev/null
+++ b/shared/typetracking/change-notes/released/1.0.9.md
@@ -0,0 +1,3 @@
+## 1.0.9
+
+No user-facing changes.
diff --git a/shared/typetracking/codeql-pack.release.yml b/shared/typetracking/codeql-pack.release.yml
index 5c55fbd52ed..56a2fb38872 100644
--- a/shared/typetracking/codeql-pack.release.yml
+++ b/shared/typetracking/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.0.8
+lastReleaseVersion: 1.0.11
diff --git a/shared/typetracking/qlpack.yml b/shared/typetracking/qlpack.yml
index 3f61875e42f..07eeb938af3 100644
--- a/shared/typetracking/qlpack.yml
+++ b/shared/typetracking/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/typetracking
-version: 1.0.9-dev
+version: 1.0.12-dev
 groups: shared
 library: true
 dependencies:
diff --git a/shared/typos/CHANGELOG.md b/shared/typos/CHANGELOG.md
index 415174b3b07..e5392886a3e 100644
--- a/shared/typos/CHANGELOG.md
+++ b/shared/typos/CHANGELOG.md
@@ -1,3 +1,15 @@
+## 1.0.11
+
+No user-facing changes.
+
+## 1.0.10
+
+No user-facing changes.
+
+## 1.0.9
+
+No user-facing changes.
+
 ## 1.0.8
 
 No user-facing changes.
diff --git a/shared/typos/change-notes/released/1.0.10.md b/shared/typos/change-notes/released/1.0.10.md
new file mode 100644
index 00000000000..b601d878453
--- /dev/null
+++ b/shared/typos/change-notes/released/1.0.10.md
@@ -0,0 +1,3 @@
+## 1.0.10
+
+No user-facing changes.
diff --git a/shared/typos/change-notes/released/1.0.11.md b/shared/typos/change-notes/released/1.0.11.md
new file mode 100644
index 00000000000..245e0812108
--- /dev/null
+++ b/shared/typos/change-notes/released/1.0.11.md
@@ -0,0 +1,3 @@
+## 1.0.11
+
+No user-facing changes.
diff --git a/shared/typos/change-notes/released/1.0.9.md b/shared/typos/change-notes/released/1.0.9.md
new file mode 100644
index 00000000000..ee073f7ec16
--- /dev/null
+++ b/shared/typos/change-notes/released/1.0.9.md
@@ -0,0 +1,3 @@
+## 1.0.9
+
+No user-facing changes.
diff --git a/shared/typos/codeql-pack.release.yml b/shared/typos/codeql-pack.release.yml
index 5c55fbd52ed..56a2fb38872 100644
--- a/shared/typos/codeql-pack.release.yml
+++ b/shared/typos/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.0.8
+lastReleaseVersion: 1.0.11
diff --git a/shared/typos/qlpack.yml b/shared/typos/qlpack.yml
index 4df1e7c6e6a..dcd9631b697 100644
--- a/shared/typos/qlpack.yml
+++ b/shared/typos/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/typos
-version: 1.0.9-dev
+version: 1.0.12-dev
 groups: shared
 library: true
 warnOnImplicitThis: true
diff --git a/shared/util/CHANGELOG.md b/shared/util/CHANGELOG.md
index 5213509f1c7..9f1057cba24 100644
--- a/shared/util/CHANGELOG.md
+++ b/shared/util/CHANGELOG.md
@@ -1,3 +1,15 @@
+## 1.0.11
+
+No user-facing changes.
+
+## 1.0.10
+
+No user-facing changes.
+
+## 1.0.9
+
+No user-facing changes.
+
 ## 1.0.8
 
 No user-facing changes.
diff --git a/shared/util/change-notes/released/1.0.10.md b/shared/util/change-notes/released/1.0.10.md
new file mode 100644
index 00000000000..b601d878453
--- /dev/null
+++ b/shared/util/change-notes/released/1.0.10.md
@@ -0,0 +1,3 @@
+## 1.0.10
+
+No user-facing changes.
diff --git a/shared/util/change-notes/released/1.0.11.md b/shared/util/change-notes/released/1.0.11.md
new file mode 100644
index 00000000000..245e0812108
--- /dev/null
+++ b/shared/util/change-notes/released/1.0.11.md
@@ -0,0 +1,3 @@
+## 1.0.11
+
+No user-facing changes.
diff --git a/shared/util/change-notes/released/1.0.9.md b/shared/util/change-notes/released/1.0.9.md
new file mode 100644
index 00000000000..ee073f7ec16
--- /dev/null
+++ b/shared/util/change-notes/released/1.0.9.md
@@ -0,0 +1,3 @@
+## 1.0.9
+
+No user-facing changes.
diff --git a/shared/util/codeql-pack.release.yml b/shared/util/codeql-pack.release.yml
index 5c55fbd52ed..56a2fb38872 100644
--- a/shared/util/codeql-pack.release.yml
+++ b/shared/util/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.0.8
+lastReleaseVersion: 1.0.11
diff --git a/shared/util/codeql/util/AlertFiltering.qll b/shared/util/codeql/util/AlertFiltering.qll
new file mode 100644
index 00000000000..d1778304b73
--- /dev/null
+++ b/shared/util/codeql/util/AlertFiltering.qll
@@ -0,0 +1,40 @@
+/**
+ * Provides the `restrictAlertsTo` extensible predicate to restrict alerts to specific source
+ * locations, and the `AlertFilteringImpl` parameterized module to apply the filtering.
+ */
+
+private import codeql.util.Location
+
+/**
+ * Restricts alerts to a specific location in specific files.
+ *
+ * If this predicate is empty, accept all alerts. Otherwise, accept alerts only at the specified
+ * locations. Note that alert restrictions apply only to the start line of an alert (even if the
+ * alert location spans multiple lines) because alerts are displayed on their start lines.
+ *
+ * - filePath: Absolute path of the file to restrict alerts to.
+ * - startLine: Start line number (starting with 1, inclusive) to restrict alerts to.
+ * - endLine: End line number (starting with 1, inclusive) to restrict alerts to.
+ *
+ * If startLine and endLine are both 0, accept alerts anywhere in the file.
+ */
+extensible predicate restrictAlertsTo(string filePath, int startLine, int endLine);
+
+/** Module for applying alert location filtering. */
+module AlertFilteringImpl<LocationSig Location> {
+  /** Applies alert filtering to the given location. */
+  bindingset[location]
+  predicate filterByLocation(Location location) {
+    not restrictAlertsTo(_, _, _)
+    or
+    exists(string filePath, int startLine, int endLine |
+      restrictAlertsTo(filePath, startLine, endLine)
+    |
+      startLine = 0 and
+      endLine = 0 and
+      location.hasLocationInfo(filePath, _, _, _, _)
+      or
+      location.hasLocationInfo(filePath, [startLine .. endLine], _, _, _)
+    )
+  }
+}
diff --git a/shared/util/codeql/util/DenseRank.qll b/shared/util/codeql/util/DenseRank.qll
new file mode 100644
index 00000000000..d1ba4ae4b62
--- /dev/null
+++ b/shared/util/codeql/util/DenseRank.qll
@@ -0,0 +1,131 @@
+/**
+ * Provides modules for computing dense `rank`s. See the `DenseRank` module
+ * below for a more detailed explanation.
+ */
+
+/** Provides the input to `DenseRank`. */
+signature module DenseRankInputSig {
+  /** An element that is ranked. */
+  bindingset[this]
+  class Ranked;
+
+  /** Gets the rank of `r`. */
+  int getRank(Ranked r);
+}
+
+/**
+ * Provides the `denseRank` predicate for computing dense `rank`s. For example,
+ * if we have
+ *
+ * ```ql
+ * query predicate names(string name) {
+ *   name = ["Alice", "Bob", "Charles", "Charlie", "David"]
+ * }
+ *
+ * int rankByFirstLetter(string name) {
+ *   name = rank[result](string n | names(n) | n order by n.charAt(0))
+ * }
+ * ```
+ *
+ * then `rankByFirstLetter` computes the following relation
+ *
+ * ```
+ * Alice    1
+ * Bob      2
+ * Charles  3
+ * Charlie  3
+ * David    5
+ * ```
+ *
+ * Note that `"David"` has rank 5 instead of 4. If we want a dense ranking instead,
+ * we can do
+ *
+ * ```ql
+ * module M implements DenseRankInputSig {
+ *   class Ranked = string;
+ *
+ *   predicate getRank = rankByFirstLetter/1;
+ * }
+ *
+ * predicate denseRank = DenseRank<M>::denseRank/1;
+ * ```
+ */
+module DenseRank<DenseRankInputSig Input> {
+  private import Input
+
+  private int rankRank(Ranked r, int rnk) {
+    rnk = getRank(r) and
+    rnk = rank[result](int rnk0 | rnk0 = getRank(_) | rnk0)
+  }
+
+  /** Gets the dense rank of `r`. */
+  int denseRank(Ranked r) { result = rankRank(r, getRank(r)) }
+}
+
+/** Provides the input to `DenseRank2`. */
+signature module DenseRankInputSig2 {
+  /** A ranking context. */
+  bindingset[this]
+  class C;
+
+  /** An element that is ranked. */
+  bindingset[this]
+  class Ranked;
+
+  /** Gets the rank of `r` in the context provided by `c`. */
+  int getRank(C c, Ranked r);
+}
+
+/** Same as `DenseRank`, but allows for a context consisting of one element. */
+module DenseRank2<DenseRankInputSig2 Input> {
+  private import Input
+
+  private int rankRank(C c, Ranked r, int rnk) {
+    rnk = getRank(c, r) and
+    rnk = rank[result](int rnk0 | rnk0 = getRank(c, _) | rnk0)
+  }
+
+  /** Gets the dense rank of `r` in the context provided by `c`. */
+  int denseRank(C c, Ranked r) {
+    exists(int rnk |
+      result = rankRank(c, r, rnk) and
+      rnk = getRank(c, r)
+    )
+  }
+}
+
+/** Provides the input to `DenseRank3`. */
+signature module DenseRankInputSig3 {
+  /** A ranking context. */
+  bindingset[this]
+  class C1;
+
+  /** A ranking context. */
+  bindingset[this]
+  class C2;
+
+  /** An element that is ranked. */
+  bindingset[this]
+  class Ranked;
+
+  /** Gets the rank of `r` in the context provided by `c1` and `c2`. */
+  int getRank(C1 c1, C2 c2, Ranked r);
+}
+
+/** Same as `DenseRank`, but allows for a context consisting of two elements. */
+module DenseRank3<DenseRankInputSig3 Input> {
+  private import Input
+
+  private int rankRank(C1 c1, C2 c2, Ranked r, int rnk) {
+    rnk = getRank(c1, c2, r) and
+    rnk = rank[result](int rnk0 | rnk0 = getRank(c1, c2, _) | rnk0)
+  }
+
+  /** Gets the dense rank of `r` in the context provided by `c1` and `c2`. */
+  int denseRank(C1 c1, C2 c2, Ranked r) {
+    exists(int rnk |
+      result = rankRank(c1, c2, r, rnk) and
+      rnk = getRank(c1, c2, r)
+    )
+  }
+}
diff --git a/shared/util/codeql/util/Void.qll b/shared/util/codeql/util/Void.qll
new file mode 100644
index 00000000000..886687b5460
--- /dev/null
+++ b/shared/util/codeql/util/Void.qll
@@ -0,0 +1,10 @@
+/** Provides the empty `Void` class. */
+
+/** The empty void type. */
+private newtype TVoid = TMkVoid() { none() }
+
+/** The trivial empty type. */
+final class Void extends TVoid {
+  /** Gets a textual representation of this element. */
+  string toString() { result = "dummy" }
+}
diff --git a/shared/util/codeql/util/test/InlineExpectationsTest.qll b/shared/util/codeql/util/test/InlineExpectationsTest.qll
index 1e95f0d0c9d..bd51ad1c2bd 100644
--- a/shared/util/codeql/util/test/InlineExpectationsTest.qll
+++ b/shared/util/codeql/util/test/InlineExpectationsTest.qll
@@ -134,8 +134,31 @@ module Make<InlineExpectationsTestSig Impl> {
      * predicate for an active test will be ignored. This makes it possible to write multiple tests in
      * different `.ql` files that all query the same source code.
      */
+    bindingset[result]
     string getARelevantTag();
 
+    /**
+     * Holds if expected tag `expectedTag` matches actual tag `actualTag`.
+     *
+     * This is normally defined as `expectedTag = actualTag`.
+     */
+    bindingset[expectedTag, actualTag]
+    default predicate tagMatches(string expectedTag, string actualTag) { expectedTag = actualTag }
+
+    /** Holds if expectations marked with `expectedTag` are optional. */
+    bindingset[expectedTag]
+    default predicate tagIsOptional(string expectedTag) { none() }
+
+    /**
+     * Holds if expected value `expectedValue` matches actual value `actualValue`.
+     *
+     * This is normally defined as `expectedValue = actualValue`.
+     */
+    bindingset[expectedValue, actualValue]
+    default predicate valueMatches(string expectedValue, string actualValue) {
+      expectedValue = actualValue
+    }
+
     /**
      * Returns the actual results of the query that is being tested. Each result consist of the
      * following values:
@@ -177,7 +200,7 @@ module Make<InlineExpectationsTestSig Impl> {
         (
           exists(FalseNegativeTestExpectation falseNegative |
             falseNegative.matchesActualResult(actualResult) and
-            message = "Fixed missing result:" + falseNegative.getExpectationText()
+            message = "Fixed missing result: " + falseNegative.getExpectationText()
           )
           or
           not exists(ValidTestExpectation expectation |
@@ -200,13 +223,13 @@ module Make<InlineExpectationsTestSig Impl> {
         not exists(ActualTestResult actualResult | expectation.matchesActualResult(actualResult)) and
         expectation.getTag() = TestImpl::getARelevantTag() and
         element = expectation and
-        (
-          expectation instanceof GoodTestExpectation and
-          message = "Missing result:" + expectation.getExpectationText()
-          or
-          expectation instanceof FalsePositiveTestExpectation and
-          message = "Fixed spurious result:" + expectation.getExpectationText()
-        )
+        not expectation.isOptional()
+      |
+        expectation instanceof GoodTestExpectation and
+        message = "Missing result: " + expectation.getExpectationText()
+        or
+        expectation instanceof FalsePositiveTestExpectation and
+        message = "Fixed spurious result: " + expectation.getExpectationText()
       )
       or
       exists(InvalidTestExpectation expectation |
@@ -242,7 +265,13 @@ module Make<InlineExpectationsTestSig Impl> {
 
       Impl::Location getLocation() { none() }
 
-      final string getExpectationText() { result = this.getTag() + "=" + this.getValue() }
+      final string getExpectationText() {
+        exists(string suffix |
+          if this.getValue() = "" then suffix = "" else suffix = "=" + this.getValue()
+        |
+          result = this.getTag() + suffix
+        )
+      }
 
       string getTag() { none() }
 
@@ -305,9 +334,11 @@ module Make<InlineExpectationsTestSig Impl> {
 
       predicate matchesActualResult(ActualTestResult actualResult) {
         onSameLine(pragma[only_bind_into](this), actualResult) and
-        this.getTag() = actualResult.getTag() and
-        this.getValue() = actualResult.getValue()
+        TestImpl::tagMatches(this.getTag(), actualResult.getTag()) and
+        TestImpl::valueMatches(this.getValue(), actualResult.getValue())
       }
+
+      predicate isOptional() { TestImpl::tagIsOptional(tag) }
     }
 
     // Note: These next three classes correspond to all the possible values of type `TColumn`.
@@ -331,6 +362,18 @@ module Make<InlineExpectationsTestSig Impl> {
       string getExpectation() { result = expectation }
     }
 
+    /**
+     * Gets a test expectation that matches the actual result at the given location.
+     */
+    ValidTestExpectation getAMatchingExpectation(
+      Impl::Location location, string element, string tag, string val, boolean optional
+    ) {
+      exists(ActualTestResult actualResult |
+        result.matchesActualResult(actualResult) and
+        actualResult = TActualResult(location, element, tag, val, optional)
+      )
+    }
+
     query predicate testFailures(FailureLocatable element, string message) {
       hasFailureMessage(element, message)
     }
@@ -379,6 +422,7 @@ module Make<InlineExpectationsTestSig Impl> {
    * ```
    */
   module MergeTests<TestSig TestImpl1, TestSig TestImpl2> implements TestSig {
+    bindingset[result]
     string getARelevantTag() {
       result = TestImpl1::getARelevantTag() or result = TestImpl2::getARelevantTag()
     }
@@ -402,6 +446,7 @@ module Make<InlineExpectationsTestSig Impl> {
   module MergeTests3<TestSig TestImpl1, TestSig TestImpl2, TestSig TestImpl3> implements TestSig {
     private module M = MergeTests<MergeTests<TestImpl1, TestImpl2>, TestImpl3>;
 
+    bindingset[result]
     string getARelevantTag() { result = M::getARelevantTag() }
 
     predicate hasActualResult(Impl::Location location, string element, string tag, string value) {
@@ -421,6 +466,7 @@ module Make<InlineExpectationsTestSig Impl> {
   {
     private module M = MergeTests<MergeTests3<TestImpl1, TestImpl2, TestImpl3>, TestImpl4>;
 
+    bindingset[result]
     string getARelevantTag() { result = M::getARelevantTag() }
 
     predicate hasActualResult(Impl::Location location, string element, string tag, string value) {
@@ -442,6 +488,7 @@ module Make<InlineExpectationsTestSig Impl> {
     private module M =
       MergeTests<MergeTests4<TestImpl1, TestImpl2, TestImpl3, TestImpl4>, TestImpl5>;
 
+    bindingset[result]
     string getARelevantTag() { result = M::getARelevantTag() }
 
     predicate hasActualResult(Impl::Location location, string element, string tag, string value) {
@@ -584,3 +631,266 @@ private string expectationPattern() {
     result = tags + "(?:=" + value + ")?"
   )
 }
+
+/**
+ * Provides logic for creating a `@kind test-postprocess` query that checks
+ * inline test expectations using `$ Alert` markers.
+ *
+ * The postprocessing query works for queries of kind `problem` and `path-problem`,
+ * and each query result must have a matching `$ Alert` comment. It is possible to
+ * augment the comment with a query ID, in order to support cases where multiple
+ * `.qlref` tests share the same test code:
+ *
+ * ```rust
+ * var x = ""; // $ Alert[rust/unused-value]
+ * return;
+ * foo();      // $ Alert[rust/unreachable-code]
+ * ```
+ *
+ * In the example above, the `$ Alert[rust/unused-value]` commment is only taken
+ * into account in the test for the query with ID `rust/unused-value`, and vice
+ * versa for the `$ Alert[rust/unreachable-code]` comment.
+ *
+ * For `path-problem` queries, each source and sink must additionally be annotated
+ * (`$ Source` and `$ Sink`, respectively), except when their location coincides
+ * with the location of the alert itself, in which case only `$ Alert` is needed.
+ *
+ * Example:
+ *
+ * ```csharp
+ * var queryParam = Request.QueryString["param"]; // $ Source
+ * Write(Html.Raw(queryParam));                   // $ Alert
+ * ```
+ *
+ * Morover, it is possible to tag sources with a unique identifier:
+ *
+ * ```csharp
+ * var queryParam = Request.QueryString["param"]; // $ Source=source1
+ * Write(Html.Raw(queryParam));                   // $ Alert=source1
+ * ```
+ *
+ * In this case, the source and sink must have the same tag in order
+ * to be matched.
+ */
+module TestPostProcessing {
+  external predicate queryResults(string relation, int row, int column, string data);
+
+  external predicate queryRelations(string relation);
+
+  external predicate queryMetadata(string key, string value);
+
+  private string getQueryId() { queryMetadata("id", result) }
+
+  private string getQueryKind() { queryMetadata("kind", result) }
+
+  signature module InputSig<InlineExpectationsTestSig Input> {
+    string getRelativeUrl(Input::Location location);
+  }
+
+  module Make<InlineExpectationsTestSig Input, InputSig<Input> Input2> {
+    private import InlineExpectationsTest as InlineExpectationsTest
+    private import InlineExpectationsTest::Make<Input>
+
+    /**
+     * Gets the tag to be used for the path-problem source at result row `row`.
+     *
+     * This is either `Source` or `Alert`, depending on whether the location
+     * of the source matches the location of the alert.
+     */
+    private string getSourceTag(int row) {
+      getQueryKind() = "path-problem" and
+      exists(string loc | queryResults("#select", row, 2, loc) |
+        if queryResults("#select", row, 0, loc) then result = "Alert" else result = "Source"
+      )
+    }
+
+    /**
+     * Gets the tag to be used for the path-problem sink at result row `row`.
+     *
+     * This is either `Sink` or `Alert`, depending on whether the location
+     * of the sink matches the location of the alert.
+     */
+    private string getSinkTag(int row) {
+      getQueryKind() = "path-problem" and
+      exists(string loc | queryResults("#select", row, 4, loc) |
+        if queryResults("#select", row, 0, loc) then result = "Alert" else result = "Sink"
+      )
+    }
+
+    private string getTagRegex() {
+      exists(string sourceSinkTags |
+        (
+          getQueryKind() = "problem"
+          or
+          not exists(getSourceTag(_)) and
+          not exists(getSinkTag(_))
+        ) and
+        sourceSinkTags = ""
+        or
+        sourceSinkTags = "|" + getSourceTag(_) + "|" + getSinkTag(_)
+      |
+        result = "(Alert" + sourceSinkTags + ")(\\[(.*)\\])?"
+      )
+    }
+
+    /**
+     * A configuration for matching `// $ Source=foo` comments against actual
+     * path-problem sources.
+     *
+     * Whenever a source is tagged with a value, like `foo`, we will use that
+     * to define the expected tags at the sink and the alert.
+     */
+    private module PathProblemSourceTestInput implements TestSig {
+      string getARelevantTag() { result = getSourceTag(_) }
+
+      bindingset[expectedTag, actualTag]
+      predicate tagMatches(string expectedTag, string actualTag) {
+        actualTag = expectedTag.regexpCapture(getTagRegex(), 1) and
+        (
+          // expected tag is annotated with a query ID
+          getQueryId() = expectedTag.regexpCapture(getTagRegex(), 3)
+          or
+          // expected tag is not annotated with a query ID
+          not exists(expectedTag.regexpCapture(getTagRegex(), 3))
+        )
+      }
+
+      bindingset[expectedValue, actualValue]
+      predicate valueMatches(string expectedValue, string actualValue) {
+        exists(expectedValue) and
+        actualValue = ""
+      }
+
+      additional predicate hasPathProblemSource(
+        int row, Input::Location location, string element, string tag, string value
+      ) {
+        getQueryKind() = "path-problem" and
+        exists(string loc |
+          queryResults("#select", row, 2, loc) and
+          queryResults("#select", row, 3, element) and
+          tag = getSourceTag(row) and
+          value = "" and
+          Input2::getRelativeUrl(location) = loc
+        )
+      }
+
+      predicate hasActualResult(Input::Location location, string element, string tag, string value) {
+        hasPathProblemSource(_, location, element, tag, value)
+      }
+    }
+
+    private module PathProblemSourceTest = MakeTest<PathProblemSourceTestInput>;
+
+    private module TestInput implements TestSig {
+      bindingset[result]
+      string getARelevantTag() { any() }
+
+      predicate tagMatches = PathProblemSourceTestInput::tagMatches/2;
+
+      bindingset[expectedTag]
+      predicate tagIsOptional(string expectedTag) {
+        // ignore irrelevant tags
+        not expectedTag.regexpMatch(getTagRegex())
+        or
+        // ignore tags annotated with a query ID that does not match the current query ID
+        exists(string queryId |
+          queryId = expectedTag.regexpCapture(getTagRegex(), 3) and
+          queryId != getQueryId()
+        )
+      }
+
+      private predicate hasPathProblemSource = PathProblemSourceTestInput::hasPathProblemSource/5;
+
+      private predicate hasPathProblemSink(
+        int row, Input::Location location, string element, string tag
+      ) {
+        getQueryKind() = "path-problem" and
+        exists(string loc |
+          queryResults("#select", row, 4, loc) and
+          queryResults("#select", row, 5, element) and
+          tag = getSinkTag(row) and
+          Input2::getRelativeUrl(location) = loc
+        )
+      }
+
+      private predicate hasAlert(int row, Input::Location location, string element, string tag) {
+        getQueryKind() = ["problem", "path-problem"] and
+        exists(string loc |
+          queryResults("#select", row, 0, loc) and
+          queryResults("#select", row, 2, element) and
+          tag = "Alert" and
+          Input2::getRelativeUrl(location) = loc and
+          not hasPathProblemSource(row, location, _, _, _) and
+          not hasPathProblemSink(row, location, _, _)
+        )
+      }
+
+      /**
+       * Gets the expected value for result row `row`, if any. This value must
+       * match the value at the corresponding path-problem source (if it is
+       * present).
+       */
+      private string getValue(int row) {
+        exists(Input::Location location, string element, string tag, string val |
+          hasPathProblemSource(row, location, element, tag, val) and
+          result =
+            PathProblemSourceTest::getAMatchingExpectation(location, element, tag, val, false)
+                .getValue()
+        )
+      }
+
+      predicate hasActualResult(Input::Location location, string element, string tag, string value) {
+        exists(int row |
+          hasPathProblemSource(row, location, element, tag, _)
+          or
+          hasPathProblemSink(row, location, element, tag)
+          or
+          hasAlert(row, location, element, tag)
+        |
+          not exists(getValue(row)) and value = ""
+          or
+          value = getValue(row)
+        )
+      }
+    }
+
+    private module Test = MakeTest<TestInput>;
+
+    private newtype TTestFailure =
+      MkTestFailure(Test::FailureLocatable f, string message) { Test::testFailures(f, message) }
+
+    private predicate rankedTestFailures(int i, MkTestFailure f) {
+      f =
+        rank[i](MkTestFailure f0, Test::FailureLocatable fl, string message, string filename,
+          int startLine, int startColumn, int endLine, int endColumn |
+          f0 = MkTestFailure(fl, message) and
+          fl.getLocation().hasLocationInfo(filename, startLine, startColumn, endLine, endColumn)
+        |
+          f0 order by filename, startLine, startColumn, endLine, endColumn, message
+        )
+    }
+
+    query predicate results(string relation, int row, int column, string data) {
+      queryResults(relation, row, column, data)
+      or
+      exists(MkTestFailure f, Test::FailureLocatable fl, string message |
+        relation = "testFailures" and
+        rankedTestFailures(row, f) and
+        f = MkTestFailure(fl, message)
+      |
+        column = 0 and data = Input2::getRelativeUrl(fl.getLocation())
+        or
+        column = 1 and data = fl.toString()
+        or
+        column = 2 and data = message
+      )
+    }
+
+    query predicate resultRelations(string relation) {
+      queryRelations(relation)
+      or
+      Test::testFailures(_, _) and
+      relation = "testFailures"
+    }
+  }
+}
diff --git a/shared/util/ext/default-alert-filter.yml b/shared/util/ext/default-alert-filter.yml
new file mode 100644
index 00000000000..0ae5a2f4eb5
--- /dev/null
+++ b/shared/util/ext/default-alert-filter.yml
@@ -0,0 +1,7 @@
+extensions:
+
+  - addsTo:
+      pack: codeql/util
+      extensible: restrictAlertsTo
+    # Empty predicate means no restrictions on alert locations
+    data: []
diff --git a/shared/util/qlpack.yml b/shared/util/qlpack.yml
index 2f5ab19dec4..2a33b5aa84a 100644
--- a/shared/util/qlpack.yml
+++ b/shared/util/qlpack.yml
@@ -1,6 +1,8 @@
 name: codeql/util
-version: 1.0.9-dev
+version: 1.0.12-dev
 groups: shared
 library: true
 dependencies: null
+dataExtensions:
+  - ext/*.yml
 warnOnImplicitThis: true
diff --git a/shared/xml/CHANGELOG.md b/shared/xml/CHANGELOG.md
index e776ce85b58..6ef34d6264c 100644
--- a/shared/xml/CHANGELOG.md
+++ b/shared/xml/CHANGELOG.md
@@ -1,3 +1,15 @@
+## 1.0.11
+
+No user-facing changes.
+
+## 1.0.10
+
+No user-facing changes.
+
+## 1.0.9
+
+No user-facing changes.
+
 ## 1.0.8
 
 No user-facing changes.
diff --git a/shared/xml/change-notes/released/1.0.10.md b/shared/xml/change-notes/released/1.0.10.md
new file mode 100644
index 00000000000..b601d878453
--- /dev/null
+++ b/shared/xml/change-notes/released/1.0.10.md
@@ -0,0 +1,3 @@
+## 1.0.10
+
+No user-facing changes.
diff --git a/shared/xml/change-notes/released/1.0.11.md b/shared/xml/change-notes/released/1.0.11.md
new file mode 100644
index 00000000000..245e0812108
--- /dev/null
+++ b/shared/xml/change-notes/released/1.0.11.md
@@ -0,0 +1,3 @@
+## 1.0.11
+
+No user-facing changes.
diff --git a/shared/xml/change-notes/released/1.0.9.md b/shared/xml/change-notes/released/1.0.9.md
new file mode 100644
index 00000000000..ee073f7ec16
--- /dev/null
+++ b/shared/xml/change-notes/released/1.0.9.md
@@ -0,0 +1,3 @@
+## 1.0.9
+
+No user-facing changes.
diff --git a/shared/xml/codeql-pack.release.yml b/shared/xml/codeql-pack.release.yml
index 5c55fbd52ed..56a2fb38872 100644
--- a/shared/xml/codeql-pack.release.yml
+++ b/shared/xml/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.0.8
+lastReleaseVersion: 1.0.11
diff --git a/shared/xml/qlpack.yml b/shared/xml/qlpack.yml
index 50b2e44a4b7..94acb679e9c 100644
--- a/shared/xml/qlpack.yml
+++ b/shared/xml/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/xml
-version: 1.0.9-dev
+version: 1.0.12-dev
 groups: shared
 library: true
 dependencies:
diff --git a/shared/yaml/CHANGELOG.md b/shared/yaml/CHANGELOG.md
index 3b774c7dc4c..79fc573c5ae 100644
--- a/shared/yaml/CHANGELOG.md
+++ b/shared/yaml/CHANGELOG.md
@@ -1,3 +1,15 @@
+## 1.0.11
+
+No user-facing changes.
+
+## 1.0.10
+
+No user-facing changes.
+
+## 1.0.9
+
+No user-facing changes.
+
 ## 1.0.8
 
 No user-facing changes.
diff --git a/shared/yaml/change-notes/released/1.0.10.md b/shared/yaml/change-notes/released/1.0.10.md
new file mode 100644
index 00000000000..b601d878453
--- /dev/null
+++ b/shared/yaml/change-notes/released/1.0.10.md
@@ -0,0 +1,3 @@
+## 1.0.10
+
+No user-facing changes.
diff --git a/shared/yaml/change-notes/released/1.0.11.md b/shared/yaml/change-notes/released/1.0.11.md
new file mode 100644
index 00000000000..245e0812108
--- /dev/null
+++ b/shared/yaml/change-notes/released/1.0.11.md
@@ -0,0 +1,3 @@
+## 1.0.11
+
+No user-facing changes.
diff --git a/shared/yaml/change-notes/released/1.0.9.md b/shared/yaml/change-notes/released/1.0.9.md
new file mode 100644
index 00000000000..ee073f7ec16
--- /dev/null
+++ b/shared/yaml/change-notes/released/1.0.9.md
@@ -0,0 +1,3 @@
+## 1.0.9
+
+No user-facing changes.
diff --git a/shared/yaml/codeql-pack.release.yml b/shared/yaml/codeql-pack.release.yml
index 5c55fbd52ed..56a2fb38872 100644
--- a/shared/yaml/codeql-pack.release.yml
+++ b/shared/yaml/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.0.8
+lastReleaseVersion: 1.0.11
diff --git a/shared/yaml/qlpack.yml b/shared/yaml/qlpack.yml
index 4fa80cf5c0c..62119951431 100644
--- a/shared/yaml/qlpack.yml
+++ b/shared/yaml/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/yaml
-version: 1.0.9-dev
+version: 1.0.12-dev
 groups: shared
 library: true
 warnOnImplicitThis: true
diff --git a/swift/README.md b/swift/README.md
index a39c0ea5578..b5be374b5e7 100644
--- a/swift/README.md
+++ b/swift/README.md
@@ -13,7 +13,7 @@ brew install bazelisk
 then from the `ql` directory run
 
 ```bash
-bazel run //swift:create-extractor-pack
+bazel run //swift:install
 ```
 
 If you are running on macOS and you encounter errors mentioning `XXX is unavailable: introduced in macOS YY.ZZ`,
diff --git a/swift/actions/build-and-test/action.yml b/swift/actions/build-and-test/action.yml
index 2522f545c05..4048560640b 100644
--- a/swift/actions/build-and-test/action.yml
+++ b/swift/actions/build-and-test/action.yml
@@ -48,7 +48,7 @@ runs:
     - name: Build Swift extractor
       shell: bash
       run: |
-        bazel run //swift:create-extractor-pack
+        bazel run //swift:install
     - name: Run codegen tests
       if : ${{ github.event_name == 'pull_request' }}
       shell: bash
diff --git a/swift/ql/.generated.list b/swift/ql/.generated.list
index 66e8f70c271..da39f2f2fe7 100644
--- a/swift/ql/.generated.list
+++ b/swift/ql/.generated.list
@@ -713,7 +713,7 @@ lib/codeql/swift/generated/ParentChild.qll d1814f2bad4c2ba9242ce49fe6fb8564ac99f
 lib/codeql/swift/generated/PlatformVersionAvailabilitySpec.qll dc17b49a90a18a8f7607adf2433bc8f0c194fa3e803aa3822f809d4d4fbd6793 be48ea9f8ae17354c8508aaed24337a9e57ce01f288fece3dcecd99776cabcec
 lib/codeql/swift/generated/PureSynthConstructors.qll bc31a6c4d142fa3fbdcae69d5ba6f1cec00eb9ad92b46c8d7b91ebfa7ef6c1f4 bc31a6c4d142fa3fbdcae69d5ba6f1cec00eb9ad92b46c8d7b91ebfa7ef6c1f4
 lib/codeql/swift/generated/Raw.qll 118b43fedd4265b5aa15c33ef01a2f5a5db6e5597f95bef1078a01c3ff8da983 075aec2c8b232f0361ebf63f07ae9b66163f3975e6023583fb0fa2e40b979a33
-lib/codeql/swift/generated/Synth.qll 221f40afbc2bed0f5de1961877fd39dd025574bc72622af0e9f47f278a8324b7 05b8aaa9ac6236b0c08d6afc7a13e58361b90524cff6520a1ac6d422eea4fe40
+lib/codeql/swift/generated/Synth.qll 31e318c6e156848c85a2a2664695b48b5e93c57c9bb22fa29d027069907b3ab0 8655ffcf772f55284b93f1d7f8e1b3d497a9744d5f2e0c17bc322c1fdf8bdba8
 lib/codeql/swift/generated/SynthConstructors.qll 3e53c7853096020219c01dae85681fe80b34938d198a0ff359a209dda41c5ed7 3e53c7853096020219c01dae85681fe80b34938d198a0ff359a209dda41c5ed7
 lib/codeql/swift/generated/UnknownFile.qll 247ddf2ebb49ce5ed4bf7bf91a969ddff37de6c78d43d8affccaf7eb586e06f2 452b29f0465ef45e978ef8b647b75e5a2a1e53f2a568fc003bc8f52f73b3fa4d
 lib/codeql/swift/generated/UnknownLocation.qll d871000b4f53ffca4f67ea23ca5626e5dcce125d62a4d4b9969e08cc974af6fc b05971d7774e60790362fb810fb7086314f40a2de747b8cb1bc823ec6494a4dd
diff --git a/swift/ql/lib/CHANGELOG.md b/swift/ql/lib/CHANGELOG.md
index 07ce1b3e9de..d871246f42f 100644
--- a/swift/ql/lib/CHANGELOG.md
+++ b/swift/ql/lib/CHANGELOG.md
@@ -1,3 +1,17 @@
+## 2.0.3
+
+No user-facing changes.
+
+## 2.0.2
+
+No user-facing changes.
+
+## 2.0.1
+
+### Minor Analysis Improvements
+
+* All AST classes in `codeql.swift.elements` are now `final`, which means that it is no longer possible to `override` predicates defined in those classes (it is, however, still possible to `extend` the classes).
+
 ## 2.0.0
 
 ### Breaking Changes
diff --git a/swift/ql/lib/change-notes/2024-09-16-final-classes.md b/swift/ql/lib/change-notes/released/2.0.1.md
similarity index 83%
rename from swift/ql/lib/change-notes/2024-09-16-final-classes.md
rename to swift/ql/lib/change-notes/released/2.0.1.md
index 32f46efd979..ea35dc1370b 100644
--- a/swift/ql/lib/change-notes/2024-09-16-final-classes.md
+++ b/swift/ql/lib/change-notes/released/2.0.1.md
@@ -1,4 +1,5 @@
----
-category: minorAnalysis
----
+## 2.0.1
+
+### Minor Analysis Improvements
+
 * All AST classes in `codeql.swift.elements` are now `final`, which means that it is no longer possible to `override` predicates defined in those classes (it is, however, still possible to `extend` the classes).
diff --git a/swift/ql/lib/change-notes/released/2.0.2.md b/swift/ql/lib/change-notes/released/2.0.2.md
new file mode 100644
index 00000000000..862ef0e9df7
--- /dev/null
+++ b/swift/ql/lib/change-notes/released/2.0.2.md
@@ -0,0 +1,3 @@
+## 2.0.2
+
+No user-facing changes.
diff --git a/swift/ql/lib/change-notes/released/2.0.3.md b/swift/ql/lib/change-notes/released/2.0.3.md
new file mode 100644
index 00000000000..7bd669821d5
--- /dev/null
+++ b/swift/ql/lib/change-notes/released/2.0.3.md
@@ -0,0 +1,3 @@
+## 2.0.3
+
+No user-facing changes.
diff --git a/swift/ql/lib/codeql-pack.release.yml b/swift/ql/lib/codeql-pack.release.yml
index 0abe6ccede0..fabf1e86596 100644
--- a/swift/ql/lib/codeql-pack.release.yml
+++ b/swift/ql/lib/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 2.0.0
+lastReleaseVersion: 2.0.3
diff --git a/swift/ql/lib/codeql/swift/controlflow/internal/ControlFlowGraphImplSpecific.qll b/swift/ql/lib/codeql/swift/controlflow/internal/ControlFlowGraphImplSpecific.qll
index 07d3a0842c9..362537068a6 100644
--- a/swift/ql/lib/codeql/swift/controlflow/internal/ControlFlowGraphImplSpecific.qll
+++ b/swift/ql/lib/codeql/swift/controlflow/internal/ControlFlowGraphImplSpecific.qll
@@ -46,10 +46,6 @@ module CfgInput implements InputSig<Location> {
 
   CfgScope getCfgScope(AstNode n) { result = scopeOfAst(n.asAstNode()) }
 
-  class SplitKindBase = Splitting::TSplitKind;
-
-  class Split = Splitting::Split;
-
   class SuccessorType = Cfg::SuccessorType;
 
   /** Gets a successor type that matches completion `c`. */
@@ -88,4 +84,19 @@ module CfgInput implements InputSig<Location> {
   }
 }
 
-module CfgImpl = Make<Location, CfgInput>;
+private module CfgSplittingInput implements SplittingInputSig<Location, CfgInput> {
+  private import Splitting as S
+
+  class SplitKindBase = S::TSplitKind;
+
+  class Split = S::Split;
+}
+
+private module ConditionalCompletionSplittingInput implements
+  ConditionalCompletionSplittingInputSig<Location, CfgInput, CfgSplittingInput>
+{
+  import Splitting::ConditionalCompletionSplitting::ConditionalCompletionSplittingInput
+}
+
+module CfgImpl =
+  MakeWithSplitting<Location, CfgInput, CfgSplittingInput, ConditionalCompletionSplittingInput>;
diff --git a/swift/ql/lib/codeql/swift/controlflow/internal/Splitting.qll b/swift/ql/lib/codeql/swift/controlflow/internal/Splitting.qll
index dcc34ceb46b..ddf2f01a8d4 100644
--- a/swift/ql/lib/codeql/swift/controlflow/internal/Splitting.qll
+++ b/swift/ql/lib/codeql/swift/controlflow/internal/Splitting.qll
@@ -26,7 +26,7 @@ class Split extends TSplit {
   string toString() { none() }
 }
 
-private module ConditionalCompletionSplitting {
+module ConditionalCompletionSplitting {
   /** A split for conditional completions. */
   class ConditionalCompletionSplit extends Split, TConditionalCompletionSplit {
     ConditionalCompletion completion;
@@ -38,7 +38,7 @@ private module ConditionalCompletionSplitting {
     override string toString() { result = completion.toString() }
   }
 
-  private class ConditionalCompletionSplitKind extends SplitKind, TConditionalCompletionSplitKind {
+  private class ConditionalCompletionSplitKind_ extends SplitKind, TConditionalCompletionSplitKind {
     override int getListOrder() { result = 0 }
 
     override predicate isEnabled(ControlFlowElement n) { this.appliesTo(n) }
@@ -46,54 +46,44 @@ private module ConditionalCompletionSplitting {
     override string toString() { result = "ConditionalCompletion" }
   }
 
-  private class ConditionalCompletionSplitImpl extends SplitImpl instanceof ConditionalCompletionSplit
-  {
-    override ConditionalCompletionSplitKind getKind() { any() }
+  module ConditionalCompletionSplittingInput {
+    private import Completion as Comp
 
-    override predicate hasEntry(ControlFlowElement pred, ControlFlowElement succ, Completion c) {
-      succ(pred, succ, c) and
-      last(succ, _, super.getCompletion()) and
+    class ConditionalCompletion = Comp::ConditionalCompletion;
+
+    class ConditionalCompletionSplitKind extends ConditionalCompletionSplitKind_, TSplitKind { }
+
+    class ConditionalCompletionSplit = ConditionalCompletionSplitting::ConditionalCompletionSplit;
+
+    bindingset[parent, parentCompletion]
+    private predicate condPropagateAstExpr(
+      AstNode parent, ConditionalCompletion parentCompletion, AstNode child,
+      ConditionalCompletion childCompletion
+    ) {
+      child = parent.(NotExpr).getOperand().getFullyConverted() and
+      childCompletion.(BooleanCompletion).getDual() = parentCompletion
+      or
+      childCompletion = parentCompletion and
       (
-        astLast(succ.asAstNode().(NotExpr).getOperand().getFullyConverted(), pred, c) and
-        super.getCompletion().(BooleanCompletion).getDual() = c
+        child = parent.(LogicalAndExpr).getAnOperand().getFullyConverted()
         or
-        astLast(succ.asAstNode().(LogicalAndExpr).getAnOperand().getFullyConverted(), pred, c) and
-        super.getCompletion() = c
+        child = parent.(LogicalOrExpr).getAnOperand().getFullyConverted()
         or
-        astLast(succ.asAstNode().(LogicalOrExpr).getAnOperand().getFullyConverted(), pred, c) and
-        super.getCompletion() = c
+        child = parent.(IfExpr).getBranch(_).getFullyConverted()
         or
-        succ.asAstNode() =
-          any(IfExpr ce |
-            astLast(ce.getBranch(_).getFullyConverted(), pred, c) and
-            super.getCompletion() = c
-          )
-        or
-        exists(Expr e, Exprs::Conversions::ConversionOrIdentityTree conv |
-          succ.asAstNode() = conv.getAst() and
-          conv.convertsFrom(e) and
-          astLast(e, pred, c) and
-          super.getCompletion() = c
+        exists(Exprs::Conversions::ConversionOrIdentityTree conv |
+          parent = conv.getAst() and
+          conv.convertsFrom(child)
         )
       )
     }
 
-    override predicate hasEntryScope(CfgInput::CfgScope scope, ControlFlowElement succ) { none() }
-
-    override predicate hasExit(ControlFlowElement pred, ControlFlowElement succ, Completion c) {
-      this.appliesTo(pred) and
-      succ(pred, succ, c) and
-      if c instanceof ConditionalCompletion then super.getCompletion() = c else any()
-    }
-
-    override predicate hasExitScope(CfgInput::CfgScope scope, ControlFlowElement last, Completion c) {
-      this.appliesTo(last) and
-      succExit(scope, last, c) and
-      if c instanceof ConditionalCompletion then super.getCompletion() = c else any()
-    }
-
-    override predicate hasSuccessor(ControlFlowElement pred, ControlFlowElement succ, Completion c) {
-      none()
+    bindingset[parent, parentCompletion]
+    predicate condPropagateExpr(
+      ControlFlowElement parent, ConditionalCompletion parentCompletion, ControlFlowElement child,
+      ConditionalCompletion childCompletion
+    ) {
+      condPropagateAstExpr(parent.asAstNode(), parentCompletion, child.asAstNode(), childCompletion)
     }
   }
 }
diff --git a/swift/ql/lib/codeql/swift/dataflow/internal/DataFlowImpl1.qll b/swift/ql/lib/codeql/swift/dataflow/internal/DataFlowImpl1.qll
index 359fa71744b..17def0c431d 100644
--- a/swift/ql/lib/codeql/swift/dataflow/internal/DataFlowImpl1.qll
+++ b/swift/ql/lib/codeql/swift/dataflow/internal/DataFlowImpl1.qll
@@ -261,13 +261,17 @@ deprecated private module Config implements FullStateConfigSig {
     model = ""
   }
 
-  predicate isAdditionalFlowStep(Node node1, FlowState state1, Node node2, FlowState state2) {
+  predicate isAdditionalFlowStep(
+    Node node1, FlowState state1, Node node2, FlowState state2, string model
+  ) {
     getConfig(state1).isAdditionalFlowStep(node1, getState(state1), node2, getState(state2)) and
-    getConfig(state2) = getConfig(state1)
+    getConfig(state2) = getConfig(state1) and
+    model = ""
     or
     not singleConfiguration() and
     getConfig(state1).isAdditionalFlowStep(node1, node2) and
-    state2 = state1
+    state2 = state1 and
+    model = ""
   }
 
   predicate allowImplicitRead(Node node, ContentSet c) {
@@ -283,6 +287,8 @@ deprecated private module Config implements FullStateConfigSig {
   FlowFeature getAFeature() { result = any(Configuration config).getAFeature() }
 
   predicate includeHiddenNodes() { any(Configuration config).includeHiddenNodes() }
+
+  predicate observeDiffInformedIncrementalMode() { none() }
 }
 
 deprecated private import Impl<Config> as I
diff --git a/swift/ql/lib/codeql/swift/dataflow/internal/TaintTrackingPrivate.qll b/swift/ql/lib/codeql/swift/dataflow/internal/TaintTrackingPrivate.qll
index a6acdbc25ed..c3f14b03f83 100644
--- a/swift/ql/lib/codeql/swift/dataflow/internal/TaintTrackingPrivate.qll
+++ b/swift/ql/lib/codeql/swift/dataflow/internal/TaintTrackingPrivate.qll
@@ -99,3 +99,33 @@ private module Cached {
 }
 
 import Cached
+import SpeculativeTaintFlow
+
+private module SpeculativeTaintFlow {
+  private import codeql.swift.dataflow.internal.DataFlowDispatch as DataFlowDispatch
+  private import codeql.swift.dataflow.internal.DataFlowPublic as DataFlowPublic
+  private import codeql.swift.dataflow.internal.DataFlowPrivate as DataFlowPrivate
+
+  /**
+   * Holds if the additional step from `src` to `sink` should be considered in
+   * speculative taint flow exploration.
+   */
+  predicate speculativeTaintStep(DataFlow::Node src, DataFlow::Node sink) {
+    exists(DataFlowDispatch::DataFlowCall call, DataFlowDispatch::ArgumentPosition argpos |
+      // TODO: exclude neutrals and anything that has QL modeling.
+      not exists(DataFlowDispatch::viableCallable(call)) and
+      src.(DataFlowPrivate::ArgumentNode).argumentOf(call, argpos)
+    |
+      not argpos instanceof DataFlowDispatch::ThisArgumentPosition and
+      sink.(DataFlowPublic::PostUpdateNode)
+          .getPreUpdateNode()
+          .(DataFlowPrivate::ArgumentNode)
+          .argumentOf(call,
+            any(DataFlowDispatch::ArgumentPosition qualpos |
+              qualpos instanceof DataFlowDispatch::ThisArgumentPosition
+            ))
+      or
+      sink.(DataFlowPrivate::OutNode).getCall(_) = call
+    )
+  }
+}
diff --git a/swift/ql/lib/codeql/swift/generated/Synth.qll b/swift/ql/lib/codeql/swift/generated/Synth.qll
index 7d8c69f779d..44759bc72ea 100644
--- a/swift/ql/lib/codeql/swift/generated/Synth.qll
+++ b/swift/ql/lib/codeql/swift/generated/Synth.qll
@@ -7,7 +7,6 @@
 private import codeql.swift.generated.SynthConstructors
 private import codeql.swift.generated.Raw
 
-cached
 module Synth {
   /**
    * INTERNAL: Do not use.
@@ -1413,56 +1412,48 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TAvailabilityInfo`, if possible.
    */
-  cached
   TAvailabilityInfo convertAvailabilityInfoFromRaw(Raw::Element e) { result = TAvailabilityInfo(e) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TComment`, if possible.
    */
-  cached
   TComment convertCommentFromRaw(Raw::Element e) { result = TComment(e) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TDbFile`, if possible.
    */
-  cached
   TDbFile convertDbFileFromRaw(Raw::Element e) { result = TDbFile(e) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TDbLocation`, if possible.
    */
-  cached
   TDbLocation convertDbLocationFromRaw(Raw::Element e) { result = TDbLocation(e) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TDiagnostics`, if possible.
    */
-  cached
   TDiagnostics convertDiagnosticsFromRaw(Raw::Element e) { result = TDiagnostics(e) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TKeyPathComponent`, if possible.
    */
-  cached
   TKeyPathComponent convertKeyPathComponentFromRaw(Raw::Element e) { result = TKeyPathComponent(e) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TMacroRole`, if possible.
    */
-  cached
   TMacroRole convertMacroRoleFromRaw(Raw::Element e) { result = TMacroRole(e) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TOtherAvailabilitySpec`, if possible.
    */
-  cached
   TOtherAvailabilitySpec convertOtherAvailabilitySpecFromRaw(Raw::Element e) {
     result = TOtherAvailabilitySpec(e)
   }
@@ -1471,7 +1462,6 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TPlatformVersionAvailabilitySpec`, if possible.
    */
-  cached
   TPlatformVersionAvailabilitySpec convertPlatformVersionAvailabilitySpecFromRaw(Raw::Element e) {
     result = TPlatformVersionAvailabilitySpec(e)
   }
@@ -1480,21 +1470,18 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TUnknownFile`, if possible.
    */
-  cached
   TUnknownFile convertUnknownFileFromRaw(Raw::Element e) { none() }
 
   /**
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TUnknownLocation`, if possible.
    */
-  cached
   TUnknownLocation convertUnknownLocationFromRaw(Raw::Element e) { none() }
 
   /**
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TUnspecifiedElement`, if possible.
    */
-  cached
   TUnspecifiedElement convertUnspecifiedElementFromRaw(Raw::Element e) {
     result = TUnspecifiedElement(e)
   }
@@ -1503,14 +1490,12 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TAccessor`, if possible.
    */
-  cached
   TAccessor convertAccessorFromRaw(Raw::Element e) { result = TAccessor(e) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TAssociatedTypeDecl`, if possible.
    */
-  cached
   TAssociatedTypeDecl convertAssociatedTypeDeclFromRaw(Raw::Element e) {
     result = TAssociatedTypeDecl(e)
   }
@@ -1519,63 +1504,54 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TCapturedDecl`, if possible.
    */
-  cached
   TCapturedDecl convertCapturedDeclFromRaw(Raw::Element e) { result = TCapturedDecl(e) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TClassDecl`, if possible.
    */
-  cached
   TClassDecl convertClassDeclFromRaw(Raw::Element e) { result = TClassDecl(e) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TConcreteVarDecl`, if possible.
    */
-  cached
   TConcreteVarDecl convertConcreteVarDeclFromRaw(Raw::Element e) { result = TConcreteVarDecl(e) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TDeinitializer`, if possible.
    */
-  cached
   TDeinitializer convertDeinitializerFromRaw(Raw::Element e) { result = TDeinitializer(e) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TEnumCaseDecl`, if possible.
    */
-  cached
   TEnumCaseDecl convertEnumCaseDeclFromRaw(Raw::Element e) { result = TEnumCaseDecl(e) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TEnumDecl`, if possible.
    */
-  cached
   TEnumDecl convertEnumDeclFromRaw(Raw::Element e) { result = TEnumDecl(e) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TEnumElementDecl`, if possible.
    */
-  cached
   TEnumElementDecl convertEnumElementDeclFromRaw(Raw::Element e) { result = TEnumElementDecl(e) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TExtensionDecl`, if possible.
    */
-  cached
   TExtensionDecl convertExtensionDeclFromRaw(Raw::Element e) { result = TExtensionDecl(e) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TGenericTypeParamDecl`, if possible.
    */
-  cached
   TGenericTypeParamDecl convertGenericTypeParamDeclFromRaw(Raw::Element e) {
     result = TGenericTypeParamDecl(e)
   }
@@ -1584,21 +1560,18 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TIfConfigDecl`, if possible.
    */
-  cached
   TIfConfigDecl convertIfConfigDeclFromRaw(Raw::Element e) { result = TIfConfigDecl(e) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TImportDecl`, if possible.
    */
-  cached
   TImportDecl convertImportDeclFromRaw(Raw::Element e) { result = TImportDecl(e) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TInfixOperatorDecl`, if possible.
    */
-  cached
   TInfixOperatorDecl convertInfixOperatorDeclFromRaw(Raw::Element e) {
     result = TInfixOperatorDecl(e)
   }
@@ -1607,21 +1580,18 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TInitializer`, if possible.
    */
-  cached
   TInitializer convertInitializerFromRaw(Raw::Element e) { result = TInitializer(e) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TMacroDecl`, if possible.
    */
-  cached
   TMacroDecl convertMacroDeclFromRaw(Raw::Element e) { result = TMacroDecl(e) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TMissingMemberDecl`, if possible.
    */
-  cached
   TMissingMemberDecl convertMissingMemberDeclFromRaw(Raw::Element e) {
     result = TMissingMemberDecl(e)
   }
@@ -1630,35 +1600,30 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TModuleDecl`, if possible.
    */
-  cached
   TModuleDecl convertModuleDeclFromRaw(Raw::Element e) { result = TModuleDecl(e) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TNamedFunction`, if possible.
    */
-  cached
   TNamedFunction convertNamedFunctionFromRaw(Raw::Element e) { result = TNamedFunction(e) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TOpaqueTypeDecl`, if possible.
    */
-  cached
   TOpaqueTypeDecl convertOpaqueTypeDeclFromRaw(Raw::Element e) { result = TOpaqueTypeDecl(e) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TParamDecl`, if possible.
    */
-  cached
   TParamDecl convertParamDeclFromRaw(Raw::Element e) { result = TParamDecl(e) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TPatternBindingDecl`, if possible.
    */
-  cached
   TPatternBindingDecl convertPatternBindingDeclFromRaw(Raw::Element e) {
     result = TPatternBindingDecl(e)
   }
@@ -1667,7 +1632,6 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TPostfixOperatorDecl`, if possible.
    */
-  cached
   TPostfixOperatorDecl convertPostfixOperatorDeclFromRaw(Raw::Element e) {
     result = TPostfixOperatorDecl(e)
   }
@@ -1676,7 +1640,6 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TPoundDiagnosticDecl`, if possible.
    */
-  cached
   TPoundDiagnosticDecl convertPoundDiagnosticDeclFromRaw(Raw::Element e) {
     result = TPoundDiagnosticDecl(e)
   }
@@ -1685,7 +1648,6 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TPrecedenceGroupDecl`, if possible.
    */
-  cached
   TPrecedenceGroupDecl convertPrecedenceGroupDeclFromRaw(Raw::Element e) {
     result = TPrecedenceGroupDecl(e)
   }
@@ -1694,7 +1656,6 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TPrefixOperatorDecl`, if possible.
    */
-  cached
   TPrefixOperatorDecl convertPrefixOperatorDeclFromRaw(Raw::Element e) {
     result = TPrefixOperatorDecl(e)
   }
@@ -1703,42 +1664,36 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TProtocolDecl`, if possible.
    */
-  cached
   TProtocolDecl convertProtocolDeclFromRaw(Raw::Element e) { result = TProtocolDecl(e) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TStructDecl`, if possible.
    */
-  cached
   TStructDecl convertStructDeclFromRaw(Raw::Element e) { result = TStructDecl(e) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TSubscriptDecl`, if possible.
    */
-  cached
   TSubscriptDecl convertSubscriptDeclFromRaw(Raw::Element e) { result = TSubscriptDecl(e) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TTopLevelCodeDecl`, if possible.
    */
-  cached
   TTopLevelCodeDecl convertTopLevelCodeDeclFromRaw(Raw::Element e) { result = TTopLevelCodeDecl(e) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TTypeAliasDecl`, if possible.
    */
-  cached
   TTypeAliasDecl convertTypeAliasDeclFromRaw(Raw::Element e) { result = TTypeAliasDecl(e) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TAbiSafeConversionExpr`, if possible.
    */
-  cached
   TAbiSafeConversionExpr convertAbiSafeConversionExprFromRaw(Raw::Element e) {
     result = TAbiSafeConversionExpr(e)
   }
@@ -1747,7 +1702,6 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TAnyHashableErasureExpr`, if possible.
    */
-  cached
   TAnyHashableErasureExpr convertAnyHashableErasureExprFromRaw(Raw::Element e) {
     result = TAnyHashableErasureExpr(e)
   }
@@ -1756,7 +1710,6 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TAppliedPropertyWrapperExpr`, if possible.
    */
-  cached
   TAppliedPropertyWrapperExpr convertAppliedPropertyWrapperExprFromRaw(Raw::Element e) {
     result = TAppliedPropertyWrapperExpr(e)
   }
@@ -1765,7 +1718,6 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TArchetypeToSuperExpr`, if possible.
    */
-  cached
   TArchetypeToSuperExpr convertArchetypeToSuperExprFromRaw(Raw::Element e) {
     result = TArchetypeToSuperExpr(e)
   }
@@ -1774,21 +1726,18 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TArgument`, if possible.
    */
-  cached
   TArgument convertArgumentFromRaw(Raw::Element e) { result = TArgument(e) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TArrayExpr`, if possible.
    */
-  cached
   TArrayExpr convertArrayExprFromRaw(Raw::Element e) { result = TArrayExpr(e) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TArrayToPointerExpr`, if possible.
    */
-  cached
   TArrayToPointerExpr convertArrayToPointerExprFromRaw(Raw::Element e) {
     result = TArrayToPointerExpr(e)
   }
@@ -1797,42 +1746,36 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TAssignExpr`, if possible.
    */
-  cached
   TAssignExpr convertAssignExprFromRaw(Raw::Element e) { result = TAssignExpr(e) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TAutoClosureExpr`, if possible.
    */
-  cached
   TAutoClosureExpr convertAutoClosureExprFromRaw(Raw::Element e) { result = TAutoClosureExpr(e) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TAwaitExpr`, if possible.
    */
-  cached
   TAwaitExpr convertAwaitExprFromRaw(Raw::Element e) { result = TAwaitExpr(e) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TBinaryExpr`, if possible.
    */
-  cached
   TBinaryExpr convertBinaryExprFromRaw(Raw::Element e) { result = TBinaryExpr(e) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TBindOptionalExpr`, if possible.
    */
-  cached
   TBindOptionalExpr convertBindOptionalExprFromRaw(Raw::Element e) { result = TBindOptionalExpr(e) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TBooleanLiteralExpr`, if possible.
    */
-  cached
   TBooleanLiteralExpr convertBooleanLiteralExprFromRaw(Raw::Element e) {
     result = TBooleanLiteralExpr(e)
   }
@@ -1841,14 +1784,12 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TBorrowExpr`, if possible.
    */
-  cached
   TBorrowExpr convertBorrowExprFromRaw(Raw::Element e) { result = TBorrowExpr(e) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TBridgeFromObjCExpr`, if possible.
    */
-  cached
   TBridgeFromObjCExpr convertBridgeFromObjCExprFromRaw(Raw::Element e) {
     result = TBridgeFromObjCExpr(e)
   }
@@ -1857,28 +1798,24 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TBridgeToObjCExpr`, if possible.
    */
-  cached
   TBridgeToObjCExpr convertBridgeToObjCExprFromRaw(Raw::Element e) { result = TBridgeToObjCExpr(e) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TCallExpr`, if possible.
    */
-  cached
   TCallExpr convertCallExprFromRaw(Raw::Element e) { result = TCallExpr(e) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TCaptureListExpr`, if possible.
    */
-  cached
   TCaptureListExpr convertCaptureListExprFromRaw(Raw::Element e) { result = TCaptureListExpr(e) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TClassMetatypeToObjectExpr`, if possible.
    */
-  cached
   TClassMetatypeToObjectExpr convertClassMetatypeToObjectExprFromRaw(Raw::Element e) {
     result = TClassMetatypeToObjectExpr(e)
   }
@@ -1887,14 +1824,12 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TCoerceExpr`, if possible.
    */
-  cached
   TCoerceExpr convertCoerceExprFromRaw(Raw::Element e) { result = TCoerceExpr(e) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TCollectionUpcastConversionExpr`, if possible.
    */
-  cached
   TCollectionUpcastConversionExpr convertCollectionUpcastConversionExprFromRaw(Raw::Element e) {
     result = TCollectionUpcastConversionExpr(e)
   }
@@ -1903,7 +1838,6 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TConditionalBridgeFromObjCExpr`, if possible.
    */
-  cached
   TConditionalBridgeFromObjCExpr convertConditionalBridgeFromObjCExprFromRaw(Raw::Element e) {
     result = TConditionalBridgeFromObjCExpr(e)
   }
@@ -1912,7 +1846,6 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TConditionalCheckedCastExpr`, if possible.
    */
-  cached
   TConditionalCheckedCastExpr convertConditionalCheckedCastExprFromRaw(Raw::Element e) {
     result = TConditionalCheckedCastExpr(e)
   }
@@ -1921,21 +1854,18 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TConsumeExpr`, if possible.
    */
-  cached
   TConsumeExpr convertConsumeExprFromRaw(Raw::Element e) { result = TConsumeExpr(e) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TCopyExpr`, if possible.
    */
-  cached
   TCopyExpr convertCopyExprFromRaw(Raw::Element e) { result = TCopyExpr(e) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TCovariantFunctionConversionExpr`, if possible.
    */
-  cached
   TCovariantFunctionConversionExpr convertCovariantFunctionConversionExprFromRaw(Raw::Element e) {
     result = TCovariantFunctionConversionExpr(e)
   }
@@ -1944,7 +1874,6 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TCovariantReturnConversionExpr`, if possible.
    */
-  cached
   TCovariantReturnConversionExpr convertCovariantReturnConversionExprFromRaw(Raw::Element e) {
     result = TCovariantReturnConversionExpr(e)
   }
@@ -1953,14 +1882,12 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TDeclRefExpr`, if possible.
    */
-  cached
   TDeclRefExpr convertDeclRefExprFromRaw(Raw::Element e) { result = TDeclRefExpr(e) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TDefaultArgumentExpr`, if possible.
    */
-  cached
   TDefaultArgumentExpr convertDefaultArgumentExprFromRaw(Raw::Element e) {
     result = TDefaultArgumentExpr(e)
   }
@@ -1969,7 +1896,6 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TDerivedToBaseExpr`, if possible.
    */
-  cached
   TDerivedToBaseExpr convertDerivedToBaseExprFromRaw(Raw::Element e) {
     result = TDerivedToBaseExpr(e)
   }
@@ -1978,7 +1904,6 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TDestructureTupleExpr`, if possible.
    */
-  cached
   TDestructureTupleExpr convertDestructureTupleExprFromRaw(Raw::Element e) {
     result = TDestructureTupleExpr(e)
   }
@@ -1987,14 +1912,12 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TDictionaryExpr`, if possible.
    */
-  cached
   TDictionaryExpr convertDictionaryExprFromRaw(Raw::Element e) { result = TDictionaryExpr(e) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TDifferentiableFunctionExpr`, if possible.
    */
-  cached
   TDifferentiableFunctionExpr convertDifferentiableFunctionExprFromRaw(Raw::Element e) {
     result = TDifferentiableFunctionExpr(e)
   }
@@ -2003,7 +1926,6 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TDifferentiableFunctionExtractOriginalExpr`, if possible.
    */
-  cached
   TDifferentiableFunctionExtractOriginalExpr convertDifferentiableFunctionExtractOriginalExprFromRaw(
     Raw::Element e
   ) {
@@ -2014,7 +1936,6 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TDiscardAssignmentExpr`, if possible.
    */
-  cached
   TDiscardAssignmentExpr convertDiscardAssignmentExprFromRaw(Raw::Element e) {
     result = TDiscardAssignmentExpr(e)
   }
@@ -2023,14 +1944,12 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TDotSelfExpr`, if possible.
    */
-  cached
   TDotSelfExpr convertDotSelfExprFromRaw(Raw::Element e) { result = TDotSelfExpr(e) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TDotSyntaxBaseIgnoredExpr`, if possible.
    */
-  cached
   TDotSyntaxBaseIgnoredExpr convertDotSyntaxBaseIgnoredExprFromRaw(Raw::Element e) {
     result = TDotSyntaxBaseIgnoredExpr(e)
   }
@@ -2039,7 +1958,6 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TDotSyntaxCallExpr`, if possible.
    */
-  cached
   TDotSyntaxCallExpr convertDotSyntaxCallExprFromRaw(Raw::Element e) {
     result = TDotSyntaxCallExpr(e)
   }
@@ -2048,7 +1966,6 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TDynamicMemberRefExpr`, if possible.
    */
-  cached
   TDynamicMemberRefExpr convertDynamicMemberRefExprFromRaw(Raw::Element e) {
     result = TDynamicMemberRefExpr(e)
   }
@@ -2057,7 +1974,6 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TDynamicSubscriptExpr`, if possible.
    */
-  cached
   TDynamicSubscriptExpr convertDynamicSubscriptExprFromRaw(Raw::Element e) {
     result = TDynamicSubscriptExpr(e)
   }
@@ -2066,35 +1982,30 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TDynamicTypeExpr`, if possible.
    */
-  cached
   TDynamicTypeExpr convertDynamicTypeExprFromRaw(Raw::Element e) { result = TDynamicTypeExpr(e) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TEnumIsCaseExpr`, if possible.
    */
-  cached
   TEnumIsCaseExpr convertEnumIsCaseExprFromRaw(Raw::Element e) { result = TEnumIsCaseExpr(e) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TErasureExpr`, if possible.
    */
-  cached
   TErasureExpr convertErasureExprFromRaw(Raw::Element e) { result = TErasureExpr(e) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TErrorExpr`, if possible.
    */
-  cached
   TErrorExpr convertErrorExprFromRaw(Raw::Element e) { result = TErrorExpr(e) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TExistentialMetatypeToObjectExpr`, if possible.
    */
-  cached
   TExistentialMetatypeToObjectExpr convertExistentialMetatypeToObjectExprFromRaw(Raw::Element e) {
     result = TExistentialMetatypeToObjectExpr(e)
   }
@@ -2103,7 +2014,6 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TExplicitClosureExpr`, if possible.
    */
-  cached
   TExplicitClosureExpr convertExplicitClosureExprFromRaw(Raw::Element e) {
     result = TExplicitClosureExpr(e)
   }
@@ -2112,28 +2022,24 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TFloatLiteralExpr`, if possible.
    */
-  cached
   TFloatLiteralExpr convertFloatLiteralExprFromRaw(Raw::Element e) { result = TFloatLiteralExpr(e) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TForceTryExpr`, if possible.
    */
-  cached
   TForceTryExpr convertForceTryExprFromRaw(Raw::Element e) { result = TForceTryExpr(e) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TForceValueExpr`, if possible.
    */
-  cached
   TForceValueExpr convertForceValueExprFromRaw(Raw::Element e) { result = TForceValueExpr(e) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TForcedCheckedCastExpr`, if possible.
    */
-  cached
   TForcedCheckedCastExpr convertForcedCheckedCastExprFromRaw(Raw::Element e) {
     result = TForcedCheckedCastExpr(e)
   }
@@ -2142,7 +2048,6 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TForeignObjectConversionExpr`, if possible.
    */
-  cached
   TForeignObjectConversionExpr convertForeignObjectConversionExprFromRaw(Raw::Element e) {
     result = TForeignObjectConversionExpr(e)
   }
@@ -2151,7 +2056,6 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TFunctionConversionExpr`, if possible.
    */
-  cached
   TFunctionConversionExpr convertFunctionConversionExprFromRaw(Raw::Element e) {
     result = TFunctionConversionExpr(e)
   }
@@ -2160,21 +2064,18 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TIfExpr`, if possible.
    */
-  cached
   TIfExpr convertIfExprFromRaw(Raw::Element e) { result = TIfExpr(e) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TInOutExpr`, if possible.
    */
-  cached
   TInOutExpr convertInOutExprFromRaw(Raw::Element e) { result = TInOutExpr(e) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TInOutToPointerExpr`, if possible.
    */
-  cached
   TInOutToPointerExpr convertInOutToPointerExprFromRaw(Raw::Element e) {
     result = TInOutToPointerExpr(e)
   }
@@ -2183,7 +2084,6 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TInitializerRefCallExpr`, if possible.
    */
-  cached
   TInitializerRefCallExpr convertInitializerRefCallExprFromRaw(Raw::Element e) {
     result = TInitializerRefCallExpr(e)
   }
@@ -2192,7 +2092,6 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TInjectIntoOptionalExpr`, if possible.
    */
-  cached
   TInjectIntoOptionalExpr convertInjectIntoOptionalExprFromRaw(Raw::Element e) {
     result = TInjectIntoOptionalExpr(e)
   }
@@ -2201,7 +2100,6 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TIntegerLiteralExpr`, if possible.
    */
-  cached
   TIntegerLiteralExpr convertIntegerLiteralExprFromRaw(Raw::Element e) {
     result = TIntegerLiteralExpr(e)
   }
@@ -2210,7 +2108,6 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TInterpolatedStringLiteralExpr`, if possible.
    */
-  cached
   TInterpolatedStringLiteralExpr convertInterpolatedStringLiteralExprFromRaw(Raw::Element e) {
     result = TInterpolatedStringLiteralExpr(e)
   }
@@ -2219,14 +2116,12 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TIsExpr`, if possible.
    */
-  cached
   TIsExpr convertIsExprFromRaw(Raw::Element e) { result = TIsExpr(e) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TKeyPathApplicationExpr`, if possible.
    */
-  cached
   TKeyPathApplicationExpr convertKeyPathApplicationExprFromRaw(Raw::Element e) {
     result = TKeyPathApplicationExpr(e)
   }
@@ -2235,21 +2130,18 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TKeyPathDotExpr`, if possible.
    */
-  cached
   TKeyPathDotExpr convertKeyPathDotExprFromRaw(Raw::Element e) { result = TKeyPathDotExpr(e) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TKeyPathExpr`, if possible.
    */
-  cached
   TKeyPathExpr convertKeyPathExprFromRaw(Raw::Element e) { result = TKeyPathExpr(e) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TLazyInitializationExpr`, if possible.
    */
-  cached
   TLazyInitializationExpr convertLazyInitializationExprFromRaw(Raw::Element e) {
     result = TLazyInitializationExpr(e)
   }
@@ -2258,7 +2150,6 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TLinearFunctionExpr`, if possible.
    */
-  cached
   TLinearFunctionExpr convertLinearFunctionExprFromRaw(Raw::Element e) {
     result = TLinearFunctionExpr(e)
   }
@@ -2267,7 +2158,6 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TLinearFunctionExtractOriginalExpr`, if possible.
    */
-  cached
   TLinearFunctionExtractOriginalExpr convertLinearFunctionExtractOriginalExprFromRaw(Raw::Element e) {
     result = TLinearFunctionExtractOriginalExpr(e)
   }
@@ -2276,7 +2166,6 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TLinearToDifferentiableFunctionExpr`, if possible.
    */
-  cached
   TLinearToDifferentiableFunctionExpr convertLinearToDifferentiableFunctionExprFromRaw(
     Raw::Element e
   ) {
@@ -2287,14 +2176,12 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TLoadExpr`, if possible.
    */
-  cached
   TLoadExpr convertLoadExprFromRaw(Raw::Element e) { result = TLoadExpr(e) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TMagicIdentifierLiteralExpr`, if possible.
    */
-  cached
   TMagicIdentifierLiteralExpr convertMagicIdentifierLiteralExprFromRaw(Raw::Element e) {
     result = TMagicIdentifierLiteralExpr(e)
   }
@@ -2303,7 +2190,6 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TMakeTemporarilyEscapableExpr`, if possible.
    */
-  cached
   TMakeTemporarilyEscapableExpr convertMakeTemporarilyEscapableExprFromRaw(Raw::Element e) {
     result = TMakeTemporarilyEscapableExpr(e)
   }
@@ -2312,7 +2198,6 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TMaterializePackExpr`, if possible.
    */
-  cached
   TMaterializePackExpr convertMaterializePackExprFromRaw(Raw::Element e) {
     result = TMaterializePackExpr(e)
   }
@@ -2321,14 +2206,12 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TMemberRefExpr`, if possible.
    */
-  cached
   TMemberRefExpr convertMemberRefExprFromRaw(Raw::Element e) { result = TMemberRefExpr(e) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TMetatypeConversionExpr`, if possible.
    */
-  cached
   TMetatypeConversionExpr convertMetatypeConversionExprFromRaw(Raw::Element e) {
     result = TMetatypeConversionExpr(e)
   }
@@ -2337,28 +2220,24 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TMethodLookupExpr`, if possible.
    */
-  cached
   TMethodLookupExpr convertMethodLookupExprFromRaw(Raw::Element e) { result = TMethodLookupExpr(e) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TNilLiteralExpr`, if possible.
    */
-  cached
   TNilLiteralExpr convertNilLiteralExprFromRaw(Raw::Element e) { result = TNilLiteralExpr(e) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TObjCSelectorExpr`, if possible.
    */
-  cached
   TObjCSelectorExpr convertObjCSelectorExprFromRaw(Raw::Element e) { result = TObjCSelectorExpr(e) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TObjectLiteralExpr`, if possible.
    */
-  cached
   TObjectLiteralExpr convertObjectLiteralExprFromRaw(Raw::Element e) {
     result = TObjectLiteralExpr(e)
   }
@@ -2367,21 +2246,18 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TOneWayExpr`, if possible.
    */
-  cached
   TOneWayExpr convertOneWayExprFromRaw(Raw::Element e) { result = TOneWayExpr(e) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TOpaqueValueExpr`, if possible.
    */
-  cached
   TOpaqueValueExpr convertOpaqueValueExprFromRaw(Raw::Element e) { result = TOpaqueValueExpr(e) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TOpenExistentialExpr`, if possible.
    */
-  cached
   TOpenExistentialExpr convertOpenExistentialExprFromRaw(Raw::Element e) {
     result = TOpenExistentialExpr(e)
   }
@@ -2390,7 +2266,6 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TOptionalEvaluationExpr`, if possible.
    */
-  cached
   TOptionalEvaluationExpr convertOptionalEvaluationExprFromRaw(Raw::Element e) {
     result = TOptionalEvaluationExpr(e)
   }
@@ -2399,14 +2274,12 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TOptionalTryExpr`, if possible.
    */
-  cached
   TOptionalTryExpr convertOptionalTryExprFromRaw(Raw::Element e) { result = TOptionalTryExpr(e) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TOtherInitializerRefExpr`, if possible.
    */
-  cached
   TOtherInitializerRefExpr convertOtherInitializerRefExprFromRaw(Raw::Element e) {
     result = TOtherInitializerRefExpr(e)
   }
@@ -2415,7 +2288,6 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TOverloadedDeclRefExpr`, if possible.
    */
-  cached
   TOverloadedDeclRefExpr convertOverloadedDeclRefExprFromRaw(Raw::Element e) {
     result = TOverloadedDeclRefExpr(e)
   }
@@ -2424,14 +2296,12 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TPackElementExpr`, if possible.
    */
-  cached
   TPackElementExpr convertPackElementExprFromRaw(Raw::Element e) { result = TPackElementExpr(e) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TPackExpansionExpr`, if possible.
    */
-  cached
   TPackExpansionExpr convertPackExpansionExprFromRaw(Raw::Element e) {
     result = TPackExpansionExpr(e)
   }
@@ -2440,14 +2310,12 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TParenExpr`, if possible.
    */
-  cached
   TParenExpr convertParenExprFromRaw(Raw::Element e) { result = TParenExpr(e) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TPointerToPointerExpr`, if possible.
    */
-  cached
   TPointerToPointerExpr convertPointerToPointerExprFromRaw(Raw::Element e) {
     result = TPointerToPointerExpr(e)
   }
@@ -2456,21 +2324,18 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TPostfixUnaryExpr`, if possible.
    */
-  cached
   TPostfixUnaryExpr convertPostfixUnaryExprFromRaw(Raw::Element e) { result = TPostfixUnaryExpr(e) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TPrefixUnaryExpr`, if possible.
    */
-  cached
   TPrefixUnaryExpr convertPrefixUnaryExprFromRaw(Raw::Element e) { result = TPrefixUnaryExpr(e) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TPropertyWrapperValuePlaceholderExpr`, if possible.
    */
-  cached
   TPropertyWrapperValuePlaceholderExpr convertPropertyWrapperValuePlaceholderExprFromRaw(
     Raw::Element e
   ) {
@@ -2481,7 +2346,6 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TProtocolMetatypeToObjectExpr`, if possible.
    */
-  cached
   TProtocolMetatypeToObjectExpr convertProtocolMetatypeToObjectExprFromRaw(Raw::Element e) {
     result = TProtocolMetatypeToObjectExpr(e)
   }
@@ -2490,7 +2354,6 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TRebindSelfInInitializerExpr`, if possible.
    */
-  cached
   TRebindSelfInInitializerExpr convertRebindSelfInInitializerExprFromRaw(Raw::Element e) {
     result = TRebindSelfInInitializerExpr(e)
   }
@@ -2499,21 +2362,18 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TRegexLiteralExpr`, if possible.
    */
-  cached
   TRegexLiteralExpr convertRegexLiteralExprFromRaw(Raw::Element e) { result = TRegexLiteralExpr(e) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TSequenceExpr`, if possible.
    */
-  cached
   TSequenceExpr convertSequenceExprFromRaw(Raw::Element e) { result = TSequenceExpr(e) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TSingleValueStmtExpr`, if possible.
    */
-  cached
   TSingleValueStmtExpr convertSingleValueStmtExprFromRaw(Raw::Element e) {
     result = TSingleValueStmtExpr(e)
   }
@@ -2522,7 +2382,6 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TStringLiteralExpr`, if possible.
    */
-  cached
   TStringLiteralExpr convertStringLiteralExprFromRaw(Raw::Element e) {
     result = TStringLiteralExpr(e)
   }
@@ -2531,7 +2390,6 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TStringToPointerExpr`, if possible.
    */
-  cached
   TStringToPointerExpr convertStringToPointerExprFromRaw(Raw::Element e) {
     result = TStringToPointerExpr(e)
   }
@@ -2540,56 +2398,48 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TSubscriptExpr`, if possible.
    */
-  cached
   TSubscriptExpr convertSubscriptExprFromRaw(Raw::Element e) { result = TSubscriptExpr(e) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TSuperRefExpr`, if possible.
    */
-  cached
   TSuperRefExpr convertSuperRefExprFromRaw(Raw::Element e) { result = TSuperRefExpr(e) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TTapExpr`, if possible.
    */
-  cached
   TTapExpr convertTapExprFromRaw(Raw::Element e) { result = TTapExpr(e) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TTryExpr`, if possible.
    */
-  cached
   TTryExpr convertTryExprFromRaw(Raw::Element e) { result = TTryExpr(e) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TTupleElementExpr`, if possible.
    */
-  cached
   TTupleElementExpr convertTupleElementExprFromRaw(Raw::Element e) { result = TTupleElementExpr(e) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TTupleExpr`, if possible.
    */
-  cached
   TTupleExpr convertTupleExprFromRaw(Raw::Element e) { result = TTupleExpr(e) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TTypeExpr`, if possible.
    */
-  cached
   TTypeExpr convertTypeExprFromRaw(Raw::Element e) { result = TTypeExpr(e) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TUnderlyingToOpaqueExpr`, if possible.
    */
-  cached
   TUnderlyingToOpaqueExpr convertUnderlyingToOpaqueExprFromRaw(Raw::Element e) {
     result = TUnderlyingToOpaqueExpr(e)
   }
@@ -2598,7 +2448,6 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TUnevaluatedInstanceExpr`, if possible.
    */
-  cached
   TUnevaluatedInstanceExpr convertUnevaluatedInstanceExprFromRaw(Raw::Element e) {
     result = TUnevaluatedInstanceExpr(e)
   }
@@ -2607,7 +2456,6 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TUnresolvedDeclRefExpr`, if possible.
    */
-  cached
   TUnresolvedDeclRefExpr convertUnresolvedDeclRefExprFromRaw(Raw::Element e) {
     result = TUnresolvedDeclRefExpr(e)
   }
@@ -2616,7 +2464,6 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TUnresolvedDotExpr`, if possible.
    */
-  cached
   TUnresolvedDotExpr convertUnresolvedDotExprFromRaw(Raw::Element e) {
     result = TUnresolvedDotExpr(e)
   }
@@ -2625,7 +2472,6 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TUnresolvedMemberChainResultExpr`, if possible.
    */
-  cached
   TUnresolvedMemberChainResultExpr convertUnresolvedMemberChainResultExprFromRaw(Raw::Element e) {
     result = TUnresolvedMemberChainResultExpr(e)
   }
@@ -2634,7 +2480,6 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TUnresolvedMemberExpr`, if possible.
    */
-  cached
   TUnresolvedMemberExpr convertUnresolvedMemberExprFromRaw(Raw::Element e) {
     result = TUnresolvedMemberExpr(e)
   }
@@ -2643,7 +2488,6 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TUnresolvedPatternExpr`, if possible.
    */
-  cached
   TUnresolvedPatternExpr convertUnresolvedPatternExprFromRaw(Raw::Element e) {
     result = TUnresolvedPatternExpr(e)
   }
@@ -2652,7 +2496,6 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TUnresolvedSpecializeExpr`, if possible.
    */
-  cached
   TUnresolvedSpecializeExpr convertUnresolvedSpecializeExprFromRaw(Raw::Element e) {
     result = TUnresolvedSpecializeExpr(e)
   }
@@ -2661,7 +2504,6 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TUnresolvedTypeConversionExpr`, if possible.
    */
-  cached
   TUnresolvedTypeConversionExpr convertUnresolvedTypeConversionExprFromRaw(Raw::Element e) {
     result = TUnresolvedTypeConversionExpr(e)
   }
@@ -2670,7 +2512,6 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TVarargExpansionExpr`, if possible.
    */
-  cached
   TVarargExpansionExpr convertVarargExpansionExprFromRaw(Raw::Element e) {
     result = TVarargExpansionExpr(e)
   }
@@ -2679,28 +2520,24 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TAnyPattern`, if possible.
    */
-  cached
   TAnyPattern convertAnyPatternFromRaw(Raw::Element e) { result = TAnyPattern(e) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TBindingPattern`, if possible.
    */
-  cached
   TBindingPattern convertBindingPatternFromRaw(Raw::Element e) { result = TBindingPattern(e) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TBoolPattern`, if possible.
    */
-  cached
   TBoolPattern convertBoolPatternFromRaw(Raw::Element e) { result = TBoolPattern(e) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TEnumElementPattern`, if possible.
    */
-  cached
   TEnumElementPattern convertEnumElementPatternFromRaw(Raw::Element e) {
     result = TEnumElementPattern(e)
   }
@@ -2709,28 +2546,24 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TExprPattern`, if possible.
    */
-  cached
   TExprPattern convertExprPatternFromRaw(Raw::Element e) { result = TExprPattern(e) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TIsPattern`, if possible.
    */
-  cached
   TIsPattern convertIsPatternFromRaw(Raw::Element e) { result = TIsPattern(e) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TNamedPattern`, if possible.
    */
-  cached
   TNamedPattern convertNamedPatternFromRaw(Raw::Element e) { result = TNamedPattern(e) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TOptionalSomePattern`, if possible.
    */
-  cached
   TOptionalSomePattern convertOptionalSomePatternFromRaw(Raw::Element e) {
     result = TOptionalSomePattern(e)
   }
@@ -2739,203 +2572,174 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TParenPattern`, if possible.
    */
-  cached
   TParenPattern convertParenPatternFromRaw(Raw::Element e) { result = TParenPattern(e) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TTuplePattern`, if possible.
    */
-  cached
   TTuplePattern convertTuplePatternFromRaw(Raw::Element e) { result = TTuplePattern(e) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TTypedPattern`, if possible.
    */
-  cached
   TTypedPattern convertTypedPatternFromRaw(Raw::Element e) { result = TTypedPattern(e) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TBraceStmt`, if possible.
    */
-  cached
   TBraceStmt convertBraceStmtFromRaw(Raw::Element e) { result = TBraceStmt(e) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TBreakStmt`, if possible.
    */
-  cached
   TBreakStmt convertBreakStmtFromRaw(Raw::Element e) { result = TBreakStmt(e) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TCaseLabelItem`, if possible.
    */
-  cached
   TCaseLabelItem convertCaseLabelItemFromRaw(Raw::Element e) { result = TCaseLabelItem(e) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TCaseStmt`, if possible.
    */
-  cached
   TCaseStmt convertCaseStmtFromRaw(Raw::Element e) { result = TCaseStmt(e) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TConditionElement`, if possible.
    */
-  cached
   TConditionElement convertConditionElementFromRaw(Raw::Element e) { result = TConditionElement(e) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TContinueStmt`, if possible.
    */
-  cached
   TContinueStmt convertContinueStmtFromRaw(Raw::Element e) { result = TContinueStmt(e) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TDeferStmt`, if possible.
    */
-  cached
   TDeferStmt convertDeferStmtFromRaw(Raw::Element e) { result = TDeferStmt(e) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TDiscardStmt`, if possible.
    */
-  cached
   TDiscardStmt convertDiscardStmtFromRaw(Raw::Element e) { result = TDiscardStmt(e) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TDoCatchStmt`, if possible.
    */
-  cached
   TDoCatchStmt convertDoCatchStmtFromRaw(Raw::Element e) { result = TDoCatchStmt(e) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TDoStmt`, if possible.
    */
-  cached
   TDoStmt convertDoStmtFromRaw(Raw::Element e) { result = TDoStmt(e) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TFailStmt`, if possible.
    */
-  cached
   TFailStmt convertFailStmtFromRaw(Raw::Element e) { result = TFailStmt(e) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TFallthroughStmt`, if possible.
    */
-  cached
   TFallthroughStmt convertFallthroughStmtFromRaw(Raw::Element e) { result = TFallthroughStmt(e) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TForEachStmt`, if possible.
    */
-  cached
   TForEachStmt convertForEachStmtFromRaw(Raw::Element e) { result = TForEachStmt(e) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TGuardStmt`, if possible.
    */
-  cached
   TGuardStmt convertGuardStmtFromRaw(Raw::Element e) { result = TGuardStmt(e) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TIfStmt`, if possible.
    */
-  cached
   TIfStmt convertIfStmtFromRaw(Raw::Element e) { result = TIfStmt(e) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TPoundAssertStmt`, if possible.
    */
-  cached
   TPoundAssertStmt convertPoundAssertStmtFromRaw(Raw::Element e) { result = TPoundAssertStmt(e) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TRepeatWhileStmt`, if possible.
    */
-  cached
   TRepeatWhileStmt convertRepeatWhileStmtFromRaw(Raw::Element e) { result = TRepeatWhileStmt(e) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TReturnStmt`, if possible.
    */
-  cached
   TReturnStmt convertReturnStmtFromRaw(Raw::Element e) { result = TReturnStmt(e) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TStmtCondition`, if possible.
    */
-  cached
   TStmtCondition convertStmtConditionFromRaw(Raw::Element e) { result = TStmtCondition(e) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TSwitchStmt`, if possible.
    */
-  cached
   TSwitchStmt convertSwitchStmtFromRaw(Raw::Element e) { result = TSwitchStmt(e) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TThenStmt`, if possible.
    */
-  cached
   TThenStmt convertThenStmtFromRaw(Raw::Element e) { result = TThenStmt(e) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TThrowStmt`, if possible.
    */
-  cached
   TThrowStmt convertThrowStmtFromRaw(Raw::Element e) { result = TThrowStmt(e) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TWhileStmt`, if possible.
    */
-  cached
   TWhileStmt convertWhileStmtFromRaw(Raw::Element e) { result = TWhileStmt(e) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TYieldStmt`, if possible.
    */
-  cached
   TYieldStmt convertYieldStmtFromRaw(Raw::Element e) { result = TYieldStmt(e) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TArraySliceType`, if possible.
    */
-  cached
   TArraySliceType convertArraySliceTypeFromRaw(Raw::Element e) { result = TArraySliceType(e) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TBoundGenericClassType`, if possible.
    */
-  cached
   TBoundGenericClassType convertBoundGenericClassTypeFromRaw(Raw::Element e) {
     result = TBoundGenericClassType(e)
   }
@@ -2944,7 +2748,6 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TBoundGenericEnumType`, if possible.
    */
-  cached
   TBoundGenericEnumType convertBoundGenericEnumTypeFromRaw(Raw::Element e) {
     result = TBoundGenericEnumType(e)
   }
@@ -2953,7 +2756,6 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TBoundGenericStructType`, if possible.
    */
-  cached
   TBoundGenericStructType convertBoundGenericStructTypeFromRaw(Raw::Element e) {
     result = TBoundGenericStructType(e)
   }
@@ -2962,7 +2764,6 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TBuiltinBridgeObjectType`, if possible.
    */
-  cached
   TBuiltinBridgeObjectType convertBuiltinBridgeObjectTypeFromRaw(Raw::Element e) {
     result = TBuiltinBridgeObjectType(e)
   }
@@ -2971,7 +2772,6 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TBuiltinDefaultActorStorageType`, if possible.
    */
-  cached
   TBuiltinDefaultActorStorageType convertBuiltinDefaultActorStorageTypeFromRaw(Raw::Element e) {
     result = TBuiltinDefaultActorStorageType(e)
   }
@@ -2980,7 +2780,6 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TBuiltinExecutorType`, if possible.
    */
-  cached
   TBuiltinExecutorType convertBuiltinExecutorTypeFromRaw(Raw::Element e) {
     result = TBuiltinExecutorType(e)
   }
@@ -2989,14 +2788,12 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TBuiltinFloatType`, if possible.
    */
-  cached
   TBuiltinFloatType convertBuiltinFloatTypeFromRaw(Raw::Element e) { result = TBuiltinFloatType(e) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TBuiltinIntegerLiteralType`, if possible.
    */
-  cached
   TBuiltinIntegerLiteralType convertBuiltinIntegerLiteralTypeFromRaw(Raw::Element e) {
     result = TBuiltinIntegerLiteralType(e)
   }
@@ -3005,7 +2802,6 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TBuiltinIntegerType`, if possible.
    */
-  cached
   TBuiltinIntegerType convertBuiltinIntegerTypeFromRaw(Raw::Element e) {
     result = TBuiltinIntegerType(e)
   }
@@ -3014,14 +2810,12 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TBuiltinJobType`, if possible.
    */
-  cached
   TBuiltinJobType convertBuiltinJobTypeFromRaw(Raw::Element e) { result = TBuiltinJobType(e) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TBuiltinNativeObjectType`, if possible.
    */
-  cached
   TBuiltinNativeObjectType convertBuiltinNativeObjectTypeFromRaw(Raw::Element e) {
     result = TBuiltinNativeObjectType(e)
   }
@@ -3030,7 +2824,6 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TBuiltinRawPointerType`, if possible.
    */
-  cached
   TBuiltinRawPointerType convertBuiltinRawPointerTypeFromRaw(Raw::Element e) {
     result = TBuiltinRawPointerType(e)
   }
@@ -3039,7 +2832,6 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TBuiltinRawUnsafeContinuationType`, if possible.
    */
-  cached
   TBuiltinRawUnsafeContinuationType convertBuiltinRawUnsafeContinuationTypeFromRaw(Raw::Element e) {
     result = TBuiltinRawUnsafeContinuationType(e)
   }
@@ -3048,7 +2840,6 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TBuiltinUnsafeValueBufferType`, if possible.
    */
-  cached
   TBuiltinUnsafeValueBufferType convertBuiltinUnsafeValueBufferTypeFromRaw(Raw::Element e) {
     result = TBuiltinUnsafeValueBufferType(e)
   }
@@ -3057,7 +2848,6 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TBuiltinVectorType`, if possible.
    */
-  cached
   TBuiltinVectorType convertBuiltinVectorTypeFromRaw(Raw::Element e) {
     result = TBuiltinVectorType(e)
   }
@@ -3066,14 +2856,12 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TClassType`, if possible.
    */
-  cached
   TClassType convertClassTypeFromRaw(Raw::Element e) { result = TClassType(e) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TDependentMemberType`, if possible.
    */
-  cached
   TDependentMemberType convertDependentMemberTypeFromRaw(Raw::Element e) {
     result = TDependentMemberType(e)
   }
@@ -3082,21 +2870,18 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TDictionaryType`, if possible.
    */
-  cached
   TDictionaryType convertDictionaryTypeFromRaw(Raw::Element e) { result = TDictionaryType(e) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TDynamicSelfType`, if possible.
    */
-  cached
   TDynamicSelfType convertDynamicSelfTypeFromRaw(Raw::Element e) { result = TDynamicSelfType(e) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TElementArchetypeType`, if possible.
    */
-  cached
   TElementArchetypeType convertElementArchetypeTypeFromRaw(Raw::Element e) {
     result = TElementArchetypeType(e)
   }
@@ -3105,21 +2890,18 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TEnumType`, if possible.
    */
-  cached
   TEnumType convertEnumTypeFromRaw(Raw::Element e) { result = TEnumType(e) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TErrorType`, if possible.
    */
-  cached
   TErrorType convertErrorTypeFromRaw(Raw::Element e) { result = TErrorType(e) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TExistentialMetatypeType`, if possible.
    */
-  cached
   TExistentialMetatypeType convertExistentialMetatypeTypeFromRaw(Raw::Element e) {
     result = TExistentialMetatypeType(e)
   }
@@ -3128,21 +2910,18 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TExistentialType`, if possible.
    */
-  cached
   TExistentialType convertExistentialTypeFromRaw(Raw::Element e) { result = TExistentialType(e) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TFunctionType`, if possible.
    */
-  cached
   TFunctionType convertFunctionTypeFromRaw(Raw::Element e) { result = TFunctionType(e) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TGenericFunctionType`, if possible.
    */
-  cached
   TGenericFunctionType convertGenericFunctionTypeFromRaw(Raw::Element e) {
     result = TGenericFunctionType(e)
   }
@@ -3151,7 +2930,6 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TGenericTypeParamType`, if possible.
    */
-  cached
   TGenericTypeParamType convertGenericTypeParamTypeFromRaw(Raw::Element e) {
     result = TGenericTypeParamType(e)
   }
@@ -3160,35 +2938,30 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TInOutType`, if possible.
    */
-  cached
   TInOutType convertInOutTypeFromRaw(Raw::Element e) { result = TInOutType(e) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TLValueType`, if possible.
    */
-  cached
   TLValueType convertLValueTypeFromRaw(Raw::Element e) { result = TLValueType(e) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TMetatypeType`, if possible.
    */
-  cached
   TMetatypeType convertMetatypeTypeFromRaw(Raw::Element e) { result = TMetatypeType(e) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TModuleType`, if possible.
    */
-  cached
   TModuleType convertModuleTypeFromRaw(Raw::Element e) { result = TModuleType(e) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TOpaqueTypeArchetypeType`, if possible.
    */
-  cached
   TOpaqueTypeArchetypeType convertOpaqueTypeArchetypeTypeFromRaw(Raw::Element e) {
     result = TOpaqueTypeArchetypeType(e)
   }
@@ -3197,7 +2970,6 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TOpenedArchetypeType`, if possible.
    */
-  cached
   TOpenedArchetypeType convertOpenedArchetypeTypeFromRaw(Raw::Element e) {
     result = TOpenedArchetypeType(e)
   }
@@ -3206,14 +2978,12 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TOptionalType`, if possible.
    */
-  cached
   TOptionalType convertOptionalTypeFromRaw(Raw::Element e) { result = TOptionalType(e) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TPackArchetypeType`, if possible.
    */
-  cached
   TPackArchetypeType convertPackArchetypeTypeFromRaw(Raw::Element e) {
     result = TPackArchetypeType(e)
   }
@@ -3222,14 +2992,12 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TPackElementType`, if possible.
    */
-  cached
   TPackElementType convertPackElementTypeFromRaw(Raw::Element e) { result = TPackElementType(e) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TPackExpansionType`, if possible.
    */
-  cached
   TPackExpansionType convertPackExpansionTypeFromRaw(Raw::Element e) {
     result = TPackExpansionType(e)
   }
@@ -3238,14 +3006,12 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TPackType`, if possible.
    */
-  cached
   TPackType convertPackTypeFromRaw(Raw::Element e) { result = TPackType(e) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TParameterizedProtocolType`, if possible.
    */
-  cached
   TParameterizedProtocolType convertParameterizedProtocolTypeFromRaw(Raw::Element e) {
     result = TParameterizedProtocolType(e)
   }
@@ -3254,14 +3020,12 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TParenType`, if possible.
    */
-  cached
   TParenType convertParenTypeFromRaw(Raw::Element e) { result = TParenType(e) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TPrimaryArchetypeType`, if possible.
    */
-  cached
   TPrimaryArchetypeType convertPrimaryArchetypeTypeFromRaw(Raw::Element e) {
     result = TPrimaryArchetypeType(e)
   }
@@ -3270,7 +3034,6 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TProtocolCompositionType`, if possible.
    */
-  cached
   TProtocolCompositionType convertProtocolCompositionTypeFromRaw(Raw::Element e) {
     result = TProtocolCompositionType(e)
   }
@@ -3279,42 +3042,36 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TProtocolType`, if possible.
    */
-  cached
   TProtocolType convertProtocolTypeFromRaw(Raw::Element e) { result = TProtocolType(e) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TStructType`, if possible.
    */
-  cached
   TStructType convertStructTypeFromRaw(Raw::Element e) { result = TStructType(e) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TTupleType`, if possible.
    */
-  cached
   TTupleType convertTupleTypeFromRaw(Raw::Element e) { result = TTupleType(e) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TTypeAliasType`, if possible.
    */
-  cached
   TTypeAliasType convertTypeAliasTypeFromRaw(Raw::Element e) { result = TTypeAliasType(e) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TTypeRepr`, if possible.
    */
-  cached
   TTypeRepr convertTypeReprFromRaw(Raw::Element e) { result = TTypeRepr(e) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TUnboundGenericType`, if possible.
    */
-  cached
   TUnboundGenericType convertUnboundGenericTypeFromRaw(Raw::Element e) {
     result = TUnboundGenericType(e)
   }
@@ -3323,7 +3080,6 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TUnmanagedStorageType`, if possible.
    */
-  cached
   TUnmanagedStorageType convertUnmanagedStorageTypeFromRaw(Raw::Element e) {
     result = TUnmanagedStorageType(e)
   }
@@ -3332,7 +3088,6 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TUnownedStorageType`, if possible.
    */
-  cached
   TUnownedStorageType convertUnownedStorageTypeFromRaw(Raw::Element e) {
     result = TUnownedStorageType(e)
   }
@@ -3341,14 +3096,12 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TUnresolvedType`, if possible.
    */
-  cached
   TUnresolvedType convertUnresolvedTypeFromRaw(Raw::Element e) { result = TUnresolvedType(e) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TVariadicSequenceType`, if possible.
    */
-  cached
   TVariadicSequenceType convertVariadicSequenceTypeFromRaw(Raw::Element e) {
     result = TVariadicSequenceType(e)
   }
@@ -3357,14 +3110,12 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TWeakStorageType`, if possible.
    */
-  cached
   TWeakStorageType convertWeakStorageTypeFromRaw(Raw::Element e) { result = TWeakStorageType(e) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a raw DB element to a synthesized `TAstNode`, if possible.
    */
-  cached
   TAstNode convertAstNodeFromRaw(Raw::Element e) {
     result = convertAvailabilityInfoFromRaw(e)
     or
@@ -3397,7 +3148,6 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a raw DB element to a synthesized `TAvailabilitySpec`, if possible.
    */
-  cached
   TAvailabilitySpec convertAvailabilitySpecFromRaw(Raw::Element e) {
     result = convertOtherAvailabilitySpecFromRaw(e)
     or
@@ -3408,7 +3158,6 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a raw DB element to a synthesized `TCallable`, if possible.
    */
-  cached
   TCallable convertCallableFromRaw(Raw::Element e) {
     result = convertClosureExprFromRaw(e)
     or
@@ -3419,7 +3168,6 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a raw DB element to a synthesized `TElement`, if possible.
    */
-  cached
   TElement convertElementFromRaw(Raw::Element e) {
     result = convertFileFromRaw(e)
     or
@@ -3436,7 +3184,6 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a raw DB element to a synthesized `TErrorElement`, if possible.
    */
-  cached
   TErrorElement convertErrorElementFromRaw(Raw::Element e) {
     result = convertErrorExprFromRaw(e)
     or
@@ -3467,7 +3214,6 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a raw DB element to a synthesized `TFile`, if possible.
    */
-  cached
   TFile convertFileFromRaw(Raw::Element e) {
     result = convertDbFileFromRaw(e)
     or
@@ -3478,7 +3224,6 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a raw DB element to a synthesized `TLocatable`, if possible.
    */
-  cached
   TLocatable convertLocatableFromRaw(Raw::Element e) {
     result = convertArgumentFromRaw(e)
     or
@@ -3495,7 +3240,6 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a raw DB element to a synthesized `TLocation`, if possible.
    */
-  cached
   TLocation convertLocationFromRaw(Raw::Element e) {
     result = convertDbLocationFromRaw(e)
     or
@@ -3506,7 +3250,6 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a raw DB element to a synthesized `TAbstractStorageDecl`, if possible.
    */
-  cached
   TAbstractStorageDecl convertAbstractStorageDeclFromRaw(Raw::Element e) {
     result = convertSubscriptDeclFromRaw(e)
     or
@@ -3517,7 +3260,6 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a raw DB element to a synthesized `TAbstractTypeParamDecl`, if possible.
    */
-  cached
   TAbstractTypeParamDecl convertAbstractTypeParamDeclFromRaw(Raw::Element e) {
     result = convertAssociatedTypeDeclFromRaw(e)
     or
@@ -3528,7 +3270,6 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a raw DB element to a synthesized `TAccessorOrNamedFunction`, if possible.
    */
-  cached
   TAccessorOrNamedFunction convertAccessorOrNamedFunctionFromRaw(Raw::Element e) {
     result = convertAccessorFromRaw(e)
     or
@@ -3539,7 +3280,6 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a raw DB element to a synthesized `TDecl`, if possible.
    */
-  cached
   TDecl convertDeclFromRaw(Raw::Element e) {
     result = convertCapturedDeclFromRaw(e)
     or
@@ -3570,7 +3310,6 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a raw DB element to a synthesized `TFunction`, if possible.
    */
-  cached
   TFunction convertFunctionFromRaw(Raw::Element e) {
     result = convertAccessorOrNamedFunctionFromRaw(e)
     or
@@ -3583,7 +3322,6 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a raw DB element to a synthesized `TGenericContext`, if possible.
    */
-  cached
   TGenericContext convertGenericContextFromRaw(Raw::Element e) {
     result = convertExtensionDeclFromRaw(e)
     or
@@ -3600,7 +3338,6 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a raw DB element to a synthesized `TGenericTypeDecl`, if possible.
    */
-  cached
   TGenericTypeDecl convertGenericTypeDeclFromRaw(Raw::Element e) {
     result = convertNominalTypeDeclFromRaw(e)
     or
@@ -3613,7 +3350,6 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a raw DB element to a synthesized `TNominalTypeDecl`, if possible.
    */
-  cached
   TNominalTypeDecl convertNominalTypeDeclFromRaw(Raw::Element e) {
     result = convertClassDeclFromRaw(e)
     or
@@ -3628,7 +3364,6 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a raw DB element to a synthesized `TOperatorDecl`, if possible.
    */
-  cached
   TOperatorDecl convertOperatorDeclFromRaw(Raw::Element e) {
     result = convertInfixOperatorDeclFromRaw(e)
     or
@@ -3641,7 +3376,6 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a raw DB element to a synthesized `TTypeDecl`, if possible.
    */
-  cached
   TTypeDecl convertTypeDeclFromRaw(Raw::Element e) {
     result = convertAbstractTypeParamDeclFromRaw(e)
     or
@@ -3654,7 +3388,6 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a raw DB element to a synthesized `TValueDecl`, if possible.
    */
-  cached
   TValueDecl convertValueDeclFromRaw(Raw::Element e) {
     result = convertAbstractStorageDeclFromRaw(e)
     or
@@ -3671,7 +3404,6 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a raw DB element to a synthesized `TVarDecl`, if possible.
    */
-  cached
   TVarDecl convertVarDeclFromRaw(Raw::Element e) {
     result = convertConcreteVarDeclFromRaw(e)
     or
@@ -3682,7 +3414,6 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a raw DB element to a synthesized `TAnyTryExpr`, if possible.
    */
-  cached
   TAnyTryExpr convertAnyTryExprFromRaw(Raw::Element e) {
     result = convertForceTryExprFromRaw(e)
     or
@@ -3695,7 +3426,6 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a raw DB element to a synthesized `TApplyExpr`, if possible.
    */
-  cached
   TApplyExpr convertApplyExprFromRaw(Raw::Element e) {
     result = convertBinaryExprFromRaw(e)
     or
@@ -3712,7 +3442,6 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a raw DB element to a synthesized `TBuiltinLiteralExpr`, if possible.
    */
-  cached
   TBuiltinLiteralExpr convertBuiltinLiteralExprFromRaw(Raw::Element e) {
     result = convertBooleanLiteralExprFromRaw(e)
     or
@@ -3727,7 +3456,6 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a raw DB element to a synthesized `TCheckedCastExpr`, if possible.
    */
-  cached
   TCheckedCastExpr convertCheckedCastExprFromRaw(Raw::Element e) {
     result = convertConditionalCheckedCastExprFromRaw(e)
     or
@@ -3740,7 +3468,6 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a raw DB element to a synthesized `TClosureExpr`, if possible.
    */
-  cached
   TClosureExpr convertClosureExprFromRaw(Raw::Element e) {
     result = convertAutoClosureExprFromRaw(e)
     or
@@ -3751,7 +3478,6 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a raw DB element to a synthesized `TCollectionExpr`, if possible.
    */
-  cached
   TCollectionExpr convertCollectionExprFromRaw(Raw::Element e) {
     result = convertArrayExprFromRaw(e)
     or
@@ -3762,7 +3488,6 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a raw DB element to a synthesized `TDynamicLookupExpr`, if possible.
    */
-  cached
   TDynamicLookupExpr convertDynamicLookupExprFromRaw(Raw::Element e) {
     result = convertDynamicMemberRefExprFromRaw(e)
     or
@@ -3773,7 +3498,6 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a raw DB element to a synthesized `TExplicitCastExpr`, if possible.
    */
-  cached
   TExplicitCastExpr convertExplicitCastExprFromRaw(Raw::Element e) {
     result = convertCheckedCastExprFromRaw(e)
     or
@@ -3784,7 +3508,6 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a raw DB element to a synthesized `TExpr`, if possible.
    */
-  cached
   TExpr convertExprFromRaw(Raw::Element e) {
     result = convertAnyTryExprFromRaw(e)
     or
@@ -3901,7 +3624,6 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a raw DB element to a synthesized `TIdentityExpr`, if possible.
    */
-  cached
   TIdentityExpr convertIdentityExprFromRaw(Raw::Element e) {
     result = convertAwaitExprFromRaw(e)
     or
@@ -3918,7 +3640,6 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a raw DB element to a synthesized `TImplicitConversionExpr`, if possible.
    */
-  cached
   TImplicitConversionExpr convertImplicitConversionExprFromRaw(Raw::Element e) {
     result = convertAbiSafeConversionExprFromRaw(e)
     or
@@ -3989,7 +3710,6 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a raw DB element to a synthesized `TLiteralExpr`, if possible.
    */
-  cached
   TLiteralExpr convertLiteralExprFromRaw(Raw::Element e) {
     result = convertBuiltinLiteralExprFromRaw(e)
     or
@@ -4006,7 +3726,6 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a raw DB element to a synthesized `TLookupExpr`, if possible.
    */
-  cached
   TLookupExpr convertLookupExprFromRaw(Raw::Element e) {
     result = convertDynamicLookupExprFromRaw(e)
     or
@@ -4021,7 +3740,6 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a raw DB element to a synthesized `TNumberLiteralExpr`, if possible.
    */
-  cached
   TNumberLiteralExpr convertNumberLiteralExprFromRaw(Raw::Element e) {
     result = convertFloatLiteralExprFromRaw(e)
     or
@@ -4032,7 +3750,6 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a raw DB element to a synthesized `TSelfApplyExpr`, if possible.
    */
-  cached
   TSelfApplyExpr convertSelfApplyExprFromRaw(Raw::Element e) {
     result = convertDotSyntaxCallExprFromRaw(e)
     or
@@ -4043,7 +3760,6 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a raw DB element to a synthesized `TPattern`, if possible.
    */
-  cached
   TPattern convertPatternFromRaw(Raw::Element e) {
     result = convertAnyPatternFromRaw(e)
     or
@@ -4072,7 +3788,6 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a raw DB element to a synthesized `TLabeledConditionalStmt`, if possible.
    */
-  cached
   TLabeledConditionalStmt convertLabeledConditionalStmtFromRaw(Raw::Element e) {
     result = convertGuardStmtFromRaw(e)
     or
@@ -4085,7 +3800,6 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a raw DB element to a synthesized `TLabeledStmt`, if possible.
    */
-  cached
   TLabeledStmt convertLabeledStmtFromRaw(Raw::Element e) {
     result = convertDoCatchStmtFromRaw(e)
     or
@@ -4104,7 +3818,6 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a raw DB element to a synthesized `TStmt`, if possible.
    */
-  cached
   TStmt convertStmtFromRaw(Raw::Element e) {
     result = convertBraceStmtFromRaw(e)
     or
@@ -4139,7 +3852,6 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a raw DB element to a synthesized `TAnyBuiltinIntegerType`, if possible.
    */
-  cached
   TAnyBuiltinIntegerType convertAnyBuiltinIntegerTypeFromRaw(Raw::Element e) {
     result = convertBuiltinIntegerLiteralTypeFromRaw(e)
     or
@@ -4150,7 +3862,6 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a raw DB element to a synthesized `TAnyFunctionType`, if possible.
    */
-  cached
   TAnyFunctionType convertAnyFunctionTypeFromRaw(Raw::Element e) {
     result = convertFunctionTypeFromRaw(e)
     or
@@ -4161,7 +3872,6 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a raw DB element to a synthesized `TAnyGenericType`, if possible.
    */
-  cached
   TAnyGenericType convertAnyGenericTypeFromRaw(Raw::Element e) {
     result = convertNominalOrBoundGenericNominalTypeFromRaw(e)
     or
@@ -4172,7 +3882,6 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a raw DB element to a synthesized `TAnyMetatypeType`, if possible.
    */
-  cached
   TAnyMetatypeType convertAnyMetatypeTypeFromRaw(Raw::Element e) {
     result = convertExistentialMetatypeTypeFromRaw(e)
     or
@@ -4183,7 +3892,6 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a raw DB element to a synthesized `TArchetypeType`, if possible.
    */
-  cached
   TArchetypeType convertArchetypeTypeFromRaw(Raw::Element e) {
     result = convertLocalArchetypeTypeFromRaw(e)
     or
@@ -4198,7 +3906,6 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a raw DB element to a synthesized `TBoundGenericType`, if possible.
    */
-  cached
   TBoundGenericType convertBoundGenericTypeFromRaw(Raw::Element e) {
     result = convertBoundGenericClassTypeFromRaw(e)
     or
@@ -4211,7 +3918,6 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a raw DB element to a synthesized `TBuiltinType`, if possible.
    */
-  cached
   TBuiltinType convertBuiltinTypeFromRaw(Raw::Element e) {
     result = convertAnyBuiltinIntegerTypeFromRaw(e)
     or
@@ -4240,7 +3946,6 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a raw DB element to a synthesized `TLocalArchetypeType`, if possible.
    */
-  cached
   TLocalArchetypeType convertLocalArchetypeTypeFromRaw(Raw::Element e) {
     result = convertElementArchetypeTypeFromRaw(e)
     or
@@ -4251,7 +3956,6 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a raw DB element to a synthesized `TNominalOrBoundGenericNominalType`, if possible.
    */
-  cached
   TNominalOrBoundGenericNominalType convertNominalOrBoundGenericNominalTypeFromRaw(Raw::Element e) {
     result = convertBoundGenericTypeFromRaw(e)
     or
@@ -4262,7 +3966,6 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a raw DB element to a synthesized `TNominalType`, if possible.
    */
-  cached
   TNominalType convertNominalTypeFromRaw(Raw::Element e) {
     result = convertClassTypeFromRaw(e)
     or
@@ -4277,7 +3980,6 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a raw DB element to a synthesized `TReferenceStorageType`, if possible.
    */
-  cached
   TReferenceStorageType convertReferenceStorageTypeFromRaw(Raw::Element e) {
     result = convertUnmanagedStorageTypeFromRaw(e)
     or
@@ -4290,7 +3992,6 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a raw DB element to a synthesized `TSubstitutableType`, if possible.
    */
-  cached
   TSubstitutableType convertSubstitutableTypeFromRaw(Raw::Element e) {
     result = convertArchetypeTypeFromRaw(e)
     or
@@ -4301,7 +4002,6 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a raw DB element to a synthesized `TSugarType`, if possible.
    */
-  cached
   TSugarType convertSugarTypeFromRaw(Raw::Element e) {
     result = convertParenTypeFromRaw(e)
     or
@@ -4314,7 +4014,6 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a raw DB element to a synthesized `TSyntaxSugarType`, if possible.
    */
-  cached
   TSyntaxSugarType convertSyntaxSugarTypeFromRaw(Raw::Element e) {
     result = convertDictionaryTypeFromRaw(e)
     or
@@ -4325,7 +4024,6 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a raw DB element to a synthesized `TType`, if possible.
    */
-  cached
   TType convertTypeFromRaw(Raw::Element e) {
     result = convertAnyFunctionTypeFromRaw(e)
     or
@@ -4374,7 +4072,6 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a raw DB element to a synthesized `TUnarySyntaxSugarType`, if possible.
    */
-  cached
   TUnarySyntaxSugarType convertUnarySyntaxSugarTypeFromRaw(Raw::Element e) {
     result = convertArraySliceTypeFromRaw(e)
     or
@@ -4387,56 +4084,48 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a synthesized `TAvailabilityInfo` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertAvailabilityInfoToRaw(TAvailabilityInfo e) { e = TAvailabilityInfo(result) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a synthesized `TComment` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertCommentToRaw(TComment e) { e = TComment(result) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a synthesized `TDbFile` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertDbFileToRaw(TDbFile e) { e = TDbFile(result) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a synthesized `TDbLocation` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertDbLocationToRaw(TDbLocation e) { e = TDbLocation(result) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a synthesized `TDiagnostics` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertDiagnosticsToRaw(TDiagnostics e) { e = TDiagnostics(result) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a synthesized `TKeyPathComponent` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertKeyPathComponentToRaw(TKeyPathComponent e) { e = TKeyPathComponent(result) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a synthesized `TMacroRole` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertMacroRoleToRaw(TMacroRole e) { e = TMacroRole(result) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a synthesized `TOtherAvailabilitySpec` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertOtherAvailabilitySpecToRaw(TOtherAvailabilitySpec e) {
     e = TOtherAvailabilitySpec(result)
   }
@@ -4445,7 +4134,6 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a synthesized `TPlatformVersionAvailabilitySpec` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertPlatformVersionAvailabilitySpecToRaw(TPlatformVersionAvailabilitySpec e) {
     e = TPlatformVersionAvailabilitySpec(result)
   }
@@ -4454,21 +4142,18 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a synthesized `TUnknownFile` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertUnknownFileToRaw(TUnknownFile e) { none() }
 
   /**
    * INTERNAL: Do not use.
    * Converts a synthesized `TUnknownLocation` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertUnknownLocationToRaw(TUnknownLocation e) { none() }
 
   /**
    * INTERNAL: Do not use.
    * Converts a synthesized `TUnspecifiedElement` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertUnspecifiedElementToRaw(TUnspecifiedElement e) {
     e = TUnspecifiedElement(result)
   }
@@ -4477,14 +4162,12 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a synthesized `TAccessor` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertAccessorToRaw(TAccessor e) { e = TAccessor(result) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a synthesized `TAssociatedTypeDecl` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertAssociatedTypeDeclToRaw(TAssociatedTypeDecl e) {
     e = TAssociatedTypeDecl(result)
   }
@@ -4493,63 +4176,54 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a synthesized `TCapturedDecl` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertCapturedDeclToRaw(TCapturedDecl e) { e = TCapturedDecl(result) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a synthesized `TClassDecl` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertClassDeclToRaw(TClassDecl e) { e = TClassDecl(result) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a synthesized `TConcreteVarDecl` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertConcreteVarDeclToRaw(TConcreteVarDecl e) { e = TConcreteVarDecl(result) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a synthesized `TDeinitializer` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertDeinitializerToRaw(TDeinitializer e) { e = TDeinitializer(result) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a synthesized `TEnumCaseDecl` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertEnumCaseDeclToRaw(TEnumCaseDecl e) { e = TEnumCaseDecl(result) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a synthesized `TEnumDecl` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertEnumDeclToRaw(TEnumDecl e) { e = TEnumDecl(result) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a synthesized `TEnumElementDecl` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertEnumElementDeclToRaw(TEnumElementDecl e) { e = TEnumElementDecl(result) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a synthesized `TExtensionDecl` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertExtensionDeclToRaw(TExtensionDecl e) { e = TExtensionDecl(result) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a synthesized `TGenericTypeParamDecl` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertGenericTypeParamDeclToRaw(TGenericTypeParamDecl e) {
     e = TGenericTypeParamDecl(result)
   }
@@ -4558,21 +4232,18 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a synthesized `TIfConfigDecl` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertIfConfigDeclToRaw(TIfConfigDecl e) { e = TIfConfigDecl(result) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a synthesized `TImportDecl` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertImportDeclToRaw(TImportDecl e) { e = TImportDecl(result) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a synthesized `TInfixOperatorDecl` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertInfixOperatorDeclToRaw(TInfixOperatorDecl e) {
     e = TInfixOperatorDecl(result)
   }
@@ -4581,21 +4252,18 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a synthesized `TInitializer` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertInitializerToRaw(TInitializer e) { e = TInitializer(result) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a synthesized `TMacroDecl` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertMacroDeclToRaw(TMacroDecl e) { e = TMacroDecl(result) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a synthesized `TMissingMemberDecl` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertMissingMemberDeclToRaw(TMissingMemberDecl e) {
     e = TMissingMemberDecl(result)
   }
@@ -4604,35 +4272,30 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a synthesized `TModuleDecl` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertModuleDeclToRaw(TModuleDecl e) { e = TModuleDecl(result) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a synthesized `TNamedFunction` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertNamedFunctionToRaw(TNamedFunction e) { e = TNamedFunction(result) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a synthesized `TOpaqueTypeDecl` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertOpaqueTypeDeclToRaw(TOpaqueTypeDecl e) { e = TOpaqueTypeDecl(result) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a synthesized `TParamDecl` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertParamDeclToRaw(TParamDecl e) { e = TParamDecl(result) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a synthesized `TPatternBindingDecl` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertPatternBindingDeclToRaw(TPatternBindingDecl e) {
     e = TPatternBindingDecl(result)
   }
@@ -4641,7 +4304,6 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a synthesized `TPostfixOperatorDecl` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertPostfixOperatorDeclToRaw(TPostfixOperatorDecl e) {
     e = TPostfixOperatorDecl(result)
   }
@@ -4650,7 +4312,6 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a synthesized `TPoundDiagnosticDecl` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertPoundDiagnosticDeclToRaw(TPoundDiagnosticDecl e) {
     e = TPoundDiagnosticDecl(result)
   }
@@ -4659,7 +4320,6 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a synthesized `TPrecedenceGroupDecl` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertPrecedenceGroupDeclToRaw(TPrecedenceGroupDecl e) {
     e = TPrecedenceGroupDecl(result)
   }
@@ -4668,7 +4328,6 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a synthesized `TPrefixOperatorDecl` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertPrefixOperatorDeclToRaw(TPrefixOperatorDecl e) {
     e = TPrefixOperatorDecl(result)
   }
@@ -4677,42 +4336,36 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a synthesized `TProtocolDecl` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertProtocolDeclToRaw(TProtocolDecl e) { e = TProtocolDecl(result) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a synthesized `TStructDecl` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertStructDeclToRaw(TStructDecl e) { e = TStructDecl(result) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a synthesized `TSubscriptDecl` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertSubscriptDeclToRaw(TSubscriptDecl e) { e = TSubscriptDecl(result) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a synthesized `TTopLevelCodeDecl` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertTopLevelCodeDeclToRaw(TTopLevelCodeDecl e) { e = TTopLevelCodeDecl(result) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a synthesized `TTypeAliasDecl` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertTypeAliasDeclToRaw(TTypeAliasDecl e) { e = TTypeAliasDecl(result) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a synthesized `TAbiSafeConversionExpr` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertAbiSafeConversionExprToRaw(TAbiSafeConversionExpr e) {
     e = TAbiSafeConversionExpr(result)
   }
@@ -4721,7 +4374,6 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a synthesized `TAnyHashableErasureExpr` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertAnyHashableErasureExprToRaw(TAnyHashableErasureExpr e) {
     e = TAnyHashableErasureExpr(result)
   }
@@ -4730,7 +4382,6 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a synthesized `TAppliedPropertyWrapperExpr` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertAppliedPropertyWrapperExprToRaw(TAppliedPropertyWrapperExpr e) {
     e = TAppliedPropertyWrapperExpr(result)
   }
@@ -4739,7 +4390,6 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a synthesized `TArchetypeToSuperExpr` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertArchetypeToSuperExprToRaw(TArchetypeToSuperExpr e) {
     e = TArchetypeToSuperExpr(result)
   }
@@ -4748,21 +4398,18 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a synthesized `TArgument` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertArgumentToRaw(TArgument e) { e = TArgument(result) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a synthesized `TArrayExpr` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertArrayExprToRaw(TArrayExpr e) { e = TArrayExpr(result) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a synthesized `TArrayToPointerExpr` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertArrayToPointerExprToRaw(TArrayToPointerExpr e) {
     e = TArrayToPointerExpr(result)
   }
@@ -4771,42 +4418,36 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a synthesized `TAssignExpr` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertAssignExprToRaw(TAssignExpr e) { e = TAssignExpr(result) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a synthesized `TAutoClosureExpr` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertAutoClosureExprToRaw(TAutoClosureExpr e) { e = TAutoClosureExpr(result) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a synthesized `TAwaitExpr` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertAwaitExprToRaw(TAwaitExpr e) { e = TAwaitExpr(result) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a synthesized `TBinaryExpr` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertBinaryExprToRaw(TBinaryExpr e) { e = TBinaryExpr(result) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a synthesized `TBindOptionalExpr` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertBindOptionalExprToRaw(TBindOptionalExpr e) { e = TBindOptionalExpr(result) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a synthesized `TBooleanLiteralExpr` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertBooleanLiteralExprToRaw(TBooleanLiteralExpr e) {
     e = TBooleanLiteralExpr(result)
   }
@@ -4815,14 +4456,12 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a synthesized `TBorrowExpr` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertBorrowExprToRaw(TBorrowExpr e) { e = TBorrowExpr(result) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a synthesized `TBridgeFromObjCExpr` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertBridgeFromObjCExprToRaw(TBridgeFromObjCExpr e) {
     e = TBridgeFromObjCExpr(result)
   }
@@ -4831,28 +4470,24 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a synthesized `TBridgeToObjCExpr` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertBridgeToObjCExprToRaw(TBridgeToObjCExpr e) { e = TBridgeToObjCExpr(result) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a synthesized `TCallExpr` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertCallExprToRaw(TCallExpr e) { e = TCallExpr(result) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a synthesized `TCaptureListExpr` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertCaptureListExprToRaw(TCaptureListExpr e) { e = TCaptureListExpr(result) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a synthesized `TClassMetatypeToObjectExpr` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertClassMetatypeToObjectExprToRaw(TClassMetatypeToObjectExpr e) {
     e = TClassMetatypeToObjectExpr(result)
   }
@@ -4861,14 +4496,12 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a synthesized `TCoerceExpr` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertCoerceExprToRaw(TCoerceExpr e) { e = TCoerceExpr(result) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a synthesized `TCollectionUpcastConversionExpr` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertCollectionUpcastConversionExprToRaw(TCollectionUpcastConversionExpr e) {
     e = TCollectionUpcastConversionExpr(result)
   }
@@ -4877,7 +4510,6 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a synthesized `TConditionalBridgeFromObjCExpr` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertConditionalBridgeFromObjCExprToRaw(TConditionalBridgeFromObjCExpr e) {
     e = TConditionalBridgeFromObjCExpr(result)
   }
@@ -4886,7 +4518,6 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a synthesized `TConditionalCheckedCastExpr` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertConditionalCheckedCastExprToRaw(TConditionalCheckedCastExpr e) {
     e = TConditionalCheckedCastExpr(result)
   }
@@ -4895,21 +4526,18 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a synthesized `TConsumeExpr` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertConsumeExprToRaw(TConsumeExpr e) { e = TConsumeExpr(result) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a synthesized `TCopyExpr` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertCopyExprToRaw(TCopyExpr e) { e = TCopyExpr(result) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a synthesized `TCovariantFunctionConversionExpr` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertCovariantFunctionConversionExprToRaw(TCovariantFunctionConversionExpr e) {
     e = TCovariantFunctionConversionExpr(result)
   }
@@ -4918,7 +4546,6 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a synthesized `TCovariantReturnConversionExpr` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertCovariantReturnConversionExprToRaw(TCovariantReturnConversionExpr e) {
     e = TCovariantReturnConversionExpr(result)
   }
@@ -4927,14 +4554,12 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a synthesized `TDeclRefExpr` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertDeclRefExprToRaw(TDeclRefExpr e) { e = TDeclRefExpr(result) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a synthesized `TDefaultArgumentExpr` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertDefaultArgumentExprToRaw(TDefaultArgumentExpr e) {
     e = TDefaultArgumentExpr(result)
   }
@@ -4943,7 +4568,6 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a synthesized `TDerivedToBaseExpr` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertDerivedToBaseExprToRaw(TDerivedToBaseExpr e) {
     e = TDerivedToBaseExpr(result)
   }
@@ -4952,7 +4576,6 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a synthesized `TDestructureTupleExpr` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertDestructureTupleExprToRaw(TDestructureTupleExpr e) {
     e = TDestructureTupleExpr(result)
   }
@@ -4961,14 +4584,12 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a synthesized `TDictionaryExpr` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertDictionaryExprToRaw(TDictionaryExpr e) { e = TDictionaryExpr(result) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a synthesized `TDifferentiableFunctionExpr` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertDifferentiableFunctionExprToRaw(TDifferentiableFunctionExpr e) {
     e = TDifferentiableFunctionExpr(result)
   }
@@ -4977,7 +4598,6 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a synthesized `TDifferentiableFunctionExtractOriginalExpr` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertDifferentiableFunctionExtractOriginalExprToRaw(
     TDifferentiableFunctionExtractOriginalExpr e
   ) {
@@ -4988,7 +4608,6 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a synthesized `TDiscardAssignmentExpr` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertDiscardAssignmentExprToRaw(TDiscardAssignmentExpr e) {
     e = TDiscardAssignmentExpr(result)
   }
@@ -4997,14 +4616,12 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a synthesized `TDotSelfExpr` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertDotSelfExprToRaw(TDotSelfExpr e) { e = TDotSelfExpr(result) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a synthesized `TDotSyntaxBaseIgnoredExpr` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertDotSyntaxBaseIgnoredExprToRaw(TDotSyntaxBaseIgnoredExpr e) {
     e = TDotSyntaxBaseIgnoredExpr(result)
   }
@@ -5013,7 +4630,6 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a synthesized `TDotSyntaxCallExpr` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertDotSyntaxCallExprToRaw(TDotSyntaxCallExpr e) {
     e = TDotSyntaxCallExpr(result)
   }
@@ -5022,7 +4638,6 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a synthesized `TDynamicMemberRefExpr` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertDynamicMemberRefExprToRaw(TDynamicMemberRefExpr e) {
     e = TDynamicMemberRefExpr(result)
   }
@@ -5031,7 +4646,6 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a synthesized `TDynamicSubscriptExpr` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertDynamicSubscriptExprToRaw(TDynamicSubscriptExpr e) {
     e = TDynamicSubscriptExpr(result)
   }
@@ -5040,35 +4654,30 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a synthesized `TDynamicTypeExpr` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertDynamicTypeExprToRaw(TDynamicTypeExpr e) { e = TDynamicTypeExpr(result) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a synthesized `TEnumIsCaseExpr` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertEnumIsCaseExprToRaw(TEnumIsCaseExpr e) { e = TEnumIsCaseExpr(result) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a synthesized `TErasureExpr` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertErasureExprToRaw(TErasureExpr e) { e = TErasureExpr(result) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a synthesized `TErrorExpr` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertErrorExprToRaw(TErrorExpr e) { e = TErrorExpr(result) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a synthesized `TExistentialMetatypeToObjectExpr` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertExistentialMetatypeToObjectExprToRaw(TExistentialMetatypeToObjectExpr e) {
     e = TExistentialMetatypeToObjectExpr(result)
   }
@@ -5077,7 +4686,6 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a synthesized `TExplicitClosureExpr` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertExplicitClosureExprToRaw(TExplicitClosureExpr e) {
     e = TExplicitClosureExpr(result)
   }
@@ -5086,28 +4694,24 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a synthesized `TFloatLiteralExpr` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertFloatLiteralExprToRaw(TFloatLiteralExpr e) { e = TFloatLiteralExpr(result) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a synthesized `TForceTryExpr` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertForceTryExprToRaw(TForceTryExpr e) { e = TForceTryExpr(result) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a synthesized `TForceValueExpr` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertForceValueExprToRaw(TForceValueExpr e) { e = TForceValueExpr(result) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a synthesized `TForcedCheckedCastExpr` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertForcedCheckedCastExprToRaw(TForcedCheckedCastExpr e) {
     e = TForcedCheckedCastExpr(result)
   }
@@ -5116,7 +4720,6 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a synthesized `TForeignObjectConversionExpr` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertForeignObjectConversionExprToRaw(TForeignObjectConversionExpr e) {
     e = TForeignObjectConversionExpr(result)
   }
@@ -5125,7 +4728,6 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a synthesized `TFunctionConversionExpr` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertFunctionConversionExprToRaw(TFunctionConversionExpr e) {
     e = TFunctionConversionExpr(result)
   }
@@ -5134,21 +4736,18 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a synthesized `TIfExpr` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertIfExprToRaw(TIfExpr e) { e = TIfExpr(result) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a synthesized `TInOutExpr` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertInOutExprToRaw(TInOutExpr e) { e = TInOutExpr(result) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a synthesized `TInOutToPointerExpr` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertInOutToPointerExprToRaw(TInOutToPointerExpr e) {
     e = TInOutToPointerExpr(result)
   }
@@ -5157,7 +4756,6 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a synthesized `TInitializerRefCallExpr` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertInitializerRefCallExprToRaw(TInitializerRefCallExpr e) {
     e = TInitializerRefCallExpr(result)
   }
@@ -5166,7 +4764,6 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a synthesized `TInjectIntoOptionalExpr` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertInjectIntoOptionalExprToRaw(TInjectIntoOptionalExpr e) {
     e = TInjectIntoOptionalExpr(result)
   }
@@ -5175,7 +4772,6 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a synthesized `TIntegerLiteralExpr` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertIntegerLiteralExprToRaw(TIntegerLiteralExpr e) {
     e = TIntegerLiteralExpr(result)
   }
@@ -5184,7 +4780,6 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a synthesized `TInterpolatedStringLiteralExpr` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertInterpolatedStringLiteralExprToRaw(TInterpolatedStringLiteralExpr e) {
     e = TInterpolatedStringLiteralExpr(result)
   }
@@ -5193,14 +4788,12 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a synthesized `TIsExpr` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertIsExprToRaw(TIsExpr e) { e = TIsExpr(result) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a synthesized `TKeyPathApplicationExpr` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertKeyPathApplicationExprToRaw(TKeyPathApplicationExpr e) {
     e = TKeyPathApplicationExpr(result)
   }
@@ -5209,21 +4802,18 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a synthesized `TKeyPathDotExpr` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertKeyPathDotExprToRaw(TKeyPathDotExpr e) { e = TKeyPathDotExpr(result) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a synthesized `TKeyPathExpr` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertKeyPathExprToRaw(TKeyPathExpr e) { e = TKeyPathExpr(result) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a synthesized `TLazyInitializationExpr` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertLazyInitializationExprToRaw(TLazyInitializationExpr e) {
     e = TLazyInitializationExpr(result)
   }
@@ -5232,7 +4822,6 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a synthesized `TLinearFunctionExpr` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertLinearFunctionExprToRaw(TLinearFunctionExpr e) {
     e = TLinearFunctionExpr(result)
   }
@@ -5241,7 +4830,6 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a synthesized `TLinearFunctionExtractOriginalExpr` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertLinearFunctionExtractOriginalExprToRaw(TLinearFunctionExtractOriginalExpr e) {
     e = TLinearFunctionExtractOriginalExpr(result)
   }
@@ -5250,7 +4838,6 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a synthesized `TLinearToDifferentiableFunctionExpr` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertLinearToDifferentiableFunctionExprToRaw(TLinearToDifferentiableFunctionExpr e) {
     e = TLinearToDifferentiableFunctionExpr(result)
   }
@@ -5259,14 +4846,12 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a synthesized `TLoadExpr` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertLoadExprToRaw(TLoadExpr e) { e = TLoadExpr(result) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a synthesized `TMagicIdentifierLiteralExpr` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertMagicIdentifierLiteralExprToRaw(TMagicIdentifierLiteralExpr e) {
     e = TMagicIdentifierLiteralExpr(result)
   }
@@ -5275,7 +4860,6 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a synthesized `TMakeTemporarilyEscapableExpr` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertMakeTemporarilyEscapableExprToRaw(TMakeTemporarilyEscapableExpr e) {
     e = TMakeTemporarilyEscapableExpr(result)
   }
@@ -5284,7 +4868,6 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a synthesized `TMaterializePackExpr` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertMaterializePackExprToRaw(TMaterializePackExpr e) {
     e = TMaterializePackExpr(result)
   }
@@ -5293,14 +4876,12 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a synthesized `TMemberRefExpr` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertMemberRefExprToRaw(TMemberRefExpr e) { e = TMemberRefExpr(result) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a synthesized `TMetatypeConversionExpr` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertMetatypeConversionExprToRaw(TMetatypeConversionExpr e) {
     e = TMetatypeConversionExpr(result)
   }
@@ -5309,28 +4890,24 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a synthesized `TMethodLookupExpr` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertMethodLookupExprToRaw(TMethodLookupExpr e) { e = TMethodLookupExpr(result) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a synthesized `TNilLiteralExpr` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertNilLiteralExprToRaw(TNilLiteralExpr e) { e = TNilLiteralExpr(result) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a synthesized `TObjCSelectorExpr` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertObjCSelectorExprToRaw(TObjCSelectorExpr e) { e = TObjCSelectorExpr(result) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a synthesized `TObjectLiteralExpr` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertObjectLiteralExprToRaw(TObjectLiteralExpr e) {
     e = TObjectLiteralExpr(result)
   }
@@ -5339,21 +4916,18 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a synthesized `TOneWayExpr` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertOneWayExprToRaw(TOneWayExpr e) { e = TOneWayExpr(result) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a synthesized `TOpaqueValueExpr` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertOpaqueValueExprToRaw(TOpaqueValueExpr e) { e = TOpaqueValueExpr(result) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a synthesized `TOpenExistentialExpr` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertOpenExistentialExprToRaw(TOpenExistentialExpr e) {
     e = TOpenExistentialExpr(result)
   }
@@ -5362,7 +4936,6 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a synthesized `TOptionalEvaluationExpr` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertOptionalEvaluationExprToRaw(TOptionalEvaluationExpr e) {
     e = TOptionalEvaluationExpr(result)
   }
@@ -5371,14 +4944,12 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a synthesized `TOptionalTryExpr` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertOptionalTryExprToRaw(TOptionalTryExpr e) { e = TOptionalTryExpr(result) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a synthesized `TOtherInitializerRefExpr` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertOtherInitializerRefExprToRaw(TOtherInitializerRefExpr e) {
     e = TOtherInitializerRefExpr(result)
   }
@@ -5387,7 +4958,6 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a synthesized `TOverloadedDeclRefExpr` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertOverloadedDeclRefExprToRaw(TOverloadedDeclRefExpr e) {
     e = TOverloadedDeclRefExpr(result)
   }
@@ -5396,14 +4966,12 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a synthesized `TPackElementExpr` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertPackElementExprToRaw(TPackElementExpr e) { e = TPackElementExpr(result) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a synthesized `TPackExpansionExpr` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertPackExpansionExprToRaw(TPackExpansionExpr e) {
     e = TPackExpansionExpr(result)
   }
@@ -5412,14 +4980,12 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a synthesized `TParenExpr` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertParenExprToRaw(TParenExpr e) { e = TParenExpr(result) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a synthesized `TPointerToPointerExpr` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertPointerToPointerExprToRaw(TPointerToPointerExpr e) {
     e = TPointerToPointerExpr(result)
   }
@@ -5428,21 +4994,18 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a synthesized `TPostfixUnaryExpr` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertPostfixUnaryExprToRaw(TPostfixUnaryExpr e) { e = TPostfixUnaryExpr(result) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a synthesized `TPrefixUnaryExpr` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertPrefixUnaryExprToRaw(TPrefixUnaryExpr e) { e = TPrefixUnaryExpr(result) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a synthesized `TPropertyWrapperValuePlaceholderExpr` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertPropertyWrapperValuePlaceholderExprToRaw(
     TPropertyWrapperValuePlaceholderExpr e
   ) {
@@ -5453,7 +5016,6 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a synthesized `TProtocolMetatypeToObjectExpr` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertProtocolMetatypeToObjectExprToRaw(TProtocolMetatypeToObjectExpr e) {
     e = TProtocolMetatypeToObjectExpr(result)
   }
@@ -5462,7 +5024,6 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a synthesized `TRebindSelfInInitializerExpr` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertRebindSelfInInitializerExprToRaw(TRebindSelfInInitializerExpr e) {
     e = TRebindSelfInInitializerExpr(result)
   }
@@ -5471,21 +5032,18 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a synthesized `TRegexLiteralExpr` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertRegexLiteralExprToRaw(TRegexLiteralExpr e) { e = TRegexLiteralExpr(result) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a synthesized `TSequenceExpr` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertSequenceExprToRaw(TSequenceExpr e) { e = TSequenceExpr(result) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a synthesized `TSingleValueStmtExpr` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertSingleValueStmtExprToRaw(TSingleValueStmtExpr e) {
     e = TSingleValueStmtExpr(result)
   }
@@ -5494,7 +5052,6 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a synthesized `TStringLiteralExpr` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertStringLiteralExprToRaw(TStringLiteralExpr e) {
     e = TStringLiteralExpr(result)
   }
@@ -5503,7 +5060,6 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a synthesized `TStringToPointerExpr` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertStringToPointerExprToRaw(TStringToPointerExpr e) {
     e = TStringToPointerExpr(result)
   }
@@ -5512,56 +5068,48 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a synthesized `TSubscriptExpr` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertSubscriptExprToRaw(TSubscriptExpr e) { e = TSubscriptExpr(result) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a synthesized `TSuperRefExpr` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertSuperRefExprToRaw(TSuperRefExpr e) { e = TSuperRefExpr(result) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a synthesized `TTapExpr` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertTapExprToRaw(TTapExpr e) { e = TTapExpr(result) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a synthesized `TTryExpr` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertTryExprToRaw(TTryExpr e) { e = TTryExpr(result) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a synthesized `TTupleElementExpr` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertTupleElementExprToRaw(TTupleElementExpr e) { e = TTupleElementExpr(result) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a synthesized `TTupleExpr` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertTupleExprToRaw(TTupleExpr e) { e = TTupleExpr(result) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a synthesized `TTypeExpr` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertTypeExprToRaw(TTypeExpr e) { e = TTypeExpr(result) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a synthesized `TUnderlyingToOpaqueExpr` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertUnderlyingToOpaqueExprToRaw(TUnderlyingToOpaqueExpr e) {
     e = TUnderlyingToOpaqueExpr(result)
   }
@@ -5570,7 +5118,6 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a synthesized `TUnevaluatedInstanceExpr` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertUnevaluatedInstanceExprToRaw(TUnevaluatedInstanceExpr e) {
     e = TUnevaluatedInstanceExpr(result)
   }
@@ -5579,7 +5126,6 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a synthesized `TUnresolvedDeclRefExpr` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertUnresolvedDeclRefExprToRaw(TUnresolvedDeclRefExpr e) {
     e = TUnresolvedDeclRefExpr(result)
   }
@@ -5588,7 +5134,6 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a synthesized `TUnresolvedDotExpr` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertUnresolvedDotExprToRaw(TUnresolvedDotExpr e) {
     e = TUnresolvedDotExpr(result)
   }
@@ -5597,7 +5142,6 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a synthesized `TUnresolvedMemberChainResultExpr` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertUnresolvedMemberChainResultExprToRaw(TUnresolvedMemberChainResultExpr e) {
     e = TUnresolvedMemberChainResultExpr(result)
   }
@@ -5606,7 +5150,6 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a synthesized `TUnresolvedMemberExpr` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertUnresolvedMemberExprToRaw(TUnresolvedMemberExpr e) {
     e = TUnresolvedMemberExpr(result)
   }
@@ -5615,7 +5158,6 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a synthesized `TUnresolvedPatternExpr` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertUnresolvedPatternExprToRaw(TUnresolvedPatternExpr e) {
     e = TUnresolvedPatternExpr(result)
   }
@@ -5624,7 +5166,6 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a synthesized `TUnresolvedSpecializeExpr` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertUnresolvedSpecializeExprToRaw(TUnresolvedSpecializeExpr e) {
     e = TUnresolvedSpecializeExpr(result)
   }
@@ -5633,7 +5174,6 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a synthesized `TUnresolvedTypeConversionExpr` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertUnresolvedTypeConversionExprToRaw(TUnresolvedTypeConversionExpr e) {
     e = TUnresolvedTypeConversionExpr(result)
   }
@@ -5642,7 +5182,6 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a synthesized `TVarargExpansionExpr` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertVarargExpansionExprToRaw(TVarargExpansionExpr e) {
     e = TVarargExpansionExpr(result)
   }
@@ -5651,28 +5190,24 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a synthesized `TAnyPattern` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertAnyPatternToRaw(TAnyPattern e) { e = TAnyPattern(result) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a synthesized `TBindingPattern` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertBindingPatternToRaw(TBindingPattern e) { e = TBindingPattern(result) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a synthesized `TBoolPattern` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertBoolPatternToRaw(TBoolPattern e) { e = TBoolPattern(result) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a synthesized `TEnumElementPattern` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertEnumElementPatternToRaw(TEnumElementPattern e) {
     e = TEnumElementPattern(result)
   }
@@ -5681,28 +5216,24 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a synthesized `TExprPattern` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertExprPatternToRaw(TExprPattern e) { e = TExprPattern(result) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a synthesized `TIsPattern` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertIsPatternToRaw(TIsPattern e) { e = TIsPattern(result) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a synthesized `TNamedPattern` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertNamedPatternToRaw(TNamedPattern e) { e = TNamedPattern(result) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a synthesized `TOptionalSomePattern` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertOptionalSomePatternToRaw(TOptionalSomePattern e) {
     e = TOptionalSomePattern(result)
   }
@@ -5711,203 +5242,174 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a synthesized `TParenPattern` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertParenPatternToRaw(TParenPattern e) { e = TParenPattern(result) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a synthesized `TTuplePattern` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertTuplePatternToRaw(TTuplePattern e) { e = TTuplePattern(result) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a synthesized `TTypedPattern` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertTypedPatternToRaw(TTypedPattern e) { e = TTypedPattern(result) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a synthesized `TBraceStmt` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertBraceStmtToRaw(TBraceStmt e) { e = TBraceStmt(result) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a synthesized `TBreakStmt` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertBreakStmtToRaw(TBreakStmt e) { e = TBreakStmt(result) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a synthesized `TCaseLabelItem` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertCaseLabelItemToRaw(TCaseLabelItem e) { e = TCaseLabelItem(result) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a synthesized `TCaseStmt` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertCaseStmtToRaw(TCaseStmt e) { e = TCaseStmt(result) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a synthesized `TConditionElement` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertConditionElementToRaw(TConditionElement e) { e = TConditionElement(result) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a synthesized `TContinueStmt` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertContinueStmtToRaw(TContinueStmt e) { e = TContinueStmt(result) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a synthesized `TDeferStmt` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertDeferStmtToRaw(TDeferStmt e) { e = TDeferStmt(result) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a synthesized `TDiscardStmt` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertDiscardStmtToRaw(TDiscardStmt e) { e = TDiscardStmt(result) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a synthesized `TDoCatchStmt` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertDoCatchStmtToRaw(TDoCatchStmt e) { e = TDoCatchStmt(result) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a synthesized `TDoStmt` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertDoStmtToRaw(TDoStmt e) { e = TDoStmt(result) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a synthesized `TFailStmt` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertFailStmtToRaw(TFailStmt e) { e = TFailStmt(result) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a synthesized `TFallthroughStmt` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertFallthroughStmtToRaw(TFallthroughStmt e) { e = TFallthroughStmt(result) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a synthesized `TForEachStmt` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertForEachStmtToRaw(TForEachStmt e) { e = TForEachStmt(result) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a synthesized `TGuardStmt` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertGuardStmtToRaw(TGuardStmt e) { e = TGuardStmt(result) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a synthesized `TIfStmt` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertIfStmtToRaw(TIfStmt e) { e = TIfStmt(result) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a synthesized `TPoundAssertStmt` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertPoundAssertStmtToRaw(TPoundAssertStmt e) { e = TPoundAssertStmt(result) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a synthesized `TRepeatWhileStmt` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertRepeatWhileStmtToRaw(TRepeatWhileStmt e) { e = TRepeatWhileStmt(result) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a synthesized `TReturnStmt` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertReturnStmtToRaw(TReturnStmt e) { e = TReturnStmt(result) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a synthesized `TStmtCondition` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertStmtConditionToRaw(TStmtCondition e) { e = TStmtCondition(result) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a synthesized `TSwitchStmt` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertSwitchStmtToRaw(TSwitchStmt e) { e = TSwitchStmt(result) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a synthesized `TThenStmt` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertThenStmtToRaw(TThenStmt e) { e = TThenStmt(result) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a synthesized `TThrowStmt` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertThrowStmtToRaw(TThrowStmt e) { e = TThrowStmt(result) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a synthesized `TWhileStmt` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertWhileStmtToRaw(TWhileStmt e) { e = TWhileStmt(result) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a synthesized `TYieldStmt` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertYieldStmtToRaw(TYieldStmt e) { e = TYieldStmt(result) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a synthesized `TArraySliceType` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertArraySliceTypeToRaw(TArraySliceType e) { e = TArraySliceType(result) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a synthesized `TBoundGenericClassType` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertBoundGenericClassTypeToRaw(TBoundGenericClassType e) {
     e = TBoundGenericClassType(result)
   }
@@ -5916,7 +5418,6 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a synthesized `TBoundGenericEnumType` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertBoundGenericEnumTypeToRaw(TBoundGenericEnumType e) {
     e = TBoundGenericEnumType(result)
   }
@@ -5925,7 +5426,6 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a synthesized `TBoundGenericStructType` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertBoundGenericStructTypeToRaw(TBoundGenericStructType e) {
     e = TBoundGenericStructType(result)
   }
@@ -5934,7 +5434,6 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a synthesized `TBuiltinBridgeObjectType` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertBuiltinBridgeObjectTypeToRaw(TBuiltinBridgeObjectType e) {
     e = TBuiltinBridgeObjectType(result)
   }
@@ -5943,7 +5442,6 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a synthesized `TBuiltinDefaultActorStorageType` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertBuiltinDefaultActorStorageTypeToRaw(TBuiltinDefaultActorStorageType e) {
     e = TBuiltinDefaultActorStorageType(result)
   }
@@ -5952,7 +5450,6 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a synthesized `TBuiltinExecutorType` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertBuiltinExecutorTypeToRaw(TBuiltinExecutorType e) {
     e = TBuiltinExecutorType(result)
   }
@@ -5961,14 +5458,12 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a synthesized `TBuiltinFloatType` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertBuiltinFloatTypeToRaw(TBuiltinFloatType e) { e = TBuiltinFloatType(result) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a synthesized `TBuiltinIntegerLiteralType` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertBuiltinIntegerLiteralTypeToRaw(TBuiltinIntegerLiteralType e) {
     e = TBuiltinIntegerLiteralType(result)
   }
@@ -5977,7 +5472,6 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a synthesized `TBuiltinIntegerType` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertBuiltinIntegerTypeToRaw(TBuiltinIntegerType e) {
     e = TBuiltinIntegerType(result)
   }
@@ -5986,14 +5480,12 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a synthesized `TBuiltinJobType` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertBuiltinJobTypeToRaw(TBuiltinJobType e) { e = TBuiltinJobType(result) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a synthesized `TBuiltinNativeObjectType` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertBuiltinNativeObjectTypeToRaw(TBuiltinNativeObjectType e) {
     e = TBuiltinNativeObjectType(result)
   }
@@ -6002,7 +5494,6 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a synthesized `TBuiltinRawPointerType` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertBuiltinRawPointerTypeToRaw(TBuiltinRawPointerType e) {
     e = TBuiltinRawPointerType(result)
   }
@@ -6011,7 +5502,6 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a synthesized `TBuiltinRawUnsafeContinuationType` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertBuiltinRawUnsafeContinuationTypeToRaw(TBuiltinRawUnsafeContinuationType e) {
     e = TBuiltinRawUnsafeContinuationType(result)
   }
@@ -6020,7 +5510,6 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a synthesized `TBuiltinUnsafeValueBufferType` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertBuiltinUnsafeValueBufferTypeToRaw(TBuiltinUnsafeValueBufferType e) {
     e = TBuiltinUnsafeValueBufferType(result)
   }
@@ -6029,7 +5518,6 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a synthesized `TBuiltinVectorType` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertBuiltinVectorTypeToRaw(TBuiltinVectorType e) {
     e = TBuiltinVectorType(result)
   }
@@ -6038,14 +5526,12 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a synthesized `TClassType` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertClassTypeToRaw(TClassType e) { e = TClassType(result) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a synthesized `TDependentMemberType` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertDependentMemberTypeToRaw(TDependentMemberType e) {
     e = TDependentMemberType(result)
   }
@@ -6054,21 +5540,18 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a synthesized `TDictionaryType` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertDictionaryTypeToRaw(TDictionaryType e) { e = TDictionaryType(result) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a synthesized `TDynamicSelfType` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertDynamicSelfTypeToRaw(TDynamicSelfType e) { e = TDynamicSelfType(result) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a synthesized `TElementArchetypeType` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertElementArchetypeTypeToRaw(TElementArchetypeType e) {
     e = TElementArchetypeType(result)
   }
@@ -6077,21 +5560,18 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a synthesized `TEnumType` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertEnumTypeToRaw(TEnumType e) { e = TEnumType(result) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a synthesized `TErrorType` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertErrorTypeToRaw(TErrorType e) { e = TErrorType(result) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a synthesized `TExistentialMetatypeType` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertExistentialMetatypeTypeToRaw(TExistentialMetatypeType e) {
     e = TExistentialMetatypeType(result)
   }
@@ -6100,21 +5580,18 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a synthesized `TExistentialType` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertExistentialTypeToRaw(TExistentialType e) { e = TExistentialType(result) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a synthesized `TFunctionType` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertFunctionTypeToRaw(TFunctionType e) { e = TFunctionType(result) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a synthesized `TGenericFunctionType` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertGenericFunctionTypeToRaw(TGenericFunctionType e) {
     e = TGenericFunctionType(result)
   }
@@ -6123,7 +5600,6 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a synthesized `TGenericTypeParamType` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertGenericTypeParamTypeToRaw(TGenericTypeParamType e) {
     e = TGenericTypeParamType(result)
   }
@@ -6132,35 +5608,30 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a synthesized `TInOutType` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertInOutTypeToRaw(TInOutType e) { e = TInOutType(result) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a synthesized `TLValueType` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertLValueTypeToRaw(TLValueType e) { e = TLValueType(result) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a synthesized `TMetatypeType` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertMetatypeTypeToRaw(TMetatypeType e) { e = TMetatypeType(result) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a synthesized `TModuleType` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertModuleTypeToRaw(TModuleType e) { e = TModuleType(result) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a synthesized `TOpaqueTypeArchetypeType` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertOpaqueTypeArchetypeTypeToRaw(TOpaqueTypeArchetypeType e) {
     e = TOpaqueTypeArchetypeType(result)
   }
@@ -6169,7 +5640,6 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a synthesized `TOpenedArchetypeType` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertOpenedArchetypeTypeToRaw(TOpenedArchetypeType e) {
     e = TOpenedArchetypeType(result)
   }
@@ -6178,14 +5648,12 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a synthesized `TOptionalType` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertOptionalTypeToRaw(TOptionalType e) { e = TOptionalType(result) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a synthesized `TPackArchetypeType` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertPackArchetypeTypeToRaw(TPackArchetypeType e) {
     e = TPackArchetypeType(result)
   }
@@ -6194,14 +5662,12 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a synthesized `TPackElementType` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertPackElementTypeToRaw(TPackElementType e) { e = TPackElementType(result) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a synthesized `TPackExpansionType` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertPackExpansionTypeToRaw(TPackExpansionType e) {
     e = TPackExpansionType(result)
   }
@@ -6210,14 +5676,12 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a synthesized `TPackType` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertPackTypeToRaw(TPackType e) { e = TPackType(result) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a synthesized `TParameterizedProtocolType` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertParameterizedProtocolTypeToRaw(TParameterizedProtocolType e) {
     e = TParameterizedProtocolType(result)
   }
@@ -6226,14 +5690,12 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a synthesized `TParenType` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertParenTypeToRaw(TParenType e) { e = TParenType(result) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a synthesized `TPrimaryArchetypeType` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertPrimaryArchetypeTypeToRaw(TPrimaryArchetypeType e) {
     e = TPrimaryArchetypeType(result)
   }
@@ -6242,7 +5704,6 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a synthesized `TProtocolCompositionType` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertProtocolCompositionTypeToRaw(TProtocolCompositionType e) {
     e = TProtocolCompositionType(result)
   }
@@ -6251,42 +5712,36 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a synthesized `TProtocolType` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertProtocolTypeToRaw(TProtocolType e) { e = TProtocolType(result) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a synthesized `TStructType` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertStructTypeToRaw(TStructType e) { e = TStructType(result) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a synthesized `TTupleType` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertTupleTypeToRaw(TTupleType e) { e = TTupleType(result) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a synthesized `TTypeAliasType` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertTypeAliasTypeToRaw(TTypeAliasType e) { e = TTypeAliasType(result) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a synthesized `TTypeRepr` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertTypeReprToRaw(TTypeRepr e) { e = TTypeRepr(result) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a synthesized `TUnboundGenericType` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertUnboundGenericTypeToRaw(TUnboundGenericType e) {
     e = TUnboundGenericType(result)
   }
@@ -6295,7 +5750,6 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a synthesized `TUnmanagedStorageType` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertUnmanagedStorageTypeToRaw(TUnmanagedStorageType e) {
     e = TUnmanagedStorageType(result)
   }
@@ -6304,7 +5758,6 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a synthesized `TUnownedStorageType` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertUnownedStorageTypeToRaw(TUnownedStorageType e) {
     e = TUnownedStorageType(result)
   }
@@ -6313,14 +5766,12 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a synthesized `TUnresolvedType` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertUnresolvedTypeToRaw(TUnresolvedType e) { e = TUnresolvedType(result) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a synthesized `TVariadicSequenceType` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertVariadicSequenceTypeToRaw(TVariadicSequenceType e) {
     e = TVariadicSequenceType(result)
   }
@@ -6329,14 +5780,12 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a synthesized `TWeakStorageType` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertWeakStorageTypeToRaw(TWeakStorageType e) { e = TWeakStorageType(result) }
 
   /**
    * INTERNAL: Do not use.
    * Converts a synthesized `TAstNode` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertAstNodeToRaw(TAstNode e) {
     result = convertAvailabilityInfoToRaw(e)
     or
@@ -6369,7 +5818,6 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a synthesized `TAvailabilitySpec` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertAvailabilitySpecToRaw(TAvailabilitySpec e) {
     result = convertOtherAvailabilitySpecToRaw(e)
     or
@@ -6380,7 +5828,6 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a synthesized `TCallable` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertCallableToRaw(TCallable e) {
     result = convertClosureExprToRaw(e)
     or
@@ -6391,7 +5838,6 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a synthesized `TElement` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertElementToRaw(TElement e) {
     result = convertFileToRaw(e)
     or
@@ -6408,7 +5854,6 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a synthesized `TErrorElement` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertErrorElementToRaw(TErrorElement e) {
     result = convertErrorExprToRaw(e)
     or
@@ -6439,7 +5884,6 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a synthesized `TFile` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertFileToRaw(TFile e) {
     result = convertDbFileToRaw(e)
     or
@@ -6450,7 +5894,6 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a synthesized `TLocatable` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertLocatableToRaw(TLocatable e) {
     result = convertArgumentToRaw(e)
     or
@@ -6467,7 +5910,6 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a synthesized `TLocation` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertLocationToRaw(TLocation e) {
     result = convertDbLocationToRaw(e)
     or
@@ -6478,7 +5920,6 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a synthesized `TAbstractStorageDecl` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertAbstractStorageDeclToRaw(TAbstractStorageDecl e) {
     result = convertSubscriptDeclToRaw(e)
     or
@@ -6489,7 +5930,6 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a synthesized `TAbstractTypeParamDecl` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertAbstractTypeParamDeclToRaw(TAbstractTypeParamDecl e) {
     result = convertAssociatedTypeDeclToRaw(e)
     or
@@ -6500,7 +5940,6 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a synthesized `TAccessorOrNamedFunction` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertAccessorOrNamedFunctionToRaw(TAccessorOrNamedFunction e) {
     result = convertAccessorToRaw(e)
     or
@@ -6511,7 +5950,6 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a synthesized `TDecl` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertDeclToRaw(TDecl e) {
     result = convertCapturedDeclToRaw(e)
     or
@@ -6542,7 +5980,6 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a synthesized `TFunction` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertFunctionToRaw(TFunction e) {
     result = convertAccessorOrNamedFunctionToRaw(e)
     or
@@ -6555,7 +5992,6 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a synthesized `TGenericContext` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertGenericContextToRaw(TGenericContext e) {
     result = convertExtensionDeclToRaw(e)
     or
@@ -6572,7 +6008,6 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a synthesized `TGenericTypeDecl` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertGenericTypeDeclToRaw(TGenericTypeDecl e) {
     result = convertNominalTypeDeclToRaw(e)
     or
@@ -6585,7 +6020,6 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a synthesized `TNominalTypeDecl` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertNominalTypeDeclToRaw(TNominalTypeDecl e) {
     result = convertClassDeclToRaw(e)
     or
@@ -6600,7 +6034,6 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a synthesized `TOperatorDecl` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertOperatorDeclToRaw(TOperatorDecl e) {
     result = convertInfixOperatorDeclToRaw(e)
     or
@@ -6613,7 +6046,6 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a synthesized `TTypeDecl` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertTypeDeclToRaw(TTypeDecl e) {
     result = convertAbstractTypeParamDeclToRaw(e)
     or
@@ -6626,7 +6058,6 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a synthesized `TValueDecl` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertValueDeclToRaw(TValueDecl e) {
     result = convertAbstractStorageDeclToRaw(e)
     or
@@ -6643,7 +6074,6 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a synthesized `TVarDecl` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertVarDeclToRaw(TVarDecl e) {
     result = convertConcreteVarDeclToRaw(e)
     or
@@ -6654,7 +6084,6 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a synthesized `TAnyTryExpr` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertAnyTryExprToRaw(TAnyTryExpr e) {
     result = convertForceTryExprToRaw(e)
     or
@@ -6667,7 +6096,6 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a synthesized `TApplyExpr` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertApplyExprToRaw(TApplyExpr e) {
     result = convertBinaryExprToRaw(e)
     or
@@ -6684,7 +6112,6 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a synthesized `TBuiltinLiteralExpr` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertBuiltinLiteralExprToRaw(TBuiltinLiteralExpr e) {
     result = convertBooleanLiteralExprToRaw(e)
     or
@@ -6699,7 +6126,6 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a synthesized `TCheckedCastExpr` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertCheckedCastExprToRaw(TCheckedCastExpr e) {
     result = convertConditionalCheckedCastExprToRaw(e)
     or
@@ -6712,7 +6138,6 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a synthesized `TClosureExpr` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertClosureExprToRaw(TClosureExpr e) {
     result = convertAutoClosureExprToRaw(e)
     or
@@ -6723,7 +6148,6 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a synthesized `TCollectionExpr` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertCollectionExprToRaw(TCollectionExpr e) {
     result = convertArrayExprToRaw(e)
     or
@@ -6734,7 +6158,6 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a synthesized `TDynamicLookupExpr` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertDynamicLookupExprToRaw(TDynamicLookupExpr e) {
     result = convertDynamicMemberRefExprToRaw(e)
     or
@@ -6745,7 +6168,6 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a synthesized `TExplicitCastExpr` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertExplicitCastExprToRaw(TExplicitCastExpr e) {
     result = convertCheckedCastExprToRaw(e)
     or
@@ -6756,7 +6178,6 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a synthesized `TExpr` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertExprToRaw(TExpr e) {
     result = convertAnyTryExprToRaw(e)
     or
@@ -6873,7 +6294,6 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a synthesized `TIdentityExpr` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertIdentityExprToRaw(TIdentityExpr e) {
     result = convertAwaitExprToRaw(e)
     or
@@ -6890,7 +6310,6 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a synthesized `TImplicitConversionExpr` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertImplicitConversionExprToRaw(TImplicitConversionExpr e) {
     result = convertAbiSafeConversionExprToRaw(e)
     or
@@ -6961,7 +6380,6 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a synthesized `TLiteralExpr` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertLiteralExprToRaw(TLiteralExpr e) {
     result = convertBuiltinLiteralExprToRaw(e)
     or
@@ -6978,7 +6396,6 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a synthesized `TLookupExpr` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertLookupExprToRaw(TLookupExpr e) {
     result = convertDynamicLookupExprToRaw(e)
     or
@@ -6993,7 +6410,6 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a synthesized `TNumberLiteralExpr` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertNumberLiteralExprToRaw(TNumberLiteralExpr e) {
     result = convertFloatLiteralExprToRaw(e)
     or
@@ -7004,7 +6420,6 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a synthesized `TSelfApplyExpr` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertSelfApplyExprToRaw(TSelfApplyExpr e) {
     result = convertDotSyntaxCallExprToRaw(e)
     or
@@ -7015,7 +6430,6 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a synthesized `TPattern` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertPatternToRaw(TPattern e) {
     result = convertAnyPatternToRaw(e)
     or
@@ -7044,7 +6458,6 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a synthesized `TLabeledConditionalStmt` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertLabeledConditionalStmtToRaw(TLabeledConditionalStmt e) {
     result = convertGuardStmtToRaw(e)
     or
@@ -7057,7 +6470,6 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a synthesized `TLabeledStmt` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertLabeledStmtToRaw(TLabeledStmt e) {
     result = convertDoCatchStmtToRaw(e)
     or
@@ -7076,7 +6488,6 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a synthesized `TStmt` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertStmtToRaw(TStmt e) {
     result = convertBraceStmtToRaw(e)
     or
@@ -7111,7 +6522,6 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a synthesized `TAnyBuiltinIntegerType` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertAnyBuiltinIntegerTypeToRaw(TAnyBuiltinIntegerType e) {
     result = convertBuiltinIntegerLiteralTypeToRaw(e)
     or
@@ -7122,7 +6532,6 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a synthesized `TAnyFunctionType` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertAnyFunctionTypeToRaw(TAnyFunctionType e) {
     result = convertFunctionTypeToRaw(e)
     or
@@ -7133,7 +6542,6 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a synthesized `TAnyGenericType` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertAnyGenericTypeToRaw(TAnyGenericType e) {
     result = convertNominalOrBoundGenericNominalTypeToRaw(e)
     or
@@ -7144,7 +6552,6 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a synthesized `TAnyMetatypeType` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertAnyMetatypeTypeToRaw(TAnyMetatypeType e) {
     result = convertExistentialMetatypeTypeToRaw(e)
     or
@@ -7155,7 +6562,6 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a synthesized `TArchetypeType` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertArchetypeTypeToRaw(TArchetypeType e) {
     result = convertLocalArchetypeTypeToRaw(e)
     or
@@ -7170,7 +6576,6 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a synthesized `TBoundGenericType` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertBoundGenericTypeToRaw(TBoundGenericType e) {
     result = convertBoundGenericClassTypeToRaw(e)
     or
@@ -7183,7 +6588,6 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a synthesized `TBuiltinType` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertBuiltinTypeToRaw(TBuiltinType e) {
     result = convertAnyBuiltinIntegerTypeToRaw(e)
     or
@@ -7212,7 +6616,6 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a synthesized `TLocalArchetypeType` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertLocalArchetypeTypeToRaw(TLocalArchetypeType e) {
     result = convertElementArchetypeTypeToRaw(e)
     or
@@ -7223,7 +6626,6 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a synthesized `TNominalOrBoundGenericNominalType` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertNominalOrBoundGenericNominalTypeToRaw(TNominalOrBoundGenericNominalType e) {
     result = convertBoundGenericTypeToRaw(e)
     or
@@ -7234,7 +6636,6 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a synthesized `TNominalType` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertNominalTypeToRaw(TNominalType e) {
     result = convertClassTypeToRaw(e)
     or
@@ -7249,7 +6650,6 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a synthesized `TReferenceStorageType` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertReferenceStorageTypeToRaw(TReferenceStorageType e) {
     result = convertUnmanagedStorageTypeToRaw(e)
     or
@@ -7262,7 +6662,6 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a synthesized `TSubstitutableType` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertSubstitutableTypeToRaw(TSubstitutableType e) {
     result = convertArchetypeTypeToRaw(e)
     or
@@ -7273,7 +6672,6 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a synthesized `TSugarType` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertSugarTypeToRaw(TSugarType e) {
     result = convertParenTypeToRaw(e)
     or
@@ -7286,7 +6684,6 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a synthesized `TSyntaxSugarType` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertSyntaxSugarTypeToRaw(TSyntaxSugarType e) {
     result = convertDictionaryTypeToRaw(e)
     or
@@ -7297,7 +6694,6 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a synthesized `TType` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertTypeToRaw(TType e) {
     result = convertAnyFunctionTypeToRaw(e)
     or
@@ -7346,7 +6742,6 @@ module Synth {
    * INTERNAL: Do not use.
    * Converts a synthesized `TUnarySyntaxSugarType` to a raw DB element, if possible.
    */
-  cached
   Raw::Element convertUnarySyntaxSugarTypeToRaw(TUnarySyntaxSugarType e) {
     result = convertArraySliceTypeToRaw(e)
     or
diff --git a/swift/ql/lib/qlpack.yml b/swift/ql/lib/qlpack.yml
index dac64ed9ea9..bc08ee6ac2e 100644
--- a/swift/ql/lib/qlpack.yml
+++ b/swift/ql/lib/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/swift-all
-version: 2.0.1-dev
+version: 2.0.4-dev
 groups: swift
 extractor: swift
 dbscheme: swift.dbscheme
diff --git a/swift/ql/src/CHANGELOG.md b/swift/ql/src/CHANGELOG.md
index 6e8b43032bd..8890e7e83a4 100644
--- a/swift/ql/src/CHANGELOG.md
+++ b/swift/ql/src/CHANGELOG.md
@@ -1,3 +1,15 @@
+## 1.0.11
+
+No user-facing changes.
+
+## 1.0.10
+
+No user-facing changes.
+
+## 1.0.9
+
+No user-facing changes.
+
 ## 1.0.8
 
 No user-facing changes.
diff --git a/swift/ql/src/change-notes/released/1.0.10.md b/swift/ql/src/change-notes/released/1.0.10.md
new file mode 100644
index 00000000000..b601d878453
--- /dev/null
+++ b/swift/ql/src/change-notes/released/1.0.10.md
@@ -0,0 +1,3 @@
+## 1.0.10
+
+No user-facing changes.
diff --git a/swift/ql/src/change-notes/released/1.0.11.md b/swift/ql/src/change-notes/released/1.0.11.md
new file mode 100644
index 00000000000..245e0812108
--- /dev/null
+++ b/swift/ql/src/change-notes/released/1.0.11.md
@@ -0,0 +1,3 @@
+## 1.0.11
+
+No user-facing changes.
diff --git a/swift/ql/src/change-notes/released/1.0.9.md b/swift/ql/src/change-notes/released/1.0.9.md
new file mode 100644
index 00000000000..ee073f7ec16
--- /dev/null
+++ b/swift/ql/src/change-notes/released/1.0.9.md
@@ -0,0 +1,3 @@
+## 1.0.9
+
+No user-facing changes.
diff --git a/swift/ql/src/codeql-pack.release.yml b/swift/ql/src/codeql-pack.release.yml
index 5c55fbd52ed..56a2fb38872 100644
--- a/swift/ql/src/codeql-pack.release.yml
+++ b/swift/ql/src/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.0.8
+lastReleaseVersion: 1.0.11
diff --git a/swift/ql/src/qlpack.yml b/swift/ql/src/qlpack.yml
index ff1a0b18e74..dcc0f94dcf4 100644
--- a/swift/ql/src/qlpack.yml
+++ b/swift/ql/src/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/swift-queries
-version: 1.0.9-dev
+version: 1.0.12-dev
 groups:
   - swift
   - queries
diff --git a/swift/ql/test/TestUtilities/InlineExpectationsTest.qll b/swift/ql/test/TestUtilities/InlineExpectationsTest.qll
index 96c537a022b..da8cde37b93 100644
--- a/swift/ql/test/TestUtilities/InlineExpectationsTest.qll
+++ b/swift/ql/test/TestUtilities/InlineExpectationsTest.qll
@@ -3,33 +3,6 @@
  * See `shared/util/codeql/util/test/InlineExpectationsTest.qll`
  */
 
-private import swift as S
 private import codeql.util.test.InlineExpectationsTest
-
-private module Impl implements InlineExpectationsTestSig {
-  private newtype TExpectationComment = MkExpectationComment(S::SingleLineComment c)
-
-  /**
-   * A class representing a line comment.
-   * Unlike the `SingleLineComment` class, however, the string returned by `getContents` does _not_
-   * include the preceding comment marker (`//`).
-   */
-  class ExpectationComment extends TExpectationComment {
-    S::SingleLineComment comment;
-
-    ExpectationComment() { this = MkExpectationComment(comment) }
-
-    /** Returns the contents of the given comment, _without_ the preceding comment marker (`//`). */
-    string getContents() { result = comment.getText().suffix(2) }
-
-    /** Gets a textual representation of this element. */
-    string toString() { result = comment.toString() }
-
-    /** Gets the location of this comment. */
-    Location getLocation() { result = comment.getLocation() }
-  }
-
-  class Location = S::Location;
-}
-
+private import internal.InlineExpectationsTestImpl
 import Make<Impl>
diff --git a/swift/ql/test/TestUtilities/InlineExpectationsTestQuery.ql b/swift/ql/test/TestUtilities/InlineExpectationsTestQuery.ql
new file mode 100644
index 00000000000..a7c112bc00e
--- /dev/null
+++ b/swift/ql/test/TestUtilities/InlineExpectationsTestQuery.ql
@@ -0,0 +1,21 @@
+/**
+ * @kind test-postprocess
+ */
+
+private import swift
+private import codeql.util.test.InlineExpectationsTest as T
+private import internal.InlineExpectationsTestImpl
+import T::TestPostProcessing
+import T::TestPostProcessing::Make<Impl, Input>
+
+private module Input implements T::TestPostProcessing::InputSig<Impl> {
+  string getRelativeUrl(Location location) {
+    exists(File f, int startline, int startcolumn, int endline, int endcolumn |
+      location.hasLocationInfo(_, startline, startcolumn, endline, endcolumn) and
+      f = location.getFile()
+    |
+      result =
+        f.getRelativePath() + ":" + startline + ":" + startcolumn + ":" + endline + ":" + endcolumn
+    )
+  }
+}
diff --git a/swift/ql/test/TestUtilities/internal/InlineExpectationsTestImpl.qll b/swift/ql/test/TestUtilities/internal/InlineExpectationsTestImpl.qll
new file mode 100644
index 00000000000..af84a908633
--- /dev/null
+++ b/swift/ql/test/TestUtilities/internal/InlineExpectationsTestImpl.qll
@@ -0,0 +1,28 @@
+private import swift as S
+private import codeql.util.test.InlineExpectationsTest
+
+module Impl implements InlineExpectationsTestSig {
+  private newtype TExpectationComment = MkExpectationComment(S::SingleLineComment c)
+
+  /**
+   * A class representing a line comment.
+   * Unlike the `SingleLineComment` class, however, the string returned by `getContents` does _not_
+   * include the preceding comment marker (`//`).
+   */
+  class ExpectationComment extends TExpectationComment {
+    S::SingleLineComment comment;
+
+    ExpectationComment() { this = MkExpectationComment(comment) }
+
+    /** Returns the contents of the given comment, _without_ the preceding comment marker (`//`). */
+    string getContents() { result = comment.getText().suffix(2) }
+
+    /** Gets a textual representation of this element. */
+    string toString() { result = comment.toString() }
+
+    /** Gets the location of this comment. */
+    Location getLocation() { result = comment.getLocation() }
+  }
+
+  class Location = S::Location;
+}
diff --git a/swift/ql/test/library-tests/controlflow/graph/Cfg.expected b/swift/ql/test/library-tests/controlflow/graph/Cfg.expected
index 184b07a132f..a1c28db69a1 100644
--- a/swift/ql/test/library-tests/controlflow/graph/Cfg.expected
+++ b/swift/ql/test/library-tests/controlflow/graph/Cfg.expected
@@ -1,7006 +1,2306 @@
-#-----|  ... = ...
-#-----|  -> exit set (normal)
-
-#-----|  ... = ...
-#-----|  -> exit set (normal)
-
-#-----|  ... = ...
-#-----|  -> exit set (normal)
-
-#-----|  ... = ...
-#-----|  -> exit set (normal)
-
-#-----|  ... = ...
-#-----|  -> exit set (normal)
-
-#-----|  ... = ...
-#-----|  -> exit set (normal)
-
-#-----|  ... = ...
-#-----|  -> exit set (normal)
-
-#-----| &...
-#-----|  -> yield ...
-
-#-----| &...
-#-----|  -> yield ...
-
-#-----| &...
-#-----|  -> yield ...
-
-#-----| &...
-#-----|  -> yield ...
-
-#-----| &...
-#-----|  -> yield ...
-
-#-----| &...
-#-----|  -> yield ...
-
-#-----| &...
-#-----|  -> yield ...
-
-#-----| .b
-#-----|  -> return ...
-
-#-----| .b
-#-----|  -> value
-
-#-----| .bs
-#-----|  -> return ...
-
-#-----| .bs
-#-----|  -> value
-
-#-----| .c
-#-----|  -> return ...
-
-#-----| .field
-#-----|  -> return ...
-
-#-----| .field
-#-----|  -> value
-
-#-----| .mayB
-#-----|  -> return ...
-
-#-----| .mayB
-#-----|  -> value
-
-#-----| .myInt
-#-----|  -> return ...
-
-#-----| .x
-#-----|  -> return ...
-
-#-----| .x
-#-----|  -> value
-
-#-----| .x
-#-----|  -> return ...
-
-#-----| .x
-#-----|  -> value
-
-#-----| .x
-#-----|  -> return ...
-
-#-----| .x
-#-----|  -> value
-
-#-----| KeyPathComponent
-#-----|  -> #keyPath(...)
-
-#-----| await ...
-#-----|  -> for ... in ... { ... }
-
-#-----| getter for .b
-#-----|  -> &...
-
-#-----| getter for .bs
-#-----|  -> &...
-
-#-----| getter for .field
-#-----|  -> &...
-
-#-----| getter for .mayB
-#-----|  -> &...
-
-#-----| getter for .x
-#-----|  -> &...
-
-#-----| getter for .x
-#-----|  -> &...
-
-#-----| getter for .x
-#-----|  -> &...
-
-#-----| n
-#-----|  -> _unimplementedInitializer(className:initName:file:line:column:)
-
-#-----| return
-#-----| return -> exit Derived.init(n:) (normal)
-
-#-----| return ...
-#-----| return -> exit get (normal)
-
-#-----| return ...
-#-----| return -> exit get (normal)
-
-#-----| return ...
-#-----| return -> exit get (normal)
-
-#-----| return ...
-#-----| return -> exit get (normal)
-
-#-----| return ...
-#-----| return -> exit get (normal)
-
-#-----| return ...
-#-----| return -> exit get (normal)
-
-#-----| return ...
-#-----| return -> exit get (normal)
-
-#-----| return ...
-#-----| return -> exit get (normal)
-
-#-----| return ...
-#-----| return -> exit get (normal)
-
-#-----| self
-#-----|  -> .myInt
-
-#-----| self
-#-----|  -> .c
-
-#-----| self
-#-----|  -> .field
-
-#-----| self
-#-----|  -> .field
-
-#-----| self
-#-----|  -> getter for .field
-
-#-----| self
-#-----|  -> .x
-
-#-----| self
-#-----|  -> .x
-
-#-----| self
-#-----|  -> getter for .x
-
-#-----| self
-#-----|  -> .x
-
-#-----| self
-#-----|  -> .x
-
-#-----| self
-#-----|  -> getter for .x
-
-#-----| self
-#-----|  -> .x
-
-#-----| self
-#-----|  -> .x
-
-#-----| self
-#-----|  -> getter for .x
-
-#-----| self
-#-----|  -> .mayB
-
-#-----| self
-#-----|  -> .mayB
-
-#-----| self
-#-----|  -> getter for .mayB
-
-#-----| self
-#-----|  -> .bs
-
-#-----| self
-#-----|  -> .bs
-
-#-----| self
-#-----|  -> getter for .bs
-
-#-----| self
-#-----|  -> .b
-
-#-----| self
-#-----|  -> .b
-
-#-----| self
-#-----|  -> getter for .b
-
-#-----| value
-#-----|  ->  ... = ...
-
-#-----| value
-#-----|  ->  ... = ...
-
-#-----| value
-#-----|  ->  ... = ...
-
-#-----| value
-#-----|  ->  ... = ...
-
-#-----| value
-#-----|  ->  ... = ...
-
-#-----| value
-#-----|  ->  ... = ...
-
-#-----| value
-#-----|  ->  ... = ...
-
-#-----| var ... = ...
-#-----|  -> .next()
-
-#-----| var ... = ...
-#-----|  -> .next()
-
-#-----| var ... = ...
-#-----|  -> .next()
-
-cfg.swift:
-#    5| enter returnZero()
-#-----|  -> returnZero()
-
-#    5| exit returnZero()
-
-#    5| exit returnZero() (normal)
-#-----|  -> exit returnZero()
-
-#    5| returnZero()
-#-----|  -> 0
-
-#    5| return ...
-#-----| return -> exit returnZero() (normal)
-
-#    5| 0
-#-----|  -> return ...
-
-#   15| enter isZero(x:)
-#-----|  -> isZero(x:)
-
-#   15| exit isZero(x:)
-
-#   15| exit isZero(x:) (normal)
-#-----|  -> exit isZero(x:)
-
-#   15| isZero(x:)
-#-----|  -> x
-
-#   15| x
-#-----|  -> .==(_:_:)
-
-#   15| return ...
-#-----| return -> exit isZero(x:) (normal)
-
-#   15| x
-#-----|  -> 0
-
-#   15| ... .==(_:_:) ...
-#-----|  -> return ...
-
-#   15| .==(_:_:)
-#-----|  -> Int.Type
-
-#   15| Int.Type
-#-----|  -> x
-
-#   15| 0
-#-----|  -> ... .==(_:_:) ...
-
-#   17| enter mightThrow(x:)
-#-----|  -> mightThrow(x:)
-
-#   17| exit mightThrow(x:)
-
-#   17| exit mightThrow(x:) (abnormal)
-#-----|  -> exit mightThrow(x:)
-
-#   17| exit mightThrow(x:) (normal)
-#-----|  -> exit mightThrow(x:)
-
-#   17| mightThrow(x:)
-#-----|  -> x
-
-#   17| x
-#-----|  -> guard ... else { ... }
-
-#   18| guard ... else { ... }
-#-----|  -> StmtCondition
-
-#   18| x
-#-----|  -> 0
-
-#   18| ... .>=(_:_:) ...
-#-----| false -> .error1
-#-----| true -> guard ... else { ... }
-
-#   18| StmtCondition
-#-----|  -> .>=(_:_:)
-
-#   18| .>=(_:_:)
-#-----|  -> Int.Type
-
-#   18| Int.Type
-#-----|  -> x
-
-#   18| 0
-#-----|  -> ... .>=(_:_:) ...
-
-#   19| throw ...
-#-----| exception -> exit mightThrow(x:) (abnormal)
-
-#   19| MyError.Type
-#-----|  -> (any Error) ...
-
-#   19| (any Error) ...
-#-----|  -> throw ...
-
-#   19| .error1
-#-----|  -> MyError.Type
-
-#   21| guard ... else { ... }
-#-----|  -> StmtCondition
-
-#   21| x
-#-----|  -> 0
-
-#   21| ... .<=(_:_:) ...
-#-----| true -> exit mightThrow(x:) (normal)
-#-----| false -> .error3
-
-#   21| StmtCondition
-#-----|  -> .<=(_:_:)
-
-#   21| .<=(_:_:)
-#-----|  -> Int.Type
-
-#   21| Int.Type
-#-----|  -> x
-
-#   21| 0
-#-----|  -> ... .<=(_:_:) ...
-
-#   22| throw ...
-#-----| exception -> exit mightThrow(x:) (abnormal)
-
-#   22| MyError.Type
-#-----|  -> .+(_:_:)
-
-#   22| .error3
-#-----|  -> MyError.Type
-
-#   22| (any Error) ...
-#-----|  -> throw ...
-
-#   22| call to ...
-#-----|  -> (any Error) ...
-
-#   22| x
-#-----|  -> 1
-
-#   22| ... .+(_:_:) ...
-#-----|  -> call to ...
-
-#   22| .+(_:_:)
-#-----|  -> Int.Type
-
-#   22| Int.Type
-#-----|  -> x
-
-#   22| 1
-#-----|  -> ... .+(_:_:) ...
-
-#   26| enter tryCatch(x:)
-#-----|  -> tryCatch(x:)
-
-#   26| exit tryCatch(x:)
-
-#   26| exit tryCatch(x:) (normal)
-#-----|  -> exit tryCatch(x:)
-
-#   26| tryCatch(x:)
-#-----|  -> x
-
-#   26| x
-#-----|  -> do { ... } catch { ... }
-
-#   27| do { ... } catch { ... }
-#-----|  -> mightThrow(x:)
-
-#   28| try ...
-#-----|  -> print(_:separator:terminator:)
-
-#   28| mightThrow(x:)
-#-----|  -> 0
-
-#   28| call to mightThrow(x:)
-#-----|  -> try ...
-#-----| exception -> case ...
-
-#   28| 0
-#-----|  -> call to mightThrow(x:)
-
-#   29| print(_:separator:terminator:)
-#-----|  -> Did not throw.
-
-#   29| call to print(_:separator:terminator:)
-#-----|  -> mightThrow(x:)
-
-#   29| default separator
-#-----|  -> default terminator
-
-#   29| default terminator
-#-----|  -> call to print(_:separator:terminator:)
-
-#   29| (Any) ...
-#-----|  -> [...]
-
-#   29| Did not throw.
-#-----|  -> (Any) ...
-
-#   29| [...]
-#-----|  -> [...]
-
-#   29| [...]
-#-----|  -> default separator
-
-#   30| try! ...
-#-----|  -> print(_:separator:terminator:)
-
-#   30| mightThrow(x:)
-#-----|  -> 0
-
-#   30| call to mightThrow(x:)
-#-----|  -> try! ...
-#-----| exception -> case ...
-
-#   30| 0
-#-----|  -> call to mightThrow(x:)
-
-#   31| print(_:separator:terminator:)
-#-----|  -> Still did not throw.
-
-#   31| call to print(_:separator:terminator:)
-#-----|  -> 0
-
-#   31| default separator
-#-----|  -> default terminator
-
-#   31| default terminator
-#-----|  -> call to print(_:separator:terminator:)
-
-#   31| (Any) ...
-#-----|  -> [...]
-
-#   31| Still did not throw.
-#-----|  -> (Any) ...
-
-#   31| [...]
-#-----|  -> [...]
-
-#   31| [...]
-#-----|  -> default separator
-
-#   33| case ...
-#-----|  -> ... is ...
-
-#   33| ... is ...
-#-----|  -> .error1
-
-#   33| ... is ...
-#-----| no-match -> ... is ... where ...
-#-----| match -> 0
-
-#   33| .error1
-#-----| match, no-match -> ... is ...
-
-#   33| ... is ...
-#-----| match, no-match -> call to isZero(x:)
-#-----| no-match -> case ...
-
-#   33| .error2
-#-----| match, no-match -> ... is ...
-
-#   33| ... is ... where ...
-#-----|  -> .error2
-
-#   33| call to isZero(x:)
-
-#   34| return ...
-#-----| return -> exit tryCatch(x:) (normal)
-
-#   34| 0
-#-----|  -> return ...
-
-#   35| case ...
-#-----|  -> ... is ...
-
-#   35| ... is ...
-#-----|  -> .error3(...)
-
-#   35| ... is ...
-#-----| match -> withParam
-#-----| no-match -> case ...
-
-#   35| .error3(...)
-#-----| no-match -> ... is ...
-#-----| match -> (...)
-
-#   35| (...)
-#-----|  -> withParam
-
-#   35| let ...
-#-----| match -> ... is ...
-
-#   35| withParam
-#-----| match -> let ...
-
-#   36| return ...
-#-----| return -> exit tryCatch(x:) (normal)
-
-#   36| withParam
-#-----|  -> return ...
-
-#   37| case ...
-#-----|  -> ... is ...
-
-#   37| ... is ...
-#-----|  -> ... is ...
-
-#   37| ... is ...
-#-----| match -> print(_:separator:terminator:)
-#-----| no-match -> case ...
-
-#   38| print(_:separator:terminator:)
-#-----|  -> MyError
-
-#   38| call to print(_:separator:terminator:)
-#-----|  -> 0
-
-#   38| default separator
-#-----|  -> default terminator
-
-#   38| default terminator
-#-----|  -> call to print(_:separator:terminator:)
-
-#   38| (Any) ...
-#-----|  -> [...]
-
-#   38| MyError
-#-----|  -> (Any) ...
-
-#   38| [...]
-#-----|  -> [...]
-
-#   38| [...]
-#-----|  -> default separator
-
-#   39| case ...
-#-----|  -> error
-
-#   39| error
-#-----|  -> error
-
-#   39| error
-#-----| match -> let ...
-
-#   39| let ...
-#-----| match -> print(_:separator:terminator:)
-
-#   40| print(_:separator:terminator:)
-#-----|  -> OpaqueValueExpr
-
-#   40| call to print(_:separator:terminator:)
-#-----|  -> 0
-
-#   40| default separator
-#-----|  -> default terminator
-
-#   40| default terminator
-#-----|  -> call to print(_:separator:terminator:)
-
-#   40| "..."
-#-----|  -> (Any) ...
-
-#   40| (Any) ...
-#-----|  -> [...]
-
-#   40| OpaqueValueExpr
-#-----|  -> .appendLiteral(_:)
-
-#   40| TapExpr
-#-----|  -> "..."
-
-#   40| Unknown error 
-#-----|  -> call to appendLiteral(_:)
-
-#   40| [...]
-#-----|  -> [...]
-
-#   40| [...]
-#-----|  -> default separator
-
-#   40| call to appendLiteral(_:)
-#-----|  -> .appendInterpolation(_:)
-
-#   40| $interpolation
-#-----|  -> &...
-
-#   40| &...
-#-----|  -> Unknown error 
-
-#   40| .appendLiteral(_:)
-#-----|  -> $interpolation
-
-#   40| $interpolation
-#-----|  -> &...
-
-#   40| &...
-#-----|  -> error
-
-#   40| .appendInterpolation(_:)
-#-----|  -> $interpolation
-
-#   40| call to appendInterpolation(_:)
-#-----|  -> .appendLiteral(_:)
-
-#   40| error
-#-----|  -> call to appendInterpolation(_:)
-
-#   40| 
-#-----|  -> call to appendLiteral(_:)
-
-#   40| $interpolation
-#-----|  -> &...
-
-#   40| &...
-#-----|  -> 
-
-#   40| .appendLiteral(_:)
-#-----|  -> $interpolation
-
-#   40| call to appendLiteral(_:)
-#-----|  -> TapExpr
-
-#   42| return ...
-#-----| return -> exit tryCatch(x:) (normal)
-
-#   42| 0
-#-----|  -> return ...
-
-#   45| createClosure1(s:)
-#-----|  -> s
-
-#   45| enter createClosure1(s:)
-#-----|  -> createClosure1(s:)
-
-#   45| exit createClosure1(s:)
-
-#   45| exit createClosure1(s:) (normal)
-#-----|  -> exit createClosure1(s:)
-
-#   45| s
-#-----|  -> { ... }
-
-#   46| return ...
-#-----| return -> exit createClosure1(s:) (normal)
-
-#   46| enter { ... }
-#-----|  -> { ... }
-
-#   46| exit { ... }
-
-#   46| exit { ... } (normal)
-#-----|  -> exit { ... }
-
-#   46| { ... }
-#-----|  -> .+(_:_:)
-
-#   46| { ... }
-#-----|  -> return ...
-
-#   47| return ...
-#-----| return -> exit { ... } (normal)
-
-#   47| s
-#-----|  -> 
-
-#   47| ... .+(_:_:) ...
-#-----|  -> return ...
-
-#   47| .+(_:_:)
-#-----|  -> String.Type
-
-#   47| String.Type
-#-----|  -> s
-
-#   47| 
-#-----|  -> ... .+(_:_:) ...
-
-#   51| createClosure2(x:)
-#-----|  -> x
-
-#   51| enter createClosure2(x:)
-#-----|  -> createClosure2(x:)
-
-#   51| exit createClosure2(x:)
-
-#   51| exit createClosure2(x:) (normal)
-#-----|  -> exit createClosure2(x:)
-
-#   51| x
-#-----|  -> f(y:)
-
-#   52| enter f(y:)
-#-----|  -> f(y:)
-
-#   52| exit f(y:)
-
-#   52| exit f(y:) (normal)
-#-----|  -> exit f(y:)
-
-#   52| f(y:)
-#-----|  -> y
-
-#   52| f(y:)
-#-----|  -> f(y:)
-
-#   52| y
-#-----|  -> .+(_:_:)
-
-#   53| return ...
-#-----| return -> exit f(y:) (normal)
-
-#   53| x
-#-----|  -> y
-
-#   53| ... .+(_:_:) ...
-#-----|  -> return ...
-
-#   53| .+(_:_:)
-#-----|  -> Int.Type
-
-#   53| Int.Type
-#-----|  -> x
-
-#   53| y
-#-----|  -> ... .+(_:_:) ...
-
-#   55| return ...
-#-----| return -> exit createClosure2(x:) (normal)
-
-#   55| f(y:)
-#-----|  -> return ...
-
-#   58| createClosure3(x:)
-#-----|  -> x
-
-#   58| enter createClosure3(x:)
-#-----|  -> createClosure3(x:)
-
-#   58| exit createClosure3(x:)
-
-#   58| exit createClosure3(x:) (normal)
-#-----|  -> exit createClosure3(x:)
-
-#   58| x
-#-----|  -> { ... }
-
-#   59| return ...
-#-----| return -> exit createClosure3(x:) (normal)
-
-#   59| enter { ... }
-#-----|  -> { ... }
-
-#   59| exit { ... }
-
-#   59| exit { ... } (normal)
-#-----|  -> exit { ... }
-
-#   59| { ... }
-#-----|  -> y
-
-#   59| { ... }
-#-----|  -> return ...
-
-#   60| y
-#-----|  -> .+(_:_:)
-
-#   60| x
-#-----|  -> y
-
-#   60| ... .+(_:_:) ...
-#-----|  -> return ...
-
-#   60| return ...
-#-----| return -> exit { ... } (normal)
-
-#   60| .+(_:_:)
-#-----|  -> Int.Type
-
-#   60| Int.Type
-#-----|  -> x
-
-#   60| y
-#-----|  -> ... .+(_:_:) ...
-
-#   64| callClosures()
-#-----|  -> x1
-
-#   64| enter callClosures()
-#-----|  -> callClosures()
-
-#   64| exit callClosures()
-
-#   64| exit callClosures() (normal)
-#-----|  -> exit callClosures()
-
-#   65| var ... = ...
-#-----|  -> x2
-
-#   65| x1
-#-----| match -> createClosure1(s:)
-
-#   65| createClosure1(s:)
-#-----|  -> 
-
-#   65| call to createClosure1(s:)
-#-----|  -> call to ...
-
-#   65| call to ...
-#-----|  -> var ... = ...
-
-#   65| 
-#-----|  -> call to createClosure1(s:)
-
-#   66| var ... = ...
-#-----|  -> x3
-
-#   66| x2
-#-----| match -> createClosure2(x:)
-
-#   66| createClosure2(x:)
-#-----|  -> 0
-
-#   66| call to createClosure2(x:)
-#-----|  -> 10
-
-#   66| call to ...
-#-----|  -> var ... = ...
-
-#   66| 0
-#-----|  -> call to createClosure2(x:)
-
-#   66| 10
-#-----|  -> call to ...
-
-#   67| var ... = ...
-#-----|  -> exit callClosures() (normal)
-
-#   67| x3
-#-----| match -> createClosure3(x:)
-
-#   67| createClosure3(x:)
-#-----|  -> 0
-
-#   67| call to createClosure3(x:)
-#-----|  -> 10
-
-#   67| call to ...
-#-----|  -> var ... = ...
-
-#   67| 0
-#-----|  -> call to createClosure3(x:)
-
-#   67| 10
-#-----|  -> call to ...
-
-#   70| enter maybeParseInt(s:)
-#-----|  -> maybeParseInt(s:)
-
-#   70| exit maybeParseInt(s:)
-
-#   70| exit maybeParseInt(s:) (normal)
-#-----|  -> exit maybeParseInt(s:)
-
-#   70| maybeParseInt(s:)
-#-----|  -> s
-
-#   70| s
-#-----|  -> n
-
-#   71| var ... = ...
-#-----|  -> n
-
-#   71| n
-#-----| match -> ... as ...
-
-#   71| ... as ...
-#-----| match -> Self.init(_:)
-
-#   71| Int.Type
-#-----|  -> s
-
-#   71| Self.init(_:)
-#-----|  -> Int.Type
-
-#   71| call to Self.init(_:)
-#-----|  -> var ... = ...
-
-#   71| s
-#-----|  -> call to Self.init(_:)
-
-#   72| return ...
-#-----| return -> exit maybeParseInt(s:) (normal)
-
-#   72| (Int?) ...
-#-----|  -> return ...
-
-#   72| n
-#-----|  -> (Int?) ...
-
-#   75| enter forceAndBackToOptional()
-#-----|  -> forceAndBackToOptional()
-
-#   75| exit forceAndBackToOptional()
-
-#   75| exit forceAndBackToOptional() (normal)
-#-----|  -> exit forceAndBackToOptional()
-
-#   75| forceAndBackToOptional()
-#-----|  -> nBang
-
-#   76| var ... = ...
-#-----|  -> n
-
-#   76| nBang
-#-----| match -> maybeParseInt(s:)
-
-#   76| maybeParseInt(s:)
-#-----|  -> 42
-
-#   76| call to maybeParseInt(s:)
-#-----|  -> ...!
-
-#   76| ...!
-#-----|  -> var ... = ...
-
-#   76| 42
-#-----|  -> call to maybeParseInt(s:)
-
-#   77| var ... = ...
-#-----|  -> .+(_:_:)
-
-#   77| n
-#-----| match -> maybeParseInt(s:)
-
-#   77| maybeParseInt(s:)
-#-----|  -> 42
-
-#   77| call to maybeParseInt(s:)
-#-----|  -> var ... = ...
-
-#   77| 42
-#-----|  -> call to maybeParseInt(s:)
-
-#   78| return ...
-#-----| return -> exit forceAndBackToOptional() (normal)
-
-#   78| (Int) ...
-#-----|  -> n
-
-#   78| nBang
-#-----|  -> (Int) ...
-
-#   78| (Int?) ...
-#-----|  -> return ...
-
-#   78| ... .+(_:_:) ...
-#-----|  -> (Int?) ...
-
-#   78| .+(_:_:)
-#-----|  -> Int.Type
-
-#   78| Int.Type
-#-----|  -> nBang
-
-#   78| (Int?) ...
-#-----|  -> ...!
-
-#   78| n
-#-----|  -> (Int?) ...
-
-#   78| ...!
-#-----|  -> ... .+(_:_:) ...
-
-#   81| enter testInOut()
-#-----|  -> testInOut()
-
-#   81| exit testInOut()
-
-#   81| exit testInOut() (normal)
-#-----|  -> exit testInOut()
-
-#   81| testInOut()
-#-----|  -> temp
-
-#   82| var ... = ...
-#-----|  -> add(a:)
-
-#   82| temp
-#-----| match -> 10
-
-#   82| 10
-#-----|  -> var ... = ...
-
-#   84| add(a:)
-#-----|  -> a
-
-#   84| add(a:)
-#-----|  -> addOptional(a:)
-
-#   84| enter add(a:)
-#-----|  -> add(a:)
-
-#   84| exit add(a:)
-
-#   84| exit add(a:) (normal)
-#-----|  -> exit add(a:)
-
-#   84| a
-#-----|  -> a
-
-#   85| a
-#-----|  -> .+(_:_:)
-
-#   85|  ... = ...
-#-----|  -> exit add(a:) (normal)
-
-#   85| (Int) ...
-#-----|  -> 1
-
-#   85| a
-#-----|  -> (Int) ...
-
-#   85| ... .+(_:_:) ...
-#-----|  ->  ... = ...
-
-#   85| .+(_:_:)
-#-----|  -> Int.Type
-
-#   85| Int.Type
-#-----|  -> a
-
-#   85| 1
-#-----|  -> ... .+(_:_:) ...
-
-#   88| addOptional(a:)
-#-----|  -> a
-
-#   88| addOptional(a:)
-#-----|  -> add(a:)
-
-#   88| enter addOptional(a:)
-#-----|  -> addOptional(a:)
-
-#   88| exit addOptional(a:)
-
-#   88| exit addOptional(a:) (normal)
-#-----|  -> exit addOptional(a:)
-
-#   88| a
-#-----|  -> a
-
-#   89| a
-#-----|  -> nil
-
-#   89|  ... = ...
-#-----|  -> exit addOptional(a:) (normal)
-
-#   89| nil
-#-----|  ->  ... = ...
-
-#   92| add(a:)
-#-----|  -> temp
-
-#   92| call to add(a:)
-#-----|  -> tempOptional
-
-#   92| &...
-#-----|  -> call to add(a:)
-
-#   92| temp
-#-----|  -> &...
-
-#   93| var ... = ...
-#-----|  -> addOptional(a:)
-
-#   93| tempOptional
-#-----| match -> ... as ...
-
-#   93| ... as ...
-#-----| match -> 10
-
-#   93| (Int?) ...
-#-----|  -> var ... = ...
-
-#   93| 10
-#-----|  -> (Int?) ...
-
-#   94| addOptional(a:)
-#-----|  -> tempOptional
-
-#   94| call to addOptional(a:)
-#-----|  -> .+(_:_:)
-
-#   94| &...
-#-----|  -> call to addOptional(a:)
-
-#   94| tempOptional
-#-----|  -> &...
-
-#   95| return ...
-#-----| return -> exit testInOut() (normal)
-
-#   95| (Int) ...
-#-----|  -> tempOptional
-
-#   95| temp
-#-----|  -> (Int) ...
-
-#   95| ... .+(_:_:) ...
-#-----|  -> return ...
-
-#   95| .+(_:_:)
-#-----|  -> Int.Type
-
-#   95| Int.Type
-#-----|  -> temp
-
-#   95| (Int?) ...
-#-----|  -> ...!
-
-#   95| tempOptional
-#-----|  -> (Int?) ...
-
-#   95| ...!
-#-----|  -> ... .+(_:_:) ...
-
-#   98| C.deinit()
-#-----|  -> self
-
-#   98| enter C.deinit()
-#-----|  -> C.deinit()
-
-#   98| exit C.deinit()
-
-#   98| exit C.deinit() (normal)
-#-----|  -> exit C.deinit()
-
-#   98| self
-#-----|  -> { ... }
-
-#   98| { ... }
-#-----|  -> exit C.deinit() (normal)
-
-#   99| enter get
-#-----|  -> get
-
-#   99| exit get
-
-#   99| exit get (normal)
-#-----|  -> exit get
-
-#   99| get
-#-----|  -> self
-
-#   99| self
-#-----|  -> self
-
-#  100| self
-#-----|  -> n
-
-#  100| C.init(n:)
-#-----|  -> self
-
-#  100| enter C.init(n:)
-#-----|  -> C.init(n:)
-
-#  100| exit C.init(n:)
-
-#  100| exit C.init(n:) (normal)
-#-----|  -> exit C.init(n:)
-
-#  100| n
-#-----|  -> self
-
-#  101| .myInt
-#-----|  -> n
-
-#  101| self
-#-----|  -> .myInt
-
-#  101|  ... = ...
-#-----|  -> return
-
-#  101| n
-#-----|  ->  ... = ...
-
-#  102| return
-#-----| return -> exit C.init(n:) (normal)
-
-#  104| enter getMyInt()
-#-----|  -> getMyInt()
-
-#  104| exit getMyInt()
-
-#  104| exit getMyInt() (normal)
-#-----|  -> exit getMyInt()
-
-#  104| getMyInt()
-#-----|  -> self
-
-#  104| self
-#-----|  -> self
-
-#  105| return ...
-#-----| return -> exit getMyInt() (normal)
-
-#  105| getter for .myInt
-#-----|  -> return ...
-
-#  105| self
-#-----|  -> getter for .myInt
-
-#  109| enter testMemberRef(param:inoutParam:opt:)
-#-----|  -> testMemberRef(param:inoutParam:opt:)
-
-#  109| exit testMemberRef(param:inoutParam:opt:)
-
-#  109| exit testMemberRef(param:inoutParam:opt:) (normal)
-#-----|  -> exit testMemberRef(param:inoutParam:opt:)
-
-#  109| testMemberRef(param:inoutParam:opt:)
-#-----|  -> param
-
-#  109| param
-#-----|  -> inoutParam
-
-#  109| inoutParam
-#-----|  -> opt
-
-#  109| opt
-#-----|  -> c
-
-#  110| var ... = ...
-#-----|  -> n1
-
-#  110| c
-#-----| match -> C.init(n:)
-
-#  110| C.Type
-#-----|  -> 42
-
-#  110| C.init(n:)
-#-----|  -> C.Type
-
-#  110| call to C.init(n:)
-#-----|  -> var ... = ...
-
-#  110| 42
-#-----|  -> call to C.init(n:)
-
-#  111| var ... = ...
-#-----|  -> n2
-
-#  111| n1
-#-----| match -> c
-
-#  111| c
-#-----|  -> getter for .myInt
-
-#  111| getter for .myInt
-#-----|  -> var ... = ...
-
-#  112| var ... = ...
-#-----|  -> n3
-
-#  112| n2
-#-----| match -> c
-
-#  112| c
-#-----|  -> .self
-
-#  112| .self
-#-----|  -> getter for .myInt
-
-#  112| getter for .myInt
-#-----|  -> var ... = ...
-
-#  113| var ... = ...
-#-----|  -> n4
-
-#  113| n3
-#-----| match -> .getMyInt()
-
-#  113| c
-#-----|  -> call to getMyInt()
-
-#  113| .getMyInt()
-#-----|  -> c
-
-#  113| call to getMyInt()
-#-----|  -> var ... = ...
-
-#  114| var ... = ...
-#-----|  -> n5
-
-#  114| n4
-#-----| match -> .getMyInt()
-
-#  114| c
-#-----|  -> .self
-
-#  114| .self
-#-----|  -> call to getMyInt()
-
-#  114| .getMyInt()
-#-----|  -> c
-
-#  114| call to getMyInt()
-#-----|  -> var ... = ...
-
-#  116| var ... = ...
-#-----|  -> n6
-
-#  116| n5
-#-----| match -> param
-
-#  116| param
-#-----|  -> getter for .myInt
-
-#  116| getter for .myInt
-#-----|  -> var ... = ...
-
-#  117| var ... = ...
-#-----|  -> n7
-
-#  117| n6
-#-----| match -> param
-
-#  117| param
-#-----|  -> .self
-
-#  117| .self
-#-----|  -> getter for .myInt
-
-#  117| getter for .myInt
-#-----|  -> var ... = ...
-
-#  118| var ... = ...
-#-----|  -> n8
-
-#  118| n7
-#-----| match -> .getMyInt()
-
-#  118| param
-#-----|  -> call to getMyInt()
-
-#  118| .getMyInt()
-#-----|  -> param
-
-#  118| call to getMyInt()
-#-----|  -> var ... = ...
-
-#  119| var ... = ...
-#-----|  -> n9
-
-#  119| n8
-#-----| match -> .getMyInt()
-
-#  119| param
-#-----|  -> .self
-
-#  119| .self
-#-----|  -> call to getMyInt()
-
-#  119| .getMyInt()
-#-----|  -> param
-
-#  119| call to getMyInt()
-#-----|  -> var ... = ...
-
-#  121| var ... = ...
-#-----|  -> n10
-
-#  121| n9
-#-----| match -> inoutParam
-
-#  121| (C) ...
-#-----|  -> getter for .myInt
-
-#  121| inoutParam
-#-----|  -> (C) ...
-
-#  121| getter for .myInt
-#-----|  -> var ... = ...
-
-#  122| var ... = ...
-#-----|  -> n11
-
-#  122| n10
-#-----| match -> inoutParam
-
-#  122| inoutParam
-#-----|  -> .self
-
-#  122| (C) ...
-#-----|  -> getter for .myInt
-
-#  122| .self
-#-----|  -> (C) ...
-
-#  122| getter for .myInt
-#-----|  -> var ... = ...
-
-#  123| var ... = ...
-#-----|  -> n12
-
-#  123| n11
-#-----| match -> .getMyInt()
-
-#  123| (C) ...
-#-----|  -> call to getMyInt()
-
-#  123| inoutParam
-#-----|  -> (C) ...
-
-#  123| .getMyInt()
-#-----|  -> inoutParam
-
-#  123| call to getMyInt()
-#-----|  -> var ... = ...
-
-#  124| var ... = ...
-#-----|  -> n13
-
-#  124| n12
-#-----| match -> .getMyInt()
-
-#  124| inoutParam
-#-----|  -> .self
-
-#  124| (C) ...
-#-----|  -> call to getMyInt()
-
-#  124| .self
-#-----|  -> (C) ...
-
-#  124| .getMyInt()
-#-----|  -> inoutParam
-
-#  124| call to getMyInt()
-#-----|  -> var ... = ...
-
-#  126| var ... = ...
-#-----|  -> n14
-
-#  126| n13
-#-----| match -> opt
-
-#  126| opt
-#-----|  -> ...!
-
-#  126| ...!
-#-----|  -> getter for .myInt
-
-#  126| getter for .myInt
-#-----|  -> var ... = ...
-
-#  127| var ... = ...
-#-----|  -> n15
-
-#  127| n14
-#-----| match -> opt
-
-#  127| opt
-#-----|  -> ...!
-
-#  127| ...!
-#-----|  -> .self
-
-#  127| .self
-#-----|  -> getter for .myInt
-
-#  127| getter for .myInt
-#-----|  -> var ... = ...
-
-#  128| var ... = ...
-#-----|  -> n16
-
-#  128| n15
-#-----| match -> .getMyInt()
-
-#  128| opt
-#-----|  -> ...!
-
-#  128| ...!
-#-----|  -> call to getMyInt()
-
-#  128| .getMyInt()
-#-----|  -> opt
-
-#  128| call to getMyInt()
-#-----|  -> var ... = ...
-
-#  129| var ... = ...
-#-----|  -> n17
-
-#  129| n16
-#-----| match -> .getMyInt()
-
-#  129| opt
-#-----|  -> ...!
-
-#  129| ...!
-#-----|  -> .self
-
-#  129| .self
-#-----|  -> call to getMyInt()
-
-#  129| .getMyInt()
-#-----|  -> opt
-
-#  129| call to getMyInt()
-#-----|  -> var ... = ...
-
-#  131| var ... = ...
-#-----|  -> n18
-
-#  131| n17
-#-----| match -> opt
-
-#  131| opt
-#-----|  -> ...?
-
-#  131| ...?
-#-----|  -> getter for .myInt
-
-#  131| (Int?) ...
-#-----|  -> OptionalEvaluationExpr
-
-#  131| OptionalEvaluationExpr
-#-----|  -> var ... = ...
-
-#  131| getter for .myInt
-#-----|  -> (Int?) ...
-
-#  132| var ... = ...
-#-----|  -> n19
-
-#  132| n18
-#-----| match -> opt
-
-#  132| opt
-#-----|  -> ...?
-
-#  132| ...?
-#-----|  -> .self
-
-#  132| .self
-#-----|  -> getter for .myInt
-
-#  132| (Int?) ...
-#-----|  -> OptionalEvaluationExpr
-
-#  132| OptionalEvaluationExpr
-#-----|  -> var ... = ...
-
-#  132| getter for .myInt
-#-----|  -> (Int?) ...
-
-#  133| var ... = ...
-#-----|  -> n20
-
-#  133| n19
-#-----| match -> .getMyInt()
-
-#  133| opt
-#-----|  -> ...?
-
-#  133| ...?
-#-----|  -> call to getMyInt()
-
-#  133| .getMyInt()
-#-----|  -> opt
-
-#  133| (Int?) ...
-#-----|  -> OptionalEvaluationExpr
-
-#  133| OptionalEvaluationExpr
-#-----|  -> var ... = ...
-
-#  133| call to getMyInt()
-#-----|  -> (Int?) ...
-
-#  134| var ... = ...
-#-----|  -> exit testMemberRef(param:inoutParam:opt:) (normal)
-
-#  134| n20
-#-----| match -> .getMyInt()
-
-#  134| opt
-#-----|  -> ...?
-
-#  134| ...?
-#-----|  -> .self
-
-#  134| .self
-#-----|  -> call to getMyInt()
-
-#  134| .getMyInt()
-#-----|  -> opt
-
-#  134| (Int?) ...
-#-----|  -> OptionalEvaluationExpr
-
-#  134| OptionalEvaluationExpr
-#-----|  -> var ... = ...
-
-#  134| call to getMyInt()
-#-----|  -> (Int?) ...
-
-#  137| enter patterns(x:)
-#-----|  -> patterns(x:)
-
-#  137| exit patterns(x:)
-
-#  137| exit patterns(x:) (normal)
-#-----|  -> exit patterns(x:)
-
-#  137| patterns(x:)
-#-----|  -> x
-
-#  137| x
-#-----|  -> $generator
-
-#  138| $generator
-#-----|  -> &...
-
-#  138| &...
-#-----|  -> call to next()
-
-#  138| .next()
-#-----|  -> $generator
-
-#  138| call to next()
-#-----|  -> for ... in ... { ... }
-
-#  138| for ... in ... { ... }
-#-----| non-empty -> _
-#-----| empty -> switch x { ... }
-
-#  138| _
-#-----| match -> { ... }
-
-#  138| $generator
-#-----| match -> .makeIterator()
-
-#  138| 0
-#-----|  -> 10
-
-#  138| ... ....(_:_:) ...
-#-----|  -> call to makeIterator()
-
-#  138| .makeIterator()
-#-----|  -> ....(_:_:)
-
-#  138| call to makeIterator()
-#-----|  -> var ... = ...
-
-#  138| ....(_:_:)
-#-----|  -> Int.Type
-
-#  138| Int.Type
-#-----|  -> 0
-
-#  138| 10
-#-----|  -> ... ....(_:_:) ...
-
-#  138| { ... }
-#-----|  -> .next()
-
-#  140| switch x { ... }
-#-----|  -> x
-
-#  140| x
-#-----|  -> case ...
-
-#  141| case ...
-#-----|  -> =~ ...
-
-#  141| $match
-#-----|  -> ... ~=(_:_:) ...
-
-#  141| ... ~=(_:_:) ...
-#-----|  -> =~ ...
-
-#  141| 0
-#-----|  -> $match
-
-#  141| =~ ...
-#-----|  -> ~=(_:_:)
-
-#  141| =~ ...
-#-----| no-match -> =~ ...
-#-----| match -> true
-
-#  141| ~=(_:_:)
-#-----|  -> 0
-
-#  141| $match
-#-----|  -> ... ~=(_:_:) ...
-
-#  141| ... ~=(_:_:) ...
-#-----|  -> =~ ...
-
-#  141| 1
-#-----|  -> $match
-
-#  141| =~ ...
-#-----|  -> ~=(_:_:)
-
-#  141| =~ ...
-#-----| match -> true
-#-----| no-match -> case ...
-
-#  141| ~=(_:_:)
-#-----|  -> 1
-
-#  142| return ...
-#-----| return -> exit patterns(x:) (normal)
-
-#  142| true
-#-----|  -> return ...
-
-#  144| case ...
-#-----|  -> =~ ... where ...
-
-#  144| $match
-#-----|  -> ... ~=(_:_:) ...
-
-#  144| ... ~=(_:_:) ...
-#-----|  -> =~ ...
-
-#  144| =~ ...
-#-----| match, no-match -> ... .&&(_:_:) ...
-#-----| no-match -> case ...
-
-#  144| x
-#-----|  -> $match
-
-#  144| ~=(_:_:)
-#-----|  -> x
-
-#  144| =~ ... where ...
-#-----|  -> ~=(_:_:)
-
-#  144| ... .&&(_:_:) ...
-
-#  146| _
-#-----| match -> false
-
-#  146| _
-#-----|  -> _
-
-#  146| case ...
-#-----|  -> _
-
-#  147| return ...
-#-----| return -> exit patterns(x:) (normal)
-
-#  147| false
-#-----|  -> return ...
-
-#  163| enter testDefer(x:)
-#-----|  -> testDefer(x:)
-
-#  163| exit testDefer(x:)
-
-#  163| exit testDefer(x:) (normal)
-#-----|  -> exit testDefer(x:)
-
-#  163| testDefer(x:)
-#-----|  -> x
-
-#  163| x
-#-----|  -> defer { ... }
-
-#  165| defer { ... }
-#-----|  -> defer { ... }
-
-#  166| print(_:separator:terminator:)
-#-----|  -> 4
-
-#  166| call to print(_:separator:terminator:)
-#-----|  -> exit testDefer(x:) (normal)
-
-#  166| default separator
-#-----|  -> default terminator
-
-#  166| default terminator
-#-----|  -> call to print(_:separator:terminator:)
-
-#  166| (Any) ...
-#-----|  -> [...]
-
-#  166| 4
-#-----|  -> (Any) ...
-
-#  166| [...]
-#-----|  -> [...]
-
-#  166| [...]
-#-----|  -> default separator
-
-#  169| defer { ... }
-#-----|  -> defer { ... }
-
-#  170| print(_:separator:terminator:)
-#-----|  -> 3
-
-#  170| call to print(_:separator:terminator:)
-#-----|  -> print(_:separator:terminator:)
-
-#  170| default separator
-#-----|  -> default terminator
-
-#  170| default terminator
-#-----|  -> call to print(_:separator:terminator:)
-
-#  170| (Any) ...
-#-----|  -> [...]
-
-#  170| 3
-#-----|  -> (Any) ...
-
-#  170| [...]
-#-----|  -> [...]
-
-#  170| [...]
-#-----|  -> default separator
-
-#  173| defer { ... }
-#-----|  -> print(_:separator:terminator:)
-
-#  174| print(_:separator:terminator:)
-#-----|  -> 1
-
-#  174| call to print(_:separator:terminator:)
-#-----|  -> defer { ... }
-
-#  174| default separator
-#-----|  -> default terminator
-
-#  174| default terminator
-#-----|  -> call to print(_:separator:terminator:)
-
-#  174| (Any) ...
-#-----|  -> [...]
-
-#  174| 1
-#-----|  -> (Any) ...
-
-#  174| [...]
-#-----|  -> [...]
-
-#  174| [...]
-#-----|  -> default separator
-
-#  175| defer { ... }
-#-----|  -> print(_:separator:terminator:)
-
-#  176| print(_:separator:terminator:)
-#-----|  -> 2
-
-#  176| call to print(_:separator:terminator:)
-#-----|  -> print(_:separator:terminator:)
-
-#  176| default separator
-#-----|  -> default terminator
-
-#  176| default terminator
-#-----|  -> call to print(_:separator:terminator:)
-
-#  176| (Any) ...
-#-----|  -> [...]
-
-#  176| 2
-#-----|  -> (Any) ...
-
-#  176| [...]
-#-----|  -> [...]
-
-#  176| [...]
-#-----|  -> default separator
-
-#  181| enter m1(x:)
-#-----|  -> m1(x:)
-
-#  181| exit m1(x:)
-
-#  181| exit m1(x:) (abnormal)
-#-----|  -> exit m1(x:)
-
-#  181| exit m1(x:) (normal)
-#-----|  -> exit m1(x:)
-
-#  181| m1(x:)
-#-----|  -> x
-
-#  181| x
-#-----|  -> if ... then { ... } else { ... }
-
-#  182| if ... then { ... } else { ... }
-#-----|  -> StmtCondition
-
-#  182| x
-#-----|  -> 2
-
-#  182| ... .>(_:_:) ...
-#-----| true -> print(_:separator:terminator:)
-#-----| false -> if ... then { ... } else { ... }
-
-#  182| StmtCondition
-#-----|  -> .>(_:_:)
-
-#  182| .>(_:_:)
-#-----|  -> Int.Type
-
-#  182| Int.Type
-#-----|  -> x
-
-#  182| 2
-#-----|  -> ... .>(_:_:) ...
-
-#  183| print(_:separator:terminator:)
-#-----|  -> x is greater than 2
-
-#  183| call to print(_:separator:terminator:)
-#-----|  -> exit m1(x:) (normal)
-
-#  183| default separator
-#-----|  -> default terminator
-
-#  183| default terminator
-#-----|  -> call to print(_:separator:terminator:)
-
-#  183| (Any) ...
-#-----|  -> [...]
-
-#  183| [...]
-#-----|  -> [...]
-
-#  183| [...]
-#-----|  -> default separator
-
-#  183| x is greater than 2
-#-----|  -> (Any) ...
-
-#  185| if ... then { ... } else { ... }
-#-----|  -> StmtCondition
-
-#  185| x
-#-----|  -> 2
-
-#  185| ... .<=(_:_:) ...
-#-----| false -> [false] ... .&&(_:_:) ...
-#-----| true -> { ... }
-
-#  185| ... .&&(_:_:) ...
-#-----| exception -> exit m1(x:) (abnormal)
-#-----| false -> [false] ... .&&(_:_:) ...
-#-----| true -> { ... }
-
-#  185| [false] ... .&&(_:_:) ...
-#-----| exception -> exit m1(x:) (abnormal)
-#-----| false -> [false] ... .&&(_:_:) ...
-
-#  185| ... .&&(_:_:) ...
-#-----| exception -> exit m1(x:) (abnormal)
-#-----| true -> print(_:separator:terminator:)
-#-----| false -> print(_:separator:terminator:)
-
-#  185| StmtCondition
-#-----|  -> .<=(_:_:)
-
-#  185| [false] ... .&&(_:_:) ...
-#-----| exception -> exit m1(x:) (abnormal)
-#-----| false -> print(_:separator:terminator:)
-
-#  185| .<=(_:_:)
-#-----|  -> Int.Type
-
-#  185| Int.Type
-#-----|  -> x
-
-#  185| 2
-#-----|  -> ... .<=(_:_:) ...
-
-#  185| x
-#-----|  -> 0
-
-#  185| ... .>(_:_:) ...
-#-----|  -> return ...
-
-#  185| return ...
-#-----|  -> ... .&&(_:_:) ...
-
-#  185| { ... }
-#-----|  -> .>(_:_:)
-
-#  185| .>(_:_:)
-#-----|  -> Int.Type
-
-#  185| Int.Type
-#-----|  -> x
-
-#  185| 0
-#-----|  -> ... .>(_:_:) ...
-
-#  185| call to !(_:)
-#-----|  -> return ...
-
-#  185| return ...
-#-----|  -> ... .&&(_:_:) ...
-
-#  185| { ... }
-#-----|  -> .==(_:_:)
-
-#  185| (...)
-#-----|  -> call to !(_:)
-
-#  185| x
-#-----|  -> 5
-
-#  185| ... .==(_:_:) ...
-#-----|  -> (...)
-
-#  185| .==(_:_:)
-#-----|  -> Int.Type
-
-#  185| Int.Type
-#-----|  -> x
-
-#  185| 5
-#-----|  -> ... .==(_:_:) ...
-
-#  186| print(_:separator:terminator:)
-#-----|  -> x is 1
-
-#  186| call to print(_:separator:terminator:)
-#-----|  -> exit m1(x:) (normal)
-
-#  186| default separator
-#-----|  -> default terminator
-
-#  186| default terminator
-#-----|  -> call to print(_:separator:terminator:)
-
-#  186| (Any) ...
-#-----|  -> [...]
-
-#  186| [...]
-#-----|  -> [...]
-
-#  186| [...]
-#-----|  -> default separator
-
-#  186| x is 1
-#-----|  -> (Any) ...
-
-#  189| print(_:separator:terminator:)
-#-----|  -> I can't guess the number
-
-#  189| call to print(_:separator:terminator:)
-#-----|  -> exit m1(x:) (normal)
-
-#  189| default separator
-#-----|  -> default terminator
-
-#  189| default terminator
-#-----|  -> call to print(_:separator:terminator:)
-
-#  189| (Any) ...
-#-----|  -> [...]
-
-#  189| I can't guess the number
-#-----|  -> (Any) ...
-
-#  189| [...]
-#-----|  -> [...]
-
-#  189| [...]
-#-----|  -> default separator
-
-#  193| enter m2(b:)
-#-----|  -> m2(b:)
-
-#  193| exit m2(b:)
-
-#  193| exit m2(b:) (normal)
-#-----|  -> exit m2(b:)
-
-#  193| m2(b:)
-#-----|  -> b
-
-#  193| b
-#-----|  -> if ... then { ... }
-
-#  194| if ... then { ... }
-#-----|  -> StmtCondition
-
-#  194| StmtCondition
-#-----|  -> b
-
-#  194| b
-#-----| true -> 0
-#-----| false -> 1
-
-#  195| return ...
-#-----| return -> exit m2(b:) (normal)
-
-#  195| 0
-#-----|  -> return ...
-
-#  197| return ...
-#-----| return -> exit m2(b:) (normal)
-
-#  197| 1
-#-----|  -> return ...
-
-#  200| enter m3(x:)
-#-----|  -> m3(x:)
-
-#  200| exit m3(x:)
-
-#  200| exit m3(x:) (normal)
-#-----|  -> exit m3(x:)
-
-#  200| m3(x:)
-#-----|  -> x
-
-#  200| x
-#-----|  -> if ... then { ... }
-
-#  201| if ... then { ... }
-#-----|  -> StmtCondition
-
-#  201| (Int) ...
-#-----|  -> 0
-
-#  201| x
-#-----|  -> (Int) ...
-
-#  201| ... .<(_:_:) ...
-#-----| true -> x
-#-----| false -> x
-
-#  201| StmtCondition
-#-----|  -> .<(_:_:)
-
-#  201| .<(_:_:)
-#-----|  -> Int.Type
-
-#  201| Int.Type
-#-----|  -> x
-
-#  201| 0
-#-----|  -> ... .<(_:_:) ...
-
-#  202| x
-#-----|  -> .-(_:)
-
-#  202|  ... = ...
-#-----|  -> if ... then { ... }
-
-#  202| .-(_:)
-#-----|  -> Int.Type
-
-#  202| Int.Type
-#-----|  -> x
-
-#  202| call to -(_:)
-#-----|  ->  ... = ...
-
-#  202| (Int) ...
-#-----|  -> call to -(_:)
-
-#  202| x
-#-----|  -> (Int) ...
-
-#  203| if ... then { ... }
-#-----|  -> StmtCondition
-
-#  203| (Int) ...
-#-----|  -> 10
-
-#  203| x
-#-----|  -> (Int) ...
-
-#  203| ... .>(_:_:) ...
-#-----| true -> x
-#-----| false -> x
-
-#  203| StmtCondition
-#-----|  -> .>(_:_:)
-
-#  203| .>(_:_:)
-#-----|  -> Int.Type
-
-#  203| Int.Type
-#-----|  -> x
-
-#  203| 10
-#-----|  -> ... .>(_:_:) ...
-
-#  204| x
-#-----|  -> .-(_:_:)
-
-#  204|  ... = ...
-#-----|  -> x
-
-#  204| (Int) ...
-#-----|  -> 1
-
-#  204| x
-#-----|  -> (Int) ...
-
-#  204| ... .-(_:_:) ...
-#-----|  ->  ... = ...
-
-#  204| .-(_:_:)
-#-----|  -> Int.Type
-
-#  204| Int.Type
-#-----|  -> x
-
-#  204| 1
-#-----|  -> ... .-(_:_:) ...
-
-#  207| return ...
-#-----| return -> exit m3(x:) (normal)
-
-#  207| (Int) ...
-#-----|  -> return ...
-
-#  207| x
-#-----|  -> (Int) ...
-
-#  210| enter m4(b1:b2:b3:)
-#-----|  -> m4(b1:b2:b3:)
-
-#  210| exit m4(b1:b2:b3:)
-
-#  210| exit m4(b1:b2:b3:) (normal)
-#-----|  -> exit m4(b1:b2:b3:)
-
-#  210| m4(b1:b2:b3:)
-#-----|  -> b1
-
-#  210| b1
-#-----|  -> b2
-
-#  210| b2
-#-----|  -> b3
-
-#  210| b3
-#-----|  -> b1
-
-#  211| return ...
-#-----| return -> exit m4(b1:b2:b3:) (normal)
-
-#  211| [false] (...)
-#-----| false -> !b2 || !b3
-
-#  211| [true] (...)
-#-----| true -> b2 || b3
-
-#  211| ... ? ... : ...
-#-----|  -> return ...
-
-#  211| b1
-#-----| true -> b2
-#-----| false -> b3
-
-#  211| [false] ... ? ... : ...
-#-----| false -> [false] (...)
-
-#  211| [true] ... ? ... : ...
-#-----| true -> [true] (...)
-
-#  211| b2
-#-----| false -> [false] ... ? ... : ...
-#-----| true -> [true] ... ? ... : ...
-
-#  211| b3
-#-----| false -> [false] ... ? ... : ...
-#-----| true -> [true] ... ? ... : ...
-
-#  211| b2 || b3
-#-----|  -> ... ? ... : ...
-
-#  211| !b2 || !b3
-#-----|  -> ... ? ... : ...
-
-#  214| conversionsInSplitEntry(b:)
-#-----|  -> b
-
-#  214| enter conversionsInSplitEntry(b:)
-#-----|  -> conversionsInSplitEntry(b:)
-
-#  214| exit conversionsInSplitEntry(b:)
-
-#  214| exit conversionsInSplitEntry(b:) (normal)
-#-----|  -> exit conversionsInSplitEntry(b:)
-
-#  214| b
-#-----|  -> if ... then { ... } else { ... }
-
-#  215| if ... then { ... } else { ... }
-#-----|  -> StmtCondition
-
-#  215| b
-#-----| true -> true
-#-----| false -> false
-
-#  215| StmtCondition
-#-----|  -> b
-
-#  215| [false] ... ? ... : ...
-#-----| false -> !b
-
-#  215| [true] ... ? ... : ...
-#-----| true -> b
-
-#  215| [true] (...)
-#-----| true -> [true] ... ? ... : ...
-
-#  215| true
-#-----| true -> [true] (...)
-
-#  215| [false] (Bool) ...
-#-----| false -> [false] ... ? ... : ...
-
-#  215| false
-#-----| false -> [false] (Bool) ...
-
-#  216| return ...
-#-----| return -> exit conversionsInSplitEntry(b:) (normal)
-
-#  216| b
-#-----|  -> return ...
-
-#  219| return ...
-#-----| return -> exit conversionsInSplitEntry(b:) (normal)
-
-#  219| !b
-#-----|  -> return ...
-
-#  223| constant_condition()
-#-----|  -> if ... then { ... }
-
-#  223| enter constant_condition()
-#-----|  -> constant_condition()
-
-#  223| exit constant_condition()
-
-#  223| exit constant_condition() (normal)
-#-----|  -> exit constant_condition()
-
-#  224| if ... then { ... }
-#-----|  -> StmtCondition
-
-#  224| StmtCondition
-#-----|  -> true
-
-#  224| [false] call to !(_:)
-#-----| false -> exit constant_condition() (normal)
-
-#  224| true
-#-----| true -> [false] call to !(_:)
-
-#  229| empty_else(b:)
-#-----|  -> b
-
-#  229| enter empty_else(b:)
-#-----|  -> empty_else(b:)
-
-#  229| exit empty_else(b:)
-
-#  229| exit empty_else(b:) (normal)
-#-----|  -> exit empty_else(b:)
-
-#  229| b
-#-----|  -> if ... then { ... } else { ... }
-
-#  230| if ... then { ... } else { ... }
-#-----|  -> StmtCondition
-
-#  230| StmtCondition
-#-----|  -> b
-
-#  230| b
-#-----| true -> print(_:separator:terminator:)
-#-----| false -> { ... }
-
-#  231| print(_:separator:terminator:)
-#-----|  -> true
-
-#  231| call to print(_:separator:terminator:)
-#-----|  -> print(_:separator:terminator:)
-
-#  231| default separator
-#-----|  -> default terminator
-
-#  231| default terminator
-#-----|  -> call to print(_:separator:terminator:)
-
-#  231| (Any) ...
-#-----|  -> [...]
-
-#  231| [...]
-#-----|  -> [...]
-
-#  231| [...]
-#-----|  -> default separator
-
-#  231| true
-#-----|  -> (Any) ...
-
-#  233| { ... }
-#-----|  -> print(_:separator:terminator:)
-
-#  234| print(_:separator:terminator:)
-#-----|  -> done
-
-#  234| call to print(_:separator:terminator:)
-#-----|  -> exit empty_else(b:) (normal)
-
-#  234| default separator
-#-----|  -> default terminator
-
-#  234| default terminator
-#-----|  -> call to print(_:separator:terminator:)
-
-#  234| (Any) ...
-#-----|  -> [...]
-
-#  234| [...]
-#-----|  -> [...]
-
-#  234| [...]
-#-----|  -> default separator
-
-#  234| done
-#-----|  -> (Any) ...
-
-#  237| disjunct(b1:b2:)
-#-----|  -> b1
-
-#  237| enter disjunct(b1:b2:)
-#-----|  -> disjunct(b1:b2:)
-
-#  237| exit disjunct(b1:b2:)
-
-#  237| exit disjunct(b1:b2:) (abnormal)
-#-----|  -> exit disjunct(b1:b2:)
-
-#  237| exit disjunct(b1:b2:) (normal)
-#-----|  -> exit disjunct(b1:b2:)
-
-#  237| b1
-#-----|  -> b2
-
-#  237| b2
-#-----|  -> if ... then { ... }
-
-#  238| if ... then { ... }
-#-----|  -> StmtCondition
-
-#  238| StmtCondition
-#-----|  -> b1
-
-#  238| [false] (...)
-#-----| false -> exit disjunct(b1:b2:) (normal)
-
-#  238| [true] (...)
-#-----| true -> print(_:separator:terminator:)
-
-#  238| b1
-#-----| true -> [true] ... .||(_:_:) ...
-#-----| false -> { ... }
-
-#  238| ... .||(_:_:) ...
-#-----| exception -> exit disjunct(b1:b2:) (abnormal)
-#-----| false -> [false] (...)
-#-----| true -> [true] (...)
-
-#  238| [true] ... .||(_:_:) ...
-#-----| exception -> exit disjunct(b1:b2:) (abnormal)
-#-----| true -> [true] (...)
-
-#  238| b2
-#-----|  -> return ...
-
-#  238| return ...
-#-----|  -> ... .||(_:_:) ...
-
-#  238| { ... }
-#-----|  -> b2
-
-#  239| print(_:separator:terminator:)
-#-----|  -> b1 or b2
-
-#  239| call to print(_:separator:terminator:)
-#-----|  -> exit disjunct(b1:b2:) (normal)
-
-#  239| default separator
-#-----|  -> default terminator
-
-#  239| default terminator
-#-----|  -> call to print(_:separator:terminator:)
-
-#  239| (Any) ...
-#-----|  -> [...]
-
-#  239| [...]
-#-----|  -> [...]
-
-#  239| [...]
-#-----|  -> default separator
-
-#  239| b1 or b2
-#-----|  -> (Any) ...
-
-#  243| binaryExprs(a:b:)
-#-----|  -> a
-
-#  243| enter binaryExprs(a:b:)
-#-----|  -> binaryExprs(a:b:)
-
-#  243| exit binaryExprs(a:b:)
-
-#  243| exit binaryExprs(a:b:) (normal)
-#-----|  -> exit binaryExprs(a:b:)
-
-#  243| a
-#-----|  -> b
-
-#  243| b
-#-----|  -> c
-
-#  244| var ... = ...
-#-----|  -> d
-
-#  244| c
-#-----| match -> .+(_:_:)
-
-#  244| a
-#-----|  -> b
-
-#  244| ... .+(_:_:) ...
-#-----|  -> var ... = ...
-
-#  244| .+(_:_:)
-#-----|  -> Int.Type
-
-#  244| Int.Type
-#-----|  -> a
-
-#  244| b
-#-----|  -> ... .+(_:_:) ...
-
-#  245| var ... = ...
-#-----|  -> e
-
-#  245| d
-#-----| match -> .-(_:_:)
-
-#  245| a
-#-----|  -> b
-
-#  245| ... .-(_:_:) ...
-#-----|  -> var ... = ...
-
-#  245| .-(_:_:)
-#-----|  -> Int.Type
-
-#  245| Int.Type
-#-----|  -> a
-
-#  245| b
-#-----|  -> ... .-(_:_:) ...
-
-#  246| var ... = ...
-#-----|  -> f
-
-#  246| e
-#-----| match -> .*(_:_:)
-
-#  246| a
-#-----|  -> b
-
-#  246| ... .*(_:_:) ...
-#-----|  -> var ... = ...
-
-#  246| .*(_:_:)
-#-----|  -> Int.Type
-
-#  246| Int.Type
-#-----|  -> a
-
-#  246| b
-#-----|  -> ... .*(_:_:) ...
-
-#  247| var ... = ...
-#-----|  -> g
-
-#  247| f
-#-----| match -> ./(_:_:)
-
-#  247| a
-#-----|  -> b
-
-#  247| ... ./(_:_:) ...
-#-----|  -> var ... = ...
-
-#  247| ./(_:_:)
-#-----|  -> Int.Type
-
-#  247| Int.Type
-#-----|  -> a
-
-#  247| b
-#-----|  -> ... ./(_:_:) ...
-
-#  248| var ... = ...
-#-----|  -> h
-
-#  248| g
-#-----| match -> .%(_:_:)
-
-#  248| a
-#-----|  -> b
-
-#  248| ... .%(_:_:) ...
-#-----|  -> var ... = ...
-
-#  248| .%(_:_:)
-#-----|  -> Int.Type
-
-#  248| Int.Type
-#-----|  -> a
-
-#  248| b
-#-----|  -> ... .%(_:_:) ...
-
-#  249| var ... = ...
-#-----|  -> i
-
-#  249| h
-#-----| match -> .&(_:_:)
-
-#  249| a
-#-----|  -> b
-
-#  249| ... .&(_:_:) ...
-#-----|  -> var ... = ...
-
-#  249| .&(_:_:)
-#-----|  -> Int.Type
-
-#  249| Int.Type
-#-----|  -> a
-
-#  249| b
-#-----|  -> ... .&(_:_:) ...
-
-#  250| var ... = ...
-#-----|  -> j
-
-#  250| i
-#-----| match -> .|(_:_:)
-
-#  250| a
-#-----|  -> b
-
-#  250| ... .|(_:_:) ...
-#-----|  -> var ... = ...
-
-#  250| .|(_:_:)
-#-----|  -> Int.Type
-
-#  250| Int.Type
-#-----|  -> a
-
-#  250| b
-#-----|  -> ... .|(_:_:) ...
-
-#  251| var ... = ...
-#-----|  -> k
-
-#  251| j
-#-----| match -> .^(_:_:)
-
-#  251| a
-#-----|  -> b
-
-#  251| ... .^(_:_:) ...
-#-----|  -> var ... = ...
-
-#  251| .^(_:_:)
-#-----|  -> Int.Type
-
-#  251| Int.Type
-#-----|  -> a
-
-#  251| b
-#-----|  -> ... .^(_:_:) ...
-
-#  252| var ... = ...
-#-----|  -> l
-
-#  252| k
-#-----| match -> .<<(_:_:)
-
-#  252| a
-#-----|  -> b
-
-#  252| ... .<<(_:_:) ...
-#-----|  -> var ... = ...
-
-#  252| .<<(_:_:)
-#-----|  -> Int.Type
-
-#  252| Int.Type
-#-----|  -> a
-
-#  252| b
-#-----|  -> ... .<<(_:_:) ...
-
-#  253| var ... = ...
-#-----|  -> o
-
-#  253| l
-#-----| match -> .>>(_:_:)
-
-#  253| a
-#-----|  -> b
-
-#  253| ... .>>(_:_:) ...
-#-----|  -> var ... = ...
-
-#  253| .>>(_:_:)
-#-----|  -> Int.Type
-
-#  253| Int.Type
-#-----|  -> a
-
-#  253| b
-#-----|  -> ... .>>(_:_:) ...
-
-#  254| var ... = ...
-#-----|  -> p
-
-#  254| o
-#-----| match -> .==(_:_:)
-
-#  254| a
-#-----|  -> b
-
-#  254| ... .==(_:_:) ...
-#-----|  -> var ... = ...
-
-#  254| .==(_:_:)
-#-----|  -> Int.Type
-
-#  254| Int.Type
-#-----|  -> a
-
-#  254| b
-#-----|  -> ... .==(_:_:) ...
-
-#  255| var ... = ...
-#-----|  -> q
-
-#  255| p
-#-----| match -> .!=(_:_:)
-
-#  255| a
-#-----|  -> b
-
-#  255| ... .!=(_:_:) ...
-#-----|  -> var ... = ...
-
-#  255| .!=(_:_:)
-#-----|  -> Int.Type
-
-#  255| Int.Type
-#-----|  -> a
-
-#  255| b
-#-----|  -> ... .!=(_:_:) ...
-
-#  256| var ... = ...
-#-----|  -> r
-
-#  256| q
-#-----| match -> .<(_:_:)
-
-#  256| a
-#-----|  -> b
-
-#  256| ... .<(_:_:) ...
-#-----|  -> var ... = ...
-
-#  256| .<(_:_:)
-#-----|  -> Int.Type
-
-#  256| Int.Type
-#-----|  -> a
-
-#  256| b
-#-----|  -> ... .<(_:_:) ...
-
-#  257| var ... = ...
-#-----|  -> s
-
-#  257| r
-#-----| match -> .<=(_:_:)
-
-#  257| a
-#-----|  -> b
-
-#  257| ... .<=(_:_:) ...
-#-----|  -> var ... = ...
-
-#  257| .<=(_:_:)
-#-----|  -> Int.Type
-
-#  257| Int.Type
-#-----|  -> a
-
-#  257| b
-#-----|  -> ... .<=(_:_:) ...
-
-#  258| var ... = ...
-#-----|  -> t
-
-#  258| s
-#-----| match -> .>(_:_:)
-
-#  258| a
-#-----|  -> b
-
-#  258| ... .>(_:_:) ...
-#-----|  -> var ... = ...
-
-#  258| .>(_:_:)
-#-----|  -> Int.Type
-
-#  258| Int.Type
-#-----|  -> a
-
-#  258| b
-#-----|  -> ... .>(_:_:) ...
-
-#  259| var ... = ...
-#-----|  -> exit binaryExprs(a:b:) (normal)
-
-#  259| t
-#-----| match -> .>=(_:_:)
-
-#  259| a
-#-----|  -> b
-
-#  259| ... .>=(_:_:) ...
-#-----|  -> var ... = ...
-
-#  259| .>=(_:_:)
-#-----|  -> Int.Type
-
-#  259| Int.Type
-#-----|  -> a
-
-#  259| b
-#-----|  -> ... .>=(_:_:) ...
-
-#  262| enter interpolatedString(x:y:)
-#-----|  -> interpolatedString(x:y:)
-
-#  262| exit interpolatedString(x:y:)
-
-#  262| exit interpolatedString(x:y:) (normal)
-#-----|  -> exit interpolatedString(x:y:)
-
-#  262| interpolatedString(x:y:)
-#-----|  -> x
-
-#  262| x
-#-----|  -> y
-
-#  262| y
-#-----|  -> OpaqueValueExpr
-
-#  263| return ...
-#-----| return -> exit interpolatedString(x:y:) (normal)
-
-#  263| 
-#-----|  -> call to appendLiteral(_:)
-
-#  263| "..."
-#-----|  -> return ...
-
-#  263| OpaqueValueExpr
-#-----|  -> .appendLiteral(_:)
-
-#  263| TapExpr
-#-----|  -> "..."
-
-#  263| call to appendLiteral(_:)
-#-----|  -> .appendInterpolation(_:)
-
-#  263| $interpolation
-#-----|  -> &...
-
-#  263| &...
-#-----|  -> 
-
-#  263| .appendLiteral(_:)
-#-----|  -> $interpolation
-
-#  263| $interpolation
-#-----|  -> &...
-
-#  263| &...
-#-----|  -> x
-
-#  263| .appendInterpolation(_:)
-#-----|  -> $interpolation
-
-#  263| call to appendInterpolation(_:)
-#-----|  -> .appendLiteral(_:)
-
-#  263| x
-#-----|  -> call to appendInterpolation(_:)
-
-#  263|  + 
-#-----|  -> call to appendLiteral(_:)
-
-#  263| $interpolation
-#-----|  -> &...
-
-#  263| &...
-#-----|  ->  + 
-
-#  263| .appendLiteral(_:)
-#-----|  -> $interpolation
-
-#  263| call to appendLiteral(_:)
-#-----|  -> .appendInterpolation(_:)
-
-#  263| $interpolation
-#-----|  -> &...
-
-#  263| &...
-#-----|  -> y
-
-#  263| .appendInterpolation(_:)
-#-----|  -> $interpolation
-
-#  263| call to appendInterpolation(_:)
-#-----|  -> .appendLiteral(_:)
-
-#  263| y
-#-----|  -> call to appendInterpolation(_:)
-
-#  263|  is equal to 
-#-----|  -> call to appendLiteral(_:)
-
-#  263| $interpolation
-#-----|  -> &...
-
-#  263| &...
-#-----|  ->  is equal to 
-
-#  263| .appendLiteral(_:)
-#-----|  -> $interpolation
-
-#  263| call to appendLiteral(_:)
-#-----|  -> .appendInterpolation(_:)
-
-#  263| $interpolation
-#-----|  -> &...
-
-#  263| &...
-#-----|  -> .+(_:_:)
-
-#  263| .appendInterpolation(_:)
-#-----|  -> $interpolation
-
-#  263| call to appendInterpolation(_:)
-#-----|  -> .appendLiteral(_:)
-
-#  263| x
-#-----|  -> y
-
-#  263| ... .+(_:_:) ...
-#-----|  -> call to appendInterpolation(_:)
-
-#  263| .+(_:_:)
-#-----|  -> Int.Type
-
-#  263| Int.Type
-#-----|  -> x
-
-#  263| y
-#-----|  -> ... .+(_:_:) ...
-
-#  263|  and here is a zero: 
-#-----|  -> call to appendLiteral(_:)
-
-#  263| $interpolation
-#-----|  -> &...
-
-#  263| &...
-#-----|  ->  and here is a zero: 
-
-#  263| .appendLiteral(_:)
-#-----|  -> $interpolation
-
-#  263| call to appendLiteral(_:)
-#-----|  -> .appendInterpolation(_:)
-
-#  263| $interpolation
-#-----|  -> &...
-
-#  263| &...
-#-----|  -> returnZero()
-
-#  263| .appendInterpolation(_:)
-#-----|  -> $interpolation
-
-#  263| call to appendInterpolation(_:)
-#-----|  -> .appendLiteral(_:)
-
-#  263| returnZero()
-#-----|  -> call to returnZero()
-
-#  263| call to returnZero()
-#-----|  -> call to appendInterpolation(_:)
-
-#  263| 
-#-----|  -> call to appendLiteral(_:)
-
-#  263| $interpolation
-#-----|  -> &...
-
-#  263| &...
-#-----|  -> 
-
-#  263| .appendLiteral(_:)
-#-----|  -> $interpolation
-
-#  263| call to appendLiteral(_:)
-#-----|  -> TapExpr
-
-#  266| enter testSubscriptExpr()
-#-----|  -> testSubscriptExpr()
-
-#  266| exit testSubscriptExpr()
-
-#  266| exit testSubscriptExpr() (normal)
-#-----|  -> exit testSubscriptExpr()
-
-#  266| testSubscriptExpr()
-#-----|  -> a
-
-#  267| var ... = ...
-#-----|  -> a
-
-#  267| a
-#-----| match -> 0
-
-#  267| [...]
-#-----|  -> var ... = ...
-
-#  267| 0
-#-----|  -> 1
-
-#  267| 1
-#-----|  -> 2
-
-#  267| 2
-#-----|  -> 3
-
-#  267| 3
-#-----|  -> 4
-
-#  267| 4
-#-----|  -> 5
-
-#  267| 5
-#-----|  -> 6
-
-#  267| 6
-#-----|  -> 7
-
-#  267| 7
-#-----|  -> 8
-
-#  267| 8
-#-----|  -> 9
-
-#  267| 9
-#-----|  -> 10
-
-#  267| 10
-#-----|  -> [...]
-
-#  268| &...
-#-----|  -> 0
-
-#  268| a
-#-----|  -> &...
-
-#  268| ...[...]
-#-----|  -> 0
-
-#  268| setter for  ... = ...
-#-----|  -> .+=(_:_:)
-
-#  268| 0
-#-----|  -> ...[...]
-
-#  268| 0
-#-----|  -> setter for  ... = ...
-
-#  269| &...
-#-----|  -> 1
-
-#  269| a
-#-----|  -> &...
-
-#  269| &...
-#-----|  -> 1
-
-#  269| getter for ...[...]
-#-----|  -> &...
-
-#  269| ... .+=(_:_:) ...
-#-----|  -> .-=(_:_:)
-
-#  269| 1
-#-----|  -> getter for ...[...]
-
-#  269| .+=(_:_:)
-#-----|  -> Int.Type
-
-#  269| Int.Type
-#-----|  -> a
-
-#  269| 1
-#-----|  -> ... .+=(_:_:) ...
-
-#  270| &...
-#-----|  -> 2
-
-#  270| a
-#-----|  -> &...
-
-#  270| &...
-#-----|  -> 1
-
-#  270| getter for ...[...]
-#-----|  -> &...
-
-#  270| ... .-=(_:_:) ...
-#-----|  -> .*=(_:_:)
-
-#  270| 2
-#-----|  -> getter for ...[...]
-
-#  270| .-=(_:_:)
-#-----|  -> Int.Type
-
-#  270| Int.Type
-#-----|  -> a
-
-#  270| 1
-#-----|  -> ... .-=(_:_:) ...
-
-#  271| &...
-#-----|  -> 3
-
-#  271| a
-#-----|  -> &...
-
-#  271| &...
-#-----|  -> 1
-
-#  271| getter for ...[...]
-#-----|  -> &...
-
-#  271| ... .*=(_:_:) ...
-#-----|  -> ./=(_:_:)
-
-#  271| 3
-#-----|  -> getter for ...[...]
-
-#  271| .*=(_:_:)
-#-----|  -> Int.Type
-
-#  271| Int.Type
-#-----|  -> a
-
-#  271| 1
-#-----|  -> ... .*=(_:_:) ...
-
-#  272| &...
-#-----|  -> 4
-
-#  272| a
-#-----|  -> &...
-
-#  272| &...
-#-----|  -> 1
-
-#  272| getter for ...[...]
-#-----|  -> &...
-
-#  272| ... ./=(_:_:) ...
-#-----|  -> .%=(_:_:)
-
-#  272| 4
-#-----|  -> getter for ...[...]
-
-#  272| ./=(_:_:)
-#-----|  -> Int.Type
-
-#  272| Int.Type
-#-----|  -> a
-
-#  272| 1
-#-----|  -> ... ./=(_:_:) ...
-
-#  273| &...
-#-----|  -> 5
-
-#  273| a
-#-----|  -> &...
-
-#  273| &...
-#-----|  -> 1
-
-#  273| getter for ...[...]
-#-----|  -> &...
-
-#  273| ... .%=(_:_:) ...
-#-----|  -> .&=(_:_:)
-
-#  273| 5
-#-----|  -> getter for ...[...]
-
-#  273| .%=(_:_:)
-#-----|  -> Int.Type
-
-#  273| Int.Type
-#-----|  -> a
-
-#  273| 1
-#-----|  -> ... .%=(_:_:) ...
-
-#  274| &...
-#-----|  -> 6
-
-#  274| a
-#-----|  -> &...
-
-#  274| &...
-#-----|  -> 1
-
-#  274| getter for ...[...]
-#-----|  -> &...
-
-#  274| ... .&=(_:_:) ...
-#-----|  -> .|=(_:_:)
-
-#  274| 6
-#-----|  -> getter for ...[...]
-
-#  274| .&=(_:_:)
-#-----|  -> Int.Type
-
-#  274| Int.Type
-#-----|  -> a
-
-#  274| 1
-#-----|  -> ... .&=(_:_:) ...
-
-#  275| &...
-#-----|  -> 7
-
-#  275| a
-#-----|  -> &...
-
-#  275| &...
-#-----|  -> 1
-
-#  275| getter for ...[...]
-#-----|  -> &...
-
-#  275| ... .|=(_:_:) ...
-#-----|  -> .^=(_:_:)
-
-#  275| 7
-#-----|  -> getter for ...[...]
-
-#  275| .|=(_:_:)
-#-----|  -> Int.Type
-
-#  275| Int.Type
-#-----|  -> a
-
-#  275| 1
-#-----|  -> ... .|=(_:_:) ...
-
-#  276| &...
-#-----|  -> 8
-
-#  276| a
-#-----|  -> &...
-
-#  276| &...
-#-----|  -> 1
-
-#  276| getter for ...[...]
-#-----|  -> &...
-
-#  276| ... .^=(_:_:) ...
-#-----|  -> .<<=(_:_:)
-
-#  276| 8
-#-----|  -> getter for ...[...]
-
-#  276| .^=(_:_:)
-#-----|  -> Int.Type
-
-#  276| Int.Type
-#-----|  -> a
-
-#  276| 1
-#-----|  -> ... .^=(_:_:) ...
-
-#  277| &...
-#-----|  -> 9
-
-#  277| a
-#-----|  -> &...
-
-#  277| &...
-#-----|  -> 1
-
-#  277| getter for ...[...]
-#-----|  -> &...
-
-#  277| ... .<<=(_:_:) ...
-#-----|  -> .>>=(_:_:)
-
-#  277| 9
-#-----|  -> getter for ...[...]
-
-#  277| .<<=(_:_:)
-#-----|  -> Int.Type
-
-#  277| Int.Type
-#-----|  -> a
-
-#  277| 1
-#-----|  -> ... .<<=(_:_:) ...
-
-#  278| &...
-#-----|  -> 10
-
-#  278| a
-#-----|  -> &...
-
-#  278| &...
-#-----|  -> 1
-
-#  278| getter for ...[...]
-#-----|  -> &...
-
-#  278| ... .>>=(_:_:) ...
-#-----|  -> tupleWithA
-
-#  278| 10
-#-----|  -> getter for ...[...]
-
-#  278| .>>=(_:_:)
-#-----|  -> Int.Type
-
-#  278| Int.Type
-#-----|  -> a
-
-#  278| 1
-#-----|  -> ... .>>=(_:_:) ...
-
-#  280| var ... = ...
-#-----|  -> b
-
-#  280| tupleWithA
-#-----| match -> a
-
-#  280| (...)
-#-----|  -> var ... = ...
-
-#  280| &...
-#-----|  -> 0
-
-#  280| a
-#-----|  -> &...
-
-#  280| (Int) ...
-#-----|  -> a
-
-#  280| getter for ...[...]
-#-----|  -> (Int) ...
-
-#  280| 0
-#-----|  -> getter for ...[...]
-
-#  280| &...
-#-----|  -> 1
-
-#  280| a
-#-----|  -> &...
-
-#  280| (Int) ...
-#-----|  -> a
-
-#  280| getter for ...[...]
-#-----|  -> (Int) ...
-
-#  280| 1
-#-----|  -> getter for ...[...]
-
-#  280| &...
-#-----|  -> 2
-
-#  280| a
-#-----|  -> &...
-
-#  280| (Int) ...
-#-----|  -> a
-
-#  280| getter for ...[...]
-#-----|  -> (Int) ...
-
-#  280| 2
-#-----|  -> getter for ...[...]
-
-#  280| &...
-#-----|  -> 3
-
-#  280| a
-#-----|  -> &...
-
-#  280| (Int) ...
-#-----|  -> a
-
-#  280| getter for ...[...]
-#-----|  -> (Int) ...
-
-#  280| 3
-#-----|  -> getter for ...[...]
-
-#  280| &...
-#-----|  -> 4
-
-#  280| a
-#-----|  -> &...
-
-#  280| (Int) ...
-#-----|  -> (...)
-
-#  280| getter for ...[...]
-#-----|  -> (Int) ...
-
-#  280| 4
-#-----|  -> getter for ...[...]
-
-#  282| var ... = ...
-#-----|  -> b
-
-#  282| b
-#-----| match -> 0
-
-#  282| [...]
-#-----|  -> var ... = ...
-
-#  282| 0
-#-----|  -> 1
-
-#  282| 1
-#-----|  -> 2
-
-#  282| 2
-#-----|  -> 3
-
-#  282| 3
-#-----|  -> 4
-
-#  282| 4
-#-----|  -> 5
-
-#  282| 5
-#-----|  -> 6
-
-#  282| 6
-#-----|  -> 7
-
-#  282| 7
-#-----|  -> 8
-
-#  282| 8
-#-----|  -> 9
-
-#  282| 9
-#-----|  -> 10
-
-#  282| 10
-#-----|  -> 11
-
-#  282| 11
-#-----|  -> [...]
-
-#  283| &...
-#-----|  -> 0
-
-#  283| b
-#-----|  -> &...
-
-#  283| ...[...]
-#-----|  -> a
-
-#  283| setter for  ... = ...
-#-----|  -> b
-
-#  283| 0
-#-----|  -> ...[...]
-
-#  283| &...
-#-----|  -> 10
-
-#  283| a
-#-----|  -> &...
-
-#  283| (Int) ...
-#-----|  -> setter for  ... = ...
-
-#  283| getter for ...[...]
-#-----|  -> (Int) ...
-
-#  283| 10
-#-----|  -> getter for ...[...]
-
-#  284| &...
-#-----|  -> 1
-
-#  284| b
-#-----|  -> &...
-
-#  284| ...[...]
-#-----|  -> .+(_:_:)
-
-#  284| setter for  ... = ...
-#-----|  -> b
-
-#  284| 1
-#-----|  -> ...[...]
-
-#  284| &...
-#-----|  -> 0
-
-#  284| b
-#-----|  -> &...
-
-#  284| (Int) ...
-#-----|  -> 1
-
-#  284| getter for ...[...]
-#-----|  -> (Int) ...
-
-#  284| ... .+(_:_:) ...
-#-----|  -> setter for  ... = ...
-
-#  284| 0
-#-----|  -> getter for ...[...]
-
-#  284| .+(_:_:)
-#-----|  -> Int.Type
-
-#  284| Int.Type
-#-----|  -> b
-
-#  284| 1
-#-----|  -> ... .+(_:_:) ...
-
-#  285| &...
-#-----|  -> 2
-
-#  285| b
-#-----|  -> &...
-
-#  285| ...[...]
-#-----|  -> .-(_:_:)
-
-#  285| setter for  ... = ...
-#-----|  -> b
-
-#  285| 2
-#-----|  -> ...[...]
-
-#  285| &...
-#-----|  -> 1
-
-#  285| b
-#-----|  -> &...
-
-#  285| (Int) ...
-#-----|  -> 1
-
-#  285| getter for ...[...]
-#-----|  -> (Int) ...
-
-#  285| ... .-(_:_:) ...
-#-----|  -> setter for  ... = ...
-
-#  285| 1
-#-----|  -> getter for ...[...]
-
-#  285| .-(_:_:)
-#-----|  -> Int.Type
-
-#  285| Int.Type
-#-----|  -> b
-
-#  285| 1
-#-----|  -> ... .-(_:_:) ...
-
-#  286| &...
-#-----|  -> 3
-
-#  286| b
-#-----|  -> &...
-
-#  286| ...[...]
-#-----|  -> .*(_:_:)
-
-#  286| setter for  ... = ...
-#-----|  -> b
-
-#  286| 3
-#-----|  -> ...[...]
-
-#  286| &...
-#-----|  -> 2
-
-#  286| b
-#-----|  -> &...
-
-#  286| (Int) ...
-#-----|  -> 1
-
-#  286| getter for ...[...]
-#-----|  -> (Int) ...
-
-#  286| ... .*(_:_:) ...
-#-----|  -> setter for  ... = ...
-
-#  286| 2
-#-----|  -> getter for ...[...]
-
-#  286| .*(_:_:)
-#-----|  -> Int.Type
-
-#  286| Int.Type
-#-----|  -> b
-
-#  286| 1
-#-----|  -> ... .*(_:_:) ...
-
-#  287| &...
-#-----|  -> 4
-
-#  287| b
-#-----|  -> &...
-
-#  287| ...[...]
-#-----|  -> ./(_:_:)
-
-#  287| setter for  ... = ...
-#-----|  -> b
-
-#  287| 4
-#-----|  -> ...[...]
-
-#  287| &...
-#-----|  -> 3
-
-#  287| b
-#-----|  -> &...
-
-#  287| (Int) ...
-#-----|  -> 1
-
-#  287| getter for ...[...]
-#-----|  -> (Int) ...
-
-#  287| ... ./(_:_:) ...
-#-----|  -> setter for  ... = ...
-
-#  287| 3
-#-----|  -> getter for ...[...]
-
-#  287| ./(_:_:)
-#-----|  -> Int.Type
-
-#  287| Int.Type
-#-----|  -> b
-
-#  287| 1
-#-----|  -> ... ./(_:_:) ...
-
-#  288| &...
-#-----|  -> 5
-
-#  288| b
-#-----|  -> &...
-
-#  288| ...[...]
-#-----|  -> .%(_:_:)
-
-#  288| setter for  ... = ...
-#-----|  -> b
-
-#  288| 5
-#-----|  -> ...[...]
-
-#  288| &...
-#-----|  -> 4
-
-#  288| b
-#-----|  -> &...
-
-#  288| (Int) ...
-#-----|  -> 1
-
-#  288| getter for ...[...]
-#-----|  -> (Int) ...
-
-#  288| ... .%(_:_:) ...
-#-----|  -> setter for  ... = ...
-
-#  288| 4
-#-----|  -> getter for ...[...]
-
-#  288| .%(_:_:)
-#-----|  -> Int.Type
-
-#  288| Int.Type
-#-----|  -> b
-
-#  288| 1
-#-----|  -> ... .%(_:_:) ...
-
-#  289| &...
-#-----|  -> 6
-
-#  289| b
-#-----|  -> &...
-
-#  289| ...[...]
-#-----|  -> .&(_:_:)
-
-#  289| setter for  ... = ...
-#-----|  -> b
-
-#  289| 6
-#-----|  -> ...[...]
-
-#  289| &...
-#-----|  -> 5
-
-#  289| b
-#-----|  -> &...
-
-#  289| (Int) ...
-#-----|  -> 1
-
-#  289| getter for ...[...]
-#-----|  -> (Int) ...
-
-#  289| ... .&(_:_:) ...
-#-----|  -> setter for  ... = ...
-
-#  289| 5
-#-----|  -> getter for ...[...]
-
-#  289| .&(_:_:)
-#-----|  -> Int.Type
-
-#  289| Int.Type
-#-----|  -> b
-
-#  289| 1
-#-----|  -> ... .&(_:_:) ...
-
-#  290| &...
-#-----|  -> 7
-
-#  290| b
-#-----|  -> &...
-
-#  290| ...[...]
-#-----|  -> .|(_:_:)
-
-#  290| setter for  ... = ...
-#-----|  -> b
-
-#  290| 7
-#-----|  -> ...[...]
-
-#  290| &...
-#-----|  -> 6
-
-#  290| b
-#-----|  -> &...
-
-#  290| (Int) ...
-#-----|  -> 1
-
-#  290| getter for ...[...]
-#-----|  -> (Int) ...
-
-#  290| ... .|(_:_:) ...
-#-----|  -> setter for  ... = ...
-
-#  290| 6
-#-----|  -> getter for ...[...]
-
-#  290| .|(_:_:)
-#-----|  -> Int.Type
-
-#  290| Int.Type
-#-----|  -> b
-
-#  290| 1
-#-----|  -> ... .|(_:_:) ...
-
-#  291| &...
-#-----|  -> 8
-
-#  291| b
-#-----|  -> &...
-
-#  291| ...[...]
-#-----|  -> .^(_:_:)
-
-#  291| setter for  ... = ...
-#-----|  -> b
-
-#  291| 8
-#-----|  -> ...[...]
-
-#  291| &...
-#-----|  -> 7
-
-#  291| b
-#-----|  -> &...
-
-#  291| (Int) ...
-#-----|  -> 1
-
-#  291| getter for ...[...]
-#-----|  -> (Int) ...
-
-#  291| ... .^(_:_:) ...
-#-----|  -> setter for  ... = ...
-
-#  291| 7
-#-----|  -> getter for ...[...]
-
-#  291| .^(_:_:)
-#-----|  -> Int.Type
-
-#  291| Int.Type
-#-----|  -> b
-
-#  291| 1
-#-----|  -> ... .^(_:_:) ...
-
-#  292| &...
-#-----|  -> 9
-
-#  292| b
-#-----|  -> &...
-
-#  292| ...[...]
-#-----|  -> .<<(_:_:)
-
-#  292| setter for  ... = ...
-#-----|  -> b
-
-#  292| 9
-#-----|  -> ...[...]
-
-#  292| &...
-#-----|  -> 8
-
-#  292| b
-#-----|  -> &...
-
-#  292| (Int) ...
-#-----|  -> 1
-
-#  292| getter for ...[...]
-#-----|  -> (Int) ...
-
-#  292| ... .<<(_:_:) ...
-#-----|  -> setter for  ... = ...
-
-#  292| 8
-#-----|  -> getter for ...[...]
-
-#  292| .<<(_:_:)
-#-----|  -> Int.Type
-
-#  292| Int.Type
-#-----|  -> b
-
-#  292| 1
-#-----|  -> ... .<<(_:_:) ...
-
-#  293| &...
-#-----|  -> 10
-
-#  293| b
-#-----|  -> &...
-
-#  293| ...[...]
-#-----|  -> .>>(_:_:)
-
-#  293| setter for  ... = ...
-#-----|  -> (...)
-
-#  293| 10
-#-----|  -> ...[...]
-
-#  293| &...
-#-----|  -> 9
-
-#  293| b
-#-----|  -> &...
-
-#  293| (Int) ...
-#-----|  -> 1
-
-#  293| getter for ...[...]
-#-----|  -> (Int) ...
-
-#  293| ... .>>(_:_:) ...
-#-----|  -> setter for  ... = ...
-
-#  293| 9
-#-----|  -> getter for ...[...]
-
-#  293| .>>(_:_:)
-#-----|  -> Int.Type
-
-#  293| Int.Type
-#-----|  -> b
-
-#  293| 1
-#-----|  -> ... .>>(_:_:) ...
-
-#  295| var ... = ...
-#-----|  -> .+(_:_:)
-
-#  295| (...)
-#-----|  -> a1
-
-#  295| a1
-#-----| match -> a2
-
-#  295| a2
-#-----| match -> a3
-
-#  295| a3
-#-----| match -> a4
-
-#  295| a4
-#-----| match -> a5
-
-#  295| a5
-#-----| match -> tupleWithA
-
-#  295| ((Int, Int, Int, Int, Int)) ...
-#-----|  -> var ... = ...
-
-#  295| tupleWithA
-#-----|  -> ((Int, Int, Int, Int, Int)) ...
-
-#  296| return ...
-#-----| return -> exit testSubscriptExpr() (normal)
-
-#  296| (...)
-#-----|  -> return ...
-
-#  296| a1
-#-----|  -> b
-
-#  296| ... .+(_:_:) ...
-#-----|  -> .+(_:_:)
-
-#  296| .+(_:_:)
-#-----|  -> Int.Type
-
-#  296| Int.Type
-#-----|  -> a1
-
-#  296| &...
-#-----|  -> 0
-
-#  296| b
-#-----|  -> &...
-
-#  296| (Int) ...
-#-----|  -> ... .+(_:_:) ...
-
-#  296| getter for ...[...]
-#-----|  -> (Int) ...
-
-#  296| 0
-#-----|  -> getter for ...[...]
-
-#  296| a2
-#-----|  -> b
-
-#  296| ... .+(_:_:) ...
-#-----|  -> .+(_:_:)
-
-#  296| .+(_:_:)
-#-----|  -> Int.Type
-
-#  296| Int.Type
-#-----|  -> a2
-
-#  296| &...
-#-----|  -> 1
-
-#  296| b
-#-----|  -> &...
-
-#  296| (Int) ...
-#-----|  -> ... .+(_:_:) ...
-
-#  296| getter for ...[...]
-#-----|  -> (Int) ...
-
-#  296| 1
-#-----|  -> getter for ...[...]
-
-#  296| a3
-#-----|  -> b
-
-#  296| ... .+(_:_:) ...
-#-----|  -> .+(_:_:)
-
-#  296| .+(_:_:)
-#-----|  -> Int.Type
-
-#  296| Int.Type
-#-----|  -> a3
-
-#  296| &...
-#-----|  -> 2
-
-#  296| b
-#-----|  -> &...
-
-#  296| (Int) ...
-#-----|  -> ... .+(_:_:) ...
-
-#  296| getter for ...[...]
-#-----|  -> (Int) ...
-
-#  296| 2
-#-----|  -> getter for ...[...]
-
-#  296| a4
-#-----|  -> b
-
-#  296| ... .+(_:_:) ...
-#-----|  -> .+(_:_:)
-
-#  296| .+(_:_:)
-#-----|  -> Int.Type
-
-#  296| Int.Type
-#-----|  -> a4
-
-#  296| &...
-#-----|  -> 3
-
-#  296| b
-#-----|  -> &...
-
-#  296| (Int) ...
-#-----|  -> ... .+(_:_:) ...
-
-#  296| getter for ...[...]
-#-----|  -> (Int) ...
-
-#  296| 3
-#-----|  -> getter for ...[...]
-
-#  296| a5
-#-----|  -> b
-
-#  296| ... .+(_:_:) ...
-#-----|  -> (...)
-
-#  296| .+(_:_:)
-#-----|  -> Int.Type
-
-#  296| Int.Type
-#-----|  -> a5
-
-#  296| &...
-#-----|  -> 4
-
-#  296| b
-#-----|  -> &...
-
-#  296| (Int) ...
-#-----|  -> ... .+(_:_:) ...
-
-#  296| getter for ...[...]
-#-----|  -> (Int) ...
-
-#  296| 4
-#-----|  -> getter for ...[...]
-
-#  299| enter loop1(x:)
-#-----|  -> loop1(x:)
-
-#  299| exit loop1(x:)
-
-#  299| exit loop1(x:) (normal)
-#-----|  -> exit loop1(x:)
-
-#  299| loop1(x:)
-#-----|  -> x
-
-#  299| x
-#-----|  -> while ... { ... }
-
-#  300| while ... { ... }
-#-----|  -> StmtCondition
-
-#  300| (Int) ...
-#-----|  -> 0
-
-#  300| x
-#-----|  -> (Int) ...
-
-#  300| ... .>=(_:_:) ...
-#-----| false -> exit loop1(x:) (normal)
-#-----| true -> print(_:separator:terminator:)
-
-#  300| StmtCondition
-#-----|  -> .>=(_:_:)
-
-#  300| .>=(_:_:)
-#-----|  -> Int.Type
-
-#  300| Int.Type
-#-----|  -> x
-
-#  300| 0
-#-----|  -> ... .>=(_:_:) ...
-
-#  301| print(_:separator:terminator:)
-#-----|  -> x
-
-#  301| call to print(_:separator:terminator:)
-#-----|  -> .-=(_:_:)
-
-#  301| default separator
-#-----|  -> default terminator
-
-#  301| default terminator
-#-----|  -> call to print(_:separator:terminator:)
-
-#  301| (Any) ...
-#-----|  -> [...]
-
-#  301| (Int) ...
-#-----|  -> (Any) ...
-
-#  301| [...]
-#-----|  -> [...]
-
-#  301| [...]
-#-----|  -> default separator
-
-#  301| x
-#-----|  -> (Int) ...
-
-#  302| &...
-#-----|  -> 1
-
-#  302| x
-#-----|  -> &...
-
-#  302| ... .-=(_:_:) ...
-#-----|  -> StmtCondition
-
-#  302| .-=(_:_:)
-#-----|  -> Int.Type
-
-#  302| Int.Type
-#-----|  -> x
-
-#  302| 1
-#-----|  -> ... .-=(_:_:) ...
-
-#  306| enter loop2(x:)
-#-----|  -> loop2(x:)
-
-#  306| exit loop2(x:)
-
-#  306| exit loop2(x:) (normal)
-#-----|  -> exit loop2(x:)
-
-#  306| loop2(x:)
-#-----|  -> x
-
-#  306| x
-#-----|  -> while ... { ... }
-
-#  307| while ... { ... }
-#-----|  -> StmtCondition
-
-#  307| (Int) ...
-#-----|  -> 0
-
-#  307| x
-#-----|  -> (Int) ...
-
-#  307| ... .>=(_:_:) ...
-#-----| true -> print(_:separator:terminator:)
-#-----| false -> print(_:separator:terminator:)
-
-#  307| StmtCondition
-#-----|  -> .>=(_:_:)
-
-#  307| .>=(_:_:)
-#-----|  -> Int.Type
-
-#  307| Int.Type
-#-----|  -> x
-
-#  307| 0
-#-----|  -> ... .>=(_:_:) ...
-
-#  308| print(_:separator:terminator:)
-#-----|  -> x
-
-#  308| call to print(_:separator:terminator:)
-#-----|  -> .-=(_:_:)
-
-#  308| default separator
-#-----|  -> default terminator
-
-#  308| default terminator
-#-----|  -> call to print(_:separator:terminator:)
-
-#  308| (Any) ...
-#-----|  -> [...]
-
-#  308| (Int) ...
-#-----|  -> (Any) ...
-
-#  308| [...]
-#-----|  -> [...]
-
-#  308| [...]
-#-----|  -> default separator
-
-#  308| x
-#-----|  -> (Int) ...
-
-#  309| &...
-#-----|  -> 1
-
-#  309| x
-#-----|  -> &...
-
-#  309| ... .-=(_:_:) ...
-#-----|  -> if ... then { ... } else { ... }
-
-#  309| .-=(_:_:)
-#-----|  -> Int.Type
-
-#  309| Int.Type
-#-----|  -> x
-
-#  309| 1
-#-----|  -> ... .-=(_:_:) ...
-
-#  310| if ... then { ... } else { ... }
-#-----|  -> StmtCondition
-
-#  310| (Int) ...
-#-----|  -> 100
-
-#  310| x
-#-----|  -> (Int) ...
-
-#  310| ... .>(_:_:) ...
-#-----| true -> break
-#-----| false -> if ... then { ... }
-
-#  310| StmtCondition
-#-----|  -> .>(_:_:)
-
-#  310| .>(_:_:)
-#-----|  -> Int.Type
-
-#  310| Int.Type
-#-----|  -> x
-
-#  310| 100
-#-----|  -> ... .>(_:_:) ...
-
-#  311| break
-#-----|  -> print(_:separator:terminator:)
-
-#  313| if ... then { ... }
-#-----|  -> StmtCondition
-
-#  313| (Int) ...
-#-----|  -> 50
-
-#  313| x
-#-----|  -> (Int) ...
-
-#  313| ... .>(_:_:) ...
-#-----| true -> continue
-#-----| false -> print(_:separator:terminator:)
-
-#  313| StmtCondition
-#-----|  -> .>(_:_:)
-
-#  313| .>(_:_:)
-#-----|  -> Int.Type
-
-#  313| Int.Type
-#-----|  -> x
-
-#  313| 50
-#-----|  -> ... .>(_:_:) ...
-
-#  314| continue
-#-----| continue -> StmtCondition
-
-#  316| print(_:separator:terminator:)
-#-----|  -> Iter
-
-#  316| call to print(_:separator:terminator:)
-#-----|  -> StmtCondition
-
-#  316| default separator
-#-----|  -> default terminator
-
-#  316| default terminator
-#-----|  -> call to print(_:separator:terminator:)
-
-#  316| (Any) ...
-#-----|  -> [...]
-
-#  316| Iter
-#-----|  -> (Any) ...
-
-#  316| [...]
-#-----|  -> [...]
-
-#  316| [...]
-#-----|  -> default separator
-
-#  318| print(_:separator:terminator:)
-#-----|  -> Done
-
-#  318| call to print(_:separator:terminator:)
-#-----|  -> exit loop2(x:) (normal)
-
-#  318| default separator
-#-----|  -> default terminator
-
-#  318| default terminator
-#-----|  -> call to print(_:separator:terminator:)
-
-#  318| (Any) ...
-#-----|  -> [...]
-
-#  318| Done
-#-----|  -> (Any) ...
-
-#  318| [...]
-#-----|  -> [...]
-
-#  318| [...]
-#-----|  -> default separator
-
-#  321| enter labeledLoop(x:)
-#-----|  -> labeledLoop(x:)
-
-#  321| exit labeledLoop(x:)
-
-#  321| exit labeledLoop(x:) (normal)
-#-----|  -> exit labeledLoop(x:)
-
-#  321| labeledLoop(x:)
-#-----|  -> x
-
-#  321| x
-#-----|  -> while ... { ... }
-
-#  322| while ... { ... }
-#-----|  -> StmtCondition
-
-#  322| (Int) ...
-#-----|  -> 0
-
-#  322| x
-#-----|  -> (Int) ...
-
-#  322| ... .>=(_:_:) ...
-#-----| false -> exit labeledLoop(x:) (normal)
-#-----| true -> while ... { ... }
-
-#  322| StmtCondition
-#-----|  -> .>=(_:_:)
-
-#  322| .>=(_:_:)
-#-----|  -> Int.Type
-
-#  322| Int.Type
-#-----|  -> x
-
-#  322| 0
-#-----|  -> ... .>=(_:_:) ...
-
-#  323| while ... { ... }
-#-----|  -> StmtCondition
-
-#  323| (Int) ...
-#-----|  -> 0
-
-#  323| x
-#-----|  -> (Int) ...
-
-#  323| ... .>=(_:_:) ...
-#-----| true -> print(_:separator:terminator:)
-#-----| false -> print(_:separator:terminator:)
-
-#  323| StmtCondition
-#-----|  -> .>=(_:_:)
-
-#  323| .>=(_:_:)
-#-----|  -> Int.Type
-
-#  323| Int.Type
-#-----|  -> x
-
-#  323| 0
-#-----|  -> ... .>=(_:_:) ...
-
-#  324| print(_:separator:terminator:)
-#-----|  -> x
-
-#  324| call to print(_:separator:terminator:)
-#-----|  -> .-=(_:_:)
-
-#  324| default separator
-#-----|  -> default terminator
-
-#  324| default terminator
-#-----|  -> call to print(_:separator:terminator:)
-
-#  324| (Any) ...
-#-----|  -> [...]
-
-#  324| (Int) ...
-#-----|  -> (Any) ...
-
-#  324| [...]
-#-----|  -> [...]
-
-#  324| [...]
-#-----|  -> default separator
-
-#  324| x
-#-----|  -> (Int) ...
-
-#  325| &...
-#-----|  -> 1
-
-#  325| x
-#-----|  -> &...
-
-#  325| ... .-=(_:_:) ...
-#-----|  -> if ... then { ... } else { ... }
-
-#  325| .-=(_:_:)
-#-----|  -> Int.Type
-
-#  325| Int.Type
-#-----|  -> x
-
-#  325| 1
-#-----|  -> ... .-=(_:_:) ...
-
-#  326| if ... then { ... } else { ... }
-#-----|  -> StmtCondition
-
-#  326| (Int) ...
-#-----|  -> 100
-
-#  326| x
-#-----|  -> (Int) ...
-
-#  326| ... .>(_:_:) ...
-#-----| true -> break outer
-#-----| false -> if ... then { ... }
-
-#  326| StmtCondition
-#-----|  -> .>(_:_:)
-
-#  326| .>(_:_:)
-#-----|  -> Int.Type
-
-#  326| Int.Type
-#-----|  -> x
-
-#  326| 100
-#-----|  -> ... .>(_:_:) ...
-
-#  327| break outer
-#-----|  -> exit labeledLoop(x:) (normal)
-
-#  329| if ... then { ... }
-#-----|  -> StmtCondition
-
-#  329| (Int) ...
-#-----|  -> 50
-
-#  329| x
-#-----|  -> (Int) ...
-
-#  329| ... .>(_:_:) ...
-#-----| true -> continue inner
-#-----| false -> print(_:separator:terminator:)
-
-#  329| StmtCondition
-#-----|  -> .>(_:_:)
-
-#  329| .>(_:_:)
-#-----|  -> Int.Type
-
-#  329| Int.Type
-#-----|  -> x
-
-#  329| 50
-#-----|  -> ... .>(_:_:) ...
-
-#  330| continue inner
-#-----| continue -> StmtCondition
-
-#  332| print(_:separator:terminator:)
-#-----|  -> Iter
-
-#  332| call to print(_:separator:terminator:)
-#-----|  -> StmtCondition
-
-#  332| default separator
-#-----|  -> default terminator
-
-#  332| default terminator
-#-----|  -> call to print(_:separator:terminator:)
-
-#  332| (Any) ...
-#-----|  -> [...]
-
-#  332| Iter
-#-----|  -> (Any) ...
-
-#  332| [...]
-#-----|  -> [...]
-
-#  332| [...]
-#-----|  -> default separator
-
-#  334| print(_:separator:terminator:)
-#-----|  -> Done
-
-#  334| call to print(_:separator:terminator:)
-#-----|  -> StmtCondition
-
-#  334| default separator
-#-----|  -> default terminator
-
-#  334| default terminator
-#-----|  -> call to print(_:separator:terminator:)
-
-#  334| (Any) ...
-#-----|  -> [...]
-
-#  334| Done
-#-----|  -> (Any) ...
-
-#  334| [...]
-#-----|  -> [...]
-
-#  334| [...]
-#-----|  -> default separator
-
-#  338| enter testRepeat(x:)
-#-----|  -> testRepeat(x:)
-
-#  338| exit testRepeat(x:)
-
-#  338| exit testRepeat(x:) (normal)
-#-----|  -> exit testRepeat(x:)
-
-#  338| testRepeat(x:)
-#-----|  -> x
-
-#  338| x
-#-----|  -> repeat { ... } while ... 
-
-#  339| repeat { ... } while ... 
-#-----|  -> print(_:separator:terminator:)
-
-#  340| print(_:separator:terminator:)
-#-----|  -> x
-
-#  340| call to print(_:separator:terminator:)
-#-----|  -> .-=(_:_:)
-
-#  340| default separator
-#-----|  -> default terminator
-
-#  340| default terminator
-#-----|  -> call to print(_:separator:terminator:)
-
-#  340| (Any) ...
-#-----|  -> [...]
-
-#  340| (Int) ...
-#-----|  -> (Any) ...
-
-#  340| [...]
-#-----|  -> [...]
-
-#  340| [...]
-#-----|  -> default separator
-
-#  340| x
-#-----|  -> (Int) ...
-
-#  341| &...
-#-----|  -> 1
-
-#  341| x
-#-----|  -> &...
-
-#  341| ... .-=(_:_:) ...
-#-----|  -> .>=(_:_:)
-
-#  341| .-=(_:_:)
-#-----|  -> Int.Type
-
-#  341| Int.Type
-#-----|  -> x
-
-#  341| 1
-#-----|  -> ... .-=(_:_:) ...
-
-#  342| (Int) ...
-#-----|  -> 0
-
-#  342| x
-#-----|  -> (Int) ...
-
-#  342| ... .>=(_:_:) ...
-#-----| false -> exit testRepeat(x:) (normal)
-#-----| true -> print(_:separator:terminator:)
-
-#  342| .>=(_:_:)
-#-----|  -> Int.Type
-
-#  342| Int.Type
-#-----|  -> x
-
-#  342| 0
-#-----|  -> ... .>=(_:_:) ...
-
-#  345| enter loop_with_identity_expr()
-#-----|  -> loop_with_identity_expr()
-
-#  345| exit loop_with_identity_expr()
-
-#  345| exit loop_with_identity_expr() (normal)
-#-----|  -> exit loop_with_identity_expr()
-
-#  345| loop_with_identity_expr()
-#-----|  -> x
-
-#  346| var ... = ...
-#-----|  -> while ... { ... }
-
-#  346| x
-#-----| match -> 0
-
-#  346| 0
-#-----|  -> var ... = ...
-
-#  347| while ... { ... }
-#-----|  -> StmtCondition
-
-#  347| StmtCondition
-#-----|  -> .<(_:_:)
-
-#  347| [false] (...)
-#-----| false -> exit loop_with_identity_expr() (normal)
-
-#  347| [true] (...)
-#-----| true -> .+=(_:_:)
-
-#  347| (Int) ...
-#-----|  -> 10
-
-#  347| x
-#-----|  -> (Int) ...
-
-#  347| ... .<(_:_:) ...
-#-----| false -> [false] (...)
-#-----| true -> [true] (...)
-
-#  347| .<(_:_:)
-#-----|  -> Int.Type
-
-#  347| Int.Type
-#-----|  -> x
-
-#  347| 10
-#-----|  -> ... .<(_:_:) ...
-
-#  348| &...
-#-----|  -> 1
-
-#  348| x
-#-----|  -> &...
-
-#  348| ... .+=(_:_:) ...
-#-----|  -> StmtCondition
-
-#  348| .+=(_:_:)
-#-----|  -> Int.Type
-
-#  348| Int.Type
-#-----|  -> x
-
-#  348| 1
-#-----|  -> ... .+=(_:_:) ...
-
-#  352| OptionalC.deinit()
-#-----|  -> self
-
-#  352| enter OptionalC.deinit()
-#-----|  -> OptionalC.deinit()
-
-#  352| exit OptionalC.deinit()
-
-#  352| exit OptionalC.deinit() (normal)
-#-----|  -> exit OptionalC.deinit()
-
-#  352| self
-#-----|  -> { ... }
-
-#  352| { ... }
-#-----|  -> exit OptionalC.deinit() (normal)
-
-#  353| enter get
-#-----|  -> get
-
-#  353| exit get
-
-#  353| exit get (normal)
-#-----|  -> exit get
-
-#  353| get
-#-----|  -> self
-
-#  353| self
-#-----|  -> self
-
-#  354| self
-#-----|  -> arg
-
-#  354| OptionalC.init(arg:)
-#-----|  -> self
-
-#  354| enter OptionalC.init(arg:)
-#-----|  -> OptionalC.init(arg:)
-
-#  354| exit OptionalC.init(arg:)
-
-#  354| exit OptionalC.init(arg:) (normal)
-#-----|  -> exit OptionalC.init(arg:)
-
-#  354| arg
-#-----|  -> self
-
-#  355| .c
-#-----|  -> arg
-
-#  355| self
-#-----|  -> .c
-
-#  355|  ... = ...
-#-----|  -> return
-
-#  355| arg
-#-----|  ->  ... = ...
-
-#  356| return
-#-----| return -> exit OptionalC.init(arg:) (normal)
-
-#  358| enter getOptional()
-#-----|  -> getOptional()
-
-#  358| exit getOptional()
-
-#  358| exit getOptional() (normal)
-#-----|  -> exit getOptional()
-
-#  358| getOptional()
-#-----|  -> self
-
-#  358| self
-#-----|  -> self
-
-#  359| return ...
-#-----| return -> exit getOptional() (normal)
-
-#  359| getter for .c
-#-----|  -> return ...
-
-#  359| self
-#-----|  -> getter for .c
-
-#  363| enter testOptional(c:)
-#-----|  -> testOptional(c:)
-
-#  363| exit testOptional(c:)
-
-#  363| exit testOptional(c:) (normal)
-#-----|  -> exit testOptional(c:)
-
-#  363| testOptional(c:)
-#-----|  -> c
-
-#  363| c
-#-----|  -> .getMyInt()
-
-#  364| return ...
-#-----| return -> exit testOptional(c:) (normal)
-
-#  364| c
-#-----|  -> ...?
-
-#  364| ...?
-#-----|  -> call to getOptional()
-
-#  364| .getOptional()
-#-----|  -> c
-
-#  364| call to getOptional()
-#-----|  -> ...?
-
-#  364| ...?
-#-----|  -> call to getMyInt()
-
-#  364| .getMyInt()
-#-----|  -> .getOptional()
-
-#  364| (Int?) ...
-#-----|  -> OptionalEvaluationExpr
-
-#  364| OptionalEvaluationExpr
-#-----|  -> return ...
-
-#  364| call to getMyInt()
-#-----|  -> (Int?) ...
-
-#  367| enter testCapture(x:y:)
-#-----|  -> testCapture(x:y:)
-
-#  367| exit testCapture(x:y:)
-
-#  367| exit testCapture(x:y:) (normal)
-#-----|  -> exit testCapture(x:y:)
-
-#  367| testCapture(x:y:)
-#-----|  -> x
-
-#  367| x
-#-----|  -> y
-
-#  367| y
-#-----|  -> z
-
-#  368| return ...
-#-----| return -> exit testCapture(x:y:) (normal)
-
-#  368| enter { ... }
-#-----|  -> { ... }
-
-#  368| exit { ... }
-
-#  368| exit { ... } (normal)
-#-----|  -> exit { ... }
-
-#  368| { ... }
-#-----|  -> z
-
-#  368| { ... }
-#-----|  -> return ...
-
-#  368| { ... }
-#-----|  -> { ... }
-
-#  368| z
-#-----| match -> .+(_:_:)
-
-#  368| var ... = ...
-#-----|  -> t
-
-#  368| x
-#-----|  -> y
-
-#  368| ... .+(_:_:) ...
-#-----|  -> var ... = ...
-
-#  368| .+(_:_:)
-#-----|  -> Int.Type
-
-#  368| Int.Type
-#-----|  -> x
-
-#  368| y
-#-----|  -> ... .+(_:_:) ...
-
-#  368| t
-#-----| match -> literal
-
-#  368| var ... = ...
-#-----|  -> { ... }
-
-#  368| literal
-#-----|  -> var ... = ...
-
-#  369| return ...
-#-----| return -> exit { ... } (normal)
-
-#  369| z
-#-----|  -> return ...
-
-#  373| enter testTupleElement(t:)
-#-----|  -> testTupleElement(t:)
-
-#  373| exit testTupleElement(t:)
-
-#  373| exit testTupleElement(t:) (normal)
-#-----|  -> exit testTupleElement(t:)
-
-#  373| testTupleElement(t:)
-#-----|  -> t
-
-#  373| t
-#-----|  -> .+(_:_:)
-
-#  374| return ...
-#-----| return -> exit testTupleElement(t:) (normal)
-
-#  374| t
-#-----|  -> .0
-
-#  374| .0
-#-----|  -> t
-
-#  374| ... .+(_:_:) ...
-#-----|  -> t
-
-#  374| ... .+(_:_:) ...
-#-----|  -> 1
-
-#  374| ... .+(_:_:) ...
-#-----|  -> return ...
-
-#  374| .+(_:_:)
-#-----|  -> Int.Type
-
-#  374| Int.Type
-#-----|  -> t
-
-#  374| t
-#-----|  -> .1
-
-#  374| .1
-#-----|  -> ... .+(_:_:) ...
-
-#  374| .+(_:_:)
-#-----|  -> Int.Type
-
-#  374| Int.Type
-#-----|  -> .+(_:_:)
-
-#  374| t
-#-----|  -> .2
-
-#  374| .2
-#-----|  -> ... .+(_:_:) ...
-
-#  374| .+(_:_:)
-#-----|  -> Int.Type
-
-#  374| Int.Type
-#-----|  -> .+(_:_:)
-
-#  374| (...)
-#-----|  -> .0
-
-#  374| .0
-#-----|  -> ... .+(_:_:) ...
-
-#  374| 1
-#-----|  -> 2
-
-#  374| 2
-#-----|  -> 3
-
-#  374| 3
-#-----|  -> (...)
-
-#  377| #...
-#-----|  -> #...
-
-#  377| #...
-#-----|  -> #...
-
-#  377| #...
-#-----|  -> #...
-
-#  377| #...
-#-----|  -> call to _unimplementedInitializer(className:initName:file:line:column:)
-
-#  377| Derived.deinit()
-#-----|  -> self
-
-#  377| _unimplementedInitializer(className:initName:file:line:column:)
-#-----|  -> cfg.Derived
-
-#  377| call to _unimplementedInitializer(className:initName:file:line:column:)
-#-----|  -> return
-
-#  377| cfg.Derived
-#-----|  -> #...
-
-#  377| enter Derived.deinit()
-#-----|  -> Derived.deinit()
-
-#  377| exit Derived.deinit()
-
-#  377| exit Derived.deinit() (normal)
-#-----|  -> exit Derived.deinit()
-
-#  377| self
-#-----|  -> { ... }
-
-#  377| { ... }
-#-----|  -> exit Derived.deinit() (normal)
-
-#  377| Derived.init(n:)
-#-----|  -> self
-
-#  377| enter Derived.init(n:)
-#-----|  -> Derived.init(n:)
-
-#  377| exit Derived.init(n:)
-
-#  377| exit Derived.init(n:) (normal)
-#-----|  -> exit Derived.init(n:)
-
-#  377| self
-#-----|  -> n
-
-#  378| self
-#-----|  -> C.init(n:)
-
-#  378| Derived.init()
-#-----|  -> self
-
-#  378| enter Derived.init()
-#-----|  -> Derived.init()
-
-#  378| exit Derived.init()
-
-#  378| exit Derived.init() (normal)
-#-----|  -> exit Derived.init()
-
-#  379| super
-#-----|  -> 0
-
-#  379| C.init(n:)
-#-----|  -> super
-
-#  379| call to C.init(n:)
-#-----|  -> self = ...
-
-#  379| self = ...
-#-----|  -> return
-
-#  379| 0
-#-----|  -> call to C.init(n:)
-
-#  380| return
-#-----| return -> exit Derived.init() (normal)
-
-#  383| doWithoutCatch(x:)
-#-----|  -> x
-
-#  383| enter doWithoutCatch(x:)
-#-----|  -> doWithoutCatch(x:)
-
-#  383| exit doWithoutCatch(x:)
-
-#  383| exit doWithoutCatch(x:) (abnormal)
-#-----|  -> exit doWithoutCatch(x:)
-
-#  383| exit doWithoutCatch(x:) (normal)
-#-----|  -> exit doWithoutCatch(x:)
-
-#  383| x
-#-----|  -> do { ... }
-
-#  384| do { ... }
-#-----|  -> mightThrow(x:)
-
-#  385| try ...
-#-----|  -> print(_:separator:terminator:)
-
-#  385| mightThrow(x:)
-#-----|  -> 0
-
-#  385| call to mightThrow(x:)
-#-----| exception -> exit doWithoutCatch(x:) (abnormal)
-#-----|  -> try ...
-
-#  385| 0
-#-----|  -> call to mightThrow(x:)
-
-#  386| print(_:separator:terminator:)
-#-----|  -> Did not throw.
-
-#  386| call to print(_:separator:terminator:)
-#-----|  -> mightThrow(x:)
-
-#  386| default separator
-#-----|  -> default terminator
-
-#  386| default terminator
-#-----|  -> call to print(_:separator:terminator:)
-
-#  386| (Any) ...
-#-----|  -> [...]
-
-#  386| Did not throw.
-#-----|  -> (Any) ...
-
-#  386| [...]
-#-----|  -> [...]
-
-#  386| [...]
-#-----|  -> default separator
-
-#  387| try! ...
-#-----|  -> print(_:separator:terminator:)
-
-#  387| mightThrow(x:)
-#-----|  -> 0
-
-#  387| call to mightThrow(x:)
-#-----| exception -> exit doWithoutCatch(x:) (abnormal)
-#-----|  -> try! ...
-
-#  387| 0
-#-----|  -> call to mightThrow(x:)
-
-#  388| print(_:separator:terminator:)
-#-----|  -> Still did not throw.
-
-#  388| call to print(_:separator:terminator:)
-#-----|  -> 0
-
-#  388| default separator
-#-----|  -> default terminator
-
-#  388| default terminator
-#-----|  -> call to print(_:separator:terminator:)
-
-#  388| (Any) ...
-#-----|  -> [...]
-
-#  388| Still did not throw.
-#-----|  -> (Any) ...
-
-#  388| [...]
-#-----|  -> [...]
-
-#  388| [...]
-#-----|  -> default separator
-
-#  390| return ...
-#-----| return -> exit doWithoutCatch(x:) (normal)
-
-#  390| 0
-#-----|  -> return ...
-
-#  394| _modify
-#-----|  -> self
-
-#  394| enter _modify
-#-----|  -> _modify
-
-#  394| enter get
-#-----|  -> get
-
-#  394| enter set
-#-----|  -> set
-
-#  394| exit _modify
-
-#  394| exit _modify (normal)
-#-----|  -> exit _modify
-
-#  394| exit get
-
-#  394| exit get (normal)
-#-----|  -> exit get
-
-#  394| exit set
-
-#  394| exit set (normal)
-#-----|  -> exit set
-
-#  394| get
-#-----|  -> self
-
-#  394| self
-#-----|  -> self
-
-#  394| self
-#-----|  -> value
-
-#  394| self
-#-----|  -> self
-
-#  394| set
-#-----|  -> self
-
-#  394| value
-#-----|  -> self
-
-#  394| yield ...
-#-----|  -> exit _modify (normal)
-
-#  395| self
-#-----|  -> self
-
-#  395| Structors.init()
-#-----|  -> self
-
-#  395| enter Structors.init()
-#-----|  -> Structors.init()
-
-#  395| exit Structors.init()
-
-#  395| exit Structors.init() (normal)
-#-----|  -> exit Structors.init()
-
-#  396| .field
-#-----|  -> 10
-
-#  396| self
-#-----|  -> .field
-
-#  396|  ... = ...
-#-----|  -> return
-
-#  396| 10
-#-----|  ->  ... = ...
-
-#  397| return
-#-----| return -> exit Structors.init() (normal)
-
-#  399| self
-#-----|  -> self
-
-#  399| Structors.deinit()
-#-----|  -> self
-
-#  399| enter Structors.deinit()
-#-----|  -> Structors.deinit()
-
-#  399| exit Structors.deinit()
-
-#  399| exit Structors.deinit() (normal)
-#-----|  -> exit Structors.deinit()
-
-#  400| .field
-#-----|  -> 0
-
-#  400| self
-#-----|  -> .field
-
-#  400|  ... = ...
-#-----|  -> exit Structors.deinit() (normal)
-
-#  400| 0
-#-----|  ->  ... = ...
-
-#  404| dictionaryLiteral(x:y:)
-#-----|  -> x
-
-#  404| enter dictionaryLiteral(x:y:)
-#-----|  -> dictionaryLiteral(x:y:)
-
-#  404| exit dictionaryLiteral(x:y:)
-
-#  404| exit dictionaryLiteral(x:y:) (normal)
-#-----|  -> exit dictionaryLiteral(x:y:)
-
-#  404| x
-#-----|  -> y
-
-#  404| y
-#-----|  -> x
-
-#  405| return ...
-#-----| return -> exit dictionaryLiteral(x:y:) (normal)
-
-#  405| [...]
-#-----|  -> return ...
-
-#  405| x
-#-----|  -> x
-
-#  405| (...)
-#-----|  -> y
-
-#  405| x
-#-----|  -> (...)
-
-#  405| y
-#-----|  -> y
-
-#  405| (...)
-#-----|  -> [...]
-
-#  405| y
-#-----|  -> (...)
-
-#  408| enter localDeclarations()
-#-----|  -> localDeclarations()
-
-#  408| exit localDeclarations()
-
-#  408| exit localDeclarations() (normal)
-#-----|  -> exit localDeclarations()
-
-#  408| localDeclarations()
-#-----|  -> MyLocalClass
-
-#  409| MyLocalClass
-#-----|  -> MyLocalStruct
-
-#  409| MyLocalClass.deinit()
-#-----|  -> self
-
-#  409| enter MyLocalClass.deinit()
-#-----|  -> MyLocalClass.deinit()
-
-#  409| exit MyLocalClass.deinit()
-
-#  409| exit MyLocalClass.deinit() (normal)
-#-----|  -> exit MyLocalClass.deinit()
-
-#  409| self
-#-----|  -> { ... }
-
-#  409| { ... }
-#-----|  -> exit MyLocalClass.deinit() (normal)
-
-#  410| _modify
-#-----|  -> self
-
-#  410| enter _modify
-#-----|  -> _modify
-
-#  410| enter get
-#-----|  -> get
-
-#  410| enter set
-#-----|  -> set
-
-#  410| exit _modify
-
-#  410| exit _modify (normal)
-#-----|  -> exit _modify
-
-#  410| exit get
-
-#  410| exit get (normal)
-#-----|  -> exit get
-
-#  410| exit set
-
-#  410| exit set (normal)
-#-----|  -> exit set
-
-#  410| get
-#-----|  -> self
-
-#  410| self
-#-----|  -> self
-
-#  410| self
-#-----|  -> value
-
-#  410| self
-#-----|  -> self
-
-#  410| set
-#-----|  -> self
-
-#  410| value
-#-----|  -> self
-
-#  410| yield ...
-#-----|  -> exit _modify (normal)
-
-#  411| self
-#-----|  -> self
-
-#  411| MyLocalClass.init()
-#-----|  -> self
-
-#  411| enter MyLocalClass.init()
-#-----|  -> MyLocalClass.init()
-
-#  411| exit MyLocalClass.init()
-
-#  411| exit MyLocalClass.init() (normal)
-#-----|  -> exit MyLocalClass.init()
-
-#  412| .x
-#-----|  -> 10
-
-#  412| self
-#-----|  -> .x
-
-#  412|  ... = ...
-#-----|  -> return
-
-#  412| 10
-#-----|  ->  ... = ...
-
-#  413| return
-#-----| return -> exit MyLocalClass.init() (normal)
-
-#  416| MyLocalStruct
-#-----|  -> MyLocalEnum
-
-#  417| _modify
-#-----|  -> self
-
-#  417| enter _modify
-#-----|  -> _modify
-
-#  417| enter get
-#-----|  -> get
-
-#  417| enter set
-#-----|  -> set
-
-#  417| exit _modify
-
-#  417| exit _modify (normal)
-#-----|  -> exit _modify
-
-#  417| exit get
-
-#  417| exit get (normal)
-#-----|  -> exit get
-
-#  417| exit set
-
-#  417| exit set (normal)
-#-----|  -> exit set
-
-#  417| get
-#-----|  -> self
-
-#  417| self
-#-----|  -> self
-
-#  417| self
-#-----|  -> value
-
-#  417| self
-#-----|  -> self
-
-#  417| set
-#-----|  -> self
-
-#  417| value
-#-----|  -> self
-
-#  417| yield ...
-#-----|  -> exit _modify (normal)
-
-#  418| self
-#-----|  -> self
-
-#  418| MyLocalStruct.init()
-#-----|  -> self
-
-#  418| enter MyLocalStruct.init()
-#-----|  -> MyLocalStruct.init()
-
-#  418| exit MyLocalStruct.init()
-
-#  418| exit MyLocalStruct.init() (normal)
-#-----|  -> exit MyLocalStruct.init()
-
-#  419| .x
-#-----|  -> 10
-
-#  419| self
-#-----|  -> .x
-
-#  419|  ... = ...
-#-----|  -> return
-
-#  419| 10
-#-----|  ->  ... = ...
-
-#  420| return
-#-----| return -> exit MyLocalStruct.init() (normal)
-
-#  423| MyLocalEnum
-#-----|  -> myLocalVar
-
-#  428| var ... = ...
-#-----|  -> 0
-
-#  428| myLocalVar
-#-----| match -> ... as ...
-
-#  428| ... as ...
-#-----| match -> var ... = ...
-
-#  442| return ...
-#-----| return -> exit localDeclarations() (normal)
-
-#  442| 0
-#-----|  -> return ...
-
-#  446| _modify
-#-----|  -> self
-
-#  446| enter _modify
-#-----|  -> _modify
-
-#  446| enter get
-#-----|  -> get
-
-#  446| enter set
-#-----|  -> set
-
-#  446| exit _modify
-
-#  446| exit _modify (normal)
-#-----|  -> exit _modify
-
-#  446| exit get
-
-#  446| exit get (normal)
-#-----|  -> exit get
-
-#  446| exit set
-
-#  446| exit set (normal)
-#-----|  -> exit set
-
-#  446| get
-#-----|  -> self
-
-#  446| self
-#-----|  -> self
-
-#  446| self
-#-----|  -> value
-
-#  446| self
-#-----|  -> self
-
-#  446| set
-#-----|  -> self
-
-#  446| value
-#-----|  -> self
-
-#  446| yield ...
-#-----|  -> exit _modify (normal)
-
-#  450| _modify
-#-----|  -> self
-
-#  450| enter _modify
-#-----|  -> _modify
-
-#  450| enter get
-#-----|  -> get
-
-#  450| enter set
-#-----|  -> set
-
-#  450| exit _modify
-
-#  450| exit _modify (normal)
-#-----|  -> exit _modify
-
-#  450| exit get
-
-#  450| exit get (normal)
-#-----|  -> exit get
-
-#  450| exit set
-
-#  450| exit set (normal)
-#-----|  -> exit set
-
-#  450| get
-#-----|  -> self
-
-#  450| self
-#-----|  -> self
-
-#  450| self
-#-----|  -> value
-
-#  450| self
-#-----|  -> self
-
-#  450| set
-#-----|  -> self
-
-#  450| value
-#-----|  -> self
-
-#  450| yield ...
-#-----|  -> exit _modify (normal)
-
-#  451| _modify
-#-----|  -> self
-
-#  451| enter _modify
-#-----|  -> _modify
-
-#  451| enter get
-#-----|  -> get
-
-#  451| enter set
-#-----|  -> set
-
-#  451| exit _modify
-
-#  451| exit _modify (normal)
-#-----|  -> exit _modify
-
-#  451| exit get
-
-#  451| exit get (normal)
-#-----|  -> exit get
-
-#  451| exit set
-
-#  451| exit set (normal)
-#-----|  -> exit set
-
-#  451| get
-#-----|  -> self
-
-#  451| self
-#-----|  -> self
-
-#  451| self
-#-----|  -> value
-
-#  451| self
-#-----|  -> self
-
-#  451| set
-#-----|  -> self
-
-#  451| value
-#-----|  -> self
-
-#  451| yield ...
-#-----|  -> exit _modify (normal)
-
-#  452| _modify
-#-----|  -> self
-
-#  452| enter _modify
-#-----|  -> _modify
-
-#  452| enter get
-#-----|  -> get
-
-#  452| enter set
-#-----|  -> set
-
-#  452| exit _modify
-
-#  452| exit _modify (normal)
-#-----|  -> exit _modify
-
-#  452| exit get
-
-#  452| exit get (normal)
-#-----|  -> exit get
-
-#  452| exit set
-
-#  452| exit set (normal)
-#-----|  -> exit set
-
-#  452| get
-#-----|  -> self
-
-#  452| self
-#-----|  -> self
-
-#  452| self
-#-----|  -> value
-
-#  452| self
-#-----|  -> self
-
-#  452| set
-#-----|  -> self
-
-#  452| value
-#-----|  -> self
-
-#  452| yield ...
-#-----|  -> exit _modify (normal)
-
-#  455| enter test(a:)
-#-----|  -> test(a:)
-
-#  455| exit test(a:)
-
-#  455| exit test(a:) (normal)
-#-----|  -> exit test(a:)
-
-#  455| test(a:)
-#-----|  -> a
-
-#  455| a
-#-----|  -> kpGet_b_x
-
-#  456| var ... = ...
-#-----|  -> kpGet_bs_0_x
-
-#  456| kpGet_b_x
-#-----| match -> #keyPath(...)
-
-#  456| #keyPath(...)
-#-----|  -> exit #keyPath(...) (normal)
-
-#  456| #keyPath(...)
-#-----|  -> var ... = ...
-
-#  456| enter #keyPath(...)
-#-----|  -> KeyPathComponent
-
-#  456| exit #keyPath(...)
-
-#  456| exit #keyPath(...) (normal)
-#-----|  -> exit #keyPath(...)
-
-#  456| KeyPathComponent
-#-----|  -> KeyPathComponent
-
-#  456| KeyPathComponent
-#-----|  -> #keyPath(...)
-
-#  457| var ... = ...
-#-----|  -> kpGet_mayB_force_x
-
-#  457| kpGet_bs_0_x
-#-----| match -> #keyPath(...)
-
-#  457| #keyPath(...)
-#-----|  -> exit #keyPath(...) (normal)
-
-#  457| #keyPath(...)
-#-----|  -> var ... = ...
-
-#  457| enter #keyPath(...)
-#-----|  -> KeyPathComponent
-
-#  457| exit #keyPath(...)
-
-#  457| exit #keyPath(...) (normal)
-#-----|  -> exit #keyPath(...)
-
-#  457| KeyPathComponent
-#-----|  -> 0
-
-#  457| KeyPathComponent
-#-----|  -> KeyPathComponent
-
-#  457| 0
-#-----|  -> KeyPathComponent
-
-#  457| KeyPathComponent
-#-----|  -> #keyPath(...)
-
-#  458| var ... = ...
-#-----|  -> kpGet_mayB_x
-
-#  458| kpGet_mayB_force_x
-#-----| match -> #keyPath(...)
-
-#  458| #keyPath(...)
-#-----|  -> exit #keyPath(...) (normal)
-
-#  458| #keyPath(...)
-#-----|  -> var ... = ...
-
-#  458| enter #keyPath(...)
-#-----|  -> KeyPathComponent
-
-#  458| exit #keyPath(...)
-
-#  458| exit #keyPath(...) (normal)
-#-----|  -> exit #keyPath(...)
-
-#  458| KeyPathComponent
-#-----|  -> KeyPathComponent
-
-#  458| KeyPathComponent
-#-----|  -> KeyPathComponent
-
-#  458| KeyPathComponent
-#-----|  -> #keyPath(...)
-
-#  459| var ... = ...
-#-----|  -> apply_kpGet_b_x
-
-#  459| kpGet_mayB_x
-#-----| match -> #keyPath(...)
-
-#  459| #keyPath(...)
-#-----|  -> exit #keyPath(...) (normal)
-
-#  459| #keyPath(...)
-#-----|  -> var ... = ...
-
-#  459| enter #keyPath(...)
-#-----|  -> KeyPathComponent
-
-#  459| exit #keyPath(...)
-
-#  459| exit #keyPath(...) (normal)
-#-----|  -> exit #keyPath(...)
-
-#  459| KeyPathComponent
-#-----|  -> KeyPathComponent
-
-#  459| KeyPathComponent
-#-----|  -> KeyPathComponent
-
-#  459| KeyPathComponent
-#-----|  -> KeyPathComponent
-
-#  461| var ... = ...
-#-----|  -> apply_kpGet_bs_0_x
-
-#  461| apply_kpGet_b_x
-#-----| match -> a
-
-#  461| a
-#-----|  -> kpGet_b_x
-
-#  461| \...[...]
-#-----|  -> var ... = ...
-
-#  461| (WritableKeyPath<A, Int>) ...
-#-----|  -> \...[...]
-
-#  461| kpGet_b_x
-#-----|  -> (WritableKeyPath<A, Int>) ...
-
-#  462| var ... = ...
-#-----|  -> apply_kpGet_mayB_force_x
-
-#  462| apply_kpGet_bs_0_x
-#-----| match -> a
-
-#  462| a
-#-----|  -> kpGet_bs_0_x
-
-#  462| \...[...]
-#-----|  -> var ... = ...
-
-#  462| (WritableKeyPath<A, Int>) ...
-#-----|  -> \...[...]
-
-#  462| kpGet_bs_0_x
-#-----|  -> (WritableKeyPath<A, Int>) ...
-
-#  463| var ... = ...
-#-----|  -> apply_kpGet_mayB_x
-
-#  463| apply_kpGet_mayB_force_x
-#-----| match -> a
-
-#  463| a
-#-----|  -> kpGet_mayB_force_x
-
-#  463| \...[...]
-#-----|  -> var ... = ...
-
-#  463| (WritableKeyPath<A, Int>) ...
-#-----|  -> \...[...]
-
-#  463| kpGet_mayB_force_x
-#-----|  -> (WritableKeyPath<A, Int>) ...
-
-#  464| var ... = ...
-#-----|  -> exit test(a:) (normal)
-
-#  464| apply_kpGet_mayB_x
-#-----| match -> a
-
-#  464| a
-#-----|  -> kpGet_mayB_x
-
-#  464| \...[...]
-#-----|  -> var ... = ...
-
-#  464| (KeyPath<A, Int?>) ...
-#-----|  -> \...[...]
-
-#  464| kpGet_mayB_x
-#-----|  -> (KeyPath<A, Int?>) ...
-
-#  467| enter testIfConfig()
-#-----|  -> testIfConfig()
-
-#  467| exit testIfConfig()
-
-#  467| exit testIfConfig() (normal)
-#-----|  -> exit testIfConfig()
-
-#  467| testIfConfig()
-#-----|  -> #if ...
-
-#  468| #if ...
-#-----|  -> 3
-
-#  472| 3
-#-----|  -> 4
-
-#  473| 4
-#-----|  -> 5
-
-#  476| 5
-#-----|  -> #if ...
-
-#  478| #if ...
-#-----|  -> 8
-
-#  483| 8
-#-----|  -> #if ...
-
-#  485| #if ...
-#-----|  -> 11
-
-#  489| 11
-#-----|  -> 12
-
-#  490| 12
-#-----|  -> 13
-
-#  493| 13
-#-----|  -> exit testIfConfig() (normal)
-
-#  496| enter testAvailable()
-#-----|  -> testAvailable()
-
-#  496| exit testAvailable()
-
-#  496| exit testAvailable() (normal)
-#-----|  -> exit testAvailable()
-
-#  496| testAvailable()
-#-----|  -> x
-
-#  497| var ... = ...
-#-----|  -> if ... then { ... }
-
-#  497| x
-#-----| match -> 0
-
-#  497| 0
-#-----|  -> var ... = ...
-
-#  499| if ... then { ... }
-#-----|  -> StmtCondition
-
-#  499| #available
-#-----| true -> .+=(_:_:)
-#-----| false -> if ... then { ... }
-
-#  499| StmtCondition
-#-----|  -> macOS 10
-
-#  499| macOS 10
-#-----|  -> *
-
-#  499| *
-#-----|  -> #available
-
-#  500| &...
-#-----|  -> 1
-
-#  500| x
-#-----|  -> &...
-
-#  500| ... .+=(_:_:) ...
-#-----|  -> if ... then { ... }
-
-#  500| .+=(_:_:)
-#-----|  -> Int.Type
-
-#  500| Int.Type
-#-----|  -> x
-
-#  500| 1
-#-----|  -> ... .+=(_:_:) ...
-
-#  503| if ... then { ... }
-#-----|  -> StmtCondition
-
-#  503| #available
-#-----| true -> .+=(_:_:)
-#-----| false -> if ... then { ... }
-
-#  503| StmtCondition
-#-----|  -> macOS 10.13
-
-#  503| macOS 10.13
-#-----|  -> *
-
-#  503| *
-#-----|  -> #available
-
-#  504| &...
-#-----|  -> 1
-
-#  504| x
-#-----|  -> &...
-
-#  504| ... .+=(_:_:) ...
-#-----|  -> if ... then { ... }
-
-#  504| .+=(_:_:)
-#-----|  -> Int.Type
-
-#  504| Int.Type
-#-----|  -> x
-
-#  504| 1
-#-----|  -> ... .+=(_:_:) ...
-
-#  507| if ... then { ... }
-#-----|  -> StmtCondition
-
-#  507| #unavailable
-#-----| true -> .+=(_:_:)
-#-----| false -> guard ... else { ... }
-
-#  507| StmtCondition
-#-----|  -> iOS 10
-
-#  507| iOS 10
-#-----|  -> watchOS 10
-
-#  507| watchOS 10
-#-----|  -> macOS 10
-
-#  507| macOS 10
-#-----|  -> #unavailable
-
-#  508| &...
-#-----|  -> 1
-
-#  508| x
-#-----|  -> &...
-
-#  508| ... .+=(_:_:) ...
-#-----|  -> guard ... else { ... }
-
-#  508| .+=(_:_:)
-#-----|  -> Int.Type
-
-#  508| Int.Type
-#-----|  -> x
-
-#  508| 1
-#-----|  -> ... .+=(_:_:) ...
-
-#  511| guard ... else { ... }
-#-----|  -> StmtCondition
-
-#  511| #available
-#-----| false -> .+=(_:_:)
-#-----| true -> if ... then { ... }
-
-#  511| StmtCondition
-#-----|  -> macOS 12
-
-#  511| macOS 12
-#-----|  -> *
-
-#  511| *
-#-----|  -> #available
-
-#  512| &...
-#-----|  -> 1
-
-#  512| x
-#-----|  -> &...
-
-#  512| ... .+=(_:_:) ...
-#-----|  -> if ... then { ... }
-
-#  512| .+=(_:_:)
-#-----|  -> Int.Type
-
-#  512| Int.Type
-#-----|  -> x
-
-#  512| 1
-#-----|  -> ... .+=(_:_:) ...
-
-#  515| if ... then { ... }
-#-----|  -> StmtCondition
-
-#  515| #available
-#-----| false, true -> iOS 12
-#-----| false -> x
-
-#  515| StmtCondition
-#-----|  -> macOS 12
-
-#  515| macOS 12
-#-----|  -> *
-
-#  515| *
-#-----|  -> #available
-
-#  515| #available
-#-----| true -> .+=(_:_:)
-#-----| false -> x
-
-#  515| iOS 12
-#-----|  -> *
-
-#  515| *
-#-----|  -> #available
-
-#  516| &...
-#-----|  -> 1
-
-#  516| x
-#-----|  -> &...
-
-#  516| ... .+=(_:_:) ...
-#-----|  -> x
-
-#  516| .+=(_:_:)
-#-----|  -> Int.Type
-
-#  516| Int.Type
-#-----|  -> x
-
-#  516| 1
-#-----|  -> ... .+=(_:_:) ...
-
-#  519| return ...
-#-----| return -> exit testAvailable() (normal)
-
-#  519| (Int) ...
-#-----|  -> return ...
-
-#  519| x
-#-----|  -> (Int) ...
-
-#  522| enter testAsyncFor()
-#-----|  -> testAsyncFor()
-
-#  522| exit testAsyncFor()
-
-#  522| exit testAsyncFor() (normal)
-#-----|  -> exit testAsyncFor()
-
-#  522| testAsyncFor()
-#-----|  -> stream
-
-#  523| var ... = ...
-#-----|  -> $i$generator
-
-#  523| stream
-#-----| match -> AsyncStream<Element>.init(_:bufferingPolicy:_:)
-
-#  523| AsyncStream<Element>.init(_:bufferingPolicy:_:)
-#-----|  -> AsyncStream<Int>.Type
-
-#  523| AsyncStream<Int>.Type
-#-----|  -> Int.Type
-
-#  523| call to AsyncStream<Element>.init(_:bufferingPolicy:_:)
-#-----|  -> var ... = ...
-
-#  523| Int.Type
-#-----|  -> .self
-
-#  523| .self
-#-----|  -> .bufferingNewest
-
-#  523| AsyncStream<Int>.Continuation.BufferingPolicy.Type
-#-----|  -> 5
-
-#  523| .bufferingNewest
-#-----|  -> AsyncStream<Int>.Continuation.BufferingPolicy.Type
-
-#  523| call to ...
-#-----|  -> { ... }
-
-#  523| 5
-#-----|  -> call to ...
-
-#  523| enter { ... }
-#-----|  -> { ... }
-
-#  523| exit { ... }
-
-#  523| exit { ... } (normal)
-#-----|  -> exit { ... }
-
-#  523| { ... }
-#-----|  -> continuation
-
-#  523| { ... }
-#-----|  -> call to AsyncStream<Element>.init(_:bufferingPolicy:_:)
-
-#  524| continuation
-#-----|  -> .detached(priority:operation:)
-
-#  525| Task<(), Never>.Type
-#-----|  -> default priority
-
-#  525| .detached(priority:operation:)
-#-----|  -> Task<(), Never>.Type
-
-#  525| call to detached(priority:operation:)
-#-----|  -> exit { ... } (normal)
-
-#  525| default priority
-#-----|  -> { ... }
-
-#  525| enter { ... }
-#-----|  -> { ... }
-
-#  525| exit { ... }
-
-#  525| exit { ... } (normal)
-#-----|  -> exit { ... }
-
-#  525| { ... }
-#-----|  -> $i$generator
-
-#  525| { ... }
-#-----|  -> call to detached(priority:operation:)
-
-#  526| $i$generator
-#-----|  -> &...
-
-#  526| &...
-#-----|  -> call to next()
-
-#  526| .next()
-#-----|  -> $i$generator
-
-#  526| call to next()
-#-----|  -> for ... in ... { ... }
-
-#  526| for ... in ... { ... }
-#-----| non-empty -> i
-#-----| empty -> .finish()
-
-#  526| i
-#-----| match -> .yield(_:)
-
-#  526| $i$generator
-#-----| match -> .makeIterator()
-
-#  526| 1
-#-----|  -> 100
-
-#  526| ... ....(_:_:) ...
-#-----|  -> call to makeIterator()
-
-#  526| .makeIterator()
-#-----|  -> ....(_:_:)
-
-#  526| call to makeIterator()
-#-----|  -> var ... = ...
-
-#  526| ....(_:_:)
-#-----|  -> Int.Type
-
-#  526| Int.Type
-#-----|  -> 1
-
-#  526| 100
-#-----|  -> ... ....(_:_:) ...
-
-#  527| continuation
-#-----|  -> i
-
-#  527| .yield(_:)
-#-----|  -> continuation
-
-#  527| call to yield(_:)
-#-----|  -> .next()
-
-#  527| i
-#-----|  -> call to yield(_:)
-
-#  529| continuation
-#-----|  -> call to finish()
-
-#  529| .finish()
-#-----|  -> continuation
-
-#  529| call to finish()
-#-----|  -> exit { ... } (normal)
-
-#  533| $i$generator
-#-----|  -> &...
-
-#  533| &...
-#-----|  -> call to next()
-
-#  533| .next()
-#-----|  -> $i$generator
-
-#  533| call to next()
-#-----|  -> await ...
-
-#  533| for ... in ... { ... }
-#-----| empty -> exit testAsyncFor() (normal)
-#-----| non-empty -> i
-
-#  533| i
-#-----| match -> print(_:separator:terminator:)
-
-#  533| $i$generator
-#-----| match -> .makeAsyncIterator()
-
-#  533| (AsyncStream<Int>) ...
-#-----|  -> call to makeAsyncIterator()
-
-#  533| .makeAsyncIterator()
-#-----|  -> stream
-
-#  533| call to makeAsyncIterator()
-#-----|  -> var ... = ...
-
-#  533| stream
-#-----|  -> (AsyncStream<Int>) ...
-
-#  534| print(_:separator:terminator:)
-#-----|  -> i
-
-#  534| call to print(_:separator:terminator:)
-#-----|  -> .next()
-
-#  534| default separator
-#-----|  -> default terminator
-
-#  534| default terminator
-#-----|  -> call to print(_:separator:terminator:)
-
-#  534| (Any) ...
-#-----|  -> [...]
-
-#  534| [...]
-#-----|  -> [...]
-
-#  534| [...]
-#-----|  -> default separator
-
-#  534| i
-#-----|  -> (Any) ...
-
-#  538| enter testNilCoalescing(x:)
-#-----|  -> testNilCoalescing(x:)
-
-#  538| exit testNilCoalescing(x:)
-
-#  538| exit testNilCoalescing(x:) (abnormal)
-#-----|  -> exit testNilCoalescing(x:)
-
-#  538| exit testNilCoalescing(x:) (normal)
-#-----|  -> exit testNilCoalescing(x:)
-
-#  538| testNilCoalescing(x:)
-#-----|  -> x
-
-#  538| x
-#-----|  -> x
-
-#  539| return ...
-#-----| return -> exit testNilCoalescing(x:) (normal)
-
-#  539| x
-#-----|  -> emptiness test for ... ??(_:_:) ...
-
-#  539| ... ??(_:_:) ...
-#-----| exception -> exit testNilCoalescing(x:) (abnormal)
-#-----|  -> return ...
-
-#  539| emptiness test for ... ??(_:_:) ...
-#-----| non-empty -> ... ??(_:_:) ...
-#-----| empty -> { ... }
-
-#  539| 0
-#-----|  -> return ...
-
-#  539| return ...
-#-----|  -> ... ??(_:_:) ...
-
-#  539| { ... }
-#-----|  -> 0
-
-#  542| enter testNilCoalescing2(x:)
-#-----|  -> testNilCoalescing2(x:)
-
-#  542| exit testNilCoalescing2(x:)
-
-#  542| exit testNilCoalescing2(x:) (abnormal)
-#-----|  -> exit testNilCoalescing2(x:)
-
-#  542| exit testNilCoalescing2(x:) (normal)
-#-----|  -> exit testNilCoalescing2(x:)
-
-#  542| testNilCoalescing2(x:)
-#-----|  -> x
-
-#  542| x
-#-----|  -> if ... then { ... } else { ... }
-
-#  543| if ... then { ... } else { ... }
-#-----|  -> StmtCondition
-
-#  543| x
-#-----|  -> emptiness test for ... ??(_:_:) ...
-
-#  543| ... ??(_:_:) ...
-#-----| exception -> exit testNilCoalescing2(x:) (abnormal)
-#-----| true -> 1
-#-----| false -> 0
-
-#  543| StmtCondition
-#-----|  -> x
-
-#  543| emptiness test for ... ??(_:_:) ...
-#-----| non-empty -> ... ??(_:_:) ...
-#-----| empty -> { ... }
-
-#  543| false
-#-----|  -> return ...
-
-#  543| return ...
-#-----|  -> ... ??(_:_:) ...
-
-#  543| { ... }
-#-----|  -> false
-
-#  544| return ...
-#-----| return -> exit testNilCoalescing2(x:) (normal)
-
-#  544| 1
-#-----|  -> return ...
-
-#  546| return ...
-#-----| return -> exit testNilCoalescing2(x:) (normal)
-
-#  546| 0
-#-----|  -> return ...
-
-#  550| enter usesAutoclosure(_:)
-#-----|  -> usesAutoclosure(_:)
-
-#  550| exit usesAutoclosure(_:)
-
-#  550| exit usesAutoclosure(_:) (normal)
-#-----|  -> exit usesAutoclosure(_:)
-
-#  550| usesAutoclosure(_:)
-#-----|  -> expr
-
-#  550| expr
-#-----|  -> expr
-
-#  551| return ...
-#-----| return -> exit usesAutoclosure(_:) (normal)
-
-#  551| expr
-#-----|  -> call to ...
-
-#  551| call to ...
-#-----|  -> return ...
-
-#  554| autoclosureTest()
-#-----|  -> usesAutoclosure(_:)
-
-#  554| enter autoclosureTest()
-#-----|  -> autoclosureTest()
-
-#  554| exit autoclosureTest()
-
-#  554| exit autoclosureTest() (normal)
-#-----|  -> exit autoclosureTest()
-
-#  555| usesAutoclosure(_:)
-#-----|  -> { ... }
-
-#  555| call to usesAutoclosure(_:)
-#-----|  -> exit autoclosureTest() (normal)
-
-#  555| 1
-#-----|  -> return ...
-
-#  555| enter { ... }
-#-----|  -> { ... }
-
-#  555| exit { ... }
-
-#  555| exit { ... } (normal)
-#-----|  -> exit { ... }
-
-#  555| return ...
-#-----|  -> exit { ... } (normal)
-
-#  555| { ... }
-#-----|  -> 1
-
-#  555| { ... }
-#-----|  -> call to usesAutoclosure(_:)
-
-#  564| MyProcotolImpl.deinit()
-#-----|  -> self
-
-#  564| MyProcotolImpl.init()
-#-----|  -> self
-
-#  564| enter MyProcotolImpl.deinit()
-#-----|  -> MyProcotolImpl.deinit()
-
-#  564| enter MyProcotolImpl.init()
-#-----|  -> MyProcotolImpl.init()
-
-#  564| exit MyProcotolImpl.deinit()
-
-#  564| exit MyProcotolImpl.deinit() (normal)
-#-----|  -> exit MyProcotolImpl.deinit()
-
-#  564| exit MyProcotolImpl.init()
-
-#  564| exit MyProcotolImpl.init() (normal)
-#-----|  -> exit MyProcotolImpl.init()
-
-#  564| return
-#-----| return -> exit MyProcotolImpl.init() (normal)
-
-#  564| self
-#-----|  -> { ... }
-
-#  564| self
-#-----|  -> return
-
-#  564| { ... }
-#-----|  -> exit MyProcotolImpl.deinit() (normal)
-
-#  565| enter source()
-#-----|  -> source()
-
-#  565| exit source()
-
-#  565| exit source() (normal)
-#-----|  -> exit source()
-
-#  565| source()
-#-----|  -> self
-
-#  565| self
-#-----|  -> 0
-
-#  565| return ...
-#-----| return -> exit source() (normal)
-
-#  565| 0
-#-----|  -> return ...
-
-#  568| enter getMyProtocol()
-#-----|  -> getMyProtocol()
-
-#  568| exit getMyProtocol()
-
-#  568| exit getMyProtocol() (normal)
-#-----|  -> exit getMyProtocol()
-
-#  568| getMyProtocol()
-#-----|  -> MyProcotolImpl.init()
-
-#  568| return ...
-#-----| return -> exit getMyProtocol() (normal)
-
-#  568| MyProcotolImpl.Type
-#-----|  -> call to MyProcotolImpl.init()
-
-#  568| MyProcotolImpl.init()
-#-----|  -> MyProcotolImpl.Type
-
-#  568| (any MyProtocol) ...
-#-----|  -> return ...
-
-#  568| call to MyProcotolImpl.init()
-#-----|  -> (any MyProtocol) ...
-
-#  569| enter getMyProtocolImpl()
-#-----|  -> getMyProtocolImpl()
-
-#  569| exit getMyProtocolImpl()
-
-#  569| exit getMyProtocolImpl() (normal)
-#-----|  -> exit getMyProtocolImpl()
-
-#  569| getMyProtocolImpl()
-#-----|  -> MyProcotolImpl.init()
-
-#  569| return ...
-#-----| return -> exit getMyProtocolImpl() (normal)
-
-#  569| MyProcotolImpl.Type
-#-----|  -> call to MyProcotolImpl.init()
-
-#  569| MyProcotolImpl.init()
-#-----|  -> MyProcotolImpl.Type
-
-#  569| call to MyProcotolImpl.init()
-#-----|  -> return ...
-
-#  571| enter sink(arg:)
-#-----|  -> sink(arg:)
-
-#  571| exit sink(arg:)
-
-#  571| exit sink(arg:) (normal)
-#-----|  -> exit sink(arg:)
-
-#  571| sink(arg:)
-#-----|  -> arg
-
-#  571| arg
-#-----|  -> { ... }
-
-#  571| { ... }
-#-----|  -> exit sink(arg:) (normal)
-
-#  573| enter testOpenExistentialExpr(x:y:)
-#-----|  -> testOpenExistentialExpr(x:y:)
-
-#  573| exit testOpenExistentialExpr(x:y:)
-
-#  573| exit testOpenExistentialExpr(x:y:) (normal)
-#-----|  -> exit testOpenExistentialExpr(x:y:)
-
-#  573| testOpenExistentialExpr(x:y:)
-#-----|  -> x
-
-#  573| x
-#-----|  -> y
-
-#  573| y
-#-----|  -> sink(arg:)
-
-#  574| sink(arg:)
-#-----|  -> x
-
-#  574| call to sink(arg:)
-#-----|  -> sink(arg:)
-
-#  574| OpaqueValueExpr
-#-----|  -> call to source()
-
-#  574| x
-#-----|  -> .source()
-
-#  574| .source()
-#-----|  -> OpaqueValueExpr
-
-#  574| OpenExistentialExpr
-#-----|  -> call to sink(arg:)
-
-#  574| call to source()
-#-----|  -> OpenExistentialExpr
-
-#  575| sink(arg:)
-#-----|  -> .source()
-
-#  575| call to sink(arg:)
-#-----|  -> sink(arg:)
-
-#  575| y
-#-----|  -> call to source()
-
-#  575| .source()
-#-----|  -> y
-
-#  575| call to source()
-#-----|  -> call to sink(arg:)
-
-#  576| sink(arg:)
-#-----|  -> getMyProtocol()
-
-#  576| call to sink(arg:)
-#-----|  -> sink(arg:)
-
-#  576| getMyProtocol()
-#-----|  -> call to getMyProtocol()
-
-#  576| OpaqueValueExpr
-#-----|  -> call to source()
-
-#  576| call to getMyProtocol()
-#-----|  -> .source()
-
-#  576| .source()
-#-----|  -> OpaqueValueExpr
-
-#  576| OpenExistentialExpr
-#-----|  -> call to sink(arg:)
-
-#  576| call to source()
-#-----|  -> OpenExistentialExpr
-
-#  577| sink(arg:)
-#-----|  -> .source()
-
-#  577| call to sink(arg:)
-#-----|  -> exit testOpenExistentialExpr(x:y:) (normal)
-
-#  577| getMyProtocolImpl()
-#-----|  -> call to getMyProtocolImpl()
-
-#  577| call to getMyProtocolImpl()
-#-----|  -> call to source()
-
-#  577| .source()
-#-----|  -> getMyProtocolImpl()
-
-#  577| call to source()
-#-----|  -> call to sink(arg:)
-
-#  580| enter singleStmtExpr(_:)
-#-----|  -> singleStmtExpr(_:)
-
-#  580| exit singleStmtExpr(_:)
-
-#  580| exit singleStmtExpr(_:) (normal)
-#-----|  -> exit singleStmtExpr(_:)
-
-#  580| singleStmtExpr(_:)
-#-----|  -> x
-
-#  580| x
-#-----|  -> a
-
-#  581| var ... = ...
-#-----|  -> b
-
-#  581| a
-#-----| match -> switch x { ... }
-
-#  581| SingleValueStmtExpr
-#-----|  -> var ... = ...
-
-#  581| switch x { ... }
-#-----|  -> x
-
-#  581| x
-#-----|  -> case ...
-
-#  582| case ...
-#-----|  -> =~ ...
-
-#  582| .~=(_:_:)
-#-----|  -> Range<Int>.Type
-
-#  582| 0
-#-----|  -> 5
-
-#  582| Range<Int>.Type
-#-----|  -> ...<(_:_:)
-
-#  582| ... ...<(_:_:) ...
-#-----|  -> $match
-
-#  582| ... .~=(_:_:) ...
-#-----|  -> =~ ...
-
-#  582| =~ ...
-#-----|  -> .~=(_:_:)
-
-#  582| =~ ...
-#-----| match -> 1
-#-----| no-match -> case ...
-
-#  582| ...<(_:_:)
-#-----|  -> Int.Type
-
-#  582| Int.Type
-#-----|  -> 0
-
-#  582| $match
-#-----|  -> ... .~=(_:_:) ...
-
-#  582| 5
-#-----|  -> ... ...<(_:_:) ...
-
-#  582| 1
-#-----|  -> ThenStmt
-
-#  582| ThenStmt
-#-----|  -> SingleValueStmtExpr
-
-#  583| _
-#-----| match -> 2
-
-#  583| _
-#-----|  -> _
-
-#  583| case ...
-#-----|  -> _
-
-#  583| 2
-#-----|  -> ThenStmt
-
-#  583| ThenStmt
-#-----|  -> SingleValueStmtExpr
-
-#  585| var ... = ...
-#-----|  -> exit singleStmtExpr(_:) (normal)
-
-#  585| b
-#-----| match -> if ... then { ... } else { ... }
-
-#  585| SingleValueStmtExpr
-#-----|  -> var ... = ...
-
-#  585| if ... then { ... } else { ... }
-#-----|  -> StmtCondition
-
-#  585| StmtCondition
-#-----|  -> .<(_:_:)
-
-#  585| [false] (...)
-#-----| false -> 2
-
-#  585| [true] (...)
-#-----| true -> 1
-
-#  585| x
-#-----|  -> 42
-
-#  585| ... .<(_:_:) ...
-#-----| false -> [false] (...)
-#-----| true -> [true] (...)
-
-#  585| .<(_:_:)
-#-----|  -> Int.Type
-
-#  585| Int.Type
-#-----|  -> x
-
-#  585| 42
-#-----|  -> ... .<(_:_:) ...
-
-#  585| 1
-#-----|  -> ThenStmt
-
-#  585| ThenStmt
-#-----|  -> SingleValueStmtExpr
-
-#  585| 2
-#-----|  -> ThenStmt
-
-#  585| ThenStmt
-#-----|  -> SingleValueStmtExpr
+| cfg.swift:5:1:5:37 | enter returnZero() | cfg.swift:5:1:5:37 | returnZero() |  |
+| cfg.swift:5:1:5:37 | exit returnZero() (normal) | cfg.swift:5:1:5:37 | exit returnZero() |  |
+| cfg.swift:5:1:5:37 | returnZero() | cfg.swift:5:35:5:35 | 0 |  |
+| cfg.swift:5:28:5:35 | return ... | cfg.swift:5:1:5:37 | exit returnZero() (normal) | return |
+| cfg.swift:5:35:5:35 | 0 | cfg.swift:5:28:5:35 | return ... |  |
+| cfg.swift:15:1:15:46 | enter isZero(x:) | cfg.swift:15:1:15:46 | isZero(x:) |  |
+| cfg.swift:15:1:15:46 | exit isZero(x:) (normal) | cfg.swift:15:1:15:46 | exit isZero(x:) |  |
+| cfg.swift:15:1:15:46 | isZero(x:) | cfg.swift:15:13:15:17 | x |  |
+| cfg.swift:15:13:15:17 | x | cfg.swift:15:41:15:41 | .==(_:_:) |  |
+| cfg.swift:15:32:15:44 | return ... | cfg.swift:15:1:15:46 | exit isZero(x:) (normal) | return |
+| cfg.swift:15:39:15:39 | x | cfg.swift:15:44:15:44 | 0 |  |
+| cfg.swift:15:39:15:44 | ... .==(_:_:) ... | cfg.swift:15:32:15:44 | return ... |  |
+| cfg.swift:15:41:15:41 | .==(_:_:) | cfg.swift:15:41:15:41 | Int.Type |  |
+| cfg.swift:15:41:15:41 | Int.Type | cfg.swift:15:39:15:39 | x |  |
+| cfg.swift:15:44:15:44 | 0 | cfg.swift:15:39:15:44 | ... .==(_:_:) ... |  |
+| cfg.swift:17:1:24:1 | enter mightThrow(x:) | cfg.swift:17:1:24:1 | mightThrow(x:) |  |
+| cfg.swift:17:1:24:1 | exit mightThrow(x:) (abnormal) | cfg.swift:17:1:24:1 | exit mightThrow(x:) |  |
+| cfg.swift:17:1:24:1 | exit mightThrow(x:) (normal) | cfg.swift:17:1:24:1 | exit mightThrow(x:) |  |
+| cfg.swift:17:1:24:1 | mightThrow(x:) | cfg.swift:17:17:17:21 | x |  |
+| cfg.swift:17:17:17:21 | x | cfg.swift:18:3:20:3 | guard ... else { ... } |  |
+| cfg.swift:18:3:20:3 | guard ... else { ... } | cfg.swift:18:9:18:14 | StmtCondition |  |
+| cfg.swift:18:9:18:9 | x | cfg.swift:18:14:18:14 | 0 |  |
+| cfg.swift:18:9:18:14 | ... .>=(_:_:) ... | cfg.swift:19:11:19:19 | .error1 | false |
+| cfg.swift:18:9:18:14 | ... .>=(_:_:) ... | cfg.swift:21:3:23:3 | guard ... else { ... } | true |
+| cfg.swift:18:9:18:14 | StmtCondition | cfg.swift:18:11:18:11 | .>=(_:_:) |  |
+| cfg.swift:18:11:18:11 | .>=(_:_:) | cfg.swift:18:11:18:11 | Int.Type |  |
+| cfg.swift:18:11:18:11 | Int.Type | cfg.swift:18:9:18:9 | x |  |
+| cfg.swift:18:14:18:14 | 0 | cfg.swift:18:9:18:14 | ... .>=(_:_:) ... |  |
+| cfg.swift:19:5:19:19 | throw ... | cfg.swift:17:1:24:1 | exit mightThrow(x:) (abnormal) | exception |
+| cfg.swift:19:11:19:11 | MyError.Type | cfg.swift:19:11:19:19 | (any Error) ... |  |
+| cfg.swift:19:11:19:19 | (any Error) ... | cfg.swift:19:5:19:19 | throw ... |  |
+| cfg.swift:19:11:19:19 | .error1 | cfg.swift:19:11:19:11 | MyError.Type |  |
+| cfg.swift:21:3:23:3 | guard ... else { ... } | cfg.swift:21:9:21:14 | StmtCondition |  |
+| cfg.swift:21:9:21:9 | x | cfg.swift:21:14:21:14 | 0 |  |
+| cfg.swift:21:9:21:14 | ... .<=(_:_:) ... | cfg.swift:17:1:24:1 | exit mightThrow(x:) (normal) | true |
+| cfg.swift:21:9:21:14 | ... .<=(_:_:) ... | cfg.swift:22:11:22:19 | .error3 | false |
+| cfg.swift:21:9:21:14 | StmtCondition | cfg.swift:21:11:21:11 | .<=(_:_:) |  |
+| cfg.swift:21:11:21:11 | .<=(_:_:) | cfg.swift:21:11:21:11 | Int.Type |  |
+| cfg.swift:21:11:21:11 | Int.Type | cfg.swift:21:9:21:9 | x |  |
+| cfg.swift:21:14:21:14 | 0 | cfg.swift:21:9:21:14 | ... .<=(_:_:) ... |  |
+| cfg.swift:22:5:22:42 | throw ... | cfg.swift:17:1:24:1 | exit mightThrow(x:) (abnormal) | exception |
+| cfg.swift:22:11:22:11 | MyError.Type | cfg.swift:22:39:22:39 | .+(_:_:) |  |
+| cfg.swift:22:11:22:19 | .error3 | cfg.swift:22:11:22:11 | MyError.Type |  |
+| cfg.swift:22:11:22:42 | (any Error) ... | cfg.swift:22:5:22:42 | throw ... |  |
+| cfg.swift:22:11:22:42 | call to ... | cfg.swift:22:11:22:42 | (any Error) ... |  |
+| cfg.swift:22:37:22:37 | x | cfg.swift:22:41:22:41 | 1 |  |
+| cfg.swift:22:37:22:41 | ... .+(_:_:) ... | cfg.swift:22:11:22:42 | call to ... |  |
+| cfg.swift:22:39:22:39 | .+(_:_:) | cfg.swift:22:39:22:39 | Int.Type |  |
+| cfg.swift:22:39:22:39 | Int.Type | cfg.swift:22:37:22:37 | x |  |
+| cfg.swift:22:41:22:41 | 1 | cfg.swift:22:37:22:41 | ... .+(_:_:) ... |  |
+| cfg.swift:26:1:43:1 | enter tryCatch(x:) | cfg.swift:26:1:43:1 | tryCatch(x:) |  |
+| cfg.swift:26:1:43:1 | exit tryCatch(x:) (normal) | cfg.swift:26:1:43:1 | exit tryCatch(x:) |  |
+| cfg.swift:26:1:43:1 | tryCatch(x:) | cfg.swift:26:15:26:19 | x |  |
+| cfg.swift:26:15:26:19 | x | cfg.swift:27:3:41:3 | do { ... } catch { ... } |  |
+| cfg.swift:27:3:41:3 | do { ... } catch { ... } | cfg.swift:28:9:28:9 | mightThrow(x:) |  |
+| cfg.swift:28:5:28:24 | try ... | cfg.swift:29:5:29:5 | print(_:separator:terminator:) |  |
+| cfg.swift:28:9:28:9 | mightThrow(x:) | cfg.swift:28:23:28:23 | 0 |  |
+| cfg.swift:28:9:28:24 | call to mightThrow(x:) | cfg.swift:28:5:28:24 | try ... |  |
+| cfg.swift:28:9:28:24 | call to mightThrow(x:) | cfg.swift:33:5:35:3 | case ... | exception |
+| cfg.swift:28:23:28:23 | 0 | cfg.swift:28:9:28:24 | call to mightThrow(x:) |  |
+| cfg.swift:29:5:29:5 | print(_:separator:terminator:) | cfg.swift:29:11:29:11 | Did not throw. |  |
+| cfg.swift:29:5:29:27 | call to print(_:separator:terminator:) | cfg.swift:30:10:30:10 | mightThrow(x:) |  |
+| cfg.swift:29:10:29:10 | default separator | cfg.swift:29:10:29:10 | default terminator |  |
+| cfg.swift:29:10:29:10 | default terminator | cfg.swift:29:5:29:27 | call to print(_:separator:terminator:) |  |
+| cfg.swift:29:11:29:11 | (Any) ... | cfg.swift:29:11:29:11 | [...] |  |
+| cfg.swift:29:11:29:11 | Did not throw. | cfg.swift:29:11:29:11 | (Any) ... |  |
+| cfg.swift:29:11:29:11 | [...] | cfg.swift:29:10:29:10 | default separator |  |
+| cfg.swift:29:11:29:11 | [...] | cfg.swift:29:11:29:11 | [...] |  |
+| cfg.swift:30:5:30:25 | try! ... | cfg.swift:31:5:31:5 | print(_:separator:terminator:) |  |
+| cfg.swift:30:10:30:10 | mightThrow(x:) | cfg.swift:30:24:30:24 | 0 |  |
+| cfg.swift:30:10:30:25 | call to mightThrow(x:) | cfg.swift:30:5:30:25 | try! ... |  |
+| cfg.swift:30:10:30:25 | call to mightThrow(x:) | cfg.swift:33:5:35:3 | case ... | exception |
+| cfg.swift:30:24:30:24 | 0 | cfg.swift:30:10:30:25 | call to mightThrow(x:) |  |
+| cfg.swift:31:5:31:5 | print(_:separator:terminator:) | cfg.swift:31:11:31:11 | Still did not throw. |  |
+| cfg.swift:31:5:31:33 | call to print(_:separator:terminator:) | cfg.swift:42:10:42:10 | 0 |  |
+| cfg.swift:31:10:31:10 | default separator | cfg.swift:31:10:31:10 | default terminator |  |
+| cfg.swift:31:10:31:10 | default terminator | cfg.swift:31:5:31:33 | call to print(_:separator:terminator:) |  |
+| cfg.swift:31:11:31:11 | (Any) ... | cfg.swift:31:11:31:11 | [...] |  |
+| cfg.swift:31:11:31:11 | Still did not throw. | cfg.swift:31:11:31:11 | (Any) ... |  |
+| cfg.swift:31:11:31:11 | [...] | cfg.swift:31:10:31:10 | default separator |  |
+| cfg.swift:31:11:31:11 | [...] | cfg.swift:31:11:31:11 | [...] |  |
+| cfg.swift:33:5:35:3 | case ... | cfg.swift:33:11:33:11 | ... is ... |  |
+| cfg.swift:33:11:33:11 | ... is ... | cfg.swift:33:11:33:19 | .error1 |  |
+| cfg.swift:33:11:33:11 | ... is ... | cfg.swift:33:28:33:60 | ... is ... where ... | no-match |
+| cfg.swift:33:11:33:11 | ... is ... | cfg.swift:34:12:34:12 | 0 | match |
+| cfg.swift:33:11:33:19 | .error1 | cfg.swift:33:11:33:11 | ... is ... | match, no-match |
+| cfg.swift:33:28:33:28 | ... is ... | cfg.swift:33:49:33:60 | call to isZero(x:) | match, no-match |
+| cfg.swift:33:28:33:28 | ... is ... | cfg.swift:35:5:37:3 | case ... | no-match |
+| cfg.swift:33:28:33:36 | .error2 | cfg.swift:33:28:33:28 | ... is ... | match, no-match |
+| cfg.swift:33:28:33:60 | ... is ... where ... | cfg.swift:33:28:33:36 | .error2 |  |
+| cfg.swift:34:5:34:12 | return ... | cfg.swift:26:1:43:1 | exit tryCatch(x:) (normal) | return |
+| cfg.swift:34:12:34:12 | 0 | cfg.swift:34:5:34:12 | return ... |  |
+| cfg.swift:35:5:37:3 | case ... | cfg.swift:35:11:35:11 | ... is ... |  |
+| cfg.swift:35:11:35:11 | ... is ... | cfg.swift:35:11:35:39 | .error3(...) |  |
+| cfg.swift:35:11:35:11 | ... is ... | cfg.swift:36:12:36:12 | withParam | match |
+| cfg.swift:35:11:35:11 | ... is ... | cfg.swift:37:5:39:3 | case ... | no-match |
+| cfg.swift:35:11:35:39 | .error3(...) | cfg.swift:35:11:35:11 | ... is ... | no-match |
+| cfg.swift:35:11:35:39 | .error3(...) | cfg.swift:35:25:35:39 | (...) | match |
+| cfg.swift:35:25:35:39 | (...) | cfg.swift:35:30:35:30 | withParam |  |
+| cfg.swift:35:26:35:30 | let ... | cfg.swift:35:11:35:11 | ... is ... | match |
+| cfg.swift:35:30:35:30 | withParam | cfg.swift:35:26:35:30 | let ... | match |
+| cfg.swift:36:5:36:12 | return ... | cfg.swift:26:1:43:1 | exit tryCatch(x:) (normal) | return |
+| cfg.swift:36:12:36:12 | withParam | cfg.swift:36:5:36:12 | return ... |  |
+| cfg.swift:37:5:39:3 | case ... | cfg.swift:37:11:37:14 | ... is ... |  |
+| cfg.swift:37:11:37:14 | ... is ... | cfg.swift:37:11:37:14 | ... is ... |  |
+| cfg.swift:37:11:37:14 | ... is ... | cfg.swift:38:5:38:5 | print(_:separator:terminator:) | match |
+| cfg.swift:37:11:37:14 | ... is ... | cfg.swift:39:5:41:3 | case ... | no-match |
+| cfg.swift:38:5:38:5 | print(_:separator:terminator:) | cfg.swift:38:11:38:11 | MyError |  |
+| cfg.swift:38:5:38:20 | call to print(_:separator:terminator:) | cfg.swift:42:10:42:10 | 0 |  |
+| cfg.swift:38:10:38:10 | default separator | cfg.swift:38:10:38:10 | default terminator |  |
+| cfg.swift:38:10:38:10 | default terminator | cfg.swift:38:5:38:20 | call to print(_:separator:terminator:) |  |
+| cfg.swift:38:11:38:11 | (Any) ... | cfg.swift:38:11:38:11 | [...] |  |
+| cfg.swift:38:11:38:11 | MyError | cfg.swift:38:11:38:11 | (Any) ... |  |
+| cfg.swift:38:11:38:11 | [...] | cfg.swift:38:10:38:10 | default separator |  |
+| cfg.swift:38:11:38:11 | [...] | cfg.swift:38:11:38:11 | [...] |  |
+| cfg.swift:39:5:41:3 | case ... | cfg.swift:39:11:39:11 | error |  |
+| cfg.swift:39:11:39:11 | error | cfg.swift:39:11:39:11 | error |  |
+| cfg.swift:39:11:39:11 | error | cfg.swift:39:11:39:11 | let ... | match |
+| cfg.swift:39:11:39:11 | let ... | cfg.swift:40:5:40:5 | print(_:separator:terminator:) | match |
+| cfg.swift:40:5:40:5 | print(_:separator:terminator:) | cfg.swift:40:11:40:11 | OpaqueValueExpr |  |
+| cfg.swift:40:5:40:35 | call to print(_:separator:terminator:) | cfg.swift:42:10:42:10 | 0 |  |
+| cfg.swift:40:10:40:10 | default separator | cfg.swift:40:10:40:10 | default terminator |  |
+| cfg.swift:40:10:40:10 | default terminator | cfg.swift:40:5:40:35 | call to print(_:separator:terminator:) |  |
+| cfg.swift:40:11:40:11 | "..." | cfg.swift:40:11:40:11 | (Any) ... |  |
+| cfg.swift:40:11:40:11 | (Any) ... | cfg.swift:40:11:40:11 | [...] |  |
+| cfg.swift:40:11:40:11 | OpaqueValueExpr | cfg.swift:40:12:40:12 | .appendLiteral(_:) |  |
+| cfg.swift:40:11:40:11 | TapExpr | cfg.swift:40:11:40:11 | "..." |  |
+| cfg.swift:40:11:40:11 | Unknown error  | cfg.swift:40:12:40:11 | call to appendLiteral(_:) |  |
+| cfg.swift:40:11:40:11 | [...] | cfg.swift:40:10:40:10 | default separator |  |
+| cfg.swift:40:11:40:11 | [...] | cfg.swift:40:11:40:11 | [...] |  |
+| cfg.swift:40:12:40:11 | call to appendLiteral(_:) | cfg.swift:40:27:40:27 | .appendInterpolation(_:) |  |
+| cfg.swift:40:12:40:12 | $interpolation | cfg.swift:40:12:40:12 | &... |  |
+| cfg.swift:40:12:40:12 | &... | cfg.swift:40:11:40:11 | Unknown error  |  |
+| cfg.swift:40:12:40:12 | .appendLiteral(_:) | cfg.swift:40:12:40:12 | $interpolation |  |
+| cfg.swift:40:27:40:27 | $interpolation | cfg.swift:40:27:40:27 | &... |  |
+| cfg.swift:40:27:40:27 | &... | cfg.swift:40:28:40:28 | error |  |
+| cfg.swift:40:27:40:27 | .appendInterpolation(_:) | cfg.swift:40:27:40:27 | $interpolation |  |
+| cfg.swift:40:27:40:33 | call to appendInterpolation(_:) | cfg.swift:40:34:40:34 | .appendLiteral(_:) |  |
+| cfg.swift:40:28:40:28 | error | cfg.swift:40:27:40:33 | call to appendInterpolation(_:) |  |
+| cfg.swift:40:34:40:34 |  | cfg.swift:40:34:40:34 | call to appendLiteral(_:) |  |
+| cfg.swift:40:34:40:34 | $interpolation | cfg.swift:40:34:40:34 | &... |  |
+| cfg.swift:40:34:40:34 | &... | cfg.swift:40:34:40:34 |  |  |
+| cfg.swift:40:34:40:34 | .appendLiteral(_:) | cfg.swift:40:34:40:34 | $interpolation |  |
+| cfg.swift:40:34:40:34 | call to appendLiteral(_:) | cfg.swift:40:11:40:11 | TapExpr |  |
+| cfg.swift:42:3:42:10 | return ... | cfg.swift:26:1:43:1 | exit tryCatch(x:) (normal) | return |
+| cfg.swift:42:10:42:10 | 0 | cfg.swift:42:3:42:10 | return ... |  |
+| cfg.swift:45:1:49:1 | createClosure1(s:) | cfg.swift:45:21:45:25 | s |  |
+| cfg.swift:45:1:49:1 | enter createClosure1(s:) | cfg.swift:45:1:49:1 | createClosure1(s:) |  |
+| cfg.swift:45:1:49:1 | exit createClosure1(s:) (normal) | cfg.swift:45:1:49:1 | exit createClosure1(s:) |  |
+| cfg.swift:45:21:45:25 | s | cfg.swift:46:10:48:3 | { ... } |  |
+| cfg.swift:46:3:48:3 | return ... | cfg.swift:45:1:49:1 | exit createClosure1(s:) (normal) | return |
+| cfg.swift:46:10:48:3 | enter { ... } | cfg.swift:46:10:48:3 | { ... } |  |
+| cfg.swift:46:10:48:3 | exit { ... } (normal) | cfg.swift:46:10:48:3 | exit { ... } |  |
+| cfg.swift:46:10:48:3 | { ... } | cfg.swift:46:3:48:3 | return ... |  |
+| cfg.swift:46:10:48:3 | { ... } | cfg.swift:47:14:47:14 | .+(_:_:) |  |
+| cfg.swift:47:5:47:16 | return ... | cfg.swift:46:10:48:3 | exit { ... } (normal) | return |
+| cfg.swift:47:12:47:12 | s | cfg.swift:47:16:47:16 |  |  |
+| cfg.swift:47:12:47:16 | ... .+(_:_:) ... | cfg.swift:47:5:47:16 | return ... |  |
+| cfg.swift:47:14:47:14 | .+(_:_:) | cfg.swift:47:14:47:14 | String.Type |  |
+| cfg.swift:47:14:47:14 | String.Type | cfg.swift:47:12:47:12 | s |  |
+| cfg.swift:47:16:47:16 |  | cfg.swift:47:12:47:16 | ... .+(_:_:) ... |  |
+| cfg.swift:51:1:56:1 | createClosure2(x:) | cfg.swift:51:21:51:25 | x |  |
+| cfg.swift:51:1:56:1 | enter createClosure2(x:) | cfg.swift:51:1:56:1 | createClosure2(x:) |  |
+| cfg.swift:51:1:56:1 | exit createClosure2(x:) (normal) | cfg.swift:51:1:56:1 | exit createClosure2(x:) |  |
+| cfg.swift:51:21:51:25 | x | cfg.swift:52:3:54:3 | f(y:) |  |
+| cfg.swift:52:3:54:3 | enter f(y:) | cfg.swift:52:3:54:3 | f(y:) |  |
+| cfg.swift:52:3:54:3 | exit f(y:) (normal) | cfg.swift:52:3:54:3 | exit f(y:) |  |
+| cfg.swift:52:3:54:3 | f(y:) | cfg.swift:52:10:52:14 | y |  |
+| cfg.swift:52:3:54:3 | f(y:) | cfg.swift:55:10:55:10 | f(y:) |  |
+| cfg.swift:52:10:52:14 | y | cfg.swift:53:14:53:14 | .+(_:_:) |  |
+| cfg.swift:53:5:53:16 | return ... | cfg.swift:52:3:54:3 | exit f(y:) (normal) | return |
+| cfg.swift:53:12:53:12 | x | cfg.swift:53:16:53:16 | y |  |
+| cfg.swift:53:12:53:16 | ... .+(_:_:) ... | cfg.swift:53:5:53:16 | return ... |  |
+| cfg.swift:53:14:53:14 | .+(_:_:) | cfg.swift:53:14:53:14 | Int.Type |  |
+| cfg.swift:53:14:53:14 | Int.Type | cfg.swift:53:12:53:12 | x |  |
+| cfg.swift:53:16:53:16 | y | cfg.swift:53:12:53:16 | ... .+(_:_:) ... |  |
+| cfg.swift:55:3:55:10 | return ... | cfg.swift:51:1:56:1 | exit createClosure2(x:) (normal) | return |
+| cfg.swift:55:10:55:10 | f(y:) | cfg.swift:55:3:55:10 | return ... |  |
+| cfg.swift:58:1:62:1 | createClosure3(x:) | cfg.swift:58:21:58:25 | x |  |
+| cfg.swift:58:1:62:1 | enter createClosure3(x:) | cfg.swift:58:1:62:1 | createClosure3(x:) |  |
+| cfg.swift:58:1:62:1 | exit createClosure3(x:) (normal) | cfg.swift:58:1:62:1 | exit createClosure3(x:) |  |
+| cfg.swift:58:21:58:25 | x | cfg.swift:59:10:61:3 | { ... } |  |
+| cfg.swift:59:3:61:3 | return ... | cfg.swift:58:1:62:1 | exit createClosure3(x:) (normal) | return |
+| cfg.swift:59:10:61:3 | enter { ... } | cfg.swift:59:10:61:3 | { ... } |  |
+| cfg.swift:59:10:61:3 | exit { ... } (normal) | cfg.swift:59:10:61:3 | exit { ... } |  |
+| cfg.swift:59:10:61:3 | { ... } | cfg.swift:59:3:61:3 | return ... |  |
+| cfg.swift:59:10:61:3 | { ... } | cfg.swift:60:6:60:6 | y |  |
+| cfg.swift:60:6:60:6 | y | cfg.swift:60:21:60:21 | .+(_:_:) |  |
+| cfg.swift:60:19:60:19 | x | cfg.swift:60:23:60:23 | y |  |
+| cfg.swift:60:19:60:23 | ... .+(_:_:) ... | cfg.swift:60:19:60:23 | return ... |  |
+| cfg.swift:60:19:60:23 | return ... | cfg.swift:59:10:61:3 | exit { ... } (normal) | return |
+| cfg.swift:60:21:60:21 | .+(_:_:) | cfg.swift:60:21:60:21 | Int.Type |  |
+| cfg.swift:60:21:60:21 | Int.Type | cfg.swift:60:19:60:19 | x |  |
+| cfg.swift:60:23:60:23 | y | cfg.swift:60:19:60:23 | ... .+(_:_:) ... |  |
+| cfg.swift:64:1:68:1 | callClosures() | cfg.swift:65:7:65:7 | x1 |  |
+| cfg.swift:64:1:68:1 | enter callClosures() | cfg.swift:64:1:68:1 | callClosures() |  |
+| cfg.swift:64:1:68:1 | exit callClosures() (normal) | cfg.swift:64:1:68:1 | exit callClosures() |  |
+| cfg.swift:65:3:65:34 | var ... = ... | cfg.swift:66:7:66:7 | x2 |  |
+| cfg.swift:65:7:65:7 | x1 | cfg.swift:65:12:65:12 | createClosure1(s:) | match |
+| cfg.swift:65:12:65:12 | createClosure1(s:) | cfg.swift:65:30:65:30 |  |  |
+| cfg.swift:65:12:65:32 | call to createClosure1(s:) | cfg.swift:65:12:65:34 | call to ... |  |
+| cfg.swift:65:12:65:34 | call to ... | cfg.swift:65:3:65:34 | var ... = ... |  |
+| cfg.swift:65:30:65:30 |  | cfg.swift:65:12:65:32 | call to createClosure1(s:) |  |
+| cfg.swift:66:3:66:35 | var ... = ... | cfg.swift:67:7:67:7 | x3 |  |
+| cfg.swift:66:7:66:7 | x2 | cfg.swift:66:12:66:12 | createClosure2(x:) | match |
+| cfg.swift:66:12:66:12 | createClosure2(x:) | cfg.swift:66:30:66:30 | 0 |  |
+| cfg.swift:66:12:66:31 | call to createClosure2(x:) | cfg.swift:66:33:66:33 | 10 |  |
+| cfg.swift:66:12:66:35 | call to ... | cfg.swift:66:3:66:35 | var ... = ... |  |
+| cfg.swift:66:30:66:30 | 0 | cfg.swift:66:12:66:31 | call to createClosure2(x:) |  |
+| cfg.swift:66:33:66:33 | 10 | cfg.swift:66:12:66:35 | call to ... |  |
+| cfg.swift:67:3:67:35 | var ... = ... | cfg.swift:64:1:68:1 | exit callClosures() (normal) |  |
+| cfg.swift:67:7:67:7 | x3 | cfg.swift:67:12:67:12 | createClosure3(x:) | match |
+| cfg.swift:67:12:67:12 | createClosure3(x:) | cfg.swift:67:30:67:30 | 0 |  |
+| cfg.swift:67:12:67:31 | call to createClosure3(x:) | cfg.swift:67:33:67:33 | 10 |  |
+| cfg.swift:67:12:67:35 | call to ... | cfg.swift:67:3:67:35 | var ... = ... |  |
+| cfg.swift:67:30:67:30 | 0 | cfg.swift:67:12:67:31 | call to createClosure3(x:) |  |
+| cfg.swift:67:33:67:33 | 10 | cfg.swift:67:12:67:35 | call to ... |  |
+| cfg.swift:70:1:73:1 | enter maybeParseInt(s:) | cfg.swift:70:1:73:1 | maybeParseInt(s:) |  |
+| cfg.swift:70:1:73:1 | exit maybeParseInt(s:) (normal) | cfg.swift:70:1:73:1 | exit maybeParseInt(s:) |  |
+| cfg.swift:70:1:73:1 | maybeParseInt(s:) | cfg.swift:70:20:70:24 | s |  |
+| cfg.swift:70:20:70:24 | s | cfg.swift:71:7:71:7 | n |  |
+| cfg.swift:71:3:71:23 | var ... = ... | cfg.swift:72:10:72:10 | n |  |
+| cfg.swift:71:7:71:7 | n | cfg.swift:71:7:71:14 | ... as ... | match |
+| cfg.swift:71:7:71:14 | ... as ... | cfg.swift:71:18:71:18 | Self.init(_:) | match |
+| cfg.swift:71:18:71:18 | Int.Type | cfg.swift:71:22:71:22 | s |  |
+| cfg.swift:71:18:71:18 | Self.init(_:) | cfg.swift:71:18:71:18 | Int.Type |  |
+| cfg.swift:71:18:71:23 | call to Self.init(_:) | cfg.swift:71:3:71:23 | var ... = ... |  |
+| cfg.swift:71:22:71:22 | s | cfg.swift:71:18:71:23 | call to Self.init(_:) |  |
+| cfg.swift:72:3:72:10 | return ... | cfg.swift:70:1:73:1 | exit maybeParseInt(s:) (normal) | return |
+| cfg.swift:72:10:72:10 | (Int?) ... | cfg.swift:72:3:72:10 | return ... |  |
+| cfg.swift:72:10:72:10 | n | cfg.swift:72:10:72:10 | (Int?) ... |  |
+| cfg.swift:75:1:79:1 | enter forceAndBackToOptional() | cfg.swift:75:1:79:1 | forceAndBackToOptional() |  |
+| cfg.swift:75:1:79:1 | exit forceAndBackToOptional() (normal) | cfg.swift:75:1:79:1 | exit forceAndBackToOptional() |  |
+| cfg.swift:75:1:79:1 | forceAndBackToOptional() | cfg.swift:76:7:76:7 | nBang |  |
+| cfg.swift:76:3:76:36 | var ... = ... | cfg.swift:77:7:77:7 | n |  |
+| cfg.swift:76:7:76:7 | nBang | cfg.swift:76:15:76:15 | maybeParseInt(s:) | match |
+| cfg.swift:76:15:76:15 | maybeParseInt(s:) | cfg.swift:76:31:76:31 | 42 |  |
+| cfg.swift:76:15:76:35 | call to maybeParseInt(s:) | cfg.swift:76:15:76:36 | ...! |  |
+| cfg.swift:76:15:76:36 | ...! | cfg.swift:76:3:76:36 | var ... = ... |  |
+| cfg.swift:76:31:76:31 | 42 | cfg.swift:76:15:76:35 | call to maybeParseInt(s:) |  |
+| cfg.swift:77:3:77:31 | var ... = ... | cfg.swift:78:16:78:16 | .+(_:_:) |  |
+| cfg.swift:77:7:77:7 | n | cfg.swift:77:11:77:11 | maybeParseInt(s:) | match |
+| cfg.swift:77:11:77:11 | maybeParseInt(s:) | cfg.swift:77:27:77:27 | 42 |  |
+| cfg.swift:77:11:77:31 | call to maybeParseInt(s:) | cfg.swift:77:3:77:31 | var ... = ... |  |
+| cfg.swift:77:27:77:27 | 42 | cfg.swift:77:11:77:31 | call to maybeParseInt(s:) |  |
+| cfg.swift:78:3:78:19 | return ... | cfg.swift:75:1:79:1 | exit forceAndBackToOptional() (normal) | return |
+| cfg.swift:78:10:78:10 | (Int) ... | cfg.swift:78:18:78:18 | n |  |
+| cfg.swift:78:10:78:10 | nBang | cfg.swift:78:10:78:10 | (Int) ... |  |
+| cfg.swift:78:10:78:19 | (Int?) ... | cfg.swift:78:3:78:19 | return ... |  |
+| cfg.swift:78:10:78:19 | ... .+(_:_:) ... | cfg.swift:78:10:78:19 | (Int?) ... |  |
+| cfg.swift:78:16:78:16 | .+(_:_:) | cfg.swift:78:16:78:16 | Int.Type |  |
+| cfg.swift:78:16:78:16 | Int.Type | cfg.swift:78:10:78:10 | nBang |  |
+| cfg.swift:78:18:78:18 | (Int?) ... | cfg.swift:78:18:78:19 | ...! |  |
+| cfg.swift:78:18:78:18 | n | cfg.swift:78:18:78:18 | (Int?) ... |  |
+| cfg.swift:78:18:78:19 | ...! | cfg.swift:78:10:78:19 | ... .+(_:_:) ... |  |
+| cfg.swift:81:1:96:1 | enter testInOut() | cfg.swift:81:1:96:1 | testInOut() |  |
+| cfg.swift:81:1:96:1 | exit testInOut() (normal) | cfg.swift:81:1:96:1 | exit testInOut() |  |
+| cfg.swift:81:1:96:1 | testInOut() | cfg.swift:82:7:82:7 | temp |  |
+| cfg.swift:82:3:82:14 | var ... = ... | cfg.swift:84:3:86:3 | add(a:) |  |
+| cfg.swift:82:7:82:7 | temp | cfg.swift:82:14:82:14 | 10 | match |
+| cfg.swift:82:14:82:14 | 10 | cfg.swift:82:3:82:14 | var ... = ... |  |
+| cfg.swift:84:3:86:3 | add(a:) | cfg.swift:84:12:84:21 | a |  |
+| cfg.swift:84:3:86:3 | add(a:) | cfg.swift:88:3:90:3 | addOptional(a:) |  |
+| cfg.swift:84:3:86:3 | enter add(a:) | cfg.swift:84:3:86:3 | add(a:) |  |
+| cfg.swift:84:3:86:3 | exit add(a:) (normal) | cfg.swift:84:3:86:3 | exit add(a:) |  |
+| cfg.swift:84:12:84:21 | a | cfg.swift:85:5:85:5 | a |  |
+| cfg.swift:85:5:85:5 | a | cfg.swift:85:11:85:11 | .+(_:_:) |  |
+| cfg.swift:85:5:85:13 |  ... = ... | cfg.swift:84:3:86:3 | exit add(a:) (normal) |  |
+| cfg.swift:85:9:85:9 | (Int) ... | cfg.swift:85:13:85:13 | 1 |  |
+| cfg.swift:85:9:85:9 | a | cfg.swift:85:9:85:9 | (Int) ... |  |
+| cfg.swift:85:9:85:13 | ... .+(_:_:) ... | cfg.swift:85:5:85:13 |  ... = ... |  |
+| cfg.swift:85:11:85:11 | .+(_:_:) | cfg.swift:85:11:85:11 | Int.Type |  |
+| cfg.swift:85:11:85:11 | Int.Type | cfg.swift:85:9:85:9 | a |  |
+| cfg.swift:85:13:85:13 | 1 | cfg.swift:85:9:85:13 | ... .+(_:_:) ... |  |
+| cfg.swift:88:3:90:3 | addOptional(a:) | cfg.swift:88:20:88:32 | a |  |
+| cfg.swift:88:3:90:3 | addOptional(a:) | cfg.swift:92:3:92:3 | add(a:) |  |
+| cfg.swift:88:3:90:3 | enter addOptional(a:) | cfg.swift:88:3:90:3 | addOptional(a:) |  |
+| cfg.swift:88:3:90:3 | exit addOptional(a:) (normal) | cfg.swift:88:3:90:3 | exit addOptional(a:) |  |
+| cfg.swift:88:20:88:32 | a | cfg.swift:89:5:89:5 | a |  |
+| cfg.swift:89:5:89:5 | a | cfg.swift:89:9:89:9 | nil |  |
+| cfg.swift:89:5:89:9 |  ... = ... | cfg.swift:88:3:90:3 | exit addOptional(a:) (normal) |  |
+| cfg.swift:89:9:89:9 | nil | cfg.swift:89:5:89:9 |  ... = ... |  |
+| cfg.swift:92:3:92:3 | add(a:) | cfg.swift:92:10:92:10 | temp |  |
+| cfg.swift:92:3:92:14 | call to add(a:) | cfg.swift:93:7:93:7 | tempOptional |  |
+| cfg.swift:92:9:92:10 | &... | cfg.swift:92:3:92:14 | call to add(a:) |  |
+| cfg.swift:92:10:92:10 | temp | cfg.swift:92:9:92:10 | &... |  |
+| cfg.swift:93:3:93:29 | var ... = ... | cfg.swift:94:3:94:3 | addOptional(a:) |  |
+| cfg.swift:93:7:93:7 | tempOptional | cfg.swift:93:7:93:25 | ... as ... | match |
+| cfg.swift:93:7:93:25 | ... as ... | cfg.swift:93:29:93:29 | 10 | match |
+| cfg.swift:93:29:93:29 | 10 | cfg.swift:93:29:93:29 | (Int?) ... |  |
+| cfg.swift:93:29:93:29 | (Int?) ... | cfg.swift:93:3:93:29 | var ... = ... |  |
+| cfg.swift:94:3:94:3 | addOptional(a:) | cfg.swift:94:18:94:18 | tempOptional |  |
+| cfg.swift:94:3:94:30 | call to addOptional(a:) | cfg.swift:95:15:95:15 | .+(_:_:) |  |
+| cfg.swift:94:17:94:18 | &... | cfg.swift:94:3:94:30 | call to addOptional(a:) |  |
+| cfg.swift:94:18:94:18 | tempOptional | cfg.swift:94:17:94:18 | &... |  |
+| cfg.swift:95:3:95:29 | return ... | cfg.swift:81:1:96:1 | exit testInOut() (normal) | return |
+| cfg.swift:95:10:95:10 | (Int) ... | cfg.swift:95:17:95:17 | tempOptional |  |
+| cfg.swift:95:10:95:10 | temp | cfg.swift:95:10:95:10 | (Int) ... |  |
+| cfg.swift:95:10:95:29 | ... .+(_:_:) ... | cfg.swift:95:3:95:29 | return ... |  |
+| cfg.swift:95:15:95:15 | .+(_:_:) | cfg.swift:95:15:95:15 | Int.Type |  |
+| cfg.swift:95:15:95:15 | Int.Type | cfg.swift:95:10:95:10 | temp |  |
+| cfg.swift:95:17:95:17 | (Int?) ... | cfg.swift:95:17:95:29 | ...! |  |
+| cfg.swift:95:17:95:17 | tempOptional | cfg.swift:95:17:95:17 | (Int?) ... |  |
+| cfg.swift:95:17:95:29 | ...! | cfg.swift:95:10:95:29 | ... .+(_:_:) ... |  |
+| cfg.swift:98:7:98:7 | C.deinit() | cfg.swift:98:7:98:7 | self |  |
+| cfg.swift:98:7:98:7 | enter C.deinit() | cfg.swift:98:7:98:7 | C.deinit() |  |
+| cfg.swift:98:7:98:7 | exit C.deinit() (normal) | cfg.swift:98:7:98:7 | exit C.deinit() |  |
+| cfg.swift:98:7:98:7 | self | cfg.swift:98:7:98:7 | { ... } |  |
+| cfg.swift:98:7:98:7 | { ... } | cfg.swift:98:7:98:7 | exit C.deinit() (normal) |  |
+| cfg.swift:99:7:99:7 | enter get | cfg.swift:99:7:99:7 | get |  |
+| cfg.swift:99:7:99:7 | exit get (normal) | cfg.swift:99:7:99:7 | exit get |  |
+| cfg.swift:99:7:99:7 | get | cfg.swift:99:7:99:7 | self |  |
+| cfg.swift:99:7:99:7 | self | file://:0:0:0:0 | self |  |
+| cfg.swift:100:3:100:3 | self | cfg.swift:100:8:100:11 | n |  |
+| cfg.swift:100:3:102:3 | C.init(n:) | cfg.swift:100:3:100:3 | self |  |
+| cfg.swift:100:3:102:3 | enter C.init(n:) | cfg.swift:100:3:102:3 | C.init(n:) |  |
+| cfg.swift:100:3:102:3 | exit C.init(n:) (normal) | cfg.swift:100:3:102:3 | exit C.init(n:) |  |
+| cfg.swift:100:8:100:11 | n | cfg.swift:101:5:101:5 | self |  |
+| cfg.swift:101:5:101:5 | .myInt | cfg.swift:101:13:101:13 | n |  |
+| cfg.swift:101:5:101:5 | self | cfg.swift:101:5:101:5 | .myInt |  |
+| cfg.swift:101:5:101:13 |  ... = ... | cfg.swift:102:3:102:3 | return |  |
+| cfg.swift:101:13:101:13 | n | cfg.swift:101:5:101:13 |  ... = ... |  |
+| cfg.swift:102:3:102:3 | return | cfg.swift:100:3:102:3 | exit C.init(n:) (normal) | return |
+| cfg.swift:104:3:106:3 | enter getMyInt() | cfg.swift:104:3:106:3 | getMyInt() |  |
+| cfg.swift:104:3:106:3 | exit getMyInt() (normal) | cfg.swift:104:3:106:3 | exit getMyInt() |  |
+| cfg.swift:104:3:106:3 | getMyInt() | cfg.swift:104:8:104:8 | self |  |
+| cfg.swift:104:8:104:8 | self | cfg.swift:105:12:105:12 | self |  |
+| cfg.swift:105:5:105:12 | return ... | cfg.swift:104:3:106:3 | exit getMyInt() (normal) | return |
+| cfg.swift:105:12:105:12 | getter for .myInt | cfg.swift:105:5:105:12 | return ... |  |
+| cfg.swift:105:12:105:12 | self | cfg.swift:105:12:105:12 | getter for .myInt |  |
+| cfg.swift:109:1:135:1 | enter testMemberRef(param:inoutParam:opt:) | cfg.swift:109:1:135:1 | testMemberRef(param:inoutParam:opt:) |  |
+| cfg.swift:109:1:135:1 | exit testMemberRef(param:inoutParam:opt:) (normal) | cfg.swift:109:1:135:1 | exit testMemberRef(param:inoutParam:opt:) |  |
+| cfg.swift:109:1:135:1 | testMemberRef(param:inoutParam:opt:) | cfg.swift:109:20:109:28 | param |  |
+| cfg.swift:109:20:109:28 | param | cfg.swift:109:31:109:50 | inoutParam |  |
+| cfg.swift:109:31:109:50 | inoutParam | cfg.swift:109:53:109:60 | opt |  |
+| cfg.swift:109:53:109:60 | opt | cfg.swift:110:7:110:7 | c |  |
+| cfg.swift:110:3:110:18 | var ... = ... | cfg.swift:111:7:111:7 | n1 |  |
+| cfg.swift:110:7:110:7 | c | cfg.swift:110:11:110:11 | C.init(n:) | match |
+| cfg.swift:110:11:110:11 | C.Type | cfg.swift:110:16:110:16 | 42 |  |
+| cfg.swift:110:11:110:11 | C.init(n:) | cfg.swift:110:11:110:11 | C.Type |  |
+| cfg.swift:110:11:110:18 | call to C.init(n:) | cfg.swift:110:3:110:18 | var ... = ... |  |
+| cfg.swift:110:16:110:16 | 42 | cfg.swift:110:11:110:18 | call to C.init(n:) |  |
+| cfg.swift:111:3:111:14 | var ... = ... | cfg.swift:112:7:112:7 | n2 |  |
+| cfg.swift:111:7:111:7 | n1 | cfg.swift:111:12:111:12 | c | match |
+| cfg.swift:111:12:111:12 | c | cfg.swift:111:12:111:14 | getter for .myInt |  |
+| cfg.swift:111:12:111:14 | getter for .myInt | cfg.swift:111:3:111:14 | var ... = ... |  |
+| cfg.swift:112:3:112:19 | var ... = ... | cfg.swift:113:7:113:7 | n3 |  |
+| cfg.swift:112:7:112:7 | n2 | cfg.swift:112:12:112:12 | c | match |
+| cfg.swift:112:12:112:12 | c | cfg.swift:112:12:112:14 | .self |  |
+| cfg.swift:112:12:112:14 | .self | cfg.swift:112:12:112:19 | getter for .myInt |  |
+| cfg.swift:112:12:112:19 | getter for .myInt | cfg.swift:112:3:112:19 | var ... = ... |  |
+| cfg.swift:113:3:113:23 | var ... = ... | cfg.swift:114:7:114:7 | n4 |  |
+| cfg.swift:113:7:113:7 | n3 | cfg.swift:113:12:113:14 | .getMyInt() | match |
+| cfg.swift:113:12:113:12 | c | cfg.swift:113:12:113:23 | call to getMyInt() |  |
+| cfg.swift:113:12:113:14 | .getMyInt() | cfg.swift:113:12:113:12 | c |  |
+| cfg.swift:113:12:113:23 | call to getMyInt() | cfg.swift:113:3:113:23 | var ... = ... |  |
+| cfg.swift:114:3:114:28 | var ... = ... | cfg.swift:116:7:116:7 | n5 |  |
+| cfg.swift:114:7:114:7 | n4 | cfg.swift:114:12:114:19 | .getMyInt() | match |
+| cfg.swift:114:12:114:12 | c | cfg.swift:114:12:114:14 | .self |  |
+| cfg.swift:114:12:114:14 | .self | cfg.swift:114:12:114:28 | call to getMyInt() |  |
+| cfg.swift:114:12:114:19 | .getMyInt() | cfg.swift:114:12:114:12 | c |  |
+| cfg.swift:114:12:114:28 | call to getMyInt() | cfg.swift:114:3:114:28 | var ... = ... |  |
+| cfg.swift:116:3:116:18 | var ... = ... | cfg.swift:117:7:117:7 | n6 |  |
+| cfg.swift:116:7:116:7 | n5 | cfg.swift:116:12:116:12 | param | match |
+| cfg.swift:116:12:116:12 | param | cfg.swift:116:12:116:18 | getter for .myInt |  |
+| cfg.swift:116:12:116:18 | getter for .myInt | cfg.swift:116:3:116:18 | var ... = ... |  |
+| cfg.swift:117:3:117:23 | var ... = ... | cfg.swift:118:7:118:7 | n7 |  |
+| cfg.swift:117:7:117:7 | n6 | cfg.swift:117:12:117:12 | param | match |
+| cfg.swift:117:12:117:12 | param | cfg.swift:117:12:117:18 | .self |  |
+| cfg.swift:117:12:117:18 | .self | cfg.swift:117:12:117:23 | getter for .myInt |  |
+| cfg.swift:117:12:117:23 | getter for .myInt | cfg.swift:117:3:117:23 | var ... = ... |  |
+| cfg.swift:118:3:118:27 | var ... = ... | cfg.swift:119:7:119:7 | n8 |  |
+| cfg.swift:118:7:118:7 | n7 | cfg.swift:118:12:118:18 | .getMyInt() | match |
+| cfg.swift:118:12:118:12 | param | cfg.swift:118:12:118:27 | call to getMyInt() |  |
+| cfg.swift:118:12:118:18 | .getMyInt() | cfg.swift:118:12:118:12 | param |  |
+| cfg.swift:118:12:118:27 | call to getMyInt() | cfg.swift:118:3:118:27 | var ... = ... |  |
+| cfg.swift:119:3:119:32 | var ... = ... | cfg.swift:121:7:121:7 | n9 |  |
+| cfg.swift:119:7:119:7 | n8 | cfg.swift:119:12:119:23 | .getMyInt() | match |
+| cfg.swift:119:12:119:12 | param | cfg.swift:119:12:119:18 | .self |  |
+| cfg.swift:119:12:119:18 | .self | cfg.swift:119:12:119:32 | call to getMyInt() |  |
+| cfg.swift:119:12:119:23 | .getMyInt() | cfg.swift:119:12:119:12 | param |  |
+| cfg.swift:119:12:119:32 | call to getMyInt() | cfg.swift:119:3:119:32 | var ... = ... |  |
+| cfg.swift:121:3:121:23 | var ... = ... | cfg.swift:122:7:122:7 | n10 |  |
+| cfg.swift:121:7:121:7 | n9 | cfg.swift:121:12:121:12 | inoutParam | match |
+| cfg.swift:121:12:121:12 | (C) ... | cfg.swift:121:12:121:23 | getter for .myInt |  |
+| cfg.swift:121:12:121:12 | inoutParam | cfg.swift:121:12:121:12 | (C) ... |  |
+| cfg.swift:121:12:121:23 | getter for .myInt | cfg.swift:121:3:121:23 | var ... = ... |  |
+| cfg.swift:122:3:122:29 | var ... = ... | cfg.swift:123:7:123:7 | n11 |  |
+| cfg.swift:122:7:122:7 | n10 | cfg.swift:122:13:122:13 | inoutParam | match |
+| cfg.swift:122:13:122:13 | inoutParam | cfg.swift:122:13:122:24 | .self |  |
+| cfg.swift:122:13:122:24 | (C) ... | cfg.swift:122:13:122:29 | getter for .myInt |  |
+| cfg.swift:122:13:122:24 | .self | cfg.swift:122:13:122:24 | (C) ... |  |
+| cfg.swift:122:13:122:29 | getter for .myInt | cfg.swift:122:3:122:29 | var ... = ... |  |
+| cfg.swift:123:3:123:33 | var ... = ... | cfg.swift:124:7:124:7 | n12 |  |
+| cfg.swift:123:7:123:7 | n11 | cfg.swift:123:13:123:24 | .getMyInt() | match |
+| cfg.swift:123:13:123:13 | (C) ... | cfg.swift:123:13:123:33 | call to getMyInt() |  |
+| cfg.swift:123:13:123:13 | inoutParam | cfg.swift:123:13:123:13 | (C) ... |  |
+| cfg.swift:123:13:123:24 | .getMyInt() | cfg.swift:123:13:123:13 | inoutParam |  |
+| cfg.swift:123:13:123:33 | call to getMyInt() | cfg.swift:123:3:123:33 | var ... = ... |  |
+| cfg.swift:124:3:124:38 | var ... = ... | cfg.swift:126:7:126:7 | n13 |  |
+| cfg.swift:124:7:124:7 | n12 | cfg.swift:124:13:124:29 | .getMyInt() | match |
+| cfg.swift:124:13:124:13 | inoutParam | cfg.swift:124:13:124:24 | .self |  |
+| cfg.swift:124:13:124:24 | (C) ... | cfg.swift:124:13:124:38 | call to getMyInt() |  |
+| cfg.swift:124:13:124:24 | .self | cfg.swift:124:13:124:24 | (C) ... |  |
+| cfg.swift:124:13:124:29 | .getMyInt() | cfg.swift:124:13:124:13 | inoutParam |  |
+| cfg.swift:124:13:124:38 | call to getMyInt() | cfg.swift:124:3:124:38 | var ... = ... |  |
+| cfg.swift:126:3:126:18 | var ... = ... | cfg.swift:127:7:127:7 | n14 |  |
+| cfg.swift:126:7:126:7 | n13 | cfg.swift:126:13:126:13 | opt | match |
+| cfg.swift:126:13:126:13 | opt | cfg.swift:126:13:126:16 | ...! |  |
+| cfg.swift:126:13:126:16 | ...! | cfg.swift:126:13:126:18 | getter for .myInt |  |
+| cfg.swift:126:13:126:18 | getter for .myInt | cfg.swift:126:3:126:18 | var ... = ... |  |
+| cfg.swift:127:3:127:23 | var ... = ... | cfg.swift:128:7:128:7 | n15 |  |
+| cfg.swift:127:7:127:7 | n14 | cfg.swift:127:13:127:13 | opt | match |
+| cfg.swift:127:13:127:13 | opt | cfg.swift:127:13:127:16 | ...! |  |
+| cfg.swift:127:13:127:16 | ...! | cfg.swift:127:13:127:18 | .self |  |
+| cfg.swift:127:13:127:18 | .self | cfg.swift:127:13:127:23 | getter for .myInt |  |
+| cfg.swift:127:13:127:23 | getter for .myInt | cfg.swift:127:3:127:23 | var ... = ... |  |
+| cfg.swift:128:3:128:27 | var ... = ... | cfg.swift:129:7:129:7 | n16 |  |
+| cfg.swift:128:7:128:7 | n15 | cfg.swift:128:13:128:18 | .getMyInt() | match |
+| cfg.swift:128:13:128:13 | opt | cfg.swift:128:13:128:16 | ...! |  |
+| cfg.swift:128:13:128:16 | ...! | cfg.swift:128:13:128:27 | call to getMyInt() |  |
+| cfg.swift:128:13:128:18 | .getMyInt() | cfg.swift:128:13:128:13 | opt |  |
+| cfg.swift:128:13:128:27 | call to getMyInt() | cfg.swift:128:3:128:27 | var ... = ... |  |
+| cfg.swift:129:3:129:32 | var ... = ... | cfg.swift:131:7:131:7 | n17 |  |
+| cfg.swift:129:7:129:7 | n16 | cfg.swift:129:13:129:23 | .getMyInt() | match |
+| cfg.swift:129:13:129:13 | opt | cfg.swift:129:13:129:16 | ...! |  |
+| cfg.swift:129:13:129:16 | ...! | cfg.swift:129:13:129:18 | .self |  |
+| cfg.swift:129:13:129:18 | .self | cfg.swift:129:13:129:32 | call to getMyInt() |  |
+| cfg.swift:129:13:129:23 | .getMyInt() | cfg.swift:129:13:129:13 | opt |  |
+| cfg.swift:129:13:129:32 | call to getMyInt() | cfg.swift:129:3:129:32 | var ... = ... |  |
+| cfg.swift:131:3:131:18 | var ... = ... | cfg.swift:132:7:132:7 | n18 |  |
+| cfg.swift:131:7:131:7 | n17 | cfg.swift:131:13:131:13 | opt | match |
+| cfg.swift:131:13:131:13 | opt | cfg.swift:131:13:131:16 | ...? |  |
+| cfg.swift:131:13:131:16 | ...? | cfg.swift:131:13:131:18 | getter for .myInt |  |
+| cfg.swift:131:13:131:18 | (Int?) ... | cfg.swift:131:13:131:18 | OptionalEvaluationExpr |  |
+| cfg.swift:131:13:131:18 | OptionalEvaluationExpr | cfg.swift:131:3:131:18 | var ... = ... |  |
+| cfg.swift:131:13:131:18 | getter for .myInt | cfg.swift:131:13:131:18 | (Int?) ... |  |
+| cfg.swift:132:3:132:23 | var ... = ... | cfg.swift:133:7:133:7 | n19 |  |
+| cfg.swift:132:7:132:7 | n18 | cfg.swift:132:13:132:13 | opt | match |
+| cfg.swift:132:13:132:13 | opt | cfg.swift:132:13:132:16 | ...? |  |
+| cfg.swift:132:13:132:16 | ...? | cfg.swift:132:13:132:18 | .self |  |
+| cfg.swift:132:13:132:18 | .self | cfg.swift:132:13:132:23 | getter for .myInt |  |
+| cfg.swift:132:13:132:23 | (Int?) ... | cfg.swift:132:13:132:23 | OptionalEvaluationExpr |  |
+| cfg.swift:132:13:132:23 | OptionalEvaluationExpr | cfg.swift:132:3:132:23 | var ... = ... |  |
+| cfg.swift:132:13:132:23 | getter for .myInt | cfg.swift:132:13:132:23 | (Int?) ... |  |
+| cfg.swift:133:3:133:27 | var ... = ... | cfg.swift:134:7:134:7 | n20 |  |
+| cfg.swift:133:7:133:7 | n19 | cfg.swift:133:13:133:18 | .getMyInt() | match |
+| cfg.swift:133:13:133:13 | opt | cfg.swift:133:13:133:16 | ...? |  |
+| cfg.swift:133:13:133:16 | ...? | cfg.swift:133:13:133:27 | call to getMyInt() |  |
+| cfg.swift:133:13:133:18 | .getMyInt() | cfg.swift:133:13:133:13 | opt |  |
+| cfg.swift:133:13:133:27 | (Int?) ... | cfg.swift:133:13:133:27 | OptionalEvaluationExpr |  |
+| cfg.swift:133:13:133:27 | OptionalEvaluationExpr | cfg.swift:133:3:133:27 | var ... = ... |  |
+| cfg.swift:133:13:133:27 | call to getMyInt() | cfg.swift:133:13:133:27 | (Int?) ... |  |
+| cfg.swift:134:3:134:32 | var ... = ... | cfg.swift:109:1:135:1 | exit testMemberRef(param:inoutParam:opt:) (normal) |  |
+| cfg.swift:134:7:134:7 | n20 | cfg.swift:134:13:134:23 | .getMyInt() | match |
+| cfg.swift:134:13:134:13 | opt | cfg.swift:134:13:134:16 | ...? |  |
+| cfg.swift:134:13:134:16 | ...? | cfg.swift:134:13:134:18 | .self |  |
+| cfg.swift:134:13:134:18 | .self | cfg.swift:134:13:134:32 | call to getMyInt() |  |
+| cfg.swift:134:13:134:23 | .getMyInt() | cfg.swift:134:13:134:13 | opt |  |
+| cfg.swift:134:13:134:32 | (Int?) ... | cfg.swift:134:13:134:32 | OptionalEvaluationExpr |  |
+| cfg.swift:134:13:134:32 | OptionalEvaluationExpr | cfg.swift:134:3:134:32 | var ... = ... |  |
+| cfg.swift:134:13:134:32 | call to getMyInt() | cfg.swift:134:13:134:32 | (Int?) ... |  |
+| cfg.swift:137:1:161:1 | enter patterns(x:) | cfg.swift:137:1:161:1 | patterns(x:) |  |
+| cfg.swift:137:1:161:1 | exit patterns(x:) (normal) | cfg.swift:137:1:161:1 | exit patterns(x:) |  |
+| cfg.swift:137:1:161:1 | patterns(x:) | cfg.swift:137:15:137:19 | x |  |
+| cfg.swift:137:15:137:19 | x | cfg.swift:138:12:138:12 | $generator |  |
+| cfg.swift:138:3:138:3 | $generator | cfg.swift:138:3:138:3 | &... |  |
+| cfg.swift:138:3:138:3 | &... | cfg.swift:138:3:138:3 | call to next() |  |
+| cfg.swift:138:3:138:3 | .next() | cfg.swift:138:3:138:3 | $generator |  |
+| cfg.swift:138:3:138:3 | call to next() | cfg.swift:138:3:138:22 | for ... in ... { ... } |  |
+| cfg.swift:138:3:138:22 | for ... in ... { ... } | cfg.swift:138:7:138:7 | _ | non-empty |
+| cfg.swift:138:3:138:22 | for ... in ... { ... } | cfg.swift:140:3:148:3 | switch x { ... } | empty |
+| cfg.swift:138:7:138:7 | _ | cfg.swift:138:19:138:22 | { ... } | match |
+| cfg.swift:138:12:138:12 | 0 | cfg.swift:138:16:138:16 | 10 |  |
+| cfg.swift:138:12:138:12 | $generator | cfg.swift:138:12:138:16 | .makeIterator() | match |
+| cfg.swift:138:12:138:16 | ... ....(_:_:) ... | cfg.swift:138:12:138:16 | call to makeIterator() |  |
+| cfg.swift:138:12:138:16 | .makeIterator() | cfg.swift:138:13:138:13 | ....(_:_:) |  |
+| cfg.swift:138:12:138:16 | call to makeIterator() | file://:0:0:0:0 | var ... = ... |  |
+| cfg.swift:138:13:138:13 | ....(_:_:) | cfg.swift:138:13:138:13 | Int.Type |  |
+| cfg.swift:138:13:138:13 | Int.Type | cfg.swift:138:12:138:12 | 0 |  |
+| cfg.swift:138:16:138:16 | 10 | cfg.swift:138:12:138:16 | ... ....(_:_:) ... |  |
+| cfg.swift:138:19:138:22 | { ... } | cfg.swift:138:3:138:3 | .next() |  |
+| cfg.swift:140:3:148:3 | switch x { ... } | cfg.swift:140:10:140:10 | x |  |
+| cfg.swift:140:10:140:10 | x | cfg.swift:141:5:143:14 | case ... |  |
+| cfg.swift:141:5:143:14 | case ... | cfg.swift:141:10:141:10 | =~ ... |  |
+| cfg.swift:141:10:141:10 | 0 | cfg.swift:141:10:141:10 | $match |  |
+| cfg.swift:141:10:141:10 | $match | cfg.swift:141:10:141:10 | ... ~=(_:_:) ... |  |
+| cfg.swift:141:10:141:10 | ... ~=(_:_:) ... | cfg.swift:141:10:141:10 | =~ ... |  |
+| cfg.swift:141:10:141:10 | =~ ... | cfg.swift:141:10:141:10 | ~=(_:_:) |  |
+| cfg.swift:141:10:141:10 | =~ ... | cfg.swift:141:13:141:13 | =~ ... | no-match |
+| cfg.swift:141:10:141:10 | =~ ... | cfg.swift:142:14:142:14 | true | match |
+| cfg.swift:141:10:141:10 | ~=(_:_:) | cfg.swift:141:10:141:10 | 0 |  |
+| cfg.swift:141:13:141:13 | 1 | cfg.swift:141:13:141:13 | $match |  |
+| cfg.swift:141:13:141:13 | $match | cfg.swift:141:13:141:13 | ... ~=(_:_:) ... |  |
+| cfg.swift:141:13:141:13 | ... ~=(_:_:) ... | cfg.swift:141:13:141:13 | =~ ... |  |
+| cfg.swift:141:13:141:13 | =~ ... | cfg.swift:141:13:141:13 | ~=(_:_:) |  |
+| cfg.swift:141:13:141:13 | =~ ... | cfg.swift:142:14:142:14 | true | match |
+| cfg.swift:141:13:141:13 | =~ ... | cfg.swift:144:5:145:14 | case ... | no-match |
+| cfg.swift:141:13:141:13 | ~=(_:_:) | cfg.swift:141:13:141:13 | 1 |  |
+| cfg.swift:142:7:142:14 | return ... | cfg.swift:137:1:161:1 | exit patterns(x:) (normal) | return |
+| cfg.swift:142:14:142:14 | true | cfg.swift:142:7:142:14 | return ... |  |
+| cfg.swift:144:5:145:14 | case ... | cfg.swift:144:10:144:34 | =~ ... where ... |  |
+| cfg.swift:144:10:144:10 | $match | cfg.swift:144:10:144:10 | ... ~=(_:_:) ... |  |
+| cfg.swift:144:10:144:10 | ... ~=(_:_:) ... | cfg.swift:144:10:144:10 | =~ ... |  |
+| cfg.swift:144:10:144:10 | =~ ... | cfg.swift:144:18:144:34 | ... .&&(_:_:) ... | match, no-match |
+| cfg.swift:144:10:144:10 | =~ ... | cfg.swift:146:5:147:14 | case ... | no-match |
+| cfg.swift:144:10:144:10 | x | cfg.swift:144:10:144:10 | $match |  |
+| cfg.swift:144:10:144:10 | ~=(_:_:) | cfg.swift:144:10:144:10 | x |  |
+| cfg.swift:144:10:144:34 | =~ ... where ... | cfg.swift:144:10:144:10 | ~=(_:_:) |  |
+| cfg.swift:146:5:146:5 | _ | cfg.swift:146:5:146:5 | _ |  |
+| cfg.swift:146:5:146:5 | _ | cfg.swift:147:14:147:14 | false | match |
+| cfg.swift:146:5:147:14 | case ... | cfg.swift:146:5:146:5 | _ |  |
+| cfg.swift:147:7:147:14 | return ... | cfg.swift:137:1:161:1 | exit patterns(x:) (normal) | return |
+| cfg.swift:147:14:147:14 | false | cfg.swift:147:7:147:14 | return ... |  |
+| cfg.swift:163:1:179:1 | enter testDefer(x:) | cfg.swift:163:1:179:1 | testDefer(x:) |  |
+| cfg.swift:163:1:179:1 | exit testDefer(x:) (normal) | cfg.swift:163:1:179:1 | exit testDefer(x:) |  |
+| cfg.swift:163:1:179:1 | testDefer(x:) | cfg.swift:163:16:163:26 | x |  |
+| cfg.swift:163:16:163:26 | x | cfg.swift:165:3:167:3 | defer { ... } |  |
+| cfg.swift:165:3:167:3 | defer { ... } | cfg.swift:169:3:171:3 | defer { ... } |  |
+| cfg.swift:166:5:166:5 | print(_:separator:terminator:) | cfg.swift:166:11:166:11 | 4 |  |
+| cfg.swift:166:5:166:14 | call to print(_:separator:terminator:) | cfg.swift:163:1:179:1 | exit testDefer(x:) (normal) |  |
+| cfg.swift:166:10:166:10 | default separator | cfg.swift:166:10:166:10 | default terminator |  |
+| cfg.swift:166:10:166:10 | default terminator | cfg.swift:166:5:166:14 | call to print(_:separator:terminator:) |  |
+| cfg.swift:166:11:166:11 | 4 | cfg.swift:166:11:166:11 | (Any) ... |  |
+| cfg.swift:166:11:166:11 | (Any) ... | cfg.swift:166:11:166:11 | [...] |  |
+| cfg.swift:166:11:166:11 | [...] | cfg.swift:166:10:166:10 | default separator |  |
+| cfg.swift:166:11:166:11 | [...] | cfg.swift:166:11:166:11 | [...] |  |
+| cfg.swift:169:3:171:3 | defer { ... } | cfg.swift:173:3:178:3 | defer { ... } |  |
+| cfg.swift:170:5:170:5 | print(_:separator:terminator:) | cfg.swift:170:11:170:11 | 3 |  |
+| cfg.swift:170:5:170:14 | call to print(_:separator:terminator:) | cfg.swift:166:5:166:5 | print(_:separator:terminator:) |  |
+| cfg.swift:170:10:170:10 | default separator | cfg.swift:170:10:170:10 | default terminator |  |
+| cfg.swift:170:10:170:10 | default terminator | cfg.swift:170:5:170:14 | call to print(_:separator:terminator:) |  |
+| cfg.swift:170:11:170:11 | 3 | cfg.swift:170:11:170:11 | (Any) ... |  |
+| cfg.swift:170:11:170:11 | (Any) ... | cfg.swift:170:11:170:11 | [...] |  |
+| cfg.swift:170:11:170:11 | [...] | cfg.swift:170:10:170:10 | default separator |  |
+| cfg.swift:170:11:170:11 | [...] | cfg.swift:170:11:170:11 | [...] |  |
+| cfg.swift:173:3:178:3 | defer { ... } | cfg.swift:174:5:174:5 | print(_:separator:terminator:) |  |
+| cfg.swift:174:5:174:5 | print(_:separator:terminator:) | cfg.swift:174:11:174:11 | 1 |  |
+| cfg.swift:174:5:174:14 | call to print(_:separator:terminator:) | cfg.swift:175:6:177:5 | defer { ... } |  |
+| cfg.swift:174:10:174:10 | default separator | cfg.swift:174:10:174:10 | default terminator |  |
+| cfg.swift:174:10:174:10 | default terminator | cfg.swift:174:5:174:14 | call to print(_:separator:terminator:) |  |
+| cfg.swift:174:11:174:11 | 1 | cfg.swift:174:11:174:11 | (Any) ... |  |
+| cfg.swift:174:11:174:11 | (Any) ... | cfg.swift:174:11:174:11 | [...] |  |
+| cfg.swift:174:11:174:11 | [...] | cfg.swift:174:10:174:10 | default separator |  |
+| cfg.swift:174:11:174:11 | [...] | cfg.swift:174:11:174:11 | [...] |  |
+| cfg.swift:175:6:177:5 | defer { ... } | cfg.swift:176:7:176:7 | print(_:separator:terminator:) |  |
+| cfg.swift:176:7:176:7 | print(_:separator:terminator:) | cfg.swift:176:13:176:13 | 2 |  |
+| cfg.swift:176:7:176:16 | call to print(_:separator:terminator:) | cfg.swift:170:5:170:5 | print(_:separator:terminator:) |  |
+| cfg.swift:176:12:176:12 | default separator | cfg.swift:176:12:176:12 | default terminator |  |
+| cfg.swift:176:12:176:12 | default terminator | cfg.swift:176:7:176:16 | call to print(_:separator:terminator:) |  |
+| cfg.swift:176:13:176:13 | 2 | cfg.swift:176:13:176:13 | (Any) ... |  |
+| cfg.swift:176:13:176:13 | (Any) ... | cfg.swift:176:13:176:13 | [...] |  |
+| cfg.swift:176:13:176:13 | [...] | cfg.swift:176:12:176:12 | default separator |  |
+| cfg.swift:176:13:176:13 | [...] | cfg.swift:176:13:176:13 | [...] |  |
+| cfg.swift:181:1:191:1 | enter m1(x:) | cfg.swift:181:1:191:1 | m1(x:) |  |
+| cfg.swift:181:1:191:1 | exit m1(x:) (abnormal) | cfg.swift:181:1:191:1 | exit m1(x:) |  |
+| cfg.swift:181:1:191:1 | exit m1(x:) (normal) | cfg.swift:181:1:191:1 | exit m1(x:) |  |
+| cfg.swift:181:1:191:1 | m1(x:) | cfg.swift:181:9:181:13 | x |  |
+| cfg.swift:181:9:181:13 | x | cfg.swift:182:3:190:3 | if ... then { ... } else { ... } |  |
+| cfg.swift:182:3:190:3 | if ... then { ... } else { ... } | cfg.swift:182:6:182:10 | StmtCondition |  |
+| cfg.swift:182:6:182:6 | x | cfg.swift:182:10:182:10 | 2 |  |
+| cfg.swift:182:6:182:10 | ... .>(_:_:) ... | cfg.swift:183:5:183:5 | print(_:separator:terminator:) | true |
+| cfg.swift:182:6:182:10 | ... .>(_:_:) ... | cfg.swift:185:8:190:3 | if ... then { ... } else { ... } | false |
+| cfg.swift:182:6:182:10 | StmtCondition | cfg.swift:182:8:182:8 | .>(_:_:) |  |
+| cfg.swift:182:8:182:8 | .>(_:_:) | cfg.swift:182:8:182:8 | Int.Type |  |
+| cfg.swift:182:8:182:8 | Int.Type | cfg.swift:182:6:182:6 | x |  |
+| cfg.swift:182:10:182:10 | 2 | cfg.swift:182:6:182:10 | ... .>(_:_:) ... |  |
+| cfg.swift:183:5:183:5 | print(_:separator:terminator:) | cfg.swift:183:11:183:11 | x is greater than 2 |  |
+| cfg.swift:183:5:183:32 | call to print(_:separator:terminator:) | cfg.swift:181:1:191:1 | exit m1(x:) (normal) |  |
+| cfg.swift:183:10:183:10 | default separator | cfg.swift:183:10:183:10 | default terminator |  |
+| cfg.swift:183:10:183:10 | default terminator | cfg.swift:183:5:183:32 | call to print(_:separator:terminator:) |  |
+| cfg.swift:183:11:183:11 | (Any) ... | cfg.swift:183:11:183:11 | [...] |  |
+| cfg.swift:183:11:183:11 | [...] | cfg.swift:183:10:183:10 | default separator |  |
+| cfg.swift:183:11:183:11 | [...] | cfg.swift:183:11:183:11 | [...] |  |
+| cfg.swift:183:11:183:11 | x is greater than 2 | cfg.swift:183:11:183:11 | (Any) ... |  |
+| cfg.swift:185:8:190:3 | if ... then { ... } else { ... } | cfg.swift:185:11:185:38 | StmtCondition |  |
+| cfg.swift:185:11:185:11 | x | cfg.swift:185:16:185:16 | 2 |  |
+| cfg.swift:185:11:185:16 | ... .<=(_:_:) ... | cfg.swift:185:11:185:25 | [false] ... .&&(_:_:) ... | false |
+| cfg.swift:185:11:185:16 | ... .<=(_:_:) ... | cfg.swift:185:21:185:25 | { ... } | true |
+| cfg.swift:185:11:185:25 | ... .&&(_:_:) ... | cfg.swift:181:1:191:1 | exit m1(x:) (abnormal) | exception |
+| cfg.swift:185:11:185:25 | ... .&&(_:_:) ... | cfg.swift:185:11:185:38 | [false] ... .&&(_:_:) ... | false |
+| cfg.swift:185:11:185:25 | ... .&&(_:_:) ... | cfg.swift:185:30:185:38 | { ... } | true |
+| cfg.swift:185:11:185:25 | [false] ... .&&(_:_:) ... | cfg.swift:181:1:191:1 | exit m1(x:) (abnormal) | exception |
+| cfg.swift:185:11:185:25 | [false] ... .&&(_:_:) ... | cfg.swift:185:11:185:38 | [false] ... .&&(_:_:) ... | false |
+| cfg.swift:185:11:185:38 | ... .&&(_:_:) ... | cfg.swift:181:1:191:1 | exit m1(x:) (abnormal) | exception |
+| cfg.swift:185:11:185:38 | ... .&&(_:_:) ... | cfg.swift:186:5:186:5 | print(_:separator:terminator:) | true |
+| cfg.swift:185:11:185:38 | ... .&&(_:_:) ... | cfg.swift:189:5:189:5 | print(_:separator:terminator:) | false |
+| cfg.swift:185:11:185:38 | StmtCondition | cfg.swift:185:13:185:13 | .<=(_:_:) |  |
+| cfg.swift:185:11:185:38 | [false] ... .&&(_:_:) ... | cfg.swift:181:1:191:1 | exit m1(x:) (abnormal) | exception |
+| cfg.swift:185:11:185:38 | [false] ... .&&(_:_:) ... | cfg.swift:189:5:189:5 | print(_:separator:terminator:) | false |
+| cfg.swift:185:13:185:13 | .<=(_:_:) | cfg.swift:185:13:185:13 | Int.Type |  |
+| cfg.swift:185:13:185:13 | Int.Type | cfg.swift:185:11:185:11 | x |  |
+| cfg.swift:185:16:185:16 | 2 | cfg.swift:185:11:185:16 | ... .<=(_:_:) ... |  |
+| cfg.swift:185:21:185:21 | x | cfg.swift:185:25:185:25 | 0 |  |
+| cfg.swift:185:21:185:25 | ... .>(_:_:) ... | cfg.swift:185:21:185:25 | return ... |  |
+| cfg.swift:185:21:185:25 | return ... | cfg.swift:185:11:185:25 | ... .&&(_:_:) ... |  |
+| cfg.swift:185:21:185:25 | { ... } | cfg.swift:185:23:185:23 | .>(_:_:) |  |
+| cfg.swift:185:23:185:23 | .>(_:_:) | cfg.swift:185:23:185:23 | Int.Type |  |
+| cfg.swift:185:23:185:23 | Int.Type | cfg.swift:185:21:185:21 | x |  |
+| cfg.swift:185:25:185:25 | 0 | cfg.swift:185:21:185:25 | ... .>(_:_:) ... |  |
+| cfg.swift:185:30:185:38 | call to !(_:) | cfg.swift:185:30:185:38 | return ... |  |
+| cfg.swift:185:30:185:38 | return ... | cfg.swift:185:11:185:38 | ... .&&(_:_:) ... |  |
+| cfg.swift:185:30:185:38 | { ... } | cfg.swift:185:34:185:34 | .==(_:_:) |  |
+| cfg.swift:185:31:185:38 | (...) | cfg.swift:185:30:185:38 | call to !(_:) |  |
+| cfg.swift:185:32:185:32 | x | cfg.swift:185:37:185:37 | 5 |  |
+| cfg.swift:185:32:185:37 | ... .==(_:_:) ... | cfg.swift:185:31:185:38 | (...) |  |
+| cfg.swift:185:34:185:34 | .==(_:_:) | cfg.swift:185:34:185:34 | Int.Type |  |
+| cfg.swift:185:34:185:34 | Int.Type | cfg.swift:185:32:185:32 | x |  |
+| cfg.swift:185:37:185:37 | 5 | cfg.swift:185:32:185:37 | ... .==(_:_:) ... |  |
+| cfg.swift:186:5:186:5 | print(_:separator:terminator:) | cfg.swift:186:11:186:11 | x is 1 |  |
+| cfg.swift:186:5:186:19 | call to print(_:separator:terminator:) | cfg.swift:181:1:191:1 | exit m1(x:) (normal) |  |
+| cfg.swift:186:10:186:10 | default separator | cfg.swift:186:10:186:10 | default terminator |  |
+| cfg.swift:186:10:186:10 | default terminator | cfg.swift:186:5:186:19 | call to print(_:separator:terminator:) |  |
+| cfg.swift:186:11:186:11 | (Any) ... | cfg.swift:186:11:186:11 | [...] |  |
+| cfg.swift:186:11:186:11 | [...] | cfg.swift:186:10:186:10 | default separator |  |
+| cfg.swift:186:11:186:11 | [...] | cfg.swift:186:11:186:11 | [...] |  |
+| cfg.swift:186:11:186:11 | x is 1 | cfg.swift:186:11:186:11 | (Any) ... |  |
+| cfg.swift:189:5:189:5 | print(_:separator:terminator:) | cfg.swift:189:11:189:11 | I can't guess the number |  |
+| cfg.swift:189:5:189:37 | call to print(_:separator:terminator:) | cfg.swift:181:1:191:1 | exit m1(x:) (normal) |  |
+| cfg.swift:189:10:189:10 | default separator | cfg.swift:189:10:189:10 | default terminator |  |
+| cfg.swift:189:10:189:10 | default terminator | cfg.swift:189:5:189:37 | call to print(_:separator:terminator:) |  |
+| cfg.swift:189:11:189:11 | (Any) ... | cfg.swift:189:11:189:11 | [...] |  |
+| cfg.swift:189:11:189:11 | I can't guess the number | cfg.swift:189:11:189:11 | (Any) ... |  |
+| cfg.swift:189:11:189:11 | [...] | cfg.swift:189:10:189:10 | default separator |  |
+| cfg.swift:189:11:189:11 | [...] | cfg.swift:189:11:189:11 | [...] |  |
+| cfg.swift:193:1:198:1 | enter m2(b:) | cfg.swift:193:1:198:1 | m2(b:) |  |
+| cfg.swift:193:1:198:1 | exit m2(b:) (normal) | cfg.swift:193:1:198:1 | exit m2(b:) |  |
+| cfg.swift:193:1:198:1 | m2(b:) | cfg.swift:193:9:193:13 | b |  |
+| cfg.swift:193:9:193:13 | b | cfg.swift:194:3:196:3 | if ... then { ... } |  |
+| cfg.swift:194:3:196:3 | if ... then { ... } | cfg.swift:194:6:194:6 | StmtCondition |  |
+| cfg.swift:194:6:194:6 | StmtCondition | cfg.swift:194:6:194:6 | b |  |
+| cfg.swift:194:6:194:6 | b | cfg.swift:195:12:195:12 | 0 | true |
+| cfg.swift:194:6:194:6 | b | cfg.swift:197:10:197:10 | 1 | false |
+| cfg.swift:195:5:195:12 | return ... | cfg.swift:193:1:198:1 | exit m2(b:) (normal) | return |
+| cfg.swift:195:12:195:12 | 0 | cfg.swift:195:5:195:12 | return ... |  |
+| cfg.swift:197:3:197:10 | return ... | cfg.swift:193:1:198:1 | exit m2(b:) (normal) | return |
+| cfg.swift:197:10:197:10 | 1 | cfg.swift:197:3:197:10 | return ... |  |
+| cfg.swift:200:1:208:1 | enter m3(x:) | cfg.swift:200:1:208:1 | m3(x:) |  |
+| cfg.swift:200:1:208:1 | exit m3(x:) (normal) | cfg.swift:200:1:208:1 | exit m3(x:) |  |
+| cfg.swift:200:1:208:1 | m3(x:) | cfg.swift:200:9:200:19 | x |  |
+| cfg.swift:200:9:200:19 | x | cfg.swift:201:3:206:3 | if ... then { ... } |  |
+| cfg.swift:201:3:206:3 | if ... then { ... } | cfg.swift:201:6:201:10 | StmtCondition |  |
+| cfg.swift:201:6:201:6 | (Int) ... | cfg.swift:201:10:201:10 | 0 |  |
+| cfg.swift:201:6:201:6 | x | cfg.swift:201:6:201:6 | (Int) ... |  |
+| cfg.swift:201:6:201:10 | ... .<(_:_:) ... | cfg.swift:202:5:202:5 | x | true |
+| cfg.swift:201:6:201:10 | ... .<(_:_:) ... | cfg.swift:207:10:207:10 | x | false |
+| cfg.swift:201:6:201:10 | StmtCondition | cfg.swift:201:8:201:8 | .<(_:_:) |  |
+| cfg.swift:201:8:201:8 | .<(_:_:) | cfg.swift:201:8:201:8 | Int.Type |  |
+| cfg.swift:201:8:201:8 | Int.Type | cfg.swift:201:6:201:6 | x |  |
+| cfg.swift:201:10:201:10 | 0 | cfg.swift:201:6:201:10 | ... .<(_:_:) ... |  |
+| cfg.swift:202:5:202:5 | x | cfg.swift:202:9:202:9 | .-(_:) |  |
+| cfg.swift:202:5:202:10 |  ... = ... | cfg.swift:203:5:205:5 | if ... then { ... } |  |
+| cfg.swift:202:9:202:9 | .-(_:) | cfg.swift:202:9:202:9 | Int.Type |  |
+| cfg.swift:202:9:202:9 | Int.Type | cfg.swift:202:10:202:10 | x |  |
+| cfg.swift:202:9:202:10 | call to -(_:) | cfg.swift:202:5:202:10 |  ... = ... |  |
+| cfg.swift:202:10:202:10 | (Int) ... | cfg.swift:202:9:202:10 | call to -(_:) |  |
+| cfg.swift:202:10:202:10 | x | cfg.swift:202:10:202:10 | (Int) ... |  |
+| cfg.swift:203:5:205:5 | if ... then { ... } | cfg.swift:203:8:203:12 | StmtCondition |  |
+| cfg.swift:203:8:203:8 | (Int) ... | cfg.swift:203:12:203:12 | 10 |  |
+| cfg.swift:203:8:203:8 | x | cfg.swift:203:8:203:8 | (Int) ... |  |
+| cfg.swift:203:8:203:12 | ... .>(_:_:) ... | cfg.swift:204:7:204:7 | x | true |
+| cfg.swift:203:8:203:12 | ... .>(_:_:) ... | cfg.swift:207:10:207:10 | x | false |
+| cfg.swift:203:8:203:12 | StmtCondition | cfg.swift:203:10:203:10 | .>(_:_:) |  |
+| cfg.swift:203:10:203:10 | .>(_:_:) | cfg.swift:203:10:203:10 | Int.Type |  |
+| cfg.swift:203:10:203:10 | Int.Type | cfg.swift:203:8:203:8 | x |  |
+| cfg.swift:203:12:203:12 | 10 | cfg.swift:203:8:203:12 | ... .>(_:_:) ... |  |
+| cfg.swift:204:7:204:7 | x | cfg.swift:204:13:204:13 | .-(_:_:) |  |
+| cfg.swift:204:7:204:15 |  ... = ... | cfg.swift:207:10:207:10 | x |  |
+| cfg.swift:204:11:204:11 | (Int) ... | cfg.swift:204:15:204:15 | 1 |  |
+| cfg.swift:204:11:204:11 | x | cfg.swift:204:11:204:11 | (Int) ... |  |
+| cfg.swift:204:11:204:15 | ... .-(_:_:) ... | cfg.swift:204:7:204:15 |  ... = ... |  |
+| cfg.swift:204:13:204:13 | .-(_:_:) | cfg.swift:204:13:204:13 | Int.Type |  |
+| cfg.swift:204:13:204:13 | Int.Type | cfg.swift:204:11:204:11 | x |  |
+| cfg.swift:204:15:204:15 | 1 | cfg.swift:204:11:204:15 | ... .-(_:_:) ... |  |
+| cfg.swift:207:3:207:10 | return ... | cfg.swift:200:1:208:1 | exit m3(x:) (normal) | return |
+| cfg.swift:207:10:207:10 | (Int) ... | cfg.swift:207:3:207:10 | return ... |  |
+| cfg.swift:207:10:207:10 | x | cfg.swift:207:10:207:10 | (Int) ... |  |
+| cfg.swift:210:1:212:1 | enter m4(b1:b2:b3:) | cfg.swift:210:1:212:1 | m4(b1:b2:b3:) |  |
+| cfg.swift:210:1:212:1 | exit m4(b1:b2:b3:) (normal) | cfg.swift:210:1:212:1 | exit m4(b1:b2:b3:) |  |
+| cfg.swift:210:1:212:1 | m4(b1:b2:b3:) | cfg.swift:210:10:210:15 | b1 |  |
+| cfg.swift:210:10:210:15 | b1 | cfg.swift:210:21:210:26 | b2 |  |
+| cfg.swift:210:21:210:26 | b2 | cfg.swift:210:32:210:37 | b3 |  |
+| cfg.swift:210:32:210:37 | b3 | cfg.swift:211:11:211:11 | b1 |  |
+| cfg.swift:211:3:211:40 | return ... | cfg.swift:210:1:212:1 | exit m4(b1:b2:b3:) (normal) | return |
+| cfg.swift:211:10:211:23 | [false] (...) | cfg.swift:211:40:211:40 | !b2 \|\| !b3 | false |
+| cfg.swift:211:10:211:23 | [true] (...) | cfg.swift:211:27:211:27 | b2 \|\| b3 | true |
+| cfg.swift:211:10:211:40 | ... ? ... : ... | cfg.swift:211:3:211:40 | return ... |  |
+| cfg.swift:211:11:211:11 | b1 | cfg.swift:211:16:211:16 | b2 | true |
+| cfg.swift:211:11:211:11 | b1 | cfg.swift:211:21:211:21 | b3 | false |
+| cfg.swift:211:11:211:21 | [false] ... ? ... : ... | cfg.swift:211:10:211:23 | [false] (...) | false |
+| cfg.swift:211:11:211:21 | [true] ... ? ... : ... | cfg.swift:211:10:211:23 | [true] (...) | true |
+| cfg.swift:211:16:211:16 | b2 | cfg.swift:211:11:211:21 | [false] ... ? ... : ... | false |
+| cfg.swift:211:16:211:16 | b2 | cfg.swift:211:11:211:21 | [true] ... ? ... : ... | true |
+| cfg.swift:211:21:211:21 | b3 | cfg.swift:211:11:211:21 | [false] ... ? ... : ... | false |
+| cfg.swift:211:21:211:21 | b3 | cfg.swift:211:11:211:21 | [true] ... ? ... : ... | true |
+| cfg.swift:211:27:211:27 | b2 \|\| b3 | cfg.swift:211:10:211:40 | ... ? ... : ... |  |
+| cfg.swift:211:40:211:40 | !b2 \|\| !b3 | cfg.swift:211:10:211:40 | ... ? ... : ... |  |
+| cfg.swift:214:1:221:1 | conversionsInSplitEntry(b:) | cfg.swift:214:31:214:35 | b |  |
+| cfg.swift:214:1:221:1 | enter conversionsInSplitEntry(b:) | cfg.swift:214:1:221:1 | conversionsInSplitEntry(b:) |  |
+| cfg.swift:214:1:221:1 | exit conversionsInSplitEntry(b:) (normal) | cfg.swift:214:1:221:1 | exit conversionsInSplitEntry(b:) |  |
+| cfg.swift:214:31:214:35 | b | cfg.swift:215:3:220:3 | if ... then { ... } else { ... } |  |
+| cfg.swift:215:3:220:3 | if ... then { ... } else { ... } | cfg.swift:215:6:215:29 | StmtCondition |  |
+| cfg.swift:215:6:215:6 | b | cfg.swift:215:11:215:11 | true | true |
+| cfg.swift:215:6:215:6 | b | cfg.swift:215:24:215:24 | false | false |
+| cfg.swift:215:6:215:29 | StmtCondition | cfg.swift:215:6:215:6 | b |  |
+| cfg.swift:215:6:215:29 | [false] ... ? ... : ... | cfg.swift:219:12:219:12 | !b | false |
+| cfg.swift:215:6:215:29 | [true] ... ? ... : ... | cfg.swift:216:12:216:12 | b | true |
+| cfg.swift:215:10:215:15 | [true] (...) | cfg.swift:215:6:215:29 | [true] ... ? ... : ... | true |
+| cfg.swift:215:11:215:11 | true | cfg.swift:215:10:215:15 | [true] (...) | true |
+| cfg.swift:215:19:215:29 | [false] (Bool) ... | cfg.swift:215:6:215:29 | [false] ... ? ... : ... | false |
+| cfg.swift:215:24:215:24 | false | cfg.swift:215:19:215:29 | [false] (Bool) ... | false |
+| cfg.swift:216:5:216:12 | return ... | cfg.swift:214:1:221:1 | exit conversionsInSplitEntry(b:) (normal) | return |
+| cfg.swift:216:12:216:12 | b | cfg.swift:216:5:216:12 | return ... |  |
+| cfg.swift:219:5:219:12 | return ... | cfg.swift:214:1:221:1 | exit conversionsInSplitEntry(b:) (normal) | return |
+| cfg.swift:219:12:219:12 | !b | cfg.swift:219:5:219:12 | return ... |  |
+| cfg.swift:223:1:227:1 | constant_condition() | cfg.swift:224:3:226:3 | if ... then { ... } |  |
+| cfg.swift:223:1:227:1 | enter constant_condition() | cfg.swift:223:1:227:1 | constant_condition() |  |
+| cfg.swift:223:1:227:1 | exit constant_condition() (normal) | cfg.swift:223:1:227:1 | exit constant_condition() |  |
+| cfg.swift:224:3:226:3 | if ... then { ... } | cfg.swift:224:6:224:7 | StmtCondition |  |
+| cfg.swift:224:6:224:7 | StmtCondition | cfg.swift:224:7:224:7 | true |  |
+| cfg.swift:224:6:224:7 | [false] call to !(_:) | cfg.swift:223:1:227:1 | exit constant_condition() (normal) | false |
+| cfg.swift:224:7:224:7 | true | cfg.swift:224:6:224:7 | [false] call to !(_:) | true |
+| cfg.swift:229:1:235:1 | empty_else(b:) | cfg.swift:229:17:229:21 | b |  |
+| cfg.swift:229:1:235:1 | enter empty_else(b:) | cfg.swift:229:1:235:1 | empty_else(b:) |  |
+| cfg.swift:229:1:235:1 | exit empty_else(b:) (normal) | cfg.swift:229:1:235:1 | exit empty_else(b:) |  |
+| cfg.swift:229:17:229:21 | b | cfg.swift:230:3:233:9 | if ... then { ... } else { ... } |  |
+| cfg.swift:230:3:233:9 | if ... then { ... } else { ... } | cfg.swift:230:6:230:6 | StmtCondition |  |
+| cfg.swift:230:6:230:6 | StmtCondition | cfg.swift:230:6:230:6 | b |  |
+| cfg.swift:230:6:230:6 | b | cfg.swift:231:5:231:5 | print(_:separator:terminator:) | true |
+| cfg.swift:230:6:230:6 | b | cfg.swift:233:8:233:9 | { ... } | false |
+| cfg.swift:231:5:231:5 | print(_:separator:terminator:) | cfg.swift:231:11:231:11 | true |  |
+| cfg.swift:231:5:231:17 | call to print(_:separator:terminator:) | cfg.swift:234:3:234:3 | print(_:separator:terminator:) |  |
+| cfg.swift:231:10:231:10 | default separator | cfg.swift:231:10:231:10 | default terminator |  |
+| cfg.swift:231:10:231:10 | default terminator | cfg.swift:231:5:231:17 | call to print(_:separator:terminator:) |  |
+| cfg.swift:231:11:231:11 | (Any) ... | cfg.swift:231:11:231:11 | [...] |  |
+| cfg.swift:231:11:231:11 | [...] | cfg.swift:231:10:231:10 | default separator |  |
+| cfg.swift:231:11:231:11 | [...] | cfg.swift:231:11:231:11 | [...] |  |
+| cfg.swift:231:11:231:11 | true | cfg.swift:231:11:231:11 | (Any) ... |  |
+| cfg.swift:233:8:233:9 | { ... } | cfg.swift:234:3:234:3 | print(_:separator:terminator:) |  |
+| cfg.swift:234:3:234:3 | print(_:separator:terminator:) | cfg.swift:234:9:234:9 | done |  |
+| cfg.swift:234:3:234:15 | call to print(_:separator:terminator:) | cfg.swift:229:1:235:1 | exit empty_else(b:) (normal) |  |
+| cfg.swift:234:8:234:8 | default separator | cfg.swift:234:8:234:8 | default terminator |  |
+| cfg.swift:234:8:234:8 | default terminator | cfg.swift:234:3:234:15 | call to print(_:separator:terminator:) |  |
+| cfg.swift:234:9:234:9 | (Any) ... | cfg.swift:234:9:234:9 | [...] |  |
+| cfg.swift:234:9:234:9 | [...] | cfg.swift:234:8:234:8 | default separator |  |
+| cfg.swift:234:9:234:9 | [...] | cfg.swift:234:9:234:9 | [...] |  |
+| cfg.swift:234:9:234:9 | done | cfg.swift:234:9:234:9 | (Any) ... |  |
+| cfg.swift:237:1:241:1 | disjunct(b1:b2:) | cfg.swift:237:16:237:21 | b1 |  |
+| cfg.swift:237:1:241:1 | enter disjunct(b1:b2:) | cfg.swift:237:1:241:1 | disjunct(b1:b2:) |  |
+| cfg.swift:237:1:241:1 | exit disjunct(b1:b2:) (abnormal) | cfg.swift:237:1:241:1 | exit disjunct(b1:b2:) |  |
+| cfg.swift:237:1:241:1 | exit disjunct(b1:b2:) (normal) | cfg.swift:237:1:241:1 | exit disjunct(b1:b2:) |  |
+| cfg.swift:237:16:237:21 | b1 | cfg.swift:237:27:237:32 | b2 |  |
+| cfg.swift:237:27:237:32 | b2 | cfg.swift:238:3:240:3 | if ... then { ... } |  |
+| cfg.swift:238:3:240:3 | if ... then { ... } | cfg.swift:238:6:238:15 | StmtCondition |  |
+| cfg.swift:238:6:238:15 | StmtCondition | cfg.swift:238:7:238:7 | b1 |  |
+| cfg.swift:238:6:238:15 | [false] (...) | cfg.swift:237:1:241:1 | exit disjunct(b1:b2:) (normal) | false |
+| cfg.swift:238:6:238:15 | [true] (...) | cfg.swift:239:5:239:5 | print(_:separator:terminator:) | true |
+| cfg.swift:238:7:238:7 | b1 | cfg.swift:238:7:238:13 | [true] ... .\|\|(_:_:) ... | true |
+| cfg.swift:238:7:238:7 | b1 | cfg.swift:238:13:238:13 | { ... } | false |
+| cfg.swift:238:7:238:13 | ... .\|\|(_:_:) ... | cfg.swift:237:1:241:1 | exit disjunct(b1:b2:) (abnormal) | exception |
+| cfg.swift:238:7:238:13 | ... .\|\|(_:_:) ... | cfg.swift:238:6:238:15 | [false] (...) | false |
+| cfg.swift:238:7:238:13 | ... .\|\|(_:_:) ... | cfg.swift:238:6:238:15 | [true] (...) | true |
+| cfg.swift:238:7:238:13 | [true] ... .\|\|(_:_:) ... | cfg.swift:237:1:241:1 | exit disjunct(b1:b2:) (abnormal) | exception |
+| cfg.swift:238:7:238:13 | [true] ... .\|\|(_:_:) ... | cfg.swift:238:6:238:15 | [true] (...) | true |
+| cfg.swift:238:13:238:13 | b2 | cfg.swift:238:13:238:13 | return ... |  |
+| cfg.swift:238:13:238:13 | return ... | cfg.swift:238:7:238:13 | ... .\|\|(_:_:) ... |  |
+| cfg.swift:238:13:238:13 | { ... } | cfg.swift:238:13:238:13 | b2 |  |
+| cfg.swift:239:5:239:5 | print(_:separator:terminator:) | cfg.swift:239:11:239:11 | b1 or b2 |  |
+| cfg.swift:239:5:239:21 | call to print(_:separator:terminator:) | cfg.swift:237:1:241:1 | exit disjunct(b1:b2:) (normal) |  |
+| cfg.swift:239:10:239:10 | default separator | cfg.swift:239:10:239:10 | default terminator |  |
+| cfg.swift:239:10:239:10 | default terminator | cfg.swift:239:5:239:21 | call to print(_:separator:terminator:) |  |
+| cfg.swift:239:11:239:11 | (Any) ... | cfg.swift:239:11:239:11 | [...] |  |
+| cfg.swift:239:11:239:11 | [...] | cfg.swift:239:10:239:10 | default separator |  |
+| cfg.swift:239:11:239:11 | [...] | cfg.swift:239:11:239:11 | [...] |  |
+| cfg.swift:239:11:239:11 | b1 or b2 | cfg.swift:239:11:239:11 | (Any) ... |  |
+| cfg.swift:243:1:260:1 | binaryExprs(a:b:) | cfg.swift:243:18:243:22 | a |  |
+| cfg.swift:243:1:260:1 | enter binaryExprs(a:b:) | cfg.swift:243:1:260:1 | binaryExprs(a:b:) |  |
+| cfg.swift:243:1:260:1 | exit binaryExprs(a:b:) (normal) | cfg.swift:243:1:260:1 | exit binaryExprs(a:b:) |  |
+| cfg.swift:243:18:243:22 | a | cfg.swift:243:27:243:31 | b |  |
+| cfg.swift:243:27:243:31 | b | cfg.swift:244:7:244:7 | c |  |
+| cfg.swift:244:3:244:15 | var ... = ... | cfg.swift:245:7:245:7 | d |  |
+| cfg.swift:244:7:244:7 | c | cfg.swift:244:13:244:13 | .+(_:_:) | match |
+| cfg.swift:244:11:244:11 | a | cfg.swift:244:15:244:15 | b |  |
+| cfg.swift:244:11:244:15 | ... .+(_:_:) ... | cfg.swift:244:3:244:15 | var ... = ... |  |
+| cfg.swift:244:13:244:13 | .+(_:_:) | cfg.swift:244:13:244:13 | Int.Type |  |
+| cfg.swift:244:13:244:13 | Int.Type | cfg.swift:244:11:244:11 | a |  |
+| cfg.swift:244:15:244:15 | b | cfg.swift:244:11:244:15 | ... .+(_:_:) ... |  |
+| cfg.swift:245:3:245:15 | var ... = ... | cfg.swift:246:7:246:7 | e |  |
+| cfg.swift:245:7:245:7 | d | cfg.swift:245:13:245:13 | .-(_:_:) | match |
+| cfg.swift:245:11:245:11 | a | cfg.swift:245:15:245:15 | b |  |
+| cfg.swift:245:11:245:15 | ... .-(_:_:) ... | cfg.swift:245:3:245:15 | var ... = ... |  |
+| cfg.swift:245:13:245:13 | .-(_:_:) | cfg.swift:245:13:245:13 | Int.Type |  |
+| cfg.swift:245:13:245:13 | Int.Type | cfg.swift:245:11:245:11 | a |  |
+| cfg.swift:245:15:245:15 | b | cfg.swift:245:11:245:15 | ... .-(_:_:) ... |  |
+| cfg.swift:246:3:246:15 | var ... = ... | cfg.swift:247:7:247:7 | f |  |
+| cfg.swift:246:7:246:7 | e | cfg.swift:246:13:246:13 | .*(_:_:) | match |
+| cfg.swift:246:11:246:11 | a | cfg.swift:246:15:246:15 | b |  |
+| cfg.swift:246:11:246:15 | ... .*(_:_:) ... | cfg.swift:246:3:246:15 | var ... = ... |  |
+| cfg.swift:246:13:246:13 | .*(_:_:) | cfg.swift:246:13:246:13 | Int.Type |  |
+| cfg.swift:246:13:246:13 | Int.Type | cfg.swift:246:11:246:11 | a |  |
+| cfg.swift:246:15:246:15 | b | cfg.swift:246:11:246:15 | ... .*(_:_:) ... |  |
+| cfg.swift:247:3:247:15 | var ... = ... | cfg.swift:248:7:248:7 | g |  |
+| cfg.swift:247:7:247:7 | f | cfg.swift:247:13:247:13 | ./(_:_:) | match |
+| cfg.swift:247:11:247:11 | a | cfg.swift:247:15:247:15 | b |  |
+| cfg.swift:247:11:247:15 | ... ./(_:_:) ... | cfg.swift:247:3:247:15 | var ... = ... |  |
+| cfg.swift:247:13:247:13 | ./(_:_:) | cfg.swift:247:13:247:13 | Int.Type |  |
+| cfg.swift:247:13:247:13 | Int.Type | cfg.swift:247:11:247:11 | a |  |
+| cfg.swift:247:15:247:15 | b | cfg.swift:247:11:247:15 | ... ./(_:_:) ... |  |
+| cfg.swift:248:3:248:15 | var ... = ... | cfg.swift:249:7:249:7 | h |  |
+| cfg.swift:248:7:248:7 | g | cfg.swift:248:13:248:13 | .%(_:_:) | match |
+| cfg.swift:248:11:248:11 | a | cfg.swift:248:15:248:15 | b |  |
+| cfg.swift:248:11:248:15 | ... .%(_:_:) ... | cfg.swift:248:3:248:15 | var ... = ... |  |
+| cfg.swift:248:13:248:13 | .%(_:_:) | cfg.swift:248:13:248:13 | Int.Type |  |
+| cfg.swift:248:13:248:13 | Int.Type | cfg.swift:248:11:248:11 | a |  |
+| cfg.swift:248:15:248:15 | b | cfg.swift:248:11:248:15 | ... .%(_:_:) ... |  |
+| cfg.swift:249:3:249:15 | var ... = ... | cfg.swift:250:7:250:7 | i |  |
+| cfg.swift:249:7:249:7 | h | cfg.swift:249:13:249:13 | .&(_:_:) | match |
+| cfg.swift:249:11:249:11 | a | cfg.swift:249:15:249:15 | b |  |
+| cfg.swift:249:11:249:15 | ... .&(_:_:) ... | cfg.swift:249:3:249:15 | var ... = ... |  |
+| cfg.swift:249:13:249:13 | .&(_:_:) | cfg.swift:249:13:249:13 | Int.Type |  |
+| cfg.swift:249:13:249:13 | Int.Type | cfg.swift:249:11:249:11 | a |  |
+| cfg.swift:249:15:249:15 | b | cfg.swift:249:11:249:15 | ... .&(_:_:) ... |  |
+| cfg.swift:250:3:250:15 | var ... = ... | cfg.swift:251:7:251:7 | j |  |
+| cfg.swift:250:7:250:7 | i | cfg.swift:250:13:250:13 | .\|(_:_:) | match |
+| cfg.swift:250:11:250:11 | a | cfg.swift:250:15:250:15 | b |  |
+| cfg.swift:250:11:250:15 | ... .\|(_:_:) ... | cfg.swift:250:3:250:15 | var ... = ... |  |
+| cfg.swift:250:13:250:13 | .\|(_:_:) | cfg.swift:250:13:250:13 | Int.Type |  |
+| cfg.swift:250:13:250:13 | Int.Type | cfg.swift:250:11:250:11 | a |  |
+| cfg.swift:250:15:250:15 | b | cfg.swift:250:11:250:15 | ... .\|(_:_:) ... |  |
+| cfg.swift:251:3:251:15 | var ... = ... | cfg.swift:252:7:252:7 | k |  |
+| cfg.swift:251:7:251:7 | j | cfg.swift:251:13:251:13 | .^(_:_:) | match |
+| cfg.swift:251:11:251:11 | a | cfg.swift:251:15:251:15 | b |  |
+| cfg.swift:251:11:251:15 | ... .^(_:_:) ... | cfg.swift:251:3:251:15 | var ... = ... |  |
+| cfg.swift:251:13:251:13 | .^(_:_:) | cfg.swift:251:13:251:13 | Int.Type |  |
+| cfg.swift:251:13:251:13 | Int.Type | cfg.swift:251:11:251:11 | a |  |
+| cfg.swift:251:15:251:15 | b | cfg.swift:251:11:251:15 | ... .^(_:_:) ... |  |
+| cfg.swift:252:3:252:16 | var ... = ... | cfg.swift:253:7:253:7 | l |  |
+| cfg.swift:252:7:252:7 | k | cfg.swift:252:13:252:13 | .<<(_:_:) | match |
+| cfg.swift:252:11:252:11 | a | cfg.swift:252:16:252:16 | b |  |
+| cfg.swift:252:11:252:16 | ... .<<(_:_:) ... | cfg.swift:252:3:252:16 | var ... = ... |  |
+| cfg.swift:252:13:252:13 | .<<(_:_:) | cfg.swift:252:13:252:13 | Int.Type |  |
+| cfg.swift:252:13:252:13 | Int.Type | cfg.swift:252:11:252:11 | a |  |
+| cfg.swift:252:16:252:16 | b | cfg.swift:252:11:252:16 | ... .<<(_:_:) ... |  |
+| cfg.swift:253:3:253:16 | var ... = ... | cfg.swift:254:7:254:7 | o |  |
+| cfg.swift:253:7:253:7 | l | cfg.swift:253:13:253:13 | .>>(_:_:) | match |
+| cfg.swift:253:11:253:11 | a | cfg.swift:253:16:253:16 | b |  |
+| cfg.swift:253:11:253:16 | ... .>>(_:_:) ... | cfg.swift:253:3:253:16 | var ... = ... |  |
+| cfg.swift:253:13:253:13 | .>>(_:_:) | cfg.swift:253:13:253:13 | Int.Type |  |
+| cfg.swift:253:13:253:13 | Int.Type | cfg.swift:253:11:253:11 | a |  |
+| cfg.swift:253:16:253:16 | b | cfg.swift:253:11:253:16 | ... .>>(_:_:) ... |  |
+| cfg.swift:254:3:254:16 | var ... = ... | cfg.swift:255:7:255:7 | p |  |
+| cfg.swift:254:7:254:7 | o | cfg.swift:254:13:254:13 | .==(_:_:) | match |
+| cfg.swift:254:11:254:11 | a | cfg.swift:254:16:254:16 | b |  |
+| cfg.swift:254:11:254:16 | ... .==(_:_:) ... | cfg.swift:254:3:254:16 | var ... = ... |  |
+| cfg.swift:254:13:254:13 | .==(_:_:) | cfg.swift:254:13:254:13 | Int.Type |  |
+| cfg.swift:254:13:254:13 | Int.Type | cfg.swift:254:11:254:11 | a |  |
+| cfg.swift:254:16:254:16 | b | cfg.swift:254:11:254:16 | ... .==(_:_:) ... |  |
+| cfg.swift:255:3:255:16 | var ... = ... | cfg.swift:256:7:256:7 | q |  |
+| cfg.swift:255:7:255:7 | p | cfg.swift:255:13:255:13 | .!=(_:_:) | match |
+| cfg.swift:255:11:255:11 | a | cfg.swift:255:16:255:16 | b |  |
+| cfg.swift:255:11:255:16 | ... .!=(_:_:) ... | cfg.swift:255:3:255:16 | var ... = ... |  |
+| cfg.swift:255:13:255:13 | .!=(_:_:) | cfg.swift:255:13:255:13 | Int.Type |  |
+| cfg.swift:255:13:255:13 | Int.Type | cfg.swift:255:11:255:11 | a |  |
+| cfg.swift:255:16:255:16 | b | cfg.swift:255:11:255:16 | ... .!=(_:_:) ... |  |
+| cfg.swift:256:3:256:15 | var ... = ... | cfg.swift:257:7:257:7 | r |  |
+| cfg.swift:256:7:256:7 | q | cfg.swift:256:13:256:13 | .<(_:_:) | match |
+| cfg.swift:256:11:256:11 | a | cfg.swift:256:15:256:15 | b |  |
+| cfg.swift:256:11:256:15 | ... .<(_:_:) ... | cfg.swift:256:3:256:15 | var ... = ... |  |
+| cfg.swift:256:13:256:13 | .<(_:_:) | cfg.swift:256:13:256:13 | Int.Type |  |
+| cfg.swift:256:13:256:13 | Int.Type | cfg.swift:256:11:256:11 | a |  |
+| cfg.swift:256:15:256:15 | b | cfg.swift:256:11:256:15 | ... .<(_:_:) ... |  |
+| cfg.swift:257:3:257:16 | var ... = ... | cfg.swift:258:7:258:7 | s |  |
+| cfg.swift:257:7:257:7 | r | cfg.swift:257:13:257:13 | .<=(_:_:) | match |
+| cfg.swift:257:11:257:11 | a | cfg.swift:257:16:257:16 | b |  |
+| cfg.swift:257:11:257:16 | ... .<=(_:_:) ... | cfg.swift:257:3:257:16 | var ... = ... |  |
+| cfg.swift:257:13:257:13 | .<=(_:_:) | cfg.swift:257:13:257:13 | Int.Type |  |
+| cfg.swift:257:13:257:13 | Int.Type | cfg.swift:257:11:257:11 | a |  |
+| cfg.swift:257:16:257:16 | b | cfg.swift:257:11:257:16 | ... .<=(_:_:) ... |  |
+| cfg.swift:258:3:258:15 | var ... = ... | cfg.swift:259:7:259:7 | t |  |
+| cfg.swift:258:7:258:7 | s | cfg.swift:258:13:258:13 | .>(_:_:) | match |
+| cfg.swift:258:11:258:11 | a | cfg.swift:258:15:258:15 | b |  |
+| cfg.swift:258:11:258:15 | ... .>(_:_:) ... | cfg.swift:258:3:258:15 | var ... = ... |  |
+| cfg.swift:258:13:258:13 | .>(_:_:) | cfg.swift:258:13:258:13 | Int.Type |  |
+| cfg.swift:258:13:258:13 | Int.Type | cfg.swift:258:11:258:11 | a |  |
+| cfg.swift:258:15:258:15 | b | cfg.swift:258:11:258:15 | ... .>(_:_:) ... |  |
+| cfg.swift:259:3:259:16 | var ... = ... | cfg.swift:243:1:260:1 | exit binaryExprs(a:b:) (normal) |  |
+| cfg.swift:259:7:259:7 | t | cfg.swift:259:13:259:13 | .>=(_:_:) | match |
+| cfg.swift:259:11:259:11 | a | cfg.swift:259:16:259:16 | b |  |
+| cfg.swift:259:11:259:16 | ... .>=(_:_:) ... | cfg.swift:259:3:259:16 | var ... = ... |  |
+| cfg.swift:259:13:259:13 | .>=(_:_:) | cfg.swift:259:13:259:13 | Int.Type |  |
+| cfg.swift:259:13:259:13 | Int.Type | cfg.swift:259:11:259:11 | a |  |
+| cfg.swift:259:16:259:16 | b | cfg.swift:259:11:259:16 | ... .>=(_:_:) ... |  |
+| cfg.swift:262:1:264:1 | enter interpolatedString(x:y:) | cfg.swift:262:1:264:1 | interpolatedString(x:y:) |  |
+| cfg.swift:262:1:264:1 | exit interpolatedString(x:y:) (normal) | cfg.swift:262:1:264:1 | exit interpolatedString(x:y:) |  |
+| cfg.swift:262:1:264:1 | interpolatedString(x:y:) | cfg.swift:262:25:262:29 | x |  |
+| cfg.swift:262:25:262:29 | x | cfg.swift:262:34:262:38 | y |  |
+| cfg.swift:262:34:262:38 | y | cfg.swift:263:10:263:10 | OpaqueValueExpr |  |
+| cfg.swift:263:3:263:10 | return ... | cfg.swift:262:1:264:1 | exit interpolatedString(x:y:) (normal) | return |
+| cfg.swift:263:10:263:10 |  | cfg.swift:263:11:263:10 | call to appendLiteral(_:) |  |
+| cfg.swift:263:10:263:10 | "..." | cfg.swift:263:3:263:10 | return ... |  |
+| cfg.swift:263:10:263:10 | OpaqueValueExpr | cfg.swift:263:11:263:11 | .appendLiteral(_:) |  |
+| cfg.swift:263:10:263:10 | TapExpr | cfg.swift:263:10:263:10 | "..." |  |
+| cfg.swift:263:11:263:10 | call to appendLiteral(_:) | cfg.swift:263:12:263:12 | .appendInterpolation(_:) |  |
+| cfg.swift:263:11:263:11 | $interpolation | cfg.swift:263:11:263:11 | &... |  |
+| cfg.swift:263:11:263:11 | &... | cfg.swift:263:10:263:10 |  |  |
+| cfg.swift:263:11:263:11 | .appendLiteral(_:) | cfg.swift:263:11:263:11 | $interpolation |  |
+| cfg.swift:263:12:263:12 | $interpolation | cfg.swift:263:12:263:12 | &... |  |
+| cfg.swift:263:12:263:12 | &... | cfg.swift:263:13:263:13 | x |  |
+| cfg.swift:263:12:263:12 | .appendInterpolation(_:) | cfg.swift:263:12:263:12 | $interpolation |  |
+| cfg.swift:263:12:263:14 | call to appendInterpolation(_:) | cfg.swift:263:15:263:15 | .appendLiteral(_:) |  |
+| cfg.swift:263:13:263:13 | x | cfg.swift:263:12:263:14 | call to appendInterpolation(_:) |  |
+| cfg.swift:263:15:263:15 |  +  | cfg.swift:263:15:263:15 | call to appendLiteral(_:) |  |
+| cfg.swift:263:15:263:15 | $interpolation | cfg.swift:263:15:263:15 | &... |  |
+| cfg.swift:263:15:263:15 | &... | cfg.swift:263:15:263:15 |  +  |  |
+| cfg.swift:263:15:263:15 | .appendLiteral(_:) | cfg.swift:263:15:263:15 | $interpolation |  |
+| cfg.swift:263:15:263:15 | call to appendLiteral(_:) | cfg.swift:263:19:263:19 | .appendInterpolation(_:) |  |
+| cfg.swift:263:19:263:19 | $interpolation | cfg.swift:263:19:263:19 | &... |  |
+| cfg.swift:263:19:263:19 | &... | cfg.swift:263:20:263:20 | y |  |
+| cfg.swift:263:19:263:19 | .appendInterpolation(_:) | cfg.swift:263:19:263:19 | $interpolation |  |
+| cfg.swift:263:19:263:21 | call to appendInterpolation(_:) | cfg.swift:263:22:263:22 | .appendLiteral(_:) |  |
+| cfg.swift:263:20:263:20 | y | cfg.swift:263:19:263:21 | call to appendInterpolation(_:) |  |
+| cfg.swift:263:22:263:22 |  is equal to  | cfg.swift:263:22:263:22 | call to appendLiteral(_:) |  |
+| cfg.swift:263:22:263:22 | $interpolation | cfg.swift:263:22:263:22 | &... |  |
+| cfg.swift:263:22:263:22 | &... | cfg.swift:263:22:263:22 |  is equal to  |  |
+| cfg.swift:263:22:263:22 | .appendLiteral(_:) | cfg.swift:263:22:263:22 | $interpolation |  |
+| cfg.swift:263:22:263:22 | call to appendLiteral(_:) | cfg.swift:263:36:263:36 | .appendInterpolation(_:) |  |
+| cfg.swift:263:36:263:36 | $interpolation | cfg.swift:263:36:263:36 | &... |  |
+| cfg.swift:263:36:263:36 | &... | cfg.swift:263:39:263:39 | .+(_:_:) |  |
+| cfg.swift:263:36:263:36 | .appendInterpolation(_:) | cfg.swift:263:36:263:36 | $interpolation |  |
+| cfg.swift:263:36:263:42 | call to appendInterpolation(_:) | cfg.swift:263:43:263:43 | .appendLiteral(_:) |  |
+| cfg.swift:263:37:263:37 | x | cfg.swift:263:41:263:41 | y |  |
+| cfg.swift:263:37:263:41 | ... .+(_:_:) ... | cfg.swift:263:36:263:42 | call to appendInterpolation(_:) |  |
+| cfg.swift:263:39:263:39 | .+(_:_:) | cfg.swift:263:39:263:39 | Int.Type |  |
+| cfg.swift:263:39:263:39 | Int.Type | cfg.swift:263:37:263:37 | x |  |
+| cfg.swift:263:41:263:41 | y | cfg.swift:263:37:263:41 | ... .+(_:_:) ... |  |
+| cfg.swift:263:43:263:43 |  and here is a zero:  | cfg.swift:263:43:263:43 | call to appendLiteral(_:) |  |
+| cfg.swift:263:43:263:43 | $interpolation | cfg.swift:263:43:263:43 | &... |  |
+| cfg.swift:263:43:263:43 | &... | cfg.swift:263:43:263:43 |  and here is a zero:  |  |
+| cfg.swift:263:43:263:43 | .appendLiteral(_:) | cfg.swift:263:43:263:43 | $interpolation |  |
+| cfg.swift:263:43:263:43 | call to appendLiteral(_:) | cfg.swift:263:65:263:65 | .appendInterpolation(_:) |  |
+| cfg.swift:263:65:263:65 | $interpolation | cfg.swift:263:65:263:65 | &... |  |
+| cfg.swift:263:65:263:65 | &... | cfg.swift:263:66:263:66 | returnZero() |  |
+| cfg.swift:263:65:263:65 | .appendInterpolation(_:) | cfg.swift:263:65:263:65 | $interpolation |  |
+| cfg.swift:263:65:263:78 | call to appendInterpolation(_:) | cfg.swift:263:79:263:79 | .appendLiteral(_:) |  |
+| cfg.swift:263:66:263:66 | returnZero() | cfg.swift:263:66:263:77 | call to returnZero() |  |
+| cfg.swift:263:66:263:77 | call to returnZero() | cfg.swift:263:65:263:78 | call to appendInterpolation(_:) |  |
+| cfg.swift:263:79:263:79 |  | cfg.swift:263:79:263:79 | call to appendLiteral(_:) |  |
+| cfg.swift:263:79:263:79 | $interpolation | cfg.swift:263:79:263:79 | &... |  |
+| cfg.swift:263:79:263:79 | &... | cfg.swift:263:79:263:79 |  |  |
+| cfg.swift:263:79:263:79 | .appendLiteral(_:) | cfg.swift:263:79:263:79 | $interpolation |  |
+| cfg.swift:263:79:263:79 | call to appendLiteral(_:) | cfg.swift:263:10:263:10 | TapExpr |  |
+| cfg.swift:266:1:297:1 | enter testSubscriptExpr() | cfg.swift:266:1:297:1 | testSubscriptExpr() |  |
+| cfg.swift:266:1:297:1 | exit testSubscriptExpr() (normal) | cfg.swift:266:1:297:1 | exit testSubscriptExpr() |  |
+| cfg.swift:266:1:297:1 | testSubscriptExpr() | cfg.swift:267:7:267:7 | a |  |
+| cfg.swift:267:3:267:44 | var ... = ... | cfg.swift:268:3:268:3 | a |  |
+| cfg.swift:267:7:267:7 | a | cfg.swift:267:12:267:12 | 0 | match |
+| cfg.swift:267:11:267:44 | [...] | cfg.swift:267:3:267:44 | var ... = ... |  |
+| cfg.swift:267:12:267:12 | 0 | cfg.swift:267:15:267:15 | 1 |  |
+| cfg.swift:267:15:267:15 | 1 | cfg.swift:267:18:267:18 | 2 |  |
+| cfg.swift:267:18:267:18 | 2 | cfg.swift:267:21:267:21 | 3 |  |
+| cfg.swift:267:21:267:21 | 3 | cfg.swift:267:24:267:24 | 4 |  |
+| cfg.swift:267:24:267:24 | 4 | cfg.swift:267:27:267:27 | 5 |  |
+| cfg.swift:267:27:267:27 | 5 | cfg.swift:267:30:267:30 | 6 |  |
+| cfg.swift:267:30:267:30 | 6 | cfg.swift:267:33:267:33 | 7 |  |
+| cfg.swift:267:33:267:33 | 7 | cfg.swift:267:36:267:36 | 8 |  |
+| cfg.swift:267:36:267:36 | 8 | cfg.swift:267:39:267:39 | 9 |  |
+| cfg.swift:267:39:267:39 | 9 | cfg.swift:267:42:267:42 | 10 |  |
+| cfg.swift:267:42:267:42 | 10 | cfg.swift:267:11:267:44 | [...] |  |
+| cfg.swift:268:3:268:3 | &... | cfg.swift:268:5:268:5 | 0 |  |
+| cfg.swift:268:3:268:3 | a | cfg.swift:268:3:268:3 | &... |  |
+| cfg.swift:268:3:268:6 | ...[...] | cfg.swift:268:10:268:10 | 0 |  |
+| cfg.swift:268:3:268:10 | setter for  ... = ... | cfg.swift:269:8:269:8 | .+=(_:_:) |  |
+| cfg.swift:268:5:268:5 | 0 | cfg.swift:268:3:268:6 | ...[...] |  |
+| cfg.swift:268:10:268:10 | 0 | cfg.swift:268:3:268:10 | setter for  ... = ... |  |
+| cfg.swift:269:3:269:3 | &... | cfg.swift:269:5:269:5 | 1 |  |
+| cfg.swift:269:3:269:3 | a | cfg.swift:269:3:269:3 | &... |  |
+| cfg.swift:269:3:269:6 | &... | cfg.swift:269:11:269:11 | 1 |  |
+| cfg.swift:269:3:269:6 | getter for ...[...] | cfg.swift:269:3:269:6 | &... |  |
+| cfg.swift:269:3:269:11 | ... .+=(_:_:) ... | cfg.swift:270:8:270:8 | .-=(_:_:) |  |
+| cfg.swift:269:5:269:5 | 1 | cfg.swift:269:3:269:6 | getter for ...[...] |  |
+| cfg.swift:269:8:269:8 | .+=(_:_:) | cfg.swift:269:8:269:8 | Int.Type |  |
+| cfg.swift:269:8:269:8 | Int.Type | cfg.swift:269:3:269:3 | a |  |
+| cfg.swift:269:11:269:11 | 1 | cfg.swift:269:3:269:11 | ... .+=(_:_:) ... |  |
+| cfg.swift:270:3:270:3 | &... | cfg.swift:270:5:270:5 | 2 |  |
+| cfg.swift:270:3:270:3 | a | cfg.swift:270:3:270:3 | &... |  |
+| cfg.swift:270:3:270:6 | &... | cfg.swift:270:11:270:11 | 1 |  |
+| cfg.swift:270:3:270:6 | getter for ...[...] | cfg.swift:270:3:270:6 | &... |  |
+| cfg.swift:270:3:270:11 | ... .-=(_:_:) ... | cfg.swift:271:8:271:8 | .*=(_:_:) |  |
+| cfg.swift:270:5:270:5 | 2 | cfg.swift:270:3:270:6 | getter for ...[...] |  |
+| cfg.swift:270:8:270:8 | .-=(_:_:) | cfg.swift:270:8:270:8 | Int.Type |  |
+| cfg.swift:270:8:270:8 | Int.Type | cfg.swift:270:3:270:3 | a |  |
+| cfg.swift:270:11:270:11 | 1 | cfg.swift:270:3:270:11 | ... .-=(_:_:) ... |  |
+| cfg.swift:271:3:271:3 | &... | cfg.swift:271:5:271:5 | 3 |  |
+| cfg.swift:271:3:271:3 | a | cfg.swift:271:3:271:3 | &... |  |
+| cfg.swift:271:3:271:6 | &... | cfg.swift:271:11:271:11 | 1 |  |
+| cfg.swift:271:3:271:6 | getter for ...[...] | cfg.swift:271:3:271:6 | &... |  |
+| cfg.swift:271:3:271:11 | ... .*=(_:_:) ... | cfg.swift:272:8:272:8 | ./=(_:_:) |  |
+| cfg.swift:271:5:271:5 | 3 | cfg.swift:271:3:271:6 | getter for ...[...] |  |
+| cfg.swift:271:8:271:8 | .*=(_:_:) | cfg.swift:271:8:271:8 | Int.Type |  |
+| cfg.swift:271:8:271:8 | Int.Type | cfg.swift:271:3:271:3 | a |  |
+| cfg.swift:271:11:271:11 | 1 | cfg.swift:271:3:271:11 | ... .*=(_:_:) ... |  |
+| cfg.swift:272:3:272:3 | &... | cfg.swift:272:5:272:5 | 4 |  |
+| cfg.swift:272:3:272:3 | a | cfg.swift:272:3:272:3 | &... |  |
+| cfg.swift:272:3:272:6 | &... | cfg.swift:272:11:272:11 | 1 |  |
+| cfg.swift:272:3:272:6 | getter for ...[...] | cfg.swift:272:3:272:6 | &... |  |
+| cfg.swift:272:3:272:11 | ... ./=(_:_:) ... | cfg.swift:273:8:273:8 | .%=(_:_:) |  |
+| cfg.swift:272:5:272:5 | 4 | cfg.swift:272:3:272:6 | getter for ...[...] |  |
+| cfg.swift:272:8:272:8 | ./=(_:_:) | cfg.swift:272:8:272:8 | Int.Type |  |
+| cfg.swift:272:8:272:8 | Int.Type | cfg.swift:272:3:272:3 | a |  |
+| cfg.swift:272:11:272:11 | 1 | cfg.swift:272:3:272:11 | ... ./=(_:_:) ... |  |
+| cfg.swift:273:3:273:3 | &... | cfg.swift:273:5:273:5 | 5 |  |
+| cfg.swift:273:3:273:3 | a | cfg.swift:273:3:273:3 | &... |  |
+| cfg.swift:273:3:273:6 | &... | cfg.swift:273:11:273:11 | 1 |  |
+| cfg.swift:273:3:273:6 | getter for ...[...] | cfg.swift:273:3:273:6 | &... |  |
+| cfg.swift:273:3:273:11 | ... .%=(_:_:) ... | cfg.swift:274:8:274:8 | .&=(_:_:) |  |
+| cfg.swift:273:5:273:5 | 5 | cfg.swift:273:3:273:6 | getter for ...[...] |  |
+| cfg.swift:273:8:273:8 | .%=(_:_:) | cfg.swift:273:8:273:8 | Int.Type |  |
+| cfg.swift:273:8:273:8 | Int.Type | cfg.swift:273:3:273:3 | a |  |
+| cfg.swift:273:11:273:11 | 1 | cfg.swift:273:3:273:11 | ... .%=(_:_:) ... |  |
+| cfg.swift:274:3:274:3 | &... | cfg.swift:274:5:274:5 | 6 |  |
+| cfg.swift:274:3:274:3 | a | cfg.swift:274:3:274:3 | &... |  |
+| cfg.swift:274:3:274:6 | &... | cfg.swift:274:11:274:11 | 1 |  |
+| cfg.swift:274:3:274:6 | getter for ...[...] | cfg.swift:274:3:274:6 | &... |  |
+| cfg.swift:274:3:274:11 | ... .&=(_:_:) ... | cfg.swift:275:8:275:8 | .\|=(_:_:) |  |
+| cfg.swift:274:5:274:5 | 6 | cfg.swift:274:3:274:6 | getter for ...[...] |  |
+| cfg.swift:274:8:274:8 | .&=(_:_:) | cfg.swift:274:8:274:8 | Int.Type |  |
+| cfg.swift:274:8:274:8 | Int.Type | cfg.swift:274:3:274:3 | a |  |
+| cfg.swift:274:11:274:11 | 1 | cfg.swift:274:3:274:11 | ... .&=(_:_:) ... |  |
+| cfg.swift:275:3:275:3 | &... | cfg.swift:275:5:275:5 | 7 |  |
+| cfg.swift:275:3:275:3 | a | cfg.swift:275:3:275:3 | &... |  |
+| cfg.swift:275:3:275:6 | &... | cfg.swift:275:11:275:11 | 1 |  |
+| cfg.swift:275:3:275:6 | getter for ...[...] | cfg.swift:275:3:275:6 | &... |  |
+| cfg.swift:275:3:275:11 | ... .\|=(_:_:) ... | cfg.swift:276:8:276:8 | .^=(_:_:) |  |
+| cfg.swift:275:5:275:5 | 7 | cfg.swift:275:3:275:6 | getter for ...[...] |  |
+| cfg.swift:275:8:275:8 | .\|=(_:_:) | cfg.swift:275:8:275:8 | Int.Type |  |
+| cfg.swift:275:8:275:8 | Int.Type | cfg.swift:275:3:275:3 | a |  |
+| cfg.swift:275:11:275:11 | 1 | cfg.swift:275:3:275:11 | ... .\|=(_:_:) ... |  |
+| cfg.swift:276:3:276:3 | &... | cfg.swift:276:5:276:5 | 8 |  |
+| cfg.swift:276:3:276:3 | a | cfg.swift:276:3:276:3 | &... |  |
+| cfg.swift:276:3:276:6 | &... | cfg.swift:276:11:276:11 | 1 |  |
+| cfg.swift:276:3:276:6 | getter for ...[...] | cfg.swift:276:3:276:6 | &... |  |
+| cfg.swift:276:3:276:11 | ... .^=(_:_:) ... | cfg.swift:277:8:277:8 | .<<=(_:_:) |  |
+| cfg.swift:276:5:276:5 | 8 | cfg.swift:276:3:276:6 | getter for ...[...] |  |
+| cfg.swift:276:8:276:8 | .^=(_:_:) | cfg.swift:276:8:276:8 | Int.Type |  |
+| cfg.swift:276:8:276:8 | Int.Type | cfg.swift:276:3:276:3 | a |  |
+| cfg.swift:276:11:276:11 | 1 | cfg.swift:276:3:276:11 | ... .^=(_:_:) ... |  |
+| cfg.swift:277:3:277:3 | &... | cfg.swift:277:5:277:5 | 9 |  |
+| cfg.swift:277:3:277:3 | a | cfg.swift:277:3:277:3 | &... |  |
+| cfg.swift:277:3:277:6 | &... | cfg.swift:277:12:277:12 | 1 |  |
+| cfg.swift:277:3:277:6 | getter for ...[...] | cfg.swift:277:3:277:6 | &... |  |
+| cfg.swift:277:3:277:12 | ... .<<=(_:_:) ... | cfg.swift:278:9:278:9 | .>>=(_:_:) |  |
+| cfg.swift:277:5:277:5 | 9 | cfg.swift:277:3:277:6 | getter for ...[...] |  |
+| cfg.swift:277:8:277:8 | .<<=(_:_:) | cfg.swift:277:8:277:8 | Int.Type |  |
+| cfg.swift:277:8:277:8 | Int.Type | cfg.swift:277:3:277:3 | a |  |
+| cfg.swift:277:12:277:12 | 1 | cfg.swift:277:3:277:12 | ... .<<=(_:_:) ... |  |
+| cfg.swift:278:3:278:3 | &... | cfg.swift:278:5:278:5 | 10 |  |
+| cfg.swift:278:3:278:3 | a | cfg.swift:278:3:278:3 | &... |  |
+| cfg.swift:278:3:278:7 | &... | cfg.swift:278:13:278:13 | 1 |  |
+| cfg.swift:278:3:278:7 | getter for ...[...] | cfg.swift:278:3:278:7 | &... |  |
+| cfg.swift:278:3:278:13 | ... .>>=(_:_:) ... | cfg.swift:280:7:280:7 | tupleWithA |  |
+| cfg.swift:278:5:278:5 | 10 | cfg.swift:278:3:278:7 | getter for ...[...] |  |
+| cfg.swift:278:9:278:9 | .>>=(_:_:) | cfg.swift:278:9:278:9 | Int.Type |  |
+| cfg.swift:278:9:278:9 | Int.Type | cfg.swift:278:3:278:3 | a |  |
+| cfg.swift:278:13:278:13 | 1 | cfg.swift:278:3:278:13 | ... .>>=(_:_:) ... |  |
+| cfg.swift:280:3:280:49 | var ... = ... | cfg.swift:282:7:282:7 | b |  |
+| cfg.swift:280:7:280:7 | tupleWithA | cfg.swift:280:21:280:21 | a | match |
+| cfg.swift:280:20:280:49 | (...) | cfg.swift:280:3:280:49 | var ... = ... |  |
+| cfg.swift:280:21:280:21 | &... | cfg.swift:280:23:280:23 | 0 |  |
+| cfg.swift:280:21:280:21 | a | cfg.swift:280:21:280:21 | &... |  |
+| cfg.swift:280:21:280:24 | (Int) ... | cfg.swift:280:27:280:27 | a |  |
+| cfg.swift:280:21:280:24 | getter for ...[...] | cfg.swift:280:21:280:24 | (Int) ... |  |
+| cfg.swift:280:23:280:23 | 0 | cfg.swift:280:21:280:24 | getter for ...[...] |  |
+| cfg.swift:280:27:280:27 | &... | cfg.swift:280:29:280:29 | 1 |  |
+| cfg.swift:280:27:280:27 | a | cfg.swift:280:27:280:27 | &... |  |
+| cfg.swift:280:27:280:30 | (Int) ... | cfg.swift:280:33:280:33 | a |  |
+| cfg.swift:280:27:280:30 | getter for ...[...] | cfg.swift:280:27:280:30 | (Int) ... |  |
+| cfg.swift:280:29:280:29 | 1 | cfg.swift:280:27:280:30 | getter for ...[...] |  |
+| cfg.swift:280:33:280:33 | &... | cfg.swift:280:35:280:35 | 2 |  |
+| cfg.swift:280:33:280:33 | a | cfg.swift:280:33:280:33 | &... |  |
+| cfg.swift:280:33:280:36 | (Int) ... | cfg.swift:280:39:280:39 | a |  |
+| cfg.swift:280:33:280:36 | getter for ...[...] | cfg.swift:280:33:280:36 | (Int) ... |  |
+| cfg.swift:280:35:280:35 | 2 | cfg.swift:280:33:280:36 | getter for ...[...] |  |
+| cfg.swift:280:39:280:39 | &... | cfg.swift:280:41:280:41 | 3 |  |
+| cfg.swift:280:39:280:39 | a | cfg.swift:280:39:280:39 | &... |  |
+| cfg.swift:280:39:280:42 | (Int) ... | cfg.swift:280:45:280:45 | a |  |
+| cfg.swift:280:39:280:42 | getter for ...[...] | cfg.swift:280:39:280:42 | (Int) ... |  |
+| cfg.swift:280:41:280:41 | 3 | cfg.swift:280:39:280:42 | getter for ...[...] |  |
+| cfg.swift:280:45:280:45 | &... | cfg.swift:280:47:280:47 | 4 |  |
+| cfg.swift:280:45:280:45 | a | cfg.swift:280:45:280:45 | &... |  |
+| cfg.swift:280:45:280:48 | (Int) ... | cfg.swift:280:20:280:49 | (...) |  |
+| cfg.swift:280:45:280:48 | getter for ...[...] | cfg.swift:280:45:280:48 | (Int) ... |  |
+| cfg.swift:280:47:280:47 | 4 | cfg.swift:280:45:280:48 | getter for ...[...] |  |
+| cfg.swift:282:3:282:48 | var ... = ... | cfg.swift:283:3:283:3 | b |  |
+| cfg.swift:282:7:282:7 | b | cfg.swift:282:12:282:12 | 0 | match |
+| cfg.swift:282:11:282:48 | [...] | cfg.swift:282:3:282:48 | var ... = ... |  |
+| cfg.swift:282:12:282:12 | 0 | cfg.swift:282:15:282:15 | 1 |  |
+| cfg.swift:282:15:282:15 | 1 | cfg.swift:282:18:282:18 | 2 |  |
+| cfg.swift:282:18:282:18 | 2 | cfg.swift:282:21:282:21 | 3 |  |
+| cfg.swift:282:21:282:21 | 3 | cfg.swift:282:24:282:24 | 4 |  |
+| cfg.swift:282:24:282:24 | 4 | cfg.swift:282:27:282:27 | 5 |  |
+| cfg.swift:282:27:282:27 | 5 | cfg.swift:282:30:282:30 | 6 |  |
+| cfg.swift:282:30:282:30 | 6 | cfg.swift:282:33:282:33 | 7 |  |
+| cfg.swift:282:33:282:33 | 7 | cfg.swift:282:36:282:36 | 8 |  |
+| cfg.swift:282:36:282:36 | 8 | cfg.swift:282:39:282:39 | 9 |  |
+| cfg.swift:282:39:282:39 | 9 | cfg.swift:282:42:282:42 | 10 |  |
+| cfg.swift:282:42:282:42 | 10 | cfg.swift:282:46:282:46 | 11 |  |
+| cfg.swift:282:46:282:46 | 11 | cfg.swift:282:11:282:48 | [...] |  |
+| cfg.swift:283:3:283:3 | &... | cfg.swift:283:5:283:5 | 0 |  |
+| cfg.swift:283:3:283:3 | b | cfg.swift:283:3:283:3 | &... |  |
+| cfg.swift:283:3:283:6 | ...[...] | cfg.swift:283:10:283:10 | a |  |
+| cfg.swift:283:3:283:14 | setter for  ... = ... | cfg.swift:284:3:284:3 | b |  |
+| cfg.swift:283:5:283:5 | 0 | cfg.swift:283:3:283:6 | ...[...] |  |
+| cfg.swift:283:10:283:10 | &... | cfg.swift:283:12:283:12 | 10 |  |
+| cfg.swift:283:10:283:10 | a | cfg.swift:283:10:283:10 | &... |  |
+| cfg.swift:283:10:283:14 | (Int) ... | cfg.swift:283:3:283:14 | setter for  ... = ... |  |
+| cfg.swift:283:10:283:14 | getter for ...[...] | cfg.swift:283:10:283:14 | (Int) ... |  |
+| cfg.swift:283:12:283:12 | 10 | cfg.swift:283:10:283:14 | getter for ...[...] |  |
+| cfg.swift:284:3:284:3 | &... | cfg.swift:284:5:284:5 | 1 |  |
+| cfg.swift:284:3:284:3 | b | cfg.swift:284:3:284:3 | &... |  |
+| cfg.swift:284:3:284:6 | ...[...] | cfg.swift:284:15:284:15 | .+(_:_:) |  |
+| cfg.swift:284:3:284:17 | setter for  ... = ... | cfg.swift:285:3:285:3 | b |  |
+| cfg.swift:284:5:284:5 | 1 | cfg.swift:284:3:284:6 | ...[...] |  |
+| cfg.swift:284:10:284:10 | &... | cfg.swift:284:12:284:12 | 0 |  |
+| cfg.swift:284:10:284:10 | b | cfg.swift:284:10:284:10 | &... |  |
+| cfg.swift:284:10:284:13 | (Int) ... | cfg.swift:284:17:284:17 | 1 |  |
+| cfg.swift:284:10:284:13 | getter for ...[...] | cfg.swift:284:10:284:13 | (Int) ... |  |
+| cfg.swift:284:10:284:17 | ... .+(_:_:) ... | cfg.swift:284:3:284:17 | setter for  ... = ... |  |
+| cfg.swift:284:12:284:12 | 0 | cfg.swift:284:10:284:13 | getter for ...[...] |  |
+| cfg.swift:284:15:284:15 | .+(_:_:) | cfg.swift:284:15:284:15 | Int.Type |  |
+| cfg.swift:284:15:284:15 | Int.Type | cfg.swift:284:10:284:10 | b |  |
+| cfg.swift:284:17:284:17 | 1 | cfg.swift:284:10:284:17 | ... .+(_:_:) ... |  |
+| cfg.swift:285:3:285:3 | &... | cfg.swift:285:5:285:5 | 2 |  |
+| cfg.swift:285:3:285:3 | b | cfg.swift:285:3:285:3 | &... |  |
+| cfg.swift:285:3:285:6 | ...[...] | cfg.swift:285:15:285:15 | .-(_:_:) |  |
+| cfg.swift:285:3:285:17 | setter for  ... = ... | cfg.swift:286:3:286:3 | b |  |
+| cfg.swift:285:5:285:5 | 2 | cfg.swift:285:3:285:6 | ...[...] |  |
+| cfg.swift:285:10:285:10 | &... | cfg.swift:285:12:285:12 | 1 |  |
+| cfg.swift:285:10:285:10 | b | cfg.swift:285:10:285:10 | &... |  |
+| cfg.swift:285:10:285:13 | (Int) ... | cfg.swift:285:17:285:17 | 1 |  |
+| cfg.swift:285:10:285:13 | getter for ...[...] | cfg.swift:285:10:285:13 | (Int) ... |  |
+| cfg.swift:285:10:285:17 | ... .-(_:_:) ... | cfg.swift:285:3:285:17 | setter for  ... = ... |  |
+| cfg.swift:285:12:285:12 | 1 | cfg.swift:285:10:285:13 | getter for ...[...] |  |
+| cfg.swift:285:15:285:15 | .-(_:_:) | cfg.swift:285:15:285:15 | Int.Type |  |
+| cfg.swift:285:15:285:15 | Int.Type | cfg.swift:285:10:285:10 | b |  |
+| cfg.swift:285:17:285:17 | 1 | cfg.swift:285:10:285:17 | ... .-(_:_:) ... |  |
+| cfg.swift:286:3:286:3 | &... | cfg.swift:286:5:286:5 | 3 |  |
+| cfg.swift:286:3:286:3 | b | cfg.swift:286:3:286:3 | &... |  |
+| cfg.swift:286:3:286:6 | ...[...] | cfg.swift:286:15:286:15 | .*(_:_:) |  |
+| cfg.swift:286:3:286:17 | setter for  ... = ... | cfg.swift:287:3:287:3 | b |  |
+| cfg.swift:286:5:286:5 | 3 | cfg.swift:286:3:286:6 | ...[...] |  |
+| cfg.swift:286:10:286:10 | &... | cfg.swift:286:12:286:12 | 2 |  |
+| cfg.swift:286:10:286:10 | b | cfg.swift:286:10:286:10 | &... |  |
+| cfg.swift:286:10:286:13 | (Int) ... | cfg.swift:286:17:286:17 | 1 |  |
+| cfg.swift:286:10:286:13 | getter for ...[...] | cfg.swift:286:10:286:13 | (Int) ... |  |
+| cfg.swift:286:10:286:17 | ... .*(_:_:) ... | cfg.swift:286:3:286:17 | setter for  ... = ... |  |
+| cfg.swift:286:12:286:12 | 2 | cfg.swift:286:10:286:13 | getter for ...[...] |  |
+| cfg.swift:286:15:286:15 | .*(_:_:) | cfg.swift:286:15:286:15 | Int.Type |  |
+| cfg.swift:286:15:286:15 | Int.Type | cfg.swift:286:10:286:10 | b |  |
+| cfg.swift:286:17:286:17 | 1 | cfg.swift:286:10:286:17 | ... .*(_:_:) ... |  |
+| cfg.swift:287:3:287:3 | &... | cfg.swift:287:5:287:5 | 4 |  |
+| cfg.swift:287:3:287:3 | b | cfg.swift:287:3:287:3 | &... |  |
+| cfg.swift:287:3:287:6 | ...[...] | cfg.swift:287:15:287:15 | ./(_:_:) |  |
+| cfg.swift:287:3:287:17 | setter for  ... = ... | cfg.swift:288:3:288:3 | b |  |
+| cfg.swift:287:5:287:5 | 4 | cfg.swift:287:3:287:6 | ...[...] |  |
+| cfg.swift:287:10:287:10 | &... | cfg.swift:287:12:287:12 | 3 |  |
+| cfg.swift:287:10:287:10 | b | cfg.swift:287:10:287:10 | &... |  |
+| cfg.swift:287:10:287:13 | (Int) ... | cfg.swift:287:17:287:17 | 1 |  |
+| cfg.swift:287:10:287:13 | getter for ...[...] | cfg.swift:287:10:287:13 | (Int) ... |  |
+| cfg.swift:287:10:287:17 | ... ./(_:_:) ... | cfg.swift:287:3:287:17 | setter for  ... = ... |  |
+| cfg.swift:287:12:287:12 | 3 | cfg.swift:287:10:287:13 | getter for ...[...] |  |
+| cfg.swift:287:15:287:15 | ./(_:_:) | cfg.swift:287:15:287:15 | Int.Type |  |
+| cfg.swift:287:15:287:15 | Int.Type | cfg.swift:287:10:287:10 | b |  |
+| cfg.swift:287:17:287:17 | 1 | cfg.swift:287:10:287:17 | ... ./(_:_:) ... |  |
+| cfg.swift:288:3:288:3 | &... | cfg.swift:288:5:288:5 | 5 |  |
+| cfg.swift:288:3:288:3 | b | cfg.swift:288:3:288:3 | &... |  |
+| cfg.swift:288:3:288:6 | ...[...] | cfg.swift:288:15:288:15 | .%(_:_:) |  |
+| cfg.swift:288:3:288:17 | setter for  ... = ... | cfg.swift:289:3:289:3 | b |  |
+| cfg.swift:288:5:288:5 | 5 | cfg.swift:288:3:288:6 | ...[...] |  |
+| cfg.swift:288:10:288:10 | &... | cfg.swift:288:12:288:12 | 4 |  |
+| cfg.swift:288:10:288:10 | b | cfg.swift:288:10:288:10 | &... |  |
+| cfg.swift:288:10:288:13 | (Int) ... | cfg.swift:288:17:288:17 | 1 |  |
+| cfg.swift:288:10:288:13 | getter for ...[...] | cfg.swift:288:10:288:13 | (Int) ... |  |
+| cfg.swift:288:10:288:17 | ... .%(_:_:) ... | cfg.swift:288:3:288:17 | setter for  ... = ... |  |
+| cfg.swift:288:12:288:12 | 4 | cfg.swift:288:10:288:13 | getter for ...[...] |  |
+| cfg.swift:288:15:288:15 | .%(_:_:) | cfg.swift:288:15:288:15 | Int.Type |  |
+| cfg.swift:288:15:288:15 | Int.Type | cfg.swift:288:10:288:10 | b |  |
+| cfg.swift:288:17:288:17 | 1 | cfg.swift:288:10:288:17 | ... .%(_:_:) ... |  |
+| cfg.swift:289:3:289:3 | &... | cfg.swift:289:5:289:5 | 6 |  |
+| cfg.swift:289:3:289:3 | b | cfg.swift:289:3:289:3 | &... |  |
+| cfg.swift:289:3:289:6 | ...[...] | cfg.swift:289:15:289:15 | .&(_:_:) |  |
+| cfg.swift:289:3:289:17 | setter for  ... = ... | cfg.swift:290:3:290:3 | b |  |
+| cfg.swift:289:5:289:5 | 6 | cfg.swift:289:3:289:6 | ...[...] |  |
+| cfg.swift:289:10:289:10 | &... | cfg.swift:289:12:289:12 | 5 |  |
+| cfg.swift:289:10:289:10 | b | cfg.swift:289:10:289:10 | &... |  |
+| cfg.swift:289:10:289:13 | (Int) ... | cfg.swift:289:17:289:17 | 1 |  |
+| cfg.swift:289:10:289:13 | getter for ...[...] | cfg.swift:289:10:289:13 | (Int) ... |  |
+| cfg.swift:289:10:289:17 | ... .&(_:_:) ... | cfg.swift:289:3:289:17 | setter for  ... = ... |  |
+| cfg.swift:289:12:289:12 | 5 | cfg.swift:289:10:289:13 | getter for ...[...] |  |
+| cfg.swift:289:15:289:15 | .&(_:_:) | cfg.swift:289:15:289:15 | Int.Type |  |
+| cfg.swift:289:15:289:15 | Int.Type | cfg.swift:289:10:289:10 | b |  |
+| cfg.swift:289:17:289:17 | 1 | cfg.swift:289:10:289:17 | ... .&(_:_:) ... |  |
+| cfg.swift:290:3:290:3 | &... | cfg.swift:290:5:290:5 | 7 |  |
+| cfg.swift:290:3:290:3 | b | cfg.swift:290:3:290:3 | &... |  |
+| cfg.swift:290:3:290:6 | ...[...] | cfg.swift:290:15:290:15 | .\|(_:_:) |  |
+| cfg.swift:290:3:290:17 | setter for  ... = ... | cfg.swift:291:3:291:3 | b |  |
+| cfg.swift:290:5:290:5 | 7 | cfg.swift:290:3:290:6 | ...[...] |  |
+| cfg.swift:290:10:290:10 | &... | cfg.swift:290:12:290:12 | 6 |  |
+| cfg.swift:290:10:290:10 | b | cfg.swift:290:10:290:10 | &... |  |
+| cfg.swift:290:10:290:13 | (Int) ... | cfg.swift:290:17:290:17 | 1 |  |
+| cfg.swift:290:10:290:13 | getter for ...[...] | cfg.swift:290:10:290:13 | (Int) ... |  |
+| cfg.swift:290:10:290:17 | ... .\|(_:_:) ... | cfg.swift:290:3:290:17 | setter for  ... = ... |  |
+| cfg.swift:290:12:290:12 | 6 | cfg.swift:290:10:290:13 | getter for ...[...] |  |
+| cfg.swift:290:15:290:15 | .\|(_:_:) | cfg.swift:290:15:290:15 | Int.Type |  |
+| cfg.swift:290:15:290:15 | Int.Type | cfg.swift:290:10:290:10 | b |  |
+| cfg.swift:290:17:290:17 | 1 | cfg.swift:290:10:290:17 | ... .\|(_:_:) ... |  |
+| cfg.swift:291:3:291:3 | &... | cfg.swift:291:5:291:5 | 8 |  |
+| cfg.swift:291:3:291:3 | b | cfg.swift:291:3:291:3 | &... |  |
+| cfg.swift:291:3:291:6 | ...[...] | cfg.swift:291:15:291:15 | .^(_:_:) |  |
+| cfg.swift:291:3:291:17 | setter for  ... = ... | cfg.swift:292:3:292:3 | b |  |
+| cfg.swift:291:5:291:5 | 8 | cfg.swift:291:3:291:6 | ...[...] |  |
+| cfg.swift:291:10:291:10 | &... | cfg.swift:291:12:291:12 | 7 |  |
+| cfg.swift:291:10:291:10 | b | cfg.swift:291:10:291:10 | &... |  |
+| cfg.swift:291:10:291:13 | (Int) ... | cfg.swift:291:17:291:17 | 1 |  |
+| cfg.swift:291:10:291:13 | getter for ...[...] | cfg.swift:291:10:291:13 | (Int) ... |  |
+| cfg.swift:291:10:291:17 | ... .^(_:_:) ... | cfg.swift:291:3:291:17 | setter for  ... = ... |  |
+| cfg.swift:291:12:291:12 | 7 | cfg.swift:291:10:291:13 | getter for ...[...] |  |
+| cfg.swift:291:15:291:15 | .^(_:_:) | cfg.swift:291:15:291:15 | Int.Type |  |
+| cfg.swift:291:15:291:15 | Int.Type | cfg.swift:291:10:291:10 | b |  |
+| cfg.swift:291:17:291:17 | 1 | cfg.swift:291:10:291:17 | ... .^(_:_:) ... |  |
+| cfg.swift:292:3:292:3 | &... | cfg.swift:292:5:292:5 | 9 |  |
+| cfg.swift:292:3:292:3 | b | cfg.swift:292:3:292:3 | &... |  |
+| cfg.swift:292:3:292:6 | ...[...] | cfg.swift:292:15:292:15 | .<<(_:_:) |  |
+| cfg.swift:292:3:292:18 | setter for  ... = ... | cfg.swift:293:3:293:3 | b |  |
+| cfg.swift:292:5:292:5 | 9 | cfg.swift:292:3:292:6 | ...[...] |  |
+| cfg.swift:292:10:292:10 | &... | cfg.swift:292:12:292:12 | 8 |  |
+| cfg.swift:292:10:292:10 | b | cfg.swift:292:10:292:10 | &... |  |
+| cfg.swift:292:10:292:13 | (Int) ... | cfg.swift:292:18:292:18 | 1 |  |
+| cfg.swift:292:10:292:13 | getter for ...[...] | cfg.swift:292:10:292:13 | (Int) ... |  |
+| cfg.swift:292:10:292:18 | ... .<<(_:_:) ... | cfg.swift:292:3:292:18 | setter for  ... = ... |  |
+| cfg.swift:292:12:292:12 | 8 | cfg.swift:292:10:292:13 | getter for ...[...] |  |
+| cfg.swift:292:15:292:15 | .<<(_:_:) | cfg.swift:292:15:292:15 | Int.Type |  |
+| cfg.swift:292:15:292:15 | Int.Type | cfg.swift:292:10:292:10 | b |  |
+| cfg.swift:292:18:292:18 | 1 | cfg.swift:292:10:292:18 | ... .<<(_:_:) ... |  |
+| cfg.swift:293:3:293:3 | &... | cfg.swift:293:5:293:5 | 10 |  |
+| cfg.swift:293:3:293:3 | b | cfg.swift:293:3:293:3 | &... |  |
+| cfg.swift:293:3:293:7 | ...[...] | cfg.swift:293:16:293:16 | .>>(_:_:) |  |
+| cfg.swift:293:3:293:19 | setter for  ... = ... | cfg.swift:295:7:295:26 | (...) |  |
+| cfg.swift:293:5:293:5 | 10 | cfg.swift:293:3:293:7 | ...[...] |  |
+| cfg.swift:293:11:293:11 | &... | cfg.swift:293:13:293:13 | 9 |  |
+| cfg.swift:293:11:293:11 | b | cfg.swift:293:11:293:11 | &... |  |
+| cfg.swift:293:11:293:14 | (Int) ... | cfg.swift:293:19:293:19 | 1 |  |
+| cfg.swift:293:11:293:14 | getter for ...[...] | cfg.swift:293:11:293:14 | (Int) ... |  |
+| cfg.swift:293:11:293:19 | ... .>>(_:_:) ... | cfg.swift:293:3:293:19 | setter for  ... = ... |  |
+| cfg.swift:293:13:293:13 | 9 | cfg.swift:293:11:293:14 | getter for ...[...] |  |
+| cfg.swift:293:16:293:16 | .>>(_:_:) | cfg.swift:293:16:293:16 | Int.Type |  |
+| cfg.swift:293:16:293:16 | Int.Type | cfg.swift:293:11:293:11 | b |  |
+| cfg.swift:293:19:293:19 | 1 | cfg.swift:293:11:293:19 | ... .>>(_:_:) ... |  |
+| cfg.swift:295:3:295:30 | var ... = ... | cfg.swift:296:14:296:14 | .+(_:_:) |  |
+| cfg.swift:295:7:295:26 | (...) | cfg.swift:295:8:295:8 | a1 |  |
+| cfg.swift:295:8:295:8 | a1 | cfg.swift:295:12:295:12 | a2 | match |
+| cfg.swift:295:12:295:12 | a2 | cfg.swift:295:16:295:16 | a3 | match |
+| cfg.swift:295:16:295:16 | a3 | cfg.swift:295:20:295:20 | a4 | match |
+| cfg.swift:295:20:295:20 | a4 | cfg.swift:295:24:295:24 | a5 | match |
+| cfg.swift:295:24:295:24 | a5 | cfg.swift:295:30:295:30 | tupleWithA | match |
+| cfg.swift:295:30:295:30 | ((Int, Int, Int, Int, Int)) ... | cfg.swift:295:3:295:30 | var ... = ... |  |
+| cfg.swift:295:30:295:30 | tupleWithA | cfg.swift:295:30:295:30 | ((Int, Int, Int, Int, Int)) ... |  |
+| cfg.swift:296:3:296:64 | return ... | cfg.swift:266:1:297:1 | exit testSubscriptExpr() (normal) | return |
+| cfg.swift:296:10:296:64 | (...) | cfg.swift:296:3:296:64 | return ... |  |
+| cfg.swift:296:11:296:11 | a1 | cfg.swift:296:16:296:16 | b |  |
+| cfg.swift:296:11:296:19 | ... .+(_:_:) ... | cfg.swift:296:25:296:25 | .+(_:_:) |  |
+| cfg.swift:296:14:296:14 | .+(_:_:) | cfg.swift:296:14:296:14 | Int.Type |  |
+| cfg.swift:296:14:296:14 | Int.Type | cfg.swift:296:11:296:11 | a1 |  |
+| cfg.swift:296:16:296:16 | &... | cfg.swift:296:18:296:18 | 0 |  |
+| cfg.swift:296:16:296:16 | b | cfg.swift:296:16:296:16 | &... |  |
+| cfg.swift:296:16:296:19 | (Int) ... | cfg.swift:296:11:296:19 | ... .+(_:_:) ... |  |
+| cfg.swift:296:16:296:19 | getter for ...[...] | cfg.swift:296:16:296:19 | (Int) ... |  |
+| cfg.swift:296:18:296:18 | 0 | cfg.swift:296:16:296:19 | getter for ...[...] |  |
+| cfg.swift:296:22:296:22 | a2 | cfg.swift:296:27:296:27 | b |  |
+| cfg.swift:296:22:296:30 | ... .+(_:_:) ... | cfg.swift:296:36:296:36 | .+(_:_:) |  |
+| cfg.swift:296:25:296:25 | .+(_:_:) | cfg.swift:296:25:296:25 | Int.Type |  |
+| cfg.swift:296:25:296:25 | Int.Type | cfg.swift:296:22:296:22 | a2 |  |
+| cfg.swift:296:27:296:27 | &... | cfg.swift:296:29:296:29 | 1 |  |
+| cfg.swift:296:27:296:27 | b | cfg.swift:296:27:296:27 | &... |  |
+| cfg.swift:296:27:296:30 | (Int) ... | cfg.swift:296:22:296:30 | ... .+(_:_:) ... |  |
+| cfg.swift:296:27:296:30 | getter for ...[...] | cfg.swift:296:27:296:30 | (Int) ... |  |
+| cfg.swift:296:29:296:29 | 1 | cfg.swift:296:27:296:30 | getter for ...[...] |  |
+| cfg.swift:296:33:296:33 | a3 | cfg.swift:296:38:296:38 | b |  |
+| cfg.swift:296:33:296:41 | ... .+(_:_:) ... | cfg.swift:296:47:296:47 | .+(_:_:) |  |
+| cfg.swift:296:36:296:36 | .+(_:_:) | cfg.swift:296:36:296:36 | Int.Type |  |
+| cfg.swift:296:36:296:36 | Int.Type | cfg.swift:296:33:296:33 | a3 |  |
+| cfg.swift:296:38:296:38 | &... | cfg.swift:296:40:296:40 | 2 |  |
+| cfg.swift:296:38:296:38 | b | cfg.swift:296:38:296:38 | &... |  |
+| cfg.swift:296:38:296:41 | (Int) ... | cfg.swift:296:33:296:41 | ... .+(_:_:) ... |  |
+| cfg.swift:296:38:296:41 | getter for ...[...] | cfg.swift:296:38:296:41 | (Int) ... |  |
+| cfg.swift:296:40:296:40 | 2 | cfg.swift:296:38:296:41 | getter for ...[...] |  |
+| cfg.swift:296:44:296:44 | a4 | cfg.swift:296:49:296:49 | b |  |
+| cfg.swift:296:44:296:52 | ... .+(_:_:) ... | cfg.swift:296:58:296:58 | .+(_:_:) |  |
+| cfg.swift:296:47:296:47 | .+(_:_:) | cfg.swift:296:47:296:47 | Int.Type |  |
+| cfg.swift:296:47:296:47 | Int.Type | cfg.swift:296:44:296:44 | a4 |  |
+| cfg.swift:296:49:296:49 | &... | cfg.swift:296:51:296:51 | 3 |  |
+| cfg.swift:296:49:296:49 | b | cfg.swift:296:49:296:49 | &... |  |
+| cfg.swift:296:49:296:52 | (Int) ... | cfg.swift:296:44:296:52 | ... .+(_:_:) ... |  |
+| cfg.swift:296:49:296:52 | getter for ...[...] | cfg.swift:296:49:296:52 | (Int) ... |  |
+| cfg.swift:296:51:296:51 | 3 | cfg.swift:296:49:296:52 | getter for ...[...] |  |
+| cfg.swift:296:55:296:55 | a5 | cfg.swift:296:60:296:60 | b |  |
+| cfg.swift:296:55:296:63 | ... .+(_:_:) ... | cfg.swift:296:10:296:64 | (...) |  |
+| cfg.swift:296:58:296:58 | .+(_:_:) | cfg.swift:296:58:296:58 | Int.Type |  |
+| cfg.swift:296:58:296:58 | Int.Type | cfg.swift:296:55:296:55 | a5 |  |
+| cfg.swift:296:60:296:60 | &... | cfg.swift:296:62:296:62 | 4 |  |
+| cfg.swift:296:60:296:60 | b | cfg.swift:296:60:296:60 | &... |  |
+| cfg.swift:296:60:296:63 | (Int) ... | cfg.swift:296:55:296:63 | ... .+(_:_:) ... |  |
+| cfg.swift:296:60:296:63 | getter for ...[...] | cfg.swift:296:60:296:63 | (Int) ... |  |
+| cfg.swift:296:62:296:62 | 4 | cfg.swift:296:60:296:63 | getter for ...[...] |  |
+| cfg.swift:299:1:304:1 | enter loop1(x:) | cfg.swift:299:1:304:1 | loop1(x:) |  |
+| cfg.swift:299:1:304:1 | exit loop1(x:) (normal) | cfg.swift:299:1:304:1 | exit loop1(x:) |  |
+| cfg.swift:299:1:304:1 | loop1(x:) | cfg.swift:299:12:299:22 | x |  |
+| cfg.swift:299:12:299:22 | x | cfg.swift:300:3:303:3 | while ... { ... } |  |
+| cfg.swift:300:3:303:3 | while ... { ... } | cfg.swift:300:9:300:14 | StmtCondition |  |
+| cfg.swift:300:9:300:9 | (Int) ... | cfg.swift:300:14:300:14 | 0 |  |
+| cfg.swift:300:9:300:9 | x | cfg.swift:300:9:300:9 | (Int) ... |  |
+| cfg.swift:300:9:300:14 | ... .>=(_:_:) ... | cfg.swift:299:1:304:1 | exit loop1(x:) (normal) | false |
+| cfg.swift:300:9:300:14 | ... .>=(_:_:) ... | cfg.swift:301:5:301:5 | print(_:separator:terminator:) | true |
+| cfg.swift:300:9:300:14 | StmtCondition | cfg.swift:300:11:300:11 | .>=(_:_:) |  |
+| cfg.swift:300:11:300:11 | .>=(_:_:) | cfg.swift:300:11:300:11 | Int.Type |  |
+| cfg.swift:300:11:300:11 | Int.Type | cfg.swift:300:9:300:9 | x |  |
+| cfg.swift:300:14:300:14 | 0 | cfg.swift:300:9:300:14 | ... .>=(_:_:) ... |  |
+| cfg.swift:301:5:301:5 | print(_:separator:terminator:) | cfg.swift:301:11:301:11 | x |  |
+| cfg.swift:301:5:301:12 | call to print(_:separator:terminator:) | cfg.swift:302:7:302:7 | .-=(_:_:) |  |
+| cfg.swift:301:10:301:10 | default separator | cfg.swift:301:10:301:10 | default terminator |  |
+| cfg.swift:301:10:301:10 | default terminator | cfg.swift:301:5:301:12 | call to print(_:separator:terminator:) |  |
+| cfg.swift:301:11:301:11 | (Any) ... | cfg.swift:301:11:301:11 | [...] |  |
+| cfg.swift:301:11:301:11 | (Int) ... | cfg.swift:301:11:301:11 | (Any) ... |  |
+| cfg.swift:301:11:301:11 | [...] | cfg.swift:301:10:301:10 | default separator |  |
+| cfg.swift:301:11:301:11 | [...] | cfg.swift:301:11:301:11 | [...] |  |
+| cfg.swift:301:11:301:11 | x | cfg.swift:301:11:301:11 | (Int) ... |  |
+| cfg.swift:302:5:302:5 | &... | cfg.swift:302:10:302:10 | 1 |  |
+| cfg.swift:302:5:302:5 | x | cfg.swift:302:5:302:5 | &... |  |
+| cfg.swift:302:5:302:10 | ... .-=(_:_:) ... | cfg.swift:300:9:300:14 | StmtCondition |  |
+| cfg.swift:302:7:302:7 | .-=(_:_:) | cfg.swift:302:7:302:7 | Int.Type |  |
+| cfg.swift:302:7:302:7 | Int.Type | cfg.swift:302:5:302:5 | x |  |
+| cfg.swift:302:10:302:10 | 1 | cfg.swift:302:5:302:10 | ... .-=(_:_:) ... |  |
+| cfg.swift:306:1:319:1 | enter loop2(x:) | cfg.swift:306:1:319:1 | loop2(x:) |  |
+| cfg.swift:306:1:319:1 | exit loop2(x:) (normal) | cfg.swift:306:1:319:1 | exit loop2(x:) |  |
+| cfg.swift:306:1:319:1 | loop2(x:) | cfg.swift:306:12:306:22 | x |  |
+| cfg.swift:306:12:306:22 | x | cfg.swift:307:3:317:3 | while ... { ... } |  |
+| cfg.swift:307:3:317:3 | while ... { ... } | cfg.swift:307:9:307:14 | StmtCondition |  |
+| cfg.swift:307:9:307:9 | (Int) ... | cfg.swift:307:14:307:14 | 0 |  |
+| cfg.swift:307:9:307:9 | x | cfg.swift:307:9:307:9 | (Int) ... |  |
+| cfg.swift:307:9:307:14 | ... .>=(_:_:) ... | cfg.swift:308:5:308:5 | print(_:separator:terminator:) | true |
+| cfg.swift:307:9:307:14 | ... .>=(_:_:) ... | cfg.swift:318:3:318:3 | print(_:separator:terminator:) | false |
+| cfg.swift:307:9:307:14 | StmtCondition | cfg.swift:307:11:307:11 | .>=(_:_:) |  |
+| cfg.swift:307:11:307:11 | .>=(_:_:) | cfg.swift:307:11:307:11 | Int.Type |  |
+| cfg.swift:307:11:307:11 | Int.Type | cfg.swift:307:9:307:9 | x |  |
+| cfg.swift:307:14:307:14 | 0 | cfg.swift:307:9:307:14 | ... .>=(_:_:) ... |  |
+| cfg.swift:308:5:308:5 | print(_:separator:terminator:) | cfg.swift:308:11:308:11 | x |  |
+| cfg.swift:308:5:308:12 | call to print(_:separator:terminator:) | cfg.swift:309:7:309:7 | .-=(_:_:) |  |
+| cfg.swift:308:10:308:10 | default separator | cfg.swift:308:10:308:10 | default terminator |  |
+| cfg.swift:308:10:308:10 | default terminator | cfg.swift:308:5:308:12 | call to print(_:separator:terminator:) |  |
+| cfg.swift:308:11:308:11 | (Any) ... | cfg.swift:308:11:308:11 | [...] |  |
+| cfg.swift:308:11:308:11 | (Int) ... | cfg.swift:308:11:308:11 | (Any) ... |  |
+| cfg.swift:308:11:308:11 | [...] | cfg.swift:308:10:308:10 | default separator |  |
+| cfg.swift:308:11:308:11 | [...] | cfg.swift:308:11:308:11 | [...] |  |
+| cfg.swift:308:11:308:11 | x | cfg.swift:308:11:308:11 | (Int) ... |  |
+| cfg.swift:309:5:309:5 | &... | cfg.swift:309:10:309:10 | 1 |  |
+| cfg.swift:309:5:309:5 | x | cfg.swift:309:5:309:5 | &... |  |
+| cfg.swift:309:5:309:10 | ... .-=(_:_:) ... | cfg.swift:310:5:315:5 | if ... then { ... } else { ... } |  |
+| cfg.swift:309:7:309:7 | .-=(_:_:) | cfg.swift:309:7:309:7 | Int.Type |  |
+| cfg.swift:309:7:309:7 | Int.Type | cfg.swift:309:5:309:5 | x |  |
+| cfg.swift:309:10:309:10 | 1 | cfg.swift:309:5:309:10 | ... .-=(_:_:) ... |  |
+| cfg.swift:310:5:315:5 | if ... then { ... } else { ... } | cfg.swift:310:8:310:12 | StmtCondition |  |
+| cfg.swift:310:8:310:8 | (Int) ... | cfg.swift:310:12:310:12 | 100 |  |
+| cfg.swift:310:8:310:8 | x | cfg.swift:310:8:310:8 | (Int) ... |  |
+| cfg.swift:310:8:310:12 | ... .>(_:_:) ... | cfg.swift:311:7:311:7 | break | true |
+| cfg.swift:310:8:310:12 | ... .>(_:_:) ... | cfg.swift:313:10:315:5 | if ... then { ... } | false |
+| cfg.swift:310:8:310:12 | StmtCondition | cfg.swift:310:10:310:10 | .>(_:_:) |  |
+| cfg.swift:310:10:310:10 | .>(_:_:) | cfg.swift:310:10:310:10 | Int.Type |  |
+| cfg.swift:310:10:310:10 | Int.Type | cfg.swift:310:8:310:8 | x |  |
+| cfg.swift:310:12:310:12 | 100 | cfg.swift:310:8:310:12 | ... .>(_:_:) ... |  |
+| cfg.swift:311:7:311:7 | break | cfg.swift:318:3:318:3 | print(_:separator:terminator:) |  |
+| cfg.swift:313:10:315:5 | if ... then { ... } | cfg.swift:313:13:313:17 | StmtCondition |  |
+| cfg.swift:313:13:313:13 | (Int) ... | cfg.swift:313:17:313:17 | 50 |  |
+| cfg.swift:313:13:313:13 | x | cfg.swift:313:13:313:13 | (Int) ... |  |
+| cfg.swift:313:13:313:17 | ... .>(_:_:) ... | cfg.swift:314:7:314:7 | continue | true |
+| cfg.swift:313:13:313:17 | ... .>(_:_:) ... | cfg.swift:316:5:316:5 | print(_:separator:terminator:) | false |
+| cfg.swift:313:13:313:17 | StmtCondition | cfg.swift:313:15:313:15 | .>(_:_:) |  |
+| cfg.swift:313:15:313:15 | .>(_:_:) | cfg.swift:313:15:313:15 | Int.Type |  |
+| cfg.swift:313:15:313:15 | Int.Type | cfg.swift:313:13:313:13 | x |  |
+| cfg.swift:313:17:313:17 | 50 | cfg.swift:313:13:313:17 | ... .>(_:_:) ... |  |
+| cfg.swift:314:7:314:7 | continue | cfg.swift:307:9:307:14 | StmtCondition | continue |
+| cfg.swift:316:5:316:5 | print(_:separator:terminator:) | cfg.swift:316:11:316:11 | Iter |  |
+| cfg.swift:316:5:316:17 | call to print(_:separator:terminator:) | cfg.swift:307:9:307:14 | StmtCondition |  |
+| cfg.swift:316:10:316:10 | default separator | cfg.swift:316:10:316:10 | default terminator |  |
+| cfg.swift:316:10:316:10 | default terminator | cfg.swift:316:5:316:17 | call to print(_:separator:terminator:) |  |
+| cfg.swift:316:11:316:11 | (Any) ... | cfg.swift:316:11:316:11 | [...] |  |
+| cfg.swift:316:11:316:11 | Iter | cfg.swift:316:11:316:11 | (Any) ... |  |
+| cfg.swift:316:11:316:11 | [...] | cfg.swift:316:10:316:10 | default separator |  |
+| cfg.swift:316:11:316:11 | [...] | cfg.swift:316:11:316:11 | [...] |  |
+| cfg.swift:318:3:318:3 | print(_:separator:terminator:) | cfg.swift:318:9:318:9 | Done |  |
+| cfg.swift:318:3:318:15 | call to print(_:separator:terminator:) | cfg.swift:306:1:319:1 | exit loop2(x:) (normal) |  |
+| cfg.swift:318:8:318:8 | default separator | cfg.swift:318:8:318:8 | default terminator |  |
+| cfg.swift:318:8:318:8 | default terminator | cfg.swift:318:3:318:15 | call to print(_:separator:terminator:) |  |
+| cfg.swift:318:9:318:9 | (Any) ... | cfg.swift:318:9:318:9 | [...] |  |
+| cfg.swift:318:9:318:9 | Done | cfg.swift:318:9:318:9 | (Any) ... |  |
+| cfg.swift:318:9:318:9 | [...] | cfg.swift:318:8:318:8 | default separator |  |
+| cfg.swift:318:9:318:9 | [...] | cfg.swift:318:9:318:9 | [...] |  |
+| cfg.swift:321:1:336:1 | enter labeledLoop(x:) | cfg.swift:321:1:336:1 | labeledLoop(x:) |  |
+| cfg.swift:321:1:336:1 | exit labeledLoop(x:) (normal) | cfg.swift:321:1:336:1 | exit labeledLoop(x:) |  |
+| cfg.swift:321:1:336:1 | labeledLoop(x:) | cfg.swift:321:18:321:28 | x |  |
+| cfg.swift:321:18:321:28 | x | cfg.swift:322:3:335:3 | while ... { ... } |  |
+| cfg.swift:322:3:335:3 | while ... { ... } | cfg.swift:322:16:322:21 | StmtCondition |  |
+| cfg.swift:322:16:322:16 | (Int) ... | cfg.swift:322:21:322:21 | 0 |  |
+| cfg.swift:322:16:322:16 | x | cfg.swift:322:16:322:16 | (Int) ... |  |
+| cfg.swift:322:16:322:21 | ... .>=(_:_:) ... | cfg.swift:321:1:336:1 | exit labeledLoop(x:) (normal) | false |
+| cfg.swift:322:16:322:21 | ... .>=(_:_:) ... | cfg.swift:323:5:333:5 | while ... { ... } | true |
+| cfg.swift:322:16:322:21 | StmtCondition | cfg.swift:322:18:322:18 | .>=(_:_:) |  |
+| cfg.swift:322:18:322:18 | .>=(_:_:) | cfg.swift:322:18:322:18 | Int.Type |  |
+| cfg.swift:322:18:322:18 | Int.Type | cfg.swift:322:16:322:16 | x |  |
+| cfg.swift:322:21:322:21 | 0 | cfg.swift:322:16:322:21 | ... .>=(_:_:) ... |  |
+| cfg.swift:323:5:333:5 | while ... { ... } | cfg.swift:323:18:323:23 | StmtCondition |  |
+| cfg.swift:323:18:323:18 | (Int) ... | cfg.swift:323:23:323:23 | 0 |  |
+| cfg.swift:323:18:323:18 | x | cfg.swift:323:18:323:18 | (Int) ... |  |
+| cfg.swift:323:18:323:23 | ... .>=(_:_:) ... | cfg.swift:324:7:324:7 | print(_:separator:terminator:) | true |
+| cfg.swift:323:18:323:23 | ... .>=(_:_:) ... | cfg.swift:334:5:334:5 | print(_:separator:terminator:) | false |
+| cfg.swift:323:18:323:23 | StmtCondition | cfg.swift:323:20:323:20 | .>=(_:_:) |  |
+| cfg.swift:323:20:323:20 | .>=(_:_:) | cfg.swift:323:20:323:20 | Int.Type |  |
+| cfg.swift:323:20:323:20 | Int.Type | cfg.swift:323:18:323:18 | x |  |
+| cfg.swift:323:23:323:23 | 0 | cfg.swift:323:18:323:23 | ... .>=(_:_:) ... |  |
+| cfg.swift:324:7:324:7 | print(_:separator:terminator:) | cfg.swift:324:13:324:13 | x |  |
+| cfg.swift:324:7:324:14 | call to print(_:separator:terminator:) | cfg.swift:325:9:325:9 | .-=(_:_:) |  |
+| cfg.swift:324:12:324:12 | default separator | cfg.swift:324:12:324:12 | default terminator |  |
+| cfg.swift:324:12:324:12 | default terminator | cfg.swift:324:7:324:14 | call to print(_:separator:terminator:) |  |
+| cfg.swift:324:13:324:13 | (Any) ... | cfg.swift:324:13:324:13 | [...] |  |
+| cfg.swift:324:13:324:13 | (Int) ... | cfg.swift:324:13:324:13 | (Any) ... |  |
+| cfg.swift:324:13:324:13 | [...] | cfg.swift:324:12:324:12 | default separator |  |
+| cfg.swift:324:13:324:13 | [...] | cfg.swift:324:13:324:13 | [...] |  |
+| cfg.swift:324:13:324:13 | x | cfg.swift:324:13:324:13 | (Int) ... |  |
+| cfg.swift:325:7:325:7 | &... | cfg.swift:325:12:325:12 | 1 |  |
+| cfg.swift:325:7:325:7 | x | cfg.swift:325:7:325:7 | &... |  |
+| cfg.swift:325:7:325:12 | ... .-=(_:_:) ... | cfg.swift:326:7:331:7 | if ... then { ... } else { ... } |  |
+| cfg.swift:325:9:325:9 | .-=(_:_:) | cfg.swift:325:9:325:9 | Int.Type |  |
+| cfg.swift:325:9:325:9 | Int.Type | cfg.swift:325:7:325:7 | x |  |
+| cfg.swift:325:12:325:12 | 1 | cfg.swift:325:7:325:12 | ... .-=(_:_:) ... |  |
+| cfg.swift:326:7:331:7 | if ... then { ... } else { ... } | cfg.swift:326:10:326:14 | StmtCondition |  |
+| cfg.swift:326:10:326:10 | (Int) ... | cfg.swift:326:14:326:14 | 100 |  |
+| cfg.swift:326:10:326:10 | x | cfg.swift:326:10:326:10 | (Int) ... |  |
+| cfg.swift:326:10:326:14 | ... .>(_:_:) ... | cfg.swift:327:9:327:15 | break outer | true |
+| cfg.swift:326:10:326:14 | ... .>(_:_:) ... | cfg.swift:329:12:331:7 | if ... then { ... } | false |
+| cfg.swift:326:10:326:14 | StmtCondition | cfg.swift:326:12:326:12 | .>(_:_:) |  |
+| cfg.swift:326:12:326:12 | .>(_:_:) | cfg.swift:326:12:326:12 | Int.Type |  |
+| cfg.swift:326:12:326:12 | Int.Type | cfg.swift:326:10:326:10 | x |  |
+| cfg.swift:326:14:326:14 | 100 | cfg.swift:326:10:326:14 | ... .>(_:_:) ... |  |
+| cfg.swift:327:9:327:15 | break outer | cfg.swift:321:1:336:1 | exit labeledLoop(x:) (normal) |  |
+| cfg.swift:329:12:331:7 | if ... then { ... } | cfg.swift:329:15:329:19 | StmtCondition |  |
+| cfg.swift:329:15:329:15 | (Int) ... | cfg.swift:329:19:329:19 | 50 |  |
+| cfg.swift:329:15:329:15 | x | cfg.swift:329:15:329:15 | (Int) ... |  |
+| cfg.swift:329:15:329:19 | ... .>(_:_:) ... | cfg.swift:330:9:330:18 | continue inner | true |
+| cfg.swift:329:15:329:19 | ... .>(_:_:) ... | cfg.swift:332:7:332:7 | print(_:separator:terminator:) | false |
+| cfg.swift:329:15:329:19 | StmtCondition | cfg.swift:329:17:329:17 | .>(_:_:) |  |
+| cfg.swift:329:17:329:17 | .>(_:_:) | cfg.swift:329:17:329:17 | Int.Type |  |
+| cfg.swift:329:17:329:17 | Int.Type | cfg.swift:329:15:329:15 | x |  |
+| cfg.swift:329:19:329:19 | 50 | cfg.swift:329:15:329:19 | ... .>(_:_:) ... |  |
+| cfg.swift:330:9:330:18 | continue inner | cfg.swift:323:18:323:23 | StmtCondition | continue |
+| cfg.swift:332:7:332:7 | print(_:separator:terminator:) | cfg.swift:332:13:332:13 | Iter |  |
+| cfg.swift:332:7:332:19 | call to print(_:separator:terminator:) | cfg.swift:323:18:323:23 | StmtCondition |  |
+| cfg.swift:332:12:332:12 | default separator | cfg.swift:332:12:332:12 | default terminator |  |
+| cfg.swift:332:12:332:12 | default terminator | cfg.swift:332:7:332:19 | call to print(_:separator:terminator:) |  |
+| cfg.swift:332:13:332:13 | (Any) ... | cfg.swift:332:13:332:13 | [...] |  |
+| cfg.swift:332:13:332:13 | Iter | cfg.swift:332:13:332:13 | (Any) ... |  |
+| cfg.swift:332:13:332:13 | [...] | cfg.swift:332:12:332:12 | default separator |  |
+| cfg.swift:332:13:332:13 | [...] | cfg.swift:332:13:332:13 | [...] |  |
+| cfg.swift:334:5:334:5 | print(_:separator:terminator:) | cfg.swift:334:11:334:11 | Done |  |
+| cfg.swift:334:5:334:17 | call to print(_:separator:terminator:) | cfg.swift:322:16:322:21 | StmtCondition |  |
+| cfg.swift:334:10:334:10 | default separator | cfg.swift:334:10:334:10 | default terminator |  |
+| cfg.swift:334:10:334:10 | default terminator | cfg.swift:334:5:334:17 | call to print(_:separator:terminator:) |  |
+| cfg.swift:334:11:334:11 | (Any) ... | cfg.swift:334:11:334:11 | [...] |  |
+| cfg.swift:334:11:334:11 | Done | cfg.swift:334:11:334:11 | (Any) ... |  |
+| cfg.swift:334:11:334:11 | [...] | cfg.swift:334:10:334:10 | default separator |  |
+| cfg.swift:334:11:334:11 | [...] | cfg.swift:334:11:334:11 | [...] |  |
+| cfg.swift:338:1:343:1 | enter testRepeat(x:) | cfg.swift:338:1:343:1 | testRepeat(x:) |  |
+| cfg.swift:338:1:343:1 | exit testRepeat(x:) (normal) | cfg.swift:338:1:343:1 | exit testRepeat(x:) |  |
+| cfg.swift:338:1:343:1 | testRepeat(x:) | cfg.swift:338:17:338:27 | x |  |
+| cfg.swift:338:17:338:27 | x | cfg.swift:339:3:342:16 | repeat { ... } while ...  |  |
+| cfg.swift:339:3:342:16 | repeat { ... } while ...  | cfg.swift:340:5:340:5 | print(_:separator:terminator:) |  |
+| cfg.swift:340:5:340:5 | print(_:separator:terminator:) | cfg.swift:340:11:340:11 | x |  |
+| cfg.swift:340:5:340:12 | call to print(_:separator:terminator:) | cfg.swift:341:7:341:7 | .-=(_:_:) |  |
+| cfg.swift:340:10:340:10 | default separator | cfg.swift:340:10:340:10 | default terminator |  |
+| cfg.swift:340:10:340:10 | default terminator | cfg.swift:340:5:340:12 | call to print(_:separator:terminator:) |  |
+| cfg.swift:340:11:340:11 | (Any) ... | cfg.swift:340:11:340:11 | [...] |  |
+| cfg.swift:340:11:340:11 | (Int) ... | cfg.swift:340:11:340:11 | (Any) ... |  |
+| cfg.swift:340:11:340:11 | [...] | cfg.swift:340:10:340:10 | default separator |  |
+| cfg.swift:340:11:340:11 | [...] | cfg.swift:340:11:340:11 | [...] |  |
+| cfg.swift:340:11:340:11 | x | cfg.swift:340:11:340:11 | (Int) ... |  |
+| cfg.swift:341:5:341:5 | &... | cfg.swift:341:10:341:10 | 1 |  |
+| cfg.swift:341:5:341:5 | x | cfg.swift:341:5:341:5 | &... |  |
+| cfg.swift:341:5:341:10 | ... .-=(_:_:) ... | cfg.swift:342:13:342:13 | .>=(_:_:) |  |
+| cfg.swift:341:7:341:7 | .-=(_:_:) | cfg.swift:341:7:341:7 | Int.Type |  |
+| cfg.swift:341:7:341:7 | Int.Type | cfg.swift:341:5:341:5 | x |  |
+| cfg.swift:341:10:341:10 | 1 | cfg.swift:341:5:341:10 | ... .-=(_:_:) ... |  |
+| cfg.swift:342:11:342:11 | (Int) ... | cfg.swift:342:16:342:16 | 0 |  |
+| cfg.swift:342:11:342:11 | x | cfg.swift:342:11:342:11 | (Int) ... |  |
+| cfg.swift:342:11:342:16 | ... .>=(_:_:) ... | cfg.swift:338:1:343:1 | exit testRepeat(x:) (normal) | false |
+| cfg.swift:342:11:342:16 | ... .>=(_:_:) ... | cfg.swift:340:5:340:5 | print(_:separator:terminator:) | true |
+| cfg.swift:342:13:342:13 | .>=(_:_:) | cfg.swift:342:13:342:13 | Int.Type |  |
+| cfg.swift:342:13:342:13 | Int.Type | cfg.swift:342:11:342:11 | x |  |
+| cfg.swift:342:16:342:16 | 0 | cfg.swift:342:11:342:16 | ... .>=(_:_:) ... |  |
+| cfg.swift:345:1:350:1 | enter loop_with_identity_expr() | cfg.swift:345:1:350:1 | loop_with_identity_expr() |  |
+| cfg.swift:345:1:350:1 | exit loop_with_identity_expr() (normal) | cfg.swift:345:1:350:1 | exit loop_with_identity_expr() |  |
+| cfg.swift:345:1:350:1 | loop_with_identity_expr() | cfg.swift:346:7:346:7 | x |  |
+| cfg.swift:346:3:346:11 | var ... = ... | cfg.swift:347:3:349:3 | while ... { ... } |  |
+| cfg.swift:346:7:346:7 | x | cfg.swift:346:11:346:11 | 0 | match |
+| cfg.swift:346:11:346:11 | 0 | cfg.swift:346:3:346:11 | var ... = ... |  |
+| cfg.swift:347:3:349:3 | while ... { ... } | cfg.swift:347:8:347:15 | StmtCondition |  |
+| cfg.swift:347:8:347:15 | StmtCondition | cfg.swift:347:11:347:11 | .<(_:_:) |  |
+| cfg.swift:347:8:347:15 | [false] (...) | cfg.swift:345:1:350:1 | exit loop_with_identity_expr() (normal) | false |
+| cfg.swift:347:8:347:15 | [true] (...) | cfg.swift:348:7:348:7 | .+=(_:_:) | true |
+| cfg.swift:347:9:347:9 | (Int) ... | cfg.swift:347:13:347:13 | 10 |  |
+| cfg.swift:347:9:347:9 | x | cfg.swift:347:9:347:9 | (Int) ... |  |
+| cfg.swift:347:9:347:13 | ... .<(_:_:) ... | cfg.swift:347:8:347:15 | [false] (...) | false |
+| cfg.swift:347:9:347:13 | ... .<(_:_:) ... | cfg.swift:347:8:347:15 | [true] (...) | true |
+| cfg.swift:347:11:347:11 | .<(_:_:) | cfg.swift:347:11:347:11 | Int.Type |  |
+| cfg.swift:347:11:347:11 | Int.Type | cfg.swift:347:9:347:9 | x |  |
+| cfg.swift:347:13:347:13 | 10 | cfg.swift:347:9:347:13 | ... .<(_:_:) ... |  |
+| cfg.swift:348:5:348:5 | &... | cfg.swift:348:10:348:10 | 1 |  |
+| cfg.swift:348:5:348:5 | x | cfg.swift:348:5:348:5 | &... |  |
+| cfg.swift:348:5:348:10 | ... .+=(_:_:) ... | cfg.swift:347:8:347:15 | StmtCondition |  |
+| cfg.swift:348:7:348:7 | .+=(_:_:) | cfg.swift:348:7:348:7 | Int.Type |  |
+| cfg.swift:348:7:348:7 | Int.Type | cfg.swift:348:5:348:5 | x |  |
+| cfg.swift:348:10:348:10 | 1 | cfg.swift:348:5:348:10 | ... .+=(_:_:) ... |  |
+| cfg.swift:352:7:352:7 | OptionalC.deinit() | cfg.swift:352:7:352:7 | self |  |
+| cfg.swift:352:7:352:7 | enter OptionalC.deinit() | cfg.swift:352:7:352:7 | OptionalC.deinit() |  |
+| cfg.swift:352:7:352:7 | exit OptionalC.deinit() (normal) | cfg.swift:352:7:352:7 | exit OptionalC.deinit() |  |
+| cfg.swift:352:7:352:7 | self | cfg.swift:352:7:352:7 | { ... } |  |
+| cfg.swift:352:7:352:7 | { ... } | cfg.swift:352:7:352:7 | exit OptionalC.deinit() (normal) |  |
+| cfg.swift:353:7:353:7 | enter get | cfg.swift:353:7:353:7 | get |  |
+| cfg.swift:353:7:353:7 | exit get (normal) | cfg.swift:353:7:353:7 | exit get |  |
+| cfg.swift:353:7:353:7 | get | cfg.swift:353:7:353:7 | self |  |
+| cfg.swift:353:7:353:7 | self | file://:0:0:0:0 | self |  |
+| cfg.swift:354:3:354:3 | self | cfg.swift:354:8:354:14 | arg |  |
+| cfg.swift:354:3:356:3 | OptionalC.init(arg:) | cfg.swift:354:3:354:3 | self |  |
+| cfg.swift:354:3:356:3 | enter OptionalC.init(arg:) | cfg.swift:354:3:356:3 | OptionalC.init(arg:) |  |
+| cfg.swift:354:3:356:3 | exit OptionalC.init(arg:) (normal) | cfg.swift:354:3:356:3 | exit OptionalC.init(arg:) |  |
+| cfg.swift:354:8:354:14 | arg | cfg.swift:355:5:355:5 | self |  |
+| cfg.swift:355:5:355:5 | .c | cfg.swift:355:9:355:9 | arg |  |
+| cfg.swift:355:5:355:5 | self | cfg.swift:355:5:355:5 | .c |  |
+| cfg.swift:355:5:355:9 |  ... = ... | cfg.swift:356:3:356:3 | return |  |
+| cfg.swift:355:9:355:9 | arg | cfg.swift:355:5:355:9 |  ... = ... |  |
+| cfg.swift:356:3:356:3 | return | cfg.swift:354:3:356:3 | exit OptionalC.init(arg:) (normal) | return |
+| cfg.swift:358:3:360:3 | enter getOptional() | cfg.swift:358:3:360:3 | getOptional() |  |
+| cfg.swift:358:3:360:3 | exit getOptional() (normal) | cfg.swift:358:3:360:3 | exit getOptional() |  |
+| cfg.swift:358:3:360:3 | getOptional() | cfg.swift:358:8:358:8 | self |  |
+| cfg.swift:358:8:358:8 | self | cfg.swift:359:12:359:12 | self |  |
+| cfg.swift:359:5:359:12 | return ... | cfg.swift:358:3:360:3 | exit getOptional() (normal) | return |
+| cfg.swift:359:12:359:12 | getter for .c | cfg.swift:359:5:359:12 | return ... |  |
+| cfg.swift:359:12:359:12 | self | cfg.swift:359:12:359:12 | getter for .c |  |
+| cfg.swift:363:1:365:1 | enter testOptional(c:) | cfg.swift:363:1:365:1 | testOptional(c:) |  |
+| cfg.swift:363:1:365:1 | exit testOptional(c:) (normal) | cfg.swift:363:1:365:1 | exit testOptional(c:) |  |
+| cfg.swift:363:1:365:1 | testOptional(c:) | cfg.swift:363:19:363:32 | c |  |
+| cfg.swift:363:19:363:32 | c | cfg.swift:364:10:364:28 | .getMyInt() |  |
+| cfg.swift:364:3:364:37 | return ... | cfg.swift:363:1:365:1 | exit testOptional(c:) (normal) | return |
+| cfg.swift:364:10:364:10 | c | cfg.swift:364:10:364:11 | ...? |  |
+| cfg.swift:364:10:364:11 | ...? | cfg.swift:364:10:364:25 | call to getOptional() |  |
+| cfg.swift:364:10:364:13 | .getOptional() | cfg.swift:364:10:364:10 | c |  |
+| cfg.swift:364:10:364:25 | call to getOptional() | cfg.swift:364:10:364:26 | ...? |  |
+| cfg.swift:364:10:364:26 | ...? | cfg.swift:364:10:364:37 | call to getMyInt() |  |
+| cfg.swift:364:10:364:28 | .getMyInt() | cfg.swift:364:10:364:13 | .getOptional() |  |
+| cfg.swift:364:10:364:37 | (Int?) ... | cfg.swift:364:10:364:37 | OptionalEvaluationExpr |  |
+| cfg.swift:364:10:364:37 | OptionalEvaluationExpr | cfg.swift:364:3:364:37 | return ... |  |
+| cfg.swift:364:10:364:37 | call to getMyInt() | cfg.swift:364:10:364:37 | (Int?) ... |  |
+| cfg.swift:367:1:371:1 | enter testCapture(x:y:) | cfg.swift:367:1:371:1 | testCapture(x:y:) |  |
+| cfg.swift:367:1:371:1 | exit testCapture(x:y:) (normal) | cfg.swift:367:1:371:1 | exit testCapture(x:y:) |  |
+| cfg.swift:367:1:371:1 | testCapture(x:y:) | cfg.swift:367:18:367:22 | x |  |
+| cfg.swift:367:18:367:22 | x | cfg.swift:367:27:367:31 | y |  |
+| cfg.swift:367:27:367:31 | y | cfg.swift:368:13:368:13 | z |  |
+| cfg.swift:368:3:370:3 | return ... | cfg.swift:367:1:371:1 | exit testCapture(x:y:) (normal) | return |
+| cfg.swift:368:10:370:3 | enter { ... } | cfg.swift:368:10:370:3 | { ... } |  |
+| cfg.swift:368:10:370:3 | exit { ... } (normal) | cfg.swift:368:10:370:3 | exit { ... } |  |
+| cfg.swift:368:10:370:3 | { ... } | cfg.swift:368:3:370:3 | return ... |  |
+| cfg.swift:368:10:370:3 | { ... } | cfg.swift:368:10:370:3 | { ... } |  |
+| cfg.swift:368:10:370:3 | { ... } | cfg.swift:369:12:369:12 | z |  |
+| cfg.swift:368:13:368:13 | z | cfg.swift:368:19:368:19 | .+(_:_:) | match |
+| cfg.swift:368:13:368:21 | var ... = ... | cfg.swift:368:24:368:24 | t |  |
+| cfg.swift:368:17:368:17 | x | cfg.swift:368:21:368:21 | y |  |
+| cfg.swift:368:17:368:21 | ... .+(_:_:) ... | cfg.swift:368:13:368:21 | var ... = ... |  |
+| cfg.swift:368:19:368:19 | .+(_:_:) | cfg.swift:368:19:368:19 | Int.Type |  |
+| cfg.swift:368:19:368:19 | Int.Type | cfg.swift:368:17:368:17 | x |  |
+| cfg.swift:368:21:368:21 | y | cfg.swift:368:17:368:21 | ... .+(_:_:) ... |  |
+| cfg.swift:368:24:368:24 | t | cfg.swift:368:28:368:28 | literal | match |
+| cfg.swift:368:24:368:28 | var ... = ... | cfg.swift:368:10:370:3 | { ... } |  |
+| cfg.swift:368:28:368:28 | literal | cfg.swift:368:24:368:28 | var ... = ... |  |
+| cfg.swift:369:5:369:12 | return ... | cfg.swift:368:10:370:3 | exit { ... } (normal) | return |
+| cfg.swift:369:12:369:12 | z | cfg.swift:369:5:369:12 | return ... |  |
+| cfg.swift:373:1:375:1 | enter testTupleElement(t:) | cfg.swift:373:1:375:1 | testTupleElement(t:) |  |
+| cfg.swift:373:1:375:1 | exit testTupleElement(t:) (normal) | cfg.swift:373:1:375:1 | exit testTupleElement(t:) |  |
+| cfg.swift:373:1:375:1 | testTupleElement(t:) | cfg.swift:373:23:373:47 | t |  |
+| cfg.swift:373:23:373:47 | t | cfg.swift:374:26:374:26 | .+(_:_:) |  |
+| cfg.swift:374:3:374:38 | return ... | cfg.swift:373:1:375:1 | exit testTupleElement(t:) (normal) | return |
+| cfg.swift:374:10:374:10 | t | cfg.swift:374:10:374:12 | .0 |  |
+| cfg.swift:374:10:374:12 | .0 | cfg.swift:374:16:374:16 | t |  |
+| cfg.swift:374:10:374:18 | ... .+(_:_:) ... | cfg.swift:374:22:374:22 | t |  |
+| cfg.swift:374:10:374:24 | ... .+(_:_:) ... | cfg.swift:374:29:374:29 | 1 |  |
+| cfg.swift:374:10:374:38 | ... .+(_:_:) ... | cfg.swift:374:3:374:38 | return ... |  |
+| cfg.swift:374:14:374:14 | .+(_:_:) | cfg.swift:374:14:374:14 | Int.Type |  |
+| cfg.swift:374:14:374:14 | Int.Type | cfg.swift:374:10:374:10 | t |  |
+| cfg.swift:374:16:374:16 | t | cfg.swift:374:16:374:18 | .1 |  |
+| cfg.swift:374:16:374:18 | .1 | cfg.swift:374:10:374:18 | ... .+(_:_:) ... |  |
+| cfg.swift:374:20:374:20 | .+(_:_:) | cfg.swift:374:20:374:20 | Int.Type |  |
+| cfg.swift:374:20:374:20 | Int.Type | cfg.swift:374:14:374:14 | .+(_:_:) |  |
+| cfg.swift:374:22:374:22 | t | cfg.swift:374:22:374:24 | .2 |  |
+| cfg.swift:374:22:374:24 | .2 | cfg.swift:374:10:374:24 | ... .+(_:_:) ... |  |
+| cfg.swift:374:26:374:26 | .+(_:_:) | cfg.swift:374:26:374:26 | Int.Type |  |
+| cfg.swift:374:26:374:26 | Int.Type | cfg.swift:374:20:374:20 | .+(_:_:) |  |
+| cfg.swift:374:28:374:36 | (...) | cfg.swift:374:28:374:38 | .0 |  |
+| cfg.swift:374:28:374:38 | .0 | cfg.swift:374:10:374:38 | ... .+(_:_:) ... |  |
+| cfg.swift:374:29:374:29 | 1 | cfg.swift:374:32:374:32 | 2 |  |
+| cfg.swift:374:32:374:32 | 2 | cfg.swift:374:35:374:35 | 3 |  |
+| cfg.swift:374:35:374:35 | 3 | cfg.swift:374:28:374:36 | (...) |  |
+| cfg.swift:377:7:377:7 | #... | cfg.swift:377:7:377:7 | #... |  |
+| cfg.swift:377:7:377:7 | #... | cfg.swift:377:7:377:7 | #... |  |
+| cfg.swift:377:7:377:7 | #... | cfg.swift:377:7:377:7 | #... |  |
+| cfg.swift:377:7:377:7 | #... | cfg.swift:377:7:377:7 | call to _unimplementedInitializer(className:initName:file:line:column:) |  |
+| cfg.swift:377:7:377:7 | Derived.deinit() | cfg.swift:377:7:377:7 | self |  |
+| cfg.swift:377:7:377:7 | _unimplementedInitializer(className:initName:file:line:column:) | cfg.swift:377:7:377:7 | cfg.Derived |  |
+| cfg.swift:377:7:377:7 | call to _unimplementedInitializer(className:initName:file:line:column:) | file://:0:0:0:0 | return |  |
+| cfg.swift:377:7:377:7 | cfg.Derived | cfg.swift:377:7:377:7 | #... |  |
+| cfg.swift:377:7:377:7 | enter Derived.deinit() | cfg.swift:377:7:377:7 | Derived.deinit() |  |
+| cfg.swift:377:7:377:7 | exit Derived.deinit() (normal) | cfg.swift:377:7:377:7 | exit Derived.deinit() |  |
+| cfg.swift:377:7:377:7 | self | cfg.swift:377:7:377:7 | { ... } |  |
+| cfg.swift:377:7:377:7 | { ... } | cfg.swift:377:7:377:7 | exit Derived.deinit() (normal) |  |
+| cfg.swift:377:19:377:19 | Derived.init(n:) | cfg.swift:377:19:377:19 | self |  |
+| cfg.swift:377:19:377:19 | enter Derived.init(n:) | cfg.swift:377:19:377:19 | Derived.init(n:) |  |
+| cfg.swift:377:19:377:19 | exit Derived.init(n:) (normal) | cfg.swift:377:19:377:19 | exit Derived.init(n:) |  |
+| cfg.swift:377:19:377:19 | self | file://:0:0:0:0 | n |  |
+| cfg.swift:378:3:378:3 | self | cfg.swift:379:5:379:11 | C.init(n:) |  |
+| cfg.swift:378:3:380:3 | Derived.init() | cfg.swift:378:3:378:3 | self |  |
+| cfg.swift:378:3:380:3 | enter Derived.init() | cfg.swift:378:3:380:3 | Derived.init() |  |
+| cfg.swift:378:3:380:3 | exit Derived.init() (normal) | cfg.swift:378:3:380:3 | exit Derived.init() |  |
+| cfg.swift:379:5:379:5 | super | cfg.swift:379:19:379:19 | 0 |  |
+| cfg.swift:379:5:379:11 | C.init(n:) | cfg.swift:379:5:379:5 | super |  |
+| cfg.swift:379:5:379:20 | call to C.init(n:) | cfg.swift:379:5:379:20 | self = ... |  |
+| cfg.swift:379:5:379:20 | self = ... | cfg.swift:380:3:380:3 | return |  |
+| cfg.swift:379:19:379:19 | 0 | cfg.swift:379:5:379:20 | call to C.init(n:) |  |
+| cfg.swift:380:3:380:3 | return | cfg.swift:378:3:380:3 | exit Derived.init() (normal) | return |
+| cfg.swift:383:1:391:1 | doWithoutCatch(x:) | cfg.swift:383:21:383:25 | x |  |
+| cfg.swift:383:1:391:1 | enter doWithoutCatch(x:) | cfg.swift:383:1:391:1 | doWithoutCatch(x:) |  |
+| cfg.swift:383:1:391:1 | exit doWithoutCatch(x:) (abnormal) | cfg.swift:383:1:391:1 | exit doWithoutCatch(x:) |  |
+| cfg.swift:383:1:391:1 | exit doWithoutCatch(x:) (normal) | cfg.swift:383:1:391:1 | exit doWithoutCatch(x:) |  |
+| cfg.swift:383:21:383:25 | x | cfg.swift:384:3:389:3 | do { ... } |  |
+| cfg.swift:384:3:389:3 | do { ... } | cfg.swift:385:9:385:9 | mightThrow(x:) |  |
+| cfg.swift:385:5:385:24 | try ... | cfg.swift:386:5:386:5 | print(_:separator:terminator:) |  |
+| cfg.swift:385:9:385:9 | mightThrow(x:) | cfg.swift:385:23:385:23 | 0 |  |
+| cfg.swift:385:9:385:24 | call to mightThrow(x:) | cfg.swift:383:1:391:1 | exit doWithoutCatch(x:) (abnormal) | exception |
+| cfg.swift:385:9:385:24 | call to mightThrow(x:) | cfg.swift:385:5:385:24 | try ... |  |
+| cfg.swift:385:23:385:23 | 0 | cfg.swift:385:9:385:24 | call to mightThrow(x:) |  |
+| cfg.swift:386:5:386:5 | print(_:separator:terminator:) | cfg.swift:386:11:386:11 | Did not throw. |  |
+| cfg.swift:386:5:386:27 | call to print(_:separator:terminator:) | cfg.swift:387:10:387:10 | mightThrow(x:) |  |
+| cfg.swift:386:10:386:10 | default separator | cfg.swift:386:10:386:10 | default terminator |  |
+| cfg.swift:386:10:386:10 | default terminator | cfg.swift:386:5:386:27 | call to print(_:separator:terminator:) |  |
+| cfg.swift:386:11:386:11 | (Any) ... | cfg.swift:386:11:386:11 | [...] |  |
+| cfg.swift:386:11:386:11 | Did not throw. | cfg.swift:386:11:386:11 | (Any) ... |  |
+| cfg.swift:386:11:386:11 | [...] | cfg.swift:386:10:386:10 | default separator |  |
+| cfg.swift:386:11:386:11 | [...] | cfg.swift:386:11:386:11 | [...] |  |
+| cfg.swift:387:5:387:25 | try! ... | cfg.swift:388:5:388:5 | print(_:separator:terminator:) |  |
+| cfg.swift:387:10:387:10 | mightThrow(x:) | cfg.swift:387:24:387:24 | 0 |  |
+| cfg.swift:387:10:387:25 | call to mightThrow(x:) | cfg.swift:383:1:391:1 | exit doWithoutCatch(x:) (abnormal) | exception |
+| cfg.swift:387:10:387:25 | call to mightThrow(x:) | cfg.swift:387:5:387:25 | try! ... |  |
+| cfg.swift:387:24:387:24 | 0 | cfg.swift:387:10:387:25 | call to mightThrow(x:) |  |
+| cfg.swift:388:5:388:5 | print(_:separator:terminator:) | cfg.swift:388:11:388:11 | Still did not throw. |  |
+| cfg.swift:388:5:388:33 | call to print(_:separator:terminator:) | cfg.swift:390:10:390:10 | 0 |  |
+| cfg.swift:388:10:388:10 | default separator | cfg.swift:388:10:388:10 | default terminator |  |
+| cfg.swift:388:10:388:10 | default terminator | cfg.swift:388:5:388:33 | call to print(_:separator:terminator:) |  |
+| cfg.swift:388:11:388:11 | (Any) ... | cfg.swift:388:11:388:11 | [...] |  |
+| cfg.swift:388:11:388:11 | Still did not throw. | cfg.swift:388:11:388:11 | (Any) ... |  |
+| cfg.swift:388:11:388:11 | [...] | cfg.swift:388:10:388:10 | default separator |  |
+| cfg.swift:388:11:388:11 | [...] | cfg.swift:388:11:388:11 | [...] |  |
+| cfg.swift:390:3:390:10 | return ... | cfg.swift:383:1:391:1 | exit doWithoutCatch(x:) (normal) | return |
+| cfg.swift:390:10:390:10 | 0 | cfg.swift:390:3:390:10 | return ... |  |
+| cfg.swift:394:7:394:7 | _modify | cfg.swift:394:7:394:7 | self |  |
+| cfg.swift:394:7:394:7 | enter _modify | cfg.swift:394:7:394:7 | _modify |  |
+| cfg.swift:394:7:394:7 | enter get | cfg.swift:394:7:394:7 | get |  |
+| cfg.swift:394:7:394:7 | enter set | cfg.swift:394:7:394:7 | set |  |
+| cfg.swift:394:7:394:7 | exit _modify (normal) | cfg.swift:394:7:394:7 | exit _modify |  |
+| cfg.swift:394:7:394:7 | exit get (normal) | cfg.swift:394:7:394:7 | exit get |  |
+| cfg.swift:394:7:394:7 | exit set (normal) | cfg.swift:394:7:394:7 | exit set |  |
+| cfg.swift:394:7:394:7 | get | cfg.swift:394:7:394:7 | self |  |
+| cfg.swift:394:7:394:7 | self | cfg.swift:394:7:394:7 | value |  |
+| cfg.swift:394:7:394:7 | self | file://:0:0:0:0 | self |  |
+| cfg.swift:394:7:394:7 | self | file://:0:0:0:0 | self |  |
+| cfg.swift:394:7:394:7 | set | cfg.swift:394:7:394:7 | self |  |
+| cfg.swift:394:7:394:7 | value | file://:0:0:0:0 | self |  |
+| cfg.swift:394:7:394:7 | yield ... | cfg.swift:394:7:394:7 | exit _modify (normal) |  |
+| cfg.swift:395:3:395:3 | self | cfg.swift:396:5:396:5 | self |  |
+| cfg.swift:395:3:397:3 | Structors.init() | cfg.swift:395:3:395:3 | self |  |
+| cfg.swift:395:3:397:3 | enter Structors.init() | cfg.swift:395:3:397:3 | Structors.init() |  |
+| cfg.swift:395:3:397:3 | exit Structors.init() (normal) | cfg.swift:395:3:397:3 | exit Structors.init() |  |
+| cfg.swift:396:5:396:5 | .field | cfg.swift:396:13:396:13 | 10 |  |
+| cfg.swift:396:5:396:5 | self | cfg.swift:396:5:396:5 | .field |  |
+| cfg.swift:396:5:396:13 |  ... = ... | cfg.swift:397:3:397:3 | return |  |
+| cfg.swift:396:13:396:13 | 10 | cfg.swift:396:5:396:13 |  ... = ... |  |
+| cfg.swift:397:3:397:3 | return | cfg.swift:395:3:397:3 | exit Structors.init() (normal) | return |
+| cfg.swift:399:3:399:3 | self | cfg.swift:400:5:400:5 | self |  |
+| cfg.swift:399:3:401:3 | Structors.deinit() | cfg.swift:399:3:399:3 | self |  |
+| cfg.swift:399:3:401:3 | enter Structors.deinit() | cfg.swift:399:3:401:3 | Structors.deinit() |  |
+| cfg.swift:399:3:401:3 | exit Structors.deinit() (normal) | cfg.swift:399:3:401:3 | exit Structors.deinit() |  |
+| cfg.swift:400:5:400:5 | .field | cfg.swift:400:13:400:13 | 0 |  |
+| cfg.swift:400:5:400:5 | self | cfg.swift:400:5:400:5 | .field |  |
+| cfg.swift:400:5:400:13 |  ... = ... | cfg.swift:399:3:401:3 | exit Structors.deinit() (normal) |  |
+| cfg.swift:400:13:400:13 | 0 | cfg.swift:400:5:400:13 |  ... = ... |  |
+| cfg.swift:404:1:406:1 | dictionaryLiteral(x:y:) | cfg.swift:404:24:404:27 | x |  |
+| cfg.swift:404:1:406:1 | enter dictionaryLiteral(x:y:) | cfg.swift:404:1:406:1 | dictionaryLiteral(x:y:) |  |
+| cfg.swift:404:1:406:1 | exit dictionaryLiteral(x:y:) (normal) | cfg.swift:404:1:406:1 | exit dictionaryLiteral(x:y:) |  |
+| cfg.swift:404:24:404:27 | x | cfg.swift:404:32:404:35 | y |  |
+| cfg.swift:404:32:404:35 | y | cfg.swift:405:11:405:11 | x |  |
+| cfg.swift:405:3:405:25 | return ... | cfg.swift:404:1:406:1 | exit dictionaryLiteral(x:y:) (normal) | return |
+| cfg.swift:405:10:405:25 | [...] | cfg.swift:405:3:405:25 | return ... |  |
+| cfg.swift:405:11:405:11 | x | cfg.swift:405:16:405:16 | x |  |
+| cfg.swift:405:11:405:16 | (...) | cfg.swift:405:19:405:19 | y |  |
+| cfg.swift:405:16:405:16 | x | cfg.swift:405:11:405:16 | (...) |  |
+| cfg.swift:405:19:405:19 | y | cfg.swift:405:24:405:24 | y |  |
+| cfg.swift:405:19:405:24 | (...) | cfg.swift:405:10:405:25 | [...] |  |
+| cfg.swift:405:24:405:24 | y | cfg.swift:405:19:405:24 | (...) |  |
+| cfg.swift:408:1:443:1 | enter localDeclarations() | cfg.swift:408:1:443:1 | localDeclarations() |  |
+| cfg.swift:408:1:443:1 | exit localDeclarations() (normal) | cfg.swift:408:1:443:1 | exit localDeclarations() |  |
+| cfg.swift:408:1:443:1 | localDeclarations() | cfg.swift:409:3:414:3 | MyLocalClass |  |
+| cfg.swift:409:3:414:3 | MyLocalClass | cfg.swift:416:3:421:3 | MyLocalStruct |  |
+| cfg.swift:409:9:409:9 | MyLocalClass.deinit() | cfg.swift:409:9:409:9 | self |  |
+| cfg.swift:409:9:409:9 | enter MyLocalClass.deinit() | cfg.swift:409:9:409:9 | MyLocalClass.deinit() |  |
+| cfg.swift:409:9:409:9 | exit MyLocalClass.deinit() (normal) | cfg.swift:409:9:409:9 | exit MyLocalClass.deinit() |  |
+| cfg.swift:409:9:409:9 | self | cfg.swift:409:9:409:9 | { ... } |  |
+| cfg.swift:409:9:409:9 | { ... } | cfg.swift:409:9:409:9 | exit MyLocalClass.deinit() (normal) |  |
+| cfg.swift:410:9:410:9 | _modify | cfg.swift:410:9:410:9 | self |  |
+| cfg.swift:410:9:410:9 | enter _modify | cfg.swift:410:9:410:9 | _modify |  |
+| cfg.swift:410:9:410:9 | enter get | cfg.swift:410:9:410:9 | get |  |
+| cfg.swift:410:9:410:9 | enter set | cfg.swift:410:9:410:9 | set |  |
+| cfg.swift:410:9:410:9 | exit _modify (normal) | cfg.swift:410:9:410:9 | exit _modify |  |
+| cfg.swift:410:9:410:9 | exit get (normal) | cfg.swift:410:9:410:9 | exit get |  |
+| cfg.swift:410:9:410:9 | exit set (normal) | cfg.swift:410:9:410:9 | exit set |  |
+| cfg.swift:410:9:410:9 | get | cfg.swift:410:9:410:9 | self |  |
+| cfg.swift:410:9:410:9 | self | cfg.swift:410:9:410:9 | value |  |
+| cfg.swift:410:9:410:9 | self | file://:0:0:0:0 | self |  |
+| cfg.swift:410:9:410:9 | self | file://:0:0:0:0 | self |  |
+| cfg.swift:410:9:410:9 | set | cfg.swift:410:9:410:9 | self |  |
+| cfg.swift:410:9:410:9 | value | file://:0:0:0:0 | self |  |
+| cfg.swift:410:9:410:9 | yield ... | cfg.swift:410:9:410:9 | exit _modify (normal) |  |
+| cfg.swift:411:5:411:5 | self | cfg.swift:412:7:412:7 | self |  |
+| cfg.swift:411:5:413:5 | MyLocalClass.init() | cfg.swift:411:5:411:5 | self |  |
+| cfg.swift:411:5:413:5 | enter MyLocalClass.init() | cfg.swift:411:5:413:5 | MyLocalClass.init() |  |
+| cfg.swift:411:5:413:5 | exit MyLocalClass.init() (normal) | cfg.swift:411:5:413:5 | exit MyLocalClass.init() |  |
+| cfg.swift:412:7:412:7 | .x | cfg.swift:412:11:412:11 | 10 |  |
+| cfg.swift:412:7:412:7 | self | cfg.swift:412:7:412:7 | .x |  |
+| cfg.swift:412:7:412:11 |  ... = ... | cfg.swift:413:5:413:5 | return |  |
+| cfg.swift:412:11:412:11 | 10 | cfg.swift:412:7:412:11 |  ... = ... |  |
+| cfg.swift:413:5:413:5 | return | cfg.swift:411:5:413:5 | exit MyLocalClass.init() (normal) | return |
+| cfg.swift:416:3:421:3 | MyLocalStruct | cfg.swift:423:3:426:3 | MyLocalEnum |  |
+| cfg.swift:417:9:417:9 | _modify | cfg.swift:417:9:417:9 | self |  |
+| cfg.swift:417:9:417:9 | enter _modify | cfg.swift:417:9:417:9 | _modify |  |
+| cfg.swift:417:9:417:9 | enter get | cfg.swift:417:9:417:9 | get |  |
+| cfg.swift:417:9:417:9 | enter set | cfg.swift:417:9:417:9 | set |  |
+| cfg.swift:417:9:417:9 | exit _modify (normal) | cfg.swift:417:9:417:9 | exit _modify |  |
+| cfg.swift:417:9:417:9 | exit get (normal) | cfg.swift:417:9:417:9 | exit get |  |
+| cfg.swift:417:9:417:9 | exit set (normal) | cfg.swift:417:9:417:9 | exit set |  |
+| cfg.swift:417:9:417:9 | get | cfg.swift:417:9:417:9 | self |  |
+| cfg.swift:417:9:417:9 | self | cfg.swift:417:9:417:9 | value |  |
+| cfg.swift:417:9:417:9 | self | file://:0:0:0:0 | self |  |
+| cfg.swift:417:9:417:9 | self | file://:0:0:0:0 | self |  |
+| cfg.swift:417:9:417:9 | set | cfg.swift:417:9:417:9 | self |  |
+| cfg.swift:417:9:417:9 | value | file://:0:0:0:0 | self |  |
+| cfg.swift:417:9:417:9 | yield ... | cfg.swift:417:9:417:9 | exit _modify (normal) |  |
+| cfg.swift:418:5:418:5 | self | cfg.swift:419:7:419:7 | self |  |
+| cfg.swift:418:5:420:5 | MyLocalStruct.init() | cfg.swift:418:5:418:5 | self |  |
+| cfg.swift:418:5:420:5 | enter MyLocalStruct.init() | cfg.swift:418:5:420:5 | MyLocalStruct.init() |  |
+| cfg.swift:418:5:420:5 | exit MyLocalStruct.init() (normal) | cfg.swift:418:5:420:5 | exit MyLocalStruct.init() |  |
+| cfg.swift:419:7:419:7 | .x | cfg.swift:419:11:419:11 | 10 |  |
+| cfg.swift:419:7:419:7 | self | cfg.swift:419:7:419:7 | .x |  |
+| cfg.swift:419:7:419:11 |  ... = ... | cfg.swift:420:5:420:5 | return |  |
+| cfg.swift:419:11:419:11 | 10 | cfg.swift:419:7:419:11 |  ... = ... |  |
+| cfg.swift:420:5:420:5 | return | cfg.swift:418:5:420:5 | exit MyLocalStruct.init() (normal) | return |
+| cfg.swift:423:3:426:3 | MyLocalEnum | cfg.swift:428:7:428:7 | myLocalVar |  |
+| cfg.swift:428:3:428:20 | var ... = ... | cfg.swift:442:10:442:10 | 0 |  |
+| cfg.swift:428:7:428:7 | myLocalVar | cfg.swift:428:7:428:20 | ... as ... | match |
+| cfg.swift:428:7:428:20 | ... as ... | cfg.swift:428:3:428:20 | var ... = ... | match |
+| cfg.swift:442:3:442:10 | return ... | cfg.swift:408:1:443:1 | exit localDeclarations() (normal) | return |
+| cfg.swift:442:10:442:10 | 0 | cfg.swift:442:3:442:10 | return ... |  |
+| cfg.swift:446:7:446:7 | _modify | cfg.swift:446:7:446:7 | self |  |
+| cfg.swift:446:7:446:7 | enter _modify | cfg.swift:446:7:446:7 | _modify |  |
+| cfg.swift:446:7:446:7 | enter get | cfg.swift:446:7:446:7 | get |  |
+| cfg.swift:446:7:446:7 | enter set | cfg.swift:446:7:446:7 | set |  |
+| cfg.swift:446:7:446:7 | exit _modify (normal) | cfg.swift:446:7:446:7 | exit _modify |  |
+| cfg.swift:446:7:446:7 | exit get (normal) | cfg.swift:446:7:446:7 | exit get |  |
+| cfg.swift:446:7:446:7 | exit set (normal) | cfg.swift:446:7:446:7 | exit set |  |
+| cfg.swift:446:7:446:7 | get | cfg.swift:446:7:446:7 | self |  |
+| cfg.swift:446:7:446:7 | self | cfg.swift:446:7:446:7 | value |  |
+| cfg.swift:446:7:446:7 | self | file://:0:0:0:0 | self |  |
+| cfg.swift:446:7:446:7 | self | file://:0:0:0:0 | self |  |
+| cfg.swift:446:7:446:7 | set | cfg.swift:446:7:446:7 | self |  |
+| cfg.swift:446:7:446:7 | value | file://:0:0:0:0 | self |  |
+| cfg.swift:446:7:446:7 | yield ... | cfg.swift:446:7:446:7 | exit _modify (normal) |  |
+| cfg.swift:450:7:450:7 | _modify | cfg.swift:450:7:450:7 | self |  |
+| cfg.swift:450:7:450:7 | enter _modify | cfg.swift:450:7:450:7 | _modify |  |
+| cfg.swift:450:7:450:7 | enter get | cfg.swift:450:7:450:7 | get |  |
+| cfg.swift:450:7:450:7 | enter set | cfg.swift:450:7:450:7 | set |  |
+| cfg.swift:450:7:450:7 | exit _modify (normal) | cfg.swift:450:7:450:7 | exit _modify |  |
+| cfg.swift:450:7:450:7 | exit get (normal) | cfg.swift:450:7:450:7 | exit get |  |
+| cfg.swift:450:7:450:7 | exit set (normal) | cfg.swift:450:7:450:7 | exit set |  |
+| cfg.swift:450:7:450:7 | get | cfg.swift:450:7:450:7 | self |  |
+| cfg.swift:450:7:450:7 | self | cfg.swift:450:7:450:7 | value |  |
+| cfg.swift:450:7:450:7 | self | file://:0:0:0:0 | self |  |
+| cfg.swift:450:7:450:7 | self | file://:0:0:0:0 | self |  |
+| cfg.swift:450:7:450:7 | set | cfg.swift:450:7:450:7 | self |  |
+| cfg.swift:450:7:450:7 | value | file://:0:0:0:0 | self |  |
+| cfg.swift:450:7:450:7 | yield ... | cfg.swift:450:7:450:7 | exit _modify (normal) |  |
+| cfg.swift:451:7:451:7 | _modify | cfg.swift:451:7:451:7 | self |  |
+| cfg.swift:451:7:451:7 | enter _modify | cfg.swift:451:7:451:7 | _modify |  |
+| cfg.swift:451:7:451:7 | enter get | cfg.swift:451:7:451:7 | get |  |
+| cfg.swift:451:7:451:7 | enter set | cfg.swift:451:7:451:7 | set |  |
+| cfg.swift:451:7:451:7 | exit _modify (normal) | cfg.swift:451:7:451:7 | exit _modify |  |
+| cfg.swift:451:7:451:7 | exit get (normal) | cfg.swift:451:7:451:7 | exit get |  |
+| cfg.swift:451:7:451:7 | exit set (normal) | cfg.swift:451:7:451:7 | exit set |  |
+| cfg.swift:451:7:451:7 | get | cfg.swift:451:7:451:7 | self |  |
+| cfg.swift:451:7:451:7 | self | cfg.swift:451:7:451:7 | value |  |
+| cfg.swift:451:7:451:7 | self | file://:0:0:0:0 | self |  |
+| cfg.swift:451:7:451:7 | self | file://:0:0:0:0 | self |  |
+| cfg.swift:451:7:451:7 | set | cfg.swift:451:7:451:7 | self |  |
+| cfg.swift:451:7:451:7 | value | file://:0:0:0:0 | self |  |
+| cfg.swift:451:7:451:7 | yield ... | cfg.swift:451:7:451:7 | exit _modify (normal) |  |
+| cfg.swift:452:7:452:7 | _modify | cfg.swift:452:7:452:7 | self |  |
+| cfg.swift:452:7:452:7 | enter _modify | cfg.swift:452:7:452:7 | _modify |  |
+| cfg.swift:452:7:452:7 | enter get | cfg.swift:452:7:452:7 | get |  |
+| cfg.swift:452:7:452:7 | enter set | cfg.swift:452:7:452:7 | set |  |
+| cfg.swift:452:7:452:7 | exit _modify (normal) | cfg.swift:452:7:452:7 | exit _modify |  |
+| cfg.swift:452:7:452:7 | exit get (normal) | cfg.swift:452:7:452:7 | exit get |  |
+| cfg.swift:452:7:452:7 | exit set (normal) | cfg.swift:452:7:452:7 | exit set |  |
+| cfg.swift:452:7:452:7 | get | cfg.swift:452:7:452:7 | self |  |
+| cfg.swift:452:7:452:7 | self | cfg.swift:452:7:452:7 | value |  |
+| cfg.swift:452:7:452:7 | self | file://:0:0:0:0 | self |  |
+| cfg.swift:452:7:452:7 | self | file://:0:0:0:0 | self |  |
+| cfg.swift:452:7:452:7 | set | cfg.swift:452:7:452:7 | self |  |
+| cfg.swift:452:7:452:7 | value | file://:0:0:0:0 | self |  |
+| cfg.swift:452:7:452:7 | yield ... | cfg.swift:452:7:452:7 | exit _modify (normal) |  |
+| cfg.swift:455:1:465:1 | enter test(a:) | cfg.swift:455:1:465:1 | test(a:) |  |
+| cfg.swift:455:1:465:1 | exit test(a:) (normal) | cfg.swift:455:1:465:1 | exit test(a:) |  |
+| cfg.swift:455:1:465:1 | test(a:) | cfg.swift:455:11:455:15 | a |  |
+| cfg.swift:455:11:455:15 | a | cfg.swift:456:7:456:7 | kpGet_b_x |  |
+| cfg.swift:456:3:456:24 | var ... = ... | cfg.swift:457:7:457:7 | kpGet_bs_0_x |  |
+| cfg.swift:456:7:456:7 | kpGet_b_x | cfg.swift:456:19:456:24 | #keyPath(...) | match |
+| cfg.swift:456:19:456:24 | #keyPath(...) | cfg.swift:456:3:456:24 | var ... = ... |  |
+| cfg.swift:456:19:456:24 | #keyPath(...) | cfg.swift:456:19:456:24 | exit #keyPath(...) (normal) |  |
+| cfg.swift:456:19:456:24 | enter #keyPath(...) | cfg.swift:456:22:456:22 | KeyPathComponent |  |
+| cfg.swift:456:19:456:24 | exit #keyPath(...) (normal) | cfg.swift:456:19:456:24 | exit #keyPath(...) |  |
+| cfg.swift:456:22:456:22 | KeyPathComponent | cfg.swift:456:24:456:24 | KeyPathComponent |  |
+| cfg.swift:456:24:456:24 | KeyPathComponent | cfg.swift:456:19:456:24 | #keyPath(...) |  |
+| cfg.swift:457:3:457:31 | var ... = ... | cfg.swift:458:7:458:7 | kpGet_mayB_force_x |  |
+| cfg.swift:457:7:457:7 | kpGet_bs_0_x | cfg.swift:457:22:457:31 | #keyPath(...) | match |
+| cfg.swift:457:22:457:31 | #keyPath(...) | cfg.swift:457:3:457:31 | var ... = ... |  |
+| cfg.swift:457:22:457:31 | #keyPath(...) | cfg.swift:457:22:457:31 | exit #keyPath(...) (normal) |  |
+| cfg.swift:457:22:457:31 | enter #keyPath(...) | cfg.swift:457:25:457:25 | KeyPathComponent |  |
+| cfg.swift:457:22:457:31 | exit #keyPath(...) (normal) | cfg.swift:457:22:457:31 | exit #keyPath(...) |  |
+| cfg.swift:457:25:457:25 | KeyPathComponent | cfg.swift:457:28:457:28 | 0 |  |
+| cfg.swift:457:27:457:29 | KeyPathComponent | cfg.swift:457:31:457:31 | KeyPathComponent |  |
+| cfg.swift:457:28:457:28 | 0 | cfg.swift:457:27:457:29 | KeyPathComponent |  |
+| cfg.swift:457:31:457:31 | KeyPathComponent | cfg.swift:457:22:457:31 | #keyPath(...) |  |
+| cfg.swift:458:3:458:37 | var ... = ... | cfg.swift:459:7:459:7 | kpGet_mayB_x |  |
+| cfg.swift:458:7:458:7 | kpGet_mayB_force_x | cfg.swift:458:28:458:37 | #keyPath(...) | match |
+| cfg.swift:458:28:458:37 | #keyPath(...) | cfg.swift:458:3:458:37 | var ... = ... |  |
+| cfg.swift:458:28:458:37 | #keyPath(...) | cfg.swift:458:28:458:37 | exit #keyPath(...) (normal) |  |
+| cfg.swift:458:28:458:37 | enter #keyPath(...) | cfg.swift:458:31:458:31 | KeyPathComponent |  |
+| cfg.swift:458:28:458:37 | exit #keyPath(...) (normal) | cfg.swift:458:28:458:37 | exit #keyPath(...) |  |
+| cfg.swift:458:31:458:31 | KeyPathComponent | cfg.swift:458:31:458:31 | KeyPathComponent |  |
+| cfg.swift:458:31:458:31 | KeyPathComponent | cfg.swift:458:37:458:37 | KeyPathComponent |  |
+| cfg.swift:458:37:458:37 | KeyPathComponent | cfg.swift:458:28:458:37 | #keyPath(...) |  |
+| cfg.swift:459:3:459:31 | var ... = ... | cfg.swift:461:7:461:7 | apply_kpGet_b_x |  |
+| cfg.swift:459:7:459:7 | kpGet_mayB_x | cfg.swift:459:22:459:31 | #keyPath(...) | match |
+| cfg.swift:459:22:459:31 | #keyPath(...) | cfg.swift:459:3:459:31 | var ... = ... |  |
+| cfg.swift:459:22:459:31 | #keyPath(...) | cfg.swift:459:22:459:31 | exit #keyPath(...) (normal) |  |
+| cfg.swift:459:22:459:31 | enter #keyPath(...) | cfg.swift:459:25:459:25 | KeyPathComponent |  |
+| cfg.swift:459:22:459:31 | exit #keyPath(...) (normal) | cfg.swift:459:22:459:31 | exit #keyPath(...) |  |
+| cfg.swift:459:25:459:25 | KeyPathComponent | cfg.swift:459:29:459:29 | KeyPathComponent |  |
+| cfg.swift:459:29:459:29 | KeyPathComponent | cfg.swift:459:31:459:31 | KeyPathComponent |  |
+| cfg.swift:459:31:459:31 | KeyPathComponent | file://:0:0:0:0 | KeyPathComponent |  |
+| cfg.swift:461:3:461:45 | var ... = ... | cfg.swift:462:7:462:7 | apply_kpGet_bs_0_x |  |
+| cfg.swift:461:7:461:7 | apply_kpGet_b_x | cfg.swift:461:25:461:25 | a | match |
+| cfg.swift:461:25:461:25 | a | cfg.swift:461:36:461:36 | kpGet_b_x |  |
+| cfg.swift:461:25:461:45 | \\...[...] | cfg.swift:461:3:461:45 | var ... = ... |  |
+| cfg.swift:461:36:461:36 | (WritableKeyPath<A, Int>) ... | cfg.swift:461:25:461:45 | \\...[...] |  |
+| cfg.swift:461:36:461:36 | kpGet_b_x | cfg.swift:461:36:461:36 | (WritableKeyPath<A, Int>) ... |  |
+| cfg.swift:462:3:462:51 | var ... = ... | cfg.swift:463:7:463:7 | apply_kpGet_mayB_force_x |  |
+| cfg.swift:462:7:462:7 | apply_kpGet_bs_0_x | cfg.swift:462:28:462:28 | a | match |
+| cfg.swift:462:28:462:28 | a | cfg.swift:462:39:462:39 | kpGet_bs_0_x |  |
+| cfg.swift:462:28:462:51 | \\...[...] | cfg.swift:462:3:462:51 | var ... = ... |  |
+| cfg.swift:462:39:462:39 | (WritableKeyPath<A, Int>) ... | cfg.swift:462:28:462:51 | \\...[...] |  |
+| cfg.swift:462:39:462:39 | kpGet_bs_0_x | cfg.swift:462:39:462:39 | (WritableKeyPath<A, Int>) ... |  |
+| cfg.swift:463:3:463:63 | var ... = ... | cfg.swift:464:7:464:7 | apply_kpGet_mayB_x |  |
+| cfg.swift:463:7:463:7 | apply_kpGet_mayB_force_x | cfg.swift:463:34:463:34 | a | match |
+| cfg.swift:463:34:463:34 | a | cfg.swift:463:45:463:45 | kpGet_mayB_force_x |  |
+| cfg.swift:463:34:463:63 | \\...[...] | cfg.swift:463:3:463:63 | var ... = ... |  |
+| cfg.swift:463:45:463:45 | (WritableKeyPath<A, Int>) ... | cfg.swift:463:34:463:63 | \\...[...] |  |
+| cfg.swift:463:45:463:45 | kpGet_mayB_force_x | cfg.swift:463:45:463:45 | (WritableKeyPath<A, Int>) ... |  |
+| cfg.swift:464:3:464:51 | var ... = ... | cfg.swift:455:1:465:1 | exit test(a:) (normal) |  |
+| cfg.swift:464:7:464:7 | apply_kpGet_mayB_x | cfg.swift:464:28:464:28 | a | match |
+| cfg.swift:464:28:464:28 | a | cfg.swift:464:39:464:39 | kpGet_mayB_x |  |
+| cfg.swift:464:28:464:51 | \\...[...] | cfg.swift:464:3:464:51 | var ... = ... |  |
+| cfg.swift:464:39:464:39 | (KeyPath<A, Int?>) ... | cfg.swift:464:28:464:51 | \\...[...] |  |
+| cfg.swift:464:39:464:39 | kpGet_mayB_x | cfg.swift:464:39:464:39 | (KeyPath<A, Int?>) ... |  |
+| cfg.swift:467:1:494:1 | enter testIfConfig() | cfg.swift:467:1:494:1 | testIfConfig() |  |
+| cfg.swift:467:1:494:1 | exit testIfConfig() (normal) | cfg.swift:467:1:494:1 | exit testIfConfig() |  |
+| cfg.swift:467:1:494:1 | testIfConfig() | cfg.swift:468:1:474:1 | #if ... |  |
+| cfg.swift:468:1:474:1 | #if ... | cfg.swift:472:3:472:3 | 3 |  |
+| cfg.swift:472:3:472:3 | 3 | cfg.swift:473:3:473:3 | 4 |  |
+| cfg.swift:473:3:473:3 | 4 | cfg.swift:476:3:476:3 | 5 |  |
+| cfg.swift:476:3:476:3 | 5 | cfg.swift:478:1:481:1 | #if ... |  |
+| cfg.swift:478:1:481:1 | #if ... | cfg.swift:483:3:483:3 | 8 |  |
+| cfg.swift:483:3:483:3 | 8 | cfg.swift:485:1:491:1 | #if ... |  |
+| cfg.swift:485:1:491:1 | #if ... | cfg.swift:489:3:489:3 | 11 |  |
+| cfg.swift:489:3:489:3 | 11 | cfg.swift:490:3:490:3 | 12 |  |
+| cfg.swift:490:3:490:3 | 12 | cfg.swift:493:3:493:3 | 13 |  |
+| cfg.swift:493:3:493:3 | 13 | cfg.swift:467:1:494:1 | exit testIfConfig() (normal) |  |
+| cfg.swift:496:1:520:1 | enter testAvailable() | cfg.swift:496:1:520:1 | testAvailable() |  |
+| cfg.swift:496:1:520:1 | exit testAvailable() (normal) | cfg.swift:496:1:520:1 | exit testAvailable() |  |
+| cfg.swift:496:1:520:1 | testAvailable() | cfg.swift:497:7:497:7 | x |  |
+| cfg.swift:497:3:497:11 | var ... = ... | cfg.swift:499:3:501:3 | if ... then { ... } |  |
+| cfg.swift:497:7:497:7 | x | cfg.swift:497:11:497:11 | 0 | match |
+| cfg.swift:497:11:497:11 | 0 | cfg.swift:497:3:497:11 | var ... = ... |  |
+| cfg.swift:499:3:501:3 | if ... then { ... } | cfg.swift:499:6:499:28 | StmtCondition |  |
+| cfg.swift:499:6:499:28 | #available | cfg.swift:500:7:500:7 | .+=(_:_:) | true |
+| cfg.swift:499:6:499:28 | #available | cfg.swift:503:3:505:3 | if ... then { ... } | false |
+| cfg.swift:499:6:499:28 | StmtCondition | cfg.swift:499:17:499:23 | macOS 10 |  |
+| cfg.swift:499:17:499:23 | macOS 10 | cfg.swift:499:27:499:27 | * |  |
+| cfg.swift:499:27:499:27 | * | cfg.swift:499:6:499:28 | #available |  |
+| cfg.swift:500:5:500:5 | &... | cfg.swift:500:10:500:10 | 1 |  |
+| cfg.swift:500:5:500:5 | x | cfg.swift:500:5:500:5 | &... |  |
+| cfg.swift:500:5:500:10 | ... .+=(_:_:) ... | cfg.swift:503:3:505:3 | if ... then { ... } |  |
+| cfg.swift:500:7:500:7 | .+=(_:_:) | cfg.swift:500:7:500:7 | Int.Type |  |
+| cfg.swift:500:7:500:7 | Int.Type | cfg.swift:500:5:500:5 | x |  |
+| cfg.swift:500:10:500:10 | 1 | cfg.swift:500:5:500:10 | ... .+=(_:_:) ... |  |
+| cfg.swift:503:3:505:3 | if ... then { ... } | cfg.swift:503:6:503:31 | StmtCondition |  |
+| cfg.swift:503:6:503:31 | #available | cfg.swift:504:7:504:7 | .+=(_:_:) | true |
+| cfg.swift:503:6:503:31 | #available | cfg.swift:507:3:509:3 | if ... then { ... } | false |
+| cfg.swift:503:6:503:31 | StmtCondition | cfg.swift:503:17:503:23 | macOS 10.13 |  |
+| cfg.swift:503:17:503:23 | macOS 10.13 | cfg.swift:503:30:503:30 | * |  |
+| cfg.swift:503:30:503:30 | * | cfg.swift:503:6:503:31 | #available |  |
+| cfg.swift:504:5:504:5 | &... | cfg.swift:504:10:504:10 | 1 |  |
+| cfg.swift:504:5:504:5 | x | cfg.swift:504:5:504:5 | &... |  |
+| cfg.swift:504:5:504:10 | ... .+=(_:_:) ... | cfg.swift:507:3:509:3 | if ... then { ... } |  |
+| cfg.swift:504:7:504:7 | .+=(_:_:) | cfg.swift:504:7:504:7 | Int.Type |  |
+| cfg.swift:504:7:504:7 | Int.Type | cfg.swift:504:5:504:5 | x |  |
+| cfg.swift:504:10:504:10 | 1 | cfg.swift:504:5:504:10 | ... .+=(_:_:) ... |  |
+| cfg.swift:507:3:509:3 | if ... then { ... } | cfg.swift:507:6:507:47 | StmtCondition |  |
+| cfg.swift:507:6:507:47 | #unavailable | cfg.swift:508:7:508:7 | .+=(_:_:) | true |
+| cfg.swift:507:6:507:47 | #unavailable | cfg.swift:511:3:513:3 | guard ... else { ... } | false |
+| cfg.swift:507:6:507:47 | StmtCondition | cfg.swift:507:19:507:23 | iOS 10 |  |
+| cfg.swift:507:19:507:23 | iOS 10 | cfg.swift:507:27:507:35 | watchOS 10 |  |
+| cfg.swift:507:27:507:35 | watchOS 10 | cfg.swift:507:39:507:45 | macOS 10 |  |
+| cfg.swift:507:39:507:45 | macOS 10 | cfg.swift:507:6:507:47 | #unavailable |  |
+| cfg.swift:508:5:508:5 | &... | cfg.swift:508:10:508:10 | 1 |  |
+| cfg.swift:508:5:508:5 | x | cfg.swift:508:5:508:5 | &... |  |
+| cfg.swift:508:5:508:10 | ... .+=(_:_:) ... | cfg.swift:511:3:513:3 | guard ... else { ... } |  |
+| cfg.swift:508:7:508:7 | .+=(_:_:) | cfg.swift:508:7:508:7 | Int.Type |  |
+| cfg.swift:508:7:508:7 | Int.Type | cfg.swift:508:5:508:5 | x |  |
+| cfg.swift:508:10:508:10 | 1 | cfg.swift:508:5:508:10 | ... .+=(_:_:) ... |  |
+| cfg.swift:511:3:513:3 | guard ... else { ... } | cfg.swift:511:9:511:31 | StmtCondition |  |
+| cfg.swift:511:9:511:31 | #available | cfg.swift:512:7:512:7 | .+=(_:_:) | false |
+| cfg.swift:511:9:511:31 | #available | cfg.swift:515:3:517:3 | if ... then { ... } | true |
+| cfg.swift:511:9:511:31 | StmtCondition | cfg.swift:511:20:511:26 | macOS 12 |  |
+| cfg.swift:511:20:511:26 | macOS 12 | cfg.swift:511:30:511:30 | * |  |
+| cfg.swift:511:30:511:30 | * | cfg.swift:511:9:511:31 | #available |  |
+| cfg.swift:512:5:512:5 | &... | cfg.swift:512:10:512:10 | 1 |  |
+| cfg.swift:512:5:512:5 | x | cfg.swift:512:5:512:5 | &... |  |
+| cfg.swift:512:5:512:10 | ... .+=(_:_:) ... | cfg.swift:515:3:517:3 | if ... then { ... } |  |
+| cfg.swift:512:7:512:7 | .+=(_:_:) | cfg.swift:512:7:512:7 | Int.Type |  |
+| cfg.swift:512:7:512:7 | Int.Type | cfg.swift:512:5:512:5 | x |  |
+| cfg.swift:512:10:512:10 | 1 | cfg.swift:512:5:512:10 | ... .+=(_:_:) ... |  |
+| cfg.swift:515:3:517:3 | if ... then { ... } | cfg.swift:515:6:515:51 | StmtCondition |  |
+| cfg.swift:515:6:515:28 | #available | cfg.swift:515:42:515:46 | iOS 12 | false, true |
+| cfg.swift:515:6:515:28 | #available | cfg.swift:519:10:519:10 | x | false |
+| cfg.swift:515:6:515:51 | StmtCondition | cfg.swift:515:17:515:23 | macOS 12 |  |
+| cfg.swift:515:17:515:23 | macOS 12 | cfg.swift:515:27:515:27 | * |  |
+| cfg.swift:515:27:515:27 | * | cfg.swift:515:6:515:28 | #available |  |
+| cfg.swift:515:31:515:51 | #available | cfg.swift:516:7:516:7 | .+=(_:_:) | true |
+| cfg.swift:515:31:515:51 | #available | cfg.swift:519:10:519:10 | x | false |
+| cfg.swift:515:42:515:46 | iOS 12 | cfg.swift:515:50:515:50 | * |  |
+| cfg.swift:515:50:515:50 | * | cfg.swift:515:31:515:51 | #available |  |
+| cfg.swift:516:5:516:5 | &... | cfg.swift:516:10:516:10 | 1 |  |
+| cfg.swift:516:5:516:5 | x | cfg.swift:516:5:516:5 | &... |  |
+| cfg.swift:516:5:516:10 | ... .+=(_:_:) ... | cfg.swift:519:10:519:10 | x |  |
+| cfg.swift:516:7:516:7 | .+=(_:_:) | cfg.swift:516:7:516:7 | Int.Type |  |
+| cfg.swift:516:7:516:7 | Int.Type | cfg.swift:516:5:516:5 | x |  |
+| cfg.swift:516:10:516:10 | 1 | cfg.swift:516:5:516:10 | ... .+=(_:_:) ... |  |
+| cfg.swift:519:3:519:10 | return ... | cfg.swift:496:1:520:1 | exit testAvailable() (normal) | return |
+| cfg.swift:519:10:519:10 | (Int) ... | cfg.swift:519:3:519:10 | return ... |  |
+| cfg.swift:519:10:519:10 | x | cfg.swift:519:10:519:10 | (Int) ... |  |
+| cfg.swift:522:1:536:1 | enter testAsyncFor() | cfg.swift:522:1:536:1 | testAsyncFor() |  |
+| cfg.swift:522:1:536:1 | exit testAsyncFor() (normal) | cfg.swift:522:1:536:1 | exit testAsyncFor() |  |
+| cfg.swift:522:1:536:1 | testAsyncFor() | cfg.swift:523:9:523:9 | stream |  |
+| cfg.swift:523:5:531:6 | var ... = ... | cfg.swift:533:24:533:24 | $i$generator |  |
+| cfg.swift:523:9:523:9 | stream | cfg.swift:523:18:523:18 | AsyncStream<Element>.init(_:bufferingPolicy:_:) | match |
+| cfg.swift:523:18:523:18 | AsyncStream<Element>.init(_:bufferingPolicy:_:) | cfg.swift:523:18:523:18 | AsyncStream<Int>.Type |  |
+| cfg.swift:523:18:523:18 | AsyncStream<Int>.Type | cfg.swift:523:30:523:30 | Int.Type |  |
+| cfg.swift:523:18:531:6 | call to AsyncStream<Element>.init(_:bufferingPolicy:_:) | cfg.swift:523:5:531:6 | var ... = ... |  |
+| cfg.swift:523:30:523:30 | Int.Type | cfg.swift:523:30:523:34 | .self |  |
+| cfg.swift:523:30:523:34 | .self | cfg.swift:523:57:523:58 | .bufferingNewest |  |
+| cfg.swift:523:57:523:57 | AsyncStream<Int>.Continuation.BufferingPolicy.Type | cfg.swift:523:74:523:74 | 5 |  |
+| cfg.swift:523:57:523:58 | .bufferingNewest | cfg.swift:523:57:523:57 | AsyncStream<Int>.Continuation.BufferingPolicy.Type |  |
+| cfg.swift:523:57:523:75 | call to ... | cfg.swift:523:78:531:5 | { ... } |  |
+| cfg.swift:523:74:523:74 | 5 | cfg.swift:523:57:523:75 | call to ... |  |
+| cfg.swift:523:78:531:5 | enter { ... } | cfg.swift:523:78:531:5 | { ... } |  |
+| cfg.swift:523:78:531:5 | exit { ... } (normal) | cfg.swift:523:78:531:5 | exit { ... } |  |
+| cfg.swift:523:78:531:5 | { ... } | cfg.swift:523:18:531:6 | call to AsyncStream<Element>.init(_:bufferingPolicy:_:) |  |
+| cfg.swift:523:78:531:5 | { ... } | cfg.swift:524:9:524:9 | continuation |  |
+| cfg.swift:524:9:524:9 | continuation | cfg.swift:525:13:525:18 | .detached(priority:operation:) |  |
+| cfg.swift:525:13:525:13 | Task<(), Never>.Type | cfg.swift:525:27:525:27 | default priority |  |
+| cfg.swift:525:13:525:18 | .detached(priority:operation:) | cfg.swift:525:13:525:13 | Task<(), Never>.Type |  |
+| cfg.swift:525:13:530:13 | call to detached(priority:operation:) | cfg.swift:523:78:531:5 | exit { ... } (normal) |  |
+| cfg.swift:525:27:525:27 | default priority | cfg.swift:525:27:530:13 | { ... } |  |
+| cfg.swift:525:27:530:13 | enter { ... } | cfg.swift:525:27:530:13 | { ... } |  |
+| cfg.swift:525:27:530:13 | exit { ... } (normal) | cfg.swift:525:27:530:13 | exit { ... } |  |
+| cfg.swift:525:27:530:13 | { ... } | cfg.swift:525:13:530:13 | call to detached(priority:operation:) |  |
+| cfg.swift:525:27:530:13 | { ... } | cfg.swift:526:26:526:26 | $i$generator |  |
+| cfg.swift:526:17:526:17 | $i$generator | cfg.swift:526:17:526:17 | &... |  |
+| cfg.swift:526:17:526:17 | &... | cfg.swift:526:17:526:17 | call to next() |  |
+| cfg.swift:526:17:526:17 | .next() | cfg.swift:526:17:526:17 | $i$generator |  |
+| cfg.swift:526:17:526:17 | call to next() | cfg.swift:526:17:528:17 | for ... in ... { ... } |  |
+| cfg.swift:526:17:528:17 | for ... in ... { ... } | cfg.swift:526:21:526:21 | i | non-empty |
+| cfg.swift:526:17:528:17 | for ... in ... { ... } | cfg.swift:529:17:529:30 | .finish() | empty |
+| cfg.swift:526:21:526:21 | i | cfg.swift:527:21:527:34 | .yield(_:) | match |
+| cfg.swift:526:26:526:26 | 1 | cfg.swift:526:30:526:30 | 100 |  |
+| cfg.swift:526:26:526:26 | $i$generator | cfg.swift:526:26:526:30 | .makeIterator() | match |
+| cfg.swift:526:26:526:30 | ... ....(_:_:) ... | cfg.swift:526:26:526:30 | call to makeIterator() |  |
+| cfg.swift:526:26:526:30 | .makeIterator() | cfg.swift:526:27:526:27 | ....(_:_:) |  |
+| cfg.swift:526:26:526:30 | call to makeIterator() | file://:0:0:0:0 | var ... = ... |  |
+| cfg.swift:526:27:526:27 | ....(_:_:) | cfg.swift:526:27:526:27 | Int.Type |  |
+| cfg.swift:526:27:526:27 | Int.Type | cfg.swift:526:26:526:26 | 1 |  |
+| cfg.swift:526:30:526:30 | 100 | cfg.swift:526:26:526:30 | ... ....(_:_:) ... |  |
+| cfg.swift:527:21:527:21 | continuation | cfg.swift:527:40:527:40 | i |  |
+| cfg.swift:527:21:527:34 | .yield(_:) | cfg.swift:527:21:527:21 | continuation |  |
+| cfg.swift:527:21:527:41 | call to yield(_:) | cfg.swift:526:17:526:17 | .next() |  |
+| cfg.swift:527:40:527:40 | i | cfg.swift:527:21:527:41 | call to yield(_:) |  |
+| cfg.swift:529:17:529:17 | continuation | cfg.swift:529:17:529:37 | call to finish() |  |
+| cfg.swift:529:17:529:30 | .finish() | cfg.swift:529:17:529:17 | continuation |  |
+| cfg.swift:529:17:529:37 | call to finish() | cfg.swift:525:27:530:13 | exit { ... } (normal) |  |
+| cfg.swift:533:5:533:5 | $i$generator | cfg.swift:533:5:533:5 | &... |  |
+| cfg.swift:533:5:533:5 | &... | cfg.swift:533:5:533:5 | call to next() |  |
+| cfg.swift:533:5:533:5 | .next() | cfg.swift:533:5:533:5 | $i$generator |  |
+| cfg.swift:533:5:533:5 | call to next() | file://:0:0:0:0 | await ... |  |
+| cfg.swift:533:5:535:5 | for ... in ... { ... } | cfg.swift:522:1:536:1 | exit testAsyncFor() (normal) | empty |
+| cfg.swift:533:5:535:5 | for ... in ... { ... } | cfg.swift:533:19:533:19 | i | non-empty |
+| cfg.swift:533:19:533:19 | i | cfg.swift:534:9:534:9 | print(_:separator:terminator:) | match |
+| cfg.swift:533:24:533:24 | $i$generator | cfg.swift:533:24:533:24 | .makeAsyncIterator() | match |
+| cfg.swift:533:24:533:24 | (AsyncStream<Int>) ... | cfg.swift:533:24:533:24 | call to makeAsyncIterator() |  |
+| cfg.swift:533:24:533:24 | .makeAsyncIterator() | cfg.swift:533:24:533:24 | stream |  |
+| cfg.swift:533:24:533:24 | call to makeAsyncIterator() | file://:0:0:0:0 | var ... = ... |  |
+| cfg.swift:533:24:533:24 | stream | cfg.swift:533:24:533:24 | (AsyncStream<Int>) ... |  |
+| cfg.swift:534:9:534:9 | print(_:separator:terminator:) | cfg.swift:534:15:534:15 | i |  |
+| cfg.swift:534:9:534:16 | call to print(_:separator:terminator:) | cfg.swift:533:5:533:5 | .next() |  |
+| cfg.swift:534:14:534:14 | default separator | cfg.swift:534:14:534:14 | default terminator |  |
+| cfg.swift:534:14:534:14 | default terminator | cfg.swift:534:9:534:16 | call to print(_:separator:terminator:) |  |
+| cfg.swift:534:15:534:15 | (Any) ... | cfg.swift:534:15:534:15 | [...] |  |
+| cfg.swift:534:15:534:15 | [...] | cfg.swift:534:14:534:14 | default separator |  |
+| cfg.swift:534:15:534:15 | [...] | cfg.swift:534:15:534:15 | [...] |  |
+| cfg.swift:534:15:534:15 | i | cfg.swift:534:15:534:15 | (Any) ... |  |
+| cfg.swift:538:1:540:1 | enter testNilCoalescing(x:) | cfg.swift:538:1:540:1 | testNilCoalescing(x:) |  |
+| cfg.swift:538:1:540:1 | exit testNilCoalescing(x:) (abnormal) | cfg.swift:538:1:540:1 | exit testNilCoalescing(x:) |  |
+| cfg.swift:538:1:540:1 | exit testNilCoalescing(x:) (normal) | cfg.swift:538:1:540:1 | exit testNilCoalescing(x:) |  |
+| cfg.swift:538:1:540:1 | testNilCoalescing(x:) | cfg.swift:538:24:538:30 | x |  |
+| cfg.swift:538:24:538:30 | x | cfg.swift:539:10:539:10 | x |  |
+| cfg.swift:539:3:539:15 | return ... | cfg.swift:538:1:540:1 | exit testNilCoalescing(x:) (normal) | return |
+| cfg.swift:539:10:539:10 | x | cfg.swift:539:10:539:15 | emptiness test for ... ??(_:_:) ... |  |
+| cfg.swift:539:10:539:15 | ... ??(_:_:) ... | cfg.swift:538:1:540:1 | exit testNilCoalescing(x:) (abnormal) | exception |
+| cfg.swift:539:10:539:15 | ... ??(_:_:) ... | cfg.swift:539:3:539:15 | return ... |  |
+| cfg.swift:539:10:539:15 | emptiness test for ... ??(_:_:) ... | cfg.swift:539:10:539:15 | ... ??(_:_:) ... | non-empty |
+| cfg.swift:539:10:539:15 | emptiness test for ... ??(_:_:) ... | cfg.swift:539:15:539:15 | { ... } | empty |
+| cfg.swift:539:15:539:15 | 0 | cfg.swift:539:15:539:15 | return ... |  |
+| cfg.swift:539:15:539:15 | return ... | cfg.swift:539:10:539:15 | ... ??(_:_:) ... |  |
+| cfg.swift:539:15:539:15 | { ... } | cfg.swift:539:15:539:15 | 0 |  |
+| cfg.swift:542:1:548:1 | enter testNilCoalescing2(x:) | cfg.swift:542:1:548:1 | testNilCoalescing2(x:) |  |
+| cfg.swift:542:1:548:1 | exit testNilCoalescing2(x:) (abnormal) | cfg.swift:542:1:548:1 | exit testNilCoalescing2(x:) |  |
+| cfg.swift:542:1:548:1 | exit testNilCoalescing2(x:) (normal) | cfg.swift:542:1:548:1 | exit testNilCoalescing2(x:) |  |
+| cfg.swift:542:1:548:1 | testNilCoalescing2(x:) | cfg.swift:542:25:542:32 | x |  |
+| cfg.swift:542:25:542:32 | x | cfg.swift:543:3:547:3 | if ... then { ... } else { ... } |  |
+| cfg.swift:543:3:547:3 | if ... then { ... } else { ... } | cfg.swift:543:6:543:11 | StmtCondition |  |
+| cfg.swift:543:6:543:6 | x | cfg.swift:543:6:543:11 | emptiness test for ... ??(_:_:) ... |  |
+| cfg.swift:543:6:543:11 | ... ??(_:_:) ... | cfg.swift:542:1:548:1 | exit testNilCoalescing2(x:) (abnormal) | exception |
+| cfg.swift:543:6:543:11 | ... ??(_:_:) ... | cfg.swift:544:12:544:12 | 1 | true |
+| cfg.swift:543:6:543:11 | ... ??(_:_:) ... | cfg.swift:546:12:546:12 | 0 | false |
+| cfg.swift:543:6:543:11 | StmtCondition | cfg.swift:543:6:543:6 | x |  |
+| cfg.swift:543:6:543:11 | emptiness test for ... ??(_:_:) ... | cfg.swift:543:6:543:11 | ... ??(_:_:) ... | non-empty |
+| cfg.swift:543:6:543:11 | emptiness test for ... ??(_:_:) ... | cfg.swift:543:11:543:11 | { ... } | empty |
+| cfg.swift:543:11:543:11 | false | cfg.swift:543:11:543:11 | return ... |  |
+| cfg.swift:543:11:543:11 | return ... | cfg.swift:543:6:543:11 | ... ??(_:_:) ... |  |
+| cfg.swift:543:11:543:11 | { ... } | cfg.swift:543:11:543:11 | false |  |
+| cfg.swift:544:5:544:12 | return ... | cfg.swift:542:1:548:1 | exit testNilCoalescing2(x:) (normal) | return |
+| cfg.swift:544:12:544:12 | 1 | cfg.swift:544:5:544:12 | return ... |  |
+| cfg.swift:546:5:546:12 | return ... | cfg.swift:542:1:548:1 | exit testNilCoalescing2(x:) (normal) | return |
+| cfg.swift:546:12:546:12 | 0 | cfg.swift:546:5:546:12 | return ... |  |
+| cfg.swift:550:1:552:1 | enter usesAutoclosure(_:) | cfg.swift:550:1:552:1 | usesAutoclosure(_:) |  |
+| cfg.swift:550:1:552:1 | exit usesAutoclosure(_:) (normal) | cfg.swift:550:1:552:1 | exit usesAutoclosure(_:) |  |
+| cfg.swift:550:1:552:1 | usesAutoclosure(_:) | cfg.swift:550:22:550:49 | expr |  |
+| cfg.swift:550:22:550:49 | expr | cfg.swift:551:10:551:10 | expr |  |
+| cfg.swift:551:3:551:15 | return ... | cfg.swift:550:1:552:1 | exit usesAutoclosure(_:) (normal) | return |
+| cfg.swift:551:10:551:10 | expr | cfg.swift:551:10:551:15 | call to ... |  |
+| cfg.swift:551:10:551:15 | call to ... | cfg.swift:551:3:551:15 | return ... |  |
+| cfg.swift:554:1:556:1 | autoclosureTest() | cfg.swift:555:3:555:3 | usesAutoclosure(_:) |  |
+| cfg.swift:554:1:556:1 | enter autoclosureTest() | cfg.swift:554:1:556:1 | autoclosureTest() |  |
+| cfg.swift:554:1:556:1 | exit autoclosureTest() (normal) | cfg.swift:554:1:556:1 | exit autoclosureTest() |  |
+| cfg.swift:555:3:555:3 | usesAutoclosure(_:) | cfg.swift:555:19:555:19 | { ... } |  |
+| cfg.swift:555:3:555:20 | call to usesAutoclosure(_:) | cfg.swift:554:1:556:1 | exit autoclosureTest() (normal) |  |
+| cfg.swift:555:19:555:19 | 1 | cfg.swift:555:19:555:19 | return ... |  |
+| cfg.swift:555:19:555:19 | enter { ... } | cfg.swift:555:19:555:19 | { ... } |  |
+| cfg.swift:555:19:555:19 | exit { ... } (normal) | cfg.swift:555:19:555:19 | exit { ... } |  |
+| cfg.swift:555:19:555:19 | return ... | cfg.swift:555:19:555:19 | exit { ... } (normal) |  |
+| cfg.swift:555:19:555:19 | { ... } | cfg.swift:555:3:555:20 | call to usesAutoclosure(_:) |  |
+| cfg.swift:555:19:555:19 | { ... } | cfg.swift:555:19:555:19 | 1 |  |
+| cfg.swift:564:7:564:7 | MyProcotolImpl.deinit() | cfg.swift:564:7:564:7 | self |  |
+| cfg.swift:564:7:564:7 | MyProcotolImpl.init() | cfg.swift:564:7:564:7 | self |  |
+| cfg.swift:564:7:564:7 | enter MyProcotolImpl.deinit() | cfg.swift:564:7:564:7 | MyProcotolImpl.deinit() |  |
+| cfg.swift:564:7:564:7 | enter MyProcotolImpl.init() | cfg.swift:564:7:564:7 | MyProcotolImpl.init() |  |
+| cfg.swift:564:7:564:7 | exit MyProcotolImpl.deinit() (normal) | cfg.swift:564:7:564:7 | exit MyProcotolImpl.deinit() |  |
+| cfg.swift:564:7:564:7 | exit MyProcotolImpl.init() (normal) | cfg.swift:564:7:564:7 | exit MyProcotolImpl.init() |  |
+| cfg.swift:564:7:564:7 | return | cfg.swift:564:7:564:7 | exit MyProcotolImpl.init() (normal) | return |
+| cfg.swift:564:7:564:7 | self | cfg.swift:564:7:564:7 | return |  |
+| cfg.swift:564:7:564:7 | self | cfg.swift:564:7:564:7 | { ... } |  |
+| cfg.swift:564:7:564:7 | { ... } | cfg.swift:564:7:564:7 | exit MyProcotolImpl.deinit() (normal) |  |
+| cfg.swift:565:2:565:34 | enter source() | cfg.swift:565:2:565:34 | source() |  |
+| cfg.swift:565:2:565:34 | exit source() (normal) | cfg.swift:565:2:565:34 | exit source() |  |
+| cfg.swift:565:2:565:34 | source() | cfg.swift:565:7:565:7 | self |  |
+| cfg.swift:565:7:565:7 | self | cfg.swift:565:32:565:32 | 0 |  |
+| cfg.swift:565:25:565:32 | return ... | cfg.swift:565:2:565:34 | exit source() (normal) | return |
+| cfg.swift:565:32:565:32 | 0 | cfg.swift:565:25:565:32 | return ... |  |
+| cfg.swift:568:1:568:62 | enter getMyProtocol() | cfg.swift:568:1:568:62 | getMyProtocol() |  |
+| cfg.swift:568:1:568:62 | exit getMyProtocol() (normal) | cfg.swift:568:1:568:62 | exit getMyProtocol() |  |
+| cfg.swift:568:1:568:62 | getMyProtocol() | cfg.swift:568:45:568:45 | MyProcotolImpl.init() |  |
+| cfg.swift:568:38:568:60 | return ... | cfg.swift:568:1:568:62 | exit getMyProtocol() (normal) | return |
+| cfg.swift:568:45:568:45 | MyProcotolImpl.Type | cfg.swift:568:45:568:60 | call to MyProcotolImpl.init() |  |
+| cfg.swift:568:45:568:45 | MyProcotolImpl.init() | cfg.swift:568:45:568:45 | MyProcotolImpl.Type |  |
+| cfg.swift:568:45:568:60 | (any MyProtocol) ... | cfg.swift:568:38:568:60 | return ... |  |
+| cfg.swift:568:45:568:60 | call to MyProcotolImpl.init() | cfg.swift:568:45:568:60 | (any MyProtocol) ... |  |
+| cfg.swift:569:1:569:70 | enter getMyProtocolImpl() | cfg.swift:569:1:569:70 | getMyProtocolImpl() |  |
+| cfg.swift:569:1:569:70 | exit getMyProtocolImpl() (normal) | cfg.swift:569:1:569:70 | exit getMyProtocolImpl() |  |
+| cfg.swift:569:1:569:70 | getMyProtocolImpl() | cfg.swift:569:53:569:53 | MyProcotolImpl.init() |  |
+| cfg.swift:569:46:569:68 | return ... | cfg.swift:569:1:569:70 | exit getMyProtocolImpl() (normal) | return |
+| cfg.swift:569:53:569:53 | MyProcotolImpl.Type | cfg.swift:569:53:569:68 | call to MyProcotolImpl.init() |  |
+| cfg.swift:569:53:569:53 | MyProcotolImpl.init() | cfg.swift:569:53:569:53 | MyProcotolImpl.Type |  |
+| cfg.swift:569:53:569:68 | call to MyProcotolImpl.init() | cfg.swift:569:46:569:68 | return ... |  |
+| cfg.swift:571:1:571:23 | enter sink(arg:) | cfg.swift:571:1:571:23 | sink(arg:) |  |
+| cfg.swift:571:1:571:23 | exit sink(arg:) (normal) | cfg.swift:571:1:571:23 | exit sink(arg:) |  |
+| cfg.swift:571:1:571:23 | sink(arg:) | cfg.swift:571:11:571:16 | arg |  |
+| cfg.swift:571:11:571:16 | arg | cfg.swift:571:21:571:23 | { ... } |  |
+| cfg.swift:571:21:571:23 | { ... } | cfg.swift:571:1:571:23 | exit sink(arg:) (normal) |  |
+| cfg.swift:573:1:578:1 | enter testOpenExistentialExpr(x:y:) | cfg.swift:573:1:578:1 | testOpenExistentialExpr(x:y:) |  |
+| cfg.swift:573:1:578:1 | exit testOpenExistentialExpr(x:y:) (normal) | cfg.swift:573:1:578:1 | exit testOpenExistentialExpr(x:y:) |  |
+| cfg.swift:573:1:578:1 | testOpenExistentialExpr(x:y:) | cfg.swift:573:30:573:33 | x |  |
+| cfg.swift:573:30:573:33 | x | cfg.swift:573:45:573:48 | y |  |
+| cfg.swift:573:45:573:48 | y | cfg.swift:574:2:574:2 | sink(arg:) |  |
+| cfg.swift:574:2:574:2 | sink(arg:) | cfg.swift:574:12:574:12 | x |  |
+| cfg.swift:574:2:574:22 | call to sink(arg:) | cfg.swift:575:2:575:2 | sink(arg:) |  |
+| cfg.swift:574:12:574:12 | OpaqueValueExpr | cfg.swift:574:12:574:21 | call to source() |  |
+| cfg.swift:574:12:574:12 | x | cfg.swift:574:12:574:14 | .source() |  |
+| cfg.swift:574:12:574:14 | .source() | cfg.swift:574:12:574:12 | OpaqueValueExpr |  |
+| cfg.swift:574:12:574:21 | OpenExistentialExpr | cfg.swift:574:2:574:22 | call to sink(arg:) |  |
+| cfg.swift:574:12:574:21 | call to source() | cfg.swift:574:12:574:21 | OpenExistentialExpr |  |
+| cfg.swift:575:2:575:2 | sink(arg:) | cfg.swift:575:12:575:14 | .source() |  |
+| cfg.swift:575:2:575:22 | call to sink(arg:) | cfg.swift:576:2:576:2 | sink(arg:) |  |
+| cfg.swift:575:12:575:12 | y | cfg.swift:575:12:575:21 | call to source() |  |
+| cfg.swift:575:12:575:14 | .source() | cfg.swift:575:12:575:12 | y |  |
+| cfg.swift:575:12:575:21 | call to source() | cfg.swift:575:2:575:22 | call to sink(arg:) |  |
+| cfg.swift:576:2:576:2 | sink(arg:) | cfg.swift:576:12:576:12 | getMyProtocol() |  |
+| cfg.swift:576:2:576:36 | call to sink(arg:) | cfg.swift:577:2:577:2 | sink(arg:) |  |
+| cfg.swift:576:12:576:12 | getMyProtocol() | cfg.swift:576:12:576:26 | call to getMyProtocol() |  |
+| cfg.swift:576:12:576:26 | OpaqueValueExpr | cfg.swift:576:12:576:35 | call to source() |  |
+| cfg.swift:576:12:576:26 | call to getMyProtocol() | cfg.swift:576:12:576:28 | .source() |  |
+| cfg.swift:576:12:576:28 | .source() | cfg.swift:576:12:576:26 | OpaqueValueExpr |  |
+| cfg.swift:576:12:576:35 | OpenExistentialExpr | cfg.swift:576:2:576:36 | call to sink(arg:) |  |
+| cfg.swift:576:12:576:35 | call to source() | cfg.swift:576:12:576:35 | OpenExistentialExpr |  |
+| cfg.swift:577:2:577:2 | sink(arg:) | cfg.swift:577:12:577:32 | .source() |  |
+| cfg.swift:577:2:577:40 | call to sink(arg:) | cfg.swift:573:1:578:1 | exit testOpenExistentialExpr(x:y:) (normal) |  |
+| cfg.swift:577:12:577:12 | getMyProtocolImpl() | cfg.swift:577:12:577:30 | call to getMyProtocolImpl() |  |
+| cfg.swift:577:12:577:30 | call to getMyProtocolImpl() | cfg.swift:577:12:577:39 | call to source() |  |
+| cfg.swift:577:12:577:32 | .source() | cfg.swift:577:12:577:12 | getMyProtocolImpl() |  |
+| cfg.swift:577:12:577:39 | call to source() | cfg.swift:577:2:577:40 | call to sink(arg:) |  |
+| cfg.swift:580:1:586:1 | enter singleStmtExpr(_:) | cfg.swift:580:1:586:1 | singleStmtExpr(_:) |  |
+| cfg.swift:580:1:586:1 | exit singleStmtExpr(_:) (normal) | cfg.swift:580:1:586:1 | exit singleStmtExpr(_:) |  |
+| cfg.swift:580:1:586:1 | singleStmtExpr(_:) | cfg.swift:580:21:580:26 | x |  |
+| cfg.swift:580:21:580:26 | x | cfg.swift:581:7:581:7 | a |  |
+| cfg.swift:581:3:584:3 | var ... = ... | cfg.swift:585:7:585:7 | b |  |
+| cfg.swift:581:7:581:7 | a | cfg.swift:581:11:584:3 | switch x { ... } | match |
+| cfg.swift:581:11:584:3 | SingleValueStmtExpr | cfg.swift:581:3:584:3 | var ... = ... |  |
+| cfg.swift:581:11:584:3 | switch x { ... } | cfg.swift:581:18:581:18 | x |  |
+| cfg.swift:581:18:581:18 | x | cfg.swift:582:5:582:17 | case ... |  |
+| cfg.swift:582:5:582:17 | case ... | cfg.swift:582:10:582:14 | =~ ... |  |
+| cfg.swift:582:10:582:10 | 0 | cfg.swift:582:14:582:14 | 5 |  |
+| cfg.swift:582:10:582:10 | .~=(_:_:) | cfg.swift:582:10:582:10 | Range<Int>.Type |  |
+| cfg.swift:582:10:582:10 | Range<Int>.Type | cfg.swift:582:11:582:11 | ...<(_:_:) |  |
+| cfg.swift:582:10:582:14 | ... ...<(_:_:) ... | cfg.swift:582:14:582:14 | $match |  |
+| cfg.swift:582:10:582:14 | ... .~=(_:_:) ... | cfg.swift:582:10:582:14 | =~ ... |  |
+| cfg.swift:582:10:582:14 | =~ ... | cfg.swift:582:10:582:10 | .~=(_:_:) |  |
+| cfg.swift:582:10:582:14 | =~ ... | cfg.swift:582:17:582:17 | 1 | match |
+| cfg.swift:582:10:582:14 | =~ ... | cfg.swift:583:5:583:14 | case ... | no-match |
+| cfg.swift:582:11:582:11 | ...<(_:_:) | cfg.swift:582:11:582:11 | Int.Type |  |
+| cfg.swift:582:11:582:11 | Int.Type | cfg.swift:582:10:582:10 | 0 |  |
+| cfg.swift:582:14:582:14 | 5 | cfg.swift:582:10:582:14 | ... ...<(_:_:) ... |  |
+| cfg.swift:582:14:582:14 | $match | cfg.swift:582:10:582:14 | ... .~=(_:_:) ... |  |
+| cfg.swift:582:17:582:17 | 1 | cfg.swift:582:17:582:17 | ThenStmt |  |
+| cfg.swift:582:17:582:17 | ThenStmt | cfg.swift:581:11:584:3 | SingleValueStmtExpr |  |
+| cfg.swift:583:5:583:5 | _ | cfg.swift:583:5:583:5 | _ |  |
+| cfg.swift:583:5:583:5 | _ | cfg.swift:583:14:583:14 | 2 | match |
+| cfg.swift:583:5:583:14 | case ... | cfg.swift:583:5:583:5 | _ |  |
+| cfg.swift:583:14:583:14 | 2 | cfg.swift:583:14:583:14 | ThenStmt |  |
+| cfg.swift:583:14:583:14 | ThenStmt | cfg.swift:581:11:584:3 | SingleValueStmtExpr |  |
+| cfg.swift:585:3:585:38 | var ... = ... | cfg.swift:580:1:586:1 | exit singleStmtExpr(_:) (normal) |  |
+| cfg.swift:585:7:585:7 | b | cfg.swift:585:11:585:38 | if ... then { ... } else { ... } | match |
+| cfg.swift:585:11:585:38 | SingleValueStmtExpr | cfg.swift:585:3:585:38 | var ... = ... |  |
+| cfg.swift:585:11:585:38 | if ... then { ... } else { ... } | cfg.swift:585:14:585:21 | StmtCondition |  |
+| cfg.swift:585:14:585:21 | StmtCondition | cfg.swift:585:17:585:17 | .<(_:_:) |  |
+| cfg.swift:585:14:585:21 | [false] (...) | cfg.swift:585:36:585:36 | 2 | false |
+| cfg.swift:585:14:585:21 | [true] (...) | cfg.swift:585:25:585:25 | 1 | true |
+| cfg.swift:585:15:585:15 | x | cfg.swift:585:19:585:19 | 42 |  |
+| cfg.swift:585:15:585:19 | ... .<(_:_:) ... | cfg.swift:585:14:585:21 | [false] (...) | false |
+| cfg.swift:585:15:585:19 | ... .<(_:_:) ... | cfg.swift:585:14:585:21 | [true] (...) | true |
+| cfg.swift:585:17:585:17 | .<(_:_:) | cfg.swift:585:17:585:17 | Int.Type |  |
+| cfg.swift:585:17:585:17 | Int.Type | cfg.swift:585:15:585:15 | x |  |
+| cfg.swift:585:19:585:19 | 42 | cfg.swift:585:15:585:19 | ... .<(_:_:) ... |  |
+| cfg.swift:585:25:585:25 | 1 | cfg.swift:585:25:585:25 | ThenStmt |  |
+| cfg.swift:585:25:585:25 | ThenStmt | cfg.swift:585:11:585:38 | SingleValueStmtExpr |  |
+| cfg.swift:585:36:585:36 | 2 | cfg.swift:585:36:585:36 | ThenStmt |  |
+| cfg.swift:585:36:585:36 | ThenStmt | cfg.swift:585:11:585:38 | SingleValueStmtExpr |  |
+| file://:0:0:0:0 |  ... = ... | cfg.swift:394:7:394:7 | exit set (normal) |  |
+| file://:0:0:0:0 |  ... = ... | cfg.swift:410:9:410:9 | exit set (normal) |  |
+| file://:0:0:0:0 |  ... = ... | cfg.swift:417:9:417:9 | exit set (normal) |  |
+| file://:0:0:0:0 |  ... = ... | cfg.swift:446:7:446:7 | exit set (normal) |  |
+| file://:0:0:0:0 |  ... = ... | cfg.swift:450:7:450:7 | exit set (normal) |  |
+| file://:0:0:0:0 |  ... = ... | cfg.swift:451:7:451:7 | exit set (normal) |  |
+| file://:0:0:0:0 |  ... = ... | cfg.swift:452:7:452:7 | exit set (normal) |  |
+| file://:0:0:0:0 | &... | cfg.swift:394:7:394:7 | yield ... |  |
+| file://:0:0:0:0 | &... | cfg.swift:410:9:410:9 | yield ... |  |
+| file://:0:0:0:0 | &... | cfg.swift:417:9:417:9 | yield ... |  |
+| file://:0:0:0:0 | &... | cfg.swift:446:7:446:7 | yield ... |  |
+| file://:0:0:0:0 | &... | cfg.swift:450:7:450:7 | yield ... |  |
+| file://:0:0:0:0 | &... | cfg.swift:451:7:451:7 | yield ... |  |
+| file://:0:0:0:0 | &... | cfg.swift:452:7:452:7 | yield ... |  |
+| file://:0:0:0:0 | .b | file://:0:0:0:0 | return ... |  |
+| file://:0:0:0:0 | .b | file://:0:0:0:0 | value |  |
+| file://:0:0:0:0 | .bs | file://:0:0:0:0 | return ... |  |
+| file://:0:0:0:0 | .bs | file://:0:0:0:0 | value |  |
+| file://:0:0:0:0 | .c | file://:0:0:0:0 | return ... |  |
+| file://:0:0:0:0 | .field | file://:0:0:0:0 | return ... |  |
+| file://:0:0:0:0 | .field | file://:0:0:0:0 | value |  |
+| file://:0:0:0:0 | .mayB | file://:0:0:0:0 | return ... |  |
+| file://:0:0:0:0 | .mayB | file://:0:0:0:0 | value |  |
+| file://:0:0:0:0 | .myInt | file://:0:0:0:0 | return ... |  |
+| file://:0:0:0:0 | .x | file://:0:0:0:0 | return ... |  |
+| file://:0:0:0:0 | .x | file://:0:0:0:0 | return ... |  |
+| file://:0:0:0:0 | .x | file://:0:0:0:0 | return ... |  |
+| file://:0:0:0:0 | .x | file://:0:0:0:0 | value |  |
+| file://:0:0:0:0 | .x | file://:0:0:0:0 | value |  |
+| file://:0:0:0:0 | .x | file://:0:0:0:0 | value |  |
+| file://:0:0:0:0 | KeyPathComponent | cfg.swift:459:22:459:31 | #keyPath(...) |  |
+| file://:0:0:0:0 | await ... | cfg.swift:533:5:535:5 | for ... in ... { ... } |  |
+| file://:0:0:0:0 | getter for .b | file://:0:0:0:0 | &... |  |
+| file://:0:0:0:0 | getter for .bs | file://:0:0:0:0 | &... |  |
+| file://:0:0:0:0 | getter for .field | file://:0:0:0:0 | &... |  |
+| file://:0:0:0:0 | getter for .mayB | file://:0:0:0:0 | &... |  |
+| file://:0:0:0:0 | getter for .x | file://:0:0:0:0 | &... |  |
+| file://:0:0:0:0 | getter for .x | file://:0:0:0:0 | &... |  |
+| file://:0:0:0:0 | getter for .x | file://:0:0:0:0 | &... |  |
+| file://:0:0:0:0 | n | cfg.swift:377:7:377:7 | _unimplementedInitializer(className:initName:file:line:column:) |  |
+| file://:0:0:0:0 | return | cfg.swift:377:19:377:19 | exit Derived.init(n:) (normal) | return |
+| file://:0:0:0:0 | return ... | cfg.swift:99:7:99:7 | exit get (normal) | return |
+| file://:0:0:0:0 | return ... | cfg.swift:353:7:353:7 | exit get (normal) | return |
+| file://:0:0:0:0 | return ... | cfg.swift:394:7:394:7 | exit get (normal) | return |
+| file://:0:0:0:0 | return ... | cfg.swift:410:9:410:9 | exit get (normal) | return |
+| file://:0:0:0:0 | return ... | cfg.swift:417:9:417:9 | exit get (normal) | return |
+| file://:0:0:0:0 | return ... | cfg.swift:446:7:446:7 | exit get (normal) | return |
+| file://:0:0:0:0 | return ... | cfg.swift:450:7:450:7 | exit get (normal) | return |
+| file://:0:0:0:0 | return ... | cfg.swift:451:7:451:7 | exit get (normal) | return |
+| file://:0:0:0:0 | return ... | cfg.swift:452:7:452:7 | exit get (normal) | return |
+| file://:0:0:0:0 | self | file://:0:0:0:0 | .b |  |
+| file://:0:0:0:0 | self | file://:0:0:0:0 | .b |  |
+| file://:0:0:0:0 | self | file://:0:0:0:0 | .bs |  |
+| file://:0:0:0:0 | self | file://:0:0:0:0 | .bs |  |
+| file://:0:0:0:0 | self | file://:0:0:0:0 | .c |  |
+| file://:0:0:0:0 | self | file://:0:0:0:0 | .field |  |
+| file://:0:0:0:0 | self | file://:0:0:0:0 | .field |  |
+| file://:0:0:0:0 | self | file://:0:0:0:0 | .mayB |  |
+| file://:0:0:0:0 | self | file://:0:0:0:0 | .mayB |  |
+| file://:0:0:0:0 | self | file://:0:0:0:0 | .myInt |  |
+| file://:0:0:0:0 | self | file://:0:0:0:0 | .x |  |
+| file://:0:0:0:0 | self | file://:0:0:0:0 | .x |  |
+| file://:0:0:0:0 | self | file://:0:0:0:0 | .x |  |
+| file://:0:0:0:0 | self | file://:0:0:0:0 | .x |  |
+| file://:0:0:0:0 | self | file://:0:0:0:0 | .x |  |
+| file://:0:0:0:0 | self | file://:0:0:0:0 | .x |  |
+| file://:0:0:0:0 | self | file://:0:0:0:0 | getter for .b |  |
+| file://:0:0:0:0 | self | file://:0:0:0:0 | getter for .bs |  |
+| file://:0:0:0:0 | self | file://:0:0:0:0 | getter for .field |  |
+| file://:0:0:0:0 | self | file://:0:0:0:0 | getter for .mayB |  |
+| file://:0:0:0:0 | self | file://:0:0:0:0 | getter for .x |  |
+| file://:0:0:0:0 | self | file://:0:0:0:0 | getter for .x |  |
+| file://:0:0:0:0 | self | file://:0:0:0:0 | getter for .x |  |
+| file://:0:0:0:0 | value | file://:0:0:0:0 |  ... = ... |  |
+| file://:0:0:0:0 | value | file://:0:0:0:0 |  ... = ... |  |
+| file://:0:0:0:0 | value | file://:0:0:0:0 |  ... = ... |  |
+| file://:0:0:0:0 | value | file://:0:0:0:0 |  ... = ... |  |
+| file://:0:0:0:0 | value | file://:0:0:0:0 |  ... = ... |  |
+| file://:0:0:0:0 | value | file://:0:0:0:0 |  ... = ... |  |
+| file://:0:0:0:0 | value | file://:0:0:0:0 |  ... = ... |  |
+| file://:0:0:0:0 | var ... = ... | cfg.swift:138:3:138:3 | .next() |  |
+| file://:0:0:0:0 | var ... = ... | cfg.swift:526:17:526:17 | .next() |  |
+| file://:0:0:0:0 | var ... = ... | cfg.swift:533:5:533:5 | .next() |  |
diff --git a/swift/ql/test/library-tests/controlflow/graph/Cfg.ql b/swift/ql/test/library-tests/controlflow/graph/Cfg.ql
index 48e00332acd..179e07db064 100644
--- a/swift/ql/test/library-tests/controlflow/graph/Cfg.ql
+++ b/swift/ql/test/library-tests/controlflow/graph/Cfg.ql
@@ -1,20 +1,8 @@
-/**
- * @kind graph
- */
-
 import swift
 import codeql.swift.controlflow.ControlFlowGraph
 
 class MyRelevantNode extends ControlFlowNode {
   MyRelevantNode() { this.getScope().getLocation().getFile().getName().matches("%swift/ql/test%") }
-
-  private AstNode asAstNode() { result = this.getAstNode().asAstNode() }
-
-  string getOrderDisambiguation() {
-    result = concat([this.asAstNode().getAPrimaryQlClass(), this.asAstNode().toString()], ",")
-    or
-    not exists(this.asAstNode()) and result = ""
-  }
 }
 
 import codeql.swift.controlflow.internal.ControlFlowGraphImpl::TestOutput<MyRelevantNode>
diff --git a/swift/ql/test/library-tests/dataflow/taint/core/Taint.expected b/swift/ql/test/library-tests/dataflow/taint/core/Taint.expected
index c1b21928881..70cf2d3eaf0 100644
--- a/swift/ql/test/library-tests/dataflow/taint/core/Taint.expected
+++ b/swift/ql/test/library-tests/dataflow/taint/core/Taint.expected
@@ -2,9 +2,7 @@ edges
 | conversions.swift:33:16:33:26 | call to sourceInt() | conversions.swift:33:12:33:27 | call to Self.init(_:) | provenance |  |
 | conversions.swift:34:18:34:28 | call to sourceInt() | conversions.swift:34:12:34:29 | call to Self.init(_:) | provenance |  |
 | conversions.swift:35:18:35:28 | call to sourceInt() | conversions.swift:35:12:35:29 | call to Float.init(_:) | provenance |  |
-| conversions.swift:36:12:36:30 | call to String.init(_:) [Collection element] | conversions.swift:36:12:36:30 | call to String.init(_:) | provenance |  |
 | conversions.swift:36:19:36:29 | call to sourceInt() | conversions.swift:36:12:36:30 | call to String.init(_:) | provenance |  |
-| conversions.swift:36:19:36:29 | call to sourceInt() | conversions.swift:36:12:36:30 | call to String.init(_:) [Collection element] | provenance |  |
 | conversions.swift:37:12:37:30 | call to String.init(_:) | conversions.swift:37:12:37:32 | .utf8 | provenance |  |
 | conversions.swift:37:19:37:29 | call to sourceInt() | conversions.swift:37:12:37:30 | call to String.init(_:) | provenance |  |
 | conversions.swift:39:12:39:30 | [...] [Collection element] | conversions.swift:40:12:40:12 | arr | provenance |  |
@@ -13,13 +11,11 @@ edges
 | conversions.swift:39:12:39:30 | [...] [Collection element] | conversions.swift:43:20:43:20 | arr [Collection element] | provenance |  |
 | conversions.swift:39:19:39:29 | call to sourceInt() | conversions.swift:39:12:39:30 | [...] [Collection element] | provenance |  |
 | conversions.swift:41:12:41:12 | arr [Collection element] | conversions.swift:41:12:41:17 | ...[...] | provenance |  |
-| conversions.swift:42:12:42:23 | call to Array<Element>.init(_:) [Collection element] | conversions.swift:42:12:42:23 | call to Array<Element>.init(_:) | provenance |  |
-| conversions.swift:42:20:42:20 | arr [Collection element] | conversions.swift:42:12:42:23 | call to Array<Element>.init(_:) [Collection element] | provenance |  |
+| conversions.swift:42:20:42:20 | arr [Collection element] | conversions.swift:42:12:42:23 | call to Array<Element>.init(_:) | provenance |  |
 | conversions.swift:43:12:43:23 | call to Array<Element>.init(_:) [Collection element] | conversions.swift:43:12:43:26 | ...[...] | provenance |  |
 | conversions.swift:43:20:43:20 | arr [Collection element] | conversions.swift:43:12:43:23 | call to Array<Element>.init(_:) [Collection element] | provenance |  |
-| conversions.swift:44:12:44:39 | call to Array<Element>.init(_:) [Collection element] | conversions.swift:44:12:44:39 | call to Array<Element>.init(_:) | provenance |  |
 | conversions.swift:44:20:44:33 | call to sourceString() | conversions.swift:44:20:44:35 | .utf8 | provenance |  |
-| conversions.swift:44:20:44:35 | .utf8 | conversions.swift:44:12:44:39 | call to Array<Element>.init(_:) [Collection element] | provenance |  |
+| conversions.swift:44:20:44:35 | .utf8 | conversions.swift:44:12:44:39 | call to Array<Element>.init(_:) | provenance |  |
 | conversions.swift:45:12:45:39 | call to Array<Element>.init(_:) [Collection element] | conversions.swift:45:12:45:42 | ...[...] | provenance |  |
 | conversions.swift:45:20:45:33 | call to sourceString() | conversions.swift:45:20:45:35 | .utf8 | provenance |  |
 | conversions.swift:45:20:45:35 | .utf8 | conversions.swift:45:12:45:39 | call to Array<Element>.init(_:) [Collection element] | provenance |  |
@@ -49,19 +45,13 @@ edges
 | conversions.swift:80:12:80:22 | call to sourceInt() | conversions.swift:80:12:80:24 | .bigEndian | provenance |  |
 | conversions.swift:109:18:109:30 | call to sourceFloat() | conversions.swift:109:12:109:31 | call to Float.init(_:) | provenance |  |
 | conversions.swift:110:18:110:30 | call to sourceFloat() | conversions.swift:110:12:110:31 | call to UInt8.init(_:) | provenance |  |
-| conversions.swift:111:12:111:32 | call to String.init(_:) [Collection element] | conversions.swift:111:12:111:32 | call to String.init(_:) | provenance |  |
 | conversions.swift:111:19:111:31 | call to sourceFloat() | conversions.swift:111:12:111:32 | call to String.init(_:) | provenance |  |
-| conversions.swift:111:19:111:31 | call to sourceFloat() | conversions.swift:111:12:111:32 | call to String.init(_:) [Collection element] | provenance |  |
 | conversions.swift:112:12:112:32 | call to String.init(_:) | conversions.swift:112:12:112:34 | .utf8 | provenance |  |
 | conversions.swift:112:19:112:31 | call to sourceFloat() | conversions.swift:112:12:112:32 | call to String.init(_:) | provenance |  |
-| conversions.swift:113:12:113:34 | call to String.init(_:) [Collection element] | conversions.swift:113:12:113:34 | call to String.init(_:) | provenance |  |
 | conversions.swift:113:19:113:33 | call to sourceFloat80() | conversions.swift:113:12:113:34 | call to String.init(_:) | provenance |  |
-| conversions.swift:113:19:113:33 | call to sourceFloat80() | conversions.swift:113:12:113:34 | call to String.init(_:) [Collection element] | provenance |  |
 | conversions.swift:114:12:114:34 | call to String.init(_:) | conversions.swift:114:12:114:36 | .utf8 | provenance |  |
 | conversions.swift:114:19:114:33 | call to sourceFloat80() | conversions.swift:114:12:114:34 | call to String.init(_:) | provenance |  |
-| conversions.swift:115:12:115:33 | call to String.init(_:) [Collection element] | conversions.swift:115:12:115:33 | call to String.init(_:) | provenance |  |
 | conversions.swift:115:19:115:32 | call to sourceDouble() | conversions.swift:115:12:115:33 | call to String.init(_:) | provenance |  |
-| conversions.swift:115:19:115:32 | call to sourceDouble() | conversions.swift:115:12:115:33 | call to String.init(_:) [Collection element] | provenance |  |
 | conversions.swift:116:12:116:33 | call to String.init(_:) | conversions.swift:116:12:116:35 | .utf8 | provenance |  |
 | conversions.swift:116:19:116:32 | call to sourceDouble() | conversions.swift:116:12:116:33 | call to String.init(_:) | provenance |  |
 | conversions.swift:118:18:118:30 | call to sourceFloat() | conversions.swift:118:12:118:31 | call to Float.init(_:) | provenance |  |
@@ -76,9 +66,7 @@ edges
 | conversions.swift:129:12:129:25 | call to sourceDouble() | conversions.swift:129:12:129:27 | .significand | provenance |  |
 | conversions.swift:130:12:130:23 | call to sourceUInt() | conversions.swift:130:12:130:25 | .byteSwapped | provenance |  |
 | conversions.swift:131:12:131:25 | call to sourceUInt64() | conversions.swift:131:12:131:27 | .byteSwapped | provenance |  |
-| conversions.swift:136:12:136:33 | call to String.init(_:) [Collection element] | conversions.swift:136:12:136:33 | call to String.init(_:) | provenance |  |
 | conversions.swift:136:19:136:32 | call to sourceString() | conversions.swift:136:12:136:33 | call to String.init(_:) | provenance |  |
-| conversions.swift:136:19:136:32 | call to sourceString() | conversions.swift:136:12:136:33 | call to String.init(_:) [Collection element] | provenance |  |
 | conversions.swift:144:12:144:35 | call to MyString.init(_:) | conversions.swift:144:12:144:35 | call to MyString.init(_:) [some:0] | provenance |  |
 | conversions.swift:144:12:144:35 | call to MyString.init(_:) | conversions.swift:145:12:145:12 | ms2 | provenance |  |
 | conversions.swift:144:12:144:35 | call to MyString.init(_:) | conversions.swift:146:12:146:16 | .description | provenance |  |
@@ -251,7 +239,6 @@ nodes
 | conversions.swift:35:12:35:29 | call to Float.init(_:) | semmle.label | call to Float.init(_:) |
 | conversions.swift:35:18:35:28 | call to sourceInt() | semmle.label | call to sourceInt() |
 | conversions.swift:36:12:36:30 | call to String.init(_:) | semmle.label | call to String.init(_:) |
-| conversions.swift:36:12:36:30 | call to String.init(_:) [Collection element] | semmle.label | call to String.init(_:) [Collection element] |
 | conversions.swift:36:19:36:29 | call to sourceInt() | semmle.label | call to sourceInt() |
 | conversions.swift:37:12:37:30 | call to String.init(_:) | semmle.label | call to String.init(_:) |
 | conversions.swift:37:12:37:32 | .utf8 | semmle.label | .utf8 |
@@ -262,13 +249,11 @@ nodes
 | conversions.swift:41:12:41:12 | arr [Collection element] | semmle.label | arr [Collection element] |
 | conversions.swift:41:12:41:17 | ...[...] | semmle.label | ...[...] |
 | conversions.swift:42:12:42:23 | call to Array<Element>.init(_:) | semmle.label | call to Array<Element>.init(_:) |
-| conversions.swift:42:12:42:23 | call to Array<Element>.init(_:) [Collection element] | semmle.label | call to Array<Element>.init(_:) [Collection element] |
 | conversions.swift:42:20:42:20 | arr [Collection element] | semmle.label | arr [Collection element] |
 | conversions.swift:43:12:43:23 | call to Array<Element>.init(_:) [Collection element] | semmle.label | call to Array<Element>.init(_:) [Collection element] |
 | conversions.swift:43:12:43:26 | ...[...] | semmle.label | ...[...] |
 | conversions.swift:43:20:43:20 | arr [Collection element] | semmle.label | arr [Collection element] |
 | conversions.swift:44:12:44:39 | call to Array<Element>.init(_:) | semmle.label | call to Array<Element>.init(_:) |
-| conversions.swift:44:12:44:39 | call to Array<Element>.init(_:) [Collection element] | semmle.label | call to Array<Element>.init(_:) [Collection element] |
 | conversions.swift:44:20:44:33 | call to sourceString() | semmle.label | call to sourceString() |
 | conversions.swift:44:20:44:35 | .utf8 | semmle.label | .utf8 |
 | conversions.swift:45:12:45:39 | call to Array<Element>.init(_:) [Collection element] | semmle.label | call to Array<Element>.init(_:) [Collection element] |
@@ -321,19 +306,16 @@ nodes
 | conversions.swift:110:12:110:31 | call to UInt8.init(_:) | semmle.label | call to UInt8.init(_:) |
 | conversions.swift:110:18:110:30 | call to sourceFloat() | semmle.label | call to sourceFloat() |
 | conversions.swift:111:12:111:32 | call to String.init(_:) | semmle.label | call to String.init(_:) |
-| conversions.swift:111:12:111:32 | call to String.init(_:) [Collection element] | semmle.label | call to String.init(_:) [Collection element] |
 | conversions.swift:111:19:111:31 | call to sourceFloat() | semmle.label | call to sourceFloat() |
 | conversions.swift:112:12:112:32 | call to String.init(_:) | semmle.label | call to String.init(_:) |
 | conversions.swift:112:12:112:34 | .utf8 | semmle.label | .utf8 |
 | conversions.swift:112:19:112:31 | call to sourceFloat() | semmle.label | call to sourceFloat() |
 | conversions.swift:113:12:113:34 | call to String.init(_:) | semmle.label | call to String.init(_:) |
-| conversions.swift:113:12:113:34 | call to String.init(_:) [Collection element] | semmle.label | call to String.init(_:) [Collection element] |
 | conversions.swift:113:19:113:33 | call to sourceFloat80() | semmle.label | call to sourceFloat80() |
 | conversions.swift:114:12:114:34 | call to String.init(_:) | semmle.label | call to String.init(_:) |
 | conversions.swift:114:12:114:36 | .utf8 | semmle.label | .utf8 |
 | conversions.swift:114:19:114:33 | call to sourceFloat80() | semmle.label | call to sourceFloat80() |
 | conversions.swift:115:12:115:33 | call to String.init(_:) | semmle.label | call to String.init(_:) |
-| conversions.swift:115:12:115:33 | call to String.init(_:) [Collection element] | semmle.label | call to String.init(_:) [Collection element] |
 | conversions.swift:115:19:115:32 | call to sourceDouble() | semmle.label | call to sourceDouble() |
 | conversions.swift:116:12:116:33 | call to String.init(_:) | semmle.label | call to String.init(_:) |
 | conversions.swift:116:12:116:35 | .utf8 | semmle.label | .utf8 |
@@ -364,7 +346,6 @@ nodes
 | conversions.swift:131:12:131:27 | .byteSwapped | semmle.label | .byteSwapped |
 | conversions.swift:135:12:135:25 | call to sourceString() | semmle.label | call to sourceString() |
 | conversions.swift:136:12:136:33 | call to String.init(_:) | semmle.label | call to String.init(_:) |
-| conversions.swift:136:12:136:33 | call to String.init(_:) [Collection element] | semmle.label | call to String.init(_:) [Collection element] |
 | conversions.swift:136:19:136:32 | call to sourceString() | semmle.label | call to sourceString() |
 | conversions.swift:144:12:144:35 | call to MyString.init(_:) | semmle.label | call to MyString.init(_:) |
 | conversions.swift:144:12:144:35 | call to MyString.init(_:) [some:0] | semmle.label | call to MyString.init(_:) [some:0] |
diff --git a/swift/ql/test/query-tests/Diagnostics/Info.expected b/swift/ql/test/query-tests/Diagnostics/Info.expected
index 5cc633358ca..5c5b1da94ea 100644
--- a/swift/ql/test/query-tests/Diagnostics/Info.expected
+++ b/swift/ql/test/query-tests/Diagnostics/Info.expected
@@ -1,3 +1,3 @@
-| error.swift:0:0:0:0 | error.swift | query-tests/Diagnostics/error.swift |  |
+| error.swift:0:0:0:0 | error.swift | error.swift |  |
 | file://:0:0:0:0 |  |  |  |
-| main.swift:0:0:0:0 | main.swift | query-tests/Diagnostics/main.swift | isSuccessfullyExtracted |
+| main.swift:0:0:0:0 | main.swift | main.swift | isSuccessfullyExtracted |
diff --git a/swift/ql/test/query-tests/Security/CWE-078/CommandInjection.expected b/swift/ql/test/query-tests/Security/CWE-078/CommandInjection.expected
index 0fe8ae7b868..6e6b8623149 100644
--- a/swift/ql/test/query-tests/Security/CWE-078/CommandInjection.expected
+++ b/swift/ql/test/query-tests/Security/CWE-078/CommandInjection.expected
@@ -14,8 +14,7 @@ edges
 | CommandInjection.swift:75:40:75:94 | call to String.init(contentsOf:) [some:0] | CommandInjection.swift:75:8:75:12 | let ...? [some:0] | provenance |  |
 | CommandInjection.swift:75:40:75:94 | call to String.init(contentsOf:) [some:0] | CommandInjection.swift:75:40:75:94 | call to String.init(contentsOf:) [some:0, some:0] | provenance |  |
 | CommandInjection.swift:75:40:75:94 | call to String.init(contentsOf:) [some:0] | CommandInjection.swift:84:43:84:43 | userControlledString [some:0] | provenance |  |
-| CommandInjection.swift:81:2:81:2 | [post] task1 [arguments, Collection element] | CommandInjection.swift:81:2:81:2 | [post] task1 | provenance |  |
-| CommandInjection.swift:81:20:81:47 | [...] [Collection element] | CommandInjection.swift:81:2:81:2 | [post] task1 [arguments, Collection element] | provenance |  |
+| CommandInjection.swift:81:20:81:47 | [...] [Collection element] | CommandInjection.swift:81:2:81:2 | [post] task1 | provenance |  |
 | CommandInjection.swift:81:27:81:27 | userControlledString | CommandInjection.swift:81:20:81:47 | [...] [Collection element] | provenance |  |
 | CommandInjection.swift:84:5:84:9 | let ...? [some:0] | CommandInjection.swift:84:9:84:9 | validatedString | provenance |  |
 | CommandInjection.swift:84:9:84:9 | validatedString | CommandInjection.swift:87:31:87:31 | validatedString | provenance |  |
@@ -26,12 +25,10 @@ edges
 | CommandInjection.swift:84:43:84:43 | userControlledString | CommandInjection.swift:84:27:84:63 | call to validateCommand(_:) [some:0] | provenance |  |
 | CommandInjection.swift:84:43:84:43 | userControlledString [some:0] | CommandInjection.swift:64:22:64:33 | command [some:0] | provenance |  |
 | CommandInjection.swift:84:43:84:43 | userControlledString [some:0] | CommandInjection.swift:84:27:84:63 | call to validateCommand(_:) [some:0] | provenance |  |
-| CommandInjection.swift:87:6:87:6 | [post] task2 [arguments, Collection element] | CommandInjection.swift:87:6:87:6 | [post] task2 | provenance |  |
-| CommandInjection.swift:87:24:87:46 | [...] [Collection element] | CommandInjection.swift:87:6:87:6 | [post] task2 [arguments, Collection element] | provenance |  |
+| CommandInjection.swift:87:24:87:46 | [...] [Collection element] | CommandInjection.swift:87:6:87:6 | [post] task2 | provenance |  |
 | CommandInjection.swift:87:31:87:31 | validatedString | CommandInjection.swift:87:24:87:46 | [...] [Collection element] | provenance |  |
 | CommandInjection.swift:99:20:99:40 | arguments [Collection element] | CommandInjection.swift:100:20:100:20 | arguments [Collection element] | provenance |  |
-| CommandInjection.swift:100:3:100:3 | [post] self [arguments, Collection element] | CommandInjection.swift:100:3:100:3 | [post] self | provenance |  |
-| CommandInjection.swift:100:20:100:20 | arguments [Collection element] | CommandInjection.swift:100:3:100:3 | [post] self [arguments, Collection element] | provenance |  |
+| CommandInjection.swift:100:20:100:20 | arguments [Collection element] | CommandInjection.swift:100:3:100:3 | [post] self | provenance |  |
 | CommandInjection.swift:105:8:105:12 | let ...? [some:0] | CommandInjection.swift:105:12:105:12 | userControlledString | provenance |  |
 | CommandInjection.swift:105:12:105:12 | userControlledString | CommandInjection.swift:120:36:120:36 | userControlledString | provenance |  |
 | CommandInjection.swift:105:12:105:12 | userControlledString | CommandInjection.swift:121:28:121:28 | userControlledString | provenance |  |
@@ -73,55 +70,42 @@ edges
 | CommandInjection.swift:105:40:105:94 | call to String.init(contentsOf:) | CommandInjection.swift:164:33:164:33 | userControlledString | provenance |  |
 | CommandInjection.swift:105:40:105:94 | call to String.init(contentsOf:) | CommandInjection.swift:166:57:166:57 | userControlledString | provenance |  |
 | CommandInjection.swift:105:40:105:94 | call to String.init(contentsOf:) [some:0] | CommandInjection.swift:105:8:105:12 | let ...? [some:0] | provenance |  |
-| CommandInjection.swift:120:2:120:2 | [post] task3 [executableURL] | CommandInjection.swift:120:2:120:2 | [post] task3 | provenance |  |
 | CommandInjection.swift:120:24:120:56 | call to URL.init(string:) [some:0] | CommandInjection.swift:120:24:120:57 | ...! | provenance |  |
-| CommandInjection.swift:120:24:120:57 | ...! | CommandInjection.swift:120:2:120:2 | [post] task3 [executableURL] | provenance |  |
+| CommandInjection.swift:120:24:120:57 | ...! | CommandInjection.swift:120:2:120:2 | [post] task3 | provenance |  |
 | CommandInjection.swift:120:36:120:36 | userControlledString | CommandInjection.swift:120:24:120:56 | call to URL.init(string:) [some:0] | provenance |  |
-| CommandInjection.swift:121:2:121:2 | [post] task3 [arguments, Collection element] | CommandInjection.swift:121:2:121:2 | [post] task3 | provenance |  |
-| CommandInjection.swift:121:20:121:48 | [...] [Collection element] | CommandInjection.swift:121:2:121:2 | [post] task3 [arguments, Collection element] | provenance |  |
+| CommandInjection.swift:121:20:121:48 | [...] [Collection element] | CommandInjection.swift:121:2:121:2 | [post] task3 | provenance |  |
 | CommandInjection.swift:121:28:121:28 | userControlledString | CommandInjection.swift:121:20:121:48 | [...] [Collection element] | provenance |  |
-| CommandInjection.swift:125:2:125:2 | [post] task4 [executableURL] | CommandInjection.swift:125:2:125:2 | [post] task4 | provenance |  |
-| CommandInjection.swift:125:24:125:65 | call to URL.init(fileURLWithPath:) | CommandInjection.swift:125:2:125:2 | [post] task4 [executableURL] | provenance |  |
+| CommandInjection.swift:125:24:125:65 | call to URL.init(fileURLWithPath:) | CommandInjection.swift:125:2:125:2 | [post] task4 | provenance |  |
 | CommandInjection.swift:125:45:125:45 | userControlledString | CommandInjection.swift:125:24:125:65 | call to URL.init(fileURLWithPath:) | provenance |  |
-| CommandInjection.swift:126:2:126:2 | [post] task4 [executableURL] | CommandInjection.swift:126:2:126:2 | [post] task4 | provenance |  |
 | CommandInjection.swift:126:24:126:56 | call to URL.init(string:) [some:0] | CommandInjection.swift:126:24:126:57 | ...! | provenance |  |
-| CommandInjection.swift:126:24:126:57 | ...! | CommandInjection.swift:126:2:126:2 | [post] task4 [executableURL] | provenance |  |
+| CommandInjection.swift:126:24:126:57 | ...! | CommandInjection.swift:126:2:126:2 | [post] task4 | provenance |  |
 | CommandInjection.swift:126:36:126:36 | userControlledString | CommandInjection.swift:126:24:126:56 | call to URL.init(string:) [some:0] | provenance |  |
-| CommandInjection.swift:127:2:127:2 | [post] task4 [arguments, Collection element] | CommandInjection.swift:127:2:127:2 | [post] task4 | provenance |  |
-| CommandInjection.swift:127:20:127:56 | [...] [Collection element] | CommandInjection.swift:127:2:127:2 | [post] task4 [arguments, Collection element] | provenance |  |
+| CommandInjection.swift:127:20:127:56 | [...] [Collection element] | CommandInjection.swift:127:2:127:2 | [post] task4 | provenance |  |
 | CommandInjection.swift:127:28:127:36 | ... .+(_:_:) ... | CommandInjection.swift:127:20:127:56 | [...] [Collection element] | provenance |  |
-| CommandInjection.swift:131:2:131:7 | [post] ...? [executableURL] | CommandInjection.swift:131:2:131:7 | [post] ...? | provenance |  |
-| CommandInjection.swift:131:25:131:66 | call to URL.init(fileURLWithPath:) | CommandInjection.swift:131:2:131:7 | [post] ...? [executableURL] | provenance |  |
+| CommandInjection.swift:131:25:131:66 | call to URL.init(fileURLWithPath:) | CommandInjection.swift:131:2:131:7 | [post] ...? | provenance |  |
 | CommandInjection.swift:131:46:131:46 | userControlledString | CommandInjection.swift:131:25:131:66 | call to URL.init(fileURLWithPath:) | provenance |  |
-| CommandInjection.swift:132:2:132:7 | [post] ...? [arguments, Collection element] | CommandInjection.swift:132:2:132:7 | [post] ...? | provenance |  |
-| CommandInjection.swift:132:21:132:42 | [...] [Collection element] | CommandInjection.swift:132:2:132:7 | [post] ...? [arguments, Collection element] | provenance |  |
+| CommandInjection.swift:132:21:132:42 | [...] [Collection element] | CommandInjection.swift:132:2:132:7 | [post] ...? | provenance |  |
 | CommandInjection.swift:132:22:132:22 | userControlledString | CommandInjection.swift:132:21:132:42 | [...] [Collection element] | provenance |  |
-| CommandInjection.swift:136:2:136:2 | [post] task6 [executableURL] | CommandInjection.swift:136:2:136:2 | [post] task6 | provenance |  |
-| CommandInjection.swift:136:24:136:65 | call to URL.init(fileURLWithPath:) | CommandInjection.swift:136:2:136:2 | [post] task6 [executableURL] | provenance |  |
+| CommandInjection.swift:136:24:136:65 | call to URL.init(fileURLWithPath:) | CommandInjection.swift:136:2:136:2 | [post] task6 | provenance |  |
 | CommandInjection.swift:136:45:136:45 | userControlledString | CommandInjection.swift:136:24:136:65 | call to URL.init(fileURLWithPath:) | provenance |  |
-| CommandInjection.swift:137:2:137:2 | [post] task6 [executableURL] | CommandInjection.swift:137:2:137:2 | [post] task6 | provenance |  |
 | CommandInjection.swift:137:24:137:56 | call to URL.init(string:) [some:0] | CommandInjection.swift:137:24:137:57 | ...! | provenance |  |
-| CommandInjection.swift:137:24:137:57 | ...! | CommandInjection.swift:137:2:137:2 | [post] task6 [executableURL] | provenance |  |
+| CommandInjection.swift:137:24:137:57 | ...! | CommandInjection.swift:137:2:137:2 | [post] task6 | provenance |  |
 | CommandInjection.swift:137:36:137:36 | userControlledString | CommandInjection.swift:137:24:137:56 | call to URL.init(string:) [some:0] | provenance |  |
-| CommandInjection.swift:138:2:138:2 | [post] task6 [arguments, Collection element] | CommandInjection.swift:138:2:138:2 | [post] task6 | provenance |  |
-| CommandInjection.swift:138:20:138:41 | [...] [Collection element] | CommandInjection.swift:138:2:138:2 | [post] task6 [arguments, Collection element] | provenance |  |
+| CommandInjection.swift:138:20:138:41 | [...] [Collection element] | CommandInjection.swift:138:2:138:2 | [post] task6 | provenance |  |
 | CommandInjection.swift:138:21:138:21 | userControlledString | CommandInjection.swift:138:20:138:41 | [...] [Collection element] | provenance |  |
 | CommandInjection.swift:139:21:139:42 | [...] [Collection element] | CommandInjection.swift:99:20:99:40 | arguments [Collection element] | provenance |  |
 | CommandInjection.swift:139:22:139:22 | userControlledString | CommandInjection.swift:139:21:139:42 | [...] [Collection element] | provenance |  |
-| CommandInjection.swift:151:67:151:95 | [...] [Collection element] | CommandInjection.swift:151:67:151:95 | [...] | provenance |  |
-| CommandInjection.swift:151:75:151:75 | userControlledString | CommandInjection.swift:151:67:151:95 | [...] [Collection element] | provenance |  |
+| CommandInjection.swift:151:75:151:75 | userControlledString | CommandInjection.swift:151:67:151:95 | [...] | provenance |  |
 | CommandInjection.swift:154:23:154:55 | call to URL.init(string:) [some:0] | CommandInjection.swift:154:23:154:56 | ...! | provenance |  |
 | CommandInjection.swift:154:35:154:35 | userControlledString | CommandInjection.swift:154:23:154:55 | call to URL.init(string:) [some:0] | provenance |  |
-| CommandInjection.swift:155:62:155:90 | [...] [Collection element] | CommandInjection.swift:155:62:155:90 | [...] | provenance |  |
-| CommandInjection.swift:155:70:155:70 | userControlledString | CommandInjection.swift:155:62:155:90 | [...] [Collection element] | provenance |  |
+| CommandInjection.swift:155:70:155:70 | userControlledString | CommandInjection.swift:155:62:155:90 | [...] | provenance |  |
 | CommandInjection.swift:160:41:160:73 | call to URL.init(string:) [some:0] | CommandInjection.swift:160:41:160:74 | ...! | provenance |  |
 | CommandInjection.swift:160:53:160:53 | userControlledString | CommandInjection.swift:160:41:160:73 | call to URL.init(string:) [some:0] | provenance |  |
 | CommandInjection.swift:163:40:163:72 | call to URL.init(string:) [some:0] | CommandInjection.swift:163:40:163:73 | ...! | provenance |  |
 | CommandInjection.swift:163:40:163:72 | call to URL.init(string:) [some:0] | CommandInjection.swift:163:40:163:73 | ...! | provenance |  |
 | CommandInjection.swift:163:40:163:73 | ...! | file://:0:0:0:0 | url | provenance |  |
 | CommandInjection.swift:163:52:163:52 | userControlledString | CommandInjection.swift:163:40:163:72 | call to URL.init(string:) [some:0] | provenance |  |
-| CommandInjection.swift:164:32:164:53 | [...] [Collection element] | CommandInjection.swift:164:32:164:53 | [...] | provenance |  |
-| CommandInjection.swift:164:33:164:33 | userControlledString | CommandInjection.swift:164:32:164:53 | [...] [Collection element] | provenance |  |
+| CommandInjection.swift:164:33:164:33 | userControlledString | CommandInjection.swift:164:32:164:53 | [...] | provenance |  |
 | CommandInjection.swift:166:45:166:77 | call to URL.init(string:) [some:0] | CommandInjection.swift:166:45:166:78 | ...! | provenance |  |
 | CommandInjection.swift:166:45:166:77 | call to URL.init(string:) [some:0] | CommandInjection.swift:166:45:166:78 | ...! | provenance |  |
 | CommandInjection.swift:166:45:166:78 | ...! | file://:0:0:0:0 | url | provenance |  |
@@ -129,12 +113,9 @@ edges
 | CommandInjection.swift:193:3:193:3 | newValue [Collection element] | CommandInjection.swift:194:19:194:19 | newValue [Collection element] | provenance |  |
 | CommandInjection.swift:193:3:193:3 | newValue [Collection element] | CommandInjection.swift:195:20:195:20 | newValue [Collection element] | provenance |  |
 | CommandInjection.swift:193:3:193:3 | newValue [Collection element] | CommandInjection.swift:196:19:196:19 | newValue [Collection element] | provenance |  |
-| CommandInjection.swift:194:4:194:4 | [post] getter for .p1 [arguments, Collection element] | CommandInjection.swift:194:4:194:4 | [post] getter for .p1 | provenance |  |
-| CommandInjection.swift:194:19:194:19 | newValue [Collection element] | CommandInjection.swift:194:4:194:4 | [post] getter for .p1 [arguments, Collection element] | provenance |  |
-| CommandInjection.swift:195:4:195:6 | [post] ...! [arguments, Collection element] | CommandInjection.swift:195:4:195:6 | [post] ...! | provenance |  |
-| CommandInjection.swift:195:20:195:20 | newValue [Collection element] | CommandInjection.swift:195:4:195:6 | [post] ...! [arguments, Collection element] | provenance |  |
-| CommandInjection.swift:196:4:196:4 | [post] ...! [arguments, Collection element] | CommandInjection.swift:196:4:196:4 | [post] ...! | provenance |  |
-| CommandInjection.swift:196:19:196:19 | newValue [Collection element] | CommandInjection.swift:196:4:196:4 | [post] ...! [arguments, Collection element] | provenance |  |
+| CommandInjection.swift:194:19:194:19 | newValue [Collection element] | CommandInjection.swift:194:4:194:4 | [post] getter for .p1 | provenance |  |
+| CommandInjection.swift:195:20:195:20 | newValue [Collection element] | CommandInjection.swift:195:4:195:6 | [post] ...! | provenance |  |
+| CommandInjection.swift:196:19:196:19 | newValue [Collection element] | CommandInjection.swift:196:4:196:4 | [post] ...! | provenance |  |
 | CommandInjection.swift:201:9:201:13 | let ...? [some:0] | CommandInjection.swift:201:13:201:13 | userControlledString | provenance |  |
 | CommandInjection.swift:201:13:201:13 | userControlledString | CommandInjection.swift:205:19:205:19 | userControlledString | provenance |  |
 | CommandInjection.swift:201:13:201:13 | userControlledString | CommandInjection.swift:211:31:211:31 | userControlledString | provenance |  |
@@ -146,23 +127,17 @@ edges
 | CommandInjection.swift:205:18:205:39 | [...] [Collection element] | CommandInjection.swift:208:19:208:19 | tainted1 [Collection element] | provenance |  |
 | CommandInjection.swift:205:18:205:39 | [...] [Collection element] | CommandInjection.swift:209:18:209:18 | tainted1 [Collection element] | provenance |  |
 | CommandInjection.swift:205:19:205:19 | userControlledString | CommandInjection.swift:205:18:205:39 | [...] [Collection element] | provenance |  |
-| CommandInjection.swift:207:3:207:3 | [post] getter for .p1 [arguments, Collection element] | CommandInjection.swift:207:3:207:3 | [post] getter for .p1 | provenance |  |
-| CommandInjection.swift:207:18:207:18 | tainted1 [Collection element] | CommandInjection.swift:207:3:207:3 | [post] getter for .p1 [arguments, Collection element] | provenance |  |
-| CommandInjection.swift:208:3:208:5 | [post] ...! [arguments, Collection element] | CommandInjection.swift:208:3:208:5 | [post] ...! | provenance |  |
-| CommandInjection.swift:208:19:208:19 | tainted1 [Collection element] | CommandInjection.swift:208:3:208:5 | [post] ...! [arguments, Collection element] | provenance |  |
-| CommandInjection.swift:209:3:209:3 | [post] ...! [arguments, Collection element] | CommandInjection.swift:209:3:209:3 | [post] ...! | provenance |  |
-| CommandInjection.swift:209:18:209:18 | tainted1 [Collection element] | CommandInjection.swift:209:3:209:3 | [post] ...! [arguments, Collection element] | provenance |  |
+| CommandInjection.swift:207:18:207:18 | tainted1 [Collection element] | CommandInjection.swift:207:3:207:3 | [post] getter for .p1 | provenance |  |
+| CommandInjection.swift:208:19:208:19 | tainted1 [Collection element] | CommandInjection.swift:208:3:208:5 | [post] ...! | provenance |  |
+| CommandInjection.swift:209:18:209:18 | tainted1 [Collection element] | CommandInjection.swift:209:3:209:3 | [post] ...! | provenance |  |
 | CommandInjection.swift:211:30:211:51 | [...] [Collection element] | CommandInjection.swift:213:18:213:18 | tainted2 [Collection element] | provenance |  |
 | CommandInjection.swift:211:30:211:51 | [...] [Collection element] | CommandInjection.swift:214:19:214:19 | tainted2 [Collection element] | provenance |  |
 | CommandInjection.swift:211:30:211:51 | [...] [Collection element] | CommandInjection.swift:215:18:215:18 | tainted2 [Collection element] | provenance |  |
 | CommandInjection.swift:211:30:211:51 | [...] [Collection element] | CommandInjection.swift:217:13:217:13 | tainted2 [Collection element] | provenance |  |
 | CommandInjection.swift:211:31:211:31 | userControlledString | CommandInjection.swift:211:30:211:51 | [...] [Collection element] | provenance |  |
-| CommandInjection.swift:213:3:213:3 | [post] getter for .p1 [arguments, Collection element] | CommandInjection.swift:213:3:213:3 | [post] getter for .p1 | provenance |  |
-| CommandInjection.swift:213:18:213:18 | tainted2 [Collection element] | CommandInjection.swift:213:3:213:3 | [post] getter for .p1 [arguments, Collection element] | provenance |  |
-| CommandInjection.swift:214:3:214:5 | [post] ...! [arguments, Collection element] | CommandInjection.swift:214:3:214:5 | [post] ...! | provenance |  |
-| CommandInjection.swift:214:19:214:19 | tainted2 [Collection element] | CommandInjection.swift:214:3:214:5 | [post] ...! [arguments, Collection element] | provenance |  |
-| CommandInjection.swift:215:3:215:3 | [post] ...! [arguments, Collection element] | CommandInjection.swift:215:3:215:3 | [post] ...! | provenance |  |
-| CommandInjection.swift:215:18:215:18 | tainted2 [Collection element] | CommandInjection.swift:215:3:215:3 | [post] ...! [arguments, Collection element] | provenance |  |
+| CommandInjection.swift:213:18:213:18 | tainted2 [Collection element] | CommandInjection.swift:213:3:213:3 | [post] getter for .p1 | provenance |  |
+| CommandInjection.swift:214:19:214:19 | tainted2 [Collection element] | CommandInjection.swift:214:3:214:5 | [post] ...! | provenance |  |
+| CommandInjection.swift:215:18:215:18 | tainted2 [Collection element] | CommandInjection.swift:215:3:215:3 | [post] ...! | provenance |  |
 | CommandInjection.swift:217:13:217:13 | tainted2 [Collection element] | CommandInjection.swift:193:3:193:3 | newValue [Collection element] | provenance |  |
 | file://:0:0:0:0 | url | file://:0:0:0:0 | url | provenance |  |
 | file://:0:0:0:0 | url | file://:0:0:0:0 | url | provenance |  |
@@ -180,7 +155,6 @@ nodes
 | CommandInjection.swift:75:40:75:94 | call to String.init(contentsOf:) [some:0, some:0] | semmle.label | call to String.init(contentsOf:) [some:0, some:0] |
 | CommandInjection.swift:75:40:75:94 | call to String.init(contentsOf:) [some:0] | semmle.label | call to String.init(contentsOf:) [some:0] |
 | CommandInjection.swift:81:2:81:2 | [post] task1 | semmle.label | [post] task1 |
-| CommandInjection.swift:81:2:81:2 | [post] task1 [arguments, Collection element] | semmle.label | [post] task1 [arguments, Collection element] |
 | CommandInjection.swift:81:20:81:47 | [...] [Collection element] | semmle.label | [...] [Collection element] |
 | CommandInjection.swift:81:27:81:27 | userControlledString | semmle.label | userControlledString |
 | CommandInjection.swift:84:5:84:9 | let ...? [some:0] | semmle.label | let ...? [some:0] |
@@ -190,71 +164,57 @@ nodes
 | CommandInjection.swift:84:43:84:43 | userControlledString | semmle.label | userControlledString |
 | CommandInjection.swift:84:43:84:43 | userControlledString [some:0] | semmle.label | userControlledString [some:0] |
 | CommandInjection.swift:87:6:87:6 | [post] task2 | semmle.label | [post] task2 |
-| CommandInjection.swift:87:6:87:6 | [post] task2 [arguments, Collection element] | semmle.label | [post] task2 [arguments, Collection element] |
 | CommandInjection.swift:87:24:87:46 | [...] [Collection element] | semmle.label | [...] [Collection element] |
 | CommandInjection.swift:87:31:87:31 | validatedString | semmle.label | validatedString |
 | CommandInjection.swift:99:20:99:40 | arguments [Collection element] | semmle.label | arguments [Collection element] |
 | CommandInjection.swift:100:3:100:3 | [post] self | semmle.label | [post] self |
-| CommandInjection.swift:100:3:100:3 | [post] self [arguments, Collection element] | semmle.label | [post] self [arguments, Collection element] |
 | CommandInjection.swift:100:20:100:20 | arguments [Collection element] | semmle.label | arguments [Collection element] |
 | CommandInjection.swift:105:8:105:12 | let ...? [some:0] | semmle.label | let ...? [some:0] |
 | CommandInjection.swift:105:12:105:12 | userControlledString | semmle.label | userControlledString |
 | CommandInjection.swift:105:40:105:94 | call to String.init(contentsOf:) | semmle.label | call to String.init(contentsOf:) |
 | CommandInjection.swift:105:40:105:94 | call to String.init(contentsOf:) [some:0] | semmle.label | call to String.init(contentsOf:) [some:0] |
 | CommandInjection.swift:120:2:120:2 | [post] task3 | semmle.label | [post] task3 |
-| CommandInjection.swift:120:2:120:2 | [post] task3 [executableURL] | semmle.label | [post] task3 [executableURL] |
 | CommandInjection.swift:120:24:120:56 | call to URL.init(string:) [some:0] | semmle.label | call to URL.init(string:) [some:0] |
 | CommandInjection.swift:120:24:120:57 | ...! | semmle.label | ...! |
 | CommandInjection.swift:120:36:120:36 | userControlledString | semmle.label | userControlledString |
 | CommandInjection.swift:121:2:121:2 | [post] task3 | semmle.label | [post] task3 |
-| CommandInjection.swift:121:2:121:2 | [post] task3 [arguments, Collection element] | semmle.label | [post] task3 [arguments, Collection element] |
 | CommandInjection.swift:121:20:121:48 | [...] [Collection element] | semmle.label | [...] [Collection element] |
 | CommandInjection.swift:121:28:121:28 | userControlledString | semmle.label | userControlledString |
 | CommandInjection.swift:125:2:125:2 | [post] task4 | semmle.label | [post] task4 |
-| CommandInjection.swift:125:2:125:2 | [post] task4 [executableURL] | semmle.label | [post] task4 [executableURL] |
 | CommandInjection.swift:125:24:125:65 | call to URL.init(fileURLWithPath:) | semmle.label | call to URL.init(fileURLWithPath:) |
 | CommandInjection.swift:125:45:125:45 | userControlledString | semmle.label | userControlledString |
 | CommandInjection.swift:126:2:126:2 | [post] task4 | semmle.label | [post] task4 |
-| CommandInjection.swift:126:2:126:2 | [post] task4 [executableURL] | semmle.label | [post] task4 [executableURL] |
 | CommandInjection.swift:126:24:126:56 | call to URL.init(string:) [some:0] | semmle.label | call to URL.init(string:) [some:0] |
 | CommandInjection.swift:126:24:126:57 | ...! | semmle.label | ...! |
 | CommandInjection.swift:126:36:126:36 | userControlledString | semmle.label | userControlledString |
 | CommandInjection.swift:127:2:127:2 | [post] task4 | semmle.label | [post] task4 |
-| CommandInjection.swift:127:2:127:2 | [post] task4 [arguments, Collection element] | semmle.label | [post] task4 [arguments, Collection element] |
 | CommandInjection.swift:127:20:127:56 | [...] [Collection element] | semmle.label | [...] [Collection element] |
 | CommandInjection.swift:127:28:127:36 | ... .+(_:_:) ... | semmle.label | ... .+(_:_:) ... |
 | CommandInjection.swift:131:2:131:7 | [post] ...? | semmle.label | [post] ...? |
-| CommandInjection.swift:131:2:131:7 | [post] ...? [executableURL] | semmle.label | [post] ...? [executableURL] |
 | CommandInjection.swift:131:25:131:66 | call to URL.init(fileURLWithPath:) | semmle.label | call to URL.init(fileURLWithPath:) |
 | CommandInjection.swift:131:46:131:46 | userControlledString | semmle.label | userControlledString |
 | CommandInjection.swift:132:2:132:7 | [post] ...? | semmle.label | [post] ...? |
-| CommandInjection.swift:132:2:132:7 | [post] ...? [arguments, Collection element] | semmle.label | [post] ...? [arguments, Collection element] |
 | CommandInjection.swift:132:21:132:42 | [...] [Collection element] | semmle.label | [...] [Collection element] |
 | CommandInjection.swift:132:22:132:22 | userControlledString | semmle.label | userControlledString |
 | CommandInjection.swift:136:2:136:2 | [post] task6 | semmle.label | [post] task6 |
-| CommandInjection.swift:136:2:136:2 | [post] task6 [executableURL] | semmle.label | [post] task6 [executableURL] |
 | CommandInjection.swift:136:24:136:65 | call to URL.init(fileURLWithPath:) | semmle.label | call to URL.init(fileURLWithPath:) |
 | CommandInjection.swift:136:45:136:45 | userControlledString | semmle.label | userControlledString |
 | CommandInjection.swift:137:2:137:2 | [post] task6 | semmle.label | [post] task6 |
-| CommandInjection.swift:137:2:137:2 | [post] task6 [executableURL] | semmle.label | [post] task6 [executableURL] |
 | CommandInjection.swift:137:24:137:56 | call to URL.init(string:) [some:0] | semmle.label | call to URL.init(string:) [some:0] |
 | CommandInjection.swift:137:24:137:57 | ...! | semmle.label | ...! |
 | CommandInjection.swift:137:36:137:36 | userControlledString | semmle.label | userControlledString |
 | CommandInjection.swift:138:2:138:2 | [post] task6 | semmle.label | [post] task6 |
-| CommandInjection.swift:138:2:138:2 | [post] task6 [arguments, Collection element] | semmle.label | [post] task6 [arguments, Collection element] |
 | CommandInjection.swift:138:20:138:41 | [...] [Collection element] | semmle.label | [...] [Collection element] |
 | CommandInjection.swift:138:21:138:21 | userControlledString | semmle.label | userControlledString |
 | CommandInjection.swift:139:21:139:42 | [...] [Collection element] | semmle.label | [...] [Collection element] |
 | CommandInjection.swift:139:22:139:22 | userControlledString | semmle.label | userControlledString |
 | CommandInjection.swift:150:42:150:42 | userControlledString | semmle.label | userControlledString |
 | CommandInjection.swift:151:67:151:95 | [...] | semmle.label | [...] |
-| CommandInjection.swift:151:67:151:95 | [...] [Collection element] | semmle.label | [...] [Collection element] |
 | CommandInjection.swift:151:75:151:75 | userControlledString | semmle.label | userControlledString |
 | CommandInjection.swift:154:23:154:55 | call to URL.init(string:) [some:0] | semmle.label | call to URL.init(string:) [some:0] |
 | CommandInjection.swift:154:23:154:56 | ...! | semmle.label | ...! |
 | CommandInjection.swift:154:35:154:35 | userControlledString | semmle.label | userControlledString |
 | CommandInjection.swift:155:62:155:90 | [...] | semmle.label | [...] |
-| CommandInjection.swift:155:62:155:90 | [...] [Collection element] | semmle.label | [...] [Collection element] |
 | CommandInjection.swift:155:70:155:70 | userControlledString | semmle.label | userControlledString |
 | CommandInjection.swift:160:41:160:73 | call to URL.init(string:) [some:0] | semmle.label | call to URL.init(string:) [some:0] |
 | CommandInjection.swift:160:41:160:74 | ...! | semmle.label | ...! |
@@ -264,7 +224,6 @@ nodes
 | CommandInjection.swift:163:40:163:73 | ...! | semmle.label | ...! |
 | CommandInjection.swift:163:52:163:52 | userControlledString | semmle.label | userControlledString |
 | CommandInjection.swift:164:32:164:53 | [...] | semmle.label | [...] |
-| CommandInjection.swift:164:32:164:53 | [...] [Collection element] | semmle.label | [...] [Collection element] |
 | CommandInjection.swift:164:33:164:33 | userControlledString | semmle.label | userControlledString |
 | CommandInjection.swift:166:45:166:77 | call to URL.init(string:) [some:0] | semmle.label | call to URL.init(string:) [some:0] |
 | CommandInjection.swift:166:45:166:78 | ...! | semmle.label | ...! |
@@ -272,13 +231,10 @@ nodes
 | CommandInjection.swift:166:57:166:57 | userControlledString | semmle.label | userControlledString |
 | CommandInjection.swift:193:3:193:3 | newValue [Collection element] | semmle.label | newValue [Collection element] |
 | CommandInjection.swift:194:4:194:4 | [post] getter for .p1 | semmle.label | [post] getter for .p1 |
-| CommandInjection.swift:194:4:194:4 | [post] getter for .p1 [arguments, Collection element] | semmle.label | [post] getter for .p1 [arguments, Collection element] |
 | CommandInjection.swift:194:19:194:19 | newValue [Collection element] | semmle.label | newValue [Collection element] |
 | CommandInjection.swift:195:4:195:6 | [post] ...! | semmle.label | [post] ...! |
-| CommandInjection.swift:195:4:195:6 | [post] ...! [arguments, Collection element] | semmle.label | [post] ...! [arguments, Collection element] |
 | CommandInjection.swift:195:20:195:20 | newValue [Collection element] | semmle.label | newValue [Collection element] |
 | CommandInjection.swift:196:4:196:4 | [post] ...! | semmle.label | [post] ...! |
-| CommandInjection.swift:196:4:196:4 | [post] ...! [arguments, Collection element] | semmle.label | [post] ...! [arguments, Collection element] |
 | CommandInjection.swift:196:19:196:19 | newValue [Collection element] | semmle.label | newValue [Collection element] |
 | CommandInjection.swift:201:9:201:13 | let ...? [some:0] | semmle.label | let ...? [some:0] |
 | CommandInjection.swift:201:13:201:13 | userControlledString | semmle.label | userControlledString |
@@ -287,24 +243,18 @@ nodes
 | CommandInjection.swift:205:18:205:39 | [...] [Collection element] | semmle.label | [...] [Collection element] |
 | CommandInjection.swift:205:19:205:19 | userControlledString | semmle.label | userControlledString |
 | CommandInjection.swift:207:3:207:3 | [post] getter for .p1 | semmle.label | [post] getter for .p1 |
-| CommandInjection.swift:207:3:207:3 | [post] getter for .p1 [arguments, Collection element] | semmle.label | [post] getter for .p1 [arguments, Collection element] |
 | CommandInjection.swift:207:18:207:18 | tainted1 [Collection element] | semmle.label | tainted1 [Collection element] |
 | CommandInjection.swift:208:3:208:5 | [post] ...! | semmle.label | [post] ...! |
-| CommandInjection.swift:208:3:208:5 | [post] ...! [arguments, Collection element] | semmle.label | [post] ...! [arguments, Collection element] |
 | CommandInjection.swift:208:19:208:19 | tainted1 [Collection element] | semmle.label | tainted1 [Collection element] |
 | CommandInjection.swift:209:3:209:3 | [post] ...! | semmle.label | [post] ...! |
-| CommandInjection.swift:209:3:209:3 | [post] ...! [arguments, Collection element] | semmle.label | [post] ...! [arguments, Collection element] |
 | CommandInjection.swift:209:18:209:18 | tainted1 [Collection element] | semmle.label | tainted1 [Collection element] |
 | CommandInjection.swift:211:30:211:51 | [...] [Collection element] | semmle.label | [...] [Collection element] |
 | CommandInjection.swift:211:31:211:31 | userControlledString | semmle.label | userControlledString |
 | CommandInjection.swift:213:3:213:3 | [post] getter for .p1 | semmle.label | [post] getter for .p1 |
-| CommandInjection.swift:213:3:213:3 | [post] getter for .p1 [arguments, Collection element] | semmle.label | [post] getter for .p1 [arguments, Collection element] |
 | CommandInjection.swift:213:18:213:18 | tainted2 [Collection element] | semmle.label | tainted2 [Collection element] |
 | CommandInjection.swift:214:3:214:5 | [post] ...! | semmle.label | [post] ...! |
-| CommandInjection.swift:214:3:214:5 | [post] ...! [arguments, Collection element] | semmle.label | [post] ...! [arguments, Collection element] |
 | CommandInjection.swift:214:19:214:19 | tainted2 [Collection element] | semmle.label | tainted2 [Collection element] |
 | CommandInjection.swift:215:3:215:3 | [post] ...! | semmle.label | [post] ...! |
-| CommandInjection.swift:215:3:215:3 | [post] ...! [arguments, Collection element] | semmle.label | [post] ...! [arguments, Collection element] |
 | CommandInjection.swift:215:18:215:18 | tainted2 [Collection element] | semmle.label | tainted2 [Collection element] |
 | CommandInjection.swift:217:13:217:13 | tainted2 [Collection element] | semmle.label | tainted2 [Collection element] |
 | file://:0:0:0:0 | url | semmle.label | url |
diff --git a/swift/ql/test/query-tests/Security/CWE-094/UnsafeJsEval.qlref b/swift/ql/test/query-tests/Security/CWE-094/UnsafeJsEval.qlref
index b8c11cee30d..51ad8bf6ed3 100644
--- a/swift/ql/test/query-tests/Security/CWE-094/UnsafeJsEval.qlref
+++ b/swift/ql/test/query-tests/Security/CWE-094/UnsafeJsEval.qlref
@@ -1 +1,2 @@
-queries/Security/CWE-094/UnsafeJsEval.ql
+query: queries/Security/CWE-094/UnsafeJsEval.ql
+postprocess: TestUtilities/InlineExpectationsTestQuery.ql
diff --git a/swift/ql/test/query-tests/Security/CWE-094/UnsafeJsEval.swift b/swift/ql/test/query-tests/Security/CWE-094/UnsafeJsEval.swift
index 83d691d5f03..973b2858857 100644
--- a/swift/ql/test/query-tests/Security/CWE-094/UnsafeJsEval.swift
+++ b/swift/ql/test/query-tests/Security/CWE-094/UnsafeJsEval.swift
@@ -175,17 +175,17 @@ func testAsync(_ sink: @escaping (String) async throws -> ()) {
 		let url = URL(string: "http://example.com/")
 
 		try! await sink(localString) // GOOD: the HTML data is local
-		try! await sink(try String(contentsOf: URL(string: "http://example.com/")!)) // BAD [NOT DETECTED - TODO]: HTML contains remote input, may access local secrets
-		try! await sink(try! String(contentsOf: url!)) // BAD [NOT DETECTED - TODO]
+		try! await sink(try String(contentsOf: URL(string: "http://example.com/")!)) // $ MISSING: Alert (HTML contains remote input, may access local secrets)
+		try! await sink(try! String(contentsOf: url!)) // $ MISSING: Alert
 
 		try! await sink("console.log(" + localStringFragment + ")") // GOOD: the HTML data is local
-		try! await sink("console.log(" + (try! String(contentsOf: url!)) + ")") // BAD [NOT DETECTED - TODO]
+		try! await sink("console.log(" + (try! String(contentsOf: url!)) + ")") // $ MISSING: Alert
 
 		let localData = Data(localString.utf8)
 		let remoteData = Data((try! String(contentsOf: url!)).utf8)
 
 		try! await sink(String(decoding: localData, as: UTF8.self)) // GOOD: the data is local
-		try! await sink(String(decoding: remoteData, as: UTF8.self)) // BAD [NOT DETECTED - TODO]: the data is remote
+		try! await sink(String(decoding: remoteData, as: UTF8.self)) // $ MISSING: Alert the data is remote
 
 		try! await sink("console.log(" + String(Int(localStringFragment) ?? 0) + ")") // GOOD: Primitive conversion
 		try! await sink("console.log(" + String(Int(try! String(contentsOf: url!)) ?? 0) + ")") // GOOD: Primitive conversion
@@ -201,17 +201,17 @@ func testSync(_ sink: @escaping (String) -> ()) {
 	let url = URL(string: "http://example.com/")
 
 	sink(localString) // GOOD: the HTML data is local
-	sink(try! String(contentsOf: URL(string: "http://example.com/")!)) // BAD: HTML contains remote input, may access local secrets
-	sink(try! String(contentsOf: url!)) // BAD
+	sink(try! String(contentsOf: URL(string: "http://example.com/")!)) // $ Source=source1
+	sink(try! String(contentsOf: url!)) // $ Source=source2
 
 	sink("console.log(" + localStringFragment + ")") // GOOD: the HTML data is local
-	sink("console.log(" + (try! String(contentsOf: url!)) + ")") // BAD
+	sink("console.log(" + (try! String(contentsOf: url!)) + ")") // $ Source=source3
 
 	let localData = Data(localString.utf8)
-	let remoteData = Data((try! String(contentsOf: url!)).utf8)
+	let remoteData = Data((try! String(contentsOf: url!)).utf8) // $ Source=source4
 
 	sink(String(decoding: localData, as: UTF8.self)) // GOOD: the data is local
-	sink(String(decoding: remoteData, as: UTF8.self)) // BAD: the data is remote
+	sink(String(decoding: remoteData, as: UTF8.self))
 
 	sink("console.log(" + String(Int(localStringFragment) ?? 0) + ")") // GOOD: Primitive conversion
 	sink("console.log(" + String(Int(try! String(contentsOf: url!)) ?? 0) + ")") // GOOD: Primitive conversion
@@ -224,7 +224,7 @@ func testUIWebView() {
 	let webview = UIWebView()
 
 	testAsync { string in
-		_ = await webview.stringByEvaluatingJavaScript(from: string) // BAD [NOT DETECTED]
+		_ = await webview.stringByEvaluatingJavaScript(from: string) // $ MISSING: Alert
 	}
 }
 
@@ -232,7 +232,7 @@ func testWebView() {
 	let webview = WebView()
 
 	testAsync { string in
-		_ = await webview.stringByEvaluatingJavaScript(from: string) // BAD [NOT DETECTED]
+		_ = await webview.stringByEvaluatingJavaScript(from: string) // $ MISSING: Alert
 	}
 }
 
@@ -240,22 +240,22 @@ func testWKWebView() {
 	let webview = WKWebView()
 
 	testAsync { string in
-		_ = try await webview.evaluateJavaScript(string) // BAD [NOT DETECTED]
+		_ = try await webview.evaluateJavaScript(string) // $ MISSING: Alert
 	}
 	testAsync { string in
-		await webview.evaluateJavaScript(string) { _, _ in } // BAD [NOT DETECTED]
+		await webview.evaluateJavaScript(string) { _, _ in } // $ MISSING: Alert
 	}
 	testAsync { string in
-		await webview.evaluateJavaScript(string, in: nil, in: WKContentWorld.defaultClient) { _ in } // BAD [NOT DETECTED]
+		await webview.evaluateJavaScript(string, in: nil, in: WKContentWorld.defaultClient) { _ in } // $ MISSING: Alert
 	}
 	testAsync { string in
-		_ = try await webview.evaluateJavaScript(string, contentWorld: .defaultClient) // BAD [NOT DETECTED]
+		_ = try await webview.evaluateJavaScript(string, contentWorld: .defaultClient) // $ MISSING: Alert
 	}
 	testAsync { string in
-		await webview.callAsyncJavaScript(string, in: nil, in: .defaultClient) { _ in () } // BAD [NOT DETECTED]
+		await webview.callAsyncJavaScript(string, in: nil, in: .defaultClient) { _ in () } // $ MISSING: Alert
 	}
 	testAsync { string in
-		_ = try await webview.callAsyncJavaScript(string, contentWorld: WKContentWorld.defaultClient) // BAD [NOT DETECTED]
+		_ = try await webview.callAsyncJavaScript(string, contentWorld: WKContentWorld.defaultClient) // $ MISSING: Alert
 	}
 }
 
@@ -263,10 +263,10 @@ func testWKUserContentController() {
 	let ctrl = WKUserContentController()
 
 	testSync { string in
-		ctrl.addUserScript(WKUserScript(source: string, injectionTime: .atDocumentStart, forMainFrameOnly: false)) // BAD (multiple sources)
+		ctrl.addUserScript(WKUserScript(source: string, injectionTime: .atDocumentStart, forMainFrameOnly: false)) // $ Alert=source1 $ Alert=source2 $ Alert=source3 $ Alert=source4
 	}
 	testSync { string in
-		ctrl.addUserScript(WKUserScript(source: string, injectionTime: .atDocumentEnd, forMainFrameOnly: true, in: .defaultClient)) // BAD (multiple sources)
+		ctrl.addUserScript(WKUserScript(source: string, injectionTime: .atDocumentEnd, forMainFrameOnly: true, in: .defaultClient)) // $ Alert=source1 $ Alert=source2 $ Alert=source3 $ Alert=source4
 	}
 }
 
@@ -274,10 +274,10 @@ func testJSContext() {
 	let ctx = JSContext()
 
 	testSync { string in
-		_ = ctx.evaluateScript(string) // BAD (multiple sources)
+		_ = ctx.evaluateScript(string) // $ Alert=source1 $ Alert=source2 $ Alert=source3 $ Alert=source4
 	}
 	testSync { string in
-		_ = ctx.evaluateScript(string, withSourceURL: URL(string: "https://example.com")) // BAD (multiple sources)
+		_ = ctx.evaluateScript(string, withSourceURL: URL(string: "https://example.com")) // $ Alert=source1 $ Alert=source2 $ Alert=source3 $ Alert=source4
 	}
 }
 
@@ -288,7 +288,7 @@ func testJSEvaluateScript() {
 			defer { JSStringRelease(jsstr) }
 			_ = JSEvaluateScript(
 				/*ctx:*/ OpaquePointer(bitPattern: 0),
-				/*script:*/ jsstr, // BAD (multiple sources)
+				/*script:*/ jsstr, // $ Alert=source1 $ Alert=source2 $ Alert=source3 $ Alert=source4
 				/*thisObject:*/ OpaquePointer(bitPattern: 0),
 				/*sourceURL:*/ OpaquePointer(bitPattern: 0),
 				/*startingLineNumber:*/ 0,
@@ -302,7 +302,7 @@ func testJSEvaluateScript() {
 			defer { JSStringRelease(jsstr) }
 			_ = JSEvaluateScript(
 				/*ctx:*/ OpaquePointer(bitPattern: 0),
-				/*script:*/ jsstr, // BAD (multiple sources)
+				/*script:*/ jsstr, // $ Alert=source1 $ Alert=source2 $ Alert=source3 $ Alert=source4
 				/*thisObject:*/ OpaquePointer(bitPattern: 0),
 				/*sourceURL:*/ OpaquePointer(bitPattern: 0),
 				/*startingLineNumber:*/ 0,
@@ -315,9 +315,9 @@ func testJSEvaluateScript() {
 func testQHelpExamples() {
 	Task {
 		let webview = WKWebView()
-		let remoteData = try String(contentsOf: URL(string: "http://example.com/evil.json")!)
+		let remoteData = try String(contentsOf: URL(string: "http://example.com/evil.json")!) // $ Source=source5
 
-		_ = try await webview.evaluateJavaScript("console.log(" + remoteData + ")") // BAD
+		_ = try await webview.evaluateJavaScript("console.log(" + remoteData + ")") // $ Alert=source5
 
 		_ = try await webview.callAsyncJavaScript(
 			"console.log(data)",
diff --git a/swift/ql/test/query-tests/Security/CWE-311/CleartextStorageDatabase.expected b/swift/ql/test/query-tests/Security/CWE-311/CleartextStorageDatabase.expected
index 83fb7d9c1fe..204e2486cc2 100644
--- a/swift/ql/test/query-tests/Security/CWE-311/CleartextStorageDatabase.expected
+++ b/swift/ql/test/query-tests/Security/CWE-311/CleartextStorageDatabase.expected
@@ -21,35 +21,23 @@ edges
 | SQLite.swift:153:20:153:20 | mobilePhoneNumber | SQLite.swift:153:20:153:20 | [...] [Collection element] | provenance |  |
 | SQLite.swift:154:23:154:23 | [...] [Collection element] | SQLite.swift:154:23:154:23 | [...] | provenance |  |
 | SQLite.swift:154:23:154:23 | mobilePhoneNumber | SQLite.swift:154:23:154:23 | [...] [Collection element] | provenance |  |
-| SQLite.swift:158:32:158:54 | [...] [Collection element] | SQLite.swift:158:32:158:54 | [...] | provenance |  |
-| SQLite.swift:158:33:158:33 | mobilePhoneNumber | SQLite.swift:158:32:158:54 | [...] [Collection element] | provenance |  |
-| SQLite.swift:159:28:159:50 | [...] [Collection element] | SQLite.swift:159:28:159:50 | [...] | provenance |  |
-| SQLite.swift:159:29:159:29 | mobilePhoneNumber | SQLite.swift:159:28:159:50 | [...] [Collection element] | provenance |  |
-| SQLite.swift:160:31:160:53 | [...] [Collection element] | SQLite.swift:160:31:160:53 | [...] | provenance |  |
-| SQLite.swift:160:32:160:32 | mobilePhoneNumber | SQLite.swift:160:31:160:53 | [...] [Collection element] | provenance |  |
-| SQLite.swift:163:21:163:43 | [...] [Collection element] | SQLite.swift:163:21:163:43 | [...] | provenance |  |
-| SQLite.swift:163:22:163:22 | mobilePhoneNumber | SQLite.swift:163:21:163:43 | [...] [Collection element] | provenance |  |
-| SQLite.swift:164:20:164:42 | [...] [Collection element] | SQLite.swift:164:20:164:42 | [...] | provenance |  |
-| SQLite.swift:164:21:164:21 | mobilePhoneNumber | SQLite.swift:164:20:164:42 | [...] [Collection element] | provenance |  |
-| SQLite.swift:165:23:165:45 | [...] [Collection element] | SQLite.swift:165:23:165:45 | [...] | provenance |  |
-| SQLite.swift:165:24:165:24 | mobilePhoneNumber | SQLite.swift:165:23:165:45 | [...] [Collection element] | provenance |  |
-| SQLite.swift:169:32:169:70 | [...] [Collection element, Tuple element at index 1] | SQLite.swift:169:32:169:70 | [...] | provenance |  |
-| SQLite.swift:169:43:169:53 | (...) [Tuple element at index 1] | SQLite.swift:169:32:169:70 | [...] [Collection element, Tuple element at index 1] | provenance |  |
+| SQLite.swift:158:33:158:33 | mobilePhoneNumber | SQLite.swift:158:32:158:54 | [...] | provenance |  |
+| SQLite.swift:159:29:159:29 | mobilePhoneNumber | SQLite.swift:159:28:159:50 | [...] | provenance |  |
+| SQLite.swift:160:32:160:32 | mobilePhoneNumber | SQLite.swift:160:31:160:53 | [...] | provenance |  |
+| SQLite.swift:163:22:163:22 | mobilePhoneNumber | SQLite.swift:163:21:163:43 | [...] | provenance |  |
+| SQLite.swift:164:21:164:21 | mobilePhoneNumber | SQLite.swift:164:20:164:42 | [...] | provenance |  |
+| SQLite.swift:165:24:165:24 | mobilePhoneNumber | SQLite.swift:165:23:165:45 | [...] | provenance |  |
+| SQLite.swift:169:43:169:53 | (...) [Tuple element at index 1] | SQLite.swift:169:32:169:70 | [...] | provenance |  |
 | SQLite.swift:169:53:169:53 | mobilePhoneNumber | SQLite.swift:169:43:169:53 | (...) [Tuple element at index 1] | provenance |  |
-| SQLite.swift:170:28:170:66 | [...] [Collection element, Tuple element at index 1] | SQLite.swift:170:28:170:66 | [...] | provenance |  |
-| SQLite.swift:170:39:170:49 | (...) [Tuple element at index 1] | SQLite.swift:170:28:170:66 | [...] [Collection element, Tuple element at index 1] | provenance |  |
+| SQLite.swift:170:39:170:49 | (...) [Tuple element at index 1] | SQLite.swift:170:28:170:66 | [...] | provenance |  |
 | SQLite.swift:170:49:170:49 | mobilePhoneNumber | SQLite.swift:170:39:170:49 | (...) [Tuple element at index 1] | provenance |  |
-| SQLite.swift:171:31:171:69 | [...] [Collection element, Tuple element at index 1] | SQLite.swift:171:31:171:69 | [...] | provenance |  |
-| SQLite.swift:171:42:171:52 | (...) [Tuple element at index 1] | SQLite.swift:171:31:171:69 | [...] [Collection element, Tuple element at index 1] | provenance |  |
+| SQLite.swift:171:42:171:52 | (...) [Tuple element at index 1] | SQLite.swift:171:31:171:69 | [...] | provenance |  |
 | SQLite.swift:171:52:171:52 | mobilePhoneNumber | SQLite.swift:171:42:171:52 | (...) [Tuple element at index 1] | provenance |  |
-| SQLite.swift:174:21:174:59 | [...] [Collection element, Tuple element at index 1] | SQLite.swift:174:21:174:59 | [...] | provenance |  |
-| SQLite.swift:174:32:174:42 | (...) [Tuple element at index 1] | SQLite.swift:174:21:174:59 | [...] [Collection element, Tuple element at index 1] | provenance |  |
+| SQLite.swift:174:32:174:42 | (...) [Tuple element at index 1] | SQLite.swift:174:21:174:59 | [...] | provenance |  |
 | SQLite.swift:174:42:174:42 | mobilePhoneNumber | SQLite.swift:174:32:174:42 | (...) [Tuple element at index 1] | provenance |  |
-| SQLite.swift:175:20:175:58 | [...] [Collection element, Tuple element at index 1] | SQLite.swift:175:20:175:58 | [...] | provenance |  |
-| SQLite.swift:175:31:175:41 | (...) [Tuple element at index 1] | SQLite.swift:175:20:175:58 | [...] [Collection element, Tuple element at index 1] | provenance |  |
+| SQLite.swift:175:31:175:41 | (...) [Tuple element at index 1] | SQLite.swift:175:20:175:58 | [...] | provenance |  |
 | SQLite.swift:175:41:175:41 | mobilePhoneNumber | SQLite.swift:175:31:175:41 | (...) [Tuple element at index 1] | provenance |  |
-| SQLite.swift:176:23:176:61 | [...] [Collection element, Tuple element at index 1] | SQLite.swift:176:23:176:61 | [...] | provenance |  |
-| SQLite.swift:176:34:176:44 | (...) [Tuple element at index 1] | SQLite.swift:176:23:176:61 | [...] [Collection element, Tuple element at index 1] | provenance |  |
+| SQLite.swift:176:34:176:44 | (...) [Tuple element at index 1] | SQLite.swift:176:23:176:61 | [...] | provenance |  |
 | SQLite.swift:176:44:176:44 | mobilePhoneNumber | SQLite.swift:176:34:176:44 | (...) [Tuple element at index 1] | provenance |  |
 | SQLite.swift:186:40:186:54 | ... <-(_:_:) ... | SQLite.swift:186:40:186:54 | [...] [Collection element] | provenance |  |
 | SQLite.swift:186:40:186:54 | [...] [Collection element] | SQLite.swift:186:40:186:54 | [...] | provenance |  |
@@ -87,264 +75,173 @@ edges
 | sqlite3_c_api.swift:42:69:42:69 | medicalNotes | sqlite3_c_api.swift:46:27:46:27 | insertQuery | provenance |  |
 | sqlite3_c_api.swift:43:49:43:49 | medicalNotes | sqlite3_c_api.swift:47:27:47:27 | updateQuery | provenance |  |
 | testCoreData2.swift:23:13:23:13 | value | file://:0:0:0:0 | value | provenance |  |
-| testCoreData2.swift:37:2:37:2 | [post] obj [myValue] | testCoreData2.swift:37:2:37:2 | [post] obj | provenance |  |
-| testCoreData2.swift:37:16:37:16 | bankAccountNo | testCoreData2.swift:37:2:37:2 | [post] obj [myValue] | provenance |  |
-| testCoreData2.swift:39:2:39:2 | [post] obj [myBankAccountNumber] | testCoreData2.swift:39:2:39:2 | [post] obj | provenance |  |
-| testCoreData2.swift:39:28:39:28 | bankAccountNo | testCoreData2.swift:39:2:39:2 | [post] obj [myBankAccountNumber] | provenance |  |
-| testCoreData2.swift:41:2:41:2 | [post] obj [myBankAccountNumber2] | testCoreData2.swift:41:2:41:2 | [post] obj | provenance |  |
-| testCoreData2.swift:41:29:41:29 | bankAccountNo | testCoreData2.swift:41:2:41:2 | [post] obj [myBankAccountNumber2] | provenance |  |
-| testCoreData2.swift:43:2:43:2 | [post] obj [notStoredBankAccountNumber] | testCoreData2.swift:43:2:43:2 | [post] obj | provenance |  |
+| testCoreData2.swift:37:16:37:16 | bankAccountNo | testCoreData2.swift:37:2:37:2 | [post] obj | provenance |  |
+| testCoreData2.swift:39:28:39:28 | bankAccountNo | testCoreData2.swift:39:2:39:2 | [post] obj | provenance |  |
+| testCoreData2.swift:41:29:41:29 | bankAccountNo | testCoreData2.swift:41:2:41:2 | [post] obj | provenance |  |
 | testCoreData2.swift:43:35:43:35 | bankAccountNo | testCoreData2.swift:23:13:23:13 | value | provenance |  |
-| testCoreData2.swift:43:35:43:35 | bankAccountNo | testCoreData2.swift:43:2:43:2 | [post] obj [notStoredBankAccountNumber] | provenance |  |
-| testCoreData2.swift:46:2:46:10 | [post] ...? [myValue] | testCoreData2.swift:46:2:46:10 | [post] ...? | provenance |  |
-| testCoreData2.swift:46:22:46:22 | bankAccountNo | testCoreData2.swift:46:2:46:10 | [post] ...? [myValue] | provenance |  |
-| testCoreData2.swift:48:2:48:10 | [post] ...? [myBankAccountNumber] | testCoreData2.swift:48:2:48:10 | [post] ...? | provenance |  |
-| testCoreData2.swift:48:34:48:34 | bankAccountNo | testCoreData2.swift:48:2:48:10 | [post] ...? [myBankAccountNumber] | provenance |  |
-| testCoreData2.swift:50:2:50:10 | [post] ...? [myBankAccountNumber2] | testCoreData2.swift:50:2:50:10 | [post] ...? | provenance |  |
-| testCoreData2.swift:50:35:50:35 | bankAccountNo | testCoreData2.swift:50:2:50:10 | [post] ...? [myBankAccountNumber2] | provenance |  |
-| testCoreData2.swift:52:2:52:10 | [post] ...? [notStoredBankAccountNumber] | testCoreData2.swift:52:2:52:10 | [post] ...? | provenance |  |
+| testCoreData2.swift:43:35:43:35 | bankAccountNo | testCoreData2.swift:43:2:43:2 | [post] obj | provenance |  |
+| testCoreData2.swift:46:22:46:22 | bankAccountNo | testCoreData2.swift:46:2:46:10 | [post] ...? | provenance |  |
+| testCoreData2.swift:48:34:48:34 | bankAccountNo | testCoreData2.swift:48:2:48:10 | [post] ...? | provenance |  |
+| testCoreData2.swift:50:35:50:35 | bankAccountNo | testCoreData2.swift:50:2:50:10 | [post] ...? | provenance |  |
 | testCoreData2.swift:52:41:52:41 | bankAccountNo | testCoreData2.swift:23:13:23:13 | value | provenance |  |
-| testCoreData2.swift:52:41:52:41 | bankAccountNo | testCoreData2.swift:52:2:52:10 | [post] ...? [notStoredBankAccountNumber] | provenance |  |
-| testCoreData2.swift:57:3:57:3 | [post] obj [myBankAccountNumber] | testCoreData2.swift:57:3:57:3 | [post] obj | provenance |  |
-| testCoreData2.swift:57:29:57:29 | bankAccountNo | testCoreData2.swift:57:3:57:3 | [post] obj [myBankAccountNumber] | provenance |  |
-| testCoreData2.swift:60:4:60:4 | [post] obj [myBankAccountNumber] | testCoreData2.swift:60:4:60:4 | [post] obj | provenance |  |
-| testCoreData2.swift:60:30:60:30 | bankAccountNo | testCoreData2.swift:60:4:60:4 | [post] obj [myBankAccountNumber] | provenance |  |
-| testCoreData2.swift:62:4:62:4 | [post] obj [myBankAccountNumber] | testCoreData2.swift:62:4:62:4 | [post] obj | provenance |  |
-| testCoreData2.swift:62:30:62:30 | bankAccountNo | testCoreData2.swift:62:4:62:4 | [post] obj [myBankAccountNumber] | provenance |  |
-| testCoreData2.swift:65:3:65:3 | [post] obj [myBankAccountNumber] | testCoreData2.swift:65:3:65:3 | [post] obj | provenance |  |
-| testCoreData2.swift:65:29:65:29 | bankAccountNo | testCoreData2.swift:65:3:65:3 | [post] obj [myBankAccountNumber] | provenance |  |
+| testCoreData2.swift:52:41:52:41 | bankAccountNo | testCoreData2.swift:52:2:52:10 | [post] ...? | provenance |  |
+| testCoreData2.swift:57:29:57:29 | bankAccountNo | testCoreData2.swift:57:3:57:3 | [post] obj | provenance |  |
+| testCoreData2.swift:60:30:60:30 | bankAccountNo | testCoreData2.swift:60:4:60:4 | [post] obj | provenance |  |
+| testCoreData2.swift:62:30:62:30 | bankAccountNo | testCoreData2.swift:62:4:62:4 | [post] obj | provenance |  |
+| testCoreData2.swift:65:29:65:29 | bankAccountNo | testCoreData2.swift:65:3:65:3 | [post] obj | provenance |  |
 | testCoreData2.swift:70:9:70:9 | self | file://:0:0:0:0 | self | provenance |  |
 | testCoreData2.swift:70:9:70:9 | self [value] | file://:0:0:0:0 | self [value] | provenance |  |
 | testCoreData2.swift:70:9:70:9 | value | file://:0:0:0:0 | value | provenance |  |
 | testCoreData2.swift:71:9:71:9 | self | file://:0:0:0:0 | self | provenance |  |
-| testCoreData2.swift:79:2:79:2 | [post] dbObj [myValue] | testCoreData2.swift:79:2:79:2 | [post] dbObj | provenance |  |
-| testCoreData2.swift:79:18:79:28 | .bankAccountNo | testCoreData2.swift:79:2:79:2 | [post] dbObj [myValue] | provenance |  |
-| testCoreData2.swift:80:2:80:2 | [post] dbObj [myValue] | testCoreData2.swift:80:2:80:2 | [post] dbObj | provenance |  |
-| testCoreData2.swift:80:18:80:28 | ...! | testCoreData2.swift:80:2:80:2 | [post] dbObj [myValue] | provenance |  |
+| testCoreData2.swift:79:18:79:28 | .bankAccountNo | testCoreData2.swift:79:2:79:2 | [post] dbObj | provenance |  |
+| testCoreData2.swift:80:18:80:28 | ...! | testCoreData2.swift:80:2:80:2 | [post] dbObj | provenance |  |
 | testCoreData2.swift:80:18:80:28 | .bankAccountNo2 | testCoreData2.swift:80:18:80:28 | ...! | provenance |  |
-| testCoreData2.swift:82:2:82:2 | [post] dbObj [myValue] | testCoreData2.swift:82:2:82:2 | [post] dbObj | provenance |  |
 | testCoreData2.swift:82:18:82:18 | bankAccountNo | testCoreData2.swift:70:9:70:9 | self | provenance |  |
 | testCoreData2.swift:82:18:82:18 | bankAccountNo | testCoreData2.swift:82:18:82:32 | .value | provenance | Config |
-| testCoreData2.swift:82:18:82:32 | .value | testCoreData2.swift:82:2:82:2 | [post] dbObj [myValue] | provenance |  |
-| testCoreData2.swift:83:2:83:2 | [post] dbObj [myValue] | testCoreData2.swift:83:2:83:2 | [post] dbObj | provenance |  |
+| testCoreData2.swift:82:18:82:32 | .value | testCoreData2.swift:82:2:82:2 | [post] dbObj | provenance |  |
 | testCoreData2.swift:83:18:83:18 | bankAccountNo | testCoreData2.swift:71:9:71:9 | self | provenance |  |
 | testCoreData2.swift:83:18:83:18 | bankAccountNo | testCoreData2.swift:83:18:83:32 | .value2 | provenance | Config |
-| testCoreData2.swift:83:18:83:32 | ...! | testCoreData2.swift:83:2:83:2 | [post] dbObj [myValue] | provenance |  |
+| testCoreData2.swift:83:18:83:32 | ...! | testCoreData2.swift:83:2:83:2 | [post] dbObj | provenance |  |
 | testCoreData2.swift:83:18:83:32 | .value2 | testCoreData2.swift:83:18:83:32 | ...! | provenance |  |
-| testCoreData2.swift:84:2:84:2 | [post] dbObj [myValue] | testCoreData2.swift:84:2:84:2 | [post] dbObj | provenance |  |
 | testCoreData2.swift:84:18:84:18 | ...! | testCoreData2.swift:70:9:70:9 | self | provenance |  |
 | testCoreData2.swift:84:18:84:18 | ...! | testCoreData2.swift:84:18:84:33 | .value | provenance | Config |
 | testCoreData2.swift:84:18:84:18 | bankAccountNo2 | testCoreData2.swift:84:18:84:18 | ...! | provenance |  |
-| testCoreData2.swift:84:18:84:33 | .value | testCoreData2.swift:84:2:84:2 | [post] dbObj [myValue] | provenance |  |
-| testCoreData2.swift:85:2:85:2 | [post] dbObj [myValue] | testCoreData2.swift:85:2:85:2 | [post] dbObj | provenance |  |
+| testCoreData2.swift:84:18:84:33 | .value | testCoreData2.swift:84:2:84:2 | [post] dbObj | provenance |  |
 | testCoreData2.swift:85:18:85:18 | ...! | testCoreData2.swift:71:9:71:9 | self | provenance |  |
 | testCoreData2.swift:85:18:85:18 | ...! | testCoreData2.swift:85:18:85:33 | .value2 | provenance | Config |
 | testCoreData2.swift:85:18:85:18 | bankAccountNo2 | testCoreData2.swift:85:18:85:18 | ...! | provenance |  |
-| testCoreData2.swift:85:18:85:33 | ...! | testCoreData2.swift:85:2:85:2 | [post] dbObj [myValue] | provenance |  |
+| testCoreData2.swift:85:18:85:33 | ...! | testCoreData2.swift:85:2:85:2 | [post] dbObj | provenance |  |
 | testCoreData2.swift:85:18:85:33 | .value2 | testCoreData2.swift:85:18:85:33 | ...! | provenance |  |
-| testCoreData2.swift:87:2:87:10 | [post] ...? [myValue] | testCoreData2.swift:87:2:87:10 | [post] ...? | provenance |  |
-| testCoreData2.swift:87:22:87:32 | .bankAccountNo | testCoreData2.swift:87:2:87:10 | [post] ...? [myValue] | provenance |  |
-| testCoreData2.swift:88:2:88:10 | [post] ...? [myValue] | testCoreData2.swift:88:2:88:10 | [post] ...? | provenance |  |
+| testCoreData2.swift:87:22:87:32 | .bankAccountNo | testCoreData2.swift:87:2:87:10 | [post] ...? | provenance |  |
 | testCoreData2.swift:88:22:88:22 | bankAccountNo | testCoreData2.swift:70:9:70:9 | self | provenance |  |
 | testCoreData2.swift:88:22:88:22 | bankAccountNo | testCoreData2.swift:88:22:88:36 | .value | provenance | Config |
-| testCoreData2.swift:88:22:88:36 | .value | testCoreData2.swift:88:2:88:10 | [post] ...? [myValue] | provenance |  |
-| testCoreData2.swift:89:2:89:10 | [post] ...? [myValue] | testCoreData2.swift:89:2:89:10 | [post] ...? | provenance |  |
+| testCoreData2.swift:88:22:88:36 | .value | testCoreData2.swift:88:2:88:10 | [post] ...? | provenance |  |
 | testCoreData2.swift:89:22:89:22 | ...! | testCoreData2.swift:71:9:71:9 | self | provenance |  |
 | testCoreData2.swift:89:22:89:22 | ...! | testCoreData2.swift:89:22:89:37 | .value2 | provenance | Config |
 | testCoreData2.swift:89:22:89:22 | bankAccountNo2 | testCoreData2.swift:89:22:89:22 | ...! | provenance |  |
-| testCoreData2.swift:89:22:89:37 | ...! | testCoreData2.swift:89:2:89:10 | [post] ...? [myValue] | provenance |  |
+| testCoreData2.swift:89:22:89:37 | ...! | testCoreData2.swift:89:2:89:10 | [post] ...? | provenance |  |
 | testCoreData2.swift:89:22:89:37 | .value2 | testCoreData2.swift:89:22:89:37 | ...! | provenance |  |
 | testCoreData2.swift:91:10:91:10 | bankAccountNo | testCoreData2.swift:92:10:92:10 | a | provenance |  |
 | testCoreData2.swift:92:10:92:10 | a | testCoreData2.swift:70:9:70:9 | self | provenance |  |
 | testCoreData2.swift:92:10:92:10 | a | testCoreData2.swift:92:10:92:12 | .value | provenance | Config |
 | testCoreData2.swift:92:10:92:12 | .value | testCoreData2.swift:93:18:93:18 | b | provenance |  |
-| testCoreData2.swift:93:2:93:2 | [post] dbObj [myValue] | testCoreData2.swift:93:2:93:2 | [post] dbObj | provenance |  |
-| testCoreData2.swift:93:18:93:18 | b | testCoreData2.swift:93:2:93:2 | [post] dbObj [myValue] | provenance |  |
+| testCoreData2.swift:93:18:93:18 | b | testCoreData2.swift:93:2:93:2 | [post] dbObj | provenance |  |
 | testCoreData2.swift:95:10:95:10 | bankAccountNo | testCoreData2.swift:97:12:97:12 | c | provenance |  |
 | testCoreData2.swift:97:2:97:2 | [post] d [value] | testCoreData2.swift:98:18:98:18 | d [value] | provenance |  |
 | testCoreData2.swift:97:12:97:12 | c | testCoreData2.swift:70:9:70:9 | self | provenance |  |
 | testCoreData2.swift:97:12:97:12 | c | testCoreData2.swift:97:12:97:14 | .value | provenance | Config |
 | testCoreData2.swift:97:12:97:14 | .value | testCoreData2.swift:70:9:70:9 | value | provenance |  |
 | testCoreData2.swift:97:12:97:14 | .value | testCoreData2.swift:97:2:97:2 | [post] d [value] | provenance |  |
-| testCoreData2.swift:98:2:98:2 | [post] dbObj [myValue] | testCoreData2.swift:98:2:98:2 | [post] dbObj | provenance |  |
 | testCoreData2.swift:98:18:98:18 | d [value] | testCoreData2.swift:70:9:70:9 | self [value] | provenance |  |
 | testCoreData2.swift:98:18:98:18 | d [value] | testCoreData2.swift:98:18:98:20 | .value | provenance |  |
-| testCoreData2.swift:98:18:98:20 | .value | testCoreData2.swift:98:2:98:2 | [post] dbObj [myValue] | provenance |  |
+| testCoreData2.swift:98:18:98:20 | .value | testCoreData2.swift:98:2:98:2 | [post] dbObj | provenance |  |
 | testCoreData2.swift:101:10:101:10 | bankAccountNo | testCoreData2.swift:103:13:103:13 | e | provenance |  |
 | testCoreData2.swift:103:13:103:13 | e | testCoreData2.swift:104:18:104:18 | e | provenance |  |
-| testCoreData2.swift:104:2:104:2 | [post] dbObj [myValue] | testCoreData2.swift:104:2:104:2 | [post] dbObj | provenance |  |
 | testCoreData2.swift:104:18:104:18 | e | testCoreData2.swift:70:9:70:9 | self | provenance |  |
 | testCoreData2.swift:104:18:104:18 | e | testCoreData2.swift:104:18:104:20 | .value | provenance | Config |
 | testCoreData2.swift:104:18:104:18 | e | testCoreData2.swift:105:18:105:18 | e | provenance |  |
-| testCoreData2.swift:104:18:104:20 | .value | testCoreData2.swift:104:2:104:2 | [post] dbObj [myValue] | provenance |  |
-| testCoreData2.swift:105:2:105:2 | [post] dbObj [myValue] | testCoreData2.swift:105:2:105:2 | [post] dbObj | provenance |  |
+| testCoreData2.swift:104:18:104:20 | .value | testCoreData2.swift:104:2:104:2 | [post] dbObj | provenance |  |
 | testCoreData2.swift:105:18:105:18 | e | testCoreData2.swift:71:9:71:9 | self | provenance |  |
 | testCoreData2.swift:105:18:105:18 | e | testCoreData2.swift:105:18:105:20 | .value2 | provenance | Config |
-| testCoreData2.swift:105:18:105:20 | ...! | testCoreData2.swift:105:2:105:2 | [post] dbObj [myValue] | provenance |  |
+| testCoreData2.swift:105:18:105:20 | ...! | testCoreData2.swift:105:2:105:2 | [post] dbObj | provenance |  |
 | testCoreData2.swift:105:18:105:20 | .value2 | testCoreData2.swift:105:18:105:20 | ...! | provenance |  |
 | testCoreData.swift:18:19:18:26 | value | testCoreData.swift:19:12:19:12 | value | provenance |  |
 | testCoreData.swift:31:3:31:3 | newValue | testCoreData.swift:32:13:32:13 | newValue | provenance |  |
 | testCoreData.swift:61:25:61:25 | password | testCoreData.swift:18:19:18:26 | value | provenance |  |
-| testCoreData.swift:64:2:64:2 | [post] obj [myValue] | testCoreData.swift:64:2:64:2 | [post] obj | provenance |  |
 | testCoreData.swift:64:16:64:16 | password | testCoreData.swift:31:3:31:3 | newValue | provenance |  |
-| testCoreData.swift:64:16:64:16 | password | testCoreData.swift:64:2:64:2 | [post] obj [myValue] | provenance |  |
+| testCoreData.swift:64:16:64:16 | password | testCoreData.swift:64:2:64:2 | [post] obj | provenance |  |
 | testCoreData.swift:77:24:77:24 | x | testCoreData.swift:78:15:78:15 | x | provenance |  |
 | testCoreData.swift:80:10:80:22 | call to getPassword() | testCoreData.swift:81:15:81:15 | y | provenance |  |
 | testCoreData.swift:91:10:91:10 | passwd | testCoreData.swift:95:15:95:15 | x | provenance |  |
 | testCoreData.swift:92:10:92:10 | passwd | testCoreData.swift:96:15:96:15 | y | provenance |  |
 | testCoreData.swift:93:10:93:10 | passwd | testCoreData.swift:97:15:97:15 | z | provenance |  |
-| testGRDB.swift:73:56:73:65 | [...] [Collection element] | testGRDB.swift:73:56:73:65 | [...] | provenance |  |
-| testGRDB.swift:73:57:73:57 | password | testGRDB.swift:73:56:73:65 | [...] [Collection element] | provenance |  |
-| testGRDB.swift:76:42:76:51 | [...] [Collection element] | testGRDB.swift:76:42:76:51 | [...] | provenance |  |
-| testGRDB.swift:76:43:76:43 | password | testGRDB.swift:76:42:76:51 | [...] [Collection element] | provenance |  |
-| testGRDB.swift:81:44:81:53 | [...] [Collection element] | testGRDB.swift:81:44:81:53 | [...] | provenance |  |
-| testGRDB.swift:81:45:81:45 | password | testGRDB.swift:81:44:81:53 | [...] [Collection element] | provenance |  |
-| testGRDB.swift:83:44:83:53 | [...] [Collection element] | testGRDB.swift:83:44:83:53 | [...] | provenance |  |
-| testGRDB.swift:83:45:83:45 | password | testGRDB.swift:83:44:83:53 | [...] [Collection element] | provenance |  |
-| testGRDB.swift:85:44:85:53 | [...] [Collection element] | testGRDB.swift:85:44:85:53 | [...] | provenance |  |
-| testGRDB.swift:85:45:85:45 | password | testGRDB.swift:85:44:85:53 | [...] [Collection element] | provenance |  |
-| testGRDB.swift:87:44:87:53 | [...] [Collection element] | testGRDB.swift:87:44:87:53 | [...] | provenance |  |
-| testGRDB.swift:87:45:87:45 | password | testGRDB.swift:87:44:87:53 | [...] [Collection element] | provenance |  |
-| testGRDB.swift:92:37:92:46 | [...] [Collection element] | testGRDB.swift:92:37:92:46 | [...] | provenance |  |
-| testGRDB.swift:92:38:92:38 | password | testGRDB.swift:92:37:92:46 | [...] [Collection element] | provenance |  |
-| testGRDB.swift:95:36:95:45 | [...] [Collection element] | testGRDB.swift:95:36:95:45 | [...] | provenance |  |
-| testGRDB.swift:95:37:95:37 | password | testGRDB.swift:95:36:95:45 | [...] [Collection element] | provenance |  |
-| testGRDB.swift:100:72:100:81 | [...] [Collection element] | testGRDB.swift:100:72:100:81 | [...] | provenance |  |
-| testGRDB.swift:100:73:100:73 | password | testGRDB.swift:100:72:100:81 | [...] [Collection element] | provenance |  |
-| testGRDB.swift:101:72:101:81 | [...] [Collection element] | testGRDB.swift:101:72:101:81 | [...] | provenance |  |
-| testGRDB.swift:101:73:101:73 | password | testGRDB.swift:101:72:101:81 | [...] [Collection element] | provenance |  |
-| testGRDB.swift:107:52:107:61 | [...] [Collection element] | testGRDB.swift:107:52:107:61 | [...] | provenance |  |
-| testGRDB.swift:107:53:107:53 | password | testGRDB.swift:107:52:107:61 | [...] [Collection element] | provenance |  |
-| testGRDB.swift:109:52:109:61 | [...] [Collection element] | testGRDB.swift:109:52:109:61 | [...] | provenance |  |
-| testGRDB.swift:109:53:109:53 | password | testGRDB.swift:109:52:109:61 | [...] [Collection element] | provenance |  |
-| testGRDB.swift:111:51:111:60 | [...] [Collection element] | testGRDB.swift:111:51:111:60 | [...] | provenance |  |
-| testGRDB.swift:111:52:111:52 | password | testGRDB.swift:111:51:111:60 | [...] [Collection element] | provenance |  |
-| testGRDB.swift:116:47:116:56 | [...] [Collection element] | testGRDB.swift:116:47:116:56 | [...] | provenance |  |
-| testGRDB.swift:116:48:116:48 | password | testGRDB.swift:116:47:116:56 | [...] [Collection element] | provenance |  |
-| testGRDB.swift:118:47:118:56 | [...] [Collection element] | testGRDB.swift:118:47:118:56 | [...] | provenance |  |
-| testGRDB.swift:118:48:118:48 | password | testGRDB.swift:118:47:118:56 | [...] [Collection element] | provenance |  |
-| testGRDB.swift:121:44:121:53 | [...] [Collection element] | testGRDB.swift:121:44:121:53 | [...] | provenance |  |
-| testGRDB.swift:121:45:121:45 | password | testGRDB.swift:121:44:121:53 | [...] [Collection element] | provenance |  |
-| testGRDB.swift:123:44:123:53 | [...] [Collection element] | testGRDB.swift:123:44:123:53 | [...] | provenance |  |
-| testGRDB.swift:123:45:123:45 | password | testGRDB.swift:123:44:123:53 | [...] [Collection element] | provenance |  |
-| testGRDB.swift:126:44:126:53 | [...] [Collection element] | testGRDB.swift:126:44:126:53 | [...] | provenance |  |
-| testGRDB.swift:126:45:126:45 | password | testGRDB.swift:126:44:126:53 | [...] [Collection element] | provenance |  |
-| testGRDB.swift:128:44:128:53 | [...] [Collection element] | testGRDB.swift:128:44:128:53 | [...] | provenance |  |
-| testGRDB.swift:128:45:128:45 | password | testGRDB.swift:128:44:128:53 | [...] [Collection element] | provenance |  |
-| testGRDB.swift:131:44:131:53 | [...] [Collection element] | testGRDB.swift:131:44:131:53 | [...] | provenance |  |
-| testGRDB.swift:131:45:131:45 | password | testGRDB.swift:131:44:131:53 | [...] [Collection element] | provenance |  |
-| testGRDB.swift:133:44:133:53 | [...] [Collection element] | testGRDB.swift:133:44:133:53 | [...] | provenance |  |
-| testGRDB.swift:133:45:133:45 | password | testGRDB.swift:133:44:133:53 | [...] [Collection element] | provenance |  |
-| testGRDB.swift:138:68:138:77 | [...] [Collection element] | testGRDB.swift:138:68:138:77 | [...] | provenance |  |
-| testGRDB.swift:138:69:138:69 | password | testGRDB.swift:138:68:138:77 | [...] [Collection element] | provenance |  |
-| testGRDB.swift:140:68:140:77 | [...] [Collection element] | testGRDB.swift:140:68:140:77 | [...] | provenance |  |
-| testGRDB.swift:140:69:140:69 | password | testGRDB.swift:140:68:140:77 | [...] [Collection element] | provenance |  |
-| testGRDB.swift:143:65:143:74 | [...] [Collection element] | testGRDB.swift:143:65:143:74 | [...] | provenance |  |
-| testGRDB.swift:143:66:143:66 | password | testGRDB.swift:143:65:143:74 | [...] [Collection element] | provenance |  |
-| testGRDB.swift:145:65:145:74 | [...] [Collection element] | testGRDB.swift:145:65:145:74 | [...] | provenance |  |
-| testGRDB.swift:145:66:145:66 | password | testGRDB.swift:145:65:145:74 | [...] [Collection element] | provenance |  |
-| testGRDB.swift:148:65:148:74 | [...] [Collection element] | testGRDB.swift:148:65:148:74 | [...] | provenance |  |
-| testGRDB.swift:148:66:148:66 | password | testGRDB.swift:148:65:148:74 | [...] [Collection element] | provenance |  |
-| testGRDB.swift:150:65:150:74 | [...] [Collection element] | testGRDB.swift:150:65:150:74 | [...] | provenance |  |
-| testGRDB.swift:150:66:150:66 | password | testGRDB.swift:150:65:150:74 | [...] [Collection element] | provenance |  |
-| testGRDB.swift:153:65:153:74 | [...] [Collection element] | testGRDB.swift:153:65:153:74 | [...] | provenance |  |
-| testGRDB.swift:153:66:153:66 | password | testGRDB.swift:153:65:153:74 | [...] [Collection element] | provenance |  |
-| testGRDB.swift:155:65:155:74 | [...] [Collection element] | testGRDB.swift:155:65:155:74 | [...] | provenance |  |
-| testGRDB.swift:155:66:155:66 | password | testGRDB.swift:155:65:155:74 | [...] [Collection element] | provenance |  |
-| testGRDB.swift:160:59:160:68 | [...] [Collection element] | testGRDB.swift:160:59:160:68 | [...] | provenance |  |
-| testGRDB.swift:160:60:160:60 | password | testGRDB.swift:160:59:160:68 | [...] [Collection element] | provenance |  |
-| testGRDB.swift:161:50:161:59 | [...] [Collection element] | testGRDB.swift:161:50:161:59 | [...] | provenance |  |
-| testGRDB.swift:161:51:161:51 | password | testGRDB.swift:161:50:161:59 | [...] [Collection element] | provenance |  |
-| testGRDB.swift:164:59:164:68 | [...] [Collection element] | testGRDB.swift:164:59:164:68 | [...] | provenance |  |
-| testGRDB.swift:164:60:164:60 | password | testGRDB.swift:164:59:164:68 | [...] [Collection element] | provenance |  |
-| testGRDB.swift:165:50:165:59 | [...] [Collection element] | testGRDB.swift:165:50:165:59 | [...] | provenance |  |
-| testGRDB.swift:165:51:165:51 | password | testGRDB.swift:165:50:165:59 | [...] [Collection element] | provenance |  |
-| testGRDB.swift:169:56:169:65 | [...] [Collection element] | testGRDB.swift:169:56:169:65 | [...] | provenance |  |
-| testGRDB.swift:169:57:169:57 | password | testGRDB.swift:169:56:169:65 | [...] [Collection element] | provenance |  |
-| testGRDB.swift:170:47:170:56 | [...] [Collection element] | testGRDB.swift:170:47:170:56 | [...] | provenance |  |
-| testGRDB.swift:170:48:170:48 | password | testGRDB.swift:170:47:170:56 | [...] [Collection element] | provenance |  |
-| testGRDB.swift:173:56:173:65 | [...] [Collection element] | testGRDB.swift:173:56:173:65 | [...] | provenance |  |
-| testGRDB.swift:173:57:173:57 | password | testGRDB.swift:173:56:173:65 | [...] [Collection element] | provenance |  |
-| testGRDB.swift:174:47:174:56 | [...] [Collection element] | testGRDB.swift:174:47:174:56 | [...] | provenance |  |
-| testGRDB.swift:174:48:174:48 | password | testGRDB.swift:174:47:174:56 | [...] [Collection element] | provenance |  |
-| testGRDB.swift:178:56:178:65 | [...] [Collection element] | testGRDB.swift:178:56:178:65 | [...] | provenance |  |
-| testGRDB.swift:178:57:178:57 | password | testGRDB.swift:178:56:178:65 | [...] [Collection element] | provenance |  |
-| testGRDB.swift:179:47:179:56 | [...] [Collection element] | testGRDB.swift:179:47:179:56 | [...] | provenance |  |
-| testGRDB.swift:179:48:179:48 | password | testGRDB.swift:179:47:179:56 | [...] [Collection element] | provenance |  |
-| testGRDB.swift:182:56:182:65 | [...] [Collection element] | testGRDB.swift:182:56:182:65 | [...] | provenance |  |
-| testGRDB.swift:182:57:182:57 | password | testGRDB.swift:182:56:182:65 | [...] [Collection element] | provenance |  |
-| testGRDB.swift:183:47:183:56 | [...] [Collection element] | testGRDB.swift:183:47:183:56 | [...] | provenance |  |
-| testGRDB.swift:183:48:183:48 | password | testGRDB.swift:183:47:183:56 | [...] [Collection element] | provenance |  |
-| testGRDB.swift:187:56:187:65 | [...] [Collection element] | testGRDB.swift:187:56:187:65 | [...] | provenance |  |
-| testGRDB.swift:187:57:187:57 | password | testGRDB.swift:187:56:187:65 | [...] [Collection element] | provenance |  |
-| testGRDB.swift:188:47:188:56 | [...] [Collection element] | testGRDB.swift:188:47:188:56 | [...] | provenance |  |
-| testGRDB.swift:188:48:188:48 | password | testGRDB.swift:188:47:188:56 | [...] [Collection element] | provenance |  |
-| testGRDB.swift:191:56:191:65 | [...] [Collection element] | testGRDB.swift:191:56:191:65 | [...] | provenance |  |
-| testGRDB.swift:191:57:191:57 | password | testGRDB.swift:191:56:191:65 | [...] [Collection element] | provenance |  |
-| testGRDB.swift:192:47:192:56 | [...] [Collection element] | testGRDB.swift:192:47:192:56 | [...] | provenance |  |
-| testGRDB.swift:192:48:192:48 | password | testGRDB.swift:192:47:192:56 | [...] [Collection element] | provenance |  |
-| testGRDB.swift:198:29:198:38 | [...] [Collection element] | testGRDB.swift:198:29:198:38 | [...] | provenance |  |
-| testGRDB.swift:198:30:198:30 | password | testGRDB.swift:198:29:198:38 | [...] [Collection element] | provenance |  |
-| testGRDB.swift:201:23:201:32 | [...] [Collection element] | testGRDB.swift:201:23:201:32 | [...] | provenance |  |
-| testGRDB.swift:201:24:201:24 | password | testGRDB.swift:201:23:201:32 | [...] [Collection element] | provenance |  |
-| testGRDB.swift:206:66:206:75 | [...] [Collection element] | testGRDB.swift:206:66:206:75 | [...] | provenance |  |
-| testGRDB.swift:206:67:206:67 | password | testGRDB.swift:206:66:206:75 | [...] [Collection element] | provenance |  |
-| testGRDB.swift:208:80:208:89 | [...] [Collection element] | testGRDB.swift:208:80:208:89 | [...] | provenance |  |
-| testGRDB.swift:208:81:208:81 | password | testGRDB.swift:208:80:208:89 | [...] [Collection element] | provenance |  |
-| testGRDB.swift:210:84:210:93 | [...] [Collection element] | testGRDB.swift:210:84:210:93 | [...] | provenance |  |
-| testGRDB.swift:210:85:210:85 | password | testGRDB.swift:210:84:210:93 | [...] [Collection element] | provenance |  |
-| testGRDB.swift:212:98:212:107 | [...] [Collection element] | testGRDB.swift:212:98:212:107 | [...] | provenance |  |
-| testGRDB.swift:212:99:212:99 | password | testGRDB.swift:212:98:212:107 | [...] [Collection element] | provenance |  |
+| testGRDB.swift:73:57:73:57 | password | testGRDB.swift:73:56:73:65 | [...] | provenance |  |
+| testGRDB.swift:76:43:76:43 | password | testGRDB.swift:76:42:76:51 | [...] | provenance |  |
+| testGRDB.swift:81:45:81:45 | password | testGRDB.swift:81:44:81:53 | [...] | provenance |  |
+| testGRDB.swift:83:45:83:45 | password | testGRDB.swift:83:44:83:53 | [...] | provenance |  |
+| testGRDB.swift:85:45:85:45 | password | testGRDB.swift:85:44:85:53 | [...] | provenance |  |
+| testGRDB.swift:87:45:87:45 | password | testGRDB.swift:87:44:87:53 | [...] | provenance |  |
+| testGRDB.swift:92:38:92:38 | password | testGRDB.swift:92:37:92:46 | [...] | provenance |  |
+| testGRDB.swift:95:37:95:37 | password | testGRDB.swift:95:36:95:45 | [...] | provenance |  |
+| testGRDB.swift:100:73:100:73 | password | testGRDB.swift:100:72:100:81 | [...] | provenance |  |
+| testGRDB.swift:101:73:101:73 | password | testGRDB.swift:101:72:101:81 | [...] | provenance |  |
+| testGRDB.swift:107:53:107:53 | password | testGRDB.swift:107:52:107:61 | [...] | provenance |  |
+| testGRDB.swift:109:53:109:53 | password | testGRDB.swift:109:52:109:61 | [...] | provenance |  |
+| testGRDB.swift:111:52:111:52 | password | testGRDB.swift:111:51:111:60 | [...] | provenance |  |
+| testGRDB.swift:116:48:116:48 | password | testGRDB.swift:116:47:116:56 | [...] | provenance |  |
+| testGRDB.swift:118:48:118:48 | password | testGRDB.swift:118:47:118:56 | [...] | provenance |  |
+| testGRDB.swift:121:45:121:45 | password | testGRDB.swift:121:44:121:53 | [...] | provenance |  |
+| testGRDB.swift:123:45:123:45 | password | testGRDB.swift:123:44:123:53 | [...] | provenance |  |
+| testGRDB.swift:126:45:126:45 | password | testGRDB.swift:126:44:126:53 | [...] | provenance |  |
+| testGRDB.swift:128:45:128:45 | password | testGRDB.swift:128:44:128:53 | [...] | provenance |  |
+| testGRDB.swift:131:45:131:45 | password | testGRDB.swift:131:44:131:53 | [...] | provenance |  |
+| testGRDB.swift:133:45:133:45 | password | testGRDB.swift:133:44:133:53 | [...] | provenance |  |
+| testGRDB.swift:138:69:138:69 | password | testGRDB.swift:138:68:138:77 | [...] | provenance |  |
+| testGRDB.swift:140:69:140:69 | password | testGRDB.swift:140:68:140:77 | [...] | provenance |  |
+| testGRDB.swift:143:66:143:66 | password | testGRDB.swift:143:65:143:74 | [...] | provenance |  |
+| testGRDB.swift:145:66:145:66 | password | testGRDB.swift:145:65:145:74 | [...] | provenance |  |
+| testGRDB.swift:148:66:148:66 | password | testGRDB.swift:148:65:148:74 | [...] | provenance |  |
+| testGRDB.swift:150:66:150:66 | password | testGRDB.swift:150:65:150:74 | [...] | provenance |  |
+| testGRDB.swift:153:66:153:66 | password | testGRDB.swift:153:65:153:74 | [...] | provenance |  |
+| testGRDB.swift:155:66:155:66 | password | testGRDB.swift:155:65:155:74 | [...] | provenance |  |
+| testGRDB.swift:160:60:160:60 | password | testGRDB.swift:160:59:160:68 | [...] | provenance |  |
+| testGRDB.swift:161:51:161:51 | password | testGRDB.swift:161:50:161:59 | [...] | provenance |  |
+| testGRDB.swift:164:60:164:60 | password | testGRDB.swift:164:59:164:68 | [...] | provenance |  |
+| testGRDB.swift:165:51:165:51 | password | testGRDB.swift:165:50:165:59 | [...] | provenance |  |
+| testGRDB.swift:169:57:169:57 | password | testGRDB.swift:169:56:169:65 | [...] | provenance |  |
+| testGRDB.swift:170:48:170:48 | password | testGRDB.swift:170:47:170:56 | [...] | provenance |  |
+| testGRDB.swift:173:57:173:57 | password | testGRDB.swift:173:56:173:65 | [...] | provenance |  |
+| testGRDB.swift:174:48:174:48 | password | testGRDB.swift:174:47:174:56 | [...] | provenance |  |
+| testGRDB.swift:178:57:178:57 | password | testGRDB.swift:178:56:178:65 | [...] | provenance |  |
+| testGRDB.swift:179:48:179:48 | password | testGRDB.swift:179:47:179:56 | [...] | provenance |  |
+| testGRDB.swift:182:57:182:57 | password | testGRDB.swift:182:56:182:65 | [...] | provenance |  |
+| testGRDB.swift:183:48:183:48 | password | testGRDB.swift:183:47:183:56 | [...] | provenance |  |
+| testGRDB.swift:187:57:187:57 | password | testGRDB.swift:187:56:187:65 | [...] | provenance |  |
+| testGRDB.swift:188:48:188:48 | password | testGRDB.swift:188:47:188:56 | [...] | provenance |  |
+| testGRDB.swift:191:57:191:57 | password | testGRDB.swift:191:56:191:65 | [...] | provenance |  |
+| testGRDB.swift:192:48:192:48 | password | testGRDB.swift:192:47:192:56 | [...] | provenance |  |
+| testGRDB.swift:198:30:198:30 | password | testGRDB.swift:198:29:198:38 | [...] | provenance |  |
+| testGRDB.swift:201:24:201:24 | password | testGRDB.swift:201:23:201:32 | [...] | provenance |  |
+| testGRDB.swift:206:67:206:67 | password | testGRDB.swift:206:66:206:75 | [...] | provenance |  |
+| testGRDB.swift:208:81:208:81 | password | testGRDB.swift:208:80:208:89 | [...] | provenance |  |
+| testGRDB.swift:210:85:210:85 | password | testGRDB.swift:210:84:210:93 | [...] | provenance |  |
+| testGRDB.swift:212:99:212:99 | password | testGRDB.swift:212:98:212:107 | [...] | provenance |  |
 | testRealm2.swift:13:6:13:6 | value | file://:0:0:0:0 | value | provenance |  |
 | testRealm2.swift:13:6:13:6 | value [Collection element] | file://:0:0:0:0 | value [Collection element] | provenance |  |
-| testRealm2.swift:18:2:18:2 | [post] o [data] | testRealm2.swift:18:2:18:2 | [post] o | provenance |  |
 | testRealm2.swift:18:11:18:11 | myPassword | testRealm2.swift:13:6:13:6 | value | provenance |  |
-| testRealm2.swift:18:11:18:11 | myPassword | testRealm2.swift:18:2:18:2 | [post] o [data] | provenance |  |
-| testRealm2.swift:24:2:24:2 | [post] o [data] | testRealm2.swift:24:2:24:2 | [post] o | provenance |  |
+| testRealm2.swift:18:11:18:11 | myPassword | testRealm2.swift:18:2:18:2 | [post] o | provenance |  |
 | testRealm2.swift:24:11:24:11 | socialSecurityNumber | testRealm2.swift:13:6:13:6 | value | provenance |  |
-| testRealm2.swift:24:11:24:11 | socialSecurityNumber | testRealm2.swift:24:2:24:2 | [post] o [data] | provenance |  |
-| testRealm2.swift:25:2:25:2 | [post] o [data] | testRealm2.swift:25:2:25:2 | [post] o | provenance |  |
+| testRealm2.swift:24:11:24:11 | socialSecurityNumber | testRealm2.swift:24:2:24:2 | [post] o | provenance |  |
 | testRealm2.swift:25:11:25:11 | ssn | testRealm2.swift:13:6:13:6 | value | provenance |  |
-| testRealm2.swift:25:11:25:11 | ssn | testRealm2.swift:25:2:25:2 | [post] o [data] | provenance |  |
-| testRealm2.swift:26:2:26:2 | [post] o [data, Collection element] | testRealm2.swift:26:2:26:2 | [post] o | provenance |  |
-| testRealm2.swift:26:2:26:2 | [post] o [data] | testRealm2.swift:26:2:26:2 | [post] o | provenance |  |
+| testRealm2.swift:25:11:25:11 | ssn | testRealm2.swift:25:2:25:2 | [post] o | provenance |  |
 | testRealm2.swift:26:11:26:25 | call to String.init(_:) | testRealm2.swift:13:6:13:6 | value | provenance |  |
-| testRealm2.swift:26:11:26:25 | call to String.init(_:) | testRealm2.swift:26:2:26:2 | [post] o [data] | provenance |  |
+| testRealm2.swift:26:11:26:25 | call to String.init(_:) | testRealm2.swift:26:2:26:2 | [post] o | provenance |  |
 | testRealm2.swift:26:11:26:25 | call to String.init(_:) [Collection element] | testRealm2.swift:13:6:13:6 | value [Collection element] | provenance |  |
-| testRealm2.swift:26:11:26:25 | call to String.init(_:) [Collection element] | testRealm2.swift:26:2:26:2 | [post] o [data, Collection element] | provenance |  |
+| testRealm2.swift:26:11:26:25 | call to String.init(_:) [Collection element] | testRealm2.swift:26:2:26:2 | [post] o | provenance |  |
 | testRealm2.swift:26:18:26:18 | ssn_int | testRealm2.swift:26:11:26:25 | call to String.init(_:) | provenance |  |
 | testRealm2.swift:26:18:26:18 | ssn_int | testRealm2.swift:26:11:26:25 | call to String.init(_:) [Collection element] | provenance |  |
-| testRealm2.swift:32:2:32:2 | [post] o [data] | testRealm2.swift:32:2:32:2 | [post] o | provenance |  |
 | testRealm2.swift:32:11:32:11 | creditCardNumber | testRealm2.swift:13:6:13:6 | value | provenance |  |
-| testRealm2.swift:32:11:32:11 | creditCardNumber | testRealm2.swift:32:2:32:2 | [post] o [data] | provenance |  |
-| testRealm2.swift:33:2:33:2 | [post] o [data] | testRealm2.swift:33:2:33:2 | [post] o | provenance |  |
+| testRealm2.swift:32:11:32:11 | creditCardNumber | testRealm2.swift:32:2:32:2 | [post] o | provenance |  |
 | testRealm2.swift:33:11:33:11 | CCN | testRealm2.swift:13:6:13:6 | value | provenance |  |
-| testRealm2.swift:33:11:33:11 | CCN | testRealm2.swift:33:2:33:2 | [post] o [data] | provenance |  |
-| testRealm2.swift:34:2:34:2 | [post] o [data, Collection element] | testRealm2.swift:34:2:34:2 | [post] o | provenance |  |
-| testRealm2.swift:34:2:34:2 | [post] o [data] | testRealm2.swift:34:2:34:2 | [post] o | provenance |  |
+| testRealm2.swift:33:11:33:11 | CCN | testRealm2.swift:33:2:33:2 | [post] o | provenance |  |
 | testRealm2.swift:34:11:34:25 | call to String.init(_:) | testRealm2.swift:13:6:13:6 | value | provenance |  |
-| testRealm2.swift:34:11:34:25 | call to String.init(_:) | testRealm2.swift:34:2:34:2 | [post] o [data] | provenance |  |
+| testRealm2.swift:34:11:34:25 | call to String.init(_:) | testRealm2.swift:34:2:34:2 | [post] o | provenance |  |
 | testRealm2.swift:34:11:34:25 | call to String.init(_:) [Collection element] | testRealm2.swift:13:6:13:6 | value [Collection element] | provenance |  |
-| testRealm2.swift:34:11:34:25 | call to String.init(_:) [Collection element] | testRealm2.swift:34:2:34:2 | [post] o [data, Collection element] | provenance |  |
+| testRealm2.swift:34:11:34:25 | call to String.init(_:) [Collection element] | testRealm2.swift:34:2:34:2 | [post] o | provenance |  |
 | testRealm2.swift:34:18:34:18 | int_ccn | testRealm2.swift:34:11:34:25 | call to String.init(_:) | provenance |  |
 | testRealm2.swift:34:18:34:18 | int_ccn | testRealm2.swift:34:11:34:25 | call to String.init(_:) [Collection element] | provenance |  |
 | testRealm.swift:27:6:27:6 | value | file://:0:0:0:0 | value | provenance |  |
 | testRealm.swift:34:6:34:6 | value | file://:0:0:0:0 | value | provenance |  |
-| testRealm.swift:41:2:41:2 | [post] a [data] | testRealm.swift:41:2:41:2 | [post] a | provenance |  |
 | testRealm.swift:41:11:41:11 | myPassword | testRealm.swift:27:6:27:6 | value | provenance |  |
-| testRealm.swift:41:11:41:11 | myPassword | testRealm.swift:41:2:41:2 | [post] a [data] | provenance |  |
-| testRealm.swift:49:2:49:2 | [post] c [data] | testRealm.swift:49:2:49:2 | [post] c | provenance |  |
+| testRealm.swift:41:11:41:11 | myPassword | testRealm.swift:41:2:41:2 | [post] a | provenance |  |
 | testRealm.swift:49:11:49:11 | myPassword | testRealm.swift:27:6:27:6 | value | provenance |  |
-| testRealm.swift:49:11:49:11 | myPassword | testRealm.swift:49:2:49:2 | [post] c [data] | provenance |  |
-| testRealm.swift:59:2:59:3 | [post] ...! [data] | testRealm.swift:59:2:59:3 | [post] ...! | provenance |  |
+| testRealm.swift:49:11:49:11 | myPassword | testRealm.swift:49:2:49:2 | [post] c | provenance |  |
 | testRealm.swift:59:12:59:12 | myPassword | testRealm.swift:27:6:27:6 | value | provenance |  |
-| testRealm.swift:59:12:59:12 | myPassword | testRealm.swift:59:2:59:3 | [post] ...! [data] | provenance |  |
-| testRealm.swift:66:2:66:2 | [post] g [data] | testRealm.swift:66:2:66:2 | [post] g | provenance |  |
+| testRealm.swift:59:12:59:12 | myPassword | testRealm.swift:59:2:59:3 | [post] ...! | provenance |  |
 | testRealm.swift:66:11:66:11 | myPassword | testRealm.swift:27:6:27:6 | value | provenance |  |
-| testRealm.swift:66:11:66:11 | myPassword | testRealm.swift:66:2:66:2 | [post] g [data] | provenance |  |
-| testRealm.swift:73:2:73:2 | [post] h [password] | testRealm.swift:73:2:73:2 | [post] h | provenance |  |
+| testRealm.swift:66:11:66:11 | myPassword | testRealm.swift:66:2:66:2 | [post] g | provenance |  |
 | testRealm.swift:73:15:73:15 | myPassword | testRealm.swift:34:6:34:6 | value | provenance |  |
-| testRealm.swift:73:15:73:15 | myPassword | testRealm.swift:73:2:73:2 | [post] h [password] | provenance |  |
+| testRealm.swift:73:15:73:15 | myPassword | testRealm.swift:73:2:73:2 | [post] h | provenance |  |
 nodes
 | SQLite.swift:119:70:119:70 | mobilePhoneNumber | semmle.label | mobilePhoneNumber |
 | SQLite.swift:120:50:120:50 | mobilePhoneNumber | semmle.label | mobilePhoneNumber |
@@ -377,45 +274,33 @@ nodes
 | SQLite.swift:154:23:154:23 | [...] [Collection element] | semmle.label | [...] [Collection element] |
 | SQLite.swift:154:23:154:23 | mobilePhoneNumber | semmle.label | mobilePhoneNumber |
 | SQLite.swift:158:32:158:54 | [...] | semmle.label | [...] |
-| SQLite.swift:158:32:158:54 | [...] [Collection element] | semmle.label | [...] [Collection element] |
 | SQLite.swift:158:33:158:33 | mobilePhoneNumber | semmle.label | mobilePhoneNumber |
 | SQLite.swift:159:28:159:50 | [...] | semmle.label | [...] |
-| SQLite.swift:159:28:159:50 | [...] [Collection element] | semmle.label | [...] [Collection element] |
 | SQLite.swift:159:29:159:29 | mobilePhoneNumber | semmle.label | mobilePhoneNumber |
 | SQLite.swift:160:31:160:53 | [...] | semmle.label | [...] |
-| SQLite.swift:160:31:160:53 | [...] [Collection element] | semmle.label | [...] [Collection element] |
 | SQLite.swift:160:32:160:32 | mobilePhoneNumber | semmle.label | mobilePhoneNumber |
 | SQLite.swift:163:21:163:43 | [...] | semmle.label | [...] |
-| SQLite.swift:163:21:163:43 | [...] [Collection element] | semmle.label | [...] [Collection element] |
 | SQLite.swift:163:22:163:22 | mobilePhoneNumber | semmle.label | mobilePhoneNumber |
 | SQLite.swift:164:20:164:42 | [...] | semmle.label | [...] |
-| SQLite.swift:164:20:164:42 | [...] [Collection element] | semmle.label | [...] [Collection element] |
 | SQLite.swift:164:21:164:21 | mobilePhoneNumber | semmle.label | mobilePhoneNumber |
 | SQLite.swift:165:23:165:45 | [...] | semmle.label | [...] |
-| SQLite.swift:165:23:165:45 | [...] [Collection element] | semmle.label | [...] [Collection element] |
 | SQLite.swift:165:24:165:24 | mobilePhoneNumber | semmle.label | mobilePhoneNumber |
 | SQLite.swift:169:32:169:70 | [...] | semmle.label | [...] |
-| SQLite.swift:169:32:169:70 | [...] [Collection element, Tuple element at index 1] | semmle.label | [...] [Collection element, Tuple element at index 1] |
 | SQLite.swift:169:43:169:53 | (...) [Tuple element at index 1] | semmle.label | (...) [Tuple element at index 1] |
 | SQLite.swift:169:53:169:53 | mobilePhoneNumber | semmle.label | mobilePhoneNumber |
 | SQLite.swift:170:28:170:66 | [...] | semmle.label | [...] |
-| SQLite.swift:170:28:170:66 | [...] [Collection element, Tuple element at index 1] | semmle.label | [...] [Collection element, Tuple element at index 1] |
 | SQLite.swift:170:39:170:49 | (...) [Tuple element at index 1] | semmle.label | (...) [Tuple element at index 1] |
 | SQLite.swift:170:49:170:49 | mobilePhoneNumber | semmle.label | mobilePhoneNumber |
 | SQLite.swift:171:31:171:69 | [...] | semmle.label | [...] |
-| SQLite.swift:171:31:171:69 | [...] [Collection element, Tuple element at index 1] | semmle.label | [...] [Collection element, Tuple element at index 1] |
 | SQLite.swift:171:42:171:52 | (...) [Tuple element at index 1] | semmle.label | (...) [Tuple element at index 1] |
 | SQLite.swift:171:52:171:52 | mobilePhoneNumber | semmle.label | mobilePhoneNumber |
 | SQLite.swift:174:21:174:59 | [...] | semmle.label | [...] |
-| SQLite.swift:174:21:174:59 | [...] [Collection element, Tuple element at index 1] | semmle.label | [...] [Collection element, Tuple element at index 1] |
 | SQLite.swift:174:32:174:42 | (...) [Tuple element at index 1] | semmle.label | (...) [Tuple element at index 1] |
 | SQLite.swift:174:42:174:42 | mobilePhoneNumber | semmle.label | mobilePhoneNumber |
 | SQLite.swift:175:20:175:58 | [...] | semmle.label | [...] |
-| SQLite.swift:175:20:175:58 | [...] [Collection element, Tuple element at index 1] | semmle.label | [...] [Collection element, Tuple element at index 1] |
 | SQLite.swift:175:31:175:41 | (...) [Tuple element at index 1] | semmle.label | (...) [Tuple element at index 1] |
 | SQLite.swift:175:41:175:41 | mobilePhoneNumber | semmle.label | mobilePhoneNumber |
 | SQLite.swift:176:23:176:61 | [...] | semmle.label | [...] |
-| SQLite.swift:176:23:176:61 | [...] [Collection element, Tuple element at index 1] | semmle.label | [...] [Collection element, Tuple element at index 1] |
 | SQLite.swift:176:34:176:44 | (...) [Tuple element at index 1] | semmle.label | (...) [Tuple element at index 1] |
 | SQLite.swift:176:44:176:44 | mobilePhoneNumber | semmle.label | mobilePhoneNumber |
 | SQLite.swift:186:40:186:54 | ... <-(_:_:) ... | semmle.label | ... <-(_:_:) ... |
@@ -467,40 +352,28 @@ nodes
 | testCoreData2.swift:23:13:23:13 | self [Return] [notStoredBankAccountNumber] | semmle.label | self [Return] [notStoredBankAccountNumber] |
 | testCoreData2.swift:23:13:23:13 | value | semmle.label | value |
 | testCoreData2.swift:37:2:37:2 | [post] obj | semmle.label | [post] obj |
-| testCoreData2.swift:37:2:37:2 | [post] obj [myValue] | semmle.label | [post] obj [myValue] |
 | testCoreData2.swift:37:16:37:16 | bankAccountNo | semmle.label | bankAccountNo |
 | testCoreData2.swift:39:2:39:2 | [post] obj | semmle.label | [post] obj |
-| testCoreData2.swift:39:2:39:2 | [post] obj [myBankAccountNumber] | semmle.label | [post] obj [myBankAccountNumber] |
 | testCoreData2.swift:39:28:39:28 | bankAccountNo | semmle.label | bankAccountNo |
 | testCoreData2.swift:41:2:41:2 | [post] obj | semmle.label | [post] obj |
-| testCoreData2.swift:41:2:41:2 | [post] obj [myBankAccountNumber2] | semmle.label | [post] obj [myBankAccountNumber2] |
 | testCoreData2.swift:41:29:41:29 | bankAccountNo | semmle.label | bankAccountNo |
 | testCoreData2.swift:43:2:43:2 | [post] obj | semmle.label | [post] obj |
-| testCoreData2.swift:43:2:43:2 | [post] obj [notStoredBankAccountNumber] | semmle.label | [post] obj [notStoredBankAccountNumber] |
 | testCoreData2.swift:43:35:43:35 | bankAccountNo | semmle.label | bankAccountNo |
 | testCoreData2.swift:46:2:46:10 | [post] ...? | semmle.label | [post] ...? |
-| testCoreData2.swift:46:2:46:10 | [post] ...? [myValue] | semmle.label | [post] ...? [myValue] |
 | testCoreData2.swift:46:22:46:22 | bankAccountNo | semmle.label | bankAccountNo |
 | testCoreData2.swift:48:2:48:10 | [post] ...? | semmle.label | [post] ...? |
-| testCoreData2.swift:48:2:48:10 | [post] ...? [myBankAccountNumber] | semmle.label | [post] ...? [myBankAccountNumber] |
 | testCoreData2.swift:48:34:48:34 | bankAccountNo | semmle.label | bankAccountNo |
 | testCoreData2.swift:50:2:50:10 | [post] ...? | semmle.label | [post] ...? |
-| testCoreData2.swift:50:2:50:10 | [post] ...? [myBankAccountNumber2] | semmle.label | [post] ...? [myBankAccountNumber2] |
 | testCoreData2.swift:50:35:50:35 | bankAccountNo | semmle.label | bankAccountNo |
 | testCoreData2.swift:52:2:52:10 | [post] ...? | semmle.label | [post] ...? |
-| testCoreData2.swift:52:2:52:10 | [post] ...? [notStoredBankAccountNumber] | semmle.label | [post] ...? [notStoredBankAccountNumber] |
 | testCoreData2.swift:52:41:52:41 | bankAccountNo | semmle.label | bankAccountNo |
 | testCoreData2.swift:57:3:57:3 | [post] obj | semmle.label | [post] obj |
-| testCoreData2.swift:57:3:57:3 | [post] obj [myBankAccountNumber] | semmle.label | [post] obj [myBankAccountNumber] |
 | testCoreData2.swift:57:29:57:29 | bankAccountNo | semmle.label | bankAccountNo |
 | testCoreData2.swift:60:4:60:4 | [post] obj | semmle.label | [post] obj |
-| testCoreData2.swift:60:4:60:4 | [post] obj [myBankAccountNumber] | semmle.label | [post] obj [myBankAccountNumber] |
 | testCoreData2.swift:60:30:60:30 | bankAccountNo | semmle.label | bankAccountNo |
 | testCoreData2.swift:62:4:62:4 | [post] obj | semmle.label | [post] obj |
-| testCoreData2.swift:62:4:62:4 | [post] obj [myBankAccountNumber] | semmle.label | [post] obj [myBankAccountNumber] |
 | testCoreData2.swift:62:30:62:30 | bankAccountNo | semmle.label | bankAccountNo |
 | testCoreData2.swift:65:3:65:3 | [post] obj | semmle.label | [post] obj |
-| testCoreData2.swift:65:3:65:3 | [post] obj [myBankAccountNumber] | semmle.label | [post] obj [myBankAccountNumber] |
 | testCoreData2.swift:65:29:65:29 | bankAccountNo | semmle.label | bankAccountNo |
 | testCoreData2.swift:70:9:70:9 | self | semmle.label | self |
 | testCoreData2.swift:70:9:70:9 | self [Return] [value] | semmle.label | self [Return] [value] |
@@ -508,41 +381,32 @@ nodes
 | testCoreData2.swift:70:9:70:9 | value | semmle.label | value |
 | testCoreData2.swift:71:9:71:9 | self | semmle.label | self |
 | testCoreData2.swift:79:2:79:2 | [post] dbObj | semmle.label | [post] dbObj |
-| testCoreData2.swift:79:2:79:2 | [post] dbObj [myValue] | semmle.label | [post] dbObj [myValue] |
 | testCoreData2.swift:79:18:79:28 | .bankAccountNo | semmle.label | .bankAccountNo |
 | testCoreData2.swift:80:2:80:2 | [post] dbObj | semmle.label | [post] dbObj |
-| testCoreData2.swift:80:2:80:2 | [post] dbObj [myValue] | semmle.label | [post] dbObj [myValue] |
 | testCoreData2.swift:80:18:80:28 | ...! | semmle.label | ...! |
 | testCoreData2.swift:80:18:80:28 | .bankAccountNo2 | semmle.label | .bankAccountNo2 |
 | testCoreData2.swift:82:2:82:2 | [post] dbObj | semmle.label | [post] dbObj |
-| testCoreData2.swift:82:2:82:2 | [post] dbObj [myValue] | semmle.label | [post] dbObj [myValue] |
 | testCoreData2.swift:82:18:82:18 | bankAccountNo | semmle.label | bankAccountNo |
 | testCoreData2.swift:82:18:82:32 | .value | semmle.label | .value |
 | testCoreData2.swift:83:2:83:2 | [post] dbObj | semmle.label | [post] dbObj |
-| testCoreData2.swift:83:2:83:2 | [post] dbObj [myValue] | semmle.label | [post] dbObj [myValue] |
 | testCoreData2.swift:83:18:83:18 | bankAccountNo | semmle.label | bankAccountNo |
 | testCoreData2.swift:83:18:83:32 | ...! | semmle.label | ...! |
 | testCoreData2.swift:83:18:83:32 | .value2 | semmle.label | .value2 |
 | testCoreData2.swift:84:2:84:2 | [post] dbObj | semmle.label | [post] dbObj |
-| testCoreData2.swift:84:2:84:2 | [post] dbObj [myValue] | semmle.label | [post] dbObj [myValue] |
 | testCoreData2.swift:84:18:84:18 | ...! | semmle.label | ...! |
 | testCoreData2.swift:84:18:84:18 | bankAccountNo2 | semmle.label | bankAccountNo2 |
 | testCoreData2.swift:84:18:84:33 | .value | semmle.label | .value |
 | testCoreData2.swift:85:2:85:2 | [post] dbObj | semmle.label | [post] dbObj |
-| testCoreData2.swift:85:2:85:2 | [post] dbObj [myValue] | semmle.label | [post] dbObj [myValue] |
 | testCoreData2.swift:85:18:85:18 | ...! | semmle.label | ...! |
 | testCoreData2.swift:85:18:85:18 | bankAccountNo2 | semmle.label | bankAccountNo2 |
 | testCoreData2.swift:85:18:85:33 | ...! | semmle.label | ...! |
 | testCoreData2.swift:85:18:85:33 | .value2 | semmle.label | .value2 |
 | testCoreData2.swift:87:2:87:10 | [post] ...? | semmle.label | [post] ...? |
-| testCoreData2.swift:87:2:87:10 | [post] ...? [myValue] | semmle.label | [post] ...? [myValue] |
 | testCoreData2.swift:87:22:87:32 | .bankAccountNo | semmle.label | .bankAccountNo |
 | testCoreData2.swift:88:2:88:10 | [post] ...? | semmle.label | [post] ...? |
-| testCoreData2.swift:88:2:88:10 | [post] ...? [myValue] | semmle.label | [post] ...? [myValue] |
 | testCoreData2.swift:88:22:88:22 | bankAccountNo | semmle.label | bankAccountNo |
 | testCoreData2.swift:88:22:88:36 | .value | semmle.label | .value |
 | testCoreData2.swift:89:2:89:10 | [post] ...? | semmle.label | [post] ...? |
-| testCoreData2.swift:89:2:89:10 | [post] ...? [myValue] | semmle.label | [post] ...? [myValue] |
 | testCoreData2.swift:89:22:89:22 | ...! | semmle.label | ...! |
 | testCoreData2.swift:89:22:89:22 | bankAccountNo2 | semmle.label | bankAccountNo2 |
 | testCoreData2.swift:89:22:89:37 | ...! | semmle.label | ...! |
@@ -551,24 +415,20 @@ nodes
 | testCoreData2.swift:92:10:92:10 | a | semmle.label | a |
 | testCoreData2.swift:92:10:92:12 | .value | semmle.label | .value |
 | testCoreData2.swift:93:2:93:2 | [post] dbObj | semmle.label | [post] dbObj |
-| testCoreData2.swift:93:2:93:2 | [post] dbObj [myValue] | semmle.label | [post] dbObj [myValue] |
 | testCoreData2.swift:93:18:93:18 | b | semmle.label | b |
 | testCoreData2.swift:95:10:95:10 | bankAccountNo | semmle.label | bankAccountNo |
 | testCoreData2.swift:97:2:97:2 | [post] d [value] | semmle.label | [post] d [value] |
 | testCoreData2.swift:97:12:97:12 | c | semmle.label | c |
 | testCoreData2.swift:97:12:97:14 | .value | semmle.label | .value |
 | testCoreData2.swift:98:2:98:2 | [post] dbObj | semmle.label | [post] dbObj |
-| testCoreData2.swift:98:2:98:2 | [post] dbObj [myValue] | semmle.label | [post] dbObj [myValue] |
 | testCoreData2.swift:98:18:98:18 | d [value] | semmle.label | d [value] |
 | testCoreData2.swift:98:18:98:20 | .value | semmle.label | .value |
 | testCoreData2.swift:101:10:101:10 | bankAccountNo | semmle.label | bankAccountNo |
 | testCoreData2.swift:103:13:103:13 | e | semmle.label | e |
 | testCoreData2.swift:104:2:104:2 | [post] dbObj | semmle.label | [post] dbObj |
-| testCoreData2.swift:104:2:104:2 | [post] dbObj [myValue] | semmle.label | [post] dbObj [myValue] |
 | testCoreData2.swift:104:18:104:18 | e | semmle.label | e |
 | testCoreData2.swift:104:18:104:20 | .value | semmle.label | .value |
 | testCoreData2.swift:105:2:105:2 | [post] dbObj | semmle.label | [post] dbObj |
-| testCoreData2.swift:105:2:105:2 | [post] dbObj [myValue] | semmle.label | [post] dbObj [myValue] |
 | testCoreData2.swift:105:18:105:18 | e | semmle.label | e |
 | testCoreData2.swift:105:18:105:20 | ...! | semmle.label | ...! |
 | testCoreData2.swift:105:18:105:20 | .value2 | semmle.label | .value2 |
@@ -581,7 +441,6 @@ nodes
 | testCoreData.swift:58:15:58:15 | password | semmle.label | password |
 | testCoreData.swift:61:25:61:25 | password | semmle.label | password |
 | testCoreData.swift:64:2:64:2 | [post] obj | semmle.label | [post] obj |
-| testCoreData.swift:64:2:64:2 | [post] obj [myValue] | semmle.label | [post] obj [myValue] |
 | testCoreData.swift:64:16:64:16 | password | semmle.label | password |
 | testCoreData.swift:77:24:77:24 | x | semmle.label | x |
 | testCoreData.swift:78:15:78:15 | x | semmle.label | x |
@@ -597,186 +456,126 @@ nodes
 | testCoreData.swift:128:15:128:33 | call to generateSecretKey() | semmle.label | call to generateSecretKey() |
 | testCoreData.swift:129:15:129:30 | call to getCertificate() | semmle.label | call to getCertificate() |
 | testGRDB.swift:73:56:73:65 | [...] | semmle.label | [...] |
-| testGRDB.swift:73:56:73:65 | [...] [Collection element] | semmle.label | [...] [Collection element] |
 | testGRDB.swift:73:57:73:57 | password | semmle.label | password |
 | testGRDB.swift:76:42:76:51 | [...] | semmle.label | [...] |
-| testGRDB.swift:76:42:76:51 | [...] [Collection element] | semmle.label | [...] [Collection element] |
 | testGRDB.swift:76:43:76:43 | password | semmle.label | password |
 | testGRDB.swift:81:44:81:53 | [...] | semmle.label | [...] |
-| testGRDB.swift:81:44:81:53 | [...] [Collection element] | semmle.label | [...] [Collection element] |
 | testGRDB.swift:81:45:81:45 | password | semmle.label | password |
 | testGRDB.swift:83:44:83:53 | [...] | semmle.label | [...] |
-| testGRDB.swift:83:44:83:53 | [...] [Collection element] | semmle.label | [...] [Collection element] |
 | testGRDB.swift:83:45:83:45 | password | semmle.label | password |
 | testGRDB.swift:85:44:85:53 | [...] | semmle.label | [...] |
-| testGRDB.swift:85:44:85:53 | [...] [Collection element] | semmle.label | [...] [Collection element] |
 | testGRDB.swift:85:45:85:45 | password | semmle.label | password |
 | testGRDB.swift:87:44:87:53 | [...] | semmle.label | [...] |
-| testGRDB.swift:87:44:87:53 | [...] [Collection element] | semmle.label | [...] [Collection element] |
 | testGRDB.swift:87:45:87:45 | password | semmle.label | password |
 | testGRDB.swift:92:37:92:46 | [...] | semmle.label | [...] |
-| testGRDB.swift:92:37:92:46 | [...] [Collection element] | semmle.label | [...] [Collection element] |
 | testGRDB.swift:92:38:92:38 | password | semmle.label | password |
 | testGRDB.swift:95:36:95:45 | [...] | semmle.label | [...] |
-| testGRDB.swift:95:36:95:45 | [...] [Collection element] | semmle.label | [...] [Collection element] |
 | testGRDB.swift:95:37:95:37 | password | semmle.label | password |
 | testGRDB.swift:100:72:100:81 | [...] | semmle.label | [...] |
-| testGRDB.swift:100:72:100:81 | [...] [Collection element] | semmle.label | [...] [Collection element] |
 | testGRDB.swift:100:73:100:73 | password | semmle.label | password |
 | testGRDB.swift:101:72:101:81 | [...] | semmle.label | [...] |
-| testGRDB.swift:101:72:101:81 | [...] [Collection element] | semmle.label | [...] [Collection element] |
 | testGRDB.swift:101:73:101:73 | password | semmle.label | password |
 | testGRDB.swift:107:52:107:61 | [...] | semmle.label | [...] |
-| testGRDB.swift:107:52:107:61 | [...] [Collection element] | semmle.label | [...] [Collection element] |
 | testGRDB.swift:107:53:107:53 | password | semmle.label | password |
 | testGRDB.swift:109:52:109:61 | [...] | semmle.label | [...] |
-| testGRDB.swift:109:52:109:61 | [...] [Collection element] | semmle.label | [...] [Collection element] |
 | testGRDB.swift:109:53:109:53 | password | semmle.label | password |
 | testGRDB.swift:111:51:111:60 | [...] | semmle.label | [...] |
-| testGRDB.swift:111:51:111:60 | [...] [Collection element] | semmle.label | [...] [Collection element] |
 | testGRDB.swift:111:52:111:52 | password | semmle.label | password |
 | testGRDB.swift:116:47:116:56 | [...] | semmle.label | [...] |
-| testGRDB.swift:116:47:116:56 | [...] [Collection element] | semmle.label | [...] [Collection element] |
 | testGRDB.swift:116:48:116:48 | password | semmle.label | password |
 | testGRDB.swift:118:47:118:56 | [...] | semmle.label | [...] |
-| testGRDB.swift:118:47:118:56 | [...] [Collection element] | semmle.label | [...] [Collection element] |
 | testGRDB.swift:118:48:118:48 | password | semmle.label | password |
 | testGRDB.swift:121:44:121:53 | [...] | semmle.label | [...] |
-| testGRDB.swift:121:44:121:53 | [...] [Collection element] | semmle.label | [...] [Collection element] |
 | testGRDB.swift:121:45:121:45 | password | semmle.label | password |
 | testGRDB.swift:123:44:123:53 | [...] | semmle.label | [...] |
-| testGRDB.swift:123:44:123:53 | [...] [Collection element] | semmle.label | [...] [Collection element] |
 | testGRDB.swift:123:45:123:45 | password | semmle.label | password |
 | testGRDB.swift:126:44:126:53 | [...] | semmle.label | [...] |
-| testGRDB.swift:126:44:126:53 | [...] [Collection element] | semmle.label | [...] [Collection element] |
 | testGRDB.swift:126:45:126:45 | password | semmle.label | password |
 | testGRDB.swift:128:44:128:53 | [...] | semmle.label | [...] |
-| testGRDB.swift:128:44:128:53 | [...] [Collection element] | semmle.label | [...] [Collection element] |
 | testGRDB.swift:128:45:128:45 | password | semmle.label | password |
 | testGRDB.swift:131:44:131:53 | [...] | semmle.label | [...] |
-| testGRDB.swift:131:44:131:53 | [...] [Collection element] | semmle.label | [...] [Collection element] |
 | testGRDB.swift:131:45:131:45 | password | semmle.label | password |
 | testGRDB.swift:133:44:133:53 | [...] | semmle.label | [...] |
-| testGRDB.swift:133:44:133:53 | [...] [Collection element] | semmle.label | [...] [Collection element] |
 | testGRDB.swift:133:45:133:45 | password | semmle.label | password |
 | testGRDB.swift:138:68:138:77 | [...] | semmle.label | [...] |
-| testGRDB.swift:138:68:138:77 | [...] [Collection element] | semmle.label | [...] [Collection element] |
 | testGRDB.swift:138:69:138:69 | password | semmle.label | password |
 | testGRDB.swift:140:68:140:77 | [...] | semmle.label | [...] |
-| testGRDB.swift:140:68:140:77 | [...] [Collection element] | semmle.label | [...] [Collection element] |
 | testGRDB.swift:140:69:140:69 | password | semmle.label | password |
 | testGRDB.swift:143:65:143:74 | [...] | semmle.label | [...] |
-| testGRDB.swift:143:65:143:74 | [...] [Collection element] | semmle.label | [...] [Collection element] |
 | testGRDB.swift:143:66:143:66 | password | semmle.label | password |
 | testGRDB.swift:145:65:145:74 | [...] | semmle.label | [...] |
-| testGRDB.swift:145:65:145:74 | [...] [Collection element] | semmle.label | [...] [Collection element] |
 | testGRDB.swift:145:66:145:66 | password | semmle.label | password |
 | testGRDB.swift:148:65:148:74 | [...] | semmle.label | [...] |
-| testGRDB.swift:148:65:148:74 | [...] [Collection element] | semmle.label | [...] [Collection element] |
 | testGRDB.swift:148:66:148:66 | password | semmle.label | password |
 | testGRDB.swift:150:65:150:74 | [...] | semmle.label | [...] |
-| testGRDB.swift:150:65:150:74 | [...] [Collection element] | semmle.label | [...] [Collection element] |
 | testGRDB.swift:150:66:150:66 | password | semmle.label | password |
 | testGRDB.swift:153:65:153:74 | [...] | semmle.label | [...] |
-| testGRDB.swift:153:65:153:74 | [...] [Collection element] | semmle.label | [...] [Collection element] |
 | testGRDB.swift:153:66:153:66 | password | semmle.label | password |
 | testGRDB.swift:155:65:155:74 | [...] | semmle.label | [...] |
-| testGRDB.swift:155:65:155:74 | [...] [Collection element] | semmle.label | [...] [Collection element] |
 | testGRDB.swift:155:66:155:66 | password | semmle.label | password |
 | testGRDB.swift:160:59:160:68 | [...] | semmle.label | [...] |
-| testGRDB.swift:160:59:160:68 | [...] [Collection element] | semmle.label | [...] [Collection element] |
 | testGRDB.swift:160:60:160:60 | password | semmle.label | password |
 | testGRDB.swift:161:50:161:59 | [...] | semmle.label | [...] |
-| testGRDB.swift:161:50:161:59 | [...] [Collection element] | semmle.label | [...] [Collection element] |
 | testGRDB.swift:161:51:161:51 | password | semmle.label | password |
 | testGRDB.swift:164:59:164:68 | [...] | semmle.label | [...] |
-| testGRDB.swift:164:59:164:68 | [...] [Collection element] | semmle.label | [...] [Collection element] |
 | testGRDB.swift:164:60:164:60 | password | semmle.label | password |
 | testGRDB.swift:165:50:165:59 | [...] | semmle.label | [...] |
-| testGRDB.swift:165:50:165:59 | [...] [Collection element] | semmle.label | [...] [Collection element] |
 | testGRDB.swift:165:51:165:51 | password | semmle.label | password |
 | testGRDB.swift:169:56:169:65 | [...] | semmle.label | [...] |
-| testGRDB.swift:169:56:169:65 | [...] [Collection element] | semmle.label | [...] [Collection element] |
 | testGRDB.swift:169:57:169:57 | password | semmle.label | password |
 | testGRDB.swift:170:47:170:56 | [...] | semmle.label | [...] |
-| testGRDB.swift:170:47:170:56 | [...] [Collection element] | semmle.label | [...] [Collection element] |
 | testGRDB.swift:170:48:170:48 | password | semmle.label | password |
 | testGRDB.swift:173:56:173:65 | [...] | semmle.label | [...] |
-| testGRDB.swift:173:56:173:65 | [...] [Collection element] | semmle.label | [...] [Collection element] |
 | testGRDB.swift:173:57:173:57 | password | semmle.label | password |
 | testGRDB.swift:174:47:174:56 | [...] | semmle.label | [...] |
-| testGRDB.swift:174:47:174:56 | [...] [Collection element] | semmle.label | [...] [Collection element] |
 | testGRDB.swift:174:48:174:48 | password | semmle.label | password |
 | testGRDB.swift:178:56:178:65 | [...] | semmle.label | [...] |
-| testGRDB.swift:178:56:178:65 | [...] [Collection element] | semmle.label | [...] [Collection element] |
 | testGRDB.swift:178:57:178:57 | password | semmle.label | password |
 | testGRDB.swift:179:47:179:56 | [...] | semmle.label | [...] |
-| testGRDB.swift:179:47:179:56 | [...] [Collection element] | semmle.label | [...] [Collection element] |
 | testGRDB.swift:179:48:179:48 | password | semmle.label | password |
 | testGRDB.swift:182:56:182:65 | [...] | semmle.label | [...] |
-| testGRDB.swift:182:56:182:65 | [...] [Collection element] | semmle.label | [...] [Collection element] |
 | testGRDB.swift:182:57:182:57 | password | semmle.label | password |
 | testGRDB.swift:183:47:183:56 | [...] | semmle.label | [...] |
-| testGRDB.swift:183:47:183:56 | [...] [Collection element] | semmle.label | [...] [Collection element] |
 | testGRDB.swift:183:48:183:48 | password | semmle.label | password |
 | testGRDB.swift:187:56:187:65 | [...] | semmle.label | [...] |
-| testGRDB.swift:187:56:187:65 | [...] [Collection element] | semmle.label | [...] [Collection element] |
 | testGRDB.swift:187:57:187:57 | password | semmle.label | password |
 | testGRDB.swift:188:47:188:56 | [...] | semmle.label | [...] |
-| testGRDB.swift:188:47:188:56 | [...] [Collection element] | semmle.label | [...] [Collection element] |
 | testGRDB.swift:188:48:188:48 | password | semmle.label | password |
 | testGRDB.swift:191:56:191:65 | [...] | semmle.label | [...] |
-| testGRDB.swift:191:56:191:65 | [...] [Collection element] | semmle.label | [...] [Collection element] |
 | testGRDB.swift:191:57:191:57 | password | semmle.label | password |
 | testGRDB.swift:192:47:192:56 | [...] | semmle.label | [...] |
-| testGRDB.swift:192:47:192:56 | [...] [Collection element] | semmle.label | [...] [Collection element] |
 | testGRDB.swift:192:48:192:48 | password | semmle.label | password |
 | testGRDB.swift:198:29:198:38 | [...] | semmle.label | [...] |
-| testGRDB.swift:198:29:198:38 | [...] [Collection element] | semmle.label | [...] [Collection element] |
 | testGRDB.swift:198:30:198:30 | password | semmle.label | password |
 | testGRDB.swift:201:23:201:32 | [...] | semmle.label | [...] |
-| testGRDB.swift:201:23:201:32 | [...] [Collection element] | semmle.label | [...] [Collection element] |
 | testGRDB.swift:201:24:201:24 | password | semmle.label | password |
 | testGRDB.swift:206:66:206:75 | [...] | semmle.label | [...] |
-| testGRDB.swift:206:66:206:75 | [...] [Collection element] | semmle.label | [...] [Collection element] |
 | testGRDB.swift:206:67:206:67 | password | semmle.label | password |
 | testGRDB.swift:208:80:208:89 | [...] | semmle.label | [...] |
-| testGRDB.swift:208:80:208:89 | [...] [Collection element] | semmle.label | [...] [Collection element] |
 | testGRDB.swift:208:81:208:81 | password | semmle.label | password |
 | testGRDB.swift:210:84:210:93 | [...] | semmle.label | [...] |
-| testGRDB.swift:210:84:210:93 | [...] [Collection element] | semmle.label | [...] [Collection element] |
 | testGRDB.swift:210:85:210:85 | password | semmle.label | password |
 | testGRDB.swift:212:98:212:107 | [...] | semmle.label | [...] |
-| testGRDB.swift:212:98:212:107 | [...] [Collection element] | semmle.label | [...] [Collection element] |
 | testGRDB.swift:212:99:212:99 | password | semmle.label | password |
 | testRealm2.swift:13:6:13:6 | self [Return] [data, Collection element] | semmle.label | self [Return] [data, Collection element] |
 | testRealm2.swift:13:6:13:6 | self [Return] [data] | semmle.label | self [Return] [data] |
 | testRealm2.swift:13:6:13:6 | value | semmle.label | value |
 | testRealm2.swift:13:6:13:6 | value [Collection element] | semmle.label | value [Collection element] |
 | testRealm2.swift:18:2:18:2 | [post] o | semmle.label | [post] o |
-| testRealm2.swift:18:2:18:2 | [post] o [data] | semmle.label | [post] o [data] |
 | testRealm2.swift:18:11:18:11 | myPassword | semmle.label | myPassword |
 | testRealm2.swift:24:2:24:2 | [post] o | semmle.label | [post] o |
-| testRealm2.swift:24:2:24:2 | [post] o [data] | semmle.label | [post] o [data] |
 | testRealm2.swift:24:11:24:11 | socialSecurityNumber | semmle.label | socialSecurityNumber |
 | testRealm2.swift:25:2:25:2 | [post] o | semmle.label | [post] o |
-| testRealm2.swift:25:2:25:2 | [post] o [data] | semmle.label | [post] o [data] |
 | testRealm2.swift:25:11:25:11 | ssn | semmle.label | ssn |
 | testRealm2.swift:26:2:26:2 | [post] o | semmle.label | [post] o |
-| testRealm2.swift:26:2:26:2 | [post] o [data, Collection element] | semmle.label | [post] o [data, Collection element] |
-| testRealm2.swift:26:2:26:2 | [post] o [data] | semmle.label | [post] o [data] |
 | testRealm2.swift:26:11:26:25 | call to String.init(_:) | semmle.label | call to String.init(_:) |
 | testRealm2.swift:26:11:26:25 | call to String.init(_:) [Collection element] | semmle.label | call to String.init(_:) [Collection element] |
 | testRealm2.swift:26:18:26:18 | ssn_int | semmle.label | ssn_int |
 | testRealm2.swift:32:2:32:2 | [post] o | semmle.label | [post] o |
-| testRealm2.swift:32:2:32:2 | [post] o [data] | semmle.label | [post] o [data] |
 | testRealm2.swift:32:11:32:11 | creditCardNumber | semmle.label | creditCardNumber |
 | testRealm2.swift:33:2:33:2 | [post] o | semmle.label | [post] o |
-| testRealm2.swift:33:2:33:2 | [post] o [data] | semmle.label | [post] o [data] |
 | testRealm2.swift:33:11:33:11 | CCN | semmle.label | CCN |
 | testRealm2.swift:34:2:34:2 | [post] o | semmle.label | [post] o |
-| testRealm2.swift:34:2:34:2 | [post] o [data, Collection element] | semmle.label | [post] o [data, Collection element] |
-| testRealm2.swift:34:2:34:2 | [post] o [data] | semmle.label | [post] o [data] |
 | testRealm2.swift:34:11:34:25 | call to String.init(_:) | semmle.label | call to String.init(_:) |
 | testRealm2.swift:34:11:34:25 | call to String.init(_:) [Collection element] | semmle.label | call to String.init(_:) [Collection element] |
 | testRealm2.swift:34:18:34:18 | int_ccn | semmle.label | int_ccn |
@@ -785,23 +584,18 @@ nodes
 | testRealm.swift:34:6:34:6 | self [Return] [password] | semmle.label | self [Return] [password] |
 | testRealm.swift:34:6:34:6 | value | semmle.label | value |
 | testRealm.swift:41:2:41:2 | [post] a | semmle.label | [post] a |
-| testRealm.swift:41:2:41:2 | [post] a [data] | semmle.label | [post] a [data] |
 | testRealm.swift:41:11:41:11 | myPassword | semmle.label | myPassword |
 | testRealm.swift:49:2:49:2 | [post] c | semmle.label | [post] c |
-| testRealm.swift:49:2:49:2 | [post] c [data] | semmle.label | [post] c [data] |
 | testRealm.swift:49:11:49:11 | myPassword | semmle.label | myPassword |
 | testRealm.swift:59:2:59:3 | [post] ...! | semmle.label | [post] ...! |
-| testRealm.swift:59:2:59:3 | [post] ...! [data] | semmle.label | [post] ...! [data] |
 | testRealm.swift:59:12:59:12 | myPassword | semmle.label | myPassword |
 | testRealm.swift:66:2:66:2 | [post] g | semmle.label | [post] g |
-| testRealm.swift:66:2:66:2 | [post] g [data] | semmle.label | [post] g [data] |
 | testRealm.swift:66:11:66:11 | myPassword | semmle.label | myPassword |
 | testRealm.swift:73:2:73:2 | [post] h | semmle.label | [post] h |
-| testRealm.swift:73:2:73:2 | [post] h [password] | semmle.label | [post] h [password] |
 | testRealm.swift:73:15:73:15 | myPassword | semmle.label | myPassword |
 subpaths
-| testCoreData2.swift:43:35:43:35 | bankAccountNo | testCoreData2.swift:23:13:23:13 | value | testCoreData2.swift:23:13:23:13 | self [Return] [notStoredBankAccountNumber] | testCoreData2.swift:43:2:43:2 | [post] obj [notStoredBankAccountNumber] |
-| testCoreData2.swift:52:41:52:41 | bankAccountNo | testCoreData2.swift:23:13:23:13 | value | testCoreData2.swift:23:13:23:13 | self [Return] [notStoredBankAccountNumber] | testCoreData2.swift:52:2:52:10 | [post] ...? [notStoredBankAccountNumber] |
+| testCoreData2.swift:43:35:43:35 | bankAccountNo | testCoreData2.swift:23:13:23:13 | value | testCoreData2.swift:23:13:23:13 | self [Return] [notStoredBankAccountNumber] | testCoreData2.swift:43:2:43:2 | [post] obj |
+| testCoreData2.swift:52:41:52:41 | bankAccountNo | testCoreData2.swift:23:13:23:13 | value | testCoreData2.swift:23:13:23:13 | self [Return] [notStoredBankAccountNumber] | testCoreData2.swift:52:2:52:10 | [post] ...? |
 | testCoreData2.swift:82:18:82:18 | bankAccountNo | testCoreData2.swift:70:9:70:9 | self | file://:0:0:0:0 | .value | testCoreData2.swift:82:18:82:32 | .value |
 | testCoreData2.swift:83:18:83:18 | bankAccountNo | testCoreData2.swift:71:9:71:9 | self | file://:0:0:0:0 | .value2 | testCoreData2.swift:83:18:83:32 | .value2 |
 | testCoreData2.swift:84:18:84:18 | ...! | testCoreData2.swift:70:9:70:9 | self | file://:0:0:0:0 | .value | testCoreData2.swift:84:18:84:33 | .value |
@@ -814,20 +608,20 @@ subpaths
 | testCoreData2.swift:98:18:98:18 | d [value] | testCoreData2.swift:70:9:70:9 | self [value] | file://:0:0:0:0 | .value | testCoreData2.swift:98:18:98:20 | .value |
 | testCoreData2.swift:104:18:104:18 | e | testCoreData2.swift:70:9:70:9 | self | file://:0:0:0:0 | .value | testCoreData2.swift:104:18:104:20 | .value |
 | testCoreData2.swift:105:18:105:18 | e | testCoreData2.swift:71:9:71:9 | self | file://:0:0:0:0 | .value2 | testCoreData2.swift:105:18:105:20 | .value2 |
-| testRealm2.swift:18:11:18:11 | myPassword | testRealm2.swift:13:6:13:6 | value | testRealm2.swift:13:6:13:6 | self [Return] [data] | testRealm2.swift:18:2:18:2 | [post] o [data] |
-| testRealm2.swift:24:11:24:11 | socialSecurityNumber | testRealm2.swift:13:6:13:6 | value | testRealm2.swift:13:6:13:6 | self [Return] [data] | testRealm2.swift:24:2:24:2 | [post] o [data] |
-| testRealm2.swift:25:11:25:11 | ssn | testRealm2.swift:13:6:13:6 | value | testRealm2.swift:13:6:13:6 | self [Return] [data] | testRealm2.swift:25:2:25:2 | [post] o [data] |
-| testRealm2.swift:26:11:26:25 | call to String.init(_:) | testRealm2.swift:13:6:13:6 | value | testRealm2.swift:13:6:13:6 | self [Return] [data] | testRealm2.swift:26:2:26:2 | [post] o [data] |
-| testRealm2.swift:26:11:26:25 | call to String.init(_:) [Collection element] | testRealm2.swift:13:6:13:6 | value [Collection element] | testRealm2.swift:13:6:13:6 | self [Return] [data, Collection element] | testRealm2.swift:26:2:26:2 | [post] o [data, Collection element] |
-| testRealm2.swift:32:11:32:11 | creditCardNumber | testRealm2.swift:13:6:13:6 | value | testRealm2.swift:13:6:13:6 | self [Return] [data] | testRealm2.swift:32:2:32:2 | [post] o [data] |
-| testRealm2.swift:33:11:33:11 | CCN | testRealm2.swift:13:6:13:6 | value | testRealm2.swift:13:6:13:6 | self [Return] [data] | testRealm2.swift:33:2:33:2 | [post] o [data] |
-| testRealm2.swift:34:11:34:25 | call to String.init(_:) | testRealm2.swift:13:6:13:6 | value | testRealm2.swift:13:6:13:6 | self [Return] [data] | testRealm2.swift:34:2:34:2 | [post] o [data] |
-| testRealm2.swift:34:11:34:25 | call to String.init(_:) [Collection element] | testRealm2.swift:13:6:13:6 | value [Collection element] | testRealm2.swift:13:6:13:6 | self [Return] [data, Collection element] | testRealm2.swift:34:2:34:2 | [post] o [data, Collection element] |
-| testRealm.swift:41:11:41:11 | myPassword | testRealm.swift:27:6:27:6 | value | testRealm.swift:27:6:27:6 | self [Return] [data] | testRealm.swift:41:2:41:2 | [post] a [data] |
-| testRealm.swift:49:11:49:11 | myPassword | testRealm.swift:27:6:27:6 | value | testRealm.swift:27:6:27:6 | self [Return] [data] | testRealm.swift:49:2:49:2 | [post] c [data] |
-| testRealm.swift:59:12:59:12 | myPassword | testRealm.swift:27:6:27:6 | value | testRealm.swift:27:6:27:6 | self [Return] [data] | testRealm.swift:59:2:59:3 | [post] ...! [data] |
-| testRealm.swift:66:11:66:11 | myPassword | testRealm.swift:27:6:27:6 | value | testRealm.swift:27:6:27:6 | self [Return] [data] | testRealm.swift:66:2:66:2 | [post] g [data] |
-| testRealm.swift:73:15:73:15 | myPassword | testRealm.swift:34:6:34:6 | value | testRealm.swift:34:6:34:6 | self [Return] [password] | testRealm.swift:73:2:73:2 | [post] h [password] |
+| testRealm2.swift:18:11:18:11 | myPassword | testRealm2.swift:13:6:13:6 | value | testRealm2.swift:13:6:13:6 | self [Return] [data] | testRealm2.swift:18:2:18:2 | [post] o |
+| testRealm2.swift:24:11:24:11 | socialSecurityNumber | testRealm2.swift:13:6:13:6 | value | testRealm2.swift:13:6:13:6 | self [Return] [data] | testRealm2.swift:24:2:24:2 | [post] o |
+| testRealm2.swift:25:11:25:11 | ssn | testRealm2.swift:13:6:13:6 | value | testRealm2.swift:13:6:13:6 | self [Return] [data] | testRealm2.swift:25:2:25:2 | [post] o |
+| testRealm2.swift:26:11:26:25 | call to String.init(_:) | testRealm2.swift:13:6:13:6 | value | testRealm2.swift:13:6:13:6 | self [Return] [data] | testRealm2.swift:26:2:26:2 | [post] o |
+| testRealm2.swift:26:11:26:25 | call to String.init(_:) [Collection element] | testRealm2.swift:13:6:13:6 | value [Collection element] | testRealm2.swift:13:6:13:6 | self [Return] [data, Collection element] | testRealm2.swift:26:2:26:2 | [post] o |
+| testRealm2.swift:32:11:32:11 | creditCardNumber | testRealm2.swift:13:6:13:6 | value | testRealm2.swift:13:6:13:6 | self [Return] [data] | testRealm2.swift:32:2:32:2 | [post] o |
+| testRealm2.swift:33:11:33:11 | CCN | testRealm2.swift:13:6:13:6 | value | testRealm2.swift:13:6:13:6 | self [Return] [data] | testRealm2.swift:33:2:33:2 | [post] o |
+| testRealm2.swift:34:11:34:25 | call to String.init(_:) | testRealm2.swift:13:6:13:6 | value | testRealm2.swift:13:6:13:6 | self [Return] [data] | testRealm2.swift:34:2:34:2 | [post] o |
+| testRealm2.swift:34:11:34:25 | call to String.init(_:) [Collection element] | testRealm2.swift:13:6:13:6 | value [Collection element] | testRealm2.swift:13:6:13:6 | self [Return] [data, Collection element] | testRealm2.swift:34:2:34:2 | [post] o |
+| testRealm.swift:41:11:41:11 | myPassword | testRealm.swift:27:6:27:6 | value | testRealm.swift:27:6:27:6 | self [Return] [data] | testRealm.swift:41:2:41:2 | [post] a |
+| testRealm.swift:49:11:49:11 | myPassword | testRealm.swift:27:6:27:6 | value | testRealm.swift:27:6:27:6 | self [Return] [data] | testRealm.swift:49:2:49:2 | [post] c |
+| testRealm.swift:59:12:59:12 | myPassword | testRealm.swift:27:6:27:6 | value | testRealm.swift:27:6:27:6 | self [Return] [data] | testRealm.swift:59:2:59:3 | [post] ...! |
+| testRealm.swift:66:11:66:11 | myPassword | testRealm.swift:27:6:27:6 | value | testRealm.swift:27:6:27:6 | self [Return] [data] | testRealm.swift:66:2:66:2 | [post] g |
+| testRealm.swift:73:15:73:15 | myPassword | testRealm.swift:34:6:34:6 | value | testRealm.swift:34:6:34:6 | self [Return] [password] | testRealm.swift:73:2:73:2 | [post] h |
 #select
 | SQLite.swift:123:17:123:17 | insertQuery | SQLite.swift:119:70:119:70 | mobilePhoneNumber | SQLite.swift:123:17:123:17 | insertQuery | This operation stores 'insertQuery' in a database. It may contain unencrypted sensitive data from $@. | SQLite.swift:119:70:119:70 | mobilePhoneNumber | mobilePhoneNumber |
 | SQLite.swift:124:17:124:17 | updateQuery | SQLite.swift:120:50:120:50 | mobilePhoneNumber | SQLite.swift:124:17:124:17 | updateQuery | This operation stores 'updateQuery' in a database. It may contain unencrypted sensitive data from $@. | SQLite.swift:120:50:120:50 | mobilePhoneNumber | mobilePhoneNumber |
diff --git a/swift/ql/test/query-tests/Security/CWE-321/HardcodedEncryptionKey.expected b/swift/ql/test/query-tests/Security/CWE-321/HardcodedEncryptionKey.expected
index 544431cfb4f..bd2119ac332 100644
--- a/swift/ql/test/query-tests/Security/CWE-321/HardcodedEncryptionKey.expected
+++ b/swift/ql/test/query-tests/Security/CWE-321/HardcodedEncryptionKey.expected
@@ -26,8 +26,8 @@ edges
 | cryptoswift.swift:94:18:94:36 | call to getConstantString() | cryptoswift.swift:155:26:155:26 | keyString | provenance |  |
 | cryptoswift.swift:94:18:94:36 | call to getConstantString() | cryptoswift.swift:164:24:164:24 | keyString | provenance |  |
 | cryptoswift.swift:94:18:94:36 | call to getConstantString() | cryptoswift.swift:166:24:166:24 | keyString | provenance |  |
-| file://:0:0:0:0 | [post] self [encryptionKey] | file://:0:0:0:0 | [post] self | provenance |  |
 | file://:0:0:0:0 | [post] self [encryptionKey] | misc.swift:30:7:30:7 | self [Return] [encryptionKey] | provenance |  |
+| file://:0:0:0:0 | value | file://:0:0:0:0 | [post] self | provenance |  |
 | file://:0:0:0:0 | value | file://:0:0:0:0 | [post] self [encryptionKey] | provenance |  |
 | grdb.swift:21:20:21:20 | abc123 | grdb.swift:27:23:27:23 | constString | provenance |  |
 | grdb.swift:21:20:21:20 | abc123 | grdb.swift:31:26:31:26 | constString | provenance |  |
@@ -40,18 +40,14 @@ edges
 | misc.swift:57:19:57:38 | call to Data.init(_:) | misc.swift:66:25:66:25 | myConstKey | provenance |  |
 | misc.swift:57:19:57:38 | call to Data.init(_:) | misc.swift:70:41:70:41 | myConstKey | provenance |  |
 | misc.swift:57:24:57:24 | abcdef123456 | misc.swift:57:19:57:38 | call to Data.init(_:) | provenance |  |
-| misc.swift:66:2:66:2 | [post] config [encryptionKey] | misc.swift:66:2:66:2 | [post] config | provenance |  |
 | misc.swift:66:25:66:25 | myConstKey | misc.swift:30:7:30:7 | value | provenance |  |
-| misc.swift:66:25:66:25 | myConstKey | misc.swift:66:2:66:2 | [post] config [encryptionKey] | provenance |  |
-| misc.swift:70:2:70:18 | [post] getter for .config [encryptionKey] | misc.swift:70:2:70:18 | [post] getter for .config | provenance |  |
+| misc.swift:66:25:66:25 | myConstKey | misc.swift:66:2:66:2 | [post] config | provenance |  |
 | misc.swift:70:41:70:41 | myConstKey | misc.swift:30:7:30:7 | value | provenance |  |
-| misc.swift:70:41:70:41 | myConstKey | misc.swift:70:2:70:18 | [post] getter for .config [encryptionKey] | provenance |  |
+| misc.swift:70:41:70:41 | myConstKey | misc.swift:70:2:70:18 | [post] getter for .config | provenance |  |
 | misc.swift:73:14:73:20 | k1 | misc.swift:76:26:76:29 | .utf8 | provenance |  |
 | misc.swift:73:28:73:34 | k2 | misc.swift:77:26:77:29 | .utf8 | provenance |  |
-| misc.swift:76:20:76:33 | call to Array<Element>.init(_:) [Collection element] | misc.swift:76:20:76:33 | call to Array<Element>.init(_:) | provenance |  |
-| misc.swift:76:26:76:29 | .utf8 | misc.swift:76:20:76:33 | call to Array<Element>.init(_:) [Collection element] | provenance |  |
-| misc.swift:77:20:77:33 | call to Array<Element>.init(_:) [Collection element] | misc.swift:77:20:77:33 | call to Array<Element>.init(_:) | provenance |  |
-| misc.swift:77:26:77:29 | .utf8 | misc.swift:77:20:77:33 | call to Array<Element>.init(_:) [Collection element] | provenance |  |
+| misc.swift:76:26:76:29 | .utf8 | misc.swift:76:20:76:33 | call to Array<Element>.init(_:) | provenance |  |
+| misc.swift:77:26:77:29 | .utf8 | misc.swift:77:20:77:33 | call to Array<Element>.init(_:) | provenance |  |
 | misc.swift:82:10:82:10 | abc123 | misc.swift:73:14:73:20 | k1 | provenance |  |
 | misc.swift:83:10:83:10 | abc123 | misc.swift:73:14:73:20 | k1 | provenance |  |
 | misc.swift:83:20:83:20 | abc123 | misc.swift:73:28:73:34 | k2 | provenance |  |
@@ -128,18 +124,14 @@ nodes
 | misc.swift:57:24:57:24 | abcdef123456 | semmle.label | abcdef123456 |
 | misc.swift:62:41:62:41 | myConstKey | semmle.label | myConstKey |
 | misc.swift:66:2:66:2 | [post] config | semmle.label | [post] config |
-| misc.swift:66:2:66:2 | [post] config [encryptionKey] | semmle.label | [post] config [encryptionKey] |
 | misc.swift:66:25:66:25 | myConstKey | semmle.label | myConstKey |
 | misc.swift:70:2:70:18 | [post] getter for .config | semmle.label | [post] getter for .config |
-| misc.swift:70:2:70:18 | [post] getter for .config [encryptionKey] | semmle.label | [post] getter for .config [encryptionKey] |
 | misc.swift:70:41:70:41 | myConstKey | semmle.label | myConstKey |
 | misc.swift:73:14:73:20 | k1 | semmle.label | k1 |
 | misc.swift:73:28:73:34 | k2 | semmle.label | k2 |
 | misc.swift:76:20:76:33 | call to Array<Element>.init(_:) | semmle.label | call to Array<Element>.init(_:) |
-| misc.swift:76:20:76:33 | call to Array<Element>.init(_:) [Collection element] | semmle.label | call to Array<Element>.init(_:) [Collection element] |
 | misc.swift:76:26:76:29 | .utf8 | semmle.label | .utf8 |
 | misc.swift:77:20:77:33 | call to Array<Element>.init(_:) | semmle.label | call to Array<Element>.init(_:) |
-| misc.swift:77:20:77:33 | call to Array<Element>.init(_:) [Collection element] | semmle.label | call to Array<Element>.init(_:) [Collection element] |
 | misc.swift:77:26:77:29 | .utf8 | semmle.label | .utf8 |
 | misc.swift:82:10:82:10 | abc123 | semmle.label | abc123 |
 | misc.swift:83:10:83:10 | abc123 | semmle.label | abc123 |
@@ -168,8 +160,8 @@ nodes
 | sqlite3_c_api.swift:49:36:49:36 | buffer | semmle.label | buffer |
 | sqlite3_c_api.swift:50:38:50:38 | buffer | semmle.label | buffer |
 subpaths
-| misc.swift:66:25:66:25 | myConstKey | misc.swift:30:7:30:7 | value | misc.swift:30:7:30:7 | self [Return] [encryptionKey] | misc.swift:66:2:66:2 | [post] config [encryptionKey] |
-| misc.swift:70:41:70:41 | myConstKey | misc.swift:30:7:30:7 | value | misc.swift:30:7:30:7 | self [Return] [encryptionKey] | misc.swift:70:2:70:18 | [post] getter for .config [encryptionKey] |
+| misc.swift:66:25:66:25 | myConstKey | misc.swift:30:7:30:7 | value | misc.swift:30:7:30:7 | self [Return] [encryptionKey] | misc.swift:66:2:66:2 | [post] config |
+| misc.swift:70:41:70:41 | myConstKey | misc.swift:30:7:30:7 | value | misc.swift:30:7:30:7 | self [Return] [encryptionKey] | misc.swift:70:2:70:18 | [post] getter for .config |
 #select
 | SQLite.swift:43:13:43:13 | hardcoded_key | SQLite.swift:43:13:43:13 | hardcoded_key | SQLite.swift:43:13:43:13 | hardcoded_key | The key 'hardcoded_key' has been initialized with hard-coded values from $@. | SQLite.swift:43:13:43:13 | hardcoded_key | hardcoded_key |
 | SQLite.swift:45:23:45:23 | hardcoded_key | SQLite.swift:45:23:45:23 | hardcoded_key | SQLite.swift:45:23:45:23 | hardcoded_key | The key 'hardcoded_key' has been initialized with hard-coded values from $@. | SQLite.swift:45:23:45:23 | hardcoded_key | hardcoded_key |
diff --git a/swift/ql/test/query-tests/Security/CWE-757/InsecureTLS.expected b/swift/ql/test/query-tests/Security/CWE-757/InsecureTLS.expected
index f463e8d939b..e48f6c9a9b6 100644
--- a/swift/ql/test/query-tests/Security/CWE-757/InsecureTLS.expected
+++ b/swift/ql/test/query-tests/Security/CWE-757/InsecureTLS.expected
@@ -3,62 +3,51 @@ edges
 | InsecureTLS.swift:20:7:20:7 | value | file://:0:0:0:0 | value | provenance |  |
 | InsecureTLS.swift:22:7:22:7 | value | file://:0:0:0:0 | value | provenance |  |
 | InsecureTLS.swift:23:7:23:7 | value | file://:0:0:0:0 | value | provenance |  |
-| InsecureTLS.swift:40:3:40:3 | [post] config [tlsMinimumSupportedProtocolVersion] | InsecureTLS.swift:40:3:40:3 | [post] config | provenance |  |
 | InsecureTLS.swift:40:47:40:70 | .TLSv10 | InsecureTLS.swift:19:7:19:7 | value | provenance |  |
-| InsecureTLS.swift:40:47:40:70 | .TLSv10 | InsecureTLS.swift:40:3:40:3 | [post] config [tlsMinimumSupportedProtocolVersion] | provenance |  |
-| InsecureTLS.swift:45:3:45:3 | [post] config [tlsMinimumSupportedProtocolVersion] | InsecureTLS.swift:45:3:45:3 | [post] config | provenance |  |
+| InsecureTLS.swift:40:47:40:70 | .TLSv10 | InsecureTLS.swift:40:3:40:3 | [post] config | provenance |  |
 | InsecureTLS.swift:45:47:45:70 | .TLSv11 | InsecureTLS.swift:19:7:19:7 | value | provenance |  |
-| InsecureTLS.swift:45:47:45:70 | .TLSv11 | InsecureTLS.swift:45:3:45:3 | [post] config [tlsMinimumSupportedProtocolVersion] | provenance |  |
-| InsecureTLS.swift:57:3:57:3 | [post] config [tlsMaximumSupportedProtocolVersion] | InsecureTLS.swift:57:3:57:3 | [post] config | provenance |  |
+| InsecureTLS.swift:45:47:45:70 | .TLSv11 | InsecureTLS.swift:45:3:45:3 | [post] config | provenance |  |
 | InsecureTLS.swift:57:47:57:70 | .TLSv10 | InsecureTLS.swift:20:7:20:7 | value | provenance |  |
-| InsecureTLS.swift:57:47:57:70 | .TLSv10 | InsecureTLS.swift:57:3:57:3 | [post] config [tlsMaximumSupportedProtocolVersion] | provenance |  |
-| InsecureTLS.swift:64:3:64:3 | [post] config [tlsMinimumSupportedProtocol] | InsecureTLS.swift:64:3:64:3 | [post] config | provenance |  |
+| InsecureTLS.swift:57:47:57:70 | .TLSv10 | InsecureTLS.swift:57:3:57:3 | [post] config | provenance |  |
 | InsecureTLS.swift:64:40:64:52 | .tlsProtocol10 | InsecureTLS.swift:22:7:22:7 | value | provenance |  |
-| InsecureTLS.swift:64:40:64:52 | .tlsProtocol10 | InsecureTLS.swift:64:3:64:3 | [post] config [tlsMinimumSupportedProtocol] | provenance |  |
-| InsecureTLS.swift:76:3:76:3 | [post] config [tlsMaximumSupportedProtocol] | InsecureTLS.swift:76:3:76:3 | [post] config | provenance |  |
+| InsecureTLS.swift:64:40:64:52 | .tlsProtocol10 | InsecureTLS.swift:64:3:64:3 | [post] config | provenance |  |
 | InsecureTLS.swift:76:40:76:52 | .tlsProtocol10 | InsecureTLS.swift:23:7:23:7 | value | provenance |  |
-| InsecureTLS.swift:76:40:76:52 | .tlsProtocol10 | InsecureTLS.swift:76:3:76:3 | [post] config [tlsMaximumSupportedProtocol] | provenance |  |
+| InsecureTLS.swift:76:40:76:52 | .tlsProtocol10 | InsecureTLS.swift:76:3:76:3 | [post] config | provenance |  |
 | InsecureTLS.swift:102:10:102:33 | .TLSv10 | InsecureTLS.swift:111:47:111:64 | call to getBadTLSVersion() | provenance |  |
-| InsecureTLS.swift:111:3:111:3 | [post] config [tlsMinimumSupportedProtocolVersion] | InsecureTLS.swift:111:3:111:3 | [post] config | provenance |  |
 | InsecureTLS.swift:111:47:111:64 | call to getBadTLSVersion() | InsecureTLS.swift:19:7:19:7 | value | provenance |  |
-| InsecureTLS.swift:111:47:111:64 | call to getBadTLSVersion() | InsecureTLS.swift:111:3:111:3 | [post] config [tlsMinimumSupportedProtocolVersion] | provenance |  |
+| InsecureTLS.swift:111:47:111:64 | call to getBadTLSVersion() | InsecureTLS.swift:111:3:111:3 | [post] config | provenance |  |
 | InsecureTLS.swift:121:55:121:66 | version | InsecureTLS.swift:122:47:122:47 | version | provenance |  |
-| InsecureTLS.swift:122:3:122:3 | [post] config [tlsMinimumSupportedProtocolVersion] | InsecureTLS.swift:122:3:122:3 | [post] config | provenance |  |
 | InsecureTLS.swift:122:47:122:47 | version | InsecureTLS.swift:19:7:19:7 | value | provenance |  |
-| InsecureTLS.swift:122:47:122:47 | version | InsecureTLS.swift:122:3:122:3 | [post] config [tlsMinimumSupportedProtocolVersion] | provenance |  |
+| InsecureTLS.swift:122:47:122:47 | version | InsecureTLS.swift:122:3:122:3 | [post] config | provenance |  |
 | InsecureTLS.swift:127:25:127:48 | .TLSv11 | InsecureTLS.swift:121:55:121:66 | version | provenance |  |
 | InsecureTLS.swift:158:7:158:7 | self [TLSVersion] | file://:0:0:0:0 | self [TLSVersion] | provenance |  |
 | InsecureTLS.swift:158:7:158:7 | value | file://:0:0:0:0 | value | provenance |  |
 | InsecureTLS.swift:163:3:163:3 | [post] def [TLSVersion] | InsecureTLS.swift:165:47:165:47 | def [TLSVersion] | provenance |  |
 | InsecureTLS.swift:163:20:163:43 | .TLSv10 | InsecureTLS.swift:158:7:158:7 | value | provenance |  |
 | InsecureTLS.swift:163:20:163:43 | .TLSv10 | InsecureTLS.swift:163:3:163:3 | [post] def [TLSVersion] | provenance |  |
-| InsecureTLS.swift:165:3:165:3 | [post] config [tlsMinimumSupportedProtocolVersion] | InsecureTLS.swift:165:3:165:3 | [post] config | provenance |  |
 | InsecureTLS.swift:165:47:165:47 | def [TLSVersion] | InsecureTLS.swift:158:7:158:7 | self [TLSVersion] | provenance |  |
 | InsecureTLS.swift:165:47:165:47 | def [TLSVersion] | InsecureTLS.swift:165:47:165:51 | .TLSVersion | provenance |  |
 | InsecureTLS.swift:165:47:165:51 | .TLSVersion | InsecureTLS.swift:19:7:19:7 | value | provenance |  |
-| InsecureTLS.swift:165:47:165:51 | .TLSVersion | InsecureTLS.swift:165:3:165:3 | [post] config [tlsMinimumSupportedProtocolVersion] | provenance |  |
-| InsecureTLS.swift:181:3:181:9 | [post] getter for .config [tlsMinimumSupportedProtocolVersion] | InsecureTLS.swift:181:3:181:9 | [post] getter for .config | provenance |  |
+| InsecureTLS.swift:165:47:165:51 | .TLSVersion | InsecureTLS.swift:165:3:165:3 | [post] config | provenance |  |
 | InsecureTLS.swift:181:53:181:76 | .TLSv10 | InsecureTLS.swift:19:7:19:7 | value | provenance |  |
-| InsecureTLS.swift:181:53:181:76 | .TLSv10 | InsecureTLS.swift:181:3:181:9 | [post] getter for .config [tlsMinimumSupportedProtocolVersion] | provenance |  |
+| InsecureTLS.swift:181:53:181:76 | .TLSv10 | InsecureTLS.swift:181:3:181:9 | [post] getter for .config | provenance |  |
 | InsecureTLS.swift:185:20:185:36 | withMinVersion | InsecureTLS.swift:187:42:187:42 | withMinVersion | provenance |  |
-| InsecureTLS.swift:187:5:187:5 | [post] self [tlsMinimumSupportedProtocolVersion] | InsecureTLS.swift:187:5:187:5 | [post] self | provenance |  |
-| InsecureTLS.swift:187:42:187:42 | withMinVersion | InsecureTLS.swift:187:5:187:5 | [post] self [tlsMinimumSupportedProtocolVersion] | provenance |  |
+| InsecureTLS.swift:187:42:187:42 | withMinVersion | InsecureTLS.swift:187:5:187:5 | [post] self | provenance |  |
 | InsecureTLS.swift:193:51:193:74 | .TLSv10 | InsecureTLS.swift:185:20:185:36 | withMinVersion | provenance |  |
 | InsecureTLS.swift:196:56:196:63 | value | InsecureTLS.swift:196:1:198:1 | version[return] | provenance |  |
-| InsecureTLS.swift:202:24:202:24 | [post] config [tlsMinimumSupportedProtocolVersion] | InsecureTLS.swift:202:24:202:24 | [post] config | provenance |  |
-| InsecureTLS.swift:202:24:202:31 | [post] getter for .tlsMinimumSupportedProtocolVersion | InsecureTLS.swift:202:24:202:24 | [post] config [tlsMinimumSupportedProtocolVersion] | provenance |  |
+| InsecureTLS.swift:202:24:202:31 | [post] getter for .tlsMinimumSupportedProtocolVersion | InsecureTLS.swift:202:24:202:24 | [post] config | provenance |  |
 | InsecureTLS.swift:202:74:202:97 | .TLSv10 | InsecureTLS.swift:196:56:196:63 | value | provenance |  |
 | InsecureTLS.swift:202:74:202:97 | .TLSv10 | InsecureTLS.swift:202:24:202:31 | [post] getter for .tlsMinimumSupportedProtocolVersion | provenance |  |
 | file://:0:0:0:0 | [post] self [TLSVersion] | InsecureTLS.swift:158:7:158:7 | self [Return] [TLSVersion] | provenance |  |
 | file://:0:0:0:0 | [post] self [tlsMaximumSupportedProtocolVersion] | InsecureTLS.swift:20:7:20:7 | self [Return] [tlsMaximumSupportedProtocolVersion] | provenance |  |
-| file://:0:0:0:0 | [post] self [tlsMaximumSupportedProtocolVersion] | file://:0:0:0:0 | [post] self | provenance |  |
 | file://:0:0:0:0 | [post] self [tlsMaximumSupportedProtocol] | InsecureTLS.swift:23:7:23:7 | self [Return] [tlsMaximumSupportedProtocol] | provenance |  |
-| file://:0:0:0:0 | [post] self [tlsMaximumSupportedProtocol] | file://:0:0:0:0 | [post] self | provenance |  |
 | file://:0:0:0:0 | [post] self [tlsMinimumSupportedProtocolVersion] | InsecureTLS.swift:19:7:19:7 | self [Return] [tlsMinimumSupportedProtocolVersion] | provenance |  |
-| file://:0:0:0:0 | [post] self [tlsMinimumSupportedProtocolVersion] | file://:0:0:0:0 | [post] self | provenance |  |
 | file://:0:0:0:0 | [post] self [tlsMinimumSupportedProtocol] | InsecureTLS.swift:22:7:22:7 | self [Return] [tlsMinimumSupportedProtocol] | provenance |  |
-| file://:0:0:0:0 | [post] self [tlsMinimumSupportedProtocol] | file://:0:0:0:0 | [post] self | provenance |  |
 | file://:0:0:0:0 | self [TLSVersion] | file://:0:0:0:0 | .TLSVersion | provenance |  |
+| file://:0:0:0:0 | value | file://:0:0:0:0 | [post] self | provenance |  |
+| file://:0:0:0:0 | value | file://:0:0:0:0 | [post] self | provenance |  |
+| file://:0:0:0:0 | value | file://:0:0:0:0 | [post] self | provenance |  |
+| file://:0:0:0:0 | value | file://:0:0:0:0 | [post] self | provenance |  |
 | file://:0:0:0:0 | value | file://:0:0:0:0 | [post] self [TLSVersion] | provenance |  |
 | file://:0:0:0:0 | value | file://:0:0:0:0 | [post] self [tlsMaximumSupportedProtocolVersion] | provenance |  |
 | file://:0:0:0:0 | value | file://:0:0:0:0 | [post] self [tlsMaximumSupportedProtocol] | provenance |  |
@@ -74,27 +63,20 @@ nodes
 | InsecureTLS.swift:23:7:23:7 | self [Return] [tlsMaximumSupportedProtocol] | semmle.label | self [Return] [tlsMaximumSupportedProtocol] |
 | InsecureTLS.swift:23:7:23:7 | value | semmle.label | value |
 | InsecureTLS.swift:40:3:40:3 | [post] config | semmle.label | [post] config |
-| InsecureTLS.swift:40:3:40:3 | [post] config [tlsMinimumSupportedProtocolVersion] | semmle.label | [post] config [tlsMinimumSupportedProtocolVersion] |
 | InsecureTLS.swift:40:47:40:70 | .TLSv10 | semmle.label | .TLSv10 |
 | InsecureTLS.swift:45:3:45:3 | [post] config | semmle.label | [post] config |
-| InsecureTLS.swift:45:3:45:3 | [post] config [tlsMinimumSupportedProtocolVersion] | semmle.label | [post] config [tlsMinimumSupportedProtocolVersion] |
 | InsecureTLS.swift:45:47:45:70 | .TLSv11 | semmle.label | .TLSv11 |
 | InsecureTLS.swift:57:3:57:3 | [post] config | semmle.label | [post] config |
-| InsecureTLS.swift:57:3:57:3 | [post] config [tlsMaximumSupportedProtocolVersion] | semmle.label | [post] config [tlsMaximumSupportedProtocolVersion] |
 | InsecureTLS.swift:57:47:57:70 | .TLSv10 | semmle.label | .TLSv10 |
 | InsecureTLS.swift:64:3:64:3 | [post] config | semmle.label | [post] config |
-| InsecureTLS.swift:64:3:64:3 | [post] config [tlsMinimumSupportedProtocol] | semmle.label | [post] config [tlsMinimumSupportedProtocol] |
 | InsecureTLS.swift:64:40:64:52 | .tlsProtocol10 | semmle.label | .tlsProtocol10 |
 | InsecureTLS.swift:76:3:76:3 | [post] config | semmle.label | [post] config |
-| InsecureTLS.swift:76:3:76:3 | [post] config [tlsMaximumSupportedProtocol] | semmle.label | [post] config [tlsMaximumSupportedProtocol] |
 | InsecureTLS.swift:76:40:76:52 | .tlsProtocol10 | semmle.label | .tlsProtocol10 |
 | InsecureTLS.swift:102:10:102:33 | .TLSv10 | semmle.label | .TLSv10 |
 | InsecureTLS.swift:111:3:111:3 | [post] config | semmle.label | [post] config |
-| InsecureTLS.swift:111:3:111:3 | [post] config [tlsMinimumSupportedProtocolVersion] | semmle.label | [post] config [tlsMinimumSupportedProtocolVersion] |
 | InsecureTLS.swift:111:47:111:64 | call to getBadTLSVersion() | semmle.label | call to getBadTLSVersion() |
 | InsecureTLS.swift:121:55:121:66 | version | semmle.label | version |
 | InsecureTLS.swift:122:3:122:3 | [post] config | semmle.label | [post] config |
-| InsecureTLS.swift:122:3:122:3 | [post] config [tlsMinimumSupportedProtocolVersion] | semmle.label | [post] config [tlsMinimumSupportedProtocolVersion] |
 | InsecureTLS.swift:122:47:122:47 | version | semmle.label | version |
 | InsecureTLS.swift:127:25:127:48 | .TLSv11 | semmle.label | .TLSv11 |
 | InsecureTLS.swift:158:7:158:7 | self [Return] [TLSVersion] | semmle.label | self [Return] [TLSVersion] |
@@ -103,21 +85,17 @@ nodes
 | InsecureTLS.swift:163:3:163:3 | [post] def [TLSVersion] | semmle.label | [post] def [TLSVersion] |
 | InsecureTLS.swift:163:20:163:43 | .TLSv10 | semmle.label | .TLSv10 |
 | InsecureTLS.swift:165:3:165:3 | [post] config | semmle.label | [post] config |
-| InsecureTLS.swift:165:3:165:3 | [post] config [tlsMinimumSupportedProtocolVersion] | semmle.label | [post] config [tlsMinimumSupportedProtocolVersion] |
 | InsecureTLS.swift:165:47:165:47 | def [TLSVersion] | semmle.label | def [TLSVersion] |
 | InsecureTLS.swift:165:47:165:51 | .TLSVersion | semmle.label | .TLSVersion |
 | InsecureTLS.swift:181:3:181:9 | [post] getter for .config | semmle.label | [post] getter for .config |
-| InsecureTLS.swift:181:3:181:9 | [post] getter for .config [tlsMinimumSupportedProtocolVersion] | semmle.label | [post] getter for .config [tlsMinimumSupportedProtocolVersion] |
 | InsecureTLS.swift:181:53:181:76 | .TLSv10 | semmle.label | .TLSv10 |
 | InsecureTLS.swift:185:20:185:36 | withMinVersion | semmle.label | withMinVersion |
 | InsecureTLS.swift:187:5:187:5 | [post] self | semmle.label | [post] self |
-| InsecureTLS.swift:187:5:187:5 | [post] self [tlsMinimumSupportedProtocolVersion] | semmle.label | [post] self [tlsMinimumSupportedProtocolVersion] |
 | InsecureTLS.swift:187:42:187:42 | withMinVersion | semmle.label | withMinVersion |
 | InsecureTLS.swift:193:51:193:74 | .TLSv10 | semmle.label | .TLSv10 |
 | InsecureTLS.swift:196:1:198:1 | version[return] | semmle.label | version[return] |
 | InsecureTLS.swift:196:56:196:63 | value | semmle.label | value |
 | InsecureTLS.swift:202:24:202:24 | [post] config | semmle.label | [post] config |
-| InsecureTLS.swift:202:24:202:24 | [post] config [tlsMinimumSupportedProtocolVersion] | semmle.label | [post] config [tlsMinimumSupportedProtocolVersion] |
 | InsecureTLS.swift:202:24:202:31 | [post] getter for .tlsMinimumSupportedProtocolVersion | semmle.label | [post] getter for .tlsMinimumSupportedProtocolVersion |
 | InsecureTLS.swift:202:74:202:97 | .TLSv10 | semmle.label | .TLSv10 |
 | file://:0:0:0:0 | .TLSVersion | semmle.label | .TLSVersion |
@@ -137,17 +115,17 @@ nodes
 | file://:0:0:0:0 | value | semmle.label | value |
 | file://:0:0:0:0 | value | semmle.label | value |
 subpaths
-| InsecureTLS.swift:40:47:40:70 | .TLSv10 | InsecureTLS.swift:19:7:19:7 | value | InsecureTLS.swift:19:7:19:7 | self [Return] [tlsMinimumSupportedProtocolVersion] | InsecureTLS.swift:40:3:40:3 | [post] config [tlsMinimumSupportedProtocolVersion] |
-| InsecureTLS.swift:45:47:45:70 | .TLSv11 | InsecureTLS.swift:19:7:19:7 | value | InsecureTLS.swift:19:7:19:7 | self [Return] [tlsMinimumSupportedProtocolVersion] | InsecureTLS.swift:45:3:45:3 | [post] config [tlsMinimumSupportedProtocolVersion] |
-| InsecureTLS.swift:57:47:57:70 | .TLSv10 | InsecureTLS.swift:20:7:20:7 | value | InsecureTLS.swift:20:7:20:7 | self [Return] [tlsMaximumSupportedProtocolVersion] | InsecureTLS.swift:57:3:57:3 | [post] config [tlsMaximumSupportedProtocolVersion] |
-| InsecureTLS.swift:64:40:64:52 | .tlsProtocol10 | InsecureTLS.swift:22:7:22:7 | value | InsecureTLS.swift:22:7:22:7 | self [Return] [tlsMinimumSupportedProtocol] | InsecureTLS.swift:64:3:64:3 | [post] config [tlsMinimumSupportedProtocol] |
-| InsecureTLS.swift:76:40:76:52 | .tlsProtocol10 | InsecureTLS.swift:23:7:23:7 | value | InsecureTLS.swift:23:7:23:7 | self [Return] [tlsMaximumSupportedProtocol] | InsecureTLS.swift:76:3:76:3 | [post] config [tlsMaximumSupportedProtocol] |
-| InsecureTLS.swift:111:47:111:64 | call to getBadTLSVersion() | InsecureTLS.swift:19:7:19:7 | value | InsecureTLS.swift:19:7:19:7 | self [Return] [tlsMinimumSupportedProtocolVersion] | InsecureTLS.swift:111:3:111:3 | [post] config [tlsMinimumSupportedProtocolVersion] |
-| InsecureTLS.swift:122:47:122:47 | version | InsecureTLS.swift:19:7:19:7 | value | InsecureTLS.swift:19:7:19:7 | self [Return] [tlsMinimumSupportedProtocolVersion] | InsecureTLS.swift:122:3:122:3 | [post] config [tlsMinimumSupportedProtocolVersion] |
+| InsecureTLS.swift:40:47:40:70 | .TLSv10 | InsecureTLS.swift:19:7:19:7 | value | InsecureTLS.swift:19:7:19:7 | self [Return] [tlsMinimumSupportedProtocolVersion] | InsecureTLS.swift:40:3:40:3 | [post] config |
+| InsecureTLS.swift:45:47:45:70 | .TLSv11 | InsecureTLS.swift:19:7:19:7 | value | InsecureTLS.swift:19:7:19:7 | self [Return] [tlsMinimumSupportedProtocolVersion] | InsecureTLS.swift:45:3:45:3 | [post] config |
+| InsecureTLS.swift:57:47:57:70 | .TLSv10 | InsecureTLS.swift:20:7:20:7 | value | InsecureTLS.swift:20:7:20:7 | self [Return] [tlsMaximumSupportedProtocolVersion] | InsecureTLS.swift:57:3:57:3 | [post] config |
+| InsecureTLS.swift:64:40:64:52 | .tlsProtocol10 | InsecureTLS.swift:22:7:22:7 | value | InsecureTLS.swift:22:7:22:7 | self [Return] [tlsMinimumSupportedProtocol] | InsecureTLS.swift:64:3:64:3 | [post] config |
+| InsecureTLS.swift:76:40:76:52 | .tlsProtocol10 | InsecureTLS.swift:23:7:23:7 | value | InsecureTLS.swift:23:7:23:7 | self [Return] [tlsMaximumSupportedProtocol] | InsecureTLS.swift:76:3:76:3 | [post] config |
+| InsecureTLS.swift:111:47:111:64 | call to getBadTLSVersion() | InsecureTLS.swift:19:7:19:7 | value | InsecureTLS.swift:19:7:19:7 | self [Return] [tlsMinimumSupportedProtocolVersion] | InsecureTLS.swift:111:3:111:3 | [post] config |
+| InsecureTLS.swift:122:47:122:47 | version | InsecureTLS.swift:19:7:19:7 | value | InsecureTLS.swift:19:7:19:7 | self [Return] [tlsMinimumSupportedProtocolVersion] | InsecureTLS.swift:122:3:122:3 | [post] config |
 | InsecureTLS.swift:163:20:163:43 | .TLSv10 | InsecureTLS.swift:158:7:158:7 | value | InsecureTLS.swift:158:7:158:7 | self [Return] [TLSVersion] | InsecureTLS.swift:163:3:163:3 | [post] def [TLSVersion] |
 | InsecureTLS.swift:165:47:165:47 | def [TLSVersion] | InsecureTLS.swift:158:7:158:7 | self [TLSVersion] | file://:0:0:0:0 | .TLSVersion | InsecureTLS.swift:165:47:165:51 | .TLSVersion |
-| InsecureTLS.swift:165:47:165:51 | .TLSVersion | InsecureTLS.swift:19:7:19:7 | value | InsecureTLS.swift:19:7:19:7 | self [Return] [tlsMinimumSupportedProtocolVersion] | InsecureTLS.swift:165:3:165:3 | [post] config [tlsMinimumSupportedProtocolVersion] |
-| InsecureTLS.swift:181:53:181:76 | .TLSv10 | InsecureTLS.swift:19:7:19:7 | value | InsecureTLS.swift:19:7:19:7 | self [Return] [tlsMinimumSupportedProtocolVersion] | InsecureTLS.swift:181:3:181:9 | [post] getter for .config [tlsMinimumSupportedProtocolVersion] |
+| InsecureTLS.swift:165:47:165:51 | .TLSVersion | InsecureTLS.swift:19:7:19:7 | value | InsecureTLS.swift:19:7:19:7 | self [Return] [tlsMinimumSupportedProtocolVersion] | InsecureTLS.swift:165:3:165:3 | [post] config |
+| InsecureTLS.swift:181:53:181:76 | .TLSv10 | InsecureTLS.swift:19:7:19:7 | value | InsecureTLS.swift:19:7:19:7 | self [Return] [tlsMinimumSupportedProtocolVersion] | InsecureTLS.swift:181:3:181:9 | [post] getter for .config |
 | InsecureTLS.swift:202:74:202:97 | .TLSv10 | InsecureTLS.swift:196:56:196:63 | value | InsecureTLS.swift:196:1:198:1 | version[return] | InsecureTLS.swift:202:24:202:31 | [post] getter for .tlsMinimumSupportedProtocolVersion |
 #select
 | InsecureTLS.swift:40:3:40:3 | [post] config | InsecureTLS.swift:40:47:40:70 | .TLSv10 | InsecureTLS.swift:40:3:40:3 | [post] config | This TLS configuration is insecure. |